diff -Nru mame-0.222+dfsg.1/3rdparty/lua-zlib/lua_zlib.c mame-0.224+dfsg.1/3rdparty/lua-zlib/lua_zlib.c
--- mame-0.222+dfsg.1/3rdparty/lua-zlib/lua_zlib.c	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/3rdparty/lua-zlib/lua_zlib.c	2020-08-26 08:57:19.000000000 +0000
@@ -392,7 +392,7 @@
 
     SETLITERAL("_COPYRIGHT", "Copyright (c) 2009-2010 Brian Maher");
     SETLITERAL("_DESCRIPTION", "Yet another binding to the zlib library");
-    SETLITERAL("_VERSION", "lua-zlib $Id: b619258c75f480717fad20c113c3b1a35f888ce0 $  (tag: mame0222, release0222)");
+    SETLITERAL("_VERSION", "lua-zlib $Id: b619258c75f480717fad20c113c3b1a35f888ce0 $  (tag: mame0224)");
 
     /* Expose this to lua so we can do a test: */
     SETINT("_TEST_BUFSIZ", LUAL_BUFFERSIZE);
diff -Nru mame-0.222+dfsg.1/3rdparty/sol2/sol/container_usertype_metatable.hpp mame-0.224+dfsg.1/3rdparty/sol2/sol/container_usertype_metatable.hpp
--- mame-0.222+dfsg.1/3rdparty/sol2/sol/container_usertype_metatable.hpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/3rdparty/sol2/sol/container_usertype_metatable.hpp	2020-08-26 08:57:19.000000000 +0000
@@ -273,7 +273,7 @@
 			auto& src = get_src(L);
 			using std::begin;
 			stack::push(L, pairs_next_call);
-			stack::push<user<iter>>(L, src, begin(src));
+			stack::push_specific<user<iter>>(L, src, begin(src));
 			stack::push(L, 1);
 			return 3;
 		}
@@ -296,7 +296,7 @@
 			auto& src = get_src(L);
 			using std::begin;
 			stack::push(L, pairs_next_call);
-			stack::push<user<iter>>(L, src, begin(src));
+			stack::push_specific<user<iter>>(L, src, begin(src));
 			stack::push(L, 0);
 			return 3;
 		}
diff -Nru mame-0.222+dfsg.1/3rdparty/sol2/sol/function_types.hpp mame-0.224+dfsg.1/3rdparty/sol2/sol/function_types.hpp
--- mame-0.222+dfsg.1/3rdparty/sol2/sol/function_types.hpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/3rdparty/sol2/sol/function_types.hpp	2020-08-26 08:57:19.000000000 +0000
@@ -165,7 +165,7 @@
 			static void set_fx(lua_State* L, Args&&... args) {
 				lua_CFunction freefunc = function_detail::call<meta::unqualified_t<Fx>>;
 
-				stack::push<user<Fx>>(L, std::forward<Args>(args)...);
+				stack::push_specific<user<Fx>>(L, std::forward<Args>(args)...);
 				stack::push(L, c_closure(freefunc, 1));
 			}
 
@@ -181,7 +181,7 @@
 		struct pusher<function_arguments<T, Args...>> {
 			template <std::size_t... I, typename FP>
 			static int push_func(std::index_sequence<I...>, lua_State* L, FP&& fp) {
-				return stack::push<T>(L, detail::forward_get<I>(fp.arguments)...);
+				return stack::push_specific<T>(L, detail::forward_get<I>(fp.arguments)...);
 			}
 
 			static int push(lua_State* L, const function_arguments<T, Args...>& fp) {
@@ -235,13 +235,13 @@
 		struct pusher<protect_t<T>> {
 			static int push(lua_State* L, protect_t<T>&& pw) {
 				lua_CFunction cf = call_detail::call_user<void, false, false, protect_t<T>>;
-				int closures = stack::push<user<protect_t<T>>>(L, std::move(pw.value));
+				int closures = stack::push_specific<user<protect_t<T>>>(L, std::move(pw.value));
 				return stack::push(L, c_closure(cf, closures));
 			}
 
 			static int push(lua_State* L, const protect_t<T>& pw) {
 				lua_CFunction cf = call_detail::call_user<void, false, false, protect_t<T>>;
-				int closures = stack::push<user<protect_t<T>>>(L, pw.value);
+				int closures = stack::push_specific<user<protect_t<T>>>(L, pw.value);
 				return stack::push(L, c_closure(cf, closures));
 			}
 		};
@@ -314,7 +314,7 @@
 			template <typename C>
 			static int push(lua_State* L, C&& c) {
 				lua_CFunction cf = call_detail::call_user<T, false, false, constructor_wrapper<Fxs...>>;
-				int closures = stack::push<user<constructor_wrapper<Fxs...>>>(L, std::forward<C>(c));
+				int closures = stack::push_specific<user<constructor_wrapper<Fxs...>>>(L, std::forward<C>(c));
 				return stack::push(L, c_closure(cf, closures));
 			}
 		};
@@ -331,7 +331,7 @@
 		struct pusher<detail::tagged<T, destructor_wrapper<Fx>>> {
 			static int push(lua_State* L, destructor_wrapper<Fx> c) {
 				lua_CFunction cf = call_detail::call_user<T, false, false, destructor_wrapper<Fx>>;
-				int closures = stack::push<user<T>>(L, std::move(c));
+				int closures = stack::push_specific<user<T>>(L, std::move(c));
 				return stack::push(L, c_closure(cf, closures));
 			}
 		};
diff -Nru mame-0.222+dfsg.1/3rdparty/sol2/sol/object.hpp mame-0.224+dfsg.1/3rdparty/sol2/sol/object.hpp
--- mame-0.222+dfsg.1/3rdparty/sol2/sol/object.hpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/3rdparty/sol2/sol/object.hpp	2020-08-26 08:57:19.000000000 +0000
@@ -43,7 +43,7 @@
 
 	template <typename T, typename R = reference, bool should_pop = !std::is_base_of<stack_reference, R>::value, typename... Args>
 	R make_reference(lua_State* L, Args&&... args) {
-		int backpedal = stack::push<T>(L, std::forward<Args>(args)...);
+		int backpedal = stack::push_specific<T>(L, std::forward<Args>(args)...);
 		R r = stack::get<R>(L, -backpedal);
 		if (should_pop) {
 			lua_pop(L, backpedal);
@@ -99,7 +99,7 @@
 		basic_object(lua_State* L, int index = -1) noexcept : base_t(L, index) {}
 		basic_object(lua_State* L, ref_index index) noexcept : base_t(L, index) {}
 		template <typename T, typename... Args>
-		basic_object(lua_State* L, in_place_type_t<T>, Args&&... args) noexcept : basic_object(std::integral_constant<bool, !std::is_base_of<stack_reference, base_t>::value>(), L, -stack::push<T>(L, std::forward<Args>(args)...)) {}
+		basic_object(lua_State* L, in_place_type_t<T>, Args&&... args) noexcept : basic_object(std::integral_constant<bool, !std::is_base_of<stack_reference, base_t>::value>(), L, -stack::push_specific<T>(L, std::forward<Args>(args)...)) {}
 		template <typename T, typename... Args>
 		basic_object(lua_State* L, in_place_t, T&& arg, Args&&... args) noexcept : basic_object(L, in_place<T>, std::forward<T>(arg), std::forward<Args>(args)...) {}
 		basic_object& operator=(const basic_object&) = default;
diff -Nru mame-0.222+dfsg.1/3rdparty/sol2/sol/simple_usertype_metatable.hpp mame-0.224+dfsg.1/3rdparty/sol2/sol/simple_usertype_metatable.hpp
--- mame-0.222+dfsg.1/3rdparty/sol2/sol/simple_usertype_metatable.hpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/3rdparty/sol2/sol/simple_usertype_metatable.hpp	2020-08-26 08:57:19.000000000 +0000
@@ -366,7 +366,7 @@
 				++uniqueness;
 
 				const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
-				stack::push<user<usertype_detail::simple_map>>(L, metatable_key, uniquegcmetakey, &usertype_traits<T>::metatable()[0], 
+				stack::push_specific<user<usertype_detail::simple_map>>(L, metatable_key, uniquegcmetakey, &usertype_traits<T>::metatable()[0], 
 					umx.indexbaseclasspropogation, umx.newindexbaseclasspropogation, 
 					std::move(umx.varmap), std::move(umx.registrations)
 				);
diff -Nru mame-0.222+dfsg.1/3rdparty/sol2/sol/stack_core.hpp mame-0.224+dfsg.1/3rdparty/sol2/sol/stack_core.hpp
--- mame-0.222+dfsg.1/3rdparty/sol2/sol/stack_core.hpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/3rdparty/sol2/sol/stack_core.hpp	2020-08-26 08:57:19.000000000 +0000
@@ -173,9 +173,9 @@
 			return pusher<meta::unqualified_t<T>>{}.push(L, std::forward<T>(t), std::forward<Args>(args)...);
 		}
 
-		// overload allows to use a pusher of a specific type, but pass in any kind of args
-		template<typename T, typename Arg, typename... Args, typename = std::enable_if_t<!std::is_same<T, Arg>::value>>
-		inline int push(lua_State* L, Arg&& arg, Args&&... args) {
+		// allow a pusher of a specific type, but pass in any kind of args
+		template<typename T, typename Arg, typename... Args>
+		inline int push_specific(lua_State* L, Arg&& arg, Args&&... args) {
 			return pusher<meta::unqualified_t<T>>{}.push(L, std::forward<Arg>(arg), std::forward<Args>(args)...);
 		}
 
diff -Nru mame-0.222+dfsg.1/3rdparty/sol2/sol/stack_push.hpp mame-0.224+dfsg.1/3rdparty/sol2/sol/stack_push.hpp
--- mame-0.222+dfsg.1/3rdparty/sol2/sol/stack_push.hpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/3rdparty/sol2/sol/stack_push.hpp	2020-08-26 08:57:19.000000000 +0000
@@ -546,7 +546,7 @@
 			}
 
 			static int push(lua_State* L, const wchar_t(&str)[N], std::size_t sz) {
-				return stack::push<const wchar_t*>(L, str, str + sz);
+				return stack::push_specific<const wchar_t*>(L, str, str + sz);
 			}
 		};
 
@@ -557,7 +557,7 @@
 			}
 
 			static int push(lua_State* L, const char16_t(&str)[N], std::size_t sz) {
-				return stack::push<const char16_t*>(L, str, str + sz);
+				return stack::push_specific<const char16_t*>(L, str, str + sz);
 			}
 		};
 
@@ -568,7 +568,7 @@
 			}
 
 			static int push(lua_State* L, const char32_t(&str)[N], std::size_t sz) {
-				return stack::push<const char32_t*>(L, str, str + sz);
+				return stack::push_specific<const char32_t*>(L, str, str + sz);
 			}
 		};
 
diff -Nru mame-0.222+dfsg.1/3rdparty/sol2/sol/usertype_metatable.hpp mame-0.224+dfsg.1/3rdparty/sol2/sol/usertype_metatable.hpp
--- mame-0.222+dfsg.1/3rdparty/sol2/sol/usertype_metatable.hpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/3rdparty/sol2/sol/usertype_metatable.hpp	2020-08-26 08:57:19.000000000 +0000
@@ -489,7 +489,7 @@
 				const char* gcmetakey = &usertype_traits<T>::gc_table()[0];
 				// Make sure userdata's memory is properly in lua first,
 				// otherwise all the light userdata we make later will become invalid
-				stack::push<user<umt_t>>(L, metatable_key, uniquegcmetakey, std::move(umx));
+				stack::push_specific<user<umt_t>>(L, metatable_key, uniquegcmetakey, std::move(umx));
 				// Create the top level thing that will act as our deleter later on
 				stack_reference umt(L, -1);
 				stack::set_field<true>(L, gcmetakey, umt);
diff -Nru mame-0.222+dfsg.1/android-project/app/src/main/AndroidManifest.xml mame-0.224+dfsg.1/android-project/app/src/main/AndroidManifest.xml
--- mame-0.222+dfsg.1/android-project/app/src/main/AndroidManifest.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/android-project/app/src/main/AndroidManifest.xml	2020-08-26 08:57:19.000000000 +0000
@@ -4,8 +4,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.mamedev.mame"
-      android:versionCode="222"
-      android:versionName="0.222"
+      android:versionCode="224"
+      android:versionName="0.224"
       android:installLocation="auto">
 
     <!-- OpenGL ES 2.0 -->
diff -Nru mame-0.222+dfsg.1/.appveyor.yml mame-0.224+dfsg.1/.appveyor.yml
--- mame-0.222+dfsg.1/.appveyor.yml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/.appveyor.yml	2020-08-26 08:57:19.000000000 +0000
@@ -23,8 +23,8 @@
   - set MSYSTEM=MINGW64
 
 build_script:
-  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && export MINGW64=/mingw64 && make SUBTARGET=tiny PTR64=1 TOOLS=1 OPTIMIZE=0 vs2019 -j3"
-  - msbuild "build\projects\windows\mametiny\vs2019\mametiny.sln" /m /p:ContinueOnError=false /p:StopOnFirstFailure=true /property:Configuration=Debug /property:Platform=x64 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
+  - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && export MINGW64=/mingw64 && make SUBTARGET=ci PTR64=1 TOOLS=1 OPTIMIZE=0 vs2019 -j3"
+  - msbuild "build\projects\windows\mameci\vs2019\mameci.sln" /m /p:ContinueOnError=false /p:StopOnFirstFailure=true /property:Configuration=Debug /property:Platform=x64 /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
 for:
   -
     matrix:
@@ -35,19 +35,24 @@
     install:
       - set "PATH=C:\msys64\usr\bin;C:\msys64\mingw64\bin;C:\Windows\System32;C:\Windows;%PATH%"
       - set MSYSTEM=MINGW64
+      - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
+      - bash -lc "curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
+      - bash -lc "pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig"
+      - bash -lc "pacman -U --noconfirm msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz"
       - bash -lc "pacman -Syu --noconfirm"
+      - taskkill /f /fi "MODULES eq msys-2.0.dll"
       - bash -lc "pacman -Syu --noconfirm"
     build_script:
-      - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && export MINGW64=/mingw64 && make SUBTARGET=tiny PTR64=1 TOOLS=1 OPTIMIZE=1 IGNORE_GIT=1 -j3"
+      - bash -lc "exec 0</dev/null && cd $APPVEYOR_BUILD_FOLDER && export MINGW64=/mingw64 && make SUBTARGET=ci PTR64=1 TOOLS=1 OPTIMIZE=3 IGNORE_GIT=1 -j3"
     test_script:
-      - \projects\mame\mametiny64.exe -validate
+      - \projects\mame\mameci64.exe -validate
     after_test:
-      - 7z a mametiny64-appveyor-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%-%APPVEYOR_BUILD_NUMBER%.7z %APPVEYOR_BUILD_FOLDER%\*.exe %APPVEYOR_BUILD_FOLDER%\artwork %APPVEYOR_BUILD_FOLDER%\bgfx %APPVEYOR_BUILD_FOLDER%\ctrlr %APPVEYOR_BUILD_FOLDER%\docs %APPVEYOR_BUILD_FOLDER%\hash %APPVEYOR_BUILD_FOLDER%\hlsl %APPVEYOR_BUILD_FOLDER%\ini %APPVEYOR_BUILD_FOLDER%\language %APPVEYOR_BUILD_FOLDER%\nl_examples %APPVEYOR_BUILD_FOLDER%\plugins %APPVEYOR_BUILD_FOLDER%\roms %APPVEYOR_BUILD_FOLDER%\samples
-      - appveyor PushArtifact mametiny64-appveyor-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%-%APPVEYOR_BUILD_NUMBER%.7z
+      - 7z a mameci64-appveyor-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%-%APPVEYOR_BUILD_NUMBER%.7z %APPVEYOR_BUILD_FOLDER%\*.exe %APPVEYOR_BUILD_FOLDER%\artwork %APPVEYOR_BUILD_FOLDER%\bgfx %APPVEYOR_BUILD_FOLDER%\ctrlr %APPVEYOR_BUILD_FOLDER%\docs %APPVEYOR_BUILD_FOLDER%\hash %APPVEYOR_BUILD_FOLDER%\hlsl %APPVEYOR_BUILD_FOLDER%\ini %APPVEYOR_BUILD_FOLDER%\language %APPVEYOR_BUILD_FOLDER%\nl_examples %APPVEYOR_BUILD_FOLDER%\plugins %APPVEYOR_BUILD_FOLDER%\roms %APPVEYOR_BUILD_FOLDER%\samples
+      - appveyor PushArtifact mameci64-appveyor-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%-%APPVEYOR_BUILD_NUMBER%.7z
 
 test_script:
-  - \projects\mame\mametiny64d.exe -validate
+  - \projects\mame\mameci64d.exe -validate
 
 after_test:
-  - 7z a mametiny64d-appveyor-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%-%APPVEYOR_BUILD_NUMBER%.7z %APPVEYOR_BUILD_FOLDER%\*.exe %APPVEYOR_BUILD_FOLDER%\artwork %APPVEYOR_BUILD_FOLDER%\bgfx %APPVEYOR_BUILD_FOLDER%\ctrlr %APPVEYOR_BUILD_FOLDER%\docs %APPVEYOR_BUILD_FOLDER%\hash %APPVEYOR_BUILD_FOLDER%\hlsl %APPVEYOR_BUILD_FOLDER%\ini %APPVEYOR_BUILD_FOLDER%\language %APPVEYOR_BUILD_FOLDER%\nl_examples %APPVEYOR_BUILD_FOLDER%\plugins %APPVEYOR_BUILD_FOLDER%\roms %APPVEYOR_BUILD_FOLDER%\samples
-  - appveyor PushArtifact mametiny64d-appveyor-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%-%APPVEYOR_BUILD_NUMBER%.7z
+  - 7z a mameci64d-appveyor-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%-%APPVEYOR_BUILD_NUMBER%.7z %APPVEYOR_BUILD_FOLDER%\*.exe %APPVEYOR_BUILD_FOLDER%\artwork %APPVEYOR_BUILD_FOLDER%\bgfx %APPVEYOR_BUILD_FOLDER%\ctrlr %APPVEYOR_BUILD_FOLDER%\docs %APPVEYOR_BUILD_FOLDER%\hash %APPVEYOR_BUILD_FOLDER%\hlsl %APPVEYOR_BUILD_FOLDER%\ini %APPVEYOR_BUILD_FOLDER%\language %APPVEYOR_BUILD_FOLDER%\nl_examples %APPVEYOR_BUILD_FOLDER%\plugins %APPVEYOR_BUILD_FOLDER%\roms %APPVEYOR_BUILD_FOLDER%\samples
+  - appveyor PushArtifact mameci64d-appveyor-%APPVEYOR_REPO_BRANCH%-%APPVEYOR_REPO_COMMIT%-%APPVEYOR_BUILD_NUMBER%.7z
diff -Nru mame-0.222+dfsg.1/debian/changelog mame-0.224+dfsg.1/debian/changelog
--- mame-0.222+dfsg.1/debian/changelog	2020-07-06 17:43:00.000000000 +0000
+++ mame-0.224+dfsg.1/debian/changelog	2020-08-31 05:51:45.000000000 +0000
@@ -1,3 +1,33 @@
+mame (0.224+dfsg.1-2) unstable; urgency=medium
+
+  * Set NOASM=1 for hppa, m68k, mips64el, mipsel and sh4.
+
+ -- Jordi Mallach <jordi@debian.org>  Mon, 31 Aug 2020 07:51:45 +0200
+
+mame (0.224+dfsg.1-1) unstable; urgency=medium
+
+  [ Cesare Falco ]
+  * New upstream release.
+  * Updated patches.
+
+  [ Jordi Mallach ]
+  * Let the build system figure out FORCE_DRC_C_BACKEND and NOASM
+    (hopefully closes: #968883).
+
+ -- Jordi Mallach <jordi@debian.org>  Sat, 29 Aug 2020 21:43:12 +0200
+
+mame (0.223+dfsg.1-1) unstable; urgency=medium
+
+  [ Cesare Falco ]
+  * New upstream release.
+    - fixes ftbfs after toolchain upgrades (closes: #966911).
+
+  [ Jordi Mallach ]
+  * Do not pass -m64 on alpha.
+  * Drop ftbfs_arm_asmjit.patch, unneeded in new upstream version.
+
+ -- Jordi Mallach <jordi@debian.org>  Wed, 12 Aug 2020 19:36:58 +0200
+
 mame (0.222+dfsg.1-2) unstable; urgency=medium
 
   * Add patch from upstream git to fix ARM builds.
diff -Nru mame-0.222+dfsg.1/debian/patches/ftbfs_alpha.patch mame-0.224+dfsg.1/debian/patches/ftbfs_alpha.patch
--- mame-0.222+dfsg.1/debian/patches/ftbfs_alpha.patch	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/debian/patches/ftbfs_alpha.patch	2020-07-10 14:27:46.000000000 +0000
@@ -0,0 +1,21 @@
+Index: mame/makefile
+===================================================================
+--- mame.orig/makefile
++++ mame/makefile
+@@ -301,12 +301,16 @@ TARGETOS := $(OS)
+ ifeq ($(ARCHITECTURE),_x86)
+ MPARAM := -m32
+ else
++ifeq ($(firstword $(filter alpha,$(UNAME))),alpha)
++MPARAM :=
++else
+ ifeq ($(ARCHITECTURE),_x64)
+ MPARAM := -m64
+ else
+ MPARAM :=
+ endif
+ endif
++endif
+ 
+ ARCHITECTURE := _x86
+ 
diff -Nru mame-0.222+dfsg.1/debian/patches/ftbfs_arm_asmjit.patch mame-0.224+dfsg.1/debian/patches/ftbfs_arm_asmjit.patch
--- mame-0.222+dfsg.1/debian/patches/ftbfs_arm_asmjit.patch	2020-07-06 17:41:48.000000000 +0000
+++ mame-0.224+dfsg.1/debian/patches/ftbfs_arm_asmjit.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-commit a8bd59055eda6b6656e56e689a8a74f7e835434d
-Author: Julian Sikorski <belegdol+github@gmail.com>
-Date:   Sat Jun 27 14:50:48 2020 +0200
-
-    Only build asmjit on x86 and x86_64
-
-diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
-index 52e5d862168..7002fdbe0ff 100644
---- a/scripts/src/3rdparty.lua
-+++ b/scripts/src/3rdparty.lua
-@@ -2224,6 +2224,7 @@ project "wdlfft"
- -- asmjit library
- --------------------------------------------------
- 
-+if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
- project "asmjit"
- 	uuid "4539757c-6e99-4bae-b3d0-b342a7c49539"
- 	kind "StaticLib"
-@@ -2353,3 +2354,4 @@ project "asmjit"
- 		MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass.cpp",
- 		MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass_p.h",
- 	}
-+end
-diff --git a/scripts/src/main.lua b/scripts/src/main.lua
-index 26e7ab94394..4d787bfbdaf 100644
---- a/scripts/src/main.lua
-+++ b/scripts/src/main.lua
-@@ -261,8 +261,12 @@ end
- 		"wdlfft",
- 		ext_lib("jpeg"),
- 		"7z",
-+	}
-+if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
-+	links {
- 		"asmjit",
- 	}
-+end
- if (STANDALONE~=true) then
- 	links {
- 		ext_lib("lua"),
diff -Nru mame-0.222+dfsg.1/debian/patches/hurd.patch mame-0.224+dfsg.1/debian/patches/hurd.patch
--- mame-0.222+dfsg.1/debian/patches/hurd.patch	2020-07-06 15:24:52.000000000 +0000
+++ mame-0.224+dfsg.1/debian/patches/hurd.patch	2020-08-29 19:09:45.000000000 +0000
@@ -16,7 +16,7 @@
  ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin)
  OS := macosx
  GENIEOS := darwin
-@@ -1359,6 +1362,16 @@ linux: generate $(PROJECTDIR)/$(MAKETYPE
+@@ -1370,6 +1373,16 @@ linux: generate $(PROJECTDIR)/$(MAKETYPE
  	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG) precompile
  	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-linux config=$(CONFIG)
  
diff -Nru mame-0.222+dfsg.1/debian/patches/python3.patch mame-0.224+dfsg.1/debian/patches/python3.patch
--- mame-0.222+dfsg.1/debian/patches/python3.patch	2020-07-06 15:24:52.000000000 +0000
+++ mame-0.224+dfsg.1/debian/patches/python3.patch	2020-08-29 19:09:45.000000000 +0000
@@ -7,7 +7,7 @@
 ===================================================================
 --- mame.orig/makefile
 +++ mame/makefile
-@@ -412,7 +412,7 @@ endif
+@@ -423,7 +423,7 @@ endif
  endif # BIGENDIAN
  
  ifndef PYTHON_EXECUTABLE
@@ -16,7 +16,7 @@
  else
  PYTHON := $(PYTHON_EXECUTABLE)
  endif
-@@ -960,7 +960,7 @@ ifeq ($(OS),windows)
+@@ -971,7 +971,7 @@ ifeq ($(OS),windows)
  ifeq (posix,$(SHELLTYPE))
  GCC_VERSION      := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> /dev/null)
  CLANG_VERSION    := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> /dev/null| head -n 1 | grep clang | sed "s/^.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$$/\1/" | head -n 1)
@@ -25,7 +25,7 @@
  GIT_AVAILABLE    := $(shell git --version > /dev/null 2>&1 && echo git)
  else
  GCC_VERSION      := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> NUL)
-@@ -1004,7 +1004,7 @@ else
+@@ -1015,7 +1015,7 @@ else
  GCC_VERSION      := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> /dev/null)
  endif
  CLANG_VERSION    := $(shell $(TOOLCHAIN)$(subst @,,$(CC))  --version  2> /dev/null | head -n 1 | grep -e 'version [0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' -o | grep -e '[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' -o | tail -n 1)
@@ -34,7 +34,7 @@
  GIT_AVAILABLE := $(shell git --version > /dev/null 2>&1 && echo git)
  endif
  
-@@ -1021,7 +1021,7 @@ endif
+@@ -1032,7 +1032,7 @@ endif
  endif
  endif
  
diff -Nru mame-0.222+dfsg.1/debian/patches/series mame-0.224+dfsg.1/debian/patches/series
--- mame-0.222+dfsg.1/debian/patches/series	2020-07-06 17:42:09.000000000 +0000
+++ mame-0.224+dfsg.1/debian/patches/series	2020-08-12 15:35:18.000000000 +0000
@@ -1,4 +1,5 @@
 #genie_freebsd_target.patch
+ftbfs_alpha.patch
 python3.patch
 hurd.patch
 sphinx_mathjax_location.patch
@@ -7,4 +8,3 @@
 sphinx_remove_unresolved_module.patch
 fix-922619.patch
 #fix-bx-ppc64el.patch #accepted upstream
-ftbfs_arm_asmjit.patch
diff -Nru mame-0.222+dfsg.1/debian/rules mame-0.224+dfsg.1/debian/rules
--- mame-0.222+dfsg.1/debian/rules	2020-07-06 15:24:52.000000000 +0000
+++ mame-0.224+dfsg.1/debian/rules	2020-08-31 05:48:38.000000000 +0000
@@ -34,10 +34,8 @@
     DEBUG= \
     TARGETOS=linux \
     DISTRO=debian-stable \
-    FORCE_DRC_C_BACKEND=1 \
     PTR64= \
     BIGENDIAN= \
-    NOASM=1 \
     PYTHON_EXECUTABLE=python3 \
     QT_HOME=/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/ \
     USE_SYSTEM_LIB_ASIO= \
@@ -71,9 +69,7 @@
 
 ifeq ($(DEB_HOST_ARCH),amd64)
 DEB_OPTS += \
-    FORCE_DRC_C_BACKEND= \
-    PTR64=1 \
-    NOASM=
+    PTR64=1
 endif
 
 ifeq ($(DEB_HOST_ARCH),arm64)
@@ -85,14 +81,10 @@
 export DEB_LDFLAGS_MAINT_APPEND += -Wl,--allow-multiple-definition
 endif
 
-ifeq ($(DEB_HOST_ARCH),i386)
-DEB_OPTS += \
-    FORCE_DRC_C_BACKEND= \
-    NOASM=
-endif
-
 ifeq ($(DEB_HOST_ARCH),hppa)
 LINK_WITH_GOLD =
+DEB_OPTS += \
+    NOASM=1
 endif
 
 ifeq ($(DEB_HOST_ARCH),ia64)
@@ -103,6 +95,8 @@
 
 ifeq ($(DEB_HOST_ARCH),m68k)
 LINK_WITH_GOLD =
+DEB_OPTS += \
+    NOASM=1
 endif
 
 ifeq ($(DEB_HOST_ARCH),mips)
@@ -114,17 +108,19 @@
 
 ifeq ($(DEB_HOST_ARCH),mipsel)
 DEB_OPTS += \
-    ARCHOPTS=-Umips
+    ARCHOPTS=-Umips \
+    NOASM=1
 LINK_WITH_GOLD =
 endif
 
 ifeq ($(DEB_HOST_ARCH),mips64el)
+DEB_OPTS += \
+    NOASM=1
 endif
 
 ifeq ($(DEB_HOST_ARCH),powerpc)
 DEB_OPTS += \
     ARCHOPTS=-Upowerpc \
-    NOASM= \
     BIGENDIAN=1
 LINK_WITH_GOLD =
 endif
@@ -132,15 +128,13 @@
 ifeq ($(DEB_HOST_ARCH),ppc64)
 DEB_OPTS += \
     PTR64=1 \
-    NOASM= \
     BIGENDIAN=1
 LINK_WITH_GOLD =
 endif
 
 ifeq ($(DEB_HOST_ARCH),ppc64el)
 DEB_OPTS += \
-    PTR64=1 \
-    NOASM=
+    PTR64=1
 LINK_WITH_GOLD =
 endif
 
@@ -164,6 +158,8 @@
 
 ifeq ($(DEB_HOST_ARCH),sh4)
 LINK_WITH_GOLD =
+DEB_OPTS += \
+    NOASM=1
 endif
 
 ifeq ($(DEB_HOST_ARCH),sparc)
@@ -179,19 +175,11 @@
 LINK_WITH_GOLD =
 endif
 
-ifeq ($(DEB_HOST_ARCH),x32)
-DEB_OPTS += \
-    FORCE_DRC_C_BACKEND= \
-    NOASM=
-endif
-
 # kFreeBSD architectures
 ifeq ($(DEB_HOST_ARCH),kfreebsd-amd64)
 DEB_OPTS += \
     TARGETOS=freebsd \
-    FORCE_DRC_C_BACKEND= \
     PTR64=1 \
-    NOASM= \
     USE_SYSTEM_LIB_PORTMIDI=
 export DEB_LDFLAGS_MAINT_APPEND = -ldl
 endif
@@ -199,8 +187,6 @@
 ifeq ($(DEB_HOST_ARCH),kfreebsd-i386)
 DEB_OPTS += \
     TARGETOS=freebsd \
-    FORCE_DRC_C_BACKEND= \
-    NOASM= \
     USE_SYSTEM_LIB_PORTMIDI=
 export DEB_LDFLAGS_MAINT_APPEND = -ldl
 endif
@@ -209,8 +195,6 @@
 ifeq ($(DEB_HOST_ARCH),hurd-i386)
 DEB_OPTS += \
     TARGETOS=gnu \
-    FORCE_DRC_C_BACKEND= \
-    NOASM= \
     USE_SYSTEM_LIB_PORTMIDI= \
     NO_USE_MIDI=1
 LINK_WITH_GOLD =
diff -Nru mame-0.222+dfsg.1/docs/source/commandline/commandline-all.rst mame-0.224+dfsg.1/docs/source/commandline/commandline-all.rst
--- mame-0.222+dfsg.1/docs/source/commandline/commandline-all.rst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/source/commandline/commandline-all.rst	2020-08-26 08:57:19.000000000 +0000
@@ -237,9 +237,9 @@
             </mame>
 
 .. Tip:: Output from this command is typically more useful if redirected to
-         an output file. For instance, doing 
+         an output file. For instance, doing
          **mame64 -listxml galaxian > galax.xml** will make ``galax.xml`` or
-         overwrite any existing data in the file with the results of 
+         overwrite any existing data in the file with the results of
          **-listxml**; this will allow you to view it in a text editor or parse
          it with external tools.
 
@@ -607,7 +607,7 @@
 
 **-getsoftlist** / **-glist** [<*pattern*>]
 
-    Displays the contents of a specific softlist with the filename represented 
+    Displays the contents of a specific softlist with the filename represented
     by *pattern*.
 
     Example:
@@ -698,21 +698,21 @@
       - dwrite
       - none
       - auto
-      - 
+      -
       - sdl [#UIFPSDLWindows]_.
     * - **macOS**
-      - 
-      - 
+      -
+      -
       - none
       - auto
       - osx
       - sdl
     * - **Linux**
-      - 
-      - 
+      -
+      -
       - none
       - auto
-      - 
+      -
       - sdl
 
 ..  rubric:: Footnotes
@@ -745,16 +745,16 @@
       - sdl [#KBIPSDLWindows]_.
     * - **SDL (macOS and Linux)**
       - auto [#KBIPAutoSDL]_.
-      - 
-      - 
-      - 
+      -
+      -
+      -
       - none
       - sdl
     * - **Linux**
       - auto [#KBIPAutoSDL]_.
-      - 
-      - 
-      - 
+      -
+      -
+      -
       - none
       - sdl
 
@@ -797,16 +797,16 @@
       - sdl [#MIPSDLWindows]_.
     * - **SDL (macOS and Linux)**
       - auto [#MIPAutoSDL]_.
-      - 
-      - 
-      - 
+      -
+      -
+      -
       - none
       - sdl
     * - **Linux**
       - auto [#MIPAutoSDL]_.
-      - 
-      - 
-      - 
+      -
+      -
+      -
       - none
       - sdl
 
@@ -841,21 +841,21 @@
       - rawinput
       - win32
       - none
-      - 
-      - 
+      -
+      -
     * - **macOS**
       - auto [#LGIPAutoSDL]_.
-      - 
-      - 
+      -
+      -
       - none
-      - 
-      - 
+      -
+      -
     * - **Linux**
       - auto [#LGIPAutoLinux]_.
-      - 
-      - 
+      -
+      -
       - none
-      - 
+      -
       - x11
 
 ..  rubric:: Footnotes
@@ -892,9 +892,9 @@
       - sdl
     * - **SDL**
       - auto [#JIPAutoSDL]_.
-      - 
-      - 
-      - 
+      -
+      -
+      -
       - none
       - sdl
 
@@ -1036,7 +1036,7 @@
     The default is ``.`` (that is, in the current working directory).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -homepath c:\mame\lua
 
@@ -1051,7 +1051,7 @@
     working directory).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -rompath c:\mame\roms;c:\roms\another
 
@@ -1066,7 +1066,7 @@
     working directory).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -hashpath c:\mame\hash;c:\roms\softlists
 
@@ -1081,7 +1081,7 @@
     working directory).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -samplepath c:\mame\samples;c:\roms\samples
 
@@ -1096,7 +1096,7 @@
     working directory).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -artpath c:\mame\artwork;c:\emu\shared-artwork
 
@@ -1111,7 +1111,7 @@
     working directory).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -ctrlrpath c:\mame\ctrlr;c:\emu\controllers
 
@@ -1140,7 +1140,7 @@
     directory ``ini`` in the current working directory).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -inipath c:\users\thisuser\documents\mameini
 
@@ -1155,7 +1155,7 @@
     The default is ``.`` (that is, search in the current working directory).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -fontpath c:\mame\;c:\emu\artwork\mamefonts
 
@@ -1170,7 +1170,7 @@
     current working directory).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -cheatpath c:\mame\cheat;c:\emu\cheats
 
@@ -1185,7 +1185,7 @@
     current working directory).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -crosshairpath c:\mame\crsshair;c:\emu\artwork\crosshairs
 
@@ -1199,7 +1199,7 @@
     working directory).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -pluginspath c:\mame\plugins;c:\emu\lua
 
@@ -1214,7 +1214,7 @@
     current working directory).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -languagepath c:\mame\language;c:\emu\mame-languages
 
@@ -1228,7 +1228,7 @@
     working directory).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -swpath c:\mame\software;c:\emu\mydisks
 
@@ -1251,7 +1251,7 @@
     automatically.
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -cfg_directory c:\mame\cfg
 
@@ -1269,7 +1269,7 @@
     automatically.
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -nvram_directory c:\mame\nvram
 
@@ -1286,7 +1286,7 @@
     automatically.
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -input_directory c:\mame\inp
 
@@ -1303,7 +1303,7 @@
     automatically.
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -state_directory c:\mame\sta
 
@@ -1319,7 +1319,7 @@
     automatically.
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -snapshot_directory c:\mame\snap
 
@@ -1338,7 +1338,7 @@
     automatically.
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -diff_directory c:\mame\diff
 
@@ -1355,7 +1355,7 @@
     created automatically.
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -comment_directory c:\mame\comments
 
@@ -1380,7 +1380,7 @@
     command.
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -norewind
 
@@ -1395,7 +1395,7 @@
     clamped to 0.
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -rewind_capacity 30
 
@@ -1407,7 +1407,7 @@
     in the specified <slot> to be loaded.
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -state 1
 
@@ -1423,7 +1423,7 @@
     The default is OFF (**-noautosave**).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 -autosave
 
@@ -1438,7 +1438,7 @@
     The default is ``NULL`` (no playback).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 pacman -playback worldrecord
 
@@ -1458,7 +1458,7 @@
     The default is OFF (**-noexit_after_playback**).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 pacman -playback worldrecord -exit_after_playback
 
@@ -1473,7 +1473,7 @@
     The default is ``NULL`` (no recording).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 pacman -record worldrecord
 
@@ -1494,7 +1494,7 @@
     By default, no timecode file is saved.
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 pacman -record worldrecord -record_timecode
 
@@ -1511,7 +1511,7 @@
     The default is ``NULL`` (no recording).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 pacman -mngwrite pacman-video
 
@@ -1531,7 +1531,7 @@
     The default is ``NULL`` (no recording).
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 pacman -playback worldrecord -exit_after_playback -aviwrite worldrecord
 
@@ -1547,7 +1547,7 @@
 .. _mame-commandline-snapname:
 
     Example:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 pacman -wavewrite pacsounds
 
@@ -1572,21 +1572,21 @@
     with the media switch you want to use.
 
     Example 1:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 robby -snapname foo\%g%i
 
         Snapshots will be saved as ``snaps\foo\robby0000.png``, ``snaps\foo\robby0001.png`` and so on.
 
     Example 2:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 nes -cart robby -snapname %g\%d_cart
 
         Snapshots will be saved as ``snaps\nes\robby.png``.
 
     Example 3:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 c64 -flop1 robby -snapname %g\%d_flop1/%i
 
@@ -1671,19 +1671,19 @@
     ``[media]`` with the media switch you want to use.
 
     Example 1:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 robby -statename foo\%g
             All save states will be stored inside sta\foo\robby\
 
     Example 2:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 nes -cart robby -statename %g/%d_cart
             All save states will be stored inside sta\nes\robby\
 
     Example 3:
-        .. code-block::
+        .. code-block:: bash
 
             mame64 c64 -flop1 robby -statename %g/%d_flop1
             All save states will be stored inside sta\c64\robby\
@@ -1878,7 +1878,7 @@
     latency.  This is particularly effective with VRR (Variable Refresh Rate)
     displays.
 
-    This may cause frame pacing issues in the form of jitter with some 
+    This may cause frame pacing issues in the form of jitter with some
     systems (especially newer 3D-based systems or systems that run software
     akin to an operating system), so the default is off (**-nolowlatency**).
 
@@ -1959,7 +1959,7 @@
 
             mame64 pacman -autorol
 
-.. Tip:: If you have a display that can be rotated, **-autorol** or 
+.. Tip:: If you have a display that can be rotated, **-autorol** or
          **-autoror** will allow you to get a larger display for both horizontal
          and vertical systems.
 
@@ -2039,9 +2039,9 @@
 
 **-numscreens** *<count>*
 
-    Tells MAME how many output windows or screens to create.  For most systems, 
-    a single output window is all you need, but some systems originally used 
-    multiple screens (*e.g. Darius and PlayChoice-10 arcade machines*).  Some 
+    Tells MAME how many output windows or screens to create.  For most systems,
+    a single output window is all you need, but some systems originally used
+    multiple screens (*e.g. Darius and PlayChoice-10 arcade machines*).  Some
     systems with front panel controls and/or status lights also may let you put
     these in different windows/screens. Each screen (up to 4) has its own
     independent settings for physical monitor, aspect ratio, resolution, and
@@ -2180,6 +2180,7 @@
     The default is OFF (**-nosyncrefresh**).
 
 .. _mame-commandline-prescale:
+
     Example:
         .. code-block:: bash
 
@@ -2520,7 +2521,7 @@
     ramp, for the system screens.  This option does not affect the artwork or
     other parts of the display.  Using the MAME UI, you can individually set
     the gamma for each system screen; this option controls the initial value for
-    all visible system screens.  The standard and default value is ``1.0``, 
+    all visible system screens.  The standard and default value is ``1.0``,
     which gives a linear ramp from black to white.  Selecting lower values
     (down to 0.1) will increase the nonlinearity toward black, while
     selecting higher values (up to 3.0) will push the nonlinearity toward white.
@@ -2576,7 +2577,10 @@
 
 **-beam_width_min** *<width>*
 
-    Sets the vector beam minimum width.
+    Sets the vector beam minimum width. The beam width varies between
+    the minimum and maximum beam widths as the intensity of the vector
+    drawn changes. To disable vector width changes based on intensity,
+    set the maximum equal to the minimum.
 
     Example:
         .. code-block:: bash
@@ -2587,7 +2591,10 @@
 
 **-beam_width_max** *<width>*
 
-    Sets the vector beam maximum width.
+    Sets the vector beam maximum width. The beam width varies between
+    the minimum and maximum beam widths as the intensity of the vector
+    drawn changes. To disable vector width changes based on intensity,
+    set the maximum equal to the minimum.
 
     Example:
         .. code-block:: bash
@@ -2598,13 +2605,35 @@
 
 **-beam_intensity_weight** *<weight>*
 
-    Sets the vector beam intensity weight.
+    Sets the vector beam intensity weight. This value determines how the
+    intensity of the vector drawn affects the width. A value of 0 creates
+    a linear mapping from intensity to width. Negative values mean that
+    lower intensities will increase the width toward maximum faster,
+    while positive values will increase the width toward maximum more
+    slowly.
 
     Example:
         .. code-block:: bash
 
             mame64 asteroid -beam_intensity_weight 0.5
 
+.. _mame-commandline-beamdotsize:
+
+**-beam_dot_size** *<scale>*
+
+    Scale factor to apply to the size of single-point dots in vector games.
+    Normally these are rendered according to the computed beam width; however,
+    it is common for this to produce dots that are difficult to see. The
+    beam_dot_size option applies a scale factor on top of the beam width to
+    help them show up better.
+
+    The default is ``1``.
+
+    Example:
+        .. code-block:: bash
+
+            mame64 asteroid -beam_dot_size 2
+
 .. _mame-commandline-flicker:
 
 **-flicker** *<value>*
@@ -2828,21 +2857,21 @@
       - dsound
       - xaudio2
       - portaudio
-      - 
+      -
       - sdl [#SoundWinSDL]_.
       - none
     * - **macOS**
-      - 
-      - 
+      -
+      -
       - portaudio
       - coreaudio
       - sdl
       - none
     * - **Linux** and others
-      - 
-      - 
+      -
+      -
       - portaudio
-      - 
+      -
       - sdl
       - none
 
@@ -2860,9 +2889,9 @@
     Higher values increase audio delay but may help avoid buffer under-runs and
     audio interruptions.
 
-    The default is ``1``. 
+    The default is ``1``.
 
-    | For PortAudio, see :ref:`mame-commandline-pa-latency`.
+    | For PortAudio, see the section on :ref:`-pa_latency <mame-commandline-pa-latency>`.
     | XAudio2 calculates audio_latency as 10ms steps.
     | DSound calculates audio_latency as 10ms steps.
     | CoreAudio calculates audio_latency as 25ms steps.
@@ -3045,33 +3074,62 @@
 
 **-joystick_map** *<map>* / **-joymap** *<map>*
 
-    Controls how joystick values map to digital joystick controls. MAME accepts
-    all joystick input from the system as analog data.  For true analog
-    joysticks, this needs to be mapped down to the usual 4-way or 8-way digital
-    joystick values.  To do this, MAME divides the analog range into a 9x9 grid.
-    It then takes the joystick axis position (for X and Y axes only), maps it to
-    this grid, and then looks up a translation from a joystick map.  This
+    Controls how analog joystick values map to digital joystick controls.
+
+    Systems such as Pac-Man use a 4-way digital joystick and will exhibit
+    undesired behavior when a diagonal is triggered; in the case of Pac-Man,
+    movement will stop completely at intersections when diagonals are triggered
+    and the game will be considerably harder to play correctly.  Many other
+    arcade cabinets used 4-way or 8-way joysticks (as opposed to full analog
+    joysticks), so for true analog joysticks such as flight sticks and analog
+    thumb sticks, this then needs to be mapped down to the expected
+    4-way or 8-way digital joystick values.
+
+    To do this, MAME divides the analog range into a 9x9 grid that looks
+    like this:
+
+    **insert 9x9 grid picture here**
+
+    MAME then takes the joystick axis position (for X and Y axes only), maps it
+    to this grid, and then looks up a translation from a joystick map.  This
     parameter allows you to specify the map.
 
+    For instance, an 8-way joystick map traditionally looks like this:
+
+    **insert 8-way map picture here**
+
+    This mapping gives considerable leeway to the angles accepted for a given
+    direction, so that being approximately in the area of the direction you want
+    will give you the results you want.  Without that, if you were slightly off
+    center while holding the stick left, it would not recognize the action
+    correctly.
+
     The default is ``auto``, which means that a standard 8-way, 4-way, or 4-way
     diagonal map is selected automatically based on the input port configuration
     of the current system.
 
-    Maps are defined as a string of numbers and characters. Since the grid is
-    9x9, there are a total of 81 characters necessary to define a complete map.
-    Below is an example map for an 8-way joystick:
+    Generally you will want to set up the **-joystick_map** setting in the
+    per-system ``<system>.ini`` file as opposed to the main ``MAME.INI``
+    file so that the mapping only affects the systems you want it to.  See
+    :ref:`Multiple Configuration Files <advanced-multi-CFG>` for further
+    details on per-system configuration.
 
-		+-------------+---------------------------------------------------------+
-		| | 777888999 |                                                         |
-		| | 777888999 | | Note that the numeric digits correspond to the keys   |
-		| | 777888999 | | on a numeric keypad. So '7' maps to up+left, '4' maps |
-		| | 444555666 | | to left, '5' maps to neutral, etc. In addition to the |
-		| | 444555666 | | numeric values, you can specify the character 's',    |
-		| | 444555666 | | which means "sticky". In this case, the value of the  |
-		| | 111222333 | | map is the same as it was the last time a non-sticky  |
-		| | 111222333 | | value was read.                                       |
-		| | 111222333 |                                                         |
-		+-------------+---------------------------------------------------------+
+    Maps are defined as a string of numbers and characters. Since the grid is
+    9x9, there are a total of 81 characters necessary to define a complete
+    map.  Below is an example map for an 8-way joystick that matches the
+    picture shown above:
+
+		+-------------+--------------------------------------------------------+
+		| | 777888999 |                                                        |
+		| | 777888999 | | Note that the numeric digits correspond to the keys  |
+		| | 777888999 | | on a numeric keypad. So '7' maps to up+left, '4' maps|
+		| | 444555666 | | to left, '5' maps to neutral, etc. In addition to the|
+		| | 444555666 | | numeric values, you can specify the character 's',   |
+		| | 444555666 | | which means "sticky".  Sticky map positions will keep|
+		| | 111222333 | | the output the same as the last non-sticky input sent|
+		| | 111222333 | | to the system.                                       |
+		| | 111222333 |                                                        |
+		+-------------+--------------------------------------------------------+
 
     To specify the map for this parameter, you can specify a string of rows
     separated by a '.' (which indicates the end of a row), like so:
@@ -3107,6 +3165,47 @@
     up/down mirrors of the first three rows, giving three final rows of
     111222333.
 
+    With 4-way games, sticky becomes important to avoid problems with
+    diagonals.  Typically you would choose a map that looks something like this:
+
+    **insert 9x9 4-way sticky grid picture here**
+
+    This means that if you press left, then roll the stick towards up (without
+    re-centering it) you'll pass through the sticky section in the corner.  As
+    you do, MAME will read that sticky corner as **left** as that's the last
+    non-sticky input it received.  As the roll gets into the upward space of
+    the map, this then switches to an up motion.
+
+    This map would look somewhat like:
+
+		+-------------+---------------------------------------------------------+
+		| | s8888888s |                                                         |
+		| | 4s88888s6 | | For this mapping, we have a wide range for the        |
+		| | 44s888s66 | | cardinal directions on 8, 4, 6, and 2.  We have sticky|
+		| | 444555666 | | on the meeting points between those cardinal          |
+		| | 444555666 | | directions where the appropriate direction isn't      |
+		| | 444555666 | | going to be completely obvious.                       |
+		| | 44s222s66 |                                                         |
+		| | 4s22222s6 |                                                         |
+		| | s2222222s |                                                         |
+		+-------------+---------------------------------------------------------+
+
+    To specify the map for this parameter, you can specify a string of rows
+    separated by a '.' (which indicates the end of a row), like so:
+
+    +-------------------------------------------------------------------------------------------------------+
+    | **-joymap s8888888s.4s88888s6.44s888s66.444555666.444555666.444555666.44s222s66.4s22222s6.s2222222s** |
+    +-------------------------------------------------------------------------------------------------------+
+
+    Like before, because of the symmetry between top and bottom and left and
+    right, we can shorten this down to:
+
+    +------------------------------+
+    | **-joymap s8.4s8.44s8.4445** |
+    +------------------------------+
+
+
+
 .. _mame-commandline-joystickdeadzone:
 
 **-joystick_deadzone** *<value>* / **-joy_deadzone** *<value>* / **-jdz** *<value>*
@@ -3645,6 +3744,7 @@
     The default is (**-noui_mouse**).
 
 .. _mame-commandline-language:
+
     Example:
         .. code-block:: bash
 
diff -Nru mame-0.222+dfsg.1/docs/source/healthwarning.rst mame-0.224+dfsg.1/docs/source/healthwarning.rst
--- mame-0.222+dfsg.1/docs/source/healthwarning.rst	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/source/healthwarning.rst	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,29 @@
+Health Warnings
+===============
+
+Epilepsy Warning
+----------------
+
+A very small percentage of individuals may experience epileptic seizures when
+exposed to certain light patterns or flashing lights. Exposure to certain
+patterns or backgrounds on a television screen or computer monitor, or while
+playing video games may induce an epileptic seizure in these individuals.
+
+Certain conditions may induce previously undetected epileptic symptoms even in
+persons who have no history of prior seizures or epilepsy. These conditions can
+include emulation accuracy or inaccuracy, computer performance at the time of
+running MAME, video card drivers, your monitor, and a lot of other factors.
+If you, or anyone in your family, has an epileptic condition, consult your
+physician prior to using MAME.
+
+If you experience any of the following while using MAME, **IMMEDIATELY**
+discontinue use and consult your physician before resuming use of MAME.
+
+* Dizziness
+* Altered vision
+* Eye or muscle twitches
+* Loss of awareness
+* Disorientation
+* Any involuntary movement
+* Convulsions
+
diff -Nru mame-0.222+dfsg.1/docs/source/index.rst mame-0.224+dfsg.1/docs/source/index.rst
--- mame-0.222+dfsg.1/docs/source/index.rst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/source/index.rst	2020-08-26 08:57:19.000000000 +0000
@@ -17,6 +17,7 @@
     :titlesonly:
 
     whatis
+    healthwarning
     initialsetup/index
 
     usingmame/index
diff -Nru mame-0.222+dfsg.1/docs/source/initialsetup/compilingmame.rst mame-0.224+dfsg.1/docs/source/initialsetup/compilingmame.rst
--- mame-0.222+dfsg.1/docs/source/initialsetup/compilingmame.rst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/source/initialsetup/compilingmame.rst	2020-08-26 08:57:19.000000000 +0000
@@ -75,7 +75,7 @@
   add **OSD=sdl** to the make options.  The main emulator binary will have an
   ``sdl`` prefix prepended (e.g. ``sdlmame64.exe`` or ``sdlmame.exe``).  You
   will need to install the MSYS2 packages for SDL 2 version 2.0.3 or later.
-* By default, MAME will include the native Windows debugger.  To also inculde
+* By default, MAME will include the native Windows debugger.  To also include
   the portable Qt debugger, add **USE_QTDEBUG=1** to the make options.  You
   will need to install the MSYS2 packages for Qt 5.
 
@@ -96,10 +96,13 @@
 * Install packages necessary to build MAME.  At the very least, you'll need
   ``bash``, ``git``, ``make``.
 * For 64-bit builds you'll need ``mingw-w64-x86_64-gcc`` and
-  ``mingw-w64-x86_64-python2``.
+  ``mingw-w64-x86_64-python``.
 * For 32-bit builds you'll need ``mingw-w64-i686-gcc`` and
-  ``mingw-w64-i686-python2``.
+  ``mingw-w64-i686-python``.
 * For debugging you may want to install ``gdb``.
+* To link using the LLVM linker (generally much faster than the GNU linker),
+  you'll need ``mingw-w64-x86_64-lld`` for 64-bit builds, or
+  ``mingw-w64-i686-lld`` for 32-bit builds.
 * To build against the portable SDL interfaces, you'll need
   ``mingw-w64-x86_64-SDL2`` and ``mingw-w64-x86_64-SDL2_ttf`` for 64-bit builds,
   or ``mingw-w64-i686-SDL2`` and ``mingw-w64-i686-SDL2_ttf`` for 32-bit builds.
@@ -139,7 +142,8 @@
 Fedora Linux
 ------------
 
-You'll need a few prerequisites from your distro. Make sure you get SDL2 2.0.3 or 2.0.4 as earlier versions are buggy.
+You'll need a few prerequisites from your Linux distribution.  Make sure you get
+SDL2 2.0.4 or later as earlier versions are buggy.
 
 **sudo dnf install gcc gcc-c++ SDL2-devel SDL2_ttf-devel libXi-devel libXinerama-devel qt5-qtbase-devel qt5-qttools expat-devel fontconfig-devel alsa-lib-devel**
 
@@ -151,7 +155,8 @@
 Debian and Ubuntu (including Raspberry Pi and ODROID devices)
 -------------------------------------------------------------
 
-You'll need a few prerequisites from your distro. Make sure you get SDL2 2.0.3 or 2.0.4 as earlier versions are buggy.
+You'll need a few prerequisites from your Linux distribution.  Make sure you get
+SDL2 2.0.4 or later as earlier versions are buggy.
 
 **sudo apt-get install git build-essential python libsdl2-dev libsdl2-ttf-dev libfontconfig-dev qt5-default**
 
@@ -175,7 +180,7 @@
 Apple Mac OS X
 --------------
 
-You'll need a few prerequisites to get started. Make sure you're on OS X 10.9 Mavericks or later. You will NEED SDL2 2.0.4 for OS X.
+You'll need a few prerequisites to get started. Make sure you're on OS X 10.9 Mavericks or later. You will need SDL2 2.0.4 or later for OS X.
 
 * Install **Xcode** from the Mac App Store
 * Launch **Xcode**. It will download a few additional prerequisites. Let this run through before proceeding.
@@ -492,6 +497,16 @@
 Unusual Build Configurations
 ----------------------------
 
+Linking using the LLVM linker
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The LLVM linker is generally faster than the GNU linker that GCC uses by
+default.  This is more pronounced on systems with a high overhead for file
+system operations (e.g. Microsoft Windows, or when compiling on a disk mounted
+over a network).  To use the LLVM linker with GCC, ensure the LLVM linker is
+installed and add ``-fuse-ld=lld`` to the linker options (e.g. in the
+**LDFLAGS** environment variable or in the **ARCHOPTS** setting).
+
 Cross-compiling MAME
 ~~~~~~~~~~~~~~~~~~~~
 
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/breadcrumbs.html mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/breadcrumbs.html
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/breadcrumbs.html	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/breadcrumbs.html	2020-08-26 08:57:19.000000000 +0000
@@ -1,24 +1,82 @@
+{# Support for Sphinx 1.3+ page_source_suffix, but don't break old builds. #}
+
+{% if page_source_suffix %}
+{% set suffix = page_source_suffix %}
+{% else %}
+{% set suffix = source_suffix %}
+{% endif %}
+
+{% if meta is defined and meta is not none %}
+{% set check_meta = True %}
+{% else %}
+{% set check_meta = False %}
+{% endif %}
+
+{% if check_meta and 'github_url' in meta %}
+{% set display_github = True %}
+{% endif %}
+
+{% if check_meta and 'bitbucket_url' in meta %}
+{% set display_bitbucket = True %}
+{% endif %}
+
+{% if check_meta and 'gitlab_url' in meta %}
+{% set display_gitlab = True %}
+{% endif %}
+
 <div role="navigation" aria-label="breadcrumbs navigation">
+
   <ul class="wy-breadcrumbs">
-    <li><a href="{{ pathto(master_doc) }}">Docs</a> &raquo;</li>
-      {% for doc in parents %}
+    {% block breadcrumbs %}
+      <li><a href="{{ pathto(master_doc) }}" class="icon icon-home"></a> &raquo;</li>
+        {% for doc in parents %}
           <li><a href="{{ doc.link|e }}">{{ doc.title }}</a> &raquo;</li>
-      {% endfor %}
-    <li>{{ title }}</li>
+        {% endfor %}
+      <li>{{ title }}</li>
+    {% endblock %}
+    {% block breadcrumbs_aside %}
       <li class="wy-breadcrumbs-aside">
-        {% if pagename != "search" %}
-          {% if display_github %}
-            <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/blob/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ source_suffix }}" class="fa fa-github"> Edit on GitHub</a>
+        {% if hasdoc(pagename) %}
+            {% if display_github %}
+            {% if check_meta and 'github_url' in meta %}
+              <!-- User defined GitHub URL -->
+              <a href="{{ meta['github_url'] }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
+            {% else %}
+              <a href="https://{{ github_host|default("github.com") }}/{{ github_user }}/{{ github_repo }}/{{ theme_vcs_pageview_mode|default("blob") }}/{{ github_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
+            {% endif %}
           {% elif display_bitbucket %}
-            <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ source_suffix }}" class="fa fa-bitbucket"> Edit on Bitbucket</a>
+            {% if check_meta and 'bitbucket_url' in meta %}
+              <!-- User defined Bitbucket URL -->
+              <a href="{{ meta['bitbucket_url'] }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
+            {% else %}
+              <a href="https://bitbucket.org/{{ bitbucket_user }}/{{ bitbucket_repo }}/src/{{ bitbucket_version}}{{ conf_py_path }}{{ pagename }}{{ suffix }}?mode={{ theme_vcs_pageview_mode|default("view") }}" class="fa fa-bitbucket"> {{ _('Edit on Bitbucket') }}</a>
+            {% endif %}
+          {% elif display_gitlab %}
+            {% if check_meta and 'gitlab_url' in meta %}
+              <!-- User defined GitLab URL -->
+              <a href="{{ meta['gitlab_url'] }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
+            {% else %}
+              <a href="https://{{ gitlab_host|default("gitlab.com") }}/{{ gitlab_user }}/{{ gitlab_repo }}/{{ theme_vcs_pageview_mode|default("blob") }}/{{ gitlab_version }}{{ conf_py_path }}{{ pagename }}{{ suffix }}" class="fa fa-gitlab"> {{ _('Edit on GitLab') }}</a>
+            {% endif %}
           {% elif show_source and source_url_prefix %}
-            <a href="{{ source_url_prefix }}{{ pagename }}{{ source_suffix }}">View page source</a>
+            <a href="{{ source_url_prefix }}{{ pagename }}{{ suffix }}">{{ _('View page source') }}</a>
           {% elif show_source and has_source and sourcename %}
-            <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> View page source</a>
+            <a href="{{ pathto('_sources/' + sourcename, true)|e }}" rel="nofollow"> {{ _('View page source') }}</a>
           {% endif %}
         {% endif %}
-		<a href="{{ edit_on_github_url }}" rel="nofollow"class="fa fa-github"> {{ _('Edit on GitHub') }}</a>
       </li>
+    {% endblock %}
   </ul>
+
+  {% if (theme_prev_next_buttons_location == 'top' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
+  <div class="rst-breadcrumbs-buttons" role="navigation" aria-label="breadcrumb navigation">
+      {% if next %}
+        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">{{ _('Next') }} <span class="fa fa-arrow-circle-right"></span></a>
+      {% endif %}
+      {% if prev %}
+        <a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left"></span> {{ _('Previous') }}</a>
+      {% endif %}
+  </div>
+  {% endif %}
   <hr/>
 </div>
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/footer.html mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/footer.html
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/footer.html	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/footer.html	2020-08-26 08:57:19.000000000 +0000
@@ -1,11 +1,11 @@
 <footer>
-  {% if next or prev %}
+  {% if (theme_prev_next_buttons_location == 'bottom' or theme_prev_next_buttons_location == 'both') and (next or prev) %}
     <div class="rst-footer-buttons" role="navigation" aria-label="footer navigation">
       {% if next %}
-        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n">Next <span class="fa fa-arrow-circle-right"></span></a>
+        <a href="{{ next.link|e }}" class="btn btn-neutral float-right" title="{{ next.title|striptags|e }}" accesskey="n" rel="next">{{ _('Next') }} <span class="fa fa-arrow-circle-right"></span></a>
       {% endif %}
       {% if prev %}
-        <a href="{{ prev.link|e }}" class="btn btn-neutral" title="{{ prev.title|striptags|e }}" accesskey="p"><span class="fa fa-arrow-circle-left"></span> Previous</a>
+        <a href="{{ prev.link|e }}" class="btn btn-neutral float-left" title="{{ prev.title|striptags|e }}" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left"></span> {{ _('Previous') }}</a>
       {% endif %}
     </div>
   {% endif %}
@@ -16,21 +16,47 @@
     <p>
     {%- if show_copyright %}
       {%- if hasdoc('copyright') %}
-        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
+        {% set path = pathto('copyright') %}
+        {% set copyright = copyright|e %}
+        &copy; <a href="{{ path }}">{% trans %}Copyright{% endtrans %}</a> {{ copyright }}
       {%- else %}
-        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
+        {% set copyright = copyright|e %}
+        &copy; {% trans %}Copyright{% endtrans %} {{ copyright }}
       {%- endif %}
     {%- endif %}
 
-    {%- if last_updated %}
-      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
+    {%- if build_id and build_url %}
+      <span class="build">
+        {# Translators: Build is a noun, not a verb #}
+        {% trans %}Build{% endtrans %}
+        <a href="{{ build_url }}">{{ build_id }}</a>.
+      </span>
+    {%- elif commit %}
+      <span class="commit">
+        {# Translators: the phrase "revision" comes from Git, referring to a commit #}
+        {% trans %}Revision{% endtrans %} <code>{{ commit }}</code>.
+      </span>
+    {%- elif last_updated %}
+      <span class="lastupdated">
+        {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
+      </span>
     {%- endif %}
+
     </p>
   </div>
 
   {%- if show_sphinx %}
-  {% trans %}Built with <a href="http://sphinx-doc.org/">Sphinx</a> using a <a href="https://github.com/snide/sphinx_rtd_theme">theme</a> provided by <a href="https://readthedocs.org">Read the Docs</a>{% endtrans %}.
+    {% set sphinx_web = '<a href="http://sphinx-doc.org/">Sphinx</a>' %}
+    {% set readthedocs_web = '<a href="https://readthedocs.org">Read the Docs</a>'  %}
+    {# Translators: the variable "sphinx_web" is a link to the Sphinx project documentation with the text "Sphinx" #}
+    {% trans sphinx_web=sphinx_web, readthedocs_web=readthedocs_web %}Built with {{ sphinx_web }} using a{% endtrans %}
+    {# Translators: "theme" refers to a theme for Sphinx, which alters the appearance of the generated documenation #}
+    <a href="https://github.com/rtfd/sphinx_rtd_theme">{% trans %}theme{% endtrans %}</a>
+    {# Translators: this is always used as "provided by Read the Docs", and should not imply Read the Docs is an author of the generated documentation. #}
+    {% trans %}provided by {{ readthedocs_web }}{% endtrans %}.
   {%- endif %}
 
+  {%- block extrafooter %} {% endblock %}
+
 </footer>
 
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/__init__.py mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/__init__.py
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/__init__.py	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/__init__.py	2020-08-26 08:57:19.000000000 +0000
@@ -1,17 +1,34 @@
-"""Sphinx ReadTheDocs theme.
+"""
+Sphinx Read the Docs theme.
 
 From https://github.com/ryan-roemer/sphinx-bootstrap-theme.
-
 """
-import os
 
-VERSION = (0, 1, 8)
+from os import path
+
+import sphinx
+
 
-__version__ = ".".join(str(v) for v in VERSION)
+__version__ = '0.5.0'
 __version_full__ = __version__
 
 
 def get_html_theme_path():
     """Return list of HTML theme paths."""
-    cur_dir = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))
+    cur_dir = path.abspath(path.dirname(path.dirname(__file__)))
     return cur_dir
+
+
+# See http://www.sphinx-doc.org/en/stable/theming.html#distribute-your-theme-as-a-python-package
+def setup(app):
+    if sphinx.version_info >= (1, 6, 0):
+        # Register the theme that can be referenced without adding a theme path
+        app.add_html_theme('sphinx_rtd_theme', path.abspath(path.dirname(__file__)))
+
+    if sphinx.version_info >= (1, 8, 0):
+        # Add Sphinx message catalog for newer versions of Sphinx
+        # See http://www.sphinx-doc.org/en/master/extdev/appapi.html#sphinx.application.Sphinx.add_message_catalog
+        rtd_locale_path = path.join(path.abspath(path.dirname(__file__)), 'locale')
+        app.add_message_catalog('sphinx', rtd_locale_path)
+
+    return {'parallel_read_safe': True, 'parallel_write_safe': True}
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/layout.html mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/layout.html
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/layout.html	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/layout.html	2020-08-26 08:57:19.000000000 +0000
@@ -6,10 +6,11 @@
 {%- else %}
   {%- set titlesuffix = "" %}
 {%- endif %}
+{%- set lang_attr = 'en' if language == None else (language | replace('_', '-')) %}
+{%- set sphinx_writer = 'writer-html5' if html5_doctype else 'writer-html4' %}
 
 <!DOCTYPE html>
-<!--[if IE 8]><html class="no-js lt-ie9" lang="en" > <![endif]-->
-<!--[if gt IE 8]><!--> <html class="no-js" lang="en" > <!--<![endif]-->
+<html class="{{ sphinx_writer }}" lang="{{ lang_attr }}" >
 <head>
   <meta charset="utf-8">
   {{ metatags }}
@@ -18,125 +19,192 @@
   <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
   {% endblock %}
 
+  {# CSS #}
+  <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
+  <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
+  {%- for css in css_files %}
+    {%- if css|attr("rel") %}
+  <link rel="{{ css.rel }}" href="{{ pathto(css.filename, 1) }}" type="text/css"{% if css.title is not none %} title="{{ css.title }}"{% endif %} />
+    {%- else %}
+  <link rel="stylesheet" href="{{ pathto(css, 1) }}" type="text/css" />
+    {%- endif %}
+  {%- endfor %}
+
+  {%- for cssfile in extra_css_files %}
+    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
+  {%- endfor %}
+
   {# FAVICON #}
   {% if favicon %}
     <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
   {% endif %}
-
-  {# CSS #}
-
-  {# OPENSEARCH #}
-  {% if not embedded %}
-    {% if use_opensearch %}
-      <link rel="search" type="application/opensearchdescription+xml" title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}" href="{{ pathto('_static/opensearch.xml', 1) }}"/>
+  {# CANONICAL URL #}
+  {% if theme_canonical_url %}
+    <link rel="canonical" href="{{ theme_canonical_url }}{{ pagename }}.html"/>
+  {% endif %}
+
+  {# JAVASCRIPTS #}
+  {%- block scripts %}
+  <!--[if lt IE 9]>
+    <script src="{{ pathto('_static/js/html5shiv.min.js', 1) }}"></script>
+  <![endif]-->
+  {%- if not embedded %}
+  {# XXX Sphinx 1.8.0 made this an external js-file, quick fix until we refactor the template to inherert more blocks directly from sphinx #}
+    {% if sphinx_version >= "1.8.0" %}
+      <script type="text/javascript" id="documentation_options" data-url_root="{{ pathto('', 1) }}" src="{{ pathto('_static/documentation_options.js', 1) }}"></script>
+      {%- for scriptfile in script_files %}
+        {{ js_tag(scriptfile) }}
+      {%- endfor %}
+    {% else %}
+      <script type="text/javascript">
+          var DOCUMENTATION_OPTIONS = {
+              URL_ROOT:'{{ url_root }}',
+              VERSION:'{{ release|e }}',
+              LANGUAGE:'{{ language }}',
+              COLLAPSE_INDEX:false,
+              FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
+              HAS_SOURCE:  {{ has_source|lower }},
+              SOURCELINK_SUFFIX: '{{ sourcelink_suffix }}'
+          };
+      </script>
+      {%- for scriptfile in script_files %}
+        <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
+      {%- endfor %}
     {% endif %}
+    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
 
-  {% endif %}
-
-  {# RTD hosts this file, so just load on non RTD builds #}
-  {% if not READTHEDOCS %}
-    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-  {% endif %}
-
-  {% for cssfile in css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-  {% endfor %}
-
-  {% for cssfile in extra_css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-  {% endfor %}
+    {# OPENSEARCH #}
+    {%- if use_opensearch %}
+    <link rel="search" type="application/opensearchdescription+xml"
+          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
+          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
+    {%- endif %}
+  {%- endif %}
+  {%- endblock %}
 
   {%- block linktags %}
     {%- if hasdoc('about') %}
-        <link rel="author" title="{{ _('About these documents') }}"
-              href="{{ pathto('about') }}"/>
+    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
     {%- endif %}
     {%- if hasdoc('genindex') %}
-        <link rel="index" title="{{ _('Index') }}"
-              href="{{ pathto('genindex') }}"/>
+    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
     {%- endif %}
     {%- if hasdoc('search') %}
-        <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}"/>
+    <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
     {%- endif %}
     {%- if hasdoc('copyright') %}
-        <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}"/>
-    {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}"/>
-    {%- if parents %}
-        <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}"/>
+    <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
     {%- endif %}
     {%- if next %}
-        <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}"/>
+    <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}" />
     {%- endif %}
     {%- if prev %}
-        <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}"/>
+    <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
     {%- endif %}
   {%- endblock %}
   {%- block extrahead %} {% endblock %}
-
-  {# Keep modernizr in head - http://modernizr.com/docs/#installing #}
-  <script src="_static/js/modernizr.min.js"></script>
-
 </head>
 
-<body class="wy-body-for-nav" role="document">
+<body class="wy-body-for-nav">
 
+  {% block extrabody %} {% endblock %}
   <div class="wy-grid-for-nav">
-
     {# SIDE NAV, TOGGLES ON MOBILE #}
     <nav data-toggle="wy-nav-shift" class="wy-nav-side">
-      <div class="wy-side-nav-search">
-        {% block sidebartitle %}
+      <div class="wy-side-scroll">
+        <div class="wy-side-nav-search" {% if theme_style_nav_header_background %} style="background: {{theme_style_nav_header_background}}" {% endif %}>
+          {% block sidebartitle %}
 
-        {% if logo and theme_logo_only %}
-          <a href="{{ pathto(master_doc) }}">
-        {% else %}
-          <a href="{{ pathto(master_doc) }}" class="icon icon-home"> {{ project }}
-        {% endif %}
+          {% if logo and theme_logo_only %}
+            <a href="{{ pathto(master_doc) }}">
+          {% else %}
+            <a href="{{ pathto(master_doc) }}" class="icon icon-home" alt="{{ _("Documentation Home") }}"> {{ project }}
+          {% endif %}
 
-        {% if logo %}
-          {# Not strictly valid HTML, but it's the only way to display/scale it properly, without weird scripting or heaps of work #}
-          <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" />
-        {% endif %}
-        </a>
-		<br/><a href="/_files/MAME.pdf">PDF</a>&nbsp;&nbsp;<a href="/_files/MAME.epub">EPUB</a>
-        {% include "searchbox.html" %}
+          {% if logo %}
+            {# Not strictly valid HTML, but it's the only way to display/scale
+               it properly, without weird scripting or heaps of work
+            #}
+            <img src="{{ pathto('_static/' + logo, 1) }}" class="logo" alt="{{ _('Logo') }}"/>
+          {% endif %}
+          </a>
 
-        {% endblock %}
-      </div>
+          {% if theme_display_version %}
+            {%- set nav_version = version %}
+            {% if READTHEDOCS and current_version %}
+              {%- set nav_version = current_version %}
+            {% endif %}
+            {% if nav_version %}
+              <div class="version">
+                {{ nav_version }}
+              </div>
+            {% endif %}
+          {% endif %}
 
-      <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
-        {% block menu %}
-          {% set toctree = toctree(maxdepth=4, collapse=False, includehidden=True) %}
-          {% if toctree %}
-              {{ toctree }}
-          {% else %}
+          {% include "searchbox.html" %}
+
+          {% endblock %}
+        </div>
+
+        {% block navigation %}
+        <div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="main navigation">
+          {% block menu %}
+            {#
+              The singlehtml builder doesn't handle this toctree call when the
+              toctree is empty. Skip building this for now.
+            #}
+            {% if 'singlehtml' not in builder %}
+              {% set global_toc = toctree(maxdepth=theme_navigation_depth|int,
+                                          collapse=theme_collapse_navigation|tobool,
+                                          includehidden=theme_includehidden|tobool,
+                                          titles_only=theme_titles_only|tobool) %}
+            {% endif %}
+            {% if global_toc %}
+              {{ global_toc }}
+            {% else %}
               <!-- Local TOC -->
               <div class="local-toc">{{ toc }}</div>
-          {% endif %}
+            {% endif %}
+          {% endblock %}
+        </div>
         {% endblock %}
       </div>
-      &nbsp;
     </nav>
 
     <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap">
 
       {# MOBILE NAV, TRIGGLES SIDE NAV ON TOGGLE #}
-      <nav class="wy-nav-top" role="navigation" aria-label="top navigation">
-        <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
-        <a href="{{ pathto(master_doc) }}">{{ project }}</a>
+      <nav class="wy-nav-top" aria-label="top navigation">
+        {% block mobile_nav %}
+          <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+          <a href="{{ pathto(master_doc) }}">{{ project }}</a>
+        {% endblock %}
       </nav>
 
 
-      {# PAGE CONTENT #}
       <div class="wy-nav-content">
+      {%- block content %}
+        {% if theme_style_external_links|tobool %}
+        <div class="rst-content style-external-links">
+        {% else %}
         <div class="rst-content">
+        {% endif %}
           {% include "breadcrumbs.html" %}
-          <div role="main" class="document">
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+          {%- block document %}
+           <div itemprop="articleBody">
             {% block body %}{% endblock %}
+           </div>
+           {% if self.comments()|trim %}
+           <div class="articleComments">
+            {% block comments %}{% endblock %}
+           </div>
+           {% endif%}
           </div>
+          {%- endblock %}
           {% include "footer.html" %}
         </div>
+      {%- endblock %}
       </div>
 
     </section>
@@ -144,35 +212,27 @@
   </div>
   {% include "versions.html" %}
 
-  {% if not embedded %}
-
-    <script type="text/javascript">
-        var DOCUMENTATION_OPTIONS = {
-            URL_ROOT:'{{ url_root }}',
-            VERSION:'{{ release|e }}',
-            COLLAPSE_INDEX:false,
-            FILE_SUFFIX:'{{ '' if no_search_suffix else file_suffix }}',
-            HAS_SOURCE:  {{ has_source|lower }}
-        };
-    </script>
-    {%- for scriptfile in script_files %}
-      <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-    {%- endfor %}
-
-  {% endif %}
-
-  {# RTD hosts this file, so just load on non RTD builds #}
-  {% if not READTHEDOCS %}
-    <script type="text/javascript" src="{{ pathto('_static/js/theme.js', 1) }}"></script>
-  {% endif %}
-
-  {# STICKY NAVIGATION #}
-  {% if theme_sticky_navigation %}
   <script type="text/javascript">
       jQuery(function () {
-          SphinxRtdTheme.StickyNav.enable();
+          SphinxRtdTheme.Navigation.enable({{ 'true' if theme_sticky_navigation|tobool else 'false' }});
       });
   </script>
+
+  {# Do not conflict with RTD insertion of analytics script #}
+  {% if not READTHEDOCS %}
+    {% if theme_analytics_id %}
+    <!-- Theme Analytics -->
+    <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', '{{ theme_analytics_id }}', 'auto');
+    ga('send', 'pageview');
+    </script>
+
+    {% endif %}
   {% endif %}
 
   {%- block footer %} {% endblock %}
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/layout_old.html mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/layout_old.html
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/layout_old.html	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/layout_old.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,205 +0,0 @@
-{#
-    basic/layout.html
-    ~~~~~~~~~~~~~~~~~
-
-    Master layout template for Sphinx themes.
-
-    :copyright: Copyright 2007-2013 by the Sphinx team, see AUTHORS.
-    :license: BSD, see LICENSE for details.
-#}
-{%- block doctype -%}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-{%- endblock %}
-{%- set reldelim1 = reldelim1 is not defined and ' &raquo;' or reldelim1 %}
-{%- set reldelim2 = reldelim2 is not defined and ' |' or reldelim2 %}
-{%- set render_sidebar = (not embedded) and (not theme_nosidebar|tobool) and
-                         (sidebars != []) %}
-{%- set url_root = pathto('', 1) %}
-{# XXX necessary? #}
-{%- if url_root == '#' %}{% set url_root = '' %}{% endif %}
-{%- if not embedded and docstitle %}
-  {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
-{%- else %}
-  {%- set titlesuffix = "" %}
-{%- endif %}
-
-{%- macro relbar() %}
-    <div class="related">
-      <h3>{{ _('Navigation') }}</h3>
-      <ul>
-        {%- for rellink in rellinks %}
-        <li class="right" {% if loop.first %}style="margin-right: 10px"{% endif %}>
-          <a href="{{ pathto(rellink[0]) }}" title="{{ rellink[1]|striptags|e }}"
-             {{ accesskey(rellink[2]) }}>{{ rellink[3] }}</a>
-          {%- if not loop.first %}{{ reldelim2 }}{% endif %}</li>
-        {%- endfor %}
-        {%- block rootrellink %}
-        <li><a href="{{ pathto(master_doc) }}">{{ shorttitle|e }}</a>{{ reldelim1 }}</li>
-        {%- endblock %}
-        {%- for parent in parents %}
-          <li><a href="{{ parent.link|e }}" {% if loop.last %}{{ accesskey("U") }}{% endif %}>{{ parent.title }}</a>{{ reldelim1 }}</li>
-        {%- endfor %}
-        {%- block relbaritems %} {% endblock %}
-      </ul>
-    </div>
-{%- endmacro %}
-
-{%- macro sidebar() %}
-      {%- if render_sidebar %}
-      <div class="sphinxsidebar">
-        <div class="sphinxsidebarwrapper">
-          {%- block sidebarlogo %}
-          {%- if logo %}
-            <p class="logo"><a href="{{ pathto(master_doc) }}">
-              <img class="logo" src="{{ pathto('_static/' + logo, 1) }}" alt="Logo"/>
-            </a></p>
-          {%- endif %}
-          {%- endblock %}
-          {%- if sidebars != None %}
-            {#- new style sidebar: explicitly include/exclude templates #}
-            {%- for sidebartemplate in sidebars %}
-            {%- include sidebartemplate %}
-            {%- endfor %}
-          {%- else %}
-            {#- old style sidebars: using blocks -- should be deprecated #}
-            {%- block sidebartoc %}
-            {%- include "localtoc.html" %}
-            {%- endblock %}
-            {%- block sidebarrel %}
-            {%- include "relations.html" %}
-            {%- endblock %}
-            {%- block sidebarsourcelink %}
-            {%- include "sourcelink.html" %}
-            {%- endblock %}
-            {%- if customsidebar %}
-            {%- include customsidebar %}
-            {%- endif %}
-            {%- block sidebarsearch %}
-            {%- include "searchbox.html" %}
-            {%- endblock %}
-          {%- endif %}
-        </div>
-      </div>
-      {%- endif %}
-{%- endmacro %}
-
-{%- macro script() %}
-    <script type="text/javascript">
-      var DOCUMENTATION_OPTIONS = {
-        URL_ROOT:    '{{ url_root }}',
-        VERSION:     '{{ release|e }}',
-        COLLAPSE_INDEX: false,
-        FILE_SUFFIX: '{{ '' if no_search_suffix else file_suffix }}',
-        HAS_SOURCE:  {{ has_source|lower }}
-      };
-    </script>
-    {%- for scriptfile in script_files %}
-    <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
-    {%- endfor %}
-{%- endmacro %}
-
-{%- macro css() %}
-    <link rel="stylesheet" href="{{ pathto('_static/' + style, 1) }}" type="text/css" />
-    <link rel="stylesheet" href="{{ pathto('_static/pygments.css', 1) }}" type="text/css" />
-    {%- for cssfile in css_files %}
-    <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-    {%- endfor %}
-{%- endmacro %}
-
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset={{ encoding }}" />
-    {{ metatags }}
-    {%- block htmltitle %}
-    <title>{{ title|striptags|e }}{{ titlesuffix }}</title>
-    {%- endblock %}
-    {{ css() }}
-    {%- if not embedded %}
-    {{ script() }}
-    {%- if use_opensearch %}
-    <link rel="search" type="application/opensearchdescription+xml"
-          title="{% trans docstitle=docstitle|e %}Search within {{ docstitle }}{% endtrans %}"
-          href="{{ pathto('_static/opensearch.xml', 1) }}"/>
-    {%- endif %}
-    {%- if favicon %}
-    <link rel="shortcut icon" href="{{ pathto('_static/' + favicon, 1) }}"/>
-    {%- endif %}
-    {%- endif %}
-{%- block linktags %}
-    {%- if hasdoc('about') %}
-    <link rel="author" title="{{ _('About these documents') }}" href="{{ pathto('about') }}" />
-    {%- endif %}
-    {%- if hasdoc('genindex') %}
-    <link rel="index" title="{{ _('Index') }}" href="{{ pathto('genindex') }}" />
-    {%- endif %}
-    {%- if hasdoc('search') %}
-    <link rel="search" title="{{ _('Search') }}" href="{{ pathto('search') }}" />
-    {%- endif %}
-    {%- if hasdoc('copyright') %}
-    <link rel="copyright" title="{{ _('Copyright') }}" href="{{ pathto('copyright') }}" />
-    {%- endif %}
-    <link rel="top" title="{{ docstitle|e }}" href="{{ pathto('index') }}" />
-    {%- if parents %}
-    <link rel="up" title="{{ parents[-1].title|striptags|e }}" href="{{ parents[-1].link|e }}" />
-    {%- endif %}
-    {%- if next %}
-    <link rel="next" title="{{ next.title|striptags|e }}" href="{{ next.link|e }}" />
-    {%- endif %}
-    {%- if prev %}
-    <link rel="prev" title="{{ prev.title|striptags|e }}" href="{{ prev.link|e }}" />
-    {%- endif %}
-{%- endblock %}
-{%- block extrahead %} {% endblock %}
-  </head>
-  <body>
-{%- block header %}{% endblock %}
-
-{%- block relbar1 %}{{ relbar() }}{% endblock %}
-
-{%- block content %}
-  {%- block sidebar1 %} {# possible location for sidebar #} {% endblock %}
-
-    <div class="document">
-  {%- block document %}
-      <div class="documentwrapper">
-      {%- if render_sidebar %}
-        <div class="bodywrapper">
-      {%- endif %}
-          <div class="body">
-            {% block body %} {% endblock %}
-          </div>
-      {%- if render_sidebar %}
-        </div>
-      {%- endif %}
-      </div>
-  {%- endblock %}
-
-  {%- block sidebar2 %}{{ sidebar() }}{% endblock %}
-      <div class="clearer"></div>
-    </div>
-{%- endblock %}
-
-{%- block relbar2 %}{{ relbar() }}{% endblock %}
-
-{%- block footer %}
-    <div class="footer">
-    {%- if show_copyright %}
-      {%- if hasdoc('copyright') %}
-        {% trans path=pathto('copyright'), copyright=copyright|e %}&copy; <a href="{{ path }}">Copyright</a> {{ copyright }}.{% endtrans %}
-      {%- else %}
-        {% trans copyright=copyright|e %}&copy; Copyright {{ copyright }}.{% endtrans %}
-      {%- endif %}
-    {%- endif %}
-    {%- if last_updated %}
-      {% trans last_updated=last_updated|e %}Last updated on {{ last_updated }}.{% endtrans %}
-    {%- endif %}
-    {%- if show_sphinx %}
-      {% trans sphinx_version=sphinx_version|e %}Created using <a href="http://sphinx-doc.org/">Sphinx</a> {{ sphinx_version }}.{% endtrans %}
-    {%- endif %}
-    </div>
-    <p>asdf asdf asdf asdf 22</p>
-{%- endblock %}
-  </body>
-</html>
-
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/de/LC_MESSAGES/sphinx.po	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,143 @@
+# English translations for sphinx_rtd_theme.
+# Copyright (C) 2019 ORGANIZATION
+# This file is distributed under the same license as the sphinx_rtd_theme
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# 
+# Translators:
+# Tom Kunze <transifex.com@tomabrafix.de>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-06 13:38-0600\n"
+"PO-Revision-Date: 2019-07-16 21:44+0000\n"
+"Last-Translator: Tom Kunze <transifex.com@tomabrafix.de>, 2019\n"
+"Language-Team: German (https://www.transifex.com/readthedocs/teams/101354/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
+msgid "Edit on GitHub"
+msgstr "Auf GitHub bearbeiten"
+
+#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
+msgid "Edit on Bitbucket"
+msgstr "Auf Bitbucket bearbeiten"
+
+#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
+msgid "Edit on GitLab"
+msgstr "Auf GitLab bearbeiten"
+
+#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
+msgid "View page source"
+msgstr "Quelltext anzeigen"
+
+#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
+msgid "Next"
+msgstr "Weiter"
+
+#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
+msgid "Previous"
+msgstr "Zurück"
+
+#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
+#: sphinx_rtd_theme/layout.html:96
+msgid "Copyright"
+msgstr "Copyright"
+
+#. Build is a noun, not a verb
+#: sphinx_rtd_theme/footer.html:31
+msgid "Build"
+msgstr "Build"
+
+#: sphinx_rtd_theme/footer.html:41
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "Zuletzt aktualisiert am %(last_updated)s."
+
+#. the variable "sphinx_web" is a link to the Sphinx project documentation
+#. with
+#. the text "Sphinx"
+#: sphinx_rtd_theme/footer.html:52
+#, python-format
+msgid "Built with %(sphinx_web)s using a"
+msgstr "Erstellt mit %(sphinx_web)s mit einem"
+
+#. this is always used as "provided by Read the Docs", and should not imply
+#. Read the Docs is an author of the generated documentation.
+#: sphinx_rtd_theme/footer.html:56
+#, python-format
+msgid "provided by %(readthedocs_web)s"
+msgstr "bereitgestellt von %(readthedocs_web)s"
+
+#: sphinx_rtd_theme/layout.html:79
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "%(docstitle)s durchsuchen"
+
+#: sphinx_rtd_theme/layout.html:87
+msgid "About these documents"
+msgstr "Über diese Dokumentation"
+
+#: sphinx_rtd_theme/layout.html:90
+msgid "Index"
+msgstr "Index"
+
+#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
+msgid "Search"
+msgstr "Suche"
+
+#: sphinx_rtd_theme/layout.html:128
+msgid "Logo"
+msgstr "Logo"
+
+#: sphinx_rtd_theme/search.html:29
+msgid "Please activate JavaScript to enable the search functionality."
+msgstr "Bitte aktiviere JavaScript, um die Suchfunktion zu nutzen."
+
+#. Search is a noun, not a verb
+#: sphinx_rtd_theme/search.html:37
+msgid "Search Results"
+msgstr "Suchergebnisse"
+
+#: sphinx_rtd_theme/search.html:39
+msgid ""
+"Your search did not match any documents. Please make sure that all words are"
+" spelled correctly and that you've selected enough categories."
+msgstr ""
+"Es wurden keine mit deiner Suchanfrage übereinstimmenden Dokumente gefunden."
+" Achte darauf, dass alle Wörter richtig geschrieben sind und dass genug "
+"Kategorien ausgewählt sind."
+
+#: sphinx_rtd_theme/searchbox.html:4
+msgid "Search docs"
+msgstr "Dokumentation durchsuchen"
+
+#: sphinx_rtd_theme/versions.html:11
+msgid "Versions"
+msgstr "Versionen"
+
+#. The phrase "Read the Docs" is not translated
+#: sphinx_rtd_theme/versions.html:24
+msgid "On Read the Docs"
+msgstr "Auf Read the Docs"
+
+#: sphinx_rtd_theme/versions.html:26
+msgid "Project Home"
+msgstr "Projektübersicht"
+
+#: sphinx_rtd_theme/versions.html:29
+msgid "Builds"
+msgstr "Builds"
+
+#~ msgid "Docs"
+#~ msgstr "Dokumentation"
+
+#~ msgid "Free document hosting provided by"
+#~ msgstr "Kostenloses Dokumentationen-Hosting zur Verfügung gestellt von"
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/en/LC_MESSAGES/sphinx.po	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,156 @@
+# English translations for sphinx_rtd_theme.
+# Copyright (C) 2019 ORGANIZATION
+# This file is distributed under the same license as the sphinx_rtd_theme
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-06 13:38-0600\n"
+"PO-Revision-Date: 2019-07-16 15:43-0600\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language: en\n"
+"Language-Team: en <LL@li.org>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+
+#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
+msgid "Edit on GitHub"
+msgstr ""
+
+#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
+msgid "Edit on Bitbucket"
+msgstr ""
+
+#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
+msgid "Edit on GitLab"
+msgstr ""
+
+#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
+msgid "View page source"
+msgstr ""
+
+#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
+msgid "Next"
+msgstr ""
+
+#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
+msgid "Previous"
+msgstr ""
+
+#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
+#: sphinx_rtd_theme/layout.html:96
+msgid "Copyright"
+msgstr ""
+
+#. Build is a noun, not a verb
+#: sphinx_rtd_theme/footer.html:31
+msgid "Build"
+msgstr ""
+
+#. the phrase "revision" comes from Git, referring to a commit
+#: sphinx_rtd_theme/footer.html:37
+msgid "Revision"
+msgstr ""
+
+#: sphinx_rtd_theme/footer.html:41
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr ""
+
+#. the variable "sphinx_web" is a link to the Sphinx project documentation with
+#. the text "Sphinx"
+#: sphinx_rtd_theme/footer.html:52
+#, python-format
+msgid "Built with %(sphinx_web)s using a"
+msgstr ""
+
+#. "theme" refers to a theme for Sphinx, which alters the appearance of the
+#. generated documenation
+#: sphinx_rtd_theme/footer.html:54
+msgid "theme"
+msgstr ""
+
+#. this is always used as "provided by Read the Docs", and should not imply
+#. Read the Docs is an author of the generated documentation.
+#: sphinx_rtd_theme/footer.html:56
+#, python-format
+msgid "provided by %(readthedocs_web)s"
+msgstr ""
+
+#: sphinx_rtd_theme/layout.html:79
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr ""
+
+#: sphinx_rtd_theme/layout.html:87
+msgid "About these documents"
+msgstr ""
+
+#: sphinx_rtd_theme/layout.html:90
+msgid "Index"
+msgstr ""
+
+#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
+msgid "Search"
+msgstr ""
+
+#: sphinx_rtd_theme/layout.html:121
+msgid "Documentation Home"
+msgstr ""
+
+#: sphinx_rtd_theme/layout.html:128
+msgid "Logo"
+msgstr ""
+
+#: sphinx_rtd_theme/search.html:29
+msgid "Please activate JavaScript to enable the search functionality."
+msgstr ""
+
+#. Search is a noun, not a verb
+#: sphinx_rtd_theme/search.html:37
+msgid "Search Results"
+msgstr ""
+
+#: sphinx_rtd_theme/search.html:39
+msgid ""
+"Your search did not match any documents. Please make sure that all words "
+"are spelled correctly and that you've selected enough categories."
+msgstr ""
+
+#: sphinx_rtd_theme/searchbox.html:4
+msgid "Search docs"
+msgstr ""
+
+#: sphinx_rtd_theme/versions.html:11
+msgid "Versions"
+msgstr ""
+
+#: sphinx_rtd_theme/versions.html:17
+msgid "Downloads"
+msgstr ""
+
+#. The phrase "Read the Docs" is not translated
+#: sphinx_rtd_theme/versions.html:24
+msgid "On Read the Docs"
+msgstr ""
+
+#: sphinx_rtd_theme/versions.html:26
+msgid "Project Home"
+msgstr ""
+
+#: sphinx_rtd_theme/versions.html:29
+msgid "Builds"
+msgstr ""
+
+#~ msgid "Docs"
+#~ msgstr ""
+
+#~ msgid "Free document hosting provided by"
+#~ msgstr ""
+
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/es/LC_MESSAGES/sphinx.po	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,164 @@
+# English translations for sphinx_rtd_theme.
+# Copyright (C) 2019 ORGANIZATION
+# This file is distributed under the same license as the sphinx_rtd_theme
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# 
+# Translators:
+# Anthony <aj@ohess.org>, 2019
+# Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-06 13:38-0600\n"
+"PO-Revision-Date: 2019-07-16 21:44+0000\n"
+"Last-Translator: Leonardo J. Caballero G. <leonardocaballero@gmail.com>, 2020\n"
+"Language-Team: Spanish (https://www.transifex.com/readthedocs/teams/101354/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
+msgid "Edit on GitHub"
+msgstr "Editar en GitHub"
+
+#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
+msgid "Edit on Bitbucket"
+msgstr "Editar en Bitbucket"
+
+#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
+msgid "Edit on GitLab"
+msgstr "Editar en GitLab"
+
+#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
+msgid "View page source"
+msgstr "Ver código fuente de la página"
+
+#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
+msgid "Next"
+msgstr "Siguiente"
+
+#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
+msgid "Previous"
+msgstr "Anterior"
+
+#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
+#: sphinx_rtd_theme/layout.html:96
+msgid "Copyright"
+msgstr "Derechos de autor"
+
+#. Build is a noun, not a verb
+#: sphinx_rtd_theme/footer.html:31
+msgid "Build"
+msgstr "Construido"
+
+#. the phrase "revision" comes from Git, referring to a commit
+#: sphinx_rtd_theme/footer.html:37
+msgid "Revision"
+msgstr "Revisión"
+
+#: sphinx_rtd_theme/footer.html:41
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "Actualizado por última vez en %(last_updated)s."
+
+#. the variable "sphinx_web" is a link to the Sphinx project documentation
+#. with
+#. the text "Sphinx"
+#: sphinx_rtd_theme/footer.html:52
+#, python-format
+msgid "Built with %(sphinx_web)s using a"
+msgstr "Construido con %(sphinx_web)s usando un"
+
+#. "theme" refers to a theme for Sphinx, which alters the appearance of the
+#. generated documenation
+#: sphinx_rtd_theme/footer.html:54
+msgid "theme"
+msgstr "tema"
+
+#. this is always used as "provided by Read the Docs", and should not imply
+#. Read the Docs is an author of the generated documentation.
+#: sphinx_rtd_theme/footer.html:56
+#, python-format
+msgid "provided by %(readthedocs_web)s"
+msgstr "proporcionado por %(readthedocs_web)s"
+
+#: sphinx_rtd_theme/layout.html:79
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "Buscar en %(docstitle)s"
+
+#: sphinx_rtd_theme/layout.html:87
+msgid "About these documents"
+msgstr "Sobre esta documentación"
+
+#: sphinx_rtd_theme/layout.html:90
+msgid "Index"
+msgstr "Índice"
+
+#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
+msgid "Search"
+msgstr "Búsqueda"
+
+#: sphinx_rtd_theme/layout.html:121
+msgid "Documentation Home"
+msgstr "Inicio de Documentación"
+
+#: sphinx_rtd_theme/layout.html:128
+msgid "Logo"
+msgstr "Logotipo"
+
+#: sphinx_rtd_theme/search.html:29
+msgid "Please activate JavaScript to enable the search functionality."
+msgstr ""
+"Por favor, active JavaScript para habilitar la funcionalidad de búsqueda."
+
+#. Search is a noun, not a verb
+#: sphinx_rtd_theme/search.html:37
+msgid "Search Results"
+msgstr "Resultados de la búsqueda"
+
+#: sphinx_rtd_theme/search.html:39
+msgid ""
+"Your search did not match any documents. Please make sure that all words are"
+" spelled correctly and that you've selected enough categories."
+msgstr ""
+"Su búsqueda no coincide con ningún documento. Por favor, asegúrese de que "
+"todas las palabras estén correctamente escritas y que usted haya "
+"seleccionado las suficientes categorías."
+
+#: sphinx_rtd_theme/searchbox.html:4
+msgid "Search docs"
+msgstr "Buscar documentos"
+
+#: sphinx_rtd_theme/versions.html:11
+msgid "Versions"
+msgstr "Versiones"
+
+#: sphinx_rtd_theme/versions.html:17
+msgid "Downloads"
+msgstr "Descargas"
+
+#. The phrase "Read the Docs" is not translated
+#: sphinx_rtd_theme/versions.html:24
+msgid "On Read the Docs"
+msgstr "En Read the Docs"
+
+#: sphinx_rtd_theme/versions.html:26
+msgid "Project Home"
+msgstr "Página de Proyecto"
+
+#: sphinx_rtd_theme/versions.html:29
+msgid "Builds"
+msgstr "Construcciones"
+
+#~ msgid "Docs"
+#~ msgstr "Documentos"
+
+#~ msgid "Free document hosting provided by"
+#~ msgstr "Alojamiento gratuito de documentos proporcionado por"
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/et/LC_MESSAGES/sphinx.po	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,155 @@
+# English translations for sphinx_rtd_theme.
+# Copyright (C) 2019 ORGANIZATION
+# This file is distributed under the same license as the sphinx_rtd_theme
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# 
+# Translators:
+# Anthony <aj@ohess.org>, 2020
+# Ivar Smolin <okul@linux.ee>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-06 13:38-0600\n"
+"PO-Revision-Date: 2019-07-16 21:44+0000\n"
+"Last-Translator: Ivar Smolin <okul@linux.ee>, 2020\n"
+"Language-Team: Estonian (https://www.transifex.com/readthedocs/teams/101354/et/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
+msgid "Edit on GitHub"
+msgstr "Muuda GitHubis"
+
+#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
+msgid "Edit on Bitbucket"
+msgstr "Muuda Bitbucketis"
+
+#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
+msgid "Edit on GitLab"
+msgstr "Muuda GitLabis"
+
+#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
+msgid "View page source"
+msgstr "Vaata lehe lähtekoodi"
+
+#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
+msgid "Next"
+msgstr "Järgmine"
+
+#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
+msgid "Previous"
+msgstr "Eelmine"
+
+#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
+#: sphinx_rtd_theme/layout.html:96
+msgid "Copyright"
+msgstr "Autoriõigus"
+
+#. Build is a noun, not a verb
+#: sphinx_rtd_theme/footer.html:31
+msgid "Build"
+msgstr "Ehitus"
+
+#. the phrase "revision" comes from Git, referring to a commit
+#: sphinx_rtd_theme/footer.html:37
+msgid "Revision"
+msgstr "Redaktsioon"
+
+#: sphinx_rtd_theme/footer.html:41
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "Viimati uuendatud  %(last_updated)s."
+
+#. the variable "sphinx_web" is a link to the Sphinx project documentation
+#. with
+#. the text "Sphinx"
+#: sphinx_rtd_theme/footer.html:52
+#, python-format
+msgid "Built with %(sphinx_web)s using a"
+msgstr "Ehitatud %(sphinx_web)s'iga,"
+
+#. "theme" refers to a theme for Sphinx, which alters the appearance of the
+#. generated documenation
+#: sphinx_rtd_theme/footer.html:54
+msgid "theme"
+msgstr "kujundusteema"
+
+#: sphinx_rtd_theme/layout.html:79
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "Otsi dokumendist %(docstitle)s"
+
+#: sphinx_rtd_theme/layout.html:87
+msgid "About these documents"
+msgstr "Nende dokumentide kirjeldused"
+
+#: sphinx_rtd_theme/layout.html:90
+msgid "Index"
+msgstr "Indeks"
+
+#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
+msgid "Search"
+msgstr "Otsing"
+
+#: sphinx_rtd_theme/layout.html:121
+msgid "Documentation Home"
+msgstr "Dokumentatsiooni kodu"
+
+#: sphinx_rtd_theme/layout.html:128
+msgid "Logo"
+msgstr "Logo"
+
+#: sphinx_rtd_theme/search.html:29
+msgid "Please activate JavaScript to enable the search functionality."
+msgstr "Otsimisfunktsiooni lubamiseks aktiveeri palun JavaScript"
+
+#. Search is a noun, not a verb
+#: sphinx_rtd_theme/search.html:37
+msgid "Search Results"
+msgstr "Otsingu tulemused"
+
+#: sphinx_rtd_theme/search.html:39
+msgid ""
+"Your search did not match any documents. Please make sure that all words are"
+" spelled correctly and that you've selected enough categories."
+msgstr ""
+"Sinu otsingule ei vastanud ükski dokument. Palun veendu, et kõik sisestatud "
+"sõnad on õigesti kirjutatud ja sa oled valikud piisaval hulgal kategooriaid."
+
+#: sphinx_rtd_theme/searchbox.html:4
+msgid "Search docs"
+msgstr "Otsi dokumente"
+
+#: sphinx_rtd_theme/versions.html:11
+msgid "Versions"
+msgstr "Versioonid"
+
+#: sphinx_rtd_theme/versions.html:17
+msgid "Downloads"
+msgstr "Allalaadimised"
+
+#. The phrase "Read the Docs" is not translated
+#: sphinx_rtd_theme/versions.html:24
+msgid "On Read the Docs"
+msgstr "Saidil Read the Docs"
+
+#: sphinx_rtd_theme/versions.html:26
+msgid "Project Home"
+msgstr "Projekti kodu"
+
+#: sphinx_rtd_theme/versions.html:29
+msgid "Builds"
+msgstr "Ehitused"
+
+#~ msgid "Docs"
+#~ msgstr "Dokumendid"
+
+#~ msgid "Free document hosting provided by"
+#~ msgstr "Dokumentatsiooni majutab tasuta"
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.po mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.po
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.po	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/fr/LC_MESSAGES/sphinx.po	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,154 @@
+# English translations for sphinx_rtd_theme.
+# Copyright (C) 2019 ORGANIZATION
+# This file is distributed under the same license as the sphinx_rtd_theme
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# 
+# Translators:
+# Radina Matic <radina.matic@gmail.com>, 2020
+# Anthony <aj@ohess.org>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-06 13:38-0600\n"
+"PO-Revision-Date: 2019-07-16 21:44+0000\n"
+"Last-Translator: Anthony <aj@ohess.org>, 2020\n"
+"Language-Team: French (https://www.transifex.com/readthedocs/teams/101354/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
+msgid "Edit on GitHub"
+msgstr "Éditer sur GitHub"
+
+#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
+msgid "Edit on Bitbucket"
+msgstr "Éditer sur Bitbucket"
+
+#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
+msgid "Edit on GitLab"
+msgstr "Éditer sur GitLab"
+
+#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
+msgid "View page source"
+msgstr "Afficher la source de la page"
+
+#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
+msgid "Next"
+msgstr "Suivant"
+
+#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
+msgid "Previous"
+msgstr "Précédent"
+
+#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
+#: sphinx_rtd_theme/layout.html:96
+msgid "Copyright"
+msgstr "Droits d'auteur"
+
+#. Build is a noun, not a verb
+#: sphinx_rtd_theme/footer.html:31
+msgid "Build"
+msgstr "Compilation"
+
+#. the phrase "revision" comes from Git, referring to a commit
+#: sphinx_rtd_theme/footer.html:37
+msgid "Revision"
+msgstr "Révision"
+
+#: sphinx_rtd_theme/footer.html:41
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "Dernière mise à jour le %(last_updated)s."
+
+#. the variable "sphinx_web" is a link to the Sphinx project documentation
+#. with
+#. the text "Sphinx"
+#: sphinx_rtd_theme/footer.html:52
+#, python-format
+msgid "Built with %(sphinx_web)s using a"
+msgstr "Compilé avec %(sphinx_web)s en utilisant un"
+
+#. "theme" refers to a theme for Sphinx, which alters the appearance of the
+#. generated documenation
+#: sphinx_rtd_theme/footer.html:54
+msgid "theme"
+msgstr "thème"
+
+#. this is always used as "provided by Read the Docs", and should not imply
+#. Read the Docs is an author of the generated documentation.
+#: sphinx_rtd_theme/footer.html:56
+#, python-format
+msgid "provided by %(readthedocs_web)s"
+msgstr "fourni par %(readthedocs_web)s"
+
+#: sphinx_rtd_theme/layout.html:79
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "Rechercher dans %(docstitle)s"
+
+#: sphinx_rtd_theme/layout.html:87
+msgid "About these documents"
+msgstr "À propos de cette documentation"
+
+#: sphinx_rtd_theme/layout.html:90
+msgid "Index"
+msgstr "Index"
+
+#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
+msgid "Search"
+msgstr "Rechercher"
+
+#: sphinx_rtd_theme/layout.html:128
+msgid "Logo"
+msgstr "Logo"
+
+#: sphinx_rtd_theme/search.html:29
+msgid "Please activate JavaScript to enable the search functionality."
+msgstr "Activez JavaScript pour accéder à la fonction de recherche."
+
+#. Search is a noun, not a verb
+#: sphinx_rtd_theme/search.html:37
+msgid "Search Results"
+msgstr "Résultats de la recherche"
+
+#: sphinx_rtd_theme/search.html:39
+msgid ""
+"Your search did not match any documents. Please make sure that all words are"
+" spelled correctly and that you've selected enough categories."
+msgstr ""
+"Votre recherche ne correspond à aucun document. Assurez-vous que tous les "
+"mots sont correctement orthographiés et que vous avez sélectionné "
+"suffisamment de catégories."
+
+#: sphinx_rtd_theme/searchbox.html:4
+msgid "Search docs"
+msgstr "Rechercher docs"
+
+#: sphinx_rtd_theme/versions.html:11
+msgid "Versions"
+msgstr "Versions"
+
+#: sphinx_rtd_theme/versions.html:17
+msgid "Downloads"
+msgstr "Téléchargements"
+
+#: sphinx_rtd_theme/versions.html:26
+msgid "Project Home"
+msgstr "Accueil du projet"
+
+#: sphinx_rtd_theme/versions.html:29
+msgid "Builds"
+msgstr "Compilations"
+
+#~ msgid "Docs"
+#~ msgstr "Docs"
+
+#~ msgid "Free document hosting provided by"
+#~ msgstr "Hébergement gratuit de documents fourni par"
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.po mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.po
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.po	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/nl/LC_MESSAGES/sphinx.po	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,157 @@
+# English translations for sphinx_rtd_theme.
+# Copyright (C) 2019 ORGANIZATION
+# This file is distributed under the same license as the sphinx_rtd_theme
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# 
+# Translators:
+# Jesse Tan, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-06 13:38-0600\n"
+"PO-Revision-Date: 2019-07-16 21:44+0000\n"
+"Last-Translator: Jesse Tan, 2019\n"
+"Language-Team: Dutch (https://www.transifex.com/readthedocs/teams/101354/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
+msgid "Edit on GitHub"
+msgstr "Bewerk op GitHub"
+
+#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
+msgid "Edit on Bitbucket"
+msgstr "Bewerk op BitBucket"
+
+#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
+msgid "Edit on GitLab"
+msgstr "Bewerk op GitLab"
+
+#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
+msgid "View page source"
+msgstr "Bekijk paginabron"
+
+#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
+msgid "Next"
+msgstr "Volgende"
+
+#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
+msgid "Previous"
+msgstr "Vorige"
+
+#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
+#: sphinx_rtd_theme/layout.html:96
+msgid "Copyright"
+msgstr "Copyright"
+
+#. Build is a noun, not a verb
+#: sphinx_rtd_theme/footer.html:31
+msgid "Build"
+msgstr "Bouwresultaat"
+
+#. the phrase "revision" comes from Git, referring to a commit
+#: sphinx_rtd_theme/footer.html:37
+msgid "Revision"
+msgstr "Revisie"
+
+#: sphinx_rtd_theme/footer.html:41
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "Laatste update op %(last_updated)s."
+
+#. the variable "sphinx_web" is a link to the Sphinx project documentation
+#. with
+#. the text "Sphinx"
+#: sphinx_rtd_theme/footer.html:52
+#, python-format
+msgid "Built with %(sphinx_web)s using a"
+msgstr "Gebouwd met %(sphinx_web)s met een"
+
+#. "theme" refers to a theme for Sphinx, which alters the appearance of the
+#. generated documenation
+#: sphinx_rtd_theme/footer.html:54
+msgid "theme"
+msgstr "thema"
+
+#. this is always used as "provided by Read the Docs", and should not imply
+#. Read the Docs is an author of the generated documentation.
+#: sphinx_rtd_theme/footer.html:56
+#, python-format
+msgid "provided by %(readthedocs_web)s"
+msgstr "geleverd door %(readthedocs_web)s"
+
+#: sphinx_rtd_theme/layout.html:79
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "Zoek binnen %(docstitle)s"
+
+#: sphinx_rtd_theme/layout.html:87
+msgid "About these documents"
+msgstr "Over deze documenten"
+
+#: sphinx_rtd_theme/layout.html:90
+msgid "Index"
+msgstr "Index"
+
+#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
+msgid "Search"
+msgstr "Zoek"
+
+#: sphinx_rtd_theme/layout.html:128
+msgid "Logo"
+msgstr "Logo"
+
+#: sphinx_rtd_theme/search.html:29
+msgid "Please activate JavaScript to enable the search functionality."
+msgstr "Zet JavaScript aan om de zoekfunctie mogelijk te maken."
+
+#. Search is a noun, not a verb
+#: sphinx_rtd_theme/search.html:37
+msgid "Search Results"
+msgstr "Zoekresultaten"
+
+#: sphinx_rtd_theme/search.html:39
+msgid ""
+"Your search did not match any documents. Please make sure that all words are"
+" spelled correctly and that you've selected enough categories."
+msgstr ""
+"Zoekpoging vond geen documenten. Zorg ervoor dat alle woorden correct zijn "
+"gespeld en dat voldoende categorieën zijn geselecteerd."
+
+#: sphinx_rtd_theme/searchbox.html:4
+msgid "Search docs"
+msgstr "Zoek in documentatie"
+
+#: sphinx_rtd_theme/versions.html:11
+msgid "Versions"
+msgstr "Versies"
+
+#: sphinx_rtd_theme/versions.html:17
+msgid "Downloads"
+msgstr "Downloads"
+
+#. The phrase "Read the Docs" is not translated
+#: sphinx_rtd_theme/versions.html:24
+msgid "On Read the Docs"
+msgstr "Op Read the Docs"
+
+#: sphinx_rtd_theme/versions.html:26
+msgid "Project Home"
+msgstr "Project Home"
+
+#: sphinx_rtd_theme/versions.html:29
+msgid "Builds"
+msgstr "Bouwresultaten"
+
+#~ msgid "Docs"
+#~ msgstr "Documentatie"
+
+#~ msgid "Free document hosting provided by"
+#~ msgstr "Gratis hosting voor documentatie verzorgd door"
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.po mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.po
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.po	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/pt_BR/LC_MESSAGES/sphinx.po	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,159 @@
+# English translations for sphinx_rtd_theme.
+# Copyright (C) 2019 ORGANIZATION
+# This file is distributed under the same license as the sphinx_rtd_theme
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# 
+# Translators:
+# Rafael Fontenelle <rffontenelle@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-06 13:38-0600\n"
+"PO-Revision-Date: 2019-07-16 21:44+0000\n"
+"Last-Translator: Rafael Fontenelle <rffontenelle@gmail.com>, 2020\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/readthedocs/teams/101354/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
+msgid "Edit on GitHub"
+msgstr "Editar no GitHub"
+
+#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
+msgid "Edit on Bitbucket"
+msgstr "Editar no Bitbucket"
+
+#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
+msgid "Edit on GitLab"
+msgstr "Editar no GitLab"
+
+#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
+msgid "View page source"
+msgstr "Ver código-fonte da página"
+
+#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
+msgid "Next"
+msgstr "Próximo"
+
+#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
+msgid "Previous"
+msgstr "Anterior"
+
+#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
+#: sphinx_rtd_theme/layout.html:96
+msgid "Copyright"
+msgstr "Copyright"
+
+#. Build is a noun, not a verb
+#: sphinx_rtd_theme/footer.html:31
+msgid "Build"
+msgstr "Compilação"
+
+#. the phrase "revision" comes from Git, referring to a commit
+#: sphinx_rtd_theme/footer.html:37
+msgid "Revision"
+msgstr "Revisão"
+
+#: sphinx_rtd_theme/footer.html:41
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "Última atualização em %(last_updated)s."
+
+#. the variable "sphinx_web" is a link to the Sphinx project documentation
+#. with
+#. the text "Sphinx"
+#: sphinx_rtd_theme/footer.html:52
+#, python-format
+msgid "Built with %(sphinx_web)s using a"
+msgstr "Compilado com %(sphinx_web)s usando um"
+
+#. "theme" refers to a theme for Sphinx, which alters the appearance of the
+#. generated documenation
+#: sphinx_rtd_theme/footer.html:54
+msgid "theme"
+msgstr "tema"
+
+#. this is always used as "provided by Read the Docs", and should not imply
+#. Read the Docs is an author of the generated documentation.
+#: sphinx_rtd_theme/footer.html:56
+#, python-format
+msgid "provided by %(readthedocs_web)s"
+msgstr "fornecido por %(readthedocs_web)s"
+
+#: sphinx_rtd_theme/layout.html:79
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "Pesquisar em %(docstitle)s"
+
+#: sphinx_rtd_theme/layout.html:87
+msgid "About these documents"
+msgstr "Sobre esses documentos"
+
+#: sphinx_rtd_theme/layout.html:90
+msgid "Index"
+msgstr "Índice"
+
+#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
+msgid "Search"
+msgstr "Pesquisar"
+
+#: sphinx_rtd_theme/layout.html:128
+msgid "Logo"
+msgstr "Logo"
+
+#: sphinx_rtd_theme/search.html:29
+msgid "Please activate JavaScript to enable the search functionality."
+msgstr ""
+"Por favor, ative JavaScript para habilitar a funcionalidade de pesquisa."
+
+#. Search is a noun, not a verb
+#: sphinx_rtd_theme/search.html:37
+msgid "Search Results"
+msgstr "Resultados da pesquisa"
+
+#: sphinx_rtd_theme/search.html:39
+msgid ""
+"Your search did not match any documents. Please make sure that all words are"
+" spelled correctly and that you've selected enough categories."
+msgstr ""
+"A sua pesquisa não encontrou nenhum documento correspondente. Verifique se "
+"todas as palavras estão escritas corretamente e se você selecionou "
+"categorias suficientes."
+
+#: sphinx_rtd_theme/searchbox.html:4
+msgid "Search docs"
+msgstr "Pesquisar documentos"
+
+#: sphinx_rtd_theme/versions.html:11
+msgid "Versions"
+msgstr "Versões"
+
+#: sphinx_rtd_theme/versions.html:17
+msgid "Downloads"
+msgstr "Downloads"
+
+#. The phrase "Read the Docs" is not translated
+#: sphinx_rtd_theme/versions.html:24
+msgid "On Read the Docs"
+msgstr "No Read the Docs"
+
+#: sphinx_rtd_theme/versions.html:26
+msgid "Project Home"
+msgstr "Página inicial"
+
+#: sphinx_rtd_theme/versions.html:29
+msgid "Builds"
+msgstr "Compilações"
+
+#~ msgid "Docs"
+#~ msgstr "Docs"
+
+#~ msgid "Free document hosting provided by"
+#~ msgstr "Hospedagem de documentos livres fornecida por"
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.po mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.po
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.po	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/ru/LC_MESSAGES/sphinx.po	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,158 @@
+# English translations for sphinx_rtd_theme.
+# Copyright (C) 2019 ORGANIZATION
+# This file is distributed under the same license as the sphinx_rtd_theme
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# 
+# Translators:
+# Dmitry Shachnev <mitya57@gmail.com>, 2019
+# lvv83 <vlozhkin83@gmail.com>, 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-06 13:38-0600\n"
+"PO-Revision-Date: 2019-07-16 21:44+0000\n"
+"Last-Translator: lvv83 <vlozhkin83@gmail.com>, 2019\n"
+"Language-Team: Russian (https://www.transifex.com/readthedocs/teams/101354/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
+msgid "Edit on GitHub"
+msgstr "Редактировать на GitHub"
+
+#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
+msgid "Edit on Bitbucket"
+msgstr "Редактировать на BitBucket"
+
+#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
+msgid "Edit on GitLab"
+msgstr "Редактировать на GitLab"
+
+#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
+msgid "View page source"
+msgstr "Просмотреть исходный код страницы"
+
+#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
+msgid "Next"
+msgstr "Следующая"
+
+#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
+msgid "Previous"
+msgstr "Предыдущая"
+
+#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
+#: sphinx_rtd_theme/layout.html:96
+msgid "Copyright"
+msgstr "Авторские права"
+
+#. Build is a noun, not a verb
+#: sphinx_rtd_theme/footer.html:31
+msgid "Build"
+msgstr "Сборка"
+
+#. the phrase "revision" comes from Git, referring to a commit
+#: sphinx_rtd_theme/footer.html:37
+msgid "Revision"
+msgstr "Ревизия"
+
+#: sphinx_rtd_theme/footer.html:41
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "Последний раз обновлено %(last_updated)s."
+
+#. the variable "sphinx_web" is a link to the Sphinx project documentation
+#. with
+#. the text "Sphinx"
+#: sphinx_rtd_theme/footer.html:52
+#, python-format
+msgid "Built with %(sphinx_web)s using a"
+msgstr "Собрано при помощи %(sphinx_web)s с использованием"
+
+#. "theme" refers to a theme for Sphinx, which alters the appearance of the
+#. generated documenation
+#: sphinx_rtd_theme/footer.html:54
+msgid "theme"
+msgstr "темы,"
+
+#. this is always used as "provided by Read the Docs", and should not imply
+#. Read the Docs is an author of the generated documentation.
+#: sphinx_rtd_theme/footer.html:56
+#, python-format
+msgid "provided by %(readthedocs_web)s"
+msgstr "предоставленной %(readthedocs_web)s"
+
+#: sphinx_rtd_theme/layout.html:79
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "Поиск в %(docstitle)s"
+
+#: sphinx_rtd_theme/layout.html:87
+msgid "About these documents"
+msgstr "Об этих документах"
+
+#: sphinx_rtd_theme/layout.html:90
+msgid "Index"
+msgstr "Алфавитный указатель"
+
+#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
+msgid "Search"
+msgstr "Поиск"
+
+#: sphinx_rtd_theme/layout.html:128
+msgid "Logo"
+msgstr "Логотип"
+
+#: sphinx_rtd_theme/search.html:29
+msgid "Please activate JavaScript to enable the search functionality."
+msgstr "Активируйте JavaScript, чтобы использовать функционал поиска."
+
+#. Search is a noun, not a verb
+#: sphinx_rtd_theme/search.html:37
+msgid "Search Results"
+msgstr "Результаты поиска"
+
+#: sphinx_rtd_theme/search.html:39
+msgid ""
+"Your search did not match any documents. Please make sure that all words are"
+" spelled correctly and that you've selected enough categories."
+msgstr ""
+"По Вашему запросу не найдено результатов. Пожалуйста, проверьте, что все "
+"слова написаны правильно, и Вы выбрали нужные категории."
+
+#: sphinx_rtd_theme/searchbox.html:4
+msgid "Search docs"
+msgstr "Поиск в документации"
+
+#: sphinx_rtd_theme/versions.html:11
+msgid "Versions"
+msgstr "Версии"
+
+#: sphinx_rtd_theme/versions.html:17
+msgid "Downloads"
+msgstr "Загрузки"
+
+#. The phrase "Read the Docs" is not translated
+#: sphinx_rtd_theme/versions.html:24
+msgid "On Read the Docs"
+msgstr "На Read the Docs"
+
+#: sphinx_rtd_theme/versions.html:26
+msgid "Project Home"
+msgstr "Домашняя страница проекта"
+
+#: sphinx_rtd_theme/versions.html:29
+msgid "Builds"
+msgstr "Сборки"
+
+#~ msgid "Docs"
+#~ msgstr "Документация"
+
+#~ msgid "Free document hosting provided by"
+#~ msgstr "Бесплатный хостинг документов, предоставленный"
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/sphinx.pot mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/sphinx.pot
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/sphinx.pot	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/sphinx.pot	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,149 @@
+# Translations template for sphinx_rtd_theme.
+# Copyright (C) 2020 ORGANIZATION
+# This file is distributed under the same license as the sphinx_rtd_theme
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-06 13:38-0600\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+
+#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
+msgid "Edit on GitHub"
+msgstr ""
+
+#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
+msgid "Edit on Bitbucket"
+msgstr ""
+
+#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
+msgid "Edit on GitLab"
+msgstr ""
+
+#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
+msgid "View page source"
+msgstr ""
+
+#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
+msgid "Next"
+msgstr ""
+
+#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
+msgid "Previous"
+msgstr ""
+
+#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
+#: sphinx_rtd_theme/layout.html:96
+msgid "Copyright"
+msgstr ""
+
+#. Build is a noun, not a verb
+#: sphinx_rtd_theme/footer.html:31
+msgid "Build"
+msgstr ""
+
+#. the phrase "revision" comes from Git, referring to a commit
+#: sphinx_rtd_theme/footer.html:37
+msgid "Revision"
+msgstr ""
+
+#: sphinx_rtd_theme/footer.html:41
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr ""
+
+#. the variable "sphinx_web" is a link to the Sphinx project documentation with
+#. the text "Sphinx"
+#: sphinx_rtd_theme/footer.html:52
+#, python-format
+msgid "Built with %(sphinx_web)s using a"
+msgstr ""
+
+#. "theme" refers to a theme for Sphinx, which alters the appearance of the
+#. generated documenation
+#: sphinx_rtd_theme/footer.html:54
+msgid "theme"
+msgstr ""
+
+#. this is always used as "provided by Read the Docs", and should not imply
+#. Read the Docs is an author of the generated documentation.
+#: sphinx_rtd_theme/footer.html:56
+#, python-format
+msgid "provided by %(readthedocs_web)s"
+msgstr ""
+
+#: sphinx_rtd_theme/layout.html:79
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr ""
+
+#: sphinx_rtd_theme/layout.html:87
+msgid "About these documents"
+msgstr ""
+
+#: sphinx_rtd_theme/layout.html:90
+msgid "Index"
+msgstr ""
+
+#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
+msgid "Search"
+msgstr ""
+
+#: sphinx_rtd_theme/layout.html:121
+msgid "Documentation Home"
+msgstr ""
+
+#: sphinx_rtd_theme/layout.html:128
+msgid "Logo"
+msgstr ""
+
+#: sphinx_rtd_theme/search.html:29
+msgid "Please activate JavaScript to enable the search functionality."
+msgstr ""
+
+#. Search is a noun, not a verb
+#: sphinx_rtd_theme/search.html:37
+msgid "Search Results"
+msgstr ""
+
+#: sphinx_rtd_theme/search.html:39
+msgid ""
+"Your search did not match any documents. Please make sure that all words "
+"are spelled correctly and that you've selected enough categories."
+msgstr ""
+
+#: sphinx_rtd_theme/searchbox.html:4
+msgid "Search docs"
+msgstr ""
+
+#: sphinx_rtd_theme/versions.html:11
+msgid "Versions"
+msgstr ""
+
+#: sphinx_rtd_theme/versions.html:17
+msgid "Downloads"
+msgstr ""
+
+#. The phrase "Read the Docs" is not translated
+#: sphinx_rtd_theme/versions.html:24
+msgid "On Read the Docs"
+msgstr ""
+
+#: sphinx_rtd_theme/versions.html:26
+msgid "Project Home"
+msgstr ""
+
+#: sphinx_rtd_theme/versions.html:29
+msgid "Builds"
+msgstr ""
+
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.po mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.po
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.po	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/sv/LC_MESSAGES/sphinx.po	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,158 @@
+# English translations for sphinx_rtd_theme.
+# Copyright (C) 2019 ORGANIZATION
+# This file is distributed under the same license as the sphinx_rtd_theme
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# 
+# Translators:
+# Daniel Holmberg <daniel.holmberg97@gmail.com>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-06 13:38-0600\n"
+"PO-Revision-Date: 2019-07-16 21:44+0000\n"
+"Last-Translator: Daniel Holmberg <daniel.holmberg97@gmail.com>, 2020\n"
+"Language-Team: Swedish (https://www.transifex.com/readthedocs/teams/101354/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
+msgid "Edit on GitHub"
+msgstr "Editera på GitHub"
+
+#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
+msgid "Edit on Bitbucket"
+msgstr "Editera på Bitbucket"
+
+#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
+msgid "Edit on GitLab"
+msgstr "Editera på GitLab"
+
+#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
+msgid "View page source"
+msgstr "Visa sidkälla"
+
+#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
+msgid "Next"
+msgstr "Nästa"
+
+#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
+msgid "Previous"
+msgstr "Tillbaka"
+
+#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
+#: sphinx_rtd_theme/layout.html:96
+msgid "Copyright"
+msgstr "Upphovsrätt"
+
+#. Build is a noun, not a verb
+#: sphinx_rtd_theme/footer.html:31
+msgid "Build"
+msgstr "Bygg"
+
+#. the phrase "revision" comes from Git, referring to a commit
+#: sphinx_rtd_theme/footer.html:37
+msgid "Revision"
+msgstr "Ändra"
+
+#: sphinx_rtd_theme/footer.html:41
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "Senast uppdaterad %(last_updated)s."
+
+#. the variable "sphinx_web" is a link to the Sphinx project documentation
+#. with
+#. the text "Sphinx"
+#: sphinx_rtd_theme/footer.html:52
+#, python-format
+msgid "Built with %(sphinx_web)s using a"
+msgstr "Gjord med %(sphinx_web)s med hjälp av"
+
+#. "theme" refers to a theme for Sphinx, which alters the appearance of the
+#. generated documenation
+#: sphinx_rtd_theme/footer.html:54
+msgid "theme"
+msgstr "tema"
+
+#. this is always used as "provided by Read the Docs", and should not imply
+#. Read the Docs is an author of the generated documentation.
+#: sphinx_rtd_theme/footer.html:56
+#, python-format
+msgid "provided by %(readthedocs_web)s"
+msgstr "erhållet av %(readthedocs_web)s"
+
+#: sphinx_rtd_theme/layout.html:79
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "Sök i %(docstitle)s"
+
+#: sphinx_rtd_theme/layout.html:87
+msgid "About these documents"
+msgstr "Om dessa dokument"
+
+#: sphinx_rtd_theme/layout.html:90
+msgid "Index"
+msgstr "Index"
+
+#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
+msgid "Search"
+msgstr "Sök"
+
+#: sphinx_rtd_theme/layout.html:121
+msgid "Documentation Home"
+msgstr "Dokumentation Hem"
+
+#: sphinx_rtd_theme/layout.html:128
+msgid "Logo"
+msgstr "Logo"
+
+#: sphinx_rtd_theme/search.html:29
+msgid "Please activate JavaScript to enable the search functionality."
+msgstr ""
+"Var vänlig och aktivera JavaScript för att möjliggöra sökfunktionaliteten."
+
+#. Search is a noun, not a verb
+#: sphinx_rtd_theme/search.html:37
+msgid "Search Results"
+msgstr "Sökresultat"
+
+#: sphinx_rtd_theme/search.html:39
+msgid ""
+"Your search did not match any documents. Please make sure that all words are"
+" spelled correctly and that you've selected enough categories."
+msgstr ""
+"Din sökning gav inga träffar. Var vänlig och se till att alla ord är rätt "
+"stavade och att du har valt tillräckligt många kategorier."
+
+#: sphinx_rtd_theme/searchbox.html:4
+msgid "Search docs"
+msgstr "Sök i dokumentationen"
+
+#: sphinx_rtd_theme/versions.html:11
+msgid "Versions"
+msgstr "Versioner"
+
+#: sphinx_rtd_theme/versions.html:17
+msgid "Downloads"
+msgstr "Nerladdningar"
+
+#. The phrase "Read the Docs" is not translated
+#: sphinx_rtd_theme/versions.html:24
+msgid "On Read the Docs"
+msgstr "På Read the Docs"
+
+#: sphinx_rtd_theme/versions.html:26
+msgid "Project Home"
+msgstr "Projekt Hem"
+
+#~ msgid "Docs"
+#~ msgstr "Dokumentation"
+
+#~ msgid "Free document hosting provided by"
+#~ msgstr "Gratis dokumentations hysning erhållen av"
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.po mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.po
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.po	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/tr/LC_MESSAGES/sphinx.po	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,147 @@
+# English translations for sphinx_rtd_theme.
+# Copyright (C) 2019 ORGANIZATION
+# This file is distributed under the same license as the sphinx_rtd_theme
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# 
+# Translators:
+# BouRock, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-06 13:38-0600\n"
+"PO-Revision-Date: 2019-07-16 21:44+0000\n"
+"Last-Translator: BouRock, 2020\n"
+"Language-Team: Turkish (https://www.transifex.com/readthedocs/teams/101354/tr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
+msgid "Edit on GitHub"
+msgstr "GitHub'da Düzenle"
+
+#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
+msgid "Edit on Bitbucket"
+msgstr "Bitbucket'ta Düzenle"
+
+#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
+msgid "Edit on GitLab"
+msgstr "GitLab'ta Düzenle"
+
+#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
+msgid "View page source"
+msgstr "Sayfa kaynağını görüntüle"
+
+#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
+msgid "Next"
+msgstr "Sonraki"
+
+#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
+msgid "Previous"
+msgstr "Önceki"
+
+#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
+#: sphinx_rtd_theme/layout.html:96
+msgid "Copyright"
+msgstr "Telif hakkı"
+
+#. Build is a noun, not a verb
+#: sphinx_rtd_theme/footer.html:31
+msgid "Build"
+msgstr "Oluşturma"
+
+#. the phrase "revision" comes from Git, referring to a commit
+#: sphinx_rtd_theme/footer.html:37
+msgid "Revision"
+msgstr "Gözden geçirme"
+
+#: sphinx_rtd_theme/footer.html:41
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "Son olarak %(last_updated)s tarihinde güncellendi."
+
+#. "theme" refers to a theme for Sphinx, which alters the appearance of the
+#. generated documenation
+#: sphinx_rtd_theme/footer.html:54
+msgid "theme"
+msgstr "tema"
+
+#. this is always used as "provided by Read the Docs", and should not imply
+#. Read the Docs is an author of the generated documentation.
+#: sphinx_rtd_theme/footer.html:56
+#, python-format
+msgid "provided by %(readthedocs_web)s"
+msgstr "kullanılarak %(readthedocs_web)s tarafından sağlanmasıyla oluşturuldu"
+
+#: sphinx_rtd_theme/layout.html:79
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "%(docstitle)s içinde ara"
+
+#: sphinx_rtd_theme/layout.html:87
+msgid "About these documents"
+msgstr "Bu belgeler hakkında"
+
+#: sphinx_rtd_theme/layout.html:90
+msgid "Index"
+msgstr "Dizin"
+
+#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
+msgid "Search"
+msgstr "Arama"
+
+#: sphinx_rtd_theme/layout.html:128
+msgid "Logo"
+msgstr "Logo"
+
+#: sphinx_rtd_theme/search.html:29
+msgid "Please activate JavaScript to enable the search functionality."
+msgstr ""
+"Arama işlevselliğini etkinleştirmek için lütfen JavaScript'i etkinleştirin."
+
+#. Search is a noun, not a verb
+#: sphinx_rtd_theme/search.html:37
+msgid "Search Results"
+msgstr "Arama Sonuçları"
+
+#: sphinx_rtd_theme/search.html:39
+msgid ""
+"Your search did not match any documents. Please make sure that all words are"
+" spelled correctly and that you've selected enough categories."
+msgstr ""
+"Aramanız hiçbir belgeyle eşleşmedi. Lütfen tüm kelimelerin doğru "
+"yazıldığından ve yeterli kategori seçtiğinizden emin olun."
+
+#: sphinx_rtd_theme/searchbox.html:4
+msgid "Search docs"
+msgstr "Belgeleri arayın"
+
+#: sphinx_rtd_theme/versions.html:11
+msgid "Versions"
+msgstr "Sürümler"
+
+#: sphinx_rtd_theme/versions.html:17
+msgid "Downloads"
+msgstr "İndirmeler"
+
+#. The phrase "Read the Docs" is not translated
+#: sphinx_rtd_theme/versions.html:24
+msgid "On Read the Docs"
+msgstr "Read the Docs Üzerinde"
+
+#: sphinx_rtd_theme/versions.html:26
+msgid "Project Home"
+msgstr "Proje Ana Sayfa"
+
+#: sphinx_rtd_theme/versions.html:29
+msgid "Builds"
+msgstr "Oluşturmalar"
+
+#~ msgid "Free document hosting provided by"
+#~ msgstr "Ücretsiz belge barındırmayı sağlayan"
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.po mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.po
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.po	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/locale/zh_CN/LC_MESSAGES/sphinx.po	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,151 @@
+# English translations for sphinx_rtd_theme.
+# Copyright (C) 2019 ORGANIZATION
+# This file is distributed under the same license as the sphinx_rtd_theme
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+# 
+# Translators:
+# 王赛 <wangsai@bootcss.com>, 2019
+# Anthony <aj@ohess.org>, 2020
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: sphinx_rtd_theme 0.4.3.dev0\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2020-05-06 13:38-0600\n"
+"PO-Revision-Date: 2019-07-16 21:44+0000\n"
+"Last-Translator: Anthony <aj@ohess.org>, 2020\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/readthedocs/teams/101354/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: sphinx_rtd_theme/breadcrumbs.html:43 sphinx_rtd_theme/breadcrumbs.html:45
+msgid "Edit on GitHub"
+msgstr "在 GitHub 上修改"
+
+#: sphinx_rtd_theme/breadcrumbs.html:50 sphinx_rtd_theme/breadcrumbs.html:52
+msgid "Edit on Bitbucket"
+msgstr "在 Bitbucket 上修改"
+
+#: sphinx_rtd_theme/breadcrumbs.html:57 sphinx_rtd_theme/breadcrumbs.html:59
+msgid "Edit on GitLab"
+msgstr "在 GitLab 上修改"
+
+#: sphinx_rtd_theme/breadcrumbs.html:62 sphinx_rtd_theme/breadcrumbs.html:64
+msgid "View page source"
+msgstr "查看页面源码"
+
+#: sphinx_rtd_theme/breadcrumbs.html:74 sphinx_rtd_theme/footer.html:5
+msgid "Next"
+msgstr "下一页"
+
+#: sphinx_rtd_theme/breadcrumbs.html:77 sphinx_rtd_theme/footer.html:8
+msgid "Previous"
+msgstr "上一页"
+
+#: sphinx_rtd_theme/footer.html:21 sphinx_rtd_theme/footer.html:24
+#: sphinx_rtd_theme/layout.html:96
+msgid "Copyright"
+msgstr "版权所有"
+
+#. Build is a noun, not a verb
+#: sphinx_rtd_theme/footer.html:31
+msgid "Build"
+msgstr "构建"
+
+#: sphinx_rtd_theme/footer.html:41
+#, python-format
+msgid "Last updated on %(last_updated)s."
+msgstr "最后更新时间 %(last_updated)s。"
+
+#. the variable "sphinx_web" is a link to the Sphinx project documentation
+#. with
+#. the text "Sphinx"
+#: sphinx_rtd_theme/footer.html:52
+#, python-format
+msgid "Built with %(sphinx_web)s using a"
+msgstr "利用 %(sphinx_web)s 构建，使用了 "
+
+#. "theme" refers to a theme for Sphinx, which alters the appearance of the
+#. generated documenation
+#: sphinx_rtd_theme/footer.html:54
+msgid "theme"
+msgstr "主题"
+
+#. this is always used as "provided by Read the Docs", and should not imply
+#. Read the Docs is an author of the generated documentation.
+#: sphinx_rtd_theme/footer.html:56
+#, python-format
+msgid "provided by %(readthedocs_web)s"
+msgstr "由 %(readthedocs_web)s开发"
+
+#: sphinx_rtd_theme/layout.html:79
+#, python-format
+msgid "Search within %(docstitle)s"
+msgstr "在 %(docstitle)s中搜索"
+
+#: sphinx_rtd_theme/layout.html:87
+msgid "About these documents"
+msgstr "关于此文档"
+
+#: sphinx_rtd_theme/layout.html:90
+msgid "Index"
+msgstr "索引"
+
+#: sphinx_rtd_theme/layout.html:93 sphinx_rtd_theme/search.html:11
+msgid "Search"
+msgstr "搜索"
+
+#: sphinx_rtd_theme/layout.html:128
+msgid "Logo"
+msgstr "Logo"
+
+#: sphinx_rtd_theme/search.html:29
+msgid "Please activate JavaScript to enable the search functionality."
+msgstr "请启用 JavaScript 以便使用搜索功能"
+
+#. Search is a noun, not a verb
+#: sphinx_rtd_theme/search.html:37
+msgid "Search Results"
+msgstr "搜索结果"
+
+#: sphinx_rtd_theme/search.html:39
+msgid ""
+"Your search did not match any documents. Please make sure that all words are"
+" spelled correctly and that you've selected enough categories."
+msgstr "您的搜索没有匹配到任何文档。请确保所有单词拼写正确，并选择了足够多的类别。"
+
+#: sphinx_rtd_theme/searchbox.html:4
+msgid "Search docs"
+msgstr "在文档中搜索"
+
+#: sphinx_rtd_theme/versions.html:11
+msgid "Versions"
+msgstr "版本列表"
+
+#: sphinx_rtd_theme/versions.html:17
+msgid "Downloads"
+msgstr "下载链接"
+
+#. The phrase "Read the Docs" is not translated
+#: sphinx_rtd_theme/versions.html:24
+msgid "On Read the Docs"
+msgstr "托管于 Read the Docs"
+
+#: sphinx_rtd_theme/versions.html:26
+msgid "Project Home"
+msgstr "项目首页"
+
+#: sphinx_rtd_theme/versions.html:29
+msgid "Builds"
+msgstr "构建"
+
+#~ msgid "Docs"
+#~ msgstr "文档"
+
+#~ msgid "Free document hosting provided by"
+#~ msgstr "此文档免费托管于"
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/searchbox.html mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/searchbox.html
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/searchbox.html	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/searchbox.html	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,7 @@
 {%- if builder != 'singlehtml' %}
 <div role="search">
   <form id="rtd-search-form" class="wy-form" action="{{ pathto('search') }}" method="get">
-    <input type="text" name="q" placeholder="Search docs" />
+    <input type="text" name="q" placeholder="{{ _('Search docs') }}" />
     <input type="hidden" name="check_keywords" value="yes" />
     <input type="hidden" name="area" value="default" />
   </form>
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/search.html mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/search.html
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/search.html	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/search.html	2020-08-26 08:57:19.000000000 +0000
@@ -9,7 +9,10 @@
 #}
 {%- extends "layout.html" %}
 {% set title = _('Search') %}
-{% set script_files = script_files + ['_static/searchtools.js'] %}
+{%- block scripts %}
+    {{ super() }}
+    <script type="text/javascript" src="{{ pathto('_static/searchtools.js', 1) }}"></script>
+{%- endblock %}
 {% block footer %}
   <script type="text/javascript">
     jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
@@ -23,13 +26,14 @@
   <noscript>
   <div id="fallback" class="admonition warning">
     <p class="last">
-      {% trans %}Please activate JavaScript to enable the search
+      {% trans trimmed %}Please activate JavaScript to enable the search
       functionality.{% endtrans %}
     </p>
   </div>
   </noscript>
 
   {% if search_performed %}
+    {# Translators: Search is a noun, not a verb #}
     <h2>{{ _('Search Results') }}</h2>
     {% if not search_results %}
       <p>{{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}</p>
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/badge_only.css mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/badge_only.css
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/badge_only.css	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/badge_only.css	2020-08-26 08:57:19.000000000 +0000
@@ -1,2 +1 @@
-.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-weight:normal;font-style:normal;src:url("../font/fontawesome_webfont.eot");src:url("../font/fontawesome_webfont.eot?#iefix") format("embedded-opentype"),url("../font/fontawesome_webfont.woff") format("woff"),url("../font/fontawesome_webfont.ttf") format("truetype"),url("../font/fontawesome_webfont.svg#FontAwesome") format("svg")}.fa:before{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa{display:inline-block;text-decoration:inherit}li .fa{display:inline-block}li .fa-large:before,li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-0.8em}ul.fas li .fa{width:0.8em}ul.fas li .fa-large:before,ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before{content:""}.icon-book:before{content:""}.fa-caret-down:before{content:""}.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.icon-caret-up:before{content:""}.fa-caret-left:before{content:""}.icon-caret-left:before{content:""}.fa-caret-right:before{content:""}.icon-caret-right:before{content:""}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}
-/*# sourceMappingURL=badge_only.css.map */
+.fa:before{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:after,.clearfix:before{display:table;content:""}.clearfix:after{clear:both}@font-face{font-family:FontAwesome;font-style:normal;font-weight:400;src:url(fonts/fontawesome-webfont.eot?674f50d287a8c48dc19ba404d20fe713?#iefix) format("embedded-opentype"),url(fonts/fontawesome-webfont.woff2?af7ae505a9eed503f8b8e6982036873e) format("woff2"),url(fonts/fontawesome-webfont.woff?fee66e712a8a08eef5805a46892932ad) format("woff"),url(fonts/fontawesome-webfont.ttf?b06871f281fee6b241d60582ae9369b9) format("truetype"),url(fonts/fontawesome-webfont.svg?912ec66d7572ff821749319396470bde#FontAwesome) format("svg")}.fa:before{font-family:FontAwesome;font-style:normal;font-weight:400;line-height:1}.fa:before,a .fa{text-decoration:inherit}.fa:before,a .fa,li .fa{display:inline-block}li .fa-large:before{width:1.875em}ul.fas{list-style-type:none;margin-left:2em;text-indent:-.8em}ul.fas li .fa{width:.8em}ul.fas li .fa-large:before{vertical-align:baseline}.fa-book:before,.icon-book:before{content:"\f02d"}.fa-caret-down:before,.icon-caret-down:before{content:"\f0d7"}.fa-caret-up:before,.icon-caret-up:before{content:"\f0d8"}.fa-caret-left:before,.icon-caret-left:before{content:"\f0d9"}.fa-caret-right:before,.icon-caret-right:before{content:"\f0da"}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60}.rst-versions .rst-current-version:after{clear:both;content:"";display:block}.rst-versions .rst-current-version .fa{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#f1c40f;color:#000}.rst-versions.shift-up{height:auto;max-height:100%;overflow-y:scroll}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:grey;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:1px solid #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px;max-height:90%}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none;line-height:30px}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge>.rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width:768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}
\ No newline at end of file
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/badge_only.css.map mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/badge_only.css.map
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/badge_only.css.map	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/badge_only.css.map	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-{
-"version": 3,
-"mappings": "CAyDA,SAAY,EACV,qBAAsB,EAAE,UAAW,EAqDrC,QAAS,EARP,IAAK,EAAE,AAAC,EACR,+BAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,cAAO,EACL,IAAK,EAAE,GAAI,EC1Gb,SAkBC,EAjBC,UAAW,ECFJ,UAAW,EDGlB,UAAW,EAHqC,KAAM,EAItD,SAAU,EAJsD,KAAM,EAapE,EAAG,EAAE,qCAAwB,EAC7B,EAAG,EAAE,0PAAyE,ECZpF,SAAU,EACR,MAAO,EAAE,WAAY,EACrB,UAAW,EAAE,UAAW,EACxB,SAAU,EAAE,KAAM,EAClB,UAAW,EAAE,KAAM,EACnB,UAAW,EAAE,AAAC,EACd,cAAe,EAAE,MAAO,EAG1B,IAAK,EACH,MAAO,EAAE,WAAY,EACrB,cAAe,EAAE,MAAO,EAIxB,KAAG,EACD,MAAO,EAAE,WAAY,EACvB,sCAAiB,EAGf,IAAK,EAAE,MAAY,EAEvB,KAAM,EACJ,cAAe,EAAE,GAAI,EACrB,UAAW,EAAE,EAAG,EAChB,UAAW,EAAE,KAAM,EAEjB,YAAG,EACD,IAAK,EAAE,IAAI,EACb,oDAAiB,EAGf,aAAc,EAAE,OAAQ,EAG9B,cAAe,EACb,MAAO,EAAE,EAAO,EAElB,gBAAiB,EACf,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,sBAAuB,EACrB,MAAO,EAAE,EAAO,EAElB,kBAAmB,EACjB,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,oBAAqB,EACnB,MAAO,EAAE,EAAO,EAElB,sBAAuB,EACrB,MAAO,EAAE,EAAO,EAElB,qBAAsB,EACpB,MAAO,EAAE,EAAO,EAElB,uBAAwB,EACtB,MAAO,EAAE,EAAO,ECnElB,YAAa,EACX,OAAQ,EAAE,IAAK,EACf,KAAM,EAAE,AAAC,EACT,GAAI,EAAE,AAAC,EACP,IAAK,EC6E+B,IAAK,ED5EzC,IAAK,ECE+B,MAAyB,EDD7D,SAAU,EAAE,MAAkC,EAC9C,SAAU,EAAE,iBAAiC,EAC7C,UAAW,EEAyB,sDAAM,EFC1C,MAAO,EC+E6B,EAAG,ED9EvC,cAAC,EACC,IAAK,ECqE6B,MAAW,EDpE7C,cAAe,EAAE,GAAI,EACvB,6BAAgB,EACd,MAAO,EAAE,GAAI,EACf,iCAAoB,EAClB,MAAO,EAAE,GAAqB,EAC9B,eAAgB,EAAE,MAAkC,EACpD,MAAO,EAAE,IAAK,EACd,SAAU,EAAE,IAAK,EACjB,QAAS,EAAE,EAAG,EACd,KAAM,EAAE,MAAO,EACf,IAAK,ECiD6B,MAAM,EJgC1C,IAAK,EAAE,AAAC,EACR,iFAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,uCAAO,EACL,IAAK,EAAE,GAAI,EGrFX,qCAAG,EACD,IAAK,EClB2B,MAAyB,EDmB3D,0CAAQ,EACN,IAAK,EAAE,GAAI,EACb,4CAAU,EACR,IAAK,EAAE,GAAI,EACb,iDAAiB,EACf,eAAgB,ECQgB,MAAI,EDPpC,IAAK,EC0B2B,GAAM,EDzBxC,wDAAwB,EACtB,eAAgB,ECXgB,MAAO,EDYvC,IAAK,ECzB2B,GAAI,ED0BxC,yCAA8B,EAC5B,MAAO,EAAE,IAAK,EAChB,gCAAmB,EACjB,QAAS,EAAE,EAAG,EACd,MAAO,EAAE,GAAqB,EAC9B,IAAK,ECE6B,GAAwB,EDD1D,MAAO,EAAE,GAAI,EACb,mCAAE,EACA,MAAO,EAAE,IAAK,EACd,KAAM,EAAE,EAAG,EACX,KAAM,EAAE,AAAC,EACT,KAAM,EAAE,KAAM,EACd,MAAO,EAAE,AAAC,EACV,SAAU,EAAE,gBAA6C,EAC3D,mCAAE,EACA,MAAO,EAAE,WAAY,EACrB,KAAM,EAAE,AAAC,EACT,qCAAC,EACC,MAAO,EAAE,WAAY,EACrB,MAAO,EAAE,EAAqB,EAC9B,IAAK,ECjDyB,MAAyB,EDkD7D,sBAAW,EACT,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI,EACZ,IAAK,EAAE,GAAI,EACX,GAAI,EAAE,GAAI,EACV,KAAM,EAAE,GAAI,EACZ,QAAS,ECkByB,IAAK,EDjBvC,iCAAU,EACR,IAAK,EAAE,GAAI,EACb,+BAAQ,EACN,IAAK,EAAE,GAAI,EACb,oDAA+B,EAC7B,SAAU,EAAE,IAAK,EACjB,6DAAQ,EACN,IAAK,EAAE,GAAI,EACb,+DAAU,EACR,IAAK,EAAE,GAAI,EACf,2CAAoB,EAClB,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI,EACZ,UAAW,EAAE,GAAI,EACjB,MAAO,EAAE,IAAuB,EAChC,MAAO,EAAE,IAAK,EACd,SAAU,EAAE,KAAM,EGhDpB,mCAAsB,EHmDxB,YAAa,EACX,IAAK,EAAE,EAAG,EACV,MAAO,EAAE,GAAI,EACb,kBAAO,EACL,MAAO,EAAE,IAAK,EAClB,EAAG,EACD,IAAK,EAAE,GAAI,EACX,KAAM,EAAE,GAAI",
-"sources": ["../../../bower_components/wyrm/sass/wyrm_core/_mixin.sass","../../../bower_components/bourbon/dist/css3/_font-face.scss","../../../sass/_theme_badge_fa.sass","../../../sass/_theme_badge.sass","../../../bower_components/wyrm/sass/wyrm_core/_wy_variables.sass","../../../sass/_theme_variables.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_media.scss"],
-"names": [],
-"file": "badge_only.css"
-}
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.eot and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.eot differ
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.svg mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.svg
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.svg	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.svg	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,2671 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg>
+<metadata>
+Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016
+ By ,,,
+Copyright Dave Gandy 2016. All rights reserved.
+</metadata>
+<defs>
+<font id="FontAwesome" horiz-adv-x="1536" >
+  <font-face 
+    font-family="FontAwesome"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="1792"
+    panose-1="0 0 0 0 0 0 0 0 0 0"
+    ascent="1536"
+    descent="-256"
+    bbox="-1.02083 -256.962 2304.6 1537.02"
+    underline-thickness="0"
+    underline-position="0"
+    unicode-range="U+0020-F500"
+  />
+<missing-glyph horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".notdef" horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".null" horiz-adv-x="0" 
+ />
+    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="597" 
+ />
+    <glyph glyph-name="space" unicode=" " horiz-adv-x="448" 
+ />
+    <glyph glyph-name="dieresis" unicode="&#xa8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="copyright" unicode="&#xa9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="registered" unicode="&#xae;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="acute" unicode="&#xb4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="AE" unicode="&#xc6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="Oslash" unicode="&#xd8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="trademark" unicode="&#x2122;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="infinity" unicode="&#x221e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="notequal" unicode="&#x2260;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="glass" unicode="&#xf000;" horiz-adv-x="1792" 
+d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
+    <glyph glyph-name="music" unicode="&#xf001;" 
+d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89
+t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="search" unicode="&#xf002;" horiz-adv-x="1664" 
+d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5
+t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+    <glyph glyph-name="envelope" unicode="&#xf003;" horiz-adv-x="1792" 
+d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13
+t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z
+M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="heart" unicode="&#xf004;" horiz-adv-x="1792" 
+d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600
+q-18 -18 -44 -18z" />
+    <glyph glyph-name="star" unicode="&#xf005;" horiz-adv-x="1664" 
+d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455
+l502 -73q56 -9 56 -46z" />
+    <glyph glyph-name="star_empty" unicode="&#xf006;" horiz-adv-x="1664" 
+d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500
+l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
+    <glyph glyph-name="user" unicode="&#xf007;" horiz-adv-x="1280" 
+d="M1280 137q0 -109 -62.5 -187t-150.5 -78h-854q-88 0 -150.5 78t-62.5 187q0 85 8.5 160.5t31.5 152t58.5 131t94 89t134.5 34.5q131 -128 313 -128t313 128q76 0 134.5 -34.5t94 -89t58.5 -131t31.5 -152t8.5 -160.5zM1024 1024q0 -159 -112.5 -271.5t-271.5 -112.5
+t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="film" unicode="&#xf008;" horiz-adv-x="1920" 
+d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128
+q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45
+t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128
+q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19
+t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="th_large" unicode="&#xf009;" horiz-adv-x="1664" 
+d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38
+h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="th" unicode="&#xf00a;" horiz-adv-x="1792" 
+d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
+h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192
+q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="th_list" unicode="&#xf00b;" horiz-adv-x="1792" 
+d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
+h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="ok" unicode="&#xf00c;" horiz-adv-x="1792" 
+d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
+    <glyph glyph-name="remove" unicode="&#xf00d;" horiz-adv-x="1408" 
+d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68
+t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
+    <glyph glyph-name="zoom_in" unicode="&#xf00e;" horiz-adv-x="1664" 
+d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224
+q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5
+t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+    <glyph glyph-name="zoom_out" unicode="&#xf010;" horiz-adv-x="1664" 
+d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z
+M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z
+" />
+    <glyph glyph-name="off" unicode="&#xf011;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5
+t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
+    <glyph glyph-name="signal" unicode="&#xf012;" horiz-adv-x="1792" 
+d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="cog" unicode="&#xf013;" 
+d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38
+q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13
+l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22
+q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
+    <glyph glyph-name="trash" unicode="&#xf014;" horiz-adv-x="1408" 
+d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576
+q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832
+q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="home" unicode="&#xf015;" horiz-adv-x="1664" 
+d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5
+l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
+    <glyph glyph-name="file_alt" unicode="&#xf016;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+" />
+    <glyph glyph-name="time" unicode="&#xf017;" 
+d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="road" unicode="&#xf018;" horiz-adv-x="1920" 
+d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256
+q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
+    <glyph glyph-name="download_alt" unicode="&#xf019;" horiz-adv-x="1664" 
+d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136
+q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
+    <glyph glyph-name="download" unicode="&#xf01a;" 
+d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273
+t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="upload" unicode="&#xf01b;" 
+d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198
+t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="inbox" unicode="&#xf01c;" 
+d="M1023 576h316q-1 3 -2.5 8.5t-2.5 7.5l-212 496h-708l-212 -496q-1 -3 -2.5 -8.5t-2.5 -7.5h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552
+q25 -61 25 -123z" />
+    <glyph glyph-name="play_circle" unicode="&#xf01d;" 
+d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="repeat" unicode="&#xf01e;" 
+d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q15 0 25 -9
+l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
+    <glyph glyph-name="refresh" unicode="&#xf021;" 
+d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117
+q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5
+q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="list_alt" unicode="&#xf022;" horiz-adv-x="1792" 
+d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z
+M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5
+t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47
+t47 -113z" />
+    <glyph glyph-name="lock" unicode="&#xf023;" horiz-adv-x="1152" 
+d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="flag" unicode="&#xf024;" horiz-adv-x="1792" 
+d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48
+t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="headphones" unicode="&#xf025;" horiz-adv-x="1664" 
+d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78
+t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5
+t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
+    <glyph glyph-name="volume_off" unicode="&#xf026;" horiz-adv-x="768" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="volume_down" unicode="&#xf027;" horiz-adv-x="1152" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
+    <glyph glyph-name="volume_up" unicode="&#xf028;" horiz-adv-x="1664" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5
+t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289
+t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
+    <glyph glyph-name="qrcode" unicode="&#xf029;" horiz-adv-x="1408" 
+d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z
+M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
+    <glyph glyph-name="barcode" unicode="&#xf02a;" horiz-adv-x="1792" 
+d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z
+M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
+    <glyph glyph-name="tag" unicode="&#xf02b;" 
+d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91z" />
+    <glyph glyph-name="tags" unicode="&#xf02c;" horiz-adv-x="1920" 
+d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
+    <glyph glyph-name="book" unicode="&#xf02d;" horiz-adv-x="1664" 
+d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23
+q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906
+q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5
+t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
+    <glyph glyph-name="bookmark" unicode="&#xf02e;" horiz-adv-x="1280" 
+d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+    <glyph glyph-name="print" unicode="&#xf02f;" horiz-adv-x="1664" 
+d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68
+v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
+    <glyph glyph-name="camera" unicode="&#xf030;" horiz-adv-x="1920" 
+d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136
+q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="font" unicode="&#xf031;" horiz-adv-x="1664" 
+d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57
+q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -5 -0.5 -13.5t-0.5 -12.5q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5
+q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
+    <glyph glyph-name="bold" unicode="&#xf032;" horiz-adv-x="1408" 
+d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142
+q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5
+t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68 -0.5t68 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5
+t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
+    <glyph glyph-name="italic" unicode="&#xf033;" horiz-adv-x="1024" 
+d="M0 -126l17 85q22 7 61.5 16.5t72 19t59.5 23.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5
+q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
+    <glyph glyph-name="text_height" unicode="&#xf034;" horiz-adv-x="1792" 
+d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2
+t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5
+q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
+q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
+    <glyph glyph-name="text_width" unicode="&#xf035;" 
+d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1
+t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
+q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5
+t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49
+t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
+    <glyph glyph-name="align_left" unicode="&#xf036;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_center" unicode="&#xf037;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19
+h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_right" unicode="&#xf038;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_justify" unicode="&#xf039;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="list" unicode="&#xf03a;" horiz-adv-x="1792" 
+d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5
+t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344
+q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
+t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192
+q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="indent_left" unicode="&#xf03b;" horiz-adv-x="1792" 
+d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="indent_right" unicode="&#xf03c;" horiz-adv-x="1792" 
+d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="facetime_video" unicode="&#xf03d;" horiz-adv-x="1792" 
+d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5
+q39 -17 39 -59z" />
+    <glyph glyph-name="picture" unicode="&#xf03e;" horiz-adv-x="1920" 
+d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216
+q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="pencil" unicode="&#xf040;" 
+d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38
+q53 0 91 -38l235 -234q37 -39 37 -91z" />
+    <glyph glyph-name="map_marker" unicode="&#xf041;" horiz-adv-x="1024" 
+d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
+    <glyph glyph-name="adjust" unicode="&#xf042;" 
+d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="tint" unicode="&#xf043;" horiz-adv-x="1024" 
+d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362
+q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
+    <glyph glyph-name="edit" unicode="&#xf044;" horiz-adv-x="1792" 
+d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92
+l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
+    <glyph glyph-name="share" unicode="&#xf045;" horiz-adv-x="1664" 
+d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832
+q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5
+t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="check" unicode="&#xf046;" horiz-adv-x="1664" 
+d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832
+q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110
+q24 -24 24 -57t-24 -57z" />
+    <glyph glyph-name="move" unicode="&#xf047;" horiz-adv-x="1792" 
+d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45
+t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="step_backward" unicode="&#xf048;" horiz-adv-x="1024" 
+d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19z" />
+    <glyph glyph-name="fast_backward" unicode="&#xf049;" horiz-adv-x="1792" 
+d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19l710 710
+q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="backward" unicode="&#xf04a;" horiz-adv-x="1664" 
+d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="play" unicode="&#xf04b;" horiz-adv-x="1408" 
+d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
+    <glyph glyph-name="pause" unicode="&#xf04c;" 
+d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="stop" unicode="&#xf04d;" 
+d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="forward" unicode="&#xf04e;" horiz-adv-x="1664" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="fast_forward" unicode="&#xf050;" horiz-adv-x="1792" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19l-710 -710
+q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="step_forward" unicode="&#xf051;" horiz-adv-x="1024" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19z" />
+    <glyph glyph-name="eject" unicode="&#xf052;" horiz-adv-x="1538" 
+d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
+    <glyph glyph-name="chevron_left" unicode="&#xf053;" horiz-adv-x="1280" 
+d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="chevron_right" unicode="&#xf054;" horiz-adv-x="1280" 
+d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="plus_sign" unicode="&#xf055;" 
+d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5
+t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="minus_sign" unicode="&#xf056;" 
+d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="remove_sign" unicode="&#xf057;" 
+d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19
+q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ok_sign" unicode="&#xf058;" 
+d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="question_sign" unicode="&#xf059;" 
+d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59
+q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="info_sign" unicode="&#xf05a;" 
+d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23
+t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="screenshot" unicode="&#xf05b;" 
+d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109
+q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143
+q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="remove_circle" unicode="&#xf05c;" 
+d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5
+t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ok_circle" unicode="&#xf05d;" 
+d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198
+t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ban_circle" unicode="&#xf05e;" 
+d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61
+t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
+    <glyph glyph-name="arrow_left" unicode="&#xf060;" 
+d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5
+t32.5 -90.5z" />
+    <glyph glyph-name="arrow_right" unicode="&#xf061;" 
+d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
+    <glyph glyph-name="arrow_up" unicode="&#xf062;" horiz-adv-x="1664" 
+d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651
+q37 -39 37 -91z" />
+    <glyph glyph-name="arrow_down" unicode="&#xf063;" horiz-adv-x="1664" 
+d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+    <glyph glyph-name="share_alt" unicode="&#xf064;" horiz-adv-x="1792" 
+d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22
+t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
+    <glyph glyph-name="resize_full" unicode="&#xf065;" 
+d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332
+q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="resize_small" unicode="&#xf066;" 
+d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45
+t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
+    <glyph glyph-name="plus" unicode="&#xf067;" horiz-adv-x="1408" 
+d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="minus" unicode="&#xf068;" horiz-adv-x="1408" 
+d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="asterisk" unicode="&#xf069;" horiz-adv-x="1664" 
+d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154
+q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
+    <glyph glyph-name="exclamation_sign" unicode="&#xf06a;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192
+q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
+    <glyph glyph-name="gift" unicode="&#xf06b;" 
+d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320
+q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5
+t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="leaf" unicode="&#xf06c;" horiz-adv-x="1792" 
+d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268
+q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-43 0 -63.5 17.5t-45.5 59.5q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5
+t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
+    <glyph glyph-name="fire" unicode="&#xf06d;" horiz-adv-x="1408" 
+d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1
+q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
+    <glyph glyph-name="eye_open" unicode="&#xf06e;" horiz-adv-x="1792" 
+d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5
+t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
+    <glyph glyph-name="eye_close" unicode="&#xf070;" horiz-adv-x="1792" 
+d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9
+q-106 -189 -316 -567t-315 -566l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5
+q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z
+" />
+    <glyph glyph-name="warning_sign" unicode="&#xf071;" horiz-adv-x="1792" 
+d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185
+q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
+    <glyph glyph-name="plane" unicode="&#xf072;" horiz-adv-x="1408" 
+d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9
+q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
+    <glyph glyph-name="calendar" unicode="&#xf073;" horiz-adv-x="1664" 
+d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z
+M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64
+q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47
+h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="random" unicode="&#xf074;" horiz-adv-x="1792" 
+d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1
+t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5
+v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111
+t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+    <glyph glyph-name="comment" unicode="&#xf075;" horiz-adv-x="1792" 
+d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281
+q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="magnet" unicode="&#xf076;" 
+d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384
+q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="chevron_up" unicode="&#xf077;" horiz-adv-x="1792" 
+d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
+    <glyph glyph-name="chevron_down" unicode="&#xf078;" horiz-adv-x="1792" 
+d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
+    <glyph glyph-name="retweet" unicode="&#xf079;" horiz-adv-x="1920" 
+d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -10 7 -21
+zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z
+" />
+    <glyph glyph-name="shopping_cart" unicode="&#xf07a;" horiz-adv-x="1664" 
+d="M640 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1536 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1664 1088v-512q0 -24 -16.5 -42.5t-40.5 -21.5l-1044 -122q13 -60 13 -70q0 -16 -24 -64h920q26 0 45 -19t19 -45
+t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 11 8 31.5t16 36t21.5 40t15.5 29.5l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t19.5 -15.5t13 -24.5t8 -26t5.5 -29.5t4.5 -26h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="folder_close" unicode="&#xf07b;" horiz-adv-x="1664" 
+d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="folder_open" unicode="&#xf07c;" horiz-adv-x="1920" 
+d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5
+t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="resize_vertical" unicode="&#xf07d;" horiz-adv-x="768" 
+d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="resize_horizontal" unicode="&#xf07e;" horiz-adv-x="1792" 
+d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="bar_chart" unicode="&#xf080;" horiz-adv-x="2048" 
+d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
+    <glyph glyph-name="twitter_sign" unicode="&#xf081;" 
+d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4
+q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5
+t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="facebook_sign" unicode="&#xf082;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-188v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-532q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960z" />
+    <glyph glyph-name="camera_retro" unicode="&#xf083;" horiz-adv-x="1792" 
+d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5
+t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280
+q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="key" unicode="&#xf084;" horiz-adv-x="1792" 
+d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26
+l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5
+t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
+    <glyph glyph-name="cogs" unicode="&#xf085;" horiz-adv-x="1920" 
+d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -11 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5
+l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7
+l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -8 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31
+q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20
+t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68
+q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70
+q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
+    <glyph glyph-name="comments" unicode="&#xf086;" horiz-adv-x="1792" 
+d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224
+q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7
+q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
+    <glyph glyph-name="thumbs_up_alt" unicode="&#xf087;" 
+d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5
+t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769
+q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128
+q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
+    <glyph glyph-name="thumbs_down_alt" unicode="&#xf088;" 
+d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 31 18 69q0 37 -17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5
+t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z
+M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5
+h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -73 49 -163z" />
+    <glyph glyph-name="star_half" unicode="&#xf089;" horiz-adv-x="896" 
+d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
+    <glyph glyph-name="heart_empty" unicode="&#xf08a;" horiz-adv-x="1792" 
+d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559
+q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5
+q224 0 351 -124t127 -344z" />
+    <glyph glyph-name="signout" unicode="&#xf08b;" horiz-adv-x="1664" 
+d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704
+q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
+    <glyph glyph-name="linkedin_sign" unicode="&#xf08c;" 
+d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5
+q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="pushpin" unicode="&#xf08d;" horiz-adv-x="1152" 
+d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38
+t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
+    <glyph glyph-name="external_link" unicode="&#xf08e;" horiz-adv-x="1792" 
+d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320
+q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="signin" unicode="&#xf090;" 
+d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5
+q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="trophy" unicode="&#xf091;" horiz-adv-x="1664" 
+d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91
+t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96
+q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="github_sign" unicode="&#xf092;" 
+d="M519 336q4 6 -3 13q-9 7 -14 2q-4 -6 3 -13q9 -7 14 -2zM491 377q-5 7 -12 4q-6 -4 0 -12q7 -8 12 -5q6 4 0 13zM450 417q2 4 -5 8q-7 2 -8 -2q-3 -5 4 -8q8 -2 9 2zM471 394q2 1 1.5 4.5t-3.5 5.5q-6 7 -10 3t1 -11q6 -6 11 -2zM557 319q2 7 -9 11q-9 3 -13 -4
+q-2 -7 9 -11q9 -3 13 4zM599 316q0 8 -12 8q-10 0 -10 -8t11 -8t11 8zM638 323q-2 7 -13 5t-9 -9q2 -8 12 -6t10 10zM1280 640q0 212 -150 362t-362 150t-362 -150t-150 -362q0 -167 98 -300.5t252 -185.5q18 -3 26.5 5t8.5 20q0 52 -1 95q-6 -1 -15.5 -2.5t-35.5 -2t-48 4
+t-43.5 20t-29.5 41.5q-23 59 -57 74q-2 1 -4.5 3.5l-8 8t-7 9.5t4 7.5t19.5 3.5q6 0 15 -2t30 -15.5t33 -35.5q16 -28 37.5 -42t43.5 -14t38 3.5t30 9.5q7 47 33 69q-49 6 -86 18.5t-73 39t-55.5 76t-19.5 119.5q0 79 53 137q-24 62 5 136q19 6 54.5 -7.5t60.5 -29.5l26 -16
+q58 17 128 17t128 -17q11 7 28.5 18t55.5 26t57 9q29 -74 5 -136q53 -58 53 -137q0 -57 -14 -100.5t-35.5 -70t-53.5 -44.5t-62.5 -26t-68.5 -12q35 -31 35 -95q0 -40 -0.5 -89t-0.5 -51q0 -12 8.5 -20t26.5 -5q154 52 252 185.5t98 300.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="upload_alt" unicode="&#xf093;" horiz-adv-x="1664" 
+d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92
+t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
+    <glyph glyph-name="lemon" unicode="&#xf094;" 
+d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5
+q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44
+q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5
+q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -13 2 -25t3.5 -16.5t7.5 -20.5t8 -20q16 -40 25 -118.5t9 -136.5z" />
+    <glyph glyph-name="phone" unicode="&#xf095;" horiz-adv-x="1408" 
+d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -53 3.5t-57.5 12.5t-47 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-127 79 -264 216t-216 264q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47t-12.5 57.5t-3.5 53q0 92 51 186
+q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174q2 -1 19 -11.5t24 -14
+t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
+    <glyph glyph-name="check_empty" unicode="&#xf096;" horiz-adv-x="1408" 
+d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="bookmark_empty" unicode="&#xf097;" horiz-adv-x="1280" 
+d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289
+q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+    <glyph glyph-name="phone_sign" unicode="&#xf098;" 
+d="M1280 343q0 11 -2 16t-18 16.5t-40.5 25t-47.5 26.5t-45.5 25t-28.5 15q-5 3 -19 13t-25 15t-21 5q-15 0 -36.5 -20.5t-39.5 -45t-38.5 -45t-33.5 -20.5q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170 126.5t-127 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5
+t-3.5 16.5q0 13 20.5 33.5t45 38.5t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5
+t320.5 -216.5q6 -2 30 -11t33 -12.5t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z
+" />
+    <glyph glyph-name="twitter" unicode="&#xf099;" horiz-adv-x="1664" 
+d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41
+q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
+    <glyph glyph-name="facebook" unicode="&#xf09a;" horiz-adv-x="1024" 
+d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
+    <glyph glyph-name="github" unicode="&#xf09b;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -40 7t-13 30q0 3 0.5 76.5t0.5 134.5q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 119 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24
+q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-85 13.5q-45 -113 -8 -204q-79 -87 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-39 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5
+t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -88.5t0.5 -54.5q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103zM291 305q3 7 -7 12
+q-10 3 -13 -2q-3 -7 7 -12q9 -6 13 2zM322 271q7 5 -2 16q-10 9 -16 3q-7 -5 2 -16q10 -10 16 -3zM352 226q9 7 0 19q-8 13 -17 6q-9 -5 0 -18t17 -7zM394 184q8 8 -4 19q-12 12 -20 3q-9 -8 4 -19q12 -12 20 -3zM451 159q3 11 -13 16q-15 4 -19 -7t13 -15q15 -6 19 6z
+M514 154q0 13 -17 11q-16 0 -16 -11q0 -13 17 -11q16 0 16 11zM572 164q-2 11 -18 9q-16 -3 -14 -15t18 -8t14 14z" />
+    <glyph glyph-name="unlock" unicode="&#xf09c;" horiz-adv-x="1664" 
+d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5
+t316.5 -131.5t131.5 -316.5z" />
+    <glyph glyph-name="credit_card" unicode="&#xf09d;" horiz-adv-x="1920" 
+d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608
+q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
+    <glyph glyph-name="rss" unicode="&#xf09e;" horiz-adv-x="1408" 
+d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5
+t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294
+q187 -186 294 -425.5t120 -501.5z" />
+    <glyph glyph-name="hdd" unicode="&#xf0a0;" 
+d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5
+h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75
+l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
+    <glyph glyph-name="bullhorn" unicode="&#xf0a1;" horiz-adv-x="1792" 
+d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5
+t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
+    <glyph glyph-name="bell" unicode="&#xf0a2;" horiz-adv-x="1792" 
+d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z
+M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5
+t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+    <glyph glyph-name="certificate" unicode="&#xf0a3;" 
+d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70
+l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70
+l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
+    <glyph glyph-name="hand_right" unicode="&#xf0a4;" horiz-adv-x="1792" 
+d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106
+q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43
+q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5
+t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
+    <glyph glyph-name="hand_left" unicode="&#xf0a5;" horiz-adv-x="1792" 
+d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-8 9 -12 14q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576q-50 0 -89 -38.5
+t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45z
+M1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128q0 122 81.5 189t206.5 67
+q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="hand_up" unicode="&#xf0a6;" 
+d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576
+q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5
+t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76
+q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
+    <glyph glyph-name="hand_down" unicode="&#xf0a7;" 
+d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33
+t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580
+q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100
+q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
+    <glyph glyph-name="circle_arrow_left" unicode="&#xf0a8;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_right" unicode="&#xf0a9;" 
+d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_up" unicode="&#xf0aa;" 
+d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_down" unicode="&#xf0ab;" 
+d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="globe" unicode="&#xf0ac;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11
+q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 11t-9.5 10q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5
+q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5
+q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5
+t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-4 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3
+q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25
+q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5
+t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5
+t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10.5t17 -19.5q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21
+q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5
+q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3
+q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5
+t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q8 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5
+q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7
+q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
+    <glyph glyph-name="wrench" unicode="&#xf0ad;" horiz-adv-x="1664" 
+d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5
+t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
+    <glyph glyph-name="tasks" unicode="&#xf0ae;" horiz-adv-x="1792" 
+d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19
+t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="filter" unicode="&#xf0b0;" horiz-adv-x="1408" 
+d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
+    <glyph glyph-name="briefcase" unicode="&#xf0b1;" horiz-adv-x="1792" 
+d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68
+t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="fullscreen" unicode="&#xf0b2;" 
+d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144
+l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z
+" />
+    <glyph glyph-name="group" unicode="&#xf0c0;" horiz-adv-x="1920" 
+d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5
+t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75
+t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5
+t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
+    <glyph glyph-name="link" unicode="&#xf0c1;" horiz-adv-x="1664" 
+d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26
+l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15
+t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207
+q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
+    <glyph glyph-name="cloud" unicode="&#xf0c2;" horiz-adv-x="1920" 
+d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z
+" />
+    <glyph glyph-name="beaker" unicode="&#xf0c3;" horiz-adv-x="1664" 
+d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
+    <glyph glyph-name="cut" unicode="&#xf0c4;" horiz-adv-x="1792" 
+d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84
+q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148
+q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108
+q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6
+q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
+    <glyph glyph-name="copy" unicode="&#xf0c5;" horiz-adv-x="1792" 
+d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299
+h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
+    <glyph glyph-name="paper_clip" unicode="&#xf0c6;" horiz-adv-x="1408" 
+d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181
+l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235
+z" />
+    <glyph glyph-name="save" unicode="&#xf0c7;" 
+d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5
+h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
+    <glyph glyph-name="sign_blank" unicode="&#xf0c8;" 
+d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="reorder" unicode="&#xf0c9;" 
+d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45
+t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="ul" unicode="&#xf0ca;" horiz-adv-x="1792" 
+d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
+t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z
+M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="ol" unicode="&#xf0cb;" horiz-adv-x="1792" 
+d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362
+q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5
+t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 121.5t0.5 121.5v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216
+q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="strikethrough" unicode="&#xf0cc;" horiz-adv-x="1792" 
+d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 98 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6
+l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -56 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23
+l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
+    <glyph glyph-name="underline" unicode="&#xf0cd;" 
+d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47
+q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41
+q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472
+q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
+    <glyph glyph-name="table" unicode="&#xf0ce;" horiz-adv-x="1664" 
+d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23
+v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192
+q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192
+q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113
+z" />
+    <glyph glyph-name="magic" unicode="&#xf0d0;" horiz-adv-x="1664" 
+d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276
+l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
+    <glyph glyph-name="truck" unicode="&#xf0d1;" horiz-adv-x="1792" 
+d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5
+t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38
+t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="pinterest" unicode="&#xf0d2;" 
+d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134
+q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33
+q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="pinterest_sign" unicode="&#xf0d3;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5
+t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5
+t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
+    <glyph glyph-name="google_plus_sign" unicode="&#xf0d4;" 
+d="M917 631q0 26 -6 64h-362v-132h217q-3 -24 -16.5 -50t-37.5 -53t-66.5 -44.5t-96.5 -17.5q-99 0 -169 71t-70 171t70 171t169 71q92 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585
+h109v110h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="google_plus" unicode="&#xf0d5;" horiz-adv-x="2304" 
+d="M1437 623q0 -208 -87 -370.5t-248 -254t-369 -91.5q-149 0 -285 58t-234 156t-156 234t-58 285t58 285t156 234t234 156t285 58q286 0 491 -192l-199 -191q-117 113 -292 113q-123 0 -227.5 -62t-165.5 -168.5t-61 -232.5t61 -232.5t165.5 -168.5t227.5 -62
+q83 0 152.5 23t114.5 57.5t78.5 78.5t49 83t21.5 74h-416v252h692q12 -63 12 -122zM2304 745v-210h-209v-209h-210v209h-209v210h209v209h210v-209h209z" />
+    <glyph glyph-name="money" unicode="&#xf0d6;" horiz-adv-x="1920" 
+d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384
+v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="caret_down" unicode="&#xf0d7;" horiz-adv-x="1024" 
+d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="caret_up" unicode="&#xf0d8;" horiz-adv-x="1024" 
+d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="caret_left" unicode="&#xf0d9;" horiz-adv-x="640" 
+d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="caret_right" unicode="&#xf0da;" horiz-adv-x="640" 
+d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="columns" unicode="&#xf0db;" horiz-adv-x="1664" 
+d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="sort" unicode="&#xf0dc;" horiz-adv-x="1024" 
+d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="sort_down" unicode="&#xf0dd;" horiz-adv-x="1024" 
+d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="sort_up" unicode="&#xf0de;" horiz-adv-x="1024" 
+d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="envelope_alt" unicode="&#xf0e0;" horiz-adv-x="1792" 
+d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123
+q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
+    <glyph glyph-name="linkedin" unicode="&#xf0e1;" 
+d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329
+q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
+    <glyph glyph-name="undo" unicode="&#xf0e2;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
+    <glyph glyph-name="legal" unicode="&#xf0e3;" horiz-adv-x="1792" 
+d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5
+t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14
+q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28
+q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
+    <glyph glyph-name="dashboard" unicode="&#xf0e4;" horiz-adv-x="1792" 
+d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5
+t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5
+t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29
+q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="comment_alt" unicode="&#xf0e5;" horiz-adv-x="1792" 
+d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640
+q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5
+t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="comments_alt" unicode="&#xf0e6;" horiz-adv-x="1792" 
+d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257
+t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5
+t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129
+q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
+    <glyph glyph-name="bolt" unicode="&#xf0e7;" horiz-adv-x="896" 
+d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
+    <glyph glyph-name="sitemap" unicode="&#xf0e8;" horiz-adv-x="1792" 
+d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320
+q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68
+z" />
+    <glyph glyph-name="umbrella" unicode="&#xf0e9;" horiz-adv-x="1664" 
+d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97
+q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69
+q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
+    <glyph glyph-name="paste" unicode="&#xf0ea;" horiz-adv-x="1792" 
+d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28
+h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
+    <glyph glyph-name="light_bulb" unicode="&#xf0eb;" horiz-adv-x="1024" 
+d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134
+q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47
+q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5
+t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
+    <glyph glyph-name="exchange" unicode="&#xf0ec;" horiz-adv-x="1792" 
+d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9
+q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+    <glyph glyph-name="cloud_download" unicode="&#xf0ed;" horiz-adv-x="1920" 
+d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+    <glyph glyph-name="cloud_upload" unicode="&#xf0ee;" horiz-adv-x="1920" 
+d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+    <glyph glyph-name="user_md" unicode="&#xf0f0;" horiz-adv-x="1408" 
+d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56
+t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68
+t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
+t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="stethoscope" unicode="&#xf0f1;" horiz-adv-x="1408" 
+d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48
+t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252
+t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="suitcase" unicode="&#xf0f2;" horiz-adv-x="1792" 
+d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66
+t66 -158z" />
+    <glyph glyph-name="bell_alt" unicode="&#xf0f3;" horiz-adv-x="1792" 
+d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5
+t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+    <glyph glyph-name="coffee" unicode="&#xf0f4;" horiz-adv-x="1920" 
+d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45
+t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="food" unicode="&#xf0f5;" horiz-adv-x="1408" 
+d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45
+t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="file_text_alt" unicode="&#xf0f6;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704
+q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
+    <glyph glyph-name="building" unicode="&#xf0f7;" horiz-adv-x="1408" 
+d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="hospital" unicode="&#xf0f8;" horiz-adv-x="1408" 
+d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5
+t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320
+v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="ambulance" unicode="&#xf0f9;" horiz-adv-x="1920" 
+d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152
+q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="medkit" unicode="&#xf0fa;" horiz-adv-x="1792" 
+d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32
+q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="fighter_jet" unicode="&#xf0fb;" horiz-adv-x="1920" 
+d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96
+q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q128 -28 200 -52t80 -34z" />
+    <glyph glyph-name="beer" unicode="&#xf0fc;" horiz-adv-x="1664" 
+d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
+    <glyph glyph-name="h_sign" unicode="&#xf0fd;" 
+d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="f0fe" unicode="&#xf0fe;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="double_angle_left" unicode="&#xf100;" horiz-adv-x="1024" 
+d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_right" unicode="&#xf101;" horiz-adv-x="1024" 
+d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23
+l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_up" unicode="&#xf102;" horiz-adv-x="1152" 
+d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393
+q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_down" unicode="&#xf103;" horiz-adv-x="1152" 
+d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="angle_left" unicode="&#xf104;" horiz-adv-x="640" 
+d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="angle_right" unicode="&#xf105;" horiz-adv-x="640" 
+d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="angle_up" unicode="&#xf106;" horiz-adv-x="1152" 
+d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="angle_down" unicode="&#xf107;" horiz-adv-x="1152" 
+d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="desktop" unicode="&#xf108;" horiz-adv-x="1920" 
+d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19
+t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="laptop" unicode="&#xf109;" horiz-adv-x="1920" 
+d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z
+M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
+    <glyph glyph-name="tablet" unicode="&#xf10a;" horiz-adv-x="1152" 
+d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832
+q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="mobile_phone" unicode="&#xf10b;" horiz-adv-x="768" 
+d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136
+q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="circle_blank" unicode="&#xf10c;" 
+d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103
+t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="quote_left" unicode="&#xf10d;" horiz-adv-x="1664" 
+d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z
+M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
+    <glyph glyph-name="quote_right" unicode="&#xf10e;" horiz-adv-x="1664" 
+d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216
+v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
+    <glyph glyph-name="spinner" unicode="&#xf110;" horiz-adv-x="1792" 
+d="M526 142q0 -53 -37.5 -90.5t-90.5 -37.5q-52 0 -90 38t-38 90q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 -64q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -53 -37.5 -90.5t-90.5 -37.5
+t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1522 142q0 -52 -38 -90t-90 -38q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM558 1138q0 -66 -47 -113t-113 -47t-113 47t-47 113t47 113t113 47t113 -47t47 -113z
+M1728 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1088 1344q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1618 1138q0 -93 -66 -158.5t-158 -65.5q-93 0 -158.5 65.5t-65.5 158.5
+q0 92 65.5 158t158.5 66q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="circle" unicode="&#xf111;" 
+d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="reply" unicode="&#xf112;" horiz-adv-x="1792" 
+d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19
+l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
+    <glyph glyph-name="github_alt" unicode="&#xf113;" horiz-adv-x="1664" 
+d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320
+q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86
+t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218
+q0 -87 -27 -168q136 -160 136 -398z" />
+    <glyph glyph-name="folder_close_alt" unicode="&#xf114;" horiz-adv-x="1664" 
+d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320
+q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="folder_open_alt" unicode="&#xf115;" horiz-adv-x="1920" 
+d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68
+v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z
+" />
+    <glyph glyph-name="expand_alt" unicode="&#xf116;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="collapse_alt" unicode="&#xf117;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="smile" unicode="&#xf118;" 
+d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5
+t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="frown" unicode="&#xf119;" 
+d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204
+t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="meh" unicode="&#xf11a;" 
+d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="gamepad" unicode="&#xf11b;" horiz-adv-x="1920" 
+d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150
+t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
+    <glyph glyph-name="keyboard" unicode="&#xf11c;" horiz-adv-x="1920" 
+d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16
+h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16
+h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96
+q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896
+h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="flag_alt" unicode="&#xf11d;" horiz-adv-x="1792" 
+d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9
+h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102
+q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+    <glyph glyph-name="flag_checkered" unicode="&#xf11e;" horiz-adv-x="1792" 
+d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2
+q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266
+q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8
+q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+    <glyph glyph-name="terminal" unicode="&#xf120;" horiz-adv-x="1664" 
+d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9
+t9 -23z" />
+    <glyph glyph-name="code" unicode="&#xf121;" horiz-adv-x="1920" 
+d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5
+l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
+    <glyph glyph-name="reply_all" unicode="&#xf122;" horiz-adv-x="1792" 
+d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1
+q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
+    <glyph glyph-name="star_half_empty" unicode="&#xf123;" horiz-adv-x="1664" 
+d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5
+l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
+    <glyph glyph-name="location_arrow" unicode="&#xf124;" horiz-adv-x="1408" 
+d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
+    <glyph glyph-name="crop" unicode="&#xf125;" horiz-adv-x="1664" 
+d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23
+v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="code_fork" unicode="&#xf126;" horiz-adv-x="1024" 
+d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5
+q-2 -287 -226 -414q-67 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497
+q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="unlink" unicode="&#xf127;" horiz-adv-x="1664" 
+d="M439 265l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320
+q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18
+l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9
+t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+    <glyph glyph-name="question" unicode="&#xf128;" horiz-adv-x="1024" 
+d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5
+t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
+    <glyph glyph-name="_279" unicode="&#xf129;" horiz-adv-x="640" 
+d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192
+q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="exclamation" unicode="&#xf12a;" horiz-adv-x="640" 
+d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
+    <glyph glyph-name="superscript" unicode="&#xf12b;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+M1534 846v-206h-514l-3 27q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5
+t-65.5 -51.5t-30.5 -63h232v80h126z" />
+    <glyph glyph-name="subscript" unicode="&#xf12c;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+M1536 -50v-206h-514l-4 27q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73
+h232v80h126z" />
+    <glyph glyph-name="_283" unicode="&#xf12d;" horiz-adv-x="1920" 
+d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
+    <glyph glyph-name="puzzle_piece" unicode="&#xf12e;" horiz-adv-x="1664" 
+d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5
+t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89
+q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117
+q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
+    <glyph glyph-name="microphone" unicode="&#xf130;" horiz-adv-x="1152" 
+d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5
+t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
+    <glyph glyph-name="microphone_off" unicode="&#xf131;" horiz-adv-x="1408" 
+d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128
+q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23
+t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
+    <glyph glyph-name="shield" unicode="&#xf132;" horiz-adv-x="1280" 
+d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150
+t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="calendar_empty" unicode="&#xf133;" horiz-adv-x="1664" 
+d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="fire_extinguisher" unicode="&#xf134;" horiz-adv-x="1408" 
+d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800
+q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113
+q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
+    <glyph glyph-name="rocket" unicode="&#xf135;" horiz-adv-x="1664" 
+d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1
+q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
+    <glyph glyph-name="maxcdn" unicode="&#xf136;" horiz-adv-x="1792" 
+d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
+    <glyph glyph-name="chevron_sign_left" unicode="&#xf137;" 
+d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_right" unicode="&#xf138;" 
+d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_up" unicode="&#xf139;" 
+d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_down" unicode="&#xf13a;" 
+d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="html5" unicode="&#xf13b;" horiz-adv-x="1408" 
+d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
+    <glyph glyph-name="css3" unicode="&#xf13c;" horiz-adv-x="1792" 
+d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
+    <glyph glyph-name="anchor" unicode="&#xf13d;" horiz-adv-x="1792" 
+d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352
+q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19
+t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="unlock_alt" unicode="&#xf13e;" horiz-adv-x="1152" 
+d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181
+v-320h736z" />
+    <glyph glyph-name="bullseye" unicode="&#xf140;" 
+d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150
+t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ellipsis_horizontal" unicode="&#xf141;" horiz-adv-x="1408" 
+d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="ellipsis_vertical" unicode="&#xf142;" horiz-adv-x="384" 
+d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="_303" unicode="&#xf143;" 
+d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 233 -176.5 396.5t-396.5 176.5q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128
+q13 0 23 10t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="play_sign" unicode="&#xf144;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56
+q16 -8 32 -8q17 0 32 9z" />
+    <glyph glyph-name="ticket" unicode="&#xf145;" horiz-adv-x="1792" 
+d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136
+t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
+    <glyph glyph-name="minus_sign_alt" unicode="&#xf146;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="check_minus" unicode="&#xf147;" horiz-adv-x="1408" 
+d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5
+t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="level_up" unicode="&#xf148;" horiz-adv-x="1024" 
+d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
+    <glyph glyph-name="level_down" unicode="&#xf149;" horiz-adv-x="1024" 
+d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
+    <glyph glyph-name="check_sign" unicode="&#xf14a;" 
+d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5
+t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="edit_sign" unicode="&#xf14b;" 
+d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_312" unicode="&#xf14c;" 
+d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960
+q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="share_sign" unicode="&#xf14d;" 
+d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q11 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5
+t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="compass" unicode="&#xf14e;" 
+d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="collapse" unicode="&#xf150;" 
+d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="collapse_top" unicode="&#xf151;" 
+d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_317" unicode="&#xf152;" 
+d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="eur" unicode="&#xf153;" horiz-adv-x="1024" 
+d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9
+t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26
+l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
+    <glyph glyph-name="gbp" unicode="&#xf154;" horiz-adv-x="1024" 
+d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7
+q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
+    <glyph glyph-name="usd" unicode="&#xf155;" horiz-adv-x="1024" 
+d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43
+t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5
+t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50
+t53 -63.5t31.5 -76.5t13 -94z" />
+    <glyph glyph-name="inr" unicode="&#xf156;" horiz-adv-x="898" 
+d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102
+q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="jpy" unicode="&#xf157;" horiz-adv-x="1027" 
+d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61
+l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
+    <glyph glyph-name="rub" unicode="&#xf158;" horiz-adv-x="1280" 
+d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128
+q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
+    <glyph glyph-name="krw" unicode="&#xf159;" horiz-adv-x="1792" 
+d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23
+t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28
+q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="btc" unicode="&#xf15a;" horiz-adv-x="1280" 
+d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164
+l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30
+t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
+    <glyph glyph-name="file" unicode="&#xf15b;" 
+d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
+    <glyph glyph-name="file_text" unicode="&#xf15c;" 
+d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704
+q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
+    <glyph glyph-name="sort_by_alphabet" unicode="&#xf15d;" horiz-adv-x="1664" 
+d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23
+v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162
+l230 -662h70z" />
+    <glyph glyph-name="_329" unicode="&#xf15e;" horiz-adv-x="1664" 
+d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150
+v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248
+v119h121z" />
+    <glyph glyph-name="sort_by_attributes" unicode="&#xf160;" horiz-adv-x="1792" 
+d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832
+q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="sort_by_attributes_alt" unicode="&#xf161;" horiz-adv-x="1792" 
+d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192
+q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="sort_by_order" unicode="&#xf162;" 
+d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23
+zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5
+t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
+    <glyph glyph-name="sort_by_order_alt" unicode="&#xf163;" 
+d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9
+t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13
+q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
+    <glyph glyph-name="_334" unicode="&#xf164;" horiz-adv-x="1664" 
+d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76
+q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5
+t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
+    <glyph glyph-name="_335" unicode="&#xf165;" horiz-adv-x="1664" 
+d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135
+t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121
+t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
+    <glyph glyph-name="youtube_sign" unicode="&#xf166;" 
+d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 17 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15
+q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38
+q21 -29 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5
+q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78q7 -23 23 -69l24 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38
+q-51 0 -78 -38q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5
+h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="youtube" unicode="&#xf167;" 
+d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73
+q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51
+q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99
+q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-38 -51 -106 -51q-67 0 -105 51
+q-28 38 -28 118v175q0 80 28 117q38 51 105 51q68 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
+    <glyph glyph-name="xing" unicode="&#xf168;" horiz-adv-x="1408" 
+d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942
+q25 45 64 45h241q22 0 31 -15z" />
+    <glyph glyph-name="xing_sign" unicode="&#xf169;" 
+d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1
+l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="youtube_play" unicode="&#xf16a;" horiz-adv-x="1792" 
+d="M711 408l484 250l-484 253v-503zM896 1270q168 0 324.5 -4.5t229.5 -9.5l73 -4q1 0 17 -1.5t23 -3t23.5 -4.5t28.5 -8t28 -13t31 -19.5t29 -26.5q6 -6 15.5 -18.5t29 -58.5t26.5 -101q8 -64 12.5 -136.5t5.5 -113.5v-40v-136q1 -145 -18 -290q-7 -55 -25 -99.5t-32 -61.5
+l-14 -17q-14 -15 -29 -26.5t-31 -19t-28 -12.5t-28.5 -8t-24 -4.5t-23 -3t-16.5 -1.5q-251 -19 -627 -19q-207 2 -359.5 6.5t-200.5 7.5l-49 4l-36 4q-36 5 -54.5 10t-51 21t-56.5 41q-6 6 -15.5 18.5t-29 58.5t-26.5 101q-8 64 -12.5 136.5t-5.5 113.5v40v136
+q-1 145 18 290q7 55 25 99.5t32 61.5l14 17q14 15 29 26.5t31 19.5t28 13t28.5 8t23.5 4.5t23 3t17 1.5q251 18 627 18z" />
+    <glyph glyph-name="dropbox" unicode="&#xf16b;" horiz-adv-x="1792" 
+d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
+    <glyph glyph-name="stackexchange" unicode="&#xf16c;" 
+d="M1289 -96h-1118v480h-160v-640h1438v640h-160v-480zM347 428l33 157l783 -165l-33 -156zM450 802l67 146l725 -339l-67 -145zM651 1158l102 123l614 -513l-102 -123zM1048 1536l477 -641l-128 -96l-477 641zM330 65v159h800v-159h-800z" />
+    <glyph glyph-name="instagram" unicode="&#xf16d;" 
+d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1162 640q0 -164 -115 -279t-279 -115t-279 115t-115 279t115 279t279 115t279 -115t115 -279zM1270 1050q0 -38 -27 -65t-65 -27t-65 27t-27 65t27 65t65 27t65 -27t27 -65zM768 1270
+q-7 0 -76.5 0.5t-105.5 0t-96.5 -3t-103 -10t-71.5 -18.5q-50 -20 -88 -58t-58 -88q-11 -29 -18.5 -71.5t-10 -103t-3 -96.5t0 -105.5t0.5 -76.5t-0.5 -76.5t0 -105.5t3 -96.5t10 -103t18.5 -71.5q20 -50 58 -88t88 -58q29 -11 71.5 -18.5t103 -10t96.5 -3t105.5 0t76.5 0.5
+t76.5 -0.5t105.5 0t96.5 3t103 10t71.5 18.5q50 20 88 58t58 88q11 29 18.5 71.5t10 103t3 96.5t0 105.5t-0.5 76.5t0.5 76.5t0 105.5t-3 96.5t-10 103t-18.5 71.5q-20 50 -58 88t-88 58q-29 11 -71.5 18.5t-103 10t-96.5 3t-105.5 0t-76.5 -0.5zM1536 640q0 -229 -5 -317
+q-10 -208 -124 -322t-322 -124q-88 -5 -317 -5t-317 5q-208 10 -322 124t-124 322q-5 88 -5 317t5 317q10 208 124 322t322 124q88 5 317 5t317 -5q208 -10 322 -124t124 -322q5 -88 5 -317z" />
+    <glyph glyph-name="flickr" unicode="&#xf16e;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150
+t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
+    <glyph glyph-name="adn" unicode="&#xf170;" 
+d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="f171" unicode="&#xf171;" horiz-adv-x="1408" 
+d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22
+t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18
+t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5
+t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
+    <glyph glyph-name="bitbucket_sign" unicode="&#xf172;" 
+d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5
+t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z
+M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="tumblr" unicode="&#xf173;" horiz-adv-x="1024" 
+d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14
+q78 2 134 29z" />
+    <glyph glyph-name="tumblr_sign" unicode="&#xf174;" 
+d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="long_arrow_down" unicode="&#xf175;" horiz-adv-x="768" 
+d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
+    <glyph glyph-name="long_arrow_up" unicode="&#xf176;" horiz-adv-x="768" 
+d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
+    <glyph glyph-name="long_arrow_left" unicode="&#xf177;" horiz-adv-x="1792" 
+d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="long_arrow_right" unicode="&#xf178;" horiz-adv-x="1792" 
+d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
+    <glyph glyph-name="apple" unicode="&#xf179;" horiz-adv-x="1408" 
+d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q113 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65
+q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
+    <glyph glyph-name="windows" unicode="&#xf17a;" horiz-adv-x="1664" 
+d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
+    <glyph glyph-name="android" unicode="&#xf17b;" horiz-adv-x="1408" 
+d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30
+t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5
+h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
+    <glyph glyph-name="linux" unicode="&#xf17c;" 
+d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-10 -11 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z
+M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7
+q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15
+q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5
+t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19
+q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63
+q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18q-2 -1 -4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92
+q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152
+q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-6 0 -8 -2t0 -4
+t5 -3q14 -4 18 -31q0 -3 8 2q2 2 2 3zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5
+t-30 -18.5t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43
+q-19 4 -51 9.5t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49
+t-14 -48q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54
+q110 143 124 195q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5
+t-40.5 -33.5t-61 -14q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5
+t15.5 47.5q1 -31 8 -56.5t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
+    <glyph glyph-name="dribble" unicode="&#xf17d;" 
+d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81
+t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19
+q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -5 6.5 -17t7.5 -17q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6
+t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="skype" unicode="&#xf17e;" 
+d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5
+t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5
+q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80
+q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
+    <glyph glyph-name="foursquare" unicode="&#xf180;" horiz-adv-x="1280" 
+d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z
+M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324
+l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
+    <glyph glyph-name="trello" unicode="&#xf181;" 
+d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408
+q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="female" unicode="&#xf182;" horiz-adv-x="1280" 
+d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43
+q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="male" unicode="&#xf183;" horiz-adv-x="1024" 
+d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z
+M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="gittip" unicode="&#xf184;" 
+d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="sun" unicode="&#xf185;" horiz-adv-x="1792" 
+d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4
+l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94
+q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
+    <glyph glyph-name="_366" unicode="&#xf186;" 
+d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61
+t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
+    <glyph glyph-name="archive" unicode="&#xf187;" horiz-adv-x="1792" 
+d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536
+q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="bug" unicode="&#xf188;" horiz-adv-x="1664" 
+d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207
+q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19
+t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
+    <glyph glyph-name="vk" unicode="&#xf189;" horiz-adv-x="1920" 
+d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-40 -51 -55 -72t-30.5 -49.5t-12 -42t13 -34.5t32.5 -43t57 -53q4 -2 5 -4q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58
+t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6
+q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q16 19 38 30q53 26 239 24
+q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2
+q39 5 64 -2.5t31 -16.5z" />
+    <glyph glyph-name="weibo" unicode="&#xf18a;" horiz-adv-x="1792" 
+d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12
+q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422
+q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178
+q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z
+M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
+    <glyph glyph-name="renren" unicode="&#xf18b;" 
+d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495
+q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
+    <glyph glyph-name="_372" unicode="&#xf18c;" horiz-adv-x="1408" 
+d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5
+t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56
+t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -4 1 -50t-1 -72q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5
+t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
+    <glyph glyph-name="stack_exchange" unicode="&#xf18d;" horiz-adv-x="1280" 
+d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z
+" />
+    <glyph glyph-name="_374" unicode="&#xf18e;" 
+d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="arrow_circle_alt_left" unicode="&#xf190;" 
+d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_376" unicode="&#xf191;" 
+d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="dot_circle_alt" unicode="&#xf192;" 
+d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5
+t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_378" unicode="&#xf193;" horiz-adv-x="1664" 
+d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128
+q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 17 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
+    <glyph glyph-name="vimeo_square" unicode="&#xf194;" 
+d="M1292 898q10 216 -161 222q-231 8 -312 -261q44 19 82 19q85 0 74 -96q-4 -57 -74 -167t-105 -110q-43 0 -82 169q-13 54 -45 255q-30 189 -160 177q-59 -7 -164 -100l-81 -72l-81 -72l52 -67q76 52 87 52q57 0 107 -179q15 -55 45 -164.5t45 -164.5q68 -179 164 -179
+q157 0 383 294q220 283 226 444zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_380" unicode="&#xf195;" horiz-adv-x="1152" 
+d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160
+q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="plus_square_o" unicode="&#xf196;" horiz-adv-x="1408" 
+d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832
+q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_382" unicode="&#xf197;" horiz-adv-x="2176" 
+d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40
+t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29
+q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
+    <glyph glyph-name="_383" unicode="&#xf198;" horiz-adv-x="1664" 
+d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9
+q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102
+t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
+    <glyph glyph-name="_384" unicode="&#xf199;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69
+q-47 32 -142 92.5t-142 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13
+t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
+    <glyph glyph-name="_385" unicode="&#xf19a;" horiz-adv-x="1792" 
+d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5
+t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21
+t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286
+t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273
+t273 -182.5t331.5 -68z" />
+    <glyph glyph-name="_386" unicode="&#xf19b;" horiz-adv-x="1792" 
+d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
+    <glyph glyph-name="_387" unicode="&#xf19c;" horiz-adv-x="2048" 
+d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64
+q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
+    <glyph glyph-name="_388" unicode="&#xf19d;" horiz-adv-x="2304" 
+d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433
+q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
+    <glyph glyph-name="_389" unicode="&#xf19e;" 
+d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q44 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0
+q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
+    <glyph glyph-name="uniF1A0" unicode="&#xf1a0;" 
+d="M768 750h725q12 -67 12 -128q0 -217 -91 -387.5t-259.5 -266.5t-386.5 -96q-157 0 -299 60.5t-245 163.5t-163.5 245t-60.5 299t60.5 299t163.5 245t245 163.5t299 60.5q300 0 515 -201l-209 -201q-123 119 -306 119q-129 0 -238.5 -65t-173.5 -176.5t-64 -243.5
+t64 -243.5t173.5 -176.5t238.5 -65q87 0 160 24t120 60t82 82t51.5 87t22.5 78h-436v264z" />
+    <glyph glyph-name="f1a1" unicode="&#xf1a1;" horiz-adv-x="1792" 
+d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26
+t-26 63t26 63.5t63 26.5t63.5 -26t26.5 -64zM1434 670q0 49 -35 84t-85 35t-86 -36q-130 90 -311 96l63 283l200 -45q0 -37 26 -63t63 -26t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5q-54 0 -80 -50l-221 49q-19 5 -25 -16l-69 -312q-180 -7 -309 -97q-35 37 -87 37
+q-50 0 -85 -35t-35 -84q0 -35 18.5 -64t49.5 -44q-6 -27 -6 -56q0 -142 140 -243t337 -101q198 0 338 101t140 243q0 32 -7 57q30 15 48 43.5t18 63.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191
+t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_392" unicode="&#xf1a2;" 
+d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54
+q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1229 666q0 42 -30 72t-73 30q-42 0 -73 -31q-113 78 -267 82l54 243l171 -39q1 -32 23.5 -54t53.5 -22q32 0 54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5q-48 0 -69 -43l-189 42q-17 5 -21 -13l-60 -268q-154 -6 -265 -83
+q-30 32 -74 32q-43 0 -73 -30t-30 -72q0 -30 16 -55t42 -38q-5 -25 -5 -48q0 -122 120 -208.5t289 -86.5q170 0 290 86.5t120 208.5q0 25 -6 49q25 13 40.5 37.5t15.5 54.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_393" unicode="&#xf1a3;" 
+d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150
+v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103
+t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="f1a4" unicode="&#xf1a4;" horiz-adv-x="1920" 
+d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328
+v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
+    <glyph glyph-name="_395" unicode="&#xf1a5;" 
+d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="_396" unicode="&#xf1a6;" horiz-adv-x="2048" 
+d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123
+v-369h123z" />
+    <glyph glyph-name="_397" unicode="&#xf1a7;" 
+d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101
+v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_398" unicode="&#xf1a8;" horiz-adv-x="2038" 
+d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14
+q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24
+q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33
+q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5
+t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43
+q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5
+t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13
+t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
+    <glyph glyph-name="_399" unicode="&#xf1a9;" 
+d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10
+q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14
+q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14
+t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44
+q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
+    <glyph glyph-name="_400" unicode="&#xf1aa;" 
+d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z
+M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5
+t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5
+q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126
+t135.5 51q85 0 145 -60.5t60 -145.5z" />
+    <glyph glyph-name="f1ab" unicode="&#xf1ab;" 
+d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5
+q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28
+q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z
+M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11
+q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q107 36 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5
+q20 0 20 -21v-418z" />
+    <glyph glyph-name="_402" unicode="&#xf1ac;" horiz-adv-x="1792" 
+d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48
+l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23
+t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128
+q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128
+q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
+    <glyph glyph-name="_403" unicode="&#xf1ad;" 
+d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9
+t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64
+q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
+q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9
+t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64
+q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
+q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9
+t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
+    <glyph glyph-name="_404" unicode="&#xf1ae;" horiz-adv-x="1280" 
+d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68q29 28 68.5 28t67.5 -28l228 -228h368l228 228q28 28 68 28t68 -28q28 -29 28 -68.5t-28 -67.5zM864 1152
+q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="uniF1B1" unicode="&#xf1b0;" horiz-adv-x="1664" 
+d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5
+q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819
+q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5
+t100.5 134t141.5 55.5z" />
+    <glyph glyph-name="_406" unicode="&#xf1b1;" horiz-adv-x="768" 
+d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
+    <glyph glyph-name="_407" unicode="&#xf1b2;" horiz-adv-x="1792" 
+d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z
+" />
+    <glyph glyph-name="_408" unicode="&#xf1b3;" horiz-adv-x="2304" 
+d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67
+t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-4 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70
+v-400l434 -186q36 -16 57 -48t21 -70z" />
+    <glyph glyph-name="_409" unicode="&#xf1b4;" horiz-adv-x="2048" 
+d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658
+q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204
+q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
+    <glyph glyph-name="_410" unicode="&#xf1b5;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5
+t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217
+t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
+    <glyph glyph-name="_411" unicode="&#xf1b6;" horiz-adv-x="1792" 
+d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5
+q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89
+q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
+    <glyph glyph-name="_412" unicode="&#xf1b7;" 
+d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5
+q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5
+q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z
+" />
+    <glyph glyph-name="_413" unicode="&#xf1b8;" horiz-adv-x="1792" 
+d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188
+l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5
+t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1
+q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
+    <glyph glyph-name="_414" unicode="&#xf1b9;" horiz-adv-x="2048" 
+d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384
+q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5
+l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="_415" unicode="&#xf1ba;" horiz-adv-x="2048" 
+d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5
+t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z
+M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
+    <glyph glyph-name="_416" unicode="&#xf1bb;" 
+d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384
+q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
+    <glyph glyph-name="_417" unicode="&#xf1bc;" 
+d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64
+q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37
+q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_418" unicode="&#xf1bd;" horiz-adv-x="1024" 
+d="M1024 1233l-303 -582l24 -31h279v-415h-507l-44 -30l-142 -273l-30 -30h-301v303l303 583l-24 30h-279v415h507l44 30l142 273l30 30h301v-303z" />
+    <glyph glyph-name="_419" unicode="&#xf1be;" horiz-adv-x="2304" 
+d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11
+q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245
+q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785
+l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242
+q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236
+q0 -11 -8 -19t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786
+q-13 2 -22 11t-9 22v899q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
+    <glyph glyph-name="uniF1C0" unicode="&#xf1c0;" 
+d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127
+t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5
+t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
+    <glyph glyph-name="uniF1C1" unicode="&#xf1c1;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197
+q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8
+q-1 1 -1 2q-1 2 -1 3q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
+    <glyph glyph-name="_422" unicode="&#xf1c2;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4q0 3 -0.5 6.5t-1.5 8t-1 6.5q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5
+t-3.5 -21.5l-4 -21h-4l-2 21q-2 26 -7 46l-99 438h90v107h-300z" />
+    <glyph glyph-name="_423" unicode="&#xf1c3;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107
+h-290v-107h68l189 -272l-194 -283h-68z" />
+    <glyph glyph-name="_424" unicode="&#xf1c4;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
+    <glyph glyph-name="_425" unicode="&#xf1c5;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
+    <glyph glyph-name="_426" unicode="&#xf1c6;" 
+d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400
+v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79
+q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
+    <glyph glyph-name="_427" unicode="&#xf1c7;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5
+q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
+    <glyph glyph-name="_428" unicode="&#xf1c8;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
+    <glyph glyph-name="_429" unicode="&#xf1c9;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243
+l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
+    <glyph glyph-name="_430" unicode="&#xf1ca;" 
+d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406
+q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
+    <glyph glyph-name="_431" unicode="&#xf1cb;" horiz-adv-x="1792" 
+d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546
+q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
+    <glyph glyph-name="_432" unicode="&#xf1cc;" horiz-adv-x="2048" 
+d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94
+q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55
+t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97l93 -108q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5t-85 -189.5z" />
+    <glyph glyph-name="_433" unicode="&#xf1cd;" horiz-adv-x="1792" 
+d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194
+q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5
+t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
+    <glyph glyph-name="_434" unicode="&#xf1ce;" horiz-adv-x="1792" 
+d="M1760 640q0 -176 -68.5 -336t-184 -275.5t-275.5 -184t-336 -68.5t-336 68.5t-275.5 184t-184 275.5t-68.5 336q0 213 97 398.5t265 305.5t374 151v-228q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5
+t136.5 204t51 248.5q0 230 -145.5 406t-366.5 221v228q206 -31 374 -151t265 -305.5t97 -398.5z" />
+    <glyph glyph-name="uniF1D0" unicode="&#xf1d0;" horiz-adv-x="1792" 
+d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41
+t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170
+t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136
+q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
+    <glyph glyph-name="uniF1D1" unicode="&#xf1d1;" horiz-adv-x="1792" 
+d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251
+l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162
+q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33
+q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5
+t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF1D2" unicode="&#xf1d2;" 
+d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85
+q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392
+q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072
+q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_438" unicode="&#xf1d3;" horiz-adv-x="1792" 
+d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58
+q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47
+q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171
+v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
+    <glyph glyph-name="_439" unicode="&#xf1d4;" 
+d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF1D5" unicode="&#xf1d5;" horiz-adv-x="1280" 
+d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5
+t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153
+t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
+    <glyph glyph-name="uniF1D6" unicode="&#xf1d6;" horiz-adv-x="1792" 
+d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5
+q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20
+t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5
+t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
+    <glyph glyph-name="uniF1D7" unicode="&#xf1d7;" horiz-adv-x="2048" 
+d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25
+q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5
+q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109
+q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
+    <glyph glyph-name="_443" unicode="&#xf1d8;" horiz-adv-x="1792" 
+d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
+    <glyph glyph-name="_444" unicode="&#xf1d9;" horiz-adv-x="1792" 
+d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137
+l863 639l-478 -797z" />
+    <glyph glyph-name="_445" unicode="&#xf1da;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23
+t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_446" unicode="&#xf1db;" 
+d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_447" unicode="&#xf1dc;" horiz-adv-x="1792" 
+d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15
+t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2
+t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160
+q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5
+q0 -26 -12 -48t-36 -22z" />
+    <glyph glyph-name="_448" unicode="&#xf1dd;" horiz-adv-x="1280" 
+d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179
+q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
+    <glyph glyph-name="_449" unicode="&#xf1de;" 
+d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256
+q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
+    <glyph glyph-name="uniF1E0" unicode="&#xf1e0;" 
+d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5
+t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
+    <glyph glyph-name="_451" unicode="&#xf1e1;" 
+d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5
+t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_452" unicode="&#xf1e2;" horiz-adv-x="1792" 
+d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5
+t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91
+q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9
+t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+    <glyph glyph-name="_453" unicode="&#xf1e3;" horiz-adv-x="1792" 
+d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323
+l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
+    <glyph glyph-name="_454" unicode="&#xf1e4;" horiz-adv-x="1792" 
+d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23
+zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5
+t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
+    <glyph glyph-name="_455" unicode="&#xf1e5;" horiz-adv-x="1792" 
+d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z
+M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_456" unicode="&#xf1e6;" horiz-adv-x="1792" 
+d="M1755 1083q37 -38 37 -90.5t-37 -90.5l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234
+l401 400q38 37 91 37t90 -37z" />
+    <glyph glyph-name="_457" unicode="&#xf1e7;" horiz-adv-x="1792" 
+d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5
+t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z
+M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q4 -2 11.5 -7
+t10.5 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
+    <glyph glyph-name="_458" unicode="&#xf1e8;" horiz-adv-x="1792" 
+d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
+    <glyph glyph-name="_459" unicode="&#xf1e9;" 
+d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36
+q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q71 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5
+t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87
+q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
+    <glyph glyph-name="_460" unicode="&#xf1ea;" horiz-adv-x="2048" 
+d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19
+t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
+    <glyph glyph-name="_461" unicode="&#xf1eb;" horiz-adv-x="2048" 
+d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121
+q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z
+M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
+    <glyph glyph-name="_462" unicode="&#xf1ec;" horiz-adv-x="1792" 
+d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5
+t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5
+t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
+M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38
+h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_463" unicode="&#xf1ed;" 
+d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246
+q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598
+q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
+    <glyph glyph-name="_464" unicode="&#xf1ee;" horiz-adv-x="1792" 
+d="M441 864q33 0 52 -26q266 -364 362 -774h-446q-127 441 -367 749q-12 16 -3 33.5t29 17.5h373zM1000 507q-49 -199 -125 -393q-79 310 -256 594q40 221 44 449q211 -340 337 -650zM1099 1216q235 -324 384.5 -698.5t184.5 -773.5h-451q-41 665 -553 1472h435zM1792 640
+q0 -424 -101 -812q-67 560 -359 1083q-25 301 -106 584q-4 16 5.5 28.5t25.5 12.5h359q21 0 38.5 -13t22.5 -33q115 -409 115 -850z" />
+    <glyph glyph-name="uniF1F0" unicode="&#xf1f0;" horiz-adv-x="2304" 
+d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27
+q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128
+q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_466" unicode="&#xf1f1;" horiz-adv-x="2304" 
+d="M1119 1195q-128 85 -281 85q-103 0 -197.5 -40.5t-162.5 -108.5t-108.5 -162t-40.5 -197q0 -104 40.5 -198t108.5 -162t162 -108.5t198 -40.5q153 0 281 85q-131 107 -178 265.5t0.5 316.5t177.5 265zM1152 1171q-126 -99 -172 -249.5t-0.5 -300.5t172.5 -249
+q127 99 172.5 249t-0.5 300.5t-172 249.5zM1185 1195q130 -107 177.5 -265.5t0.5 -317t-178 -264.5q128 -85 281 -85q104 0 198 40.5t162 108.5t108.5 162t40.5 198q0 103 -40.5 197t-108.5 162t-162.5 108.5t-197.5 40.5q-153 0 -281 -85zM1926 473h7v3h-17v-3h7v-17h3v17z
+M1955 456h4v20h-5l-6 -13l-6 13h-5v-20h3v15l6 -13h4l5 13v-15zM1947 16v-2h-2h-3v3h3h2v-1zM1947 7h3l-4 5h2l1 1q1 1 1 3t-1 3l-1 1h-3h-6v-13h3v5h1zM685 75q0 19 11 31t30 12q18 0 29 -12.5t11 -30.5q0 -19 -11 -31t-29 -12q-19 0 -30 12t-11 31zM1158 119q30 0 35 -32
+h-70q5 32 35 32zM1514 75q0 19 11 31t29 12t29.5 -12.5t11.5 -30.5q0 -19 -11 -31t-30 -12q-18 0 -29 12t-11 31zM1786 75q0 18 11.5 30.5t29.5 12.5t29.5 -12.5t11.5 -30.5q0 -19 -11.5 -31t-29.5 -12t-29.5 12.5t-11.5 30.5zM1944 3q-2 0 -4 1q-1 0 -3 2t-2 3q-1 2 -1 4
+q0 3 1 4q0 2 2 4l1 1q2 0 2 1q2 1 4 1q3 0 4 -1l4 -2l2 -4v-1q1 -2 1 -3l-1 -1v-3t-1 -1l-1 -2q-2 -2 -4 -2q-1 -1 -4 -1zM599 7h30v85q0 24 -14.5 38.5t-39.5 15.5q-32 0 -47 -24q-14 24 -45 24q-24 0 -39 -20v16h-30v-135h30v75q0 36 33 36q30 0 30 -36v-75h29v75
+q0 36 33 36q30 0 30 -36v-75zM765 7h29v68v67h-29v-16q-17 20 -43 20q-29 0 -48 -20t-19 -51t19 -51t48 -20q28 0 43 20v-17zM943 48q0 34 -47 40l-14 2q-23 4 -23 14q0 15 25 15q23 0 43 -11l12 24q-22 14 -55 14q-26 0 -41 -12t-15 -32q0 -33 47 -39l13 -2q24 -4 24 -14
+q0 -17 -31 -17q-25 0 -45 14l-13 -23q25 -17 58 -17q29 0 45.5 12t16.5 32zM1073 14l-8 25q-13 -7 -26 -7q-19 0 -19 22v61h48v27h-48v41h-30v-41h-28v-27h28v-61q0 -50 47 -50q21 0 36 10zM1159 146q-29 0 -48 -20t-19 -51q0 -32 19.5 -51.5t49.5 -19.5q33 0 55 19l-14 22
+q-18 -15 -39 -15q-34 0 -41 33h101v12q0 32 -18 51.5t-46 19.5zM1318 146q-23 0 -35 -20v16h-30v-135h30v76q0 35 29 35q10 0 18 -4l9 28q-9 4 -21 4zM1348 75q0 -31 19.5 -51t52.5 -20q29 0 48 16l-14 24q-18 -13 -35 -12q-18 0 -29.5 12t-11.5 31t11.5 31t29.5 12
+q19 0 35 -12l14 24q-20 16 -48 16q-33 0 -52.5 -20t-19.5 -51zM1593 7h30v68v67h-30v-16q-15 20 -42 20q-29 0 -48.5 -20t-19.5 -51t19.5 -51t48.5 -20q28 0 42 20v-17zM1726 146q-23 0 -35 -20v16h-29v-135h29v76q0 35 29 35q10 0 18 -4l9 28q-8 4 -21 4zM1866 7h29v68v122
+h-29v-71q-15 20 -43 20t-47.5 -20.5t-19.5 -50.5t19.5 -50.5t47.5 -20.5q29 0 43 20v-17zM1944 27l-2 -1h-3q-2 -1 -4 -3q-3 -1 -3 -4q-1 -2 -1 -6q0 -3 1 -5q0 -2 3 -4q2 -2 4 -3t5 -1q4 0 6 1q0 1 2 2l2 1q1 1 3 4q1 2 1 5q0 4 -1 6q-1 1 -3 4q0 1 -2 2l-2 1q-1 0 -3 0.5
+t-3 0.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_467" unicode="&#xf1f2;" horiz-adv-x="2304" 
+d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42
+q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604
+v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569
+q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73
+t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
+    <glyph glyph-name="f1f3" unicode="&#xf1f3;" horiz-adv-x="2304" 
+d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z
+M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260
+l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279
+v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040
+q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168
+q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5
+t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21
+h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5
+t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
+    <glyph glyph-name="_469" unicode="&#xf1f4;" horiz-adv-x="2304" 
+d="M745 630q0 -37 -25.5 -61.5t-62.5 -24.5q-29 0 -46.5 16t-17.5 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM1530 779q0 -42 -22 -57t-66 -15l-32 -1l17 107q2 11 13 11h18q22 0 35 -2t25 -12.5t12 -30.5zM1881 630q0 -36 -25.5 -61t-61.5 -25q-29 0 -47 16
+t-18 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM513 801q0 59 -38.5 85.5t-100.5 26.5h-160q-19 0 -21 -19l-65 -408q-1 -6 3 -11t10 -5h76q20 0 22 19l18 110q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM822 489l41 261q1 6 -3 11t-10 5h-76
+q-14 0 -17 -33q-27 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q28 0 58 12t48 32q-4 -12 -4 -21q0 -16 13 -16h69q19 0 22 19zM1269 752q0 5 -4 9.5t-9 4.5h-77q-11 0 -18 -10l-106 -156l-44 150q-5 16 -22 16h-75q-5 0 -9 -4.5t-4 -9.5q0 -2 19.5 -59
+t42 -123t23.5 -70q-82 -112 -82 -120q0 -13 13 -13h77q11 0 18 10l255 368q2 2 2 7zM1649 801q0 59 -38.5 85.5t-100.5 26.5h-159q-20 0 -22 -19l-65 -408q-1 -6 3 -11t10 -5h82q12 0 16 13l18 116q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM1958 489
+l41 261q1 6 -3 11t-10 5h-76q-14 0 -17 -33q-26 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q29 0 59 12t47 32q0 -1 -2 -9t-2 -12q0 -16 13 -16h69q19 0 22 19zM2176 898v1q0 14 -13 14h-74q-11 0 -13 -11l-65 -416l-1 -2q0 -5 4 -9.5t10 -4.5h66
+q19 0 21 19zM392 764q-5 -35 -26 -46t-60 -11l-33 -1l17 107q2 11 13 11h19q40 0 58 -11.5t12 -48.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_470" unicode="&#xf1f5;" horiz-adv-x="2304" 
+d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109
+q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118
+q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151
+q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31
+q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_471" unicode="&#xf1f6;" horiz-adv-x="2048" 
+d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5
+l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5
+l418 363q10 8 23.5 7t21.5 -11z" />
+    <glyph glyph-name="_472" unicode="&#xf1f7;" horiz-adv-x="2048" 
+d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128
+q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161
+q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
+    <glyph glyph-name="_473" unicode="&#xf1f8;" horiz-adv-x="1408" 
+d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704
+q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167
+q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_474" unicode="&#xf1f9;" 
+d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5
+t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5
+t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_475" unicode="&#xf1fa;" 
+d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53
+q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24
+t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61
+t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
+    <glyph glyph-name="_476" unicode="&#xf1fb;" horiz-adv-x="1792" 
+d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10
+t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
+    <glyph glyph-name="f1fc" unicode="&#xf1fc;" horiz-adv-x="1792" 
+d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5
+t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
+    <glyph glyph-name="_478" unicode="&#xf1fd;" horiz-adv-x="1792" 
+d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11q24 0 44 -7t31 -15t33 -27q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5
+t47 37.5q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-24 0 -44 7t-31 15t-33 27q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38
+t-58 27t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448
+h256v448h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5
+q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
+    <glyph glyph-name="_479" unicode="&#xf1fe;" horiz-adv-x="2048" 
+d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
+    <glyph glyph-name="_480" unicode="&#xf200;" horiz-adv-x="1792" 
+d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_481" unicode="&#xf201;" horiz-adv-x="2048" 
+d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9
+t9 -23z" />
+    <glyph glyph-name="_482" unicode="&#xf202;" horiz-adv-x="1792" 
+d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20
+q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50
+t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1
+q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
+    <glyph glyph-name="_483" unicode="&#xf203;" 
+d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73
+q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110
+q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_484" unicode="&#xf204;" horiz-adv-x="2048" 
+d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5
+t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5
+t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
+    <glyph glyph-name="_485" unicode="&#xf205;" horiz-adv-x="2048" 
+d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5
+t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
+    <glyph glyph-name="_486" unicode="&#xf206;" horiz-adv-x="2304" 
+d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94
+q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469
+q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400
+q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
+    <glyph glyph-name="_487" unicode="&#xf207;" 
+d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5
+h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
+    <glyph glyph-name="_488" unicode="&#xf208;" horiz-adv-x="2048" 
+d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327
+q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5
+q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
+    <glyph glyph-name="_489" unicode="&#xf209;" horiz-adv-x="1280" 
+d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q17 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119
+t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5
+t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14
+q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88
+q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5
+t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
+    <glyph glyph-name="_490" unicode="&#xf20a;" horiz-adv-x="2048" 
+d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206
+q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307
+t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14
+t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
+    <glyph glyph-name="_491" unicode="&#xf20b;" 
+d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5
+t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_492" unicode="&#xf20c;" 
+d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55
+q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410
+q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
+    <glyph glyph-name="_493" unicode="&#xf20d;" 
+d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960q0 -118 -85 -203t-203 -85h-960q-118 0 -203 85t-85 203v960q0 118 85 203t203 85h960q118 0 203 -85t85 -203z" />
+    <glyph glyph-name="_494" unicode="&#xf20e;" horiz-adv-x="2048" 
+d="M2048 641q0 -21 -13 -36.5t-33 -19.5l-205 -356q3 -9 3 -18q0 -20 -12.5 -35.5t-32.5 -19.5l-193 -337q3 -8 3 -16q0 -23 -16.5 -40t-40.5 -17q-25 0 -41 18h-400q-17 -20 -43 -20t-43 20h-399q-17 -20 -43 -20q-23 0 -40 16.5t-17 40.5q0 8 4 20l-193 335
+q-20 4 -32.5 19.5t-12.5 35.5q0 9 3 18l-206 356q-20 5 -32.5 20.5t-12.5 35.5q0 21 13.5 36.5t33.5 19.5l199 344q0 1 -0.5 3t-0.5 3q0 36 34 51l209 363q-4 10 -4 18q0 24 17 40.5t40 16.5q26 0 44 -21h396q16 21 43 21t43 -21h398q18 21 44 21q23 0 40 -16.5t17 -40.5
+q0 -6 -4 -18l207 -358q23 -1 39 -17.5t16 -38.5q0 -13 -7 -27l187 -324q19 -4 31.5 -19.5t12.5 -35.5zM1063 -158h389l-342 354h-143l-342 -354h360q18 16 39 16t39 -16zM112 654q1 -4 1 -13q0 -10 -2 -15l208 -360l15 -6l188 199v347l-187 194q-13 -8 -29 -10zM986 1438
+h-388l190 -200l554 200h-280q-16 -16 -38 -16t-38 16zM1689 226q1 6 5 11l-64 68l-17 -79h76zM1583 226l22 105l-252 266l-296 -307l63 -64h463zM1495 -142l16 28l65 310h-427l333 -343q8 4 13 5zM578 -158h5l342 354h-373v-335l4 -6q14 -5 22 -13zM552 226h402l64 66
+l-309 321l-157 -166v-221zM359 226h163v189l-168 -177q4 -8 5 -12zM358 1051q0 -1 0.5 -2t0.5 -2q0 -16 -8 -29l171 -177v269zM552 1121v-311l153 -157l297 314l-223 236zM556 1425l-4 -8v-264l205 74l-191 201q-6 -2 -10 -3zM1447 1438h-16l-621 -224l213 -225zM1023 946
+l-297 -315l311 -319l296 307zM688 634l-136 141v-284zM1038 270l-42 -44h85zM1374 618l238 -251l132 624l-3 5l-1 1zM1718 1018q-8 13 -8 29v2l-216 376q-5 1 -13 5l-437 -463l310 -327zM522 1142v223l-163 -282zM522 196h-163l163 -283v283zM1607 196l-48 -227l130 227h-82
+zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z" />
+    <glyph glyph-name="f210" unicode="&#xf210;" 
+d="M0 856q0 131 91.5 226.5t222.5 95.5h742l352 358v-1470q0 -132 -91.5 -227t-222.5 -95h-780q-131 0 -222.5 95t-91.5 227v790zM1232 102l-176 180v425q0 46 -32 79t-78 33h-484q-46 0 -78 -33t-32 -79v-492q0 -46 32.5 -79.5t77.5 -33.5h770z" />
+    <glyph glyph-name="_496" unicode="&#xf211;" 
+d="M934 1386q-317 -121 -556 -362.5t-358 -560.5q-20 89 -20 176q0 208 102.5 384.5t278.5 279t384 102.5q82 0 169 -19zM1203 1267q93 -65 164 -155q-389 -113 -674.5 -400.5t-396.5 -676.5q-93 72 -155 162q112 386 395 671t667 399zM470 -67q115 356 379.5 622t619.5 384
+q40 -92 54 -195q-292 -120 -516 -345t-343 -518q-103 14 -194 52zM1536 -125q-193 50 -367 115q-135 -84 -290 -107q109 205 274 370.5t369 275.5q-21 -152 -101 -284q65 -175 115 -370z" />
+    <glyph glyph-name="f212" unicode="&#xf212;" horiz-adv-x="2048" 
+d="M1893 1144l155 -1272q-131 0 -257 57q-200 91 -393 91q-226 0 -374 -148q-148 148 -374 148q-193 0 -393 -91q-128 -57 -252 -57h-5l155 1272q224 127 482 127q233 0 387 -106q154 106 387 106q258 0 482 -127zM1398 157q129 0 232 -28.5t260 -93.5l-124 1021
+q-171 78 -368 78q-224 0 -374 -141q-150 141 -374 141q-197 0 -368 -78l-124 -1021q105 43 165.5 65t148.5 39.5t178 17.5q202 0 374 -108q172 108 374 108zM1438 191l-55 907q-211 -4 -359 -155q-152 155 -374 155q-176 0 -336 -66l-114 -941q124 51 228.5 76t221.5 25
+q209 0 374 -102q172 107 374 102z" />
+    <glyph glyph-name="_498" unicode="&#xf213;" horiz-adv-x="2048" 
+d="M1500 165v733q0 21 -15 36t-35 15h-93q-20 0 -35 -15t-15 -36v-733q0 -20 15 -35t35 -15h93q20 0 35 15t15 35zM1216 165v531q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-531q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM924 165v429q0 20 -15 35t-35 15h-101
+q-20 0 -35 -15t-15 -35v-429q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM632 165v362q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-362q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM2048 311q0 -166 -118 -284t-284 -118h-1244q-166 0 -284 118t-118 284
+q0 116 63 214.5t168 148.5q-10 34 -10 73q0 113 80.5 193.5t193.5 80.5q102 0 180 -67q45 183 194 300t338 117q149 0 275 -73.5t199.5 -199.5t73.5 -275q0 -66 -14 -122q135 -33 221 -142.5t86 -247.5z" />
+    <glyph glyph-name="_499" unicode="&#xf214;" 
+d="M0 1536h1536v-1392l-776 -338l-760 338v1392zM1436 209v926h-1336v-926l661 -294zM1436 1235v201h-1336v-201h1336zM181 937v-115h-37v115h37zM181 789v-115h-37v115h37zM181 641v-115h-37v115h37zM181 493v-115h-37v115h37zM181 345v-115h-37v115h37zM207 202l15 34
+l105 -47l-15 -33zM343 142l15 34l105 -46l-15 -34zM478 82l15 34l105 -46l-15 -34zM614 23l15 33l104 -46l-15 -34zM797 10l105 46l15 -33l-105 -47zM932 70l105 46l15 -34l-105 -46zM1068 130l105 46l15 -34l-105 -46zM1203 189l105 47l15 -34l-105 -46zM259 1389v-36h-114
+v36h114zM421 1389v-36h-115v36h115zM583 1389v-36h-115v36h115zM744 1389v-36h-114v36h114zM906 1389v-36h-114v36h114zM1068 1389v-36h-115v36h115zM1230 1389v-36h-115v36h115zM1391 1389v-36h-114v36h114zM181 1049v-79h-37v115h115v-36h-78zM421 1085v-36h-115v36h115z
+M583 1085v-36h-115v36h115zM744 1085v-36h-114v36h114zM906 1085v-36h-114v36h114zM1068 1085v-36h-115v36h115zM1230 1085v-36h-115v36h115zM1355 970v79h-78v36h115v-115h-37zM1355 822v115h37v-115h-37zM1355 674v115h37v-115h-37zM1355 526v115h37v-115h-37zM1355 378
+v115h37v-115h-37zM1355 230v115h37v-115h-37zM760 265q-129 0 -221 91.5t-92 221.5q0 129 92 221t221 92q130 0 221.5 -92t91.5 -221q0 -130 -91.5 -221.5t-221.5 -91.5zM595 646q0 -36 19.5 -56.5t49.5 -25t64 -7t64 -2t49.5 -9t19.5 -30.5q0 -49 -112 -49q-97 0 -123 51
+h-3l-31 -63q67 -42 162 -42q29 0 56.5 5t55.5 16t45.5 33t17.5 53q0 46 -27.5 69.5t-67.5 27t-79.5 3t-67 5t-27.5 25.5q0 21 20.5 33t40.5 15t41 3q34 0 70.5 -11t51.5 -34h3l30 58q-3 1 -21 8.5t-22.5 9t-19.5 7t-22 7t-20 4.5t-24 4t-23 1q-29 0 -56.5 -5t-54 -16.5
+t-43 -34t-16.5 -53.5z" />
+    <glyph glyph-name="_500" unicode="&#xf215;" horiz-adv-x="2048" 
+d="M863 504q0 112 -79.5 191.5t-191.5 79.5t-191 -79.5t-79 -191.5t79 -191t191 -79t191.5 79t79.5 191zM1726 505q0 112 -79 191t-191 79t-191.5 -79t-79.5 -191q0 -113 79.5 -192t191.5 -79t191 79.5t79 191.5zM2048 1314v-1348q0 -44 -31.5 -75.5t-76.5 -31.5h-1832
+q-45 0 -76.5 31.5t-31.5 75.5v1348q0 44 31.5 75.5t76.5 31.5h431q44 0 76 -31.5t32 -75.5v-161h754v161q0 44 32 75.5t76 31.5h431q45 0 76.5 -31.5t31.5 -75.5z" />
+    <glyph glyph-name="_501" unicode="&#xf216;" horiz-adv-x="2048" 
+d="M1430 953zM1690 749q148 0 253 -98.5t105 -244.5q0 -157 -109 -261.5t-267 -104.5q-85 0 -162 27.5t-138 73.5t-118 106t-109 126t-103.5 132.5t-108.5 126.5t-117 106t-136 73.5t-159 27.5q-154 0 -251.5 -91.5t-97.5 -244.5q0 -157 104 -250t263 -93q100 0 208 37.5
+t193 98.5q5 4 21 18.5t30 24t22 9.5q14 0 24.5 -10.5t10.5 -24.5q0 -24 -60 -77q-101 -88 -234.5 -142t-260.5 -54q-133 0 -245.5 58t-180 165t-67.5 241q0 205 141.5 341t347.5 136q120 0 226.5 -43.5t185.5 -113t151.5 -153t139 -167.5t133.5 -153.5t149.5 -113
+t172.5 -43.5q102 0 168.5 61.5t66.5 162.5q0 95 -64.5 159t-159.5 64q-30 0 -81.5 -18.5t-68.5 -18.5q-20 0 -35.5 15t-15.5 35q0 18 8.5 57t8.5 59q0 159 -107.5 263t-266.5 104q-58 0 -111.5 -18.5t-84 -40.5t-55.5 -40.5t-33 -18.5q-15 0 -25.5 10.5t-10.5 25.5
+q0 19 25 46q59 67 147 103.5t182 36.5q191 0 318 -125.5t127 -315.5q0 -37 -4 -66q57 15 115 15z" />
+    <glyph glyph-name="_502" unicode="&#xf217;" horiz-adv-x="1664" 
+d="M1216 832q0 26 -19 45t-45 19h-128v128q0 26 -19 45t-45 19t-45 -19t-19 -45v-128h-128q-26 0 -45 -19t-19 -45t19 -45t45 -19h128v-128q0 -26 19 -45t45 -19t45 19t19 45v128h128q26 0 45 19t19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="_503" unicode="&#xf218;" horiz-adv-x="1664" 
+d="M1280 832q0 26 -19 45t-45 19t-45 -19l-147 -146v293q0 26 -19 45t-45 19t-45 -19t-19 -45v-293l-147 146q-19 19 -45 19t-45 -19t-19 -45t19 -45l256 -256q19 -19 45 -19t45 19l256 256q19 19 19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="_504" unicode="&#xf219;" horiz-adv-x="2048" 
+d="M212 768l623 -665l-300 665h-323zM1024 -4l349 772h-698zM538 896l204 384h-262l-288 -384h346zM1213 103l623 665h-323zM683 896h682l-204 384h-274zM1510 896h346l-288 384h-262zM1651 1382l384 -512q14 -18 13 -41.5t-17 -40.5l-960 -1024q-18 -20 -47 -20t-47 20
+l-960 1024q-16 17 -17 40.5t13 41.5l384 512q18 26 51 26h1152q33 0 51 -26z" />
+    <glyph glyph-name="_505" unicode="&#xf21a;" horiz-adv-x="2048" 
+d="M1811 -19q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
+q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83
+q19 19 45 19t45 -19l83 -83zM237 19q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -82l83 82q19 19 45 19t45 -19l83 -82l64 64v293l-210 314q-17 26 -7 56.5t40 40.5l177 58v299h128v128h256v128h256v-128h256v-128h128v-299l177 -58q30 -10 40 -40.5t-7 -56.5l-210 -314
+v-293l19 18q19 19 45 19t45 -19l83 -82l83 82q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
+q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83zM640 1152v-128l384 128l384 -128v128h-128v128h-512v-128h-128z" />
+    <glyph glyph-name="_506" unicode="&#xf21b;" 
+d="M576 0l96 448l-96 128l-128 64zM832 0l128 640l-128 -64l-96 -128zM992 1010q-2 4 -4 6q-10 8 -96 8q-70 0 -167 -19q-7 -2 -21 -2t-21 2q-97 19 -167 19q-86 0 -96 -8q-2 -2 -4 -6q2 -18 4 -27q2 -3 7.5 -6.5t7.5 -10.5q2 -4 7.5 -20.5t7 -20.5t7.5 -17t8.5 -17t9 -14
+t12 -13.5t14 -9.5t17.5 -8t20.5 -4t24.5 -2q36 0 59 12.5t32.5 30t14.5 34.5t11.5 29.5t17.5 12.5h12q11 0 17.5 -12.5t11.5 -29.5t14.5 -34.5t32.5 -30t59 -12.5q13 0 24.5 2t20.5 4t17.5 8t14 9.5t12 13.5t9 14t8.5 17t7.5 17t7 20.5t7.5 20.5q2 7 7.5 10.5t7.5 6.5
+q2 9 4 27zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 61 4.5 118t19 125.5t37.5 123.5t63.5 103.5t93.5 74.5l-90 220h214q-22 64 -22 128q0 12 2 32q-194 40 -194 96q0 57 210 99q17 62 51.5 134t70.5 114q32 37 76 37q30 0 84 -31t84 -31t84 31
+t84 31q44 0 76 -37q36 -42 70.5 -114t51.5 -134q210 -42 210 -99q0 -56 -194 -96q7 -81 -20 -160h214l-82 -225q63 -33 107.5 -96.5t65.5 -143.5t29 -151.5t8 -148.5z" />
+    <glyph glyph-name="_507" unicode="&#xf21c;" horiz-adv-x="2304" 
+d="M2301 500q12 -103 -22 -198.5t-99 -163.5t-158.5 -106t-196.5 -31q-161 11 -279.5 125t-134.5 274q-12 111 27.5 210.5t118.5 170.5l-71 107q-96 -80 -151 -194t-55 -244q0 -27 -18.5 -46.5t-45.5 -19.5h-256h-69q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5
+t-131.5 316.5t131.5 316.5t316.5 131.5q76 0 152 -27l24 45q-123 110 -304 110h-64q-26 0 -45 19t-19 45t19 45t45 19h128q78 0 145 -13.5t116.5 -38.5t71.5 -39.5t51 -36.5h512h115l-85 128h-222q-30 0 -49 22.5t-14 52.5q4 23 23 38t43 15h253q33 0 53 -28l70 -105
+l114 114q19 19 46 19h101q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-179l115 -172q131 63 275 36q143 -26 244 -134.5t118 -253.5zM448 128q115 0 203 72.5t111 183.5h-314q-35 0 -55 31q-18 32 -1 63l147 277q-47 13 -91 13q-132 0 -226 -94t-94 -226t94 -226
+t226 -94zM1856 128q132 0 226 94t94 226t-94 226t-226 94q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94z" />
+    <glyph glyph-name="_508" unicode="&#xf21d;" 
+d="M1408 0q0 -63 -61.5 -113.5t-164 -81t-225 -46t-253.5 -15.5t-253.5 15.5t-225 46t-164 81t-61.5 113.5q0 49 33 88.5t91 66.5t118 44.5t131 29.5q26 5 48 -10.5t26 -41.5q5 -26 -10.5 -48t-41.5 -26q-58 -10 -106 -23.5t-76.5 -25.5t-48.5 -23.5t-27.5 -19.5t-8.5 -12
+q3 -11 27 -26.5t73 -33t114 -32.5t160.5 -25t201.5 -10t201.5 10t160.5 25t114 33t73 33.5t27 27.5q-1 4 -8.5 11t-27.5 19t-48.5 23.5t-76.5 25t-106 23.5q-26 4 -41.5 26t-10.5 48q4 26 26 41.5t48 10.5q71 -12 131 -29.5t118 -44.5t91 -66.5t33 -88.5zM1024 896v-384
+q0 -26 -19 -45t-45 -19h-64v-384q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v384h-64q-26 0 -45 19t-19 45v384q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5zM928 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5
+t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="_509" unicode="&#xf21e;" horiz-adv-x="1792" 
+d="M1280 512h305q-5 -6 -10 -10.5t-9 -7.5l-3 -4l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-5 2 -21 20h369q22 0 39.5 13.5t22.5 34.5l70 281l190 -667q6 -20 23 -33t39 -13q21 0 38 13t23 33l146 485l56 -112q18 -35 57 -35zM1792 940q0 -145 -103 -300h-369l-111 221
+q-8 17 -25.5 27t-36.5 8q-45 -5 -56 -46l-129 -430l-196 686q-6 20 -23.5 33t-39.5 13t-39 -13.5t-22 -34.5l-116 -464h-423q-103 155 -103 300q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124
+t127 -344z" />
+    <glyph glyph-name="venus" unicode="&#xf221;" horiz-adv-x="1280" 
+d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292
+q11 134 80.5 249t182 188t245.5 88q170 19 319 -54t236 -212t87 -306zM128 960q0 -185 131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5z" />
+    <glyph glyph-name="_511" unicode="&#xf222;" 
+d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-382 -383q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5
+q203 0 359 -126l382 382h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_512" unicode="&#xf223;" horiz-adv-x="1280" 
+d="M830 1220q145 -72 233.5 -210.5t88.5 -305.5q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5
+t-147.5 384.5q0 167 88.5 305.5t233.5 210.5q-165 96 -228 273q-6 16 3.5 29.5t26.5 13.5h69q21 0 29 -20q44 -106 140 -171t214 -65t214 65t140 171q8 20 37 20h61q17 0 26.5 -13.5t3.5 -29.5q-63 -177 -228 -273zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_513" unicode="&#xf224;" 
+d="M1024 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-149 16 -270.5 103t-186.5 223.5t-53 291.5q16 204 160 353.5t347 172.5q118 14 228 -19t198 -103l255 254h-134q-14 0 -23 9t-9 23v64zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_514" unicode="&#xf225;" horiz-adv-x="1792" 
+d="M1280 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5t-147.5 384.5q0 201 126 359l-52 53l-101 -111q-9 -10 -22 -10.5t-23 7.5l-48 44q-10 8 -10.5 21.5t8.5 23.5l105 115l-111 112v-134q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9
+t-9 23v288q0 26 19 45t45 19h288q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-133l106 -107l86 94q9 10 22 10.5t23 -7.5l48 -44q10 -8 10.5 -21.5t-8.5 -23.5l-90 -99l57 -56q158 126 359 126t359 -126l255 254h-134q-14 0 -23 9t-9 23v64zM832 256q185 0 316.5 131.5
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_515" unicode="&#xf226;" horiz-adv-x="1792" 
+d="M1790 1007q12 -155 -52.5 -292t-186 -224t-271.5 -103v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-512v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23
+t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292q17 206 164.5 356.5t352.5 169.5q206 21 377 -94q171 115 377 94q205 -19 352.5 -169.5t164.5 -356.5zM896 647q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM576 512q115 0 218 57q-154 165 -154 391
+q0 224 154 391q-103 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM1152 128v260q-137 15 -256 94q-119 -79 -256 -94v-260h512zM1216 512q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5q-115 0 -218 -57q154 -167 154 -391
+q0 -226 -154 -391q103 -57 218 -57z" />
+    <glyph glyph-name="_516" unicode="&#xf227;" horiz-adv-x="1920" 
+d="M1536 1120q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-31 -182 -166 -312t-318 -156q-210 -29 -384.5 80t-241.5 300q-117 6 -221 57.5t-177.5 133t-113.5 192.5t-32 230
+q9 135 78 252t182 191.5t248 89.5q118 14 227.5 -19t198.5 -103l255 254h-134q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q59 -74 93 -169q182 -9 328 -124l255 254h-134q-14 0 -23 9
+t-9 23v64zM1024 704q0 20 -4 58q-162 -25 -271 -150t-109 -292q0 -20 4 -58q162 25 271 150t109 292zM128 704q0 -168 111 -294t276 -149q-3 29 -3 59q0 210 135 369.5t338 196.5q-53 120 -163.5 193t-245.5 73q-185 0 -316.5 -131.5t-131.5 -316.5zM1088 -128
+q185 0 316.5 131.5t131.5 316.5q0 168 -111 294t-276 149q3 -28 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z" />
+    <glyph glyph-name="_517" unicode="&#xf228;" horiz-adv-x="2048" 
+d="M1664 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-32 -180 -164.5 -310t-313.5 -157q-223 -34 -409 90q-117 -78 -256 -93v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23
+t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-155 17 -279.5 109.5t-187 237.5t-39.5 307q25 187 159.5 322.5t320.5 164.5q224 34 410 -90q146 97 320 97q201 0 359 -126l255 254h-134q-14 0 -23 9
+t-9 23v64zM896 391q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM128 704q0 -185 131.5 -316.5t316.5 -131.5q117 0 218 57q-154 167 -154 391t154 391q-101 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5zM1216 256q185 0 316.5 131.5t131.5 316.5
+t-131.5 316.5t-316.5 131.5q-117 0 -218 -57q154 -167 154 -391t-154 -391q101 -57 218 -57z" />
+    <glyph glyph-name="_518" unicode="&#xf229;" 
+d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-213 -214l140 -140q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-140 141l-78 -79q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5
+t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5q203 0 359 -126l78 78l-172 172q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l172 -172l213 213h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_519" unicode="&#xf22a;" horiz-adv-x="1280" 
+d="M640 892q217 -24 364.5 -187.5t147.5 -384.5q0 -167 -87 -306t-236 -212t-319 -54q-133 15 -245.5 88t-182 188t-80.5 249q-12 155 52.5 292t186 224t271.5 103v132h-160q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h160v165l-92 -92q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22
+t9 23l202 201q19 19 45 19t45 -19l202 -201q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-92 92v-165h160q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-160v-132zM576 -128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5
+t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_520" unicode="&#xf22b;" horiz-adv-x="2048" 
+d="M1901 621q19 -19 19 -45t-19 -45l-294 -294q-9 -10 -22.5 -10t-22.5 10l-45 45q-10 9 -10 22.5t10 22.5l185 185h-294v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-132q-24 -217 -187.5 -364.5t-384.5 -147.5q-167 0 -306 87t-212 236t-54 319q15 133 88 245.5
+t188 182t249 80.5q155 12 292 -52.5t224 -186t103 -271.5h132v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h294l-185 185q-10 9 -10 22.5t10 22.5l45 45q9 10 22.5 10t22.5 -10zM576 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5
+t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_521" unicode="&#xf22c;" horiz-adv-x="1280" 
+d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-612q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v612q-217 24 -364.5 187.5t-147.5 384.5q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM576 512q185 0 316.5 131.5
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_522" unicode="&#xf22d;" horiz-adv-x="1280" 
+d="M1024 576q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1152 576q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123
+t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5z" />
+    <glyph glyph-name="_523" unicode="&#xf22e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_524" unicode="&#xf22f;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_525" unicode="&#xf230;" 
+d="M1451 1408q35 0 60 -25t25 -60v-1366q0 -35 -25 -60t-60 -25h-391v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-735q-35 0 -60 25t-25 60v1366q0 35 25 60t60 25h1366z" />
+    <glyph glyph-name="_526" unicode="&#xf231;" horiz-adv-x="1280" 
+d="M0 939q0 108 37.5 203.5t103.5 166.5t152 123t185 78t202 26q158 0 294 -66.5t221 -193.5t85 -287q0 -96 -19 -188t-60 -177t-100 -149.5t-145 -103t-189 -38.5q-68 0 -135 32t-96 88q-10 -39 -28 -112.5t-23.5 -95t-20.5 -71t-26 -71t-32 -62.5t-46 -77.5t-62 -86.5
+l-14 -5l-9 10q-15 157 -15 188q0 92 21.5 206.5t66.5 287.5t52 203q-32 65 -32 169q0 83 52 156t132 73q61 0 95 -40.5t34 -102.5q0 -66 -44 -191t-44 -187q0 -63 45 -104.5t109 -41.5q55 0 102 25t78.5 68t56 95t38 110.5t20 111t6.5 99.5q0 173 -109.5 269.5t-285.5 96.5
+q-200 0 -334 -129.5t-134 -328.5q0 -44 12.5 -85t27 -65t27 -45.5t12.5 -30.5q0 -28 -15 -73t-37 -45q-2 0 -17 3q-51 15 -90.5 56t-61 94.5t-32.5 108t-11 106.5z" />
+    <glyph glyph-name="_527" unicode="&#xf232;" 
+d="M985 562q13 0 97.5 -44t89.5 -53q2 -5 2 -15q0 -33 -17 -76q-16 -39 -71 -65.5t-102 -26.5q-57 0 -190 62q-98 45 -170 118t-148 185q-72 107 -71 194v8q3 91 74 158q24 22 52 22q6 0 18 -1.5t19 -1.5q19 0 26.5 -6.5t15.5 -27.5q8 -20 33 -88t25 -75q0 -21 -34.5 -57.5
+t-34.5 -46.5q0 -7 5 -15q34 -73 102 -137q56 -53 151 -101q12 -7 22 -7q15 0 54 48.5t52 48.5zM782 32q127 0 243.5 50t200.5 134t134 200.5t50 243.5t-50 243.5t-134 200.5t-200.5 134t-243.5 50t-243.5 -50t-200.5 -134t-134 -200.5t-50 -243.5q0 -203 120 -368l-79 -233
+l242 77q158 -104 345 -104zM782 1414q153 0 292.5 -60t240.5 -161t161 -240.5t60 -292.5t-60 -292.5t-161 -240.5t-240.5 -161t-292.5 -60q-195 0 -365 94l-417 -134l136 405q-108 178 -108 389q0 153 60 292.5t161 240.5t240.5 161t292.5 60z" />
+    <glyph glyph-name="_528" unicode="&#xf233;" horiz-adv-x="1792" 
+d="M128 128h1024v128h-1024v-128zM128 640h1024v128h-1024v-128zM1696 192q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM128 1152h1024v128h-1024v-128zM1696 704q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1696 1216
+q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1792 384v-384h-1792v384h1792zM1792 896v-384h-1792v384h1792zM1792 1408v-384h-1792v384h1792z" />
+    <glyph glyph-name="_529" unicode="&#xf234;" horiz-adv-x="2048" 
+d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1664 512h352q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-352q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5
+t-9.5 22.5v352h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v352q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5v-352zM928 288q0 -52 38 -90t90 -38h256v-238q-68 -50 -171 -50h-874q-121 0 -194 69t-73 190q0 53 3.5 103.5t14 109t26.5 108.5
+t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q79 -61 154.5 -91.5t164.5 -30.5t164.5 30.5t154.5 91.5q20 17 39 17q132 0 217 -96h-223q-52 0 -90 -38t-38 -90v-192z" />
+    <glyph glyph-name="_530" unicode="&#xf235;" horiz-adv-x="2048" 
+d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1781 320l249 -249q9 -9 9 -23q0 -13 -9 -22l-136 -136q-9 -9 -22 -9q-14 0 -23 9l-249 249l-249 -249q-9 -9 -23 -9q-13 0 -22 9l-136 136
+q-9 9 -9 22q0 14 9 23l249 249l-249 249q-9 9 -9 23q0 13 9 22l136 136q9 9 22 9q14 0 23 -9l249 -249l249 249q9 9 23 9q13 0 22 -9l136 -136q9 -9 9 -22q0 -14 -9 -23zM1283 320l-181 -181q-37 -37 -37 -91q0 -53 37 -90l83 -83q-21 -3 -44 -3h-874q-121 0 -194 69
+t-73 190q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q154 -122 319 -122t319 122q20 17 39 17q28 0 57 -6q-28 -27 -41 -50t-13 -56q0 -54 37 -91z" />
+    <glyph glyph-name="_531" unicode="&#xf236;" horiz-adv-x="2048" 
+d="M256 512h1728q26 0 45 -19t19 -45v-448h-256v256h-1536v-256h-256v1216q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-704zM832 832q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM2048 576v64q0 159 -112.5 271.5t-271.5 112.5h-704
+q-26 0 -45 -19t-19 -45v-384h1152z" />
+    <glyph glyph-name="_532" unicode="&#xf237;" 
+d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z" />
+    <glyph glyph-name="_533" unicode="&#xf238;" 
+d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56
+t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z" />
+    <glyph glyph-name="_534" unicode="&#xf239;" 
+d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47
+t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z" />
+    <glyph glyph-name="_535" unicode="&#xf23a;" horiz-adv-x="1792" 
+d="M597 1115v-1173q0 -25 -12.5 -42.5t-36.5 -17.5q-17 0 -33 8l-465 233q-21 10 -35.5 33.5t-14.5 46.5v1140q0 20 10 34t29 14q14 0 44 -15l511 -256q3 -3 3 -5zM661 1014l534 -866l-534 266v600zM1792 996v-1054q0 -25 -14 -40.5t-38 -15.5t-47 13l-441 220zM1789 1116
+q0 -3 -256.5 -419.5t-300.5 -487.5l-390 634l324 527q17 28 52 28q14 0 26 -6l541 -270q4 -2 4 -6z" />
+    <glyph glyph-name="_536" unicode="&#xf23b;" 
+d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
+    <glyph glyph-name="_537" unicode="&#xf23c;" horiz-adv-x="2296" 
+d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5
+q45 -13 82 4.5t37 50.5q0 46 -67.5 100.5t-115.5 59.5q-40 5 -63.5 -37.5t-6.5 -76.5zM428 -30q-13 -27 -56 -59.5t-77 -41.5q-45 -13 -82 4.5t-37 50.5q0 46 67.5 100.5t115.5 59.5q40 5 63 -37.5t6 -76.5zM1158 1094h1q-41 0 -76 -15q27 -8 44 -30.5t17 -49.5
+q0 -35 -27 -60t-65 -25q-52 0 -80 43q-5 -23 -5 -42q0 -74 56 -126.5t135 -52.5q80 0 136 52.5t56 126.5t-56 126.5t-136 52.5zM1462 1312q-99 109 -220.5 131.5t-245.5 -44.5q27 60 82.5 96.5t118 39.5t121.5 -17t99.5 -74.5t44.5 -131.5zM2212 73q8 -11 -11 -42
+q7 -23 7 -40q1 -56 -44.5 -112.5t-109.5 -91.5t-118 -37q-48 -2 -92 21.5t-66 65.5q-687 -25 -1259 0q-23 -41 -66.5 -65t-92.5 -22q-86 3 -179.5 80.5t-92.5 160.5q2 22 7 40q-19 31 -11 42q6 10 31 1q14 22 41 51q-7 29 2 38q11 10 39 -4q29 20 59 34q0 29 13 37
+q23 12 51 -16q35 5 61 -2q18 -4 38 -19v73q-11 0 -18 2q-53 10 -97 44.5t-55 87.5q-9 38 0 81q15 62 93 95q2 17 19 35.5t36 23.5t33 -7.5t19 -30.5h13q46 -5 60 -23q3 -3 5 -7q10 1 30.5 3.5t30.5 3.5q-15 11 -30 17q-23 40 -91 43q0 6 1 10q-62 2 -118.5 18.5t-84.5 47.5
+q-32 36 -42.5 92t-2.5 112q16 126 90 179q23 16 52 4.5t32 -40.5q0 -1 1.5 -14t2.5 -21t3 -20t5.5 -19t8.5 -10q27 -14 76 -12q48 46 98 74q-40 4 -162 -14l47 46q61 58 163 111q145 73 282 86q-20 8 -41 15.5t-47 14t-42.5 10.5t-47.5 11t-43 10q595 126 904 -139
+q98 -84 158 -222q85 -10 121 9h1q5 3 8.5 10t5.5 19t3 19.5t3 21.5l1 14q3 28 32 40t52 -5q73 -52 91 -178q7 -57 -3.5 -113t-42.5 -91q-28 -32 -83.5 -48.5t-115.5 -18.5v-10q-71 -2 -95 -43q-14 -5 -31 -17q11 -1 32 -3.5t30 -3.5q1 5 5 8q16 18 60 23h13q5 18 19 30t33 8
+t36 -23t19 -36q79 -32 93 -95q9 -40 1 -81q-12 -53 -56 -88t-97 -44q-10 -2 -17 -2q0 -49 -1 -73q20 15 38 19q26 7 61 2q28 28 51 16q14 -9 14 -37q33 -16 59 -34q27 13 38 4q10 -10 2 -38q28 -30 41 -51q23 8 31 -1zM1937 1025q0 -29 -9 -54q82 -32 112 -132
+q4 37 -9.5 98.5t-41.5 90.5q-20 19 -36 17t-16 -20zM1859 925q35 -42 47.5 -108.5t-0.5 -124.5q67 13 97 45q13 14 18 28q-3 64 -31 114.5t-79 66.5q-15 -15 -52 -21zM1822 921q-30 0 -44 1q42 -115 53 -239q21 0 43 3q16 68 1 135t-53 100zM258 839q30 100 112 132
+q-9 25 -9 54q0 18 -16.5 20t-35.5 -17q-28 -29 -41.5 -90.5t-9.5 -98.5zM294 737q29 -31 97 -45q-13 58 -0.5 124.5t47.5 108.5v0q-37 6 -52 21q-51 -16 -78.5 -66t-31.5 -115q9 -17 18 -28zM471 683q14 124 73 235q-19 -4 -55 -18l-45 -19v1q-46 -89 -20 -196q25 -3 47 -3z
+M1434 644q8 -38 16.5 -108.5t11.5 -89.5q3 -18 9.5 -21.5t23.5 4.5q40 20 62 85.5t23 125.5q-24 2 -146 4zM1152 1285q-116 0 -199 -82.5t-83 -198.5q0 -117 83 -199.5t199 -82.5t199 82.5t83 199.5q0 116 -83 198.5t-199 82.5zM1380 646q-105 2 -211 0v1q-1 -27 2.5 -86
+t13.5 -66q29 -14 93.5 -14.5t95.5 10.5q9 3 11 39t-0.5 69.5t-4.5 46.5zM1112 447q8 4 9.5 48t-0.5 88t-4 63v1q-212 -3 -214 -3q-4 -20 -7 -62t0 -83t14 -46q34 -15 101 -16t101 10zM718 636q-16 -59 4.5 -118.5t77.5 -84.5q15 -8 24 -5t12 21q3 16 8 90t10 103
+q-69 -2 -136 -6zM591 510q3 -23 -34 -36q132 -141 271.5 -240t305.5 -154q172 49 310.5 146t293.5 250q-33 13 -30 34q0 2 0.5 3.5t1.5 3t1 2.5v1v-1q-17 2 -50 5.5t-48 4.5q-26 -90 -82 -132q-51 -38 -82 1q-5 6 -9 14q-7 13 -17 62q-2 -5 -5 -9t-7.5 -7t-8 -5.5t-9.5 -4
+l-10 -2.5t-12 -2l-12 -1.5t-13.5 -1t-13.5 -0.5q-106 -9 -163 11q-4 -17 -10 -26.5t-21 -15t-23 -7t-36 -3.5q-6 -1 -9 -1q-179 -17 -203 40q-2 -63 -56 -54q-47 8 -91 54q-12 13 -20 26q-17 29 -26 65q-58 -6 -87 -10q1 -2 4 -10zM507 -118q3 14 3 30q-17 71 -51 130
+t-73 70q-41 12 -101.5 -14.5t-104.5 -80t-39 -107.5q35 -53 100 -93t119 -42q51 -2 94 28t53 79zM510 53q23 -63 27 -119q195 113 392 174q-98 52 -180.5 120t-179.5 165q-6 -4 -29 -13q0 -1 -1 -4t-1 -5q31 -18 22 -37q-12 -23 -56 -34q-10 -13 -29 -24h-1q-2 -83 1 -150
+q19 -34 35 -73zM579 -113q532 -21 1145 0q-254 147 -428 196q-76 -35 -156 -57q-8 -3 -16 0q-65 21 -129 49q-208 -60 -416 -188h-1v-1q1 0 1 1zM1763 -67q4 54 28 120q14 38 33 71l-1 -1q3 77 3 153q-15 8 -30 25q-42 9 -56 33q-9 20 22 38q-2 4 -2 9q-16 4 -28 12
+q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z" />
+    <glyph glyph-name="_538" unicode="&#xf23d;" horiz-adv-x="2304" 
+d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5
+t200 -31.5t250 -18.5t304 -9.5t372.5 -2.5q139 0 244.5 -5t181 -16.5t124 -27.5t71 -39.5t24 -51.5t-19.5 -64t-56.5 -76.5t-89.5 -91t-116 -104.5t-139 -119q-185 -157 -286 -247q29 51 76.5 109t94 105.5t94.5 98.5t83 91.5t54 80.5t13 70t-45.5 55.5t-116.5 41t-204 23.5
+t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z" />
+    <glyph glyph-name="_539" unicode="&#xf23e;" horiz-adv-x="1792" 
+d="M896 1472q-169 0 -323 -66t-265.5 -177.5t-177.5 -265.5t-66 -323t66 -323t177.5 -265.5t265.5 -177.5t323 -66t323 66t265.5 177.5t177.5 265.5t66 323t-66 323t-177.5 265.5t-265.5 177.5t-323 66zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348
+t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM496 704q16 0 16 -16v-480q0 -16 -16 -16h-32q-16 0 -16 16v480q0 16 16 16h32zM896 640q53 0 90.5 -37.5t37.5 -90.5q0 -35 -17.5 -64t-46.5 -46v-114q0 -14 -9 -23
+t-23 -9h-64q-14 0 -23 9t-9 23v114q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5zM896 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM544 928v-96
+q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 93 65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5v-96q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 146 -103 249t-249 103t-249 -103t-103 -249zM1408 192v512q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-512
+q0 -26 19 -45t45 -19h896q26 0 45 19t19 45z" />
+    <glyph glyph-name="_540" unicode="&#xf240;" horiz-adv-x="2304" 
+d="M1920 1024v-768h-1664v768h1664zM2048 448h128v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288zM2304 832v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113
+v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="_541" unicode="&#xf241;" horiz-adv-x="2304" 
+d="M256 256v768h1280v-768h-1280zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_542" unicode="&#xf242;" horiz-adv-x="2304" 
+d="M256 256v768h896v-768h-896zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_543" unicode="&#xf243;" horiz-adv-x="2304" 
+d="M256 256v768h512v-768h-512zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_544" unicode="&#xf244;" horiz-adv-x="2304" 
+d="M2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23
+v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_545" unicode="&#xf245;" horiz-adv-x="1280" 
+d="M1133 493q31 -30 14 -69q-17 -40 -59 -40h-382l201 -476q10 -25 0 -49t-34 -35l-177 -75q-25 -10 -49 0t-35 34l-191 452l-312 -312q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v1504q0 42 40 59q12 5 24 5q27 0 45 -19z" />
+    <glyph glyph-name="_546" unicode="&#xf246;" horiz-adv-x="1024" 
+d="M832 1408q-320 0 -320 -224v-416h128v-128h-128v-544q0 -224 320 -224h64v-128h-64q-272 0 -384 146q-112 -146 -384 -146h-64v128h64q320 0 320 224v544h-128v128h128v416q0 224 -320 224h-64v128h64q272 0 384 -146q112 146 384 146h64v-128h-64z" />
+    <glyph glyph-name="_547" unicode="&#xf247;" horiz-adv-x="2048" 
+d="M2048 1152h-128v-1024h128v-384h-384v128h-1280v-128h-384v384h128v1024h-128v384h384v-128h1280v128h384v-384zM1792 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 -128v128h-128v-128h128zM1664 0v128h128v1024h-128v128h-1280v-128h-128v-1024h128v-128
+h1280zM1920 -128v128h-128v-128h128zM1280 896h384v-768h-896v256h-384v768h896v-256zM512 512h640v512h-640v-512zM1536 256v512h-256v-384h-384v-128h640z" />
+    <glyph glyph-name="_548" unicode="&#xf248;" horiz-adv-x="2304" 
+d="M2304 768h-128v-640h128v-384h-384v128h-896v-128h-384v384h128v128h-384v-128h-384v384h128v640h-128v384h384v-128h896v128h384v-384h-128v-128h384v128h384v-384zM2048 1024v-128h128v128h-128zM1408 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 256
+v128h-128v-128h128zM1536 384h-128v-128h128v128zM384 384h896v128h128v640h-128v128h-896v-128h-128v-640h128v-128zM896 -128v128h-128v-128h128zM2176 -128v128h-128v-128h128zM2048 128v640h-128v128h-384v-384h128v-384h-384v128h-384v-128h128v-128h896v128h128z" />
+    <glyph glyph-name="_549" unicode="&#xf249;" 
+d="M1024 288v-416h-928q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68v-928h-416q-40 0 -68 -28t-28 -68zM1152 256h381q-15 -82 -65 -132l-184 -184q-50 -50 -132 -65v381z" />
+    <glyph glyph-name="_550" unicode="&#xf24a;" 
+d="M1400 256h-248v-248q29 10 41 22l185 185q12 12 22 41zM1120 384h288v896h-1280v-1280h896v288q0 40 28 68t68 28zM1536 1312v-1024q0 -40 -20 -88t-48 -76l-184 -184q-28 -28 -76 -48t-88 -20h-1024q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68
+z" />
+    <glyph glyph-name="_551" unicode="&#xf24b;" horiz-adv-x="2304" 
+d="M1951 538q0 -26 -15.5 -44.5t-38.5 -23.5q-8 -2 -18 -2h-153v140h153q10 0 18 -2q23 -5 38.5 -23.5t15.5 -44.5zM1933 751q0 -25 -15 -42t-38 -21q-3 -1 -15 -1h-139v129h139q3 0 8.5 -0.5t6.5 -0.5q23 -4 38 -21.5t15 -42.5zM728 587v308h-228v-308q0 -58 -38 -94.5
+t-105 -36.5q-108 0 -229 59v-112q53 -15 121 -23t109 -9l42 -1q328 0 328 217zM1442 403v113q-99 -52 -200 -59q-108 -8 -169 41t-61 142t61 142t169 41q101 -7 200 -58v112q-48 12 -100 19.5t-80 9.5l-28 2q-127 6 -218.5 -14t-140.5 -60t-71 -88t-22 -106t22 -106t71 -88
+t140.5 -60t218.5 -14q101 4 208 31zM2176 518q0 54 -43 88.5t-109 39.5v3q57 8 89 41.5t32 79.5q0 55 -41 88t-107 36q-3 0 -12 0.5t-14 0.5h-455v-510h491q74 0 121.5 36.5t47.5 96.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90
+t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_552" unicode="&#xf24c;" horiz-adv-x="2304" 
+d="M858 295v693q-106 -41 -172 -135.5t-66 -211.5t66 -211.5t172 -134.5zM1362 641q0 117 -66 211.5t-172 135.5v-694q106 41 172 135.5t66 211.5zM1577 641q0 -159 -78.5 -294t-213.5 -213.5t-294 -78.5q-119 0 -227.5 46.5t-187 125t-125 187t-46.5 227.5q0 159 78.5 294
+t213.5 213.5t294 78.5t294 -78.5t213.5 -213.5t78.5 -294zM1960 634q0 139 -55.5 261.5t-147.5 205.5t-213.5 131t-252.5 48h-301q-176 0 -323.5 -81t-235 -230t-87.5 -335q0 -171 87 -317.5t236 -231.5t323 -85h301q129 0 251.5 50.5t214.5 135t147.5 202.5t55.5 246z
+M2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_553" unicode="&#xf24d;" horiz-adv-x="1792" 
+d="M1664 -96v1088q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5zM1792 992v-1088q0 -66 -47 -113t-113 -47h-1088q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113
+zM1408 1376v-160h-128v160q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h160v-128h-160q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="_554" unicode="&#xf24e;" horiz-adv-x="2304" 
+d="M1728 1088l-384 -704h768zM448 1088l-384 -704h768zM1269 1280q-14 -40 -45.5 -71.5t-71.5 -45.5v-1291h608q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1344q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h608v1291q-40 14 -71.5 45.5t-45.5 71.5h-491q-14 0 -23 9t-9 23v64
+q0 14 9 23t23 9h491q21 57 70 92.5t111 35.5t111 -35.5t70 -92.5h491q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-491zM1088 1264q33 0 56.5 23.5t23.5 56.5t-23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5zM2176 384q0 -73 -46.5 -131t-117.5 -91
+t-144.5 -49.5t-139.5 -16.5t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81zM896 384q0 -73 -46.5 -131t-117.5 -91t-144.5 -49.5t-139.5 -16.5
+t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81z" />
+    <glyph glyph-name="_555" unicode="&#xf250;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-77 -29 -149 -92.5
+t-129.5 -152.5t-92.5 -210t-35 -253h1024q0 132 -35 253t-92.5 210t-129.5 152.5t-149 92.5q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+    <glyph glyph-name="_556" unicode="&#xf251;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -66 9 -128h1006q9 61 9 128zM1280 -128q0 130 -34 249.5t-90.5 208t-126.5 152t-146 94.5h-230q-76 -31 -146 -94.5t-126.5 -152t-90.5 -208t-34 -249.5h1024z" />
+    <glyph glyph-name="_557" unicode="&#xf252;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -206 85 -384h854q85 178 85 384zM1223 192q-54 141 -145.5 241.5t-194.5 142.5h-230q-103 -42 -194.5 -142.5t-145.5 -241.5h910z" />
+    <glyph glyph-name="_558" unicode="&#xf253;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-137 -51 -244 -196
+h700q-107 145 -244 196q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+    <glyph glyph-name="_559" unicode="&#xf254;" 
+d="M1504 -64q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472zM130 0q3 55 16 107t30 95t46 87t53.5 76t64.5 69.5t66 60t70.5 55t66.5 47.5t65 43q-43 28 -65 43t-66.5 47.5t-70.5 55t-66 60t-64.5 69.5t-53.5 76t-46 87
+t-30 95t-16 107h1276q-3 -55 -16 -107t-30 -95t-46 -87t-53.5 -76t-64.5 -69.5t-66 -60t-70.5 -55t-66.5 -47.5t-65 -43q43 -28 65 -43t66.5 -47.5t70.5 -55t66 -60t64.5 -69.5t53.5 -76t46 -87t30 -95t16 -107h-1276zM1504 1536q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9
+h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472z" />
+    <glyph glyph-name="_560" unicode="&#xf255;" 
+d="M768 1152q-53 0 -90.5 -37.5t-37.5 -90.5v-128h-32v93q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-429l-32 30v172q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-224q0 -47 35 -82l310 -296q39 -39 39 -102q0 -26 19 -45t45 -19h640q26 0 45 19t19 45v25
+q0 41 10 77l108 436q10 36 10 77v246q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-32h-32v125q0 40 -25 72.5t-64 40.5q-14 2 -23 2q-46 0 -79 -33t-33 -79v-128h-32v122q0 51 -32.5 89.5t-82.5 43.5q-5 1 -13 1zM768 1280q84 0 149 -50q57 34 123 34q59 0 111 -27
+t86 -76q27 7 59 7q100 0 170 -71.5t70 -171.5v-246q0 -51 -13 -108l-109 -436q-6 -24 -6 -71q0 -80 -56 -136t-136 -56h-640q-84 0 -138 58.5t-54 142.5l-308 296q-76 73 -76 175v224q0 99 70.5 169.5t169.5 70.5q11 0 16 -1q6 95 75.5 160t164.5 65q52 0 98 -21
+q72 69 174 69z" />
+    <glyph glyph-name="_561" unicode="&#xf256;" horiz-adv-x="1792" 
+d="M880 1408q-46 0 -79 -33t-33 -79v-656h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528v-256l-154 205q-38 51 -102 51q-53 0 -90.5 -37.5t-37.5 -90.5q0 -43 26 -77l384 -512q38 -51 102 -51h688q34 0 61 22t34 56l76 405q5 32 5 59v498q0 46 -33 79t-79 33t-79 -33
+t-33 -79v-272h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528h-32v656q0 46 -33 79t-79 33zM880 1536q68 0 125.5 -35.5t88.5 -96.5q19 4 42 4q99 0 169.5 -70.5t70.5 -169.5v-17q105 6 180.5 -64t75.5 -175v-498q0 -40 -8 -83l-76 -404q-14 -79 -76.5 -131t-143.5 -52
+h-688q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 106 75 181t181 75q78 0 128 -34v434q0 99 70.5 169.5t169.5 70.5q23 0 42 -4q31 61 88.5 96.5t125.5 35.5z" />
+    <glyph glyph-name="_562" unicode="&#xf257;" horiz-adv-x="1792" 
+d="M1073 -128h-177q-163 0 -226 141q-23 49 -23 102v5q-62 30 -98.5 88.5t-36.5 127.5q0 38 5 48h-261q-106 0 -181 75t-75 181t75 181t181 75h113l-44 17q-74 28 -119.5 93.5t-45.5 145.5q0 106 75 181t181 75q46 0 91 -17l628 -239h401q106 0 181 -75t75 -181v-668
+q0 -88 -54 -157.5t-140 -90.5l-339 -85q-92 -23 -186 -23zM1024 583l-155 -71l-163 -74q-30 -14 -48 -41.5t-18 -60.5q0 -46 33 -79t79 -33q26 0 46 10l338 154q-49 10 -80.5 50t-31.5 90v55zM1344 272q0 46 -33 79t-79 33q-26 0 -46 -10l-290 -132q-28 -13 -37 -17
+t-30.5 -17t-29.5 -23.5t-16 -29t-8 -40.5q0 -50 31.5 -82t81.5 -32q20 0 38 9l352 160q30 14 48 41.5t18 60.5zM1112 1024l-650 248q-24 8 -46 8q-53 0 -90.5 -37.5t-37.5 -90.5q0 -40 22.5 -73t59.5 -47l526 -200v-64h-640q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5
+t90.5 -37.5h535l233 106v198q0 63 46 106l111 102h-69zM1073 0q82 0 155 19l339 85q43 11 70 45.5t27 78.5v668q0 53 -37.5 90.5t-90.5 37.5h-308l-136 -126q-36 -33 -36 -82v-296q0 -46 33 -77t79 -31t79 35t33 81v208h32v-208q0 -70 -57 -114q52 -8 86.5 -48.5t34.5 -93.5
+q0 -42 -23 -78t-61 -53l-310 -141h91z" />
+    <glyph glyph-name="_563" unicode="&#xf258;" horiz-adv-x="2048" 
+d="M1151 1536q61 0 116 -28t91 -77l572 -781q118 -159 118 -359v-355q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v177l-286 143h-546q-80 0 -136 56t-56 136v32q0 119 84.5 203.5t203.5 84.5h420l42 128h-686q-100 0 -173.5 67.5t-81.5 166.5q-65 79 -65 182v32
+q0 80 56 136t136 56h959zM1920 -64v355q0 157 -93 284l-573 781q-39 52 -103 52h-959q-26 0 -45 -19t-19 -45q0 -32 1.5 -49.5t9.5 -40.5t25 -43q10 31 35.5 50t56.5 19h832v-32h-832q-26 0 -45 -19t-19 -45q0 -44 3 -58q8 -44 44 -73t81 -29h640h91q40 0 68 -28t28 -68
+q0 -15 -5 -30l-64 -192q-10 -29 -35 -47.5t-56 -18.5h-443q-66 0 -113 -47t-47 -113v-32q0 -26 19 -45t45 -19h561q16 0 29 -7l317 -158q24 -13 38.5 -36t14.5 -50v-197q0 -26 19 -45t45 -19h384q26 0 45 19t19 45z" />
+    <glyph glyph-name="_564" unicode="&#xf259;" horiz-adv-x="2048" 
+d="M459 -256q-77 0 -137.5 47.5t-79.5 122.5l-101 401q-13 57 -13 108q0 45 -5 67l-116 477q-7 27 -7 57q0 93 62 161t155 78q17 85 82.5 139t152.5 54q83 0 148 -51.5t85 -132.5l83 -348l103 428q20 81 85 132.5t148 51.5q89 0 155.5 -57.5t80.5 -144.5q92 -10 152 -79
+t60 -162q0 -24 -7 -59l-123 -512q10 7 37.5 28.5t38.5 29.5t35 23t41 20.5t41.5 11t49.5 5.5q105 0 180 -74t75 -179q0 -62 -28.5 -118t-78.5 -94l-507 -380q-68 -51 -153 -51h-694zM1104 1408q-38 0 -68.5 -24t-39.5 -62l-164 -682h-127l-145 602q-9 38 -39.5 62t-68.5 24
+q-48 0 -80 -33t-32 -80q0 -15 3 -28l132 -547h-26l-99 408q-9 37 -40 62.5t-69 25.5q-47 0 -80 -33t-33 -79q0 -14 3 -26l116 -478q7 -28 9 -86t10 -88l100 -401q8 -32 34 -52.5t59 -20.5h694q42 0 76 26l507 379q56 43 56 110q0 52 -37.5 88.5t-89.5 36.5q-43 0 -77 -26
+l-307 -230v227q0 4 32 138t68 282t39 161q4 18 4 29q0 47 -32 81t-79 34q-39 0 -69.5 -24t-39.5 -62l-116 -482h-26l150 624q3 14 3 28q0 48 -31.5 82t-79.5 34z" />
+    <glyph glyph-name="_565" unicode="&#xf25a;" horiz-adv-x="1792" 
+d="M640 1408q-53 0 -90.5 -37.5t-37.5 -90.5v-512v-384l-151 202q-41 54 -107 54q-52 0 -89 -38t-37 -90q0 -43 26 -77l384 -512q38 -51 102 -51h718q22 0 39.5 13.5t22.5 34.5l92 368q24 96 24 194v217q0 41 -28 71t-68 30t-68 -28t-28 -68h-32v61q0 48 -32 81.5t-80 33.5
+q-46 0 -79 -33t-33 -79v-64h-32v90q0 55 -37 94.5t-91 39.5q-53 0 -90.5 -37.5t-37.5 -90.5v-96h-32v570q0 55 -37 94.5t-91 39.5zM640 1536q107 0 181.5 -77.5t74.5 -184.5v-220q22 2 32 2q99 0 173 -69q47 21 99 21q113 0 184 -87q27 7 56 7q94 0 159 -67.5t65 -161.5
+v-217q0 -116 -28 -225l-92 -368q-16 -64 -68 -104.5t-118 -40.5h-718q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 105 74.5 180.5t179.5 75.5q71 0 130 -35v547q0 106 75 181t181 75zM768 128v384h-32v-384h32zM1024 128v384h-32v-384h32zM1280 128v384h-32
+v-384h32z" />
+    <glyph glyph-name="_566" unicode="&#xf25b;" 
+d="M1288 889q60 0 107 -23q141 -63 141 -226v-177q0 -94 -23 -186l-85 -339q-21 -86 -90.5 -140t-157.5 -54h-668q-106 0 -181 75t-75 181v401l-239 628q-17 45 -17 91q0 106 75 181t181 75q80 0 145.5 -45.5t93.5 -119.5l17 -44v113q0 106 75 181t181 75t181 -75t75 -181
+v-261q27 5 48 5q69 0 127.5 -36.5t88.5 -98.5zM1072 896q-33 0 -60.5 -18t-41.5 -48l-74 -163l-71 -155h55q50 0 90 -31.5t50 -80.5l154 338q10 20 10 46q0 46 -33 79t-79 33zM1293 761q-22 0 -40.5 -8t-29 -16t-23.5 -29.5t-17 -30.5t-17 -37l-132 -290q-10 -20 -10 -46
+q0 -46 33 -79t79 -33q33 0 60.5 18t41.5 48l160 352q9 18 9 38q0 50 -32 81.5t-82 31.5zM128 1120q0 -22 8 -46l248 -650v-69l102 111q43 46 106 46h198l106 233v535q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-640h-64l-200 526q-14 37 -47 59.5t-73 22.5
+q-53 0 -90.5 -37.5t-37.5 -90.5zM1180 -128q44 0 78.5 27t45.5 70l85 339q19 73 19 155v91l-141 -310q-17 -38 -53 -61t-78 -23q-53 0 -93.5 34.5t-48.5 86.5q-44 -57 -114 -57h-208v32h208q46 0 81 33t35 79t-31 79t-77 33h-296q-49 0 -82 -36l-126 -136v-308
+q0 -53 37.5 -90.5t90.5 -37.5h668z" />
+    <glyph glyph-name="_567" unicode="&#xf25c;" horiz-adv-x="1973" 
+d="M857 992v-117q0 -13 -9.5 -22t-22.5 -9h-298v-812q0 -13 -9 -22.5t-22 -9.5h-135q-13 0 -22.5 9t-9.5 23v812h-297q-13 0 -22.5 9t-9.5 22v117q0 14 9 23t23 9h793q13 0 22.5 -9.5t9.5 -22.5zM1895 995l77 -961q1 -13 -8 -24q-10 -10 -23 -10h-134q-12 0 -21 8.5
+t-10 20.5l-46 588l-189 -425q-8 -19 -29 -19h-120q-20 0 -29 19l-188 427l-45 -590q-1 -12 -10 -20.5t-21 -8.5h-135q-13 0 -23 10q-9 10 -9 24l78 961q1 12 10 20.5t21 8.5h142q20 0 29 -19l220 -520q10 -24 20 -51q3 7 9.5 24.5t10.5 26.5l221 520q9 19 29 19h141
+q13 0 22 -8.5t10 -20.5z" />
+    <glyph glyph-name="_568" unicode="&#xf25d;" horiz-adv-x="1792" 
+d="M1042 833q0 88 -60 121q-33 18 -117 18h-123v-281h162q66 0 102 37t36 105zM1094 548l205 -373q8 -17 -1 -31q-8 -16 -27 -16h-152q-20 0 -28 17l-194 365h-155v-350q0 -14 -9 -23t-23 -9h-134q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h294q128 0 190 -24q85 -31 134 -109
+t49 -180q0 -92 -42.5 -165.5t-115.5 -109.5q6 -10 9 -16zM896 1376q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM1792 640
+q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_569" unicode="&#xf25e;" horiz-adv-x="1792" 
+d="M605 303q153 0 257 104q14 18 3 36l-45 82q-6 13 -24 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78
+q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-148 0 -246 -96.5t-98 -240.5q0 -146 97 -241.5t247 -95.5zM1235 303q153 0 257 104q14 18 4 36l-45 82q-8 14 -25 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5
+t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-147 0 -245.5 -96.5t-98.5 -240.5q0 -146 97 -241.5t247 -95.5zM896 1376
+q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71z" />
+    <glyph glyph-name="f260" unicode="&#xf260;" horiz-adv-x="2048" 
+d="M736 736l384 -384l-384 -384l-672 672l672 672l168 -168l-96 -96l-72 72l-480 -480l480 -480l193 193l-289 287zM1312 1312l672 -672l-672 -672l-168 168l96 96l72 -72l480 480l-480 480l-193 -193l289 -287l-96 -96l-384 384z" />
+    <glyph glyph-name="f261" unicode="&#xf261;" horiz-adv-x="1792" 
+d="M717 182l271 271l-279 279l-88 -88l192 -191l-96 -96l-279 279l279 279l40 -40l87 87l-127 128l-454 -454zM1075 190l454 454l-454 454l-271 -271l279 -279l88 88l-192 191l96 96l279 -279l-279 -279l-40 40l-87 -88zM1792 640q0 -182 -71 -348t-191 -286t-286 -191
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_572" unicode="&#xf262;" horiz-adv-x="2304" 
+d="M651 539q0 -39 -27.5 -66.5t-65.5 -27.5q-39 0 -66.5 27.5t-27.5 66.5q0 38 27.5 65.5t66.5 27.5q38 0 65.5 -27.5t27.5 -65.5zM1805 540q0 -39 -27.5 -66.5t-66.5 -27.5t-66.5 27.5t-27.5 66.5t27.5 66t66.5 27t66.5 -27t27.5 -66zM765 539q0 79 -56.5 136t-136.5 57
+t-136.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM1918 540q0 80 -56.5 136.5t-136.5 56.5q-79 0 -136 -56.5t-57 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM850 539q0 -116 -81.5 -197.5t-196.5 -81.5q-116 0 -197.5 82t-81.5 197
+t82 196.5t197 81.5t196.5 -81.5t81.5 -196.5zM2004 540q0 -115 -81.5 -196.5t-197.5 -81.5q-115 0 -196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5q116 0 197.5 -81.5t81.5 -196.5zM1040 537q0 191 -135.5 326.5t-326.5 135.5q-125 0 -231 -62t-168 -168.5t-62 -231.5
+t62 -231.5t168 -168.5t231 -62q191 0 326.5 135.5t135.5 326.5zM1708 1110q-254 111 -556 111q-319 0 -573 -110q117 0 223 -45.5t182.5 -122.5t122 -183t45.5 -223q0 115 43.5 219.5t118 180.5t177.5 123t217 50zM2187 537q0 191 -135 326.5t-326 135.5t-326.5 -135.5
+t-135.5 -326.5t135.5 -326.5t326.5 -135.5t326 135.5t135 326.5zM1921 1103h383q-44 -51 -75 -114.5t-40 -114.5q110 -151 110 -337q0 -156 -77 -288t-209 -208.5t-287 -76.5q-133 0 -249 56t-196 155q-47 -56 -129 -179q-11 22 -53.5 82.5t-74.5 97.5
+q-80 -99 -196.5 -155.5t-249.5 -56.5q-155 0 -287 76.5t-209 208.5t-77 288q0 186 110 337q-9 51 -40 114.5t-75 114.5h365q149 100 355 156.5t432 56.5q224 0 421 -56t348 -157z" />
+    <glyph glyph-name="f263" unicode="&#xf263;" horiz-adv-x="1280" 
+d="M640 629q-188 0 -321 133t-133 320q0 188 133 321t321 133t321 -133t133 -321q0 -187 -133 -320t-321 -133zM640 1306q-92 0 -157.5 -65.5t-65.5 -158.5q0 -92 65.5 -157.5t157.5 -65.5t157.5 65.5t65.5 157.5q0 93 -65.5 158.5t-157.5 65.5zM1163 574q13 -27 15 -49.5
+t-4.5 -40.5t-26.5 -38.5t-42.5 -37t-61.5 -41.5q-115 -73 -315 -94l73 -72l267 -267q30 -31 30 -74t-30 -73l-12 -13q-31 -30 -74 -30t-74 30q-67 68 -267 268l-267 -268q-31 -30 -74 -30t-73 30l-12 13q-31 30 -31 73t31 74l267 267l72 72q-203 21 -317 94
+q-39 25 -61.5 41.5t-42.5 37t-26.5 38.5t-4.5 40.5t15 49.5q10 20 28 35t42 22t56 -2t65 -35q5 -4 15 -11t43 -24.5t69 -30.5t92 -24t113 -11q91 0 174 25.5t120 50.5l38 25q33 26 65 35t56 2t42 -22t28 -35z" />
+    <glyph glyph-name="_574" unicode="&#xf264;" 
+d="M927 956q0 -66 -46.5 -112.5t-112.5 -46.5t-112.5 46.5t-46.5 112.5t46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5zM1141 593q-10 20 -28 32t-47.5 9.5t-60.5 -27.5q-10 -8 -29 -20t-81 -32t-127 -20t-124 18t-86 36l-27 18q-31 25 -60.5 27.5t-47.5 -9.5t-28 -32
+q-22 -45 -2 -74.5t87 -73.5q83 -53 226 -67l-51 -52q-142 -142 -191 -190q-22 -22 -22 -52.5t22 -52.5l9 -9q22 -22 52.5 -22t52.5 22l191 191q114 -115 191 -191q22 -22 52.5 -22t52.5 22l9 9q22 22 22 52.5t-22 52.5l-191 190l-52 52q141 14 225 67q67 44 87 73.5t-2 74.5
+zM1092 956q0 134 -95 229t-229 95t-229 -95t-95 -229t95 -229t229 -95t229 95t95 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_575" unicode="&#xf265;" horiz-adv-x="1720" 
+d="M1565 1408q65 0 110 -45.5t45 -110.5v-519q0 -176 -68 -336t-182.5 -275t-274 -182.5t-334.5 -67.5q-176 0 -335.5 67.5t-274.5 182.5t-183 275t-68 336v519q0 64 46 110t110 46h1409zM861 344q47 0 82 33l404 388q37 35 37 85q0 49 -34.5 83.5t-83.5 34.5q-47 0 -82 -33
+l-323 -310l-323 310q-35 33 -81 33q-49 0 -83.5 -34.5t-34.5 -83.5q0 -51 36 -85l405 -388q33 -33 81 -33z" />
+    <glyph glyph-name="_576" unicode="&#xf266;" horiz-adv-x="2304" 
+d="M1494 -103l-295 695q-25 -49 -158.5 -305.5t-198.5 -389.5q-1 -1 -27.5 -0.5t-26.5 1.5q-82 193 -255.5 587t-259.5 596q-21 50 -66.5 107.5t-103.5 100.5t-102 43q0 5 -0.5 24t-0.5 27h583v-50q-39 -2 -79.5 -16t-66.5 -43t-10 -64q26 -59 216.5 -499t235.5 -540
+q31 61 140 266.5t131 247.5q-19 39 -126 281t-136 295q-38 69 -201 71v50l513 -1v-47q-60 -2 -93.5 -25t-12.5 -69q33 -70 87 -189.5t86 -187.5q110 214 173 363q24 55 -10 79.5t-129 26.5q1 7 1 25v24q64 0 170.5 0.5t180 1t92.5 0.5v-49q-62 -2 -119 -33t-90 -81
+l-213 -442q13 -33 127.5 -290t121.5 -274l441 1017q-14 38 -49.5 62.5t-65 31.5t-55.5 8v50l460 -4l1 -2l-1 -44q-139 -4 -201 -145q-526 -1216 -559 -1291h-49z" />
+    <glyph glyph-name="_577" unicode="&#xf267;" horiz-adv-x="1792" 
+d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640
+q0 -201 -104 -371q-3 2 -17 11t-26.5 16.5t-16.5 7.5q-13 0 -13 -13q0 -10 59 -44q-74 -112 -184.5 -190.5t-241.5 -110.5l-16 67q-1 10 -15 10q-5 0 -8 -5.5t-2 -9.5l16 -68q-72 -15 -146 -15q-199 0 -372 105q1 2 13 20.5t21.5 33.5t9.5 19q0 13 -13 13q-6 0 -17 -14.5
+t-22.5 -34.5t-13.5 -23q-113 75 -192 187.5t-110 244.5l69 15q10 3 10 15q0 5 -5.5 8t-10.5 2l-68 -15q-14 72 -14 139q0 206 109 379q2 -1 18.5 -12t30 -19t17.5 -8q13 0 13 12q0 6 -12.5 15.5t-32.5 21.5l-20 12q77 112 189 189t244 107l15 -67q2 -10 15 -10q5 0 8 5.5
+t2 10.5l-15 66q71 13 134 13q204 0 379 -109q-39 -56 -39 -65q0 -13 12 -13q11 0 48 64q111 -75 187.5 -186t107.5 -241l-56 -12q-10 -2 -10 -16q0 -5 5.5 -8t9.5 -2l57 13q14 -72 14 -140zM1696 640q0 163 -63.5 311t-170.5 255t-255 170.5t-311 63.5t-311 -63.5
+t-255 -170.5t-170.5 -255t-63.5 -311t63.5 -311t170.5 -255t255 -170.5t311 -63.5t311 63.5t255 170.5t170.5 255t63.5 311zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191
+t191 -286t71 -348z" />
+    <glyph glyph-name="_578" unicode="&#xf268;" horiz-adv-x="1792" 
+d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962
+q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z" />
+    <glyph glyph-name="_579" unicode="&#xf269;" horiz-adv-x="1792" 
+d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5
+q-5 -7 -16.5 -18.5t-56.5 -35.5t-101 -34l15 -189l-139 67q-18 -43 -7.5 -81.5t36 -66.5t65.5 -41.5t81 -6.5q51 9 98 34.5t83.5 45t73.5 17.5q61 -4 89.5 -33t19.5 -65q-1 -2 -2.5 -5.5t-8.5 -12.5t-18 -15.5t-31.5 -10.5t-46.5 -1q-60 -95 -144.5 -135.5t-209.5 -29.5
+q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z" />
+    <glyph glyph-name="_580" unicode="&#xf26a;" horiz-adv-x="1792" 
+d="M1493 1308q-165 110 -359 110q-155 0 -293 -73t-240 -200q-75 -93 -119.5 -218t-48.5 -266v-42q4 -141 48.5 -266t119.5 -218q102 -127 240 -200t293 -73q194 0 359 110q-121 -108 -274.5 -168t-322.5 -60q-29 0 -43 1q-175 8 -333 82t-272 193t-181 281t-67 339
+q0 182 71 348t191 286t286 191t348 71h3q168 -1 320.5 -60.5t273.5 -167.5zM1792 640q0 -192 -77 -362.5t-213 -296.5q-104 -63 -222 -63q-137 0 -255 84q154 56 253.5 233t99.5 405q0 227 -99 404t-253 234q119 83 254 83q119 0 226 -65q135 -125 210.5 -295t75.5 -361z
+" />
+    <glyph glyph-name="_581" unicode="&#xf26b;" horiz-adv-x="1792" 
+d="M1792 599q0 -56 -7 -104h-1151q0 -146 109.5 -244.5t257.5 -98.5q99 0 185.5 46.5t136.5 130.5h423q-56 -159 -170.5 -281t-267.5 -188.5t-321 -66.5q-187 0 -356 83q-228 -116 -394 -116q-237 0 -237 263q0 115 45 275q17 60 109 229q199 360 475 606
+q-184 -79 -427 -354q63 274 283.5 449.5t501.5 175.5q30 0 45 -1q255 117 433 117q64 0 116 -13t94.5 -40.5t66.5 -76.5t24 -115q0 -116 -75 -286q101 -182 101 -390zM1722 1239q0 83 -53 132t-137 49q-108 0 -254 -70q121 -47 222.5 -131.5t170.5 -195.5q51 135 51 216z
+M128 2q0 -86 48.5 -132.5t134.5 -46.5q115 0 266 83q-122 72 -213.5 183t-137.5 245q-98 -205 -98 -332zM632 715h728q-5 142 -113 237t-251 95q-144 0 -251.5 -95t-112.5 -237z" />
+    <glyph glyph-name="_582" unicode="&#xf26c;" horiz-adv-x="2048" 
+d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23
+v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="_583" unicode="&#xf26d;" horiz-adv-x="1792" 
+d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34
+h-178q212 210 196 565l-469 -101q-2 -45 -12 -82t-31 -72t-59.5 -59.5t-93.5 -36.5q-123 -26 -199 40q-32 27 -53 61t-51.5 129t-64.5 258q-35 163 -45.5 263t-5.5 139t23 77q20 41 62.5 73t102.5 45q45 12 83.5 6.5t67 -17t54 -35t43 -48t34.5 -56.5l468 100
+q-68 175 -180 287z" />
+    <glyph glyph-name="_584" unicode="&#xf26e;" 
+d="M1401 -11l-6 -6q-113 -113 -259 -175q-154 -64 -317 -64q-165 0 -317 64q-148 63 -259 175q-113 112 -175 258q-42 103 -54 189q-4 28 48 36q51 8 56 -20q1 -1 1 -4q18 -90 46 -159q50 -124 152 -226q98 -98 226 -152q132 -56 276 -56q143 0 276 56q128 55 225 152l6 6
+q10 10 25 6q12 -3 33 -22q36 -37 17 -58zM929 604l-66 -66l63 -63q21 -21 -7 -49q-17 -17 -32 -17q-10 0 -19 10l-62 61l-66 -66q-5 -5 -15 -5q-15 0 -31 16l-2 2q-18 15 -18 29q0 7 8 17l66 65l-66 66q-16 16 14 45q18 18 31 18q6 0 13 -5l65 -66l65 65q18 17 48 -13
+q27 -27 11 -44zM1400 547q0 -118 -46 -228q-45 -105 -126 -186q-80 -80 -187 -126t-228 -46t-228 46t-187 126q-82 82 -125 186q-15 33 -15 40h-1q-9 27 43 44q50 16 60 -12q37 -99 97 -167h1v339v2q3 136 102 232q105 103 253 103q147 0 251 -103t104 -249
+q0 -147 -104.5 -251t-250.5 -104q-58 0 -112 16q-28 11 -13 61q16 51 44 43l14 -3q14 -3 33 -6t30 -3q104 0 176 71.5t72 174.5q0 101 -72 171q-71 71 -175 71q-107 0 -178 -80q-64 -72 -64 -160v-413q110 -67 242 -67q96 0 185 36.5t156 103.5t103.5 155t36.5 183
+q0 198 -141 339q-140 140 -339 140q-200 0 -340 -140q-53 -53 -77 -87l-2 -2q-8 -11 -13 -15.5t-21.5 -9.5t-38.5 3q-21 5 -36.5 16.5t-15.5 26.5v680q0 15 10.5 26.5t27.5 11.5h877q30 0 30 -55t-30 -55h-811v-483h1q40 42 102 84t108 61q109 46 231 46q121 0 228 -46
+t187 -126q81 -81 126 -186q46 -112 46 -229zM1369 1128q9 -8 9 -18t-5.5 -18t-16.5 -21q-26 -26 -39 -26q-9 0 -16 7q-106 91 -207 133q-128 56 -276 56q-133 0 -262 -49q-27 -10 -45 37q-9 25 -8 38q3 16 16 20q130 57 299 57q164 0 316 -64q137 -58 235 -152z" />
+    <glyph glyph-name="_585" unicode="&#xf270;" horiz-adv-x="1792" 
+d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z
+M1758 175q11 -16 2.5 -69.5t-28.5 -102.5q-34 -83 -85 -124q-17 -14 -26 -9t0 24q21 45 44.5 121.5t6.5 98.5q-5 7 -15.5 11.5t-27 6t-29.5 2.5t-35 0t-31.5 -2t-31 -3t-22.5 -2q-6 -1 -13 -1.5t-11 -1t-8.5 -1t-7 -0.5h-5.5h-4.5t-3 0.5t-2 1.5l-1.5 3q-6 16 47 40t103 30
+q46 7 108 1t76 -24zM1364 618q0 -31 13.5 -64t32 -58t37.5 -46t33 -32l13 -11l-227 -224q-40 37 -79 75.5t-58 58.5l-19 20q-11 11 -25 33q-38 -59 -97.5 -102.5t-127.5 -63.5t-140 -23t-137.5 21t-117.5 65.5t-83 113t-31 162.5q0 84 28 154t72 116.5t106.5 83t122.5 57
+t130 34.5t119.5 18.5t99.5 6.5v127q0 65 -21 97q-34 53 -121 53q-6 0 -16.5 -1t-40.5 -12t-56 -29.5t-56 -59.5t-48 -96l-294 27q0 60 22 119t67 113t108 95t151.5 65.5t190.5 24.5q100 0 181 -25t129.5 -61.5t81 -83t45 -86t12.5 -73.5v-589zM692 597q0 -86 70 -133
+q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z" />
+    <glyph glyph-name="_586" unicode="&#xf271;" horiz-adv-x="1792" 
+d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9
+h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 1376v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM1536 -128v1024h-1408v-1024h1408zM896 448h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224
+v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z" />
+    <glyph glyph-name="_587" unicode="&#xf272;" horiz-adv-x="1792" 
+d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23
+t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47
+t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_588" unicode="&#xf273;" horiz-adv-x="1792" 
+d="M1111 151l-46 -46q-9 -9 -22 -9t-23 9l-188 189l-188 -189q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22t9 23l189 188l-189 188q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l188 -188l188 188q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23l-188 -188l188 -188q9 -10 9 -23t-9 -22z
+M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_589" unicode="&#xf274;" horiz-adv-x="1792" 
+d="M1303 572l-512 -512q-10 -9 -23 -9t-23 9l-288 288q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l220 -220l444 444q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23
+t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47
+t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_590" unicode="&#xf275;" horiz-adv-x="1792" 
+d="M448 1536q26 0 45 -19t19 -45v-891l536 429q17 14 40 14q26 0 45 -19t19 -45v-379l536 429q17 14 40 14q26 0 45 -19t19 -45v-1152q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h384z" />
+    <glyph glyph-name="_591" unicode="&#xf276;" horiz-adv-x="1024" 
+d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q62 -15 128 -15zM512 1536q212 0 362 -150t150 -362t-150 -362t-362 -150t-362 150t-150 362t150 362t362 150zM512 1312q14 0 23 9t9 23t-9 23t-23 9q-146 0 -249 -103t-103 -249
+q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z" />
+    <glyph glyph-name="_592" unicode="&#xf277;" horiz-adv-x="1792" 
+d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768
+q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z" />
+    <glyph glyph-name="_593" unicode="&#xf278;" horiz-adv-x="2048" 
+d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173
+v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z" />
+    <glyph glyph-name="_594" unicode="&#xf279;" horiz-adv-x="1792" 
+d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472
+q0 20 17 28l480 256q7 4 15 4zM640 1536q8 0 14 -3l512 -256q18 -10 18 -29v-1472q0 -13 -9.5 -22.5t-22.5 -9.5q-8 0 -14 3l-512 256q-18 10 -18 29v1472q0 13 9.5 22.5t22.5 9.5z" />
+    <glyph glyph-name="_595" unicode="&#xf27a;" horiz-adv-x="1792" 
+d="M640 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 640q0 53 -37.5 90.5t-90.5 37.5
+t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-110 0 -211 18q-173 -173 -435 -229q-52 -10 -86 -13q-12 -1 -22 6t-13 18q-4 15 20 37q5 5 23.5 21.5t25.5 23.5t23.5 25.5t24 31.5t20.5 37
+t20 48t14.5 57.5t12.5 72.5q-146 90 -229.5 216.5t-83.5 269.5q0 174 120 321.5t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="_596" unicode="&#xf27b;" horiz-adv-x="1792" 
+d="M640 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 -53 -37.5 -90.5t-90.5 -37.5
+t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5
+t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51
+t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 130 71 248.5t191 204.5t286 136.5t348 50.5t348 -50.5t286 -136.5t191 -204.5t71 -248.5z" />
+    <glyph glyph-name="_597" unicode="&#xf27c;" horiz-adv-x="1024" 
+d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z" />
+    <glyph glyph-name="_598" unicode="&#xf27d;" horiz-adv-x="1792" 
+d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246
+q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z" />
+    <glyph glyph-name="f27e" unicode="&#xf27e;" 
+d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
+    <glyph glyph-name="uniF280" unicode="&#xf280;" 
+d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72
+h-96v-128h76q20 0 20 -8v-382q0 -14 -5 -20t-18 -7l-73 -7v-88h448v86l-149 14q-6 1 -8.5 1.5t-3.5 2.5t-0.5 4t1 7t0.5 10v387h191l38 128h-231q-6 0 -2 6t4 9v80q0 27 1.5 40.5t7.5 28t19.5 20t36.5 5.5zM1248 96v86l-54 9q-7 1 -9.5 2.5t-2.5 3t1 7.5t1 12v520h-275
+l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z" />
+    <glyph glyph-name="uniF281" unicode="&#xf281;" horiz-adv-x="1792" 
+d="M1792 690q0 -58 -29.5 -105.5t-79.5 -72.5q12 -46 12 -96q0 -155 -106.5 -287t-290.5 -208.5t-400 -76.5t-399.5 76.5t-290 208.5t-106.5 287q0 47 11 94q-51 25 -82 73.5t-31 106.5q0 82 58 140.5t141 58.5q85 0 145 -63q218 152 515 162l116 521q3 13 15 21t26 5
+l369 -81q18 37 54 59.5t79 22.5q62 0 106 -43.5t44 -105.5t-44 -106t-106 -44t-105.5 43.5t-43.5 105.5l-334 74l-104 -472q300 -9 519 -160q58 61 143 61q83 0 141 -58.5t58 -140.5zM418 491q0 -62 43.5 -106t105.5 -44t106 44t44 106t-44 105.5t-106 43.5q-61 0 -105 -44
+t-44 -105zM1228 136q11 11 11 26t-11 26q-10 10 -25 10t-26 -10q-41 -42 -121 -62t-160 -20t-160 20t-121 62q-11 10 -26 10t-25 -10q-11 -10 -11 -25.5t11 -26.5q43 -43 118.5 -68t122.5 -29.5t91 -4.5t91 4.5t122.5 29.5t118.5 68zM1225 341q62 0 105.5 44t43.5 106
+q0 61 -44 105t-105 44q-62 0 -106 -43.5t-44 -105.5t44 -106t106 -44z" />
+    <glyph glyph-name="_602" unicode="&#xf282;" horiz-adv-x="1792" 
+d="M69 741h1q16 126 58.5 241.5t115 217t167.5 176t223.5 117.5t276.5 43q231 0 414 -105.5t294 -303.5q104 -187 104 -442v-188h-1125q1 -111 53.5 -192.5t136.5 -122.5t189.5 -57t213 -3t208 46.5t173.5 84.5v-377q-92 -55 -229.5 -92t-312.5 -38t-316 53
+q-189 73 -311.5 249t-124.5 372q-3 242 111 412t325 268q-48 -60 -78 -125.5t-46 -159.5h635q8 77 -8 140t-47 101.5t-70.5 66.5t-80.5 41t-75 20.5t-56 8.5l-22 1q-135 -5 -259.5 -44.5t-223.5 -104.5t-176 -140.5t-138 -163.5z" />
+    <glyph glyph-name="_603" unicode="&#xf283;" horiz-adv-x="2304" 
+d="M0 32v608h2304v-608q0 -66 -47 -113t-113 -47h-1984q-66 0 -113 47t-47 113zM640 256v-128h384v128h-384zM256 256v-128h256v128h-256zM2144 1408q66 0 113 -47t47 -113v-224h-2304v224q0 66 47 113t113 47h1984z" />
+    <glyph glyph-name="_604" unicode="&#xf284;" horiz-adv-x="1792" 
+d="M1584 246l-218 111q-74 -120 -196.5 -189t-263.5 -69q-147 0 -271 72t-196 196t-72 270q0 110 42.5 209.5t115 172t172 115t209.5 42.5q131 0 247.5 -60.5t192.5 -168.5l215 125q-110 169 -286.5 265t-378.5 96q-161 0 -308 -63t-253 -169t-169 -253t-63 -308t63 -308
+t169 -253t253 -169t308 -63q213 0 397.5 107t290.5 292zM1030 643l693 -352q-116 -253 -334.5 -400t-492.5 -147q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71q260 0 470.5 -133.5t335.5 -366.5zM1543 640h-39v-160h-96v352h136q32 0 54.5 -20
+t28.5 -48t1 -56t-27.5 -48t-57.5 -20z" />
+    <glyph glyph-name="uniF285" unicode="&#xf285;" horiz-adv-x="1792" 
+d="M1427 827l-614 386l92 151h855zM405 562l-184 116v858l1183 -743zM1424 697l147 -95v-858l-532 335zM1387 718l-500 -802h-855l356 571z" />
+    <glyph glyph-name="uniF286" unicode="&#xf286;" horiz-adv-x="1792" 
+d="M640 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1152 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1664 496v-752h-640v320q0 80 -56 136t-136 56t-136 -56t-56 -136v-320h-640v752q0 16 16 16h96
+q16 0 16 -16v-112h128v624q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 6 2.5 9.5t8.5 5t9.5 2t11.5 0t9 -0.5v391q-32 15 -32 50q0 23 16.5 39t38.5 16t38.5 -16t16.5 -39q0 -35 -32 -50v-17q45 10 83 10q21 0 59.5 -7.5t54.5 -7.5
+q17 0 47 7.5t37 7.5q16 0 16 -16v-210q0 -15 -35 -21.5t-62 -6.5q-18 0 -54.5 7.5t-55.5 7.5q-40 0 -90 -12v-133q1 0 9 0.5t11.5 0t9.5 -2t8.5 -5t2.5 -9.5v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-624h128v112q0 16 16 16h96
+q16 0 16 -16z" />
+    <glyph glyph-name="_607" unicode="&#xf287;" horiz-adv-x="2304" 
+d="M2288 731q16 -8 16 -27t-16 -27l-320 -192q-8 -5 -16 -5q-9 0 -16 4q-16 10 -16 28v128h-858q37 -58 83 -165q16 -37 24.5 -55t24 -49t27 -47t27 -34t31.5 -26t33 -8h96v96q0 14 9 23t23 9h320q14 0 23 -9t9 -23v-320q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v96h-96
+q-32 0 -61 10t-51 23.5t-45 40.5t-37 46t-33.5 57t-28.5 57.5t-28 60.5q-23 53 -37 81.5t-36 65t-44.5 53.5t-46.5 17h-360q-22 -84 -91 -138t-157 -54q-106 0 -181 75t-75 181t75 181t181 75q88 0 157 -54t91 -138h104q24 0 46.5 17t44.5 53.5t36 65t37 81.5q19 41 28 60.5
+t28.5 57.5t33.5 57t37 46t45 40.5t51 23.5t61 10h107q21 57 70 92.5t111 35.5q80 0 136 -56t56 -136t-56 -136t-136 -56q-62 0 -111 35.5t-70 92.5h-107q-17 0 -33 -8t-31.5 -26t-27 -34t-27 -47t-24 -49t-24.5 -55q-46 -107 -83 -165h1114v128q0 18 16 28t32 -1z" />
+    <glyph glyph-name="_608" unicode="&#xf288;" horiz-adv-x="1792" 
+d="M1150 774q0 -56 -39.5 -95t-95.5 -39h-253v269h253q56 0 95.5 -39.5t39.5 -95.5zM1329 774q0 130 -91.5 222t-222.5 92h-433v-896h180v269h253q130 0 222 91.5t92 221.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348
+t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_609" unicode="&#xf289;" horiz-adv-x="2304" 
+d="M1645 438q0 59 -34 106.5t-87 68.5q-7 -45 -23 -92q-7 -24 -27.5 -38t-44.5 -14q-12 0 -24 3q-31 10 -45 38.5t-4 58.5q23 71 23 143q0 123 -61 227.5t-166 165.5t-228 61q-134 0 -247 -73t-167 -194q108 -28 188 -106q22 -23 22 -55t-22 -54t-54 -22t-55 22
+q-75 75 -180 75q-106 0 -181 -74.5t-75 -180.5t75 -180.5t181 -74.5h1046q79 0 134.5 55.5t55.5 133.5zM1798 438q0 -142 -100.5 -242t-242.5 -100h-1046q-169 0 -289 119.5t-120 288.5q0 153 100 267t249 136q62 184 221 298t354 114q235 0 408.5 -158.5t196.5 -389.5
+q116 -25 192.5 -118.5t76.5 -214.5zM2048 438q0 -175 -97 -319q-23 -33 -64 -33q-24 0 -43 13q-26 17 -32 48.5t12 57.5q71 104 71 233t-71 233q-18 26 -12 57t32 49t57.5 11.5t49.5 -32.5q97 -142 97 -318zM2304 438q0 -244 -134 -443q-23 -34 -64 -34q-23 0 -42 13
+q-26 18 -32.5 49t11.5 57q108 164 108 358q0 195 -108 357q-18 26 -11.5 57.5t32.5 48.5q26 18 57 12t49 -33q134 -198 134 -442z" />
+    <glyph glyph-name="_610" unicode="&#xf28a;" 
+d="M1500 -13q0 -89 -63 -152.5t-153 -63.5t-153.5 63.5t-63.5 152.5q0 90 63.5 153.5t153.5 63.5t153 -63.5t63 -153.5zM1267 268q-115 -15 -192.5 -102.5t-77.5 -205.5q0 -74 33 -138q-146 -78 -379 -78q-109 0 -201 21t-153.5 54.5t-110.5 76.5t-76 85t-44.5 83
+t-23.5 66.5t-6 39.5q0 19 4.5 42.5t18.5 56t36.5 58t64 43.5t94.5 18t94 -17.5t63 -41t35.5 -53t17.5 -49t4 -33.5q0 -34 -23 -81q28 -27 82 -42t93 -17l40 -1q115 0 190 51t75 133q0 26 -9 48.5t-31.5 44.5t-49.5 41t-74 44t-93.5 47.5t-119.5 56.5q-28 13 -43 20
+q-116 55 -187 100t-122.5 102t-72 125.5t-20.5 162.5q0 78 20.5 150t66 137.5t112.5 114t166.5 77t221.5 28.5q120 0 220 -26t164.5 -67t109.5 -94t64 -105.5t19 -103.5q0 -46 -15 -82.5t-36.5 -58t-48.5 -36t-49 -19.5t-39 -5h-8h-32t-39 5t-44 14t-41 28t-37 46t-24 70.5
+t-10 97.5q-15 16 -59 25.5t-81 10.5l-37 1q-68 0 -117.5 -31t-70.5 -70t-21 -76q0 -24 5 -43t24 -46t53 -51t97 -53.5t150 -58.5q76 -25 138.5 -53.5t109 -55.5t83 -59t60.5 -59.5t41 -62.5t26.5 -62t14.5 -63.5t6 -62t1 -62.5z" />
+    <glyph glyph-name="_611" unicode="&#xf28b;" 
+d="M704 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1152 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103
+t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_612" unicode="&#xf28c;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM864 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192z" />
+    <glyph glyph-name="_613" unicode="&#xf28d;" 
+d="M1088 352v576q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="_614" unicode="&#xf28e;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h576q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-576z" />
+    <glyph glyph-name="_615" unicode="&#xf290;" horiz-adv-x="1792" 
+d="M1757 128l35 -313q3 -28 -16 -50q-19 -21 -48 -21h-1664q-29 0 -48 21q-19 22 -16 50l35 313h1722zM1664 967l86 -775h-1708l86 775q3 24 21 40.5t43 16.5h256v-128q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5v128h384v-128q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5v128h256q25 0 43 -16.5t21 -40.5zM1280 1152v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="_616" unicode="&#xf291;" horiz-adv-x="2048" 
+d="M1920 768q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5h-15l-115 -662q-8 -46 -44 -76t-82 -30h-1280q-46 0 -82 30t-44 76l-115 662h-15q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5h1792zM485 -32q26 2 43.5 22.5t15.5 46.5l-32 416q-2 26 -22.5 43.5
+t-46.5 15.5t-43.5 -22.5t-15.5 -46.5l32 -416q2 -25 20.5 -42t43.5 -17h5zM896 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1280 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1632 27l32 416
+q2 26 -15.5 46.5t-43.5 22.5t-46.5 -15.5t-22.5 -43.5l-32 -416q-2 -26 15.5 -46.5t43.5 -22.5h5q25 0 43.5 17t20.5 42zM476 1244l-93 -412h-132l101 441q19 88 89 143.5t160 55.5h167q0 26 19 45t45 19h384q26 0 45 -19t19 -45h167q90 0 160 -55.5t89 -143.5l101 -441
+h-132l-93 412q-11 44 -45.5 72t-79.5 28h-167q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45h-167q-45 0 -79.5 -28t-45.5 -72z" />
+    <glyph glyph-name="_617" unicode="&#xf292;" horiz-adv-x="1792" 
+d="M991 512l64 256h-254l-64 -256h254zM1759 1016l-56 -224q-7 -24 -31 -24h-327l-64 -256h311q15 0 25 -12q10 -14 6 -28l-56 -224q-5 -24 -31 -24h-327l-81 -328q-7 -24 -31 -24h-224q-16 0 -26 12q-9 12 -6 28l78 312h-254l-81 -328q-7 -24 -31 -24h-225q-15 0 -25 12
+q-9 12 -6 28l78 312h-311q-15 0 -25 12q-9 12 -6 28l56 224q7 24 31 24h327l64 256h-311q-15 0 -25 12q-10 14 -6 28l56 224q5 24 31 24h327l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h254l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h311
+q15 0 25 -12q9 -12 6 -28z" />
+    <glyph glyph-name="_618" unicode="&#xf293;" 
+d="M841 483l148 -148l-149 -149zM840 1094l149 -149l-148 -148zM710 -130l464 464l-306 306l306 306l-464 464v-611l-255 255l-93 -93l320 -321l-320 -321l93 -93l255 255v-611zM1429 640q0 -209 -32 -365.5t-87.5 -257t-140.5 -162.5t-181.5 -86.5t-219.5 -24.5
+t-219.5 24.5t-181.5 86.5t-140.5 162.5t-87.5 257t-32 365.5t32 365.5t87.5 257t140.5 162.5t181.5 86.5t219.5 24.5t219.5 -24.5t181.5 -86.5t140.5 -162.5t87.5 -257t32 -365.5z" />
+    <glyph glyph-name="_619" unicode="&#xf294;" horiz-adv-x="1024" 
+d="M596 113l173 172l-173 172v-344zM596 823l173 172l-173 172v-344zM628 640l356 -356l-539 -540v711l-297 -296l-108 108l372 373l-372 373l108 108l297 -296v711l539 -540z" />
+    <glyph glyph-name="_620" unicode="&#xf295;" 
+d="M1280 256q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM512 1024q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5
+t112.5 -271.5zM1440 1344q0 -20 -13 -38l-1056 -1408q-19 -26 -51 -26h-160q-26 0 -45 19t-19 45q0 20 13 38l1056 1408q19 26 51 26h160q26 0 45 -19t19 -45zM768 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
+t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="_621" unicode="&#xf296;" horiz-adv-x="1792" 
+d="M104 830l792 -1015l-868 630q-18 13 -25 34.5t0 42.5l101 308v0zM566 830h660l-330 -1015v0zM368 1442l198 -612h-462l198 612q8 23 33 23t33 -23zM1688 830l101 -308q7 -21 0 -42.5t-25 -34.5l-868 -630l792 1015v0zM1688 830h-462l198 612q8 23 33 23t33 -23z" />
+    <glyph glyph-name="_622" unicode="&#xf297;" horiz-adv-x="1792" 
+d="M384 704h160v224h-160v-224zM1221 372v92q-104 -36 -243 -38q-135 -1 -259.5 46.5t-220.5 122.5l1 -96q88 -80 212 -128.5t272 -47.5q129 0 238 49zM640 704h640v224h-640v-224zM1792 736q0 -187 -99 -352q89 -102 89 -229q0 -157 -129.5 -268t-313.5 -111
+q-122 0 -225 52.5t-161 140.5q-19 -1 -57 -1t-57 1q-58 -88 -161 -140.5t-225 -52.5q-184 0 -313.5 111t-129.5 268q0 127 89 229q-99 165 -99 352q0 209 120 385.5t326.5 279.5t449.5 103t449.5 -103t326.5 -279.5t120 -385.5z" />
+    <glyph glyph-name="_623" unicode="&#xf298;" 
+d="M515 625v-128h-252v128h252zM515 880v-127h-252v127h252zM1273 369v-128h-341v128h341zM1273 625v-128h-672v128h672zM1273 880v-127h-672v127h672zM1408 20v1240q0 8 -6 14t-14 6h-32l-378 -256l-210 171l-210 -171l-378 256h-32q-8 0 -14 -6t-6 -14v-1240q0 -8 6 -14
+t14 -6h1240q8 0 14 6t6 14zM553 1130l185 150h-406zM983 1130l221 150h-406zM1536 1260v-1240q0 -62 -43 -105t-105 -43h-1240q-62 0 -105 43t-43 105v1240q0 62 43 105t105 43h1240q62 0 105 -43t43 -105z" />
+    <glyph glyph-name="_624" unicode="&#xf299;" horiz-adv-x="1792" 
+d="M896 720q-104 196 -160 278q-139 202 -347 318q-34 19 -70 36q-89 40 -94 32t34 -38l39 -31q62 -43 112.5 -93.5t94.5 -116.5t70.5 -113t70.5 -131q9 -17 13 -25q44 -84 84 -153t98 -154t115.5 -150t131 -123.5t148.5 -90.5q153 -66 154 -60q1 3 -49 37q-53 36 -81 57
+q-77 58 -179 211t-185 310zM549 177q-76 60 -132.5 125t-98 143.5t-71 154.5t-58.5 186t-52 209t-60.5 252t-76.5 289q273 0 497.5 -36t379 -92t271 -144.5t185.5 -172.5t110 -198.5t56 -199.5t12.5 -198.5t-9.5 -173t-20 -143.5t-13 -107l323 -327h-104l-281 285
+q-22 -2 -91.5 -14t-121.5 -19t-138 -6t-160.5 17t-167.5 59t-179 111z" />
+    <glyph glyph-name="_625" unicode="&#xf29a;" horiz-adv-x="1792" 
+d="M1374 879q-6 26 -28.5 39.5t-48.5 7.5q-261 -62 -401 -62t-401 62q-26 6 -48.5 -7.5t-28.5 -39.5t7.5 -48.5t39.5 -28.5q194 -46 303 -58q-2 -158 -15.5 -269t-26.5 -155.5t-41 -115.5l-9 -21q-10 -25 1 -49t36 -34q9 -4 23 -4q44 0 60 41l8 20q54 139 71 259h42
+q17 -120 71 -259l8 -20q16 -41 60 -41q14 0 23 4q25 10 36 34t1 49l-9 21q-28 71 -41 115.5t-26.5 155.5t-15.5 269q109 12 303 58q26 6 39.5 28.5t7.5 48.5zM1024 1024q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
+M1600 640q0 -143 -55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5zM896 1408q-156 0 -298 -61t-245 -164t-164 -245t-61 -298t61 -298
+t164 -245t245 -164t298 -61t298 61t245 164t164 245t61 298t-61 298t-164 245t-245 164t-298 61zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_626" unicode="&#xf29b;" 
+d="M1438 723q34 -35 29 -82l-44 -551q-4 -42 -34.5 -70t-71.5 -28q-6 0 -9 1q-44 3 -72.5 36.5t-25.5 77.5l35 429l-143 -8q55 -113 55 -240q0 -216 -148 -372l-137 137q91 101 91 235q0 145 -102.5 248t-247.5 103q-134 0 -236 -92l-137 138q120 114 284 141l264 300
+l-149 87l-181 -161q-33 -30 -77 -27.5t-73 35.5t-26.5 77t34.5 73l239 213q26 23 60 26.5t64 -14.5l488 -283q36 -21 48 -68q17 -67 -26 -117l-205 -232l371 20q49 3 83 -32zM1240 1180q-74 0 -126 52t-52 126t52 126t126 52t126.5 -52t52.5 -126t-52.5 -126t-126.5 -52z
+M613 -62q106 0 196 61l139 -139q-146 -116 -335 -116q-148 0 -273.5 73t-198.5 198t-73 273q0 188 116 336l139 -139q-60 -88 -60 -197q0 -145 102.5 -247.5t247.5 -102.5z" />
+    <glyph glyph-name="_627" unicode="&#xf29c;" 
+d="M880 336v-160q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h160q14 0 23 -9t9 -23zM1136 832q0 -50 -15 -90t-45.5 -69t-52 -44t-59.5 -36q-32 -18 -46.5 -28t-26 -24t-11.5 -29v-32q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v68q0 35 10.5 64.5
+t24 47.5t39 35.5t41 25.5t44.5 21q53 25 75 43t22 49q0 42 -43.5 71.5t-95.5 29.5q-56 0 -95 -27q-29 -20 -80 -83q-9 -12 -25 -12q-11 0 -19 6l-108 82q-10 7 -12 20t5 23q122 192 349 192q129 0 238.5 -89.5t109.5 -214.5zM768 1280q-130 0 -248.5 -51t-204 -136.5
+t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5
+t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_628" unicode="&#xf29d;" horiz-adv-x="1408" 
+d="M366 1225q-64 0 -110 45.5t-46 110.5q0 64 46 109.5t110 45.5t109.5 -45.5t45.5 -109.5q0 -65 -45.5 -110.5t-109.5 -45.5zM917 583q0 -50 -30 -67.5t-63.5 -6.5t-47.5 34l-367 438q-7 12 -14 15.5t-11 1.5l-3 -3q-7 -8 4 -21l122 -139l1 -354l-161 -457
+q-67 -192 -92 -234q-15 -26 -28 -32q-50 -26 -103 -1q-29 13 -41.5 43t-9.5 57q2 17 197 618l5 416l-85 -164l35 -222q4 -24 -1 -42t-14 -27.5t-19 -16t-17 -7.5l-7 -2q-19 -3 -34.5 3t-24 16t-14 22t-7.5 19.5t-2 9.5l-46 299l211 381q23 34 113 34q75 0 107 -40l424 -521
+q7 -5 14 -17l3 -3l-1 -1q7 -13 7 -29zM514 433q43 -113 88.5 -225t69.5 -168l24 -55q36 -93 42 -125q11 -70 -36 -97q-35 -22 -66 -16t-51 22t-29 35h-1q-6 16 -8 25l-124 351zM1338 -159q31 -49 31 -57q0 -5 -3 -7q-9 -5 -14.5 0.5t-15.5 26t-16 30.5q-114 172 -423 661
+q3 -1 7 1t7 4l3 2q11 9 11 17z" />
+    <glyph glyph-name="_629" unicode="&#xf29e;" horiz-adv-x="2304" 
+d="M504 542h171l-1 265zM1530 641q0 87 -50.5 140t-146.5 53h-54v-388h52q91 0 145 57t54 138zM956 1018l1 -756q0 -14 -9.5 -24t-23.5 -10h-216q-14 0 -23.5 10t-9.5 24v62h-291l-55 -81q-10 -15 -28 -15h-267q-21 0 -30.5 18t3.5 35l556 757q9 14 27 14h332q14 0 24 -10
+t10 -24zM1783 641q0 -193 -125.5 -303t-324.5 -110h-270q-14 0 -24 10t-10 24v756q0 14 10 24t24 10h268q200 0 326 -109t126 -302zM1939 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5
+t-7.5 60t-20 91.5t-41 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2123 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-45 -108t-74 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5
+h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2304 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66 104.5t41 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96
+t9.5 -70.5z" />
+    <glyph glyph-name="uniF2A0" unicode="&#xf2a0;" horiz-adv-x="1408" 
+d="M617 -153q0 11 -13 58t-31 107t-20 69q-1 4 -5 26.5t-8.5 36t-13.5 21.5q-15 14 -51 14q-23 0 -70 -5.5t-71 -5.5q-34 0 -47 11q-6 5 -11 15.5t-7.5 20t-6.5 24t-5 18.5q-37 128 -37 255t37 255q1 4 5 18.5t6.5 24t7.5 20t11 15.5q13 11 47 11q24 0 71 -5.5t70 -5.5
+q36 0 51 14q9 8 13.5 21.5t8.5 36t5 26.5q2 9 20 69t31 107t13 58q0 22 -43.5 52.5t-75.5 42.5q-20 8 -45 8q-34 0 -98 -18q-57 -17 -96.5 -40.5t-71 -66t-46 -70t-45.5 -94.5q-6 -12 -9 -19q-49 -107 -68 -216t-19 -244t19 -244t68 -216q56 -122 83 -161q63 -91 179 -127
+l6 -2q64 -18 98 -18q25 0 45 8q32 12 75.5 42.5t43.5 52.5zM776 760q-26 0 -45 19t-19 45.5t19 45.5q37 37 37 90q0 52 -37 91q-19 19 -19 45t19 45t45 19t45 -19q75 -75 75 -181t-75 -181q-21 -19 -45 -19zM957 579q-27 0 -45 19q-19 19 -19 45t19 45q112 114 112 272
+t-112 272q-19 19 -19 45t19 45t45 19t45 -19q150 -150 150 -362t-150 -362q-18 -19 -45 -19zM1138 398q-27 0 -45 19q-19 19 -19 45t19 45q90 91 138.5 208t48.5 245t-48.5 245t-138.5 208q-19 19 -19 45t19 45t45 19t45 -19q109 -109 167 -249t58 -294t-58 -294t-167 -249
+q-18 -19 -45 -19z" />
+    <glyph glyph-name="uniF2A1" unicode="&#xf2a1;" horiz-adv-x="2176" 
+d="M192 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 352
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 864
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 1376q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 192q0 -80 -56 -136
+t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 1216q0 -80 -56 -136t-136 -56
+t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 192q0 -80 -56 -136t-136 -56t-136 56
+t-56 136t56 136t136 56t136 -56t56 -136zM1664 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136
+t56 136t136 56t136 -56t56 -136zM2176 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="uniF2A2" unicode="&#xf2a2;" horiz-adv-x="1792" 
+d="M128 -192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM320 0q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM365 365l256 -256l-90 -90l-256 256zM704 384q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z
+M1411 704q0 -59 -11.5 -108.5t-37.5 -93.5t-44 -67.5t-53 -64.5q-31 -35 -45.5 -54t-33.5 -50t-26.5 -64t-7.5 -74q0 -159 -112.5 -271.5t-271.5 -112.5q-26 0 -45 19t-19 45t19 45t45 19q106 0 181 75t75 181q0 57 11.5 105.5t37 91t43.5 66.5t52 63q40 46 59.5 72
+t37.5 74.5t18 103.5q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM896 576q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45
+t45 19t45 -19t19 -45zM1184 704q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 93 -65.5 158.5t-158.5 65.5q-92 0 -158 -65.5t-66 -158.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 146 103 249t249 103t249 -103t103 -249zM1578 993q10 -25 -1 -49t-36 -34q-9 -4 -23 -4
+q-19 0 -35.5 11t-23.5 30q-68 178 -224 295q-21 16 -25 42t12 47q17 21 43 25t47 -12q183 -137 266 -351zM1788 1074q9 -25 -1.5 -49t-35.5 -34q-11 -4 -23 -4q-44 0 -60 41q-92 238 -297 393q-22 16 -25.5 42t12.5 47q16 22 42 25.5t47 -12.5q235 -175 341 -449z" />
+    <glyph glyph-name="uniF2A3" unicode="&#xf2a3;" horiz-adv-x="2304" 
+d="M1032 576q-59 2 -84 55q-17 34 -48 53.5t-68 19.5q-53 0 -90.5 -37.5t-37.5 -90.5q0 -56 36 -89l10 -8q34 -31 82 -31q37 0 68 19.5t48 53.5q25 53 84 55zM1600 704q0 56 -36 89l-10 8q-34 31 -82 31q-37 0 -68 -19.5t-48 -53.5q-25 -53 -84 -55q59 -2 84 -55
+q17 -34 48 -53.5t68 -19.5q53 0 90.5 37.5t37.5 90.5zM1174 925q-17 -35 -55 -48t-73 4q-62 31 -134 31q-51 0 -99 -17q3 0 9.5 0.5t9.5 0.5q92 0 170.5 -50t118.5 -133q17 -36 3.5 -73.5t-49.5 -54.5q-18 -9 -39 -9q21 0 39 -9q36 -17 49.5 -54.5t-3.5 -73.5
+q-40 -83 -118.5 -133t-170.5 -50h-6q-16 2 -44 4l-290 27l-239 -120q-14 -7 -29 -7q-40 0 -57 35l-160 320q-11 23 -4 47.5t29 37.5l209 119l148 267q17 155 91.5 291.5t195.5 236.5q31 25 70.5 21.5t64.5 -34.5t21.5 -70t-34.5 -65q-70 -59 -117 -128q123 84 267 101
+q40 5 71.5 -19t35.5 -64q5 -40 -19 -71.5t-64 -35.5q-84 -10 -159 -55q46 10 99 10q115 0 218 -50q36 -18 49 -55.5t-5 -73.5zM2137 1085l160 -320q11 -23 4 -47.5t-29 -37.5l-209 -119l-148 -267q-17 -155 -91.5 -291.5t-195.5 -236.5q-26 -22 -61 -22q-45 0 -74 35
+q-25 31 -21.5 70t34.5 65q70 59 117 128q-123 -84 -267 -101q-4 -1 -12 -1q-36 0 -63.5 24t-31.5 60q-5 40 19 71.5t64 35.5q84 10 159 55q-46 -10 -99 -10q-115 0 -218 50q-36 18 -49 55.5t5 73.5q17 35 55 48t73 -4q62 -31 134 -31q51 0 99 17q-3 0 -9.5 -0.5t-9.5 -0.5
+q-92 0 -170.5 50t-118.5 133q-17 36 -3.5 73.5t49.5 54.5q18 9 39 9q-21 0 -39 9q-36 17 -49.5 54.5t3.5 73.5q40 83 118.5 133t170.5 50h6h1q14 -2 42 -4l291 -27l239 120q14 7 29 7q40 0 57 -35z" />
+    <glyph glyph-name="uniF2A4" unicode="&#xf2a4;" horiz-adv-x="1792" 
+d="M1056 704q0 -26 19 -45t45 -19t45 19t19 45q0 146 -103 249t-249 103t-249 -103t-103 -249q0 -26 19 -45t45 -19t45 19t19 45q0 93 66 158.5t158 65.5t158 -65.5t66 -158.5zM835 1280q-117 0 -223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5q0 -26 19 -45t45 -19t45 19
+t19 45q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -55 -18 -103.5t-37.5 -74.5t-59.5 -72q-34 -39 -52 -63t-43.5 -66.5t-37 -91t-11.5 -105.5q0 -106 -75 -181t-181 -75q-26 0 -45 -19t-19 -45t19 -45t45 -19q159 0 271.5 112.5t112.5 271.5q0 41 7.5 74
+t26.5 64t33.5 50t45.5 54q35 41 53 64.5t44 67.5t37.5 93.5t11.5 108.5q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5zM591 561l226 -226l-579 -579q-12 -12 -29 -12t-29 12l-168 168q-12 12 -12 29t12 29zM1612 1524l168 -168q12 -12 12 -29t-12 -30l-233 -233
+l-26 -25l-71 -71q-66 153 -195 258l91 91l207 207q13 12 30 12t29 -12z" />
+    <glyph glyph-name="uniF2A5" unicode="&#xf2a5;" 
+d="M866 1021q0 -27 -13 -94q-11 -50 -31.5 -150t-30.5 -150q-2 -11 -4.5 -12.5t-13.5 -2.5q-20 -2 -31 -2q-58 0 -84 49.5t-26 113.5q0 88 35 174t103 124q28 14 51 14q28 0 36.5 -16.5t8.5 -47.5zM1352 597q0 14 -39 75.5t-52 66.5q-21 8 -34 8q-91 0 -226 -77l-2 2
+q3 22 27.5 135t24.5 178q0 233 -242 233q-24 0 -68 -6q-94 -17 -168.5 -89.5t-111.5 -166.5t-37 -189q0 -146 80.5 -225t227.5 -79q25 0 25 -3t-1 -5q-4 -34 -26 -117q-14 -52 -51.5 -101t-82.5 -49q-42 0 -42 47q0 24 10.5 47.5t25 39.5t29.5 28.5t26 20t11 8.5q0 3 -7 10
+q-24 22 -58.5 36.5t-65.5 14.5q-35 0 -63.5 -34t-41 -75t-12.5 -75q0 -88 51.5 -142t138.5 -54q82 0 155 53t117.5 126t65.5 153q6 22 15.5 66.5t14.5 66.5q3 12 14 18q118 60 227 60q48 0 127 -18q1 -1 4 -1q5 0 9.5 4.5t4.5 8.5zM1536 1120v-960q0 -119 -84.5 -203.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF2A6" unicode="&#xf2a6;" horiz-adv-x="1535" 
+d="M744 1231q0 24 -2 38.5t-8.5 30t-21 23t-37.5 7.5q-39 0 -78 -23q-105 -58 -159 -190.5t-54 -269.5q0 -44 8.5 -85.5t26.5 -80.5t52.5 -62.5t81.5 -23.5q4 0 18 -0.5t20 0t16 3t15 8.5t7 16q16 77 48 231.5t48 231.5q19 91 19 146zM1498 575q0 -7 -7.5 -13.5t-15.5 -6.5
+l-6 1q-22 3 -62 11t-72 12.5t-63 4.5q-167 0 -351 -93q-15 -8 -21 -27q-10 -36 -24.5 -105.5t-22.5 -100.5q-23 -91 -70 -179.5t-112.5 -164.5t-154.5 -123t-185 -47q-135 0 -214.5 83.5t-79.5 219.5q0 53 19.5 117t63 116.5t97.5 52.5q38 0 120 -33.5t83 -61.5
+q0 -1 -16.5 -12.5t-39.5 -31t-46 -44.5t-39 -61t-16 -74q0 -33 16.5 -53t48.5 -20q45 0 85 31.5t66.5 78t48 105.5t32.5 107t16 90v9q0 2 -3.5 3.5t-8.5 1.5h-10t-10 -0.5t-6 -0.5q-227 0 -352 122.5t-125 348.5q0 108 34.5 221t96 210t156 167.5t204.5 89.5q52 9 106 9
+q374 0 374 -360q0 -98 -38 -273t-43 -211l3 -3q101 57 182.5 88t167.5 31q22 0 53 -13q19 -7 80 -102.5t61 -116.5z" />
+    <glyph glyph-name="uniF2A7" unicode="&#xf2a7;" horiz-adv-x="1664" 
+d="M831 863q32 0 59 -18l222 -148q61 -40 110 -97l146 -170q40 -46 29 -106l-72 -413q-6 -32 -29.5 -53.5t-55.5 -25.5l-527 -56l-352 -32h-9q-39 0 -67.5 28t-28.5 68q0 37 27 64t65 32l260 32h-448q-41 0 -69.5 30t-26.5 71q2 39 32 65t69 26l442 1l-521 64q-41 5 -66 37
+t-19 73q6 35 34.5 57.5t65.5 22.5h10l481 -60l-351 94q-38 10 -62 41.5t-18 68.5q6 36 33 58.5t62 22.5q6 0 20 -2l448 -96l217 -37q1 0 3 -0.5t3 -0.5q23 0 30.5 23t-12.5 36l-186 125q-35 23 -42 63.5t18 73.5q27 38 76 38zM761 661l186 -125l-218 37l-5 2l-36 38
+l-238 262q-1 1 -2.5 3.5t-2.5 3.5q-24 31 -18.5 70t37.5 64q31 23 68 17.5t64 -33.5l142 -147q-2 -1 -5 -3.5t-4 -4.5q-32 -45 -23 -99t55 -85zM1648 1115l15 -266q4 -73 -11 -147l-48 -219q-12 -59 -67 -87l-106 -54q2 62 -39 109l-146 170q-53 61 -117 103l-222 148
+q-34 23 -76 23q-51 0 -88 -37l-235 312q-25 33 -18 73.5t41 63.5q33 22 71.5 14t62.5 -40l266 -352l-262 455q-21 35 -10.5 75t47.5 59q35 18 72.5 6t57.5 -46l241 -420l-136 337q-15 35 -4.5 74t44.5 56q37 19 76 6t56 -51l193 -415l101 -196q8 -15 23 -17.5t27 7.5t11 26
+l-12 224q-2 41 26 71t69 31q39 0 67 -28.5t30 -67.5z" />
+    <glyph glyph-name="uniF2A8" unicode="&#xf2a8;" horiz-adv-x="1792" 
+d="M335 180q-2 0 -6 2q-86 57 -168.5 145t-139.5 180q-21 30 -21 69q0 9 2 19t4 18t7 18t8.5 16t10.5 17t10 15t12 15.5t11 14.5q184 251 452 365q-110 198 -110 211q0 19 17 29q116 64 128 64q18 0 28 -16l124 -229q92 19 192 19q266 0 497.5 -137.5t378.5 -369.5
+q20 -31 20 -69t-20 -69q-91 -142 -218.5 -253.5t-278.5 -175.5q110 -198 110 -211q0 -20 -17 -29q-116 -64 -127 -64q-19 0 -29 16l-124 229l-64 119l-444 820l7 7q-58 -24 -99 -47q3 -5 127 -234t243 -449t119 -223q0 -7 -9 -9q-13 -3 -72 -3q-57 0 -60 7l-456 841
+q-39 -28 -82 -68q24 -43 214 -393.5t190 -354.5q0 -10 -11 -10q-14 0 -82.5 22t-72.5 28l-106 197l-224 413q-44 -53 -78 -106q2 -3 18 -25t23 -34l176 -327q0 -10 -10 -10zM1165 282l49 -91q273 111 450 385q-180 277 -459 389q67 -64 103 -148.5t36 -176.5
+q0 -106 -47 -200.5t-132 -157.5zM848 896q0 -20 14 -34t34 -14q86 0 147 -61t61 -147q0 -20 14 -34t34 -14t34 14t14 34q0 126 -89 215t-215 89q-20 0 -34 -14t-14 -34zM1214 961l-9 4l7 -7z" />
+    <glyph glyph-name="uniF2A9" unicode="&#xf2a9;" horiz-adv-x="1280" 
+d="M1050 430q0 -215 -147 -374q-148 -161 -378 -161q-232 0 -378 161q-147 159 -147 374q0 147 68 270.5t189 196.5t268 73q96 0 182 -31q-32 -62 -39 -126q-66 28 -143 28q-167 0 -280.5 -123t-113.5 -291q0 -170 112.5 -288.5t281.5 -118.5t281 118.5t112 288.5
+q0 89 -32 166q66 13 123 49q41 -98 41 -212zM846 619q0 -192 -79.5 -345t-238.5 -253l-14 -1q-29 0 -62 5q83 32 146.5 102.5t99.5 154.5t58.5 189t30 192.5t7.5 178.5q0 69 -3 103q55 -160 55 -326zM791 947v-2q-73 214 -206 440q88 -59 142.5 -186.5t63.5 -251.5z
+M1035 744q-83 0 -160 75q218 120 290 247q19 37 21 56q-42 -94 -139.5 -166.5t-204.5 -97.5q-35 54 -35 113q0 37 17 79t43 68q46 44 157 74q59 16 106 58.5t74 100.5q74 -105 74 -253q0 -109 -24 -170q-32 -77 -88.5 -130.5t-130.5 -53.5z" />
+    <glyph glyph-name="uniF2AA" unicode="&#xf2aa;" 
+d="M1050 495q0 78 -28 147q-41 -25 -85 -34q22 -50 22 -114q0 -117 -77 -198.5t-193 -81.5t-193.5 81.5t-77.5 198.5q0 115 78 199.5t193 84.5q53 0 98 -19q4 43 27 87q-60 21 -125 21q-154 0 -257.5 -108.5t-103.5 -263.5t103.5 -261t257.5 -106t257.5 106.5t103.5 260.5z
+M872 850q2 -24 2 -71q0 -63 -5 -123t-20.5 -132.5t-40.5 -130t-68.5 -106t-100.5 -70.5q21 -3 42 -3h10q219 139 219 411q0 116 -38 225zM872 850q-4 80 -44 171.5t-98 130.5q92 -156 142 -302zM1207 955q0 102 -51 174q-41 -86 -124 -109q-69 -19 -109 -53.5t-40 -99.5
+q0 -40 24 -77q74 17 140.5 67t95.5 115q-4 -52 -74.5 -111.5t-138.5 -97.5q52 -52 110 -52q51 0 90 37t60 90q17 42 17 117zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="uniF2AB" unicode="&#xf2ab;" 
+d="M1279 388q0 22 -22 27q-67 15 -118 59t-80 108q-7 19 -7 25q0 15 19.5 26t43 17t43 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-12 0 -32 -8t-31 -8q-4 0 -12 2q5 95 5 114q0 79 -17 114q-36 78 -103 121.5t-152 43.5q-199 0 -275 -165q-17 -35 -17 -114q0 -19 5 -114
+q-4 -2 -14 -2q-12 0 -32 7.5t-30 7.5q-21 0 -38.5 -12t-17.5 -32q0 -21 19.5 -35.5t43 -20.5t43 -17t19.5 -26q0 -6 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -46 137 -68q2 -5 6 -26t11.5 -30.5t23.5 -9.5q12 0 37.5 4.5t39.5 4.5q35 0 67 -15t54 -32.5t57.5 -32.5
+t76.5 -15q43 0 79 15t57.5 32.5t53.5 32.5t67 15q14 0 39.5 -4t38.5 -4q16 0 23 10t11 30t6 25q137 22 137 68zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="uniF2AC" unicode="&#xf2ac;" horiz-adv-x="1664" 
+d="M848 1408q134 1 240.5 -68.5t163.5 -192.5q27 -58 27 -179q0 -47 -9 -191q14 -7 28 -7q18 0 51 13.5t51 13.5q29 0 56 -18t27 -46q0 -32 -31.5 -54t-69 -31.5t-69 -29t-31.5 -47.5q0 -15 12 -43q37 -82 102.5 -150t144.5 -101q28 -12 80 -23q28 -6 28 -35
+q0 -70 -219 -103q-7 -11 -11 -39t-14 -46.5t-33 -18.5q-20 0 -62 6.5t-64 6.5q-37 0 -62 -5q-32 -5 -63 -22.5t-58 -38t-58 -40.5t-76 -33.5t-99 -13.5q-52 0 -96.5 13.5t-75 33.5t-57.5 40.5t-58 38t-62 22.5q-26 5 -63 5q-24 0 -65.5 -7.5t-58.5 -7.5q-25 0 -35 18.5
+t-14 47.5t-11 40q-219 33 -219 103q0 29 28 35q52 11 80 23q78 32 144.5 101t102.5 150q12 28 12 43q0 28 -31.5 47.5t-69.5 29.5t-69.5 31.5t-31.5 52.5q0 27 26 45.5t55 18.5q15 0 48 -13t53 -13q18 0 32 7q-9 142 -9 190q0 122 27 180q64 137 172 198t264 63z" />
+    <glyph glyph-name="uniF2AD" unicode="&#xf2ad;" 
+d="M1280 388q0 22 -22 27q-67 14 -118 58t-80 109q-7 14 -7 25q0 15 19.5 26t42.5 17t42.5 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-11 0 -31 -8t-32 -8q-4 0 -12 2q5 63 5 115q0 78 -17 114q-36 78 -102.5 121.5t-152.5 43.5q-198 0 -275 -165q-18 -38 -18 -115
+q0 -38 6 -114q-10 -2 -15 -2q-11 0 -31.5 8t-30.5 8q-20 0 -37.5 -12.5t-17.5 -32.5q0 -21 19.5 -35.5t42.5 -20.5t42.5 -17t19.5 -26q0 -11 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -47 138 -69q2 -5 6 -26t11 -30.5t23 -9.5q13 0 38.5 5t38.5 5q35 0 67.5 -15
+t54.5 -32.5t57.5 -32.5t76.5 -15q43 0 79 15t57.5 32.5t54 32.5t67.5 15q13 0 39 -4.5t39 -4.5q15 0 22.5 9.5t11.5 31t5 24.5q138 22 138 69zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960
+q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF2AE" unicode="&#xf2ae;" horiz-adv-x="2304" 
+d="M2304 1536q-69 -46 -125 -92t-89 -81t-59.5 -71.5t-37.5 -57.5t-22 -44.5t-14 -29.5q-10 -18 -35.5 -136.5t-48.5 -164.5q-15 -29 -50 -60.5t-67.5 -50.5t-72.5 -41t-48 -28q-47 -31 -151 -231q-341 14 -630 -158q-92 -53 -303 -179q47 16 86 31t55 22l15 7
+q71 27 163 64.5t133.5 53.5t108 34.5t142.5 31.5q186 31 465 -7q1 0 10 -3q11 -6 14 -17t-3 -22l-194 -345q-15 -29 -47 -22q-128 24 -354 24q-146 0 -402 -44.5t-392 -46.5q-82 -1 -149 13t-107 37t-61 40t-33 34l-1 1v2q0 6 6 6q138 0 371 55q192 366 374.5 524t383.5 158
+q5 0 14.5 -0.5t38 -5t55 -12t61.5 -24.5t63 -39.5t54 -59t40 -82.5l102 177q2 4 21 42.5t44.5 86.5t61 109.5t84 133.5t100.5 137q66 82 128 141.5t121.5 96.5t92.5 53.5t88 39.5z" />
+    <glyph glyph-name="uniF2B0" unicode="&#xf2b0;" 
+d="M1322 640q0 -45 -5 -76l-236 14l224 -78q-19 -73 -58 -141l-214 103l177 -158q-44 -61 -107 -108l-157 178l103 -215q-61 -37 -140 -59l-79 228l14 -240q-38 -6 -76 -6t-76 6l14 238l-78 -226q-74 19 -140 59l103 215l-157 -178q-59 43 -108 108l178 158l-214 -104
+q-39 69 -58 141l224 79l-237 -14q-5 42 -5 76q0 35 5 77l238 -14l-225 79q19 73 58 140l214 -104l-177 159q46 61 107 108l158 -178l-103 215q67 39 140 58l77 -224l-13 236q36 6 75 6q38 0 76 -6l-14 -237l78 225q74 -19 140 -59l-103 -214l158 178q61 -47 107 -108
+l-177 -159l213 104q37 -62 58 -141l-224 -78l237 14q5 -31 5 -77zM1352 640q0 160 -78.5 295.5t-213 214t-292.5 78.5q-119 0 -227 -46.5t-186.5 -125t-124.5 -187.5t-46 -229q0 -119 46 -228t124.5 -187.5t186.5 -125t227 -46.5q158 0 292.5 78.5t213 214t78.5 294.5z
+M1425 1023v-766l-657 -383l-657 383v766l657 383zM768 -183l708 412v823l-708 411l-708 -411v-823zM1536 1088v-896l-768 -448l-768 448v896l768 448z" />
+    <glyph glyph-name="uniF2B1" unicode="&#xf2b1;" horiz-adv-x="1664" 
+d="M339 1318h691l-26 -72h-665q-110 0 -188.5 -79t-78.5 -189v-771q0 -95 60.5 -169.5t153.5 -93.5q23 -5 98 -5v-72h-45q-140 0 -239.5 100t-99.5 240v771q0 140 99.5 240t239.5 100zM1190 1536h247l-482 -1294q-23 -61 -40.5 -103.5t-45 -98t-54 -93.5t-64.5 -78.5
+t-79.5 -65t-95.5 -41t-116 -18.5v195q163 26 220 182q20 52 20 105q0 54 -20 106l-285 733h228l187 -585zM1664 978v-1111h-795q37 55 45 73h678v1038q0 85 -49.5 155t-129.5 99l25 67q101 -34 163.5 -123.5t62.5 -197.5z" />
+    <glyph glyph-name="uniF2B2" unicode="&#xf2b2;" horiz-adv-x="1792" 
+d="M852 1227q0 -29 -17 -52.5t-45 -23.5t-45 23.5t-17 52.5t17 52.5t45 23.5t45 -23.5t17 -52.5zM688 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50 -21.5t-20 -51.5v-114q0 -30 20.5 -52t49.5 -22q30 0 50.5 22t20.5 52zM860 -149v114q0 30 -20 51.5t-50 21.5t-50.5 -21.5
+t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22q29 0 49.5 22t20.5 52zM1034 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1208 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114
+q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1476 535q-84 -160 -232 -259.5t-323 -99.5q-123 0 -229.5 51.5t-178.5 137t-113 197.5t-41 232q0 88 21 174q-104 -175 -104 -390q0 -162 65 -312t185 -251q30 57 91 57q56 0 86 -50q32 50 87 50q56 0 86 -50q32 50 87 50t87 -50
+q30 50 86 50q28 0 52.5 -15.5t37.5 -40.5q112 94 177 231.5t73 287.5zM1326 564q0 75 -72 75q-17 0 -47 -6q-95 -19 -149 -19q-226 0 -226 243q0 86 30 204q-83 -127 -83 -275q0 -150 89 -260.5t235 -110.5q111 0 210 70q13 48 13 79zM884 1223q0 50 -32 89.5t-81 39.5
+t-81 -39.5t-32 -89.5q0 -51 31.5 -90.5t81.5 -39.5t81.5 39.5t31.5 90.5zM1513 884q0 96 -37.5 179t-113 137t-173.5 54q-77 0 -149 -35t-127 -94q-48 -159 -48 -268q0 -104 45.5 -157t147.5 -53q53 0 142 19q36 6 53 6q51 0 77.5 -28t26.5 -80q0 -26 -4 -46
+q75 68 117.5 165.5t42.5 200.5zM1792 667q0 -111 -33.5 -249.5t-93.5 -204.5q-58 -64 -195 -142.5t-228 -104.5l-4 -1v-114q0 -43 -29.5 -75t-72.5 -32q-56 0 -86 50q-32 -50 -87 -50t-87 50q-30 -50 -86 -50q-55 0 -87 50q-30 -50 -86 -50q-47 0 -75 33.5t-28 81.5
+q-90 -68 -198 -68q-118 0 -211 80q54 1 106 20q-113 31 -182 127q32 -7 71 -7q89 0 164 46q-192 192 -240 306q-24 56 -24 160q0 57 9 125.5t31.5 146.5t55 141t86.5 105t120 42q59 0 81 -52q19 29 42 54q2 3 12 13t13 16q10 15 23 38t25 42t28 39q87 111 211.5 177
+t260.5 66q35 0 62 -4q59 64 146 64q83 0 140 -57q5 -5 5 -12q0 -5 -6 -13.5t-12.5 -16t-16 -17l-10.5 -10.5q17 -6 36 -18t19 -24q0 -6 -16 -25q157 -138 197 -378q25 30 60 30q45 0 100 -49q90 -80 90 -279z" />
+    <glyph glyph-name="uniF2B3" unicode="&#xf2b3;" 
+d="M917 631q0 33 -6 64h-362v-132h217q-12 -76 -74.5 -120.5t-142.5 -44.5q-99 0 -169 71.5t-70 170.5t70 170.5t169 71.5q93 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585h109v110
+h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="uniF2B4" unicode="&#xf2b4;" 
+d="M1536 1024v-839q0 -48 -49 -62q-174 -52 -338 -52q-73 0 -215.5 29.5t-227.5 29.5q-164 0 -370 -48v-338h-160v1368q-63 25 -101 81t-38 124q0 91 64 155t155 64t155 -64t64 -155q0 -68 -38 -124t-101 -81v-68q190 44 343 44q99 0 198 -15q14 -2 111.5 -22.5t149.5 -20.5
+q77 0 165 18q11 2 80 21t89 19q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B5" unicode="&#xf2b5;" horiz-adv-x="2304" 
+d="M192 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32zM1665 442q-10 13 -38.5 50t-41.5 54t-38 49t-42.5 53t-40.5 47t-45 49l-125 -140q-83 -94 -208.5 -92t-205.5 98q-57 69 -56.5 158t58.5 157l177 206q-22 11 -51 16.5t-47.5 6t-56.5 -0.5t-49 -1q-92 0 -158 -66
+l-158 -158h-155v-544q5 0 21 0.5t22 0t19.5 -2t20.5 -4.5t17.5 -8.5t18.5 -13.5l297 -292q115 -111 227 -111q78 0 125 47q57 -20 112.5 8t72.5 85q74 -6 127 44q20 18 36 45.5t14 50.5q10 -10 43 -10q43 0 77 21t49.5 53t12 71.5t-30.5 73.5zM1824 384h96v512h-93l-157 180
+q-66 76 -169 76h-167q-89 0 -146 -67l-209 -243q-28 -33 -28 -75t27 -75q43 -51 110 -52t111 49l193 218q25 23 53.5 21.5t47 -27t8.5 -56.5q16 -19 56 -63t60 -68q29 -36 82.5 -105.5t64.5 -84.5q52 -66 60 -140zM2112 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32z
+M2304 960v-640q0 -26 -19 -45t-45 -19h-434q-27 -65 -82 -106.5t-125 -51.5q-33 -48 -80.5 -81.5t-102.5 -45.5q-42 -53 -104.5 -81.5t-128.5 -24.5q-60 -34 -126 -39.5t-127.5 14t-117 53.5t-103.5 81l-287 282h-358q-26 0 -45 19t-19 45v672q0 26 19 45t45 19h421
+q14 14 47 48t47.5 48t44 40t50.5 37.5t51 25.5t62 19.5t68 5.5h117q99 0 181 -56q82 56 181 56h167q35 0 67 -6t56.5 -14.5t51.5 -26.5t44.5 -31t43 -39.5t39 -42t41 -48t41.5 -48.5h355q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B6" unicode="&#xf2b6;" horiz-adv-x="1792" 
+d="M1792 882v-978q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v978q0 15 11 24q8 7 39 34.5t41.5 36t45.5 37.5t70 55.5t96 73t143.5 107t192.5 140.5q5 4 52.5 40t71.5 52.5t64 35t69 18.5t69 -18.5t65 -35.5t71 -52t52 -40q110 -80 192.5 -140.5t143.5 -107
+t96 -73t70 -55.5t45.5 -37.5t41.5 -36t39 -34.5q11 -9 11 -24zM1228 297q263 191 345 252q11 8 12.5 20.5t-6.5 23.5l-38 52q-8 11 -21 12.5t-24 -6.5q-231 -169 -343 -250q-5 -3 -52 -39t-71.5 -52.5t-64.5 -35t-69 -18.5t-69 18.5t-64.5 35t-71.5 52.5t-52 39
+q-186 134 -343 250q-11 8 -24 6.5t-21 -12.5l-38 -52q-8 -11 -6.5 -23.5t12.5 -20.5q82 -61 345 -252q10 -8 50 -38t65 -47t64 -39.5t77.5 -33.5t75.5 -11t75.5 11t79 34.5t64.5 39.5t65 47.5t48 36.5z" />
+    <glyph glyph-name="uniF2B7" unicode="&#xf2b7;" horiz-adv-x="1792" 
+d="M1474 623l39 -51q8 -11 6.5 -23.5t-11.5 -20.5q-43 -34 -126.5 -98.5t-146.5 -113t-67 -51.5q-39 -32 -60 -48t-60.5 -41t-76.5 -36.5t-74 -11.5h-1h-1q-37 0 -74 11.5t-76 36.5t-61 41.5t-60 47.5q-5 4 -65 50.5t-143.5 111t-122.5 94.5q-11 8 -12.5 20.5t6.5 23.5
+l37 52q8 11 21.5 13t24.5 -7q94 -73 306 -236q5 -4 43.5 -35t60.5 -46.5t56.5 -32.5t58.5 -17h1h1q24 0 58.5 17t56.5 32.5t60.5 46.5t43.5 35q258 198 313 242q11 8 24 6.5t21 -12.5zM1664 -96v928q-90 83 -159 139q-91 74 -389 304q-3 2 -43 35t-61 48t-56 32.5t-59 17.5
+h-1h-1q-24 0 -59 -17.5t-56 -32.5t-61 -48t-43 -35q-215 -166 -315.5 -245.5t-129.5 -104t-82 -74.5q-14 -12 -21 -19v-928q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 832v-928q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v928q0 56 41 94
+q123 114 350 290.5t233 181.5q36 30 59 47.5t61.5 42t76 36.5t74.5 12h1h1q37 0 74.5 -12t76 -36.5t61.5 -42t59 -47.5q43 -36 156 -122t226 -177t201 -173q41 -38 41 -94z" />
+    <glyph glyph-name="uniF2B8" unicode="&#xf2b8;" 
+d="M330 1l202 -214l-34 236l-216 213zM556 -225l274 218l-11 245l-300 -215zM245 413l227 -213l-48 327l-245 204zM495 189l317 214l-14 324l-352 -200zM843 178l95 -80l-2 239l-103 79q0 -1 1 -8.5t0 -12t-5 -7.5l-78 -52l85 -70q7 -6 7 -88zM138 930l256 -200l-68 465
+l-279 173zM1173 267l15 234l-230 -164l2 -240zM417 722l373 194l-19 441l-423 -163zM1270 357l20 233l-226 142l-2 -105l144 -95q6 -4 4 -9l-7 -119zM1461 496l30 222l-179 -128l-20 -228zM1273 329l-71 49l-8 -117q0 -5 -4 -8l-234 -187q-7 -5 -14 0l-98 83l7 -161
+q0 -5 -4 -8l-293 -234q-4 -2 -6 -2q-8 2 -8 3l-228 242q-4 4 -59 277q-2 7 5 11l61 37q-94 86 -95 92l-72 351q-2 7 6 12l94 45q-133 100 -135 108l-96 466q-2 10 7 13l433 135q5 0 8 -1l317 -153q6 -4 6 -9l20 -463q0 -7 -6 -10l-118 -61l126 -85q5 -2 5 -8l5 -123l121 74
+q5 4 11 0l84 -56l3 110q0 6 5 9l206 126q6 3 11 0l245 -135q4 -4 5 -7t-6.5 -60t-17.5 -124.5t-10 -70.5q0 -5 -4 -7l-191 -153q-6 -5 -13 0z" />
+    <glyph glyph-name="uniF2B9" unicode="&#xf2b9;" horiz-adv-x="1664" 
+d="M1201 298q0 57 -5.5 107t-21 100.5t-39.5 86t-64 58t-91 22.5q-6 -4 -33.5 -20.5t-42.5 -24.5t-40.5 -20t-49 -17t-46.5 -5t-46.5 5t-49 17t-40.5 20t-42.5 24.5t-33.5 20.5q-51 0 -91 -22.5t-64 -58t-39.5 -86t-21 -100.5t-5.5 -107q0 -73 42 -121.5t103 -48.5h576
+q61 0 103 48.5t42 121.5zM1028 892q0 108 -76.5 184t-183.5 76t-183.5 -76t-76.5 -184q0 -107 76.5 -183t183.5 -76t183.5 76t76.5 183zM1664 352v-192q0 -14 -9 -23t-23 -9h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216
+q66 0 113 -47t47 -113v-224h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="uniF2BA" unicode="&#xf2ba;" horiz-adv-x="1664" 
+d="M1028 892q0 -107 -76.5 -183t-183.5 -76t-183.5 76t-76.5 183q0 108 76.5 184t183.5 76t183.5 -76t76.5 -184zM980 672q46 0 82.5 -17t60 -47.5t39.5 -67t24 -81t11.5 -82.5t3.5 -79q0 -67 -39.5 -118.5t-105.5 -51.5h-576q-66 0 -105.5 51.5t-39.5 118.5q0 48 4.5 93.5
+t18.5 98.5t36.5 91.5t63 64.5t93.5 26h5q7 -4 32 -19.5t35.5 -21t33 -17t37 -16t35 -9t39.5 -4.5t39.5 4.5t35 9t37 16t33 17t35.5 21t32 19.5zM1664 928q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96
+q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216q66 0 113 -47t47 -113v-224h96q13 0 22.5 -9.5t9.5 -22.5v-192zM1408 -96v1472q0 13 -9.5 22.5t-22.5 9.5h-1216
+q-13 0 -22.5 -9.5t-9.5 -22.5v-1472q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5z" />
+    <glyph glyph-name="uniF2BB" unicode="&#xf2bb;" horiz-adv-x="2048" 
+d="M1024 405q0 64 -9 117.5t-29.5 103t-60.5 78t-97 28.5q-6 -4 -30 -18t-37.5 -21.5t-35.5 -17.5t-43 -14.5t-42 -4.5t-42 4.5t-43 14.5t-35.5 17.5t-37.5 21.5t-30 18q-57 0 -97 -28.5t-60.5 -78t-29.5 -103t-9 -117.5t37 -106.5t91 -42.5h512q54 0 91 42.5t37 106.5z
+M867 925q0 94 -66.5 160.5t-160.5 66.5t-160.5 -66.5t-66.5 -160.5t66.5 -160.5t160.5 -66.5t160.5 66.5t66.5 160.5zM1792 416v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1792 676v56q0 15 -10.5 25.5t-25.5 10.5h-568
+q-15 0 -25.5 -10.5t-10.5 -25.5v-56q0 -15 10.5 -25.5t25.5 -10.5h568q15 0 25.5 10.5t10.5 25.5zM1792 928v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-352v96q0 14 -9 23t-23 9
+h-64q-14 0 -23 -9t-9 -23v-96h-768v96q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-96h-352q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BC" unicode="&#xf2bc;" horiz-adv-x="2048" 
+d="M1024 405q0 -64 -37 -106.5t-91 -42.5h-512q-54 0 -91 42.5t-37 106.5t9 117.5t29.5 103t60.5 78t97 28.5q6 -4 30 -18t37.5 -21.5t35.5 -17.5t43 -14.5t42 -4.5t42 4.5t43 14.5t35.5 17.5t37.5 21.5t30 18q57 0 97 -28.5t60.5 -78t29.5 -103t9 -117.5zM867 925
+q0 -94 -66.5 -160.5t-160.5 -66.5t-160.5 66.5t-66.5 160.5t66.5 160.5t160.5 66.5t160.5 -66.5t66.5 -160.5zM1792 480v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1792 732v-56q0 -15 -10.5 -25.5t-25.5 -10.5h-568
+q-15 0 -25.5 10.5t-10.5 25.5v56q0 15 10.5 25.5t25.5 10.5h568q15 0 25.5 -10.5t10.5 -25.5zM1792 992v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1920 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1728q-13 0 -22.5 -9.5
+t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h352v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h768v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h352q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113
+t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BD" unicode="&#xf2bd;" horiz-adv-x="1792" 
+d="M1523 197q-22 155 -87.5 257.5t-184.5 118.5q-67 -74 -159.5 -115.5t-195.5 -41.5t-195.5 41.5t-159.5 115.5q-119 -16 -184.5 -118.5t-87.5 -257.5q106 -150 271 -237.5t356 -87.5t356 87.5t271 237.5zM1280 896q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5
+t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1792 640q0 -182 -71 -347.5t-190.5 -286t-285.5 -191.5t-349 -71q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2BE" unicode="&#xf2be;" horiz-adv-x="1792" 
+d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348q0 -181 -70.5 -347t-190.5 -286t-286 -191.5t-349 -71.5t-349 71t-285.5 191.5t-190.5 286t-71 347.5t71 348t191 286t286 191t348 71zM1515 185q149 205 149 455q0 156 -61 298t-164 245t-245 164t-298 61t-298 -61
+t-245 -164t-164 -245t-61 -298q0 -250 149 -455q66 327 306 327q131 -128 313 -128t313 128q240 0 306 -327zM1280 832q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5z" />
+    <glyph glyph-name="uniF2C0" unicode="&#xf2c0;" 
+d="M1201 752q47 -14 89.5 -38t89 -73t79.5 -115.5t55 -172t22 -236.5q0 -154 -100 -263.5t-241 -109.5h-854q-141 0 -241 109.5t-100 263.5q0 131 22 236.5t55 172t79.5 115.5t89 73t89.5 38q-79 125 -79 272q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5
+t198.5 -40.5t163.5 -109.5t109.5 -163.5t40.5 -198.5q0 -147 -79 -272zM768 1408q-159 0 -271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5zM1195 -128q88 0 150.5 71.5t62.5 173.5q0 239 -78.5 377t-225.5 145
+q-145 -127 -336 -127t-336 127q-147 -7 -225.5 -145t-78.5 -377q0 -102 62.5 -173.5t150.5 -71.5h854z" />
+    <glyph glyph-name="uniF2C1" unicode="&#xf2c1;" horiz-adv-x="1280" 
+d="M1024 278q0 -64 -37 -107t-91 -43h-512q-54 0 -91 43t-37 107t9 118t29.5 104t61 78.5t96.5 28.5q80 -75 188 -75t188 75q56 0 96.5 -28.5t61 -78.5t29.5 -104t9 -118zM870 797q0 -94 -67.5 -160.5t-162.5 -66.5t-162.5 66.5t-67.5 160.5t67.5 160.5t162.5 66.5
+t162.5 -66.5t67.5 -160.5zM1152 -96v1376h-1024v-1376q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1280 1376v-1472q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h352v-96q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v96h352
+q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C2" unicode="&#xf2c2;" horiz-adv-x="2048" 
+d="M896 324q0 54 -7.5 100.5t-24.5 90t-51 68.5t-81 25q-64 -64 -156 -64t-156 64q-47 0 -81 -25t-51 -68.5t-24.5 -90t-7.5 -100.5q0 -55 31.5 -93.5t75.5 -38.5h426q44 0 75.5 38.5t31.5 93.5zM768 768q0 80 -56 136t-136 56t-136 -56t-56 -136t56 -136t136 -56t136 56
+t56 136zM1792 288v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1408 544v64q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1792 544v64q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23
+v-64q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1792 800v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM128 1152h1792v96q0 14 -9 23t-23 9h-1728q-14 0 -23 -9t-9 -23v-96zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728
+q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C3" unicode="&#xf2c3;" horiz-adv-x="2048" 
+d="M896 324q0 -55 -31.5 -93.5t-75.5 -38.5h-426q-44 0 -75.5 38.5t-31.5 93.5q0 54 7.5 100.5t24.5 90t51 68.5t81 25q64 -64 156 -64t156 64q47 0 81 -25t51 -68.5t24.5 -90t7.5 -100.5zM768 768q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z
+M1792 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1408 608v-64q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h320q14 0 23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v64
+q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 864v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1920 32v1120h-1792v-1120q0 -13 9.5 -22.5t22.5 -9.5h1728q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47
+h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C4" unicode="&#xf2c4;" horiz-adv-x="1792" 
+d="M1255 749q0 318 -105 474.5t-330 156.5q-222 0 -326 -157t-104 -474q0 -316 104 -471.5t326 -155.5q74 0 131 17q-22 43 -39 73t-44 65t-53.5 56.5t-63 36t-77.5 14.5q-46 0 -79 -16l-49 97q105 91 276 91q132 0 215.5 -54t150.5 -155q67 149 67 402zM1645 117h117
+q3 -27 -2 -67t-26.5 -95t-58 -100.5t-107 -78t-162.5 -32.5q-71 0 -130.5 19t-105.5 56t-79 78t-66 96q-97 -27 -205 -27q-150 0 -292.5 58t-253 158.5t-178 249t-67.5 317.5q0 170 67.5 319.5t178.5 250.5t253.5 159t291.5 58q121 0 238.5 -36t217 -106t176 -164.5
+t119.5 -219t43 -261.5q0 -190 -80.5 -347.5t-218.5 -264.5q47 -70 93.5 -106.5t104.5 -36.5q61 0 94 37.5t38 85.5z" />
+    <glyph glyph-name="uniF2C5" unicode="&#xf2c5;" horiz-adv-x="2304" 
+d="M453 -101q0 -21 -16 -37.5t-37 -16.5q-1 0 -13 3q-63 15 -162 140q-225 284 -225 676q0 341 213 614q39 51 95 103.5t94 52.5q19 0 35 -13.5t16 -32.5q0 -27 -63 -90q-98 -102 -147 -184q-119 -199 -119 -449q0 -281 123 -491q50 -85 136 -173q2 -3 14.5 -16t19.5 -21
+t17 -20.5t14.5 -23.5t4.5 -21zM1796 33q0 -29 -17.5 -48.5t-46.5 -19.5h-1081q-26 0 -45 19t-19 45q0 29 17.5 48.5t46.5 19.5h1081q26 0 45 -19t19 -45zM1581 644q0 -134 -67 -233q-25 -38 -69.5 -78.5t-83.5 -60.5q-16 -10 -27 -10q-7 0 -15 6t-8 12q0 9 19 30t42 46
+t42 67.5t19 88.5q0 76 -35 130q-29 42 -46 42q-3 0 -3 -5q0 -12 7.5 -35.5t7.5 -36.5q0 -22 -21.5 -35t-44.5 -13q-66 0 -66 76q0 15 1.5 44t1.5 44q0 25 -10 46q-13 25 -42 53.5t-51 28.5q-5 0 -7 -0.5t-3.5 -2.5t-1.5 -6q0 -2 16 -26t16 -54q0 -37 -19 -68t-46 -54
+t-53.5 -46t-45.5 -54t-19 -68q0 -98 42 -160q29 -43 79 -63q16 -5 17 -10q1 -2 1 -5q0 -16 -18 -16q-6 0 -33 11q-119 43 -195 139.5t-76 218.5q0 55 24.5 115.5t60 115t70.5 108.5t59.5 113.5t24.5 111.5q0 53 -25 94q-29 48 -56 64q-19 9 -19 21q0 20 41 20q50 0 110 -29
+q41 -19 71 -44.5t49.5 -51t33.5 -62.5t22 -69t16 -80q0 -1 3 -17.5t4.5 -25t5.5 -25t9 -27t11 -21.5t14.5 -16.5t18.5 -5.5q23 0 37 14t14 37q0 25 -20 67t-20 52t10 10q27 0 93 -70q72 -76 102.5 -156t30.5 -186zM2304 615q0 -274 -138 -503q-19 -32 -48 -72t-68 -86.5
+t-81 -77t-74 -30.5q-16 0 -31 15.5t-15 31.5q0 15 29 50.5t68.5 77t48.5 52.5q183 230 183 531q0 131 -20.5 235t-72.5 211q-58 119 -163 228q-2 3 -13 13.5t-16.5 16.5t-15 17.5t-15 20t-9.5 18.5t-4 19q0 19 16 35.5t35 16.5q70 0 196 -169q98 -131 146 -273t60 -314
+q2 -42 2 -64z" />
+    <glyph glyph-name="uniF2C6" unicode="&#xf2c6;" horiz-adv-x="1792" 
+d="M1189 229l147 693q9 44 -10.5 63t-51.5 7l-864 -333q-29 -11 -39.5 -25t-2.5 -26.5t32 -19.5l221 -69l513 323q21 14 32 6q7 -5 -4 -15l-415 -375v0v0l-16 -228q23 0 45 22l108 104l224 -165q64 -36 81 38zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2C7" unicode="&#xf2c7;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v907h128v-907q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C8" unicode="&#xf2c8;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v651h128v-651q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C9" unicode="&#xf2c9;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v395h128v-395q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CA" unicode="&#xf2ca;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v139h128v-139q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CB" unicode="&#xf2cb;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 79 56 135.5t136 56.5t136 -56.5t56 -135.5zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5z
+M896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192v128h192z" />
+    <glyph glyph-name="uniF2CC" unicode="&#xf2cc;" horiz-adv-x="1920" 
+d="M1433 1287q10 -10 10 -23t-10 -23l-626 -626q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l44 44q-72 91 -81.5 207t46.5 215q-74 71 -176 71q-106 0 -181 -75t-75 -181v-1280h-256v1280q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5q106 0 201 -41
+t166 -115q94 39 197 24.5t185 -79.5l44 44q10 10 23 10t23 -10zM1344 1024q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1600 896q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1856 1024q26 0 45 -19t19 -45t-19 -45t-45 -19
+t-45 19t-19 45t19 45t45 19zM1216 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1408 832q0 26 19 45t45 19t45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45zM1728 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 768
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 640q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1600 768q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 512q-26 0 -45 19t-19 45t19 45t45 19t45 -19
+t19 -45t-19 -45t-45 -19zM1472 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 384
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 256q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19z" />
+    <glyph glyph-name="uniF2CD" unicode="&#xf2cd;" horiz-adv-x="1792" 
+d="M1664 448v-192q0 -169 -128 -286v-194q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v118q-63 -22 -128 -22h-768q-65 0 -128 22v-110q0 -17 -9.5 -28.5t-22.5 -11.5h-64q-13 0 -22.5 11.5t-9.5 28.5v186q-128 117 -128 286v192h1536zM704 864q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM768 928q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM704 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1056q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM704 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v640q0 106 75 181t181 75q108 0 184 -78q46 19 98 12t93 -39l22 22q11 11 22 0l42 -42
+q11 -11 0 -22l-314 -314q-11 -11 -22 0l-42 42q-11 11 0 22l22 22q-36 46 -40.5 104t23.5 108q-37 35 -88 35q-53 0 -90.5 -37.5t-37.5 -90.5v-640h1504q14 0 23 -9t9 -23zM896 1056q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1120q0 -14 -9 -23t-23 -9
+t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM896 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1248q0 -14 -9 -23
+t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1024 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1088 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23z" />
+    <glyph glyph-name="uniF2CE" unicode="&#xf2ce;" 
+d="M994 344q0 -86 -17 -197q-31 -215 -55 -313q-22 -90 -152 -90t-152 90q-24 98 -55 313q-17 110 -17 197q0 168 224 168t224 -168zM1536 768q0 -240 -134 -434t-350 -280q-8 -3 -15 3t-6 15q7 48 10 66q4 32 6 47q1 9 9 12q159 81 255.5 234t96.5 337q0 180 -91 330.5
+t-247 234.5t-337 74q-124 -7 -237 -61t-193.5 -140.5t-128 -202t-46.5 -240.5q1 -184 99 -336.5t257 -231.5q7 -3 9 -12q3 -21 6 -45q1 -9 5 -32.5t6 -35.5q1 -9 -6.5 -15t-15.5 -2q-148 58 -261 169.5t-173.5 264t-52.5 319.5q7 143 66 273.5t154.5 227t225 157.5t272.5 70
+q164 10 315.5 -46.5t261 -160.5t175 -250.5t65.5 -308.5zM994 800q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5zM1282 768q0 -122 -53.5 -228.5t-146.5 -177.5q-8 -6 -16 -2t-10 14q-6 52 -29 92q-7 10 3 20
+q58 54 91 127t33 155q0 111 -58.5 204t-157.5 141.5t-212 36.5q-133 -15 -229 -113t-109 -231q-10 -92 23.5 -176t98.5 -144q10 -10 3 -20q-24 -41 -29 -93q-2 -9 -10 -13t-16 2q-95 74 -148.5 183t-51.5 234q3 131 69 244t177 181.5t241 74.5q144 7 268 -60t196.5 -187.5
+t72.5 -263.5z" />
+    <glyph glyph-name="uniF2D0" unicode="&#xf2d0;" horiz-adv-x="1792" 
+d="M256 128h1280v768h-1280v-768zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D1" unicode="&#xf2d1;" horiz-adv-x="1792" 
+d="M1792 224v-192q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D2" unicode="&#xf2d2;" horiz-adv-x="2048" 
+d="M256 0h768v512h-768v-512zM1280 512h512v768h-768v-256h96q66 0 113 -47t47 -113v-352zM2048 1376v-960q0 -66 -47 -113t-113 -47h-608v-352q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h608v352q0 66 47 113t113 47h960q66 0 113 -47
+t47 -113z" />
+    <glyph glyph-name="uniF2D3" unicode="&#xf2d3;" horiz-adv-x="1792" 
+d="M1175 215l146 146q10 10 10 23t-10 23l-233 233l233 233q10 10 10 23t-10 23l-146 146q-10 10 -23 10t-23 -10l-233 -233l-233 233q-10 10 -23 10t-23 -10l-146 -146q-10 -10 -10 -23t10 -23l233 -233l-233 -233q-10 -10 -10 -23t10 -23l146 -146q10 -10 23 -10t23 10
+l233 233l233 -233q10 -10 23 -10t23 10zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D4" unicode="&#xf2d4;" horiz-adv-x="1792" 
+d="M1257 425l-146 -146q-10 -10 -23 -10t-23 10l-169 169l-169 -169q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l169 169l-169 169q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l169 -169l169 169q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-169 -169l169 -169q10 -10 10 -23t-10 -23zM256 128h1280v1024h-1280v-1024zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D5" unicode="&#xf2d5;" horiz-adv-x="1792" 
+d="M1070 358l306 564h-654l-306 -564h654zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2D6" unicode="&#xf2d6;" horiz-adv-x="1794" 
+d="M1291 1060q-15 17 -35 8.5t-26 -28.5t5 -38q14 -17 40 -14.5t34 20.5t-18 52zM895 814q-8 -8 -19.5 -8t-18.5 8q-8 8 -8 19t8 18q7 8 18.5 8t19.5 -8q7 -7 7 -18t-7 -19zM1060 740l-35 -35q-12 -13 -29.5 -13t-30.5 13l-38 38q-12 13 -12 30t12 30l35 35q12 12 29.5 12
+t30.5 -12l38 -39q12 -12 12 -29.5t-12 -29.5zM951 870q-7 -8 -18.5 -8t-19.5 8q-7 8 -7 19t7 19q8 8 19 8t19 -8t8 -19t-8 -19zM1354 968q-34 -64 -107.5 -85.5t-127.5 16.5q-38 28 -61 66.5t-21 87.5t39 92t75.5 53t70.5 -5t70 -51q2 -2 13 -12.5t14.5 -13.5t13 -13.5
+t12.5 -15.5t10 -15.5t8.5 -18t4 -18.5t1 -21t-5 -22t-9.5 -24zM1555 486q3 20 -8.5 34.5t-27.5 21.5t-33 17t-23 20q-40 71 -84 98.5t-113 11.5q19 13 40 18.5t33 4.5l12 -1q2 45 -34 90q6 20 6.5 40.5t-2.5 30.5l-3 10q43 24 71 65t34 91q10 84 -43 150.5t-137 76.5
+q-60 7 -114 -18.5t-82 -74.5q-30 -51 -33.5 -101t14.5 -87t43.5 -64t56.5 -42q-45 4 -88 36t-57 88q-28 108 32 222q-16 21 -29 32q-50 0 -89 -19q19 24 42 37t36 14l13 1q0 50 -13 78q-10 21 -32.5 28.5t-47 -3.5t-37.5 -40q2 4 4 7q-7 -28 -6.5 -75.5t19 -117t48.5 -122.5
+q-25 -14 -47 -36q-35 -16 -85.5 -70.5t-84.5 -101.5l-33 -46q-90 -34 -181 -125.5t-75 -162.5q1 -16 11 -27q-15 -12 -30 -30q-21 -25 -21 -54t21.5 -40t63.5 6q41 19 77 49.5t55 60.5q-2 2 -6.5 5t-20.5 7.5t-33 3.5q23 5 51 12.5t40 10t27.5 6t26 4t23.5 0.5q14 -7 22 34
+q7 37 7 90q0 102 -40 150q106 -103 101 -219q-1 -29 -15 -50t-27 -27l-13 -6q-4 -7 -19 -32t-26 -45.5t-26.5 -52t-25 -61t-17 -63t-6.5 -66.5t10 -63q-35 54 -37 80q-22 -24 -34.5 -39t-33.5 -42t-30.5 -46t-16.5 -41t-0.5 -38t25.5 -27q45 -25 144 64t190.5 221.5
+t122.5 228.5q86 52 145 115.5t86 119.5q47 -93 154 -178q104 -83 167 -80q39 2 46 43zM1794 640q0 -182 -71 -348t-191 -286t-286.5 -191t-348.5 -71t-348.5 71t-286.5 191t-191 286t-71 348t71 348t191 286t286.5 191t348.5 71t348.5 -71t286.5 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2D7" unicode="&#xf2d7;" 
+d="M518 1353v-655q103 -1 191.5 1.5t125.5 5.5l37 3q68 2 90.5 24.5t39.5 94.5l33 142h103l-14 -322l7 -319h-103l-29 127q-15 68 -45 93t-84 26q-87 8 -352 8v-556q0 -78 43.5 -115.5t133.5 -37.5h357q35 0 59.5 2t55 7.5t54 18t48.5 32t46 50.5t39 73l93 216h89
+q-6 -37 -31.5 -252t-30.5 -276q-146 5 -263.5 8t-162.5 4h-44h-628l-376 -12v102l127 25q67 13 91.5 37t25.5 79l8 643q3 402 -8 645q-2 61 -25.5 84t-91.5 36l-127 24v102l376 -12h702q139 0 374 27q-6 -68 -14 -194.5t-12 -219.5l-5 -92h-93l-32 124q-31 121 -74 179.5
+t-113 58.5h-548q-28 0 -35.5 -8.5t-7.5 -30.5z" />
+    <glyph glyph-name="uniF2D8" unicode="&#xf2d8;" 
+d="M922 739v-182q0 -4 0.5 -15t0 -15l-1.5 -12t-3.5 -11.5t-6.5 -7.5t-11 -5.5t-16 -1.5v309q9 0 16 -1t11 -5t6.5 -5.5t3.5 -9.5t1 -10.5v-13.5v-14zM1238 643v-121q0 -1 0.5 -12.5t0 -15.5t-2.5 -11.5t-7.5 -10.5t-13.5 -3q-9 0 -14 9q-4 10 -4 165v7v8.5v9t1.5 8.5l3.5 7
+t5 5.5t8 1.5q6 0 10 -1.5t6.5 -4.5t4 -6t2 -8.5t0.5 -8v-9.5v-9zM180 407h122v472h-122v-472zM614 407h106v472h-159l-28 -221q-20 148 -32 221h-158v-472h107v312l45 -312h76l43 319v-319zM1039 712q0 67 -5 90q-3 16 -11 28.5t-17 20.5t-25 14t-26.5 8.5t-31 4t-29 1.5
+h-29.5h-12h-91v-472h56q169 -1 197 24.5t25 180.5q-1 62 -1 100zM1356 515v133q0 29 -2 45t-9.5 33.5t-24.5 25t-46 7.5q-46 0 -77 -34v154h-117v-472h110l7 30q30 -36 77 -36q50 0 66 30.5t16 83.5zM1536 1248v-1216q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113
+v1216q0 66 47 113t113 47h1216q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D9" unicode="&#xf2d9;" horiz-adv-x="2176" 
+d="M1143 -197q-6 1 -11 4q-13 8 -36 23t-86 65t-116.5 104.5t-112 140t-89.5 172.5q-17 3 -175 37q66 -213 235 -362t391 -184zM502 409l168 -28q-25 76 -41 167.5t-19 145.5l-4 53q-84 -82 -121 -224q5 -65 17 -114zM612 1018q-43 -64 -77 -148q44 46 74 68zM2049 584
+q0 161 -62 307t-167.5 252t-250.5 168.5t-304 62.5q-147 0 -281 -52.5t-240 -148.5q-30 -58 -45 -160q60 51 143 83.5t158.5 43t143 13.5t108.5 -1l40 -3q33 -1 53 -15.5t24.5 -33t6.5 -37t-1 -28.5q-126 11 -227.5 0.5t-183 -43.5t-142.5 -71.5t-131 -98.5
+q4 -36 11.5 -92.5t35.5 -178t62 -179.5q123 -6 247.5 14.5t214.5 53.5t162.5 67t109.5 59l37 24q22 16 39.5 20.5t30.5 -5t17 -34.5q14 -97 -39 -121q-208 -97 -467 -134q-135 -20 -317 -16q41 -96 110 -176.5t137 -127t130.5 -79t101.5 -43.5l39 -12q143 -23 263 15
+q195 99 314 289t119 418zM2123 621q-14 -135 -40 -212q-70 -208 -181.5 -346.5t-318.5 -253.5q-48 -33 -82 -44q-72 -26 -163 -16q-36 -3 -73 -3q-283 0 -504.5 173t-295.5 442q-1 0 -4 0.5t-5 0.5q-6 -50 2.5 -112.5t26 -115t36 -98t31.5 -71.5l14 -26q8 -12 54 -82
+q-71 38 -124.5 106.5t-78.5 140t-39.5 137t-17.5 107.5l-2 42q-5 2 -33.5 12.5t-48.5 18t-53 20.5t-57.5 25t-50 25.5t-42.5 27t-25 25.5q19 -10 50.5 -25.5t113 -45.5t145.5 -38l2 32q11 149 94 290q41 202 176 365q28 115 81 214q15 28 32 45t49 32q158 74 303.5 104
+t302 11t306.5 -97q220 -115 333 -336t87 -474z" />
+    <glyph glyph-name="uniF2DA" unicode="&#xf2da;" horiz-adv-x="1792" 
+d="M1341 752q29 44 -6.5 129.5t-121.5 142.5q-58 39 -125.5 53.5t-118 4.5t-68.5 -37q-12 -23 -4.5 -28t42.5 -10q23 -3 38.5 -5t44.5 -9.5t56 -17.5q36 -13 67.5 -31.5t53 -37t40 -38.5t30.5 -38t22 -34.5t16.5 -28.5t12 -18.5t10.5 -6t11 9.5zM1704 178
+q-52 -127 -148.5 -220t-214.5 -141.5t-253 -60.5t-266 13.5t-251 91t-210 161.5t-141.5 235.5t-46.5 303.5q1 41 8.5 84.5t12.5 64t24 80.5t23 73q-51 -208 1 -397t173 -318t291 -206t346 -83t349 74.5t289 244.5q20 27 18 14q0 -4 -4 -14zM1465 627q0 -104 -40.5 -199
+t-108.5 -164t-162 -109.5t-198 -40.5t-198 40.5t-162 109.5t-108.5 164t-40.5 199t40.5 199t108.5 164t162 109.5t198 40.5t198 -40.5t162 -109.5t108.5 -164t40.5 -199zM1752 915q-65 147 -180.5 251t-253 153.5t-292 53.5t-301 -36.5t-275.5 -129t-220 -211.5t-131 -297
+t-10 -373q-49 161 -51.5 311.5t35.5 272.5t109 227t165.5 180.5t207 126t232 71t242.5 9t236 -54t216 -124.5t178 -197q33 -50 62 -121t31 -112zM1690 573q12 244 -136.5 416t-396.5 240q-8 0 -10 5t24 8q125 -4 230 -50t173 -120t116 -168.5t58.5 -199t-1 -208
+t-61.5 -197.5t-122.5 -167t-185 -117.5t-248.5 -46.5q108 30 201.5 80t174 123t129.5 176.5t55 225.5z" />
+    <glyph glyph-name="uniF2DB" unicode="&#xf2db;" 
+d="M192 256v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 512v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 768v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16
+q0 16 16 16h112zM192 1024v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 1280v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM1280 1440v-1472q0 -40 -28 -68t-68 -28h-832q-40 0 -68 28
+t-28 68v1472q0 40 28 68t68 28h832q40 0 68 -28t28 -68zM1536 208v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 464v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 720v-32
+q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 976v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 1232v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16
+h48q16 0 16 -16z" />
+    <glyph glyph-name="uniF2DC" unicode="&#xf2dc;" horiz-adv-x="1664" 
+d="M1566 419l-167 -33l186 -107q23 -13 29.5 -38.5t-6.5 -48.5q-14 -23 -39 -29.5t-48 6.5l-186 106l55 -160q13 -38 -12 -63.5t-60.5 -20.5t-48.5 42l-102 300l-271 156v-313l208 -238q16 -18 17 -39t-11 -36.5t-28.5 -25t-37 -5.5t-36.5 22l-112 128v-214q0 -26 -19 -45
+t-45 -19t-45 19t-19 45v214l-112 -128q-16 -18 -36.5 -22t-37 5.5t-28.5 25t-11 36.5t17 39l208 238v313l-271 -156l-102 -300q-13 -37 -48.5 -42t-60.5 20.5t-12 63.5l55 160l-186 -106q-23 -13 -48 -6.5t-39 29.5q-13 23 -6.5 48.5t29.5 38.5l186 107l-167 33
+q-29 6 -42 29t-8.5 46.5t25.5 40t50 10.5l310 -62l271 157l-271 157l-310 -62q-4 -1 -13 -1q-27 0 -44 18t-19 40t11 43t40 26l167 33l-186 107q-23 13 -29.5 38.5t6.5 48.5t39 30t48 -7l186 -106l-55 160q-13 38 12 63.5t60.5 20.5t48.5 -42l102 -300l271 -156v313
+l-208 238q-16 18 -17 39t11 36.5t28.5 25t37 5.5t36.5 -22l112 -128v214q0 26 19 45t45 19t45 -19t19 -45v-214l112 128q16 18 36.5 22t37 -5.5t28.5 -25t11 -36.5t-17 -39l-208 -238v-313l271 156l102 300q13 37 48.5 42t60.5 -20.5t12 -63.5l-55 -160l186 106
+q23 13 48 6.5t39 -29.5q13 -23 6.5 -48.5t-29.5 -38.5l-186 -107l167 -33q27 -5 40 -26t11 -43t-19 -40t-44 -18q-9 0 -13 1l-310 62l-271 -157l271 -157l310 62q29 6 50 -10.5t25.5 -40t-8.5 -46.5t-42 -29z" />
+    <glyph glyph-name="uniF2DD" unicode="&#xf2dd;" horiz-adv-x="1792" 
+d="M1473 607q7 118 -33 226.5t-113 189t-177 131t-221 57.5q-116 7 -225.5 -32t-192 -110.5t-135 -175t-59.5 -220.5q-7 -118 33 -226.5t113 -189t177.5 -131t221.5 -57.5q155 -9 293 59t224 195.5t94 283.5zM1792 1536l-349 -348q120 -117 180.5 -272t50.5 -321
+q-11 -183 -102 -339t-241 -255.5t-332 -124.5l-999 -132l347 347q-120 116 -180.5 271.5t-50.5 321.5q11 184 102 340t241.5 255.5t332.5 124.5q167 22 500 66t500 66z" />
+    <glyph glyph-name="uniF2DE" unicode="&#xf2de;" horiz-adv-x="1792" 
+d="M948 508l163 -329h-51l-175 350l-171 -350h-49l179 374l-78 33l21 49l240 -102l-21 -50zM563 1100l304 -130l-130 -304l-304 130zM907 915l240 -103l-103 -239l-239 102zM1188 765l191 -81l-82 -190l-190 81zM1680 640q0 159 -62 304t-167.5 250.5t-250.5 167.5t-304 62
+t-304 -62t-250.5 -167.5t-167.5 -250.5t-62 -304t62 -304t167.5 -250.5t250.5 -167.5t304 -62t304 62t250.5 167.5t167.5 250.5t62 304zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71
+t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2E0" unicode="&#xf2e0;" horiz-adv-x="1920" 
+d="M1334 302q-4 24 -27.5 34t-49.5 10.5t-48.5 12.5t-25.5 38q-5 47 33 139.5t75 181t32 127.5q-14 101 -117 103q-45 1 -75 -16l-3 -2l-5 -2.5t-4.5 -2t-5 -2t-5 -0.5t-6 1.5t-6 3.5t-6.5 5q-3 2 -9 8.5t-9 9t-8.5 7.5t-9.5 7.5t-9.5 5.5t-11 4.5t-11.5 2.5q-30 5 -48 -3
+t-45 -31q-1 -1 -9 -8.5t-12.5 -11t-15 -10t-16.5 -5.5t-17 3q-54 27 -84 40q-41 18 -94 -5t-76 -65q-16 -28 -41 -98.5t-43.5 -132.5t-40 -134t-21.5 -73q-22 -69 18.5 -119t110.5 -46q30 2 50.5 15t38.5 46q7 13 79 199.5t77 194.5q6 11 21.5 18t29.5 0q27 -15 21 -53
+q-2 -18 -51 -139.5t-50 -132.5q-6 -38 19.5 -56.5t60.5 -7t55 49.5q4 8 45.5 92t81.5 163.5t46 88.5q20 29 41 28q29 0 25 -38q-2 -16 -65.5 -147.5t-70.5 -159.5q-12 -53 13 -103t74 -74q17 -9 51 -15.5t71.5 -8t62.5 14t20 48.5zM383 86q3 -15 -5 -27.5t-23 -15.5
+q-14 -3 -26.5 5t-15.5 23q-3 14 5 27t22 16t27 -5t16 -23zM953 -177q12 -17 8.5 -37.5t-20.5 -32.5t-37.5 -8t-32.5 21q-11 17 -7.5 37.5t20.5 32.5t37.5 8t31.5 -21zM177 635q-18 -27 -49.5 -33t-57.5 13q-26 18 -32 50t12 58q18 27 49.5 33t57.5 -12q26 -19 32 -50.5
+t-12 -58.5zM1467 -42q19 -28 13 -61.5t-34 -52.5t-60.5 -13t-51.5 34t-13 61t33 53q28 19 60.5 13t52.5 -34zM1579 562q69 -113 42.5 -244.5t-134.5 -207.5q-90 -63 -199 -60q-20 -80 -84.5 -127t-143.5 -44.5t-140 57.5q-12 -9 -13 -10q-103 -71 -225 -48.5t-193 126.5
+q-50 73 -53 164q-83 14 -142.5 70.5t-80.5 128t-2 152t81 138.5q-36 60 -38 128t24.5 125t79.5 98.5t121 50.5q32 85 99 148t146.5 91.5t168 17t159.5 -66.5q72 21 140 17.5t128.5 -36t104.5 -80t67.5 -115t17.5 -140.5q52 -16 87 -57t45.5 -89t-5.5 -99.5t-58 -87.5z
+M455 1222q14 -20 9.5 -44.5t-24.5 -38.5q-19 -14 -43.5 -9.5t-37.5 24.5q-14 20 -9.5 44.5t24.5 38.5q19 14 43.5 9.5t37.5 -24.5zM614 1503q4 -16 -5 -30.5t-26 -18.5t-31 5.5t-18 26.5q-3 17 6.5 31t25.5 18q17 4 31 -5.5t17 -26.5zM1800 555q4 -20 -6.5 -37t-30.5 -21
+q-19 -4 -36 6.5t-21 30.5t6.5 37t30.5 22q20 4 36.5 -7.5t20.5 -30.5zM1136 1448q16 -27 8.5 -58.5t-35.5 -47.5q-27 -16 -57.5 -8.5t-46.5 34.5q-16 28 -8.5 59t34.5 48t58 9t47 -36zM1882 792q4 -15 -4 -27.5t-23 -16.5q-15 -3 -27.5 5.5t-15.5 22.5q-3 15 5 28t23 16
+q14 3 26.5 -5t15.5 -23zM1691 1033q15 -22 10.5 -49t-26.5 -43q-22 -15 -49 -10t-42 27t-10 49t27 43t48.5 11t41.5 -28z" />
+    <glyph glyph-name="uniF2E1" unicode="&#xf2e1;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E2" unicode="&#xf2e2;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E3" unicode="&#xf2e3;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E4" unicode="&#xf2e4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E5" unicode="&#xf2e5;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E6" unicode="&#xf2e6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E7" unicode="&#xf2e7;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_698" unicode="&#xf2e8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E9" unicode="&#xf2e9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EA" unicode="&#xf2ea;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EB" unicode="&#xf2eb;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EC" unicode="&#xf2ec;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2ED" unicode="&#xf2ed;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EE" unicode="&#xf2ee;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="lessequal" unicode="&#xf500;" horiz-adv-x="1792" 
+ />
+  </font>
+</defs></svg>
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/fontawesome-webfont.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-bold-italic.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-bold.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-normal-italic.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/lato-normal.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Bold.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/fonts/Roboto-Slab-Regular.woff2 differ
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/theme.css mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/theme.css
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/theme.css	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/theme.css	2020-08-26 08:57:19.000000000 +0000
@@ -1,5 +1,4 @@
-*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}audio:not([controls]){display:none}[hidden]{display:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:hover,a:active{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}blockquote{margin:0}dfn{font-style:italic}ins{background:#ff9;color:#000;text-decoration:none}mark{background:#ff0;color:#000;font-style:italic;font-weight:bold}pre,code,.rst-content tt,.rst-content code,kbd,samp{font-family:monospace,serif;_font-family:"courier new",monospace;font-size:1em}pre{white-space:pre}q{quotes:none}q:before,q:after{content:"";content:none}small{font-size:85%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}ul,ol,dl{margin:0;padding:0;list-style:none;list-style-image:none}li{list-style:none}dd{margin:0}img{border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;max-width:100%}svg:not(:root){overflow:hidden}figure{margin:0}form{margin:0}fieldset{border:0;margin:0;padding:0}label{cursor:pointer}legend{border:0;*margin-left:-7px;padding:0;white-space:normal}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;*overflow:visible}button[disabled],input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0;*width:13px;*height:13px}input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}textarea{overflow:auto;vertical-align:top;resize:vertical}table{border-collapse:collapse;border-spacing:0}td{vertical-align:top}.chromeframe{margin:0.2em 0;background:#ccc;color:#000;padding:0.2em 0}.ir{display:block;border:0;text-indent:-999em;overflow:hidden;background-color:transparent;background-repeat:no-repeat;text-align:left;direction:ltr;*line-height:0}.ir br{display:none}.hidden{display:none !important;visibility:hidden}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.relative{position:relative}big,small{font-size:100%}@media print{html,body,section{background:none !important}*{box-shadow:none !important;text-shadow:none !important;filter:none !important;-ms-filter:none !important}a,a:visited{text-decoration:underline}.ir a:after,a[href^="javascript:"]:after,a[href^="#"]:after{content:""}pre,blockquote{page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}img{max-width:100% !important}@page{margin:0.5cm}p,h2,.rst-content p.caption,h3{orphans:3;widows:3}h2,.rst-content p.caption,h3{page-break-after:avoid}}.fa:before,.wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso,.rst-content .admonition-todo,.btn,input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"],select,textarea,.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a,.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a,.wy-nav-top a{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:before,.clearfix:after{display:table;content:""}.clearfix:after{clear:both}/*!
- *  Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
+html{box-sizing:border-box}*,:after,:before{box-sizing:inherit}article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block}audio,canvas,video{display:inline-block;*display:inline;*zoom:1}[hidden],audio:not([controls]){display:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}blockquote{margin:0}dfn{font-style:italic}ins{background:#ff9;text-decoration:none}ins,mark{color:#000}mark{background:#ff0;font-style:italic;font-weight:700}.rst-content code,.rst-content tt,code,kbd,pre,samp{font-family:monospace,serif;_font-family:courier new,monospace;font-size:1em}pre{white-space:pre}q{quotes:none}q:after,q:before{content:"";content:none}small{font-size:85%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}dl,ol,ul{margin:0;padding:0;list-style:none;list-style-image:none}li{list-style:none}dd{margin:0}img{border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;max-width:100%}svg:not(:root){overflow:hidden}figure,form{margin:0}label{cursor:pointer}button,input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}button,input{line-height:normal}button,input[type=button],input[type=reset],input[type=submit]{cursor:pointer;-webkit-appearance:button;*overflow:visible}button[disabled],input[disabled]{cursor:default}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}textarea{resize:vertical}table{border-collapse:collapse;border-spacing:0}td{vertical-align:top}.chromeframe{margin:.2em 0;background:#ccc;color:#000;padding:.2em 0}.ir{display:block;border:0;text-indent:-999em;overflow:hidden;background-color:transparent;background-repeat:no-repeat;text-align:left;direction:ltr;*line-height:0}.ir br{display:none}.hidden{display:none!important;visibility:hidden}.visuallyhidden{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.visuallyhidden.focusable:active,.visuallyhidden.focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}.invisible{visibility:hidden}.relative{position:relative}big,small{font-size:100%}@media print{body,html,section{background:none!important}*{box-shadow:none!important;text-shadow:none!important;filter:none!important;-ms-filter:none!important}a,a:visited{text-decoration:underline}.ir a:after,a[href^="#"]:after,a[href^="javascript:"]:after{content:""}blockquote,pre{page-break-inside:avoid}thead{display:table-header-group}img,tr{page-break-inside:avoid}img{max-width:100%!important}@page{margin:.5cm}.rst-content .toctree-wrapper>p.caption,h2,h3,p{orphans:3;widows:3}.rst-content .toctree-wrapper>p.caption,h2,h3{page-break-after:avoid}}.btn,.fa:before,.icon:before,.rst-content .admonition,.rst-content .admonition-title:before,.rst-content .admonition-todo,.rst-content .attention,.rst-content .caution,.rst-content .code-block-caption .headerlink:before,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .note,.rst-content .seealso,.rst-content .tip,.rst-content .warning,.rst-content code.download span:first-child:before,.rst-content dl dt .headerlink:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content table>caption .headerlink:before,.rst-content tt.download span:first-child:before,.wy-alert,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-menu-vertical li.current>a,.wy-menu-vertical li.current>a span.toctree-expand:before,.wy-menu-vertical li.on a,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li span.toctree-expand:before,.wy-nav-top a,.wy-side-nav-search .wy-dropdown>a,.wy-side-nav-search>a,input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week],select,textarea{-webkit-font-smoothing:antialiased}.clearfix{*zoom:1}.clearfix:after,.clearfix:before{display:table;content:""}.clearfix:after{clear:both}/*!
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */@font-face{font-family:'FontAwesome';src:url("../fonts/fontawesome-webfont.eot?v=4.2.0");src:url("../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0") format("embedded-opentype"),url("../fonts/fontawesome-webfont.woff?v=4.2.0") format("woff"),url("../fonts/fontawesome-webfont.ttf?v=4.2.0") format("truetype"),url("../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular") format("svg");font-weight:normal;font-style:normal}.fa,.wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,.rst-content .admonition-title,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content p.caption .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content tt.download span:first-child,.rst-content code.download span:first-child,.icon{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333em;line-height:0.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14286em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14286em;width:2.14286em;top:0.14286em;text-align:center}.fa-li.fa-lg{left:-1.85714em}.fa-border{padding:.2em .25em .15em;border:solid 0.08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left,.wy-menu-vertical li span.pull-left.toctree-expand,.wy-menu-vertical li.on a span.pull-left.toctree-expand,.wy-menu-vertical li.current>a span.pull-left.toctree-expand,.rst-content .pull-left.admonition-title,.rst-content h1 .pull-left.headerlink,.rst-content h2 .pull-left.headerlink,.rst-content p.caption .pull-left.headerlink,.rst-content h3 .pull-left.headerlink,.rst-content h4 .pull-left.headerlink,.rst-content h5 .pull-left.headerlink,.rst-content h6 .pull-left.headerlink,.rst-content dl dt .pull-left.headerlink,.rst-content tt.download span.pull-left:first-child,.rst-content code.download span.pull-left:first-child,.pull-left.icon{margin-right:.3em}.fa.pull-right,.wy-menu-vertical li span.pull-right.toctree-expand,.wy-menu-vertical li.on a span.pull-right.toctree-expand,.wy-menu-vertical li.current>a span.pull-right.toctree-expand,.rst-content .pull-right.admonition-title,.rst-content h1 .pull-right.headerlink,.rst-content h2 .pull-right.headerlink,.rst-content p.caption .pull-right.headerlink,.rst-content h3 .pull-right.headerlink,.rst-content h4 .pull-right.headerlink,.rst-content h5 .pull-right.headerlink,.rst-content h6 .pull-right.headerlink,.rst-content dl dt .pull-right.headerlink,.rst-content tt.download span.pull-right:first-child,.rst-content code.download span.pull-right:first-child,.pull-right.icon{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:""}.fa-music:before{content:""}.fa-search:before,.icon-search:before{content:""}.fa-envelope-o:before{content:""}.fa-heart:before{content:""}.fa-star:before{content:""}.fa-star-o:before{content:""}.fa-user:before{content:""}.fa-film:before{content:""}.fa-th-large:before{content:""}.fa-th:before{content:""}.fa-th-list:before{content:""}.fa-check:before{content:""}.fa-remove:before,.fa-close:before,.fa-times:before{content:""}.fa-search-plus:before{content:""}.fa-search-minus:before{content:""}.fa-power-off:before{content:""}.fa-signal:before{content:""}.fa-gear:before,.fa-cog:before{content:""}.fa-trash-o:before{content:""}.fa-home:before,.icon-home:before{content:""}.fa-file-o:before{content:""}.fa-clock-o:before{content:""}.fa-road:before{content:""}.fa-download:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before{content:""}.fa-arrow-circle-o-down:before{content:""}.fa-arrow-circle-o-up:before{content:""}.fa-inbox:before{content:""}.fa-play-circle-o:before{content:""}.fa-rotate-right:before,.fa-repeat:before{content:""}.fa-refresh:before{content:""}.fa-list-alt:before{content:""}.fa-lock:before{content:""}.fa-flag:before{content:""}.fa-headphones:before{content:""}.fa-volume-off:before{content:""}.fa-volume-down:before{content:""}.fa-volume-up:before{content:""}.fa-qrcode:before{content:""}.fa-barcode:before{content:""}.fa-tag:before{content:""}.fa-tags:before{content:""}.fa-book:before,.icon-book:before{content:""}.fa-bookmark:before{content:""}.fa-print:before{content:""}.fa-camera:before{content:""}.fa-font:before{content:""}.fa-bold:before{content:""}.fa-italic:before{content:""}.fa-text-height:before{content:""}.fa-text-width:before{content:""}.fa-align-left:before{content:""}.fa-align-center:before{content:""}.fa-align-right:before{content:""}.fa-align-justify:before{content:""}.fa-list:before{content:""}.fa-dedent:before,.fa-outdent:before{content:""}.fa-indent:before{content:""}.fa-video-camera:before{content:""}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:""}.fa-pencil:before{content:""}.fa-map-marker:before{content:""}.fa-adjust:before{content:""}.fa-tint:before{content:""}.fa-edit:before,.fa-pencil-square-o:before{content:""}.fa-share-square-o:before{content:""}.fa-check-square-o:before{content:""}.fa-arrows:before{content:""}.fa-step-backward:before{content:""}.fa-fast-backward:before{content:""}.fa-backward:before{content:""}.fa-play:before{content:""}.fa-pause:before{content:""}.fa-stop:before{content:""}.fa-forward:before{content:""}.fa-fast-forward:before{content:""}.fa-step-forward:before{content:""}.fa-eject:before{content:""}.fa-chevron-left:before{content:""}.fa-chevron-right:before{content:""}.fa-plus-circle:before{content:""}.fa-minus-circle:before{content:""}.fa-times-circle:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before{content:""}.fa-check-circle:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before{content:""}.fa-question-circle:before{content:""}.fa-info-circle:before{content:""}.fa-crosshairs:before{content:""}.fa-times-circle-o:before{content:""}.fa-check-circle-o:before{content:""}.fa-ban:before{content:""}.fa-arrow-left:before{content:""}.fa-arrow-right:before{content:""}.fa-arrow-up:before{content:""}.fa-arrow-down:before{content:""}.fa-mail-forward:before,.fa-share:before{content:""}.fa-expand:before{content:""}.fa-compress:before{content:""}.fa-plus:before{content:""}.fa-minus:before{content:""}.fa-asterisk:before{content:""}.fa-exclamation-circle:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.rst-content .admonition-title:before{content:""}.fa-gift:before{content:""}.fa-leaf:before{content:""}.fa-fire:before,.icon-fire:before{content:""}.fa-eye:before{content:""}.fa-eye-slash:before{content:""}.fa-warning:before,.fa-exclamation-triangle:before{content:""}.fa-plane:before{content:""}.fa-calendar:before{content:""}.fa-random:before{content:""}.fa-comment:before{content:""}.fa-magnet:before{content:""}.fa-chevron-up:before{content:""}.fa-chevron-down:before{content:""}.fa-retweet:before{content:""}.fa-shopping-cart:before{content:""}.fa-folder:before{content:""}.fa-folder-open:before{content:""}.fa-arrows-v:before{content:""}.fa-arrows-h:before{content:""}.fa-bar-chart-o:before,.fa-bar-chart:before{content:""}.fa-twitter-square:before{content:""}.fa-facebook-square:before{content:""}.fa-camera-retro:before{content:""}.fa-key:before{content:""}.fa-gears:before,.fa-cogs:before{content:""}.fa-comments:before{content:""}.fa-thumbs-o-up:before{content:""}.fa-thumbs-o-down:before{content:""}.fa-star-half:before{content:""}.fa-heart-o:before{content:""}.fa-sign-out:before{content:""}.fa-linkedin-square:before{content:""}.fa-thumb-tack:before{content:""}.fa-external-link:before{content:""}.fa-sign-in:before{content:""}.fa-trophy:before{content:""}.fa-github-square:before{content:""}.fa-upload:before{content:""}.fa-lemon-o:before{content:""}.fa-phone:before{content:""}.fa-square-o:before{content:""}.fa-bookmark-o:before{content:""}.fa-phone-square:before{content:""}.fa-twitter:before{content:""}.fa-facebook:before{content:""}.fa-github:before,.icon-github:before{content:""}.fa-unlock:before{content:""}.fa-credit-card:before{content:""}.fa-rss:before{content:""}.fa-hdd-o:before{content:""}.fa-bullhorn:before{content:""}.fa-bell:before{content:""}.fa-certificate:before{content:""}.fa-hand-o-right:before{content:""}.fa-hand-o-left:before{content:""}.fa-hand-o-up:before{content:""}.fa-hand-o-down:before{content:""}.fa-arrow-circle-left:before,.icon-circle-arrow-left:before{content:""}.fa-arrow-circle-right:before,.icon-circle-arrow-right:before{content:""}.fa-arrow-circle-up:before{content:""}.fa-arrow-circle-down:before{content:""}.fa-globe:before{content:""}.fa-wrench:before{content:""}.fa-tasks:before{content:""}.fa-filter:before{content:""}.fa-briefcase:before{content:""}.fa-arrows-alt:before{content:""}.fa-group:before,.fa-users:before{content:""}.fa-chain:before,.fa-link:before,.icon-link:before{content:""}.fa-cloud:before{content:""}.fa-flask:before{content:""}.fa-cut:before,.fa-scissors:before{content:""}.fa-copy:before,.fa-files-o:before{content:""}.fa-paperclip:before{content:""}.fa-save:before,.fa-floppy-o:before{content:""}.fa-square:before{content:""}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:""}.fa-list-ul:before{content:""}.fa-list-ol:before{content:""}.fa-strikethrough:before{content:""}.fa-underline:before{content:""}.fa-table:before{content:""}.fa-magic:before{content:""}.fa-truck:before{content:""}.fa-pinterest:before{content:""}.fa-pinterest-square:before{content:""}.fa-google-plus-square:before{content:""}.fa-google-plus:before{content:""}.fa-money:before{content:""}.fa-caret-down:before,.wy-dropdown .caret:before,.icon-caret-down:before{content:""}.fa-caret-up:before{content:""}.fa-caret-left:before{content:""}.fa-caret-right:before{content:""}.fa-columns:before{content:""}.fa-unsorted:before,.fa-sort:before{content:""}.fa-sort-down:before,.fa-sort-desc:before{content:""}.fa-sort-up:before,.fa-sort-asc:before{content:""}.fa-envelope:before{content:""}.fa-linkedin:before{content:""}.fa-rotate-left:before,.fa-undo:before{content:""}.fa-legal:before,.fa-gavel:before{content:""}.fa-dashboard:before,.fa-tachometer:before{content:""}.fa-comment-o:before{content:""}.fa-comments-o:before{content:""}.fa-flash:before,.fa-bolt:before{content:""}.fa-sitemap:before{content:""}.fa-umbrella:before{content:""}.fa-paste:before,.fa-clipboard:before{content:""}.fa-lightbulb-o:before{content:""}.fa-exchange:before{content:""}.fa-cloud-download:before{content:""}.fa-cloud-upload:before{content:""}.fa-user-md:before{content:""}.fa-stethoscope:before{content:""}.fa-suitcase:before{content:""}.fa-bell-o:before{content:""}.fa-coffee:before{content:""}.fa-cutlery:before{content:""}.fa-file-text-o:before{content:""}.fa-building-o:before{content:""}.fa-hospital-o:before{content:""}.fa-ambulance:before{content:""}.fa-medkit:before{content:""}.fa-fighter-jet:before{content:""}.fa-beer:before{content:""}.fa-h-square:before{content:""}.fa-plus-square:before{content:""}.fa-angle-double-left:before{content:""}.fa-angle-double-right:before{content:""}.fa-angle-double-up:before{content:""}.fa-angle-double-down:before{content:""}.fa-angle-left:before{content:""}.fa-angle-right:before{content:""}.fa-angle-up:before{content:""}.fa-angle-down:before{content:""}.fa-desktop:before{content:""}.fa-laptop:before{content:""}.fa-tablet:before{content:""}.fa-mobile-phone:before,.fa-mobile:before{content:""}.fa-circle-o:before{content:""}.fa-quote-left:before{content:""}.fa-quote-right:before{content:""}.fa-spinner:before{content:""}.fa-circle:before{content:""}.fa-mail-reply:before,.fa-reply:before{content:""}.fa-github-alt:before{content:""}.fa-folder-o:before{content:""}.fa-folder-open-o:before{content:""}.fa-smile-o:before{content:""}.fa-frown-o:before{content:""}.fa-meh-o:before{content:""}.fa-gamepad:before{content:""}.fa-keyboard-o:before{content:""}.fa-flag-o:before{content:""}.fa-flag-checkered:before{content:""}.fa-terminal:before{content:""}.fa-code:before{content:""}.fa-mail-reply-all:before,.fa-reply-all:before{content:""}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:""}.fa-location-arrow:before{content:""}.fa-crop:before{content:""}.fa-code-fork:before{content:""}.fa-unlink:before,.fa-chain-broken:before{content:""}.fa-question:before{content:""}.fa-info:before{content:""}.fa-exclamation:before{content:""}.fa-superscript:before{content:""}.fa-subscript:before{content:""}.fa-eraser:before{content:""}.fa-puzzle-piece:before{content:""}.fa-microphone:before{content:""}.fa-microphone-slash:before{content:""}.fa-shield:before{content:""}.fa-calendar-o:before{content:""}.fa-fire-extinguisher:before{content:""}.fa-rocket:before{content:""}.fa-maxcdn:before{content:""}.fa-chevron-circle-left:before{content:""}.fa-chevron-circle-right:before{content:""}.fa-chevron-circle-up:before{content:""}.fa-chevron-circle-down:before{content:""}.fa-html5:before{content:""}.fa-css3:before{content:""}.fa-anchor:before{content:""}.fa-unlock-alt:before{content:""}.fa-bullseye:before{content:""}.fa-ellipsis-h:before{content:""}.fa-ellipsis-v:before{content:""}.fa-rss-square:before{content:""}.fa-play-circle:before{content:""}.fa-ticket:before{content:""}.fa-minus-square:before{content:""}.fa-minus-square-o:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before{content:""}.fa-level-up:before{content:""}.fa-level-down:before{content:""}.fa-check-square:before{content:""}.fa-pencil-square:before{content:""}.fa-external-link-square:before{content:""}.fa-share-square:before{content:""}.fa-compass:before{content:""}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:""}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:""}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:""}.fa-euro:before,.fa-eur:before{content:""}.fa-gbp:before{content:""}.fa-dollar:before,.fa-usd:before{content:""}.fa-rupee:before,.fa-inr:before{content:""}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:""}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:""}.fa-won:before,.fa-krw:before{content:""}.fa-bitcoin:before,.fa-btc:before{content:""}.fa-file:before{content:""}.fa-file-text:before{content:""}.fa-sort-alpha-asc:before{content:""}.fa-sort-alpha-desc:before{content:""}.fa-sort-amount-asc:before{content:""}.fa-sort-amount-desc:before{content:""}.fa-sort-numeric-asc:before{content:""}.fa-sort-numeric-desc:before{content:""}.fa-thumbs-up:before{content:""}.fa-thumbs-down:before{content:""}.fa-youtube-square:before{content:""}.fa-youtube:before{content:""}.fa-xing:before{content:""}.fa-xing-square:before{content:""}.fa-youtube-play:before{content:""}.fa-dropbox:before{content:""}.fa-stack-overflow:before{content:""}.fa-instagram:before{content:""}.fa-flickr:before{content:""}.fa-adn:before{content:""}.fa-bitbucket:before,.icon-bitbucket:before{content:""}.fa-bitbucket-square:before{content:""}.fa-tumblr:before{content:""}.fa-tumblr-square:before{content:""}.fa-long-arrow-down:before{content:""}.fa-long-arrow-up:before{content:""}.fa-long-arrow-left:before{content:""}.fa-long-arrow-right:before{content:""}.fa-apple:before{content:""}.fa-windows:before{content:""}.fa-android:before{content:""}.fa-linux:before{content:""}.fa-dribbble:before{content:""}.fa-skype:before{content:""}.fa-foursquare:before{content:""}.fa-trello:before{content:""}.fa-female:before{content:""}.fa-male:before{content:""}.fa-gittip:before{content:""}.fa-sun-o:before{content:""}.fa-moon-o:before{content:""}.fa-archive:before{content:""}.fa-bug:before{content:""}.fa-vk:before{content:""}.fa-weibo:before{content:""}.fa-renren:before{content:""}.fa-pagelines:before{content:""}.fa-stack-exchange:before{content:""}.fa-arrow-circle-o-right:before{content:""}.fa-arrow-circle-o-left:before{content:""}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:""}.fa-dot-circle-o:before{content:""}.fa-wheelchair:before{content:""}.fa-vimeo-square:before{content:""}.fa-turkish-lira:before,.fa-try:before{content:""}.fa-plus-square-o:before,.wy-menu-vertical li span.toctree-expand:before{content:""}.fa-space-shuttle:before{content:""}.fa-slack:before{content:""}.fa-envelope-square:before{content:""}.fa-wordpress:before{content:""}.fa-openid:before{content:""}.fa-institution:before,.fa-bank:before,.fa-university:before{content:""}.fa-mortar-board:before,.fa-graduation-cap:before{content:""}.fa-yahoo:before{content:""}.fa-google:before{content:""}.fa-reddit:before{content:""}.fa-reddit-square:before{content:""}.fa-stumbleupon-circle:before{content:""}.fa-stumbleupon:before{content:""}.fa-delicious:before{content:""}.fa-digg:before{content:""}.fa-pied-piper:before{content:""}.fa-pied-piper-alt:before{content:""}.fa-drupal:before{content:""}.fa-joomla:before{content:""}.fa-language:before{content:""}.fa-fax:before{content:""}.fa-building:before{content:""}.fa-child:before{content:""}.fa-paw:before{content:""}.fa-spoon:before{content:""}.fa-cube:before{content:""}.fa-cubes:before{content:""}.fa-behance:before{content:""}.fa-behance-square:before{content:""}.fa-steam:before{content:""}.fa-steam-square:before{content:""}.fa-recycle:before{content:""}.fa-automobile:before,.fa-car:before{content:""}.fa-cab:before,.fa-taxi:before{content:""}.fa-tree:before{content:""}.fa-spotify:before{content:""}.fa-deviantart:before{content:""}.fa-soundcloud:before{content:""}.fa-database:before{content:""}.fa-file-pdf-o:before{content:""}.fa-file-word-o:before{content:""}.fa-file-excel-o:before{content:""}.fa-file-powerpoint-o:before{content:""}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:""}.fa-file-zip-o:before,.fa-file-archive-o:before{content:""}.fa-file-sound-o:before,.fa-file-audio-o:before{content:""}.fa-file-movie-o:before,.fa-file-video-o:before{content:""}.fa-file-code-o:before{content:""}.fa-vine:before{content:""}.fa-codepen:before{content:""}.fa-jsfiddle:before{content:""}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:""}.fa-circle-o-notch:before{content:""}.fa-ra:before,.fa-rebel:before{content:""}.fa-ge:before,.fa-empire:before{content:""}.fa-git-square:before{content:""}.fa-git:before{content:""}.fa-hacker-news:before{content:""}.fa-tencent-weibo:before{content:""}.fa-qq:before{content:""}.fa-wechat:before,.fa-weixin:before{content:""}.fa-send:before,.fa-paper-plane:before{content:""}.fa-send-o:before,.fa-paper-plane-o:before{content:""}.fa-history:before{content:""}.fa-circle-thin:before{content:""}.fa-header:before{content:""}.fa-paragraph:before{content:""}.fa-sliders:before{content:""}.fa-share-alt:before{content:""}.fa-share-alt-square:before{content:""}.fa-bomb:before{content:""}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:""}.fa-tty:before{content:""}.fa-binoculars:before{content:""}.fa-plug:before{content:""}.fa-slideshare:before{content:""}.fa-twitch:before{content:""}.fa-yelp:before{content:""}.fa-newspaper-o:before{content:""}.fa-wifi:before{content:""}.fa-calculator:before{content:""}.fa-paypal:before{content:""}.fa-google-wallet:before{content:""}.fa-cc-visa:before{content:""}.fa-cc-mastercard:before{content:""}.fa-cc-discover:before{content:""}.fa-cc-amex:before{content:""}.fa-cc-paypal:before{content:""}.fa-cc-stripe:before{content:""}.fa-bell-slash:before{content:""}.fa-bell-slash-o:before{content:""}.fa-trash:before{content:""}.fa-copyright:before{content:""}.fa-at:before{content:""}.fa-eyedropper:before{content:""}.fa-paint-brush:before{content:""}.fa-birthday-cake:before{content:""}.fa-area-chart:before{content:""}.fa-pie-chart:before{content:""}.fa-line-chart:before{content:""}.fa-lastfm:before{content:""}.fa-lastfm-square:before{content:""}.fa-toggle-off:before{content:""}.fa-toggle-on:before{content:""}.fa-bicycle:before{content:""}.fa-bus:before{content:""}.fa-ioxhost:before{content:""}.fa-angellist:before{content:""}.fa-cc:before{content:""}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:""}.fa-meanpath:before{content:""}.fa,.wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,.rst-content .admonition-title,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content p.caption .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content tt.download span:first-child,.rst-content code.download span:first-child,.icon,.wy-dropdown .caret,.wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-inline-validate.wy-inline-validate-info .wy-input-context{font-family:inherit}.fa:before,.wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.rst-content .admonition-title:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content dl dt .headerlink:before,.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before,.icon:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before{font-family:"FontAwesome";display:inline-block;font-style:normal;font-weight:normal;line-height:1;text-decoration:inherit}a .fa,a .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li a span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand,a .rst-content .admonition-title,.rst-content a .admonition-title,a .rst-content h1 .headerlink,.rst-content h1 a .headerlink,a .rst-content h2 .headerlink,.rst-content h2 a .headerlink,a .rst-content p.caption .headerlink,.rst-content p.caption a .headerlink,a .rst-content h3 .headerlink,.rst-content h3 a .headerlink,a .rst-content h4 .headerlink,.rst-content h4 a .headerlink,a .rst-content h5 .headerlink,.rst-content h5 a .headerlink,a .rst-content h6 .headerlink,.rst-content h6 a .headerlink,a .rst-content dl dt .headerlink,.rst-content dl dt a .headerlink,a .rst-content tt.download span:first-child,.rst-content tt.download a span:first-child,a .rst-content code.download span:first-child,.rst-content code.download a span:first-child,a .icon{display:inline-block;text-decoration:inherit}.btn .fa,.btn .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .btn span.toctree-expand,.btn .wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.on a .btn span.toctree-expand,.btn .wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.current>a .btn span.toctree-expand,.btn .rst-content .admonition-title,.rst-content .btn .admonition-title,.btn .rst-content h1 .headerlink,.rst-content h1 .btn .headerlink,.btn .rst-content h2 .headerlink,.rst-content h2 .btn .headerlink,.btn .rst-content p.caption .headerlink,.rst-content p.caption .btn .headerlink,.btn .rst-content h3 .headerlink,.rst-content h3 .btn .headerlink,.btn .rst-content h4 .headerlink,.rst-content h4 .btn .headerlink,.btn .rst-content h5 .headerlink,.rst-content h5 .btn .headerlink,.btn .rst-content h6 .headerlink,.rst-content h6 .btn .headerlink,.btn .rst-content dl dt .headerlink,.rst-content dl dt .btn .headerlink,.btn .rst-content tt.download span:first-child,.rst-content tt.download .btn span:first-child,.btn .rst-content code.download span:first-child,.rst-content code.download .btn span:first-child,.btn .icon,.nav .fa,.nav .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .nav span.toctree-expand,.nav .wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.on a .nav span.toctree-expand,.nav .wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.current>a .nav span.toctree-expand,.nav .rst-content .admonition-title,.rst-content .nav .admonition-title,.nav .rst-content h1 .headerlink,.rst-content h1 .nav .headerlink,.nav .rst-content h2 .headerlink,.rst-content h2 .nav .headerlink,.nav .rst-content p.caption .headerlink,.rst-content p.caption .nav .headerlink,.nav .rst-content h3 .headerlink,.rst-content h3 .nav .headerlink,.nav .rst-content h4 .headerlink,.rst-content h4 .nav .headerlink,.nav .rst-content h5 .headerlink,.rst-content h5 .nav .headerlink,.nav .rst-content h6 .headerlink,.rst-content h6 .nav .headerlink,.nav .rst-content dl dt .headerlink,.rst-content dl dt .nav .headerlink,.nav .rst-content tt.download span:first-child,.rst-content tt.download .nav span:first-child,.nav .rst-content code.download span:first-child,.rst-content code.download .nav span:first-child,.nav .icon{display:inline}.btn .fa.fa-large,.btn .wy-menu-vertical li span.fa-large.toctree-expand,.wy-menu-vertical li .btn span.fa-large.toctree-expand,.btn .rst-content .fa-large.admonition-title,.rst-content .btn .fa-large.admonition-title,.btn .rst-content h1 .fa-large.headerlink,.rst-content h1 .btn .fa-large.headerlink,.btn .rst-content h2 .fa-large.headerlink,.rst-content h2 .btn .fa-large.headerlink,.btn .rst-content p.caption .fa-large.headerlink,.rst-content p.caption .btn .fa-large.headerlink,.btn .rst-content h3 .fa-large.headerlink,.rst-content h3 .btn .fa-large.headerlink,.btn .rst-content h4 .fa-large.headerlink,.rst-content h4 .btn .fa-large.headerlink,.btn .rst-content h5 .fa-large.headerlink,.rst-content h5 .btn .fa-large.headerlink,.btn .rst-content h6 .fa-large.headerlink,.rst-content h6 .btn .fa-large.headerlink,.btn .rst-content dl dt .fa-large.headerlink,.rst-content dl dt .btn .fa-large.headerlink,.btn .rst-content tt.download span.fa-large:first-child,.rst-content tt.download .btn span.fa-large:first-child,.btn .rst-content code.download span.fa-large:first-child,.rst-content code.download .btn span.fa-large:first-child,.btn .fa-large.icon,.nav .fa.fa-large,.nav .wy-menu-vertical li span.fa-large.toctree-expand,.wy-menu-vertical li .nav span.fa-large.toctree-expand,.nav .rst-content .fa-large.admonition-title,.rst-content .nav .fa-large.admonition-title,.nav .rst-content h1 .fa-large.headerlink,.rst-content h1 .nav .fa-large.headerlink,.nav .rst-content h2 .fa-large.headerlink,.rst-content h2 .nav .fa-large.headerlink,.nav .rst-content p.caption .fa-large.headerlink,.rst-content p.caption .nav .fa-large.headerlink,.nav .rst-content h3 .fa-large.headerlink,.rst-content h3 .nav .fa-large.headerlink,.nav .rst-content h4 .fa-large.headerlink,.rst-content h4 .nav .fa-large.headerlink,.nav .rst-content h5 .fa-large.headerlink,.rst-content h5 .nav .fa-large.headerlink,.nav .rst-content h6 .fa-large.headerlink,.rst-content h6 .nav .fa-large.headerlink,.nav .rst-content dl dt .fa-large.headerlink,.rst-content dl dt .nav .fa-large.headerlink,.nav .rst-content tt.download span.fa-large:first-child,.rst-content tt.download .nav span.fa-large:first-child,.nav .rst-content code.download span.fa-large:first-child,.rst-content code.download .nav span.fa-large:first-child,.nav .fa-large.icon{line-height:0.9em}.btn .fa.fa-spin,.btn .wy-menu-vertical li span.fa-spin.toctree-expand,.wy-menu-vertical li .btn span.fa-spin.toctree-expand,.btn .rst-content .fa-spin.admonition-title,.rst-content .btn .fa-spin.admonition-title,.btn .rst-content h1 .fa-spin.headerlink,.rst-content h1 .btn .fa-spin.headerlink,.btn .rst-content h2 .fa-spin.headerlink,.rst-content h2 .btn .fa-spin.headerlink,.btn .rst-content p.caption .fa-spin.headerlink,.rst-content p.caption .btn .fa-spin.headerlink,.btn .rst-content h3 .fa-spin.headerlink,.rst-content h3 .btn .fa-spin.headerlink,.btn .rst-content h4 .fa-spin.headerlink,.rst-content h4 .btn .fa-spin.headerlink,.btn .rst-content h5 .fa-spin.headerlink,.rst-content h5 .btn .fa-spin.headerlink,.btn .rst-content h6 .fa-spin.headerlink,.rst-content h6 .btn .fa-spin.headerlink,.btn .rst-content dl dt .fa-spin.headerlink,.rst-content dl dt .btn .fa-spin.headerlink,.btn .rst-content tt.download span.fa-spin:first-child,.rst-content tt.download .btn span.fa-spin:first-child,.btn .rst-content code.download span.fa-spin:first-child,.rst-content code.download .btn span.fa-spin:first-child,.btn .fa-spin.icon,.nav .fa.fa-spin,.nav .wy-menu-vertical li span.fa-spin.toctree-expand,.wy-menu-vertical li .nav span.fa-spin.toctree-expand,.nav .rst-content .fa-spin.admonition-title,.rst-content .nav .fa-spin.admonition-title,.nav .rst-content h1 .fa-spin.headerlink,.rst-content h1 .nav .fa-spin.headerlink,.nav .rst-content h2 .fa-spin.headerlink,.rst-content h2 .nav .fa-spin.headerlink,.nav .rst-content p.caption .fa-spin.headerlink,.rst-content p.caption .nav .fa-spin.headerlink,.nav .rst-content h3 .fa-spin.headerlink,.rst-content h3 .nav .fa-spin.headerlink,.nav .rst-content h4 .fa-spin.headerlink,.rst-content h4 .nav .fa-spin.headerlink,.nav .rst-content h5 .fa-spin.headerlink,.rst-content h5 .nav .fa-spin.headerlink,.nav .rst-content h6 .fa-spin.headerlink,.rst-content h6 .nav .fa-spin.headerlink,.nav .rst-content dl dt .fa-spin.headerlink,.rst-content dl dt .nav .fa-spin.headerlink,.nav .rst-content tt.download span.fa-spin:first-child,.rst-content tt.download .nav span.fa-spin:first-child,.nav .rst-content code.download span.fa-spin:first-child,.rst-content code.download .nav span.fa-spin:first-child,.nav .fa-spin.icon{display:inline-block}.btn.fa:before,.wy-menu-vertical li span.btn.toctree-expand:before,.rst-content .btn.admonition-title:before,.rst-content h1 .btn.headerlink:before,.rst-content h2 .btn.headerlink:before,.rst-content p.caption .btn.headerlink:before,.rst-content h3 .btn.headerlink:before,.rst-content h4 .btn.headerlink:before,.rst-content h5 .btn.headerlink:before,.rst-content h6 .btn.headerlink:before,.rst-content dl dt .btn.headerlink:before,.rst-content tt.download span.btn:first-child:before,.rst-content code.download span.btn:first-child:before,.btn.icon:before{opacity:0.5;-webkit-transition:opacity 0.05s ease-in;-moz-transition:opacity 0.05s ease-in;transition:opacity 0.05s ease-in}.btn.fa:hover:before,.wy-menu-vertical li span.btn.toctree-expand:hover:before,.rst-content .btn.admonition-title:hover:before,.rst-content h1 .btn.headerlink:hover:before,.rst-content h2 .btn.headerlink:hover:before,.rst-content p.caption .btn.headerlink:hover:before,.rst-content h3 .btn.headerlink:hover:before,.rst-content h4 .btn.headerlink:hover:before,.rst-content h5 .btn.headerlink:hover:before,.rst-content h6 .btn.headerlink:hover:before,.rst-content dl dt .btn.headerlink:hover:before,.rst-content tt.download span.btn:first-child:hover:before,.rst-content code.download span.btn:first-child:hover:before,.btn.icon:hover:before{opacity:1}.btn-mini .fa:before,.btn-mini .wy-menu-vertical li span.toctree-expand:before,.wy-menu-vertical li .btn-mini span.toctree-expand:before,.btn-mini .rst-content .admonition-title:before,.rst-content .btn-mini .admonition-title:before,.btn-mini .rst-content h1 .headerlink:before,.rst-content h1 .btn-mini .headerlink:before,.btn-mini .rst-content h2 .headerlink:before,.rst-content h2 .btn-mini .headerlink:before,.btn-mini .rst-content p.caption .headerlink:before,.rst-content p.caption .btn-mini .headerlink:before,.btn-mini .rst-content h3 .headerlink:before,.rst-content h3 .btn-mini .headerlink:before,.btn-mini .rst-content h4 .headerlink:before,.rst-content h4 .btn-mini .headerlink:before,.btn-mini .rst-content h5 .headerlink:before,.rst-content h5 .btn-mini .headerlink:before,.btn-mini .rst-content h6 .headerlink:before,.rst-content h6 .btn-mini .headerlink:before,.btn-mini .rst-content dl dt .headerlink:before,.rst-content dl dt .btn-mini .headerlink:before,.btn-mini .rst-content tt.download span:first-child:before,.rst-content tt.download .btn-mini span:first-child:before,.btn-mini .rst-content code.download span:first-child:before,.rst-content code.download .btn-mini span:first-child:before,.btn-mini .icon:before{font-size:14px;vertical-align:-15%}.wy-alert,.rst-content .note,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .warning,.rst-content .seealso,.rst-content .admonition-todo{padding:12px;line-height:24px;margin-bottom:24px;background:#e7f2fa}.wy-alert-title,.rst-content .admonition-title{color:#fff;font-weight:bold;display:block;color:#fff;background:#6ab0de;margin:-12px;padding:6px 12px;margin-bottom:12px}.wy-alert.wy-alert-danger,.rst-content .wy-alert-danger.note,.rst-content .wy-alert-danger.attention,.rst-content .wy-alert-danger.caution,.rst-content .danger,.rst-content .error,.rst-content .wy-alert-danger.hint,.rst-content .wy-alert-danger.important,.rst-content .wy-alert-danger.tip,.rst-content .wy-alert-danger.warning,.rst-content .wy-alert-danger.seealso,.rst-content .wy-alert-danger.admonition-todo{background:#fdf3f2}.wy-alert.wy-alert-danger .wy-alert-title,.rst-content .wy-alert-danger.note .wy-alert-title,.rst-content .wy-alert-danger.attention .wy-alert-title,.rst-content .wy-alert-danger.caution .wy-alert-title,.rst-content .danger .wy-alert-title,.rst-content .error .wy-alert-title,.rst-content .wy-alert-danger.hint .wy-alert-title,.rst-content .wy-alert-danger.important .wy-alert-title,.rst-content .wy-alert-danger.tip .wy-alert-title,.rst-content .wy-alert-danger.warning .wy-alert-title,.rst-content .wy-alert-danger.seealso .wy-alert-title,.rst-content .wy-alert-danger.admonition-todo .wy-alert-title,.wy-alert.wy-alert-danger .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-danger .admonition-title,.rst-content .wy-alert-danger.note .admonition-title,.rst-content .wy-alert-danger.attention .admonition-title,.rst-content .wy-alert-danger.caution .admonition-title,.rst-content .danger .admonition-title,.rst-content .error .admonition-title,.rst-content .wy-alert-danger.hint .admonition-title,.rst-content .wy-alert-danger.important .admonition-title,.rst-content .wy-alert-danger.tip .admonition-title,.rst-content .wy-alert-danger.warning .admonition-title,.rst-content .wy-alert-danger.seealso .admonition-title,.rst-content .wy-alert-danger.admonition-todo .admonition-title{background:#f29f97}.wy-alert.wy-alert-warning,.rst-content .wy-alert-warning.note,.rst-content .attention,.rst-content .caution,.rst-content .wy-alert-warning.danger,.rst-content .wy-alert-warning.error,.rst-content .wy-alert-warning.hint,.rst-content .wy-alert-warning.important,.rst-content .wy-alert-warning.tip,.rst-content .warning,.rst-content .wy-alert-warning.seealso,.rst-content .admonition-todo{background:#ffedcc}.wy-alert.wy-alert-warning .wy-alert-title,.rst-content .wy-alert-warning.note .wy-alert-title,.rst-content .attention .wy-alert-title,.rst-content .caution .wy-alert-title,.rst-content .wy-alert-warning.danger .wy-alert-title,.rst-content .wy-alert-warning.error .wy-alert-title,.rst-content .wy-alert-warning.hint .wy-alert-title,.rst-content .wy-alert-warning.important .wy-alert-title,.rst-content .wy-alert-warning.tip .wy-alert-title,.rst-content .warning .wy-alert-title,.rst-content .wy-alert-warning.seealso .wy-alert-title,.rst-content .admonition-todo .wy-alert-title,.wy-alert.wy-alert-warning .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-warning .admonition-title,.rst-content .wy-alert-warning.note .admonition-title,.rst-content .attention .admonition-title,.rst-content .caution .admonition-title,.rst-content .wy-alert-warning.danger .admonition-title,.rst-content .wy-alert-warning.error .admonition-title,.rst-content .wy-alert-warning.hint .admonition-title,.rst-content .wy-alert-warning.important .admonition-title,.rst-content .wy-alert-warning.tip .admonition-title,.rst-content .warning .admonition-title,.rst-content .wy-alert-warning.seealso .admonition-title,.rst-content .admonition-todo .admonition-title{background:#f0b37e}.wy-alert.wy-alert-info,.rst-content .note,.rst-content .wy-alert-info.attention,.rst-content .wy-alert-info.caution,.rst-content .wy-alert-info.danger,.rst-content .wy-alert-info.error,.rst-content .wy-alert-info.hint,.rst-content .wy-alert-info.important,.rst-content .wy-alert-info.tip,.rst-content .wy-alert-info.warning,.rst-content .seealso,.rst-content .wy-alert-info.admonition-todo{background:#e7f2fa}.wy-alert.wy-alert-info .wy-alert-title,.rst-content .note .wy-alert-title,.rst-content .wy-alert-info.attention .wy-alert-title,.rst-content .wy-alert-info.caution .wy-alert-title,.rst-content .wy-alert-info.danger .wy-alert-title,.rst-content .wy-alert-info.error .wy-alert-title,.rst-content .wy-alert-info.hint .wy-alert-title,.rst-content .wy-alert-info.important .wy-alert-title,.rst-content .wy-alert-info.tip .wy-alert-title,.rst-content .wy-alert-info.warning .wy-alert-title,.rst-content .seealso .wy-alert-title,.rst-content .wy-alert-info.admonition-todo .wy-alert-title,.wy-alert.wy-alert-info .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-info .admonition-title,.rst-content .note .admonition-title,.rst-content .wy-alert-info.attention .admonition-title,.rst-content .wy-alert-info.caution .admonition-title,.rst-content .wy-alert-info.danger .admonition-title,.rst-content .wy-alert-info.error .admonition-title,.rst-content .wy-alert-info.hint .admonition-title,.rst-content .wy-alert-info.important .admonition-title,.rst-content .wy-alert-info.tip .admonition-title,.rst-content .wy-alert-info.warning .admonition-title,.rst-content .seealso .admonition-title,.rst-content .wy-alert-info.admonition-todo .admonition-title{background:#6ab0de}.wy-alert.wy-alert-success,.rst-content .wy-alert-success.note,.rst-content .wy-alert-success.attention,.rst-content .wy-alert-success.caution,.rst-content .wy-alert-success.danger,.rst-content .wy-alert-success.error,.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .wy-alert-success.warning,.rst-content .wy-alert-success.seealso,.rst-content .wy-alert-success.admonition-todo{background:#dbfaf4}.wy-alert.wy-alert-success .wy-alert-title,.rst-content .wy-alert-success.note .wy-alert-title,.rst-content .wy-alert-success.attention .wy-alert-title,.rst-content .wy-alert-success.caution .wy-alert-title,.rst-content .wy-alert-success.danger .wy-alert-title,.rst-content .wy-alert-success.error .wy-alert-title,.rst-content .hint .wy-alert-title,.rst-content .important .wy-alert-title,.rst-content .tip .wy-alert-title,.rst-content .wy-alert-success.warning .wy-alert-title,.rst-content .wy-alert-success.seealso .wy-alert-title,.rst-content .wy-alert-success.admonition-todo .wy-alert-title,.wy-alert.wy-alert-success .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-success .admonition-title,.rst-content .wy-alert-success.note .admonition-title,.rst-content .wy-alert-success.attention .admonition-title,.rst-content .wy-alert-success.caution .admonition-title,.rst-content .wy-alert-success.danger .admonition-title,.rst-content .wy-alert-success.error .admonition-title,.rst-content .hint .admonition-title,.rst-content .important .admonition-title,.rst-content .tip .admonition-title,.rst-content .wy-alert-success.warning .admonition-title,.rst-content .wy-alert-success.seealso .admonition-title,.rst-content .wy-alert-success.admonition-todo .admonition-title{background:#1abc9c}.wy-alert.wy-alert-neutral,.rst-content .wy-alert-neutral.note,.rst-content .wy-alert-neutral.attention,.rst-content .wy-alert-neutral.caution,.rst-content .wy-alert-neutral.danger,.rst-content .wy-alert-neutral.error,.rst-content .wy-alert-neutral.hint,.rst-content .wy-alert-neutral.important,.rst-content .wy-alert-neutral.tip,.rst-content .wy-alert-neutral.warning,.rst-content .wy-alert-neutral.seealso,.rst-content .wy-alert-neutral.admonition-todo{background:#f3f6f6}.wy-alert.wy-alert-neutral .wy-alert-title,.rst-content .wy-alert-neutral.note .wy-alert-title,.rst-content .wy-alert-neutral.attention .wy-alert-title,.rst-content .wy-alert-neutral.caution .wy-alert-title,.rst-content .wy-alert-neutral.danger .wy-alert-title,.rst-content .wy-alert-neutral.error .wy-alert-title,.rst-content .wy-alert-neutral.hint .wy-alert-title,.rst-content .wy-alert-neutral.important .wy-alert-title,.rst-content .wy-alert-neutral.tip .wy-alert-title,.rst-content .wy-alert-neutral.warning .wy-alert-title,.rst-content .wy-alert-neutral.seealso .wy-alert-title,.rst-content .wy-alert-neutral.admonition-todo .wy-alert-title,.wy-alert.wy-alert-neutral .rst-content .admonition-title,.rst-content .wy-alert.wy-alert-neutral .admonition-title,.rst-content .wy-alert-neutral.note .admonition-title,.rst-content .wy-alert-neutral.attention .admonition-title,.rst-content .wy-alert-neutral.caution .admonition-title,.rst-content .wy-alert-neutral.danger .admonition-title,.rst-content .wy-alert-neutral.error .admonition-title,.rst-content .wy-alert-neutral.hint .admonition-title,.rst-content .wy-alert-neutral.important .admonition-title,.rst-content .wy-alert-neutral.tip .admonition-title,.rst-content .wy-alert-neutral.warning .admonition-title,.rst-content .wy-alert-neutral.seealso .admonition-title,.rst-content .wy-alert-neutral.admonition-todo .admonition-title{color:#404040;background:#e1e4e5}.wy-alert.wy-alert-neutral a,.rst-content .wy-alert-neutral.note a,.rst-content .wy-alert-neutral.attention a,.rst-content .wy-alert-neutral.caution a,.rst-content .wy-alert-neutral.danger a,.rst-content .wy-alert-neutral.error a,.rst-content .wy-alert-neutral.hint a,.rst-content .wy-alert-neutral.important a,.rst-content .wy-alert-neutral.tip a,.rst-content .wy-alert-neutral.warning a,.rst-content .wy-alert-neutral.seealso a,.rst-content .wy-alert-neutral.admonition-todo a{color:#2980B9}.wy-alert p:last-child,.rst-content .note p:last-child,.rst-content .attention p:last-child,.rst-content .caution p:last-child,.rst-content .danger p:last-child,.rst-content .error p:last-child,.rst-content .hint p:last-child,.rst-content .important p:last-child,.rst-content .tip p:last-child,.rst-content .warning p:last-child,.rst-content .seealso p:last-child,.rst-content .admonition-todo p:last-child{margin-bottom:0}.wy-tray-container{position:fixed;bottom:0px;left:0;z-index:600}.wy-tray-container li{display:block;width:300px;background:transparent;color:#fff;text-align:center;box-shadow:0 5px 5px 0 rgba(0,0,0,0.1);padding:0 24px;min-width:20%;opacity:0;height:0;line-height:56px;overflow:hidden;-webkit-transition:all 0.3s ease-in;-moz-transition:all 0.3s ease-in;transition:all 0.3s ease-in}.wy-tray-container li.wy-tray-item-success{background:#27AE60}.wy-tray-container li.wy-tray-item-info{background:#2980B9}.wy-tray-container li.wy-tray-item-warning{background:#E67E22}.wy-tray-container li.wy-tray-item-danger{background:#E74C3C}.wy-tray-container li.on{opacity:1;height:56px}@media screen and (max-width: 768px){.wy-tray-container{bottom:auto;top:0;width:100%}.wy-tray-container li{width:100%}}button{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;cursor:pointer;line-height:normal;-webkit-appearance:button;*overflow:visible}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}button[disabled]{cursor:default}.btn{display:inline-block;border-radius:2px;line-height:normal;white-space:nowrap;text-align:center;cursor:pointer;font-size:100%;padding:6px 12px 8px 12px;color:#fff;border:1px solid rgba(0,0,0,0.1);background-color:#27AE60;text-decoration:none;font-weight:normal;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:0px 1px 2px -1px rgba(255,255,255,0.5) inset,0px -2px 0px 0px rgba(0,0,0,0.1) inset;outline-none:false;vertical-align:middle;*display:inline;zoom:1;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transition:all 0.1s linear;-moz-transition:all 0.1s linear;transition:all 0.1s linear}.btn-hover{background:#2e8ece;color:#fff}.btn:hover{background:#2cc36b;color:#fff}.btn:focus{background:#2cc36b;outline:0}.btn:active{box-shadow:0px -1px 0px 0px rgba(0,0,0,0.05) inset,0px 2px 0px 0px rgba(0,0,0,0.1) inset;padding:8px 12px 6px 12px}.btn:visited{color:#fff}.btn:disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn-disabled:hover,.btn-disabled:focus,.btn-disabled:active{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:0.4;cursor:not-allowed;box-shadow:none}.btn::-moz-focus-inner{padding:0;border:0}.btn-small{font-size:80%}.btn-info{background-color:#2980B9 !important}.btn-info:hover{background-color:#2e8ece !important}.btn-neutral{background-color:#f3f6f6 !important;color:#404040 !important}.btn-neutral:hover{background-color:#e5ebeb !important;color:#404040}.btn-neutral:visited{color:#404040 !important}.btn-success{background-color:#27AE60 !important}.btn-success:hover{background-color:#295 !important}.btn-danger{background-color:#E74C3C !important}.btn-danger:hover{background-color:#ea6153 !important}.btn-warning{background-color:#E67E22 !important}.btn-warning:hover{background-color:#e98b39 !important}.btn-invert{background-color:#222}.btn-invert:hover{background-color:#2f2f2f !important}.btn-link{background-color:transparent !important;color:#2980B9;box-shadow:none;border-color:transparent !important}.btn-link:hover{background-color:transparent !important;color:#409ad5 !important;box-shadow:none}.btn-link:active{background-color:transparent !important;color:#409ad5 !important;box-shadow:none}.btn-link:visited{color:#9B59B6}.wy-btn-group .btn,.wy-control .btn{vertical-align:middle}.wy-btn-group{margin-bottom:24px;*zoom:1}.wy-btn-group:before,.wy-btn-group:after{display:table;content:""}.wy-btn-group:after{clear:both}.wy-dropdown{position:relative;display:inline-block}.wy-dropdown-active .wy-dropdown-menu{display:block}.wy-dropdown-menu{position:absolute;left:0;display:none;float:left;top:100%;min-width:100%;background:#fcfcfc;z-index:100;border:solid 1px #cfd7dd;box-shadow:0 2px 2px 0 rgba(0,0,0,0.1);padding:12px}.wy-dropdown-menu>dd>a{display:block;clear:both;color:#404040;white-space:nowrap;font-size:90%;padding:0 12px;cursor:pointer}.wy-dropdown-menu>dd>a:hover{background:#2980B9;color:#fff}.wy-dropdown-menu>dd.divider{border-top:solid 1px #cfd7dd;margin:6px 0}.wy-dropdown-menu>dd.search{padding-bottom:12px}.wy-dropdown-menu>dd.search input[type="search"]{width:100%}.wy-dropdown-menu>dd.call-to-action{background:#e3e3e3;text-transform:uppercase;font-weight:500;font-size:80%}.wy-dropdown-menu>dd.call-to-action:hover{background:#e3e3e3}.wy-dropdown-menu>dd.call-to-action .btn{color:#fff}.wy-dropdown.wy-dropdown-up .wy-dropdown-menu{bottom:100%;top:auto;left:auto;right:0}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu{background:#fcfcfc;margin-top:2px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a{padding:6px 12px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a:hover{background:#2980B9;color:#fff}.wy-dropdown.wy-dropdown-left .wy-dropdown-menu{right:0;left:auto;text-align:right}.wy-dropdown-arrow:before{content:" ";border-bottom:5px solid #f5f5f5;border-left:5px solid transparent;border-right:5px solid transparent;position:absolute;display:block;top:-4px;left:50%;margin-left:-3px}.wy-dropdown-arrow.wy-dropdown-arrow-left:before{left:11px}.wy-form-stacked select{display:block}.wy-form-aligned input,.wy-form-aligned textarea,.wy-form-aligned select,.wy-form-aligned .wy-help-inline,.wy-form-aligned label{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-form-aligned .wy-control-group>label{display:inline-block;vertical-align:middle;width:10em;margin:6px 12px 0 0;float:left}.wy-form-aligned .wy-control{float:left}.wy-form-aligned .wy-control label{display:block}.wy-form-aligned .wy-control select{margin-top:6px}fieldset{border:0;margin:0;padding:0}legend{display:block;width:100%;border:0;padding:0;white-space:normal;margin-bottom:24px;font-size:150%;*margin-left:-7px}label{display:block;margin:0 0 0.3125em 0;color:#333;font-size:90%}input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}.wy-control-group{margin-bottom:24px;*zoom:1;max-width:68em;margin-left:auto;margin-right:auto;*zoom:1}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group:before,.wy-control-group:after{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group.wy-control-group-required>label:after{content:" *";color:#E74C3C}.wy-control-group .wy-form-full,.wy-control-group .wy-form-halves,.wy-control-group .wy-form-thirds{padding-bottom:12px}.wy-control-group .wy-form-full select,.wy-control-group .wy-form-halves select,.wy-control-group .wy-form-thirds select{width:100%}.wy-control-group .wy-form-full input[type="text"],.wy-control-group .wy-form-full input[type="password"],.wy-control-group .wy-form-full input[type="email"],.wy-control-group .wy-form-full input[type="url"],.wy-control-group .wy-form-full input[type="date"],.wy-control-group .wy-form-full input[type="month"],.wy-control-group .wy-form-full input[type="time"],.wy-control-group .wy-form-full input[type="datetime"],.wy-control-group .wy-form-full input[type="datetime-local"],.wy-control-group .wy-form-full input[type="week"],.wy-control-group .wy-form-full input[type="number"],.wy-control-group .wy-form-full input[type="search"],.wy-control-group .wy-form-full input[type="tel"],.wy-control-group .wy-form-full input[type="color"],.wy-control-group .wy-form-halves input[type="text"],.wy-control-group .wy-form-halves input[type="password"],.wy-control-group .wy-form-halves input[type="email"],.wy-control-group .wy-form-halves input[type="url"],.wy-control-group .wy-form-halves input[type="date"],.wy-control-group .wy-form-halves input[type="month"],.wy-control-group .wy-form-halves input[type="time"],.wy-control-group .wy-form-halves input[type="datetime"],.wy-control-group .wy-form-halves input[type="datetime-local"],.wy-control-group .wy-form-halves input[type="week"],.wy-control-group .wy-form-halves input[type="number"],.wy-control-group .wy-form-halves input[type="search"],.wy-control-group .wy-form-halves input[type="tel"],.wy-control-group .wy-form-halves input[type="color"],.wy-control-group .wy-form-thirds input[type="text"],.wy-control-group .wy-form-thirds input[type="password"],.wy-control-group .wy-form-thirds input[type="email"],.wy-control-group .wy-form-thirds input[type="url"],.wy-control-group .wy-form-thirds input[type="date"],.wy-control-group .wy-form-thirds input[type="month"],.wy-control-group .wy-form-thirds input[type="time"],.wy-control-group .wy-form-thirds input[type="datetime"],.wy-control-group .wy-form-thirds input[type="datetime-local"],.wy-control-group .wy-form-thirds input[type="week"],.wy-control-group .wy-form-thirds input[type="number"],.wy-control-group .wy-form-thirds input[type="search"],.wy-control-group .wy-form-thirds input[type="tel"],.wy-control-group .wy-form-thirds input[type="color"]{width:100%}.wy-control-group .wy-form-full{float:left;display:block;margin-right:2.35765%;width:100%;margin-right:0}.wy-control-group .wy-form-full:last-child{margin-right:0}.wy-control-group .wy-form-halves{float:left;display:block;margin-right:2.35765%;width:48.82117%}.wy-control-group .wy-form-halves:last-child{margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(2n){margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(2n+1){clear:left}.wy-control-group .wy-form-thirds{float:left;display:block;margin-right:2.35765%;width:31.76157%}.wy-control-group .wy-form-thirds:last-child{margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n){margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n+1){clear:left}.wy-control-group.wy-control-group-no-input .wy-control{margin:6px 0 0 0;font-size:90%}.wy-control-no-input{display:inline-block;margin:6px 0 0 0;font-size:90%}.wy-control-group.fluid-input input[type="text"],.wy-control-group.fluid-input input[type="password"],.wy-control-group.fluid-input input[type="email"],.wy-control-group.fluid-input input[type="url"],.wy-control-group.fluid-input input[type="date"],.wy-control-group.fluid-input input[type="month"],.wy-control-group.fluid-input input[type="time"],.wy-control-group.fluid-input input[type="datetime"],.wy-control-group.fluid-input input[type="datetime-local"],.wy-control-group.fluid-input input[type="week"],.wy-control-group.fluid-input input[type="number"],.wy-control-group.fluid-input input[type="search"],.wy-control-group.fluid-input input[type="tel"],.wy-control-group.fluid-input input[type="color"]{width:100%}.wy-form-message-inline{display:inline-block;padding-left:0.3em;color:#666;vertical-align:middle;font-size:90%}.wy-form-message{display:block;color:#999;font-size:70%;margin-top:0.3125em;font-style:italic}.wy-form-message p{font-size:inherit;font-style:italic;margin-bottom:6px}.wy-form-message p:last-child{margin-bottom:0}input{line-height:normal}input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;*overflow:visible}input[type="text"],input[type="password"],input[type="email"],input[type="url"],input[type="date"],input[type="month"],input[type="time"],input[type="datetime"],input[type="datetime-local"],input[type="week"],input[type="number"],input[type="search"],input[type="tel"],input[type="color"]{-webkit-appearance:none;padding:6px;display:inline-block;border:1px solid #ccc;font-size:80%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;box-shadow:inset 0 1px 3px #ddd;border-radius:0;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}input[type="datetime-local"]{padding:0.34375em 0.625em}input[disabled]{cursor:default}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0;margin-right:0.3125em;*height:13px;*width:13px}input[type="search"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}input[type="text"]:focus,input[type="password"]:focus,input[type="email"]:focus,input[type="url"]:focus,input[type="date"]:focus,input[type="month"]:focus,input[type="time"]:focus,input[type="datetime"]:focus,input[type="datetime-local"]:focus,input[type="week"]:focus,input[type="number"]:focus,input[type="search"]:focus,input[type="tel"]:focus,input[type="color"]:focus{outline:0;outline:thin dotted \9;border-color:#333}input.no-focus:focus{border-color:#ccc !important}input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus{outline:thin dotted #333;outline:1px auto #129FEA}input[type="text"][disabled],input[type="password"][disabled],input[type="email"][disabled],input[type="url"][disabled],input[type="date"][disabled],input[type="month"][disabled],input[type="time"][disabled],input[type="datetime"][disabled],input[type="datetime-local"][disabled],input[type="week"][disabled],input[type="number"][disabled],input[type="search"][disabled],input[type="tel"][disabled],input[type="color"][disabled]{cursor:not-allowed;background-color:#fafafa}input:focus:invalid,textarea:focus:invalid,select:focus:invalid{color:#E74C3C;border:1px solid #E74C3C}input:focus:invalid:focus,textarea:focus:invalid:focus,select:focus:invalid:focus{border-color:#E74C3C}input[type="file"]:focus:invalid:focus,input[type="radio"]:focus:invalid:focus,input[type="checkbox"]:focus:invalid:focus{outline-color:#E74C3C}input.wy-input-large{padding:12px;font-size:100%}textarea{overflow:auto;vertical-align:top;width:100%;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif}select,textarea{padding:0.5em 0.625em;display:inline-block;border:1px solid #ccc;font-size:80%;box-shadow:inset 0 1px 3px #ddd;-webkit-transition:border 0.3s linear;-moz-transition:border 0.3s linear;transition:border 0.3s linear}select{border:1px solid #ccc;background-color:#fff}select[multiple]{height:auto}select:focus,textarea:focus{outline:0}select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{cursor:not-allowed;background-color:#fafafa}input[type="radio"][disabled],input[type="checkbox"][disabled]{cursor:not-allowed}.wy-checkbox,.wy-radio{margin:6px 0;color:#404040;display:block}.wy-checkbox input,.wy-radio input{vertical-align:baseline}.wy-form-message-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-input-prefix,.wy-input-suffix{white-space:nowrap;padding:6px}.wy-input-prefix .wy-input-context,.wy-input-suffix .wy-input-context{line-height:27px;padding:0 8px;display:inline-block;font-size:80%;background-color:#f3f6f6;border:solid 1px #ccc;color:#999}.wy-input-suffix .wy-input-context{border-left:0}.wy-input-prefix .wy-input-context{border-right:0}.wy-switch{width:36px;height:12px;margin:12px 0;position:relative;border-radius:4px;background:#ccc;cursor:pointer;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out}.wy-switch:before{position:absolute;content:"";display:block;width:18px;height:18px;border-radius:4px;background:#999;left:-3px;top:-3px;-webkit-transition:all 0.2s ease-in-out;-moz-transition:all 0.2s ease-in-out;transition:all 0.2s ease-in-out}.wy-switch:after{content:"false";position:absolute;left:48px;display:block;font-size:12px;color:#ccc}.wy-switch.active{background:#1e8449}.wy-switch.active:before{left:24px;background:#27AE60}.wy-switch.active:after{content:"true"}.wy-switch.disabled,.wy-switch.active.disabled{cursor:not-allowed}.wy-control-group.wy-control-group-error .wy-form-message,.wy-control-group.wy-control-group-error>label{color:#E74C3C}.wy-control-group.wy-control-group-error input[type="text"],.wy-control-group.wy-control-group-error input[type="password"],.wy-control-group.wy-control-group-error input[type="email"],.wy-control-group.wy-control-group-error input[type="url"],.wy-control-group.wy-control-group-error input[type="date"],.wy-control-group.wy-control-group-error input[type="month"],.wy-control-group.wy-control-group-error input[type="time"],.wy-control-group.wy-control-group-error input[type="datetime"],.wy-control-group.wy-control-group-error input[type="datetime-local"],.wy-control-group.wy-control-group-error input[type="week"],.wy-control-group.wy-control-group-error input[type="number"],.wy-control-group.wy-control-group-error input[type="search"],.wy-control-group.wy-control-group-error input[type="tel"],.wy-control-group.wy-control-group-error input[type="color"]{border:solid 1px #E74C3C}.wy-control-group.wy-control-group-error textarea{border:solid 1px #E74C3C}.wy-inline-validate{white-space:nowrap}.wy-inline-validate .wy-input-context{padding:0.5em 0.625em;display:inline-block;font-size:80%}.wy-inline-validate.wy-inline-validate-success .wy-input-context{color:#27AE60}.wy-inline-validate.wy-inline-validate-danger .wy-input-context{color:#E74C3C}.wy-inline-validate.wy-inline-validate-warning .wy-input-context{color:#E67E22}.wy-inline-validate.wy-inline-validate-info .wy-input-context{color:#2980B9}.rotate-90{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.rotate-180{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.rotate-270{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.mirror{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1);-o-transform:scaleX(-1);transform:scaleX(-1)}.mirror.rotate-90{-webkit-transform:scaleX(-1) rotate(90deg);-moz-transform:scaleX(-1) rotate(90deg);-ms-transform:scaleX(-1) rotate(90deg);-o-transform:scaleX(-1) rotate(90deg);transform:scaleX(-1) rotate(90deg)}.mirror.rotate-180{-webkit-transform:scaleX(-1) rotate(180deg);-moz-transform:scaleX(-1) rotate(180deg);-ms-transform:scaleX(-1) rotate(180deg);-o-transform:scaleX(-1) rotate(180deg);transform:scaleX(-1) rotate(180deg)}.mirror.rotate-270{-webkit-transform:scaleX(-1) rotate(270deg);-moz-transform:scaleX(-1) rotate(270deg);-ms-transform:scaleX(-1) rotate(270deg);-o-transform:scaleX(-1) rotate(270deg);transform:scaleX(-1) rotate(270deg)}@media only screen and (max-width: 480px){.wy-form button[type="submit"]{margin:0.7em 0 0}.wy-form input[type="text"],.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0.3em;display:block}.wy-form label{margin-bottom:0.3em;display:block}.wy-form input[type="password"],.wy-form input[type="email"],.wy-form input[type="url"],.wy-form input[type="date"],.wy-form input[type="month"],.wy-form input[type="time"],.wy-form input[type="datetime"],.wy-form input[type="datetime-local"],.wy-form input[type="week"],.wy-form input[type="number"],.wy-form input[type="search"],.wy-form input[type="tel"],.wy-form input[type="color"]{margin-bottom:0}.wy-form-aligned .wy-control-group label{margin-bottom:0.3em;text-align:left;display:block;width:100%}.wy-form-aligned .wy-control{margin:1.5em 0 0 0}.wy-form .wy-help-inline,.wy-form-message-inline,.wy-form-message{display:block;font-size:80%;padding:6px 0}}@media screen and (max-width: 768px){.tablet-hide{display:none}}@media screen and (max-width: 480px){.mobile-hide{display:none}}.float-left{float:left}.float-right{float:right}.full-width{width:100%}.wy-table,.rst-content table.docutils,.rst-content table.field-list{border-collapse:collapse;border-spacing:0;empty-cells:show;margin-bottom:24px}.wy-table caption,.rst-content table.docutils caption,.rst-content table.field-list caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td,.wy-table th,.rst-content table.docutils th,.rst-content table.field-list th{font-size:90%;margin:0;overflow:visible;padding:8px 16px}.wy-table td:first-child,.rst-content table.docutils td:first-child,.rst-content table.field-list td:first-child,.wy-table th:first-child,.rst-content table.docutils th:first-child,.rst-content table.field-list th:first-child{border-left-width:0}.wy-table thead,.rst-content table.docutils thead,.rst-content table.field-list thead{color:#000;text-align:left;vertical-align:bottom;white-space:nowrap}.wy-table thead th,.rst-content table.docutils thead th,.rst-content table.field-list thead th{font-weight:bold;border-bottom:solid 2px #e1e4e5}.wy-table td,.rst-content table.docutils td,.rst-content table.field-list td{background-color:transparent;vertical-align:middle}.wy-table td p,.rst-content table.docutils td p,.rst-content table.field-list td p{line-height:18px}.wy-table td p:last-child,.rst-content table.docutils td p:last-child,.rst-content table.field-list td p:last-child{margin-bottom:0}.wy-table .wy-table-cell-min,.rst-content table.docutils .wy-table-cell-min,.rst-content table.field-list .wy-table-cell-min{width:1%;padding-right:0}.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox],.wy-table .wy-table-cell-min input[type=checkbox],.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox]{margin:0}.wy-table-secondary{color:gray;font-size:90%}.wy-table-tertiary{color:gray;font-size:80%}.wy-table-odd td,.wy-table-striped tr:nth-child(2n-1) td,.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td{background-color:#f3f6f6}.wy-table-backed{background-color:#f3f6f6}.wy-table-bordered-all,.rst-content table.docutils{border:1px solid #e1e4e5}.wy-table-bordered-all td,.rst-content table.docutils td{border-bottom:1px solid #e1e4e5;border-left:1px solid #e1e4e5}.wy-table-bordered-all tbody>tr:last-child td,.rst-content table.docutils tbody>tr:last-child td{border-bottom-width:0}.wy-table-bordered{border:1px solid #e1e4e5}.wy-table-bordered-rows td{border-bottom:1px solid #e1e4e5}.wy-table-bordered-rows tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal td,.wy-table-horizontal th{border-width:0 0 1px 0;border-bottom:1px solid #e1e4e5}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-responsive{margin-bottom:24px;max-width:100%;overflow:auto}.wy-table-responsive table{margin-bottom:0 !important}.wy-table-responsive table td,.wy-table-responsive table th{white-space:nowrap}a{color:#2980B9;text-decoration:none;cursor:pointer}a:hover{color:#3091d1}a:visited{color:#9B59B6}html{height:100%;overflow-x:hidden}body{font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;font-weight:normal;color:#404040;min-height:100%;overflow-x:hidden;background:#edf0f2}.wy-text-left{text-align:left}.wy-text-center{text-align:center}.wy-text-right{text-align:right}.wy-text-large{font-size:120%}.wy-text-normal{font-size:100%}.wy-text-small,small{font-size:80%}.wy-text-strike{text-decoration:line-through}.wy-text-warning{color:#E67E22 !important}a.wy-text-warning:hover{color:#eb9950 !important}.wy-text-info{color:#2980B9 !important}a.wy-text-info:hover{color:#409ad5 !important}.wy-text-success{color:#27AE60 !important}a.wy-text-success:hover{color:#36d278 !important}.wy-text-danger{color:#E74C3C !important}a.wy-text-danger:hover{color:#ed7669 !important}.wy-text-neutral{color:#404040 !important}a.wy-text-neutral:hover{color:#595959 !important}h1,h2,.rst-content p.caption,h3,h4,h5,h6,legend{margin-top:0;font-weight:700;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif}p{line-height:24px;margin:0;font-size:16px;margin-bottom:24px}h1{font-size:175%}h2,.rst-content p.caption{font-size:150%}h3{font-size:125%}h4{font-size:115%}h5{font-size:110%}h6{font-size:100%}hr{display:block;height:1px;border:0;border-top:1px solid #e1e4e5;margin:24px 0;padding:0}code,.rst-content tt,.rst-content code{white-space:nowrap;max-width:100%;background:#fff;border:solid 1px #e1e4e5;font-size:75%;padding:0 5px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;color:#E74C3C;overflow-x:auto}code.code-large,.rst-content tt.code-large{font-size:90%}.wy-plain-list-disc,.rst-content .section ul,.rst-content .toctree-wrapper ul,article ul{list-style:disc;line-height:24px;margin-bottom:24px}.wy-plain-list-disc li,.rst-content .section ul li,.rst-content .toctree-wrapper ul li,article ul li{list-style:disc;margin-left:24px}.wy-plain-list-disc li p:last-child,.rst-content .section ul li p:last-child,.rst-content .toctree-wrapper ul li p:last-child,article ul li p:last-child{margin-bottom:0}.wy-plain-list-disc li ul,.rst-content .section ul li ul,.rst-content .toctree-wrapper ul li ul,article ul li ul{margin-bottom:0}.wy-plain-list-disc li li,.rst-content .section ul li li,.rst-content .toctree-wrapper ul li li,article ul li li{list-style:circle}.wy-plain-list-disc li li li,.rst-content .section ul li li li,.rst-content .toctree-wrapper ul li li li,article ul li li li{list-style:square}.wy-plain-list-disc li ol li,.rst-content .section ul li ol li,.rst-content .toctree-wrapper ul li ol li,article ul li ol li{list-style:decimal}.wy-plain-list-decimal,.rst-content .section ol,.rst-content ol.arabic,article ol{list-style:decimal;line-height:24px;margin-bottom:24px}.wy-plain-list-decimal li,.rst-content .section ol li,.rst-content ol.arabic li,article ol li{list-style:decimal;margin-left:24px}.wy-plain-list-decimal li p:last-child,.rst-content .section ol li p:last-child,.rst-content ol.arabic li p:last-child,article ol li p:last-child{margin-bottom:0}.wy-plain-list-decimal li ul,.rst-content .section ol li ul,.rst-content ol.arabic li ul,article ol li ul{margin-bottom:0}.wy-plain-list-decimal li ul li,.rst-content .section ol li ul li,.rst-content ol.arabic li ul li,article ol li ul li{list-style:disc}.codeblock-example{border:1px solid #e1e4e5;border-bottom:none;padding:24px;padding-top:48px;font-weight:500;background:#fff;position:relative}.codeblock-example:after{content:"Example";position:absolute;top:0px;left:0px;background:#9B59B6;color:#fff;padding:6px 12px}.codeblock-example.prettyprint-example-only{border:1px solid #e1e4e5;margin-bottom:24px}.codeblock,pre.literal-block,.rst-content .literal-block,.rst-content pre.literal-block,div[class^='highlight']{border:1px solid #e1e4e5;padding:0px;overflow-x:auto;background:#fff;margin:1px 0 24px 0}.codeblock div[class^='highlight'],pre.literal-block div[class^='highlight'],.rst-content .literal-block div[class^='highlight'],div[class^='highlight'] div[class^='highlight']{border:none;background:none;margin:0}div[class^='highlight'] td.code{width:100%}.linenodiv pre{border-right:solid 1px #e6e9ea;margin:0;padding:12px 12px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;font-size:12px;line-height:1.5;color:#d9d9d9}div[class^='highlight'] pre{white-space:pre;margin:0;padding:12px 12px;font-family:Consolas,"Andale Mono WT","Andale Mono","Lucida Console","Lucida Sans Typewriter","DejaVu Sans Mono","Bitstream Vera Sans Mono","Liberation Mono","Nimbus Mono L",Monaco,"Courier New",Courier,monospace;font-size:12px;line-height:1.5;display:block;overflow:auto;color:#404040}@media print{.codeblock,pre.literal-block,.rst-content .literal-block,.rst-content pre.literal-block,div[class^='highlight'],div[class^='highlight'] pre{white-space:pre-wrap}}.hll{background-color:#ffc;margin:0 -12px;padding:0 12px;display:block}.c{color:#998;font-style:italic}.err{color:#a61717;background-color:#e3d2d2}.k{font-weight:bold}.o{font-weight:bold}.cm{color:#998;font-style:italic}.cp{color:#999;font-weight:bold}.c1{color:#998;font-style:italic}.cs{color:#999;font-weight:bold;font-style:italic}.gd{color:#000;background-color:#fdd}.gd .x{color:#000;background-color:#faa}.ge{font-style:italic}.gr{color:#a00}.gh{color:#999}.gi{color:#000;background-color:#dfd}.gi .x{color:#000;background-color:#afa}.go{color:#888}.gp{color:#555}.gs{font-weight:bold}.gu{color:purple;font-weight:bold}.gt{color:#a00}.kc{font-weight:bold}.kd{font-weight:bold}.kn{font-weight:bold}.kp{font-weight:bold}.kr{font-weight:bold}.kt{color:#458;font-weight:bold}.m{color:#099}.s{color:#d14}.n{color:#333}.na{color:teal}.nb{color:#0086b3}.nc{color:#458;font-weight:bold}.no{color:teal}.ni{color:purple}.ne{color:#900;font-weight:bold}.nf{color:#900;font-weight:bold}.nn{color:#555}.nt{color:navy}.nv{color:teal}.ow{font-weight:bold}.w{color:#bbb}.mf{color:#099}.mh{color:#099}.mi{color:#099}.mo{color:#099}.sb{color:#d14}.sc{color:#d14}.sd{color:#d14}.s2{color:#d14}.se{color:#d14}.sh{color:#d14}.si{color:#d14}.sx{color:#d14}.sr{color:#009926}.s1{color:#d14}.ss{color:#990073}.bp{color:#999}.vc{color:teal}.vg{color:teal}.vi{color:teal}.il{color:#099}.gc{color:#999;background-color:#EAF2F5}.wy-breadcrumbs li{display:inline-block}.wy-breadcrumbs li.wy-breadcrumbs-aside{float:right}.wy-breadcrumbs li a{display:inline-block;padding:5px}.wy-breadcrumbs li a:first-child{padding-left:0}.wy-breadcrumbs-extra{margin-bottom:0;color:#b3b3b3;font-size:80%;display:inline-block}@media screen and (max-width: 480px){.wy-breadcrumbs-extra{display:none}.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}@media print{.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}.wy-affix{position:fixed;top:1.618em}.wy-menu a:hover{text-decoration:none}.wy-menu-horiz{*zoom:1}.wy-menu-horiz:before,.wy-menu-horiz:after{display:table;content:""}.wy-menu-horiz:after{clear:both}.wy-menu-horiz ul,.wy-menu-horiz li{display:inline-block}.wy-menu-horiz li:hover{background:rgba(255,255,255,0.1)}.wy-menu-horiz li.divide-left{border-left:solid 1px #404040}.wy-menu-horiz li.divide-right{border-right:solid 1px #404040}.wy-menu-horiz a{height:32px;display:inline-block;line-height:32px;padding:0 16px}.wy-menu-vertical header,.wy-menu-vertical p.caption{height:32px;display:inline-block;line-height:32px;padding:0 1.618em;margin-bottom:0;display:block;font-weight:bold;text-transform:uppercase;font-size:80%;color:#555;white-space:nowrap}.wy-menu-vertical ul{margin-bottom:0}.wy-menu-vertical li.divide-top{border-top:solid 1px #404040}.wy-menu-vertical li.divide-bottom{border-bottom:solid 1px #404040}.wy-menu-vertical li.current{background:#e3e3e3}.wy-menu-vertical li.current a{color:gray;border-right:solid 1px #c9c9c9;padding:0.4045em 2.427em}.wy-menu-vertical li.current a:hover{background:#d6d6d6}.wy-menu-vertical li code,.wy-menu-vertical li .rst-content tt,.rst-content .wy-menu-vertical li tt{border:none;background:inherit;color:inherit;padding-left:0;padding-right:0}.wy-menu-vertical li span.toctree-expand{display:block;float:left;margin-left:-1.2em;font-size:0.8em;line-height:1.6em;color:#4d4d4d}.wy-menu-vertical li.on a,.wy-menu-vertical li.current>a{color:#404040;padding:0.4045em 1.618em;font-weight:bold;position:relative;background:#fcfcfc;border:none;border-bottom:solid 1px #c9c9c9;border-top:solid 1px #c9c9c9;padding-left:1.618em -4px}.wy-menu-vertical li.on a:hover,.wy-menu-vertical li.current>a:hover{background:#fcfcfc}.wy-menu-vertical li.on a:hover span.toctree-expand,.wy-menu-vertical li.current>a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li.current>a span.toctree-expand{display:block;font-size:0.8em;line-height:1.6em;color:#333}.wy-menu-vertical li.toctree-l1.current li.toctree-l2>ul,.wy-menu-vertical li.toctree-l2.current li.toctree-l3>ul{display:none}.wy-menu-vertical li.toctree-l1.current li.toctree-l2.current>ul,.wy-menu-vertical li.toctree-l2.current li.toctree-l3.current>ul{display:block}.wy-menu-vertical li.toctree-l2.current>a{background:#c9c9c9;padding:0.4045em 2.427em}.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a{display:block;background:#c9c9c9;padding:0.4045em 4.045em}.wy-menu-vertical li.toctree-l2 a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.toctree-l2 span.toctree-expand{color:#a3a3a3}.wy-menu-vertical li.toctree-l3{font-size:0.9em}.wy-menu-vertical li.toctree-l3.current>a{background:#bdbdbd;padding:0.4045em 4.045em}.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a{display:block;background:#bdbdbd;padding:0.4045em 5.663em;border-top:none;border-bottom:none}.wy-menu-vertical li.toctree-l3 a:hover span.toctree-expand{color:gray}.wy-menu-vertical li.toctree-l3 span.toctree-expand{color:#969696}.wy-menu-vertical li.toctree-l4{font-size:0.9em}.wy-menu-vertical li.current ul{display:block}.wy-menu-vertical li ul{margin-bottom:0;display:none}.wy-menu-vertical .local-toc li ul{display:block}.wy-menu-vertical li ul li a{margin-bottom:0;color:#b3b3b3;font-weight:normal}.wy-menu-vertical a{display:inline-block;line-height:18px;padding:0.4045em 1.618em;display:block;position:relative;font-size:90%;color:#b3b3b3}.wy-menu-vertical a:hover{background-color:#4e4a4a;cursor:pointer}.wy-menu-vertical a:hover span.toctree-expand{color:#b3b3b3}.wy-menu-vertical a:active{background-color:#2980B9;cursor:pointer;color:#fff}.wy-menu-vertical a:active span.toctree-expand{color:#fff}.wy-side-nav-search{z-index:200;background-color:#2980B9;text-align:center;padding:0.809em;display:block;color:#fcfcfc;margin-bottom:0.809em}.wy-side-nav-search input[type=text]{width:100%;border-radius:50px;padding:6px 12px;border-color:#2472a4}.wy-side-nav-search img{display:block;margin:auto auto 0.809em auto;height:45px;width:45px;background-color:#2980B9;padding:5px;border-radius:100%}.wy-side-nav-search>a,.wy-side-nav-search .wy-dropdown>a{color:#fcfcfc;font-size:100%;font-weight:bold;display:inline-block;padding:4px 6px;margin-bottom:0.809em}.wy-side-nav-search>a:hover,.wy-side-nav-search .wy-dropdown>a:hover{background:rgba(255,255,255,0.1)}.wy-side-nav-search>a img.logo,.wy-side-nav-search .wy-dropdown>a img.logo{display:block;margin:0 auto;height:auto;width:auto;border-radius:0;max-width:100%;background:transparent}.wy-side-nav-search>a.icon img.logo,.wy-side-nav-search .wy-dropdown>a.icon img.logo{margin-top:0.85em}.wy-nav .wy-menu-vertical header{color:#2980B9}.wy-nav .wy-menu-vertical a{color:#b3b3b3}.wy-nav .wy-menu-vertical a:hover{background-color:#2980B9;color:#fff}[data-menu-wrap]{-webkit-transition:all 0.2s ease-in;-moz-transition:all 0.2s ease-in;transition:all 0.2s ease-in;position:absolute;opacity:1;width:100%;opacity:0}[data-menu-wrap].move-center{left:0;right:auto;opacity:1}[data-menu-wrap].move-left{right:auto;left:-100%;opacity:0}[data-menu-wrap].move-right{right:-100%;left:auto;opacity:0}.wy-body-for-nav{background:left repeat-y #fcfcfc;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAIAAACQd1PeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoxOERBMTRGRDBFMUUxMUUzODUwMkJCOThDMEVFNURFMCIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxOERBMTRGRTBFMUUxMUUzODUwMkJCOThDMEVFNURFMCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjE4REExNEZCMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjE4REExNEZDMEUxRTExRTM4NTAyQkI5OEMwRUU1REUwIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+EwrlwAAAAA5JREFUeNpiMDU0BAgwAAE2AJgB9BnaAAAAAElFTkSuQmCC);background-size:300px 1px}.wy-grid-for-nav{position:absolute;width:100%;height:100%}.wy-nav-side{position:fixed;top:0;bottom:0;left:0;padding-bottom:2em;width:300px;overflow-x:hidden;overflow-y:scroll;min-height:100%;background:#343131;z-index:200}.wy-nav-top{display:none;background:#2980B9;color:#fff;padding:0.4045em 0.809em;position:relative;line-height:50px;text-align:center;font-size:100%;*zoom:1}.wy-nav-top:before,.wy-nav-top:after{display:table;content:""}.wy-nav-top:after{clear:both}.wy-nav-top a{color:#fff;font-weight:bold}.wy-nav-top img{margin-right:12px;height:45px;width:45px;background-color:#2980B9;padding:5px;border-radius:100%}.wy-nav-top i{font-size:30px;float:left;cursor:pointer}.wy-nav-content-wrap{margin-left:300px;background:#fcfcfc;min-height:100%}.wy-nav-content{padding:1.618em 3.236em;height:100%;max-width:800px;margin:auto}.wy-body-mask{position:fixed;width:100%;height:100%;background:rgba(0,0,0,0.2);display:none;z-index:499}.wy-body-mask.on{display:block}footer{color:#999}footer p{margin-bottom:12px}.rst-footer-buttons{*zoom:1}.rst-footer-buttons:before,.rst-footer-buttons:after{display:table;content:""}.rst-footer-buttons:after{clear:both}#search-results .search li{margin-bottom:24px;border-bottom:solid 1px #e1e4e5;padding-bottom:24px}#search-results .search li:first-child{border-top:solid 1px #e1e4e5;padding-top:24px}#search-results .search li a{font-size:120%;margin-bottom:12px;display:inline-block}#search-results .context{color:gray;font-size:90%}@media screen and (max-width: 768px){.wy-body-for-nav{background:#fcfcfc}.wy-nav-top{display:block}.wy-nav-side{left:-300px}.wy-nav-side.shift{width:85%;left:0}.wy-nav-content-wrap{margin-left:0}.wy-nav-content-wrap .wy-nav-content{padding:1.618em}.wy-nav-content-wrap.shift{position:fixed;min-width:100%;left:85%;top:0;height:100%;overflow:hidden}}@media screen and (min-width: 1400px){.wy-nav-content-wrap{background:rgba(0,0,0,0.05)}.wy-nav-content{margin:0;background:#fcfcfc}}@media print{.rst-versions,footer,.wy-nav-side{display:none}.wy-nav-content-wrap{margin-left:0}}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;border-top:solid 10px #343131;font-family:"Lato","proxima-nova","Helvetica Neue",Arial,sans-serif;z-index:400}.rst-versions a{color:#2980B9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27AE60;*zoom:1}.rst-versions .rst-current-version:before,.rst-versions .rst-current-version:after{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-versions .rst-current-version .fa,.rst-versions .rst-current-version .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .rst-versions .rst-current-version span.toctree-expand,.rst-versions .rst-current-version .rst-content .admonition-title,.rst-content .rst-versions .rst-current-version .admonition-title,.rst-versions .rst-current-version .rst-content h1 .headerlink,.rst-content h1 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h2 .headerlink,.rst-content h2 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content p.caption .headerlink,.rst-content p.caption .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h3 .headerlink,.rst-content h3 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h4 .headerlink,.rst-content h4 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h5 .headerlink,.rst-content h5 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content h6 .headerlink,.rst-content h6 .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content dl dt .headerlink,.rst-content dl dt .rst-versions .rst-current-version .headerlink,.rst-versions .rst-current-version .rst-content tt.download span:first-child,.rst-content tt.download .rst-versions .rst-current-version span:first-child,.rst-versions .rst-current-version .rst-content code.download span:first-child,.rst-content code.download .rst-versions .rst-current-version span:first-child,.rst-versions .rst-current-version .icon{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#E74C3C;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#F1C40F;color:#000}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:gray;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:solid 1px #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px}.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge .rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width: 768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}img{width:100%;height:auto}}.rst-content img{max-width:100%;height:auto !important}.rst-content div.figure{margin-bottom:24px}.rst-content div.figure.align-center{text-align:center}.rst-content .section>img,.rst-content .section>a>img{margin-bottom:24px}.rst-content blockquote{margin-left:24px;line-height:24px;margin-bottom:24px}.rst-content .note .last,.rst-content .attention .last,.rst-content .caution .last,.rst-content .danger .last,.rst-content .error .last,.rst-content .hint .last,.rst-content .important .last,.rst-content .tip .last,.rst-content .warning .last,.rst-content .seealso .last,.rst-content .admonition-todo .last{margin-bottom:0}.rst-content .admonition-title:before{margin-right:4px}.rst-content .admonition table{border-color:rgba(0,0,0,0.1)}.rst-content .admonition table td,.rst-content .admonition table th{background:transparent !important;border-color:rgba(0,0,0,0.1) !important}.rst-content .section ol.loweralpha,.rst-content .section ol.loweralpha li{list-style:lower-alpha}.rst-content .section ol.upperalpha,.rst-content .section ol.upperalpha li{list-style:upper-alpha}.rst-content .section ol p,.rst-content .section ul p{margin-bottom:12px}.rst-content .line-block{margin-left:24px}.rst-content .topic-title{font-weight:bold;margin-bottom:12px}.rst-content .toc-backref{color:#404040}.rst-content .align-right{float:right;margin:0px 0px 24px 24px}.rst-content .align-left{float:left;margin:0px 24px 24px 0px}.rst-content .align-center{margin:auto;display:block}.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content p.caption .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content dl dt .headerlink,.rst-content p.caption .headerlink{display:none;visibility:hidden;font-size:14px}.rst-content h1 .headerlink:after,.rst-content h2 .headerlink:after,.rst-content p.caption .headerlink:after,.rst-content h3 .headerlink:after,.rst-content h4 .headerlink:after,.rst-content h5 .headerlink:after,.rst-content h6 .headerlink:after,.rst-content dl dt .headerlink:after,.rst-content p.caption .headerlink:after{visibility:visible;content:"";font-family:FontAwesome;display:inline-block}.rst-content h1:hover .headerlink,.rst-content h2:hover .headerlink,.rst-content p.caption:hover .headerlink,.rst-content h3:hover .headerlink,.rst-content h4:hover .headerlink,.rst-content h5:hover .headerlink,.rst-content h6:hover .headerlink,.rst-content dl dt:hover .headerlink,.rst-content p.caption:hover .headerlink{display:inline-block}.rst-content .sidebar{float:right;width:40%;display:block;margin:0 0 24px 24px;padding:24px;background:#f3f6f6;border:solid 1px #e1e4e5}.rst-content .sidebar p,.rst-content .sidebar ul,.rst-content .sidebar dl{font-size:90%}.rst-content .sidebar .last{margin-bottom:0}.rst-content .sidebar .sidebar-title{display:block;font-family:"Roboto Slab","ff-tisa-web-pro","Georgia",Arial,sans-serif;font-weight:bold;background:#e1e4e5;padding:6px 12px;margin:-24px;margin-bottom:24px;font-size:100%}.rst-content .highlighted{background:#F1C40F;display:inline-block;font-weight:bold;padding:0 6px}.rst-content .footnote-reference,.rst-content .citation-reference{vertical-align:super;font-size:90%}.rst-content table.docutils.citation,.rst-content table.docutils.footnote{background:none;border:none;color:#999}.rst-content table.docutils.citation td,.rst-content table.docutils.citation tr,.rst-content table.docutils.footnote td,.rst-content table.docutils.footnote tr{border:none;background-color:transparent !important;white-space:normal}.rst-content table.docutils.citation td.label,.rst-content table.docutils.footnote td.label{padding-left:0;padding-right:0;vertical-align:top}.rst-content table.field-list{border:none}.rst-content table.field-list td{border:none;padding-top:5px}.rst-content table.field-list td>strong{display:inline-block;margin-top:3px}.rst-content table.field-list .field-name{padding-right:10px;text-align:left;white-space:nowrap}.rst-content table.field-list .field-body{text-align:left;padding-left:0}.rst-content tt,.rst-content tt,.rst-content code{color:#000}.rst-content tt big,.rst-content tt em,.rst-content tt big,.rst-content code big,.rst-content tt em,.rst-content code em{font-size:100% !important;line-height:normal}.rst-content tt .xref,a .rst-content tt,.rst-content tt .xref,.rst-content code .xref,a .rst-content tt,a .rst-content code{font-weight:bold}.rst-content a tt,.rst-content a tt,.rst-content a code{color:#2980B9}.rst-content dl{margin-bottom:24px}.rst-content dl dt{font-weight:bold}.rst-content dl p,.rst-content dl table,.rst-content dl ul,.rst-content dl ol{margin-bottom:12px !important}.rst-content dl dd{margin:0 0 12px 24px}.rst-content dl:not(.docutils){margin-bottom:24px}.rst-content dl:not(.docutils) dt{display:inline-block;margin:6px 0;font-size:90%;line-height:normal;background:#e7f2fa;color:#2980B9;border-top:solid 3px #6ab0de;padding:6px;position:relative}.rst-content dl:not(.docutils) dt:before{color:#6ab0de}.rst-content dl:not(.docutils) dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dl dt{margin-bottom:6px;border:none;border-left:solid 3px #ccc;background:#f0f0f0;color:gray}.rst-content dl:not(.docutils) dl dt .headerlink{color:#404040;font-size:100% !important}.rst-content dl:not(.docutils) dt:first-child{margin-top:0}.rst-content dl:not(.docutils) tt,.rst-content dl:not(.docutils) tt,.rst-content dl:not(.docutils) code{font-weight:bold}.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) tt.descclassname,.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) code.descname,.rst-content dl:not(.docutils) tt.descclassname,.rst-content dl:not(.docutils) code.descclassname{background-color:transparent;border:none;padding:0;font-size:100% !important}.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) tt.descname,.rst-content dl:not(.docutils) code.descname{font-weight:bold}.rst-content dl:not(.docutils) .optional{display:inline-block;padding:0 4px;color:#000;font-weight:bold}.rst-content dl:not(.docutils) .property{display:inline-block;padding-right:8px}.rst-content .viewcode-link,.rst-content .viewcode-back{display:inline-block;color:#27AE60;font-size:80%;padding-left:24px}.rst-content .viewcode-back{display:block;float:right}.rst-content p.rubric{margin-bottom:12px;font-weight:bold}.rst-content tt.download,.rst-content code.download{background:inherit;padding:inherit;font-family:inherit;font-size:inherit;color:inherit;border:inherit;white-space:inherit}.rst-content tt.download span:first-child:before,.rst-content code.download span:first-child:before{margin-right:4px}@media screen and (max-width: 480px){.rst-content .sidebar{width:100%}}span[id*='MathJax-Span']{color:#404040}.math{text-align:center}@font-face{font-family:"Inconsolata";font-style:normal;font-weight:400;src:local("Inconsolata"),url(../fonts/Inconsolata.ttf) format("truetype")}@font-face{font-family:"Inconsolata";font-style:normal;font-weight:700;src:local("Inconsolata Bold"),local("Inconsolata-Bold"),url(../fonts/Inconsolata-Bold.ttf) format("truetype")}@font-face{font-family:"Lato";font-style:normal;font-weight:400;src:local("Lato Regular"),local("Lato-Regular"),url(../fonts/Lato-Regular.ttf) format("truetype")}@font-face{font-family:"Lato";font-style:normal;font-weight:700;src:local("Lato Bold"),local("Lato-Bold"),url(../fonts/Lato-Bold.ttf) format("truetype")}@font-face{font-family:"Roboto Slab";font-style:normal;font-weight:400;src:local("Roboto Slab Regular"),local("RobotoSlab-Regular"),url(../fonts/RobotoSlab-Regular.ttf) format("truetype")}@font-face{font-family:"Roboto Slab";font-style:normal;font-weight:700;src:local("Roboto Slab Bold"),local("RobotoSlab-Bold"),url(../fonts/RobotoSlab-Bold.ttf) format("truetype")}
-/*# sourceMappingURL=theme.css.map */
+ */@font-face{font-family:FontAwesome;src:url(fonts/fontawesome-webfont.eot?674f50d287a8c48dc19ba404d20fe713);src:url(fonts/fontawesome-webfont.eot?674f50d287a8c48dc19ba404d20fe713?#iefix&v=4.7.0) format("embedded-opentype"),url(fonts/fontawesome-webfont.woff2?af7ae505a9eed503f8b8e6982036873e) format("woff2"),url(fonts/fontawesome-webfont.woff?fee66e712a8a08eef5805a46892932ad) format("woff"),url(fonts/fontawesome-webfont.ttf?b06871f281fee6b241d60582ae9369b9) format("truetype"),url(fonts/fontawesome-webfont.svg?912ec66d7572ff821749319396470bde#fontawesomeregular) format("svg");font-weight:400;font-style:normal}.fa,.icon,.rst-content .admonition-title,.rst-content .code-block-caption .headerlink,.rst-content code.download span:first-child,.rst-content dl dt .headerlink,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content p.caption .headerlink,.rst-content table>caption .headerlink,.rst-content tt.download span:first-child,.wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li span.toctree-expand{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14286em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14286em;width:2.14286em;top:.14286em;text-align:center}.fa-li.fa-lg{left:-1.85714em}.fa-border{padding:.2em .25em .15em;border:.08em solid #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa-pull-left.icon,.fa.fa-pull-left,.rst-content .code-block-caption .fa-pull-left.headerlink,.rst-content .fa-pull-left.admonition-title,.rst-content code.download span.fa-pull-left:first-child,.rst-content dl dt .fa-pull-left.headerlink,.rst-content h1 .fa-pull-left.headerlink,.rst-content h2 .fa-pull-left.headerlink,.rst-content h3 .fa-pull-left.headerlink,.rst-content h4 .fa-pull-left.headerlink,.rst-content h5 .fa-pull-left.headerlink,.rst-content h6 .fa-pull-left.headerlink,.rst-content p.caption .fa-pull-left.headerlink,.rst-content table>caption .fa-pull-left.headerlink,.rst-content tt.download span.fa-pull-left:first-child,.wy-menu-vertical li.current>a span.fa-pull-left.toctree-expand,.wy-menu-vertical li.on a span.fa-pull-left.toctree-expand,.wy-menu-vertical li span.fa-pull-left.toctree-expand{margin-right:.3em}.fa-pull-right.icon,.fa.fa-pull-right,.rst-content .code-block-caption .fa-pull-right.headerlink,.rst-content .fa-pull-right.admonition-title,.rst-content code.download span.fa-pull-right:first-child,.rst-content dl dt .fa-pull-right.headerlink,.rst-content h1 .fa-pull-right.headerlink,.rst-content h2 .fa-pull-right.headerlink,.rst-content h3 .fa-pull-right.headerlink,.rst-content h4 .fa-pull-right.headerlink,.rst-content h5 .fa-pull-right.headerlink,.rst-content h6 .fa-pull-right.headerlink,.rst-content p.caption .fa-pull-right.headerlink,.rst-content table>caption .fa-pull-right.headerlink,.rst-content tt.download span.fa-pull-right:first-child,.wy-menu-vertical li.current>a span.fa-pull-right.toctree-expand,.wy-menu-vertical li.on a span.fa-pull-right.toctree-expand,.wy-menu-vertical li span.fa-pull-right.toctree-expand{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left,.pull-left.icon,.rst-content .code-block-caption .pull-left.headerlink,.rst-content .pull-left.admonition-title,.rst-content code.download span.pull-left:first-child,.rst-content dl dt .pull-left.headerlink,.rst-content h1 .pull-left.headerlink,.rst-content h2 .pull-left.headerlink,.rst-content h3 .pull-left.headerlink,.rst-content h4 .pull-left.headerlink,.rst-content h5 .pull-left.headerlink,.rst-content h6 .pull-left.headerlink,.rst-content p.caption .pull-left.headerlink,.rst-content table>caption .pull-left.headerlink,.rst-content tt.download span.pull-left:first-child,.wy-menu-vertical li.current>a span.pull-left.toctree-expand,.wy-menu-vertical li.on a span.pull-left.toctree-expand,.wy-menu-vertical li span.pull-left.toctree-expand{margin-right:.3em}.fa.pull-right,.pull-right.icon,.rst-content .code-block-caption .pull-right.headerlink,.rst-content .pull-right.admonition-title,.rst-content code.download span.pull-right:first-child,.rst-content dl dt .pull-right.headerlink,.rst-content h1 .pull-right.headerlink,.rst-content h2 .pull-right.headerlink,.rst-content h3 .pull-right.headerlink,.rst-content h4 .pull-right.headerlink,.rst-content h5 .pull-right.headerlink,.rst-content h6 .pull-right.headerlink,.rst-content p.caption .pull-right.headerlink,.rst-content table>caption .pull-right.headerlink,.rst-content tt.download span.pull-right:first-child,.wy-menu-vertical li.current>a span.pull-right.toctree-expand,.wy-menu-vertical li.on a span.pull-right.toctree-expand,.wy-menu-vertical li span.pull-right.toctree-expand{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s linear infinite;animation:fa-spin 2s linear infinite}.fa-pulse{-webkit-animation:fa-spin 1s steps(8) infinite;animation:fa-spin 1s steps(8) infinite}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scaleX(-1);-ms-transform:scaleX(-1);transform:scaleX(-1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scaleY(-1);-ms-transform:scaleY(-1);transform:scaleY(-1)}:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:""}.fa-music:before{content:""}.fa-search:before,.icon-search:before{content:""}.fa-envelope-o:before{content:""}.fa-heart:before{content:""}.fa-star:before{content:""}.fa-star-o:before{content:""}.fa-user:before{content:""}.fa-film:before{content:""}.fa-th-large:before{content:""}.fa-th:before{content:""}.fa-th-list:before{content:""}.fa-check:before{content:""}.fa-close:before,.fa-remove:before,.fa-times:before{content:""}.fa-search-plus:before{content:""}.fa-search-minus:before{content:""}.fa-power-off:before{content:""}.fa-signal:before{content:""}.fa-cog:before,.fa-gear:before{content:""}.fa-trash-o:before{content:""}.fa-home:before,.icon-home:before{content:""}.fa-file-o:before{content:""}.fa-clock-o:before{content:""}.fa-road:before{content:""}.fa-download:before,.rst-content code.download span:first-child:before,.rst-content tt.download span:first-child:before{content:""}.fa-arrow-circle-o-down:before{content:""}.fa-arrow-circle-o-up:before{content:""}.fa-inbox:before{content:""}.fa-play-circle-o:before{content:""}.fa-repeat:before,.fa-rotate-right:before{content:""}.fa-refresh:before{content:""}.fa-list-alt:before{content:""}.fa-lock:before{content:""}.fa-flag:before{content:""}.fa-headphones:before{content:""}.fa-volume-off:before{content:""}.fa-volume-down:before{content:""}.fa-volume-up:before{content:""}.fa-qrcode:before{content:""}.fa-barcode:before{content:""}.fa-tag:before{content:""}.fa-tags:before{content:""}.fa-book:before,.icon-book:before{content:""}.fa-bookmark:before{content:""}.fa-print:before{content:""}.fa-camera:before{content:""}.fa-font:before{content:""}.fa-bold:before{content:""}.fa-italic:before{content:""}.fa-text-height:before{content:""}.fa-text-width:before{content:""}.fa-align-left:before{content:""}.fa-align-center:before{content:""}.fa-align-right:before{content:""}.fa-align-justify:before{content:""}.fa-list:before{content:""}.fa-dedent:before,.fa-outdent:before{content:""}.fa-indent:before{content:""}.fa-video-camera:before{content:""}.fa-image:before,.fa-photo:before,.fa-picture-o:before{content:""}.fa-pencil:before{content:""}.fa-map-marker:before{content:""}.fa-adjust:before{content:""}.fa-tint:before{content:""}.fa-edit:before,.fa-pencil-square-o:before{content:""}.fa-share-square-o:before{content:""}.fa-check-square-o:before{content:""}.fa-arrows:before{content:""}.fa-step-backward:before{content:""}.fa-fast-backward:before{content:""}.fa-backward:before{content:""}.fa-play:before{content:""}.fa-pause:before{content:""}.fa-stop:before{content:""}.fa-forward:before{content:""}.fa-fast-forward:before{content:""}.fa-step-forward:before{content:""}.fa-eject:before{content:""}.fa-chevron-left:before{content:""}.fa-chevron-right:before{content:""}.fa-plus-circle:before{content:""}.fa-minus-circle:before{content:""}.fa-times-circle:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before{content:""}.fa-check-circle:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before{content:""}.fa-question-circle:before{content:""}.fa-info-circle:before{content:""}.fa-crosshairs:before{content:""}.fa-times-circle-o:before{content:""}.fa-check-circle-o:before{content:""}.fa-ban:before{content:""}.fa-arrow-left:before{content:""}.fa-arrow-right:before{content:""}.fa-arrow-up:before{content:""}.fa-arrow-down:before{content:""}.fa-mail-forward:before,.fa-share:before{content:""}.fa-expand:before{content:""}.fa-compress:before{content:""}.fa-plus:before{content:""}.fa-minus:before{content:""}.fa-asterisk:before{content:""}.fa-exclamation-circle:before,.rst-content .admonition-title:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before{content:""}.fa-gift:before{content:""}.fa-leaf:before{content:""}.fa-fire:before,.icon-fire:before{content:""}.fa-eye:before{content:""}.fa-eye-slash:before{content:""}.fa-exclamation-triangle:before,.fa-warning:before{content:""}.fa-plane:before{content:""}.fa-calendar:before{content:""}.fa-random:before{content:""}.fa-comment:before{content:""}.fa-magnet:before{content:""}.fa-chevron-up:before{content:""}.fa-chevron-down:before{content:""}.fa-retweet:before{content:""}.fa-shopping-cart:before{content:""}.fa-folder:before{content:""}.fa-folder-open:before{content:""}.fa-arrows-v:before{content:""}.fa-arrows-h:before{content:""}.fa-bar-chart-o:before,.fa-bar-chart:before{content:""}.fa-twitter-square:before{content:""}.fa-facebook-square:before{content:""}.fa-camera-retro:before{content:""}.fa-key:before{content:""}.fa-cogs:before,.fa-gears:before{content:""}.fa-comments:before{content:""}.fa-thumbs-o-up:before{content:""}.fa-thumbs-o-down:before{content:""}.fa-star-half:before{content:""}.fa-heart-o:before{content:""}.fa-sign-out:before{content:""}.fa-linkedin-square:before{content:""}.fa-thumb-tack:before{content:""}.fa-external-link:before{content:""}.fa-sign-in:before{content:""}.fa-trophy:before{content:""}.fa-github-square:before{content:""}.fa-upload:before{content:""}.fa-lemon-o:before{content:""}.fa-phone:before{content:""}.fa-square-o:before{content:""}.fa-bookmark-o:before{content:""}.fa-phone-square:before{content:""}.fa-twitter:before{content:""}.fa-facebook-f:before,.fa-facebook:before{content:""}.fa-github:before,.icon-github:before{content:""}.fa-unlock:before{content:""}.fa-credit-card:before{content:""}.fa-feed:before,.fa-rss:before{content:""}.fa-hdd-o:before{content:""}.fa-bullhorn:before{content:""}.fa-bell:before{content:""}.fa-certificate:before{content:""}.fa-hand-o-right:before{content:""}.fa-hand-o-left:before{content:""}.fa-hand-o-up:before{content:""}.fa-hand-o-down:before{content:""}.fa-arrow-circle-left:before,.icon-circle-arrow-left:before{content:""}.fa-arrow-circle-right:before,.icon-circle-arrow-right:before{content:""}.fa-arrow-circle-up:before{content:""}.fa-arrow-circle-down:before{content:""}.fa-globe:before{content:""}.fa-wrench:before{content:""}.fa-tasks:before{content:""}.fa-filter:before{content:""}.fa-briefcase:before{content:""}.fa-arrows-alt:before{content:""}.fa-group:before,.fa-users:before{content:""}.fa-chain:before,.fa-link:before,.icon-link:before{content:""}.fa-cloud:before{content:""}.fa-flask:before{content:""}.fa-cut:before,.fa-scissors:before{content:""}.fa-copy:before,.fa-files-o:before{content:""}.fa-paperclip:before{content:""}.fa-floppy-o:before,.fa-save:before{content:""}.fa-square:before{content:""}.fa-bars:before,.fa-navicon:before,.fa-reorder:before{content:""}.fa-list-ul:before{content:""}.fa-list-ol:before{content:""}.fa-strikethrough:before{content:""}.fa-underline:before{content:""}.fa-table:before{content:""}.fa-magic:before{content:""}.fa-truck:before{content:""}.fa-pinterest:before{content:""}.fa-pinterest-square:before{content:""}.fa-google-plus-square:before{content:""}.fa-google-plus:before{content:""}.fa-money:before{content:""}.fa-caret-down:before,.icon-caret-down:before,.wy-dropdown .caret:before{content:""}.fa-caret-up:before{content:""}.fa-caret-left:before{content:""}.fa-caret-right:before{content:""}.fa-columns:before{content:""}.fa-sort:before,.fa-unsorted:before{content:""}.fa-sort-desc:before,.fa-sort-down:before{content:""}.fa-sort-asc:before,.fa-sort-up:before{content:""}.fa-envelope:before{content:""}.fa-linkedin:before{content:""}.fa-rotate-left:before,.fa-undo:before{content:""}.fa-gavel:before,.fa-legal:before{content:""}.fa-dashboard:before,.fa-tachometer:before{content:""}.fa-comment-o:before{content:""}.fa-comments-o:before{content:""}.fa-bolt:before,.fa-flash:before{content:""}.fa-sitemap:before{content:""}.fa-umbrella:before{content:""}.fa-clipboard:before,.fa-paste:before{content:""}.fa-lightbulb-o:before{content:""}.fa-exchange:before{content:""}.fa-cloud-download:before{content:""}.fa-cloud-upload:before{content:""}.fa-user-md:before{content:""}.fa-stethoscope:before{content:""}.fa-suitcase:before{content:""}.fa-bell-o:before{content:""}.fa-coffee:before{content:""}.fa-cutlery:before{content:""}.fa-file-text-o:before{content:""}.fa-building-o:before{content:""}.fa-hospital-o:before{content:""}.fa-ambulance:before{content:""}.fa-medkit:before{content:""}.fa-fighter-jet:before{content:""}.fa-beer:before{content:""}.fa-h-square:before{content:""}.fa-plus-square:before{content:""}.fa-angle-double-left:before{content:""}.fa-angle-double-right:before{content:""}.fa-angle-double-up:before{content:""}.fa-angle-double-down:before{content:""}.fa-angle-left:before{content:""}.fa-angle-right:before{content:""}.fa-angle-up:before{content:""}.fa-angle-down:before{content:""}.fa-desktop:before{content:""}.fa-laptop:before{content:""}.fa-tablet:before{content:""}.fa-mobile-phone:before,.fa-mobile:before{content:""}.fa-circle-o:before{content:""}.fa-quote-left:before{content:""}.fa-quote-right:before{content:""}.fa-spinner:before{content:""}.fa-circle:before{content:""}.fa-mail-reply:before,.fa-reply:before{content:""}.fa-github-alt:before{content:""}.fa-folder-o:before{content:""}.fa-folder-open-o:before{content:""}.fa-smile-o:before{content:""}.fa-frown-o:before{content:""}.fa-meh-o:before{content:""}.fa-gamepad:before{content:""}.fa-keyboard-o:before{content:""}.fa-flag-o:before{content:""}.fa-flag-checkered:before{content:""}.fa-terminal:before{content:""}.fa-code:before{content:""}.fa-mail-reply-all:before,.fa-reply-all:before{content:""}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:""}.fa-location-arrow:before{content:""}.fa-crop:before{content:""}.fa-code-fork:before{content:""}.fa-chain-broken:before,.fa-unlink:before{content:""}.fa-question:before{content:""}.fa-info:before{content:""}.fa-exclamation:before{content:""}.fa-superscript:before{content:""}.fa-subscript:before{content:""}.fa-eraser:before{content:""}.fa-puzzle-piece:before{content:""}.fa-microphone:before{content:""}.fa-microphone-slash:before{content:""}.fa-shield:before{content:""}.fa-calendar-o:before{content:""}.fa-fire-extinguisher:before{content:""}.fa-rocket:before{content:""}.fa-maxcdn:before{content:""}.fa-chevron-circle-left:before{content:""}.fa-chevron-circle-right:before{content:""}.fa-chevron-circle-up:before{content:""}.fa-chevron-circle-down:before{content:""}.fa-html5:before{content:""}.fa-css3:before{content:""}.fa-anchor:before{content:""}.fa-unlock-alt:before{content:""}.fa-bullseye:before{content:""}.fa-ellipsis-h:before{content:""}.fa-ellipsis-v:before{content:""}.fa-rss-square:before{content:""}.fa-play-circle:before{content:""}.fa-ticket:before{content:""}.fa-minus-square:before{content:""}.fa-minus-square-o:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before{content:""}.fa-level-up:before{content:""}.fa-level-down:before{content:""}.fa-check-square:before{content:""}.fa-pencil-square:before{content:""}.fa-external-link-square:before{content:""}.fa-share-square:before{content:""}.fa-compass:before{content:""}.fa-caret-square-o-down:before,.fa-toggle-down:before{content:""}.fa-caret-square-o-up:before,.fa-toggle-up:before{content:""}.fa-caret-square-o-right:before,.fa-toggle-right:before{content:""}.fa-eur:before,.fa-euro:before{content:""}.fa-gbp:before{content:""}.fa-dollar:before,.fa-usd:before{content:""}.fa-inr:before,.fa-rupee:before{content:""}.fa-cny:before,.fa-jpy:before,.fa-rmb:before,.fa-yen:before{content:""}.fa-rouble:before,.fa-rub:before,.fa-ruble:before{content:""}.fa-krw:before,.fa-won:before{content:""}.fa-bitcoin:before,.fa-btc:before{content:""}.fa-file:before{content:""}.fa-file-text:before{content:""}.fa-sort-alpha-asc:before{content:""}.fa-sort-alpha-desc:before{content:""}.fa-sort-amount-asc:before{content:""}.fa-sort-amount-desc:before{content:""}.fa-sort-numeric-asc:before{content:""}.fa-sort-numeric-desc:before{content:""}.fa-thumbs-up:before{content:""}.fa-thumbs-down:before{content:""}.fa-youtube-square:before{content:""}.fa-youtube:before{content:""}.fa-xing:before{content:""}.fa-xing-square:before{content:""}.fa-youtube-play:before{content:""}.fa-dropbox:before{content:""}.fa-stack-overflow:before{content:""}.fa-instagram:before{content:""}.fa-flickr:before{content:""}.fa-adn:before{content:""}.fa-bitbucket:before,.icon-bitbucket:before{content:""}.fa-bitbucket-square:before{content:""}.fa-tumblr:before{content:""}.fa-tumblr-square:before{content:""}.fa-long-arrow-down:before{content:""}.fa-long-arrow-up:before{content:""}.fa-long-arrow-left:before{content:""}.fa-long-arrow-right:before{content:""}.fa-apple:before{content:""}.fa-windows:before{content:""}.fa-android:before{content:""}.fa-linux:before{content:""}.fa-dribbble:before{content:""}.fa-skype:before{content:""}.fa-foursquare:before{content:""}.fa-trello:before{content:""}.fa-female:before{content:""}.fa-male:before{content:""}.fa-gittip:before,.fa-gratipay:before{content:""}.fa-sun-o:before{content:""}.fa-moon-o:before{content:""}.fa-archive:before{content:""}.fa-bug:before{content:""}.fa-vk:before{content:""}.fa-weibo:before{content:""}.fa-renren:before{content:""}.fa-pagelines:before{content:""}.fa-stack-exchange:before{content:""}.fa-arrow-circle-o-right:before{content:""}.fa-arrow-circle-o-left:before{content:""}.fa-caret-square-o-left:before,.fa-toggle-left:before{content:""}.fa-dot-circle-o:before{content:""}.fa-wheelchair:before{content:""}.fa-vimeo-square:before{content:""}.fa-try:before,.fa-turkish-lira:before{content:""}.fa-plus-square-o:before,.wy-menu-vertical li span.toctree-expand:before{content:""}.fa-space-shuttle:before{content:""}.fa-slack:before{content:""}.fa-envelope-square:before{content:""}.fa-wordpress:before{content:""}.fa-openid:before{content:""}.fa-bank:before,.fa-institution:before,.fa-university:before{content:""}.fa-graduation-cap:before,.fa-mortar-board:before{content:""}.fa-yahoo:before{content:""}.fa-google:before{content:""}.fa-reddit:before{content:""}.fa-reddit-square:before{content:""}.fa-stumbleupon-circle:before{content:""}.fa-stumbleupon:before{content:""}.fa-delicious:before{content:""}.fa-digg:before{content:""}.fa-pied-piper-pp:before{content:""}.fa-pied-piper-alt:before{content:""}.fa-drupal:before{content:""}.fa-joomla:before{content:""}.fa-language:before{content:""}.fa-fax:before{content:""}.fa-building:before{content:""}.fa-child:before{content:""}.fa-paw:before{content:""}.fa-spoon:before{content:""}.fa-cube:before{content:""}.fa-cubes:before{content:""}.fa-behance:before{content:""}.fa-behance-square:before{content:""}.fa-steam:before{content:""}.fa-steam-square:before{content:""}.fa-recycle:before{content:""}.fa-automobile:before,.fa-car:before{content:""}.fa-cab:before,.fa-taxi:before{content:""}.fa-tree:before{content:""}.fa-spotify:before{content:""}.fa-deviantart:before{content:""}.fa-soundcloud:before{content:""}.fa-database:before{content:""}.fa-file-pdf-o:before{content:""}.fa-file-word-o:before{content:""}.fa-file-excel-o:before{content:""}.fa-file-powerpoint-o:before{content:""}.fa-file-image-o:before,.fa-file-photo-o:before,.fa-file-picture-o:before{content:""}.fa-file-archive-o:before,.fa-file-zip-o:before{content:""}.fa-file-audio-o:before,.fa-file-sound-o:before{content:""}.fa-file-movie-o:before,.fa-file-video-o:before{content:""}.fa-file-code-o:before{content:""}.fa-vine:before{content:""}.fa-codepen:before{content:""}.fa-jsfiddle:before{content:""}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-ring:before,.fa-life-saver:before,.fa-support:before{content:""}.fa-circle-o-notch:before{content:""}.fa-ra:before,.fa-rebel:before,.fa-resistance:before{content:""}.fa-empire:before,.fa-ge:before{content:""}.fa-git-square:before{content:""}.fa-git:before{content:""}.fa-hacker-news:before,.fa-y-combinator-square:before,.fa-yc-square:before{content:""}.fa-tencent-weibo:before{content:""}.fa-qq:before{content:""}.fa-wechat:before,.fa-weixin:before{content:""}.fa-paper-plane:before,.fa-send:before{content:""}.fa-paper-plane-o:before,.fa-send-o:before{content:""}.fa-history:before{content:""}.fa-circle-thin:before{content:""}.fa-header:before{content:""}.fa-paragraph:before{content:""}.fa-sliders:before{content:""}.fa-share-alt:before{content:""}.fa-share-alt-square:before{content:""}.fa-bomb:before{content:""}.fa-futbol-o:before,.fa-soccer-ball-o:before{content:""}.fa-tty:before{content:""}.fa-binoculars:before{content:""}.fa-plug:before{content:""}.fa-slideshare:before{content:""}.fa-twitch:before{content:""}.fa-yelp:before{content:""}.fa-newspaper-o:before{content:""}.fa-wifi:before{content:""}.fa-calculator:before{content:""}.fa-paypal:before{content:""}.fa-google-wallet:before{content:""}.fa-cc-visa:before{content:""}.fa-cc-mastercard:before{content:""}.fa-cc-discover:before{content:""}.fa-cc-amex:before{content:""}.fa-cc-paypal:before{content:""}.fa-cc-stripe:before{content:""}.fa-bell-slash:before{content:""}.fa-bell-slash-o:before{content:""}.fa-trash:before{content:""}.fa-copyright:before{content:""}.fa-at:before{content:""}.fa-eyedropper:before{content:""}.fa-paint-brush:before{content:""}.fa-birthday-cake:before{content:""}.fa-area-chart:before{content:""}.fa-pie-chart:before{content:""}.fa-line-chart:before{content:""}.fa-lastfm:before{content:""}.fa-lastfm-square:before{content:""}.fa-toggle-off:before{content:""}.fa-toggle-on:before{content:""}.fa-bicycle:before{content:""}.fa-bus:before{content:""}.fa-ioxhost:before{content:""}.fa-angellist:before{content:""}.fa-cc:before{content:""}.fa-ils:before,.fa-shekel:before,.fa-sheqel:before{content:""}.fa-meanpath:before{content:""}.fa-buysellads:before{content:""}.fa-connectdevelop:before{content:""}.fa-dashcube:before{content:""}.fa-forumbee:before{content:""}.fa-leanpub:before{content:""}.fa-sellsy:before{content:""}.fa-shirtsinbulk:before{content:""}.fa-simplybuilt:before{content:""}.fa-skyatlas:before{content:""}.fa-cart-plus:before{content:""}.fa-cart-arrow-down:before{content:""}.fa-diamond:before{content:""}.fa-ship:before{content:""}.fa-user-secret:before{content:""}.fa-motorcycle:before{content:""}.fa-street-view:before{content:""}.fa-heartbeat:before{content:""}.fa-venus:before{content:""}.fa-mars:before{content:""}.fa-mercury:before{content:""}.fa-intersex:before,.fa-transgender:before{content:""}.fa-transgender-alt:before{content:""}.fa-venus-double:before{content:""}.fa-mars-double:before{content:""}.fa-venus-mars:before{content:""}.fa-mars-stroke:before{content:""}.fa-mars-stroke-v:before{content:""}.fa-mars-stroke-h:before{content:""}.fa-neuter:before{content:""}.fa-genderless:before{content:""}.fa-facebook-official:before{content:""}.fa-pinterest-p:before{content:""}.fa-whatsapp:before{content:""}.fa-server:before{content:""}.fa-user-plus:before{content:""}.fa-user-times:before{content:""}.fa-bed:before,.fa-hotel:before{content:""}.fa-viacoin:before{content:""}.fa-train:before{content:""}.fa-subway:before{content:""}.fa-medium:before{content:""}.fa-y-combinator:before,.fa-yc:before{content:""}.fa-optin-monster:before{content:""}.fa-opencart:before{content:""}.fa-expeditedssl:before{content:""}.fa-battery-4:before,.fa-battery-full:before,.fa-battery:before{content:""}.fa-battery-3:before,.fa-battery-three-quarters:before{content:""}.fa-battery-2:before,.fa-battery-half:before{content:""}.fa-battery-1:before,.fa-battery-quarter:before{content:""}.fa-battery-0:before,.fa-battery-empty:before{content:""}.fa-mouse-pointer:before{content:""}.fa-i-cursor:before{content:""}.fa-object-group:before{content:""}.fa-object-ungroup:before{content:""}.fa-sticky-note:before{content:""}.fa-sticky-note-o:before{content:""}.fa-cc-jcb:before{content:""}.fa-cc-diners-club:before{content:""}.fa-clone:before{content:""}.fa-balance-scale:before{content:""}.fa-hourglass-o:before{content:""}.fa-hourglass-1:before,.fa-hourglass-start:before{content:""}.fa-hourglass-2:before,.fa-hourglass-half:before{content:""}.fa-hourglass-3:before,.fa-hourglass-end:before{content:""}.fa-hourglass:before{content:""}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:""}.fa-hand-paper-o:before,.fa-hand-stop-o:before{content:""}.fa-hand-scissors-o:before{content:""}.fa-hand-lizard-o:before{content:""}.fa-hand-spock-o:before{content:""}.fa-hand-pointer-o:before{content:""}.fa-hand-peace-o:before{content:""}.fa-trademark:before{content:""}.fa-registered:before{content:""}.fa-creative-commons:before{content:""}.fa-gg:before{content:""}.fa-gg-circle:before{content:""}.fa-tripadvisor:before{content:""}.fa-odnoklassniki:before{content:""}.fa-odnoklassniki-square:before{content:""}.fa-get-pocket:before{content:""}.fa-wikipedia-w:before{content:""}.fa-safari:before{content:""}.fa-chrome:before{content:""}.fa-firefox:before{content:""}.fa-opera:before{content:""}.fa-internet-explorer:before{content:""}.fa-television:before,.fa-tv:before{content:""}.fa-contao:before{content:""}.fa-500px:before{content:""}.fa-amazon:before{content:""}.fa-calendar-plus-o:before{content:""}.fa-calendar-minus-o:before{content:""}.fa-calendar-times-o:before{content:""}.fa-calendar-check-o:before{content:""}.fa-industry:before{content:""}.fa-map-pin:before{content:""}.fa-map-signs:before{content:""}.fa-map-o:before{content:""}.fa-map:before{content:""}.fa-commenting:before{content:""}.fa-commenting-o:before{content:""}.fa-houzz:before{content:""}.fa-vimeo:before{content:""}.fa-black-tie:before{content:""}.fa-fonticons:before{content:""}.fa-reddit-alien:before{content:""}.fa-edge:before{content:""}.fa-credit-card-alt:before{content:""}.fa-codiepie:before{content:""}.fa-modx:before{content:""}.fa-fort-awesome:before{content:""}.fa-usb:before{content:""}.fa-product-hunt:before{content:""}.fa-mixcloud:before{content:""}.fa-scribd:before{content:""}.fa-pause-circle:before{content:""}.fa-pause-circle-o:before{content:""}.fa-stop-circle:before{content:""}.fa-stop-circle-o:before{content:""}.fa-shopping-bag:before{content:""}.fa-shopping-basket:before{content:""}.fa-hashtag:before{content:""}.fa-bluetooth:before{content:""}.fa-bluetooth-b:before{content:""}.fa-percent:before{content:""}.fa-gitlab:before,.icon-gitlab:before{content:""}.fa-wpbeginner:before{content:""}.fa-wpforms:before{content:""}.fa-envira:before{content:""}.fa-universal-access:before{content:""}.fa-wheelchair-alt:before{content:""}.fa-question-circle-o:before{content:""}.fa-blind:before{content:""}.fa-audio-description:before{content:""}.fa-volume-control-phone:before{content:""}.fa-braille:before{content:""}.fa-assistive-listening-systems:before{content:""}.fa-american-sign-language-interpreting:before,.fa-asl-interpreting:before{content:""}.fa-deaf:before,.fa-deafness:before,.fa-hard-of-hearing:before{content:""}.fa-glide:before{content:""}.fa-glide-g:before{content:""}.fa-sign-language:before,.fa-signing:before{content:""}.fa-low-vision:before{content:""}.fa-viadeo:before{content:""}.fa-viadeo-square:before{content:""}.fa-snapchat:before{content:""}.fa-snapchat-ghost:before{content:""}.fa-snapchat-square:before{content:""}.fa-pied-piper:before{content:""}.fa-first-order:before{content:""}.fa-yoast:before{content:""}.fa-themeisle:before{content:""}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:""}.fa-fa:before,.fa-font-awesome:before{content:""}.fa-handshake-o:before{content:""}.fa-envelope-open:before{content:""}.fa-envelope-open-o:before{content:""}.fa-linode:before{content:""}.fa-address-book:before{content:""}.fa-address-book-o:before{content:""}.fa-address-card:before,.fa-vcard:before{content:""}.fa-address-card-o:before,.fa-vcard-o:before{content:""}.fa-user-circle:before{content:""}.fa-user-circle-o:before{content:""}.fa-user-o:before{content:""}.fa-id-badge:before{content:""}.fa-drivers-license:before,.fa-id-card:before{content:""}.fa-drivers-license-o:before,.fa-id-card-o:before{content:""}.fa-quora:before{content:""}.fa-free-code-camp:before{content:""}.fa-telegram:before{content:""}.fa-thermometer-4:before,.fa-thermometer-full:before,.fa-thermometer:before{content:""}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:""}.fa-thermometer-2:before,.fa-thermometer-half:before{content:""}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:""}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:""}.fa-shower:before{content:""}.fa-bath:before,.fa-bathtub:before,.fa-s15:before{content:""}.fa-podcast:before{content:""}.fa-window-maximize:before{content:""}.fa-window-minimize:before{content:""}.fa-window-restore:before{content:""}.fa-times-rectangle:before,.fa-window-close:before{content:""}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:""}.fa-bandcamp:before{content:""}.fa-grav:before{content:""}.fa-etsy:before{content:""}.fa-imdb:before{content:""}.fa-ravelry:before{content:""}.fa-eercast:before{content:""}.fa-microchip:before{content:""}.fa-snowflake-o:before{content:""}.fa-superpowers:before{content:""}.fa-wpexplorer:before{content:""}.fa-meetup:before{content:""}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.fa,.icon,.rst-content .admonition-title,.rst-content .code-block-caption .headerlink,.rst-content code.download span:first-child,.rst-content dl dt .headerlink,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content p.caption .headerlink,.rst-content table>caption .headerlink,.rst-content tt.download span:first-child,.wy-dropdown .caret,.wy-inline-validate.wy-inline-validate-danger .wy-input-context,.wy-inline-validate.wy-inline-validate-info .wy-input-context,.wy-inline-validate.wy-inline-validate-success .wy-input-context,.wy-inline-validate.wy-inline-validate-warning .wy-input-context,.wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li span.toctree-expand{font-family:inherit}.fa:before,.icon:before,.rst-content .admonition-title:before,.rst-content .code-block-caption .headerlink:before,.rst-content code.download span:first-child:before,.rst-content dl dt .headerlink:before,.rst-content h1 .headerlink:before,.rst-content h2 .headerlink:before,.rst-content h3 .headerlink:before,.rst-content h4 .headerlink:before,.rst-content h5 .headerlink:before,.rst-content h6 .headerlink:before,.rst-content p.caption .headerlink:before,.rst-content table>caption .headerlink:before,.rst-content tt.download span:first-child:before,.wy-dropdown .caret:before,.wy-inline-validate.wy-inline-validate-danger .wy-input-context:before,.wy-inline-validate.wy-inline-validate-info .wy-input-context:before,.wy-inline-validate.wy-inline-validate-success .wy-input-context:before,.wy-inline-validate.wy-inline-validate-warning .wy-input-context:before,.wy-menu-vertical li.current>a span.toctree-expand:before,.wy-menu-vertical li.on a span.toctree-expand:before,.wy-menu-vertical li span.toctree-expand:before{font-family:FontAwesome;display:inline-block;font-style:normal;font-weight:400;line-height:1;text-decoration:inherit}.rst-content .code-block-caption a .headerlink,.rst-content a .admonition-title,.rst-content code.download a span:first-child,.rst-content dl dt a .headerlink,.rst-content h1 a .headerlink,.rst-content h2 a .headerlink,.rst-content h3 a .headerlink,.rst-content h4 a .headerlink,.rst-content h5 a .headerlink,.rst-content h6 a .headerlink,.rst-content p.caption a .headerlink,.rst-content table>caption a .headerlink,.rst-content tt.download a span:first-child,.wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand,.wy-menu-vertical li a span.toctree-expand,a .fa,a .icon,a .rst-content .admonition-title,a .rst-content .code-block-caption .headerlink,a .rst-content code.download span:first-child,a .rst-content dl dt .headerlink,a .rst-content h1 .headerlink,a .rst-content h2 .headerlink,a .rst-content h3 .headerlink,a .rst-content h4 .headerlink,a .rst-content h5 .headerlink,a .rst-content h6 .headerlink,a .rst-content p.caption .headerlink,a .rst-content table>caption .headerlink,a .rst-content tt.download span:first-child,a .wy-menu-vertical li span.toctree-expand{display:inline-block;text-decoration:inherit}.btn .fa,.btn .icon,.btn .rst-content .admonition-title,.btn .rst-content .code-block-caption .headerlink,.btn .rst-content code.download span:first-child,.btn .rst-content dl dt .headerlink,.btn .rst-content h1 .headerlink,.btn .rst-content h2 .headerlink,.btn .rst-content h3 .headerlink,.btn .rst-content h4 .headerlink,.btn .rst-content h5 .headerlink,.btn .rst-content h6 .headerlink,.btn .rst-content p.caption .headerlink,.btn .rst-content table>caption .headerlink,.btn .rst-content tt.download span:first-child,.btn .wy-menu-vertical li.current>a span.toctree-expand,.btn .wy-menu-vertical li.on a span.toctree-expand,.btn .wy-menu-vertical li span.toctree-expand,.nav .fa,.nav .icon,.nav .rst-content .admonition-title,.nav .rst-content .code-block-caption .headerlink,.nav .rst-content code.download span:first-child,.nav .rst-content dl dt .headerlink,.nav .rst-content h1 .headerlink,.nav .rst-content h2 .headerlink,.nav .rst-content h3 .headerlink,.nav .rst-content h4 .headerlink,.nav .rst-content h5 .headerlink,.nav .rst-content h6 .headerlink,.nav .rst-content p.caption .headerlink,.nav .rst-content table>caption .headerlink,.nav .rst-content tt.download span:first-child,.nav .wy-menu-vertical li.current>a span.toctree-expand,.nav .wy-menu-vertical li.on a span.toctree-expand,.nav .wy-menu-vertical li span.toctree-expand,.rst-content .btn .admonition-title,.rst-content .code-block-caption .btn .headerlink,.rst-content .code-block-caption .nav .headerlink,.rst-content .nav .admonition-title,.rst-content code.download .btn span:first-child,.rst-content code.download .nav span:first-child,.rst-content dl dt .btn .headerlink,.rst-content dl dt .nav .headerlink,.rst-content h1 .btn .headerlink,.rst-content h1 .nav .headerlink,.rst-content h2 .btn .headerlink,.rst-content h2 .nav .headerlink,.rst-content h3 .btn .headerlink,.rst-content h3 .nav .headerlink,.rst-content h4 .btn .headerlink,.rst-content h4 .nav .headerlink,.rst-content h5 .btn .headerlink,.rst-content h5 .nav .headerlink,.rst-content h6 .btn .headerlink,.rst-content h6 .nav .headerlink,.rst-content p.caption .btn .headerlink,.rst-content p.caption .nav .headerlink,.rst-content table>caption .btn .headerlink,.rst-content table>caption .nav .headerlink,.rst-content tt.download .btn span:first-child,.rst-content tt.download .nav span:first-child,.wy-menu-vertical li .btn span.toctree-expand,.wy-menu-vertical li.current>a .btn span.toctree-expand,.wy-menu-vertical li.current>a .nav span.toctree-expand,.wy-menu-vertical li .nav span.toctree-expand,.wy-menu-vertical li.on a .btn span.toctree-expand,.wy-menu-vertical li.on a .nav span.toctree-expand{display:inline}.btn .fa-large.icon,.btn .fa.fa-large,.btn .rst-content .code-block-caption .fa-large.headerlink,.btn .rst-content .fa-large.admonition-title,.btn .rst-content code.download span.fa-large:first-child,.btn .rst-content dl dt .fa-large.headerlink,.btn .rst-content h1 .fa-large.headerlink,.btn .rst-content h2 .fa-large.headerlink,.btn .rst-content h3 .fa-large.headerlink,.btn .rst-content h4 .fa-large.headerlink,.btn .rst-content h5 .fa-large.headerlink,.btn .rst-content h6 .fa-large.headerlink,.btn .rst-content p.caption .fa-large.headerlink,.btn .rst-content table>caption .fa-large.headerlink,.btn .rst-content tt.download span.fa-large:first-child,.btn .wy-menu-vertical li span.fa-large.toctree-expand,.nav .fa-large.icon,.nav .fa.fa-large,.nav .rst-content .code-block-caption .fa-large.headerlink,.nav .rst-content .fa-large.admonition-title,.nav .rst-content code.download span.fa-large:first-child,.nav .rst-content dl dt .fa-large.headerlink,.nav .rst-content h1 .fa-large.headerlink,.nav .rst-content h2 .fa-large.headerlink,.nav .rst-content h3 .fa-large.headerlink,.nav .rst-content h4 .fa-large.headerlink,.nav .rst-content h5 .fa-large.headerlink,.nav .rst-content h6 .fa-large.headerlink,.nav .rst-content p.caption .fa-large.headerlink,.nav .rst-content table>caption .fa-large.headerlink,.nav .rst-content tt.download span.fa-large:first-child,.nav .wy-menu-vertical li span.fa-large.toctree-expand,.rst-content .btn .fa-large.admonition-title,.rst-content .code-block-caption .btn .fa-large.headerlink,.rst-content .code-block-caption .nav .fa-large.headerlink,.rst-content .nav .fa-large.admonition-title,.rst-content code.download .btn span.fa-large:first-child,.rst-content code.download .nav span.fa-large:first-child,.rst-content dl dt .btn .fa-large.headerlink,.rst-content dl dt .nav .fa-large.headerlink,.rst-content h1 .btn .fa-large.headerlink,.rst-content h1 .nav .fa-large.headerlink,.rst-content h2 .btn .fa-large.headerlink,.rst-content h2 .nav .fa-large.headerlink,.rst-content h3 .btn .fa-large.headerlink,.rst-content h3 .nav .fa-large.headerlink,.rst-content h4 .btn .fa-large.headerlink,.rst-content h4 .nav .fa-large.headerlink,.rst-content h5 .btn .fa-large.headerlink,.rst-content h5 .nav .fa-large.headerlink,.rst-content h6 .btn .fa-large.headerlink,.rst-content h6 .nav .fa-large.headerlink,.rst-content p.caption .btn .fa-large.headerlink,.rst-content p.caption .nav .fa-large.headerlink,.rst-content table>caption .btn .fa-large.headerlink,.rst-content table>caption .nav .fa-large.headerlink,.rst-content tt.download .btn span.fa-large:first-child,.rst-content tt.download .nav span.fa-large:first-child,.wy-menu-vertical li .btn span.fa-large.toctree-expand,.wy-menu-vertical li .nav span.fa-large.toctree-expand{line-height:.9em}.btn .fa-spin.icon,.btn .fa.fa-spin,.btn .rst-content .code-block-caption .fa-spin.headerlink,.btn .rst-content .fa-spin.admonition-title,.btn .rst-content code.download span.fa-spin:first-child,.btn .rst-content dl dt .fa-spin.headerlink,.btn .rst-content h1 .fa-spin.headerlink,.btn .rst-content h2 .fa-spin.headerlink,.btn .rst-content h3 .fa-spin.headerlink,.btn .rst-content h4 .fa-spin.headerlink,.btn .rst-content h5 .fa-spin.headerlink,.btn .rst-content h6 .fa-spin.headerlink,.btn .rst-content p.caption .fa-spin.headerlink,.btn .rst-content table>caption .fa-spin.headerlink,.btn .rst-content tt.download span.fa-spin:first-child,.btn .wy-menu-vertical li span.fa-spin.toctree-expand,.nav .fa-spin.icon,.nav .fa.fa-spin,.nav .rst-content .code-block-caption .fa-spin.headerlink,.nav .rst-content .fa-spin.admonition-title,.nav .rst-content code.download span.fa-spin:first-child,.nav .rst-content dl dt .fa-spin.headerlink,.nav .rst-content h1 .fa-spin.headerlink,.nav .rst-content h2 .fa-spin.headerlink,.nav .rst-content h3 .fa-spin.headerlink,.nav .rst-content h4 .fa-spin.headerlink,.nav .rst-content h5 .fa-spin.headerlink,.nav .rst-content h6 .fa-spin.headerlink,.nav .rst-content p.caption .fa-spin.headerlink,.nav .rst-content table>caption .fa-spin.headerlink,.nav .rst-content tt.download span.fa-spin:first-child,.nav .wy-menu-vertical li span.fa-spin.toctree-expand,.rst-content .btn .fa-spin.admonition-title,.rst-content .code-block-caption .btn .fa-spin.headerlink,.rst-content .code-block-caption .nav .fa-spin.headerlink,.rst-content .nav .fa-spin.admonition-title,.rst-content code.download .btn span.fa-spin:first-child,.rst-content code.download .nav span.fa-spin:first-child,.rst-content dl dt .btn .fa-spin.headerlink,.rst-content dl dt .nav .fa-spin.headerlink,.rst-content h1 .btn .fa-spin.headerlink,.rst-content h1 .nav .fa-spin.headerlink,.rst-content h2 .btn .fa-spin.headerlink,.rst-content h2 .nav .fa-spin.headerlink,.rst-content h3 .btn .fa-spin.headerlink,.rst-content h3 .nav .fa-spin.headerlink,.rst-content h4 .btn .fa-spin.headerlink,.rst-content h4 .nav .fa-spin.headerlink,.rst-content h5 .btn .fa-spin.headerlink,.rst-content h5 .nav .fa-spin.headerlink,.rst-content h6 .btn .fa-spin.headerlink,.rst-content h6 .nav .fa-spin.headerlink,.rst-content p.caption .btn .fa-spin.headerlink,.rst-content p.caption .nav .fa-spin.headerlink,.rst-content table>caption .btn .fa-spin.headerlink,.rst-content table>caption .nav .fa-spin.headerlink,.rst-content tt.download .btn span.fa-spin:first-child,.rst-content tt.download .nav span.fa-spin:first-child,.wy-menu-vertical li .btn span.fa-spin.toctree-expand,.wy-menu-vertical li .nav span.fa-spin.toctree-expand{display:inline-block}.btn.fa:before,.btn.icon:before,.rst-content .btn.admonition-title:before,.rst-content .code-block-caption .btn.headerlink:before,.rst-content code.download span.btn:first-child:before,.rst-content dl dt .btn.headerlink:before,.rst-content h1 .btn.headerlink:before,.rst-content h2 .btn.headerlink:before,.rst-content h3 .btn.headerlink:before,.rst-content h4 .btn.headerlink:before,.rst-content h5 .btn.headerlink:before,.rst-content h6 .btn.headerlink:before,.rst-content p.caption .btn.headerlink:before,.rst-content table>caption .btn.headerlink:before,.rst-content tt.download span.btn:first-child:before,.wy-menu-vertical li span.btn.toctree-expand:before{opacity:.5;-webkit-transition:opacity .05s ease-in;-moz-transition:opacity .05s ease-in;transition:opacity .05s ease-in}.btn.fa:hover:before,.btn.icon:hover:before,.rst-content .btn.admonition-title:hover:before,.rst-content .code-block-caption .btn.headerlink:hover:before,.rst-content code.download span.btn:first-child:hover:before,.rst-content dl dt .btn.headerlink:hover:before,.rst-content h1 .btn.headerlink:hover:before,.rst-content h2 .btn.headerlink:hover:before,.rst-content h3 .btn.headerlink:hover:before,.rst-content h4 .btn.headerlink:hover:before,.rst-content h5 .btn.headerlink:hover:before,.rst-content h6 .btn.headerlink:hover:before,.rst-content p.caption .btn.headerlink:hover:before,.rst-content table>caption .btn.headerlink:hover:before,.rst-content tt.download span.btn:first-child:hover:before,.wy-menu-vertical li span.btn.toctree-expand:hover:before{opacity:1}.btn-mini .fa:before,.btn-mini .icon:before,.btn-mini .rst-content .admonition-title:before,.btn-mini .rst-content .code-block-caption .headerlink:before,.btn-mini .rst-content code.download span:first-child:before,.btn-mini .rst-content dl dt .headerlink:before,.btn-mini .rst-content h1 .headerlink:before,.btn-mini .rst-content h2 .headerlink:before,.btn-mini .rst-content h3 .headerlink:before,.btn-mini .rst-content h4 .headerlink:before,.btn-mini .rst-content h5 .headerlink:before,.btn-mini .rst-content h6 .headerlink:before,.btn-mini .rst-content p.caption .headerlink:before,.btn-mini .rst-content table>caption .headerlink:before,.btn-mini .rst-content tt.download span:first-child:before,.btn-mini .wy-menu-vertical li span.toctree-expand:before,.rst-content .btn-mini .admonition-title:before,.rst-content .code-block-caption .btn-mini .headerlink:before,.rst-content code.download .btn-mini span:first-child:before,.rst-content dl dt .btn-mini .headerlink:before,.rst-content h1 .btn-mini .headerlink:before,.rst-content h2 .btn-mini .headerlink:before,.rst-content h3 .btn-mini .headerlink:before,.rst-content h4 .btn-mini .headerlink:before,.rst-content h5 .btn-mini .headerlink:before,.rst-content h6 .btn-mini .headerlink:before,.rst-content p.caption .btn-mini .headerlink:before,.rst-content table>caption .btn-mini .headerlink:before,.rst-content tt.download .btn-mini span:first-child:before,.wy-menu-vertical li .btn-mini span.toctree-expand:before{font-size:14px;vertical-align:-15%}.rst-content .admonition,.rst-content .admonition-todo,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .note,.rst-content .seealso,.rst-content .tip,.rst-content .warning,.wy-alert{padding:12px;line-height:24px;margin-bottom:24px;background:#e7f2fa}.rst-content .admonition-title,.wy-alert-title{font-weight:700;display:block;color:#fff;background:#6ab0de;padding:6px 12px;margin:-12px -12px 12px}.rst-content .danger,.rst-content .error,.rst-content .wy-alert-danger.admonition,.rst-content .wy-alert-danger.admonition-todo,.rst-content .wy-alert-danger.attention,.rst-content .wy-alert-danger.caution,.rst-content .wy-alert-danger.hint,.rst-content .wy-alert-danger.important,.rst-content .wy-alert-danger.note,.rst-content .wy-alert-danger.seealso,.rst-content .wy-alert-danger.tip,.rst-content .wy-alert-danger.warning,.wy-alert.wy-alert-danger{background:#fdf3f2}.rst-content .danger .admonition-title,.rst-content .danger .wy-alert-title,.rst-content .error .admonition-title,.rst-content .error .wy-alert-title,.rst-content .wy-alert-danger.admonition-todo .admonition-title,.rst-content .wy-alert-danger.admonition-todo .wy-alert-title,.rst-content .wy-alert-danger.admonition .admonition-title,.rst-content .wy-alert-danger.admonition .wy-alert-title,.rst-content .wy-alert-danger.attention .admonition-title,.rst-content .wy-alert-danger.attention .wy-alert-title,.rst-content .wy-alert-danger.caution .admonition-title,.rst-content .wy-alert-danger.caution .wy-alert-title,.rst-content .wy-alert-danger.hint .admonition-title,.rst-content .wy-alert-danger.hint .wy-alert-title,.rst-content .wy-alert-danger.important .admonition-title,.rst-content .wy-alert-danger.important .wy-alert-title,.rst-content .wy-alert-danger.note .admonition-title,.rst-content .wy-alert-danger.note .wy-alert-title,.rst-content .wy-alert-danger.seealso .admonition-title,.rst-content .wy-alert-danger.seealso .wy-alert-title,.rst-content .wy-alert-danger.tip .admonition-title,.rst-content .wy-alert-danger.tip .wy-alert-title,.rst-content .wy-alert-danger.warning .admonition-title,.rst-content .wy-alert-danger.warning .wy-alert-title,.rst-content .wy-alert.wy-alert-danger .admonition-title,.wy-alert.wy-alert-danger .rst-content .admonition-title,.wy-alert.wy-alert-danger .wy-alert-title{background:#f29f97}.rst-content .admonition-todo,.rst-content .attention,.rst-content .caution,.rst-content .warning,.rst-content .wy-alert-warning.admonition,.rst-content .wy-alert-warning.danger,.rst-content .wy-alert-warning.error,.rst-content .wy-alert-warning.hint,.rst-content .wy-alert-warning.important,.rst-content .wy-alert-warning.note,.rst-content .wy-alert-warning.seealso,.rst-content .wy-alert-warning.tip,.wy-alert.wy-alert-warning{background:#ffedcc}.rst-content .admonition-todo .admonition-title,.rst-content .admonition-todo .wy-alert-title,.rst-content .attention .admonition-title,.rst-content .attention .wy-alert-title,.rst-content .caution .admonition-title,.rst-content .caution .wy-alert-title,.rst-content .warning .admonition-title,.rst-content .warning .wy-alert-title,.rst-content .wy-alert-warning.admonition .admonition-title,.rst-content .wy-alert-warning.admonition .wy-alert-title,.rst-content .wy-alert-warning.danger .admonition-title,.rst-content .wy-alert-warning.danger .wy-alert-title,.rst-content .wy-alert-warning.error .admonition-title,.rst-content .wy-alert-warning.error .wy-alert-title,.rst-content .wy-alert-warning.hint .admonition-title,.rst-content .wy-alert-warning.hint .wy-alert-title,.rst-content .wy-alert-warning.important .admonition-title,.rst-content .wy-alert-warning.important .wy-alert-title,.rst-content .wy-alert-warning.note .admonition-title,.rst-content .wy-alert-warning.note .wy-alert-title,.rst-content .wy-alert-warning.seealso .admonition-title,.rst-content .wy-alert-warning.seealso .wy-alert-title,.rst-content .wy-alert-warning.tip .admonition-title,.rst-content .wy-alert-warning.tip .wy-alert-title,.rst-content .wy-alert.wy-alert-warning .admonition-title,.wy-alert.wy-alert-warning .rst-content .admonition-title,.wy-alert.wy-alert-warning .wy-alert-title{background:#f0b37e}.rst-content .note,.rst-content .seealso,.rst-content .wy-alert-info.admonition,.rst-content .wy-alert-info.admonition-todo,.rst-content .wy-alert-info.attention,.rst-content .wy-alert-info.caution,.rst-content .wy-alert-info.danger,.rst-content .wy-alert-info.error,.rst-content .wy-alert-info.hint,.rst-content .wy-alert-info.important,.rst-content .wy-alert-info.tip,.rst-content .wy-alert-info.warning,.wy-alert.wy-alert-info{background:#e7f2fa}.rst-content .note .admonition-title,.rst-content .note .wy-alert-title,.rst-content .seealso .admonition-title,.rst-content .seealso .wy-alert-title,.rst-content .wy-alert-info.admonition-todo .admonition-title,.rst-content .wy-alert-info.admonition-todo .wy-alert-title,.rst-content .wy-alert-info.admonition .admonition-title,.rst-content .wy-alert-info.admonition .wy-alert-title,.rst-content .wy-alert-info.attention .admonition-title,.rst-content .wy-alert-info.attention .wy-alert-title,.rst-content .wy-alert-info.caution .admonition-title,.rst-content .wy-alert-info.caution .wy-alert-title,.rst-content .wy-alert-info.danger .admonition-title,.rst-content .wy-alert-info.danger .wy-alert-title,.rst-content .wy-alert-info.error .admonition-title,.rst-content .wy-alert-info.error .wy-alert-title,.rst-content .wy-alert-info.hint .admonition-title,.rst-content .wy-alert-info.hint .wy-alert-title,.rst-content .wy-alert-info.important .admonition-title,.rst-content .wy-alert-info.important .wy-alert-title,.rst-content .wy-alert-info.tip .admonition-title,.rst-content .wy-alert-info.tip .wy-alert-title,.rst-content .wy-alert-info.warning .admonition-title,.rst-content .wy-alert-info.warning .wy-alert-title,.rst-content .wy-alert.wy-alert-info .admonition-title,.wy-alert.wy-alert-info .rst-content .admonition-title,.wy-alert.wy-alert-info .wy-alert-title{background:#6ab0de}.rst-content .hint,.rst-content .important,.rst-content .tip,.rst-content .wy-alert-success.admonition,.rst-content .wy-alert-success.admonition-todo,.rst-content .wy-alert-success.attention,.rst-content .wy-alert-success.caution,.rst-content .wy-alert-success.danger,.rst-content .wy-alert-success.error,.rst-content .wy-alert-success.note,.rst-content .wy-alert-success.seealso,.rst-content .wy-alert-success.warning,.wy-alert.wy-alert-success{background:#dbfaf4}.rst-content .hint .admonition-title,.rst-content .hint .wy-alert-title,.rst-content .important .admonition-title,.rst-content .important .wy-alert-title,.rst-content .tip .admonition-title,.rst-content .tip .wy-alert-title,.rst-content .wy-alert-success.admonition-todo .admonition-title,.rst-content .wy-alert-success.admonition-todo .wy-alert-title,.rst-content .wy-alert-success.admonition .admonition-title,.rst-content .wy-alert-success.admonition .wy-alert-title,.rst-content .wy-alert-success.attention .admonition-title,.rst-content .wy-alert-success.attention .wy-alert-title,.rst-content .wy-alert-success.caution .admonition-title,.rst-content .wy-alert-success.caution .wy-alert-title,.rst-content .wy-alert-success.danger .admonition-title,.rst-content .wy-alert-success.danger .wy-alert-title,.rst-content .wy-alert-success.error .admonition-title,.rst-content .wy-alert-success.error .wy-alert-title,.rst-content .wy-alert-success.note .admonition-title,.rst-content .wy-alert-success.note .wy-alert-title,.rst-content .wy-alert-success.seealso .admonition-title,.rst-content .wy-alert-success.seealso .wy-alert-title,.rst-content .wy-alert-success.warning .admonition-title,.rst-content .wy-alert-success.warning .wy-alert-title,.rst-content .wy-alert.wy-alert-success .admonition-title,.wy-alert.wy-alert-success .rst-content .admonition-title,.wy-alert.wy-alert-success .wy-alert-title{background:#1abc9c}.rst-content .wy-alert-neutral.admonition,.rst-content .wy-alert-neutral.admonition-todo,.rst-content .wy-alert-neutral.attention,.rst-content .wy-alert-neutral.caution,.rst-content .wy-alert-neutral.danger,.rst-content .wy-alert-neutral.error,.rst-content .wy-alert-neutral.hint,.rst-content .wy-alert-neutral.important,.rst-content .wy-alert-neutral.note,.rst-content .wy-alert-neutral.seealso,.rst-content .wy-alert-neutral.tip,.rst-content .wy-alert-neutral.warning,.wy-alert.wy-alert-neutral{background:#f3f6f6}.rst-content .wy-alert-neutral.admonition-todo .admonition-title,.rst-content .wy-alert-neutral.admonition-todo .wy-alert-title,.rst-content .wy-alert-neutral.admonition .admonition-title,.rst-content .wy-alert-neutral.admonition .wy-alert-title,.rst-content .wy-alert-neutral.attention .admonition-title,.rst-content .wy-alert-neutral.attention .wy-alert-title,.rst-content .wy-alert-neutral.caution .admonition-title,.rst-content .wy-alert-neutral.caution .wy-alert-title,.rst-content .wy-alert-neutral.danger .admonition-title,.rst-content .wy-alert-neutral.danger .wy-alert-title,.rst-content .wy-alert-neutral.error .admonition-title,.rst-content .wy-alert-neutral.error .wy-alert-title,.rst-content .wy-alert-neutral.hint .admonition-title,.rst-content .wy-alert-neutral.hint .wy-alert-title,.rst-content .wy-alert-neutral.important .admonition-title,.rst-content .wy-alert-neutral.important .wy-alert-title,.rst-content .wy-alert-neutral.note .admonition-title,.rst-content .wy-alert-neutral.note .wy-alert-title,.rst-content .wy-alert-neutral.seealso .admonition-title,.rst-content .wy-alert-neutral.seealso .wy-alert-title,.rst-content .wy-alert-neutral.tip .admonition-title,.rst-content .wy-alert-neutral.tip .wy-alert-title,.rst-content .wy-alert-neutral.warning .admonition-title,.rst-content .wy-alert-neutral.warning .wy-alert-title,.rst-content .wy-alert.wy-alert-neutral .admonition-title,.wy-alert.wy-alert-neutral .rst-content .admonition-title,.wy-alert.wy-alert-neutral .wy-alert-title{color:#404040;background:#e1e4e5}.rst-content .wy-alert-neutral.admonition-todo a,.rst-content .wy-alert-neutral.admonition a,.rst-content .wy-alert-neutral.attention a,.rst-content .wy-alert-neutral.caution a,.rst-content .wy-alert-neutral.danger a,.rst-content .wy-alert-neutral.error a,.rst-content .wy-alert-neutral.hint a,.rst-content .wy-alert-neutral.important a,.rst-content .wy-alert-neutral.note a,.rst-content .wy-alert-neutral.seealso a,.rst-content .wy-alert-neutral.tip a,.rst-content .wy-alert-neutral.warning a,.wy-alert.wy-alert-neutral a{color:#2980b9}.rst-content .admonition-todo p:last-child,.rst-content .admonition p:last-child,.rst-content .attention p:last-child,.rst-content .caution p:last-child,.rst-content .danger p:last-child,.rst-content .error p:last-child,.rst-content .hint p:last-child,.rst-content .important p:last-child,.rst-content .note p:last-child,.rst-content .seealso p:last-child,.rst-content .tip p:last-child,.rst-content .warning p:last-child,.wy-alert p:last-child{margin-bottom:0}.wy-tray-container{position:fixed;bottom:0;left:0;z-index:600}.wy-tray-container li{display:block;width:300px;background:transparent;color:#fff;text-align:center;box-shadow:0 5px 5px 0 rgba(0,0,0,.1);padding:0 24px;min-width:20%;opacity:0;height:0;line-height:56px;overflow:hidden;-webkit-transition:all .3s ease-in;-moz-transition:all .3s ease-in;transition:all .3s ease-in}.wy-tray-container li.wy-tray-item-success{background:#27ae60}.wy-tray-container li.wy-tray-item-info{background:#2980b9}.wy-tray-container li.wy-tray-item-warning{background:#e67e22}.wy-tray-container li.wy-tray-item-danger{background:#e74c3c}.wy-tray-container li.on{opacity:1;height:56px}@media screen and (max-width:768px){.wy-tray-container{bottom:auto;top:0;width:100%}.wy-tray-container li{width:100%}}button{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle;cursor:pointer;line-height:normal;-webkit-appearance:button;*overflow:visible}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}button[disabled]{cursor:default}.btn{display:inline-block;border-radius:2px;line-height:normal;white-space:nowrap;text-align:center;cursor:pointer;font-size:100%;padding:6px 12px 8px;color:#fff;border:1px solid rgba(0,0,0,.1);background-color:#27ae60;text-decoration:none;font-weight:400;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;box-shadow:inset 0 1px 2px -1px hsla(0,0%,100%,.5),inset 0 -2px 0 0 rgba(0,0,0,.1);outline-none:false;vertical-align:middle;*display:inline;zoom:1;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-transition:all .1s linear;-moz-transition:all .1s linear;transition:all .1s linear}.btn-hover{background:#2e8ece;color:#fff}.btn:hover{background:#2cc36b;color:#fff}.btn:focus{background:#2cc36b;outline:0}.btn:active{box-shadow:inset 0 -1px 0 0 rgba(0,0,0,.05),inset 0 2px 0 0 rgba(0,0,0,.1);padding:8px 12px 6px}.btn:visited{color:#fff}.btn-disabled,.btn-disabled:active,.btn-disabled:focus,.btn-disabled:hover,.btn:disabled{background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);filter:alpha(opacity=40);opacity:.4;cursor:not-allowed;box-shadow:none}.btn::-moz-focus-inner{padding:0;border:0}.btn-small{font-size:80%}.btn-info{background-color:#2980b9!important}.btn-info:hover{background-color:#2e8ece!important}.btn-neutral{background-color:#f3f6f6!important;color:#404040!important}.btn-neutral:hover{background-color:#e5ebeb!important;color:#404040}.btn-neutral:visited{color:#404040!important}.btn-success{background-color:#27ae60!important}.btn-success:hover{background-color:#295!important}.btn-danger{background-color:#e74c3c!important}.btn-danger:hover{background-color:#ea6153!important}.btn-warning{background-color:#e67e22!important}.btn-warning:hover{background-color:#e98b39!important}.btn-invert{background-color:#222}.btn-invert:hover{background-color:#2f2f2f!important}.btn-link{background-color:transparent!important;color:#2980b9;box-shadow:none;border-color:transparent!important}.btn-link:active,.btn-link:hover{background-color:transparent!important;color:#409ad5!important;box-shadow:none}.btn-link:visited{color:#9b59b6}.wy-btn-group .btn,.wy-control .btn{vertical-align:middle}.wy-btn-group{margin-bottom:24px;*zoom:1}.wy-btn-group:after,.wy-btn-group:before{display:table;content:""}.wy-btn-group:after{clear:both}.wy-dropdown{position:relative;display:inline-block}.wy-dropdown-active .wy-dropdown-menu{display:block}.wy-dropdown-menu{position:absolute;left:0;display:none;float:left;top:100%;min-width:100%;background:#fcfcfc;z-index:100;border:1px solid #cfd7dd;box-shadow:0 2px 2px 0 rgba(0,0,0,.1);padding:12px}.wy-dropdown-menu>dd>a{display:block;clear:both;color:#404040;white-space:nowrap;font-size:90%;padding:0 12px;cursor:pointer}.wy-dropdown-menu>dd>a:hover{background:#2980b9;color:#fff}.wy-dropdown-menu>dd.divider{border-top:1px solid #cfd7dd;margin:6px 0}.wy-dropdown-menu>dd.search{padding-bottom:12px}.wy-dropdown-menu>dd.search input[type=search]{width:100%}.wy-dropdown-menu>dd.call-to-action{background:#e3e3e3;text-transform:uppercase;font-weight:500;font-size:80%}.wy-dropdown-menu>dd.call-to-action:hover{background:#e3e3e3}.wy-dropdown-menu>dd.call-to-action .btn{color:#fff}.wy-dropdown.wy-dropdown-up .wy-dropdown-menu{bottom:100%;top:auto;left:auto;right:0}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu{background:#fcfcfc;margin-top:2px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a{padding:6px 12px}.wy-dropdown.wy-dropdown-bubble .wy-dropdown-menu a:hover{background:#2980b9;color:#fff}.wy-dropdown.wy-dropdown-left .wy-dropdown-menu{right:0;left:auto;text-align:right}.wy-dropdown-arrow:before{content:" ";border-bottom:5px solid #f5f5f5;border-left:5px solid transparent;border-right:5px solid transparent;position:absolute;display:block;top:-4px;left:50%;margin-left:-3px}.wy-dropdown-arrow.wy-dropdown-arrow-left:before{left:11px}.wy-form-stacked select{display:block}.wy-form-aligned .wy-help-inline,.wy-form-aligned input,.wy-form-aligned label,.wy-form-aligned select,.wy-form-aligned textarea{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-form-aligned .wy-control-group>label{display:inline-block;vertical-align:middle;width:10em;margin:6px 12px 0 0;float:left}.wy-form-aligned .wy-control{float:left}.wy-form-aligned .wy-control label{display:block}.wy-form-aligned .wy-control select{margin-top:6px}fieldset{margin:0}fieldset,legend{border:0;padding:0}legend{width:100%;white-space:normal;margin-bottom:24px;font-size:150%;*margin-left:-7px}label,legend{display:block}label{margin:0 0 .3125em;color:#333;font-size:90%}input,select,textarea{font-size:100%;margin:0;vertical-align:baseline;*vertical-align:middle}.wy-control-group{margin-bottom:24px;max-width:1200px;margin-left:auto;margin-right:auto;*zoom:1}.wy-control-group:after,.wy-control-group:before{display:table;content:""}.wy-control-group:after{clear:both}.wy-control-group.wy-control-group-required>label:after{content:" *";color:#e74c3c}.wy-control-group .wy-form-full,.wy-control-group .wy-form-halves,.wy-control-group .wy-form-thirds{padding-bottom:12px}.wy-control-group .wy-form-full input[type=color],.wy-control-group .wy-form-full input[type=date],.wy-control-group .wy-form-full input[type=datetime-local],.wy-control-group .wy-form-full input[type=datetime],.wy-control-group .wy-form-full input[type=email],.wy-control-group .wy-form-full input[type=month],.wy-control-group .wy-form-full input[type=number],.wy-control-group .wy-form-full input[type=password],.wy-control-group .wy-form-full input[type=search],.wy-control-group .wy-form-full input[type=tel],.wy-control-group .wy-form-full input[type=text],.wy-control-group .wy-form-full input[type=time],.wy-control-group .wy-form-full input[type=url],.wy-control-group .wy-form-full input[type=week],.wy-control-group .wy-form-full select,.wy-control-group .wy-form-halves input[type=color],.wy-control-group .wy-form-halves input[type=date],.wy-control-group .wy-form-halves input[type=datetime-local],.wy-control-group .wy-form-halves input[type=datetime],.wy-control-group .wy-form-halves input[type=email],.wy-control-group .wy-form-halves input[type=month],.wy-control-group .wy-form-halves input[type=number],.wy-control-group .wy-form-halves input[type=password],.wy-control-group .wy-form-halves input[type=search],.wy-control-group .wy-form-halves input[type=tel],.wy-control-group .wy-form-halves input[type=text],.wy-control-group .wy-form-halves input[type=time],.wy-control-group .wy-form-halves input[type=url],.wy-control-group .wy-form-halves input[type=week],.wy-control-group .wy-form-halves select,.wy-control-group .wy-form-thirds input[type=color],.wy-control-group .wy-form-thirds input[type=date],.wy-control-group .wy-form-thirds input[type=datetime-local],.wy-control-group .wy-form-thirds input[type=datetime],.wy-control-group .wy-form-thirds input[type=email],.wy-control-group .wy-form-thirds input[type=month],.wy-control-group .wy-form-thirds input[type=number],.wy-control-group .wy-form-thirds input[type=password],.wy-control-group .wy-form-thirds input[type=search],.wy-control-group .wy-form-thirds input[type=tel],.wy-control-group .wy-form-thirds input[type=text],.wy-control-group .wy-form-thirds input[type=time],.wy-control-group .wy-form-thirds input[type=url],.wy-control-group .wy-form-thirds input[type=week],.wy-control-group .wy-form-thirds select{width:100%}.wy-control-group .wy-form-full{float:left;display:block;width:100%;margin-right:0}.wy-control-group .wy-form-full:last-child{margin-right:0}.wy-control-group .wy-form-halves{float:left;display:block;margin-right:2.35765%;width:48.82117%}.wy-control-group .wy-form-halves:last-child,.wy-control-group .wy-form-halves:nth-of-type(2n){margin-right:0}.wy-control-group .wy-form-halves:nth-of-type(odd){clear:left}.wy-control-group .wy-form-thirds{float:left;display:block;margin-right:2.35765%;width:31.76157%}.wy-control-group .wy-form-thirds:last-child,.wy-control-group .wy-form-thirds:nth-of-type(3n){margin-right:0}.wy-control-group .wy-form-thirds:nth-of-type(3n+1){clear:left}.wy-control-group.wy-control-group-no-input .wy-control,.wy-control-no-input{margin:6px 0 0;font-size:90%}.wy-control-no-input{display:inline-block}.wy-control-group.fluid-input input[type=color],.wy-control-group.fluid-input input[type=date],.wy-control-group.fluid-input input[type=datetime-local],.wy-control-group.fluid-input input[type=datetime],.wy-control-group.fluid-input input[type=email],.wy-control-group.fluid-input input[type=month],.wy-control-group.fluid-input input[type=number],.wy-control-group.fluid-input input[type=password],.wy-control-group.fluid-input input[type=search],.wy-control-group.fluid-input input[type=tel],.wy-control-group.fluid-input input[type=text],.wy-control-group.fluid-input input[type=time],.wy-control-group.fluid-input input[type=url],.wy-control-group.fluid-input input[type=week]{width:100%}.wy-form-message-inline{padding-left:.3em;color:#666;font-size:90%}.wy-form-message{display:block;color:#999;font-size:70%;margin-top:.3125em;font-style:italic}.wy-form-message p{font-size:inherit;font-style:italic;margin-bottom:6px}.wy-form-message p:last-child{margin-bottom:0}input{line-height:normal}input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;*overflow:visible}input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=email],input[type=month],input[type=number],input[type=password],input[type=search],input[type=tel],input[type=text],input[type=time],input[type=url],input[type=week]{-webkit-appearance:none;padding:6px;display:inline-block;border:1px solid #ccc;font-size:80%;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;box-shadow:inset 0 1px 3px #ddd;border-radius:0;-webkit-transition:border .3s linear;-moz-transition:border .3s linear;transition:border .3s linear}input[type=datetime-local]{padding:.34375em .625em}input[disabled]{cursor:default}input[type=checkbox],input[type=radio]{padding:0;margin-right:.3125em;*height:13px;*width:13px}input[type=checkbox],input[type=radio],input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}input[type=color]:focus,input[type=date]:focus,input[type=datetime-local]:focus,input[type=datetime]:focus,input[type=email]:focus,input[type=month]:focus,input[type=number]:focus,input[type=password]:focus,input[type=search]:focus,input[type=tel]:focus,input[type=text]:focus,input[type=time]:focus,input[type=url]:focus,input[type=week]:focus{outline:0;outline:thin dotted\9;border-color:#333}input.no-focus:focus{border-color:#ccc!important}input[type=checkbox]:focus,input[type=file]:focus,input[type=radio]:focus{outline:thin dotted #333;outline:1px auto #129fea}input[type=color][disabled],input[type=date][disabled],input[type=datetime-local][disabled],input[type=datetime][disabled],input[type=email][disabled],input[type=month][disabled],input[type=number][disabled],input[type=password][disabled],input[type=search][disabled],input[type=tel][disabled],input[type=text][disabled],input[type=time][disabled],input[type=url][disabled],input[type=week][disabled]{cursor:not-allowed;background-color:#fafafa}input:focus:invalid,select:focus:invalid,textarea:focus:invalid{color:#e74c3c;border:1px solid #e74c3c}input:focus:invalid:focus,select:focus:invalid:focus,textarea:focus:invalid:focus{border-color:#e74c3c}input[type=checkbox]:focus:invalid:focus,input[type=file]:focus:invalid:focus,input[type=radio]:focus:invalid:focus{outline-color:#e74c3c}input.wy-input-large{padding:12px;font-size:100%}textarea{overflow:auto;vertical-align:top;width:100%;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif}select,textarea{padding:.5em .625em;display:inline-block;border:1px solid #ccc;font-size:80%;box-shadow:inset 0 1px 3px #ddd;-webkit-transition:border .3s linear;-moz-transition:border .3s linear;transition:border .3s linear}select{border:1px solid #ccc;background-color:#fff}select[multiple]{height:auto}select:focus,textarea:focus{outline:0}input[readonly],select[disabled],select[readonly],textarea[disabled],textarea[readonly]{cursor:not-allowed;background-color:#fafafa}input[type=checkbox][disabled],input[type=radio][disabled]{cursor:not-allowed}.wy-checkbox,.wy-radio{margin:6px 0;color:#404040;display:block}.wy-checkbox input,.wy-radio input{vertical-align:baseline}.wy-form-message-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}.wy-input-prefix,.wy-input-suffix{white-space:nowrap;padding:6px}.wy-input-prefix .wy-input-context,.wy-input-suffix .wy-input-context{line-height:27px;padding:0 8px;display:inline-block;font-size:80%;background-color:#f3f6f6;border:1px solid #ccc;color:#999}.wy-input-suffix .wy-input-context{border-left:0}.wy-input-prefix .wy-input-context{border-right:0}.wy-switch{position:relative;display:block;height:24px;margin-top:12px;cursor:pointer}.wy-switch:before{left:0;top:0;width:36px;height:12px;background:#ccc}.wy-switch:after,.wy-switch:before{position:absolute;content:"";display:block;border-radius:4px;-webkit-transition:all .2s ease-in-out;-moz-transition:all .2s ease-in-out;transition:all .2s ease-in-out}.wy-switch:after{width:18px;height:18px;background:#999;left:-3px;top:-3px}.wy-switch span{position:absolute;left:48px;display:block;font-size:12px;color:#ccc;line-height:1}.wy-switch.active:before{background:#1e8449}.wy-switch.active:after{left:24px;background:#27ae60}.wy-switch.disabled{cursor:not-allowed;opacity:.8}.wy-control-group.wy-control-group-error .wy-form-message,.wy-control-group.wy-control-group-error>label{color:#e74c3c}.wy-control-group.wy-control-group-error input[type=color],.wy-control-group.wy-control-group-error input[type=date],.wy-control-group.wy-control-group-error input[type=datetime-local],.wy-control-group.wy-control-group-error input[type=datetime],.wy-control-group.wy-control-group-error input[type=email],.wy-control-group.wy-control-group-error input[type=month],.wy-control-group.wy-control-group-error input[type=number],.wy-control-group.wy-control-group-error input[type=password],.wy-control-group.wy-control-group-error input[type=search],.wy-control-group.wy-control-group-error input[type=tel],.wy-control-group.wy-control-group-error input[type=text],.wy-control-group.wy-control-group-error input[type=time],.wy-control-group.wy-control-group-error input[type=url],.wy-control-group.wy-control-group-error input[type=week],.wy-control-group.wy-control-group-error textarea{border:1px solid #e74c3c}.wy-inline-validate{white-space:nowrap}.wy-inline-validate .wy-input-context{padding:.5em .625em;display:inline-block;font-size:80%}.wy-inline-validate.wy-inline-validate-success .wy-input-context{color:#27ae60}.wy-inline-validate.wy-inline-validate-danger .wy-input-context{color:#e74c3c}.wy-inline-validate.wy-inline-validate-warning .wy-input-context{color:#e67e22}.wy-inline-validate.wy-inline-validate-info .wy-input-context{color:#2980b9}.rotate-90{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg)}.rotate-180{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg)}.rotate-270{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg)}.mirror{-webkit-transform:scaleX(-1);-moz-transform:scaleX(-1);-ms-transform:scaleX(-1);-o-transform:scaleX(-1);transform:scaleX(-1)}.mirror.rotate-90{-webkit-transform:scaleX(-1) rotate(90deg);-moz-transform:scaleX(-1) rotate(90deg);-ms-transform:scaleX(-1) rotate(90deg);-o-transform:scaleX(-1) rotate(90deg);transform:scaleX(-1) rotate(90deg)}.mirror.rotate-180{-webkit-transform:scaleX(-1) rotate(180deg);-moz-transform:scaleX(-1) rotate(180deg);-ms-transform:scaleX(-1) rotate(180deg);-o-transform:scaleX(-1) rotate(180deg);transform:scaleX(-1) rotate(180deg)}.mirror.rotate-270{-webkit-transform:scaleX(-1) rotate(270deg);-moz-transform:scaleX(-1) rotate(270deg);-ms-transform:scaleX(-1) rotate(270deg);-o-transform:scaleX(-1) rotate(270deg);transform:scaleX(-1) rotate(270deg)}@media only screen and (max-width:480px){.wy-form button[type=submit]{margin:.7em 0 0}.wy-form input[type=color],.wy-form input[type=date],.wy-form input[type=datetime-local],.wy-form input[type=datetime],.wy-form input[type=email],.wy-form input[type=month],.wy-form input[type=number],.wy-form input[type=password],.wy-form input[type=search],.wy-form input[type=tel],.wy-form input[type=text],.wy-form input[type=time],.wy-form input[type=url],.wy-form input[type=week],.wy-form label{margin-bottom:.3em;display:block}.wy-form input[type=color],.wy-form input[type=date],.wy-form input[type=datetime-local],.wy-form input[type=datetime],.wy-form input[type=email],.wy-form input[type=month],.wy-form input[type=number],.wy-form input[type=password],.wy-form input[type=search],.wy-form input[type=tel],.wy-form input[type=time],.wy-form input[type=url],.wy-form input[type=week]{margin-bottom:0}.wy-form-aligned .wy-control-group label{margin-bottom:.3em;text-align:left;display:block;width:100%}.wy-form-aligned .wy-control{margin:1.5em 0 0}.wy-form-message,.wy-form-message-inline,.wy-form .wy-help-inline{display:block;font-size:80%;padding:6px 0}}@media screen and (max-width:768px){.tablet-hide{display:none}}@media screen and (max-width:480px){.mobile-hide{display:none}}.float-left{float:left}.float-right{float:right}.full-width{width:100%}.rst-content table.docutils,.rst-content table.field-list,.wy-table{border-collapse:collapse;border-spacing:0;empty-cells:show;margin-bottom:24px}.rst-content table.docutils caption,.rst-content table.field-list caption,.wy-table caption{color:#000;font:italic 85%/1 arial,sans-serif;padding:1em 0;text-align:center}.rst-content table.docutils td,.rst-content table.docutils th,.rst-content table.field-list td,.rst-content table.field-list th,.wy-table td,.wy-table th{font-size:90%;margin:0;overflow:visible;padding:8px 16px}.rst-content table.docutils td:first-child,.rst-content table.docutils th:first-child,.rst-content table.field-list td:first-child,.rst-content table.field-list th:first-child,.wy-table td:first-child,.wy-table th:first-child{border-left-width:0}.rst-content table.docutils thead,.rst-content table.field-list thead,.wy-table thead{color:#000;text-align:left;vertical-align:bottom;white-space:nowrap}.rst-content table.docutils thead th,.rst-content table.field-list thead th,.wy-table thead th{font-weight:700;border-bottom:2px solid #e1e4e5}.rst-content table.docutils td,.rst-content table.field-list td,.wy-table td{background-color:transparent;vertical-align:middle}.rst-content table.docutils td p,.rst-content table.field-list td p,.wy-table td p{line-height:18px}.rst-content table.docutils td p:last-child,.rst-content table.field-list td p:last-child,.wy-table td p:last-child{margin-bottom:0}.rst-content table.docutils .wy-table-cell-min,.rst-content table.field-list .wy-table-cell-min,.wy-table .wy-table-cell-min{width:1%;padding-right:0}.rst-content table.docutils .wy-table-cell-min input[type=checkbox],.rst-content table.field-list .wy-table-cell-min input[type=checkbox],.wy-table .wy-table-cell-min input[type=checkbox]{margin:0}.wy-table-secondary{color:grey;font-size:90%}.wy-table-tertiary{color:grey;font-size:80%}.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td,.wy-table-backed,.wy-table-odd td,.wy-table-striped tr:nth-child(2n-1) td{background-color:#f3f6f6}.rst-content table.docutils,.wy-table-bordered-all{border:1px solid #e1e4e5}.rst-content table.docutils td,.wy-table-bordered-all td{border-bottom:1px solid #e1e4e5;border-left:1px solid #e1e4e5}.rst-content table.docutils tbody>tr:last-child td,.wy-table-bordered-all tbody>tr:last-child td{border-bottom-width:0}.wy-table-bordered{border:1px solid #e1e4e5}.wy-table-bordered-rows td{border-bottom:1px solid #e1e4e5}.wy-table-bordered-rows tbody>tr:last-child td{border-bottom-width:0}.wy-table-horizontal td,.wy-table-horizontal th{border-width:0 0 1px;border-bottom:1px solid #e1e4e5}.wy-table-horizontal tbody>tr:last-child td{border-bottom-width:0}.wy-table-responsive{margin-bottom:24px;max-width:100%;overflow:auto}.wy-table-responsive table{margin-bottom:0!important}.wy-table-responsive table td,.wy-table-responsive table th{white-space:nowrap}a{color:#2980b9;text-decoration:none;cursor:pointer}a:hover{color:#3091d1}a:visited{color:#9b59b6}html{height:100%}body,html{overflow-x:hidden}body{font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;font-weight:400;color:#404040;min-height:100%;background:#edf0f2}.wy-text-left{text-align:left}.wy-text-center{text-align:center}.wy-text-right{text-align:right}.wy-text-large{font-size:120%}.wy-text-normal{font-size:100%}.wy-text-small,small{font-size:80%}.wy-text-strike{text-decoration:line-through}.wy-text-warning{color:#e67e22!important}a.wy-text-warning:hover{color:#eb9950!important}.wy-text-info{color:#2980b9!important}a.wy-text-info:hover{color:#409ad5!important}.wy-text-success{color:#27ae60!important}a.wy-text-success:hover{color:#36d278!important}.wy-text-danger{color:#e74c3c!important}a.wy-text-danger:hover{color:#ed7669!important}.wy-text-neutral{color:#404040!important}a.wy-text-neutral:hover{color:#595959!important}.rst-content .toctree-wrapper>p.caption,h1,h2,h3,h4,h5,h6,legend{margin-top:0;font-weight:700;font-family:Roboto Slab,ff-tisa-web-pro,Georgia,Arial,sans-serif}p{line-height:24px;font-size:16px;margin:0 0 24px}h1{font-size:175%}.rst-content .toctree-wrapper>p.caption,h2{font-size:150%}h3{font-size:125%}h4{font-size:115%}h5{font-size:110%}h6{font-size:100%}hr{display:block;height:1px;border:0;border-top:1px solid #e1e4e5;margin:24px 0;padding:0}.rst-content code,.rst-content tt,code{white-space:nowrap;max-width:100%;background:#fff;border:1px solid #e1e4e5;font-size:75%;padding:0 5px;font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace;color:#e74c3c;overflow-x:auto}.rst-content tt.code-large,code.code-large{font-size:90%}.rst-content .section ul,.rst-content .toctree-wrapper ul,.wy-plain-list-disc,article ul{list-style:disc;line-height:24px;margin-bottom:24px}.rst-content .section ul li,.rst-content .toctree-wrapper ul li,.wy-plain-list-disc li,article ul li{list-style:disc;margin-left:24px}.rst-content .section ul li p:last-child,.rst-content .section ul li ul,.rst-content .toctree-wrapper ul li p:last-child,.rst-content .toctree-wrapper ul li ul,.wy-plain-list-disc li p:last-child,.wy-plain-list-disc li ul,article ul li p:last-child,article ul li ul{margin-bottom:0}.rst-content .section ul li li,.rst-content .toctree-wrapper ul li li,.wy-plain-list-disc li li,article ul li li{list-style:circle}.rst-content .section ul li li li,.rst-content .toctree-wrapper ul li li li,.wy-plain-list-disc li li li,article ul li li li{list-style:square}.rst-content .section ul li ol li,.rst-content .toctree-wrapper ul li ol li,.wy-plain-list-disc li ol li,article ul li ol li{list-style:decimal}.rst-content .section ol,.rst-content ol.arabic,.wy-plain-list-decimal,article ol{list-style:decimal;line-height:24px;margin-bottom:24px}.rst-content .section ol li,.rst-content ol.arabic li,.wy-plain-list-decimal li,article ol li{list-style:decimal;margin-left:24px}.rst-content .section ol li p:last-child,.rst-content .section ol li ul,.rst-content ol.arabic li p:last-child,.rst-content ol.arabic li ul,.wy-plain-list-decimal li p:last-child,.wy-plain-list-decimal li ul,article ol li p:last-child,article ol li ul{margin-bottom:0}.rst-content .section ol li ul li,.rst-content ol.arabic li ul li,.wy-plain-list-decimal li ul li,article ol li ul li{list-style:disc}.wy-breadcrumbs{*zoom:1}.wy-breadcrumbs:after,.wy-breadcrumbs:before{display:table;content:""}.wy-breadcrumbs:after{clear:both}.wy-breadcrumbs li{display:inline-block}.wy-breadcrumbs li.wy-breadcrumbs-aside{float:right}.wy-breadcrumbs li a{display:inline-block;padding:5px}.wy-breadcrumbs li a:first-child{padding-left:0}.rst-content .wy-breadcrumbs li tt,.wy-breadcrumbs li .rst-content tt,.wy-breadcrumbs li code{padding:5px;border:none;background:none}.rst-content .wy-breadcrumbs li tt.literal,.wy-breadcrumbs li .rst-content tt.literal,.wy-breadcrumbs li code.literal{color:#404040}.wy-breadcrumbs-extra{margin-bottom:0;color:#b3b3b3;font-size:80%;display:inline-block}@media screen and (max-width:480px){.wy-breadcrumbs-extra,.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}@media print{.wy-breadcrumbs li.wy-breadcrumbs-aside{display:none}}html{font-size:16px}.wy-affix{position:fixed;top:1.618em}.wy-menu a:hover{text-decoration:none}.wy-menu-horiz{*zoom:1}.wy-menu-horiz:after,.wy-menu-horiz:before{display:table;content:""}.wy-menu-horiz:after{clear:both}.wy-menu-horiz li,.wy-menu-horiz ul{display:inline-block}.wy-menu-horiz li:hover{background:hsla(0,0%,100%,.1)}.wy-menu-horiz li.divide-left{border-left:1px solid #404040}.wy-menu-horiz li.divide-right{border-right:1px solid #404040}.wy-menu-horiz a{height:32px;display:inline-block;line-height:32px;padding:0 16px}.wy-menu-vertical{width:300px}.wy-menu-vertical header,.wy-menu-vertical p.caption{color:#55a5d9;height:32px;line-height:32px;padding:0 1.618em;margin:12px 0 0;display:block;font-weight:700;text-transform:uppercase;font-size:85%;white-space:nowrap}.wy-menu-vertical ul{margin-bottom:0}.wy-menu-vertical li.divide-top{border-top:1px solid #404040}.wy-menu-vertical li.divide-bottom{border-bottom:1px solid #404040}.wy-menu-vertical li.current{background:#e3e3e3}.wy-menu-vertical li.current a{color:grey;border-right:1px solid #c9c9c9;padding:.4045em 2.427em}.wy-menu-vertical li.current a:hover{background:#d6d6d6}.rst-content .wy-menu-vertical li tt,.wy-menu-vertical li .rst-content tt,.wy-menu-vertical li code{border:none;background:inherit;color:inherit;padding-left:0;padding-right:0}.wy-menu-vertical li span.toctree-expand{display:block;float:left;margin-left:-1.2em;font-size:.8em;line-height:1.6em;color:#4d4d4d}.wy-menu-vertical li.current>a,.wy-menu-vertical li.on a{color:#404040;font-weight:700;position:relative;background:#fcfcfc;border:none;padding:.4045em 1.618em}.wy-menu-vertical li.current>a:hover,.wy-menu-vertical li.on a:hover{background:#fcfcfc}.wy-menu-vertical li.current>a:hover span.toctree-expand,.wy-menu-vertical li.on a:hover span.toctree-expand{color:grey}.wy-menu-vertical li.current>a span.toctree-expand,.wy-menu-vertical li.on a span.toctree-expand{display:block;font-size:.8em;line-height:1.6em;color:#333}.wy-menu-vertical li.toctree-l1.current>a{border-bottom:1px solid #c9c9c9;border-top:1px solid #c9c9c9}.wy-menu-vertical .toctree-l1.current .toctree-l2>ul,.wy-menu-vertical .toctree-l2.current .toctree-l3>ul,.wy-menu-vertical .toctree-l3.current .toctree-l4>ul,.wy-menu-vertical .toctree-l4.current .toctree-l5>ul,.wy-menu-vertical .toctree-l5.current .toctree-l6>ul,.wy-menu-vertical .toctree-l6.current .toctree-l7>ul,.wy-menu-vertical .toctree-l7.current .toctree-l8>ul,.wy-menu-vertical .toctree-l8.current .toctree-l9>ul,.wy-menu-vertical .toctree-l9.current .toctree-l10>ul,.wy-menu-vertical .toctree-l10.current .toctree-l11>ul{display:none}.wy-menu-vertical .toctree-l1.current .current.toctree-l2>ul,.wy-menu-vertical .toctree-l2.current .current.toctree-l3>ul,.wy-menu-vertical .toctree-l3.current .current.toctree-l4>ul,.wy-menu-vertical .toctree-l4.current .current.toctree-l5>ul,.wy-menu-vertical .toctree-l5.current .current.toctree-l6>ul,.wy-menu-vertical .toctree-l6.current .current.toctree-l7>ul,.wy-menu-vertical .toctree-l7.current .current.toctree-l8>ul,.wy-menu-vertical .toctree-l8.current .current.toctree-l9>ul,.wy-menu-vertical .toctree-l9.current .current.toctree-l10>ul,.wy-menu-vertical .toctree-l10.current .current.toctree-l11>ul{display:block}.wy-menu-vertical li.toctree-l3,.wy-menu-vertical li.toctree-l4{font-size:.9em}.wy-menu-vertical li.toctree-l2 a,.wy-menu-vertical li.toctree-l3 a,.wy-menu-vertical li.toctree-l4 a,.wy-menu-vertical li.toctree-l5 a,.wy-menu-vertical li.toctree-l6 a,.wy-menu-vertical li.toctree-l7 a,.wy-menu-vertical li.toctree-l8 a,.wy-menu-vertical li.toctree-l9 a,.wy-menu-vertical li.toctree-l10 a{color:#404040}.wy-menu-vertical li.toctree-l2 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l3 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l4 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l5 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l6 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l7 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l8 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l9 a:hover span.toctree-expand,.wy-menu-vertical li.toctree-l10 a:hover span.toctree-expand{color:grey}.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a,.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a,.wy-menu-vertical li.toctree-l4.current li.toctree-l5>a,.wy-menu-vertical li.toctree-l5.current li.toctree-l6>a,.wy-menu-vertical li.toctree-l6.current li.toctree-l7>a,.wy-menu-vertical li.toctree-l7.current li.toctree-l8>a,.wy-menu-vertical li.toctree-l8.current li.toctree-l9>a,.wy-menu-vertical li.toctree-l9.current li.toctree-l10>a,.wy-menu-vertical li.toctree-l10.current li.toctree-l11>a{display:block}.wy-menu-vertical li.toctree-l2.current>a{padding:.4045em 2.427em}.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a,.wy-menu-vertical li.toctree-l3.current>a{padding:.4045em 4.045em}.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a,.wy-menu-vertical li.toctree-l4.current>a{padding:.4045em 5.663em}.wy-menu-vertical li.toctree-l4.current li.toctree-l5>a,.wy-menu-vertical li.toctree-l5.current>a{padding:.4045em 7.281em}.wy-menu-vertical li.toctree-l5.current li.toctree-l6>a,.wy-menu-vertical li.toctree-l6.current>a{padding:.4045em 8.899em}.wy-menu-vertical li.toctree-l6.current li.toctree-l7>a,.wy-menu-vertical li.toctree-l7.current>a{padding:.4045em 10.517em}.wy-menu-vertical li.toctree-l7.current li.toctree-l8>a,.wy-menu-vertical li.toctree-l8.current>a{padding:.4045em 12.135em}.wy-menu-vertical li.toctree-l8.current li.toctree-l9>a,.wy-menu-vertical li.toctree-l9.current>a{padding:.4045em 13.753em}.wy-menu-vertical li.toctree-l9.current li.toctree-l10>a,.wy-menu-vertical li.toctree-l10.current>a{padding:.4045em 15.371em}.wy-menu-vertical li.toctree-l10.current li.toctree-l11>a{padding:.4045em 16.989em}.wy-menu-vertical li.toctree-l2.current>a,.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a{background:#c9c9c9}.wy-menu-vertical li.toctree-l2 span.toctree-expand{color:#a3a3a3}.wy-menu-vertical li.toctree-l3.current>a,.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a{background:#bdbdbd}.wy-menu-vertical li.toctree-l3 span.toctree-expand{color:#969696}.wy-menu-vertical li.current ul{display:block}.wy-menu-vertical li ul{margin-bottom:0;display:none}.wy-menu-vertical li ul li a{margin-bottom:0;color:#d9d9d9;font-weight:400}.wy-menu-vertical a{line-height:18px;padding:.4045em 1.618em;display:block;position:relative;font-size:90%;color:#d9d9d9}.wy-menu-vertical a:hover{background-color:#4e4a4a;cursor:pointer}.wy-menu-vertical a:hover span.toctree-expand{color:#d9d9d9}.wy-menu-vertical a:active{background-color:#2980b9;cursor:pointer;color:#fff}.wy-menu-vertical a:active span.toctree-expand{color:#fff}.wy-side-nav-search{display:block;width:300px;padding:.809em;margin-bottom:.809em;z-index:200;background-color:#2980b9;text-align:center;color:#fcfcfc}.wy-side-nav-search input[type=text]{width:100%;border-radius:50px;padding:6px 12px;border-color:#2472a4}.wy-side-nav-search img{display:block;margin:auto auto .809em;height:45px;width:45px;background-color:#2980b9;padding:5px;border-radius:100%}.wy-side-nav-search .wy-dropdown>a,.wy-side-nav-search>a{color:#fcfcfc;font-size:100%;font-weight:700;display:inline-block;padding:4px 6px;margin-bottom:.809em}.wy-side-nav-search .wy-dropdown>a:hover,.wy-side-nav-search>a:hover{background:hsla(0,0%,100%,.1)}.wy-side-nav-search .wy-dropdown>a img.logo,.wy-side-nav-search>a img.logo{display:block;margin:0 auto;height:auto;width:auto;border-radius:0;max-width:100%;background:transparent}.wy-side-nav-search .wy-dropdown>a.icon img.logo,.wy-side-nav-search>a.icon img.logo{margin-top:.85em}.wy-side-nav-search>div.version{margin-top:-.4045em;margin-bottom:.809em;font-weight:400;color:hsla(0,0%,100%,.3)}.wy-nav .wy-menu-vertical header{color:#2980b9}.wy-nav .wy-menu-vertical a{color:#b3b3b3}.wy-nav .wy-menu-vertical a:hover{background-color:#2980b9;color:#fff}[data-menu-wrap]{-webkit-transition:all .2s ease-in;-moz-transition:all .2s ease-in;transition:all .2s ease-in;position:absolute;opacity:1;width:100%;opacity:0}[data-menu-wrap].move-center{left:0;right:auto;opacity:1}[data-menu-wrap].move-left{right:auto;left:-100%;opacity:0}[data-menu-wrap].move-right{right:-100%;left:auto;opacity:0}.wy-body-for-nav{background:#fcfcfc}.wy-grid-for-nav{position:absolute;width:100%;height:100%}.wy-nav-side{position:fixed;top:0;bottom:0;left:0;padding-bottom:2em;width:300px;overflow-x:hidden;overflow-y:hidden;min-height:100%;color:#9b9b9b;background:#343131;z-index:200}.wy-side-scroll{width:320px;position:relative;overflow-x:hidden;overflow-y:scroll;height:100%}.wy-nav-top{display:none;background:#2980b9;color:#fff;padding:.4045em .809em;position:relative;line-height:50px;text-align:center;font-size:100%;*zoom:1}.wy-nav-top:after,.wy-nav-top:before{display:table;content:""}.wy-nav-top:after{clear:both}.wy-nav-top a{color:#fff;font-weight:700}.wy-nav-top img{margin-right:12px;height:45px;width:45px;background-color:#2980b9;padding:5px;border-radius:100%}.wy-nav-top i{font-size:30px;float:left;cursor:pointer;padding-top:inherit}.wy-nav-content-wrap{margin-left:300px;background:#fcfcfc;min-height:100%}.wy-nav-content{padding:1.618em 3.236em;height:100%;max-width:800px;margin:auto}.wy-body-mask{position:fixed;width:100%;height:100%;background:rgba(0,0,0,.2);display:none;z-index:499}.wy-body-mask.on{display:block}footer{color:grey}footer p{margin-bottom:12px}.rst-content footer span.commit tt,footer span.commit .rst-content tt,footer span.commit code{padding:0;font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace;font-size:1em;background:none;border:none;color:grey}.rst-footer-buttons{*zoom:1}.rst-footer-buttons:after,.rst-footer-buttons:before{width:100%;display:table;content:""}.rst-footer-buttons:after{clear:both}.rst-breadcrumbs-buttons{margin-top:12px;*zoom:1}.rst-breadcrumbs-buttons:after,.rst-breadcrumbs-buttons:before{display:table;content:""}.rst-breadcrumbs-buttons:after{clear:both}#search-results .search li{margin-bottom:24px;border-bottom:1px solid #e1e4e5;padding-bottom:24px}#search-results .search li:first-child{border-top:1px solid #e1e4e5;padding-top:24px}#search-results .search li a{font-size:120%;margin-bottom:12px;display:inline-block}#search-results .context{color:grey;font-size:90%}.genindextable li>ul{margin-left:24px}@media screen and (max-width:768px){.wy-body-for-nav{background:#fcfcfc}.wy-nav-top{display:block}.wy-nav-side{left:-300px}.wy-nav-side.shift{width:85%;left:0}.wy-menu.wy-menu-vertical,.wy-side-nav-search,.wy-side-scroll{width:auto}.wy-nav-content-wrap{margin-left:0}.wy-nav-content-wrap .wy-nav-content{padding:1.618em}.wy-nav-content-wrap.shift{position:fixed;min-width:100%;left:85%;top:0;height:100%;overflow:hidden}}@media screen and (min-width:1100px){.wy-nav-content-wrap{background:rgba(0,0,0,.05)}.wy-nav-content{margin:0;background:#fcfcfc}}@media print{.rst-versions,.wy-nav-side,footer{display:none}.wy-nav-content-wrap{margin-left:0}}.rst-versions{position:fixed;bottom:0;left:0;width:300px;color:#fcfcfc;background:#1f1d1d;font-family:Lato,proxima-nova,Helvetica Neue,Arial,sans-serif;z-index:400}.rst-versions a{color:#2980b9;text-decoration:none}.rst-versions .rst-badge-small{display:none}.rst-versions .rst-current-version{padding:12px;background-color:#272525;display:block;text-align:right;font-size:90%;cursor:pointer;color:#27ae60;*zoom:1}.rst-versions .rst-current-version:after,.rst-versions .rst-current-version:before{display:table;content:""}.rst-versions .rst-current-version:after{clear:both}.rst-content .code-block-caption .rst-versions .rst-current-version .headerlink,.rst-content .rst-versions .rst-current-version .admonition-title,.rst-content code.download .rst-versions .rst-current-version span:first-child,.rst-content dl dt .rst-versions .rst-current-version .headerlink,.rst-content h1 .rst-versions .rst-current-version .headerlink,.rst-content h2 .rst-versions .rst-current-version .headerlink,.rst-content h3 .rst-versions .rst-current-version .headerlink,.rst-content h4 .rst-versions .rst-current-version .headerlink,.rst-content h5 .rst-versions .rst-current-version .headerlink,.rst-content h6 .rst-versions .rst-current-version .headerlink,.rst-content p.caption .rst-versions .rst-current-version .headerlink,.rst-content table>caption .rst-versions .rst-current-version .headerlink,.rst-content tt.download .rst-versions .rst-current-version span:first-child,.rst-versions .rst-current-version .fa,.rst-versions .rst-current-version .icon,.rst-versions .rst-current-version .rst-content .admonition-title,.rst-versions .rst-current-version .rst-content .code-block-caption .headerlink,.rst-versions .rst-current-version .rst-content code.download span:first-child,.rst-versions .rst-current-version .rst-content dl dt .headerlink,.rst-versions .rst-current-version .rst-content h1 .headerlink,.rst-versions .rst-current-version .rst-content h2 .headerlink,.rst-versions .rst-current-version .rst-content h3 .headerlink,.rst-versions .rst-current-version .rst-content h4 .headerlink,.rst-versions .rst-current-version .rst-content h5 .headerlink,.rst-versions .rst-current-version .rst-content h6 .headerlink,.rst-versions .rst-current-version .rst-content p.caption .headerlink,.rst-versions .rst-current-version .rst-content table>caption .headerlink,.rst-versions .rst-current-version .rst-content tt.download span:first-child,.rst-versions .rst-current-version .wy-menu-vertical li span.toctree-expand,.wy-menu-vertical li .rst-versions .rst-current-version span.toctree-expand{color:#fcfcfc}.rst-versions .rst-current-version .fa-book,.rst-versions .rst-current-version .icon-book{float:left}.rst-versions .rst-current-version.rst-out-of-date{background-color:#e74c3c;color:#fff}.rst-versions .rst-current-version.rst-active-old-version{background-color:#f1c40f;color:#000}.rst-versions.shift-up{height:auto;max-height:100%;overflow-y:scroll}.rst-versions.shift-up .rst-other-versions{display:block}.rst-versions .rst-other-versions{font-size:90%;padding:12px;color:grey;display:none}.rst-versions .rst-other-versions hr{display:block;height:1px;border:0;margin:20px 0;padding:0;border-top:1px solid #413d3d}.rst-versions .rst-other-versions dd{display:inline-block;margin:0}.rst-versions .rst-other-versions dd a{display:inline-block;padding:6px;color:#fcfcfc}.rst-versions.rst-badge{width:auto;bottom:20px;right:20px;left:auto;border:none;max-width:300px;max-height:90%}.rst-versions.rst-badge .fa-book,.rst-versions.rst-badge .icon-book{float:none;line-height:30px}.rst-versions.rst-badge.shift-up .rst-current-version{text-align:right}.rst-versions.rst-badge.shift-up .rst-current-version .fa-book,.rst-versions.rst-badge.shift-up .rst-current-version .icon-book{float:left}.rst-versions.rst-badge>.rst-current-version{width:auto;height:30px;line-height:30px;padding:0 6px;display:block;text-align:center}@media screen and (max-width:768px){.rst-versions{width:85%;display:none}.rst-versions.shift{display:block}}.rst-content img{max-width:100%;height:auto}.rst-content div.figure{margin-bottom:24px}.rst-content div.figure p.caption{font-style:italic}.rst-content div.figure p:last-child.caption{margin-bottom:0}.rst-content div.figure.align-center{text-align:center}.rst-content .section>a>img,.rst-content .section>img{margin-bottom:24px}.rst-content abbr[title]{text-decoration:none}.rst-content.style-external-links a.reference.external:after{font-family:FontAwesome;content:"\f08e";color:#b3b3b3;vertical-align:super;font-size:60%;margin:0 .2em}.rst-content blockquote{margin-left:24px;line-height:24px;margin-bottom:24px}.rst-content pre.literal-block{white-space:pre;margin:0;padding:12px;font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace;display:block;overflow:auto}.rst-content div[class^=highlight],.rst-content pre.literal-block{border:1px solid #e1e4e5;overflow-x:auto;margin:1px 0 24px}.rst-content div[class^=highlight] div[class^=highlight],.rst-content pre.literal-block div[class^=highlight]{padding:0;border:none;margin:0}.rst-content div[class^=highlight] td.code{width:100%}.rst-content .linenodiv pre{border-right:1px solid #e6e9ea;margin:0;padding:12px;font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace;user-select:none;pointer-events:none}.rst-content div[class^=highlight] pre{white-space:pre;margin:0;padding:12px;display:block;overflow:auto}.rst-content div[class^=highlight] pre .hll{display:block;margin:0 -12px;padding:0 12px}.rst-content .linenodiv pre,.rst-content div[class^=highlight] pre,.rst-content pre.literal-block{font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace;font-size:12px;line-height:1.4}.rst-content div.highlight .gp{user-select:none;pointer-events:none}.rst-content .code-block-caption{font-style:italic;font-size:85%;line-height:1;padding:1em 0;text-align:center}@media print{.rst-content .codeblock,.rst-content div[class^=highlight],.rst-content div[class^=highlight] pre{white-space:pre-wrap}}.rst-content .admonition,.rst-content .admonition-todo,.rst-content .attention,.rst-content .caution,.rst-content .danger,.rst-content .error,.rst-content .hint,.rst-content .important,.rst-content .note,.rst-content .seealso,.rst-content .tip,.rst-content .warning{clear:both}.rst-content .admonition-todo .last,.rst-content .admonition-todo>:last-child,.rst-content .admonition .last,.rst-content .admonition>:last-child,.rst-content .attention .last,.rst-content .attention>:last-child,.rst-content .caution .last,.rst-content .caution>:last-child,.rst-content .danger .last,.rst-content .danger>:last-child,.rst-content .error .last,.rst-content .error>:last-child,.rst-content .hint .last,.rst-content .hint>:last-child,.rst-content .important .last,.rst-content .important>:last-child,.rst-content .note .last,.rst-content .note>:last-child,.rst-content .seealso .last,.rst-content .seealso>:last-child,.rst-content .tip .last,.rst-content .tip>:last-child,.rst-content .warning .last,.rst-content .warning>:last-child{margin-bottom:0}.rst-content .admonition-title:before{margin-right:4px}.rst-content .admonition table{border-color:rgba(0,0,0,.1)}.rst-content .admonition table td,.rst-content .admonition table th{background:transparent!important;border-color:rgba(0,0,0,.1)!important}.rst-content .section ol.loweralpha,.rst-content .section ol.loweralpha>li{list-style:lower-alpha}.rst-content .section ol.upperalpha,.rst-content .section ol.upperalpha>li{list-style:upper-alpha}.rst-content .section ol li>*,.rst-content .section ul li>*{margin-top:12px;margin-bottom:12px}.rst-content .section ol li>:first-child,.rst-content .section ul li>:first-child{margin-top:0}.rst-content .section ol li>p,.rst-content .section ol li>p:last-child,.rst-content .section ul li>p,.rst-content .section ul li>p:last-child{margin-bottom:12px}.rst-content .section ol li>p:only-child,.rst-content .section ol li>p:only-child:last-child,.rst-content .section ul li>p:only-child,.rst-content .section ul li>p:only-child:last-child{margin-bottom:0}.rst-content .section ol li>ol,.rst-content .section ol li>ul,.rst-content .section ul li>ol,.rst-content .section ul li>ul{margin-bottom:12px}.rst-content .section ol.simple li>*,.rst-content .section ol.simple li ol,.rst-content .section ol.simple li ul,.rst-content .section ul.simple li>*,.rst-content .section ul.simple li ol,.rst-content .section ul.simple li ul{margin-top:0;margin-bottom:0}.rst-content .line-block{margin-left:0;margin-bottom:24px;line-height:24px}.rst-content .line-block .line-block{margin-left:24px;margin-bottom:0}.rst-content .topic-title{font-weight:700;margin-bottom:12px}.rst-content .toc-backref{color:#404040}.rst-content .align-right{float:right;margin:0 0 24px 24px}.rst-content .align-left{float:left;margin:0 24px 24px 0}.rst-content .align-center{margin:auto}.rst-content .align-center:not(table){display:block}.rst-content .code-block-caption .headerlink,.rst-content .toctree-wrapper>p.caption .headerlink,.rst-content dl dt .headerlink,.rst-content h1 .headerlink,.rst-content h2 .headerlink,.rst-content h3 .headerlink,.rst-content h4 .headerlink,.rst-content h5 .headerlink,.rst-content h6 .headerlink,.rst-content p.caption .headerlink,.rst-content table>caption .headerlink{visibility:hidden;font-size:14px}.rst-content .code-block-caption .headerlink:after,.rst-content .toctree-wrapper>p.caption .headerlink:after,.rst-content dl dt .headerlink:after,.rst-content h1 .headerlink:after,.rst-content h2 .headerlink:after,.rst-content h3 .headerlink:after,.rst-content h4 .headerlink:after,.rst-content h5 .headerlink:after,.rst-content h6 .headerlink:after,.rst-content p.caption .headerlink:after,.rst-content table>caption .headerlink:after{content:"\f0c1";font-family:FontAwesome}.rst-content .code-block-caption:hover .headerlink:after,.rst-content .toctree-wrapper>p.caption:hover .headerlink:after,.rst-content dl dt:hover .headerlink:after,.rst-content h1:hover .headerlink:after,.rst-content h2:hover .headerlink:after,.rst-content h3:hover .headerlink:after,.rst-content h4:hover .headerlink:after,.rst-content h5:hover .headerlink:after,.rst-content h6:hover .headerlink:after,.rst-content p.caption:hover .headerlink:after,.rst-content table>caption:hover .headerlink:after{visibility:visible}.rst-content table>caption .headerlink:after{font-size:12px}.rst-content .centered{text-align:center}.rst-content .sidebar{float:right;width:40%;display:block;margin:0 0 24px 24px;padding:24px;background:#f3f6f6;border:1px solid #e1e4e5}.rst-content .sidebar dl,.rst-content .sidebar p,.rst-content .sidebar ul{font-size:90%}.rst-content .sidebar .last,.rst-content .sidebar>:last-child{margin-bottom:0}.rst-content .sidebar .sidebar-title{display:block;font-family:Roboto Slab,ff-tisa-web-pro,Georgia,Arial,sans-serif;font-weight:700;background:#e1e4e5;padding:6px 12px;margin:-24px -24px 24px;font-size:100%}.rst-content .highlighted{background:#f1c40f;box-shadow:0 0 0 2px #f1c40f;display:inline;font-weight:700}.rst-content .citation-reference,.rst-content .footnote-reference{vertical-align:baseline;position:relative;top:-.4em;line-height:0;font-size:90%}.rst-content .hlist{width:100%}html.writer-html4 .rst-content table.docutils.citation,html.writer-html4 .rst-content table.docutils.footnote{background:none;border:none}html.writer-html4 .rst-content table.docutils.citation td,html.writer-html4 .rst-content table.docutils.citation tr,html.writer-html4 .rst-content table.docutils.footnote td,html.writer-html4 .rst-content table.docutils.footnote tr{border:none;background-color:transparent!important;white-space:normal}html.writer-html4 .rst-content table.docutils.citation td.label,html.writer-html4 .rst-content table.docutils.footnote td.label{padding-left:0;padding-right:0;vertical-align:top}html.writer-html5 .rst-content dl dt span.classifier:before{content:" : "}html.writer-html5 .rst-content dl.field-list,html.writer-html5 .rst-content dl.footnote{display:grid;grid-template-columns:max-content auto}html.writer-html5 .rst-content dl.field-list>dt,html.writer-html5 .rst-content dl.footnote>dt{padding-left:1rem}html.writer-html5 .rst-content dl.field-list>dt:after,html.writer-html5 .rst-content dl.footnote>dt:after{content:":"}html.writer-html5 .rst-content dl.field-list>dd,html.writer-html5 .rst-content dl.field-list>dt,html.writer-html5 .rst-content dl.footnote>dd,html.writer-html5 .rst-content dl.footnote>dt{margin-bottom:0}html.writer-html5 .rst-content dl.footnote{font-size:.9rem}html.writer-html5 .rst-content dl.footnote>dt{margin:0 .5rem .5rem 0;line-height:1.2rem;word-break:break-all;font-weight:400}html.writer-html5 .rst-content dl.footnote>dt>span.brackets{margin-right:.5rem}html.writer-html5 .rst-content dl.footnote>dt>span.brackets:before{content:"["}html.writer-html5 .rst-content dl.footnote>dt>span.brackets:after{content:"]"}html.writer-html5 .rst-content dl.footnote>dt>span.fn-backref{font-style:italic}html.writer-html5 .rst-content dl.footnote>dd{margin:0 0 .5rem;line-height:1.2rem}html.writer-html5 .rst-content dl.footnote>dd p,html.writer-html5 .rst-content dl.option-list kbd{font-size:.9rem}.rst-content table.docutils.footnote,html.writer-html4 .rst-content table.docutils.citation,html.writer-html5 .rst-content dl.footnote{color:grey}.rst-content table.docutils.footnote code,.rst-content table.docutils.footnote tt,html.writer-html4 .rst-content table.docutils.citation code,html.writer-html4 .rst-content table.docutils.citation tt,html.writer-html5 .rst-content dl.footnote code,html.writer-html5 .rst-content dl.footnote tt{color:#555}.rst-content .wy-table-responsive.citation,.rst-content .wy-table-responsive.footnote{margin-bottom:0}.rst-content .wy-table-responsive.citation+:not(.citation),.rst-content .wy-table-responsive.footnote+:not(.footnote){margin-top:24px}.rst-content .wy-table-responsive.citation:last-child,.rst-content .wy-table-responsive.footnote:last-child{margin-bottom:24px}.rst-content table.docutils th{border-color:#e1e4e5}html.writer-html5 .rst-content table.docutils th{border:1px solid #e1e4e5}html.writer-html5 .rst-content table.docutils td>p,html.writer-html5 .rst-content table.docutils th>p{line-height:1rem;margin-bottom:0;font-size:.9rem}.rst-content table.docutils td .last,.rst-content table.docutils td .last>:last-child{margin-bottom:0}.rst-content table.field-list,.rst-content table.field-list td{border:none}.rst-content table.field-list td p{font-size:inherit;line-height:inherit}.rst-content table.field-list td>strong{display:inline-block}.rst-content table.field-list .field-name{padding-right:10px;text-align:left;white-space:nowrap}.rst-content table.field-list .field-body{text-align:left}.rst-content code,.rst-content tt{color:#000;font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace;padding:2px 5px}.rst-content code big,.rst-content code em,.rst-content tt big,.rst-content tt em{font-size:100%!important;line-height:normal}.rst-content code.literal,.rst-content tt.literal{color:#e74c3c}.rst-content code.xref,.rst-content tt.xref,a .rst-content code,a .rst-content tt{font-weight:700;color:#404040}.rst-content kbd,.rst-content pre,.rst-content samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,Courier,monospace}.rst-content a code,.rst-content a tt{color:#2980b9}.rst-content dl{margin-bottom:24px}.rst-content dl dt{font-weight:700;margin-bottom:12px}.rst-content dl ol,.rst-content dl p,.rst-content dl table,.rst-content dl ul{margin-bottom:12px}.rst-content dl dd{margin:0 0 12px 24px;line-height:24px}html.writer-html4 .rst-content dl:not(.docutils),html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple){margin-bottom:24px}html.writer-html4 .rst-content dl:not(.docutils)>dt,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple)>dt{display:table;margin:6px 0;font-size:90%;line-height:normal;background:#e7f2fa;color:#2980b9;border-top:3px solid #6ab0de;padding:6px;position:relative}html.writer-html4 .rst-content dl:not(.docutils)>dt:before,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple)>dt:before{color:#6ab0de}html.writer-html4 .rst-content dl:not(.docutils)>dt .headerlink,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple)>dt .headerlink{color:#404040;font-size:100%!important}html.writer-html4 .rst-content dl:not(.docutils) dl:not(.field-list)>dt,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) dl:not(.field-list)>dt{margin-bottom:6px;border:none;border-left:3px solid #ccc;background:#f0f0f0;color:#555}html.writer-html4 .rst-content dl:not(.docutils) dl:not(.field-list)>dt .headerlink,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) dl:not(.field-list)>dt .headerlink{color:#404040;font-size:100%!important}html.writer-html4 .rst-content dl:not(.docutils)>dt:first-child,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple)>dt:first-child{margin-top:0}html.writer-html4 .rst-content dl:not(.docutils) code,html.writer-html4 .rst-content dl:not(.docutils) tt,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) code,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) tt{font-weight:700}html.writer-html4 .rst-content dl:not(.docutils) code.descclassname,html.writer-html4 .rst-content dl:not(.docutils) code.descname,html.writer-html4 .rst-content dl:not(.docutils) tt.descclassname,html.writer-html4 .rst-content dl:not(.docutils) tt.descname,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) code.descclassname,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) code.descname,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) tt.descclassname,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) tt.descname{background-color:transparent;border:none;padding:0;font-size:100%!important}html.writer-html4 .rst-content dl:not(.docutils) code.descname,html.writer-html4 .rst-content dl:not(.docutils) tt.descname,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) code.descname,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) tt.descname{font-weight:700}html.writer-html4 .rst-content dl:not(.docutils) .optional,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) .optional{display:inline-block;padding:0 4px;color:#000;font-weight:700}html.writer-html4 .rst-content dl:not(.docutils) .property,html.writer-html5 .rst-content dl[class]:not(.option-list):not(.field-list):not(.footnote):not(.glossary):not(.simple) .property{display:inline-block;padding-right:8px}.rst-content .viewcode-back,.rst-content .viewcode-link{display:inline-block;color:#27ae60;font-size:80%;padding-left:24px}.rst-content .viewcode-back{display:block;float:right}.rst-content p.rubric{margin-bottom:12px;font-weight:700}.rst-content code.download,.rst-content tt.download{background:inherit;padding:inherit;font-weight:400;font-family:inherit;font-size:inherit;color:inherit;border:inherit;white-space:inherit}.rst-content code.download span:first-child,.rst-content tt.download span:first-child{-webkit-font-smoothing:subpixel-antialiased}.rst-content code.download span:first-child:before,.rst-content tt.download span:first-child:before{margin-right:4px}.rst-content .guilabel{border:1px solid #7fbbe3;background:#e7f2fa;font-size:80%;font-weight:700;border-radius:4px;padding:2.4px 6px;margin:auto 2px}.rst-content .versionmodified{font-style:italic}@media screen and (max-width:480px){.rst-content .sidebar{width:100%}}span[id*=MathJax-Span]{color:#404040}.math{text-align:center}@font-face{font-family:Lato;src:url(fonts/lato-normal.woff2?bd03a2cc277bbbc338d464e679fe9942) format("woff2"),url(fonts/lato-normal.woff?27bd77b9162d388cb8d4c4217c7c5e2a) format("woff");font-weight:400;font-style:normal;font-display:block}@font-face{font-family:Lato;src:url(fonts/lato-bold.woff2?cccb897485813c7c256901dbca54ecf2) format("woff2"),url(fonts/lato-bold.woff?d878b6c29b10beca227e9eef4246111b) format("woff");font-weight:700;font-style:normal;font-display:block}@font-face{font-family:Lato;src:url(fonts/lato-bold-italic.woff2?0b6bb6725576b072c5d0b02ecdd1900d) format("woff2"),url(fonts/lato-bold-italic.woff?9c7e4e9eb485b4a121c760e61bc3707c) format("woff");font-weight:700;font-style:italic;font-display:block}@font-face{font-family:Lato;src:url(fonts/lato-normal-italic.woff2?4eb103b4d12be57cb1d040ed5e162e9d) format("woff2"),url(fonts/lato-normal-italic.woff?f28f2d6482446544ef1ea1ccc6dd5892) format("woff");font-weight:400;font-style:italic;font-display:block}@font-face{font-family:Roboto Slab;font-style:normal;font-weight:400;src:url(fonts/Roboto-Slab-Regular.woff2?7abf5b8d04d26a2cafea937019bca958) format("woff2"),url(fonts/Roboto-Slab-Regular.woff?c1be9284088d487c5e3ff0a10a92e58c) format("woff");font-display:block}@font-face{font-family:Roboto Slab;font-style:normal;font-weight:700;src:url(fonts/Roboto-Slab-Bold.woff2?9984f4a9bda09be08e83f2506954adbe) format("woff2"),url(fonts/Roboto-Slab-Bold.woff?bed5564a116b05148e3b3bea6fb1162a) format("woff");font-display:block}
\ No newline at end of file
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/theme.css.map mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/theme.css.map
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/theme.css.map	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/css/theme.css.map	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-{
-"version": 3,
-"mappings": "CACE,AAAE,ECQI,iBAAoB,EDPJ,SAAU,ECY1B,cAAiB,EDZD,SAAU,EC2B1B,SAAY,ED3BI,SAAU,EEFlC,uEAAiF,EAC/E,MAAO,EAAE,IAAK,EAEhB,iBAAoB,EAClB,MAAO,EAAE,WAAY,EACrB,OAAQ,EAAE,KAAM,EAChB,IAAK,EAAE,AAAC,EAEV,oBAAqB,EACnB,MAAO,EAAE,GAAI,EAEf,OAAQ,EACN,MAAO,EAAE,GAAI,EAEf,AAAC,EDLO,iBAAoB,ECMd,SAAU,EDDhB,cAAiB,ECCX,SAAU,EDchB,SAAY,ECdN,SAAU,EAExB,GAAI,EACF,QAAS,EAAE,GAAI,EACf,uBAAwB,EAAE,GAAI,EAC9B,mBAAoB,EAAE,GAAI,EAE5B,GAAI,EACF,KAAM,EAAE,AAAC,EAEX,eAAiB,EACf,MAAO,EAAE,AAAC,EAEZ,UAAW,EACT,YAAa,EAAE,SAAU,EAE3B,OAAS,EACP,UAAW,EAAE,GAAI,EAEnB,SAAU,EACR,KAAM,EAAE,AAAC,EAEX,EAAG,EACD,SAAU,EAAE,KAAM,EAGpB,EAAG,EACD,SAAU,EAAE,GAAI,EAChB,IAAK,EAAE,GAAI,EACX,cAAe,EAAE,GAAI,EAEvB,GAAI,EACF,SAAU,EAAE,GAAI,EAChB,IAAK,EAAE,GAAI,EACX,SAAU,EAAE,KAAM,EAClB,UAAW,EAAE,GAAI,EAEnB,kDAAoB,EAClB,UAAW,EAAE,cAAS,EACtB,WAAY,EAAE,sBAAa,EAC3B,QAAS,EAAE,EAAG,EAEhB,EAAG,EACD,UAAW,EAAE,EAAG,EAElB,AAAC,EACC,KAAM,EAAE,GAAI,EAEd,eAAiB,EACf,MAAO,EAAE,CAAE,EACX,MAAO,EAAE,GAAI,EAEf,IAAK,EACH,QAAS,EAAE,EAAG,EAEhB,MAAQ,EACN,QAAS,EAAE,EAAG,EACd,UAAW,EAAE,AAAC,EACd,OAAQ,EAAE,OAAQ,EAClB,aAAc,EAAE,OAAQ,EAE1B,EAAG,EACD,EAAG,EAAE,KAAM,EAEb,EAAG,EACD,KAAM,EAAE,MAAO,EAEjB,OAAU,EACR,KAAM,EAAE,AAAC,EACT,MAAO,EAAE,AAAC,EACV,SAAU,EAAE,GAAI,EAChB,eAAgB,EAAE,GAAI,EAExB,CAAE,EACA,SAAU,EAAE,GAAI,EAElB,CAAE,EACA,KAAM,EAAE,AAAC,EAEX,EAAG,EACD,KAAM,EAAE,AAAC,EACT,qBAAsB,EAAE,MAAO,EAC/B,aAAc,EAAE,KAAM,EACtB,QAAS,EAAE,GAAI,EAEjB,aAAc,EACZ,OAAQ,EAAE,KAAM,EAElB,KAAM,EACJ,KAAM,EAAE,AAAC,EAEX,GAAI,EACF,KAAM,EAAE,AAAC,EAEX,OAAQ,EACN,KAAM,EAAE,AAAC,EACT,KAAM,EAAE,AAAC,EACT,MAAO,EAAE,AAAC,EAEZ,IAAK,EACH,KAAM,EAAE,MAAO,EAEjB,KAAM,EACJ,KAAM,EAAE,AAAC,EACT,WAAY,EAAE,GAAI,EAClB,MAAO,EAAE,AAAC,EACV,UAAW,EAAE,KAAM,EAErB,2BAA+B,EAC7B,QAAS,EAAE,GAAI,EACf,KAAM,EAAE,AAAC,EACT,aAAc,EAAE,OAAQ,EACxB,cAAe,EAAE,KAAM,EAEzB,WAAa,EACX,UAAW,EAAE,KAAM,EAErB,mEAAuE,EACrE,KAAM,EAAE,MAAO,EACf,iBAAkB,EAAE,KAAM,EAC1B,QAAS,EAAE,MAAO,EAEpB,+BAAiC,EAC/B,KAAM,EAAE,MAAO,EAEjB,yCAA2C,EACzC,SAAU,EAAE,SAAU,EACtB,MAAO,EAAE,AAAC,EACV,KAAM,EAAE,GAAI,EACZ,MAAO,EAAE,GAAI,EAEf,mBAAoB,EAClB,iBAAkB,EAAE,QAAS,EAC7B,cAAe,EAAE,UAAW,EAC5B,iBAAkB,EAAE,UAAW,EAC/B,SAAU,EAAE,UAAW,EAEzB,iGAAmG,EACjG,iBAAkB,EAAE,GAAI,EAE1B,+CAAiD,EAC/C,KAAM,EAAE,AAAC,EACT,MAAO,EAAE,AAAC,EAEZ,OAAQ,EACN,OAAQ,EAAE,GAAI,EACd,aAAc,EAAE,EAAG,EACnB,KAAM,EAAE,OAAQ,EAElB,IAAK,EACH,cAAe,EAAE,OAAQ,EACzB,aAAc,EAAE,AAAC,EAEnB,CAAE,EACA,aAAc,EAAE,EAAG,EAErB,WAAY,EACV,KAAM,EAAE,MAAO,EACf,SAAU,EAAE,GAAI,EAChB,IAAK,EAAE,GAAK,EACZ,MAAO,EAAE,MAAO,EAElB,EAAG,EACD,MAAO,EAAE,IAAK,EACd,KAAM,EAAE,AAAC,EACT,UAAW,EAAE,KAAM,EACnB,OAAQ,EAAE,KAAM,EAChB,eAAgB,EAAE,UAAW,EAC7B,gBAAiB,EAAE,QAAS,EAC5B,SAAU,EAAE,GAAI,EAChB,QAAS,EAAE,EAAG,EACd,WAAY,EAAE,AAAC,EAEjB,KAAM,EACJ,MAAO,EAAE,GAAI,EAEf,MAAO,EACL,MAAO,EAAE,cAAe,EACxB,SAAU,EAAE,KAAM,EAEpB,cAAe,EACb,KAAM,EAAE,AAAC,EACT,GAAI,EAAE,YAAa,EACnB,KAAM,EAAE,EAAG,EACX,KAAM,EAAE,GAAI,EACZ,OAAQ,EAAE,KAAM,EAChB,MAAO,EAAE,AAAC,EACV,OAAQ,EAAE,OAAQ,EAClB,IAAK,EAAE,EAAG,EAEZ,+DAAiE,EAC/D,GAAI,EAAE,GAAI,EACV,KAAM,EAAE,GAAI,EACZ,KAAM,EAAE,AAAC,EACT,OAAQ,EAAE,MAAO,EACjB,OAAQ,EAAE,KAAM,EAChB,IAAK,EAAE,GAAI,EAEb,SAAU,EACR,SAAU,EAAE,KAAM,EAEpB,QAAS,EACP,OAAQ,EAAE,OAAQ,EAEpB,QAAU,EACR,QAAS,EAAE,GAAI,EAEjB,WAAY,EACV,gBAAmB,EACjB,SAAU,EAAE,cAAe,EAC7B,AAAC,EACC,SAAU,EAAE,cAAe,EAC3B,UAAW,EAAE,cAAe,EAC5B,KAAM,EAAE,cAAe,EACvB,SAAU,EAAE,cAAe,EAC7B,UAAY,EACV,cAAe,EAAE,QAAS,EAC5B,0DAA6D,EAC3D,MAAO,EAAE,CAAE,EACb,aAAe,EACb,gBAAiB,EAAE,IAAK,EAC1B,IAAK,EACH,MAAO,EAAE,iBAAkB,EAC7B,KAAO,EACL,gBAAiB,EAAE,IAAK,EAC1B,EAAG,EACD,QAAS,EAAE,cAAe,QAE1B,KAAM,EAAE,IAAK,EAEf,6BAAS,EACP,MAAO,EAAE,AAAC,EACV,KAAM,EAAE,AAAC,EACX,2BAAM,EACJ,eAAgB,EAAE,IAAK,GChM3B,ykDAAY,EACV,qBAAsB,EAAE,UAAW,EAqDrC,QAAS,EARP,IAAK,EAAE,AAAC,EACR,+BAAS,EAEP,MAAO,EAAE,IAAK,EACd,MAAO,EAAE,CAAE,EACb,cAAO,EACL,IAAK,EAAE,GAAI;;;GC1Gf,UAUC,CATC,WAAW,CAAE,aAAa,CAC1B,GAAG,CAAE,+CAAgE,CACrE,GAAG,CAAE,sSAAmG,CAKxG,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,MAAM,CCTpB,kfAAmB,CACjB,OAAO,CAAE,YAAY,CACrB,IAAI,CAAE,uCAAuC,CAC7C,SAAS,CAAE,OAAO,CAClB,cAAc,CAAE,IAAI,CACpB,sBAAsB,CAAE,WAAW,CACnC,uBAAuB,CAAE,SAAS,CCLpC,MAAsB,CACpB,SAAS,CAAE,SAAS,CACpB,WAAW,CAAE,MAAS,CACtB,cAAc,CAAE,IAAI,CAEtB,MAAsB,CAAE,SAAS,CAAE,GAAG,CACtC,MAAsB,CAAE,SAAS,CAAE,GAAG,CACtC,MAAsB,CAAE,SAAS,CAAE,GAAG,CACtC,MAAsB,CAAE,SAAS,CAAE,GAAG,CCVtC,MAAsB,CACpB,KAAK,CAAE,SAAW,CAClB,UAAU,CAAE,MAAM,CCDpB,MAAsB,CACpB,YAAY,CAAE,CAAC,CACf,WAAW,CCIU,SAAS,CDH9B,eAAe,CAAE,IAAI,CACrB,SAAK,CAAE,QAAQ,CAAE,QAAQ,CAE3B,MAAsB,CACpB,QAAQ,CAAE,QAAQ,CAClB,IAAI,CAAE,UAAa,CACnB,KAAK,CCHgB,SAAS,CDI9B,GAAG,CAAE,SAAU,CACf,UAAU,CAAE,MAAM,CAClB,YAAuB,CACrB,IAAI,CAAE,UAA0B,CEbpC,UAA0B,CACxB,OAAO,CAAE,gBAAgB,CACzB,MAAM,CAAE,iBAA4B,CACpC,aAAa,CAAE,IAAI,CAGrB,WAAY,CAAE,KAAK,CAAE,KAAK,CAC1B,UAAW,CAAE,KAAK,CAAE,IAAI,CAGtB,kpBAAY,CAAE,YAAY,CAAE,IAAI,CAChC,kqBAAa,CAAE,WAAW,CAAE,IAAI,CCXlC,QAAwB,CACtB,iBAAiB,CAAE,0BAA0B,CACrC,SAAS,CAAE,0BAA0B,CAG/C,0BASC,CARC,EAAG,CACD,iBAAiB,CAAE,YAAY,CACvB,SAAS,CAAE,YAAY,CAEjC,IAAK,CACH,iBAAiB,CAAE,cAAc,CACzB,SAAS,CAAE,cAAc,EAIrC,kBASC,CARC,EAAG,CACD,iBAAiB,CAAE,YAAY,CACvB,SAAS,CAAE,YAAY,CAEjC,IAAK,CACH,iBAAiB,CAAE,cAAc,CACzB,SAAS,CAAE,cAAc,ECvBrC,aAA8B,CCU5B,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,aAAgB,CAC/B,aAAa,CAAE,aAAgB,CAC3B,SAAS,CAAE,aAAgB,CDZrC,cAA8B,CCS5B,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,cAAgB,CAC/B,aAAa,CAAE,cAAgB,CAC3B,SAAS,CAAE,cAAgB,CDXrC,cAA8B,CCQ5B,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,cAAgB,CAC/B,aAAa,CAAE,cAAgB,CAC3B,SAAS,CAAE,cAAgB,CDTrC,mBAAmC,CCajC,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,YAAoB,CACnC,aAAa,CAAE,YAAoB,CAC/B,SAAS,CAAE,YAAoB,CDfzC,iBAAmC,CCYjC,MAAM,CAAE,wDAAmE,CAC3E,iBAAiB,CAAE,YAAoB,CACnC,aAAa,CAAE,YAAoB,CAC/B,SAAS,CAAE,YAAoB,CDVzC,+GAIuC,CACrC,MAAM,CAAE,IAAI,CEfd,SAAyB,CACvB,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,YAAY,CACrB,KAAK,CAAE,GAAG,CACV,MAAM,CAAE,GAAG,CACX,WAAW,CAAE,GAAG,CAChB,cAAc,CAAE,MAAM,CAExB,yBAAyD,CACvD,QAAQ,CAAE,QAAQ,CAClB,IAAI,CAAE,CAAC,CACP,KAAK,CAAE,IAAI,CACX,UAAU,CAAE,MAAM,CAEpB,YAA4B,CAAE,WAAW,CAAE,OAAO,CAClD,YAA4B,CAAE,SAAS,CAAE,GAAG,CAC5C,WAA2B,CAAE,KAAK,CLXZ,IAAI,CML1B,gBAAgC,CAAE,OAAO,CNwP1B,GAAO,CMvPtB,gBAAgC,CAAE,OAAO,CNkV1B,GAAO,CMjVtB,qCAAiC,CAAE,OAAO,CNyZ1B,GAAO,CMxZvB,qBAAqC,CAAE,OAAO,CN2K1B,GAAO,CM1K3B,gBAAgC,CAAE,OAAO,CNqQ1B,GAAO,CMpQtB,eAA+B,CAAE,OAAO,CNkc1B,GAAO,CMjcrB,iBAAiC,CAAE,OAAO,CNsc1B,GAAO,CMrcvB,eAA+B,CAAE,OAAO,CN0gB1B,GAAO,CMzgBrB,eAA+B,CAAE,OAAO,CN+M1B,GAAO,CM9MrB,mBAAmC,CAAE,OAAO,CN8d1B,GAAO,CM7dzB,aAA6B,CAAE,OAAO,CN4d1B,GAAO,CM3dnB,kBAAkC,CAAE,OAAO,CN6d1B,GAAO,CM5dxB,gBAAgC,CAAE,OAAO,CN+F1B,GAAO,CM9FtB,mDAEgC,CAAE,OAAO,CNge1B,GAAO,CM/dtB,sBAAsC,CAAE,OAAO,CN6Y1B,GAAO,CM5Y5B,uBAAuC,CAAE,OAAO,CN2Y1B,GAAO,CM1Y7B,oBAAoC,CAAE,OAAO,CNqW1B,GAAO,CMpW1B,iBAAiC,CAAE,OAAO,CNwZ1B,GAAO,CMvZvB,8BAC8B,CAAE,OAAO,CNmH1B,GAAO,CMlHpB,kBAAkC,CAAE,OAAO,CNoe1B,GAAO,CMnexB,iCAA+B,CAAE,OAAO,CNqP1B,GAAO,CMpPrB,iBAAiC,CAAE,OAAO,CNmL1B,GAAO,CMlLvB,kBAAkC,CAAE,OAAO,CNqG1B,GAAO,CMpGxB,eAA+B,CAAE,OAAO,CNqX1B,GAAO,CMpXrB,uHAAmC,CAAE,OAAO,CNyI1B,GAAO,CMxIzB,8BAA8C,CAAE,OAAO,CNG1B,GAAO,CMFpC,4BAA4C,CAAE,OAAO,CNK1B,GAAO,CMJlC,gBAAgC,CAAE,OAAO,CNmP1B,GAAO,CMlPtB,wBAAwC,CAAE,OAAO,CNkV1B,GAAO,CMjV9B,yCACiC,CAAE,OAAO,CNyW1B,GAAO,CMxWvB,kBAAkC,CAAE,OAAO,CNoW1B,GAAO,CMnWxB,mBAAmC,CAAE,OAAO,CNiR1B,GAAO,CMhRzB,eAA+B,CAAE,OAAO,CNoR1B,GAAO,CMnRrB,eAA+B,CAAE,OAAO,CNsL1B,GAAO,CMrLrB,qBAAqC,CAAE,OAAO,CNkO1B,GAAO,CMjO3B,qBAAqC,CAAE,OAAO,CNkf1B,GAAO,CMjf3B,sBAAsC,CAAE,OAAO,CNgf1B,GAAO,CM/e5B,oBAAoC,CAAE,OAAO,CNif1B,GAAO,CMhf1B,iBAAiC,CAAE,OAAO,CNiV1B,GAAO,CMhVvB,kBAAkC,CAAE,OAAO,CNU1B,GAAO,CMTxB,cAA8B,CAAE,OAAO,CNkb1B,GAAO,CMjbpB,eAA+B,CAAE,OAAO,CNkb1B,GAAO,CMjbrB,iCAA+B,CAAE,OAAO,CNyB1B,GAAO,CMxBrB,mBAAmC,CAAE,OAAO,CNyB1B,GAAO,CMxBzB,gBAAgC,CAAE,OAAO,CNwU1B,GAAO,CMvUtB,iBAAiC,CAAE,OAAO,CNqC1B,GAAO,CMpCvB,eAA+B,CAAE,OAAO,CNoL1B,GAAO,CMnLrB,eAA+B,CAAE,OAAO,CNiB1B,GAAO,CMhBrB,iBAAiC,CAAE,OAAO,CNqO1B,GAAO,CMpOvB,sBAAsC,CAAE,OAAO,CN+a1B,GAAO,CM9a5B,qBAAqC,CAAE,OAAO,CN+a1B,GAAO,CM9a3B,qBAAqC,CAAE,OAAO,CN3C1B,GAAO,CM4C3B,uBAAuC,CAAE,OAAO,CN9C1B,GAAO,CM+C7B,sBAAsC,CAAE,OAAO,CN5C1B,GAAO,CM6C5B,wBAAwC,CAAE,OAAO,CN/C1B,GAAO,CMgD9B,eAA+B,CAAE,OAAO,CNwP1B,GAAO,CMvPrB,oCACkC,CAAE,OAAO,CN0R1B,GAAO,CMzRxB,iBAAiC,CAAE,OAAO,CNoN1B,GAAO,CMnNvB,uBAAuC,CAAE,OAAO,CNqd1B,GAAO,CMpd7B,sDAEoC,CAAE,OAAO,CNsS1B,GAAO,CMrS1B,iBAAiC,CAAE,OAAO,CN+R1B,GAAO,CM9RvB,qBAAqC,CAAE,OAAO,CN+P1B,GAAO,CM9P3B,iBAAiC,CAAE,OAAO,CN7D1B,GAAO,CM8DvB,eAA+B,CAAE,OAAO,CN4a1B,GAAO,CM3arB,0CAC0C,CAAE,OAAO,CN4R1B,GAAO,CM3RhC,yBAAyC,CAAE,OAAO,CN2V1B,GAAO,CM1V/B,yBAAyC,CAAE,OAAO,CNqC1B,GAAO,CMpC/B,iBAAiC,CAAE,OAAO,CNlC1B,GAAO,CMmCvB,wBAAwC,CAAE,OAAO,CNmY1B,GAAO,CMlY9B,wBAAwC,CAAE,OAAO,CNkH1B,GAAO,CMjH9B,mBAAmC,CAAE,OAAO,CN9B1B,GAAO,CM+BzB,eAA+B,CAAE,OAAO,CNgS1B,GAAO,CM/RrB,gBAAgC,CAAE,OAAO,CN+Q1B,GAAO,CM9QtB,eAA+B,CAAE,OAAO,CNiY1B,GAAO,CMhYrB,kBAAkC,CAAE,OAAO,CNqJ1B,GAAO,CMpJxB,uBAAuC,CAAE,OAAO,CN6G1B,GAAO,CM5G7B,uBAAuC,CAAE,OAAO,CN4X1B,GAAO,CM3X7B,gBAAgC,CAAE,OAAO,CNoF1B,GAAO,CMnFtB,uBAAuC,CAAE,OAAO,CN+B1B,GAAO,CM9B7B,wBAAwC,CAAE,OAAO,CN+B1B,GAAO,CM9B9B,sBAAsC,CAAE,OAAO,CN4R1B,GAAO,CM3R5B,uBAAuC,CAAE,OAAO,CNkP1B,GAAO,CMjP7B,8FAAuC,CAAE,OAAO,CNsZ1B,GAAO,CMrZ7B,+FAAuC,CAAE,OAAO,CNiB1B,GAAO,CMhB7B,0BAA0C,CAAE,OAAO,CNiS1B,GAAO,CMhShC,sBAAsC,CAAE,OAAO,CNuL1B,GAAO,CMtL5B,qBAAqC,CAAE,OAAO,CNuD1B,GAAO,CMtD3B,yBAAyC,CAAE,OAAO,CNkZ1B,GAAO,CMjZ/B,yBAAyC,CAAE,OAAO,CNa1B,GAAO,CMZ/B,cAA8B,CAAE,OAAO,CNhD1B,GAAO,CMiDpB,qBAAqC,CAAE,OAAO,CN5D1B,GAAO,CM6D3B,sBAAsC,CAAE,OAAO,CN5D1B,GAAO,CM6D5B,mBAAmC,CAAE,OAAO,CN5D1B,GAAO,CM6DzB,qBAAqC,CAAE,OAAO,CNhE1B,GAAO,CMiE3B,wCACgC,CAAE,OAAO,CNyT1B,GAAO,CMxTtB,iBAAiC,CAAE,OAAO,CN+E1B,GAAO,CM9EvB,mBAAmC,CAAE,OAAO,CNuC1B,GAAO,CMtCzB,eAA+B,CAAE,OAAO,CNyQ1B,GAAO,CMxQrB,gBAAgC,CAAE,OAAO,CN+N1B,GAAO,CM9NtB,mBAAmC,CAAE,OAAO,CN/D1B,GAAO,CMgEzB,gNAA6C,CAAE,OAAO,CNwE1B,GAAO,CMvEnC,eAA+B,CAAE,OAAO,CNmI1B,GAAO,CMlIrB,eAA+B,CAAE,OAAO,CNqL1B,GAAO,CMpLrB,iCAA+B,CAAE,OAAO,CNyG1B,GAAO,CMxGrB,cAA8B,CAAE,OAAO,CNyE1B,GAAO,CMxEpB,oBAAoC,CAAE,OAAO,CNyE1B,GAAO,CMxE1B,kDAC+C,CAAE,OAAO,CNkE1B,GAAO,CMjErC,gBAAgC,CAAE,OAAO,CNyP1B,GAAO,CMxPtB,mBAAmC,CAAE,OAAO,CNlC1B,GAAO,CMmCzB,iBAAiC,CAAE,OAAO,CN0Q1B,GAAO,CMzQvB,kBAAkC,CAAE,OAAO,CNmB1B,GAAO,CMlBxB,iBAAiC,CAAE,OAAO,CNqM1B,GAAO,CMpMvB,qBAAqC,CAAE,OAAO,CNH1B,GAAO,CMI3B,uBAAuC,CAAE,OAAO,CNP1B,GAAO,CMQ7B,kBAAkC,CAAE,OAAO,CNiR1B,GAAO,CMhRxB,wBAAwC,CAAE,OAAO,CN2S1B,GAAO,CM1S9B,iBAAiC,CAAE,OAAO,CNoG1B,GAAO,CMnGvB,sBAAsC,CAAE,OAAO,CNqG1B,GAAO,CMpG5B,mBAAmC,CAAE,OAAO,CNpF1B,GAAO,CMqFzB,mBAAmC,CAAE,OAAO,CNtF1B,GAAO,CMuFzB,2CACoC,CAAE,OAAO,CNhF1B,GAAO,CMiF1B,yBAAyC,CAAE,OAAO,CNkY1B,GAAO,CMjY/B,0BAA0C,CAAE,OAAO,CNyD1B,GAAO,CMxDhC,uBAAuC,CAAE,OAAO,CN/C1B,GAAO,CMgD7B,cAA8B,CAAE,OAAO,CNsJ1B,GAAO,CMrJpB,gCAC+B,CAAE,OAAO,CNA1B,GAAO,CMCrB,mBAAmC,CAAE,OAAO,CNG1B,GAAO,CMFzB,sBAAsC,CAAE,OAAO,CNiW1B,GAAO,CMhW5B,wBAAwC,CAAE,OAAO,CN+V1B,GAAO,CM9V9B,oBAAoC,CAAE,OAAO,CN2T1B,GAAO,CM1T1B,kBAAkC,CAAE,OAAO,CN4H1B,GAAO,CM3HxB,mBAAmC,CAAE,OAAO,CN2R1B,GAAO,CM1RzB,0BAA0C,CAAE,OAAO,CNiK1B,GAAO,CMhKhC,qBAAqC,CAAE,OAAO,CNwV1B,GAAO,CMvV3B,wBAAwC,CAAE,OAAO,CNsC1B,GAAO,CMrC9B,kBAAkC,CAAE,OAAO,CNsR1B,GAAO,CMrRxB,iBAAiC,CAAE,OAAO,CNyW1B,GAAO,CMxWvB,wBAAwC,CAAE,OAAO,CNiG1B,GAAO,CMhG9B,iBAAiC,CAAE,OAAO,CNyX1B,GAAO,CMxXvB,kBAAkC,CAAE,OAAO,CN+I1B,GAAO,CM9IxB,gBAAgC,CAAE,OAAO,CN6M1B,GAAO,CM5MtB,mBAAmC,CAAE,OAAO,CN2S1B,GAAO,CM1SzB,qBAAqC,CAAE,OAAO,CNjF1B,GAAO,CMkF3B,uBAAuC,CAAE,OAAO,CN2M1B,GAAO,CM1M7B,kBAAkC,CAAE,OAAO,CNyW1B,GAAO,CMxWxB,mBAAmC,CAAE,OAAO,CNgC1B,GAAO,CM/BzB,qCAAiC,CAAE,OAAO,CNsF1B,GAAO,CMrFvB,iBAAiC,CAAE,OAAO,CN6W1B,GAAO,CM5WvB,sBAAsC,CAAE,OAAO,CNb1B,GAAO,CMc5B,cAA8B,CAAE,OAAO,CNmP1B,GAAO,CMlPpB,gBAAgC,CAAE,OAAO,CNoG1B,GAAO,CMnGtB,mBAAmC,CAAE,OAAO,CNpF1B,GAAO,CMqFzB,eAA+B,CAAE,OAAO,CN1G1B,GAAO,CM2GrB,sBAAsC,CAAE,OAAO,CN7D1B,GAAO,CM8D5B,uBAAuC,CAAE,OAAO,CN8F1B,GAAO,CM7F7B,sBAAsC,CAAE,OAAO,CN4F1B,GAAO,CM3F5B,oBAAoC,CAAE,OAAO,CN6F1B,GAAO,CM5F1B,sBAAsC,CAAE,OAAO,CNyF1B,GAAO,CMxF5B,2DAA4C,CAAE,OAAO,CN5I1B,GAAO,CM6IlC,6DAA6C,CAAE,OAAO,CNxI1B,GAAO,CMyInC,0BAA0C,CAAE,OAAO,CNxI1B,GAAO,CMyIhC,4BAA4C,CAAE,OAAO,CNhJ1B,GAAO,CMiJlC,gBAAgC,CAAE,OAAO,CN2E1B,GAAO,CM1EtB,iBAAiC,CAAE,OAAO,CNqX1B,GAAO,CMpXvB,gBAAgC,CAAE,OAAO,CNgT1B,GAAO,CM/StB,iBAAiC,CAAE,OAAO,CNuC1B,GAAO,CMtCvB,oBAAoC,CAAE,OAAO,CNxG1B,GAAO,CMyG1B,qBAAqC,CAAE,OAAO,CNzI1B,GAAO,CM0I3B,iCACgC,CAAE,OAAO,CN8V1B,GAAO,CM7VtB,kDAC+B,CAAE,OAAO,CNwH1B,GAAO,CMvHrB,gBAAgC,CAAE,OAAO,CNxD1B,GAAO,CMyDtB,gBAAgC,CAAE,OAAO,CNsC1B,GAAO,CMrCtB,kCACmC,CAAE,OAAO,CN+N1B,GAAO,CM9NzB,kCACkC,CAAE,OAAO,CNyB1B,GAAO,CMxBxB,oBAAoC,CAAE,OAAO,CN8J1B,GAAO,CM7J1B,mCACmC,CAAE,OAAO,CNiC1B,GAAO,CMhCzB,iBAAiC,CAAE,OAAO,CNkQ1B,GAAO,CMjQvB,qDAE+B,CAAE,OAAO,CN9I1B,GAAO,CM+IrB,kBAAkC,CAAE,OAAO,CNiH1B,GAAO,CMhHxB,kBAAkC,CAAE,OAAO,CN+G1B,GAAO,CM9GxB,wBAAwC,CAAE,OAAO,CN4Q1B,GAAO,CM3Q9B,oBAAoC,CAAE,OAAO,CNgU1B,GAAO,CM/T1B,gBAAgC,CAAE,OAAO,CNkR1B,GAAO,CMjRtB,gBAAgC,CAAE,OAAO,CNmH1B,GAAO,CMlHtB,gBAAgC,CAAE,OAAO,CNmT1B,GAAO,CMlTtB,oBAAoC,CAAE,OAAO,CNgK1B,GAAO,CM/J1B,2BAA2C,CAAE,OAAO,CNgK1B,GAAO,CM/JjC,6BAA6C,CAAE,OAAO,CN8C1B,GAAO,CM7CnC,sBAAsC,CAAE,OAAO,CN4C1B,GAAO,CM3C5B,gBAAgC,CAAE,OAAO,CNgI1B,GAAO,CM/HtB,wEAAqC,CAAE,OAAO,CNxH1B,GAAO,CMyH3B,mBAAmC,CAAE,OAAO,CNlH1B,GAAO,CMmHzB,qBAAqC,CAAE,OAAO,CNzH1B,GAAO,CM0H3B,sBAAsC,CAAE,OAAO,CNzH1B,GAAO,CM0H5B,kBAAkC,CAAE,OAAO,CN3E1B,GAAO,CM4ExB,mCAC+B,CAAE,OAAO,CN4N1B,GAAO,CM3NrB,yCACoC,CAAE,OAAO,CNgO1B,GAAO,CM/N1B,sCACmC,CAAE,OAAO,CN6N1B,GAAO,CM5NzB,mBAAmC,CAAE,OAAO,CN/C1B,GAAO,CMgDzB,mBAAmC,CAAE,OAAO,CNmF1B,GAAO,CMlFzB,sCAC+B,CAAE,OAAO,CN0S1B,GAAO,CMzSrB,iCACgC,CAAE,OAAO,CNW1B,GAAO,CMVtB,0CACqC,CAAE,OAAO,CN0P1B,GAAO,CMzP3B,oBAAoC,CAAE,OAAO,CNxF1B,GAAO,CMyF1B,qBAAqC,CAAE,OAAO,CNvF1B,GAAO,CMwF3B,gCAC+B,CAAE,OAAO,CNlK1B,GAAO,CMmKrB,kBAAkC,CAAE,OAAO,CNoM1B,GAAO,CMnMxB,mBAAmC,CAAE,OAAO,CN8R1B,GAAO,CM7RzB,qCACoC,CAAE,OAAO,CN9G1B,GAAO,CM+G1B,sBAAsC,CAAE,OAAO,CNiE1B,GAAO,CMhE5B,mBAAmC,CAAE,OAAO,CN1D1B,GAAO,CM2DzB,yBAAyC,CAAE,OAAO,CN7G1B,GAAO,CM8G/B,uBAAuC,CAAE,OAAO,CN7G1B,GAAO,CM8G7B,kBAAkC,CAAE,OAAO,CNkS1B,GAAO,CMjSxB,sBAAsC,CAAE,OAAO,CNgO1B,GAAO,CM/N5B,mBAAmC,CAAE,OAAO,CNqO1B,GAAO,CMpOzB,iBAAiC,CAAE,OAAO,CNxL1B,GAAO,CMyLvB,iBAAiC,CAAE,OAAO,CN7G1B,GAAO,CM8GvB,kBAAkC,CAAE,OAAO,CN3F1B,GAAO,CM4FxB,sBAAsC,CAAE,OAAO,CNpC1B,GAAO,CMqC5B,qBAAqC,CAAE,OAAO,CNzK1B,GAAO,CM0K3B,qBAAqC,CAAE,OAAO,CNqB1B,GAAO,CMpB3B,oBAAoC,CAAE,OAAO,CN3O1B,GAAO,CM4O1B,iBAAiC,CAAE,OAAO,CN4E1B,GAAO,CM3EvB,sBAAsC,CAAE,OAAO,CNxD1B,GAAO,CMyD5B,eAA+B,CAAE,OAAO,CNrM1B,GAAO,CMsMrB,mBAAmC,CAAE,OAAO,CNG1B,GAAO,CMFzB,sBAAsC,CAAE,OAAO,CNuH1B,GAAO,CMtH5B,4BAA4C,CAAE,OAAO,CN5O1B,GAAO,CM6OlC,6BAA6C,CAAE,OAAO,CN5O1B,GAAO,CM6OnC,0BAA0C,CAAE,OAAO,CN5O1B,GAAO,CM6OhC,4BAA4C,CAAE,OAAO,CNhP1B,GAAO,CMiPlC,qBAAqC,CAAE,OAAO,CN5O1B,GAAO,CM6O3B,sBAAsC,CAAE,OAAO,CN5O1B,GAAO,CM6O5B,mBAAmC,CAAE,OAAO,CN5O1B,GAAO,CM6OzB,qBAAqC,CAAE,OAAO,CNhP1B,GAAO,CMiP3B,kBAAkC,CAAE,OAAO,CNxG1B,GAAO,CMyGxB,iBAAiC,CAAE,OAAO,CNyB1B,GAAO,CMxBvB,iBAAiC,CAAE,OAAO,CNmN1B,GAAO,CMlNvB,yCACiC,CAAE,OAAO,CNmE1B,GAAO,CMlEvB,mBAAmC,CAAE,OAAO,CNlJ1B,GAAO,CMmJzB,qBAAqC,CAAE,OAAO,CNiH1B,GAAO,CMhH3B,sBAAsC,CAAE,OAAO,CNiH1B,GAAO,CMhH5B,kBAAkC,CAAE,OAAO,CNiL1B,GAAO,CMhLxB,iBAAiC,CAAE,OAAO,CNvJ1B,GAAO,CMwJvB,sCACgC,CAAE,OAAO,CNyH1B,GAAO,CMxHtB,qBAAqC,CAAE,OAAO,CN9B1B,GAAO,CM+B3B,mBAAmC,CAAE,OAAO,CNjD1B,GAAO,CMkDzB,wBAAwC,CAAE,OAAO,CNhD1B,GAAO,CMiD9B,kBAAkC,CAAE,OAAO,CN2J1B,GAAO,CM1JxB,kBAAkC,CAAE,OAAO,CN9C1B,GAAO,CM+CxB,gBAAgC,CAAE,OAAO,CN+C1B,GAAO,CM9CtB,kBAAkC,CAAE,OAAO,CN9C1B,GAAO,CM+CxB,qBAAqC,CAAE,OAAO,CNI1B,GAAO,CMH3B,iBAAiC,CAAE,OAAO,CN9D1B,GAAO,CM+DvB,yBAAyC,CAAE,OAAO,CNhE1B,GAAO,CMiE/B,mBAAmC,CAAE,OAAO,CNsM1B,GAAO,CMrMzB,eAA+B,CAAE,OAAO,CN1J1B,GAAO,CM2JrB,8CACoC,CAAE,OAAO,CN4G1B,GAAO,CM3G1B,2EAEsC,CAAE,OAAO,CNwK1B,GAAO,CMvK5B,yBAAyC,CAAE,OAAO,CNmB1B,GAAO,CMlB/B,eAA+B,CAAE,OAAO,CNjJ1B,GAAO,CMkJrB,oBAAoC,CAAE,OAAO,CNjK1B,GAAO,CMkK1B,yCACuC,CAAE,OAAO,CN9L1B,GAAO,CM+L7B,mBAAmC,CAAE,OAAO,CNmF1B,GAAO,CMlFzB,eAA+B,CAAE,OAAO,CNvB1B,GAAO,CMwBrB,sBAAsC,CAAE,OAAO,CNvH1B,GAAO,CMwH5B,sBAAsC,CAAE,OAAO,CN6K1B,GAAO,CM5K5B,oBAAoC,CAAE,OAAO,CNyK1B,GAAO,CMxK1B,iBAAiC,CAAE,OAAO,CN9H1B,GAAO,CM+HvB,uBAAuC,CAAE,OAAO,CN0E1B,GAAO,CMzE7B,qBAAqC,CAAE,OAAO,CNwB1B,GAAO,CMvB3B,2BAA2C,CAAE,OAAO,CNwB1B,GAAO,CMvBjC,iBAAiC,CAAE,OAAO,CNqH1B,GAAO,CMpHvB,qBAAqC,CAAE,OAAO,CN9N1B,GAAO,CM+N3B,4BAA4C,CAAE,OAAO,CN1F1B,GAAO,CM2FlC,iBAAiC,CAAE,OAAO,CN2F1B,GAAO,CM1FvB,iBAAiC,CAAE,OAAO,CNc1B,GAAO,CMbvB,8BAA8C,CAAE,OAAO,CNtM1B,GAAO,CMuMpC,+BAA+C,CAAE,OAAO,CNtM1B,GAAO,CMuMrC,4BAA4C,CAAE,OAAO,CNtM1B,GAAO,CMuMlC,8BAA8C,CAAE,OAAO,CN1M1B,GAAO,CM2MpC,gBAAgC,CAAE,OAAO,CN7C1B,GAAO,CM8CtB,eAA+B,CAAE,OAAO,CNtK1B,GAAO,CMuKrB,iBAAiC,CAAE,OAAO,CN9S1B,GAAO,CM+SvB,qBAAqC,CAAE,OAAO,CN+M1B,GAAO,CM9M3B,mBAAmC,CAAE,OAAO,CN/O1B,GAAO,CMgPzB,qBAAqC,CAAE,OAAO,CNtJ1B,GAAO,CMuJ3B,qBAAqC,CAAE,OAAO,CNtJ1B,GAAO,CMuJ3B,qBAAqC,CAAE,OAAO,CNmF1B,GAAO,CMlF3B,sBAAsC,CAAE,OAAO,CN6C1B,GAAO,CM5C5B,iBAAiC,CAAE,OAAO,CN0K1B,GAAO,CMzKvB,uBAAuC,CAAE,OAAO,CNO1B,GAAO,CMN7B,wIAAyC,CAAE,OAAO,CNO1B,GAAO,CMN/B,mBAAmC,CAAE,OAAO,CN/B1B,GAAO,CMgCzB,qBAAqC,CAAE,OAAO,CNjC1B,GAAO,CMkC3B,uBAAuC,CAAE,OAAO,CN3N1B,GAAO,CM4N7B,wBAAwC,CAAE,OAAO,CNyB1B,GAAO,CMxB9B,+BAA+C,CAAE,OAAO,CNlJ1B,GAAO,CMmJrC,uBAAuC,CAAE,OAAO,CNuF1B,GAAO,CMtF7B,kBAAkC,CAAE,OAAO,CN9L1B,GAAO,CM+LxB,qDAC8C,CAAE,OAAO,CNnP1B,GAAO,CMoPpC,iDAC4C,CAAE,OAAO,CNlP1B,GAAO,CMmPlC,uDAC+C,CAAE,OAAO,CNrP1B,GAAO,CMsPrC,8BAC8B,CAAE,OAAO,CNpK1B,GAAO,CMqKpB,cAA8B,CAAE,OAAO,CNzG1B,GAAO,CM0GpB,gCAC8B,CAAE,OAAO,CNwL1B,GAAO,CMvLpB,+BAC8B,CAAE,OAAO,CNrE1B,GAAO,CMsEpB,2DAG8B,CAAE,OAAO,CNnE1B,GAAO,CMoEpB,iDAE8B,CAAE,OAAO,CNqD1B,GAAO,CMpDpB,6BAC8B,CAAE,OAAO,CNpE1B,GAAO,CMqEpB,iCAC8B,CAAE,OAAO,CN1R1B,GAAO,CM2RpB,eAA+B,CAAE,OAAO,CNlK1B,GAAO,CMmKrB,oBAAoC,CAAE,OAAO,CNtJ1B,GAAO,CMuJ1B,yBAAyC,CAAE,OAAO,CN4E1B,GAAO,CM3E/B,0BAA0C,CAAE,OAAO,CN4E1B,GAAO,CM3EhC,0BAA0C,CAAE,OAAO,CN4E1B,GAAO,CM3EhC,2BAA2C,CAAE,OAAO,CN4E1B,GAAO,CM3EjC,2BAA2C,CAAE,OAAO,CN+E1B,GAAO,CM9EjC,4BAA4C,CAAE,OAAO,CN+E1B,GAAO,CM9ElC,oBAAoC,CAAE,OAAO,CN+H1B,GAAO,CM9H1B,sBAAsC,CAAE,OAAO,CN2H1B,GAAO,CM1H5B,yBAAyC,CAAE,OAAO,CN4L1B,GAAO,CM3L/B,kBAAkC,CAAE,OAAO,CNyL1B,GAAO,CMxLxB,eAA+B,CAAE,OAAO,CNmL1B,GAAO,CMlLrB,sBAAsC,CAAE,OAAO,CNmL1B,GAAO,CMlL5B,uBAAuC,CAAE,OAAO,CNuL1B,GAAO,CMtL7B,kBAAkC,CAAE,OAAO,CN/M1B,GAAO,CMgNxB,yBAAyC,CAAE,OAAO,CNgF1B,GAAO,CM/E/B,oBAAoC,CAAE,OAAO,CNjG1B,GAAO,CMkG1B,iBAAiC,CAAE,OAAO,CNxJ1B,GAAO,CMyJvB,cAA8B,CAAE,OAAO,CNhX1B,GAAO,CMiXpB,2CAAoC,CAAE,OAAO,CNzT1B,GAAO,CM0T1B,2BAA2C,CAAE,OAAO,CNzT1B,GAAO,CM0TjC,iBAAiC,CAAE,OAAO,CNqI1B,GAAO,CMpIvB,wBAAwC,CAAE,OAAO,CNqI1B,GAAO,CMpI9B,0BAA0C,CAAE,OAAO,CNrE1B,GAAO,CMsEhC,wBAAwC,CAAE,OAAO,CNnE1B,GAAO,CMoE9B,0BAA0C,CAAE,OAAO,CNtE1B,GAAO,CMuEhC,2BAA2C,CAAE,OAAO,CNtE1B,GAAO,CMuEjC,gBAAgC,CAAE,OAAO,CNxW1B,GAAO,CMyWtB,kBAAkC,CAAE,OAAO,CN8J1B,GAAO,CM7JxB,kBAAkC,CAAE,OAAO,CNpX1B,GAAO,CMqXxB,gBAAgC,CAAE,OAAO,CNnF1B,GAAO,CMoFtB,mBAAmC,CAAE,OAAO,CNjO1B,GAAO,CMkOzB,gBAAgC,CAAE,OAAO,CNsC1B,GAAO,CMrCtB,qBAAqC,CAAE,OAAO,CNhK1B,GAAO,CMiK3B,iBAAiC,CAAE,OAAO,CNmH1B,GAAO,CMlHvB,iBAAiC,CAAE,OAAO,CNxM1B,GAAO,CMyMvB,eAA+B,CAAE,OAAO,CNzE1B,GAAO,CM0ErB,iBAAiC,CAAE,OAAO,CNrJ1B,GAAO,CMsJvB,gBAAgC,CAAE,OAAO,CN2E1B,GAAO,CM1EtB,iBAAiC,CAAE,OAAO,CN7D1B,GAAO,CM8DvB,kBAAkC,CAAE,OAAO,CNpX1B,GAAO,CMqXxB,cAA8B,CAAE,OAAO,CNpU1B,GAAO,CMqUpB,aAA6B,CAAE,OAAO,CNsI1B,GAAO,CMrInB,gBAAgC,CAAE,OAAO,CN2I1B,GAAO,CM1ItB,iBAAiC,CAAE,OAAO,CNX1B,GAAO,CMYvB,oBAAoC,CAAE,OAAO,CN5D1B,GAAO,CM6D1B,yBAAyC,CAAE,OAAO,CNgD1B,GAAO,CM/C/B,+BAA+C,CAAE,OAAO,CNrX1B,GAAO,CMsXrC,8BAA8C,CAAE,OAAO,CNvX1B,GAAO,CMwXpC,qDAC8C,CAAE,OAAO,CN5T1B,GAAO,CM6TpC,uBAAuC,CAAE,OAAO,CNvP1B,GAAO,CMwP7B,qBAAqC,CAAE,OAAO,CNoI1B,GAAO,CMnI3B,uBAAuC,CAAE,OAAO,CNyH1B,GAAO,CMxH7B,sCAC8B,CAAE,OAAO,CNiG1B,GAAO,CMhGpB,wEAAwC,CAAE,OAAO,CNzC1B,GAAO,CM0C9B,wBAAwC,CAAE,OAAO,CN+B1B,GAAO,CM9B9B,gBAAgC,CAAE,OAAO,CNa1B,GAAO,CMZtB,0BAA0C,CAAE,OAAO,CNnP1B,GAAO,CMoPhC,oBAAoC,CAAE,OAAO,CNgI1B,GAAO,CM/H1B,iBAAiC,CAAE,OAAO,CN9E1B,GAAO,CM+EvB,4DAEqC,CAAE,OAAO,CNmG1B,GAAO,CMlG3B,iDACyC,CAAE,OAAO,CN3K1B,GAAO,CM4K/B,gBAAgC,CAAE,OAAO,CN6H1B,GAAO,CM5HtB,iBAAiC,CAAE,OAAO,CNjL1B,GAAO,CMkLvB,iBAAiC,CAAE,OAAO,CNxC1B,GAAO,CMyCvB,wBAAwC,CAAE,OAAO,CNxC1B,GAAO,CMyC9B,6BAA6C,CAAE,OAAO,CNuC1B,GAAO,CMtCnC,sBAAsC,CAAE,OAAO,CNqC1B,GAAO,CMpC5B,oBAAoC,CAAE,OAAO,CNlR1B,GAAO,CMmR1B,eAA+B,CAAE,OAAO,CNhR1B,GAAO,CMiRrB,qBAAqC,CAAE,OAAO,CNxE1B,GAAO,CMyE3B,yBAAyC,CAAE,OAAO,CNxE1B,GAAO,CMyE/B,iBAAiC,CAAE,OAAO,CN7Q1B,GAAO,CM8QvB,iBAAiC,CAAE,OAAO,CN3J1B,GAAO,CM4JvB,mBAAmC,CAAE,OAAO,CNtJ1B,GAAO,CMuJzB,cAA8B,CAAE,OAAO,CNtP1B,GAAO,CMuPpB,mBAAmC,CAAE,OAAO,CN3W1B,GAAO,CM4WzB,gBAAgC,CAAE,OAAO,CNjU1B,GAAO,CMkUtB,cAA8B,CAAE,OAAO,CN1F1B,GAAO,CM2FpB,gBAAgC,CAAE,OAAO,CNM1B,GAAO,CMLtB,eAA+B,CAAE,OAAO,CNrS1B,GAAO,CMsSrB,gBAAgC,CAAE,OAAO,CNrS1B,GAAO,CMsStB,kBAAkC,CAAE,OAAO,CNtY1B,GAAO,CMuYxB,yBAAyC,CAAE,OAAO,CNtY1B,GAAO,CMuY/B,gBAAgC,CAAE,OAAO,CNa1B,GAAO,CMZtB,uBAAuC,CAAE,OAAO,CNa1B,GAAO,CMZ7B,kBAAkC,CAAE,OAAO,CN/D1B,GAAO,CMgExB,oCAC8B,CAAE,OAAO,CN5W1B,GAAO,CM6WpB,8BAC+B,CAAE,OAAO,CN2B1B,GAAO,CM1BrB,eAA+B,CAAE,OAAO,CNoD1B,GAAO,CMnDrB,kBAAkC,CAAE,OAAO,CNN1B,GAAO,CMOxB,qBAAqC,CAAE,OAAO,CNzS1B,GAAO,CM0S3B,qBAAqC,CAAE,OAAO,CNZ1B,GAAO,CMa3B,mBAAmC,CAAE,OAAO,CN/S1B,GAAO,CMgTzB,qBAAqC,CAAE,OAAO,CNhQ1B,GAAO,CMiQ3B,sBAAsC,CAAE,OAAO,CNzP1B,GAAO,CM0P5B,uBAAuC,CAAE,OAAO,CNtQ1B,GAAO,CMuQ7B,4BAA4C,CAAE,OAAO,CNhQ1B,GAAO,CMiQlC,yEAEuC,CAAE,OAAO,CNzQ1B,GAAO,CM0Q7B,+CACyC,CAAE,OAAO,CN/Q1B,GAAO,CMgR/B,+CACuC,CAAE,OAAO,CNhR1B,GAAO,CMiR7B,+CACuC,CAAE,OAAO,CNrQ1B,GAAO,CMsQ7B,sBAAsC,CAAE,OAAO,CNlR1B,GAAO,CMmR5B,eAA+B,CAAE,OAAO,CN4D1B,GAAO,CM3DrB,kBAAkC,CAAE,OAAO,CNrV1B,GAAO,CMsVxB,mBAAmC,CAAE,OAAO,CNhM1B,GAAO,CMiMzB,uGAIoC,CAAE,OAAO,CNtL1B,GAAO,CMuL1B,yBAAyC,CAAE,OAAO,CNvW1B,GAAO,CMwW/B,8BACgC,CAAE,OAAO,CNlG1B,GAAO,CMmGtB,+BACiC,CAAE,OAAO,CN1T1B,GAAO,CM2TvB,qBAAqC,CAAE,OAAO,CNpP1B,GAAO,CMqP3B,cAA8B,CAAE,OAAO,CNtP1B,GAAO,CMuPpB,sBAAsC,CAAE,OAAO,CNxO1B,GAAO,CMyO5B,wBAAwC,CAAE,OAAO,CNR1B,GAAO,CMS9B,aAA6B,CAAE,OAAO,CNjH1B,GAAO,CMkHnB,mCACiC,CAAE,OAAO,CNiD1B,GAAO,CMhDvB,sCACsC,CAAE,OAAO,CNrJ1B,GAAO,CMsJ5B,0CACwC,CAAE,OAAO,CNtJ1B,GAAO,CMuJ9B,kBAAkC,CAAE,OAAO,CNvO1B,GAAO,CMwOxB,sBAAsC,CAAE,OAAO,CNvX1B,GAAO,CMwX5B,iBAAiC,CAAE,OAAO,CN7O1B,GAAO,CM8OvB,oBAAoC,CAAE,OAAO,CNxJ1B,GAAO,CMyJ1B,kBAAkC,CAAE,OAAO,CNvE1B,GAAO,CMwExB,oBAAoC,CAAE,OAAO,CNtF1B,GAAO,CMuF1B,2BAA2C,CAAE,OAAO,CNtF1B,GAAO,CMuFjC,eAA+B,CAAE,OAAO,CNnb1B,GAAO,CMobrB,4CACmC,CAAE,OAAO,CNjR1B,GAAO,CMkRzB,cAA8B,CAAE,OAAO,CNI1B,GAAO,CMHpB,qBAAqC,CAAE,OAAO,CN9b1B,GAAO,CM+b3B,eAA+B,CAAE,OAAO,CN5I1B,GAAO,CM6IrB,qBAAqC,CAAE,OAAO,CN/E1B,GAAO,CMgF3B,iBAAiC,CAAE,OAAO,CNI1B,GAAO,CMHvB,eAA+B,CAAE,OAAO,CNuC1B,GAAO,CMtCrB,sBAAsC,CAAE,OAAO,CN7K1B,GAAO,CM8K5B,eAA+B,CAAE,OAAO,CN6B1B,GAAO,CM5BrB,qBAAqC,CAAE,OAAO,CNjb1B,GAAO,CMkb3B,iBAAiC,CAAE,OAAO,CNpK1B,GAAO,CMqKvB,wBAAwC,CAAE,OAAO,CNzQ1B,GAAO,CM0Q9B,kBAAkC,CAAE,OAAO,CNha1B,GAAO,CMiaxB,wBAAwC,CAAE,OAAO,CNpa1B,GAAO,CMqa9B,sBAAsC,CAAE,OAAO,CNta1B,GAAO,CMua5B,kBAAkC,CAAE,OAAO,CNxa1B,GAAO,CMyaxB,oBAAoC,CAAE,OAAO,CNta1B,GAAO,CMua1B,oBAAoC,CAAE,OAAO,CNta1B,GAAO,CMua1B,qBAAqC,CAAE,OAAO,CNjd1B,GAAO,CMkd3B,uBAAuC,CAAE,OAAO,CNjd1B,GAAO,CMkd7B,gBAAgC,CAAE,OAAO,CNtB1B,GAAO,CMuBtB,oBAAoC,CAAE,OAAO,CN9X1B,GAAO,CM+X1B,aAA6B,CAAE,OAAO,CNne1B,GAAO,CMoenB,qBAAqC,CAAE,OAAO,CNtV1B,GAAO,CMuV3B,sBAAsC,CAAE,OAAO,CN1L1B,GAAO,CM2L5B,wBAAwC,CAAE,OAAO,CNpd1B,GAAO,CMqd9B,qBAAqC,CAAE,OAAO,CNzf1B,GAAO,CM0f3B,oBAAoC,CAAE,OAAO,CN7K1B,GAAO,CM8K1B,qBAAqC,CAAE,OAAO,CNzO1B,GAAO,CM0O3B,iBAAiC,CAAE,OAAO,CNtP1B,GAAO,CMuPvB,wBAAwC,CAAE,OAAO,CNtP1B,GAAO,CMuP9B,qBAAqC,CAAE,OAAO,CNrC1B,GAAO,CMsC3B,oBAAoC,CAAE,OAAO,CNrC1B,GAAO,CMsC1B,kBAAkC,CAAE,OAAO,CN9d1B,GAAO,CM+dxB,cAA8B,CAAE,OAAO,CN5c1B,GAAO,CM6cpB,kBAAkC,CAAE,OAAO,CNtQ1B,GAAO,CMuQxB,oBAAoC,CAAE,OAAO,CN9gB1B,GAAO,CM+gB1B,aAA6B,CAAE,OAAO,CN/b1B,GAAO,CMgcnB,kDAE8B,CAAE,OAAO,CNpR1B,GAAO,CMqRpB,mBAAmC,CAAE,OAAO,CN/N1B,GAAO,COtUzB,swBAAK,CACH,WAAW,CAAE,OAAO,CACpB,y5BAAQ,CACN,WAAW,CC+BuB,aAAa,CD9B/C,OAAO,CAAE,YAAY,CACrB,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,MAAM,CACnB,WAAW,CAAE,CAAC,CACd,eAAe,CAAE,OAAO,CAM5B,86BAAkB,CAChB,OAAO,CAAE,YAAY,CACrB,eAAe,CAAE,OAAO,CAGxB,muEAAgB,CACd,OAAO,CAAE,MAAM,CACf,2wEAAuB,CACrB,WAAW,CAAE,KAAI,CACnB,utEAAsB,CACpB,OAAO,CAAE,YAAY,CAE3B,2iBAA2B,CACzB,OAAO,CAAE,GAAE,CfpBL,kBAAoB,CAAE,qBAAM,CAK5B,eAAiB,CAAE,qBAAM,CAezB,UAAY,CAAE,qBAAM,CeE5B,+nBAAiC,CAC/B,OAAO,CAAE,CAAC,CAGV,mtCAAuB,CACrB,SAAS,CAAE,IAAI,CACf,cAAc,CAAE,IAAI,CEpBxB,0PAAS,CACP,OAAO,CAAE,IAAqB,CAC9B,WAAW,CDayB,IAAI,CCZxC,aAAa,CDYuB,IAAI,CCXxC,UAAU,CAAE,OAAmB,CAEjC,8CAAe,CACb,KAAK,CDkC+B,IAAM,CCjC1C,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,KAAK,CACd,KAAK,CD+B+B,IAAM,CC9B1C,UAAU,CAAE,OAAkB,CAC9B,MAAM,CAAE,KAAsB,CAC9B,OAAO,CAAE,QAA2C,CACpD,aAAa,CAAE,IAAqB,CAEtC,0ZAAyB,CACvB,UAAU,CAAE,OAAkB,CAC9B,mxCAAe,CACb,UAAU,CAAE,OAAiB,CACjC,kYAA0B,CACxB,UAAU,CAAE,OAAmB,CAC/B,ouCAAe,CACb,UAAU,CAAE,OAAoB,CAEpC,sYAAuB,CACrB,UAAU,CAAE,OAAmB,CAC/B,yuCAAe,CACb,UAAU,CAAE,OAAkB,CAElC,mZAA0B,CACxB,UAAU,CAAE,OAAuB,CACnC,swCAAe,CACb,UAAU,CAAE,OAAqB,CAErC,scAA0B,CACxB,UAAU,CDmB0B,OAAmB,CClBvD,42CAAe,CACb,KAAK,CCjD6B,OAAW,CDkD7C,UAAU,CDJwB,OAAmB,CCKvD,8dAAC,CACC,KAAK,CDsB6B,OAAW,CCpBjD,sZAAsB,CACpB,aAAa,CAAE,CAAC,CAsBlB,kBAAkB,CAChB,QAAQ,CAAE,KAAK,CACf,MAAM,CAAE,GAAG,CACX,IAAI,CAAE,CAAC,CACP,OAAO,CDG6B,GAAG,CCFvC,qBAAE,CACA,OAAO,CAAE,KAAK,CACd,KAAK,CDT6B,KAAK,CCUvC,UAAU,CAAE,WAAW,CACvB,KAAK,CDlC6B,IAAM,CCmCxC,UAAU,CAAE,MAAM,CAClB,UAAU,CAAE,2BAA0B,CACtC,OAAO,CAAE,MAAmB,CAC5B,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,CAAC,CACV,MAAM,CAAE,CAAC,CACT,WAAW,CAAE,IAAI,CACjB,QAAQ,CAAE,MAAM,CjB3FZ,kBAAoB,CAAE,gBAAM,CAK5B,eAAiB,CAAE,gBAAM,CAezB,UAAY,CAAE,gBAAM,CiByExB,0CAAsB,CACpB,UAAU,CDhCsB,OAAM,CCiCxC,uCAAmB,CACjB,UAAU,CDzBsB,OAAW,CC0B7C,0CAAsB,CACpB,UAAU,CDnFsB,OAAO,CCoFzC,yCAAqB,CACnB,UAAU,CDtEsB,OAAI,CCuEtC,wBAAI,CACF,OAAO,CAAE,CAAC,CACV,MAAM,CAAE,IAAI,CEhFd,oCAAsB,CFmFxB,kBAAkB,CAChB,MAAM,CAAE,IAAI,CACZ,GAAG,CAAE,CAAC,CACN,KAAK,CAAE,IAAI,CACX,qBAAE,CACA,KAAK,CAAE,IAAI,EG3FjB,MAAM,CACJ,SAAS,CAAE,IAAI,CACf,MAAM,CAAE,CAAC,CACT,cAAc,CAAE,QAAQ,CACxB,eAAe,CAAE,MAAM,CACvB,MAAM,CAAE,OAAO,CACf,WAAW,CAAE,MAAM,CACnB,kBAAkB,CAAE,MAAM,CAC1B,SAAS,CAAE,OAAO,CACpB,gDAAiD,CAC/C,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,CAAC,CACZ,gBAAgB,CACd,MAAM,CAAE,OAAO,CAEjB,IAAI,CAEF,OAAO,CAAE,YAAY,CACrB,aAAa,CAAE,GAAG,CAClB,WAAW,CAAE,MAAM,CACnB,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,MAAM,CAClB,MAAM,CAAE,OAAO,CACf,SAAS,CAAE,IAAI,CACf,OAAO,CAAE,iBAA6F,CACtG,KAAK,CJI+B,IAAM,CIH1C,MAAM,CAAE,yBAAyB,CACjC,gBAAgB,CJeoB,OAAM,CId1C,eAAe,CAAE,IAAI,CACrB,WAAW,CAAE,MAAM,CACnB,WAAW,CFnDyB,uDAAM,CEoD1C,UAAU,CAAE,mFAA8C,CAC1D,YAAY,CAAE,KAAK,CACnB,cAAc,CAAE,MAAM,CACtB,QAAQ,CAAE,MAAM,CAChB,IAAI,CAAE,CAAC,CACP,iBAAiB,CAAE,IAAI,CpBxDjB,mBAAoB,CoByDb,IAAI,CpBpDX,gBAAiB,CoBoDV,IAAI,CpB/CX,eAAgB,CoB+CT,IAAI,CpBrCX,WAAY,CoBqCL,IAAI,CpBzDX,kBAAoB,CAAE,eAAM,CAK5B,eAAiB,CAAE,eAAM,CAezB,UAAY,CAAE,eAAM,CoByC5B,UAAU,CACR,UAAU,CAAE,OAAwB,CACpC,KAAK,CJd+B,IAAM,CIiB1C,UAAO,CACL,UAAU,CAAE,OAAqC,CACjD,KAAK,CJnB6B,IAAM,CIoB1C,UAAO,CACL,UAAU,CAAE,OAAqC,CACjD,OAAO,CAAE,CAAC,CACZ,WAAQ,CACN,UAAU,CAAE,6EAAyC,CACrD,OAAO,CAAE,iBAA6F,CACxG,YAAS,CACP,KAAK,CJ3B6B,IAAM,CI4B1C,aAAU,CACR,gBAAgB,CAAE,IAAI,CACtB,MAAM,CAAE,2DAA2D,CACnE,MAAM,CAAE,iBAAmB,CAC3B,OAAO,CAAE,GAAG,CACZ,MAAM,CAAE,WAAW,CACnB,UAAU,CAAE,IAAI,CAEpB,aAAa,CACX,gBAAgB,CAAE,IAAI,CACtB,MAAM,CAAE,2DAA2D,CACnE,MAAM,CAAE,iBAAmB,CAC3B,OAAO,CAAE,GAAG,CACZ,MAAM,CAAE,WAAW,CACnB,UAAU,CAAE,IAAI,CAChB,4DAA0B,CACxB,gBAAgB,CAAE,IAAI,CACtB,MAAM,CAAE,2DAA2D,CACnE,MAAM,CAAE,iBAAmB,CAC3B,OAAO,CAAE,GAAI,CACb,MAAM,CAAE,WAAW,CACnB,UAAU,CAAE,IAAI,CAGpB,sBAAsB,CACpB,OAAO,CAAE,CAAC,CACV,MAAM,CAAE,CAAC,CAEX,UAAU,CACR,SAAS,CAAE,GAAG,CAEhB,SAAS,CACP,gBAAgB,CAAE,kBAAgB,CAClC,eAAO,CACL,gBAAgB,CAAE,kBAA6B,CAEnD,YAAY,CACV,gBAAgB,CAAE,kBAA2C,CAC7D,KAAK,CAAE,kBAAsB,CAC7B,kBAAO,CACL,gBAAgB,CAAE,kBAAuD,CACzE,KAAK,CFzH6B,OAAW,CE0H/C,oBAAS,CACP,KAAK,CAAE,kBAAsB,CAEjC,YAAY,CACV,gBAAgB,CAAE,kBAAiB,CACnC,kBAAO,CACL,gBAAgB,CAAE,eAA6B,CAEnD,WAAW,CACT,gBAAgB,CAAE,kBAAe,CACjC,iBAAO,CACL,gBAAgB,CAAE,kBAA4B,CAElD,YAAY,CACV,gBAAgB,CAAE,kBAAkB,CACpC,kBAAO,CACL,gBAAgB,CAAE,kBAA+B,CACrD,WAAW,CACT,gBAAgB,CJvIoB,IAAI,CIwIxC,iBAAO,CACL,gBAAgB,CAAE,kBAAoC,CAE1D,SAAS,CACP,gBAAgB,CAAE,sBAAsB,CACxC,KAAK,CJxE+B,OAAW,CIyE/C,UAAU,CAAE,IAAI,CAChB,YAAY,CAAE,sBAAsB,CACpC,eAAO,CACL,gBAAgB,CAAE,sBAAsB,CACxC,KAAK,CAAE,kBAAoC,CAC3C,UAAU,CAAE,IAAI,CAClB,gBAAQ,CACN,gBAAgB,CAAE,sBAAsB,CACxC,KAAK,CAAE,kBAAoC,CAC3C,UAAU,CAAE,IAAI,CAClB,iBAAS,CACP,KAAK,CJnG6B,OAAO,CIqG7C,mCAAoC,CAClC,cAAc,CAAE,MAAM,CAExB,aAAa,CACX,aAAa,CJ1IuB,IAAI,CduExC,KAAK,CAAE,CAAC,CACR,wCAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,mBAAO,CACL,KAAK,CAAE,IAAI,CmB3Ff,YAAY,CACV,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,YAAY,CAIvB,qCAAqC,CACnC,OAAO,CAAE,KAAK,CAChB,iBAAiB,CACf,QAAQ,CAAE,QAAQ,CAClB,IAAI,CAAE,CAAC,CACP,OAAO,CAAE,IAAI,CACb,KAAK,CAAE,IAAI,CACX,GAAG,CAAE,IAAI,CACT,SAAS,CAAE,IAAI,CACf,UAAU,CL1B0B,OAAyB,CK2B7D,OAAO,CLmD6B,GAAG,CKlDvC,MAAM,CAAE,iBAAgC,CACxC,UAAU,CAAE,2BAA0B,CACtC,OAAO,CAAE,IAAqB,CAC9B,sBAAQ,CACN,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACX,KAAK,CHnC6B,OAAW,CGoC7C,WAAW,CAAE,MAAM,CACnB,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,MAAuB,CAChC,MAAM,CAAE,OAAO,CACf,4BAAO,CACL,UAAU,CLiCsB,OAAW,CKhC3C,KAAK,CLU2B,IAAM,CKT1C,4BAAY,CACV,UAAU,CAAE,iBAAgC,CAC5C,MAAM,CAAE,KAAuB,CACjC,2BAAW,CACT,cAAc,CAAE,IAAqB,CACrC,gDAAoB,CAClB,KAAK,CAAE,IAAI,CACf,mCAAmB,CACjB,UAAU,CAAE,OAA4B,CACxC,cAAc,CAAE,SAAS,CACzB,WAAW,CAAE,GAAG,CAChB,SAAS,CAAE,GAAG,CACd,yCAAO,CACL,UAAU,CAAE,OAA4B,CAC1C,wCAAI,CACF,KAAK,CLN2B,IAAM,CKQ5C,6CAA6C,CAC3C,MAAM,CAAE,IAAI,CACZ,GAAG,CAAE,IAAI,CACT,IAAI,CAAE,IAAI,CACV,KAAK,CAAE,CAAC,CAGR,iDAAiB,CACf,UAAU,CLnEwB,OAAyB,CKoE3D,UAAU,CAAE,GAAG,CACjB,mDAAmB,CACjB,OAAO,CAAE,QAA2C,CACpD,yDAAO,CACL,UAAU,CLCsB,OAAW,CKA3C,KAAK,CLtB2B,IAAM,CKwB5C,+CAA+C,CAC7C,KAAK,CAAE,CAAC,CACR,IAAI,CAAE,IAAI,CACV,UAAU,CAAE,KAAK,CAGjB,yBAAQ,CACN,OAAO,CAAE,GAAG,CACZ,aAAa,CAAE,iBAA0B,CACzC,WAAW,CAAE,qBAAqB,CAClC,YAAY,CAAE,qBAAqB,CACnC,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,KAAK,CACd,GAAG,CAAE,IAAI,CACT,IAAI,CAAE,GAAG,CACT,WAAW,CAAE,IAAI,CACnB,gDAA+B,CAC7B,IAAI,CAAE,IAAI,CCtEZ,uBAAM,CACJ,OAAO,CAAE,KAAK,CAEhB,gIAA+C,CAC7C,OAAO,CAAE,YAAY,CACrB,QAAQ,CAAE,MAAM,CAChB,KAAK,CAAE,CAAC,CACR,cAAc,CAAE,MAAM,CAItB,wCAAO,CACL,OAAO,CAAE,YAAY,CACrB,cAAc,CAAE,MAAM,CACtB,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,YAA+C,CACvD,KAAK,CAAE,IAAI,CACf,4BAAW,CACT,KAAK,CAAE,IAAI,CACX,kCAAK,CACH,OAAO,CAAE,KAAK,CAChB,mCAAM,CACJ,UAAU,CAAE,GAAqB,CAEvC,QAAQ,CACN,MAAM,CAAE,CAAC,CACT,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,CAAC,CACZ,MAAM,CACJ,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,CAAC,CACV,WAAW,CAAE,MAAM,CACnB,aAAa,CN/BuB,IAAI,CMgCxC,SAAS,CAAE,IAAI,CACf,YAAY,CAAE,IAAI,CACpB,KAAK,CACH,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,cAAa,CACrB,KAAK,CNR+B,IAAU,CMS9C,SAAS,CAAE,GAAG,CAEhB,qBAAuB,CACrB,SAAS,CAAE,IAAI,CACf,MAAM,CAAE,CAAC,CACT,cAAc,CAAE,QAAQ,CACxB,eAAe,CAAE,MAAM,CAGzB,iBAAiB,CACf,aAAa,CNhDuB,IAAI,CduExC,KAAK,CAAE,CAAC,CqBrGR,SAAS,CCCC,IAAQ,CDChB,WAAI,CAAE,IAAI,CACV,YAAK,CAAE,IAAI,CrBkGb,KAAK,CAAE,CAAC,CACR,gDAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,uBAAO,CACL,KAAK,CAAE,IAAI,CALb,gDAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,uBAAO,CACL,KAAK,CAAE,IAAI,CoBzBf,uDAAyD,CACvD,OAAO,CAAE,IAAI,CACb,KAAK,CN/C+B,OAAI,CMoDxC,mGAA+C,CAC7C,cAAc,CAAE,IAAqB,CACrC,wHAAM,CACJ,KAAK,CAAE,IAAI,CAEX,0tEAAqP,CACnP,KAAK,CAAE,IAAI,CACnB,+BAA+B,CGlF3B,KAAK,CAAE,IAAsB,CAG3B,OAAO,CAAE,KAAK,CAed,YAAoB,CAAE,QAA+B,CACrD,KAAK,CAAE,IAAuC,CCnB5C,YAAoB,CAAE,CAAC,CDqBzB,0CAAa,CACX,YAAoB,CAAE,CAAC,CHgE/B,iCAAiC,CGtF7B,KAAK,CAAE,IAAsB,CAG3B,OAAO,CAAE,KAAK,CAed,YAAoB,CAAE,QAA+B,CACrD,KAAK,CAAE,SAAuC,CAE9C,4CAAa,CACX,YAAoB,CAAE,CAAC,CCA7B,iDAAwB,CACtB,YAAoB,CAAE,CAAC,CAEvB,mDAA0B,CACxB,KAAK,CALY,IAAkC,CJqEzD,iCAAiC,CG1F7B,KAAK,CAAE,IAAsB,CAG3B,OAAO,CAAE,KAAK,CAed,YAAoB,CAAE,QAA+B,CACrD,KAAK,CAAE,SAAuC,CAE9C,4CAAa,CACX,YAAoB,CAAE,CAAC,CCA7B,iDAAwB,CACtB,YAAoB,CAAE,CAAC,CAEvB,mDAA0B,CACxB,KAAK,CALY,IAAkC,CJ0EzD,uDAAuD,CACrD,MAAM,CAAE,SAA2B,CACnC,SAAS,CAAE,GAAG,CAEhB,oBAAoB,CAClB,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,SAA2B,CACnC,SAAS,CAAE,GAAG,CAOZ,osBAAqP,CACnP,KAAK,CAAE,IAAI,CAIjB,uBAAuB,CACrB,OAAO,CAAE,YAAY,CACrB,YAAY,CAAE,KAAK,CACnB,KAAK,CAAE,IAAI,CACX,cAAc,CAAE,MAAM,CACtB,SAAS,CAAE,GAAG,CAEhB,gBAAgB,CACd,OAAO,CAAE,KAAK,CACd,KAAK,CN7H+B,IAAI,CM8HxC,SAAS,CAAE,GAAG,CACd,UAAU,CAAE,QAAO,CACnB,UAAU,CAAE,MAAM,CAClB,kBAAC,CACC,SAAS,CAAE,OAAO,CAClB,UAAU,CAAE,MAAM,CAClB,aAAa,CAAE,GAAqB,CACtC,6BAAY,CACV,aAAa,CAAE,CAAC,CA4DpB,KAAK,CACH,WAAW,CAAE,MAAM,CAGnB,6DAAmD,CACjD,kBAAkB,CAAE,MAAM,CAC1B,MAAM,CAAE,OAAO,CACf,WAAW,CJ/MuB,uDAAM,CIgNxC,SAAS,CAAE,OAAO,CACpB,gSAAqP,CACnP,kBAAkB,CAAE,IAAI,CACxB,OAAO,CAAE,GAAqB,CAC9B,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,cAA6B,CACrC,SAAS,CAAE,GAAG,CACd,WAAW,CJvNuB,uDAAM,CIwNxC,UAAU,CAAE,oBAAmC,CAC/C,aAAa,CAAE,CAAC,CtBxNZ,kBAAoB,CAAE,kBAAM,CAK5B,eAAiB,CAAE,kBAAM,CAezB,UAAY,CAAE,kBAAM,CsBuM1B,4BAAwB,CACtB,OAAO,CAAE,iBAAkB,CAC7B,eAAW,CACT,MAAM,CAAE,OAAO,CACjB,0CAAmC,CtB/N7B,kBAAoB,CsBgOZ,UAAU,CtB3NlB,eAAiB,CsB2NT,UAAU,CtB5MlB,UAAY,CsB4MJ,UAAU,CACtB,OAAO,CAAE,CAAC,CACV,YAAY,CAAE,QAAO,CACrB,OAAO,CAAE,IAAI,CACb,MAAM,CAAE,IAAI,CACd,oBAAgB,CtBrOV,kBAAoB,CsBsOZ,UAAU,CtBjOlB,eAAiB,CsBiOT,UAAU,CtBlNlB,UAAY,CsBkNJ,UAAU,CACtB,kGAA6D,CAC3D,kBAAkB,CAAE,IAAI,CAC5B,oXAAyU,CACvU,OAAO,CAAE,CAAC,CACV,OAAO,CAAE,cAAc,CACvB,YAAY,CNxLsB,IAAU,CMyL9C,oBAAgB,CACd,YAAY,CAAE,eAA8B,CAC9C,+EAAqE,CACnE,OAAO,CAAE,gBAAsB,CAC/B,OAAO,CAAE,gBAAgB,CAC3B,4aAAiY,CAC/X,MAAM,CAAE,WAAW,CACnB,gBAAgB,CAAE,OAAmC,CAEzD,+DAAiE,CAC/D,KAAK,CNzN+B,OAAI,CM0NxC,MAAM,CAAE,iBAAc,CACxB,iFAAmF,CACjF,YAAY,CN5NwB,OAAI,CM8NxC,yHAA+G,CAC7G,aAAa,CN/NqB,OAAI,CMiO1C,oBAAoB,CAClB,OAAO,CAAE,IAAqB,CAC9B,SAAS,CAAE,IAAI,CAKjB,QAAQ,CACN,QAAQ,CAAE,IAAI,CACd,cAAc,CAAE,GAAG,CACnB,KAAK,CAAE,IAAI,CACX,WAAW,CJ3QyB,uDAAM,CI4Q5C,eAAgB,CACd,OAAO,CAAE,aAAgB,CACzB,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,cAA6B,CACrC,SAAS,CAAE,GAAG,CACd,UAAU,CAAE,oBAAmC,CtBhRzC,kBAAoB,CAAE,kBAAM,CAK5B,eAAiB,CAAE,kBAAM,CAezB,UAAY,CAAE,kBAAM,CsB+P5B,MAAM,CACJ,MAAM,CAAE,cAA6B,CACrC,gBAAgB,CNpOoB,IAAM,CMqO1C,gBAAW,CACT,MAAM,CAAE,IAAI,CAChB,2BAA4B,CAC1B,OAAO,CAAE,CAAC,CACZ,uFAA2F,CACzF,MAAM,CAAE,WAAW,CACnB,gBAAgB,CAAE,OAAmC,CAKrD,8DAAuD,CACrD,MAAM,CAAE,WAAW,CACvB,sBAAuB,CACrB,MAAM,CAAE,KAAuB,CAE/B,KAAK,CJzS+B,OAAW,CI0S/C,OAAO,CAAE,KAAK,CACd,kCAAK,CACH,cAAc,CAAE,QAAQ,CAI5B,uBAAuB,CACrB,OAAO,CAAE,YAAY,CACrB,QAAQ,CAAE,MAAM,CAChB,KAAK,CAAE,CAAC,CACR,cAAc,CAAE,MAAM,CAuBxB,iCAAkC,CAChC,WAAW,CAAE,MAAM,CACnB,OAAO,CAAE,GAAqB,CAC9B,qEAAiB,CACf,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,YAAY,CACrB,SAAS,CAAE,GAAG,CACd,gBAAgB,CNjRkB,OAAmB,CMkRrD,MAAM,CAAE,cAA6B,CACrC,KAAK,CN7U6B,IAAI,CM+U1C,kCAAkC,CAChC,WAAW,CAAE,CAAC,CAChB,kCAAkC,CAChC,YAAY,CAAE,CAAC,CAcjB,UAAU,CACR,KAAK,CAAE,IAAuB,CAC9B,MAAM,CAAE,IAAqB,CAC7B,MAAM,CAAE,MAAwB,CAChC,QAAQ,CAAE,QAAQ,CAClB,aAAa,CAAE,GAAG,CAClB,UAAU,CNrW0B,IAAI,CMsWxC,MAAM,CAAE,OAAO,CtB5WT,kBAAoB,CAAE,oBAAM,CAK5B,eAAiB,CAAE,oBAAM,CAezB,UAAY,CAAE,oBAAM,CsB0V1B,iBAAQ,CACN,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,EAAE,CACX,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACZ,aAAa,CAAE,GAAG,CAClB,UAAU,CNhXwB,IAAI,CMiXtC,IAAI,CAAE,IAAI,CACV,GAAG,CAAE,IAAI,CtBvXL,kBAAoB,CAAE,oBAAM,CAK5B,eAAiB,CAAE,oBAAM,CAezB,UAAY,CAAE,oBAAM,CsBqW1B,gBAAO,CACL,OAAO,CAAE,OAAO,CAChB,QAAQ,CAAE,QAAQ,CAClB,IAAI,CAAE,IAAqB,CAC3B,OAAO,CAAE,KAAK,CACd,SAAS,CAAE,IAAI,CACf,KAAK,CNzX6B,IAAI,CM0X1C,iBAAiB,CACf,UAAU,CAAE,OAAmB,CAC/B,wBAAQ,CACN,IAAI,CN5W8B,IAAI,CM6WtC,UAAU,CNtUwB,OAAM,CMuU1C,uBAAO,CACL,OAAO,CAAE,MAAM,CAEnB,8CAA+C,CAC7C,MAAM,CAAE,WAAW,CAiDnB,wGAAyB,CACvB,KAAK,CN7Z6B,OAAI,CM+ZtC,81BAAqP,CACnP,MAAM,CAAE,iBAAc,CAC1B,iDAAQ,CACN,MAAM,CAAE,iBAAc,CAE1B,mBAAmB,CACjB,WAAW,CAAE,MAAM,CACnB,qCAAiB,CACf,OAAO,CAAE,aAAgB,CACzB,OAAO,CAAE,YAAY,CACrB,SAAS,CAAE,GAAG,CAClB,gEAAgE,CAC9D,KAAK,CN3Y+B,OAAM,CM8Y5C,+DAA+D,CAC7D,KAAK,CN/a+B,OAAI,CMkb1C,gEAAgE,CAC9D,KAAK,CNlc+B,OAAO,CMqc7C,6DAA6D,CAC3D,KAAK,CN9Y+B,OAAW,CMoZjD,UAAU,CtB3dF,iBAAoB,CAAE,aAAM,CAK5B,cAAiB,CAAE,aAAM,CAKzB,aAAgB,CAAE,aAAM,CAKxB,YAAe,CAAE,aAAM,CAKvB,SAAY,CAAE,aAAM,CsByc5B,WAAW,CtB7dH,iBAAoB,CAAE,cAAM,CAK5B,cAAiB,CAAE,cAAM,CAKzB,aAAgB,CAAE,cAAM,CAKxB,YAAe,CAAE,cAAM,CAKvB,SAAY,CAAE,cAAM,CsB2c5B,WAAW,CtB/dH,iBAAoB,CAAE,cAAM,CAK5B,cAAiB,CAAE,cAAM,CAKzB,aAAgB,CAAE,cAAM,CAKxB,YAAe,CAAE,cAAM,CAKvB,SAAY,CAAE,cAAM,CsB6c5B,OAAO,CtBjeC,iBAAoB,CAAE,UAAM,CAK5B,cAAiB,CAAE,UAAM,CAKzB,aAAgB,CAAE,UAAM,CAKxB,YAAe,CAAE,UAAM,CAKvB,SAAY,CAAE,UAAM,CsB+c1B,iBAAW,CtBneL,iBAAoB,CsBoeL,wBAAwB,CtB/dvC,cAAiB,CsB+dF,wBAAwB,CtB1dvC,aAAgB,CsB0dD,wBAAwB,CtBrdvC,YAAe,CsBqdA,wBAAwB,CtBhdvC,SAAY,CsBgdG,wBAAwB,CAC7C,kBAAY,CtBreN,iBAAoB,CsBseL,yBAAyB,CtBjexC,cAAiB,CsBieF,yBAAyB,CtB5dxC,aAAgB,CsB4dD,yBAAyB,CtBvdxC,YAAe,CsBudA,yBAAyB,CtBldxC,SAAY,CsBkdG,yBAAyB,CAC9C,kBAAY,CtBveN,iBAAoB,CsBweL,yBAAyB,CtBnexC,cAAiB,CsBmeF,yBAAyB,CtB9dxC,aAAgB,CsB8dD,yBAAyB,CtBzdxC,YAAe,CsBydA,yBAAyB,CtBpdxC,SAAY,CsBodG,yBAAyB,CAEhD,yCAAyC,CAErC,8BAAqB,CACnB,MAAM,CAAE,SAAS,CAEjB,8ZAAqP,CACnP,aAAa,CAAE,KAAK,CACpB,OAAO,CAAE,KAAK,CAClB,cAAK,CACH,aAAa,CAAE,KAAK,CACpB,OAAO,CAAE,KAAK,CAEhB,kYAAqO,CACnO,aAAa,CAAE,CAAC,CAElB,wCAAuB,CACrB,aAAa,CAAE,KAAK,CACpB,UAAU,CAAE,IAAI,CAChB,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACb,4BAAW,CACT,MAAM,CAAE,WAAW,CACvB,iEAAmE,CACjE,OAAO,CAAE,KAAK,CACd,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,KAAuB,EH5ehC,oCAAsB,CQhC1B,YAAY,CAER,OAAO,CAAE,IAAI,ER8Bb,oCAAsB,CQ5B1B,YAAY,CAER,OAAO,CAAE,IAAI,EAEjB,WAAW,CACT,KAAK,CAAE,IAAI,CAEb,YAAY,CACV,KAAK,CAAE,KAAK,CAEd,WAAW,CACT,KAAK,CAAE,IAAI,CC4Cb,mEAAS,CACP,eAAe,CAAE,QAAQ,CACzB,cAAc,CAAE,CAAC,CACjB,WAAW,CAAE,IAAI,CACjB,aAAa,CZ/BuB,IAAI,CYgCxC,2FAAO,CACL,KAAK,CAAE,IAAI,CACX,IAAI,CAAE,6BAAkB,CACxB,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,MAAM,CACpB,yJAAM,CACJ,SAAS,CZjByB,GAAG,CYkBrC,MAAM,CAAE,CAAC,CACT,QAAQ,CAAE,OAAO,CACjB,OAAO,CZnB2B,QAAmC,CYoBvE,iOAA8B,CAC5B,iBAAiB,CAAE,CAAC,CACtB,qFAAK,CACH,KAAK,CAAE,IAAI,CACX,UAAU,CAAE,IAAI,CAChB,cAAc,CAAE,MAAM,CACtB,WAAW,CAAE,MAAM,CACnB,8FAAE,CACA,WAAW,CZnDqB,IAAI,CYoDpC,aAAa,CAAE,iBAA6B,CAChD,4EAAE,CACA,gBAAgB,CAAE,WAAW,CAC7B,cAAc,CAAE,MAAM,CAE1B,kFAAc,CACZ,WAAW,CAAE,IAAuB,CACpC,mHAAY,CACV,aAAa,CAAE,CAAC,CACpB,4HAA4B,CAC1B,KAAK,CAAE,EAAE,CACT,aAAa,CAAE,CAAC,CAChB,uXAA0C,CACxC,MAAM,CAAE,CAAC,CAEb,mBAAmB,CACjB,KAAK,CZxD+B,IAAwB,CYyD5D,SAAS,CAAE,GAAG,CAChB,kBAAkB,CAChB,KAAK,CZ3D+B,IAAwB,CY4D5D,SAAS,CAAE,GAAG,CAIhB,2HAAyD,CACvD,gBAAgB,CZpCoB,OAAmB,CYsCzD,gBAAgB,CACd,gBAAgB,CZvCoB,OAAmB,CY4CzD,kDAAsB,CACpB,MAAM,CAAE,iBAA6B,CACrC,wDAAE,CACA,aAAa,CAAE,iBAA6B,CAC5C,WAAW,CAAE,iBAA6B,CAC5C,gGAAwB,CACtB,mBAAmB,CAAE,CAAC,CAE1B,kBAAkB,CAChB,MAAM,CAAE,iBAA6B,CAGrC,0BAAE,CACA,aAAa,CAAE,iBAA6B,CAC9C,8CAAwB,CACtB,mBAAmB,CAAE,CAAC,CAGxB,2CAAwB,CACtB,mBAAmB,CAAE,CAAC,CACxB,+CAAM,CACJ,YAAY,CAAE,SAAS,CACvB,aAAa,CAAE,iBAA6B,CAC9C,2CAAwB,CACtB,mBAAmB,CAAE,CAAC,CAG1B,oBAAoB,CAClB,aAAa,CZhHuB,IAAI,CYiHxC,SAAS,CAAE,IAAI,CACf,QAAQ,CAAE,IAAI,CACd,0BAAK,CACH,aAAa,CAAE,YAAY,CAC3B,2DAAM,CACJ,WAAW,CAAE,MAAM,CCzIzB,CAAC,CACC,KAAK,CbkE+B,OAAW,CajE/C,eAAe,CAAE,IAAI,CACrB,MAAM,CAAE,OAAO,CACf,OAAO,CACL,KAAK,CbgD6B,OAAwB,Ca/C5D,SAAS,CACP,KAAK,Cb6C6B,OAAO,CanB7C,IAAI,CACF,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,MAAM,CAEpB,IAAI,CACF,WAAW,CX3CyB,uDAAM,CW4C1C,WAAW,CAAE,MAAM,CACnB,KAAK,CX/C+B,OAAW,CWgD/C,UAAU,CAAE,IAAI,CAChB,UAAU,CAAE,MAAM,CAClB,UAAU,CbnD0B,OAAO,CaqD7C,aAAa,CACX,UAAU,CAAE,IAAI,CAElB,eAAe,CACb,UAAU,CAAE,MAAM,CAEpB,cAAc,CACZ,UAAU,CAAE,KAAK,CAEnB,cAAc,CACZ,SAAS,CAAE,IAAI,CAEjB,eAAe,CACb,SAAS,CAAE,IAAI,CAEjB,oBAAqB,CACnB,SAAS,CAAE,GAAG,CAEhB,eAAe,CACb,eAAe,CAAE,YAAY,CAE/B,gBAAgB,CACd,KAAK,CAAE,kBAAkB,CAC3B,uBAAuB,CACrB,KAAK,CAAE,kBAAgC,CACzC,aAAa,CACX,KAAK,CAAE,kBAAgB,CACzB,oBAAoB,CAClB,KAAK,CAAE,kBAA8B,CACvC,gBAAgB,CACd,KAAK,CAAE,kBAAiB,CAC1B,uBAAuB,CACrB,KAAK,CAAE,kBAA+B,CACxC,eAAe,CACb,KAAK,CAAE,kBAAe,CACxB,sBAAsB,CACpB,KAAK,CAAE,kBAA6B,CACtC,gBAAgB,CACd,KAAK,CAAE,kBAAsB,CAC/B,uBAAuB,CACrB,KAAK,CAAE,kBAAoC,CAkB7C,+CAAyB,CACvB,UAAU,CAAE,CAAC,CACb,WAAW,CAAE,GAAG,CAChB,WAAW,CX9GyB,0DAAa,CWgHnD,CAAC,CACC,WAAW,Cb1FyB,IAAI,Ca2FxC,MAAM,CAAE,CAAC,CACT,SAAS,Cb/F2B,IAAI,CagGxC,aAAa,Cb7FuB,IAAI,Ca+F1C,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,yBAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,SAAS,CAAE,IAAI,CAEjB,EAAE,CACA,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,GAAG,CACX,MAAM,CAAE,CAAC,CACT,UAAU,CAAE,iBAA6B,CACzC,MAAM,CAAE,MAAmB,CAC3B,OAAO,CAAE,CAAC,CAEZ,sCAAI,CACF,WAAW,CAAE,MAAM,CACnB,SAAS,CAAE,IAAI,CACf,UAAU,CblG0B,IAAM,CamG1C,MAAM,CAAE,iBAAiC,CACzC,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,KAAK,CACd,WAAW,CXrJyB,wMAAQ,CWsJ5C,KAAK,Cb1H+B,OAAI,Ca2HxC,UAAU,CAAE,IAAI,CAChB,0CAAY,CACV,SAAS,CAAE,GAAG,CAmClB,wFAAmB,CACjB,UAAU,CAAE,IAAI,CAChB,WAAW,CbzKyB,IAAI,Ca0KxC,aAAa,Cb1KuB,IAAI,Ca2KxC,oGAAE,CACA,UAAU,CAAE,IAAI,CAChB,WAAW,Cb7KuB,IAAI,Ca8KtC,wJAAY,CACV,aAAa,CAAE,CAAC,CAClB,gHAAE,CACA,aAAa,CAAE,CAAC,CAClB,gHAAE,CACA,UAAU,CAAE,MAAM,CAClB,4HAAE,CACA,UAAU,CAAE,MAAM,CACtB,4HAAK,CACH,UAAU,CAAE,OAAO,CAEzB,iFAAsB,CACpB,UAAU,CAAE,OAAO,CACnB,WAAW,Cb3LyB,IAAI,Ca4LxC,aAAa,Cb5LuB,IAAI,Ca6LxC,6FAAE,CACA,UAAU,CAAE,OAAO,CACnB,WAAW,Cb/LuB,IAAI,CagMtC,iJAAY,CACV,aAAa,CAAE,CAAC,CAClB,yGAAE,CACA,aAAa,CAAE,CAAC,CAChB,qHAAE,CACA,UAAU,CAAE,IAAI,CCrOxB,kBAAkB,CAChB,MAAM,CAAE,iBAA6B,CACrC,aAAa,CAAE,IAAI,CACnB,OAAO,Cd6B6B,IAAI,Cc5BxC,WAAW,CAAE,IAAqB,CAClC,WAAW,CAAE,GAAG,CAChB,UAAU,CdoD0B,IAAM,CcnD1C,QAAQ,CAAE,QAAQ,CAClB,wBAAO,CACL,OAAO,CAAE,SAAS,CAClB,QAAQ,CAAE,QAAQ,CAClB,GAAG,CAAE,GAAG,CACR,IAAI,CAAE,GAAG,CACT,UAAU,CdoDwB,OAAO,CcnDzC,KAAK,CAAE,IAAoB,CAC3B,OAAO,CAAE,QAA2C,CACtD,2CAA0B,CACxB,MAAM,CAAE,iBAA6B,CACrC,aAAa,CdcqB,IAAI,CcZ1C,+GAAmC,CACjC,MAAM,CAAE,iBAA6B,CACrC,OAAO,CAAE,GAAG,CACZ,UAAU,CAAE,IAAI,CAChB,UAAU,CdkC0B,IAAM,CchC1C,MAAM,CAAE,YAAyB,CACjC,gLAAuB,CACrB,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,IAAI,CAChB,MAAM,CAAE,CAAC,CAEb,+BAA+B,CAC7B,KAAK,CAAE,IAAI,CACb,cAAc,CACZ,YAAY,CAAE,iBAA0C,CACxD,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,SAA2C,CACpD,WAAW,CZ3ByB,wMAAQ,CY4B5C,SAAS,CAAE,IAAI,CACf,WAAW,CAAE,GAAG,CAChB,KAAK,CdI+B,OAAwB,CcH9D,2BAA2B,CACzB,WAAW,CAAE,GAAG,CAChB,MAAM,CAAE,CAAC,CACT,OAAO,CAAE,SAA2C,CACpD,WAAW,CZnCyB,wMAAQ,CYoC5C,SAAS,CAAE,IAAI,CACf,WAAW,CAAE,GAAG,CAChB,OAAO,CAAE,KAAK,CACd,QAAQ,CAAE,IAAI,CACd,KAAK,CZ7C+B,OAAW,CYiDjD,YAAY,CACV,2IAAgE,CAC9D,WAAW,CAAE,QAAQ,ECzDzB,IAAI,CACF,gBAAgB,CAAE,IAAO,CACzB,MAAM,CAAE,OAAO,CACf,OAAO,CAAE,MAAM,CACf,OAAO,CAAE,KAAK,CAChB,EAAE,CACA,KAAK,CAAE,IAAO,CACd,UAAU,CAAE,MAAM,CACpB,IAAI,CACF,KAAK,CAAE,OAAO,CACd,gBAAgB,CAAE,OAAO,CAC3B,EAAE,CACA,WAAW,CAAE,IAAI,CACnB,EAAE,CACA,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,UAAU,CAAE,MAAM,CACpB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,UAAU,CAAE,MAAM,CACpB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACjB,UAAU,CAAE,MAAM,CACpB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,gBAAgB,CAAE,IAAO,CAC3B,MAAM,CACJ,KAAK,CAAE,IAAO,CACd,gBAAgB,CAAE,IAAO,CAC3B,GAAG,CACD,UAAU,CAAE,MAAM,CACpB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,gBAAgB,CAAE,IAAO,CAC3B,MAAM,CACJ,KAAK,CAAE,IAAO,CACd,gBAAgB,CAAE,IAAO,CAC3B,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,MAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,EAAE,CACA,KAAK,CAAE,IAAO,CAChB,EAAE,CACA,KAAK,CAAE,IAAO,CAChB,EAAE,CACA,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,OAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,MAAM,CACf,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CACd,WAAW,CAAE,IAAI,CACnB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,WAAW,CAAE,IAAI,CACnB,EAAE,CACA,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,OAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,OAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,IAAI,CACb,GAAG,CACD,KAAK,CAAE,IAAO,CAChB,GAAG,CACD,KAAK,CAAE,IAAI,CACX,gBAAgB,CAAE,OAAO,CCjJ3B,kBAAkB,CAChB,OAAO,CAAE,YAAY,CACrB,uCAAsB,CACpB,KAAK,CAAE,KAAK,CACd,oBAAC,CACC,OAAO,CAAE,YAAY,CACrB,OAAO,CAAE,GAAG,CACZ,gCAAa,CACX,YAAY,CAAE,CAAC,CACrB,qBAAqB,CACnB,aAAa,CAAE,CAAC,CAChB,KAAK,ChBiC+B,OAAwB,CgBhC5D,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,YAAY,CbmBnB,oCAAsB,CafxB,qBAAqB,CACnB,OAAO,CAAE,IAAI,CACf,uCAAuC,CACrC,OAAO,CAAE,IAAI,EAEjB,YAAY,CACV,uCAAuC,CACrC,OAAO,CAAE,IAAI,ECxBjB,SAAS,CACP,QAAQ,CAAE,KAAK,CACf,GAAG,CCAO,OAAO,CDGjB,gBAAO,CACL,eAAe,CAAE,IAAI,CAEzB,cAAc,C/B+FZ,KAAK,CAAE,CAAC,CACR,0CAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,oBAAO,CACL,KAAK,CAAE,IAAI,C+BnGb,mCAAM,CACJ,OAAO,CAAE,YAAY,CACvB,uBAAQ,CACN,UAAU,CAAE,qBAAoB,CAEhC,6BAAa,CACX,WAAW,CAAE,iBAAyB,CACxC,8BAAc,CACZ,YAAY,CAAE,iBAAyB,CAC3C,gBAAC,CACC,MAAM,CAAE,IAAmB,CAC3B,OAAO,CAAE,YAAY,CACrB,WAAW,CAAE,IAAmB,CAChC,OAAO,CAAE,MAAiB,CAG5B,oDAAiB,CACf,MAAM,CAAE,IAAmB,CAC3B,OAAO,CAAE,YAAY,CACrB,WAAW,CAAE,IAAmB,CAChC,OAAO,CAAE,SAAS,CAClB,aAAa,CAAE,CAAC,CAChB,OAAO,CAAE,KAAK,CACd,WAAW,CAAE,IAAI,CACjB,cAAc,CAAE,SAAS,CACzB,SAAS,CAAE,GAAG,CACd,KAAK,CjBvB6B,IAAI,CiBwBtC,WAAW,CAAE,MAAM,CAErB,oBAAE,CACA,aAAa,CAAE,CAAC,CAEhB,+BAAY,CACV,UAAU,CAAE,iBAAyB,CACvC,kCAAe,CACb,aAAa,CAAE,iBAAyB,CAC1C,4BAAS,CACP,UAAU,CAAE,OAAsC,CAClD,8BAAC,CACC,KAAK,CjBNyB,IAAwB,CiBOtD,YAAY,CAAE,iBAAgD,CAC9D,OAAO,CAAE,gBAAyB,CAClC,oCAAO,CACL,UAAU,CAAE,OAAsC,CACxD,mGAAI,CACF,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,OAAO,CACnB,KAAK,CAAE,OAAO,CACd,YAAY,CAAE,CAAC,CACf,aAAa,CAAE,CAAC,CAElB,wCAAmB,CACjB,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,IAAI,CACX,WAAW,CAAE,MAAM,CAGnB,SAAS,CAAE,KAAI,CACf,WAAW,CAAE,KAAK,CAClB,KAAK,CAAE,OAAyB,CAGpC,wDAAuB,CACrB,KAAK,CfnE6B,OAAW,CeoE7C,OAAO,CAAE,gBAAmB,CAC5B,WAAW,CAAE,IAAI,CACjB,QAAQ,CAAE,QAAQ,CAClB,UAAU,CjBtEwB,OAAyB,CiBuE3D,MAAM,CAAE,IAAI,CACZ,aAAa,CAAE,iBAAgD,CAC/D,UAAU,CAAE,iBAAgD,CAC5D,YAAY,CAAE,YAAY,CAE1B,oEAAO,CACL,UAAU,CjB7EsB,OAAyB,CiB8EzD,4GAAmB,CACjB,KAAK,CjB3CyB,IAAwB,CiB4C1D,gGAAmB,CAGjB,OAAO,CAAE,KAAK,CACd,SAAS,CAAE,KAAI,CACf,WAAW,CAAE,KAAK,CAClB,KAAK,CAAE,IAAyB,CAIlC,iHAAI,CACF,OAAO,CAAE,IAAI,CACf,iIAAc,CACZ,OAAO,CAAE,KAAK,CAGd,yCAAG,CACD,UAAU,CAAE,OAAsC,CAClD,OAAO,CAAE,gBAAyB,CACpC,uDAAiB,CACf,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,OAAsC,CAClD,OAAO,CAAE,gBAAyB,CACtC,2DAA2B,CACzB,KAAK,CjBpE2B,IAAwB,CiBqE1D,mDAAmB,CACjB,KAAK,CAAE,OAAsC,CACjD,+BAAa,CACX,SAAS,CAAE,KAAI,CAEb,yCAAG,CACD,UAAU,CAAE,OAAsC,CAClD,OAAO,CAAE,gBAAyB,CACpC,uDAAiB,CACf,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,OAAsC,CAClD,OAAO,CAAE,gBAAyB,CAClC,UAAU,CAAE,IAAI,CAChB,aAAa,CAAE,IAAI,CACvB,2DAA2B,CACzB,KAAK,CjBpF2B,IAAwB,CiBqF1D,mDAAmB,CACjB,KAAK,CAAE,OAAsC,CACjD,+BAAa,CACX,SAAS,CAAE,KAAI,CAEjB,+BAAa,CACX,OAAO,CAAE,KAAK,CAChB,uBAAK,CACH,aAAa,CAAE,CAAC,CAChB,OAAO,CAAE,IAAI,CAEb,kCAAK,CACH,OAAO,CAAE,KAAK,CAClB,4BAAU,CACR,aAAa,CAAE,CAAC,CAChB,KAAK,CjBnG6B,OAAwB,CiBoG1D,WAAW,CAAE,MAAM,CACrB,mBAAC,CACC,OAAO,CAAE,YAAY,CACrB,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,gBAAmB,CAC5B,OAAO,CAAE,KAAK,CACd,QAAQ,CAAE,QAAQ,CAClB,SAAS,CAAE,GAAG,CACd,KAAK,CjB5G6B,OAAwB,CiB6G1D,yBAAO,CACL,gBAAgB,CAAE,OAAoC,CACtD,MAAM,CAAE,OAAO,CACf,6CAAmB,CACjB,KAAK,CjBjHyB,OAAwB,CiBkH1D,0BAAQ,CACN,gBAAgB,CjB/EgB,OAAW,CiBgF3C,MAAM,CAAE,OAAO,CACf,KAAK,CjBvG2B,IAAM,CiBwGtC,8CAAmB,CACjB,KAAK,CjBzGyB,IAAM,CiB2G5C,mBAAmB,CACjB,OAAO,CjBhF6B,GAAG,CiBiFvC,gBAAgB,CjBvFoB,OAAW,CiBwF/C,UAAU,CAAE,MAAM,CAClB,OAAO,CAAE,OAAW,CACpB,OAAO,CAAE,KAAK,CACd,KAAK,CjBpK+B,OAAyB,CiBqK7D,aAAa,CAAE,OAAW,CAC1B,oCAAgB,CACd,KAAK,CAAE,IAAI,CACX,aAAa,CAAE,IAAI,CACnB,OAAO,CAAE,QAAQ,CACjB,YAAY,CAAE,OAAuB,CACvC,uBAAG,CACD,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,sBAA0B,CAClC,MAAM,CAAE,IAAI,CACZ,KAAK,CAAE,IAAI,CACX,gBAAgB,CjBvGkB,OAAW,CiBwG7C,OAAO,CAAE,GAAG,CACZ,aAAa,CAAE,IAAI,CACrB,wDAAqB,CACnB,KAAK,CjBpL6B,OAAyB,CiBqL3D,SAAS,CAAE,IAAI,CACf,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,YAAY,CACrB,OAAO,CAAE,OAA2C,CACpD,aAAa,CAAE,OAAW,CAE1B,oEAAO,CACL,UAAU,CAAE,qBAAoB,CAClC,0EAAQ,CACN,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,MAAM,CACd,MAAM,CAAE,IAAI,CACZ,KAAK,CAAE,IAAI,CACX,aAAa,CAAE,CAAC,CAChB,SAAS,CAAE,IAAI,CACf,UAAU,CAAE,WAAa,CAEzB,oFAAQ,CACN,UAAU,CAAE,MAAM,CAGxB,gCAAM,CACJ,KAAK,CjBlI6B,OAAW,CiBmI/C,2BAAC,CACC,KAAK,CjBxK6B,OAAwB,CiByK1D,iCAAO,CACL,gBAAgB,CjBtIgB,OAAW,CiBuI3C,KAAK,CjB7J2B,IAAM,CiB+J5C,gBAAgB,CjChNR,kBAAoB,CAAE,gBAAM,CAK5B,eAAiB,CAAE,gBAAM,CAezB,UAAY,CAAE,gBAAM,CiC8L1B,QAAQ,CAAE,QAAQ,CAClB,OAAO,CAAE,CAAC,CACV,KAAK,CAAE,IAAI,CACX,OAAO,CAAE,CAAC,CACV,4BAAa,CACX,IAAI,CAAE,CAAC,CACP,KAAK,CAAE,IAAI,CACX,OAAO,CAAE,CAAC,CACZ,0BAAW,CACT,KAAK,CAAE,IAAI,CACX,IAAI,CAAE,KAAK,CACX,OAAO,CAAE,CAAC,CACZ,2BAAY,CACV,KAAK,CAAE,KAAK,CACZ,IAAI,CAAE,IAAI,CACV,OAAO,CAAE,CAAC,CAGd,gBAAgB,CACd,UAAU,CAAE,qBAAuC,CACnD,gBAAgB,CAAE,2uCAA2uC,CAC7vC,eAAe,CAAE,SAAsB,CAEzC,gBAAgB,CACd,QAAQ,CAAE,QAAQ,CAClB,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CAEd,YAAY,CACV,QAAQ,CAAE,KAAK,CACf,GAAG,CAAE,CAAC,CACN,MAAM,CAAE,CAAC,CACT,IAAI,CAAE,CAAC,CACP,cAAc,CAAE,GAAG,CACnB,KAAK,CjB5K+B,KAAK,CiB6KzC,UAAU,CAAE,MAAM,CAClB,UAAU,CAAE,MAAM,CAClB,UAAU,CAAE,IAAI,CAChB,UAAU,CjBlLsB,OAAe,CiBmL/C,OAAO,CjB5K6B,GAAG,CiB8KzC,WAAW,CACT,OAAO,CAAE,IAAI,CACb,UAAU,CjBtL0B,OAAW,CiBuL/C,KAAK,CjB7M+B,IAAM,CiB8M1C,OAAO,CAAE,gBAAuB,CAChC,QAAQ,CAAE,QAAQ,CAClB,WAAW,CAAE,IAAI,CACjB,UAAU,CAAE,MAAM,CAClB,SAAS,CAAE,IAAI,C/BrKf,KAAK,CAAE,CAAC,CACR,oCAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,iBAAO,CACL,KAAK,CAAE,IAAI,C+BiKb,aAAC,CACC,KAAK,CjBrN6B,IAAM,CiBsNxC,WAAW,CAAE,IAAI,CAEnB,eAAG,CACD,YAAY,CAAE,IAAqB,CACnC,MAAM,CAAE,IAAI,CACZ,KAAK,CAAE,IAAI,CACX,gBAAgB,CjBtMkB,OAAW,CiBuM7C,OAAO,CAAE,GAAG,CACZ,aAAa,CAAE,IAAI,CACrB,aAAC,CACC,SAAS,CAAE,IAAI,CACf,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,OAAO,CAEnB,oBAAoB,CAClB,WAAW,CjB9MyB,KAAK,CiB+MzC,UAAU,CjBzR0B,OAAyB,CiB0R7D,UAAU,CAAE,IAAI,CAElB,eAAe,CACb,OAAO,CAAE,eAAmB,CAC5B,MAAM,CAAE,IAAI,CACZ,SAAS,CAAE,KAAK,CAChB,MAAM,CAAE,IAAI,CAEd,aAAa,CACX,QAAQ,CAAE,KAAK,CACf,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACZ,UAAU,CAAE,eAAc,CAC1B,OAAO,CAAE,IAAI,CACb,OAAO,CAAE,GAAkB,CAC3B,gBAAI,CACF,OAAO,CAAE,KAAK,CAClB,MAAM,CACJ,KAAK,CjBrS+B,IAAI,CiBsSxC,QAAC,CACC,aAAa,CAAE,IAAqB,CAExC,mBAAmB,C/BhNjB,KAAK,CAAE,CAAC,CACR,oDAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,yBAAO,CACL,KAAK,CAAE,IAAI,C+B8Mb,0BAAU,CACR,aAAa,CjB5RqB,IAAI,CiB6RtC,aAAa,CAAE,iBAA6B,CAC5C,cAAc,CjB9RoB,IAAI,CiB+RxC,sCAAsB,CACpB,UAAU,CAAE,iBAA6B,CACzC,WAAW,CjBjSuB,IAAI,CiBkSxC,4BAAY,CACV,SAAS,CAAE,IAAI,CACf,aAAa,CAAE,IAAqB,CACpC,OAAO,CAAE,YAAY,CACvB,wBAAQ,CACN,KAAK,CjB5R6B,IAAwB,CiB6R1D,SAAS,CAAE,GAAG,CdxSd,oCAAsB,Cc4SxB,gBAAgB,CACd,UAAU,CjBtUwB,OAAyB,CiBuU7D,WAAW,CACT,OAAO,CAAE,KAAK,CAChB,YAAY,CAER,IAAI,CAAE,MAAmB,CAG3B,kBAAO,CACL,KAAK,CAAE,GAAG,CACV,IAAI,CAAE,CAAC,CACX,oBAAoB,CAClB,WAAW,CAAE,CAAC,CACd,oCAAe,CACb,OAAO,CCzVD,OAAO,CD0Vf,0BAAO,CACL,QAAQ,CAAE,KAAK,CACf,SAAS,CAAE,IAAI,CACf,IAAI,CAAE,GAAG,CACT,GAAG,CAAE,CAAC,CACN,MAAM,CAAE,IAAI,CACZ,QAAQ,CAAE,MAAM,EdlUlB,qCAAsB,CcqUxB,oBAAoB,CAClB,UAAU,CAAE,gBAAe,CAC7B,eAAe,CACb,MAAM,CAAE,CAAC,CACT,UAAU,CjBlWwB,OAAyB,EiBoW/D,YAAY,CACV,iCAAmC,CACjC,OAAO,CAAE,IAAI,CACf,oBAAoB,CAClB,WAAW,CAAE,CAAC,EE/WlB,aAAa,CACX,QAAQ,CAAE,KAAK,CACf,MAAM,CAAE,CAAC,CACT,IAAI,CAAE,CAAC,CACP,KAAK,CnB6E+B,KAAK,CmB5EzC,KAAK,CnBE+B,OAAyB,CmBD7D,UAAU,CAAE,OAAkC,CAC9C,UAAU,CAAE,kBAAiC,CAC7C,WAAW,CjBAyB,uDAAM,CiBC1C,OAAO,CnB+E6B,GAAG,CmB9EvC,eAAC,CACC,KAAK,CnBqE6B,OAAW,CmBpE7C,eAAe,CAAE,IAAI,CACvB,8BAAgB,CACd,OAAO,CAAE,IAAI,CACf,kCAAoB,CAClB,OAAO,CAAE,IAAqB,CAC9B,gBAAgB,CAAE,OAAkC,CACpD,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,KAAK,CACjB,SAAS,CAAE,GAAG,CACd,MAAM,CAAE,OAAO,CACf,KAAK,CnBiD6B,OAAM,CdgC1C,KAAK,CAAE,CAAC,CACR,kFAAS,CAEP,OAAO,CAAE,KAAK,CACd,OAAO,CAAE,EAAE,CACb,wCAAO,CACL,KAAK,CAAE,IAAI,CiCrFX,uqDAAG,CACD,KAAK,CnBlB2B,OAAyB,CmBmB3D,yFAAQ,CACN,KAAK,CAAE,IAAI,CACb,6CAAU,CACR,KAAK,CAAE,IAAI,CACb,kDAAiB,CACf,gBAAgB,CnBQgB,OAAI,CmBPpC,KAAK,CnB0B2B,IAAM,CmBzBxC,yDAAwB,CACtB,gBAAgB,CnBXgB,OAAO,CmBYvC,KAAK,CnBzB2B,IAAI,CmB0BxC,0CAA8B,CAC5B,OAAO,CAAE,KAAK,CAChB,iCAAmB,CACjB,SAAS,CAAE,GAAG,CACd,OAAO,CAAE,IAAqB,CAC9B,KAAK,CnBE6B,IAAwB,CmBD1D,OAAO,CAAE,IAAI,CACb,oCAAE,CACA,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,GAAG,CACX,MAAM,CAAE,CAAC,CACT,MAAM,CAAE,MAAM,CACd,OAAO,CAAE,CAAC,CACV,UAAU,CAAE,iBAA6C,CAC3D,oCAAE,CACA,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,CAAC,CACT,sCAAC,CACC,OAAO,CAAE,YAAY,CACrB,OAAO,CAAE,GAAqB,CAC9B,KAAK,CnBjDyB,OAAyB,CmBkD7D,uBAAW,CACT,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACZ,KAAK,CAAE,IAAI,CACX,IAAI,CAAE,IAAI,CACV,MAAM,CAAE,IAAI,CACZ,SAAS,CnBkByB,KAAK,CmBjBvC,kCAAU,CACR,KAAK,CAAE,IAAI,CACb,mEAAQ,CACN,KAAK,CAAE,IAAI,CACb,qDAA+B,CAC7B,UAAU,CAAE,KAAK,CACjB,+HAAQ,CACN,KAAK,CAAE,IAAI,CACb,gEAAU,CACR,KAAK,CAAE,IAAI,CACf,4CAAoB,CAClB,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,CACZ,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,KAAuB,CAChC,OAAO,CAAE,KAAK,CACd,UAAU,CAAE,MAAM,ChBhDpB,oCAAsB,CgBmDxB,aAAa,CACX,KAAK,CAAE,GAAG,CACV,OAAO,CAAE,IAAI,CACb,mBAAO,CACL,OAAO,CAAE,KAAK,CAClB,GAAG,CACD,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,IAAI,ECzEd,gBAAG,CACD,SAAS,CAAE,IAAI,CACf,MAAM,CAAE,eAAe,CAEzB,uBAAU,CACR,aAAa,CpBUqB,IAAI,CoBRxC,oCAAuB,CACrB,UAAU,CAAE,MAAM,CAGpB,qDAAoC,CAClC,aAAa,CpBGqB,IAAI,CoBQxC,uBAAU,CACR,WAAW,CpBTuB,IAAI,CoBUtC,WAAW,CpBVuB,IAAI,CoBWtC,aAAa,CpBXqB,IAAI,CoBiBtC,kTAAK,CACH,aAAa,CAAE,CAAC,CAKlB,qCAAQ,CACN,YAAY,CAAE,GAAG,CAUrB,8BAAiB,CACf,YAAY,CAAE,eAAc,CAC5B,mEAAM,CACJ,UAAU,CAAE,sBAAsB,CAClC,YAAY,CAAE,0BAAyB,CAG3C,0EAAiD,CAC/C,UAAU,CAAE,WAAW,CACzB,0EAAiD,CAC/C,UAAU,CAAE,WAAW,CAGzB,qDAA4B,CAC1B,aAAa,CAAE,IAAqB,CACtC,wBAAW,CACT,WAAW,CpBlDuB,IAAI,CoBqDxC,yBAAY,CACV,WAAW,CAAE,IAAI,CACjB,aAAa,CAAE,IAAqB,CACtC,yBAAY,CACV,KAAK,ClBnF6B,OAAW,CkBoF/C,yBAAY,CACV,KAAK,CAAE,KAAK,CACZ,MAAM,CAAE,iBAA2C,CACrD,wBAAW,CACT,KAAK,CAAE,IAAI,CACX,MAAM,CAAE,iBAA2C,CACrD,0BAAa,CACX,MAAM,CAAE,IAAI,CACZ,OAAO,CAAE,KAAK,CAMd,4QAAW,CACT,OAAO,CAAE,IAAI,CACb,UAAU,CAAE,MAAM,CAClB,SAAS,CAAE,IAAI,CAEf,kUAAO,CACL,UAAU,CAAE,OAAO,CACnB,OAAO,CAAE,GAAO,CAChB,WAAW,CAAE,WAAW,CACxB,OAAO,CAAE,YAAY,CACzB,kUAAmB,CACjB,OAAO,CAAE,YAAY,CAGzB,qBAAQ,CACN,KAAK,CAAE,KAAK,CACZ,KAAK,CAAE,GAAG,CACV,OAAO,CAAE,KAAK,CACd,MAAM,CAAE,aAAuC,CAC/C,OAAO,CpB3F2B,IAAI,CoB4FtC,UAAU,CpBpDwB,OAAmB,CoBqDrD,MAAM,CAAE,iBAA6B,CAErC,yEAAS,CACP,SAAS,CAAE,GAAG,CAChB,2BAAK,CACH,aAAa,CAAE,CAAC,CAClB,oCAAc,CACZ,OAAO,CAAE,KAAK,CACd,WAAW,ClB5HqB,0DAAa,CkB6H7C,WAAW,CAAE,IAAI,CACjB,UAAU,CpBnFsB,OAAmB,CoBoFnD,OAAO,CAAE,QAA2C,CACpD,MAAM,CAAE,KAAkB,CAC1B,aAAa,CpB1GmB,IAAI,CoB2GpC,SAAS,CAAE,IAAI,CAEnB,yBAAY,CACV,UAAU,CpBvHwB,OAAO,CoBwHzC,OAAO,CAAE,YAAY,CACrB,WAAW,CAAE,IAAI,CACjB,OAAO,CAAE,KAAuB,CAGlC,iEAAwC,CACtC,cAAc,CAAE,KAAK,CACrB,SAAS,CAAE,GAAG,CAIhB,yEAAgD,CAC9C,UAAU,CAAE,IAAI,CAChB,MAAM,CAAE,IAAI,CACZ,KAAK,CpB/I6B,IAAI,CoBgJtC,+JAAM,CACJ,MAAM,CAAE,IAAI,CACZ,gBAAgB,CAAE,sBAAsB,CACxC,WAAW,CAAE,MAAM,CACrB,2FAAQ,CACN,YAAY,CAAE,CAAC,CACf,aAAa,CAAE,CAAC,CAChB,cAAc,CAAE,GAAG,CAOvB,6BAAgB,CAEd,MAAM,CAAE,IAAI,CACZ,gCAAE,CACA,MAAM,CAAE,IAAI,CACZ,WAAW,CAAE,GAAG,CAClB,uCAAW,CACT,OAAO,CAAE,YAAY,CACrB,UAAU,CAAE,GAAG,CACjB,yCAAW,CACT,aAAa,CAAE,IAAI,CACnB,UAAU,CAAE,IAAI,CAChB,WAAW,CAAE,MAAM,CACrB,yCAAW,CACT,UAAU,CAAE,IAAI,CAChB,YAAY,CAAE,CAAC,CAGnB,iDAAQ,CAEN,KAAK,CpBtL6B,IAAI,CoBuLtC,wHAAO,CACL,SAAS,CAAE,eAAe,CAC1B,WAAW,CAAE,MAAM,CAErB,2HAAU,CACR,WAAW,CAAE,IAAI,CAErB,uDAAY,CACV,KAAK,CpBzH6B,OAAW,CoB0H/C,eAAE,CACA,aAAa,CpB3KqB,IAAI,CoB4KtC,kBAAE,CACA,WAAW,CAAE,IAAI,CAEnB,6EAAgB,CACd,aAAa,CAAE,eAAgC,CAEjD,kBAAE,CACA,MAAM,CAAE,aAA4C,CAMxD,8BAAiB,CACf,aAAa,CpB1LqB,IAAI,CoB4LtC,iCAAE,CACA,OAAO,CAAE,YAAY,CACrB,MAAM,CAAE,KAAuB,CAC/B,SAAS,CAAE,GAAG,CACd,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,OAAmB,CAC/B,KAAK,CpBlJ2B,OAAW,CoBmJ3C,UAAU,CAAE,iBAA6B,CACzC,OAAO,CAAE,GAAqB,CAC9B,QAAQ,CAAE,QAAQ,CAClB,wCAAQ,CACN,KAAK,CAAE,OAAmB,CAC5B,6CAAW,CACT,KAAK,ClBnOyB,OAAW,CkBoOzC,SAAS,CAAE,eAAe,CAE9B,oCAAK,CACH,aAAa,CAAE,GAAqB,CACpC,MAAM,CAAE,IAAI,CACZ,WAAW,CAAE,cAAuB,CACpC,UAAU,CAAE,OAAa,CACzB,KAAK,CpBtM2B,IAAwB,CoBuMxD,gDAAW,CACT,KAAK,ClB7OyB,OAAW,CkB8OzC,SAAS,CAAE,eAAe,CAC9B,6CAAc,CACZ,UAAU,CAAE,CAAC,CAEf,uGAAQ,CACN,WAAW,CAAE,IAAI,CACjB,oRAA2B,CACzB,gBAAgB,CAAE,WAAW,CAC7B,MAAM,CAAE,IAAI,CACZ,OAAO,CAAE,CAAC,CACV,SAAS,CAAE,eAAe,CAC5B,kIAAU,CACR,WAAW,CAAE,IAAI,CAErB,wCAAS,CACP,OAAO,CAAE,YAAY,CACrB,OAAO,CAAE,KAAK,CACd,KAAK,CpB3P2B,IAAI,CoB4PpC,WAAW,CAAE,IAAI,CACnB,wCAAS,CACP,OAAO,CAAE,YAAY,CACrB,aAAa,CAAE,GAAG,CAEtB,uDAA8B,CAC5B,OAAO,CAAE,YAAY,CACrB,KAAK,CpBtM6B,OAAM,CoBuMxC,SAAS,CAAE,GAAG,CACd,YAAY,CpB/OsB,IAAI,CoBgPxC,2BAAc,CACZ,OAAO,CAAE,KAAK,CACd,KAAK,CAAE,KAAK,CACd,qBAAQ,CACN,aAAa,CAAE,IAAI,CACnB,WAAW,CAAE,IAAI,CAEnB,mDAAa,CACX,UAAU,CAAE,OAAO,CACnB,OAAO,CAAE,OAAO,CAChB,WAAW,CAAE,OAAO,CACpB,SAAS,CAAE,OAAO,CAClB,KAAK,CAAE,OAAO,CACd,MAAM,CAAE,OAAO,CACf,WAAW,CAAE,OAAO,CAIlB,mGAAQ,CACN,YAAY,CAAE,GAAG,CjBnQrB,oCAAsB,CiBwQtB,qBAAQ,CACN,KAAK,CAAE,IAAI,ECzSjB,wBAAwB,CACtB,KAAK,CnBK+B,OAAW,CmBHjD,KAAK,CACH,UAAU,CAAE,MAAM,YCHlB,WAAW,CAAE,aAAa,CAC1B,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,qEAAoB,YAGzB,WAAW,CAAE,aAAa,CAC1B,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,yGAAyB,YAG9B,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,6FAAqB,YAG1B,WAAW,CAAE,MAAM,CACnB,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,oFAAkB,YAGvB,WAAW,CAAE,aAAa,CAC1B,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,gHAA4B,YAGjC,WAAW,CAAE,aAAa,CAC1B,UAAU,CAAE,MAAM,CAClB,WAAW,CAAE,GAAG,CAChB,GAAG,CAAE,uGAAyB",
-"sources": ["../../../bower_components/neat/app/assets/stylesheets/grid/_grid.scss","../../../bower_components/bourbon/dist/addons/_prefixer.scss","../../../bower_components/wyrm/sass/wyrm_core/_reset.sass","../../../bower_components/wyrm/sass/wyrm_core/_mixin.sass","../../../bower_components/font-awesome/scss/_path.scss","../../../bower_components/font-awesome/scss/_core.scss","../../../bower_components/font-awesome/scss/_larger.scss","../../../bower_components/font-awesome/scss/_fixed-width.scss","../../../bower_components/font-awesome/scss/_list.scss","../../../bower_components/font-awesome/scss/_variables.scss","../../../bower_components/font-awesome/scss/_bordered-pulled.scss","../../../bower_components/font-awesome/scss/_spinning.scss","../../../bower_components/font-awesome/scss/_rotated-flipped.scss","../../../bower_components/font-awesome/scss/_mixins.scss","../../../bower_components/font-awesome/scss/_stacked.scss","../../../bower_components/font-awesome/scss/_icons.scss","../../../bower_components/wyrm/sass/wyrm_core/_font_icon_defaults.sass","../../../bower_components/wyrm/sass/wyrm_core/_wy_variables.sass","../../../bower_components/wyrm/sass/wyrm_core/_alert.sass","../../../sass/_theme_variables.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_media.scss","../../../bower_components/wyrm/sass/wyrm_core/_button.sass","../../../bower_components/wyrm/sass/wyrm_core/_dropdown.sass","../../../bower_components/wyrm/sass/wyrm_core/_form.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_outer-container.scss","../../../bower_components/neat/app/assets/stylesheets/settings/_grid.scss","../../../bower_components/neat/app/assets/stylesheets/grid/_span-columns.scss","../../../bower_components/wyrm/sass/wyrm_core/_neat_extra.sass","../../../bower_components/wyrm/sass/wyrm_core/_generic.sass","../../../bower_components/wyrm/sass/wyrm_core/_table.sass","../../../bower_components/wyrm/sass/wyrm_core/_type.sass","../../../bower_components/wyrm/sass/wyrm_addons/pygments/_pygments.sass","../../../bower_components/wyrm/sass/wyrm_addons/pygments/_pygments_light.sass","../../../sass/_theme_breadcrumbs.sass","../../../sass/_theme_layout.sass","../../../bower_components/neat/app/assets/stylesheets/grid/_private.scss","../../../sass/_theme_badge.sass","../../../sass/_theme_rst.sass","../../../sass/_theme_mathjax.sass","../../../sass/_theme_font_local.sass"],
-"names": [],
-"file": "theme.css"
-}
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/FontAwesome.otf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot differ
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg	2020-08-26 08:57:19.000000000 +0000
@@ -1,414 +1,2671 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
+<svg>
+<metadata>
+Created by FontForge 20120731 at Mon Oct 24 17:37:40 2016
+ By ,,,
+Copyright Dave Gandy 2016. All rights reserved.
+</metadata>
 <defs>
-<font id="fontawesomeregular" horiz-adv-x="1536" >
-<font-face units-per-em="1792" ascent="1536" descent="-256" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode=" "  horiz-adv-x="448" />
-<glyph unicode="&#x09;" horiz-adv-x="448" />
-<glyph unicode="&#xa0;" horiz-adv-x="448" />
-<glyph unicode="&#xa8;" horiz-adv-x="1792" />
-<glyph unicode="&#xa9;" horiz-adv-x="1792" />
-<glyph unicode="&#xae;" horiz-adv-x="1792" />
-<glyph unicode="&#xb4;" horiz-adv-x="1792" />
-<glyph unicode="&#xc6;" horiz-adv-x="1792" />
-<glyph unicode="&#x2000;" horiz-adv-x="768" />
-<glyph unicode="&#x2001;" />
-<glyph unicode="&#x2002;" horiz-adv-x="768" />
-<glyph unicode="&#x2003;" />
-<glyph unicode="&#x2004;" horiz-adv-x="512" />
-<glyph unicode="&#x2005;" horiz-adv-x="384" />
-<glyph unicode="&#x2006;" horiz-adv-x="256" />
-<glyph unicode="&#x2007;" horiz-adv-x="256" />
-<glyph unicode="&#x2008;" horiz-adv-x="192" />
-<glyph unicode="&#x2009;" horiz-adv-x="307" />
-<glyph unicode="&#x200a;" horiz-adv-x="85" />
-<glyph unicode="&#x202f;" horiz-adv-x="307" />
-<glyph unicode="&#x205f;" horiz-adv-x="384" />
-<glyph unicode="&#x2122;" horiz-adv-x="1792" />
-<glyph unicode="&#x221e;" horiz-adv-x="1792" />
-<glyph unicode="&#x2260;" horiz-adv-x="1792" />
-<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xf000;" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-<glyph unicode="&#xf001;" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf002;" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf003;" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf004;" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
-<glyph unicode="&#xf005;" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf006;" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-<glyph unicode="&#xf007;" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf008;" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf009;" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf00a;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00b;" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf00c;" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-<glyph unicode="&#xf00d;" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-<glyph unicode="&#xf00e;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="&#xf010;" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
-<glyph unicode="&#xf011;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-<glyph unicode="&#xf012;" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf013;" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-<glyph unicode="&#xf014;" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf015;" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="&#xf016;" horiz-adv-x="1280" d="M128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280zM768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z " />
-<glyph unicode="&#xf017;" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf018;" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-<glyph unicode="&#xf019;" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-<glyph unicode="&#xf01a;" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01b;" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01c;" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
-<glyph unicode="&#xf01d;" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf01e;" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-<glyph unicode="&#xf021;" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf022;" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
-<glyph unicode="&#xf023;" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf024;" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf025;" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-<glyph unicode="&#xf026;" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf027;" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-<glyph unicode="&#xf028;" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-<glyph unicode="&#xf029;" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-<glyph unicode="&#xf02a;" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-<glyph unicode="&#xf02b;" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02c;" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-<glyph unicode="&#xf02d;" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-<glyph unicode="&#xf02e;" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf02f;" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-<glyph unicode="&#xf030;" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="&#xf031;" horiz-adv-x="1664" d="M725 977l-170 -450q73 -1 153.5 -2t119 -1.5t52.5 -0.5l29 2q-32 95 -92 241q-53 132 -92 211zM21 -128h-21l2 79q22 7 80 18q89 16 110 31q20 16 48 68l237 616l280 724h75h53l11 -21l205 -480q103 -242 124 -297q39 -102 96 -235q26 -58 65 -164q24 -67 65 -149 q22 -49 35 -57q22 -19 69 -23q47 -6 103 -27q6 -39 6 -57q0 -14 -1 -26q-80 0 -192 8q-93 8 -189 8q-79 0 -135 -2l-200 -11l-58 -2q0 45 4 78l131 28q56 13 68 23q12 12 12 27t-6 32l-47 114l-92 228l-450 2q-29 -65 -104 -274q-23 -64 -23 -84q0 -31 17 -43 q26 -21 103 -32q3 0 13.5 -2t30 -5t40.5 -6q1 -28 1 -58q0 -17 -2 -27q-66 0 -349 20l-48 -8q-81 -14 -167 -14z" />
-<glyph unicode="&#xf032;" horiz-adv-x="1408" d="M555 15q76 -32 140 -32q131 0 216 41t122 113q38 70 38 181q0 114 -41 180q-58 94 -141 126q-80 32 -247 32q-74 0 -101 -10v-144l-1 -173l3 -270q0 -15 12 -44zM541 761q43 -7 109 -7q175 0 264 65t89 224q0 112 -85 187q-84 75 -255 75q-52 0 -130 -13q0 -44 2 -77 q7 -122 6 -279l-1 -98q0 -43 1 -77zM0 -128l2 94q45 9 68 12q77 12 123 31q17 27 21 51q9 66 9 194l-2 497q-5 256 -9 404q-1 87 -11 109q-1 4 -12 12q-18 12 -69 15q-30 2 -114 13l-4 83l260 6l380 13l45 1q5 0 14 0.5t14 0.5q1 0 21.5 -0.5t40.5 -0.5h74q88 0 191 -27 q43 -13 96 -39q57 -29 102 -76q44 -47 65 -104t21 -122q0 -70 -32 -128t-95 -105q-26 -20 -150 -77q177 -41 267 -146q92 -106 92 -236q0 -76 -29 -161q-21 -62 -71 -117q-66 -72 -140 -108q-73 -36 -203 -60q-82 -15 -198 -11l-197 4q-84 2 -298 -11q-33 -3 -272 -11z" />
-<glyph unicode="&#xf033;" horiz-adv-x="1024" d="M0 -126l17 85q4 1 77 20q76 19 116 39q29 37 41 101l27 139l56 268l12 64q8 44 17 84.5t16 67t12.5 46.5t9 30.5t3.5 11.5l29 157l16 63l22 135l8 50v38q-41 22 -144 28q-28 2 -38 4l19 103l317 -14q39 -2 73 -2q66 0 214 9q33 2 68 4.5t36 2.5q-2 -19 -6 -38 q-7 -29 -13 -51q-55 -19 -109 -31q-64 -16 -101 -31q-12 -31 -24 -88q-9 -44 -13 -82q-44 -199 -66 -306l-61 -311l-38 -158l-43 -235l-12 -45q-2 -7 1 -27q64 -15 119 -21q36 -5 66 -10q-1 -29 -7 -58q-7 -31 -9 -41q-18 0 -23 -1q-24 -2 -42 -2q-9 0 -28 3q-19 4 -145 17 l-198 2q-41 1 -174 -11q-74 -7 -98 -9z" />
-<glyph unicode="&#xf034;" horiz-adv-x="1792" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l215 -1h293l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -42.5 2t-103.5 -1t-111 -1 q-34 0 -67 -5q-10 -97 -8 -136l1 -152v-332l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-88 0 -233 -14q-48 -4 -70 -4q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q8 192 6 433l-5 428q-1 62 -0.5 118.5t0.5 102.5t-2 57t-6 15q-6 5 -14 6q-38 6 -148 6q-43 0 -100 -13.5t-73 -24.5q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1744 128q33 0 42 -18.5t-11 -44.5 l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80z" />
-<glyph unicode="&#xf035;" d="M81 1407l54 -27q20 -5 211 -5h130l19 3l115 1l446 -1h318l34 -2q14 -1 28 7t21 16l7 8l42 1q15 0 28 -1v-104.5t1 -131.5l1 -100l-1 -58q0 -32 -4 -51q-39 -15 -68 -18q-25 43 -54 128q-8 24 -15.5 62.5t-11.5 65.5t-6 29q-13 15 -27 19q-7 2 -58.5 2t-138.5 -1t-128 -1 q-94 0 -127 -5q-10 -97 -8 -136l1 -152v52l3 -359l-1 -147q-1 -46 11 -85q49 -25 89 -32q2 0 18 -5t44 -13t43 -12q30 -8 50 -18q5 -45 5 -50q0 -10 -3 -29q-14 -1 -34 -1q-110 0 -187 10q-72 8 -238 8q-82 0 -233 -13q-45 -5 -70 -5q-2 22 -2 26l-1 26v9q21 33 79 49 q139 38 159 50q9 21 12 56q6 137 6 433l-5 44q0 265 -2 278q-2 11 -6 15q-6 5 -14 6q-38 6 -148 6q-50 0 -168.5 -14t-132.5 -24q-13 -9 -22 -33t-22 -75t-24 -84q-6 -19 -19.5 -32t-20.5 -13q-44 27 -56 44v297v86zM1505 113q26 -20 26 -49t-26 -49l-162 -126 q-26 -20 -44.5 -11t-18.5 42v80h-1024v-80q0 -33 -18.5 -42t-44.5 11l-162 126q-26 20 -26 49t26 49l162 126q26 20 44.5 11t18.5 -42v-80h1024v80q0 33 18.5 42t44.5 -11z" />
-<glyph unicode="&#xf036;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf037;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf038;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf039;" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf03a;" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03b;" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03c;" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf03d;" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
-<glyph unicode="&#xf03e;" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf040;" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
-<glyph unicode="&#xf041;" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-<glyph unicode="&#xf042;" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf043;" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-<glyph unicode="&#xf044;" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-<glyph unicode="&#xf045;" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-<glyph unicode="&#xf046;" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
-<glyph unicode="&#xf047;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf048;" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
-<glyph unicode="&#xf049;" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
-<glyph unicode="&#xf04a;" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
-<glyph unicode="&#xf04b;" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-<glyph unicode="&#xf04c;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04d;" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf04e;" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf050;" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="&#xf051;" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
-<glyph unicode="&#xf052;" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-<glyph unicode="&#xf053;" horiz-adv-x="1152" d="M742 -37l-652 651q-37 37 -37 90.5t37 90.5l652 651q37 37 90.5 37t90.5 -37l75 -75q37 -37 37 -90.5t-37 -90.5l-486 -486l486 -485q37 -38 37 -91t-37 -90l-75 -75q-37 -37 -90.5 -37t-90.5 37z" />
-<glyph unicode="&#xf054;" horiz-adv-x="1152" d="M1099 704q0 -52 -37 -91l-652 -651q-37 -37 -90 -37t-90 37l-76 75q-37 39 -37 91q0 53 37 90l486 486l-486 485q-37 39 -37 91q0 53 37 90l76 75q36 38 90 38t90 -38l652 -651q37 -37 37 -90z" />
-<glyph unicode="&#xf055;" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf056;" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
-<glyph unicode="&#xf057;" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf058;" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf059;" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05a;" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05b;" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf05c;" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05d;" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf05e;" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-<glyph unicode="&#xf060;" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
-<glyph unicode="&#xf061;" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-<glyph unicode="&#xf062;" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
-<glyph unicode="&#xf063;" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf064;" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-<glyph unicode="&#xf065;" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf066;" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-<glyph unicode="&#xf067;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf068;" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf069;" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-<glyph unicode="&#xf06a;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-<glyph unicode="&#xf06b;" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf06c;" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-<glyph unicode="&#xf06d;" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-<glyph unicode="&#xf06e;" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-<glyph unicode="&#xf070;" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
-<glyph unicode="&#xf071;" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-<glyph unicode="&#xf072;" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-<glyph unicode="&#xf073;" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf074;" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf075;" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf076;" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf077;" horiz-adv-x="1664" d="M1611 320q0 -53 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-486 485l-486 -485q-36 -38 -90 -38t-90 38l-75 75q-38 36 -38 90q0 53 38 91l651 651q37 37 90 37q52 0 91 -37l650 -651q38 -38 38 -91z" />
-<glyph unicode="&#xf078;" horiz-adv-x="1664" d="M1611 832q0 -53 -37 -90l-651 -651q-38 -38 -91 -38q-54 0 -90 38l-651 651q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l486 -486l486 486q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="&#xf079;" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
-<glyph unicode="&#xf07a;" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf07b;" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07c;" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf07d;" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf07e;" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="&#xf080;" horiz-adv-x="1920" d="M512 512v-384h-256v384h256zM896 1024v-896h-256v896h256zM1280 768v-640h-256v640h256zM1664 1152v-1024h-256v1024h256zM1792 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5z M1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf081;" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf082;" d="M1307 618l23 219h-198v109q0 49 15.5 68.5t71.5 19.5h110v219h-175q-152 0 -218 -72t-66 -213v-131h-131v-219h131v-635h262v635h175zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf083;" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf084;" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-<glyph unicode="&#xf085;" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-<glyph unicode="&#xf086;" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-<glyph unicode="&#xf087;" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf088;" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
-<glyph unicode="&#xf089;" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-<glyph unicode="&#xf08a;" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
-<glyph unicode="&#xf08b;" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-<glyph unicode="&#xf08c;" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf08d;" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-<glyph unicode="&#xf08e;" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf090;" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf091;" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf092;" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf093;" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-<glyph unicode="&#xf094;" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
-<glyph unicode="&#xf095;" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-<glyph unicode="&#xf096;" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf097;" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="&#xf098;" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf099;" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-<glyph unicode="&#xf09a;" horiz-adv-x="768" d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" />
-<glyph unicode="&#xf09b;" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf09c;" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="&#xf09d;" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-<glyph unicode="&#xf09e;" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
-<glyph unicode="&#xf0a0;" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-<glyph unicode="&#xf0a1;" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-<glyph unicode="&#xf0a2;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM183 128h1298q-164 181 -246.5 411.5t-82.5 484.5q0 256 -320 256t-320 -256q0 -254 -82.5 -484.5t-246.5 -411.5zM1664 128q0 -52 -38 -90t-90 -38 h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="&#xf0a3;" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-<glyph unicode="&#xf0a4;" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-<glyph unicode="&#xf0a5;" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf0a6;" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-<glyph unicode="&#xf0a7;" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-<glyph unicode="&#xf0a8;" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0a9;" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0aa;" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ab;" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0ac;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-<glyph unicode="&#xf0ad;" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-<glyph unicode="&#xf0ae;" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0b0;" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-<glyph unicode="&#xf0b1;" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0b2;" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
-<glyph unicode="&#xf0c0;" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-<glyph unicode="&#xf0c1;" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-<glyph unicode="&#xf0c2;" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
-<glyph unicode="&#xf0c3;" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-<glyph unicode="&#xf0c4;" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-<glyph unicode="&#xf0c5;" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-<glyph unicode="&#xf0c6;" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
-<glyph unicode="&#xf0c7;" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0c8;" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0c9;" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0ca;" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cb;" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="&#xf0cc;" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-<glyph unicode="&#xf0cd;" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-<glyph unicode="&#xf0ce;" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
-<glyph unicode="&#xf0d0;" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-<glyph unicode="&#xf0d1;" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d2;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf0d3;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="&#xf0d4;" d="M678 -57q0 -38 -10 -71h-380q-95 0 -171.5 56.5t-103.5 147.5q24 45 69 77.5t100 49.5t107 24t107 7q32 0 49 -2q6 -4 30.5 -21t33 -23t31 -23t32 -25.5t27.5 -25.5t26.5 -29.5t21 -30.5t17.5 -34.5t9.5 -36t4.5 -40.5zM385 294q-234 -7 -385 -85v433q103 -118 273 -118 q32 0 70 5q-21 -61 -21 -86q0 -67 63 -149zM558 805q0 -100 -43.5 -160.5t-140.5 -60.5q-51 0 -97 26t-78 67.5t-56 93.5t-35.5 104t-11.5 99q0 96 51.5 165t144.5 69q66 0 119 -41t84 -104t47 -130t16 -128zM1536 896v-736q0 -119 -84.5 -203.5t-203.5 -84.5h-468 q39 73 39 157q0 66 -22 122.5t-55.5 93t-72 71t-72 59.5t-55.5 54.5t-22 59.5q0 36 23 68t56 61.5t65.5 64.5t55.5 93t23 131t-26.5 145.5t-75.5 118.5q-6 6 -14 11t-12.5 7.5t-10 9.5t-10.5 17h135l135 64h-437q-138 0 -244.5 -38.5t-182.5 -133.5q0 126 81 213t207 87h960 q119 0 203.5 -84.5t84.5 -203.5v-96h-256v256h-128v-256h-256v-128h256v-256h128v256h256z" />
-<glyph unicode="&#xf0d5;" horiz-adv-x="1664" d="M876 71q0 21 -4.5 40.5t-9.5 36t-17.5 34.5t-21 30.5t-26.5 29.5t-27.5 25.5t-32 25.5t-31 23t-33 23t-30.5 21q-17 2 -50 2q-54 0 -106 -7t-108 -25t-98 -46t-69 -75t-27 -107q0 -68 35.5 -121.5t93 -84t120.5 -45.5t127 -15q59 0 112.5 12.5t100.5 39t74.5 73.5 t27.5 110zM756 933q0 60 -16.5 127.5t-47 130.5t-84 104t-119.5 41q-93 0 -144 -69t-51 -165q0 -47 11.5 -99t35.5 -104t56 -93.5t78 -67.5t97 -26q97 0 140.5 60.5t43.5 160.5zM625 1408h437l-135 -79h-135q71 -45 110 -126t39 -169q0 -74 -23 -131.5t-56 -92.5t-66 -64.5 t-56 -61t-23 -67.5q0 -26 16.5 -51t43 -48t58.5 -48t64 -55.5t58.5 -66t43 -85t16.5 -106.5q0 -160 -140 -282q-152 -131 -420 -131q-59 0 -119.5 10t-122 33.5t-108.5 58t-77 89t-30 121.5q0 61 37 135q32 64 96 110.5t145 71t155 36t150 13.5q-64 83 -64 149q0 12 2 23.5 t5 19.5t8 21.5t7 21.5q-40 -5 -70 -5q-149 0 -255.5 98t-106.5 246q0 140 95 250.5t234 141.5q94 20 187 20zM1664 1152v-128h-256v-256h-128v256h-256v128h256v256h128v-256h256z" />
-<glyph unicode="&#xf0d6;" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d7;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0d8;" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0d9;" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0da;" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0db;" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf0dc;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0dd;" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0de;" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="&#xf0e0;" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-<glyph unicode="&#xf0e1;" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-<glyph unicode="&#xf0e2;" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-<glyph unicode="&#xf0e3;" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-<glyph unicode="&#xf0e4;" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="&#xf0e5;" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="&#xf0e6;" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-<glyph unicode="&#xf0e7;" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-<glyph unicode="&#xf0e8;" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
-<glyph unicode="&#xf0e9;" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-<glyph unicode="&#xf0ea;" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0eb;" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-<glyph unicode="&#xf0ec;" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="&#xf0ed;" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0ee;" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="&#xf0f0;" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f1;" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf0f2;" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
-<glyph unicode="&#xf0f3;" horiz-adv-x="1664" d="M848 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1664 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q190 161 287 397.5t97 498.5 q0 165 96 262t264 117q-8 18 -8 37q0 40 28 68t68 28t68 -28t28 -68q0 -19 -8 -37q168 -20 264 -117t96 -262q0 -262 97 -498.5t287 -397.5z" />
-<glyph unicode="&#xf0f4;" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf0f5;" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f6;" horiz-adv-x="1280" d="M1024 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1024 608v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM128 0h1024v768h-416q-40 0 -68 28t-28 68v416h-512v-1280z M768 896h376q-10 29 -22 41l-313 313q-12 12 -41 22v-376zM1280 864v-896q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h640q40 0 88 -20t76 -48l312 -312q28 -28 48 -76t20 -88z" />
-<glyph unicode="&#xf0f7;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f8;" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0f9;" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf0fa;" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf0fb;" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
-<glyph unicode="&#xf0fc;" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-<glyph unicode="&#xf0fd;" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf0fe;" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf100;" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-<glyph unicode="&#xf101;" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf102;" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf103;" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf104;" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf105;" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf106;" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="&#xf107;" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="&#xf108;" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf109;" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-<glyph unicode="&#xf10a;" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-<glyph unicode="&#xf10b;" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf10c;" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf10d;" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf10e;" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-<glyph unicode="&#xf110;" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
-<glyph unicode="&#xf111;" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf112;" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-<glyph unicode="&#xf113;" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
-<glyph unicode="&#xf114;" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="&#xf115;" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="&#xf116;" horiz-adv-x="1792" />
-<glyph unicode="&#xf117;" horiz-adv-x="1792" />
-<glyph unicode="&#xf118;" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf119;" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11a;" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf11b;" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-<glyph unicode="&#xf11c;" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="&#xf11d;" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf11e;" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="&#xf120;" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
-<glyph unicode="&#xf121;" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-<glyph unicode="&#xf122;" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-<glyph unicode="&#xf123;" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-<glyph unicode="&#xf124;" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-<glyph unicode="&#xf125;" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf126;" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="&#xf127;" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="&#xf128;" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-<glyph unicode="&#xf129;" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf12a;" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-<glyph unicode="&#xf12b;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
-<glyph unicode="&#xf12c;" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
-<glyph unicode="&#xf12d;" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-<glyph unicode="&#xf12e;" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-<glyph unicode="&#xf130;" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-<glyph unicode="&#xf131;" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-<glyph unicode="&#xf132;" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf133;" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="&#xf134;" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-<glyph unicode="&#xf135;" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="&#xf136;" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
-<glyph unicode="&#xf137;" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf138;" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf139;" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13a;" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf13b;" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-<glyph unicode="&#xf13c;" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-<glyph unicode="&#xf13d;" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf13e;" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
-<glyph unicode="&#xf140;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf141;" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf142;" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="&#xf143;" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf144;" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
-<glyph unicode="&#xf145;" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-<glyph unicode="&#xf146;" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="&#xf147;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf148;" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-<glyph unicode="&#xf149;" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-<glyph unicode="&#xf14a;" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14b;" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14c;" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14d;" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf14e;" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf150;" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf151;" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf152;" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf153;" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-<glyph unicode="&#xf154;" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-<glyph unicode="&#xf155;" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
-<glyph unicode="&#xf156;" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf157;" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="&#xf158;" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
-<glyph unicode="&#xf159;" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf15a;" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-<glyph unicode="&#xf15b;" horiz-adv-x="1280" d="M1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="&#xf15c;" horiz-adv-x="1280" d="M1024 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1024 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1280 768v-800q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28 t-28 68v1344q0 40 28 68t68 28h544v-544q0 -40 28 -68t68 -28h544zM1277 896h-509v509q82 -15 132 -65l312 -312q50 -50 65 -132z" />
-<glyph unicode="&#xf15d;" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
-<glyph unicode="&#xf15e;" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
-<glyph unicode="&#xf160;" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf161;" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf162;" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-<glyph unicode="&#xf163;" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-<glyph unicode="&#xf164;" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-<glyph unicode="&#xf165;" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-<glyph unicode="&#xf166;" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf167;" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-<glyph unicode="&#xf168;" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
-<glyph unicode="&#xf169;" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf16a;" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
-<glyph unicode="&#xf16b;" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-<glyph unicode="&#xf16c;" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
-<glyph unicode="&#xf16d;" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
-<glyph unicode="&#xf16e;" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-<glyph unicode="&#xf170;" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf171;" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-<glyph unicode="&#xf172;" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf173;" horiz-adv-x="1024" d="M390 1408h219v-388h364v-241h-364v-394q0 -136 14 -172q13 -37 52 -60q50 -31 117 -31q117 0 232 76v-242q-102 -48 -178 -65q-77 -19 -173 -19q-105 0 -186 27q-78 25 -138 75q-58 51 -79 105q-22 54 -22 161v539h-170v217q91 30 155 84q64 55 103 132q39 78 54 196z " />
-<glyph unicode="&#xf174;" d="M1123 127v181q-88 -56 -174 -56q-51 0 -88 23q-29 17 -39 45q-11 30 -11 129v295h274v181h-274v291h-164q-11 -90 -40 -147t-78 -99q-48 -40 -116 -63v-163h127v-404q0 -78 17 -121q17 -42 59 -78q43 -37 104 -57q62 -20 140 -20q67 0 129 14q57 13 134 49zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf175;" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-<glyph unicode="&#xf176;" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-<glyph unicode="&#xf177;" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf178;" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-<glyph unicode="&#xf179;" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-<glyph unicode="&#xf17a;" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-<glyph unicode="&#xf17b;" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-<glyph unicode="&#xf17c;" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-<glyph unicode="&#xf17d;" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf17e;" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-<glyph unicode="&#xf180;" horiz-adv-x="1664" d="M1483 512l-587 -587q-52 -53 -127.5 -53t-128.5 53l-587 587q-53 53 -53 128t53 128l587 587q53 53 128 53t128 -53l265 -265l-398 -399l-188 188q-42 42 -99 42q-59 0 -100 -41l-120 -121q-42 -40 -42 -99q0 -58 42 -100l406 -408q30 -28 67 -37l6 -4h28q60 0 99 41 l619 619l2 -3q53 -53 53 -128t-53 -128zM1406 1138l120 -120q14 -15 14 -36t-14 -36l-730 -730q-17 -15 -37 -15v0q-4 0 -6 1q-18 2 -30 14l-407 408q-14 15 -14 36t14 35l121 120q13 15 35 15t36 -15l252 -252l574 575q15 15 36 15t36 -15z" />
-<glyph unicode="&#xf181;" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf182;" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf183;" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="&#xf184;" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf185;" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-<glyph unicode="&#xf186;" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-<glyph unicode="&#xf187;" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-<glyph unicode="&#xf188;" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-<glyph unicode="&#xf189;" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
-<glyph unicode="&#xf18a;" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="&#xf18b;" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-<glyph unicode="&#xf18c;" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
-<glyph unicode="&#xf18d;" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
-<glyph unicode="&#xf18e;" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf190;" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf191;" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf192;" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="&#xf193;" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
-<glyph unicode="&#xf194;" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf195;" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="&#xf196;" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="&#xf197;" horiz-adv-x="1792" />
-<glyph unicode="&#xf198;" horiz-adv-x="1792" />
-<glyph unicode="&#xf199;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19a;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19b;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19c;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19d;" horiz-adv-x="1792" />
-<glyph unicode="&#xf19e;" horiz-adv-x="1792" />
-<glyph unicode="&#xf500;" horiz-adv-x="1792" />
-</font>
-</defs></svg> 
\ No newline at end of file
+<font id="FontAwesome" horiz-adv-x="1536" >
+  <font-face 
+    font-family="FontAwesome"
+    font-weight="400"
+    font-stretch="normal"
+    units-per-em="1792"
+    panose-1="0 0 0 0 0 0 0 0 0 0"
+    ascent="1536"
+    descent="-256"
+    bbox="-1.02083 -256.962 2304.6 1537.02"
+    underline-thickness="0"
+    underline-position="0"
+    unicode-range="U+0020-F500"
+  />
+<missing-glyph horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".notdef" horiz-adv-x="896" 
+d="M224 112h448v1312h-448v-1312zM112 0v1536h672v-1536h-672z" />
+    <glyph glyph-name=".null" horiz-adv-x="0" 
+ />
+    <glyph glyph-name="nonmarkingreturn" horiz-adv-x="597" 
+ />
+    <glyph glyph-name="space" unicode=" " horiz-adv-x="448" 
+ />
+    <glyph glyph-name="dieresis" unicode="&#xa8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="copyright" unicode="&#xa9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="registered" unicode="&#xae;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="acute" unicode="&#xb4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="AE" unicode="&#xc6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="Oslash" unicode="&#xd8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="trademark" unicode="&#x2122;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="infinity" unicode="&#x221e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="notequal" unicode="&#x2260;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="glass" unicode="&#xf000;" horiz-adv-x="1792" 
+d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
+    <glyph glyph-name="music" unicode="&#xf001;" 
+d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89
+t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="search" unicode="&#xf002;" horiz-adv-x="1664" 
+d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5
+t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+    <glyph glyph-name="envelope" unicode="&#xf003;" horiz-adv-x="1792" 
+d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13
+t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z
+M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="heart" unicode="&#xf004;" horiz-adv-x="1792" 
+d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600
+q-18 -18 -44 -18z" />
+    <glyph glyph-name="star" unicode="&#xf005;" horiz-adv-x="1664" 
+d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455
+l502 -73q56 -9 56 -46z" />
+    <glyph glyph-name="star_empty" unicode="&#xf006;" horiz-adv-x="1664" 
+d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500
+l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
+    <glyph glyph-name="user" unicode="&#xf007;" horiz-adv-x="1280" 
+d="M1280 137q0 -109 -62.5 -187t-150.5 -78h-854q-88 0 -150.5 78t-62.5 187q0 85 8.5 160.5t31.5 152t58.5 131t94 89t134.5 34.5q131 -128 313 -128t313 128q76 0 134.5 -34.5t94 -89t58.5 -131t31.5 -152t8.5 -160.5zM1024 1024q0 -159 -112.5 -271.5t-271.5 -112.5
+t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="film" unicode="&#xf008;" horiz-adv-x="1920" 
+d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128
+q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45
+t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128
+q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19
+t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="th_large" unicode="&#xf009;" horiz-adv-x="1664" 
+d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38
+h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="th" unicode="&#xf00a;" horiz-adv-x="1792" 
+d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
+h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192
+q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="th_list" unicode="&#xf00b;" horiz-adv-x="1792" 
+d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28
+h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="ok" unicode="&#xf00c;" horiz-adv-x="1792" 
+d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
+    <glyph glyph-name="remove" unicode="&#xf00d;" horiz-adv-x="1408" 
+d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68
+t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
+    <glyph glyph-name="zoom_in" unicode="&#xf00e;" horiz-adv-x="1664" 
+d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224
+q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5
+t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
+    <glyph glyph-name="zoom_out" unicode="&#xf010;" horiz-adv-x="1664" 
+d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z
+M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z
+" />
+    <glyph glyph-name="off" unicode="&#xf011;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5
+t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
+    <glyph glyph-name="signal" unicode="&#xf012;" horiz-adv-x="1792" 
+d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="cog" unicode="&#xf013;" 
+d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38
+q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13
+l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22
+q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
+    <glyph glyph-name="trash" unicode="&#xf014;" horiz-adv-x="1408" 
+d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576
+q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832
+q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="home" unicode="&#xf015;" horiz-adv-x="1664" 
+d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5
+l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
+    <glyph glyph-name="file_alt" unicode="&#xf016;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+" />
+    <glyph glyph-name="time" unicode="&#xf017;" 
+d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="road" unicode="&#xf018;" horiz-adv-x="1920" 
+d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256
+q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
+    <glyph glyph-name="download_alt" unicode="&#xf019;" horiz-adv-x="1664" 
+d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136
+q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
+    <glyph glyph-name="download" unicode="&#xf01a;" 
+d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273
+t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="upload" unicode="&#xf01b;" 
+d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198
+t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="inbox" unicode="&#xf01c;" 
+d="M1023 576h316q-1 3 -2.5 8.5t-2.5 7.5l-212 496h-708l-212 -496q-1 -3 -2.5 -8.5t-2.5 -7.5h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552
+q25 -61 25 -123z" />
+    <glyph glyph-name="play_circle" unicode="&#xf01d;" 
+d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="repeat" unicode="&#xf01e;" 
+d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q15 0 25 -9
+l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
+    <glyph glyph-name="refresh" unicode="&#xf021;" 
+d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117
+q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5
+q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="list_alt" unicode="&#xf022;" horiz-adv-x="1792" 
+d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z
+M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5
+t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47
+t47 -113z" />
+    <glyph glyph-name="lock" unicode="&#xf023;" horiz-adv-x="1152" 
+d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="flag" unicode="&#xf024;" horiz-adv-x="1792" 
+d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48
+t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="headphones" unicode="&#xf025;" horiz-adv-x="1664" 
+d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78
+t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5
+t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
+    <glyph glyph-name="volume_off" unicode="&#xf026;" horiz-adv-x="768" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="volume_down" unicode="&#xf027;" horiz-adv-x="1152" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
+    <glyph glyph-name="volume_up" unicode="&#xf028;" horiz-adv-x="1664" 
+d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 36
+t12 56.5t-12 56.5t-29 36t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5
+t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289
+t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
+    <glyph glyph-name="qrcode" unicode="&#xf029;" horiz-adv-x="1408" 
+d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z
+M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
+    <glyph glyph-name="barcode" unicode="&#xf02a;" horiz-adv-x="1792" 
+d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z
+M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
+    <glyph glyph-name="tag" unicode="&#xf02b;" 
+d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91z" />
+    <glyph glyph-name="tags" unicode="&#xf02c;" horiz-adv-x="1920" 
+d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5
+l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
+    <glyph glyph-name="book" unicode="&#xf02d;" horiz-adv-x="1664" 
+d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23
+q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906
+q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5
+t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
+    <glyph glyph-name="bookmark" unicode="&#xf02e;" horiz-adv-x="1280" 
+d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+    <glyph glyph-name="print" unicode="&#xf02f;" horiz-adv-x="1664" 
+d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68
+v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
+    <glyph glyph-name="camera" unicode="&#xf030;" horiz-adv-x="1920" 
+d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136
+q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="font" unicode="&#xf031;" horiz-adv-x="1664" 
+d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57
+q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -5 -0.5 -13.5t-0.5 -12.5q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5
+q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
+    <glyph glyph-name="bold" unicode="&#xf032;" horiz-adv-x="1408" 
+d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142
+q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5
+t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68 -0.5t68 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5
+t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
+    <glyph glyph-name="italic" unicode="&#xf033;" horiz-adv-x="1024" 
+d="M0 -126l17 85q22 7 61.5 16.5t72 19t59.5 23.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5
+q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
+    <glyph glyph-name="text_height" unicode="&#xf034;" horiz-adv-x="1792" 
+d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2
+t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5
+q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
+q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
+    <glyph glyph-name="text_width" unicode="&#xf035;" 
+d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1
+t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27
+q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5
+t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49
+t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
+    <glyph glyph-name="align_left" unicode="&#xf036;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_center" unicode="&#xf037;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19
+h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_right" unicode="&#xf038;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="align_justify" unicode="&#xf039;" horiz-adv-x="1792" 
+d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45
+t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="list" unicode="&#xf03a;" horiz-adv-x="1792" 
+d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5
+t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344
+q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
+t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192
+q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="indent_left" unicode="&#xf03b;" horiz-adv-x="1792" 
+d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="indent_right" unicode="&#xf03c;" horiz-adv-x="1792" 
+d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5
+t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088
+q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="facetime_video" unicode="&#xf03d;" horiz-adv-x="1792" 
+d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5
+q39 -17 39 -59z" />
+    <glyph glyph-name="picture" unicode="&#xf03e;" horiz-adv-x="1920" 
+d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216
+q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="pencil" unicode="&#xf040;" 
+d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38
+q53 0 91 -38l235 -234q37 -39 37 -91z" />
+    <glyph glyph-name="map_marker" unicode="&#xf041;" horiz-adv-x="1024" 
+d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
+    <glyph glyph-name="adjust" unicode="&#xf042;" 
+d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="tint" unicode="&#xf043;" horiz-adv-x="1024" 
+d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362
+q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
+    <glyph glyph-name="edit" unicode="&#xf044;" horiz-adv-x="1792" 
+d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92
+l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
+    <glyph glyph-name="share" unicode="&#xf045;" horiz-adv-x="1664" 
+d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832
+q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5
+t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="check" unicode="&#xf046;" horiz-adv-x="1664" 
+d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832
+q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110
+q24 -24 24 -57t-24 -57z" />
+    <glyph glyph-name="move" unicode="&#xf047;" horiz-adv-x="1792" 
+d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45
+t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="step_backward" unicode="&#xf048;" horiz-adv-x="1024" 
+d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19z" />
+    <glyph glyph-name="fast_backward" unicode="&#xf049;" horiz-adv-x="1792" 
+d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 10 13 19l710 710
+q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="backward" unicode="&#xf04a;" horiz-adv-x="1664" 
+d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q4 10 13 19z" />
+    <glyph glyph-name="play" unicode="&#xf04b;" horiz-adv-x="1408" 
+d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
+    <glyph glyph-name="pause" unicode="&#xf04c;" 
+d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="stop" unicode="&#xf04d;" 
+d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="forward" unicode="&#xf04e;" horiz-adv-x="1664" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="fast_forward" unicode="&#xf050;" horiz-adv-x="1792" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v710q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19l-710 -710
+q-19 -19 -32 -13t-13 32v710q-4 -10 -13 -19z" />
+    <glyph glyph-name="step_forward" unicode="&#xf051;" horiz-adv-x="1024" 
+d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q9 -9 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-4 -10 -13 -19z" />
+    <glyph glyph-name="eject" unicode="&#xf052;" horiz-adv-x="1538" 
+d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
+    <glyph glyph-name="chevron_left" unicode="&#xf053;" horiz-adv-x="1280" 
+d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="chevron_right" unicode="&#xf054;" horiz-adv-x="1280" 
+d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
+    <glyph glyph-name="plus_sign" unicode="&#xf055;" 
+d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5
+t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="minus_sign" unicode="&#xf056;" 
+d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="remove_sign" unicode="&#xf057;" 
+d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19
+q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ok_sign" unicode="&#xf058;" 
+d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="question_sign" unicode="&#xf059;" 
+d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59
+q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="info_sign" unicode="&#xf05a;" 
+d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23
+t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="screenshot" unicode="&#xf05b;" 
+d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109
+q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143
+q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="remove_circle" unicode="&#xf05c;" 
+d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5
+t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ok_circle" unicode="&#xf05d;" 
+d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198
+t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ban_circle" unicode="&#xf05e;" 
+d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61
+t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
+    <glyph glyph-name="arrow_left" unicode="&#xf060;" 
+d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5
+t32.5 -90.5z" />
+    <glyph glyph-name="arrow_right" unicode="&#xf061;" 
+d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
+    <glyph glyph-name="arrow_up" unicode="&#xf062;" horiz-adv-x="1664" 
+d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651
+q37 -39 37 -91z" />
+    <glyph glyph-name="arrow_down" unicode="&#xf063;" horiz-adv-x="1664" 
+d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
+    <glyph glyph-name="share_alt" unicode="&#xf064;" horiz-adv-x="1792" 
+d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22
+t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
+    <glyph glyph-name="resize_full" unicode="&#xf065;" 
+d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332
+q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="resize_small" unicode="&#xf066;" 
+d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45
+t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
+    <glyph glyph-name="plus" unicode="&#xf067;" horiz-adv-x="1408" 
+d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="minus" unicode="&#xf068;" horiz-adv-x="1408" 
+d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="asterisk" unicode="&#xf069;" horiz-adv-x="1664" 
+d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154
+q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
+    <glyph glyph-name="exclamation_sign" unicode="&#xf06a;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192
+q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
+    <glyph glyph-name="gift" unicode="&#xf06b;" 
+d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320
+q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5
+t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="leaf" unicode="&#xf06c;" horiz-adv-x="1792" 
+d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268
+q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-43 0 -63.5 17.5t-45.5 59.5q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5
+t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
+    <glyph glyph-name="fire" unicode="&#xf06d;" horiz-adv-x="1408" 
+d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1
+q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
+    <glyph glyph-name="eye_open" unicode="&#xf06e;" horiz-adv-x="1792" 
+d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5
+t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
+    <glyph glyph-name="eye_close" unicode="&#xf070;" horiz-adv-x="1792" 
+d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9
+q-106 -189 -316 -567t-315 -566l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5
+q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z
+" />
+    <glyph glyph-name="warning_sign" unicode="&#xf071;" horiz-adv-x="1792" 
+d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185
+q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
+    <glyph glyph-name="plane" unicode="&#xf072;" horiz-adv-x="1408" 
+d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9
+q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
+    <glyph glyph-name="calendar" unicode="&#xf073;" horiz-adv-x="1664" 
+d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z
+M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64
+q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47
+h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="random" unicode="&#xf074;" horiz-adv-x="1792" 
+d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1
+t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5
+v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111
+t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+    <glyph glyph-name="comment" unicode="&#xf075;" horiz-adv-x="1792" 
+d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281
+q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="magnet" unicode="&#xf076;" 
+d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384
+q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="chevron_up" unicode="&#xf077;" horiz-adv-x="1792" 
+d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
+    <glyph glyph-name="chevron_down" unicode="&#xf078;" horiz-adv-x="1792" 
+d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
+    <glyph glyph-name="retweet" unicode="&#xf079;" horiz-adv-x="1920" 
+d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -10 7 -21
+zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z
+" />
+    <glyph glyph-name="shopping_cart" unicode="&#xf07a;" horiz-adv-x="1664" 
+d="M640 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1536 0q0 -52 -38 -90t-90 -38t-90 38t-38 90t38 90t90 38t90 -38t38 -90zM1664 1088v-512q0 -24 -16.5 -42.5t-40.5 -21.5l-1044 -122q13 -60 13 -70q0 -16 -24 -64h920q26 0 45 -19t19 -45
+t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 11 8 31.5t16 36t21.5 40t15.5 29.5l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t19.5 -15.5t13 -24.5t8 -26t5.5 -29.5t4.5 -26h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="folder_close" unicode="&#xf07b;" horiz-adv-x="1664" 
+d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="folder_open" unicode="&#xf07c;" horiz-adv-x="1920" 
+d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5
+t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="resize_vertical" unicode="&#xf07d;" horiz-adv-x="768" 
+d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="resize_horizontal" unicode="&#xf07e;" horiz-adv-x="1792" 
+d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
+    <glyph glyph-name="bar_chart" unicode="&#xf080;" horiz-adv-x="2048" 
+d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
+    <glyph glyph-name="twitter_sign" unicode="&#xf081;" 
+d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4
+q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5
+t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="facebook_sign" unicode="&#xf082;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-188v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-532q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960z" />
+    <glyph glyph-name="camera_retro" unicode="&#xf083;" horiz-adv-x="1792" 
+d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5
+t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280
+q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="key" unicode="&#xf084;" horiz-adv-x="1792" 
+d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26
+l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5
+t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
+    <glyph glyph-name="cogs" unicode="&#xf085;" horiz-adv-x="1920" 
+d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -11 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5
+l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7
+l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -8 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31
+q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20
+t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68
+q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70
+q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
+    <glyph glyph-name="comments" unicode="&#xf086;" horiz-adv-x="1792" 
+d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224
+q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7
+q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
+    <glyph glyph-name="thumbs_up_alt" unicode="&#xf087;" 
+d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5
+t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769
+q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128
+q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
+    <glyph glyph-name="thumbs_down_alt" unicode="&#xf088;" 
+d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 31 18 69q0 37 -17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5
+t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z
+M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5
+h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -73 49 -163z" />
+    <glyph glyph-name="star_half" unicode="&#xf089;" horiz-adv-x="896" 
+d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
+    <glyph glyph-name="heart_empty" unicode="&#xf08a;" horiz-adv-x="1792" 
+d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559
+q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5
+q224 0 351 -124t127 -344z" />
+    <glyph glyph-name="signout" unicode="&#xf08b;" horiz-adv-x="1664" 
+d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704
+q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
+    <glyph glyph-name="linkedin_sign" unicode="&#xf08c;" 
+d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5
+q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="pushpin" unicode="&#xf08d;" horiz-adv-x="1152" 
+d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38
+t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
+    <glyph glyph-name="external_link" unicode="&#xf08e;" horiz-adv-x="1792" 
+d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320
+q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="signin" unicode="&#xf090;" 
+d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5
+q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="trophy" unicode="&#xf091;" horiz-adv-x="1664" 
+d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91
+t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96
+q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="github_sign" unicode="&#xf092;" 
+d="M519 336q4 6 -3 13q-9 7 -14 2q-4 -6 3 -13q9 -7 14 -2zM491 377q-5 7 -12 4q-6 -4 0 -12q7 -8 12 -5q6 4 0 13zM450 417q2 4 -5 8q-7 2 -8 -2q-3 -5 4 -8q8 -2 9 2zM471 394q2 1 1.5 4.5t-3.5 5.5q-6 7 -10 3t1 -11q6 -6 11 -2zM557 319q2 7 -9 11q-9 3 -13 -4
+q-2 -7 9 -11q9 -3 13 4zM599 316q0 8 -12 8q-10 0 -10 -8t11 -8t11 8zM638 323q-2 7 -13 5t-9 -9q2 -8 12 -6t10 10zM1280 640q0 212 -150 362t-362 150t-362 -150t-150 -362q0 -167 98 -300.5t252 -185.5q18 -3 26.5 5t8.5 20q0 52 -1 95q-6 -1 -15.5 -2.5t-35.5 -2t-48 4
+t-43.5 20t-29.5 41.5q-23 59 -57 74q-2 1 -4.5 3.5l-8 8t-7 9.5t4 7.5t19.5 3.5q6 0 15 -2t30 -15.5t33 -35.5q16 -28 37.5 -42t43.5 -14t38 3.5t30 9.5q7 47 33 69q-49 6 -86 18.5t-73 39t-55.5 76t-19.5 119.5q0 79 53 137q-24 62 5 136q19 6 54.5 -7.5t60.5 -29.5l26 -16
+q58 17 128 17t128 -17q11 7 28.5 18t55.5 26t57 9q29 -74 5 -136q53 -58 53 -137q0 -57 -14 -100.5t-35.5 -70t-53.5 -44.5t-62.5 -26t-68.5 -12q35 -31 35 -95q0 -40 -0.5 -89t-0.5 -51q0 -12 8.5 -20t26.5 -5q154 52 252 185.5t98 300.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="upload_alt" unicode="&#xf093;" horiz-adv-x="1664" 
+d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92
+t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
+    <glyph glyph-name="lemon" unicode="&#xf094;" 
+d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5
+q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44
+q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5
+q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -13 2 -25t3.5 -16.5t7.5 -20.5t8 -20q16 -40 25 -118.5t9 -136.5z" />
+    <glyph glyph-name="phone" unicode="&#xf095;" horiz-adv-x="1408" 
+d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -53 3.5t-57.5 12.5t-47 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-127 79 -264 216t-216 264q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47t-12.5 57.5t-3.5 53q0 92 51 186
+q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174q2 -1 19 -11.5t24 -14
+t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
+    <glyph glyph-name="check_empty" unicode="&#xf096;" horiz-adv-x="1408" 
+d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832
+q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="bookmark_empty" unicode="&#xf097;" horiz-adv-x="1280" 
+d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289
+q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
+    <glyph glyph-name="phone_sign" unicode="&#xf098;" 
+d="M1280 343q0 11 -2 16t-18 16.5t-40.5 25t-47.5 26.5t-45.5 25t-28.5 15q-5 3 -19 13t-25 15t-21 5q-15 0 -36.5 -20.5t-39.5 -45t-38.5 -45t-33.5 -20.5q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170 126.5t-127 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5
+t-3.5 16.5q0 13 20.5 33.5t45 38.5t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5
+t320.5 -216.5q6 -2 30 -11t33 -12.5t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z
+" />
+    <glyph glyph-name="twitter" unicode="&#xf099;" horiz-adv-x="1664" 
+d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41
+q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
+    <glyph glyph-name="facebook" unicode="&#xf09a;" horiz-adv-x="1024" 
+d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
+    <glyph glyph-name="github" unicode="&#xf09b;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -40 7t-13 30q0 3 0.5 76.5t0.5 134.5q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 119 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24
+q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-85 13.5q-45 -113 -8 -204q-79 -87 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-39 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5
+t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -88.5t0.5 -54.5q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103zM291 305q3 7 -7 12
+q-10 3 -13 -2q-3 -7 7 -12q9 -6 13 2zM322 271q7 5 -2 16q-10 9 -16 3q-7 -5 2 -16q10 -10 16 -3zM352 226q9 7 0 19q-8 13 -17 6q-9 -5 0 -18t17 -7zM394 184q8 8 -4 19q-12 12 -20 3q-9 -8 4 -19q12 -12 20 -3zM451 159q3 11 -13 16q-15 4 -19 -7t13 -15q15 -6 19 6z
+M514 154q0 13 -17 11q-16 0 -16 -11q0 -13 17 -11q16 0 16 11zM572 164q-2 11 -18 9q-16 -3 -14 -15t18 -8t14 14z" />
+    <glyph glyph-name="unlock" unicode="&#xf09c;" horiz-adv-x="1664" 
+d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5
+t316.5 -131.5t131.5 -316.5z" />
+    <glyph glyph-name="credit_card" unicode="&#xf09d;" horiz-adv-x="1920" 
+d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608
+q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
+    <glyph glyph-name="rss" unicode="&#xf09e;" horiz-adv-x="1408" 
+d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5
+t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294
+q187 -186 294 -425.5t120 -501.5z" />
+    <glyph glyph-name="hdd" unicode="&#xf0a0;" 
+d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5
+h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75
+l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
+    <glyph glyph-name="bullhorn" unicode="&#xf0a1;" horiz-adv-x="1792" 
+d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5
+t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
+    <glyph glyph-name="bell" unicode="&#xf0a2;" horiz-adv-x="1792" 
+d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z
+M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5
+t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+    <glyph glyph-name="certificate" unicode="&#xf0a3;" 
+d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70
+l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70
+l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
+    <glyph glyph-name="hand_right" unicode="&#xf0a4;" horiz-adv-x="1792" 
+d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106
+q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43
+q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5
+t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
+    <glyph glyph-name="hand_left" unicode="&#xf0a5;" horiz-adv-x="1792" 
+d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-8 9 -12 14q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576q-50 0 -89 -38.5
+t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45z
+M1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128q0 122 81.5 189t206.5 67
+q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="hand_up" unicode="&#xf0a6;" 
+d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576
+q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5
+t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76
+q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
+    <glyph glyph-name="hand_down" unicode="&#xf0a7;" 
+d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33
+t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580
+q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100
+q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
+    <glyph glyph-name="circle_arrow_left" unicode="&#xf0a8;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_right" unicode="&#xf0a9;" 
+d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_up" unicode="&#xf0aa;" 
+d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="circle_arrow_down" unicode="&#xf0ab;" 
+d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="globe" unicode="&#xf0ac;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11
+q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 11t-9.5 10q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5
+q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5
+q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5
+t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-4 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3
+q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25
+q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5
+t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5
+t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10.5t17 -19.5q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21
+q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5
+q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3
+q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5
+t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q8 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5
+q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7
+q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
+    <glyph glyph-name="wrench" unicode="&#xf0ad;" horiz-adv-x="1664" 
+d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5
+t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
+    <glyph glyph-name="tasks" unicode="&#xf0ae;" horiz-adv-x="1792" 
+d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19
+t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="filter" unicode="&#xf0b0;" horiz-adv-x="1408" 
+d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
+    <glyph glyph-name="briefcase" unicode="&#xf0b1;" horiz-adv-x="1792" 
+d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68
+t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="fullscreen" unicode="&#xf0b2;" 
+d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144
+l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z
+" />
+    <glyph glyph-name="group" unicode="&#xf0c0;" horiz-adv-x="1920" 
+d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5
+t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75
+t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5
+t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
+    <glyph glyph-name="link" unicode="&#xf0c1;" horiz-adv-x="1664" 
+d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26
+l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15
+t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207
+q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
+    <glyph glyph-name="cloud" unicode="&#xf0c2;" horiz-adv-x="1920" 
+d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z
+" />
+    <glyph glyph-name="beaker" unicode="&#xf0c3;" horiz-adv-x="1664" 
+d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
+    <glyph glyph-name="cut" unicode="&#xf0c4;" horiz-adv-x="1792" 
+d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84
+q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148
+q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108
+q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6
+q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
+    <glyph glyph-name="copy" unicode="&#xf0c5;" horiz-adv-x="1792" 
+d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299
+h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
+    <glyph glyph-name="paper_clip" unicode="&#xf0c6;" horiz-adv-x="1408" 
+d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181
+l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235
+z" />
+    <glyph glyph-name="save" unicode="&#xf0c7;" 
+d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5
+h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
+    <glyph glyph-name="sign_blank" unicode="&#xf0c8;" 
+d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="reorder" unicode="&#xf0c9;" 
+d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45
+t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="ul" unicode="&#xf0ca;" horiz-adv-x="1792" 
+d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5
+t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z
+M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="ol" unicode="&#xf0cb;" horiz-adv-x="1792" 
+d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362
+q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5
+t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 121.5t0.5 121.5v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216
+q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
+    <glyph glyph-name="strikethrough" unicode="&#xf0cc;" horiz-adv-x="1792" 
+d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 98 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6
+l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -56 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23
+l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
+    <glyph glyph-name="underline" unicode="&#xf0cd;" 
+d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47
+q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41
+q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472
+q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
+    <glyph glyph-name="table" unicode="&#xf0ce;" horiz-adv-x="1664" 
+d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23
+v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192
+q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192
+q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113
+z" />
+    <glyph glyph-name="magic" unicode="&#xf0d0;" horiz-adv-x="1664" 
+d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276
+l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
+    <glyph glyph-name="truck" unicode="&#xf0d1;" horiz-adv-x="1792" 
+d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5
+t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38
+t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="pinterest" unicode="&#xf0d2;" 
+d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134
+q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33
+q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="pinterest_sign" unicode="&#xf0d3;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5
+t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5
+t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
+    <glyph glyph-name="google_plus_sign" unicode="&#xf0d4;" 
+d="M917 631q0 26 -6 64h-362v-132h217q-3 -24 -16.5 -50t-37.5 -53t-66.5 -44.5t-96.5 -17.5q-99 0 -169 71t-70 171t70 171t169 71q92 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585
+h109v110h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="google_plus" unicode="&#xf0d5;" horiz-adv-x="2304" 
+d="M1437 623q0 -208 -87 -370.5t-248 -254t-369 -91.5q-149 0 -285 58t-234 156t-156 234t-58 285t58 285t156 234t234 156t285 58q286 0 491 -192l-199 -191q-117 113 -292 113q-123 0 -227.5 -62t-165.5 -168.5t-61 -232.5t61 -232.5t165.5 -168.5t227.5 -62
+q83 0 152.5 23t114.5 57.5t78.5 78.5t49 83t21.5 74h-416v252h692q12 -63 12 -122zM2304 745v-210h-209v-209h-210v209h-209v210h209v209h210v-209h209z" />
+    <glyph glyph-name="money" unicode="&#xf0d6;" horiz-adv-x="1920" 
+d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384
+v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="caret_down" unicode="&#xf0d7;" horiz-adv-x="1024" 
+d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="caret_up" unicode="&#xf0d8;" horiz-adv-x="1024" 
+d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="caret_left" unicode="&#xf0d9;" horiz-adv-x="640" 
+d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
+    <glyph glyph-name="caret_right" unicode="&#xf0da;" horiz-adv-x="640" 
+d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="columns" unicode="&#xf0db;" horiz-adv-x="1664" 
+d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="sort" unicode="&#xf0dc;" horiz-adv-x="1024" 
+d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="sort_down" unicode="&#xf0dd;" horiz-adv-x="1024" 
+d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="sort_up" unicode="&#xf0de;" horiz-adv-x="1024" 
+d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
+    <glyph glyph-name="envelope_alt" unicode="&#xf0e0;" horiz-adv-x="1792" 
+d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123
+q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
+    <glyph glyph-name="linkedin" unicode="&#xf0e1;" 
+d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329
+q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
+    <glyph glyph-name="undo" unicode="&#xf0e2;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
+    <glyph glyph-name="legal" unicode="&#xf0e3;" horiz-adv-x="1792" 
+d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5
+t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14
+q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28
+q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
+    <glyph glyph-name="dashboard" unicode="&#xf0e4;" horiz-adv-x="1792" 
+d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5
+t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5
+t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29
+q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="comment_alt" unicode="&#xf0e5;" horiz-adv-x="1792" 
+d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640
+q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5
+t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="comments_alt" unicode="&#xf0e6;" horiz-adv-x="1792" 
+d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257
+t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5
+t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129
+q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
+    <glyph glyph-name="bolt" unicode="&#xf0e7;" horiz-adv-x="896" 
+d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
+    <glyph glyph-name="sitemap" unicode="&#xf0e8;" horiz-adv-x="1792" 
+d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320
+q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68
+z" />
+    <glyph glyph-name="umbrella" unicode="&#xf0e9;" horiz-adv-x="1664" 
+d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97
+q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69
+q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
+    <glyph glyph-name="paste" unicode="&#xf0ea;" horiz-adv-x="1792" 
+d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28
+h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
+    <glyph glyph-name="light_bulb" unicode="&#xf0eb;" horiz-adv-x="1024" 
+d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134
+q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47
+q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5
+t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
+    <glyph glyph-name="exchange" unicode="&#xf0ec;" horiz-adv-x="1792" 
+d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9
+q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
+    <glyph glyph-name="cloud_download" unicode="&#xf0ed;" horiz-adv-x="1920" 
+d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+    <glyph glyph-name="cloud_upload" unicode="&#xf0ee;" horiz-adv-x="1920" 
+d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088
+q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
+    <glyph glyph-name="user_md" unicode="&#xf0f0;" horiz-adv-x="1408" 
+d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56
+t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68
+t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
+t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="stethoscope" unicode="&#xf0f1;" horiz-adv-x="1408" 
+d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48
+t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252
+t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="suitcase" unicode="&#xf0f2;" horiz-adv-x="1792" 
+d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66
+t66 -158z" />
+    <glyph glyph-name="bell_alt" unicode="&#xf0f3;" horiz-adv-x="1792" 
+d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5
+t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
+    <glyph glyph-name="coffee" unicode="&#xf0f4;" horiz-adv-x="1920" 
+d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45
+t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="food" unicode="&#xf0f5;" horiz-adv-x="1408" 
+d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45
+t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="file_text_alt" unicode="&#xf0f6;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704
+q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
+    <glyph glyph-name="building" unicode="&#xf0f7;" horiz-adv-x="1408" 
+d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="hospital" unicode="&#xf0f8;" horiz-adv-x="1408" 
+d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z
+M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5
+t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320
+v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="ambulance" unicode="&#xf0f9;" horiz-adv-x="1920" 
+d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152
+q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="medkit" unicode="&#xf0fa;" horiz-adv-x="1792" 
+d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32
+q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="fighter_jet" unicode="&#xf0fb;" horiz-adv-x="1920" 
+d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96
+q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q128 -28 200 -52t80 -34z" />
+    <glyph glyph-name="beer" unicode="&#xf0fc;" horiz-adv-x="1664" 
+d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
+    <glyph glyph-name="h_sign" unicode="&#xf0fd;" 
+d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="f0fe" unicode="&#xf0fe;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="double_angle_left" unicode="&#xf100;" horiz-adv-x="1024" 
+d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_right" unicode="&#xf101;" horiz-adv-x="1024" 
+d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23
+l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_up" unicode="&#xf102;" horiz-adv-x="1152" 
+d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393
+q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="double_angle_down" unicode="&#xf103;" horiz-adv-x="1152" 
+d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23
+t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="angle_left" unicode="&#xf104;" horiz-adv-x="640" 
+d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="angle_right" unicode="&#xf105;" horiz-adv-x="640" 
+d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="angle_up" unicode="&#xf106;" horiz-adv-x="1152" 
+d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
+    <glyph glyph-name="angle_down" unicode="&#xf107;" horiz-adv-x="1152" 
+d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
+    <glyph glyph-name="desktop" unicode="&#xf108;" horiz-adv-x="1920" 
+d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19
+t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="laptop" unicode="&#xf109;" horiz-adv-x="1920" 
+d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z
+M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
+    <glyph glyph-name="tablet" unicode="&#xf10a;" horiz-adv-x="1152" 
+d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832
+q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="mobile_phone" unicode="&#xf10b;" horiz-adv-x="768" 
+d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136
+q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="circle_blank" unicode="&#xf10c;" 
+d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103
+t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="quote_left" unicode="&#xf10d;" horiz-adv-x="1664" 
+d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z
+M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
+    <glyph glyph-name="quote_right" unicode="&#xf10e;" horiz-adv-x="1664" 
+d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216
+v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
+    <glyph glyph-name="spinner" unicode="&#xf110;" horiz-adv-x="1792" 
+d="M526 142q0 -53 -37.5 -90.5t-90.5 -37.5q-52 0 -90 38t-38 90q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 -64q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -53 -37.5 -90.5t-90.5 -37.5
+t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1522 142q0 -52 -38 -90t-90 -38q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM558 1138q0 -66 -47 -113t-113 -47t-113 47t-47 113t47 113t113 47t113 -47t47 -113z
+M1728 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1088 1344q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1618 1138q0 -93 -66 -158.5t-158 -65.5q-93 0 -158.5 65.5t-65.5 158.5
+q0 92 65.5 158t158.5 66q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="circle" unicode="&#xf111;" 
+d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="reply" unicode="&#xf112;" horiz-adv-x="1792" 
+d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19
+l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
+    <glyph glyph-name="github_alt" unicode="&#xf113;" horiz-adv-x="1664" 
+d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320
+q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86
+t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218
+q0 -87 -27 -168q136 -160 136 -398z" />
+    <glyph glyph-name="folder_close_alt" unicode="&#xf114;" horiz-adv-x="1664" 
+d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320
+q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
+    <glyph glyph-name="folder_open_alt" unicode="&#xf115;" horiz-adv-x="1920" 
+d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68
+v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z
+" />
+    <glyph glyph-name="expand_alt" unicode="&#xf116;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="collapse_alt" unicode="&#xf117;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="smile" unicode="&#xf118;" 
+d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5
+t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="frown" unicode="&#xf119;" 
+d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204
+t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="meh" unicode="&#xf11a;" 
+d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="gamepad" unicode="&#xf11b;" horiz-adv-x="1920" 
+d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150
+t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
+    <glyph glyph-name="keyboard" unicode="&#xf11c;" horiz-adv-x="1920" 
+d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16
+h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16
+h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96
+q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896
+h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="flag_alt" unicode="&#xf11d;" horiz-adv-x="1792" 
+d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9
+h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102
+q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+    <glyph glyph-name="flag_checkered" unicode="&#xf11e;" horiz-adv-x="1792" 
+d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2
+q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266
+q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8
+q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
+    <glyph glyph-name="terminal" unicode="&#xf120;" horiz-adv-x="1664" 
+d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9
+t9 -23z" />
+    <glyph glyph-name="code" unicode="&#xf121;" horiz-adv-x="1920" 
+d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5
+l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
+    <glyph glyph-name="reply_all" unicode="&#xf122;" horiz-adv-x="1792" 
+d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1
+q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
+    <glyph glyph-name="star_half_empty" unicode="&#xf123;" horiz-adv-x="1664" 
+d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5
+l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
+    <glyph glyph-name="location_arrow" unicode="&#xf124;" horiz-adv-x="1408" 
+d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
+    <glyph glyph-name="crop" unicode="&#xf125;" horiz-adv-x="1664" 
+d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23
+v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="code_fork" unicode="&#xf126;" horiz-adv-x="1024" 
+d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5
+q-2 -287 -226 -414q-67 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497
+q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="unlink" unicode="&#xf127;" horiz-adv-x="1664" 
+d="M439 265l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320
+q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18
+l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9
+t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+    <glyph glyph-name="question" unicode="&#xf128;" horiz-adv-x="1024" 
+d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5
+t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
+    <glyph glyph-name="_279" unicode="&#xf129;" horiz-adv-x="640" 
+d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192
+q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="exclamation" unicode="&#xf12a;" horiz-adv-x="640" 
+d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
+    <glyph glyph-name="superscript" unicode="&#xf12b;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+M1534 846v-206h-514l-3 27q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5
+t-65.5 -51.5t-30.5 -63h232v80h126z" />
+    <glyph glyph-name="subscript" unicode="&#xf12c;" 
+d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3q-1 -3 -2.5 -6.5t-3.5 -8t-3 -6.5q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109z
+M1536 -50v-206h-514l-4 27q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73
+h232v80h126z" />
+    <glyph glyph-name="_283" unicode="&#xf12d;" horiz-adv-x="1920" 
+d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
+    <glyph glyph-name="puzzle_piece" unicode="&#xf12e;" horiz-adv-x="1664" 
+d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5
+t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89
+q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117
+q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
+    <glyph glyph-name="microphone" unicode="&#xf130;" horiz-adv-x="1152" 
+d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5
+t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
+    <glyph glyph-name="microphone_off" unicode="&#xf131;" horiz-adv-x="1408" 
+d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128
+q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23
+t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
+    <glyph glyph-name="shield" unicode="&#xf132;" horiz-adv-x="1280" 
+d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150
+t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="calendar_empty" unicode="&#xf133;" horiz-adv-x="1664" 
+d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="fire_extinguisher" unicode="&#xf134;" horiz-adv-x="1408" 
+d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800
+q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113
+q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
+    <glyph glyph-name="rocket" unicode="&#xf135;" horiz-adv-x="1664" 
+d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1
+q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
+    <glyph glyph-name="maxcdn" unicode="&#xf136;" horiz-adv-x="1792" 
+d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
+    <glyph glyph-name="chevron_sign_left" unicode="&#xf137;" 
+d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_right" unicode="&#xf138;" 
+d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_up" unicode="&#xf139;" 
+d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="chevron_sign_down" unicode="&#xf13a;" 
+d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5
+t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="html5" unicode="&#xf13b;" horiz-adv-x="1408" 
+d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
+    <glyph glyph-name="css3" unicode="&#xf13c;" horiz-adv-x="1792" 
+d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
+    <glyph glyph-name="anchor" unicode="&#xf13d;" horiz-adv-x="1792" 
+d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352
+q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19
+t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="unlock_alt" unicode="&#xf13e;" horiz-adv-x="1152" 
+d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181
+v-320h736z" />
+    <glyph glyph-name="bullseye" unicode="&#xf140;" 
+d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150
+t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640
+q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="ellipsis_horizontal" unicode="&#xf141;" horiz-adv-x="1408" 
+d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="ellipsis_vertical" unicode="&#xf142;" horiz-adv-x="384" 
+d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192
+q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
+    <glyph glyph-name="_303" unicode="&#xf143;" 
+d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 233 -176.5 396.5t-396.5 176.5q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128
+q13 0 23 10t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="play_sign" unicode="&#xf144;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56
+q16 -8 32 -8q17 0 32 9z" />
+    <glyph glyph-name="ticket" unicode="&#xf145;" horiz-adv-x="1792" 
+d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136
+t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
+    <glyph glyph-name="minus_sign_alt" unicode="&#xf146;" 
+d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="check_minus" unicode="&#xf147;" horiz-adv-x="1408" 
+d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5
+t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="level_up" unicode="&#xf148;" horiz-adv-x="1024" 
+d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
+    <glyph glyph-name="level_down" unicode="&#xf149;" horiz-adv-x="1024" 
+d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
+    <glyph glyph-name="check_sign" unicode="&#xf14a;" 
+d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5
+t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="edit_sign" unicode="&#xf14b;" 
+d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_312" unicode="&#xf14c;" 
+d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960
+q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="share_sign" unicode="&#xf14d;" 
+d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q11 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5
+t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="compass" unicode="&#xf14e;" 
+d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="collapse" unicode="&#xf150;" 
+d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="collapse_top" unicode="&#xf151;" 
+d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_317" unicode="&#xf152;" 
+d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="eur" unicode="&#xf153;" horiz-adv-x="1024" 
+d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9
+t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26
+l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
+    <glyph glyph-name="gbp" unicode="&#xf154;" horiz-adv-x="1024" 
+d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7
+q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
+    <glyph glyph-name="usd" unicode="&#xf155;" horiz-adv-x="1024" 
+d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43
+t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5
+t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50
+t53 -63.5t31.5 -76.5t13 -94z" />
+    <glyph glyph-name="inr" unicode="&#xf156;" horiz-adv-x="898" 
+d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102
+q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="jpy" unicode="&#xf157;" horiz-adv-x="1027" 
+d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61
+l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
+    <glyph glyph-name="rub" unicode="&#xf158;" horiz-adv-x="1280" 
+d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128
+q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
+    <glyph glyph-name="krw" unicode="&#xf159;" horiz-adv-x="1792" 
+d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23
+t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28
+q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="btc" unicode="&#xf15a;" horiz-adv-x="1280" 
+d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164
+l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30
+t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
+    <glyph glyph-name="file" unicode="&#xf15b;" 
+d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
+    <glyph glyph-name="file_text" unicode="&#xf15c;" 
+d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704
+q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
+    <glyph glyph-name="sort_by_alphabet" unicode="&#xf15d;" horiz-adv-x="1664" 
+d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23
+v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162
+l230 -662h70z" />
+    <glyph glyph-name="_329" unicode="&#xf15e;" horiz-adv-x="1664" 
+d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150
+v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248
+v119h121z" />
+    <glyph glyph-name="sort_by_attributes" unicode="&#xf160;" horiz-adv-x="1792" 
+d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832
+q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="sort_by_attributes_alt" unicode="&#xf161;" horiz-adv-x="1792" 
+d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192
+q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="sort_by_order" unicode="&#xf162;" 
+d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23
+zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5
+t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
+    <glyph glyph-name="sort_by_order_alt" unicode="&#xf163;" 
+d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9
+t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13
+q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
+    <glyph glyph-name="_334" unicode="&#xf164;" horiz-adv-x="1664" 
+d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76
+q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5
+t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
+    <glyph glyph-name="_335" unicode="&#xf165;" horiz-adv-x="1664" 
+d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135
+t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121
+t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
+    <glyph glyph-name="youtube_sign" unicode="&#xf166;" 
+d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 17 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15
+q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38
+q21 -29 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5
+q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78q7 -23 23 -69l24 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38
+q-51 0 -78 -38q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5
+h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="youtube" unicode="&#xf167;" 
+d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73
+q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51
+q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99
+q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-38 -51 -106 -51q-67 0 -105 51
+q-28 38 -28 118v175q0 80 28 117q38 51 105 51q68 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
+    <glyph glyph-name="xing" unicode="&#xf168;" horiz-adv-x="1408" 
+d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942
+q25 45 64 45h241q22 0 31 -15z" />
+    <glyph glyph-name="xing_sign" unicode="&#xf169;" 
+d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1
+l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="youtube_play" unicode="&#xf16a;" horiz-adv-x="1792" 
+d="M711 408l484 250l-484 253v-503zM896 1270q168 0 324.5 -4.5t229.5 -9.5l73 -4q1 0 17 -1.5t23 -3t23.5 -4.5t28.5 -8t28 -13t31 -19.5t29 -26.5q6 -6 15.5 -18.5t29 -58.5t26.5 -101q8 -64 12.5 -136.5t5.5 -113.5v-40v-136q1 -145 -18 -290q-7 -55 -25 -99.5t-32 -61.5
+l-14 -17q-14 -15 -29 -26.5t-31 -19t-28 -12.5t-28.5 -8t-24 -4.5t-23 -3t-16.5 -1.5q-251 -19 -627 -19q-207 2 -359.5 6.5t-200.5 7.5l-49 4l-36 4q-36 5 -54.5 10t-51 21t-56.5 41q-6 6 -15.5 18.5t-29 58.5t-26.5 101q-8 64 -12.5 136.5t-5.5 113.5v40v136
+q-1 145 18 290q7 55 25 99.5t32 61.5l14 17q14 15 29 26.5t31 19.5t28 13t28.5 8t23.5 4.5t23 3t17 1.5q251 18 627 18z" />
+    <glyph glyph-name="dropbox" unicode="&#xf16b;" horiz-adv-x="1792" 
+d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
+    <glyph glyph-name="stackexchange" unicode="&#xf16c;" 
+d="M1289 -96h-1118v480h-160v-640h1438v640h-160v-480zM347 428l33 157l783 -165l-33 -156zM450 802l67 146l725 -339l-67 -145zM651 1158l102 123l614 -513l-102 -123zM1048 1536l477 -641l-128 -96l-477 641zM330 65v159h800v-159h-800z" />
+    <glyph glyph-name="instagram" unicode="&#xf16d;" 
+d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1162 640q0 -164 -115 -279t-279 -115t-279 115t-115 279t115 279t279 115t279 -115t115 -279zM1270 1050q0 -38 -27 -65t-65 -27t-65 27t-27 65t27 65t65 27t65 -27t27 -65zM768 1270
+q-7 0 -76.5 0.5t-105.5 0t-96.5 -3t-103 -10t-71.5 -18.5q-50 -20 -88 -58t-58 -88q-11 -29 -18.5 -71.5t-10 -103t-3 -96.5t0 -105.5t0.5 -76.5t-0.5 -76.5t0 -105.5t3 -96.5t10 -103t18.5 -71.5q20 -50 58 -88t88 -58q29 -11 71.5 -18.5t103 -10t96.5 -3t105.5 0t76.5 0.5
+t76.5 -0.5t105.5 0t96.5 3t103 10t71.5 18.5q50 20 88 58t58 88q11 29 18.5 71.5t10 103t3 96.5t0 105.5t-0.5 76.5t0.5 76.5t0 105.5t-3 96.5t-10 103t-18.5 71.5q-20 50 -58 88t-88 58q-29 11 -71.5 18.5t-103 10t-96.5 3t-105.5 0t-76.5 -0.5zM1536 640q0 -229 -5 -317
+q-10 -208 -124 -322t-322 -124q-88 -5 -317 -5t-317 5q-208 10 -322 124t-124 322q-5 88 -5 317t5 317q10 208 124 322t322 124q88 5 317 5t317 -5q208 -10 322 -124t124 -322q5 -88 5 -317z" />
+    <glyph glyph-name="flickr" unicode="&#xf16e;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150
+t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
+    <glyph glyph-name="adn" unicode="&#xf170;" 
+d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="f171" unicode="&#xf171;" horiz-adv-x="1408" 
+d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22
+t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18
+t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5
+t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
+    <glyph glyph-name="bitbucket_sign" unicode="&#xf172;" 
+d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5
+t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z
+M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120
+v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="tumblr" unicode="&#xf173;" horiz-adv-x="1024" 
+d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14
+q78 2 134 29z" />
+    <glyph glyph-name="tumblr_sign" unicode="&#xf174;" 
+d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="long_arrow_down" unicode="&#xf175;" horiz-adv-x="768" 
+d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
+    <glyph glyph-name="long_arrow_up" unicode="&#xf176;" horiz-adv-x="768" 
+d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
+    <glyph glyph-name="long_arrow_left" unicode="&#xf177;" horiz-adv-x="1792" 
+d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="long_arrow_right" unicode="&#xf178;" horiz-adv-x="1792" 
+d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
+    <glyph glyph-name="apple" unicode="&#xf179;" horiz-adv-x="1408" 
+d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q113 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65
+q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
+    <glyph glyph-name="windows" unicode="&#xf17a;" horiz-adv-x="1664" 
+d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
+    <glyph glyph-name="android" unicode="&#xf17b;" horiz-adv-x="1408" 
+d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30
+t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5
+h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
+    <glyph glyph-name="linux" unicode="&#xf17c;" 
+d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-10 -11 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z
+M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7
+q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15
+q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5
+t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19
+q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63
+q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18q-2 -1 -4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92
+q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152
+q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-6 0 -8 -2t0 -4
+t5 -3q14 -4 18 -31q0 -3 8 2q2 2 2 3zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5
+t-30 -18.5t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43
+q-19 4 -51 9.5t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49
+t-14 -48q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54
+q110 143 124 195q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5
+t-40.5 -33.5t-61 -14q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5
+t15.5 47.5q1 -31 8 -56.5t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
+    <glyph glyph-name="dribble" unicode="&#xf17d;" 
+d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81
+t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19
+q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -5 6.5 -17t7.5 -17q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6
+t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="skype" unicode="&#xf17e;" 
+d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5
+t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5
+q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80
+q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
+    <glyph glyph-name="foursquare" unicode="&#xf180;" horiz-adv-x="1280" 
+d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z
+M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324
+l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
+    <glyph glyph-name="trello" unicode="&#xf181;" 
+d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408
+q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="female" unicode="&#xf182;" horiz-adv-x="1280" 
+d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43
+q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="male" unicode="&#xf183;" horiz-adv-x="1024" 
+d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z
+M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="gittip" unicode="&#xf184;" 
+d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="sun" unicode="&#xf185;" horiz-adv-x="1792" 
+d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4
+l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94
+q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
+    <glyph glyph-name="_366" unicode="&#xf186;" 
+d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61
+t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
+    <glyph glyph-name="archive" unicode="&#xf187;" horiz-adv-x="1792" 
+d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536
+q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="bug" unicode="&#xf188;" horiz-adv-x="1664" 
+d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207
+q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19
+t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
+    <glyph glyph-name="vk" unicode="&#xf189;" horiz-adv-x="1920" 
+d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-40 -51 -55 -72t-30.5 -49.5t-12 -42t13 -34.5t32.5 -43t57 -53q4 -2 5 -4q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58
+t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6
+q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q16 19 38 30q53 26 239 24
+q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2
+q39 5 64 -2.5t31 -16.5z" />
+    <glyph glyph-name="weibo" unicode="&#xf18a;" horiz-adv-x="1792" 
+d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12
+q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422
+q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178
+q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z
+M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
+    <glyph glyph-name="renren" unicode="&#xf18b;" 
+d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495
+q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
+    <glyph glyph-name="_372" unicode="&#xf18c;" horiz-adv-x="1408" 
+d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5
+t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56
+t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -4 1 -50t-1 -72q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5
+t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
+    <glyph glyph-name="stack_exchange" unicode="&#xf18d;" horiz-adv-x="1280" 
+d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z
+" />
+    <glyph glyph-name="_374" unicode="&#xf18e;" 
+d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="arrow_circle_alt_left" unicode="&#xf190;" 
+d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198
+t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_376" unicode="&#xf191;" 
+d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z
+M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="dot_circle_alt" unicode="&#xf192;" 
+d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5
+t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_378" unicode="&#xf193;" horiz-adv-x="1664" 
+d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128
+q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 17 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
+    <glyph glyph-name="vimeo_square" unicode="&#xf194;" 
+d="M1292 898q10 216 -161 222q-231 8 -312 -261q44 19 82 19q85 0 74 -96q-4 -57 -74 -167t-105 -110q-43 0 -82 169q-13 54 -45 255q-30 189 -160 177q-59 -7 -164 -100l-81 -72l-81 -72l52 -67q76 52 87 52q57 0 107 -179q15 -55 45 -164.5t45 -164.5q68 -179 164 -179
+q157 0 383 294q220 283 226 444zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_380" unicode="&#xf195;" horiz-adv-x="1152" 
+d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160
+q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="plus_square_o" unicode="&#xf196;" horiz-adv-x="1408" 
+d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832
+q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_382" unicode="&#xf197;" horiz-adv-x="2176" 
+d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40
+t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29
+q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
+    <glyph glyph-name="_383" unicode="&#xf198;" horiz-adv-x="1664" 
+d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9
+q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102
+t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
+    <glyph glyph-name="_384" unicode="&#xf199;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69
+q-47 32 -142 92.5t-142 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13
+t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
+    <glyph glyph-name="_385" unicode="&#xf19a;" horiz-adv-x="1792" 
+d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5
+t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21
+t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286
+t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273
+t273 -182.5t331.5 -68z" />
+    <glyph glyph-name="_386" unicode="&#xf19b;" horiz-adv-x="1792" 
+d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
+    <glyph glyph-name="_387" unicode="&#xf19c;" horiz-adv-x="2048" 
+d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64
+q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
+    <glyph glyph-name="_388" unicode="&#xf19d;" horiz-adv-x="2304" 
+d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433
+q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
+    <glyph glyph-name="_389" unicode="&#xf19e;" 
+d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q44 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0
+q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
+    <glyph glyph-name="uniF1A0" unicode="&#xf1a0;" 
+d="M768 750h725q12 -67 12 -128q0 -217 -91 -387.5t-259.5 -266.5t-386.5 -96q-157 0 -299 60.5t-245 163.5t-163.5 245t-60.5 299t60.5 299t163.5 245t245 163.5t299 60.5q300 0 515 -201l-209 -201q-123 119 -306 119q-129 0 -238.5 -65t-173.5 -176.5t-64 -243.5
+t64 -243.5t173.5 -176.5t238.5 -65q87 0 160 24t120 60t82 82t51.5 87t22.5 78h-436v264z" />
+    <glyph glyph-name="f1a1" unicode="&#xf1a1;" horiz-adv-x="1792" 
+d="M1095 369q16 -16 0 -31q-62 -62 -199 -62t-199 62q-16 15 0 31q6 6 15 6t15 -6q48 -49 169 -49q120 0 169 49q6 6 15 6t15 -6zM788 550q0 -37 -26 -63t-63 -26t-63.5 26t-26.5 63q0 38 26.5 64t63.5 26t63 -26.5t26 -63.5zM1183 550q0 -37 -26.5 -63t-63.5 -26t-63 26
+t-26 63t26 63.5t63 26.5t63.5 -26t26.5 -64zM1434 670q0 49 -35 84t-85 35t-86 -36q-130 90 -311 96l63 283l200 -45q0 -37 26 -63t63 -26t63.5 26.5t26.5 63.5t-26.5 63.5t-63.5 26.5q-54 0 -80 -50l-221 49q-19 5 -25 -16l-69 -312q-180 -7 -309 -97q-35 37 -87 37
+q-50 0 -85 -35t-35 -84q0 -35 18.5 -64t49.5 -44q-6 -27 -6 -56q0 -142 140 -243t337 -101q198 0 338 101t140 243q0 32 -7 57q30 15 48 43.5t18 63.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191
+t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_392" unicode="&#xf1a2;" 
+d="M939 407q13 -13 0 -26q-53 -53 -171 -53t-171 53q-13 13 0 26q5 6 13 6t13 -6q42 -42 145 -42t145 42q5 6 13 6t13 -6zM676 563q0 -31 -23 -54t-54 -23t-54 23t-23 54q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1014 563q0 -31 -23 -54t-54 -23t-54 23t-23 54
+q0 32 22.5 54.5t54.5 22.5t54.5 -22.5t22.5 -54.5zM1229 666q0 42 -30 72t-73 30q-42 0 -73 -31q-113 78 -267 82l54 243l171 -39q1 -32 23.5 -54t53.5 -22q32 0 54.5 22.5t22.5 54.5t-22.5 54.5t-54.5 22.5q-48 0 -69 -43l-189 42q-17 5 -21 -13l-60 -268q-154 -6 -265 -83
+q-30 32 -74 32q-43 0 -73 -30t-30 -72q0 -30 16 -55t42 -38q-5 -25 -5 -48q0 -122 120 -208.5t289 -86.5q170 0 290 86.5t120 208.5q0 25 -6 49q25 13 40.5 37.5t15.5 54.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_393" unicode="&#xf1a3;" 
+d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150
+v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103
+t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="f1a4" unicode="&#xf1a4;" horiz-adv-x="1920" 
+d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328
+v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
+    <glyph glyph-name="_395" unicode="&#xf1a5;" 
+d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="_396" unicode="&#xf1a6;" horiz-adv-x="2048" 
+d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123
+v-369h123z" />
+    <glyph glyph-name="_397" unicode="&#xf1a7;" 
+d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101
+v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960
+q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_398" unicode="&#xf1a8;" horiz-adv-x="2038" 
+d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14
+q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24
+q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33
+q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5
+t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43
+q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5
+t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13
+t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
+    <glyph glyph-name="_399" unicode="&#xf1a9;" 
+d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10
+q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14
+q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14
+t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44
+q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
+    <glyph glyph-name="_400" unicode="&#xf1aa;" 
+d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z
+M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5
+t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5
+q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126
+t135.5 51q85 0 145 -60.5t60 -145.5z" />
+    <glyph glyph-name="f1ab" unicode="&#xf1ab;" 
+d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5
+q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28
+q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z
+M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11
+q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q107 36 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5
+q20 0 20 -21v-418z" />
+    <glyph glyph-name="_402" unicode="&#xf1ac;" horiz-adv-x="1792" 
+d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48
+l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23
+t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128
+q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128
+q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
+    <glyph glyph-name="_403" unicode="&#xf1ad;" 
+d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9
+t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64
+q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
+q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9
+t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64
+q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64
+q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9
+t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
+    <glyph glyph-name="_404" unicode="&#xf1ae;" horiz-adv-x="1280" 
+d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68q29 28 68.5 28t67.5 -28l228 -228h368l228 228q28 28 68 28t68 -28q28 -29 28 -68.5t-28 -67.5zM864 1152
+q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="uniF1B1" unicode="&#xf1b0;" horiz-adv-x="1664" 
+d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5
+q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819
+q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5
+t100.5 134t141.5 55.5z" />
+    <glyph glyph-name="_406" unicode="&#xf1b1;" horiz-adv-x="768" 
+d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
+    <glyph glyph-name="_407" unicode="&#xf1b2;" horiz-adv-x="1792" 
+d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z
+" />
+    <glyph glyph-name="_408" unicode="&#xf1b3;" horiz-adv-x="2304" 
+d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67
+t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-4 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70
+v-400l434 -186q36 -16 57 -48t21 -70z" />
+    <glyph glyph-name="_409" unicode="&#xf1b4;" horiz-adv-x="2048" 
+d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658
+q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204
+q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
+    <glyph glyph-name="_410" unicode="&#xf1b5;" 
+d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5
+t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217
+t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
+    <glyph glyph-name="_411" unicode="&#xf1b6;" horiz-adv-x="1792" 
+d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5
+q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89
+q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
+    <glyph glyph-name="_412" unicode="&#xf1b7;" 
+d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5
+q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5
+q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z
+" />
+    <glyph glyph-name="_413" unicode="&#xf1b8;" horiz-adv-x="1792" 
+d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188
+l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5
+t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1
+q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
+    <glyph glyph-name="_414" unicode="&#xf1b9;" horiz-adv-x="2048" 
+d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384
+q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5
+l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="_415" unicode="&#xf1ba;" horiz-adv-x="2048" 
+d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5
+t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z
+M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
+    <glyph glyph-name="_416" unicode="&#xf1bb;" 
+d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384
+q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
+    <glyph glyph-name="_417" unicode="&#xf1bc;" 
+d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64
+q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37
+q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_418" unicode="&#xf1bd;" horiz-adv-x="1024" 
+d="M1024 1233l-303 -582l24 -31h279v-415h-507l-44 -30l-142 -273l-30 -30h-301v303l303 583l-24 30h-279v415h507l44 30l142 273l30 30h301v-303z" />
+    <glyph glyph-name="_419" unicode="&#xf1be;" horiz-adv-x="2304" 
+d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11
+q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245
+q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785
+l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242
+q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236
+q0 -11 -8 -19t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786
+q-13 2 -22 11t-9 22v899q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
+    <glyph glyph-name="uniF1C0" unicode="&#xf1c0;" 
+d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127
+t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5
+t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
+    <glyph glyph-name="uniF1C1" unicode="&#xf1c1;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197
+q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8
+q-1 1 -1 2q-1 2 -1 3q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
+    <glyph glyph-name="_422" unicode="&#xf1c2;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4q0 3 -0.5 6.5t-1.5 8t-1 6.5q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5
+t-3.5 -21.5l-4 -21h-4l-2 21q-2 26 -7 46l-99 438h90v107h-300z" />
+    <glyph glyph-name="_423" unicode="&#xf1c3;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107
+h-290v-107h68l189 -272l-194 -283h-68z" />
+    <glyph glyph-name="_424" unicode="&#xf1c4;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
+    <glyph glyph-name="_425" unicode="&#xf1c5;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
+    <glyph glyph-name="_426" unicode="&#xf1c6;" 
+d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400
+v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79
+q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
+    <glyph glyph-name="_427" unicode="&#xf1c7;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5
+q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
+    <glyph glyph-name="_428" unicode="&#xf1c8;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
+    <glyph glyph-name="_429" unicode="&#xf1c9;" 
+d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z
+M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243
+l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
+    <glyph glyph-name="_430" unicode="&#xf1ca;" 
+d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406
+q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
+    <glyph glyph-name="_431" unicode="&#xf1cb;" horiz-adv-x="1792" 
+d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546
+q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
+    <glyph glyph-name="_432" unicode="&#xf1cc;" horiz-adv-x="2048" 
+d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94
+q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55
+t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97l93 -108q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5t-85 -189.5z" />
+    <glyph glyph-name="_433" unicode="&#xf1cd;" horiz-adv-x="1792" 
+d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194
+q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5
+t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
+    <glyph glyph-name="_434" unicode="&#xf1ce;" horiz-adv-x="1792" 
+d="M1760 640q0 -176 -68.5 -336t-184 -275.5t-275.5 -184t-336 -68.5t-336 68.5t-275.5 184t-184 275.5t-68.5 336q0 213 97 398.5t265 305.5t374 151v-228q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5
+t136.5 204t51 248.5q0 230 -145.5 406t-366.5 221v228q206 -31 374 -151t265 -305.5t97 -398.5z" />
+    <glyph glyph-name="uniF1D0" unicode="&#xf1d0;" horiz-adv-x="1792" 
+d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41
+t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170
+t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136
+q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
+    <glyph glyph-name="uniF1D1" unicode="&#xf1d1;" horiz-adv-x="1792" 
+d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251
+l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162
+q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33
+q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5
+t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF1D2" unicode="&#xf1d2;" 
+d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85
+q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392
+q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072
+q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_438" unicode="&#xf1d3;" horiz-adv-x="1792" 
+d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58
+q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47
+q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171
+v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
+    <glyph glyph-name="_439" unicode="&#xf1d4;" 
+d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF1D5" unicode="&#xf1d5;" horiz-adv-x="1280" 
+d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5
+t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153
+t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
+    <glyph glyph-name="uniF1D6" unicode="&#xf1d6;" horiz-adv-x="1792" 
+d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5
+q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20
+t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5
+t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
+    <glyph glyph-name="uniF1D7" unicode="&#xf1d7;" horiz-adv-x="2048" 
+d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25
+q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5
+q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109
+q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
+    <glyph glyph-name="_443" unicode="&#xf1d8;" horiz-adv-x="1792" 
+d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
+    <glyph glyph-name="_444" unicode="&#xf1d9;" horiz-adv-x="1792" 
+d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137
+l863 639l-478 -797z" />
+    <glyph glyph-name="_445" unicode="&#xf1da;" 
+d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5
+t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23
+t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_446" unicode="&#xf1db;" 
+d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103
+t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_447" unicode="&#xf1dc;" horiz-adv-x="1792" 
+d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15
+t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2
+t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160
+q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5
+q0 -26 -12 -48t-36 -22z" />
+    <glyph glyph-name="_448" unicode="&#xf1dd;" horiz-adv-x="1280" 
+d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179
+q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
+    <glyph glyph-name="_449" unicode="&#xf1de;" 
+d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256
+q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
+    <glyph glyph-name="uniF1E0" unicode="&#xf1e0;" 
+d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5
+t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
+    <glyph glyph-name="_451" unicode="&#xf1e1;" 
+d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5
+t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_452" unicode="&#xf1e2;" horiz-adv-x="1792" 
+d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5
+t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91
+q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9
+t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
+    <glyph glyph-name="_453" unicode="&#xf1e3;" horiz-adv-x="1792" 
+d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323
+l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
+    <glyph glyph-name="_454" unicode="&#xf1e4;" horiz-adv-x="1792" 
+d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23
+v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192
+q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23
+zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5
+t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
+    <glyph glyph-name="_455" unicode="&#xf1e5;" horiz-adv-x="1792" 
+d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z
+M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_456" unicode="&#xf1e6;" horiz-adv-x="1792" 
+d="M1755 1083q37 -38 37 -90.5t-37 -90.5l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234
+l401 400q38 37 91 37t90 -37z" />
+    <glyph glyph-name="_457" unicode="&#xf1e7;" horiz-adv-x="1792" 
+d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5
+t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z
+M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q4 -2 11.5 -7
+t10.5 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
+    <glyph glyph-name="_458" unicode="&#xf1e8;" horiz-adv-x="1792" 
+d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
+    <glyph glyph-name="_459" unicode="&#xf1e9;" 
+d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36
+q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q71 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5
+t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87
+q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
+    <glyph glyph-name="_460" unicode="&#xf1ea;" horiz-adv-x="2048" 
+d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19
+t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
+    <glyph glyph-name="_461" unicode="&#xf1eb;" horiz-adv-x="2048" 
+d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121
+q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z
+M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
+    <glyph glyph-name="_462" unicode="&#xf1ec;" horiz-adv-x="1792" 
+d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5
+t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5
+t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5
+t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
+M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38
+h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_463" unicode="&#xf1ed;" 
+d="M1519 890q18 -84 -4 -204q-87 -444 -565 -444h-44q-25 0 -44 -16.5t-24 -42.5l-4 -19l-55 -346l-2 -15q-5 -26 -24.5 -42.5t-44.5 -16.5h-251q-21 0 -33 15t-9 36q9 56 26.5 168t26.5 168t27 167.5t27 167.5q5 37 43 37h131q133 -2 236 21q175 39 287 144q102 95 155 246
+q24 70 35 133q1 6 2.5 7.5t3.5 1t6 -3.5q79 -59 98 -162zM1347 1172q0 -107 -46 -236q-80 -233 -302 -315q-113 -40 -252 -42q0 -1 -90 -1l-90 1q-100 0 -118 -96q-2 -8 -85 -530q-1 -10 -12 -10h-295q-22 0 -36.5 16.5t-11.5 38.5l232 1471q5 29 27.5 48t51.5 19h598
+q34 0 97.5 -13t111.5 -32q107 -41 163.5 -123t56.5 -196z" />
+    <glyph glyph-name="_464" unicode="&#xf1ee;" horiz-adv-x="1792" 
+d="M441 864q33 0 52 -26q266 -364 362 -774h-446q-127 441 -367 749q-12 16 -3 33.5t29 17.5h373zM1000 507q-49 -199 -125 -393q-79 310 -256 594q40 221 44 449q211 -340 337 -650zM1099 1216q235 -324 384.5 -698.5t184.5 -773.5h-451q-41 665 -553 1472h435zM1792 640
+q0 -424 -101 -812q-67 560 -359 1083q-25 301 -106 584q-4 16 5.5 28.5t25.5 12.5h359q21 0 38.5 -13t22.5 -33q115 -409 115 -850z" />
+    <glyph glyph-name="uniF1F0" unicode="&#xf1f0;" horiz-adv-x="2304" 
+d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27
+q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128
+q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_466" unicode="&#xf1f1;" horiz-adv-x="2304" 
+d="M1119 1195q-128 85 -281 85q-103 0 -197.5 -40.5t-162.5 -108.5t-108.5 -162t-40.5 -197q0 -104 40.5 -198t108.5 -162t162 -108.5t198 -40.5q153 0 281 85q-131 107 -178 265.5t0.5 316.5t177.5 265zM1152 1171q-126 -99 -172 -249.5t-0.5 -300.5t172.5 -249
+q127 99 172.5 249t-0.5 300.5t-172 249.5zM1185 1195q130 -107 177.5 -265.5t0.5 -317t-178 -264.5q128 -85 281 -85q104 0 198 40.5t162 108.5t108.5 162t40.5 198q0 103 -40.5 197t-108.5 162t-162.5 108.5t-197.5 40.5q-153 0 -281 -85zM1926 473h7v3h-17v-3h7v-17h3v17z
+M1955 456h4v20h-5l-6 -13l-6 13h-5v-20h3v15l6 -13h4l5 13v-15zM1947 16v-2h-2h-3v3h3h2v-1zM1947 7h3l-4 5h2l1 1q1 1 1 3t-1 3l-1 1h-3h-6v-13h3v5h1zM685 75q0 19 11 31t30 12q18 0 29 -12.5t11 -30.5q0 -19 -11 -31t-29 -12q-19 0 -30 12t-11 31zM1158 119q30 0 35 -32
+h-70q5 32 35 32zM1514 75q0 19 11 31t29 12t29.5 -12.5t11.5 -30.5q0 -19 -11 -31t-30 -12q-18 0 -29 12t-11 31zM1786 75q0 18 11.5 30.5t29.5 12.5t29.5 -12.5t11.5 -30.5q0 -19 -11.5 -31t-29.5 -12t-29.5 12.5t-11.5 30.5zM1944 3q-2 0 -4 1q-1 0 -3 2t-2 3q-1 2 -1 4
+q0 3 1 4q0 2 2 4l1 1q2 0 2 1q2 1 4 1q3 0 4 -1l4 -2l2 -4v-1q1 -2 1 -3l-1 -1v-3t-1 -1l-1 -2q-2 -2 -4 -2q-1 -1 -4 -1zM599 7h30v85q0 24 -14.5 38.5t-39.5 15.5q-32 0 -47 -24q-14 24 -45 24q-24 0 -39 -20v16h-30v-135h30v75q0 36 33 36q30 0 30 -36v-75h29v75
+q0 36 33 36q30 0 30 -36v-75zM765 7h29v68v67h-29v-16q-17 20 -43 20q-29 0 -48 -20t-19 -51t19 -51t48 -20q28 0 43 20v-17zM943 48q0 34 -47 40l-14 2q-23 4 -23 14q0 15 25 15q23 0 43 -11l12 24q-22 14 -55 14q-26 0 -41 -12t-15 -32q0 -33 47 -39l13 -2q24 -4 24 -14
+q0 -17 -31 -17q-25 0 -45 14l-13 -23q25 -17 58 -17q29 0 45.5 12t16.5 32zM1073 14l-8 25q-13 -7 -26 -7q-19 0 -19 22v61h48v27h-48v41h-30v-41h-28v-27h28v-61q0 -50 47 -50q21 0 36 10zM1159 146q-29 0 -48 -20t-19 -51q0 -32 19.5 -51.5t49.5 -19.5q33 0 55 19l-14 22
+q-18 -15 -39 -15q-34 0 -41 33h101v12q0 32 -18 51.5t-46 19.5zM1318 146q-23 0 -35 -20v16h-30v-135h30v76q0 35 29 35q10 0 18 -4l9 28q-9 4 -21 4zM1348 75q0 -31 19.5 -51t52.5 -20q29 0 48 16l-14 24q-18 -13 -35 -12q-18 0 -29.5 12t-11.5 31t11.5 31t29.5 12
+q19 0 35 -12l14 24q-20 16 -48 16q-33 0 -52.5 -20t-19.5 -51zM1593 7h30v68v67h-30v-16q-15 20 -42 20q-29 0 -48.5 -20t-19.5 -51t19.5 -51t48.5 -20q28 0 42 20v-17zM1726 146q-23 0 -35 -20v16h-29v-135h29v76q0 35 29 35q10 0 18 -4l9 28q-8 4 -21 4zM1866 7h29v68v122
+h-29v-71q-15 20 -43 20t-47.5 -20.5t-19.5 -50.5t19.5 -50.5t47.5 -20.5q29 0 43 20v-17zM1944 27l-2 -1h-3q-2 -1 -4 -3q-3 -1 -3 -4q-1 -2 -1 -6q0 -3 1 -5q0 -2 3 -4q2 -2 4 -3t5 -1q4 0 6 1q0 1 2 2l2 1q1 1 3 4q1 2 1 5q0 4 -1 6q-1 1 -3 4q0 1 -2 2l-2 1q-1 0 -3 0.5
+t-3 0.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_467" unicode="&#xf1f2;" horiz-adv-x="2304" 
+d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42
+q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604
+v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569
+q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73
+t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
+    <glyph glyph-name="f1f3" unicode="&#xf1f3;" horiz-adv-x="2304" 
+d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z
+M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260
+l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279
+v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040
+q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168
+q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5
+t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21
+h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5
+t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
+    <glyph glyph-name="_469" unicode="&#xf1f4;" horiz-adv-x="2304" 
+d="M745 630q0 -37 -25.5 -61.5t-62.5 -24.5q-29 0 -46.5 16t-17.5 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM1530 779q0 -42 -22 -57t-66 -15l-32 -1l17 107q2 11 13 11h18q22 0 35 -2t25 -12.5t12 -30.5zM1881 630q0 -36 -25.5 -61t-61.5 -25q-29 0 -47 16
+t-18 44q0 37 25 62.5t62 25.5q28 0 46.5 -16.5t18.5 -45.5zM513 801q0 59 -38.5 85.5t-100.5 26.5h-160q-19 0 -21 -19l-65 -408q-1 -6 3 -11t10 -5h76q20 0 22 19l18 110q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM822 489l41 261q1 6 -3 11t-10 5h-76
+q-14 0 -17 -33q-27 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q28 0 58 12t48 32q-4 -12 -4 -21q0 -16 13 -16h69q19 0 22 19zM1269 752q0 5 -4 9.5t-9 4.5h-77q-11 0 -18 -10l-106 -156l-44 150q-5 16 -22 16h-75q-5 0 -9 -4.5t-4 -9.5q0 -2 19.5 -59
+t42 -123t23.5 -70q-82 -112 -82 -120q0 -13 13 -13h77q11 0 18 10l255 368q2 2 2 7zM1649 801q0 59 -38.5 85.5t-100.5 26.5h-159q-20 0 -22 -19l-65 -408q-1 -6 3 -11t10 -5h82q12 0 16 13l18 116q1 8 7 13t15 6.5t17 1.5t19 -1t14 -1q86 0 135 48.5t49 134.5zM1958 489
+l41 261q1 6 -3 11t-10 5h-76q-14 0 -17 -33q-26 40 -95 40q-72 0 -122.5 -54t-50.5 -127q0 -59 34.5 -94t92.5 -35q29 0 59 12t47 32q0 -1 -2 -9t-2 -12q0 -16 13 -16h69q19 0 22 19zM2176 898v1q0 14 -13 14h-74q-11 0 -13 -11l-65 -416l-1 -2q0 -5 4 -9.5t10 -4.5h66
+q19 0 21 19zM392 764q-5 -35 -26 -46t-60 -11l-33 -1l17 107q2 11 13 11h19q40 0 58 -11.5t12 -48.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_470" unicode="&#xf1f5;" horiz-adv-x="2304" 
+d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109
+q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118
+q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151
+q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31
+q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_471" unicode="&#xf1f6;" horiz-adv-x="2048" 
+d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5
+l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5
+l418 363q10 8 23.5 7t21.5 -11z" />
+    <glyph glyph-name="_472" unicode="&#xf1f7;" horiz-adv-x="2048" 
+d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128
+q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161
+q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
+    <glyph glyph-name="_473" unicode="&#xf1f8;" horiz-adv-x="1408" 
+d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704
+q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167
+q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_474" unicode="&#xf1f9;" 
+d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5
+t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5
+t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_475" unicode="&#xf1fa;" 
+d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53
+q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24
+t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61
+t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
+    <glyph glyph-name="_476" unicode="&#xf1fb;" horiz-adv-x="1792" 
+d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10
+t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
+    <glyph glyph-name="f1fc" unicode="&#xf1fc;" horiz-adv-x="1792" 
+d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5
+t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
+    <glyph glyph-name="_478" unicode="&#xf1fd;" horiz-adv-x="1792" 
+d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11q24 0 44 -7t31 -15t33 -27q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5
+t47 37.5q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-24 0 -44 7t-31 15t-33 27q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38
+t-58 27t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448
+h256v448h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5
+q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
+    <glyph glyph-name="_479" unicode="&#xf1fe;" horiz-adv-x="2048" 
+d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
+    <glyph glyph-name="_480" unicode="&#xf200;" horiz-adv-x="1792" 
+d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_481" unicode="&#xf201;" horiz-adv-x="2048" 
+d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9
+t9 -23z" />
+    <glyph glyph-name="_482" unicode="&#xf202;" horiz-adv-x="1792" 
+d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20
+q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50
+t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1
+q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
+    <glyph glyph-name="_483" unicode="&#xf203;" 
+d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73
+q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110
+q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960
+q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_484" unicode="&#xf204;" horiz-adv-x="2048" 
+d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5
+t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5
+t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
+    <glyph glyph-name="_485" unicode="&#xf205;" horiz-adv-x="2048" 
+d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5
+t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
+    <glyph glyph-name="_486" unicode="&#xf206;" horiz-adv-x="2304" 
+d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94
+q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469
+q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400
+q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
+    <glyph glyph-name="_487" unicode="&#xf207;" 
+d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5
+h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5
+t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
+    <glyph glyph-name="_488" unicode="&#xf208;" horiz-adv-x="2048" 
+d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327
+q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5
+q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
+    <glyph glyph-name="_489" unicode="&#xf209;" horiz-adv-x="1280" 
+d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q17 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119
+t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5
+t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14
+q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88
+q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5
+t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
+    <glyph glyph-name="_490" unicode="&#xf20a;" horiz-adv-x="2048" 
+d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206
+q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307
+t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14
+t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
+    <glyph glyph-name="_491" unicode="&#xf20b;" 
+d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5
+t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="_492" unicode="&#xf20c;" 
+d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55
+q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410
+q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
+    <glyph glyph-name="_493" unicode="&#xf20d;" 
+d="M915 450h-294l147 551zM1001 128h311l-324 1024h-440l-324 -1024h311l383 314zM1536 1120v-960q0 -118 -85 -203t-203 -85h-960q-118 0 -203 85t-85 203v960q0 118 85 203t203 85h960q118 0 203 -85t85 -203z" />
+    <glyph glyph-name="_494" unicode="&#xf20e;" horiz-adv-x="2048" 
+d="M2048 641q0 -21 -13 -36.5t-33 -19.5l-205 -356q3 -9 3 -18q0 -20 -12.5 -35.5t-32.5 -19.5l-193 -337q3 -8 3 -16q0 -23 -16.5 -40t-40.5 -17q-25 0 -41 18h-400q-17 -20 -43 -20t-43 20h-399q-17 -20 -43 -20q-23 0 -40 16.5t-17 40.5q0 8 4 20l-193 335
+q-20 4 -32.5 19.5t-12.5 35.5q0 9 3 18l-206 356q-20 5 -32.5 20.5t-12.5 35.5q0 21 13.5 36.5t33.5 19.5l199 344q0 1 -0.5 3t-0.5 3q0 36 34 51l209 363q-4 10 -4 18q0 24 17 40.5t40 16.5q26 0 44 -21h396q16 21 43 21t43 -21h398q18 21 44 21q23 0 40 -16.5t17 -40.5
+q0 -6 -4 -18l207 -358q23 -1 39 -17.5t16 -38.5q0 -13 -7 -27l187 -324q19 -4 31.5 -19.5t12.5 -35.5zM1063 -158h389l-342 354h-143l-342 -354h360q18 16 39 16t39 -16zM112 654q1 -4 1 -13q0 -10 -2 -15l208 -360l15 -6l188 199v347l-187 194q-13 -8 -29 -10zM986 1438
+h-388l190 -200l554 200h-280q-16 -16 -38 -16t-38 16zM1689 226q1 6 5 11l-64 68l-17 -79h76zM1583 226l22 105l-252 266l-296 -307l63 -64h463zM1495 -142l16 28l65 310h-427l333 -343q8 4 13 5zM578 -158h5l342 354h-373v-335l4 -6q14 -5 22 -13zM552 226h402l64 66
+l-309 321l-157 -166v-221zM359 226h163v189l-168 -177q4 -8 5 -12zM358 1051q0 -1 0.5 -2t0.5 -2q0 -16 -8 -29l171 -177v269zM552 1121v-311l153 -157l297 314l-223 236zM556 1425l-4 -8v-264l205 74l-191 201q-6 -2 -10 -3zM1447 1438h-16l-621 -224l213 -225zM1023 946
+l-297 -315l311 -319l296 307zM688 634l-136 141v-284zM1038 270l-42 -44h85zM1374 618l238 -251l132 624l-3 5l-1 1zM1718 1018q-8 13 -8 29v2l-216 376q-5 1 -13 5l-437 -463l310 -327zM522 1142v223l-163 -282zM522 196h-163l163 -283v283zM1607 196l-48 -227l130 227h-82
+zM1729 266l207 361q-2 10 -2 14q0 1 3 16l-171 296l-129 -612l77 -82q5 3 15 7z" />
+    <glyph glyph-name="f210" unicode="&#xf210;" 
+d="M0 856q0 131 91.5 226.5t222.5 95.5h742l352 358v-1470q0 -132 -91.5 -227t-222.5 -95h-780q-131 0 -222.5 95t-91.5 227v790zM1232 102l-176 180v425q0 46 -32 79t-78 33h-484q-46 0 -78 -33t-32 -79v-492q0 -46 32.5 -79.5t77.5 -33.5h770z" />
+    <glyph glyph-name="_496" unicode="&#xf211;" 
+d="M934 1386q-317 -121 -556 -362.5t-358 -560.5q-20 89 -20 176q0 208 102.5 384.5t278.5 279t384 102.5q82 0 169 -19zM1203 1267q93 -65 164 -155q-389 -113 -674.5 -400.5t-396.5 -676.5q-93 72 -155 162q112 386 395 671t667 399zM470 -67q115 356 379.5 622t619.5 384
+q40 -92 54 -195q-292 -120 -516 -345t-343 -518q-103 14 -194 52zM1536 -125q-193 50 -367 115q-135 -84 -290 -107q109 205 274 370.5t369 275.5q-21 -152 -101 -284q65 -175 115 -370z" />
+    <glyph glyph-name="f212" unicode="&#xf212;" horiz-adv-x="2048" 
+d="M1893 1144l155 -1272q-131 0 -257 57q-200 91 -393 91q-226 0 -374 -148q-148 148 -374 148q-193 0 -393 -91q-128 -57 -252 -57h-5l155 1272q224 127 482 127q233 0 387 -106q154 106 387 106q258 0 482 -127zM1398 157q129 0 232 -28.5t260 -93.5l-124 1021
+q-171 78 -368 78q-224 0 -374 -141q-150 141 -374 141q-197 0 -368 -78l-124 -1021q105 43 165.5 65t148.5 39.5t178 17.5q202 0 374 -108q172 108 374 108zM1438 191l-55 907q-211 -4 -359 -155q-152 155 -374 155q-176 0 -336 -66l-114 -941q124 51 228.5 76t221.5 25
+q209 0 374 -102q172 107 374 102z" />
+    <glyph glyph-name="_498" unicode="&#xf213;" horiz-adv-x="2048" 
+d="M1500 165v733q0 21 -15 36t-35 15h-93q-20 0 -35 -15t-15 -36v-733q0 -20 15 -35t35 -15h93q20 0 35 15t15 35zM1216 165v531q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-531q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM924 165v429q0 20 -15 35t-35 15h-101
+q-20 0 -35 -15t-15 -35v-429q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM632 165v362q0 20 -15 35t-35 15h-101q-20 0 -35 -15t-15 -35v-362q0 -20 15 -35t35 -15h101q20 0 35 15t15 35zM2048 311q0 -166 -118 -284t-284 -118h-1244q-166 0 -284 118t-118 284
+q0 116 63 214.5t168 148.5q-10 34 -10 73q0 113 80.5 193.5t193.5 80.5q102 0 180 -67q45 183 194 300t338 117q149 0 275 -73.5t199.5 -199.5t73.5 -275q0 -66 -14 -122q135 -33 221 -142.5t86 -247.5z" />
+    <glyph glyph-name="_499" unicode="&#xf214;" 
+d="M0 1536h1536v-1392l-776 -338l-760 338v1392zM1436 209v926h-1336v-926l661 -294zM1436 1235v201h-1336v-201h1336zM181 937v-115h-37v115h37zM181 789v-115h-37v115h37zM181 641v-115h-37v115h37zM181 493v-115h-37v115h37zM181 345v-115h-37v115h37zM207 202l15 34
+l105 -47l-15 -33zM343 142l15 34l105 -46l-15 -34zM478 82l15 34l105 -46l-15 -34zM614 23l15 33l104 -46l-15 -34zM797 10l105 46l15 -33l-105 -47zM932 70l105 46l15 -34l-105 -46zM1068 130l105 46l15 -34l-105 -46zM1203 189l105 47l15 -34l-105 -46zM259 1389v-36h-114
+v36h114zM421 1389v-36h-115v36h115zM583 1389v-36h-115v36h115zM744 1389v-36h-114v36h114zM906 1389v-36h-114v36h114zM1068 1389v-36h-115v36h115zM1230 1389v-36h-115v36h115zM1391 1389v-36h-114v36h114zM181 1049v-79h-37v115h115v-36h-78zM421 1085v-36h-115v36h115z
+M583 1085v-36h-115v36h115zM744 1085v-36h-114v36h114zM906 1085v-36h-114v36h114zM1068 1085v-36h-115v36h115zM1230 1085v-36h-115v36h115zM1355 970v79h-78v36h115v-115h-37zM1355 822v115h37v-115h-37zM1355 674v115h37v-115h-37zM1355 526v115h37v-115h-37zM1355 378
+v115h37v-115h-37zM1355 230v115h37v-115h-37zM760 265q-129 0 -221 91.5t-92 221.5q0 129 92 221t221 92q130 0 221.5 -92t91.5 -221q0 -130 -91.5 -221.5t-221.5 -91.5zM595 646q0 -36 19.5 -56.5t49.5 -25t64 -7t64 -2t49.5 -9t19.5 -30.5q0 -49 -112 -49q-97 0 -123 51
+h-3l-31 -63q67 -42 162 -42q29 0 56.5 5t55.5 16t45.5 33t17.5 53q0 46 -27.5 69.5t-67.5 27t-79.5 3t-67 5t-27.5 25.5q0 21 20.5 33t40.5 15t41 3q34 0 70.5 -11t51.5 -34h3l30 58q-3 1 -21 8.5t-22.5 9t-19.5 7t-22 7t-20 4.5t-24 4t-23 1q-29 0 -56.5 -5t-54 -16.5
+t-43 -34t-16.5 -53.5z" />
+    <glyph glyph-name="_500" unicode="&#xf215;" horiz-adv-x="2048" 
+d="M863 504q0 112 -79.5 191.5t-191.5 79.5t-191 -79.5t-79 -191.5t79 -191t191 -79t191.5 79t79.5 191zM1726 505q0 112 -79 191t-191 79t-191.5 -79t-79.5 -191q0 -113 79.5 -192t191.5 -79t191 79.5t79 191.5zM2048 1314v-1348q0 -44 -31.5 -75.5t-76.5 -31.5h-1832
+q-45 0 -76.5 31.5t-31.5 75.5v1348q0 44 31.5 75.5t76.5 31.5h431q44 0 76 -31.5t32 -75.5v-161h754v161q0 44 32 75.5t76 31.5h431q45 0 76.5 -31.5t31.5 -75.5z" />
+    <glyph glyph-name="_501" unicode="&#xf216;" horiz-adv-x="2048" 
+d="M1430 953zM1690 749q148 0 253 -98.5t105 -244.5q0 -157 -109 -261.5t-267 -104.5q-85 0 -162 27.5t-138 73.5t-118 106t-109 126t-103.5 132.5t-108.5 126.5t-117 106t-136 73.5t-159 27.5q-154 0 -251.5 -91.5t-97.5 -244.5q0 -157 104 -250t263 -93q100 0 208 37.5
+t193 98.5q5 4 21 18.5t30 24t22 9.5q14 0 24.5 -10.5t10.5 -24.5q0 -24 -60 -77q-101 -88 -234.5 -142t-260.5 -54q-133 0 -245.5 58t-180 165t-67.5 241q0 205 141.5 341t347.5 136q120 0 226.5 -43.5t185.5 -113t151.5 -153t139 -167.5t133.5 -153.5t149.5 -113
+t172.5 -43.5q102 0 168.5 61.5t66.5 162.5q0 95 -64.5 159t-159.5 64q-30 0 -81.5 -18.5t-68.5 -18.5q-20 0 -35.5 15t-15.5 35q0 18 8.5 57t8.5 59q0 159 -107.5 263t-266.5 104q-58 0 -111.5 -18.5t-84 -40.5t-55.5 -40.5t-33 -18.5q-15 0 -25.5 10.5t-10.5 25.5
+q0 19 25 46q59 67 147 103.5t182 36.5q191 0 318 -125.5t127 -315.5q0 -37 -4 -66q57 15 115 15z" />
+    <glyph glyph-name="_502" unicode="&#xf217;" horiz-adv-x="1664" 
+d="M1216 832q0 26 -19 45t-45 19h-128v128q0 26 -19 45t-45 19t-45 -19t-19 -45v-128h-128q-26 0 -45 -19t-19 -45t19 -45t45 -19h128v-128q0 -26 19 -45t45 -19t45 19t19 45v128h128q26 0 45 19t19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="_503" unicode="&#xf218;" horiz-adv-x="1664" 
+d="M1280 832q0 26 -19 45t-45 19t-45 -19l-147 -146v293q0 26 -19 45t-45 19t-45 -19t-19 -45v-293l-147 146q-19 19 -45 19t-45 -19t-19 -45t19 -45l256 -256q19 -19 45 -19t45 19l256 256q19 19 19 45zM640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5
+t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920
+q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="_504" unicode="&#xf219;" horiz-adv-x="2048" 
+d="M212 768l623 -665l-300 665h-323zM1024 -4l349 772h-698zM538 896l204 384h-262l-288 -384h346zM1213 103l623 665h-323zM683 896h682l-204 384h-274zM1510 896h346l-288 384h-262zM1651 1382l384 -512q14 -18 13 -41.5t-17 -40.5l-960 -1024q-18 -20 -47 -20t-47 20
+l-960 1024q-16 17 -17 40.5t13 41.5l384 512q18 26 51 26h1152q33 0 51 -26z" />
+    <glyph glyph-name="_505" unicode="&#xf21a;" horiz-adv-x="2048" 
+d="M1811 -19q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
+q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83q19 19 45 19t45 -19l83 -83l83 83
+q19 19 45 19t45 -19l83 -83zM237 19q-19 -19 -45 -19t-45 19l-128 128l90 90l83 -82l83 82q19 19 45 19t45 -19l83 -82l64 64v293l-210 314q-17 26 -7 56.5t40 40.5l177 58v299h128v128h256v128h256v-128h256v-128h128v-299l177 -58q30 -10 40 -40.5t-7 -56.5l-210 -314
+v-293l19 18q19 19 45 19t45 -19l83 -82l83 82q19 19 45 19t45 -19l128 -128l-90 -90l-83 83l-83 -83q-18 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83l-83 -83
+q-19 -19 -45 -19t-45 19l-83 83l-83 -83q-19 -19 -45 -19t-45 19l-83 83zM640 1152v-128l384 128l384 -128v128h-128v128h-512v-128h-128z" />
+    <glyph glyph-name="_506" unicode="&#xf21b;" 
+d="M576 0l96 448l-96 128l-128 64zM832 0l128 640l-128 -64l-96 -128zM992 1010q-2 4 -4 6q-10 8 -96 8q-70 0 -167 -19q-7 -2 -21 -2t-21 2q-97 19 -167 19q-86 0 -96 -8q-2 -2 -4 -6q2 -18 4 -27q2 -3 7.5 -6.5t7.5 -10.5q2 -4 7.5 -20.5t7 -20.5t7.5 -17t8.5 -17t9 -14
+t12 -13.5t14 -9.5t17.5 -8t20.5 -4t24.5 -2q36 0 59 12.5t32.5 30t14.5 34.5t11.5 29.5t17.5 12.5h12q11 0 17.5 -12.5t11.5 -29.5t14.5 -34.5t32.5 -30t59 -12.5q13 0 24.5 2t20.5 4t17.5 8t14 9.5t12 13.5t9 14t8.5 17t7.5 17t7 20.5t7.5 20.5q2 7 7.5 10.5t7.5 6.5
+q2 9 4 27zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 61 4.5 118t19 125.5t37.5 123.5t63.5 103.5t93.5 74.5l-90 220h214q-22 64 -22 128q0 12 2 32q-194 40 -194 96q0 57 210 99q17 62 51.5 134t70.5 114q32 37 76 37q30 0 84 -31t84 -31t84 31
+t84 31q44 0 76 -37q36 -42 70.5 -114t51.5 -134q210 -42 210 -99q0 -56 -194 -96q7 -81 -20 -160h214l-82 -225q63 -33 107.5 -96.5t65.5 -143.5t29 -151.5t8 -148.5z" />
+    <glyph glyph-name="_507" unicode="&#xf21c;" horiz-adv-x="2304" 
+d="M2301 500q12 -103 -22 -198.5t-99 -163.5t-158.5 -106t-196.5 -31q-161 11 -279.5 125t-134.5 274q-12 111 27.5 210.5t118.5 170.5l-71 107q-96 -80 -151 -194t-55 -244q0 -27 -18.5 -46.5t-45.5 -19.5h-256h-69q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5
+t-131.5 316.5t131.5 316.5t316.5 131.5q76 0 152 -27l24 45q-123 110 -304 110h-64q-26 0 -45 19t-19 45t19 45t45 19h128q78 0 145 -13.5t116.5 -38.5t71.5 -39.5t51 -36.5h512h115l-85 128h-222q-30 0 -49 22.5t-14 52.5q4 23 23 38t43 15h253q33 0 53 -28l70 -105
+l114 114q19 19 46 19h101q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-179l115 -172q131 63 275 36q143 -26 244 -134.5t118 -253.5zM448 128q115 0 203 72.5t111 183.5h-314q-35 0 -55 31q-18 32 -1 63l147 277q-47 13 -91 13q-132 0 -226 -94t-94 -226t94 -226
+t226 -94zM1856 128q132 0 226 94t94 226t-94 226t-226 94q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94z" />
+    <glyph glyph-name="_508" unicode="&#xf21d;" 
+d="M1408 0q0 -63 -61.5 -113.5t-164 -81t-225 -46t-253.5 -15.5t-253.5 15.5t-225 46t-164 81t-61.5 113.5q0 49 33 88.5t91 66.5t118 44.5t131 29.5q26 5 48 -10.5t26 -41.5q5 -26 -10.5 -48t-41.5 -26q-58 -10 -106 -23.5t-76.5 -25.5t-48.5 -23.5t-27.5 -19.5t-8.5 -12
+q3 -11 27 -26.5t73 -33t114 -32.5t160.5 -25t201.5 -10t201.5 10t160.5 25t114 33t73 33.5t27 27.5q-1 4 -8.5 11t-27.5 19t-48.5 23.5t-76.5 25t-106 23.5q-26 4 -41.5 26t-10.5 48q4 26 26 41.5t48 10.5q71 -12 131 -29.5t118 -44.5t91 -66.5t33 -88.5zM1024 896v-384
+q0 -26 -19 -45t-45 -19h-64v-384q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v384h-64q-26 0 -45 19t-19 45v384q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5zM928 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5
+t158.5 -65.5t65.5 -158.5z" />
+    <glyph glyph-name="_509" unicode="&#xf21e;" horiz-adv-x="1792" 
+d="M1280 512h305q-5 -6 -10 -10.5t-9 -7.5l-3 -4l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-5 2 -21 20h369q22 0 39.5 13.5t22.5 34.5l70 281l190 -667q6 -20 23 -33t39 -13q21 0 38 13t23 33l146 485l56 -112q18 -35 57 -35zM1792 940q0 -145 -103 -300h-369l-111 221
+q-8 17 -25.5 27t-36.5 8q-45 -5 -56 -46l-129 -430l-196 686q-6 20 -23.5 33t-39.5 13t-39 -13.5t-22 -34.5l-116 -464h-423q-103 155 -103 300q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124
+t127 -344z" />
+    <glyph glyph-name="venus" unicode="&#xf221;" horiz-adv-x="1280" 
+d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292
+q11 134 80.5 249t182 188t245.5 88q170 19 319 -54t236 -212t87 -306zM128 960q0 -185 131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5z" />
+    <glyph glyph-name="_511" unicode="&#xf222;" 
+d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-382 -383q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5
+q203 0 359 -126l382 382h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_512" unicode="&#xf223;" horiz-adv-x="1280" 
+d="M830 1220q145 -72 233.5 -210.5t88.5 -305.5q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5
+t-147.5 384.5q0 167 88.5 305.5t233.5 210.5q-165 96 -228 273q-6 16 3.5 29.5t26.5 13.5h69q21 0 29 -20q44 -106 140 -171t214 -65t214 65t140 171q8 20 37 20h61q17 0 26.5 -13.5t3.5 -29.5q-63 -177 -228 -273zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_513" unicode="&#xf224;" 
+d="M1024 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-149 16 -270.5 103t-186.5 223.5t-53 291.5q16 204 160 353.5t347 172.5q118 14 228 -19t198 -103l255 254h-134q-14 0 -23 9t-9 23v64zM576 256q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_514" unicode="&#xf225;" horiz-adv-x="1792" 
+d="M1280 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q126 -158 126 -359q0 -221 -147.5 -384.5t-364.5 -187.5v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64
+q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-217 24 -364.5 187.5t-147.5 384.5q0 201 126 359l-52 53l-101 -111q-9 -10 -22 -10.5t-23 7.5l-48 44q-10 8 -10.5 21.5t8.5 23.5l105 115l-111 112v-134q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9
+t-9 23v288q0 26 19 45t45 19h288q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-133l106 -107l86 94q9 10 22 10.5t23 -7.5l48 -44q10 -8 10.5 -21.5t-8.5 -23.5l-90 -99l57 -56q158 126 359 126t359 -126l255 254h-134q-14 0 -23 9t-9 23v64zM832 256q185 0 316.5 131.5
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_515" unicode="&#xf226;" horiz-adv-x="1792" 
+d="M1790 1007q12 -155 -52.5 -292t-186 -224t-271.5 -103v-260h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-512v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23
+t23 9h224v260q-150 16 -271.5 103t-186 224t-52.5 292q17 206 164.5 356.5t352.5 169.5q206 21 377 -94q171 115 377 94q205 -19 352.5 -169.5t164.5 -356.5zM896 647q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM576 512q115 0 218 57q-154 165 -154 391
+q0 224 154 391q-103 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM1152 128v260q-137 15 -256 94q-119 -79 -256 -94v-260h512zM1216 512q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5q-115 0 -218 -57q154 -167 154 -391
+q0 -226 -154 -391q103 -57 218 -57z" />
+    <glyph glyph-name="_516" unicode="&#xf227;" horiz-adv-x="1920" 
+d="M1536 1120q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-31 -182 -166 -312t-318 -156q-210 -29 -384.5 80t-241.5 300q-117 6 -221 57.5t-177.5 133t-113.5 192.5t-32 230
+q9 135 78 252t182 191.5t248 89.5q118 14 227.5 -19t198.5 -103l255 254h-134q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q59 -74 93 -169q182 -9 328 -124l255 254h-134q-14 0 -23 9
+t-9 23v64zM1024 704q0 20 -4 58q-162 -25 -271 -150t-109 -292q0 -20 4 -58q162 25 271 150t109 292zM128 704q0 -168 111 -294t276 -149q-3 29 -3 59q0 210 135 369.5t338 196.5q-53 120 -163.5 193t-245.5 73q-185 0 -316.5 -131.5t-131.5 -316.5zM1088 -128
+q185 0 316.5 131.5t131.5 316.5q0 168 -111 294t-276 149q3 -28 3 -59q0 -210 -135 -369.5t-338 -196.5q53 -120 163.5 -193t245.5 -73z" />
+    <glyph glyph-name="_517" unicode="&#xf228;" horiz-adv-x="2048" 
+d="M1664 1504q0 14 9 23t23 9h288q26 0 45 -19t19 -45v-288q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v134l-254 -255q76 -95 107.5 -214t9.5 -247q-32 -180 -164.5 -310t-313.5 -157q-223 -34 -409 90q-117 -78 -256 -93v-132h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23
+t-23 -9h-96v-96q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v96h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v132q-155 17 -279.5 109.5t-187 237.5t-39.5 307q25 187 159.5 322.5t320.5 164.5q224 34 410 -90q146 97 320 97q201 0 359 -126l255 254h-134q-14 0 -23 9
+t-9 23v64zM896 391q128 131 128 313t-128 313q-128 -131 -128 -313t128 -313zM128 704q0 -185 131.5 -316.5t316.5 -131.5q117 0 218 57q-154 167 -154 391t154 391q-101 57 -218 57q-185 0 -316.5 -131.5t-131.5 -316.5zM1216 256q185 0 316.5 131.5t131.5 316.5
+t-131.5 316.5t-316.5 131.5q-117 0 -218 -57q154 -167 154 -391t-154 -391q101 -57 218 -57z" />
+    <glyph glyph-name="_518" unicode="&#xf229;" 
+d="M1472 1408q26 0 45 -19t19 -45v-416q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v262l-213 -214l140 -140q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-140 141l-78 -79q126 -156 126 -359q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5
+t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5q203 0 359 -126l78 78l-172 172q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l172 -172l213 213h-261q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h416zM576 0q185 0 316.5 131.5t131.5 316.5t-131.5 316.5
+t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_519" unicode="&#xf22a;" horiz-adv-x="1280" 
+d="M640 892q217 -24 364.5 -187.5t147.5 -384.5q0 -167 -87 -306t-236 -212t-319 -54q-133 15 -245.5 88t-182 188t-80.5 249q-12 155 52.5 292t186 224t271.5 103v132h-160q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h160v165l-92 -92q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22
+t9 23l202 201q19 19 45 19t45 -19l202 -201q9 -10 9 -23t-9 -22l-46 -46q-9 -9 -22 -9t-23 9l-92 92v-165h160q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-160v-132zM576 -128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5
+t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_520" unicode="&#xf22b;" horiz-adv-x="2048" 
+d="M1901 621q19 -19 19 -45t-19 -45l-294 -294q-9 -10 -22.5 -10t-22.5 10l-45 45q-10 9 -10 22.5t10 22.5l185 185h-294v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-132q-24 -217 -187.5 -364.5t-384.5 -147.5q-167 0 -306 87t-212 236t-54 319q15 133 88 245.5
+t188 182t249 80.5q155 12 292 -52.5t224 -186t103 -271.5h132v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224h294l-185 185q-10 9 -10 22.5t10 22.5l45 45q9 10 22.5 10t22.5 -10zM576 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5
+t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_521" unicode="&#xf22c;" horiz-adv-x="1280" 
+d="M1152 960q0 -221 -147.5 -384.5t-364.5 -187.5v-612q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v612q-217 24 -364.5 187.5t-147.5 384.5q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM576 512q185 0 316.5 131.5
+t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
+    <glyph glyph-name="_522" unicode="&#xf22d;" horiz-adv-x="1280" 
+d="M1024 576q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1152 576q0 -117 -45.5 -223.5t-123 -184t-184 -123t-223.5 -45.5t-223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123
+t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5z" />
+    <glyph glyph-name="_523" unicode="&#xf22e;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_524" unicode="&#xf22f;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_525" unicode="&#xf230;" 
+d="M1451 1408q35 0 60 -25t25 -60v-1366q0 -35 -25 -60t-60 -25h-391v595h199l30 232h-229v148q0 56 23.5 84t91.5 28l122 1v207q-63 9 -178 9q-136 0 -217.5 -80t-81.5 -226v-171h-200v-232h200v-595h-735q-35 0 -60 25t-25 60v1366q0 35 25 60t60 25h1366z" />
+    <glyph glyph-name="_526" unicode="&#xf231;" horiz-adv-x="1280" 
+d="M0 939q0 108 37.5 203.5t103.5 166.5t152 123t185 78t202 26q158 0 294 -66.5t221 -193.5t85 -287q0 -96 -19 -188t-60 -177t-100 -149.5t-145 -103t-189 -38.5q-68 0 -135 32t-96 88q-10 -39 -28 -112.5t-23.5 -95t-20.5 -71t-26 -71t-32 -62.5t-46 -77.5t-62 -86.5
+l-14 -5l-9 10q-15 157 -15 188q0 92 21.5 206.5t66.5 287.5t52 203q-32 65 -32 169q0 83 52 156t132 73q61 0 95 -40.5t34 -102.5q0 -66 -44 -191t-44 -187q0 -63 45 -104.5t109 -41.5q55 0 102 25t78.5 68t56 95t38 110.5t20 111t6.5 99.5q0 173 -109.5 269.5t-285.5 96.5
+q-200 0 -334 -129.5t-134 -328.5q0 -44 12.5 -85t27 -65t27 -45.5t12.5 -30.5q0 -28 -15 -73t-37 -45q-2 0 -17 3q-51 15 -90.5 56t-61 94.5t-32.5 108t-11 106.5z" />
+    <glyph glyph-name="_527" unicode="&#xf232;" 
+d="M985 562q13 0 97.5 -44t89.5 -53q2 -5 2 -15q0 -33 -17 -76q-16 -39 -71 -65.5t-102 -26.5q-57 0 -190 62q-98 45 -170 118t-148 185q-72 107 -71 194v8q3 91 74 158q24 22 52 22q6 0 18 -1.5t19 -1.5q19 0 26.5 -6.5t15.5 -27.5q8 -20 33 -88t25 -75q0 -21 -34.5 -57.5
+t-34.5 -46.5q0 -7 5 -15q34 -73 102 -137q56 -53 151 -101q12 -7 22 -7q15 0 54 48.5t52 48.5zM782 32q127 0 243.5 50t200.5 134t134 200.5t50 243.5t-50 243.5t-134 200.5t-200.5 134t-243.5 50t-243.5 -50t-200.5 -134t-134 -200.5t-50 -243.5q0 -203 120 -368l-79 -233
+l242 77q158 -104 345 -104zM782 1414q153 0 292.5 -60t240.5 -161t161 -240.5t60 -292.5t-60 -292.5t-161 -240.5t-240.5 -161t-292.5 -60q-195 0 -365 94l-417 -134l136 405q-108 178 -108 389q0 153 60 292.5t161 240.5t240.5 161t292.5 60z" />
+    <glyph glyph-name="_528" unicode="&#xf233;" horiz-adv-x="1792" 
+d="M128 128h1024v128h-1024v-128zM128 640h1024v128h-1024v-128zM1696 192q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM128 1152h1024v128h-1024v-128zM1696 704q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1696 1216
+q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1792 384v-384h-1792v384h1792zM1792 896v-384h-1792v384h1792zM1792 1408v-384h-1792v384h1792z" />
+    <glyph glyph-name="_529" unicode="&#xf234;" horiz-adv-x="2048" 
+d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1664 512h352q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-352q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5
+t-9.5 22.5v352h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v352q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5v-352zM928 288q0 -52 38 -90t90 -38h256v-238q-68 -50 -171 -50h-874q-121 0 -194 69t-73 190q0 53 3.5 103.5t14 109t26.5 108.5
+t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q79 -61 154.5 -91.5t164.5 -30.5t164.5 30.5t154.5 91.5q20 17 39 17q132 0 217 -96h-223q-52 0 -90 -38t-38 -90v-192z" />
+    <glyph glyph-name="_530" unicode="&#xf235;" horiz-adv-x="2048" 
+d="M704 640q-159 0 -271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5zM1781 320l249 -249q9 -9 9 -23q0 -13 -9 -22l-136 -136q-9 -9 -22 -9q-14 0 -23 9l-249 249l-249 -249q-9 -9 -23 -9q-13 0 -22 9l-136 136
+q-9 9 -9 22q0 14 9 23l249 249l-249 249q-9 9 -9 23q0 13 9 22l136 136q9 9 22 9q14 0 23 -9l249 -249l249 249q9 9 23 9q13 0 22 -9l136 -136q9 -9 9 -22q0 -14 -9 -23zM1283 320l-181 -181q-37 -37 -37 -91q0 -53 37 -90l83 -83q-21 -3 -44 -3h-874q-121 0 -194 69
+t-73 190q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q19 0 39 -17q154 -122 319 -122t319 122q20 17 39 17q28 0 57 -6q-28 -27 -41 -50t-13 -56q0 -54 37 -91z" />
+    <glyph glyph-name="_531" unicode="&#xf236;" horiz-adv-x="2048" 
+d="M256 512h1728q26 0 45 -19t19 -45v-448h-256v256h-1536v-256h-256v1216q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-704zM832 832q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM2048 576v64q0 159 -112.5 271.5t-271.5 112.5h-704
+q-26 0 -45 -19t-19 -45v-384h1152z" />
+    <glyph glyph-name="_532" unicode="&#xf237;" 
+d="M1536 1536l-192 -448h192v-192h-274l-55 -128h329v-192h-411l-357 -832l-357 832h-411v192h329l-55 128h-274v192h192l-192 448h256l323 -768h378l323 768h256zM768 320l108 256h-216z" />
+    <glyph glyph-name="_533" unicode="&#xf238;" 
+d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM768 192q80 0 136 56t56 136t-56 136t-136 56
+t-136 -56t-56 -136t56 -136t136 -56zM1344 768v512h-1152v-512h1152z" />
+    <glyph glyph-name="_534" unicode="&#xf239;" 
+d="M1088 1536q185 0 316.5 -93.5t131.5 -226.5v-896q0 -130 -125.5 -222t-305.5 -97l213 -202q16 -15 8 -35t-30 -20h-1056q-22 0 -30 20t8 35l213 202q-180 5 -305.5 97t-125.5 222v896q0 133 131.5 226.5t316.5 93.5h640zM288 224q66 0 113 47t47 113t-47 113t-113 47
+t-113 -47t-47 -113t47 -113t113 -47zM704 768v512h-544v-512h544zM1248 224q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM1408 768v512h-576v-512h576z" />
+    <glyph glyph-name="_535" unicode="&#xf23a;" horiz-adv-x="1792" 
+d="M597 1115v-1173q0 -25 -12.5 -42.5t-36.5 -17.5q-17 0 -33 8l-465 233q-21 10 -35.5 33.5t-14.5 46.5v1140q0 20 10 34t29 14q14 0 44 -15l511 -256q3 -3 3 -5zM661 1014l534 -866l-534 266v600zM1792 996v-1054q0 -25 -14 -40.5t-38 -15.5t-47 13l-441 220zM1789 1116
+q0 -3 -256.5 -419.5t-300.5 -487.5l-390 634l324 527q17 28 52 28q14 0 26 -6l541 -270q4 -2 4 -6z" />
+    <glyph glyph-name="_536" unicode="&#xf23b;" 
+d="M809 532l266 499h-112l-157 -312q-24 -48 -44 -92l-42 92l-155 312h-120l263 -493v-324h101v318zM1536 1408v-1536h-1536v1536h1536z" />
+    <glyph glyph-name="_537" unicode="&#xf23c;" horiz-adv-x="2296" 
+d="M478 -139q-8 -16 -27 -34.5t-37 -25.5q-25 -9 -51.5 3.5t-28.5 31.5q-1 22 40 55t68 38q23 4 34 -21.5t2 -46.5zM1819 -139q7 -16 26 -34.5t38 -25.5q25 -9 51.5 3.5t27.5 31.5q2 22 -39.5 55t-68.5 38q-22 4 -33 -21.5t-2 -46.5zM1867 -30q13 -27 56.5 -59.5t77.5 -41.5
+q45 -13 82 4.5t37 50.5q0 46 -67.5 100.5t-115.5 59.5q-40 5 -63.5 -37.5t-6.5 -76.5zM428 -30q-13 -27 -56 -59.5t-77 -41.5q-45 -13 -82 4.5t-37 50.5q0 46 67.5 100.5t115.5 59.5q40 5 63 -37.5t6 -76.5zM1158 1094h1q-41 0 -76 -15q27 -8 44 -30.5t17 -49.5
+q0 -35 -27 -60t-65 -25q-52 0 -80 43q-5 -23 -5 -42q0 -74 56 -126.5t135 -52.5q80 0 136 52.5t56 126.5t-56 126.5t-136 52.5zM1462 1312q-99 109 -220.5 131.5t-245.5 -44.5q27 60 82.5 96.5t118 39.5t121.5 -17t99.5 -74.5t44.5 -131.5zM2212 73q8 -11 -11 -42
+q7 -23 7 -40q1 -56 -44.5 -112.5t-109.5 -91.5t-118 -37q-48 -2 -92 21.5t-66 65.5q-687 -25 -1259 0q-23 -41 -66.5 -65t-92.5 -22q-86 3 -179.5 80.5t-92.5 160.5q2 22 7 40q-19 31 -11 42q6 10 31 1q14 22 41 51q-7 29 2 38q11 10 39 -4q29 20 59 34q0 29 13 37
+q23 12 51 -16q35 5 61 -2q18 -4 38 -19v73q-11 0 -18 2q-53 10 -97 44.5t-55 87.5q-9 38 0 81q15 62 93 95q2 17 19 35.5t36 23.5t33 -7.5t19 -30.5h13q46 -5 60 -23q3 -3 5 -7q10 1 30.5 3.5t30.5 3.5q-15 11 -30 17q-23 40 -91 43q0 6 1 10q-62 2 -118.5 18.5t-84.5 47.5
+q-32 36 -42.5 92t-2.5 112q16 126 90 179q23 16 52 4.5t32 -40.5q0 -1 1.5 -14t2.5 -21t3 -20t5.5 -19t8.5 -10q27 -14 76 -12q48 46 98 74q-40 4 -162 -14l47 46q61 58 163 111q145 73 282 86q-20 8 -41 15.5t-47 14t-42.5 10.5t-47.5 11t-43 10q595 126 904 -139
+q98 -84 158 -222q85 -10 121 9h1q5 3 8.5 10t5.5 19t3 19.5t3 21.5l1 14q3 28 32 40t52 -5q73 -52 91 -178q7 -57 -3.5 -113t-42.5 -91q-28 -32 -83.5 -48.5t-115.5 -18.5v-10q-71 -2 -95 -43q-14 -5 -31 -17q11 -1 32 -3.5t30 -3.5q1 5 5 8q16 18 60 23h13q5 18 19 30t33 8
+t36 -23t19 -36q79 -32 93 -95q9 -40 1 -81q-12 -53 -56 -88t-97 -44q-10 -2 -17 -2q0 -49 -1 -73q20 15 38 19q26 7 61 2q28 28 51 16q14 -9 14 -37q33 -16 59 -34q27 13 38 4q10 -10 2 -38q28 -30 41 -51q23 8 31 -1zM1937 1025q0 -29 -9 -54q82 -32 112 -132
+q4 37 -9.5 98.5t-41.5 90.5q-20 19 -36 17t-16 -20zM1859 925q35 -42 47.5 -108.5t-0.5 -124.5q67 13 97 45q13 14 18 28q-3 64 -31 114.5t-79 66.5q-15 -15 -52 -21zM1822 921q-30 0 -44 1q42 -115 53 -239q21 0 43 3q16 68 1 135t-53 100zM258 839q30 100 112 132
+q-9 25 -9 54q0 18 -16.5 20t-35.5 -17q-28 -29 -41.5 -90.5t-9.5 -98.5zM294 737q29 -31 97 -45q-13 58 -0.5 124.5t47.5 108.5v0q-37 6 -52 21q-51 -16 -78.5 -66t-31.5 -115q9 -17 18 -28zM471 683q14 124 73 235q-19 -4 -55 -18l-45 -19v1q-46 -89 -20 -196q25 -3 47 -3z
+M1434 644q8 -38 16.5 -108.5t11.5 -89.5q3 -18 9.5 -21.5t23.5 4.5q40 20 62 85.5t23 125.5q-24 2 -146 4zM1152 1285q-116 0 -199 -82.5t-83 -198.5q0 -117 83 -199.5t199 -82.5t199 82.5t83 199.5q0 116 -83 198.5t-199 82.5zM1380 646q-105 2 -211 0v1q-1 -27 2.5 -86
+t13.5 -66q29 -14 93.5 -14.5t95.5 10.5q9 3 11 39t-0.5 69.5t-4.5 46.5zM1112 447q8 4 9.5 48t-0.5 88t-4 63v1q-212 -3 -214 -3q-4 -20 -7 -62t0 -83t14 -46q34 -15 101 -16t101 10zM718 636q-16 -59 4.5 -118.5t77.5 -84.5q15 -8 24 -5t12 21q3 16 8 90t10 103
+q-69 -2 -136 -6zM591 510q3 -23 -34 -36q132 -141 271.5 -240t305.5 -154q172 49 310.5 146t293.5 250q-33 13 -30 34q0 2 0.5 3.5t1.5 3t1 2.5v1v-1q-17 2 -50 5.5t-48 4.5q-26 -90 -82 -132q-51 -38 -82 1q-5 6 -9 14q-7 13 -17 62q-2 -5 -5 -9t-7.5 -7t-8 -5.5t-9.5 -4
+l-10 -2.5t-12 -2l-12 -1.5t-13.5 -1t-13.5 -0.5q-106 -9 -163 11q-4 -17 -10 -26.5t-21 -15t-23 -7t-36 -3.5q-6 -1 -9 -1q-179 -17 -203 40q-2 -63 -56 -54q-47 8 -91 54q-12 13 -20 26q-17 29 -26 65q-58 -6 -87 -10q1 -2 4 -10zM507 -118q3 14 3 30q-17 71 -51 130
+t-73 70q-41 12 -101.5 -14.5t-104.5 -80t-39 -107.5q35 -53 100 -93t119 -42q51 -2 94 28t53 79zM510 53q23 -63 27 -119q195 113 392 174q-98 52 -180.5 120t-179.5 165q-6 -4 -29 -13q0 -1 -1 -4t-1 -5q31 -18 22 -37q-12 -23 -56 -34q-10 -13 -29 -24h-1q-2 -83 1 -150
+q19 -34 35 -73zM579 -113q532 -21 1145 0q-254 147 -428 196q-76 -35 -156 -57q-8 -3 -16 0q-65 21 -129 49q-208 -60 -416 -188h-1v-1q1 0 1 1zM1763 -67q4 54 28 120q14 38 33 71l-1 -1q3 77 3 153q-15 8 -30 25q-42 9 -56 33q-9 20 22 38q-2 4 -2 9q-16 4 -28 12
+q-204 -190 -383 -284q198 -59 414 -176zM2155 -90q5 54 -39 107.5t-104 80t-102 14.5q-38 -11 -72.5 -70.5t-51.5 -129.5q0 -16 3 -30q10 -49 53 -79t94 -28q54 2 119 42t100 93z" />
+    <glyph glyph-name="_538" unicode="&#xf23d;" horiz-adv-x="2304" 
+d="M1524 -25q0 -68 -48 -116t-116 -48t-116.5 48t-48.5 116t48.5 116.5t116.5 48.5t116 -48.5t48 -116.5zM775 -25q0 -68 -48.5 -116t-116.5 -48t-116 48t-48 116t48 116.5t116 48.5t116.5 -48.5t48.5 -116.5zM0 1469q57 -60 110.5 -104.5t121 -82t136 -63t166 -45.5
+t200 -31.5t250 -18.5t304 -9.5t372.5 -2.5q139 0 244.5 -5t181 -16.5t124 -27.5t71 -39.5t24 -51.5t-19.5 -64t-56.5 -76.5t-89.5 -91t-116 -104.5t-139 -119q-185 -157 -286 -247q29 51 76.5 109t94 105.5t94.5 98.5t83 91.5t54 80.5t13 70t-45.5 55.5t-116.5 41t-204 23.5
+t-304 5q-168 -2 -314 6t-256 23t-204.5 41t-159.5 51.5t-122.5 62.5t-91.5 66.5t-68 71.5t-50.5 69.5t-40 68t-36.5 59.5z" />
+    <glyph glyph-name="_539" unicode="&#xf23e;" horiz-adv-x="1792" 
+d="M896 1472q-169 0 -323 -66t-265.5 -177.5t-177.5 -265.5t-66 -323t66 -323t177.5 -265.5t265.5 -177.5t323 -66t323 66t265.5 177.5t177.5 265.5t66 323t-66 323t-177.5 265.5t-265.5 177.5t-323 66zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348
+t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM496 704q16 0 16 -16v-480q0 -16 -16 -16h-32q-16 0 -16 16v480q0 16 16 16h32zM896 640q53 0 90.5 -37.5t37.5 -90.5q0 -35 -17.5 -64t-46.5 -46v-114q0 -14 -9 -23
+t-23 -9h-64q-14 0 -23 9t-9 23v114q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5zM896 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM544 928v-96
+q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 93 65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5v-96q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v96q0 146 -103 249t-249 103t-249 -103t-103 -249zM1408 192v512q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-512
+q0 -26 19 -45t45 -19h896q26 0 45 19t19 45z" />
+    <glyph glyph-name="_540" unicode="&#xf240;" horiz-adv-x="2304" 
+d="M1920 1024v-768h-1664v768h1664zM2048 448h128v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288zM2304 832v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113
+v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160q53 0 90.5 -37.5t37.5 -90.5z" />
+    <glyph glyph-name="_541" unicode="&#xf241;" horiz-adv-x="2304" 
+d="M256 256v768h1280v-768h-1280zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_542" unicode="&#xf242;" horiz-adv-x="2304" 
+d="M256 256v768h896v-768h-896zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_543" unicode="&#xf243;" horiz-adv-x="2304" 
+d="M256 256v768h512v-768h-512zM2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9
+h-1856q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_544" unicode="&#xf244;" horiz-adv-x="2304" 
+d="M2176 960q53 0 90.5 -37.5t37.5 -90.5v-384q0 -53 -37.5 -90.5t-90.5 -37.5v-160q0 -66 -47 -113t-113 -47h-1856q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1856q66 0 113 -47t47 -113v-160zM2176 448v384h-128v288q0 14 -9 23t-23 9h-1856q-14 0 -23 -9t-9 -23
+v-960q0 -14 9 -23t23 -9h1856q14 0 23 9t9 23v288h128z" />
+    <glyph glyph-name="_545" unicode="&#xf245;" horiz-adv-x="1280" 
+d="M1133 493q31 -30 14 -69q-17 -40 -59 -40h-382l201 -476q10 -25 0 -49t-34 -35l-177 -75q-25 -10 -49 0t-35 34l-191 452l-312 -312q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v1504q0 42 40 59q12 5 24 5q27 0 45 -19z" />
+    <glyph glyph-name="_546" unicode="&#xf246;" horiz-adv-x="1024" 
+d="M832 1408q-320 0 -320 -224v-416h128v-128h-128v-544q0 -224 320 -224h64v-128h-64q-272 0 -384 146q-112 -146 -384 -146h-64v128h64q320 0 320 224v544h-128v128h128v416q0 224 -320 224h-64v128h64q272 0 384 -146q112 146 384 146h64v-128h-64z" />
+    <glyph glyph-name="_547" unicode="&#xf247;" horiz-adv-x="2048" 
+d="M2048 1152h-128v-1024h128v-384h-384v128h-1280v-128h-384v384h128v1024h-128v384h384v-128h1280v128h384v-384zM1792 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 -128v128h-128v-128h128zM1664 0v128h128v1024h-128v128h-1280v-128h-128v-1024h128v-128
+h1280zM1920 -128v128h-128v-128h128zM1280 896h384v-768h-896v256h-384v768h896v-256zM512 512h640v512h-640v-512zM1536 256v512h-256v-384h-384v-128h640z" />
+    <glyph glyph-name="_548" unicode="&#xf248;" horiz-adv-x="2304" 
+d="M2304 768h-128v-640h128v-384h-384v128h-896v-128h-384v384h128v128h-384v-128h-384v384h128v640h-128v384h384v-128h896v128h384v-384h-128v-128h384v128h384v-384zM2048 1024v-128h128v128h-128zM1408 1408v-128h128v128h-128zM128 1408v-128h128v128h-128zM256 256
+v128h-128v-128h128zM1536 384h-128v-128h128v128zM384 384h896v128h128v640h-128v128h-896v-128h-128v-640h128v-128zM896 -128v128h-128v-128h128zM2176 -128v128h-128v-128h128zM2048 128v640h-128v128h-384v-384h128v-384h-384v128h-384v-128h128v-128h896v128h128z" />
+    <glyph glyph-name="_549" unicode="&#xf249;" 
+d="M1024 288v-416h-928q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68v-928h-416q-40 0 -68 -28t-28 -68zM1152 256h381q-15 -82 -65 -132l-184 -184q-50 -50 -132 -65v381z" />
+    <glyph glyph-name="_550" unicode="&#xf24a;" 
+d="M1400 256h-248v-248q29 10 41 22l185 185q12 12 22 41zM1120 384h288v896h-1280v-1280h896v288q0 40 28 68t68 28zM1536 1312v-1024q0 -40 -20 -88t-48 -76l-184 -184q-28 -28 -76 -48t-88 -20h-1024q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1344q40 0 68 -28t28 -68
+z" />
+    <glyph glyph-name="_551" unicode="&#xf24b;" horiz-adv-x="2304" 
+d="M1951 538q0 -26 -15.5 -44.5t-38.5 -23.5q-8 -2 -18 -2h-153v140h153q10 0 18 -2q23 -5 38.5 -23.5t15.5 -44.5zM1933 751q0 -25 -15 -42t-38 -21q-3 -1 -15 -1h-139v129h139q3 0 8.5 -0.5t6.5 -0.5q23 -4 38 -21.5t15 -42.5zM728 587v308h-228v-308q0 -58 -38 -94.5
+t-105 -36.5q-108 0 -229 59v-112q53 -15 121 -23t109 -9l42 -1q328 0 328 217zM1442 403v113q-99 -52 -200 -59q-108 -8 -169 41t-61 142t61 142t169 41q101 -7 200 -58v112q-48 12 -100 19.5t-80 9.5l-28 2q-127 6 -218.5 -14t-140.5 -60t-71 -88t-22 -106t22 -106t71 -88
+t140.5 -60t218.5 -14q101 4 208 31zM2176 518q0 54 -43 88.5t-109 39.5v3q57 8 89 41.5t32 79.5q0 55 -41 88t-107 36q-3 0 -12 0.5t-14 0.5h-455v-510h491q74 0 121.5 36.5t47.5 96.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90
+t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_552" unicode="&#xf24c;" horiz-adv-x="2304" 
+d="M858 295v693q-106 -41 -172 -135.5t-66 -211.5t66 -211.5t172 -134.5zM1362 641q0 117 -66 211.5t-172 135.5v-694q106 41 172 135.5t66 211.5zM1577 641q0 -159 -78.5 -294t-213.5 -213.5t-294 -78.5q-119 0 -227.5 46.5t-187 125t-125 187t-46.5 227.5q0 159 78.5 294
+t213.5 213.5t294 78.5t294 -78.5t213.5 -213.5t78.5 -294zM1960 634q0 139 -55.5 261.5t-147.5 205.5t-213.5 131t-252.5 48h-301q-176 0 -323.5 -81t-235 -230t-87.5 -335q0 -171 87 -317.5t236 -231.5t323 -85h301q129 0 251.5 50.5t214.5 135t147.5 202.5t55.5 246z
+M2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_553" unicode="&#xf24d;" horiz-adv-x="1792" 
+d="M1664 -96v1088q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5zM1792 992v-1088q0 -66 -47 -113t-113 -47h-1088q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113
+zM1408 1376v-160h-128v160q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5v-1088q0 -13 9.5 -22.5t22.5 -9.5h160v-128h-160q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1088q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="_554" unicode="&#xf24e;" horiz-adv-x="2304" 
+d="M1728 1088l-384 -704h768zM448 1088l-384 -704h768zM1269 1280q-14 -40 -45.5 -71.5t-71.5 -45.5v-1291h608q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1344q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h608v1291q-40 14 -71.5 45.5t-45.5 71.5h-491q-14 0 -23 9t-9 23v64
+q0 14 9 23t23 9h491q21 57 70 92.5t111 35.5t111 -35.5t70 -92.5h491q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-491zM1088 1264q33 0 56.5 23.5t23.5 56.5t-23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5zM2176 384q0 -73 -46.5 -131t-117.5 -91
+t-144.5 -49.5t-139.5 -16.5t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81zM896 384q0 -73 -46.5 -131t-117.5 -91t-144.5 -49.5t-139.5 -16.5
+t-139.5 16.5t-144.5 49.5t-117.5 91t-46.5 131q0 11 35 81t92 174.5t107 195.5t102 184t56 100q18 33 56 33t56 -33q4 -7 56 -100t102 -184t107 -195.5t92 -174.5t35 -81z" />
+    <glyph glyph-name="_555" unicode="&#xf250;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-77 -29 -149 -92.5
+t-129.5 -152.5t-92.5 -210t-35 -253h1024q0 132 -35 253t-92.5 210t-129.5 152.5t-149 92.5q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+    <glyph glyph-name="_556" unicode="&#xf251;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -66 9 -128h1006q9 61 9 128zM1280 -128q0 130 -34 249.5t-90.5 208t-126.5 152t-146 94.5h-230q-76 -31 -146 -94.5t-126.5 -152t-90.5 -208t-34 -249.5h1024z" />
+    <glyph glyph-name="_557" unicode="&#xf252;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM1280 1408h-1024q0 -206 85 -384h854q85 178 85 384zM1223 192q-54 141 -145.5 241.5t-194.5 142.5h-230q-103 -42 -194.5 -142.5t-145.5 -241.5h910z" />
+    <glyph glyph-name="_558" unicode="&#xf253;" 
+d="M1408 1408q0 -261 -106.5 -461.5t-266.5 -306.5q160 -106 266.5 -306.5t106.5 -461.5h96q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96q0 261 106.5 461.5t266.5 306.5q-160 106 -266.5 306.5t-106.5 461.5h-96q-14 0 -23 9
+t-9 23v64q0 14 9 23t23 9h1472q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-96zM874 700q77 29 149 92.5t129.5 152.5t92.5 210t35 253h-1024q0 -132 35 -253t92.5 -210t129.5 -152.5t149 -92.5q19 -7 30.5 -23.5t11.5 -36.5t-11.5 -36.5t-30.5 -23.5q-137 -51 -244 -196
+h700q-107 145 -244 196q-19 7 -30.5 23.5t-11.5 36.5t11.5 36.5t30.5 23.5z" />
+    <glyph glyph-name="_559" unicode="&#xf254;" 
+d="M1504 -64q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472zM130 0q3 55 16 107t30 95t46 87t53.5 76t64.5 69.5t66 60t70.5 55t66.5 47.5t65 43q-43 28 -65 43t-66.5 47.5t-70.5 55t-66 60t-64.5 69.5t-53.5 76t-46 87
+t-30 95t-16 107h1276q-3 -55 -16 -107t-30 -95t-46 -87t-53.5 -76t-64.5 -69.5t-66 -60t-70.5 -55t-66.5 -47.5t-65 -43q43 -28 65 -43t66.5 -47.5t70.5 -55t66 -60t64.5 -69.5t53.5 -76t46 -87t30 -95t16 -107h-1276zM1504 1536q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9
+h-1472q-14 0 -23 9t-9 23v128q0 14 9 23t23 9h1472z" />
+    <glyph glyph-name="_560" unicode="&#xf255;" 
+d="M768 1152q-53 0 -90.5 -37.5t-37.5 -90.5v-128h-32v93q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-429l-32 30v172q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-224q0 -47 35 -82l310 -296q39 -39 39 -102q0 -26 19 -45t45 -19h640q26 0 45 19t19 45v25
+q0 41 10 77l108 436q10 36 10 77v246q0 48 -32 81.5t-80 33.5q-46 0 -79 -33t-33 -79v-32h-32v125q0 40 -25 72.5t-64 40.5q-14 2 -23 2q-46 0 -79 -33t-33 -79v-128h-32v122q0 51 -32.5 89.5t-82.5 43.5q-5 1 -13 1zM768 1280q84 0 149 -50q57 34 123 34q59 0 111 -27
+t86 -76q27 7 59 7q100 0 170 -71.5t70 -171.5v-246q0 -51 -13 -108l-109 -436q-6 -24 -6 -71q0 -80 -56 -136t-136 -56h-640q-84 0 -138 58.5t-54 142.5l-308 296q-76 73 -76 175v224q0 99 70.5 169.5t169.5 70.5q11 0 16 -1q6 95 75.5 160t164.5 65q52 0 98 -21
+q72 69 174 69z" />
+    <glyph glyph-name="_561" unicode="&#xf256;" horiz-adv-x="1792" 
+d="M880 1408q-46 0 -79 -33t-33 -79v-656h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528v-256l-154 205q-38 51 -102 51q-53 0 -90.5 -37.5t-37.5 -90.5q0 -43 26 -77l384 -512q38 -51 102 -51h688q34 0 61 22t34 56l76 405q5 32 5 59v498q0 46 -33 79t-79 33t-79 -33
+t-33 -79v-272h-32v528q0 46 -33 79t-79 33t-79 -33t-33 -79v-528h-32v656q0 46 -33 79t-79 33zM880 1536q68 0 125.5 -35.5t88.5 -96.5q19 4 42 4q99 0 169.5 -70.5t70.5 -169.5v-17q105 6 180.5 -64t75.5 -175v-498q0 -40 -8 -83l-76 -404q-14 -79 -76.5 -131t-143.5 -52
+h-688q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 106 75 181t181 75q78 0 128 -34v434q0 99 70.5 169.5t169.5 70.5q23 0 42 -4q31 61 88.5 96.5t125.5 35.5z" />
+    <glyph glyph-name="_562" unicode="&#xf257;" horiz-adv-x="1792" 
+d="M1073 -128h-177q-163 0 -226 141q-23 49 -23 102v5q-62 30 -98.5 88.5t-36.5 127.5q0 38 5 48h-261q-106 0 -181 75t-75 181t75 181t181 75h113l-44 17q-74 28 -119.5 93.5t-45.5 145.5q0 106 75 181t181 75q46 0 91 -17l628 -239h401q106 0 181 -75t75 -181v-668
+q0 -88 -54 -157.5t-140 -90.5l-339 -85q-92 -23 -186 -23zM1024 583l-155 -71l-163 -74q-30 -14 -48 -41.5t-18 -60.5q0 -46 33 -79t79 -33q26 0 46 10l338 154q-49 10 -80.5 50t-31.5 90v55zM1344 272q0 46 -33 79t-79 33q-26 0 -46 -10l-290 -132q-28 -13 -37 -17
+t-30.5 -17t-29.5 -23.5t-16 -29t-8 -40.5q0 -50 31.5 -82t81.5 -32q20 0 38 9l352 160q30 14 48 41.5t18 60.5zM1112 1024l-650 248q-24 8 -46 8q-53 0 -90.5 -37.5t-37.5 -90.5q0 -40 22.5 -73t59.5 -47l526 -200v-64h-640q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5
+t90.5 -37.5h535l233 106v198q0 63 46 106l111 102h-69zM1073 0q82 0 155 19l339 85q43 11 70 45.5t27 78.5v668q0 53 -37.5 90.5t-90.5 37.5h-308l-136 -126q-36 -33 -36 -82v-296q0 -46 33 -77t79 -31t79 35t33 81v208h32v-208q0 -70 -57 -114q52 -8 86.5 -48.5t34.5 -93.5
+q0 -42 -23 -78t-61 -53l-310 -141h91z" />
+    <glyph glyph-name="_563" unicode="&#xf258;" horiz-adv-x="2048" 
+d="M1151 1536q61 0 116 -28t91 -77l572 -781q118 -159 118 -359v-355q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v177l-286 143h-546q-80 0 -136 56t-56 136v32q0 119 84.5 203.5t203.5 84.5h420l42 128h-686q-100 0 -173.5 67.5t-81.5 166.5q-65 79 -65 182v32
+q0 80 56 136t136 56h959zM1920 -64v355q0 157 -93 284l-573 781q-39 52 -103 52h-959q-26 0 -45 -19t-19 -45q0 -32 1.5 -49.5t9.5 -40.5t25 -43q10 31 35.5 50t56.5 19h832v-32h-832q-26 0 -45 -19t-19 -45q0 -44 3 -58q8 -44 44 -73t81 -29h640h91q40 0 68 -28t28 -68
+q0 -15 -5 -30l-64 -192q-10 -29 -35 -47.5t-56 -18.5h-443q-66 0 -113 -47t-47 -113v-32q0 -26 19 -45t45 -19h561q16 0 29 -7l317 -158q24 -13 38.5 -36t14.5 -50v-197q0 -26 19 -45t45 -19h384q26 0 45 19t19 45z" />
+    <glyph glyph-name="_564" unicode="&#xf259;" horiz-adv-x="2048" 
+d="M459 -256q-77 0 -137.5 47.5t-79.5 122.5l-101 401q-13 57 -13 108q0 45 -5 67l-116 477q-7 27 -7 57q0 93 62 161t155 78q17 85 82.5 139t152.5 54q83 0 148 -51.5t85 -132.5l83 -348l103 428q20 81 85 132.5t148 51.5q89 0 155.5 -57.5t80.5 -144.5q92 -10 152 -79
+t60 -162q0 -24 -7 -59l-123 -512q10 7 37.5 28.5t38.5 29.5t35 23t41 20.5t41.5 11t49.5 5.5q105 0 180 -74t75 -179q0 -62 -28.5 -118t-78.5 -94l-507 -380q-68 -51 -153 -51h-694zM1104 1408q-38 0 -68.5 -24t-39.5 -62l-164 -682h-127l-145 602q-9 38 -39.5 62t-68.5 24
+q-48 0 -80 -33t-32 -80q0 -15 3 -28l132 -547h-26l-99 408q-9 37 -40 62.5t-69 25.5q-47 0 -80 -33t-33 -79q0 -14 3 -26l116 -478q7 -28 9 -86t10 -88l100 -401q8 -32 34 -52.5t59 -20.5h694q42 0 76 26l507 379q56 43 56 110q0 52 -37.5 88.5t-89.5 36.5q-43 0 -77 -26
+l-307 -230v227q0 4 32 138t68 282t39 161q4 18 4 29q0 47 -32 81t-79 34q-39 0 -69.5 -24t-39.5 -62l-116 -482h-26l150 624q3 14 3 28q0 48 -31.5 82t-79.5 34z" />
+    <glyph glyph-name="_565" unicode="&#xf25a;" horiz-adv-x="1792" 
+d="M640 1408q-53 0 -90.5 -37.5t-37.5 -90.5v-512v-384l-151 202q-41 54 -107 54q-52 0 -89 -38t-37 -90q0 -43 26 -77l384 -512q38 -51 102 -51h718q22 0 39.5 13.5t22.5 34.5l92 368q24 96 24 194v217q0 41 -28 71t-68 30t-68 -28t-28 -68h-32v61q0 48 -32 81.5t-80 33.5
+q-46 0 -79 -33t-33 -79v-64h-32v90q0 55 -37 94.5t-91 39.5q-53 0 -90.5 -37.5t-37.5 -90.5v-96h-32v570q0 55 -37 94.5t-91 39.5zM640 1536q107 0 181.5 -77.5t74.5 -184.5v-220q22 2 32 2q99 0 173 -69q47 21 99 21q113 0 184 -87q27 7 56 7q94 0 159 -67.5t65 -161.5
+v-217q0 -116 -28 -225l-92 -368q-16 -64 -68 -104.5t-118 -40.5h-718q-60 0 -114.5 27.5t-90.5 74.5l-384 512q-51 68 -51 154q0 105 74.5 180.5t179.5 75.5q71 0 130 -35v547q0 106 75 181t181 75zM768 128v384h-32v-384h32zM1024 128v384h-32v-384h32zM1280 128v384h-32
+v-384h32z" />
+    <glyph glyph-name="_566" unicode="&#xf25b;" 
+d="M1288 889q60 0 107 -23q141 -63 141 -226v-177q0 -94 -23 -186l-85 -339q-21 -86 -90.5 -140t-157.5 -54h-668q-106 0 -181 75t-75 181v401l-239 628q-17 45 -17 91q0 106 75 181t181 75q80 0 145.5 -45.5t93.5 -119.5l17 -44v113q0 106 75 181t181 75t181 -75t75 -181
+v-261q27 5 48 5q69 0 127.5 -36.5t88.5 -98.5zM1072 896q-33 0 -60.5 -18t-41.5 -48l-74 -163l-71 -155h55q50 0 90 -31.5t50 -80.5l154 338q10 20 10 46q0 46 -33 79t-79 33zM1293 761q-22 0 -40.5 -8t-29 -16t-23.5 -29.5t-17 -30.5t-17 -37l-132 -290q-10 -20 -10 -46
+q0 -46 33 -79t79 -33q33 0 60.5 18t41.5 48l160 352q9 18 9 38q0 50 -32 81.5t-82 31.5zM128 1120q0 -22 8 -46l248 -650v-69l102 111q43 46 106 46h198l106 233v535q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-640h-64l-200 526q-14 37 -47 59.5t-73 22.5
+q-53 0 -90.5 -37.5t-37.5 -90.5zM1180 -128q44 0 78.5 27t45.5 70l85 339q19 73 19 155v91l-141 -310q-17 -38 -53 -61t-78 -23q-53 0 -93.5 34.5t-48.5 86.5q-44 -57 -114 -57h-208v32h208q46 0 81 33t35 79t-31 79t-77 33h-296q-49 0 -82 -36l-126 -136v-308
+q0 -53 37.5 -90.5t90.5 -37.5h668z" />
+    <glyph glyph-name="_567" unicode="&#xf25c;" horiz-adv-x="1973" 
+d="M857 992v-117q0 -13 -9.5 -22t-22.5 -9h-298v-812q0 -13 -9 -22.5t-22 -9.5h-135q-13 0 -22.5 9t-9.5 23v812h-297q-13 0 -22.5 9t-9.5 22v117q0 14 9 23t23 9h793q13 0 22.5 -9.5t9.5 -22.5zM1895 995l77 -961q1 -13 -8 -24q-10 -10 -23 -10h-134q-12 0 -21 8.5
+t-10 20.5l-46 588l-189 -425q-8 -19 -29 -19h-120q-20 0 -29 19l-188 427l-45 -590q-1 -12 -10 -20.5t-21 -8.5h-135q-13 0 -23 10q-9 10 -9 24l78 961q1 12 10 20.5t21 8.5h142q20 0 29 -19l220 -520q10 -24 20 -51q3 7 9.5 24.5t10.5 26.5l221 520q9 19 29 19h141
+q13 0 22 -8.5t10 -20.5z" />
+    <glyph glyph-name="_568" unicode="&#xf25d;" horiz-adv-x="1792" 
+d="M1042 833q0 88 -60 121q-33 18 -117 18h-123v-281h162q66 0 102 37t36 105zM1094 548l205 -373q8 -17 -1 -31q-8 -16 -27 -16h-152q-20 0 -28 17l-194 365h-155v-350q0 -14 -9 -23t-23 -9h-134q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h294q128 0 190 -24q85 -31 134 -109
+t49 -180q0 -92 -42.5 -165.5t-115.5 -109.5q6 -10 9 -16zM896 1376q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM1792 640
+q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_569" unicode="&#xf25e;" horiz-adv-x="1792" 
+d="M605 303q153 0 257 104q14 18 3 36l-45 82q-6 13 -24 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78
+q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-148 0 -246 -96.5t-98 -240.5q0 -146 97 -241.5t247 -95.5zM1235 303q153 0 257 104q14 18 4 36l-45 82q-8 14 -25 17q-16 2 -27 -11l-4 -3q-4 -4 -11.5 -10t-17.5 -13.5t-23.5 -14.5t-28.5 -13t-33.5 -9.5
+t-37.5 -3.5q-76 0 -125 50t-49 127q0 76 48 125.5t122 49.5q37 0 71.5 -14t50.5 -28l16 -14q11 -11 26 -10q16 2 24 14l53 78q13 20 -2 39q-3 4 -11 12t-30 23.5t-48.5 28t-67.5 22.5t-86 10q-147 0 -245.5 -96.5t-98.5 -240.5q0 -146 97 -241.5t247 -95.5zM896 1376
+q-150 0 -286 -58.5t-234.5 -157t-157 -234.5t-58.5 -286t58.5 -286t157 -234.5t234.5 -157t286 -58.5t286 58.5t234.5 157t157 234.5t58.5 286t-58.5 286t-157 234.5t-234.5 157t-286 58.5zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71z" />
+    <glyph glyph-name="f260" unicode="&#xf260;" horiz-adv-x="2048" 
+d="M736 736l384 -384l-384 -384l-672 672l672 672l168 -168l-96 -96l-72 72l-480 -480l480 -480l193 193l-289 287zM1312 1312l672 -672l-672 -672l-168 168l96 96l72 -72l480 480l-480 480l-193 -193l289 -287l-96 -96l-384 384z" />
+    <glyph glyph-name="f261" unicode="&#xf261;" horiz-adv-x="1792" 
+d="M717 182l271 271l-279 279l-88 -88l192 -191l-96 -96l-279 279l279 279l40 -40l87 87l-127 128l-454 -454zM1075 190l454 454l-454 454l-271 -271l279 -279l88 88l-192 191l96 96l279 -279l-279 -279l-40 40l-87 -88zM1792 640q0 -182 -71 -348t-191 -286t-286 -191
+t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_572" unicode="&#xf262;" horiz-adv-x="2304" 
+d="M651 539q0 -39 -27.5 -66.5t-65.5 -27.5q-39 0 -66.5 27.5t-27.5 66.5q0 38 27.5 65.5t66.5 27.5q38 0 65.5 -27.5t27.5 -65.5zM1805 540q0 -39 -27.5 -66.5t-66.5 -27.5t-66.5 27.5t-27.5 66.5t27.5 66t66.5 27t66.5 -27t27.5 -66zM765 539q0 79 -56.5 136t-136.5 57
+t-136.5 -56.5t-56.5 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM1918 540q0 80 -56.5 136.5t-136.5 56.5q-79 0 -136 -56.5t-57 -136.5t56.5 -136.5t136.5 -56.5t136.5 56.5t56.5 136.5zM850 539q0 -116 -81.5 -197.5t-196.5 -81.5q-116 0 -197.5 82t-81.5 197
+t82 196.5t197 81.5t196.5 -81.5t81.5 -196.5zM2004 540q0 -115 -81.5 -196.5t-197.5 -81.5q-115 0 -196.5 81.5t-81.5 196.5t81.5 196.5t196.5 81.5q116 0 197.5 -81.5t81.5 -196.5zM1040 537q0 191 -135.5 326.5t-326.5 135.5q-125 0 -231 -62t-168 -168.5t-62 -231.5
+t62 -231.5t168 -168.5t231 -62q191 0 326.5 135.5t135.5 326.5zM1708 1110q-254 111 -556 111q-319 0 -573 -110q117 0 223 -45.5t182.5 -122.5t122 -183t45.5 -223q0 115 43.5 219.5t118 180.5t177.5 123t217 50zM2187 537q0 191 -135 326.5t-326 135.5t-326.5 -135.5
+t-135.5 -326.5t135.5 -326.5t326.5 -135.5t326 135.5t135 326.5zM1921 1103h383q-44 -51 -75 -114.5t-40 -114.5q110 -151 110 -337q0 -156 -77 -288t-209 -208.5t-287 -76.5q-133 0 -249 56t-196 155q-47 -56 -129 -179q-11 22 -53.5 82.5t-74.5 97.5
+q-80 -99 -196.5 -155.5t-249.5 -56.5q-155 0 -287 76.5t-209 208.5t-77 288q0 186 110 337q-9 51 -40 114.5t-75 114.5h365q149 100 355 156.5t432 56.5q224 0 421 -56t348 -157z" />
+    <glyph glyph-name="f263" unicode="&#xf263;" horiz-adv-x="1280" 
+d="M640 629q-188 0 -321 133t-133 320q0 188 133 321t321 133t321 -133t133 -321q0 -187 -133 -320t-321 -133zM640 1306q-92 0 -157.5 -65.5t-65.5 -158.5q0 -92 65.5 -157.5t157.5 -65.5t157.5 65.5t65.5 157.5q0 93 -65.5 158.5t-157.5 65.5zM1163 574q13 -27 15 -49.5
+t-4.5 -40.5t-26.5 -38.5t-42.5 -37t-61.5 -41.5q-115 -73 -315 -94l73 -72l267 -267q30 -31 30 -74t-30 -73l-12 -13q-31 -30 -74 -30t-74 30q-67 68 -267 268l-267 -268q-31 -30 -74 -30t-73 30l-12 13q-31 30 -31 73t31 74l267 267l72 72q-203 21 -317 94
+q-39 25 -61.5 41.5t-42.5 37t-26.5 38.5t-4.5 40.5t15 49.5q10 20 28 35t42 22t56 -2t65 -35q5 -4 15 -11t43 -24.5t69 -30.5t92 -24t113 -11q91 0 174 25.5t120 50.5l38 25q33 26 65 35t56 2t42 -22t28 -35z" />
+    <glyph glyph-name="_574" unicode="&#xf264;" 
+d="M927 956q0 -66 -46.5 -112.5t-112.5 -46.5t-112.5 46.5t-46.5 112.5t46.5 112.5t112.5 46.5t112.5 -46.5t46.5 -112.5zM1141 593q-10 20 -28 32t-47.5 9.5t-60.5 -27.5q-10 -8 -29 -20t-81 -32t-127 -20t-124 18t-86 36l-27 18q-31 25 -60.5 27.5t-47.5 -9.5t-28 -32
+q-22 -45 -2 -74.5t87 -73.5q83 -53 226 -67l-51 -52q-142 -142 -191 -190q-22 -22 -22 -52.5t22 -52.5l9 -9q22 -22 52.5 -22t52.5 22l191 191q114 -115 191 -191q22 -22 52.5 -22t52.5 22l9 9q22 22 22 52.5t-22 52.5l-191 190l-52 52q141 14 225 67q67 44 87 73.5t-2 74.5
+zM1092 956q0 134 -95 229t-229 95t-229 -95t-95 -229t95 -229t229 -95t229 95t95 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="_575" unicode="&#xf265;" horiz-adv-x="1720" 
+d="M1565 1408q65 0 110 -45.5t45 -110.5v-519q0 -176 -68 -336t-182.5 -275t-274 -182.5t-334.5 -67.5q-176 0 -335.5 67.5t-274.5 182.5t-183 275t-68 336v519q0 64 46 110t110 46h1409zM861 344q47 0 82 33l404 388q37 35 37 85q0 49 -34.5 83.5t-83.5 34.5q-47 0 -82 -33
+l-323 -310l-323 310q-35 33 -81 33q-49 0 -83.5 -34.5t-34.5 -83.5q0 -51 36 -85l405 -388q33 -33 81 -33z" />
+    <glyph glyph-name="_576" unicode="&#xf266;" horiz-adv-x="2304" 
+d="M1494 -103l-295 695q-25 -49 -158.5 -305.5t-198.5 -389.5q-1 -1 -27.5 -0.5t-26.5 1.5q-82 193 -255.5 587t-259.5 596q-21 50 -66.5 107.5t-103.5 100.5t-102 43q0 5 -0.5 24t-0.5 27h583v-50q-39 -2 -79.5 -16t-66.5 -43t-10 -64q26 -59 216.5 -499t235.5 -540
+q31 61 140 266.5t131 247.5q-19 39 -126 281t-136 295q-38 69 -201 71v50l513 -1v-47q-60 -2 -93.5 -25t-12.5 -69q33 -70 87 -189.5t86 -187.5q110 214 173 363q24 55 -10 79.5t-129 26.5q1 7 1 25v24q64 0 170.5 0.5t180 1t92.5 0.5v-49q-62 -2 -119 -33t-90 -81
+l-213 -442q13 -33 127.5 -290t121.5 -274l441 1017q-14 38 -49.5 62.5t-65 31.5t-55.5 8v50l460 -4l1 -2l-1 -44q-139 -4 -201 -145q-526 -1216 -559 -1291h-49z" />
+    <glyph glyph-name="_577" unicode="&#xf267;" horiz-adv-x="1792" 
+d="M949 643q0 -26 -16.5 -45t-41.5 -19q-26 0 -45 16.5t-19 41.5q0 26 17 45t42 19t44 -16.5t19 -41.5zM964 585l350 581q-9 -8 -67.5 -62.5t-125.5 -116.5t-136.5 -127t-117 -110.5t-50.5 -51.5l-349 -580q7 7 67 62t126 116.5t136 127t117 111t50 50.5zM1611 640
+q0 -201 -104 -371q-3 2 -17 11t-26.5 16.5t-16.5 7.5q-13 0 -13 -13q0 -10 59 -44q-74 -112 -184.5 -190.5t-241.5 -110.5l-16 67q-1 10 -15 10q-5 0 -8 -5.5t-2 -9.5l16 -68q-72 -15 -146 -15q-199 0 -372 105q1 2 13 20.5t21.5 33.5t9.5 19q0 13 -13 13q-6 0 -17 -14.5
+t-22.5 -34.5t-13.5 -23q-113 75 -192 187.5t-110 244.5l69 15q10 3 10 15q0 5 -5.5 8t-10.5 2l-68 -15q-14 72 -14 139q0 206 109 379q2 -1 18.5 -12t30 -19t17.5 -8q13 0 13 12q0 6 -12.5 15.5t-32.5 21.5l-20 12q77 112 189 189t244 107l15 -67q2 -10 15 -10q5 0 8 5.5
+t2 10.5l-15 66q71 13 134 13q204 0 379 -109q-39 -56 -39 -65q0 -13 12 -13q11 0 48 64q111 -75 187.5 -186t107.5 -241l-56 -12q-10 -2 -10 -16q0 -5 5.5 -8t9.5 -2l57 13q14 -72 14 -140zM1696 640q0 163 -63.5 311t-170.5 255t-255 170.5t-311 63.5t-311 -63.5
+t-255 -170.5t-170.5 -255t-63.5 -311t63.5 -311t170.5 -255t255 -170.5t311 -63.5t311 63.5t255 170.5t170.5 255t63.5 311zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191
+t191 -286t71 -348z" />
+    <glyph glyph-name="_578" unicode="&#xf268;" horiz-adv-x="1792" 
+d="M893 1536q240 2 451 -120q232 -134 352 -372l-742 39q-160 9 -294 -74.5t-185 -229.5l-276 424q128 159 311 245.5t383 87.5zM146 1131l337 -663q72 -143 211 -217t293 -45l-230 -451q-212 33 -385 157.5t-272.5 316t-99.5 411.5q0 267 146 491zM1732 962
+q58 -150 59.5 -310.5t-48.5 -306t-153 -272t-246 -209.5q-230 -133 -498 -119l405 623q88 131 82.5 290.5t-106.5 277.5zM896 942q125 0 213.5 -88.5t88.5 -213.5t-88.5 -213.5t-213.5 -88.5t-213.5 88.5t-88.5 213.5t88.5 213.5t213.5 88.5z" />
+    <glyph glyph-name="_579" unicode="&#xf269;" horiz-adv-x="1792" 
+d="M903 -256q-283 0 -504.5 150.5t-329.5 398.5q-58 131 -67 301t26 332.5t111 312t179 242.5l-11 -281q11 14 68 15.5t70 -15.5q42 81 160.5 138t234.5 59q-54 -45 -119.5 -148.5t-58.5 -163.5q25 -8 62.5 -13.5t63 -7.5t68 -4t50.5 -3q15 -5 9.5 -45.5t-30.5 -75.5
+q-5 -7 -16.5 -18.5t-56.5 -35.5t-101 -34l15 -189l-139 67q-18 -43 -7.5 -81.5t36 -66.5t65.5 -41.5t81 -6.5q51 9 98 34.5t83.5 45t73.5 17.5q61 -4 89.5 -33t19.5 -65q-1 -2 -2.5 -5.5t-8.5 -12.5t-18 -15.5t-31.5 -10.5t-46.5 -1q-60 -95 -144.5 -135.5t-209.5 -29.5
+q74 -61 162.5 -82.5t168.5 -6t154.5 52t128 87.5t80.5 104q43 91 39 192.5t-37.5 188.5t-78.5 125q87 -38 137 -79.5t77 -112.5q15 170 -57.5 343t-209.5 284q265 -77 412 -279.5t151 -517.5q2 -127 -40.5 -255t-123.5 -238t-189 -196t-247.5 -135.5t-288.5 -49.5z" />
+    <glyph glyph-name="_580" unicode="&#xf26a;" horiz-adv-x="1792" 
+d="M1493 1308q-165 110 -359 110q-155 0 -293 -73t-240 -200q-75 -93 -119.5 -218t-48.5 -266v-42q4 -141 48.5 -266t119.5 -218q102 -127 240 -200t293 -73q194 0 359 110q-121 -108 -274.5 -168t-322.5 -60q-29 0 -43 1q-175 8 -333 82t-272 193t-181 281t-67 339
+q0 182 71 348t191 286t286 191t348 71h3q168 -1 320.5 -60.5t273.5 -167.5zM1792 640q0 -192 -77 -362.5t-213 -296.5q-104 -63 -222 -63q-137 0 -255 84q154 56 253.5 233t99.5 405q0 227 -99 404t-253 234q119 83 254 83q119 0 226 -65q135 -125 210.5 -295t75.5 -361z
+" />
+    <glyph glyph-name="_581" unicode="&#xf26b;" horiz-adv-x="1792" 
+d="M1792 599q0 -56 -7 -104h-1151q0 -146 109.5 -244.5t257.5 -98.5q99 0 185.5 46.5t136.5 130.5h423q-56 -159 -170.5 -281t-267.5 -188.5t-321 -66.5q-187 0 -356 83q-228 -116 -394 -116q-237 0 -237 263q0 115 45 275q17 60 109 229q199 360 475 606
+q-184 -79 -427 -354q63 274 283.5 449.5t501.5 175.5q30 0 45 -1q255 117 433 117q64 0 116 -13t94.5 -40.5t66.5 -76.5t24 -115q0 -116 -75 -286q101 -182 101 -390zM1722 1239q0 83 -53 132t-137 49q-108 0 -254 -70q121 -47 222.5 -131.5t170.5 -195.5q51 135 51 216z
+M128 2q0 -86 48.5 -132.5t134.5 -46.5q115 0 266 83q-122 72 -213.5 183t-137.5 245q-98 -205 -98 -332zM632 715h728q-5 142 -113 237t-251 95q-144 0 -251.5 -95t-112.5 -237z" />
+    <glyph glyph-name="_582" unicode="&#xf26c;" horiz-adv-x="2048" 
+d="M1792 288v960q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1248v-960q0 -66 -47 -113t-113 -47h-736v-128h352q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23
+v64q0 14 9 23t23 9h352v128h-736q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="_583" unicode="&#xf26d;" horiz-adv-x="1792" 
+d="M138 1408h197q-70 -64 -126 -149q-36 -56 -59 -115t-30 -125.5t-8.5 -120t10.5 -132t21 -126t28 -136.5q4 -19 6 -28q51 -238 81 -329q57 -171 152 -275h-272q-48 0 -82 34t-34 82v1304q0 48 34 82t82 34zM1346 1408h308q48 0 82 -34t34 -82v-1304q0 -48 -34 -82t-82 -34
+h-178q212 210 196 565l-469 -101q-2 -45 -12 -82t-31 -72t-59.5 -59.5t-93.5 -36.5q-123 -26 -199 40q-32 27 -53 61t-51.5 129t-64.5 258q-35 163 -45.5 263t-5.5 139t23 77q20 41 62.5 73t102.5 45q45 12 83.5 6.5t67 -17t54 -35t43 -48t34.5 -56.5l468 100
+q-68 175 -180 287z" />
+    <glyph glyph-name="_584" unicode="&#xf26e;" 
+d="M1401 -11l-6 -6q-113 -113 -259 -175q-154 -64 -317 -64q-165 0 -317 64q-148 63 -259 175q-113 112 -175 258q-42 103 -54 189q-4 28 48 36q51 8 56 -20q1 -1 1 -4q18 -90 46 -159q50 -124 152 -226q98 -98 226 -152q132 -56 276 -56q143 0 276 56q128 55 225 152l6 6
+q10 10 25 6q12 -3 33 -22q36 -37 17 -58zM929 604l-66 -66l63 -63q21 -21 -7 -49q-17 -17 -32 -17q-10 0 -19 10l-62 61l-66 -66q-5 -5 -15 -5q-15 0 -31 16l-2 2q-18 15 -18 29q0 7 8 17l66 65l-66 66q-16 16 14 45q18 18 31 18q6 0 13 -5l65 -66l65 65q18 17 48 -13
+q27 -27 11 -44zM1400 547q0 -118 -46 -228q-45 -105 -126 -186q-80 -80 -187 -126t-228 -46t-228 46t-187 126q-82 82 -125 186q-15 33 -15 40h-1q-9 27 43 44q50 16 60 -12q37 -99 97 -167h1v339v2q3 136 102 232q105 103 253 103q147 0 251 -103t104 -249
+q0 -147 -104.5 -251t-250.5 -104q-58 0 -112 16q-28 11 -13 61q16 51 44 43l14 -3q14 -3 33 -6t30 -3q104 0 176 71.5t72 174.5q0 101 -72 171q-71 71 -175 71q-107 0 -178 -80q-64 -72 -64 -160v-413q110 -67 242 -67q96 0 185 36.5t156 103.5t103.5 155t36.5 183
+q0 198 -141 339q-140 140 -339 140q-200 0 -340 -140q-53 -53 -77 -87l-2 -2q-8 -11 -13 -15.5t-21.5 -9.5t-38.5 3q-21 5 -36.5 16.5t-15.5 26.5v680q0 15 10.5 26.5t27.5 11.5h877q30 0 30 -55t-30 -55h-811v-483h1q40 42 102 84t108 61q109 46 231 46q121 0 228 -46
+t187 -126q81 -81 126 -186q46 -112 46 -229zM1369 1128q9 -8 9 -18t-5.5 -18t-16.5 -21q-26 -26 -39 -26q-9 0 -16 7q-106 91 -207 133q-128 56 -276 56q-133 0 -262 -49q-27 -10 -45 37q-9 25 -8 38q3 16 16 20q130 57 299 57q164 0 316 -64q137 -58 235 -152z" />
+    <glyph glyph-name="_585" unicode="&#xf270;" horiz-adv-x="1792" 
+d="M1551 60q15 6 26 3t11 -17.5t-15 -33.5q-13 -16 -44 -43.5t-95.5 -68t-141 -74t-188 -58t-229.5 -24.5q-119 0 -238 31t-209 76.5t-172.5 104t-132.5 105t-84 87.5q-8 9 -10 16.5t1 12t8 7t11.5 2t11.5 -4.5q192 -117 300 -166q389 -176 799 -90q190 40 391 135z
+M1758 175q11 -16 2.5 -69.5t-28.5 -102.5q-34 -83 -85 -124q-17 -14 -26 -9t0 24q21 45 44.5 121.5t6.5 98.5q-5 7 -15.5 11.5t-27 6t-29.5 2.5t-35 0t-31.5 -2t-31 -3t-22.5 -2q-6 -1 -13 -1.5t-11 -1t-8.5 -1t-7 -0.5h-5.5h-4.5t-3 0.5t-2 1.5l-1.5 3q-6 16 47 40t103 30
+q46 7 108 1t76 -24zM1364 618q0 -31 13.5 -64t32 -58t37.5 -46t33 -32l13 -11l-227 -224q-40 37 -79 75.5t-58 58.5l-19 20q-11 11 -25 33q-38 -59 -97.5 -102.5t-127.5 -63.5t-140 -23t-137.5 21t-117.5 65.5t-83 113t-31 162.5q0 84 28 154t72 116.5t106.5 83t122.5 57
+t130 34.5t119.5 18.5t99.5 6.5v127q0 65 -21 97q-34 53 -121 53q-6 0 -16.5 -1t-40.5 -12t-56 -29.5t-56 -59.5t-48 -96l-294 27q0 60 22 119t67 113t108 95t151.5 65.5t190.5 24.5q100 0 181 -25t129.5 -61.5t81 -83t45 -86t12.5 -73.5v-589zM692 597q0 -86 70 -133
+q66 -44 139 -22q84 25 114 123q14 45 14 101v162q-59 -2 -111 -12t-106.5 -33.5t-87 -71t-32.5 -114.5z" />
+    <glyph glyph-name="_586" unicode="&#xf271;" horiz-adv-x="1792" 
+d="M1536 1280q52 0 90 -38t38 -90v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128zM1152 1376v-288q0 -14 9 -23t23 -9
+h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 1376v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM1536 -128v1024h-1408v-1024h1408zM896 448h224q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-224
+v-224q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v224h-224q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v224q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-224z" />
+    <glyph glyph-name="_587" unicode="&#xf272;" horiz-adv-x="1792" 
+d="M1152 416v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23
+t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47
+t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_588" unicode="&#xf273;" horiz-adv-x="1792" 
+d="M1111 151l-46 -46q-9 -9 -22 -9t-23 9l-188 189l-188 -189q-10 -9 -23 -9t-22 9l-46 46q-9 9 -9 22t9 23l189 188l-189 188q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l188 -188l188 188q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23l-188 -188l188 -188q9 -10 9 -23t-9 -22z
+M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280
+q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_589" unicode="&#xf274;" horiz-adv-x="1792" 
+d="M1303 572l-512 -512q-10 -9 -23 -9t-23 9l-288 288q-9 10 -9 23t9 22l46 46q9 9 22 9t23 -9l220 -220l444 444q10 9 23 9t22 -9l46 -46q9 -9 9 -22t-9 -23zM128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23
+t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47
+t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
+    <glyph glyph-name="_590" unicode="&#xf275;" horiz-adv-x="1792" 
+d="M448 1536q26 0 45 -19t19 -45v-891l536 429q17 14 40 14q26 0 45 -19t19 -45v-379l536 429q17 14 40 14q26 0 45 -19t19 -45v-1152q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h384z" />
+    <glyph glyph-name="_591" unicode="&#xf276;" horiz-adv-x="1024" 
+d="M512 448q66 0 128 15v-655q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v655q62 -15 128 -15zM512 1536q212 0 362 -150t150 -362t-150 -362t-362 -150t-362 150t-150 362t150 362t362 150zM512 1312q14 0 23 9t9 23t-9 23t-23 9q-146 0 -249 -103t-103 -249
+q0 -14 9 -23t23 -9t23 9t9 23q0 119 84.5 203.5t203.5 84.5z" />
+    <glyph glyph-name="_592" unicode="&#xf277;" horiz-adv-x="1792" 
+d="M1745 1239q10 -10 10 -23t-10 -23l-141 -141q-28 -28 -68 -28h-1344q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h576v64q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-64h512q40 0 68 -28zM768 320h256v-512q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v512zM1600 768
+q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-1344q-40 0 -68 28l-141 141q-10 10 -10 23t10 23l141 141q28 28 68 28h512v192h256v-192h576z" />
+    <glyph glyph-name="_593" unicode="&#xf278;" horiz-adv-x="2048" 
+d="M2020 1525q28 -20 28 -53v-1408q0 -20 -11 -36t-29 -23l-640 -256q-24 -11 -48 0l-616 246l-616 -246q-10 -5 -24 -5q-19 0 -36 11q-28 20 -28 53v1408q0 20 11 36t29 23l640 256q24 11 48 0l616 -246l616 246q32 13 60 -6zM736 1390v-1270l576 -230v1270zM128 1173
+v-1270l544 217v1270zM1920 107v1270l-544 -217v-1270z" />
+    <glyph glyph-name="_594" unicode="&#xf279;" horiz-adv-x="1792" 
+d="M512 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472q0 20 17 28l480 256q7 4 15 4zM1760 1536q13 0 22.5 -9.5t9.5 -22.5v-1472q0 -20 -17 -28l-480 -256q-7 -4 -15 -4q-13 0 -22.5 9.5t-9.5 22.5v1472
+q0 20 17 28l480 256q7 4 15 4zM640 1536q8 0 14 -3l512 -256q18 -10 18 -29v-1472q0 -13 -9.5 -22.5t-22.5 -9.5q-8 0 -14 3l-512 256q-18 10 -18 29v1472q0 13 9.5 22.5t22.5 9.5z" />
+    <glyph glyph-name="_595" unicode="&#xf27a;" horiz-adv-x="1792" 
+d="M640 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 640q0 53 -37.5 90.5t-90.5 37.5
+t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-110 0 -211 18q-173 -173 -435 -229q-52 -10 -86 -13q-12 -1 -22 6t-13 18q-4 15 20 37q5 5 23.5 21.5t25.5 23.5t23.5 25.5t24 31.5t20.5 37
+t20 48t14.5 57.5t12.5 72.5q-146 90 -229.5 216.5t-83.5 269.5q0 174 120 321.5t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
+    <glyph glyph-name="_596" unicode="&#xf27b;" horiz-adv-x="1792" 
+d="M640 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1024 640q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 -53 -37.5 -90.5t-90.5 -37.5
+t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5
+t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51
+t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 130 71 248.5t191 204.5t286 136.5t348 50.5t348 -50.5t286 -136.5t191 -204.5t71 -248.5z" />
+    <glyph glyph-name="_597" unicode="&#xf27c;" horiz-adv-x="1024" 
+d="M512 345l512 295v-591l-512 -296v592zM0 640v-591l512 296zM512 1527v-591l-512 -296v591zM512 936l512 295v-591z" />
+    <glyph glyph-name="_598" unicode="&#xf27d;" horiz-adv-x="1792" 
+d="M1709 1018q-10 -236 -332 -651q-333 -431 -562 -431q-142 0 -240 263q-44 160 -132 482q-72 262 -157 262q-18 0 -127 -76l-77 98q24 21 108 96.5t130 115.5q156 138 241 146q95 9 153 -55.5t81 -203.5q44 -287 66 -373q55 -249 120 -249q51 0 154 161q101 161 109 246
+q13 139 -109 139q-57 0 -121 -26q120 393 459 382q251 -8 236 -326z" />
+    <glyph glyph-name="f27e" unicode="&#xf27e;" 
+d="M0 1408h1536v-1536h-1536v1536zM1085 293l-221 631l221 297h-634l221 -297l-221 -631l317 -304z" />
+    <glyph glyph-name="uniF280" unicode="&#xf280;" 
+d="M0 1408h1536v-1536h-1536v1536zM908 1088l-12 -33l75 -83l-31 -114l25 -25l107 57l107 -57l25 25l-31 114l75 83l-12 33h-95l-53 96h-32l-53 -96h-95zM641 925q32 0 44.5 -16t11.5 -63l174 21q0 55 -17.5 92.5t-50.5 56t-69 25.5t-85 7q-133 0 -199 -57.5t-66 -182.5v-72
+h-96v-128h76q20 0 20 -8v-382q0 -14 -5 -20t-18 -7l-73 -7v-88h448v86l-149 14q-6 1 -8.5 1.5t-3.5 2.5t-0.5 4t1 7t0.5 10v387h191l38 128h-231q-6 0 -2 6t4 9v80q0 27 1.5 40.5t7.5 28t19.5 20t36.5 5.5zM1248 96v86l-54 9q-7 1 -9.5 2.5t-2.5 3t1 7.5t1 12v520h-275
+l-23 -101l83 -22q23 -7 23 -27v-370q0 -14 -6 -18.5t-20 -6.5l-70 -9v-86h352z" />
+    <glyph glyph-name="uniF281" unicode="&#xf281;" horiz-adv-x="1792" 
+d="M1792 690q0 -58 -29.5 -105.5t-79.5 -72.5q12 -46 12 -96q0 -155 -106.5 -287t-290.5 -208.5t-400 -76.5t-399.5 76.5t-290 208.5t-106.5 287q0 47 11 94q-51 25 -82 73.5t-31 106.5q0 82 58 140.5t141 58.5q85 0 145 -63q218 152 515 162l116 521q3 13 15 21t26 5
+l369 -81q18 37 54 59.5t79 22.5q62 0 106 -43.5t44 -105.5t-44 -106t-106 -44t-105.5 43.5t-43.5 105.5l-334 74l-104 -472q300 -9 519 -160q58 61 143 61q83 0 141 -58.5t58 -140.5zM418 491q0 -62 43.5 -106t105.5 -44t106 44t44 106t-44 105.5t-106 43.5q-61 0 -105 -44
+t-44 -105zM1228 136q11 11 11 26t-11 26q-10 10 -25 10t-26 -10q-41 -42 -121 -62t-160 -20t-160 20t-121 62q-11 10 -26 10t-25 -10q-11 -10 -11 -25.5t11 -26.5q43 -43 118.5 -68t122.5 -29.5t91 -4.5t91 4.5t122.5 29.5t118.5 68zM1225 341q62 0 105.5 44t43.5 106
+q0 61 -44 105t-105 44q-62 0 -106 -43.5t-44 -105.5t44 -106t106 -44z" />
+    <glyph glyph-name="_602" unicode="&#xf282;" horiz-adv-x="1792" 
+d="M69 741h1q16 126 58.5 241.5t115 217t167.5 176t223.5 117.5t276.5 43q231 0 414 -105.5t294 -303.5q104 -187 104 -442v-188h-1125q1 -111 53.5 -192.5t136.5 -122.5t189.5 -57t213 -3t208 46.5t173.5 84.5v-377q-92 -55 -229.5 -92t-312.5 -38t-316 53
+q-189 73 -311.5 249t-124.5 372q-3 242 111 412t325 268q-48 -60 -78 -125.5t-46 -159.5h635q8 77 -8 140t-47 101.5t-70.5 66.5t-80.5 41t-75 20.5t-56 8.5l-22 1q-135 -5 -259.5 -44.5t-223.5 -104.5t-176 -140.5t-138 -163.5z" />
+    <glyph glyph-name="_603" unicode="&#xf283;" horiz-adv-x="2304" 
+d="M0 32v608h2304v-608q0 -66 -47 -113t-113 -47h-1984q-66 0 -113 47t-47 113zM640 256v-128h384v128h-384zM256 256v-128h256v128h-256zM2144 1408q66 0 113 -47t47 -113v-224h-2304v224q0 66 47 113t113 47h1984z" />
+    <glyph glyph-name="_604" unicode="&#xf284;" horiz-adv-x="1792" 
+d="M1584 246l-218 111q-74 -120 -196.5 -189t-263.5 -69q-147 0 -271 72t-196 196t-72 270q0 110 42.5 209.5t115 172t172 115t209.5 42.5q131 0 247.5 -60.5t192.5 -168.5l215 125q-110 169 -286.5 265t-378.5 96q-161 0 -308 -63t-253 -169t-169 -253t-63 -308t63 -308
+t169 -253t253 -169t308 -63q213 0 397.5 107t290.5 292zM1030 643l693 -352q-116 -253 -334.5 -400t-492.5 -147q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71q260 0 470.5 -133.5t335.5 -366.5zM1543 640h-39v-160h-96v352h136q32 0 54.5 -20
+t28.5 -48t1 -56t-27.5 -48t-57.5 -20z" />
+    <glyph glyph-name="uniF285" unicode="&#xf285;" horiz-adv-x="1792" 
+d="M1427 827l-614 386l92 151h855zM405 562l-184 116v858l1183 -743zM1424 697l147 -95v-858l-532 335zM1387 718l-500 -802h-855l356 571z" />
+    <glyph glyph-name="uniF286" unicode="&#xf286;" horiz-adv-x="1792" 
+d="M640 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1152 528v224q0 16 -16 16h-96q-16 0 -16 -16v-224q0 -16 16 -16h96q16 0 16 16zM1664 496v-752h-640v320q0 80 -56 136t-136 56t-136 -56t-56 -136v-320h-640v752q0 16 16 16h96
+q16 0 16 -16v-112h128v624q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 6 2.5 9.5t8.5 5t9.5 2t11.5 0t9 -0.5v391q-32 15 -32 50q0 23 16.5 39t38.5 16t38.5 -16t16.5 -39q0 -35 -32 -50v-17q45 10 83 10q21 0 59.5 -7.5t54.5 -7.5
+q17 0 47 7.5t37 7.5q16 0 16 -16v-210q0 -15 -35 -21.5t-62 -6.5q-18 0 -54.5 7.5t-55.5 7.5q-40 0 -90 -12v-133q1 0 9 0.5t11.5 0t9.5 -2t8.5 -5t2.5 -9.5v-112h128v112q0 16 16 16h96q16 0 16 -16v-112h128v112q0 16 16 16h96q16 0 16 -16v-624h128v112q0 16 16 16h96
+q16 0 16 -16z" />
+    <glyph glyph-name="_607" unicode="&#xf287;" horiz-adv-x="2304" 
+d="M2288 731q16 -8 16 -27t-16 -27l-320 -192q-8 -5 -16 -5q-9 0 -16 4q-16 10 -16 28v128h-858q37 -58 83 -165q16 -37 24.5 -55t24 -49t27 -47t27 -34t31.5 -26t33 -8h96v96q0 14 9 23t23 9h320q14 0 23 -9t9 -23v-320q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v96h-96
+q-32 0 -61 10t-51 23.5t-45 40.5t-37 46t-33.5 57t-28.5 57.5t-28 60.5q-23 53 -37 81.5t-36 65t-44.5 53.5t-46.5 17h-360q-22 -84 -91 -138t-157 -54q-106 0 -181 75t-75 181t75 181t181 75q88 0 157 -54t91 -138h104q24 0 46.5 17t44.5 53.5t36 65t37 81.5q19 41 28 60.5
+t28.5 57.5t33.5 57t37 46t45 40.5t51 23.5t61 10h107q21 57 70 92.5t111 35.5q80 0 136 -56t56 -136t-56 -136t-136 -56q-62 0 -111 35.5t-70 92.5h-107q-17 0 -33 -8t-31.5 -26t-27 -34t-27 -47t-24 -49t-24.5 -55q-46 -107 -83 -165h1114v128q0 18 16 28t32 -1z" />
+    <glyph glyph-name="_608" unicode="&#xf288;" horiz-adv-x="1792" 
+d="M1150 774q0 -56 -39.5 -95t-95.5 -39h-253v269h253q56 0 95.5 -39.5t39.5 -95.5zM1329 774q0 130 -91.5 222t-222.5 92h-433v-896h180v269h253q130 0 222 91.5t92 221.5zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348
+t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_609" unicode="&#xf289;" horiz-adv-x="2304" 
+d="M1645 438q0 59 -34 106.5t-87 68.5q-7 -45 -23 -92q-7 -24 -27.5 -38t-44.5 -14q-12 0 -24 3q-31 10 -45 38.5t-4 58.5q23 71 23 143q0 123 -61 227.5t-166 165.5t-228 61q-134 0 -247 -73t-167 -194q108 -28 188 -106q22 -23 22 -55t-22 -54t-54 -22t-55 22
+q-75 75 -180 75q-106 0 -181 -74.5t-75 -180.5t75 -180.5t181 -74.5h1046q79 0 134.5 55.5t55.5 133.5zM1798 438q0 -142 -100.5 -242t-242.5 -100h-1046q-169 0 -289 119.5t-120 288.5q0 153 100 267t249 136q62 184 221 298t354 114q235 0 408.5 -158.5t196.5 -389.5
+q116 -25 192.5 -118.5t76.5 -214.5zM2048 438q0 -175 -97 -319q-23 -33 -64 -33q-24 0 -43 13q-26 17 -32 48.5t12 57.5q71 104 71 233t-71 233q-18 26 -12 57t32 49t57.5 11.5t49.5 -32.5q97 -142 97 -318zM2304 438q0 -244 -134 -443q-23 -34 -64 -34q-23 0 -42 13
+q-26 18 -32.5 49t11.5 57q108 164 108 358q0 195 -108 357q-18 26 -11.5 57.5t32.5 48.5q26 18 57 12t49 -33q134 -198 134 -442z" />
+    <glyph glyph-name="_610" unicode="&#xf28a;" 
+d="M1500 -13q0 -89 -63 -152.5t-153 -63.5t-153.5 63.5t-63.5 152.5q0 90 63.5 153.5t153.5 63.5t153 -63.5t63 -153.5zM1267 268q-115 -15 -192.5 -102.5t-77.5 -205.5q0 -74 33 -138q-146 -78 -379 -78q-109 0 -201 21t-153.5 54.5t-110.5 76.5t-76 85t-44.5 83
+t-23.5 66.5t-6 39.5q0 19 4.5 42.5t18.5 56t36.5 58t64 43.5t94.5 18t94 -17.5t63 -41t35.5 -53t17.5 -49t4 -33.5q0 -34 -23 -81q28 -27 82 -42t93 -17l40 -1q115 0 190 51t75 133q0 26 -9 48.5t-31.5 44.5t-49.5 41t-74 44t-93.5 47.5t-119.5 56.5q-28 13 -43 20
+q-116 55 -187 100t-122.5 102t-72 125.5t-20.5 162.5q0 78 20.5 150t66 137.5t112.5 114t166.5 77t221.5 28.5q120 0 220 -26t164.5 -67t109.5 -94t64 -105.5t19 -103.5q0 -46 -15 -82.5t-36.5 -58t-48.5 -36t-49 -19.5t-39 -5h-8h-32t-39 5t-44 14t-41 28t-37 46t-24 70.5
+t-10 97.5q-15 16 -59 25.5t-81 10.5l-37 1q-68 0 -117.5 -31t-70.5 -70t-21 -76q0 -24 5 -43t24 -46t53 -51t97 -53.5t150 -58.5q76 -25 138.5 -53.5t109 -55.5t83 -59t60.5 -59.5t41 -62.5t26.5 -62t14.5 -63.5t6 -62t1 -62.5z" />
+    <glyph glyph-name="_611" unicode="&#xf28b;" 
+d="M704 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1152 352v576q0 14 -9 23t-23 9h-256q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h256q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103
+t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_612" unicode="&#xf28c;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM864 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-192z" />
+    <glyph glyph-name="_613" unicode="&#xf28d;" 
+d="M1088 352v576q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-576q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="_614" unicode="&#xf28e;" 
+d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM768 96q148 0 273 73t198 198t73 273t-73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273
+t73 -273t198 -198t273 -73zM480 320q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h576q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-576z" />
+    <glyph glyph-name="_615" unicode="&#xf290;" horiz-adv-x="1792" 
+d="M1757 128l35 -313q3 -28 -16 -50q-19 -21 -48 -21h-1664q-29 0 -48 21q-19 22 -16 50l35 313h1722zM1664 967l86 -775h-1708l86 775q3 24 21 40.5t43 16.5h256v-128q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5v128h384v-128q0 -53 37.5 -90.5t90.5 -37.5
+t90.5 37.5t37.5 90.5v128h256q25 0 43 -16.5t21 -40.5zM1280 1152v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-256q0 -26 -19 -45t-45 -19t-45 19t-19 45v256q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="_616" unicode="&#xf291;" horiz-adv-x="2048" 
+d="M1920 768q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5h-15l-115 -662q-8 -46 -44 -76t-82 -30h-1280q-46 0 -82 30t-44 76l-115 662h-15q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5h1792zM485 -32q26 2 43.5 22.5t15.5 46.5l-32 416q-2 26 -22.5 43.5
+t-46.5 15.5t-43.5 -22.5t-15.5 -46.5l32 -416q2 -25 20.5 -42t43.5 -17h5zM896 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1280 32v416q0 26 -19 45t-45 19t-45 -19t-19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45zM1632 27l32 416
+q2 26 -15.5 46.5t-43.5 22.5t-46.5 -15.5t-22.5 -43.5l-32 -416q-2 -26 15.5 -46.5t43.5 -22.5h5q25 0 43.5 17t20.5 42zM476 1244l-93 -412h-132l101 441q19 88 89 143.5t160 55.5h167q0 26 19 45t45 19h384q26 0 45 -19t19 -45h167q90 0 160 -55.5t89 -143.5l101 -441
+h-132l-93 412q-11 44 -45.5 72t-79.5 28h-167q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45h-167q-45 0 -79.5 -28t-45.5 -72z" />
+    <glyph glyph-name="_617" unicode="&#xf292;" horiz-adv-x="1792" 
+d="M991 512l64 256h-254l-64 -256h254zM1759 1016l-56 -224q-7 -24 -31 -24h-327l-64 -256h311q15 0 25 -12q10 -14 6 -28l-56 -224q-5 -24 -31 -24h-327l-81 -328q-7 -24 -31 -24h-224q-16 0 -26 12q-9 12 -6 28l78 312h-254l-81 -328q-7 -24 -31 -24h-225q-15 0 -25 12
+q-9 12 -6 28l78 312h-311q-15 0 -25 12q-9 12 -6 28l56 224q7 24 31 24h327l64 256h-311q-15 0 -25 12q-10 14 -6 28l56 224q5 24 31 24h327l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h254l81 328q7 24 32 24h224q15 0 25 -12q9 -12 6 -28l-78 -312h311
+q15 0 25 -12q9 -12 6 -28z" />
+    <glyph glyph-name="_618" unicode="&#xf293;" 
+d="M841 483l148 -148l-149 -149zM840 1094l149 -149l-148 -148zM710 -130l464 464l-306 306l306 306l-464 464v-611l-255 255l-93 -93l320 -321l-320 -321l93 -93l255 255v-611zM1429 640q0 -209 -32 -365.5t-87.5 -257t-140.5 -162.5t-181.5 -86.5t-219.5 -24.5
+t-219.5 24.5t-181.5 86.5t-140.5 162.5t-87.5 257t-32 365.5t32 365.5t87.5 257t140.5 162.5t181.5 86.5t219.5 24.5t219.5 -24.5t181.5 -86.5t140.5 -162.5t87.5 -257t32 -365.5z" />
+    <glyph glyph-name="_619" unicode="&#xf294;" horiz-adv-x="1024" 
+d="M596 113l173 172l-173 172v-344zM596 823l173 172l-173 172v-344zM628 640l356 -356l-539 -540v711l-297 -296l-108 108l372 373l-372 373l108 108l297 -296v711l539 -540z" />
+    <glyph glyph-name="_620" unicode="&#xf295;" 
+d="M1280 256q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM512 1024q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5
+t112.5 -271.5zM1440 1344q0 -20 -13 -38l-1056 -1408q-19 -26 -51 -26h-160q-26 0 -45 19t-19 45q0 20 13 38l1056 1408q19 26 51 26h160q26 0 45 -19t19 -45zM768 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5
+t271.5 -112.5t112.5 -271.5z" />
+    <glyph glyph-name="_621" unicode="&#xf296;" horiz-adv-x="1792" 
+d="M104 830l792 -1015l-868 630q-18 13 -25 34.5t0 42.5l101 308v0zM566 830h660l-330 -1015v0zM368 1442l198 -612h-462l198 612q8 23 33 23t33 -23zM1688 830l101 -308q7 -21 0 -42.5t-25 -34.5l-868 -630l792 1015v0zM1688 830h-462l198 612q8 23 33 23t33 -23z" />
+    <glyph glyph-name="_622" unicode="&#xf297;" horiz-adv-x="1792" 
+d="M384 704h160v224h-160v-224zM1221 372v92q-104 -36 -243 -38q-135 -1 -259.5 46.5t-220.5 122.5l1 -96q88 -80 212 -128.5t272 -47.5q129 0 238 49zM640 704h640v224h-640v-224zM1792 736q0 -187 -99 -352q89 -102 89 -229q0 -157 -129.5 -268t-313.5 -111
+q-122 0 -225 52.5t-161 140.5q-19 -1 -57 -1t-57 1q-58 -88 -161 -140.5t-225 -52.5q-184 0 -313.5 111t-129.5 268q0 127 89 229q-99 165 -99 352q0 209 120 385.5t326.5 279.5t449.5 103t449.5 -103t326.5 -279.5t120 -385.5z" />
+    <glyph glyph-name="_623" unicode="&#xf298;" 
+d="M515 625v-128h-252v128h252zM515 880v-127h-252v127h252zM1273 369v-128h-341v128h341zM1273 625v-128h-672v128h672zM1273 880v-127h-672v127h672zM1408 20v1240q0 8 -6 14t-14 6h-32l-378 -256l-210 171l-210 -171l-378 256h-32q-8 0 -14 -6t-6 -14v-1240q0 -8 6 -14
+t14 -6h1240q8 0 14 6t6 14zM553 1130l185 150h-406zM983 1130l221 150h-406zM1536 1260v-1240q0 -62 -43 -105t-105 -43h-1240q-62 0 -105 43t-43 105v1240q0 62 43 105t105 43h1240q62 0 105 -43t43 -105z" />
+    <glyph glyph-name="_624" unicode="&#xf299;" horiz-adv-x="1792" 
+d="M896 720q-104 196 -160 278q-139 202 -347 318q-34 19 -70 36q-89 40 -94 32t34 -38l39 -31q62 -43 112.5 -93.5t94.5 -116.5t70.5 -113t70.5 -131q9 -17 13 -25q44 -84 84 -153t98 -154t115.5 -150t131 -123.5t148.5 -90.5q153 -66 154 -60q1 3 -49 37q-53 36 -81 57
+q-77 58 -179 211t-185 310zM549 177q-76 60 -132.5 125t-98 143.5t-71 154.5t-58.5 186t-52 209t-60.5 252t-76.5 289q273 0 497.5 -36t379 -92t271 -144.5t185.5 -172.5t110 -198.5t56 -199.5t12.5 -198.5t-9.5 -173t-20 -143.5t-13 -107l323 -327h-104l-281 285
+q-22 -2 -91.5 -14t-121.5 -19t-138 -6t-160.5 17t-167.5 59t-179 111z" />
+    <glyph glyph-name="_625" unicode="&#xf29a;" horiz-adv-x="1792" 
+d="M1374 879q-6 26 -28.5 39.5t-48.5 7.5q-261 -62 -401 -62t-401 62q-26 6 -48.5 -7.5t-28.5 -39.5t7.5 -48.5t39.5 -28.5q194 -46 303 -58q-2 -158 -15.5 -269t-26.5 -155.5t-41 -115.5l-9 -21q-10 -25 1 -49t36 -34q9 -4 23 -4q44 0 60 41l8 20q54 139 71 259h42
+q17 -120 71 -259l8 -20q16 -41 60 -41q14 0 23 4q25 10 36 34t1 49l-9 21q-28 71 -41 115.5t-26.5 155.5t-15.5 269q109 12 303 58q26 6 39.5 28.5t7.5 48.5zM1024 1024q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z
+M1600 640q0 -143 -55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5zM896 1408q-156 0 -298 -61t-245 -164t-164 -245t-61 -298t61 -298
+t164 -245t245 -164t298 -61t298 61t245 164t164 245t61 298t-61 298t-164 245t-245 164t-298 61zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="_626" unicode="&#xf29b;" 
+d="M1438 723q34 -35 29 -82l-44 -551q-4 -42 -34.5 -70t-71.5 -28q-6 0 -9 1q-44 3 -72.5 36.5t-25.5 77.5l35 429l-143 -8q55 -113 55 -240q0 -216 -148 -372l-137 137q91 101 91 235q0 145 -102.5 248t-247.5 103q-134 0 -236 -92l-137 138q120 114 284 141l264 300
+l-149 87l-181 -161q-33 -30 -77 -27.5t-73 35.5t-26.5 77t34.5 73l239 213q26 23 60 26.5t64 -14.5l488 -283q36 -21 48 -68q17 -67 -26 -117l-205 -232l371 20q49 3 83 -32zM1240 1180q-74 0 -126 52t-52 126t52 126t126 52t126.5 -52t52.5 -126t-52.5 -126t-126.5 -52z
+M613 -62q106 0 196 61l139 -139q-146 -116 -335 -116q-148 0 -273.5 73t-198.5 198t-73 273q0 188 116 336l139 -139q-60 -88 -60 -197q0 -145 102.5 -247.5t247.5 -102.5z" />
+    <glyph glyph-name="_627" unicode="&#xf29c;" 
+d="M880 336v-160q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v160q0 14 9 23t23 9h160q14 0 23 -9t9 -23zM1136 832q0 -50 -15 -90t-45.5 -69t-52 -44t-59.5 -36q-32 -18 -46.5 -28t-26 -24t-11.5 -29v-32q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v68q0 35 10.5 64.5
+t24 47.5t39 35.5t41 25.5t44.5 21q53 25 75 43t22 49q0 42 -43.5 71.5t-95.5 29.5q-56 0 -95 -27q-29 -20 -80 -83q-9 -12 -25 -12q-11 0 -19 6l-108 82q-10 7 -12 20t5 23q122 192 349 192q129 0 238.5 -89.5t109.5 -214.5zM768 1280q-130 0 -248.5 -51t-204 -136.5
+t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5
+t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="_628" unicode="&#xf29d;" horiz-adv-x="1408" 
+d="M366 1225q-64 0 -110 45.5t-46 110.5q0 64 46 109.5t110 45.5t109.5 -45.5t45.5 -109.5q0 -65 -45.5 -110.5t-109.5 -45.5zM917 583q0 -50 -30 -67.5t-63.5 -6.5t-47.5 34l-367 438q-7 12 -14 15.5t-11 1.5l-3 -3q-7 -8 4 -21l122 -139l1 -354l-161 -457
+q-67 -192 -92 -234q-15 -26 -28 -32q-50 -26 -103 -1q-29 13 -41.5 43t-9.5 57q2 17 197 618l5 416l-85 -164l35 -222q4 -24 -1 -42t-14 -27.5t-19 -16t-17 -7.5l-7 -2q-19 -3 -34.5 3t-24 16t-14 22t-7.5 19.5t-2 9.5l-46 299l211 381q23 34 113 34q75 0 107 -40l424 -521
+q7 -5 14 -17l3 -3l-1 -1q7 -13 7 -29zM514 433q43 -113 88.5 -225t69.5 -168l24 -55q36 -93 42 -125q11 -70 -36 -97q-35 -22 -66 -16t-51 22t-29 35h-1q-6 16 -8 25l-124 351zM1338 -159q31 -49 31 -57q0 -5 -3 -7q-9 -5 -14.5 0.5t-15.5 26t-16 30.5q-114 172 -423 661
+q3 -1 7 1t7 4l3 2q11 9 11 17z" />
+    <glyph glyph-name="_629" unicode="&#xf29e;" horiz-adv-x="2304" 
+d="M504 542h171l-1 265zM1530 641q0 87 -50.5 140t-146.5 53h-54v-388h52q91 0 145 57t54 138zM956 1018l1 -756q0 -14 -9.5 -24t-23.5 -10h-216q-14 0 -23.5 10t-9.5 24v62h-291l-55 -81q-10 -15 -28 -15h-267q-21 0 -30.5 18t3.5 35l556 757q9 14 27 14h332q14 0 24 -10
+t10 -24zM1783 641q0 -193 -125.5 -303t-324.5 -110h-270q-14 0 -24 10t-10 24v756q0 14 10 24t24 10h268q200 0 326 -109t126 -302zM1939 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5
+t-7.5 60t-20 91.5t-41 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2123 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-45 -108t-74 -102.5h-51q38 45 66.5 104.5t41.5 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5
+h43q41 -47 72 -107t45.5 -111.5t23 -96t10.5 -70.5zM2304 640q0 -11 -0.5 -29t-8 -71.5t-21.5 -102t-44.5 -108t-73.5 -102.5h-51q38 45 66 104.5t41 112t21 98t9 72.5l1 27q0 8 -0.5 22.5t-7.5 60t-19.5 91.5t-40.5 111.5t-66 124.5h43q41 -47 72 -107t45.5 -111.5t23 -96
+t9.5 -70.5z" />
+    <glyph glyph-name="uniF2A0" unicode="&#xf2a0;" horiz-adv-x="1408" 
+d="M617 -153q0 11 -13 58t-31 107t-20 69q-1 4 -5 26.5t-8.5 36t-13.5 21.5q-15 14 -51 14q-23 0 -70 -5.5t-71 -5.5q-34 0 -47 11q-6 5 -11 15.5t-7.5 20t-6.5 24t-5 18.5q-37 128 -37 255t37 255q1 4 5 18.5t6.5 24t7.5 20t11 15.5q13 11 47 11q24 0 71 -5.5t70 -5.5
+q36 0 51 14q9 8 13.5 21.5t8.5 36t5 26.5q2 9 20 69t31 107t13 58q0 22 -43.5 52.5t-75.5 42.5q-20 8 -45 8q-34 0 -98 -18q-57 -17 -96.5 -40.5t-71 -66t-46 -70t-45.5 -94.5q-6 -12 -9 -19q-49 -107 -68 -216t-19 -244t19 -244t68 -216q56 -122 83 -161q63 -91 179 -127
+l6 -2q64 -18 98 -18q25 0 45 8q32 12 75.5 42.5t43.5 52.5zM776 760q-26 0 -45 19t-19 45.5t19 45.5q37 37 37 90q0 52 -37 91q-19 19 -19 45t19 45t45 19t45 -19q75 -75 75 -181t-75 -181q-21 -19 -45 -19zM957 579q-27 0 -45 19q-19 19 -19 45t19 45q112 114 112 272
+t-112 272q-19 19 -19 45t19 45t45 19t45 -19q150 -150 150 -362t-150 -362q-18 -19 -45 -19zM1138 398q-27 0 -45 19q-19 19 -19 45t19 45q90 91 138.5 208t48.5 245t-48.5 245t-138.5 208q-19 19 -19 45t19 45t45 19t45 -19q109 -109 167 -249t58 -294t-58 -294t-167 -249
+q-18 -19 -45 -19z" />
+    <glyph glyph-name="uniF2A1" unicode="&#xf2a1;" horiz-adv-x="2176" 
+d="M192 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM704 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 352
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 352q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1472 864q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 864
+q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM1984 1376q-66 0 -113 -47t-47 -113t47 -113t113 -47t113 47t47 113t-47 113t-113 47zM384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 192q0 -80 -56 -136
+t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 1216q0 -80 -56 -136t-136 -56
+t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 192q0 -80 -56 -136t-136 -56t-136 56
+t-56 136t56 136t136 56t136 -56t56 -136zM1664 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM2176 704q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136
+t56 136t136 56t136 -56t56 -136zM2176 1216q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z" />
+    <glyph glyph-name="uniF2A2" unicode="&#xf2a2;" horiz-adv-x="1792" 
+d="M128 -192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM320 0q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM365 365l256 -256l-90 -90l-256 256zM704 384q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45z
+M1411 704q0 -59 -11.5 -108.5t-37.5 -93.5t-44 -67.5t-53 -64.5q-31 -35 -45.5 -54t-33.5 -50t-26.5 -64t-7.5 -74q0 -159 -112.5 -271.5t-271.5 -112.5q-26 0 -45 19t-19 45t19 45t45 19q106 0 181 75t75 181q0 57 11.5 105.5t37 91t43.5 66.5t52 63q40 46 59.5 72
+t37.5 74.5t18 103.5q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 117 45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM896 576q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45
+t45 19t45 -19t19 -45zM1184 704q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 93 -65.5 158.5t-158.5 65.5q-92 0 -158 -65.5t-66 -158.5q0 -26 -19 -45t-45 -19t-45 19t-19 45q0 146 103 249t249 103t249 -103t103 -249zM1578 993q10 -25 -1 -49t-36 -34q-9 -4 -23 -4
+q-19 0 -35.5 11t-23.5 30q-68 178 -224 295q-21 16 -25 42t12 47q17 21 43 25t47 -12q183 -137 266 -351zM1788 1074q9 -25 -1.5 -49t-35.5 -34q-11 -4 -23 -4q-44 0 -60 41q-92 238 -297 393q-22 16 -25.5 42t12.5 47q16 22 42 25.5t47 -12.5q235 -175 341 -449z" />
+    <glyph glyph-name="uniF2A3" unicode="&#xf2a3;" horiz-adv-x="2304" 
+d="M1032 576q-59 2 -84 55q-17 34 -48 53.5t-68 19.5q-53 0 -90.5 -37.5t-37.5 -90.5q0 -56 36 -89l10 -8q34 -31 82 -31q37 0 68 19.5t48 53.5q25 53 84 55zM1600 704q0 56 -36 89l-10 8q-34 31 -82 31q-37 0 -68 -19.5t-48 -53.5q-25 -53 -84 -55q59 -2 84 -55
+q17 -34 48 -53.5t68 -19.5q53 0 90.5 37.5t37.5 90.5zM1174 925q-17 -35 -55 -48t-73 4q-62 31 -134 31q-51 0 -99 -17q3 0 9.5 0.5t9.5 0.5q92 0 170.5 -50t118.5 -133q17 -36 3.5 -73.5t-49.5 -54.5q-18 -9 -39 -9q21 0 39 -9q36 -17 49.5 -54.5t-3.5 -73.5
+q-40 -83 -118.5 -133t-170.5 -50h-6q-16 2 -44 4l-290 27l-239 -120q-14 -7 -29 -7q-40 0 -57 35l-160 320q-11 23 -4 47.5t29 37.5l209 119l148 267q17 155 91.5 291.5t195.5 236.5q31 25 70.5 21.5t64.5 -34.5t21.5 -70t-34.5 -65q-70 -59 -117 -128q123 84 267 101
+q40 5 71.5 -19t35.5 -64q5 -40 -19 -71.5t-64 -35.5q-84 -10 -159 -55q46 10 99 10q115 0 218 -50q36 -18 49 -55.5t-5 -73.5zM2137 1085l160 -320q11 -23 4 -47.5t-29 -37.5l-209 -119l-148 -267q-17 -155 -91.5 -291.5t-195.5 -236.5q-26 -22 -61 -22q-45 0 -74 35
+q-25 31 -21.5 70t34.5 65q70 59 117 128q-123 -84 -267 -101q-4 -1 -12 -1q-36 0 -63.5 24t-31.5 60q-5 40 19 71.5t64 35.5q84 10 159 55q-46 -10 -99 -10q-115 0 -218 50q-36 18 -49 55.5t5 73.5q17 35 55 48t73 -4q62 -31 134 -31q51 0 99 17q-3 0 -9.5 -0.5t-9.5 -0.5
+q-92 0 -170.5 50t-118.5 133q-17 36 -3.5 73.5t49.5 54.5q18 9 39 9q-21 0 -39 9q-36 17 -49.5 54.5t3.5 73.5q40 83 118.5 133t170.5 50h6h1q14 -2 42 -4l291 -27l239 120q14 7 29 7q40 0 57 -35z" />
+    <glyph glyph-name="uniF2A4" unicode="&#xf2a4;" horiz-adv-x="1792" 
+d="M1056 704q0 -26 19 -45t45 -19t45 19t19 45q0 146 -103 249t-249 103t-249 -103t-103 -249q0 -26 19 -45t45 -19t45 19t19 45q0 93 66 158.5t158 65.5t158 -65.5t66 -158.5zM835 1280q-117 0 -223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5q0 -26 19 -45t45 -19t45 19
+t19 45q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -55 -18 -103.5t-37.5 -74.5t-59.5 -72q-34 -39 -52 -63t-43.5 -66.5t-37 -91t-11.5 -105.5q0 -106 -75 -181t-181 -75q-26 0 -45 -19t-19 -45t19 -45t45 -19q159 0 271.5 112.5t112.5 271.5q0 41 7.5 74
+t26.5 64t33.5 50t45.5 54q35 41 53 64.5t44 67.5t37.5 93.5t11.5 108.5q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5zM591 561l226 -226l-579 -579q-12 -12 -29 -12t-29 12l-168 168q-12 12 -12 29t12 29zM1612 1524l168 -168q12 -12 12 -29t-12 -30l-233 -233
+l-26 -25l-71 -71q-66 153 -195 258l91 91l207 207q13 12 30 12t29 -12z" />
+    <glyph glyph-name="uniF2A5" unicode="&#xf2a5;" 
+d="M866 1021q0 -27 -13 -94q-11 -50 -31.5 -150t-30.5 -150q-2 -11 -4.5 -12.5t-13.5 -2.5q-20 -2 -31 -2q-58 0 -84 49.5t-26 113.5q0 88 35 174t103 124q28 14 51 14q28 0 36.5 -16.5t8.5 -47.5zM1352 597q0 14 -39 75.5t-52 66.5q-21 8 -34 8q-91 0 -226 -77l-2 2
+q3 22 27.5 135t24.5 178q0 233 -242 233q-24 0 -68 -6q-94 -17 -168.5 -89.5t-111.5 -166.5t-37 -189q0 -146 80.5 -225t227.5 -79q25 0 25 -3t-1 -5q-4 -34 -26 -117q-14 -52 -51.5 -101t-82.5 -49q-42 0 -42 47q0 24 10.5 47.5t25 39.5t29.5 28.5t26 20t11 8.5q0 3 -7 10
+q-24 22 -58.5 36.5t-65.5 14.5q-35 0 -63.5 -34t-41 -75t-12.5 -75q0 -88 51.5 -142t138.5 -54q82 0 155 53t117.5 126t65.5 153q6 22 15.5 66.5t14.5 66.5q3 12 14 18q118 60 227 60q48 0 127 -18q1 -1 4 -1q5 0 9.5 4.5t4.5 8.5zM1536 1120v-960q0 -119 -84.5 -203.5
+t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF2A6" unicode="&#xf2a6;" horiz-adv-x="1535" 
+d="M744 1231q0 24 -2 38.5t-8.5 30t-21 23t-37.5 7.5q-39 0 -78 -23q-105 -58 -159 -190.5t-54 -269.5q0 -44 8.5 -85.5t26.5 -80.5t52.5 -62.5t81.5 -23.5q4 0 18 -0.5t20 0t16 3t15 8.5t7 16q16 77 48 231.5t48 231.5q19 91 19 146zM1498 575q0 -7 -7.5 -13.5t-15.5 -6.5
+l-6 1q-22 3 -62 11t-72 12.5t-63 4.5q-167 0 -351 -93q-15 -8 -21 -27q-10 -36 -24.5 -105.5t-22.5 -100.5q-23 -91 -70 -179.5t-112.5 -164.5t-154.5 -123t-185 -47q-135 0 -214.5 83.5t-79.5 219.5q0 53 19.5 117t63 116.5t97.5 52.5q38 0 120 -33.5t83 -61.5
+q0 -1 -16.5 -12.5t-39.5 -31t-46 -44.5t-39 -61t-16 -74q0 -33 16.5 -53t48.5 -20q45 0 85 31.5t66.5 78t48 105.5t32.5 107t16 90v9q0 2 -3.5 3.5t-8.5 1.5h-10t-10 -0.5t-6 -0.5q-227 0 -352 122.5t-125 348.5q0 108 34.5 221t96 210t156 167.5t204.5 89.5q52 9 106 9
+q374 0 374 -360q0 -98 -38 -273t-43 -211l3 -3q101 57 182.5 88t167.5 31q22 0 53 -13q19 -7 80 -102.5t61 -116.5z" />
+    <glyph glyph-name="uniF2A7" unicode="&#xf2a7;" horiz-adv-x="1664" 
+d="M831 863q32 0 59 -18l222 -148q61 -40 110 -97l146 -170q40 -46 29 -106l-72 -413q-6 -32 -29.5 -53.5t-55.5 -25.5l-527 -56l-352 -32h-9q-39 0 -67.5 28t-28.5 68q0 37 27 64t65 32l260 32h-448q-41 0 -69.5 30t-26.5 71q2 39 32 65t69 26l442 1l-521 64q-41 5 -66 37
+t-19 73q6 35 34.5 57.5t65.5 22.5h10l481 -60l-351 94q-38 10 -62 41.5t-18 68.5q6 36 33 58.5t62 22.5q6 0 20 -2l448 -96l217 -37q1 0 3 -0.5t3 -0.5q23 0 30.5 23t-12.5 36l-186 125q-35 23 -42 63.5t18 73.5q27 38 76 38zM761 661l186 -125l-218 37l-5 2l-36 38
+l-238 262q-1 1 -2.5 3.5t-2.5 3.5q-24 31 -18.5 70t37.5 64q31 23 68 17.5t64 -33.5l142 -147q-2 -1 -5 -3.5t-4 -4.5q-32 -45 -23 -99t55 -85zM1648 1115l15 -266q4 -73 -11 -147l-48 -219q-12 -59 -67 -87l-106 -54q2 62 -39 109l-146 170q-53 61 -117 103l-222 148
+q-34 23 -76 23q-51 0 -88 -37l-235 312q-25 33 -18 73.5t41 63.5q33 22 71.5 14t62.5 -40l266 -352l-262 455q-21 35 -10.5 75t47.5 59q35 18 72.5 6t57.5 -46l241 -420l-136 337q-15 35 -4.5 74t44.5 56q37 19 76 6t56 -51l193 -415l101 -196q8 -15 23 -17.5t27 7.5t11 26
+l-12 224q-2 41 26 71t69 31q39 0 67 -28.5t30 -67.5z" />
+    <glyph glyph-name="uniF2A8" unicode="&#xf2a8;" horiz-adv-x="1792" 
+d="M335 180q-2 0 -6 2q-86 57 -168.5 145t-139.5 180q-21 30 -21 69q0 9 2 19t4 18t7 18t8.5 16t10.5 17t10 15t12 15.5t11 14.5q184 251 452 365q-110 198 -110 211q0 19 17 29q116 64 128 64q18 0 28 -16l124 -229q92 19 192 19q266 0 497.5 -137.5t378.5 -369.5
+q20 -31 20 -69t-20 -69q-91 -142 -218.5 -253.5t-278.5 -175.5q110 -198 110 -211q0 -20 -17 -29q-116 -64 -127 -64q-19 0 -29 16l-124 229l-64 119l-444 820l7 7q-58 -24 -99 -47q3 -5 127 -234t243 -449t119 -223q0 -7 -9 -9q-13 -3 -72 -3q-57 0 -60 7l-456 841
+q-39 -28 -82 -68q24 -43 214 -393.5t190 -354.5q0 -10 -11 -10q-14 0 -82.5 22t-72.5 28l-106 197l-224 413q-44 -53 -78 -106q2 -3 18 -25t23 -34l176 -327q0 -10 -10 -10zM1165 282l49 -91q273 111 450 385q-180 277 -459 389q67 -64 103 -148.5t36 -176.5
+q0 -106 -47 -200.5t-132 -157.5zM848 896q0 -20 14 -34t34 -14q86 0 147 -61t61 -147q0 -20 14 -34t34 -14t34 14t14 34q0 126 -89 215t-215 89q-20 0 -34 -14t-14 -34zM1214 961l-9 4l7 -7z" />
+    <glyph glyph-name="uniF2A9" unicode="&#xf2a9;" horiz-adv-x="1280" 
+d="M1050 430q0 -215 -147 -374q-148 -161 -378 -161q-232 0 -378 161q-147 159 -147 374q0 147 68 270.5t189 196.5t268 73q96 0 182 -31q-32 -62 -39 -126q-66 28 -143 28q-167 0 -280.5 -123t-113.5 -291q0 -170 112.5 -288.5t281.5 -118.5t281 118.5t112 288.5
+q0 89 -32 166q66 13 123 49q41 -98 41 -212zM846 619q0 -192 -79.5 -345t-238.5 -253l-14 -1q-29 0 -62 5q83 32 146.5 102.5t99.5 154.5t58.5 189t30 192.5t7.5 178.5q0 69 -3 103q55 -160 55 -326zM791 947v-2q-73 214 -206 440q88 -59 142.5 -186.5t63.5 -251.5z
+M1035 744q-83 0 -160 75q218 120 290 247q19 37 21 56q-42 -94 -139.5 -166.5t-204.5 -97.5q-35 54 -35 113q0 37 17 79t43 68q46 44 157 74q59 16 106 58.5t74 100.5q74 -105 74 -253q0 -109 -24 -170q-32 -77 -88.5 -130.5t-130.5 -53.5z" />
+    <glyph glyph-name="uniF2AA" unicode="&#xf2aa;" 
+d="M1050 495q0 78 -28 147q-41 -25 -85 -34q22 -50 22 -114q0 -117 -77 -198.5t-193 -81.5t-193.5 81.5t-77.5 198.5q0 115 78 199.5t193 84.5q53 0 98 -19q4 43 27 87q-60 21 -125 21q-154 0 -257.5 -108.5t-103.5 -263.5t103.5 -261t257.5 -106t257.5 106.5t103.5 260.5z
+M872 850q2 -24 2 -71q0 -63 -5 -123t-20.5 -132.5t-40.5 -130t-68.5 -106t-100.5 -70.5q21 -3 42 -3h10q219 139 219 411q0 116 -38 225zM872 850q-4 80 -44 171.5t-98 130.5q92 -156 142 -302zM1207 955q0 102 -51 174q-41 -86 -124 -109q-69 -19 -109 -53.5t-40 -99.5
+q0 -40 24 -77q74 17 140.5 67t95.5 115q-4 -52 -74.5 -111.5t-138.5 -97.5q52 -52 110 -52q51 0 90 37t60 90q17 42 17 117zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5
+t84.5 -203.5z" />
+    <glyph glyph-name="uniF2AB" unicode="&#xf2ab;" 
+d="M1279 388q0 22 -22 27q-67 15 -118 59t-80 108q-7 19 -7 25q0 15 19.5 26t43 17t43 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-12 0 -32 -8t-31 -8q-4 0 -12 2q5 95 5 114q0 79 -17 114q-36 78 -103 121.5t-152 43.5q-199 0 -275 -165q-17 -35 -17 -114q0 -19 5 -114
+q-4 -2 -14 -2q-12 0 -32 7.5t-30 7.5q-21 0 -38.5 -12t-17.5 -32q0 -21 19.5 -35.5t43 -20.5t43 -17t19.5 -26q0 -6 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -46 137 -68q2 -5 6 -26t11.5 -30.5t23.5 -9.5q12 0 37.5 4.5t39.5 4.5q35 0 67 -15t54 -32.5t57.5 -32.5
+t76.5 -15q43 0 79 15t57.5 32.5t53.5 32.5t67 15q14 0 39.5 -4t38.5 -4q16 0 23 10t11 30t6 25q137 22 137 68zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5
+t103 -385.5z" />
+    <glyph glyph-name="uniF2AC" unicode="&#xf2ac;" horiz-adv-x="1664" 
+d="M848 1408q134 1 240.5 -68.5t163.5 -192.5q27 -58 27 -179q0 -47 -9 -191q14 -7 28 -7q18 0 51 13.5t51 13.5q29 0 56 -18t27 -46q0 -32 -31.5 -54t-69 -31.5t-69 -29t-31.5 -47.5q0 -15 12 -43q37 -82 102.5 -150t144.5 -101q28 -12 80 -23q28 -6 28 -35
+q0 -70 -219 -103q-7 -11 -11 -39t-14 -46.5t-33 -18.5q-20 0 -62 6.5t-64 6.5q-37 0 -62 -5q-32 -5 -63 -22.5t-58 -38t-58 -40.5t-76 -33.5t-99 -13.5q-52 0 -96.5 13.5t-75 33.5t-57.5 40.5t-58 38t-62 22.5q-26 5 -63 5q-24 0 -65.5 -7.5t-58.5 -7.5q-25 0 -35 18.5
+t-14 47.5t-11 40q-219 33 -219 103q0 29 28 35q52 11 80 23q78 32 144.5 101t102.5 150q12 28 12 43q0 28 -31.5 47.5t-69.5 29.5t-69.5 31.5t-31.5 52.5q0 27 26 45.5t55 18.5q15 0 48 -13t53 -13q18 0 32 7q-9 142 -9 190q0 122 27 180q64 137 172 198t264 63z" />
+    <glyph glyph-name="uniF2AD" unicode="&#xf2ad;" 
+d="M1280 388q0 22 -22 27q-67 14 -118 58t-80 109q-7 14 -7 25q0 15 19.5 26t42.5 17t42.5 20.5t19.5 36.5q0 19 -18.5 31.5t-38.5 12.5q-11 0 -31 -8t-32 -8q-4 0 -12 2q5 63 5 115q0 78 -17 114q-36 78 -102.5 121.5t-152.5 43.5q-198 0 -275 -165q-18 -38 -18 -115
+q0 -38 6 -114q-10 -2 -15 -2q-11 0 -31.5 8t-30.5 8q-20 0 -37.5 -12.5t-17.5 -32.5q0 -21 19.5 -35.5t42.5 -20.5t42.5 -17t19.5 -26q0 -11 -7 -25q-64 -138 -198 -167q-22 -5 -22 -27q0 -47 138 -69q2 -5 6 -26t11 -30.5t23 -9.5q13 0 38.5 5t38.5 5q35 0 67.5 -15
+t54.5 -32.5t57.5 -32.5t76.5 -15q43 0 79 15t57.5 32.5t54 32.5t67.5 15q13 0 39 -4.5t39 -4.5q15 0 22.5 9.5t11.5 31t5 24.5q138 22 138 69zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960
+q119 0 203.5 -84.5t84.5 -203.5z" />
+    <glyph glyph-name="uniF2AE" unicode="&#xf2ae;" horiz-adv-x="2304" 
+d="M2304 1536q-69 -46 -125 -92t-89 -81t-59.5 -71.5t-37.5 -57.5t-22 -44.5t-14 -29.5q-10 -18 -35.5 -136.5t-48.5 -164.5q-15 -29 -50 -60.5t-67.5 -50.5t-72.5 -41t-48 -28q-47 -31 -151 -231q-341 14 -630 -158q-92 -53 -303 -179q47 16 86 31t55 22l15 7
+q71 27 163 64.5t133.5 53.5t108 34.5t142.5 31.5q186 31 465 -7q1 0 10 -3q11 -6 14 -17t-3 -22l-194 -345q-15 -29 -47 -22q-128 24 -354 24q-146 0 -402 -44.5t-392 -46.5q-82 -1 -149 13t-107 37t-61 40t-33 34l-1 1v2q0 6 6 6q138 0 371 55q192 366 374.5 524t383.5 158
+q5 0 14.5 -0.5t38 -5t55 -12t61.5 -24.5t63 -39.5t54 -59t40 -82.5l102 177q2 4 21 42.5t44.5 86.5t61 109.5t84 133.5t100.5 137q66 82 128 141.5t121.5 96.5t92.5 53.5t88 39.5z" />
+    <glyph glyph-name="uniF2B0" unicode="&#xf2b0;" 
+d="M1322 640q0 -45 -5 -76l-236 14l224 -78q-19 -73 -58 -141l-214 103l177 -158q-44 -61 -107 -108l-157 178l103 -215q-61 -37 -140 -59l-79 228l14 -240q-38 -6 -76 -6t-76 6l14 238l-78 -226q-74 19 -140 59l103 215l-157 -178q-59 43 -108 108l178 158l-214 -104
+q-39 69 -58 141l224 79l-237 -14q-5 42 -5 76q0 35 5 77l238 -14l-225 79q19 73 58 140l214 -104l-177 159q46 61 107 108l158 -178l-103 215q67 39 140 58l77 -224l-13 236q36 6 75 6q38 0 76 -6l-14 -237l78 225q74 -19 140 -59l-103 -214l158 178q61 -47 107 -108
+l-177 -159l213 104q37 -62 58 -141l-224 -78l237 14q5 -31 5 -77zM1352 640q0 160 -78.5 295.5t-213 214t-292.5 78.5q-119 0 -227 -46.5t-186.5 -125t-124.5 -187.5t-46 -229q0 -119 46 -228t124.5 -187.5t186.5 -125t227 -46.5q158 0 292.5 78.5t213 214t78.5 294.5z
+M1425 1023v-766l-657 -383l-657 383v766l657 383zM768 -183l708 412v823l-708 411l-708 -411v-823zM1536 1088v-896l-768 -448l-768 448v896l768 448z" />
+    <glyph glyph-name="uniF2B1" unicode="&#xf2b1;" horiz-adv-x="1664" 
+d="M339 1318h691l-26 -72h-665q-110 0 -188.5 -79t-78.5 -189v-771q0 -95 60.5 -169.5t153.5 -93.5q23 -5 98 -5v-72h-45q-140 0 -239.5 100t-99.5 240v771q0 140 99.5 240t239.5 100zM1190 1536h247l-482 -1294q-23 -61 -40.5 -103.5t-45 -98t-54 -93.5t-64.5 -78.5
+t-79.5 -65t-95.5 -41t-116 -18.5v195q163 26 220 182q20 52 20 105q0 54 -20 106l-285 733h228l187 -585zM1664 978v-1111h-795q37 55 45 73h678v1038q0 85 -49.5 155t-129.5 99l25 67q101 -34 163.5 -123.5t62.5 -197.5z" />
+    <glyph glyph-name="uniF2B2" unicode="&#xf2b2;" horiz-adv-x="1792" 
+d="M852 1227q0 -29 -17 -52.5t-45 -23.5t-45 23.5t-17 52.5t17 52.5t45 23.5t45 -23.5t17 -52.5zM688 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50 -21.5t-20 -51.5v-114q0 -30 20.5 -52t49.5 -22q30 0 50.5 22t20.5 52zM860 -149v114q0 30 -20 51.5t-50 21.5t-50.5 -21.5
+t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22q29 0 49.5 22t20.5 52zM1034 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1208 -149v114q0 30 -20.5 51.5t-50.5 21.5t-50.5 -21.5t-20.5 -51.5v-114
+q0 -30 20.5 -52t50.5 -22t50.5 22t20.5 52zM1476 535q-84 -160 -232 -259.5t-323 -99.5q-123 0 -229.5 51.5t-178.5 137t-113 197.5t-41 232q0 88 21 174q-104 -175 -104 -390q0 -162 65 -312t185 -251q30 57 91 57q56 0 86 -50q32 50 87 50q56 0 86 -50q32 50 87 50t87 -50
+q30 50 86 50q28 0 52.5 -15.5t37.5 -40.5q112 94 177 231.5t73 287.5zM1326 564q0 75 -72 75q-17 0 -47 -6q-95 -19 -149 -19q-226 0 -226 243q0 86 30 204q-83 -127 -83 -275q0 -150 89 -260.5t235 -110.5q111 0 210 70q13 48 13 79zM884 1223q0 50 -32 89.5t-81 39.5
+t-81 -39.5t-32 -89.5q0 -51 31.5 -90.5t81.5 -39.5t81.5 39.5t31.5 90.5zM1513 884q0 96 -37.5 179t-113 137t-173.5 54q-77 0 -149 -35t-127 -94q-48 -159 -48 -268q0 -104 45.5 -157t147.5 -53q53 0 142 19q36 6 53 6q51 0 77.5 -28t26.5 -80q0 -26 -4 -46
+q75 68 117.5 165.5t42.5 200.5zM1792 667q0 -111 -33.5 -249.5t-93.5 -204.5q-58 -64 -195 -142.5t-228 -104.5l-4 -1v-114q0 -43 -29.5 -75t-72.5 -32q-56 0 -86 50q-32 -50 -87 -50t-87 50q-30 -50 -86 -50q-55 0 -87 50q-30 -50 -86 -50q-47 0 -75 33.5t-28 81.5
+q-90 -68 -198 -68q-118 0 -211 80q54 1 106 20q-113 31 -182 127q32 -7 71 -7q89 0 164 46q-192 192 -240 306q-24 56 -24 160q0 57 9 125.5t31.5 146.5t55 141t86.5 105t120 42q59 0 81 -52q19 29 42 54q2 3 12 13t13 16q10 15 23 38t25 42t28 39q87 111 211.5 177
+t260.5 66q35 0 62 -4q59 64 146 64q83 0 140 -57q5 -5 5 -12q0 -5 -6 -13.5t-12.5 -16t-16 -17l-10.5 -10.5q17 -6 36 -18t19 -24q0 -6 -16 -25q157 -138 197 -378q25 30 60 30q45 0 100 -49q90 -80 90 -279z" />
+    <glyph glyph-name="uniF2B3" unicode="&#xf2b3;" 
+d="M917 631q0 33 -6 64h-362v-132h217q-12 -76 -74.5 -120.5t-142.5 -44.5q-99 0 -169 71.5t-70 170.5t70 170.5t169 71.5q93 0 153 -59l104 101q-108 100 -257 100q-160 0 -272 -112.5t-112 -271.5t112 -271.5t272 -112.5q165 0 266.5 105t101.5 270zM1262 585h109v110
+h-109v110h-110v-110h-110v-110h110v-110h110v110zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
+    <glyph glyph-name="uniF2B4" unicode="&#xf2b4;" 
+d="M1536 1024v-839q0 -48 -49 -62q-174 -52 -338 -52q-73 0 -215.5 29.5t-227.5 29.5q-164 0 -370 -48v-338h-160v1368q-63 25 -101 81t-38 124q0 91 64 155t155 64t155 -64t64 -155q0 -68 -38 -124t-101 -81v-68q190 44 343 44q99 0 198 -15q14 -2 111.5 -22.5t149.5 -20.5
+q77 0 165 18q11 2 80 21t89 19q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B5" unicode="&#xf2b5;" horiz-adv-x="2304" 
+d="M192 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32zM1665 442q-10 13 -38.5 50t-41.5 54t-38 49t-42.5 53t-40.5 47t-45 49l-125 -140q-83 -94 -208.5 -92t-205.5 98q-57 69 -56.5 158t58.5 157l177 206q-22 11 -51 16.5t-47.5 6t-56.5 -0.5t-49 -1q-92 0 -158 -66
+l-158 -158h-155v-544q5 0 21 0.5t22 0t19.5 -2t20.5 -4.5t17.5 -8.5t18.5 -13.5l297 -292q115 -111 227 -111q78 0 125 47q57 -20 112.5 8t72.5 85q74 -6 127 44q20 18 36 45.5t14 50.5q10 -10 43 -10q43 0 77 21t49.5 53t12 71.5t-30.5 73.5zM1824 384h96v512h-93l-157 180
+q-66 76 -169 76h-167q-89 0 -146 -67l-209 -243q-28 -33 -28 -75t27 -75q43 -51 110 -52t111 49l193 218q25 23 53.5 21.5t47 -27t8.5 -56.5q16 -19 56 -63t60 -68q29 -36 82.5 -105.5t64.5 -84.5q52 -66 60 -140zM2112 384q40 0 56 32t0 64t-56 32t-56 -32t0 -64t56 -32z
+M2304 960v-640q0 -26 -19 -45t-45 -19h-434q-27 -65 -82 -106.5t-125 -51.5q-33 -48 -80.5 -81.5t-102.5 -45.5q-42 -53 -104.5 -81.5t-128.5 -24.5q-60 -34 -126 -39.5t-127.5 14t-117 53.5t-103.5 81l-287 282h-358q-26 0 -45 19t-19 45v672q0 26 19 45t45 19h421
+q14 14 47 48t47.5 48t44 40t50.5 37.5t51 25.5t62 19.5t68 5.5h117q99 0 181 -56q82 56 181 56h167q35 0 67 -6t56.5 -14.5t51.5 -26.5t44.5 -31t43 -39.5t39 -42t41 -48t41.5 -48.5h355q26 0 45 -19t19 -45z" />
+    <glyph glyph-name="uniF2B6" unicode="&#xf2b6;" horiz-adv-x="1792" 
+d="M1792 882v-978q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v978q0 15 11 24q8 7 39 34.5t41.5 36t45.5 37.5t70 55.5t96 73t143.5 107t192.5 140.5q5 4 52.5 40t71.5 52.5t64 35t69 18.5t69 -18.5t65 -35.5t71 -52t52 -40q110 -80 192.5 -140.5t143.5 -107
+t96 -73t70 -55.5t45.5 -37.5t41.5 -36t39 -34.5q11 -9 11 -24zM1228 297q263 191 345 252q11 8 12.5 20.5t-6.5 23.5l-38 52q-8 11 -21 12.5t-24 -6.5q-231 -169 -343 -250q-5 -3 -52 -39t-71.5 -52.5t-64.5 -35t-69 -18.5t-69 18.5t-64.5 35t-71.5 52.5t-52 39
+q-186 134 -343 250q-11 8 -24 6.5t-21 -12.5l-38 -52q-8 -11 -6.5 -23.5t12.5 -20.5q82 -61 345 -252q10 -8 50 -38t65 -47t64 -39.5t77.5 -33.5t75.5 -11t75.5 11t79 34.5t64.5 39.5t65 47.5t48 36.5z" />
+    <glyph glyph-name="uniF2B7" unicode="&#xf2b7;" horiz-adv-x="1792" 
+d="M1474 623l39 -51q8 -11 6.5 -23.5t-11.5 -20.5q-43 -34 -126.5 -98.5t-146.5 -113t-67 -51.5q-39 -32 -60 -48t-60.5 -41t-76.5 -36.5t-74 -11.5h-1h-1q-37 0 -74 11.5t-76 36.5t-61 41.5t-60 47.5q-5 4 -65 50.5t-143.5 111t-122.5 94.5q-11 8 -12.5 20.5t6.5 23.5
+l37 52q8 11 21.5 13t24.5 -7q94 -73 306 -236q5 -4 43.5 -35t60.5 -46.5t56.5 -32.5t58.5 -17h1h1q24 0 58.5 17t56.5 32.5t60.5 46.5t43.5 35q258 198 313 242q11 8 24 6.5t21 -12.5zM1664 -96v928q-90 83 -159 139q-91 74 -389 304q-3 2 -43 35t-61 48t-56 32.5t-59 17.5
+h-1h-1q-24 0 -59 -17.5t-56 -32.5t-61 -48t-43 -35q-215 -166 -315.5 -245.5t-129.5 -104t-82 -74.5q-14 -12 -21 -19v-928q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 832v-928q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v928q0 56 41 94
+q123 114 350 290.5t233 181.5q36 30 59 47.5t61.5 42t76 36.5t74.5 12h1h1q37 0 74.5 -12t76 -36.5t61.5 -42t59 -47.5q43 -36 156 -122t226 -177t201 -173q41 -38 41 -94z" />
+    <glyph glyph-name="uniF2B8" unicode="&#xf2b8;" 
+d="M330 1l202 -214l-34 236l-216 213zM556 -225l274 218l-11 245l-300 -215zM245 413l227 -213l-48 327l-245 204zM495 189l317 214l-14 324l-352 -200zM843 178l95 -80l-2 239l-103 79q0 -1 1 -8.5t0 -12t-5 -7.5l-78 -52l85 -70q7 -6 7 -88zM138 930l256 -200l-68 465
+l-279 173zM1173 267l15 234l-230 -164l2 -240zM417 722l373 194l-19 441l-423 -163zM1270 357l20 233l-226 142l-2 -105l144 -95q6 -4 4 -9l-7 -119zM1461 496l30 222l-179 -128l-20 -228zM1273 329l-71 49l-8 -117q0 -5 -4 -8l-234 -187q-7 -5 -14 0l-98 83l7 -161
+q0 -5 -4 -8l-293 -234q-4 -2 -6 -2q-8 2 -8 3l-228 242q-4 4 -59 277q-2 7 5 11l61 37q-94 86 -95 92l-72 351q-2 7 6 12l94 45q-133 100 -135 108l-96 466q-2 10 7 13l433 135q5 0 8 -1l317 -153q6 -4 6 -9l20 -463q0 -7 -6 -10l-118 -61l126 -85q5 -2 5 -8l5 -123l121 74
+q5 4 11 0l84 -56l3 110q0 6 5 9l206 126q6 3 11 0l245 -135q4 -4 5 -7t-6.5 -60t-17.5 -124.5t-10 -70.5q0 -5 -4 -7l-191 -153q-6 -5 -13 0z" />
+    <glyph glyph-name="uniF2B9" unicode="&#xf2b9;" horiz-adv-x="1664" 
+d="M1201 298q0 57 -5.5 107t-21 100.5t-39.5 86t-64 58t-91 22.5q-6 -4 -33.5 -20.5t-42.5 -24.5t-40.5 -20t-49 -17t-46.5 -5t-46.5 5t-49 17t-40.5 20t-42.5 24.5t-33.5 20.5q-51 0 -91 -22.5t-64 -58t-39.5 -86t-21 -100.5t-5.5 -107q0 -73 42 -121.5t103 -48.5h576
+q61 0 103 48.5t42 121.5zM1028 892q0 108 -76.5 184t-183.5 76t-183.5 -76t-76.5 -184q0 -107 76.5 -183t183.5 -76t183.5 76t76.5 183zM1664 352v-192q0 -14 -9 -23t-23 -9h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216
+q66 0 113 -47t47 -113v-224h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23v-192q0 -14 -9 -23t-23 -9h-96v-128h96q14 0 23 -9t9 -23z" />
+    <glyph glyph-name="uniF2BA" unicode="&#xf2ba;" horiz-adv-x="1664" 
+d="M1028 892q0 -107 -76.5 -183t-183.5 -76t-183.5 76t-76.5 183q0 108 76.5 184t183.5 76t183.5 -76t76.5 -184zM980 672q46 0 82.5 -17t60 -47.5t39.5 -67t24 -81t11.5 -82.5t3.5 -79q0 -67 -39.5 -118.5t-105.5 -51.5h-576q-66 0 -105.5 51.5t-39.5 118.5q0 48 4.5 93.5
+t18.5 98.5t36.5 91.5t63 64.5t93.5 26h5q7 -4 32 -19.5t35.5 -21t33 -17t37 -16t35 -9t39.5 -4.5t39.5 4.5t35 9t37 16t33 17t35.5 21t32 19.5zM1664 928q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-128h96
+q13 0 22.5 -9.5t9.5 -22.5v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-96v-224q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h1216q66 0 113 -47t47 -113v-224h96q13 0 22.5 -9.5t9.5 -22.5v-192zM1408 -96v1472q0 13 -9.5 22.5t-22.5 9.5h-1216
+q-13 0 -22.5 -9.5t-9.5 -22.5v-1472q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5z" />
+    <glyph glyph-name="uniF2BB" unicode="&#xf2bb;" horiz-adv-x="2048" 
+d="M1024 405q0 64 -9 117.5t-29.5 103t-60.5 78t-97 28.5q-6 -4 -30 -18t-37.5 -21.5t-35.5 -17.5t-43 -14.5t-42 -4.5t-42 4.5t-43 14.5t-35.5 17.5t-37.5 21.5t-30 18q-57 0 -97 -28.5t-60.5 -78t-29.5 -103t-9 -117.5t37 -106.5t91 -42.5h512q54 0 91 42.5t37 106.5z
+M867 925q0 94 -66.5 160.5t-160.5 66.5t-160.5 -66.5t-66.5 -160.5t66.5 -160.5t160.5 -66.5t160.5 66.5t66.5 160.5zM1792 416v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM1792 676v56q0 15 -10.5 25.5t-25.5 10.5h-568
+q-15 0 -25.5 -10.5t-10.5 -25.5v-56q0 -15 10.5 -25.5t25.5 -10.5h568q15 0 25.5 10.5t10.5 25.5zM1792 928v64q0 14 -9 23t-23 9h-576q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h576q14 0 23 9t9 23zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-352v96q0 14 -9 23t-23 9
+h-64q-14 0 -23 -9t-9 -23v-96h-768v96q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-96h-352q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BC" unicode="&#xf2bc;" horiz-adv-x="2048" 
+d="M1024 405q0 -64 -37 -106.5t-91 -42.5h-512q-54 0 -91 42.5t-37 106.5t9 117.5t29.5 103t60.5 78t97 28.5q6 -4 30 -18t37.5 -21.5t35.5 -17.5t43 -14.5t42 -4.5t42 4.5t43 14.5t35.5 17.5t37.5 21.5t30 18q57 0 97 -28.5t60.5 -78t29.5 -103t9 -117.5zM867 925
+q0 -94 -66.5 -160.5t-160.5 -66.5t-160.5 66.5t-66.5 160.5t66.5 160.5t160.5 66.5t160.5 -66.5t66.5 -160.5zM1792 480v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1792 732v-56q0 -15 -10.5 -25.5t-25.5 -10.5h-568
+q-15 0 -25.5 10.5t-10.5 25.5v56q0 15 10.5 25.5t25.5 10.5h568q15 0 25.5 -10.5t10.5 -25.5zM1792 992v-64q0 -14 -9 -23t-23 -9h-576q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h576q14 0 23 -9t9 -23zM1920 32v1216q0 13 -9.5 22.5t-22.5 9.5h-1728q-13 0 -22.5 -9.5
+t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h352v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h768v96q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-96h352q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113
+t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2BD" unicode="&#xf2bd;" horiz-adv-x="1792" 
+d="M1523 197q-22 155 -87.5 257.5t-184.5 118.5q-67 -74 -159.5 -115.5t-195.5 -41.5t-195.5 41.5t-159.5 115.5q-119 -16 -184.5 -118.5t-87.5 -257.5q106 -150 271 -237.5t356 -87.5t356 87.5t271 237.5zM1280 896q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5
+t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1792 640q0 -182 -71 -347.5t-190.5 -286t-285.5 -191.5t-349 -71q-182 0 -348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2BE" unicode="&#xf2be;" horiz-adv-x="1792" 
+d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348q0 -181 -70.5 -347t-190.5 -286t-286 -191.5t-349 -71.5t-349 71t-285.5 191.5t-190.5 286t-71 347.5t71 348t191 286t286 191t348 71zM1515 185q149 205 149 455q0 156 -61 298t-164 245t-245 164t-298 61t-298 -61
+t-245 -164t-164 -245t-61 -298q0 -250 149 -455q66 327 306 327q131 -128 313 -128t313 128q240 0 306 -327zM1280 832q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5z" />
+    <glyph glyph-name="uniF2C0" unicode="&#xf2c0;" 
+d="M1201 752q47 -14 89.5 -38t89 -73t79.5 -115.5t55 -172t22 -236.5q0 -154 -100 -263.5t-241 -109.5h-854q-141 0 -241 109.5t-100 263.5q0 131 22 236.5t55 172t79.5 115.5t89 73t89.5 38q-79 125 -79 272q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5
+t198.5 -40.5t163.5 -109.5t109.5 -163.5t40.5 -198.5q0 -147 -79 -272zM768 1408q-159 0 -271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5zM1195 -128q88 0 150.5 71.5t62.5 173.5q0 239 -78.5 377t-225.5 145
+q-145 -127 -336 -127t-336 127q-147 -7 -225.5 -145t-78.5 -377q0 -102 62.5 -173.5t150.5 -71.5h854z" />
+    <glyph glyph-name="uniF2C1" unicode="&#xf2c1;" horiz-adv-x="1280" 
+d="M1024 278q0 -64 -37 -107t-91 -43h-512q-54 0 -91 43t-37 107t9 118t29.5 104t61 78.5t96.5 28.5q80 -75 188 -75t188 75q56 0 96.5 -28.5t61 -78.5t29.5 -104t9 -118zM870 797q0 -94 -67.5 -160.5t-162.5 -66.5t-162.5 66.5t-67.5 160.5t67.5 160.5t162.5 66.5
+t162.5 -66.5t67.5 -160.5zM1152 -96v1376h-1024v-1376q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1280 1376v-1472q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v1472q0 66 47 113t113 47h352v-96q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v96h352
+q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C2" unicode="&#xf2c2;" horiz-adv-x="2048" 
+d="M896 324q0 54 -7.5 100.5t-24.5 90t-51 68.5t-81 25q-64 -64 -156 -64t-156 64q-47 0 -81 -25t-51 -68.5t-24.5 -90t-7.5 -100.5q0 -55 31.5 -93.5t75.5 -38.5h426q44 0 75.5 38.5t31.5 93.5zM768 768q0 80 -56 136t-136 56t-136 -56t-56 -136t56 -136t136 -56t136 56
+t56 136zM1792 288v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1408 544v64q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1792 544v64q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23
+v-64q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1792 800v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM128 1152h1792v96q0 14 -9 23t-23 9h-1728q-14 0 -23 -9t-9 -23v-96zM2048 1248v-1216q0 -66 -47 -113t-113 -47h-1728
+q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C3" unicode="&#xf2c3;" horiz-adv-x="2048" 
+d="M896 324q0 -55 -31.5 -93.5t-75.5 -38.5h-426q-44 0 -75.5 38.5t-31.5 93.5q0 54 7.5 100.5t24.5 90t51 68.5t81 25q64 -64 156 -64t156 64q47 0 81 -25t51 -68.5t24.5 -90t7.5 -100.5zM768 768q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136z
+M1792 352v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1408 608v-64q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h320q14 0 23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v64
+q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 864v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704q14 0 23 -9t9 -23zM1920 32v1120h-1792v-1120q0 -13 9.5 -22.5t22.5 -9.5h1728q13 0 22.5 9.5t9.5 22.5zM2048 1248v-1216q0 -66 -47 -113t-113 -47
+h-1728q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1728q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2C4" unicode="&#xf2c4;" horiz-adv-x="1792" 
+d="M1255 749q0 318 -105 474.5t-330 156.5q-222 0 -326 -157t-104 -474q0 -316 104 -471.5t326 -155.5q74 0 131 17q-22 43 -39 73t-44 65t-53.5 56.5t-63 36t-77.5 14.5q-46 0 -79 -16l-49 97q105 91 276 91q132 0 215.5 -54t150.5 -155q67 149 67 402zM1645 117h117
+q3 -27 -2 -67t-26.5 -95t-58 -100.5t-107 -78t-162.5 -32.5q-71 0 -130.5 19t-105.5 56t-79 78t-66 96q-97 -27 -205 -27q-150 0 -292.5 58t-253 158.5t-178 249t-67.5 317.5q0 170 67.5 319.5t178.5 250.5t253.5 159t291.5 58q121 0 238.5 -36t217 -106t176 -164.5
+t119.5 -219t43 -261.5q0 -190 -80.5 -347.5t-218.5 -264.5q47 -70 93.5 -106.5t104.5 -36.5q61 0 94 37.5t38 85.5z" />
+    <glyph glyph-name="uniF2C5" unicode="&#xf2c5;" horiz-adv-x="2304" 
+d="M453 -101q0 -21 -16 -37.5t-37 -16.5q-1 0 -13 3q-63 15 -162 140q-225 284 -225 676q0 341 213 614q39 51 95 103.5t94 52.5q19 0 35 -13.5t16 -32.5q0 -27 -63 -90q-98 -102 -147 -184q-119 -199 -119 -449q0 -281 123 -491q50 -85 136 -173q2 -3 14.5 -16t19.5 -21
+t17 -20.5t14.5 -23.5t4.5 -21zM1796 33q0 -29 -17.5 -48.5t-46.5 -19.5h-1081q-26 0 -45 19t-19 45q0 29 17.5 48.5t46.5 19.5h1081q26 0 45 -19t19 -45zM1581 644q0 -134 -67 -233q-25 -38 -69.5 -78.5t-83.5 -60.5q-16 -10 -27 -10q-7 0 -15 6t-8 12q0 9 19 30t42 46
+t42 67.5t19 88.5q0 76 -35 130q-29 42 -46 42q-3 0 -3 -5q0 -12 7.5 -35.5t7.5 -36.5q0 -22 -21.5 -35t-44.5 -13q-66 0 -66 76q0 15 1.5 44t1.5 44q0 25 -10 46q-13 25 -42 53.5t-51 28.5q-5 0 -7 -0.5t-3.5 -2.5t-1.5 -6q0 -2 16 -26t16 -54q0 -37 -19 -68t-46 -54
+t-53.5 -46t-45.5 -54t-19 -68q0 -98 42 -160q29 -43 79 -63q16 -5 17 -10q1 -2 1 -5q0 -16 -18 -16q-6 0 -33 11q-119 43 -195 139.5t-76 218.5q0 55 24.5 115.5t60 115t70.5 108.5t59.5 113.5t24.5 111.5q0 53 -25 94q-29 48 -56 64q-19 9 -19 21q0 20 41 20q50 0 110 -29
+q41 -19 71 -44.5t49.5 -51t33.5 -62.5t22 -69t16 -80q0 -1 3 -17.5t4.5 -25t5.5 -25t9 -27t11 -21.5t14.5 -16.5t18.5 -5.5q23 0 37 14t14 37q0 25 -20 67t-20 52t10 10q27 0 93 -70q72 -76 102.5 -156t30.5 -186zM2304 615q0 -274 -138 -503q-19 -32 -48 -72t-68 -86.5
+t-81 -77t-74 -30.5q-16 0 -31 15.5t-15 31.5q0 15 29 50.5t68.5 77t48.5 52.5q183 230 183 531q0 131 -20.5 235t-72.5 211q-58 119 -163 228q-2 3 -13 13.5t-16.5 16.5t-15 17.5t-15 20t-9.5 18.5t-4 19q0 19 16 35.5t35 16.5q70 0 196 -169q98 -131 146 -273t60 -314
+q2 -42 2 -64z" />
+    <glyph glyph-name="uniF2C6" unicode="&#xf2c6;" horiz-adv-x="1792" 
+d="M1189 229l147 693q9 44 -10.5 63t-51.5 7l-864 -333q-29 -11 -39.5 -25t-2.5 -26.5t32 -19.5l221 -69l513 323q21 14 32 6q7 -5 -4 -15l-415 -375v0v0l-16 -228q23 0 45 22l108 104l224 -165q64 -36 81 38zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71
+t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2C7" unicode="&#xf2c7;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v907h128v-907q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C8" unicode="&#xf2c8;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v651h128v-651q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2C9" unicode="&#xf2c9;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v395h128v-395q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CA" unicode="&#xf2ca;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 60 35 110t93 71v139h128v-139q58 -21 93 -71t35 -110zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5
+t93.5 226.5zM896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192
+v128h192z" />
+    <glyph glyph-name="uniF2CB" unicode="&#xf2cb;" horiz-adv-x="1024" 
+d="M640 192q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 79 56 135.5t136 56.5t136 -56.5t56 -135.5zM768 192q0 77 -34 144t-94 112v768q0 80 -56 136t-136 56t-136 -56t-56 -136v-768q-60 -45 -94 -112t-34 -144q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5z
+M896 192q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 182 128 313v711q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5v-711q128 -131 128 -313zM1024 768v-128h-192v128h192zM1024 1024v-128h-192v128h192zM1024 1280v-128h-192v128h192z" />
+    <glyph glyph-name="uniF2CC" unicode="&#xf2cc;" horiz-adv-x="1920" 
+d="M1433 1287q10 -10 10 -23t-10 -23l-626 -626q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l44 44q-72 91 -81.5 207t46.5 215q-74 71 -176 71q-106 0 -181 -75t-75 -181v-1280h-256v1280q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5q106 0 201 -41
+t166 -115q94 39 197 24.5t185 -79.5l44 44q10 10 23 10t23 -10zM1344 1024q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1600 896q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1856 1024q26 0 45 -19t19 -45t-19 -45t-45 -19
+t-45 19t-19 45t19 45t45 19zM1216 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1408 832q0 26 19 45t45 19t45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45zM1728 896q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 768
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 640q-26 0 -45 19t-19 45t19 45t45 19t45 -19t19 -45t-19 -45t-45 -19zM1600 768q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 512q-26 0 -45 19t-19 45t19 45t45 19t45 -19
+t19 -45t-19 -45t-45 -19zM1472 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1344 512q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1216 384
+q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1088 256q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19z" />
+    <glyph glyph-name="uniF2CD" unicode="&#xf2cd;" horiz-adv-x="1792" 
+d="M1664 448v-192q0 -169 -128 -286v-194q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v118q-63 -22 -128 -22h-768q-65 0 -128 22v-110q0 -17 -9.5 -28.5t-22.5 -11.5h-64q-13 0 -22.5 11.5t-9.5 28.5v186q-128 117 -128 286v192h1536zM704 864q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM768 928q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM704 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 992q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1056q0 -14 -9 -23t-23 -9t-23 9
+t-9 23t9 23t23 9t23 -9t9 -23zM704 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1792 608v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h96v640q0 106 75 181t181 75q108 0 184 -78q46 19 98 12t93 -39l22 22q11 11 22 0l42 -42
+q11 -11 0 -22l-314 -314q-11 -11 -22 0l-42 42q-11 11 0 22l22 22q-36 46 -40.5 104t23.5 108q-37 35 -88 35q-53 0 -90.5 -37.5t-37.5 -90.5v-640h1504q14 0 23 -9t9 -23zM896 1056q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1120q0 -14 -9 -23t-23 -9
+t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM768 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1120q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM896 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM832 1248q0 -14 -9 -23
+t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1024 1184q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM960 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23zM1088 1248q0 -14 -9 -23t-23 -9t-23 9t-9 23t9 23t23 9t23 -9t9 -23z" />
+    <glyph glyph-name="uniF2CE" unicode="&#xf2ce;" 
+d="M994 344q0 -86 -17 -197q-31 -215 -55 -313q-22 -90 -152 -90t-152 90q-24 98 -55 313q-17 110 -17 197q0 168 224 168t224 -168zM1536 768q0 -240 -134 -434t-350 -280q-8 -3 -15 3t-6 15q7 48 10 66q4 32 6 47q1 9 9 12q159 81 255.5 234t96.5 337q0 180 -91 330.5
+t-247 234.5t-337 74q-124 -7 -237 -61t-193.5 -140.5t-128 -202t-46.5 -240.5q1 -184 99 -336.5t257 -231.5q7 -3 9 -12q3 -21 6 -45q1 -9 5 -32.5t6 -35.5q1 -9 -6.5 -15t-15.5 -2q-148 58 -261 169.5t-173.5 264t-52.5 319.5q7 143 66 273.5t154.5 227t225 157.5t272.5 70
+q164 10 315.5 -46.5t261 -160.5t175 -250.5t65.5 -308.5zM994 800q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5zM1282 768q0 -122 -53.5 -228.5t-146.5 -177.5q-8 -6 -16 -2t-10 14q-6 52 -29 92q-7 10 3 20
+q58 54 91 127t33 155q0 111 -58.5 204t-157.5 141.5t-212 36.5q-133 -15 -229 -113t-109 -231q-10 -92 23.5 -176t98.5 -144q10 -10 3 -20q-24 -41 -29 -93q-2 -9 -10 -13t-16 2q-95 74 -148.5 183t-51.5 234q3 131 69 244t177 181.5t241 74.5q144 7 268 -60t196.5 -187.5
+t72.5 -263.5z" />
+    <glyph glyph-name="uniF2D0" unicode="&#xf2d0;" horiz-adv-x="1792" 
+d="M256 128h1280v768h-1280v-768zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D1" unicode="&#xf2d1;" horiz-adv-x="1792" 
+d="M1792 224v-192q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D2" unicode="&#xf2d2;" horiz-adv-x="2048" 
+d="M256 0h768v512h-768v-512zM1280 512h512v768h-768v-256h96q66 0 113 -47t47 -113v-352zM2048 1376v-960q0 -66 -47 -113t-113 -47h-608v-352q0 -66 -47 -113t-113 -47h-960q-66 0 -113 47t-47 113v960q0 66 47 113t113 47h608v352q0 66 47 113t113 47h960q66 0 113 -47
+t47 -113z" />
+    <glyph glyph-name="uniF2D3" unicode="&#xf2d3;" horiz-adv-x="1792" 
+d="M1175 215l146 146q10 10 10 23t-10 23l-233 233l233 233q10 10 10 23t-10 23l-146 146q-10 10 -23 10t-23 -10l-233 -233l-233 233q-10 10 -23 10t-23 -10l-146 -146q-10 -10 -10 -23t10 -23l233 -233l-233 -233q-10 -10 -10 -23t10 -23l146 -146q10 -10 23 -10t23 10
+l233 233l233 -233q10 -10 23 -10t23 10zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D4" unicode="&#xf2d4;" horiz-adv-x="1792" 
+d="M1257 425l-146 -146q-10 -10 -23 -10t-23 10l-169 169l-169 -169q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l169 169l-169 169q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l169 -169l169 169q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23
+l-169 -169l169 -169q10 -10 10 -23t-10 -23zM256 128h1280v1024h-1280v-1024zM1792 1248v-1216q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D5" unicode="&#xf2d5;" horiz-adv-x="1792" 
+d="M1070 358l306 564h-654l-306 -564h654zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2D6" unicode="&#xf2d6;" horiz-adv-x="1794" 
+d="M1291 1060q-15 17 -35 8.5t-26 -28.5t5 -38q14 -17 40 -14.5t34 20.5t-18 52zM895 814q-8 -8 -19.5 -8t-18.5 8q-8 8 -8 19t8 18q7 8 18.5 8t19.5 -8q7 -7 7 -18t-7 -19zM1060 740l-35 -35q-12 -13 -29.5 -13t-30.5 13l-38 38q-12 13 -12 30t12 30l35 35q12 12 29.5 12
+t30.5 -12l38 -39q12 -12 12 -29.5t-12 -29.5zM951 870q-7 -8 -18.5 -8t-19.5 8q-7 8 -7 19t7 19q8 8 19 8t19 -8t8 -19t-8 -19zM1354 968q-34 -64 -107.5 -85.5t-127.5 16.5q-38 28 -61 66.5t-21 87.5t39 92t75.5 53t70.5 -5t70 -51q2 -2 13 -12.5t14.5 -13.5t13 -13.5
+t12.5 -15.5t10 -15.5t8.5 -18t4 -18.5t1 -21t-5 -22t-9.5 -24zM1555 486q3 20 -8.5 34.5t-27.5 21.5t-33 17t-23 20q-40 71 -84 98.5t-113 11.5q19 13 40 18.5t33 4.5l12 -1q2 45 -34 90q6 20 6.5 40.5t-2.5 30.5l-3 10q43 24 71 65t34 91q10 84 -43 150.5t-137 76.5
+q-60 7 -114 -18.5t-82 -74.5q-30 -51 -33.5 -101t14.5 -87t43.5 -64t56.5 -42q-45 4 -88 36t-57 88q-28 108 32 222q-16 21 -29 32q-50 0 -89 -19q19 24 42 37t36 14l13 1q0 50 -13 78q-10 21 -32.5 28.5t-47 -3.5t-37.5 -40q2 4 4 7q-7 -28 -6.5 -75.5t19 -117t48.5 -122.5
+q-25 -14 -47 -36q-35 -16 -85.5 -70.5t-84.5 -101.5l-33 -46q-90 -34 -181 -125.5t-75 -162.5q1 -16 11 -27q-15 -12 -30 -30q-21 -25 -21 -54t21.5 -40t63.5 6q41 19 77 49.5t55 60.5q-2 2 -6.5 5t-20.5 7.5t-33 3.5q23 5 51 12.5t40 10t27.5 6t26 4t23.5 0.5q14 -7 22 34
+q7 37 7 90q0 102 -40 150q106 -103 101 -219q-1 -29 -15 -50t-27 -27l-13 -6q-4 -7 -19 -32t-26 -45.5t-26.5 -52t-25 -61t-17 -63t-6.5 -66.5t10 -63q-35 54 -37 80q-22 -24 -34.5 -39t-33.5 -42t-30.5 -46t-16.5 -41t-0.5 -38t25.5 -27q45 -25 144 64t190.5 221.5
+t122.5 228.5q86 52 145 115.5t86 119.5q47 -93 154 -178q104 -83 167 -80q39 2 46 43zM1794 640q0 -182 -71 -348t-191 -286t-286.5 -191t-348.5 -71t-348.5 71t-286.5 191t-191 286t-71 348t71 348t191 286t286.5 191t348.5 71t348.5 -71t286.5 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2D7" unicode="&#xf2d7;" 
+d="M518 1353v-655q103 -1 191.5 1.5t125.5 5.5l37 3q68 2 90.5 24.5t39.5 94.5l33 142h103l-14 -322l7 -319h-103l-29 127q-15 68 -45 93t-84 26q-87 8 -352 8v-556q0 -78 43.5 -115.5t133.5 -37.5h357q35 0 59.5 2t55 7.5t54 18t48.5 32t46 50.5t39 73l93 216h89
+q-6 -37 -31.5 -252t-30.5 -276q-146 5 -263.5 8t-162.5 4h-44h-628l-376 -12v102l127 25q67 13 91.5 37t25.5 79l8 643q3 402 -8 645q-2 61 -25.5 84t-91.5 36l-127 24v102l376 -12h702q139 0 374 27q-6 -68 -14 -194.5t-12 -219.5l-5 -92h-93l-32 124q-31 121 -74 179.5
+t-113 58.5h-548q-28 0 -35.5 -8.5t-7.5 -30.5z" />
+    <glyph glyph-name="uniF2D8" unicode="&#xf2d8;" 
+d="M922 739v-182q0 -4 0.5 -15t0 -15l-1.5 -12t-3.5 -11.5t-6.5 -7.5t-11 -5.5t-16 -1.5v309q9 0 16 -1t11 -5t6.5 -5.5t3.5 -9.5t1 -10.5v-13.5v-14zM1238 643v-121q0 -1 0.5 -12.5t0 -15.5t-2.5 -11.5t-7.5 -10.5t-13.5 -3q-9 0 -14 9q-4 10 -4 165v7v8.5v9t1.5 8.5l3.5 7
+t5 5.5t8 1.5q6 0 10 -1.5t6.5 -4.5t4 -6t2 -8.5t0.5 -8v-9.5v-9zM180 407h122v472h-122v-472zM614 407h106v472h-159l-28 -221q-20 148 -32 221h-158v-472h107v312l45 -312h76l43 319v-319zM1039 712q0 67 -5 90q-3 16 -11 28.5t-17 20.5t-25 14t-26.5 8.5t-31 4t-29 1.5
+h-29.5h-12h-91v-472h56q169 -1 197 24.5t25 180.5q-1 62 -1 100zM1356 515v133q0 29 -2 45t-9.5 33.5t-24.5 25t-46 7.5q-46 0 -77 -34v154h-117v-472h110l7 30q30 -36 77 -36q50 0 66 30.5t16 83.5zM1536 1248v-1216q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113
+v1216q0 66 47 113t113 47h1216q66 0 113 -47t47 -113z" />
+    <glyph glyph-name="uniF2D9" unicode="&#xf2d9;" horiz-adv-x="2176" 
+d="M1143 -197q-6 1 -11 4q-13 8 -36 23t-86 65t-116.5 104.5t-112 140t-89.5 172.5q-17 3 -175 37q66 -213 235 -362t391 -184zM502 409l168 -28q-25 76 -41 167.5t-19 145.5l-4 53q-84 -82 -121 -224q5 -65 17 -114zM612 1018q-43 -64 -77 -148q44 46 74 68zM2049 584
+q0 161 -62 307t-167.5 252t-250.5 168.5t-304 62.5q-147 0 -281 -52.5t-240 -148.5q-30 -58 -45 -160q60 51 143 83.5t158.5 43t143 13.5t108.5 -1l40 -3q33 -1 53 -15.5t24.5 -33t6.5 -37t-1 -28.5q-126 11 -227.5 0.5t-183 -43.5t-142.5 -71.5t-131 -98.5
+q4 -36 11.5 -92.5t35.5 -178t62 -179.5q123 -6 247.5 14.5t214.5 53.5t162.5 67t109.5 59l37 24q22 16 39.5 20.5t30.5 -5t17 -34.5q14 -97 -39 -121q-208 -97 -467 -134q-135 -20 -317 -16q41 -96 110 -176.5t137 -127t130.5 -79t101.5 -43.5l39 -12q143 -23 263 15
+q195 99 314 289t119 418zM2123 621q-14 -135 -40 -212q-70 -208 -181.5 -346.5t-318.5 -253.5q-48 -33 -82 -44q-72 -26 -163 -16q-36 -3 -73 -3q-283 0 -504.5 173t-295.5 442q-1 0 -4 0.5t-5 0.5q-6 -50 2.5 -112.5t26 -115t36 -98t31.5 -71.5l14 -26q8 -12 54 -82
+q-71 38 -124.5 106.5t-78.5 140t-39.5 137t-17.5 107.5l-2 42q-5 2 -33.5 12.5t-48.5 18t-53 20.5t-57.5 25t-50 25.5t-42.5 27t-25 25.5q19 -10 50.5 -25.5t113 -45.5t145.5 -38l2 32q11 149 94 290q41 202 176 365q28 115 81 214q15 28 32 45t49 32q158 74 303.5 104
+t302 11t306.5 -97q220 -115 333 -336t87 -474z" />
+    <glyph glyph-name="uniF2DA" unicode="&#xf2da;" horiz-adv-x="1792" 
+d="M1341 752q29 44 -6.5 129.5t-121.5 142.5q-58 39 -125.5 53.5t-118 4.5t-68.5 -37q-12 -23 -4.5 -28t42.5 -10q23 -3 38.5 -5t44.5 -9.5t56 -17.5q36 -13 67.5 -31.5t53 -37t40 -38.5t30.5 -38t22 -34.5t16.5 -28.5t12 -18.5t10.5 -6t11 9.5zM1704 178
+q-52 -127 -148.5 -220t-214.5 -141.5t-253 -60.5t-266 13.5t-251 91t-210 161.5t-141.5 235.5t-46.5 303.5q1 41 8.5 84.5t12.5 64t24 80.5t23 73q-51 -208 1 -397t173 -318t291 -206t346 -83t349 74.5t289 244.5q20 27 18 14q0 -4 -4 -14zM1465 627q0 -104 -40.5 -199
+t-108.5 -164t-162 -109.5t-198 -40.5t-198 40.5t-162 109.5t-108.5 164t-40.5 199t40.5 199t108.5 164t162 109.5t198 40.5t198 -40.5t162 -109.5t108.5 -164t40.5 -199zM1752 915q-65 147 -180.5 251t-253 153.5t-292 53.5t-301 -36.5t-275.5 -129t-220 -211.5t-131 -297
+t-10 -373q-49 161 -51.5 311.5t35.5 272.5t109 227t165.5 180.5t207 126t232 71t242.5 9t236 -54t216 -124.5t178 -197q33 -50 62 -121t31 -112zM1690 573q12 244 -136.5 416t-396.5 240q-8 0 -10 5t24 8q125 -4 230 -50t173 -120t116 -168.5t58.5 -199t-1 -208
+t-61.5 -197.5t-122.5 -167t-185 -117.5t-248.5 -46.5q108 30 201.5 80t174 123t129.5 176.5t55 225.5z" />
+    <glyph glyph-name="uniF2DB" unicode="&#xf2db;" 
+d="M192 256v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 512v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 768v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16
+q0 16 16 16h112zM192 1024v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM192 1280v-128h-112q-16 0 -16 16v16h-48q-16 0 -16 16v32q0 16 16 16h48v16q0 16 16 16h112zM1280 1440v-1472q0 -40 -28 -68t-68 -28h-832q-40 0 -68 28
+t-28 68v1472q0 40 28 68t68 28h832q40 0 68 -28t28 -68zM1536 208v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 464v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 720v-32
+q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 976v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16h48q16 0 16 -16zM1536 1232v-32q0 -16 -16 -16h-48v-16q0 -16 -16 -16h-112v128h112q16 0 16 -16v-16
+h48q16 0 16 -16z" />
+    <glyph glyph-name="uniF2DC" unicode="&#xf2dc;" horiz-adv-x="1664" 
+d="M1566 419l-167 -33l186 -107q23 -13 29.5 -38.5t-6.5 -48.5q-14 -23 -39 -29.5t-48 6.5l-186 106l55 -160q13 -38 -12 -63.5t-60.5 -20.5t-48.5 42l-102 300l-271 156v-313l208 -238q16 -18 17 -39t-11 -36.5t-28.5 -25t-37 -5.5t-36.5 22l-112 128v-214q0 -26 -19 -45
+t-45 -19t-45 19t-19 45v214l-112 -128q-16 -18 -36.5 -22t-37 5.5t-28.5 25t-11 36.5t17 39l208 238v313l-271 -156l-102 -300q-13 -37 -48.5 -42t-60.5 20.5t-12 63.5l55 160l-186 -106q-23 -13 -48 -6.5t-39 29.5q-13 23 -6.5 48.5t29.5 38.5l186 107l-167 33
+q-29 6 -42 29t-8.5 46.5t25.5 40t50 10.5l310 -62l271 157l-271 157l-310 -62q-4 -1 -13 -1q-27 0 -44 18t-19 40t11 43t40 26l167 33l-186 107q-23 13 -29.5 38.5t6.5 48.5t39 30t48 -7l186 -106l-55 160q-13 38 12 63.5t60.5 20.5t48.5 -42l102 -300l271 -156v313
+l-208 238q-16 18 -17 39t11 36.5t28.5 25t37 5.5t36.5 -22l112 -128v214q0 26 19 45t45 19t45 -19t19 -45v-214l112 128q16 18 36.5 22t37 -5.5t28.5 -25t11 -36.5t-17 -39l-208 -238v-313l271 156l102 300q13 37 48.5 42t60.5 -20.5t12 -63.5l-55 -160l186 106
+q23 13 48 6.5t39 -29.5q13 -23 6.5 -48.5t-29.5 -38.5l-186 -107l167 -33q27 -5 40 -26t11 -43t-19 -40t-44 -18q-9 0 -13 1l-310 62l-271 -157l271 -157l310 62q29 6 50 -10.5t25.5 -40t-8.5 -46.5t-42 -29z" />
+    <glyph glyph-name="uniF2DD" unicode="&#xf2dd;" horiz-adv-x="1792" 
+d="M1473 607q7 118 -33 226.5t-113 189t-177 131t-221 57.5q-116 7 -225.5 -32t-192 -110.5t-135 -175t-59.5 -220.5q-7 -118 33 -226.5t113 -189t177.5 -131t221.5 -57.5q155 -9 293 59t224 195.5t94 283.5zM1792 1536l-349 -348q120 -117 180.5 -272t50.5 -321
+q-11 -183 -102 -339t-241 -255.5t-332 -124.5l-999 -132l347 347q-120 116 -180.5 271.5t-50.5 321.5q11 184 102 340t241.5 255.5t332.5 124.5q167 22 500 66t500 66z" />
+    <glyph glyph-name="uniF2DE" unicode="&#xf2de;" horiz-adv-x="1792" 
+d="M948 508l163 -329h-51l-175 350l-171 -350h-49l179 374l-78 33l21 49l240 -102l-21 -50zM563 1100l304 -130l-130 -304l-304 130zM907 915l240 -103l-103 -239l-239 102zM1188 765l191 -81l-82 -190l-190 81zM1680 640q0 159 -62 304t-167.5 250.5t-250.5 167.5t-304 62
+t-304 -62t-250.5 -167.5t-167.5 -250.5t-62 -304t62 -304t167.5 -250.5t250.5 -167.5t304 -62t304 62t250.5 167.5t167.5 250.5t62 304zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71
+t286 -191t191 -286t71 -348z" />
+    <glyph glyph-name="uniF2E0" unicode="&#xf2e0;" horiz-adv-x="1920" 
+d="M1334 302q-4 24 -27.5 34t-49.5 10.5t-48.5 12.5t-25.5 38q-5 47 33 139.5t75 181t32 127.5q-14 101 -117 103q-45 1 -75 -16l-3 -2l-5 -2.5t-4.5 -2t-5 -2t-5 -0.5t-6 1.5t-6 3.5t-6.5 5q-3 2 -9 8.5t-9 9t-8.5 7.5t-9.5 7.5t-9.5 5.5t-11 4.5t-11.5 2.5q-30 5 -48 -3
+t-45 -31q-1 -1 -9 -8.5t-12.5 -11t-15 -10t-16.5 -5.5t-17 3q-54 27 -84 40q-41 18 -94 -5t-76 -65q-16 -28 -41 -98.5t-43.5 -132.5t-40 -134t-21.5 -73q-22 -69 18.5 -119t110.5 -46q30 2 50.5 15t38.5 46q7 13 79 199.5t77 194.5q6 11 21.5 18t29.5 0q27 -15 21 -53
+q-2 -18 -51 -139.5t-50 -132.5q-6 -38 19.5 -56.5t60.5 -7t55 49.5q4 8 45.5 92t81.5 163.5t46 88.5q20 29 41 28q29 0 25 -38q-2 -16 -65.5 -147.5t-70.5 -159.5q-12 -53 13 -103t74 -74q17 -9 51 -15.5t71.5 -8t62.5 14t20 48.5zM383 86q3 -15 -5 -27.5t-23 -15.5
+q-14 -3 -26.5 5t-15.5 23q-3 14 5 27t22 16t27 -5t16 -23zM953 -177q12 -17 8.5 -37.5t-20.5 -32.5t-37.5 -8t-32.5 21q-11 17 -7.5 37.5t20.5 32.5t37.5 8t31.5 -21zM177 635q-18 -27 -49.5 -33t-57.5 13q-26 18 -32 50t12 58q18 27 49.5 33t57.5 -12q26 -19 32 -50.5
+t-12 -58.5zM1467 -42q19 -28 13 -61.5t-34 -52.5t-60.5 -13t-51.5 34t-13 61t33 53q28 19 60.5 13t52.5 -34zM1579 562q69 -113 42.5 -244.5t-134.5 -207.5q-90 -63 -199 -60q-20 -80 -84.5 -127t-143.5 -44.5t-140 57.5q-12 -9 -13 -10q-103 -71 -225 -48.5t-193 126.5
+q-50 73 -53 164q-83 14 -142.5 70.5t-80.5 128t-2 152t81 138.5q-36 60 -38 128t24.5 125t79.5 98.5t121 50.5q32 85 99 148t146.5 91.5t168 17t159.5 -66.5q72 21 140 17.5t128.5 -36t104.5 -80t67.5 -115t17.5 -140.5q52 -16 87 -57t45.5 -89t-5.5 -99.5t-58 -87.5z
+M455 1222q14 -20 9.5 -44.5t-24.5 -38.5q-19 -14 -43.5 -9.5t-37.5 24.5q-14 20 -9.5 44.5t24.5 38.5q19 14 43.5 9.5t37.5 -24.5zM614 1503q4 -16 -5 -30.5t-26 -18.5t-31 5.5t-18 26.5q-3 17 6.5 31t25.5 18q17 4 31 -5.5t17 -26.5zM1800 555q4 -20 -6.5 -37t-30.5 -21
+q-19 -4 -36 6.5t-21 30.5t6.5 37t30.5 22q20 4 36.5 -7.5t20.5 -30.5zM1136 1448q16 -27 8.5 -58.5t-35.5 -47.5q-27 -16 -57.5 -8.5t-46.5 34.5q-16 28 -8.5 59t34.5 48t58 9t47 -36zM1882 792q4 -15 -4 -27.5t-23 -16.5q-15 -3 -27.5 5.5t-15.5 22.5q-3 15 5 28t23 16
+q14 3 26.5 -5t15.5 -23zM1691 1033q15 -22 10.5 -49t-26.5 -43q-22 -15 -49 -10t-42 27t-10 49t27 43t48.5 11t41.5 -28z" />
+    <glyph glyph-name="uniF2E1" unicode="&#xf2e1;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E2" unicode="&#xf2e2;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E3" unicode="&#xf2e3;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E4" unicode="&#xf2e4;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E5" unicode="&#xf2e5;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E6" unicode="&#xf2e6;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E7" unicode="&#xf2e7;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="_698" unicode="&#xf2e8;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2E9" unicode="&#xf2e9;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EA" unicode="&#xf2ea;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EB" unicode="&#xf2eb;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EC" unicode="&#xf2ec;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2ED" unicode="&#xf2ed;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="uniF2EE" unicode="&#xf2ee;" horiz-adv-x="1792" 
+ />
+    <glyph glyph-name="lessequal" unicode="&#xf500;" horiz-adv-x="1792" 
+ />
+  </font>
+</defs></svg>
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Inconsolata-Bold.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Inconsolata.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Inconsolata.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bold.eot and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bold.eot differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bolditalic.eot and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bolditalic.eot differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bolditalic.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bolditalic.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bolditalic.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bolditalic.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bolditalic.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bolditalic.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bold.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bold.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bold.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bold.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bold.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-bold.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-italic.eot and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-italic.eot differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-italic.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-italic.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-italic.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-italic.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-italic.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-italic.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-regular.eot and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-regular.eot differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-regular.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-regular.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-regular.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-regular.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-regular.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato/lato-regular.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-bold-italic.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-bold-italic.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-bold-italic.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-bold-italic.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato-Bold.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-bold.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-bold.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-bold.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-bold.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-normal-italic.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-normal-italic.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-normal-italic.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-normal-italic.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-normal.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-normal.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-normal.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/lato-normal.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Lato-Regular.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-bold.eot and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-bold.eot differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-bold.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-bold.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-bold.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-bold.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-bold.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-bold.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-regular.eot and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-regular.eot differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-regular.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-regular.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-regular.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-regular.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-regular.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab/roboto-slab-v7-regular.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Bold.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Bold.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Bold.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Bold.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Bold.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Light.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Light.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Light.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Light.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/RobotoSlab-Regular.ttf differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Regular.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Regular.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Regular.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Regular.woff2 differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Thin.woff and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Thin.woff differ
Binary files /tmp/tmpKD22Tq/EybYH_ldl_/mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Thin.woff2 and /tmp/tmpKD22Tq/XBqfPHFQfj/mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/fonts/Roboto-Slab-Thin.woff2 differ
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/badge_only.js mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/badge_only.js
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/badge_only.js	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/badge_only.js	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1 @@
+!function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=4)}({4:function(e,t,r){}});
\ No newline at end of file
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/html5shiv.min.js mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/html5shiv.min.js
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/html5shiv.min.js	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/html5shiv.min.js	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,4 @@
+/**
+* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+*/
+!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():p.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||o.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),l)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return t.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(t,b.frag)}function j(a){a||(a=b);var d=f(a);return!t.shivCSS||k||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),l||i(a,d),a}var k,l,m="3.7.3-pre",n=a.html5||{},o=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,p=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,q="_html5shiv",r=0,s={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",k="hidden"in a,l=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){k=!0,l=!0}}();var t={elements:n.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:m,shivCSS:n.shivCSS!==!1,supportsUnknownElements:l,shivMethods:n.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=t,j(b),"object"==typeof module&&module.exports&&(module.exports=t)}("undefined"!=typeof window?window:this,document);
\ No newline at end of file
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/html5shiv-printshiv.min.js mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/html5shiv-printshiv.min.js
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/html5shiv-printshiv.min.js	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/html5shiv-printshiv.min.js	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,4 @@
+/**
+* @preserve HTML5 Shiv 3.7.3-pre | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+*/
+!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x<style>"+b+"</style>",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=y.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=y.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),y.elements=c+" "+a,j(b)}function f(a){var b=x[a[v]];return b||(b={},w++,a[v]=w,x[w]=b),b}function g(a,c,d){if(c||(c=b),q)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():u.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||t.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),q)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return y.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(y,b.frag)}function j(a){a||(a=b);var d=f(a);return!y.shivCSS||p||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),q||i(a,d),a}function k(a){for(var b,c=a.getElementsByTagName("*"),e=c.length,f=RegExp("^(?:"+d().join("|")+")$","i"),g=[];e--;)b=c[e],f.test(b.nodeName)&&g.push(b.applyElement(l(b)));return g}function l(a){for(var b,c=a.attributes,d=c.length,e=a.ownerDocument.createElement(A+":"+a.nodeName);d--;)b=c[d],b.specified&&e.setAttribute(b.nodeName,b.nodeValue);return e.style.cssText=a.style.cssText,e}function m(a){for(var b,c=a.split("{"),e=c.length,f=RegExp("(^|[\\s,>+~])("+d().join("|")+")(?=[[\\s,>+~#.:]|$)","gi"),g="$1"+A+"\\:$2";e--;)b=c[e]=c[e].split("}"),b[b.length-1]=b[b.length-1].replace(f,g),c[e]=b.join("}");return c.join("{")}function n(a){for(var b=a.length;b--;)a[b].removeNode()}function o(a){function b(){clearTimeout(g._removeSheetTimer),d&&d.removeNode(!0),d=null}var d,e,g=f(a),h=a.namespaces,i=a.parentWindow;return!B||a.printShived?a:("undefined"==typeof h[A]&&h.add(A),i.attachEvent("onbeforeprint",function(){b();for(var f,g,h,i=a.styleSheets,j=[],l=i.length,n=Array(l);l--;)n[l]=i[l];for(;h=n.pop();)if(!h.disabled&&z.test(h.media)){try{f=h.imports,g=f.length}catch(o){g=0}for(l=0;g>l;l++)n.push(f[l]);try{j.push(h.cssText)}catch(o){}}j=m(j.reverse().join("")),e=k(a),d=c(a,j)}),i.attachEvent("onafterprint",function(){n(e),clearTimeout(g._removeSheetTimer),g._removeSheetTimer=setTimeout(b,500)}),a.printShived=!0,a)}var p,q,r="3.7.3",s=a.html5||{},t=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,u=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,v="_html5shiv",w=0,x={};!function(){try{var a=b.createElement("a");a.innerHTML="<xyz></xyz>",p="hidden"in a,q=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){p=!0,q=!0}}();var y={elements:s.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:r,shivCSS:s.shivCSS!==!1,supportsUnknownElements:q,shivMethods:s.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=y,j(b);var z=/^$|\b(?:all|print)\b/,A="html5shiv",B=!q&&function(){var c=b.documentElement;return!("undefined"==typeof b.namespaces||"undefined"==typeof b.parentWindow||"undefined"==typeof c.applyElement||"undefined"==typeof c.removeNode||"undefined"==typeof a.attachEvent)}();y.type+=" print",y.shivPrint=o,o(b),"object"==typeof module&&module.exports&&(module.exports=y)}("undefined"!=typeof window?window:this,document);
\ No newline at end of file
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/theme.js mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/theme.js
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/theme.js	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/static/js/theme.js	2020-08-26 08:57:19.000000000 +0000
@@ -1,113 +1 @@
-function toggleCurrent (elem) {
-    var parent_li = elem.closest('li');
-    parent_li.siblings('li.current').removeClass('current');
-    parent_li.siblings().find('li.current').removeClass('current');
-    parent_li.find('> ul li.current').removeClass('current');
-    parent_li.toggleClass('current');
-}
-
-$(document).ready(function() {
-    // Shift nav in mobile when clicking the menu.
-    $(document).on('click', "[data-toggle='wy-nav-top']", function() {
-        $("[data-toggle='wy-nav-shift']").toggleClass("shift");
-        $("[data-toggle='rst-versions']").toggleClass("shift");
-    });
-    // Nav menu link click operations
-    $(document).on('click', ".wy-menu-vertical .current ul li a", function() {
-        var target = $(this);
-        // Close menu when you click a link.
-        $("[data-toggle='wy-nav-shift']").removeClass("shift");
-        $("[data-toggle='rst-versions']").toggleClass("shift");
-        // Handle dynamic display of l3 and l4 nav lists
-        toggleCurrent(target);
-        if (typeof(window.SphinxRtdTheme) != 'undefined') {
-            window.SphinxRtdTheme.StickyNav.hashChange();
-        }
-    });
-    $(document).on('click', "[data-toggle='rst-current-version']", function() {
-        $("[data-toggle='rst-versions']").toggleClass("shift-up");
-    });
-    // Make tables responsive
-    $("table.docutils:not(.field-list)").wrap("<div class='wy-table-responsive'></div>");
-
-    // Add expand links to all parents of nested ul
-    $('.wy-menu-vertical ul').siblings('a').each(function () {
-        var link = $(this);
-            expand = $('<span class="toctree-expand"></span>');
-        expand.on('click', function (ev) {
-            toggleCurrent(link);
-            ev.stopPropagation();
-            return false;
-        });
-        link.prepend(expand);
-    });
-});
-
-// Sphinx theme state
-window.SphinxRtdTheme = (function (jquery) {
-    var stickyNav = (function () {
-        var navBar,
-            win,
-            winScroll = false,
-            linkScroll = false,
-            winPosition = 0,
-            enable = function () {
-                init();
-                reset();
-                win.on('hashchange', reset);
-
-                // Set scrolling
-                win.on('scroll', function () {
-                    if (!linkScroll) {
-                        winScroll = true;
-                    }
-                });
-                setInterval(function () {
-                    if (winScroll) {
-                        winScroll = false;
-                        var newWinPosition = win.scrollTop(),
-                            navPosition = navBar.scrollTop(),
-                            newNavPosition = navPosition + (newWinPosition - winPosition);
-                        navBar.scrollTop(newNavPosition);
-                        winPosition = newWinPosition;
-                    }
-                }, 25);
-            },
-            init = function () {
-                navBar = jquery('nav.wy-nav-side:first');
-                win = jquery(window);
-            },
-            reset = function () {
-                // Get anchor from URL and open up nested nav
-                var anchor = encodeURI(window.location.hash);
-                if (anchor) {
-                    try {
-                        var link = $('.wy-menu-vertical')
-                            .find('[href="' + anchor + '"]');
-                        $('.wy-menu-vertical li.toctree-l1 li.current')
-                            .removeClass('current');
-                        link.closest('li.toctree-l2').addClass('current');
-                        link.closest('li.toctree-l3').addClass('current');
-                        link.closest('li.toctree-l4').addClass('current');
-                    }
-                    catch (err) {
-                        console.log("Error expanding nav for anchor", err);
-                    }
-                }
-            },
-            hashChange = function () {
-                linkScroll = true;
-                win.one('hashchange', function () {
-                    linkScroll = false;
-                });
-            };
-        jquery(init);
-        return {
-            enable: enable,
-            hashChange: hashChange
-        };
-    }());
-    return {
-        StickyNav: stickyNav
-    };
-}($));
+!function(n){var e={};function t(i){if(e[i])return e[i].exports;var o=e[i]={i:i,l:!1,exports:{}};return n[i].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=n,t.c=e,t.d=function(n,e,i){t.o(n,e)||Object.defineProperty(n,e,{enumerable:!0,get:i})},t.r=function(n){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(n,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(n,"__esModule",{value:!0})},t.t=function(n,e){if(1&e&&(n=t(n)),8&e)return n;if(4&e&&"object"==typeof n&&n&&n.__esModule)return n;var i=Object.create(null);if(t.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:n}),2&e&&"string"!=typeof n)for(var o in n)t.d(i,o,function(e){return n[e]}.bind(null,o));return i},t.n=function(n){var e=n&&n.__esModule?function(){return n.default}:function(){return n};return t.d(e,"a",e),e},t.o=function(n,e){return Object.prototype.hasOwnProperty.call(n,e)},t.p="",t(t.s=0)}([function(n,e,t){t(1),n.exports=t(3)},function(n,e,t){(function(){var e="undefined"!=typeof window?window.jQuery:t(2);n.exports.ThemeNav={navBar:null,win:null,winScroll:!1,winResize:!1,linkScroll:!1,winPosition:0,winHeight:null,docHeight:null,isRunning:!1,enable:function(n){var t=this;void 0===n&&(n=!0),t.isRunning||(t.isRunning=!0,e((function(e){t.init(e),t.reset(),t.win.on("hashchange",t.reset),n&&t.win.on("scroll",(function(){t.linkScroll||t.winScroll||(t.winScroll=!0,requestAnimationFrame((function(){t.onScroll()})))})),t.win.on("resize",(function(){t.winResize||(t.winResize=!0,requestAnimationFrame((function(){t.onResize()})))})),t.onResize()})))},enableSticky:function(){this.enable(!0)},init:function(n){n(document);var e=this;this.navBar=n("div.wy-side-scroll:first"),this.win=n(window),n(document).on("click","[data-toggle='wy-nav-top']",(function(){n("[data-toggle='wy-nav-shift']").toggleClass("shift"),n("[data-toggle='rst-versions']").toggleClass("shift")})).on("click",".wy-menu-vertical .current ul li a",(function(){var t=n(this);n("[data-toggle='wy-nav-shift']").removeClass("shift"),n("[data-toggle='rst-versions']").toggleClass("shift"),e.toggleCurrent(t),e.hashChange()})).on("click","[data-toggle='rst-current-version']",(function(){n("[data-toggle='rst-versions']").toggleClass("shift-up")})),n("table.docutils:not(.field-list,.footnote,.citation)").wrap("<div class='wy-table-responsive'></div>"),n("table.docutils.footnote").wrap("<div class='wy-table-responsive footnote'></div>"),n("table.docutils.citation").wrap("<div class='wy-table-responsive citation'></div>"),n(".wy-menu-vertical ul").not(".simple").siblings("a").each((function(){var t=n(this);expand=n('<span class="toctree-expand"></span>'),expand.on("click",(function(n){return e.toggleCurrent(t),n.stopPropagation(),!1})),t.prepend(expand)}))},reset:function(){var n=encodeURI(window.location.hash)||"#";try{var e=$(".wy-menu-vertical"),t=e.find('[href="'+n+'"]');if(0===t.length){var i=$('.document [id="'+n.substring(1)+'"]').closest("div.section");0===(t=e.find('[href="#'+i.attr("id")+'"]')).length&&(t=e.find('[href="#"]'))}t.length>0&&($(".wy-menu-vertical .current").removeClass("current"),t.addClass("current"),t.closest("li.toctree-l1").addClass("current"),t.closest("li.toctree-l1").parent().addClass("current"),t.closest("li.toctree-l1").addClass("current"),t.closest("li.toctree-l2").addClass("current"),t.closest("li.toctree-l3").addClass("current"),t.closest("li.toctree-l4").addClass("current"),t.closest("li.toctree-l5").addClass("current"),t[0].scrollIntoView())}catch(n){console.log("Error expanding nav for anchor",n)}},onScroll:function(){this.winScroll=!1;var n=this.win.scrollTop(),e=n+this.winHeight,t=this.navBar.scrollTop()+(n-this.winPosition);n<0||e>this.docHeight||(this.navBar.scrollTop(t),this.winPosition=n)},onResize:function(){this.winResize=!1,this.winHeight=this.win.height(),this.docHeight=$(document).height()},hashChange:function(){this.linkScroll=!0,this.win.one("hashchange",(function(){this.linkScroll=!1}))},toggleCurrent:function(n){var e=n.closest("li");e.siblings("li.current").removeClass("current"),e.siblings().find("li.current").removeClass("current"),e.find("> ul li.current").removeClass("current"),e.toggleClass("current")}},"undefined"!=typeof window&&(window.SphinxRtdTheme={Navigation:n.exports.ThemeNav,StickyNav:n.exports.ThemeNav}),function(){for(var n=0,e=["ms","moz","webkit","o"],t=0;t<e.length&&!window.requestAnimationFrame;++t)window.requestAnimationFrame=window[e[t]+"RequestAnimationFrame"],window.cancelAnimationFrame=window[e[t]+"CancelAnimationFrame"]||window[e[t]+"CancelRequestAnimationFrame"];window.requestAnimationFrame||(window.requestAnimationFrame=function(e,t){var i=(new Date).getTime(),o=Math.max(0,16-(i-n)),r=window.setTimeout((function(){e(i+o)}),o);return n=i+o,r}),window.cancelAnimationFrame||(window.cancelAnimationFrame=function(n){clearTimeout(n)})}()}).call(window)},function(n,e){n.exports=jQuery},function(n,e,t){}]);
\ No newline at end of file
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/theme.conf mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/theme.conf
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/theme.conf	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/theme.conf	2020-08-26 08:57:19.000000000 +0000
@@ -1,9 +1,18 @@
 [theme]
 inherit = basic
 stylesheet = css/theme.css
+pygments_style = default
 
 [options]
-typekit_id = hiw1hhg
-analytics_id = 
-sticky_navigation = False
+canonical_url =
+analytics_id =
+collapse_navigation = True
+sticky_navigation = True
+navigation_depth = 4
+includehidden = True
+titles_only =
 logo_only =
+display_version = True
+prev_next_buttons_location = bottom
+style_external_links = False
+style_nav_header_background =
\ No newline at end of file
diff -Nru mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/versions.html mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/versions.html
--- mame-0.222+dfsg.1/docs/themes/sphinx_rtd_theme/versions.html	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/docs/themes/sphinx_rtd_theme/versions.html	2020-08-26 08:57:19.000000000 +0000
@@ -8,30 +8,27 @@
     </span>
     <div class="rst-other-versions">
       <dl>
-        <dt>Versions</dt>
+        <dt>{{ _('Versions') }}</dt>
         {% for slug, url in versions %}
           <dd><a href="{{ url }}">{{ slug }}</a></dd>
         {% endfor %}
       </dl>
       <dl>
-        <dt>Downloads</dt>
+        <dt>{{ _('Downloads') }}</dt>
         {% for type, url in downloads %}
           <dd><a href="{{ url }}">{{ type }}</a></dd>
         {% endfor %}
       </dl>
       <dl>
-        <dt>On Read the Docs</dt>
+        {# Translators: The phrase "Read the Docs" is not translated #}
+        <dt>{{ _('On Read the Docs') }}</dt>
           <dd>
-            <a href="//{{ PRODUCTION_DOMAIN }}/projects/{{ slug }}/?fromdocs={{ slug }}">Project Home</a>
+            <a href="//{{ PRODUCTION_DOMAIN }}/projects/{{ slug }}/?fromdocs={{ slug }}">{{ _('Project Home') }}</a>
           </dd>
           <dd>
-            <a href="//{{ PRODUCTION_DOMAIN }}/builds/{{ slug }}/?fromdocs={{ slug }}">Builds</a>
+            <a href="//{{ PRODUCTION_DOMAIN }}/builds/{{ slug }}/?fromdocs={{ slug }}">{{ _('Builds') }}</a>
           </dd>
       </dl>
-      <hr/>
-      Free document hosting provided by <a href="http://www.readthedocs.org">Read the Docs</a>.
-
     </div>
   </div>
 {% endif %}
-
diff -Nru mame-0.222+dfsg.1/.editorconfig mame-0.224+dfsg.1/.editorconfig
--- mame-0.222+dfsg.1/.editorconfig	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/.editorconfig	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+tab_width = 4
+trim_trailing_whitespace = true
+
+[*.py]
+indent_style = space
+tab_width = 8
diff -Nru mame-0.222+dfsg.1/hash/a2600_cass.xml mame-0.224+dfsg.1/hash/a2600_cass.xml
--- mame-0.222+dfsg.1/hash/a2600_cass.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/a2600_cass.xml	2020-08-26 08:57:19.000000000 +0000
@@ -4,6 +4,11 @@
 license:CC0
 
 Info from Atariage and Atarimania
+
+The scharger cartridge must be loaded before being able to load a tape. Press Play when asked.
+
+e.g. mame64 a2600 scharger -cass commumut
+
 -->
 
 <softwarelist name="a2600_cass" description="Atari 2600 cassettes">
diff -Nru mame-0.222+dfsg.1/hash/apogee.xml mame-0.224+dfsg.1/hash/apogee.xml
--- mame-0.222+dfsg.1/hash/apogee.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/apogee.xml	2020-08-26 08:57:19.000000000 +0000
@@ -10,6 +10,7 @@
 		<description>BADROAD</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4105">
 				<rom name="badroad.rka" size="4105" crc="7126d777" sha1="1c3f93c76bec063e5ca05a6b30e85837e2501b6c"/>
@@ -21,6 +22,7 @@
 		<description>BATTLESH</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="3361">
 				<rom name="battlesh.rka" size="3361" crc="967781b6" sha1="e3ba8383e096b4f1c54ddc169024a584de2acbad"/>
@@ -32,6 +34,7 @@
 		<description>BDASHALL</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="23001">
 				<rom name="bdashall.rka" size="23001" crc="a2420cb3" sha1="7a557eb2037861edde18895ca0b9402bf7be6e76"/>
@@ -43,6 +46,7 @@
 		<description>BDASHFRM</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="15497">
 				<rom name="bdashfrm.rka" size="15497" crc="3dd7b313" sha1="c137ae1c18558b5bf5b380ce4be6426547e78c76"/>
@@ -54,6 +58,7 @@
 		<description>BDASHSMR</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="15497">
 				<rom name="bdashsmr.rka" size="15497" crc="0760b44c" sha1="0b0fd32267d59f6e51eccc95c628c4c46682a475"/>
@@ -65,6 +70,7 @@
 		<description>BLDRDASH</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="16393">
 				<rom name="bldrdash.rka" size="16393" crc="0407c111" sha1="7aa3f00f24571d993d0aa8cb9335b25eec5929db"/>
@@ -76,6 +82,7 @@
 		<description>BOMBARD</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4617">
 				<rom name="bombard.rka" size="4617" crc="84d17a6a" sha1="4ccf63f7411a162841473301cd3f6f04f6c4c66b"/>
@@ -87,6 +94,7 @@
 		<description>BOX</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4105">
 				<rom name="box.rka" size="4105" crc="a0486df5" sha1="452f93b72b3df614b7c83cb1a0c721df7e3f60bf"/>
@@ -98,6 +106,7 @@
 		<description>BUCK_ROG</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="2825">
 				<rom name="buck_rog.rka" size="2825" crc="35f6e7f6" sha1="9b0ac115a4786005e6251db01fc2b058cba27c01"/>
@@ -109,6 +118,7 @@
 		<description>CHESS</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="28938">
 				<rom name="chess.rka" size="28938" crc="47dd5fd9" sha1="25861b791a610ee109a3b8906b82476c8f093e5f"/>
@@ -120,6 +130,7 @@
 		<description>CHUDOV</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="970">
 				<rom name="chudov.rka" size="970" crc="69c629b4" sha1="0b43950247b7a28216cb2cbf3251555c17fefa28"/>
@@ -131,6 +142,7 @@
 		<description>CIRK</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="7689">
 				<rom name="cirk.rka" size="7689" crc="ad2f3340" sha1="90e1d0211e3821f8979faa96c2e2fa2d0de0b249"/>
@@ -142,6 +154,7 @@
 		<description>CROCET</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="19897">
 				<rom name="crocet.rka" size="19897" crc="7f01b26f" sha1="24cefc7df457bd149d360c93de6e6a76496b1f3b"/>
@@ -153,6 +166,7 @@
 		<description>CROSSFIR</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="11369">
 				<rom name="crossfir.rka" size="11369" crc="c30f872c" sha1="8219d45c3d5b49eb28e72958fe4b14437715db2e"/>
@@ -164,6 +178,7 @@
 		<description>DESCENT</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="10506">
 				<rom name="descent.rka" size="10506" crc="97215e71" sha1="9563efb3ebb582d3c4deaf04b944133c28e1bb19"/>
@@ -175,6 +190,7 @@
 		<description>DIGGER</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="17289">
 				<rom name="digger.rka" size="17289" crc="b5631421" sha1="c2ff2a6fcc3abbde206a0c30ec1a755ec9ec188b"/>
@@ -186,6 +202,7 @@
 		<description>ENGL</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="3021">
 				<rom name="engl.rka" size="3021" crc="1f6f47c5" sha1="badec2b38316cff4cf797445df4e496f45f91161"/>
@@ -197,6 +214,7 @@
 		<description>FOOTBALL</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="3194">
 				<rom name="football.rka" size="3194" crc="4f77e321" sha1="dd4cc6d515b441537a52111b74ba04ec4470bbef"/>
@@ -208,6 +226,7 @@
 		<description>FOXHUNT</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="2941">
 				<rom name="foxhunt.rka" size="2941" crc="3630da50" sha1="e2c1fddc643975a28cc2e09131c54ff9b41c1fcb"/>
@@ -219,6 +238,7 @@
 		<description>FROGGI15</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4105">
 				<rom name="froggi15.rka" size="4105" crc="82451761" sha1="045ea8786ff9187bbbeb660c49302527d8615aae"/>
@@ -230,6 +250,7 @@
 		<description>GONKI</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="29355">
 				<rom name="gonki.rka" size="29355" crc="5c5b3803" sha1="cbd66ce65e14ec35ff3443adeb1edf6c0770a17f"/>
@@ -241,6 +262,7 @@
 		<description>GORODKI</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4438">
 				<rom name="gorodki.rka" size="4438" crc="93aba42b" sha1="4cbf9160fbb28b7b492c1490ab0d918f350d18e0"/>
@@ -252,6 +274,7 @@
 		<description>KLAD</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="13145">
 				<rom name="klad.rka" size="13145" crc="9b3586b6" sha1="79ce2eec3ed572ecc752b99ff1b2aead84ca977a"/>
@@ -263,6 +286,7 @@
 		<description>KOLOBOK</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="5196">
 				<rom name="kolobok.rka" size="5196" crc="dd900dad" sha1="7242564b7da2b195f6d18b8ba479f95f2f8df92b"/>
@@ -274,6 +298,7 @@
 		<description>KOMMUTAT</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="16076">
 				<rom name="kommutat.rka" size="16076" crc="0b1fb2b6" sha1="4983ff56e32441b5d5383fcc954e584931b43989"/>
@@ -285,6 +310,7 @@
 		<description>LANDMINE</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="3170">
 				<rom name="landmine.rka" size="3170" crc="38a1c993" sha1="07cded088f5e528296053f1b43cff47d5e5e6964"/>
@@ -296,6 +322,7 @@
 		<description>LESTN</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="7977">
 				<rom name="lestn.rka" size="7977" crc="6a23b4ac" sha1="89514d18a7f6a16a5bff471517625e63ce9f9d02"/>
@@ -307,6 +334,7 @@
 		<description>LESTNICA</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1791">
 				<rom name="lestnica.rka" size="1791" crc="aea86cfe" sha1="2575d3ffbdca68649e3a5d466884d2d748cc2f40"/>
@@ -318,6 +346,7 @@
 		<description>LIFE</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="3290">
 				<rom name="life.rka" size="3290" crc="1587f724" sha1="506a0b1272820117a18fad26c55f311b9c0ed85e"/>
@@ -329,6 +358,7 @@
 		<description>LIFE1</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1546">
 				<rom name="life1.rka" size="1546" crc="8ebebe53" sha1="27769ab12988f83c9f475f82720069bd8fc64227"/>
@@ -340,6 +370,7 @@
 		<description>LIQSKY</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="6239">
 				<rom name="liqsky.rka" size="6239" crc="e9db15ac" sha1="6c854529c3c234dd44ecabbf1f26ceba97510180"/>
@@ -351,6 +382,7 @@
 		<description>LODERUN</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="12569">
 				<rom name="loderun.rka" size="12569" crc="cb5a8c2b" sha1="0873b6eba458bc1714d376fe16fa598d370c02ae"/>
@@ -362,6 +394,7 @@
 		<description>LRUNNER</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="5249">
 				<rom name="lrunner.rka" size="5249" crc="473ea733" sha1="f0b60280bebd1efc82f4b2710c33aa45d42b14a0"/>
@@ -373,6 +406,7 @@
 		<description>MARAFON</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="3497">
 				<rom name="marafon.rka" size="3497" crc="6b284c47" sha1="4562f23b50ad4b1c35502117a0cc9ad316b24ac2"/>
@@ -384,6 +418,7 @@
 		<description>MARS</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="5642">
 				<rom name="mars.rka" size="5642" crc="7b4d6f94" sha1="ddc1f942052b8815850151c765688f2a2002f5e4"/>
@@ -395,6 +430,7 @@
 		<description>MARS (Alt)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="2570">
 				<rom name="mars_alt.rka" size="2570" crc="7a1c6fdf" sha1="852d954c47bf5aa1289c4475ce67b8156d51f8d2"/>
@@ -406,6 +442,7 @@
 		<description>MARSH2</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="2313">
 				<rom name="marsh2.rka" size="2313" crc="5eaeeb16" sha1="ea6c54ce730e83d57d3c74e406128cff8f01c29c"/>
@@ -417,6 +454,7 @@
 		<description>MESH</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="3081">
 				<rom name="mesh.rka" size="3081" crc="5aaa5c6a" sha1="ea885314ee224f6eec6f9c7754d17446e7d7fe76"/>
@@ -428,6 +466,7 @@
 		<description>MIRAGE</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4105">
 				<rom name="mirage.rka" size="4105" crc="11246976" sha1="80230c38b2a7c904ca4fc2518833766116313b5f"/>
@@ -439,6 +478,7 @@
 		<description>MUS1</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1033">
 				<rom name="mus1.rka" size="1033" crc="4bbd4043" sha1="7b330c642370abaf51250faa11a393c2e530f1b4"/>
@@ -450,6 +490,7 @@
 		<description>MUS2</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1289">
 				<rom name="mus2.rka" size="1289" crc="022539f9" sha1="bb53ecf365174f0f736756995eed827f569353b7"/>
@@ -461,6 +502,7 @@
 		<description>MUS3</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="2057">
 				<rom name="mus3.rka" size="2057" crc="5f717fac" sha1="c523391f14a69f2de9a8b5e3388c99fffe5cc8eb"/>
@@ -472,6 +514,7 @@
 		<description>MUS4</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1033">
 				<rom name="mus4.rka" size="1033" crc="be892d73" sha1="db673924ce75125e544ffb51330dc289f93375e3"/>
@@ -483,6 +526,7 @@
 		<description>MUS5</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1546">
 				<rom name="mus5.rka" size="1546" crc="41782166" sha1="c998a6e09990715359487d0b2cc2b15d3afc7b03"/>
@@ -494,6 +538,7 @@
 		<description>MUS6</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1546">
 				<rom name="mus6.rka" size="1546" crc="a9cf92f3" sha1="ce827b5355f1c478dddfd467fe7be2060526ff99"/>
@@ -505,6 +550,7 @@
 		<description>MUS7</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="2313">
 				<rom name="mus7.rka" size="2313" crc="b40d6b04" sha1="e89531a0654d6d51775ebd679cb547a00df07903"/>
@@ -516,6 +562,7 @@
 		<description>MUSICBOX</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="2707">
 				<rom name="musicbox.rka" size="2707" crc="056b77c4" sha1="3cd020bca79d41ce6ba9ade62345bcae734def67"/>
@@ -527,6 +574,7 @@
 		<description>NESUSHKA</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4169">
 				<rom name="nesushka.rka" size="4169" crc="5bd4dbca" sha1="e9af41bdabf833adf9d78b124892450e8d141007"/>
@@ -538,6 +586,7 @@
 		<description>NIM</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="5119">
 				<rom name="nim.rka" size="5119" crc="97f25dc3" sha1="7703f156b2395127c8f0071bb326b2a8d0d788ff"/>
@@ -549,6 +598,7 @@
 		<description>PACMAN</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4552">
 				<rom name="pacman.rka" size="4552" crc="0c35b94c" sha1="b09ebbcb1eca2363d59b55dbfd72a15cc6a443d7"/>
@@ -560,6 +610,7 @@
 		<description>PACMAN2</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4552">
 				<rom name="pacman2.rka" size="4552" crc="c29688f0" sha1="e0a0ed69e8c0d58325ac10c5cf1e24a6ae168f3d"/>
@@ -571,6 +622,7 @@
 		<description>PANIKA</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="6736">
 				<rom name="panika.rka" size="6736" crc="a386c142" sha1="7f0e4c8e3dc30e57cef12455fc666f8d1ab14db8"/>
@@ -582,6 +634,7 @@
 		<description>PENTIS</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="5914">
 				<rom name="pentis.rka" size="5914" crc="937cd247" sha1="515d2bdf95fff61ef6572cda92d9c3a0602ef0ab"/>
@@ -593,6 +646,7 @@
 		<description>PIF</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4505">
 				<rom name="pif.rka" size="4505" crc="c40ae07c" sha1="d44f147c440267f8afff5ce9896326ca572683de"/>
@@ -604,6 +658,7 @@
 		<description>PINGPONG</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1763">
 				<rom name="pingpong.rka" size="1763" crc="61c4398b" sha1="9e93e16e6de416e2a9cae080b6d5de78727e9956"/>
@@ -615,6 +670,7 @@
 		<description>PLANETA</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="17401">
 				<rom name="planeta.rka" size="17401" crc="848ca8ac" sha1="ade878341dac66391e894fa4f9beee3d56b8c8bb"/>
@@ -626,6 +682,7 @@
 		<description>POGONIA</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="12809">
 				<rom name="pogonia.rka" size="12809" crc="4b1854c1" sha1="cdd6d2d30197d24b931fff21c3fc0eb63737b418"/>
@@ -637,6 +694,7 @@
 		<description>PVO87</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1453">
 				<rom name="pvo87.rka" size="1453" crc="fa1327db" sha1="54bbeb7e612e6012ff923905fe7a6cac71609dbe"/>
@@ -648,6 +706,7 @@
 		<description>RALLI</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4105">
 				<rom name="ralli.rka" size="4105" crc="5633d9d5" sha1="4fe4ddf7b0f73bf9a7470afdc6c2faf91b8016c0"/>
@@ -659,6 +718,7 @@
 		<description>RALSLAL</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="5577">
 				<rom name="ralslal.rka" size="5577" crc="763d25d2" sha1="544cb7d2665e5a27c9b279a9247dd5bb67e00651"/>
@@ -670,6 +730,7 @@
 		<description>REDFLWR</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="5851">
 				<rom name="redflwr.rka" size="5851" crc="6774fdb3" sha1="d97fd18071f076e17d961b058a4f31d09957503c"/>
@@ -681,6 +742,7 @@
 		<description>REIN</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="11417">
 				<rom name="rein.rka" size="11417" crc="aee962f9" sha1="bbc1feb0eb82a33e9d2536a09a2043bec7a46791"/>
@@ -692,6 +754,7 @@
 		<description>RIKOSHET</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="12297">
 				<rom name="rikoshet.rka" size="12297" crc="4283ed5d" sha1="f38424510b0bb9d34e9418e29fbf1cc1629f520f"/>
@@ -703,6 +766,7 @@
 		<description>RISE</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="9481">
 				<rom name="rise.rka" size="9481" crc="ea70a438" sha1="f67718c2e339333b34fd1d1197bb7eaf52de17dd"/>
@@ -714,6 +778,7 @@
 		<description>SABOTEUR</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="3353">
 				<rom name="saboteur.rka" size="3353" crc="7b76172b" sha1="99e1dee796a3930a7589a18f69157ab93db091a1"/>
@@ -725,6 +790,7 @@
 		<description>SAD</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="3001">
 				<rom name="sad.rka" size="3001" crc="35ce6b48" sha1="7510aa2d6fadf916bc0132895cc921e4f55c18be"/>
@@ -736,6 +802,7 @@
 		<description>SHAHTY</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="15305">
 				<rom name="shahty.rka" size="15305" crc="533db960" sha1="0aafc73037ee3043b8f9914dde0c6748e490f532"/>
@@ -747,6 +814,7 @@
 		<description>SHASHKI</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="9737">
 				<rom name="shashki.rka" size="9737" crc="a5f99284" sha1="ad781ce86cc085d5e43a6ba0f91c712e10304fed"/>
@@ -758,6 +826,7 @@
 		<description>SHMEL</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="9257">
 				<rom name="shmel.rka" size="9257" crc="7b3a884c" sha1="ed76b4d11e3b13077bab3294e586f7be7ddf7a4c"/>
@@ -769,6 +838,7 @@
 		<description>SHTURM</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="5434">
 				<rom name="shturm.rka" size="5434" crc="94df098a" sha1="57ba78240d1d0f8228261041071fe129131bb645"/>
@@ -780,6 +850,7 @@
 		<description>SKACHKI</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4505">
 				<rom name="skachki.rka" size="4505" crc="1a61d798" sha1="a26a2ddecfeb12cc180bec1938414a2636ea2de0"/>
@@ -791,6 +862,7 @@
 		<description>SKALOED</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="2377">
 				<rom name="skaloed.rka" size="2377" crc="e1937741" sha1="3c8a5b4334a8a8016fe03295856a0ddf7fc9f2e0"/>
@@ -802,6 +874,7 @@
 		<description>SLAMS</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4262">
 				<rom name="slams.rka" size="4262" crc="c6802ae0" sha1="eaafff202e848cbbd0a696ecf65d8bd7336f802b"/>
@@ -813,6 +886,7 @@
 		<description>SNAKE</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4617">
 				<rom name="snake.rka" size="4617" crc="2209aa3e" sha1="c918a429861121fef1c13386adc05e118ab4e1ba"/>
@@ -824,6 +898,7 @@
 		<description>SOS</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4105">
 				<rom name="sos.rka" size="4105" crc="5e08d1c3" sha1="c6746f59e0e93490dcde6e63083ff4429763d2f9"/>
@@ -835,6 +910,7 @@
 		<description>SPBATTLE</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1280">
 				<rom name="spbattle.rka" size="1280" crc="9e6dae70" sha1="0962f912c8a3fcc5061cebe1de9cf3cab6aa200e"/>
@@ -846,6 +922,7 @@
 		<description>SPINSECT</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="5529">
 				<rom name="spinsect.rka" size="5529" crc="170f7b36" sha1="d7bcfa04168ff65f757ede48aaadedd510c3deb2"/>
@@ -857,6 +934,7 @@
 		<description>SPYSDEM</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="6729">
 				<rom name="spysdem.rka" size="6729" crc="3c862f3f" sha1="469ea963a0303137569b7f441ceea87bf6daac4c"/>
@@ -868,6 +946,7 @@
 		<description>STAKAN</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="3871">
 				<rom name="stakan.rka" size="3871" crc="37be2ea3" sha1="d41851532fa0f0c784b8ef489df536988a4dfd7c"/>
@@ -879,6 +958,7 @@
 		<description>STELBI</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4527">
 				<rom name="stelbi.rka" size="4527" crc="94688ecf" sha1="46d1ade0cbbe8192b05c442b9fd15275304e09c9"/>
@@ -890,6 +970,7 @@
 		<description>STENA</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="11945">
 				<rom name="stena.rka" size="11945" crc="2e097fea" sha1="f64ca7a4f8ac31249319d64a8db0678776bf0e88"/>
@@ -901,6 +982,7 @@
 		<description>STONEFLD</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="2361">
 				<rom name="stonefld.rka" size="2361" crc="4956a5f8" sha1="075fa56956d196a5dbb6bfdfc2ec3b8bb9c81872"/>
@@ -912,6 +994,7 @@
 		<description>TARELKI</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="5282">
 				<rom name="tarelki.rka" size="5282" crc="32422ee1" sha1="4b2909218d9571ae4ea442fb2304b23ffaf4ad6f"/>
@@ -923,6 +1006,7 @@
 		<description>TENNIS</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="2377">
 				<rom name="tennis.rka" size="2377" crc="b3444451" sha1="ced24cf9e7fdbd2c7e449373239c54e0a803bb62"/>
@@ -934,6 +1018,7 @@
 		<description>TETRIS</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="2313">
 				<rom name="tetris.rka" size="2313" crc="492f274a" sha1="616a9a33720a2e25ef0212b6facd7ffc95238295"/>
@@ -945,6 +1030,7 @@
 		<description>TORPATT</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4362">
 				<rom name="torpatt.rka" size="4362" crc="ef59fea8" sha1="519a60e4e0f91222d42283865a29956ab8757fe4"/>
@@ -956,6 +1042,7 @@
 		<description>TRASINA</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="8828">
 				<rom name="trasina.rka" size="8828" crc="c2794fa0" sha1="02921f55d664925e090de62a8da08f6fa9311d92"/>
@@ -967,6 +1054,7 @@
 		<description>TULPAN</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1059">
 				<rom name="tulpan.rka" size="1059" crc="f8ece2ce" sha1="92a8efe96333e39f9d556d31a22178441d1734d2"/>
@@ -978,6 +1066,7 @@
 		<description>UDAV</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="2057">
 				<rom name="udav.rka" size="2057" crc="ecc4fc76" sha1="f913f279847c66ac581aded102ee406853009b7f"/>
@@ -989,6 +1078,7 @@
 		<description>UTKA</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1450">
 				<rom name="utka.rka" size="1450" crc="1277b1bb" sha1="00d0a7f92b7c12bfdc928686ac488d22882e710f"/>
@@ -1000,6 +1090,7 @@
 		<description>WOOD</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="2361">
 				<rom name="wood.rka" size="2361" crc="9fd36743" sha1="79932e8efbfb8c6abee6dc3b465352470f15e5c2"/>
@@ -1011,6 +1102,7 @@
 		<description>XONIXZM</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="3937">
 				<rom name="xonixzm.rka" size="3937" crc="d269d551" sha1="3c88e9258a5ae49e77d1249565eb848c326835ca"/>
@@ -1022,6 +1114,7 @@
 		<description>XTRO</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="7802">
 				<rom name="xtro.rka" size="7802" crc="932aa910" sha1="57da1a34a50dc698068b078f5c2e2eef1f6167b1"/>
@@ -1036,6 +1129,7 @@
 		<description>BASGRAPH</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="11828">
 				<rom name="basgraph.rka" size="11828" crc="af1ba121" sha1="27c56d0b01d53d34028399932e851638a8b411aa"/>
@@ -1047,6 +1141,7 @@
 		<description>BASMICR</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="8200">
 				<rom name="basmicr.rka" size="8200" crc="b989b2f8" sha1="9be29bb4255453cb1cb6da05ffe737cc13f18c2c"/>
@@ -1058,6 +1153,7 @@
 		<description>BASMSX</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="17786">
 				<rom name="basmsx.rka" size="17786" crc="e949e6e2" sha1="363e873fc9f55791028551f418ff6f2972cd0a4f"/>
@@ -1069,6 +1165,7 @@
 		<description>BASRK</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="7689">
 				<rom name="basrk.rka" size="7689" crc="b29f5db1" sha1="1e009b87fa1c352425bc63b9204ccb530940c98d"/>
@@ -1080,6 +1177,7 @@
 		<description>DUMPRED</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="3747">
 				<rom name="dumpred.rka" size="3747" crc="ef6c7903" sha1="c8cd5ac95a52ffc8c8a2d99f5f879cc56c0011af"/>
@@ -1091,6 +1189,7 @@
 		<description>GRAPHRED</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="5129">
 				<rom name="graphred.rka" size="5129" crc="e5b15e4c" sha1="022b72488aa0c293dc3f1d726e585c2157ce3265"/>
@@ -1102,6 +1201,7 @@
 		<description>POISK</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1014">
 				<rom name="poisk.rka" size="1014" crc="763ef592" sha1="67ae4cef6b6c009271952dc2bd78402a330390da"/>
@@ -1113,6 +1213,7 @@
 		<description>PROVERKA</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4901">
 				<rom name="proverka.rka" size="4901" crc="3d008245" sha1="da5e71a74f5723b8f16f2bd0a0efa6ed200dbd1f"/>
@@ -1124,6 +1225,7 @@
 		<description>RECORDER</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="1402">
 				<rom name="recorder.rka" size="1402" crc="c0b03aa1" sha1="8bd8ff358233700a889fc8351cfa1bd4dacde200"/>
@@ -1135,6 +1237,7 @@
 		<description>REDASM</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4105">
 				<rom name="redasm.rka" size="4105" crc="b8e49913" sha1="6764edb38820e1a6cc4c30f6ed6f2ba78e0feecc"/>
@@ -1146,6 +1249,7 @@
 		<description>REDDSSM</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass" interface="apogee_cass">
 			<dataarea name="cass" size="4105">
 				<rom name="reddssm.rka" size="4105" crc="14802c17" sha1="4efe18cc5f71e6cb45a5e1bd557de009cdbce72e"/>
diff -Nru mame-0.222+dfsg.1/hash/apple1.xml mame-0.224+dfsg.1/hash/apple1.xml
--- mame-0.222+dfsg.1/hash/apple1.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/apple1.xml	2020-08-26 08:57:19.000000000 +0000
@@ -2,6 +2,24 @@
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 <!--
 license:CC0
+
+To load and run a tape:
+Some programs run from the monitor prompt, while Basic programs must be loaded in the monitor and run from Basic.
+Monitor programs:
+1. Type C100R, press <Enter>. This gives the prompt A9*.
+2. Now enter the load instructions as per the usage, e.g E000.EFFFR but don't press <Enter> yet.
+3. Start the tape via the Tab menu Tape Control (NOT by pressing F2), wait for the leader tone then press <Enter>.
+4. When it's finished you are back to the \ prompt.
+5. Enter the "enter at" information, press <Return> to run the program.
+
+Basic programs:
+1. You must already have loaded and run Basic. Do a soft reset (Scroll-Lock then F3) to get back to the monitor.
+2. Now enter the load instructions as per the usage, e.g 4A.00FFR300.FFFR but don't press <Enter> yet.
+3. Start the tape via the Tab menu Tape Control (NOT by pressing F2), wait for the leader tone then press <Enter>.
+4. When it's finished you are back to the \ prompt.
+5. Go back to Basic by typing E2B3R <Enter>
+6. Now you can LIST or RUN the program.
+
 -->
 
 <softwarelist name="apple1" description="Apple 1 cassettes">
diff -Nru mame-0.222+dfsg.1/hash/apple2_cass.xml mame-0.224+dfsg.1/hash/apple2_cass.xml
--- mame-0.222+dfsg.1/hash/apple2_cass.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/apple2_cass.xml	2020-08-26 08:57:19.000000000 +0000
@@ -6,10 +6,14 @@
 
 <softwarelist name="apple2_cass" description="Apple II cassettes">
 
-<!-- To load and run a tape:
+<!-- To enter Basic after powering on:
+AppleII : Type Ctrl-B (nothing shows) and press <Enter>
+AppleIIe : Press Ctrl-F12
+
+To load and run a tape:
 1. Set up the machine for the type of tape: Monitor "*", Integer BASIC ">", or Applesoft BASIC "]".
 2. Enter the address information or type LOAD for BASIC programs but do not press <Return>.
-3. Play the tape then press <Return>.
+3. Play the tape, wait for the leader sound then press <Return>.
 4. Enter the address information or type RUN for BASIC programs and press <Return> to run the program. -->
 
 	<software name="3dartgra">
diff -Nru mame-0.222+dfsg.1/hash/apple2_flop_clcracked.xml mame-0.224+dfsg.1/hash/apple2_flop_clcracked.xml
--- mame-0.222+dfsg.1/hash/apple2_flop_clcracked.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/apple2_flop_clcracked.xml	2020-08-26 08:57:19.000000000 +0000
@@ -13,12 +13,21 @@
 	Set "colorme" (Color Me) is missing Tink Tonk Side B.
 	Set "mfamilyr" (Marty's Family Reader) is missing disks #1, 2, and 7.
 	Set "mthtutsb" (Math Tutor: Subtraction) is missing disk #1.
-	Set "pgrammar" (Practical Grammar) is missing disks #1-13.
+	Set "prcgramr" (Practical Grammar) is missing disks #1-13.
 	Set "qmile41" (The Quarter Mile (Version 4.1) is missing disks #1, 4, and 5.
 	Set "succread" (Success with Reading) is thought to be missing story A/B.
 	Set "sentdiag" (Sentence Diagramming) is missing disk #5.
 	Set "schlread" (Scholastic Reading Comprehension) is likely missing several.
 	Set "basfrcc" (Basic Fraction Concepts) is missing side A.
+	Set "shvrbgl3" (Scoring Higher: Verbal Grade Level 3) is missing disk 12.
+	Set "frogdog2" (Frogs, Dogs, Kittens, and Kids 2 (Version 10.18.88)) may be
+	  missing disks 1-3, but it is unknown if those exist.
+	Set "matactl4" (Mathematics Activities Courseware Level 4) is missing
+	  disk 1. Disk 2 does boot, so it's usable. Is there a disk 3?
+	Set "matactl6" (Mathematics Activities Courseware Level 6) may be missing
+	  disks A and B. Disk C does boot, so it's usable.
+	Set "asatprep" (ARCO Computer Preparation for the SAT) is missing
+	  disks 1, 2, and 7.
 	-->
 
 	<software name="101mword">
@@ -26,7 +35,6 @@
 		<year>1983</year>
 		<publisher>Learning Seed Company</publisher>
 		<info name="release" value="2016-04-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -40,7 +48,6 @@
 		<year>1986</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2017-04-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -54,7 +61,6 @@
 		<year>1987</year>
 		<publisher>Origin Systems</publisher>
 		<info name="release" value="2018-09-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -75,7 +81,6 @@
 		<year>1984</year>
 		<publisher>Bitcards</publisher>
 		<info name="release" value="2019-01-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -95,7 +100,6 @@
 		<description>Alcazar the Forgotten Fortress (cleanly cracked)</description>
 		<year>1985</year>
 		<publisher>Activision</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -109,7 +113,6 @@
 		<year>1982</year>
 		<publisher>Datamost</publisher>
 		<info name="release" value="2016-07-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -122,7 +125,6 @@
 		<description>The American Challenge (cleanly cracked)</description>
 		<year>1986</year>
 		<publisher>Mindscape</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -135,7 +137,6 @@
 		<description>Battle Chess (cleanly cracked)</description>
 		<year>1990</year>
 		<publisher>Interplay</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -156,7 +157,6 @@
 		<year>1988</year>
 		<publisher>Data East</publisher>
 		<info name="release" value="2015-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -177,7 +177,6 @@
 		<year>1983</year>
 		<publisher>Micro Education</publisher>
 		<info name="release" value="2015-10-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -198,7 +197,6 @@
 		<year>1987</year>
 		<publisher>D.C. Heath and Company</publisher>
 		<info name="release" value="2016-08-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -212,7 +210,6 @@
 		<year>1988</year>
 		<publisher>Taito America / NovaLogic</publisher>
 		<info name="release" value="2017-08-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -232,7 +229,6 @@
 		<description>Countdown to Shutdown (cleanly cracked)</description>
 		<year>1985</year>
 		<publisher>Activision</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -246,7 +242,6 @@
 		<year>1984</year>
 		<publisher>Reader's Digest Software</publisher>
 		<info name="release" value="2016-07-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -259,7 +254,6 @@
 		<description>Crisis Mountain (cleanly cracked)</description>
 		<year>1982</year>
 		<publisher>Synergistic Software</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -272,7 +266,6 @@
 		<description>Where in Time is Carmen Sandiego (Version 1.1) (cleanly cracked)</description>
 		<year>1989</year>
 		<publisher>Broderbund Software</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -304,7 +297,6 @@
 		<description>Where in Time is Carmen Sandiego (Version 1.1) (800K 3.5") (cleanly cracked)</description>
 		<year>1989</year>
 		<publisher>Broderbund Software</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="819264">
@@ -317,7 +309,6 @@
 		<description>Where in Time is Carmen Sandiego (Version 1.0) (cleanly cracked)</description>
 		<year>1989</year>
 		<publisher>Broderbund Software</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -349,7 +340,6 @@
 		<description>Dungeon Master's Assistant (cleanly cracked)</description>
 		<year>1988</year>
 		<publisher>Strategic Simulations</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -369,7 +359,6 @@
 		<description>Genesis (cleanly cracked)</description>
 		<year>1983</year>
 		<publisher>Datasoft / Design Labs</publisher>
-		<!-- No compatibility data known at this time. -->
 		<!-- Original disk wouldn't boot on 65C02 or later -->
 
 		<part name="flop1" interface="floppy_5_25">
@@ -383,7 +372,6 @@
 		<description>Ghostbusters (cleanly cracked)</description>
 		<year>1984</year>
 		<publisher>Activision</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -396,7 +384,6 @@
 		<description>Hardball (cleanly cracked)</description>
 		<year>1985</year>
 		<publisher>Accolade</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -409,7 +396,6 @@
 		<description>Hard Hat Mack (cleanly cracked)</description>
 		<year>1983</year>
 		<publisher>Electronic Arts</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -422,7 +408,6 @@
 		<description>Law of the West (cleanly cracked)</description>
 		<year>1985</year>
 		<publisher>Accolade</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -436,7 +421,6 @@
 		<year>1985</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2017-01-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -449,7 +433,6 @@
 		<description>Miner 2049er (cleanly cracked)</description>
 		<year>1982</year>
 		<publisher>Micro Fun</publisher>
-		<!-- No compatibility data known at this time. -->
 		<!-- High scores stored on disc, reset to AAA 5000, AAA 4000, AAA 3000, AAA 2000 & AAA 1000 -->
 
 		<part name="flop1" interface="floppy_5_25">
@@ -464,7 +447,6 @@
 		<year>1985</year>
 		<publisher>Datasoft</publisher>
 		<info name="release" value="2015-07-05"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- Crack was updated on 2015-07-05 to fix corrupted blocks. -->
 
 		<part name="flop1" interface="floppy_5_25">
@@ -479,7 +461,6 @@
 		<year>1983</year>
 		<publisher>Atari</publisher>
 		<info name="release" value="2015-03-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -493,7 +474,6 @@
 		<year>1983</year>
 		<publisher>Atari</publisher>
 		<info name="release" value="2015-03-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -507,7 +487,6 @@
 		<year>1983</year>
 		<publisher>Datasoft</publisher>
 		<info name="release" value="2015-03-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -521,7 +500,6 @@
 		<year>1983</year>
 		<publisher>Thunder Mountain</publisher>
 		<info name="release" value="2015-05-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -535,7 +513,6 @@
 		<year>1986</year>
 		<publisher>Mindscape / Atari</publisher>
 		<info name="release" value="2014-05-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -548,7 +525,6 @@
 		<description>Pigpen (cleanly cracked)</description>
 		<year>1982</year>
 		<publisher>Datamost / TMQ Software</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -561,7 +537,6 @@
 		<description>Pipe Dream (cleanly cracked)</description>
 		<year>1990</year>
 		<publisher>Lucasfilm</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -574,7 +549,6 @@
 		<description>Qix (cleanly cracked)</description>
 		<year>1989</year>
 		<publisher>Taito</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -588,7 +562,6 @@
 		<year>1985</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2014-12-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -602,7 +575,6 @@
 		<year>1985</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2014-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -615,7 +587,6 @@
 		<description>Rampage (cleanly cracked)</description>
 		<year>1988</year>
 		<publisher>Activision</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -626,10 +597,9 @@
 
 	<software name="renegade">
 		<description>Renegade (cleanly cracked)</description>
-		<!-- ProDOS 8 based & hard drive compatable -->
 		<year>1988</year>
 		<publisher>Taito America / NovaLogic</publisher>
-		<!-- No compatibility data known at this time. -->
+		<!-- ProDOS 8 based & hard drive compatable -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -649,7 +619,6 @@
 		<description>Shanghai (cleanly cracked)</description>
 		<year>1986</year>
 		<publisher>Activision</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -662,7 +631,6 @@
 		<description>Sneakers (cleanly cracked)</description>
 		<year>1981</year>
 		<publisher>Sirius Software</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -675,7 +643,6 @@
 		<description>Spindizzy (cleanly cracked)</description>
 		<year>1986</year>
 		<publisher>Activision</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -688,7 +655,6 @@
 		<description>Tapper (cleanly cracked)</description>
 		<year>1983</year>
 		<publisher>Bally/Midway</publisher>
-		<!-- No compatibility data known at this time. -->
 		<!-- Corrected rerip 09/19/2016 -->
 
 		<part name="flop1" interface="floppy_5_25">
@@ -702,10 +668,11 @@
 		<description>Thief (cleanly cracked)</description>
 		<year>1981</year>
 		<publisher>Datamost</publisher>
-		<!-- No compatibility data known at this time. -->
-		<!-- Apple II clone of Berzerk arcade game by Bob Flanagan - Thief: "The damn things nearly killed me." -->
-		<!-- All files transfered from a highly protected DOS 3.2 disc to a PronoDOS disc -->
-		<!-- Also includes a single file BRUNable conversion of the game -->
+		<!-- Apple II clone of Berzerk arcade game by Bob Flanagan -
+		Thief: "The damn things nearly killed me." -->
+		<!-- All files transfered from a highly protected DOS 3.2 disc to a
+		PronoDOS disc. Also includes a single file BRUNable conversion of the
+		game. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -718,7 +685,6 @@
 		<description>Xevious (cleanly cracked)</description>
 		<year>1983</year>
 		<publisher>Mindscape</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -731,7 +697,6 @@
 		<description>1-2-3 Sequence Me (cleanly cracked)</description>
 		<year>1991</year>
 		<publisher>Sunburst Communications</publisher>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -745,7 +710,6 @@
 		<year>1987</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2015-04-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -766,7 +730,6 @@
 		<year>1987</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2015-07-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -787,7 +750,6 @@
 		<year>1985</year>
 		<publisher>Scott, Foresman and Company</publisher>
 		<info name="release" value="2014-08-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -800,7 +762,7 @@
 		<description>Mathematics Courseware Series: Addition and Subtraction 2 (cleanly cracked)</description>
 		<year>1985</year>
 		<publisher>Scott, Foresman and Company</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2017-04-18"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -814,7 +776,6 @@
 		<year>1986</year>
 		<publisher>Alfred Publishing Company</publisher>
 		<info name="release" value="2014-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -828,7 +789,6 @@
 		<year>1984</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-05-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -842,7 +802,6 @@
 		<year>1984</year>
 		<publisher>NeoSoft</publisher>
 		<info name="release" value="2015-05-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -856,7 +815,6 @@
 		<year>1985</year>
 		<publisher>Windham Classics</publisher>
 		<info name="release" value="2015-05-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -877,7 +835,6 @@
 		<year>1982</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2014-04-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -892,7 +849,6 @@
 		<publisher>Davidson &amp; Associates, Inc.</publisher>
 		<info name="release" value="2014-11-17"/>
 		<info name="usage" value="Works with Apple II Mouse Card in slot 4: -sl4 mouse" />
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Program Disk Side 1"/>
@@ -925,7 +881,6 @@
 		<year>1987</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2015-03-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -939,7 +894,6 @@
 		<year>1982</year>
 		<publisher>Developmental Learning Materials</publisher>
 		<info name="release" value="2015-03-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -975,7 +929,6 @@
 		<year>1985</year>
 		<publisher>Unicorn Software</publisher>
 		<info name="release" value="2014-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -997,7 +950,6 @@
 		<publisher>Taito America</publisher>
 		<info name="release" value="2015-03-03"/>
 		<info name="usage" value="Works with Apple II Mouse Card in slot 4: -sl4 mouse" />
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1010,7 +962,7 @@
 		<description>BallBlazer (cleanly cracked)</description>
 		<year>1985</year>
 		<publisher>Lucasfilm Games</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-05-13"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1024,7 +976,6 @@
 		<year>1986</year>
 		<publisher>Abraxas Basic Courseware</publisher>
 		<info name="release" value="2014-07-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1037,7 +988,7 @@
 		<description>Basic Vocabulary Builder Demo (cleanly cracked)</description>
 		<year>1984</year>
 		<publisher>National Textbook Company</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-02-01"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1051,7 +1002,6 @@
 		<year>1981</year>
 		<publisher>Sirius Software</publisher>
 		<info name="release" value="2015-05-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1065,7 +1015,6 @@
 		<year>1991</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2015-03-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 Side A"/>
@@ -1098,7 +1047,6 @@
 		<year>1985</year>
 		<publisher>Quest Learning Systems</publisher>
 		<info name="release" value="2014-09-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1112,7 +1060,6 @@
 		<year>1985</year>
 		<publisher>Quest Learning Systems</publisher>
 		<info name="release" value="2014-09-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1125,7 +1072,7 @@
 		<description>Binomial Multiplication (Mindscape) (cleanly cracked)</description>
 		<year>1984</year>
 		<publisher>Mindscape</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2014-11-13"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1138,8 +1085,8 @@
 		<description>Blazing Paddles (cleanly cracked)</description>
 		<year>1985</year>
 		<publisher>Baudville</publisher>
+		<info name="release" value="2014-08-20"/>
 		<info name="usage" value="Works with Apple II Mouse Card in slot 4: -sl4 mouse" />
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1152,7 +1099,7 @@
 		<description>Bumble Games (cleanly cracked)</description>
 		<year>1982</year>
 		<publisher>The Learning Company</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2017-04-18"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1165,7 +1112,7 @@
 		<description>Boppie's Great Word Chase (cleanly cracked)</description>
 		<year>1985</year>
 		<publisher>Developmental Learning Materials</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2014-12-03"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1178,7 +1125,7 @@
 		<description>Bounce (cleanly cracked)</description>
 		<year>1988</year>
 		<publisher>Sunburst Communications</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-03-17"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1191,7 +1138,7 @@
 		<description>Bridge 4.0 (cleanly cracked)</description>
 		<year>1983</year>
 		<publisher>Artworx</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2014-10-28"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1205,7 +1152,6 @@
 		<year>1982</year>
 		<publisher>Mattel Electronics</publisher>
 		<info name="release" value="2015-12-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1219,7 +1165,6 @@
 		<year>1983</year>
 		<publisher>Atarisoft</publisher>
 		<info name="release" value="2015-03-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1233,7 +1178,6 @@
 		<year>1987</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2014-08-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -1254,7 +1198,6 @@
 		<year>1986</year>
 		<publisher>Hartley Courseware, Inc.</publisher>
 		<info name="release" value="2014-12-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1268,7 +1211,6 @@
 		<year>1986</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-02-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1281,7 +1223,7 @@
 		<description>Cat 'n Mouse (cleanly cracked)</description>
 		<year>1986</year>
 		<publisher>Mindplay</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-03-28"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1294,7 +1236,7 @@
 		<description>Centipede (cleanly cracked)</description>
 		<year>1983</year>
 		<publisher>Atarisoft</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-03-18"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1308,7 +1250,6 @@
 		<year>1989</year>
 		<publisher>Developmental Learning Materials</publisher>
 		<info name="release" value="2015-01-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -1329,7 +1270,6 @@
 		<year>1989</year>
 		<publisher>Developmental Learning Materials</publisher>
 		<info name="release" value="2014-04-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -1349,7 +1289,7 @@
 		<description>Challenge Math (cleanly cracked)</description>
 		<year>1982</year>
 		<publisher>Sunburst Communications</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2014-08-19"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1363,7 +1303,6 @@
 		<year>1985</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2015-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -1384,7 +1323,6 @@
 		<year>1984</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2015-02-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -1405,7 +1343,6 @@
 		<year>1984</year>
 		<publisher>Broderbund Software</publisher>
 		<info name="release" value="2015-03-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1419,7 +1356,6 @@
 		<year>1986</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2015-03-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -1440,7 +1376,6 @@
 		<year>1985</year>
 		<publisher>The Math Lab</publisher>
 		<info name="release" value="2014-09-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1453,7 +1388,7 @@
 		<description>Classifying Animals with Backbones (cleanly cracked)</description>
 		<year>1985</year>
 		<publisher>D.C. Heath and Company</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-01-30"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1466,7 +1401,7 @@
 		<description>ClassMate (cleanly cracked)</description>
 		<year>1987</year>
 		<publisher>Davidson and Associates</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2014-09-12"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1479,9 +1414,10 @@
 		<description>Color Me (cleanly cracked)</description>
 		<year>1985</year>
 		<publisher>Mindscape</publisher>
-		<!-- No compatibility data known at this time. -->
-		<!-- Missing: Tink Tonk side B needs to be redumped as the existing image is
-		a duplicate of Hugga Bunch side A. -->
+		<info name="release" value="2014-08-19"/>
+		<info name="usage" value="Side B of Tink Tonk remains missing." />
+		<!-- Missing: Tink Tonk side B needs to be redumped as the existing
+		image is a duplicate of Hugga Bunch side A. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Program Disk"/>
@@ -1514,7 +1450,6 @@
 		<year>1987</year>
 		<publisher>Data East</publisher>
 		<info name="release" value="2015-03-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1528,7 +1463,6 @@
 		<year>1982</year>
 		<publisher>Edu-Ware Services Inc.</publisher>
 		<info name="release" value="2014-09-22"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- The on-disk main menu says "Ver. 3.4  25 Jan 82" -->
 
 		<part name="flop1" interface="floppy_5_25">
@@ -1543,7 +1477,6 @@
 		<year>1984</year>
 		<publisher>Datasoft</publisher>
 		<info name="release" value="2014-05-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -1569,7 +1502,7 @@
 		<description>Cotton Tales (cleanly cracked)</description>
 		<year>1987</year>
 		<publisher>Mindplay</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-03-28"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1582,7 +1515,7 @@
 		<description>Creature Creator (cleanly cracked)</description>
 		<year>1983</year>
 		<publisher>DesignWare</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-02-22"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1596,7 +1529,6 @@
 		<year>1988</year>
 		<publisher>Pelican Software</publisher>
 		<info name="release" value="2015-04-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -1617,7 +1549,6 @@
 		<year>1983</year>
 		<publisher>Davka Corporation</publisher>
 		<info name="release" value="2014-09-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1631,7 +1562,6 @@
 		<year>1983</year>
 		<publisher>DesignWare</publisher>
 		<info name="release" value="2014-04-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1645,7 +1575,6 @@
 		<year>1988</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2014-05-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1659,7 +1588,6 @@
 		<year>1986</year>
 		<publisher>Developmental Learning Materials</publisher>
 		<info name="release" value="2014-05-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1673,7 +1601,6 @@
 		<year>1982</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2014-08-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1686,7 +1613,7 @@
 		<description>Defender (cleanly cracked)</description>
 		<year>1983</year>
 		<publisher>Atarisoft</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-03-27"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1700,7 +1627,6 @@
 		<year>1982</year>
 		<publisher>Spinnaker</publisher>
 		<info name="release" value="2014-08-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1714,7 +1640,6 @@
 		<year>1983</year>
 		<publisher>Atarisoft</publisher>
 		<info name="release" value="2015-03-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1728,7 +1653,6 @@
 		<year>1983</year>
 		<publisher>Thunder Mountain</publisher>
 		<info name="release" value="2015-05-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1742,7 +1666,6 @@
 		<year>1992</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-02-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1756,7 +1679,6 @@
 		<year>1983</year>
 		<publisher>Micro Fun</publisher>
 		<info name="release" value="2014-03-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1770,7 +1692,6 @@
 		<year>1984</year>
 		<publisher>Advanced Ideas, Inc.</publisher>
 		<info name="release" value="2014-05-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1784,7 +1705,6 @@
 		<year>1988</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2015-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1797,7 +1717,7 @@
 		<description>Donkey Kong (cleanly cracked)</description>
 		<year>1983</year>
 		<publisher>Atarisoft</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-03-18"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1811,7 +1731,6 @@
 		<year>1982</year>
 		<publisher>Screenplay</publisher>
 		<info name="release" value="2014-06-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1825,7 +1744,6 @@
 		<year>1984</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2015-03-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1838,7 +1756,7 @@
 		<description>Design Your Own Home: Architectural Design (cleanly cracked)</description>
 		<year>1984</year>
 		<publisher>Avant-Garde Publishing Corp.</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-03-17"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Program disk (no mouse)"/>
@@ -1864,7 +1782,7 @@
 		<description>Design Your Own Home: Interior Design (cleanly cracked)</description>
 		<year>1986</year>
 		<publisher>Avant-Garde Publishing Corp.</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-01-12"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Program disk (no mouse)"/>
@@ -1891,7 +1809,6 @@
 		<year>1984</year>
 		<publisher>Springboard Software</publisher>
 		<info name="release" value="2014-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1904,7 +1821,7 @@
 		<description>Easy Reader Demo (cleanly cracked)</description>
 		<year>1983</year>
 		<publisher>American Educational Computer, Inc.</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2014-08-21"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -1937,7 +1854,6 @@
 		<year>1988</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2015-03-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1952,7 +1868,6 @@
 		<publisher>Polarware</publisher>
 		<info name="release" value="2014-08-19"/>
 		<info name="usage" value="Works with Apple II Mouse Card in slot 4: -sl4 mouse" />
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -1966,7 +1881,6 @@
 		<year>1985</year>
 		<publisher>Grolier</publisher>
 		<info name="release" value="2015-02-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -1987,7 +1901,6 @@
 		<year>1982</year>
 		<publisher>Springboard Software</publisher>
 		<info name="release" value="2014-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2001,7 +1914,6 @@
 		<year>1985</year>
 		<publisher>DesignWare, Inc.</publisher>
 		<info name="release" value="2014-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2015,7 +1927,6 @@
 		<year>1988</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2014-11-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2029,7 +1940,6 @@
 		<year>1984</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2014-11-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2042,7 +1952,7 @@
 		<description>Facemaker (cleanly cracked)</description>
 		<year>1982</year>
 		<publisher>Spinnaker</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2014-08-09"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2056,7 +1966,6 @@
 		<year>1981</year>
 		<publisher>Piccadilly Software</publisher>
 		<info name="release" value="2015-04-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2070,7 +1979,6 @@
 		<year>1983</year>
 		<publisher>Methods &amp; Solutions</publisher>
 		<info name="release" value="2014-08-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2084,7 +1992,6 @@
 		<year>1983</year>
 		<publisher>Methods &amp; Solutions</publisher>
 		<info name="release" value="2017-12-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2098,7 +2005,6 @@
 		<year>1984</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2014-11-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2112,7 +2018,6 @@
 		<year>1981</year>
 		<publisher>Advanced Operating Systems</publisher>
 		<info name="release" value="2014-09-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2126,7 +2031,6 @@
 		<year>1983</year>
 		<publisher>Microcomputer Workships Courseware</publisher>
 		<info name="release" value="2015-03-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2140,7 +2044,6 @@
 		<year>1983</year>
 		<publisher>The Computer Colorworks</publisher>
 		<info name="release" value="2014-08-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2154,7 +2057,6 @@
 		<year>1990</year>
 		<publisher>Queue, Inc.</publisher>
 		<info name="release" value="2015-03-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -2175,7 +2077,6 @@
 		<year>1985</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2014-04-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2189,7 +2090,6 @@
 		<year>1989</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2015-03-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2203,7 +2103,6 @@
 		<year>1987</year>
 		<publisher>Silver Burdett Company</publisher>
 		<info name="release" value="2014-07-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2217,7 +2116,6 @@
 		<year>19??</year>
 		<publisher>Opportunities For Learning</publisher>
 		<info name="release" value="2015-01-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -2238,7 +2136,6 @@
 		<year>1984</year>
 		<publisher>Developmental Learning Materials</publisher>
 		<info name="release" value="2015-03-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2252,7 +2149,6 @@
 		<year>1982</year>
 		<publisher>Control Data Corporation</publisher>
 		<info name="release" value="2014-05-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2265,7 +2161,7 @@
 		<description>Frogs, Dogs, Kittens, and Kids 1 (cleanly cracked)</description>
 		<year>1988</year>
 		<publisher>Hartley Courseware</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2014-08-20"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -2292,7 +2188,6 @@
 		<year>1984</year>
 		<publisher>Sega Enterprises Inc.</publisher>
 		<info name="release" value="2015-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2306,7 +2201,6 @@
 		<year>1981</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2015-03-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2320,7 +2214,6 @@
 		<year>1985</year>
 		<publisher>Scott, Foresman and Company</publisher>
 		<info name="release" value="2014-05-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2334,7 +2227,6 @@
 		<year>1983</year>
 		<publisher>Atarisoft</publisher>
 		<info name="release" value="2015-03-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2348,7 +2240,6 @@
 		<year>1983</year>
 		<publisher>Thunder Mountain</publisher>
 		<info name="release" value="2015-05-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2362,7 +2253,6 @@
 		<year>1985</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2015-01-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -2382,7 +2272,7 @@
 		<description>Gene Machine (Version 2.0) (cleanly cracked)</description>
 		<year>1983</year>
 		<publisher>HRM Software</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-04-27"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2395,7 +2285,7 @@
 		<description>Gertrude's Secrets (Version 1.2) (cleanly cracked)</description>
 		<year>1982</year>
 		<publisher>The Learning Company</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2014-08-19"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2409,7 +2299,6 @@
 		<year>1986</year>
 		<publisher>Davidson &amp; Associates, Inc.</publisher>
 		<info name="release" value="2015-04-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -2430,7 +2319,6 @@
 		<year>1987</year>
 		<publisher>Davidson &amp; Associates, Inc.</publisher>
 		<info name="release" value="2019-05-10"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- On May 10th, 2019, updated disk image from new source to fix some
 		minor data corruption on side A, track $1C -->
 
@@ -2452,7 +2340,7 @@
 		<description>Grammar Mastery II (cleanly cracked)</description>
 		<year>1987</year>
 		<publisher>American Language Academy</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-01-16"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk A-1"/>
@@ -2563,7 +2451,6 @@
 		<year>1986</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2015-04-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2577,7 +2464,6 @@
 		<year>1984</year>
 		<publisher>Atarisoft</publisher>
 		<info name="release" value="2015-03-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2591,7 +2477,6 @@
 		<year>1984</year>
 		<publisher>Microcomputer Workshops Courseware</publisher>
 		<info name="release" value="2014-04-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2605,7 +2490,6 @@
 		<year>1985</year>
 		<publisher>The Avalon Hill Game Company</publisher>
 		<info name="release" value="2014-06-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2618,7 +2502,8 @@
 		<description>Gumball (cleanly cracked)</description>
 		<year>1983</year>
 		<publisher>Broderbund Software</publisher>
-		<!-- Corrected image 09/24/2016 -->
+		<info name="release" value="2016-06-08"/>
+		<!-- Corrected image September 24th, 2016 -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2632,7 +2517,6 @@
 		<year>1983</year>
 		<publisher>HRM Software</publisher>
 		<info name="release" value="2015-05-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2646,7 +2530,6 @@
 		<year>1983</year>
 		<publisher>Spinnaker</publisher>
 		<info name="release" value="2015-01-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2660,7 +2543,6 @@
 		<year>1985</year>
 		<publisher>Spinnaker</publisher>
 		<info name="release" value="2014-05-22"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -2705,7 +2587,6 @@
 		<year>1988</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-01-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -2726,7 +2607,6 @@
 		<year>1988</year>
 		<publisher>Decision Development</publisher>
 		<info name="release" value="2014-09-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -2747,7 +2627,6 @@
 		<year>1987</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2014-05-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2761,7 +2640,6 @@
 		<year>1988</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2014-09-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -2805,7 +2683,6 @@
 		<year>1985</year>
 		<publisher>HRM Software</publisher>
 		<info name="release" value="2014-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2824,7 +2701,6 @@
 		<year>1988</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2014-04-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2838,7 +2714,6 @@
 		<year>1983</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2016-09-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -2858,7 +2733,7 @@
 		<description>Jungle Hunt (cleanly cracked)</description>
 		<year>1984</year>
 		<publisher>Atarisoft</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-03-18"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2871,7 +2746,7 @@
 		<description>Ken Uston's Professional Blackjack (Version 1.23) (cleanly cracked)</description>
 		<year>1983</year>
 		<publisher>Intelligent Statements, Inc.</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-03-02"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2885,7 +2760,6 @@
 		<year>1983</year>
 		<publisher>Spinnaker</publisher>
 		<info name="release" value="2014-03-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2899,7 +2773,6 @@
 		<year>1983</year>
 		<publisher>Spinnaker</publisher>
 		<info name="release" value="2014-04-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2912,7 +2785,7 @@
 		<description>Kittens, Kids, and a Frog (Version 01.11.85) (cleanly cracked)</description>
 		<year>1985</year>
 		<publisher>Hartley Courseware, Inc.</publisher>
-		<!-- No compatibility data known at this time. -->
+		<info name="release" value="2015-03-07"/>
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -2933,7 +2806,6 @@
 		<year>1987</year>
 		<publisher>Academic Hallmarks</publisher>
 		<info name="release" value="2014-10-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2947,7 +2819,6 @@
 		<year>1981</year>
 		<publisher>Krell</publisher>
 		<info name="release" value="2014-05-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2974,7 +2845,6 @@
 		<year>1986</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2016-03-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -2988,7 +2858,6 @@
 		<year>1984</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2016-03-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3002,7 +2871,6 @@
 		<year>1984</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-12-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3029,7 +2897,6 @@
 		<year>1983</year>
 		<publisher>Space-Time Associates</publisher>
 		<info name="release" value="2018-10-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3043,7 +2910,6 @@
 		<year>1990</year>
 		<publisher>General Quarters Software</publisher>
 		<info name="release" value="2017-07-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3062,7 +2928,6 @@
 		<year>1980</year>
 		<publisher>Avant-Garde Creations</publisher>
 		<info name="release" value="2016-02-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3076,7 +2941,6 @@
 		<year>1981</year>
 		<publisher>Applecart Programs for Education</publisher>
 		<info name="release" value="2015-07-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - The Great Land"/>
@@ -3158,7 +3022,6 @@
 		<year>1982</year>
 		<publisher>Krell Software</publisher>
 		<info name="release" value="2014-08-20"/>
-		<!-- No compatibility data known at this time. -->
 		<!--"Alice in Logoland" is a disk of sample Logo programs that was
 		bundled with Krell's Logo, distributed by Krell Software. -->
 
@@ -3174,7 +3037,6 @@
 		<year>1985</year>
 		<publisher>Windham Classics</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3193,7 +3055,6 @@
 		<year>1985</year>
 		<publisher>Alfred Publishing Company</publisher>
 		<info name="release" value="2015-06-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -3214,7 +3075,6 @@
 		<year>1984</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2015-04-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3228,7 +3088,6 @@
 		<year>1981</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2015-07-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3242,7 +3101,6 @@
 		<year>1983</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2015-08-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3256,7 +3114,6 @@
 		<year>1983</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2015-08-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3270,7 +3127,6 @@
 		<year>1983</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2015-08-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3284,7 +3140,6 @@
 		<year>1984</year>
 		<publisher>Peachtree Software</publisher>
 		<info name="release" value="2016-04-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3298,7 +3153,6 @@
 		<year>1984</year>
 		<publisher>Peachtree Software</publisher>
 		<info name="release" value="2016-04-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3312,7 +3166,6 @@
 		<year>1985</year>
 		<publisher>Davidson &amp; Associates</publisher>
 		<info name="release" value="2016-12-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -3333,7 +3186,6 @@
 		<year>1982</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2015-11-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3347,7 +3199,6 @@
 		<year>1982</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2017-09-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3361,7 +3212,6 @@
 		<year>1985</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2017-06-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3375,9 +3225,8 @@
 		<year>1984</year>
 		<publisher>Josten Learning Systems</publisher>
 		<info name="release" value="2018-01-21"/>
-		<!-- No compatibility data known at this time. -->
-		<!-- This crack was updated on 01-21-2018 to correct minor data corruption
-		on disk 2 at T1B,S0E. -->
+		<!-- This crack was updated on 01-21-2018 to correct minor data
+		corruption on disk 2 at T1B,S0E. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Addition and subtraction"/>
@@ -3398,7 +3247,6 @@
 		<year>1987</year>
 		<publisher>Unicorn Software</publisher>
 		<info name="release" value="2018-11-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3422,7 +3270,6 @@
 		<year>1983</year>
 		<publisher>Davka Corporation</publisher>
 		<info name="release" value="2017-08-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3446,7 +3293,6 @@
 		<year>1984</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2016-04-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3460,7 +3306,6 @@
 		<year>1982</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2015-07-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3474,7 +3319,6 @@
 		<year>1982</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2017-09-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3488,7 +3332,6 @@
 		<year>1984</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-06-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3502,7 +3345,6 @@
 		<year>1983</year>
 		<publisher>Reader's Digest Software</publisher>
 		<info name="release" value="2017-01-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3516,7 +3358,6 @@
 		<year>1983</year>
 		<publisher>South-Western Publishing Co.</publisher>
 		<info name="release" value="2017-04-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3530,7 +3371,6 @@
 		<year>1983</year>
 		<publisher>South-Western Publishing Co.</publisher>
 		<info name="release" value="2017-04-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3544,7 +3384,6 @@
 		<year>1984</year>
 		<publisher>Intellectual Software</publisher>
 		<info name="release" value="2016-01-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3558,7 +3397,6 @@
 		<year>1980</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3572,7 +3410,6 @@
 		<year>1983</year>
 		<publisher>Methods &amp; Solutions</publisher>
 		<info name="release" value="2017-04-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3586,7 +3423,6 @@
 		<year>1985</year>
 		<publisher>Litag</publisher>
 		<info name="release" value="2015-07-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3600,7 +3436,6 @@
 		<year>1986</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2018-01-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 Side A"/>
@@ -3645,7 +3480,6 @@
 		<year>1985</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2017-01-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 Side A"/>
@@ -3690,7 +3524,6 @@
 		<year>1984</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2017-05-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3704,7 +3537,6 @@
 		<year>1985</year>
 		<publisher>Intellectual Software</publisher>
 		<info name="release" value="2016-02-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3743,7 +3575,6 @@
 		<year>1984</year>
 		<publisher>Micro Learningware</publisher>
 		<info name="release" value="2017-02-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3757,7 +3588,6 @@
 		<year>1986</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2016-12-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3771,7 +3601,6 @@
 		<year>1984</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2016-09-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3788,9 +3617,8 @@
 	<software name="ancleg">
 		<description>Ancient Legends (cleanly cracked)</description>
 		<year>2016</year>
-		<publisher>none(*)</publisher>
+		<publisher>No Publisher</publisher>
 		<info name="release" value="2016-09-08"/>
-		<!-- No compatibility data known at this time. -->
 		<!--"Ancient Legends" is a 2016 roleplaying adventure game by
 		Seth Sternberger, Martin Haye, Brendan Robert, Dave Schmenk, and
 		Andrew Hogan. This is version 1.0, released at Kansasfest 2016.
@@ -3818,7 +3646,6 @@
 		<year>1992</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-02-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3832,7 +3659,6 @@
 		<year>1985</year>
 		<publisher>Learning Technologies</publisher>
 		<info name="release" value="2017-03-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3846,7 +3672,6 @@
 		<year>1989</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-04-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3860,7 +3685,6 @@
 		<year>1989</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-04-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3874,7 +3698,6 @@
 		<year>1986</year>
 		<publisher>Broderbund Software</publisher>
 		<info name="release" value="2017-06-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -3907,7 +3730,6 @@
 		<year>1983</year>
 		<publisher>Datamost</publisher>
 		<info name="release" value="2017-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3921,7 +3743,6 @@
 		<year>1983</year>
 		<publisher>MUSE Software</publisher>
 		<info name="release" value="2016-04-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -3942,7 +3763,6 @@
 		<year>1987</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2015-09-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3956,7 +3776,6 @@
 		<year>1987</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-09-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3970,7 +3789,6 @@
 		<year>1983</year>
 		<publisher>Parrot Software</publisher>
 		<info name="release" value="2017-09-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3984,7 +3802,6 @@
 		<year>1983</year>
 		<publisher>Parrot Software</publisher>
 		<info name="release" value="2018-03-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -3998,7 +3815,6 @@
 		<year>1983</year>
 		<publisher>Parrot Software</publisher>
 		<info name="release" value="2017-09-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4012,7 +3828,6 @@
 		<year>1985</year>
 		<publisher>Parrot Software</publisher>
 		<info name="release" value="2017-09-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4026,7 +3841,6 @@
 		<year>1983</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2017-01-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4040,10 +3854,9 @@
 		<year>1983</year>
 		<publisher>Shawnee Mission Unified School District</publisher>
 		<info name="release" value="2017-09-17"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- Bill Sandburg appears to have been employed by Shanee Mission USD
 		as head of telecommunications from basic research. This is backed up by
-		the "Property of A.V. Repair USD 512"   text. -->
+		the "Property of A.V. Repair USD 512" text. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4057,7 +3870,6 @@
 		<year>1981</year>
 		<publisher>Apple Computer</publisher>
 		<info name="release" value="2017-01-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4071,7 +3883,6 @@
 		<year>1982</year>
 		<publisher>Synergistic Software</publisher>
 		<info name="release" value="2017-07-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4085,7 +3896,6 @@
 		<year>1983</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2017-01-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4099,7 +3909,6 @@
 		<year>1984</year>
 		<publisher>Penguin Software</publisher>
 		<info name="release" value="2018-09-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4113,7 +3922,6 @@
 		<year>1984</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4127,7 +3935,6 @@
 		<year>1985</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4141,8 +3948,8 @@
 		<year>1984</year>
 		<publisher>ARCO Publishing</publisher>
 		<info name="release" value="2017-04-21"/>
-		<!-- No compatibility data known at this time. -->
-		<!-- Note from 4AM: Disk 3 was damaged beyond my ability to repair it. -->
+		<!-- Note from 4AM: Disk 3 was damaged beyond my ability to repair
+		it. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -4193,7 +4000,6 @@
 		<year>1986</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4207,7 +4013,6 @@
 		<year>1983</year>
 		<publisher>Datamost</publisher>
 		<info name="release" value="2017-06-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4221,7 +4026,6 @@
 		<year>1984</year>
 		<publisher>Border Software</publisher>
 		<info name="release" value="2017-01-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4235,7 +4039,6 @@
 		<year>1983</year>
 		<publisher>Datamost</publisher>
 		<info name="release" value="2017-06-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4249,7 +4052,6 @@
 		<year>1983</year>
 		<publisher>Parrot Software</publisher>
 		<info name="release" value="2017-09-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4263,7 +4065,6 @@
 		<year>1981</year>
 		<publisher>I.M.C.</publisher>
 		<info name="release" value="2017-04-22"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4277,7 +4078,6 @@
 		<year>1988</year>
 		<publisher>Advanced Ideas</publisher>
 		<info name="release" value="2016-02-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -4316,7 +4116,6 @@
 		<year>1985</year>
 		<publisher>Origin Software</publisher>
 		<info name="release" value="2016-12-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4335,7 +4134,6 @@
 		<year>1983</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4349,7 +4147,6 @@
 		<year>1984</year>
 		<publisher>Blue Ridge Software</publisher>
 		<info name="release" value="2017-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -4384,7 +4181,6 @@
 		<year>1986</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2017-08-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4398,7 +4194,6 @@
 		<year>1985</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2015-07-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4417,7 +4212,6 @@
 		<year>1985</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2017-01-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4436,7 +4230,6 @@
 		<year>1984</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2017-01-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4455,7 +4248,6 @@
 		<year>1992</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2017-05-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4484,7 +4276,6 @@
 		<year>1992</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2017-05-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4513,7 +4304,6 @@
 		<year>1984</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-12-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4527,7 +4317,6 @@
 		<year>1985</year>
 		<publisher>Blue Chip Software</publisher>
 		<info name="release" value="2015-12-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4546,7 +4335,6 @@
 		<year>1986</year>
 		<publisher>Media Materials</publisher>
 		<info name="release" value="2017-07-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4560,7 +4348,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-01-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4574,7 +4361,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-01-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4588,7 +4374,6 @@
 		<year>1985</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2018-01-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4602,7 +4387,6 @@
 		<year>1986</year>
 		<publisher>Hearlihy &amp; Co.</publisher>
 		<info name="release" value="2017-11-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4616,7 +4400,6 @@
 		<year>1980</year>
 		<publisher>K-12 Micro Media</publisher>
 		<info name="release" value="2016-01-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4630,7 +4413,6 @@
 		<year>1983</year>
 		<publisher>Encyclopaedia Britannica</publisher>
 		<info name="release" value="2016-01-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4644,7 +4426,6 @@
 		<year>1983</year>
 		<publisher>Encyclopaedia Britannica</publisher>
 		<info name="release" value="2016-01-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4658,7 +4439,6 @@
 		<year>1983</year>
 		<publisher>Encyclopaedia Britannica</publisher>
 		<info name="release" value="2016-01-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4682,7 +4462,6 @@
 		<year>1983</year>
 		<publisher>Encyclopaedia Britannica</publisher>
 		<info name="release" value="2016-01-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4696,7 +4475,6 @@
 		<year>1983</year>
 		<publisher>Encyclopaedia Britannica</publisher>
 		<info name="release" value="2016-01-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4720,7 +4498,6 @@
 		<year>1984</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2017-12-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4734,7 +4511,6 @@
 		<year>1981</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2015-03-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4748,7 +4524,6 @@
 		<year>1981</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2016-09-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4762,7 +4537,6 @@
 		<year>1981</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2016-09-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4776,7 +4550,6 @@
 		<year>1985</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2018-01-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4790,7 +4563,6 @@
 		<year>1984</year>
 		<publisher>National Textbook Company</publisher>
 		<info name="release" value="2016-03-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4809,7 +4581,6 @@
 		<year>1985</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4823,7 +4594,6 @@
 		<year>1987</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4842,7 +4612,6 @@
 		<year>1982</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4856,7 +4625,6 @@
 		<year>1986</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4875,7 +4643,6 @@
 		<year>1985</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-10-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4894,7 +4661,6 @@
 		<year>1982</year>
 		<publisher>Milliken Publishing Company</publisher>
 		<info name="release" value="2015-08-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4908,7 +4674,6 @@
 		<year>1983</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2016-07-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4922,7 +4687,6 @@
 		<year>1985</year>
 		<publisher>Methods and Solutions</publisher>
 		<info name="release" value="2016-07-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4936,7 +4700,6 @@
 		<year>1982</year>
 		<publisher>Hayden Book Company</publisher>
 		<info name="release" value="2017-10-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4950,7 +4713,6 @@
 		<year>1984</year>
 		<publisher>Windham Classics</publisher>
 		<info name="release" value="2018-11-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4969,7 +4731,6 @@
 		<year>1983</year>
 		<publisher>Berserker Works</publisher>
 		<info name="release" value="2018-11-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4983,7 +4744,6 @@
 		<year>1983</year>
 		<publisher>Search Software</publisher>
 		<info name="release" value="2017-02-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -4997,7 +4757,6 @@
 		<year>1986</year>
 		<publisher>Santa Barbara Softworks</publisher>
 		<info name="release" value="2017-09-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5016,7 +4775,6 @@
 		<year>1990</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2017-05-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5045,7 +4803,6 @@
 		<year>1983</year>
 		<publisher>SoftArt Games</publisher>
 		<info name="release" value="2016-12-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5059,7 +4816,6 @@
 		<year>1985</year>
 		<publisher>Learning Technologies</publisher>
 		<info name="release" value="2016-07-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5073,7 +4829,6 @@
 		<year>1985</year>
 		<publisher>Quest Learning Systems</publisher>
 		<info name="release" value="2016-09-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5087,7 +4842,6 @@
 		<year>1986</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2016-12-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5101,7 +4855,6 @@
 		<year>1986</year>
 		<publisher>D.C. Heath and Company</publisher>
 		<info name="release" value="2017-09-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5115,7 +4868,6 @@
 		<year>1984</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-12-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5129,7 +4881,6 @@
 		<year>1987</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-05-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5165,7 +4916,6 @@
 		<year>1982</year>
 		<publisher>Synergistic Software</publisher>
 		<info name="release" value="2018-10-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5179,7 +4929,6 @@
 		<year>1982</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-10-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5193,7 +4942,6 @@
 		<year>1985</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2016-11-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5212,7 +4960,6 @@
 		<year>1984</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5226,7 +4973,6 @@
 		<year>1987</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2017-05-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5240,7 +4986,6 @@
 		<year>1983</year>
 		<publisher>Penguin Software</publisher>
 		<info name="release" value="2018-05-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5254,7 +4999,6 @@
 		<year>1984</year>
 		<publisher>Society for Visual Education</publisher>
 		<info name="release" value="2016-07-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5268,7 +5012,6 @@
 		<year>1987</year>
 		<publisher>Great Game Products</publisher>
 		<info name="release" value="2016-01-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5282,7 +5025,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5296,7 +5038,6 @@
 		<year>1985</year>
 		<publisher>Josten Learning Systems</publisher>
 		<info name="release" value="2016-03-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5315,7 +5056,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5329,7 +5069,6 @@
 		<year>1992</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2017-05-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5358,7 +5097,6 @@
 		<year>1992</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2017-05-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5387,7 +5125,6 @@
 		<year>1982</year>
 		<publisher>Apple Computer</publisher>
 		<info name="release" value="2016-12-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5401,7 +5138,6 @@
 		<year>1982</year>
 		<publisher>The Learning Company</publisher>
 		<info name="release" value="2015-06-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5415,7 +5151,6 @@
 		<year>1982</year>
 		<publisher>On-Line Systems</publisher>
 		<info name="release" value="2017-01-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5429,7 +5164,6 @@
 		<year>1982</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2015-07-22"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5453,7 +5187,6 @@
 		<year>1987</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2016-07-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5467,7 +5200,6 @@
 		<year>1987</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2016-07-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5481,7 +5213,6 @@
 		<year>1984</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2017-07-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5495,7 +5226,6 @@
 		<year>1985</year>
 		<publisher>Optimum Resource</publisher>
 		<info name="release" value="2015-06-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5509,7 +5239,6 @@
 		<year>1985</year>
 		<publisher>Optimum Resource</publisher>
 		<info name="release" value="2016-03-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5523,7 +5252,6 @@
 		<year>1985</year>
 		<publisher>Optimum Resource</publisher>
 		<info name="release" value="2017-02-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5537,7 +5265,6 @@
 		<year>1983</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-10-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5551,7 +5278,6 @@
 		<year>1981</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5565,7 +5291,6 @@
 		<year>1986</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-02-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5579,7 +5304,6 @@
 		<year>1981</year>
 		<publisher>MUSE Software</publisher>
 		<info name="release" value="2017-11-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5593,7 +5317,6 @@
 		<year>1986</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2016-09-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5607,7 +5330,6 @@
 		<year>1986</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2017-10-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5621,7 +5343,6 @@
 		<year>1983</year>
 		<publisher>Houghton Mifflin</publisher>
 		<info name="release" value="2019-01-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5635,7 +5356,6 @@
 		<year>1988</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2016-10-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5649,7 +5369,6 @@
 		<year>1986</year>
 		<publisher>Conduit Educational Software</publisher>
 		<info name="release" value="2015-07-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5663,7 +5382,6 @@
 		<year>1984</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2016-07-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5677,7 +5395,6 @@
 		<year>1988</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-02-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5691,7 +5408,6 @@
 		<year>1985</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-09-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5710,7 +5426,6 @@
 		<year>1990</year>
 		<publisher>Broderbund Software</publisher>
 		<info name="release" value="2017-01-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5749,7 +5464,6 @@
 		<year>1983</year>
 		<publisher>Adventure International</publisher>
 		<info name="release" value="2018-04-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5763,7 +5477,6 @@
 		<year>1984</year>
 		<publisher>Milliken Publishing Company</publisher>
 		<info name="release" value="2017-04-22"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5777,7 +5490,6 @@
 		<year>1986</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2017-01-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -5798,7 +5510,6 @@
 		<year>1982</year>
 		<publisher>Hayden Software</publisher>
 		<info name="release" value="2018-06-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5812,7 +5523,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5826,7 +5536,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5840,7 +5549,6 @@
 		<year>1989</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2015-09-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -5861,7 +5569,6 @@
 		<year>1986</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2016-12-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5875,7 +5582,6 @@
 		<year>1983</year>
 		<publisher>Optimum Resource</publisher>
 		<info name="release" value="2017-05-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5889,7 +5595,6 @@
 		<year>1986</year>
 		<publisher>The Continental Press</publisher>
 		<info name="release" value="2016-03-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5903,7 +5608,6 @@
 		<year>1986</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2017-09-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5917,7 +5621,6 @@
 		<year>1983</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2015-06-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5931,7 +5634,6 @@
 		<year>1986</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-12-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5945,7 +5647,6 @@
 		<year>1983</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-08-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5959,7 +5660,6 @@
 		<year>1985</year>
 		<publisher>Learning Technologies</publisher>
 		<info name="release" value="2015-12-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -5973,7 +5673,6 @@
 		<year>1985</year>
 		<publisher>A/V Concepts Corp.</publisher>
 		<info name="release" value="2016-07-13"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- Disk 3 was irretrievably damaged and needs a redump. -->
 
 		<part name="flop1" interface="floppy_5_25">
@@ -6001,7 +5700,6 @@
 		<year>1985</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2019-01-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6015,7 +5713,6 @@
 		<year>1983</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -6048,7 +5745,6 @@
 		<year>1983</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -6081,7 +5777,6 @@
 		<year>1983</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -6114,7 +5809,6 @@
 		<year>1981</year>
 		<publisher>Krell Software</publisher>
 		<info name="release" value="2017-10-22"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6128,7 +5822,6 @@
 		<year>1984</year>
 		<publisher>College Entrance Exam Board</publisher>
 		<info name="release" value="2017-04-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -6161,7 +5854,6 @@
 		<year>1985</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6175,7 +5867,6 @@
 		<year>1982</year>
 		<publisher>Softsmith</publisher>
 		<info name="release" value="2018-08-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6189,7 +5880,6 @@
 		<year>1986</year>
 		<publisher>Bantam Software</publisher>
 		<info name="release" value="2017-12-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6208,7 +5898,6 @@
 		<year>1990</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2016-04-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6222,7 +5911,6 @@
 		<year>????</year>
 		<publisher>Phoenix Software</publisher>
 		<info name="release" value="2018-10-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6236,7 +5924,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6250,7 +5937,6 @@
 		<year>????</year>
 		<publisher>None</publisher>
 		<info name="release" value="2017-06-28"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- This is a homemade compilation disk of several file-cracked games,
 		to which someone has added new copy protection. -->
 
@@ -6266,7 +5952,6 @@
 		<year>????</year>
 		<publisher>None</publisher>
 		<info name="release" value="2017-06-28"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- This is a homemade compilation disk of several file-cracked games,
 		to which someone has added new copy protection. -->
 
@@ -6282,7 +5967,6 @@
 		<year>1982</year>
 		<publisher>Behavioral Engineering</publisher>
 		<info name="release" value="2016-08-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6296,7 +5980,6 @@
 		<year>1983</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2015-07-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -6353,7 +6036,6 @@
 		<year>1981</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2015-07-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6367,7 +6049,6 @@
 		<year>1983</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2018-02-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6381,7 +6062,6 @@
 		<year>1980</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2017-10-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Program Disk"/>
@@ -6414,7 +6094,6 @@
 		<year>1980</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-11-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6428,7 +6107,6 @@
 		<year>1982</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6442,7 +6120,6 @@
 		<year>1983</year>
 		<publisher>Houghton Mifflin Company</publisher>
 		<info name="release" value="2015-08-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6456,7 +6133,6 @@
 		<year>1984</year>
 		<publisher>UNKNOWN</publisher>
 		<info name="release" value="2017-09-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -6477,7 +6153,6 @@
 		<year>1984</year>
 		<publisher>UNKNOWN</publisher>
 		<info name="release" value="2017-09-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -6498,7 +6173,6 @@
 		<year>1984</year>
 		<publisher>UNKNOWN</publisher>
 		<info name="release" value="2017-09-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -6519,7 +6193,6 @@
 		<year>1981</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-10-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6533,7 +6206,6 @@
 		<year>1981</year>
 		<publisher>Science Research Associates</publisher>
 		<info name="release" value="2015-06-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -6554,7 +6226,6 @@
 		<year>1981</year>
 		<publisher>Science Research Associates</publisher>
 		<info name="release" value="2017-10-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6568,7 +6239,6 @@
 		<year>1981</year>
 		<publisher>Science Research Associates</publisher>
 		<info name="release" value="2017-10-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6582,7 +6252,6 @@
 		<year>1981</year>
 		<publisher>Science Research Associates</publisher>
 		<info name="release" value="2017-10-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6596,7 +6265,6 @@
 		<year>1981</year>
 		<publisher>Science Research Associates</publisher>
 		<info name="release" value="2017-10-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6610,7 +6278,6 @@
 		<year>1983</year>
 		<publisher>Science Research Associates</publisher>
 		<info name="release" value="2017-10-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6624,7 +6291,6 @@
 		<year>1981</year>
 		<publisher>Science Research Associates</publisher>
 		<info name="release" value="2017-10-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6638,7 +6304,6 @@
 		<year>1982</year>
 		<publisher>Addison-Wesley Publishing</publisher>
 		<info name="release" value="2017-09-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6652,7 +6317,6 @@
 		<year>1982</year>
 		<publisher>Control Data Corporation</publisher>
 		<info name="release" value="2014-08-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6666,7 +6330,6 @@
 		<year>1981</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6680,7 +6343,6 @@
 		<year>1984</year>
 		<publisher>College-Hill Press</publisher>
 		<info name="release" value="2016-07-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Associated nouns"/>
@@ -6776,7 +6438,6 @@
 		<year>1988</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6790,7 +6451,6 @@
 		<year>1988</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6804,7 +6464,6 @@
 		<year>1984</year>
 		<publisher>Millennium Group Inc.</publisher>
 		<info name="release" value="2016-04-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6818,7 +6477,6 @@
 		<year>1986</year>
 		<publisher>Microprose Software</publisher>
 		<info name="release" value="2017-08-30"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- Version 2 comes with an option to use double hi-res
 		graphics on 128K machines -->
 
@@ -6841,7 +6499,6 @@
 		<year>1981</year>
 		<publisher>Rockroy</publisher>
 		<info name="release" value="2018-09-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6855,7 +6512,6 @@
 		<year>1982</year>
 		<publisher>Sentient Software</publisher>
 		<info name="release" value="2018-09-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6869,7 +6525,6 @@
 		<year>1983</year>
 		<publisher>SEGA Enterprises</publisher>
 		<info name="release" value="2018-09-22"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6883,7 +6538,6 @@
 		<year>1983</year>
 		<publisher>Datamost</publisher>
 		<info name="release" value="2016-07-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6897,7 +6551,6 @@
 		<year>1984</year>
 		<publisher>McCarthy-McCormack</publisher>
 		<info name="release" value="2015-09-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6911,7 +6564,6 @@
 		<year>1986</year>
 		<publisher>Houghton Mifflin</publisher>
 		<info name="release" value="2017-01-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6925,7 +6577,6 @@
 		<year>1984</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2017-12-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6939,7 +6590,6 @@
 		<year>1984</year>
 		<publisher>Langenscheidt Publishers</publisher>
 		<info name="release" value="2017-12-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -6960,7 +6610,6 @@
 		<year>1989</year>
 		<publisher>Micrograms</publisher>
 		<info name="release" value="2018-06-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6974,7 +6623,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -6988,7 +6636,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7002,7 +6649,6 @@
 		<year>1985</year>
 		<publisher>Grolier Publishing</publisher>
 		<info name="release" value="2017-02-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -7023,7 +6669,6 @@
 		<year>1981</year>
 		<publisher>On-Line Systems</publisher>
 		<info name="release" value="2017-12-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7037,7 +6682,6 @@
 		<year>1982</year>
 		<publisher>Datamost</publisher>
 		<info name="release" value="2018-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7051,7 +6695,6 @@
 		<year>1983</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2016-09-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7065,7 +6708,6 @@
 		<year>1987</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2015-08-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -7086,7 +6728,6 @@
 		<year>1981</year>
 		<publisher>Hartley Software</publisher>
 		<info name="release" value="2015-07-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7100,7 +6741,6 @@
 		<year>1982</year>
 		<publisher>The Regents of the University of California</publisher>
 		<info name="release" value="2016-10-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -7121,7 +6761,6 @@
 		<year>1986</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-01-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -7142,7 +6781,6 @@
 		<year>1987</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2017-09-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7156,7 +6794,6 @@
 		<year>1994</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7170,7 +6807,6 @@
 		<year>1984</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-12-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7184,7 +6820,6 @@
 		<year>1982</year>
 		<publisher>Hayden Book Company</publisher>
 		<info name="release" value="2018-08-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7198,7 +6833,6 @@
 		<year>1983</year>
 		<publisher>Penguin Software</publisher>
 		<info name="release" value="2018-02-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7212,7 +6846,6 @@
 		<year>1987</year>
 		<publisher>Didatech Software</publisher>
 		<info name="release" value="2015-06-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -7233,7 +6866,6 @@
 		<year>1988</year>
 		<publisher>Absolute Entertainment</publisher>
 		<info name="release" value="2016-07-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -7254,7 +6886,6 @@
 		<year>1981</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2016-07-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7268,7 +6899,6 @@
 		<year>1980</year>
 		<publisher>Micro Lab</publisher>
 		<info name="release" value="2018-10-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7282,7 +6912,6 @@
 		<year>1987</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2017-11-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7296,7 +6925,6 @@
 		<year>1985</year>
 		<publisher>Microprose Software</publisher>
 		<info name="release" value="2017-08-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -7317,7 +6945,6 @@
 		<year>1985</year>
 		<publisher>Microprose Software</publisher>
 		<info name="release" value="2017-08-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7331,7 +6958,6 @@
 		<year>1981</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2017-01-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7345,7 +6971,6 @@
 		<year>1984</year>
 		<publisher>DesignWare</publisher>
 		<info name="release" value="2016-01-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7359,7 +6984,6 @@
 		<year>1983</year>
 		<publisher>DesignWare</publisher>
 		<info name="release" value="2016-12-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7373,7 +6997,6 @@
 		<year>1982</year>
 		<publisher>Hayden Book Company</publisher>
 		<info name="release" value="2018-10-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7387,7 +7010,6 @@
 		<year>1983</year>
 		<publisher>Micromax</publisher>
 		<info name="release" value="2017-06-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7401,7 +7023,6 @@
 		<year>1989</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2015-09-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -7422,7 +7043,6 @@
 		<year>1981</year>
 		<publisher>Random House Micro-Line</publisher>
 		<info name="release" value="2015-08-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7436,7 +7056,6 @@
 		<year>1984</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-03-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Program"/>
@@ -7457,7 +7076,6 @@
 		<year>1984</year>
 		<publisher>Infocom</publisher>
 		<info name="release" value="2017-10-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7471,7 +7089,6 @@
 		<year>1985</year>
 		<publisher>The Avalon Hill Game Company</publisher>
 		<info name="release" value="2018-10-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7485,7 +7102,6 @@
 		<year>1985</year>
 		<publisher>Avant-Garde</publisher>
 		<info name="release" value="2018-09-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -7506,7 +7122,6 @@
 		<year>1982</year>
 		<publisher>Infocom</publisher>
 		<info name="release" value="2018-01-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7520,7 +7135,6 @@
 		<year>1982</year>
 		<publisher>Infocom</publisher>
 		<info name="release" value="2017-10-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7534,7 +7148,6 @@
 		<year>1983</year>
 		<publisher>Micro-Fun</publisher>
 		<info name="release" value="2017-06-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -7555,7 +7168,6 @@
 		<year>1985</year>
 		<publisher>Unicorn Software</publisher>
 		<info name="release" value="2018-02-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7569,7 +7181,6 @@
 		<year>1982</year>
 		<publisher>Control Data Corporation</publisher>
 		<info name="release" value="2016-01-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7583,7 +7194,6 @@
 		<year>1984</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2017-04-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7597,7 +7207,6 @@
 		<year>1984</year>
 		<publisher>Spinnaker Software</publisher>
 		<info name="release" value="2015-11-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7611,7 +7220,6 @@
 		<year>1982</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2017-09-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7625,7 +7233,6 @@
 		<year>1982</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2017-12-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7639,7 +7246,6 @@
 		<year>1985</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2017-06-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7653,7 +7259,6 @@
 		<year>1986</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2017-07-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7667,7 +7272,6 @@
 		<year>1981</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2016-02-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7681,7 +7285,6 @@
 		<year>1986</year>
 		<publisher>Abracadata Limited</publisher>
 		<info name="release" value="2015-08-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Program disk (no mouse)"/>
@@ -7708,7 +7311,6 @@
 		<year>1987</year>
 		<publisher>Abracadata Limited</publisher>
 		<info name="release" value="2015-08-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -7729,7 +7331,6 @@
 		<year>1986</year>
 		<publisher>Abracadata Limited</publisher>
 		<info name="release" value="2015-06-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Program disk (no mouse)"/>
@@ -7756,7 +7357,6 @@
 		<year>1987</year>
 		<publisher>Abracadata</publisher>
 		<info name="release" value="2016-08-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -7777,7 +7377,6 @@
 		<year>1988</year>
 		<publisher>Designware</publisher>
 		<info name="release" value="2017-03-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Build"/>
@@ -7816,7 +7415,6 @@
 		<year>1986</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2015-08-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7830,7 +7428,6 @@
 		<year>1986</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2016-10-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7844,7 +7441,6 @@
 		<year>1986</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2016-10-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7858,7 +7454,6 @@
 		<year>1984</year>
 		<publisher>Aquarius People Materials</publisher>
 		<info name="release" value="2015-12-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -7897,7 +7492,6 @@
 		<year>1984</year>
 		<publisher>Datasoft</publisher>
 		<info name="release" value="2015-06-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7911,7 +7505,6 @@
 		<year>1992</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-02-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7925,7 +7518,6 @@
 		<year>1988</year>
 		<publisher>Pelican Software</publisher>
 		<info name="release" value="2015-12-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 Side A"/>
@@ -7958,7 +7550,6 @@
 		<year>1985</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2015-06-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7972,7 +7563,6 @@
 		<year>1984</year>
 		<publisher>Focus Media</publisher>
 		<info name="release" value="2017-11-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -7986,7 +7576,6 @@
 		<year>1983</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2019-01-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8000,7 +7589,6 @@
 		<year>1984</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2015-06-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8014,7 +7602,6 @@
 		<year>1987</year>
 		<publisher>Computer Aided Teaching</publisher>
 		<info name="release" value="2015-09-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8028,7 +7615,6 @@
 		<year>1985</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2018-01-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8042,7 +7628,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-01-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8056,7 +7641,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8070,7 +7654,6 @@
 		<year>1985</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2017-07-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8084,7 +7667,6 @@
 		<year>1984</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-07-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8098,7 +7680,6 @@
 		<year>1986</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2017-07-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -8119,7 +7700,6 @@
 		<year>1987</year>
 		<publisher>Spectrum Holobyte</publisher>
 		<info name="release" value="2018-09-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 Side A"/>
@@ -8164,7 +7744,6 @@
 		<year>1986</year>
 		<publisher>Houghton Mifflin</publisher>
 		<info name="release" value="2017-01-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8178,7 +7757,6 @@
 		<year>1985</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-01-22"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -8199,7 +7777,6 @@
 		<year>1983</year>
 		<publisher>Bez</publisher>
 		<info name="release" value="2018-10-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8213,7 +7790,6 @@
 		<year>1986</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2015-10-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8227,7 +7803,6 @@
 		<year>1987</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2015-10-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8241,7 +7816,6 @@
 		<year>1981</year>
 		<publisher>Level-10</publisher>
 		<info name="release" value="2017-08-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8255,7 +7829,6 @@
 		<year>1982</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2017-08-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8269,7 +7842,6 @@
 		<year>1982</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2017-08-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8283,7 +7855,6 @@
 		<year>1983</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2017-01-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8297,7 +7868,6 @@
 		<year>1986</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2015-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8311,7 +7881,6 @@
 		<year>1986</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2017-11-22"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8325,7 +7894,6 @@
 		<year>1983</year>
 		<publisher>Border Software</publisher>
 		<info name="release" value="2017-01-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8339,7 +7907,6 @@
 		<year>1985</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-09-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8353,7 +7920,6 @@
 		<year>1981</year>
 		<publisher>Compu-Tations</publisher>
 		<info name="release" value="2015-07-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8367,7 +7933,6 @@
 		<year>1990</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8381,7 +7946,6 @@
 		<year>1990</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8395,7 +7959,6 @@
 		<year>1983</year>
 		<publisher>Counterpoint Software</publisher>
 		<info name="release" value="2015-10-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8409,7 +7972,6 @@
 		<year>1983</year>
 		<publisher>Counterpoint Software</publisher>
 		<info name="release" value="2018-05-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8423,7 +7985,6 @@
 		<year>1984</year>
 		<publisher>Baker Book House</publisher>
 		<info name="release" value="2016-07-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -8444,7 +8005,6 @@
 		<year>1986</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-09-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Sample lessons"/>
@@ -8465,7 +8025,6 @@
 		<year>1987</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-03-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Boot"/>
@@ -8492,7 +8051,6 @@
 		<year>1982</year>
 		<publisher>Adventure International</publisher>
 		<info name="release" value="2018-10-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -8513,7 +8071,6 @@
 		<year>1984</year>
 		<publisher>Grolier</publisher>
 		<info name="release" value="2016-07-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8527,7 +8084,6 @@
 		<year>1988</year>
 		<publisher>Focus Media</publisher>
 		<info name="release" value="2017-05-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8541,7 +8097,6 @@
 		<year>1983</year>
 		<publisher>HRM Software</publisher>
 		<info name="release" value="2018-02-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8555,7 +8110,6 @@
 		<year>1986</year>
 		<publisher>Heartsoft</publisher>
 		<info name="release" value="2016-03-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8569,7 +8123,6 @@
 		<year>1980</year>
 		<publisher>MUSE Software</publisher>
 		<info name="release" value="2017-11-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8583,7 +8136,6 @@
 		<year>1981</year>
 		<publisher>Electronic Courseware</publisher>
 		<info name="release" value="2019-01-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8597,7 +8149,6 @@
 		<year>1985</year>
 		<publisher>Firebird</publisher>
 		<info name="release" value="2017-01-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8611,7 +8162,6 @@
 		<year>1982</year>
 		<publisher>Edu-Ware Services</publisher>
 		<info name="release" value="2017-12-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8625,7 +8175,6 @@
 		<year>1983</year>
 		<publisher>Infocom</publisher>
 		<info name="release" value="2018-01-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8639,7 +8188,6 @@
 		<year>1983</year>
 		<publisher>Infocom</publisher>
 		<info name="release" value="2017-10-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8653,7 +8201,6 @@
 		<year>1986</year>
 		<publisher>Houghton Mifflin</publisher>
 		<info name="release" value="2017-01-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8667,7 +8214,6 @@
 		<year>1989</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2016-09-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -8688,7 +8234,6 @@
 		<year>1983</year>
 		<publisher>HRM Software</publisher>
 		<info name="release" value="2018-02-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8702,7 +8247,6 @@
 		<year>1982</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2017-05-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8716,7 +8260,6 @@
 		<year>1982</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2017-05-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8730,7 +8273,6 @@
 		<year>1982</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2017-05-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8744,7 +8286,6 @@
 		<year>1982</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2017-05-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8758,7 +8299,6 @@
 		<year>1982</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2017-05-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8772,7 +8312,6 @@
 		<year>1984</year>
 		<publisher>Learning Seed Company</publisher>
 		<info name="release" value="2016-04-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8786,7 +8325,6 @@
 		<year>1983</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8800,7 +8338,6 @@
 		<year>1981</year>
 		<publisher>Sirius Software</publisher>
 		<info name="release" value="2016-10-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8814,7 +8351,6 @@
 		<year>1981</year>
 		<publisher>Apple Computer</publisher>
 		<info name="release" value="2016-12-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8828,7 +8364,6 @@
 		<year>1981</year>
 		<publisher>Synergistic Software</publisher>
 		<info name="release" value="2018-04-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8842,7 +8377,6 @@
 		<year>1982</year>
 		<publisher>Sirius Software</publisher>
 		<info name="release" value="2017-08-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8856,7 +8390,6 @@
 		<year>1989</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2016-10-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -8877,9 +8410,8 @@
 		<year>1985</year>
 		<publisher>The Regents/ALA Company</publisher>
 		<info name="release" value="2017-12-23"/>
-		<!-- No compatibility data known at this time. -->
-		<!-- Missing: Disk 1 has not been dumped at this time
-		and is still missing. -->
+		<info name="usage" value="Disk 1 remains missing." />
+		<!-- Disk 1 has not been dumped at this time and is still missing. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -8898,7 +8430,6 @@
 		<year>1990</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2016-09-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -8919,7 +8450,6 @@
 		<year>1992</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2016-06-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -8940,7 +8470,6 @@
 		<year>1983</year>
 		<publisher>Penguin Software</publisher>
 		<info name="release" value="2016-08-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -8961,7 +8490,6 @@
 		<year>1985</year>
 		<publisher>Josten Learning Systems</publisher>
 		<info name="release" value="2016-03-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -8982,7 +8510,6 @@
 		<year>1985</year>
 		<publisher>Media Materials</publisher>
 		<info name="release" value="2015-12-08"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- Year comes from disk label, which reports 1985. -->
 
 		<part name="flop1" interface="floppy_5_25">
@@ -8997,7 +8524,6 @@
 		<year>1984</year>
 		<publisher>Milton Bradley</publisher>
 		<info name="release" value="2015-12-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9011,7 +8537,6 @@
 		<year>1986</year>
 		<publisher>Spinnaker Software</publisher>
 		<info name="release" value="2017-06-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9025,7 +8550,6 @@
 		<year>1985</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2015-08-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9039,7 +8563,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-01-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9117,7 +8640,6 @@
 		<year>1984</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2016-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9131,7 +8653,6 @@
 		<year>1983</year>
 		<publisher>DesignWare</publisher>
 		<info name="release" value="2017-11-22"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9145,7 +8666,6 @@
 		<year>1983</year>
 		<publisher>Optimum Resource</publisher>
 		<info name="release" value="2018-10-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9159,7 +8679,6 @@
 		<year>1987</year>
 		<publisher>Didatech Software</publisher>
 		<info name="release" value="2016-07-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -9180,7 +8699,6 @@
 		<year>1983</year>
 		<publisher>McCarthy-McCormack</publisher>
 		<info name="release" value="2015-06-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9194,7 +8712,6 @@
 		<year>1984</year>
 		<publisher>Thunder Mountain</publisher>
 		<info name="release" value="2018-03-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9208,7 +8725,6 @@
 		<year>1984</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -9229,7 +8745,6 @@
 		<year>1984</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9243,7 +8758,6 @@
 		<year>1984</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9257,7 +8771,6 @@
 		<year>1983</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9271,7 +8784,6 @@
 		<year>1984</year>
 		<publisher>Human Engineered Software</publisher>
 		<info name="release" value="2015-11-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Program"/>
@@ -9298,7 +8810,6 @@
 		<year>1984</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-03-22"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9312,7 +8823,6 @@
 		<year>1985</year>
 		<publisher>Quest Learning Systems</publisher>
 		<info name="release" value="2015-12-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9326,7 +8836,6 @@
 		<year>1992</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-07-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9340,7 +8849,6 @@
 		<year>1994</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-12-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9354,7 +8862,6 @@
 		<year>1985</year>
 		<publisher>Grolier Publishing</publisher>
 		<info name="release" value="2017-09-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9368,7 +8875,6 @@
 		<year>1985</year>
 		<publisher>Grolier Publishing</publisher>
 		<info name="release" value="2017-09-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9382,7 +8888,6 @@
 		<year>1986</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9396,7 +8901,6 @@
 		<year>1986</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9410,7 +8914,6 @@
 		<year>1992</year>
 		<publisher>Critical Thinking Press</publisher>
 		<info name="release" value="2016-04-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -9431,7 +8934,6 @@
 		<year>1990</year>
 		<publisher>Critical Thinking Press</publisher>
 		<info name="release" value="2016-03-22"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9445,7 +8947,6 @@
 		<year>1985</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2015-12-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9459,7 +8960,6 @@
 		<year>1986</year>
 		<publisher>Focus Media</publisher>
 		<info name="release" value="2017-11-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -9480,7 +8980,6 @@
 		<year>1982</year>
 		<publisher>Sirius Software</publisher>
 		<info name="release" value="2015-08-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9494,7 +8993,6 @@
 		<year>1982</year>
 		<publisher>Vital Information</publisher>
 		<info name="release" value="2018-10-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9508,7 +9006,6 @@
 		<year>1986</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9522,7 +9019,6 @@
 		<year>1986</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9536,7 +9032,6 @@
 		<year>1985</year>
 		<publisher>Marshfilm</publisher>
 		<info name="release" value="2017-07-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9550,7 +9045,6 @@
 		<year>1983</year>
 		<publisher>Gentry Software</publisher>
 		<info name="release" value="2016-07-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9564,7 +9058,6 @@
 		<year>1984</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-05-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9578,7 +9071,6 @@
 		<year>1984</year>
 		<publisher>Unicorn Software</publisher>
 		<info name="release" value="2015-06-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9592,7 +9084,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9606,7 +9097,6 @@
 		<year>1983</year>
 		<publisher>Springboard Software</publisher>
 		<info name="release" value="2017-04-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9620,7 +9110,6 @@
 		<year>1983</year>
 		<publisher>Spinnaker Software</publisher>
 		<info name="release" value="2018-03-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9634,7 +9123,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9648,7 +9136,6 @@
 		<year>1984</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2016-10-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9662,7 +9149,6 @@
 		<year>1985</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2017-07-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9676,7 +9162,6 @@
 		<year>1985</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2017-07-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9690,7 +9175,6 @@
 		<year>1982</year>
 		<publisher>Control Data Corporation</publisher>
 		<info name="release" value="2015-11-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9704,7 +9188,6 @@
 		<year>1981</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-08-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9718,7 +9201,6 @@
 		<year>1984</year>
 		<publisher>Grolier Publishing</publisher>
 		<info name="release" value="2017-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -9739,7 +9221,6 @@
 		<year>1988</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-09-23"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- Disks are labelled as disks 4, 5, and 6, so probably no missing
 		disks. -->
 
@@ -9765,7 +9246,6 @@
 		<year>1987</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2016-10-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9779,7 +9259,6 @@
 		<year>1986</year>
 		<publisher>Learning Well</publisher>
 		<info name="release" value="2017-09-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9793,7 +9272,6 @@
 		<year>1983</year>
 		<publisher>Parrot Software</publisher>
 		<info name="release" value="2017-09-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9807,7 +9285,6 @@
 		<year>1982</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2016-10-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9821,7 +9298,6 @@
 		<year>1982</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2016-10-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9835,7 +9311,6 @@
 		<year>1985</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2015-08-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -9856,7 +9331,6 @@
 		<year>1983</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -9877,7 +9351,6 @@
 		<year>1981</year>
 		<publisher>Magna Soft</publisher>
 		<info name="release" value="2018-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9891,7 +9364,6 @@
 		<year>1985</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2017-06-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9905,7 +9377,6 @@
 		<year>1985</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2017-06-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9919,7 +9390,6 @@
 		<year>1982</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2016-03-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -9933,7 +9403,6 @@
 		<year>1986</year>
 		<publisher>Houghton Mifflin Co.</publisher>
 		<info name="release" value="2015-11-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Shafts and stairs (Bootable)"/>
@@ -9966,7 +9435,6 @@
 		<year>1986</year>
 		<publisher>Houghton Mifflin Co.</publisher>
 		<info name="release" value="2017-01-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Bowling for scholars (Bootable)"/>
@@ -9999,7 +9467,6 @@
 		<year>1988</year>
 		<publisher>Infocom</publisher>
 		<info name="release" value="2018-10-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -10020,7 +9487,6 @@
 		<year>1985</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2015-09-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10034,7 +9500,6 @@
 		<year>1985</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2017-01-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -10055,7 +9520,6 @@
 		<year>1986</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2017-01-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10069,7 +9533,6 @@
 		<year>1984</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2018-10-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -10090,7 +9553,6 @@
 		<year>1984</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2016-12-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10104,7 +9566,6 @@
 		<year>1983</year>
 		<publisher>Marley W. Watkins</publisher>
 		<info name="release" value="2017-11-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10118,7 +9579,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10132,7 +9592,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10146,7 +9605,6 @@
 		<year>1985</year>
 		<publisher>Courses by Computers</publisher>
 		<info name="release" value="2018-07-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -10167,7 +9625,6 @@
 		<year>1984</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2015-11-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10181,7 +9638,6 @@
 		<year>1984</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2015-11-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10195,7 +9651,6 @@
 		<year>1984</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2015-09-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10209,7 +9664,6 @@
 		<year>1980</year>
 		<publisher>Charles Lund</publisher>
 		<info name="release" value="2018-06-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10223,7 +9677,6 @@
 		<year>1980</year>
 		<publisher>Charles Lund</publisher>
 		<info name="release" value="2018-06-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10237,7 +9690,6 @@
 		<year>1983</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A - Geopol"/>
@@ -10258,7 +9710,6 @@
 		<year>1990</year>
 		<publisher>Silver</publisher>
 		<info name="release" value="2018-01-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -10285,7 +9736,6 @@
 		<year>1984</year>
 		<publisher>Intellectual Software</publisher>
 		<info name="release" value="2016-02-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Program"/>
@@ -10306,7 +9756,6 @@
 		<year>1982</year>
 		<publisher>The Learning Company</publisher>
 		<info name="release" value="2016-01-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10320,7 +9769,6 @@
 		<year>1982</year>
 		<publisher>The Learning Company</publisher>
 		<info name="release" value="2015-05-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10334,7 +9782,6 @@
 		<year>1982</year>
 		<publisher>The Learning Company</publisher>
 		<info name="release" value="2015-08-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10348,7 +9795,6 @@
 		<year>1982</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-12-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10362,7 +9808,6 @@
 		<year>1985</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-04-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10376,7 +9821,6 @@
 		<year>1984</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2016-04-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10390,7 +9834,6 @@
 		<year>1986</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -10411,7 +9854,6 @@
 		<year>1987</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2017-06-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10425,7 +9867,6 @@
 		<year>1982</year>
 		<publisher>Datamost</publisher>
 		<info name="release" value="2016-08-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10439,7 +9880,6 @@
 		<year>1986</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-04-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10453,7 +9893,6 @@
 		<year>1982</year>
 		<publisher>Hayden Book Co.</publisher>
 		<info name="release" value="2016-07-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10467,7 +9906,6 @@
 		<year>1984</year>
 		<publisher>Milton Bradley</publisher>
 		<info name="release" value="2015-12-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10481,7 +9919,6 @@
 		<year>1989</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2017-11-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10495,7 +9932,6 @@
 		<year>1986</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2018-10-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10509,7 +9945,6 @@
 		<year>1991</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2016-08-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -10530,7 +9965,6 @@
 		<year>1986</year>
 		<publisher>Michael G. Southwell</publisher>
 		<info name="release" value="2017-12-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10544,7 +9978,6 @@
 		<year>1986</year>
 		<publisher>Michael G. Southwell</publisher>
 		<info name="release" value="2017-12-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10558,7 +9991,6 @@
 		<year>1988</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2016-07-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -10579,7 +10011,6 @@
 		<year>1982</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2016-10-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10593,7 +10024,6 @@
 		<year>1982</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2016-10-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10607,7 +10037,6 @@
 		<year>1982</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2016-10-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10621,7 +10050,6 @@
 		<year>1993</year>
 		<publisher>Micrograms</publisher>
 		<info name="release" value="2016-10-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10635,7 +10063,6 @@
 		<year>1993</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-12-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10649,7 +10076,6 @@
 		<year>1990</year>
 		<publisher>Pelican Software</publisher>
 		<info name="release" value="2015-09-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -10670,7 +10096,6 @@
 		<year>1984</year>
 		<publisher>Grolier</publisher>
 		<info name="release" value="2016-12-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10684,7 +10109,6 @@
 		<year>1984</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2017-12-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10698,7 +10122,6 @@
 		<year>1984</year>
 		<publisher>Cross Educational Software</publisher>
 		<info name="release" value="2017-01-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -10719,7 +10142,6 @@
 		<year>1981</year>
 		<publisher>On-Line Systems</publisher>
 		<info name="release" value="2017-12-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10733,7 +10155,6 @@
 		<year>1982</year>
 		<publisher>The Learning Company</publisher>
 		<info name="release" value="2016-12-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10747,7 +10168,6 @@
 		<year>1982</year>
 		<publisher>Apple Computer</publisher>
 		<info name="release" value="2016-12-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10761,7 +10181,6 @@
 		<year>1986</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2014-06-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -10782,7 +10201,6 @@
 		<year>1982</year>
 		<publisher>Mattel Electronics</publisher>
 		<info name="release" value="2014-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10796,7 +10214,6 @@
 		<year>1987</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2016-09-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -10817,7 +10234,6 @@
 		<year>1984</year>
 		<publisher>American Educational Computer</publisher>
 		<info name="release" value="2014-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10831,7 +10247,6 @@
 		<year>1984</year>
 		<publisher>MatchMaker</publisher>
 		<info name="release" value="2014-09-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10845,7 +10260,6 @@
 		<year>1983</year>
 		<publisher>Davidson &amp; Associates</publisher>
 		<info name="release" value="2014-08-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -10866,7 +10280,6 @@
 		<year>1984</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2014-04-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10880,7 +10293,6 @@
 		<year>1983</year>
 		<publisher>DesignWare</publisher>
 		<info name="release" value="2014-05-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10894,7 +10306,6 @@
 		<year>1985</year>
 		<publisher>The Learning Company</publisher>
 		<info name="release" value="2014-04-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10908,7 +10319,6 @@
 		<year>1986</year>
 		<publisher>The Learning Company</publisher>
 		<info name="release" value="2015-08-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10922,7 +10332,6 @@
 		<year>1986</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2014-09-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -10943,7 +10352,6 @@
 		<year>1983</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2014-10-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10957,7 +10365,6 @@
 		<year>1986</year>
 		<publisher>Neosoft</publisher>
 		<info name="release" value="2014-04-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -10971,7 +10378,6 @@
 		<year>1983</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-11-20"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -10994,7 +10400,6 @@
 		<year>1983</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-10-25"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11017,7 +10422,6 @@
 		<year>1983</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-06-06"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11040,7 +10444,6 @@
 		<year>1984</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-09-27"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11063,7 +10466,6 @@
 		<year>1984</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-08-18"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11086,7 +10488,6 @@
 		<year>1984</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-08-30"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11109,7 +10510,6 @@
 		<year>1984</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2016-12-23"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11132,7 +10532,6 @@
 		<year>????</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2014-09-29"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11155,7 +10554,6 @@
 		<year>1985</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2016-12-23"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11178,7 +10576,6 @@
 		<year>1985</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2016-12-23"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11201,7 +10598,6 @@
 		<year>????</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2014-09-15"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11224,7 +10620,6 @@
 		<year>????</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2014-09-22"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11247,7 +10642,6 @@
 		<year>1985</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2017-01-27"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11270,7 +10664,6 @@
 		<year>1986</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-08-28"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11293,7 +10686,6 @@
 		<year>1986</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-08-28"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11316,7 +10708,6 @@
 		<year>????</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2014-09-15"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11339,7 +10730,6 @@
 		<year>????</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2014-09-15"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11362,7 +10752,6 @@
 		<year>1987</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-08-03"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11385,7 +10774,6 @@
 		<year>????</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2014-09-16"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11408,7 +10796,6 @@
 		<year>1988</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-08-03"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11431,7 +10818,6 @@
 		<year>????</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2014-09-16"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11460,7 +10846,6 @@
 		<year>????</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2014-09-30"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11483,7 +10868,6 @@
 		<year>1988</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-08-03"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11512,7 +10896,6 @@
 		<year>????</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2014-08-14"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11535,7 +10918,6 @@
 		<year>????</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2014-08-20"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11558,7 +10940,6 @@
 		<year>1988</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-08-03"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Microzine" is an educational disk-based magazine
 		published by Scholastic between 1983 and 1992. -->
 
@@ -11625,7 +11006,6 @@
 		<year>1984</year>
 		<publisher>Learning Well</publisher>
 		<info name="release" value="2014-09-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -11646,7 +11026,6 @@
 		<year>1981</year>
 		<publisher>The Learning Company</publisher>
 		<info name="release" value="2017-04-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11660,7 +11039,6 @@
 		<year>1983</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2016-01-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11674,7 +11052,6 @@
 		<year>1984</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2014-05-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11688,7 +11065,6 @@
 		<year>1987</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2016-02-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11702,7 +11078,6 @@
 		<year>1987</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2014-09-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11716,7 +11091,6 @@
 		<year>1983</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2016-02-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11730,7 +11104,6 @@
 		<year>1987</year>
 		<publisher>Silver Burdett Company</publisher>
 		<info name="release" value="2014-09-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11744,7 +11117,6 @@
 		<year>1983</year>
 		<publisher>Thunder Mountain</publisher>
 		<info name="release" value="2014-07-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11758,7 +11130,6 @@
 		<year>1985</year>
 		<publisher>Scott, Foresman and Company</publisher>
 		<info name="release" value="2014-08-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11772,7 +11143,6 @@
 		<year>1985</year>
 		<publisher>Scott, Foresman and Company</publisher>
 		<info name="release" value="2014-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11786,7 +11156,6 @@
 		<year>1986</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2014-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11800,7 +11169,6 @@
 		<year>1990</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-05-23"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- This version, dated 26-AUG-1990 based on file metadata. -->
 
 		<part name="flop1" interface="floppy_5_25">
@@ -11815,7 +11183,6 @@
 		<year>1983</year>
 		<publisher>Counterpoint Software</publisher>
 		<info name="release" value="2014-06-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11829,7 +11196,6 @@
 		<year>1983</year>
 		<publisher>Springboard Software</publisher>
 		<info name="release" value="2014-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11843,7 +11209,6 @@
 		<year>1984</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2014-08-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11857,7 +11222,6 @@
 		<year>1984</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2015-11-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11871,7 +11235,6 @@
 		<year>1983</year>
 		<publisher>Infocom</publisher>
 		<info name="release" value="2017-10-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11885,7 +11248,6 @@
 		<year>1983</year>
 		<publisher>Infocom</publisher>
 		<info name="release" value="2017-10-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11899,7 +11261,6 @@
 		<year>1983</year>
 		<publisher>Sirius Software</publisher>
 		<info name="release" value="2014-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11913,7 +11274,6 @@
 		<year>1984</year>
 		<publisher>Gessler Educational Software</publisher>
 		<info name="release" value="2014-11-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11927,7 +11287,6 @@
 		<year>1985</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2014-11-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -11941,7 +11300,6 @@
 		<year>1990</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2014-06-03"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- It comes on five disks; the first three disks are single-sided,
 		but the last two are double-sided. -->
 
@@ -11994,7 +11352,6 @@
 		<year>1983</year>
 		<publisher>Unicorn Software Company</publisher>
 		<info name="release" value="2014-08-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12008,7 +11365,6 @@
 		<year>1987</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2014-05-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12022,7 +11378,6 @@
 		<year>1984</year>
 		<publisher>Daystar Learning</publisher>
 		<info name="release" value="2016-07-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12036,7 +11391,6 @@
 		<year>1982</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12050,7 +11404,6 @@
 		<year>1982</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12064,7 +11417,6 @@
 		<year>1986</year>
 		<publisher>Avalon Hill</publisher>
 		<info name="release" value="2018-04-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12078,7 +11430,6 @@
 		<year>1986</year>
 		<publisher>Baudville</publisher>
 		<info name="release" value="2018-04-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12092,7 +11443,6 @@
 		<year>1982</year>
 		<publisher>Milliken Publishing Company</publisher>
 		<info name="release" value="2016-03-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12106,7 +11456,6 @@
 		<year>1984</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2015-11-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12120,7 +11469,6 @@
 		<year>1985</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2017-01-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12134,7 +11482,6 @@
 		<year>1986</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2015-08-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12148,7 +11495,6 @@
 		<year>1983</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2016-02-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12162,7 +11508,6 @@
 		<year>1983</year>
 		<publisher>Gentry Software</publisher>
 		<info name="release" value="2016-12-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12176,7 +11521,6 @@
 		<year>1985</year>
 		<publisher>Methods &amp; Solutions</publisher>
 		<info name="release" value="2017-05-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12190,7 +11534,6 @@
 		<year>1985</year>
 		<publisher>D.C. Heath and Company</publisher>
 		<info name="release" value="2017-09-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12204,7 +11547,6 @@
 		<year>1989</year>
 		<publisher>Data East USA</publisher>
 		<info name="release" value="2017-08-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12218,7 +11560,6 @@
 		<year>1984</year>
 		<publisher>Davka Corporation</publisher>
 		<info name="release" value="2017-03-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -12239,7 +11580,6 @@
 		<year>1983</year>
 		<publisher>Micro Learn</publisher>
 		<info name="release" value="2016-07-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12253,7 +11593,6 @@
 		<year>1982</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2016-04-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12267,7 +11606,6 @@
 		<year>1982</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2016-04-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12281,7 +11619,6 @@
 		<year>1987</year>
 		<publisher>Garde</publisher>
 		<info name="release" value="2018-10-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -12302,7 +11639,6 @@
 		<year>1986</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2018-10-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12316,7 +11652,6 @@
 		<year>1985</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-04-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12330,7 +11665,6 @@
 		<year>1981</year>
 		<publisher>Avant-Garde Creations</publisher>
 		<info name="release" value="2015-07-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12344,7 +11678,6 @@
 		<year>1987</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2015-07-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12358,7 +11691,6 @@
 		<year>1987</year>
 		<publisher>Davidson and Associates</publisher>
 		<info name="release" value="2016-10-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -12379,7 +11711,6 @@
 		<year>1982</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2015-07-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12393,7 +11724,6 @@
 		<year>1987</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2016-07-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12407,7 +11737,6 @@
 		<year>1982</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12421,7 +11750,6 @@
 		<year>1982</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12435,7 +11763,6 @@
 		<year>1984</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-07-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12449,7 +11776,6 @@
 		<year>1983</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2019-01-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12463,7 +11789,6 @@
 		<year>1985</year>
 		<publisher>Learning Technologies</publisher>
 		<info name="release" value="2017-04-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12477,7 +11802,6 @@
 		<year>1987</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2016-07-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12491,7 +11815,6 @@
 		<year>1987</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2016-07-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12505,7 +11828,6 @@
 		<year>1985</year>
 		<publisher>Bantam Software</publisher>
 		<info name="release" value="2017-12-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -12526,7 +11848,6 @@
 		<year>1982</year>
 		<publisher>Morningstar</publisher>
 		<info name="release" value="2018-10-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12540,7 +11861,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12554,7 +11874,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12568,7 +11887,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12582,7 +11900,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12596,7 +11913,6 @@
 		<year>1987</year>
 		<publisher>Data East USA</publisher>
 		<info name="release" value="2015-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -12617,7 +11933,6 @@
 		<year>1984</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-10-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A - Scenario and boot"/>
@@ -12638,7 +11953,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12652,7 +11966,6 @@
 		<year>1983</year>
 		<publisher>Spinnaker Software</publisher>
 		<info name="release" value="2017-11-22"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12666,7 +11979,6 @@
 		<year>1984</year>
 		<publisher>Spinnaker Software</publisher>
 		<info name="release" value="2018-03-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12680,7 +11992,6 @@
 		<year>1987</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2018-10-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12694,7 +12005,6 @@
 		<year>1984</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-04-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12708,7 +12018,6 @@
 		<year>1983</year>
 		<publisher>Infocom</publisher>
 		<info name="release" value="2017-11-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12722,7 +12031,6 @@
 		<year>1984</year>
 		<publisher>Grolier Publishing</publisher>
 		<info name="release" value="2017-01-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12736,7 +12044,6 @@
 		<year>1986</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2017-09-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12750,7 +12057,6 @@
 		<year>1981</year>
 		<publisher>Apple ("Special Delivery"</publisher>
 		<info name="release" value="2016-12-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12764,7 +12070,6 @@
 		<year>1986</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-01-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12778,7 +12083,6 @@
 		<year>1983</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2015-12-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12792,7 +12096,6 @@
 		<year>1987</year>
 		<publisher>Silver</publisher>
 		<info name="release" value="2018-10-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12806,7 +12109,6 @@
 		<year>1987</year>
 		<publisher>Silver</publisher>
 		<info name="release" value="2018-10-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12820,7 +12122,6 @@
 		<year>1984</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2019-01-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12834,7 +12135,6 @@
 		<year>1983</year>
 		<publisher>McCarthy-McCormack</publisher>
 		<info name="release" value="2015-06-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12848,7 +12148,6 @@
 		<year>1989</year>
 		<publisher>Micrograms</publisher>
 		<info name="release" value="2018-06-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12862,7 +12161,6 @@
 		<year>1990</year>
 		<publisher>National Geographic Society</publisher>
 		<info name="release" value="2017-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -12883,7 +12181,6 @@
 		<year>1990</year>
 		<publisher>National Geographic Society</publisher>
 		<info name="release" value="2017-08-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -12904,7 +12201,6 @@
 		<year>1984</year>
 		<publisher>Unicorn Software</publisher>
 		<info name="release" value="2015-06-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12918,7 +12214,6 @@
 		<year>1988</year>
 		<publisher>Pelican Software</publisher>
 		<info name="release" value="2017-11-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -12939,7 +12234,6 @@
 		<year>1987</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2017-11-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12953,7 +12247,6 @@
 		<year>1983</year>
 		<publisher>Methods &amp; Solutions</publisher>
 		<info name="release" value="2018-04-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12967,7 +12260,6 @@
 		<year>1982</year>
 		<publisher>Hayden Book Company</publisher>
 		<info name="release" value="2017-11-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -12981,7 +12273,6 @@
 		<year>1985</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-10-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Game"/>
@@ -13002,7 +12293,6 @@
 		<year>1985</year>
 		<publisher>Data East</publisher>
 		<info name="release" value="2018-08-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13016,7 +12306,6 @@
 		<year>1983</year>
 		<publisher>Reader's Digest Services</publisher>
 		<info name="release" value="2016-03-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13030,7 +12319,6 @@
 		<year>1992</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-02-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13044,7 +12332,6 @@
 		<year>1987</year>
 		<publisher>Data East</publisher>
 		<info name="release" value="2018-12-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -13065,7 +12352,6 @@
 		<year>1990</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2017-09-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -13086,7 +12372,6 @@
 		<year>1983</year>
 		<publisher>Spinnaker Software</publisher>
 		<info name="release" value="2015-12-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13100,7 +12385,6 @@
 		<year>1983</year>
 		<publisher>Midwest Software</publisher>
 		<info name="release" value="2018-02-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13114,7 +12398,6 @@
 		<year>1983</year>
 		<publisher>Spinnaker Software</publisher>
 		<info name="release" value="2017-04-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13128,7 +12411,6 @@
 		<year>1981</year>
 		<publisher>Hayden Book Company</publisher>
 		<info name="release" value="2017-10-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13142,7 +12424,6 @@
 		<year>1984</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2018-01-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13166,7 +12447,6 @@
 		<year>1985</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2018-01-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 Side A"/>
@@ -13205,7 +12485,6 @@
 		<year>1988</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2018-01-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 Side A"/>
@@ -13274,7 +12553,6 @@
 		<year>1989</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2016-02-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -13295,7 +12573,6 @@
 		<year>1984</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-09-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -13316,7 +12593,6 @@
 		<year>1983</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-10-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13330,7 +12606,6 @@
 		<year>1982</year>
 		<publisher>MUSE Software</publisher>
 		<info name="release" value="2017-10-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13344,7 +12619,6 @@
 		<year>1982</year>
 		<publisher>MUSE Software</publisher>
 		<info name="release" value="2017-10-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13358,7 +12632,6 @@
 		<year>1984</year>
 		<publisher>Academic Hallmarks</publisher>
 		<info name="release" value="2017-03-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -13379,7 +12652,6 @@
 		<year>1984</year>
 		<publisher>Academic Hallmarks</publisher>
 		<info name="release" value="2016-08-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13393,7 +12665,6 @@
 		<year>1984</year>
 		<publisher>Academic Hallmarks</publisher>
 		<info name="release" value="2016-09-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13407,7 +12678,6 @@
 		<year>1985</year>
 		<publisher>Academic Hallmarks</publisher>
 		<info name="release" value="2017-05-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13421,7 +12691,6 @@
 		<year>1983</year>
 		<publisher>Koala Technologies</publisher>
 		<info name="release" value="2017-01-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13435,7 +12704,6 @@
 		<year>1985</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2016-12-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13449,7 +12717,6 @@
 		<year>1983</year>
 		<publisher>Krell Software</publisher>
 		<info name="release" value="2017-09-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Math I"/>
@@ -13494,7 +12761,6 @@
 		<year>1982</year>
 		<publisher>Krell Software</publisher>
 		<info name="release" value="2017-11-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Program"/>
@@ -13515,7 +12781,6 @@
 		<year>1983</year>
 		<publisher>Data East</publisher>
 		<info name="release" value="2016-07-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13529,7 +12794,6 @@
 		<year>1988</year>
 		<publisher>Epyx</publisher>
 		<info name="release" value="2015-08-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -13550,7 +12814,6 @@
 		<year>1984</year>
 		<publisher>Quest Learning Systems</publisher>
 		<info name="release" value="2016-07-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Program Disk"/>
@@ -13595,7 +12858,6 @@
 		<year>1988</year>
 		<publisher>Infocom</publisher>
 		<info name="release" value="2018-10-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -13616,7 +12878,6 @@
 		<year>1988</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2016-10-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13630,7 +12891,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2019-01-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13644,7 +12904,6 @@
 		<year>1982</year>
 		<publisher>Hayden Book Company</publisher>
 		<info name="release" value="2017-10-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13658,7 +12917,6 @@
 		<year>1987</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13672,7 +12930,6 @@
 		<year>1983</year>
 		<publisher>American Educational</publisher>
 		<info name="release" value="2015-05-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -13693,7 +12950,6 @@
 		<year>1984</year>
 		<publisher>Peachtree Software</publisher>
 		<info name="release" value="2016-07-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -13714,7 +12970,6 @@
 		<year>1984</year>
 		<publisher>Peachtree Software</publisher>
 		<info name="release" value="2016-07-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -13735,7 +12990,6 @@
 		<year>1984</year>
 		<publisher>Peachtree Software</publisher>
 		<info name="release" value="2016-07-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -13756,7 +13010,6 @@
 		<year>1986</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-07-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13770,7 +13023,6 @@
 		<year>1984</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2018-09-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13784,7 +13036,6 @@
 		<year>1983</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2016-07-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13798,7 +13049,6 @@
 		<year>1982</year>
 		<publisher>Superior Software</publisher>
 		<info name="release" value="2018-10-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13812,7 +13062,6 @@
 		<year>1987</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2018-01-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 Side A"/>
@@ -13851,7 +13100,6 @@
 		<year>1987</year>
 		<publisher>Focus Media</publisher>
 		<info name="release" value="2016-07-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -13884,7 +13132,6 @@
 		<year>1984</year>
 		<publisher>Milton Bradley</publisher>
 		<info name="release" value="2017-04-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -13905,7 +13152,6 @@
 		<year>1985</year>
 		<publisher>Learning Technologies</publisher>
 		<info name="release" value="2017-04-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13919,7 +13165,6 @@
 		<year>1993</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-06-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13933,7 +13178,6 @@
 		<year>1993</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-07-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13947,7 +13191,6 @@
 		<year>1986</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2016-10-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13961,7 +13204,6 @@
 		<year>1982</year>
 		<publisher>Behavioral Engineering</publisher>
 		<info name="release" value="2017-04-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13975,7 +13217,6 @@
 		<year>1981</year>
 		<publisher>Hartley Software</publisher>
 		<info name="release" value="2015-07-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -13989,7 +13230,6 @@
 		<year>1988</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-04-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14003,7 +13243,6 @@
 		<year>1986</year>
 		<publisher>Polarware</publisher>
 		<info name="release" value="2015-07-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14017,7 +13256,6 @@
 		<year>1983</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2015-09-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14031,7 +13269,6 @@
 		<year>1987</year>
 		<publisher>McCarthy-McCormack</publisher>
 		<info name="release" value="2015-12-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -14052,7 +13289,6 @@
 		<year>1986</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-02-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -14079,7 +13315,6 @@
 		<year>1984</year>
 		<publisher>Reader's Digest Services</publisher>
 		<info name="release" value="2017-08-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14093,7 +13328,6 @@
 		<year>1986</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2016-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -14114,7 +13348,6 @@
 		<year>1983</year>
 		<publisher>Omega MicroWare</publisher>
 		<info name="release" value="2016-08-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14128,7 +13361,6 @@
 		<year>1983</year>
 		<publisher>Omega Microware</publisher>
 		<info name="release" value="2018-06-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14142,7 +13374,6 @@
 		<year>1983</year>
 		<publisher>Broderbund Software</publisher>
 		<info name="release" value="2018-10-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14156,7 +13387,6 @@
 		<year>1984</year>
 		<publisher>Fisher Price Learning</publisher>
 		<info name="release" value="2016-01-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14170,7 +13400,6 @@
 		<year>1982</year>
 		<publisher>The Learning Company</publisher>
 		<info name="release" value="2015-01-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14184,7 +13413,6 @@
 		<year>1986</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2017-04-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14198,7 +13426,6 @@
 		<year>1985</year>
 		<publisher>Softlore Corporation</publisher>
 		<info name="release" value="2018-10-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14212,7 +13439,6 @@
 		<year>1986</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -14233,7 +13459,6 @@
 		<year>1984</year>
 		<publisher>American Eagle</publisher>
 		<info name="release" value="2018-10-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -14254,7 +13479,6 @@
 		<year>1984</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2019-01-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14268,7 +13492,6 @@
 		<year>1984</year>
 		<publisher>Society for Visual Education</publisher>
 		<info name="release" value="2016-08-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14282,7 +13505,6 @@
 		<year>1984</year>
 		<publisher>Society for Visual Education</publisher>
 		<info name="release" value="2016-08-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14296,7 +13518,6 @@
 		<year>1981</year>
 		<publisher>Micro Lab</publisher>
 		<info name="release" value="2018-11-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14310,7 +13531,6 @@
 		<year>1985</year>
 		<publisher>Methods and Solutions</publisher>
 		<info name="release" value="2016-07-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14324,7 +13544,6 @@
 		<year>1986</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-02-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14338,7 +13557,6 @@
 		<year>1987</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-08-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14352,7 +13570,6 @@
 		<year>1984</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-02-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14366,7 +13583,6 @@
 		<year>1984</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-02-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14380,7 +13596,6 @@
 		<year>1984</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-02-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14394,7 +13609,6 @@
 		<year>1984</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-02-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14408,7 +13622,6 @@
 		<year>1984</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-02-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14422,7 +13635,6 @@
 		<year>1986</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-02-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14436,7 +13648,6 @@
 		<year>1987</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-08-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14450,7 +13661,6 @@
 		<year>1985</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-02-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14464,7 +13674,6 @@
 		<year>1985</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-08-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14478,7 +13687,6 @@
 		<year>1985</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-02-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14492,7 +13700,6 @@
 		<year>1987</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-02-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14506,7 +13713,6 @@
 		<year>1988</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2018-01-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14520,7 +13726,6 @@
 		<year>1988</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2018-01-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14534,7 +13739,6 @@
 		<year>1988</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2018-01-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14548,7 +13752,6 @@
 		<year>1981</year>
 		<publisher>Apple Computer</publisher>
 		<info name="release" value="2016-12-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14562,7 +13765,6 @@
 		<year>1985</year>
 		<publisher>The Learning Company</publisher>
 		<info name="release" value="2015-12-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14576,7 +13778,6 @@
 		<year>1985</year>
 		<publisher>Unicorn Software</publisher>
 		<info name="release" value="2015-01-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14590,7 +13791,6 @@
 		<year>1993</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-12-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14604,7 +13804,6 @@
 		<year>1983</year>
 		<publisher>CBS Software</publisher>
 		<info name="release" value="2015-07-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -14631,7 +13830,6 @@
 		<year>1987</year>
 		<publisher>Lucasfilm Games</publisher>
 		<info name="release" value="2015-09-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -14652,7 +13850,6 @@
 		<year>1987</year>
 		<publisher>Optimum Resource</publisher>
 		<info name="release" value="2016-01-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14666,7 +13863,6 @@
 		<year>1986</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-05-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -14687,7 +13883,6 @@
 		<year>1983</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2017-01-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14701,7 +13896,6 @@
 		<year>1986</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -14722,7 +13916,6 @@
 		<year>1990</year>
 		<publisher>General Quarters Software</publisher>
 		<info name="release" value="2017-08-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -14743,7 +13936,6 @@
 		<year>1982</year>
 		<publisher>Datamost</publisher>
 		<info name="release" value="2017-09-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14798,7 +13990,6 @@
 		<year>1984</year>
 		<publisher>Springboard Software</publisher>
 		<info name="release" value="2015-05-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -14819,7 +14010,6 @@
 		<year>1983</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2016-09-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14833,7 +14023,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14847,7 +14036,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14861,7 +14049,6 @@
 		<year>1984</year>
 		<publisher>Scarborough Systems</publisher>
 		<info name="release" value="2014-06-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14875,7 +14062,6 @@
 		<year>1985</year>
 		<publisher>Scarborough Systems</publisher>
 		<info name="release" value="2016-12-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -14896,7 +14082,6 @@
 		<year>1984</year>
 		<publisher>Scarborough Systems</publisher>
 		<info name="release" value="2019-01-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14910,7 +14095,6 @@
 		<year>1984</year>
 		<publisher>The Regents/ALA Company</publisher>
 		<info name="release" value="2016-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14924,7 +14108,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14938,7 +14121,6 @@
 		<year>1987</year>
 		<publisher>Davidson &amp; Associates</publisher>
 		<info name="release" value="2018-06-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -14959,7 +14141,6 @@
 		<year>1983</year>
 		<publisher>Media Materials</publisher>
 		<info name="release" value="2017-02-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -14973,7 +14154,6 @@
 		<year>1989</year>
 		<publisher>Davidson &amp; Associates</publisher>
 		<info name="release" value="2015-01-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -15006,7 +14186,6 @@
 		<year>1989</year>
 		<publisher>Davidson &amp; Associates</publisher>
 		<info name="release" value="2015-09-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -15027,7 +14206,6 @@
 		<year>1987</year>
 		<publisher>Davidson &amp; Associates</publisher>
 		<info name="release" value="2015-05-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -15048,7 +14226,6 @@
 		<year>1989</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15062,7 +14239,6 @@
 		<year>1985</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-08-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15076,7 +14252,6 @@
 		<year>1992</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2016-09-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -15097,7 +14272,6 @@
 		<year>1982</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2015-09-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -15118,7 +14292,6 @@
 		<year>1985</year>
 		<publisher>Learning Technologies</publisher>
 		<info name="release" value="2015-11-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15132,7 +14305,6 @@
 		<year>1983</year>
 		<publisher>Harcourt Brace Jovanovich</publisher>
 		<info name="release" value="2017-02-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15146,7 +14318,6 @@
 		<year>1987</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-07-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15160,7 +14331,6 @@
 		<year>1988</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-07-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15174,7 +14344,6 @@
 		<year>1989</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-07-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15188,7 +14357,6 @@
 		<year>1989</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-07-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15202,7 +14370,6 @@
 		<year>1986</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2015-03-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15216,7 +14383,6 @@
 		<year>1984</year>
 		<publisher>Houghton Mifflin Company</publisher>
 		<info name="release" value="2015-10-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15230,7 +14396,6 @@
 		<year>1984</year>
 		<publisher>Houghton Mifflin Company</publisher>
 		<info name="release" value="2017-01-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15244,7 +14409,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15258,7 +14422,6 @@
 		<year>1984</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15272,7 +14435,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15286,7 +14448,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15300,7 +14461,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15314,7 +14474,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15328,7 +14487,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15342,7 +14500,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15356,7 +14513,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-06-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15370,7 +14526,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15384,7 +14539,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15398,7 +14552,6 @@
 		<year>1980</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-10-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15412,7 +14565,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15426,7 +14578,6 @@
 		<year>1980</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-10-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15440,7 +14591,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15454,7 +14604,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15468,7 +14617,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15482,7 +14630,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15496,7 +14643,6 @@
 		<year>1985</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15510,7 +14656,6 @@
 		<year>1986</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15524,7 +14669,6 @@
 		<year>1986</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2016-06-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -15545,7 +14689,6 @@
 		<year>1986</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2016-01-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -15566,7 +14709,6 @@
 		<year>1988</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2015-12-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -15587,7 +14729,6 @@
 		<year>1986</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2016-01-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -15608,7 +14749,6 @@
 		<year>1987</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2016-01-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -15629,7 +14769,6 @@
 		<year>1986</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2016-03-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15659,10 +14798,8 @@
 		<publisher>Houghton-Mifflin Company</publisher>
 		<info name="release" value="2015-09-18"/>
 		<info name="usage" value="Disk 1 remains missing. Disk 2 does boot." />
-		<!-- No compatibility data known at this time. -->
 		<!-- Main menu presents choices from 6-10, implying disk 1 is missing.
-		The disk does autoboot, though, so it's usable.
-		Is there a disk 3? -->
+		The disk does autoboot, though, so it's usable. Is there a disk 3? -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 2"/>
@@ -15677,9 +14814,8 @@
 		<year>1983</year>
 		<publisher>Houghton-Mifflin Company</publisher>
 		<info name="release" value="2015-09-18"/>
-		<!-- No compatibility data known at this time. -->
-		<!-- Main menu shows choices from 11-15, implying disk 1 and 2 are missing.
-		The disk does autoboot, though, so it's usable. -->
+		<!-- Main menu shows choices from 11-15, implying disk A and B are
+		missing. The disk does autoboot, though, so it's usable. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk C"/>
@@ -15694,7 +14830,6 @@
 		<year>1987</year>
 		<publisher>Addison-Wesley</publisher>
 		<info name="release" value="2015-08-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15708,7 +14843,6 @@
 		<year>1987</year>
 		<publisher>Addison-Wesley</publisher>
 		<info name="release" value="2015-09-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15722,7 +14856,6 @@
 		<year>1987</year>
 		<publisher>Addison-Wesley</publisher>
 		<info name="release" value="2015-08-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15736,7 +14869,6 @@
 		<year>1986</year>
 		<publisher>Addison-Wesley</publisher>
 		<info name="release" value="2017-04-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15750,7 +14882,6 @@
 		<year>1985</year>
 		<publisher>Harcourt Brace Jovanovich</publisher>
 		<info name="release" value="2015-06-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -15789,7 +14920,6 @@
 		<year>1983</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2019-01-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15803,7 +14933,6 @@
 		<year>1982</year>
 		<publisher>Avant-Garde Creations</publisher>
 		<info name="release" value="2015-08-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15817,7 +14946,6 @@
 		<year>1982</year>
 		<publisher>Rock Roy</publisher>
 		<info name="release" value="2018-05-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15831,7 +14959,6 @@
 		<year>1984</year>
 		<publisher>Grolier Publishing</publisher>
 		<info name="release" value="2017-01-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15845,7 +14972,6 @@
 		<year>1984</year>
 		<publisher>Avalon Hill</publisher>
 		<info name="release" value="2018-09-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15859,7 +14985,6 @@
 		<year>1985</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-04-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15873,7 +14998,6 @@
 		<year>1984</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-09-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15887,7 +15011,6 @@
 		<year>1984</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-05-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15901,7 +15024,6 @@
 		<year>1985</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-06-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15915,7 +15037,6 @@
 		<year>1985</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-04-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -15929,7 +15050,6 @@
 		<year>1985</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-04-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -15950,7 +15070,6 @@
 		<year>1985</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-09-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -15971,7 +15090,6 @@
 		<year>1985</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-09-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -15992,7 +15110,6 @@
 		<year>1985</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-04-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16006,7 +15123,6 @@
 		<year>1985</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-02-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16020,7 +15136,6 @@
 		<year>1986</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-04-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16034,7 +15149,6 @@
 		<year>1986</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-05-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16048,7 +15162,6 @@
 		<year>1987</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-06-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16062,7 +15175,6 @@
 		<year>1987</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-04-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16076,7 +15188,6 @@
 		<year>1987</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-04-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16104,7 +15215,6 @@
 		<year>1988</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-09-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16118,7 +15228,6 @@
 		<year>1988</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-03-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16132,7 +15241,6 @@
 		<year>1988</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-05-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16146,7 +15254,6 @@
 		<year>1990</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-09-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16160,7 +15267,6 @@
 		<year>1988</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-04-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16174,7 +15280,6 @@
 		<year>1988</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-08-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16188,7 +15293,6 @@
 		<year>1989</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-12-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16202,7 +15306,6 @@
 		<year>1989</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-03-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16216,7 +15319,6 @@
 		<year>1990</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-03-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16230,7 +15332,6 @@
 		<year>1991</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-12-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -16251,7 +15352,6 @@
 		<year>1992</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-09-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16265,7 +15365,6 @@
 		<year>????</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-10-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -16286,7 +15385,6 @@
 		<year>1992</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-02-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16300,7 +15398,6 @@
 		<year>1980</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-02-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16314,7 +15411,6 @@
 		<year>1983</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-03-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16328,7 +15424,6 @@
 		<year>1980</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16342,7 +15437,6 @@
 		<year>1980</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2018-07-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16356,7 +15450,6 @@
 		<year>1980</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-10-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16370,7 +15463,6 @@
 		<year>1980</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-09-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16384,7 +15476,6 @@
 		<year>1980</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-04-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16398,7 +15489,6 @@
 		<year>1980</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-10-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16412,7 +15502,6 @@
 		<year>1981</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16426,7 +15515,6 @@
 		<year>1980</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-02-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16440,7 +15528,6 @@
 		<year>1980</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-02-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16454,7 +15541,6 @@
 		<year>1981</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2018-02-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16468,7 +15554,6 @@
 		<year>1981</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2018-07-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16482,7 +15567,6 @@
 		<year>1981</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2018-01-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16496,7 +15580,6 @@
 		<year>1982</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16510,7 +15593,6 @@
 		<year>1982</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-09-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16524,7 +15606,6 @@
 		<year>1982</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-04-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16538,7 +15619,6 @@
 		<year>1983</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-03-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16552,7 +15632,6 @@
 		<year>1984</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16566,7 +15645,6 @@
 		<year>1983</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16580,7 +15658,6 @@
 		<year>1983</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-03-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16594,7 +15671,6 @@
 		<year>1983</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16608,7 +15684,6 @@
 		<year>1983</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2016-11-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16622,7 +15697,6 @@
 		<year>1983</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2018-07-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16636,7 +15710,6 @@
 		<year>1983</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-06-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16650,7 +15723,6 @@
 		<year>1983</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-06-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16664,7 +15736,6 @@
 		<year>1983</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-06-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16678,7 +15749,6 @@
 		<year>1983</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2018-02-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16692,7 +15762,6 @@
 		<year>1983</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2018-01-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16706,7 +15775,6 @@
 		<year>1983</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-06-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16720,7 +15788,6 @@
 		<year>1985</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-11-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16734,7 +15801,6 @@
 		<year>1985</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2017-11-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16748,7 +15814,6 @@
 		<year>1985</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-10-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Game and boot"/>
@@ -16769,7 +15834,6 @@
 		<year>1987</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-05-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16783,7 +15847,6 @@
 		<year>1981</year>
 		<publisher>Softsmith</publisher>
 		<info name="release" value="2015-05-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -16816,7 +15879,6 @@
 		<year>1986</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2015-09-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16830,7 +15892,6 @@
 		<year>1989</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-05-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16844,7 +15905,6 @@
 		<year>1983</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2016-01-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16858,7 +15918,6 @@
 		<year>1986</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-12-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16872,7 +15931,6 @@
 		<year>1984</year>
 		<publisher>Computer Headware</publisher>
 		<info name="release" value="2015-11-22"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -16893,7 +15951,6 @@
 		<year>1983</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2016-03-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16907,7 +15964,6 @@
 		<year>1982</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2015-07-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16921,7 +15977,6 @@
 		<year>1982</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2017-06-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16935,7 +15990,6 @@
 		<year>1983</year>
 		<publisher>Hayden Book Company</publisher>
 		<info name="release" value="2016-08-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16949,7 +16003,6 @@
 		<year>1983</year>
 		<publisher>Hayden Book Company</publisher>
 		<info name="release" value="2016-07-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16963,7 +16016,6 @@
 		<year>1984</year>
 		<publisher>Reader's Digest Software</publisher>
 		<info name="release" value="2017-01-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16977,7 +16029,6 @@
 		<year>1980</year>
 		<publisher>Stoneware</publisher>
 		<info name="release" value="2017-11-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -16991,7 +16042,6 @@
 		<year>1983</year>
 		<publisher>Hayden Book Company</publisher>
 		<info name="release" value="2016-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17005,7 +16055,6 @@
 		<year>1982</year>
 		<publisher>Synergistic Software</publisher>
 		<info name="release" value="2017-04-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17019,7 +16068,6 @@
 		<year>1982</year>
 		<publisher>Synergistic Software</publisher>
 		<info name="release" value="2017-05-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17033,7 +16081,6 @@
 		<year>1989</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17047,7 +16094,6 @@
 		<year>1989</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17061,7 +16107,6 @@
 		<year>1989</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17075,7 +16120,6 @@
 		<year>1989</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17089,7 +16133,6 @@
 		<year>1989</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17103,7 +16146,6 @@
 		<year>1989</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17117,7 +16159,6 @@
 		<year>1989</year>
 		<publisher>Laureate Learning Systems</publisher>
 		<info name="release" value="2016-09-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17131,7 +16172,6 @@
 		<year>1982</year>
 		<publisher>Hayden Book Company</publisher>
 		<info name="release" value="2017-10-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17140,12 +16180,14 @@
 		</part>
 	</software>
 
-	<software name="mcorgtrl">
+	<software name="mcorgtrl" supported="no">
 		<description>MECC-A157 Oregon Trail (Version 1.1) (cleanly cracked)</description>
 		<year>1985</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2019-05-29"/>
-		<!-- No compatibility data known at this time. -->
+		<!-- As of 8/16/2020 changed to not working; this disk image looks like
+		it may be bad. I've gotten in touch with 4am to investigate as the disk
+		image doesn't seem to work on multiple Apple emulators. - FH -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -17161,12 +16203,31 @@
 		</part>
 	</software>
 
+	<software name="mcortr14">
+		<description>MECC-A157 Oregon Trail (Version 1.4) (cleanly cracked)</description>
+		<year>1985</year>
+		<publisher>MECC</publisher>
+		<info name="release" value="2014-07-19"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Side A"/>
+			<dataarea name="flop" size="143360">
+				<rom name="mecc-a157 the oregon trail v1.4 (logo crack) side a.dsk" size="143360" crc="6332b2c7" sha1="52c7a6cc3939ab6ff3e0063f87eac4d4d466d85a" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Side B"/>
+			<dataarea name="flop" size="143360">
+				<rom name="mecc-a157 the oregon trail v1.4 (logo crack) side b.dsk" size="143360" crc="37cad616" sha1="e26e2e67f9891a6835c0d93e07a12b7e2d9691c7" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="mcrtutr2">
 		<description>MicroTutor II - Prefixes, Suffixes, Capitalization (cleanly cracked)</description>
 		<year>1982</year>
 		<publisher>Scandura associates</publisher>
 		<info name="release" value="2017-01-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17180,7 +16241,6 @@
 		<year>1985</year>
 		<publisher>South-Western Publishing</publisher>
 		<info name="release" value="2018-09-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -17201,7 +16261,6 @@
 		<year>1988</year>
 		<publisher>S. E. Warner Software</publisher>
 		<info name="release" value="2018-03-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -17222,7 +16281,6 @@
 		<year>1982</year>
 		<publisher>Cavalier Computer</publisher>
 		<info name="release" value="2018-07-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17236,7 +16294,6 @@
 		<year>1984</year>
 		<publisher>Blue Chip Software</publisher>
 		<info name="release" value="2015-11-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17250,7 +16307,6 @@
 		<year>1986</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2016-01-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -17271,7 +16327,6 @@
 		<year>1986</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2016-01-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -17292,7 +16347,6 @@
 		<year>1984</year>
 		<publisher>MCE</publisher>
 		<info name="release" value="2015-05-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17306,7 +16360,6 @@
 		<year>1985</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-09-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Program"/>
@@ -17333,7 +16386,6 @@
 		<year>1984</year>
 		<publisher>The Human Edge</publisher>
 		<info name="release" value="2017-10-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17347,7 +16399,6 @@
 		<year>1984</year>
 		<publisher>Micro Fun</publisher>
 		<info name="release" value="2018-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17361,7 +16412,6 @@
 		<year>1982</year>
 		<publisher>Micro Fun</publisher>
 		<info name="release" value="2018-04-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17375,7 +16425,6 @@
 		<year>1983</year>
 		<publisher>Penguin Software</publisher>
 		<info name="release" value="2016-07-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17389,7 +16438,6 @@
 		<year>1982</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2017-09-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17403,7 +16451,6 @@
 		<year>1985</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2017-06-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17417,7 +16464,6 @@
 		<year>1981</year>
 		<publisher>On-Line Systems</publisher>
 		<info name="release" value="2017-12-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17431,7 +16477,6 @@
 		<year>1984</year>
 		<publisher>DesignWare</publisher>
 		<info name="release" value="2015-01-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17445,7 +16490,6 @@
 		<year>1991</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2017-07-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -17466,7 +16510,6 @@
 		<year>1981</year>
 		<publisher>Apple</publisher>
 		<info name="release" value="2016-12-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17480,7 +16523,6 @@
 		<year>1990</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2018-01-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 Side A"/>
@@ -17545,7 +16587,6 @@
 		<year>1983</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-12-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17559,7 +16600,6 @@
 		<year>1982</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-04-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17573,7 +16613,6 @@
 		<year>1982</year>
 		<publisher>Datamost</publisher>
 		<info name="release" value="2017-08-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17587,7 +16626,6 @@
 		<year>1985</year>
 		<publisher>Litag</publisher>
 		<info name="release" value="2015-12-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17601,7 +16639,6 @@
 		<year>1983</year>
 		<publisher>Artworx</publisher>
 		<info name="release" value="2015-03-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17615,7 +16652,6 @@
 		<year>1982</year>
 		<publisher>The Software Farm</publisher>
 		<info name="release" value="2016-12-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17629,7 +16665,6 @@
 		<year>1988</year>
 		<publisher>Pelican Software</publisher>
 		<info name="release" value="2015-09-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -17650,7 +16685,6 @@
 		<year>1990</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2017-05-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Program"/>
@@ -17683,7 +16717,6 @@
 		<year>1984</year>
 		<publisher>Program Design</publisher>
 		<info name="release" value="2015-12-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17697,7 +16730,6 @@
 		<year>1981</year>
 		<publisher>Ritam Corporation</publisher>
 		<info name="release" value="2016-03-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17711,7 +16743,6 @@
 		<year>1984</year>
 		<publisher>Ritam Corporation</publisher>
 		<info name="release" value="2017-10-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17725,7 +16756,6 @@
 		<year>1985</year>
 		<publisher>Grolier Publishing</publisher>
 		<info name="release" value="2017-09-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17739,7 +16769,6 @@
 		<year>1981</year>
 		<publisher>Apple Computer</publisher>
 		<info name="release" value="2016-12-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17753,7 +16782,6 @@
 		<year>1981</year>
 		<publisher>The Learning Company</publisher>
 		<info name="release" value="2015-01-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17767,7 +16795,6 @@
 		<year>1981</year>
 		<publisher>The Learning Company</publisher>
 		<info name="release" value="2015-07-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17781,7 +16808,6 @@
 		<year>1984</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-07-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17795,7 +16821,6 @@
 		<year>1982</year>
 		<publisher>Methods &amp; Solutions</publisher>
 		<info name="release" value="2015-12-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17809,7 +16834,6 @@
 		<year>1985</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -17830,7 +16854,6 @@
 		<year>1985</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2016-01-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -17851,7 +16874,6 @@
 		<year>1985</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2018-03-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17865,7 +16887,6 @@
 		<year>1983</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2017-01-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17879,7 +16900,6 @@
 		<year>1985</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2018-09-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17893,7 +16913,6 @@
 		<year>1985</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2015-12-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17907,7 +16926,6 @@
 		<year>1987</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2015-06-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17921,7 +16939,6 @@
 		<year>1984</year>
 		<publisher>Datamost</publisher>
 		<info name="release" value="2017-08-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17935,7 +16952,6 @@
 		<year>1986</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-02-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17949,7 +16965,6 @@
 		<year>1985</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-12-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -17963,7 +16978,6 @@
 		<year>1989</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2018-06-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -17984,7 +16998,6 @@
 		<year>1980</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2015-06-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -18041,7 +17054,6 @@
 		<year>1985</year>
 		<publisher>Courses by Computers</publisher>
 		<info name="release" value="2018-07-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -18062,7 +17074,6 @@
 		<year>1984</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2017-12-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18076,7 +17087,6 @@
 		<year>1985</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2017-07-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18090,7 +17100,6 @@
 		<year>1985</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2018-01-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18104,7 +17113,6 @@
 		<year>1985</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2018-01-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18118,7 +17126,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18132,7 +17139,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18146,7 +17152,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18160,7 +17165,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-01-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18174,7 +17178,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18188,7 +17191,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18202,7 +17204,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18216,7 +17217,6 @@
 		<year>1982</year>
 		<publisher>Reston Publishing</publisher>
 		<info name="release" value="2017-05-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18230,7 +17230,6 @@
 		<year>1981</year>
 		<publisher>Highland Computers</publisher>
 		<info name="release" value="2018-09-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18244,7 +17243,6 @@
 		<year>1988</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-04-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Boot"/>
@@ -18265,7 +17263,6 @@
 		<year>1986</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2015-09-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18279,7 +17276,6 @@
 		<year>1987</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2015-09-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18293,7 +17289,6 @@
 		<year>1987</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-06-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18307,7 +17302,6 @@
 		<year>1986</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2015-03-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18321,7 +17315,6 @@
 		<year>1986</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2015-08-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -18342,7 +17335,6 @@
 		<year>1984</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18358,8 +17350,6 @@
 		<info name="release" value="2019-12-09"/>
 		<!-- This crack was updated on 2019-12-09 to fix corruption on track
 		$20. -->
-		<!-- No compatibility data known at this time. -->
-
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
 				<rom name="music construction set (4am and san inc crack).dsk" size="143360" crc="221034cd" sha1="ff22eb248c1a6d270ebb97f4660c97ff832cf0a2" />
@@ -18372,7 +17362,6 @@
 		<year>1988</year>
 		<publisher>Silver</publisher>
 		<info name="release" value="2016-11-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18386,7 +17375,6 @@
 		<year>1983</year>
 		<publisher>Springboard Software</publisher>
 		<info name="release" value="2015-03-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18400,7 +17388,6 @@
 		<year>1980</year>
 		<publisher>Apple Computer</publisher>
 		<info name="release" value="2018-06-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18414,7 +17401,6 @@
 		<year>1984</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2016-11-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -18435,7 +17421,6 @@
 		<year>1980</year>
 		<publisher>On-Line Systems</publisher>
 		<info name="release" value="2017-12-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18449,7 +17434,6 @@
 		<year>1985</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2016-07-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18463,7 +17447,6 @@
 		<year>1986</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-02-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18477,7 +17460,6 @@
 		<year>1984</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2016-12-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -18498,7 +17480,6 @@
 		<year>1986</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-11-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18512,7 +17493,6 @@
 		<year>1984</year>
 		<publisher>None</publisher>
 		<info name="release" value="2016-08-19"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- "Nemesis" is an unreleased 1984 adventure game by Kyle Freeman and
 		Gary Wilens. A later version was released in 1987 by Datasoft under the
 		name "Dark Lord." -->
@@ -18536,7 +17516,6 @@
 		<year>1981</year>
 		<publisher>Level-10</publisher>
 		<info name="release" value="2017-08-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18550,7 +17529,6 @@
 		<year>1984</year>
 		<publisher>Nikrom Technical Products</publisher>
 		<info name="release" value="2019-01-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18596,7 +17574,6 @@
 		<year>1982</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-09-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18610,7 +17587,6 @@
 		<year>1985</year>
 		<publisher>Grolier</publisher>
 		<info name="release" value="2016-03-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Program"/>
@@ -18631,7 +17607,6 @@
 		<year>1986</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2015-06-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -18652,7 +17627,6 @@
 		<year>1984</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-04-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18666,7 +17640,6 @@
 		<year>1981</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-09-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -18687,7 +17660,6 @@
 		<year>1987</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2015-03-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18701,7 +17673,6 @@
 		<year>1987</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2015-03-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18715,7 +17686,6 @@
 		<year>1986</year>
 		<publisher>D.C. Heath and Company</publisher>
 		<info name="release" value="2015-08-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18729,7 +17699,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18743,7 +17712,6 @@
 		<year>1984</year>
 		<publisher>Developmental Learning</publisher>
 		<info name="release" value="2017-10-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18757,7 +17725,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18771,7 +17738,6 @@
 		<year>1985</year>
 		<publisher>Learning Technologies</publisher>
 		<info name="release" value="2018-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18785,7 +17751,6 @@
 		<year>1984</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-04-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18799,7 +17764,6 @@
 		<year>1984</year>
 		<publisher>The Learning Company</publisher>
 		<info name="release" value="2016-11-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18813,7 +17777,6 @@
 		<year>1983</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2018-12-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18827,7 +17790,6 @@
 		<year>1985</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2018-01-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18841,7 +17803,6 @@
 		<year>1986</year>
 		<publisher>Origin Systems</publisher>
 		<info name="release" value="2015-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18855,7 +17816,6 @@
 		<year>1982</year>
 		<publisher>CPU Software</publisher>
 		<info name="release" value="2018-04-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18869,7 +17829,6 @@
 		<year>1983</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2016-07-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18903,7 +17862,6 @@
 		<year>1989</year>
 		<publisher>Origin Systems</publisher>
 		<info name="release" value="2018-09-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 Side A - Systems"/>
@@ -18936,7 +17894,6 @@
 		<year>1986</year>
 		<publisher>Polarware</publisher>
 		<info name="release" value="2018-01-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -18957,7 +17914,6 @@
 		<year>1981</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-10-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18971,7 +17927,6 @@
 		<year>1984</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2016-12-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18985,7 +17940,6 @@
 		<year>1986</year>
 		<publisher>Polarware</publisher>
 		<info name="release" value="2015-01-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -18999,7 +17953,6 @@
 		<year>1982</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-09-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -19020,7 +17973,6 @@
 		<year>1984</year>
 		<publisher>Microcomputer Workshops</publisher>
 		<info name="release" value="2017-12-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19034,7 +17986,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19048,7 +17999,6 @@
 		<year>1984</year>
 		<publisher>Chevron Chemical</publisher>
 		<info name="release" value="2015-12-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Program"/>
@@ -19069,7 +18019,6 @@
 		<year>1981</year>
 		<publisher>Sirius Software</publisher>
 		<info name="release" value="2015-12-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19083,7 +18032,6 @@
 		<year>1983</year>
 		<publisher>ADAM Christian Educational</publisher>
 		<info name="release" value="2015-08-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -19110,7 +18058,6 @@
 		<year>1982</year>
 		<publisher>Datamost</publisher>
 		<info name="release" value="2017-10-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19124,7 +18071,6 @@
 		<year>1985</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-04-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19138,7 +18084,6 @@
 		<year>1986</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2015-02-20"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19152,7 +18097,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19166,7 +18110,6 @@
 		<year>1985</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-09-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19180,7 +18123,6 @@
 		<year>1992</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-02-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19194,7 +18136,6 @@
 		<year>1991</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2015-02-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19208,7 +18149,6 @@
 		<year>1984</year>
 		<publisher>Thunder Mountain</publisher>
 		<info name="release" value="2017-07-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19222,7 +18162,6 @@
 		<year>1986</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2017-02-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19236,7 +18175,6 @@
 		<year>1984</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-07-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19250,7 +18188,6 @@
 		<year>1984</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2017-02-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19264,7 +18201,6 @@
 		<year>1984</year>
 		<publisher>Random House</publisher>
 		<info name="release" value="2016-12-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -19285,7 +18221,6 @@
 		<year>1984</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-07-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19299,7 +18234,6 @@
 		<year>1981</year>
 		<publisher>On-Line Systems</publisher>
 		<info name="release" value="2017-12-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19313,7 +18247,6 @@
 		<year>1986</year>
 		<publisher>Gamco Industries</publisher>
 		<info name="release" value="2017-07-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19327,7 +18260,6 @@
 		<year>1985</year>
 		<publisher>Telarium</publisher>
 		<info name="release" value="2018-09-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk A"/>
@@ -19361,7 +18293,6 @@
 		<year>1980</year>
 		<publisher>Apple Computer</publisher>
 		<info name="release" value="2018-06-09"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19375,7 +18306,6 @@
 		<year>1985</year>
 		<publisher>Fisher Price Learning</publisher>
 		<info name="release" value="2015-12-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -19396,7 +18326,6 @@
 		<year>1985</year>
 		<publisher>Fisher Price Learning</publisher>
 		<info name="release" value="2015-03-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -19417,7 +18346,6 @@
 		<year>1984</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-10-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19431,7 +18359,6 @@
 		<year>1986</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-10-06"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -19452,7 +18379,6 @@
 		<year>1987</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-10-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -19473,7 +18399,6 @@
 		<year>1989</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2017-11-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19487,7 +18412,6 @@
 		<year>1982</year>
 		<publisher>Synapse Software</publisher>
 		<info name="release" value="2019-01-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19501,7 +18425,6 @@
 		<year>1990</year>
 		<publisher>Jostens Learning Corporation</publisher>
 		<info name="release" value="2018-02-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19515,7 +18438,6 @@
 		<year>1988</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2017-09-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19529,7 +18451,6 @@
 		<year>1989</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2017-11-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19543,7 +18464,6 @@
 		<year>1982</year>
 		<publisher>Penguin Software</publisher>
 		<info name="release" value="2017-08-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19557,7 +18477,6 @@
 		<year>1983</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="release" value="2017-03-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19571,7 +18490,6 @@
 		<year>1984</year>
 		<publisher>McCarthy-McCormack</publisher>
 		<info name="release" value="2015-09-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19585,7 +18503,6 @@
 		<year>1984</year>
 		<publisher>Centurion Software</publisher>
 		<info name="release" value="2017-04-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19599,7 +18516,6 @@
 		<year>1984</year>
 		<publisher>Centurion Industries</publisher>
 		<info name="release" value="2016-01-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19613,7 +18529,6 @@
 		<year>1988</year>
 		<publisher>Data East</publisher>
 		<info name="release" value="2016-09-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -19634,7 +18549,6 @@
 		<year>1985</year>
 		<publisher>Troll Associates</publisher>
 		<info name="release" value="2017-04-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19648,7 +18562,6 @@
 		<year>1982</year>
 		<publisher>Top Notch Software</publisher>
 		<info name="release" value="2018-04-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19662,7 +18575,6 @@
 		<year>1983</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-05-23"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19676,7 +18588,6 @@
 		<year>1986</year>
 		<publisher>Activision</publisher>
 		<info name="release" value="2017-01-30"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 Side A"/>
@@ -19721,7 +18632,6 @@
 		<year>1984</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2017-04-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19775,7 +18685,6 @@
 		<year>1983</year>
 		<publisher>Intellectual Software</publisher>
 		<info name="release" value="2018-07-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -19796,6 +18705,7 @@
 		<year>1988</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2015-01-21"/>
+		<info name="usage" value="Disks 1-13 remain missing." />
 		<!-- Disks 1-13 are believed to exist and are missing. -->
 		<!-- This crack was updated on 2015-12-21 to fix compatibility with some
 		less-accurate emulators. -->
@@ -19891,7 +18801,6 @@
 		<year>1987</year>
 		<publisher>Hartley Courseware</publisher>
 		<info name="release" value="2016-07-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19905,7 +18814,6 @@
 		<year>1981</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-10-21"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19919,7 +18827,6 @@
 		<year>1987</year>
 		<publisher>Strategic Simulations (SSI)</publisher>
 		<info name="release" value="2018-03-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19933,7 +18840,6 @@
 		<year>1987</year>
 		<publisher>Learning Well / Pelican</publisher>
 		<info name="release" value="2015-03-07"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -19954,7 +18860,6 @@
 		<year>1982</year>
 		<publisher>Edu-Ware</publisher>
 		<info name="release" value="2018-09-24"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19968,7 +18873,6 @@
 		<year>1982</year>
 		<publisher>Edu-Ware Services</publisher>
 		<info name="release" value="2018-01-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -19982,7 +18886,6 @@
 		<year>1985</year>
 		<publisher>Hesware</publisher>
 		<info name="release" value="2016-08-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -20003,7 +18906,6 @@
 		<year>1982</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20017,7 +18919,6 @@
 		<year>1982</year>
 		<publisher>Milliken Publishing</publisher>
 		<info name="release" value="2017-08-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20044,7 +18945,6 @@
 		<year>1984</year>
 		<publisher>Peachtree Software</publisher>
 		<info name="release" value="2017-01-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20058,7 +18958,6 @@
 		<year>1984</year>
 		<publisher>Peachtree Software</publisher>
 		<info name="release" value="2017-01-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20072,7 +18971,6 @@
 		<year>1984</year>
 		<publisher>Peachtree Software</publisher>
 		<info name="release" value="2017-01-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20086,7 +18984,6 @@
 		<year>1986</year>
 		<publisher>Soft Productions</publisher>
 		<info name="release" value="2015-01-31"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -20155,7 +19052,6 @@
 		<year>1983</year>
 		<publisher>Queue</publisher>
 		<info name="release" value="2017-11-18"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20169,7 +19065,6 @@
 		<year>1981</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2015-12-16"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20183,7 +19078,6 @@
 		<year>1984</year>
 		<publisher>Springboard Software</publisher>
 		<info name="release" value="2015-03-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20197,7 +19091,6 @@
 		<year>1984</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2016-01-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20211,7 +19104,6 @@
 		<year>1985</year>
 		<publisher>Mindscape</publisher>
 		<info name="release" value="2019-01-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20225,7 +19117,6 @@
 		<year>1983</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2018-11-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20239,7 +19130,6 @@
 		<year>1986</year>
 		<publisher>Josten Learning Corporation</publisher>
 		<info name="release" value="2018-02-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -20260,7 +19150,6 @@
 		<year>1986</year>
 		<publisher>Josten Learning Corporation</publisher>
 		<info name="release" value="2018-02-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -20281,7 +19170,6 @@
 		<year>1986</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2016-04-28"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -20302,7 +19190,6 @@
 		<year>1986</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2016-07-15"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -20323,7 +19210,6 @@
 		<year>1986</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2016-07-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -20344,7 +19230,6 @@
 		<year>1986</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2016-07-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -20365,7 +19250,6 @@
 		<year>1986</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2016-07-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -20386,7 +19270,6 @@
 		<year>1986</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2016-07-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -20407,7 +19290,6 @@
 		<year>1986</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2016-07-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -20428,7 +19310,6 @@
 		<year>1986</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2016-07-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -20449,7 +19330,6 @@
 		<year>1986</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2016-07-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -20470,7 +19350,6 @@
 		<year>1986</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2016-07-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -20491,7 +19370,6 @@
 		<year>1986</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2016-07-17"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
@@ -20512,7 +19390,6 @@
 		<year>1986</year>
 		<publisher>Prescription Learning</publisher>
 		<info name="release" value="2016-03-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -20533,7 +19410,6 @@
 		<year>1984</year>
 		<publisher>Adventure International</publisher>
 		<info name="release" value="2018-05-03"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -20554,7 +19430,6 @@
 		<year>1984</year>
 		<publisher>Thunder Mountain</publisher>
 		<info name="release" value="2017-08-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20568,7 +19443,6 @@
 		<year>1984</year>
 		<publisher>Educational Activities</publisher>
 		<info name="release" value="2017-12-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20582,7 +19456,6 @@
 		<year>1983</year>
 		<publisher>McCarthy-McCormack</publisher>
 		<info name="release" value="2015-06-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20596,7 +19469,6 @@
 		<year>1984</year>
 		<publisher>Mindplay</publisher>
 		<info name="release" value="2017-11-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20610,7 +19482,6 @@
 		<year>1980</year>
 		<publisher>Discovery Games</publisher>
 		<info name="release" value="2018-10-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20624,7 +19495,6 @@
 		<year>1982</year>
 		<publisher>Hayden Book Company</publisher>
 		<info name="release" value="2019-06-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20638,7 +19508,6 @@
 		<year>1985</year>
 		<publisher>Methods and Solutions</publisher>
 		<info name="release" value="2019-04-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20652,7 +19521,6 @@
 		<year>1982</year>
 		<publisher>Broderbund Software</publisher>
 		<info name="release" value="2019-04-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20666,7 +19534,6 @@
 		<year>1985</year>
 		<publisher>Bantam Software</publisher>
 		<info name="release" value="2019-05-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -20687,7 +19554,6 @@
 		<year>1982</year>
 		<publisher>Broderbund Software</publisher>
 		<info name="release" value="2019-04-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20701,7 +19567,6 @@
 		<year>1982</year>
 		<publisher>Gebelli Software</publisher>
 		<info name="release" value="2019-04-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20715,7 +19580,6 @@
 		<year>1981</year>
 		<publisher>Electronic Courseware Systems</publisher>
 		<info name="release" value="2019-04-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20729,7 +19593,6 @@
 		<year>1989</year>
 		<publisher>Developmental Learning Materials</publisher>
 		<info name="release" value="2019-04-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20743,7 +19606,6 @@
 		<year>1982</year>
 		<publisher>Gebelli Software</publisher>
 		<info name="release" value="2019-04-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20757,7 +19619,6 @@
 		<year>1989</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2019-07-13"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- 1985 original release, 1989 re-release -->
 
 		<part name="flop1" interface="floppy_5_25">
@@ -20772,7 +19633,6 @@
 		<year>1982</year>
 		<publisher>Gebelli Software</publisher>
 		<info name="release" value="2019-04-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20786,7 +19646,6 @@
 		<year>1983</year>
 		<publisher>Rhiannon Software</publisher>
 		<info name="release" value="2019-06-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20800,7 +19659,6 @@
 		<year>1981</year>
 		<publisher>Level-10</publisher>
 		<info name="release" value="2019-05-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20814,7 +19672,6 @@
 		<year>1982</year>
 		<publisher>Broderbund Software</publisher>
 		<info name="release" value="2019-04-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20828,7 +19685,6 @@
 		<year>1982</year>
 		<publisher>Gebelli Software</publisher>
 		<info name="release" value="2019-04-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20842,7 +19698,6 @@
 		<year>1981</year>
 		<publisher>ArtSci</publisher>
 		<info name="release" value="2019-05-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20856,7 +19711,6 @@
 		<year>1983</year>
 		<publisher>Phoenix Software</publisher>
 		<info name="release" value="2019-05-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -20877,7 +19731,6 @@
 		<year>1981</year>
 		<publisher>Behavioral Engineering</publisher>
 		<info name="release" value="2019-04-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20891,7 +19744,6 @@
 		<year>1986</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2019-04-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20905,7 +19757,6 @@
 		<year>1981</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2019-04-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20919,7 +19770,6 @@
 		<year>1982</year>
 		<publisher>MECC</publisher>
 		<info name="release" value="2019-04-14"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20933,7 +19783,6 @@
 		<year>1984</year>
 		<publisher>Society for Visual Education</publisher>
 		<info name="release" value="2019-04-27"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1 - Money Adventures"/>
@@ -20954,7 +19803,6 @@
 		<year>1982</year>
 		<publisher>K-12 MultiPloy</publisher>
 		<info name="release" value="2019-05-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20968,7 +19816,6 @@
 		<year>1982</year>
 		<publisher>Gebelli Software</publisher>
 		<info name="release" value="2019-04-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20982,7 +19829,6 @@
 		<year>1983</year>
 		<publisher>Turning Point Software</publisher>
 		<info name="release" value="2019-05-29"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -20996,7 +19842,6 @@
 		<year>1982</year>
 		<publisher>Gebelli Software</publisher>
 		<info name="release" value="2019-04-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21010,7 +19855,6 @@
 		<year>1983</year>
 		<publisher>Strategic Simulations</publisher>
 		<info name="release" value="2019-06-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A - Master Disk"/>
@@ -21031,7 +19875,6 @@
 		<year>1981</year>
 		<publisher>Level-10</publisher>
 		<info name="release" value="2019-05-05"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21045,7 +19888,6 @@
 		<year>1982</year>
 		<publisher>Gebelli Software</publisher>
 		<info name="release" value="2019-04-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21059,7 +19901,6 @@
 		<year>1982</year>
 		<publisher>Adventure International</publisher>
 		<info name="release" value="2019-04-27"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- This version appears to have the game title scrubbed from both the
 		graphical title page and the text introduction, for reasons unknown.
 		(To be clear, this is on the original copy protected disk.) -->
@@ -21083,7 +19924,6 @@
 		<year>1982</year>
 		<publisher>Broderbund Software</publisher>
 		<info name="release" value="2019-04-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21097,7 +19937,6 @@
 		<year>1984</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2019-05-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21111,7 +19950,6 @@
 		<year>1982</year>
 		<publisher>Broderbund Software</publisher>
 		<info name="release" value="2019-04-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21125,7 +19963,6 @@
 		<year>1981</year>
 		<publisher>Broderbund Software</publisher>
 		<info name="release" value="2019-06-01"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21139,7 +19976,6 @@
 		<year>1985</year>
 		<publisher>Learning Technologies</publisher>
 		<info name="release" value="2019-05-25"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21153,7 +19989,6 @@
 		<year>1982</year>
 		<publisher>Broderbund Software</publisher>
 		<info name="release" value="2019-04-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21167,7 +20002,6 @@
 		<year>1981</year>
 		<publisher>Automated Simulations</publisher>
 		<info name="release" value="2019-06-12"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21181,7 +20015,6 @@
 		<year>1983</year>
 		<publisher>Optimum Resource</publisher>
 		<info name="release" value="2019-05-19"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21195,7 +20028,6 @@
 		<year>1983</year>
 		<publisher>Optimum Resource</publisher>
 		<info name="release" value="2019-05-08"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21209,7 +20041,6 @@
 		<year>1991</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2019-07-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21223,7 +20054,6 @@
 		<year>1983</year>
 		<publisher>Unicorn Software</publisher>
 		<info name="release" value="2019-06-01"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- This is an undated updated revision that had updated copy protection. -->
 
 		<part name="flop1" interface="floppy_5_25">
@@ -21238,7 +20068,6 @@
 		<year>1989</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2019-07-11"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21252,7 +20081,6 @@
 		<year>1984</year>
 		<publisher>Thunder Mountain</publisher>
 		<info name="release" value="2019-06-02"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21266,7 +20094,6 @@
 		<year>1984</year>
 		<publisher>Electronic Courseware Systems</publisher>
 		<info name="release" value="2019-04-26"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21280,7 +20107,6 @@
 		<year>1982</year>
 		<publisher>Artworx</publisher>
 		<info name="release" value="2019-04-13"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21294,7 +20120,6 @@
 		<year>1986</year>
 		<publisher>Sunburst Communications</publisher>
 		<info name="release" value="2019-06-04"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
@@ -21308,7 +20133,6 @@
 		<year>1985</year>
 		<publisher>Davidson and Associates</publisher>
 		<info name="release" value="2019-05-10"/>
-		<!-- No compatibility data known at this time. -->
 
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Side A"/>
@@ -21329,7 +20153,6 @@
 		<year>1982</year>
 		<publisher>Phoenix Software</publisher>
 		<info name="release" value="2019-05-05"/>
-		<!-- No compatibility data known at this time. -->
 		<!-- This version is dated 25-MAY-83 according to comments within the
 		program itself. -->
 
@@ -24720,6 +23543,7 @@
 		<year>1985</year>
 		<publisher>Methods and Solutions</publisher>
 		<info name="release" value="2015-09-02"/>
+
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
 				<rom name="the chief of detectives (4am crack).dsk" size="143360" crc="2e7bc78b" sha1="8f0d7abffefa4bf607b855aea436d18e69e1701f" />
@@ -24778,6 +23602,7 @@
 		<year>1995</year>
 		<publisher>Barnum Software</publisher>
 		<info name="release" value="2015-09-11"/>
+		<info name="usage" value="Disks 1, 4, and 5 remain missing." />
 		<!-- This is version 4.1, published in 1995. (The physical label on each
 		disk claims this is version 4.1, published in 1995. The graphical title
 		screen and the main menu say version 4.0 and 1992. The disk catalog
@@ -25696,6 +24521,7 @@
 		<year>1985</year>
 		<publisher>Scholastic</publisher>
 		<info name="release" value="2016-01-27"/>
+		<info name="usage" value="Disks for levels A and B are believed to exist and are missing." />
 		<!-- Story disks level C-F were present, which suggests A and B exist.
 		They were not present and are assumed missing. -->
 
@@ -25938,6 +24764,7 @@
 		<year>1985</year>
 		<publisher>Intellectual Software</publisher>
 		<info name="release" value="2016-02-23"/>
+		<info name="usage" value="Disk 5 remains missing." />
 		<!-- Disk #5 is missing. -->
 
 		<part name="flop1" interface="floppy_5_25">
@@ -33275,6 +32102,7 @@
 		<year>1985</year>
 		<publisher>Courses by Computers</publisher>
 		<info name="release" value="2018-07-19"/>
+		<info name="usage" value="Side A remains missing." />
 		<!-- Side A is missing. -->
 
 		<part name="flop1" interface="floppy_5_25">
@@ -35137,7 +33965,7 @@
 		<!-- Press open-apple during boot to read a message from the
 		programmer. -->
 
-		<part name="flop0" interface="floppy_5_25">
+		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
 				<rom name="sega - buck rogers - planet of zoom (logo crack).dsk" size="143360" crc="49bc53af" sha1="a565aefbdaa2b94a4c5a18ec5ddd801abfe78827" />
 			</dataarea>
@@ -36485,6 +35313,7 @@
 		-->
 
 		<info name="release" value="2020-03-22"/>
+
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
 				<rom name="north dakota parks and historical sites (4am crack).dsk" size="143360" crc="1be8abde" sha1="fd4df9a60c3fd7bcc1425c56a321dad23cfce47d"/>
@@ -37029,11 +35858,1167 @@
 		<year>1984</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="release" value="2020-06-18"/>
+
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
 				<rom name="the wizard of id's wizmath (4am crack).dsk" size="143360" crc="b90a08c7" sha1="f8d13d1ef59301856c847469b107dd9251fd90db"/>
 			</dataarea>
 		</part>
 	</software>
+
+	<software name="agalxsc">
+		<description>Apple Galaxian (StarCraft) (cleanly cracked)</description>
+		<year>1981</year>
+		<publisher>StarCraft</publisher>
+		<info name="release" value="2020-06-23"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="apple galaxian (starcraft) (4am crack).dsk" size="143360" crc="f2015816" sha1="d7f2e879638238bf909eceb194a7f4a1c66c7754"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="spcjourn">
+		<description>Space Journey (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Scott, Foresman and Company</publisher>
+		<info name="release" value="2020-06-28"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="space journey (4am crack).dsk" size="143360" crc="963043ba" sha1="9d2b4f9caeef9b02df9f1bda17a42763c642e98a"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="xpmapsgl">
+		<description>Exploring Maps and Globes (cleanly cracked)</description>
+		<year>1987</year>
+		<publisher>Society for Visual Education</publisher>
+		<info name="release" value="2020-06-29"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="exploring maps and globes (4am crack).dsk" size="143360" crc="b0dfae9b" sha1="29c79f3a45528e71db21639f2eed24af65a3f62b"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="st1gpr2">
+		<description>Snooper Troops 1: The Case of the Granite Point Ghost (Revision 2) (cleanly cracked)</description>
+		<year>1982</year>
+		<publisher>Spinnaker</publisher>
+		<info name="release" value="2020-06-29"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="snooper troops and the case of the granite point ghost rev. 2 (4am crack).dsk" size="143360" crc="0d66db3e" sha1="0b922e12625060e7f272192241ab44cc4800195f"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="nwawit">
+		<description>Newbery Winners: A Wrinkle in Time (cleanly cracked)</description>
+		<year>1982</year>
+		<publisher>Sunburst Communications</publisher>
+		<info name="release" value="2020-07-02"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="newbery winners- a wrinkle in time (4am crack).dsk" size="143360" crc="d4637c5a" sha1="b12f12ea6de8898a8f7552527ba882b21c1e40ce"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="nwbtt">
+		<description>Newbery Winners: Bridge to Terabithia (cleanly cracked)</description>
+		<year>1982</year>
+		<publisher>Sunburst Communications</publisher>
+		<info name="release" value="2020-07-02"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="newbery winners- bridge to terabithia (4am crack).dsk" size="143360" crc="f86a002a" sha1="5340a51606f2a963f413b032ac8ee198382e97c7"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="nwsndr">
+		<description>Newbery Winners: Sounder (cleanly cracked)</description>
+		<year>1982</year>
+		<publisher>Sunburst Communications</publisher>
+		<info name="release" value="2020-07-02"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="newbery winners- sounder (4am crack).dsk" size="143360" crc="cb639f8e" sha1="64b3f80208f36df0cf24e2cc51f4419b3c2e26e1"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="nwtwg">
+		<description>Newbery Winners: The Westing Game (cleanly cracked)</description>
+		<year>1982</year>
+		<publisher>Sunburst Communications</publisher>
+		<info name="release" value="2020-07-02"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="newbery winners- the westing game (4am crack).dsk" size="143360" crc="7479173c" sha1="88143a8b920f809a40854bff1f3207298cdaad4c"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="geomap">
+		<description>Geometry: Area and Perimeter (cleanly cracked)</description>
+		<year>1986</year>
+		<publisher>Encyclopaedia Britannica</publisher>
+		<info name="release" value="2020-07-14"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="geometry- area and perimeter (4am crack).dsk" size="143360" crc="9eda9409" sha1="a9574f8535a86e7cc0b0cd57c51c4fddaca0e631"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="harvprim">
+		<description>Harvey by Primes (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Queue</publisher>
+		<info name="release" value="2020-07-14"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="harvey by primes (4am crack).dsk" size="143360" crc="53b86cdc" sha1="ff3465d702503a32d55a3e45106f9bdee99bfba0"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="capalgr2">
+		<description>Computer Assisted Problem Solving for Intermediate Algebra (Revision 2) (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>UNKNOWN</publisher>
+		<info name="release" value="2020-07-16"/>
+		<!-- Publisher is unknown. Authors are Chris W. Avery and Charles B.
+		Barker. -->
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Side A"/>
+			<dataarea name="flop" size="143360">
+				<rom name="computer assisted problem solving for intermediate algebra rev. 2 (4am crack) side a.dsk" size="143360" crc="a88d9c03" sha1="abded6498ca7e3b15add02cb45b7f1bba24e7e88"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Side B"/>
+			<dataarea name="flop" size="143360">
+				<rom name="computer assisted problem solving for intermediate algebra rev. 2 (4am crack) side b.dsk" size="143360" crc="3db24779" sha1="9955585a49e74348a4659d8bf404109fb1c9721b"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="georectr">
+		<description>Geometry: Rectilinear Regions (cleanly cracked)</description>
+		<year>1987</year>
+		<publisher>Encyclopaedia Britannica</publisher>
+
+		<info name="release" value="2020-07-16"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="geometry- rectilinear regions (4am crack).dsk" size="143360" crc="9a216e06" sha1="8bd6c17f48143de83be75c52b23fc90aa4c9a279"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="psialge">
+		<description>Problem Solving in Algebra (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Encyclopaedia Britannica</publisher>
+		<info name="release" value="2020-07-16"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 1"/>
+			<dataarea name="flop" size="143360">
+				<rom name="problem solving in algebra (4am crack) disk 1.dsk" size="143360" crc="03cc98f1" sha1="5128aaffc6d85ed1597bf4efe9c520aef9cf25c4"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 2"/>
+			<dataarea name="flop" size="143360">
+				<rom name="problem solving in algebra (4am crack) disk 2.dsk" size="143360" crc="dd40b065" sha1="ab1ced8fcfeea82e6186375bc328c7a6166bfc54"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 3"/>
+			<dataarea name="flop" size="143360">
+				<rom name="problem solving in algebra (4am crack) disk 3.dsk" size="143360" crc="d642c5b6" sha1="275fd1d0045fd79ac63965207f7c12d4d825ca90"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 4"/>
+			<dataarea name="flop" size="143360">
+				<rom name="problem solving in algebra (4am crack) disk 4.dsk" size="143360" crc="bd7bf5e3" sha1="9580a8a274b919060dcec49aa56182b4ca8a396a"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 5"/>
+			<dataarea name="flop" size="143360">
+				<rom name="problem solving in algebra (4am crack) disk 5.dsk" size="143360" crc="16dba183" sha1="8f7da0dd662480d7a57dfb593aa83c82d1f0c98c"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="intacont">
+		<description>Integers (A Contest) (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Society for Visual Education</publisher>
+		<info name="release" value="2020-07-17"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="integers (a contest) (4am crack).dsk" size="143360" crc="48a99981" sha1="3dfa6a108ed203886ab55063b7638343cee797b3"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="seaiv2">
+		<description>Solving Equations and Inequalities (Version 2) (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Sunburst Communications</publisher>
+		<info name="release" value="2020-07-17"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="solving equations and inequalities v2 (4am crack).dsk" size="143360" crc="0fb9deac" sha1="3a240343ee2ad54fcfa62b8894b9928818539f0f"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="estbe">
+		<description>Estimation: Bull's Eye (cleanly cracked)</description>
+		<year>1986</year>
+		<publisher>Encyclopaedia Britannica</publisher>
+		<info name="release" value="2020-07-17"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="estimation- bull's eye (4am crack).dsk" size="143360" crc="b76acaf6" sha1="befd753d3d74e341b503dd8776cb1cfd1dcc3c38"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="rtrredpn">
+		<description>Return to Reading: The Red Pony (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Media Basics</publisher>
+		<info name="release" value="2020-07-12"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="return to reading- the red pony (4am crack).dsk" size="143360" crc="0f7f8479" sha1="ef2e06e2246f68d085e221519b632e296c38903b"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="rtrjtrem">
+		<description>Return to Reading: Johnny Tremain (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Media Basics</publisher>
+		<info name="release" value="2020-07-12"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="return to reading- johnny tremain (4am crack).dsk" size="143360" crc="030ce1fb" sha1="49aceb3171a577a1e41c66bf5f1d9d546bca7383"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="tbmaths1">
+		<description>Testing Basic Math Skills 1 (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Society for Visual Education</publisher>
+		<info name="release" value="2020-07-17"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="testing basic math skills 1 (4am crack).dsk" size="143360" crc="c7ff3a8b" sha1="7874eaf88be46761727b75ec4e57aab46dfe19d6"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="geopool">
+		<description>Geometry Pool and Billiards (cleanly cracked)</description>
+		<year>1986</year>
+		<publisher>Intellectual Software</publisher>
+		<info name="release" value="2020-07-12"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="geometry pool and billiards (4am crack).dsk" size="143360" crc="795f6bd3" sha1="d4a86b14d7c6196f520ba60b599ba86c8d42810f"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="casamist">
+		<description>Casa Del Misterio (cleanly cracked)</description>
+		<year>1988</year>
+		<publisher>Language Study Software</publisher>
+		<info name="release" value="2020-07-12"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="casa del misterio (4am crack).dsk" size="143360" crc="e8380ab5" sha1="01118aca84ac9b1cca5a0fd7ed4bf1e5be523ff7"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mlapdll">
+		<description>M-ss-ng L-nks: Al Pie De La Letra (cleanly cracked)</description>
+		<year>1985</year>
+		<publisher>Sunburst Communications</publisher>
+		<info name="release" value="2020-07-12"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="m-ss-ng l-nks- al pie de la letra (4am crack).dsk" size="143360" crc="890c379e" sha1="09e341e5f183e85c9c050d8dafef35513bbe1e30"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="fracwprb">
+		<description>Fraction Word Problems (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Queue</publisher>
+		<info name="release" value="2020-07-13"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="fraction word problems (4am crack).dsk" size="143360" crc="388b1049" sha1="dada3c8f63e043e52c06c97632d1fc900e18eb3e"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="spncont">
+		<description>The Spanish Contest (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Lingo Fun</publisher>
+		<info name="release" value="2020-07-13"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Side A"/>
+			<dataarea name="flop" size="143360">
+				<rom name="the spanish contest (4am crack) side a.dsk" size="143360" crc="982ccc90" sha1="64cabfcc297cda11f51b8044c4dd3457a108237b"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Side B"/>
+			<dataarea name="flop" size="143360">
+				<rom name="the spanish contest (4am crack) side b.dsk" size="143360" crc="d62739f9" sha1="8374efc8d7cc621e55044177f502efd17d866c5d"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="analresn">
+		<description>Analytical Reasoning (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Queue</publisher>
+		<info name="release" value="2020-07-13"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 1"/>
+			<dataarea name="flop" size="143360">
+				<rom name="analytical reasoning (4am crack) disk 1.dsk" size="143360" crc="15f4d7e8" sha1="46484e258bf6a0fcddaaa7bddf0b39708d0dd502"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 2"/>
+			<dataarea name="flop" size="143360">
+				<rom name="analytical reasoning (4am crack) disk 2.dsk" size="143360" crc="58d30651" sha1="bb6755e3ea303d9832f879c63d145e554ae3bba6"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="endestim">
+		<description>Rounding and Estimation (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Queue</publisher>
+		<info name="release" value="2020-07-13"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="rounding and estimation (4am crack).dsk" size="143360" crc="8e40827e" sha1="7f61b9a5e84d2799055469e945b91fc438d161af"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="paiffdp2">
+		<description>Proper and Improper Fractions: Fractions, Decimals, and Percent (2nd Edition) (cleanly cracked)</description>
+		<year>1981</year>
+		<publisher>Society for Visual Education</publisher>
+		<info name="release" value="2020-07-13"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="proper and improper fractions- fractions, decimals, and percent 2nd edition (4am crack).dsk" size="143360" crc="d93d9d2b" sha1="c6cd5be98d598c382847349d4eef0ef4054b65c9"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="qaverg">
+		<description>Averages (cleanly cracked)</description>
+		<year>1988</year>
+		<publisher>Queue</publisher>
+		<info name="release" value="2020-07-13"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="averages (4am crack).dsk" size="143360" crc="1cac50dc" sha1="5bf1029c9880c24a69cc568a91761e2f43191255"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="np0886">
+		<description>Nouns/Pronouns (08.31.86 Version) (cleanly cracked)</description>
+		<year>1981</year>
+		<publisher>Hartley Courseware</publisher>
+		<info name="release" value="2020-07-14"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 1"/>
+			<dataarea name="flop" size="143360">
+				<rom name="nouns-pronouns v08.31.86 (4am crack) disk 1.dsk" size="143360" crc="2daf72ad" sha1="eaf0972a9efe036414325b1f95eaf6c26860c6d4"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 2"/>
+			<dataarea name="flop" size="143360">
+				<rom name="nouns-pronouns v08.31.86 (4am crack) disk 2.dsk" size="143360" crc="89f49f07" sha1="48066e68e141c94c1b6fa6debfd94fe5c6d89de5"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mettutr">
+		<description>Metric System Tutor (cleanly cracked)</description>
+		<year>1980</year>
+		<publisher>Educational Materials and Equipment</publisher>
+		<info name="release" value="2020-07-19"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="metric system tutor (4am crack).dsk" size="143360" crc="743534c6" sha1="47ea8c215580c0ba58d516e38e59d19417933134"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="addwn117">
+		<description>Addition: Whole Numbers Steps 1-17 (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Instructional/Communications Technology</publisher>
+		<info name="release" value="2020-07-20"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="addition- whole numbers steps 1-17 (4am crack).dsk" size="143360" crc="77fb0cc9" sha1="3423672de66bb6da9c88b058f0dac19a1d72fe7d"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="afrac118">
+		<description>Addition: Fractions Concepts Steps 1-8 (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Instructional/Communications Technology</publisher>
+		<info name="release" value="2020-07-20"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="addition- fractions concepts steps 1-8 (4am crack).dsk" size="143360" crc="1f9bf17a" sha1="83edd117e3b093c08718fa42f576082ba303678d"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mulwn114">
+		<description>Multiplication: Whole Numbers Steps 1-14 (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Instructional/Communications Technology</publisher>
+		<info name="release" value="2020-07-22"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="multiplication- whole numbers steps 1-14 (4am crack).dsk" size="143360" crc="e4ecf98d" sha1="a1c5beb24921793055f8932c8d821ab0f335e001"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="laguillo">
+		<description>La Guillotine (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Gessler Educational Software</publisher>
+		<info name="release" value="2020-07-24"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="la guillotine (4am crack).dsk" size="143360" crc="2b389d84" sha1="a11eb5ccaf44997776faf8404b412b87bf9856d8"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="corrtoro">
+		<description>La Corrida de Toros (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Gessler Educational Software</publisher>
+		<info name="release" value="2020-07-24"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="la corrida de toros (4am crack).dsk" size="143360" crc="3a941200" sha1="c9d98bfcc2878a5fd991ab372627deb929e3d3ef"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mdd1sm">
+		<description>Math Demo Disk #1: Secondary Mathematics (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Conduit</publisher>
+		<info name="release" value="2020-07-26"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="math demo disk #1- secondary mathematics (4am crack).dsk" size="143360" crc="3bd5e0b8" sha1="46141c42ee3c640c7f1d50cfd8f7b2e28f2017bf"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mdd2geig">
+		<description>Math Demo Disk #2: Graphing Equations and Interpreting Graphs (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Conduit</publisher>
+		<info name="release" value="2020-08-01"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="math demo disk #2- graphing equations and interpreting graphs (4am crack).dsk" size="143360" crc="3670cfab" sha1="5a22a0033cafbc54e6927853b792339a83145a12"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mdd3psm">
+		<description>Math Demo Disk #3: Postsecondary Mathematics (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Conduit</publisher>
+		<info name="release" value="2020-08-01"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="math demo disk #3- postsecondary mathematics (4am crack).dsk" size="143360" crc="0a2696bd" sha1="688e8283d2efea83874abe7c6d297b0871ae9b99"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mseleml">
+		<description>Math Skills: Elementary Level (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Encyclopaedia Britannica</publisher>
+		<info name="release" value="2020-08-01"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="math skills- elementary level (4am crack).dsk" size="143360" crc="8959752d" sha1="89d2e59a23636de848f0abca5fe0fe579ae38973"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="msjrhigh">
+		<description>Math Skills: Junior High Level (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Encyclopaedia Britannica</publisher>
+		<info name="release" value="2020-08-01"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="math skills- junior high level (4am crack).dsk" size="143360" crc="dadb8d31" sha1="2fb6e5f2aa81885d5193946e44228c46f2964b22"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="gifpalg">
+		<description>Graphing is Fun: Pie and Line Graphs (cleanly cracked)</description>
+		<year>1985</year>
+		<publisher>Aquarius People Materials</publisher>
+		<info name="release" value="2020-08-01"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="graphing is fun pie and line graphs (4am crack).dsk" size="143360" crc="1f3bed11" sha1="62cb669c99db7bd5d632c86847bd7e22c78a071e"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="addfs921">
+		<description>Addition: Fractions Steps 9-21 (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Instructional/Communications Technology</publisher>
+		<info name="release" value="2020-07-22"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="addition- fractions steps 9-21 (4am crack).dsk" size="143360" crc="db4691b9" sha1="0babf87ee4e70dc9b8cd86a98c0c15a0258b3d19"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="subwn117">
+		<description>Subtraction: Whole Numbers Steps 1-17 (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Instructional/Communications Technology</publisher>
+		<info name="release" value="2020-07-22"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="subtraction- whole numbers steps 1-17 (4am crack).dsk" size="143360" crc="44e5f768" sha1="7feb38fd65b46bdefe3863953209fc82d51a14ef"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="subfs111">
+		<description>Subtraction: Fractions Steps 1-11 (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Instructional/Communications Technology</publisher>
+		<info name="release" value="2020-07-22"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="subtraction- fractions steps 1-11 (4am crack).dsk" size="143360" crc="243c79ee" sha1="83cb304e32b1c53b2ff58302eeba104b92615c95"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="dungeon">
+		<description>Dungeon! (cleanly cracked)</description>
+		<year>1982</year>
+		<publisher>TSR Hobbies</publisher>
+		<info name="release" value="2020-08-08"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="dungeon (4am crack).dsk" size="143360" crc="96b24763" sha1="917d23cfd331ec13aa6e97e17823abfb7e5df9cd"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="thesmino">
+		<description>Theseus and the Minotaur (cleanly cracked)</description>
+		<year>1982</year>
+		<publisher>TSR Hobbies</publisher>
+		<info name="release" value="2020-08-08"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="theseus and the minotaur (4am crack).dsk" size="143360" crc="d951a87a" sha1="8f317e8406d9931e5776cdf0a5c54c904affb754"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="dawnpatr">
+		<description>Dawn Patrol (cleanly cracked)</description>
+		<year>1982</year>
+		<publisher>TSR Hobbies</publisher>
+		<info name="release" value="2020-08-08"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="dawn patrol (4am crack).dsk" size="143360" crc="31066d6a" sha1="e268102ad3bc91837c791a9a90aa0a8d66c4b544"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="conceptr">
+		<description>Conceptor (cleanly cracked)</description>
+		<year>1985</year>
+		<publisher>Mentor Learning Systems</publisher>
+		<info name="release" value="2020-08-08"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Side A"/>
+			<dataarea name="flop" size="143360">
+				<rom name="conceptor (4am crack) side a.dsk" size="143360" crc="87502ff2" sha1="d8ba21f1ceb0c04952919c223deca7e1415c117e"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Side B"/>
+			<dataarea name="flop" size="143360">
+				<rom name="conceptor (4am crack) side b.dsk" size="143360" crc="47a2b340" sha1="b8fd53a5ed08f0937c9897f1bfbf22f9f511b7fa"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="epyx3pck">
+		<description>Epyx 3-Pack (cleanly cracked)</description>
+		<year>1980</year>
+		<publisher>Automated Simulations</publisher>
+		<info name="release" value="2020-08-08"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="epyx 3-pack (4am crack).dsk" size="143360" crc="a48d559a" sha1="02c425fb01810a847e0567f10b9d5081fce90e68"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="trlltlr2">
+		<description>Troll's Tale (Revision 2) (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Sierra On-Line</publisher>
+		<info name="release" value="2020-08-08"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="troll's tale rev. 2 (4am and san inc crack).dsk" size="143360" crc="bef3e3cc" sha1="dc761551f75be849088da5fbdcc795a4e41c9f9c"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="nytcrswd">
+		<description>Daily Computer Crosswords from The New York Times (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Evolving Technology Company</publisher>
+		<info name="release" value="2020-08-08"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="daily computer crosswords from the new york times (4am crack).dsk" size="143360" crc="2c91cf83" sha1="bf1d8a7bab18a9340eb3358cd6722631d03886f8"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="uboatcmd">
+		<description>U-Boat Command (cleanly cracked)</description>
+		<year>1982</year>
+		<publisher>Synergistic Software</publisher>
+		<info name="release" value="2020-08-09"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="u-boat command (4am crack).dsk" size="143360" crc="c134e816" sha1="cdf9e04801e96e9d5aa7dbd6a785a0e822ec262b"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mcrocfct">
+		<description>MECC-A308 Rocket Factory (Version 1.0) (cleanly cracked)</description>
+		<year>1992</year>
+		<publisher>MECC</publisher>
+		<info name="release" value="2020-08-09"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="mecc-a308 rocket factory v1.0 (4am crack).dsk" size="143360" crc="a791cb46" sha1="56009fa88b3f7839db8ba93c2bb4a9c09a5fc234"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="sa2gramr">
+		<description>Spanish Achievement II: Grammar (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Microcomputer Workshops</publisher>
+		<info name="release" value="2020-08-05"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="spanish achievement ii (4am crack).dsk" size="143360" crc="f3859731" sha1="dcc487aebc6bb7abe2edd81a4440207464b54576"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="slvwrdp1">
+		<description>Solving Word Problems 1 (cleanly cracked)</description>
+		<year>1985</year>
+		<publisher>Aquarius People Materials</publisher>
+		<info name="release" value="2020-08-05"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="solving word problems 1 (4am crack).dsk" size="143360" crc="dee630b8" sha1="9f5a5a3c84174e9d0f239e0ca1aec83c18b30a19"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="slvwrdp2">
+		<description>Solving Word Problems II (cleanly cracked)</description>
+		<year>1985</year>
+		<publisher>Aquarius People Materials</publisher>
+		<info name="release" value="2020-08-05"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="solving word problems ii (4am crack).dsk" size="143360" crc="d69453ca" sha1="af182c47a5cc9226250cd7e492a57e1cd5bc3a4d"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mdfrc120">
+		<description>Multiplication/Division Fractions: Steps 1-20 (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Instructional/Communications Technology</publisher>
+		<info name="release" value="2020-08-06"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="multiplication-division- fractions steps 1-20 (4am crack).dsk" size="143360" crc="14e84966" sha1="43d9a7202f0ff68291c1f60c9ffb97a62f15c6d7"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="divwn119">
+		<description>Division: Whole Numbers Steps 1-19 (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Instructional/Communications Technology</publisher>
+		<info name="release" value="2020-08-06"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="division- whole numbers steps 1-19 (4am crack).dsk" size="143360" crc="0c47657f" sha1="e14d4d453a79ad7de56d47b0c8e66d3b547fe2df"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="prccs15">
+		<description>Percent Concepts Steps 1-5 (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Instructional/Communications Technology</publisher>
+		<info name="release" value="2020-08-06"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="percent concepts steps 1-5 (4am crack).dsk" size="143360" crc="279880dd" sha1="3f2cff480f3936a12253f944579458fedd02dfe0"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="prccs710">
+		<description>Percent Steps 7-10 (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Instructional/Communications Technology</publisher>
+		<info name="release" value="2020-08-06"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="percent steps 7-10 (4am crack).dsk" size="143360" crc="52c83a46" sha1="91cde89c53dc0c1f27ceebfaeb04c6bcf7dd31ba"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="decs710">
+		<description>Decimals Steps 7-10 (cleanly cracked)</description>
+		<year>1985</year>
+		<publisher>Instructional/Communications Technology</publisher>
+		<info name="release" value="2020-08-06"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="decimals steps 7-10 (4am crack).dsk" size="143360" crc="3794b3a2" sha1="64edcc54676688674276c419e6d56ed29666b4d0"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="oppo0187">
+		<description>Opposites v01.30.87 (cleanly cracked)</description>
+		<year>1986</year>
+		<publisher>Hartley Courseware</publisher>
+		<info name="release" value="2020-08-12"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Side A"/>
+			<dataarea name="flop" size="143360">
+				<rom name="opposites v01.30.87 (4am crack) side a.dsk" size="143360" crc="2428e261" sha1="6536827c63ac92e9a95cf35ef0e427a041f54025"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Side B"/>
+			<dataarea name="flop" size="143360">
+				<rom name="opposites v01.30.87 (4am crack) side b.dsk" size="143360" crc="5b2f7f91" sha1="f086afa11259ac35379dbde3e3338f98b364402d"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mceng115">
+		<description>MECC-A746 English Volume 1: Parts of Speech (Version 1.5) (cleanly cracked)</description>
+		<year>1981</year>
+		<publisher>MECC</publisher>
+		<info name="release" value="2020-08-12"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="mecc-a746 english volume 1 - parts of speech v1.5 (4am crack).dsk" size="143360" crc="7d7e319c" sha1="93e2f83c347c4e9a28075f13eb80c19ca3c6abbe"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="rdcmpmid">
+		<description>Reading Comprehension: Main Idea and Details (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>Milton Bradley</publisher>
+		<info name="release" value="2020-08-12"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="reading comprehension - main idea and details (4am crack).dsk" size="143360" crc="3298ca6a" sha1="3aba5a667d02ad14decccecca12f6b6b8a1d21b9"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="shmthag3">
+		<description>Scoring Higher: Mathematics A, Grade Level 3 (cleanly cracked)</description>
+		<year>1987</year>
+		<publisher>Krell Software</publisher>
+		<info name="release" value="2020-08-12"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 1"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- mathematics a- grade level 3 (4am crack) disk 1.dsk" size="143360" crc="41db6ed8" sha1="4e891157c034e94de90096e3a41b22eac02b979a"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 2"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- mathematics a- grade level 3 (4am crack) disk 2.dsk" size="143360" crc="95f86e53" sha1="fc499e1132d39c974432e9c63a1defa9b29dbcd2"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 3"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- mathematics a- grade level 3 (4am crack) disk 3.dsk" size="143360" crc="1d15607e" sha1="54b6b120a6e0114dc5f38179e3f611afe518e25c"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 4"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- mathematics a- grade level 3 (4am crack) disk 4.dsk" size="143360" crc="2a02442e" sha1="094031c27a7d588f9a613609a75ae5ce2486e1fd"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 5"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- mathematics a- grade level 3 (4am crack) disk 5.dsk" size="143360" crc="9623ae0e" sha1="076f006d6b7c6660c6c4de769026942ffc1d87b2"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 6"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- mathematics a- grade level 3 (4am crack) disk 6.dsk" size="143360" crc="80ba76e8" sha1="11373cfa49c6926e901e67984055d8db636d0548"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="hvrbs2886">
+		<description>Verbs 2 (Version 08.31.86) (cleanly cracked)</description>
+		<year>1986</year>
+		<publisher>Hartley Courseware</publisher>
+		<info name="release" value="2020-08-13"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="verbs 2 v08.31.86 (4am crack).dsk" size="143360" crc="1cadc659" sha1="f8812127ccb518ae406e7df338fadcfb2e591bcf"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="kavekr2">
+		<description>Kaves of Karkhan (Revision 2) (cleanly cracked)</description>
+		<year>1981</year>
+		<publisher>Level-10</publisher>
+		<info name="release" value="2020-08-13"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="kaves of karkhan rev. 2 (4am crack).dsk" size="143360" crc="68cfc189" sha1="5cc8ecb75b9693329f50a1d9338973919d40a994"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="spnhang">
+		<description>The Spanish Hangman (cleanly cracked)</description>
+		<year>1983</year>
+		<publisher>George Earl</publisher>
+		<info name="release" value="2020-08-13"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Side A"/>
+			<dataarea name="flop" size="143360">
+				<rom name="the spanish hangman (4am crack) side a.dsk" size="143360" crc="b516e7a1" sha1="ad9b0a5d6a9c71144f54febc5d28511740bbc775"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Side B"/>
+			<dataarea name="flop" size="143360">
+				<rom name="the spanish hangman (4am crack) side b.dsk" size="143360" crc="95312c61" sha1="b17b6256153068efa05d34e999a998f76428122a"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="shvrbgl3">
+		<description>Scoring Higher: Verbal Grade Level 3 (cleanly cracked)</description>
+		<year>1987</year>
+		<publisher>Krell Software</publisher>
+		<info name="release" value="2020-08-14"/>
+		<info name="usage" value="Disk 12 remains missing." />
+		<!-- Missing: Disk 12 has not been dumped at this time
+		and is still missing. -->
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 1"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 1.dsk" size="143360" crc="749df0e7" sha1="7f3c0863b0372612ca8279912a993d6581810d57"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 2"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 2.dsk" size="143360" crc="4e8eff97" sha1="f49f094e7996d1ce9358180d88db8dd17eb2c21d"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 3"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 3.dsk" size="143360" crc="517f62b4" sha1="8ed9c97e0d001f5bc7cee191502f5d748bf7f5cc"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 4"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 4.dsk" size="143360" crc="293f88af" sha1="0e8672f8c734db155bdec34d873fb0db2574a8f5"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 5"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 5.dsk" size="143360" crc="d70e563e" sha1="a5590d5e7442a2a25cdfad30cc2bb1f10a29bcd0"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 6"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 6.dsk" size="143360" crc="27dfc43f" sha1="1ab824bcb2049568d397ce8c7fa0456874fe3b69"/>
+			</dataarea>
+		</part>
+		<part name="flop7" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 7"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 7.dsk" size="143360" crc="f9fa4f7b" sha1="11e919389c3521dff653c55e627e2da3fb33e2f1"/>
+			</dataarea>
+		</part>
+		<part name="flop8" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 8"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 8.dsk" size="143360" crc="e4feae30" sha1="4cbdcdd68b393268476b17165e82be701a744ea6"/>
+			</dataarea>
+		</part>
+		<part name="flop9" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 9"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 9.dsk" size="143360" crc="61a3f5c8" sha1="cb2abdbac6cde996f1ead3be1c43d8666fc8df43"/>
+			</dataarea>
+		</part>
+		<part name="flop10" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 10"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 10.dsk" size="143360" crc="3e4b9eda" sha1="aaef06bc44f37e74801497121d86f706c906d360"/>
+			</dataarea>
+		</part>
+		<part name="flop11" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 11"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 11.dsk" size="143360" crc="061175ba" sha1="c1c4b677bfeaeaf8701b30b63e61d78353d9dc96"/>
+			</dataarea>
+		</part>
+		<part name="flop13" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 13"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 13.dsk" size="143360" crc="fd50a586" sha1="7780b4273c79820d87d70725405eb84f7bf821c2"/>
+			</dataarea>
+		</part>
+		<part name="flop14" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 14"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 14.dsk" size="143360" crc="5d466528" sha1="89f535d61caa7b365df22ab586c8da97bffa6de9"/>
+			</dataarea>
+		</part>
+		<part name="flop15" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 15"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 15.dsk" size="143360" crc="9b7136d1" sha1="0b1fc00c6e23a828288b10a15cece270a4424bf2"/>
+			</dataarea>
+		</part>
+		<part name="flop16" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 16"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 16.dsk" size="143360" crc="e757dd02" sha1="622615ed7e69b86c1050806c74c3a7d2eb4475a8"/>
+			</dataarea>
+		</part>
+		<part name="flop17" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 17"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 17.dsk" size="143360" crc="3dd9cfc8" sha1="fbf70e07a04def5083d135b0dbd7dfe7f517fdeb"/>
+			</dataarea>
+		</part>
+		<part name="flop18" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 18"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 18.dsk" size="143360" crc="8e74f4e5" sha1="f4b75e79aa65027d167a9630325e455466fe114f"/>
+			</dataarea>
+		</part>
+		<part name="flop19" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 19"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 19.dsk" size="143360" crc="40b0c044" sha1="38e4955f7602fe98dab3171689331fbb95399afe"/>
+			</dataarea>
+		</part>
+		<part name="flop20" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 20"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 20.dsk" size="143360" crc="2d0f051b" sha1="950cdda3032947c86d3553cddd2dd48f9f01c81f"/>
+			</dataarea>
+		</part>
+		<part name="flop21" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 21"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scoring higher- verbal grade level 3 (4am crack) disk 21.dsk" size="143360" crc="dc77e6ee" sha1="8c86d51df3830020b81203643405f2aa9ec60705"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="srccly22">
+		<description>The Sorcerer of Claymorgue Castle (Version 2.2/122) (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Adventure International</publisher>
+		<info name="release" value="2020-08-15"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Side A"/>
+			<dataarea name="flop" size="143360">
+				<rom name="scott adams graphic adventure 13 - the sorcerer of claymorgue castle v2.2-122 (4am crack) side a.dsk" size="143360" crc="02ab3efa" sha1="77e968e15fc8772bc2b966e4ec995e9b2e20cd09"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="scott adams graphic adventure 13 - the sorcerer of claymorgue castle v2.2-122 (4am crack) side b (boot).dsk" size="143360" crc="c09ae2dc" sha1="9ffcdf7f78f394ff57d0bf92fca3beac02714a77"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="frac310">
+		<description>French Achievement III (Version 1.0) (cleanly cracked)</description>
+		<year>1984</year>
+		<publisher>Microcomputer Workshops</publisher>
+		<info name="release" value="2020-08-12"/>
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="french achievement iii- grammar (4am crack).dsk" size="143360" crc="b4a902c2" sha1="4749364b8debc5819beedaca26797b064c30f495"/>
+			</dataarea>
+		</part>
+	</software>
 
 </softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/apple2_flop_misc.xml mame-0.224+dfsg.1/hash/apple2_flop_misc.xml
--- mame-0.222+dfsg.1/hash/apple2_flop_misc.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/apple2_flop_misc.xml	2020-08-26 08:57:19.000000000 +0000
@@ -932,12 +932,28 @@
 		("MicroChess 2.0," "Checker King," "Gammon Gambler")
 		-->
 
-		<part name="flop0" interface="floppy_5_25">
+		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="143360">
 				<rom name="anti-m-v1.6-2019-11-09.dsk" size="143360" crc="3f604ff3" sha1="6c556f9ade3973069570be1f76560d4730e083b8" />
 			</dataarea>
 		</part>
 	</software>
+
+	<software name="antim17">
+		<description>Anti-M (version 1.7)</description>
+		<year>2020</year>
+		<publisher>4AM</publisher>
+		<info name="release" value="2020-08-11"/>
+		<!--
+		* 1.7 adds support for "Odin" and fixes some bugs.
+		-->
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="143360">
+				<rom name="anti-m-v1.7-2020-08-11.dsk" size="143360" crc="2e8190fa" sha1="b8f5df40c93a3908f9630f34b24c464da6d69796" />
+			</dataarea>
+		</part>
+	</software>
 
 	<software name="ankh">
 		<description>Ankh</description>
diff -Nru mame-0.222+dfsg.1/hash/apple2_flop_orig.xml mame-0.224+dfsg.1/hash/apple2_flop_orig.xml
--- mame-0.222+dfsg.1/hash/apple2_flop_orig.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/apple2_flop_orig.xml	2020-08-26 08:57:19.000000000 +0000
@@ -14226,4 +14226,70 @@
 		</part>
 	</software>
 
+	<software name="mtarm410">
+		<description>Those Amazing Reading Machines IV (Version 1.0)</description>
+		<year>1986</year>
+		<publisher>MECC</publisher>
+		<info name="release" value="2020-07-04"/>
+		<sharedfeat name="compatibility" value="A2P,A2E,A2EE,A2C,A2GS"/>
+		<!-- It requires a 64K Apple II+ or later. -->
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="234810">
+				<rom name="those amazing reading machines iv.woz" size="234810" crc="592ee96d" sha1="0c08795604e54300e1119b00d92b0311d24342d1"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mspwm10">
+		<description>Speedway Math (Version 1.0)</description>
+		<year>1986</year>
+		<publisher>MECC</publisher>
+		<info name="release" value="2020-07-04"/>
+		<sharedfeat name="compatibility" value="A2P,A2E,A2EE,A2C,A2GS"/>
+		<!-- It requires a 64K Apple II+ or later. -->
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="234765">
+				<rom name="speedway math.woz" size="234765" crc="a97daabb" sha1="8aeda33f513380483f9aa731468822b5327f3c55"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mqflsh10">
+		<description>Quickflash! (Version 1.0)</description>
+		<year>1986</year>
+		<publisher>MECC</publisher>
+		<info name="release" value="2020-07-04"/>
+		<sharedfeat name="compatibility" value="A2P,A2E,A2EE,A2C,A2GS"/>
+		<!-- It requires a 64K Apple II+ or later. -->
+
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="241419">
+				<rom name="quickflash.woz" size="241419" crc="24590b00" sha1="6e563223fc4ecc13ecad4de95e84e6bd36128e2b"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="srccly22">
+		<description>The Sorcerer of Claymorgue Castle (Version 2.2/122)</description>
+		<year>1984</year>
+		<publisher>Adventure International</publisher>
+		<info name="release" value="2020-08-15"/>
+		<sharedfeat name="compatibility" value="A2,A2P,A2E,A2EE,A2C,A2GS"/>
+		<!-- It runs on any Apple II with 48K. -->
+
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Side A"/>
+			<dataarea name="flop" size="241511">
+				<rom name="s.a.g.a. 13 - sorcerer of claymorgue castle side a.woz" size="241511" crc="4f5e141c" sha1="82b64408d2430877b7b68afca9ad625374180943"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Side B - Boot Disk"/>
+			<dataarea name="flop" size="234855">
+				<rom name="s.a.g.a. 13 - sorcerer of claymorgue castle side b (boot).woz" size="234855" crc="12223084" sha1="54b12aecd5f80b7edc36f925552ec2a2810b5355"/>
+			</dataarea>
+		</part>
+	</software>
 </softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/archimedes.xml mame-0.224+dfsg.1/hash/archimedes.xml
--- mame-0.222+dfsg.1/hash/archimedes.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/archimedes.xml	2020-08-26 08:57:19.000000000 +0000
@@ -197,7 +197,7 @@
 Zelanites: The Onslaught by Micro Power (RiscOS2)
 -->
 
-	<!-- Boot OK, !Control throws a "sprite doesn't exist" exception -->
+	<!-- boot OK, !Control throws a "sprite doesn't exist" exception -->
 	<software name="2067bc" supported="partial">
 		<description>2067 BC</description>
 		<year>1992</year>
@@ -671,7 +671,7 @@
 		</part>
 	</software>
 
-	<!-- Boot OK -->
+	<!-- boot OK -->
 	<software name="caverns">
 		<description>Caverns</description>
 		<year>1991</year>
@@ -1068,7 +1068,7 @@
 	</software>
 
 	<!-- Hangs at boot screen -->
-	<software name="egoc" cloneof="ego">
+	<software name="egoc" cloneof="ego" supported="no">
 		<description>EGO: Repton 4 [passwords]</description>
 		<year>1992</year>
 		<publisher>ProAction</publisher>
@@ -1980,7 +1980,7 @@
 	</software>
 
 	<!-- Black screen after selecting a course and golfer -->
-	<software name="microdrv">
+	<software name="microdrv" supported="no">
 		<description>MicroDrive 3D</description>
 		<year>1990</year>
 		<publisher>CIS</publisher>
@@ -2387,6 +2387,7 @@
 		</part>
 	</software>
 
+	<!-- boot OK -->
 	<software name="repton3c" cloneof="repton3">
 		<description>Repton 3 [cracked]</description>
 		<year>1988</year>
@@ -3110,12 +3111,13 @@
 		</part>
 	</software>
 
-	<!-- Has trainer and copy protection? -->
-	<software name="zool">
+	<!-- disc swap isn't recognized -->
+	<!-- Has trainer but uncracked copy protection? -->
+	<software name="zool" supported="no">
 		<description>Zool</description>
 		<year>1993</year>
 		<publisher>Gremlin</publisher>
-		<info name="usage" value="Protection requires manual" />
+		<info name="usage" value="Protection requires code wheel" />
 		<part name="flop1" interface="floppy_3_5">
 			<feature name="part_id" value="Disk 1"/>
 			<dataarea name="flop" size="819200">
diff -Nru mame-0.222+dfsg.1/hash/bbc_cass.xml mame-0.224+dfsg.1/hash/bbc_cass.xml
--- mame-0.222+dfsg.1/hash/bbc_cass.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/bbc_cass.xml	2020-08-26 08:57:19.000000000 +0000
@@ -9518,7 +9518,7 @@
 				<rom name="musicmaestro(gtm).uef" size="9811" crc="47d92a23" sha1="bddf0f5921628a46d85e3e77a91b1a17f8d46fa7" />
 			</dataarea>
 		</part>
-	<part name="cass2" interface="bbc_cass">
+		<part name="cass2" interface="bbc_cass">
 			<feature name="part_id" value="Music Instructions"/>
 			<dataarea name="cass" size="10762">
 				<rom name="musicmaestro-instructions(gtm).uef" size="10762" crc="288b3e9b" sha1="ab7782e69a1fb77bf9b6cf4d52ae4c4da2dc97e0" />
@@ -12791,7 +12791,7 @@
 				<rom name="soccersupremo-eurocups(qualsoft).uef" size="7793" crc="182792a9" sha1="15ad8c55cd09709f1c323b2f6f437044e8be4ec0" />
 			</dataarea>
 		</part>
-	<part name="cass3" interface="bbc_cass">
+		<part name="cass3" interface="bbc_cass">
 			<feature name="part_id" value="Data"/>
 			<dataarea name="cass" size="2857">
 				<rom name="soccersupremo-data(qualsoft).uef" size="2857" crc="afe54b24" sha1="e7c29f3a71383d721413fbcd90625cf7181d088e" />
diff -Nru mame-0.222+dfsg.1/hash/bbc_flop_torch.xml mame-0.224+dfsg.1/hash/bbc_flop_torch.xml
--- mame-0.222+dfsg.1/hash/bbc_flop_torch.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/bbc_flop_torch.xml	2020-08-26 08:57:19.000000000 +0000
@@ -16,6 +16,7 @@
 		<publisher>Crowther and Woods</publisher>
 		<info name="format" value="CPN" />
 		<info name="usage" value="Requires Torch Z80 co-processor" />
+		<sharedfeat name="compatibility" value="Z80"/>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="adventureb01.dsd" size="409600" crc="38be4448" sha1="acadee5c6648f01d84188ea05cba9b2f55fef8e5"/>
@@ -30,6 +31,7 @@
 		<info name="release" value="SC02" />
 		<info name="format" value="CPN" />
 		<info name="usage" value="Requires Torch Z80 co-processor" />
+		<sharedfeat name="compatibility" value="Z80"/>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="bbcbasic.dsd" size="409600" crc="d72e8582" sha1="6a6080863988810117774d79a5ff94da79a1ef48"/>
@@ -43,6 +45,7 @@
 		<publisher>Sapphire Systems</publisher>
 		<info name="format" value="CPN" />
 		<info name="usage" value="Requires Torch Z80 co-processor" />
+		<sharedfeat name="compatibility" value="Z80"/>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="comanex.dsd" size="409600" crc="5e457aea" sha1="d5544c6e56c9f6d484890951b7c1a9134df8dcf1"/>
@@ -57,6 +60,7 @@
 		<info name="release" value="SC05" />
 		<info name="format" value="CPN" />
 		<info name="usage" value="Requires Torch Z80 co-processor" />
+		<sharedfeat name="compatibility" value="Z80"/>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="dbase_ii.dsd" size="409600" crc="f9dc5794" sha1="5e26e1a4b05f689b95c34e9121019cccafd7a57c"/>
@@ -70,9 +74,10 @@
 		<publisher>Torch Computers</publisher>
 		<info name="format" value="CPN" />
 		<info name="usage" value="Requires Torch Z80 co-processor" />
+		<sharedfeat name="compatibility" value="Z80"/>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
-				<rom name="hard_disc_utils_41.dsd" size="409600" crc="bab06207" sha1="24cc5b74b481794cdd3e67ea746cbd57927c1201"/>
+				<rom name="hard_disc_utils_4.1.dsd" size="409600" crc="bab06207" sha1="24cc5b74b481794cdd3e67ea746cbd57927c1201"/>
 			</dataarea>
 		</part>
 	</software>
@@ -83,9 +88,10 @@
 		<publisher>Torch Computers</publisher>
 		<info name="format" value="CPN" />
 		<info name="usage" value="Requires Torch Z80 co-processor" />
+		<sharedfeat name="compatibility" value="Z80"/>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
-				<rom name="hard_disc_utils.dsd" size="409600" crc="c84cdc5d" sha1="a8134ccb787e831e234731297c719ad94e3ffe2a"/>
+				<rom name="hard_disc_utils_4.4.dsd" size="409600" crc="c84cdc5d" sha1="a8134ccb787e831e234731297c719ad94e3ffe2a"/>
 			</dataarea>
 		</part>
 	</software>
@@ -96,6 +102,7 @@
 		<publisher>Columbia University</publisher>
 		<info name="format" value="CPN" />
 		<info name="usage" value="Requires Torch Z80 co-processor" />
+		<sharedfeat name="compatibility" value="Z80"/>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="kermit.dsd" size="409600" crc="f48b3ca6" sha1="de7d576f5c0a0e24a5425fb41de8f73f7651d075"/>
@@ -109,6 +116,7 @@
 		<publisher>Torch Computers</publisher>
 		<info name="format" value="CPN" />
 		<info name="usage" value="Requires Torch Z80 co-processor" />
+		<sharedfeat name="compatibility" value="Z80"/>
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Perfect Calc"/>
 			<dataarea name="flop" size="409600">
@@ -135,22 +143,24 @@
 		<publisher>Torch Computers</publisher>
 		<info name="format" value="CPN" />
 		<info name="usage" value="Requires Torch Z80 co-processor" />
+		<sharedfeat name="compatibility" value="Z80"/>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
-				<rom name="standard_utilities_2.dsd" size="409600" crc="6e6feeec" sha1="52033a8e4772a81d5879d3d14c04cc65b5df47cf"/>
+				<rom name="standard_utilities_2.0.dsd" size="409600" crc="6e6feeec" sha1="52033a8e4772a81d5879d3d14c04cc65b5df47cf"/>
 			</dataarea>
 		</part>
 	</software>
 
 	<software name="torchsys">
 		<description>Torch System Disc v1.7</description>
-		<year>1984</year>
+		<year>1983</year>
 		<publisher>Torch Computers</publisher>
 		<info name="format" value="CPN" />
 		<info name="usage" value="Requires Torch Z80 co-processor" />
+		<sharedfeat name="compatibility" value="Z80"/>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
-				<rom name="torch_system.ssd" size="409600" crc="b8d140a0" sha1="181a3b820a11bacc3db6dd39470e0e5424a52d12"/>
+				<rom name="torch_system_1.7.ssd" size="409600" crc="b8d140a0" sha1="181a3b820a11bacc3db6dd39470e0e5424a52d12"/>
 			</dataarea>
 		</part>
 	</software>
@@ -161,6 +171,7 @@
 		<publisher>Borland</publisher>
 		<info name="format" value="CPN" />
 		<info name="usage" value="Requires Torch Z80 co-processor" />
+		<sharedfeat name="compatibility" value="Z80"/>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="turbopascal30a.dsd" size="409600" crc="8c3dde20" sha1="15b544b9b7a3cf0369fd7c952fa3c95f741b2fc2"/>
@@ -174,6 +185,7 @@
 		<publisher>Torch Computers</publisher>
 		<info name="format" value="CPN" />
 		<info name="usage" value="Requires Torch Z80 co-processor" />
+		<sharedfeat name="compatibility" value="Z80"/>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="unicomms.dsd" size="409600" crc="35dd22b8" sha1="1878284d8aa1610eec80fb91a0a074acc709ec69"/>
@@ -188,6 +200,7 @@
 		<info name="release" value="SC02/SC03/SC04" />
 		<info name="format" value="CPN" />
 		<info name="usage" value="SpellStar in User 0, WordStar in User 10, MailMerge in User 20\nRequires Torch Z80 co-processor" />
+		<sharedfeat name="compatibility" value="Z80"/>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="wordstar.dsd" size="409600" crc="cf3b9c77" sha1="2053ec8a1aead7c392c0e7243e8420699fd43491"/>
diff -Nru mame-0.222+dfsg.1/hash/bbcm_cart.xml mame-0.224+dfsg.1/hash/bbcm_cart.xml
--- mame-0.222+dfsg.1/hash/bbcm_cart.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/bbcm_cart.xml	2020-08-26 08:57:19.000000000 +0000
@@ -201,6 +201,48 @@
 		</part>
 	</software>
 
+	<software name="prisma2" supported="no">
+		<description>MasterPieCe 1.10</description>
+		<year>1987</year>
+		<publisher>G2 Systems</publisher>
+		<info name="usage" value="Requires Prisma-2"/>
+		<part name="cart" interface="bbcm_cart">
+			<dataarea name="rom" size="16384">
+				<rom name="MasterPieCe-1.10.rom" size="16384" crc="14b85cdd" sha1="c975041933dd0e223470292d169dd70568c25c59" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="prisma3" supported="no">
+		<description>Prisma-3 1.30</description>
+		<year>1988</year>
+		<publisher>Millipede</publisher>
+		<info name="usage" value="Requires Prisma-3"/>
+		<part name="cart" interface="bbcm_cart">
+			<dataarea name="lorom" size="16384">
+				<rom name="Prisma3-1.30-Main.rom" size="16384" crc="6ed1e8aa" sha1="ceda5ca869f960a4bb5368adbf4acd4861efd3a0" />
+			</dataarea>
+			<dataarea name="uprom" size="16384">
+				<rom name="Prisma3-1.30-Utils.rom" size="16384" crc="76c42acb" sha1="36aab45a3565325dd31ada64934597bafe765ed8" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="prisma3p" cloneof="prisma3" supported="no">
+		<description>Prisma-3 2.30</description>
+		<year>1990</year>
+		<publisher>Millipede</publisher>
+		<info name="usage" value="Requires Prisma-3/3+"/>
+		<part name="cart" interface="bbcm_cart">
+			<dataarea name="lorom" size="16384">
+				<rom name="Prisma3-2.30-Main.rom" size="16384" crc="b9489c7c" sha1="59a7606e3b92e1c7fbd0075d54e4fffd7c28417e" />
+			</dataarea>
+			<dataarea name="uprom" size="16384">
+				<rom name="Prisma3-2.30-Utils.rom" size="16384" crc="fa395bca" sha1="be7b1f590818e362a8acc5b203f0a08fce967f42" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="techcad">
 		<description>TechnoCAD</description>
 		<year>1988</year>
diff -Nru mame-0.222+dfsg.1/hash/bbc_rom.xml mame-0.224+dfsg.1/hash/bbc_rom.xml
--- mame-0.222+dfsg.1/hash/bbc_rom.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/bbc_rom.xml	2020-08-26 08:57:19.000000000 +0000
@@ -2534,7 +2534,7 @@
 	<software name="database100" cloneof="database">
 		<description>Database 1.00</description>
 		<year>1984</year>
-		<publisher>Merlin</publisher>
+		<publisher>Merlin Computer Products</publisher>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="8192">
 				<rom name="Database-1.10.rom" size="8192" crc="db803935" sha1="160f97616a410ff2baccbd343552dfc022117904"/>
@@ -2545,7 +2545,7 @@
 	<software name="database">
 		<description>Database 1.20</description>
 		<year>1984</year>
-		<publisher>Merlin</publisher>
+		<publisher>Merlin Computer Products</publisher>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="8192">
 				<rom name="Database-1.20.rom" size="8192" crc="d16db46c" sha1="3b3eec4dea6b2962511471f6487fa02336e504f7"/>
@@ -2567,7 +2567,7 @@
 	<software name="datagem">
 		<description>DataGem 1.02F</description>
 		<year>1985</year>
-		<publisher>Merlin</publisher>
+		<publisher>Merlin Computer Products</publisher>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="DataGem-1.02F.rom" size="16384" crc="bfb21e7e" sha1="043f372195f25acb3e55b042a8d8e9f3f4e3806f"/>
@@ -2578,7 +2578,7 @@
 	<software name="datascrib101" cloneof="datascrib">
 		<description>Data Scribe 1.01</description>
 		<year>1984</year>
-		<publisher>Merlin</publisher>
+		<publisher>Merlin Computer Products</publisher>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="DataScribe-1.01.rom" size="16384" crc="4f1e9dd2" sha1="ea6d5b7773ed0dbe97a68c212c3c574eb239c76a"/>
@@ -2589,7 +2589,7 @@
 	<software name="datascrib120" cloneof="datascrib">
 		<description>Data Scribe 1.20</description>
 		<year>1985</year>
-		<publisher>Merlin</publisher>
+		<publisher>Merlin Computer Products</publisher>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="DataScribe-1.20.rom" size="16384" crc="5ad8feda" sha1="9a7b39385a2d3d03119c1304eff11a05d5b87546"/>
@@ -2600,7 +2600,7 @@
 	<software name="datascrib">
 		<description>Data Scribe 1.31</description>
 		<year>1985</year>
-		<publisher>Merlin</publisher>
+		<publisher>Merlin Computer Products</publisher>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="DataScribe-1.31.rom" size="16384" crc="aceec462" sha1="6cf5a5c990b61c42edcc3ac8f30f3e5fed829ab2"/>
@@ -2611,7 +2611,7 @@
 	<software name="datastag">
 		<description>DataStag 1.0</description>
 		<year>1985</year>
-		<publisher>Merlin</publisher>
+		<publisher>Merlin Computer Products</publisher>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="DataStag-1.0.rom" size="16384" crc="b6304221" sha1="6b6da0fc1da67c6d2a6a6c338df644ed85a39d9d"/>
@@ -2619,12 +2619,13 @@
 		</part>
 	</software>
 
-	<software name="ddfs090">
+	<software name="ddfs090" cloneof="ddfs310">
 		<description>Microware DDFS 0.90</description>
 		<year>1984</year>
 		<publisher>Microware</publisher>
 		<info name="usage" value="Requires Microware DDFS FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="udm"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Microware-DDFS-0.90.rom" size="16384" crc="700d50e5" sha1="6834e46cb15354003d553e6c2bdb4ed76b47a465"/>
@@ -2632,12 +2633,27 @@
 		</part>
 	</software>
 
-	<software name="ddfs200">
+	<software name="ddfs098" cloneof="ddfs310">
+		<description>UDM DDFS 0.98</description>
+		<year>1985</year>
+		<publisher>United Disk Memories</publisher>
+		<info name="usage" value="Requires UDM DDFS FDC" />
+		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="udm"/>
+		<part name="rom1" interface="bbc_rom">
+			<dataarea name="rom" size="16384">
+				<rom name="UDM-DDFS-0.98.rom" size="16384" crc="2119f9ad" sha1="bfb9404b34de3b489db73d886300f37081db2482"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="ddfs200" cloneof="ddfs310">
 		<description>UDM DDFS 2.00</description>
 		<year>1985</year>
-		<publisher>UDM</publisher>
-		<info name="usage" value="Requires Microware DDFS FDC" />
+		<publisher>United Disk Memories</publisher>
+		<info name="usage" value="Requires UDM DDFS FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="udm"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="UDM-DDFS-2.00.rom" size="16384" crc="1b4708a2" sha1="0f37bcc73a758657cfe58c19f0cc92be9107e767"/>
@@ -2645,12 +2661,27 @@
 		</part>
 	</software>
 
-	<software name="ddos300">
+	<software name="ddfs310">
+		<description>UDM DDFS 3.10</description>
+		<year>1985</year>
+		<publisher>United Disk Memories</publisher>
+		<info name="usage" value="Requires UDM DDFS FDC" />
+		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="udm"/>
+		<part name="rom1" interface="bbc_rom">
+			<dataarea name="rom" size="16384">
+				<rom name="UDM-DDFS-3.10.rom" size="16384" crc="55851c2d" sha1="c5b6557fa4dbfa651c8ecc5b1da93b615c3aa905"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="ddos300" cloneof="ddos305">
 		<description>Opus DDOS 3.00</description>
 		<year>1984</year>
 		<publisher>Slogger</publisher>
 		<info name="usage" value="Requires Opus 8272 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="opus8272"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Opus-DDOS-3.00.rom" size="16384" crc="1b5fa131" sha1="6b4e0363a9d39807973a2ef0871a78b287cea27e"/>
@@ -2664,6 +2695,7 @@
 		<publisher>Slogger</publisher>
 		<info name="usage" value="Requires Opus 8272 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="opus8272"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Opus-DDOS-3.05.rom" size="16384" crc="43c75fa4" sha1="0b7194a234c2316ba825e878e3f69928bf3bb595"/>
@@ -2677,6 +2709,7 @@
 		<publisher>Slogger</publisher>
 		<info name="usage" value="Requires Opus 2791 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="opus2791"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Opus-EDOS-0.4.rom" size="16384" crc="1d8a3860" sha1="05f461464707b4ca24636c9e726af561f227ccdb"/>
@@ -2690,6 +2723,7 @@
 		<publisher>Slogger</publisher>
 		<info name="usage" value="Requires Opus 2791 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="opus2791"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Opus-DDOS-3.12.rom" size="16384" crc="b2c393be" sha1="6accaa0b13b0b939c86674cddd7bee1aea2f66cb"/>
@@ -2703,6 +2737,7 @@
 		<publisher>Slogger</publisher>
 		<info name="usage" value="Requires Opus 2791 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="opus2791"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Opus-DDOS-3.15.rom" size="16384" crc="5f06701c" sha1="9e250dc7ddcde35b19e8f29f2cfe95a79f46d473"/>
@@ -2716,6 +2751,7 @@
 		<publisher>Slogger</publisher>
 		<info name="usage" value="Requires Opus 2791 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="opus2791"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Opus-DDOS-3.16.rom" size="16384" crc="268ebc0d" sha1="e608f6e40a5579147cc631f351aae275fdabec5b"/>
@@ -2729,6 +2765,7 @@
 		<publisher>Slogger</publisher>
 		<info name="usage" value="Requires Opus 2793 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="opus2793"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Opus-DDOS-3.35.rom" size="16384" crc="e33167fb" sha1="42fbc9932db2087708da41cb1ffa94358683cf7a"/>
@@ -2742,6 +2779,7 @@
 		<publisher>Slogger</publisher>
 		<info name="usage" value="Requires Opus 2793 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="opus2793"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Opus-DDOS-3.36.rom" size="16384" crc="2f400f69" sha1="a6a57bb907d6b9bd351029fb0471a3a9c343da24"/>
@@ -2755,6 +2793,7 @@
 		<publisher>Slogger</publisher>
 		<info name="usage" value="Requires Opus D-DOS(B) 1770 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="opus1770"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Opus-DDOS-3.45.rom" size="16384" crc="c0163b95" sha1="1c5a68e08abbb7ffe663151c59088f750d2287a9"/>
@@ -2768,6 +2807,7 @@
 		<publisher>Slogger</publisher>
 		<info name="usage" value="Requires Opus D-DOS(B) 1770 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="opus1770"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Opus-DDOS-3.46.rom" size="16384" crc="bf9c35cf" sha1="a1ad3e9acbd15400e7da1e50bc6673835cde1fe7"/>
@@ -3222,6 +3262,17 @@
 		</part>
 	</software>
 
+	<software name="dmter54" supported="no">
+		<description>Terminal for Rank-Cintel/BBC Slide File</description>
+		<year>1987</year>
+		<publisher>BBC Television Centre</publisher>
+		<part name="rom1" interface="bbc_rom">
+			<dataarea name="rom" size="8192">
+				<rom name="DMTER54-1.3.rom" size="8192" crc="8490766e" sha1="19d274791e1c5f5103d0268dc1747338f041e387"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="dotprintp">
 		<description>DotPrint-Plus</description>
 		<year>1986</year>
@@ -4883,6 +4934,21 @@
 		</part>
 	</software>
 
+	<software name="kenda">
+		<description>Kenda Professional DMFS with PADS 1.02</description>
+		<year>1985</year>
+		<publisher>Kenda Electronic Systems</publisher>
+		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="kenda"/>
+		<part name="rom1" interface="bbc_rom">
+			<feature name="slot" value="dfse00" />
+			<dataarea name="rom" size="8192">
+				<rom name="Kenda-1.02.rom" size="8192" crc="430b911c" sha1="594ae1d1aeaa20a1d5d1c64cd94d43926dda4029"/>
+			</dataarea>
+			<dataarea name="ram" size="2048" />
+		</part>
+	</software>
+
 	<software name="kermit102" cloneof="kermit">
 		<description>Kermit 1.02</description>
 		<year>1985</year>
@@ -5096,6 +5162,8 @@
 		<year>198?</year>
 		<publisher>Computer Village</publisher>
 		<info name="usage" value="Requires Computer Village 1797 FDC" />
+		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="cv1797"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="8192">
 				<rom name="LVL-Dos-0.91.rom" size="8192" crc="69d7653a" sha1="9cd39d011290b97d5ba05b6c745689a8553be5fc"/>
@@ -5220,6 +5288,18 @@
 		</part>
 	</software>
 
+	<software name="master104" cloneof="master">
+		<description>Master ROM 1.04</description>
+		<year>1991</year>
+		<publisher>Beebugsoft</publisher>
+		<part name="rom1" interface="bbc_rom">
+			<feature name="slot" value="cciword" />
+			<dataarea name="rom" size="32768">
+				<rom name="MasterROM-1.04.rom" size="32768" crc="2eb2c934" sha1="325960b91b3367526cb51b5880b5d5fb5a10aa1e"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="master">
 		<description>Master ROM 1.05</description>
 		<year>1991</year>
@@ -5689,7 +5769,7 @@
 		<year>1985</year>
 		<publisher>MRM Software</publisher>
 		<part name="rom1" interface="bbc_rom">
-			<feature name="slot" value="mrme00" />
+			<feature name="slot" value="dfse00" />
 			<dataarea name="rom" size="8192">
 				<rom name="MRM-E00-DFS-1.20.rom" size="8192" crc="944958b6" sha1="0db7be4deb303af2400f9af20a9a7211dcbaeae5"/>
 			</dataarea>
@@ -6687,6 +6767,7 @@
 		<year>1984</year>
 		<publisher>Gnomic</publisher>
 		<info name="usage" value="Requires Cumana QFS 8877A FDC" />
+		<sharedfeat name="fdc_default" value="cumana1"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="QFS-1.01.rom" size="16384" crc="3ce2af39" sha1="0eea54d3433ec3aaf32e2c43cd9469d5f5be06be"/>
@@ -6699,6 +6780,7 @@
 		<year>1984</year>
 		<publisher>Gnomic</publisher>
 		<info name="usage" value="Requires Cumana QFS 8877A FDC" />
+		<sharedfeat name="fdc_default" value="cumana1"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="QFS-1.02.rom" size="16384" crc="083a9285" sha1="4bf31a420a9d752285b088ee4f08a64563527662"/>
@@ -6711,6 +6793,7 @@
 		<year>1985</year>
 		<publisher>Gnomic</publisher>
 		<info name="usage" value="Requires Cumana QFS Issue 2 8877A FDC" />
+		<sharedfeat name="fdc_default" value="cumana2"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="QFS-2.00.rom" size="16384" crc="5863962a" sha1="0dced741482321938842746ee47090ae443d7ad5"/>
@@ -7262,7 +7345,7 @@
 	<software name="scribe110" cloneof="scribe">
 		<description>Scribe 1.10</description>
 		<year>1983</year>
-		<publisher>Merlin</publisher>
+		<publisher>Merlin Computer Products</publisher>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="8192">
 				<rom name="Scribe-1.10.rom" size="8192" crc="cb45b756" sha1="3117c082337e7877c411d3faccc902c99b26e3ad"/>
@@ -7273,7 +7356,7 @@
 	<software name="scribe">
 		<description>Scribe 1.30</description>
 		<year>1984</year>
-		<publisher>Merlin</publisher>
+		<publisher>Merlin Computer Products</publisher>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="8192">
 				<rom name="Scribe-1.30.rom" size="8192" crc="555d63c5" sha1="161346230eeb00904819091bdaaef7dc01995832"/>
@@ -7284,7 +7367,7 @@
 	<software name="scribchec">
 		<description>ScribeChec 1.10</description>
 		<year>1985</year>
-		<publisher>Merlin</publisher>
+		<publisher>Merlin Computer Products</publisher>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="ScribeChec-1.10.rom" size="16384" crc="a0035210" sha1="a7333e003b31dafdfef78ce11b18aab2cb9f9433"/>
@@ -7318,22 +7401,34 @@
 		<description>SEHK Terminal 2.00</description>
 		<year>1987</year>
 		<publisher>Nippon Business Machines</publisher>
+		<sharedfeat name="compatibility" value="B"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="SEHKTerminal-2.00.rom" size="16384" crc="d6014fcf" sha1="6fa6463e611274f78d320e86cfbed6808b327113"/>
 			</dataarea>
 		</part>
+		<part name="rom2" interface="bbc_rom">
+			<dataarea name="rom" size="16384">
+				<rom name="SEHK_CC2-2.00.rom" size="16384" crc="af952d2e" sha1="0da6a0a3acfe2b084f0eaf7ca2d68fcc14759c61"/>
+			</dataarea>
+		</part>
 	</software>
 
 	<software name="sehk" supported="no">
 		<description>SEHK Terminal 4.01</description>
 		<year>1989</year>
 		<publisher>Nippon Business Machines</publisher>
+		<sharedfeat name="compatibility" value="B,M"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="SEHKTerminal-4.01.rom" size="16384" crc="b4f9c59c" sha1="b74dcf2eb10874ae4bf7477ce32d67a15272a176"/>
 			</dataarea>
 		</part>
+		<part name="rom2" interface="bbc_rom">
+			<dataarea name="rom" size="16384">
+				<rom name="SEHK_CC1-3.00.rom" size="16384" crc="5d5fafc3" sha1="ec1e93d5490f9f5e2eac5096f9f9e40aa48bffc8"/>
+			</dataarea>
+		</part>
 	</software>
 
 	<software name="sforth">
@@ -8360,9 +8455,9 @@
 	</software>
 
 	<software name="suprvisr">
-		<description>Supervisor</description>
+		<description>Supervisor 1</description>
 		<year>1985</year>
-		<publisher>Micropulse</publisher>
+		<publisher>Northern Computers</publisher>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="8192">
 				<rom name="Supervisor-1.00.rom" size="8192" crc="d8a326f5" sha1="a9da6867e780fc72e42f1216c398ef5329fabe4d"/>
@@ -8370,6 +8465,39 @@
 		</part>
 	</software>
 
+	<software name="suprvisr2f">
+		<description>Supervisor 2 - DFS</description>
+		<year>1987</year>
+		<publisher>Northern Computers</publisher>
+		<part name="rom1" interface="bbc_rom">
+			<dataarea name="rom" size="16384">
+				<rom name="Supervisor-2.10F.rom" size="16384" crc="05937ce8" sha1="cb874c958285d4ac4b22eda5050c57b5b49aab34"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="suprvisr3f">
+		<description>Supervisor 3 - Floppy</description>
+		<year>1986</year>
+		<publisher>Northern Computers</publisher>
+		<part name="rom1" interface="bbc_rom">
+			<dataarea name="rom" size="16384">
+				<rom name="Supervisor-3.03F.rom" size="16384" crc="7a6e81d1" sha1="e1e00b339cc6dbe3b64ebd6ca7343dd40a697d3d"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="suprvisr3w">
+		<description>Supervisor 3 - Winchester</description>
+		<year>1986</year>
+		<publisher>Northern Computers</publisher>
+		<part name="rom1" interface="bbc_rom">
+			<dataarea name="rom" size="16384">
+				<rom name="Supervisor-3.03W.rom" size="16384" crc="fd8759ac" sha1="34c1737dc7849b3044211ab1f3f3c52f5c3b92a5"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="swift">
 		<description>Swift 2.2</description>
 		<year>1986</year>
@@ -9317,6 +9445,18 @@
 		</part>
 	</software>
 
+	<software name="videorom" supported="no">
+		<description>VideoROM: Videodisc Player Control Software</description>
+		<year>1988</year>
+		<publisher>The Soft Option</publisher>
+		<sharedfeat name="compatibility" value="M"/>
+		<part name="rom1" interface="bbc_rom">
+			<dataarea name="rom" size="16384">
+				<rom name="VideoROM-X3.1.rom" size="16384" crc="e2089d1c" sha1="32c3aed1e8dc44997a7b567da012b85687062193"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="viditel">
 		<description>Viditel</description>
 		<year>198?</year>
@@ -9624,6 +9764,7 @@
 		<publisher>Watford Electronics</publisher>
 		<info name="usage" value="Requires Watford Electronics DDB2 1772 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="weddb2"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Watford-DDFS-1.40.rom" size="16384" crc="6c6eef94" sha1="d86b26a6fe7b3532e7bd3c6f3e8e503edac3811c"/>
@@ -9637,6 +9778,7 @@
 		<publisher>Watford Electronics</publisher>
 		<info name="usage" value="Requires Watford Electronics DDB2 1772 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="weddb2"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Watford-DDFS-1.50.rom" size="16384" crc="d2fff497" sha1="7693f14aeed26c34b2342c3487ed4b9ad233e279"/>
@@ -9650,6 +9792,7 @@
 		<publisher>Watford Electronics</publisher>
 		<info name="usage" value="Requires Watford Electronics DDB2 1772 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="weddb2"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Watford-DDFS-1.53.rom" size="16384" crc="e1be4ee4" sha1="6719dc958f2631e6dc8f045429797b289bfe649a"/>
@@ -9663,6 +9806,7 @@
 		<publisher>Watford Electronics</publisher>
 		<info name="usage" value="Requires Watford Electronics DDB3 1770 FDC" />
 		<sharedfeat name="compatibility" value="B"/>
+		<sharedfeat name="fdc_default" value="weddb3"/>
 		<part name="rom1" interface="bbc_rom">
 			<dataarea name="rom" size="16384">
 				<rom name="Watford-DDFS-1.54T.rom" size="16384" crc="6504c1ed" sha1="618b7a1551f91e2b18608428b9e581f3d920d4b5"/>
diff -Nru mame-0.222+dfsg.1/hash/cpc_flop.xml mame-0.224+dfsg.1/hash/cpc_flop.xml
--- mame-0.222+dfsg.1/hash/cpc_flop.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/cpc_flop.xml	2020-08-26 08:57:19.000000000 +0000
@@ -70245,23 +70245,11 @@
 		</part>
 	</software>
 
-	<!-- Identifying Secret Agent - Sly Spy (UK) (1990).zip... --> <!-- CPC Power -->
-	<software name="secretag" supported="no">
-		<description>Secret Agent - Sly Spy (UK)</description>
-		<year>1990</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="flop1" interface="floppy_3">
-			<dataarea name="flop" size="194816">
-				<rom name="secret agent - sly spy (uk) (1990).dsk" size="194816" crc="3ec4f163" sha1="a41969d5bd1f8b19938a831376d9948bf5504fe9"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<!-- Identifying Secret Agent - Sly Spy (UK) (2 faces) (1990) (Spain retail version) [Original].zip... --> <!-- CPC Power -->
-	<software name="secretag01" cloneof="secretag" supported="no">
+	<software name="slyspy" supported="yes">
 		<description>Secret Agent - Sly Spy (UK) (2 faces) (Spain retail version) [Original]</description>
 		<year>1990</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Erbe</publisher>
 		<part name="flop1" interface="floppy_3">
 			<dataarea name="flop" size="194816">
 				<rom name="secret agent - sly spy (uk) (face a) (1990) (spain retail version) [original].dsk" size="194816" crc="ad8ad3cd" sha1="de09630051d2dea575b2febc17be785f45a6faeb"/>
@@ -70275,10 +70263,11 @@
 	</software>
 
 	<!-- Identifying Secret Agent - Sly Spy (UK) (2 faces) (1990) (UK retail version) [Original] (Weak Sectors).zip... --> <!-- CPC Power -->
-	<software name="secretag02" cloneof="secretag" supported="no">
+	<!-- does not load - Incorrect layout on track 1 head 0, expected_size=105000, current_size=134400 -->
+	<software name="slyspy01" cloneof="slyspy" supported="no">
 		<description>Secret Agent - Sly Spy (UK) (2 faces) (UK retail version) [Original] (Weak Sectors)</description>
 		<year>1990</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Ocean Software</publisher>
 		<part name="flop1" interface="floppy_3">
 			<dataarea name="flop" size="72837">
 				<rom name="secret agent - sly spy (uk) (face a) (1990) (uk retail version) [original] (weak sectors).dsk" size="72837" crc="006979b0" sha1="c366fea55b22398fa76314c9e54b9ff4b1a344f6"/>
@@ -70291,6 +70280,18 @@
 		</part>
 	</software>
 
+	<!-- Identifying Secret Agent - Sly Spy (UK) (1990).zip... --> <!-- CPC Power -->
+	<software name="slyspy07" cloneof="slyspy" supported="yes">
+		<description>Secret Agent - Sly Spy (UK)</description>
+		<year>1990</year>
+		<publisher>&lt;unknown&gt;</publisher>
+		<part name="flop1" interface="floppy_3">
+			<dataarea name="flop" size="194816">
+				<rom name="secret agent - sly spy (uk) (1990).dsk" size="194816" crc="3ec4f163" sha1="a41969d5bd1f8b19938a831376d9948bf5504fe9"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<!-- Identifying Secret Defense (F) (1988) [Original].zip... --> <!-- CPC Power -->
 	<software name="secretde" supported="no">
 		<description>Secret Defense (Fra) [Original]</description>
@@ -144896,8 +144897,9 @@
 	</software>
 
 	<!-- Identifying Sly Spy - Secret Agent (1990)(Ocean Software)(Disk 1 of 2).dsk... --> <!-- Mostly GoodCPC -->
-	<software name="slyspyse" supported="no">
-		<description>Sly Spy - Secret Agent (Ocean Software)(Disk 1 of 2)</description>
+	<!-- No music on title screen -->
+	<software name="slyspy02" cloneof="slyspy" supported="yes">
+		<description>Sly Spy - Secret Agent (Ocean Software)</description>
 		<year>1990</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_3">
@@ -144905,14 +144907,7 @@
 				<rom name="sly spy - secret agent (1990)(ocean software)(disk 1 of 2).dsk" size="194816" crc="829c3108" sha1="a3b223d26fa98d1e16f92737621b2b6b63d3c5bc"/>
 			</dataarea>
 		</part>
-	</software>
-
-	<!-- Identifying Sly Spy - Secret Agent (1990)(Ocean Software)(Disk 2 of 2).dsk... --> <!-- Mostly GoodCPC -->
-	<software name="slyspyse01" cloneof="slyspyse" supported="no">
-		<description>Sly Spy - Secret Agent (Ocean Software)(Disk 2 of 2)</description>
-		<year>1990</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="flop1" interface="floppy_3">
+		<part name="flop2" interface="floppy_3">
 			<dataarea name="flop" size="194816">
 				<rom name="sly spy - secret agent (1990)(ocean software)(disk 2 of 2).dsk" size="194816" crc="bd06d9d5" sha1="317257889f1fcb4e7f99287ad3241f8641b10d2f"/>
 			</dataarea>
@@ -144920,7 +144915,8 @@
 	</software>
 
 	<!-- Identifying Sly Spy - Secret Agent (1990)(Ocean Software)[cr XOR][t +2 XOR].dsk... --> <!-- Mostly GoodCPC -->
-	<software name="slyspyse02" cloneof="slyspyse" supported="no">
+	<!-- Some cutscenes have glitched graphics (normal for this hack?) -->
+	<software name="slyspy03" cloneof="slyspy" supported="yes">
 		<description>Sly Spy - Secret Agent (Ocean Software)[cr XOR][t +2 XOR]</description>
 		<year>1990</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -183025,9 +183021,10 @@
 	</software>
 
 	<!-- Identifying Secret Agent (UK) (19xx) [t1].dsk... --> <!-- GoodCPC -->
-	<software name="secretag03" cloneof="secretag" supported="no">
+	<!-- does not load - too many tracks (double-sided floppy image? -->
+	<software name="slyspy04" cloneof="slyspy" supported="no">
 		<description>Secret Agent (UK) [t1]</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_3">
 			<dataarea name="flop" size="296960">
@@ -184128,9 +184125,9 @@
 		</part>
 	</software>
 
-	<!-- Identifying Sly Spy - Secret Agent (UK) (1990) (Disk 1 of 2) [a1].dsk... --> <!-- GoodCPC -->
-	<software name="slyspyse03" cloneof="slyspyse" supported="no">
-		<description>Sly Spy - Secret Agent (UK) (Disk 1 of 2) [a1]</description>
+	<!-- Identifying Sly Spy - Secret Agent (UK) (1990) [a1].dsk... --> <!-- GoodCPC -->
+	<software name="slyspy05" cloneof="slyspy" supported="yes">
+		<description>Sly Spy - Secret Agent (UK) [a1]</description>
 		<year>1990</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_3">
@@ -184138,14 +184135,7 @@
 				<rom name="sly spy - secret agent (uk) (1990) (disk 1 of 2) [a1] (goodcpc).dsk" size="204544" crc="c123f14d" sha1="9ea706a4ab10011d0ee4d1347b7bde54aa4c5e32"/>
 			</dataarea>
 		</part>
-	</software>
-
-	<!-- Identifying Sly Spy - Secret Agent (UK) (1990) (Disk 2 of 2) [a1].dsk... --> <!-- GoodCPC -->
-	<software name="slyspyse04" cloneof="slyspyse" supported="no">
-		<description>Sly Spy - Secret Agent (UK) (Disk 2 of 2) [a1]</description>
-		<year>1990</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="flop1" interface="floppy_3">
+		<part name="flop2" interface="floppy_3">
 			<dataarea name="flop" size="194816">
 				<rom name="sly spy - secret agent (uk) (1990) (disk 2 of 2) [a1] (goodcpc).dsk" size="194816" crc="1179ce0b" sha1="899ec70ae49f0dd1aa1731142c9691a2a66941f9"/>
 			</dataarea>
@@ -214374,23 +214364,16 @@
 	</software>
 
 	<!-- Identifying Sly Spy - Secret Agent (1 de 2) (nongoodcpc).dsk... --> <!-- NonGoodCPC -->
-	<software name="slyspyse05" cloneof="slyspyse" supported="no">
-		<description>Sly Spy - Secret Agent (1 de 2)</description>
-		<year>19??</year>
+	<software name="slyspy06" cloneof="slyspy" supported="yes">
+		<description>Sly Spy - Secret Agent (NonGoodCPC)</description>
+		<year>1990</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_3">
 			<dataarea name="flop" size="194816">
 				<rom name="sly spy - secret agent (1 de 2) (nongoodcpc).dsk" size="194816" crc="d78556f8" sha1="b2529c705f0fba2f9155f0a8c8d98fe5bd143600"/>
 			</dataarea>
 		</part>
-	</software>
-
-	<!-- Identifying Sly Spy - Secret Agent (2 de 2) (nongoodcpc).dsk... --> <!-- NonGoodCPC -->
-	<software name="slyspyse06" cloneof="slyspyse" supported="no">
-		<description>Sly Spy - Secret Agent (2 de 2)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="flop1" interface="floppy_3">
+		<part name="flop2" interface="floppy_3">
 			<dataarea name="flop" size="194816">
 				<rom name="sly spy - secret agent (2 de 2) (nongoodcpc).dsk" size="194816" crc="65723a81" sha1="1d5b162080cf5ac0e404486a2ae7d185cdb48e7a"/>
 			</dataarea>
diff -Nru mame-0.222+dfsg.1/hash/electron_cart.xml mame-0.224+dfsg.1/hash/electron_cart.xml
--- mame-0.222+dfsg.1/hash/electron_cart.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/electron_cart.xml	2020-08-26 08:57:19.000000000 +0000
@@ -423,7 +423,7 @@
 		</part>
 	</software>
 
-		<software name="peg4001" cloneof="peg400">
+	<software name="peg4001" cloneof="peg400">
 		<description>Pegasus 400 v1.01</description>
 		<year>1987</year>
 		<publisher>Slogger</publisher>
@@ -514,27 +514,40 @@
 		</part>
 	</software>
 
-	<software name="sndexp" supported="no">
+	<software name="sndexp">
 		<description>Sound Expansion</description>
 		<year>1988</year>
 		<publisher>Project Expansions</publisher>
 		<part name="cart" interface="electron_cart">
 			<feature name="slot" value="sndexp" />
 			<dataarea name="rom" size="8192">
-				<rom name="sound_expansion-v1.00.rom" size="8192" crc="01a43480" sha1="9f570abbff97e6615a29c9d2de5ec9f37d22c564"/>
+				<rom name="sound_expansion-1.00.rom" size="8192" crc="01a43480" sha1="9f570abbff97e6615a29c9d2de5ec9f37d22c564"/>
+			</dataarea>
+			<dataarea name="ram" size="8192" />
+		</part>
+	</software>
+
+	<software name="sndexp2">
+		<description>Sound Expansion 2.0</description>
+		<year>1988</year>
+		<publisher>Project Expansions</publisher>
+		<part name="cart" interface="electron_cart">
+			<feature name="slot" value="sndexp" />
+			<dataarea name="rom" size="8192">
+				<rom name="sound_expansion-2.0.rom" size="8192" crc="8b8a85c3" sha1="a438d19431782142b0c1b591d3c025716014bffc"/>
 			</dataarea>
 			<dataarea name="ram" size="8192" />
 		</part>
 	</software>
 
 	<software name="sndexp3">
-		<description>Sound Expansion v3</description>
+		<description>Sound Expansion 3.0</description>
 		<year>1989</year>
 		<publisher>Complex Software Systems</publisher>
 		<part name="cart" interface="electron_cart">
 			<feature name="slot" value="sndexp3" />
 			<dataarea name="rom" size="16384">
-				<rom name="sound_expansion-v3.00.rom" size="16384" crc="65ebfb98" sha1="2e409b92c97cda34ff25c2951e5f799125fe7e32"/>
+				<rom name="sound_expansion-3.0.rom" size="16384" crc="65ebfb98" sha1="2e409b92c97cda34ff25c2951e5f799125fe7e32"/>
 			</dataarea>
 			<dataarea name="ram" size="8192" />
 		</part>
@@ -551,6 +564,17 @@
 			</dataarea>
 		</part>
 	</software>
+
+	<software name="upurs" supported="no">
+		<description>UPURS 1.0E</description>
+		<year>2012</year>
+		<publisher>Martin Barr</publisher>
+		<part name="rom" interface="electron_cart">
+			<dataarea name="rom" size="16384">
+				<rom name="upurs-1.0e.rom" size="16384" crc="128ce6bd" sha1="d836275efcd8d35aeb239abe1c71ea6f426dc45c"/>
+			</dataarea>
+		</part>
+	</software>
 
 	<!-- Mega Games Cartridge -->
 
diff -Nru mame-0.222+dfsg.1/hash/electron_rom.xml mame-0.224+dfsg.1/hash/electron_rom.xml
--- mame-0.222+dfsg.1/hash/electron_rom.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/electron_rom.xml	2020-08-26 08:57:19.000000000 +0000
@@ -475,8 +475,8 @@
 		<year>1985</year>
 		<publisher>Slogger</publisher>
 		<part name="rom" interface="electron_rom">
-			<dataarea name="rom" size="16384">
-				<rom name="ElkMan-1.4.rom" size="16384" crc="762e4ee6" sha1="9bd1c016aa0473183b5a137d6564423f3e3ff0f9"/>
+			<dataarea name="rom" size="8192">
+				<rom name="ElkMan-1.4.rom" size="8192" crc="d2bcacf4" sha1="3ba7d6b40794969dbb2322de8dc2434543abb8ea"/>
 			</dataarea>
 		</part>
 	</software>
@@ -503,6 +503,17 @@
 		</part>
 	</software>
 
+	<software name="gommc" supported="no">
+		<description>GoMMC Tools 1.03</description>
+		<year>2007</year>
+		<publisher>John Kortink</publisher>
+		<part name="rom" interface="electron_rom">
+			<dataarea name="rom" size="16384">
+				<rom name="GoMMCTools-E1.03.rom" size="16384" crc="ab7cd089" sha1="f2b069f7b29ae699e55a9f3e7d187efce052582f"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="matrix">
 		<description>Matrix</description>
 		<year>1986</year>
@@ -514,7 +525,29 @@
 		</part>
 	</software>
 
-	<software name="mode7sim">
+	<software name="mode7mk211" cloneof="mode7mk2" supported="no">
+		<description>Mode 7 Mk2 v1.1</description>
+		<year>1989</year>
+		<publisher>JAFA Systems</publisher>
+		<part name="rom" interface="electron_rom">
+			<dataarea name="rom" size="16384">
+				<rom name="Mode7Mk2-1.1.rom" size="16384" crc="d5d7c7db" sha1="5e98963c268ac56c49631fe808b4f37aca3bef63"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mode7mk2" supported="no">
+		<description>Mode 7 Mk2 v2.2</description>
+		<year>1989</year>
+		<publisher>JAFA Systems</publisher>
+		<part name="rom" interface="electron_rom">
+			<dataarea name="rom" size="16384">
+				<rom name="Mode7Mk2-2.2.rom" size="16384" crc="28792451" sha1="efabe095f7a87ff42d8da318a14ad57c5c03772e"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mode7sim11" cloneof="mode7sim">
 		<description>Mode 7 Simulator v1.1</description>
 		<year>1988</year>
 		<publisher>JAFA Systems</publisher>
@@ -524,6 +557,17 @@
 			</dataarea>
 		</part>
 	</software>
+
+	<software name="mode7sim">
+		<description>Mode 7 Simulator v1.5</description>
+		<year>1988</year>
+		<publisher>JAFA Systems</publisher>
+		<part name="rom" interface="electron_rom">
+			<dataarea name="rom" size="16384">
+				<rom name="Mode7Simulator-1.5.rom" size="16384" crc="ad5f6ee8" sha1="c00ec0902d03f81254ea264af1f4d7a03b28e8a6"/>
+			</dataarea>
+		</part>
+	</software>
 
 	<software name="mforth83">
 		<description>Multi-Forth 83</description>
diff -Nru mame-0.222+dfsg.1/hash/fm7_cass.xml mame-0.224+dfsg.1/hash/fm7_cass.xml
--- mame-0.222+dfsg.1/hash/fm7_cass.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/fm7_cass.xml	2020-08-26 08:57:19.000000000 +0000
@@ -971,6 +971,18 @@
 		</part>
 	</software>
 
+	<software name="inoue">
+		<description>Inoue's Dragon Slayer</description>
+		<year>1985</year>
+		<publisher>Tadanobu Inoue</publisher>
+		<info name="alt_title" value="井上のドラスレ"/>
+		<part name="cass1" interface="fm7_cass">
+			<dataarea name="cass" size="1270216">
+				<rom name="inoue.t77" size="1270216" crc="571b270e" sha1="1176818e42976a04ec6800c91ac97b6f0f6ffb37"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="ixion">
 		<description>Ixion</description>
 		<year>1985</year>
diff -Nru mame-0.222+dfsg.1/hash/fmtowns_cd.xml mame-0.224+dfsg.1/hash/fmtowns_cd.xml
--- mame-0.222+dfsg.1/hash/fmtowns_cd.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/fmtowns_cd.xml	2020-08-26 08:57:19.000000000 +0000
@@ -31,7 +31,6 @@
 Airwave Adventure                                             Toshiba EMI                       1989/12    CD
 Aishuu to Netsujou no Chouwa                                  Fujitsu                           1995/4     CD
 Akiko Gold                                                    Fairytale (Red Zone)              1995/1     SET(CD+FD)
-Akiko Premium Version                                         Fairytale (Red Zone)              1993/3     CD
 Alice in Wonderland                                           DynEd Japan                       1993/3     SET(CD+FD)
 * Alice no Yakata 3 CD                                        Alice Soft                        1995/6     CD
 Amour Ver. 1.0                                                Kozu System                       1989/11    SET(CD+FD)
@@ -55,7 +54,6 @@
 ByHAND V1.1                                                   Fujitsu                           1992/1     CD
 ByHAND V2.1                                                   Fujitsu                           1993/3     CD
 ByHAND V3.1                                                   Fujitsu                           1994/3     CD
-CAL Towns 3                                                   Birdy Soft                        1993/7     CD
 California X Party: Joshi Daisei Himitsu Club                 HOP                               1994/9     SET(CD+FD)
 Car Marty Exciting CD                                         Fujitsu Ten                       1994/3     CD×2
 Car Marty Exciting CD                                         Fujitsu Ten                       1994/3     CD×2
@@ -72,7 +70,6 @@
 CD Eigo Gakushuu System 2-nen Sanseidou: New Crown            Uchida Youkou                     1991/4     SET(CD+FD)
 CD-ROM-ban Katei Igaku Daizenka                               Houken                            1992/10    SET(CD+FD)
 CDWord                                                        Sanshusha                         1989/3     SET(CD+FD)
-Chiemi & Naomi                                                Fairytale (Red Zone)              1993/12    CD
 Chiisana Ensouka                                              Fujitsu Social Science Laboratory 1993/9     CD
 Chikyuu no Himitsu (Kankyou Kyouiku Kyouzai)                  Fujitsu                           1994/7     CD
 Chinmoku no Kantai                                            GAM                               1992/4     SET(CD+FD)
@@ -92,7 +89,6 @@
 CRI StacCard                                                  CSK Research Institute (CRI)      1991/5     SET(CD+FD)
 Criss                                                         CSK Research Institute (CRI)      1989/7     CD
 C-Trace Towns                                                 Cast                              1989/6     CD
-Curse                                                         Queen Soft                        1995/2     CD
 Custom Mate & Denwa no Bell ga…                               Cocktail Soft                     1994/12    SET(CD+FD)
 Cutie Queen                                                   Crystal Eizou                     1995/2     CD
 Cybernoid Alpha                                               D.O.                              1996/4     CD
@@ -168,7 +164,6 @@
 Eigo de Eigo ni Tsuyoku Naru 7                                Infortech                         1990/4     CD
 Eigo de Eigo ni Tsuyoku Naru 8                                Infortech                         1990/4     CD
 Eigo de Eigo ni Tsuyoku Naru 9                                Infortech                         1990/4     CD
-Eikan wa Kimi ni 2: Koukou Yakyuu Zenkoku Taikai              Artdink                           1991/8     CD
 Eikan wa Kimi ni 3: Koukou Yakyuu Zenkoku Taikai              Artdink                           1993/8     SET(CD+FD)
 Ei-wa-doku-ro Denki Jutsugo Daijiten                          Ohmsha                            1990/4     CD
 Emit Vol. 3: Watashi ni Sayonara wo                           Koei                              1994/9     SET(CD+FD)
@@ -203,7 +198,6 @@
 Fuzzy Kakeibo 3                                               GAM                               1995/11    CD
 Gakuen Bakuretsu Tenkousei!                                   ZyX                               1996/3     CD
 Gakuen Bomber                                                 Active                            1994/6     CD
-Gambler - Queen's Cup                                         Queen Soft                        1994/9     CD
 Game Nihonshi: Kakumeiji Oda Nobunaga                         Koei                              1996/3     SET(CD+FD)
 Game Nihonshi: Tenkabito Hideyoshi to Ieyasu                  Koei                              1996/6     SET(CD+FD)
 Garou Densetsu Special                                        Mahou (Nihon Home Data)           1996/9     SET(CD+FD)
@@ -221,7 +215,6 @@
 Ginga Uchuu Odyssey 2                                         Fujitsu                           1992/4     CD
 Ginga Uchuu Odyssey 2                                         Fujitsu                           1991/3     CD
 Ginga Yuukyou Densetsu Tobakker                               Ponytail Soft                     1995/11    CD
-Gokuraku Mandala                                              Fairytale                         1994/2     CD
 Gomen ne Angel: Yokohama Monogatari                           JAST                              1992/1     ?
 Gram Cats 2                                                   Dot Kikaku                        ?          ?
 Grand Prix Densetsu                                           Soft Studio Wing                  1993/9     CD
@@ -279,7 +272,6 @@
 Hyper Drill Series Shougakkou Shakai 5-nen                    Uchida Youkou                     1994/4     CD
 Hyper Drill Series Shougakkou Shakai 6-nen                    Uchida Youkou                     1994/8     CD
 Hyper DX                                                      Datt Japan                        1989/10    SET(CD+FD)
-Hyper Fetishism                                               Extend                            1993/12    CD
 Hyper Ikuji Guide: Babubabu Tenshi                            Dennou Shoukai                    1996/4     CD
 Hyper Koto no Tabi: Kyoto                                     Nanken Koubou                     1993/2     CD
 Hyper Land: Doubutsu no Sekai                                 Datt Japan                        1993/3     CD
@@ -301,7 +293,6 @@
 Igo Doujou Shodan Kaigan! Kyuu kara Dan e no Chousen          Fujitsu OA                        1991/5     CD
 Igo Doujou Yaburi: Menkyo Kaiden!! Mezase 7-kyuu              Fujitsu OA                        1990/10    CD
 Igo Nyuumon Doujou                                            GAM                               1991/6     CD
-Illust Hyakka: Yamashita Hideki no Ikiiki Cut-shuu            CSK Research Institute (CRI)      1990/8     CD
 Image Art System                                              Raison                            1990/6     CD
 Image Art System Pro                                          Raison                            1990/8     CD
 Image Power                                                   Raison                            1990/3     CD
@@ -311,7 +302,6 @@
 Interactive Business English 4                                DynEd Japan                       1992/7     SET(CD+FD)
 Interactive Business English 5                                DynEd Japan                       1992/7     SET(CD+FD)
 Interactive Business English 6                                DynEd Japan                       1992/7     SET(CD+FD)
-Iris-tei Sayokyoku                                            Agumix                            1992/11    CD
 Iwanami Bungakukan: Natsume Souseki                           Iwanami Shoten                    1994/2     CD
 Iwanami Denshi Nihon Sougou Nendo CD-ROM                      Fujitsu                           1993/10    CD
 J.League Professional Soccer 1994                             Victor Entertainment              1994/9     CD
@@ -321,7 +311,6 @@
 Jinmon Yuugi                                                  Fairytale (Red Zone)              1995/8     SET(CD+FD)
 Jintaizu System Skeleton                                      Medical System                    1995/8     CD
 Joshikousei Shoujo Densetsu                                   Byakuya Shobou                    1994/4     CD
-Jouhou Club                                                   Fujitsu Social Science Laboratory 1989/11    CD
 Jouhou Gijutsu Yougo Shuu CD-ROM                              Fujitsu                           1991/12    CD
 JYB                                                           Cocktail Soft                     1993/4     CD
 Kadokawa Ruigo Shin Jiten CD-ROM                              Fujitsu                           1989/12    CD
@@ -363,7 +352,7 @@
 Let's go 2-1                                                  DynEd Japan                       1995/7     SET(CD+FD)
 Let's go 2-2                                                  DynEd Japan                       1995/7     SET(CD+FD)
 Lettuce Cooking 2: Tanoshiku Tsukureru Obentou                SS Communications                 1990/8     SET(CD+FD)
-* Lipstick Adventure 3                                          Fairytale                         1993/5     CD
+* Lipstick Adventure 3                                        Fairytale                         1993/5     CD
 Little Big Adventure                                          Electronic Arts Victor            1995/12    CD
 LiveAnimation V1.1                                            Fujitsu                           1992/12    CD
 LiveAnimation V2.1                                            Fujitsu                           1994/5     CD
@@ -375,13 +364,10 @@
 M Talk                                                        Fujitsu Office Kiki               1993/6     CD
 Mahjong Gensoukyoku 2                                         Active                            1993/9     CD
 Mahjong Gensoukyoku III                                       Active                            1995/11    CD
-Mahjong Musashi                                               Cosmos Computer                   1989/10    CD
 Manami no Dokomade Iku no?                                    Wendy Magazine                    1995/5     CD
-Manami no Dokomade Iku no? 2: Return of the Kuro Pack         Wendy Magazine                    1995/5     CD
 Manami: Ai to Koukan no Hibi                                  Fairytale (Red Zone)              1995/10    SET(CD+FD)
 Many Colors 2                                                 Amorphous                         1995/6     CD
 Manyoushuu                                                    Uchida Youkou                     1993/2     CD
-Marionette Mind                                               Studio Milk                       1994/3     CD
 Maruanki Eitango: Chuugaku 1-nensei                           CSK Research Institute (CRI)      1989/12    SET(CD+FD)
 Maruanki Eitango: Chuugaku 2-nensei                           CSK Research Institute (CRI)      1989/12    SET(CD+FD)
 Maruanki Eitango: Chuugaku 3-nensei                           CSK Research Institute (CRI)      1990/2     SET(CD+FD)
@@ -393,7 +379,6 @@
 Migenerator V1.1                                              Fujitsu                           1992/7     SET(CD+FD)
 Mimi no Daibouken Hyper Land 2: Konchuu no Sekai              Datt Japan                        1995/2     SET(CD+FD)
 Minna de Sansuu 1-nen                                         Tokyo Shoseki                     1995/9     CD
-Mirage 2: Torry x Neat x Roan no Daibouken                    Discovery                         1994/12    CD
 Misato-san no Yume Nikki                                      Active                            1997/4     CD
 Mizube no Ninkimono                                           Fujitsu Social Science Laboratory 1994/7     CD
 Moeru Asoko no Paipai Yuugi                                   Illusion                          1993/12    CD
@@ -481,7 +466,6 @@
 * Nobunaga no Yabou: Tenshouki                                Koei                              1995/3     SET(CD+FD)
 Nooch: Abakareta Inbou                                        Bombee Bonbon                     1992/11    ?
 Nostalgia 1907                                                Sur de Wave                       1992/5     CD
-Noushuku Angel 120%                                           Cocktail Soft                     1995/4     SET(CD+FD)
 Noyama no Kensakuka                                           Fujitsu Social Science Laboratory 1995/3     CD
 O Hoshi Senjutsu Daireigen                                    Victor Entertainment              1990/2     CD
 Obaachan no Chiebukuro                                        Gyousei                           1991/11    CD
@@ -504,7 +488,6 @@
 Primary Health Care System                                    Raison                            1990/9     CD
 Princess Danger                                               Janis                             1996/4     CD
 Private Slave                                                 Raccoon                           1993/8     SET(CD+FD)
-Pro Student G Renkaban                                        Alice Soft                        1995/4     CD
 Psychic Detective Series Vol. 1: Invitation: Kage kara no Shoutaijou (Remake)   Data West                         1993/11    SET(CD+FD)
 Psychic Detective Series Vol. 2: Memories (Remake)            Data West                         1994/4     SET(CD+FD)
 Psychic Detective Series Vol. 3: Aya (Remake)                 Data West                         1994/7     SET(CD+FD)
@@ -539,8 +522,8 @@
 Sanseido Word Hunter Multi CD-ROM Jiten                       Fujitsu                           1991/10    CD
 Sayonara no Mukougawa                                         Foster                            1997/8     CD
 School Accessory Illust-hen V1.0                              Fujitsu                           1993/2     CD
-School Navi Nihon no Rekishi CD: Heian, Kamakura             Unitybell                         1995/8     CD
-School Navi Nihon no Rekishi CD: Kodai, Asuka-Nara           Unitybell                         1995/7     CD
+School Navi Nihon no Rekishi CD: Heian, Kamakura              Unitybell                         1995/8     CD
+School Navi Nihon no Rekishi CD: Kodai, Asuka-Nara            Unitybell                         1995/7     CD
 School Navi Nihon no Rekishi CD: Azuchi-Momoyama, Edo         Unitybell                         1995/9     CD
 School Navi Nihon no Rekishi CD: Meiji, Gendai                Unitybell                         1995/9     CD
 School-Ace Alpha HG Sensei-you                                Fujitsu                           1994/7     SET(CD+FD)
@@ -559,7 +542,6 @@
 Sexy PK World Cup Ban                                         Birdy Soft                        1995/6     CD
 Shadow of the Beast: Mashou no Okite (1991-10-11)             Victor Entertainment              1991/10?   CD
 Shakaika Database: Nihon no Bunka / Sangyou / Shizen          Nihon Kyouiku System              1991/12    CD
-Shamhat: The Holy Circlet (Marty-ban)                         Data West                         1993/4     SET(CD+FD)
 Shanghai: Banri no Choujou                                    Electronic Arts Victor            1995/9     CD
 Shijou Saikyou no Video Bible                                 System Sacom                      1989/12    CD
 Shiki wo Irodoru Nihon no Shouka: Aki-hen                     Toshiba EMI                       1991/10    CD
@@ -611,7 +593,6 @@
 Teata -vision- (V1.0-1.3)                                     Nanken Koubou                     1995/6     SET(CD+FD)
 Teitoku no Ketsudan                                           Koei                              1990/4     SET(CD+FD)
 Tender Light Vol. 1                                           Fujitsu                           1994/3     CD
-Tenjin Ranma                                                  Elf                               1992/5     SET(CD+FD)
 Tensai Kyuutei Ongaku no Kanade                               Fujitsu                           1992/12    CD
 Tensen Nyannyan                                               Ponytail Soft                     1994/9     CD
 Tenshi-tachi no Gogo 3: Bangai-hen Hanseiban                  JAST                              1993/3     ?
@@ -658,7 +639,6 @@
 Towns System Software V2.1 L30                                Fujitsu                           ?          CD
 Towns System Software V2.1 L31                                Fujitsu                           ?          CD
 Towns System Software V2.1 L40                                Fujitsu                           ?          CD
-Towns Telop                                                   Lambda System                     1989/5     SET(CD+FD)
 TownsFullcolor V1.1                                           Fujitsu                           1993/3     CD
 TownsGraph V1.1                                               Fujitsu                           1993/4     CD
 TownsGraph V2.1                                               Fujitsu                           1994/10    CD
@@ -673,10 +653,9 @@
 Towns-you Chuugakkou Gijutsu Kateika Kyouzai                  Uchida Youkou                     1994/3     CD
 Treeclub                                                      Fujitsu Parex                     1995/7     CD
 Trigger 2                                                     ZyX                               1995/9     CD
-True Heart                                                    Cocktail Soft                     1995/2     SET(CD+FD)
+* True Heart                                                  Cocktail Soft                     1995/2     SET(CD+FD)
 Tsubo Relaxation                                              Fujitsu Personal Computer Systems 1994/9     CD
 Twinkle Star                                                  Studio Twinkle                    1993/7     CD
-Two Shot Diary                                                Mink                              1994/10    CD
 Ujibushi no Chiiku Game                                       Nihon Keisoku Souchi              1994/4     CD
 Unmei no Tobira                                               Fujitsu                           1992/9     CD
 URM: 15 Wakusei ni Umarete                                    Japan Home Video (JHV)            1994/12    CD
@@ -687,13 +666,11 @@
 Vector Moji Pattern 2                                         Fujitsu                           1992/12    IC
 Video Koubou V1.1                                             Fujitsu                           1992/6     SET(CD+FD)
 Video Koubou V1.2                                             Fujitsu                           1993/4     CD
-* Video Koubou V1.3                                             Fujitsu                           1994/2     CD
-* Video Koubou V1.4                                             Fujitsu                           1995/11    SET(CD+FD)
+* Video Koubou V1.3                                           Fujitsu                           1994/2     CD
+* Video Koubou V1.4                                           Fujitsu                           1995/11    SET(CD+FD)
 VIP Ball                                                      CSK Research Institute (CRI)      1991/8     CD
 VIP Tone                                                      CSK Research Institute (CRI)      1991/9     CD
 VIPER GTS                                                     Sogna                             1995/11    CD
-VIPER V12                                                     Sogna                             1995/12    CD
-VIPER V8 Turbo RS                                             Sogna                             1995/6     CD
 * Virtuacall 2                                                Fairytale                         1995/12    SET(CD+FD)
 Virtual Tours V1.0                                            Fujitsu                           1995/1     SET(CD+FD)
 Watashi no Tsukue                                             GAM                               1994/9     SET(CD+FD)
@@ -713,7 +690,6 @@
 Yasashii Chuugokugo                                           SofMedia                          1990/12    CD
 Yawahada Bishoujo                                             Illusion                          1995/3     CD
 Yellows                                                       Digital Rogue                     1994/12    CD
-Yes! HG                                                       Himeya Soft                       1995/12    CD
 Yoshioka Mayumi: Last Nude                                    Janis                             1993/12    CD
 Youki de Cool na LA Towns                                     Media Art                         1990/12    CD
 Yumeutsutsu                                                   Megami                            1992/5     CD
@@ -1163,6 +1139,26 @@
 		</part>
 	</software>
 
+	<software name="2shot">
+		<!--
+		Origin: redump.org
+		<rom name="Two Shot Diary (Japan).bin" size="126674016" crc="21f35608" sha1="d4fa738d07619eaced3e509b64a5d6b71ac62ac0"/>
+		<rom name="Two Shot Diary (Japan).cue" size="88" crc="a9278e47" sha1="43ed5b96a2a2a157ca7518495aa43d30d238a2d3"/>
+		-->
+		<description>Two Shot Diary</description>
+		<year>1994</year>
+		<publisher>ミンク (Mink)</publisher>
+		<info name="serial" value="MTC-1116"/>
+		<info name="alt_title" value="ツー・ショット　Ｄｉａｒｙ" />
+		<info name="release" value="199410xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="two shot diary (japan)" sha1="c8fe6e8f1f6799e31ae7f5f93fb1d62098605b8b" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="3x3eyes">
 		<!--
 		Origin: redump.org
@@ -1244,11 +1240,36 @@
 
 	<software name="4dtennis">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="4D Tennis.ccd" size="5869" crc="6287f51f" sha1="49c79b3496465cf35eb46c8f2d4e4bb7d13baf00"/>
-		<rom name="4D Tennis.cue" size="1145" crc="c0bb25ae" sha1="de404e98b76891fcaf5070f526e290d945d13365"/>
-		<rom name="4D Tennis.img" size="79031904" crc="6107a3ea" sha1="a53b7bb8b30ade50d9d076d080adb62059ecdf42"/>
-		<rom name="4D Tennis.sub" size="3225792" crc="1239c112" sha1="434cfbd5edc000dc2c6432bf4a5697b5d9e75109"/>
+		Origin: redump.org
+		<rom name="4D Tennis (Japan) (Track 01).bin" size="10231200" crc="0aa6ed1a" sha1="1b4aab3b82894befdaf97508ed26eb2eb156575c"/>
+		<rom name="4D Tennis (Japan) (Track 02).bin" size="11247264" crc="a2a7f636" sha1="3313531a6ff3e6e5d0a002dc2ff02c37a7547a66"/>
+		<rom name="4D Tennis (Japan) (Track 03).bin" size="26601120" crc="2881bace" sha1="d2d6b82c3b2d2c39b5f5edd8095c2dc53374beb1"/>
+		<rom name="4D Tennis (Japan) (Track 04).bin" size="1241856" crc="e65a82c8" sha1="ebc8386bc02c452bbf14bc654b02bf517a2579f1"/>
+		<rom name="4D Tennis (Japan) (Track 05).bin" size="1234800" crc="4a2b1b54" sha1="b5def19b86b2083ce7f2b6090130ae84d26e4eac"/>
+		<rom name="4D Tennis (Japan) (Track 06).bin" size="1239504" crc="06b46b49" sha1="1579aa2277c92ac74ce00382a07ecc20abcc2a35"/>
+		<rom name="4D Tennis (Japan) (Track 07).bin" size="1234800" crc="5838c7d3" sha1="52178e886ec50a4fbac501b614e84d9146d7a2aa"/>
+		<rom name="4D Tennis (Japan) (Track 08).bin" size="1234800" crc="0888376c" sha1="54a2d5552ddacf15458ec751850130a6a1111e24"/>
+		<rom name="4D Tennis (Japan) (Track 09).bin" size="1183056" crc="e6a700af" sha1="756cc051e236b0983cea4b06dafd9a2cf7007941"/>
+		<rom name="4D Tennis (Japan) (Track 10).bin" size="1234800" crc="f919abd6" sha1="5eb5afb696a451dc03491ca493a839179f585db5"/>
+		<rom name="4D Tennis (Japan) (Track 11).bin" size="1180704" crc="0a9bcd0f" sha1="046bd796b7a91b5b520e0dde48cc263ce72f9bfa"/>
+		<rom name="4D Tennis (Japan) (Track 12).bin" size="1241856" crc="264cf2af" sha1="918c04ff59e9fccb5a7be296064089dc906cd780"/>
+		<rom name="4D Tennis (Japan) (Track 13).bin" size="1234800" crc="37bb36a8" sha1="f46caf76b1d6654d93022b8cec4a980ce36a0d47"/>
+		<rom name="4D Tennis (Japan) (Track 14).bin" size="1239504" crc="ba13030b" sha1="c12c76eb68c8669be944bb498f7cb960bc39fc57"/>
+		<rom name="4D Tennis (Japan) (Track 15).bin" size="1234800" crc="bcf35808" sha1="9360f6a6b42db6f770cb7b53f4186f4fabeb7d4b"/>
+		<rom name="4D Tennis (Japan) (Track 16).bin" size="1234800" crc="a86cec98" sha1="032f0c80c270433a981df48531fb0ebcb3b38f7d"/>
+		<rom name="4D Tennis (Japan) (Track 17).bin" size="1241856" crc="03007776" sha1="dd8a8a9b952e016da00dce60bfa0dab35db35aae"/>
+		<rom name="4D Tennis (Japan) (Track 18).bin" size="1234800" crc="134b657b" sha1="a4742803af5992f7fc6952be7f327e96bb488516"/>
+		<rom name="4D Tennis (Japan) (Track 19).bin" size="1239504" crc="aa360a34" sha1="1b395b0cabf3a8064538734ced14d2aae7d86415"/>
+		<rom name="4D Tennis (Japan) (Track 20).bin" size="1187760" crc="ee8beabb" sha1="35eeb2337c41c46ba05200b49243b504e91666f9"/>
+		<rom name="4D Tennis (Japan) (Track 21).bin" size="1241856" crc="7e96e3d8" sha1="38317f4e2574c367778872bcc9ed39966287dde8"/>
+		<rom name="4D Tennis (Japan) (Track 22).bin" size="1234800" crc="312fee49" sha1="234ede1a2e6e825bfa14c4181399d3e2942bbdde"/>
+		<rom name="4D Tennis (Japan) (Track 23).bin" size="1239504" crc="f737d3af" sha1="e29fda2240ee89232ddbd3666176d4091f7da1ba"/>
+		<rom name="4D Tennis (Japan) (Track 24).bin" size="1234800" crc="be087de3" sha1="1e8611e875a8a211ba1d865fc8e353e3fa0041d5"/>
+		<rom name="4D Tennis (Japan) (Track 25).bin" size="1234800" crc="89fa78e7" sha1="c98ca7fb446a3a0c7b3d17bb55665187038cecfd"/>
+		<rom name="4D Tennis (Japan) (Track 26).bin" size="1241856" crc="59f63f6b" sha1="99ef56684f1af8dae0914cea18e7fa2f6c8c994e"/>
+		<rom name="4D Tennis (Japan) (Track 27).bin" size="1234800" crc="7f7d8afc" sha1="2f2f137c6486306328e8543c5d6ee5b59ca3f1e6"/>
+		<rom name="4D Tennis (Japan) (Track 28).bin" size="1415904" crc="d091faf7" sha1="4e50905a6015b889cf6a93e76fca53667fdc6a2a"/>
+		<rom name="4D Tennis (Japan).cue" size="3118" crc="8945fc99" sha1="1843e657d09f76b10ce8f9326778b878c4619992"/>
 		-->
 		<description>4D Tennis</description>
 		<year>1993</year>
@@ -1259,7 +1280,7 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="4d tennis" sha1="5ee1a3342469e87bc0f1d613982a92bc8ab5c5bb" />
+				<disk name="4d tennis (japan)" sha1="1ddcaee84631b1f5ace7dd60d8b4c7415ed4d789" />
 			</diskarea>
 		</part>
 	</software>
@@ -2001,13 +2022,56 @@
 		</part>
 	</software>
 
+	<software name="akikoprm">
+		<!--
+		Origin: redump.org
+		<rom name="Hyper Girl - Akiko - Premium Version (Japan) (Track 1).bin" size="20815200" crc="c33b7c72" sha1="3ea2792cc94a1dcf76cae4f13b360c2ca39c5e0f"/>
+		<rom name="Hyper Girl - Akiko - Premium Version (Japan) (Track 2).bin" size="55918800" crc="21e4a5a4" sha1="00d219297d4ed029ff384f864bd4fa70fdff6de4"/>
+		<rom name="Hyper Girl - Akiko - Premium Version (Japan) (Track 3).bin" size="58741200" crc="986d52ac" sha1="26655aee034477fe252bd6a87a3d8432839fed83"/>
+		<rom name="Hyper Girl - Akiko - Premium Version (Japan) (Track 4).bin" size="50626800" crc="c5244662" sha1="4c80f16077c88672d5b0c8eec2894b886c80e07e"/>
+		<rom name="Hyper Girl - Akiko - Premium Version (Japan) (Track 5).bin" size="42159600" crc="7b7d6491" sha1="504f02113cd07a2374fd4173d18fc050740df4fd"/>
+		<rom name="Hyper Girl - Akiko - Premium Version (Japan) (Track 6).bin" size="58388400" crc="562422e9" sha1="2943e7927d2c6e05c6a5bb98e9fd5e3e4aef9dc7"/>
+		<rom name="Hyper Girl - Akiko - Premium Version (Japan) (Track 7).bin" size="40042800" crc="89fe15d8" sha1="c672babd51af7d9e4f30c6614ec715ea23333714"/>
+		<rom name="Hyper Girl - Akiko - Premium Version (Japan) (Track 8).bin" size="37044000" crc="e395458d" sha1="e6908ae26c8628f466216275c3d8a64881901e1f"/>
+		<rom name="Hyper Girl - Akiko - Premium Version (Japan) (Track 9).bin" size="47628000" crc="316fd55f" sha1="6e0deccb28f3c325b8642df713b3fa63e9ca9712"/>
+		<rom name="Hyper Girl - Akiko - Premium Version (Japan).cue" size="1224" crc="564a7f99" sha1="d076e57aa73bb683832378130d344d894df47888"/>
+		-->
+		<description>Akiko - Premium Version</description>
+		<year>1993</year>
+		<publisher>フェアリーテール (Fairytale)</publisher>
+		<info name="serial" value="HME-121"/>
+		<info name="alt_title" value="亜紀子 プレミアム・バージョン" />
+		<info name="release" value="199303xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="hyper girl - akiko - premium version (japan)" sha1="fa1b72c5b4a0ca23a32dd9f6004ea163d4578968" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="alshark">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Alshark.ccd" size="4251" crc="c524a687" sha1="f7bfdc54de0930b263bb61bb1d313bdda14c7965"/>
-		<rom name="Alshark.cue" size="1100" crc="5eecf316" sha1="ab1d4bd49d9160fad9b9436f4b44494c03a0a845"/>
-		<rom name="Alshark.img" size="615636000" crc="a08e556c" sha1="685957bbf39071e56c23942792abb644f9083cce"/>
-		<rom name="Alshark.sub" size="25128000" crc="2d22213c" sha1="a556b64fec250576047b0cd376ce37c830ce7495"/>
+		Origin: redump.org
+		<rom name="Alshark (Japan) (Track 01).bin" size="20815200" crc="953bbbc2" sha1="08421ceb85585f2818c93e2550939824b90fea64"/>
+		<rom name="Alshark (Japan) (Track 02).bin" size="17816400" crc="b10ba3e4" sha1="f031dd8f27f477007b7276d3755c01171c79573a"/>
+		<rom name="Alshark (Japan) (Track 03).bin" size="19051200" crc="4c9a8815" sha1="be4cb00c8259a11f4d509f15aee637e75dd695da"/>
+		<rom name="Alshark (Japan) (Track 04).bin" size="13935600" crc="a31739ec" sha1="c9a88709222b9a29366fea9655a8347edd88a168"/>
+		<rom name="Alshark (Japan) (Track 05).bin" size="15170400" crc="0094f4f0" sha1="953cbd348d1c702c7a1b9354c863c4eb85491ada"/>
+		<rom name="Alshark (Japan) (Track 06).bin" size="37220400" crc="c962622c" sha1="ea5fa1ec47fbb96baafbc4730cba89440a593a0d"/>
+		<rom name="Alshark (Japan) (Track 07).bin" size="22755600" crc="ca5c0edd" sha1="f4b3e414f3e7d1eec0e10224004251133b568dc2"/>
+		<rom name="Alshark (Japan) (Track 08).bin" size="23284800" crc="ec56c826" sha1="502bf25af1a1b55b1b9db40b0eaa75219d8fe397"/>
+		<rom name="Alshark (Japan) (Track 09).bin" size="14112000" crc="0759d6d5" sha1="1f55abb8fa0876bfcd1006d18dde20dca7071cbc"/>
+		<rom name="Alshark (Japan) (Track 10).bin" size="20815200" crc="3bede9e6" sha1="e73055cfbf995703bb712263997b865f9b353998"/>
+		<rom name="Alshark (Japan) (Track 11).bin" size="16758000" crc="31ede800" sha1="4175c506d14d35a7247fdb7bb2d1f6cf7ad3ced0"/>
+		<rom name="Alshark (Japan) (Track 12).bin" size="17992800" crc="eeb9bec1" sha1="fd093564ce2d0c859c1ce670dc7dbe7862b07e7a"/>
+		<rom name="Alshark (Japan) (Track 13).bin" size="26460000" crc="63723a70" sha1="f6035435f37942f29c4b73c5b804e6e1fc708506"/>
+		<rom name="Alshark (Japan) (Track 14).bin" size="66150000" crc="fb49c3c8" sha1="6ab102606530ce5f1b763cda7a07cce1747dc3bb"/>
+		<rom name="Alshark (Japan) (Track 15).bin" size="31046400" crc="12343aab" sha1="f2694e26a690d3470ea142724df6f74ac973ba4b"/>
+		<rom name="Alshark (Japan) (Track 16).bin" size="60858000" crc="d6fe0d37" sha1="0ff527b39f8b7c4b4c3d05ce3b0389e0a4308de4"/>
+		<rom name="Alshark (Japan) (Track 17).bin" size="47628000" crc="ec6f4a41" sha1="cc67f4dace3951fb2d4c3c1de7ff9ea6cdd86665"/>
+		<rom name="Alshark (Japan) (Track 18).bin" size="143766000" crc="8c07e919" sha1="53d3e2d61af1f6b882d8ff8052ae939ff082f352"/>
+		<rom name="Alshark (Japan).cue" size="1985" crc="930f1e41" sha1="ff9e7eab7676130ca0880130ed8d058222a7ca29"/>
 		-->
 		<description>Alshark</description>
 		<year>1993</year>
@@ -2018,7 +2082,7 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="alshark" sha1="ecbdc6dead64d45836037a341bfd49332c7f8e29" />
+				<disk name="alshark (japan)" sha1="99c36574a3826e2cbdece7271012314b425e090b" />
 			</diskarea>
 		</part>
 	</software>
@@ -2251,11 +2315,25 @@
 
 	<software name="arabesq">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Arabesque.ccd" size="3266" crc="4bf6d3b1" sha1="611ac34cbd65fcbc4cee3fc2c9681b1e602e7c6b"/>
-		<rom name="Arabesque.cue" size="1115" crc="9c89fc40" sha1="e98b9b24baa65eeddae1fbb2905ecd7554bd8e4a"/>
-		<rom name="Arabesque.img" size="584413200" crc="b9abe5c0" sha1="3f7494d07e9ef8493e801932e3ae39f334b43824"/>
-		<rom name="Arabesque.sub" size="23853600" crc="01f20a90" sha1="c244dedc2946a534932aed7d886fb3f56ab38c9f"/>
+		Origin: redump.org
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 01).bin" size="20815200" crc="d0dde34d" sha1="72d5c9e6e578a2e0faf63ca7088d7673f050b145"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 02).bin" size="44805600" crc="54efca78" sha1="2cd283b0445590468c92cca1a0888e38c22d6bd1"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 03).bin" size="43041600" crc="6e8cb4cf" sha1="10310413729403cba1393978d80f354039d1b68b"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 04).bin" size="42688800" crc="e769f894" sha1="b29db1472b297d0f5bff1a4da30377ede9413406"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 05).bin" size="40924800" crc="198d69d0" sha1="5bbeed797686229cc9280d68389c4c80325c2e78"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 06).bin" size="41806800" crc="f7e84a8e" sha1="515b961b154925eedcb5dde0452b9079860d9598"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 07).bin" size="42688800" crc="4cba1c3c" sha1="bddd6ce21bb9ae0b2234d67870f1b27deda34687"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 08).bin" size="40924800" crc="1cd8b7d6" sha1="019f380205c433b031fd52e3fcb017a0d83b447c"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 09).bin" size="44629200" crc="ad1fe0d5" sha1="fe77dc55b1340bfcba41ab87877508a2f9dc21dd"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 10).bin" size="40924800" crc="09ecdada" sha1="1be708b134482bf68354cec47826cce5f405cfea"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 11).bin" size="43570800" crc="786b2389" sha1="ee423d23209f3370d040bfbef59632e691c13202"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 12).bin" size="42512400" crc="106d3c3f" sha1="0cc9c4c7d07ea0a43581af02f633c4afb8b32690"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 13).bin" size="46393200" crc="cae41412" sha1="6edc0485993043390a91e5c94c5ced1e0e4fcaa2"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 14).bin" size="2293200" crc="3c56dfd3" sha1="b0f9277f443643c2389e03f4e5c5c406e658e020"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 15).bin" size="1587600" crc="e4b02e95" sha1="78c36b55cc5d6f72a3e16f83ecf89ec7bd628feb"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 16).bin" size="2293200" crc="4c22c63a" sha1="be32733bd034d57502dae57c32fb76bbb0cd41fd"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan) (Track 17).bin" size="42512400" crc="966a7b42" sha1="7a3b90590b4b5bcfe4ba1ab6f06da26b6a13e58f"/>
+		<rom name="Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari (Japan).cue" size="2617" crc="02f4118f" sha1="cca26382434d5123921b62bb958cf4983dfaad83"/>
 		-->
 		<description>Arabesque - Shoujo-tachi no Orinasu Ai no Monogatari</description>
 		<year>1994</year>
@@ -2266,7 +2344,7 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="arabesque" sha1="5869c0c1d2eee0f551722a7d08d7feef6be53868" />
+				<disk name="arabesque - shoujo-tachi no orinasu ai no monogatari (japan)" sha1="c9474eff1c7e6d5078bb2b8ce6df8b176075bd3d" />
 			</diskarea>
 		</part>
 	</software>
@@ -2335,11 +2413,14 @@
 
 	<software name="atlas">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="The Atlas.ccd" size="1536" crc="7baa5573" sha1="30db8d77f0a80e951185804b12be324f112eacf8"/>
-		<rom name="The Atlas.cue" size="7587" crc="f14077fc" sha1="dc949e3d6fe998d047417b1778b4cefd88cfa240"/>
-		<rom name="The Atlas.img" size="707540400" crc="85ae7606" sha1="26437d18b6220e8db8f246671f191cf0241bd556"/>
-		<rom name="The Atlas.sub" size="28879200" crc="d5787c1f" sha1="b7d236402ba5b766f203718feb196619a7637f8c"/>
+		Origin: redump.org
+		<rom name="Atlas, The (Japan) (Track 1).bin" size="10231200" crc="47f34c41" sha1="606ad06ef515cebc3d74849d7aa44d0ac063e9fa"/>
+		<rom name="Atlas, The (Japan) (Track 2).bin" size="160112400" crc="b18ee89c" sha1="1cd17e23e75044e99006481a66e363e55e96e698"/>
+		<rom name="Atlas, The (Japan) (Track 3).bin" size="159524400" crc="e7b3f8e3" sha1="5d539d831f57379c1f3d35351b5a01abd3b9669c"/>
+		<rom name="Atlas, The (Japan) (Track 4).bin" size="159759600" crc="93c02683" sha1="1cbe667afa7699bb51a0c8d54bc81787a68946c0"/>
+		<rom name="Atlas, The (Japan) (Track 5).bin" size="159642000" crc="28354b4c" sha1="cc809754ff84a354de283b7bc22e6335fd3457e6"/>
+		<rom name="Atlas, The (Japan) (Track 6).bin" size="58270800" crc="6f7d7035" sha1="3096be48c7241abdc4d2dbf6410547ec4185f1fd"/>
+		<rom name="Atlas, The (Japan).cue" size="7830" crc="86b2b9b9" sha1="7626223f525ee46e5df396a3b6a4816bf95f8b40"/>
 		-->
 		<description>The Atlas</description>
 		<year>1991</year>
@@ -2350,7 +2431,7 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="the atlas" sha1="31378695a7eb7fe953e51463829468f214f2a2f4" />
+				<disk name="atlas, the (japan)" sha1="576d2ac0f7af32ef5b8bffb5d7e1b1378263c9fc" />
 			</diskarea>
 		</part>
 	</software>
@@ -2433,11 +2514,9 @@
 
 	<software name="ayumi">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Ayumi-chan Monogatari.ccd" size="751" crc="07695447" sha1="ab5e786148d9271297215724891d159f82ebfbf4"/>
-		<rom name="Ayumi-chan Monogatari.cue" size="103" crc="97e8d9b5" sha1="7b862c32e6509decbf691fce5db0a7de8cc34c46"/>
-		<rom name="Ayumi-chan Monogatari.img" size="67737600" crc="fbddbc97" sha1="5eff9ba669a7ff75572b70654a83d001baa7f012"/>
-		<rom name="Ayumi-chan Monogatari.sub" size="2764800" crc="76b91a7c" sha1="1a7b8b6d3342d3732f85e3284492418fad91e482"/>
+		Origin: redump.org (CD) / Neo Kobe Collection (floppy)
+		<rom name="Ayumi-chan Monogatari (Japan).bin" size="67737600" crc="fbddbc97" sha1="5eff9ba669a7ff75572b70654a83d001baa7f012"/>
+		<rom name="Ayumi-chan Monogatari (Japan).cue" size="95" crc="8cc50273" sha1="f40912f1b7aa1d9371a0c62db0379c6c4e6183a4"/>
 		-->
 		<description>Ayumi-chan Monogatari</description>
 		<year>1993</year>
@@ -2446,14 +2525,13 @@
 		<info name="release" value="199310xx" />
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="flop1" interface="floppy_3_5">
-			<feature name="part_id" value="Boot Disk?" />
 			<dataarea name="flop" size="1261568">
 				<rom name="ayumi-chan monogatari.hdm" size="1261568" crc="9bf209ba" sha1="cc2be00834492b0ccf5b25a1b0a5ceb810a2e330" offset="000000" />
 			</dataarea>
 		</part>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="ayumi-chan monogatari" sha1="b4adc7cb1f2f74f8beea76afb930d053addea67e" />
+				<disk name="ayumi-chan monogatari (japan)" sha1="d2fe72822ec0e7fbf5d4b0b8ce30b8ad79fed459" />
 			</diskarea>
 		</part>
 	</software>
@@ -2930,13 +3008,15 @@
 
 	<software name="branmar2">
 		<!--
-		Origin: Neo Kobe Collection (Game Disc), DamienD / Tokugawa Corporate Forums (Extra Disc)
-		<rom name="Branmarker 2 (Game disc).ccd" size="1152" crc="5a5c5567" sha1="9201413c9a0109f0ebe03a99e35e01d18c9a09a5"/>
-		<rom name="Branmarker 2 (Game disc).cue" size="166" crc="760286da" sha1="961a4db20766d03f437819c33849c90370b9edf5"/>
-		<rom name="Branmarker 2 (Game disc).img" size="479575152" crc="8e722dbd" sha1="1bfa442a34d21ae2d37ca33d6a703a754e77cdb5"/>
-		<rom name="Branmarker 2 (Game disc).sub" size="19574496" crc="51b2a7ea" sha1="e527977f203bbe6f2b9ea25a617d450521e2bc2d"/>
-		<rom name="ブランマーカー2・エクストラディスク.img" size="726325824" crc="b9324800" sha1="295e3206778ab260c41478339cf8d4c3c981b980"/>
-		<rom name="ブランマーカー2・エクストラディスク.cue" size="206" crc="dc15aca7" sha1="9c4796da1de799894e9df7bd2a9985ffa370cc52"/>
+		Origin: redump.org
+		<rom name="Branmarker 2 (Japan) (Game Disc) (Track 1).bin" size="371159712" crc="df2701fe" sha1="ecc0d8153e5b476e1692a33e61f0cea18c8a7cce"/>
+		<rom name="Branmarker 2 (Japan) (Game Disc) (Track 2).bin" size="54495840" crc="d6fea193" sha1="26dfee2e39be02968294b0fa2c304dd69bde4bc5"/>
+		<rom name="Branmarker 2 (Japan) (Game Disc) (Track 3).bin" size="53919600" crc="932ba984" sha1="8b143a0c7f1f44038c71a84df064e98c87a9dde9"/>
+		<rom name="Branmarker 2 (Japan) (Game Disc).cue" size="337" crc="049ba1fe" sha1="1c65dbd4898a0c483ee92e87cc2d9d0fa81996b7"/>
+		<rom name="Branmarker 2 (Japan) (Extra Disc) (Track 1).bin" size="482889120" crc="ae31a549" sha1="9f4ca18f2ba133534dd7a150e248398fe9cf5151"/>
+		<rom name="Branmarker 2 (Japan) (Extra Disc) (Track 2).bin" size="209972448" crc="dca6cf1c" sha1="d2125cf9cdd51d66f6af23dc9d8a3c16c2b5000d"/>
+		<rom name="Branmarker 2 (Japan) (Extra Disc) (Track 3).bin" size="33464256" crc="115ae1b1" sha1="fd3ed992993023660b1aedae0b1659e6efa80ee5"/>
+		<rom name="Branmarker 2 (Japan) (Extra Disc).cue" size="340" crc="b9c8fbc2" sha1="715fa4406d6ede1cdfbd02f7aac0fa3a6e4205ba"/>
 		-->
 		<description>Branmarker 2</description>
 		<year>1995</year>
@@ -2947,13 +3027,13 @@
 		<part name="cdrom1" interface="fmt_cdrom">
 			<feature name="part_id" value="Game Disc" />
 			<diskarea name="cdrom">
-				<disk name="branmarker 2" sha1="b7a41a36bf83c293defa929dd8b2daea961cd3aa" />
+				<disk name="branmarker 2 (japan) (game disc)" sha1="242b3fd57b45e08f29fba516257821ad7f132152" />
 			</diskarea>
 		</part>
 		<part name="cdrom2" interface="fmt_cdrom">
 			<feature name="part_id" value="Extra Disc" />
 			<diskarea name="cdrom">
-				<disk name="branmarker 2 extra disc" sha1="8845dd975d20f8d9756b0c5d1859ef7bfd79b21d" />
+				<disk name="branmarker 2 (japan) (extra disc)" sha1="755865e904bf3ee527c629a45cea052f7bb10f5b" />
 			</diskarea>
 		</part>
 	</software>
@@ -3025,11 +3105,10 @@
 
 	<software name="cal">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Cal Towns.ccd" size="953" crc="d6cfe9dd" sha1="e4938344d6242ec8efb79fe5307c55445c7668e9"/>
-		<rom name="Cal Towns.cue" size="112" crc="33ae2e5e" sha1="0672f7eec1748d724095b7d4512b2a94cd9c29ec"/>
-		<rom name="Cal Towns.img" size="59976000" crc="28cf5f0f" sha1="2cf85b59d3a2f5d28fd0267f998389570ef00107"/>
-		<rom name="Cal Towns.sub" size="2448000" crc="764fd5c3" sha1="580edbcef27d5935b83583209ad480d09dc7e52a"/>
+		Origin: redump.org
+		<rom name="CAL - Towns (Japan) (Track 1).bin" size="20815200" crc="3f16c619" sha1="3a1854fce04ba70f778754fff21973366e6b246b"/>
+		<rom name="CAL - Towns (Japan) (Track 2).bin" size="39160800" crc="8593c96b" sha1="4d8b2553c3e41dbf55a0beebd1a2ab286930b5f2"/>
+		<rom name="CAL - Towns (Japan).cue" size="231" crc="17fb6eb8" sha1="fd7c3e1bd38e1e69b99927e275dfaa8622e53877"/>
 		-->
 		<description>Cal Towns</description>
 		<year>1992</year>
@@ -3039,7 +3118,28 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="cal towns" sha1="ab905889b8a3edfd7cdfe51c728d017f257e34f7" />
+				<disk name="cal - towns (japan)" sha1="26747efe7dc470bd04af3872c257a670991498e7" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="cal3">
+		<!--
+		Origin: redump.org
+		<rom name="CAL III - Kanketsu-hen (Japan) (Track 1).bin" size="20815200" crc="e7a4625b" sha1="5573990abfbd401f7dc0e6891df05fb661d0204e"/>
+		<rom name="CAL III - Kanketsu-hen (Japan) (Track 2).bin" size="132311760" crc="bfabb97c" sha1="f65dea1be7ce6d5102e2ca19fbe43026b9cac1c7"/>
+		<rom name="CAL III - Kanketsu-hen (Japan).cue" size="253" crc="58fc56bd" sha1="af62c3ec2f8f9c0db1674b8d02b99f01e265012f"/>
+		-->
+		<description>Cal III - Kanketsu-hen</description>
+		<year>1993</year>
+		<publisher>バーディーソフト (Birdy Soft)</publisher>
+		<info name="alt_title" value="キャルⅢ　完結編" />
+		<info name="serial" value="HME-243"/>
+		<info name="release" value="199307xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="cal iii - kanketsu-hen (japan)" sha1="7adce4023f809277ce4309b8f285159b921589ba" />
 			</diskarea>
 		</part>
 	</software>
@@ -3291,6 +3391,53 @@
 		</part>
 	</software>
 
+	<software name="chiemi">
+		<!--
+		Origin: redump.org / wiggy2k
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 01).bin" size="31399200" crc="286527ae" sha1="546c782bf12f9d2d64c92204e3b53f19a12fd1c5"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 02).bin" size="23816352" crc="42619143" sha1="c1482839c418c8705e8ae73d3533c0ba7f98f7b0"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 03).bin" size="6174000" crc="0c91acac" sha1="d028c88815a1f0e9d2e70fb634f14101f490ab9d"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 04).bin" size="30870000" crc="5ce57017" sha1="443f512b65730a5d13bb26ceeda63300fb253e27"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 05).bin" size="30870000" crc="699eb0f1" sha1="948e6ece37165d1d336b5eb2260806912ec34dea"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 06).bin" size="40748400" crc="fdc102e0" sha1="49337a0b4fbd61c5c9400e12d93ccf891347ec1f"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 07).bin" size="27871200" crc="ff7de08d" sha1="1ba07789c6e3e2c84743d8bf0dca8a3c5965f281"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 08).bin" size="41101200" crc="06834f32" sha1="5235cc6c9bd04ebee2a5e0bde3b7f6b248bd407c"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 09).bin" size="27165600" crc="a3a89ad6" sha1="e10bf13c3384e6d8368b8446688e333319b4c4df"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 10).bin" size="35103600" crc="3d165d3c" sha1="b02ee7af8cfc74e8e2fc4ad725b3c599ec40bc31"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 11).bin" size="5821200" crc="d0740da8" sha1="70ca1a6786677463c7b942aecb37af8c05be79ef"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 12).bin" size="2469600" crc="6bc3a822" sha1="7f13602935ce28335ad806b08cc0be81680887c9"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 13).bin" size="1058400" crc="e0e9caeb" sha1="707eb37890638680247262bb36c3f5099af64992"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 14).bin" size="32810400" crc="be6b8c6c" sha1="7739e705be4a7e772b5b14bfb3c5624ba28cf06b"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 15).bin" size="31222800" crc="b58e2405" sha1="92c5a72d96f1f696f148e9923213cdd38b40ab81"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 16).bin" size="41277600" crc="ad6f2bf8" sha1="96d13571993b309204023af5f8b19ffd3177710c"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 17).bin" size="11642400" crc="dfa70b75" sha1="1e17c3307196ec0ef838cf7db46243c27c0c199d"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 18).bin" size="53802000" crc="da940b3d" sha1="cf9cd5b7dc4fa3421416ea66f1ef32cf8ac024fb"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 19).bin" size="30693600" crc="e292d51b" sha1="f52e8faf3ea2468f78cac37cbe7008d4c5e0bdb2"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 20).bin" size="1058400" crc="682b5602" sha1="5ac3ddcefe255704586ea634bc8a2078d10d81bb"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 21).bin" size="1587600" crc="3ac9ae1f" sha1="3616c0a7cc1ec336dc0d7fd40c7bb5c4d0a2f353"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 22).bin" size="1587600" crc="8f3f9ef8" sha1="c65ce38405157ed671253f3478d63e1c651a1d0b"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 23).bin" size="22932000" crc="6ef7fe0d" sha1="123112b8f2c7ae0fa7e1a84d7aecdfa5daa0330b"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 24).bin" size="1940400" crc="500763cd" sha1="b0abbabe9b29f9e626a89e30e3c8cbe7baba1f01"/>
+		<rom name="Chiemi &amp; Naomi (Japan).cue" size="2813" crc="5e8b2677" sha1="7f07cbe86e4eee8e3d9f2a4b5dc82f5f0deee491"/>
+		-->
+		<description>Chiemi &amp; Naomi</description>
+		<year>1993</year>
+		<publisher>フェアリーテール (Fairytale)</publisher>
+		<info name="serial" value="HME-244"/>
+		<info name="alt_title" value="稚恵美＆奈緒美" />
+		<info name="release" value="199312xx" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size="1261568">
+				<rom name="chiemi-and-naomi.hdm" size="1261568" crc="7b3706d4" sha1="a63be0d0426e54291586f8d246c4fab58630026d" offset="000000" />
+			</dataarea>
+		</part>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="chiemi &amp; naomi (japan)" sha1="dcdb4cccbce006739a1d48959fc7514441b2240c" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="chuumon">
 		<!--
 		Origin: P2P
@@ -3396,13 +3543,75 @@
 		</part>
 	</software>
 
+	<software name="curse">
+		<!--
+		Origin: redump.org
+		<rom name="Curse (Japan) (Track 01).bin" size="10231200" crc="e6370e13" sha1="8fa9210d6616a0b3a9221005d971bbb6c74da711"/>
+		<rom name="Curse (Japan) (Track 02).bin" size="28224000" crc="4949670d" sha1="5d330a9c7580a61d9a49e912efc2cb07dbee58a1"/>
+		<rom name="Curse (Japan) (Track 03).bin" size="27165600" crc="1cdab61c" sha1="f58d139e740249df23a3fe94521ed912c8d7e75d"/>
+		<rom name="Curse (Japan) (Track 04).bin" size="23108400" crc="c5cf0269" sha1="1389aebcdf96f78af1189f2ca730acebe5c6d564"/>
+		<rom name="Curse (Japan) (Track 05).bin" size="21168000" crc="027befcc" sha1="67cd1ddfe296ab358346b90ef9e3bd7cd3a0018e"/>
+		<rom name="Curse (Japan) (Track 06).bin" size="26107200" crc="2e93ca3a" sha1="484a59c1f288013e61ae3960a09e5eb5efb04f34"/>
+		<rom name="Curse (Japan) (Track 07).bin" size="25754400" crc="6519ce69" sha1="65ad3f5cd51aa94672ff494fba231c72dd01c874"/>
+		<rom name="Curse (Japan) (Track 08).bin" size="25048800" crc="57a9e4ca" sha1="4a03d36ffb5e3351ffca2485de314f811fa280a4"/>
+		<rom name="Curse (Japan) (Track 09).bin" size="26283600" crc="80cffb30" sha1="7948b0908a6c42bdfb9c97cb6358ad5dba314fff"/>
+		<rom name="Curse (Japan) (Track 10).bin" size="27694800" crc="16ba096d" sha1="fa562d99b24738f12c27ff4a0a2816ac37bbc7fc"/>
+		<rom name="Curse (Japan) (Track 11).bin" size="26636400" crc="43bf708d" sha1="547a0165d2200bd3d6a0bb967868afde712f2637"/>
+		<rom name="Curse (Japan) (Track 12).bin" size="25578000" crc="a66b2005" sha1="859a08c57e167637dce780c6ee815c940b3e584a"/>
+		<rom name="Curse (Japan) (Track 13).bin" size="22402800" crc="a83319a7" sha1="c241360adec7d5da141cf2ffdd8639e6bcb0b1b3"/>
+		<rom name="Curse (Japan) (Track 14).bin" size="22402800" crc="3426d09e" sha1="929a3f509fb632bc514be49d911936cdf5a4398f"/>
+		<rom name="Curse (Japan) (Track 15).bin" size="23990400" crc="c31eb350" sha1="d17f47b6f60eee84ae43773bcaa0982e493f5abf"/>
+		<rom name="Curse (Japan) (Track 16).bin" size="22579200" crc="16c23989" sha1="a50b66c6d54301134ab03e4815a1dfc5c89040c5"/>
+		<rom name="Curse (Japan) (Track 17).bin" size="26989200" crc="6d62621c" sha1="9ac177c4d9f2c8ba52cb8de80b0008e9f9c01c0d"/>
+		<rom name="Curse (Japan) (Track 18).bin" size="32986800" crc="6536ac15" sha1="02e380c734b8f63caec17ecedd6fef2748f05348"/>
+		<rom name="Curse (Japan) (Track 19).bin" size="30340800" crc="9bb2b8f8" sha1="ba52dc197188f25755b121ec5ecd0d275abc5a4a"/>
+		<rom name="Curse (Japan) (Track 20).bin" size="22932000" crc="39d7ee94" sha1="9bb05221d39a8f55c9d53a35949401acff62e4ca"/>
+		<rom name="Curse (Japan) (Track 21).bin" size="24343200" crc="59c9bee5" sha1="0db9d3318e53047ed3d346f0c015e79760f4b2b5"/>
+		<rom name="Curse (Japan) (Track 22).bin" size="2293200" crc="fb230e1d" sha1="19daea731fdff4e3f16b1a40f9ba248d350245b7"/>
+		<rom name="Curse (Japan) (Track 23).bin" size="1411200" crc="3991bfc5" sha1="84199fb9d1ce782cead13a2f69f8369ff3e74990"/>
+		<rom name="Curse (Japan) (Track 24).bin" size="1764000" crc="61a64e88" sha1="34c097633538c8a3f19494f8617f423ba61f3110"/>
+		<rom name="Curse (Japan) (Track 25).bin" size="21873600" crc="03d4c3c6" sha1="3bd28c1557ff2b041d1e236ba8d47bb5dd4d355b"/>
+		<rom name="Curse (Japan) (Track 26).bin" size="25225200" crc="eb04c08b" sha1="4b694d1bbf2ede7f60ef16491e2fd217a6e32a44"/>
+		<rom name="Curse (Japan) (Track 27).bin" size="24166800" crc="8fe1c429" sha1="3cc022d049f02f56d2ddf6b7e7d93e76243e7b1a"/>
+		<rom name="Curse (Japan) (Track 28).bin" size="46040400" crc="85e4b6a3" sha1="8b955c7481187e03d55cffcc7f571ab3457c59eb"/>
+		<rom name="Curse (Japan).cue" size="3006" crc="09f8ab57" sha1="275c7fbd825f1ee6bfad1ee42c4d2b2d1a700967"/>
+		-->
+		<description>Curse</description>
+		<year>1995</year>
+		<publisher>クィーンソフト (Queen Soft)</publisher>
+		<info name="serial" value="HMG-102 / QCD9502"/>
+		<info name="alt_title" value="カース" />
+		<info name="release" value="199502xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="curse (japan)" sha1="83e15d0ca514f344f4f059f289977b758f87e0a2" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="cm2itsuk">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Custom Mate 2 &amp; Itsuka dokoka de.ccd" size="4020" crc="eb37b9d9" sha1="47395b77c3fe7de2ac325e0c2463f560351be37b"/>
-		<rom name="Custom Mate 2 &amp; Itsuka dokoka de.cue" size="768" crc="a8faa951" sha1="c05a7f2e2d3ddda885bc16800787698ce1eba23b"/>
-		<rom name="Custom Mate 2 &amp; Itsuka dokoka de.img" size="477531264" crc="c7830bbe" sha1="8f95cbec78826c280d82bf2347d53bada974df74"/>
-		<rom name="Custom Mate 2 &amp; Itsuka dokoka de.sub" size="19491072" crc="c171c2e3" sha1="74b537a43e564d6df407b9fd43c1ddbda5603a05"/>
+		Origin: redump.org / wiggy2k
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 01).bin" size="20610576" crc="4dec490b" sha1="731ce1099139ceeeb7201e347cd2792a3f409271"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 02).bin" size="36164352" crc="35c40c78" sha1="1022d98e43b9422603685d9665d860b2d77225b5"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 03).bin" size="31229856" crc="fa3c547c" sha1="0469a8d015ea76a51520747de46f3d5b99c77819"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 04).bin" size="44807952" crc="8063e979" sha1="59fa6182a0948342d564a0b281910c5575618edd"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 05).bin" size="43984752" crc="0c7f6474" sha1="737a5181a8e9cc71ae5d91375cbe07535f2ebcce"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 06).bin" size="11854080" crc="cb2c5b63" sha1="7f615ff8f440efd0ce549927f3fd1625a08c9c13"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 07).bin" size="51776928" crc="5679504f" sha1="84322a5530cb46a984e4914ca922c1466aa80fe1"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 08).bin" size="20304816" crc="54ca92dc" sha1="a567c043ee848d7322c3c0d021ac44fd03f4f357"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 09).bin" size="1441776" crc="df089697" sha1="f07a880ea3edc9d32788c65d9581d456c88105ce"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 10).bin" size="22050000" crc="a49b06e6" sha1="67091896e0df33ec8bfe02ba635f146ced7c54e6"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 11).bin" size="19669776" crc="7c3d1017" sha1="807886c66e1c737e988a8881a23309cc2071071f"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 12).bin" size="31871952" crc="83e9162a" sha1="477bc0738881fc0a6ab102d3a08467e1a1159403"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 13).bin" size="45109008" crc="d9544545" sha1="571a8d0382919adb37033525e4f4a094591688af"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 14).bin" size="34753152" crc="1455518c" sha1="c999f4716a8c546e0a8f8d5b35c317225cf3f50d"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 15).bin" size="14116704" crc="24d440b0" sha1="24e76717849a5b606a241cc11778e32b17bf98a2"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 16).bin" size="1413552" crc="e51fb3a7" sha1="c7815d34e45463aba518ba94b9a1edfbaddc42ff"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 17).bin" size="23051952" crc="77db2c6d" sha1="93761f9872059472667cb4a092ce20927dcbac8f"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan) (Track 18).bin" size="23320080" crc="cc6cdbe8" sha1="d209ef89f1ecac14725e9d0aada727dd67ee6564"/>
+		<rom name="Custom Mate 2 + Itsuka Dokoka de (Japan).cue" size="2435" crc="21bfdf02" sha1="8a80a7fc4e635cc56322e318231a23461b2ca54e"/>
 		-->
 		<description>Custom Mate 2 &amp; Itsuka dokoka de</description>
 		<year>1995</year>
@@ -3411,14 +3620,13 @@
 		<info name="release" value="199508xx" />
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="flop1" interface="floppy_3_5">
-			<feature name="part_id" value="Save Disk" />
 			<dataarea name="flop" size="1261568">
-				<rom name="custom mate 2 &amp; itsuka dokoka de (save disk).hdm" size="1261568" crc="aead04fb" sha1="70197de9a7a138209b7e726063b5bca8f6534575" offset="000000" />
+				<rom name="custommate2.hdm" size="1261568" crc="7ea7f95a" sha1="23be34e523e56b51934b0428f4afeeda1243cdca" offset="000000" />
 			</dataarea>
 		</part>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="custom mate 2 &amp; itsuka dokoka de" sha1="c7671fa372beae381bb95728ac85793fd0a0ccc7" />
+				<disk name="custom mate 2 + itsuka dokoka de (japan)" sha1="99441d82ee2cd9f5f8e45e2a6fc7168646f98413" />
 			</diskarea>
 		</part>
 	</software>
@@ -4326,11 +4534,9 @@
 
 	<software name="dknight4">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Dragon Knight 4.ccd" size="767" crc="8bdfb40f" sha1="cb635633c22c5bc81e7f51006c7c319eceb316c3"/>
-		<rom name="Dragon Knight 4.cue" size="79" crc="896060d8" sha1="06a1ab4c07d51fd4ee67491a11fa0d0e1457461a"/>
-		<rom name="Dragon Knight 4.img" size="20815200" crc="4248f788" sha1="7a306ea8792d48b9ee1f952cf4246ea7e15b1e98"/>
-		<rom name="Dragon Knight 4.sub" size="849600" crc="4f418c0b" sha1="7017e03e20f31889be0af9456244aee7eaabd910"/>
+		Origin: redump.org
+		<rom name="Dragon Knight 4 (Japan).bin" size="20815200" crc="4248f788" sha1="7a306ea8792d48b9ee1f952cf4246ea7e15b1e98"/>
+		<rom name="Dragon Knight 4 (Japan).cue" size="89" crc="01711e23" sha1="0456e642e730a5fffdce67d4f66336e060f38567"/>
 		-->
 		<description>Dragon Knight 4</description>
 		<year>1994</year>
@@ -4341,7 +4547,7 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="dragon knight 4" sha1="a8ed04efe5e90c18de6c1a76fc73d730670857dc" />
+				<disk name="dragon knight 4 (japan)" sha1="b430f8be0f739cb090a661f4663252e935bf63d1" />
 			</diskarea>
 		</part>
 	</software>
@@ -4510,23 +4716,129 @@
 		</part>
 	</software>
 
+	<software name="eikanwa2">
+		<!--
+		Origin: redump.org
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 01).bin" size="15170400" crc="4c27211b" sha1="9ef5515bb9af19f0042aab1518fa813751f2a372"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 02).bin" size="1234800" crc="6d7c8c62" sha1="65647ca31ffaeb3d35a3c651d69f48672f451d2d"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 03).bin" size="969024" crc="48e072cb" sha1="050481aefd3e63e039a7c78a99e76a8a5c2260ec"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 04).bin" size="924336" crc="9c81bfc6" sha1="b231da6ee51756c5760a808535fa82a8e51034b8"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 05).bin" size="964320" crc="0969ba5e" sha1="71871e81bf1a95d3967cde45242fb5b9d9478769"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 06).bin" size="893760" crc="1b4d06b3" sha1="a11c9ae781f1ff0838c28139f8d50c75ba3c909a"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 07).bin" size="910224" crc="5d7d0c1e" sha1="0d901f698ba8967884b74753e6ffcac3f975dc8e"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 08).bin" size="959616" crc="f9e6dcae" sha1="0072c600205849821bca888a9e64e737d7bc147c"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 09).bin" size="945504" crc="e816b39e" sha1="f59550fe23bba3e3d63ad8bbc66cee882b9c1b9b"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 10).bin" size="952560" crc="a8bccb2f" sha1="36414944eef3d1e185a09221a248d7132c9cfa4f"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 11).bin" size="987840" crc="1649c336" sha1="e8489d86b2415eb889667ec4e9596dfca851bb77"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 12).bin" size="1093680" crc="2aa362e0" sha1="491451f9dd0bca17ec626b1f627e3c11a2a29ed7"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 13).bin" size="900816" crc="d9794b7a" sha1="dad6ee4355daba08887222e86327b4511883346e"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 14).bin" size="992544" crc="847d301f" sha1="08b1cfc67ee7ac53b604d76417e6e8658f91ea6f"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 15).bin" size="1100736" crc="01eea6cf" sha1="3e16789f7037613e2a5fada4dd806b1a7eb6869e"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 16).bin" size="898464" crc="b1365102" sha1="396cf5a89909e79fe6b7c1ea6093564b05e9d3ec"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 17).bin" size="1152480" crc="59e18eca" sha1="c9b5d59b24cd2372a30d4d5a72ec608c7aa77cab"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 18).bin" size="865536" crc="6d352f4f" sha1="733111c696e1fc1833f6b1e5f1ec73f757771a58"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 19).bin" size="1246560" crc="cf7df391" sha1="be21df9ecc429646c5ebd18d948bfd69a0a8eed9"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 20).bin" size="1274784" crc="d2250e09" sha1="e430ab9c2921e2eeb42b177a13979b087b88e7e8"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 21).bin" size="1300656" crc="08f2a072" sha1="797f153354eaf418ac3cb17775dd8f4b5e867635"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 22).bin" size="1176000" crc="6e16e4b8" sha1="72844509c814c94336373816d6e176d3352330b9"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 23).bin" size="1133664" crc="ab81e57b" sha1="ea601b9fe82f17a37b7ae6258832067932ea5500"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 24).bin" size="865536" crc="0698833b" sha1="fa857311eefc437a73297a3a6958ef957b71e366"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 25).bin" size="969024" crc="9dee6092" sha1="db7453a010447f99b5bb500807739c3fe1e03dd9"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 26).bin" size="924336" crc="676af92c" sha1="8fb10b5485073ebc696bf4f84a76154b9dc30522"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 27).bin" size="1027824" crc="d18ddcc0" sha1="88add9cd498ef945b2244fdb9e63406ebf724d30"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 28).bin" size="987840" crc="6ea76406" sha1="eae902412d4e131d298b2fc7b606dde2c4b49c57"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 29).bin" size="917280" crc="8e2f0337" sha1="f73730dc4ab89bf9665445fa5f3948714e33317d"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 30).bin" size="787920" crc="066b7be4" sha1="4a975b62b2da563f2c1f7f7e660c25a61a0a84ba"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 31).bin" size="846720" crc="d31b95d1" sha1="3431508ddf62a6ee131c138f8daed5f45e621371"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 32).bin" size="924336" crc="0f3fed91" sha1="8b66da51f70d5182fc89a4fb832867997c44517e"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 33).bin" size="823200" crc="ebf225f4" sha1="c245f34bf502632c5b7551bc2f3ff75e1840b158"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 34).bin" size="823200" crc="fbd4caa9" sha1="0f62179a95ec1975b180a84e8588473e68e257ee"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 35).bin" size="804384" crc="fec0ca14" sha1="5bef9aa3ea7881771bf3ec042b1af2e571351009"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 36).bin" size="870240" crc="4edd4f0d" sha1="a8a361cdb99ff6786d2f2824968599e7897762ce"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 37).bin" size="776160" crc="47c085ce" sha1="e386bd54e858aecd0760c2094454bd7d21e561cc"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 38).bin" size="818496" crc="eb264ce2" sha1="b66c204a30d77ff2b28f1979c06ba9bf3916bae6"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 39).bin" size="858480" crc="42388508" sha1="b7da9e5f0000e8729c02e4334b3f73258466691e"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 40).bin" size="811440" crc="ebd6b718" sha1="52847b6c5802dd0d49a094c5d80727cdfb1f9f0a"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 41).bin" size="870240" crc="5152bd4f" sha1="1b3e8dc79258502492ece206120bfb0a2ffdc324"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 42).bin" size="1305360" crc="0c4bfe00" sha1="50f27ad41df10b06f83db2633671da190eb9560f"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 43).bin" size="1380624" crc="0728a9d9" sha1="1f1ab3be6a84f83529face6040dd854c5e1bd44f"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 44).bin" size="1387680" crc="3b338b3b" sha1="37f2c78cd90b7683b162b19cc37eb429134674d2"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 45).bin" size="1371216" crc="3ae0a37b" sha1="d9515592b796c0e83bd6fc2a890b501c06cd634a"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 46).bin" size="1580544" crc="6b598d20" sha1="398a00a91cfc79a8df8e269b29bb2c6d945ba5e3"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 47).bin" size="1375920" crc="5678c6ac" sha1="a664688d97107583391536a48ff23b12a01b1b43"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 48).bin" size="1317120" crc="1401baf4" sha1="750f74a3ba08e23a25f768bc726a3ea13541bf19"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 49).bin" size="858480" crc="c84e4926" sha1="e473e71154c90004dbf99083ef9a84213b8671d4"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 50).bin" size="1030176" crc="544073c5" sha1="2873ccf38192970913b25d09fd06b4343b40b40c"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 51).bin" size="1023120" crc="df38a9c1" sha1="991505e9bc067eba78b5904b5bb183482d000a63"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 52).bin" size="1121904" crc="c53248f7" sha1="7e185de323013f0459ef6302be03277a3bd1f35b"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 53).bin" size="994896" crc="902e0caf" sha1="fa51e8260ea9749d3a9d425bde794ff5b8dc9c70"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 54).bin" size="1027824" crc="0948d34d" sha1="7a7f493d5c042dff42c34dbb290e2fbd41b6be62"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 55).bin" size="1046640" crc="af5d5b30" sha1="1baa3975c85af66821d6e409c5cf64f59a95da1e"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 56).bin" size="964320" crc="c53e9ff9" sha1="78531da490bfe4f9e9a0b7d5674f53f66ccea01f"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 57).bin" size="940800" crc="501135b9" sha1="ca62d2a99a3fa38da7878b6aaab81412725a1a41"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 58).bin" size="971376" crc="f0184f54" sha1="f69bed9f700e321ebc55b53e14b79b25df09d030"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 59).bin" size="834960" crc="908e3909" sha1="d7ec3414589706c3538637759923c2d1433a34df"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 60).bin" size="910224" crc="10351b92" sha1="927acb8df2fe87871880ef179564607b83263467"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 61).bin" size="877296" crc="1be12e72" sha1="f0d686c3635487d8e79cba1a0afdd495f7728616"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 62).bin" size="1027824" crc="ff7c3419" sha1="7262b70951d5c06b15377435865991c708594bc8"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 63).bin" size="971376" crc="eb86c921" sha1="e3907feceee90a7c2aef0c609bfd77877e5b7508"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 64).bin" size="874944" crc="b5422667" sha1="a7ac6d0c231ec92366815901f50b452d573b9e34"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 65).bin" size="858480" crc="92fd68e9" sha1="758374028fed4b8255ff713f69fdf0fac2f1ae09"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 66).bin" size="1077216" crc="2641d441" sha1="2390e0256695944ca111e4ae06fe8ed54ea7f5b7"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 67).bin" size="1034880" crc="2bf9d242" sha1="666be2d3ae95b6cf8ce5fdd7c3ab262f1a4a956a"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 68).bin" size="1016064" crc="64d1f66c" sha1="e1d342d1a90d9813a570bc1f2662fa60bac6fe5c"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 69).bin" size="1006656" crc="b11468e3" sha1="a77fa028a44fec052bab5568d28db9cd70b74ddb"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 70).bin" size="905520" crc="bd4d5e28" sha1="b9c1fe3a123fd185110ed81628176651b762f926"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 71).bin" size="910224" crc="3b918d5a" sha1="30eea5e93de46b80faf59286b9ab6a6ea454e0bd"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 72).bin" size="983136" crc="71504c24" sha1="13e19b878d05acaa1b029699b0927cc8b2e79d02"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 73).bin" size="976080" crc="3fae2553" sha1="80e0f0eaaf1c34737e55ee60293c5b580e8b5bc5"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 74).bin" size="1086624" crc="65b37dd4" sha1="f6a6ee866301f410da6dfd9c4d6c08b91800b39e"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 75).bin" size="870240" crc="a7a474c1" sha1="bcbdc7525def350019ef56a26aada1cb16f733cb"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 76).bin" size="917280" crc="abd16e63" sha1="0fc858a994685bb82f87f216ac221cdb5c27f4f9"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 77).bin" size="952560" crc="4d815b28" sha1="e02390b9c17eeb94a71e40d3e38c03bd040061e1"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 78).bin" size="1006656" crc="51411ed8" sha1="a0c05a599998cc12cb93583c6c491881430888cd"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 79).bin" size="1121904" crc="80eb7089" sha1="4567576c9780b9344907858927e032fd011bd2c5"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 80).bin" size="1081920" crc="00fbf7d9" sha1="ba6eed86b843ed47c6ace8570b174b058268c538"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 81).bin" size="707952" crc="2b65a541" sha1="ce478d5ca1fa75f81c65010e1ab2c1c884eeebff"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 82).bin" size="1879248" crc="9be86d25" sha1="0f6778b8e08cbcb7a942abcd5604f10cf4b87ff8"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 83).bin" size="1011360" crc="43933954" sha1="20d59c5c5f0279236d405710a0988b14ff672251"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A) (Track 84).bin" size="705600" crc="47930701" sha1="186c826d96d1c495e68454d2b978a008660e6bc8"/>
+		<rom name="Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai (Japan) (Rev A).cue" size="11559" crc="c99722d6" sha1="e6dea6fb475966b0acad96bfb93d2fe438bb8126"/>
+		-->
+		<description>Eikan wa Kimi ni 2 - Koukou Yakyuu Zenkoku Taikai</description>
+		<year>1991</year>
+		<publisher>アートディンク (Artdink)</publisher>
+		<info name="serial" value="HMC-144A"/>
+		<info name="alt_title" value="栄冠は君に2 高校野球全国大会" />
+		<info name="release" value="199108xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="eikan wa kimi ni 2 - koukou yakyuu zenkoku taikai (japan) (rev a)" sha1="401f46c7f782b07f8668b64cb49a6e17340da534" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="eimmy">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Eimmy to Yobanaide.ccd" size="1536" crc="5a957719" sha1="b674f4c5d249abd3f0b90bf82991f1128ba05ab9"/>
-		<rom name="Eimmy to Yobanaide.cue" size="238" crc="dcae031f" sha1="d27f55850c97b3761b09bb043f87c4a6ec89da2d"/>
-		<rom name="Eimmy to Yobanaide.img" size="549742368" crc="1585640a" sha1="7f98c92bb3917cf2d87d325ddc4c1ce36b5a6484"/>
-		<rom name="Eimmy to Yobanaide.sub" size="22438464" crc="03ea8525" sha1="3cbd86397d59300f0ae4d977436a12cdcad742e1"/>
+		Origin: redump.org
+		<rom name="Eimmy to Yobanaide - Please Don't Call Me Eimmy (Japan) (Track 1).bin" size="385579824" crc="99869352" sha1="429f8879aff4809064f08bf893f5a1d7329ba7bf"/>
+		<rom name="Eimmy to Yobanaide - Please Don't Call Me Eimmy (Japan) (Track 2).bin" size="51459408" crc="b447fa0d" sha1="d45f8d372e0f3d78ca08fdcdf78a367582ca267c"/>
+		<rom name="Eimmy to Yobanaide - Please Don't Call Me Eimmy (Japan) (Track 3).bin" size="51167760" crc="bc870a2f" sha1="439d9c4c619bdbbf87676bb9a4b4645ef7161dcf"/>
+		<rom name="Eimmy to Yobanaide - Please Don't Call Me Eimmy (Japan) (Track 4).bin" size="29665776" crc="4bffe326" sha1="ca1f5c4389fe6ca748a558ffe94a4bb85e1c077d"/>
+		<rom name="Eimmy to Yobanaide - Please Don't Call Me Eimmy (Japan) (Track 5).bin" size="31869600" crc="707adf40" sha1="f512336d7b8758af78cb5b08504590834c78038e"/>
+		<rom name="Eimmy to Yobanaide - Please Don't Call Me Eimmy (Japan).cue" size="658" crc="608ac853" sha1="4083d7bf509ff71735613ef4f634a92d42d7c52b"/>
 		-->
 		<description>Eimmy to Yobanaide</description>
 		<year>1995</year>
 		<publisher>シーズウェア (C's Ware)</publisher>
+		<info name="serial" value="CSW-0003"/>
 		<info name="alt_title" value="エイミーと呼ばないでっ" />
 		<info name="release" value="199508xx" />
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="eimmy to yobanaide" sha1="4c321b593322b94cf84a68ad1021d0cf3b24b1c4" />
+				<disk name="eimmy to yobanaide - please don't call me eimmy (japan)" sha1="15ba4ebd4f932f9b3406e40b439172a7680222f7" />
 			</diskarea>
 		</part>
 	</software>
@@ -4900,20 +5212,28 @@
 
 	<software name="evolutn">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Evolution.ccd" size="2472" crc="e4211ac3" sha1="d75688f1352630aedb6e52e2261643d1dbb8d525"/>
-		<rom name="Evolution.cue" size="425" crc="260d9945" sha1="269452f29765f9215857e3c8662dc4fda535c6ad"/>
-		<rom name="Evolution.img" size="371474880" crc="cd5e4330" sha1="b53b98e9bc30de328a91399a96d70e2d5b978497"/>
-		<rom name="Evolution.sub" size="15162240" crc="b828ee66" sha1="e90bf9725a82c50c27e971ea806f81c94b744cc1"/>
+		Origin: redump.org
+		<rom name="Evolution (Japan) (Track 01).bin" size="2300256" crc="ac329687" sha1="660034dffe3a8344d96efecf13bddaf53cf196b3"/>
+		<rom name="Evolution (Japan) (Track 02).bin" size="6825504" crc="a096bac5" sha1="b55c58112697f7db85b17d6e105f39d0e82bdd35"/>
+		<rom name="Evolution (Japan) (Track 03).bin" size="54420576" crc="fa3feec7" sha1="1d4ca19b0fb07c8512cbf91143b5cd8922416b25"/>
+		<rom name="Evolution (Japan) (Track 04).bin" size="53296320" crc="e069fedf" sha1="d2ca96353de5fb47ce89ac73ee751697829fb3bd"/>
+		<rom name="Evolution (Japan) (Track 05).bin" size="53383344" crc="9dc58766" sha1="39d19b50646fb7cd25dff38b67acbcc8171ac291"/>
+		<rom name="Evolution (Japan) (Track 06).bin" size="53879616" crc="025244ec" sha1="edd8b772ff562c28d7a99b5216d2e0c728e5f0cf"/>
+		<rom name="Evolution (Japan) (Track 07).bin" size="53919600" crc="49e64b65" sha1="a6c607ce3bcc4787e26cd2f9a0fb11741e134ca1"/>
+		<rom name="Evolution (Japan) (Track 08).bin" size="54107760" crc="9c3c9e8f" sha1="b9e7d56ee9d096cf3a628822a466fad54ff9ff76"/>
+		<rom name="Evolution (Japan) (Track 09).bin" size="35108304" crc="36e8c284" sha1="cee2b86ac24088a3db5cc97eb150aad1714dc962"/>
+		<rom name="Evolution (Japan) (Track 10).bin" size="4233600" crc="253dea43" sha1="9339be17416f58210b6a28ff6ac05de2589a419c"/>
+		<rom name="Evolution (Japan).cue" size="1102" crc="8342d37b" sha1="61c794ddcb866aa9a7cd041eda0853174ad6e68a"/>
 		-->
 		<description>Evolution</description>
 		<year>1989</year>
 		<publisher>システムサコム (System Sacom)</publisher>
+		<info name="serial" value="DPS-70"/>
 		<info name="alt_title" value="エヴォリューション" />
 		<info name="release" value="198903xx" />
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="evolution" sha1="93add8d48a5a0802cabc360b62c7cd39de7dabe2" />
+				<disk name="evolution (japan)" sha1="c518e330a3a9faccb4f1a7295d158361a5cf82f3" />
 			</diskarea>
 		</part>
 	</software>
@@ -5181,6 +5501,98 @@
 		</part>
 	</software>
 
+	<software name="fmtappc">
+		<!--
+		Origin: redump.org
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 01).bin" size="15530256" crc="52d70dcf" sha1="b0e1be696a0c8ac9eff53c3deb257d1f2e0050b0"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 02).bin" size="11795280" crc="91ca7078" sha1="3897df329d788a7645eb4bd0470da1cc7184a738"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 03).bin" size="14676480" crc="551b385d" sha1="cbfffe21b173e8ad745c8d900ac61dbbda868565"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 04).bin" size="11611824" crc="89c3f5aa" sha1="774d97b815315d361080fd0f4afb79082069b069"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 05).bin" size="6475056" crc="dbfb4209" sha1="3c9ee47b65b0574843116569e64955c8ef391220"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 06).bin" size="14281344" crc="e3c1b1e9" sha1="ff298a60c6510824d84c8531dc5853d740231b79"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 07).bin" size="9085776" crc="5c1e5640" sha1="ac77e27ba0cae179d697047016cd66f32feb0733"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 08).bin" size="7397040" crc="dc349201" sha1="f58ab81b913f3e99bae8234c00d33a11cc25a607"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 09).bin" size="4520544" crc="de298a86" sha1="9935e1f8ba22b7a760e26ab7e1d61325e9f110de"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 10).bin" size="6686736" crc="186ac46c" sha1="9e09cc82e1a22ce3b87a1531fbed0ffc8dc62a45"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 11).bin" size="5555424" crc="3e6b9143" sha1="dfbffd1cdca803042193e69263c44450ea6430d1"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 12).bin" size="13759200" crc="39f80329" sha1="487a5aec9b84cc81954d656b20b90e68164f22d5"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 13).bin" size="5875296" crc="7b95564e" sha1="ba6aaa226dbbb6fb7444785c10ec0fe31d322dd7"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 14).bin" size="7883904" crc="87abec76" sha1="11bf007d5f93c855f1eb5bf51cffffb5fd25858c"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 15).bin" size="6832560" crc="aafdb4a9" sha1="f921350ea1f5d0b4ab8a650326e815d5ded3313b"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 16).bin" size="5369616" crc="9d41de95" sha1="a8c5536bdf4123e1d5bb0442287d54530569c462"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 17).bin" size="7554624" crc="f34ac613" sha1="c706373067d90a07cd28f5a4fc8f18b2858ff42d"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 18).bin" size="7968576" crc="626b0189" sha1="37ace62c153a7a39d0b4caa2ab23a44e4443bbb5"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 19).bin" size="9925440" crc="e5a6831a" sha1="b2524e63dd49361a6dcbeb9f06778abab14f3761"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 20).bin" size="8707104" crc="52b2cfbd" sha1="a0e0d4174112132917645d683d59993f2aecc17f"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 21).bin" size="5339040" crc="6acf3956" sha1="a5bbe2833989d024c87e7cd5a67781a426fe5b58"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 22).bin" size="5433120" crc="06866fab" sha1="7d29ae9c74e8f2a38c32480e270b5a45d1a6165a"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 23).bin" size="12237456" crc="9e59fcec" sha1="8659392e97f0decb1b59c71c6f3d675022ff5953"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 24).bin" size="7437024" crc="2ce72622" sha1="05b13ac41177b33ce444ee5cffd4c0dea62f5c0d"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 25).bin" size="4915680" crc="c4c936f1" sha1="88d363a78ce1c0a6a342ad02ae5d9319204189ed"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 26).bin" size="5515440" crc="5cc0e731" sha1="6c65d9d7b24700c1e5bf8c9ddeac0110da2ddfd0"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 27).bin" size="12566736" crc="b670082d" sha1="6fbd7648022733af27edda78068c493baa47ccc7"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 28).bin" size="5578944" crc="19e43fde" sha1="7e979c1cd3e612efc9e3c50ef982374fac0107c8"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 29).bin" size="6157536" crc="d39a2578" sha1="e362f29f3ad1b128cf15da2eda43ab60d21df49e"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 30).bin" size="7013664" crc="bb6570a7" sha1="2736ab486adf032000253e9cf902e0cacd50edf4"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 31).bin" size="5134416" crc="0cb7bdf1" sha1="dc08ba573bfab75b93510f2ecd47543edf69c9da"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 32).bin" size="7655760" crc="44e472b7" sha1="798e3059631b6f4d12cfe9c3928facd3532ea297"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 33).bin" size="11195520" crc="c603ec65" sha1="875fbe4a8abbd9f77f8b938a60f01ac2012b0d0b"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 34).bin" size="6213984" crc="3063af33" sha1="ca452a70a4d2de33220343a3e97bae1dcb95656c"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 35).bin" size="5703600" crc="951aa5b8" sha1="cfe2196dc462434aee47918cc6a9e684982cdf79"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 36).bin" size="4475856" crc="b4705502" sha1="041a6bad485af5a3fb7c0ad43a3769c6e6991264"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 37).bin" size="11324880" crc="161f08dc" sha1="04ce4b1db5f5d2aa577e2e9c25c27db698fac31a"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 38).bin" size="5738880" crc="256b1e0b" sha1="9975a308311711f93b10fcd77f50f4d623765a9f"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 39).bin" size="5480160" crc="74875fd6" sha1="5a4bd6d50efb412ce6f12e874d8a7aafaa680560"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 40).bin" size="5868240" crc="f6024905" sha1="f9751e730561594445395ec4e021a5d895f84c7b"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 41).bin" size="5186160" crc="60fd7298" sha1="849886710ecaa6c2083b3b4ea726c8fc12cbdef2"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 42).bin" size="5597760" crc="848345e9" sha1="0582d9c3194cd8b0d850488b3adc0b2c84107257"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 43).bin" size="5473104" crc="1a1fc415" sha1="4452082d53ecb7dfcaaae1860926e705766c63a6"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 44).bin" size="5675376" crc="f553e9bb" sha1="2e2c8be9636ac0aaacf2ad3a2a6e6bee8842d1a0"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 45).bin" size="5837664" crc="7c2f7403" sha1="2d384189ab7d4968e8868be2a4c2e530769d114c"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 46).bin" size="5451936" crc="94ebbc96" sha1="7027c2b8db4f50cac3d6ca5bd755025bf18a8852"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 47).bin" size="6373920" crc="97ed91a2" sha1="dc5d2977b8212662d99d9359a9b3b56847f8f112"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 48).bin" size="5061504" crc="5f61d8d4" sha1="aec035bab19c0c43de1bf2953b6de283467a3f7a"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 49).bin" size="5209680" crc="bf307f54" sha1="4c0472373b5186438a63b3029b535d78ed3de844"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 50).bin" size="5221440" crc="5abe8324" sha1="4bfa5e2315b3c70225a327e6d3792123803a3496"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 51).bin" size="5451936" crc="f5f64a2b" sha1="b655b85a9642e57fc8ec887ab2fa1894135fb93a"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 52).bin" size="6256320" crc="f87cf05a" sha1="72804a863f852dddd72458fb602711875f12336d"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 53).bin" size="5496624" crc="f0fb93e8" sha1="71bb20856fc9b619a8ab77bd9cf4ee66647f2ad9"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 54).bin" size="4809840" crc="705cb5ea" sha1="36a6e2b5fc709db29e49fde476c269a3c3ba35aa"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 55).bin" size="5303760" crc="cbc358e2" sha1="0f74520024d34286aa358903e406d745e9bbcfbc"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 56).bin" size="5240256" crc="35c2aab1" sha1="aa0933e84200d537075079f0b472acdda311763f"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 57).bin" size="5155584" crc="bb17d662" sha1="4d8f76f7fa4f7f956246b4980ed31e5d6cd18c46"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 58).bin" size="5675376" crc="15c5c33e" sha1="cbb75746b57a296ce8fc8ab51f8320b1d4034858"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 59).bin" size="8914080" crc="799ffdb7" sha1="083622cdb8b378ea0fdd027a05757e4f185f9c27"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 60).bin" size="5832960" crc="402204cc" sha1="cd80eaafe94407eada670a69dded64033f0928c2"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 61).bin" size="5762400" crc="6615ec8f" sha1="e4f3aa5e36d3bfc7f17f7db6cd27981480feb17c"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 62).bin" size="6437424" crc="8d7dd7a3" sha1="9afc5234442fbafdb3ce7b7bf6ab915c8e742f7e"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 63).bin" size="5209680" crc="4f611843" sha1="6857a83007540356b818398209e010676b45e8be"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 64).bin" size="4903920" crc="965e8912" sha1="fe7f075d754eb3f573fa3bd6e7b9df03d1344624"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 65).bin" size="5757696" crc="6eb2f02c" sha1="4e3a17734f41c31f9461516b54953d1264333abd"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 66).bin" size="5767104" crc="f4df1ad6" sha1="7929bdeb41c17b797afff1fd7ed30562611f36f5"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 67).bin" size="5374320" crc="abd4d752" sha1="f7be6016137328c5589bdfb1d8b30ad415de430b"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 68).bin" size="5903520" crc="5841a86c" sha1="b5eb4e1e49a192e1d48bc09a9e2cb40fc1d9db4f"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 69).bin" size="4934496" crc="8df58a0b" sha1="59a271b9e6b764f2d0253f40d26eff1d862d781a"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 70).bin" size="5562480" crc="bb0b4d09" sha1="f239bbf2835b839241dd7669e6feb1833f4e88c6"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 71).bin" size="4445280" crc="b15e2048" sha1="621e319be114bee8df009f95e8863f8bf15190a0"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 72).bin" size="5362560" crc="b1f3a777" sha1="b34507b57c8cb20ab36f027f4db66ea6403f29c6"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 73).bin" size="8130864" crc="7f96d8c5" sha1="0eb47882ddee19551cb3960d5b18557c1b4fba22"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 74).bin" size="4809840" crc="0ae6ce5d" sha1="1a201450c74d218e3995014eeb315376b69d5387"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan) (Track 75).bin" size="6174000" crc="0ec56263" sha1="2d2447ec6ddba3d744d60d09b91d3c2989e87b8f"/>
+		<rom name="FM Towns Application Catalog CD-ROM - Original Soft-hen (Japan).cue" size="11832" crc="73362051" sha1="0b00afdb9b2f28fe92a8965e9bb5a73b79143bd4"/>
+		-->
+		<description>FM Towns Application Catalog CD-ROM - Original Soft-hen</description>
+		<year>1989</year>
+		<publisher>富士通 (Fujitsu)</publisher>
+		<info name="serial" value="HMA-904"/>
+		<info name="alt_title" value="ＦＭ　ＴＯＷＮＳ　アプリケーション・カタログＣＤ‐ＲＯＭ　オリジナル・ソフト編" />
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="fm towns application catalog cd-rom - original soft-hen (japan)" sha1="071d7090c1295d610cd9518bd547ab07f6c73ff5" />
+			</diskarea>
+		</part>
+	</software>
+
 	<!-- Seems to be a coverdisc for Oh!FM magazine, would be nice to have more info -->
 	<software name="fmthcdd1">
 		<!--
@@ -5719,17 +6131,17 @@
 	<software name="g5">
 		<!--
 		Origin: redump.org
-		<rom name="G5 (Japan) (Track 1).bin" size="27875904" crc="5c1f8806" sha1="6bdb36d9a38c50615d9cffca9456e0b49dd9ff78"/>
-		<rom name="G5 (Japan) (Track 2).bin" size="36145536" crc="ce0cb02c" sha1="9176e536a1e8ba977f9a05455f159dadd726af6b"/>
-		<rom name="G5 (Japan) (Track 3).bin" size="156972480" crc="4362731b" sha1="1b9bc817f9cd9450db048989aa0dca0ef06205c8"/>
-		<rom name="G5 (Japan) (Track 4).bin" size="41759760" crc="27534dbf" sha1="1cf94204f04a3f06d8bfd4319e409d1df2716779"/>
-		<rom name="G5 (Japan) (Track 5).bin" size="63685104" crc="4f819e54" sha1="b6c7c708d9f5e935ecbc024c894b95d2482a68d3"/>
-		<rom name="G5 (Japan) (Track 6).bin" size="39901680" crc="fc0d37bd" sha1="19bd225c4f54630cab6cf1018bf9182bbd077a07"/>
-		<rom name="G5 (Japan) (Track 7).bin" size="41277600" crc="8d676919" sha1="edea880a03554aced8b180d44ddf75c251ebdf95"/>
-		<rom name="G5 (Japan) (Track 8).bin" size="164976336" crc="ec9f23a9" sha1="fc7dbf3d7c6194221038581cd439caac5b9261a9"/>
-		<rom name="G5 (Japan).cue" size="814" crc="1568c89d" sha1="290eb5d5299379a25240bef8b3fa43dc4beee7c0"/>
+		<rom name="G5 (Japan) (Rev A) (Track 1).bin" size="27875904" crc="5c1f8806" sha1="6bdb36d9a38c50615d9cffca9456e0b49dd9ff78"/>
+		<rom name="G5 (Japan) (Rev A) (Track 2).bin" size="36145536" crc="ce0cb02c" sha1="9176e536a1e8ba977f9a05455f159dadd726af6b"/>
+		<rom name="G5 (Japan) (Rev A) (Track 3).bin" size="156972480" crc="4362731b" sha1="1b9bc817f9cd9450db048989aa0dca0ef06205c8"/>
+		<rom name="G5 (Japan) (Rev A) (Track 4).bin" size="41759760" crc="27534dbf" sha1="1cf94204f04a3f06d8bfd4319e409d1df2716779"/>
+		<rom name="G5 (Japan) (Rev A) (Track 5).bin" size="63685104" crc="4f819e54" sha1="b6c7c708d9f5e935ecbc024c894b95d2482a68d3"/>
+		<rom name="G5 (Japan) (Rev A) (Track 6).bin" size="39901680" crc="fc0d37bd" sha1="19bd225c4f54630cab6cf1018bf9182bbd077a07"/>
+		<rom name="G5 (Japan) (Rev A) (Track 7).bin" size="41277600" crc="8d676919" sha1="edea880a03554aced8b180d44ddf75c251ebdf95"/>
+		<rom name="G5 (Japan) (Rev A) (Track 8).bin" size="164976336" crc="ec9f23a9" sha1="fc7dbf3d7c6194221038581cd439caac5b9261a9"/>
+		<rom name="G5 (Japan) (Rev A).cue" size="878" crc="38f47687" sha1="07a91d1bedfcf68eb823e892fbc3aba492b6a216"/>
 		-->
-		<description>G5</description>
+		<description>G5 (HMA-206A)</description>
 		<year>1989</year>
 		<publisher>エー・エム・アール (AMR)</publisher>
 		<info name="serial" value="HMA-206A"/>
@@ -5738,7 +6150,39 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="g5 (japan)" sha1="3038fd11e7c7f58b17ef96fb9c872f4c7924915a" />
+				<disk name="g5 (japan) (rev a)" sha1="3038fd11e7c7f58b17ef96fb9c872f4c7924915a" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="g5o" cloneof="g5">
+		<!--
+		Origin: redump.org
+		<rom name="G5 (Japan) (Track 1).bin" size="27875904" crc="9e2e9d03" sha1="0b1cfd7cf34ede3beadc4d33603ca8b0e40f6287"/>
+		<rom name="G5 (Japan) (Track 2).bin" size="36150240" crc="2522d5ab" sha1="2c636f310ba9c77efbd5f443e414bf5a8781df06"/>
+		<rom name="G5 (Japan) (Track 3).bin" size="156972480" crc="3dd235b8" sha1="6455c0bca59d35880a46baf3bdf6819105357cd7"/>
+		<rom name="G5 (Japan) (Track 4).bin" size="41759760" crc="97a9806a" sha1="fc5c72858293442d88154cc0387b71a4645b744d"/>
+		<rom name="G5 (Japan) (Track 5).bin" size="63687456" crc="f6aa8415" sha1="580cfa3720bbb96780da93f87847d411eb666ebd"/>
+		<rom name="G5 (Japan) (Track 6).bin" size="39901680" crc="e8c40e4a" sha1="24e50e02cc9e1a5127f07ebad22efa72f5403455"/>
+		<rom name="G5 (Japan) (Track 7).bin" size="41277600" crc="66757946" sha1="0a391ba93651ed185e7cccb1363a0e469939e245"/>
+		<rom name="G5 (Japan) (Track 8).bin" size="164973984" crc="a1d16fe5" sha1="9670631e0201b4d7e3aa756fb33e89015aa4741a"/>
+		<rom name="G5 (Japan).cue" size="814" crc="48fec8f9" sha1="e0b9e5212acb70e90949dc5bc6621dd3e454cb0e"/>
+		-->
+		<description>G5 (HMA-206)</description>
+		<year>1989</year>
+		<publisher>エー・エム・アール (AMR)</publisher>
+		<info name="serial" value="HMA-206"/>
+		<info name="alt_title" value="ジーファイヴ" />
+		<info name="release" value="198907xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size="1261568">
+				<rom name="g5.hdm" size="1261568" crc="be71541a" sha1="b6686763b1d4774a623c88bf86eee029224657c7" offset="000000" />
+			</dataarea>
+		</part>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="g5 (japan)" sha1="022cce796bb7879860ac6e7955a7de2763910bd2" />
 			</diskarea>
 		</part>
 	</software>
@@ -6100,6 +6544,38 @@
 		</part>
 	</software>
 
+	<software name="gokumand">
+		<!--
+		Origin: redump.org
+		<rom name="Gokuraku Mandala (Japan) (Track 01).bin" size="20815200" crc="067ea9ce" sha1="162bb2c4c46cdcc401e9d118792f4343184f1898"/>
+		<rom name="Gokuraku Mandala (Japan) (Track 02).bin" size="49921200" crc="9301ace8" sha1="a004a60ba0067106c203ae8d7a99b3c4b41f0e2c"/>
+		<rom name="Gokuraku Mandala (Japan) (Track 03).bin" size="49215600" crc="a79166a6" sha1="9b39107f2ec80431c30778a889cf05abacd94678"/>
+		<rom name="Gokuraku Mandala (Japan) (Track 04).bin" size="55742400" crc="d1e86a69" sha1="b914de80829955dbad202fe26cd7f19f500fef4a"/>
+		<rom name="Gokuraku Mandala (Japan) (Track 05).bin" size="47098800" crc="fb57f64a" sha1="104a1101804d961b71e0072bf0f3942290b6b67b"/>
+		<rom name="Gokuraku Mandala (Japan) (Track 06).bin" size="47275200" crc="4c4993f1" sha1="bc43fa39c43d152f62c0efdd8100156a998f69f7"/>
+		<rom name="Gokuraku Mandala (Japan) (Track 07).bin" size="54684000" crc="288e6e97" sha1="3b1b9fc9bc192adf4c852b7243d5e2654d14eb1e"/>
+		<rom name="Gokuraku Mandala (Japan) (Track 08).bin" size="46569600" crc="973dccfd" sha1="8a5f53b401c293e8d252c8f03e5b3f1da655e12a"/>
+		<rom name="Gokuraku Mandala (Japan) (Track 09).bin" size="49921200" crc="516b6a4a" sha1="fd0a7d8f6905374d455b0a843ae4fb3d85d13db4"/>
+		<rom name="Gokuraku Mandala (Japan) (Track 10).bin" size="3704400" crc="477ffd1e" sha1="e5541250c7e86b694e69cad5a26b22506d679f3d"/>
+		<rom name="Gokuraku Mandala (Japan) (Track 11).bin" size="7232400" crc="489f2069" sha1="3f74200f47b8e2c9ea3e491a3466ee423fe38b56"/>
+		<rom name="Gokuraku Mandala (Japan) (Track 12).bin" size="1058400" crc="74965b12" sha1="7d139955173a7fc5ed1adde253f0b66c08e8a649"/>
+		<rom name="Gokuraku Mandala (Japan) (Track 13).bin" size="3175200" crc="e1921519" sha1="ed8c2f9397dbd88bbecf28b802eda6b28d4c8a74"/>
+		<rom name="Gokuraku Mandala (Japan).cue" size="1529" crc="c42ab548" sha1="6bd177e928c5ea9262f1df7948a8a7e205348bd3"/>
+		-->
+		<description>Gokuraku Mandala</description>
+		<year>1994</year>
+		<publisher>フェアリーテール (Fairytale)</publisher>
+		<info name="serial" value="HMF-102"/>
+		<info name="alt_title" value="極楽まんだら" />
+		<info name="release" value="199402xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="gokuraku mandala (japan)" sha1="911f06db513d74c86c4e8b2baa10a9ac21663d56" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="grimmaka">
 		<!--
 		Origin: P2P
@@ -6201,11 +6677,22 @@
 
 	<software name="gunblaze">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Gunblaze.ccd" size="3249" crc="d0f88b1a" sha1="7283b05fc15a7b1cf0d6f149ecfbb58e8149edda"/>
-		<rom name="Gunblaze.cue" size="584" crc="3c6ff80a" sha1="5df8151457900ffeadcd363aa8ba9ed18bc6def0"/>
-		<rom name="Gunblaze.img" size="654387552" crc="b14b4ec2" sha1="5df61a755df6e58b9939b878f933aadbde792cc0"/>
-		<rom name="Gunblaze.sub" size="26709696" crc="812809ef" sha1="732dfd7efe04f585b6a4a21a2457c097eaf59f41"/>
+		Origin: redump.org
+		<rom name="GunBlaze (Japan) (Track 01).bin" size="22169952" crc="ea4d18ce" sha1="1640bbaeb2e7d283ae426c95ba14f3d55d0170ff"/>
+		<rom name="GunBlaze (Japan) (Track 02).bin" size="47980800" crc="3d2555d0" sha1="db3d771ad9aa19c9ebaf66b7e3d92160d77f3ac1"/>
+		<rom name="GunBlaze (Japan) (Track 03).bin" size="19227600" crc="2f8678ab" sha1="ce48e775dfe653d8c664798946d039aaadc31c0f"/>
+		<rom name="GunBlaze (Japan) (Track 04).bin" size="39337200" crc="449e0cb6" sha1="716e36fc87c08d6a31c0c94424e42d2bb87e8f1e"/>
+		<rom name="GunBlaze (Japan) (Track 05).bin" size="28047600" crc="8a529a22" sha1="6abefc1f1d0caacdf1f5232263953a9774691b9b"/>
+		<rom name="GunBlaze (Japan) (Track 06).bin" size="68090400" crc="ee456e36" sha1="596f5b98eb48b28c72d97eba6dec3ca4ab2ef0e8"/>
+		<rom name="GunBlaze (Japan) (Track 07).bin" size="16934400" crc="40a4caad" sha1="2ff5c49121fb2e6b9e2a05e86946fd361af07776"/>
+		<rom name="GunBlaze (Japan) (Track 08).bin" size="22755600" crc="9af82a5e" sha1="1361a07ba97c4a18047cc911406dc042979c5453"/>
+		<rom name="GunBlaze (Japan) (Track 09).bin" size="53625600" crc="b2b91812" sha1="96b068f865a21d1b32ef93e6efc58fd5fc63d720"/>
+		<rom name="GunBlaze (Japan) (Track 10).bin" size="56800800" crc="a19f1695" sha1="90263879fa4c70ed56e54fd8e689384df8569a07"/>
+		<rom name="GunBlaze (Japan) (Track 11).bin" size="85906800" crc="1f8de6a0" sha1="c904fe37300cac2767c038d1cb0de71ff9c2c664"/>
+		<rom name="GunBlaze (Japan) (Track 12).bin" size="57859200" crc="91609f02" sha1="bd3882dcc1f47354a409b9598873ad78aef56832"/>
+		<rom name="GunBlaze (Japan) (Track 13).bin" size="89787600" crc="adb8eae8" sha1="e3932b57603992bc4a890d8348c255e477bfa9c0"/>
+		<rom name="GunBlaze (Japan) (Track 14).bin" size="45864000" crc="89666e12" sha1="66d6789e6393802369e4c0013a2e0d0683dcb17f"/>
+		<rom name="GunBlaze (Japan).cue" size="1536" crc="8f565d63" sha1="613ae9664c2e3955ca7720b843c49c1d7135799c"/>
 		-->
 		<description>Gunblaze</description>
 		<year>1994</year>
@@ -6215,7 +6702,7 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="gunblaze" sha1="2ef094206014ebbe9606e2eca117779e833bd1eb" />
+				<disk name="gunblaze (japan)" sha1="9f4631523057e4946484d23b3d5f28d1d65d16e6" />
 			</diskarea>
 		</part>
 	</software>
@@ -6452,6 +6939,26 @@
 		</part>
 	</software>
 
+	<software name="hfetish">
+		<!--
+		Origin: redump.org
+		<rom name="Hyper Fetishism (Japan).bin" size="179575200" crc="baef4557" sha1="903b1e7103f30d7791512e4230e0363876585d19"/>
+		<rom name="Hyper Fetishism (Japan).cue" size="89" crc="78b12700" sha1="11ac4d0a5b2bc8e4be1398a47bc7531df46977ce"/>
+		-->
+		<description>Hyper Fetishism</description>
+		<year>1993</year>
+		<publisher>エクステンド (Extend)</publisher>
+		<info name="serial" value="HME-250"/>
+		<info name="alt_title" value="ハイパー・フェティシズム" />
+		<info name="release" value="199503xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="hyper fetishism (japan)" sha1="40052a58a056709334273f5199dfae2bb11db116" />
+			</diskarea>
+		</part>
+	</software>
+
 	<!-- These CDs are probably supposed to be self-bootable but they are missing the IPL sector. Marked as bad dumps until they are redumped. -->
 	<software name="highlt20">
 		<!--
@@ -6894,11 +7401,9 @@
 
 	<software name="igo2">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Go II.ccd" size="768" crc="c0608f7b" sha1="1dcbb4856227905559ae70461907b529ac7bc74b"/>
-		<rom name="Go II.cue" size="69" crc="16a3bd2a" sha1="af36f49c218f4634d961f86ddbbc4196612249a8"/>
-		<rom name="Go II.img" size="3880800" crc="d32d5632" sha1="7aef1aa8570b38e7e85fe06bcfd835ddf8d985cd"/>
-		<rom name="Go II.sub" size="158400" crc="66b32aee" sha1="c3eb209b26f2794a74639760a4fffc9614aa9853"/>
+		Origin: redump.org
+		<rom name="Igo II (Japan) (Rev A).bin" size="3880800" crc="1dd0f59b" sha1="e1380283f529b6053fcc954e5273dc635f79fe16"/>
+		<rom name="Igo II (Japan) (Rev A).cue" size="111" crc="bfeeefba" sha1="d0161f5bca4bae641a6904128c2ee6196f89c23e"/>
 		-->
 		<description>Igo II</description>
 		<year>1989</year>
@@ -6907,7 +7412,7 @@
 		<info name="alt_title" value="囲碁II" />
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="go ii" sha1="74ad3665b97bf25ea91a7d7dd344de8bff845be0" />
+				<disk name="igo ii (japan) (rev a)" sha1="c8086e68ae61656c24034decab5c5044e02f50c6" />
 			</diskarea>
 		</part>
 	</software>
@@ -6936,6 +7441,26 @@
 		</part>
 	</software>
 
+	<software name="ilhyakka">
+		<!--
+		Origin: redump.org
+		<rom name="Illust Hyakka - Yamashita Hideki no Ikiiki Cut-shuu (Japan) (Rev A).bin" size="253663200" crc="672e5788" sha1="a53016373fb272b45fc1e96d367432676677ea9b"/>
+		<rom name="Illust Hyakka - Yamashita Hideki no Ikiiki Cut-shuu (Japan) (Rev A).cue" size="133" crc="0528e451" sha1="e6abc2c0f881acd48794d456670e328634482b84"/>
+		-->
+		<description>Illust Hyakka - Yamashita Hideki no Ikiiki Cut-shuu</description>
+		<year>1990</year>
+		<publisher>CRI</publisher>
+		<info name="serial" value="HMB-160A"/>
+		<info name="alt_title" value="イラスト百科　～山下秀樹のいきいきカット集～" />
+		<info name="release" value="199008xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="illust hyakka - yamashita hideki no ikiiki cut-shuu (japan) (rev a)" sha1="b5927af960c7a80087ab24c96cd93f52fc7b340a" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="imgfight">
 		<!--
 		Origin: Neo Kobe Collection
@@ -7121,6 +7646,36 @@
 		</part>
 	</software>
 
+	<software name="iris">
+		<!--
+		Origin: redump.org
+		<rom name="Iris-tei Serenade (Japan) (Track 01).bin" size="10231200" crc="07ac491a" sha1="d0e038d721c80a60b064aebf1bdab5a00d890aa5"/>
+		<rom name="Iris-tei Serenade (Japan) (Track 02).bin" size="37961280" crc="1394ee31" sha1="44f912cf96fe67b94355ded99383cf0c15dc649e"/>
+		<rom name="Iris-tei Serenade (Japan) (Track 03).bin" size="36103200" crc="e04f1024" sha1="10844dfb2780f3b096ed64bda881ba003de1696d"/>
+		<rom name="Iris-tei Serenade (Japan) (Track 04).bin" size="40917744" crc="2dad7abf" sha1="4e9b301ea9de1935a9212bff21e155b2eb8d9867"/>
+		<rom name="Iris-tei Serenade (Japan) (Track 05).bin" size="35992656" crc="7175d9e0" sha1="ad4252a86ee64e44fc25efd3ed0710742cff764c"/>
+		<rom name="Iris-tei Serenade (Japan) (Track 06).bin" size="47021184" crc="179130ae" sha1="a35a8a16abe9086e196ee5bd9398b1ea14445a78"/>
+		<rom name="Iris-tei Serenade (Japan) (Track 07).bin" size="47769120" crc="8ee147c8" sha1="d71a5ae23c04511efa7ac3dfcf87607f7b997752"/>
+		<rom name="Iris-tei Serenade (Japan) (Track 08).bin" size="44177616" crc="33f62599" sha1="60d9b232925f2f68ef46fac17b1fff868efc45d5"/>
+		<rom name="Iris-tei Serenade (Japan) (Track 09).bin" size="39478320" crc="93049efa" sha1="7a7192ffcfddb6fa7a7f74f080e571b3b1e60aff"/>
+		<rom name="Iris-tei Serenade (Japan) (Track 10).bin" size="36326640" crc="d2f16a69" sha1="7fc00f22ff35ae65e73e756419871169186d8fd2"/>
+		<rom name="Iris-tei Serenade (Japan) (Track 11).bin" size="31039344" crc="06e2ac13" sha1="3458b148b561326885ed24e326682b4b965bb83f"/>
+		<rom name="Iris-tei Serenade (Japan).cue" size="1325" crc="a6f812d3" sha1="02859e1eeae9aea0a4bf57ef405a13b2ba9f26fb"/>
+		-->
+		<description>Iris-tei Serenade</description>
+		<year>1992</year>
+		<publisher>アグミックス (Agumix)</publisher>
+		<info name="serial" value="HMD-212 / MTC-1031"/>
+		<info name="alt_title" value="イーリス亭小夜曲" />
+		<info name="release" value="199211xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="iris-tei serenade (japan)" sha1="cb2c726ce594c8e56c47f8ce6c19ddbee96e62e6" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="ishido">
 		<!--
 		Origin: Neo Kobe Collection
@@ -7246,6 +7801,26 @@
 		</part>
 	</software>
 
+	<software name="jclub">
+		<!--
+		Origin: redump.org
+		<rom name="Jouhou Club - Card Processor Ver. 1.1 (Japan).bin" size="3716160" crc="8e291389" sha1="70e8f87c893567d86896865dd831c1960111a367"/>
+		<rom name="Jouhou Club - Card Processor Ver. 1.1 (Japan).cue" size="134" crc="9ae78bd1" sha1="1529bcd1cc5418c3f3d9cba9f73debb7bc7dfb58"/>
+		-->
+		<description>Jouhou Club - Card Processor Ver. 1.1</description>
+		<year>1989</year>
+		<publisher>富士通ソーシアルサイエンスラボラトリ (Fujitsu Social Science Laboratory)</publisher>
+		<info name="serial" value="HMA-214A"/>
+		<info name="alt_title" value="情報倶楽部" />
+		<info name="release" value="198911xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="jouhou club - card processor ver. 1.1 (japan)" sha1="84c7c26036a354c170f5fc9f638ebc52df02eeca" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="jealousy">
 		<!--
 		Origin: Neo Kobe Collection
@@ -8411,11 +8986,10 @@
 
 	<software name="lesserm">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Lesser Mern.ccd" size="956" crc="9fa79f85" sha1="e0dc612d75fc5cb9f84d61009d99658964e18f44"/>
-		<rom name="Lesser Mern.cue" size="114" crc="b94ab7d4" sha1="391c115b65f428082357911a4b0cd1d968378e58"/>
-		<rom name="Lesser Mern.img" size="309828960" crc="a9115225" sha1="76d5d8c7554fe9dbcd06674054c8969c34f00b26"/>
-		<rom name="Lesser Mern.sub" size="12646080" crc="bcf77f91" sha1="54f92b3ffd4367c9f8941a619add6228659b983a"/>
+		Origin: redump.org
+		<rom name="Lesser Mern (Japan) (Track 1).bin" size="20815200" crc="d87b1d37" sha1="668bcd1c70373ae9dae251f5778a2974bef7ef66"/>
+		<rom name="Lesser Mern (Japan) (Track 2).bin" size="289013760" crc="1df28c09" sha1="38d9ec06362917cb5e4d0a621fc67253033ae65e"/>
+		<rom name="Lesser Mern (Japan).cue" size="231" crc="72e54ef3" sha1="ae5961289300e8d0c8616d9058823ee7bbffeb62"/>
 		-->
 		<description>Lesser Mern</description>
 		<year>1992</year>
@@ -8426,7 +9000,7 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="lesser mern" sha1="e9e9e42e26db1afbeb6f111d9ee4068fd09c3c3d" />
+				<disk name="lesser mern (japan)" sha1="cf4a79db0387994ce4e69cadf88c1dae76d17ad7" />
 			</diskarea>
 		</part>
 	</software>
@@ -8778,7 +9352,7 @@
 		-->
 		<description>Mad Paradox</description>
 		<year>1994</year>
-		<publisher>クィーンソフト (Queensoft)</publisher>
+		<publisher>クィーンソフト (Queen Soft)</publisher>
 		<info name="serial" value="HMF-107"/>
 		<info name="alt_title" value="マッドパラドックス" />
 		<info name="release" value="199402xx" />
@@ -8876,7 +9450,7 @@
 		-->
 		<description>Mahjong Hou Tei Rao Yui</description>
 		<year>1995</year>
-		<publisher>クィーンソフト (Queensoft)</publisher>
+		<publisher>クィーンソフト (Queen Soft)</publisher>
 		<info name="alt_title" value="麻雀河底撈魚" />
 		<info name="release" value="199508xx" />
 		<part name="cdrom" interface="fmt_cdrom">
@@ -8886,6 +9460,41 @@
 		</part>
 	</software>
 
+	<software name="mjmusashi">
+		<!--
+		Origin: redump.org
+		<rom name="Mahjong Musashi (Japan) (Track 01).bin" size="2116800" crc="dce5d3e3" sha1="b59c50df396bcb355f547548bac83a12606a0d5b"/>
+		<rom name="Mahjong Musashi (Japan) (Track 02).bin" size="35103600" crc="e2bfa0a1" sha1="4f64e1ea6b9c3809e77bd769bc376af713bd8a9b"/>
+		<rom name="Mahjong Musashi (Japan) (Track 03).bin" size="35632800" crc="a310cf04" sha1="72ae2679d9c97c8191b898ae8bcd1e1cc37ad446"/>
+		<rom name="Mahjong Musashi (Japan) (Track 04).bin" size="41277600" crc="3cf5de10" sha1="75c345d1fe6ce2d47d4faf218564d6e2a1621e0b"/>
+		<rom name="Mahjong Musashi (Japan) (Track 05).bin" size="37044000" crc="4bb2d45c" sha1="c48d1122d24d6b9182e85fe6557e8c898ba59523"/>
+		<rom name="Mahjong Musashi (Japan) (Track 06).bin" size="26283600" crc="0cf5e1cf" sha1="44aeb1a5f18bcf2894e8b6e48ec5635afc0c8b3d"/>
+		<rom name="Mahjong Musashi (Japan) (Track 07).bin" size="21873600" crc="eec8a770" sha1="59420ec16f1d44a8902a3bf5f4845e832c16ba3e"/>
+		<rom name="Mahjong Musashi (Japan) (Track 08).bin" size="27636000" crc="abb0b64e" sha1="3912d6f930cffbd734cfeae5c79fbc51a936bd7b"/>
+		<rom name="Mahjong Musashi (Japan) (Track 09).bin" size="35338800" crc="c981b2f3" sha1="47f78eb5b765a6b8ad9b453ba276692821093725"/>
+		<rom name="Mahjong Musashi (Japan) (Track 10).bin" size="46746000" crc="2c51841e" sha1="875d01beb4db378a0d99b33901e4d6211fbbf4cf"/>
+		<rom name="Mahjong Musashi (Japan) (Track 11).bin" size="61916400" crc="a763b86b" sha1="c8483a5a4470dd18db87f1f8e72e71c52b192a75"/>
+		<rom name="Mahjong Musashi (Japan) (Track 12).bin" size="44100000" crc="27ebd76b" sha1="f1566b1f9a515bfdab25b3b2ad92056b727f30c5"/>
+		<rom name="Mahjong Musashi (Japan) (Track 13).bin" size="39690000" crc="677b0650" sha1="f5d0a550a3c16ea766a1dcc99d1289d104088b25"/>
+		<rom name="Mahjong Musashi (Japan) (Track 14).bin" size="37044000" crc="d5e0c6d4" sha1="c6767fffccd7992c5102fbed2aaa81ba29b28e05"/>
+		<rom name="Mahjong Musashi (Japan) (Track 15).bin" size="31752000" crc="c8330e9c" sha1="1ff83cbff57d5b0a6b6c734ac1cbb8f87673c397"/>
+		<rom name="Mahjong Musashi (Japan) (Track 16).bin" size="39337200" crc="4169578d" sha1="0794f8cd69858145de00fbd35fae9b9cbea347dc"/>
+		<rom name="Mahjong Musashi (Japan) (Track 17).bin" size="38278800" crc="505c076e" sha1="7d0f6906a7a2fb491c7b7e2ddbd809dec7393f55"/>
+		<rom name="Mahjong Musashi (Japan).cue" size="2011" crc="f990d3ec" sha1="a47ca93db234129c16ad23fe5eeacf73153d9aa0"/>
+		-->
+		<description>Mahjong Musashi</description>
+		<year>1989</year>
+		<publisher>コスモスコンピュータ (Cosmos Computer)</publisher>
+		<info name="serial" value="HMA-224"/>
+		<info name="alt_title" value="麻雀武蔵" />
+		<info name="release" value="198910xx" />
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="mahjong musashi (japan)" sha1="b283dc621d3ae7e4cb46b6a42648ff7b795355bf" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="mjripple">
 		<!--
 		Origin: redump.org
@@ -8926,6 +9535,25 @@
 		</part>
 	</software>
 
+	<software name="manadoko2">
+		<!--
+		Origin: redump.org
+		<rom name="Manami no Doko made Iku no 2 - Return of the Kuro Pack (Japan).bin" size="12376224" crc="81fd5145" sha1="8f2ceebf79dc77fa29a788ec05ede101d6045de4"/>
+		<rom name="Manami no Doko made Iku no 2 - Return of the Kuro Pack (Japan).cue" size="151" crc="7351f4ca" sha1="3914f29f9afd579a56aecb42c478f9b170bded64"/>
+		-->
+		<description>Manami no Doko made Iku no? 2 - Return of the Kuro Pack</description>
+		<year>1995</year>
+		<publisher>ウエンディマガジン (Wendy Magazine)</publisher>
+		<info name="alt_title" value="まなみのどこまでイクの? 2 リターン オブ THE 黒パック" />
+		<info name="release" value="199505xx" />
+		<info name="usage" value="Requires 2 MB RAM and mouse on port 1"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="manami no doko made iku no 2 - return of the kuro pack (japan)" sha1="026662a39cda929bcc4b33110b0192f92f09d398" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="mandalai">
 		<!--
 		Origin: Neo Kobe Collection
@@ -9032,6 +9660,26 @@
 		</part>
 	</software>
 
+	<software name="marionetm">
+		<!--
+		Origin: redump.org
+		<rom name="Marionette Mind (Japan).bin" size="10231200" crc="89eb54af" sha1="330fed6c662d7b83ccd25d8e2fc242fd7db16802"/>
+		<rom name="Marionette Mind (Japan).cue" size="89" crc="a458ca9b" sha1="9cf92ae9a16a0f42205807f9b80ffb0a5aef827f"/>
+		-->
+		<description>Marionette Mind</description>
+		<year>1994</year>
+		<publisher>スタジオみるく (Studio Milk)</publisher>
+		<info name="serial" value="HME-251"/>
+		<info name="alt_title" value="マリオネット・マインド" />
+		<info name="release" value="199403xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="marionette mind (japan)" sha1="060c3feab24d0212ffefe2b3338f9f78b98b5f34" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="manhole">
 		<!--
 		Origin: Neo Kobe Collection
@@ -9040,11 +9688,11 @@
 		<rom name="The Manhole.img" size="523672800" crc="33510cba" sha1="9ffc30557cc95464065c075c74583ef70f0be011"/>
 		<rom name="The Manhole.sub" size="21374400" crc="ec086392" sha1="01775a3b3ccb342a01bbe954626ab36f461fe053"/>
 		-->
-		<description>The Manhole</description>
+		<description>The Manhole (1990-09-06)</description>
 		<year>1990</year>
 		<publisher>富士通 (Fujitsu)</publisher>
 		<info name="alt_title" value="マンホール" />
-		<info name="release" value="199008xx" />
+		<info name="release" value="199009xx" />
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
 				<disk name="the manhole" sha1="b469808157cd2aeff35c8c538c0a56c9dd41d064" />
@@ -9052,6 +9700,96 @@
 		</part>
 	</software>
 
+	<software name="manholeo" cloneof="manhole">
+		<!--
+		Origin: redump.org
+		<rom name="Manhole, The (Japan) (Track 01).bin" size="105487200" crc="ec45db33" sha1="f4954f1e6afe21e4b32858ddd4d671791e93e901"/>
+		<rom name="Manhole, The (Japan) (Track 02).bin" size="7338240" crc="c01cde84" sha1="ffcbc5f6c98eec23408ced136fa4cac447f77096"/>
+		<rom name="Manhole, The (Japan) (Track 03).bin" size="8455440" crc="59012515" sha1="659473f2cd8fb719c4083d4cef85e3c14367364e"/>
+		<rom name="Manhole, The (Japan) (Track 04).bin" size="12402096" crc="38976e6b" sha1="d281e47886fa85f18ff19a1b34810d253111cca7"/>
+		<rom name="Manhole, The (Japan) (Track 05).bin" size="13335840" crc="7ffe7e52" sha1="f7325da1ba4bbb9aa5c6c0f4da763b7a04169655"/>
+		<rom name="Manhole, The (Japan) (Track 06).bin" size="6879600" crc="bb38080c" sha1="e41ebbbb29bc9a9f2dac0de3103cfa528844166c"/>
+		<rom name="Manhole, The (Japan) (Track 07).bin" size="7625184" crc="9d199abe" sha1="afccc2e649cb778e541e1ca021f00fe3359ec813"/>
+		<rom name="Manhole, The (Japan) (Track 08).bin" size="9685536" crc="d6bdf47e" sha1="007974b483663f6295105aeffa7526ecf42996f5"/>
+		<rom name="Manhole, The (Japan) (Track 09).bin" size="10600464" crc="c2fd76db" sha1="c6cc5aef931501582cc2f6c61040ddeaab82f654"/>
+		<rom name="Manhole, The (Japan) (Track 10).bin" size="12484416" crc="8f024d56" sha1="7f94b60396ab44affcbb2620010b9b825e52823b"/>
+		<rom name="Manhole, The (Japan) (Track 11).bin" size="24025680" crc="f1a52185" sha1="65f4808c76c3e92ba390a0d1c93467489737d5bc"/>
+		<rom name="Manhole, The (Japan) (Track 12).bin" size="11313120" crc="178c48da" sha1="1989e2415fc508facb59f68906c14bb4de74a5dd"/>
+		<rom name="Manhole, The (Japan) (Track 13).bin" size="19749744" crc="5eb5b053" sha1="19404cab9b0c939e3280e8c5b2be25c0a3f39db5"/>
+		<rom name="Manhole, The (Japan) (Track 14).bin" size="8808240" crc="b5c5dab6" sha1="73f34caa248a05e1065925a60dd7493000ca3ac6"/>
+		<rom name="Manhole, The (Japan) (Track 15).bin" size="18470256" crc="7a54510a" sha1="139aec0a764ab3c927cd86b92183fbaf8733d8b1"/>
+		<rom name="Manhole, The (Japan) (Track 16).bin" size="13324080" crc="2e2cf4b6" sha1="2c78a96b134d7441454d581d5bc3891317ccdced"/>
+		<rom name="Manhole, The (Japan) (Track 17).bin" size="15534960" crc="db4d761a" sha1="748c279f463bc5e37878ebe3956b01eafca88a74"/>
+		<rom name="Manhole, The (Japan) (Track 18).bin" size="11501280" crc="a9e791c5" sha1="e4eb01295443500ad6446812078a05af6706f286"/>
+		<rom name="Manhole, The (Japan) (Track 19).bin" size="12470304" crc="c2a7de11" sha1="e9dba41a1076e59929097340fb0d4627aa7cbc41"/>
+		<rom name="Manhole, The (Japan) (Track 20).bin" size="10426416" crc="2c1da614" sha1="031fa08f30667a20a079a2ac0e9e75b364ed4c07"/>
+		<rom name="Manhole, The (Japan) (Track 21).bin" size="10224144" crc="e4f59ff8" sha1="600ea4907e15f8e5f52b473f4e5ba18189a0167d"/>
+		<rom name="Manhole, The (Japan) (Track 22).bin" size="11148480" crc="9eb125b4" sha1="a390b3f0db83ca96b0ad9a99700b6761173e974a"/>
+		<rom name="Manhole, The (Japan) (Track 23).bin" size="6933696" crc="d702ce59" sha1="9bc26f8167ddbee23bf526eeb92cd8e57a735eb0"/>
+		<rom name="Manhole, The (Japan) (Track 24).bin" size="5578944" crc="998f85c9" sha1="89b522a969d3cf0ab6ff2568e9bb3ab50ba7053f"/>
+		<rom name="Manhole, The (Japan) (Track 25).bin" size="3528000" crc="ee4c2c0b" sha1="1f72f42b85c2cec292c1eff95462289dfbe503dd"/>
+		<rom name="Manhole, The (Japan) (Track 26).bin" size="4362960" crc="07bf6202" sha1="0d0e0fe9d0caa8c58bc7274203a46e4a8be18885"/>
+		<rom name="Manhole, The (Japan) (Track 27).bin" size="665616" crc="59012a2c" sha1="4d678ff3ce5d8bfcfa8cde7f17ea5c220a40abf9"/>
+		<rom name="Manhole, The (Japan) (Track 28).bin" size="834960" crc="712eb475" sha1="d61306bf26a2115a56e027a3359f25c50498c775"/>
+		<rom name="Manhole, The (Japan) (Track 29).bin" size="780864" crc="32be2c43" sha1="a0c0a368069f386ada294454351be6e7fb5d19f8"/>
+		<rom name="Manhole, The (Japan) (Track 30).bin" size="776160" crc="07428177" sha1="5b6d37b0ed4e535f1833494fa69aee8502bd0ce3"/>
+		<rom name="Manhole, The (Japan) (Track 31).bin" size="912576" crc="95e00ebc" sha1="0ad87a944895eeab55e7d5b135ef22b8629f8212"/>
+		<rom name="Manhole, The (Japan) (Track 32).bin" size="1081920" crc="2f25ecd0" sha1="0f31d307e6dbee05cb294ebb768ded4492975884"/>
+		<rom name="Manhole, The (Japan) (Track 33).bin" size="910224" crc="7a6c358c" sha1="e16683d6ebb69ec7b2334c7887f30124f514cb40"/>
+		<rom name="Manhole, The (Japan) (Track 34).bin" size="929040" crc="b462278a" sha1="03d130d4ebb1808dcc2ab56f20d8957dfdd06cc9"/>
+		<rom name="Manhole, The (Japan) (Track 35).bin" size="818496" crc="8517e5e4" sha1="d5c9140adf331f790cc271f0181104171bd45fc6"/>
+		<rom name="Manhole, The (Japan) (Track 36).bin" size="2222640" crc="d2c61ad3" sha1="9f45e43d251071af627357dbcca5cca1b430dfe8"/>
+		<rom name="Manhole, The (Japan) (Track 37).bin" size="858480" crc="e7ef9c07" sha1="ac9b4a2dd5dcf9b1e49e1b1fa052e66d8e4ae297"/>
+		<rom name="Manhole, The (Japan) (Track 38).bin" size="764400" crc="f2f27f8e" sha1="ef420e2c6410d178aa379c44496b03d737941b50"/>
+		<rom name="Manhole, The (Japan) (Track 39).bin" size="639744" crc="cf1fa48b" sha1="b705d1c137248352ad3e80b414b2d15531172f25"/>
+		<rom name="Manhole, The (Japan) (Track 40).bin" size="1223040" crc="d8ee863e" sha1="2f009d94c3e7c827cc249a571028dde2f20c9644"/>
+		<rom name="Manhole, The (Japan) (Track 41).bin" size="1206576" crc="35385c80" sha1="2cf045ddf54b21e1993bb988ecda248eb281c0f5"/>
+		<rom name="Manhole, The (Japan) (Track 42).bin" size="851424" crc="ee5f361a" sha1="2d3ae2e3546190cae338f6e87ee9352d215ca4ec"/>
+		<rom name="Manhole, The (Japan) (Track 43).bin" size="917280" crc="a25d463f" sha1="72667adab078bc9ddf0b5e54b9d0dde241d32657"/>
+		<rom name="Manhole, The (Japan) (Track 44).bin" size="1105440" crc="5d20e995" sha1="487a2e60b669c35828719685ecdd761c4c518d11"/>
+		<rom name="Manhole, The (Japan) (Track 45).bin" size="1077216" crc="5499cc59" sha1="d87a8dd5f3d33741a000972b0e0382ef7e1798d9"/>
+		<rom name="Manhole, The (Japan) (Track 46).bin" size="2109744" crc="525dfb44" sha1="1d2c01980bf2d7dcc3f8e695a76629999c8f0109"/>
+		<rom name="Manhole, The (Japan) (Track 47).bin" size="700896" crc="3117de69" sha1="ec9c205b6cd5717ae3c5a937c680851bc8407659"/>
+		<rom name="Manhole, The (Japan) (Track 48).bin" size="1121904" crc="a9ae9622" sha1="1f7339b20d3d04a382bde67d36a5f73a0384e746"/>
+		<rom name="Manhole, The (Japan) (Track 49).bin" size="882000" crc="2d1cfc8f" sha1="5edb04fb8a79e59d8f8cacf771b8f1bc38a0a71e"/>
+		<rom name="Manhole, The (Japan) (Track 50).bin" size="764400" crc="61fdb406" sha1="58bcc3bdcbc26669397efe00399430ab9f360b93"/>
+		<rom name="Manhole, The (Japan) (Track 51).bin" size="2540160" crc="81fd2d52" sha1="0a113e2bf82f0bd75e7c0e99336129f5b621b359"/>
+		<rom name="Manhole, The (Japan) (Track 52).bin" size="1434720" crc="109b6fa1" sha1="e60d3bf8495bd726323e65afda2b90277d7dd025"/>
+		<rom name="Manhole, The (Japan) (Track 53).bin" size="1246560" crc="2e33753b" sha1="1cc0f9ce177dc0d0fbc0ff7806cbc3feab7532fa"/>
+		<rom name="Manhole, The (Japan) (Track 54).bin" size="736176" crc="286a981a" sha1="092ae238f716b6ade4db9aa5802d4144c21f1be7"/>
+		<rom name="Manhole, The (Japan) (Track 55).bin" size="917280" crc="abf1816f" sha1="0675f17340804d912b0d75102eaf8952ca8da72d"/>
+		<rom name="Manhole, The (Japan) (Track 56).bin" size="627984" crc="5ac69655" sha1="71176a5b33bffeb44f0097f2d552812b0ee52328"/>
+		<rom name="Manhole, The (Japan) (Track 57).bin" size="2493120" crc="cbe8ce7b" sha1="d748220ddf319116c2a33e9a7c75c684fcd6f2dc"/>
+		<rom name="Manhole, The (Japan) (Track 58).bin" size="1611120" crc="81ff85b2" sha1="f8de9bbed568745d3aaa7c2f3c26a6c13e571e4e"/>
+		<rom name="Manhole, The (Japan) (Track 59).bin" size="752640" crc="da78bea9" sha1="f5836bb6abda172a0eec4446f0f43392cff81410"/>
+		<rom name="Manhole, The (Japan) (Track 60).bin" size="693840" crc="251e5b2c" sha1="c3a33325a02d05072c8532d33a087f8290766f13"/>
+		<rom name="Manhole, The (Japan) (Track 61).bin" size="994896" crc="6431559e" sha1="4b7583da82fbb12fc79ffe591699758d24dc32d9"/>
+		<rom name="Manhole, The (Japan) (Track 62).bin" size="1486464" crc="8e2d13ab" sha1="12e3d3bc7653bcf7a93ab211161133c37581961e"/>
+		<rom name="Manhole, The (Japan) (Track 63).bin" size="1253616" crc="8f6e37ad" sha1="36c4c6d2696bc9c2453cdc5bf70b2b0d3b5a2f5d"/>
+		<rom name="Manhole, The (Japan) (Track 64).bin" size="811440" crc="f2b803cc" sha1="bcea665f5735d1846919f6d4e712190c4810a484"/>
+		<rom name="Manhole, The (Japan) (Track 65).bin" size="1251264" crc="ac8056c3" sha1="c2cd7337892514db2275f2748f85347e9d20a4dd"/>
+		<rom name="Manhole, The (Japan) (Track 66).bin" size="1046640" crc="27734d33" sha1="8e227fa5a895733f689d49bfc24e7d3bb5d4803a"/>
+		<rom name="Manhole, The (Japan) (Track 67).bin" size="1618176" crc="d94f4a04" sha1="dc8c3413fbffd8ce829dd94c118b2d50ae4edbef"/>
+		<rom name="Manhole, The (Japan) (Track 68).bin" size="72187584" crc="428281c7" sha1="500d5edd3d29167131ecee113fee68d5832a906c"/>
+		<rom name="Manhole, The (Japan) (Track 69).bin" size="14389536" crc="9f9476c3" sha1="a16229a211b343e3c6b7a7d5307a3e0399837bfb"/>
+		<rom name="Manhole, The (Japan) (Track 70).bin" size="2756544" crc="b8ae1a61" sha1="0d6488261fa1c9e90149d579ceb04946355beb41"/>
+		<rom name="Manhole, The (Japan) (Track 71).bin" size="3010560" crc="2117b7d8" sha1="e176efe36a46e6373cb5d353c0afac694185a3f0"/>
+		<rom name="Manhole, The (Japan) (Track 72).bin" size="2622480" crc="ada911e3" sha1="6ef2a9b43f349c6453cbfd9262abe19e1403142e"/>
+		<rom name="Manhole, The (Japan) (Track 73).bin" size="1340640" crc="ccb8f54c" sha1="eba98b1a87ab4f2cca530313294bd7a0b89f8227"/>
+		<rom name="Manhole, The (Japan).cue" size="8400" crc="446657cb" sha1="66f2603d5dc12d39f87a24f842378cb33a1f4042"/>
+		-->
+		<description>The Manhole (1990-08-01)</description>
+		<year>1990</year>
+		<publisher>富士通 (Fujitsu)</publisher>
+		<info name="alt_title" value="マンホール" />
+		<info name="release" value="199008xx" />
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="manhole, the (japan)" sha1="314d7c0ddb900e9e8d6d104264cf95017d80f33d" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="mbomber">
 		<!--
 		Origin: redump.org
@@ -9347,6 +10085,26 @@
 		</part>
 	</software>
 
+	<software name="mirage2">
+		<!--
+		Origin: redump.org
+		<rom name="Mirage 2 - Torry, Neat &amp; Roan Fairladies in MagicLand (Japan).bin" size="18726624" crc="94f9dfb8" sha1="f60333837f42ca928f677bc5da1f6b0966d2eacf"/>
+		<rom name="Mirage 2 - Torry, Neat &amp; Roan Fairladies in MagicLand (Japan).cue" size="127" crc="0053d83b" sha1="9799d748643ce4a6bf634ca3acf2ca359fe5de6a"/>
+		-->
+		<description>Mirage 2 - Torry, Neat &amp; Roan Fairladies in MagicLand</description>
+		<year>1994</year>
+		<publisher>ディスカバリー (Discovery)</publisher>
+		<info name="serial" value="2TD-3018"/>
+		<info name="alt_title" value="ミラージュ２ トリー×ニート×ローンの大冒険" />
+		<info name="release" value="199412xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="mirage 2 - torry, neat &amp; roan fairladies in magicLand (japan)" sha1="22c46e6409b2ffa8423691d12340b189f2e24358" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="mirrors">
 		<!--
 		Origin: Neo Kobe Collection
@@ -10774,6 +11532,46 @@
 		</part>
 	</software>
 
+	<software name="nsangel">
+		<!--
+		Origin: redump.org
+		<rom name="Noushuku Angel 120% (Japan) (Track 01).bin" size="116071200" crc="13da9107" sha1="38a50b6a4d530ec9b157817ed5b0b28d1640f803"/>
+		<rom name="Noushuku Angel 120% (Japan) (Track 02).bin" size="46746000" crc="39981d2a" sha1="15be0d7ce0d732d843c834def8f2aad0d6aeae5d"/>
+		<rom name="Noushuku Angel 120% (Japan) (Track 03).bin" size="45334800" crc="6c24a035" sha1="3c119818b83f449dff5060bf5834aad762f99530"/>
+		<rom name="Noushuku Angel 120% (Japan) (Track 04).bin" size="45864000" crc="fec7747c" sha1="8475d21bde8654b7267f33419810d2c2c0833235"/>
+		<rom name="Noushuku Angel 120% (Japan) (Track 05).bin" size="46922400" crc="bdaeb016" sha1="d1dffc1545c6e25e18b0497a20112b4ddf738a4d"/>
+		<rom name="Noushuku Angel 120% (Japan) (Track 06).bin" size="46216800" crc="82ccaccb" sha1="3444a90b5aecec9cc53a420f54fc9dd0313056a0"/>
+		<rom name="Noushuku Angel 120% (Japan) (Track 07).bin" size="52390800" crc="b66bfe6d" sha1="339eeae795b6a7bcaa0adc8c0b7c6da50b58b2ad"/>
+		<rom name="Noushuku Angel 120% (Japan) (Track 08).bin" size="43218000" crc="c749c93c" sha1="fea2955d17f2ba326e47f6f7e0f1199aa4a5d17c"/>
+		<rom name="Noushuku Angel 120% (Japan) (Track 09).bin" size="46393200" crc="db27fc75" sha1="0904f12e43fc6082c3db0c83e33dc1056dd85131"/>
+		<rom name="Noushuku Angel 120% (Japan) (Track 10).bin" size="46216800" crc="7742b676" sha1="ee7e03ec2ad9d0cdb317142feff18eb850e38c4a"/>
+		<rom name="Noushuku Angel 120% (Japan) (Track 11).bin" size="53096400" crc="6bcc7382" sha1="63ddcd25e0d1659dc3dc0a697311cb3e78971a04"/>
+		<rom name="Noushuku Angel 120% (Japan) (Track 12).bin" size="42512400" crc="597afae5" sha1="c31f7efe149db4a49a8e351ef7b6355f94d0e5df"/>
+		<rom name="Noushuku Angel 120% (Japan) (Track 13).bin" size="5997600" crc="d66966f0" sha1="2f287e73882b9941ffbb7c1db43c97c7fd2c62ac"/>
+		<rom name="Noushuku Angel 120% (Japan) (Track 14).bin" size="5115600" crc="2d0b9103" sha1="fb8fa599858d8132626464cc9f2e40e90e4e6ce5"/>
+		<rom name="Noushuku Angel 120% (Japan).cue" size="1713" crc="a6d9a336" sha1="fcb6d755feed16a0339b36cdb5e4a58c8db2f102"/>
+		-->
+		<description>Noushuku Angel 120%</description>
+		<year>1995</year>
+		<publisher>カクテル・ソフト (Cocktail Soft)</publisher>
+		<info name="serial" value="HMG-118"/>
+		<info name="alt_title" value="濃縮エンジェル１２０％" />
+		<info name="release" value="199504xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<!-- Floppy image created with the BSS tool included on the CD. Should match an image of the actual disk -->
+		<part name="flop1" interface="floppy_3_5">
+			<feature name="part_id" value="Disk A" />
+			<dataarea name="flop" size="1261568">
+				<rom name="nsangel_disk_a.hdm" size="1261568" crc="ba5a137b" sha1="b64d6bc1c303d281ff8ed9f81dbfbaa02ffde8a9" offset="000000" />
+			</dataarea>
+		</part>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="noushuku angel 120 (japan)" sha1="eae40afd0882c6dfbe127bd8b985e7c743443217" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="okitgear">
 		<!--
 		Origin: Neo Kobe Collection
@@ -11234,11 +12032,10 @@
 
 	<software name="prinmak2">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Princess Maker 2.ccd" size="908" crc="dba2d512" sha1="196e444bccbedee24a79da2d3c3e352217ebc7f4"/>
-		<rom name="Princess Maker 2.cue" size="162" crc="f1f3b81e" sha1="50cc03f0970cc60a8d78dda0e7d5235a68ff66ec"/>
-		<rom name="Princess Maker 2.img" size="621214944" crc="4540f9f0" sha1="304fad2201aa58a6528b152e12b97fd21dff4377"/>
-		<rom name="Princess Maker 2.sub" size="25355712" crc="4e54a2ff" sha1="53c6325736f83d4cb079b0ec32a6771e4df6a15d"/>
+		Origin: redump.org
+		<rom name="Princess Maker 2 (Japan) (Track 1).bin" size="84319200" crc="a56e88e3" sha1="8e6b892eb5406d97766cd0f05b7db2676b8e6c19"/>
+		<rom name="Princess Maker 2 (Japan) (Track 2).bin" size="536895744" crc="8eb99fd9" sha1="a068269a494234e8390115e405e395e5d601d71b"/>
+		<rom name="Princess Maker 2 (Japan).cue" size="218" crc="9d022bcf" sha1="66c4b27f7a08cd6deaf706eab8212d3952d3e035"/>
 		-->
 		<description>Princess Maker 2</description>
 		<year>1994</year>
@@ -11249,7 +12046,7 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="princess maker 2" sha1="a0ed8d1a394ccfc109c3afdc6fdc6fd6a095643d" />
+				<disk name="princess maker 2 (japan)" sha1="013247a78840c2a00f3a50aa1d19658586a16d49" />
 			</diskarea>
 		</part>
 	</software>
@@ -11434,27 +12231,79 @@
 
 	<software name="prostudg">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Pro Student G.ccd" size="3122" crc="432b8400" sha1="4924d961cfd32c8801b895a2ba38c24b07e75150"/>
-		<rom name="Pro Student G.cue" size="1055" crc="c2d44694" sha1="bb660cfa5764653f9241f038771f5c7ba98f5bf2"/>
-		<rom name="Pro Student G.img" size="602504784" crc="ea3e84ba" sha1="ea6bf35f3450cfb981f284bd9e2cd48ac4bc5345"/>
-		<rom name="Pro Student G.sub" size="24592032" crc="10d9ec13" sha1="1a8d47c6314b40e69aa6260cd0a60e837f18a19f"/>
+		Origin: redump.org / wiggy2k
+		<rom name="Pro Student G (Japan) (Track 01).bin" size="20286000" crc="67a54813" sha1="e2addb84d76ae60d3dd633a542c42e0147d97eff"/>
+		<rom name="Pro Student G (Japan) (Track 02).bin" size="54571104" crc="162e066d" sha1="6f6899b1aabe1d4ed44b32e1d31ab17112b7422a"/>
+		<rom name="Pro Student G (Japan) (Track 03).bin" size="52155600" crc="94f2606b" sha1="1c5ddf807d30040f3a75b17bcdd827933582c542"/>
+		<rom name="Pro Student G (Japan) (Track 04).bin" size="54408816" crc="bcc0c436" sha1="10ed1a515e6d7abe5d1d736a64448fd4ba41bf28"/>
+		<rom name="Pro Student G (Japan) (Track 05).bin" size="56459760" crc="aea89d20" sha1="cbb126d749bb288c34be7ee35ae1f6574f5080f6"/>
+		<rom name="Pro Student G (Japan) (Track 06).bin" size="54406464" crc="3633cb42" sha1="71d0c3d3492d91f9274529edaea9de0f7492ab5a"/>
+		<rom name="Pro Student G (Japan) (Track 07).bin" size="52491936" crc="346903b3" sha1="162cac12ead048ccee468e956edd3db6dd449728"/>
+		<rom name="Pro Student G (Japan) (Track 08).bin" size="54437040" crc="153c7795" sha1="770993b28de6a3882e8c33a762bcc4327d1f4cdd"/>
+		<rom name="Pro Student G (Japan) (Track 09).bin" size="54495840" crc="ac9cdad5" sha1="a352c23e8c8bee8b3d8eddfba379cfdd8a9079a6"/>
+		<rom name="Pro Student G (Japan) (Track 10).bin" size="54813360" crc="0c1747ce" sha1="4f3906500bd4cf59c14ba711588209a61b9bbe85"/>
+		<rom name="Pro Student G (Japan) (Track 11).bin" size="49337904" crc="b2d97770" sha1="22940f081f1c97174d92b93d1d7fd0afbb3869d1"/>
+		<rom name="Pro Student G (Japan) (Track 12).bin" size="7444080" crc="08bf76fe" sha1="04f4836ce9db4888f3079f1d7d8fc4dfe29c3bf3"/>
+		<rom name="Pro Student G (Japan) (Track 13).bin" size="9744336" crc="8c52e5e6" sha1="081eab9dad0758f954e5a0ab15b1a29d4f59043a"/>
+		<rom name="Pro Student G (Japan) (Track 14).bin" size="9137520" crc="730ef897" sha1="21f8e40623324ededf87fa75365927b1b6d7ff08"/>
+		<rom name="Pro Student G (Japan) (Track 15).bin" size="8761200" crc="fce73c9f" sha1="2d34703f83b64502d499102aa4d0c0d498a65d31"/>
+		<rom name="Pro Student G (Japan) (Track 16).bin" size="9553824" crc="90c2763c" sha1="5ffd6a802aaf276ccb8fe5fe1d4bb785b8d0e44a"/>
 		-->
-		<description>Pro Student G</description>
+		<description>Pro Student G (ALS-0004)</description>
 		<year>1993</year>
 		<publisher>アリスソフト (AliceSoft)</publisher>
-		<info name="serial" value="HME-171"/>
+		<info name="serial" value="HME-171 / ALS-0004"/>
 		<info name="alt_title" value="ぷろすちゅーでんとG" />
 		<info name="release" value="199307xx" />
 		<part name="flop1" interface="floppy_3_5">
-			<feature name="part_id" value="Boot Disk" />
+			<feature name="part_id" value="System Disk" />
 			<dataarea name="flop" size="1261568">
-				<rom name="pro student g (boot disk).hdm" size="1261568" crc="a068feeb" sha1="fa5e5b185cc452e9fa252eac61eb6f8a133cc080" offset="000000" />
+				<rom name="pro-student-g.hdm" size="1261568" crc="b3786aa4" sha1="1b0f9cfcf93a15c7d063872877b1fcdeb6fd1d44" offset="000000" />
 			</dataarea>
 		</part>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="pro student g" sha1="a7675c732045804fbaf292a191eb1967f98894a4" />
+				<disk name="pro student g (japan)" sha1="f4873e000d4070c1621bded2b33f785f7ff2de38" />
+			</diskarea>
+		</part>
+	</software>
+
+	<!-- Apparently the BAT file that launches the installer is incorrect? This needs to be investigated further -->
+	<software name="prostudgr" cloneof="prostudg" supported="no">
+		<!--
+		Origin: redump.org
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 01).bin" size="17578848" crc="1c135323" sha1="5ac9502fb8403ae6758bfb1987b307551c4aa64a"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 02).bin" size="39690000" crc="b90fdc51" sha1="1116aeaa041c448af34b50bf5a950ab2128094b6"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 03).bin" size="37044000" crc="5cf5891b" sha1="c9c5e3788cd0ca592ae48c99571504299faea51c"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 04).bin" size="34221600" crc="48d69882" sha1="5f0ef4164da83f9e6df3984101f2dc9e152924cd"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 05).bin" size="34927200" crc="8fab8c62" sha1="806a9e5ffe9a44a24a0b06f0daa1f4f2388b5ffa"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 06).bin" size="35280000" crc="d2c122fc" sha1="522fdc34d23fd590ea6104f03e3713cc2f17eaed"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 07).bin" size="38455200" crc="a406d437" sha1="d2ebee07144e231056a7f9322504c341b5492a66"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 08).bin" size="40219200" crc="b07efecc" sha1="4acc0e2854a467c4372232f0e75ef052dc254932"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 09).bin" size="40572000" crc="06cc5fa2" sha1="17413d5c3022bd3d9c0948475ac2f3bb60a34077"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 10).bin" size="42336000" crc="7e370915" sha1="bf8795c013c170c38439ebdf6aa99a96df97fe01"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 11).bin" size="36338400" crc="467afaa9" sha1="92dc0fad6abd5f96f8f140d6e18b4c4aa1c120ed"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 12).bin" size="35103600" crc="403e89ae" sha1="984441b0dca2bf82cb26ced130403b0be44aeb14"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 13).bin" size="38102400" crc="d328b087" sha1="302ef11c3a573abe7074ad8037fa5aef19cd6979"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 14).bin" size="36514800" crc="88a78af9" sha1="1fdf76aaf88357e0abd39931ecff4e60b5636ea3"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 15).bin" size="36162000" crc="0b6aefcc" sha1="d03e2ab593f0a3f4947141092d28d19b99e0473b"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 16).bin" size="37220400" crc="80292d1e" sha1="fb913d4512db6e1b54eb4b9f1dae3736f74f8f31"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 17).bin" size="7761600" crc="dd48a75c" sha1="c19375235bd173043baefa837f5c542eaf41d7d2"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 18).bin" size="9878400" crc="11683d0d" sha1="abd580333025a8abbb65a108d57f2bf71196153b"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 19).bin" size="9349200" crc="e419c606" sha1="fd3d6047d07cd4d0fddd22ec468068f4cc145944"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 20).bin" size="8996400" crc="3bc95efd" sha1="cbe9f1be6fd040c05b8837af4beaf2f201a34ba5"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 21).bin" size="9878400" crc="cbd9495f" sha1="916d94dfe84edc954d6a1a6b40051ba534bef120"/>
+		<rom name="Pro Student G (Japan) (Rerelease).cue" size="2670" crc="b270fa34" sha1="87898b38c2fe1ed83a633444408d4b1a69b4bb05"/>
+		-->
+		<description>Pro Student G (ALS-0010)</description>
+		<year>1994</year>
+		<publisher>アリスソフト (AliceSoft)</publisher>
+		<info name="serial" value="ALS-0010"/>
+		<info name="alt_title" value="ぷろすちゅーでんとG" />
+		<info name="release" value="199407xx" />
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="pro student g (japan) (rerelease)" sha1="11bc5195ccaf557fe17a349eb8284c78e08e29ac" />
 			</diskarea>
 		</part>
 	</software>
@@ -11834,6 +12683,47 @@
 		</part>
 	</software>
 
+	<software name="queencup">
+		<!--
+		Origin: redump.org
+		<rom name="Gambler - Queen's Cup (Japan) (Track 01).bin" size="10231200" crc="7395f2e5" sha1="7ac8911da780869775a3b8d82c7f041fff946098"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 02).bin" size="28224000" crc="3730db43" sha1="6b0e0b33f36843477640d844c12ec09e4eb12887"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 03).bin" size="34574400" crc="d6303740" sha1="ba8b714e8fd34c3a6767f4018065ec8fb9c1520e"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 04).bin" size="9172800" crc="c44953b6" sha1="470d8a6a90ff3580b0260cf9da6f1e0b4ecef223"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 05).bin" size="9172800" crc="f4331595" sha1="18d912d3ca6a962598b887a682b65ebe93899a97"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 06).bin" size="33868800" crc="b343c990" sha1="46a924e512fc483fe63e9041a33e2abcec2c56b4"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 07).bin" size="30340800" crc="2698edaf" sha1="98b3f59b92f1453abe5eb7f972311df70f7cd92f"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 08).bin" size="31222800" crc="ea4e7ac0" sha1="0cb5702ad2c5c134fd93f05f6d780a8a33227787"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 09).bin" size="34045200" crc="826568b6" sha1="bc2d793d6e3adc4c1393287cc35b8fd43d9d9e94"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 10).bin" size="32457600" crc="3bdfe41e" sha1="ed52e4cc66f033ccf14407876022781143afd33b"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 11).bin" size="29635200" crc="8c5be8ce" sha1="8999d763265a5c0e5f06f023e707803b3584b49a"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 12).bin" size="31222800" crc="484535c6" sha1="40ec04af1e9f6cde3088b64d1940f591d09bf044"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 13).bin" size="31222800" crc="9911b750" sha1="a8850e6b1447108a3cc498b08a22acd74c98ad38"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 14).bin" size="28929600" crc="fbaa1181" sha1="4bd76a5f18ee7b913795ef39b3c489e0f6a7b903"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 15).bin" size="32281200" crc="18670d9e" sha1="56de59298958ba293053377f34a466cdfe9fbed2"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 16).bin" size="36162000" crc="620bbb71" sha1="be643dec236ccdb2aa4819bd541e23fe2f0b75db"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 17).bin" size="32634000" crc="1c0a3ff5" sha1="6006aa6104c8d3af94f87a2f7ae8d1afa5c889fb"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 18).bin" size="30693600" crc="bc99ffd8" sha1="921414d2f9cc5ba72994a89bf8c206eeff9e2656"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 19).bin" size="1411200" crc="cac4b12c" sha1="69c04a29b23c7a27e731fc1d4c7ebfaf12a6476c"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 20).bin" size="2469600" crc="11c8fa19" sha1="8b80db24c1fa2990c5bb8e4e9b0d165100c1aa6e"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 21).bin" size="1587600" crc="f8dc45df" sha1="edc4888cb260082cb23e3ce3a4bfa0ac90d624d3"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 22).bin" size="32281200" crc="ceb82122" sha1="a4c3ff3673ec0f09f68cd44e46fb572ed037cecf"/>
+		<rom name="Gambler - Queen's Cup (Japan) (Track 23).bin" size="1058400" crc="c2ff07f3" sha1="998857932ffe379a562106aa1cd9511f50938bc2"/>
+		<rom name="Gambler - Queen's Cup (Japan).cue" size="2834" crc="07681ae9" sha1="5d04f444a1f0761bf9ace90a441f9b2aca19a76d"/>
+		-->
+		<description>Gambler - Queen's Cup</description>
+		<year>1994</year>
+		<publisher>クィーンソフト (Queen Soft)</publisher>
+		<info name="serial" value="HMF-180 / QCD9409"/>
+		<info name="alt_title" value="ギャンブラー　－Ｑｕｅｅｎ’ｓ　Ｃｕｐ－" />
+		<info name="release" value="199409xx" />
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="gambler - queen's cup (japan)" sha1="6d12c2ce89e79c9fb8a78717c5771bffa3f632d2" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="racrally">
 		<!--
 		Origin: Neo Kobe Collection
@@ -12105,11 +12995,23 @@
 
 	<software name="rayxanbr">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Rayxanber.ccd" size="3527" crc="7b3c29af" sha1="3077f1f119cfeb5e89262002bc6501fc5ea8c80c"/>
-		<rom name="Rayxanber.cue" size="670" crc="e0a2263d" sha1="153fc29eecde9cda783c5dc01b180b313a777d79"/>
-		<rom name="Rayxanber.img" size="417268320" crc="6cfe50cc" sha1="64843282a94d48fc2f185d9e5f2522ec145eef78"/>
-		<rom name="Rayxanber.sub" size="17031360" crc="c8fdc393" sha1="19257c49a93ba1ce34cdb32c42ae64f5427a9e7a"/>
+		Origin: redump.org
+		<rom name="Rayxanber (Japan) (Track 01).bin" size="8937600" crc="9699280b" sha1="5ba8bdf2a926c32942782aef738a8fbab282455b"/>
+		<rom name="Rayxanber (Japan) (Track 02).bin" size="54237120" crc="0c23a42f" sha1="08369036bca2b5fdc0e411321b6d3d60c860a959"/>
+		<rom name="Rayxanber (Japan) (Track 03).bin" size="27271440" crc="11b06bd6" sha1="1376993c3e871c6d0288079c11675014fdb80d23"/>
+		<rom name="Rayxanber (Japan) (Track 04).bin" size="28776720" crc="82abd0fb" sha1="77f1b5bcd491d0a8d8cf40cb5839f5c5039ac2d7"/>
+		<rom name="Rayxanber (Japan) (Track 05).bin" size="33222000" crc="ea5980cf" sha1="3652831c0a1e9fc15cee1d3dc0cedee4f5f4725a"/>
+		<rom name="Rayxanber (Japan) (Track 06).bin" size="40736640" crc="f3054da2" sha1="ff9d2869e9eec806fded9d1ec5a9c9b53d6fc09f"/>
+		<rom name="Rayxanber (Japan) (Track 07).bin" size="33457200" crc="5c45258c" sha1="f14c6628e86ea81e874128435fc7daf003f5b4f6"/>
+		<rom name="Rayxanber (Japan) (Track 08).bin" size="14394240" crc="d9f6ff7e" sha1="98242339c7eb2676b76dff50a43c86d4f223fa07"/>
+		<rom name="Rayxanber (Japan) (Track 09).bin" size="24284400" crc="66cf9ae2" sha1="fef17c2b46e0e6c86ec80e485075a9e19dbd3f55"/>
+		<rom name="Rayxanber (Japan) (Track 10).bin" size="45746400" crc="0917370b" sha1="c432f016544f5977df515edb52f5e912574642b4"/>
+		<rom name="Rayxanber (Japan) (Track 11).bin" size="30329040" crc="3f8a499e" sha1="684238be9fdc1389201eed2ea1b4f11691f506ec"/>
+		<rom name="Rayxanber (Japan) (Track 12).bin" size="21850080" crc="e1023d09" sha1="1201679e5efe4d8c5bc65d7157a9951fb005e443"/>
+		<rom name="Rayxanber (Japan) (Track 13).bin" size="43441440" crc="40cfcc18" sha1="a70c24d902c7d07937c79d45a560eabdaa3f8b4e"/>
+		<rom name="Rayxanber (Japan) (Track 14).bin" size="6350400" crc="24f467dc" sha1="a5f58e8736f972b703a5a05e406e8f47c38fe298"/>
+		<rom name="Rayxanber (Japan) (Track 15).bin" size="4240656" crc="b110050a" sha1="3ef64e567cab4d44b058fb21d07b6e3e7e7f7e3b"/>
+		<rom name="Rayxanber (Japan).cue" size="1685" crc="3f57cc4b" sha1="77d494307d8be79a6b19cb0010fb631d4f875825"/>
 		-->
 		<description>Rayxanber</description>
 		<year>1990</year>
@@ -12120,7 +13022,7 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="rayxanber" sha1="5e7c36227d61be81f8a4cf4ef79889d12a72549c" />
+				<disk name="rayxanber (japan)" sha1="44c3f016aaa6365e05f5533adb82b56e2bf69ccf" />
 			</diskarea>
 		</part>
 	</software>
@@ -12702,6 +13604,35 @@
 		</part>
 	</software>
 
+	<software name="shamhatm" cloneof="shamhat">
+		<!--
+		Origin: redump.org / wiggy2k
+		<rom name="Shamhat - The Holy Circlet (Japan) (Track 1).bin" size="260484000" crc="5c856e63" sha1="2751566dd6bb590dfb4c67e5e54d5c9535233d80"/>
+		<rom name="Shamhat - The Holy Circlet (Japan) (Track 2).bin" size="5997600" crc="97dfe1ae" sha1="1d9d1ff4e3ee96c9b14caa867d58fe7f58a693d4"/>
+		<rom name="Shamhat - The Holy Circlet (Japan) (Track 3).bin" size="54695760" crc="95e66371" sha1="ae10a3f5ce8fdc8a841aaaea5936dff6e576a2b1"/>
+		<rom name="Shamhat - The Holy Circlet (Japan).cue" size="366" crc="65b04438" sha1="a7bd44db41f64066975a485c166dada00468867c"/>
+		-->
+		<description>Shamhat - The Holy Circlet (FM Towns Marty version)</description>
+		<year>1993</year>
+		<publisher>データウエスト (Data West)</publisher>
+		<info name="serial" value="DWFT 3012"/>
+		<info name="alt_title" value="シャムハト　－Ｔｈｅ　Ｈｏｌｙ　Ｃｉｒｃｌｅｔ－" />
+		<info name="release" value="199304xx" />
+		<info name="usage" value="Requires an FM Towns Marty. Won't run on any other models."/>
+		<part name="flop1" interface="floppy_3_5">
+			<feature name="part_id" value="User Disk" />
+			<dataarea name="flop" size="1261568">
+				<rom name="shamhat - the holy circlet (user disk) (marty version).hdm" size="1261568" crc="2acf7fea" sha1="4ad6670d633eaf158a24d5aa1fc9a3bcec0bbc0e" offset="000000" />
+			</dataarea>
+		</part>
+		<!-- Verified to use the same CD as the original version -->
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="shamhat - the holy circlet (japan)" sha1="538a5f793c970a3ad9732c9e30f75b5b68b7b8f0" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="shanghai">
 		<!--
 		Origin: redump.org
@@ -13628,9 +14559,34 @@
 
 	<software name="srogue">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Space Rogue.cue" size="2422" crc="505ed099" sha1="e7c51ba8a662bfb88c392cb1e71f051c80028533"/>
-		<rom name="Space Rogue.iso" size="341863200" crc="54c6360a" sha1="1eedb92c1c0668c5abe8d2a459f11263a48eb238"/>
+		Origin: redump.org
+		<rom name="Space Rogue (Japan) (Track 01).bin" size="9878400" crc="56c86b6d" sha1="95add72d920a13ca6036f7fc9812bf4bc6e800ad"/>
+		<rom name="Space Rogue (Japan) (Track 02).bin" size="13406400" crc="89868b75" sha1="8c205cea57ae2f8337c86950fd8453abe6e701cb"/>
+		<rom name="Space Rogue (Japan) (Track 03).bin" size="11995200" crc="db88f401" sha1="1cc63713b4a1630879e80d4a843fd7389c63e24b"/>
+		<rom name="Space Rogue (Japan) (Track 04).bin" size="7585200" crc="99620b1b" sha1="e291f44c67e182a883766c7936d2a52938d71645"/>
+		<rom name="Space Rogue (Japan) (Track 05).bin" size="16581600" crc="e83b1412" sha1="e8076df0bd2ff2bc44e56cb93bda7dffe6d66883"/>
+		<rom name="Space Rogue (Japan) (Track 06).bin" size="24872400" crc="50c479a0" sha1="da2e6eea1e35a249eeb60a717a4a31b38d782f92"/>
+		<rom name="Space Rogue (Japan) (Track 07).bin" size="15170400" crc="46e0640d" sha1="8a040eb5966f9c93f2c6074d346a975bfc9799eb"/>
+		<rom name="Space Rogue (Japan) (Track 08).bin" size="25048800" crc="55af8b95" sha1="c4906604e870ae29a648469c83bf54ee76ffd355"/>
+		<rom name="Space Rogue (Japan) (Track 09).bin" size="14817600" crc="23ae637e" sha1="be972c6c1aef6b438f2d8243b1f223e31debf41e"/>
+		<rom name="Space Rogue (Japan) (Track 10).bin" size="14994000" crc="cb47c7dd" sha1="414541ace28d71171ec56c5b9dde4bdad09ace10"/>
+		<rom name="Space Rogue (Japan) (Track 11).bin" size="15876000" crc="dfc7e4d1" sha1="b81c0a75b4f80ad2435dcccd6057108dbad3e9f0"/>
+		<rom name="Space Rogue (Japan) (Track 12).bin" size="7938000" crc="332f60ea" sha1="30562b4bea0241b80eab0b7a801091e0e1b2e4f5"/>
+		<rom name="Space Rogue (Japan) (Track 13).bin" size="17992800" crc="191d415b" sha1="4477001ff1a8fb34634e640f27d97958fd5ad99e"/>
+		<rom name="Space Rogue (Japan) (Track 14).bin" size="2469600" crc="702fe4ad" sha1="de0efe42fd2d986607470fef83ea726be050a900"/>
+		<rom name="Space Rogue (Japan) (Track 15).bin" size="3351600" crc="15eb0b29" sha1="e99eccb413d7c7e9264cdd7bcdde113ce4f17496"/>
+		<rom name="Space Rogue (Japan) (Track 16).bin" size="3528000" crc="8e064121" sha1="9bb3d005d63d79e17b5b661b933ebc0407feddc7"/>
+		<rom name="Space Rogue (Japan) (Track 17).bin" size="8996400" crc="4233b8ba" sha1="06aec2c8d257ea3ccb883a1421b14ebfcb088e27"/>
+		<rom name="Space Rogue (Japan) (Track 18).bin" size="7408800" crc="b6cfafea" sha1="52fb695acfb7a088eb45e3b28a785cb08f460af0"/>
+		<rom name="Space Rogue (Japan) (Track 19).bin" size="9702000" crc="c5198675" sha1="33dd8cb188d70dadbf01c23dae04d464d7ea36fb"/>
+		<rom name="Space Rogue (Japan) (Track 20).bin" size="14641200" crc="fddf0d42" sha1="466465dda4ee354675a8578cba63b1bdf59a872c"/>
+		<rom name="Space Rogue (Japan) (Track 21).bin" size="16405200" crc="783e207f" sha1="248eed086c9f4f1038277056214588b35bbcd384"/>
+		<rom name="Space Rogue (Japan) (Track 22).bin" size="16934400" crc="2736b86f" sha1="870195e8ec9b957e1ccd3fa4f3efe1baff2ec362"/>
+		<rom name="Space Rogue (Japan) (Track 23).bin" size="16405200" crc="62d260e6" sha1="96aa253b48bae7de4ec0679aedcf6b799cee6113"/>
+		<rom name="Space Rogue (Japan) (Track 24).bin" size="14112000" crc="82389fcd" sha1="c6db940354203608e4ff3c990d97693b4e4a91fb"/>
+		<rom name="Space Rogue (Japan) (Track 25).bin" size="17110800" crc="d6030688" sha1="1a6cbe275b626465b1d58015e782f24ea64d9045"/>
+		<rom name="Space Rogue (Japan) (Track 26).bin" size="14641200" crc="c2dbe1f1" sha1="d253134b2afdd5da652cf67fa018d8a21a909646"/>
+		<rom name="Space Rogue (Japan).cue" size="2923" crc="a7262191" sha1="9b3be2bbb9e59b4f46d95078166075ef503bcc0f"/>
 		-->
 		<description>Space Rogue</description>
 		<year>1990</year>
@@ -13641,7 +14597,7 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="space rogue" sha1="f409d07391dfdff739241710df792ddd84531a85" />
+				<disk name="space rogue (japan)" sha1="029429a703b4f93905f0063038abf14004bb1ccd" />
 			</diskarea>
 		</part>
 	</software>
@@ -13650,7 +14606,7 @@
 	This version seems to remove some kind of disc check (copy protection?).
 	Not sure when it was made or who made it.
 	-->
-	<software name="sroguend">
+	<software name="sroguend" cloneof="srogue">
 		<!--
 		Origin: Neo Kobe Collection
 		<rom name="Space Rogue (no disk check).cue" size="2438" crc="10b5891a" sha1="8456354802bb2dc2f2d01c11e9843d3e8d90849f"/>
@@ -14279,6 +15235,32 @@
 		</part>
 	</software>
 
+	<!-- Requires the FMT-411 Video Card, not currently emulated by MAME -->
+	<software name="telop" supported="no">
+		<!--
+		Origin: redump.org / wiggy2k
+		<rom name="Towns-Telop (Japan).bin" size="10231200" crc="a4790acd" sha1="401cb3b49f69680cd5fc3cbfc2b7f304e793587f"/>
+		<rom name="Towns-Telop (Japan).cue" size="85" crc="dbbe1098" sha1="d79a607758d3416a01e8d9a93438f5d35f8352f3"/>
+		-->
+		<description>Towns-Telop</description>
+		<year>1989</year>
+		<publisher>ラムダシステム (Lambda System)</publisher>
+		<info name="serial" value="DPS-69"/>
+		<info name="release" value="198905xx" />
+		<info name="usage" value="Requires the FMT-411 Video Card"/>
+		<part name="flop1" interface="floppy_3_5">
+			<feature name="part_id" value="Towns-Telop System Programs" />
+			<dataarea name="flop" size="1261568">
+				<rom name="townstelopv100.hdm" size="1261568" crc="b7b525b2" sha1="43fbba547a73a85ee7dbca8777728b31c3a4de44" offset="000000" />
+			</dataarea>
+		</part>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="towns-telop (japan)" sha1="bfd73a565bd224798eec08e648a0fc6be5bfa41a" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="tenkagom">
 		<!--
 		Origin: Neo Kobe Collection
@@ -14307,6 +15289,25 @@
 		</part>
 	</software>
 
+	<software name="tenranma">
+		<!--
+		Origin: redump.org
+		<rom name="Tenshin Ranma (Japan).bin" size="10231200" crc="d886d832" sha1="106036b5b730478e6bc7626d12b40f07f0a60903"/>
+		<rom name="Tenshin Ranma (Japan).cue" size="110" crc="24157ac7" sha1="1e875712a4cf447e3bcd61ec355d87715d04cd8a"/>
+		-->
+		<description>Tenshin Ranma</description>
+		<year>1992</year>
+		<publisher>エルフ (Elf)</publisher>
+		<info name="serial" value="HMD-135"/>
+		<info name="alt_title" value="天神乱魔" />
+		<info name="release" value="199205xx" />
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="tenshin ranma (japan)" sha1="545427376d437155f46836bb043feb2d6e6f855f" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="date">
 		<!--
 		Origin: Neo Kobe Collection
@@ -14823,6 +15824,36 @@
 		</part>
 	</software>
 
+	<!-- Missing a floppy disk -->
+	<software name="truheart" supported="no">
+		<!--
+		Origin: redump.org
+		<rom name="True Heart (Japan) (Track 01).bin" size="20815200" crc="b7b9c9d9" sha1="3f8f2ab8f60aa73692a0afc5b86dd4370269ff62"/>
+		<rom name="True Heart (Japan) (Track 02).bin" size="54507600" crc="6f4bf847" sha1="44eb881c45650f5f6e6dd4443627d9f588339949"/>
+		<rom name="True Heart (Japan) (Track 03).bin" size="44805600" crc="c5da9986" sha1="8d40fe2367cac3fd08e728fb0b46c36a45d478c3"/>
+		<rom name="True Heart (Japan) (Track 04).bin" size="44982000" crc="3aeb9577" sha1="1718cc5faa78bc2d44b09442e47610b560676a61"/>
+		<rom name="True Heart (Japan) (Track 05).bin" size="55213200" crc="01bf905b" sha1="39925a840f67b65c6de39ff718ab2c76fbac8978"/>
+		<rom name="True Heart (Japan) (Track 06).bin" size="55566000" crc="fe624ad5" sha1="3eae3e6e4d39f7712a4ef59302a465188ce98b48"/>
+		<rom name="True Heart (Japan) (Track 07).bin" size="49392000" crc="b774a425" sha1="52efa20fae3b8bf3c4ea2421a51a6965bfa69d2b"/>
+		<rom name="True Heart (Japan) (Track 08).bin" size="47275200" crc="2be5a75b" sha1="13291a097896e6e657bf4c43db9c5cc5ceed2509"/>
+		<rom name="True Heart (Japan) (Track 09).bin" size="41101200" crc="2afab07c" sha1="6b1a6ed9769f8146f67015035c5b492cd2a1ea56"/>
+		<rom name="True Heart (Japan) (Track 10).bin" size="58212000" crc="999b7bd5" sha1="bf2dbc36e68cf64723f621874d1987cf1c537f39"/>
+		<rom name="True Heart (Japan).cue" size="1135" crc="1baa7b0f" sha1="19ca4de8f59166a905296cb1bff2aa19376e9a48"/>
+		-->
+		<description>True Heart</description>
+		<year>1995</year>
+		<publisher>カクテル・ソフト (Cocktail Soft)</publisher>
+		<info name="serial" value="HMG-118"/>
+		<info name="alt_title" value="トゥルー・ハート" />
+		<info name="release" value="199502xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="true heart (japan)" sha1="2d360a246a227c0531e586412f48f51b34eac771" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="tuntroll">
 		<!--
 		Origin: redump.org
@@ -15105,22 +16136,24 @@
 
 	<software name="vastness">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Vastness.ccd" size="1525" crc="41bb06da" sha1="764c09836fc45e09f6efe47ed2b9da4c49a97e7f"/>
-		<rom name="Vastness.cue" size="228" crc="e8656a96" sha1="193c31c0fa10f79dd7c2601bf42bb764edb2d353"/>
-		<rom name="Vastness.img" size="463666224" crc="ff249f28" sha1="21c024c9f4bc2fcfaadf84072e094998facad4a7"/>
-		<rom name="Vastness.sub" size="18925152" crc="1f3a4a5d" sha1="7d26e94d29997ae4c1f204a143194c9a08c74860"/>
+		Origin: redump.org
+		<rom name="Vastness - Kuukyo no Ikenie-tachi (Japan) (Track 1).bin" size="10231200" crc="ca6a503d" sha1="688f246987699717d7a3caa49914c34e5c2637ec"/>
+		<rom name="Vastness - Kuukyo no Ikenie-tachi (Japan) (Track 2).bin" size="5731824" crc="65e978bf" sha1="3bbb11f1180f0985225e774a6664badeb11fbd51"/>
+		<rom name="Vastness - Kuukyo no Ikenie-tachi (Japan) (Track 3).bin" size="232466976" crc="befe530a" sha1="99717ae81e6b5dc9b7f09bfdd7ed14f541f90428"/>
+		<rom name="Vastness - Kuukyo no Ikenie-tachi (Japan) (Track 4).bin" size="123978624" crc="dbd4fc08" sha1="af28b6e43f566c5d07d9af67826cbec7a379c4c7"/>
+		<rom name="Vastness - Kuukyo no Ikenie-tachi (Japan) (Track 5).bin" size="91257600" crc="2ce807e4" sha1="8a25b2ddd808f4403a854e3d9db0f92464ca3052"/>
+		<rom name="Vastness - Kuukyo no Ikenie-tachi (Japan).cue" size="657" crc="aad2990f" sha1="4e750c468bccb248fab521e20a4d55a422b5490d"/>
 		-->
 		<description>Vastness - Kuukyo no Ikenie-tachi</description>
 		<year>1993</year>
 		<publisher>CD Bros.</publisher>
-		<info name="serial" value="HMF-132"/>
+		<info name="serial" value="HMF-132 / CB-001"/>
 		<info name="alt_title" value="ヴアーストニス 空虚の生贄達" />
 		<info name="release" value="199309xx" />
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="vastness" sha1="12d1fbe66e92cd580616814077eebb402d4e0332" />
+				<disk name="vastness - kuukyo no ikenie-tachi (japan)" sha1="bd8b85316d31bbe6efc543ef9c5fbf2e3a7b02d7" />
 			</diskarea>
 		</part>
 	</software>
@@ -15243,7 +16276,7 @@
 		<rom name="Viper V6 Turbo RS.img" size="63151200" crc="307627bb" sha1="832dced51299a3f13ffc4532c76215f1b558c6d0"/>
 		<rom name="Viper V6 Turbo RS.sub" size="2577600" crc="b7dcf321" sha1="0993fbd9fcd53cffd0ca231f5180a9d233af319c"/>
 		-->
-		<description>Viper V6 Turbo RS</description>
+		<description>Viper-V6 Turbo RS</description>
 		<year>1995</year>
 		<publisher>ソニア (Sogna)</publisher>
 		<info name="serial" value="HMG-112"/>
@@ -15256,15 +16289,32 @@
 		</part>
 	</software>
 
+	<software name="viperv8">
+		<!--
+		Origin: redump.org
+		<rom name="Viper-V8 Turbo RS (Japan).bin" size="48392400" crc="87d9a05c" sha1="cea620be746e1e86e1d1c06ec5ece8898144ae59"/>
+		<rom name="Viper-V8 Turbo RS (Japan).cue" size="91" crc="63d2d707" sha1="861e94a133304a61bdb5da4ecb8125195b2292d7"/>
+		-->
+		<description>Viper-V8 Turbo RS</description>
+		<year>1995</year>
+		<publisher>ソニア (Sogna)</publisher>
+		<info name="serial" value="HMG-121"/>
+		<info name="release" value="199506xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="viper-v8 turbo rs (japan)" sha1="f3348d252a15f7fa14439dedd4472eaf84cab96e" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="viperv10">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Viper V10 Turbo RS.ccd" size="782" crc="a5ba1d7c" sha1="6d16e338de23ff02145c648537558cfd50efd3a5"/>
-		<rom name="Viper V10 Turbo RS.cue" size="82" crc="3320346c" sha1="f93d377ee8aab8c26023a226b986552295cb14ed"/>
-		<rom name="Viper V10 Turbo RS.img" size="45911040" crc="b3d25f40" sha1="f6a2ace6e0c37402f2504fb4f4c2724db2b7dd4f"/>
-		<rom name="Viper V10 Turbo RS.sub" size="1873920" crc="5fe696ea" sha1="784729f33c6b2eabeed60dfdc6b3edbd64349d31"/>
+		Origin: redump.org
+		<rom name="Viper-V10 Turbo RS (Japan).bin" size="45911040" crc="f7232c71" sha1="7c988b0721f8e4d6cb95cef4bb81b56a3e7ee515"/>
+		<rom name="Viper-V10 Turbo RS (Japan).cue" size="92" crc="dd1128fd" sha1="9224cc239756d037b78c55f7c531fb4319cdb143"/>
 		-->
-		<description>Viper V10 Turbo RS</description>
+		<description>Viper-V10 Turbo RS</description>
 		<year>1995</year>
 		<publisher>ソニア (Sogna)</publisher>
 		<info name="serial" value="HMG-127"/>
@@ -15272,7 +16322,26 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="viper v10 turbo rs" sha1="0afcc96abbe300b9b0499948fede525dcf084ba0" />
+				<disk name="viper-v10 turbo rs (japan)" sha1="bc0b8f2a384442215fb251c124caa2fa5dec20ea" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="viperv12">
+		<!--
+		Origin: redump.org
+		<rom name="Viper-V12 RS (Japan).bin" size="77674800" crc="f1045710" sha1="e93415c638877e6592499623b2c7fc33364e36a3"/>
+		<rom name="Viper-V12 RS (Japan).cue" size="86" crc="848f6b70" sha1="0c491350006caf657746bd49a675aedbc32ec5d5"/>
+		-->
+		<description>Viper-V12 RS</description>
+		<year>1995</year>
+		<publisher>ソニア (Sogna)</publisher>
+		<info name="serial" value="HMG-141"/>
+		<info name="release" value="199512xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="viper-v12 rs (japan)" sha1="40973e9098c64c5e14c1c72df03487a0e82aad6e" />
 			</diskarea>
 		</part>
 	</software>
@@ -15924,6 +16993,34 @@
 		</part>
 	</software>
 
+	<software name="yeshg">
+		<!--
+		Origin: redump.org
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 01).bin" size="265220928" crc="cc93d1fe" sha1="a8225d3549ba99aeb0696503ad8ba382c744e8a7"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 02).bin" size="31681440" crc="f1895c66" sha1="fa365fdf0aab278c77c5a1ad7d01ed73588e37e5"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 03).bin" size="29153040" crc="66458fe7" sha1="9ea60b9228171cdfe8b3d43927274e53fc0998fa"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 04).bin" size="24108000" crc="a7c1d463" sha1="3f41bc0e27ba089c0d58af4acd3f0b8e5fb1b404"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 05).bin" size="24681888" crc="ee1b1cc0" sha1="becd261a5ccf758371850832f0535b33ac3c3d8b"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 06).bin" size="32022480" crc="41224dae" sha1="5d183e42b301f3090e1ebc3a6ef099b5df68c1e6"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 07).bin" size="32676336" crc="9a87018a" sha1="240ab5985db6a447767e9dddee40e9653dc7aa5c"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 08).bin" size="35028336" crc="6316956e" sha1="f06cdd56c093157afff51d782c0a4b83ccefae5c"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 09).bin" size="43956528" crc="9b5a41eb" sha1="f8c83a2f3af2630c7d75ace7ff82f4296a1c9ca7"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 10).bin" size="28515648" crc="21095ba9" sha1="04cc52a6102666dd991c6affa4df84a40a572fb1"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 11).bin" size="24919440" crc="8b9f2552" sha1="6872b88379d3688ad68fad2e3e7cfde836df70e9"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan).cue" size="1238" crc="1f9dbaf4" sha1="f75cf01ff1292bbd61d71ac749e896cce1283b99"/>
+		-->
+		<description>YES! HG - Erotic Voice Version</description>
+		<year>1995</year>
+		<publisher>姫屋ソフト (Himeya Soft)</publisher>
+		<info name="release" value="199512xx" />
+		<info name="usage" value="Requires 2 MB RAM"/>
+		<part name="cdrom" interface="fmt_cdrom">
+			<diskarea name="cdrom">
+				<disk name="yes hg - erotic voice version (japan)" sha1="1973d5e32f50ada90f093203de09c87b51af489d" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="yojusenk">
 		<!--
 		Origin: redump.org
@@ -15947,21 +17044,32 @@
 	<!-- PC-98x1 / FM Towns hybrid, also included in pc98_cd.xml -->
 	<software name="yojusen2">
 		<!--
-		Origin: P2P
-		<rom name="Image.cdm" size="3205" crc="ca4446d3" sha1="8028e2647ef572de3dcf27ce5332f7ca00530a42"/>
-		<rom name="Image.cue" size="586" crc="b6b20ac9" sha1="b8bc72b8d909546d1078b1921ec04f526e746e3a"/>
-		<rom name="Image.img" size="649808208" crc="16f70c96" sha1="29b587dbcdaae2d471b7c13c1ce5c5825bc86eaf"/>
-		<rom name="Image.sub" size="26522784" crc="af8cb6ad" sha1="f77df38b35d73e8bc3e20033a8878af0e9c03ea8"/>
+		Origin: redump.org
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 01).bin" size="245104272" crc="eaf647b7" sha1="cd8ad09cfbd77af4bdc14c87cf3a40f95d5693e0"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 02).bin" size="27421968" crc="01ffa5b8" sha1="fb6f409029df70a25b91cf63fddd15f22f57618f"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 03).bin" size="21304416" crc="a8a49409" sha1="6a4fa97b448e00e7a0f3aca1c8b1b8fbf8fb3d70"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 04).bin" size="29240064" crc="8e56a2d5" sha1="00eca09b1c442e4ca6047511650974b5b22e3aa8"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 05).bin" size="31634400" crc="547bec0d" sha1="5167d5ee996ed8db4094c73e8b240ff38a978e7f"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 06).bin" size="41877360" crc="1b56f87a" sha1="00343ee6bb85f4af0f55cfc554324383d14647bc"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 07).bin" size="37817808" crc="e0009c74" sha1="1f49b162cf913429530d007483246f7ff27b3e05"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 08).bin" size="30418416" crc="d2031484" sha1="83190a6ec4773b857ec8f8c45eb32e24906f5821"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 09).bin" size="29000160" crc="77290d48" sha1="11587e4fef756f033a9507c9a89fee8d4336e137"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 10).bin" size="41778576" crc="b1ed8767" sha1="53f36fe9ca460f980a66502856b46eaab48d612a"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 11).bin" size="40562592" crc="6090e013" sha1="021fd651bb35cb76b71e5ca90dfa8df3ea2a8b27"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 12).bin" size="43001616" crc="5d47a747" sha1="55a4b0925d0a52c24248fe864c0892dcf8df2d6a"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 13).bin" size="30646560" crc="1241e2db" sha1="c189de3cb6bf93d1b90159499cd35611faeb9f0e"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan).cue" size="1575" crc="ebb77713" sha1="881d04c4e6938dd301f3acfdf9139f2a56a9e000"/>
 		-->
 		<description>Youjuu Senki 2 - Reimei no Senshi-tachi</description>
 		<year>1993</year>
 		<publisher>ディー・オー (D.O.)</publisher>
+		<info name="serial" value="DCD-0011"/>
 		<info name="alt_title" value="妖獣戦記2 黎明の戦士たち" />
 		<info name="release" value="199402xx" />
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="yojusen2" sha1="219f6731e9960291832df99d43ee52ab5d62bc52" />
+				<disk name="youjuu senki 2 - reimei no senshi-tachi (japan)" sha1="365c5e7983cc3aa59a97992035c6ddf76a86ab6e" />
 			</diskarea>
 		</part>
 	</software>
@@ -16137,11 +17245,20 @@
 
 	<software name="zenith">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Zenith.ccd" size="2872" crc="4426b6e6" sha1="7783bb8cd8cec3d812925d3edbdac4f6bd7dc625"/>
-		<rom name="Zenith.cue" size="502" crc="b24661ae" sha1="6873712a9eaf075f7f10d6d93c0632de4675f5df"/>
-		<rom name="Zenith.img" size="635263440" crc="59a86e0b" sha1="e30974c5d832961713cee73134e787fd880ad7fc"/>
-		<rom name="Zenith.sub" size="25929120" crc="751d0315" sha1="d4e2ec606815d6abd72a7a98606bc9a975f3ce58"/>
+		Origin: redump.org
+		<rom name="Animation Zenith (Japan) (Track 01).bin" size="42253680" crc="57313645" sha1="db347eeb7b89001e4c4823b9e9ab99183a042558"/>
+		<rom name="Animation Zenith (Japan) (Track 02).bin" size="71893584" crc="0c118374" sha1="6dea000ab14066e3eecef5a37f96af19e53c6e19"/>
+		<rom name="Animation Zenith (Japan) (Track 03).bin" size="67761120" crc="e26102e4" sha1="373fc9d93256b126c88f72816626c9a63fbc7db7"/>
+		<rom name="Animation Zenith (Japan) (Track 04).bin" size="66528672" crc="8d800702" sha1="9c133dc99ec8ed72c2a5194a1665385a33915b53"/>
+		<rom name="Animation Zenith (Japan) (Track 05).bin" size="69177024" crc="08b90269" sha1="2d0150bb0b3f124e67ff77159535bcc706cd5f00"/>
+		<rom name="Animation Zenith (Japan) (Track 06).bin" size="78493296" crc="f835785a" sha1="28be5e63f35aa9037c1e5aaabaa67d62a04abb97"/>
+		<rom name="Animation Zenith (Japan) (Track 07).bin" size="77653632" crc="dffc1548" sha1="b43d67a4dbbfcb295ab66b0f8c7efbdd0edb328a"/>
+		<rom name="Animation Zenith (Japan) (Track 08).bin" size="39610032" crc="1b36ee9f" sha1="642cf720f6c302e443f13b6416b84b4cdf5e0bf3"/>
+		<rom name="Animation Zenith (Japan) (Track 09).bin" size="27981744" crc="e81f8d36" sha1="1f15ba82a16fc749fea01fce95613e50d5f115b6"/>
+		<rom name="Animation Zenith (Japan) (Track 10).bin" size="26140128" crc="61430506" sha1="8f7c96d14614904f4060b4d63d6167270010a468"/>
+		<rom name="Animation Zenith (Japan) (Track 11).bin" size="23870448" crc="86a01836" sha1="c56edc34a923f3d22d16df8ca555f86dedc35d1d"/>
+		<rom name="Animation Zenith (Japan) (Track 12).bin" size="43900080" crc="0e891e7d" sha1="aef3c7caa61e937c05253e3873c5da2af2c9d848"/>
+		<rom name="Animation Zenith (Japan).cue" size="1180" crc="00ecc2e4" sha1="a7398fd40a67d4c494b3030992241852c92183b9"/>
 		-->
 		<description>Zenith</description>
 		<year>1995</year>
@@ -16151,7 +17268,7 @@
 		<info name="usage" value="Requires 2 MB RAM"/>
 		<part name="cdrom" interface="fmt_cdrom">
 			<diskarea name="cdrom">
-				<disk name="zenith" sha1="3709c5434e21c060895b0ee0d7921e7f2d0c4ca0" />
+				<disk name="animation zenith (japan)" sha1="c99f1b2db763f5e0eaf48cb5726351a81d2fd916" />
 			</diskarea>
 		</part>
 	</software>
diff -Nru mame-0.222+dfsg.1/hash/g7400.xml mame-0.224+dfsg.1/hash/g7400.xml
--- mame-0.222+dfsg.1/hash/g7400.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/g7400.xml	2020-08-26 08:57:19.000000000 +0000
@@ -3,421 +3,483 @@
 <!--
 license:CC0
 
-Some of these were normal Videopac G7000 carts with enhanced graphics for the Videopac Plus G7400 and the unreleased
-Odyssey³ Command Center
+The softwarelist is sorted alphabetically per title, not counting clone sets.
+When adding new sets, avoid naming conflicts between g7400.xml and odyssey2.xml,
+games that have prototypes or older sets in odyssey2.xml are marked "Plus" here.
+
+Most of these were normal Videopac G7000 carts with enhanced graphics for the
+Videopac Plus G7400 and the unreleased Odyssey³ Command Center
 
 Undumped prototypes:
+
 USA:
-TMS2764
-Freedom Fighters
-Pick Axe Pete
+- TMS2764
+- Freedom Fighters
+- Pick Axe Pete
 
 http://www.ozyr.com/rene/PICS/protos.jpg
-Flash Point (PAL conversion exists)
-Modem Program
-Baseball
-Attack of the Time Lord
-Requins [Shark Hunter]
-monsternet dedicated g7400 840209 [Norseman]
-58+ Air Battle
+- Flash Point (PAL conversion exists)
+- Modem Program
+- Baseball
+- Attack of the Time Lord
+- Requins [Shark Hunter]
+- monsternet dedicated g7400 840209 [Norseman]
+- 58+ Air Battle
+
 http://www.ozyr.com/rene/PICS/odyssey3_set.jpg
 There is an Odyssey³ Command Center Voice Module, could be differences to released Odyssey² version.
 
 Europe:
-Melrep
+- Melrep
 
 Do Videopac+/Odyssey3 versions exist?:
-Syracuse (France)
-Robot City (USA)
-Interpol (USA)
+- Syracuse (France)
+- Robot City (USA)
+- Interpol (USA)
 
 -->
 
-<softwarelist name="g7400" description="Philips Videopac Plus G7400 cartridges">
+<softwarelist name="g7400" description="Philips Videopac+ cartridges">
 
-<!-- Philips Videopac+ G7400 carts -->
+<!-- Philips Videopac+ G7400 carts, compatible on G7000 -->
 
-	<software name="airbattl" supported="no">
-		<description>Air Battle (Euro)</description>
+	<software name="airbattl">
+		<description>Air Battle (Euro, Plus)</description>
 		<year>1983</year>
 		<publisher>Philips</publisher>
 		<info name="serial" value="58"/>
 		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom12" />
-			<dataarea name="rom" size="12288">
-				<rom name="air battle (europe).bin" size="12288" crc="d94d4109" sha1="66837bbd0b9df12c89215f533a1ec8b5a42d5610"/>
+			<feature name="slot" value="o2_rally" />
+			<feature name="b_pin" value="1" />
+			<dataarea name="rom" size="0x4000">
+				<rom name="air battle (europe).bin" offset="0x0000" size="0x3000" crc="d94d4109" sha1="66837bbd0b9df12c89215f533a1ec8b5a42d5610"/>
+				<rom                                offset="0x1000" size="0x3000" loadflag="reload" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="backgamm" supported="no">
-		<description>Backgammon (Euro)</description>
-		<year>1982</year>
-		<publisher>GST Video</publisher>
-		<info name="programmer" value="Mick Rouse"/>
-		<info name="serial" value="48"/>
+	<software name="2bsktbwlpl">
+		<description>Basket Bowling+ (Fra, Plus)</description>
+		<year>198?</year>
+		<publisher>Brandt</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="backgammon (europe).bin" size="8192" crc="9d2c45dc" sha1="bcb420dc1cc6fa5cf13dc46c546145953fb11643"/>
+				<rom name="basket - bowling + (france).bin" size="8192" crc="b5fb1416" sha1="c341ed24346546b75de2ab24af1a9223ca2d1aac"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="billard" supported="no">
-		<description>Billard+ (Fra)</description>
-		<year>1983</year>
-		<publisher>Jopac</publisher>
-		<info name="programmer" value="Ed Averett"/>
-		<info name="serial" value="JXA D03"/>
+	<software name="2bwlbsktpl" cloneof="2bsktbwlpl">
+		<description>Tenpin Bowling/Basketball (Euro, Plus, Prototype)</description>
+		<year>198?</year>
+		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="billiard americain (france).bin" size="8192" crc="4cec1404" sha1="004ea921b691db6b310f5b51c495df9b86be3aa8"/>
+				<rom name="tenpin bowling - basketball (europe).bin" size="8192" crc="e5fb4260" sha1="29d5c9b252e65d257f1472e343039ed8c47eeb05"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="billiard" cloneof="billard" supported="no">
-		<description>Billiard (Euro, Prototype)</description>
-		<year>198?</year>
-		<publisher>Philips</publisher>
+	<software name="billardpl">
+		<description>Billard+ (Fra, Plus)</description>
+		<year>1983</year>
+		<publisher>Brandt</publisher>
 		<info name="programmer" value="Ed Averett"/>
+		<info name="serial" value="JXA D03"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="billiard (europe).bin" size="8192" crc="3c949a57" sha1="4c7f1dc569e9abe829e36dbe42d91d39419bfd60"/>
+				<rom name="billiard americain (france).bin" size="8192" crc="4cec1404" sha1="004ea921b691db6b310f5b51c495df9b86be3aa8"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="flipper" supported="no">
-		<description>Flipper+ (Fra)</description>
+	<software name="billiardpl" cloneof="billardpl">
+		<description>Billiard (Euro, Plus, Prototype)</description>
 		<year>198?</year>
-		<publisher>Jopac</publisher>
+		<publisher>Philips</publisher>
+		<info name="programmer" value="Ed Averett"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="billard electrique (france).bin" size="8192" crc="ac5c74e6" sha1="215439c1044b93888b71bd6a210ebfda93d97c22"/>
+				<rom name="billiard (europe).bin" size="8192" crc="3c949a57" sha1="4c7f1dc569e9abe829e36dbe42d91d39419bfd60"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="flippera" cloneof="flipper" supported="no">
-		<description>Flipper+ (Fra, Alt?)</description>
+	<software name="claypigpl">
+		<description>Clay Pigeon (Euro, Plus, Prototype)</description>
 		<year>198?</year>
-		<publisher>Jopac</publisher>
+		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="flipper (europe).bin" size="8192" crc="2fce9245" sha1="6510b54e3e9bf9bc7ae558d1d16fa73294701ddb"/>
+				<rom name="clay pigeon (europe).bin" size="8192" crc="6fabcb7e" sha1="3f6dbef6bf13427a52f4f7324d9c33cfce52adb0"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="claypig" supported="no">
-		<description>Clay Pigeon (Euro, Prototype)</description>
+	<software name="claypigpla" cloneof="claypigpl">
+		<description>Clay Pigeon (Euro, Plus, Prototype, Alt)</description>
 		<year>198?</year>
 		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="clay pigeon (europe).bin" size="8192" crc="6fabcb7e" sha1="3f6dbef6bf13427a52f4f7324d9c33cfce52adb0"/>
+				<rom name="clay pigeon (europe, alt).bin" size="8192" crc="7c989567" sha1="431547d04d5c57b0730b1136f8e68b0ac44b755f"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="cosmic" supported="no">
-		<description>Cosmic Conflict (Euro)</description>
+	<software name="cosmicpl">
+		<description>Cosmic Conflict (Euro, Plus)</description>
 		<year>1983</year>
 		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
 				<rom name="cosmic conflict (europe).bin" size="8192" crc="a8dbed92" sha1="99932be5496a0daa7dffc70c7a3ab85bfa726043"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="3csaucpt" cloneof="3rcsocpt" supported="no">
-		<description>Grand Prix+ (Fra)</description>
-		<year>1983</year>
-		<publisher>Jopac</publisher>
+	<software name="cosmospl" cloneof="cosmicpl">
+		<description>Cosmos+ (Fra, Plus)</description>
+		<year>198?</year>
+		<publisher>Brandt</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="course de voitures - autodrome - cryptogramme (france).bin" size="8192" crc="9bc04ebb" sha1="e69e524eba10976310333787eafef1d18da6d568"/>
+				<rom name="cosmos (france).bin" size="8192" crc="105231f8" sha1="9220dc32d3bb9225292f3e709d1320b9b1052140"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="demon" supported="no">
-		<description>Demon Attack+ (Fra)</description>
+	<software name="demonpl">
+		<description>Demon Attack+ (Fra, Plus)</description>
 		<year>198?</year>
-		<publisher>Radiola</publisher>
+		<publisher>Brandt</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
 				<rom name="demon attack (france).bin" size="8192" crc="50af9d45" sha1="cfd1337c8d5a40f2f4e1ab49158a8963764919da"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="exojet" supported="no">
-		<description>Exojet+ (Fra)</description>
+	<software name="flipperpl">
+		<description>Flipper+ (Fra, Plus)</description>
 		<year>198?</year>
-		<publisher>Jopac</publisher>
+		<publisher>Brandt</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="exojet (france).bin" size="8192" crc="cfca6f39" sha1="8aafcd055a2ef45c3d85804c8a3ea04d9a9732ab"/>
+				<rom name="billard electrique (france).bin" size="8192" crc="ac5c74e6" sha1="215439c1044b93888b71bd6a210ebfda93d97c22"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<!-- possibly only the pal converted dump is available  -->
-	<software name="flashp" supported="no">
-		<description>Flashpoint (USA, Prototype, PAL Conversion)</description>
-		<year>2004</year>
+	<software name="flipperpla" cloneof="flipperpl">
+		<description>Flipper Game (Euro, Plus, Prototype)</description>
+		<year>198?</year>
 		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="flashpoint (usa)(proto)(pal conversion).bin" size="8192" crc="06861a9c" sha1="6810ccc1508244216860271417a866618a731ae2"/>
+				<rom name="flipper (europe).bin" size="8192" crc="2fce9245" sha1="6510b54e3e9bf9bc7ae558d1d16fa73294701ddb"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="freedom" supported="no">
-		<description>Freedom Fighters (Euro)</description>
+	<software name="freedompl">
+		<description>Freedom Fighters (Euro, Plus)</description>
 		<year>198?</year>
 		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
 				<rom name="freedom fighters (europe).bin" size="8192" crc="1931f5c5" sha1="3f8d6cd5bed5244b400c69640065c77ec103a6cd"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="liberte" cloneof="freedom" supported="no">
-		<description>Combattants de la Liberté (Fra)</description>
+	<software name="beespl">
+		<description>Killer Bees (Euro, Plus)</description>
 		<year>198?</year>
-		<publisher>Radiola</publisher>
+		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="guerre de l'espace (france).bin" size="8192" crc="105231f8" sha1="9220dc32d3bb9225292f3e709d1320b9b1052140"/>
+				<rom name="killer bees (europe).bin" size="8192" crc="dee70b33" sha1="9253586337917bda0b7c43dbb251999b6c974f30"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="helicopt" supported="no">
-		<description>Helicopter Rescue (Euro)</description>
-		<year>1983</year>
-		<publisher>Philips</publisher>
-		<info name="serial" value="59"/>
+	<software name="infernal" cloneof="beespl">
+		<description>La Ruche Infernale (Fra, Plus)</description>
+		<year>198?</year>
+		<publisher>Radiola</publisher>
 		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom16" />
-			<dataarea name="rom" size="16384">
-				<rom name="helicopter rescue (europe).bin" size="16384" crc="c4134df8" sha1="7369a2d3fb81ddc4c8086bbcd245c11ea7aaa331"/>
+			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
+			<dataarea name="rom" size="8192">
+				<rom name="la ruche infernale (france).bin" size="8192" crc="20e2f7be" sha1="34f91468bf42b26eb237af342164043c16d173ca"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="2bsktbwl" supported="no">
-		<description>Basket Bowling+ (Fra)</description>
+	<software name="loony">
+		<description>Loony Balloon (Euro, Plus)</description>
 		<year>198?</year>
-		<publisher>Jopac</publisher>
+		<publisher>Philips</publisher>
+		<info name="serial" value="54"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="basket - bowling + (france).bin" size="8192" crc="b5fb1416" sha1="c341ed24346546b75de2ab24af1a9223ca2d1aac"/>
+				<rom name="loony balloon (europe).bin" size="8192" crc="b932d584" sha1="8dd1cba7ce6622aaf5e1b432ab8d47e395d211f2"/>
 			</dataarea>
 		</part>
 	</software>
-	<software name="2bwlbskt" cloneof="2bsktbwl" supported="no">
-		<description>Tenpin Bowling/Basketball (Euro, Prototype)</description>
+
+	<software name="neutron">
+		<description>Neutron Star (Euro, Plus)</description>
 		<year>198?</year>
 		<publisher>Philips</publisher>
+		<info name="serial" value="55"/>
 		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="8192">
-				<rom name="tenpin bowling - basketball (europe).bin" size="8192" crc="e5fb4260" sha1="29d5c9b252e65d257f1472e343039ed8c47eeb05"/>
+			<feature name="slot" value="o2_rally" />
+			<feature name="b_pin" value="1" />
+			<dataarea name="rom" size="0x4000">
+				<rom name="neutron star (europe).bin" offset="0x0000" size="0x3000" crc="be11157c" sha1="fde3e0791b9cbef91a8462764ebf09a457ffe038"/>
+				<rom                                  offset="0x1000" size="0x3000" loadflag="reload" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="bees" supported="no">
-		<description>Killer Bees (Euro)</description>
+	<software name="nightmar">
+		<description>Nightmare (Euro, Plus)</description>
 		<year>198?</year>
 		<publisher>Philips</publisher>
+		<info name="serial" value="53"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="killer bees (europe).bin" size="8192" crc="dee70b33" sha1="9253586337917bda0b7c43dbb251999b6c974f30"/>
+				<rom name="nightmare (europe).bin" size="8192" crc="26b0ff5b" sha1="c8988f13c2af7632de6ef326ed617279bf6c8221"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="loony" supported="no">
-		<description>Loony Balloon (Euro)</description>
+	<software name="pickaxepl">
+		<description>Pickaxe Pete (Euro, Plus)</description>
 		<year>198?</year>
 		<publisher>Philips</publisher>
-		<info name="serial" value="54"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="loony balloon (europe).bin" size="8192" crc="b932d584" sha1="8dd1cba7ce6622aaf5e1b432ab8d47e395d211f2"/>
+				<rom name="pickaxe pete (europe).bin" size="8192" crc="b2ffb353" sha1="182829b4cd5184ab3705d26f75e3d8c497b5abf6"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="motocras" supported="no">
-		<description>Moto-Crash (Fra)</description>
-		<year>198?</year>
-		<publisher>Radiola</publisher>
+	<software name="3rcsocptpl">
+		<description>Race/Spin-out/Cryptogram (Euro, Plus)</description>
+		<year>1983</year>
+		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="moto-crash (france).bin" size="8192" crc="68560dc7" sha1="f6de2f95e5cf4849a4d7071b1a470c3ef0634e5f"/>
+				<rom name="race - spin-out - cryptogram (europe).bin" size="8192" crc="ee3ee642" sha1="69a73208c0c0a6d1b879e62d0ccf3a5a534510bd"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="neutron" supported="no">
-		<description>Neutron Star (Euro)</description>
-		<year>198?</year>
-		<publisher>Philips</publisher>
-		<info name="serial" value="55"/>
+	<software name="3csaucptpl" cloneof="3rcsocptpl">
+		<description>Grand Prix+ (Fra, Plus)</description>
+		<year>1983</year>
+		<publisher>Brandt</publisher>
 		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom12" />
-			<dataarea name="rom" size="12288">
-				<rom name="neutron star (europe).bin" size="12288" crc="be11157c" sha1="fde3e0791b9cbef91a8462764ebf09a457ffe038"/>
+			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
+			<dataarea name="rom" size="8192">
+				<rom name="course de voitures - autodrome - cryptogramme (france).bin" size="8192" crc="9bc04ebb" sha1="e69e524eba10976310333787eafef1d18da6d568"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="nightmar" supported="no">
-		<description>Nightmare (Euro)</description>
+	<software name="satellitpl">
+		<description>Satellite Attack (Euro, Plus)</description>
 		<year>198?</year>
 		<publisher>Philips</publisher>
-		<info name="serial" value="53"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="nightmare (europe).bin" size="8192" crc="26b0ff5b" sha1="c8988f13c2af7632de6ef326ed617279bf6c8221"/>
+				<rom name="satellite attack (europe).bin" size="8192" crc="b4735e6b" sha1="8bec213886d026040ed2037f01e8e9f81fa395b9"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="norseman" supported="no">
-		<description>Norseman (Euro)</description>
+	<software name="stonepl">
+		<description>Stone Sling (Euro, Plus)</description>
 		<year>198?</year>
-		<publisher>GST Video</publisher>
-		<info name="programmer" value="Andy Eltisand Jake Dowding"/>
-		<info name="serial" value="57"/>
+		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="norseman (europe).bin" size="8192" crc="a75c42f8" sha1="8e8fe23225631eef673517f3e2970eade15b7a5c"/>
+				<rom name="stone sling (europe).bin" size="8192" crc="2391c2fb" sha1="d358fcc6a0fa6469d7063114aa0dc143af14e3e9"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="pickaxe" supported="no">
-		<description>Pickaxe Pete (Euro)</description>
+	<software name="hawks">
+		<description>Terrahawks (Euro, Plus)</description>
 		<year>198?</year>
 		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="pickaxe pete (europe).bin" size="8192" crc="b2ffb353" sha1="182829b4cd5184ab3705d26f75e3d8c497b5abf6"/>
+				<rom name="terrahawks (europe).bin" size="8192" crc="764894a1" sha1="0c01df9799b6d0235fef3c86fec1beac5b0b2d74"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="3rcsocpt" supported="no">
-		<description>Race/Spin-out/Cryptogram (Euro)</description>
-		<year>1983</year>
-		<publisher>Philips</publisher>
+
+
+<!-- VP+ uniques, completely new games(not a simple upgrade to an VP old release/prototype), still compatible with VP -->
+
+	<software name="exojet">
+		<description>Exojet+ (Fra)</description>
+		<year>198?</year>
+		<publisher>Brandt</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="race - spin-out - cryptogram (europe).bin" size="8192" crc="ee3ee642" sha1="69a73208c0c0a6d1b879e62d0ccf3a5a534510bd"/>
+				<rom name="exojet (france).bin" size="8192" crc="cfca6f39" sha1="8aafcd055a2ef45c3d85804c8a3ea04d9a9732ab"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="infernal" supported="no">
-		<description>La Ruche Infernale (Fra)</description>
+	<software name="englouti">
+		<description>Le Tresor Englouti+ (Fra)</description>
 		<year>198?</year>
-		<publisher>Radiola</publisher>
+		<publisher>Brandt</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="la ruche infernale (france).bin" size="8192" crc="20e2f7be" sha1="34f91468bf42b26eb237af342164043c16d173ca"/>
+				<rom name="le tresor englouti (france).bin" size="8192" crc="b2f0f0b4" sha1="c0fcaef6a18026e0acc04c3d48443d768043cb03"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="satellit" supported="no">
-		<description>Satellite Attack (Euro)</description>
-		<year>198?</year>
+
+
+<!-- VP+ exclusives, they won't work on VP -->
+
+	<!-- possibly only the pal converted dump is available  -->
+	<software name="flashp">
+		<description>Flashpoint (USA, Prototype, PAL Conversion)</description>
+		<year>2004</year>
 		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="satellite attack (europe).bin" size="8192" crc="b4735e6b" sha1="8bec213886d026040ed2037f01e8e9f81fa395b9"/>
+				<rom name="flashpoint (usa)(proto)(pal conversion).bin" size="8192" crc="06861a9c" sha1="6810ccc1508244216860271417a866618a731ae2"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="stone" supported="no">
-		<description>Stone Sling (Euro)</description>
-		<year>198?</year>
+	<software name="helicopt" supported="partial">
+		<description>Helicopter Rescue (Euro)</description>
+		<year>1983</year>
 		<publisher>Philips</publisher>
+		<info name="serial" value="59"/>
 		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="8192">
-				<rom name="stone sling (europe).bin" size="8192" crc="2391c2fb" sha1="d358fcc6a0fa6469d7063114aa0dc143af14e3e9"/>
+			<feature name="slot" value="o2_rally" />
+			<feature name="b_pin" value="1" />
+			<dataarea name="rom" size="0x4000">
+				<rom name="helicopter rescue (europe).bin" size="0x4000" crc="c4134df8" sha1="7369a2d3fb81ddc4c8086bbcd245c11ea7aaa331"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="hawks" supported="no">
-		<description>Terrahawks (Euro)</description>
-		<year>198?</year>
+	<software name="homecomp" supported="partial">
+		<description>Home Computer Module (Euro)</description><!-- aka Basic -->
+		<year>1983</year>
 		<publisher>Philips</publisher>
+		<info name="serial" value="C7420"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_homecomp" />
+			<feature name="b_pin" value="1" />
+			<dataarea name="rom" size="0x4800">
+				<rom name="z80_c7420.bin" offset="0x0000" size="0x4000" crc="939f0e4c" sha1="24c334ba4321f3dd30ac659d35e43f74283ad93b" /> <!-- Z80 CPU on module with its own ROM/RAM -->
+				<rom name="vp_c7420.bin"  offset="0x4000" size="0x0800" crc="8e824b98" sha1="60dfc1eea93c25f30d25e549f32f837e22735224" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="motocras">
+		<description>Moto-Crash+ (Fra)</description>
+		<year>1984</year>
+		<publisher>Brandt</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="terrahawks (europe).bin" size="8192" crc="764894a1" sha1="0c01df9799b6d0235fef3c86fec1beac5b0b2d74"/>
+				<rom name="moto-crash (france).bin" size="8192" crc="68560dc7" sha1="f6de2f95e5cf4849a4d7071b1a470c3ef0634e5f"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="rally" supported="no">
-		<description>Trans American Rally (Euro)</description>
+	<software name="norseman">
+		<description>Norseman (Euro)</description>
 		<year>198?</year>
-		<publisher>Philips</publisher>
+		<publisher>GST Video</publisher>
+		<info name="programmer" value="Andy Eltisand Jake Dowding"/>
+		<info name="serial" value="57"/>
 		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom16" />
-			<dataarea name="rom" size="16384">
-				<rom name="trans american rally (europe).bin" size="16384" crc="0d2d721d" sha1="be8a9f2aa66acb4f5e288d1a77afada9565b530a"/>
+			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
+			<dataarea name="rom" size="8192">
+				<rom name="norseman (europe).bin" size="8192" crc="a75c42f8" sha1="8e8fe23225631eef673517f3e2970eade15b7a5c"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="englouti" supported="no">
-		<description>Le Tresor Englouti (Fra)</description>
+	<software name="rally">
+		<description>Trans American Rally (Euro)</description>
 		<year>198?</year>
-		<publisher>Radiola</publisher>
+		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="8192">
-				<rom name="le tresor englouti (france).bin" size="8192" crc="b2f0f0b4" sha1="c0fcaef6a18026e0acc04c3d48443d768043cb03"/>
+			<feature name="slot" value="o2_rally" />
+			<feature name="b_pin" value="1" />
+			<dataarea name="rom" size="0x4000">
+				<rom name="trans american rally (europe).bin" size="0x4000" crc="0d2d721d" sha1="be8a9f2aa66acb4f5e288d1a77afada9565b530a"/>
 			</dataarea>
 		</part>
 	</software>
+
 </softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/gamate.xml mame-0.224+dfsg.1/hash/gamate.xml
--- mame-0.222+dfsg.1/hash/gamate.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/gamate.xml	2020-08-26 08:57:19.000000000 +0000
@@ -12,7 +12,6 @@
 C1039 - Column #5 (Unreleased?)
 C1040 - ??
 C1041 - Mighty Boxer
-C1051 - Incantational Couple
 C1055 - ??
 C1059 - ??
 C1062 - ??
@@ -130,6 +129,8 @@
 		</part>
 	</software>
 
+	<!-- c1-010 - Bump N' Run (unreleased?) -->
+
 	<software name="moneymaz">
 		<description>Money Maze</description>
 		<year>199?</year>
@@ -239,6 +240,8 @@
 		</part>
 	</software>
 
+	<!-- c1-020 - Bad Bud Chou Chu's Adventure (unreleased?) -->
+
 	<software name="mythasam">
 		<description>Myth of Asamia</description>
 		<year>1990</year>
@@ -287,6 +290,8 @@
 		</part>
 	</software>
 
+	<!-- c1-025 - Jackpot (unreleased?) -->
+
 	<software name="flipuzle">
 		<description>Flipuzzle</description>
 		<year>1991</year>
@@ -335,6 +340,8 @@
 		</part>
 	</software>
 
+	<!-- c1-030 - Beach Volleyball (unreleased?) -->
+
 	<software name="bomblast">
 		<description>Bomb Blaster</description>
 		<year>1990</year>
@@ -385,6 +392,8 @@
 		</part>
 	</software>
 
+	<!-- c1-034 - Super Boy (unreleased?) -->
+
 	<software name="treashnt">
 		<description>Treasure Hunter</description>
 		<year>1990</year>
@@ -434,6 +443,12 @@
 		</part>
 	</software>
 
+	<!-- c1-039 - Column #5 (unreleased?) -->
+
+	<!-- c1-040 - unknown / unreleased -->
+
+	<!-- c1-041 - Mighty Boxer -->
+
 	<software name="flgoblin">
 		<description>Flying Goblin</description>
 		<year>1991</year>
@@ -548,6 +563,18 @@
 		</part>
 	</software>
 
+	<software name="incouple">
+		<description>Incantational Couple</description>
+		<year>1991</year> <!-- 1992 on gamecard, 1991 on title screen -->
+		<publisher>Bit Corporation</publisher>
+		<info name="serial" value="C1051" />
+		<part name="cart" interface="gamate_cart">
+			<dataarea name="rom" size="32768">
+				<rom name="incouple.bin" size="32768" crc="d092a22a" sha1="bbb5bd0466b79657e44c4e9fde603ec645e77bfe" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="famous7">
 		<description>Famous 7</description>
 		<year>1993</year>
@@ -586,6 +613,8 @@
 		</part>
 	</software>
 
+	<!-- c1-055 - unknown / unreleased -->
+
 	<software name="gprace">
 		<description>GP Race</description>
 		<year>1992</year>
@@ -625,6 +654,8 @@
 		</part>
 	</software>
 
+	<!-- c1-059 - unknown / unreleased -->
+
 	<software name="hannibal">
 		<description>Further Adventures of Hannibal The Cat</description>
 		<year>1993</year>
@@ -651,6 +682,8 @@
 		</part>
 	</software>
 
+	<!-- c1-062 - unknown / unreleased -->
+
 	<software name="basketba">
 		<description>Basketball</description>
 		<year>199?</year>
@@ -690,6 +723,8 @@
 		</part>
 	</software>
 
+	<!-- c1-066 - unknown / unreleased -->
+
 	<software name="robinhoo">
 		<description>Robin Hood</description>
 		<year>1994</year>
diff -Nru mame-0.222+dfsg.1/hash/gba.xml mame-0.224+dfsg.1/hash/gba.xml
--- mame-0.222+dfsg.1/hash/gba.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/gba.xml	2020-08-26 08:57:19.000000000 +0000
@@ -41518,4 +41518,161 @@
 		</part>
 	</software>
 
+<!-- hacked dumpd of protected games using 'Sintax' protection.
+
+     These games have a protection device which locks out certain ranges (and further reads) depending on the otherwised unused
+     upper address bits.  Furthermore there is some kind of bootstrap mechanism to bypass the GBA protection.
+
+     The dumps are 'full address range' as to bypass the address lockouts, with the expected data for booting patched in.
+
+     These should be replaced with proper dumps of the flash ROM, with the lockout ranges documented and simulated
+     as things stand they have to be marked as 'bad' as they're not true archival quality dumps.
+
+     see http://hhug.me/?post=90 for details
+
+-->
+	<software name="rayman4">
+		<description>Rayman IV (Rayman - Sunshine of Trip) (unlicensed) (protection hacked)</description>
+		<year>200?</year>
+		<publisher>Sintax</publisher>
+		<part name="cart" interface="gba_cart">
+			<dataarea name="rom" size="0x2000000">
+				<rom name="Rayman IV (Rayman - Sunshine of Trip) (Unl) (Eng) [YJ restored].gba" size="0x2000000" crc="d72c620f" sha1="0ef17374ee28f903127493bf47c14971aa6ed0b8" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="rayman4r" cloneof="rayman4">
+		<description>Rayman IV (Rayman - Puteshestviye Solnechnogo Sveta) (unlicensed) (Russian) (protection hacked)</description>
+		<year>200?</year>
+		<publisher>Sintax</publisher>
+		<part name="cart" interface="gba_cart">
+			<dataarea name="rom" size="0x2000000">
+				<rom name="Rayman IV (Rayman - Puteshestviye Solnechnogo Sveta) (Unl) (Rus) [YJ restored].gba" size="0x2000000" crc="8ee6b303" sha1="6a2840b0b15e23c0914a5d233183030f050a1148" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="leiman4" cloneof="rayman4"> <!-- 'Rayman 4' -->
+		<description>Leiman IV - Guangming Zhi Lv (unlicensed) (Chinese) (protection hacked)</description>
+		<year>200?</year>
+		<publisher>Sintax</publisher>
+		<part name="cart" interface="gba_cart">
+			<dataarea name="rom" size="0x2000000">
+				<rom name="Leiman IV - Guangming Zhi Lv (Unl) (Chi) [YJ restored].gba" size="0x2000000" crc="d05c8414" sha1="90bb6a90fe3fcf57beb0bb6b69122860c532cf26" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="smariodx">
+		<description>Super Mario DX (unlicensed) (protection hacked)</description>
+		<year>200?</year>
+		<publisher>Sintax</publisher>
+		<part name="cart" interface="gba_cart">
+			<feature name="pcb" value="E12-U8" />
+			<dataarea name="rom" size="0x2000000">
+				<rom name="Super Mario DX (Unl) (Eng) [YJ restored].gba" size="0x2000000" crc="9255c170" sha1="2b7dce921497e10b43083040bc7a596369fc1b0e" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="chaojim" cloneof="smariodx">
+		<description>Chaoji Maliou DX (unlicensed) (Chinese) (protection hacked)</description>
+		<year>200?</year>
+		<publisher>Sintax</publisher>
+		<part name="cart" interface="gba_cart">
+			<dataarea name="rom" size="0x2000000">
+				<rom name="Chaoji Maliou DX (Unl) (Chi) [YJ restored].gba" size="0x2000000" crc="2c7af7e8" sha1="a8968d5e324c27c8d64382815f4e3ab40dffa80c" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="crashad4">
+		<description>Crash Advance IV  (unlicensed) (protection hacked)</description>
+		<year>200?</year>
+		<publisher>Sintax</publisher>
+		<part name="cart" interface="gba_cart">
+			<dataarea name="rom" size="0x2000000">
+				<rom name="Crash Advance IV (Unl) (Eng) [YJ restored].gba" size="0x2000000" crc="4b67247c" sha1="a122a0c7d2cf2cb58d12007a79f811044a9f3539" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="digirs">
+		<description>Digimon - Ruby and Sapphire (unlicensed) (protection hacked)</description>
+		<year>200?</year>
+		<publisher>Sintax</publisher>
+		<part name="cart" interface="gba_cart">
+			<dataarea name="rom" size="0x2000000">
+				<rom name="Digimon - Ruby and Sapphire (Unl) (Eng) [YJ restored].gba" size="0x2000000" crc="51ef4700" sha1="88f496a8e796d3dedb356c4aafff9ccf41ed5af4" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="poksaph"> <!-- unlicensed translation -->
+		<description>Pokemon - Sapphire Version (unlicensed) (protection hacked)</description>
+		<year>200?</year>
+		<publisher>Sintax</publisher>
+		<part name="cart" interface="gba_cart">
+			<dataarea name="rom" size="0x2000000">
+				<rom name="Pokemon - Sapphire Version (Unl) (Eng) [YJ restored].gba" size="0x2000000" crc="86a602ab" sha1="14051d159d7a1266b5bfecbfd52722fd3e0711bf" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="sonic3fs">
+		<description>Sonic 3 - Fighter Sonic (unlicensed) (protection hacked)</description>
+		<year>200?</year>
+		<publisher>Sintax</publisher>
+		<part name="cart" interface="gba_cart">
+			<dataarea name="rom" size="0x2000000">
+				<rom name="Sonic 3 - Fighter Sonic (Unl) (Eng) [YJ restored].gba" size="0x2000000" crc="8e0a9112" sha1="b3855ceae35152b8a98c882777f040ac2aa93926" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="tmnturt2">
+		<description>Teenage Mutant Ninja Turtles 2 (unlicensed) (protection hacked)</description>
+		<year>200?</year>
+		<publisher>Sintax</publisher>
+		<part name="cart" interface="gba_cart">
+			<dataarea name="rom" size="0x2000000">
+				<rom name="Teenage Mutant Ninja Turtles 2 (Unl) (Eng) [YJ restored].gba" size="0x2000000" crc="8ee6d3d5" sha1="cbcb99b4ee34d6d83c898a09083a655f7f9eecb1" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="lotr4">
+		<description>The Lord of the Rings IV - The Fellowship of the Ring (unlicensed) (protection hacked)</description>
+		<year>200?</year>
+		<publisher>Sintax</publisher>
+		<part name="cart" interface="gba_cart">
+			<dataarea name="rom" size="0x2000000">
+				<rom name="The Lord of the Rings IV - The Fellowship of the Ring (Unl) (Eng) [YJ restored].gba" size="0x2000000" crc="09c7c895" sha1="bf5f2ec4e7c7df834be9911d217af0d4490e3722" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="ultcje">
+		<description>Ultraman - Confrontation Between Justice And Evil (Ul'traman - Konfrontatsiya mezhdu spravedlivost'yu i zlom) (unlicensed) (Russian) (protection hacked)</description>
+		<year>200?</year>
+		<publisher>Sintax</publisher>
+		<part name="cart" interface="gba_cart">
+			<dataarea name="rom" size="0x2000000">
+				<rom name="Ultraman - Confrontation Between Justice And Evil (Unl) (Rus) [YJ restored].gba" size="0x2000000" crc="4683dbb5" sha1="08a9530ce82a76e1be5e408ae99bdd90c42748e9" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="xmanam">
+		<description>X-Man - Armour of Might (X-men) (unlicensed) (Russian) (protection hacked)</description>
+		<year>200?</year>
+		<publisher>Sintax</publisher>
+		<part name="cart" interface="gba_cart">
+			<dataarea name="rom" size="0x2000000">
+				<rom name="X-Man - Armour of Might (X-men) (Unl) (Rus) [YJ restored].gba" size="0x2000000" crc="e14c9b78" sha1="a894acc460efc9b9b03a7ce55e5a860b64473e13" status="baddump" />
+			</dataarea>
+		</part>
+	</software>
+
 </softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/gtfore.xml mame-0.224+dfsg.1/hash/gtfore.xml
--- mame-0.222+dfsg.1/hash/gtfore.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/gtfore.xml	2020-08-26 08:57:19.000000000 +0000
@@ -12,7 +12,7 @@
 		<info name="disc_matrix" value="FUTURE MEDIA \ CA   FM 20372 (GOLF FORE 2002 N2.00.00/IN0006)" />
 		<part name="cdrom1" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="golden tee fore! 2002 (v2.00.00)" sha1="525ccfd713fa7de4c8ba7770cd0086726f0132cd" />
+				<disk name="golden tee fore 2002 (v2.00.00)" sha1="525ccfd713fa7de4c8ba7770cd0086726f0132cd" />
 			</diskarea>
 		</part>
 	</software>
@@ -24,7 +24,7 @@
 		<info name="disc_matrix" value="GT42003RM·" />
 		<part name="cdrom1" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="golden tee fore! 2003 (v3.00.04)" sha1="29f5a04c15a9f6ccd49de2752545370077b2b4b8" />
+				<disk name="golden tee fore 2003 (v3.00.04)" sha1="29f5a04c15a9f6ccd49de2752545370077b2b4b8" />
 			</diskarea>
 		</part>
 	</software>
@@ -36,7 +36,7 @@
 		<info name="disc_matrix" value="GOLFV40000RM·" />
 		<part name="cdrom1" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="golden tee fore! 2004 (v4.00.xx)" sha1="ceb65c40a34bcceed282fd9bfd79aa3a25e267dc" />
+				<disk name="golden tee fore 2004 (v4.00.xx)" sha1="ceb65c40a34bcceed282fd9bfd79aa3a25e267dc" />
 			</diskarea>
 		</part>
 	</software>
@@ -48,7 +48,7 @@
 		<info name="disc_matrix" value="ITGT2005RM:" />
 		<part name="cdrom1" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="golden tee fore! 2005 (v5.00.xx)" sha1="6b92b048c89e4f75ad12892becb283b6a6533127" />
+				<disk name="golden tee fore 2005 (v5.00.xx)" sha1="6b92b048c89e4f75ad12892becb283b6a6533127" />
 			</diskarea>
 		</part>
 	</software>
@@ -60,7 +60,7 @@
 		<info name="disc_matrix" value="0369382 02   10/12/2005 12:37:11 AM" />
 		<part name="cdrom1" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="golden tee fore! complete (v6.00.xx)" sha1="f201f872f9018cde0caf43a898344cdedf66cab0" />
+				<disk name="golden tee fore complete (v6.00.xx)" sha1="f201f872f9018cde0caf43a898344cdedf66cab0" />
 			</diskarea>
 		</part>
 	</software>
diff -Nru mame-0.222+dfsg.1/hash/hp9k3xx_cdrom.xml mame-0.224+dfsg.1/hash/hp9k3xx_cdrom.xml
--- mame-0.222+dfsg.1/hash/hp9k3xx_cdrom.xml	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/hash/hp9k3xx_cdrom.xml	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,89 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<!--
+license:CC0
+-->
+<softwarelist name="hp9k3xx_cdrom" description="HP9000/300 CD-ROM images">
+	<software name="hpux_9_10">
+		<description>HP-UX Release 9.10 for Series 300/400</description>
+		<year>1995</year>
+		<publisher>Hewlett-Packard</publisher>
+		<part name="cdrom1" interface="cdrom"> <!-- 10/92 -->
+			<feature name="part_number" value="B2378-13621"/>
+			<feature name="part_id" value="HP-UX Install Disc"/>
+			<!-- Origin: BitSavers -->
+			<diskarea name="cdrom">
+				<disk name="hpux_9_0_install_disc" sha1="d1918f321f0520a3607c2c87983709c2417203d4" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom"> <!-- 04/95 -->
+			<feature name="part_number" value="B2378-87054"/>
+			<feature name="part_id" value="HP-UX Core Operating System Software"/>
+			<!-- Origin: BitSavers -->
+			<diskarea name="cdrom">
+				<disk name="hpux_9_10_core_os" sha1="e4bc82c602cc72c8e08ff57dec34de0ee017ec2b" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="hpux_9_1_y2k">
+		<description>HP-UX 9.1 Y2K Patches</description>
+		<year>1998</year>
+		<publisher>Hewlett-Packard</publisher>
+		<part name="cdrom" interface="cdrom">
+			<!-- Origin: BitSavers -->
+			<diskarea name="cdrom">
+				<disk name="hpux_9_1_y2k_patches" sha1="bf2dc75d5527ad49dbc052e21f638d5944e7b572" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="hpux_9_10_apps">
+		<description>HP-UX Application Software</description>
+		<year>1995</year> <!-- 04/95 -->
+		<publisher>Hewlett-Packard</publisher>
+		<part name="cdrom1" interface="cdrom">
+			<feature name="part_number" value="B2378-10142"/>
+			<feature name="part_id" value="HP-UX Application Software Disc 1 of 2"/>
+			<!-- Origin: BitSavers -->
+			<diskarea name="cdrom">
+				<disk name="app_1_of_2" sha1="924d2577b2993cd382444e52079d478e23bb9bac" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
+			<feature name="part_number" value="B2378-10143"/>
+			<feature name="part_id" value="HP-UX Application Software Disc 2 of 2"/>
+			<!-- Origin: BitSavers -->
+			<diskarea name="cdrom">
+				<disk name="app_2_of_2" sha1="500ad788abb71f7f7fcffed5b7eaa3db6046dcbb" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="hpux_9_10_prog">
+		<description>HP-UX 9.10 Programming Language Tools</description>
+		<year>1998</year>
+		<publisher>Hewlett-Packard</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="B6736-87001"/>
+			<!-- Origin: archive.org -->
+			<diskarea name="cdrom">
+				<disk name="HP-UX 9.10 Programming Language Tools" sha1="b3b0bd68c8368ba267fd76518592053b99cd23de" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="hpux_9_0_laserom">
+		<description>HP LaserROM HP-UX Release 9.0</description>
+		<year>1995</year> <!-- 02/95 -->
+		<publisher>Hewlett-Packard</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="50726-10230"/>
+			<feature name="part_id" value="HP-UX Documentation Disc"/>
+			<!-- Origin: BitSavers -->
+			<diskarea name="cdrom">
+				<disk name="50726-10230_LaserROM_9.0_Feb1995" sha1="3c20b94f2090a09665045232c2b1f0d34e3dea23" />
+			</diskarea>
+		</part>
+	</software>
+</softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/hp9k3xx_hdd.xml mame-0.224+dfsg.1/hash/hp9k3xx_hdd.xml
--- mame-0.222+dfsg.1/hash/hp9k3xx_hdd.xml	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/hash/hp9k3xx_hdd.xml	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<!--
+license:CC0
+-->
+<softwarelist name="hp9k3xx_hdd" description="HP9000/300 hard disk images">
+
+	<!--
+	Unless otherwise specified, all images are based on default installs of the
+	corresponding hp9k3xx_flop or hp9k3xx_cdrom sets.
+	-->
+
+	<software name="hpux_9_10">
+		<description>HP-UX Release 9.10 for Series 300/400</description>
+		<year>1995</year>
+		<publisher>Hewlett-Packard</publisher>
+		<part name="hdd" interface="scsi_hdd">
+			<diskarea name="harddriv">
+				<disk name="hpux_9_10" sha1="85898db956bb5539832817c0203354b4299b381e" writeable="yes" />
+			</diskarea>
+		</part>
+	</software>
+
+</softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/ibm5150_cass.xml mame-0.224+dfsg.1/hash/ibm5150_cass.xml
--- mame-0.222+dfsg.1/hash/ibm5150_cass.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/ibm5150_cass.xml	2020-08-26 08:57:19.000000000 +0000
@@ -5,10 +5,11 @@
 -->
 <softwarelist name="ibm5150_cass" description="IBM PC/XT cassettes">
 
-	<software name="diag">
+	<software name="diag" supported="no"><!-- when the menu should appear, it reboots Basic instead -->
 		<description>IBM Advanced Diagnostics for the IBM PC 5150</description>
 		<year>1982</year>
 		<publisher>IBM</publisher>
+		<info name="usage" value="In ROM BASIC, LOAD&quot;ldcass then RUN" />
 		<part name="cass1" interface="ibm5150_cass">
 			<dataarea name="cass" size="40121900">
 				<rom name="ibm_pc_diagnostics_cassette.wav" size="40121900" crc="59351cf6" sha1="b7f03fadb2ff8c7dfe8dd0ff9b694c1b437e23b1"/>
diff -Nru mame-0.222+dfsg.1/hash/ibm5150.xml mame-0.224+dfsg.1/hash/ibm5150.xml
--- mame-0.222+dfsg.1/hash/ibm5150.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/ibm5150.xml	2020-08-26 08:57:19.000000000 +0000
@@ -443,7 +443,7 @@
 		<publisher>Atarisoft</publisher>
 		<info name="usage" value="PC Booter" />
 		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="1049469">
+			<dataarea name="flop" size="1011265">
 				<rom name="centipede.mfm" size="1011265" crc="29332053" sha1="d34519a6cd21ac50ada1d78b28be138e77128635"/>
 			</dataarea>
 		</part>
@@ -476,7 +476,7 @@
 	<software name="arkstenn">
 		<description>La Collection Amstrad PC - Arkanoid / Super Tennis</description>
 		<year>1987</year>
-		<publisher>US Gold</publisher>
+		<publisher>U.S. Gold</publisher>
 		<info name="usage" value="PC Booter" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size = "2851051">
@@ -675,10 +675,11 @@
 		</part>
 	</software>
 
+	<!-- Game cracked - Missing copy protection track -->
 	<software name="digger">
-		<description>Digger</description>
+		<description>Digger (cracked)</description>
 		<year>1983</year>
-		<publisher>Windwill Software</publisher>
+		<publisher>Windmill Software</publisher>
 		<info name="usage" value="PC Booter" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="163840">
@@ -687,48 +688,6 @@
 		</part>
 	</software>
 
-	<software name="dlair">
-		<description>Dragon's Lair</description>
-		<year>1989</year>
-		<publisher>Merit Software</publisher>
-		<info name="developer" value="Sullivan Bluth Interactive Media" />
-		<part name="flop1" interface="floppy_3_5">
-			<dataarea name="flop" size = "737280">
-				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 1 of 7].img" size="737280" crc="427a0228" sha1="1dc55efd9e29cf40cf7fb3d8f18c7bd638463767"/>
-			</dataarea>
-		</part>
-		<part name="flop2" interface="floppy_3_5">
-			<dataarea name="flop" size = "737280">
-				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 2 of 7].img" size="737280" crc="edd53e3f" sha1="0e3a92ef40d34625ca7bbf0659f92426a87f7d7d"/>
-			</dataarea>
-		</part>
-		<part name="flop3" interface="floppy_3_5">
-			<dataarea name="flop" size = "737280">
-				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 3 of 7].img" size="737280" crc="abce5854" sha1="1c5fb429a82c333e80c97dacc643a53f75d697a9"/>
-			</dataarea>
-		</part>
-		<part name="flop4" interface="floppy_3_5">
-			<dataarea name="flop" size = "737280">
-				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 4 of 7].img" size="737280" crc="4b18e231" sha1="77956cf326c656040623ea18e6e29855198b4a43"/>
-			</dataarea>
-		</part>
-		<part name="flop5" interface="floppy_3_5">
-			<dataarea name="flop" size = "737280">
-				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 5 of 7].img" size="737280" crc="8472352b" sha1="951ada228f6b503590240a0826638a44767eb15a"/>
-			</dataarea>
-		</part>
-		<part name="flop6" interface="floppy_3_5">
-			<dataarea name="flop" size = "737280">
-				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 6 of 7].img" size="737280" crc="32eb9f17" sha1="c04ee5b1f011d57382ad91ea39462339795cc2ef"/>
-			</dataarea>
-		</part>
-		<part name="flop7" interface="floppy_3_5">
-			<dataarea name="flop" size = "737280">
-				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 7 of 7].img" size="737280" crc="3454a916" sha1="88fcfc7b9f653951023ee3b7cd9955eff9083ddc"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="donald">
 		<description>Donald Duck's Playground</description>
 		<year>1986</year>
@@ -741,8 +700,9 @@
 		</part>
 	</software>
 
+	<!-- Game cracked - Missing copy protection track -->
 	<software name="dkong">
-		<description>Donkey Kong</description>
+		<description>Donkey Kong (cracked)</description>
 		<year>1983</year>
 		<publisher>Atarisoft</publisher>
 		<info name="usage" value="PC Booter" />
@@ -1074,24 +1034,6 @@
 		</part>
 	</software>
 
-	<software name="gunship">
-		<description>Gunship</description>
-		<year>1987</year>
-		<publisher>MicroProse</publisher>
-		<info name="developer" value="MicroProse" />
-		<info name="version" value="429.05" />
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size = "368640">
-				<rom name="Gunship v429.05 [Microprose] [1987] [5.25DD] [Disk 1 of 2].img" size="368640" crc="74ef4447" sha1="c31b6df82fdb09e68ebae6e19f4aac525c21b948"/>
-			</dataarea>
-		</part>
-		<part name="flop2" interface="floppy_5_25">
-			<dataarea name="flop" size = "368640">
-				<rom name="Gunship v429.05 [Microprose] [1987] [5.25DD] [Disk 2 of 2].img" size="368640" crc="edcb863f" sha1="3391538e151626280ae59875619dcb9bfafaf1c9"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="hacker">
 		<description>Hacker</description>
 		<year>1985</year>
@@ -1644,7 +1586,7 @@
 		<publisher>Atarisoft</publisher>
 		<info name="usage" value="PC Booter" />
 		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="551161">
+			<dataarea name="flop" size="550459">
 				<rom name="mspacman.mfm" size="550459" crc="1cc9488e" sha1="4fc2751e7a77ac9a8ccad888109246492617806c"/>
 			</dataarea>
 		</part>
@@ -2320,22 +2262,6 @@
 		</part>
 	</software>
 
-	<software name="td3">
-		<description>Test Drive III - The Passion</description>
-		<year>1990</year>
-		<publisher>Accolade</publisher>
-		<part name="flop1" interface="floppy_3_5">
-			<dataarea name="flop" size = "737280">
-				<rom name="Test Drive III - The Passion (USA) [Accolade] [1990] [3.5DD] [Boot Program Disk].img" size="737280" crc="50d5f0f3" sha1="d34edbb61f8a140621a7744629fee6fb81b5f897"/>
-			</dataarea>
-		</part>
-		<part name="flop2" interface="floppy_3_5">
-			<dataarea name="flop" size = "737280">
-				<rom name="Test Drive III - The Passion (USA) [Accolade] [1990] [3.5DD] [Master Play Disk].img" size="737280" crc="c06149ac" sha1="9e810be2bb975d64969e812bfd53836ba1932498"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="mindmirr">
 		<description>Timothy Leary's Mind Mirror</description>
 		<year>1986</year>
@@ -6568,6 +6494,137 @@
 		</part>
 	</software>
 
+	<software name="pcix10">
+		<description>IBM Personal Computer Interactive Executive (PC/IX) 1.00</description>
+		<year>1984</year>
+		<!-- developed by INTERACTIVE Systems Corporation for IBM -->
+		<publisher>IBM</publisher>
+		<!-- Origin: WinWorld -->
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_number" value="LY20-6261-0"/>
+			<feature name="part_id" value="Maintenance"/>
+			<dataarea name="flop" size="368640">
+				<rom name="01MAINT.IMA" size="368640" crc="d2948105" sha1="eb4f132f0779b8835f41907e5bb29a2225c2c443"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_number" value="LY20-6262-0"/>
+			<feature name="part_id" value="Core 1"/>
+			<dataarea name="flop" size="368640">
+				<rom name="02CORE1.IMA" size="368640" crc="a6fc76e0" sha1="dc8d8dd2b041f475547c7326354e33e709d068b6"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_number" value="LY20-6263-0"/>
+			<feature name="part_id" value="Core 2"/>
+			<dataarea name="flop" size="368640">
+				<rom name="03CORE2.IMA" size="368640" crc="3075f9b8" sha1="c3fad1fe431147c71f12eff73d33bd047cae15c3"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_number" value="LY20-6264-0"/>
+			<feature name="part_id" value="Core 3"/>
+			<dataarea name="flop" size="368640">
+				<rom name="04CORE3.IMA" size="368640" crc="683c8314" sha1="ecf4f8738dd7f654ea2fa51f363c76c5f84a05d6"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_number" value="LY20-6265-0"/>
+			<feature name="part_id" value="Core 4"/>
+			<dataarea name="flop" size="368640">
+				<rom name="05CORE4.IMA" size="368640" crc="dedc1330" sha1="c185b40ac90a344a8c4694f3cdf15425ecc3af4b"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_5_25">
+			<feature name="part_number" value="LY20-6266-0"/>
+			<feature name="part_id" value="Core 5"/>
+			<dataarea name="flop" size="368640">
+				<rom name="06CORE5.IMA" size="368640" crc="45fb7668" sha1="1b92f98f1ed665109ad588814e0859d7df8a7d16"/>
+			</dataarea>
+		</part>
+		<part name="flop7" interface="floppy_5_25">
+			<feature name="part_number" value="LY20-6267-0"/>
+			<feature name="part_id" value="Core 6"/>
+			<dataarea name="flop" size="368640">
+				<rom name="07CORE6.IMA" size="368640" crc="d4b1fa1e" sha1="bc6437a1410a11c4d12ce5d90dec9abb3ff34103"/>
+			</dataarea>
+		</part>
+		<part name="flop8" interface="floppy_5_25">
+			<feature name="part_number" value="LY20-6268-0"/>
+			<feature name="part_id" value="Core 7"/>
+			<dataarea name="flop" size="368640">
+				<rom name="08CORE7.IMA" size="368640" crc="d3468cbe" sha1="024bc551f9ef7fafdbec0ab063252b1964acc161"/>
+			</dataarea>
+		</part>
+		<part name="flop9" interface="floppy_5_25">
+			<feature name="part_number" value="LY20-6269-0"/>
+			<feature name="part_id" value="Core 8"/>
+			<dataarea name="flop" size="368640">
+				<rom name="09CORE8.IMA" size="368640" crc="a9d6d06a" sha1="561f31d65465b851f480d843078ba38e187cd6cc"/>
+			</dataarea>
+		</part>
+		<part name="flop10" interface="floppy_5_25">
+			<feature name="part_id" value="Programming Subset 1"/>
+			<dataarea name="flop" size="368640">
+				<rom name="10PROG1.IMA" size="368640" crc="99e1f238" sha1="bd2bf980918c921d9eb7a355e670e68847ff0b6d"/>
+			</dataarea>
+		</part>
+		<part name="flop11" interface="floppy_5_25">
+			<feature name="part_id" value="Programming Subset 2"/>
+			<dataarea name="flop" size="368640">
+				<rom name="11PROG2.IMA" size="368640" crc="912bd367" sha1="28400a3f0cd345be0905890bc3cf22ce795e0732"/>
+			</dataarea>
+		</part>
+		<part name="flop12" interface="floppy_5_25">
+			<feature name="part_id" value="Programming Subset 3"/>
+			<dataarea name="flop" size="368640">
+				<rom name="12PROG3.IMA" size="368640" crc="7f8d93ee" sha1="f8cfb8be8c3881a80360b4fa8b4fd8134d6b80a2"/>
+			</dataarea>
+		</part>
+		<part name="flop13" interface="floppy_5_25">
+			<feature name="part_id" value="Programming Subset 4"/>
+			<dataarea name="flop" size="368640">
+				<rom name="13PROG4.IMA" size="368640" crc="fae2489b" sha1="23bc51d535526732c5f15ed5dc1db394d5cbc209"/>
+			</dataarea>
+		</part>
+		<part name="flop14" interface="floppy_5_25">
+			<feature name="part_id" value="Communications"/>
+			<dataarea name="flop" size="368640">
+				<rom name="14COMMS.IMA" size="368640" crc="64ef3326" sha1="b91a4f8152a248405fe2df05ea9fc4d621acfd99"/>
+			</dataarea>
+		</part>
+		<part name="flop15" interface="floppy_5_25">
+			<feature name="part_id" value="SCCS"/>
+			<dataarea name="flop" size="368640">
+				<rom name="15SCCS.IMA" size="368640" crc="b3496c93" sha1="b2f8bbeb17233e2aab6ad77962e39305fe283af1"/>
+			</dataarea>
+		</part>
+		<part name="flop16" interface="floppy_5_25">
+			<feature name="part_id" value="Text Processing"/>
+			<dataarea name="flop" size="368640">
+				<rom name="16TEXT.IMA" size="368640" crc="66969148" sha1="4a603e4b04f9819edfafa5d3e300c88c7fc2f8f9"/>
+			</dataarea>
+		</part>
+		<part name="flop17" interface="floppy_5_25">
+			<feature name="part_id" value="Special Purpose Subset"/>
+			<dataarea name="flop" size="368640">
+				<rom name="17SPECIA.IMA" size="368640" crc="6c10f1fc" sha1="5535e1882f6f42110c4b7da80ec0db15a07f2742"/>
+			</dataarea>
+		</part>
+		<part name="flop18" interface="floppy_5_25">
+			<feature name="part_id" value="Games"/>
+			<dataarea name="flop" size="368640">
+				<rom name="18GAMES.IMA" size="368640" crc="3c0edba6" sha1="23903c58a07c05f821a5b9fcb8dd42b1b587c4e8"/>
+			</dataarea>
+		</part>
+		<part name="flop19" interface="floppy_5_25">
+			<feature name="part_id" value="Accounting"/>
+			<dataarea name="flop" size="368640">
+				<rom name="19ACCNT.IMA" size="368640" crc="52e3229b" sha1="05a3d3bca0b93f139c1708e548d3c1a801c7fc35"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="qnxdemo">
 		<description>QNX Demonstration (Apr 17th, 1989)</description>
 		<year>1989</year>
@@ -6786,6 +6843,79 @@
 		</part>
 	</software>
 
+	<software name="xenixdev213">
+		<description>SCO XENIX System V Development System version 2.1.3</description>
+		<year>1986</year>
+		<publisher>SCO</publisher>
+		<!-- Origin: archive.org -->
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Development System volume D1"/>
+			<dataarea name="flop" size="368640">
+				<rom name="D1.img" size="368640" crc="aebb993e" sha1="a82b134e6a16c824dc203ddc63b3093070778aeb"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Development System volume D2"/>
+			<dataarea name="flop" size="368640">
+				<rom name="D2.img" size="368640" crc="1b27d622" sha1="fe29ce2833d7e7731c166ce58edb4bb965a1db10"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Development System volume D3"/>
+			<dataarea name="flop" size="368640">
+				<rom name="D3.img" size="368640" crc="7e2bac6c" sha1="7c8c09a2accd866c4bbe2b1f0b900d1d8d5e1beb"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Development System volume D4"/>
+			<dataarea name="flop" size="368640">
+				<rom name="D4.img" size="368640" crc="6a20dc53" sha1="1b29be4c8be12f330b758ce288381bb7311dcb09"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_id" value="Development System volume D5"/>
+			<dataarea name="flop" size="368640">
+				<rom name="D5.img" size="368640" crc="e4766e89" sha1="f7dbd8b572b20451ca1d9607711d6f8cca2394e9"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_5_25">
+			<feature name="part_id" value="Development System volume D6"/>
+			<dataarea name="flop" size="368640">
+				<rom name="D6.img" size="368640" crc="e8962a7e" sha1="8dbcf2b2d3c849de88a9db5d817bffbcb3d074e0"/>
+			</dataarea>
+		</part>
+			<part name="flop7" interface="floppy_5_25">
+			<feature name="part_id" value="Development System volume D7"/>
+			<dataarea name="flop" size="368640">
+				<rom name="D7.img" size="368640" crc="5e734955" sha1="e925c894c0674a83185d1d2f4dcfa3834fc8aa2d"/>
+			</dataarea>
+		</part>
+		<part name="flop8" interface="floppy_5_25">
+			<feature name="part_id" value="Development System volume D8"/>
+			<dataarea name="flop" size="368640">
+				<rom name="D8.img" size="368640" crc="6601c6a5" sha1="dde9189542007afca40cc752bfe0f500362e2594"/>
+			</dataarea>
+		</part>
+		<part name="flop9" interface="floppy_5_25">
+			<feature name="part_id" value="Development System volume D9"/>
+			<dataarea name="flop" size="368640">
+				<rom name="D9.img" size="368640" crc="d07dbd2c" sha1="1941e45a0a3d861222a0ada0e945a8ac69f18074"/>
+			</dataarea>
+		</part>
+			<part name="flop10" interface="floppy_5_25">
+			<feature name="part_id" value="Development System volume D10"/>
+			<dataarea name="flop" size="368640">
+				<rom name="D10.img" size="368640" crc="25d07207" sha1="ef25823026141ccf3d5c12a0f64e5bca7703e65a"/>
+			</dataarea>
+		</part>
+		<part name="flop11" interface="floppy_5_25">
+			<feature name="part_id" value="Development System volume D11"/>
+			<dataarea name="flop" size="368640">
+				<rom name="D11.img" size="368640" crc="84d74eb0" sha1="bd17a850b990e846b35bd38671cd9a6f76e33106"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<!-- Driver disks -->
 
 	<software name="amouse7">
@@ -6940,11 +7070,11 @@
 	</software>
 
 	<software name="4dboxing">
-		<description>4D Boxing (US)</description>
+		<description>4D Boxing (USA)</description>
 		<year>1991</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="version" value="1.0" />
-		<info name="developer" value="Distinctive Software, Inc." />
+		<info name="developer" value="Distinctive Software" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "737280">
 				<rom name="4D Boxing (US) [Electronic Arts] [1991] [3.5DD] [Disk 1 of 2].img" size="737280" crc="9c28c0c8" sha1="5b324abec67baa90a44c04bb9cc82ba50f4fb962"/>
@@ -6960,9 +7090,9 @@
 	<software name="4dsboxin" cloneof="4dboxing">
 		<description>4D Sports Boxing (Euro)</description>
 		<year>1991</year>
-		<publisher>Mindscape International Ltd.</publisher>
+		<publisher>Mindscape International</publisher>
 		<info name="version" value="1.0" />
-		<info name="developer" value="Distinctive Software, Inc." />
+		<info name="developer" value="Distinctive Software" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "737280">
 				<rom name="4D Sports Boxing (Euro) [Mindscape] [1991] [3.5DD] [Disk 1 of 1].img" size="737280" crc="08fe612c" sha1="55a47b3da60cc4962b536a177c8b091feeea6b1a"/>
@@ -6973,9 +7103,9 @@
 	<software name="4dsboxina" cloneof="4dboxing">
 		<description>4D Sports Boxing (Euro, Alt)</description>
 		<year>1991</year>
-		<publisher>Mindscape International Ltd.</publisher>
+		<publisher>Mindscape International</publisher>
 		<info name="version" value="1.0" />
-		<info name="developer" value="Distinctive Software, Inc." />
+		<info name="developer" value="Distinctive Software" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "737280">
 				<rom name="4D Sports Boxing (Europe) (3.5'').img" size="737280" crc="a464aacf" sha1="6f7b2171faedb74c8f328795cef72e348182b477"/>
@@ -7887,6 +8017,30 @@
 		</part>
 	</software>
 
+	<software name="bloodwyc">
+		<description>Bloodwych (USA)</description>
+		<year>1991</year>
+		<publisher>Konami</publisher>
+		<info name="developer" value="Mirrorsoft" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Bloodwych (USA) [Konami] [1991] [3.5DD] [Disk 1 of 1].img" size="737280" crc="481b0339" sha1="bb15ff6796f450c54282fc5c7db4aa22a844e146"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="bloodwyca" cloneof="bloodwyc">
+		<description>Bloodwych (Quest &amp; Glory Compilation) (Euro)</description>
+		<year>1991</year>
+		<publisher>Ubi Soft</publisher>
+		<info name="developer" value="Mirrorsoft" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Bloodwych (Quest &amp; Glory Compilation) (Euro) [Ubi Soft] [1991] [3.5DD] [Disk 1 of 1].img" size="737280" crc="5e77657e" sha1="e696c4f620b138f67f3fbea3730cd16ea74476e6"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="bluesbro">
 		<!-- Dumped via Kryoflux -->
 		<description>The Blues Brothers</description>
@@ -7936,8 +8090,9 @@
 		</part>
 	</software>
 
+	<!-- Game cracked - Missing copy protection track on disk 1 -->
 	<software name="bublbobl">
-		<description>Bubble Bobble (5.25")</description>
+		<description>Bubble Bobble (5.25") (cracked)</description>
 		<year>1989</year>
 		<publisher>Taito Software</publisher>
 		<info name="developer" value="Taito Software" />
@@ -7970,23 +8125,41 @@
 	</software>
 
 	<software name="budokan">
-		<description>Budokan - The Martial Spirit</description>
+		<description>Budokan - The Martial Spirit (5.25")</description>
 		<year>1989</year>
 		<publisher>Electronic Arts</publisher>
-		<part name="flop1" interface="floppy_3_5">
-			<dataarea name="flop" size = "737280">
-				<rom name="Budokan - The Martial Spirit [Electronic Arts] [1989] [3.5] [1 of 1].img" size="737280" crc="fea46e33" sha1="bf874ea08695344cc9c3db8bc1b2db2e0b62ca9f"/>
+		<info name="developer" value="Electronic Arts" />
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Budokan [Electronic Art] [1989] [5.25DD] [Disk 1 of 2] [Dojo Disk].img" size="368640" crc="4c90178f" sha1="84aa44e77320f72e5c4e65dae559750e1617f82e"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Budokan [Electronic Art] [1989] [5.25DD] [Disk 2 of 2] [Tournament Disk].img" size="368640" crc="a4c61ea5" sha1="1dfd6726779fd63c7a9db63064476b79c3f02d27"/>
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="budokana" cloneof="budokan">
-		<description>Budokan - The Martial Spirit (Big Games release)</description>
+	<software name="budokan35" cloneof="budokan">
+		<description>Budokan - The Martial Spirit (3.5")</description>
 		<year>1989</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="developer" value="Electronic Arts" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "737280">
+				<rom name="Budokan - The Martial Spirit [Electronic Arts] [1989] [3.5DD] [Disk 1 of 1].img" size="737280" crc="fea46e33" sha1="bf874ea08695344cc9c3db8bc1b2db2e0b62ca9f"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="budokan35a" cloneof="budokan">
+		<description>Budokan - The Martial Spirit (3.5", Big Games release)</description>
+		<year>1996</year>
+		<publisher>Big Games</publisher>
+		<info name="developer" value="Electronic Arts" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
 				<rom name="Budokan - The Martial Spirit (Big Games release) [Electronic Arts] [1989] [3.5DD] [Disk 1 of 1].img" size="737280" crc="7c3acc15" sha1="ed1e6883d394b2e1fce1006105cc6a5a05f926f8"/>
 			</dataarea>
 		</part>
@@ -8020,7 +8193,7 @@
 	</software>
 
 	<software name="cadaver35" cloneof="cadaver">
-		<description>Cadaver (3.5", Quest and Glory Compilation)</description>
+		<description>Cadaver (3.5", Quest &amp; Glory Compilation)</description>
 		<year>1991</year>
 		<publisher>Image Works</publisher>
 		<info name="developer" value="Bitmap Brothers" />
@@ -8302,31 +8475,117 @@
 		</part>
 	</software>
 
-	<software name="colossus4">
-		<description>Colossus Bridge 4</description>
-		<year>1988</year>
-		<publisher>CDS Software</publisher>
-		<info name="usage" value="Turn power on load system Insert COLOSSUS disk type BRIDGE or TUTOR" />
-		<part name="flop1" interface="floppy_3_5">
-			<dataarea name="flop" size = "737280">
-				<rom name="colossus 4 bridge.img" size="737280" crc="e8d92247" sha1="fa6ff45a9314a66e6eadc57f0a242f2e35edf391"/>
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="keen123">
-		<description>Commander Keen in Invasion of the Vorticons (v1.31, 5.25")</description>
-		<year>1991</year>
-		<publisher>Apogee Software</publisher>
-		<info name="developer" value="id Software" />
+	<software name="laurabow">
+		<description>The Colonel's Bequest (5.25")</description>
+		<year>1989</year>
+		<publisher>Sierra On-Line</publisher>
+		<info name="developer" value="Sierra On-Line" />
+		<info name="version" value="1.000.046" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size = "368640">
-				<rom name="Commander Keen in Invasion of the Vorticons (USA) (v1.31) (5.25'') (Disk 1).img" size="368640" crc="3beb1b23" sha1="32e83f4f6870e587e61c3079f9b0e03dbadeb839"/>
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [5.25DD] [Disk 01 of 10].img" size="368640" crc="c2c2801b" sha1="95118dac5ee6232413e282397f047f70c2a5ca95"/>
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
 			<dataarea name="flop" size = "368640">
-				<rom name="Commander Keen in Invasion of the Vorticons (USA) (v1.31) (5.25'') (Disk 2).img" size="368640" crc="66446934" sha1="fe9099633582c3a185167429aeba9ffadb02c6ec"/>
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [5.25DD] [Disk 02 of 10].img" size="368640" crc="793af3e9" sha1="37cc73635c32a6a23934676d9c04e40b17be48b9"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [5.25DD] [Disk 03 of 10].img" size="368640" crc="f0db56de" sha1="6b1e5624a63cb98896da397084242f9b7e11f6fd"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [5.25DD] [Disk 04 of 10].img" size="368640" crc="b50d5d25" sha1="14901e38dddf7fda09f5ba70de016584ef988d21"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [5.25DD] [Disk 05 of 10].img" size="368640" crc="c25e531d" sha1="d2c4a8439d396a1eaea1ad8cd3b533071a8bb69f"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [5.25DD] [Disk 06 of 10].img" size="368640" crc="f19693f3" sha1="9fcee8c6dbcc6e9b10e8582aaddcb774608a3e84"/>
+			</dataarea>
+		</part>
+		<part name="flop7" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [5.25DD] [Disk 07 of 10].img" size="368640" crc="eec57cd1" sha1="a8468d3c8505fa80e71f658356e7ce3387877699"/>
+			</dataarea>
+		</part>
+		<part name="flop8" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [5.25DD] [Disk 08 of 10].img" size="368640" crc="ee0c8b6f" sha1="17284ab1dd6e45cc3c968d35a3e5e2785071e153"/>
+			</dataarea>
+		</part>
+		<part name="flop9" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [5.25DD] [Disk 09 of 10].img" size="368640" crc="b8badbd5" sha1="5b5fac0fa5acdbe4d9c987e992afe6526db0edbb"/>
+			</dataarea>
+		</part>
+		<part name="flop10" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [5.25DD] [Disk 10 of 10].img" size="368640" crc="77d189bd" sha1="6a51026779cf8c2495e04195fe2d15708bf40f51"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="laurabw35" cloneof="laurabow">
+		<description>The Colonel's Bequest (3.5")</description>
+		<year>1989</year>
+		<publisher>Sierra On-Line</publisher>
+		<info name="developer" value="Sierra On-Line" />
+		<info name="version" value="1.000.046" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [3.5DD] [Disk 1 of 4].img" size="737280" crc="d3f80650" sha1="e4119b36a02230acf42498879ab7570a183f35b4"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [3.5DD] [Disk 2 of 4].img" size="737280" crc="61663864" sha1="02865bc61fe45a8031c608ec7c76ef9f05ac8ae3"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [3.5DD] [Disk 3 of 4].img" size="737280" crc="1e6c2f9b" sha1="95f5673450c7f81d296887506e7109b45d022b32"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Laura Bow - The Colonel's Bequest [Sierra On-Line] [1989]  [3.5DD] [Disk 4 of 4].img" size="737280" crc="a35399e0" sha1="da4d4814782be5a14429c193e66993764a1cd0cc"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="colossus4">
+		<description>Colossus Bridge 4</description>
+		<year>1988</year>
+		<publisher>CDS Software</publisher>
+		<info name="usage" value="Turn power on load system Insert COLOSSUS disk type BRIDGE or TUTOR" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="colossus 4 bridge.img" size="737280" crc="e8d92247" sha1="fa6ff45a9314a66e6eadc57f0a242f2e35edf391"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="keen123">
+		<description>Commander Keen in Invasion of the Vorticons (v1.31, 5.25")</description>
+		<year>1991</year>
+		<publisher>Apogee Software</publisher>
+		<info name="developer" value="id Software" />
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Commander Keen in Invasion of the Vorticons (USA) (v1.31) (5.25'') (Disk 1).img" size="368640" crc="3beb1b23" sha1="32e83f4f6870e587e61c3079f9b0e03dbadeb839"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Commander Keen in Invasion of the Vorticons (USA) (v1.31) (5.25'') (Disk 2).img" size="368640" crc="66446934" sha1="fe9099633582c3a185167429aeba9ffadb02c6ec"/>
 			</dataarea>
 		</part>
 	</software>
@@ -8671,6 +8930,120 @@
 		</part>
 	</software>
 
+	<software name="dlair">
+		<description>Dragon's Lair (5.25")</description>
+		<year>1989</year>
+		<publisher>Merit Software</publisher>
+		<info name="developer" value="Sullivan Bluth Interactive Media" />
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Dragon's Lair [Merit Software] [1989] [5.25DD] [Disk 01 of 13].img" size="368640" crc="63e76372" sha1="46785065572152b6015ba4937fac577fc6cfc2a7"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Dragon's Lair [Merit Software] [1989] [5.25DD] [Disk 02 of 13].img" size="368640" crc="371e335e" sha1="9466563a824aa2a9c2d359083c9f69a537784ff2"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Dragon's Lair [Merit Software] [1989] [5.25DD] [Disk 03 of 13].img" size="368640" crc="809f39e5" sha1="0e61c6188ec32360055570c1b76399ec5e43f23d"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Dragon's Lair [Merit Software] [1989] [5.25DD] [Disk 04 of 13].img" size="368640" crc="e7087a0c" sha1="d33322ebecdd9a3566d1358a3052187ce1b69758"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Dragon's Lair [Merit Software] [1989] [5.25DD] [Disk 05 of 13].img" size="368640" crc="24db0798" sha1="0a169a62fb16faf4e5a0ab721c8b537fbab5f78f"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Dragon's Lair [Merit Software] [1989] [5.25DD] [Disk 06 of 13].img" size="368640" crc="ba652ef1" sha1="14f054b2122c02796e1182e2c291230b31e2ec82"/>
+			</dataarea>
+		</part>
+		<part name="flop7" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Dragon's Lair [Merit Software] [1989] [5.25DD] [Disk 07 of 13].img" size="368640" crc="6e2af55c" sha1="da5ee6df23df16879fc55b6866722e06fba15602"/>
+			</dataarea>
+		</part>
+		<part name="flop8" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Dragon's Lair [Merit Software] [1989] [5.25DD] [Disk 08 of 13].img" size="368640" crc="e62f0ac2" sha1="688874136230366fff747787c1eb344dd778b52e"/>
+			</dataarea>
+		</part>
+		<part name="flop9" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Dragon's Lair [Merit Software] [1989] [5.25DD] [Disk 09 of 13].img" size="368640" crc="6c832f42" sha1="42747cb7c91e0d116bd8559c7e3893679875037f"/>
+			</dataarea>
+		</part>
+		<part name="flop10" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Dragon's Lair [Merit Software] [1989] [5.25DD] [Disk 10 of 13].img" size="368640" crc="90bead8d" sha1="f82a392fd6239e2306b68fc0f571caeddf8c11e3"/>
+			</dataarea>
+		</part>
+		<part name="flop11" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Dragon's Lair [Merit Software] [1989] [5.25DD] [Disk 11 of 13].img" size="368640" crc="bc826826" sha1="ee03b2428548f1c952879591804f5e9ef895d229"/>
+			</dataarea>
+		</part>
+		<part name="flop12" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Dragon's Lair [Merit Software] [1989] [5.25DD] [Disk 12 of 13].img" size="368640" crc="857c2bde" sha1="89e15fb47111771edfcb7652c803f0c65e7669b9"/>
+			</dataarea>
+		</part>
+		<part name="flop13" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Dragon's Lair [Merit Software] [1989] [5.25DD] [Disk 13 of 13].img" size="368640" crc="9b3235aa" sha1="8b800bcfa4b443ce719e83bb8e2e0f89fa946f44"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="dlair35" cloneof="dlair">
+		<description>Dragon's Lair (3.5")</description>
+		<year>1989</year>
+		<publisher>Merit Software</publisher>
+		<info name="developer" value="Sullivan Bluth Interactive Media" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 1 of 7].img" size="737280" crc="427a0228" sha1="1dc55efd9e29cf40cf7fb3d8f18c7bd638463767"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 2 of 7].img" size="737280" crc="edd53e3f" sha1="0e3a92ef40d34625ca7bbf0659f92426a87f7d7d"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 3 of 7].img" size="737280" crc="abce5854" sha1="1c5fb429a82c333e80c97dacc643a53f75d697a9"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 4 of 7].img" size="737280" crc="4b18e231" sha1="77956cf326c656040623ea18e6e29855198b4a43"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 5 of 7].img" size="737280" crc="8472352b" sha1="951ada228f6b503590240a0826638a44767eb15a"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 6 of 7].img" size="737280" crc="32eb9f17" sha1="c04ee5b1f011d57382ad91ea39462339795cc2ef"/>
+			</dataarea>
+		</part>
+		<part name="flop7" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Dragon's Lair [Merit Software] [1989] [3.5DD] [Disk 7 of 7].img" size="737280" crc="3454a916" sha1="88fcfc7b9f653951023ee3b7cd9955eff9083ddc"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="drakkhen">
 		<description>Drakkhen (EGA, CGA, VGA)</description>
 		<year>1990</year>
@@ -8866,6 +9239,18 @@
 		</part>
 	</software>
 
+	<software name="f29retal">
+		<description>F29 Retaliator</description>
+		<year>1990</year>
+		<publisher>Ocean</publisher>
+		<info name="developer" value="Digital Image Design" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="F29 Retaliator [Ocean] [1990] [3.5DD] [Disk 1 of 1].img" size="737280" crc="206489fc" sha1="fc8cd80ca5d3288ffbcb797e72e187bdc9113fcf"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="fta1">
 		<description>The Faery Tale Adventure: Book I</description>
 		<year>1989</year>
@@ -9144,6 +9529,24 @@
 		</part>
 	</software>
 
+	<software name="gunship">
+		<description>Gunship</description>
+		<year>1987</year>
+		<publisher>MicroProse</publisher>
+		<info name="developer" value="MicroProse" />
+		<info name="version" value="429.05" />
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Gunship v429.05 [Microprose] [1987] [5.25DD] [Disk 1 of 2].img" size="368640" crc="74ef4447" sha1="c31b6df82fdb09e68ebae6e19f4aac525c21b948"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Gunship v429.05 [Microprose] [1987] [5.25DD] [Disk 2 of 2].img" size="368640" crc="edcb863f" sha1="3391538e151626280ae59875619dcb9bfafaf1c9"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="hardbal2">
 		<description>Hardball II</description>
 		<year>1989</year>
@@ -9706,13 +10109,31 @@
 	</software>
 
 	<software name="lakecelt">
-		<description>Lakers vs Celtics and the NBA Playoffs</description>
+		<description>Lakers vs Celtics and the NBA Playoffs (5.25")</description>
+		<year>1989</year>
+		<publisher>Electronic Arts</publisher>
+		<info name="developer" value="Electronic Arts" />
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Lakers vs Celtics [Electronic Arts] [1989] [5.25DD] [Disk 1 of 2] [Game Disk].img" size="368640" crc="cd206aeb" sha1="c9227ca97f0266951402034db3722eac8f5aabe3"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Lakers vs Celtics [Electronic Arts] [1989] [5.25DD] [Disk 2 of 2] [Team Data Disk].img" size="368640" crc="d85973dd" sha1="e19c68028487987ea6bd98cc82782a3740135c15"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="lakecelt35" cloneof="lakecelt">
+		<description>Lakers vs Celtics and the NBA Playoffs (3.5")</description>
 		<year>1989</year>
 		<publisher>Electronic Arts</publisher>
+		<info name="developer" value="Electronic Arts" />
 		<part name="flop1" interface="floppy_3_5">
 			<feature name="disk_serial" value="361302" />
 			<dataarea name="flop" size = "737280">
-				<rom name="Lakers Versus Celtics [Electronic Arts] [1989] [3.5].img" size="737280" crc="250b9754" sha1="ddabfc228055d876ba249407235ac7fe3b2b5d1c"/>
+				<rom name="Lakers vs Celtics [Electronic Arts] [1989] [3.5DD] [Disk 1 of 1].img" size="737280" crc="250b9754" sha1="ddabfc228055d876ba249407235ac7fe3b2b5d1c"/>
 			</dataarea>
 		</part>
 	</software>
@@ -9739,23 +10160,81 @@
 		</part>
 	</software>
 
+	<software name="lsl">
+		<description>Leisure Suit Larry in the Land of the Lounge Lizards</description>
+		<year>1987</year>
+		<publisher>Sierra On-Line</publisher>
+		<info name="developer" value="Sierra On-Line" />
+		<info name="version" value="Ver. 1.00 6/1/87" />
+		<part name="flop1" interface="floppy_5_25">
+			<!-- Copy-protected key disk -->
+			<dataarea name="flop" size = "2159416">
+				<rom name="Leisure Suit Larry [Sierra] [1987] [5.25DD] [Disk 1 of 2].mfm" size="2159416" crc="95c59a20" sha1="7c00ffe84e46b327b33e275df1df4842d8aa6c64"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Leisure Suit Larry [Sierra] [1987] [5.25DD] [Disk 2 of 2].img" size="368640" crc="15ef74ed" sha1="e9e8789721364c63ab279c2db4d44a0835f9b452"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="lsl2">
-		<description>Leisure Suit Larry Goes Looking for Love (In Several Wrong Places)</description>
-		<year>1988</year>
-		<publisher>Sierra</publisher>
+		<description>Leisure Suit Larry Goes Looking for Love (in Several Wrong Places) (5.25")</description>
+		<year>1989</year>
+		<publisher>Sierra On-Line</publisher>
+		<info name="developer" value="Sierra On-Line" />
+		<info name="version" value="Ver. 1.002.000 January 11, 89" />
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Leisure Suit Larry 2 [Sierra] [1989] [5.25DD] [Disk 1 of 6].img" size="368640" crc="e88e484e" sha1="bc9a1560dddd7693f5bbd966ff7dbac1cfe27167"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Leisure Suit Larry 2 [Sierra] [1989] [5.25DD] [Disk 2 of 6].img" size="368640" crc="8291e70d" sha1="a2d34c580b33db9ed890697e3d926206e4c4e22f"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Leisure Suit Larry 2 [Sierra] [1989] [5.25DD] [Disk 3 of 6].img" size="368640" crc="cf970896" sha1="135bd6bc669b7530e615c1e5c5658e9db43dbc52"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Leisure Suit Larry 2 [Sierra] [1989] [5.25DD] [Disk 4 of 6].img" size="368640" crc="1b58a8ed" sha1="9d9bf39a2012522f1a5e2f8535368a8cc696bd6b"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Leisure Suit Larry 2 [Sierra] [1989] [5.25DD] [Disk 5 of 6].img" size="368640" crc="260f05a1" sha1="25354834527dde21a0705dc5216601dbaef4b4b3"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="Leisure Suit Larry 2 [Sierra] [1989] [5.25DD] [Disk 6 of 6].img" size="368640" crc="c22b5f3f" sha1="6c3d3aad5fdf86d6dca9c915053b49bc7369f0ec"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="lsl2_35" cloneof="lsl2">
+		<description>Leisure Suit Larry Goes Looking for Love (in Several Wrong Places) (3.5")</description>
+		<year>1989</year>
+		<publisher>Sierra On-Line</publisher>
+		<info name="developer" value="Sierra On-Line" />
+		<info name="version" value="Ver. 1.002.000 January 11, 89" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "737280">
-				<rom name="leisure suit larry 2 (disk 1).img" size="737280" crc="d852af42" sha1="1feab542687a6984072faabd228976d6953238c1"/>
+				<rom name="Leisure Suit Larry 2 [Sierra] [1989] [3.5DD] [Disk 1 of 3].img" size="737280" crc="0a201664" sha1="9cc61dec4fadfd1519e084ba7ecb007b070d0625"/>
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_3_5">
 			<dataarea name="flop" size = "737280">
-				<rom name="leisure suit larry 2 (disk 2).img" size="737280" crc="09153a59" sha1="a57ef10d7b5c6ffa393b0b296a7907c51728652a"/>
+				<rom name="Leisure Suit Larry 2 [Sierra] [1989] [3.5DD] [Disk 2 of 3].img" size="737280" crc="09153a59" sha1="a57ef10d7b5c6ffa393b0b296a7907c51728652a"/>
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_3_5">
 			<dataarea name="flop" size = "737280">
-				<rom name="leisure suit larry 2 (disk 3).img" size="737280" crc="0a3b07f8" sha1="2a3732988e2265d3f352fa5f25330fb6602ab59d"/>
+				<rom name="Leisure Suit Larry 2 [Sierra] [1989] [3.5DD] [Disk 3 of 3].img" size="737280" crc="0a3b07f8" sha1="2a3732988e2265d3f352fa5f25330fb6602ab59d"/>
 			</dataarea>
 		</part>
 	</software>
@@ -10349,6 +10828,29 @@
 		</part>
 	</software>
 
+	<software name="andretti">
+		<description>Mario Andretti's Racing Challenge</description>
+		<year>1991</year>
+		<publisher>Electronic Arts</publisher>
+		<info name="developer" value="Distinctive Software" />
+		<info name="version" value="1.0" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Mario Andretti's Racing Challenge [Electronic Arts] [1991] [3.5DD] [Career Disk].img" size="737280" crc="affe5fe6" sha1="74e2fe67f71ef56e9104c72c89cabec4a2f57f66"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Mario Andretti's Racing Challenge [Electronic Arts] [1991] [3.5DD] [Program Control Disk].img" size="737280" crc="7c6dab1f" sha1="c9447f411da447af0190c61312271221990818ab"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Mario Andretti's Racing Challenge [Electronic Arts] [1991] [3.5DD] [Race Disk].img" size="737280" crc="eb3ab737" sha1="01c291ec3086c1d621fee6d65fee804ef7930432"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="martmemo">
 		<description>Martian Memorandum</description>
 		<year>1991</year>
@@ -11232,13 +11734,25 @@
 		</part>
 	</software>
 
-	<software name="ppersia35a" cloneof="ppersia">
+	<software name="ppersia35c" cloneof="ppersia">
 		<description>Prince of Persia (3.5", v1.1)</description>
 		<year>1990</year>
 		<publisher>Brøderbund Software</publisher>
 		<info name="version" value="V1.1" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "737280">
+				<rom name="Prince of Persia (v1.1) [Broderbund] [1990] [3.5DD] [Disk 1 of 1].img" size="737280" crc="151bbd64" sha1="6340b76af36796e41432cf15f85b26c882229a34"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="ppersia35a" cloneof="ppersia">
+		<description>Prince of Persia (3.5", v1.1, Hit Squad release)</description>
+		<year>1992</year>
+		<publisher>Hit Squad</publisher>
+		<info name="version" value="V1.1" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
 				<rom name="Prince of Persia (World) (v1.1) (Hit Squad).img" size="737280" crc="0c386185" sha1="b194505c710acd1da5aeea34415b1ae5bb4979dd"/>
 			</dataarea>
 		</part>
@@ -11274,7 +11788,7 @@
 	</software>
 
 	<software name="ppersia35fr" cloneof="ppersia">
-		<description>Prince of Persia (3.5", v1.0, French)</description>
+		<description>Prince of Persia (3.5", v1.0, France)</description>
 		<year>1990</year>
 		<publisher>Brøderbund Software</publisher>
 		<info name="version" value="V1.0" />
@@ -12012,17 +12526,30 @@
 	</software>
 
 	<software name="spdball2">
-		<description>Speedball 2 - Brutal Deluxe</description>
-		<year>1990</year>
-		<publisher>Imageworks</publisher>
+		<description>Speedball 2 - Brutal Deluxe (USA, 5.25")</description>
+		<year>1991</year>
+		<publisher>Konami / Mirrorsoft</publisher>
+		<info name="developer" value="The Bitmap Brothers" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size = "368640">
-				<rom name="Speedball 2 - Brutal Deluxe (1990)(Imageworks)(Disk 1 of 2).dsk" size="368640" crc="7076b522" sha1="80e4d60ebe4c948f13897fb74c403b22a2acfceb"/>
+				<rom name="Speedball 2 (USA) [Konami] [1991] [5.25DD] [Disk 1 of 2].img" size="368640" crc="3be3b716" sha1="aa948d9c1c940e4aa93b6107a537483cbc6e65c6"/>
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
 			<dataarea name="flop" size = "368640">
-				<rom name="Speedball 2 - Brutal Deluxe (1990)(Imageworks)(Disk 2 of 2).dsk" size="368640" crc="09fc221a" sha1="a71468919cb0d32706de00dae2cc14ca0b471a62"/>
+				<rom name="Speedball 2 (USA) [Konami] [1991] [5.25DD] [Disk 2 of 2].img" size="368640" crc="09fc221a" sha1="a71468919cb0d32706de00dae2cc14ca0b471a62"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="spdball2_35" cloneof="spdball2">
+		<description>Speedball 2 - Brutal Deluxe (Euro, 3.5")</description>
+		<year>1991</year>
+		<publisher>ImageWorks</publisher>
+		<info name="developer" value="The Bitmap Brothers" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Speedball 2 [ImageWorks] [1991] [3.5DD] [Disk 1 of 1].img" size="737280" crc="d2c66d2b" sha1="6a931ef4b2001948f1fea10e0d1b9e9652238908"/>
 			</dataarea>
 		</part>
 	</software>
@@ -12219,7 +12746,8 @@
 	<software name="sf">
 		<description>Street Fighter</description>
 		<year>1988</year>
-		<publisher>Capcom Co., Ltd.</publisher>
+		<publisher>Capcom</publisher>
+		<info name="developer" value="Capcom" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="737280">
 				<rom name="street fighter.img" size="737280" crc="838baa9e" sha1="ef14c9638208e04fcc819ebc7908c7611a929624"/>
@@ -12465,6 +12993,22 @@
 		</part>
 	</software>
 
+	<software name="td3">
+		<description>Test Drive III - The Passion</description>
+		<year>1990</year>
+		<publisher>Accolade</publisher>
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Test Drive III - The Passion (USA) [Accolade] [1990] [3.5DD] [Boot Program Disk].img" size="737280" crc="50d5f0f3" sha1="d34edbb61f8a140621a7744629fee6fb81b5f897"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Test Drive III - The Passion (USA) [Accolade] [1990] [3.5DD] [Master Play Disk].img" size="737280" crc="c06149ac" sha1="9e810be2bb975d64969e812bfd53836ba1932498"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="tetris">
 		<description>Tetris (5.25")</description>
 		<year>1987</year>
@@ -12526,6 +13070,58 @@
 		</part>
 	</software>
 
+
+	<software name="tvsbbv">
+		<description>TV Sports Basketball (5.25", UK, VGA version)</description>
+		<year>1990</year>
+		<publisher>Cinemaware</publisher>
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="TVS BasketBall (UK) [Cinemaware] [1990] [5.25DD] [VGA Disk 1 of 2].img" size="368640" crc="3fddbc38" sha1="358f09f1c1b96f5f72775257ee32ea898e10cd59"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="TVS BasketBall (UK) [Cinemaware] [1990] [5.25DD] [VGA Disk 2 of 2].img" size="368640" crc="b47edc73" sha1="cc59befe5f2175dc4b6f6a510320f73702d4bd9b"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="tvsbbe" cloneof="tvsbbv">
+		<description>TV Sports Basketball (5.25", UK, EGA/TANDY version)</description>
+		<year>1990</year>
+		<publisher>Cinemaware</publisher>
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="TVS BasketBall (UK) [Cinemaware] [1990] [5.25DD] [EGA-Tandy Disk 1 of 2].img" size="368640" crc="e9c5f52c" sha1="a873b6044e9526f0f6e18ef541aee1f3dc2a7586"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size = "368640">
+				<rom name="TVS BasketBall (UK) [Cinemaware] [1990] [5.25DD] [EGA-Tandy Disk 2 of 2].img" size="368640" crc="15a6a3ef" sha1="324a0e17f213f6b4674159aad9b5fb75e89288da"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="tvsbbv35" cloneof="tvsbbv">
+		<description>TV Sports Basketball (3.5", USA, VGA version)</description>
+		<year>1990</year>
+		<publisher>Cinemaware</publisher>
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="TVS BasketBall (USA) [Cinemaware] [1990] [3.5DD] [VGA Disk 1 of 1].img" size="737280" crc="4749a24f" sha1="ecc52dcb80eab1bc03b18dd98fe860f2e10830dd"/>
+			</dataarea>
+		</part>
+	</software>
+	<software name="tvsbbe35" cloneof="tvsbbv">
+		<description>TV Sports Basketball (3.5", USA, EGA/TANDY version)</description>
+		<year>1990</year>
+		<publisher>Cinemaware</publisher>
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="TVS BasketBall (USA) [Cinemaware] [1990] [3.5DD] [EGA-Tandy Disk 1 of 1].img" size="737280" crc="047e2e5a" sha1="002bf754975b1d7ad472b139e77e036e7053a7ae"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="ums2pe">
 		<description>UMS II: Nations at War - Planet Editor</description>
 		<year>1992</year>
@@ -12627,6 +13223,19 @@
 		</part>
 	</software>
 
+	<software name="wolfpack">
+		<description>Wolfpack (USA)</description>
+		<year>1990</year>
+		<publisher>Brøderbund</publisher>
+		<info name="developer" value="Novalogic" />
+		<info name="version" value="1.10" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Wolfpack [Broderbund] [1990] [3.5DD] [Disk 1 of 1].img" size="737280" crc="09fd3cb5" sha1="3b51892af5c41303ce50e34d64cb85f464dbccd8"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="wndrland">
 		<!-- Dumped via Kryoflux, track 0 shows as modified on all disks -->
 		<description>Wonderland</description>
@@ -12749,12 +13358,24 @@
 	</software>
 
 	<software name="xenon2">
-		<description>Xenon 2: Megablast (Power Pack Compilation)</description>
+		<description>Xenon 2: Megablast</description>
 		<year>1990</year>
 		<publisher>Mirrorsoft</publisher>
 		<info name="developer" value="The Assembly Line - The Bitmap Brothers" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "737280">
+				<rom name="Xenon 2 [Mirrorsoft] [1990] [3.5DD] [Disk 1 of 1].img" size="737280" crc="ae093ac1" sha1="1167c3a0af77690f3ede783772773a840fbae34a"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="xenon2a" cloneof="xenon2">
+		<description>Xenon 2: Megablast (Power Pack Compilation)</description>
+		<year>1990</year>
+		<publisher>Beau Jolly - Mirrorsoft</publisher>
+		<info name="developer" value="The Assembly Line - The Bitmap Brothers" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
 				<rom name="Xenon 2 (Power Pack Compilation) [Mirrorsoft] [1990] [3.5DD] [Disk 1 of 1].img" size="737280" crc="e11986f8" sha1="b70e62ff6af4270188f85dbd4d7bf24d4acc45b7"/>
 			</dataarea>
 		</part>
diff -Nru mame-0.222+dfsg.1/hash/ibm5170.xml mame-0.224+dfsg.1/hash/ibm5170.xml
--- mame-0.222+dfsg.1/hash/ibm5170.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/ibm5170.xml	2020-08-26 08:57:19.000000000 +0000
@@ -8964,6 +8964,58 @@
 		</part>
 	</software>
 
+	<software name="aitd2us" cloneof="aitd2">
+		<description>Alone in the Dark 2 (USA)</description>
+		<year>1994</year>
+		<publisher>I·Motion</publisher>
+		<info name="developer" value="Infogrames" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Alone in the Dark 2 (USA) [I-Motion] [1994] [3.5HD] [Disk 1 of 9].img" size="1474560" crc="3b785f3b" sha1="e1a3743725394545fcc06c3e8291968461782c32"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Alone in the Dark 2 (USA) [I-Motion] [1994] [3.5HD] [Disk 2 of 9].img" size="1474560" crc="b9202a73" sha1="661a943bc7e1d4609f9ce932f4128a149d0ce105"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Alone in the Dark 2 (USA) [I-Motion] [1994] [3.5HD] [Disk 3 of 9].img" size="1474560" crc="cc584179" sha1="e600d6479f9bedfc895527b14f2341ba2ab1008c"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Alone in the Dark 2 (USA) [I-Motion] [1994] [3.5HD] [Disk 4 of 9].img" size="1474560" crc="4f33d82f" sha1="321c23775b437e94cb8fe836bb25572a630b0665"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Alone in the Dark 2 (USA) [I-Motion] [1994] [3.5HD] [Disk 5 of 9].img" size="1474560" crc="ef75d09f" sha1="9d82237451ebdfe70359be84a93c3a2856e3870a"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Alone in the Dark 2 (USA) [I-Motion] [1994] [3.5HD] [Disk 6 of 9].img" size="1474560" crc="f3e11e88" sha1="b6f7b89ea1b9babf941056a23f7be2c9d3c83cf0"/>
+			</dataarea>
+		</part>
+		<part name="flop7" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Alone in the Dark 2 (USA) [I-Motion] [1994] [3.5HD] [Disk 7 of 9].img" size="1474560" crc="bef5bb00" sha1="05042ab1d9a3197069381095549781a3908c45de"/>
+			</dataarea>
+		</part>
+		<part name="flop8" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Alone in the Dark 2 (USA) [I-Motion] [1994] [3.5HD] [Disk 8 of 9].img" size="1474560" crc="2b82a8f4" sha1="2f1343a5d7636e10858cdc8623fb0d46bde2706c"/>
+			</dataarea>
+		</part>
+		<part name="flop9" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Alone in the Dark 2 (USA) [I-Motion] [1994] [3.5HD] [Disk 9 of 9].img" size="1474560" crc="45d8eaa3" sha1="029691f33419c1a5c690ebf98ce813761e39831c"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="amazon">
 		<description>Amazon - Guardians of Eden</description>
 		<year>1992</year>
@@ -9007,13 +9059,42 @@
 	</software>
 
 	<software name="anotherw">
-		<description>Another World</description>
-		<year>1991</year>
+		<description>Another World (Euro) (KIXX XL release)</description>
+		<year>1993</year>
 		<publisher>U.S. Gold</publisher>
 		<info name="developer" value="Delphine Software" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "1474560">
-				<rom name="Another World [U.S. Gold] [1991] [3.5HD] [Disk 1 of 1].img" size="1474560" crc="4eb64a42" sha1="b04f581b6c14c4b592b89f1875e645f7c03a90d6"/>
+				<rom name="Another World [U.S. Gold] [1993] [3.5HD] [Disk 1 of 1].img" size="1474560" crc="4eb64a42" sha1="b04f581b6c14c4b592b89f1875e645f7c03a90d6"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="ootw_525" cloneof="anotherw">
+		<description>Out of this World (USA, 5.25" HD)</description>
+		<year>1992</year>
+		<publisher>Interplay</publisher>
+		<info name="developer" value="Delphine Software" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "1228800">
+				<rom name="Out of this World [Interplay] [1992] [5.25HD] [Disk 1 of 1].img" size="1228800" crc="25a14c8e" sha1="31556fda8c25d39d2c29cba54f9e8d49e33355d6"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="ootw_35dd" cloneof="anotherw">
+		<description>Out of this World (USA, 3.5" DD)</description>
+		<year>1992</year>
+		<publisher>Interplay</publisher>
+		<info name="developer" value="Delphine Software" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Out of this World [Interplay] [1992] [3.5DD] [Disk 1 of 2].img" size="737280" crc="121ceb6f" sha1="1e04092ec17c671688b53ef392ba3e514b4bbd8e"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Out of this World [Interplay] [1992] [3.5DD] [Disk 2 of 2].img" size="737280" crc="4e6eb05c" sha1="1a2084a9fc15141404eecfb31127a0d209567624"/>
 			</dataarea>
 		</part>
 	</software>
@@ -9042,7 +9123,7 @@
 	</software>
 
 	<software name="b17">
-		<description>B-17 Flying Fortress</description>
+		<description>B-17 Flying Fortress (3.5")</description>
 		<year>1992</year>
 		<publisher>MicroProse</publisher>
 		<part name="flop1" interface="floppy_3_5">
@@ -9067,6 +9148,37 @@
 		</part>
 	</software>
 
+	<software name="b17_525" cloneof="b17">
+		<description>B-17 Flying Fortress (5.25")</description>
+		<year>1992</year>
+		<publisher>MicroProse</publisher>
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="B-17 Flying Fortress [MicroProse] [1992] [5.25HD] [Disk A].img" size="1228800" crc="641a5f5c" sha1="58f1901778345507d3b5ad3d328983a134858f6c"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="B-17 Flying Fortress [MicroProse] [1992] [5.25HD] [Disk B].img" size="1228800" crc="ff8885d9" sha1="523e5309376392d27ab0562b7d8f420eee3bab49"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="B-17 Flying Fortress [MicroProse] [1992] [5.25HD] [Disk C].img" size="1228800" crc="ff34c38e" sha1="c4bbde9b1ede796e3dc8e0a98778dd2c85ed1103"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="B-17 Flying Fortress [MicroProse] [1992] [5.25HD] [Disk D].img" size="1228800" crc="68e361b5" sha1="65f12941e448e9585fe684c584b51babebb746af"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="B-17 Flying Fortress [MicroProse] [1992] [5.25HD] [Disk E].img" size="1228800" crc="2d11c55e" sha1="bc18cefd20f39cfa85d23eece42315d262da1cac"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="bat2">
 		<description>B.A.T. II</description>
 		<year>1992</year>
@@ -9153,7 +9265,92 @@
 		</part>
 	</software>
 
-	<software name="steelskyf">
+	<software name="bchess4k">
+		<description>Battle Chess 4000</description>
+		<year>1992</year>
+		<publisher>Interplay</publisher>
+		<info name="developer" value="Interplay" />
+		<info name="version" value="1.00" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Battle Chess 4000 [Interplay] [1992] [3.5HD] [Startup Disk].img" size="1474560" crc="4459e4be" sha1="64d4cbd12a1e9f1ab7cb924a6a72885127fc2199"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Battle Chess 4000 [Interplay] [1992] [3.5HD] [Data Disk 1 of 7].img" size="1474560" crc="6f3ff014" sha1="2b76b901ee55a153d78a2b0e00a62d8dc634676d"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Battle Chess 4000 [Interplay] [1992] [3.5HD] [Data Disk 2 of 7].img" size="1474560" crc="b1d2fe82" sha1="3869c0d5fd8f67bc5ebf0729fda6030204a1dc33"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Battle Chess 4000 [Interplay] [1992] [3.5HD] [Data Disk 3 of 7].img" size="1474560" crc="114f15d8" sha1="07522fca5afe22a863d24443c418a2186d368cf0"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Battle Chess 4000 [Interplay] [1992] [3.5HD] [Data Disk 4 of 7].img" size="1474560" crc="e54cc2ce" sha1="94f18ce53853784094f5d53bf2e427a5bc37899b"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Battle Chess 4000 [Interplay] [1992] [3.5HD] [Data Disk 5 of 7].img" size="1474560" crc="8a8fbde2" sha1="44ee2e4160bbac6a69b361d963670f6d3754c916"/>
+			</dataarea>
+		</part>
+		<part name="flop7" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Battle Chess 4000 [Interplay] [1992] [3.5HD] [Data Disk 6 of 7].img" size="1474560" crc="10fed963" sha1="e87fc11274cc28af8bc7a0376fb6e0775d04c020"/>
+			</dataarea>
+		</part>
+		<part name="flop8" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Battle Chess 4000 [Interplay] [1992] [3.5HD] [Data Disk 7 of 7].img" size="1474560" crc="b1649f1b" sha1="e84cdf93446c3695357502482875e6265309af1f"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="steelsky">
+		<description>Beneath a Steel Sky (Euro)</description>
+		<year>1994</year>
+		<publisher>Virgin</publisher>
+		<info name="developer" value="Revolution Software" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Beneath a Steel Sky (euro) [Virgin] [1994] [3.5HD] [Disk 1 of 6].img" size="1474560" crc="fdcdb506" sha1="78b12fa1c43bc0f94ec55091c4a60905962235b7"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Beneath a Steel Sky (euro) [Virgin] [1994] [3.5HD] [Disk 2 of 6].img" size="1474560" crc="93971d52" sha1="233cb0275fff27296f474fbff7874f1ada1b9957"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Beneath a Steel Sky (euro) [Virgin] [1994] [3.5HD] [Disk 3 of 6].img" size="1474560" crc="b624464b" sha1="08c638de7259836a472f2d7173312399be369588"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Beneath a Steel Sky (euro) [Virgin] [1994] [3.5HD] [Disk 4 of 6].img" size="1474560" crc="d1802f9e" sha1="36cd78784c013e3614ce3aae9591e2c2aa886ab0"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Beneath a Steel Sky (euro) [Virgin] [1994] [3.5HD] [Disk 5 of 6].img" size="1474560" crc="72680d7a" sha1="ca773d61aef0a3d5eee4fc51f62305645b879ce1"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Beneath a Steel Sky (euro) [Virgin] [1994] [3.5HD] [Disk 6 of 6].img" size="1474560" crc="68c95e68" sha1="788c850c5976560f129e91f49ea4c82750904b1b"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="steelskyf" cloneof="steelsky">
 		<description>Beneath a Steel Sky (France)</description>
 		<year>1994</year>
 		<publisher>Virgin</publisher>
@@ -9638,6 +9835,19 @@
 		</part>
 	</software>
 
+	<software name="corridr7d" cloneof="corridr7">
+		<description>Corridor 7: Alien Invasion (demo)</description>
+		<year>1994</year>
+		<publisher>Capstone Software</publisher>
+		<info name="developer" value="Capstone Software" />
+		<info name="version" value="2.0D" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Corridor 7 (demo) [Capstone] [1994] [3.5HD] [Disk 1 of 1].img" size="1474560" crc="7337a21d" sha1="dd2c1752ba51c8a7e2fa520bf1e4900229a714c2"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="cosmo">
 		<description>Cosmo's Cosmic Adventure - Forbidden Planet</description>
 		<year>1992</year>
@@ -9799,7 +10009,7 @@
 		<year>1992</year>
 		<publisher>Dro Soft</publisher>
 		<info name="version" value="1.5" />
-		<info name="developer" value="Cyberdreams, Inc." />
+		<info name="developer" value="Cyberdreams" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "737280">
 				<rom name="Dark Seed [Dro Soft] [1992] [3.5DD] [Disk 1 of 5].img" size="737280" crc="06f697be" sha1="11e8b1fdc50916bc81f25e925b4050408b7031a3"/>
@@ -9881,8 +10091,8 @@
 	<software name="aladdin">
 		<description>Disney's Aladdin</description>
 		<year>1994</year>
-		<publisher>Virgin Interactive Entertainment, Inc.</publisher>
-		<info name="developer" value="Virgin Interactive Entertainment, Inc." />
+		<publisher>Virgin Interactive Entertainment</publisher>
+		<info name="developer" value="Virgin Interactive Entertainment" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "1474560">
 				<rom name="Disney's Aladdin [Virgin] [1994] [3.5HD] [Disk 1 of 2].img" size="1474560" crc="ceaca4d7" sha1="068e75e0e5432eb337b468e647135f085ff3166e"/>
@@ -9898,7 +10108,7 @@
 	<software name="lionking">
 		<description>Disney's The Lion King</description>
 		<year>1994</year>
-		<publisher>Virgin Interactive Entertainment, Inc.</publisher>
+		<publisher>Virgin Interactive Entertainment</publisher>
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "1474560">
 				<rom name="Disney's The Lion King (USA) (Disk 1).img" size="1474560" crc="732d455a" sha1="20e85e8c381263363250c5b509fbc24415ed2e5d"/>
@@ -10492,7 +10702,7 @@
 	</software>
 
 	<software name="kyrandia">
-		<description>Fables &amp; Fiends - The Legend of Kyrandia Book One</description>
+		<description>Fables &amp; Fiends - Book One: The Legend of Kyrandia</description>
 		<year>1992</year>
 		<publisher>Virgin Games</publisher>
 		<info name="version" value="1.3" />
@@ -10520,7 +10730,7 @@
 	</software>
 
 	<software name="kyrandiafr" cloneof="kyrandia">
-		<description>Fables &amp; Fiends - The Legend of Kyrandia Book One (France)</description>
+		<description>Fables &amp; Fiends - Book One: The Legend of Kyrandia (France)</description>
 		<year>1992</year>
 		<publisher>Virgin Games</publisher>
 		<info name="version" value="1.7" />
@@ -10548,7 +10758,7 @@
 	</software>
 
 	<software name="hofde">
-		<description>Fables &amp; Fiends - The Hand of Fate (Germany)</description>
+		<description>Fables &amp; Fiends - Book Two: The Hand of Fate (Germany)</description>
 		<year>1993</year>
 		<publisher>Virgin Interactive Entertainment</publisher>
 		<info name="version" value="1.41" />
@@ -10740,6 +10950,23 @@
 		</part>
 	</software>
 
+	<software name="ffurries">
+		<description>Fury of the Furries (Euro)</description>
+		<year>1993</year>
+		<publisher>Mindscape</publisher>
+		<info name="developer" value="Kalisto" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Fury of the Furries [Mindscape] [1993] [3.5HD] [Disk 1 of 2].img" size="1474560" crc="a34ab8a1" sha1="9097f6724e8234dc7d3e61c8b89737da511fd6df"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Fury of the Furries [Mindscape] [1993] [3.5HD] [Disk 2 of 2].img" size="1474560" crc="476b3ccd" sha1="6947567ace0cf50e0f6754d4c3c908cd04781190"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<!-- ISBN: 98-89973-26-7 -->
 	<software name="gilispa" supported="no">
 		<description>Gilis presentask (Swe)</description>
@@ -10805,7 +11032,7 @@
 	</software>
 
 	<software name="goblins">
-		<description>Gobliiins (US - VGA release)</description>
+		<description>Gobliiins (USA, VGA version)</description>
 		<year>1992</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="version" value="1.000 09/11/92" />
@@ -10873,6 +11100,39 @@
 		</part>
 	</software>
 
+	<software name="goblins3g" cloneof="goblins3">
+		<description>Goblins Quest 3 (Germany)</description>
+		<year>1993</year>
+		<publisher>Sierra On-Line</publisher>
+		<info name="developer" value="Coktel Vision" />
+		<info name="version" value="0.50" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Goblins 3 (Germany) [Sierra] [1993] [3.5HD] [Disk 1 of 5].img" size="1474560" crc="debef2d0" sha1="aac7f973e3cd6645bf75a42baff4526459ca6c12"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Goblins 3 (Germany) [Sierra] [1993] [3.5HD] [Disk 2 of 5].img" size="1474560" crc="06fd5e22" sha1="5983857f151513af6be873bb4fb3d24f18e4bade"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Goblins 3 (Germany) [Sierra] [1993] [3.5HD] [Disk 3 of 5].img" size="1474560" crc="6241a908" sha1="71a2ba8183c6acb2211ef16ece4ee3ee5cc13516"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Goblins 3 (Germany) [Sierra] [1993] [3.5HD] [Disk 4 of 5].img" size="1474560" crc="6f96ad1c" sha1="18ec37853726f72994b2cb3ca386f180b5510c56"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Goblins 3 (Germany) [Sierra] [1993] [3.5HD] [Disk 5 of 5].img" size="1474560" crc="9c5f6d67" sha1="e0f87c8dcc57a07e6c653aef3bc671f06da791d3"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="gods">
 		<description>Gods</description>
 		<year>1991</year>
@@ -11125,17 +11385,17 @@
 		<description>The Humans (5.25" HD)</description>
 		<year>1993</year>
 		<publisher>GameTek</publisher>
-		<part name="flop1" interface="floppy_3_5">
+		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size = "1228800">
 				<rom name="The Humans [GameTek] [1992] [5.25HD] [Disk 1 of 3].img" size="1228800" crc="2dc56954" sha1="25877a02d07686f71e9bfc74a6e507a02a859c56"/>
 			</dataarea>
 		</part>
-		<part name="flop2" interface="floppy_3_5">
+		<part name="flop2" interface="floppy_5_25">
 			<dataarea name="flop" size = "1228800">
 				<rom name="The Humans [GameTek] [1992] [5.25HD] [Disk 2 of 3].img" size="1228800" crc="f376ef79" sha1="7a7f3b829edba812e88a81a958549eb4099bd9cd"/>
 			</dataarea>
 		</part>
-		<part name="flop3" interface="floppy_3_5">
+		<part name="flop3" interface="floppy_5_25">
 			<dataarea name="flop" size = "1228800">
 				<rom name="The Humans [GameTek] [1992] [5.25HD] [Disk 3 of 3].img" size="1228800" crc="1e0e73ed" sha1="e0fcd8422b91c8d3ea00e5706be871e9a4cf408c"/>
 			</dataarea>
@@ -11200,7 +11460,7 @@
 	</software>
 
 	<software name="inca2">
-		<description>Inca 2: Wiracocha (Europe)</description>
+		<description>Inca 2: Wiracocha (Euro)</description>
 		<year>1993</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="developer" value="Coktel Vision" />
@@ -11402,6 +11662,52 @@
 		</part>
 	</software>
 
+	<software name="indy4act">
+		<description>Indiana Jones and the Fate of Atlantis - The Action Game</description>
+		<year>1992</year>
+		<publisher>LucasArts</publisher>
+		<info name="developer" value="LucasArts" />
+		<info name="version" value="1.00" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Indiana Jones and the Fate of Atlantis - The Action Game [LucasArts] [1992] [3.5DD] [Disk 1 of 2].img" size="737280" crc="763866f4" sha1="952ab38672078f8dbd9b14d5850a2564b55d646f"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="Indiana Jones and the Fate of Atlantis - The Action Game [LucasArts] [1992] [3.5DD] [Disk 2 of 2].img" size="737280" crc="45c3bfcf" sha1="de0d29a4652bef6d7b1204b13e35e78088ad85a1"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="indy3adv">
+		<description>Indiana Jones and the Last Crusade - The Graphic Adventure (VGA version)</description>
+		<year>1990</year>
+		<publisher>U.S. Gold</publisher>
+		<info name="developer" value="Lucasfilm" />
+		<info name="version" value="version IBM 256 color 2.0 5/3/90" />
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="Indiana Jones and the Last Crusade - Adventure (VGA version) [US Gold] [1990] [5.25HD] [Disk 1 of 4].img" size="1228800" crc="ac770086" sha1="034a0c3ad00e87abf2bf890ccf080ca3ece79d50"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="Indiana Jones and the Last Crusade - Adventure (VGA version) [US Gold] [1990] [5.25HD] [Disk 2 of 4].img" size="1228800" crc="198a9ff8" sha1="86908565e6ed53bc5a4d1a22ae5ee6b51cfa90c1"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="Indiana Jones and the Last Crusade - Adventure (VGA version) [US Gold] [1990] [5.25HD] [Disk 3 of 4].img" size="1228800" crc="e069cdd6" sha1="cc26fe066cb37d8f566c271b0c6c89bb6f651d5b"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="Indiana Jones and the Last Crusade - Adventure (VGA version) [US Gold] [1990] [5.25HD] [Disk 4 of 4].img" size="1228800" crc="1f6c8db2" sha1="53477730cf096a94f1581f78c431a3d3bcdca823"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="indycar">
 		<description>IndyCar Racing</description>
 		<year>1993</year>
@@ -11473,6 +11779,28 @@
 		</part>
 	</software>
 
+	<software name="jstrike">
+		<description>Jungle Strike</description>
+		<year>1995</year>
+		<publisher>Gremlin Interactive</publisher>
+		<info name="developer" value="Electronic Arts" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Jungle Strike [Gremlin Interactive] [1995] [3.5HD] [Disk 1 of 3].img" size="1474560" crc="ec72dfd3" sha1="bac732abff714d93fa3058d07df3bbe7138ef4d1"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Jungle Strike [Gremlin Interactive] [1995] [3.5HD] [Disk 2 of 3].img" size="1474560" crc="dfd5bbd2" sha1="3bdde79c20439b2e7853a456a7c8db356c759161"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Jungle Strike [Gremlin Interactive] [1995] [3.5HD] [Disk 3 of 3].img" size="1474560" crc="20691385" sha1="a15ad8005da8a4ed7470be8c40bcd8af85e047c0"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="jp">
 		<description>Jurassic Park</description>
 		<year>1993</year>
@@ -11638,11 +11966,11 @@
 	</software>
 
 	<software name="lslvga">
-		<description>Leisure Suit Larry 1: In the Land of the Lounge Lizards (VGA release)</description>
+		<description>Leisure Suit Larry 1: In the Land of the Lounge Lizards (3.5", VGA release, v2.1)</description>
 		<year>1991</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="developer" value="Sierra On-Line" />
-		<info name="version" value="2.1" />
+		<info name="version" value="2.1, July 4, 1991" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "1474560">
 				<rom name="Leisure Suit Larry 1 (VGA release) [Sierra] [1991] [3.5HD] [Disk 1 of 3] (Startup Disk).img" size="1474560" crc="c8caf78b" sha1="88eb7c5442fba643acc15daccebda62a6b5d6aa5"/>
@@ -11660,12 +11988,58 @@
 		</part>
 	</software>
 
+	<software name="lslvgaa" cloneof="lslvga">
+		<description>Leisure Suit Larry 1: In the Land of the Lounge Lizards (3.5", VGA release, v2.0)</description>
+		<year>1991</year>
+		<publisher>Sierra On-Line</publisher>
+		<info name="developer" value="Sierra On-Line" />
+		<info name="version" value="2.0, June 26, 1991" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Leisure Suit Larry 1 (VGA release) (v2.0) [Sierra] [1991] [3.5HD] [Disk 1 of 3] (Startup Disk).img" size="1474560" crc="41a3b667" sha1="1ace473185189cd1aca13702975d0fa006cc3c80"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Leisure Suit Larry 1 (VGA release) (v2.0) [Sierra] [1991] [3.5HD] [Disk 2 of 3] (Disk 1).img" size="1474560" crc="bd041272" sha1="05d0764b2311f8f0a72d16aecc03415d79ebf430"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Leisure Suit Larry 1 (VGA release) (v2.0) [Sierra] [1991] [3.5HD] [Disk 3 of 3] (Disk 2).img" size="1474560" crc="7bcfd73f" sha1="798c2b094f240ff3c52564c1a52fb2b33a9c2dbd"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="lslvga525" cloneof="lslvga">
+		<description>Leisure Suit Larry 1: In the Land of the Lounge Lizards (5.25", VGA release, v2.1)</description>
+		<year>1991</year>
+		<publisher>Sierra On-Line</publisher>
+		<info name="developer" value="Sierra On-Line" />
+		<info name="version" value="2.1, July 4, 1991" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "1228800">
+				<rom name="Leisure Suit Larry 1 (VGA release) [Sierra] [1991] [5.25HD] [Disk 1 of 3] (Startup Disk).img" size="1228800" crc="d2c8ff1d" sha1="595a07c61e5156a1e89349b6671bbc83395da3fe"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "1228800">
+				<rom name="Leisure Suit Larry 1 (VGA release) [Sierra] [1991] [5.25HD] [Disk 2 of 3] (Disk 1).img" size="1228800" crc="823fe8c1" sha1="b513f7a0dee3a726569342c8ee785a8434a4565f"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "1228800">
+				<rom name="Leisure Suit Larry 1 (VGA release) [Sierra] [1991] [5.25HD] [Disk 3 of 3] (Disk 2).img" size="1228800" crc="f852defb" sha1="cc2999277aaad66e01de94db3e314b9d7dfee0f5"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="lslega" cloneof="lslvga">
-		<description>Leisure Suit Larry 1: In the Land of the Lounge Lizards (EGA release)</description>
+		<description>Leisure Suit Larry 1: In the Land of the Lounge Lizards (EGA release, v2.0)</description>
 		<year>1991</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="developer" value="Sierra On-Line" />
-		<info name="version" value="2.0" />
+		<info name="version" value="2.0, July 4, 1991" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "737280">
 				<rom name="Leisure Suit Larry 1 (EGA release) [Sierra] [1991] [3.5DD] [Disk 1 of 4] (Startup Disk).img" size="737280" crc="58f85d3d" sha1="e893f0463faa25daaf6c3d6904ff8165254137c2"/>
@@ -11995,6 +12369,49 @@
 		</part>
 	</software>
 
+	<software name="tentaclef" cloneof="tentacle">
+		<description>Maniac Mansion: Day of the Tentacle (France)</description>
+		<year>1993</year>
+		<publisher>LucasArts</publisher>
+		<info name="version" value="1.1" />
+		<info name="developer" value="LucasArts" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Day of the Tentacle (France) [LucasArts] [1993] [3.5HD] [Disk 1 of 7].img" size="1474560" crc="464e52a1" sha1="83bb837a82de1b6fa09203b031b314b8ba2767f5"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Day of the Tentacle (France) [LucasArts] [1993] [3.5HD] [Disk 2 of 7].img" size="1474560" crc="1348cbe3" sha1="96a64a0f05107a847c113e60388977adeb76828a"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Day of the Tentacle (France) [LucasArts] [1993] [3.5HD] [Disk 3 of 7].img" size="1474560" crc="10423ec3" sha1="3d441d826f6e6e6d1176a8f85f9986c2e7073abb"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Day of the Tentacle (France) [LucasArts] [1993] [3.5HD] [Disk 4 of 7].img" size="1474560" crc="faa8882d" sha1="86ec9822d43ff604aff8770b2e94c02c2e64f6f5"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Day of the Tentacle (France) [LucasArts] [1993] [3.5HD] [Disk 5 of 7].img" size="1474560" crc="61e009df" sha1="3e50985dedb2aade936e7c83f5812c14a2885a45"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Day of the Tentacle (France) [LucasArts] [1993] [3.5HD] [Disk 6 of 7].img" size="1474560" crc="65f3107d" sha1="9677d0310d9a1c904c8161a5d8a936894a133824"/>
+			</dataarea>
+		</part>
+		<part name="flop7" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Day of the Tentacle (France) [LucasArts] [1993] [3.5HD] [Disk 7 of 7].img" size="1474560" crc="4e21650b" sha1="8be9b2ffb1d7dd012ea51349ca5171fb1975f5eb"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="moo">
 		<description>Master of Orion</description>
 		<year>1993</year>
@@ -12338,6 +12755,28 @@
 		</part>
 	</software>
 
+	<software name="mkg">
+		<description>Mortal Kombat (Germany)</description>
+		<year>1993</year>
+		<publisher>Acclaim Entertainment</publisher>
+		<info name="developer" value="Midway" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Mortal Kombat (Germany) [Acclaim Entertainment] [1993] [3.5HD] [Disk 1 of 3].img" size="1474560" crc="cf28b8bd" sha1="2e3f2b19a7be884bd174a7b11cba2b834863584c"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Mortal Kombat (Germany) [Acclaim Entertainment] [1993] [3.5HD] [Disk 2 of 3].img" size="1474560" crc="db6a79e8" sha1="22efbe5e268f77b2aa3a267b649ccf815a4f2c2e"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Mortal Kombat (Germany) [Acclaim Entertainment] [1993] [3.5HD] [Disk 3 of 3].img" size="1474560" crc="79fa7c68" sha1="e2b09703777b4d70b4cea4e1f23f3b258b53c46d"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="mystict">
 		<description>Mystic Towers</description>
 		<year>1994</year>
@@ -12730,15 +13169,15 @@
 	</software>
 
 	<software name="rotd">
-		<description>Rise of the Dragon</description>
+		<description>Rise of the Dragon (3.5")</description>
 		<year>1990</year>
 		<publisher>Sierra On-Line</publisher>
 		<info name="developer" value="Dynamix" />
 		<info name="version" value="1.000" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "1474560">
-				<!-- has a saved configuration file -->
-				<rom name="Rise of the Dragon [Sierra] [1990] [3.5HD] [Disk 1 of 6].img" size="1474560" crc="feba710f" sha1="4692dda4267b4b4b0791c837e9bdb27a45e48240" status="baddump"/>
+				<!-- has a deleted configuration file -->
+				<rom name="Rise of the Dragon [Sierra] [1990] [3.5HD] [Disk 1 of 6].img" size="1474560" crc="434e737c" sha1="bccd718c8c2a3a26c1f8624e7f85b7eec7648b91" status="baddump"/>
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_3_5">
@@ -12768,6 +13207,49 @@
 		</part>
 	</software>
 
+	<software name="rotd525" cloneof="rotd">
+		<description>Rise of the Dragon (5.25")</description>
+		<year>1990</year>
+		<publisher>Sierra On-Line</publisher>
+		<info name="developer" value="Dynamix" />
+			<info name="version" value="1.000" />
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="disk1.img" size="1228800" crc="f477ffe2" sha1="c23e8979ccbf883a9f95692df0cf798c2d0fdbd4"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="disk2.img" size="1228800" crc="5e323c4b" sha1="b06751ad2c29e4c5f2b866a328c0c0f14513bc96"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="disk3.img" size="1228800" crc="76ae2ac5" sha1="c3f8bb7cd7c79b5cba933be89a0b620e24ea4946"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="disk4.img" size="1228800" crc="e239ce0d" sha1="0e1bd087da699a70c37905a51b8efc28bcbb2cc8"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="disk5.img" size="1228800" crc="d9a5a5b3" sha1="012f6c1751dff63189fc68fc271a739ed99006a8"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="disk6.img" size="1228800" crc="4fde8b01" sha1="ee80c6097620326f87402e7a341a1d87c63b733a"/>
+			</dataarea>
+		</part>
+		<part name="flop7" interface="floppy_5_25">
+			<dataarea name="flop" size = "1228800">
+				<rom name="disk7.img" size="1228800" crc="dc023701" sha1="7bf8ab14b4c000598ed77f3eb3d465c9ca4f405e"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="laurabw2">
 		<description>Roberta Williams' Laura Bow in "The Dagger of Amon Ra"</description>
 		<year>1992</year>
@@ -12844,6 +13326,49 @@
 		</part>
 	</software>
 
+	<software name="samnmaxg" cloneof="samnmax">
+		<description>Sam &amp; Max Hit the Road (Germany)</description>
+		<year>1993</year>
+		<publisher>LucasArts</publisher>
+		<info name="developer" value="LucasArts" />
+		<info name="version" value="Version 1.3, 17-12-93" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size="1474560">
+				<rom name="Sam &amp; Max Hit the Road (Germany) [LucasArts] [1993] [3.5HD] [Disk 1 of 7].img" size="1474560" crc="7f386e72" sha1="fe7eb3f23b82795f671fa4ecbe5a20ca50f7b511"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size="1474560">
+				<rom name="Sam &amp; Max Hit the Road (Germany) [LucasArts] [1993] [3.5HD] [Disk 2 of 7].img" size="1474560" crc="9b31c820" sha1="37a6e7607ef3d193f8cc1f43ac234031e9c44a4d"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size="1474560">
+				<rom name="Sam &amp; Max Hit the Road (Germany) [LucasArts] [1993] [3.5HD] [Disk 3 of 7].img" size="1474560" crc="b64a17f8" sha1="83c25f3a4a4c63d495cf814376106d5509fb80dc"/>
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_3_5">
+			<dataarea name="flop" size="1474560">
+				<rom name="Sam &amp; Max Hit the Road (Germany) [LucasArts] [1993] [3.5HD] [Disk 4 of 7].img" size="1474560" crc="c12d9f16" sha1="2e39a8f50ca75eaf70692aa3e64d3fb6315349cc"/>
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_3_5">
+			<dataarea name="flop" size="1474560">
+				<rom name="Sam &amp; Max Hit the Road (Germany) [LucasArts] [1993] [3.5HD] [Disk 5 of 7].img" size="1474560" crc="21f48f4d" sha1="5174ca8f11cff9eda6ae117a295ad4baacbe4b4e"/>
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_3_5">
+			<dataarea name="flop" size="1474560">
+				<rom name="Sam &amp; Max Hit the Road (Germany) [LucasArts] [1993] [3.5HD] [Disk 6 of 7].img" size="1474560" crc="9a350d54" sha1="a743ab7d561090608af8ff2788ef38af69c54a75"/>
+			</dataarea>
+		</part>
+		<part name="flop7" interface="floppy_3_5">
+			<dataarea name="flop" size="1474560">
+				<rom name="Sam &amp; Max Hit the Road (Germany) [LucasArts] [1993] [3.5HD] [Disk 7 of 7].img" size="1474560" crc="e00ff1bb" sha1="8eeb456808445eb5c17fdc682a613473aad59c86"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="monkeyk">
 		<description>The Secret of Monkey Island (3.5", Kixx XL release)</description>
 		<year>1993</year>
@@ -13594,6 +14119,7 @@
 		<year>1993</year>
 		<publisher>MicroProse</publisher>
 		<info name="developer" value="Particle Systems" />
+		<info name="version" value="1.2" />
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size = "1474560">
 				<rom name="Subwar 2050 - The Underwater Combat Simulation [MicroProse] [1993] [3.5HD] [Disk 1 of 5].img" size="1474560" crc="0d95139a" sha1="3444dcff49f379efc4d1e62a89415816ea6c179a"/>
@@ -13671,12 +14197,34 @@
 		</part>
 	</software>
 
-
 	<software name="ufoeu">
-		<description>UFO - Enemy Unknown</description>
+		<description>UFO - Enemy Unknown (Euro)</description>
 		<year>1994</year>
 		<publisher>MicroProse</publisher>
 		<part name="flop1" interface="floppy_3_5">
+			<!-- mpscopy.exe file version: MicroProse Software Unpacker - by Brian Reynolds - Version 1.07 - Lib 4.02 -->
+			<dataarea name="flop" size = "1474560">
+				<rom name="Ufo Enemy Unknown (Euro) [Microprose] [1994] [3.5HD] [Disk 1 of 3].img" size="1474560" crc="40995e21" sha1="2ddd9337d9cec4ae53777c26832b34bb2bbc3fd6"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Ufo Enemy Unknown (Euro) [Microprose] [1994] [3.5HD] [Disk 2 of 3].img" size="1474560" crc="a6b9f216" sha1="d37bc1db505bff0894f34c921f602fadf75cd425"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Ufo Enemy Unknown (Euro) [Microprose] [1994] [3.5HD] [Disk 3 of 3].img" size="1474560" crc="4fd5b5ec" sha1="3ff806afdfc1af6f7f5d3d8d61250895c4f17be3"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="ufoeua" cloneof="ufoeu">
+		<description>UFO - Enemy Unknown (Euro) (alt)</description>
+		<year>1994</year>
+		<publisher>MicroProse</publisher>
+		<part name="flop1" interface="floppy_3_5">
+			<!-- mpscopy.exe file version: MicroProse Software Unpacker - F-15 Strike Eagle 3 - Version 1.08 - Lib 4.02 -->
 			<dataarea name="flop" size = "1474560">
 				<rom name="UFO - Enemy Unknown (Europe) (Disk 1).img" size="1474560" crc="5eaa25eb" sha1="fc40d21299238bfad9e5884f58507d7237c44517"/>
 			</dataarea>
@@ -13713,6 +14261,27 @@
 			</dataarea>
 		</part>
 	</software>
+
+	<software name="xcomufod" cloneof="ufoeu">
+		<description>X-COM - UFO Defense (USA)</description>
+		<year>1994</year>
+		<publisher>MicroProse</publisher>
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Xcom Ufo Defense (USA) [Microprose] [1994] [3.5HD] [Disk 1 of 3].img" size="1474560" crc="286b3afa" sha1="937264378c4766dcb8c6fc0ccbc607a8fe334f39"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Xcom Ufo Defense (USA) [Microprose] [1994] [3.5HD] [Disk 2 of 3].img" size="1474560" crc="8b4d94e9" sha1="a15b733b48f787d26851338d989fe30b5a87c46c"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "1474560">
+				<rom name="Xcom Ufo Defense (USA) [Microprose] [1994] [3.5HD] [Disk 3 of 3].img" size="1474560" crc="def6ee35" sha1="83873634bd12db244b7533f594be52cfc59df8f2"/>
+			</dataarea>
+		</part>
+	</software>
 
 	<software name="ultdoom">
 		<description>The Ultimate DOOM</description>
diff -Nru mame-0.222+dfsg.1/hash/interact.xml mame-0.224+dfsg.1/hash/interact.xml
--- mame-0.222+dfsg.1/hash/interact.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/interact.xml	2020-08-26 08:57:19.000000000 +0000
@@ -6,7 +6,7 @@
 <softwarelist name="interact" description="Interact Family Computer cassettes">
 <!--
 UNDUMPED:
-These are from the Spring 1981 catalog from Micro Video, after they aquired the rights from Interact
+These are from the Spring 1981 catalog from Micro Video, after they acquired the rights from Interact
 oldcomputers.net/interact/MV_catalog.pdf
 
 *16k of RAM is needed
diff -Nru mame-0.222+dfsg.1/hash/kaypro484.xml mame-0.224+dfsg.1/hash/kaypro484.xml
--- mame-0.222+dfsg.1/hash/kaypro484.xml	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/hash/kaypro484.xml	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<!--
+license:CC0
+-->
+<softwarelist name="kaypro484" description="Kaypro 4/84 disk images">
+
+<!-- Operating systems -->
+
+	<software name="cpm22f">
+		<description>CP/M 2.2F (81-292)</description>
+		<year>19??</year>
+		<publisher>Digital Research</publisher>
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="270208">
+				<rom name="k4f-292.td0" size="270208" crc="8309cabe" sha1="7eb6829aaadae67b71bf4bfa19ce72f1e780747e"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="cpm22g">
+		<description>CP/M 2.2G (81-292-A)</description>
+		<year>19??</year>
+		<publisher>Digital Research</publisher>
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="202620">
+				<rom name="kp22gdsd.td0" size="202620" crc="6ab35630" sha1="106fb294b719d620abd82ee74f0f16130264e3d1"/>
+			</dataarea>
+		</part>
+	</software>
+
+</softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/leapfrog_mfleappad_cart.xml mame-0.224+dfsg.1/hash/leapfrog_mfleappad_cart.xml
--- mame-0.222+dfsg.1/hash/leapfrog_mfleappad_cart.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/leapfrog_mfleappad_cart.xml	2020-08-26 08:57:19.000000000 +0000
@@ -5,6 +5,21 @@
 -->
 <softwarelist name="leapfrog_mfleappad_cart" description="LeapFrog My First LeapPad cartridges">
 
+	<software name="carss" supported="no">
+		<description>Disney/Pixar Cars (Spain)</description>
+		<year>2005</year>
+		<publisher>LeapFrog</publisher>
+		<info name="serial" value="500-12148"/>
+		<part name="cart" interface="leapfrog_mfleappad_cart">
+			<feature name="pcb" value="57000-003-7223"/>
+			<feature name="pcb_rev" value="REV:00"/>
+			<feature name="u1" value="OKI 32(J)"/> <!-- ROM on epoxy blob, but type silkscreened on the PCB -->
+			<dataarea name="rom" size="0x400000">
+				<rom name="500-12148 - Cars (SPA).bin" size="0x400000" crc="6ace95ff" sha1="d272646c0a06876a3e39907e6e6e65b45339f53a" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="thomasst" supported="no">
 		<description>Thomas &amp; Friends - Thomas and the School Trip (UK)</description>
 		<year>2002</year>
diff -Nru mame-0.222+dfsg.1/hash/megadriv.xml mame-0.224+dfsg.1/hash/megadriv.xml
--- mame-0.222+dfsg.1/hash/megadriv.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/megadriv.xml	2020-08-26 08:57:19.000000000 +0000
@@ -13666,7 +13666,7 @@
 
 <!-- This dump comes from an internal "Confidential Preview" cart at Acclaim USA -->
 	<software name="cutthrp" cloneof="cutthr">
-		<description>CutThroat Island (Prototye)</description>
+		<description>CutThroat Island (Prototype)</description>
 		<year>1995</year>
 		<publisher>Acclaim Entertainment</publisher>
 		<part name="cart" interface="megadriv_cart">
@@ -32507,6 +32507,17 @@
 			</dataarea>
 		</part>
 	</software>
+
+	<software name="starwarsp">
+		<description>Starwars (Prototype 19930125)</description>
+		<year>1993</year>
+		<publisher>Sega</publisher>
+		<part name="cart" interface="megadriv_cart">
+			<dataarea name="rom" width="16" endianness="big" size="1048576">
+				<rom name="Star Wars (Jan 25, 1993 prototype).md" size="1048576" crc="e1c32fec" sha1="46cd5c0380f09c93f4a53de14a65481037e4dba5"/>
+			</dataarea>
+		</part>
+	</software>
 
 	<software name="starjedi" cloneof="wolfchld">
 		<description>Star Wars Jedi (Rus)</description>
diff -Nru mame-0.222+dfsg.1/hash/mikro80.xml mame-0.224+dfsg.1/hash/mikro80.xml
--- mame-0.222+dfsg.1/hash/mikro80.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/mikro80.xml	2020-08-26 08:57:19.000000000 +0000
@@ -2,6 +2,9 @@
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 <!--
 license:CC0
+
+The general method of loading a tape is to type I, press Return, select Play. When it's finished, type G and press Return to run it.
+
 -->
 <softwarelist name="mikro80" description="Mikro-80 cassettes">
 
@@ -9,6 +12,7 @@
 		<description>Mikro-80 BASIC</description>
 		<year>1984</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass1" interface="mikro80_cass">
 			<dataarea name="cass" size="6665">
 				<rom name="mikro-80 basic (1984)(-).rk8" size="6665" crc="38d15a6a" sha1="df9e126fa8d118a1ff4b883115b7f10c393a765d"/>
@@ -18,8 +22,10 @@
 
 	<software name="basica" cloneof="basic">
 		<description>Mikro-80 BASIC (Alt)</description>
+		<!-- This loads ok, and signs on as RADIO86-RK basic, then immediately exits back to the monitor -->
 		<year>1984</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, Play, G" />
 		<part name="cass1" interface="mikro80_cass">
 			<dataarea name="cass" size="6665">
 				<rom name="mikro-80 basic (1984)(-)[a].rk8" size="6665" crc="751a4063" sha1="67fb4fbaefbcbe774413c79e4fecc4626f5a3d76"/>
@@ -29,9 +35,13 @@
 
 	<software name="proverki">
 		<description>Programma Proverki</description>
+		<!-- This does a checksum of a section of RAM, and compares to internal values. It should only be used after loading "basic" above -->
+		<!-- If successful, you get a message in Russian, "END OF WORK. TO RETURN TO THE MONITOR PRESS ANY KEY" -->
+		<!-- In case a failure, you'll get a list of bad blocks -->
+		<!-- Testing method: Start mikro80 in the debugger. Load basic. Load proverki. In the debugger, pc=2800, g -->
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="I, Play, G. See notes in mikro80.xml" />
 		<part name="cass1" interface="mikro80_cass">
 			<dataarea name="cass" size="217">
 				<rom name="programma proverki (19xx)(-).rk8" size="217" crc="d4718cad" sha1="03f466d6ebd7b6c1ffea766461bb8cb13466f085"/>
diff -Nru mame-0.222+dfsg.1/hash/mobigo_cart.xml mame-0.224+dfsg.1/hash/mobigo_cart.xml
--- mame-0.222+dfsg.1/hash/mobigo_cart.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/mobigo_cart.xml	2020-08-26 08:57:19.000000000 +0000
@@ -21,7 +21,19 @@
 		</part>
 	</software>
 
-	<software name="braveg" supported="no">
+	<software name="brave" supported="no">
+		<description>Disney/Pixar Brave (USA)</description>
+		<year>2012</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-252600(US)"/>
+		<part name="cart" interface="mobigo_cart">
+			<dataarea name="rom" size="0x1000000">
+				<rom name="80-252600 - Brave (US).bin" size="0x1000000" crc="cbf91103" sha1="39ba554528ff070e39d737233ad4b85937ccb9e8"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="braveg" cloneof="brave" supported="no">
 		<description>Disney/Pixar Merida - Legende der Highlands (Germany)</description>
 		<year>2012</year>
 		<publisher>VTech</publisher>
@@ -81,26 +93,14 @@
 		</part>
 	</software>
 
-	<software name="penmad" supported="no">
-		<description>DreamWorks/Nickelodeon The Penguins of Madagascar - Mission Madness (USA)</description>
-		<year>2010</year>
-		<publisher>VTech</publisher>
-		<info name="serial" value="80-250300(US)"/>
-		<part name="cart" interface="mobigo_cart">
-			<dataarea name="rom" size="0x1000000">
-				<rom name="mobigo_250300_2.bin" size="0x1000000" crc="b3f0fd02" sha1="ef896a26820ea6f4f79e0c7d9debf6f23c6d10fb"/>
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="penmadg" cloneof="penmad" supported="no">
-		<description>DreamWorks/Nickelodeon Die Pinguine aus Madagascar - Operation Krone (Germany)</description>
+	<software name="elmoabby" supported="no">
+		<description>Sesame Street - Elmo and Abby - Nature Explorers (USA)</description>
 		<year>2011</year>
 		<publisher>VTech</publisher>
-		<info name="serial" value="80-250304(GER)"/>
+		<info name="serial" value="80-251400(US)"/>
 		<part name="cart" interface="mobigo_cart">
 			<dataarea name="rom" size="0x1000000">
-				<rom name="80-250304 - die pinguine aus madagascar - operation krone (ger).bin" size="0x1000000" crc="847620f3" sha1="0cc8449ba6fabb1b5dc6045171e978d25fcff1c8"/>
+				<rom name="80-251400 - Sesame Street - Elmo and Abby - Nature Explorers (US).bin" size="0x1000000" crc="73095ec6" sha1="884b7025f19b1a566d76ccac144b7be19e1e7c0d"/>
 			</dataarea>
 		</part>
 	</software>
@@ -129,6 +129,18 @@
 		</part>
 	</software>
 
+	<software name="dprincesalt" cloneof="dprinces" supported="no">
+		<description>Disney Princess (USA, alt)</description>
+		<year>2010</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-251100(US)"/>
+		<part name="cart" interface="mobigo_cart">
+			<dataarea name="rom" size="0x1000000">
+				<rom name="80-251100 - Disney Princess (US).bin" size="0x1000000" crc="fd9d04fc" sha1="af9ae160faf3087eb4d3a375c484e569465d4fc4"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="dprincesg" cloneof="dprinces" supported="no">
 		<description>Disney Princess (Germany)</description>
 		<year>2011</year>
@@ -153,18 +165,6 @@
 		</part>
 	</software>
 
-	<software name="fishrekg" supported="no">
-		<description>DreamWorks Für immer Shrek (Germany)</description>
-		<year>201?</year>
-		<publisher>VTech</publisher>
-		<info name="serial" value="80-250004(GER)"/>
-		<part name="cart" interface="mobigo_cart">
-			<dataarea name="rom" size="0x1000000">
-				<rom name="80-250004 - fur immer shrek (ger).bin" size="0x1000000" crc="812a3f90" sha1="1cbd4728201c76b4fb26a8523b080330515153d5"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="hkittyg" supported="no">
 		<description>Hello Kitty - Hello Kitty feiert Geburtstag! (Germany)</description>
 		<year>2012</year>
@@ -189,6 +189,18 @@
 		</part>
 	</software>
 
+	<software name="jakenevalt" cloneof="jakenev" supported="no">
+		<description>Disney Jake and the Neverland Pirates (USA, alt)</description>
+		<year>2012</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-252800(US)"/>
+		<part name="cart" interface="mobigo_cart">
+			<dataarea name="rom" size="0x1000000">
+				<rom name="80-252800 - Jake and the Neverland Pirates (US).bin" size="0x1000000" crc="eebe529e" sha1="7a8dc059e6713470937631b2b4d65cf87f9d3d20"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="jakenevg" cloneof="jakenev" supported="no">
 		<description>Jake und die Nimmerland Piraten (Germany)</description>
 		<year>2012</year>
@@ -260,6 +272,30 @@
 		</part>
 	</software>
 
+	<software name="penmad" supported="no">
+		<description>DreamWorks/Nickelodeon The Penguins of Madagascar - Mission Madness (USA)</description>
+		<year>2010</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-250300(US)"/>
+		<part name="cart" interface="mobigo_cart">
+			<dataarea name="rom" size="0x1000000">
+				<rom name="mobigo_250300_2.bin" size="0x1000000" crc="b3f0fd02" sha1="ef896a26820ea6f4f79e0c7d9debf6f23c6d10fb"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="penmadg" cloneof="penmad" supported="no">
+		<description>DreamWorks/Nickelodeon Die Pinguine aus Madagascar - Operation Krone (Germany)</description>
+		<year>2011</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-250304(GER)"/>
+		<part name="cart" interface="mobigo_cart">
+			<dataarea name="rom" size="0x1000000">
+				<rom name="80-250304 - die pinguine aus madagascar - operation krone (ger).bin" size="0x1000000" crc="847620f3" sha1="0cc8449ba6fabb1b5dc6045171e978d25fcff1c8"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="planesg" supported="no">
 		<description>Disney Planes (Germany)</description>
 		<year>2013</year>
@@ -296,6 +332,30 @@
 		</part>
 	</software>
 
+	<software name="shrekfa" supported="no">
+		<description>Dreamworks Shrek - Forever After (US)</description>
+		<year>2010</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-250000(US)"/>
+		<part name="cart" interface="mobigo_cart">
+			<dataarea name="rom" size="0x1000000">
+				<rom name="80-250000 - Shrek - Forever After (US).bin" size="0x1000000" crc="c8bdb5f6" sha1="f376884717907cfd96d23085a26350bc5589bdb7"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="shrekfag" cloneof="shrekfa" supported="no">
+		<description>DreamWorks Für immer Shrek (Germany)</description>
+		<year>201?</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-250004(GER)"/>
+		<part name="cart" interface="mobigo_cart">
+			<dataarea name="rom" size="0x1000000">
+				<rom name="80-250004 - fur immer shrek (ger).bin" size="0x1000000" crc="812a3f90" sha1="1cbd4728201c76b4fb26a8523b080330515153d5"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="sofiag" supported="no">
 		<description>Sofia die Erste (Germany)</description>
 		<year>2013</year>
@@ -410,7 +470,7 @@
 		<info name="serial" value="80-250900(US)"/>
 		<part name="cart" interface="mobigo_cart">
 			<dataarea name="rom" size="0x1000000">
-				<rom name="mobigo_250522.bin" size="0x1000000" crc="40b659c4" sha1="8e864ed29c3e3f4d5f1904082e920e92ceeb37fd"/>
+				<rom name="mobigo_250900.bin" size="0x1000000" crc="0e26b761" sha1="a0f1ccb048990e4144801f05c143d4f38f9cbf44"/>
 			</dataarea>
 		</part>
 	</software>
@@ -475,5 +535,29 @@
 			</dataarea>
 		</part>
 	</software>
+
+	<!-- these have downloaded games on them, they do however appear to be tied to the machine that downloaded them, on other units they appear as blank -->
+	<software name="user1" supported="no">
+		<description>NAND User Cartridge (unknown data, set 1)</description>
+		<year>201?</year>
+		<publisher>VTech</publisher>
+		<part name="cart" interface="mobigo_cart">
+			<dataarea name="rom" size="0x8400000">
+				<rom name="80-201401.bin" size="0x8400000" crc="ea99f4d7" sha1="a9f8a7f05de21d971895e3385621112461a0a339"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="user2" supported="no">
+		<description>NAND User Cartridge (unknown data, set 2)</description>
+		<year>201?</year>
+		<publisher>VTech</publisher>
+		<part name="cart" interface="mobigo_cart">
+			<dataarea name="rom" size="0x8400000">
+				<rom name="80-201404.bin" size="0x8400000" crc="a776ff2b" sha1="a154ad9bd58d14128752236fee5385aace3717e1"/>
+				<rom name="80-201404_Console.bin" size="0x8400000" crc="ed3388f5" sha1="583d7eab0bf2a0e9bb90a28d1fdda701f0a7f32b"/>
+			</dataarea>
+		</part>
+	</software>
 
 </softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/n64.xml mame-0.224+dfsg.1/hash/n64.xml
--- mame-0.222+dfsg.1/hash/n64.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/n64.xml	2020-08-26 08:57:19.000000000 +0000
@@ -262,6 +262,10 @@
 		<info name="release" value="19971219"/>
 		<info name="alt_title" value="64で発見!!たまごっち みんなでたまごっちワールド"/>
 		<part name="cart" interface="n64_cart">
+			<feature name="pcb" value="NUS-01A-02" />
+			<feature name="u1" value="U1 [NUS-NTWJ-0]" /> <!-- MX23L9602-35 -->
+			<feature name="u2" value="U2 [BU9850]" />
+			<feature name="u3" value="U3 [CIC-NUS-6102]" />
 			<dataarea name="rom" size="12582912">
 				<rom name="64 de hakken tamagotchi - minna de tamagotchi world (japan).bin" size="12582912" crc="c6400938" sha1="538ae3f3354c3fb96926d759e81cf64b827f2782" />
 			</dataarea>
@@ -1298,6 +1302,10 @@
 		<info name="release" value="19970321"/>
 		<info name="alt_title" value="ブラストドーザー"/>
 		<part name="cart" interface="n64_cart">
+			<feature name="pcb" value="NUS-01A-01" />
+			<feature name="u1" value="U1 [NUS-NBCJ-0]" /> <!-- MX823L6402-35 -->
+			<feature name="u2" value="U2 [BU9850]" />
+			<feature name="u3" value="U3 [CIC-NUS-6102]" />
 			<dataarea name="rom" size="8388608">
 				<rom name="blastdozer (japan).bin" size="8388608" crc="4605759e" sha1="68c6d95af29c647b64d5dad90c02980b772d5faf" />
 			</dataarea>
@@ -3353,6 +3361,10 @@
 		<info name="release" value="19961129"/>
 		<info name="alt_title" value="栄光のセントアンドリュース"/>
 		<part name="cart" interface="n64_cart">
+			<feature name="pcb" value="NUS-01A-01" />
+			<feature name="u1" value="U1 [NUS-NSTJ-0]" />
+			<feature name="u2" value="U2 [empty]" />
+			<feature name="u3" value="U3 [CIC-NUS-6102]" />
 			<dataarea name="rom" size="8388608">
 				<rom name="eikou no saint andrews (japan).bin" size="8388608" crc="ce55bb19" sha1="1a313d3b4b11a16b8280b0139a15e47791c8080a" />
 			</dataarea>
@@ -4965,6 +4977,10 @@
 		<info name="release" value="19971218"/>
 		<info name="alt_title" value="ハイパーオリンピック イン ナガノ64"/>
 		<part name="cart" interface="n64_cart">
+			<feature name="pcb" value="NUS-01A-02" />
+			<feature name="u1" value="U1 [NUS-NH5J-0]" /> <!-- MX23L9602-35 -->
+			<feature name="u2" value="U2 [empty]" />
+			<feature name="u3" value="U3 [CIC-NUS-6102]" />
 			<dataarea name="rom" size="12582912">
 				<rom name="hyper olympics in nagano 64 (japan).bin" size="12582912" crc="f7c2bb67" sha1="51ea8af6b29fc99a9c61dd2242c3732b6cdf43dc" />
 			</dataarea>
@@ -5574,6 +5590,10 @@
 		<info name="release" value="19970314"/>
 		<info name="alt_title" value="実況パワフルプロ野球4"/>
 		<part name="cart" interface="n64_cart">
+			<feature name="pcb" value="NUS-01A-02" />
+			<feature name="u1" value="U1 [NUS-NP4J-1]" /> <!-- MX23L9602-35 -->
+			<feature name="u2" value="U2 [empty]" />
+			<feature name="u3" value="U3 [CIC-NUS-6102]" />
 			<dataarea name="rom" size="12582912">
 				<rom name="jikkyou powerful pro yakyuu 4 (japan) (rev a).bin" size="12582912" crc="435126ae" sha1="44287562745c42662b61224ebfd9b483867eafee" />
 			</dataarea>
@@ -5638,6 +5658,12 @@
 		<info name="release" value="19980326"/>
 		<info name="alt_title" value="実況パワフルプロ野球5"/>
 		<part name="cart" interface="n64_cart">
+			<feature name="pcb" value="NUS-03A-01" />
+			<feature name="u1" value="U1 [NUS-NJ5J-0]" />
+			<feature name="u2" value="U2 [LH52V246AD]" />
+			<feature name="u3" value="U3 [BU9803A]" />
+			<feature name="u4" value="U4 [CIC-NUS-6102]" />
+			<feature name="bt1" value="BT1 [CR2032]" />
 			<dataarea name="rom" size="16777216">
 				<rom name="jikkyou powerful pro yakyuu 5 (japan).bin" size="16777216" crc="94fa55ff" sha1="7822e0015e716ae540e95f50c32558eaa7865174" />
 			</dataarea>
@@ -5772,6 +5798,10 @@
 		<info name="release" value="19970918"/>
 		<info name="alt_title" value="実況ワールドサッカー3"/>
 		<part name="cart" interface="n64_cart">
+			<feature name="pcb" value="NUS-01A-02" />
+			<feature name="u1" value="U1 [NUS-NJ3J-1]" /> <!-- MX23L6402-35 -->
+			<feature name="u2" value="U2 [empty]" />
+			<feature name="u3" value="U3 [CIC-NUS-6102]" />
 			<dataarea name="rom" size="8388608">
 				<rom name="jikkyou world soccer 3 (japan).bin" size="8388608" crc="8755de1f" sha1="e1c73256a92e98bcb79d2d4c56efce77f0ff158b" />
 			</dataarea>
@@ -6896,6 +6926,10 @@
 		<info name="release" value="19981218"/>
 		<info name="alt_title" value="マリオパーティ"/>
 		<part name="cart" interface="n64_cart">
+			<feature name="pcb" value="NUS-01A-02" />
+			<feature name="u1" value="U1 [NUS-CLBJ-0]" />
+			<feature name="u2" value="U2 [BK4D-NUS]" />
+			<feature name="u3" value="U3 [CIC-NUS-6102]" />
 			<dataarea name="rom" size="33554432">
 				<rom name="mario party (japan).bin" size="33554432" crc="7d387e37" sha1="82d03c229f37b7e8af72f4ee867022e4fa0f1f99" />
 			</dataarea>
@@ -8660,6 +8694,13 @@
 		<info name="release" value="19990714"/>
 		<info name="alt_title" value="オウガバトル 64"/>
 		<part name="cart" interface="n64_cart">
+			<feature name="pcb" value="NUS-04B-01" />
+			<feature name="u1" value="U1 [NUS-NOBJ-1 02]" /> <!-- MX23L25603-35A -->
+			<feature name="u2" value="U2 [NUS-NOBJ-0 12]" /> <!-- MX23L6403-35A -->
+			<feature name="u3" value="U3 [LH52V246AN]" />
+			<feature name="u4" value="U4 BU9803 [LV2416]" />
+			<feature name="u5" value="U5 CIC-NUS [CIC6102A]" />
+			<feature name="bt1" value="BT1 [CR2032]" />
 			<dataarea name="rom" size="41943040">
 				<rom name="ogre battle 64 - person of lordly caliber (japan) (rev a).bin" size="41943040" crc="d52f01fd" sha1="771bb04c814fdb741351b37bc4ca2db00f3d2a43" />
 			</dataarea>
@@ -10534,6 +10575,10 @@
 		<info name="release" value="19960623"/>
 		<info name="alt_title" value="最強羽生将棋"/>
 		<part name="cart" interface="n64_cart">
+			<feature name="pcb" value="NUS-01A-01" />
+			<feature name="u1" value="U1 [NUS-NCHJ-0]" /> <!-- MX23L6402-35 -->
+			<feature name="u2" value="U2 [empty]" />
+			<feature name="u3" value="U3 [CIC-NUS-6102]" />
 			<dataarea name="rom" size="8388608">
 				<rom name="saikyou habu shougi (japan).bin" size="8388608" crc="e8d0810b" sha1="8a06e7a7d15e5586ff5ce5fed235e0357096c827" />
 			</dataarea>
diff -Nru mame-0.222+dfsg.1/hash/nascom_snap.xml mame-0.224+dfsg.1/hash/nascom_snap.xml
--- mame-0.222+dfsg.1/hash/nascom_snap.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/nascom_snap.xml	2020-08-26 08:57:19.000000000 +0000
@@ -33,6 +33,32 @@
 		</part>
 	</software>
 
+	<software name="advent16" cloneof="advent32">
+		<description>Adventure 16K</description>
+		<year>1981</year>
+		<publisher>Syrtis Software</publisher>
+		<info name="usage" value="Enter E1000 to start" />
+		<sharedfeat name="compatibility" value="NASCOM2"/>
+		<part name="snap1" interface="nascom_snap">
+			<dataarea name="snap" size="71683">
+				<rom name="adventure_16k.nas" size="71683" crc="4c13ee90" sha1="94c5bf72c66f6e855cd20df25ec57720f5464a39"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="advent32">
+		<description>Adventure 32K</description>
+		<year>1982</year>
+		<publisher>Syrtis Software</publisher>
+		<info name="usage" value="Enter E1000 to start" />
+		<sharedfeat name="compatibility" value="NASCOM2"/>
+		<part name="snap1" interface="nascom_snap">
+			<dataarea name="snap" size="143363">
+				<rom name="adventure_32k.nas" size="143363" crc="f6ddd1eb" sha1="8a5fe36b072e162c73e7fb03b6ace2b45fd23e7a"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="advquest">
 		<description>Adventure Quest</description>
 		<year>1982</year>
@@ -92,15 +118,8 @@
 		<info name="usage" value="Enter E1000 to start" />
 		<sharedfeat name="compatibility" value="NASCOM2"/>
 		<part name="snap1" interface="nascom_snap">
-			<feature name="part_id" value="32K"/>
-			<dataarea name="snap" size="143363">
-				<rom name="cave_32k.nas" size="143363" crc="f6ddd1eb" sha1="8a5fe36b072e162c73e7fb03b6ace2b45fd23e7a"/>
-			</dataarea>
-		</part>
-		<part name="snap2" interface="nascom_snap">
-			<feature name="part_id" value="16K"/>
-			<dataarea name="snap" size="71683">
-				<rom name="cave_16k.nas" size="71683" crc="4c13ee90" sha1="94c5bf72c66f6e855cd20df25ec57720f5464a39"/>
+			<dataarea name="snap" size="125443">
+				<rom name="colossal_32k.nas" size="125443" crc="dac5fac3" sha1="06c9c9830901d8e7c319303503ceaefbccc2fbfc"/>
 			</dataarea>
 		</part>
 	</software>
diff -Nru mame-0.222+dfsg.1/hash/novag_ssensor4.xml mame-0.224+dfsg.1/hash/novag_ssensor4.xml
--- mame-0.222+dfsg.1/hash/novag_ssensor4.xml	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/hash/novag_ssensor4.xml	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<!--
+license:CC0
+-->
+
+<softwarelist name="novag_ssensor4" description="Super Sensor IV expansion ROMs">
+
+<!-- Expansion ROMs available separately, 2 ROM sockets on PCB accessible via hatch on the bottom -->
+
+	<software name="clock" supported="no">
+		<description>Quartz Chess Clock</description>
+		<year>1981</year>
+		<publisher>Novag</publisher>
+		<part name="exrom" interface="novag_ssensor4">
+			<dataarea name="rom" size="0x1000">
+				<rom name="5613_1j_blue" size="0x1000" crc="51ee10f2" sha1="d0e4b8a0e5df1a81958e9c290e21ec6ada0811f1" /> <!-- TMM2332P -->
+			</dataarea>
+		</part>
+	</software>
+
+</softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/odyssey2.xml mame-0.224+dfsg.1/hash/odyssey2.xml
--- mame-0.222+dfsg.1/hash/odyssey2.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/odyssey2.xml	2020-08-26 08:57:19.000000000 +0000
@@ -3,57 +3,145 @@
 <!--
 license:CC0
 
+The softwarelist is sorted alphabetically per title, not counting clone sets.
+See g7400.xml for G7400 cartridges that can also be run on G7000/O2.
+When adding new sets, avoid naming conflicts between odyssey2.xml and g7400.xml.
+
+This list does not include ROM hacks, but those can still be loaded with -cart.
+WIP beta homebrews are also not included.
+
 TODO:
-add first release date were applicable
-add usage for those which use 2nd joystick (<info name="usage" value="Uses the 2nd joystick" />)
-add programmers (<info name="programmer" value=""/>)(mainly Ed Averett)
-add ntsc pal compatibility (<sharedfeat name="compatibility" value="NTSC,PAL"/>)
-add rom names from pcbs (lack of)
-add serials for radiola and jopacs
+- add first release date were applicable
+- add usage for those which use 2nd joystick (<info name="usage" value="Uses the 2nd joystick" />)
+- add programmers (<info name="programmer" value=""/>)(mainly Ed Averett)
+- add compatibility flags (<sharedfeat name="compatibility" value="O2,VP,VPP,O3"/>),
+  but it's not user-friendly since MAME refuses to load an incompatible game at all,
+  while on the real console you can still play them (just with more glitches)
+- add rom names from pcbs (lack of)
+- add serials for radiola and jopacs
 
 Undumped:
-Spaans          (spanish to dutch translator)
-Crazy Horses
+- Spaans          (spanish to dutch translator)
+- Crazy Horses
+- Service Test Cartridge
 
 Protos:
-Bastion         youtube.com/watch?v=cFdmgs4r7_E
-Catburglar      youtube.com/watch?v=DDsWDFxy0oE
-Himalaya        youtube.com/watch?v=L_lvOs6EnA4
-SoundTool       youtube.com/watch?v=7JYn6B7rxqw
-Terrahawks      youtube.com/watch?v=AXk7OSA6NGg
+- Bastion         youtube.com/watch?v=cFdmgs4r7_E
+- Catburglar      youtube.com/watch?v=DDsWDFxy0oE
+- Himalaya        youtube.com/watch?v=L_lvOs6EnA4
+- SoundTool       youtube.com/watch?v=7JYn6B7rxqw
+- Terrahawks      youtube.com/watch?v=AXk7OSA6NGg
 
 http://www.ozyr.com/rene/PICS/protos.jpg
-Sherlock Holmes Consulting Detective (programmed by Ed Friedman, most likely dumped and hoarded)
-Back Gammon
-Freedom Fighters
-K.C.'s Crazy Chase
-Killer Bees (also 10/12/82 (silent version), and 11/12/82 builds exist)
-Power Lords
-Handicap I (?)
-Frogger
-Robot City
-Requins (Shark Hunter?)
-K.C. Munchkin!
-Pick Axe Pete
+- Sherlock Holmes Consulting Detective (programmed by Ed Friedman, most likely dumped and hoarded)
+- Back Gammon
+- Freedom Fighters
+- K.C.'s Crazy Chase
+- Killer Bees (also 10/12/82 (silent version), and 11/12/82 builds exist)
+- Handicap I (?)
+- Frogger
+- Robot City
+- Requins (Shark Hunter?)
+- K.C. Munchkin! (looks more like Pacman)
+- Pick Axe Pete
 
 Unreleased, possibly no prototypes exist:
-A Turma da Mônica [Mônica's Gang]
-Pink Panther
-Clean Up Yer Act (programmed by Robert S. Harris, never completed)
-Star Wars (GST Video)
-Moonsweeper (Imagic)
-Fathom (Imagic)
-
-NOTE:
-PAL colours leave a lot to be desired
-Chess needs emulation of the C7010 Chess Module, which had a NSC800 CMOS microprocessor, which gave the G7000 extra CPU and memory.
-The C7420 Home Computer Module, which contains a Z80 microprocessor running at 3.574 MHz,
-adds 16K RAM and 18K ROM, that plugs into the G7000 needs to be dumped.
+- A Turma da Mônica [Mônica's Gang]
+- Pink Panther
+- Clean Up Yer Act (programmed by Robert S. Harris, never completed)
+- Star Wars (GST Video)
+- Moonsweeper (Imagic)
+- Fathom (Imagic)
+
+misc. homebrew cartridges
+
+================================================================================
+
+1st-party Philips Videopac games, especially the older ones, didn't prominently
+have the game title on either the box or the cartridge, but simply "Videopac X"
+where X is the game number.
+
+1:  3rcsocpt - Race/Spin-Out/Cryptogram
+2:  3prspclg - Pairs/Space Rendezvous/Logic
+3:  football - American Football
+4:  2armrsub - Air-Sea War/Battle
+5:  lsvsblck - Blackjack
+6:  2bwlbskt - Ten Pin Bowling/Basketball
+7:  2mthecho - Mathematician/Echo
+8:  baseball - Baseball
+9:  compprog - Computer Programmer
+10: golf     - Golf
+11: cosmic   - Cosmic Conflict
+12: moneyrun - Take the Money and Run
+13: number   - Playschool Maths
+14: gunfight - Gunfighter
+15: samurai  - Samurai
+16: 2dpthmrk - Depth Charge/Marksman
+17: chinese  - Chinese Logic
+18: laser    - Laser War
+19: 2bllcrss - Catch the Ball/Noughts and Crosses
+20: stone    - Stone Sling
+21: pharaohs - Secret of the Pharaohs
+22: alieninv - Space Monster
+23: casino   - Las Vegas Gambling
+24: flipper  - Flipper Game
+25: alpine   - Skiing
+26: pachinko - Basket Game
+27: soccer   - Electronic Table Football
+28: volley   - Electronic Volleyball
+29: 2blckbrk - Dam Buster
+30: battlef  - Battlefield
+31: musician - Musician
+32: 2lbsprmd - A Labyrinth Game/Supermind
+33: acrobat/acrobata - Jumping Acrobats
+34: satellit - Satellite Attack
+35: billiard - Electronic Billiards
+36: 2hckyscr - Electronic Ice Hockey/Electronic Soccer
+37: monkey   - Monkeyshines
+38: munchkin - Munchkin
+39: freedom  - Freedom Fighters
+40: 4in1     - 4 in 1 Row
+41: conquest - Conquest of the World
+42: quest    - The Quest for the Rings
+43: pickaxe  - Pickaxe Pete
+44: kckrazy  - Crazy Chase
+45: morse    - Morse
+46: gtwallst - The Great Wall Street Fortune Hunt
+47: mousing  - The Mousing Cat
+48: backgamm - Backgammon
+49: turtles  - Turtles
+50: superbee - Super Bee
+51+:hawks    - Terrahawks
+52+:beespl   - Killer Bees
+53+:nightmar - Nightmare
+54+:loony    - Loony Balloon
+55+:neutron  - Neutron Star
+56‡:norseman - Norseman
+57: blobbers - Blobbers
+58+:airbattl - Air Battle
+59‡:helicopt - Helicopter Rescue
+60‡:rally    - Trans American Rally
+
+A:  newscast - Newscaster
+V:  kndrvrkr - Kinder im Verkehr 1
+C7010: chess - Chess Module
+C7420‡:homecomp - Home Computer Module
+
++: Videopac+ games, compatible with Videopac
+‡: Videopac+ games, not playable on Videopac
+These are in g7400.xml
+
+Official VP+ upgaded versions (simply adds a background picture):
+3rcsocptpl, cosmicpl, stonepl, satellitpl, freedompl, pickaxepl
+
 -->
-<softwarelist name="odyssey2" description="Magnavox Odyssey2 cartridges">
+
+<softwarelist name="odyssey2" description="Magnavox Odyssey 2 / Philips Videopac cartridges">
+
 <!-- Philips Videopac G7000/Magnavox Odyssey² carts -->
 
 <!-- Applications -->
+
 	<software name="compprog">
 		<description>Computer Programmer (Euro)</description>
 		<year>1980</year>
@@ -112,13 +200,24 @@
 		<publisher>Philips</publisher>
 		<info name="serial" value="31"/>
 		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
+			<feature name="slot" value="o2_4in1" />
 			<dataarea name="rom" size="4096">
 				<rom name="musician (europe).bin" size="4096" crc="afb23f89" sha1="7445f4df9017c4d2ea94542d0db335dc18c9d7ed" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
+	<software name="voice">
+		<description>The Voice</description>
+		<year>1979?</year>
+		<publisher>Magnavox</publisher>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_voice" />
+			<dataarea name="rom" size="2048">
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="typetell">
 		<description>Type &amp; Tell! (USA)</description>
 		<year>1982</year>
@@ -133,19 +232,9 @@
 		</part>
 	</software>
 
+
+
 <!-- Educational -->
-	<software name="number">
-		<description>Playschool Maths (Euro) ~ I've Got Your Number (USA)</description>
-		<year>1980</year>
-		<publisher>Philips</publisher>
-		<info name="serial" value="AC9413 (USA) ~ 13 (Euro)"/>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="i've got your number (usa, europe).bin" size="2048" crc="1c8368e7" sha1="498cb0882d8a692042889e83775a83cf267a1837" offset="0" />
-			</dataarea>
-		</part>
-	</software>
 
 	<software name="2mthecho">
 		<description>Mathematician/Echo (Euro) ~ Math-a-Magic!/Echo! (USA)</description>
@@ -213,6 +302,19 @@
 		</part>
 	</software>
 
+	<software name="number">
+		<description>Playschool Maths (Euro) ~ I've Got Your Number (USA)</description>
+		<year>1980</year>
+		<publisher>Philips</publisher>
+		<info name="serial" value="AC9413 (USA) ~ 13 (Euro)"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="2048">
+				<rom name="i've got your number (usa, europe).bin" size="2048" crc="1c8368e7" sha1="498cb0882d8a692042889e83775a83cf267a1837" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="sidspell">
 		<description>Sid the Spellbinder (USA)</description>
 		<year>1982</year>
@@ -263,14 +365,17 @@
 		</part>
 	</software>
 
+
+
 <!-- Games -->
+
 	<software name="4in1">
 		<description>4 in 1 Row (Euro)</description>
 		<year>1982</year>
 		<publisher>Philips</publisher>
 		<info name="serial" value="40"/>
 		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
+			<feature name="slot" value="o2_4in1" />
 			<dataarea name="rom" size="4096">
 				<rom name="4 in 1 row (europe).bin" size="4096" crc="3bfef56b" sha1="e9a8996c4fb87120d8620ab8876b90ddb48335db" offset="0" />
 			</dataarea>
@@ -282,47 +387,22 @@
 		<year>1982</year>
 		<publisher>Radiola</publisher>
 		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
+			<feature name="slot" value="o2_4in1" />
 			<dataarea name="rom" size="4096">
 				<rom name="4 en 1 ligne (france).bin" size="4096" crc="9b5e9356" sha1="0831c3212a9e0a588a242dcd2b136e350aaceac9" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="alieninv">
-		<description>Space Monster (Euro) ~ Alien Invaders - Plus! (USA)</description>
-		<year>1980</year>
-		<publisher>Magnavox</publisher>
-		<info name="serial" value="AA9428 (USA) ~ 22 (Euro)"/>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="alien invaders - plus (usa, europe).bin" size="2048" crc="71ae8533" sha1="9ba0737fdee2918375725bb5230d075a2f847159" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="alpine">
-		<description>Skiing (Euro) ~ Alpine Skiing! (USA)</description>
-		<year>1979</year>
+	<software name="2lbsprmd">
+		<description>A Labyrinth Game/Supermind (Euro)</description>
+		<year>1981</year>
 		<publisher>Philips</publisher>
-		<info name="serial" value="AK9418 (USA) ~ 25 (Euro)"/>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="alpine skiing (usa, europe).bin" size="2048" crc="4663c4b6" sha1="9e7e16744b44fa83fa14c211b2365cf04604e06e" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="ski" cloneof="alpine">
-		<description>Ski (Fra)</description>
-		<year>1979</year>
-		<publisher>Radiola</publisher>
+		<info name="serial" value="32"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="ski (france).bin" size="2048" crc="e129490d" sha1="a6e07b727b4f48d13ce21442911995eb46b99c5d" offset="0" />
+				<rom name="a labyrinth game - supermind (europe).bin" size="2048" crc="d158eeba" sha1="85c567c8f38239350a5d04f8cfd9dd7872f448c9" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -354,8 +434,21 @@
 		</part>
 	</software>
 
+	<software name="football">
+		<description>American Football (Euro) ~ Football! (USA)</description>
+		<year>1980</year>
+		<publisher>Philips</publisher>
+		<info name="serial" value="AJ9402 (USA) ~ 3 (Euro)"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="2048">
+				<rom name="football (usa, europe).bin" size="2048" crc="f9084aa3" sha1="364504ffce1108bcf09a5cc784f7ea2cf141f7b8" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="timelord">
-		<description>Attack of the Timelord! (USA)</description><!-- possibly also "Terrahawks (Euro)[Videopac 51]"? -->
+		<description>Attack of the Timelord! (USA)</description>
 		<year>1983</year>
 		<publisher>Philips</publisher>
 		<info name="serial" value="AC9445"/>
@@ -367,130 +460,181 @@
 		</part>
 	</software>
 
-	<software name="baseball">
-		<description>Baseball (Euro) ~ Baseball! (USA)</description>
-		<year>1980</year>
-		<publisher>Philips (Euro) ~ Magnavox (USA)</publisher>
-		<info name="serial" value="AJ9408 (USA) ~ 8 (Euro)"/>
+	<software name="backgamm" supported="partial">
+		<description>Backgammon (Euro)</description>
+		<year>1983</year>
+		<publisher>GST Video</publisher>
+		<info name="programmer" value="Mick Rouse"/>
+		<info name="serial" value="48"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="baseball (usa, europe).bin" size="2048" crc="b07748e7" sha1="14a37a38c582d8822cb78fb0aace221a2fa9a44c" offset="0" />
+			<feature name="b_pin" value="1" />
+			<dataarea name="rom" size="8192">
+				<rom name="backgammon (europe).bin" size="8192" crc="9d2c45dc" sha1="bcb420dc1cc6fa5cf13dc46c546145953fb11643" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="blobbers">
-		<description>Blobbers (Euro)</description>
+	<software name="balao">
+		<description>Balão Travesso! (Bra)</description>
 		<year>1983</year>
 		<publisher>Philips</publisher>
-		<info name="serial" value="56"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="4096">
+				<rom name="balao travesso (brazil).bin" size="4096" crc="5b6e741a" sha1="73bf363400fece63d1a10b6b8cd9413612a1a126" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="loonyp" cloneof="balao">
+		<description>Loony Balloon (Euro, Prototype)</description>
+		<year>1983</year>
+		<publisher>Philips</publisher>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="4096">
+				<rom name="loony balloon (europe) (proto).bin" size="4096" crc="ca23f40c" sha1="3cb324b047cbac8ec4381150b1c2aee98573841b" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="battle">
+		<description>Barão Vermelho! (Bra)</description>
+		<year>198?</year>
+		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="8192">
-				<rom name="blobbers (europe).bin" size="8192" crc="9d72d4e9" sha1="cae4e1f3ee090ec423aff89102f359b9e14dba41" offset="0" />
+				<rom name="air battle (brazil).bin" size="8192" crc="4103ee95" sha1="b6842b9264b722e2b39c8647b7963e513a0cde16" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="2blckbrk">
-		<description>Dam Buster (Euro) ~ Blockout!/Breakdown! (USA)</description>
-		<year>1980</year>
+	<software name="baron" cloneof="battle">
+		<description>Red Baron (Euro, Prototype)</description>
+		<year>198?</year>
 		<publisher>Philips</publisher>
-		<info name="usage" value="Press 0 then 1 for Blockout/Dam Buster, press 0 then 2 for Breakdown" />
-		<info name="serial" value="AA9427 (USA) ~ 29 (Euro)"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="8192">
+				<rom name="red baron (europe) (proto).bin" size="8192" crc="1eeb88f5" sha1="50eba68915b0ccc95f07719f80d9011ca2cf67c9" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="barona" cloneof="battle">
+		<description>Red Baron (Euro, Prototype, Alt)</description>
+		<year>198?</year>
+		<publisher>Philips</publisher>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="8192">
+				<rom name="red baron (europe, proto, alt).bin" size="8192" crc="5c4f35d3" sha1="2fc0080d132e0063e21fd72d501eef94d3eefab8" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="baseball">
+		<description>Baseball (Euro) ~ Baseball! (USA)</description>
+		<year>1980</year>
+		<publisher>Philips (Euro) ~ Magnavox (USA)</publisher>
+		<info name="serial" value="AJ9408 (USA) ~ 8 (Euro)"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="blockout - breakdown (usa, europe).bin" size="2048" crc="fb83171e" sha1="00ef6868724a6826534da620f34dad207fcb3800" offset="0" />
-				</dataarea>
+				<rom name="baseball (usa, europe).bin" size="2048" crc="b07748e7" sha1="14a37a38c582d8822cb78fb0aace221a2fa9a44c" offset="0" />
+			</dataarea>
 		</part>
 	</software>
 
-	<software name="magique" cloneof="2blckbrk">
-		<description>Le Mûr Magique (Fra)</description>
+	<software name="pachinko">
+		<description>Basket Game (Euro) ~ Pachinko! (USA)</description>
 		<year>1981</year>
-		<publisher>Radiola</publisher>
+		<publisher>Philips</publisher>
+		<info name="programmer" value="Ed Averett"/>
+		<info name="serial" value="AA9425 (USA) ~ 26 (Euro)"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="mur magique, le (france).bin" size="2048" crc="d38153f6" sha1="ff0ebe9efc275011a0534fd98ca1f4112dae3dab" offset="0" />
+				<rom name="pachinko (usa, europe).bin" size="2048" crc="239df97d" sha1="ffd525d5c6023409afdcdb2afbda227bc4568304" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="2bwlbskt">
-		<description>Ten Pin Bowling/Basketball (Euro) ~ Bowling!/Basketball! (USA)</description>
-		<year>1978</year>
+	<software name="battlef">
+		<description>Battlefield (Euro) ~ War of Nerves! (USA)</description>
+		<year>1979</year>
 		<publisher>Philips</publisher>
-		<info name="usage" value="Press 1 for League Night Bowling, press 2 for Tournament Play Bowling, press 3 for Basketball" />
-		<info name="serial" value="AJ9404 (USA) ~ 6 (Euro)"/>
+		<info name="serial" value="AK9417 (USA) ~ 30 (Euro)"/>
+		<info name="programmer" value="Ed Averett" />
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="bowling - basketball (usa, europe).bin" size="2048" crc="084ee035" sha1="2630c304b6beb0f8021578277be68e837202895d" offset="0" />
+				<rom name="war of nerves (usa, europe).bin" size="2048" crc="58fa6766" sha1="e56b674c832e5a7cad977cc76779548fdd2f338e" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="2qllbskt" cloneof="2bwlbskt">
-		<description>Jeu de Quilles/Basketball (Fra)</description>
-		<year>1978</year>
-		<publisher>Radiola</publisher>
-		<info name="usage" value="Press 1 for (League Night Bowling), press 2 for (Tournament Play Bowling), press 3 for Basketball" />
+	<software name="lsvsblck">
+		<description>Blackjack (Euro) ~ Las Vegas Blackjack! (USA)</description>
+		<year>1980</year>
+		<publisher>Philips</publisher>
+		<info name="serial" value="AJ9401 (USA) ~ 5 (Euro)"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="jeu de quilles - basketball (france).bin" size="2048" crc="a7e97958" sha1="30cbbec570fa0872c13e89ddc312b2f74e3749fb" offset="0" />
+				<rom name="las vegas blackjack (usa, europe).bin" size="2048" crc="6f66b1f7" sha1="3e10fc687b1d07612305f680f24590f99842e62b" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="buraco">
-		<description>Buraco Negro! (Bra)</description>
-		<year>1984</year>
-		<publisher>Philips</publisher>
+	<software name="blackjck" cloneof="lsvsblck">
+		<description>Blackjack (Fra)</description>
+		<year>1980</year>
+		<publisher>Radiola</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="8192">
-				<rom name="buraco negro (brazil).bin" size="8192" crc="25874b04" sha1="8414605a62e78753e3f8474fa020035596292583" offset="0" />
+			<dataarea name="rom" size="2048">
+				<rom name="blackjack (france).bin" size="2048" crc="6381e402" sha1="9ec331ce8e50ef60de93e615c18327f08b4a24fb" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="neutron" cloneof="buraco">
-		<description>Neutron Star (Euro, Prototype)</description>
+	<software name="blobbers">
+		<description>Blobbers (Euro)</description>
 		<year>1983</year>
 		<publisher>Philips</publisher>
+		<info name="serial" value="56"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
-				<rom name="neutron star (europe) (proto).bin" size="8192" crc="d03efa86" sha1="0a91bdb293f52ac37414a63f71d90c6338a4a91a" offset="0" />
+				<rom name="blobbers (europe).bin" size="8192" crc="9d72d4e9" sha1="cae4e1f3ee090ec423aff89102f359b9e14dba41" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="casino">
-		<description>Las Vegas Gambling (Euro) ~ Casino Slot Machine! (USA)</description>
-		<year>1980</year>
-		<publisher>Magnavox</publisher>
-		<info name="serial" value="AA9426 (USA) ~ 23 (Euro)"/>
+	<software name="buraco">
+		<description>Buraco Negro! (Bra)</description>
+		<year>1984</year>
+		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="casino slot machine (usa, europe).bin" size="2048" crc="bb6e7135" sha1="052bc62eb03e2673a802bab866dd0ab3c39fd584" offset="0" />
+			<dataarea name="rom" size="8192">
+				<rom name="buraco negro (brazil).bin" size="8192" crc="25874b04" sha1="8414605a62e78753e3f8474fa020035596292583" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="lasvegas" cloneof="casino">
-		<description>Las Vegas (Fra)</description>
-		<year>1980</year>
-		<publisher>Radiola</publisher>
+	<software name="neutronp" cloneof="buraco">
+		<description>Neutron Star (Euro, Prototype)</description>
+		<year>1983</year>
+		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="las vegas (france).bin" size="2048" crc="a0620082" sha1="b83463b7c40367d4310f142fa15d06d12061f3be" offset="0" />
+			<dataarea name="rom" size="8192">
+				<rom name="neutron star (europe) (proto).bin" size="8192" crc="d03efa86" sha1="0a91bdb293f52ac37414a63f71d90c6338a4a91a" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -522,21 +666,22 @@
 		</part>
 	</software>
 
-	<software name="chess" supported="no"><!-- needs chess module emulation -->
-		<description>Chess (Euro)</description>
-		<year>198?</year>
+	<software name="chess">
+		<description>Chess Module (Euro)</description>
+		<year>1982</year>
 		<publisher>Philips</publisher>
-		<info name="serial" value="G7010"/>
+		<info name="serial" value="C7010"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_chess" />
-			<dataarea name="rom" size="2048">
-				<rom name="chess (europe).bin" size="2048" crc="77066338" sha1="7162359313f66fe759bdd8a34755a5f62f3cadfb" offset="0" />
+			<dataarea name="rom" size="0x2800">
+				<rom name="z80_c7010.bin" offset="0x0000" size="0x2000" crc="45080245" sha1="fff3e6449a0e82e8e4ff45e5830c98fc38a8848e" /> <!-- NSC800 CPU on module with its own ROM/RAM -->
+				<rom name="vp_c7010.bin"  offset="0x2000" size="0x0800" crc="77066338" sha1="7162359313f66fe759bdd8a34755a5f62f3cadfb" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="chezmxme"><!-- I know it's a clone of something... -->
-		<description>Chez Maxime (Fra)</description>
+	<software name="chezmxme">
+		<description>Chez Maxime (Fra)</description><!-- aka Restaurant -->
 		<year>198?</year>
 		<publisher>Radiola</publisher>
 		<part name="cart" interface="odyssey_cart">
@@ -675,11 +820,50 @@
 		</part>
 	</software>
 
-	<software name="demon">
-		<description>Demon Attack (Euro, USA)</description>
-		<year>1983</year>
-		<publisher>Imagic</publisher>
-		<info name="programmer" value="Dave Johnson" />
+	<software name="kckrazy">
+		<description>Crazy Chase (Euro) ~ K.C.'s Krazy Chase! (USA)</description>
+		<year>1982</year>
+		<publisher>Philips</publisher>
+		<info name="serial" value="AC9442 (USA) ~ 44 (Euro)"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="4096">
+				<rom name="k.c.'s krazy chase (usa, europe).bin" size="4096" crc="a6909a8b" sha1="3391e48c0048a2f588d8238bb202e2ec346a6ad4" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="2blckbrk">
+		<description>Dam Buster (Euro) ~ Blockout!/Breakdown! (USA)</description>
+		<year>1980</year>
+		<publisher>Philips</publisher>
+		<info name="usage" value="Press 0 then 1 for Blockout/Dam Buster, press 0 then 2 for Breakdown" />
+		<info name="serial" value="AA9427 (USA) ~ 29 (Euro)"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="2048">
+				<rom name="blockout - breakdown (usa, europe).bin" size="2048" crc="fb83171e" sha1="00ef6868724a6826534da620f34dad207fcb3800" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="magique" cloneof="2blckbrk">
+		<description>Le Mûr Magique (Fra)</description>
+		<year>1981</year>
+		<publisher>Radiola</publisher>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="2048">
+				<rom name="mur magique, le (france).bin" size="2048" crc="d38153f6" sha1="ff0ebe9efc275011a0534fd98ca1f4112dae3dab" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="demon">
+		<description>Demon Attack (Euro, USA)</description>
+		<year>1983</year>
+		<publisher>Imagic</publisher>
+		<info name="programmer" value="Dave Johnson" />
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="4096">
@@ -688,13 +872,12 @@
 		</part>
 	</software>
 
-	<software name="2dpthmrk" supported="partial">
+	<software name="2dpthmrk">
 		<description>Depth Charge/Marksman (Euro)</description>
 		<year>1980</year>
 		<publisher>Philips</publisher>
 		<info name="usage" value="Press 1 for Depth Charge, press 2 for Marksman; Uses the 2nd joystick" />
 		<info name="serial" value="16"/>
-		<sharedfeat name="compatibility" value="PAL"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
@@ -708,7 +891,6 @@
 		<year>1980</year>
 		<publisher>Philips</publisher>
 		<info name="usage" value="Press 1 for Depth Charge, press 2 for Marksman; Uses the 2nd joystick" />
-		<sharedfeat name="compatibility" value="NTSC"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
@@ -717,6 +899,60 @@
 		</part>
 	</software>
 
+	<software name="billiard">
+		<description>Electronic Billiards (Euro) ~ Pocket Billiards! (USA)</description>
+		<year>1978</year>
+		<publisher>Philips (Euro) ~ Magnavox (USA)</publisher>
+		<info name="programmer" value="Ed Averett"/>
+		<info name="serial" value="AC9424 (USA) ~ 35 (Euro)"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="2048">
+				<rom name="pocket billiards (usa, europe).bin" size="2048" crc="24d53e2c" sha1="8abd1057202ebac12acf3822ed4d965bba02b7de" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="billamer" cloneof="billiard">
+		<description>Billard Américain (Fra)</description>
+		<year>1978</year>
+		<publisher>Radiola</publisher>
+		<info name="programmer" value="Ed Averett"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="2048">
+				<rom name="billiard americain (france).bin" size="2048" crc="a674ea27" sha1="283ae5fa1d6e89a5ac921c7f2e21a89a67dd138c" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="2hckyscr">
+		<description>Electronic Ice Hockey/Electronic Soccer (Euro) ~ Hockey!/Soccer! (USA)</description>
+		<year>1981</year>
+		<publisher>Philips</publisher>
+		<info name="usage" value="Move joystick when game is on screen." />
+		<info name="serial" value="AK9420 (USA) ~ 36 (Euro)"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="2048">
+				<rom name="hockey - soccer (usa, europe).bin" size="2048" crc="39989464" sha1="f39c9801984f97d5a685a4b7a1accd0164a49b43" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="2fblhcky" cloneof="2hckyscr">
+		<description>Football Electronique/Hockey Electronique (Fra)</description>
+		<year>1981</year>
+		<publisher>Radiola</publisher>
+		<info name="usage" value="Move joystick when game is on screen." />
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="2048">
+				<rom name="football electronique - hockey electronique (france).bin" size="2048" crc="f00f9dba" sha1="d7593ade4d60a6e314e4f18711e8ea59e3c8c3ad" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="soccer">
 		<description>Electronic Table Football (Euro) ~ Electronic Table Soccer (USA)</description>
 		<year>1980</year>
@@ -730,15 +966,54 @@
 		</part>
 	</software>
 
-	<software name="football">
-		<description>American Football (Euro) ~ Football! (USA)</description>
+	<software name="volley">
+		<description>Electronic Volleyball (Euro) ~ Volleyball! (USA)</description>
+		<year>1979</year>
+		<publisher>Philips (Euro) ~ Magnavox (USA)</publisher>
+		<info name="programmer" value="Ed Averett" />
+		<info name="serial" value="AA9422 (USA) ~ 28 (Euro)"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="2048">
+				<rom name="volleyball (usa, europe).bin" size="2048" crc="d3b09fec" sha1="830c9b3628f2e9c4f8c882024dd912b9d7610765" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="volleyf" cloneof="volley">
+		<description>Volleyball (Fra)</description>
+		<year>1979</year>
+		<publisher>Radiola</publisher>
+		<info name="programmer" value="Ed Averett" />
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="2048">
+				<rom name="volleyball electronique (france).bin" size="2048" crc="551e38a2" sha1="9ea8d921ca03699f74e53e25b139632391838c7d" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="flipper">
+		<description>Flipper Game (Euro) ~ Thunderball! (USA)</description>
+		<year>1979</year>
+		<publisher>Philips (Euro) ~ Magnavox (USA)</publisher>
+		<info name="serial" value="AK9415 (USA) ~ 24 (Euro)"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="2048">
+				<rom name="thunderball (usa, europe).bin" size="2048" crc="2c9d1715" sha1="d0070e12d6b0f406dab6e1fa550ab01509c9362e" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="flipperf" cloneof="flipper">
+		<description>Flipper (Fra)</description>
 		<year>1980</year>
-		<publisher>Philips</publisher>
-		<info name="serial" value="AJ9402 (USA) ~ 3 (Euro)"/>
+		<publisher>Radiola</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="football (usa, europe).bin" size="2048" crc="f9084aa3" sha1="364504ffce1108bcf09a5cc784f7ea2cf141f7b8" offset="0" />
+				<rom name="billard electrique (france).bin" size="2048" crc="54bf4750" sha1="d12a242d273c4f4417806c3bcd868a9a0f553854" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -809,31 +1084,6 @@
 		</part>
 	</software>
 
-	<software name="gtwallst">
-		<description>The Great Wall Street Fortune Hunt (Euro, USA)</description>
-		<year>1983</year>
-		<publisher>Philips</publisher>
-		<info name="serial" value="AC9434 (USA) ~ 46 (Euro)"/>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="4096">
-				<rom name="the great wall street fortune hunt (usa, europe).bin" size="4096" crc="881ceae4" sha1="d54b1d5667bf90368dddab55a91955b1789f177c" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="wallst" cloneof="gtwallst">
-		<description>Wall Street (Bra)</description>
-		<year>1983</year>
-		<publisher>Philips</publisher>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="4096">
-				<rom name="wall street (brazil).bin" size="4096" crc="228842df" sha1="af9db337a2edbb3fe79a3d50f1b4ec1b007f4a52" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="gunfight">
 		<description>Gunfighter (Euro)</description>
 		<year>1980</year>
@@ -860,33 +1110,6 @@
 		</part>
 	</software>
 
-	<software name="2hckyscr">
-		<description>Electronic Ice Hockey/Electronic Soccer (Euro) ~ Hockey!/Soccer! (USA)</description>
-		<year>1981</year>
-		<publisher>Philips</publisher>
-		<info name="usage" value="Move joystick when game is on screen." />
-		<info name="serial" value="AK9420 (USA) ~ 36 (Euro)"/>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="hockey - soccer (usa, europe).bin" size="2048" crc="39989464" sha1="f39c9801984f97d5a685a4b7a1accd0164a49b43" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="2fblhcky" cloneof="2hckyscr">
-		<description>Football Electronique/Hockey Electronique (Fra)</description>
-		<year>1981</year>
-		<publisher>Radiola</publisher>
-		<info name="usage" value="Move joystick when game is on screen." />
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="football electronique - hockey electronique (france).bin" size="2048" crc="f00f9dba" sha1="d7593ade4d60a6e314e4f18711e8ea59e3c8c3ad" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="interpol">
 		<description>Interpol (Euro, Prototype)</description>
 		<year>198?</year>
@@ -941,21 +1164,8 @@
 		</part>
 	</software>
 
-	<software name="kckrazy">
-		<description>Crazy Chase (Euro) ~ K.C.'s Krazy Chase! (USA)</description>
-		<year>1982</year>
-		<publisher>Philips</publisher>
-		<info name="serial" value="AC9442 (USA) ~ 44 (Euro)"/>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="4096">
-				<rom name="k.c.'s krazy chase (usa, europe).bin" size="4096" crc="a6909a8b" sha1="3391e48c0048a2f588d8238bb202e2ec346a6ad4" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="bees">
-		<description>Killer Bees! (USA)</description><!-- also "Killer Bees (Euro)[Videopac 52]"? -->
+		<description>Killer Bees! (USA)</description>
 		<year>1983</year>
 		<publisher>Philips</publisher>
 		<info name="programmer" value="Robert S. Harris" />
@@ -968,40 +1178,27 @@
 		</part>
 	</software>
 
-	<software name="2lbsprmd">
-		<description>A Labyrinth Game/Supermind (Euro)</description>
-		<year>1981</year>
-		<publisher>Philips</publisher>
-		<info name="serial" value="32"/>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="a labyrinth game - supermind (europe).bin" size="2048" crc="d158eeba" sha1="85c567c8f38239350a5d04f8cfd9dd7872f448c9" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="lsvsblck">
-		<description>Blackjack (Euro) ~ Las Vegas Blackjack! (USA)</description>
+	<software name="casino">
+		<description>Las Vegas Gambling (Euro) ~ Casino Slot Machine! (USA)</description>
 		<year>1980</year>
-		<publisher>Philips</publisher>
-		<info name="serial" value="AJ9401 (USA) ~ 5 (Euro)"/>
+		<publisher>Magnavox</publisher>
+		<info name="serial" value="AA9426 (USA) ~ 23 (Euro)"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="las vegas blackjack (usa, europe).bin" size="2048" crc="6f66b1f7" sha1="3e10fc687b1d07612305f680f24590f99842e62b" offset="0" />
+				<rom name="casino slot machine (usa, europe).bin" size="2048" crc="bb6e7135" sha1="052bc62eb03e2673a802bab866dd0ab3c39fd584" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="blackjck" cloneof="lsvsblck">
-		<description>Blackjack (Fra)</description>
+	<software name="lasvegas" cloneof="casino">
+		<description>Las Vegas (Fra)</description>
 		<year>1980</year>
 		<publisher>Radiola</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="blackjack (france).bin" size="2048" crc="6381e402" sha1="9ec331ce8e50ef60de93e615c18327f08b4a24fb" offset="0" />
+				<rom name="las vegas (france).bin" size="2048" crc="a0620082" sha1="b83463b7c40367d4310f142fa15d06d12061f3be" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -1044,30 +1241,6 @@
 		</part>
 	</software>
 
-	<software name="balao">
-		<description>Balão Travesso! (Bra)</description>
-		<year>1983</year>
-		<publisher>Philips</publisher>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="4096">
-				<rom name="balao travesso (brazil).bin" size="4096" crc="5b6e741a" sha1="73bf363400fece63d1a10b6b8cd9413612a1a126" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="loony" cloneof="balao">
-		<description>Loony Balloon (Euro, Prototype)</description>
-		<year>1983</year>
-		<publisher>Philips</publisher>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="4096">
-				<rom name="loony balloon (europe) (proto).bin" size="4096" crc="ca23f40c" sha1="3cb324b047cbac8ec4381150b1c2aee98573841b" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="martian">
 		<description>Martian Threat (Euro, Prototype)</description>
 		<year>198?</year>
@@ -1081,30 +1254,15 @@
 		</part>
 	</software>
 
-	<software name="3prspclg">
-		<description>Pairs/Space Rendezvous/Logic (Euro)</description>
-		<year>1978</year>
+	<software name="martiana" cloneof="martian">
+		<description>Martian Threat (Euro, Prototype, Alt)</description>
+		<year>198?</year>
 		<publisher>Philips</publisher>
-		<info name="usage" value="Press 1 for Pairs 1 player, press 2 for Pairs 2 players, press 3 for Space Rendezvous, press 4 for Logic" />
-		<info name="serial" value="2"/>
+		<info name="programmer" value="Jake Dowding?" />
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="pairs - space rendezvous - logic (europe).bin" size="2048" crc="a69c2c93" sha1="7ea8e5ff3b9f86914774de2aa6f7a4652adcf47a" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="3mkrbzlg" cloneof="3prspclg">
-		<description>Matchmaker!/Buzzword!/Logix! (USA)</description>
-		<year>1978</year>
-		<publisher>Magnavox</publisher>
-		<info name="usage" value="Press 1 for Matchmaker 1 player, press 2 for Matchmaker 2 players, press 3 for Buzzword, press 4 for Logix" />
-		<info name="serial" value="AJ9407"/>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="matchmaker - buzzword - logix (usa).bin" size="2048" crc="bbf276a0" sha1="908387d2446f4c62019017fe262b412dfa040d10" offset="0" />
+			<dataarea name="rom" size="8192">
+				<rom name="martian threat (europe, proto, alt).bin" size="8192" crc="335481f1" sha1="d6a3f2def966b798099dbf3c754ab12f69bb4ee8" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -1136,31 +1294,6 @@
 		</part>
 	</software>
 
-	<software name="mousing">
-		<description>The Mousing Cat (Euro)</description>
-		<year>1982</year>
-		<publisher>Philips</publisher>
-		<info name="serial" value="47"/>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="4096">
-				<rom name="the mousing cat (europe).bin" size="4096" crc="f390bfec" sha1="f9727e6c5a941518187c08e5f5d104460ac3b3e3" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="chat" cloneof="mousing">
-		<description>Chat et Souris (Fra)</description>
-		<year>1983</year>
-		<publisher>Radiola</publisher>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="4096">
-				<rom name="chat et souris (france).bin" size="4096" crc="61a350e6" sha1="afa67f2110647753de9dfacb268d96e75d6d8657" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="munchkin">
 		<description>Munchkin (Euro)</description>
 		<year>1982</year>
@@ -1189,18 +1322,6 @@
 		</part>
 	</software>
 
-	<software name="phantom">
-		<description>Phantom House (Euro, Prototype)</description>
-		<year>1983</year>
-		<publisher>Philips</publisher>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="8192">
-				<rom name="phantom house (europe)(proto).bin" size="8192" crc="313547eb" sha1="3cc218587116eb105e95ffce9eb1b5e268258d4a" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="2wrldrsc">
 		<description>Out of this World!/Helicopter Rescue! (USA)</description>
 		<year>1979</year>
@@ -1215,81 +1336,80 @@
 		</part>
 	</software>
 
-	<software name="pachinko">
-		<description>Basket Game (Euro) ~ Pachinko! (USA)</description>
-		<year>1981</year>
+	<software name="3prspclg">
+		<description>Pairs/Space Rendezvous/Logic (Euro)</description>
+		<year>1978</year>
 		<publisher>Philips</publisher>
-		<info name="programmer" value="Ed Averett"/>
-		<info name="serial" value="AA9425 (USA) ~ 26 (Euro)"/>
+		<info name="usage" value="Press 1 for Pairs 1 player, press 2 for Pairs 2 players, press 3 for Space Rendezvous, press 4 for Logic" />
+		<info name="serial" value="2"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="pachinko (usa, europe).bin" size="2048" crc="239df97d" sha1="ffd525d5c6023409afdcdb2afbda227bc4568304" offset="0" />
+				<rom name="pairs - space rendezvous - logic (europe).bin" size="2048" crc="a69c2c93" sha1="7ea8e5ff3b9f86914774de2aa6f7a4652adcf47a" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="pickaxe">
-		<description>Pickaxe Pete (Euro) ~ Pick Axe Pete! (USA)</description>
-		<year>1980</year>
-		<publisher>Philips (Euro) ~ Magnavox (USA)</publisher>
-		<info name="serial" value="AC9437 (USA) ~ 43 (Euro)"/>
+	<software name="3mkrbzlg" cloneof="3prspclg">
+		<description>Matchmaker!/Buzzword!/Logix! (USA)</description>
+		<year>1978</year>
+		<publisher>Magnavox</publisher>
+		<info name="usage" value="Press 1 for Matchmaker 1 player, press 2 for Matchmaker 2 players, press 3 for Buzzword, press 4 for Logix" />
+		<info name="serial" value="AJ9407"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="4096">
-				<rom name="pick axe pete (usa, europe).bin" size="4096" crc="d62814a3" sha1="b979ed0c2b8947f764786fcf4444463b3d3ae87d" offset="0" />
+			<dataarea name="rom" size="2048">
+				<rom name="matchmaker - buzzword - logix (usa).bin" size="2048" crc="bbf276a0" sha1="908387d2446f4c62019017fe262b412dfa040d10" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="pinball">
-		<description>Pinball! (USA, Prototype)</description>
-		<year>1979</year><!-- re-released at Classic Games Expo (2004 in Philadelphia) with Ralph Baer's autograph (as he was the designer)  -->
+	<software name="phantom">
+		<description>Phantom House (Euro, Prototype)</description>
+		<year>1983</year>
 		<publisher>Philips</publisher>
-		<info name="programmer" value="Don McGuiness"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="pinball (usa) (proto).bin" size="2048" crc="6ef2471a" sha1="350a9e3f95dbf2d5e7aa1ddbd5e531300ddeeee4" offset="0" />
+			<dataarea name="rom" size="8192">
+				<rom name="phantom house (europe)(proto).bin" size="8192" crc="313547eb" sha1="3cc218587116eb105e95ffce9eb1b5e268258d4a" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="playtag">
-		<description>Plantage ~ Play Tag (Euro, Prototype)</description>
-		<year>198?</year>
-		<publisher>Philips</publisher>
+	<software name="pickaxe">
+		<description>Pickaxe Pete (Euro) ~ Pick Axe Pete! (USA)</description>
+		<year>1980</year>
+		<publisher>Philips (Euro) ~ Magnavox (USA)</publisher>
+		<info name="serial" value="AC9437 (USA) ~ 43 (Euro)"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="4096">
-				<rom name="playtag (europe) (proto).bin" size="4096" crc="a29f0fd4" sha1="759dc0efb9dbf64034d9fd78c12207206b173c0c" offset="0" />
+				<rom name="pick axe pete (usa, europe).bin" size="4096" crc="d62814a3" sha1="b979ed0c2b8947f764786fcf4444463b3d3ae87d" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="billiard">
-		<description>Electronic Billiards (Euro) ~ Pocket Billiards! (USA)</description>
-		<year>1978</year>
-		<publisher>Philips (Euro) ~ Magnavox (USA)</publisher>
-		<info name="programmer" value="Ed Averett"/>
-		<info name="serial" value="AC9424 (USA) ~ 35 (Euro)"/>
+	<software name="pinball">
+		<description>Pinball! (USA, Prototype)</description>
+		<year>1979</year><!-- re-released at Classic Games Expo (2004 in Philadelphia) with Ralph Baer's autograph (as he was the designer)  -->
+		<publisher>Philips</publisher>
+		<info name="programmer" value="Don McGuiness"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="pocket billiards (usa, europe).bin" size="2048" crc="24d53e2c" sha1="8abd1057202ebac12acf3822ed4d965bba02b7de" offset="0" />
+				<rom name="pinball (usa) (proto).bin" size="2048" crc="6ef2471a" sha1="350a9e3f95dbf2d5e7aa1ddbd5e531300ddeeee4" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="billamer" cloneof="billiard">
-		<description>Billard Américain (Fra)</description>
-		<year>1978</year>
-		<publisher>Radiola</publisher>
-		<info name="programmer" value="Ed Averett"/>
+	<software name="playtag">
+		<description>Plantage ~ Play Tag (Euro, Prototype)</description>
+		<year>198?</year>
+		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="billiard americain (france).bin" size="2048" crc="a674ea27" sha1="283ae5fa1d6e89a5ac921c7f2e21a89a67dd138c" offset="0" />
+			<dataarea name="rom" size="4096">
+				<rom name="playtag (europe) (proto).bin" size="4096" crc="a29f0fd4" sha1="759dc0efb9dbf64034d9fd78c12207206b173c0c" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -1334,29 +1454,28 @@
 		</part>
 	</software>
 
-	<software name="qbert">
-		<description>Q*bert (Euro)</description>
+	<software name="powerlrda" cloneof="powerlrd">
+		<description>Power Lords (Euro, Prototype)</description>
 		<year>1983</year>
-		<publisher>Parker Brothers</publisher>
-		<info name="programmer" value="Gil Williamson and Charles Dear" />
+		<publisher>Philips</publisher>
+		<info name="usage" value="Uses the 2nd joystick" />
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="8192">
-				<rom name="q-bert (europe).bin" size="8192" crc="202f2749" sha1="80d76d5c56fc716a8f7a55166390658c320e4c34" offset="0" />
+			<dataarea name="rom" size="4096">
+				<rom name="power lords (europe) (proto).bin" size="4096" crc="bbeb1bd2" sha1="d6b2c274082a42634d08f514cf0fa30c5360a462" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="quest">
-		<description>Quest for the Rings (Euro, USA)</description>
-		<year>1981</year>
-		<publisher>Philips</publisher>
-		<info name="programmer" value="Ed Averett"/>
-		<info name="serial" value="AC9429 (USA) ~ 42 (Euro)"/>
+	<software name="qbert">
+		<description>Q*bert (Euro)</description>
+		<year>1983</year>
+		<publisher>Parker Brothers</publisher>
+		<info name="programmer" value="Gil Williamson and Charles Dear" />
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="4096">
-				<rom name="quest for the rings (usa, europe).bin" size="4096" crc="9451be1e" sha1="32759c8d502cd8b959da5f03351db7cd46c8f96a" offset="0" />
+			<dataarea name="rom" size="8192">
+				<rom name="q-bert (europe).bin" size="8192" crc="202f2749" sha1="80d76d5c56fc716a8f7a55166390658c320e4c34" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -1374,26 +1493,29 @@
 		</part>
 	</software>
 
-	<software name="battle">
-		<description>Barão Vermelho! (Bra)</description>
-		<year>198?</year>
-		<publisher>Philips</publisher>
+	<software name="3rcsocpt">
+		<description>Race/Spin-Out/Cryptogram (Euro) ~ Speedway/Spin-Out/Crypto-logic (USA)</description>
+		<year>1978</year>
+		<publisher>Philips (Euro) ~ Magnavox (USA)</publisher>
+		<info name="usage" value="Press 1 for Race/Speedway, press 2 for 3-lap Spin-out, press 4 for 15-lap Spin-out, press 5 for Cryptogram/Crypto-logic" />
+		<info name="serial" value="AC9400 (USA) ~ 1 (Euro)"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="8192">
-				<rom name="air battle (brazil).bin" size="8192" crc="4103ee95" sha1="b6842b9264b722e2b39c8647b7963e513a0cde16" offset="0" />
+			<dataarea name="rom" size="2048">
+				<rom name="speedway - spin-out - crypto-logic (usa, europe).bin" size="2048" crc="4eda4917" sha1="29d078f587be2afa4612800c64a5af72705e5681" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="baron" cloneof="battle">
-		<description>Red Baron (Euro, Prototype)</description>
-		<year>198?</year>
-		<publisher>Philips</publisher>
+	<software name="3csaucpt" cloneof="3rcsocpt">
+		<description>Course de Voitures/Autodrome/Cryptogramme (Fra)</description>
+		<year>1978</year>
+		<publisher>Radiola</publisher>
+		<info name="usage" value="Press 1 for Course de Voitures, press 2 for 3-lap Autodrome, press 4 for 15-lap Autodrome, press 5 for Cryptogramme" />
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="8192">
-				<rom name="red baron (europe) (proto).bin" size="8192" crc="1eeb88f5" sha1="50eba68915b0ccc95f07719f80d9011ca2cf67c9" offset="0" />
+			<dataarea name="rom" size="2048">
+				<rom name="course de voitures - autodrome - cryptogramme (france).bin" size="2048" crc="3b24e1ee" sha1="9e44ca9fc9e5def58c61b24274f0cbfb57d559ee" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -1466,18 +1588,6 @@
 		</part>
 	</software>
 
-	<software name="syracuse">
-		<description>Syracuse (Fra)</description>
-		<year>1981</year>
-		<publisher>Jopac</publisher>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="4096">
-				<rom name="syracuse (france).bin" size="4096" crc="280d08f4" sha1="37aa11cbf0a32ece89d1d2c500b74660830377df" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="pharaohs">
 		<description>Secret of the Pharaohs (Euro)</description>
 		<year>1981</year>
@@ -1516,29 +1626,40 @@
 		</part>
 	</software>
 
-	<software name="3rcsocpt">
-		<description>Race/Spin-Out/Cryptogram (Euro) ~ Speedway/Spin-Out/Crypto-logic (USA)</description>
-		<year>1978</year>
-		<publisher>Philips (Euro) ~ Magnavox (USA)</publisher>
-		<info name="usage" value="Press 1 for Race/Speedway, press 2 for 3-lap Spin-out, press 4 for 15-lap Spin-out, press 5 for Cryptogram/Crypto-logic" />
-		<info name="serial" value="AC9400 (USA) ~ 1 (Euro)"/>
+	<software name="alpine">
+		<description>Skiing (Euro) ~ Alpine Skiing! (USA)</description>
+		<year>1979</year>
+		<publisher>Philips</publisher>
+		<info name="serial" value="AK9418 (USA) ~ 25 (Euro)"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="speedway - spin-out - crypto-logic (usa, europe).bin" size="2048" crc="4eda4917" sha1="29d078f587be2afa4612800c64a5af72705e5681" offset="0" />
+				<rom name="alpine skiing (usa, europe).bin" size="2048" crc="4663c4b6" sha1="9e7e16744b44fa83fa14c211b2365cf04604e06e" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="3csaucpt" cloneof="3rcsocpt">
-		<description>Course de Voitures/Autodrome/Cryptogramme (Fra)</description>
-		<year>1978</year>
+	<software name="ski" cloneof="alpine">
+		<description>Ski (Fra)</description>
+		<year>1979</year>
 		<publisher>Radiola</publisher>
-		<info name="usage" value="Press 1 for Course de Voitures, press 2 for 3-lap Autodrome, press 4 for 15-lap Autodrome, press 5 for Cryptogramme" />
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="course de voitures - autodrome - cryptogramme (france).bin" size="2048" crc="3b24e1ee" sha1="9e44ca9fc9e5def58c61b24274f0cbfb57d559ee" offset="0" />
+				<rom name="ski (france).bin" size="2048" crc="e129490d" sha1="a6e07b727b4f48d13ce21442911995eb46b99c5d" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="alieninv">
+		<description>Space Monster (Euro) ~ Alien Invaders - Plus! (USA)</description>
+		<year>1980</year>
+		<publisher>Magnavox</publisher>
+		<info name="serial" value="AA9428 (USA) ~ 22 (Euro)"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="2048">
+				<rom name="alien invaders - plus (usa, europe).bin" size="2048" crc="71ae8533" sha1="9ba0737fdee2918375725bb5230d075a2f847159" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -1555,6 +1676,18 @@
 		</part>
 	</software>
 
+	<software name="spidera" cloneof="spider">
+		<description>Spider-Man (Euro, Prototype, Alt)</description>
+		<year>198?</year>
+		<publisher>Parker Brothers</publisher>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="8192">
+				<rom name="spider-man (europe, proto, alt).bin" size="8192" crc="3e5f71f3" sha1="69661c91c984aa26bb971e989fe3aaca93ab718c" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="stone">
 		<description>Stone Sling (Euro)</description>
 		<year>1981</year>
@@ -1591,6 +1724,7 @@
 		<info name="serial" value="50"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="4096">
 				<rom name="super bee (europe).bin" size="4096" crc="9585d511" sha1="dfcfd9c019773e703aa130bc55f5b2f972ece8f0" offset="0" />
 			</dataarea>
@@ -1603,6 +1737,7 @@
 		<publisher>Philips</publisher>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="4096">
 				<rom name="super bee (brazil).bin" size="4096" crc="02743352" sha1="98c1f3a9726fe1ba880d43f0ba004821c4cbec6c" offset="0" />
 			</dataarea>
@@ -1633,6 +1768,18 @@
 		</part>
 	</software>
 
+	<software name="syracuse">
+		<description>Syracuse (Fra)</description>
+		<year>1981</year>
+		<publisher>Brandt</publisher>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="4096">
+				<rom name="syracuse (france).bin" size="4096" crc="280d08f4" sha1="37aa11cbf0a32ece89d1d2c500b74660830377df" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="moneyrun">
 		<description>Take the Money and Run (Euro) ~ Take the Money and Run! (USA)</description>
 		<year>1978</year>
@@ -1660,27 +1807,93 @@
 		</part>
 	</software>
 
-	<software name="flipper">
-		<description>Flipper Game (Euro) ~ Thunderball! (USA)</description>
-		<year>1979</year>
-		<publisher>Philips (Euro) ~ Magnavox (USA)</publisher>
-		<info name="serial" value="AK9415 (USA) ~ 24 (Euro)"/>
+	<software name="gtwallst">
+		<description>The Great Wall Street Fortune Hunt (Euro, USA)</description>
+		<year>1983</year>
+		<publisher>Philips</publisher>
+		<info name="serial" value="AC9434 (USA) ~ 46 (Euro)"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="4096">
+				<rom name="the great wall street fortune hunt (usa, europe).bin" size="4096" crc="881ceae4" sha1="d54b1d5667bf90368dddab55a91955b1789f177c" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="wallst" cloneof="gtwallst">
+		<description>Wall Street (Bra)</description>
+		<year>1983</year>
+		<publisher>Philips</publisher>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="4096">
+				<rom name="wall street (brazil).bin" size="4096" crc="228842df" sha1="af9db337a2edbb3fe79a3d50f1b4ec1b007f4a52" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mousing">
+		<description>The Mousing Cat (Euro)</description>
+		<year>1982</year>
+		<publisher>Philips</publisher>
+		<info name="serial" value="47"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="4096">
+				<rom name="the mousing cat (europe).bin" size="4096" crc="f390bfec" sha1="f9727e6c5a941518187c08e5f5d104460ac3b3e3" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="chat" cloneof="mousing">
+		<description>Chat et Souris (Fra)</description>
+		<year>1983</year>
+		<publisher>Radiola</publisher>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="4096">
+				<rom name="chat et souris (france).bin" size="4096" crc="61a350e6" sha1="afa67f2110647753de9dfacb268d96e75d6d8657" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="quest">
+		<description>The Quest for the Rings (Euro, USA)</description>
+		<year>1981</year>
+		<publisher>Philips</publisher>
+		<info name="programmer" value="Ed Averett"/>
+		<info name="serial" value="AC9429 (USA) ~ 42 (Euro)"/>
+		<part name="cart" interface="odyssey_cart">
+			<feature name="slot" value="o2_rom" />
+			<dataarea name="rom" size="4096">
+				<rom name="quest for the rings (usa, europe).bin" size="4096" crc="9451be1e" sha1="32759c8d502cd8b959da5f03351db7cd46c8f96a" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="2bwlbskt">
+		<description>Ten Pin Bowling/Basketball (Euro) ~ Bowling!/Basketball! (USA)</description>
+		<year>1978</year>
+		<publisher>Philips</publisher>
+		<info name="usage" value="Press 1 for League Night Bowling, press 2 for Tournament Play Bowling, press 3 for Basketball" />
+		<info name="serial" value="AJ9404 (USA) ~ 6 (Euro)"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="thunderball (usa, europe).bin" size="2048" crc="2c9d1715" sha1="d0070e12d6b0f406dab6e1fa550ab01509c9362e" offset="0" />
+				<rom name="bowling - basketball (usa, europe).bin" size="2048" crc="084ee035" sha1="2630c304b6beb0f8021578277be68e837202895d" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="flipperf">
-		<description>Flipper (Fra)</description>
-		<year>1980</year>
+	<software name="2qllbskt" cloneof="2bwlbskt">
+		<description>Jeu de Quilles/Basketball (Fra)</description>
+		<year>1978</year>
 		<publisher>Radiola</publisher>
+		<info name="usage" value="Press 1 for (League Night Bowling), press 2 for (Tournament Play Bowling), press 3 for Basketball" />
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
-				<rom name="billard electrique (france).bin" size="2048" crc="54bf4750" sha1="d12a242d273c4f4417806c3bcd868a9a0f553854" offset="0" />
+				<rom name="jeu de quilles - basketball (france).bin" size="2048" crc="a7e97958" sha1="30cbbec570fa0872c13e89ddc312b2f74e3749fb" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -1693,6 +1906,7 @@
 		<info name="serial" value="49"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
 				<rom name="turtles (europe).bin" size="8192" crc="1c750349" sha1="1fdca749675f62212d0b79c5f0911bcabc4e4e11" offset="0" />
 			</dataarea>
@@ -1707,6 +1921,7 @@
 		<info name="serial" value="AC9446"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="8192">
 				<rom name="turtles (usa).bin" size="8192" crc="9e42e766" sha1="ee456305397ecbd54fffa0bb7a894f53976d2a7c" offset="0" />
 			</dataarea>
@@ -1726,47 +1941,9 @@
 		</part>
 	</software>
 
-	<software name="volley">
-		<description>Electronic Volleyball (Euro) ~ Volleyball! (USA)</description>
-		<year>1979</year>
-		<publisher>Philips (Euro) ~ Magnavox (USA)</publisher>
-		<info name="programmer" value="Ed Averett" />
-		<info name="serial" value="AA9422 (USA) ~ 28 (Euro)"/>
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="volleyball (usa, europe).bin" size="2048" crc="d3b09fec" sha1="830c9b3628f2e9c4f8c882024dd912b9d7610765" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="volleyf" cloneof="volley">
-		<description>Volleyball (Fra)</description>
-		<year>1979</year>
-		<publisher>Radiola</publisher>
-		<info name="programmer" value="Ed Averett" />
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="volleyball electronique (france).bin" size="2048" crc="551e38a2" sha1="9ea8d921ca03699f74e53e25b139632391838c7d" offset="0" />
-			</dataarea>
-		</part>
-	</software>
 
-	<software name="battlef">
-		<description>Battlefield (Euro) ~ War of Nerves! (USA)</description>
-		<year>1979</year>
-		<publisher>Philips</publisher>
-		<info name="serial" value="AK9417 (USA) ~ 30 (Euro)"/>
-		<info name="programmer" value="Ed Averett" />
-		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom" />
-			<dataarea name="rom" size="2048">
-				<rom name="war of nerves (usa, europe).bin" size="2048" crc="58fa6766" sha1="e56b674c832e5a7cad977cc76779548fdd2f338e" offset="0" />
-			</dataarea>
-		</part>
-	</software>
 
+<!-- Homebrew -->
 
 	<software name="amok">
 		<description>AMOK!</description>
@@ -1794,13 +1971,12 @@
 		</part>
 	</software>
 
-<!-- NTSC Cartidge dumped from a 39SF010 flashrom (1MB) and actual data (2KB) data is repeated to fill space and matches publicly posted rom from author -->
+	<!-- NTSC Cartridge dumped from a 39SF010 flashrom (1MB) and actual data (2KB) data is repeated to fill space and matches publicly posted rom from author -->
 	<software name="deathrac">
 		<description>Death Race (USA)</description>
 		<year>2014</year>
 		<publisher>&lt;homebrew&gt;</publisher>
 		<info name="programmer" value="Ivan Machado" />
-		<sharedfeat name="compatibility" value="NTSC"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
@@ -1814,7 +1990,6 @@
 		<year>2014</year>
 		<publisher>&lt;homebrew&gt;</publisher>
 		<info name="programmer" value="Ivan Machado" />
-		<sharedfeat name="compatibility" value="PAL"/>
 		<part name="cart" interface="odyssey_cart">
 			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
@@ -1829,7 +2004,8 @@
 		<publisher>&lt;homebrew&gt;</publisher>
 		<info name="programmer" value="Soeren Gust" />
 		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_rom12" />
+			<feature name="slot" value="o2_ktaa" />
+			<feature name="b_pin" value="1" />
 			<dataarea name="rom" size="12288">
 				<rom name="ktaa.bin" size="12288" crc="4e2cc6d3" sha1="42ad0c57bd16b7f24c242f60b5c0e9988d8dfba8" offset="0" />
 			</dataarea>
@@ -1888,15 +2064,17 @@
 		</part>
 	</software>
 
-
-	<software name="voice">
-		<description>The Voice</description>
-		<year>1979?</year>
-		<publisher>Magnavox</publisher>
+	<software name="route66">
+		<description>Route 66</description>
+		<year>2007</year>
+		<publisher>&lt;homebrew&gt;</publisher>
+		<info name="programmer" value="Rafael Cardoso, René van den Enden" />
 		<part name="cart" interface="odyssey_cart">
-			<feature name="slot" value="o2_voice" />
+			<feature name="slot" value="o2_rom" />
 			<dataarea name="rom" size="2048">
+				<rom name="new_route66.bin" size="2048" crc="abe9b016" sha1="21f0210ec8c25a37cc728aba195bad9cad904061" offset="0" />
 			</dataarea>
 		</part>
 	</software>
+
 </softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/ondra.xml mame-0.224+dfsg.1/hash/ondra.xml
--- mame-0.222+dfsg.1/hash/ondra.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/ondra.xml	2020-08-26 08:57:19.000000000 +0000
@@ -2,14 +2,18 @@
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 <!--
 license:CC0
+
+These tapes only work on ondrav. Load the tape and press Enter. Tape will load and then the program will run by itself.
+If asked for numbers, press letters: Q = 1, W = 2, E = 3, etc.
+
 -->
 <softwarelist name="ondra" description="Ondra &amp; Ondra ViLi cassettes">
 
 	<software name="copyfile">
-		<description>COPYFILE</description>
+		<description>Copyfile Utility</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
-		<info name="usage" value="Works only on the Ondra ViLi" />
+		<info name="usage" value="Ondrav only. Hit enter to load and run." />
 		<part name="cass" interface="ondra_cass">
 			<dataarea name="cass" size="112800">
 				<rom name="copyfile.wav" size="112800" crc="b3049df0" sha1="9172a09b22d2e532c96f87ffab098f8b292fecf3"/>
@@ -18,10 +22,10 @@
 	</software>
 
 	<software name="editasm">
-		<description>EDITASM</description>
+		<description>Microsoft Editor/Assembler 10.0</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
-		<info name="usage" value="Works only on the Ondra ViLi" />
+		<info name="usage" value="Ondrav only. Hit enter to load and run." />
 		<part name="cass" interface="ondra_cass">
 			<dataarea name="cass" size="1015968">
 				<rom name="editasm.wav" size="1015968" crc="62b18cc1" sha1="71850e204e17c44d3dcd7cda9e9d8717d96063a8"/>
@@ -33,7 +37,7 @@
 		<description>GALAXIANS</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
-		<info name="usage" value="Works only on the Ondra ViLi" />
+		<info name="usage" value="Ondrav only. Hit enter to load and run. Arrows to move, Space to fire." />
 		<part name="cass" interface="ondra_cass">
 			<dataarea name="cass" size="1449244">
 				<rom name="galaxians.wav" size="1449244" crc="e9245841" sha1="bc24392a6ac9db4730363cea8efda4f090d3d1b1"/>
@@ -42,10 +46,10 @@
 	</software>
 
 	<software name="jetpac">
-		<description>JETPAC</description>
+		<description>Jetpac</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
-		<info name="usage" value="Works only on the Ondra ViLi" />
+		<info name="usage" value="Ondrav only. Hit enter to load and run. Arrows to move and fly, Space to fire." />
 		<part name="cass" interface="ondra_cass">
 			<dataarea name="cass" size="1304736">
 				<rom name="jetpac.wav" size="1304736" crc="d69d30d2" sha1="9919166ce9b954188af163bcfe52db6df4da8df6"/>
@@ -54,10 +58,10 @@
 	</software>
 
 	<software name="jetset">
-		<description>JETSETWILLY</description>
+		<description>Jet Set Willy</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
-		<info name="usage" value="Works only on the Ondra ViLi" />
+		<info name="usage" value="Ondrav only. Hit enter to load. Press enter a few times to start. Arrows to move, Space to jump." />
 		<part name="cass" interface="ondra_cass">
 			<dataarea name="cass" size="2308256">
 				<rom name="jetsetwilly.wav" size="2308256" crc="753c51fd" sha1="4342dc96eb60fe5ee92222542c714dc22eda77a0"/>
@@ -69,7 +73,7 @@
 		<description>KAREL</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
-		<info name="usage" value="Works only on the Ondra ViLi" />
+		<info name="usage" value="Ondrav only. Hit enter to load and run." />
 		<part name="cass" interface="ondra_cass">
 			<dataarea name="cass" size="385184">
 				<rom name="karel.wav" size="385184" crc="c10354de" sha1="e640e63e5fc4fe34af33ecfaf57196cc00917b71"/>
@@ -78,10 +82,10 @@
 	</software>
 
 	<software name="mikos">
-		<description>MIKOS</description>
+		<description>MIKOS v0.5</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
-		<info name="usage" value="Works only on the Ondra ViLi" />
+		<info name="usage" value="Ondrav only. Hit enter to load and run. Emulates ondrat." />
 		<part name="cass" interface="ondra_cass">
 			<dataarea name="cass" size="297120">
 				<rom name="mikos.wav" size="297120" crc="4ba186d4" sha1="56e15d9e064afa2196a235ff25f504256779ca5a"/>
@@ -90,10 +94,10 @@
 	</software>
 
 	<software name="pascal">
-		<description>PASCAL</description>
+		<description>Hisoft Pascal System</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
-		<info name="usage" value="Works only on the Ondra ViLi" />
+		<info name="usage" value="Ondrav only. Hit enter to load and run." />
 		<part name="cass" interface="ondra_cass">
 			<dataarea name="cass" size="1732768">
 				<rom name="pascal.wav" size="1732768" crc="e9b74b24" sha1="6ba4fd152e8c2e60483f7725ab73f8e5bf39445d"/>
@@ -105,7 +109,7 @@
 		<description>PLANETOIDS</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
-		<info name="usage" value="Works only on the Ondra ViLi" />
+		<info name="usage" value="Ondrav only. Hit enter to load and run. Arrows to turn, Space to fire." />
 		<part name="cass" interface="ondra_cass">
 			<dataarea name="cass" size="1355936">
 				<rom name="planetoids.wav" size="1355936" crc="8d517fd8" sha1="e34600276d188018b66a1077697c9a63b9565692"/>
@@ -117,7 +121,7 @@
 		<description>PSSST</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
-		<info name="usage" value="Works only on the Ondra ViLi" />
+		<info name="usage" value="Ondrav only. Hit enter to load and run. Arrows to move, get the spray can, Space to fire." />
 		<part name="cass" interface="ondra_cass">
 			<dataarea name="cass" size="1380112">
 				<rom name="pssst.wav" size="1380112" crc="745ed80b" sha1="2bab363cc8efbac52c46d1ecc09184a667c9c1f3"/>
diff -Nru mame-0.222+dfsg.1/hash/pc98_cd.xml mame-0.224+dfsg.1/hash/pc98_cd.xml
--- mame-0.222+dfsg.1/hash/pc98_cd.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/pc98_cd.xml	2020-08-26 08:57:19.000000000 +0000
@@ -873,20 +873,34 @@
 		</part>
 	</software>
 
+	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
 	<software name="branmar2">
 		<!--
-		Origin: Unknown
-		<rom name="GAME.BIN" size="479222352" crc="b96fad3a" sha1="76d673cd9fdcf7479f484e2e5b92fcde3d6c6e41"/>
-		<rom name="GAME.CUE" size="173" crc="75049f00" sha1="008c1c2053e71aa20f6818fbe4f9eeb6705ef7a6"/>
+		Origin: redump.org
+		<rom name="Branmarker 2 (Japan) (Game Disc) (Track 1).bin" size="371159712" crc="df2701fe" sha1="ecc0d8153e5b476e1692a33e61f0cea18c8a7cce"/>
+		<rom name="Branmarker 2 (Japan) (Game Disc) (Track 2).bin" size="54495840" crc="d6fea193" sha1="26dfee2e39be02968294b0fa2c304dd69bde4bc5"/>
+		<rom name="Branmarker 2 (Japan) (Game Disc) (Track 3).bin" size="53919600" crc="932ba984" sha1="8b143a0c7f1f44038c71a84df064e98c87a9dde9"/>
+		<rom name="Branmarker 2 (Japan) (Game Disc).cue" size="337" crc="049ba1fe" sha1="1c65dbd4898a0c483ee92e87cc2d9d0fa81996b7"/>
+		<rom name="Branmarker 2 (Japan) (Extra Disc) (Track 1).bin" size="482889120" crc="ae31a549" sha1="9f4ca18f2ba133534dd7a150e248398fe9cf5151"/>
+		<rom name="Branmarker 2 (Japan) (Extra Disc) (Track 2).bin" size="209972448" crc="dca6cf1c" sha1="d2125cf9cdd51d66f6af23dc9d8a3c16c2b5000d"/>
+		<rom name="Branmarker 2 (Japan) (Extra Disc) (Track 3).bin" size="33464256" crc="115ae1b1" sha1="fd3ed992993023660b1aedae0b1659e6efa80ee5"/>
+		<rom name="Branmarker 2 (Japan) (Extra Disc).cue" size="340" crc="b9c8fbc2" sha1="715fa4406d6ede1cdfbd02f7aac0fa3a6e4205ba"/>
 		-->
 		<description>Branmarker 2</description>
 		<year>1995</year>
 		<publisher>ディー・オー (D.O.)</publisher>
 		<info name="alt_title" value="ブランマーカー２" />
 		<info name="release" value="19951014" />
-		<part name="cdrom" interface="cdrom">
+		<part name="cdrom1" interface="cdrom">
+			<feature name="part_id" value="Game Disc" />
+			<diskarea name="cdrom">
+				<disk name="branmarker 2 (japan) (game disc)" sha1="242b3fd57b45e08f29fba516257821ad7f132152" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
+			<feature name="part_id" value="Extra Disc" />
 			<diskarea name="cdrom">
-				<disk name="branmarker 2" sha1="15f0320726f83a341a7f01e3268945b143c66873" />
+				<disk name="branmarker 2 (japan) (extra disc)" sha1="755865e904bf3ee527c629a45cea052f7bb10f5b" />
 			</diskarea>
 		</part>
 	</software>
@@ -1025,6 +1039,55 @@
 		</part>
 	</software>
 
+	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
+	<!-- After installing the system files, it fails to boot with "CD-ROM ドライブが見つかりません" (CD-ROM drive not found) -->
+	<software name="chiemi" supported="no">
+		<!--
+		Origin: redump.org / wiggy2k
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 01).bin" size="31399200" crc="286527ae" sha1="546c782bf12f9d2d64c92204e3b53f19a12fd1c5"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 02).bin" size="23816352" crc="42619143" sha1="c1482839c418c8705e8ae73d3533c0ba7f98f7b0"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 03).bin" size="6174000" crc="0c91acac" sha1="d028c88815a1f0e9d2e70fb634f14101f490ab9d"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 04).bin" size="30870000" crc="5ce57017" sha1="443f512b65730a5d13bb26ceeda63300fb253e27"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 05).bin" size="30870000" crc="699eb0f1" sha1="948e6ece37165d1d336b5eb2260806912ec34dea"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 06).bin" size="40748400" crc="fdc102e0" sha1="49337a0b4fbd61c5c9400e12d93ccf891347ec1f"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 07).bin" size="27871200" crc="ff7de08d" sha1="1ba07789c6e3e2c84743d8bf0dca8a3c5965f281"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 08).bin" size="41101200" crc="06834f32" sha1="5235cc6c9bd04ebee2a5e0bde3b7f6b248bd407c"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 09).bin" size="27165600" crc="a3a89ad6" sha1="e10bf13c3384e6d8368b8446688e333319b4c4df"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 10).bin" size="35103600" crc="3d165d3c" sha1="b02ee7af8cfc74e8e2fc4ad725b3c599ec40bc31"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 11).bin" size="5821200" crc="d0740da8" sha1="70ca1a6786677463c7b942aecb37af8c05be79ef"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 12).bin" size="2469600" crc="6bc3a822" sha1="7f13602935ce28335ad806b08cc0be81680887c9"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 13).bin" size="1058400" crc="e0e9caeb" sha1="707eb37890638680247262bb36c3f5099af64992"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 14).bin" size="32810400" crc="be6b8c6c" sha1="7739e705be4a7e772b5b14bfb3c5624ba28cf06b"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 15).bin" size="31222800" crc="b58e2405" sha1="92c5a72d96f1f696f148e9923213cdd38b40ab81"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 16).bin" size="41277600" crc="ad6f2bf8" sha1="96d13571993b309204023af5f8b19ffd3177710c"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 17).bin" size="11642400" crc="dfa70b75" sha1="1e17c3307196ec0ef838cf7db46243c27c0c199d"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 18).bin" size="53802000" crc="da940b3d" sha1="cf9cd5b7dc4fa3421416ea66f1ef32cf8ac024fb"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 19).bin" size="30693600" crc="e292d51b" sha1="f52e8faf3ea2468f78cac37cbe7008d4c5e0bdb2"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 20).bin" size="1058400" crc="682b5602" sha1="5ac3ddcefe255704586ea634bc8a2078d10d81bb"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 21).bin" size="1587600" crc="3ac9ae1f" sha1="3616c0a7cc1ec336dc0d7fd40c7bb5c4d0a2f353"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 22).bin" size="1587600" crc="8f3f9ef8" sha1="c65ce38405157ed671253f3478d63e1c651a1d0b"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 23).bin" size="22932000" crc="6ef7fe0d" sha1="123112b8f2c7ae0fa7e1a84d7aecdfa5daa0330b"/>
+		<rom name="Chiemi &amp; Naomi (Japan) (Track 24).bin" size="1940400" crc="500763cd" sha1="b0abbabe9b29f9e626a89e30e3c8cbe7baba1f01"/>
+		<rom name="Chiemi &amp; Naomi (Japan).cue" size="2813" crc="5e8b2677" sha1="7f07cbe86e4eee8e3d9f2a4b5dc82f5f0deee491"/>
+		-->
+		<description>Chiemi &amp; Naomi</description>
+		<year>1993</year>
+		<publisher>フェアリーテール (Fairytale)</publisher>
+		<info name="serial" value="HME-244"/>
+		<info name="alt_title" value="稚恵美＆奈緒美" />
+		<info name="release" value="199312xx" />
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="1261568">
+				<rom name="chiemi-and-naomi.hdm" size="1261568" crc="7b3706d4" sha1="a63be0d0426e54291586f8d246c4fab58630026d" offset="000000" />
+			</dataarea>
+		</part>
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="chiemi &amp; naomi (japan)" sha1="dcdb4cccbce006739a1d48959fc7514441b2240c" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="classro4">
 		<!--
 		Origin: P2P
@@ -1504,6 +1567,48 @@
 		</part>
 	</software>
 
+	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
+	<!-- Black screen on boot -->
+	<software name="dorse93" supported="no">
+		<!--
+		Origin: redump.org
+		<rom name="DOR SE (Special Edition) '93 (Japan) (Track 1).bin" size="317167200" crc="e4cc8ac3" sha1="e8e32b1a959f69b4bdd0fef124d72ce2e64c747d"/>
+		<rom name="DOR SE (Special Edition) '93 (Japan) (Track 2).bin" size="35630448" crc="99da051e" sha1="15151aa198c8e2c6c528ff9be2ebd262344678a5"/>
+		<rom name="DOR SE (Special Edition) '93 (Japan) (Track 3).bin" size="36164352" crc="825418a8" sha1="d58a5a9afdd409b428f794c129f39ec3d0627b43"/>
+		<rom name="DOR SE (Special Edition) '93 (Japan).cue" size="395" crc="b921381c" sha1="777da9a56c83b06f9c75eedd12433bf9105a0fb9"/>
+		-->
+		<description>DOR Special Edition '93</description>
+		<year>1993</year>
+		<publisher>ディー・オー (D.O.)</publisher>
+		<info name="serial" value="HME-255 / 2TD-3004"/>
+		<info name="release" value="199312xx" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="dor se (special edition) '93 (japan)" sha1="effc100b0dc1850e840390a8ae52b7b5e80af821" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="dorse93a" cloneof="dorse93" supported="no">
+		<!--
+		Origin: redump.org
+		<rom name="DOR - Special Edition &apos;93 (Japan) (Alt) (Track 1).bin" size="310421664" crc="752f9bdd" sha1="ae19d158d5cc4c094d216b593ff383bd7ee33abb"/>
+		<rom name="DOR - Special Edition &apos;93 (Japan) (Alt) (Track 2).bin" size="35630448" crc="b8116f60" sha1="1ad59d2a1d591251b9b68093b572b4c253eb2017"/>
+		<rom name="DOR - Special Edition &apos;93 (Japan) (Alt) (Track 3).bin" size="35635152" crc="5a9d095a" sha1="d93ba61f4cb4b841ba2a93256182ef71452b0501"/>
+		<rom name="DOR - Special Edition &apos;93 (Japan) (Alt).cue" size="404" crc="0f4aee39" sha1="c95f294d8607b877a4fe6d4e8723acd728747d14"/>
+		-->
+		<description>DOR Special Edition '93 (alt)</description>
+		<year>1993</year>
+		<publisher>ディー・オー (D.O.)</publisher>
+		<info name="serial" value="HME-255"/>
+		<info name="release" value="199312xx" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="dor special edition '93 (alt)" sha1="7c8ed53fc332b99eebdeb81933184b85b424a1ac" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="dstat_09">
 		<!--
 		Origin: redump.org
@@ -1665,19 +1770,23 @@
 	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
 	<software name="eimmy">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Eimmy to Yobanaide.ccd" size="1536" crc="5a957719" sha1="b674f4c5d249abd3f0b90bf82991f1128ba05ab9"/>
-		<rom name="Eimmy to Yobanaide.cue" size="238" crc="dcae031f" sha1="d27f55850c97b3761b09bb043f87c4a6ec89da2d"/>
-		<rom name="Eimmy to Yobanaide.img" size="549742368" crc="1585640a" sha1="7f98c92bb3917cf2d87d325ddc4c1ce36b5a6484"/>
-		<rom name="Eimmy to Yobanaide.sub" size="22438464" crc="03ea8525" sha1="3cbd86397d59300f0ae4d977436a12cdcad742e1"/>
+		Origin: redump.org
+		<rom name="Eimmy to Yobanaide - Please Don't Call Me Eimmy (Japan) (Track 1).bin" size="385579824" crc="99869352" sha1="429f8879aff4809064f08bf893f5a1d7329ba7bf"/>
+		<rom name="Eimmy to Yobanaide - Please Don't Call Me Eimmy (Japan) (Track 2).bin" size="51459408" crc="b447fa0d" sha1="d45f8d372e0f3d78ca08fdcdf78a367582ca267c"/>
+		<rom name="Eimmy to Yobanaide - Please Don't Call Me Eimmy (Japan) (Track 3).bin" size="51167760" crc="bc870a2f" sha1="439d9c4c619bdbbf87676bb9a4b4645ef7161dcf"/>
+		<rom name="Eimmy to Yobanaide - Please Don't Call Me Eimmy (Japan) (Track 4).bin" size="29665776" crc="4bffe326" sha1="ca1f5c4389fe6ca748a558ffe94a4bb85e1c077d"/>
+		<rom name="Eimmy to Yobanaide - Please Don't Call Me Eimmy (Japan) (Track 5).bin" size="31869600" crc="707adf40" sha1="f512336d7b8758af78cb5b08504590834c78038e"/>
+		<rom name="Eimmy to Yobanaide - Please Don't Call Me Eimmy (Japan).cue" size="658" crc="608ac853" sha1="4083d7bf509ff71735613ef4f634a92d42d7c52b"/>
 		-->
 		<description>Eimmy to Yobanaide</description>
 		<year>1995</year>
 		<publisher>シーズウェア (C's Ware)</publisher>
+		<info name="serial" value="CSW-0003"/>
+		<info name="alt_title" value="エイミーと呼ばないでっ" />
 		<info name="release" value="199508xx" />
 		<part name="cdrom" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="eimmy to yobanaide" sha1="4c321b593322b94cf84a68ad1021d0cf3b24b1c4" />
+				<disk name="eimmy to yobanaide - please don't call me eimmy (japan)" sha1="15ba4ebd4f932f9b3406e40b439172a7680222f7" />
 			</diskarea>
 		</part>
 	</software>
@@ -1851,6 +1960,24 @@
 		</part>
 	</software>
 
+	<software name="f15se3">
+		<!--
+		Origin redump.org
+		<rom name="F-15 Strike Eagle III (Japan).bin" size="12141024" crc="e603b6f5" sha1="991b5a9b05c9fa7424e7474bad544aeb43ace86e"/>
+		<rom name="F-15 Strike Eagle III (Japan).cue" size="118" crc="427a1e8c" sha1="7cac9565d86c47b4d73e93a8ff8762d7499d8b89"/>
+		-->
+		<description>F15 Strike Eagle III</description>
+		<year>1995</year>
+		<publisher>スペクトラムホロバイトジャパン (Spectrum HoloByte Japan)</publisher>
+		<info name="alt_title" value="Ｆ－１５ ストライクイーグル３" />
+		<info name="release" value="19951006" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="f-15 strike eagle iii (japan)" sha1="9b830e4c843f50c09480976a577638200ebe5f5b"/>
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="fh2tag">
 		<!--
 		Origin: redump.org
@@ -2293,6 +2420,26 @@
 		</part>
 	</software>
 
+	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
+	<software name="if2">
+		<!--
+		Origin: redump.org
+		<rom name="if 2 - Invitations from Fantastic Stories (Japan).bin" size="20815200" crc="2b674736" sha1="cfc887aa25a66dc5bccd35153989d0a7590a9755"/>
+		<rom name="if 2 - Invitations from Fantastic Stories (Japan).cue" size="138" crc="5a455327" sha1="92f01383275dd88e6aff59373b52b6aa87dc3ca5"/>
+		-->
+		<description>if 2 - Invitations from Fantastic Stories</description>
+		<year>1993</year>
+		<publisher>アクティブ (Active)</publisher>
+		<info name="serial" value="HMF-228 / 2TD-3003"/>
+		<info name="alt_title" value="イフ2" />
+		<info name="release" value="19931119" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="if 2 - invitations from fantastic stories (japan)" sha1="aab5838de5a0e92d8a887e075f913aed0acdf18d" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="inhearth">
 		<!--
 		Origin unknown
@@ -2398,6 +2545,31 @@
 	</software>
 
 	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
+	<!-- Only the top 2 lines show up on screen, the rest is empty -->
+	<software name="knjland3" supported="no">
+		<!--
+		Origin: redump.org
+		<rom name="Kanji Land 3-nen (Japan) (Track 1).bin" size="32539920" crc="c8b3bd9a" sha1="22735456fc350697845450cd95c63a3119c939bd"/>
+		<rom name="Kanji Land 3-nen (Japan) (Track 2).bin" size="19488672" crc="6290a60f" sha1="6cb0f3e4679ac4bed0df6bad19cbc55e4c20125b"/>
+		<rom name="Kanji Land 3-nen (Japan) (Track 3).bin" size="32544624" crc="9e0b3bbe" sha1="b11572cc05568e5c5800f43f4f1d46f901d8ebd2"/>
+		<rom name="Kanji Land 3-nen (Japan) (Track 4).bin" size="34661424" crc="7917756f" sha1="b039d7a236e92084995a9cea64c63dae7375e9e9"/>
+		<rom name="Kanji Land 3-nen (Japan) (Track 5).bin" size="40306224" crc="ef038840" sha1="1fd7250bff7578f0e39a12efe13c5fd7525195b6"/>
+		<rom name="Kanji Land 3-nen (Japan).cue" size="595" crc="ade9085c" sha1="3a32a76c1568b8c2efed6006d28019c1db0aff83"/>
+		-->
+		<description>Kanji Land 3-nen</description>
+		<year>1995</year>
+		<publisher>富士通大分ソフトウェアラボラトリ (Fujitsu Ooita Software Laboratory)</publisher>
+		<info name="serial" value="OSL-010A"/>
+		<info name="alt_title" value="漢字ランド３年" />
+		<info name="release" value="199507xx" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="kanji land 3-nen (japan)" sha1="fb7b3684231bde65a285fe528b6c42f0be6f74cd" />
+			</diskarea>
+		</part>
+	</software>
+
+	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
 	<software name="kokoraku">
 		<!--
 		Origin: Neo Kobe Collection
@@ -2456,18 +2628,37 @@
 
 	<software name="kyrandia">
 		<!--
-		Origin: Neo Kobe Collection
-		CCD converted to CUE with GNU ccd2cue
-		<rom name="The Legend of Kyrandia.ccd" size="4894" crc="3a8bbbfb" sha1="132f7535d204a731423b497729d3b7e01f35eefd"/>
-		<rom name="The Legend of Kyrandia.cue" size="917" crc="126b517a" sha1="50280ae669798e6e37f82a9621e8a2b2341832ba"/>
-		<rom name="The Legend of Kyrandia.img" size="561895152" crc="8f8bb29e" sha1="15d73a824957614af96bac3467c37f576a50390f"/>
-		<rom name="The Legend of Kyrandia.sub" size="22934496" crc="0638eedb" sha1="76d14925a9f668100d2e55f610b56cacf6fbb292"/>
+		Origin: redump.org (CD) / Neo Kobe Collection (floppy)
+		<rom name="Legend of Kyrandia, The (Japan) (Track 01).bin" size="9403296" crc="22887101" sha1="310f10bc63da750541b513913990708daf57e14f"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 02).bin" size="29752800" crc="25626629" sha1="174ff1838863decc1d0d85aa96e4a25cc051f7ac"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 03).bin" size="28129920" crc="9118b9ea" sha1="eda13c04ef5fd2e540f2b313c3ede040dc039511"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 04).bin" size="20991600" crc="e947027f" sha1="c6daed40f17f86b33515126e1dd693d663c4abc5"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 05).bin" size="17146080" crc="f72d5f33" sha1="29e574677f57f994d2379d7d3694b9aff24deff8"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 06).bin" size="25013520" crc="1fa1be1e" sha1="a5a3d4c17bd68a57861f4686d24e02d95a74eaf1"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 07).bin" size="18340896" crc="39ec5b66" sha1="670f639a9ef064c9673d818a8ba3753ed4aec2fb"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 08).bin" size="21266784" crc="26bc5a4b" sha1="007241398eb076c30830f9ce3ca019c457f269ad"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 09).bin" size="34720224" crc="7de82006" sha1="71a7f245dc1f6b78aa5f78bba1ac4d906ff12855"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 10).bin" size="28607376" crc="1d50f9dc" sha1="be14acaa770940026a2f395acb3652be8e071bbb"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 11).bin" size="31575600" crc="2ced7636" sha1="b5859fa5105992ec149bf591169c0cf253196724"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 12).bin" size="15424416" crc="98c26745" sha1="ddf835c2034de1e0c1180b0cfa3161a2623d756d"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 13).bin" size="21960624" crc="3992269a" sha1="c874ca23da50011a23db06c8c25fdaca1ae0e2aa"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 14).bin" size="78415680" crc="cdd6d402" sha1="c6f583afdd17a59133a2112075551322bdbe883d"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 15).bin" size="27612480" crc="e3cba596" sha1="1c93a3785b583db57094c179928d2b2add2cd788"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 16).bin" size="45593520" crc="4a57c679" sha1="bb29d4153db1864b6aca7f583256f1993c94b4c0"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 17).bin" size="12430320" crc="523cd6db" sha1="6a24ffe7b532fa3c6b7fe8e27129ab179701bba7"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 18).bin" size="8624784" crc="dc9d19ca" sha1="cb6ba4f6a592b769e13bb8950da6c47be6bac9fd"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 19).bin" size="10614576" crc="8a1bfb3f" sha1="3cb83119ea14bb7220da4a15e12c20f264b23852"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 20).bin" size="14229600" crc="fd2fc7cc" sha1="efdf399475a4e1fd330e5bf0c627d82a781942f7"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 21).bin" size="12136320" crc="973875fa" sha1="5e887dd49336fab522991343ee68b999fa7fc690"/>
+		<rom name="Legend of Kyrandia, The (Japan) (Track 22).bin" size="49904736" crc="f4fc1800" sha1="3e14d6e4d3143f51dd4b20b29617748bf669ea48"/>
+		<rom name="Legend of Kyrandia, The (Japan).cue" size="2294" crc="b9a1dd2b" sha1="922a29b2a73047b58abb17fccb945e7a9188cf60"/>
 		-->
 		<description>The Legend of Kyrandia</description>
-		<year>1994</year>
+		<year>1993</year>
 		<publisher>スタークラフト (Starcraft)</publisher>
-		<info name="alt_title" value="レジェンド　オブ　キランディア" />
-		<info name="release" value="19940215" />
+		<info name="serial" value="SC-93002"/>
+		<info name="alt_title" value="レジェンド・オブ・キランディア" />
+		<info name="release" value="199310xx" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1261568">
 				<rom name="the legend of kyrandia (cd install disk).hdm" size="1261568" crc="005afba9" sha1="b60c579d34363f947bfb187401aa53eafe4d299a" offset="000000" />
@@ -2475,7 +2666,72 @@
 		</part>
 		<part name="cdrom" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="the legend of kyrandia" sha1="c1e8ad3237cc405e134ccebb7466f356d6280871" />
+				<disk name="legend of kyrandia, the (japan)" sha1="c5b8ccb2a80a2053c0cb1ae0b0546ba5a0fe6677" />
+			</diskarea>
+		</part>
+	</software>
+
+	<!-- Hangs after the title screen. Could be related to the bad sectors on the floppy disk. -->
+	<software name="kyrandia2" supported="no">
+		<!--
+		Origin: redump.org (CD) / KailoKyra (floppy)
+		<rom name="Kyrandia II - The Hand of Fate (Japan).bin" size="19535712" crc="189dec4f" sha1="55091fb0dd63855eb527753a46737142e17b7ae6"/>
+		<rom name="Kyrandia II - The Hand of Fate (Japan).cue" size="127" crc="ee8bf244" sha1="55f2b4c6a2faadb71269fc36d490d9289dba60ec"/>
+		-->
+		<description>Kyrandia II - The Hand of Fate</description>
+		<year>1995</year>
+		<publisher>スタークラフト (Starcraft)</publisher>
+		<info name="serial" value="SC-95002"/>
+		<info name="alt_title" value="ザ・ハンド・オブ・フェイト キランディア２" />
+		<info name="release" value="19951014" />
+		<part name="flop1" interface="floppy_5_25">
+			<!-- Several bad sectors, needs a redump -->
+			<dataarea name="flop" size="1261568">
+				<rom name="kyrandia ii pc-9821.hdm" size="1261568" crc="67ad11ea" sha1="c1f9f4ab622cd04d8954b921750acda1650ffac5" offset="000000" status="baddump" />
+			</dataarea>
+		</part>
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="kyrandia ii - the hand of fate (japan)" sha1="88ec7b26f9acd111150a46b1460e466d9bbb28aa" />
+			</diskarea>
+		</part>
+	</software>
+
+	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
+	<!-- Fails with "can't find the CD-ROM drive" error -->
+	<software name="lemoncc" supported="no">
+		<!--
+		Origin: redump.org
+		<rom name="Lemon Cocktail Collection (Japan) (Track 01).bin" size="31399200" crc="ed3b3b75" sha1="941364b602e9c0fe9c0682ba342a052de6d4ea03"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 02).bin" size="30164400" crc="6d056e4e" sha1="f08fd5b36730246fa9346858839bb756c640cdde"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 03).bin" size="46746000" crc="1eea2fc5" sha1="27dd006784be1902f58bb88fb726909da6aca250"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 04).bin" size="43747200" crc="eb597d0a" sha1="ab76557a1ca57953592edb9987098cf3364a8098"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 05).bin" size="30340800" crc="4cf5eb6d" sha1="27fdcc111fd63b6844724fabbd94018ff64a957d"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 06).bin" size="37926000" crc="b6356045" sha1="6d35c9872ad7da946a1d06917a030fc7f8809309"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 07).bin" size="38808000" crc="d17604fd" sha1="8f208d1779c1b0e2a4e6238dcf44d73a4dd3baf0"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 08).bin" size="39513600" crc="9fd04581" sha1="e7a09ba8dd070fa4ecd34b6cc309a0a4cf948dfb"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 09).bin" size="33868800" crc="5af50c83" sha1="19672e4e73b0ef9e438b90ffa1a634db7e5e5cb4"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 10).bin" size="30870000" crc="9e43d498" sha1="8d3067f23310b4731a690b4270e46bdfa3c125fe"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 11).bin" size="32457600" crc="00f3d2c0" sha1="f43426a61850877f614895f478ac2dc214d03f29"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 12).bin" size="29282400" crc="3285f41e" sha1="904cf11e4326521897434cf85e4524676405bb21"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 13).bin" size="7408800" crc="dc332186" sha1="e529334b5c58665c70e91d316f0849eb694ba65a"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 14).bin" size="31046400" crc="7a5933cd" sha1="12a5d3b61da4d32c84c23435e79cd7f727215489"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 15).bin" size="32457600" crc="2f2b4fcd" sha1="d67fd767a926fb0874745857ad0f1906945cc1b1"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 16).bin" size="40924800" crc="37f417b1" sha1="25bae598fe25ccd19fd839985c22dc14a80225af"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 17).bin" size="28576800" crc="de0575a8" sha1="a010aedd53a02cdac4930e19e872140382a06748"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 18).bin" size="17463600" crc="1ed23af9" sha1="7628aace5c65598355d2f64f55f243e9892190f2"/>
+		<rom name="Lemon Cocktail Collection (Japan) (Track 19).bin" size="26107200" crc="89b3a0d3" sha1="4e6dd9a07d655aacad7a2461407ee2ba16b2dc0f"/>
+		<rom name="Lemon Cocktail Collection (Japan).cue" size="2414" crc="bf6e3f6a" sha1="8c903aa24570e9ea4c9aa6b722504eb7a29b0d73"/>
+		-->
+		<description>Lemon Cocktail Collection</description>
+		<year>1993</year>
+		<publisher>カクテル・ソフト (Cocktail Soft)</publisher>
+		<info name="alt_title" value="レモン・カクテル・コレクション" />
+		<info name="serial" value="HME-101"/>
+		<info name="release" value="199303xx" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="lemon cocktail collection (japan)" sha1="a17512ebc210b781310d79a35cf8da325ed1374a" />
 			</diskarea>
 		</part>
 	</software>
@@ -2486,12 +2742,10 @@
 	-->
 	<software name="lesserm" supported="partial">
 		<!--
-		Origin: Neo Kobe Collection
-		CCD converted to CUE with GNU ccd2cue
-		<rom name="Lesser Mern Special Director's Edition.ccd" size="957" crc="189d87e2" sha1="0d829c0ca27ab24a1404ce8932219a52a2519a0a"/>
-		<rom name="Lesser Mern Special Director's Edition.cue" size="138" crc="815d6da0" sha1="f8cf64b84815ec089c8ab9f3bdcee99c76a3bdab"/>
-		<rom name="Lesser Mern Special Director's Edition.img" size="298544064" crc="6df3f1b5" sha1="54232495cf7288d21d20d62a6cbea74c6e64660a"/>
-		<rom name="Lesser Mern Special Director's Edition.sub" size="12185472" crc="734bf105" sha1="4a0f9eda741adaaff00021574fa096e4f7a7c75b"/>
+		Origin: redump.org (CD) / Neo Kobe Collection (floppy)
+		<rom name="Lesser Mern - Special Director's Edition (Japan) (Track 1).bin" size="9530304" crc="5b0f4a83" sha1="f5410af0b1177f62c7f22bb2ba6a572a93528582"/>
+		<rom name="Lesser Mern - Special Director's Edition (Japan) (Track 2).bin" size="289013760" crc="56060d44" sha1="2b5c901351bd829de702605fff82c862b96543d8"/>
+		<rom name="Lesser Mern - Special Director's Edition (Japan).cue" size="289" crc="cfe05e75" sha1="43d95b291c3a40d1a87914e18c90bf13b7629e9a"/>
 		-->
 		<description>Lesser Mern - Special Director's Edition</description>
 		<year>1992</year>
@@ -2511,7 +2765,7 @@
 		</part>
 		<part name="cdrom" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="lesser mern special director's edition" sha1="238538d0118a18ce8237f681bf0de70b73af887d" />
+				<disk name="lesser mern - special director's edition (japan)" sha1="9ecf32d0dfe54a3781e822e30ac40ab971ba03b2" />
 			</diskarea>
 		</part>
 	</software>
@@ -2552,6 +2806,37 @@
 		</part>
 	</software>
 
+	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
+	<!-- Missing a floppy disk? -->
+	<software name="lipsadv3" supported="no">
+		<!--
+		Origin: redump.org
+		<rom name="Lip 3 - Lipstick Adventure 3 (Japan) (Track 01).bin" size="52567200" crc="7462e0c3" sha1="48900be15c74d4099e25710dcd5e6f26123c1d7f"/>
+		<rom name="Lip 3 - Lipstick Adventure 3 (Japan) (Track 02).bin" size="43923600" crc="12c3a386" sha1="853c797694005ab58666f5c21e2fa0f461c9fc5d"/>
+		<rom name="Lip 3 - Lipstick Adventure 3 (Japan) (Track 03).bin" size="32281200" crc="7fe731f3" sha1="c831ad5520e846d0d2f7145e6358b092ae80ff2f"/>
+		<rom name="Lip 3 - Lipstick Adventure 3 (Japan) (Track 04).bin" size="19404000" crc="0caf8555" sha1="be705a4209922d7253771c9042a9a055b7f46b69"/>
+		<rom name="Lip 3 - Lipstick Adventure 3 (Japan) (Track 05).bin" size="28224000" crc="cb3c404d" sha1="cd06c6312a80fed619c8f1a0d37de35239654a37"/>
+		<rom name="Lip 3 - Lipstick Adventure 3 (Japan) (Track 06).bin" size="33692400" crc="e6832e70" sha1="41424966a28305fbae01f69ad499942a3b145249"/>
+		<rom name="Lip 3 - Lipstick Adventure 3 (Japan) (Track 07).bin" size="27871200" crc="82d18093" sha1="87850e07f580fd8d0c03b712824a91990bc35be4"/>
+		<rom name="Lip 3 - Lipstick Adventure 3 (Japan) (Track 08).bin" size="34574400" crc="ba15484d" sha1="afbfa37d18570433b4786823622eb31caff106c7"/>
+		<rom name="Lip 3 - Lipstick Adventure 3 (Japan) (Track 09).bin" size="46040400" crc="09bcb43a" sha1="9611971fdbf918086742f169b53f860e03be299c"/>
+		<rom name="Lip 3 - Lipstick Adventure 3 (Japan) (Track 10).bin" size="46393200" crc="f2b00612" sha1="d1cd805d5ec73615cc22683f2687c6d67b023f88"/>
+		<rom name="Lip 3 - Lipstick Adventure 3 (Japan) (Track 11).bin" size="33516000" crc="f6b1128f" sha1="c22c7c63a7c0b42f10350581a937b12312aebe3b"/>
+		<rom name="Lip 3 - Lipstick Adventure 3 (Japan).cue" size="1423" crc="583e7d8b" sha1="68abb3c69843d9a1297c90a04f0613d98962d691"/>
+		-->
+		<description>Lip 3 - Lipstick Adventure 3</description>
+		<year>1993</year>
+		<publisher>フェアリーテール (Fairytale)</publisher>
+		<info name="alt_title" value="LIP3 リップスティック・アドベンチャー３" />
+		<info name="serial" value="HME-221"/>
+		<info name="release" value="199305xx" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="lip 3 - lipstick adventure 3 (japan)" sha1="c0507c340b55c1fa08a8080e0fc3d53d271f6a1e" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="lodoss">
 		<!--
 		Origin unknown
@@ -2692,6 +2977,25 @@
 		</part>
 	</software>
 
+	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
+	<software name="manadoko2">
+		<!--
+		Origin: redump.org
+		<rom name="Manami no Doko made Iku no 2 - Return of the Kuro Pack (Japan).bin" size="12376224" crc="81fd5145" sha1="8f2ceebf79dc77fa29a788ec05ede101d6045de4"/>
+		<rom name="Manami no Doko made Iku no 2 - Return of the Kuro Pack (Japan).cue" size="151" crc="7351f4ca" sha1="3914f29f9afd579a56aecb42c478f9b170bded64"/>
+		-->
+		<description>Manami no Doko made Iku no? 2 - Return of the Kuro Pack</description>
+		<year>1995</year>
+		<publisher>ウエンディマガジン (Wendy Magazine)</publisher>
+		<info name="alt_title" value="まなみのどこまでイクの? 2 リターン オブ THE 黒パック" />
+		<info name="release" value="199505xx" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="manami no doko made iku no 2 - return of the kuro pack (japan)" sha1="026662a39cda929bcc4b33110b0192f92f09d398" />
+			</diskarea>
+		</part>
+	</software>
+
 	<!-- MAME crashes with "Incorrect layout on track 77 head 0" error -->
 	<software name="manpsy" supported="no">
 		<!--
@@ -2739,22 +3043,56 @@
 	</software>
 
 	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
-	<!-- Parts of the voiced dialogue get cut off, probably due to the lack of proper pregaps in the audio tracks -->
+	<!-- Hangs shortly after starting -->
+	<software name="mirage2" supported="no">
+		<!--
+		Origin: redump.org
+		<rom name="Mirage 2 - Torry, Neat &amp; Roan Fairladies in MagicLand (Japan).bin" size="18726624" crc="94f9dfb8" sha1="f60333837f42ca928f677bc5da1f6b0966d2eacf"/>
+		<rom name="Mirage 2 - Torry, Neat &amp; Roan Fairladies in MagicLand (Japan).cue" size="127" crc="0053d83b" sha1="9799d748643ce4a6bf634ca3acf2ca359fe5de6a"/>
+		-->
+		<description>Mirage 2 - Torry, Neat &amp; Roan Fairladies in MagicLand</description>
+		<year>1994</year>
+		<publisher>ディスカバリー (Discovery)</publisher>
+		<info name="serial" value="2TD-3018"/>
+		<info name="alt_title" value="ミラージュ２ トリー×ニート×ローンの大冒険" />
+		<info name="release" value="199412xx" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="mirage 2 - torry, neat &amp; roan fairladies in magicLand (japan)" sha1="22c46e6409b2ffa8423691d12340b189f2e24358" />
+			</diskarea>
+		</part>
+	</software>
+
+	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
 	<software name="mjdepon">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Mahjong de Pon!.ccd" size="3410" crc="2c6f9c3a" sha1="345140cdfe2dced80d7dccee798cea13ee8d7a58"/>
-		<rom name="Mahjong de Pon!.cue" size="631" crc="96651093" sha1="609f56161fd6e17522e3200a1207319bcce7b478"/>
-		<rom name="Mahjong de Pon!.img" size="247331616" crc="b973c373" sha1="f29afc379f24e00b5d0719ef962feabb6ec97187"/>
-		<rom name="Mahjong de Pon!.sub" size="10095168" crc="7c68bfd2" sha1="0bfab2bf3cd775663dbc33133aea2d043fb74a7f"/>
+		Origin: redump.org
+		<rom name="Mahjong de Pon! (Japan) (Track 01).bin" size="16421664" crc="cbdf74ed" sha1="74ae179088e5e549f487bc844b5220ccd5666ca0"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 02).bin" size="21520800" crc="2badd8fc" sha1="0b8066a8d74e446f15a97bc97b9b05eed5c390ba"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 03).bin" size="34927200" crc="c2621921" sha1="be4518ca76b4a093ba9f27d4b35ca4d5049971f9"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 04).bin" size="10936800" crc="0474ca45" sha1="79ea76bd1e0dade9aa2018b4ef73bd8d02969a0f"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 05).bin" size="26989200" crc="163bb41c" sha1="4492c1e8a1c66dc9ffca81bfc1719af973c7870d"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 06).bin" size="10584000" crc="bfaadfeb" sha1="420bef04eb402323ed2a46db452917042d7dfed6"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 07).bin" size="26283600" crc="a936f2a4" sha1="9014257e17d4d9fa2130c80ac7a97f2070d870f5"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 08).bin" size="10407600" crc="78201ff5" sha1="29e1cec86732b525f59f9ac30371de5c395b32b7"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 09).bin" size="26460000" crc="937abcb7" sha1="f8a84bb330695ed4e16a46bec6f040282a55de0b"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 10).bin" size="8290800" crc="daee42b7" sha1="bab67ba1394672afa227940e1380735c0c0e0ba4"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 11).bin" size="8467200" crc="968aaf37" sha1="a3964b2474c9f4fe8ede0159b878c8b1c4d8e13d"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 12).bin" size="8467200" crc="5bbe7d16" sha1="5810b129215010e42334c23787c0c0ad1583c406"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 13).bin" size="11642400" crc="96958c55" sha1="16ee2cdee03dfb96608868284276cf8fca97434f"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 14).bin" size="11818800" crc="8ed5bad8" sha1="16e9b001142de022776165749b5141592f175c91"/>
+		<rom name="Mahjong de Pon! (Japan) (Track 15).bin" size="14114352" crc="1a6683a7" sha1="b1ed8c28b8656ce463cf6ef5eaade83dd7ff627b"/>
+		<rom name="Mahjong de Pon! (Japan).cue" size="1775" crc="e6451e66" sha1="1b1096501add7f3c4cfe4a0316644fa9e02c343d"/>
 		-->
 		<description>Mahjong de Pon!</description>
 		<year>1994</year>
 		<publisher>アクティブ (Active)</publisher>
+		<info name="serial" value="2TD-3013"/>
+		<info name="alt_title" value="麻雀でPON！" />
 		<info name="release" value="199404xx" />
 		<part name="cdrom" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="mahjong de pon" sha1="58c4ae95a830294baa1a448c328d53c1d0a6002b" />
+				<disk name="mahjong de pon (japan)" sha1="a6332b3d1f893621f25f035b538cb14a6e5d946e" />
 			</diskarea>
 		</part>
 	</software>
@@ -3073,6 +3411,26 @@
 		</part>
 	</software>
 
+	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
+	<software name="phobos">
+		<!--
+		Origin: redump.org
+		<rom name="Phobos (Japan).bin" size="109074000" crc="7d8a4ad6" sha1="04848bc5e17007c4422dab14934eef29dd50accc"/>
+		<rom name="Phobos (Japan).cue" size="80" crc="d4091963" sha1="b6ee8af14fbd01ad236d5523acb554ddd6141542"/>
+		-->
+		<description>Phobos</description>
+		<year>1995</year>
+		<publisher>姫屋ソフト (Himeya Soft)</publisher>
+		<info name="alt_title" value="フォボス" />
+		<info name="serial" value="HMS-0002"/>
+		<info name="release" value="199508xx" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="phobos (japan)" sha1="3ef091b02523c332e6c423b02618022a01b8a46b" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="photogen">
 		<!--
 		Origin: redump.org
@@ -3223,6 +3581,47 @@
 		</part>
 	</software>
 
+	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
+	<!-- Does an earlier PC-98-only release exist, like it does for the FM Towns? -->
+	<software name="prostudgr">
+		<!--
+		Origin: redump.org
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 01).bin" size="17578848" crc="1c135323" sha1="5ac9502fb8403ae6758bfb1987b307551c4aa64a"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 02).bin" size="39690000" crc="b90fdc51" sha1="1116aeaa041c448af34b50bf5a950ab2128094b6"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 03).bin" size="37044000" crc="5cf5891b" sha1="c9c5e3788cd0ca592ae48c99571504299faea51c"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 04).bin" size="34221600" crc="48d69882" sha1="5f0ef4164da83f9e6df3984101f2dc9e152924cd"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 05).bin" size="34927200" crc="8fab8c62" sha1="806a9e5ffe9a44a24a0b06f0daa1f4f2388b5ffa"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 06).bin" size="35280000" crc="d2c122fc" sha1="522fdc34d23fd590ea6104f03e3713cc2f17eaed"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 07).bin" size="38455200" crc="a406d437" sha1="d2ebee07144e231056a7f9322504c341b5492a66"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 08).bin" size="40219200" crc="b07efecc" sha1="4acc0e2854a467c4372232f0e75ef052dc254932"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 09).bin" size="40572000" crc="06cc5fa2" sha1="17413d5c3022bd3d9c0948475ac2f3bb60a34077"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 10).bin" size="42336000" crc="7e370915" sha1="bf8795c013c170c38439ebdf6aa99a96df97fe01"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 11).bin" size="36338400" crc="467afaa9" sha1="92dc0fad6abd5f96f8f140d6e18b4c4aa1c120ed"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 12).bin" size="35103600" crc="403e89ae" sha1="984441b0dca2bf82cb26ced130403b0be44aeb14"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 13).bin" size="38102400" crc="d328b087" sha1="302ef11c3a573abe7074ad8037fa5aef19cd6979"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 14).bin" size="36514800" crc="88a78af9" sha1="1fdf76aaf88357e0abd39931ecff4e60b5636ea3"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 15).bin" size="36162000" crc="0b6aefcc" sha1="d03e2ab593f0a3f4947141092d28d19b99e0473b"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 16).bin" size="37220400" crc="80292d1e" sha1="fb913d4512db6e1b54eb4b9f1dae3736f74f8f31"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 17).bin" size="7761600" crc="dd48a75c" sha1="c19375235bd173043baefa837f5c542eaf41d7d2"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 18).bin" size="9878400" crc="11683d0d" sha1="abd580333025a8abbb65a108d57f2bf71196153b"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 19).bin" size="9349200" crc="e419c606" sha1="fd3d6047d07cd4d0fddd22ec468068f4cc145944"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 20).bin" size="8996400" crc="3bc95efd" sha1="cbe9f1be6fd040c05b8837af4beaf2f201a34ba5"/>
+		<rom name="Pro Student G (Japan) (Rerelease) (Track 21).bin" size="9878400" crc="cbd9495f" sha1="916d94dfe84edc954d6a1a6b40051ba534bef120"/>
+		<rom name="Pro Student G (Japan) (Rerelease).cue" size="2670" crc="b270fa34" sha1="87898b38c2fe1ed83a633444408d4b1a69b4bb05"/>
+		-->
+		<description>Pro Student G (ALS-0010)</description>
+		<year>1994</year>
+		<publisher>アリスソフト (AliceSoft)</publisher>
+		<info name="serial" value="ALS-0010"/>
+		<info name="alt_title" value="ぷろすちゅーでんとG" />
+		<info name="release" value="199407xx" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="pro student g (japan) (rerelease)" sha1="11bc5195ccaf557fe17a349eb8284c78e08e29ac" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="psydet1">
 		<!--
 		Origin: Neo Kobe Collection
@@ -3720,11 +4119,9 @@
 
 	<software name="saintdia">
 		<!--
-		Origin: P2P
-		<rom name="Image.cdm" size="844" crc="51d2e30a" sha1="e080d6fbd0d2c181fd303e2a89d997d65158809f"/>
-		<rom name="Image.cue" size="71" crc="b496048a" sha1="8590392ca153b7559d50bef2f83defc45e315624"/>
-		<rom name="Image.img" size="17835216" crc="7942b16b" sha1="607c6633b8c4b62e9e34fc3a5b7a9456dc08c466"/>
-		<rom name="Image.sub" size="727968" crc="3ee737d5" sha1="93f010ad0dd73881df678910b46af696fd906005"/>
+		Origin: redump.org
+		<rom name="Saint Diary - Kiyoka-chan no Nikki (Japan).bin" size="17835216" crc="7942b16b" sha1="607c6633b8c4b62e9e34fc3a5b7a9456dc08c466"/>
+		<rom name="Saint Diary - Kiyoka-chan no Nikki (Japan).cue" size="108" crc="effe090b" sha1="91224feb75754c839b40fa2d7fbb8de5f70440a7"/>
 		-->
 		<description>Saint Diary - Kiyoka-chan no Nikki</description>
 		<year>1996</year>
@@ -3733,7 +4130,7 @@
 		<info name="release" value="19951129" />
 		<part name="cdrom" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="saintdia" sha1="6739b5d1454abfbf0bda6a6cc82f2b7e5b19af66" />
+				<disk name="saint diary - kiyoka-chan no nikki (japan)" sha1="832e546c489a29c3986c8a7022a3de43b229ea1f" />
 			</diskarea>
 		</part>
 	</software>
@@ -4135,19 +4532,34 @@
 	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
 	<software name="takamiza">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Takamizawa Kyosuke - Nekketsu!! Kyouiku Kenshuu.ccd" size="3627" crc="523d5414" sha1="38a3d547c0c351e201fb2faa2f4fe05080d81b01"/>
-		<rom name="Takamizawa Kyosuke - Nekketsu!! Kyouiku Kenshuu.cue" size="703" crc="81f0c8ab" sha1="f0bc997d4643da5ebb15341f67981507587eac16"/>
-		<rom name="Takamizawa Kyosuke - Nekketsu!! Kyouiku Kenshuu.img" size="445943904" crc="0f83a769" sha1="b417cc433d6946ea6939e4f80b722bccb038318f"/>
-		<rom name="Takamizawa Kyosuke - Nekketsu!! Kyouiku Kenshuu.sub" size="18201792" crc="1412cb19" sha1="28071814e73145f6e9ca4eb16a1704fb00ab6109"/>
+		Origin: redump.org
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 01).bin" size="20102544" crc="832bed19" sha1="9c4cbe6becd6fea4132272fa248f5d56e89e81b4"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 02).bin" size="28823760" crc="ce63facb" sha1="0b1149d646b2ba1e3ddd964e4bfd9e12afc12760"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 03).bin" size="20156640" crc="59930c20" sha1="57021c3c3a78563781ecf821c934370266b9713d"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 04).bin" size="20749344" crc="f9a3b0a8" sha1="05aa07e7975d94f2f0ad0f6a7f3df9d33626aafe"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 05).bin" size="46541376" crc="9f8329c1" sha1="00ba11f3a71eb06685f9fbe413dd77505cf8b711"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 06).bin" size="40588464" crc="6ddef2fc" sha1="24c461e4e7c7dded805b9780ab5eb8b6acd5adcd"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 07).bin" size="21494928" crc="2fc2ce13" sha1="f3bcc2e4b334789d1c8f5ace580115053fc0ca32"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 08).bin" size="31192224" crc="02f0f767" sha1="e6ce9baeed1c64af659f9052c69884e2fb86c1bf"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 09).bin" size="33306672" crc="ffe687f0" sha1="43e3a8b72bac68047d102001744556d0becd67cf"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 10).bin" size="22635648" crc="0e457432" sha1="89b6dc8e48f1b3fe92e78bd62a8a9999d7a4363a"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 11).bin" size="29409408" crc="47470780" sha1="347b4990229d0ff3488f2cc983d3131670abc982"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 12).bin" size="13041840" crc="b48c1cfb" sha1="10b08a89fd05f3259f1cc943c0ba9fbfc0a280d8"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 13).bin" size="24639552" crc="ed3cf802" sha1="6273117073394d97c89951f78ee870136083e5f1"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 14).bin" size="26561136" crc="d54c846a" sha1="a98602c43700d3760a449ab7b86acb72043acd07"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 15).bin" size="41479872" crc="2bb60608" sha1="0bcc4687750a3c97c3dec466d7f1969ed54dae40"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan) (Track 16).bin" size="25220496" crc="d33f8f34" sha1="4b689062806241de217dab4f2894847c28d9db26"/>
+		<rom name="Takamizawa Kyousuke Nekketsu!! Kyouiku Kenshuu (Japan).cue" size="2044" crc="6d9055b2" sha1="9e9161f54a5f3fdc832a1ef17d12fae82740c3a7"/>
 		-->
-		<description>Takamizawa Kyosuke - Nekketsu!! Kyouiku Kenshuu</description>
+		<description>Takamizawa Kyousuke - Nekketsu!! Kyouiku Kenshuu</description>
 		<year>1995</year>
 		<publisher>ジックス (ZyX)</publisher>
+		<info name="serial" value="ZYX-0002"/>
+		<info name="alt_title" value="高見沢恭介 熱血！！教育研修" />
 		<info name="release" value="199501xx" />
 		<part name="cdrom" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="takamizawa kyosuke - nekketsu kyouiku kenshuu" sha1="ce13831f3094f9ab53c392480ece497c9b3c7997" />
+				<disk name="takamizawa kyousuke nekketsu kyouiku kenshuu (japan)" sha1="c221b1b63f145650bff7f050cc7040d5cb794887" />
 			</diskarea>
 		</part>
 	</software>
@@ -4336,12 +4748,9 @@
 
 	<software name="tunedhrt">
 		<!--
-		Origin: Neo Kobe Collection
-		CCD converted to CUE with GNU ccd2cue
-		<rom name="Tuned Heart.ccd" size="769" crc="dbe8ffa6" sha1="cee4b22d9ee44f5a6991066a7b2029e60e2b119d"/>
-		<rom name="Tuned Heart.cue" size="73" crc="b24bd492" sha1="e80940cadc9e028df3a76dc1113404cf644dc3e3"/>
-		<rom name="Tuned Heart.img" size="99155616" crc="99bd1f7a" sha1="751a1d740446cf2d591acca5888eb1ea4b0fb186"/>
-		<rom name="Tuned Heart.sub" size="4047168" crc="51cb456d" sha1="da7807fe854d60225e06d01ae9abe548c4499a77"/>
+		Origin: redump.org
+		<rom name="Tuned Heart (Japan).bin" size="99155616" crc="99bd1f7a" sha1="751a1d740446cf2d591acca5888eb1ea4b0fb186"/>
+		<rom name="Tuned Heart (Japan).cue" size="85" crc="c701d867" sha1="a6f8f522d934240520f0b57865af7328688e1708"/>
 		-->
 		<description>Tuned Heart</description>
 		<year>1996</year>
@@ -4351,7 +4760,7 @@
 		<info name="usage" value="Requires serial number printed on registration card"/>
 		<part name="cdrom" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="tuned heart" sha1="8022484f60e7afe9c348b7f1a979766968c9400f" />
+				<disk name="tuned heart (japan)" sha1="8022484f60e7afe9c348b7f1a979766968c9400f" />
 			</diskarea>
 		</part>
 	</software>
@@ -4378,19 +4787,23 @@
 	<!-- Hangs at the text / voice selection screen -->
 	<software name="vastness" supported="no">
 		<!--
-		Origin: Neo Kobe Collection
-		<rom name="Vastness.ccd" size="1525" crc="41bb06da" sha1="764c09836fc45e09f6efe47ed2b9da4c49a97e7f"/>
-		<rom name="Vastness.cue" size="228" crc="e8656a96" sha1="193c31c0fa10f79dd7c2601bf42bb764edb2d353"/>
-		<rom name="Vastness.img" size="463666224" crc="ff249f28" sha1="21c024c9f4bc2fcfaadf84072e094998facad4a7"/>
-		<rom name="Vastness.sub" size="18925152" crc="1f3a4a5d" sha1="7d26e94d29997ae4c1f204a143194c9a08c74860"/>
+		Origin: redump.org
+		<rom name="Vastness - Kuukyo no Ikenie-tachi (Japan) (Track 1).bin" size="10231200" crc="ca6a503d" sha1="688f246987699717d7a3caa49914c34e5c2637ec"/>
+		<rom name="Vastness - Kuukyo no Ikenie-tachi (Japan) (Track 2).bin" size="5731824" crc="65e978bf" sha1="3bbb11f1180f0985225e774a6664badeb11fbd51"/>
+		<rom name="Vastness - Kuukyo no Ikenie-tachi (Japan) (Track 3).bin" size="232466976" crc="befe530a" sha1="99717ae81e6b5dc9b7f09bfdd7ed14f541f90428"/>
+		<rom name="Vastness - Kuukyo no Ikenie-tachi (Japan) (Track 4).bin" size="123978624" crc="dbd4fc08" sha1="af28b6e43f566c5d07d9af67826cbec7a379c4c7"/>
+		<rom name="Vastness - Kuukyo no Ikenie-tachi (Japan) (Track 5).bin" size="91257600" crc="2ce807e4" sha1="8a25b2ddd808f4403a854e3d9db0f92464ca3052"/>
+		<rom name="Vastness - Kuukyo no Ikenie-tachi (Japan).cue" size="657" crc="aad2990f" sha1="4e750c468bccb248fab521e20a4d55a422b5490d"/>
 		-->
 		<description>Vastness - Kuukyo no Ikenie-tachi</description>
-		<year>1994</year>
+		<year>1995</year>
 		<publisher>CD Bros.</publisher>
-		<info name="release" value="19940422" />
+		<info name="serial" value="HMF-132 / CB-001"/>
+		<info name="alt_title" value="ヴアーストニス 空虚の生贄達" />
+		<info name="release" value="199502xx" />
 		<part name="cdrom" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="vastness" sha1="12d1fbe66e92cd580616814077eebb402d4e0332" />
+				<disk name="vastness - kuukyo no ikenie-tachi (japan)" sha1="bd8b85316d31bbe6efc543ef9c5fbf2e3a7b02d7" />
 			</diskarea>
 		</part>
 	</software>
@@ -4537,22 +4950,61 @@
 	</software>
 
 	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
+	<software name="yeshg">
+		<!--
+		Origin: redump.org
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 01).bin" size="265220928" crc="cc93d1fe" sha1="a8225d3549ba99aeb0696503ad8ba382c744e8a7"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 02).bin" size="31681440" crc="f1895c66" sha1="fa365fdf0aab278c77c5a1ad7d01ed73588e37e5"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 03).bin" size="29153040" crc="66458fe7" sha1="9ea60b9228171cdfe8b3d43927274e53fc0998fa"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 04).bin" size="24108000" crc="a7c1d463" sha1="3f41bc0e27ba089c0d58af4acd3f0b8e5fb1b404"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 05).bin" size="24681888" crc="ee1b1cc0" sha1="becd261a5ccf758371850832f0535b33ac3c3d8b"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 06).bin" size="32022480" crc="41224dae" sha1="5d183e42b301f3090e1ebc3a6ef099b5df68c1e6"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 07).bin" size="32676336" crc="9a87018a" sha1="240ab5985db6a447767e9dddee40e9653dc7aa5c"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 08).bin" size="35028336" crc="6316956e" sha1="f06cdd56c093157afff51d782c0a4b83ccefae5c"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 09).bin" size="43956528" crc="9b5a41eb" sha1="f8c83a2f3af2630c7d75ace7ff82f4296a1c9ca7"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 10).bin" size="28515648" crc="21095ba9" sha1="04cc52a6102666dd991c6affa4df84a40a572fb1"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan) (Track 11).bin" size="24919440" crc="8b9f2552" sha1="6872b88379d3688ad68fad2e3e7cfde836df70e9"/>
+		<rom name="YES! HG - Erotic Voice Version (Japan).cue" size="1238" crc="1f9dbaf4" sha1="f75cf01ff1292bbd61d71ac749e896cce1283b99"/>
+		-->
+		<description>YES! HG - Erotic Voice Version</description>
+		<year>1995</year>
+		<publisher>姫屋ソフト (Himeya Soft)</publisher>
+		<info name="release" value="199512xx" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="yes hg - erotic voice version (japan)" sha1="1973d5e32f50ada90f093203de09c87b51af489d" />
+			</diskarea>
+		</part>
+	</software>
+
+	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
 	<software name="yojusen2">
 		<!--
-		Origin: P2P
-		<rom name="Image.cdm" size="3205" crc="ca4446d3" sha1="8028e2647ef572de3dcf27ce5332f7ca00530a42"/>
-		<rom name="Image.cue" size="586" crc="b6b20ac9" sha1="b8bc72b8d909546d1078b1921ec04f526e746e3a"/>
-		<rom name="Image.img" size="649808208" crc="16f70c96" sha1="29b587dbcdaae2d471b7c13c1ce5c5825bc86eaf"/>
-		<rom name="Image.sub" size="26522784" crc="af8cb6ad" sha1="f77df38b35d73e8bc3e20033a8878af0e9c03ea8"/>
+		Origin: redump.org
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 01).bin" size="245104272" crc="eaf647b7" sha1="cd8ad09cfbd77af4bdc14c87cf3a40f95d5693e0"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 02).bin" size="27421968" crc="01ffa5b8" sha1="fb6f409029df70a25b91cf63fddd15f22f57618f"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 03).bin" size="21304416" crc="a8a49409" sha1="6a4fa97b448e00e7a0f3aca1c8b1b8fbf8fb3d70"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 04).bin" size="29240064" crc="8e56a2d5" sha1="00eca09b1c442e4ca6047511650974b5b22e3aa8"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 05).bin" size="31634400" crc="547bec0d" sha1="5167d5ee996ed8db4094c73e8b240ff38a978e7f"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 06).bin" size="41877360" crc="1b56f87a" sha1="00343ee6bb85f4af0f55cfc554324383d14647bc"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 07).bin" size="37817808" crc="e0009c74" sha1="1f49b162cf913429530d007483246f7ff27b3e05"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 08).bin" size="30418416" crc="d2031484" sha1="83190a6ec4773b857ec8f8c45eb32e24906f5821"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 09).bin" size="29000160" crc="77290d48" sha1="11587e4fef756f033a9507c9a89fee8d4336e137"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 10).bin" size="41778576" crc="b1ed8767" sha1="53f36fe9ca460f980a66502856b46eaab48d612a"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 11).bin" size="40562592" crc="6090e013" sha1="021fd651bb35cb76b71e5ca90dfa8df3ea2a8b27"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 12).bin" size="43001616" crc="5d47a747" sha1="55a4b0925d0a52c24248fe864c0892dcf8df2d6a"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan) (Track 13).bin" size="30646560" crc="1241e2db" sha1="c189de3cb6bf93d1b90159499cd35611faeb9f0e"/>
+		<rom name="Youjuu Senki 2 - Reimei no Senshi-tachi (Japan).cue" size="1575" crc="ebb77713" sha1="881d04c4e6938dd301f3acfdf9139f2a56a9e000"/>
 		-->
-		<description>Youjuu Senki 2 - Reimei no Senshi</description>
+		<description>Youjuu Senki 2 - Reimei no Senshi-tachi</description>
 		<year>1993</year>
 		<publisher>ディー・オー (D.O.)</publisher>
-		<info name="alt_title" value="妖獣戦記2 黎明の戦士" />
+		<info name="serial" value="DCD-0011"/>
+		<info name="alt_title" value="妖獣戦記2 黎明の戦士たち" />
 		<info name="release" value="199402xx" />
 		<part name="cdrom" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="yojusen2" sha1="219f6731e9960291832df99d43ee52ab5d62bc52" />
+				<disk name="youjuu senki 2 - reimei no senshi-tachi (japan)" sha1="365c5e7983cc3aa59a97992035c6ddf76a86ab6e" />
 			</diskarea>
 		</part>
 	</software>
@@ -4633,6 +5085,35 @@
 		</part>
 	</software>
 
+	<software name="yuurou">
+		<!--
+		Origin: redump.org
+		<rom name="Yuurou - Transient Sands (Japan) (Track 01).bin" size="9692592" crc="d9ba2d44" sha1="5bd16e87e901cd6465bea1147f994385e781a220"/>
+		<rom name="Yuurou - Transient Sands (Japan) (Track 02).bin" size="24646608" crc="6ed9d4a8" sha1="b81ed5b12134e6dca61fb1ae504fa162c5bb1e00"/>
+		<rom name="Yuurou - Transient Sands (Japan) (Track 03).bin" size="27748896" crc="9d201cd9" sha1="0d84ec092a04d2606ccb050cf752bd9fad0771f9"/>
+		<rom name="Yuurou - Transient Sands (Japan) (Track 04).bin" size="30778272" crc="2eff4221" sha1="33c58519ff49462640a5cc1550741ebdd23f5216"/>
+		<rom name="Yuurou - Transient Sands (Japan) (Track 05).bin" size="34186320" crc="3ff623d6" sha1="e03f0cd19c42854db1b5bef4d5bbb6ff0655ca47"/>
+		<rom name="Yuurou - Transient Sands (Japan) (Track 06).bin" size="29402352" crc="c602ab34" sha1="4b88fd808d4374566a52f5600596d50838d56a71"/>
+		<rom name="Yuurou - Transient Sands (Japan) (Track 07).bin" size="25307520" crc="754ccd21" sha1="a74ff68fa263a864224faab3f2b479d7bffdf287"/>
+		<rom name="Yuurou - Transient Sands (Japan) (Track 08).bin" size="37594368" crc="914c956e" sha1="381c612b6e6ed93f5ceed0e8e862268ef9a73bdb"/>
+		<rom name="Yuurou - Transient Sands (Japan) (Track 09).bin" size="22473360" crc="cce1174e" sha1="a3db27b848d7f28878b54f9e749ab2d7d527a6da"/>
+		<rom name="Yuurou - Transient Sands (Japan) (Track 10).bin" size="40101600" crc="81be03c8" sha1="0c298381596f3db6d29cf85dcfa086417190a441"/>
+		<rom name="Yuurou - Transient Sands (Japan) (Track 11).bin" size="60286464" crc="973707d0" sha1="b5759889837273dd41c986da8abbcc10305ecf7c"/>
+		<rom name="Yuurou - Transient Sands (Japan) (Track 12).bin" size="31728480" crc="aff2af6a" sha1="d0fc0074588d5b8d3b33d70c107abf0df0efc2de"/>
+		<rom name="Yuurou - Transient Sands (Japan).cue" size="1506" crc="58b35d82" sha1="4fcc41af9c7c63a9383c167af03e8bd90a2eaae9"/>
+		-->
+		<description>Yuurou - Transient Sands</description>
+		<year>1996</year>
+		<publisher>ハーベスト (Hervest)</publisher>
+		<info name="alt_title" value="憂楼 　－Ｔｒａｎｓｉｅｎｔ　Ｓａｎｄｓ－" />
+		<info name="release" value="19960802" />
+		<part name="cdrom" interface="cdrom">
+			<diskarea name="cdrom">
+				<disk name="yuurou - transient sands (japan)" sha1="07d11d70d7f06321a3695a75edf3d9b617e980b2" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="zaimeta">
 		<!--
 		Origin: Unknown
@@ -4671,19 +5152,32 @@
 		</part>
 	</software>
 
+	<!-- PC-98x1 / FM Towns hybrid, also included in fmtowns_cd.xml -->
 	<software name="zenith">
 		<!--
-		 Origin: peter_j (Super Lonely Terminal)
-		 <rom name="zenith_cd.bin" size="634910640" crc="5810c93d" sha1="79c092a48ae49ae81414631eee6678fef1603931"/>
-		 <rom name="zenith_cd.cue" size="547" crc="4f1d0d78" sha1="7e5f0ad7f3e3b43ad52a628de191cc789e6ff51f"/>
-		 -->
+		Origin: redump.org
+		<rom name="Animation Zenith (Japan) (Track 01).bin" size="42253680" crc="57313645" sha1="db347eeb7b89001e4c4823b9e9ab99183a042558"/>
+		<rom name="Animation Zenith (Japan) (Track 02).bin" size="71893584" crc="0c118374" sha1="6dea000ab14066e3eecef5a37f96af19e53c6e19"/>
+		<rom name="Animation Zenith (Japan) (Track 03).bin" size="67761120" crc="e26102e4" sha1="373fc9d93256b126c88f72816626c9a63fbc7db7"/>
+		<rom name="Animation Zenith (Japan) (Track 04).bin" size="66528672" crc="8d800702" sha1="9c133dc99ec8ed72c2a5194a1665385a33915b53"/>
+		<rom name="Animation Zenith (Japan) (Track 05).bin" size="69177024" crc="08b90269" sha1="2d0150bb0b3f124e67ff77159535bcc706cd5f00"/>
+		<rom name="Animation Zenith (Japan) (Track 06).bin" size="78493296" crc="f835785a" sha1="28be5e63f35aa9037c1e5aaabaa67d62a04abb97"/>
+		<rom name="Animation Zenith (Japan) (Track 07).bin" size="77653632" crc="dffc1548" sha1="b43d67a4dbbfcb295ab66b0f8c7efbdd0edb328a"/>
+		<rom name="Animation Zenith (Japan) (Track 08).bin" size="39610032" crc="1b36ee9f" sha1="642cf720f6c302e443f13b6416b84b4cdf5e0bf3"/>
+		<rom name="Animation Zenith (Japan) (Track 09).bin" size="27981744" crc="e81f8d36" sha1="1f15ba82a16fc749fea01fce95613e50d5f115b6"/>
+		<rom name="Animation Zenith (Japan) (Track 10).bin" size="26140128" crc="61430506" sha1="8f7c96d14614904f4060b4d63d6167270010a468"/>
+		<rom name="Animation Zenith (Japan) (Track 11).bin" size="23870448" crc="86a01836" sha1="c56edc34a923f3d22d16df8ca555f86dedc35d1d"/>
+		<rom name="Animation Zenith (Japan) (Track 12).bin" size="43900080" crc="0e891e7d" sha1="aef3c7caa61e937c05253e3873c5da2af2c9d848"/>
+		<rom name="Animation Zenith (Japan).cue" size="1180" crc="00ecc2e4" sha1="a7398fd40a67d4c494b3030992241852c92183b9"/>
+		-->
 		<description>Zenith - Full Animation Adventure Series #1</description>
-		<year>1994</year>
+		<year>1995</year>
 		<publisher>姫屋ソフト (Himeya Soft)</publisher>
 		<info name="alt_title" value="ゼニス" />
+		<info name="release" value="199502xx" />
 		<part name="cdrom" interface="cdrom">
 			<diskarea name="cdrom">
-				<disk name="zenith_cd" sha1="3288b12f463e0df371804ff0db38546a452217f0"/>
+				<disk name="animation zenith (japan)" sha1="c99f1b2db763f5e0eaf48cb5726351a81d2fd916" />
 			</diskarea>
 		</part>
 	</software>
diff -Nru mame-0.222+dfsg.1/hash/pc98.xml mame-0.224+dfsg.1/hash/pc98.xml
--- mame-0.222+dfsg.1/hash/pc98.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/pc98.xml	2020-08-26 08:57:19.000000000 +0000
@@ -7762,9 +7762,10 @@
 		<publisher>アスキー (ASCII)</publisher>
 		<info name="alt_title" value="ボンバーマン ぱにっくボンバー" />
 		<info name="release" value="19950405" />
+		<!-- was mislabeled as hldrun clone -->
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1281968">
-				<rom name="panicbom.d88" size="1281968" crc="f972bd7b" sha1="5eb1125a2b1906b66b05f9da91bf9e4e7767032f" offset="0" />
+				<rom name="loderun.d88" size="1281968" crc="7c3e3f7e" sha1="3df6f8d37240b2af4ac01da2d6d7efd6c61c9bdf" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -9830,19 +9831,19 @@
 		<info name="alt_title" value="ファーサイドムーン 地球防衛軍２" />
 		<info name="release" value="198912xx" />
 		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="Disk A"/>
+			<feature name="part_id" value="System Disk"/>
 			<dataarea name="flop" size="1281968">
 				<rom name="fsmoon_a.d88" size="1281968" crc="2ae11d3d" sha1="a073d584a5878c321232870265407211ada3ab7b" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="Disk B"/>
+			<feature name="part_id" value="Game Disk"/>
 			<dataarea name="flop" size="1281968">
 				<rom name="fsmoon_b.d88" size="1281968" crc="35cfd3f6" sha1="fbb5d6b5fde402a6ee7c5b7a2ee28400a5fc9ebb" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_5_25">
-			<feature name="part_id" value="Disk C"/>
+			<feature name="part_id" value="Data Disk"/>
 			<dataarea name="flop" size="1281968">
 				<rom name="fsmoon_c.d88" size="1281968" crc="c665c4bc" sha1="61ae5578512429235f3c96d83487af93a481a6da" offset="0" />
 			</dataarea>
@@ -18482,7 +18483,9 @@
 		<publisher>スペクトラムホロバイトジャパン (Spectrum HoloByte Japan)</publisher>
 		<info name="alt_title" value="Ｆ－１１７Ａ ナイトホーク" />
 		<info name="release" value="19950715" />
+		<info name="usage" value="Requires HDD installation and a manual-based copy protection check. Run INSTALL.BAT from DOS." />
 		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 1"/>
 			<dataarea name="flop" size="1261568">
 				<rom name="f117a_1.hdm" size="1261568" crc="32871147" sha1="e7a4201b4f25f6dd86c3a09e4bdae8ecea4868fd" offset="0" />
 			</dataarea>
@@ -18507,14 +18510,60 @@
 		<publisher>マイクロプローズジャパン (MicroProse Japan)</publisher>
 		<info name="alt_title" value="Ｆ－１４ フリートディフェンダー" />
 		<info name="release" value="19950223" />
+		<info name="usage" value="Requires HDD installation and a PC-9821 computer. Run INSTALL.EXE from DOS." />
 		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="1265664">
-				<rom name="main.fdi" size="1265664" crc="2fde239e" sha1="4bcc668fc283cb5cfc666e57cf3123eb70f7fa03" offset="0" />
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="f-14 fleet defender (disk a).hdm" size="1261568" crc="d6dd831b" sha1="86074cdfa1da60a798570b2a99466e354cbb981e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="f-14 fleet defender (disk b).hdm" size="1261568" crc="f6b21969" sha1="ee3eab667c64e8f12f13d294cdf3dd046630da3a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk C"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="f-14 fleet defender (disk c).hdm" size="1261568" crc="71198865" sha1="c592d76349574b2a3f33af6a471e7cba9af64e08" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk D"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="f-14 fleet defender (disk d).hdm" size="1261568" crc="5594025a" sha1="d016b72f48642c74b3fafdcddd7cc6815d2de6fe" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_id" value="Disk E"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="f-14 fleet defender (disk e).hdm" size="1261568" crc="15ed1186" sha1="71067a76b17f451698322c7d9cb2056d272e04be" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_5_25">
+			<feature name="part_id" value="Disk F"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="f-14 fleet defender (disk f).hdm" size="1261568" crc="6ca575d1" sha1="71a01332a03165b62fc5df012f902684c0bebbd6" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="f15se2">
+	<software name="f15se">
+		<description>F-15 Strike Eagle</description>
+		<year>1989</year>
+		<publisher>システムソフト (SystemSoft)</publisher>
+		<info name="alt_title" value="Ｆ－１５ ストライクイーグル" />
+		<info name="release" value="198905xx" />
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="1261568">
+				<rom name="f-15 strike eagle.hdm" size="1261568" crc="7a4d0eac" sha1="c843bdbfdb5aa2982df79909fd8dd863098c7a05" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<!-- Graphical glitches -->
+	<software name="f15se2" supported="partial">
 		<description>F-15 Strike Eagle II</description>
 		<year>1990</year>
 		<publisher>マイクロプローズジャパン (MicroProse Japan)</publisher>
@@ -18534,13 +18583,14 @@
 		</part>
 	</software>
 
-<!-- for pc9821? 256 colors? -->
-	<software name="f15se256">
+	<!-- Graphical glitches -->
+	<software name="f15se256" supported="partial">
 		<description>F-15 Strike Eagle II 256</description>
 		<year>1993</year>
 		<publisher>マイクロプローズジャパン (MicroProse Japan)</publisher>
 		<info name="alt_title" value="Ｆ－１５ ストライクイーグル２ ２５６" />
 		<info name="release" value="19931112" />
+		<info name="usage" value="Requires a PC-9821 computer" />
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
 			<dataarea name="flop" size="1265664">
@@ -18568,6 +18618,7 @@
 		</part>
 	</software>
 
+	<!-- Any answer will pass the manual protection check. Probably cracked. -->
 	<software name="f19sf">
 		<description>F-19 Stealth Fighter</description>
 		<year>1992</year>
@@ -18582,7 +18633,7 @@
 	</software>
 
 	<software name="f29ret">
-		<description>F29 Retaliator</description>
+		<description>F29 Retaliator (1992-10-15)</description>
 		<year>1992</year>
 		<publisher>イマジニア (Imagineer)</publisher>
 		<info name="alt_title" value="Ｆ２９ リタリエイター" />
@@ -18601,8 +18652,49 @@
 		</part>
 	</software>
 
-	<software name="faara">
-		<description>Faara no Toki Kekkai</description>
+	<software name="f29reto" cloneof="f29ret">
+		<description>F29 Retaliator (1992-10-10)</description>
+		<year>1992</year>
+		<publisher>イマジニア (Imagineer)</publisher>
+		<info name="alt_title" value="Ｆ２９ リタリエイター" />
+		<info name="release" value="19921030" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 1"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="f29 retaliator (disk 1).hdm" size="1261568" crc="ad51c929" sha1="a0aec807ab38e5e58abbb29ac74a6fba6487d04d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 2"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="f29 retaliator (disk 2).hdm" size="1261568" crc="97674e37" sha1="9723d2b23744fb10ae8a4a3babd7a358c2c9a9ab" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<!-- Disk I/O Error -->
+	<software name="faires" supported="no">
+		<description>Fairie's Residence</description>
+		<year>1984</year>
+		<publisher>チャンピオンソフト (Champion Soft)</publisher>
+		<info name="alt_title" value="フェアリーズレジデンス" />
+		<info name="release" value="198412xx" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="697008">
+				<rom name="fairie's residence (disk a).d88" size="697008" crc="7fb640bd" sha1="b3b63fcb0e6bf2a3cc076a59c4183b8dcd65cdc9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="697008">
+				<rom name="fairie's residence (disk b).d88" size="697008" crc="5832b2ec" sha1="740e97d1501240c495611617c04119299317398b" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="falla">
+		<description>Falla no Jikekkai</description>
 		<year>1991</year>
 		<publisher>ハートソフト (Heart Soft)</publisher>
 		<info name="alt_title" value="ファーラの時結界" />
@@ -18621,7 +18713,8 @@
 		</part>
 	</software>
 
-	<software name="fairytal">
+	<!-- Black screen on boot -->
+	<software name="fairytal" supported="no">
 		<description>Fairytale</description>
 		<year>1987</year>
 		<publisher>フェアリーテール (Fairytale)</publisher>
@@ -18667,6 +18760,7 @@
 		<publisher>きんぷくりん (Kinpukurin)</publisher>
 		<info name="alt_title" value="ファルアディア" />
 		<info name="release" value="19940428" />
+		<info name="usage" value="The first time playing the game insert a blank disk on drive B: to create the user disk, otherwise the intro will just loop endlessly" />
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="System Disk"/>
 			<dataarea name="flop" size="1265664">
@@ -18685,12 +18779,6 @@
 				<rom name="disk_b.fdi" size="1265664" crc="414ac632" sha1="f9ca271e5af3d6725678732b49bbdf9de322f55b" offset="0" />
 			</dataarea>
 		</part>
-		<part name="flop4" interface="floppy_5_25">
-			<feature name="part_id" value="User Disk"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="user.fdi" size="1265664" crc="b155e1e3" sha1="f64ebb69f8ad7b897309a6fed76a4277a6eb582d" offset="0" status="baddump" />
-			</dataarea>
-		</part>
 	</software>
 
 	<software name="falcomcg">
@@ -18713,26 +18801,6 @@
 		</part>
 	</software>
 
-	<software name="falcomcga" cloneof="falcomcg">
-		<description>Falcom Character CG (Alt Format)</description>
-		<year>1990</year>
-		<publisher>タケル (Takeru)</publisher>
-		<info name="alt_title" value="ファルコムキャラクターＣＧ" />
-		<info name="release" value="19901208" />
-		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="System Disk"/>
-			<dataarea name="flop" size="1281968">
-				<rom name="falcomcharacg_sys.d88" size="1281968" crc="4b3cb685" sha1="a363b982f269e495eabf38d57a082a94afd65a7b" offset="0" />
-			</dataarea>
-		</part>
-		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="Data Disk"/>
-			<dataarea name="flop" size="1281968">
-				<rom name="falcomcharacg_dat.d88" size="1281968" crc="f5550b93" sha1="71fc84bff8ea2b723c23c571d6f62cc1371aa9a8" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="fall">
 		<description>Fall</description>
 		<year>1991</year>
@@ -18753,7 +18821,8 @@
 		</part>
 	</software>
 
-	<software name="fantsian">
+	<!-- Fatal error: Incorrect layout on track 1 head 0, expected_size=100000, current_size=103104 -->
+	<software name="fantsian" supported="no">
 		<description>Fantasian</description>
 		<year>1985</year>
 		<publisher>クリスタルソフト (Xtal Soft)</publisher>
@@ -18765,6 +18834,51 @@
 		</part>
 	</software>
 
+	<!-- Black screen on boot -->
+	<software name="farce" supported="no">
+		<description>Farce - Yuuwaku Hakusho</description>
+		<year>1994</year>
+		<publisher>ソフトウェアハウスぱせり (Software House Parsley)</publisher>
+		<info name="alt_title" value="ファルス 誘惑白書" />
+		<info name="release" value="19941213" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farce - yuuwaku hakusho (disk a).hdm" size="1261568" crc="56ef00e6" sha1="8ab6551ab7ee782902983d8f0502b6b568dc1296" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farce - yuuwaku hakusho (disk b).hdm" size="1261568" crc="d82638bc" sha1="bc3ad6e47a16dcae46a58cfadd7a37d6a2b1d391" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk C"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farce - yuuwaku hakusho (disk c).hdm" size="1261568" crc="5404654d" sha1="02c4094bb2cb5bd71d3ba9028f773c24cfdb4717" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk D"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farce - yuuwaku hakusho (disk d).hdm" size="1261568" crc="2bf8cdce" sha1="a2ffdf28d8665463ae79dec8ba7ae70396014e6d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_id" value="Disk E"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farce - yuuwaku hakusho (disk e).hdm" size="1261568" crc="24fbe49b" sha1="07b40fb8dbf29e41f33e2b993127a8b62cec224b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_5_25">
+			<feature name="part_id" value="Disk F"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farce - yuuwaku hakusho (disk f).hdm" size="1261568" crc="650b3b9f" sha1="2c62986ca3274295fcdfc4829b5bfd185473114e" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="farland">
 		<description>Farland Story - Tooi Kuni no Monogatari</description>
 		<year>1993</year>
@@ -18797,7 +18911,8 @@
 		</part>
 	</software>
 
-	<software name="farland4">
+	<!-- Doesn't recognize disk changes -->
+	<software name="farland4" supported="no">
 		<description>Farland Story - Hakugin no Tsubasa</description>
 		<year>1994</year>
 		<publisher>テイジイエル (TGL)</publisher>
@@ -18835,22 +18950,172 @@
 		</part>
 	</software>
 
-	<software name="fechi">
-		<description>Fechi</description>
+	<!-- Some graphical glitches during cutscenes, otherwise ok -->
+	<software name="farland6" supported="partial">
+		<description>Farland Story - Kamigami no Isan</description>
+		<year>1995</year>
+		<publisher>テイジイエル (TGL)</publisher>
+		<info name="alt_title" value="ファーランドストーリー 神々の遺産" />
+		<info name="release" value="19950721" />
+		<info name="usage" value="Requires HDD installation. Run SETUP.EXE from DOS (the installer doesn't work correctly with large hard drives)." />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - kamigami no isan (disk a).hdm" size="1261568" crc="29d98cdc" sha1="65415810d1cf5582c3bb2835e1299bd83e39fb0b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - kamigami no isan (disk b).hdm" size="1261568" crc="c955f681" sha1="d686aad451d92b8d56e01bb311d2d395e2a3e223" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk C"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - kamigami no isan (disk c).hdm" size="1261568" crc="199663a4" sha1="2147b15c27211ce65ba48b8e2f543f22ca81fb4f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk D"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - kamigami no isan (disk d).hdm" size="1261568" crc="0794497f" sha1="6bad957d0532e2e6bbe34af21c96a25db78e1ba6" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_id" value="Disk E"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - kamigami no isan (disk e).hdm" size="1261568" crc="4e15472c" sha1="590e045ee97eb2f9775c041a694ae1263d24cca9" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="farland7">
+		<description>Farland Story - Juuou no Akashi</description>
+		<year>1995</year>
+		<publisher>テイジイエル (TGL)</publisher>
+		<info name="alt_title" value="ファーランドストーリー 獣王の証" />
+		<info name="release" value="19951110" />
+		<info name="usage" value="Requires HDD installation, and the game manual to pass the protection check. Run SETUP.EXE from DOS (the installer doesn't work correctly with large hard drives)." />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - juuou no akashi (disk a) [alt 1].hdm" size="1261568" crc="b1ff8b82" sha1="30f3306449688e476a488dc984b2008608367e89" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - juuou no akashi (disk b).hdm" size="1261568" crc="a4af9652" sha1="166f5694b9c13a467b3cc3442eef42d570fa5bc4" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk C"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - juuou no akashi (disk c).hdm" size="1261568" crc="c12d5776" sha1="e5ba7a79f56a09e3001a701d27c1e76c7909c501" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk D"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - juuou no akashi (disk d).hdm" size="1261568" crc="64562c6a" sha1="3590661999505cb6668546eb79a526ee496d103b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_id" value="Disk E"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - juuou no akashi (disk e).hdm" size="1261568" crc="90461d9f" sha1="bf4adeda5c7111dfba6237f04a4700f221c6da99" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="farland7c" cloneof="farland7">
+		<description>Farland Story - Juuou no Akashi (cracked)</description>
+		<year>1995</year>
+		<publisher>テイジイエル (TGL)</publisher>
+		<info name="alt_title" value="ファーランドストーリー 獣王の証" />
+		<info name="release" value="19951110" />
+		<info name="usage" value="Requires HDD installation. Run SETUP.EXE from DOS (the installer doesn't work correctly with large hard drives)." />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - juuou no akashi (disk a).hdm" size="1261568" crc="5724df87" sha1="f8f1dd4d87146932663a71bd973e98e44a3aca59" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - juuou no akashi (disk b).hdm" size="1261568" crc="a4af9652" sha1="166f5694b9c13a467b3cc3442eef42d570fa5bc4" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk C"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - juuou no akashi (disk c).hdm" size="1261568" crc="c12d5776" sha1="e5ba7a79f56a09e3001a701d27c1e76c7909c501" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk D"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - juuou no akashi (disk d).hdm" size="1261568" crc="64562c6a" sha1="3590661999505cb6668546eb79a526ee496d103b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_id" value="Disk E"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="farland story - juuou no akashi (disk e).hdm" size="1261568" crc="90461d9f" sha1="bf4adeda5c7111dfba6237f04a4700f221c6da99" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="feti">
+		<description>Feti</description>
 		<year>1994</year>
 		<publisher>Cat's Pro.</publisher>
 		<info name="alt_title" value="ふぇち" />
 		<info name="release" value="19940318" />
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="fechi_1.fdi" size="1265664" crc="d77ef2aa" sha1="362dc44bd145879de77c20c4ad05d101a5141e84" offset="0" />
+			<dataarea name="flop" size="1261568">
+				<rom name="feti (fetish) (disk 1).hdm" size="1261568" crc="ed8606b0" sha1="d33c06cd8287a25941c508d3edbfc66e2e637875 " offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 2"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="fechi_2.fdi" size="1265664" crc="a0802ee0" sha1="c2970c7becd550ac5c8867492d73a31d6ace8d0f" offset="0" />
+			<dataarea name="flop" size="1261568">
+				<rom name="feti (fetish) (disk 2).hdm" size="1261568" crc="7f1fc198" sha1="24bccbdfe7f32d2230e5c9942ac748caebf9b48a" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="fermion">
+		<description>Fermion - Mirai kara no Houmonsha</description>
+		<year>1995</year>
+		<publisher>シルキーズ (Silky's)</publisher>
+		<info name="alt_title" value="フェルミオン ～未来からの訪問者～" />
+		<info name="release" value="19951222" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fermion (disk a).hdm" size="1261568" crc="847badeb" sha1="b5af3375766b6a685c5f51bd7d1289f0d0fd38ad" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fermion (disk b).hdm" size="1261568" crc="13b70644" sha1="8a62c5191d1f093793e75e29d0595427bfa0caf8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk C"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fermion (disk c).hdm" size="1261568" crc="c4cf042b" sha1="6d252df7645d9357a9d2d258fa983382583d9d2e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk D"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fermion (disk d).hdm" size="1261568" crc="313e6603" sha1="b5e38ad283b79cff0605152f3de6f53e0baf8379" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -18914,44 +19179,110 @@
 		</part>
 	</software>
 
-	<software name="filsnown">
+	<!-- The only difference between these sets is in the volume serial number of the disks; in this one it's zero, the other one has an actual number -->
+	<software name="figure">
+		<description>Figure - Ubawareta Houkago</description>
+		<year>1995</year>
+		<publisher>シルキーズ (Silky's)</publisher>
+		<info name="alt_title" value="フィギュア ～奪われた放課後～" />
+		<info name="release" value="19950929" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 1"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="figure (disk 1).hdm" size="1261568" crc="c7503855" sha1="c0dbd5e7b1f67dc65fe108d67475419fe379c917" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 2"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="figure (disk 2).hdm" size="1261568" crc="7402405b" sha1="ef277171c244c23532cfb8de269c85ac7b0e6a4b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 3"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="figure (disk 3).hdm" size="1261568" crc="c14bd4cc" sha1="91831385fd9638085311fe9eec3552bb8adaa7ed" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 4"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="figure (disk 4).hdm" size="1261568" crc="0444396e" sha1="4eae28aa9b56a8511bf678173b77706024c7a6b5" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="figurea" cloneof="figure">
+		<description>Figure - Ubawareta Houkago (Alt)</description>
+		<year>1995</year>
+		<publisher>シルキーズ (Silky's)</publisher>
+		<info name="alt_title" value="フィギュア ～奪われた放課後～" />
+		<info name="release" value="19950929" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="figure [set 1] (disk 1).hdm" size="1261568" crc="3d5601c9" sha1="e6601517ba487515a6d7bdc7b9a18bd96990f41f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="figure [set 1] (disk 2).hdm" size="1261568" crc="9aff78b5" sha1="a85eac75035db2feb1f3da793ac3e1b60d4f13a7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk C"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="figure [set 1] (disk 3).hdm" size="1261568" crc="75033fdd" sha1="cf36ad4a8153a7da7d6983fe37c09d49de57d48a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk D"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="figure [set 1] (disk 4).hdm" size="1261568" crc="3b74417e" sha1="506f2db1a36e1cc665cb71fbd7f7c08dd16bed88" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<!-- Doesn't recognize disk changes -->
+	<software name="filsnown" supported="no">
 		<description>Filsnown - Hikari to Toki</description>
 		<year>1995</year>
 		<publisher>リーフ (Leaf)</publisher>
 		<info name="alt_title" value="フィルスノーン ～光と刻～" />
 		<info name="release" value="19950803" />
 		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 1"/>
+			<feature name="part_id" value="Disk A"/>
 			<dataarea name="flop" size="1265664">
 				<rom name="1.fdi" size="1265664" crc="93c18ffe" sha1="76c90f9712f4ddc91089a178ba8dffc205efd67b" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 2"/>
+			<feature name="part_id" value="Disk B"/>
 			<dataarea name="flop" size="1265664">
 				<rom name="2.fdi" size="1265664" crc="8dff4a64" sha1="9d14c73ff0cabffad54469defefbcf738ef04536" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 3"/>
+			<feature name="part_id" value="Disk C"/>
 			<dataarea name="flop" size="1265664">
 				<rom name="3.fdi" size="1265664" crc="5c9cff13" sha1="60a5fa6afc4a4d392c744b357d3890b692d16a50" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop4" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 4"/>
+			<feature name="part_id" value="Disk D"/>
 			<dataarea name="flop" size="1265664">
 				<rom name="4.fdi" size="1265664" crc="be2b3426" sha1="9d8730684f188292bf787f4dbf732c8216d42793" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop5" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 5"/>
+			<feature name="part_id" value="Disk E"/>
 			<dataarea name="flop" size="1265664">
 				<rom name="5.fdi" size="1265664" crc="2120b61d" sha1="475f0daef5b69d92b38491a7a06c08904ae8d020" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop6" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 6"/>
+			<feature name="part_id" value="Disk F"/>
 			<dataarea name="flop" size="1265664">
 				<rom name="6.fdi" size="1265664" crc="aa63c1f9" sha1="d34da3a478270ca5530d1701928ee13e43572e79" offset="0" />
 			</dataarea>
@@ -18982,10 +19313,137 @@
 				<rom name="fbreak_3.fdi" size="1265664" crc="f14185c3" sha1="87b2ddc3cad821b6fff10f362eb3ae895965c5db" offset="0" />
 			</dataarea>
 		</part>
-		<part name="flop4" interface="floppy_5_25">
-			<feature name="part_id" value="User Disk"/>
+	</software>
+
+	<software name="fhold">
+		<description>Finish Hold</description>
+		<year>1995</year>
+		<publisher>システムソフト (SystemSoft)</publisher>
+		<info name="alt_title" value="フィニッシュホールド" />
+		<info name="release" value="19950623" />
+		<info name="usage" value="Requires HDD installation, and the game manual to pass the protection check. Run INST.EXE from DOS." />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 1"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="finish hold (disk 1) [original uncracked].hdm" size="1261568" crc="14678832" sha1="1840e364c904976194e31035e79af55e121c8c95" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 2"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="finish hold (disk 2).hdm" size="1261568" crc="3a09986a" sha1="0126941025b30050893498d0d49e85c6c2b28555" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<!-- The cracked version of the installer hangs when it asks for disk 2. Doesn't happen in other emulators. -->
+	<software name="fholdc" cloneof="fhold" supported="no">
+		<description>Finish Hold (cracked)</description>
+		<year>1995</year>
+		<publisher>システムソフト (SystemSoft)</publisher>
+		<info name="alt_title" value="フィニッシュホールド" />
+		<info name="release" value="19950623" />
+		<info name="usage" value="Requires HDD installation. Run INST.EXE from DOS." />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 1"/>
 			<dataarea name="flop" size="1265664">
-				<rom name="user.fdi" size="1265664" crc="a73f9ba6" sha1="f55ba756a9a80d13d6ab73a1ae626872e61b4024" offset="0" status="baddump" />
+				<rom name="finish hold (disk 1).hdm" size="1261568" crc="b3a8b987" sha1="23f0a099dc74b04da24d834412d941713c9a8cfc" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 2"/>
+			<dataarea name="flop" size="1265664">
+				<rom name="finish hold (disk 2).hdm" size="1261568" crc="3a09986a" sha1="0126941025b30050893498d0d49e85c6c2b28555" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="fholdwz">
+		<description>Finish Hold Hissatsuwaza Zukan</description>
+		<year>1995</year>
+		<publisher>システムソフト (SystemSoft)</publisher>
+		<info name="alt_title" value="フィニッシュホールド (必殺技図鑑)" />
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="1261568">
+				<rom name="finish hold (waza zukan).hdm" size="1261568" crc="42d1c241" sha1="bc0779e814012c5f0192762fbbb39360c9f8f81d" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="fh2tag">
+		<description>Finish Hold 2 - Tag</description>
+		<year>1996</year>
+		<publisher>システムソフト (SystemSoft)</publisher>
+		<info name="alt_title" value="フィニッシュホールド２ ＴＡＧ" />
+		<info name="release" value="19960322" />
+		<info name="usage" value="Requires HDD installation, and the game manual to pass the protection check. Run INST.EXE from DOS." />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 1"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="finish hold 2 tag (disk 1) [original uncracked].hdm" size="1261568" crc="4028b59a" sha1="76b210c388be69485f2e9ad7177be742296fe927" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 2"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="finish hold 2 tag (disk 2).hdm" size="1261568" crc="59cf90b0" sha1="d84eb589f9a32bbe090ba995f323e1cd45abb6d5" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 3"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="finish hold 2 tag (disk 3).hdm" size="1261568" crc="a02b330c" sha1="d27def0f225d7ce1340659bd3ce45635d9636a6c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 4"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="finish hold 2 tag (disk 4).hdm" size="1261568" crc="c2be825d" sha1="5e35138538c2c84fe0dd4f7204aa9e2a722ec87a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 5"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="finish hold 2 tag (disk 5).hdm" size="1261568" crc="9006c491" sha1="cbdd23431ddff2be1552529f45da76b50e350738" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="fh2tagc" cloneof="fh2tag" supported="no">
+		<description>Finish Hold 2 - Tag (cracked)</description>
+		<year>1996</year>
+		<publisher>システムソフト (SystemSoft)</publisher>
+		<info name="alt_title" value="フィニッシュホールド２ ＴＡＧ" />
+		<info name="release" value="19960322" />
+		<info name="usage" value="Requires HDD installation. Run INST.EXE from DOS." />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 1"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="finish hold 2 tag (disk 1).hdm" size="1261568" crc="70c04605" sha1="9bb9cbf7aab1acfb8924d658494c297ec7a79667" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 2"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="finish hold 2 tag (disk 2).hdm" size="1261568" crc="59cf90b0" sha1="d84eb589f9a32bbe090ba995f323e1cd45abb6d5" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 3"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="finish hold 2 tag (disk 3).hdm" size="1261568" crc="a02b330c" sha1="d27def0f225d7ce1340659bd3ce45635d9636a6c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 4"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="finish hold 2 tag (disk 4).hdm" size="1261568" crc="c2be825d" sha1="5e35138538c2c84fe0dd4f7204aa9e2a722ec87a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 5"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="finish hold 2 tag (disk 5).hdm" size="1261568" crc="9006c491" sha1="cbdd23431ddff2be1552529f45da76b50e350738" offset="0" />
 			</dataarea>
 		</part>
 	</software>
@@ -19035,6 +19493,78 @@
 		</part>
 	</software>
 
+	<software name="fknight">
+		<description>Fantasy Knight</description>
+		<year>1988</year>
+		<publisher>システムソフト (SystemSoft)</publisher>
+		<info name="alt_title" value="ファンタジーナイト" />
+		<info name="release" value="198805xx" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="System Disk"/>
+			<dataarea name="flop" size="1086448">
+				<rom name="fantasy knight (system disk).d88" size="1086448" crc="68dea35f" sha1="49fa3d579191bc766a6dca5da0cbec0dd0dee795" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Data Disk"/>
+			<dataarea name="flop" size="1103920">
+				<rom name="fantasy knight (data disk).d88" size="1103920" crc="1f372632" sha1="8998526c9f9727a13daa7187dda0a53a4b0c5fc2" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="fknightf">
+		<description>Fantasy Knight Fukkokuban</description>
+		<year>1991</year>
+		<publisher>システムソフト (SystemSoft)</publisher>
+		<info name="alt_title" value="ファンタジーナイト 復刻版" />
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="1086448">
+				<rom name="fantasy knight (fukkokuban).d88" size="1086448" crc="b01b3f22" sha1="6d934135fbeb6a4dc417cfd95862a69fb992ff21" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="fqueen">
+		<description>First Queen</description>
+		<year>1988</year>
+		<publisher>呉ソフトウエア工房  (KSK)</publisher>
+		<info name="alt_title" value="ファーストクィーン" />
+		<info name="release" value="198812xx" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1089776">
+				<rom name="first queen [set 1] (disk a).d88" size="1089776" crc="40bd4430" sha1="5b56441d55f8d134fe5fa9975eeda7578f268c6b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1089504">
+				<rom name="first queen [set 1] (disk b).d88" size="1089504" crc="0e27e90a" sha1="e4347ac15fd27aa88bbfb5131a58de612f7c7bda" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="fqueena" cloneof="fqueen">
+		<description>First Queen (Alt)</description>
+		<year>1988</year>
+		<publisher>呉ソフトウエア工房  (KSK)</publisher>
+		<info name="alt_title" value="ファーストクィーン" />
+		<info name="release" value="198812xx" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1103920">
+				<rom name="first queen [set 2] (disk a).d88" size="1103920" crc="986676da" sha1="ebaa8fa1df201706e6e093832691ed711cae5a59" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1103920">
+				<rom name="first queen [set 2] (disk b).d88" size="1103920" crc="4b300313" sha1="eeba1aa3de509779e707ad35475194ed85b3f132" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="fqueen2">
 		<description>First Queen II - Sabaku no Joou</description>
 		<year>1990</year>
@@ -19042,45 +19572,71 @@
 		<info name="alt_title" value="ファーストクィーン２ 砂漠の女王" />
 		<info name="release" value="19901217" />
 		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Opening Disk"/>
+			<dataarea name="flop" size="1089776">
+				<rom name="firstq2o.d88" size="1089776" crc="fa39b8d1" sha1="ab371a6b458d02f6c68cffd23dabd8442514088d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
 			<feature name="part_id" value="Disk A"/>
 			<dataarea name="flop" size="1089776">
 				<rom name="firstq2a.d88" size="1089776" crc="485b32f3" sha1="6cb5e8115b0b7805a9767a8704b01641ce4b2042" offset="0" />
 			</dataarea>
 		</part>
-		<part name="flop2" interface="floppy_5_25">
+		<part name="flop3" interface="floppy_5_25">
 			<feature name="part_id" value="Disk B"/>
 			<dataarea name="flop" size="1089776">
 				<rom name="firstq2b.d88" size="1089776" crc="15a66a75" sha1="ac0d9908e0925e4f971cda688ed98da17973fa0a" offset="0" />
 			</dataarea>
 		</part>
+	</software>
+
+	<software name="fqueen3">
+		<description>First Queen III</description>
+		<year>1993</year>
+		<publisher>呉ソフトウエア工房  (KSK)</publisher>
+		<info name="alt_title" value="ファーストクィーン３" />
+		<info name="release" value="19930702" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Opening Disk"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="first queen iii (opening disk).hdm" size="1261568" crc="25eed8c3" sha1="00372b0bead44bd86c46c6157cfabb6b7384e968" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="System Disk"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="first queen iii (system disk).hdm" size="1261568" crc="7ceb63be" sha1="3d2f63af3a5f6c20e735ea9fcc49061a2e366065" offset="0" />
+			</dataarea>
+		</part>
 		<part name="flop3" interface="floppy_5_25">
-			<feature name="part_id" value="Opening"/>
-			<dataarea name="flop" size="1089776">
-				<rom name="firstq2o.d88" size="1089776" crc="fa39b8d1" sha1="ab371a6b458d02f6c68cffd23dabd8442514088d" offset="0" />
+			<feature name="part_id" value="Data Disk"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="first queen iii (data disk).hdm" size="1261568" crc="e5469a51" sha1="b1298b6ab31a7e30909a4b9b806c841e1a870489" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
 	<software name="fqueen4">
-		<description>First Queen IV</description>
+		<description>First Queen IV - Varcia Senki</description>
 		<year>1994</year>
 		<publisher>呉ソフトウエア工房  (KSK)</publisher>
-		<info name="alt_title" value="ファーストクィーン４ バルシア戦記 ~ First Queen 4 Barushia Senki" />
+		<info name="alt_title" value="ファーストクィーン４ バルシア戦記" />
 		<info name="release" value="19940610" />
 		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 1"/>
+			<feature name="part_id" value="Opening Disk"/>
 			<dataarea name="flop" size="1265664">
 				<rom name="fq4_1.fdi" size="1265664" crc="317b0371" sha1="ed7ba7be4cd55c5411a3110678c0a43c77239375" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 2"/>
+			<feature name="part_id" value="System Disk"/>
 			<dataarea name="flop" size="1265664">
 				<rom name="fq4_2.fdi" size="1265664" crc="e69beff1" sha1="34da123eb3136e9e9ec64407764cff5f37d1b655" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 3"/>
+			<feature name="part_id" value="Data Disk"/>
 			<dataarea name="flop" size="1265664">
 				<rom name="fq4_3.fdi" size="1265664" crc="63ba9797" sha1="727533e4c51ed2941b06c7b9691be95e60506b29" offset="0" />
 			</dataarea>
@@ -19222,7 +19778,8 @@
 		</part>
 	</software>
 
-	<software name="flhawaii">
+	<!-- Fatal error: Incorrect layout on track 48 head 0, expected_size=100000, current_size=325920 -->
+	<software name="flhawaii" supported="no">
 		<description>Flight in Hawaii</description>
 		<year>1986</year>
 		<publisher>キャリーラボ (Carry Lab)</publisher>
@@ -19234,12 +19791,26 @@
 		</part>
 	</software>
 
+	<software name="flixmix">
+		<description>FlixMix</description>
+		<year>1995</year>
+		<publisher>スタークラフト (Starcraft)</publisher>
+		<info name="alt_title" value="フリックスミックス" />
+		<info name="usage" value="Requires a PC-9821 computer, the GDC Clock DIP switch set to 5 MHz, and HDD installation. Run INSTALL.EXE from DOS." />
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="1261568">
+				<rom name="flix mix (gdc 5mhz).hdm" size="1261568" crc="ba7952f1" sha1="9fed734c8617fc99967dfd36c7ebf472084ce5cf" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="flopbnk3">
 		<description>Floppy Bunko 03 - Bishoujo Graphic Data Shuu Vol. 01</description>
 		<year>1992</year>
 		<publisher>エファット (EFAT)</publisher>
 		<info name="alt_title" value="フロッピー文庫０３ 美少女グラフィックデータ集　Ｖｏｌ．１" />
 		<info name="release" value="19920726" />
+		<info name="usage" value="Run CG98.BAT from DOS" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1281968">
 				<rom name="vol1.d88" size="1281968" crc="be20da72" sha1="e777514a56468e86c859350bc3166bd40e70d609" offset="0" />
@@ -19253,6 +19824,7 @@
 		<publisher>エファット (EFAT)</publisher>
 		<info name="alt_title" value="フロッピー文庫０４ 美少女グラフィックデータ集　Ｖｏｌ．２" />
 		<info name="release" value="19920726" />
+		<info name="usage" value="Run CG98.BAT from DOS" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1281968">
 				<rom name="vol2.d88" size="1281968" crc="6427826f" sha1="35c06ecaefea02e6fb53baf0115fa0dd52222882" offset="0" />
@@ -19266,6 +19838,7 @@
 		<publisher>アーカムプロダクツ (Arkham Products)</publisher>
 		<info name="alt_title" value="フロッピー文庫０５ マンガ家ＳＬＧ" />
 		<info name="release" value="19920826" />
+		<info name="usage" value="Run AUTOEXEC.BAT from DOS" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1265664">
 				<rom name="floppy bunko 05 - manga-ka slg.fdi" size="1265664" crc="775535ef" sha1="a050f5493e3bd6ceef2f7fb4d1dc0569e0bc2f49" offset="0" />
@@ -19279,6 +19852,7 @@
 		<publisher>エファット (EFAT)</publisher>
 		<info name="alt_title" value="フロッピー文庫０６ 美少女グラフィックデータ集　Ｖｏｌ．３" />
 		<info name="release" value="19920826" />
+		<info name="usage" value="Run CG98.BAT from DOS" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1281968">
 				<rom name="vol3.d88" size="1281968" crc="ace7e787" sha1="50bf4aaebb23bd0ab83203bfde81db450507ac0a" offset="0" />
@@ -19286,12 +19860,31 @@
 		</part>
 	</software>
 
+	<software name="flopbnk9">
+		<description>Floppy Bunko 09 - Bishoujo Graphic Data Shuu Vol. 04</description>
+		<year>1992</year>
+		<publisher>エファット (EFAT)</publisher>
+		<info name="alt_title" value="フロッピー文庫０９ 美少女グラフィックデータ集　Ｖｏｌ．４" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Boot Disk"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="floppy bunko 9 - bishoujo graphic data shuu vol. 4 (boot disk).hdm" size="1261568" crc="c74a8613" sha1="b6a066ba92329ba776854ffe64bdbf3c811d8385" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<dataarea name="flop" size="1261568">
+				<rom name="floppy bunko 9 - bishoujo graphic data shuu vol. 4.hdm" size="1261568" crc="df76a942" sha1="6ecae78b63002a929e9d2ed9bfbf2f15505aefd8" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="flopbn11">
 		<description>Floppy Bunko 11 - Listeners Club 0990 Vol. 2</description>
 		<year>1992</year>
 		<publisher>アーカムプロダクツ (Arkham Products)</publisher>
 		<info name="alt_title" value="フロッピー文庫１１ リスナーズクラブ０９９０Ｖｏｌ．２" />
 		<info name="release" value="19921026" />
+		<info name="usage" value="Run AUTOEXEC.BAT from DOS" />
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
 			<dataarea name="flop" size="1265664">
@@ -19306,6 +19899,202 @@
 		</part>
 	</software>
 
+	<!-- These seem to be fonts for something called Just Window, no way to test them. Are the disk labels correct? -->
+	<software name="fontwave">
+		<description>FontWave</description>
+		<year>1994</year>
+		<publisher>アルプス電気 (Alps Electric)</publisher>
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Master Disk"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fontwave (disk 01).hdm" size="1261568" crc="62abd55d" sha1="b1ca7fdf67fb1f8ea68116fbc61c85aa7094bc9c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Ryobi Sirius M (Disk 1)"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fontwave (disk 02).hdm" size="1261568" crc="bcb7e45a" sha1="ec9f09044550b1f0ca771bb2cdc8252bc9760af9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Ryobi Sirius M (Disk 2)"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fontwave (disk 03).hdm" size="1261568" crc="8a60ced9" sha1="46523f63d935f9373ea54a424a38b5214f42c960" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Ryobi Sirius M (Disk 3)"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fontwave (disk 04).hdm" size="1261568" crc="da345534" sha1="20b64af65e2f7f3ca8f8d757a86706e4d5a199d8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_id" value="Ryobi Gothic B (Disk 1)"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fontwave (disk 05).hdm" size="1261568" crc="f3d77634" sha1="4facbe35da9fc0e9186e2bae51c83e4dc5147f71" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop6" interface="floppy_5_25">
+			<feature name="part_id" value="Ryobi Gothic B (Disk 2)"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fontwave (disk 06).hdm" size="1261568" crc="ed031a95" sha1="74a47be36f928d00c5ae929673cbbf2d5745b592" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop7" interface="floppy_5_25">
+			<feature name="part_id" value="Ryobi Gothic B (Disk 3)"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fontwave (disk 07).hdm" size="1261568" crc="8c961bc4" sha1="0b4b818a234e5d2d953d8919e67c25b5b013bccb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop8" interface="floppy_5_25">
+			<feature name="part_id" value="Ryobi Hagoromo M (Disk 1)"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fontwave (disk 08).hdm" size="1261568" crc="5e8ca302" sha1="763d4994701c9da6c0a9ba2f18c7f8c65f386733" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop9" interface="floppy_5_25">
+			<feature name="part_id" value="Ryobi Hagoromo M (Disk 2)"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fontwave (disk 09).hdm" size="1261568" crc="2f73664d" sha1="b54519381c238a464618a09102de8aa9ec4db994" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop10" interface="floppy_5_25">
+			<feature name="part_id" value="Ryobi Hagoromo M (Disk 3)"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fontwave (disk 10).hdm" size="1261568" crc="3b01154c" sha1="3a0f68d1c787967a4824218dfd6e50a4a6294516" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop11" interface="floppy_5_25">
+			<feature name="part_id" value="Ryobi Hagoromo M (Disk 4)"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fontwave (disk 11).hdm" size="1261568" crc="f02d9e95" sha1="e58eba2099b5d28782ab15d1c825a24ec94cae9c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop12" interface="floppy_5_25">
+			<feature name="part_id" value="Ryobi Hagoromo M (Disk 5)"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fontwave (disk 12).hdm" size="1261568" crc="cf9c6ecb" sha1="6c54faef209b47cd61c9bae871183cbceb528a7c" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="fourflsh">
+		<description>Four Flush</description>
+		<year>1993</year>
+		<publisher>アグミックス (Agumix)</publisher>
+		<info name="alt_title" value="フォア フラッシュ" />
+		<info name="release" value="19930429" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="four flush (disk a).hdm" size="1261568" crc="3f575b7d" sha1="096a1d584b0dd5ac87b0b664bbebd5ab94410cde" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="four flush (disk b).hdm" size="1261568" crc="8d963ed4" sha1="29db622d38ddaaa5360b183c6a49c3f937ad052f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk C"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="four flush (disk c).hdm" size="1261568" crc="9ae28489" sha1="7f7e82f49ae14fb02e2a7de79600d13824cbfd37" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<!-- The cracked version has a 1-byte difference in the file A0_000.SO3, but both seem to work. Maybe there's a manual check later in the game? -->
+	<software name="frontier">
+		<description>Frontier</description>
+		<year>1995</year>
+		<publisher>フロンティア (Frontier)</publisher>
+		<info name="alt_title" value="フロンティア" />
+		<info name="release" value="19950825" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="frontier (disk a) [alt 1] [original uncracked].hdm" size="1261568" crc="d4d2b814" sha1="c7d7d155523c56afb97ed0c9fda7d8faa55cacaf" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="frontier (disk b).hdm" size="1261568" crc="b1df5015" sha1="4b7a668931328c3cd4777a2420a7dd65a79261cf" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk C"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="frontier (disk c).hdm" size="1261568" crc="89631d5b" sha1="b7458bbd615c092a8e142e82bd8705a595370f90" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="frontierc" cloneof="frontier">
+		<description>Frontier (cracked)</description>
+		<year>1995</year>
+		<publisher>フロンティア (Frontier)</publisher>
+		<info name="alt_title" value="フロンティア" />
+		<info name="release" value="19950825" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="frontier (disk a).hdm" size="1261568" crc="246f318e" sha1="44e5d413ff817f2bf5ac60d45115cf1cfbd1af2e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="frontier (disk b).hdm" size="1261568" crc="b1df5015" sha1="4b7a668931328c3cd4777a2420a7dd65a79261cf" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk C"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="frontier (disk c).hdm" size="1261568" crc="89631d5b" sha1="b7458bbd615c092a8e142e82bd8705a595370f90" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="fsdolly">
+		<description>Foresight Dolly</description>
+		<year>1994</year>
+		<publisher>ライトスタッフ (Right Stuff)</publisher>
+		<info name="alt_title" value="フォーサイト・ドリィ" />
+		<info name="release" value="19941111" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="foresight dolly (disk a).hdm" size="1261568" crc="4a131cda" sha1="f2710908c13f513a9f83e2e347ceb801d8c3e090" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="foresight dolly (disk b).hdm" size="1261568" crc="902f6c7a" sha1="65f383628a8deaa5509e06f6fdd34b2c70cfe819" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk C"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="foresight dolly (disk c).hdm" size="1261568" crc="350dfa82" sha1="346bd2968a61719f40ef4260c140af2b28eb2daf" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk D"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="foresight dolly (disk d).hdm" size="1261568" crc="5a3e8022" sha1="bea6a62ee37204a3cb065b9c16a34d0e9310e0da" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop5" interface="floppy_5_25">
+			<feature name="part_id" value="Disk E"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="foresight dolly (disk e).hdm" size="1261568" crc="f9fbde90" sha1="f46cf73a4332ab49a040c386c72cec98dfb82010" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="foxy">
 		<description>Foxy</description>
 		<year>1990</year>
@@ -19313,13 +20102,13 @@
 		<info name="alt_title" value="フォクシー" />
 		<info name="release" value="19900216" />
 		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 1"/>
+			<feature name="part_id" value="Disk A"/>
 			<dataarea name="flop" size="1265664">
 				<rom name="foxy_01.fdi" size="1265664" crc="296d450c" sha1="4048648f39c8ae65bf4fa9f325e48e3d9dce8641" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 2"/>
+			<feature name="part_id" value="Disk B"/>
 			<dataarea name="flop" size="1265664">
 				<rom name="foxy_02.fdi" size="1265664" crc="fab2bdef" sha1="a89bf2839ec09490aa671bb5f0f4a34e10b83303" offset="0" />
 			</dataarea>
@@ -19428,6 +20217,7 @@
 		<publisher>きんぷくりん (Kinpukurin)</publisher>
 		<info name="alt_title" value="フリーウィル Ｋｎｉｇｈｔ ｏｆ Ａｒｇｅｎｔ" />
 		<info name="release" value="19920821" />
+		<info name="usage" value="The first time playing the game insert a blank disk on drive B: to create the user disk, otherwise the intro will just loop endlessly" />
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Master Disk"/>
 			<dataarea name="flop" size="1265664">
@@ -19446,15 +20236,9 @@
 				<rom name="disk_b.fdi" size="1265664" crc="d121a389" sha1="9f7419c9579e63fc3e53f76687ad68a335845c8f" offset="0" />
 			</dataarea>
 		</part>
-		<part name="flop4" interface="floppy_5_25">
-			<feature name="part_id" value="User Disk"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="user.fdi" size="1265664" crc="13eb620b" sha1="d485796811232814aef6f724cc0cd62ef7904db3" offset="0" status="baddump" />
-			</dataarea>
-		</part>
 	</software>
 
-	<software name="frontier">
+	<software name="frontunv">
 		<description>Frontier Universe</description>
 		<year>1993</year>
 		<publisher>B·P·S (Bullet-Proof Software)</publisher>
@@ -19498,7 +20282,8 @@
 		</part>
 	</software>
 
-	<software name="funny">
+	<!-- Address 20 line error -->
+	<software name="funny" supported="no">
 		<description>Funny</description>
 		<year>19??</year>
 		<publisher>アスキー (ASCII)</publisher>
@@ -19677,6 +20462,26 @@
 		</part>
 	</software>
 
+	<software name="furinkaz">
+		<description>Fuurin Kazan</description>
+		<year>1992</year>
+		<publisher>ソフトプラン (Soft Plan)</publisher>
+		<info name="alt_title" value="風林火山" />
+		<info name="release" value="19920502" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 1"/>
+			<dataarea name="flop" size="1086448">
+				<rom name="fuurin kazan (disk 1).d88" size="1086448" crc="71fcc26b" sha1="f9b2ab08b165fccade24513fd82610de044de489" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk 2"/>
+			<dataarea name="flop" size="1086448">
+				<rom name="fuurin kazan (disk 2).d88" size="1086448" crc="9451abb3" sha1="0c709265aaa78bfe3a15ba99d074a4a02c07e5c4" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="nadia">
 		<description>Fushigi no Umi no Nadia</description>
 		<year>1992</year>
@@ -19751,6 +20556,7 @@
 		<publisher>スタークラフト (Starcraft)</publisher>
 		<info name="alt_title" value="フューチャーウォーズ ～時の冒険者～" />
 		<info name="release" value="19910624" />
+		<info name="usage" value="Run FW.EXE from DOS. Requires the game manual to pass the copy protection check." />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1281968">
 				<rom name="futurews.d88" size="1281968" crc="92d9780b" sha1="d9b7ff3c1aafb7e3a4c7673e3ce947bf1fc1c401" offset="0" />
@@ -19758,6 +20564,38 @@
 		</part>
 	</software>
 
+	<software name="fzlemon">
+		<description>Fuzoroi no Lemon</description>
+		<year>1994</year>
+		<publisher>ボンびいボンボン！ (Bonbee Bonbon!)</publisher>
+		<info name="alt_title" value="不揃いのレモン" />
+		<info name="release" value="19940121" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Disk A"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fuzoroi no lemon (disk a).hdm" size="1261568" crc="79ec12ad" sha1="fbacf38f0245e90cc318769f6fbbb2b7b1276bf6" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Disk B"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fuzoroi no lemon (disk b).hdm" size="1261568" crc="b7b2c558" sha1="48a698f5c5b7fd199ba0f9fde3bc88fcdb2ba1c0" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Disk C"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fuzoroi no lemon (disk c).hdm" size="1261568" crc="6231140d" sha1="657e7f3603e97d1538f2a0998336919426933b22" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Disk D"/>
+			<dataarea name="flop" size="1261568">
+				<rom name="fuzoroi no lemon (disk d).hdm" size="1261568" crc="7d8db270" sha1="9a3cc3694b716bdb62a7964b777666339eec3af1" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="gage">
 		<description>Gage</description>
 		<year>1992</year>
@@ -21349,7 +22187,7 @@
 	<software name="groupx">
 		<description>Group X</description>
 		<year>1991</year>
-		<publisher>コムパック (Compaq)</publisher>
+		<publisher>コムパック (Compac)</publisher>
 		<info name="alt_title" value="グループ・エックス" />
 		<info name="release" value="199105xx" />
 		<part name="flop1" interface="floppy_5_25">
@@ -22919,24 +23757,27 @@
 	</software>
 
 	<software name="hldrun">
+		<!-- remake, converted to DOS 3.30, has original ldrun levels + extra mode -->
 		<description>Hozonban Lode Runner</description>
 		<year>1989</year>
 		<publisher>システムソフト (SystemSoft)</publisher>
 		<info name="alt_title" value="保存版ロードランナー" />
 		<info name="release" value="198907xx" />
+		<!-- was mislabeled as panicbom -->
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1281968">
-				<rom name="loderun.d88" size="1281968" crc="7c3e3f7e" sha1="3df6f8d37240b2af4ac01da2d6d7efd6c61c9bdf" offset="0" />
+				<rom name="panicbom.d88" size="1281968" crc="f972bd7b" sha1="5eb1125a2b1906b66b05f9da91bf9e4e7767032f" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="hldruna" cloneof="hldrun">
-		<description>Hozonban Lode Runner (Alt)</description>
-		<year>1989</year>
+	<software name="ldrun" cloneof="hldrun">
+		<!-- original version, compiled in N88-Basic 2.0 -->
+		<description>Lode Runner</description>
+		<year>1983</year>
 		<publisher>システムソフト (SystemSoft)</publisher>
-		<info name="alt_title" value="保存版ロードランナー" />
-		<info name="release" value="198907xx" />
+		<info name="alt_title" value="ロードランナー" />
+		<info name="release" value="1983xxxx" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1086448">
 				<rom name="lode runner.d88" size="1086448" crc="e5f804b6" sha1="d2b6241fbc6f15f1fba791ae6d6260653a6140af" offset="0" />
@@ -31705,6 +32546,37 @@
 		</part>
 	</software>
 
+	<software name="nirvana">
+		<description>Nirvana - Zeta II (cracked)</description>
+		<year>1994</year>
+		<publisher>トンキンハウス (Tonkin House)</publisher>
+		<info name="developer" value="Will" />
+		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="System"/>
+			<dataarea name="flop" size="1265664">
+				<rom name="system.fdi" size="1265664" crc="e4ae0682" sha1="ddab9087e441add7a02e9a401114e015c073945c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Data 1"/>
+			<dataarea name="flop" size="1265664">
+				<rom name="data 1.fdi" size="1265664" crc="df974fce" sha1="cbb26eec0c3b7feceaec75333b91cf9ad09dffa0" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_5_25">
+			<feature name="part_id" value="Data 2"/>
+			<dataarea name="flop" size="1265664">
+				<rom name="data 2.fdi" size="1265664" crc="79ab7c32" sha1="ef9dd33cb0b3e1969aa3fcf9fa7edbc07d3b9cee" offset="0" />
+			</dataarea>
+		</part>
+		<part name="flop4" interface="floppy_5_25">
+			<feature name="part_id" value="Data 3"/>
+			<dataarea name="flop" size="1265664">
+				<rom name="data 3.fdi" size="1265664" crc="00f9ad98" sha1="aee242f3a7d401bb1ceb357d06e288e99e3ecfd9" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="nobunaga">
 		<description>Nobunaga no Yabou</description>
 		<year>1983</year>
@@ -35033,7 +35905,7 @@
 	<software name="prodmang">
 		<description>Production Manager</description>
 		<year>1988</year>
-		<publisher>コムパック (Compaq)</publisher>
+		<publisher>コムパック (Compac)</publisher>
 		<info name="alt_title" value="プロダクションマネージャー" />
 		<info name="release" value="198812xx" />
 		<part name="flop1" interface="floppy_5_25">
@@ -37416,7 +38288,7 @@
 
 	<software name="felis">
 		<description>Sailor Fuku Senshi Felis</description>
-		<year>1990?</year>
+		<year>1990</year>
 		<publisher>カクテル・ソフト (Cocktail Soft)</publisher>
 		<info name="alt_title" value="セーラー服戦士フェリス" />
 		<part name="flop1" interface="floppy_5_25">
@@ -44191,106 +45063,6 @@
 		<info name="alt_title" value="宇宙快盗ファニーＢｅｅ" />
 		<info name="release" value="19940810" />
 		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 1"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="disk_1.fdi" size="1265664" crc="05036c46" sha1="fef6d757d0a49c2951c06f51adc7eba5f14f1503" offset="0" />
-			</dataarea>
-		</part>
-		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 2"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="disk_2.fdi" size="1265664" crc="80b8c996" sha1="02ef9f1b240cd2b81ad8b72dfa6f6ce4135e21a9" offset="0" />
-			</dataarea>
-		</part>
-		<part name="flop3" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 3"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="disk_3.fdi" size="1265664" crc="0ab3b4cb" sha1="260d59072051a6f9510d3b215d89e73d0dcb55a3" offset="0" />
-			</dataarea>
-		</part>
-		<part name="flop4" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 4"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="disk_4.fdi" size="1265664" crc="bd312a44" sha1="1d98e620f8c777998f3ba610b6e05a44f1eca0d1" offset="0" />
-			</dataarea>
-		</part>
-		<part name="flop5" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 5"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="disk_5.fdi" size="1265664" crc="0ce793e7" sha1="2493ce9d20e030d3a7e4208f489b83ca6f653ea1" offset="0" />
-			</dataarea>
-		</part>
-		<part name="flop6" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 6"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="disk_6.fdi" size="1265664" crc="3d58640b" sha1="3164a0b653d8a1c288174b4d035b16247a0dc3e7" offset="0" />
-			</dataarea>
-		</part>
-		<part name="flop7" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 7"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="disk_7.fdi" size="1265664" crc="ddf4f953" sha1="c3c9e36fffbc14ae3e8e1aba7988979929bc8a0a" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="funnybeea" cloneof="funnybee">
-		<description>Uchuu Kaitou Funny Bee (Alt)</description>
-		<year>1994</year>
-		<publisher>アリスソフト (AliceSoft)</publisher>
-		<info name="alt_title" value="宇宙快盗ファニーＢｅｅ" />
-		<info name="release" value="19940810" />
-		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="Disk A"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="bee-a.fdi" size="1265664" crc="2b0b5a4d" sha1="431ce9750268d0ef65e8ed8cb8f81cbe01b98bae" offset="0" />
-			</dataarea>
-		</part>
-		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="Disk B"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="bee-b.fdi" size="1265664" crc="85804a9a" sha1="4883bff26453775a469e825227200a6700db40d7" offset="0" />
-			</dataarea>
-		</part>
-		<part name="flop3" interface="floppy_5_25">
-			<feature name="part_id" value="Disk C"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="bee-c.fdi" size="1265664" crc="7ebb6c6f" sha1="2892ac2762b822b0ebe0e82daf6a233fb37fdb1e" offset="0" />
-			</dataarea>
-		</part>
-		<part name="flop4" interface="floppy_5_25">
-			<feature name="part_id" value="Disk D"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="bee-d.fdi" size="1265664" crc="904a8326" sha1="50e18d1582bc2b5de5faff6f0679c523575b24ec" offset="0" />
-			</dataarea>
-		</part>
-		<part name="flop5" interface="floppy_5_25">
-			<feature name="part_id" value="Disk E"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="bee-e.fdi" size="1265664" crc="9acaf716" sha1="f9bc43c7335d213ae30554921ebd96bd49c584e5" offset="0" />
-			</dataarea>
-		</part>
-		<part name="flop6" interface="floppy_5_25">
-			<feature name="part_id" value="Disk F"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="bee-f.fdi" size="1265664" crc="5a8a4665" sha1="afcbc99e1c7394021dce692922525eb4fefd445c" offset="0" />
-			</dataarea>
-		</part>
-		<part name="flop7" interface="floppy_5_25">
-			<feature name="part_id" value="Disk G"/>
-			<dataarea name="flop" size="1265664">
-				<rom name="bee-g.fdi" size="1265664" crc="715ed3e3" sha1="ec5cf7f03e0ec12c9d4fce4c4465c006439dfbb1" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="funnybeeb" cloneof="funnybee">
-		<description>Uchuu Kaitou Funny Bee (Alt Format)</description>
-		<year>1994</year>
-		<publisher>アリスソフト (AliceSoft)</publisher>
-		<info name="alt_title" value="宇宙快盗ファニーＢｅｅ" />
-		<info name="release" value="19940810" />
-		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk A"/>
 			<dataarea name="flop" size="1261568">
 				<rom name="diska.hdm" size="1261568" crc="f5c61e10" sha1="2d67763dda145ce543301bba812c9926b9e4dd07" offset="0" />
@@ -49833,10 +50605,11 @@
 		</part>
 	</software>
 
-	<software name="f1datad" supported="no">
+	<software name="f1datad">
 		<description>F-1 Databox (Demo)</description>
-		<year>19??</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<year>1990</year>
+		<publisher>リード・レックス (Reed Rex)</publisher>
+		<info name="usage" value="Run DB.BAT from DOS" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1261568">
 				<rom name="f-1databox_demo.hdm" size="1261568" crc="cac82d7a" sha1="dff76eee8d41322d58736efa885ad4849ff64cff" offset="0" />
@@ -49844,19 +50617,7 @@
 		</part>
 	</software>
 
-	<software name="fknight" supported="no">
-		<description>Fantasy Knight</description>
-		<year>1988</year>
-		<publisher>システムソフト (SystemSoft)</publisher>
-		<info name="alt_title" value="ファンタジーナイト" />
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="1089808">
-				<rom name="fantasy.nfd" size="1089808" crc="8357b005" sha1="6b733497e4f8aca422109d77c9dda43f583c41b7" offset="0" />
-			</dataarea>
-		</part>
-	</software>
-
-	<software name="farland2" supported="no">
+	<software name="farland2">
 		<description>Farland Story Denki - Arc Ou no Ensei</description>
 		<year>1994</year>
 		<publisher>テイジイエル (TGL)</publisher>
@@ -49888,27 +50649,27 @@
 		</part>
 	</software>
 
-	<software name="feedgyak" supported="no">
-		<description>Feed no Gyakushuu - Backlash of Feed (1993)(Kamejima)(Disk 1 of 2)</description>
+	<software name="feedgyak">
+		<description>Feed no Gyakushuu - Backlash of Feed</description>
 		<year>1993</year>
 		<publisher>亀島産業 (Kamejima Sangyou)</publisher>
 		<info name="alt_title" value="フィードの逆襲" />
 		<info name="release" value="19930220" />
 		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 1"/>
+			<feature name="part_id" value="System Disk"/>
 			<dataarea name="flop" size="1020924">
 				<rom name="backlash of feed (1993)(kamejima)(disk 1 of 2).fdd" size="1020924" crc="706efbbe" sha1="51d1b9e5022761a7068bcd06edce6ec2cbf2d210" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 2"/>
+			<feature name="part_id" value="Data Disk"/>
 			<dataarea name="flop" size="1166332">
 				<rom name="backlash of feed (1993)(kamejima)(disk 2 of 2).fdd" size="1166332" crc="81a41874" sha1="d50ecebaa1c583fe681e506dc3723f60b5a6d118" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="file0" supported="no">
+	<software name="file0">
 		<description>File:0 - Ghost Killer Kamimura Rei</description>
 		<year>1996</year>
 		<publisher>コロッサス (Colossus)</publisher>
@@ -49934,6 +50695,7 @@
 		</part>
 	</software>
 
+	<!-- Black screen on boot -->
 	<software name="flashb" supported="no">
 		<description>Flashback</description>
 		<year>1994</year>
@@ -49941,19 +50703,19 @@
 		<info name="alt_title" value="フラッシュバック" />
 		<info name="release" value="19940422" />
 		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 1"/>
+			<feature name="part_id" value="Disk A"/>
 			<dataarea name="flop" size="1329680">
 				<rom name="flashback_1.nfd" size="1329680" crc="bb415b0a" sha1="b42641e175060840c0df43e2319bc4ea75d29d89" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 2"/>
+			<feature name="part_id" value="Disk B"/>
 			<dataarea name="flop" size="1329680">
 				<rom name="flashback_2.nfd" size="1329680" crc="63240e74" sha1="6e925e1a57e8910b9324ed98f273475bb9fadc91" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 3"/>
+			<feature name="part_id" value="Disk C"/>
 			<dataarea name="flop" size="1329680">
 				<rom name="flashback_3.nfd" size="1329680" crc="0d370e26" sha1="2655bb815b92e98d496e03c2fd6723d01db04897" offset="0" />
 			</dataarea>
@@ -51857,7 +52619,7 @@
 		</part>
 	</software>
 
-	<software name="freelncd" supported="no">
+	<software name="freelncd">
 		<description>Lotus Freelance (Demo)</description>
 		<year>19??</year>
 		<publisher>Lotus</publisher>
@@ -52388,7 +53150,7 @@
 	<software name="cessna" supported="no">
 		<description>Nihon Juudan Cessna Flight</description>
 		<year>1988</year>
-		<publisher>コムパック (Compaq)</publisher>
+		<publisher>コムパック (Compac)</publisher>
 		<info name="alt_title" value="日本縦断セスナ・フライト" />
 		<info name="release" value="198806xx" />
 		<part name="flop1" interface="floppy_5_25">
@@ -57005,7 +57767,6 @@
 			</dataarea>
 		</part>
 	</software>
-
 	<!-- Disk changes don't work -->
 	<software name="elle" supported="no">
 		<description>Elle</description>
@@ -57335,6 +58096,7 @@
 		</part>
 	</software>
 
+	<!-- Doesn't recognize disk changes -->
 	<software name="farland3" supported="no">
 		<description>Farland Story - Tenshi no Namida</description>
 		<year>1994</year>
@@ -57373,12 +58135,13 @@
 		</part>
 	</software>
 
-	<software name="farland5" supported="no">
+	<software name="farland5">
 		<description>Farland Story - Daichi no Kizuna</description>
 		<year>1994</year>
 		<publisher>テイジイエル (TGL)</publisher>
 		<info name="alt_title" value="ファーランドストーリー 大地の絆" />
 		<info name="release" value="19950317" />
+		<info name="usage" value="Requires entering the game's barcode as a form of copy protection" />
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk A"/>
 			<dataarea name="flop" size="1307644">
@@ -57417,58 +58180,60 @@
 		</part>
 	</software>
 
-	<software name="file" supported="no">
-		<description>FILE - Kokubou Soushou Jouhoukyoku Jouhou Rouei Taisakubu Josei Jinmonin</description>
+	<software name="file">
+		<description>FILE - Kokubou Soushou Jouhoukyoku Jouhou Rouei Taisakubu Josei Jinmon'in</description>
 		<year>1994</year>
 		<publisher>メイビーソフト (May-Be Soft)</publisher>
 		<info name="alt_title" value="ＦＩＬＥ 国防総省　情報局　情報漏洩対策部女性尋問員" />
 		<info name="release" value="19941130" />
+		<info name="usage" value="Run INSTALL.EXE to copy the system files" />
 		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 1"/>
+			<feature name="part_id" value="Disk A"/>
 			<dataarea name="flop" size="1068028">
 				<rom name="file (1994)(may-be)(disk 1 of 3).fdd" size="1068028" crc="48c5d2f0" sha1="51bea568280c54943cec72b746631dffcbe8e1cb" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 2"/>
+			<feature name="part_id" value="Disk B"/>
 			<dataarea name="flop" size="1288188">
 				<rom name="file (1994)(may-be)(disk 2 of 3).fdd" size="1288188" crc="cd4b7ed9" sha1="67fdb6315796bbed7d480c91118dc68ac353d6ef" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 3"/>
+			<feature name="part_id" value="Disk C"/>
 			<dataarea name="flop" size="1292284">
 				<rom name="file (1994)(may-be)(disk 3 of 3).fdd" size="1292284" crc="ae9d5eff" sha1="a2dabf216604b9a11ff4dcae5f914d5297b4fc9d" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="foreign" supported="no">
+	<!-- Runs only on 286-class and older machines (e.g. PC-9801F, PC-9801UX), otherwise gives a "Packed file is corrupt" error. -->
+	<software name="foreign" supported="partial">
 		<description>Foreigner</description>
 		<year>1991</year>
 		<publisher>グレイト (Great)</publisher>
 		<info name="alt_title" value="フォリナー" />
 		<info name="release" value="19911125" />
 		<part name="flop1" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 1"/>
+			<feature name="part_id" value="Disk A"/>
 			<dataarea name="flop" size="1308668">
 				<rom name="foreigner (19xx)(communication group plum)(disk 1 of 4).fdd" size="1308668" crc="5589c8ec" sha1="bcb116d3408a8212c32bf792894750d68f246bae" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 2"/>
+			<feature name="part_id" value="Disk B"/>
 			<dataarea name="flop" size="1310716">
 				<rom name="foreigner (19xx)(communication group plum)(disk 2 of 4).fdd" size="1310716" crc="53a11b79" sha1="488305da3ee97d7bfb3a43136e6a5a57135fec8b" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop3" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 3"/>
+			<feature name="part_id" value="Disk C"/>
 			<dataarea name="flop" size="1298428">
 				<rom name="foreigner (19xx)(communication group plum)(disk 3 of 4).fdd" size="1298428" crc="801367ae" sha1="96e60a1e1606bd6c1e35a7f8e62fa772d0f9df52" offset="0" />
 			</dataarea>
 		</part>
 		<part name="flop4" interface="floppy_5_25">
-			<feature name="part_id" value="Disk 4"/>
+			<feature name="part_id" value="Disk D"/>
 			<dataarea name="flop" size="1308668">
 				<rom name="foreigner (19xx)(communication group plum)(disk 4 of 4).fdd" size="1308668" crc="08eb640e" sha1="28c7aee53e97e784c0214c56139e01f0b7def832" offset="0" />
 			</dataarea>
@@ -64104,6 +64869,7 @@
 		<description>Free Soft Library - CG Collection 1</description>
 		<year>19??</year>
 		<publisher>Shuwa System Trading</publisher>
+		<info name="usage" value="Run START.BAT from DOS" />
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
 			<dataarea name="flop" size="1265664">
@@ -64122,6 +64888,7 @@
 		<description>Free Soft Library - CG Collection 2</description>
 		<year>19??</year>
 		<publisher>Shuwa System Trading</publisher>
+		<info name="usage" value="Run START.BAT from DOS" />
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
 			<dataarea name="flop" size="1265664">
@@ -64140,6 +64907,7 @@
 		<description>Free Soft Library - Fantastic Windows</description>
 		<year>19??</year>
 		<publisher>Shuwa System Trading</publisher>
+		<info name="usage" value="Run INST.BAT from DOS" />
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
 			<dataarea name="flop" size="1265664">
@@ -64158,6 +64926,7 @@
 		<description>Free Soft Library - Keiba Collection</description>
 		<year>19??</year>
 		<publisher>Shuwa System Trading</publisher>
+		<info name="usage" value="Run any of the BAT files from DOS" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1265664">
 				<rom name="free_software_library_horse_racing_collection.fdi" size="1265664" crc="96e76cbc" sha1="9ccdc5e06f9158717ddeea281b06b4180099bc0a" offset="0" />
@@ -64333,7 +65102,8 @@
 		</part>
 	</software>
 
-	<software name="f1grandp">
+	<!-- Fatal error: Incorrect layout on track 0 head 0, expected_size=166666, current_size=167648 -->
+	<software name="f1grandp" supported="no">
 		<description>F1 Grandprix</description>
 		<year>1992</year>
 		<publisher>バイオひゃくパーセント (Bio 100%)</publisher>
@@ -65918,6 +66688,7 @@
 		<year>1995?</year>
 		<publisher>&lt;doujin&gt;</publisher>
 		<info name="author" value="ソフトさーくる　クレージュ ~ Soft Circle Courreges" />
+		<info name="usage" value="Run FAFM.BAT from DOS" />
 		<part name="flop1" interface="floppy_5_25">
 			<feature name="part_id" value="Disk 1"/>
 			<dataarea name="flop" size="1265664">
@@ -65932,9 +66703,10 @@
 		</part>
 	</software>
 
-	<software name="fnereid">
-		<description>Fervent Nereid - She's So Unusual (1995)(New York Spirits - Rapcat)</description>
-		<year>19??</year>
+	<!-- Disk I/O error -->
+	<software name="fnereid" supported="no">
+		<description>Fervent Nereid - She's So Unusual</description>
+		<year>1995</year>
 		<publisher>&lt;doujin&gt;</publisher>
 		<info name="alt_title" value="NYS &amp; Rapcat" />
 		<part name="flop1" interface="floppy_5_25">
@@ -65944,7 +66716,8 @@
 		</part>
 	</software>
 
-	<software name="firstfa5">
+	<!-- This probably requires 3.5" floppy emulation -->
+	<software name="firstfa5" supported="no">
 		<description>First Fantazy 5</description>
 		<year>1992</year>
 		<publisher>&lt;doujin&gt;</publisher>
@@ -66153,10 +66926,11 @@
 		</part>
 	</software>
 
-	<software name="fantgrl1" supported="no">
+	<software name="fantgrl1">
 		<description>Kazuma CG Collection - Fantastic Girls Vol.1</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>&lt;doujin&gt;</publisher>
+		<info name="author" value="Monitor Heaven" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="1261568">
 				<rom name="fantastic_girls_vol1.hdm" size="1261568" crc="f6f70f1d" sha1="1c47f012fcadaaaab9465a44e4559322e6013cb0" offset="0" />
diff -Nru mame-0.222+dfsg.1/hash/picno.xml mame-0.224+dfsg.1/hash/picno.xml
--- mame-0.222+dfsg.1/hash/picno.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/picno.xml	2020-08-26 08:57:19.000000000 +0000
@@ -19,15 +19,15 @@
   *RX112 Anime Box / アニメボックス
    RX113 Picno de Nihon Chizu / ピクノでにほんちず
    RX114 ???
-   RX115 Dokkin Shinri Game / どっきん心理ゲーム
+  *RX115 Dokkin Shinri Game / どっきん心理ゲーム
   *RX116 Kanji Club / 漢字俱楽部
    RX117 Picno de Kuku / ピクノで九九
   *RX118 Shirayuki-hime Monogatari / しらゆきひめ物語
   *RX119 Nontan to Issho Anime Stamp / ノンタンといっしょ アニメスタンプ
    RX120 Manfī no Fushigi na Bōken / マンフィーのふしぎなぼうけん
-   RX121 Hello Kitty no Eikawa / ハローキティの英会話
+  *RX121 Hello Kitty no Eikaiwa / ハローキティの英会話
   *RX122 Son Gokū no Bōken / そんごくうの冒険
-   RX123 Sen'yō Card Soft / 専用カードソフト
+  *RX123 Paint Ehon: Cinderella Monogatari / ペイント絵本シンデレラ物語
    RX124 Chibimaruko-chan no Tashizan Hikizan / ちびまる子ちゃんのたしざんひきざん
 -->
 
@@ -73,6 +73,32 @@
 		</part>
 	</software>
 
+	<software name="dokkins" supported="no">
+		<description>Dokkin Shinri Game</description>
+		<year>1994</year>
+		<publisher>Konami</publisher>
+		<info name="serial" value="RX115"/>
+		<info name="alt_title" value="どっきん心理ゲーム"/>
+		<part name="cart" interface="picno_cart">
+			<dataarea name="rom" size="524288">
+				<rom name="RX115 - Dokkin Shinri Game.bin" size="524288" crc="cdc9d45e" sha1="e6085b05888280b4e411beddac382b2242e239d1" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="hkittye" supported="no">
+		<description>Hello Kitty no Eikaiwa</description>
+		<year>1994</year>
+		<publisher>Konami</publisher>
+		<info name="serial" value="RX121"/>
+		<info name="alt_title" value="ハローキティの英会話"/>
+		<part name="cart" interface="picno_cart">
+			<dataarea name="rom" size="524288">
+				<rom name="RX121 - Hello Kitty no Eikaiwa.bin" size="524288" crc="30308638" sha1="a29d726ecb73262dd8e3fdabb35670bdf2c5ce1d" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="kanjiclb" supported="no">
 		<description>Kanji Club</description>
 		<year>1994</year>
@@ -126,6 +152,19 @@
 			</dataarea>
 		</part>
 	</software>
+
+	<software name="pecindere" supported="no">
+		<description>Paint Ehon: Cinderella Monogatari</description>
+		<year>1995</year>
+		<publisher>Konami</publisher>
+		<info name="serial" value="RX123"/>
+		<info name="alt_title" value="ペイント絵本シンデレラ物語"/>
+		<part name="cart" interface="picno_cart">
+			<dataarea name="rom" size="524288">
+				<rom name="rx123.bin" size="524288" crc="560e0eca" sha1="4d96991a025e2811727e7834f2c8a83841eccdb3" />
+			</dataarea>
+		</part>
+	</software>
 
 	<software name="artpuzzl" supported="no">
 		<description>Picno Art Puzzle</description>
diff -Nru mame-0.222+dfsg.1/hash/pi_storyreader_cart.xml mame-0.224+dfsg.1/hash/pi_storyreader_cart.xml
--- mame-0.222+dfsg.1/hash/pi_storyreader_cart.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/pi_storyreader_cart.xml	2020-08-26 08:57:19.000000000 +0000
@@ -455,4 +455,39 @@
 		</part>
 	</software>
 
+	<!-- Spanish carts -->
+
+	<software name="srlionkngs" supported="no">
+		<description>Disney El Rey León (Spain)</description>
+		<year>200?</year>
+		<publisher>Publications International Ltd. / Disney</publisher>
+		<part name="cart" interface="pi_storyreader_cart">
+			<dataarea name="rom" size="0x100000">
+				<rom name="El Rey Leon (SPA).bin" size="0x100000" crc="5bf23272" sha1="e9b3e232eb34834677741d33037397d8d2136fa0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="srpeterpns" supported="no">
+		<description>Walt Disney Peter Pan (Spain)</description>
+		<year>200?</year>
+		<publisher>Publications International Ltd. / Disney</publisher>
+		<part name="cart" interface="pi_storyreader_cart">
+			<dataarea name="rom" size="0x100000">
+				<rom name="Peter Pan (SPA).bin" size="0x100000" crc="3a2c5e66" sha1="7f0c3d3118a47949d9bf14579b6c16d11e334736" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="srsnowwhts" supported="no">
+		<description>Disney Blanca Nieves y los siete enanos (Spain)</description>
+		<year>200?</year>
+		<publisher>Publications International Ltd. / Disney</publisher>
+		<part name="cart" interface="pi_storyreader_cart">
+			<dataarea name="rom" size="0x100000">
+				<rom name="Blanca Nieves y los siete enanos (SPA).bin" size="0x100000" crc="b263a480" sha1="f6f30118e69b371e8fd25adef745d132da17d9f0" />
+			</dataarea>
+		</part>
+	</software>
+
 </softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/pmd85_cass.xml mame-0.224+dfsg.1/hash/pmd85_cass.xml
--- mame-0.222+dfsg.1/hash/pmd85_cass.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/pmd85_cass.xml	2020-08-26 08:57:19.000000000 +0000
@@ -3,16 +3,21 @@
 <!--
 license:CC0
 
-For now tape loading only works in PMD-85.1
+See source notes for more information about tapes and Basic.
+
+These tapes are generally usable with pmd851, pmd852, pmd852a, pmd852b and alfa.
+
+If the Usage shows a filename of xx, it's because it hasn't been possible to identify the number.
+
 -->
 
 <softwarelist name="pmd85_cass" description="Tesla PMD-85 cassettes">
 <!-- From TOSEC -->
-	<software name="auto">
+	<software name="auto" supported="partial"><!-- loads but does nothing -->
 		<description>Auto</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="1317">
 				<rom name="auto (198x)(-).ptp" size="1317" crc="1e33b4d6" sha1="6527f2b701e78de177315c43ce434287668ad22a"/>
@@ -24,7 +29,7 @@
 		<description>Bludiště</description>
 		<year>1988</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="8567">
 				<rom name="bludiste (1988)(-).ptp" size="8567" crc="62c8ad42" sha1="5b891fb3c92a6d7a23725fcb2e94a046314e98c2"/>
@@ -32,11 +37,11 @@
 		</part>
 	</software>
 
-	<software name="bombard">
+	<software name="bombard" supported="no"><!-- unrecognised, and can crash MAME at start -->
 		<description>Bombarder</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In BASIC, LOAD xx and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="2772">
 				<rom name="bombarder (19xx)(-).ptp" size="2772" crc="7e5b178e" sha1="2d876752fcf774be6464a084144a6a85e2f4c31d"/>
@@ -44,11 +49,11 @@
 		</part>
 	</software>
 
-	<software name="bdash">
+	<software name="bdash" supported="no"><!-- can crash MAME at start, machine resets while loading -->
 		<description>Boulder Dash</description>
 		<year>1988</year>
 		<publisher>VBG Software</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 03 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="24903">
 				<rom name="boulder dash (1988)(vbg software).ptp" size="24903" crc="9ea24bb6" sha1="19617ebfe73fcc752c7ddaa8d43367ca7cc74581"/>
@@ -56,11 +61,11 @@
 		</part>
 	</software>
 
-	<software name="faraonov">
+	<software name="faraonov" supported="no"><!-- unrecognised -->
 		<description>Faraonova Hbroka</description>
 		<year>1988</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In BASIC, LOAD xx and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="7096">
 				<rom name="faraonova hbroka (1988)(-).ptp" size="7096" crc="307994fc" sha1="198ce2a78304aeb61d081d3e64d8f737d2a64918"/>
@@ -68,11 +73,11 @@
 		</part>
 	</software>
 
-	<software name="flappy">
+	<software name="flappy" supported="no"><!-- machine resets while loading -->
 		<description>Flappy</description>
 		<year>1987</year>
 		<publisher>VBG Software</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 03 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="36448">
 				<rom name="flappy (1987)(vbg software).ptp" size="36448" crc="0f4cb0a9" sha1="40bf5f34362fdaa25f5de1f95640916ccaee1c4d"/>
@@ -84,7 +89,7 @@
 		<description>Fred</description>
 		<year>1988</year>
 		<publisher>VBG Software</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 03 and press Play. E to go up, Ctrl if you get stuck"/>
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="17235">
 				<rom name="fred (1988)(vbg software).ptp" size="17235" crc="39499aa9" sha1="9b1670900ec3aff9a78ad1dc4079a5c521f62e95"/>
@@ -96,7 +101,7 @@
 		<description>Galaxia</description>
 		<year>1988</year>
 		<publisher>Ceres Soft</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="21656">
 				<rom name="galaxia (1988)(ceres soft).ptp" size="21656" crc="7de36b2e" sha1="ee0e489c99e7274dca788f24bbf4ca45df0cfdda"/>
@@ -108,7 +113,7 @@
 		<description>Hlípa</description>
 		<year>1989</year>
 		<publisher>ZO Svazarmu</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="44336">
 				<rom name="hlipa (1989)(zo svazarmu).ptp" size="44336" crc="26f53a9f" sha1="90ee9074f98b4b110bf5ba34cfc3432a428bde35"/>
@@ -116,11 +121,11 @@
 		</part>
 	</software>
 
-	<software name="horac">
+	<software name="horac" supported="no"><!-- unrecognised, and can crash MAME at start -->
 		<description>Horác a pavouci</description>
 		<year>1985</year>
 		<publisher>ZO Svazarmu</publisher>
-
+		<info name="usage" value="In Monitor, MGLD xx and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="3292">
 				<rom name="horac a pavouci (1985)(zo svazarmu).ptp" size="3292" crc="44d23af1" sha1="960961bbffa7d76c0f4e9a0f64c5373f7eabb978"/>
@@ -128,11 +133,11 @@
 		</part>
 	</software>
 
-	<software name="karel">
+	<software name="karel" supported="no"><!-- loads then freezes -->
 		<description>Karel</description>
 		<year>1988</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="7027">
 				<rom name="karel (1988)(-).ptp" size="7027" crc="8cfb094b" sha1="6bb68b63b1baeb75400fd130a6f962ddafaea3ff"/>
@@ -140,11 +145,11 @@
 		</part>
 	</software>
 
-	<software name="kuriatko">
+	<software name="kuriatko" supported="partial"><!-- loads but does nothing -->
 		<description>Kuriatko</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="6379">
 				<rom name="kuriatko (19xx)(-).ptp" size="6379" crc="bb208585" sha1="3f0a958bc750d49b11b02cb2e5722109472bde5f"/>
@@ -156,7 +161,7 @@
 		<description>Manic Miner</description>
 		<year>1987</year>
 		<publisher>VBG Software</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play. Shift to jump." />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="27792">
 				<rom name="manic miner (1987)(vbg software).ptp" size="27792" crc="f21937aa" sha1="cfbc4ea6f39d2f38da095c19dd8e784e8686861f"/>
@@ -168,7 +173,7 @@
 		<description>Město robotů</description>
 		<year>1988</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="28221">
 				<rom name="mesto robotu (1988)(-).ptp" size="28221" crc="07938025" sha1="8c4460275829e503cf330c1fc08d27bd41e878ee"/>
@@ -176,11 +181,11 @@
 		</part>
 	</software>
 
-	<software name="pampuch">
+	<software name="pampuch" supported="partial"><!-- loads but does nothing -->
 		<description>Pampuch &amp; Duch</description>
 		<year>1986</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 01 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="4691">
 				<rom name="pampuch &amp; duch (1986)(-).ptp" size="4691" crc="8552213a" sha1="a2845da6f8ca66ae78d7815c8e839dfcca79eb06"/>
@@ -192,7 +197,7 @@
 		<description>Penetrator</description>
 		<year>1988</year>
 		<publisher>VBG Software</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 03 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="34125">
 				<rom name="penetrator (1988)(vbg software).ptp" size="34125" crc="c46033fe" sha1="19739f1b1328be1a0886a03fa7619652989afb22"/>
@@ -204,7 +209,7 @@
 		<description>Pexeso</description>
 		<year>1988</year>
 		<publisher>Petisoft</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="23006">
 				<rom name="pexeso (1988)(petisoft).ptp" size="23006" crc="f994b980" sha1="cb2b6be14dd2a85447f41cdf838e0dd66c7e3f97"/>
@@ -212,11 +217,11 @@
 		</part>
 	</software>
 
-	<software name="piskvork">
+	<software name="piskvork" supported="no"><!-- machine resets while loading -->
 		<description>Piškvorky</description>
 		<year>1987</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="10132">
 				<rom name="piskvorky (1987)(-).ptp" size="10132" crc="9ea553c2" sha1="4660b90d8d0c06107795a4faf2db7e5be20e92e2"/>
@@ -224,11 +229,11 @@
 		</part>
 	</software>
 
-	<software name="princjas">
+	<software name="princjas" supported="no"><!-- machine froze while loading -->
 		<description>Princ Jasoň</description>
 		<year>1989</year>
 		<publisher>Ceres Soft</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="37194">
 				<rom name="princ jason (1989)(ceres soft).ptp" size="37194" crc="f0e67ee4" sha1="3593fc5b95e16cd6c6ac95748f097bf5eb9da5e6"/>
@@ -240,7 +245,7 @@
 		<description>Saboter</description>
 		<year>1989</year>
 		<publisher>VBG Software</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 03 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="30541">
 				<rom name="saboter (1989)(vbg software).ptp" size="30541" crc="0706a1ca" sha1="1d6485f12903f3cc0be07754b975eaca67895f28"/>
@@ -248,11 +253,11 @@
 		</part>
 	</software>
 
-	<software name="tava">
+	<software name="tava" supported="no"><!-- unrecognised, and can crash MAME at start -->
 		<description>Tava - HRA s Nahodou a Prirodou</description>
 		<year>1985</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In BASIC, LOAD xx and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="6841">
 				<rom name="tava - hra s nahodou a prirodou (1985)(-).ptp" size="6841" crc="3346f7a1" sha1="50a87c7e81c637161742929b42f225183e3215f6"/>
@@ -260,11 +265,11 @@
 		</part>
 	</software>
 
-	<software name="zaby">
+	<software name="zaby" supported="partial"><!-- loads but does nothing -->
 		<description>Zaby</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 09 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="2883">
 				<rom name="zaby (198x)(-).ptp" size="2883" crc="f8ff3af1" sha1="89c0df30ce1c1e703396f76eb85cd77688054e2a"/>
@@ -272,11 +277,11 @@
 		</part>
 	</software>
 
-	<software name="zed">
+	<software name="zed" supported="partial"><!-- loads but does nothing -->
 		<description>ZED</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="1185">
 				<rom name="zed (198x)(-).ptp" size="1185" crc="99be7a35" sha1="bfbb57b61e5867082feb6d80c658a8bccabd0010"/>
@@ -284,11 +289,11 @@
 		</part>
 	</software>
 
-	<software name="grdemo">
+	<software name="grdemo" supported="no"><!-- loads then freezes -->
 		<description>GRDEMO</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="29639">
 				<rom name="zzz-unk-grdemo.ptp" size="29639" crc="f9e1e8ac" sha1="5dc2a7436073eb59ebe74a4c2c56ffdf2cb92cd5"/>
@@ -296,11 +301,11 @@
 		</part>
 	</software>
 
-	<software name="kurca">
+	<software name="kurca" supported="partial"><!-- loads but does nothing -->
 		<description>KURCA</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 14 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="18243">
 				<rom name="zzz-unk-kurca.ptp" size="18243" crc="dc8db4aa" sha1="0c74ac004911cd4024c08b0bc91a608ed1885455"/>
@@ -308,11 +313,11 @@
 		</part>
 	</software>
 
-	<software name="wurmi">
+	<software name="wurmi" supported="no"><!-- unrecognised, and can crash MAME at start -->
 		<description>WURMI</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In BASIC, LOAD xx and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="2440">
 				<rom name="zzz-unk-wurmi.ptp" size="2440" crc="8aa15e50" sha1="d69ccff727f54c79fdc689c7099de8e18dcfc1e1"/>
@@ -323,21 +328,21 @@
 <!-- From pmd85.borik.net/ -->
 
 <!-- bas20-demo.ptp
-| CURSOR   | Ilustrácia príkazu CURSOR                                        |
-| GENZN    | Generátor znakov MON 20                                          |
-| CHANNEL0 | Ilustrácia príkazov OUTPUT a ENTER kanál 0                       |
-| INPUT    | Ilustrácia príkazov PRINT DIM a INPUT DIM                        |
-| KEYBOARD | Rozloženie kláves na klávesnici v príkaze TEXT                   |
-| MENU     | Ilustrácia príkazu WINDOW                                        |
-| MODIF    | Program na modifikovanie BASIC 20                                |
-| SACHOV   | Ilustrácia zobrazenia sachovnice príkazmi FILL a WINDOW          |
-| ZIZALA   | Klasická Húsenka alias Wurmi                                     |
+| 00 CURSOR   | Ilustrácia príkazu CURSOR                                        |
+| 00 GENZN    | Generátor znakov MON 20                                          |
+| 00 CHANNEL0 | Ilustrácia príkazov OUTPUT a ENTER kanál 0                       |
+| 00 INPUT    | Ilustrácia príkazov PRINT DIM a INPUT DIM                        |
+| 00 KEYBOARD | Rozloženie kláves na klávesnici v príkaze TEXT                   |
+| 00 MENU     | Ilustrácia príkazu WINDOW                                        |
+| 00 MODIF    | Program na modifikovanie BASIC 20                                |
+| 00 SACHOV   | Ilustrácia zobrazenia sachovnice príkazmi FILL a WINDOW          |
+| 00 ZIZALA   | Klasická Húsenka alias Wurmi                                     |
 -->
-	<software name="bas20dem">
+	<software name="bas20dem"><!-- doesn't seem to work? -->
 		<description>BASIC20 Demo</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In BASIC v2.0, LOAD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="13998">
 				<rom name="bas20-demo.ptp" size="13998" crc="08f25c1f" sha1="bdd77e5c4417e20e2b256ab2e3e65a4a29439602"/>
@@ -346,17 +351,17 @@
 	</software>
 
 <!-- cirkus-sasa-tomasa.ptp
-| SASO     | AutoRun   | 1,2,2A,3 | A. Blaho, I. Kalaš, D. Tóth                |
-| POSTARIK | AutoRun   | 1,2,2A,3 | A. Blaho, I. Kalaš, M. Lupták, D. Tóth     |
-| ZMRZLINY | AutoRun   | 1,2,2A,3 | A. Blaho, I. Kalaš, ¼. Moravèíková, D. Tóth|
-| DOMCEKY  | AutoRun   | 1,2,2A,3 | A. Blaho, I. Kalaš, D. Tóth, M. Vittek     |
-| ROBOTIK  | AutoRun   | 1,2,2A,3 | A. Blaho, I. Kalaš, D. Tóth                |
+| 01 SASO     | AutoRun   | 1,2,2A,3 | A. Blaho, I. Kalaš, D. Tóth                |
+| 02 POSTARIK | AutoRun   | 1,2,2A,3 | A. Blaho, I. Kalaš, M. Lupták, D. Tóth     |
+| 03 ZMRZLINY | AutoRun   | 1,2,2A,3 | A. Blaho, I. Kalaš, M. Moravèíková, D. Tóth|
+| 04 DOMCEKY  | AutoRun   | 1,2,2A,3 | A. Blaho, I. Kalaš, D. Tóth, M. Vittek     |
+| 05 ROBOTIK  | AutoRun   | 1,2,2A,3 | A. Blaho, I. Kalaš, D. Tóth                |
 -->
 	<software name="cirkus">
 		<description>cirkus-sasa-tomasa</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In BASIC, LOAD 01 (saso), 02 (postarik), 03 (zmrzliny), 04 (domceky) or 05 (robotik), and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="112591">
 				<rom name="cirkus-sasa-tomasa.ptp" size="112591" crc="46e8bfda" sha1="f6ad3626d190a549bf6ade72739590bea9110326"/>
@@ -365,17 +370,17 @@
 	</software>
 
 <!-- copytape.ptp
-| COPY     | JUMP 0000 | 1        | IFO software - UAK                        |
-| COPYPLUS | JUMP 0100 | 1        | IFO software                              |
-| COPYCOPY | JUMP 0000 | 1        | IFO software                              |
-| COPPY    | JUMP 0000 | 1        | ODPM PRAHA 2                              |
-| WELL+2   | AutoRun   | 2,2A,3   | Karel Šuhajda, Petr Tùma                  |
+| 00 COPY     | JUMP 0000 | 1        | IFO software - UAK                        |
+| 00 COPYPLUS | JUMP 0100 | 1        | IFO software                              |
+| 00 COPYCOPY | JUMP 0000 | 1        | IFO software                              |
+| 00 COPPY    | JUMP 0000 | 1        | ODPM PRAHA 2                              |
+| 00 WELL+2   | AutoRun   | 2,2A,3   | Karel Šuhajda, Petr Tùma                  |
 -->
-	<software name="copytape">
+	<software name="copytape"><!-- untested -->
 		<description>Copy Tape</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="8177">
 				<rom name="copytape.ptp" size="8177" crc="1fb93bb7" sha1="d23d44bb4c2fa41a2fe5027b4c329665e725c688"/>
@@ -384,27 +389,27 @@
 	</software>
 
 <!-- dam+2.ptp
-| DAM+2    |  ?  | AutoRun   | 2,2A,3   | štandardný relokovate¾ný DAM        |
-| DAM+2.1  |  X  |           |          | \                                   |
-| DAM+2.2  |  X  |           |          |  \ manuál k DAM+2 napísaný v        |
-| DAM+2.3  |  X  |           |          |  / v textovom editore KASWORD       |
-| DAM+2.3  |  X  |           |          | /                                   |
-| TRANSFER |  ?  | JUMP 0000 | 2,2A,3   | konvertor zdroj. textov z DAM-0000  |
-| TRANSFER |  X  |           |          | manuál k utilite TRANSFER           |
-| OPTIMAX  |  ?  | JUMP 0000 | 2,2A,3   | optimalizér zdrojových textov       |
-| RESRC2   |  ?  | AutoRun   | 2,2A,3   | disassemblig do zdrojového textu    |
-| TEXTER   |  A  |           |          | zdrojak - prevod dat do zdr. textu  |
-| EXTENDCH |  A  |           |          | zdrojak - zobr. znakov s diakr.     |
-| JOYDEMO  |  A  |           |          | zdrojak - 4004/482 joystick test    |
-| JOYSTICK |  >  | RUN       | 1,2,2A,3 | BASIC - schema zapojenia joysticku  |
-| ALLRAM2A |  ?  | JUMP 7000 | 2A       | prepnutie do AllRAM na PMD 85-2A    |
-| DAM+9000 |  ?  | JUMP 9000 | 2A,3     | DAM od adresy 9000H                 |
+| 00 DAM+2    |  ?  | AutoRun   | 2,2A,3   | štandardný relokovate¾ný DAM        |
+| 00 DAM+2.1  |  X  |           |          | \                                   |
+| 00 DAM+2.2  |  X  |           |          |  \ manuál k DAM+2 napísaný v        |
+| 00 DAM+2.3  |  X  |           |          |  / v textovom editore KASWORD       |
+| 00 DAM+2.3  |  X  |           |          | /                                   |
+| 00 TRANSFER |  ?  | JUMP 0000 | 2,2A,3   | konvertor zdroj. textov z DAM-0000  |
+| 00 TRANSFER |  X  |           |          | manuál k utilite TRANSFER           |
+| 00 OPTIMAX  |  ?  | JUMP 0000 | 2,2A,3   | optimalizér zdrojových textov       |
+| 00 RESRC2   |  ?  | AutoRun   | 2,2A,3   | disassemblig do zdrojového textu    |
+| 00 TEXTER   |  A  |           |          | zdrojak - prevod dat do zdr. textu  |
+| 00 EXTENDCH |  A  |           |          | zdrojak - zobr. znakov s diakr.     |
+| 00 JOYDEMO  |  A  |           |          | zdrojak - 4004/482 joystick test    |
+| 00 JOYSTICK |  >  | RUN       | 1,2,2A,3 | BASIC - schema zapojenia joysticku  |
+| 00 ALLRAM2A |  ?  | JUMP 7000 | 2A       | prepnutie do AllRAM na PMD 85-2A    |
+| 00 DAM+9000 |  ?  | JUMP 9000 | 2A,3     | DAM od adresy 9000H                 |
 -->
-	<software name="dam2">
+	<software name="dam2"><!-- untested -->
 		<description>DAM+2</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="73030">
 				<rom name="dam+2.ptp" size="73030" crc="b388c4ee" sha1="7ee8d1625d4274ac068dab54d533603ba6d29eb1"/>
@@ -413,13 +418,13 @@
 	</software>
 
 <!-- dat-pmd.ptp
-| DAT PMD  |  ?  | JUMP 0000 | 2,2A,3   |                                     |
+| 00 DAT PMD  |  ?  | JUMP 0000 | 2,2A,3   |                                     |
 -->
 	<software name="datpmd">
 		<description>DAT PMD</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play, then JUMP 0000" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="6213">
 				<rom name="dat-pmd.ptp" size="6213" crc="4f262583" sha1="31ee56a4566eb3ddc137b1cfae27c17507c50948"/>
@@ -428,17 +433,17 @@
 	</software>
 
 <!-- devutils.ptp
-| DDT 6000 | JUMP 6000 | 1,2,2A,3 | ? / monitor, debbugger                    |
-| VMON 2.1 | JUMP E900 | 1,2,2A,3 | Petr Tùma / obrazovkový monitor, debugger |
-| ALLRAM2A | JUMP 7000 | 2A       | prepnutie do AllRAM na PMD 85-2A    |
-| VMON9000 | JUMP 9000 | 2A,3     | Petr Tùma / monitor, debugger v ext. mem. |
-| DISASS   | RUN       | 1,2,2A,3 | Pavol Kiko / disassembler v BASICu        |
+| 00 DDT 6000 | JUMP 6000 | 1,2,2A,3 | ? / monitor, debbugger                    |
+| 00 VMON 2.1 | JUMP E900 | 1,2,2A,3 | Petr Tùma / obrazovkový monitor, debugger |
+| 00 ALLRAM2A | JUMP 7000 | 2A       | prepnutie do AllRAM na PMD 85-2A    |
+| 00 VMON9000 | JUMP 9000 | 2A,3     | Petr Tùma / monitor, debugger v ext. mem. |
+| 00 DISASS   | RUN       | 1,2,2A,3 | Pavol Kiko / disassembler v BASICu        |
 -->
-	<software name="devutils">
+	<software name="devutils"><!-- untested -->
 		<description>Development Utils</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="20914">
 				<rom name="devutils.ptp" size="20914" crc="68c99dc8" sha1="cde02be5b0b1f53e1e16d3e5f7dcb76c731edaef"/>
@@ -447,23 +452,23 @@
 	</software>
 
 <!-- evidence.ptp
-| EVIDENCE |  ?  | AutoRun   | 1,2,2A,3 | samotný databázový systém           |
-| EVIDEDIT |  ?  | AutoRun   | 1,2,2A,3 | editor formulárov pre databázu      |
-| ZAJ.CIN  |  E  |           |          | \                                   |
-| CLEN.ZAK |  E  |           |          |  \ ukážkové dátove súbory           |
-|  SEZNAM  |  E  |           |          |  /                                  |
-| PROGRAMY |  E  |           |          | /                                   |
-| EVIMAN 1 |  X  |           |          | \                                   |
-| EVIMAN 2 |  X  |           |          |  \                                  |
-| EVIMAN 3 |  X  |           |          |  | manuál k programu                |
-| EVIMAN 4 |  X  |           |          |  /                                  |
-| EVIMAN 5 |  X  |           |          | /                                   |
+| 00 EVIDENCE |  ?  | AutoRun   | 1,2,2A,3 | samotný databázový systém           |
+| 00 EVIDEDIT |  ?  | AutoRun   | 1,2,2A,3 | editor formulárov pre databázu      |
+| 00 ZAJ.CIN  |  E  |           |          | \                                   |
+| 00 CLEN.ZAK |  E  |           |          |  \ ukážkové dátove súbory           |
+| 00  SEZNAM  |  E  |           |          |  /                                  |
+| 00 PROGRAMY |  E  |           |          | /                                   |
+| 00 EVIMAN 1 |  X  |           |          | \                                   |
+| 00 EVIMAN 2 |  X  |           |          |  \                                  |
+| 00 EVIMAN 3 |  X  |           |          |  | manuál k programu                |
+| 00 EVIMAN 4 |  X  |           |          |  /                                  |
+| 00 EVIMAN 5 |  X  |           |          | /                                   |
 -->
-	<software name="evidence">
+	<software name="evidence"><!-- untested -->
 		<description>Evidence</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="74358">
 				<rom name="evidence.ptp" size="74358" crc="25938fbf" sha1="dbc699b46932a701d5ebdaf063a9a5c74023ad8e"/>
@@ -471,11 +476,11 @@
 		</part>
 	</software>
 
-	<software name="lemm256k">
+	<software name="lemm256k" supported="no"><!-- machine resets while loading -->
 		<description>Lemmings (256k)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="115835">
 				<rom name="game-lemmings-256k.ptp" size="115835" crc="14800807" sha1="b5d3cc843584cbcd062252aa86d33c04b2f1814c"/>
@@ -487,7 +492,7 @@
 		<description>Lemmings</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="168252">
 				<rom name="game-lemmings.ptp" size="168252" crc="95cdfcd5" sha1="6f57ebffff27ffb9b44d29ab1484d3ead42e55ee"/>
@@ -496,20 +501,20 @@
 	</software>
 
 <!-- games-1.ptp
-| AUTO     | JUMP 2000 | 1,2,2A,3 | R.D.                                      |
-| INVADERS | JUMP 0100 | 1,2,2A,3 | IFO software, UAK Bratislava              |
-| KURA     | JUMP 0000 | 1,2,2A,3 | SAS                                       |
-| MUR      | JUMP 0000 | 1,2,2A,3 | SAS                                       |
-| PUZZLE   | JUMP 0000 | 1,2,2A,3 | SAS                                       |
-| TANK     | JUMP 2000 | 1,2,2A   | Pavol Kiko (prednostne pre PMD 85-1)      |
-| TENISS   | JUMP 7000 | 2,2A     | ?                                         |
-| ZABY     | JUMP 1500 | 1,2,2A,3 | ?                                         |
-| ZED      | JUMP 1000 | 1,2,2A,3 | R.D.                                      |
-| CROSFIRE | JUMP 0000 | 1        | ?                                         |
-| AIR RAID | JUMP 1000 | 1,2,2A,3 | ? (NITRA 1987)                            |
-| REVERZ   | JUMP 0000 | 1,2,2A,3 | SEN SOFTWARE                              |
+| 00 AUTO     | JUMP 2000 | 1,2,2A,3 | R.D.                                      |
+| 17 INVADERS | JUMP 0100 | 1,2,2A,3 | IFO software, UAK Bratislava              |
+| 01 KURA     | JUMP 0000 | 1,2,2A,3 | SAS                                       |
+| 04 MUR      | JUMP 0000 | 1,2,2A,3 | SAS                                       |
+| 02 PUZZLE   | JUMP 0000 | 1,2,2A,3 | SAS                                       |
+| 00 TANK     | JUMP 2000 | 1,2,2A   | Pavol Kiko (prednostne pre PMD 85-1)      |
+| 16 TENISS   | JUMP 7000 | 2,2A     | ?                                         |
+| 09 ZABY     | JUMP 1500 | 1,2,2A,3 | ?                                         |
+| 00 ZED      | JUMP 1000 | 1,2,2A,3 | R.D.                                      |
+| 00 CROSFIRE | JUMP 0000 | 1        | ?                                         |
+| 00 AIR RAID | JUMP 1000 | 1,2,2A,3 | ? (NITRA 1987)                            |
+| 00 REVERZ   | JUMP 0000 | 1,2,2A,3 | SEN SOFTWARE                              |
 -->
-	<software name="games1">
+	<software name="games1"><!-- untested -->
 		<description>Games 1</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -522,21 +527,21 @@
 	</software>
 
 <!-- games-2.ptp
-| GALAXIA  | AutoRun   | 1,2,2A   | Petr Tuma (CERES SOFT)                    |
-| GLUTTON  | AutoRun   | 1,2,2A,3 | Jaroslav Szczurek, Peter Gregorovic       |
-| GRDEMO   | AutoRun   | 1,2,2A,3 | Petr Tuma (CERES SOFT)                    |
-| JASON    | AutoRun   | 1,2,2A,3 | Petr Tuma (CERES SOFT)                    |
-| KANKAN   | JUMP 0000 | 1,2,2A,3 | ?                                         |
-| MESTO    | AutoRun   | 1,2,2A   | Vit Libovicky (heslo: konvalinka)         |
-| MANIC+   | AutoRun   | 1        | Vit Libovicky, Daniel Jenne               |
-| MANIC+2  | AutoRun   | 2,2A,3   | Vit Libovicky, Daniel Jenne               |
-| PAMPUCH  | AutoRun   | 1        | D. Blasko                                 |
-| PAMPUCHX | AutoRun   | 1        | D. Blasko (255 zivotov)                   |
-| ON&DUCH4 | AutoRun   | 1        | D. Blasko (s hudobnym podmazom)           |
-| SPACE-RA | AutoRun   | 1        | Dusan Kertes                              |
-| SP'DEMIS | AutoRun   | 1        | Ján Miche¾, Igor Kolla                    |
+| 00 GALAXIA  | AutoRun   | 1,2,2A   | Petr Tuma (CERES SOFT)                    |
+| 00 GLUTTON  | AutoRun   | 1,2,2A,3 | Jaroslav Szczurek, Peter Gregorovic       |
+| 00 GRDEMO   | AutoRun   | 1,2,2A,3 | Petr Tuma (CERES SOFT)                    |
+| 00 JASON    | AutoRun   | 1,2,2A,3 | Petr Tuma (CERES SOFT)                    |
+| 00 KANKAN   | JUMP 0000 | 1,2,2A,3 | ?                                         |
+| 00 MESTO    | AutoRun   | 1,2,2A   | Vit Libovicky (heslo: konvalinka)         |
+| 02 MANIC+   | AutoRun   | 1        | Vit Libovicky, Daniel Jenne               |
+| 01 MANIC+2  | AutoRun   | 2,2A,3   | Vit Libovicky, Daniel Jenne               |
+| 00 PAMPUCH  | AutoRun   | 1        | D. Blasko                                 |
+| 00 PAMPUCHX | AutoRun   | 1        | D. Blasko (255 zivotov)                   |
+| 17 ON&DUCH4 | AutoRun   | 1        | D. Blasko (s hudobnym podmazom)           |
+| 02 SPACE-RA | AutoRun   | 1        | Dusan Kertes                              |
+| 01 SP'DEMIS | AutoRun   | 1        | Ján Miche, Igor Kolla                     |
 -->
-	<software name="games2">
+	<software name="games2"><!-- untested -->
 		<description>Games 2</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -549,15 +554,15 @@
 	</software>
 
 <!-- games-3.ptp
-| CATEGORI | JUMP 1000 | 1        | Miroslav Urda                             |
-| COBRA    | JUMP 5B00 | 1        | Miroslav Urda                             |
-| STRIPPED | AutoRun   | 1        | Miroslav Urda                             |
-| PANGO    | AutoRun   | 1        | Miroslav Urda                             |
-| MISSION  | AutoRun   | 1        | Miroslav Urda                             |
-| RESCUER  | AutoRun   | 1        | Miroslav Urda, OK soft                    |
-| MICRHYTM | AutoRun   | 1        | Miroslav Urda                             |
+| 11 CATEGORI | JUMP 1000 | 1        | Miroslav Urda                             |
+| 05 COBRA    | JUMP 5B00 | 1        | Miroslav Urda                             |
+| 03 STRIPPED | AutoRun   | 1        | Miroslav Urda                             |
+| 30 PANGO    | AutoRun   | 1        | Miroslav Urda                             |
+| 06 MISSION  | AutoRun   | 1        | Miroslav Urda                             |
+| 01 RESCUER  | AutoRun   | 1        | Miroslav Urda, OK soft                    |
+| 05 MICRHYTM | AutoRun   | 1        | Miroslav Urda                             |
 -->
-	<software name="games3">
+	<software name="games3"><!-- untested -->
 		<description>Games 3</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -570,20 +575,20 @@
 	</software>
 
 <!-- games-4004-482.ptp
-| -WILLY-  | AutoRun   | 1        | Karel Šuhajda                             |
-| WILLY2   | JUMP 0000 | 2,2A,3   | Karel Šuhajda                             |
-| HORACE+2 | AutoRun   | 1,2,2A,3 | Karel Šuhajda                             |
-| FERLAJT  | AutoRun   | 1        | K. Šuhajda, Pavel Šindelka, Michal Èerný  |
-| M-TRON 1 | AutoRun   | 1        | Karel Šuhajda, Michal Èerný               |
-| M-TRON 2 | AutoRun   | 1        | Karel Šuhajda, Michal Èerný               |
-| M-TRON 3 | AutoRun   | 1        | Karel Šuhajda, Michal Èerný               |
-| PISQORKY | AutoRun   | 2,2A,3   | K. Šuhajda, P. Paleta                     |
-| BLUDISTE | AutoRun   | 1,2,2A,3 | K. Šuhajda, P. Šindelka, M. Èerný, T. Švec|
-| PEXESO   | AutoRun   | 1,2,2A   | Petr Thiel - elektrické znaèky            |
-| PEXESO2  | AutoRun   | 1,2,2A   | Petr Thiel - detské obrázky               |
-| HLIPA    | AutoRun   | 1,2,2A   | Karel Šuhajda, Tomáš Švec                 |
+| 00 -WILLY-  | AutoRun   | 1        | Karel Šuhajda                             |
+| 00 WILLY2   | JUMP 0000 | 2,2A,3   | Karel Šuhajda                             |
+| 17 HORACE+2 | AutoRun   | 1,2,2A,3 | Karel Šuhajda                             |
+| 13 FERLAJT  | AutoRun   | 1        | K. Šuhajda, Pavel Šindelka, Michal Èerný  |
+| 00 M-TRON 1 | AutoRun   | 1        | Karel Šuhajda, Michal Èerný               |
+| 00 M-TRON 2 | AutoRun   | 1        | Karel Šuhajda, Michal Èerný               |
+| 00 M-TRON 3 | AutoRun   | 1        | Karel Šuhajda, Michal Èerný               |
+| 00 PISQORKY | AutoRun   | 2,2A,3   | K. Šuhajda, P. Paleta                     |
+| 00 BLUDISTE | AutoRun   | 1,2,2A,3 | K. Šuhajda, P. Šindelka, M. Èerný, T. Švec|
+| 00 PEXESO   | AutoRun   | 1,2,2A   | Petr Thiel - elektrické znaèky            |
+| 00 PEXESO2  | AutoRun   | 1,2,2A   | Petr Thiel - detské obrázky               |
+| 21 HLIPA    | AutoRun   | 1,2,2A   | Karel Šuhajda, Tomáš Švec                 |
 -->
-	<software name="game4004">
+	<software name="game4004"><!-- untested -->
 		<description>Games by 4004/482 ZO Svazarmu</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -596,10 +601,10 @@
 	</software>
 
 <!-- games-libor-lasota.ptp
-| JETPAC   | AutoRun   | 1,2,2A,3 | Konverzia hry zo ZX Spectrum              |
-| PSSST    | AutoRun   | 1,2,2A,3 | Konverzia hry zo ZX Spectrum              |
+| 01 JETPAC   | AutoRun   | 1,2,2A,3 | Konverzia hry zo ZX Spectrum              |
+| 02 PSSST    | AutoRun   | 1,2,2A,3 | Konverzia hry zo ZX Spectrum              |
 -->
-	<software name="gameslib">
+	<software name="gameslib"><!-- untested -->
 		<description>Games by Libor Lasota</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -612,13 +617,13 @@
 	</software>
 
 <!-- games-rm-team.ptp
-| KVADRO   | AutoRun | 1,2,2A,3 | Martin Bórik, Roman Bórik                   |
-| KVADRO.E | AutoRun | 1,2,2A,3 | Martin Bórik, Roman Bórik / anglická verzia |
-| PLOTTING | AutoRun | 1,2,2A,3 | Roman Bórik, Martin Bórik                   |
-| SPINDZ   | AutoRun | 2A,3     | Roman Bórik, Martin Bórik                   |
-| GAME2048 | AutoRun | 1,2,2A,3 | Roman Bórik, Martin Bórik                   |
+| 00 KVADRO   | AutoRun | 1,2,2A,3 | Martin Bórik, Roman Bórik                   |
+| 00 KVADRO.E | AutoRun | 1,2,2A,3 | Martin Bórik, Roman Bórik / anglická verzia |
+| 00 PLOTTING | AutoRun | 1,2,2A,3 | Roman Bórik, Martin Bórik                   |
+| 00 SPINDZ   | AutoRun | 2A,3     | Roman Bórik, Martin Bórik                   |
+| 00 GAME2048 | AutoRun | 1,2,2A,3 | Roman Bórik, Martin Bórik                   |
 -->
-	<software name="gamesrm">
+	<software name="gamesrm"><!-- untested -->
 		<description>Games by RM-TEAM</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -631,22 +636,22 @@
 	</software>
 
 <!-- games-vbg.ptp
-| JERRY    | JUMP 1100 | 1,2,2A,3 | Jerry                                     |
-| *FLAPPY* | AutoRun   | 1        | Flappy (prvotna verzia, odlisny obrazok)  |
-| FLAPPY+4 | AutoRun   | 1,2,2A,3 | Flappy                                    |
-| MANIC2+3 | AutoRun   | 1,2,2A,3 | Manic Miner                               |
-| MANIC23c | AutoRun   | 1,2,2A,3 | Manic Miner s Cheat modom                 |
-| BOULDER  | AutoRun   | 1        | Boulder Dash (prvotna verzia)             |
-| BOULD+4  | AutoRun   | 1,2,2A,3 | Boulder Dash                              |
-| PENETR.3 | AutoRun   | 1,2,2A,3 | Penetrator                                |
-| FRED +4  | AutoRun   | 1,2,2A,3 | Fred                                      |
-| TETRIS+4 | AutoRun   | 1,2,2A,3 | Tetris (aj vo farbe)                      |
-| SABO +4  | AutoRun   | 1,2,2A,3 | Saboter                                   |
-| CERES-01 | AutoRun   | 1,2,2A,3 | DEMO od CERES-SOFTu s POKE do hier        |
-|          |           |          |   PENETR.3, FLAPPY+4, MANIC2+3, BOULD+4   |
-| PONTRIS  | AutoRun   | 1,2,2A,3 | Pontris (nova hra aj vo farbe, rok 2010)  |
+| 00 JERRY    | JUMP 1100 | 1,2,2A,3 | Jerry                                     |
+| 03 *FLAPPY* | AutoRun   | 1        | Flappy (prvotna verzia, odlisny obrazok)  |
+| 03 FLAPPY+4 | AutoRun   | 1,2,2A,3 | Flappy                                    |
+| 03 MANIC2+3 | AutoRun   | 1,2,2A,3 | Manic Miner                               |
+| 03 MANIC23c | AutoRun   | 1,2,2A,3 | Manic Miner s Cheat modom                 |
+| 03 BOULDER  | AutoRun   | 1        | Boulder Dash (prvotna verzia)             |
+| 03 BOULD+4  | AutoRun   | 1,2,2A,3 | Boulder Dash                              |
+| 03 PENETR.3 | AutoRun   | 1,2,2A,3 | Penetrator                                |
+| 03 FRED +4  | AutoRun   | 1,2,2A,3 | Fred                                      |
+| 03 TETRIS+4 | AutoRun   | 1,2,2A,3 | Tetris (aj vo farbe)                      |
+| 03 SABO +4  | AutoRun   | 1,2,2A,3 | Saboter                                   |
+| 00 CERES-01 | AutoRun   | 1,2,2A,3 | DEMO od CERES-SOFTu s POKE do hier        |
+|             |           |          |   PENETR.3, FLAPPY+4, MANIC2+3, BOULD+4   |
+| 00 PONTRIS  | AutoRun   | 1,2,2A,3 | Pontris (nova hra aj vo farbe, rok 2010)  |
 -->
-	<software name="gamesvbg">
+	<software name="gamesvbg"><!-- untested -->
 		<description>Games by VBG Software</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -659,13 +664,13 @@
 	</software>
 
 <!-- gr.ptp
-| GR v1.00 |  ?  | AutoRun   | 2,2A,3   |                                     |
-| GR - obr |  C  |           |          | \                                   |
-| GR - obr |  C  |           |          |  \ obrázky vytvorené v editore      |
-| GR - obr |  C  |           |          |  /                                  |
-| GR - obr |  C  |           |          | /                                   |
+| 00 GR v1.00 |  ?  | AutoRun   | 2,2A,3   |                                     |
+| 00 GR - obr |  C  |           |          | \                                   |
+| 00 GR - obr |  C  |           |          |  \ obrázky vytvorené v editore      |
+| 00 GR - obr |  C  |           |          |  /                                  |
+| 00 GR - obr |  C  |           |          | /                                   |
 -->
-	<software name="gr">
+	<software name="gr"><!-- untested -->
 		<description>GR v1.00</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -678,11 +683,11 @@
 	</software>
 
 <!-- gred.ptp
-| GRED 2.1 |  ?  | AutoRun   | 2,2A,3   | verzia 2.1 - 10/1988                |
-| GRED 3.2 |  ?  | AutoRun   | 2,2A,3   | verzia 3.2 - 4/1989                 |
-| *        |  C  |           |          | rôzne obrázky zo ZX Spectrum        |
+| 00 GRED 2.1 |  ?  | AutoRun   | 2,2A,3   | verzia 2.1 - 10/1988                |
+| 00 GRED 3.2 |  ?  | AutoRun   | 2,2A,3   | verzia 3.2 - 4/1989                 |
+| 00 *        |  C  |           |          | rôzne obrázky zo ZX Spectrum        |
 -->
-	<software name="gred">
+	<software name="gred"><!-- untested -->
 		<description>GRED</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -695,10 +700,10 @@
 	</software>
 
 <!-- grep.ptp
-| GREP2    |  ?  | AutoRun   | 2,2A,3   |                                     |
-| *        |  G  |           |          | ukážkové sprity                     |
+| 00 GREP2    |  ?  | AutoRun   | 2,2A,3   |                                     |
+| 00 *        |  G  |           |          | ukážkové sprity                     |
 -->
-	<software name="grep">
+	<software name="grep"><!-- untested -->
 		<description>GREP</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -711,26 +716,26 @@
 	</software>
 
 <!-- hry1.ptp
-| BLACK    | 1,2,2A,3 | Andrej Blaho / logicka hra                            |
-| BOMBARDE | 1,2,2A   | org. František Fuka / Bombardér                       |
-| ELKA     | 1,2,2A   | D / logicka hra                                       |
-| FARAON   | 1,2,2A,3 | KM PF Nitra / log. hra Faraónova hrobka štýlu "HRA 15"|
-| GARDNER  | 2,2A,3   | Roman Bórik pod¾a Zenitu Pionierov / logická hra      |
-| LAVICKA  | 2,2A,3   | ? / hra Lietajúca lavièka (primárne pre PMD 85-3)     |
-| KON      | 1,2,2A   | ? / logická hra ah koòom                              |
-| NALET    | 3        | org. František Fuka / upraveny Bombardér pre PMD 85-3 |
-| PAVUCI   | 1,2,2A   | Karel Šuhajda / Horac a pavouci                       |
-| PEXESO   | 1,2,2A,3 | ? Zenit Pionierov / Písmenové pexeso                  |
-| REVERZ   | 2,2A,3   | P.N. / logická hra (primárne pre PMD 85-3)            |
-| ROBINSON | 1,2,2A   | RNDr. Daniel Polcin / strielanie na kaèicu :-)        |
-| SLALOM   | 3        | ? / slalom na lyžiach :-)                             |
-| TANKY    | 1,2,2A   | Pavol Kiko / Tanková bitva                            |
-| TAVA     | 1,2,2A,3 | KM PF Nitra / textovka-prejdite s avou 200km v púšti  |
-| VIDEOSTP | 2,2A,3   | Roman Bórik / na motívy známej TV hry                 |
-| VOTRELCI | 2,2A,3   | TESLA / nicenie votrelcov (primárne pre PMD 85-3)     |
-| WURMI    | 1,2,2A   | org. František Fuka / Húsenka :-)                     |
+| 01 BLACK    | 1,2,2A,3 | Andrej Blaho / logicka hra                            |
+| 02 BOMBARDE | 1,2,2A   | org. František Fuka / Bombardér                       |
+| 00 ELKA     | 1,2,2A   | D / logicka hra                                       |
+| 03 FARAON   | 1,2,2A,3 | KM PF Nitra / log. hra Faraónova hrobka štýlu "HRA 15"|
+| 44 GARDNER  | 2,2A,3   | Roman Bórik pod¾a Zenitu Pionierov / logická hra      |
+| 00 LAVICKA  | 2,2A,3   | ? / hra Lietajúca lavièka (primárne pre PMD 85-3)     |
+| 04 KON      | 1,2,2A   | ? / logická hra ah koòom                              |
+| 00 NALET    | 3        | org. František Fuka / upraveny Bombardér pre PMD 85-3 |
+| 40 PAVUCI   | 1,2,2A   | Karel Šuhajda / Horac a pavouci                       |
+| 30 PEXESO   | 1,2,2A,3 | ? Zenit Pionierov / Písmenové pexeso                  |
+| 00 REVERZ   | 2,2A,3   | P.N. / logická hra (primárne pre PMD 85-3)            |
+| 01 ROBINSON | 1,2,2A   | RNDr. Daniel Polcin / strielanie na kaèicu :-)        |
+| 00 SLALOM   | 3        | ? / slalom na lyžiach :-)                             |
+| 53 TANKY    | 1,2,2A   | Pavol Kiko / Tanková bitva                            |
+| 05 TAVA     | 1,2,2A,3 | KM PF Nitra / textovka-prejdite s avou 200km v púšti  |
+| 11 VIDEOSTP | 2,2A,3   | Roman Bórik / na motívy známej TV hry                 |
+| 00 VOTRELCI | 2,2A,3   | TESLA / nicenie votrelcov (primárne pre PMD 85-3)     |
+| 07 WURMI    | 1,2,2A   | org. František Fuka / Húsenka :-)                     |
 -->
-	<software name="hry1">
+	<software name="hry1"><!-- untested -->
 		<description>HRY1</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -743,20 +748,20 @@
 	</software>
 
 <!-- hry2.ptp
-| ADC      | 2,2A     | R&I / chodièka                                        |
-| BARBAR   | 2,2A     | R&I / chodièka                                        |
-| COSMIC   | 2,2A     | R&I / chodièka                                        |
-| ERB      | 2,2A     | R&I / chodièka                                        |
-| JOE1     | 2,2A     | R&I / chodièka                                        |
-| KRES     | 2,2A     | R&I / kreslenie                                       |
-| MYTH1    | 2,2A     | R&I / chodièka                                        |
-| MYTH2    | 2,2A     | R&I / chodièka                                        |
-| MYTH3    | 2,2A     | R&I / chodièka                                        |
-| NINJA    | 2,2A     | R&I / chodièka                                        |
-| OSTROV   | 2,2A     | R&I / chodièka                                        |
-| POKLAD   | 2,2A     | R&I / chodièka                                        |
+| 01 ADC      | 2,2A     | R&I / chodièka                                        |
+| 01 BARBAR   | 2,2A     | R&I / chodièka                                        |
+| 01 COSMIC   | 2,2A     | R&I / chodièka                                        |
+| 01 ERB      | 2,2A     | R&I / chodièka                                        |
+| 01 JOE1     | 2,2A     | R&I / chodièka                                        |
+| 01 KRES     | 2,2A     | R&I / kreslenie                                       |
+| 01 MYTH1    | 2,2A     | R&I / chodièka                                        |
+| 01 MYTH2    | 2,2A     | R&I / chodièka                                        |
+| 01 MYTH3    | 2,2A     | R&I / chodièka                                        |
+| 01 NINJA    | 2,2A     | R&I / chodièka                                        |
+| 01 OSTROV   | 2,2A     | R&I / chodièka                                        |
+| 01 POKLAD   | 2,2A     | R&I / chodièka                                        |
 -->
-	<software name="hry2">
+	<software name="hry2"><!-- untested -->
 		<description>HRY2</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -769,13 +774,13 @@
 	</software>
 
 <!-- k-studio.ptp
-| K-STUDIO |  ?  | AutoRun   | 2,2A,3   |                                     |
+| 01 K-STUDIO |  ?  | AutoRun   | 2,2A,3   |                                     |
 -->
 	<software name="kstudio">
-		<description>K-Studio</description>
-		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
-
+		<description>K-Studio v2.7</description>
+		<year>1988</year>
+		<publisher>S2 Software</publisher>
+		<info name="usage" value="In Monitor, MGLD 01 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="19156">
 				<rom name="k-studio.ptp" size="19156" crc="a765d1c3" sha1="0aaa901ffeb3f2e7bb38f92e87bc3720d5b1938b"/>
@@ -784,18 +789,18 @@
 	</software>
 
 <!-- karel.ptp
-| KAREL    | AutoRun   | 1,2,2A,3 | Karel Šuhajda / 2D Karel                  |
-| KAREL2D  | RUN       | 1,2,2A   | Tomáš Bartovský / 2D Karel (Basic)        |
-| KAREL-2R | JUMP 0000 | 1        | Tomáš Bartovský / 2D Karel                |
-| KAREL3D0 | JUMP 0000 | 1,2,2A,3 | Marián Vittek / 3D Karel v0.0             |
-| KAREL3.2 | JUMP 0000 | 1,2,2A,3 | Marián Vittek / 3D Karel v2.0             |
-| KAREL3D2 | JUMP 0000 | 1,2,2A,3 | Marián Vittek / 3D Karel v3.2             |
+| 00 KAREL    | AutoRun   | 1,2,2A,3 | Karel Šuhajda / 2D Karel                  |
+| 22 KAREL2D  | RUN       | 1,2,2A   | Tomáš Bartovský / 2D Karel (Basic)        |
+| 16 KAREL-2R | JUMP 0000 | 1        | Tomáš Bartovský / 2D Karel                |
+| 17 KAREL3D0 | JUMP 0000 | 1,2,2A,3 | Marián Vittek / 3D Karel v0.0             |
+| 18 KAREL3.2 | JUMP 0000 | 1,2,2A,3 | Marián Vittek / 3D Karel v2.0             |
+| 19 KAREL3D2 | JUMP 0000 | 1,2,2A,3 | Marián Vittek / 3D Karel v3.2             |
 -->
-	<software name="karela" cloneof="karel">
+	<software name="karela" cloneof="karel"><!-- untested -->
 		<description>Karel (Alt)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
-
+		<info name="usage" value="In Monitor, MGLD 00 and press Play" />
 		<part name="cass1" interface="pmd85_cass">
 			<dataarea name="cass" size="54244">
 				<rom name="karel.ptp" size="54244" crc="20e10dd8" sha1="ce8c6b7a790754edecb65bb9e6f15ee64d466502"/>
@@ -804,12 +809,12 @@
 	</software>
 
 <!-- karel2d3d.ptp
-| KAREL    | AutoRun   | 1,2,2A,3 | Karel Šuhajda / 2D Karel                  |
-| KAREL3D0 | AutoRun   | 1,2,2A,3 | Marián Vittek / 3D Karel v0.0             |
-| KAREL3.2 | AutoRun   | 1,2,2A,3 | Marián Vittek / 3D Karel v2.0             |
-| KAREL3D2 | AutoRun   | 1,2,2A,3 | Marián Vittek / 3D Karel v3.2             |
+| 00 KAREL    | AutoRun   | 1,2,2A,3 | Karel Šuhajda / 2D Karel                  |
+| 01 KAREL3D0 | AutoRun   | 1,2,2A,3 | Marián Vittek / 3D Karel v0.0             |
+| 02 KAREL3.2 | AutoRun   | 1,2,2A,3 | Marián Vittek / 3D Karel v2.0             |
+| 03 KAREL3D2 | AutoRun   | 1,2,2A,3 | Marián Vittek / 3D Karel v3.2             |
 -->
-	<software name="karelb" cloneof="karel">
+	<software name="karelb" cloneof="karel"><!-- untested -->
 		<description>Karel (Alt 2)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -822,13 +827,13 @@
 	</software>
 
 <!-- krivky.ptp
-    - SIERPIN  - program na kreslenie Sierpinskeho kriviek
-    - HILBERT  - program na kreslenie Hilbertovych kriviek
-    - W-KRIVKY - program na kreslenie W kriviek (Iba krivky 1. a 2. rádu sa
+    - SIERPIN  - program na kreslenie Sierpinskeho kriviek (01/P, 02/?, 03/?, 04/?)
+    - HILBERT  - program na kreslenie Hilbertovych kriviek (01/P, 02/?, 03/?)
+    - W-KRIVKY - program na kreslenie W kriviek (Iba krivky 1. a 2. rádu sa (01/P, 02/?, 03/?)
                  kreslia správne. Od 3. rádu sa kreslia zle.
                  Nájde niekto správne riešenie?... :-)
 -->
-	<software name="krivky">
+	<software name="krivky"><!-- untested -->
 		<description>Krivky</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -841,16 +846,16 @@
 	</software>
 
 <!-- logo.ptp
-    - ZOFKA1   - korytnaèka Žofka v BASICu (v1)
-    - ZOFKA2   - korytnaèka Žofka v BASICu (v2/v2A/v3)
-    - ZOFKA 2  - korytnaèka Žofka v BASICu (staršia verzia) (v2/v2A/v3)
-    - ZOFKA2T  - korytnaèka Žofka v BASICu s prikazom pre tlac (v2/v2A/v3)
-    - Zofka 3  - korytnaèka Žofka v strojovom kóde (v2/v2A/v3). Po nahratí sa spúšta JUMP 0003
+ 01 - ZOFKA1   - korytnaèka Žofka v BASICu (v1)
+ 10 - ZOFKA2   - korytnaèka Žofka v BASICu (v2/v2A/v3)
+ 12 - ZOFKA 2  - korytnaèka Žofka v BASICu (staršia verzia) (v2/v2A/v3)
+ 11 - ZOFKA2T  - korytnaèka Žofka v BASICu s prikazom pre tlac (v2/v2A/v3)
+ 42 - Zofka 3  - korytnaèka Žofka v strojovom kóde (v2/v2A/v3). Po nahratí sa spúšta JUMP 0003
                  (pri PMD 85-3 je treba najprv prejs do režimu kompatibility zadanim JUMP FFF0 v monitore).
-    - MRAVEC   - jednoduchý logický jazyk Mravec (v2/v2A/v3)
-    - T.MRAVEC - jednoduchý logický jazyk Toèi-Mravec (v2/v2A/v3)
+ 34 - MRAVEC   - jednoduchý logický jazyk Mravec (v2/v2A/v3)
+ 52 - T.MRAVEC - jednoduchý logický jazyk Toèi-Mravec (v2/v2A/v3)
 -->
-	<software name="logo">
+	<software name="logo"><!-- untested -->
 		<description>LOGO</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -863,13 +868,13 @@
 	</software>
 
 <!-- mrs.ptp
-| MRS      | JUMP 6000 | 1        |                                           |
-| MRS-NOVE | JUMP 6000 | 1        | upravená verzia                           |
-| MRS2     | JUMP 6000 | 2,2A,3   | verzia pre PMD 85-2, 2A a 3               |
-| LIB      |           |          | knižnica                                  |
-| BZZZZT   |           |          | zdroják - zabzuèanie z hry Hlípa          |
+| 00 MRS      | JUMP 6000 | 1        |                                           |
+| 00 MRS-NOVE | JUMP 6000 | 1        | upravená verzia                           |
+| 00 MRS2     | JUMP 6000 | 2,2A,3   | verzia pre PMD 85-2, 2A a 3               |
+| 00 LIB      |           |          | knižnica                                  |
+| 00 BZZZZT   |           |          | zdroják - zabzuèanie z hry Hlípa          |
 -->
-	<software name="mrs">
+	<software name="mrs"><!-- untested -->
 		<description>MRS</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -882,13 +887,13 @@
 	</software>
 
 <!-- musica.ptp
-| MUSICA   |  ?  | AutoRun   | 1        |                                     |
-| MUSICA+2 |  ?  | AutoRun   | 2,2A,3   |                                     |
-| MUSICA+3 |  ?  | AutoRun   | 2,2A,3   |                                     |
-| MUSICman |  T  |           |          | manuál k programu                   |
-| *        |  M  |           |          | rôzne ukážkové hudby                |
+| 00 MUSICA   |  ?  | AutoRun   | 1        |                                     |
+| 00 MUSICA+2 |  ?  | AutoRun   | 2,2A,3   |                                     |
+| 00 MUSICA+3 |  ?  | AutoRun   | 2,2A,3   |                                     |
+| 00 MUSICman |  T  |           |          | manuál k programu                   |
+| 00 *        |  M  |           |          | rôzne ukážkové hudby                |
 -->
-	<software name="musica">
+	<software name="musica"><!-- untested -->
 		<description>Musica</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -901,20 +906,20 @@
 	</software>
 
 <!-- rozne.ptp
-| BUBLSORT | 1,2,2A,3 | KM PF Nitra / vysvetlenie bublinkového triedenia      |
-| GONIO    | 2,2A,3   | Martin Bórik / ukážka SIN/COS (primárne pre PMD 85-3) |
-| KLAV-PMD | 3        | TESLA Bratislava / demo                               |
-| LISSAJ   | 1,2,2A,3 | ? / ukážka SIN/COS                                    |
-| MATODEMO | 1,2,2A,3 | ? / demo z poèítaèa MAO                               |
-| MESIAC   | 1,2,2A,3 | Brestenský - Zenit Pionierov / Fázy mesiaca           |
-| MUZIKANT | 1,2,2A,3 | ? Zenit Pionierov / Vytváranie jednoduchých melódií   |
-| REZ      | 2,2A,3   | ? / demonštrácia rezu kockou                          |
-| TEST3A   | 3        | TESLA Bratislava / demo k PMD 85-3                    |
-| TESTATTR | 2,2A,3   | Roman Bórik / Test farebného zobrazenia               |
-| TESTATR2 | 2,2A,3   | Roman Bórik / Test farebného zobrazenia               |
-| TEST LOG | 1,2,2A,3 | KM PF Nitra / Test logiky a inteligencie              |
+| 00 BUBLSORT | 1,2,2A,3 | KM PF Nitra / vysvetlenie bublinkového triedenia      |
+| 34 GONIO    | 2,2A,3   | Martin Bórik / ukážka SIN/COS (primárne pre PMD 85-3) |
+| 00 KLAV-PMD | 3        | TESLA Bratislava / demo                               |
+| 09 LISSAJ   | 1,2,2A,3 | ? / ukážka SIN/COS                                    |
+| 55 MATODEMO | 1,2,2A,3 | ? / demo z poèítaèa MATO                              |
+| 23 MESIAC   | 1,2,2A,3 | Brestenský - Zenit Pionierov / Fázy mesiaca           |
+| 19 MUZIKANT | 1,2,2A,3 | ? Zenit Pionierov / Vytváranie jednoduchých melódií   |
+| 00 REZ      | 2,2A,3   | ? / demonštrácia rezu kockou                          |
+| 00 TEST3A   | 3        | TESLA Bratislava / demo k PMD 85-3                    |
+| 00 TESTATTR | 2,2A,3   | Roman Bórik / Test farebného zobrazenia               |
+| 01 TESTATR2 | 2,2A,3   | Roman Bórik / Test farebného zobrazenia               |
+| 06 TEST LOG | 1,2,2A,3 | KM PF Nitra / Test logiky a inteligencie              |
 -->
-	<software name="rozne">
+	<software name="rozne"><!-- untested -->
 		<description>Rozne</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -927,12 +932,12 @@
 	</software>
 
 <!-- rozne.ptp (pascal)
-    - DRAW     - test grafických príkazov
-    - GRAPH    - test grafických príkazov 2
-    - FACT.PAS - výpoèet faktoriálu
-    - SNC.PAS  - súèet nepárnych èísel
+    - DRAW     - test grafických príkazov (01/P)
+    - GRAPH    - test grafických príkazov 2 (01/P, 02/:, 03/:)
+    - FACT.PAS - výpoèet faktoriálu (01/P)
+    - SNC.PAS  - súèet nepárnych èísel (01/P)
 -->
-	<software name="rozne_1">
+	<software name="rozne_1"><!-- untested -->
 		<description>Rozne (Pascal)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -945,14 +950,14 @@
 	</software>
 
 <!-- skladatel.ptp
-| SKLADATE |  ?  | JUMP 0100 | 2,2A,3   |                                     |
-| FLAPPY1  |  ?  | JUMP 0F90 | 1,2,2A,3 | muzika z hry Flappy                 |
-| FLAPPY2  |  ?  | JUMP 0F90 | 1,2,2A,3 | muzika z hry Flappy                 |
-| PENETR-1 |  ?  | JUMP 0F90 | 1,2,2A,3 | muzika z hry Penetrator             |
-| PENETR-2 |  ?  | JUMP 0F90 | 1,2,2A,3 | muzika z hry Penetrator             |
-| PENETR-3 |  ?  | JUMP 0F90 | 1,2,2A,3 | muzika z hry Penetrator             |
+| 03 SKLADATE |  ?  | JUMP 0100 | 2,2A,3   |                                     |
+| 00 FLAPPY1  |  ?  | JUMP 0F90 | 1,2,2A,3 | muzika z hry Flappy                 |
+| 00 FLAPPY2  |  ?  | JUMP 0F90 | 1,2,2A,3 | muzika z hry Flappy                 |
+| 00 PENETR-1 |  ?  | JUMP 0F90 | 1,2,2A,3 | muzika z hry Penetrator             |
+| 00 PENETR-2 |  ?  | JUMP 0F90 | 1,2,2A,3 | muzika z hry Penetrator             |
+| 00 PENETR-3 |  ?  | JUMP 0F90 | 1,2,2A,3 | muzika z hry Penetrator             |
 -->
-	<software name="skladate">
+	<software name="skladate"><!-- untested -->
 		<description>Skladatel</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -965,14 +970,14 @@
 	</software>
 
 <!-- texted.ptp
-| KASWORD3 |  ?  | JUMP 0000 | 1,2,2A,3 | KASWORD 3                           |
-| KASW.MAN |  X  |           |          | manuál k editoru KASWORD3           |
-| TEXED    |  ?  | JUMP 0000 | 2,2A,3   | úprava P. Holubek                   |
-| MANTEXED |  T  |           |          | manuál k editoru TEXED              |
-| KASWRD+2 |  ?  | AutoRun   | 2,2A,3   | KASWORD+2                           |
-| KASW-CON |  ?  | AutoRun   | 2,2A,3   | KASWORD+2 s inym ovladacom tlaciarne|
+| 00 KASWORD3 |  ?  | JUMP 0000 | 1,2,2A,3 | KASWORD 3                           |
+| 00 KASW.MAN |  X  |           |          | manuál k editoru KASWORD3           |
+| 00 TEXED    |  ?  | JUMP 0000 | 2,2A,3   | úprava P. Holubek                   |
+| 00 MANTEXED |  T  |           |          | manuál k editoru TEXED              |
+| 00 KASWRD+2 |  ?  | AutoRun   | 2,2A,3   | KASWORD+2                           |
+| 03 KASW-CON |  ?  | AutoRun   | 2,2A,3   | KASWORD+2 s inym ovladacom tlaciarne|
 -->
-	<software name="texted">
+	<software name="texted"><!-- untested -->
 		<description>Texted</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
@@ -985,13 +990,13 @@
 	</software>
 
 <!-- vegrap.ptp
-| VEGRAP3X |  ?  | JUMP 0000 | 1,2,2A,3 | (9.3.1988)                          |
-| MANVEGR1 |  T  |           |          | manuál k editoru VEGRAP3X           |
-| MANVEGR2 |  T  |           |          |                                     |
-| VEGRAP;Q |  ?  | JUMP 0000 | 1,2,2A,3 | (30.12.1989)                        |
-| MANVGP;Q |  X  |           |          | manuál k editoru VEGRAP;Q           |
+| 03 VEGRAP3X |  ?  | JUMP 0000 | 1,2,2A,3 | (9.3.1988)                          |
+| 00 MANVEGR1 |  T  |           |          | manuál k editoru VEGRAP3X           |
+| 00 MANVEGR2 |  T  |           |          |                                     |
+| 03 VEGRAP;Q |  ?  | JUMP 0000 | 1,2,2A,3 | (30.12.1989)                        |
+| 00 MANVGP;Q |  X  |           |          | manuál k editoru VEGRAP;Q           |
 -->
-	<software name="vegrap">
+	<software name="vegrap"><!-- untested -->
 		<description>Vegrap</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
diff -Nru mame-0.222+dfsg.1/hash/princ.xml mame-0.224+dfsg.1/hash/princ.xml
--- mame-0.222+dfsg.1/hash/princ.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/princ.xml	2020-08-26 08:57:19.000000000 +0000
@@ -2,7 +2,11 @@
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 <!--
 license:CC0
+
+Known undumped titles:
+New Kazoku de Nengajou
 -->
+
 <softwarelist name="princ" description="Tomy Prin-C cartridges">
 	<software name="bbmaru" supported="no">
 		<description>Bad Badtz-Maru</description>
@@ -14,6 +18,17 @@
 			</dataarea>
 		</part>
 	</software>
+
+	<software name="doraemon" supported="no">
+		<description>Doraemon</description> <!-- Character Rom Cassette EX series -->
+		<year>1998</year>
+		<publisher>Tomy</publisher>
+		<part name="rom" interface="princ_cart">
+			<dataarea name="rom" size="0x80000">
+				<rom name="u1.bin" size="0x80000" crc="7e8cdd27" sha1="4487aea62d6f7913a2df1677846420a6f5626326"/>
+			</dataarea>
+		</part>
+	</software>
 
 	<software name="hkitty" supported="no">
 		<description>Hello Kitty</description>
diff -Nru mame-0.222+dfsg.1/hash/sgi_mips_hdd.xml mame-0.224+dfsg.1/hash/sgi_mips_hdd.xml
--- mame-0.222+dfsg.1/hash/sgi_mips_hdd.xml	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/hash/sgi_mips_hdd.xml	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
+<!--
+license:CC0
+-->
+<softwarelist name="sgi_mips_hdd" description="Hard disk images for SGI MIPS">
+
+	<!--
+	IRIX requires a valid eaddr and high resolution mode. Before first boot,
+	enter the PROM command monitor and check printenv. If required settings are
+	missing, run
+	    setenv -f eaddr 08:00:69:12:34:56
+	to set the Ethernet interface address, and
+	    setenv monitor h
+	to enable high resolution mode (1280x1024), then power cycle.
+
+	Unless otherwise specified, all images are based on default installs of the
+	corresponding sgi_mips sets.
+	-->
+
+	<software name="irix_5_2">
+		<description>IRIX 5.2</description>
+		<year>1994</year>
+		<publisher>Silicon Graphics</publisher>
+		<part name="hdd" interface="scsi_hdd">
+			<diskarea name="harddriv">
+				<disk name="irix_5_2" sha1="e32910287c9f9ca5b4efe6a328a7c71bdbaed235" writeable="yes" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="irix_5_3">
+		<description>IRIX 5.3</description>
+		<year>1994</year>
+		<publisher>Silicon Graphics</publisher>
+		<part name="hdd" interface="scsi_hdd">
+			<diskarea name="harddriv">
+				<disk name="irix_5_3" sha1="22de8751b85fd5f5ff002657e0f475cce719ee52" writeable="yes" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="irix_6_2">
+		<description>IRIX 6.2</description>
+		<year>1996</year>
+		<publisher>Silicon Graphics</publisher>
+		<part name="hdd" interface="scsi_hdd">
+			<diskarea name="harddriv">
+				<disk name="irix_6_2" sha1="d5ebffe77590551ff18d3107751983b62e059af3" writeable="yes" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="irix_6_5">
+		<description>IRIX 6.5</description>
+		<year>1998</year>
+		<publisher>Silicon Graphics</publisher>
+		<part name="hdd" interface="scsi_hdd">
+			<diskarea name="harddriv">
+				<disk name="irix_6_5" sha1="87ab8431fb9be519d05343f6fc735a1730cff49d" writeable="yes" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="irix_6_5_22">
+		<description>IRIX 6.5.22</description>
+		<year>2003</year>
+		<publisher>SGI</publisher>
+		<part name="hdd" interface="scsi_hdd">
+			<diskarea name="harddriv">
+				<disk name="irix_6_5_22" sha1="02a015321dc31a08a08ff4751687bc474583190a" writeable="yes" />
+			</diskarea>
+		</part>
+	</software>
+
+</softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/sgi_mips.xml mame-0.224+dfsg.1/hash/sgi_mips.xml
--- mame-0.222+dfsg.1/hash/sgi_mips.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/sgi_mips.xml	2020-08-26 08:57:19.000000000 +0000
@@ -3,7 +3,7 @@
 <!--
 license:CC0
 -->
-<softwarelist name="sgi_mips" description="Sgi MIPS/IRIX software">
+<softwarelist name="sgi_mips" description="SGI MIPS/IRIX software">
 
 	<!-- Apps and utilities -->
 
@@ -63,6 +63,42 @@
 		</part>
 	</software>
 
+	<software name="chalice_1_5_12">
+		<description>Chalice 1.5.12</description>
+		<year>1998</year>
+		<publisher>Silicon Grail</publisher>
+		<part name="cdrom" interface="cdrom">
+			<!-- Origin: unknown -->
+			<diskarea name="cdrom">
+				<disk name="chalice_1_5_12" sha1="e747549772d3947582d2a66b70760376b97a5753" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="chalice_1_6_1">
+		<description>Chalice 1.6.1</description>
+		<year>1999</year>
+		<publisher>Silicon Grail</publisher>
+		<part name="cdrom" interface="cdrom">
+			<!-- Origin: unknown -->
+			<diskarea name="cdrom">
+				<disk name="chalice_1_6_1" sha1="2cd47e3686be21b2a8dbdf08c69d6ab3622ef8a7" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="chalice_2_0">
+		<description>Chalice 2.0</description>
+		<year>2000</year>
+		<publisher>Silicon Grail</publisher>
+		<part name="cdrom" interface="cdrom">
+			<!-- Origin: unknown, reconstructed from a tarball -->
+			<diskarea name="cdrom">
+				<disk name="chalice_2_0" sha1="188b9180acdc7714b45b8ea1d62c914b407788ef" status="baddump" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="cosmo_1_1_1">
 		<description>Cosmo Compress 1.1.1</description>
 		<year>1994</year> <!-- 11/94 -->
@@ -128,12 +164,26 @@
 		</part>
 	</software>
 
+	<software name="deskse_1_0">
+		<description>Desktop Special Edition 1.0</description>
+		<year>1995</year> <!-- 8/95 -->
+		<publisher>Silicon Graphics</publisher>
+		<info name="version" value="1.0" />
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-0410-001"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="Desktop_Special_Edition_1_0" sha1="4ed0c83fd7d53112da5e3ec210d767cf3d29f41b" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="deskse_1_1">
 		<description>Desktop Special Edition 1.1</description>
 		<year>1995</year> <!-- 11/95 -->
 		<publisher>Silicon Graphics</publisher>
 		<part name="cdrom" interface="cdrom">
-			<feature name="part_number" value="813-0410-002"/>
+			<feature name="part_number" value="812-0410-002"/>
 			<!-- Origin: private dump -->
 			<diskarea name="cdrom">
 				<disk name="desktop_special_edition_1_1" sha1="4f740d11eb60da5fadcd4a3003aca88ff81d7ae3" />
@@ -219,12 +269,26 @@
 		</part>
 	</software>
 
+	<software name="eurlang_1_1">
+		<description>European Language Module 1.1</description>
+		<year>1993</year> <!-- 10/93 -->
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-0241-001"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="european_language_module_1_1" sha1="0fb2bcfd2796d24baf4328bc12bce8571f992253" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="eurlang_1_2">
 		<description>European Language Module 1.2</description>
 		<year>1994</year> <!-- 05/94 -->
 		<publisher>Silicon Graphics</publisher>
 		<part name="cdrom" interface="cdrom">
-			<feature name="part_number" value="812-0739-003"/>
+			<!-- Also distributed with P/N 812-0739-003 and identical contents -->
+			<feature name="part_number" value="812-0241-002"/>
 			<!-- Origin: private dump -->
 			<diskarea name="cdrom">
 				<disk name="european_language_module_1_2" sha1="ae869fd7623d2624b569b365239cfa173788a481" />
@@ -246,6 +310,20 @@
 		</part>
 	</software>
 
+	<software name="eurlang_1_3_1">
+		<description>European Language Module 1.3.1</description>
+		<year>1995</year> <!-- 9/95 -->
+		<publisher>Silicon Graphics</publisher>
+		<info name="version" value="1.3.1" />
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-0241-004"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="European_Language_Module_1_3_1" sha1="9c4931ef0d3030ed4998f2992c6c3a70338136f7" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="flame_4_0_2">
 		<description>Discreet Flame 4.0.2</description>
 		<year>1996</year>
@@ -271,6 +349,31 @@
 		</part>
 	</software>
 
+	<software name="framemaker_5_0">
+		<description>Adobe FrameMaker 5 and Adobe Frame Developer's Kit</description>
+		<year>1996</year> <!-- 5/96 -->
+		<publisher>Adobe</publisher>
+		<info name="version" value="5.0" />
+		<part name="cdrom" interface="cdrom">
+			<!-- Origin: archive.org -->
+			<diskarea name="cdrom">
+				<disk name="frame_products" sha1="270cad068d237e69684a82b036eaae26ff861ebb" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="framemaker_5_5_6">
+		<description>Adobe FrameMaker 5.5.6</description>
+		<year>1998</year>
+		<publisher>Adobe</publisher>
+		<part name="cdrom" interface="cdrom">
+			<!-- Origin: unixfiles.org, reconstructed from a tarball -->
+			<diskarea name="cdrom">
+				<disk name="framemaker_5_5_6" sha1="19c77eeec5858303113dfc69512fed5fa56602c9" status="baddump" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="freeware_2_0">
 		<description>Freeware 2.0 - Unsupported Software compatible with IRIX 6.2 and later</description>
 		<year>1996</year> <!-- 04/96 -->
@@ -441,6 +544,18 @@
 		</part>
 	</software>
 
+	<software name="mathematica_5_2">
+		<description>Mathematica 5.2</description>
+		<year>2005</year>
+		<publisher>Wolfram</publisher>
+		<part name="cdrom" interface="cdrom">
+			<!-- Origin: archive.org -->
+			<diskarea name="cdrom">
+				<disk name="mathematica_5_2_all_unix" sha1="fffc51ad8bf28c68c64ca834e52f8bcbd3423b0a" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="maya_comp_5_5">
 		<description>Alias|Wavefront Maya Composer 5.5</description>
 		<year>1999</year>
@@ -676,15 +791,41 @@
 		</part>
 	</software>
 
+	<software name="onc3nfs_1">
+		<description>ONC3/NFS for IRIX 6.2 Version 1</description>
+		<year>1996</year> <!-- 03/96 -->
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-0305-004"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="onc3_nfs_for_irix_6_2_version_1" sha1="e2e85307864dff08189d5271fbc66b2ae3fae954" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="onc3nfs_ind">
+		<description>ONC3/NFS for IRIX 6.2 with Indigo2 IMPACT 10000 Version 1</description>
+		<year>1996</year> <!-- 06/96 -->
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-0305-005"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="onc3_nfs_for_irix_6_2_with_indigo2_impact_10000_version_1" sha1="49171c4968606047af96fbce7fbde5f685c8d130" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="onc3nfs_1_2">
-		<description>NFS/ONC3 for IRIX 6.2 Version 1.2</description>
+		<description>ONC3/NFS for IRIX 6.2 Version 1.2</description>
 		<year>1996</year> <!-- 08/96 -->
 		<publisher>Silicon Graphics</publisher>
 		<part name="cdrom" interface="cdrom">
-			<feature name="part_number" value="813-0305-006"/>
+			<feature name="part_number" value="812-0305-006"/>
 			<!-- Origin: jrra.zone -->
 			<diskarea name="cdrom">
-				<disk name="nfs_onc3_for_irix_6_2_version_1_2" sha1="86f44b190dbbe8b8a55f6a8250e7a9d42905b70a" />
+				<disk name="onc3_nfs_for_irix_6_2_version_1_2" sha1="86f44b190dbbe8b8a55f6a8250e7a9d42905b70a" />
 			</diskarea>
 		</part>
 	</software>
@@ -860,6 +1001,30 @@
 		</part>
 	</software>
 
+	<software name="rayz_2_2">
+		<description>RAYZ 2.2</description>
+		<year>2002</year>
+		<publisher>Silicon Grail</publisher>
+		<part name="cdrom" interface="cdrom">
+			<!-- Origin: unknown -->
+			<diskarea name="cdrom">
+				<disk name="rayz_2_2" sha1="f53cab16b7bed7a89abe46a9595ac9b068f4b1f9" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="rayz_2_2_12">
+		<description>RAYZ 2.2.12</description>
+		<year>200?</year>
+		<publisher>Silicon Grail</publisher>
+		<part name="cdrom" interface="cdrom">
+			<!-- Origin: unknown, reconstructed from a tarball -->
+			<diskarea name="cdrom">
+				<disk name="rayz_2_2_12" sha1="0c33586e0b0fa86742d8a47b1292fddcc17c22e9" status="baddump" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="samba_2_0_0">
 		<description>Samba 2.0.0 for IRIX for IRIX 6.5 and later</description>
 		<year>1998</year> <!-- 12/98 -->
@@ -935,6 +1100,36 @@
 		</part>
 	</software>
 
+	<software name="sybyl_7_2">
+		<description>Tripos SYBYL 7.2</description>
+		<year>2006</year>
+		<publisher>Tripos, Inc.</publisher>
+		<part name="cdrom1" interface="cdrom">
+			<!-- Origin: unixfiles.org -->
+			<diskarea name="cdrom">
+				<disk name="sybyl_7_2_cd1" sha1="4ee395eeeca2dfa3f0ff42e1f4973e49e9a7cbf7" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
+			<!-- Origin: unixfiles.org -->
+			<diskarea name="cdrom">
+				<disk name="sybyl_7_2_cd2" sha1="91f4e7fad5acab29847beaafa5bc10d6366bda1b" />
+			</diskarea>
+		</part>
+		<part name="cdrom3" interface="cdrom">
+			<!-- Origin: unixfiles.org -->
+			<diskarea name="cdrom">
+				<disk name="sybyl_7_2_cd3" sha1="c073cf3042b4816bff033cb76cd08983b8d9cf0d" />
+			</diskarea>
+		</part>
+		<part name="cdrom4" interface="cdrom">
+			<!-- Origin: unixfiles.org; modified image, needs redump from an original -->
+			<diskarea name="cdrom">
+				<disk name="sybyl_7_2_cd4_pr" sha1="e158700f39cd7f61ddb15fa8f8d9ac6983a418a1" status="baddump" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="1600sw_doc">
 		<description>Silicon Graphics 1600SW Flat Panel Monitor Owner's Manual</description>
 		<year>1999</year> <!-- 08/99 -->
@@ -1319,6 +1514,19 @@
 		</part>
 	</software>
 
+	<software name="ido_5_2">
+		<description>IRIS Development Option 5.2</description>
+		<year>1994</year> <!-- 03/94 -->
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-0129-004"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="iris_development_option_5_2" sha1="b011702ba853d744e047dcf28091a75a06fcf972" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="ido_5_3">
 		<description>IRIS Development Option 5.3</description>
 		<year>1994</year> <!-- 11/94 -->
@@ -1345,6 +1553,19 @@
 		</part>
 	</software>
 
+	<software name="f77_4_0_1">
+		<description>FORTRAN 77 Compiler 4.0.1</description>
+		<year>1994</year> <!-- 03/94 -->
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-0132-005"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="fortran_77_compiler_4_0_1" sha1="1d214d44deb8d68833e334628e333a54f7ce7c04" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="mipspro_7_2">
 		<description>MIPSpro 7.2</description>
 		<year>1997</year> <!-- 09/97 -->
@@ -1480,6 +1701,32 @@
 		</part>
 	</software>
 
+	<software name="hotmix_5">
+		<description>Hot Mix 5</description>
+		<year>1993</year>
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-8101-005"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="hot_mix_5" sha1="06e221fda5bb09c0ffcd23cbffa73cc1b503a980" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="hotmix_7">
+		<description>Hot Mix 7</description>
+		<year>1994</year>
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-8101-007"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="hot_mix_7" sha1="cd2af0d9d29c288c85c3308ec5c2a6cc25b698cc" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="hotmix_8">
 		<description>Hot Mix Volume 8</description>
 		<year>1994</year>
@@ -1572,17 +1819,31 @@
 		</part>
 	</software>
 
-	<!-- IndyZone -->
+	<!-- IndiZone -->
 
-	<software name="indizone">
-		<description>IndiZone</description>
+	<software name="indizone_1">
+		<description>IndiZone 1.0</description>
+		<year>1993</year>
+		<publisher>Silicon Graphics</publisher>
+		<info name="version" value="1.0" />
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-8102-001"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="indizone_1" sha1="1ea7db165ddba9f91e6ad46c9c12ab842a366c5c" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="indizone_1_1">
+		<description>IndiZone 1.1</description>
 		<year>1993</year>
 		<publisher>Silicon Graphics</publisher>
 		<info name="version" value="1.1" />
 		<part name="cdrom" interface="cdrom">
 			<!-- Origin: archive.org; reconstructed from a tarball, needs redump -->
 			<diskarea name="cdrom">
-				<disk name="indizone" sha1="a534bba52ce0eff4be54e8a7d2603dc1295763b4" />
+				<disk name="indizone_1_1" sha1="a534bba52ce0eff4be54e8a7d2603dc1295763b4" status="baddump" />
 			</diskarea>
 		</part>
 	</software>
@@ -1664,13 +1925,140 @@
 		<description>SupportFolio 10/96</description>
 		<year>1996</year> <!-- 10/96 -->
 		<publisher>Silicon Graphics</publisher>
-		<part name="cdrom" interface="cdrom">
+		<info name="version" value="1.2" /> <!-- as printed on the CDs -->
+		<part name="cdrom1" interface="cdrom">
+			<feature name="part_number" value="812-0508-003"/>
+			<feature name="part_id" value="SupportFolio Information Resources 10/96"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="supportfolio_information_resources_10_96" sha1="d01876973667216e044bb8a959f6530575fdd70e" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
 			<feature name="part_number" value="812-0603-001"/>
+			<feature name="part_id" value="SupportFolio IRIX 6.2 Patches 10/96"/>
 			<!-- Origin: private dump -->
 			<diskarea name="cdrom">
 				<disk name="supportfolio_irix_6_2_patches_10_96" sha1="55209bec451eb43fa27e8c65fe90d4b2c3157b73" />
 			</diskarea>
 		</part>
+		<part name="cdrom3" interface="cdrom">
+			<feature name="part_number" value="812-0604-001"/>
+			<feature name="part_id" value="SupportFolio IRIX 5.3/6.1 Patches 10/96"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="supportfolio_irix_5_3_and_6_1_patches_10_96" sha1="0f1d18a85a85fc97cfc69aaf8f6d1a8f8b500d71" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="sfolio_2_97">
+		<description>SupportFolio 2/97</description>
+		<year>1997</year> <!-- 2/97 -->
+		<publisher>Silicon Graphics</publisher>
+		<info name="version" value="1.3" /> <!-- as printed on the CDs -->
+		<!-- CD 1 "SupportFolio Information Resources 2/97" missing -->
+		<part name="cdrom2" interface="cdrom">
+			<feature name="part_number" value="812-0603-002"/>
+			<feature name="part_id" value="SupportFolio IRIX 6.2 Patches 2/97"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="supportfolio_irix_6_2_patches_2_97" sha1="4687cdc28d14a4d59a1887a6873119805a1c64aa" />
+			</diskarea>
+		</part>
+		<part name="cdrom3" interface="cdrom">
+			<feature name="part_number" value="812-0638-001"/>
+			<feature name="part_id" value="SupportFolio IRIX 5.3/6.3/6.4 Patches 2/97"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="supportfolio_irix_5_3_6_3_and_6_4_patches_2_97" sha1="42eefd43f7377ae1e2a0d318b8118a67ae56b2df" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="sfolio_4_97">
+		<description>SupportFolio 4/97</description>
+		<year>1997</year> <!-- 4/97 -->
+		<publisher>Silicon Graphics</publisher>
+		<!-- CD 1 "SupportFolio Information Resources 4/97" missing -->
+		<part name="cdrom2" interface="cdrom">
+			<feature name="part_number" value="812-0603-003" />
+			<feature name="part_id" value="SupportFolio IRIX 6.2 Patches 4/97"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="supportfolio_irix_6_2_patches_4_97" sha1="36a7630cc2b50cdbf059a3d167a04eb4d3aec6d2" />
+			</diskarea>
+		</part>
+		<part name="cdrom3" interface="cdrom">
+			<feature name="part_number" value="812-0638-002"/>
+			<feature name="part_id" value="SupportFolio IRIX 5.3/6.3/6.4 Patches 4/97"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="supportfolio_irix_5_3_6_3_and_6_4_patches_4_97" sha1="b33cc43486fe375d126b8e39178f69072b0310d3" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="sadvantage_11_93">
+		<description>Support Advantage Int'l 11/93</description>
+		<year>1993</year> <!-- 11/93 -->
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-4015-001"/>
+			<diskarea name="cdrom">
+				<!-- Origin: private dump -->
+				<disk name="support_advantage_intl_11_93.chd" sha1="36324701f84531b965046a17ed7aebfa4e8bf7ca" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="sadvantage_3_94">
+		<description>Support Advantage Int'l 3/94</description>
+		<year>1994</year> <!-- 3/94 -->
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-4015-002"/>
+			<diskarea name="cdrom">
+				<!-- Origin: private dump -->
+				<disk name="support_advantage_intl_3_94.chd" sha1="3079331e1f47f6d9537d1a1dcda9c00ad3a6b0af" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="sadvantage_10_94">
+		<description>Support Advantage 10/94</description>
+		<year>1994</year> <!-- 10/94 -->
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-4024-001"/>
+			<feature name="part_id" value="Support Advantage Support Libraries 10/94"/>
+			<diskarea name="cdrom">
+				<!-- Origin: private dump -->
+				<disk name="Support_Advantage_Support_Libraries_10_94" sha1="643371e46dffed73f1d493a623d920233d79c5b1" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="sadvantage_6_95">
+		<description>Support Advantage 6/95</description>
+		<year>1995</year> <!-- 6/95 -->
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom1" interface="cdrom">
+			<feature name="part_number" value="812-4024-004"/>
+			<feature name="part_id" value="Support Advantage Support Libraries 6/95"/>
+			<diskarea name="cdrom">
+				<!-- Origin: private dump -->
+				<disk name="Support_Advantage_Support_Libraries_6_95" sha1="e24c4af01b54bf1a6ccae6a6291df53b116ffbcd" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
+			<feature name="part_number" value="812-0290-004"/>
+			<feature name="part_id" value="Support Advantage IRIX Patches 6/95"/>
+			<diskarea name="cdrom">
+				<!-- Origin: private dump -->
+				<disk name="Support_Advantage_IRIX_Patches_6_95" sha1="e458a0076039d4fb1fe2cc5f6475670a86025087" />
+			</diskarea>
+		</part>
 	</software>
 
 	<software name="sadvantage_9_95">
@@ -1825,6 +2213,19 @@
 		</part>
 	</software>
 
+	<software name="patch_5_1_1_2">
+		<description>IRIX Patch 5.1.1.2</description>
+		<year>1993</year> <!-- 11/93 -->
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-0238-002"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="irix_patch_5_1_1_2" sha1="29092ce7dd4682393e1ac0d2ffbbd8d0f9a6e90b" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="patch_5_3_sep_97">
 		<description>IRIX 5.3 Recommended/Required Patches September 1997</description>
 		<year>1997</year>
@@ -2134,6 +2535,19 @@
 	</software>
 
 	<software name="irix_5_2_a" cloneof="irix_5_2">
+		<description>IRIX 5.2 for Indy R4600PC and Challenge SX</description>
+		<year>1994</year> <!-- 04/94 -->
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-0279-001"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="irix_5_2_for_indy_r4600pc_and_challenge_sx" sha1="972cffffe22668cf2383a335718afd3083cb5965" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="irix_5_2_b" cloneof="irix_5_2">
 		<description>IRIX 5.2 for Indy R4600SC/XZ and Presenter</description>
 		<year>1994</year> <!-- 08/94 -->
 		<publisher>Silicon Graphics</publisher>
@@ -2146,6 +2560,19 @@
 		</part>
 	</software>
 
+	<software name="irix_5_2_patches">
+		<description>IRIX 5.2 Patches</description>
+		<year>1994</year> <!-- 06/94 -->
+		<publisher>Silicon Graphics</publisher>
+		<part name="cdrom" interface="cdrom">
+			<feature name="part_number" value="812-0290-001"/>
+			<!-- Origin: private dump -->
+			<diskarea name="cdrom">
+				<disk name="irix_5_2_patches" sha1="fb7e6b45f0cc96d40f9e2634882345f4846bfb60" />
+			</diskarea>
+		</part>
+	</software>
+
 	<software name="irix_5_3">
 		<description>IRIX 5.3</description>
 		<year>1994</year> <!-- 11/94 -->
@@ -3053,7 +3480,7 @@
 			</diskarea>
 		</part>
 		<part name="cdrom5" interface="cdrom">
-		  <feature name="part_id" value="IRIX 6.5.15 Base Documentation"/>
+			<feature name="part_id" value="IRIX 6.5.15 Base Documentation"/>
 			<feature name="part_number" value="812-0779-015"/>
 			<!-- Origin: jrra.zone -->
 			<diskarea name="cdrom">
@@ -3581,5 +4008,167 @@
 			</diskarea>
 		</part>
 	</software>
+
+	<!-- NetBSD -->
+
+	<software name="netbsd_1_6_2">
+		<description>NetBSD 1.6.2</description>
+		<year>2004</year> <!-- 10/04 -->
+		<publisher>The NetBSD Project</publisher>
+		<part name="cdrom1" interface="cdrom">
+			<feature name="part_id" value="NetBSD 1.6.2 CD sgimipscd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sgimipscd" sha1="dd58f16cda1510a59ec64b02e6fb0b6b308587ad" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
+			<feature name="part_id" value="NetBSD 1.6.2 CD sourcecd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sourcecd" sha1="a542d0b3397632c125c279e4b50df0fa431b5fd9" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="netbsd_2_0">
+		<description>NetBSD 2.0</description>
+		<year>2004</year> <!-- 12/04 -->
+		<publisher>The NetBSD Project</publisher>
+		<part name="cdrom1" interface="cdrom">
+			<feature name="part_id" value="NetBSD 2.0 CD sgimipscd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sgimipscd" sha1="d8960cfffc55d87f8e83074346e0f670b7a7f024" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
+			<feature name="part_id" value="NetBSD 2.0 CD sourcecd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sourcecd" sha1="073ceaa3db068938e11a4893fcec81ce533e1016" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="netbsd_2_0_2">
+		<description>NetBSD 2.0.2</description>
+		<year>2005</year> <!-- 04/05 -->
+		<publisher>The NetBSD Project</publisher>
+		<part name="cdrom1" interface="cdrom">
+			<feature name="part_id" value="NetBSD 2.0.2 CD sgimipscd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sgimipscd" sha1="45b78a683010aa75476ca987e48fa469b4cfa127" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
+			<feature name="part_id" value="NetBSD 2.0.2 CD sourcecd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sourcecd" sha1="e74be0fe637d4ddc8e5bbe818d6c3876fce2f6ae" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="netbsd_2_1">
+		<description>NetBSD 2.1</description>
+		<year>2005</year> <!-- 10/04 -->
+		<publisher>The NetBSD Project</publisher>
+		<part name="cdrom1" interface="cdrom">
+			<feature name="part_id" value="NetBSD 2.1 CD sgimipscd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sgimipscd" sha1="dd160526c51fc4976639a5ca872b6a38f8da9088" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
+			<feature name="part_id" value="NetBSD 2.1 CD sourcecd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sourcecd" sha1="9c1dd6ae595aa44f68b21b574e4ede12ad23a6b1" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="netbsd_3_0">
+		<description>NetBSD 3.0</description>
+		<year>2005</year> <!-- 12/05 -->
+		<publisher>The NetBSD Project</publisher>
+		<part name="cdrom1" interface="cdrom">
+			<feature name="part_id" value="NetBSD 3.0 sgimipscd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sgimipscd_3_0" sha1="ce20c8a04f2013bf826bad0535931082535d564e" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
+			<feature name="part_id" value="NetBSD 3.0 sourcecd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sourcecd_3_0" sha1="9ab700a635e1816a8f1120b915b97875299686c7" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="netbsd_3_0_1">
+		<description>NetBSD 3.0.1</description>
+		<year>2006</year> <!-- 07/06 -->
+		<publisher>The NetBSD Project</publisher>
+		<part name="cdrom1" interface="cdrom">
+			<feature name="part_id" value="NetBSD 3.0.1 sgimipscd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sgimipscd_3_0_1" sha1="8c9fbcdfe31006d19c43cf1afdafa6a0926f868a" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
+			<feature name="part_id" value="NetBSD 3.0.1 sourcecd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sourcecd_3_0_1" sha1="476c37f1154169a1443a82baf4cf5cde6847f1e1" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="netbsd_3_0_2">
+		<description>NetBSD 3.0.2</description>
+		<year>2006</year> <!-- 11/06 -->
+		<publisher>The NetBSD Project</publisher>
+		<part name="cdrom1" interface="cdrom">
+			<feature name="part_id" value="NetBSD 3.0.2 sgimipscd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sgimipscd_3_0_2" sha1="8785e73b09d99ee9eab7a6821c61fd6154ad1f0c" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
+			<feature name="part_id" value="NetBSD 3.0.2 sourcecd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sourcecd_3_0_2" sha1="86038dcdfeb5a4ad74c83a7cf0d37e2bfbc2e9f2" />
+			</diskarea>
+		</part>
+	</software>
+
+	<software name="netbsd_3_1">
+		<description>NetBSD 3.1</description>
+		<year>2006</year> <!-- 11/06 -->
+		<publisher>The NetBSD Project</publisher>
+		<part name="cdrom1" interface="cdrom">
+			<feature name="part_id" value="NetBSD 3.1 sgimipscd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sgimipscd_3_1" sha1="0258964ef25771d5c0107612be4190081568d689" />
+			</diskarea>
+		</part>
+		<part name="cdrom2" interface="cdrom">
+			<feature name="part_id" value="NetBSD 3.1 sourcecd"/>
+			<!-- Origin: netbsd.org -->
+			<diskarea name="cdrom">
+				<disk name="sourcecd_3_1" sha1="55c55fe766674c84ba7db132f5e05cabc77ee5b0" />
+			</diskarea>
+		</part>
+	</software>
 
 </softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/smc777.xml mame-0.224+dfsg.1/hash/smc777.xml
--- mame-0.222+dfsg.1/hash/smc777.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/smc777.xml	2020-08-26 08:57:19.000000000 +0000
@@ -144,7 +144,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="121414">
-				<rom name="cpm22.imd" size="121414" crc="02db74fe" sha1="3f27609dd2d17e983bc337a5530e95883140e5b7" offset="0x0000" />
+				<rom name="cpm22.imd" size="121414" crc="02db74fe" sha1="3f27609dd2d17e983bc337a5530e95883140e5b7" />
 			</dataarea>
 		</part>
 	</software>
@@ -157,7 +157,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="305328">
-				<rom name="develop.1dd" size="305328" crc="13e5971a" sha1="c15d61e00ea2495ef5406a0a6f637ab2746e91cc" offset="0x0000" />
+				<rom name="develop.1dd" size="305328" crc="13e5971a" sha1="c15d61e00ea2495ef5406a0a6f637ab2746e91cc" />
 			</dataarea>
 		</part>
 	</software>
@@ -170,7 +170,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="261808">
-				<rom name="system 12j.1dd" size="261808" crc="c66e1a07" sha1="44e5ffb697c20f3652d6673885c9824f49a307bb" offset="0x0000" />
+				<rom name="system 12j.1dd" size="261808" crc="c66e1a07" sha1="44e5ffb697c20f3652d6673885c9824f49a307bb" />
 			</dataarea>
 		</part>
 	</software>
@@ -182,7 +182,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="305328">
-				<rom name="system 11.1dd" size="305328" crc="fcf54a39" sha1="d5aa09c73cef0cf639ef3adbe6e64a109f883ad6" offset="0x0000" />
+				<rom name="system 11.1dd" size="305328" crc="fcf54a39" sha1="d5aa09c73cef0cf639ef3adbe6e64a109f883ad6" />
 			</dataarea>
 		</part>
 	</software>
@@ -194,7 +194,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="305328">
-				<rom name="system 10.1dd" size="305328" crc="89a0c347" sha1="2d3fdacef43d6b89861b90997715a80d784dd2d9" offset="0x0000" />
+				<rom name="system 10.1dd" size="305328" crc="89a0c347" sha1="2d3fdacef43d6b89861b90997715a80d784dd2d9" />
 			</dataarea>
 		</part>
 	</software>
@@ -206,7 +206,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="211808">
-				<rom name="choplifter.1dd" size="211808" crc="bf2ea51c" sha1="4610f7456ca6bd1740b9c98fb3d2bd67aadffb5c" offset="0x0000" />
+				<rom name="choplifter.1dd" size="211808" crc="bf2ea51c" sha1="4610f7456ca6bd1740b9c98fb3d2bd67aadffb5c" />
 			</dataarea>
 		</part>
 	</software>
@@ -219,7 +219,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="305328">
-				<rom name="strizbh.1dd" size="305328" crc="efa24635" sha1="c2308afeb555197c6d583e6cd46e6c5c5c9b4ea9" offset="0x0000" />
+				<rom name="strizbh.1dd" size="305328" crc="efa24635" sha1="c2308afeb555197c6d583e6cd46e6c5c5c9b4ea9" />
 			</dataarea>
 		</part>
 	</software>
@@ -232,7 +232,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="305056">
-				<rom name="floppy magazine.1dd" size="305056" crc="44f18e58" sha1="dc4d8bda72d408e53edd4be4f1d9497d9179d35e" offset="0x0000" />
+				<rom name="floppy magazine.1dd" size="305056" crc="44f18e58" sha1="dc4d8bda72d408e53edd4be4f1d9497d9179d35e" />
 			</dataarea>
 		</part>
 	</software>
@@ -246,7 +246,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="70352">
-				<rom name="yakyuu-kyou (smc-777) [fd].d88" size="70352" crc="3d92559a" sha1="b1d326a8b8e6cd69723686e3a47474539741d9f8" offset="0x0000" />
+				<rom name="yakyuu-kyou (smc-777) [fd].d88" size="70352" crc="3d92559a" sha1="b1d326a8b8e6cd69723686e3a47474539741d9f8" />
 			</dataarea>
 		</part>
 	</software>
@@ -260,7 +260,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="305328">
-				<rom name="corewars.1dd" size="305328" crc="4bbc1e35" sha1="22d1ba809d69d7e1679842f1d348cc9d6da850c5" offset="0x0000" />
+				<rom name="corewars.1dd" size="305328" crc="4bbc1e35" sha1="22d1ba809d69d7e1679842f1d348cc9d6da850c5" />
 			</dataarea>
 		</part>
 	</software>
@@ -273,7 +273,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="305328">
-				<rom name="dragon.1dd" size="305328" crc="dc23c4bc" sha1="45c0d8510f660108d20c82ef116e8dfa8b66b9c2" offset="0x0000" />
+				<rom name="dragon.1dd" size="305328" crc="dc23c4bc" sha1="45c0d8510f660108d20c82ef116e8dfa8b66b9c2" />
 			</dataarea>
 		</part>
 	</software>
@@ -287,7 +287,7 @@
 
 	    <part name="flop1" interface="floppy_3_5">
 	        <dataarea name="flop" size="305328">
-	            <rom name="dragon (freeware).1dd" size="305328" crc="168925c7" sha1="cf5b4b3f3ae0b77787613c7168eb8cb25dabbe52" offset="0x0000" />
+	            <rom name="dragon (freeware).1dd" size="305328" crc="168925c7" sha1="cf5b4b3f3ae0b77787613c7168eb8cb25dabbe52" />
 	        </dataarea>
 	    </part>
 	</software -->
@@ -299,7 +299,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="305328">
-				<rom name="develop.1dd" size="305328" crc="b7605b47" sha1="927d173f5d08c7a0ad178af1c191cba7d5435a05" offset="0x0000" />
+				<rom name="develop.1dd" size="305328" crc="b7605b47" sha1="927d173f5d08c7a0ad178af1c191cba7d5435a05" />
 			</dataarea>
 		</part>
 	</software>
@@ -312,7 +312,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="305328">
-				<rom name="s-os sword monitor 2.0.1dd" size="305328" crc="27bc0b34" sha1="18840fab993716e7929b6e0600c446d8fba93059" offset="0x0000" />
+				<rom name="s-os sword monitor 2.0.1dd" size="305328" crc="27bc0b34" sha1="18840fab993716e7929b6e0600c446d8fba93059" />
 			</dataarea>
 		</part>
 	</software>
@@ -325,7 +325,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="348848">
-				<rom name="s-os sword monitor 2.2.1dd" size="348848" crc="6e3215ce" sha1="1fffac3db3005e3de750c63ce1285f6b8a40310a" offset="0x0000" />
+				<rom name="s-os sword monitor 2.2.1dd" size="348848" crc="6e3215ce" sha1="1fffac3db3005e3de750c63ce1285f6b8a40310a" />
 			</dataarea>
 		</part>
 	</software>
@@ -339,7 +339,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="261808">
-				<rom name="compilation 1.1dd" size="261808" crc="cc7827f5" sha1="8c24ec40cab047cff716d57ce44066709d238f5a" offset="0x0000" />
+				<rom name="compilation 1.1dd" size="261808" crc="cc7827f5" sha1="8c24ec40cab047cff716d57ce44066709d238f5a" />
 			</dataarea>
 		</part>
 	</software>
@@ -351,7 +351,7 @@
 
 		<part name="flop1" interface="floppy_3_5">
 			<dataarea name="flop" size="261808">
-				<rom name="compilation 2.1dd" size="261808" crc="6be3d020" sha1="9398acca8f44c868abc3a837f91c56833962c17f" offset="0x0000" />
+				<rom name="compilation 2.1dd" size="261808" crc="6be3d020" sha1="9398acca8f44c868abc3a837f91c56833962c17f" />
 			</dataarea>
 		</part>
 	</software>
diff -Nru mame-0.222+dfsg.1/hash/snotec.xml mame-0.224+dfsg.1/hash/snotec.xml
--- mame-0.222+dfsg.1/hash/snotec.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/snotec.xml	2020-08-26 08:57:19.000000000 +0000
@@ -44,7 +44,7 @@
 	</software>
 
 	<software name="catdog">
-		<description>Cats and Dogs</description>
+		<description>Ochame na PetMate</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<part name="rom" interface="genius_cart">
@@ -66,7 +66,7 @@
 	</software>
 
 	<software name="notepadn">
-		<description>Notepad</description>
+		<description>Nakayoshi Diary</description>
 		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<part name="rom" interface="genius_cart">
@@ -110,6 +110,32 @@
 			</dataarea>
 			<dataarea name="eeprom" size="0x800">
 			</dataarea>
+		</part>
+	</software>
+
+	<software name="gokinjom" supported="no">
+		<description>Gokinjo Monogatari</description>
+		<year>1996</year>
+		<publisher>Bandai</publisher>
+		<part name="rom" interface="genius_cart">
+			<dataarea name="rom" size="0x40000">
+				<rom name="ic1.bin" size="0x40000" crc="bcaf2210" sha1="0aba90745fe6c9aa2dd979d162cd8dc43ea3e602"/>
+			</dataarea>
+			<dataarea name="eeprom" size="0x800">
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="tpanda" supported="no">
+		<description>Tare Panda</description>
+		<year>2000</year>
+		<publisher>Bandai</publisher>
+		<part name="rom" interface="genius_cart">
+			<dataarea name="rom" size="0x80000">
+				<rom name="snc_tarepanda-c.ic1" size="0x80000" crc="ea57c308" sha1="7fdb42e422a12b86e87b22ac8038b578e8183eaa"/>
+			</dataarea>
+			<dataarea name="eeprom" size="0x800">
+			</dataarea>
 		</part>
 	</software>
 
diff -Nru mame-0.222+dfsg.1/hash/t1000.xml mame-0.224+dfsg.1/hash/t1000.xml
--- mame-0.222+dfsg.1/hash/t1000.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/t1000.xml	2020-08-26 08:57:19.000000000 +0000
@@ -58,6 +58,19 @@
 		</part>
 	</software>
 
+	<software name="msdos33sl2" cloneof="msdos33t">
+		<description>MS-DOS (Version 3.30, Tandy version 3.30.22) (Tandy 1000 SL/2)</description>
+		<year>1989</year>
+		<publisher>Tandy</publisher>
+		<info name="developer" value="Microsoft" />
+		<info name="serial" value="250-1402" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="dos33_1000sl2.img" size="737280" crc="e164a194" sha1="ff5e98c3e6fdd30ad4006d2800248d05b7c4dd41"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<!-- Apps -->
 	<software name="deskmate">
 		<description>DeskMate (Tandy 1000)</description>
@@ -87,6 +100,30 @@
 			</dataarea>
 		</part>
 	</software>
+
+	<software name="deskmate3" supported="no">
+		<description>DeskMate 3 (Tandy 1000 SL/2)</description>
+		<year>1989</year>
+		<publisher>Tandy</publisher>
+		<info name="usage" value="Requires the built-in DeskMate in the SL/2 system ROM"/>
+		<info name="version" value="03.03.01" />
+		<info name="serial" value="250-1402" />
+		<part name="flop1" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="deskmate1_1000sl2.img" size="737280" crc="45774fc8" sha1="49b70d5b913d7904aa67f36b9b9c2455b49c3950"/>
+			</dataarea>
+		</part>
+		<part name="flop2" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="deskmate2_1000sl2.img" size="737280" crc="c6ab33e5" sha1="38f98049a617fac59443ec49c2247bbde8cf558d"/>
+			</dataarea>
+		</part>
+		<part name="flop3" interface="floppy_3_5">
+			<dataarea name="flop" size = "737280">
+				<rom name="deskmate3_1000sl2.img" size="737280" crc="181d99cd" sha1="74c12996d5c871ba7ba69af1d4a213a83593b7ff"/>
+			</dataarea>
+		</part>
+	</software>
 
 	<software name="pdesk">
 		<description>Personal DeskMate</description>
diff -Nru mame-0.222+dfsg.1/hash/tvgogo.xml mame-0.224+dfsg.1/hash/tvgogo.xml
--- mame-0.222+dfsg.1/hash/tvgogo.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/tvgogo.xml	2020-08-26 08:57:19.000000000 +0000
@@ -9,12 +9,12 @@
 _(EU)__|__(US)__|____________|_____________________________________
   Y*   |   Y    | 4 in 1     |No controller
   Y    |   Y    | Whac-A-Mole|Hammer-shaped IR motion controller
+  Y    |   Y    | Basketball |Ball-shaped motion controller
   Y    |        | Tennis     |Racquet-shaped IR motion controller
-       |        | Paintball  |Gun controller
-       |        | Skateboard |Skateboard-shaped motion controller
-  -    |        | Basketball |Ball-shaped motion controller
        |   Y    | Dodgeball  |Motion controller
        |   Y    | Baseball   |Baseball Bat shaped motion controller
+       |        | Paintball  |Gun controller
+       |        | Skateboard |Skateboard-shaped motion controller
 
 
     The US carts do not appear to have a language selection screen
@@ -104,5 +104,27 @@
 			</dataarea>
 		</part>
 	</software>
+
+	<software name="basketbal" supported="no">
+		<description>Basketball (EU)</description>
+		<year>2005</year>
+		<publisher>Toyquest</publisher>
+		<part name="cart" interface="tvgogo_cart">
+			<dataarea name="rom" size="0x400000">
+				<rom name="gogotv_basketball.bin" size="0x400000" crc="4d5d54f5" sha1="b22717f7003783658f84369221bdf6c2a9e6361d"/>
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="basketbalu" cloneof="basketbal" supported="no">
+		<description>Basketball (US)</description>
+		<year>2005</year>
+		<publisher>Toyquest</publisher>
+		<part name="cart" interface="tvgogo_cart">
+			<dataarea name="rom" size="0x400000">
+				<rom name="gogobasketball_m5m29gt320_001c0020.bin" size="0x400000" crc="dfdec0c6" sha1="7b3cc68f54b43e839beac8ed0806a005919f61b1"/>
+			</dataarea>
+		</part>
+	</software>
 
 </softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/ut88.xml mame-0.224+dfsg.1/hash/ut88.xml
--- mame-0.222+dfsg.1/hash/ut88.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/ut88.xml	2020-08-26 08:57:19.000000000 +0000
@@ -2,14 +2,18 @@
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 <!--
 license:CC0
+
+These are for ut88 only - not for ut88mini
+
 -->
 <softwarelist name="ut88" description="UT-88 cassettes">
 
 
-	<software name="basic80">
+	<software name="basic80"><!-- bad load. There's odd white squares on the screen -->
 		<description>Mikro/80 BASIC</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, start tape, G" />
 		<part name="cass" interface="ut88_cass">
 			<dataarea name="cass" size="6665">
 				<rom name="basic80.rku" size="6665" crc="38d15a6a" sha1="df9e126fa8d118a1ff4b883115b7f10c393a765d"/>
@@ -17,6 +21,9 @@
 		</part>
 	</software>
 
+	<!-- The only way to use this is to start in the debugger and load and run cpm256. Then g f800 to get back to the monitor.
+	        Then load this tape in the usual manner, then G 100. It will start and expect to load another tape, but after that it
+	        hangs. What is it supposed to do? -->
 	<software name="chscom">
 		<description>Changer (v1.1) (CP/M)</description>
 		<year>19??</year>
@@ -28,10 +35,11 @@
 		</part>
 	</software>
 
-	<software name="cpm35">
+	<software name="cpm35" supported="no"><!-- hangs at start -->
 		<description>CP/M (v2.2, 35K)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, start tape, G" />
 		<part name="cass" interface="ut88_cass">
 			<dataarea name="cass" size="6239">
 				<rom name="cpm35.rku" size="6239" crc="655a749b" sha1="e46527bf8eb4e63a090a9161fa88243efd0f40c9"/>
@@ -43,6 +51,7 @@
 		<description>CP/M (v2.2, 256K)</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, start tape, G" />
 		<part name="cass" interface="ut88_cass">
 			<dataarea name="cass" size="7945">
 				<rom name="cpm64.rku" size="7945" crc="8041af21" sha1="19e7378328e0bbfe1303225099842fd377ccf5d2"/>
@@ -54,6 +63,7 @@
 		<description>Tetris</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="I, start tape, G" />
 		<part name="cass" interface="ut88_cass">
 			<dataarea name="cass" size="1641">
 				<rom name="tetris.rku" size="1641" crc="e7373ec6" sha1="7786302a63bf882060a883434cbfba24ad8022ac"/>
diff -Nru mame-0.222+dfsg.1/hash/vector06_cart.xml mame-0.224+dfsg.1/hash/vector06_cart.xml
--- mame-0.222+dfsg.1/hash/vector06_cart.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/vector06_cart.xml	2020-08-26 08:57:19.000000000 +0000
@@ -9,9 +9,10 @@
 		<description>ROMDISK</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Hold down one of F2 (Retex text editor), F3 (Basic), F4 (Monitor), F5 (HW Test) and hit F11. Now hit F12." />
 		<part name="cart" interface="vector06_cart">
 			<dataarea name="rom" size="16384">
-				<rom name="vector.bin" size="16384" crc="e533bd83" sha1="624470b3f232131723a41d50455dca1a2ca0a0c0" offset="0" />
+				<rom name="vector.bin" size="16384" crc="e533bd83" sha1="624470b3f232131723a41d50455dca1a2ca0a0c0"/>
 			</dataarea>
 		</part>
 	</software>
diff -Nru mame-0.222+dfsg.1/hash/vector06_flop.xml mame-0.224+dfsg.1/hash/vector06_flop.xml
--- mame-0.222+dfsg.1/hash/vector06_flop.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/vector06_flop.xml	2020-08-26 08:57:19.000000000 +0000
@@ -9,6 +9,7 @@
 		<description>MicroDOS v3.1 BIOS T-34</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Press F12" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="839680">
 				<rom name="os-t34.fdd" size="839680" crc="6405dafa" sha1="c3b0503c06b541641ae7501ff1123758a7e7d8ab"/>
@@ -20,6 +21,7 @@
 		<description>MicroDOS v3.1M BIOS T-72</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Press F12" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="839680">
 				<rom name="os-t72.fdd" size="839680" crc="cbb25106" sha1="ca2d3fa54cebe2fe29fb9b4bcd9bf7a54977ee50"/>
@@ -31,6 +33,7 @@
 		<description>Card Game</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Press F12" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="839680">
 				<rom name="card.fdd" size="839680" crc="334e1379" sha1="2c15dac696942b0f3abe051a30bd954169344ad7"/>
@@ -43,6 +46,7 @@
 		<year>1995</year>
 		<publisher>&lt;unknown&gt;</publisher>
 	<!--- title music plays too fast because of unemulated RAM access latency -->
+		<info name="usage" value="Press F12, then Left-Alt, then 2" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="839680">
 				<rom name="cdpacman.fdd" size="839680" crc="c429fa01" sha1="4513907202e22e795eb6c6af7eb9a4795795275e"/>
@@ -55,6 +59,7 @@
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
 	<!--- hold Ctrl while booting -->
+		<info name="usage" value="Press F12, and hold CTRL until it has finished starting up." />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="839680">
 				<rom name="game-15.fdd" size="839680" crc="259fcb8e" sha1="4cec8e06d147b74a43784c7389ed86ba02bdf952"/>
@@ -66,6 +71,7 @@
 		<description>Kombat Rabbits</description>
 		<year>1995</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Press F12, then KOMRAB for player vs computer, or KOMRABD for 2 players." />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="839680">
 				<rom name="komrab.fdd" size="839680" crc="59f8d7ee" sha1="ba95d78add7bf0cda05694763f0c72abcc6737de"/>
@@ -77,6 +83,7 @@
 		<description>Lemmings</description>
 		<year>1996</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Press F12" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="839680">
 				<rom name="lemmings.fdd" size="839680" crc="06ac97ba" sha1="3c6e7e226ae5dc7fd57bdf48bda17a50f5c21943"/>
@@ -88,6 +95,7 @@
 		<description>Color Lines</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Press F12" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="839680">
 				<rom name="lines.fdd" size="839680" crc="d21ed39f" sha1="2a073ab4dd6cb3bc587dd50c1ec3a40fb1be1632"/>
@@ -99,6 +107,7 @@
 		<description>Master Reversi</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Press F12" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="839680">
 				<rom name="mreversi.fdd" size="839680" crc="0175f570" sha1="c13eed04a92da8dd814dae0bc3079c2689c8cbb3"/>
@@ -110,6 +119,7 @@
 		<description>Puzznic</description>
 		<year>1996</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Press F12. In the menu, press Space to start." />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="839680">
 				<rom name="puzznic.fdd" size="839680" crc="5c228353" sha1="8ab681e04045af9a5614f09546b281e73576730a"/>
@@ -121,6 +131,7 @@
 		<description>Robocop</description>
 		<year>1995</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Press F12" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="839680">
 				<rom name="robocop.fdd" size="839680" crc="52dcfa15" sha1="ed2dd0a48a2cdbfc08c1036d62ac48fb8ae69b11"/>
@@ -132,6 +143,7 @@
 		<description>Tetris 3D</description>
 		<year>1996</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Press F12" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="839680">
 				<rom name="tet3d.fdd" size="839680" crc="1d17f27f" sha1="47f2ffb350650974de0a1e992b6eda5346e81426"/>
@@ -139,10 +151,11 @@
 		</part>
 	</software>
 
-	<software name="zoo">
+	<software name="zoo"><!-- unreadable dark blue screen -->
 		<description>Zoo</description>
 		<year>19??</year>
 		<publisher>&lt;unknown&gt;</publisher>
+		<info name="usage" value="Press F12" />
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="839680">
 				<rom name="zoo.fdd" size="839680" crc="7def2d07" sha1="80b8103b2c349d7993e5365453ca88c7685753d7"/>
diff -Nru mame-0.222+dfsg.1/hash/vgmplay.xml mame-0.224+dfsg.1/hash/vgmplay.xml
--- mame-0.222+dfsg.1/hash/vgmplay.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/vgmplay.xml	2020-08-26 08:57:19.000000000 +0000
@@ -10,8 +10,8 @@
      Current Archives available at http://vgmrips.net/files/VGMRips_all_of_them_20170815.zip
      and http://vgmrips.net/files/VGMRips_all_of_them_20180807-update.zip -->
 
-	<software name="bomber">
-		<description>Bomberman Collection (1996)(Hudson)</description>
+	<software name="bombcoll_gb">
+		<description>Bomberman Collection (1996)(Hudson) (GameBoy)</description>
 		<year>1996</year>
 		<publisher>Hudson Soft</publisher>
 		<info name="cores" value="DMG APU (LR35902)"/>
@@ -30,7 +30,7 @@
 	</software>
 
 	<software name="bnstars">
-		<description>BStars</description>
+		<description>Vs. Janshi Brandnew Stars (Jaleco Mega System 32)</description>
 		<year>1997</year>
 		<publisher>Jaleco</publisher>
 		<info name="cores" value="YMF271"/>
@@ -145,7 +145,7 @@
 	</software>
 
 	<software name="columns_msxfm">
-		<description>Columns (MSX, FM)</description>
+		<description>Columns (MSX FM)</description>
 		<year>1990</year>
 		<publisher>Nihon Telenet</publisher>
 		<info name="cores" value="MSX-Music (YM2413)"/>
@@ -194,7 +194,7 @@
 	</software>
 
 	<software name="dangar">
-		<description>Dangar - Ufo Robo</description>
+		<description>Dangar - Ufo Robo (Arcade)</description>
 		<year>1986</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="cores" value="YM3526"/>
@@ -273,7 +273,7 @@
 	</software>
 
 	<software name="deroon">
-		<description>DeroonDeroDero</description>
+		<description>Deroon DeroDero (Arcade)</description>
 		<year>1995</year>
 		<publisher>Tecmo</publisher>
 		<info name="cores" value="YMF262, YMZ280B"/>
@@ -381,9 +381,9 @@
 		</part>
 	</software>
 
-	<software name="ds00_fm">
-		<description>Disc Station (FM)</description>
-		<year>198?</year>
+	<software name="compileds_msxfm">
+		<description>Disc Station (MSX FM)</description>
+		<year>1988</year>
 		<publisher>Compile</publisher>
 		<info name="cores" value="MSX-Music (YM2413)"/>
 		<part name="001" interface="vgm_quik">
@@ -400,9 +400,9 @@
 		</part>
 	</software>
 
-	<software name="ds00_psg">
-		<description>Disc Station (PSG)</description>
-		<year>198?</year>
+	<software name="conpileds_msx">
+		<description>Disc Station (MSX PSG)</description>
+		<year>1988</year>
 		<publisher>Compile</publisher>
 		<info name="cores" value="MSX PSG (AY-3-8910A)"/>
 		<part name="001" interface="vgm_quik">
@@ -420,7 +420,7 @@
 	</software>
 
 	<software name="famicom">
-		<description>Famicom Disk System BIOS</description>
+		<description>Famicom Disk System BIOS (FDS)</description>
 		<year>1986</year>
 		<publisher>Nintendo</publisher>
 		<info name="cores" value="NES APU (N2A03)"/>
@@ -432,11 +432,11 @@
 		</part>
 	</software>
 
-	<software name="ffant">
-		<description>FinalFantasy</description>
+	<software name="ffant_msxfm">
+		<description>Final Fantasy 1 (MSX FM)</description>
 		<year>1989</year>
 		<publisher>Micro Cabin Corp.</publisher>
-		<info name="cores" value="No_Data"/>
+		<info name="cores" value="MSX PSG (AY-3-8910A), MSX-Music (YM2413)"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01_prelude.vgm" />
 			<dataarea name="quik" size="9960">
@@ -565,11 +565,11 @@
 		</part>
 	</software>
 
-	<software name="ffurries">
-		<description>Fury of the Furries</description>
+	<software name="ffurries_pc">
+		<description>Fury of the Furries (PC)</description>
 		<year>1993</year>
 		<publisher>Kalisto Entertainment</publisher>
-		<info name="cores" value="No_Data"/>
+		<info name="cores" value="AdLib/OPL2 (YM3812)"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01 - intro scene.vgm" />
 			<dataarea name="quik" size="5438">
@@ -681,7 +681,7 @@
 	</software>
 
 	<software name="ginganin">
-		<description>Ginga NinkyouDen</description>
+		<description>Ginga NinkyouDen (Arcade)</description>
 		<year>1987</year>
 		<publisher>Jaleco</publisher>
 		<info name="cores" value="Y8950"/>
@@ -958,7 +958,7 @@
 	</software>
 
 	<software name="hatris">
-		<description>Hatris</description>
+		<description>Hatris (Arcade)</description>
 		<year>1990</year>
 		<publisher>Bullet-Proof Software</publisher>
 		<info name="cores" value="YM2608"/>
@@ -1013,7 +1013,7 @@
 	</software>
 
 	<software name="sgmastc">
-		<description>Jumbo Ozaki Super Masters Golf</description>
+		<description>Jumbo Ozaki Super Masters Golf (Arcade)</description>
 		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2151"/>
@@ -1080,10 +1080,10 @@
 	</software>
 
 	<software name="lemmings_pc">
-		<description>Lemmings DOS</description>
+		<description>Lemmings DOS (PC)</description>
 		<year>1991</year>
 		<publisher>Psygnosis</publisher>
-		<info name="cores" value="No_Data"/>
+		<info name="cores" value="AdLib/OPL2 (YM3812)"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="00_lets_go.vgm" />
 			<dataarea name="quik" size="388">
@@ -1273,7 +1273,7 @@
 	</software>
 
 	<software name="m82">
-		<description>M82 Game Selectable Working Product Display</description>
+		<description>M82 Game Selectable Working Product Display (Kiosk)</description>
 		<year>199?</year>
 		<publisher>Nintendo</publisher>
 		<info name="cores" value="NES APU (N2A03)"/>
@@ -1286,7 +1286,7 @@
 	</software>
 
 	<software name="maglord">
-		<description>Magician Lord</description>
+		<description>Magician Lord (SNK Neo Geo)</description>
 		<year>1990</year>
 		<publisher>Alpha Denshi Corporation</publisher>
 		<info name="cores" value="YM2610"/>
@@ -1407,7 +1407,7 @@
 	</software>
 
 	<software name="mrgoemon">
-		<description>Mr Goemon</description>
+		<description>Mr Goemon (Arcade)</description>
 		<year>1986</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="SN76489A"/>
@@ -1503,8 +1503,8 @@
 		</part>
 	</software>
 
-	<software name="namcocdm">
-		<description>Namco Disk Magazine</description>
+	<software name="namcocdm_msxfm">
+		<description>Namco Community Disk Magazine (MSX FM)</description>
 		<year>1989</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="MSX-AUDIO (YM2413)"/>
@@ -1517,7 +1517,7 @@
 	</software>
 
 	<software name="neogeo">
-		<description>Neo-Geo SNK BIOS</description>
+		<description>Neo-Geo BIOS (SNK Neo Geo)</description>
 		<year>1990</year>
 		<publisher>SNK</publisher>
 		<info name="cores" value="YM2610"/>
@@ -1536,10 +1536,10 @@
 	</software>
 
 	<software name="ngp">
-		<description>NGP BIOS</description>
+		<description>NGP BIOS (SNK NEO GEO POCKET)</description>
 		<year>1999</year>
 		<publisher>SNK</publisher>
-		<info name="cores" value="No_Data"/>
+		<info name="cores" value="T6W28"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="ngp bios - 01 - startup tune.vgm" />
 			<dataarea name="quik" size="1190">
@@ -1554,8 +1554,8 @@
 		</part>
 	</software>
 
-	<software name="puzzle">
-		<description>Puzzle de Pon</description>
+	<software name="puzzledp">
+		<description>Puzzle de Pon (Arcade)</description>
 		<year>1995</year>
 		<publisher>Visco</publisher>
 		<info name="cores" value="YM2610"/>
@@ -1646,7 +1646,7 @@
 	</software>
 
 	<software name="quartet">
-		<description>Quartet</description>
+		<description>Quartet (Sega System 16A)</description>
 		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2151"/>
@@ -1695,7 +1695,7 @@
 	</software>
 
 	<software name="ridleofp">
-		<description>Riddle of Pythagoras</description>
+		<description>Riddle of Pythagoras (Sega System E)</description>
 		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="2x SN76496"/>
@@ -1744,7 +1744,7 @@
 	</software>
 
 	<software name="sagaia">
-		<description>Sagaia</description>
+		<description>Sagaia (Arcade)</description>
 		<year>1991</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="DMG APU (LR35902)"/>
@@ -1852,11 +1852,11 @@
 		</part>
 	</software>
 
-	<software name="sonyc_fm">
-		<description>Sonyc FM</description>
+	<software name="sonyc_msx2m">
+		<description>Sonyc (MSX2 Moonsound)</description>
 		<year>1997</year>
 		<publisher>Analogy</publisher>
-		<info name="cores" value="No_Data"/>
+		<info name="cores" value="YMF278B"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01_title.vgm" />
 			<dataarea name="quik" size="12344">
@@ -1931,11 +1931,11 @@
 		</part>
 	</software>
 
-	<software name="sonyc_ms">
-		<description>Sonyc MS</description>
+	<software name="sonyc_msx2">
+		<description>Sonyc (MSX2 FM)</description>
 		<year>1997</year>
 		<publisher>Analogy</publisher>
-		<info name="cores" value="No_Data"/>
+		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01_title.vgm" />
 			<dataarea name="quik" size="38652">
@@ -2011,7 +2011,7 @@
 	</software>
 
 	<software name="svc_ngpc">
-		<description>SvC MoTM</description>
+		<description>SNK Vs. Capcom (Neo Geo Pocker Color)</description>
 		<year>1999</year>
 		<publisher>SNK</publisher>
 		<info name="cores" value="T6W28"/>
@@ -2263,8 +2263,8 @@
 		</part>
 	</software>
 
-	<software name="atetris_syse">
-		<description>Tetris (SystemE)</description>
+	<software name="tetrisse">
+		<description>Tetris (Sega System E)</description>
 		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="2x SN76496"/>
@@ -2294,8 +2294,8 @@
 		</part>
 	</software>
 
-	<software name="atetris">
-		<description>Tetris Classic</description>
+	<software name="tetris_pc">
+		<description>Tetris Classic (PC)</description>
 		<year>1992</year>
 		<publisher>Spectrum HoloByte, Inc.</publisher>
 		<info name="cores" value="Sound Blaster Pro 2 / OPL3 (YMF262)"/>
@@ -14337,7 +14337,7 @@
 	</software>
 
 	<software name="lotlot">
-		<description>Lot Lot</description>
+		<description>Lot Lot (Arcade)</description>
 		<year>1985</year>
 		<publisher>Tokuma Shoten</publisher>
 		<info name="cores" value="AY-3-8910"/>
@@ -21078,7 +21078,7 @@
 	</software>
 
 	<software name="route16">
-		<description>Route 16</description>
+		<description>Route 16 (Arcade)</description>
 		<year>1981</year>
 		<publisher>Sunsoft</publisher>
 		<info name="cores" value="AY-3-8910"/>
@@ -25811,7 +25811,7 @@
 		</part>
 	</software>
 
-	<software name="tetrisse">
+	<software name="atetris">
 		<description>Tetris (Atari) (Arcade)</description>
 		<year>1988</year>
 		<publisher>Atari Games</publisher>
@@ -26924,7 +26924,7 @@
 	</software>
 
 	<software name="tkdensho">
-		<description>ToukiDenshou</description>
+		<description>Toukidenshou - Angel Eyes (Arcade)</description>
 		<year>1996</year>
 		<publisher>Tecmo</publisher>
 		<info name="cores" value="YMF262, YMZ280B"/>
@@ -50636,7 +50636,7 @@
 	</software>
 
 	<software name="lifefrce">
-		<description>Life Force</description>
+		<description>Life Force (Arcade)</description>
 		<year>1987</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="YM2151"/>
@@ -52312,10 +52312,10 @@
 	</software>
 
 	<software name="salamand">
-		<description>Salamander</description>
+		<description>Salamander (Arcade)</description>
 		<year>1987</year>
 		<publisher>Konami</publisher>
-		<info name="cores" value="No_Data"/>
+		<info name="cores" value="YM2151"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="salamander - 01 - power of anger.vgm" />
 			<dataarea name="quik" size="11266">
@@ -52644,7 +52644,7 @@
 	</software>
 
 	<software name="scramble">
-		<description>Scramble</description>
+		<description>Scramble (Arcade)</description>
 		<year>1981</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="AY-3-8910A"/>
@@ -61488,10 +61488,10 @@
 	</software>
 
 	<software name="cltchitr">
-		<description>Clutch Hitter</description>
+		<description>Clutch Hitter (Arcade)</description>
 		<year>1991</year>
 		<publisher>Sega</publisher>
-		<info name="cores" value="2�YM3438, RF5c68"/>
+		<info name="cores" value="2xYM3438, RF5c68"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="clutch hitter - 01 - menu theme.vgm" />
 			<dataarea name="quik" size="48793">
@@ -62890,7 +62890,7 @@
 	</software>
 
 	<software name="enduror">
-		<description>Enduro Racer</description>
+		<description>Enduro Racer (Arcade)</description>
 		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2151, SegaPCM"/>
@@ -65957,7 +65957,7 @@
 	</software>
 
 	<software name="shinobi">
-		<description>Shinobi</description>
+		<description>Shinobi (Sega System 16A)</description>
 		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2151"/>
@@ -66316,7 +66316,7 @@
 	</software>
 
 	<software name="smgp">
-		<description>Super Monaco GP</description>
+		<description>Super Monaco GP (Arcade)</description>
 		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2151, SegaPCM"/>
@@ -69767,7 +69767,7 @@
 	</software>
 
 	<software name="cadash">
-		<description>Cadash</description>
+		<description>Cadash (Arcade)</description>
 		<year>1989</year>
 		<publisher>Taito Corporation Japan</publisher>
 		<info name="cores" value="YM2151"/>
@@ -74756,7 +74756,7 @@
 	</software>
 
 	<software name="rastan">
-		<description>Rastan</description>
+		<description>Rastan (Arcade)</description>
 		<year>1987</year>
 		<publisher>Taito Corporation Japan</publisher>
 		<info name="cores" value="YM2151"/>
@@ -77267,7 +77267,7 @@
 	</software>
 
 	<software name="volfied">
-		<description>Volfied</description>
+		<description>Volfied (Arcade)</description>
 		<year>1989</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="YM2203"/>
@@ -80505,7 +80505,7 @@
 	</software>
 
 	<software name="gameboy">
-		<description>Game Boy BIOS</description>
+		<description>Game Boy BIOS (GameBoy)</description>
 		<year>1989</year>
 		<publisher>Nintendo</publisher>
 		<info name="cores" value="DMG APU (LR35902)"/>
@@ -81110,7 +81110,7 @@
 	</software>
 
 	<software name="kirby">
-		<description>Kirby's Dream Land</description>
+		<description>Kirby's Dream Land (GameBoy)_</description>
 		<year>1992</year>
 		<publisher>Nintendo</publisher>
 		<info name="cores" value="DMG APU (LR35902)"/>
@@ -99178,7 +99178,7 @@
 		<description>Puzzle Bobble (B System, Neo Geo)</description>
 		<year>1994</year>
 		<publisher>Taito Corporation</publisher>
-		<info name="cores" value="No_Data"/>
+		<info name="cores" value="YM2610"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01 intro.vgz" />
 			<dataarea name="quik" size="20380">
@@ -131148,7 +131148,7 @@
 
 	<software name="rbyrnepc_nes">
 		<description>Robert Byrne's Pool Challenge (NES)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>American Video</publisher>
 		<info name="cores" value="NES APU (N2A03)"/>
 		<part name="001" interface="vgm_quik">
@@ -133869,7 +133869,7 @@
 
 	<software name="mc_sh300_nes">
 		<description>Super HIK 300 in 1 (NES)</description>
-		<year>????</year>
+		<year>19??</year>
 		<publisher>Unknown</publisher>
 		<info name="cores" value="NES APU (N2A03)"/>
 		<part name="001" interface="vgm_quik">
@@ -138929,7 +138929,7 @@
 
 	<software name="warwheel_nes">
 		<description>War on Wheels (NES)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Jaleco, Ltd.</publisher>
 		<info name="cores" value="NES APU (N2A03)"/>
 		<part name="001" interface="vgm_quik">
@@ -152041,7 +152041,7 @@
 
 	<software name="flicky_x1">
 		<description>Flicky (Sharp X1)</description>
-		<year>198?</year>
+		<year>1985</year>
 		<publisher>Micronet</publisher>
 		<info name="cores" value="YM2149"/>
 		<part name="001" interface="vgm_quik">
@@ -161727,7 +161727,7 @@
 
 	<software name="famist89_88va">
 		<description>Pro Yakyuu Family Stadium '89 - Pennant Race Ban (NEC PC-88VA)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Game Arts</publisher>
 		<info name="cores" value="YM2608"/>
 		<part name="001" interface="vgm_quik">
@@ -173537,7 +173537,7 @@
 
 	<software name="legkage_x1">
 		<description>The Legend of Kage (Sharp X1)</description>
-		<year>198?</year>
+		<year>1987</year>
 		<publisher>Nidecom Carry</publisher>
 		<info name="cores" value="YM2149"/>
 		<part name="001" interface="vgm_quik">
@@ -176645,7 +176645,7 @@
 
 	<software name="xevious_a52">
 		<description>Xevious (Atari 5200)</description>
-		<year>19??</year>
+		<year>1984</year>
 		<publisher>Atari</publisher>
 		<info name="cores" value="Pokey"/>
 		<part name="001" interface="vgm_quik">
@@ -198107,7 +198107,7 @@
 		</part>
 	</software>
 
-	<software name="testdri2_at">
+	<software name="td3_at">
 		<description>Test Drive III - The Passion (IBM PC XT AT)</description>
 		<year>1990</year>
 		<publisher>Accolade</publisher>
@@ -229233,7 +229233,7 @@
 
 	<software name="simcity_nes">
 		<description>SimCity (NES)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Nintendo</publisher>
 		<info name="cores" value="NES APU (N2A03)"/>
 		<part name="001" interface="vgm_quik">
@@ -236810,7 +236810,7 @@
 
 	<software name="uwc_nes">
 		<description>UWC (NES)</description>
-		<year>198?</year>
+		<year>1988</year>
 		<publisher>Seta</publisher>
 		<info name="cores" value="NES APU (N2A03)"/>
 		<part name="001" interface="vgm_quik">
@@ -237877,1017 +237877,4865 @@
 		</part>
 	</software>
 
+<!-- vgmrips.net update - July 24, 2020 - 25 Entries -->
 
-<!-- Project 2612 VGM Archives located at http://project2612.org/list.php
-     Also https://archive.org/details/Project2612CompleteArchive20180623681Sets.7z -->
+	<software name="konagcbh_msx2">
+		<description>Ago Board (MSX2, PSG)</description>
+		<year>1989</year>
+		<publisher>Konami</publisher>
+		<info name="cores" value="PSG (AY-3-8910)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 main bgm.vgz" />
+			<dataarea name="quik" size="5246">
+				<rom name="01 main bgm.vgz" size="5246" crc="a0cd71c8" sha1="1acef5c1d54355ae723ed3f0d32deb369b535e3f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 win.vgz" />
+			<dataarea name="quik" size="1386">
+				<rom name="02 win.vgz" size="1386" crc="cba1404d" sha1="64f59e35fd8ff3fe80668499cae4303c5ef9537d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 draw.vgz" />
+			<dataarea name="quik" size="1368">
+				<rom name="03 draw.vgz" size="1368" crc="dd39e706" sha1="d12563e7ad2325f86cec34d4d718a748f2c55e96" offset="0" />
+			</dataarea>
+		</part>
+	</software>
 
-	<software name="16ton_md">
-		<description>16t (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>Sega</publisher>
-		<info name="cores" value="SN76496, YM2612"/>
+	<software name="konagcbh_scc">
+		<description>Ago Board (MSX2, SCC)</description>
+		<year>1989</year>
+		<publisher>Konami</publisher>
+		<info name="cores" value="SCC-I (K052539), PSG (AY-3-8910)"/>
 		<part name="001" interface="vgm_quik">
-			<feature name="part_id" value="01 - title theme.vgz" />
-			<dataarea name="quik" size="25827">
-				<rom name="01 - title theme.vgz" size="25827" crc="f661ace1" sha1="a176292db1b41a7bba6dee0db5923b68a74aa063" offset="0" />
+			<feature name="part_id" value="01 main bgm.vgz" />
+			<dataarea name="quik" size="13136">
+				<rom name="01 main bgm.vgz" size="13136" crc="84f25132" sha1="127131f43643a228c602b04d467d5016de51831e" offset="0" />
 			</dataarea>
 		</part>
 		<part name="002" interface="vgm_quik">
-			<feature name="part_id" value="02 - bgm 1.vgz" />
-			<dataarea name="quik" size="4350">
-				<rom name="02 - bgm 1.vgz" size="4350" crc="074c2308" sha1="398bcbb89cfa47b100b836753e156350ff50a5f0" offset="0" />
+			<feature name="part_id" value="02 win.vgz" />
+			<dataarea name="quik" size="2851">
+				<rom name="02 win.vgz" size="2851" crc="e14ecf8c" sha1="51c6950c3c31f0fe3121211a9950562d42b4f321" offset="0" />
 			</dataarea>
 		</part>
 		<part name="003" interface="vgm_quik">
-			<feature name="part_id" value="03 - bgm 2.vgz" />
-			<dataarea name="quik" size="28697">
-				<rom name="03 - bgm 2.vgz" size="28697" crc="8cca5a7e" sha1="f6fd304e9be237a189cca8318bf5c5d3e0da7988" offset="0" />
+			<feature name="part_id" value="03 draw.vgz" />
+			<dataarea name="quik" size="2440">
+				<rom name="03 draw.vgz" size="2440" crc="41ae20d7" sha1="c5e433477e47bedd359752eddc0a56d494beffbd" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="aleste_msx2o">
+		<description>Aleste (MSX2, OPLL)</description>
+		<year>1988</year>
+		<publisher>Compile</publisher>
+		<info name="cores" value="MSX-MUSIC (YM2413), PSG (AY-3-8910)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 compile.vgz" />
+			<dataarea name="quik" size="424">
+				<rom name="01 compile.vgz" size="424" crc="183ec561" sha1="536e9d411be562b693e1bb692c608c6f713a1965" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 prologue dia51.vgz" />
+			<dataarea name="quik" size="5579">
+				<rom name="02 prologue dia51.vgz" size="5579" crc="f9216cc4" sha1="94dfcda05bed271f522fc7ab998953fb9b129c49" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 title.vgz" />
+			<dataarea name="quik" size="2637">
+				<rom name="03 title.vgz" size="2637" crc="149084e5" sha1="16df65d3dab9ceed6d2cda01fe4f6a81ddc8101b" offset="0" />
 			</dataarea>
 		</part>
 		<part name="004" interface="vgm_quik">
-			<feature name="part_id" value="04 - round clear.vgz" />
-			<dataarea name="quik" size="1078">
-				<rom name="04 - round clear.vgz" size="1078" crc="e484d664" sha1="fd6f5440fb0e26670915b73472717670fb4ad350" offset="0" />
+			<feature name="part_id" value="04 metropolis (area 1).vgz" />
+			<dataarea name="quik" size="5459">
+				<rom name="04 metropolis (area 1).vgz" size="5459" crc="55165f48" sha1="b9839fec5908ce75c8b205d2c2ecb65572be802f" offset="0" />
 			</dataarea>
 		</part>
 		<part name="005" interface="vgm_quik">
-			<feature name="part_id" value="05 - staff roll.vgz" />
-			<dataarea name="quik" size="1991">
-				<rom name="05 - staff roll.vgz" size="1991" crc="f619d925" sha1="0daafb5f358212ff15feb079714afbcc7d11ef15" offset="0" />
+			<feature name="part_id" value="05 street fighter (sub boss).vgz" />
+			<dataarea name="quik" size="954">
+				<rom name="05 street fighter (sub boss).vgz" size="954" crc="ade8336c" sha1="bec37390df11f6f8efc5c5d6b856f27b4c051976" offset="0" />
 			</dataarea>
 		</part>
 		<part name="006" interface="vgm_quik">
-			<feature name="part_id" value="06 - game over.vgz" />
-			<dataarea name="quik" size="1085">
-				<rom name="06 - game over.vgz" size="1085" crc="24b1f77f" sha1="28b0ea227717c251e1c4020ce165d53b672a1de4" offset="0" />
+			<feature name="part_id" value="06 rapid turning (area boss).vgz" />
+			<dataarea name="quik" size="1703">
+				<rom name="06 rapid turning (area boss).vgz" size="1703" crc="4004726f" sha1="ef9563196eac3daf2641bf57efa83a2f65ef6ddd" offset="0" />
 			</dataarea>
 		</part>
-	</software>
-
-	<software name="2048_16_md">
-		<description>2048~16 (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>Titan</publisher>
-		<info name="cores" value="SN76496, YM2612"/>
-		<part name="001" interface="vgm_quik">
-			<feature name="part_id" value="01 - main theme.vgz" />
-			<dataarea name="quik" size="245170">
-				<rom name="01 - main theme.vgz" size="245170" crc="a1b5dbf7" sha1="5d8c7e1eb0edd23c54a9ea0e53c69b33522d6e18" offset="0" />
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 go ahead (area clear).vgz" />
+			<dataarea name="quik" size="1605">
+				<rom name="07 go ahead (area clear).vgz" size="1605" crc="61bd3767" sha1="8e56b06798aa45cbe78de0c16c97b8b493c3cb57" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 the challenger (area 2).vgz" />
+			<dataarea name="quik" size="4084">
+				<rom name="08 the challenger (area 2).vgz" size="4084" crc="34f16185" sha1="c3b94ee8a3e91d16e8c17f21a1064b123ea43def" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 tension of dark side (area 3).vgz" />
+			<dataarea name="quik" size="5778">
+				<rom name="09 tension of dark side (area 3).vgz" size="5778" crc="a60efe0e" sha1="c46f0e525c6a39d34eafa92879262324f1e46c44" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 the devastation (area 4).vgz" />
+			<dataarea name="quik" size="4575">
+				<rom name="10 the devastation (area 4).vgz" size="4575" crc="18d02832" sha1="0b82dc726aa3acf2ec5ad1c111de3b9e377c6e01" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 the solitude (area 5).vgz" />
+			<dataarea name="quik" size="3554">
+				<rom name="11 the solitude (area 5).vgz" size="3554" crc="b6b3bf8b" sha1="4545844fc767a861358a62eda1ac8286d5babcbd" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 red zone (area 6).vgz" />
+			<dataarea name="quik" size="4176">
+				<rom name="12 red zone (area 6).vgz" size="4176" crc="4dbeb148" sha1="446330be2a19575375a8e20d25a5c31900699589" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 don't cry hi-yah (area 7).vgz" />
+			<dataarea name="quik" size="3318">
+				<rom name="13 don't cry hi-yah (area 7).vgz" size="3318" crc="4c701548" sha1="0f1433544ada15c828008325513fc4e45ef79d75" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 bloody jewel (area 8).vgz" />
+			<dataarea name="quik" size="2414">
+				<rom name="14 bloody jewel (area 8).vgz" size="2414" crc="6d126fc8" sha1="971b0199ac08f54d07ef6f94bd8099e52bccf3d2" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 dogodaga-dogodege (final boss).vgz" />
+			<dataarea name="quik" size="1556">
+				<rom name="15 dogodaga-dogodege (final boss).vgz" size="1556" crc="fe1b4cf9" sha1="a95e222724f56035299e291a6dee3c56dc250c6d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 again (game over).vgz" />
+			<dataarea name="quik" size="3522">
+				<rom name="16 again (game over).vgz" size="3522" crc="df2227cc" sha1="26090f58cc5aec004e2794dfe336832723e106b5" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 triumph (ending).vgz" />
+			<dataarea name="quik" size="5413">
+				<rom name="17 triumph (ending).vgz" size="5413" crc="7b59ea0d" sha1="1e355bdc1fa3642864588dceb2248d9d7d8a14e9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 easy going (bonus area).vgz" />
+			<dataarea name="quik" size="2494">
+				<rom name="18 easy going (bonus area).vgz" size="2494" crc="9b0ae034" sha1="fe7aeab2db66fb43d2a678859b1bc72d3d6911d5" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="3ninja_md">
-		<description>3 Ninjas Kick Back (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>Malibu Entertainment</publisher>
-		<info name="cores" value="YM2612"/>
+	<software name="aleste_msx2">
+		<description>Aleste (MSX2, PSG)</description>
+		<year>1988</year>
+		<publisher>Compile</publisher>
+		<info name="cores" value="PSG (AY-3-8910)"/>
 		<part name="001" interface="vgm_quik">
-			<feature name="part_id" value="01.vgz" />
-			<dataarea name="quik" size="10009">
-				<rom name="01.vgz" size="10009" crc="d4281e9f" sha1="365c6f061d4132b1a16643ebc6033d6142d6419a" offset="0" />
+			<feature name="part_id" value="01 compile.vgz" />
+			<dataarea name="quik" size="455">
+				<rom name="01 compile.vgz" size="455" crc="5727894c" sha1="8655cf4daddad790180c7d73b8b401afeeea055e" offset="0" />
 			</dataarea>
 		</part>
 		<part name="002" interface="vgm_quik">
-			<feature name="part_id" value="02.vgz" />
-			<dataarea name="quik" size="6823">
-				<rom name="02.vgz" size="6823" crc="75be8c7f" sha1="9ba5e8032508aee6efb956386bd2856206669fc1" offset="0" />
+			<feature name="part_id" value="02 prologue dia51.vgz" />
+			<dataarea name="quik" size="2367">
+				<rom name="02 prologue dia51.vgz" size="2367" crc="5e67a74b" sha1="294ffba46af0b46cba34c5f7d02b02392e844d2e" offset="0" />
 			</dataarea>
 		</part>
 		<part name="003" interface="vgm_quik">
-			<feature name="part_id" value="03.vgz" />
-			<dataarea name="quik" size="5854">
-				<rom name="03.vgz" size="5854" crc="bd7856c7" sha1="be60ca57c2ccec7295eeec68fe90715fb9b59e33" offset="0" />
+			<feature name="part_id" value="03 title.vgz" />
+			<dataarea name="quik" size="2175">
+				<rom name="03 title.vgz" size="2175" crc="429ec11b" sha1="40c377ff6da3364ca521b2627d0f77a4e5a73d0e" offset="0" />
 			</dataarea>
 		</part>
 		<part name="004" interface="vgm_quik">
-			<feature name="part_id" value="04.vgz" />
-			<dataarea name="quik" size="10393">
-				<rom name="04.vgz" size="10393" crc="90df678d" sha1="463d16e21002b7e689a99fd851b6a930ff190f0b" offset="0" />
+			<feature name="part_id" value="04 metropolis (area 1).vgz" />
+			<dataarea name="quik" size="4952">
+				<rom name="04 metropolis (area 1).vgz" size="4952" crc="ff05fd2a" sha1="c379a7cf60c8ff945ac8975185f6378aa8af1938" offset="0" />
 			</dataarea>
 		</part>
 		<part name="005" interface="vgm_quik">
-			<feature name="part_id" value="05.vgz" />
-			<dataarea name="quik" size="2292">
-				<rom name="05.vgz" size="2292" crc="ac9fb5c6" sha1="3b3b390f2bc82b4cc37dc2ede3cfb35f51facc62" offset="0" />
+			<feature name="part_id" value="05 street fighter (sub boss).vgz" />
+			<dataarea name="quik" size="1921">
+				<rom name="05 street fighter (sub boss).vgz" size="1921" crc="e3e4043e" sha1="feb494340482da4c146441f17186719124e3d356" offset="0" />
 			</dataarea>
 		</part>
 		<part name="006" interface="vgm_quik">
-			<feature name="part_id" value="06.vgz" />
-			<dataarea name="quik" size="9055">
-				<rom name="06.vgz" size="9055" crc="d64a179a" sha1="0a9c928cda414ba1157783001199c793544e831a" offset="0" />
+			<feature name="part_id" value="06 rapid turning (area boss).vgz" />
+			<dataarea name="quik" size="1856">
+				<rom name="06 rapid turning (area boss).vgz" size="1856" crc="a8f063e2" sha1="ab2b6885a343ac3c53dc1d724422a5074dc4c3fc" offset="0" />
 			</dataarea>
 		</part>
 		<part name="007" interface="vgm_quik">
-			<feature name="part_id" value="07.vgz" />
-			<dataarea name="quik" size="6578">
-				<rom name="07.vgz" size="6578" crc="63899fc3" sha1="67e36b6fcd9c3c7dbe259f6dc0612f4b83d13a16" offset="0" />
+			<feature name="part_id" value="07 go ahead (area clear).vgz" />
+			<dataarea name="quik" size="1928">
+				<rom name="07 go ahead (area clear).vgz" size="1928" crc="2927c93e" sha1="d8867c0193d0ed9243058ce31bbf757ee3f8a4ea" offset="0" />
 			</dataarea>
 		</part>
 		<part name="008" interface="vgm_quik">
-			<feature name="part_id" value="08.vgz" />
-			<dataarea name="quik" size="8210">
-				<rom name="08.vgz" size="8210" crc="037f772e" sha1="159da115172a19c2361a7ac1e8c48ada86b78f21" offset="0" />
+			<feature name="part_id" value="08 the challenger (area 2).vgz" />
+			<dataarea name="quik" size="6157">
+				<rom name="08 the challenger (area 2).vgz" size="6157" crc="40e449c3" sha1="3fba9c7bb1690826b5894c7e5ef5c39b2dfd0764" offset="0" />
 			</dataarea>
 		</part>
 		<part name="009" interface="vgm_quik">
-			<feature name="part_id" value="09.vgz" />
-			<dataarea name="quik" size="20132">
-				<rom name="09.vgz" size="20132" crc="45b73eac" sha1="affc59f1de6ee59a2c92cb7b9892219fbde2642a" offset="0" />
+			<feature name="part_id" value="09 tension of dark side (area 3).vgz" />
+			<dataarea name="quik" size="3932">
+				<rom name="09 tension of dark side (area 3).vgz" size="3932" crc="0320d5f6" sha1="349a0cfa82f901d8ef60ccfd3f967ff015f8257f" offset="0" />
 			</dataarea>
 		</part>
 		<part name="010" interface="vgm_quik">
-			<feature name="part_id" value="10.vgz" />
-			<dataarea name="quik" size="5066">
-				<rom name="10.vgz" size="5066" crc="71406daa" sha1="28da9bc6699d2885cd9baa2a3143042cd1a4fa64" offset="0" />
+			<feature name="part_id" value="10 the devastation (area 4).vgz" />
+			<dataarea name="quik" size="5962">
+				<rom name="10 the devastation (area 4).vgz" size="5962" crc="05893269" sha1="6d999556ac8876eb5aebf9c5fde2aff66d160f1f" offset="0" />
 			</dataarea>
 		</part>
 		<part name="011" interface="vgm_quik">
-			<feature name="part_id" value="11.vgz" />
-			<dataarea name="quik" size="4838">
-				<rom name="11.vgz" size="4838" crc="e4db4f42" sha1="1f18990f75081fbe8e4707ac3cc512c9b5b77fb8" offset="0" />
+			<feature name="part_id" value="11 the solitude (area 5).vgz" />
+			<dataarea name="quik" size="5234">
+				<rom name="11 the solitude (area 5).vgz" size="5234" crc="a620d916" sha1="0eddcdf528e4d9f6601863321b950ccd29ede079" offset="0" />
 			</dataarea>
 		</part>
 		<part name="012" interface="vgm_quik">
-			<feature name="part_id" value="12.vgz" />
-			<dataarea name="quik" size="11181">
-				<rom name="12.vgz" size="11181" crc="65057af8" sha1="6ca6c8b6b5a16d1f46898d4d3bcc77ba9715a567" offset="0" />
+			<feature name="part_id" value="12 red zone (area 6).vgz" />
+			<dataarea name="quik" size="4860">
+				<rom name="12 red zone (area 6).vgz" size="4860" crc="82db6633" sha1="48db0c4ef29efdc0b64d66c939751f96eab57d1e" offset="0" />
 			</dataarea>
 		</part>
 		<part name="013" interface="vgm_quik">
-			<feature name="part_id" value="13.vgz" />
-			<dataarea name="quik" size="5960">
-				<rom name="13.vgz" size="5960" crc="62c45d67" sha1="dca6eb6fc60e14a85c94fe48d0ec7cb7eecc27b1" offset="0" />
+			<feature name="part_id" value="13 don't cry hi-yah (area 7).vgz" />
+			<dataarea name="quik" size="3831">
+				<rom name="13 don't cry hi-yah (area 7).vgz" size="3831" crc="f55df6e8" sha1="5811fcb7d06e40c026a50099431f4dc4a00998dc" offset="0" />
 			</dataarea>
 		</part>
 		<part name="014" interface="vgm_quik">
-			<feature name="part_id" value="14.vgz" />
-			<dataarea name="quik" size="4594">
-				<rom name="14.vgz" size="4594" crc="f4cd2c77" sha1="525e7aa35e23f1f3236b1627f3a7a04226f2bbf5" offset="0" />
+			<feature name="part_id" value="14 bloody jewel (area 8).vgz" />
+			<dataarea name="quik" size="1525">
+				<rom name="14 bloody jewel (area 8).vgz" size="1525" crc="e99ec512" sha1="286c95d921b670ee5c7de334dde804b9a89365a5" offset="0" />
 			</dataarea>
 		</part>
 		<part name="015" interface="vgm_quik">
-			<feature name="part_id" value="15.vgz" />
-			<dataarea name="quik" size="6002">
-				<rom name="15.vgz" size="6002" crc="498f0281" sha1="8d0ac61219f10cf86d8770d12b8db7f8a36be15c" offset="0" />
+			<feature name="part_id" value="15 dogodaga-dogodege (final boss).vgz" />
+			<dataarea name="quik" size="2262">
+				<rom name="15 dogodaga-dogodege (final boss).vgz" size="2262" crc="7d15ee1f" sha1="a2c9c0c8f9b372afef2d5310c13ddd5f33a173b3" offset="0" />
 			</dataarea>
 		</part>
 		<part name="016" interface="vgm_quik">
-			<feature name="part_id" value="16.vgz" />
-			<dataarea name="quik" size="5810">
-				<rom name="16.vgz" size="5810" crc="83b22ebf" sha1="8a7da10be0b7684a1d3943d2d10ce3ce819d8ed9" offset="0" />
+			<feature name="part_id" value="16 again (game over).vgz" />
+			<dataarea name="quik" size="1626">
+				<rom name="16 again (game over).vgz" size="1626" crc="68835729" sha1="4fc8220b11a03ed5baad895492b0569dd4e6e645" offset="0" />
 			</dataarea>
 		</part>
-	</software>
-
-	<software name="32xpwm_md">
-		<description>32X PWM Test (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>Sega</publisher>
-		<info name="cores" value="SEGA32X"/>
-		<part name="001" interface="vgm_quik">
-			<feature name="part_id" value="01 - the imperial march.vgz" />
-			<dataarea name="quik" size="275989">
-				<rom name="01 - the imperial march.vgz" size="275989" crc="a6b3e2f6" sha1="5e1b7fe776ceff593775b3ca946f74d7f1919d1f" offset="0" />
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 triumph (ending).vgz" />
+			<dataarea name="quik" size="5918">
+				<rom name="17 triumph (ending).vgz" size="5918" crc="e51d6fec" sha1="66099b0c856efcae1189df943b6a01dec5b29554" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 easy going (bonus area).vgz" />
+			<dataarea name="quik" size="3142">
+				<rom name="18 easy going (bonus area).vgz" size="3142" crc="61002fe6" sha1="3d9b4cc1cb2695b97c8c743dc25d229c9365c2f4" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="bugslife_md">
-		<description>A Bug's Life (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>unknown</publisher>
-		<info name="cores" value="YM2612"/>
+	<software name="altbeast_zxs">
+		<description>Altered Beast (ZX Spectrum 128)</description>
+		<year>1989</year>
+		<publisher>Activision (E) / The Hit Squad (E) / MCM (S)</publisher>
+		<info name="cores" value="AY-3-8912A"/>
 		<part name="001" interface="vgm_quik">
-			<feature name="part_id" value="01 - title.vgz" />
-			<dataarea name="quik" size="8703">
-				<rom name="01 - title.vgz" size="8703" crc="5b2795dd" sha1="68b1c8099d08286df748e5c8ff9750259ebd8af7" offset="0" />
+			<feature name="part_id" value="01 rise from your grave.vgz" />
+			<dataarea name="quik" size="12367">
+				<rom name="01 rise from your grave.vgz" size="12367" crc="bed8c6a2" sha1="3ba2fd16ce1d0232267db889f92dd5d940b05494" offset="0" />
 			</dataarea>
 		</part>
 		<part name="002" interface="vgm_quik">
-			<feature name="part_id" value="02 - ant island.vgz" />
-			<dataarea name="quik" size="2889">
-				<rom name="02 - ant island.vgz" size="2889" crc="6bcfa284" sha1="04cc8579486890d62220a3bd74088a124796da9a" offset="0" />
+			<feature name="part_id" value="02 altered beast.vgz" />
+			<dataarea name="quik" size="14377">
+				<rom name="02 altered beast.vgz" size="14377" crc="eebd7ac8" sha1="868da454c54a8c0059432269f765c849baf505e6" offset="0" />
 			</dataarea>
 		</part>
 		<part name="003" interface="vgm_quik">
-			<feature name="part_id" value="03 - find the hero.vgz" />
-			<dataarea name="quik" size="2525">
-				<rom name="03 - find the hero.vgz" size="2525" crc="81b7db23" sha1="f138121f9163508e461a1e8815413da3b9f17127" offset="0" />
+			<feature name="part_id" value="03 gaum-hammer.vgz" />
+			<dataarea name="quik" size="4906">
+				<rom name="03 gaum-hammer.vgz" size="4906" crc="c81f1b3a" sha1="4a92e15249d2261c7a08ef0a0730db455aed9070" offset="0" />
 			</dataarea>
 		</part>
 		<part name="004" interface="vgm_quik">
-			<feature name="part_id" value="04 - in the dark hole.vgz" />
-			<dataarea name="quik" size="20517">
-				<rom name="04 - in the dark hole.vgz" size="20517" crc="aeaec953" sha1="150df95310ef2c07378fb72978fa035d7baa8e57" offset="0" />
+			<feature name="part_id" value="04 crystal ball theme.vgz" />
+			<dataarea name="quik" size="1146">
+				<rom name="04 crystal ball theme.vgz" size="1146" crc="ebabb2c1" sha1="c129cf8b7343e43b3fa39d64dadacbd54ab2f3d2" offset="0" />
 			</dataarea>
 		</part>
 		<part name="005" interface="vgm_quik">
-			<feature name="part_id" value="05 - hang by a thread.vgz" />
-			<dataarea name="quik" size="16254">
-				<rom name="05 - hang by a thread.vgz" size="16254" crc="ad00d257" sha1="23372d369662ef386a560db666ce88f7c45fc783" offset="0" />
+			<feature name="part_id" value="05 closed in upon me.vgz" />
+			<dataarea name="quik" size="4697">
+				<rom name="05 closed in upon me.vgz" size="4697" crc="a8e961a3" sha1="ae362c05cbaa2a3abe67e8b704c7fb56e82f5b5a" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="aressha_md">
-		<description>A Ressha de Ikou MD (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>Artdink / Sega</publisher>
-		<info name="cores" value="SN76496, YM2612"/>
+	<software name="bublbobl_zxs">
+		<description>Bubble Bobble (ZX Spectrum 128)</description>
+		<year>1987</year>
+		<publisher>Firebird (E) / The Hit Squad (E) / Dro (S) / Musical 1 (S)</publisher>
+		<info name="cores" value="AY-3-8912A"/>
 		<part name="001" interface="vgm_quik">
-			<feature name="part_id" value="01.vgz" />
-			<dataarea name="quik" size="3268">
-				<rom name="01.vgz" size="3268" crc="257e5021" sha1="6909ed59d3a2b56f9fb61af06bdcf9274160cb10" offset="0" />
+			<feature name="part_id" value="01 introduction ~ main theme.vgz" />
+			<dataarea name="quik" size="2052">
+				<rom name="01 introduction ~ main theme.vgz" size="2052" crc="32cc82ef" sha1="9ad104ad49b3babaa09b1fcd77927858af019c86" offset="0" />
 			</dataarea>
 		</part>
 		<part name="002" interface="vgm_quik">
-			<feature name="part_id" value="02.vgz" />
-			<dataarea name="quik" size="4446">
-				<rom name="02.vgz" size="4446" crc="70d631bd" sha1="df078230af4b78541eae8520333b179af58845e6" offset="0" />
+			<feature name="part_id" value="02 bonus music.vgz" />
+			<dataarea name="quik" size="590">
+				<rom name="02 bonus music.vgz" size="590" crc="58944563" sha1="7a571094d7ceda1b37b8f5fa0feaf8d847b3140b" offset="0" />
 			</dataarea>
 		</part>
 		<part name="003" interface="vgm_quik">
-			<feature name="part_id" value="03.vgz" />
-			<dataarea name="quik" size="8460">
-				<rom name="03.vgz" size="8460" crc="f683ac39" sha1="ea9edd48f601559fa109d1748b33ffeb11788001" offset="0" />
+			<feature name="part_id" value="03 super drunk.vgz" />
+			<dataarea name="quik" size="841">
+				<rom name="03 super drunk.vgz" size="841" crc="9a3ba490" sha1="4ad6fd270f2f0d6033773b726ab0b364ac4375ad" offset="0" />
 			</dataarea>
 		</part>
 		<part name="004" interface="vgm_quik">
-			<feature name="part_id" value="04.vgz" />
-			<dataarea name="quik" size="7004">
-				<rom name="04.vgz" size="7004" crc="a5c6ec39" sha1="6f7f362e55b29cca76af268f4f61f14169a63031" offset="0" />
+			<feature name="part_id" value="04 name regist.vgz" />
+			<dataarea name="quik" size="688">
+				<rom name="04 name regist.vgz" size="688" crc="679f6b3c" sha1="8ee60f5f692a42816daf95df4575990d7fd29a4e" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="dondoko2_fc">
+		<description>Don Doko Don 2 (Family Computer)</description>
+		<year>1992</year>
+		<publisher>Taito</publisher>
+		<info name="cores" value="NES APU (N2A03)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 title screen.vgz" />
+			<dataarea name="quik" size="2228">
+				<rom name="01 title screen.vgz" size="2228" crc="9b403980" sha1="9e0ad0d554acd12633b80fab077498cfb3e54e12" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 game start.vgz" />
+			<dataarea name="quik" size="690">
+				<rom name="02 game start.vgz" size="690" crc="160c0fe4" sha1="48930f2f35e260e894c5b50366c065264e439168" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 map screen.vgz" />
+			<dataarea name="quik" size="1237">
+				<rom name="03 map screen.vgz" size="1237" crc="409e85df" sha1="aa0861a713e7c404fdb55aa73d580bd982330855" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 introduction.vgz" />
+			<dataarea name="quik" size="2527">
+				<rom name="04 introduction.vgz" size="2527" crc="685e521c" sha1="8b85e284354717895a90a5f519dec4915dfb526a" offset="0" />
 			</dataarea>
 		</part>
 		<part name="005" interface="vgm_quik">
-			<feature name="part_id" value="05.vgz" />
-			<dataarea name="quik" size="3393">
-				<rom name="05.vgz" size="3393" crc="8f7af832" sha1="2ec2a880e6f1132c0119ec8164e6b00f7de1745f" offset="0" />
+			<feature name="part_id" value="05 woods land 1.vgz" />
+			<dataarea name="quik" size="4849">
+				<rom name="05 woods land 1.vgz" size="4849" crc="d564d88c" sha1="a4688dd985f12746f1998c045c0b8c9af2e449b5" offset="0" />
 			</dataarea>
 		</part>
 		<part name="006" interface="vgm_quik">
-			<feature name="part_id" value="06.vgz" />
-			<dataarea name="quik" size="3702">
-				<rom name="06.vgz" size="3702" crc="2a68c2e8" sha1="ef811d05ac33c595d1a6ede663ad9ae09d0dfc58" offset="0" />
+			<feature name="part_id" value="06 bonus round.vgz" />
+			<dataarea name="quik" size="4105">
+				<rom name="06 bonus round.vgz" size="4105" crc="e9f4bb46" sha1="04acff98e70b1e55b87dab26e0080d5ca7590a6f" offset="0" />
 			</dataarea>
 		</part>
 		<part name="007" interface="vgm_quik">
-			<feature name="part_id" value="07.vgz" />
-			<dataarea name="quik" size="5299">
-				<rom name="07.vgz" size="5299" crc="c42bf325" sha1="a51e9435c47139e609e1fa706916d3a0296602a6" offset="0" />
+			<feature name="part_id" value="07 invincibility.vgz" />
+			<dataarea name="quik" size="2422">
+				<rom name="07 invincibility.vgz" size="2422" crc="9b391d04" sha1="56bbba2422741520a76932952339b2b254921c11" offset="0" />
 			</dataarea>
 		</part>
 		<part name="008" interface="vgm_quik">
-			<feature name="part_id" value="08.vgz" />
-			<dataarea name="quik" size="3166">
-				<rom name="08.vgz" size="3166" crc="14375068" sha1="edcb4aa32a8065566327925518c77bfd0b373c10" offset="0" />
+			<feature name="part_id" value="08 woods land 2.vgz" />
+			<dataarea name="quik" size="4357">
+				<rom name="08 woods land 2.vgz" size="4357" crc="541fa035" sha1="f5d8b98a7dd859b65034926f13d590f7dca453da" offset="0" />
 			</dataarea>
 		</part>
 		<part name="009" interface="vgm_quik">
-			<feature name="part_id" value="09.vgz" />
-			<dataarea name="quik" size="3250">
-				<rom name="09.vgz" size="3250" crc="c405c110" sha1="13834793bf4a83afa9d8f63aa1695732ac7c01fb" offset="0" />
+			<feature name="part_id" value="09 boss.vgz" />
+			<dataarea name="quik" size="4053">
+				<rom name="09 boss.vgz" size="4053" crc="18d5ae0c" sha1="6084e6f1a8599f6d0b74bdeddeb88cd5cbaa2e2b" offset="0" />
 			</dataarea>
 		</part>
 		<part name="010" interface="vgm_quik">
-			<feature name="part_id" value="10.vgz" />
-			<dataarea name="quik" size="3336">
-				<rom name="10.vgz" size="3336" crc="2d60724b" sha1="6d70b33b7eca84b789cc9aefcf1e4182188f841d" offset="0" />
+			<feature name="part_id" value="10 level clear.vgz" />
+			<dataarea name="quik" size="1294">
+				<rom name="10 level clear.vgz" size="1294" crc="4cda0c03" sha1="57cf79a6c54c0f3fb9c978f9a12d9dcd6b873032" offset="0" />
 			</dataarea>
 		</part>
 		<part name="011" interface="vgm_quik">
-			<feature name="part_id" value="11.vgz" />
-			<dataarea name="quik" size="5834">
-				<rom name="11.vgz" size="5834" crc="38b337b9" sha1="e4328c50768f52cf7f7c8f12ba0ef16daacdbc6f" offset="0" />
+			<feature name="part_id" value="11 ocean land 1.vgz" />
+			<dataarea name="quik" size="5558">
+				<rom name="11 ocean land 1.vgz" size="5558" crc="0da887b7" sha1="a09ebb468749dd36677b5731023e173851dd977e" offset="0" />
 			</dataarea>
 		</part>
 		<part name="012" interface="vgm_quik">
-			<feature name="part_id" value="12.vgz" />
-			<dataarea name="quik" size="3972">
-				<rom name="12.vgz" size="3972" crc="79b669b1" sha1="c7411fbf0f5aa3bc724ace48589481f07dc39fd6" offset="0" />
+			<feature name="part_id" value="12 ocean land 2.vgz" />
+			<dataarea name="quik" size="5140">
+				<rom name="12 ocean land 2.vgz" size="5140" crc="e2b5e9e3" sha1="74a2fc4c844cf14858adedf2a444954f4619fa8d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 sky land.vgz" />
+			<dataarea name="quik" size="8650">
+				<rom name="13 sky land.vgz" size="8650" crc="a6e3e810" sha1="ea31581ffcc487233ca0f4e0868a9a6ab1df488a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 dark land 1.vgz" />
+			<dataarea name="quik" size="6986">
+				<rom name="14 dark land 1.vgz" size="6986" crc="c626d1a9" sha1="4b95b7714396c88ddc54371e487e8b3186c36dd4" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 dark land 2.vgz" />
+			<dataarea name="quik" size="7317">
+				<rom name="15 dark land 2.vgz" size="7317" crc="af5f037c" sha1="80b5418b4ec9045fa0ddecb1f34d341a411a5170" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 toy land 1.vgz" />
+			<dataarea name="quik" size="6097">
+				<rom name="16 toy land 1.vgz" size="6097" crc="f94658b7" sha1="00ac469f15855e0459c01de93ae40913f105b644" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 toy land 2.vgz" />
+			<dataarea name="quik" size="6092">
+				<rom name="17 toy land 2.vgz" size="6092" crc="03678be3" sha1="0ff92aef6302c804018544e2dae994acfb97cb48" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 final boss.vgz" />
+			<dataarea name="quik" size="4548">
+				<rom name="18 final boss.vgz" size="4548" crc="06c1dd55" sha1="6c3ffb6444f3f58f5301857a0276b314befbd1f9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="019" interface="vgm_quik">
+			<feature name="part_id" value="19 ending.vgz" />
+			<dataarea name="quik" size="2862">
+				<rom name="19 ending.vgz" size="2862" crc="62b08210" sha1="2d6bf754e2fcb82f779747d381c1ff51000fcd5c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="020" interface="vgm_quik">
+			<feature name="part_id" value="20 credits.vgz" />
+			<dataarea name="quik" size="8574">
+				<rom name="20 credits.vgz" size="8574" crc="75e1ab07" sha1="531d7c4c46521f13aad9efe03ef0634c00317225" offset="0" />
+			</dataarea>
+		</part>
+		<part name="021" interface="vgm_quik">
+			<feature name="part_id" value="21 game over.vgz" />
+			<dataarea name="quik" size="1264">
+				<rom name="21 game over.vgz" size="1264" crc="ec6e47e6" sha1="1f185e366a68d67aed6b31eae8ceec8986ea1d8e" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="aaharima_md">
-		<description>Aa Harimanada (GEN/MD)</description>
+	<software name="mc_fcya1_nes">
+		<description>Famicom Yarou Vol. 1 (NES)</description>
 		<year>19??</year>
-		<publisher>Sega</publisher>
-		<info name="cores" value="SN76496, YM2612"/>
+		<publisher>unknown</publisher>
+		<info name="cores" value="NES APU (N2A03)"/>
 		<part name="001" interface="vgm_quik">
-			<feature name="part_id" value="01 - legend of strength.vgz" />
-			<dataarea name="quik" size="20593">
-				<rom name="01 - legend of strength.vgz" size="20593" crc="e29718c9" sha1="6526b134ae88104dbc22a897a3707b4c475038a1" offset="0" />
+			<feature name="part_id" value="01 menu.vgz" />
+			<dataarea name="quik" size="2509">
+				<rom name="01 menu.vgz" size="2509" crc="7de1a0b8" sha1="023dba56c7480bed55edf32d09f38088efdfbd13" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="gslugrsj">
+		<description>Great Sluggers - New World Stadium (Namco NB-1)</description>
+		<year>1993</year>
+		<publisher>Namco</publisher>
+		<info name="cores" value="C352"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 opening theme.vgz" />
+			<dataarea name="quik" size="149042">
+				<rom name="01 opening theme.vgz" size="149042" crc="a5849957" sha1="625d2cf6ed10fa43ac25d48b8f9f77f7f011d677" offset="0" />
 			</dataarea>
 		</part>
 		<part name="002" interface="vgm_quik">
-			<feature name="part_id" value="02 - invincible proclamation, aa harimanada.vgz" />
-			<dataarea name="quik" size="56190">
-				<rom name="02 - invincible proclamation, aa harimanada.vgz" size="56190" crc="53e14320" sha1="b71d8fa76e533dd0de13ca6cf8c06956a73fdbe8" offset="0" />
+			<feature name="part_id" value="02 forward field.vgz" />
+			<dataarea name="quik" size="128620">
+				<rom name="02 forward field.vgz" size="128620" crc="1e51fb7d" sha1="a83e51355e896ab48e66f6c988a02fe1f88cc0ac" offset="0" />
 			</dataarea>
 		</part>
 		<part name="003" interface="vgm_quik">
-			<feature name="part_id" value="03 - fierce god of flame.vgz" />
-			<dataarea name="quik" size="24231">
-				<rom name="03 - fierce god of flame.vgz" size="24231" crc="eddef57e" sha1="9d1fa302089a3af05dc140895f39ad01658cc598" offset="0" />
+			<feature name="part_id" value="03 great sluggers.vgz" />
+			<dataarea name="quik" size="267915">
+				<rom name="03 great sluggers.vgz" size="267915" crc="f93907c0" sha1="ec0b3240c665a1e5e34194e15282a0eaeb060882" offset="0" />
 			</dataarea>
 		</part>
 		<part name="004" interface="vgm_quik">
-			<feature name="part_id" value="04 - a rush of blood!.vgz" />
-			<dataarea name="quik" size="17553">
-				<rom name="04 - a rush of blood.vgz" size="17553" crc="d147b97d" sha1="845127eaeaa77fc7160ecbf225a2fb735a1afd83" offset="0" />
+			<feature name="part_id" value="04 second wind.vgz" />
+			<dataarea name="quik" size="194832">
+				<rom name="04 second wind.vgz" size="194832" crc="d2e1c07f" sha1="31dc7504b95af1fefc4d3999d8b816079285d527" offset="0" />
 			</dataarea>
 		</part>
 		<part name="005" interface="vgm_quik">
-			<feature name="part_id" value="05 - midnight visitor.vgz" />
-			<dataarea name="quik" size="19442">
-				<rom name="05 - midnight visitor.vgz" size="19442" crc="fc67c337" sha1="a017e528c9999af12d8a18d108a3610de1560b8e" offset="0" />
+			<feature name="part_id" value="05 full base.vgz" />
+			<dataarea name="quik" size="204402">
+				<rom name="05 full base.vgz" size="204402" crc="bdfe8eeb" sha1="69e8852fc1d4baa7e50c8f22c2e4241309ae7f58" offset="0" />
 			</dataarea>
 		</part>
 		<part name="006" interface="vgm_quik">
-			<feature name="part_id" value="06 - master's elegy.vgz" />
-			<dataarea name="quik" size="19380">
-				<rom name="06 - master's elegy.vgz" size="19380" crc="167fd66b" sha1="b5ed932ab93fb460e765ef9ea35c78a8a2480b60" offset="0" />
+			<feature name="part_id" value="06 namco sports news opening theme.vgz" />
+			<dataarea name="quik" size="102648">
+				<rom name="06 namco sports news opening theme.vgz" size="102648" crc="48afc33a" sha1="baa8c8a9cc57389e4586364e56a65bbc13de7d37" offset="0" />
 			</dataarea>
 		</part>
 		<part name="007" interface="vgm_quik">
-			<feature name="part_id" value="07 - burning sumo hall.vgz" />
-			<dataarea name="quik" size="25830">
-				<rom name="07 - burning sumo hall.vgz" size="25830" crc="09ff35c2" sha1="0ee6c89a600b759da44c1aa168001d41a6050370" offset="0" />
+			<feature name="part_id" value="07 namco sports news main theme.vgz" />
+			<dataarea name="quik" size="160989">
+				<rom name="07 namco sports news main theme.vgz" size="160989" crc="369e85d8" sha1="44519d25e41e2a73dd5be97d763b5277620c7016" offset="0" />
 			</dataarea>
 		</part>
 		<part name="008" interface="vgm_quik">
-			<feature name="part_id" value="08 - decisive battle! demon's arena.vgz" />
-			<dataarea name="quik" size="35077">
-				<rom name="08 - decisive battle demon's arena.vgz" size="35077" crc="06e63611" sha1="5f5e9a6d56ec6a1d1aa4ff76d0715195a031b083" offset="0" />
+			<feature name="part_id" value="08 switching between offense and defense 1.vgz" />
+			<dataarea name="quik" size="45752">
+				<rom name="08 switching between offense and defense 1.vgz" size="45752" crc="2d8ba283" sha1="968892a7b4dd6d8f695813682112ea1fc8bf7f66" offset="0" />
 			</dataarea>
 		</part>
 		<part name="009" interface="vgm_quik">
-			<feature name="part_id" value="09 - insane god!!.vgz" />
-			<dataarea name="quik" size="33685">
-				<rom name="09 - insane god.vgz" size="33685" crc="2d45b6b2" sha1="87577d73a36e373add8e3b622fb45296586f2c3a" offset="0" />
+			<feature name="part_id" value="09 switching between offense and defense 2.vgz" />
+			<dataarea name="quik" size="45311">
+				<rom name="09 switching between offense and defense 2.vgz" size="45311" crc="b0318ebe" sha1="731228026af26cbfe3987754572bdb59b063afe7" offset="0" />
 			</dataarea>
 		</part>
 		<part name="010" interface="vgm_quik">
-			<feature name="part_id" value="10 - dream of the finish.vgz" />
-			<dataarea name="quik" size="37498">
-				<rom name="10 - dream of the finish.vgz" size="37498" crc="557cb618" sha1="ecc94aef7061eed9a180fc5d3f59f7e499252ed1" offset="0" />
+			<feature name="part_id" value="10 switching between offense and defense 3.vgz" />
+			<dataarea name="quik" size="54786">
+				<rom name="10 switching between offense and defense 3.vgz" size="54786" crc="fbe90787" sha1="a67fd6b7b4790f0feb4a4cdaf3f801925deb2231" offset="0" />
 			</dataarea>
 		</part>
 		<part name="011" interface="vgm_quik">
-			<feature name="part_id" value="11 - funeral song of two nations.vgz" />
-			<dataarea name="quik" size="24544">
-				<rom name="11 - funeral song of two nations.vgz" size="24544" crc="a827b02e" sha1="7e58c6801807ddfcf47ac2d1433e741e50bc73be" offset="0" />
+			<feature name="part_id" value="11 switching between offense and defense 4.vgz" />
+			<dataarea name="quik" size="47687">
+				<rom name="11 switching between offense and defense 4.vgz" size="47687" crc="a5c5f4d1" sha1="10f2dc5ad8301a0c64e1c69520c9c56ebc4bc6d3" offset="0" />
 			</dataarea>
 		</part>
 		<part name="012" interface="vgm_quik">
-			<feature name="part_id" value="12 - meeting of assassins!.vgz" />
-			<dataarea name="quik" size="14501">
-				<rom name="12 - meeting of assassins.vgz" size="14501" crc="5588438f" sha1="76cd0f7156e66203b35f795402429e7a7d927100" offset="0" />
+			<feature name="part_id" value="12 home run.vgz" />
+			<dataarea name="quik" size="51236">
+				<rom name="12 home run.vgz" size="51236" crc="9084a9b7" sha1="65c78467dec0f8202c82c72f460b46417a408f16" offset="0" />
 			</dataarea>
 		</part>
 		<part name="013" interface="vgm_quik">
-			<feature name="part_id" value="13 - harima hyakunin isshu.vgz" />
-			<dataarea name="quik" size="14842">
-				<rom name="13 - harima hyakunin isshu.vgz" size="14842" crc="59d4e68f" sha1="0342bcd275362da4e2273b4dd540a7ae8d004e09" offset="0" />
+			<feature name="part_id" value="13 the end of the match.vgz" />
+			<dataarea name="quik" size="62571">
+				<rom name="13 the end of the match.vgz" size="62571" crc="96b82a08" sha1="514dab0500eba0e046c7e54a2c1cc0c71b5a3b4f" offset="0" />
 			</dataarea>
 		</part>
 		<part name="014" interface="vgm_quik">
-			<feature name="part_id" value="14 - sumo devotion.vgz" />
-			<dataarea name="quik" size="59364">
-				<rom name="14 - sumo devotion.vgz" size="59364" crc="278312a5" sha1="f7482c18545fbca1f6aff4b8c048d7d727951dd4" offset="0" />
+			<feature name="part_id" value="14 time bgm.vgz" />
+			<dataarea name="quik" size="82966">
+				<rom name="14 time bgm.vgz" size="82966" crc="6bb03dee" sha1="a485253f8bb2388c8f85e30d5bcb781933cd3cbf" offset="0" />
 			</dataarea>
 		</part>
 		<part name="015" interface="vgm_quik">
-			<feature name="part_id" value="15 - the end!.vgz" />
-			<dataarea name="quik" size="11428">
-				<rom name="15 - the end.vgz" size="11428" crc="d3394bae" sha1="24d28474b0ba15113bd73907d7175cda3d66000b" offset="0" />
+			<feature name="part_id" value="15 great sluggers (looped).vgz" />
+			<dataarea name="quik" size="191794">
+				<rom name="15 great sluggers (looped).vgz" size="191794" crc="1747388e" sha1="3cf5b2bb4b3823b34090e8ab51149bc2cbdd1b8f" offset="0" />
 			</dataarea>
 		</part>
 		<part name="016" interface="vgm_quik">
-			<feature name="part_id" value="16 - the first harima exercises.vgz" />
-			<dataarea name="quik" size="1759">
-				<rom name="16 - the first harima exercises.vgz" size="1759" crc="3647d87f" sha1="511199db3b5c699c6f604e712bcdf8f1bcae7e2e" offset="0" />
+			<feature name="part_id" value="16 second wind (looped).vgz" />
+			<dataarea name="quik" size="190111">
+				<rom name="16 second wind (looped).vgz" size="190111" crc="3efa183d" sha1="6ac526ed2b2d6778054cbe6456c86ad41e0f6553" offset="0" />
 			</dataarea>
 		</part>
 		<part name="017" interface="vgm_quik">
-			<feature name="part_id" value="17 - sumo dance music.vgz" />
-			<dataarea name="quik" size="60098">
-				<rom name="17 - sumo dance music.vgz" size="60098" crc="affba46f" sha1="eaf9089ab6d543f5cb5acd28897ec706f0f7efdf" offset="0" />
+			<feature name="part_id" value="17 full base (looped).vgz" />
+			<dataarea name="quik" size="193956">
+				<rom name="17 full base (looped).vgz" size="193956" crc="30b6322e" sha1="d6b5e99675c8969b9180fae015b826ad2713c0dd" offset="0" />
 			</dataarea>
 		</part>
-		<part name="018" interface="vgm_quik">
-			<feature name="part_id" value="18 - tempest arena.vgz" />
-			<dataarea name="quik" size="45474">
-				<rom name="18 - tempest arena.vgz" size="45474" crc="9f86113a" sha1="f00c272978cd332b4f37e8812055c34ae7727eea" offset="0" />
+	</software>
+
+	<software name="gslgr94j">
+		<description>Great Sluggers Featuring 1994 Team Rosters (Namco NB-1)</description>
+		<year>1993</year>
+		<publisher>Namco</publisher>
+		<info name="cores" value="C352"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 opening theme.vgz" />
+			<dataarea name="quik" size="163940">
+				<rom name="01 opening theme.vgz" size="163940" crc="5cad43e9" sha1="baec78d3577ff0c5d930fd1768537d4ebab3c19c" offset="0" />
 			</dataarea>
 		</part>
-		<part name="019" interface="vgm_quik">
-			<feature name="part_id" value="19 - sandstorm gale.vgz" />
-			<dataarea name="quik" size="47752">
-				<rom name="19 - sandstorm gale.vgz" size="47752" crc="948c441d" sha1="cc8aa0026e27a8f8ef1cdc2e83764b26d456b03d" offset="0" />
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 forward field.vgz" />
+			<dataarea name="quik" size="169820">
+				<rom name="02 forward field.vgz" size="169820" crc="a1c63375" sha1="4690c440977ee7cbef59adc894266f73ff373f80" offset="0" />
 			</dataarea>
 		</part>
-		<part name="020" interface="vgm_quik">
-			<feature name="part_id" value="20 - gachinko jinsei.vgz" />
-			<dataarea name="quik" size="35836">
-				<rom name="20 - gachinko jinsei.vgz" size="35836" crc="a775f688" sha1="6492f7eb0e16c0c384105555d466c2676ac6111f" offset="0" />
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 great sluggers.vgz" />
+			<dataarea name="quik" size="394711">
+				<rom name="03 great sluggers.vgz" size="394711" crc="7e5d4978" sha1="1d4c8b99f74741edd8210a94830eda2e8feaf76b" offset="0" />
 			</dataarea>
 		</part>
-		<part name="021" interface="vgm_quik">
-			<feature name="part_id" value="21 - destruction by size.vgz" />
-			<dataarea name="quik" size="48911">
-				<rom name="21 - destruction by size.vgz" size="48911" crc="c46869c7" sha1="071d2564a0d7c07f8894f82d2997a126aeff5438" offset="0" />
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 second wind.vgz" />
+			<dataarea name="quik" size="311081">
+				<rom name="04 second wind.vgz" size="311081" crc="297c407e" sha1="48469877d5dd6abcdd01e8961fea44b4ed7c7929" offset="0" />
 			</dataarea>
 		</part>
-		<part name="022" interface="vgm_quik">
-			<feature name="part_id" value="22 - hiramaku rock.vgz" />
-			<dataarea name="quik" size="44159">
-				<rom name="22 - hiramaku rock.vgz" size="44159" crc="eac0a4b9" sha1="0dc03636cda81d503e6504e8af318da124dcdcc3" offset="0" />
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 full base.vgz" />
+			<dataarea name="quik" size="343737">
+				<rom name="05 full base.vgz" size="343737" crc="52e4e070" sha1="788fd0f8b7cc269086f8ac52e5e8ca288d9d3d15" offset="0" />
 			</dataarea>
 		</part>
-		<part name="023" interface="vgm_quik">
-			<feature name="part_id" value="23 - elephant of the southern sea.vgz" />
-			<dataarea name="quik" size="49393">
-				<rom name="23 - elephant of the southern sea.vgz" size="49393" crc="4cc9b683" sha1="de2a6f9f3652cef0ef706be7975682e1cad4758e" offset="0" />
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 bgm 4.vgz" />
+			<dataarea name="quik" size="378038">
+				<rom name="06 bgm 4.vgz" size="378038" crc="dffed57d" sha1="f1ebf3b7c3826411ec639a4ca45e4b2f473a7b27" offset="0" />
 			</dataarea>
 		</part>
-		<part name="024" interface="vgm_quik">
-			<feature name="part_id" value="24 - throw of justice.vgz" />
-			<dataarea name="quik" size="38382">
-				<rom name="24 - throw of justice.vgz" size="38382" crc="8fabe89b" sha1="8ed8b0e4d1101ad4838ede02ed9f013bc475c876" offset="0" />
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 namco sports news opening theme.vgz" />
+			<dataarea name="quik" size="154929">
+				<rom name="07 namco sports news opening theme.vgz" size="154929" crc="6b9f7b34" sha1="f0170315d2931f9c71715b9a7f02cc508b317a70" offset="0" />
 			</dataarea>
 		</part>
-		<part name="025" interface="vgm_quik">
-			<feature name="part_id" value="25 - young noble's slap.vgz" />
-			<dataarea name="quik" size="39135">
-				<rom name="25 - young noble's slap.vgz" size="39135" crc="6b1b11f8" sha1="2ecea724e951dd94c13d1b18d722e33dea0e41e9" offset="0" />
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 namco sports news main theme.vgz" />
+			<dataarea name="quik" size="247803">
+				<rom name="08 namco sports news main theme.vgz" size="247803" crc="d7f7560d" sha1="05e282dbf1573f4930d2ab59827e4d78d1c3732a" offset="0" />
 			</dataarea>
 		</part>
-		<part name="026" interface="vgm_quik">
-			<feature name="part_id" value="26 - northern hooligan.vgz" />
-			<dataarea name="quik" size="24233">
-				<rom name="26 - northern hooligan.vgz" size="24233" crc="948b7fdc" sha1="a9b74e7c09a8dd05c19e0bb88302220588f9b7e7" offset="0" />
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 switching between offense and defense 1.vgz" />
+			<dataarea name="quik" size="109726">
+				<rom name="09 switching between offense and defense 1.vgz" size="109726" crc="ced62d1c" sha1="e5c907576f373113f6a8ac6ff81e3bda9f0acb04" offset="0" />
 			</dataarea>
 		</part>
-		<part name="027" interface="vgm_quik">
-			<feature name="part_id" value="27 - lucky adventurer of heaven.vgz" />
-			<dataarea name="quik" size="41274">
-				<rom name="27 - lucky adventurer of heaven.vgz" size="41274" crc="59f5f126" sha1="1e571f1b9a09cb0925e8c61a82e898374f39b174" offset="0" />
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 switching between offense and defense 2.vgz" />
+			<dataarea name="quik" size="109001">
+				<rom name="10 switching between offense and defense 2.vgz" size="109001" crc="99a4f3e5" sha1="7facac80da60c8f5a0d90905fc9db1bd33d53308" offset="0" />
 			</dataarea>
 		</part>
-		<part name="028" interface="vgm_quik">
-			<feature name="part_id" value="28 - explosive sumo, the decisive match!.vgz" />
-			<dataarea name="quik" size="40574">
-				<rom name="28 - explosive sumo, the decisive match.vgz" size="40574" crc="41bfc97f" sha1="b0cd6661ebb8c103d17ba3e3d6fa3ab71866af34" offset="0" />
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 switching between offense and defense 3.vgz" />
+			<dataarea name="quik" size="135799">
+				<rom name="11 switching between offense and defense 3.vgz" size="135799" crc="51401e12" sha1="a183ca6b7e6d8e7eb3afb06bc9c76913f52c6115" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 switching between offense and defense 4.vgz" />
+			<dataarea name="quik" size="109014">
+				<rom name="12 switching between offense and defense 4.vgz" size="109014" crc="ed2940f5" sha1="f7ebd6b39ec4f6f7fc6f9a672580a0a028ba966b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 home run.vgz" />
+			<dataarea name="quik" size="127099">
+				<rom name="13 home run.vgz" size="127099" crc="8e3d2904" sha1="6cab994c2dbd546e469a47b600ab84b9ce23957a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 the end of the match.vgz" />
+			<dataarea name="quik" size="123970">
+				<rom name="14 the end of the match.vgz" size="123970" crc="3e91ed6f" sha1="7e6d1aa3bcb3a205d59e91ce68e5e15085d0dc70" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 usa anthem.vgz" />
+			<dataarea name="quik" size="226528">
+				<rom name="15 usa anthem.vgz" size="226528" crc="b64d2be9" sha1="07e972365d261821a4058cac5e7ef0ebab62b77c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 canada anthem.vgz" />
+			<dataarea name="quik" size="329523">
+				<rom name="16 canada anthem.vgz" size="329523" crc="4f476811" sha1="23db6419bf042ea83d259997ea12e8867572845a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 time bgm.vgz" />
+			<dataarea name="quik" size="110272">
+				<rom name="17 time bgm.vgz" size="110272" crc="f3b6f24a" sha1="c5c02ee22cb0236a0fc82982649169a8a35422fb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 great sluggers (looped).vgz" />
+			<dataarea name="quik" size="295458">
+				<rom name="18 great sluggers (looped).vgz" size="295458" crc="96c27c78" sha1="f596e0d8ccc916da466323d26a873609bf8ff8c0" offset="0" />
+			</dataarea>
+		</part>
+		<part name="019" interface="vgm_quik">
+			<feature name="part_id" value="19 second wind (looped).vgz" />
+			<dataarea name="quik" size="305568">
+				<rom name="19 second wind (looped).vgz" size="305568" crc="30acf56a" sha1="a28ed61374f6d12487b1637d0ca8ae30482d0673" offset="0" />
+			</dataarea>
+		</part>
+		<part name="020" interface="vgm_quik">
+			<feature name="part_id" value="20 full base (looped).vgz" />
+			<dataarea name="quik" size="331782">
+				<rom name="20 full base (looped).vgz" size="331782" crc="3b75da26" sha1="c3b9c20ee0febc68fdc74df4ca70322f01f8b780" offset="0" />
+			</dataarea>
+		</part>
+		<part name="021" interface="vgm_quik">
+			<feature name="part_id" value="21 bgm 4 (looped).vgz" />
+			<dataarea name="quik" size="340032">
+				<rom name="21 bgm 4 (looped).vgz" size="340032" crc="1b00355b" sha1="e21cd61e296230eba218a16486a4bcab3db2d71f" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="aaahhrm_md">
-		<description>AAAHH!!! Real Monsters (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>Viacom New Media</publisher>
-		<info name="cores" value="SN76496, YM2612"/>
+	<software name="hhg_98">
+		<description>Heart Heat Girls (NEC PC-9801)</description>
+		<year>1993</year>
+		<publisher>Cat's Pro</publisher>
+		<info name="cores" value="NEC PC-9801-26K (YM2203)"/>
 		<part name="001" interface="vgm_quik">
-			<feature name="part_id" value="01 - title, score.vgz" />
-			<dataarea name="quik" size="7405">
-				<rom name="01 - title, score.vgz" size="7405" crc="735bfe63" sha1="30b05a4e2e1f79ada1838377cc282d8c5ee12877" offset="0" />
+			<feature name="part_id" value="01 cat's pro logo.vgz" />
+			<dataarea name="quik" size="9609">
+				<rom name="01 cat's pro logo.vgz" size="9609" crc="12bb175b" sha1="34e300cd3eb4effe46ed365e8ae0fd3e44bdb7b9" offset="0" />
 			</dataarea>
 		</part>
 		<part name="002" interface="vgm_quik">
-			<feature name="part_id" value="02 - dump 1, dump 5, post office 1.vgz" />
-			<dataarea name="quik" size="25595">
-				<rom name="02 - dump 1, dump 5, post office 1.vgz" size="25595" crc="b8773af6" sha1="428f3253455cdf97d65a847dc7aedd5f6d30637b" offset="0" />
+			<feature name="part_id" value="02 opening.vgz" />
+			<dataarea name="quik" size="19350">
+				<rom name="02 opening.vgz" size="19350" crc="320891cd" sha1="9ac13ec36afe380e8d89defe7f642813e512240d" offset="0" />
 			</dataarea>
 		</part>
 		<part name="003" interface="vgm_quik">
-			<feature name="part_id" value="03 - dump 2.vgz" />
-			<dataarea name="quik" size="56180">
-				<rom name="03 - dump 2.vgz" size="56180" crc="1432bbb4" sha1="4f162a9e92bff14c1e067e9fc44739834617a137" offset="0" />
+			<feature name="part_id" value="03 accident occurred.vgz" />
+			<dataarea name="quik" size="10596">
+				<rom name="03 accident occurred.vgz" size="10596" crc="442e17cb" sha1="f4b1df586276aac92c68383ee7fa9dc3a2b0a732" offset="0" />
 			</dataarea>
 		</part>
 		<part name="004" interface="vgm_quik">
-			<feature name="part_id" value="04 - dump 3, post office 2.vgz" />
-			<dataarea name="quik" size="61922">
-				<rom name="04 - dump 3, post office 2.vgz" size="61922" crc="345f0333" sha1="fc475802949a87161606e5f0433c5ceb1266b0ed" offset="0" />
+			<feature name="part_id" value="04 sait.vgz" />
+			<dataarea name="quik" size="22149">
+				<rom name="04 sait.vgz" size="22149" crc="0bc3a331" sha1="8b1dd60a994f8a8fe8cfcd0ab84cd6be074627a7" offset="0" />
 			</dataarea>
 		</part>
 		<part name="005" interface="vgm_quik">
-			<feature name="part_id" value="05 - dump 4.vgz" />
-			<dataarea name="quik" size="31203">
-				<rom name="05 - dump 4.vgz" size="31203" crc="ebd80943" sha1="76ba173f699d3d1e7afd75d80cd3acba5e85efd9" offset="0" />
+			<feature name="part_id" value="05 prehistoric civilization.vgz" />
+			<dataarea name="quik" size="11999">
+				<rom name="05 prehistoric civilization.vgz" size="11999" crc="242c99a3" sha1="4ae43b78a321718230d12da5af1ce01b7c8f2323" offset="0" />
 			</dataarea>
 		</part>
 		<part name="006" interface="vgm_quik">
-			<feature name="part_id" value="06 - dump 6, hunter 1, dino 2.vgz" />
-			<dataarea name="quik" size="21044">
-				<rom name="06 - dump 6, hunter 1, dino 2.vgz" size="21044" crc="86384816" sha1="a8d69122929b7dbd7d383c19ba172299b1165c7c" offset="0" />
+			<feature name="part_id" value="06 department of defense.vgz" />
+			<dataarea name="quik" size="13655">
+				<rom name="06 department of defense.vgz" size="13655" crc="ecad8b18" sha1="3ade770fda5f7f72b281ea47951437f79d620c16" offset="0" />
 			</dataarea>
 		</part>
 		<part name="007" interface="vgm_quik">
-			<feature name="part_id" value="07 - dump 7.vgz" />
-			<dataarea name="quik" size="77068">
-				<rom name="07 - dump 7.vgz" size="77068" crc="5e31fed8" sha1="b7c762a6793538ee4e02c07dc4b8bd03c2cfdf57" offset="0" />
+			<feature name="part_id" value="07 kurama industries.vgz" />
+			<dataarea name="quik" size="16804">
+				<rom name="07 kurama industries.vgz" size="16804" crc="44a8a546" sha1="191c265b36ce3d3411d030bdd5521a8371d0cf70" offset="0" />
 			</dataarea>
 		</part>
 		<part name="008" interface="vgm_quik">
-			<feature name="part_id" value="08 - post office 3, dump bonus 1.vgz" />
-			<dataarea name="quik" size="110035">
-				<rom name="08 - post office 3, dump bonus 1.vgz" size="110035" crc="ebedf425" sha1="052b59ac9415e7939c72b404ab20077f6ee0a846" offset="0" />
+			<feature name="part_id" value="08 relief.vgz" />
+			<dataarea name="quik" size="23149">
+				<rom name="08 relief.vgz" size="23149" crc="d04b49b7" sha1="76111c0e4b6fd05218c3271687e3d81711c7f12e" offset="0" />
 			</dataarea>
 		</part>
 		<part name="009" interface="vgm_quik">
-			<feature name="part_id" value="09 - mall 1, credits.vgz" />
-			<dataarea name="quik" size="59352">
-				<rom name="09 - mall 1, credits.vgz" size="59352" crc="e979fae0" sha1="85b036c3078af21323aaf69e9331c1d4145a0f24" offset="0" />
+			<feature name="part_id" value="09 rosewood.vgz" />
+			<dataarea name="quik" size="19812">
+				<rom name="09 rosewood.vgz" size="19812" crc="87b73cd5" sha1="912c210475a07ea7a0782d069faa92449d60d3c6" offset="0" />
 			</dataarea>
 		</part>
 		<part name="010" interface="vgm_quik">
-			<feature name="part_id" value="10 - continue, assignment.vgz" />
-			<dataarea name="quik" size="7123">
-				<rom name="10 - continue, assignment.vgz" size="7123" crc="d381facb" sha1="63494c913a456ffe7e8d13bf0638c521621420cf" offset="0" />
+			<feature name="part_id" value="10 danger.vgz" />
+			<dataarea name="quik" size="19039">
+				<rom name="10 danger.vgz" size="19039" crc="8a8bc886" sha1="747a498982a658ddd19f3c18a86b28cfbef027ed" offset="0" />
 			</dataarea>
 		</part>
 		<part name="011" interface="vgm_quik">
-			<feature name="part_id" value="11 - hunter 2, dino 1.vgz" />
-			<dataarea name="quik" size="40969">
-				<rom name="11 - hunter 2, dino 1.vgz" size="40969" crc="11548576" sha1="f59c8dab6ce4ecea7137846bc04b250f32eef2be" offset="0" />
+			<feature name="part_id" value="11 machining.vgz" />
+			<dataarea name="quik" size="43051">
+				<rom name="11 machining.vgz" size="43051" crc="f1857cf5" sha1="add00a4d12c34448e736afc3d8b557a6576d4da2" offset="0" />
 			</dataarea>
 		</part>
 		<part name="012" interface="vgm_quik">
-			<feature name="part_id" value="12 - gym 1, school 1.vgz" />
-			<dataarea name="quik" size="37175">
-				<rom name="12 - gym 1, school 1.vgz" size="37175" crc="d386f88f" sha1="9064f4559f1cad34c7eda37ac32a1265a850000d" offset="0" />
+			<feature name="part_id" value="12 acp.vgz" />
+			<dataarea name="quik" size="71300">
+				<rom name="12 acp.vgz" size="71300" crc="7092c88d" sha1="de8b63355b28b41b812e2323351e5f05652f75c2" offset="0" />
 			</dataarea>
 		</part>
 		<part name="013" interface="vgm_quik">
-			<feature name="part_id" value="13 - options.vgz" />
-			<dataarea name="quik" size="2941">
-				<rom name="13 - options.vgz" size="2941" crc="1d23f075" sha1="62349bf296b8601387d08575001f29d2756f2a03" offset="0" />
+			<feature name="part_id" value="13 3d map.vgz" />
+			<dataarea name="quik" size="11947">
+				<rom name="13 3d map.vgz" size="11947" crc="49d04760" sha1="71da6e637152242d4cf896a6e0e10a64731143b1" offset="0" />
 			</dataarea>
 		</part>
 		<part name="014" interface="vgm_quik">
-			<feature name="part_id" value="14 - googleplex, post boss.vgz" />
-			<dataarea name="quik" size="58354">
-				<rom name="14 - googleplex, post boss.vgz" size="58354" crc="a9b7248c" sha1="ed8efb451869da7f83f91cd179eda348e8c8ef95" offset="0" />
+			<feature name="part_id" value="14 chapter.vgz" />
+			<dataarea name="quik" size="9240">
+				<rom name="14 chapter.vgz" size="9240" crc="2b1888ff" sha1="37cbfa52538dd21066cefd98c06f472a5db62868" offset="0" />
 			</dataarea>
 		</part>
 		<part name="015" interface="vgm_quik">
-			<feature name="part_id" value="15 - diploma.vgz" />
-			<dataarea name="quik" size="5268">
-				<rom name="15 - diploma.vgz" size="5268" crc="b72d0a2a" sha1="15378181ade0e1fcac0c17961de7124f4787630d" offset="0" />
+			<feature name="part_id" value="15 shower.vgz" />
+			<dataarea name="quik" size="6869">
+				<rom name="15 shower.vgz" size="6869" crc="cbd30ebc" sha1="083551ea03ba120a10046c199bcd3e008ccfeac0" offset="0" />
 			</dataarea>
 		</part>
 		<part name="016" interface="vgm_quik">
-			<feature name="part_id" value="16 - win.vgz" />
-			<dataarea name="quik" size="15630">
-				<rom name="16 - win.vgz" size="15630" crc="4bbc8ee9" sha1="105ae486322f0604da1c052bf32790ad5655d6ef" offset="0" />
+			<feature name="part_id" value="16 infiltrate.vgz" />
+			<dataarea name="quik" size="28714">
+				<rom name="16 infiltrate.vgz" size="28714" crc="5919e4d7" sha1="87291f5b65510ee32cc5606f7790cf1592a1e31b" offset="0" />
 			</dataarea>
 		</part>
 		<part name="017" interface="vgm_quik">
-			<feature name="part_id" value="17 - unknown 1.vgz" />
-			<dataarea name="quik" size="65020">
-				<rom name="17 - unknown 1.vgz" size="65020" crc="a5319c16" sha1="2379eab8f63a5d520f4b66e3bc088b0291287c4a" offset="0" />
+			<feature name="part_id" value="17 victor.vgz" />
+			<dataarea name="quik" size="6947">
+				<rom name="17 victor.vgz" size="6947" crc="9a213e5f" sha1="1fe8823307940609d454622a8132df826e654b09" offset="0" />
 			</dataarea>
 		</part>
 		<part name="018" interface="vgm_quik">
-			<feature name="part_id" value="18 - unknown 2.vgz" />
-			<dataarea name="quik" size="7329">
-				<rom name="18 - unknown 2.vgz" size="7329" crc="577aa74e" sha1="a464fddd0b2df0ba835c9135e3369a91d75b786d" offset="0" />
+			<feature name="part_id" value="18 dawn.vgz" />
+			<dataarea name="quik" size="28312">
+				<rom name="18 dawn.vgz" size="28312" crc="d8d7e53c" sha1="ff9adcec47a76ebe4758a2838adf1b66fd98f1f7" offset="0" />
 			</dataarea>
 		</part>
 		<part name="019" interface="vgm_quik">
-			<feature name="part_id" value="19 - unknown 3.vgz" />
-			<dataarea name="quik" size="4594">
-				<rom name="19 - unknown 3.vgz" size="4594" crc="53ddb555" sha1="11e1c2ee99f1a1e132d88aefd61113afaacafa6a" offset="0" />
+			<feature name="part_id" value="19 mixed.vgz" />
+			<dataarea name="quik" size="21471">
+				<rom name="19 mixed.vgz" size="21471" crc="157635d0" sha1="9889bba1401ca6f5365e0d61a3b846b2e42e9c27" offset="0" />
 			</dataarea>
 		</part>
 		<part name="020" interface="vgm_quik">
-			<feature name="part_id" value="20 - unknown 4.vgz" />
-			<dataarea name="quik" size="4751">
-				<rom name="20 - unknown 4.vgz" size="4751" crc="66f6f61b" sha1="2e53d722ac8831b2a30eddc19e36a62c195e889f" offset="0" />
+			<feature name="part_id" value="20 angelica's tears.vgz" />
+			<dataarea name="quik" size="39572">
+				<rom name="20 angelica's tears.vgz" size="39572" crc="c8196025" sha1="8db480a2f43b41a4db7e30c41943a5059097fe9f" offset="0" />
 			</dataarea>
 		</part>
 		<part name="021" interface="vgm_quik">
-			<feature name="part_id" value="21 - unknown 5.vgz" />
-			<dataarea name="quik" size="9302">
-				<rom name="21 - unknown 5.vgz" size="9302" crc="1eda6daf" sha1="47db9b72ae575a679eadb1c4456b80ce9d572cca" offset="0" />
+			<feature name="part_id" value="21 ending.vgz" />
+			<dataarea name="quik" size="21256">
+				<rom name="21 ending.vgz" size="21256" crc="627c283c" sha1="65665a155f8648831ea56f68fd61048ebf36fa4a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="022" interface="vgm_quik">
+			<feature name="part_id" value="22 counterattack.vgz" />
+			<dataarea name="quik" size="37310">
+				<rom name="22 counterattack.vgz" size="37310" crc="fff088b4" sha1="511bd203f0bcae9b5b0c9af5cc456d89f7814eb0" offset="0" />
+			</dataarea>
+		</part>
+		<part name="023" interface="vgm_quik">
+			<feature name="part_id" value="23 reminiscence.vgz" />
+			<dataarea name="quik" size="23873">
+				<rom name="23 reminiscence.vgz" size="23873" crc="a8e4edda" sha1="6475b307bc269b038d0e875a471d23be59d2baa2" offset="0" />
+			</dataarea>
+		</part>
+		<part name="024" interface="vgm_quik">
+			<feature name="part_id" value="24 combat.vgz" />
+			<dataarea name="quik" size="4858">
+				<rom name="24 combat.vgz" size="4858" crc="45a69619" sha1="065b796bce5ed44f337924a129944891428d4e20" offset="0" />
+			</dataarea>
+		</part>
+		<part name="025" interface="vgm_quik">
+			<feature name="part_id" value="25 title.vgz" />
+			<dataarea name="quik" size="43187">
+				<rom name="25 title.vgz" size="43187" crc="5e1d3503" sha1="ba6868b39462b63815d912d40f65b0ee3769fa2d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="026" interface="vgm_quik">
+			<feature name="part_id" value="26 unknown 01.vgz" />
+			<dataarea name="quik" size="23617">
+				<rom name="26 unknown 01.vgz" size="23617" crc="0b088ab3" sha1="012081535139e88b90ad171ed4a4bbbf81a22f62" offset="0" />
+			</dataarea>
+		</part>
+		<part name="027" interface="vgm_quik">
+			<feature name="part_id" value="27 unknown 02.vgz" />
+			<dataarea name="quik" size="33854">
+				<rom name="27 unknown 02.vgz" size="33854" crc="beaa691c" sha1="22e26275356180cb6de2af05942f049bf57dd16e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="028" interface="vgm_quik">
+			<feature name="part_id" value="28 unknown 03.vgz" />
+			<dataarea name="quik" size="7611">
+				<rom name="28 unknown 03.vgz" size="7611" crc="4736df99" sha1="e0c26f516fcc984b75b2b0ba52ca8e5487f48311" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="action52_md">
-		<description>Action 52 (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>Active Enterprises / FarSight Technologies</publisher>
-		<info name="cores" value="SN76496, YM2612"/>
+	<software name="nesterfb_vb">
+		<description>Nester's Funky Bowling (Nintendo Virtual Boy)</description>
+		<year>1996</year>
+		<publisher>Nintendo</publisher>
+		<info name="cores" value="VSU-VUE"/>
 		<part name="001" interface="vgm_quik">
-			<feature name="part_id" value="01 - title theme.vgz" />
-			<dataarea name="quik" size="7410">
-				<rom name="01 - title theme.vgz" size="7410" crc="41f496fe" sha1="1bc058aac2b32e893c9383bf590b3b2c2cda6775" offset="0" />
+			<feature name="part_id" value="01 nintendo logo.vgz" />
+			<dataarea name="quik" size="2332">
+				<rom name="01 nintendo logo.vgz" size="2332" crc="06fd2e28" sha1="0b3fe32a5b4c5bb576fa6137b1ea89aedd7bd98d" offset="0" />
 			</dataarea>
 		</part>
 		<part name="002" interface="vgm_quik">
-			<feature name="part_id" value="02 - game selection.vgz" />
-			<dataarea name="quik" size="17611">
-				<rom name="02 - game selection.vgz" size="17611" crc="103bd69a" sha1="2fcd41e1572403d61d951d73367052223129df47" offset="0" />
+			<feature name="part_id" value="02 title screen.vgz" />
+			<dataarea name="quik" size="6744">
+				<rom name="02 title screen.vgz" size="6744" crc="ab8e98c7" sha1="e1926b617919929165068e270cf26c1441485a9a" offset="0" />
 			</dataarea>
 		</part>
 		<part name="003" interface="vgm_quik">
-			<feature name="part_id" value="03 - go bonkers (1), alfredo (2).vgz" />
-			<dataarea name="quik" size="20381">
-				<rom name="03 - go bonkers (1), alfredo (2).vgz" size="20381" crc="874c6efe" sha1="21e1e664858afbeb59b42648ab6af60b05db0dd1" offset="0" />
+			<feature name="part_id" value="03 music a.vgz" />
+			<dataarea name="quik" size="8058">
+				<rom name="03 music a.vgz" size="8058" crc="beb2c047" sha1="40e24fb16d415c8f2e936e5b2c3d47257d008843" offset="0" />
 			</dataarea>
 		</part>
 		<part name="004" interface="vgm_quik">
-			<feature name="part_id" value="04 - go bonkers (2), ooze (1).vgz" />
-			<dataarea name="quik" size="34742">
-				<rom name="04 - go bonkers (2), ooze (1).vgz" size="34742" crc="ce986905" sha1="7b5adb26fdf65f3a926c4ff8e987781a85abd16d" offset="0" />
+			<feature name="part_id" value="04 music b.vgz" />
+			<dataarea name="quik" size="8253">
+				<rom name="04 music b.vgz" size="8253" crc="cb55d982" sha1="c0e1578b7227cb3ef0458879284c4cb25e545eab" offset="0" />
 			</dataarea>
 		</part>
 		<part name="005" interface="vgm_quik">
-			<feature name="part_id" value="05 - darksyne (1), haunted hills (2).vgz" />
-			<dataarea name="quik" size="54641">
-				<rom name="05 - darksyne (1), haunted hills (2).vgz" size="54641" crc="f36e152c" sha1="61da7d7df63e882631114996e8de261c06ba5465" offset="0" />
+			<feature name="part_id" value="05 music c.vgz" />
+			<dataarea name="quik" size="13608">
+				<rom name="05 music c.vgz" size="13608" crc="e767a565" sha1="e5e3f15952da99d114ecbb15fd4469624c0967a9" offset="0" />
 			</dataarea>
 		</part>
 		<part name="006" interface="vgm_quik">
-			<feature name="part_id" value="06 - darksyne (2), haunted hills (1).vgz" />
-			<dataarea name="quik" size="17082">
-				<rom name="06 - darksyne (2), haunted hills (1).vgz" size="17082" crc="782ebf06" sha1="e5a6f0b10c822db465e8805470b16a99a70ac9e7" offset="0" />
+			<feature name="part_id" value="06 high score.vgz" />
+			<dataarea name="quik" size="2330">
+				<rom name="06 high score.vgz" size="2330" crc="2583f9b3" sha1="51ed5a5b7724c92ccaf08c137f853e2222164af9" offset="0" />
 			</dataarea>
 		</part>
 		<part name="007" interface="vgm_quik">
-			<feature name="part_id" value="07 - dyno tennis (1), mousetrap (2).vgz" />
-			<dataarea name="quik" size="5829">
-				<rom name="07 - dyno tennis (1), mousetrap (2).vgz" size="5829" crc="32f5aa6d" sha1="e623c3f2f9a12754552839b171a5d1d76a052954" offset="0" />
+			<feature name="part_id" value="07 low score.vgz" />
+			<dataarea name="quik" size="1329">
+				<rom name="07 low score.vgz" size="1329" crc="258b4d69" sha1="0d21d915a3addc900b64d74a9d45f88c0a85605b" offset="0" />
 			</dataarea>
 		</part>
 		<part name="008" interface="vgm_quik">
-			<feature name="part_id" value="08 - dyno tennis (2), shootout (1).vgz" />
-			<dataarea name="quik" size="6429">
-				<rom name="08 - dyno tennis (2), shootout (1).vgz" size="6429" crc="1d32754b" sha1="431f59157eddc420b95319443f5ae7ccc67aa134" offset="0" />
+			<feature name="part_id" value="08 2 players win.vgz" />
+			<dataarea name="quik" size="4527">
+				<rom name="08 2 players win.vgz" size="4527" crc="cd5bf6e5" sha1="e074e08544ca3177db5cbcf468c724681d12bcb2" offset="0" />
 			</dataarea>
 		</part>
 		<part name="009" interface="vgm_quik">
-			<feature name="part_id" value="09 - ooze (2), daytona, alfredo (1).vgz" />
-			<dataarea name="quik" size="33091">
-				<rom name="09 - ooze (2), daytona, alfredo (1).vgz" size="33091" crc="6f35eb96" sha1="fee0cf673178186f993941f39ed37c73057e5b2c" offset="0" />
+			<feature name="part_id" value="09 league leaders.vgz" />
+			<dataarea name="quik" size="4720">
+				<rom name="09 league leaders.vgz" size="4720" crc="fe47bf5f" sha1="94fe7970f9fdeca5b32687be31b9756da44c4b3a" offset="0" />
 			</dataarea>
 		</part>
 		<part name="010" interface="vgm_quik">
-			<feature name="part_id" value="10 - star ball, force one (2).vgz" />
-			<dataarea name="quik" size="25207">
-				<rom name="10 - star ball, force one (2).vgz" size="25207" crc="83b17133" sha1="99653189cc08031cf53a0f3eb5b0d8ab5d404ae7" offset="0" />
+			<feature name="part_id" value="10 unknown song.vgz" />
+			<dataarea name="quik" size="3689">
+				<rom name="10 unknown song.vgz" size="3689" crc="fc30eb73" sha1="402e470977728879f864f9e4b4977d9ebeb3e54f" offset="0" />
 			</dataarea>
 		</part>
 		<part name="011" interface="vgm_quik">
-			<feature name="part_id" value="11 - sidewinder (1), air command (2), challenge.vgz" />
-			<dataarea name="quik" size="37442">
-				<rom name="11 - sidewinder (1), air command (2), challenge.vgz" size="37442" crc="00906d48" sha1="1505cb7c92d4206ca88c52b4a96275fe226062f8" offset="0" />
+			<feature name="part_id" value="11 unknown jingle a.vgz" />
+			<dataarea name="quik" size="1732">
+				<rom name="11 unknown jingle a.vgz" size="1732" crc="a2559d62" sha1="a192be0d3892df3ff3a80d4ecd9c96005c1a568e" offset="0" />
 			</dataarea>
 		</part>
 		<part name="012" interface="vgm_quik">
-			<feature name="part_id" value="12 - sidewinder (2), alien attack (1).vgz" />
-			<dataarea name="quik" size="59361">
-				<rom name="12 - sidewinder (2), alien attack (1).vgz" size="59361" crc="194c021a" sha1="1d8f0ca1ab217f21498ea4baf1a472e2885eb531" offset="0" />
+			<feature name="part_id" value="12 unknown jingle b.vgz" />
+			<dataarea name="quik" size="1726">
+				<rom name="12 unknown jingle b.vgz" size="1726" crc="54b769c3" sha1="22dad74df3c6593cf4bd5fdf9b0a8077c6cdafc3" offset="0" />
 			</dataarea>
 		</part>
 		<part name="013" interface="vgm_quik">
-			<feature name="part_id" value="13 - 15 puzzle (1), dedant (1).vgz" />
-			<dataarea name="quik" size="10795">
-				<rom name="13 - 15 puzzle (1), dedant (1).vgz" size="10795" crc="6860c9a9" sha1="d49af1349e711286ff80aa6d4583c7897a4f6f58" offset="0" />
+			<feature name="part_id" value="13 unknown jingle c.vgz" />
+			<dataarea name="quik" size="3044">
+				<rom name="13 unknown jingle c.vgz" size="3044" crc="8918ecd7" sha1="41ec157ea0126ef32f77c47c8adc94a096d4a055" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="orphemd_88">
+		<description>Orphe Music Disk (NEC PC-8801)</description>
+		<year>1991</year>
+		<publisher>Orphe</publisher>
+		<info name="cores" value="YM2608"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 sky shooting.vgz" />
+			<dataarea name="quik" size="26819">
+				<rom name="01 sky shooting.vgz" size="26819" crc="c8affe64" sha1="13d430248abf5f31539284913e6d367095458548" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 master wizard.vgz" />
+			<dataarea name="quik" size="3848">
+				<rom name="02 master wizard.vgz" size="3848" crc="025f43e0" sha1="40a8f0c0177174f0a9e894407358d11d7a40c364" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 last night.vgz" />
+			<dataarea name="quik" size="7658">
+				<rom name="03 last night.vgz" size="7658" crc="1a034713" sha1="9cc0573abbbba4ebe257600d7e2f4e05aa1dae29" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 sample 10s.vgz" />
+			<dataarea name="quik" size="5779">
+				<rom name="04 sample 10s.vgz" size="5779" crc="b731195a" sha1="9c8c3bdbce58e62c2b19383b9cb3fa9b0957eddc" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 silent voice.vgz" />
+			<dataarea name="quik" size="20758">
+				<rom name="05 silent voice.vgz" size="20758" crc="92149ebb" sha1="cbe34c44601dc3ccc48d97f95ae2c05d258aa204" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 different world.vgz" />
+			<dataarea name="quik" size="21961">
+				<rom name="06 different world.vgz" size="21961" crc="464c55e8" sha1="aaf9216a0fa7498a9c4b893e9297ede0fd37ff2d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 after adventure.vgz" />
+			<dataarea name="quik" size="56038">
+				<rom name="07 after adventure.vgz" size="56038" crc="ca6c2079" sha1="624e0b0cd202487ecea75bec36b222cf5a2fb1f4" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 sample 5.vgz" />
+			<dataarea name="quik" size="3392">
+				<rom name="08 sample 5.vgz" size="3392" crc="4bd54e6d" sha1="bba66fae414c984e23ca52791485c808a7aa618a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 battle master.vgz" />
+			<dataarea name="quik" size="17264">
+				<rom name="09 battle master.vgz" size="17264" crc="26a63eba" sha1="36dbbfb26f2086f01f098d0532192adcd3d4e3a4" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 oath.vgz" />
+			<dataarea name="quik" size="6165">
+				<rom name="10 oath.vgz" size="6165" crc="6bf951f7" sha1="a6ca842326201118a272cbfe8646b921fe03b4cb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 holders of terror (incomplete version).vgz" />
+			<dataarea name="quik" size="11077">
+				<rom name="11 holders of terror (incomplete version).vgz" size="11077" crc="7927df1f" sha1="96ebe40564a994656d9acee2e3c8c1109f77a9ed" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 sortilege.vgz" />
+			<dataarea name="quik" size="6095">
+				<rom name="12 sortilege.vgz" size="6095" crc="f9cfa9bf" sha1="d0e8738a9b5587de5959e1ce168b4521c16b9770" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 keep in my memory.vgz" />
+			<dataarea name="quik" size="5017">
+				<rom name="13 keep in my memory.vgz" size="5017" crc="50e64310" sha1="828563a2363022134184d4300d4531a4181bdc5d" offset="0" />
 			</dataarea>
 		</part>
 		<part name="014" interface="vgm_quik">
-			<feature name="part_id" value="14 - 15 puzzle (2), spidey (1).vgz" />
-			<dataarea name="quik" size="14926">
-				<rom name="14 - 15 puzzle (2), spidey (1).vgz" size="14926" crc="efb46439" sha1="4aab4d1b4b6a4c9a3e67342e94c0aac364bc81ff" offset="0" />
+			<feature name="part_id" value="14 shrine.vgz" />
+			<dataarea name="quik" size="6796">
+				<rom name="14 shrine.vgz" size="6796" crc="d14983f8" sha1="13788e6b4f08f625f50785a3ec64511743bac7e0" offset="0" />
 			</dataarea>
 		</part>
 		<part name="015" interface="vgm_quik">
-			<feature name="part_id" value="15 - sketch.vgz" />
-			<dataarea name="quik" size="14398">
-				<rom name="15 - sketch.vgz" size="14398" crc="4bd493da" sha1="20b07f57197567545d374977b691aa5bf527af75" offset="0" />
+			<feature name="part_id" value="15 don't submit.vgz" />
+			<dataarea name="quik" size="39289">
+				<rom name="15 don't submit.vgz" size="39289" crc="c0598292" sha1="167a410646157f632287a443386239f04b209f70" offset="0" />
 			</dataarea>
 		</part>
 		<part name="016" interface="vgm_quik">
-			<feature name="part_id" value="16 - star duel (1), depth charge (2).vgz" />
-			<dataarea name="quik" size="14144">
-				<rom name="16 - star duel (1), depth charge (2).vgz" size="14144" crc="9f03e073" sha1="135f59fcae02f176e2cd5ed862ed00513d0c46ed" offset="0" />
+			<feature name="part_id" value="16 sample 12.vgz" />
+			<dataarea name="quik" size="2547">
+				<rom name="16 sample 12.vgz" size="2547" crc="ec233bd5" sha1="941e30ccc30c8e0f9f8b3aef67446ad54788cafe" offset="0" />
 			</dataarea>
 		</part>
 		<part name="017" interface="vgm_quik">
-			<feature name="part_id" value="17 - star duel (2), slalom (1).vgz" />
-			<dataarea name="quik" size="2944">
-				<rom name="17 - star duel (2), slalom (1).vgz" size="2944" crc="e06d2c41" sha1="b25a6c7e5b61ae44872e0955ccb50e9d195e00f4" offset="0" />
+			<feature name="part_id" value="17 ambition.vgz" />
+			<dataarea name="quik" size="12750">
+				<rom name="17 ambition.vgz" size="12750" crc="6ee36a9f" sha1="e23a59fb174df8c6c69359495343deab322be91d" offset="0" />
 			</dataarea>
 		</part>
 		<part name="018" interface="vgm_quik">
-			<feature name="part_id" value="18 - cheetahmen (1), minds eye (2).vgz" />
-			<dataarea name="quik" size="20305">
-				<rom name="18 - cheetahmen (1), minds eye (2).vgz" size="20305" crc="730a559e" sha1="2634d59580cdfa14e4015fcc7e9f3e9ffddf18c8" offset="0" />
+			<feature name="part_id" value="18 twilight moon.vgz" />
+			<dataarea name="quik" size="23093">
+				<rom name="18 twilight moon.vgz" size="23093" crc="051c2950" sha1="2b1bcd9df8e8895d8cb3da6676b4a57a2688fe72" offset="0" />
 			</dataarea>
 		</part>
 		<part name="019" interface="vgm_quik">
-			<feature name="part_id" value="19 - cheetahmen (2), billy bob (1).vgz" />
-			<dataarea name="quik" size="46651">
-				<rom name="19 - cheetahmen (2), billy bob (1).vgz" size="46651" crc="5df54f6c" sha1="72b3d2f050e5f62942b73d7601123cf78bbbf804" offset="0" />
+			<feature name="part_id" value="19 be brave!.vgz" />
+			<dataarea name="quik" size="3961">
+				<rom name="19 be brave.vgz" size="3961" crc="7cb8a89c" sha1="abfe571baa95d2648838fbbeb6a8d1ca32c65181" offset="0" />
 			</dataarea>
 		</part>
 		<part name="020" interface="vgm_quik">
-			<feature name="part_id" value="20 - skirmish, billy bob (2).vgz" />
-			<dataarea name="quik" size="76610">
-				<rom name="20 - skirmish, billy bob (2).vgz" size="76610" crc="124544a5" sha1="133c849ddfa9e3f9843f69a208614b184f16f1de" offset="0" />
+			<feature name="part_id" value="20 glitter sky.vgz" />
+			<dataarea name="quik" size="37953">
+				<rom name="20 glitter sky.vgz" size="37953" crc="3f0903ed" sha1="5baa735366b7d96eb7fb6c1b25da2eb1f107ba15" offset="0" />
 			</dataarea>
 		</part>
 		<part name="021" interface="vgm_quik">
-			<feature name="part_id" value="21 - depth charge (1), paratrooper (2).vgz" />
-			<dataarea name="quik" size="20333">
-				<rom name="21 - depth charge (1), paratrooper (2).vgz" size="20333" crc="94336fc0" sha1="bf55be20d5d0bc174982b2ebd96d2f7e6593c5db" offset="0" />
+			<feature name="part_id" value="21 main theme (the legend of valkyrie).vgz" />
+			<dataarea name="quik" size="31817">
+				<rom name="21 main theme (the legend of valkyrie).vgz" size="31817" crc="5d222e37" sha1="409dc963f13d3d93645ddb2cbef97fda14a32557" offset="0" />
 			</dataarea>
 		</part>
 		<part name="022" interface="vgm_quik">
-			<feature name="part_id" value="22 - minds eye (1), alien attack (2).vgz" />
-			<dataarea name="quik" size="38323">
-				<rom name="22 - minds eye (1), alien attack (2).vgz" size="38323" crc="9386506d" sha1="bc9d794a5ba91aa0adaa9b06a91e8f0c9965e1de" offset="0" />
+			<feature name="part_id" value="22 tower of the shadow of death (ys).vgz" />
+			<dataarea name="quik" size="21153">
+				<rom name="22 tower of the shadow of death (ys).vgz" size="21153" crc="5eb49818" sha1="27d5bdfe71db9171f9733dc87078ab0920bd33a4" offset="0" />
 			</dataarea>
 		</part>
 		<part name="023" interface="vgm_quik">
-			<feature name="part_id" value="23 - sharks (1), evil star (2).vgz" />
-			<dataarea name="quik" size="8992">
-				<rom name="23 - sharks (1), evil star (2).vgz" size="8992" crc="d63854ab" sha1="47c331161e50e845961f9f54df88d8337aed58a3" offset="0" />
+			<feature name="part_id" value="23 overdrive (ys).vgz" />
+			<dataarea name="quik" size="6221">
+				<rom name="23 overdrive (ys).vgz" size="6221" crc="29ab092a" sha1="16cface5d25a31c858c3fb7aeef859a57239a5db" offset="0" />
 			</dataarea>
 		</part>
 		<part name="024" interface="vgm_quik">
-			<feature name="part_id" value="24 - sharks (2), sunday drive (1).vgz" />
-			<dataarea name="quik" size="14646">
-				<rom name="24 - sharks (2), sunday drive (1).vgz" size="14646" crc="770fdee0" sha1="54027cf54fa5926778b1cd168854335b9bcfb154" offset="0" />
+			<feature name="part_id" value="24 mute city (f-zero).vgz" />
+			<dataarea name="quik" size="3831">
+				<rom name="24 mute city (f-zero).vgz" size="3831" crc="0b37402a" sha1="8df5e712fbf4daa1f8d57fa80090d37e7dc9a42a" offset="0" />
 			</dataarea>
 		</part>
 		<part name="025" interface="vgm_quik">
-			<feature name="part_id" value="25 - knockout (1), ninja (2).vgz" />
-			<dataarea name="quik" size="15567">
-				<rom name="25 - knockout (1), ninja (2).vgz" size="15567" crc="9c64d8d4" sha1="c2310ae3c928a09ba4ece24b913549b25aec2c9c" offset="0" />
+			<feature name="part_id" value="25 captian neo (darius).vgz" />
+			<dataarea name="quik" size="7841">
+				<rom name="25 captian neo (darius).vgz" size="7841" crc="0e6965e7" sha1="a03ec9ba73c2a93b494422e3e2135496b1226ce0" offset="0" />
 			</dataarea>
 		</part>
 		<part name="026" interface="vgm_quik">
-			<feature name="part_id" value="26 - knockout (2), ninja (1).vgz" />
-			<dataarea name="quik" size="18926">
-				<rom name="26 - knockout (2), ninja (1).vgz" size="18926" crc="75ffa881" sha1="bf78ec657e0ee223e393086a1f56b0d8a00cd9ba" offset="0" />
+			<feature name="part_id" value="26 stage 1 (super star soldier).vgz" />
+			<dataarea name="quik" size="33052">
+				<rom name="26 stage 1 (super star soldier).vgz" size="33052" crc="4fbc32bc" sha1="e06872e3d6760099d48ddd75e8d372d9da8160e9" offset="0" />
 			</dataarea>
 		</part>
 		<part name="027" interface="vgm_quik">
-			<feature name="part_id" value="27 - intruder (1), skater (2).vgz" />
-			<dataarea name="quik" size="3166">
-				<rom name="27 - intruder (1), skater (2).vgz" size="3166" crc="e90e5ba8" sha1="e92f7b1c21194a4628b4ec7c335f94c98a7a7240" offset="0" />
+			<feature name="part_id" value="27 stage 4 (super star soldier).vgz" />
+			<dataarea name="quik" size="10112">
+				<rom name="27 stage 4 (super star soldier).vgz" size="10112" crc="8c738586" sha1="4bcecfd879e7c627ad8524da80941246c2d26144" offset="0" />
 			</dataarea>
 		</part>
 		<part name="028" interface="vgm_quik">
-			<feature name="part_id" value="28 - intruder (2), g fighter (1).vgz" />
-			<dataarea name="quik" size="5928">
-				<rom name="28 - intruder (2), g fighter (1).vgz" size="5928" crc="b0e9c323" sha1="db31fcfd12cdc82e8ceb8489e2c5dd45b2b0ef10" offset="0" />
+			<feature name="part_id" value="28 main theme (sky kid).vgz" />
+			<dataarea name="quik" size="5345">
+				<rom name="28 main theme (sky kid).vgz" size="5345" crc="35db7bc0" sha1="b4cc2199203d034bcc0e13aee0f34a1db073594e" offset="0" />
 			</dataarea>
 		</part>
 		<part name="029" interface="vgm_quik">
-			<feature name="part_id" value="29 - freeway (1), appleseed (2).vgz" />
-			<dataarea name="quik" size="11221">
-				<rom name="29 - freeway (1), appleseed (2).vgz" size="11221" crc="1f77b8ad" sha1="e78d3aef9a9229b727d19e1b76a1622387103394" offset="0" />
+			<feature name="part_id" value="29 sand storm (gradius iii).vgz" />
+			<dataarea name="quik" size="4234">
+				<rom name="29 sand storm (gradius iii).vgz" size="4234" crc="a0771fcf" sha1="065136fbc5a66cff4a2c1cb142820f674e4eb218" offset="0" />
 			</dataarea>
 		</part>
 		<part name="030" interface="vgm_quik">
-			<feature name="part_id" value="30 - freeway (2), appleseed (1).vgz" />
-			<dataarea name="quik" size="7596">
-				<rom name="30 - freeway (2), appleseed (1).vgz" size="7596" crc="26886e06" sha1="27cb891271dc3da2aca00db7e946d32240895b46" offset="0" />
+			<feature name="part_id" value="30 in the wind (gradius iii).vgz" />
+			<dataarea name="quik" size="4000">
+				<rom name="30 in the wind (gradius iii).vgz" size="4000" crc="c72917fa" sha1="286f69a4c91288c2ae13678de95ebd42a5eee143" offset="0" />
 			</dataarea>
 		</part>
 		<part name="031" interface="vgm_quik">
-			<feature name="part_id" value="31 - mousetrap (1), speedboat (2).vgz" />
-			<dataarea name="quik" size="3276">
-				<rom name="31 - mousetrap (1), speedboat (2).vgz" size="3276" crc="d73ce09a" sha1="0bf7335baa428529f5ba87ec0b69449c99e987b1" offset="0" />
+			<feature name="part_id" value="31 nostalgic (trigon).vgz" />
+			<dataarea name="quik" size="19371">
+				<rom name="31 nostalgic (trigon).vgz" size="19371" crc="3157e1e9" sha1="240f4c0749bbcf536517964232249849c828bd44" offset="0" />
 			</dataarea>
 		</part>
 		<part name="032" interface="vgm_quik">
-			<feature name="part_id" value="32 - slalom (2).vgz" />
-			<dataarea name="quik" size="4336">
-				<rom name="32 - slalom (2).vgz" size="4336" crc="4289dcfe" sha1="541bbaecd1be3be2dae16113bcace70eeda82c93" offset="0" />
+			<feature name="part_id" value="32 first attack (thundercross).vgz" />
+			<dataarea name="quik" size="10145">
+				<rom name="32 first attack (thundercross).vgz" size="10145" crc="a4f94c13" sha1="fae236ed90ffb04f13154c61761c4253a84118d6" offset="0" />
 			</dataarea>
 		</part>
 		<part name="033" interface="vgm_quik">
-			<feature name="part_id" value="33 - dauntless (1), black hole (2).vgz" />
-			<dataarea name="quik" size="7235">
-				<rom name="33 - dauntless (1), black hole (2).vgz" size="7235" crc="439aef94" sha1="1f16f9af5c5d6ac19d40212e00d702045be616e2" offset="0" />
+			<feature name="part_id" value="33 a long way (thundercross).vgz" />
+			<dataarea name="quik" size="7549">
+				<rom name="33 a long way (thundercross).vgz" size="7549" crc="c9ee5972" sha1="cd6a45278a94d518e42aca80237ea3dffd1f0816" offset="0" />
 			</dataarea>
 		</part>
 		<part name="034" interface="vgm_quik">
-			<feature name="part_id" value="34 - dauntless (2), black hole (1).vgz" />
-			<dataarea name="quik" size="51686">
-				<rom name="34 - dauntless (2), black hole (1).vgz" size="51686" crc="450d4919" sha1="14b16ccd6029903431feda420b0813fa79447671" offset="0" />
+			<feature name="part_id" value="34 theme of jennifer (splatterhouse).vgz" />
+			<dataarea name="quik" size="5545">
+				<rom name="34 theme of jennifer (splatterhouse).vgz" size="5545" crc="f17fe60c" sha1="92ed8f35e521f399ccdbd0952d120d898736425c" offset="0" />
 			</dataarea>
 		</part>
 		<part name="035" interface="vgm_quik">
-			<feature name="part_id" value="35 - force one (1).vgz" />
-			<dataarea name="quik" size="23257">
-				<rom name="35 - force one (1).vgz" size="23257" crc="15db0ac8" sha1="567c1eaf930168164c6fb93aaf908c196d3c81f7" offset="0" />
+			<feature name="part_id" value="35 under the horizon (unknown).vgz" />
+			<dataarea name="quik" size="5446">
+				<rom name="35 under the horizon (unknown).vgz" size="5446" crc="226084a8" sha1="1aab141646131da01626757ce72952cd32dd1bd4" offset="0" />
 			</dataarea>
 		</part>
 		<part name="036" interface="vgm_quik">
-			<feature name="part_id" value="36 - spidey (2), speedboat (1).vgz" />
-			<dataarea name="quik" size="7874">
-				<rom name="36 - spidey (2), speedboat (1).vgz" size="7874" crc="f7808d1a" sha1="d93367e398911a1c1a91611cfd11a464b31ce556" offset="0" />
+			<feature name="part_id" value="36 stage 1 (castlevania).vgz" />
+			<dataarea name="quik" size="4663">
+				<rom name="36 stage 1 (castlevania).vgz" size="4663" crc="138ed98b" sha1="23abc03fe4f0bcc76bf9689a8f3eb78a5ef323c3" offset="0" />
 			</dataarea>
 		</part>
 		<part name="037" interface="vgm_quik">
-			<feature name="part_id" value="37 - skater (1), the boss (2).vgz" />
-			<dataarea name="quik" size="15724">
-				<rom name="37 - skater (1), the boss (2).vgz" size="15724" crc="a9a99023" sha1="eae6dd7ed868030a51a53961eeced17249337633" offset="0" />
+			<feature name="part_id" value="37 stage 3 (castlevania).vgz" />
+			<dataarea name="quik" size="7223">
+				<rom name="37 stage 3 (castlevania).vgz" size="7223" crc="a45871f0" sha1="f636b0caa974c4f765a2b2b858827b6096c694c2" offset="0" />
 			</dataarea>
 		</part>
 		<part name="038" interface="vgm_quik">
-			<feature name="part_id" value="38 - sunday drive (2).vgz" />
-			<dataarea name="quik" size="31021">
-				<rom name="38 - sunday drive (2).vgz" size="31021" crc="02b62aac" sha1="d4d9bda23126dea73807c5fabb109acef10fb8ee" offset="0" />
+			<feature name="part_id" value="38 stage 5 (castlevania).vgz" />
+			<dataarea name="quik" size="5117">
+				<rom name="38 stage 5 (castlevania).vgz" size="5117" crc="e6a28acf" sha1="b71294f3ba7c193afc2c292cc84eeed06efbf1c9" offset="0" />
 			</dataarea>
 		</part>
 		<part name="039" interface="vgm_quik">
-			<feature name="part_id" value="39 - star evil (1), sky avenger (2).vgz" />
-			<dataarea name="quik" size="9414">
-				<rom name="39 - star evil (1), sky avenger (2).vgz" size="9414" crc="3977ef56" sha1="8b89d8def0fbc92de6746ba7248246491575beac" offset="0" />
+			<feature name="part_id" value="39 area 9 (dragon spirit).vgz" />
+			<dataarea name="quik" size="4487">
+				<rom name="39 area 9 (dragon spirit).vgz" size="4487" crc="6f6b13d0" sha1="33ed904d862f0b0e55f9a469e7ded680e6c0b9f9" offset="0" />
 			</dataarea>
 		</part>
 		<part name="040" interface="vgm_quik">
-			<feature name="part_id" value="40 - air command (1), bombs away (2).vgz" />
-			<dataarea name="quik" size="5130">
-				<rom name="40 - air command (1), bombs away (2).vgz" size="5130" crc="780a8e7a" sha1="9cadfc96e4693e8edfd3490ad887d0d0da3824c0" offset="0" />
+			<feature name="part_id" value="40 elf (dragon slayer iv).vgz" />
+			<dataarea name="quik" size="4308">
+				<rom name="40 elf (dragon slayer iv).vgz" size="4308" crc="a3e9548c" sha1="ce2712f956e1274503490e9b8fff19cb537edf17" offset="0" />
 			</dataarea>
 		</part>
-		<part name="041" interface="vgm_quik">
-			<feature name="part_id" value="41 - shootout (2), bombs away (1).vgz" />
-			<dataarea name="quik" size="17586">
-				<rom name="41 - shootout (2), bombs away (1).vgz" size="17586" crc="b64d4e0d" sha1="319ecf04c85c3bfd5b4acb7f0e477c41c5e60f38" offset="0" />
+	</software>
+
+	<software name="pitfight_zxs">
+		<description>Pit-Fighter (ZX Spectrum 128)</description>
+		<year>1991</year>
+		<publisher>Domark (E) / Dro (S)</publisher>
+		<info name="cores" value="AY-3-8912A"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 title.vgz" />
+			<dataarea name="quik" size="25827">
+				<rom name="01 title.vgz" size="25827" crc="c96dab78" sha1="4caa10a8e4300cca9ec6917faa00f48234b32f39" offset="0" />
 			</dataarea>
 		</part>
-		<part name="042" interface="vgm_quik">
-			<feature name="part_id" value="42 - dedant (2), norman (1).vgz" />
-			<dataarea name="quik" size="13544">
-				<rom name="42 - dedant (2), norman (1).vgz" size="13544" crc="3aaa8539" sha1="cf1ec9c9e9883c43786f3ad82c123ce3cc5b8879" offset="0" />
+	</software>
+
+	<software name="rtype_88va">
+		<description>R-Type (NEC PC-88VA)</description>
+		<year>1988</year>
+		<publisher>NEC Home Electronics</publisher>
+		<info name="cores" value="YM2608"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 opening.vgz" />
+			<dataarea name="quik" size="6513">
+				<rom name="01 opening.vgz" size="6513" crc="97576886" sha1="631001d6d19191c714a67a93498b945a98d1f972" offset="0" />
 			</dataarea>
 		</part>
-		<part name="043" interface="vgm_quik">
-			<feature name="part_id" value="43 - g fighter (2), sharpshooter (1).vgz" />
-			<dataarea name="quik" size="17535">
-				<rom name="43 - g fighter (2), sharpshooter (1).vgz" size="17535" crc="26657020" sha1="c85c41bc7ba4d51e622009ba49f0eb34f8fd3834" offset="0" />
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 start ~ battle theme (1st stage).vgz" />
+			<dataarea name="quik" size="5487">
+				<rom name="02 start ~ battle theme (1st stage).vgz" size="5487" crc="82711c96" sha1="c4a83e9cf228888cda2d3bbaf415a4d19cd75046" offset="0" />
 			</dataarea>
 		</part>
-		<part name="044" interface="vgm_quik">
-			<feature name="part_id" value="44 - man at arms (1), meteor (2).vgz" />
-			<dataarea name="quik" size="8692">
-				<rom name="44 - man at arms (1), meteor (2).vgz" size="8692" crc="339f8d96" sha1="6dbf4dad1562697f22f36e8092db406a21bb5e0d" offset="0" />
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 boss theme.vgz" />
+			<dataarea name="quik" size="2701">
+				<rom name="03 boss theme.vgz" size="2701" crc="44686168" sha1="7417c7a79396a3e441d381f726a05bd81fe245d2" offset="0" />
 			</dataarea>
 		</part>
-		<part name="045" interface="vgm_quik">
-			<feature name="part_id" value="45 - man at arms (2).vgz" />
-			<dataarea name="quik" size="11290">
-				<rom name="45 - man at arms (2).vgz" size="11290" crc="ea86276c" sha1="d7d9cf18f98a551b965c3a0721ed9455666f4c05" offset="0" />
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 return in triumph (stage clear).vgz" />
+			<dataarea name="quik" size="1409">
+				<rom name="04 return in triumph (stage clear).vgz" size="1409" crc="cecb7730" sha1="a4be0e0bc6b101464bfea0dadc05b9a0dd0e7b52" offset="0" />
 			</dataarea>
 		</part>
-		<part name="046" interface="vgm_quik">
-			<feature name="part_id" value="46 - norman (2), apache (1).vgz" />
-			<dataarea name="quik" size="32056">
-				<rom name="46 - norman (2), apache (1).vgz" size="32056" crc="2da91324" sha1="74708ee92e4ad17e91e579991ed4fede2f1be69a" offset="0" />
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 monster beat (2nd stage).vgz" />
+			<dataarea name="quik" size="2903">
+				<rom name="05 monster beat (2nd stage).vgz" size="2903" crc="e5c9dc2a" sha1="515d3532ff703e3f539998cdad15264a2998a17e" offset="0" />
 			</dataarea>
 		</part>
-		<part name="047" interface="vgm_quik">
-			<feature name="part_id" value="47 - armor battle (1), sharpshooter (2).vgz" />
-			<dataarea name="quik" size="7660">
-				<rom name="47 - armor battle (1), sharpshooter (2).vgz" size="7660" crc="d3d6fd78" sha1="680dfb649dcb270427f4ee40a734ee2a8551de18" offset="0" />
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 battle pressure (3rd stage).vgz" />
+			<dataarea name="quik" size="5355">
+				<rom name="06 battle pressure (3rd stage).vgz" size="5355" crc="7fd20fb0" sha1="5f96b271676d0c13b898f2c372d7068b12c3f76b" offset="0" />
 			</dataarea>
 		</part>
-		<part name="048" interface="vgm_quik">
-			<feature name="part_id" value="48 - armor battle (2), paratrooper (1).vgz" />
-			<dataarea name="quik" size="16007">
-				<rom name="48 - armor battle (2), paratrooper (1).vgz" size="16007" crc="257f1512" sha1="33131fac594834a5ddb58f801ec00754ef941e62" offset="0" />
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 granulationes (4th stage).vgz" />
+			<dataarea name="quik" size="3032">
+				<rom name="07 granulationes (4th stage).vgz" size="3032" crc="9f64e38e" sha1="6955f342d9eab93f1977b4deba425b492c31ade1" offset="0" />
 			</dataarea>
 		</part>
-		<part name="049" interface="vgm_quik">
-			<feature name="part_id" value="49 - magic bean (1).vgz" />
-			<dataarea name="quik" size="24254">
-				<rom name="49 - magic bean (1).vgz" size="24254" crc="c0248a18" sha1="9dce7d93328657da736f28f321757fa733b1cb1d" offset="0" />
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 monster lurking in the cave (5th stage).vgz" />
+			<dataarea name="quik" size="2948">
+				<rom name="08 monster lurking in the cave (5th stage).vgz" size="2948" crc="79cfbbbe" sha1="ed87137c18604ea4d81f6fb10f162dc7e8d1b263" offset="0" />
 			</dataarea>
 		</part>
-		<part name="050" interface="vgm_quik">
-			<feature name="part_id" value="50 - magic bean (2), the boss (1).vgz" />
-			<dataarea name="quik" size="4867">
-				<rom name="50 - magic bean (2), the boss (1).vgz" size="4867" crc="7899609c" sha1="05fe7ec88ff9401937361ecfe7f91d67245d10cb" offset="0" />
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 scramble crossroad (6th stage).vgz" />
+			<dataarea name="quik" size="4469">
+				<rom name="09 scramble crossroad (6th stage).vgz" size="4469" crc="6c4dfc63" sha1="a038850e3b8e97070d5e642b7d3265195c706059" offset="0" />
 			</dataarea>
 		</part>
-		<part name="051" interface="vgm_quik">
-			<feature name="part_id" value="51 - apache (2), sky avenger (1).vgz" />
-			<dataarea name="quik" size="19215">
-				<rom name="51 - apache (2), sky avenger (1).vgz" size="19215" crc="38519a62" sha1="bb43b3427329a49438894e3f85ea890c79de02a0" offset="0" />
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 dream island (7th stage).vgz" />
+			<dataarea name="quik" size="3471">
+				<rom name="10 dream island (7th stage).vgz" size="3471" crc="78d3307c" sha1="9cc54d7cd4b981bb248d8318fa276ac2c705dc32" offset="0" />
 			</dataarea>
 		</part>
-		<part name="052" interface="vgm_quik">
-			<feature name="part_id" value="52 - meteor (1).vgz" />
-			<dataarea name="quik" size="17292">
-				<rom name="52 - meteor (1).vgz" size="17292" crc="ec7f047c" sha1="790b6704fa96ecbfca0f77adf2baaa67305b40bb" offset="0" />
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 uterus (8th stage).vgz" />
+			<dataarea name="quik" size="1116">
+				<rom name="11 uterus (8th stage).vgz" size="1116" crc="7044e1c0" sha1="a7e6f7e1301ebbbfa40c6960b47274fb23319693" offset="0" />
 			</dataarea>
 		</part>
-		<part name="053" interface="vgm_quik">
-			<feature name="part_id" value="53 - stage clear.vgz" />
-			<dataarea name="quik" size="1371">
-				<rom name="53 - stage clear.vgz" size="1371" crc="45a8c5f7" sha1="013ddb14465ef7ac9889fffd269799e79d0c7418" offset="0" />
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 like a hero (all stage clear).vgz" />
+			<dataarea name="quik" size="2333">
+				<rom name="12 like a hero (all stage clear).vgz" size="2333" crc="cc0d11d9" sha1="785c180da68d85fd955e2405bc8326eaecc0faba" offset="0" />
 			</dataarea>
 		</part>
-		<part name="054" interface="vgm_quik">
-			<feature name="part_id" value="54 - game over.vgz" />
-			<dataarea name="quik" size="1354">
-				<rom name="54 - game over.vgz" size="1354" crc="2680eff9" sha1="ccf237b9b08ce64b9060ed1b25d91ddaf0db2798" offset="0" />
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 the end of the war (game over).vgz" />
+			<dataarea name="quik" size="1237">
+				<rom name="13 the end of the war (game over).vgz" size="1237" crc="b158d580" sha1="68503abe21c7c082c7f0c636b92934e9afb5eed6" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 continue.vgz" />
+			<dataarea name="quik" size="1071">
+				<rom name="14 continue.vgz" size="1071" crc="8f1b2db1" sha1="e3deebb0aab41380f4e29a486ab1ca9e7045f9f5" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 battle theme (1st stage).vgz" />
+			<dataarea name="quik" size="4218">
+				<rom name="15 battle theme (1st stage).vgz" size="4218" crc="5ef10618" sha1="3a95eff1561b3e8d92677d4ef19099cad1868a28" offset="0" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="addfamv_md">
-		<description>Addams Family Values (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>Ocean</publisher>
-		<info name="cores" value="YM2612"/>
+	<software name="samsho">
+		<description>Samurai Shodown (Neo Geo)</description>
+		<year>1993</year>
+		<publisher>SNK</publisher>
+		<info name="cores" value="YM2610"/>
 		<part name="001" interface="vgm_quik">
-			<feature name="part_id" value="01 - ocean logo.vgz" />
-			<dataarea name="quik" size="16841">
-				<rom name="01 - ocean logo.vgz" size="16841" crc="5dc13573" sha1="e2954e5ad16d1341d5aef2ea43fbdc4adb52453d" offset="0" />
+			<feature name="part_id" value="01 calm and agitation (title).vgz" />
+			<dataarea name="quik" size="208463">
+				<rom name="01 calm and agitation (title).vgz" size="208463" crc="c6a02ff5" sha1="7dc943b68830dd80c39e89754ffd9bba012c30d9" offset="0" />
 			</dataarea>
 		</part>
 		<part name="002" interface="vgm_quik">
-			<feature name="part_id" value="02 - addams family values.vgz" />
-			<dataarea name="quik" size="40942">
-				<rom name="02 - addams family values.vgz" size="40942" crc="25a0a906" sha1="996a8d23f300d26056f9772a6757483be167005c" offset="0" />
+			<feature name="part_id" value="02 calm and agitation - short version - (30 sec. title).vgz" />
+			<dataarea name="quik" size="185503">
+				<rom name="02 calm and agitation - short version - (30 sec. title).vgz" size="185503" crc="769987ac" sha1="0a1205438d2efd32d3f8a8b83f900c7f11979ebd" offset="0" />
 			</dataarea>
 		</part>
 		<part name="003" interface="vgm_quik">
-			<feature name="part_id" value="03 - dangerous terrain.vgz" />
-			<dataarea name="quik" size="93925">
-				<rom name="03 - dangerous terrain.vgz" size="93925" crc="267768d3" sha1="f40b5b86dce09b85390603138c5862163f90a2e2" offset="0" />
+			<feature name="part_id" value="03 the twelve challengers (player select).vgz" />
+			<dataarea name="quik" size="69996">
+				<rom name="03 the twelve challengers (player select).vgz" size="69996" crc="09411605" sha1="d38fa3989915c0e6bf5754380a18094b83782eef" offset="0" />
 			</dataarea>
 		</part>
 		<part name="004" interface="vgm_quik">
-			<feature name="part_id" value="04 - dark dungeons.vgz" />
-			<dataarea name="quik" size="151713">
-				<rom name="04 - dark dungeons.vgz" size="151713" crc="b65204f3" sha1="f5d520552ad4cd785fd7ac76acf5fc7bc00c0493" offset="0" />
+			<feature name="part_id" value="04 the way (map).vgz" />
+			<dataarea name="quik" size="43626">
+				<rom name="04 the way (map).vgz" size="43626" crc="fa51a538" sha1="5d917e6cc077dc11f72da1a4482dde27b30b3009" offset="0" />
 			</dataarea>
 		</part>
 		<part name="005" interface="vgm_quik">
-			<feature name="part_id" value="05 - creepy creatures.vgz" />
-			<dataarea name="quik" size="47647">
-				<rom name="05 - creepy creatures.vgz" size="47647" crc="c86bea95" sha1="2d0787ebae73e7d01b29e8b6845a467dc9e0bf4f" offset="0" />
+			<feature name="part_id" value="05 honor's melody - day (haohmaru).vgz" />
+			<dataarea name="quik" size="293040">
+				<rom name="05 honor's melody - day (haohmaru).vgz" size="293040" crc="418dc49e" sha1="03ef47a47a8bda3d743eb67ed0d4e8bb482fd7d2" offset="0" />
 			</dataarea>
 		</part>
 		<part name="006" interface="vgm_quik">
-			<feature name="part_id" value="06 - deadly flowers.vgz" />
-			<dataarea name="quik" size="88192">
-				<rom name="06 - deadly flowers.vgz" size="88192" crc="2e181623" sha1="562b6e86d93264333adeea755cce619f18f7eb2a" offset="0" />
+			<feature name="part_id" value="06 honor's melody - night (ukyo tachibana).vgz" />
+			<dataarea name="quik" size="244824">
+				<rom name="06 honor's melody - night (ukyo tachibana).vgz" size="244824" crc="29c064b0" sha1="d81a49a52a964ab9b13076ee1e7a8729ad1554e3" offset="0" />
 			</dataarea>
 		</part>
 		<part name="007" interface="vgm_quik">
-			<feature name="part_id" value="07 - sea of cursed trees.vgz" />
-			<dataarea name="quik" size="188205">
-				<rom name="07 - sea of cursed trees.vgz" size="188205" crc="113db51b" sha1="12b1fad7e97d25422acca78288db1e05830338e8" offset="0" />
+			<feature name="part_id" value="07 drum roll i (amakusa demo).vgz" />
+			<dataarea name="quik" size="25771">
+				<rom name="07 drum roll i (amakusa demo).vgz" size="25771" crc="ed3fd378" sha1="2713608f312c53f322af231237ede4342e9ab28c" offset="0" />
 			</dataarea>
 		</part>
 		<part name="008" interface="vgm_quik">
-			<feature name="part_id" value="08 - sandy wasteland.vgz" />
-			<dataarea name="quik" size="199113">
-				<rom name="08 - sandy wasteland.vgz" size="199113" crc="43381326" sha1="0ddfbf7fae2a661d84a7456894999ac83814129b" offset="0" />
+			<feature name="part_id" value="08 bambuseae (jubei yagyu).vgz" />
+			<dataarea name="quik" size="161852">
+				<rom name="08 bambuseae (jubei yagyu).vgz" size="161852" crc="4fa2a894" sha1="5f8a56bb47cc78bea1e44d9cbd28507173dbda95" offset="0" />
 			</dataarea>
 		</part>
 		<part name="009" interface="vgm_quik">
-			<feature name="part_id" value="09 - neverending rain.vgz" />
-			<dataarea name="quik" size="116338">
-				<rom name="09 - neverending rain.vgz" size="116338" crc="f25b2483" sha1="160273cdb98616230762e31e46df9e18e38ea47b" offset="0" />
+			<feature name="part_id" value="09 shadow (hanzo hattori).vgz" />
+			<dataarea name="quik" size="244664">
+				<rom name="09 shadow (hanzo hattori).vgz" size="244664" crc="96ed5118" sha1="8f466978493e43b23ef8a198de6e0d22260b21ee" offset="0" />
 			</dataarea>
 		</part>
 		<part name="010" interface="vgm_quik">
-			<feature name="part_id" value="10 - strobia - silent guardian.vgz" />
-			<dataarea name="quik" size="91973">
-				<rom name="10 - strobia - silent guardian.vgz" size="91973" crc="a5ef0c63" sha1="41094199391217f12ebb7382d991075d2a019d7b" offset="0" />
+			<feature name="part_id" value="10 infortune (four wins demo).vgz" />
+			<dataarea name="quik" size="177501">
+				<rom name="10 infortune (four wins demo).vgz" size="177501" crc="8e96cb4a" sha1="306733143109ccbf07ec2a1f3f83921de4676f60" offset="0" />
 			</dataarea>
 		</part>
 		<part name="011" interface="vgm_quik">
-			<feature name="part_id" value="11 - mountain petrified.vgz" />
-			<dataarea name="quik" size="119612">
-				<rom name="11 - mountain petrified.vgz" size="119612" crc="c36c2a15" sha1="b1a5e2866a10d063244df931692a19eaceb3e51f" offset="0" />
+			<feature name="part_id" value="11 tuna (galford).vgz" />
+			<dataarea name="quik" size="277756">
+				<rom name="11 tuna (galford).vgz" size="277756" crc="b57ab8f0" sha1="13de28233b539ec62105c0991b324d7965fdaa07" offset="0" />
 			</dataarea>
 		</part>
 		<part name="012" interface="vgm_quik">
-			<feature name="part_id" value="12 - blizzard.vgz" />
-			<dataarea name="quik" size="104608">
-				<rom name="12 - blizzard.vgz" size="104608" crc="8194add3" sha1="89e44f3db497f439a5b0ac12dd38ce06730b7d3b" offset="0" />
+			<feature name="part_id" value="12 banquet of nature (nakoruru).vgz" />
+			<dataarea name="quik" size="112861">
+				<rom name="12 banquet of nature (nakoruru).vgz" size="112861" crc="696673d5" sha1="5ad96f9f3eb4d406ab6eb7f07494eadd15fc96e3" offset="0" />
 			</dataarea>
 		</part>
 		<part name="013" interface="vgm_quik">
-			<feature name="part_id" value="13 - house of the dead.vgz" />
-			<dataarea name="quik" size="142166">
+			<feature name="part_id" value="13 indigenous (tam tam).vgz" />
+			<dataarea name="quik" size="102641">
+				<rom name="13 indigenous (tam tam).vgz" size="102641" crc="e6de628c" sha1="50990d0893282b66eae010a7e03169f52128d5ec" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 diligence (bonus stage).vgz" />
+			<dataarea name="quik" size="197991">
+				<rom name="14 diligence (bonus stage).vgz" size="197991" crc="1256aeea" sha1="cf68a204c0405fbff1c1588ad41235fbefd003a1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 exotic lady (charlotte).vgz" />
+			<dataarea name="quik" size="107171">
+				<rom name="15 exotic lady (charlotte).vgz" size="107171" crc="69477b0e" sha1="c1d8060deae937c52f8599af4182bb79af7c677c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 evil (genan shiranui).vgz" />
+			<dataarea name="quik" size="158345">
+				<rom name="16 evil (genan shiranui).vgz" size="158345" crc="a8bf3057" sha1="0b243064a2feb286bb0f78e159fe6cd887ac6c6e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 magatama (kyoshiro senryo).vgz" />
+			<dataarea name="quik" size="197559">
+				<rom name="17 magatama (kyoshiro senryo).vgz" size="197559" crc="c669d027" sha1="68e62374edd0e7ccbb84199e396ca7367d7bc685" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 gaia (earthquake).vgz" />
+			<dataarea name="quik" size="318928">
+				<rom name="18 gaia (earthquake).vgz" size="318928" crc="f75b5461" sha1="be0785cd3eccde6dbe3e0037b6734a680048c8c1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="019" interface="vgm_quik">
+			<feature name="part_id" value="19 king tiger (wan-fu).vgz" />
+			<dataarea name="quik" size="163410">
+				<rom name="19 king tiger (wan-fu).vgz" size="163410" crc="44183d56" sha1="abfa63217ea92b192cc9a27f09a4701026745265" offset="0" />
+			</dataarea>
+		</part>
+		<part name="020" interface="vgm_quik">
+			<feature name="part_id" value="20 victory (victory demo).vgz" />
+			<dataarea name="quik" size="74577">
+				<rom name="20 victory (victory demo).vgz" size="74577" crc="3fe75b1c" sha1="8cef9bebfecbfdc713c85dca16e274ff80a0bec6" offset="0" />
+			</dataarea>
+		</part>
+		<part name="021" interface="vgm_quik">
+			<feature name="part_id" value="21 drum roll ii (final demo).vgz" />
+			<dataarea name="quik" size="7254">
+				<rom name="21 drum roll ii (final demo).vgz" size="7254" crc="1db014be" sha1="8cec2636172d2c50b0e95a301c510413a66ca006" offset="0" />
+			</dataarea>
+		</part>
+		<part name="022" interface="vgm_quik">
+			<feature name="part_id" value="22 heartbeat (shiro tokisada amakusa 1).vgz" />
+			<dataarea name="quik" size="5347">
+				<rom name="22 heartbeat (shiro tokisada amakusa 1).vgz" size="5347" crc="0b406d1b" sha1="5d303c9b431dc771286d11f87a90597bd6bf8950" offset="0" />
+			</dataarea>
+		</part>
+		<part name="023" interface="vgm_quik">
+			<feature name="part_id" value="23 flames (conversion).vgz" />
+			<dataarea name="quik" size="145085">
+				<rom name="23 flames (conversion).vgz" size="145085" crc="9214c62d" sha1="23328d766e163b19445e158337091721371f9d1c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="024" interface="vgm_quik">
+			<feature name="part_id" value="24 darkness (shiro tokisada amakusa 2).vgz" />
+			<dataarea name="quik" size="86990">
+				<rom name="24 darkness (shiro tokisada amakusa 2).vgz" size="86990" crc="d1df45c9" sha1="9357d6360617b8f99d4efc35c00517789c31cc61" offset="0" />
+			</dataarea>
+		</part>
+		<part name="025" interface="vgm_quik">
+			<feature name="part_id" value="25 scream (ending 1).vgz" />
+			<dataarea name="quik" size="70717">
+				<rom name="25 scream (ending 1).vgz" size="70717" crc="e3ef47bf" sha1="9985a7f1f1abeed686b953fd92825247399cfa9b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="026" interface="vgm_quik">
+			<feature name="part_id" value="26 harmony (ending 2).vgz" />
+			<dataarea name="quik" size="71500">
+				<rom name="26 harmony (ending 2).vgz" size="71500" crc="4b86d4e8" sha1="d44e42d5e217eb77d0b663459d96553f67883428" offset="0" />
+			</dataarea>
+		</part>
+		<part name="027" interface="vgm_quik">
+			<feature name="part_id" value="27 revolutionary lady (charlotte ending).vgz" />
+			<dataarea name="quik" size="77387">
+				<rom name="27 revolutionary lady (charlotte ending).vgz" size="77387" crc="0b811b26" sha1="3090340260276a6ff7e41b13301e51f72038080c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="028" interface="vgm_quik">
+			<feature name="part_id" value="28 celebration (staff roll).vgz" />
+			<dataarea name="quik" size="315051">
+				<rom name="28 celebration (staff roll).vgz" size="315051" crc="cc48ea79" sha1="1438e9e17820e441d78b4b6e3285d7126b153e94" offset="0" />
+			</dataarea>
+		</part>
+		<part name="029" interface="vgm_quik">
+			<feature name="part_id" value="29 request for an encore (continue).vgz" />
+			<dataarea name="quik" size="129934">
+				<rom name="29 request for an encore (continue).vgz" size="129934" crc="29c0ada4" sha1="93c992c93d9839e67047e93b636a9386fabecac1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="030" interface="vgm_quik">
+			<feature name="part_id" value="30 the curtain falls (game over).vgz" />
+			<dataarea name="quik" size="36148">
+				<rom name="30 the curtain falls (game over).vgz" size="36148" crc="4e946a70" sha1="918898c1f7d97babdce293c0557fbac937d7e6cf" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="samsho2">
+		<description>Samurai Shodown II (Neo Geo)</description>
+		<year>1994</year>
+		<publisher>SNK</publisher>
+		<info name="cores" value="YM2610"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 shishimai (title).vgz" />
+			<dataarea name="quik" size="385315">
+				<rom name="01 shishimai (title).vgz" size="385315" crc="fa5b5f1d" sha1="119c49e2c039d0096118c095d7e5bfa1b42c3852" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 the fifteen challengers (player select).vgz" />
+			<dataarea name="quik" size="98135">
+				<rom name="02 the fifteen challengers (player select).vgz" size="98135" crc="2a44a706" sha1="9577128d3266fb717ff023fde499cca011d52a38" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 new fight (start demo).vgz" />
+			<dataarea name="quik" size="71746">
+				<rom name="03 new fight (start demo).vgz" size="71746" crc="89b24f80" sha1="e6f365631faac3dfc758f67dd226e3de2a579c90" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 iza jinjyouni.vgz" />
+			<dataarea name="quik" size="90883">
+				<rom name="04 iza jinjyouni.vgz" size="90883" crc="9729be47" sha1="ced0ea3422ef9e79bdd0ac6282818970156dd5a1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 banquet of nature -spring- (nakoruru).vgz" />
+			<dataarea name="quik" size="143112">
+				<rom name="05 banquet of nature -spring- (nakoruru).vgz" size="143112" crc="1370ea80" sha1="6269f709cc14a0c3534ebb5ac24df4ea28b92aed" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 shoubuari.vgz" />
+			<dataarea name="quik" size="67161">
+				<rom name="06 shoubuari.vgz" size="67161" crc="6ebcc0fe" sha1="1be2697d1f792b54f384dfce19f56eccf2a38742" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 kachi ikusa (winner demo).vgz" />
+			<dataarea name="quik" size="110988">
+				<rom name="07 kachi ikusa (winner demo).vgz" size="110988" crc="eaead5c1" sha1="b34261c0c81696c5cfe75bcdf695c0e7766747dc" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 bluefin tuna (galford).vgz" />
+			<dataarea name="quik" size="325197">
+				<rom name="08 bluefin tuna (galford).vgz" size="325197" crc="be3d717d" sha1="dea2f64ffa235a0e59764bddbaa146b07f09b1a2" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 the true shadow (hanzo hattori).vgz" />
+			<dataarea name="quik" size="323674">
+				<rom name="09 the true shadow (hanzo hattori).vgz" size="323674" crc="f5a6b456" sha1="f22a2b30fdbeb62d6cf30ac2a291ebcbd6ea221c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 stillness (jubei yagyu).vgz" />
+			<dataarea name="quik" size="148799">
+				<rom name="10 stillness (jubei yagyu).vgz" size="148799" crc="adef099a" sha1="5bcb9cdcf9e2022384fb99e2551203e2c9763153" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 the revived one (interim demo 1).vgz" />
+			<dataarea name="quik" size="115255">
+				<rom name="11 the revived one (interim demo 1).vgz" size="115255" crc="83ba46bb" sha1="c9619cd41fbac9e627f046aa416012e7e5806a4c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 hesitation fog (nicotine caffeine).vgz" />
+			<dataarea name="quik" size="257280">
+				<rom name="12 hesitation fog (nicotine caffeine).vgz" size="257280" crc="c26364a9" sha1="b36fc46eda6ab57c5641ebb7204d97d054fedcd1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 the way of a man (haohmaru).vgz" />
+			<dataarea name="quik" size="282873">
+				<rom name="13 the way of a man (haohmaru).vgz" size="282873" crc="b74a8c2a" sha1="0a32d3f6da3cf524d90ab8288ea35fb8460f337f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 oni (genjuro kibagami).vgz" />
+			<dataarea name="quik" size="189427">
+				<rom name="14 oni (genjuro kibagami).vgz" size="189427" crc="13295347" sha1="6082b932ca4bb6dc520e86c1ded38b7488c68cad" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 onryo (interrim demo 2).vgz" />
+			<dataarea name="quik" size="100692">
+				<rom name="15 onryo (interrim demo 2).vgz" size="100692" crc="2081d45f" sha1="9960927cc4bd2312b42aa922feb430b6739e0f9c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 exotic lady (suite) (charlotte).vgz" />
+			<dataarea name="quik" size="78340">
+				<rom name="16 exotic lady (suite) (charlotte).vgz" size="78340" crc="894f25e7" sha1="a8405242366693746ea1cb178071ba5aedebbe18" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 magatama (kyoshiro senryo).vgz" />
+			<dataarea name="quik" size="346297">
+				<rom name="17 magatama (kyoshiro senryo).vgz" size="346297" crc="309d962e" sha1="b6596306f640463c8a0c6846487e825982d6574e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 brutal woman (cham cham).vgz" />
+			<dataarea name="quik" size="152082">
+				<rom name="18 brutal woman (cham cham).vgz" size="152082" crc="42b0bc50" sha1="7826ff17d09a9b6ab34af5436981fd022ba2d82e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="019" interface="vgm_quik">
+			<feature name="part_id" value="19 an evil ''western'' (interim demo 3-1 ''western'').vgz" />
+			<dataarea name="quik" size="23812">
+				<rom name="19 an evil ''western'' (interim demo 3-1 ''western'').vgz" size="23812" crc="7b825b9b" sha1="0ad7b7cfbd0eef26ad085268a391dda9c5e59cac" offset="0" />
+			</dataarea>
+		</part>
+		<part name="020" interface="vgm_quik">
+			<feature name="part_id" value="20 an evil ''eastern'' (interim demo 3-1 ''eastern'').vgz" />
+			<dataarea name="quik" size="55556">
+				<rom name="20 an evil ''eastern'' (interim demo 3-1 ''eastern'').vgz" size="55556" crc="739096fb" sha1="89465e780a370d3ee0e606c07f1976c8aa598298" offset="0" />
+			</dataarea>
+		</part>
+		<part name="021" interface="vgm_quik">
+			<feature name="part_id" value="21 the evil way (genan shiranui).vgz" />
+			<dataarea name="quik" size="246511">
+				<rom name="21 the evil way (genan shiranui).vgz" size="246511" crc="f91cd4d6" sha1="96a663a05047a27f45f1bc15a436a018bd426a71" offset="0" />
+			</dataarea>
+		</part>
+		<part name="022" interface="vgm_quik">
+			<feature name="part_id" value="22 black heart (earthquake).vgz" />
+			<dataarea name="quik" size="273016">
+				<rom name="22 black heart (earthquake).vgz" size="273016" crc="ccf919ea" sha1="32bb68136abca6adb19e452e2f1debf84f3be1fc" offset="0" />
+			</dataarea>
+		</part>
+		<part name="023" interface="vgm_quik">
+			<feature name="part_id" value="23 king tiger (wan-fu).vgz" />
+			<dataarea name="quik" size="179246">
+				<rom name="23 king tiger (wan-fu).vgz" size="179246" crc="cf9c182b" sha1="eff0a4bf683545b0dcd9a174604027f63e39eaab" offset="0" />
+			</dataarea>
+		</part>
+		<part name="024" interface="vgm_quik">
+			<feature name="part_id" value="24 real demon (interim demo 3-2,4).vgz" />
+			<dataarea name="quik" size="97917">
+				<rom name="24 real demon (interim demo 3-2,4).vgz" size="97917" crc="33709b04" sha1="841cce4a042f24e0468937fd3f11b350f80fa505" offset="0" />
+			</dataarea>
+		</part>
+		<part name="025" interface="vgm_quik">
+			<feature name="part_id" value="25 ritter (neinhalt seiger).vgz" />
+			<dataarea name="quik" size="368597">
+				<rom name="25 ritter (neinhalt seiger).vgz" size="368597" crc="eba218ae" sha1="3a4d054dfd913c25a183bf3b9c61ccba126ca781" offset="0" />
+			</dataarea>
+		</part>
+		<part name="026" interface="vgm_quik">
+			<feature name="part_id" value="26 moon petal (ukyo tachibana).vgz" />
+			<dataarea name="quik" size="250616">
+				<rom name="26 moon petal (ukyo tachibana).vgz" size="250616" crc="8914f245" sha1="82cb09159e612aacfd153cee853af45b137d9731" offset="0" />
+			</dataarea>
+		</part>
+		<part name="027" interface="vgm_quik">
+			<feature name="part_id" value="27 dojo yaburi (here comes a new challenger).vgz" />
+			<dataarea name="quik" size="89680">
+				<rom name="27 dojo yaburi (here comes a new challenger).vgz" size="89680" crc="28fec9b2" sha1="76a155deeb8bb23570adc2875e989e98b5191ee9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="028" interface="vgm_quik">
+			<feature name="part_id" value="28 harmonious rock rhyming six sentences (kuroko).vgz" />
+			<dataarea name="quik" size="328727">
+				<rom name="28 harmonious rock rhyming six sentences (kuroko).vgz" size="328727" crc="78225d4c" sha1="13658c6852f5a470699e7c9a84913e97134d300f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="029" interface="vgm_quik">
+			<feature name="part_id" value="29 iza (interim demo 5-1).vgz" />
+			<dataarea name="quik" size="33929">
+				<rom name="29 iza (interim demo 5-1).vgz" size="33929" crc="fd207ac6" sha1="68d1b85847045bd18d59e5e1463d552e43eca65d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="030" interface="vgm_quik">
+			<feature name="part_id" value="30 the last battle (interim demo 5-2).vgz" />
+			<dataarea name="quik" size="84313">
+				<rom name="30 the last battle (interim demo 5-2).vgz" size="84313" crc="88f3040b" sha1="1fce7374086510d195bc853889fc7a4eba8f6157" offset="0" />
+			</dataarea>
+		</part>
+		<part name="031" interface="vgm_quik">
+			<feature name="part_id" value="31 evil god (mizuki rashojin).vgz" />
+			<dataarea name="quik" size="167238">
+				<rom name="31 evil god (mizuki rashojin).vgz" size="167238" crc="384daaa6" sha1="c733e7e1a9bca72e433189c034edec0992353651" offset="0" />
+			</dataarea>
+		</part>
+		<part name="032" interface="vgm_quik">
+			<feature name="part_id" value="32 mad curiousness (boss elimination demo).vgz" />
+			<dataarea name="quik" size="65759">
+				<rom name="32 mad curiousness (boss elimination demo).vgz" size="65759" crc="6d2a0223" sha1="0a13e7fac7bcfcf6cc4b181b37d4da2f4d4629c5" offset="0" />
+			</dataarea>
+		</part>
+		<part name="033" interface="vgm_quik">
+			<feature name="part_id" value="33 the new ''eastern'' way (''eastern'' ending).vgz" />
+			<dataarea name="quik" size="49603">
+				<rom name="33 the new ''eastern'' way (''eastern'' ending).vgz" size="49603" crc="7e0caa2b" sha1="51c645dd784103d8802ef56025c3dbd636a5a690" offset="0" />
+			</dataarea>
+		</part>
+		<part name="034" interface="vgm_quik">
+			<feature name="part_id" value="34 the new ''western way'' (''western'' ending).vgz" />
+			<dataarea name="quik" size="23212">
+				<rom name="34 the new ''western way'' (''western'' ending).vgz" size="23212" crc="8a32d235" sha1="3a9be251393efb15fd88e5662e98c5ae5e99f503" offset="0" />
+			</dataarea>
+		</part>
+		<part name="035" interface="vgm_quik">
+			<feature name="part_id" value="35 the festival perfected (staff roll).vgz" />
+			<dataarea name="quik" size="263463">
+				<rom name="35 the festival perfected (staff roll).vgz" size="263463" crc="08bcfeff" sha1="794014159380f7494c9a251f031218915e3ba095" offset="0" />
+			</dataarea>
+		</part>
+		<part name="036" interface="vgm_quik">
+			<feature name="part_id" value="36 request for an encore (continue).vgz" />
+			<dataarea name="quik" size="163986">
+				<rom name="36 request for an encore (continue).vgz" size="163986" crc="1cfea825" sha1="b68cec893487fe22701d93691e7d8ce9be735b76" offset="0" />
+			</dataarea>
+		</part>
+		<part name="037" interface="vgm_quik">
+			<feature name="part_id" value="37 the curtain falls (game over).vgz" />
+			<dataarea name="quik" size="31433">
+				<rom name="37 the curtain falls (game over).vgz" size="31433" crc="4be32485" sha1="7bdbca7f94eaa76e09e40821884ea04bf15f87b7" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="sonicfgt">
+		<description>SegaSonic Cosmo Fighter (Sega System C-2)</description>
+		<year>1993</year>
+		<publisher>Sega</publisher>
+		<info name="cores" value="YM3438, SEGA VDP PSG"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 space - part 1.vgz" />
+			<dataarea name="quik" size="6290">
+				<rom name="01 space - part 1.vgz" size="6290" crc="0fd58bdb" sha1="7ae9fcd779913b828198d2ef6ab1e530fe176adb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 eggman appears.vgz" />
+			<dataarea name="quik" size="2226">
+				<rom name="02 eggman appears.vgz" size="2226" crc="d6401712" sha1="a8e1614e12742c615e3e24cbe15d748d6cc9a580" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 space - part 2.vgz" />
+			<dataarea name="quik" size="5502">
+				<rom name="03 space - part 2.vgz" size="5502" crc="06b1290d" sha1="35fc5bab0a283cb9de32beb1da1c67ef0d1b6a18" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 space station.vgz" />
+			<dataarea name="quik" size="5606">
+				<rom name="04 space station.vgz" size="5606" crc="1ab5a121" sha1="44c30aca28788af8e4b280c53c90ff6740fcab72" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 boss battle.vgz" />
+			<dataarea name="quik" size="4852">
+				<rom name="05 boss battle.vgz" size="4852" crc="afbad2e1" sha1="5ab1b75894b9be1102e687689a3f704a383460de" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 victory.vgz" />
+			<dataarea name="quik" size="3183">
+				<rom name="06 victory.vgz" size="3183" crc="7511c436" sha1="da1ada21f73f47b17af94be5bfcd451d919b5a39" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 results.vgz" />
+			<dataarea name="quik" size="2058">
+				<rom name="07 results.vgz" size="2058" crc="2d5723c3" sha1="5a5412afdc11cf86d0713814204236d30977ed7b" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="southprk_gb">
+		<description>South Park (Nintendo Game Boy Color)</description>
+		<year>1999</year>
+		<publisher>Acclaim Entertainment</publisher>
+		<info name="cores" value="Game Boy DMG (LR35902)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 main theme.vgz" />
+			<dataarea name="quik" size="10053">
+				<rom name="01 main theme.vgz" size="10053" crc="ea84516e" sha1="67b347670e1cd369ffbd912fcaa0f10d0e4361b9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 on the way to school ~ cattle ranch ~ up the mountain.vgz" />
+			<dataarea name="quik" size="14286">
+				<rom name="02 on the way to school ~ cattle ranch ~ up the mountain.vgz" size="14286" crc="cc26bc1f" sha1="42c2fa6b35dc5638d63c7312fe43db0030220066" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 on the bus ~ at school ~ at the mall ~ stan's house ~ genetic research lab ~ alien spacecraft.vgz" />
+			<dataarea name="quik" size="19178">
+				<rom name="03 on the bus ~ at school ~ at the mall ~ stan's house ~ genetic research lab ~ alien spacecraft.vgz" size="19178" crc="0d076785" sha1="cdc1042ad443e8b366b22e3c556e6c441c0d8c2d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 the end.vgz" />
+			<dataarea name="quik" size="6478">
+				<rom name="04 the end.vgz" size="6478" crc="b141f014" sha1="e03e704f47004021c67d03efdb8d25ce2294a2f9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 game over.vgz" />
+			<dataarea name="quik" size="4751">
+				<rom name="05 game over.vgz" size="4751" crc="8c478201" sha1="0c0657db2ed87c46a5b00383bf9a809a4c247319" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="spidman">
+		<description>Spider-Man - The Videogame (Sega System 32)</description>
+		<year>1991</year>
+		<publisher>Sega</publisher>
+		<info name="cores" value="2xYM3438, RF5C68"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 credit.vgz" />
+			<dataarea name="quik" size="12400">
+				<rom name="01 credit.vgz" size="12400" crc="30d38b87" sha1="646f00e0574230df79a28f967e6529695196c110" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 player select.vgz" />
+			<dataarea name="quik" size="35308">
+				<rom name="02 player select.vgz" size="35308" crc="d938baf9" sha1="ad6d7e40025830a3d9e6a45139aefc451f2ab288" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 start demo 1, 3.vgz" />
+			<dataarea name="quik" size="91106">
+				<rom name="03 start demo 1, 3.vgz" size="91106" crc="015a65c3" sha1="5cba2273e8e5b0aa08df8c55dabc9718655379a6" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 chapter 1-1, 3-2, 4-1.vgz" />
+			<dataarea name="quik" size="57325">
+				<rom name="04 chapter 1-1, 3-2, 4-1.vgz" size="57325" crc="b3e0823b" sha1="bba30b9cc5fbf72351dae6c112a22407047822b6" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 chapter 1-2, 3-4.vgz" />
+			<dataarea name="quik" size="63577">
+				<rom name="05 chapter 1-2, 3-4.vgz" size="63577" crc="58fe1193" sha1="8673a1609e158221829bb82967cd783013228a4b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 chapter 1-3, 2-3, 4-3.vgz" />
+			<dataarea name="quik" size="135113">
+				<rom name="06 chapter 1-3, 2-3, 4-3.vgz" size="135113" crc="62aede7f" sha1="c13a7a75e8b86a657b9720e47d036b8e78024c21" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 boss.vgz" />
+			<dataarea name="quik" size="102369">
+				<rom name="07 boss.vgz" size="102369" crc="966b161f" sha1="2ecf907a0017785016eabdcbccaf97c424ec12ba" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 bonus tally.vgz" />
+			<dataarea name="quik" size="59491">
+				<rom name="08 bonus tally.vgz" size="59491" crc="94dd39c0" sha1="b0c692ba3a4a6fbe320ca7ac04bbdc495d9d4190" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 start demo 2, 4.vgz" />
+			<dataarea name="quik" size="44506">
+				<rom name="09 start demo 2, 4.vgz" size="44506" crc="22982943" sha1="a25739662712048b911cdaf139af0ca227da8bd9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 chapter 2-1, 3-3.vgz" />
+			<dataarea name="quik" size="64911">
+				<rom name="10 chapter 2-1, 3-3.vgz" size="64911" crc="95bed5f2" sha1="b2ff978dba2879030406a48e68d97e1f9648b068" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 chapter 2-2, 4-4.vgz" />
+			<dataarea name="quik" size="78977">
+				<rom name="11 chapter 2-2, 4-4.vgz" size="78977" crc="c0fe6b35" sha1="307f842bdc319ab47c64640b906c5d09bf68a6c9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 chapter 3-1, 4-2.vgz" />
+			<dataarea name="quik" size="86535">
+				<rom name="12 chapter 3-1, 4-2.vgz" size="86535" crc="f1e8204b" sha1="4d31718ba703b27f7e3a0e2dc207eb46b0d5bb3a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 final boss.vgz" />
+			<dataarea name="quik" size="173018">
+				<rom name="13 final boss.vgz" size="173018" crc="e90afce7" sha1="b800d87e65293454643b4ad1a9c53f135ad2b1e5" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 ending.vgz" />
+			<dataarea name="quik" size="48715">
+				<rom name="14 ending.vgz" size="48715" crc="5fafd82f" sha1="1bfef3a9567b0fa886844555d4f7b6aea3ed1680" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 game over (after ending).vgz" />
+			<dataarea name="quik" size="47633">
+				<rom name="15 game over (after ending).vgz" size="47633" crc="22817598" sha1="0382fb040e4bb052f475a2c532a87c0ea59a7e19" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 game over.vgz" />
+			<dataarea name="quik" size="53147">
+				<rom name="16 game over.vgz" size="53147" crc="a974f626" sha1="e4b32ccc3dc39a81c8800df706bccd4b0ffe77c0" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 unknown.vgz" />
+			<dataarea name="quik" size="69731">
+				<rom name="17 unknown.vgz" size="69731" crc="8f63c381" sha1="df3ab2003a41134e81d880ab7bf457605c003480" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="starship_98">
+		<description>Star Ship Rendezvous (NEC PC-9801)</description>
+		<year>1988</year>
+		<publisher>Scaptrust</publisher>
+		<info name="cores" value="YM2203"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 operation in unsteady space.vgz" />
+			<dataarea name="quik" size="57411">
+				<rom name="01 operation in unsteady space.vgz" size="57411" crc="276954be" sha1="028120da7dfa1121134781b9952a959cf7a5f678" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 the art of noise.vgz" />
+			<dataarea name="quik" size="178264">
+				<rom name="02 the art of noise.vgz" size="178264" crc="92fc5141" sha1="5fccb612b6cfaad378e119b09122052f84bf593c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 madness and its synergistic effect.vgz" />
+			<dataarea name="quik" size="24832">
+				<rom name="03 madness and its synergistic effect.vgz" size="24832" crc="1311e08e" sha1="83fccac39595d31324dfe02243a26c236a1c17bb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 maze trap!!.vgz" />
+			<dataarea name="quik" size="49850">
+				<rom name="04 maze trap.vgz" size="49850" crc="18c736c3" sha1="40a97d5cd383aaca814de128a8e3b119a591d4df" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 bass gab.re.ba.li.vgz" />
+			<dataarea name="quik" size="45225">
+				<rom name="05 bass gab.re.ba.li.vgz" size="45225" crc="a8bf635d" sha1="8a35cb3c977715984687cd6e0a41ef9aa9db38f2" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 the outsider.vgz" />
+			<dataarea name="quik" size="69969">
+				<rom name="06 the outsider.vgz" size="69969" crc="5e696d12" sha1="75a24b14f854a4ec08c72ffb702d5bdcc93ef6e3" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 work of digging at midnight.vgz" />
+			<dataarea name="quik" size="53549">
+				<rom name="07 work of digging at midnight.vgz" size="53549" crc="683220cc" sha1="ac743d8f4ef79ed10b5308624c1949c3f4530b34" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 mysticism.vgz" />
+			<dataarea name="quik" size="24192">
+				<rom name="08 mysticism.vgz" size="24192" crc="848e1e51" sha1="c5726ddf136334b5e382b094c34959305d0a3162" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 the sunset for the sunrise.vgz" />
+			<dataarea name="quik" size="71413">
+				<rom name="09 the sunset for the sunrise.vgz" size="71413" crc="b205b311" sha1="a40ef0ea7ff5890f0425611903a029dbeb8a180a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 don't forget your wonderful memory.vgz" />
+			<dataarea name="quik" size="52617">
+				<rom name="10 don't forget your wonderful memory.vgz" size="52617" crc="fac35436" sha1="9ef84525deb1db2e34f6adc587faeb2e3a1350de" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="scobra_msx">
+		<description>Super Cobra (MSX, PSG)</description>
+		<year>1983</year>
+		<publisher>Konami</publisher>
+		<info name="cores" value="PSG (AY-3-8910)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 play start.vgz" />
+			<dataarea name="quik" size="371">
+				<rom name="01 play start.vgz" size="371" crc="6b20ffde" sha1="2d300d6048c8cd5071364b00a2aeb240d6979bd9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 checkpoint.vgz" />
+			<dataarea name="quik" size="506">
+				<rom name="02 checkpoint.vgz" size="506" crc="d448ba6a" sha1="69aa6dd121d45e6d16a2d9a046ba4c2dd915d3cb" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="scobra_scc">
+		<description>Super Cobra (MSX, SCC)</description>
+		<year>1983</year>
+		<publisher>Konami</publisher>
+		<info name="cores" value="SCC-I (K052539), PSG (AY-3-8910)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 play start.vgz" />
+			<dataarea name="quik" size="2907">
+				<rom name="01 play start.vgz" size="2907" crc="704b891a" sha1="c1ac4556f7882526026a786849a241b5a7cd762a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 checkpoint.vgz" />
+			<dataarea name="quik" size="2310">
+				<rom name="02 checkpoint.vgz" size="2310" crc="5149846e" sha1="0df85ced1f9ee51d1f9ca1f5074e1f50e546b790" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="jetsons_nes">
+		<description>The Jetsons - Cogswell's Caper! (NES)</description>
+		<year>1992</year>
+		<publisher>Taito (W) / Mattel (A)</publisher>
+		<info name="cores" value="NES APU (N2A03)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 intro.vgz" />
+			<dataarea name="quik" size="5561">
+				<rom name="01 intro.vgz" size="5561" crc="be1e6843" sha1="5cdef1fa4583abed10e9d4db5a049bc99567f4bc" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 call jingle.vgz" />
+			<dataarea name="quik" size="1115">
+				<rom name="02 call jingle.vgz" size="1115" crc="b0375a63" sha1="e341080ccdfc2e1532442711fb0e37b16a7980c7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 map.vgz" />
+			<dataarea name="quik" size="2272">
+				<rom name="03 map.vgz" size="2272" crc="6b50d0fd" sha1="e7b55fb0c008502cc500383b35045c0ab2d38a9b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 stage start.vgz" />
+			<dataarea name="quik" size="1684">
+				<rom name="04 stage start.vgz" size="1684" crc="cbaf46b8" sha1="606774af3fb431c88b09772540ee7901eb20ff0b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 stage 1.vgz" />
+			<dataarea name="quik" size="9651">
+				<rom name="05 stage 1.vgz" size="9651" crc="4695a7a0" sha1="cb2ab958ea1e309b63d7bbe19dea681f18933b3d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 boss bgm.vgz" />
+			<dataarea name="quik" size="2582">
+				<rom name="06 boss bgm.vgz" size="2582" crc="e3ff7362" sha1="fe560297c1ea9473363ad6502b0d5aca7cb75ae7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 stage clear.vgz" />
+			<dataarea name="quik" size="1099">
+				<rom name="07 stage clear.vgz" size="1099" crc="3d1f12fe" sha1="4a5cf9470a09d06e3769e8e3c17978b5de6a8d8a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 stages 2, 11 ~ cutscene 1.vgz" />
+			<dataarea name="quik" size="3632">
+				<rom name="08 stages 2, 11 ~ cutscene 1.vgz" size="3632" crc="d4ec2210" sha1="ce4e51cf30037f02e7ab674c18f462f53600d99b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 stages 3, 6.vgz" />
+			<dataarea name="quik" size="3108">
+				<rom name="09 stages 3, 6.vgz" size="3108" crc="0a2e7f82" sha1="bc6e9492c277a205df877cdb910db5755077ce00" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 stage 4.vgz" />
+			<dataarea name="quik" size="6218">
+				<rom name="10 stage 4.vgz" size="6218" crc="3fe3e673" sha1="8931e90effb2340cbd7ad819f4ba0fa150cda85d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 stage 5.vgz" />
+			<dataarea name="quik" size="4630">
+				<rom name="11 stage 5.vgz" size="4630" crc="fac69a13" sha1="576e38a45d5aab34f03d63f08d17c347f8d0b646" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 stage 7.vgz" />
+			<dataarea name="quik" size="6634">
+				<rom name="12 stage 7.vgz" size="6634" crc="105446ce" sha1="d21b3b8ded41497bbc780634368957f3f0e82a13" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 stage 8.vgz" />
+			<dataarea name="quik" size="3656">
+				<rom name="13 stage 8.vgz" size="3656" crc="cbdf7ccd" sha1="8083c62679616b1506ede4ed119408a1a6cb41bc" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 stage 9.vgz" />
+			<dataarea name="quik" size="4623">
+				<rom name="14 stage 9.vgz" size="4623" crc="83679131" sha1="9038c698b170bc8d4966e903a53e9d67bdbfdce4" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 stage 10.vgz" />
+			<dataarea name="quik" size="3436">
+				<rom name="15 stage 10.vgz" size="3436" crc="17ccd3ec" sha1="2194404417150446d1a2b6d0dcf39f3d063d2bf8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 cutscene 2.vgz" />
+			<dataarea name="quik" size="1383">
+				<rom name="16 cutscene 2.vgz" size="1383" crc="a0aa2003" sha1="7ee56418c6f1179a106ac18e452ae8d27e6e47e8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 cutscene 3.vgz" />
+			<dataarea name="quik" size="1108">
+				<rom name="17 cutscene 3.vgz" size="1108" crc="7abb4f98" sha1="79fe78f1ad3e874694ed11f6ac1a0df288c708fc" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 cutscene 4.vgz" />
+			<dataarea name="quik" size="1531">
+				<rom name="18 cutscene 4.vgz" size="1531" crc="0676a29c" sha1="79fd2751a1fcca126b4419dd16ebb039237d1ff1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="019" interface="vgm_quik">
+			<feature name="part_id" value="19 stage 12.vgz" />
+			<dataarea name="quik" size="5241">
+				<rom name="19 stage 12.vgz" size="5241" crc="d168a59e" sha1="3da3ad3955a4d6be8ad1c27d23491cf6766081de" offset="0" />
+			</dataarea>
+		</part>
+		<part name="020" interface="vgm_quik">
+			<feature name="part_id" value="20 staff roll.vgz" />
+			<dataarea name="quik" size="6435">
+				<rom name="20 staff roll.vgz" size="6435" crc="c443ca3e" sha1="57184e04b8cd2651f094d609160225d81290be5b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="021" interface="vgm_quik">
+			<feature name="part_id" value="21 game over.vgz" />
+			<dataarea name="quik" size="1390">
+				<rom name="21 game over.vgz" size="1390" crc="99b3c2a4" sha1="bfc6894424deebec02f7f62a9fc9783bdf1b2330" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="jetsons_gb">
+		<description>The Jetsons - Robot Panic (Nintendo Game Boy)</description>
+		<year>1992</year>
+		<publisher>Taito</publisher>
+		<info name="cores" value="Game Boy DMG (LR35902)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 title screen.vgz" />
+			<dataarea name="quik" size="20811">
+				<rom name="01 title screen.vgz" size="20811" crc="930dd76f" sha1="1f8de0abeee9692dfcec155a750f9dfca7eee38d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 space ball dome.vgz" />
+			<dataarea name="quik" size="10360">
+				<rom name="02 space ball dome.vgz" size="10360" crc="c6292048" sha1="b7373f13a5aa3aad0a85376ad7a2b87ccb0704e3" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 stage clear.vgz" />
+			<dataarea name="quik" size="1361">
+				<rom name="03 stage clear.vgz" size="1361" crc="982cf198" sha1="0c63d88eb42667da9b0257fffd689a29d7ded092" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 concert hall.vgz" />
+			<dataarea name="quik" size="6258">
+				<rom name="04 concert hall.vgz" size="6258" crc="e55b68b9" sha1="c929fd6fbbcd9841856c9943dec8c3326fd2239c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 shopping mall.vgz" />
+			<dataarea name="quik" size="7175">
+				<rom name="05 shopping mall.vgz" size="7175" crc="54312dec" sha1="9ec494fdfce92958c1059152367e2de64a9a2f70" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 cutscene.vgz" />
+			<dataarea name="quik" size="11867">
+				<rom name="06 cutscene.vgz" size="11867" crc="1b211fd9" sha1="49b3a064cc42ffe55582ee2529b571455a10a63b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 cogswell's factory.vgz" />
+			<dataarea name="quik" size="8672">
+				<rom name="07 cogswell's factory.vgz" size="8672" crc="46a62f46" sha1="e5d9fdfcf1c8aaa7076d98ffde4d612430c3d70e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 cogswell.vgz" />
+			<dataarea name="quik" size="3745">
+				<rom name="08 cogswell.vgz" size="3745" crc="94a49128" sha1="aafe12fbfdbe5a44c2aecf3170727ca50adcbba7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 ending.vgz" />
+			<dataarea name="quik" size="15841">
+				<rom name="09 ending.vgz" size="15841" crc="6d75d5f2" sha1="ada63a498212eecd8f633c6100319bdd6572d45e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 miss.vgz" />
+			<dataarea name="quik" size="1330">
+				<rom name="10 miss.vgz" size="1330" crc="08f1b32a" sha1="1ea9e88f8a8be42c4ede368754d4093918fc1a45" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 unknown 1.vgz" />
+			<dataarea name="quik" size="6427">
+				<rom name="11 unknown 1.vgz" size="6427" crc="8b058cff" sha1="7acb54910a6494d9e06d76b8c6e7c24a623d4efd" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 unknown 2.vgz" />
+			<dataarea name="quik" size="9066">
+				<rom name="12 unknown 2.vgz" size="9066" crc="1c7f5a68" sha1="af3c6012d9c5eca72a14f54ff997b2aed3508195" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 unknown 3.vgz" />
+			<dataarea name="quik" size="2412">
+				<rom name="13 unknown 3.vgz" size="2412" crc="86b61caa" sha1="eaa1438d21ec93ebb3a7d732ba9aa1b262634b25" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+<!-- vgmrips.net update - August 13, 2020 - 15 Entries -->
+
+	<software name="athland_msx">
+		<description>Athletic Land (MSX)</description>
+		<year>1984</year>
+		<publisher>Konami</publisher>
+		<info name="cores" value="PSG (AY-3-8910)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 let's play.vgz" />
+			<dataarea name="quik" size="599">
+				<rom name="01 let's play.vgz" size="599" crc="cd4ca0e6" sha1="dc07d0c00c5c532ca8d0c6c6d49f5742009445f8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 child's play.vgz" />
+			<dataarea name="quik" size="919">
+				<rom name="02 child's play.vgz" size="919" crc="f5f8ab83" sha1="37b24404b0b7d1b0b12ce9c121a63a99995c00fa" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 game over.vgz" />
+			<dataarea name="quik" size="668">
+				<rom name="03 game over.vgz" size="668" crc="8cdda225" sha1="d9cc4b971a7a06f44a18dbc8214b07a66e5fa40a" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="cabbagep_msx">
+		<description>Cabbage Patch Kids (MSX)</description>
+		<year>1984</year>
+		<publisher>Konami</publisher>
+		<info name="cores" value="PSG (AY-3-8910)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 selection.vgz" />
+			<dataarea name="quik" size="667">
+				<rom name="01 selection.vgz" size="667" crc="bc19dba5" sha1="180950c30d81d4be7e78cf395a22907662b761dd" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 selection complete.vgz" />
+			<dataarea name="quik" size="680">
+				<rom name="02 selection complete.vgz" size="680" crc="ed81aae2" sha1="257692277ecc79ccc14d8602d03b98aadc0e168d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 walk in the park.vgz" />
+			<dataarea name="quik" size="791">
+				<rom name="03 walk in the park.vgz" size="791" crc="868641cd" sha1="ec081e62af7bcdf0b01f9877b1f11ba1819e5681" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 stage clear.vgz" />
+			<dataarea name="quik" size="550">
+				<rom name="04 stage clear.vgz" size="550" crc="29bd886c" sha1="4b6e502085accb49821713eb375d9d1bd6bc1afc" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 dead.vgz" />
+			<dataarea name="quik" size="501">
+				<rom name="05 dead.vgz" size="501" crc="311f5f2c" sha1="bd18cf8649d9407d064d8abc836ec7bebe442bb8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 game over.vgz" />
+			<dataarea name="quik" size="665">
+				<rom name="06 game over.vgz" size="665" crc="508059b2" sha1="505a8225390c317f53f948eb22ab316acdc0f9f7" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="circusc_msx">
+		<description>Circus Charlie (MSX)</description>
+		<year>1984</year>
+		<publisher>Konami</publisher>
+		<info name="cores" value="PSG (AY-3-8910)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 tiger act.vgz" />
+			<dataarea name="quik" size="1006">
+				<rom name="01 tiger act.vgz" size="1006" crc="3781fa5b" sha1="ced328a704726c257ec0c84c6413ca26f76913cd" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 high rope act.vgz" />
+			<dataarea name="quik" size="1000">
+				<rom name="02 high rope act.vgz" size="1000" crc="9a5ff10a" sha1="69ebb2a0a2a0c09703b4e1df1553a7ee48781c3c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 rope swing act.vgz" />
+			<dataarea name="quik" size="1481">
+				<rom name="03 rope swing act.vgz" size="1481" crc="9ec6eb3f" sha1="868452507ce902247dea6d103244fa4b0dc3e986" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 dead.vgz" />
+			<dataarea name="quik" size="474">
+				<rom name="04 dead.vgz" size="474" crc="3817d7e7" sha1="303507c4cc4d54dd89affba0511836002bbd71df" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="gekipen2_scc">
+		<description>Clash Pennant Race 2 (MSX2, SCC)</description>
+		<year>1989</year>
+		<publisher>Konami</publisher>
+		<info name="cores" value="SCC (K051649), PSG (AY-3-8910)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 opening.vgz" />
+			<dataarea name="quik" size="22121">
+				<rom name="01 opening.vgz" size="22121" crc="c7a3ae93" sha1="eba20a95acc0a177bba5598ff84b37cbaba54a48" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 selection bgm.vgz" />
+			<dataarea name="quik" size="10738">
+				<rom name="02 selection bgm.vgz" size="10738" crc="4d5a5fe7" sha1="5343d5e6cc77b332220ce041e1dace27196b33df" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 game bgm 1.vgz" />
+			<dataarea name="quik" size="3640">
+				<rom name="03 game bgm 1.vgz" size="3640" crc="6ab53b81" sha1="0a82d273dc7a1a5cc7a628516f39cbcb53809db8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 game bgm 2.vgz" />
+			<dataarea name="quik" size="3357">
+				<rom name="04 game bgm 2.vgz" size="3357" crc="7baed2d5" sha1="3f83ea2b0605f29141e5ebe0560dd759ccc67026" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 game bgm 3.vgz" />
+			<dataarea name="quik" size="3775">
+				<rom name="05 game bgm 3.vgz" size="3775" crc="66315004" sha1="3f4b96a74d333b81f48097c10dce41fa08f51499" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 game bgm 4.vgz" />
+			<dataarea name="quik" size="2119">
+				<rom name="06 game bgm 4.vgz" size="2119" crc="2334c740" sha1="6e3a204d3520ef89b3795125ced4321492854ab4" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 game bgm 5.vgz" />
+			<dataarea name="quik" size="3068">
+				<rom name="07 game bgm 5.vgz" size="3068" crc="48030286" sha1="1fe3e68af837f76323058d19513ca9eb5743c466" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 base reached bgm 1.vgz" />
+			<dataarea name="quik" size="4897">
+				<rom name="08 base reached bgm 1.vgz" size="4897" crc="2e7d471e" sha1="687294459add5a001c601181ff1d2986c2bb2c62" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 base reached bgm 2.vgz" />
+			<dataarea name="quik" size="6194">
+				<rom name="09 base reached bgm 2.vgz" size="6194" crc="9ebfc91d" sha1="25b6745001da4135c71ce5cf147addbfcde40d03" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 home run bgm.vgz" />
+			<dataarea name="quik" size="7376">
+				<rom name="10 home run bgm.vgz" size="7376" crc="48b0f1d5" sha1="3c6ed1af8ae6c0a4762a7c407e12a4a03031bf23" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 lucky 7 bgm.vgz" />
+			<dataarea name="quik" size="5214">
+				<rom name="11 lucky 7 bgm.vgz" size="5214" crc="da5861d7" sha1="f80554f1acc0abb029cb7309aa6fd2b32fa388f9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 game set bgm.vgz" />
+			<dataarea name="quik" size="4561">
+				<rom name="12 game set bgm.vgz" size="4561" crc="1033050d" sha1="d5177ab27e772003fbe3dbb587d6da48f31d9d3f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 team switch bgm.vgz" />
+			<dataarea name="quik" size="3393">
+				<rom name="13 team switch bgm.vgz" size="3393" crc="19a40988" sha1="e04be75d231d1af50b47b187995c6ee6b49a1a47" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 statistics bgm.vgz" />
+			<dataarea name="quik" size="20738">
+				<rom name="14 statistics bgm.vgz" size="20738" crc="954b643c" sha1="2cc2e7c8a36474e4f810753918d230f0b2c40557" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 ending.vgz" />
+			<dataarea name="quik" size="29301">
+				<rom name="15 ending.vgz" size="29301" crc="ea93e83e" sha1="34eec708b66204cf4cbdc15c8fb7a4f3ae29d178" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="cybrcomm">
+		<description>Cyber Commando (Namco System 22)</description>
+		<year>1994</year>
+		<publisher>Namco</publisher>
+		<info name="cores" value="C352"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 title.vgz" />
+			<dataarea name="quik" size="31009">
+				<rom name="01 title.vgz" size="31009" crc="1d068270" sha1="b13a56678fa145a0f92316934d97c4970282c6df" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 select your vehicle.vgz" />
+			<dataarea name="quik" size="180118">
+				<rom name="02 select your vehicle.vgz" size="180118" crc="4d2758ad" sha1="4d0fb97357ec0d96f0f49394107a52b94a85ee78" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 opening.vgz" />
+			<dataarea name="quik" size="156148">
+				<rom name="03 opening.vgz" size="156148" crc="c11259d2" sha1="6d66171933311ee17f5e949d48718ca53f638d82" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 east city.vgz" />
+			<dataarea name="quik" size="248260">
+				<rom name="04 east city.vgz" size="248260" crc="a3147b96" sha1="0a6830535b6f3026a68f6ac5fd97d493594c5400" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 civic park.vgz" />
+			<dataarea name="quik" size="234394">
+				<rom name="05 civic park.vgz" size="234394" crc="89951206" sha1="0693de5ddbf963c55061d736d0086066139490b2" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 metal serpent.vgz" />
+			<dataarea name="quik" size="427679">
+				<rom name="06 metal serpent.vgz" size="427679" crc="aebf20b3" sha1="ae33a36fcd66fe9fc8cfab446dbe498c3021b4f9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 rafflesia.vgz" />
+			<dataarea name="quik" size="290913">
+				<rom name="07 rafflesia.vgz" size="290913" crc="5033b32c" sha1="6aa2be07ec992525537d139dd4ecd6500e411088" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 general-d.vgz" />
+			<dataarea name="quik" size="196589">
+				<rom name="08 general-d.vgz" size="196589" crc="ec51178c" sha1="f8cc684190df856f133715e24eb9dfa218f4d127" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 nightmare.vgz" />
+			<dataarea name="quik" size="226006">
+				<rom name="09 nightmare.vgz" size="226006" crc="f3365f0e" sha1="be19930a7830493324352934852b5e7e5c18fa5f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 ending.vgz" />
+			<dataarea name="quik" size="286920">
+				<rom name="10 ending.vgz" size="286920" crc="4780dc28" sha1="7072723a50e40ad275dacaf6ce8c5fb6746d558b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 continue.vgz" />
+			<dataarea name="quik" size="162088">
+				<rom name="11 continue.vgz" size="162088" crc="7c439645" sha1="7d88f8c15c242291fdc2c04a7cd8815de825aaf7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 rescue operations.vgz" />
+			<dataarea name="quik" size="286928">
+				<rom name="12 rescue operations.vgz" size="286928" crc="b75d19e2" sha1="efed7f028f817e289c0244e0fcb18b7eab5a60fc" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 select your vehicle (vs).vgz" />
+			<dataarea name="quik" size="190583">
+				<rom name="13 select your vehicle (vs).vgz" size="190583" crc="ed6a1a80" sha1="d9060472de7d7a61494a057838c1f022e156a9e8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 versus.vgz" />
+			<dataarea name="quik" size="173120">
+				<rom name="14 versus.vgz" size="173120" crc="8adb4f7b" sha1="5ead711b7ff75d938648d151f0865ace9243fe35" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 unused 1.vgz" />
+			<dataarea name="quik" size="117173">
+				<rom name="15 unused 1.vgz" size="117173" crc="7e404bfd" sha1="506a440c222e0b595926ff3a2322fe98142503b7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 unused 2.vgz" />
+			<dataarea name="quik" size="61825">
+				<rom name="16 unused 2.vgz" size="61825" crc="1fee7f83" sha1="201d0c72d878901a659d4c88fa59e5125f2501cb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 unused 3.vgz" />
+			<dataarea name="quik" size="95584">
+				<rom name="17 unused 3.vgz" size="95584" crc="bbed402a" sha1="50778a2bc4e6e876658bd4beba94a110bdd368b6" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 unused 4.vgz" />
+			<dataarea name="quik" size="308497">
+				<rom name="18 unused 4.vgz" size="308497" crc="f8763c2c" sha1="ff93a757242f8f0f492b2bf65329134eeced9176" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="frogger_msx">
+		<description>Frogger (MSX)</description>
+		<year>1983</year>
+		<publisher>Konami</publisher>
+		<info name="cores" value="PSG (AY-3-8910)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 play start.vgz" />
+			<dataarea name="quik" size="718">
+				<rom name="01 play start.vgz" size="718" crc="b1da93cc" sha1="7a10f384d9a28c6c4f156a4fd6de0ed489b39201" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 dead.vgz" />
+			<dataarea name="quik" size="285">
+				<rom name="02 dead.vgz" size="285" crc="df68c4e0" sha1="783e291a794f0c7498707b054c651fa55fc9d052" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 time alert.vgz" />
+			<dataarea name="quik" size="328">
+				<rom name="03 time alert.vgz" size="328" crc="8f8dca73" sha1="4f4d85044bb07cc6b3ca539328c8f9b7531c90f3" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 next stage.vgz" />
+			<dataarea name="quik" size="522">
+				<rom name="04 next stage.vgz" size="522" crc="40b77f89" sha1="f4f1b8cddfe9d5d0a7035b9731f61ed9b1cb334f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 sirene.vgz" />
+			<dataarea name="quik" size="248">
+				<rom name="05 sirene.vgz" size="248" crc="82d47c36" sha1="e7b0ba96aec27a911b931ffa74680827e7fe0822" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 game over.vgz" />
+			<dataarea name="quik" size="463">
+				<rom name="06 game over.vgz" size="463" crc="e454426d" sha1="717d301f141d338803671414a30db6d09506f05c" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="gslgr94u">
+		<description>Great Sluggers '94 - New World Stadium (Namco NB-1)</description>
+		<year>1994</year>
+		<publisher>Namco</publisher>
+		<info name="cores" value="C352"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 opening theme '94.vgz" />
+			<dataarea name="quik" size="122051">
+				<rom name="01 opening theme '94.vgz" size="122051" crc="3ede057e" sha1="9eee8e761669204e5bab811054f4e37abf03b333" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 forward field.vgz" />
+			<dataarea name="quik" size="135682">
+				<rom name="02 forward field.vgz" size="135682" crc="8c13170a" sha1="f08106893b1227ee247b6987dcfb5c66f6c923eb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 ninety four.vgz" />
+			<dataarea name="quik" size="240273">
+				<rom name="03 ninety four.vgz" size="240273" crc="3a21cdb7" sha1="5c5f6fae30b55f5f94c985261941ad5fd148ee42" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 speed and charge.vgz" />
+			<dataarea name="quik" size="262449">
+				<rom name="04 speed and charge.vgz" size="262449" crc="517aa34d" sha1="c0d4cbb62b062dd5214dad0af4a3f8d762d06a1f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 intension.vgz" />
+			<dataarea name="quik" size="253295">
+				<rom name="05 intension.vgz" size="253295" crc="c0f6324b" sha1="37d451720f0bf4d7d277bac327eedb321837f7d7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 perfect game.vgz" />
+			<dataarea name="quik" size="242032">
+				<rom name="06 perfect game.vgz" size="242032" crc="ff55216e" sha1="5757bb9e6451ae3e2601345afc43d28d54392bba" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 second wind.vgz" />
+			<dataarea name="quik" size="210953">
+				<rom name="07 second wind.vgz" size="210953" crc="41ff0cca" sha1="24d4a7e6264084cdb6eb1cd4f90c51838c55a061" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 full base.vgz" />
+			<dataarea name="quik" size="230162">
+				<rom name="08 full base.vgz" size="230162" crc="623ca10b" sha1="9a17eddd2ccb25231b8e633f815d0fe35a53b7fd" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 namco sports news '94 opening theme.vgz" />
+			<dataarea name="quik" size="115907">
+				<rom name="09 namco sports news '94 opening theme.vgz" size="115907" crc="24d9b457" sha1="b2887c9b9dfb68d8d66c7696157cbbb076bed69e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 season off.vgz" />
+			<dataarea name="quik" size="178240">
+				<rom name="10 season off.vgz" size="178240" crc="2ef04e4c" sha1="8768d8e0398e4db15b5d57c2a2c1ee9b8393048b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 namco sports news '94 main theme.vgz" />
+			<dataarea name="quik" size="136654">
+				<rom name="11 namco sports news '94 main theme.vgz" size="136654" crc="32af2af5" sha1="ec72c5be8f10c6943937d7994d1cf224137866e0" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 switching between offense and defense 1.vgz" />
+			<dataarea name="quik" size="68586">
+				<rom name="12 switching between offense and defense 1.vgz" size="68586" crc="7cf086a8" sha1="6a44f13624e1277102d89bf0ee1f6543d2a0b4c9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 switching between offense and defense 2.vgz" />
+			<dataarea name="quik" size="68048">
+				<rom name="13 switching between offense and defense 2.vgz" size="68048" crc="1f888399" sha1="b048408c9c2977c1b1a932cdd1dfe5dfc854bcc7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 switching between offense and defense 3.vgz" />
+			<dataarea name="quik" size="77878">
+				<rom name="14 switching between offense and defense 3.vgz" size="77878" crc="427083b5" sha1="953261b561da57e9fe49fdeb83b1393ca86ab1d3" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 switching between offense and defense 4.vgz" />
+			<dataarea name="quik" size="70152">
+				<rom name="15 switching between offense and defense 4.vgz" size="70152" crc="d4435263" sha1="a66aa4354ac4e0dcdb0fdadcddcde69ad23e3782" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 home run.vgz" />
+			<dataarea name="quik" size="74759">
+				<rom name="16 home run.vgz" size="74759" crc="426c0018" sha1="993c421f899202e1bbc0e8e06cb5cbb2bbb51d0f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 the end of the match '94.vgz" />
+			<dataarea name="quik" size="81300">
+				<rom name="17 the end of the match '94.vgz" size="81300" crc="a2c2d210" sha1="39b563a2a135fd3d8a3cfb570691ffb2dd47b280" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 toukon komete.vgz" />
+			<dataarea name="quik" size="232282">
+				<rom name="18 toukon komete.vgz" size="232282" crc="c724e85c" sha1="987e1919973d73257cbc8e9bd4b43647cc4ea43c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="019" interface="vgm_quik">
+			<feature name="part_id" value="19 moeyo dragons!.vgz" />
+			<dataarea name="quik" size="267858">
+				<rom name="19 moeyo dragons.vgz" size="267858" crc="4aae99cd" sha1="bc7ef5702f8bcd3d94ad6f6d499f66b98a076d94" offset="0" />
+			</dataarea>
+		</part>
+		<part name="020" interface="vgm_quik">
+			<feature name="part_id" value="20 sorieke carp ~wakaki koitachi~.vgz" />
+			<dataarea name="quik" size="271390">
+				<rom name="20 sorieke carp ~wakaki koitachi~.vgz" size="271390" crc="92a37e3f" sha1="101c251d4c1da47761cc4d6b317efb170f9053b1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="021" interface="vgm_quik">
+			<feature name="part_id" value="21 tokyo ondo.vgz" />
+			<dataarea name="quik" size="195580">
+				<rom name="21 tokyo ondo.vgz" size="195580" crc="a8a50536" sha1="5f13155b4afcf35dc2201fe95694be07b2552ea1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="022" interface="vgm_quik">
+			<feature name="part_id" value="22 rokko oroshi.vgz" />
+			<dataarea name="quik" size="347290">
+				<rom name="22 rokko oroshi.vgz" size="347290" crc="b5fe9540" sha1="8f34d5f76693005cb40110bdf71cebe9afce3206" offset="0" />
+			</dataarea>
+		</part>
+		<part name="023" interface="vgm_quik">
+			<feature name="part_id" value="23 winning.vgz" />
+			<dataarea name="quik" size="217929">
+				<rom name="23 winning.vgz" size="217929" crc="5a2430e4" sha1="1e61eb0d69133cd3251703d6275c34b9620e3c94" offset="0" />
+			</dataarea>
+		</part>
+		<part name="024" interface="vgm_quik">
+			<feature name="part_id" value="24 wakaki shishitachi.vgz" />
+			<dataarea name="quik" size="295520">
+				<rom name="24 wakaki shishitachi.vgz" size="295520" crc="d7f5d9bd" sha1="15392959665f4a06ec93f6d847bc2d925973c6c8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="025" interface="vgm_quik">
+			<feature name="part_id" value="25 little neptune.vgz" />
+			<dataarea name="quik" size="258729">
+				<rom name="25 little neptune.vgz" size="258729" crc="ece0c37a" sha1="b40f84d5b0240179cbba9adfcf2598357454bdd9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="026" interface="vgm_quik">
+			<feature name="part_id" value="26 kintetsu buffaloes no uta.vgz" />
+			<dataarea name="quik" size="202027">
+				<rom name="26 kintetsu buffaloes no uta.vgz" size="202027" crc="9f55100a" sha1="cb7582a1cf3f0dca7ea5c420bbbb55c173fe52b8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="027" interface="vgm_quik">
+			<feature name="part_id" value="27 izayuke wakataka gundan.vgz" />
+			<dataarea name="quik" size="262632">
+				<rom name="27 izayuke wakataka gundan.vgz" size="262632" crc="1d3290c1" sha1="4dd35e129ec4276c8180137d6a4884d98af350d5" offset="0" />
+			</dataarea>
+		</part>
+		<part name="028" interface="vgm_quik">
+			<feature name="part_id" value="28 we love marines.vgz" />
+			<dataarea name="quik" size="296626">
+				<rom name="28 we love marines.vgz" size="296626" crc="141a9436" sha1="a50200b38f46c0cf6ca5bfef830f86e134e96d90" offset="0" />
+			</dataarea>
+		</part>
+		<part name="029" interface="vgm_quik">
+			<feature name="part_id" value="29 fighters sanka.vgz" />
+			<dataarea name="quik" size="206605">
+				<rom name="29 fighters sanka.vgz" size="206605" crc="403a37d5" sha1="3b61ea891818999f2f2e35abc5cb6033f71bd1bc" offset="0" />
+			</dataarea>
+		</part>
+		<part name="030" interface="vgm_quik">
+			<feature name="part_id" value="30 toukon komete (electone).vgz" />
+			<dataarea name="quik" size="39687">
+				<rom name="30 toukon komete (electone).vgz" size="39687" crc="49443580" sha1="46bb418a872e957d3f2139490ff1fceedbb8dd95" offset="0" />
+			</dataarea>
+		</part>
+		<part name="031" interface="vgm_quik">
+			<feature name="part_id" value="31 moeyo dragons! (electone).vgz" />
+			<dataarea name="quik" size="38805">
+				<rom name="31 moeyo dragons (electone).vgz" size="38805" crc="09ecb0c9" sha1="180297246277142f2d8d663b73d9a398fa11e1c9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="032" interface="vgm_quik">
+			<feature name="part_id" value="32 sorieke carp ~wakaki koitachi~ (electone).vgz" />
+			<dataarea name="quik" size="39125">
+				<rom name="32 sorieke carp ~wakaki koitachi~ (electone).vgz" size="39125" crc="e206b7db" sha1="d6cc703334f8b7f3dc76fcbc2cb9da24339fd0ca" offset="0" />
+			</dataarea>
+		</part>
+		<part name="033" interface="vgm_quik">
+			<feature name="part_id" value="33 tokyo ondo (electone).vgz" />
+			<dataarea name="quik" size="38575">
+				<rom name="33 tokyo ondo (electone).vgz" size="38575" crc="8e8189f6" sha1="4b7d28695c1d0b0cf586a0233b50f5060faffd31" offset="0" />
+			</dataarea>
+		</part>
+		<part name="034" interface="vgm_quik">
+			<feature name="part_id" value="34 rokko oroshi (electone).vgz" />
+			<dataarea name="quik" size="41845">
+				<rom name="34 rokko oroshi (electone).vgz" size="41845" crc="6a24654e" sha1="662603a3cf925226272d48afff9e5a0fce46db26" offset="0" />
+			</dataarea>
+		</part>
+		<part name="035" interface="vgm_quik">
+			<feature name="part_id" value="35 winning (electone).vgz" />
+			<dataarea name="quik" size="38420">
+				<rom name="35 winning (electone).vgz" size="38420" crc="ca397768" sha1="79140e6da81f4d8f5936f75bff827eaaf26d80cd" offset="0" />
+			</dataarea>
+		</part>
+		<part name="036" interface="vgm_quik">
+			<feature name="part_id" value="36 wakaki shishitachi (electone).vgz" />
+			<dataarea name="quik" size="41072">
+				<rom name="36 wakaki shishitachi (electone).vgz" size="41072" crc="1457b4b1" sha1="e0fd55010cbf4c0564dc21665b79ebbf09f10943" offset="0" />
+			</dataarea>
+		</part>
+		<part name="037" interface="vgm_quik">
+			<feature name="part_id" value="37 little neptune (electone).vgz" />
+			<dataarea name="quik" size="40814">
+				<rom name="37 little neptune (electone).vgz" size="40814" crc="a9c8c86d" sha1="b52327f9897241116dd2098d525d818d66560795" offset="0" />
+			</dataarea>
+		</part>
+		<part name="038" interface="vgm_quik">
+			<feature name="part_id" value="38 kintetsu buffaloes no uta (electone).vgz" />
+			<dataarea name="quik" size="39590">
+				<rom name="38 kintetsu buffaloes no uta (electone).vgz" size="39590" crc="1cca2843" sha1="1e4c9eb07172eef4d383ec3a8c65b737d305cc5a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="039" interface="vgm_quik">
+			<feature name="part_id" value="39 izayuke wakataka gundan (electone).vgz" />
+			<dataarea name="quik" size="39809">
+				<rom name="39 izayuke wakataka gundan (electone).vgz" size="39809" crc="a055870d" sha1="90513d63c01bb7439aaaea88b269649abc19869f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="040" interface="vgm_quik">
+			<feature name="part_id" value="40 we love marines (electone).vgz" />
+			<dataarea name="quik" size="39583">
+				<rom name="40 we love marines (electone).vgz" size="39583" crc="bdb5f7e8" sha1="d9184fe6d25ded04a3c613c1774392fd01cf1bb2" offset="0" />
+			</dataarea>
+		</part>
+		<part name="041" interface="vgm_quik">
+			<feature name="part_id" value="41 fighters sanka (electone).vgz" />
+			<dataarea name="quik" size="38815">
+				<rom name="41 fighters sanka (electone).vgz" size="38815" crc="5db9afbc" sha1="a5cbef809f94d431ecd2065f41648b986bcbdb5e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="042" interface="vgm_quik">
+			<feature name="part_id" value="42 time bgm.vgz" />
+			<dataarea name="quik" size="68380">
+				<rom name="42 time bgm.vgz" size="68380" crc="61b7467b" sha1="4cc884662e54adf2e63970a8018a5a49b9691f32" offset="0" />
+			</dataarea>
+		</part>
+		<part name="043" interface="vgm_quik">
+			<feature name="part_id" value="43 ninety four (looped).vgz" />
+			<dataarea name="quik" size="203057">
+				<rom name="43 ninety four (looped).vgz" size="203057" crc="43d432be" sha1="07c1fbb68a5d4c51c3ac2a5e9f48e1a58f5e614f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="044" interface="vgm_quik">
+			<feature name="part_id" value="44 speed and charge (looped).vgz" />
+			<dataarea name="quik" size="216404">
+				<rom name="44 speed and charge (looped).vgz" size="216404" crc="07b33b03" sha1="9df0a76941f8afe808b57ea41bcc6b591c10cc8e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="045" interface="vgm_quik">
+			<feature name="part_id" value="45 intension (looped).vgz" />
+			<dataarea name="quik" size="212418">
+				<rom name="45 intension (looped).vgz" size="212418" crc="e6bbe0c7" sha1="3efb11cdddff178c36296b5beebd79703a0b9e95" offset="0" />
+			</dataarea>
+		</part>
+		<part name="046" interface="vgm_quik">
+			<feature name="part_id" value="46 perfect game (looped).vgz" />
+			<dataarea name="quik" size="234891">
+				<rom name="46 perfect game (looped).vgz" size="234891" crc="eeaf54a7" sha1="8ae23afea5da50ffd3394ea9858daff3e1656fd0" offset="0" />
+			</dataarea>
+		</part>
+		<part name="047" interface="vgm_quik">
+			<feature name="part_id" value="47 second wind (looped).vgz" />
+			<dataarea name="quik" size="205895">
+				<rom name="47 second wind (looped).vgz" size="205895" crc="395ff279" sha1="75fb22c4f973fbbf9c6fd39297801588f05f8daa" offset="0" />
+			</dataarea>
+		</part>
+		<part name="048" interface="vgm_quik">
+			<feature name="part_id" value="48 full base (looped).vgz" />
+			<dataarea name="quik" size="212964">
+				<rom name="48 full base (looped).vgz" size="212964" crc="8096c470" sha1="d32a788537523875149dfa8284e7fde82632aa6d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="049" interface="vgm_quik">
+			<feature name="part_id" value="49 speaker check.vgz" />
+			<dataarea name="quik" size="50810">
+				<rom name="49 speaker check.vgz" size="50810" crc="c06e7fd9" sha1="72327c8ca5b3d7378183e5beb62d054ccaf82430" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="hyprally_msx">
+		<description>Hyper Rally (MSX, PSG)</description>
+		<year>1985</year>
+		<publisher>Konami</publisher>
+		<info name="cores" value="PSG (AY-3-8910)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 play start.vgz" />
+			<dataarea name="quik" size="834">
+				<rom name="01 play start.vgz" size="834" crc="36d55335" sha1="8b649ad9ac05956cff56f02c725bdb981c92818d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 qualified.vgz" />
+			<dataarea name="quik" size="683">
+				<rom name="02 qualified.vgz" size="683" crc="87178e0f" sha1="ee3263d8c11fae7e537464d135767c67744330c5" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 disqualified.vgz" />
+			<dataarea name="quik" size="726">
+				<rom name="03 disqualified.vgz" size="726" crc="8745725f" sha1="51a6b24bb24cafc9ac95403f322b2c2186613b5d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 finished.vgz" />
+			<dataarea name="quik" size="1967">
+				<rom name="04 finished.vgz" size="1967" crc="3191caa9" sha1="c841e4342a24f544af6aa1dd415f0a6134a987f6" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="hyprally_scc">
+		<description>Hyper Rally (MSX, SCC)</description>
+		<year>1985</year>
+		<publisher>Konami</publisher>
+		<info name="cores" value="SCC-I (K052539), PSG (AY-3-8910)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 play start.vgz" />
+			<dataarea name="quik" size="2423">
+				<rom name="01 play start.vgz" size="2423" crc="695a38bd" sha1="097eaa0f9a39636d998fcba5bff90c66ddd28f17" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 qualified.vgz" />
+			<dataarea name="quik" size="2197">
+				<rom name="02 qualified.vgz" size="2197" crc="0a3ac744" sha1="0c866a2ab61fa340a87febba915a81260e30a895" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 disqualified.vgz" />
+			<dataarea name="quik" size="2502">
+				<rom name="03 disqualified.vgz" size="2502" crc="3d5f3193" sha1="560656abb53def7d958983796423c89a3f822497" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 finished.vgz" />
+			<dataarea name="quik" size="6061">
+				<rom name="04 finished.vgz" size="6061" crc="7cdff65c" sha1="bb46ef86776c0f4df7d6406e7dc188373b1480c6" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="looney_gb">
+		<description>Looney Tunes (Nintendo Game Boy)</description>
+		<year>1992</year>
+		<publisher>Sunsoft</publisher>
+		<info name="cores" value="Game Boy DMG (LR35902)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 title.vgz" />
+			<dataarea name="quik" size="7130">
+				<rom name="01 title.vgz" size="7130" crc="d7eb2ec8" sha1="02c32be9a3a9cec3ead9fc3de0a2f1a681cd5583" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 game start.vgz" />
+			<dataarea name="quik" size="654">
+				<rom name="02 game start.vgz" size="654" crc="470e2942" sha1="c246ea40e1c786a8581a07e8df095f81240f2d0c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 stage 1 - daffy duck.vgz" />
+			<dataarea name="quik" size="10869">
+				<rom name="03 stage 1 - daffy duck.vgz" size="10869" crc="467c3347" sha1="8995232cf01a9038d810534de5af739fd115c72e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 miniboss.vgz" />
+			<dataarea name="quik" size="8743">
+				<rom name="04 miniboss.vgz" size="8743" crc="bd12c700" sha1="d2ed7c105397fd8612d0d5d4170287b5c567011c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 boss battle.vgz" />
+			<dataarea name="quik" size="10131">
+				<rom name="05 boss battle.vgz" size="10131" crc="6bd9041b" sha1="0e3868350578672e46641b4372e48a37ff5fa40b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 level complete.vgz" />
+			<dataarea name="quik" size="4090">
+				<rom name="06 level complete.vgz" size="4090" crc="1f352939" sha1="5080d5b9c64aecd760ef1708f9a6f3c02ad08fca" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 stage 2 - tweety.vgz" />
+			<dataarea name="quik" size="16421">
+				<rom name="07 stage 2 - tweety.vgz" size="16421" crc="9de1e1f0" sha1="33ecac5687bfe622c164f25e6e88dbf8bc43a675" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 stage 3 - porky pig.vgz" />
+			<dataarea name="quik" size="9825">
+				<rom name="08 stage 3 - porky pig.vgz" size="9825" crc="ff83260f" sha1="5fd2248164c7cb2f2495d2c4ad40213bad373e23" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 stage 4 - tasmanian devil.vgz" />
+			<dataarea name="quik" size="16431">
+				<rom name="09 stage 4 - tasmanian devil.vgz" size="16431" crc="3845b21b" sha1="c0c3209eae5d44ae916678bb8d0bac74c89cc516" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 stage 5 - speedy gonzales - stage 7 - bugs bunny.vgz" />
+			<dataarea name="quik" size="15287">
+				<rom name="10 stage 5 - speedy gonzales - stage 7 - bugs bunny.vgz" size="15287" crc="fb47d2d7" sha1="fe8686a7ace35bdab2ab342aeff6d8a7b7174ee6" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 stage 6 - road runner.vgz" />
+			<dataarea name="quik" size="16646">
+				<rom name="11 stage 6 - road runner.vgz" size="16646" crc="328f6b0e" sha1="43f75f53195ba6a04f863a728e1c50ebd708a352" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 bonus complete.vgz" />
+			<dataarea name="quik" size="1411">
+				<rom name="12 bonus complete.vgz" size="1411" crc="886e1072" sha1="738eb3cde818a550940f2d091d6c891f8da82cfc" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 player down.vgz" />
+			<dataarea name="quik" size="804">
+				<rom name="13 player down.vgz" size="804" crc="0d8a1356" sha1="702f769ca0d264224b8a2b0afa91192f736e9956" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 game over.vgz" />
+			<dataarea name="quik" size="1527">
+				<rom name="14 game over.vgz" size="1527" crc="8cf7a1c3" sha1="4658f1264a2d654be67c5e2c61c6ff6815e59594" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 credits.vgz" />
+			<dataarea name="quik" size="18923">
+				<rom name="15 credits.vgz" size="18923" crc="097f6e8a" sha1="93aec8ea635056fc73c69c065b6e7b8a35390c59" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mslug2">
+		<description>Metal Slug 2 (SNK Neo Geo)</description>
+		<year>1998</year>
+		<publisher>SNK</publisher>
+		<info name="cores" value="YM2610"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 neo geo logo.vgz" />
+			<dataarea name="quik" size="1451">
+				<rom name="01 neo geo logo.vgz" size="1451" crc="3128e19e" sha1="38967cfa659c3e64490996d87d04ebe8ea47caaa" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 the military system.vgz" />
+			<dataarea name="quik" size="109106">
+				<rom name="02 the military system.vgz" size="109106" crc="000fc501" sha1="1dab4832f87e48fc408d730f0a87589293ee698c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 barracks.vgz" />
+			<dataarea name="quik" size="326720">
+				<rom name="03 barracks.vgz" size="326720" crc="16fce190" sha1="e0a668aa29cc28e2ea3469ba5c422d517e42b71d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 judgment.vgz" />
+			<dataarea name="quik" size="1146996">
+				<rom name="04 judgment.vgz" size="1146996" crc="4f2611b4" sha1="73ea877016ba9b52d55cd9b509bdaf982615009f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 steel beast 6beets.vgz" />
+			<dataarea name="quik" size="2205490">
+				<rom name="05 steel beast 6beets.vgz" size="2205490" crc="853b1b88" sha1="29c2ae4717c2442d968dbff5bce33cdb75da52b3" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 prehistoric site.vgz" />
+			<dataarea name="quik" size="1263812">
+				<rom name="06 prehistoric site.vgz" size="1263812" crc="6c6969d9" sha1="7acff39482a02abe70f6166cc816b006870ba6fb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 the cenotaph.vgz" />
+			<dataarea name="quik" size="833099">
+				<rom name="07 the cenotaph.vgz" size="833099" crc="8fe80a4d" sha1="b9db5c551660fb8114adec0ab0ad87fafc874dc6" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 first contact.vgz" />
+			<dataarea name="quik" size="1495923">
+				<rom name="08 first contact.vgz" size="1495923" crc="0cd4f2bd" sha1="c44a9315bbf8f6da46c82465d2cf712e46e9bcae" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 livin' on the deck.vgz" />
+			<dataarea name="quik" size="1498320">
+				<rom name="09 livin' on the deck.vgz" size="1498320" crc="af8cf4d0" sha1="ec3f733c7c1caa148f8b7a2f2624983219c1fb99" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 assault theme.vgz" />
+			<dataarea name="quik" size="2195054">
+				<rom name="10 assault theme.vgz" size="2195054" crc="b641172a" sha1="e953aaa5272f0e0edba09cb4921f5af4d87142ab" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 back to the china.vgz" />
+			<dataarea name="quik" size="1467405">
+				<rom name="11 back to the china.vgz" size="1467405" crc="2f373c88" sha1="4f2a8300fc0c90e1e17086b5d2ab7349af803300" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 new godokin street.vgz" />
+			<dataarea name="quik" size="1784331">
+				<rom name="12 new godokin street.vgz" size="1784331" crc="917b4442" sha1="8bf0e9554dfdc090957b532bd035f1a7d779d9c1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 kiss in the dark.vgz" />
+			<dataarea name="quik" size="732477">
+				<rom name="13 kiss in the dark.vgz" size="732477" crc="201784ca" sha1="a4fde67573aecffc51450858250ac6f6c78ffe15" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 metamorphosis.vgz" />
+			<dataarea name="quik" size="636615">
+				<rom name="14 metamorphosis.vgz" size="636615" crc="37ee6be0" sha1="79bfb68cd94511bdd9b29f514c7e3c1aa0cb1497" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 gravestone.vgz" />
+			<dataarea name="quik" size="576585">
+				<rom name="15 gravestone.vgz" size="576585" crc="07840869" sha1="a56e9a2ef49d5fb6b4637bd9d841bcdf5b31f3a4" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 final attack.vgz" />
+			<dataarea name="quik" size="2750503">
+				<rom name="16 final attack.vgz" size="2750503" crc="8fb93e11" sha1="aa123013a89d8efec3cafe834b1aa2a41b7fe90a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 end title again.vgz" />
+			<dataarea name="quik" size="387370">
+				<rom name="17 end title again.vgz" size="387370" crc="6a92a581" sha1="f7116727a37cf5e6aee91c411ff8cef0fc05f6b8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 carry out.vgz" />
+			<dataarea name="quik" size="909984">
+				<rom name="18 carry out.vgz" size="909984" crc="6f163451" sha1="0d52251c57589f1511aa6515c92562cdd51a52df" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="smbdx_gbc">
+		<description>Super Mario Bros. Deluxe (Nintendo Game Boy Color)</description>
+		<year>1999</year>
+		<publisher>Nintendo</publisher>
+		<info name="cores" value="Game Boy DMG (LR35902)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 title screen.vgz" />
+			<dataarea name="quik" size="1995">
+				<rom name="01 title screen.vgz" size="1995" crc="a16552f5" sha1="10d0faafae2fc9fbb53458eea4900528f10b8330" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 main menu.vgz" />
+			<dataarea name="quik" size="2723">
+				<rom name="02 main menu.vgz" size="2723" crc="9e7b7251" sha1="2066c16a90b2555663aca712e839365c9a35a6d7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 choose a pipe.vgz" />
+			<dataarea name="quik" size="1389">
+				<rom name="03 choose a pipe.vgz" size="1389" crc="8dd52f44" sha1="9add4f21631b96bb8bb80d143e00154b43c9f9c1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 running about.vgz" />
+			<dataarea name="quik" size="9156">
+				<rom name="04 running about.vgz" size="9156" crc="5a808710" sha1="fdc3da7f7999b512ae30acba54955f4e658dfb9f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 underground.vgz" />
+			<dataarea name="quik" size="1244">
+				<rom name="05 underground.vgz" size="1244" crc="1e77a68c" sha1="eff607fe78eaea20bcd26a22d04af5ee2e946898" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 swimming around.vgz" />
+			<dataarea name="quik" size="2516">
+				<rom name="06 swimming around.vgz" size="2516" crc="c6afeb15" sha1="eb12663a345aacae58d0c730b0371b4de8b630bd" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 bowser's castle.vgz" />
+			<dataarea name="quik" size="1108">
+				<rom name="07 bowser's castle.vgz" size="1108" crc="41f55967" sha1="ee0ec157c3d8f8412a6c592d1be6450835b79ad7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 invincible.vgz" />
+			<dataarea name="quik" size="944">
+				<rom name="08 invincible.vgz" size="944" crc="333e5517" sha1="f209761056f6367c3e9c56ac27baccec49c79d4f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 level complete.vgz" />
+			<dataarea name="quik" size="912">
+				<rom name="09 level complete.vgz" size="912" crc="b5d7552d" sha1="47f7f213d9cc7f90615ebef312eee22566d1bf7a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 bowser's castle complete.vgz" />
+			<dataarea name="quik" size="1610">
+				<rom name="10 bowser's castle complete.vgz" size="1610" crc="ea2e92af" sha1="5092839ebb56eba5ce299435870c8afca731270b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 miss.vgz" />
+			<dataarea name="quik" size="882">
+				<rom name="11 miss.vgz" size="882" crc="b43540de" sha1="adb0c9366f42c5a66d27d26a888933324a8171d9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 game over.vgz" />
+			<dataarea name="quik" size="982">
+				<rom name="12 game over.vgz" size="982" crc="ad169947" sha1="ca70af4de006d6ce8032fa2c0817b19d8c7b030d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 into the pipe.vgz" />
+			<dataarea name="quik" size="862">
+				<rom name="13 into the pipe.vgz" size="862" crc="351d1543" sha1="0c9bf7a51ff633e795c4533933feb692ace59803" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 saved the princess.vgz" />
+			<dataarea name="quik" size="770">
+				<rom name="14 saved the princess.vgz" size="770" crc="3ee3e431" sha1="4826e67aea646a5e1fb53e89fc76152c6422f55c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 medal get.vgz" />
+			<dataarea name="quik" size="2877">
+				<rom name="15 medal get.vgz" size="2877" crc="bb073521" sha1="0d3c06aec967f3875994a755dea201d6eb8de900" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 rankings.vgz" />
+			<dataarea name="quik" size="2128">
+				<rom name="16 rankings.vgz" size="2128" crc="a50317cf" sha1="f6fbf959da92af2ae64134d49da6798683d066c6" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 super mario bros. for super players title screen.vgz" />
+			<dataarea name="quik" size="3862">
+				<rom name="17 super mario bros. for super players title screen.vgz" size="3862" crc="edb69eea" sha1="037ba75252b5010c58352e89b0ec410c4146d3c1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 credits.vgz" />
+			<dataarea name="quik" size="13790">
+				<rom name="18 credits.vgz" size="13790" crc="c65849b2" sha1="c1a4f62af8fa475b4b6afba621d75e6d93fe7c3c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="019" interface="vgm_quik">
+			<feature name="part_id" value="19 challenge results.vgz" />
+			<dataarea name="quik" size="2028">
+				<rom name="19 challenge results.vgz" size="2028" crc="b88d41de" sha1="36590f701b73a6feb7911f8c2549b994a2efafe1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="020" interface="vgm_quik">
+			<feature name="part_id" value="20 challenge results end.vgz" />
+			<dataarea name="quik" size="1049">
+				<rom name="20 challenge results end.vgz" size="1049" crc="822260dc" sha1="76eec2f1ab67b8e2346707f984dd9f35f3f45539" offset="0" />
+			</dataarea>
+		</part>
+		<part name="021" interface="vgm_quik">
+			<feature name="part_id" value="21 challenge failed.vgz" />
+			<dataarea name="quik" size="645">
+				<rom name="21 challenge failed.vgz" size="645" crc="c38bb496" sha1="1643bab5c1df82154c3d07fc30d2946c6ebe57d8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="022" interface="vgm_quik">
+			<feature name="part_id" value="22 photo album.vgz" />
+			<dataarea name="quik" size="1402">
+				<rom name="22 photo album.vgz" size="1402" crc="6b314b03" sha1="99f31e7c2576648fa3ef8c350fd47d2f079df062" offset="0" />
+			</dataarea>
+		</part>
+		<part name="023" interface="vgm_quik">
+			<feature name="part_id" value="23 fortune teller.vgz" />
+			<dataarea name="quik" size="853">
+				<rom name="23 fortune teller.vgz" size="853" crc="e51e53ed" sha1="d369b5036d8816f99a7c37cd1b3a414b886df5da" offset="0" />
+			</dataarea>
+		</part>
+		<part name="024" interface="vgm_quik">
+			<feature name="part_id" value="24 where's yoshi.vgz" />
+			<dataarea name="quik" size="1763">
+				<rom name="24 where's yoshi.vgz" size="1763" crc="ea8d113e" sha1="f2b1447b2ced9b40e8021952d1c8dd991270e528" offset="0" />
+			</dataarea>
+		</part>
+		<part name="025" interface="vgm_quik">
+			<feature name="part_id" value="25 you vs boo.vgz" />
+			<dataarea name="quik" size="2744">
+				<rom name="25 you vs boo.vgz" size="2744" crc="278c4819" sha1="513d580282ca8c4d1c9c7628b32f29c6213a8214" offset="0" />
+			</dataarea>
+		</part>
+		<part name="026" interface="vgm_quik">
+			<feature name="part_id" value="26 vs race.vgz" />
+			<dataarea name="quik" size="2952">
+				<rom name="26 vs race.vgz" size="2952" crc="a75b256c" sha1="21e3ed249623000f68948b66fbcd462b794392fe" offset="0" />
+			</dataarea>
+		</part>
+		<part name="027" interface="vgm_quik">
+			<feature name="part_id" value="27 lose race.vgz" />
+			<dataarea name="quik" size="1319">
+				<rom name="27 lose race.vgz" size="1319" crc="2830fc5a" sha1="3f4e39c3234041cc4f1c1eac9a43b7d4d9fa3aab" offset="0" />
+			</dataarea>
+		</part>
+		<part name="028" interface="vgm_quik">
+			<feature name="part_id" value="28 tie race.vgz" />
+			<dataarea name="quik" size="668">
+				<rom name="28 tie race.vgz" size="668" crc="4fb331ed" sha1="64626a70c7b0c3cd82815c26061422838aba7e8c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="029" interface="vgm_quik">
+			<feature name="part_id" value="29 win race.vgz" />
+			<dataarea name="quik" size="1412">
+				<rom name="29 win race.vgz" size="1412" crc="ffb2c199" sha1="9db7afd116d740ff9240d36fe94f42acfb49e046" offset="0" />
+			</dataarea>
+		</part>
+		<part name="030" interface="vgm_quik">
+			<feature name="part_id" value="30 running about (hurry!).vgz" />
+			<dataarea name="quik" size="6387">
+				<rom name="30 running about (hurry).vgz" size="6387" crc="acefb865" sha1="7045a7976f18d32eedef977a001eb8aaac11415a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="031" interface="vgm_quik">
+			<feature name="part_id" value="31 underground (hurry).vgz" />
+			<dataarea name="quik" size="1419">
+				<rom name="31 underground (hurry).vgz" size="1419" crc="a13f67a6" sha1="aac65952720b4ab4139869da16c0bde69d202209" offset="0" />
+			</dataarea>
+		</part>
+		<part name="032" interface="vgm_quik">
+			<feature name="part_id" value="32 swimming around (hurry!).vgz" />
+			<dataarea name="quik" size="2735">
+				<rom name="32 swimming around (hurry).vgz" size="2735" crc="f11e495b" sha1="09b86dc8ae8cb5be563339a45c1bbb85a6b8e8b3" offset="0" />
+			</dataarea>
+		</part>
+		<part name="033" interface="vgm_quik">
+			<feature name="part_id" value="33 bowser's castle (hurry!).vgz" />
+			<dataarea name="quik" size="1681">
+				<rom name="33 bowser's castle (hurry).vgz" size="1681" crc="7e402478" sha1="29ecd75bbf67f33b120f4830972ea28f074bbbdb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="034" interface="vgm_quik">
+			<feature name="part_id" value="34 invincible (hurry!).vgz" />
+			<dataarea name="quik" size="1345">
+				<rom name="34 invincible (hurry).vgz" size="1345" crc="0604d1f4" sha1="88a469a9f15a3728160fa4c6c4fae1067df2c4f7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="035" interface="vgm_quik">
+			<feature name="part_id" value="35 into the pipe (hurry!).vgz" />
+			<dataarea name="quik" size="1130">
+				<rom name="35 into the pipe (hurry).vgz" size="1130" crc="819dd160" sha1="5c38318b9f84cdc7e92d8f22076deebc90312236" offset="0" />
+			</dataarea>
+		</part>
+		<part name="036" interface="vgm_quik">
+			<feature name="part_id" value="36 vs race (hurry!).vgz" />
+			<dataarea name="quik" size="3366">
+				<rom name="36 vs race (hurry).vgz" size="3366" crc="933ab0f9" sha1="a15ea1896d5d5330a927f4b91e7cf50ecd5113ca" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="sws95">
+		<description>Super World Stadium '95 (Namco NB-1)</description>
+		<year>1995</year>
+		<publisher>Namco</publisher>
+		<info name="cores" value="C352"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 team select.vgz" />
+			<dataarea name="quik" size="117656">
+				<rom name="01 team select.vgz" size="117656" crc="fe4f27e8" sha1="8a12d9222afce32aa341f817c7bc0207a62bef4f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 play ball.vgz" />
+			<dataarea name="quik" size="61107">
+				<rom name="02 play ball.vgz" size="61107" crc="7ec5b460" sha1="fdcaf60de2be9dfde83e3178bb1caabe3d2d8a77" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 main bgm 1.vgz" />
+			<dataarea name="quik" size="30406">
+				<rom name="03 main bgm 1.vgz" size="30406" crc="0953eca0" sha1="d62e946c5bca506bc29daf31396bf9aa44d58967" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 chance bgm 1.vgz" />
+			<dataarea name="quik" size="11798">
+				<rom name="04 chance bgm 1.vgz" size="11798" crc="b14d8da3" sha1="26782eac342354bfa36dce4b667be7a418222fbb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 home run 1.vgz" />
+			<dataarea name="quik" size="25524">
+				<rom name="05 home run 1.vgz" size="25524" crc="aa58cb06" sha1="f71f2090aa8400a368fdc885125c98535563b7f1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 time bgm 1.vgz" />
+			<dataarea name="quik" size="4138">
+				<rom name="06 time bgm 1.vgz" size="4138" crc="0ff1a0b0" sha1="96d9ef03013f89914ce1c4b42f032e761f5e3c5f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 penalty bgm.vgz" />
+			<dataarea name="quik" size="67467">
+				<rom name="07 penalty bgm.vgz" size="67467" crc="9c49b521" sha1="70b4417c3fcfb8d786617e65a5afc5e741734c5c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 main bgm 2.vgz" />
+			<dataarea name="quik" size="100854">
+				<rom name="08 main bgm 2.vgz" size="100854" crc="de9b26d5" sha1="49bd4d8180844f0477a5318ff3f242ddb90fe544" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 chance bgm 2.vgz" />
+			<dataarea name="quik" size="87495">
+				<rom name="09 chance bgm 2.vgz" size="87495" crc="935dc602" sha1="bcc32491ec6affce895ba9630c50f1e3234742fc" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 home run 2 (intro).vgz" />
+			<dataarea name="quik" size="71023">
+				<rom name="10 home run 2 (intro).vgz" size="71023" crc="dab21ecd" sha1="59700629a6a4f27523867d974f4546f36cd49b65" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 home run 2.vgz" />
+			<dataarea name="quik" size="29664">
+				<rom name="11 home run 2.vgz" size="29664" crc="23a454e2" sha1="099eb1edccb449ba59a28fbc547364c09be2255f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 time bgm 2.vgz" />
+			<dataarea name="quik" size="67599">
+				<rom name="12 time bgm 2.vgz" size="67599" crc="6c6ac2a7" sha1="cd34afa431495701f8a3f517f4bfe62b4d10c81a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 change bgm 1.vgz" />
+			<dataarea name="quik" size="9712">
+				<rom name="13 change bgm 1.vgz" size="9712" crc="ef79baef" sha1="4dbca958a77b37b6547c900cbf25a53b99cb9384" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 change bgm 2.vgz" />
+			<dataarea name="quik" size="9042">
+				<rom name="14 change bgm 2.vgz" size="9042" crc="d08f7e96" sha1="8c470137fba84aa58fcffe34e7397747dfff4bf9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 game set.vgz" />
+			<dataarea name="quik" size="107900">
+				<rom name="15 game set.vgz" size="107900" crc="f79d51f1" sha1="8a351ee9bb68d488b5e0062fcc56ad07ba42d06d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 namco news 1.vgz" />
+			<dataarea name="quik" size="93173">
+				<rom name="16 namco news 1.vgz" size="93173" crc="07f50b0c" sha1="3a00ae49c1fbfa376cbc66d7b5ddba649e3b2a34" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 namco news 2.vgz" />
+			<dataarea name="quik" size="106584">
+				<rom name="17 namco news 2.vgz" size="106584" crc="45b29ca2" sha1="cf4ce0b8f7a2856256d16cfc9dcd23f1a30d6eeb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 unknown 1.vgz" />
+			<dataarea name="quik" size="42371">
+				<rom name="18 unknown 1.vgz" size="42371" crc="b2a441fa" sha1="a7ab91fbb06ec333cf456fc46f656f55b91d8759" offset="0" />
+			</dataarea>
+		</part>
+		<part name="019" interface="vgm_quik">
+			<feature name="part_id" value="19 unknown 2.vgz" />
+			<dataarea name="quik" size="42233">
+				<rom name="19 unknown 2.vgz" size="42233" crc="52f56518" sha1="137f723a4d3e140e41e007c5563bd0e40dc5dc7e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="020" interface="vgm_quik">
+			<feature name="part_id" value="20 hitting march 1.vgz" />
+			<dataarea name="quik" size="20702">
+				<rom name="20 hitting march 1.vgz" size="20702" crc="c72a8e26" sha1="1f9ac9765330a454a47ac86887c88fe798a89eb9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="021" interface="vgm_quik">
+			<feature name="part_id" value="21 hitting march 2.vgz" />
+			<dataarea name="quik" size="23755">
+				<rom name="21 hitting march 2.vgz" size="23755" crc="8faeab11" sha1="b833691ab9f6034ad8b75475c116dd059f509980" offset="0" />
+			</dataarea>
+		</part>
+		<part name="022" interface="vgm_quik">
+			<feature name="part_id" value="22 hitting march 3.vgz" />
+			<dataarea name="quik" size="18596">
+				<rom name="22 hitting march 3.vgz" size="18596" crc="404e0f8e" sha1="46135eb2fc2fd9880615899390aac7ec50af6d15" offset="0" />
+			</dataarea>
+		</part>
+		<part name="023" interface="vgm_quik">
+			<feature name="part_id" value="23 hitting march 4.vgz" />
+			<dataarea name="quik" size="19594">
+				<rom name="23 hitting march 4.vgz" size="19594" crc="5f896ddf" sha1="65a7db68d77a16ddc174ca231fe4ab6a630eb843" offset="0" />
+			</dataarea>
+		</part>
+		<part name="024" interface="vgm_quik">
+			<feature name="part_id" value="24 hitting march 5.vgz" />
+			<dataarea name="quik" size="19602">
+				<rom name="24 hitting march 5.vgz" size="19602" crc="637e6dce" sha1="c5d03b4fba907178e499e0e7bac2344c46f7cbe1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="025" interface="vgm_quik">
+			<feature name="part_id" value="25 hitting march 6.vgz" />
+			<dataarea name="quik" size="18572">
+				<rom name="25 hitting march 6.vgz" size="18572" crc="cc77286a" sha1="c818c823fa80859f60c0bcfc4e8934bac283f4fb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="026" interface="vgm_quik">
+			<feature name="part_id" value="26 hitting march 7.vgz" />
+			<dataarea name="quik" size="19994">
+				<rom name="26 hitting march 7.vgz" size="19994" crc="99c531f3" sha1="0043dd6992fe8a835b08a2fb2b82ca57d26641a4" offset="0" />
+			</dataarea>
+		</part>
+		<part name="027" interface="vgm_quik">
+			<feature name="part_id" value="27 hitting march 8.vgz" />
+			<dataarea name="quik" size="19041">
+				<rom name="27 hitting march 8.vgz" size="19041" crc="16175f01" sha1="58551da87606dbcba8dc745f4347da5f6281fd42" offset="0" />
+			</dataarea>
+		</part>
+		<part name="028" interface="vgm_quik">
+			<feature name="part_id" value="28 hitting march 9.vgz" />
+			<dataarea name="quik" size="20009">
+				<rom name="28 hitting march 9.vgz" size="20009" crc="109ffd53" sha1="8c7a2e8cc5e6e09d7aa8964669d32000302ac591" offset="0" />
+			</dataarea>
+		</part>
+		<part name="029" interface="vgm_quik">
+			<feature name="part_id" value="29 hitting march 10.vgz" />
+			<dataarea name="quik" size="19780">
+				<rom name="29 hitting march 10.vgz" size="19780" crc="75f09d89" sha1="ef02f208434a882660acf5024e87dbadd8b52236" offset="0" />
+			</dataarea>
+		</part>
+		<part name="030" interface="vgm_quik">
+			<feature name="part_id" value="30 hitting march 11.vgz" />
+			<dataarea name="quik" size="19208">
+				<rom name="30 hitting march 11.vgz" size="19208" crc="d4708e46" sha1="e1a6003b65990078830df541e84acb0c5c43f960" offset="0" />
+			</dataarea>
+		</part>
+		<part name="031" interface="vgm_quik">
+			<feature name="part_id" value="31 hitting march 12.vgz" />
+			<dataarea name="quik" size="20658">
+				<rom name="31 hitting march 12.vgz" size="20658" crc="710e6923" sha1="b1f0f613a321d507241920832da48d29d3b8e101" offset="0" />
+			</dataarea>
+		</part>
+		<part name="032" interface="vgm_quik">
+			<feature name="part_id" value="32 hitting march 13.vgz" />
+			<dataarea name="quik" size="19460">
+				<rom name="32 hitting march 13.vgz" size="19460" crc="971a1e97" sha1="23294a1d63f6831a886ddeb23600e6f6ff6b91b0" offset="0" />
+			</dataarea>
+		</part>
+		<part name="033" interface="vgm_quik">
+			<feature name="part_id" value="33 hitting march 14.vgz" />
+			<dataarea name="quik" size="19225">
+				<rom name="33 hitting march 14.vgz" size="19225" crc="ecab2d14" sha1="6fd4976306a07de222829665ab7577d75fd2a117" offset="0" />
+			</dataarea>
+		</part>
+		<part name="034" interface="vgm_quik">
+			<feature name="part_id" value="34 hitting march 15.vgz" />
+			<dataarea name="quik" size="19957">
+				<rom name="34 hitting march 15.vgz" size="19957" crc="e04f377b" sha1="d35eb045d130c6dc24f4083b4a3b97283c3bcea9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="035" interface="vgm_quik">
+			<feature name="part_id" value="35 hitting march 16.vgz" />
+			<dataarea name="quik" size="19443">
+				<rom name="35 hitting march 16.vgz" size="19443" crc="3491f0e2" sha1="3cfd79fdf3188d41443823d8777ee172146bd7a3" offset="0" />
+			</dataarea>
+		</part>
+		<part name="036" interface="vgm_quik">
+			<feature name="part_id" value="36 hitting march 17.vgz" />
+			<dataarea name="quik" size="19528">
+				<rom name="36 hitting march 17.vgz" size="19528" crc="4523cd11" sha1="9d25736b0a93c2f4a5e10df923478602de8f1cd8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="037" interface="vgm_quik">
+			<feature name="part_id" value="37 hitting march 18.vgz" />
+			<dataarea name="quik" size="19917">
+				<rom name="37 hitting march 18.vgz" size="19917" crc="b07cc2e4" sha1="08b6213c67ec3389b53f455700f20adb7ee63437" offset="0" />
+			</dataarea>
+		</part>
+		<part name="038" interface="vgm_quik">
+			<feature name="part_id" value="38 hitting march 19.vgz" />
+			<dataarea name="quik" size="19470">
+				<rom name="38 hitting march 19.vgz" size="19470" crc="a78854e3" sha1="585090e0be7f6d96c8ab888c04bacb9e9f9c7d56" offset="0" />
+			</dataarea>
+		</part>
+		<part name="039" interface="vgm_quik">
+			<feature name="part_id" value="39 hitting march 20.vgz" />
+			<dataarea name="quik" size="19762">
+				<rom name="39 hitting march 20.vgz" size="19762" crc="a150d9fc" sha1="46120142c4dc9e61b5d44d7474570fde59fedc23" offset="0" />
+			</dataarea>
+		</part>
+		<part name="040" interface="vgm_quik">
+			<feature name="part_id" value="40 hitting march 21.vgz" />
+			<dataarea name="quik" size="19538">
+				<rom name="40 hitting march 21.vgz" size="19538" crc="8b700d29" sha1="0466acd05d56010f44ef4f7d7a6981d2b08100e0" offset="0" />
+			</dataarea>
+		</part>
+		<part name="041" interface="vgm_quik">
+			<feature name="part_id" value="41 hitting march 22.vgz" />
+			<dataarea name="quik" size="19646">
+				<rom name="41 hitting march 22.vgz" size="19646" crc="0f387bce" sha1="1be2560d7610ac239e9dbd0c0918431aaf9ead80" offset="0" />
+			</dataarea>
+		</part>
+		<part name="042" interface="vgm_quik">
+			<feature name="part_id" value="42 hitting march 23.vgz" />
+			<dataarea name="quik" size="19436">
+				<rom name="42 hitting march 23.vgz" size="19436" crc="aa6f998b" sha1="cfe4d05d6ba2537c306e2e2e4295407f7695d2d9" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="sws98">
+		<description>Super World Stadium '98 (Namco System 12)</description>
+		<year>1998</year>
+		<publisher>Namco</publisher>
+		<info name="cores" value="C352"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 boot-up.vgz" />
+			<dataarea name="quik" size="66922">
+				<rom name="01 boot-up.vgz" size="66922" crc="a9018520" sha1="923a9bf81731b788c36f97b93513daf0fe9ab9fd" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 team select.vgz" />
+			<dataarea name="quik" size="291441">
+				<rom name="02 team select.vgz" size="291441" crc="fd3e8163" sha1="593a901fc390deb2129b26fb0d0db20f481fc742" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 play ball.vgz" />
+			<dataarea name="quik" size="203033">
+				<rom name="03 play ball.vgz" size="203033" crc="73e4e8ec" sha1="67b5daf87cc02dd52953eba1e4cedfebd97ce018" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 main bgm 1.vgz" />
+			<dataarea name="quik" size="180363">
+				<rom name="04 main bgm 1.vgz" size="180363" crc="6b3306a2" sha1="0d8763118e7f4a0de3ff38d9c0d308a2e555e359" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 chance bgm 1.vgz" />
+			<dataarea name="quik" size="174722">
+				<rom name="05 chance bgm 1.vgz" size="174722" crc="11038b83" sha1="9d2dc1d66e5314a079fb512f1b5b7cbeab333b50" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 time bgm.vgz" />
+			<dataarea name="quik" size="68347">
+				<rom name="06 time bgm.vgz" size="68347" crc="67b79e18" sha1="313007a5f034d656249353073a8f470115f90a68" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 home run.vgz" />
+			<dataarea name="quik" size="57541">
+				<rom name="07 home run.vgz" size="57541" crc="aa5538a3" sha1="f84ab477e60b99532e19aade27eb1ac1737f2185" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 main bgm 2.vgz" />
+			<dataarea name="quik" size="499397">
+				<rom name="08 main bgm 2.vgz" size="499397" crc="a9622961" sha1="f8e18b2e1622d48442233e0d553a1632f4097cad" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 chance bgm 2.vgz" />
+			<dataarea name="quik" size="770761">
+				<rom name="09 chance bgm 2.vgz" size="770761" crc="071f9f8a" sha1="e7f9202e442b1ad4acab09341ad1b9ea9032e2c8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 main bgm 3.vgz" />
+			<dataarea name="quik" size="494494">
+				<rom name="10 main bgm 3.vgz" size="494494" crc="f0eeeb6e" sha1="9cec95826b771f077edbf424fad9b15040a498e8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 unknown 1.vgz" />
+			<dataarea name="quik" size="114328">
+				<rom name="11 unknown 1.vgz" size="114328" crc="ea5a5164" sha1="337f0d0d477be15eada07fabecb4f69de7b5ccf2" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 unknown 2.vgz" />
+			<dataarea name="quik" size="270138">
+				<rom name="12 unknown 2.vgz" size="270138" crc="d136d5cb" sha1="520b319ba6f1746a4b42210abdc501bb0c0c2563" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 unknown 3.vgz" />
+			<dataarea name="quik" size="273483">
+				<rom name="13 unknown 3.vgz" size="273483" crc="99f5359d" sha1="d03e41a503f0639cd000540d79a0621f9142be64" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 unknown 4.vgz" />
+			<dataarea name="quik" size="456495">
+				<rom name="14 unknown 4.vgz" size="456495" crc="deb60172" sha1="f15a96e0a24cd26b0e539ee15797efbe8a5e7095" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 unknown 5.vgz" />
+			<dataarea name="quik" size="603058">
+				<rom name="15 unknown 5.vgz" size="603058" crc="64a4af1b" sha1="4615c517fba845fe2e6e803ea03dbf68b53fb093" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 unknown 6.vgz" />
+			<dataarea name="quik" size="605304">
+				<rom name="16 unknown 6.vgz" size="605304" crc="e09f5364" sha1="50cc95ab231cdcc35e3788fa521b45a4a7c474ef" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="toystory_den">
+		<description>Toy Story (Dendy)</description>
+		<year>1997</year>
+		<publisher>NT</publisher>
+		<info name="cores" value="NES APU (N2A03)"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 you've got a friend in me.vgz" />
+			<dataarea name="quik" size="2131">
+				<rom name="01 you've got a friend in me.vgz" size="2131" crc="bcd2857f" sha1="c58482b08aa1aa57b92fd85e7114c6cccbf55666" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 red alert.vgz" />
+			<dataarea name="quik" size="4878">
+				<rom name="02 red alert.vgz" size="4878" crc="2116caf8" sha1="6897d158eb02ec8b58d366b6bbf69d4066e05d0a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 strange things.vgz" />
+			<dataarea name="quik" size="4943">
+				<rom name="03 strange things.vgz" size="4943" crc="7d20cc56" sha1="ad4b2d3ca0bdcb5fde4aac75d2f72feaebaa3d6d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 that old army game.vgz" />
+			<dataarea name="quik" size="3995">
+				<rom name="04 that old army game.vgz" size="3995" crc="cd3e6d5a" sha1="dbe196102e03d430e947ccc57bea165572224787" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 ego check.vgz" />
+			<dataarea name="quik" size="6175">
+				<rom name="05 ego check.vgz" size="6175" crc="a67a52e8" sha1="69f7fd16f7f6594a848e3bac5d3c93fd050114e8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 stage clear.vgz" />
+			<dataarea name="quik" size="690">
+				<rom name="06 stage clear.vgz" size="690" crc="76aad343" sha1="a200ebd713b9abd4b150c61de2091ccd6b1ca016" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+
+<!-- Project 2612 VGM Archives located at http://project2612.org/list.php
+     Also https://archive.org/details/Project2612CompleteArchive20180623681Sets.7z -->
+
+	<software name="16ton_md">
+		<description>16t (GEN/MD)</description>
+		<year>1991</year>
+		<publisher>Sega</publisher>
+		<info name="cores" value="SN76496, YM2612"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 - title theme.vgz" />
+			<dataarea name="quik" size="25827">
+				<rom name="01 - title theme.vgz" size="25827" crc="f661ace1" sha1="a176292db1b41a7bba6dee0db5923b68a74aa063" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 - bgm 1.vgz" />
+			<dataarea name="quik" size="4350">
+				<rom name="02 - bgm 1.vgz" size="4350" crc="074c2308" sha1="398bcbb89cfa47b100b836753e156350ff50a5f0" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 - bgm 2.vgz" />
+			<dataarea name="quik" size="28697">
+				<rom name="03 - bgm 2.vgz" size="28697" crc="8cca5a7e" sha1="f6fd304e9be237a189cca8318bf5c5d3e0da7988" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 - round clear.vgz" />
+			<dataarea name="quik" size="1078">
+				<rom name="04 - round clear.vgz" size="1078" crc="e484d664" sha1="fd6f5440fb0e26670915b73472717670fb4ad350" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 - staff roll.vgz" />
+			<dataarea name="quik" size="1991">
+				<rom name="05 - staff roll.vgz" size="1991" crc="f619d925" sha1="0daafb5f358212ff15feb079714afbcc7d11ef15" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 - game over.vgz" />
+			<dataarea name="quik" size="1085">
+				<rom name="06 - game over.vgz" size="1085" crc="24b1f77f" sha1="28b0ea227717c251e1c4020ce165d53b672a1de4" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="2048_16_md">
+		<description>2048~16 (GEN/MD)</description>
+		<year>2014</year>
+		<publisher>Titan</publisher>
+		<info name="cores" value="SN76496, YM2612"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 - main theme.vgz" />
+			<dataarea name="quik" size="245170">
+				<rom name="01 - main theme.vgz" size="245170" crc="a1b5dbf7" sha1="5d8c7e1eb0edd23c54a9ea0e53c69b33522d6e18" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="3ninja_md">
+		<description>3 Ninjas Kick Back (GEN/MD)</description>
+		<year>1994</year>
+		<publisher>Malibu Entertainment</publisher>
+		<info name="cores" value="YM2612"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01.vgz" />
+			<dataarea name="quik" size="10009">
+				<rom name="01.vgz" size="10009" crc="d4281e9f" sha1="365c6f061d4132b1a16643ebc6033d6142d6419a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02.vgz" />
+			<dataarea name="quik" size="6823">
+				<rom name="02.vgz" size="6823" crc="75be8c7f" sha1="9ba5e8032508aee6efb956386bd2856206669fc1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03.vgz" />
+			<dataarea name="quik" size="5854">
+				<rom name="03.vgz" size="5854" crc="bd7856c7" sha1="be60ca57c2ccec7295eeec68fe90715fb9b59e33" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04.vgz" />
+			<dataarea name="quik" size="10393">
+				<rom name="04.vgz" size="10393" crc="90df678d" sha1="463d16e21002b7e689a99fd851b6a930ff190f0b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05.vgz" />
+			<dataarea name="quik" size="2292">
+				<rom name="05.vgz" size="2292" crc="ac9fb5c6" sha1="3b3b390f2bc82b4cc37dc2ede3cfb35f51facc62" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06.vgz" />
+			<dataarea name="quik" size="9055">
+				<rom name="06.vgz" size="9055" crc="d64a179a" sha1="0a9c928cda414ba1157783001199c793544e831a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07.vgz" />
+			<dataarea name="quik" size="6578">
+				<rom name="07.vgz" size="6578" crc="63899fc3" sha1="67e36b6fcd9c3c7dbe259f6dc0612f4b83d13a16" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08.vgz" />
+			<dataarea name="quik" size="8210">
+				<rom name="08.vgz" size="8210" crc="037f772e" sha1="159da115172a19c2361a7ac1e8c48ada86b78f21" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09.vgz" />
+			<dataarea name="quik" size="20132">
+				<rom name="09.vgz" size="20132" crc="45b73eac" sha1="affc59f1de6ee59a2c92cb7b9892219fbde2642a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10.vgz" />
+			<dataarea name="quik" size="5066">
+				<rom name="10.vgz" size="5066" crc="71406daa" sha1="28da9bc6699d2885cd9baa2a3143042cd1a4fa64" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11.vgz" />
+			<dataarea name="quik" size="4838">
+				<rom name="11.vgz" size="4838" crc="e4db4f42" sha1="1f18990f75081fbe8e4707ac3cc512c9b5b77fb8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12.vgz" />
+			<dataarea name="quik" size="11181">
+				<rom name="12.vgz" size="11181" crc="65057af8" sha1="6ca6c8b6b5a16d1f46898d4d3bcc77ba9715a567" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13.vgz" />
+			<dataarea name="quik" size="5960">
+				<rom name="13.vgz" size="5960" crc="62c45d67" sha1="dca6eb6fc60e14a85c94fe48d0ec7cb7eecc27b1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14.vgz" />
+			<dataarea name="quik" size="4594">
+				<rom name="14.vgz" size="4594" crc="f4cd2c77" sha1="525e7aa35e23f1f3236b1627f3a7a04226f2bbf5" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15.vgz" />
+			<dataarea name="quik" size="6002">
+				<rom name="15.vgz" size="6002" crc="498f0281" sha1="8d0ac61219f10cf86d8770d12b8db7f8a36be15c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16.vgz" />
+			<dataarea name="quik" size="5810">
+				<rom name="16.vgz" size="5810" crc="83b22ebf" sha1="8a7da10be0b7684a1d3943d2d10ce3ce819d8ed9" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="32xpwm_md">
+		<description>32X PWM Test (GEN/MD)</description>
+		<year>2014</year>
+		<publisher>Sega</publisher>
+		<info name="cores" value="SEGA32X"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 - the imperial march.vgz" />
+			<dataarea name="quik" size="275989">
+				<rom name="01 - the imperial march.vgz" size="275989" crc="a6b3e2f6" sha1="5e1b7fe776ceff593775b3ca946f74d7f1919d1f" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="bugslife_md">
+		<description>A Bug's Life (GEN/MD)</description>
+		<year>199?</year>
+		<publisher>unknown</publisher>
+		<info name="cores" value="YM2612"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 - title.vgz" />
+			<dataarea name="quik" size="8703">
+				<rom name="01 - title.vgz" size="8703" crc="5b2795dd" sha1="68b1c8099d08286df748e5c8ff9750259ebd8af7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 - ant island.vgz" />
+			<dataarea name="quik" size="2889">
+				<rom name="02 - ant island.vgz" size="2889" crc="6bcfa284" sha1="04cc8579486890d62220a3bd74088a124796da9a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 - find the hero.vgz" />
+			<dataarea name="quik" size="2525">
+				<rom name="03 - find the hero.vgz" size="2525" crc="81b7db23" sha1="f138121f9163508e461a1e8815413da3b9f17127" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 - in the dark hole.vgz" />
+			<dataarea name="quik" size="20517">
+				<rom name="04 - in the dark hole.vgz" size="20517" crc="aeaec953" sha1="150df95310ef2c07378fb72978fa035d7baa8e57" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 - hang by a thread.vgz" />
+			<dataarea name="quik" size="16254">
+				<rom name="05 - hang by a thread.vgz" size="16254" crc="ad00d257" sha1="23372d369662ef386a560db666ce88f7c45fc783" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="aressha_md">
+		<description>A Ressha de Ikou MD (GEN/MD)</description>
+		<year>1992</year>
+		<publisher>Artdink / Sega</publisher>
+		<info name="cores" value="SN76496, YM2612"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01.vgz" />
+			<dataarea name="quik" size="3268">
+				<rom name="01.vgz" size="3268" crc="257e5021" sha1="6909ed59d3a2b56f9fb61af06bdcf9274160cb10" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02.vgz" />
+			<dataarea name="quik" size="4446">
+				<rom name="02.vgz" size="4446" crc="70d631bd" sha1="df078230af4b78541eae8520333b179af58845e6" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03.vgz" />
+			<dataarea name="quik" size="8460">
+				<rom name="03.vgz" size="8460" crc="f683ac39" sha1="ea9edd48f601559fa109d1748b33ffeb11788001" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04.vgz" />
+			<dataarea name="quik" size="7004">
+				<rom name="04.vgz" size="7004" crc="a5c6ec39" sha1="6f7f362e55b29cca76af268f4f61f14169a63031" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05.vgz" />
+			<dataarea name="quik" size="3393">
+				<rom name="05.vgz" size="3393" crc="8f7af832" sha1="2ec2a880e6f1132c0119ec8164e6b00f7de1745f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06.vgz" />
+			<dataarea name="quik" size="3702">
+				<rom name="06.vgz" size="3702" crc="2a68c2e8" sha1="ef811d05ac33c595d1a6ede663ad9ae09d0dfc58" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07.vgz" />
+			<dataarea name="quik" size="5299">
+				<rom name="07.vgz" size="5299" crc="c42bf325" sha1="a51e9435c47139e609e1fa706916d3a0296602a6" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08.vgz" />
+			<dataarea name="quik" size="3166">
+				<rom name="08.vgz" size="3166" crc="14375068" sha1="edcb4aa32a8065566327925518c77bfd0b373c10" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09.vgz" />
+			<dataarea name="quik" size="3250">
+				<rom name="09.vgz" size="3250" crc="c405c110" sha1="13834793bf4a83afa9d8f63aa1695732ac7c01fb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10.vgz" />
+			<dataarea name="quik" size="3336">
+				<rom name="10.vgz" size="3336" crc="2d60724b" sha1="6d70b33b7eca84b789cc9aefcf1e4182188f841d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11.vgz" />
+			<dataarea name="quik" size="5834">
+				<rom name="11.vgz" size="5834" crc="38b337b9" sha1="e4328c50768f52cf7f7c8f12ba0ef16daacdbc6f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12.vgz" />
+			<dataarea name="quik" size="3972">
+				<rom name="12.vgz" size="3972" crc="79b669b1" sha1="c7411fbf0f5aa3bc724ace48589481f07dc39fd6" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="aaharima_md">
+		<description>Aa Harimanada (GEN/MD)</description>
+		<year>1993</year>
+		<publisher>Sega</publisher>
+		<info name="cores" value="SN76496, YM2612"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 - legend of strength.vgz" />
+			<dataarea name="quik" size="20593">
+				<rom name="01 - legend of strength.vgz" size="20593" crc="e29718c9" sha1="6526b134ae88104dbc22a897a3707b4c475038a1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 - invincible proclamation, aa harimanada.vgz" />
+			<dataarea name="quik" size="56190">
+				<rom name="02 - invincible proclamation, aa harimanada.vgz" size="56190" crc="53e14320" sha1="b71d8fa76e533dd0de13ca6cf8c06956a73fdbe8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 - fierce god of flame.vgz" />
+			<dataarea name="quik" size="24231">
+				<rom name="03 - fierce god of flame.vgz" size="24231" crc="eddef57e" sha1="9d1fa302089a3af05dc140895f39ad01658cc598" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 - a rush of blood!.vgz" />
+			<dataarea name="quik" size="17553">
+				<rom name="04 - a rush of blood.vgz" size="17553" crc="d147b97d" sha1="845127eaeaa77fc7160ecbf225a2fb735a1afd83" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 - midnight visitor.vgz" />
+			<dataarea name="quik" size="19442">
+				<rom name="05 - midnight visitor.vgz" size="19442" crc="fc67c337" sha1="a017e528c9999af12d8a18d108a3610de1560b8e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 - master's elegy.vgz" />
+			<dataarea name="quik" size="19380">
+				<rom name="06 - master's elegy.vgz" size="19380" crc="167fd66b" sha1="b5ed932ab93fb460e765ef9ea35c78a8a2480b60" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 - burning sumo hall.vgz" />
+			<dataarea name="quik" size="25830">
+				<rom name="07 - burning sumo hall.vgz" size="25830" crc="09ff35c2" sha1="0ee6c89a600b759da44c1aa168001d41a6050370" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 - decisive battle! demon's arena.vgz" />
+			<dataarea name="quik" size="35077">
+				<rom name="08 - decisive battle demon's arena.vgz" size="35077" crc="06e63611" sha1="5f5e9a6d56ec6a1d1aa4ff76d0715195a031b083" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 - insane god!!.vgz" />
+			<dataarea name="quik" size="33685">
+				<rom name="09 - insane god.vgz" size="33685" crc="2d45b6b2" sha1="87577d73a36e373add8e3b622fb45296586f2c3a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 - dream of the finish.vgz" />
+			<dataarea name="quik" size="37498">
+				<rom name="10 - dream of the finish.vgz" size="37498" crc="557cb618" sha1="ecc94aef7061eed9a180fc5d3f59f7e499252ed1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 - funeral song of two nations.vgz" />
+			<dataarea name="quik" size="24544">
+				<rom name="11 - funeral song of two nations.vgz" size="24544" crc="a827b02e" sha1="7e58c6801807ddfcf47ac2d1433e741e50bc73be" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 - meeting of assassins!.vgz" />
+			<dataarea name="quik" size="14501">
+				<rom name="12 - meeting of assassins.vgz" size="14501" crc="5588438f" sha1="76cd0f7156e66203b35f795402429e7a7d927100" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 - harima hyakunin isshu.vgz" />
+			<dataarea name="quik" size="14842">
+				<rom name="13 - harima hyakunin isshu.vgz" size="14842" crc="59d4e68f" sha1="0342bcd275362da4e2273b4dd540a7ae8d004e09" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 - sumo devotion.vgz" />
+			<dataarea name="quik" size="59364">
+				<rom name="14 - sumo devotion.vgz" size="59364" crc="278312a5" sha1="f7482c18545fbca1f6aff4b8c048d7d727951dd4" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 - the end!.vgz" />
+			<dataarea name="quik" size="11428">
+				<rom name="15 - the end.vgz" size="11428" crc="d3394bae" sha1="24d28474b0ba15113bd73907d7175cda3d66000b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 - the first harima exercises.vgz" />
+			<dataarea name="quik" size="1759">
+				<rom name="16 - the first harima exercises.vgz" size="1759" crc="3647d87f" sha1="511199db3b5c699c6f604e712bcdf8f1bcae7e2e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 - sumo dance music.vgz" />
+			<dataarea name="quik" size="60098">
+				<rom name="17 - sumo dance music.vgz" size="60098" crc="affba46f" sha1="eaf9089ab6d543f5cb5acd28897ec706f0f7efdf" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 - tempest arena.vgz" />
+			<dataarea name="quik" size="45474">
+				<rom name="18 - tempest arena.vgz" size="45474" crc="9f86113a" sha1="f00c272978cd332b4f37e8812055c34ae7727eea" offset="0" />
+			</dataarea>
+		</part>
+		<part name="019" interface="vgm_quik">
+			<feature name="part_id" value="19 - sandstorm gale.vgz" />
+			<dataarea name="quik" size="47752">
+				<rom name="19 - sandstorm gale.vgz" size="47752" crc="948c441d" sha1="cc8aa0026e27a8f8ef1cdc2e83764b26d456b03d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="020" interface="vgm_quik">
+			<feature name="part_id" value="20 - gachinko jinsei.vgz" />
+			<dataarea name="quik" size="35836">
+				<rom name="20 - gachinko jinsei.vgz" size="35836" crc="a775f688" sha1="6492f7eb0e16c0c384105555d466c2676ac6111f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="021" interface="vgm_quik">
+			<feature name="part_id" value="21 - destruction by size.vgz" />
+			<dataarea name="quik" size="48911">
+				<rom name="21 - destruction by size.vgz" size="48911" crc="c46869c7" sha1="071d2564a0d7c07f8894f82d2997a126aeff5438" offset="0" />
+			</dataarea>
+		</part>
+		<part name="022" interface="vgm_quik">
+			<feature name="part_id" value="22 - hiramaku rock.vgz" />
+			<dataarea name="quik" size="44159">
+				<rom name="22 - hiramaku rock.vgz" size="44159" crc="eac0a4b9" sha1="0dc03636cda81d503e6504e8af318da124dcdcc3" offset="0" />
+			</dataarea>
+		</part>
+		<part name="023" interface="vgm_quik">
+			<feature name="part_id" value="23 - elephant of the southern sea.vgz" />
+			<dataarea name="quik" size="49393">
+				<rom name="23 - elephant of the southern sea.vgz" size="49393" crc="4cc9b683" sha1="de2a6f9f3652cef0ef706be7975682e1cad4758e" offset="0" />
+			</dataarea>
+		</part>
+		<part name="024" interface="vgm_quik">
+			<feature name="part_id" value="24 - throw of justice.vgz" />
+			<dataarea name="quik" size="38382">
+				<rom name="24 - throw of justice.vgz" size="38382" crc="8fabe89b" sha1="8ed8b0e4d1101ad4838ede02ed9f013bc475c876" offset="0" />
+			</dataarea>
+		</part>
+		<part name="025" interface="vgm_quik">
+			<feature name="part_id" value="25 - young noble's slap.vgz" />
+			<dataarea name="quik" size="39135">
+				<rom name="25 - young noble's slap.vgz" size="39135" crc="6b1b11f8" sha1="2ecea724e951dd94c13d1b18d722e33dea0e41e9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="026" interface="vgm_quik">
+			<feature name="part_id" value="26 - northern hooligan.vgz" />
+			<dataarea name="quik" size="24233">
+				<rom name="26 - northern hooligan.vgz" size="24233" crc="948b7fdc" sha1="a9b74e7c09a8dd05c19e0bb88302220588f9b7e7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="027" interface="vgm_quik">
+			<feature name="part_id" value="27 - lucky adventurer of heaven.vgz" />
+			<dataarea name="quik" size="41274">
+				<rom name="27 - lucky adventurer of heaven.vgz" size="41274" crc="59f5f126" sha1="1e571f1b9a09cb0925e8c61a82e898374f39b174" offset="0" />
+			</dataarea>
+		</part>
+		<part name="028" interface="vgm_quik">
+			<feature name="part_id" value="28 - explosive sumo, the decisive match!.vgz" />
+			<dataarea name="quik" size="40574">
+				<rom name="28 - explosive sumo, the decisive match.vgz" size="40574" crc="41bfc97f" sha1="b0cd6661ebb8c103d17ba3e3d6fa3ab71866af34" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="aaahhrm_md">
+		<description>AAAHH!!! Real Monsters (GEN/MD)</description>
+		<year>1995</year>
+		<publisher>Viacom New Media</publisher>
+		<info name="cores" value="SN76496, YM2612"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 - title, score.vgz" />
+			<dataarea name="quik" size="7405">
+				<rom name="01 - title, score.vgz" size="7405" crc="735bfe63" sha1="30b05a4e2e1f79ada1838377cc282d8c5ee12877" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 - dump 1, dump 5, post office 1.vgz" />
+			<dataarea name="quik" size="25595">
+				<rom name="02 - dump 1, dump 5, post office 1.vgz" size="25595" crc="b8773af6" sha1="428f3253455cdf97d65a847dc7aedd5f6d30637b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 - dump 2.vgz" />
+			<dataarea name="quik" size="56180">
+				<rom name="03 - dump 2.vgz" size="56180" crc="1432bbb4" sha1="4f162a9e92bff14c1e067e9fc44739834617a137" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 - dump 3, post office 2.vgz" />
+			<dataarea name="quik" size="61922">
+				<rom name="04 - dump 3, post office 2.vgz" size="61922" crc="345f0333" sha1="fc475802949a87161606e5f0433c5ceb1266b0ed" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 - dump 4.vgz" />
+			<dataarea name="quik" size="31203">
+				<rom name="05 - dump 4.vgz" size="31203" crc="ebd80943" sha1="76ba173f699d3d1e7afd75d80cd3acba5e85efd9" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 - dump 6, hunter 1, dino 2.vgz" />
+			<dataarea name="quik" size="21044">
+				<rom name="06 - dump 6, hunter 1, dino 2.vgz" size="21044" crc="86384816" sha1="a8d69122929b7dbd7d383c19ba172299b1165c7c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 - dump 7.vgz" />
+			<dataarea name="quik" size="77068">
+				<rom name="07 - dump 7.vgz" size="77068" crc="5e31fed8" sha1="b7c762a6793538ee4e02c07dc4b8bd03c2cfdf57" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 - post office 3, dump bonus 1.vgz" />
+			<dataarea name="quik" size="110035">
+				<rom name="08 - post office 3, dump bonus 1.vgz" size="110035" crc="ebedf425" sha1="052b59ac9415e7939c72b404ab20077f6ee0a846" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 - mall 1, credits.vgz" />
+			<dataarea name="quik" size="59352">
+				<rom name="09 - mall 1, credits.vgz" size="59352" crc="e979fae0" sha1="85b036c3078af21323aaf69e9331c1d4145a0f24" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 - continue, assignment.vgz" />
+			<dataarea name="quik" size="7123">
+				<rom name="10 - continue, assignment.vgz" size="7123" crc="d381facb" sha1="63494c913a456ffe7e8d13bf0638c521621420cf" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 - hunter 2, dino 1.vgz" />
+			<dataarea name="quik" size="40969">
+				<rom name="11 - hunter 2, dino 1.vgz" size="40969" crc="11548576" sha1="f59c8dab6ce4ecea7137846bc04b250f32eef2be" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 - gym 1, school 1.vgz" />
+			<dataarea name="quik" size="37175">
+				<rom name="12 - gym 1, school 1.vgz" size="37175" crc="d386f88f" sha1="9064f4559f1cad34c7eda37ac32a1265a850000d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 - options.vgz" />
+			<dataarea name="quik" size="2941">
+				<rom name="13 - options.vgz" size="2941" crc="1d23f075" sha1="62349bf296b8601387d08575001f29d2756f2a03" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 - googleplex, post boss.vgz" />
+			<dataarea name="quik" size="58354">
+				<rom name="14 - googleplex, post boss.vgz" size="58354" crc="a9b7248c" sha1="ed8efb451869da7f83f91cd179eda348e8c8ef95" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 - diploma.vgz" />
+			<dataarea name="quik" size="5268">
+				<rom name="15 - diploma.vgz" size="5268" crc="b72d0a2a" sha1="15378181ade0e1fcac0c17961de7124f4787630d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 - win.vgz" />
+			<dataarea name="quik" size="15630">
+				<rom name="16 - win.vgz" size="15630" crc="4bbc8ee9" sha1="105ae486322f0604da1c052bf32790ad5655d6ef" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 - unknown 1.vgz" />
+			<dataarea name="quik" size="65020">
+				<rom name="17 - unknown 1.vgz" size="65020" crc="a5319c16" sha1="2379eab8f63a5d520f4b66e3bc088b0291287c4a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 - unknown 2.vgz" />
+			<dataarea name="quik" size="7329">
+				<rom name="18 - unknown 2.vgz" size="7329" crc="577aa74e" sha1="a464fddd0b2df0ba835c9135e3369a91d75b786d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="019" interface="vgm_quik">
+			<feature name="part_id" value="19 - unknown 3.vgz" />
+			<dataarea name="quik" size="4594">
+				<rom name="19 - unknown 3.vgz" size="4594" crc="53ddb555" sha1="11e1c2ee99f1a1e132d88aefd61113afaacafa6a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="020" interface="vgm_quik">
+			<feature name="part_id" value="20 - unknown 4.vgz" />
+			<dataarea name="quik" size="4751">
+				<rom name="20 - unknown 4.vgz" size="4751" crc="66f6f61b" sha1="2e53d722ac8831b2a30eddc19e36a62c195e889f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="021" interface="vgm_quik">
+			<feature name="part_id" value="21 - unknown 5.vgz" />
+			<dataarea name="quik" size="9302">
+				<rom name="21 - unknown 5.vgz" size="9302" crc="1eda6daf" sha1="47db9b72ae575a679eadb1c4456b80ce9d572cca" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="action52_md">
+		<description>Action 52 (GEN/MD)</description>
+		<year>1993</year>
+		<publisher>Active Enterprises / FarSight Technologies</publisher>
+		<info name="cores" value="SN76496, YM2612"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 - title theme.vgz" />
+			<dataarea name="quik" size="7410">
+				<rom name="01 - title theme.vgz" size="7410" crc="41f496fe" sha1="1bc058aac2b32e893c9383bf590b3b2c2cda6775" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 - game selection.vgz" />
+			<dataarea name="quik" size="17611">
+				<rom name="02 - game selection.vgz" size="17611" crc="103bd69a" sha1="2fcd41e1572403d61d951d73367052223129df47" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 - go bonkers (1), alfredo (2).vgz" />
+			<dataarea name="quik" size="20381">
+				<rom name="03 - go bonkers (1), alfredo (2).vgz" size="20381" crc="874c6efe" sha1="21e1e664858afbeb59b42648ab6af60b05db0dd1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 - go bonkers (2), ooze (1).vgz" />
+			<dataarea name="quik" size="34742">
+				<rom name="04 - go bonkers (2), ooze (1).vgz" size="34742" crc="ce986905" sha1="7b5adb26fdf65f3a926c4ff8e987781a85abd16d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 - darksyne (1), haunted hills (2).vgz" />
+			<dataarea name="quik" size="54641">
+				<rom name="05 - darksyne (1), haunted hills (2).vgz" size="54641" crc="f36e152c" sha1="61da7d7df63e882631114996e8de261c06ba5465" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 - darksyne (2), haunted hills (1).vgz" />
+			<dataarea name="quik" size="17082">
+				<rom name="06 - darksyne (2), haunted hills (1).vgz" size="17082" crc="782ebf06" sha1="e5a6f0b10c822db465e8805470b16a99a70ac9e7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 - dyno tennis (1), mousetrap (2).vgz" />
+			<dataarea name="quik" size="5829">
+				<rom name="07 - dyno tennis (1), mousetrap (2).vgz" size="5829" crc="32f5aa6d" sha1="e623c3f2f9a12754552839b171a5d1d76a052954" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 - dyno tennis (2), shootout (1).vgz" />
+			<dataarea name="quik" size="6429">
+				<rom name="08 - dyno tennis (2), shootout (1).vgz" size="6429" crc="1d32754b" sha1="431f59157eddc420b95319443f5ae7ccc67aa134" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 - ooze (2), daytona, alfredo (1).vgz" />
+			<dataarea name="quik" size="33091">
+				<rom name="09 - ooze (2), daytona, alfredo (1).vgz" size="33091" crc="6f35eb96" sha1="fee0cf673178186f993941f39ed37c73057e5b2c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 - star ball, force one (2).vgz" />
+			<dataarea name="quik" size="25207">
+				<rom name="10 - star ball, force one (2).vgz" size="25207" crc="83b17133" sha1="99653189cc08031cf53a0f3eb5b0d8ab5d404ae7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 - sidewinder (1), air command (2), challenge.vgz" />
+			<dataarea name="quik" size="37442">
+				<rom name="11 - sidewinder (1), air command (2), challenge.vgz" size="37442" crc="00906d48" sha1="1505cb7c92d4206ca88c52b4a96275fe226062f8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 - sidewinder (2), alien attack (1).vgz" />
+			<dataarea name="quik" size="59361">
+				<rom name="12 - sidewinder (2), alien attack (1).vgz" size="59361" crc="194c021a" sha1="1d8f0ca1ab217f21498ea4baf1a472e2885eb531" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 - 15 puzzle (1), dedant (1).vgz" />
+			<dataarea name="quik" size="10795">
+				<rom name="13 - 15 puzzle (1), dedant (1).vgz" size="10795" crc="6860c9a9" sha1="d49af1349e711286ff80aa6d4583c7897a4f6f58" offset="0" />
+			</dataarea>
+		</part>
+		<part name="014" interface="vgm_quik">
+			<feature name="part_id" value="14 - 15 puzzle (2), spidey (1).vgz" />
+			<dataarea name="quik" size="14926">
+				<rom name="14 - 15 puzzle (2), spidey (1).vgz" size="14926" crc="efb46439" sha1="4aab4d1b4b6a4c9a3e67342e94c0aac364bc81ff" offset="0" />
+			</dataarea>
+		</part>
+		<part name="015" interface="vgm_quik">
+			<feature name="part_id" value="15 - sketch.vgz" />
+			<dataarea name="quik" size="14398">
+				<rom name="15 - sketch.vgz" size="14398" crc="4bd493da" sha1="20b07f57197567545d374977b691aa5bf527af75" offset="0" />
+			</dataarea>
+		</part>
+		<part name="016" interface="vgm_quik">
+			<feature name="part_id" value="16 - star duel (1), depth charge (2).vgz" />
+			<dataarea name="quik" size="14144">
+				<rom name="16 - star duel (1), depth charge (2).vgz" size="14144" crc="9f03e073" sha1="135f59fcae02f176e2cd5ed862ed00513d0c46ed" offset="0" />
+			</dataarea>
+		</part>
+		<part name="017" interface="vgm_quik">
+			<feature name="part_id" value="17 - star duel (2), slalom (1).vgz" />
+			<dataarea name="quik" size="2944">
+				<rom name="17 - star duel (2), slalom (1).vgz" size="2944" crc="e06d2c41" sha1="b25a6c7e5b61ae44872e0955ccb50e9d195e00f4" offset="0" />
+			</dataarea>
+		</part>
+		<part name="018" interface="vgm_quik">
+			<feature name="part_id" value="18 - cheetahmen (1), minds eye (2).vgz" />
+			<dataarea name="quik" size="20305">
+				<rom name="18 - cheetahmen (1), minds eye (2).vgz" size="20305" crc="730a559e" sha1="2634d59580cdfa14e4015fcc7e9f3e9ffddf18c8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="019" interface="vgm_quik">
+			<feature name="part_id" value="19 - cheetahmen (2), billy bob (1).vgz" />
+			<dataarea name="quik" size="46651">
+				<rom name="19 - cheetahmen (2), billy bob (1).vgz" size="46651" crc="5df54f6c" sha1="72b3d2f050e5f62942b73d7601123cf78bbbf804" offset="0" />
+			</dataarea>
+		</part>
+		<part name="020" interface="vgm_quik">
+			<feature name="part_id" value="20 - skirmish, billy bob (2).vgz" />
+			<dataarea name="quik" size="76610">
+				<rom name="20 - skirmish, billy bob (2).vgz" size="76610" crc="124544a5" sha1="133c849ddfa9e3f9843f69a208614b184f16f1de" offset="0" />
+			</dataarea>
+		</part>
+		<part name="021" interface="vgm_quik">
+			<feature name="part_id" value="21 - depth charge (1), paratrooper (2).vgz" />
+			<dataarea name="quik" size="20333">
+				<rom name="21 - depth charge (1), paratrooper (2).vgz" size="20333" crc="94336fc0" sha1="bf55be20d5d0bc174982b2ebd96d2f7e6593c5db" offset="0" />
+			</dataarea>
+		</part>
+		<part name="022" interface="vgm_quik">
+			<feature name="part_id" value="22 - minds eye (1), alien attack (2).vgz" />
+			<dataarea name="quik" size="38323">
+				<rom name="22 - minds eye (1), alien attack (2).vgz" size="38323" crc="9386506d" sha1="bc9d794a5ba91aa0adaa9b06a91e8f0c9965e1de" offset="0" />
+			</dataarea>
+		</part>
+		<part name="023" interface="vgm_quik">
+			<feature name="part_id" value="23 - sharks (1), evil star (2).vgz" />
+			<dataarea name="quik" size="8992">
+				<rom name="23 - sharks (1), evil star (2).vgz" size="8992" crc="d63854ab" sha1="47c331161e50e845961f9f54df88d8337aed58a3" offset="0" />
+			</dataarea>
+		</part>
+		<part name="024" interface="vgm_quik">
+			<feature name="part_id" value="24 - sharks (2), sunday drive (1).vgz" />
+			<dataarea name="quik" size="14646">
+				<rom name="24 - sharks (2), sunday drive (1).vgz" size="14646" crc="770fdee0" sha1="54027cf54fa5926778b1cd168854335b9bcfb154" offset="0" />
+			</dataarea>
+		</part>
+		<part name="025" interface="vgm_quik">
+			<feature name="part_id" value="25 - knockout (1), ninja (2).vgz" />
+			<dataarea name="quik" size="15567">
+				<rom name="25 - knockout (1), ninja (2).vgz" size="15567" crc="9c64d8d4" sha1="c2310ae3c928a09ba4ece24b913549b25aec2c9c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="026" interface="vgm_quik">
+			<feature name="part_id" value="26 - knockout (2), ninja (1).vgz" />
+			<dataarea name="quik" size="18926">
+				<rom name="26 - knockout (2), ninja (1).vgz" size="18926" crc="75ffa881" sha1="bf78ec657e0ee223e393086a1f56b0d8a00cd9ba" offset="0" />
+			</dataarea>
+		</part>
+		<part name="027" interface="vgm_quik">
+			<feature name="part_id" value="27 - intruder (1), skater (2).vgz" />
+			<dataarea name="quik" size="3166">
+				<rom name="27 - intruder (1), skater (2).vgz" size="3166" crc="e90e5ba8" sha1="e92f7b1c21194a4628b4ec7c335f94c98a7a7240" offset="0" />
+			</dataarea>
+		</part>
+		<part name="028" interface="vgm_quik">
+			<feature name="part_id" value="28 - intruder (2), g fighter (1).vgz" />
+			<dataarea name="quik" size="5928">
+				<rom name="28 - intruder (2), g fighter (1).vgz" size="5928" crc="b0e9c323" sha1="db31fcfd12cdc82e8ceb8489e2c5dd45b2b0ef10" offset="0" />
+			</dataarea>
+		</part>
+		<part name="029" interface="vgm_quik">
+			<feature name="part_id" value="29 - freeway (1), appleseed (2).vgz" />
+			<dataarea name="quik" size="11221">
+				<rom name="29 - freeway (1), appleseed (2).vgz" size="11221" crc="1f77b8ad" sha1="e78d3aef9a9229b727d19e1b76a1622387103394" offset="0" />
+			</dataarea>
+		</part>
+		<part name="030" interface="vgm_quik">
+			<feature name="part_id" value="30 - freeway (2), appleseed (1).vgz" />
+			<dataarea name="quik" size="7596">
+				<rom name="30 - freeway (2), appleseed (1).vgz" size="7596" crc="26886e06" sha1="27cb891271dc3da2aca00db7e946d32240895b46" offset="0" />
+			</dataarea>
+		</part>
+		<part name="031" interface="vgm_quik">
+			<feature name="part_id" value="31 - mousetrap (1), speedboat (2).vgz" />
+			<dataarea name="quik" size="3276">
+				<rom name="31 - mousetrap (1), speedboat (2).vgz" size="3276" crc="d73ce09a" sha1="0bf7335baa428529f5ba87ec0b69449c99e987b1" offset="0" />
+			</dataarea>
+		</part>
+		<part name="032" interface="vgm_quik">
+			<feature name="part_id" value="32 - slalom (2).vgz" />
+			<dataarea name="quik" size="4336">
+				<rom name="32 - slalom (2).vgz" size="4336" crc="4289dcfe" sha1="541bbaecd1be3be2dae16113bcace70eeda82c93" offset="0" />
+			</dataarea>
+		</part>
+		<part name="033" interface="vgm_quik">
+			<feature name="part_id" value="33 - dauntless (1), black hole (2).vgz" />
+			<dataarea name="quik" size="7235">
+				<rom name="33 - dauntless (1), black hole (2).vgz" size="7235" crc="439aef94" sha1="1f16f9af5c5d6ac19d40212e00d702045be616e2" offset="0" />
+			</dataarea>
+		</part>
+		<part name="034" interface="vgm_quik">
+			<feature name="part_id" value="34 - dauntless (2), black hole (1).vgz" />
+			<dataarea name="quik" size="51686">
+				<rom name="34 - dauntless (2), black hole (1).vgz" size="51686" crc="450d4919" sha1="14b16ccd6029903431feda420b0813fa79447671" offset="0" />
+			</dataarea>
+		</part>
+		<part name="035" interface="vgm_quik">
+			<feature name="part_id" value="35 - force one (1).vgz" />
+			<dataarea name="quik" size="23257">
+				<rom name="35 - force one (1).vgz" size="23257" crc="15db0ac8" sha1="567c1eaf930168164c6fb93aaf908c196d3c81f7" offset="0" />
+			</dataarea>
+		</part>
+		<part name="036" interface="vgm_quik">
+			<feature name="part_id" value="36 - spidey (2), speedboat (1).vgz" />
+			<dataarea name="quik" size="7874">
+				<rom name="36 - spidey (2), speedboat (1).vgz" size="7874" crc="f7808d1a" sha1="d93367e398911a1c1a91611cfd11a464b31ce556" offset="0" />
+			</dataarea>
+		</part>
+		<part name="037" interface="vgm_quik">
+			<feature name="part_id" value="37 - skater (1), the boss (2).vgz" />
+			<dataarea name="quik" size="15724">
+				<rom name="37 - skater (1), the boss (2).vgz" size="15724" crc="a9a99023" sha1="eae6dd7ed868030a51a53961eeced17249337633" offset="0" />
+			</dataarea>
+		</part>
+		<part name="038" interface="vgm_quik">
+			<feature name="part_id" value="38 - sunday drive (2).vgz" />
+			<dataarea name="quik" size="31021">
+				<rom name="38 - sunday drive (2).vgz" size="31021" crc="02b62aac" sha1="d4d9bda23126dea73807c5fabb109acef10fb8ee" offset="0" />
+			</dataarea>
+		</part>
+		<part name="039" interface="vgm_quik">
+			<feature name="part_id" value="39 - star evil (1), sky avenger (2).vgz" />
+			<dataarea name="quik" size="9414">
+				<rom name="39 - star evil (1), sky avenger (2).vgz" size="9414" crc="3977ef56" sha1="8b89d8def0fbc92de6746ba7248246491575beac" offset="0" />
+			</dataarea>
+		</part>
+		<part name="040" interface="vgm_quik">
+			<feature name="part_id" value="40 - air command (1), bombs away (2).vgz" />
+			<dataarea name="quik" size="5130">
+				<rom name="40 - air command (1), bombs away (2).vgz" size="5130" crc="780a8e7a" sha1="9cadfc96e4693e8edfd3490ad887d0d0da3824c0" offset="0" />
+			</dataarea>
+		</part>
+		<part name="041" interface="vgm_quik">
+			<feature name="part_id" value="41 - shootout (2), bombs away (1).vgz" />
+			<dataarea name="quik" size="17586">
+				<rom name="41 - shootout (2), bombs away (1).vgz" size="17586" crc="b64d4e0d" sha1="319ecf04c85c3bfd5b4acb7f0e477c41c5e60f38" offset="0" />
+			</dataarea>
+		</part>
+		<part name="042" interface="vgm_quik">
+			<feature name="part_id" value="42 - dedant (2), norman (1).vgz" />
+			<dataarea name="quik" size="13544">
+				<rom name="42 - dedant (2), norman (1).vgz" size="13544" crc="3aaa8539" sha1="cf1ec9c9e9883c43786f3ad82c123ce3cc5b8879" offset="0" />
+			</dataarea>
+		</part>
+		<part name="043" interface="vgm_quik">
+			<feature name="part_id" value="43 - g fighter (2), sharpshooter (1).vgz" />
+			<dataarea name="quik" size="17535">
+				<rom name="43 - g fighter (2), sharpshooter (1).vgz" size="17535" crc="26657020" sha1="c85c41bc7ba4d51e622009ba49f0eb34f8fd3834" offset="0" />
+			</dataarea>
+		</part>
+		<part name="044" interface="vgm_quik">
+			<feature name="part_id" value="44 - man at arms (1), meteor (2).vgz" />
+			<dataarea name="quik" size="8692">
+				<rom name="44 - man at arms (1), meteor (2).vgz" size="8692" crc="339f8d96" sha1="6dbf4dad1562697f22f36e8092db406a21bb5e0d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="045" interface="vgm_quik">
+			<feature name="part_id" value="45 - man at arms (2).vgz" />
+			<dataarea name="quik" size="11290">
+				<rom name="45 - man at arms (2).vgz" size="11290" crc="ea86276c" sha1="d7d9cf18f98a551b965c3a0721ed9455666f4c05" offset="0" />
+			</dataarea>
+		</part>
+		<part name="046" interface="vgm_quik">
+			<feature name="part_id" value="46 - norman (2), apache (1).vgz" />
+			<dataarea name="quik" size="32056">
+				<rom name="46 - norman (2), apache (1).vgz" size="32056" crc="2da91324" sha1="74708ee92e4ad17e91e579991ed4fede2f1be69a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="047" interface="vgm_quik">
+			<feature name="part_id" value="47 - armor battle (1), sharpshooter (2).vgz" />
+			<dataarea name="quik" size="7660">
+				<rom name="47 - armor battle (1), sharpshooter (2).vgz" size="7660" crc="d3d6fd78" sha1="680dfb649dcb270427f4ee40a734ee2a8551de18" offset="0" />
+			</dataarea>
+		</part>
+		<part name="048" interface="vgm_quik">
+			<feature name="part_id" value="48 - armor battle (2), paratrooper (1).vgz" />
+			<dataarea name="quik" size="16007">
+				<rom name="48 - armor battle (2), paratrooper (1).vgz" size="16007" crc="257f1512" sha1="33131fac594834a5ddb58f801ec00754ef941e62" offset="0" />
+			</dataarea>
+		</part>
+		<part name="049" interface="vgm_quik">
+			<feature name="part_id" value="49 - magic bean (1).vgz" />
+			<dataarea name="quik" size="24254">
+				<rom name="49 - magic bean (1).vgz" size="24254" crc="c0248a18" sha1="9dce7d93328657da736f28f321757fa733b1cb1d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="050" interface="vgm_quik">
+			<feature name="part_id" value="50 - magic bean (2), the boss (1).vgz" />
+			<dataarea name="quik" size="4867">
+				<rom name="50 - magic bean (2), the boss (1).vgz" size="4867" crc="7899609c" sha1="05fe7ec88ff9401937361ecfe7f91d67245d10cb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="051" interface="vgm_quik">
+			<feature name="part_id" value="51 - apache (2), sky avenger (1).vgz" />
+			<dataarea name="quik" size="19215">
+				<rom name="51 - apache (2), sky avenger (1).vgz" size="19215" crc="38519a62" sha1="bb43b3427329a49438894e3f85ea890c79de02a0" offset="0" />
+			</dataarea>
+		</part>
+		<part name="052" interface="vgm_quik">
+			<feature name="part_id" value="52 - meteor (1).vgz" />
+			<dataarea name="quik" size="17292">
+				<rom name="52 - meteor (1).vgz" size="17292" crc="ec7f047c" sha1="790b6704fa96ecbfca0f77adf2baaa67305b40bb" offset="0" />
+			</dataarea>
+		</part>
+		<part name="053" interface="vgm_quik">
+			<feature name="part_id" value="53 - stage clear.vgz" />
+			<dataarea name="quik" size="1371">
+				<rom name="53 - stage clear.vgz" size="1371" crc="45a8c5f7" sha1="013ddb14465ef7ac9889fffd269799e79d0c7418" offset="0" />
+			</dataarea>
+		</part>
+		<part name="054" interface="vgm_quik">
+			<feature name="part_id" value="54 - game over.vgz" />
+			<dataarea name="quik" size="1354">
+				<rom name="54 - game over.vgz" size="1354" crc="2680eff9" sha1="ccf237b9b08ce64b9060ed1b25d91ddaf0db2798" offset="0" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="addfamv_md">
+		<description>Addams Family Values (GEN/MD)</description>
+		<year>1995</year>
+		<publisher>Ocean</publisher>
+		<info name="cores" value="YM2612"/>
+		<part name="001" interface="vgm_quik">
+			<feature name="part_id" value="01 - ocean logo.vgz" />
+			<dataarea name="quik" size="16841">
+				<rom name="01 - ocean logo.vgz" size="16841" crc="5dc13573" sha1="e2954e5ad16d1341d5aef2ea43fbdc4adb52453d" offset="0" />
+			</dataarea>
+		</part>
+		<part name="002" interface="vgm_quik">
+			<feature name="part_id" value="02 - addams family values.vgz" />
+			<dataarea name="quik" size="40942">
+				<rom name="02 - addams family values.vgz" size="40942" crc="25a0a906" sha1="996a8d23f300d26056f9772a6757483be167005c" offset="0" />
+			</dataarea>
+		</part>
+		<part name="003" interface="vgm_quik">
+			<feature name="part_id" value="03 - dangerous terrain.vgz" />
+			<dataarea name="quik" size="93925">
+				<rom name="03 - dangerous terrain.vgz" size="93925" crc="267768d3" sha1="f40b5b86dce09b85390603138c5862163f90a2e2" offset="0" />
+			</dataarea>
+		</part>
+		<part name="004" interface="vgm_quik">
+			<feature name="part_id" value="04 - dark dungeons.vgz" />
+			<dataarea name="quik" size="151713">
+				<rom name="04 - dark dungeons.vgz" size="151713" crc="b65204f3" sha1="f5d520552ad4cd785fd7ac76acf5fc7bc00c0493" offset="0" />
+			</dataarea>
+		</part>
+		<part name="005" interface="vgm_quik">
+			<feature name="part_id" value="05 - creepy creatures.vgz" />
+			<dataarea name="quik" size="47647">
+				<rom name="05 - creepy creatures.vgz" size="47647" crc="c86bea95" sha1="2d0787ebae73e7d01b29e8b6845a467dc9e0bf4f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="006" interface="vgm_quik">
+			<feature name="part_id" value="06 - deadly flowers.vgz" />
+			<dataarea name="quik" size="88192">
+				<rom name="06 - deadly flowers.vgz" size="88192" crc="2e181623" sha1="562b6e86d93264333adeea755cce619f18f7eb2a" offset="0" />
+			</dataarea>
+		</part>
+		<part name="007" interface="vgm_quik">
+			<feature name="part_id" value="07 - sea of cursed trees.vgz" />
+			<dataarea name="quik" size="188205">
+				<rom name="07 - sea of cursed trees.vgz" size="188205" crc="113db51b" sha1="12b1fad7e97d25422acca78288db1e05830338e8" offset="0" />
+			</dataarea>
+		</part>
+		<part name="008" interface="vgm_quik">
+			<feature name="part_id" value="08 - sandy wasteland.vgz" />
+			<dataarea name="quik" size="199113">
+				<rom name="08 - sandy wasteland.vgz" size="199113" crc="43381326" sha1="0ddfbf7fae2a661d84a7456894999ac83814129b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="009" interface="vgm_quik">
+			<feature name="part_id" value="09 - neverending rain.vgz" />
+			<dataarea name="quik" size="116338">
+				<rom name="09 - neverending rain.vgz" size="116338" crc="f25b2483" sha1="160273cdb98616230762e31e46df9e18e38ea47b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="010" interface="vgm_quik">
+			<feature name="part_id" value="10 - strobia - silent guardian.vgz" />
+			<dataarea name="quik" size="91973">
+				<rom name="10 - strobia - silent guardian.vgz" size="91973" crc="a5ef0c63" sha1="41094199391217f12ebb7382d991075d2a019d7b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="011" interface="vgm_quik">
+			<feature name="part_id" value="11 - mountain petrified.vgz" />
+			<dataarea name="quik" size="119612">
+				<rom name="11 - mountain petrified.vgz" size="119612" crc="c36c2a15" sha1="b1a5e2866a10d063244df931692a19eaceb3e51f" offset="0" />
+			</dataarea>
+		</part>
+		<part name="012" interface="vgm_quik">
+			<feature name="part_id" value="12 - blizzard.vgz" />
+			<dataarea name="quik" size="104608">
+				<rom name="12 - blizzard.vgz" size="104608" crc="8194add3" sha1="89e44f3db497f439a5b0ac12dd38ce06730b7d3b" offset="0" />
+			</dataarea>
+		</part>
+		<part name="013" interface="vgm_quik">
+			<feature name="part_id" value="13 - house of the dead.vgz" />
+			<dataarea name="quik" size="142166">
 				<rom name="13 - house of the dead.vgz" size="142166" crc="e5d28151" sha1="34c96a3879c927c6e1ecd9dacd434d3787467fc1" offset="0" />
 			</dataarea>
 		</part>
@@ -238919,7 +242767,7 @@
 
 	<software name="advdaisn_md">
 		<description>Advanced Daisenryaku (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -238986,7 +242834,7 @@
 
 	<software name="aero2_md">
 		<description>Aero the Acro-Bat 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Iguana / Sunsoft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -239113,7 +242961,7 @@
 
 	<software name="aero_md">
 		<description>Aero the Acro-Bat (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sunsoft / Iguana</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -239258,7 +243106,7 @@
 
 	<software name="aerobiz_md">
 		<description>Aerobiz (Air Management) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -239421,7 +243269,7 @@
 
 	<software name="aerobizs_md">
 		<description>Aerobiz Supersonic (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -239560,8 +243408,8 @@
 
 	<software name="aburnerju_md">
 		<description>After Burner Complete 32X (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>No_Data</publisher>
+		<year>1994</year>
+		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612, SEGA32X"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01 - sega logo.vgz" />
@@ -239615,7 +243463,7 @@
 
 	<software name="aburner2_md">
 		<description>After Burner II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega / Denpa Shinbunsha</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -239670,7 +243518,7 @@
 
 	<software name="airbustr_md">
 		<description>Air Buster (Aero Blasters) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Kaneko</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -239761,7 +243609,7 @@
 
 	<software name="airdiver_md">
 		<description>Air Diver (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Asmik / Siesmic</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -239876,7 +243724,7 @@
 
 	<software name="aladdin_md">
 		<description>Aladdin (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega / Virgin Games / Walt Disney Company</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -239991,7 +243839,7 @@
 
 	<software name="alexkidd_md">
 		<description>Alex Kidd in the Enchanted Castle (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>SEGA</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -240112,7 +243960,7 @@
 
 	<software name="alien3_md">
 		<description>Alien 3 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Probe / Arena</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -240215,7 +244063,7 @@
 
 	<software name="aliensol_md">
 		<description>Alien Soldier (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Treasure / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -240366,7 +244214,7 @@
 
 	<software name="astorm_md">
 		<description>Alien Storm (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -240475,7 +244323,7 @@
 
 	<software name="alisiad_md">
 		<description>Alisia Dragoon (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega / Game Arts</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -240674,7 +244522,7 @@
 
 	<software name="altbeast_md">
 		<description>Altered Beast (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -240759,7 +244607,7 @@
 
 	<software name="amerglad_md">
 		<description>American Gladiators (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Gametek / Imagitek</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -240772,7 +244620,7 @@
 
 	<software name="animania_md">
 		<description>Animaniacs (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -241085,7 +244933,7 @@
 
 	<software name="archrivl_md">
 		<description>Arch Rivals (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Flying Edge</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -241134,7 +244982,7 @@
 
 	<software name="arcus_md">
 		<description>Arcus Odyssey (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Wolfteam / Renovation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -241327,7 +245175,7 @@
 
 	<software name="arnoldp_md">
 		<description>Arnold Palmer Tournament Golf (Ozaki Naomichi no Super Masters) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -241424,7 +245272,7 @@
 
 	<software name="arrow_md">
 		<description>Arrow Flash (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega / Renovation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -241527,7 +245375,7 @@
 
 	<software name="aof_md">
 		<description>Art of Fighting (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega / SNK</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -241666,7 +245514,7 @@
 
 	<software name="astergre_md">
 		<description>Asterix and the Great Rescue (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -241787,7 +245635,7 @@
 
 	<software name="asterpg_md">
 		<description>Asterix and the Power of the Gods (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega / Core Design</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -241914,7 +245762,7 @@
 
 	<software name="atomrobo_md">
 		<description>Atomic Robo-Kid (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>UPL / Treco</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -241981,7 +245829,7 @@
 
 	<software name="atomrun_md">
 		<description>Atomic Runner (Chelnov) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Data East</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -242096,7 +245944,7 @@
 
 	<software name="atptour_md">
 		<description>ATP Tour Championship Tennis (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega / SIMS</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -242199,7 +246047,7 @@
 
 	<software name="awepossm_md">
 		<description>Awesome Possum Kicks Dr. Machino's Butt! (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Tengen</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -242278,7 +246126,7 @@
 
 	<software name="aworg_md">
 		<description>Aworg - Hero in the Sky (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -242333,7 +246181,7 @@
 
 	<software name="awspro_md">
 		<description>AWS Pro Moves Soccer (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>ASCII Entertainment</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -242350,7 +246198,7 @@
 		</part>
 	</software>
 
-	<software name="smgp2j_md">
+	<software name="smgp2u_md">
 		<description>Ayrton Senna's Super Monaco GP II (GEN/MD)</description>
 		<year>19??</year>
 		<publisher>Sega</publisher>
@@ -242449,7 +246297,7 @@
 
 	<software name="backtof3_md">
 		<description>Back to the Future Part III (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Arena</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -242480,7 +246328,7 @@
 
 	<software name="bahamuts_md">
 		<description>Bahamut Senki (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -242637,7 +246485,7 @@
 
 	<software name="balljack_md">
 		<description>Ball Jacks (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -242794,7 +246642,7 @@
 
 	<software name="ballz3d_md">
 		<description>Ballz (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Accolade</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -242891,7 +246739,7 @@
 
 	<software name="batmanrj_md">
 		<description>Batman - Revenge of the Joker (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sunsoft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -242976,7 +246824,7 @@
 
 	<software name="batmanf_md">
 		<description>Batman Forever (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Probe / Acclaim</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -243043,7 +246891,7 @@
 
 	<software name="batmanrn_md">
 		<description>Batman Returns (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -243164,7 +247012,7 @@
 
 	<software name="batman_md">
 		<description>Batman (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sunsoft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -243249,7 +247097,7 @@
 
 	<software name="battlyui_md">
 		<description>Battle Golfer Yui (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -243392,7 +247240,7 @@
 		</part>
 	</software>
 
-	<software name="bltmania_md">
+	<software name="btlmania_md">
 		<description>Battle Mania (Trouble Shooter) (GEN/MD)</description>
 		<year>19??</year>
 		<publisher>Studio Uchoo Tetsujin</publisher>
@@ -243545,7 +247393,7 @@
 
 	<software name="btlmanid_md">
 		<description>Battle Mania Daiginjou (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -243756,7 +247604,7 @@
 
 	<software name="battlesq_md">
 		<description>Battle Squadron (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -243787,7 +247635,7 @@
 
 	<software name="battlems_md">
 		<description>Battlemaster (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Arena / Mirrorsoft</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -243909,7 +247757,7 @@
 
 	<software name="btoadsdd_md">
 		<description>Battletoads - Double Dragon (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Rare / Tradewest</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -244030,7 +247878,7 @@
 
 	<software name="btoads_md">
 		<description>Battletoads (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Rare Ltd. / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -244145,7 +247993,7 @@
 
 	<software name="beastw_md">
 		<description>Beast Wrestler (Beast Warriors) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Renovation (Nihon Telenet)</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -244254,7 +248102,7 @@
 
 	<software name="beavis_md">
 		<description>Beavis and Butthead (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -244435,7 +248283,7 @@
 
 	<software name="beggarp_md">
 		<description>Beggar Prince (GEN/MD)</description>
-		<year>19??</year>
+		<year>2005</year>
 		<publisher>Computer &amp;</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -244610,7 +248458,7 @@
 
 	<software name="beyoasis_md">
 		<description>Beyond Oasis (The Story of Thor) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -244821,7 +248669,7 @@
 
 	<software name="bibleadv_md">
 		<description>Bible Adventures (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Wisdom Tree</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -244858,7 +248706,7 @@
 
 	<software name="btomato_md">
 		<description>Bill's Tomato Game (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -245033,7 +248881,7 @@
 
 	<software name="bimini_md">
 		<description>Bimini Run (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Nuvision Entertainment</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -245076,7 +248924,7 @@
 
 	<software name="biohazrb_md">
 		<description>Bio-Hazard Battle (Crying) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -245143,7 +248991,7 @@
 
 	<software name="sailormn_md">
 		<description>Bishoujo Senshi Sailor Moon (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Ma-Ba</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -245354,8 +249202,8 @@
 
 	<software name="blackthr_md">
 		<description>Blackthorne 32X (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>No_Data</publisher>
+		<year>1994</year>
+		<publisher>Interplay/Blizzard</publisher>
 		<info name="cores" value="YM2612, SEGA32X"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01 - main menu.vgz" />
@@ -245397,7 +249245,7 @@
 
 	<software name="bladeven_md">
 		<description>Blades of Vengeance (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Beam Software</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -245506,7 +249354,7 @@
 
 	<software name="bmaster2_md">
 		<description>Blaster Master 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sunsoft</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -245585,7 +249433,7 @@
 
 	<software name="blockout_md">
 		<description>Blockout (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>California Dreams</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -245616,7 +249464,7 @@
 
 	<software name="bluealma_md">
 		<description>Blue Almanac (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Kodansha / Hot-B</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -245749,7 +249597,7 @@
 
 	<software name="bob_md">
 		<description>BOB (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Electronic Arts / Chris Gray Enterprises / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -245798,7 +249646,7 @@
 
 	<software name="bodyco_md">
 		<description>Body Count (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Probe / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -245895,7 +249743,7 @@
 
 	<software name="bnzabros_md">
 		<description>Bonanza Brothers (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -245974,7 +249822,7 @@
 
 	<software name="booger_md">
 		<description>Boogerman (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Interplay</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -246077,7 +249925,7 @@
 
 	<software name="boxinglg_md">
 		<description>Boxing Legends of the Ring (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sculptured Software / Electro Brain</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -246126,7 +249974,7 @@
 
 	<software name="dracula_md">
 		<description>Bram Stoker's Dracula (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sony Imagesoft / Psygnosis</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -246289,7 +250137,7 @@
 
 	<software name="barver_md">
 		<description>Brave Battle Saga (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>ChuanPu Technology Co.,Ltd.</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -246428,7 +250276,7 @@
 
 	<software name="brutal_md">
 		<description>Brutal - Paws of Fury (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Gametek</publisher>
 		<info name="cores" value="YM2413, YM2612, YM2151"/>
 		<part name="001" interface="vgm_quik">
@@ -246483,7 +250331,7 @@
 
 	<software name="bubba_md">
 		<description>Bubba 'n' Stix (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Core</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -246568,7 +250416,7 @@
 
 	<software name="bubblesq_md">
 		<description>Bubble and Squeak (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sunsoft</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -246623,7 +250471,7 @@
 
 	<software name="bubsy_md">
 		<description>Bubsy in Claws Encounters of the Furred Kind (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Accolade</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -246738,7 +250586,7 @@
 
 	<software name="bugsbun_md">
 		<description>Bugs Bunny in Double Trouble (GEN/MD)</description>
-		<year>19??</year>
+		<year>1996</year>
 		<publisher>Sega/Probe/Climax</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -246841,7 +250689,7 @@
 
 	<software name="burnforc_md">
 		<description>Burning Force (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -246944,7 +250792,7 @@
 
 	<software name="cadash_md">
 		<description>Cadash (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -247089,7 +250937,7 @@
 
 	<software name="caesars_md">
 		<description>Caesars Palace (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Virgin Games</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -247108,7 +250956,7 @@
 
 	<software name="sylvestr_md">
 		<description>Cagey Capers (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Time Warner Interactive / TecMagik / Alexandria</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -247169,7 +251017,7 @@
 
 	<software name="cal50_md">
 		<description>Caliber 50 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Seta / Mentrix</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -247278,7 +251126,7 @@
 
 	<software name="calgames_md">
 		<description>California Games (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Epyx / Novotrade / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -247333,7 +251181,7 @@
 
 	<software name="cfodder_md">
 		<description>Cannon Fodder (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sensible Software</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -247719,7 +251567,7 @@
 
 	<software name="captaven_md">
 		<description>Captain America and the Avengers (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Data East / Sega / ISCO</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -247852,7 +251700,7 @@
 
 	<software name="castlill_md">
 		<description>Castle of Illusion Starring Mickey Mouse (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -248015,7 +251863,7 @@
 
 	<software name="cvania_md">
 		<description>Castlevania - Bloodlines (Castlevania - The New Generation, Vampire Killer) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -248208,7 +252056,7 @@
 
 	<software name="chakan_md">
 		<description>Chakan - The Forever Man (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sunsoft / Iguana</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -248305,7 +252153,7 @@
 
 	<software name="champbwl_md">
 		<description>Championship Bowling (Boogie Woogie Bowling) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Visco / Mentrix</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -248372,7 +252220,7 @@
 
 	<software name="cproam_md">
 		<description>Championship Pro-Am (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Tradewest / Rare</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -248427,7 +252275,7 @@
 
 	<software name="chasehq2_md">
 		<description>Chase HQ II (Super HQ) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -248512,7 +252360,7 @@
 
 	<software name="chester_md">
 		<description>Chester Cheetah - Too Cool to Fool (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Kaneko</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -248597,7 +252445,7 @@
 
 	<software name="chesterw_md">
 		<description>Chester Cheetah - Wild Wild Quest (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Kaneko</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -248682,7 +252530,7 @@
 
 	<software name="chichi_md">
 		<description>Chi Chi's Pro Challenge (Top Pro Golf. Top Pro Golf 2) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Virgin / Softvision</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -248773,7 +252621,7 @@
 
 	<software name="chibim_md">
 		<description>Chibi Maruko-chan - Waku Waku Shopping (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -248870,7 +252718,7 @@
 
 	<software name="chiki_md">
 		<description>Chiki Chiki Boys (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Capcom / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -249045,7 +252893,7 @@
 
 	<software name="miracle9_md">
 		<description>Chou Kyuukai Miracle Nine (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -249160,7 +253008,7 @@
 
 	<software name="chukrck2_md">
 		<description>Chuck Rock II - Son of Chuck (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Core Design / Virgin Games</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -249251,7 +253099,7 @@
 
 	<software name="chuckrck_md">
 		<description>Chuck Rock (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Core Design / Virgin Games</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -249294,7 +253142,7 @@
 
 	<software name="coachk_md">
 		<description>Coach K College Basketball (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -249325,7 +253173,7 @@
 
 	<software name="columns3_md">
 		<description>Columns III - Revenge of Columns (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega / Vic Tokai</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -249506,7 +253354,7 @@
 
 	<software name="columns_md">
 		<description>Columns (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -249591,7 +253439,7 @@
 
 	<software name="combatca_md">
 		<description>Combat Cars (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Accolade</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -249682,7 +253530,7 @@
 
 	<software name="comixp_md">
 		<description>Comix Zone (Beta) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -249863,7 +253711,7 @@
 
 	<software name="comix_md">
 		<description>Comix Zone (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -250020,7 +253868,7 @@
 
 	<software name="tunshi_md">
 		<description>Conquering the World III (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>SKOB</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -250141,7 +253989,7 @@
 
 	<software name="contra_md">
 		<description>Contra Hard Corps (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -250322,7 +254170,7 @@
 
 	<software name="coolspot_md">
 		<description>Cool Spot (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -250437,7 +254285,7 @@
 
 	<software name="corporat_md">
 		<description>Corporation (Cyber-Cop) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Core Design / Virgin</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -250449,8 +254297,8 @@
 	</software>
 
 	<software name="cyberb_md">
-		<description>Cosmic Carnage (Cyber Brawl) (GEN/MD)</description>
-		<year>19??</year>
+		<description>Cosmic Carnage (Cyber Brawl) 32x (GEN/MD)</description>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -250564,8 +254412,8 @@
 	</software>
 
 	<software name="cfstory_md">
-		<description>Cosmic Fantasy Stories (GEN/MD)</description>
-		<year>19??</year>
+		<description>Cosmic Fantasy Stories (Sega CD) (GEN/MD)</description>
+		<year>1995</year>
 		<publisher>Telenet Japan, Riot</publisher>
 		<info name="cores" value="SN76496, YM2612, RF5C164"/>
 		<part name="001" interface="vgm_quik">
@@ -250704,7 +254552,7 @@
 
 	<software name="crkdown_md">
 		<description>Crack Down (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega / Sage's Creation</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -250771,7 +254619,7 @@
 
 	<software name="crayon_md">
 		<description>Crayon Shin-Chan (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Ma-Ba</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -250880,7 +254728,7 @@
 
 	<software name="superair_md">
 		<description>CrossFire (Super Airwolf) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Kyugo Boukei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -250953,7 +254801,7 @@
 
 	<software name="crusader_md">
 		<description>Crusader of Centy (Soleil, Shin Souseiki Ragnacenty) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Nextech / Atlus</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -251116,8 +254964,8 @@
 
 	<software name="cruwball_md">
 		<description>Crüe Ball (Twisted Flipper) (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>No_Data</publisher>
+		<year>1992</year>
+		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01 - live wire.vgz" />
@@ -251255,7 +255103,7 @@
 
 	<software name="curse_md">
 		<description>Curse (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Micronet</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -251352,7 +255200,7 @@
 
 	<software name="cutiesuz_md">
 		<description>Cuty Suzuki no Ringside Angel (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Asmik</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -251425,7 +255273,7 @@
 
 	<software name="cyberbal_md">
 		<description>Cyberball (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega / Atari Games</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -251540,7 +255388,7 @@
 
 	<software name="cyborgj_md">
 		<description>Cyborg Justice (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Novatrade</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -251601,7 +255449,7 @@
 
 	<software name="daffy_md">
 		<description>Daffy Duck in Hollywood (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Time Warner / Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -251710,7 +255558,7 @@
 
 	<software name="dahnak_md">
 		<description>Dahna Megami Tanjou (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>IGS</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -251831,7 +255679,7 @@
 
 	<software name="dangseed_md">
 		<description>Dangerous Seed (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Namcot</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -251952,7 +255800,7 @@
 
 	<software name="darius2_md">
 		<description>Darius II (Sagaia) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -252049,7 +255897,7 @@
 
 	<software name="darkcstl_md">
 		<description>Dark Castle (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -252061,8 +255909,8 @@
 	</software>
 
 	<software name="darkwiz_md">
-		<description>Dark Wizard (GEN/MD)</description>
-		<year>19??</year>
+		<description>Dark Wizard (SEGA CD)(GEN/MD)</description>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="RF5C164"/>
 		<part name="001" interface="vgm_quik">
@@ -252165,7 +256013,7 @@
 
 	<software name="darwin_md">
 		<description>Darwin 4081 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Data East / Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -252267,8 +256115,8 @@
 	</software>
 
 	<software name="darxide_md">
-		<description>Darxide (GEN/MD)</description>
-		<year>19??</year>
+		<description>Darxide 32X (GEN/MD)</description>
+		<year>1995</year>
 		<publisher>Fronteir / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -252377,7 +256225,7 @@
 
 	<software name="dashdes_md">
 		<description>Dashin' Desperadoes (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Data East</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -252576,7 +256424,7 @@
 
 	<software name="dazexmas_md">
 		<description>Daze Before Christmas (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Funcom / Sunsoft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -252691,7 +256539,7 @@
 
 	<software name="deadlymv_md">
 		<description>Deadly Moves (Power Athlete) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Kaneko</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -252776,7 +256624,7 @@
 
 	<software name="decapatt_md">
 		<description>Decap Attack (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -252933,7 +256781,7 @@
 
 	<software name="demoman_md">
 		<description>Demolition Man (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Alexandria / Acclaim</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -253006,7 +256854,7 @@
 
 	<software name="dstrike_md">
 		<description>Desert Strike - Return to the Gulf (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -253157,7 +257005,7 @@
 
 	<software name="n3dgdevi_md">
 		<description>Devil's Course (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega / T&amp;E Soft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -253284,7 +257132,7 @@
 
 	<software name="devilish_md">
 		<description>Devilish (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>HOT-B</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -253393,8 +257241,8 @@
 
 	<software name="dialq_md">
 		<description>Dial Q o Mawase! (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>No_Data</publisher>
+		<year>1992</year>
+		<publisher>Studio Fazzy</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01 - intro tune.vgz" />
@@ -253442,7 +257290,7 @@
 
 	<software name="dicktr_md">
 		<description>Dick Tracy (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -253539,7 +257387,7 @@
 
 	<software name="dinodini_md">
 		<description>Dino Dini's Soccer (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Dini &amp; Dini Productions</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -253582,7 +257430,7 @@
 
 	<software name="dinoland_md">
 		<description>Dino Land (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Wolfteam / Renovation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -253649,7 +257497,7 @@
 
 	<software name="dinohire_md">
 		<description>Dinosaurs for Hire (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega interActive / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -253722,7 +257570,7 @@
 
 	<software name="ariel_md">
 		<description>Disney's Ariel The Little Mermaid (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega of America, Inc.</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -253825,7 +257673,7 @@
 
 	<software name="divine_md">
 		<description>Divine Sealing (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Studio Fazzy</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -253874,7 +257722,7 @@
 
 	<software name="djboy_md">
 		<description>DJ Boy (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Kaneko / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -253971,7 +257819,7 @@
 
 	<software name="dokidoki_md">
 		<description>Doki Doki Penguin Land MD (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -254014,7 +257862,7 @@
 
 	<software name="domino_md">
 		<description>Domino (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>New Game</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -254069,7 +257917,7 @@
 
 	<software name="mauimall_md">
 		<description>Donald Duck in Maui Mallard (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Disney Interactive</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -254172,7 +258020,7 @@
 
 	<software name="doraemon_md">
 		<description>Doraemon - Yume Dorobou to 7-nin no Gozans (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -254323,7 +258171,7 @@
 
 	<software name="ddragon3_md">
 		<description>Double Dragon 3 - The Rosetta Stone (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Acclaim / Flying Edge</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -254366,7 +258214,7 @@
 
 	<software name="ddragon2_md">
 		<description>Double Dragon II - The Revenge (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Palsoft / Technos Japan</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -254463,7 +258311,7 @@
 
 	<software name="ddragon5_md">
 		<description>Double Dragon V - The Shadow Falls (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Legend / Tradewest</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -254572,7 +258420,7 @@
 
 	<software name="ddragon_md">
 		<description>Double Dragon (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Accolade / Ballistic</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -254627,7 +258475,7 @@
 
 	<software name="hyperdnk_md">
 		<description>Double Dribble (Hyper Dunk) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -254772,7 +258620,7 @@
 
 	<software name="drrobotn_md">
 		<description>Dr Robotnik's Mean Bean Machine (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega / Compile</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -254929,7 +258777,7 @@
 
 	<software name="dbz_md">
 		<description>Dragon Ball Z - Bu Yuu Retsuden (L'Appel du Destin) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Bandai</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -255044,7 +258892,7 @@
 
 	<software name="dslayed2_md">
 		<description>Dragon Slayer - Eiyuu Densetsu II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Falcom / Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -255279,7 +259127,7 @@
 
 	<software name="dslayed_md">
 		<description>Dragon Slayer - Eiyuu Densetsu (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Falcom / Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -255454,7 +259302,7 @@
 
 	<software name="shangh3_md">
 		<description>Dragon's Eye Plus - Shanghai 3 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Home Data</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -255521,7 +259369,7 @@
 
 	<software name="dfury_md">
 		<description>Dragon's Fury (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Tengen / Tecno Soft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -255660,7 +259508,7 @@
 
 	<software name="dragnrev_md">
 		<description>Dragon's Revenge (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Tengen</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -255745,7 +259593,7 @@
 
 	<software name="dune2_md">
 		<description>Dune - The Battle for Arrakis (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -255884,7 +259732,7 @@
 
 	<software name="duneu_md">
 		<description>Dune (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Virgin Games</publisher>
 		<info name="cores" value="SN76496, YM2612, RF5C164"/>
 		<part name="001" interface="vgm_quik">
@@ -255945,8 +259793,8 @@
 
 	<software name="ddwares_md">
 		<description>Dungeons &amp; Dragons - Warriors of the Eternal Sun (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>No_Data</publisher>
+		<year>1992</year>
+		<publisher>Westwood Associates</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01 - intro theme 1.vgz" />
@@ -256144,7 +259992,7 @@
 
 	<software name="dynabr2_md">
 		<description>Dyna Brothers 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>CSK Research Institute</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -256355,7 +260203,7 @@
 
 	<software name="dynabr_md">
 		<description>Dyna Brothers (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>CRI</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -256476,7 +260324,7 @@
 
 	<software name="dynduke_md">
 		<description>Dynamite Duke (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -256537,7 +260385,7 @@
 
 	<software name="dhead_md">
 		<description>Dynamite Headdy (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Treasure / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -256790,7 +260638,7 @@
 
 	<software name="earnest_md">
 		<description>Earnest Evans (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Wolfteam / Renovation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -256899,7 +260747,7 @@
 
 	<software name="ejim2_md">
 		<description>Earthworm Jim 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Shiny Entertainment</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -256984,7 +260832,7 @@
 
 	<software name="ejim_md">
 		<description>Earthworm Jim (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Shiny Entertainment</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -257081,7 +260929,7 @@
 
 	<software name="ecco2_md">
 		<description>Ecco - The Tides of Time (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Novotrade / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -257184,7 +261032,7 @@
 
 	<software name="eccojr_md">
 		<description>Ecco Jr (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Novotrade / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -257281,7 +261129,7 @@
 
 	<software name="ecco_md">
 		<description>Ecco the Dolphin (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega / Novotrade</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -257402,7 +261250,7 @@
 
 	<software name="elviento_md">
 		<description>El Viento (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Wolfteam / Renovation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -257541,7 +261389,7 @@
 
 	<software name="elemast_md">
 		<description>Elemental Master (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Tecnosoft / Renovation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -257692,7 +261540,7 @@
 
 	<software name="elimdown_md">
 		<description>Eliminate Down (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Soft Vision</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -257897,7 +261745,7 @@
 
 	<software name="eswat_md">
 		<description>ESWAT - City Under Siege (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -257976,7 +261824,7 @@
 
 	<software name="eternalc_md">
 		<description>Eternal Champions (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -258079,7 +261927,7 @@
 
 	<software name="jlcs_md">
 		<description>European League Soccer (World Trophy Soccer, J-League Champion Soccer) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Krisalis / Virgin Games</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -258194,7 +262042,7 @@
 
 	<software name="exile_md">
 		<description>Exile (XZR) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Riot / Renovation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -258339,7 +262187,7 @@
 
 	<software name="exosquad_md">
 		<description>Exo-Squad (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Novotrade / Playmates</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -258526,7 +262374,7 @@
 
 	<software name="exodus_md">
 		<description>Exodus - Journey to the Promised Land (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Wisdom Tree</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -258593,7 +262441,7 @@
 
 	<software name="f15se2_md">
 		<description>F-15 Strike Eagle II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Microprose</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -258648,7 +262496,7 @@
 
 	<software name="f1circus_md">
 		<description>F1 Circus MD (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Nichibutsu</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -258847,7 +262695,7 @@
 
 	<software name="f1wc_md">
 		<description>F1 World Championship (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Domark Software / Peakstar Software</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -258896,7 +262744,7 @@
 
 	<software name="fastest1_md">
 		<description>Fastest 1 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Human</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -258957,7 +262805,7 @@
 
 	<software name="fatfury2_md">
 		<description>Fatal Fury 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>SNK / Takara</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -259106,7 +262954,7 @@
 		</part>
 	</software>
 
-	<software name="fatfury1_md">
+	<software name="fatfury_md">
 		<description>Fatal Fury (GEN/MD)</description>
 		<year>19??</year>
 		<publisher>Sega / SNK / Takara</publisher>
@@ -259229,7 +263077,7 @@
 
 	<software name="fatallab_md">
 		<description>Fatal Labyrinth (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -259296,7 +263144,7 @@
 
 	<software name="fatalrew_md">
 		<description>Fatal Rewind (The Killing Game Show) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Raising Hell / Psygnosis</publisher>
 		<info name="cores" value="YM2413, YM2612, YM2151"/>
 		<part name="001" interface="vgm_quik">
@@ -259321,7 +263169,7 @@
 
 	<software name="ferrari_md">
 		<description>Ferrari Grand Prix Challenge (F1 Hero MD) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Flying Edge / Varie</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -259364,7 +263212,7 @@
 
 	<software name="fidodido_md">
 		<description>Fido Dido (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Kaneko</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -259437,7 +263285,7 @@
 
 	<software name="fightmas_md">
 		<description>Fighting Masters (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Treco / Almanic</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -259516,7 +263364,7 @@
 
 	<software name="fzone_md">
 		<description>Final Zone (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Wolfteam / Renovation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -259583,7 +263431,7 @@
 
 	<software name="firemust_md">
 		<description>Fire Mustang (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>NMK / Taito</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -259662,7 +263510,7 @@
 
 	<software name="fireshrk_md">
 		<description>Fire Shark (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Toaplan</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -259729,7 +263577,7 @@
 
 	<software name="flashb_md">
 		<description>Flashback - The Quest for Identity (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Delphine / US Gold</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -259941,7 +263789,7 @@
 
 	<software name="forgottn_md">
 		<description>Forgotten Worlds (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Capcom / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -260050,7 +263898,7 @@
 
 	<software name="funcar_md">
 		<description>Fun Car Rally (Beta) (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Unknown</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -260105,7 +263953,7 @@
 
 	<software name="nadia_md">
 		<description>Fushigi no Umi no Nadia (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -260316,7 +264164,7 @@
 
 	<software name="gloc_md">
 		<description>G-LOC (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega / Probe</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -260431,7 +264279,7 @@
 
 	<software name="gadget_md">
 		<description>Gadget Twins (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Gametek / Imagitek</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -260564,7 +264412,7 @@
 
 	<software name="gaiares_md">
 		<description>Gaiares (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Telenet / Renovation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -260740,7 +264588,7 @@
 
 	<software name="gforce2_md">
 		<description>Galaxy Force II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>CSK Research Institute</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -260807,7 +264655,7 @@
 
 	<software name="gambler_md">
 		<description>Gambler Jiko Chuushinha - Katayama Masayuki no Mahjong Doujou (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Game Arts</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -260970,7 +264818,7 @@
 
 	<software name="gamenko_md">
 		<description>Game no Kandzume Otokuyou (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -260983,7 +264831,7 @@
 
 	<software name="garfield_md">
 		<description>Garfield - Caught in the Act (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Segasoft / Sega / PAWS</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -261122,7 +264970,7 @@
 
 	<software name="gargoyle_md">
 		<description>Gargoyles (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Buena Vista Interactive</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -261195,7 +265043,7 @@
 
 	<software name="gauntlt4_md">
 		<description>Gauntlet IV (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Tengen / M2</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -261310,7 +265158,7 @@
 
 	<software name="gemfire_md">
 		<description>Gemfire (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -261431,7 +265279,7 @@
 
 	<software name="genchaos_md">
 		<description>General Chaos (General Chaos - Daikonsen) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Electronic Arts, Inc.</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -261456,7 +265304,7 @@
 
 	<software name="genghis2_md">
 		<description>Genghis Khan II - Clan of the Grey Wolf (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -261631,7 +265479,7 @@
 
 	<software name="georgeko_md">
 		<description>George Foreman's KO Boxing (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Flying Edge</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -261662,7 +265510,7 @@
 
 	<software name="ghostbst_md">
 		<description>Ghostbusters (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega / Compile</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -261801,7 +265649,7 @@
 
 	<software name="ghouls_md">
 		<description>Ghouls 'n Ghosts (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Capcom, Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -261964,8 +265812,8 @@
 
 	<software name="gleylanc_md">
 		<description>Gleylancer (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>No_Data</publisher>
+		<year>1992</year>
+		<publisher>NCS</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01 - story begin.vgz" />
@@ -262109,7 +265957,7 @@
 
 	<software name="mickmack_md">
 		<description>Global Gladiators (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Virgin Games</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -262188,7 +266036,7 @@
 
 	<software name="gods_md">
 		<description>Gods (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Bitmap Brothers / Mindscape / Accolade</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -262374,9 +266222,9 @@
 		</part>
 	</software>
 
-	<software name="goldaxe3_md">
+	<software name="goldnax3_md">
 		<description>Golden Axe III (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -262539,7 +266387,7 @@
 
 	<software name="goldnaxe_md">
 		<description>Golden Axe (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -262624,7 +266472,7 @@
 
 	<software name="gouketsu_md">
 		<description>Gouketsuji Ichizoku (Power Instinct) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Atlus</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -262757,7 +266605,7 @@
 
 	<software name="granada_md">
 		<description>Granada (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Wolf Team / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -262870,9 +266718,9 @@
 		</part>
 	</software>
 
-	<software name="gransl_md">
+	<software name="grandsl_md">
 		<description>Grand Slam (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Nihon Telenet / Renovation</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -262909,7 +266757,7 @@
 
 	<software name="greendog_md">
 		<description>Greendog - The Beached Surfer Dude (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -263000,7 +266848,7 @@
 
 	<software name="grindst_md">
 		<description>Grind Stormer (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Tengen / Toaplan</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -263079,7 +266927,7 @@
 
 	<software name="growl_md">
 		<description>Growl (Runark) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -263176,7 +267024,7 @@
 
 	<software name="gunship_md">
 		<description>Gunship (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>U.S. Gold / Microprose</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -263279,7 +267127,7 @@
 
 	<software name="gunstar_md">
 		<description>Gunstar Heroes (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Treasure</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -263436,7 +267284,7 @@
 
 	<software name="gynoug_md">
 		<description>Gynoug (Wings of Wor) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>NCS Masaya / Dreamworks</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -263557,7 +267405,7 @@
 
 	<software name="n3dgaugu_md">
 		<description>Harukanaru Augusta (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>T&amp;E Soft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -263678,7 +267526,7 @@
 
 	<software name="heavynov_md">
 		<description>Heavy Nova (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Micronet</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -263775,7 +267623,7 @@
 
 	<software name="hvyunit_md">
 		<description>Heavy Unit - Mega Drive Special (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Kaneko / Toho</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -263896,7 +267744,7 @@
 
 	<software name="hellfire_md">
 		<description>Hellfire (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Toaplan / NCS Masaya</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -263963,7 +267811,7 @@
 
 	<software name="herzog_md">
 		<description>Herzog Zwei (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Tecnosoft / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -264078,7 +267926,7 @@
 
 	<software name="havocu_md">
 		<description>High Seas Havoc (Captain Lang, Havoc) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Data East / Codemasters</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -264265,7 +268113,7 @@
 
 	<software name="hitice_md">
 		<description>Hit the Ice (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Taito / Aisystem Tokyo</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -264344,7 +268192,7 @@
 
 	<software name="ddanpei_md">
 		<description>Honoo no Toukyuuji - Dodge Danpei (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -264495,7 +268343,7 @@
 
 	<software name="hook_md">
 		<description>Hook (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sony Imagesoft</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -264580,7 +268428,7 @@
 
 	<software name="hurrican_md">
 		<description>Hurricanes (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>U.S. Gold</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -264690,7 +268538,7 @@
 
 	<software name="insectx_md">
 		<description>Insector X (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Taito / Hot-B</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -264775,7 +268623,7 @@
 
 	<software name="issdx_md">
 		<description>International Superstar Soccer Deluxe (GEN/MD)</description>
-		<year>19??</year>
+		<year>1996</year>
 		<publisher>Factor 5 / Konami</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -264860,7 +268708,7 @@
 
 	<software name="jlps2_md">
 		<description>J-League Pro Striker 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -264933,7 +268781,7 @@
 
 	<software name="jlps_md">
 		<description>J-League Pro Striker (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -264988,7 +268836,7 @@
 
 	<software name="jb007_md">
 		<description>James Bond 007 - The Duel (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Domark</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265049,7 +268897,7 @@
 
 	<software name="jbdougko_md">
 		<description>James Buster Douglas Knockout Boxing (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega / Taito</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265104,7 +268952,7 @@
 
 	<software name="jpond_md">
 		<description>James Pond - Underwater Agent (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Millenium / Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265177,7 +269025,7 @@
 
 	<software name="jpond3_md">
 		<description>James Pond 3 - Operation Starfish (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Millenium / Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265262,7 +269110,7 @@
 
 	<software name="robocod_md">
 		<description>James Pond II - Codename RoboCod (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Millenium / Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265323,7 +269171,7 @@
 
 	<software name="janout_md">
 		<description>Janou Touryuumon (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega / Game Arts</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265396,7 +269244,7 @@
 
 	<software name="jantei_md">
 		<description>Jantei Monogatari (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Reno / Atlus</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265487,7 +269335,7 @@
 
 	<software name="jeopardy_md">
 		<description>Jeopardy! (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>GameTek</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265506,7 +269354,7 @@
 
 	<software name="jewelms_md">
 		<description>Jewel Master (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265645,7 +269493,7 @@
 
 	<software name="jimpower_md">
 		<description>Jim Power - The Arcade Game (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Loricel</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265658,7 +269506,7 @@
 
 	<software name="jimmywws_md">
 		<description>Jimmy White's Whirlwind Snooker (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Virgin Games</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265671,7 +269519,7 @@
 
 	<software name="joemac_md">
 		<description>Joe &amp; Mac (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Data East / Takara</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265732,7 +269580,7 @@
 
 	<software name="madden92_md">
 		<description>John Madden Football '92 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Electronic Arts / Park Place Productions</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265763,7 +269611,7 @@
 
 	<software name="madden93_md">
 		<description>John Madden Football '93 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Electronic Arts / Looking Glass Studios</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265788,7 +269636,7 @@
 
 	<software name="madden_md">
 		<description>John Madden Football (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Electronic Arts / Park Place Productions</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265823,9 +269671,9 @@
 		</part>
 	</software>
 
-	<software name="junctionj_md">
+	<software name="junction_md">
 		<description>Junction (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Micronet / Konami</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -265886,7 +269734,7 @@
 
 	<software name="jstrike_md">
 		<description>Jungle Strike (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>nite Bay / Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -266097,7 +269945,7 @@
 
 	<software name="jpark_md">
 		<description>Jurassic Park (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega / Bluesky / Amblin</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -266206,7 +270054,7 @@
 
 	<software name="kageki_md">
 		<description>Ka-Ge-Ki - Fists of Steel (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Kaneko / Hot-B</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -266454,7 +270302,7 @@
 
 	<software name="patlabor_md">
 		<description>Kidou Keisatsu Patlabor (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Ma-Ba</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -266575,7 +270423,7 @@
 
 	<software name="kingcol_md">
 		<description>King Colossus (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -266684,7 +270532,7 @@
 
 	<software name="kotm2_md">
 		<description>King of the Monsters 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>SNK / Takara</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -266841,7 +270689,7 @@
 
 	<software name="kotm_md">
 		<description>King of the Monsters (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>SNK / Takara</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -266902,7 +270750,7 @@
 
 	<software name="kingsal_md">
 		<description>King Salmon (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Hot-B / Vic Tokai</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -267005,7 +270853,7 @@
 
 	<software name="kbounty_md">
 		<description>King's Bounty - The Conqueror's Quest (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>New World Computing /</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -267048,7 +270896,7 @@
 
 	<software name="kishiden_md">
 		<description>Kishi Densetsu (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Kodansha</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -267161,9 +271009,9 @@
 		</part>
 	</software>
 
-	<software name="kiss_md">
+	<software name="kissshot_md">
 		<description>Kiss Shot (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -267206,7 +271054,7 @@
 
 	<software name="klax_md">
 		<description>Klax (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Tengen</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -267219,8 +271067,8 @@
 
 	<software name="chaotixju_md">
 		<description>Knuckles' Chaotix 32X (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>No_Data</publisher>
+		<year>1995</year>
+		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612, SEGA32X"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01 - beta sega sound.vgz" />
@@ -267496,7 +271344,7 @@
 
 	<software name="krustyfh_md">
 		<description>Krusty's Super Fun House (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Acclaim / Flying Edge / Fox Williams / Audiogenic</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -267551,7 +271399,7 @@
 
 	<software name="kyukaidk_md">
 		<description>Kyuukai Douchuuki (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -267798,7 +271646,7 @@
 
 	<software name="landstlkf_md">
 		<description>Landstalker (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Climax / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -268027,7 +271875,7 @@
 
 	<software name="langris2_md">
 		<description>Langrisser II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>NCS Masaya</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -268220,7 +272068,7 @@
 
 	<software name="lastact_md">
 		<description>Last Action Hero (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>BITS / Sony Imagesoft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -268269,7 +272117,7 @@
 
 	<software name="lastbtle_md">
 		<description>Last Battle (Hokuto no Ken) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -268366,7 +272214,7 @@
 
 	<software name="wukong_md">
 		<description>Legend of Wukong (GEN/MD)</description>
-		<year>19??</year>
+		<year>2008</year>
 		<publisher>TW Ming Technology Co.,Ltd</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -268439,7 +272287,7 @@
 
 	<software name="lemming2_md">
 		<description>Lemmings 2 - The Tribes (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Psygnosis / Digital</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -268542,7 +272390,7 @@
 
 	<software name="lemmings_md">
 		<description>Lemmings (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sunsoft / Psygnosis</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -268699,7 +272547,7 @@
 
 	<software name="le2_md">
 		<description>Lethal Enforcers II - Gun Fighters (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -268850,7 +272698,7 @@
 
 	<software name="lethalen_md">
 		<description>Lethal Enforcers (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -268983,7 +272831,7 @@
 
 	<software name="liberty_md">
 		<description>Liberty or Death (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -269098,7 +272946,7 @@
 
 	<software name="lightcrs_md">
 		<description>Light Crusader (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Treasure</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -269279,7 +273127,7 @@
 
 	<software name="lordmon_md">
 		<description>Lord Monarch - Tokoton Sentou Densetsu (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega / Nihon Falcom</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -269526,7 +273374,7 @@
 
 	<software name="lotus2_md">
 		<description>Lotus II - R.E.C.S (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Electronic Arts / Gremlin</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -269575,7 +273423,7 @@
 
 	<software name="musha_md">
 		<description>M.U.S.H.A. (Musha Aleste) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>ompile / Seismic / Toaplan</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -269682,7 +273530,7 @@
 		</part>
 	</software>
 
-	<software name="madoum1_md">
+	<software name="madoumon_md">
 		<description>Madou Monogatari I (GEN/MD)</description>
 		<year>19??</year>
 		<publisher>Compile / LMS Music</publisher>
@@ -269913,7 +273761,7 @@
 
 	<software name="xiaomo_md">
 		<description>Magic Girl (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Gamtec</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -269974,7 +273822,7 @@
 
 	<software name="magichat_md">
 		<description>Magical Hat no Buttobi Turbo! Daibouken (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -270125,7 +273973,7 @@
 
 	<software name="mtaruru_md">
 		<description>Magical Taruruuto-kun (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -270300,7 +274148,7 @@
 
 	<software name="mahjongc_md">
 		<description>Mahjong Cop Ryuu - Shiro Ookami no Yabou (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -270463,7 +274311,7 @@
 
 	<software name="mamono_md">
 		<description>Mamono Hunter Youko (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>NCS Masaya</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -270536,7 +274384,7 @@
 
 	<software name="manover_md">
 		<description>Man Overboard! (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Codemasters</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -270615,7 +274463,7 @@
 
 	<software name="marble_md">
 		<description>Marble Madness (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -270670,7 +274518,7 @@
 
 	<software name="marko_md">
 		<description>Marko's Magic Football (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Domark / Cartoon Mavericks</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -270779,7 +274627,7 @@
 
 	<software name="marsup_md">
 		<description>Marsupilami (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Marsu/Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -271038,7 +274886,7 @@
 
 	<software name="marvland_md">
 		<description>Marvel Land (Talmit's Adventure) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -271165,7 +275013,7 @@
 
 	<software name="franken_md">
 		<description>Mary Shelley's Frankenstein (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>BITS Corporation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -271244,7 +275092,7 @@
 
 	<software name="mastmons_md">
 		<description>Master of Monsters (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Toshiba EMI / Renovation / System Soft / ISCO</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -271317,7 +275165,7 @@
 
 	<software name="mweapon_md">
 		<description>Master of Weapon (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -271408,7 +275256,7 @@
 
 	<software name="maten_md">
 		<description>Maten no Soumetsu (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Kodansha</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -271541,7 +275389,7 @@
 
 	<software name="mazinsaga_md">
 		<description>Mazin Saga (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Almanic / Sega / Vic Tokai</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -271650,7 +275498,7 @@
 
 	<software name="mcdonald_md">
 		<description>McDonald's Treasure Land Adventure (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Treasure / Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -271813,7 +275661,7 @@
 
 	<software name="meganser_md">
 		<description>Mega Anser (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -271874,7 +275722,7 @@
 
 	<software name="megabm8_md">
 		<description>Mega Bomberman Demo (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Factor 5/ Hudson Soft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -271887,7 +275735,7 @@
 
 	<software name="megabomb_md">
 		<description>Mega Bomberman (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Hudson / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -272579,7 +276427,7 @@
 
 	<software name="megaturr_md">
 		<description>Mega Turrican (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Factor 5 / Data East</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -272754,7 +276602,7 @@
 
 	<software name="megalo_md">
 		<description>Mega-Lo-Mania (Tyrants) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sensible Software</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -272779,7 +276627,7 @@
 
 	<software name="megapanl_md">
 		<description>Megapanel (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Namcot</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -272864,7 +276712,7 @@
 
 	<software name="mercs_md">
 		<description>Mercs (Senjou no Ookami II) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Capcom / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -273075,7 +276923,7 @@
 
 	<software name="metalfng_md">
 		<description>Metal Fangs (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Victor Musical Industries</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -273171,8 +277019,8 @@
 	</software>
 
 	<software name="metalhdju_md">
-		<description>Metal Head (GEN/MD)</description>
-		<year>19??</year>
+		<description>Metal Head 32x (GEN/MD)</description>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -273311,7 +277159,7 @@
 
 	<software name="mwalk_md">
 		<description>Michael Jackson's Moonwalker (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -273558,7 +277406,7 @@
 
 	<software name="mmania_md">
 		<description>Mickey Mania (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Traveller's Tales</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -273709,7 +277557,7 @@
 
 	<software name="microm96_md">
 		<description>Micro Machines - Turbo Tournament '96 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Supersonic / Codemasters</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -273798,7 +277646,7 @@
 		</part>
 	</software>
 
-	<software name="micromc3_md">
+	<software name="micromc2_md">
 		<description>Micro Machines 2 - Turbo Tournament (GEN/MD)</description>
 		<year>19??</year>
 		<publisher>Supersonic / Codemasters</publisher>
@@ -273891,7 +277739,7 @@
 
 	<software name="micromm_md">
 		<description>Micro Machines Military (GEN/MD)</description>
-		<year>19??</year>
+		<year>1996</year>
 		<publisher>Supersonic / Codemasters</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -273982,7 +277830,7 @@
 
 	<software name="midres_md">
 		<description>Midnight Resistance (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega / Data East</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -274049,7 +277897,7 @@
 
 	<software name="mightmag_md">
 		<description>Might and Magic - Gates to Another World (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>New World Computing</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -274152,7 +278000,7 @@
 
 	<software name="mmprfe_md">
 		<description>Mighty Morphin Power Rangers - The Fighting Edition (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Unknown</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -274255,7 +278103,7 @@
 
 	<software name="mmprtm_md">
 		<description>Mighty Morphin Power Rangers - The Movie (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega / SIMS</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -274376,7 +278224,7 @@
 
 	<software name="mmpr_md">
 		<description>Mighty Morphin Power Rangers (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>SEGA</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -274527,7 +278375,7 @@
 
 	<software name="mfpool_md">
 		<description>Minnesota Fats - Pool Legend (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Data East</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -274726,7 +278574,7 @@
 
 	<software name="mworld4_md">
 		<description>Monster World IV (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega / Westone</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -274925,7 +278773,7 @@
 
 	<software name="mk3_md">
 		<description>Mortal Kombat 3 (&amp; Ultimate MK3) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Midway / Williams</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -275160,7 +279008,7 @@
 
 	<software name="mk2_md">
 		<description>Mortal Kombat II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Midway / Probe / Acclaim</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -275359,7 +279207,7 @@
 
 	<software name="mk_md">
 		<description>Mortal Kombat (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Arena / Midway / Probe</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -275462,7 +279310,7 @@
 
 	<software name="mrnutz_md">
 		<description>Mr. Nutz (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Ocean</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -275559,7 +279407,7 @@
 
 	<software name="mlfootb_md">
 		<description>Mutant League Football (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -275626,7 +279474,7 @@
 
 	<software name="mystdef_md">
 		<description>Mystic Defender (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -275717,7 +279565,7 @@
 
 	<software name="mysticf_md">
 		<description>Mystical Fighter (Maou Renjishi) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Taito / Dreamwork</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -275844,7 +279692,7 @@
 
 	<software name="nakaf1gp_md">
 		<description>Nakajima Satoru Kanshuu - F1 Grand Prix (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Varie</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -275983,7 +279831,7 @@
 
 	<software name="nakaf1sl_md">
 		<description>Nakajima Satoru Kanshuu - F1 Super License (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Varie</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -276146,7 +279994,7 @@
 
 	<software name="nbajam_md">
 		<description>NBA Jam (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Acclaim / Iguana / Midway</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -276225,7 +280073,7 @@
 
 	<software name="nbaliv95_md">
 		<description>NBA Live 95 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -276268,7 +280116,7 @@
 
 	<software name="nbaliv96_md">
 		<description>NBA Live 96 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -276311,7 +280159,7 @@
 
 	<software name="nbaliv97_md">
 		<description>NBA Live 97 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1996</year>
 		<publisher>NuFX / Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -276354,7 +280202,7 @@
 
 	<software name="neksoccr_md">
 		<description>Nekketsu Koukou Dodgeball Bu - Soccer Hen MD (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Technos / Palsoft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -276553,7 +280401,7 @@
 
 	<software name="nfl95_md">
 		<description>NFL '95 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Double Diamond / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -276608,7 +280456,7 @@
 
 	<software name="nhlas_md">
 		<description>NHL All-Star Hockey '95 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>NuFX / Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -276765,7 +280613,7 @@
 
 	<software name="mansell_md">
 		<description>Nigel Mansell's World Championship Racing (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Gametek / Gremlin</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -276808,7 +280656,7 @@
 
 	<software name="ncirc_md">
 		<description>Nightmare Circus (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>TecToy</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -276923,7 +280771,7 @@
 
 	<software name="nikkan_md">
 		<description>Nikkan Sports Pro Yakyuu VAN (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -277171,7 +281019,7 @@
 
 	<software name="ngaiden_md">
 		<description>Ninja Gaiden (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega / Tecmo</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -277304,7 +281152,7 @@
 
 	<software name="noescape_md">
 		<description>No Escape (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>BITS Corporation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -277389,7 +281237,7 @@
 
 	<software name="nobubufu_md">
 		<description>Nobunaga no Yabou - Bushou Fuuunroku (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -277546,7 +281394,7 @@
 
 	<software name="nobuhao_md">
 		<description>Nobunaga no Yabou - Haouden (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -277697,7 +281545,7 @@
 
 	<software name="nobuamb_md">
 		<description>Nobunaga's Ambition (Nobunaga no Yabou - Zenkokuban) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -277758,7 +281606,7 @@
 
 	<software name="onslau_md">
 		<description>Onslaught (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Ballistic</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -277783,7 +281631,7 @@
 
 	<software name="opeurope_md">
 		<description>Operation Europe (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -277916,7 +281764,7 @@
 
 	<software name="osomatsu_md">
 		<description>Osomatsu-kun - Hachamecha Gekijou (GEN/MD)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -278019,7 +281867,7 @@
 
 	<software name="outr2019_md">
 		<description>OutRun 2019 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>SIMS / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -278110,7 +281958,7 @@
 
 	<software name="outrun_md">
 		<description>OutRun (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -278147,7 +281995,7 @@
 
 	<software name="orunners_md">
 		<description>OutRunners (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Data East</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -278400,7 +282248,7 @@
 
 	<software name="pto_md">
 		<description>P.T.O. - Pacific Theater of Operations (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -278515,7 +282363,7 @@
 
 	<software name="pacattak_md">
 		<description>Pac-Attack (Pac-Panic) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -278594,7 +282442,7 @@
 
 	<software name="pacman2_md">
 		<description>Pac-Man 2 - The New Adventures (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -278913,7 +282761,7 @@
 
 	<software name="pacmania_md">
 		<description>Pac-Mania (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Tengen</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -278986,7 +282834,7 @@
 
 	<software name="pachinko_md">
 		<description>Pachinko Kuunyan (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Soft Vision International</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -279155,7 +283003,7 @@
 
 	<software name="pcotton_md">
 		<description>Panorama Cotton (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sunsoft / Success</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -279318,7 +283166,7 @@
 
 	<software name="paperbo2_md">
 		<description>Paperboy II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Tengen</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -279355,7 +283203,7 @@
 
 	<software name="partyq_md">
 		<description>Party Quiz Mega Q (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -279542,7 +283390,7 @@
 
 	<software name="pebble_md">
 		<description>Pebble Beach Golf Links (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega / T&amp;E Soft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -279669,7 +283517,7 @@
 
 	<software name="ppengo_md">
 		<description>Pepenga Pengo (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -279880,7 +283728,7 @@
 
 	<software name="pstar2_md">
 		<description>Phantasy Star II (English) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -280019,7 +283867,7 @@
 
 	<software name="pstar2j_md">
 		<description>Phantasy Star II (Japan) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -280158,7 +284006,7 @@
 
 	<software name="pstar3_md">
 		<description>Phantasy Star III - Generations of Doom (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -280387,7 +284235,7 @@
 
 	<software name="pstar4_md">
 		<description>Phantasy Star IV (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -280682,7 +284530,7 @@
 
 	<software name="phelios_md">
 		<description>Phelios (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -280857,7 +284705,7 @@
 
 	<software name="psolarp_md">
 		<description>Pier Solar (Beta) (GEN/MD)</description>
-		<year>19??</year>
+		<year>2010</year>
 		<publisher>WaterMelon</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -280972,7 +284820,7 @@
 
 	<software name="psolar_md">
 		<description>Pier Solar and the Great Architects (GEN/MD)</description>
-		<year>19??</year>
+		<year>2010</year>
 		<publisher>WaterMelon</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -281339,7 +285187,7 @@
 
 	<software name="pink_md">
 		<description>Pink Goes to Hollywood (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Headgames / TecMagik</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -281442,7 +285290,7 @@
 
 	<software name="pinoc_md">
 		<description>Pinocchio (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Disney Interactive</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -281521,7 +285369,7 @@
 
 	<software name="pitfall_md">
 		<description>Pitfall - The Mayan Adventure (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Activision</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -281660,7 +285508,7 @@
 
 	<software name="pocahont_md">
 		<description>Pocahontas (GEN/MD)</description>
-		<year>19??</year>
+		<year>1996</year>
 		<publisher>Buena Vista Games, Inc.</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -281709,7 +285557,7 @@
 
 	<software name="pokemon2_md">
 		<description>Pocket Monster 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Unknown</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -281757,8 +285605,8 @@
 	</software>
 
 	<software name="popmail_md">
-		<description>Popful Mail (GEN/MD)</description>
-		<year>19??</year>
+		<description>Popful Mail (SEGA CD)(GEN/MD)</description>
+		<year>1991</year>
 		<publisher>Working Designs</publisher>
 		<info name="cores" value="SN76496, YM2612, RF5C164"/>
 		<part name="001" interface="vgm_quik">
@@ -281903,7 +285751,7 @@
 
 	<software name="populous_md">
 		<description>Populous (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Electronic Arts \ Bullfrog</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -281916,7 +285764,7 @@
 
 	<software name="pdrive_md">
 		<description>Power Drive (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Rage Software / U.S. Gold</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -282025,7 +285873,7 @@
 
 	<software name="powerbal_md">
 		<description>Powerball (Wrestle Ball) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -282098,7 +285946,7 @@
 
 	<software name="predatr2_md">
 		<description>Predator 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Perfect 10 / Arena</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -282177,7 +286025,7 @@
 
 	<software name="primetim_md">
 		<description>Prime Time NFL (NFL '98) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Spectacular / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -282244,7 +286092,7 @@
 
 	<software name="prostrfs_md">
 		<description>Pro Striker Final Stage (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega / Nextech</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -282377,7 +286225,7 @@
 
 	<software name="psyoblad_md">
 		<description>Psy-O-Blade (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>T&amp;E Soft / Sigma</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -282510,7 +286358,7 @@
 
 	<software name="puggsy_md">
 		<description>Puggsy (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Psygnosis / Traveller's Tales</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -282715,7 +286563,7 @@
 
 	<software name="pulseman_md">
 		<description>Pulseman (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Game Freak</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -282926,7 +286774,7 @@
 
 	<software name="putter_md">
 		<description>Putter Golf (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -282963,7 +286811,7 @@
 
 	<software name="puyopuyo_md">
 		<description>Puyo Puyo Tsuu (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Compile</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -283078,7 +286926,7 @@
 
 	<software name="puyopuy2_md">
 		<description>Puyo Puyo (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega / Compile</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -283193,7 +287041,7 @@
 
 	<software name="ichir_md">
 		<description>Puzzle &amp; Action - Ichidant-R (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -283440,7 +287288,7 @@
 
 	<software name="tantr_md">
 		<description>Puzzle &amp; Action - Tant-R (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -283639,7 +287487,7 @@
 
 	<software name="quacksht_md">
 		<description>Quack Shot (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega / The Walt Disney Company</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -283784,7 +287632,7 @@
 
 	<software name="quadchal_md">
 		<description>Quad Challenge (MegaTrax) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -283851,7 +287699,7 @@
 
 	<software name="racedriv_md">
 		<description>Race Drivin' (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Tengen / Polygames</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -283906,7 +287754,7 @@
 
 	<software name="radrex_md">
 		<description>Radical Rex (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Activision</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -283961,7 +287809,7 @@
 
 	<software name="raiden_md">
 		<description>Raiden Trad (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Micronet / Seibu Kaihatsu</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -284016,7 +287864,7 @@
 
 	<software name="rbisland_md">
 		<description>Rainbow Islands Extra (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -284099,9 +287947,9 @@
 		</part>
 	</software>
 
-	<software name="rambo_md">
+	<software name="rambo3_md">
 		<description>Rambo III (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -284174,7 +288022,7 @@
 
 	<software name="rampart_md">
 		<description>Rampart (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Tengen</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -284235,7 +288083,7 @@
 
 	<software name="rangerx_md">
 		<description>Ranger-X (Ex-Ranza) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega / Gau Entertainment</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -284380,7 +288228,7 @@
 
 	<software name="rastan2_md">
 		<description>Rastan Saga II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -284411,7 +288259,7 @@
 
 	<software name="redzone_md">
 		<description>Red Zone (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Zyrinx / Time Warner</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -284520,7 +288368,7 @@
 
 	<software name="renstim_md">
 		<description>Ren &amp; Stimpy - Stimpy's Invention (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega, Nickelodeon</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -284798,7 +288646,7 @@
 
 	<software name="resq_md">
 		<description>ResQ (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Psygnosis / Tempest</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -284943,7 +288791,7 @@
 
 	<software name="revshin_md">
 		<description>Revenge of Shinobi (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -285064,7 +288912,7 @@
 
 	<software name="rsbt_md">
 		<description>Richard Scarry's Busytown (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -285113,7 +288961,7 @@
 
 	<software name="ringspow_md">
 		<description>Rings of Power (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>ghty Dog / Electronic Arts</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -285222,7 +289070,7 @@
 
 	<software name="riserobo_md">
 		<description>Rise of the Robots (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Mirage / Data Design</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -285307,7 +289155,7 @@
 
 	<software name="riskyw_md">
 		<description>Risky Woods (Draxos) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -285374,7 +289222,7 @@
 
 	<software name="ristar_md">
 		<description>Ristar - The Shooting Star (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -285573,7 +289421,7 @@
 
 	<software name="rrash3_md">
 		<description>Road Rash 3 - Tour de Force (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -285622,7 +289470,7 @@
 
 	<software name="rrash2_md">
 		<description>Road Rash II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -285677,7 +289525,7 @@
 
 	<software name="roadrash_md">
 		<description>Road Rash (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -285744,7 +289592,7 @@
 
 	<software name="robocop3_md">
 		<description>Robocop 3 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Flying Edge</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -285787,7 +289635,7 @@
 
 	<software name="roboterm_md">
 		<description>Robocop versus The Terminator (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -285842,7 +289690,7 @@
 
 	<software name="rnrracin_md">
 		<description>Rock n' Roll Racing (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Blizzard / Interplay</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -285885,7 +289733,7 @@
 
 	<software name="rocket_md">
 		<description>Rocket Knight Adventures (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -286042,7 +289890,7 @@
 
 	<software name="rockmnx3_md">
 		<description>Rockman X3 (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Unknown</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -286097,7 +289945,7 @@
 
 	<software name="rthun2_md">
 		<description>Rolling Thunder 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Namcot</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -286212,7 +290060,7 @@
 
 	<software name="rthun3_md">
 		<description>Rolling Thunder 3 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -286375,7 +290223,7 @@
 
 	<software name="roman3k2_md">
 		<description>Romance of the Three Kingdoms II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -286508,7 +290356,7 @@
 
 	<software name="roman3k3_md">
 		<description>Romance of the Three Kingdoms III (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -286653,7 +290501,7 @@
 
 	<software name="ssword_md">
 		<description>Saint Sword (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -286768,7 +290616,7 @@
 
 	<software name="samsho_md">
 		<description>Samurai Shodown (Samurai Spirits) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>SNK / Saurus / Takara</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -286937,7 +290785,7 @@
 
 	<software name="sangoret_md">
 		<description>Sangokushi Retsuden - Ransei no Eiyuutachi (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -287076,7 +290924,7 @@
 
 	<software name="sansan_md">
 		<description>Sansan (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sansan Co., Ltd.</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -287119,7 +290967,7 @@
 
 	<software name="slammast_md">
 		<description>Saturday Night Slam Masters (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -287360,7 +291208,7 @@
 
 	<software name="sdvalis_md">
 		<description>SD Valis (Syd of Valis) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Laser Soft / Renovation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -287439,7 +291287,7 @@
 
 	<software name="secndsam_md">
 		<description>Second Samurai (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Vivid Image / Psygnosis</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -287591,7 +291439,7 @@
 	<software name="segacd_md">
 		<description>Sega CD BIOS (Sega CD)(GEN/MD)</description>
 		<year>1991</year>
-		<publisher>No_Data</publisher>
+		<publisher>Sega</publisher>
 		<info name="cores" value="RF5C164"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01 - japanese - european bios.vgz" />
@@ -287615,7 +291463,7 @@
 
 	<software name="segachnl_md">
 		<description>Sega Channel (Demo Cartridge #4) (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -287755,7 +291603,7 @@
 	<software name="gameto_md">
 		<description>Sega Game Toshokan (GEN/MD)</description>
 		<year>1990</year>
-		<publisher>No_Data</publisher>
+		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01 - sound code 81.vgz" />
@@ -287785,7 +291633,7 @@
 
 	<software name="sensible_md">
 		<description>Sensible Soccer (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sensible Software</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -287810,7 +291658,7 @@
 
 	<software name="shadow_md">
 		<description>Shadow Blasters (Shiten Myouou) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sigma / Sage's Creation</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -287907,7 +291755,7 @@
 
 	<software name="shdancer_md">
 		<description>Shadow Dancer (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -288028,7 +291876,7 @@
 
 	<software name="beast2_md">
 		<description>Shadow of the Beast II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>sygnosis / Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -288089,7 +291937,7 @@
 
 	<software name="beast_md">
 		<description>Shadow of the Beast (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>sygnosis / Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -288156,7 +292004,7 @@
 
 	<software name="shadowrn_md">
 		<description>Shadowrun (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>FASA</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -288283,7 +292131,7 @@
 
 	<software name="shaqfu_md">
 		<description>Shaq-Fu (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Delphine / Electronic Arts</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -288464,7 +292312,7 @@
 
 	<software name="shikinjo_md">
 		<description>Shi-Kin-Jou (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sunsoft / Scap Trust</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -288543,7 +292391,7 @@
 
 	<software name="shinfrc2_md">
 		<description>Shining Force II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -288766,7 +292614,7 @@
 
 	<software name="shinfrce_md">
 		<description>Shining Force (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -288953,7 +292801,7 @@
 
 	<software name="shindark_md">
 		<description>Shining in the Darkness (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Climax / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -289321,7 +293169,7 @@
 
 	<software name="shougi_md">
 		<description>Shougi no Hoshi (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Home Data</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -289406,7 +293254,7 @@
 
 	<software name="shoveit_md">
 		<description>Shove It! (Soukoban) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>NCS Masaya / Dreamworks</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -289431,7 +293279,7 @@
 
 	<software name="shuihu_md">
 		<description>Shui Hu - Feng Yun Zhuan (GEN/MD)</description>
-		<year>19??</year>
+		<year>1999</year>
 		<publisher>King Tec Information Co.,</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -289516,7 +293364,7 @@
 
 	<software name="shuramon_md">
 		<description>Shura no Mon (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -289623,9 +293471,9 @@
 		</part>
 	</software>
 
-	<software name="sidepckt_md">
+	<software name="sidepock_md">
 		<description>Side Pocket (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Data East</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -289764,8 +293612,8 @@
 
 	<software name="silpheed_md">
 		<description>Silpheed CD (Sega CD) (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>No_Data</publisher>
+		<year>1993</year>
+		<publisher>Game Arts</publisher>
 		<info name="cores" value="SN76496, YM2612, RF5C164"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01 - ipl ~ opening demo.vgz" />
@@ -289891,7 +293739,7 @@
 
 	<software name="skelkrew_md">
 		<description>Skeleton Krew (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Core Design</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -289976,7 +293824,7 @@
 
 	<software name="skitchin_md">
 		<description>Skitchin' (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -290139,7 +293987,7 @@
 
 	<software name="slamdunk_md">
 		<description>Slam Dunk - Kyougou Makkou Taiketsu! (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Bandai</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -290302,7 +294150,7 @@
 
 	<software name="slapfigh_md">
 		<description>Slap Fight MD (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Toaplan / Tengen</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -290453,7 +294301,7 @@
 
 	<software name="snakernr_md">
 		<description>Snake Rattle 'n' Roll (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Rare / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -290580,7 +294428,7 @@
 
 	<software name="snowbros_md">
 		<description>Snow Bros. - Nick &amp; Tom (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Toaplan / Tengen</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -290695,7 +294543,7 @@
 
 	<software name="socket_md">
 		<description>Socket (Time Dominator) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Vic Tokai</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -290834,7 +294682,7 @@
 
 	<software name="soldeace_md">
 		<description>Sol-Deace (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Wolfteam / Renovation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -291142,7 +294990,7 @@
 
 	<software name="sonic3d_md">
 		<description>Sonic 3D Blast (Sonic 3D Flickies Island) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1996</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -291335,7 +295183,7 @@
 
 	<software name="soniccd_md">
 		<description>Sonic CD (Sega CD) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="RF5C164"/>
 		<part name="001" interface="vgm_quik">
@@ -291522,7 +295370,7 @@
 
 	<software name="scrack_md">
 		<description>Sonic Crackers (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -291565,7 +295413,7 @@
 
 	<software name="sonicer_md">
 		<description>Sonic Eraser (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -291590,7 +295438,7 @@
 
 	<software name="sspin_md">
 		<description>Sonic Spinball (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -291741,7 +295589,7 @@
 
 	<software name="sonic2b_md">
 		<description>Sonic the Hedgehog 2 (Beta) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -291904,7 +295752,7 @@
 
 	<software name="sonic2_md">
 		<description>Sonic the Hedgehog 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -292332,7 +296180,7 @@
 
 	<software name="sonic_md">
 		<description>Sonic the Hedgehog (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega / Sonic Team</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -292453,7 +296301,7 @@
 
 	<software name="sorcerk_md">
 		<description>Sorcerer's Kingdom (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>NCS Masaya</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -292712,7 +296560,7 @@
 
 	<software name="sorcer_md">
 		<description>Sorcerian (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Falcom / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -292977,7 +296825,7 @@
 
 	<software name="sharrier_md">
 		<description>Space Harrier II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -293104,7 +296952,7 @@
 
 	<software name="sinv91_md">
 		<description>Space Invaders '91 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -293189,7 +297037,7 @@
 
 	<software name="sparkstr_md">
 		<description>Sparkster (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -293346,7 +297194,7 @@
 
 	<software name="speedbl2_md">
 		<description>Speedball 2 - Brutal Deluxe (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Bitmap Brothers / Virgin</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -293377,7 +297225,7 @@
 
 	<software name="spidmaxc_md">
 		<description>Spider-Man &amp; Venom - Maximum Carnage (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Acclaim</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -293498,7 +297346,7 @@
 
 	<software name="venom_md">
 		<description>Spider-Man &amp; Venom - Separation Anxiety (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Acclaim</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -293565,7 +297413,7 @@
 
 	<software name="spidxmen_md">
 		<description>Spider-Man &amp; X-Men - Arcade's Revenge (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Flying Edge</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -293638,7 +297486,7 @@
 
 	<software name="spidermn_md">
 		<description>Spider-Man - The Animated Series (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Acclaim</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -293747,7 +297595,7 @@
 
 	<software name="spiritwf_md">
 		<description>Spiritual Warfare (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Wisdom Tree</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -293995,7 +297843,7 @@
 
 	<software name="splatth3_md">
 		<description>Splatterhouse 3 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Namco</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -294206,7 +298054,7 @@
 
 	<software name="spotgo_md">
 		<description>Spot Goes to Hollywood (GEN/MD)</description>
-		<year>19??</year>
+		<year>1996</year>
 		<publisher>Virgin Games / Eurocom</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -294315,7 +298163,7 @@
 
 	<software name="squirrel_md">
 		<description>Squirrel King (Super Mario World) (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Unknown</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -294382,7 +298230,7 @@
 
 	<software name="starcrus_md">
 		<description>Star Cruiser (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>NCS Masaya / Arsys</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -294509,7 +298357,7 @@
 
 	<software name="stds9_md">
 		<description>Star Trek DS9 - Crossroads of Time (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Novotrade / Playmates</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -294660,7 +298508,7 @@
 
 	<software name="sttng_md">
 		<description>Star Trek TNG - Echoes from the Past (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -294739,7 +298587,7 @@
 
 	<software name="stargate_md">
 		<description>Stargate (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Probe / Acclaim</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -294782,7 +298630,7 @@
 
 	<software name="steelemp_md">
 		<description>Steel Empire (Koutetsu Teikoku - Steel Empire, Empire of Steel) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Hot-B / Flying Edge</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -294920,8 +298768,8 @@
 	</software>
 
 	<software name="stellar_md">
-		<description>Stellar Assault (Shadow Squadron) (GEN/MD)</description>
-		<year>19??</year>
+		<description>Stellar Assault 32x (Shadow Squadron) (GEN/MD)</description>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -295079,7 +298927,7 @@
 
 	<software name="sf2pir_md">
 		<description>Street Fighter II Turbo (Beta) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993?</year>
 		<publisher>Capcom</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -295362,7 +299210,7 @@
 
 	<software name="sf2_md">
 		<description>Street Fighter II' - Special Champion Edition (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Capcom</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -295573,7 +299421,7 @@
 
 	<software name="sracer_md">
 		<description>Street Racer (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Ubisoft / Vivid Image</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -295686,9 +299534,9 @@
 		</part>
 	</software>
 
-	<software name="streets_md">
+	<software name="ssmart_md">
 		<description>Street Smart (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>SNK / Treco</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -295785,7 +299633,7 @@
 
 	<software name="sor_md">
 		<description>Streets of Rage (Bare Knuckle) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -295888,7 +299736,7 @@
 
 	<software name="sor2_md">
 		<description>Streets of Rage 2 (Bare Knuckle II) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -296039,7 +299887,7 @@
 
 	<software name="sor3_md">
 		<description>Streets of Rage 3 (Bare Knuckle III) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -296208,7 +300056,7 @@
 
 	<software name="strider2_md">
 		<description>Strider Returns - Journey From Darkness (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Tiertex / US Gold</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -296323,7 +300171,7 @@
 
 	<software name="strider_md">
 		<description>Strider (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Capcom / Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -296516,7 +300364,7 @@
 
 	<software name="striker_md">
 		<description>Striker (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Rage Software</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -296589,7 +300437,7 @@
 
 	<software name="subterr_md">
 		<description>Sub-Terrania (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Zyrinx</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -296698,7 +300546,7 @@
 
 	<software name="ssriders_md">
 		<description>Sunset Riders (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -296867,7 +300715,7 @@
 
 	<software name="2020bb_md">
 		<description>Super Baseball 2020 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>NuFX / Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -297012,7 +300860,7 @@
 
 	<software name="suprbubl_md">
 		<description>Super Bubble Bobble MD (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Unknown</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -297079,7 +300927,7 @@
 
 	<software name="supdaisn_md">
 		<description>Super Daisenryaku (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -297152,7 +301000,7 @@
 
 	<software name="sfzone_md">
 		<description>Super Fantasy Zone (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sunsoft / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -297315,7 +301163,7 @@
 
 	<software name="shangon_md">
 		<description>Super Hang-On (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -297370,7 +301218,7 @@
 
 	<software name="shimpact_md">
 		<description>Super High Impact (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>uana Entertainment / Arena</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -297443,7 +301291,7 @@
 
 	<software name="suphydl_md">
 		<description>Super Hydlide (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Seismic / Asmik / T&amp;E Soft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -297546,7 +301394,7 @@
 
 	<software name="suprleag_md">
 		<description>Super League (Tommy Lasorda Baseball) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -297655,7 +301503,7 @@
 
 	<software name="proyakyu_md">
 		<description>Super League 91 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -297776,7 +301624,7 @@
 
 	<software name="smario2_md">
 		<description>Super Mario 2 1998 (Sonic Jam 6) (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Unknown Pirate Group</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -297873,7 +301721,7 @@
 
 	<software name="smgp_md">
 		<description>Super Monaco GP (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -297970,7 +301818,7 @@
 
 	<software name="superoff_md">
 		<description>Super Off Road (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Tradewest / Ballistic</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -298025,7 +301873,7 @@
 
 	<software name="srealbas_md">
 		<description>Super Real Basketball (Pat Riley Basketball) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -298098,7 +301946,7 @@
 
 	<software name="sskid_md">
 		<description>Super Skidmarks (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Acid / Codemasters</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -298123,7 +301971,7 @@
 
 	<software name="ssmashtv_md">
 		<description>Super Smash TV (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Williams / Flying Edge</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -298166,7 +302014,7 @@
 
 	<software name="ssf2_md">
 		<description>Super Street Fighter II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -298467,7 +302315,7 @@
 
 	<software name="stblade_md">
 		<description>Super Thunder Blade (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -298534,7 +302382,7 @@
 
 	<software name="svolley_md">
 		<description>Super Volleyball (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Video System / Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -298595,7 +302443,7 @@
 
 	<software name="superman_md">
 		<description>Superman (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sunsoft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -298704,7 +302552,7 @@
 
 	<software name="surging_md">
 		<description>Surging Aura (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -298873,7 +302721,7 @@
 
 	<software name="vermil_md">
 		<description>Sword of Vermilion (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -299084,7 +302932,7 @@
 
 	<software name="t2ag_md">
 		<description>T2 - The Arcade Game (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Probe / Arena</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -299139,7 +302987,7 @@
 
 	<software name="nhktaidr_md">
 		<description>Taiheiki (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -299278,7 +303126,7 @@
 
 	<software name="taikoris_md">
 		<description>Taikou Risshiden (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -299465,7 +303313,7 @@
 
 	<software name="talespin_md">
 		<description>TaleSpin (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega / Interactive Designs</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -299556,7 +303404,7 @@
 
 	<software name="leynos_md">
 		<description>Target Earth (Assault Suit Leynos) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>NCS Masaya / Dreamworks</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -299623,7 +303471,7 @@
 
 	<software name="taskfhex_md">
 		<description>Task Force Harrier EX (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>UPL / Treco</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -299696,7 +303544,7 @@
 
 	<software name="tecmocup_md">
 		<description>Tecmo Cup Football Game (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Sega(Unreleased)</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -299805,7 +303653,7 @@
 
 	<software name="tecmobb_md">
 		<description>Tecmo Super Baseball (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Tecmo</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -299920,7 +303768,7 @@
 
 	<software name="tecmosb2_md">
 		<description>Tecmo Super Bowl II - Special Edition (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Tecmo</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -300155,7 +304003,7 @@
 
 	<software name="tecmosb3_md">
 		<description>Tecmo Super Bowl III - Final Edition (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Tecmo</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -300300,7 +304148,7 @@
 
 	<software name="tecmosbw_md">
 		<description>Tecmo Super Bowl (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Tecmo</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -300529,7 +304377,7 @@
 
 	<software name="tecmowc_md">
 		<description>Tecmo World Cup (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>SIMS / Tecmo / Atlus</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -300620,7 +304468,7 @@
 
 	<software name="tmnthh_md">
 		<description>Teenage Mutant Ninja Turtles - The Hyperstone Heist (Return of the Shredder) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -300783,7 +304631,7 @@
 
 	<software name="tmnttfu_md">
 		<description>Teenage Mutant Ninja Turtles - Tournament Fighters (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -300926,9 +304774,9 @@
 		</part>
 	</software>
 
-	<software name="teltel_md">
+	<software name="telmah_md">
 		<description>Tel Tel Mahjong (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sunsoft / Chatnoir</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -301014,7 +304862,7 @@
 	<!-- the full set is in vgm and not vgz -->
 	<software name="telstad_md">
 		<description>Tel Tel Stadium (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sunsoft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -301093,8 +304941,8 @@
 
 	<software name="tempo_md">
 		<description>Tempo 32X (GEN/MD)</description>
-		<year>19??</year>
-		<publisher>No_Data</publisher>
+		<year>1995</year>
+		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612, SEGA32X"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="01 - tempo (make it funky).vgz" />
@@ -301382,7 +305230,7 @@
 
 	<software name="term2_md">
 		<description>Terminator 2 - Judgment Day (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>BITS / Flying Edge</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -301425,7 +305273,7 @@
 
 	<software name="tetris_md">
 		<description>Tetris (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega / Sanritsu</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -301486,7 +305334,7 @@
 
 	<software name="addfam_md">
 		<description>The Addams Family (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Ocean / Flying Edge</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -301553,7 +305401,7 @@
 
 	<software name="advbatru_md">
 		<description>The Adventures of Batman and Robin (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Clockwork Tortoise</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -301674,7 +305522,7 @@
 
 	<software name="mightmax_md">
 		<description>The Adventures of Mighty Max (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Ocean</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -301741,7 +305589,7 @@
 
 	<software name="aquagame_md">
 		<description>The Aquatic Games (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Millenium / Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -301784,7 +305632,7 @@
 
 	<software name="earthdef_md">
 		<description>The Earth Defend (Earth Defense) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>AV Artisan / Realtec</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -301857,7 +305705,7 @@
 
 	<software name="faerytal_md">
 		<description>The Faery Tale Adventure (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -301906,7 +305754,7 @@
 
 	<software name="flintu_md">
 		<description>The Flintstones (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -302009,7 +305857,7 @@
 
 	<software name="mickeycm_md">
 		<description>The Great Circus Mystery (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Capcom</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -302214,7 +306062,7 @@
 
 	<software name="waldo_md">
 		<description>The Great Waldo Search (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>THQ</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -302257,7 +306105,7 @@
 
 	<software name="humans_md">
 		<description>The Humans (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Gametek / Imagitek</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -302336,7 +306184,7 @@
 
 	<software name="hybridf_md">
 		<description>The Hybrid Front (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -302481,7 +306329,7 @@
 
 	<software name="immortal_md">
 		<description>The Immortal (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -302620,7 +306468,7 @@
 
 	<software name="hulk_md">
 		<description>The Incredible Hulk (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Probe / US Gold</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -302729,7 +306577,7 @@
 
 	<software name="itchy_md">
 		<description>The Itchy &amp; Scratchy Game (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Bits Corporation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -302826,7 +306674,7 @@
 
 	<software name="jungle_md">
 		<description>The Jungle Book (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -302917,7 +306765,7 @@
 
 	<software name="lawnmowr_md">
 		<description>The Lawnmower Man (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sales Curve / Time Warner</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -302966,7 +306814,7 @@
 
 	<software name="galahad_md">
 		<description>The Legend of Galahad (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Traveller's Tales / Psygnosis / Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -303033,7 +306881,7 @@
 
 	<software name="lionkin2_md">
 		<description>The Lion King II (GEN/MD)</description>
-		<year>19??</year>
+		<year>199?</year>
 		<publisher>Unknown</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -303100,7 +306948,7 @@
 
 	<software name="lionking_md">
 		<description>The Lion King (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Virgin Interactive</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -303209,7 +307057,7 @@
 
 	<software name="lostvik_md">
 		<description>The Lost Vikings (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Interplay / Ballistic / Silicon &amp; Synapse</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -303276,7 +307124,7 @@
 
 	<software name="flink_md">
 		<description>The Misadventures of Flink (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Psygnosis / Sony Imagesoft</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -303385,7 +307233,7 @@
 
 	<software name="tnzs_md">
 		<description>The NewZealand Story (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -303488,7 +307336,7 @@
 
 	<software name="ooze_md">
 		<description>The Ooze (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -303603,7 +307451,7 @@
 
 	<software name="ottifant_md">
 		<description>The Ottifants (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Graftgold / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -303712,7 +307560,7 @@
 
 	<software name="piratedw_md">
 		<description>The Pirates of Dark Water (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>na Entertainment / Sunsoft</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -303839,7 +307687,7 @@
 
 	<software name="punisher_md">
 		<description>The Punisher (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>pcom / Sculptured Software</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -303984,7 +307832,7 @@
 
 	<software name="bartvssm_md">
 		<description>The Simpsons - Bart vs The Space Mutants (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Developments / Flying Edge</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -304021,7 +307869,7 @@
 
 	<software name="bartnigh_md">
 		<description>The Simpsons - Bart's Nightmare (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Acclaim / Flying Edge</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -304052,7 +307900,7 @@
 
 	<software name="termintr_md">
 		<description>The Terminator (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Probe / Bethesda / Virgin</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -304167,7 +308015,7 @@
 
 	<software name="tick_md">
 		<description>The Tick (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Fox Interactive</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -304234,7 +308082,7 @@
 
 	<software name="tf2_md">
 		<description>Thunder Force II (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Tecnosoft / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -304367,7 +308215,7 @@
 
 	<software name="tf3_md">
 		<description>Thunder Force III (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Tecnosoft / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -304801,7 +308649,7 @@
 
 	<software name="tfox_md">
 		<description>Thunder Fox (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Taito / Aisystem Tokyo</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -304886,7 +308734,7 @@
 
 	<software name="tpwres_md">
 		<description>Thunder Pro Wrestling Retsuden (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Human</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -305056,7 +308904,7 @@
 
 	<software name="tinhead_md">
 		<description>Tinhead (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Ballistic / Accolade / MicroProse / Spectrum Holobyte</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -305165,7 +309013,7 @@
 
 	<software name="ttacme_md">
 		<description>Tiny Toon Adventures - Acme All Stars (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -305274,7 +309122,7 @@
 
 	<software name="ttoonbht_md">
 		<description>Tiny Toon Adventures - Buster's Hidden Treasure (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -305419,7 +309267,7 @@
 
 	<software name="slimew_md">
 		<description>Todd's Adventures in Slime World (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Epyx / Renovation</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -305462,7 +309310,7 @@
 
 	<software name="toejam2_md">
 		<description>ToeJam &amp; Earl in Panic on Funkotron (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega / JVP</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -305559,7 +309407,7 @@
 
 	<software name="toejam_md">
 		<description>ToeJam &amp; Earl (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega / JVP</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -305608,7 +309456,7 @@
 
 	<software name="toki_md">
 		<description>Toki - Going Ape Spit (JuJu Densetsu) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -305711,7 +309559,7 @@
 
 	<software name="tomjerry_md">
 		<description>Tom and Jerry - Frantic Antics! (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Beam Software</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -305772,7 +309620,7 @@
 
 	<software name="topgear2_md">
 		<description>Top Gear 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>ic Tokai / Kemco / Gremlin</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -305803,7 +309651,7 @@
 
 	<software name="toughman_md">
 		<description>Toughman Contest (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Concepts / Electronic Arts</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -305882,7 +309730,7 @@
 
 	<software name="toxicc_md">
 		<description>Toxic Crusaders (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega / Infogrames</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -305955,7 +309803,7 @@
 
 	<software name="toystory_md">
 		<description>Toy Story (GEN/MD)</description>
-		<year>19??</year>
+		<year>1996</year>
 		<publisher>Disney Interactive, Traveller's Tales, Psygnosis</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -306118,7 +309966,7 @@
 
 	<software name="toys_md">
 		<description>Toys (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Absolute Entertainment</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -306191,7 +310039,7 @@
 
 	<software name="trampter_md">
 		<description>Trampoline Terror! (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>NCS Masaya / Dreamworks</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -306276,7 +310124,7 @@
 
 	<software name="traysia_md">
 		<description>Traysia (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Riot / Nihon Telenet</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -306421,7 +310269,7 @@
 
 	<software name="truxton_md">
 		<description>Truxton (GEN/MD)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Toaplan / Taito / Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -306555,7 +310403,7 @@
 
 	<software name="turrican_md">
 		<description>Turrican (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Code Monkeys / Ballistic</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -306658,7 +310506,7 @@
 
 	<software name="twincobr_md">
 		<description>Twin Cobra (Kyuukyoku Tiger) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Toaplan / Treco / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -306725,7 +310573,7 @@
 
 	<software name="twinhawk_md">
 		<description>Twin Hawk (Daisenpuu) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Toaplan / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -306786,7 +310634,7 @@
 
 	<software name="twinklet_md">
 		<description>Twinkle Tale (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>WAS / Toyo Recording</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -306943,7 +310791,7 @@
 
 	<software name="twocrude_md">
 		<description>Two Crude Dudes (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Data East</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -307016,7 +310864,7 @@
 
 	<software name="gomora_md">
 		<description>Uchuu Senkan Gomora (Bio-Ship Paladin) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>UPL</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -307065,7 +310913,7 @@
 
 	<software name="ultqix_md">
 		<description>Ultimate Qix (Volfied) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -307138,7 +310986,7 @@
 
 	<software name="daikok2_md">
 		<description>Uncharted Waters - New Horizons (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -307301,7 +311149,7 @@
 
 	<software name="unchartd_md">
 		<description>Uncharted Waters (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Koei</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -307434,7 +311282,7 @@
 
 	<software name="undead_md">
 		<description>Undead Line (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Palsoft / T&amp;E Soft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -307543,7 +311391,7 @@
 
 	<software name="univsold_md">
 		<description>Universal Soldier (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Accolade / Ballistic</publisher>
 		<info name="cores" value="YM2413, YM2612, YM2151"/>
 		<part name="001" interface="vgm_quik">
@@ -307802,7 +311650,7 @@
 
 	<software name="uzukeo_md">
 		<description>Uzu Keobukseon (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Samsung</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -307887,7 +311735,7 @@
 
 	<software name="valis3_md">
 		<description>Valis III (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Nihon Telenet / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -307990,7 +311838,7 @@
 
 	<software name="valis_md">
 		<description>Valis (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Riot / Renovation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -308190,7 +312038,7 @@
 
 	<software name="vecman_md">
 		<description>Vectorman 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega / Blue Sky</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -308335,7 +312183,7 @@
 
 	<software name="vecman2_md">
 		<description>Vectorman (GEN/MD)</description>
-		<year>19??</year>
+		<year>1996</year>
 		<publisher>Sega / Blue Sky Software</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -308432,7 +312280,7 @@
 
 	<software name="verytex_md">
 		<description>Verytex (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Asmik</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -308511,7 +312359,7 @@
 
 	<software name="viewpoin_md">
 		<description>Viewpoint (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>American Sammy</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -308582,9 +312430,9 @@
 		</part>
 	</software>
 
-	<software name="vf_md">
+	<software name="vf2_md">
 		<description>Virtua Fighter 2 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1996</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -308662,8 +312510,8 @@
 	</software>
 
 	<software name="vrdxu_md">
-		<description>Virtua Racing Deluxe (GEN/MD)</description>
-		<year>19??</year>
+		<description>Virtua Racing Deluxe 32x (GEN/MD)</description>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -308995,7 +312843,7 @@
 
 	<software name="vbart_md">
 		<description>Virtual Bart (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Acclaim</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -309110,7 +312958,7 @@
 
 	<software name="vpinball_md">
 		<description>Virtual Pinball (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Electronic Arts / BudgeCo</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -309159,7 +313007,7 @@
 
 	<software name="vixen357_md">
 		<description>Vixen 357 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>NCS Masaya</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -309484,7 +313332,7 @@
 
 	<software name="vrtroop_md">
 		<description>VR Troopers (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega / Syrox Developments</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -309569,7 +313417,7 @@
 
 	<software name="n3dgwaia_md">
 		<description>Waialae no Kiseki (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega / T&amp;E Soft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -309696,7 +313544,7 @@
 
 	<software name="waniwani_md">
 		<description>Wani Wani World (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Kaneko</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -309811,7 +313659,7 @@
 
 	<software name="wardner_md">
 		<description>Wardner (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Visco / Mentrix</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -309884,7 +313732,7 @@
 
 	<software name="warrior_md">
 		<description>Warrior of Rome (Ambition of Caesar, Caesar no Yabou) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Micronet</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -310011,7 +313859,7 @@
 
 	<software name="warrior2_md">
 		<description>Warrior of Rome II (Caesar no Yabou II) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Micronet</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -310162,7 +314010,7 @@
 
 	<software name="warsong_md">
 		<description>Warsong (Langrisser) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>NCS Masaya / Treco</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -310265,7 +314113,7 @@
 
 	<software name="waynewld_md">
 		<description>Wayne's World (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>T*HQ / Gray Matter</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -310356,7 +314204,7 @@
 
 	<software name="weaponld_md">
 		<description>WeaponLord (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Visual Concepts / Namco</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -310471,7 +314319,7 @@
 
 	<software name="wheelfor_md">
 		<description>Wheel of Fortune (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>GameTek</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -310484,7 +314332,7 @@
 
 	<software name="whiprush_md">
 		<description>Whip Rush (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega / Vic Tokai</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -310605,7 +314453,7 @@
 
 	<software name="wimbled_md">
 		<description>Wimbledon Championship Tennis (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega / SIMS</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -310696,7 +314544,7 @@
 
 	<software name="wiznliz_md">
 		<description>Wiz 'n' Liz (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Psygnosis</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -310877,7 +314725,7 @@
 
 	<software name="wolfchld_md">
 		<description>Wolfchild (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>JVC / Core Design</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -310968,7 +314816,7 @@
 
 	<software name="wolverin_md">
 		<description>Wolverine - Adamantium Rage (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Acclaim</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -311033,9 +314881,9 @@
 		</part>
 	</software>
 
-	<software name="wb3_md">
+	<software name="wboy3_md">
 		<description>Wonder Boy III - Monster Lair (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega / Westone</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -311120,7 +314968,7 @@
 
 	<software name="wboymw_md">
 		<description>Wonder Boy in Monster World (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega / Westone</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -311313,7 +315161,7 @@
 
 	<software name="wcup90_md">
 		<description>World Championship Soccer (World Cup Italia '90, World Cup Soccer) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -311362,7 +315210,7 @@
 
 	<software name="wclead_md">
 		<description>World Class Leaderboard Golf (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>U.S. Gold</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -311387,7 +315235,7 @@
 
 	<software name="wcup94_md">
 		<description>World Cup USA 94 (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Tiertex / US Gold</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -311442,7 +315290,7 @@
 
 	<software name="wh_md">
 		<description>World Heroes (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>ADK / SNK / NuFx / Sega</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -311527,7 +315375,7 @@
 
 	<software name="worldillb_md">
 		<description>World of Illusion (Beta) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -311666,7 +315514,7 @@
 
 	<software name="worldill_md">
 		<description>World of Illusion (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -311829,7 +315677,7 @@
 
 	<software name="worms_md">
 		<description>Worms (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Ocean Software</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -311848,7 +315696,7 @@
 
 	<software name="wrestwar_md">
 		<description>Wrestle War (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -311891,7 +315739,7 @@
 
 	<software name="wwfraw_md">
 		<description>WWF Raw (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Flying Edge</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -311982,7 +315830,7 @@
 
 	<software name="wwfroyal_md">
 		<description>WWF Royal Rumble (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Flying Edge/Acclaim</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -312079,7 +315927,7 @@
 
 	<software name="wwfsup_md">
 		<description>WWF Super Wrestlemania (GEN/MD)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Flying Edge</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -312146,7 +315994,7 @@
 
 	<software name="xmen2_md">
 		<description>X-Men 2 - Clone Wars (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Headgames / Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -312249,7 +316097,7 @@
 
 	<software name="xmen_md">
 		<description>X-Men (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -312334,7 +316182,7 @@
 
 	<software name="xdr_md">
 		<description>XDR - X Dazedly Ray (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Unipacc</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -312407,7 +316255,7 @@
 
 	<software name="ys3_md">
 		<description>Ys III - Wanderers From Ys (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Falcom / Riot / Renovation</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -312600,7 +316448,7 @@
 
 	<software name="yuyumt_md">
 		<description>Yuu Yuu Hakusho - Makyou Touitsusen (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega / Treasure</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -312733,7 +316581,7 @@
 
 	<software name="yuyug_md">
 		<description>Yuu Yuu Hakusho Gaiden (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -312890,7 +316738,7 @@
 
 	<software name="zanyasha_md">
 		<description>Zan Yasha Enbukyoku (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Wolfteam</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -313064,8 +316912,8 @@
 	</software>
 
 	<software name="zaxxon2k_md">
-		<description>Zaxxon's Motherbase 2000 (GEN/MD)</description>
-		<year>19??</year>
+		<description>Zaxxon's Motherbase 2000 32x(GEN/MD)</description>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -313210,7 +317058,7 @@
 
 	<software name="zero_md">
 		<description>Zero the Kamikaze Squirrel (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Iguana / Sunsoft</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -313313,7 +317161,7 @@
 
 	<software name="zerotol_md">
 		<description>Zero Tolerance (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Accolade, Technopop</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -313362,7 +317210,7 @@
 
 	<software name="zerowing_md">
 		<description>Zero Wing (GEN/MD)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Toaplan</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -313477,7 +317325,7 @@
 
 	<software name="zombies_md">
 		<description>Zombies Ate My Neighbors (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Konami / LucasArts</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -313574,7 +317422,7 @@
 
 	<software name="zoolu_md">
 		<description>Zool - Ninja of the Nth Dimension (GEN/MD)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Gremin / Electronic Arts</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -313647,7 +317495,7 @@
 
 	<software name="zoom_md">
 		<description>Zoom! (GEN/MD)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -313738,7 +317586,7 @@
 
 	<software name="zoop_md">
 		<description>Zoop (GEN/MD)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Hookstone / Viacom New Media</publisher>
 		<info name="cores" value="YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -314251,7 +318099,7 @@
 
 	<software name="slamcity_md">
 		<description>Slam City with Scottie Pippen (Sega CD) (GEN/MD)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Digital Pictures, Inc.</publisher>
 		<info name="cores" value="SN76496, YM2612"/>
 		<part name="001" interface="vgm_quik">
@@ -315593,7 +319441,7 @@
 
 	<software name="20em1_sms">
 		<description>20 Em 1 (SMS)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -315655,7 +319503,7 @@
 
 	<software name="actionfg_sms">
 		<description>Action Fighter (SMS)</description>
-		<year>19??</year>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -315789,7 +319637,7 @@
 
 	<software name="aburner_smsfm">
 		<description>After Burner (SMS-FM)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -315832,7 +319680,7 @@
 
 	<software name="aburner_sms">
 		<description>After Burner (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -315881,7 +319729,7 @@
 
 	<software name="airresc_sms">
 		<description>Air Rescue (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -315966,7 +319814,7 @@
 
 	<software name="aladdin_sms">
 		<description>Aladdin (SMS)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -316081,7 +319929,7 @@
 
 	<software name="alexhitw_sms">
 		<description>Alex Kidd High Tech World (SMS)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -316154,7 +320002,7 @@
 
 	<software name="alexkidd_sms">
 		<description>Alex Kidd In Miracle World (SMS)</description>
-		<year>19??</year>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -316221,7 +320069,7 @@
 
 	<software name="alexshin_sms">
 		<description>Alex Kidd In Shinobi World (SMS)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -316306,7 +320154,7 @@
 
 	<software name="alexlost_smsfm">
 		<description>Alex Kidd The Lost Stars (SMS-FM)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -316373,7 +320221,7 @@
 
 	<software name="alexlost_sms">
 		<description>Alex Kidd The Lost Stars (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -316495,7 +320343,7 @@
 
 	<software name="alien3_sms">
 		<description>Alien 3 (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega / Acclaim / Probe</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -316580,7 +320428,7 @@
 
 	<software name="astorm_sms">
 		<description>Alien Storm (SMS)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -316891,7 +320739,7 @@
 
 	<software name="antarct_cv">
 		<description>Antarctic Adventure (ColecoVision)</description>
-		<year>19??</year>
+		<year>1984</year>
 		<publisher>Konami</publisher>
 		<info name="cores" value="ColecoVision"/>
 		<part name="001" interface="vgm_quik">
@@ -317020,7 +320868,7 @@
 
 	<software name="ashura_sms">
 		<description>Ashura (SMS)</description>
-		<year>19??</year>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -317075,7 +320923,7 @@
 
 	<software name="asterix_sms">
 		<description>Asterix (SMS)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -317250,7 +321098,7 @@
 
 	<software name="astergre_sms">
 		<description>Asterix And The Great Rescue (SMS)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -317341,7 +321189,7 @@
 
 	<software name="astermis_sms">
 		<description>Asterix And The Secret Mission (SMS)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -317534,7 +321382,7 @@
 
 	<software name="astrow_sms">
 		<description>Astro Warrior (SMS)</description>
-		<year>19??</year>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -317595,7 +321443,7 @@
 
 	<software name="sn_ateam_sms">
 		<description>A Team (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>n/a</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -317783,7 +321631,7 @@
 
 	<software name="aztecadv_smsfm">
 		<description>Aztec Adventure (SMS-FM)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -317850,7 +321698,7 @@
 
 	<software name="aztecadv_sms">
 		<description>Aztec Adventure (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -317917,7 +321765,7 @@
 
 	<software name="backtof2_sms">
 		<description>Back To The Future Part II (SMS)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -318058,7 +321906,7 @@
 
 	<software name="bartvsw_sms">
 		<description>Bart Vs The World (SMS)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -318112,9 +321960,9 @@
 		</part>
 	</software>
 
-	<software name="batman_sms">
+	<software name="batmanrn_sms">
 		<description>Batman Returns (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -318382,7 +322230,7 @@
 
 	<software name="btoads_gg">
 		<description>Battletoads (GG)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -318575,8 +322423,8 @@
 	</software>
 
 	<software name="sms1_sms">
-		<description>BIOS (SMS)</description>
-		<year>19??</year>
+		<description>SMS BIOS (SMS)</description>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -318740,7 +322588,7 @@
 
 	<software name="blckonyx_sg">
 		<description>Black Onyx (SG)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SG"/>
 		<part name="001" interface="vgm_quik">
@@ -318765,7 +322613,7 @@
 
 	<software name="bladeag_sms">
 		<description>Blade Eagle 3-D (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -319161,7 +323009,7 @@
 
 	<software name="buggyrun_sms">
 		<description>Buggy Run (SMS)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -319432,7 +323280,7 @@
 		</part>
 	</software>
 
-	<software name="csilver_smsfm">
+	<software name="captsilv_smsfm">
 		<description>Captain Silver (SMS-FM)</description>
 		<year>1988</year>
 		<publisher>Sega</publisher>
@@ -319505,9 +323353,9 @@
 		</part>
 	</software>
 
-	<software name="csilver_sms">
+	<software name="captsilv_sms">
 		<description>Captain Silver (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -319725,7 +323573,7 @@
 
 	<software name="castle_sg">
 		<description>Castle (SG)</description>
-		<year>19??</year>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SG"/>
 		<part name="001" interface="vgm_quik">
@@ -319798,7 +323646,7 @@
 
 	<software name="castlill_sms">
 		<description>Castle Of Illusion (SMS)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega / Disney</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -319913,7 +323761,7 @@
 
 	<software name="cloderun_sg">
 		<description>Championship Lode Runner (SG)</description>
-		<year>19??</year>
+		<year>1985</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SG"/>
 		<part name="001" interface="vgm_quik">
@@ -319950,7 +323798,7 @@
 
 	<software name="champtns_sg">
 		<description>Champion Tennis (SG)</description>
-		<year>19??</year>
+		<year>1983</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SG"/>
 		<part name="001" interface="vgm_quik">
@@ -320054,7 +323902,7 @@
 
 	<software name="choplift_sg">
 		<description>Choplifter (SG)</description>
-		<year>19??</year>
+		<year>1985</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SG"/>
 		<part name="001" interface="vgm_quik">
@@ -320089,9 +323937,9 @@
 		</part>
 	</software>
 
-	<software name="choplft3_sms">
+	<software name="choplift_sms">
 		<description>Choplifter (SMS)</description>
-		<year>19??</year>
+		<year>1985</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -320164,7 +324012,7 @@
 
 	<software name="chuckrck_sms">
 		<description>Chuck Rock (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Virgin Games</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -320365,9 +324213,9 @@
 		</part>
 	</software>
 
-	<software name="cltchitr_gg">
+	<software name="clutchit_gg">
 		<description>Clutch Hitter (GG)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -320543,7 +324391,7 @@
 
 	<software name="cosmic_sms">
 		<description>Cosmic Spacehead (SMS)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Codemasters</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -321191,7 +325039,7 @@
 
 	<software name="deepduck_sms">
 		<description>Deep Duck Trouble (SMS)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -321342,7 +325190,7 @@
 
 	<software name="dicktr_sms">
 		<description>Dick Tracy (SMS)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -321592,7 +325440,7 @@
 
 	<software name="ddragon_sms">
 		<description>Double Dragon (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -321788,7 +325636,7 @@
 
 	<software name="dcrystal_gg">
 		<description>Dragon Crystal (GG)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -322198,7 +326046,7 @@
 
 	<software name="dhead_gg">
 		<description>Dynamite Headdy (GG)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -322271,7 +326119,7 @@
 
 	<software name="ecco_gg">
 		<description>Ecco The Dolphin (GG)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -322386,7 +326234,7 @@
 
 	<software name="ecco2_gg">
 		<description>Ecco The Tides Of Time (GG)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -322427,9 +326275,9 @@
 		</part>
 	</software>
 
-	<software name="enduror_sms">
+	<software name="enduro_sms">
 		<description>Enduro Racer (SMS)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -322472,7 +326320,7 @@
 
 	<software name="eswatc_sms">
 		<description>ESWAT (SMS)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -322655,7 +326503,7 @@
 
 	<software name="f16falc_sms">
 		<description>F 1 6 Fighting Falcon (SMS)</description>
-		<year>19??</year>
+		<year>1985</year>
 		<publisher>Sega / Nexa</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -322910,7 +326758,7 @@
 
 	<software name="fantzone_sms">
 		<description>Fantasy Zone (SMS)</description>
-		<year>19??</year>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -323001,7 +326849,7 @@
 
 	<software name="fantzon2_smsfm">
 		<description>Fantasy Zone II (SMS-FM)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -323092,7 +326940,7 @@
 
 	<software name="fantzon2_sms">
 		<description>Fantasy Zone II (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -323183,7 +327031,7 @@
 
 	<software name="fantzonm_sms">
 		<description>Fantasy Zone The Maze (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -323396,7 +327244,7 @@
 
 	<software name="flint_sms">
 		<description>Flintstones (SMS)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -323524,7 +327372,7 @@
 
 	<software name="pitpot1_sms">
 		<description>Fushigi No Oshiro Pit Pot (SMS)</description>
-		<year>19??</year>
+		<year>1985</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -323628,7 +327476,7 @@
 
 	<software name="galactpr_smsfm">
 		<description>Galactic Protector (SMS-FM)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -323683,7 +327531,7 @@
 
 	<software name="gforce_smsfm">
 		<description>Galaxy Force (SMS-FM)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -323732,7 +327580,7 @@
 
 	<software name="gforce_sms">
 		<description>Galaxy Force (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -324030,7 +327878,7 @@
 
 	<software name="ggaleste_gg">
 		<description>GG Aleste II (GG)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -324151,7 +327999,7 @@
 
 	<software name="shinobi_gg">
 		<description>GG Shinobi (GG)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -324278,7 +328126,7 @@
 
 	<software name="shinobi2_gg">
 		<description>GG Shinobi II (GG)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -324423,7 +328271,7 @@
 
 	<software name="ghostbst_sms">
 		<description>Ghostbusters (SMS)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -324454,7 +328302,7 @@
 
 	<software name="ghosth_sms">
 		<description>Ghost House (SMS)</description>
-		<year>19??</year>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -324661,7 +328509,7 @@
 
 	<software name="globald_smsfm">
 		<description>Global Defense (SMS-FM)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -324704,7 +328552,7 @@
 
 	<software name="globald_sms">
 		<description>Global Defense (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -324808,7 +328656,7 @@
 
 	<software name="gaxewarr_sms">
 		<description>Golden Axe Warrior (SMS)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -325080,7 +328928,7 @@
 
 	<software name="golvell_sms">
 		<description>Golvellius (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -325267,7 +329115,7 @@
 
 	<software name="greatbas_sms">
 		<description>Great Baseball (SMS)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -325296,7 +329144,7 @@
 		</part>
 	</software>
 
-	<software name="greatbasc_sms">
+	<software name="greatbasj_sms">
 		<description>Great Baseball Card (SMS)</description>
 		<year>19??</year>
 		<publisher>Sega</publisher>
@@ -325335,7 +329183,7 @@
 
 	<software name="greatbsk_sms">
 		<description>Great Basketball (SMS)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -325458,7 +329306,7 @@
 
 	<software name="greatvol_sms">
 		<description>Great Volleyball (SMS)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -325537,7 +329385,7 @@
 
 	<software name="gunstar_gg">
 		<description>Gunstar Heroes (GG)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega / Treasure / M2</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -325676,7 +329524,7 @@
 
 	<software name="hangon_sms">
 		<description>Hang On (SMS)</description>
-		<year>19??</year>
+		<year>1985</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -325768,7 +329616,7 @@
 
 	<software name="highsc_sms">
 		<description>High School Kimengumi (SMS)</description>
-		<year>19??</year>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -325829,7 +329677,7 @@
 
 	<software name="hokuto_sms">
 		<description>Hokuto No Ken (SMS)</description>
-		<year>19??</year>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -325908,7 +329756,7 @@
 
 	<software name="homea_sms">
 		<description>Home Alone (SMS)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -326133,7 +329981,7 @@
 
 	<software name="indycrus_sms">
 		<description>Indiana Jones And The Last Crusade (SMS)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -326158,7 +330006,7 @@
 
 	<software name="robocod_sms">
 		<description>James Pond II (SMS)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>U.S. Gold</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -326354,7 +330202,7 @@
 
 	<software name="jpark_sms">
 		<description>Jurassic Park (SMS)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -326481,7 +330329,7 @@
 
 	<software name="kenseid_sms">
 		<description>Kenseiden (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -326578,7 +330426,7 @@
 
 	<software name="krustyfh_sms">
 		<description>Krustys Fun House (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -326657,7 +330505,7 @@
 
 	<software name="kungfuk_sms">
 		<description>Kung Fu Kid (SMS)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -326712,7 +330560,7 @@
 
 	<software name="landill_sms">
 		<description>Land Of Illusion (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -326906,7 +330754,7 @@
 
 	<software name="legndill_sms">
 		<description>Legend Of Illusion (SMS)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega / Disney</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -327075,7 +330923,7 @@
 
 	<software name="lemmings_sms">
 		<description>Lemmings (SMS)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -327214,7 +331062,7 @@
 
 	<software name="sn_lwep3_sms">
 		<description>Lethal Weapon 3 (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>n/a</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -327348,7 +331196,7 @@
 
 	<software name="lordswrd_sms">
 		<description>Lord Of The Sword (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -327415,7 +331263,7 @@
 
 	<software name="luckydim_sms">
 		<description>Lucky Dime Caper (SMS)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega / Disney</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -327771,7 +331619,7 @@
 
 	<software name="marble_sms">
 		<description>Marble Madness (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Tengen</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -327917,7 +331765,7 @@
 
 	<software name="mash_cv">
 		<description>M.A.S.H. (ColecoVision)</description>
-		<year>19??</year>
+		<year>1983</year>
 		<publisher>Fox Video Games</publisher>
 		<info name="cores" value="ColecoVision"/>
 		<part name="001" interface="vgm_quik">
@@ -327930,7 +331778,7 @@
 
 	<software name="mastdark_sms">
 		<description>Master Of Darkness (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -328021,7 +331869,7 @@
 
 	<software name="mazehunt_smsfm">
 		<description>Maze Hunter 3-D (SMS-FM)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -328076,7 +331924,7 @@
 
 	<software name="mazehunt_sms">
 		<description>Maze Hunter 3-D (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -328246,7 +332094,7 @@
 
 	<software name="megumi_smsfm">
 		<description>Megumi Rescue (SMS-FM)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -328319,7 +332167,7 @@
 
 	<software name="megumi_sms">
 		<description>Megumi Rescue (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -328392,7 +332240,7 @@
 
 	<software name="micromac_sms">
 		<description>Micro Machines (SMS)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Codemasters</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -328471,7 +332319,7 @@
 
 	<software name="micromac_gg">
 		<description>Micro Machines 2 (GG)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Codemasters</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -328617,7 +332465,7 @@
 
 	<software name="miracle_sms">
 		<description>Miracle Warriors (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -328764,7 +332612,7 @@
 
 	<software name="montezum_sms">
 		<description>Montezumas Revenge (SMS)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Parker Brothers</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -329045,7 +332893,7 @@
 
 	<software name="mspacman_sms">
 		<description>Ms Pac Man (SMS)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega / Namco / Tengen</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -329082,7 +332930,7 @@
 
 	<software name="myhero_sms">
 		<description>My Hero (SMS)</description>
-		<year>19??</year>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -329241,7 +333089,7 @@
 
 	<software name="ngaiden_sms">
 		<description>Ninja Gaiden (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -329393,7 +333241,7 @@
 
 	<software name="ottifant_sms">
 		<description>Ottifants (SMS)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -329485,7 +333333,7 @@
 
 	<software name="outrun_sms">
 		<description>Out Run (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -329553,7 +333401,7 @@
 
 	<software name="outrun3d_sms">
 		<description>Out Run 3-D (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -329590,7 +333438,7 @@
 
 	<software name="pacintim_gg">
 		<description>Pac In Time (GG)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Namco / Mindscape</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -329651,7 +333499,7 @@
 
 	<software name="paperboy_sms">
 		<description>Paperboy (SMS)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -329670,7 +333518,7 @@
 
 	<software name="parlour_sms">
 		<description>Parlour Games (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -329937,7 +333785,7 @@
 
 	<software name="pengland_sms">
 		<description>Penguin Land (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -330113,7 +333961,7 @@
 
 	<software name="pstar_sms">
 		<description>Phantasy Star (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -330234,7 +334082,7 @@
 
 	<software name="pstaradv_gg">
 		<description>Phantasy Star Adventure (GG)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -330277,7 +334125,7 @@
 
 	<software name="pstargdn_gg">
 		<description>Phantasy Star Gaiden (GG)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -330368,7 +334216,7 @@
 
 	<software name="pitfall2_sg">
 		<description>Pitfall II (SG)</description>
-		<year>19??</year>
+		<year>1985</year>
 		<publisher>Sega / Activision</publisher>
 		<info name="cores" value="SG"/>
 		<part name="001" interface="vgm_quik">
@@ -330515,7 +334363,7 @@
 
 	<software name="pstrike_sms">
 		<description>Power Strike (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -330770,7 +334618,7 @@
 
 	<software name="ppersia_sms">
 		<description>Prince Of Persia (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Domark</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -330898,7 +334746,7 @@
 
 	<software name="proyakyu_sms">
 		<description>Pro Yakyuu (SMS)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -330941,7 +334789,7 @@
 
 	<software name="proyak91_gg">
 		<description>Pro Yakyuu'91 (GG)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -331018,9 +334866,9 @@
 		</part>
 	</software>
 
-	<software name="psychicwj_sms">
+	<software name="psychicw_sms">
 		<description>Psychic World (SMS)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -331111,7 +334959,7 @@
 
 	<software name="psychof_sms">
 		<description>Psycho Fox (SMS)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -331287,7 +335135,7 @@
 
 	<software name="quartet_sms">
 		<description>Quartet (SMS)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -331360,7 +335208,7 @@
 
 	<software name="shavnyak_gg">
 		<description>Quest For The Shaven Yak (GG)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega / Realtime Associates</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -331506,7 +335354,7 @@
 
 	<software name="rambo3_smsfm">
 		<description>Rambo III (SMS-FM)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -331567,7 +335415,7 @@
 
 	<software name="rambo3_sms">
 		<description>Rambo III (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -331720,7 +335568,7 @@
 
 	<software name="rcgp_sms">
 		<description>R C Grand Prix (SMS)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -331818,7 +335666,7 @@
 
 	<software name="ristar_gg">
 		<description>Ristar The Shooting Star (GG)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -332035,7 +335883,7 @@
 
 	<software name="roadrash_sms">
 		<description>Road Rash (SMS)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>US Gold</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -332137,9 +335985,9 @@
 		</part>
 	</software>
 
-	<software name="rock_sms">
+	<software name="rocky_sms">
 		<description>Rocky (SMS)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -332212,7 +336060,7 @@
 
 	<software name="rtype_sms">
 		<description>R Type (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -332321,7 +336169,7 @@
 
 	<software name="running_sms">
 		<description>Running Battle (SMS)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -332406,7 +336254,7 @@
 
 	<software name="hangonsh_sms">
 		<description>Safari Hunt (SMS)</description>
-		<year>19??</year>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -332437,7 +336285,7 @@
 
 	<software name="sagaia_sms">
 		<description>Sagaia (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Taito</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -332528,7 +336376,7 @@
 
 	<software name="satell7a_sms">
 		<description>Satellite 7 (SMS)</description>
-		<year>19??</year>
+		<year>1985</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -332553,7 +336401,7 @@
 
 	<software name="segachss_sms">
 		<description>Sega Chess (SMS)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -332846,7 +336694,7 @@
 
 	<software name="shinfrgf_gg">
 		<description>Shining Force Gaiden Final Conflict (GG)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -333033,7 +336881,7 @@
 
 	<software name="shinfrg2_gg">
 		<description>Shining Force Gaiden II (GG)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -333226,7 +337074,7 @@
 
 	<software name="shinnyus_sg">
 		<description>Shinnyuushain Tooru Kun (SG)</description>
-		<year>19??</year>
+		<year>1985</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SG"/>
 		<part name="001" interface="vgm_quik">
@@ -333334,9 +337182,9 @@
 		</part>
 	</software>
 
-	<software name="shootinf_sms">
+	<software name="shooting_sms">
 		<description>Shooting Gallery (SMS)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -333391,7 +337239,7 @@
 
 	<software name="slider_gg">
 		<description>Slider (GG)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -333458,8 +337306,8 @@
 
 	<software name="smurfs_gg">
 		<description>Smurfs (GG)</description>
-		<year>19??</year>
-		<publisher>No_Data</publisher>
+		<year>1994</year>
+		<publisher>Infogrames</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="smurfs, the (gg) - 01 - intro (part i).vgm" />
@@ -333597,7 +337445,7 @@
 
 	<software name="smurfs_sms">
 		<description>Smurfs (SMS)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega / Infogrames</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -333785,7 +337633,7 @@
 
 	<software name="sonicbls_sms">
 		<description>Sonic Blast (SMS)</description>
-		<year>19??</year>
+		<year>1997</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -333900,7 +337748,7 @@
 
 	<software name="sonicc_sms">
 		<description>Sonic Chaos (SMS)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -334117,7 +337965,7 @@
 
 	<software name="sonicdr_gg">
 		<description>Sonic Drift (GG)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -334208,7 +338056,7 @@
 
 	<software name="sonicdr2_gg">
 		<description>Sonic Drift 2 (GG)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -334359,7 +338207,7 @@
 
 	<software name="soniclab_gg">
 		<description>Sonic Labyrinth (GG)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -334511,7 +338359,7 @@
 
 	<software name="sspin_gg">
 		<description>Sonic Spinball (GG)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -334566,7 +338414,7 @@
 
 	<software name="sonic_sms">
 		<description>Sonic The Hedgehog (SMS)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -334820,7 +338668,7 @@
 
 	<software name="sonictri_gg">
 		<description>Sonic Triple Trouble (GG)</description>
-		<year>19??</year>
+		<year>1994</year>
 		<publisher>Sega/Aspect Co. Ltd</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -335025,7 +338873,7 @@
 
 	<software name="sharrier_sms">
 		<description>Space Harrier (SMS)</description>
-		<year>19??</year>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -335134,7 +338982,7 @@
 
 	<software name="sharr3d_smsfm">
 		<description>Space Harrier 3-D (SMS-FM)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -335255,7 +339103,7 @@
 
 	<software name="sharr3d_sms">
 		<description>Space Harrier 3-D (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -335376,7 +339224,7 @@
 
 	<software name="spellcst_sms">
 		<description>Spell Caster (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -335528,7 +339376,7 @@
 
 	<software name="spidking_sms">
 		<description>Spider Man Vs The Kingpin (SMS)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -336116,7 +339964,7 @@
 
 	<software name="sor2_gg">
 		<description>Streets Of Rage II (GG)</description>
-		<year>19??</year>
+		<year>1993</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -336499,7 +340347,7 @@
 
 	<software name="sukeban_sms">
 		<description>Sukeban Deka II (SMS)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -336615,7 +340463,7 @@
 
 	<software name="sumgames_sms">
 		<description>Summer Games (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1991</year>
 		<publisher>Sega / Epyx</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -336736,7 +340584,7 @@
 
 	<software name="suprbskt_smsfm">
 		<description>Super Basketball (SMS-FM)</description>
-		<year>19??</year>
+		<year>1989?</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -336749,7 +340597,7 @@
 
 	<software name="suprbskt_sms">
 		<description>Super Basketball (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1989?</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -336762,7 +340610,7 @@
 
 	<software name="sboy4_sms">
 		<description>Super Boy 4 (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Zemina</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -336835,7 +340683,7 @@
 
 	<software name="sboy2_sms">
 		<description>Super Boy II (SMS)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Zemina</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -336860,7 +340708,7 @@
 
 	<software name="supercol_gg">
 		<description>Super Columns (GG)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -336963,7 +340811,7 @@
 
 	<software name="smgp_sms">
 		<description>Super Monaco GP (SMS)</description>
-		<year>19??</year>
+		<year>1990</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -337042,7 +340890,7 @@
 
 	<software name="smgp2_sms">
 		<description>Super Monaco GP I (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -337122,7 +340970,7 @@
 
 	<software name="stennis_sms">
 		<description>Super Tennis (SMS)</description>
-		<year>19??</year>
+		<year>1985</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -337175,8 +341023,8 @@
 		</part>
 	</software>
 
-	<software name="stetris">
-		<description>(SuperTetris)</description>
+	<software name="stetris_gg">
+		<description>Super Tetris (GG)</description>
 		<year>19??</year>
 		<publisher>Unknown</publisher>
 		<info name="cores" value="SuperTetris"/>
@@ -337546,7 +341394,7 @@
 
 	<software name="tailskyp_gg">
 		<description>Tails Skypatrol (GG)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
@@ -337752,7 +341600,7 @@
 
 	<software name="tazmania_sms">
 		<description>Taz Mania (SMS)</description>
-		<year>19??</year>
+		<year>1992</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -337831,7 +341679,7 @@
 
 	<software name="teddyboy_sms">
 		<description>Teddy Boy (SMS)</description>
-		<year>19??</year>
+		<year>1985</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -337897,7 +341745,7 @@
 		</part>
 	</software>
 
-	<software name="thndrbld_smsfm">
+	<software name="tblade_smsfm">
 		<description>Thunder Blade (SMS-FM)</description>
 		<year>1988</year>
 		<publisher>Sega</publisher>
@@ -337934,7 +341782,7 @@
 		</part>
 	</software>
 
-	<software name="thndrbld_sms">
+	<software name="tblade_sms">
 		<description>Thunder Blade (SMS-PSG)</description>
 		<year>19??</year>
 		<publisher>Sega</publisher>
@@ -338307,7 +342155,7 @@
 
 	<software name="transbot_sms">
 		<description>Trans Bot (SMS)</description>
-		<year>19??</year>
+		<year>1985</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -340181,7 +344029,7 @@
 
 	<software name="wboy_sms">
 		<description>Wonder Boy (SMS)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -340561,9 +344409,9 @@
 		</part>
 	</software>
 
-	<software name="wbml_smsfm">
+	<software name="wboymlnd_smsfm">
 		<description>Wonder Boy In Monster Land (SMS-FM)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -340628,9 +344476,9 @@
 		</part>
 	</software>
 
-	<software name="wbml_sms">
+	<software name="wboymlnd_sms">
 		<description>Wonder Boy In Monster Land (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -340928,7 +344776,7 @@
 
 	<software name="wldgames_sms">
 		<description>World Games (SMS)</description>
-		<year>19??</year>
+		<year>1989</year>
 		<publisher>Sega / Epyx</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -341065,9 +344913,9 @@
 		</part>
 	</software>
 
-	<software name="wgp_sms">
+	<software name="worldgp_sms">
 		<description>World Grand Prix (SMS)</description>
-		<year>19??</year>
+		<year>1986</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -341080,7 +344928,7 @@
 
 	<software name="worldsoc_sms">
 		<description>World Soccer (SMS)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -341631,7 +345479,7 @@
 
 	<software name="ys_sms">
 		<description>Ys (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1988</year>
 		<publisher>Sega/Falcom</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -341759,7 +345607,7 @@
 	<software name="zangear_gg">
 		<description>Zan Gear (GG)</description>
 		<year>1990</year>
-		<publisher>No_Data</publisher>
+		<publisher>Wolfteam</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
 			<feature name="part_id" value="zan gear (gg) - 01 - age of heat haze.vgm" />
@@ -341898,7 +345746,7 @@
 
 	<software name="zillion_sms">
 		<description>Zillion (SMS)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -341947,7 +345795,7 @@
 
 	<software name="zillion2_smsfm">
 		<description>Zillion II (SMS-FM)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="YM2413"/>
 		<part name="001" interface="vgm_quik">
@@ -341984,7 +345832,7 @@
 
 	<software name="zillion2_sms">
 		<description>Zillion II (SMS-PSG)</description>
-		<year>19??</year>
+		<year>1987</year>
 		<publisher>Sega</publisher>
 		<info name="cores" value="SN76496"/>
 		<part name="001" interface="vgm_quik">
@@ -342052,7 +345900,7 @@
 
 	<software name="zoop_gg">
 		<description>Zoop (GG)</description>
-		<year>19??</year>
+		<year>1995</year>
 		<publisher>Viacom New Media</publisher>
 		<info name="cores" value="SN76496 (panned)"/>
 		<part name="001" interface="vgm_quik">
diff -Nru mame-0.222+dfsg.1/hash/vsmileb_cart.xml mame-0.224+dfsg.1/hash/vsmileb_cart.xml
--- mame-0.222+dfsg.1/hash/vsmileb_cart.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/vsmileb_cart.xml	2020-08-26 08:57:19.000000000 +0000
@@ -66,7 +66,7 @@
 |        | 80-099140(US)     | Teletubbies                                                                |
 |        | 80-099142(NL)     | Teletubbies                                                                |
 |        | 80-099143(UK)     | Teletubbies                                                                |
-|        | 80-099145(FR)     | Teletubbies                                                                |
+|   XX   | 80-099145(FR)     | Teletubbies                                                                |
 +========+===================+============================================================================+
 |        | 80-099160(US)     | Discovery with Baby Mickey and Friends                                     |
 |        | 80-099163(UK)     | Discovery with Baby Mickey and Friends                                     |
@@ -225,5 +225,17 @@
 			</dataarea>
 		</part>
 	</software>
+
+	<software name="teletubf" supported="no">
+		<description>Teletubbies (France)</description>
+		<year>1996</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-099145(FR)" />
+		<part name="cart" interface="vsmile_cart">
+			<dataarea name="rom" size="8388608">
+				<rom name="099145 - Teletubbies (BABY) (FR).bin" size="8388608" crc="374cc936" sha1="462bf0a16eb16bd4ca008d9e57a914f88986920b" />
+			</dataarea>
+		</part>
+	</software>
 
 </softwarelist>
diff -Nru mame-0.222+dfsg.1/hash/vsmile_cart.xml mame-0.224+dfsg.1/hash/vsmile_cart.xml
--- mame-0.222+dfsg.1/hash/vsmile_cart.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/vsmile_cart.xml	2020-08-26 08:57:19.000000000 +0000
@@ -18,12 +18,12 @@
 ********5 = France            (Yellow labels on back, also for NTSC French-Canadian)
 ********6 = Portugal          Apparently distributed by company 'Concentra' (White labels on back)
 ********7 = Spain             (Green labels on back)
+********8 = China
 *******10 = Korea
 *******13 = Denmark           Distributed by the company 'Top Toy A/S'
 *******14 = Sweden            Distributed by the company 'Top Toy A/S'
 *******15 = Norway
 *******?? = Finland
-*******?? = China
 
 
 Addons (w/ yellow Smartridges)
@@ -53,7 +53,7 @@
 |   XX   | 80-067022(SP)     | V.Smile Estudio de Arte (yellow)                                           |
 |        | 80-067033(NO)     | V.Smile Tegnestudio                                                        |
 |        | 80-067057(SP)     | V.Smile Estudio de Arte (pink)                                             |
-|        |          (CN)     | 智乐学习通小画室                                                            |
+|        | 80-067058(CN)     | 智乐学习通小画室                                                            |
 +========+===================+============================================================================+
 |        | 80-091320(US)     | V.Smile Jamming Gym Class                                                  |
 |        | 80-091322(NL)     | V.Smile Muziek en Leer Mat                                                 |
@@ -116,7 +116,7 @@
 |        | 80-090200(US)     | <Unknown>                                                                                      |
 +========+===================+================================================================================================+
 |        | 80-090220(US)     | <Unknown> should be Wild Waves (purple)                                                        |
-|        | 80-090224(GE)     | Dolphis Wasser-abenteuer (52-090224(GE) on back label)                                         |
+|   XX   | 80-090224(GE)     | Dolphis Wasser-abenteuer (52-090224(GE) on back label)                                         |
 +========+===================+================================================================================================+
 |        | 80-090240(US)     | <Unknown>                                                                                      |
 +========+===================+================================================================================================+
@@ -146,8 +146,8 @@
 |        | 80-092006(PT)     | ABC Adventure (EAN is 3417768920162 cart#92016)                                                |
 |   XX   | 80-092007(SP)     | Aventuras en el Parque Alfabeto (purple, no # on label, 92007 on PCB)                          |
 |        | 80-092007(SP)     | Aventuras en el Parque Alfabeto (translucent blue cart, no # on label)                         |
+|        | 80-092008(CN)     | 英语乐园                                                                                        |
 |        |          (KOR)    | Alphabet Park Adventure - 알파벳 공원 대탐험                                                     |
-|        |          (CN)     | 英语乐园                                                                                        |
 +========+===================+================================================================================================+
 |        | 80-092020(US)     | The Adventures of Little Red Riding Hood                                                       |
 |        | 80-092023(UK)     | The Adventures of Little Red Riding Hood (no # on label, but box says 'colours')               |
@@ -173,13 +173,13 @@
 |        | 80-092066(PT)     | Winnie the Pooh - Em Busca Do Mel (92076 on cart)                                              |
 |   XX   | 80-092067(SP)     | Winnie the Pooh - En Busca de la Miel (no # on label, 92067 on PCB)                            |
 |   XX   | 80-092067-122(SP) | My Friends Tigger and Pooh - En Busca de la Miel (rev. 122, 092067-1 on PCB)                   |
+|        | 80-092068(CN)     | 小熊维尼                                                                                        |
 |   XX   | 80-092073(DK)     | Peter Plys - Honningjagten                                                                     |
 |   XX   | 80-092074(SE)     | Nalle Puh - Honungsjakten                                                                      |
 |        |          (NO)     | Winnie the Pooh - Honningjakten                                                                |
 |        |          (NO)     | Ole Brumm - Honningjakten                                                                      |
 |        |          (FI)     | Winnie the Pooh - Hunajajahti                                                                  |
 |        |          (KOR)    | Winnie The Pooh: The Honey Hunt - 푸우와 함께하는 꿀사냥놀이                                      |
-|        |          (CN)     | 小熊维尼                                                                                        |
 +========+===================+================================================================================================+
 |   XX   | 80-092080(US)     | Mickey Mouse - Mickey's Magical Adventure                                                      |
 |   XX   | 80-092081(IT)     | Topolino - Le Magiche Avventure di Topolino                                                    |
@@ -189,12 +189,12 @@
 |   XX   | 80-092085(FR)     | Mickey - Mickey à la recherche de Pluto                                                        |
 |        | 80-092086(PT)     | Mickey - A Aventura Mágica de Mickey (EAN is 3417768920964 cart 92096)                         |
 |   XX   | 80-092087(SP)     | Mickey - La Aventura Mágica de Mickey (no # on label, 92087 on PCB)                            |
+|        | 80-092088(CN)     | 米奇魔幻历险记                                                                                   |
 |        |          (DK)     | Mickey                                                                                         |
 |   XX   | 80-092094(SE)     | Musse Pigg - Musses magiska äventyr                                                            |
 |        |          (NO)     | Mickey                                                                                         |
 |        |          (FI)     | Mickey                                                                                         |
 |        |          (KOR)    | Mickey Mouse - Mickey's Magical Adventure - 미키마우스의 신비한 마술여행                           |
-|        |          (CN)     | 米奇魔幻历险记                                                                                   |
 +========+===================+================================================================================================+
 |   XX   | 80-092100(US)     | The Lion King - Simba's Big Adventure                                                          |
 |   XX   | 80-092101(IT)     | Il Re Leone - La Grande Avventura di Simba                                                     |
@@ -204,12 +204,12 @@
 |   XX   | 80-092105(FR)     | Le Roi Lion - Simba Découvre la Jungle                                                         |
 |        | 80-092106(PT)     | O Rei Leao - A grande aventura de Simba (92116 on cart)                                        |
 |   XX   | 80-092107(SP)     | El Rey León - La Gran Aventura de Simba (no # on label, 92187 on PCB)                          |
+|        | 80-092108(CN)     | 狮子王辛巴成长历险记                                                                              |
 |        |          (KOR)    | The Lion King - Simba's Big Adventure                                                          |
 |   XX   | 80-092113(DK)     | Løvernes Konge - Simbas store eventyr                                                          |
 |   XX   | 80-092114(SE)     | Lejonkungen - Simbas stora äventyr                                                             |
 |        |          (NO)     | Løvenes konge - Simbas store eventyr                                                           |
 |        |          (FI)     | Leijona kuningas - Simban suuri seikkailu                                                      |
-|        |          (CN)     | 狮子王辛巴成长历险记                                                                              |
 +========+===================+================================================================================================+
 |        | 80-092120(US)     | The Little Mermaid - Ariel's Majestic Journey                                                  |
 |   XX   | 80-092121(IT)     | La sirenetta - Ariel e la crociera magica                                                      |
@@ -219,12 +219,12 @@
 |   XX   | 80-092125(FR)     | La Petite Sirene - Ariel devient une princesse                                                 |
 |        | 80-092126(PT)     |                                                                                                |
 |   XX   | 80-092127(SP)     | La Sirenita - El Viaje Fantástico de Ariel (no # on label)                                     |
+|        | 80-092128(CN)     | 美人鱼梦幻之旅                                                                                   |
 |   XX   | 80-092133(DK)     | Den Lille Havfrue - Ariels majestætiske rejse!                                                 |
 |   XX   | 80-092134(SE)     | Den Lilla Sjöjungfrun - Ariels majestätiska resa!                                              |
 |        |          (NO)     | Den Lille Havfruen - Ariels majestetiske reise!                                                |
 |        |          (FI)     | Pieni Merenneito - Arielin majesteettinen matka                                                |
 |        |          (KOR)    | The Little Mermaid - Ariel's Majestic Journey - 인어공주의 신나는 탐험여행                        |
-|        |          (CN)     | 美人鱼梦幻之旅                                                                                   |
 +========+===================+================================================================================================+
 |        | 80-092140(US)     | Spider-Man & Friends - Secret Missions                                                         |
 |   XX   | 80-092140-101(US) | Spider-Man & Friends - Secret Missions (rev. 101)                                              |
@@ -263,7 +263,7 @@
 |        | 80-092180(US)     | Care Bears - A Lesson in Caring                                                                |
 |        | 80-092183(UK)     | Care Bears - A Lesson in Caring                                                                |
 |        | 80-092184(GE)     | Gluecksbarchis  <- existence not proven                                                        |
-|        | 80-092185(FR)     | Les Bisounours - Le Monde Merveilleux des Bisounours                                           |
+|   XX   | 80-092185(FR)     | Les Bisounours - Le Monde Merveilleux des Bisounours                                           |
 |   XX   | 80-092187(SP)     | Osos Amorosos - Una Lección de Amor (92187 on PCB)                                             |
 +========+===================+================================================================================================+
 |        | 80-092200(US)     | Aladdin - Aladdin's Wonders of the World                                                       |
@@ -283,11 +283,11 @@
 |   XX   | 80-092225(FR)     | Toy Story 2 - Buzz à la Rescousse!                                                             |
 |        | 80-092226(PT)     | Toy Story 2 - O Resgate de Woody (92236 on cart)                                               |
 |   XX   | 80-092227(SP)     | Toy Story 2 - El Rescate De Woody (52-92227(SP) on back label)                                 |
+|        | 80-092228(CN)     | 玩具总动员 2 - 营救胡迪                                                                           |
 |        |          (DK)     | Toy Story 2 - Operation: Red Woody!                                                            |
 |   XX   | 80-092234(SE)     | Toy Story 2 - Operation: Rädda Woody!                                                          |
 |        |          (NO)     | Toy Story 2 - Operasjon: Redd Woody!                                                           |
 |        |          (FI)     | Toy Story 2                                                                                    |
-|        |          (CN)     | 玩具总动员 2 - 营救胡迪                                                                           |
 +========+===================+================================================================================================+
 |   XX   | 80-092240(US)     | Cinderella - Cinderella's Magic Wishes                                                         |
 |   XX   | 80-092251(IT)     | Cenerentola - I desideri magici di Cenerentola                                                 |
@@ -307,11 +307,11 @@
 |   XX   | 80-092247(SP)     | La Cenicienta - Los sueños mágicos de Cenicienta (non motion#, but V.Motion in spanish catalog)|
 |   XX   | 80-092247-122(SP) | La Cenicienta - Los sueños mágicos de Cenicienta (rev. 122, white/light pink cart label background)
 |   XX   | 80-092247-222(SP) | La Cenicienta - Los sueños mágicos de Cenicienta (rev. 222, no # on front label, 52-092247-222(SP) on back label, non motion#, but V.Motion in Spanish catalog)
+|        | 80-092248(CN)     | 仙蒂                                                                                            |
 |   XX   | 80-092253(DK)     | Cinderella - Askepots magiske ønsker                                                           |
 |   XX   | 80-092254(SE)     | Cinderella - Askungens magiska önskningar                                                      |
 |        | 80-092255(NO)     | Cinderella - Askepotts magiske ønsker                                                          |
 |        |          (FI)     | Cinderella - Tuhkimon Taikatoiveet                                                             |
-|        |          (CN)     | 仙蒂                                                                                            |
 +========+===================+================================================================================================+
 |        | 80-092260(US)     | Elmo's World - Elmo's Big Discoveries                                                          |
 |   XX   | 80-092264(GE)     | Elmos großes Abenteuer                                                                         |
@@ -375,7 +375,7 @@
 |   XX   | 80-092364(GE)     | Zayzoos Lernall                                                                                |
 |   XX   | 80-092365(FR)     | Zézou - Notre Ami Venu d'Ailleurs                                                              |
 |   XX   | 80-092367(SP)     | Zayzoo - Mi Amiga del Espacio (52-92367(SP) on back label)                                     |
-|        |          (CN)     | 我的外星人同学                                                                                   |
+|        | 80-092368(CN)     | 我的外星人同学                                                                                   |
 +========+===================+================================================================================================+
 |        | 80-092380(US)     | Barney - The Land of Make Believe                                                              |
 |        | 80-092383(UK)     | Barney - The Land of Make Believe                                                              |
@@ -398,7 +398,7 @@
 |        | 80-092443(UK)     | Spongebob Squarepants - A Day In The Life of A Sponge                                          |
 |   XX   | 80-092444(GE)     | Spongebob Schwammkopf - Der Tag des Schwamms                                                   |
 |   XX   | 80-092444(GE)     | Spongebob Schwammkopf - Der Tag des Schwamms (rev. 1)                                          |
-|        | 80-092445(FR)     | Bob L'éponge - Une journée dans la vie d'une éponge                                            |
+|   XX   | 80-092445(FR)     | Bob L'éponge - Une journée dans la vie d'une éponge                                            |
 |   XX   | 80-092447(SP)     | Bob Esponja - Un día en la vida de una esponja (52-92447(SP) on back label)                    |
 +========+===================+================================================================================================+
 |        | 80-092460(US)     | Sesame Street - Bert and Ernie's Imagination Adventure                                         |
@@ -414,7 +414,7 @@
 |        | 80-092484(GE)     | The Batman - Rettung von Gotham City                                                           |
 |   XX   | 80-092485(FR)     | The Batman - Panique à Gotham City                                                             |
 |   XX   | 80-092487(SP)     | The Batman - Rescate en Gotham City                                                            |
-|        |          (CN)     | 蝙蝠侠 - 拯救城市                                                                                |
+|   XX   | 80-092488(CN)     | 蝙蝠侠 - 拯救城市                                                                                |
 +========+===================+================================================================================================+
 |        | 80-092500(US)     | Whiz Kid Wheels  (note to self.. no rider in this blue car)                                    |
 |        | 80-092502(NL)     | Truckie's Rekenrace                                                                            |
@@ -424,8 +424,8 @@
 |   XX   | 80-092505(FR)     | Mission Pilote                                                                                 |
 |        | 80-092506(PT)     | Conducao Diverrido (Cart# 92516)                                                               |
 |   XX   | 80-092507(SP)     | Conducción Divertida (52-92507(SP) on back label)                                              |
+|        | 80-092508(CN)     | 数学快车                                                                                        |
 |        | 80-092510(KOR)    | Whiz Kid Wheels - 꼬마 자동차 트러클 (50-92510(KOR) on back label)                               |
-|        |          (CN)     | 数学快车                                                                                        |
 +========+===================+================================================================================================+
 |        | 80-092520(US)     | Spider-Man & Friends - Doc Ock's Challenge                                                     |
 |   XX   | 80-092531(IT)     | Spider-Man & Friends - La Sfida del Dottor Ock                                                 |
@@ -468,7 +468,7 @@
 |   XX   | 80-092644(GE)     | Superman - Der Superheld                                                                       |
 |   XX   | 80-092645(FR)     | Superman - À la rescousse !                                                                    |
 |   XX   | 80-092647(SP)     | Superman - El Hombre de Acero                                                                  |
-|        |          (CN)     | 超人 - 超级英雄                                                                                  |
+|        | 80-092648(CN)     | 超人 - 超级英雄                                                                                  |
 +========+===================+================================================================================================+
 |   XX   | 80-092660(US)     | Cars - Rev It Up In Radiator Springs                                                           |
 |   XX   | 80-092660-201(US) | Cars - Rev It Up In Radiator Springs (rev. 201)                                                |
@@ -480,12 +480,12 @@
 |   XX   | 80-092665-105(FR) | Cars - Quatre Roues (rev. 105)                                                                 |
 |        | 80-092666(PT)     | Carros - Aventura em Radiator Springs (92676 on cart)                                          |
 |   XX   | 80-092667(SP)     | Cars - Acelera el Motor en Radiador Springs                                                    |
+|        | 80-092668(CN)     | 汽车总动员                                                                                      |
 |   XX   | 80-092673(DK)     | Biler - Ræs i Kølerkildekøbing                                                                 |
 |   XX   | 80-092674(SE)     | Bilar - Kör ikapp i Kylarköping                                                                |
 |        | 80-092674(SE)     | Biler - Kör ikapp i Kylarköping (Misprinted label)                                             |
 |        |          (NO)     | Biler - Full gass i Radiator By                                                                |
 |        |          (FI)     | Autot - Aja kilpaa Syylari Cityssä                                                             |
-|        |          (CN)     | 汽车总动员                                                                                      |
 +========+===================+================================================================================================+
 |        | 80-092680(US)     | <Unknown>                                                                                      |
 |        | 80-092800(US)     | <Unknown>                                                                                      |
@@ -506,11 +506,11 @@
 |   XX   | 80-092844(GE)     | Wall-E                                                                                         |
 |   XX   | 80-092845(FR)     | Wall-E                                                                                         |
 |   XX   | 80-092847(SP)     | Wall-E (52-092847 on back label)                                                               |
+|   XX   | 80-092848(CN)     | 瓦力                                                                                           |
 |        |          (DK)     | Wall-E                                                                                         |
 |   XX   | 80-092854(SE)     | Wall-E                                                                                         |
 |        |          (NO)     | Wall-E                                                                                         |
 |        |          (FI)     | Wall-E                                                                                         |
-|        |          (CN)     | 瓦力                                                                                           |
 +========+===================+================================================================================================+
 |   XX   | 80-092860(US)     | Shrek the Third: Arthur's School Day Adventure                                                 |
 |   XX   | 80-092860(US)     | Shrek the Third: Arthur's School Day Adventure (alt)                                           |
@@ -976,6 +976,23 @@
 		</part>
 	</software>
 
+	<software name="batmang">
+		<description>The Batman - Rettung von Gotham City (Germany)</description>
+		<year>2006</year> <!-- (s06) -->
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-092484(GER)" />
+		<part name="cart" interface="vsmile_cart">
+			<feature name="slot" value="vsmile_rom" />
+			<feature name="pcb" value="707180" />
+			<feature name="pcb_model" value="707180-3" />
+			<feature name="cart_type" value="lilac" />
+			<feature name="u1" value="" /> <!-- EPOXY BLOB ROM -->
+			<dataarea name="rom" size="8388608">
+				<rom name="80-092484 - Batman - Rettung von Gotham City (GER).bin" size="8388608" crc="7718f2f2" sha1="4b34dcfae721d82392dc486ac531b7b8def97257" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="batmanf" cloneof="batmanuk">
 		<description>The Batman - Panique à Gotham City (France)</description>
 		<year>2006</year> <!-- (s06) -->
@@ -1006,19 +1023,17 @@
 		</part>
 	</software>
 
-	<software name="batmang">
-		<description>The Batman - Rettung von Gotham City (Germany)</description>
+	<software name="batmancn" cloneof="batmanuk">
+		<description>Bianfuxia - Zhengjiu Chengshi (China)</description>
 		<year>2006</year> <!-- (s06) -->
 		<publisher>VTech</publisher>
-		<info name="serial" value="80-092484(GER)" />
+		<info name="serial" value="80-092488(CN)" />
+		<info name="alt_title" value="蝙蝠侠 - 拯救城市"/>
 		<part name="cart" interface="vsmile_cart">
 			<feature name="slot" value="vsmile_rom" />
-			<feature name="pcb" value="707180" />
-			<feature name="pcb_model" value="707180-3" />
 			<feature name="cart_type" value="lilac" />
-			<feature name="u1" value="" /> <!-- EPOXY BLOB ROM -->
 			<dataarea name="rom" size="8388608">
-				<rom name="80-092484 - Batman - Rettung von Gotham City (GER).bin" size="8388608" crc="7718f2f2" sha1="4b34dcfae721d82392dc486ac531b7b8def97257" />
+				<rom name="Batman - Gotham City Rescue (CN).bin" size="8388608" crc="1b8f118a" sha1="b921dfe8fdb8694f11b575a18b529e2d9de66160" />
 			</dataarea>
 		</part>
 	</software>
@@ -1074,8 +1089,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="bobbdayuk" cloneof="bobbday" supported="no">
+	<software name="bobbdayuk" cloneof="bobbday">
 		<description>Bob The Builder - Bob's Busy Day (UK)</description>
 		<year>2005</year>
 		<publisher>VTech</publisher>
@@ -1189,7 +1203,22 @@
 		</part>
 	</software>
 
-	<software name="carebears"> <!-- Will be clone of "carebear" once found and dumped. -->
+	<software name="carebearf"> <!-- Will be clone of "carebear" once found and dumped. -->
+		<description>Les Bisounours - Le monde merveilleux des Bisounours (France)</description>
+		<year>2005</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-092185(FR)" />
+		<part name="cart" interface="vsmile_cart">
+			<feature name="slot" value="vsmile_rom" />
+			<feature name="cart_type" value="lilac" />
+			<feature name="u1" value="U1" />
+			<dataarea name="rom" size="8388608">
+				<rom name="92185 - LesBisounours (FR).bin" size="8388608" crc="7de5716b" sha1="463fb552790ce25cdd4adecb8218ba3766446efa" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="carebears" cloneof="carebearf"> <!-- Will be clone of "carebear" once found and dumped. -->
 		<description>Osos Amorosos - Una Lección de Amor (Spain)</description>
 		<year>2006?</year>
 		<publisher>VTech</publisher>
@@ -1206,8 +1235,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="carsr201" supported="no">
+	<software name="carsr201">
 		<description>Disney/Pixar Cars - Rev It Up in Radiator Springs (USA, rev. 201)</description>
 		<year>2006?</year>
 		<publisher>VTech</publisher>
@@ -1287,8 +1315,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="carsfr105" cloneof="carsr201" supported="no">
+	<software name="carsfr105" cloneof="carsr201">
 		<description>Disney/Pixar Cars - Quatre Roues (France, rev. 105)</description>
 		<year>2006?</year>
 		<publisher>VTech</publisher>
@@ -1398,8 +1425,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="cinderlair1" cloneof="cinderla" supported="no">
+	<software name="cinderlair1" cloneof="cinderla">
 		<description>Disney Cenerentola - I desideri magici di Cenerentola (Italy, rev. 1)</description>
 		<year>2006</year>
 		<publisher>VTech / Giochi Preziosi</publisher>
@@ -1459,8 +1485,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="cinderlafr105" cloneof="cinderla" supported="no">
+	<software name="cinderlafr105" cloneof="cinderla">
 		<description>Disney Princesses Cendrillon - Le rêve enchanté de Cendrillon (France, rev. 105)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -1475,8 +1500,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="cinderlafr205" cloneof="cinderla" supported="no">
+	<software name="cinderlafr205" cloneof="cinderla">
 		<description>Walt Disney Cendrillon - Le rêve enchanté de Cendrillon (France, rev. 205)</description>
 		<year>2008</year>
 		<publisher>VTech</publisher>
@@ -1508,8 +1532,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="cinderlasr122" cloneof="cinderla" supported="no">
+	<software name="cinderlasr122" cloneof="cinderla">
 		<description>Walt Disney La Cenicienta - Los sueños mágicos de Cenicienta (Spain, rev. 122)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -1628,8 +1651,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="dorar201" supported="no">
+	<software name="dorar201">
 		<description>Nickelodeon Dora the Explorer - Dora's Fix-it Adventure (USA, rev. 201)</description>
 		<year>2008</year>
 		<publisher>VTech</publisher>
@@ -1662,8 +1684,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="dorauk" cloneof="dorar201" supported="no">
+	<software name="dorauk" cloneof="dorar201">
 		<description>Nick Jr. Dora the Explorer - Dora's Fix-it Adventure (USA)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -1697,8 +1718,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="dorafr105" cloneof="dorar201" supported="no">
+	<software name="dorafr105" cloneof="dorar201">
 		<description>Dora L'Exploratrice - Les aventures de Dora Apprentie Mécano (France, rev. 105)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -1713,8 +1733,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="dorasr222" cloneof="dorar201" supported="no">
+	<software name="dorasr222" cloneof="dorar201">
 		<description>Nick Jr. Dora La Exploradora - La Aventura arregla-todo de Dora (Spain, rev. 222)</description>
 		<year>2007</year> <!-- 2009 on cart -->
 		<publisher>VTech</publisher>
@@ -1933,8 +1952,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="godiegor2" supported="no">
+	<software name="godiegor2">
 		<description>Nick Jr. Go Diego Go! - Save the Animal Familes! (USA, rev. 2?)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -1949,8 +1967,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="godiegof" cloneof="godiegor2" supported="no">
+	<software name="godiegof" cloneof="godiegor2">
 		<description>Nickelodeon Go Diego! - À la rescousse des animaux! (France)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -2017,8 +2034,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="ltleinstnr5" supported="no">
+	<software name="ltleinstnr5">
 		<description>Disney's Little Einsteins (USA, rev. 5?)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -2050,8 +2066,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="ltleinstnf" cloneof="ltleinstnr5" supported="no">
+	<software name="ltleinstnf" cloneof="ltleinstnr5">
 		<description>Disney - Les petits Einsteins - Le bal du soulier de verre (France)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -2066,8 +2081,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="ltleinstns" cloneof="ltleinstnr5" supported="no">
+	<software name="ltleinstn" cloneof="ltleinstnr5">
 		<description>Disney's Little Einsteins (Spain)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -2246,8 +2260,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="kungfupf" cloneof="kungfupuk" supported="no">
+	<software name="kungfupf" cloneof="kungfupuk">
 		<description>Kung Fu Panda - La Mission de Po (France)</description>
 		<year>2008?</year>
 		<publisher>VTech</publisher>
@@ -2262,8 +2275,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="kungfups" cloneof="kungfupuk" supported="no">
+	<software name="kungfups" cloneof="kungfupuk">
 		<description>Kung Fu Panda - Aventura en el Valle de la Paz (Spain)</description>
 		<year>2008</year>
 		<publisher>VTech</publisher>
@@ -2329,8 +2341,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="mannyf" supported="no">
+	<software name="mannyf">
 		<description>Disney Manny et ses outils (France)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -2340,7 +2351,7 @@
 			<feature name="cart_type" value="lilac" />
 			<feature name="u1" value="" />
 			<dataarea name="rom" size="8388608">
-				<rom name="090025 - Manny Et Ses Outils (FR).bin" size="8388608" crc="48c88e25" sha1="da63116c0822ee862dc6ef166b4c0d83ac6fe91c" />
+				<rom name="090025 - Manny Et Ses Outils (FR).bin" size="8388608" crc="48c88e25" sha1="da63116c0822ee862dc6ef166b4c0d83ac6fe91c" status="baddump" />
 			</dataarea>
 		</part>
 	</software>
@@ -2389,8 +2400,7 @@
 		</part>
 	</software>
 
-	<!-- UNSP: illegal ALU optype 07 at 2a0001 -->
-	<software name="mickymagf" cloneof="mickymag" supported="no">
+	<software name="mickymagf" cloneof="mickymag">
 		<description>Disney Mickey - Mickey à la Recherche De Pluto (France)</description>
 		<year>2005</year>
 		<publisher>VTech</publisher>
@@ -2456,8 +2466,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="mickeychf" cloneof="mickeychgr3" supported="no">
+	<software name="mickeychf" cloneof="mickeychgr3">
 		<description>Disney La Maison De Mickey (France)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -2472,8 +2481,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="mickeychs" cloneof="mickeychgr3" supported="no">
+	<software name="mickeychs" cloneof="mickeychgr3">
 		<description>Disney La Casa de Mickey Mouse (Spain)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -2541,8 +2549,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="monstalnf" cloneof="monstalng" supported="no">
+	<software name="monstalnf" cloneof="monstalng">
 		<description>DreamWorks Monstres contre Aliens (France)</description>
 		<year>2009?</year>
 		<publisher>VTech</publisher>
@@ -2557,8 +2564,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="monstalns" cloneof="monstalng" supported="no">
+	<software name="monstalns" cloneof="monstalng">
 		<description>DreamWorks Monstruos contra Alienígenas (Spain)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -2592,8 +2598,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="mypuppys" cloneof="mypuppyg" supported="no">
+	<software name="mypuppys" cloneof="mypuppyg">
 		<description>Dakota y su mascota (Spain)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -2692,8 +2697,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="noddyfr105" cloneof="noddy" supported="no">
+	<software name="noddyfr105" cloneof="noddy">
 		<description>Oui-Oui - Détective d'un Jour (France, rev. 105)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -2810,8 +2814,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="upfr005" supported="no">
+	<software name="upfr005">
 		<description>Disney/Pixar Là-Haut (France, rev. 005)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -2839,8 +2842,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs, shows a "Please, connect the controller" message on screen. -->
-	<software name="upsr022" cloneof="upgr004" supported="no">
+	<software name="upsr022" cloneof="upgr004">
 		<description>Disney/Pixar Up (Spain, rev. 022)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -2874,8 +2876,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="partyprkg" cloneof="partyprk" supported="no">
+	<software name="partyprkg" cloneof="partyprk">
 		<description>Cranium - Freizeit Park - Ein Jahrmarkt voller Spiel- und Lernspaß (Germany)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -2892,8 +2893,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="partyprkf" cloneof="partyprk" supported="no">
+	<software name="partyprkf" cloneof="partyprk">
 		<description>Cranium - Le Parc D'Attractions (France)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -2908,8 +2908,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="partyprks" cloneof="partyprk" supported="no">
+	<software name="partyprks" cloneof="partyprk">
 		<description>Cranium - Parque de Atracciones de Cranium (Spain)</description>
 		<year>2008</year>
 		<publisher>VTech</publisher>
@@ -2938,8 +2937,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="ratatnl" supported="no">
+	<software name="ratatnl">
 		<description>Disney/Pixar Ratatouille - Remy's Nieuwe Recepten (Netherlands)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -2973,8 +2971,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="ratatf" supported="no">
+	<software name="ratatf">
 		<description>Disney/Pixar Ratatouille - Les nouvelles recettes de Rémy (France)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -2989,8 +2986,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="ratats" cloneof="ratatg" supported="no">
+	<software name="ratats" cloneof="ratatg">
 		<description>Disney/Pixar Ratatouille - Las recetas del Remy (Spain)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -3007,8 +3003,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="scoobydor301" supported="no">
+	<software name="scoobydor301">
 		<description>Scooby-Doo! - Funland Frenzy (USA, rev. 301)</description>
 		<year>2008</year> <!-- (s08) -->
 		<publisher>VTech</publisher>
@@ -3070,8 +3065,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="scoobydouk" cloneof="scoobydor301" supported="no">
+	<software name="scoobydouk" cloneof="scoobydor301">
 		<description>Scooby-Doo! - Funland Frenzy (UK)</description>
 		<year>2007</year> <!-- (s07) -->
 		<publisher>VTech</publisher>
@@ -3084,8 +3078,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="scoobydoukr1" cloneof="scoobydor301" supported="no">
+	<software name="scoobydoukr1" cloneof="scoobydor301">
 		<description>Scooby-Doo! - Funland Frenzy (UK, rev. 1?)</description>
 		<year>2008</year> <!-- (s08) -->
 		<publisher>VTech</publisher>
@@ -3115,8 +3108,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="scoobydof" cloneof="scoobydor301" supported="no">
+	<software name="scoobydof" cloneof="scoobydor301">
 		<description>Scooby-Doo! - Panique à Funland (France)</description>
 		<year>2004</year> <!-- (s04) -->
 		<publisher>VTech</publisher>
@@ -3133,8 +3125,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="scoobydofr105" cloneof="scoobydor301" supported="no">
+	<software name="scoobydofr105" cloneof="scoobydor301">
 		<description>Scooby-Doo! - Panique à Funland (France, rev. 105)</description>
 		<year>2007</year> <!-- (s07) -->
 		<publisher>VTech</publisher>
@@ -3149,8 +3140,7 @@
 		</part>
 	</software>
 
-	<!-- Does not boot, just shows a black screen -->
-	<software name="scoobydos" cloneof="scoobydor301" supported="no">
+	<software name="scoobydos" cloneof="scoobydor301">
 		<description>Scooby-Doo - Misterio en el Parque (Spain)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -3235,8 +3225,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="erniebrtf" cloneof="erniebrtg" supported="no">
+	<software name="erniebrtf" cloneof="erniebrtg">
 		<description>Les aventures de imagniares d'Ernest et Bart (France)</description>
 		<year>2006</year>
 		<publisher>VTech</publisher>
@@ -3285,8 +3274,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="shrek3a" cloneof="shrek3" supported="no">
+	<software name="shrek3a" cloneof="shrek3">
 		<description>DreamWorks Shrek the Third - Arthur's School Day Adventure (USA, alt)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -3320,8 +3308,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="shrek3uk" cloneof="shrek3" supported="no">
+	<software name="shrek3uk" cloneof="shrek3">
 		<description>DreamWorks Shrek the Third - Arthur's School Day Adventure (UK)</description>
 		<year>2007?</year>
 		<publisher>VTech</publisher>
@@ -3352,8 +3339,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="shrek3f" cloneof="shrek3" supported="no">
+	<software name="shrek3f" cloneof="shrek3">
 		<description>DreamWorks Shrek Le Troisième - L'aventure d'Arthur (France)</description>
 		<year>2007?</year>
 		<publisher>VTech</publisher>
@@ -3368,8 +3354,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="shrek3fr105" cloneof="shrek3" supported="no">
+	<software name="shrek3fr105" cloneof="shrek3">
 		<description>DreamWorks Shrek Le Troisième - L'aventure d'Arthur (France, rev. 105)</description>
 		<year>2007?</year>
 		<publisher>VTech</publisher>
@@ -3594,8 +3579,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="spidermisr101" supported="no">
+	<software name="spidermisr101">
 		<description>Marvel Spider-Man &amp; Friends - Secret Missions (USA, rev. 101)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -3660,8 +3644,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="spidermisfr105" cloneof="spidermisr101" supported="no">
+	<software name="spidermisfr105" cloneof="spidermisr101">
 		<description>Marvel Spider-Man &amp; ses amis - Missions secrètes (France, rev. 105)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -3676,8 +3659,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="spidermisfr305" cloneof="spidermisr101" supported="no">
+	<software name="spidermisfr305" cloneof="spidermisr101">
 		<description>Marvel Spider-Man &amp; ses amis - Missions secrètes (France, rev. 305)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -3709,8 +3691,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="spidermissr222" cloneof="spidermisr101" supported="no">
+	<software name="spidermissr222" cloneof="spidermisr101">
 		<description>Spider-Man y Amigos - Misiones Secretas (Spain, rev. 222)</description>
 		<year>2008</year>
 		<publisher>VTech</publisher>
@@ -3793,6 +3774,20 @@
 		</part>
 	</software>
 
+	<software name="spongebf" cloneof="spongeb">
+		<description>Nickelodeon Bob L'éponge - Une journée dans la vie d'une éponge (France)</description>
+		<year>2005</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-092445(FR)" />
+		<part name="cart" interface="vsmile_cart">
+			<feature name="slot" value="vsmile_rom" />
+			<feature name="u1" value="" />
+			<dataarea name="rom" size="8388608">
+				<rom name="92445 - BobEponge (FR).bin" size="8388608" crc="0434bd33" sha1="64cd5ef60474da4304966a03e5c3c9a34417642b" />
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="spongebs" cloneof="spongeb">
 		<description>Nickelodeon Bob Esponja - Un día en la vida de una esponja (Spain)</description>
 		<year>2006</year>
@@ -3924,8 +3919,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="thomasukr1" cloneof="thomas" supported="no">
+	<software name="thomasukr1" cloneof="thomas">
 		<description>Thomas &amp; Friends - Engines Working Together (UK, rev. 1?)</description>
 		<year>2007</year>
 		<publisher>VTech</publisher>
@@ -4147,7 +4141,7 @@
 		</part>
 	</software>
 
-	<!-- Fatal error: UNSP: illegal ALU optype 05 at 0001 -->
+	<!-- Fatal error: UNSP: unknown opcode e50b at e9a7 -->
 	<software name="toystor3i" supported="no">
 		<description>Disney/Pixar Toy Story 3 (Italy)</description>
 		<year>2010</year>
@@ -4163,8 +4157,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="wallei" supported="no">
+	<software name="wallei">
 		<description>Disney/Pixar Wall-E (Italy)</description>
 		<year>2009</year>
 		<publisher>VTech / Giochi Preziosi</publisher>
@@ -4196,8 +4189,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="wallef" cloneof="wallei" supported="no">
+	<software name="wallef" cloneof="wallei">
 		<description>Disney/Pixar Wall-E (France)</description>
 		<year>2008</year>
 		<publisher>VTech</publisher>
@@ -4212,8 +4204,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="walles" cloneof="wallei" supported="no">
+	<software name="walles" cloneof="wallei">
 		<description>Disney/Pixar Wall-E (Spain)</description>
 		<year>2008</year>
 		<publisher>VTech</publisher>
@@ -4230,6 +4221,22 @@
 		</part>
 	</software>
 
+	<software name="wallecn" cloneof="wallei">
+		<description>Disney/Pixar Wall-E (China)</description>
+		<year>2009</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-092848(CN)" />
+		<info name="alt_title" value="Disney/Pixar 瓦力"/>
+		<part name="cart" interface="vsmile_cart">
+			<feature name="slot" value="vsmile_rom" />
+			<feature name="u1" value="U1" />
+			<dataarea name="rom" size="8388608">
+				<rom name="Wall-E_52-092848_CN).bin" size="8388608" crc="7008c01f" sha1="504d2cfab90f63ae95bf6cb2806932ca5009e2ba" />
+			</dataarea>
+		</part>
+	</software>
+
+
 	<software name="wallesw" cloneof="wallei">
 		<description>Disney/Pixar Wall-E (Sweden)</description>
 		<year>2008?</year>
@@ -4278,8 +4285,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="poohnlr123" cloneof="pooh" supported="no">
+	<software name="poohnlr123" cloneof="pooh">
 		<description>Disney's Winnie de Poeh - De wonderwereld van Poeh (Netherlands)</description>
 		<year>2004?</year>
 		<publisher>VTech</publisher>
@@ -4381,10 +4387,9 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
 	<!-- Cart labeled as "Disney My Friends Tigger and Pooh - En Busca de la Miel",
 	         but game on screen title is "Disney Winnie the Pooh - En Busca de la Miel". -->
-	<software name="poohsr122" cloneof="pooh" supported="no">
+	<software name="poohsr122" cloneof="pooh">
 		<description>Disney Winnie the Pooh - En Busca de la Miel (Spain, rev. 122)</description>
 		<year>2004?</year>
 		<publisher>VTech</publisher>
@@ -4452,8 +4457,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="redhoodf" cloneof="redhoodg" supported="no">
+	<software name="redhoodf" cloneof="redhoodg">
 		<description>Les aventures du Petit Chaperon Rouge (France)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -4502,8 +4506,7 @@
 		</part>
 	</software>
 
-	<!-- Crashes MAME -->
-	<software name="techart" supported="no">
+	<software name="techart">
 		<description>V.Smile Art Studio (USA)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -4523,7 +4526,7 @@
 		</part>
 	</software>
 
-	<software name="techartg" cloneof="techart" supported="no">
+	<software name="techartg" cloneof="techart">
 		<description>V.Smile Zeichenatelier (Germany)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -4543,7 +4546,7 @@
 		</part>
 	</software>
 
-	<software name="techartf" cloneof="techart" supported="no">
+	<software name="techartf" cloneof="techart">
 		<description>V.Smile Studio De Dessin (France)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -4581,8 +4584,7 @@
 		</part>
 	</software>
 
-	<!-- Crashes MAME -->
-	<software name="techarts" cloneof="techart" supported="no">
+	<software name="techarts" cloneof="techart">
 		<description>V.Smile Estudio De Arte (Spain)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -4651,8 +4653,7 @@
 		</part>
 	</software>
 
-	<!-- No inputs -->
-	<software name="wwavesg" supported="no"> <!-- Will be clone of "wwaves" once found and dumped. -->
+	<software name="wwavesg"> <!-- Will be clone of "wwaves" once found and dumped. -->
 		<description>Dolphis Wasser-abenteuer (Germany)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
diff -Nru mame-0.222+dfsg.1/hash/vsmilem_cart.xml mame-0.224+dfsg.1/hash/vsmilem_cart.xml
--- mame-0.222+dfsg.1/hash/vsmilem_cart.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/vsmilem_cart.xml	2020-08-26 08:57:19.000000000 +0000
@@ -18,21 +18,24 @@
 ********5 = France            (Yellow labels on back, also for NTSC French-Canadian)
 ********6 = Portugal          Apparently distributed by company 'Concentra' (White labels on back)
 ********7 = Spain             (Green labels on back)
+********8 = China
 *******13 = Denmark           Distributed by the company 'Top Toy A/S'
 *******14 = Sweden            Distributed by the company 'Top Toy A/S'
 *******15 = Norway
 *******?? = Finland
 
 +========+===================+===========================================================================================+
+|   XX   | 80-084000(US)     | Action Mania                                                                              |
 |   XX   | 80-084000(US)     | Action Mania (Rev, 4?)                                                                    |
 |   XX   | 80-084000(US)     | Action Mania (Rev, 6?)                                                                    |
 |        |          (IT)     | ?????                                                                                     |
 |   XX   | 80-084002(NL)     | Sports Games                                                                              |
 |        | 80-084003(UK)     | Action Mania                                                                              |
 |   XX   | 80-084004(GE)     | Sportskanone                                                                              |
-|        | 80-084005(FR)     | Sporti Folies                                                                             |
+|   XX   | 80-084005(FR)     | Sporti'Folies                                                                             |
 |        | 80-084006(PT)     | Action Mania (84016 on cart)                                                              |
 |   XX   | 80-084007(SP)     | Action Manía                                                                              |
+|        | 80-084008(CN)     | 英语运动园                                                                                 |
 +========+===================+===========================================================================================+
 |   XX   | 80-084020(US)     | Dora the Explorer: Dora's Fix It Adventure                                                |
 |   **   | 80-084021(US)     | Dora the Explorer: Dora's Fix It Adventure (pocket version, same ROM as 80-084020(US))    |
@@ -40,7 +43,7 @@
 |        | 80-084023(UK)     | Dora the Explorer: Dora's Fix It Adventure                                                |
 |   XX   | 80-084024(GE)     | Dora: Doras Reparatur-Abenteuer                                                           |
 |   XX   | 80-084024(GE)     | Dora: Doras Reparatur-Abenteuer (Rev. 2)                                                  |
-|        | 80-084025(FR)     | Dora L'Exploratrice : Les Adventures De Dora Apprentie Mecano                             |
+|   XX   | 80-084025(FR)     | Dora L'Exploratrice : Les Adventures De Dora Apprentie Mécano                             |
 |        | 80-084026(PT)     | Dora : em busca das pecas perdidas                                                        |
 |        | 80-084027(SP)     | Dora : La Aventura arregla-todo de Dora                                                   |
 +========+===================+===========================================================================================+
@@ -66,9 +69,9 @@
 |        | 80-084120(US)     | Kung Fu Panda - Path of the Panda                                                         |
 |        | 80-084123(UK)     | Kung Fu Panda - Path of the Panda                                                         |
 |   XX   | 80-084124(GE)     | Kung Fu Panda - Der Weg des Panda                                                         |
-|        | 80-084125(FR)     | Kung Fu Panda - La mission de Po                                                          |
+|   XX   | 80-084125(FR)     | Kung Fu Panda - La mission de Po                                                          |
 +========+===================+===========================================================================================+
-|        | 80-084140(US)     | Spider-Man & Friends - Secret Missions (AKA Professor V's Secret Missions with diff label)|
+|   XX   | 80-084140(US)     | Spider-Man & Friends - Secret Missions (AKA Professor V's Secret Missions with diff label)|
 |        | 80-084143(UK)     | Spider-Man & Friends - Secret Missions                                                    |
 |   XX   | 80-084144(GE)     | Spider-Man & Freunde - Geheime Missionen                                                  |
 |   XX   | 80-084145(FR)     | Spider-Man & ses amis - Missions Secrètes                                                 |
@@ -89,6 +92,7 @@
 |   XX   | 80-084185-005(FR) | La Maison de Mickey                                                                       |
 |        | 80-084186(PT)     | A Casa do Mickey Mouse (84196 on cart)                                                    |
 |   XX   | 80-084187(SP)     | La Casa de Mickey Mouse                                                                   |
+|        | 80-084188(CN)     | 米奇妙妙屋                                                                                 |
 +========+===================+===========================================================================================+
 |   XX   | 80-084200(US)     | Nascar Academy - Race Car Superstar                                                       |
 +========+===================+===========================================================================================+
@@ -112,14 +116,15 @@
 |        | 80-084282(NL)     | Water-sport Games                                                                         |
 |        | 80-084283(UJ)     | Wild Waves                                                                                |
 |        | 80-084284(GE)     | Dolphis Wasser-abenteuer                                                                  |
-|        | 80-084285(FR)     | Martin le Dauphin                                                                         |
+|   XX   | 80-084285(FR)     | Martin le Dauphin                                                                         |
 +========+===================+===========================================================================================+
-|        | 80-084300(US)     | Soccer Challenge                                                                          |
+|   XX   | 80-084300(US)     | Soccer Challenge                                                                          |
 |        | 80-084303(UK)     | Football Challenge                                                                        |
-|   XX   | 80-084304(GE)     | Fussball Meisterschaft                                                                    |
-|        | 80-084305(FR)     | Football Challenge                                                                        |
+|   XX   | 80-084304(GE)     | Fußball Meisterschaft                                                                     |
+|   XX   | 80-084305(FR)     | Football Challenge                                                                        |
 |        | 80-084306(PT)     | Football Challenge  (cart#??)                                                             |
 |        | 80-084307(SP)     | Campeonato de Fútbol                                                                      |
+|        | 80-084308(CN)     | 欢乐足球                                                                                   |
 +========+===================+===========================================================================================+
 |        | 80-084320(US)     | Disney Fairies: TinkerBell                                                                |
 |        | 80-084321(US)     | Disney Fairies: TinkerBell (pocket version)                                               |
@@ -161,13 +166,13 @@
 |        | 80-084406(PT)     | Cars - Aventura Em Radiator Springs (84416 on cart)                                        |
 |   XX   | 80-084407(SP)     | Cars - Acelera el Motor en Radiador Springs                                                |
 +========+===================+===========================================================================================+
-|        | 80-084420(US)     | Toy Story 3                                                                               |
+|   XX   | 80-084420(US)     | Toy Story 3                                                                               |
 |        | 80-084421(US)     | Toy Story 3 (pocket version)                                                              |
 |        |          (IT)     | Toy Story 3 (EAN 8033836704196, GP470419?)                                                |
 |        | 80-084422(NL)     | Toy Story 3                                                                               |
 |        | 80-084423(UK)     | Toy Story 3                                                                               |
 |   XX   | 80-084424(GE)     | Toy Story 3                                                                               |
-|        | 80-084425(FR)     | Toy Story 3                                                                               |
+|   XX   | 80-084425(FR)     | Toy Story 3                                                                               |
 |   XX   | 80-084427(SP)     | Toy Story 3                                                                               |
 +========+===================+===========================================================================================+
 |   XX   | 80-084440(US)     | Monsters vs. Aliens                                                                       |
@@ -208,7 +213,7 @@
 |        | 80-084581(US)     | Cars 2  (pocket version)                                                                  |
 |        | 80-084583(UK)     | Cars 2                                                                                    |
 |   XX   | 80-084584(GE)     | Cars 2                                                                                    |
-|        | 80-084585(FR)     | Cars 2                                                                                    |
+|   XX   | 80-084585(FR)     | Cars 2                                                                                    |
 |        | 80-084587(SP)     | Cars 2                                                                                    |
 +========+===================+===========================================================================================+
 |        | 80-084600(US)     | <Unknown> (Should be Orange colored Cinderella - Cinderella's Magic Wishes)               |
@@ -231,7 +236,20 @@
 
 <softwarelist name="vsmilem_cart" description="VTech V.Smile Motion cartridges">
 
-	<software name="actnmniam" supported="no">
+	<software name="actnmniam6">
+		<description>Action Mania (USA, Rev. 6?)</description>
+		<year>201?</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-084000(US)" />
+		<part name="cart" interface="vsmile_cart">
+			<feature name="u1" value="" /> <!-- EPOXY BLOB ROM -->
+			<dataarea name="rom" size="8388608">
+				<rom name="vsmile84000-6.bin" size="8388608" crc="ea4aeb1a" sha1="74807f9306ccc691735acdca66588a80467bebbd" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="actnmniam4" cloneof="actnmniam6">
 		<description>Action Mania (USA, Rev. 4?)</description>
 		<year>201?</year>
 		<publisher>VTech</publisher>
@@ -246,20 +264,20 @@
 		</part>
 	</software>
 
-	<software name="actnmniama" cloneof="actnmniam" supported="no">
-		<description>Action Mania (USA, Rev. 6?)</description>
+	<software name="actnmniam" cloneof="actnmniam6">
+		<description>Action Mania (USA)</description>
 		<year>201?</year>
 		<publisher>VTech</publisher>
 		<info name="serial" value="80-084000(US)" />
 		<part name="cart" interface="vsmile_cart">
-			<feature name="u1" value="" /> <!-- EPOXY BLOB ROM -->
-			<dataarea name="rom" size="8388608">
-				<rom name="vsmile84000-6.bin" size="8388608" crc="ea4aeb1a" sha1="74807f9306ccc691735acdca66588a80467bebbd" />
+			<dataarea name="rom" size="0x0800000">
+				<rom name="vmotion80-084000.bin" size="0x0800000" crc="c3ca971e" sha1="5c63215280ec3fdb01e8b4a0c151496718b6bc0a" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="actnmniamnl" cloneof="actnmniam" supported="no">
+
+	<software name="actnmniamnl" cloneof="actnmniam6">
 		<description>Sport Games (Netherlands)</description>
 		<year>201?</year>
 		<publisher>VTech</publisher>
@@ -274,22 +292,33 @@
 		</part>
 	</software>
 
-	<software name="actnmniamg" cloneof="actnmniam" supported="no">
+	<software name="actnmniamg" cloneof="actnmniam6">
 		<description>Sportskanone (Germany)</description>
 		<year>201?</year>
 		<publisher>VTech</publisher>
-		<info name="serial" value="80-084007(SP)" />
+		<info name="serial" value="80-084004(GER)" />
 		<part name="cart" interface="vsmile_cart">
-			<feature name="pcb" value="708201" />
-			<feature name="pcb_model" value="708201-4" />
-			<feature name="u1" value="" /> <!-- EPOXY BLOB ROM -->
+			<feature name="u1" value="" />
 			<dataarea name="rom" size="8388608">
 				<rom name="80-084004 - Sportskanone (GER) (Motion).bin" size="8388608" crc="004ad4e5" sha1="7cbc9e5a27fac455ea2b03cebad7f1694937f790" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="actnmniams" cloneof="actnmniam" supported="no">
+	<software name="actnmniamf" cloneof="actnmniam6">
+		<description>Sporti'Folies (France)</description>
+		<year>201?</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-084005(FR)" />
+		<part name="cart" interface="vsmile_cart">
+			<feature name="u1" value="" />
+			<dataarea name="rom" size="8388608">
+				<rom name="084005 - SportiFolies (MOTION) (FR).bin" size="8388608" crc="c6aee288" sha1="b8d96d0b1c0e8e41ab39d9d6bc1fc39060af4f26" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="actnmniams" cloneof="actnmniam6">
 		<description>Action Manía (Spain)</description>
 		<year>201?</year>
 		<publisher>VTech</publisher>
@@ -304,7 +333,7 @@
 		</part>
 	</software>
 
-	<software name="carsmg" supported="no">
+	<software name="carsmg">
 		<description>Disney/Pixar Cars - Vollgas in Radiator Springs (Germany)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -319,7 +348,7 @@
 		</part>
 	</software>
 
-	<software name="carsmf" cloneof="carsmg" supported="no">
+	<software name="carsmf" cloneof="carsmg">
 		<description>Disney/Pixar Cars - Quatre Roues (France)</description>
 		<year>2009?</year>
 		<publisher>VTech</publisher>
@@ -332,7 +361,7 @@
 		</part>
 	</software>
 
-	<software name="carsms" cloneof="carsmg" supported="no">
+	<software name="carsms" cloneof="carsmg">
 		<description>Disney/Pixar Cars - Acelera el Motor en Radiador Springs (Spain)</description>
 		<year>20??</year>
 		<publisher>VTech</publisher>
@@ -347,11 +376,11 @@
 		</part>
 	</software>
 
-	<software name="cars2mg" supported="no">
+	<software name="cars2mg">
 		<description>Disney/Pixar Cars 2 (Germany)</description>
 		<year>2011</year>
 		<publisher>VTech</publisher>
-		<info name="serial" value="80-084404(GE)" />
+		<info name="serial" value="80-084584(GE)" />
 		<part name="cart" interface="vsmile_cart">
 			<feature name="pcb" value="708106" />
 			<feature name="pcb_model" value="708106-3" />
@@ -363,22 +392,20 @@
 		</part>
 	</software>
 
-	<software name="cinderlamg" supported="no">
-		<description>Disneys Princess Cinderella - Lernen im Märchenland (Germany)</description>
-		<year>2010?</year>
+	<software name="cars2mf">
+		<description>Disney/Pixar Cars 2 (France)</description>
+		<year>2011</year>
 		<publisher>VTech</publisher>
-		<info name="serial" value="80-084604(GE)" />
+		<info name="serial" value="80-084585(FR)" />
 		<part name="cart" interface="vsmile_cart">
-			<feature name="pcb" value="708201" />
-			<feature name="pcb_model" value="708201-7" />
-			<feature name="u1" value="" /> <!-- EPOXY BLOB ROM -->
-			<dataarea name="rom" size="8388608">
-				<rom name="C84604.u1" size="8388608" crc="0229cf3a" sha1="9c08e6370ecf08992924f067b64dd1950e3a2c6c" />
+			<feature name="u1" value="" />
+			<dataarea name="rom" size="0x1000000">
+				<rom name="084585 - Cars 2 (MOTION) (FR).bin" size="0x1000000" crc="9455eff9" sha1="0ff3fe336369f95dec640a5ca691daabacbc5332" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="cinderlam2g" cloneof="cinderlamg" supported="no">
+	<software name="cinderlamg2">
 		<description>Disneys Princess Cinderella - Lernen im Märchenland (Germany, Rev. 2?)</description>
 		<year>2010</year>
 		<publisher>VTech</publisher>
@@ -390,7 +417,22 @@
 		</part>
 	</software>
 
-	<software name="cinderlamf" cloneof="cinderlamg" supported="no">
+	<software name="cinderlamg" cloneof="cinderlamg2">
+		<description>Disneys Princess Cinderella - Lernen im Märchenland (Germany)</description>
+		<year>2010</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-084604(GE)" />
+		<part name="cart" interface="vsmile_cart">
+			<feature name="pcb" value="708201" />
+			<feature name="pcb_model" value="708201-7" />
+			<feature name="u1" value="" /> <!-- EPOXY BLOB ROM -->
+			<dataarea name="rom" size="8388608">
+				<rom name="C84604.u1" size="8388608" crc="0229cf3a" sha1="9c08e6370ecf08992924f067b64dd1950e3a2c6c" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="cinderlamf" cloneof="cinderlamg2">
 		<description>Walt Disney Cendrillon - Le rêve enchanté de Cendrillon (France)</description>
 		<year>2010</year>
 		<publisher>VTech</publisher>
@@ -402,8 +444,8 @@
 		</part>
 	</software>
 
-	<software name="doram" supported="no">
-		<description>Nickelodeon Dora the Explorer: Dora's Fix It Adventure (USA, Rev. 3?)</description>
+	<software name="doram">
+		<description>Nickelodeon Dora the Explorer - Dora's Fix It Adventure (USA, Rev. 3?)</description>
 		<year>2008</year>
 		<publisher>VTech</publisher>
 		<info name="serial" value="80-084020(US)" /> <!-- Same ROM as 084021(US) -->
@@ -415,7 +457,7 @@
 		</part>
 	</software>
 
-	<software name="doramnl" cloneof="doram" supported="no">
+	<software name="doramnl" cloneof="doram">
 		<description>Nick Jr Dora - Dora's Reparatie Avontuur (Netherlands)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -430,8 +472,8 @@
 		</part>
 	</software>
 
-	<software name="doramg" cloneof="doram" supported="no">
-		<description>Nick Dora - Doras Reparatur-Abenteuer (Germany)</description>
+	<software name="doramg2" cloneof="doram">
+		<description>Nick Dora - Doras Reparatur-Abenteuer (Germany, Rev. 2)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
 		<info name="serial" value="80-084024(GE)" />
@@ -440,14 +482,14 @@
 			<feature name="pcb_model" value="708201-4" />
 			<feature name="u1" value="" /> <!-- EPOXY BLOB ROM -->
 			<dataarea name="rom" size="8388608">
-				<rom name="84024 OK.u1" size="8388608" crc="6769cb8b" sha1="615177d959983cdb67acdb8f3be063b3d09cb5db" />  <!-- sldh -->
+				<rom name="84024 OK.u1" size="8388608" crc="7848fa93" sha1="567a337f27cc5ff0ce832afa903efafc8a305f17" />  <!-- sldh -->
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="doramg2" cloneof="doram" supported="no">
-		<description>Nick Dora - Doras Reparatur-Abenteuer (Germany, Rev. 2)</description>
-		<year>2009?</year>
+	<software name="doramg" cloneof="doram">
+		<description>Nick Dora - Doras Reparatur-Abenteuer (Germany)</description>
+		<year>2009</year>
 		<publisher>VTech</publisher>
 		<info name="serial" value="80-084024(GE)" />
 		<part name="cart" interface="vsmile_cart">
@@ -455,12 +497,25 @@
 			<feature name="pcb_model" value="708201-4" />
 			<feature name="u1" value="" /> <!-- EPOXY BLOB ROM -->
 			<dataarea name="rom" size="8388608">
-				<rom name="84024 OK.u1" size="8388608" crc="7848fa93" sha1="567a337f27cc5ff0ce832afa903efafc8a305f17" />  <!-- sldh -->
+				<rom name="84024 OK.u1" size="8388608" crc="6769cb8b" sha1="615177d959983cdb67acdb8f3be063b3d09cb5db" />  <!-- sldh -->
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="findnemomf" supported="no">
+	<software name="doramf" cloneof="doram">
+		<description>Nickelodeon Dora L'Exploratrice - Les adventures de Dora Apprentie Mécano (France)</description>
+		<year>2008</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-084025(FR)" />
+		<part name="cart" interface="vsmile_cart">
+			<feature name="u1" value="" />
+			<dataarea name="rom" size="8388608">
+				<rom name="084025 - Dora (MOTION) (FR).bin" size="8388608" crc="f8b731f2" sha1="1deaff6b5b7c6bea2e627015f875ef60e3b09d38" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="findnemomf">
 		<description>Le Monde de Nemo - Nemo à la decourverte de l'océan (France)</description>
 		<year>2010</year>
 		<publisher>VTech</publisher>
@@ -473,7 +528,7 @@
 		</part>
 	</software>
 
-	<software name="hmannym" supported="no">
+	<software name="hmannym">
 		<description>Disney Handy Manny (USA, Rev. 2?)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -487,7 +542,7 @@
 	</software>
 
 	<!-- From a multi-game cart found on a on-store demo console -->
-	<software name="hmannymg" cloneof="hmannym" supported="no">
+	<software name="hmannymg" cloneof="hmannym">
 		<description>Disney Meister Manny's Werkzeugkiste (Germany)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -500,7 +555,7 @@
 		</part>
 	</software>
 
-	<software name="hmannymf" cloneof="hmannym" supported="no">
+	<software name="hmannymf" cloneof="hmannym">
 		<description>Disney Manny et ses outils (France)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -513,7 +568,7 @@
 		</part>
 	</software>
 
-	<software name="kfpandamg" supported="no">
+	<software name="kfpandamg">
 		<description>DreamWorks Kung Fu Panda - Der Weg des Panda (Germany)</description>
 		<year>2008?</year>
 		<publisher>VTech</publisher>
@@ -528,19 +583,20 @@
 		</part>
 	</software>
 
-	<software name="ltleinstnm" supported="no">
-		<description>Disney's Little Einsteins (USA, Rev. 2?)</description>
-		<year>2009</year>
+	<software name="kfpandamf" cloneof="kfpandamg">
+		<description>DreamWorks Kung Fu Panda - La mission de Po (France)</description>
+		<year>2008?</year>
 		<publisher>VTech</publisher>
-		<info name="serial" value="80-084160(US)" />
+		<info name="serial" value="80-084125(FR)" />
 		<part name="cart" interface="vsmile_cart">
+			<feature name="u1" value="" />
 			<dataarea name="rom" size="8388608">
-				<rom name="vsmile84160-2.bin" size="8388608" crc="add7cc23" sha1="561e496ecbbc1e387ec343069ac19ae9aa2f234e" />
+				<rom name="084125 - KungFuPanda (MOTION) (FR).bin" size="8388608" crc="58d7ad17" sha1="f854a42b64a90ab9b8ea08ebfb57264654f108a8" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="ltleinstnma" cloneof="ltleinstnm" supported="no">
+	<software name="ltleinstnm5">
 		<description>Disney's Little Einsteins (USA, Rev. 5?)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -552,19 +608,19 @@
 		</part>
 	</software>
 
-	<software name="ltleinstnmg" cloneof="ltleinstnm" supported="no">
-		<description>Disney's Kleine Einsteins (Germany)</description>
-		<year>200?</year>
+	<software name="ltleinstnm2" cloneof="ltleinstnm5">
+		<description>Disney's Little Einsteins (USA, Rev. 2?)</description>
+		<year>2009</year>
 		<publisher>VTech</publisher>
-		<info name="serial" value="80-084164(GE)" />
+		<info name="serial" value="80-084160(US)" />
 		<part name="cart" interface="vsmile_cart">
 			<dataarea name="rom" size="8388608">
-				<rom name="80-084164.bin" size="8388608" crc="b0ec807e" sha1="e947c84efd3f061cbf10f73e412d4cfdd474bade" />  <!-- sldh -->
+				<rom name="vsmile84160-2.bin" size="8388608" crc="add7cc23" sha1="561e496ecbbc1e387ec343069ac19ae9aa2f234e" />
 			</dataarea>
 		</part>
 	</software>
 
-	<software name="ltleinstnm2g" cloneof="ltleinstnm" supported="no">
+	<software name="ltleinstnmg2" cloneof="ltleinstnm5">
 		<description>Disney's Kleine Einsteins (Germany, Rev. 2?)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -576,7 +632,19 @@
 		</part>
 	</software>
 
-	<software name="mickeychm" supported="no">
+	<software name="ltleinstnmg" cloneof="ltleinstnm5">
+		<description>Disney's Kleine Einsteins (Germany)</description>
+		<year>2009</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-084164(GE)" />
+		<part name="cart" interface="vsmile_cart">
+			<dataarea name="rom" size="8388608">
+				<rom name="80-084164.bin" size="8388608" crc="b0ec807e" sha1="e947c84efd3f061cbf10f73e412d4cfdd474bade" />  <!-- sldh -->
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="mickeychm">
 		<description>Disney Mickey Mouse Clubhouse (USA)</description>
 		<year>2008</year>
 		<publisher>VTech</publisher>
@@ -589,7 +657,7 @@
 		</part>
 	</software>
 
-	<software name="mickeychmg" cloneof="mickeychm" supported="no">
+	<software name="mickeychmg" cloneof="mickeychm">
 		<description>Disney Micky Maus Wunderhaus (Germany)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -604,7 +672,7 @@
 		</part>
 	</software>
 
-	<software name="mickeychmfr005" cloneof="mickeychm" supported="no">
+	<software name="mickeychmf005" cloneof="mickeychm">
 		<description>Disney La Maison de Mickey (France, Rev. 005)</description>
 		<year>2009?</year>
 		<publisher>VTech</publisher>
@@ -617,7 +685,7 @@
 		</part>
 	</software>
 
-	<software name="mickeychms" cloneof="mickeychm" supported="no">
+	<software name="mickeychms" cloneof="mickeychm">
 		<description>Disney La Casa de Mickey Mouse (Spain)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -632,7 +700,7 @@
 		</part>
 	</software>
 
-	<software name="monvsalienm" supported="no">
+	<software name="monvsalienm">
 		<description>DreamWorks Monsters vs. Aliens (USA, Rev. 3?)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -645,7 +713,7 @@
 		</part>
 	</software>
 
-	<software name="monvsalienmg" supported="no" cloneof="monvsalienm">
+	<software name="monvsalienmg" cloneof="monvsalienm">
 		<description>DreamWorks Monsters vs. Aliens (Germany)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -660,7 +728,7 @@
 		</part>
 	</software>
 
-	<software name="monvsalienmf" supported="no" cloneof="monvsalienm">
+	<software name="monvsalienmf" cloneof="monvsalienm">
 		<description>DreamWorks Monstres contre Aliens (France)</description>
 		<year>2009?</year>
 		<publisher>VTech</publisher>
@@ -673,7 +741,7 @@
 		</part>
 	</software>
 
-	<software name="monvsalienms" supported="no" cloneof="monvsalienm">
+	<software name="monvsalienms" cloneof="monvsalienm">
 		<description>DreamWorks Monstruos contra Alienígenas (Spain)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -688,7 +756,7 @@
 		</part>
 	</software>
 
-	<software name="mypuppymnl" supported="no">
+	<software name="mypuppymnl">
 		<description>Mijn Puppy! (Netherlands)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -703,7 +771,7 @@
 		</part>
 	</software>
 
-	<software name="mypuppymg" cloneof="mypuppymnl" supported="no">
+	<software name="mypuppymg" cloneof="mypuppymnl">
 		<description>Mein erster Hund (Germany)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -718,7 +786,7 @@
 		</part>
 	</software>
 
-	<software name="mypuppymf" cloneof="mypuppymnl" supported="no">
+	<software name="mypuppymf" cloneof="mypuppymnl">
 		<description>Mon Youtou tout fou! (France)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -731,7 +799,7 @@
 		</part>
 	</software>
 
-	<software name="nascarm" supported="no">
+	<software name="nascarm">
 		<description>NASCAR Academy - Race Car Superstar (USA)</description>
 		<year>2009?</year>
 		<publisher>VTech</publisher>
@@ -744,7 +812,7 @@
 		</part>
 	</software>
 
-	<software name="nihaoklm" supported="no">
+	<software name="nihaoklm">
 		<description>Nickelodeon Ni Hao Kai Lan - Happy Chinese New Year! (USA)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -757,7 +825,7 @@
 		</part>
 	</software>
 
-	<software name="nihaoklmf" cloneof="nihaoklm" supported="no">
+	<software name="nihaoklmf" cloneof="nihaoklm">
 		<description>Nickelodeon Ni Hao Kai Lan - Joyeux Nouvel an chinois! (France)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -770,7 +838,7 @@
 		</part>
 	</software>
 
-	<software name="noddymf" supported="no">
+	<software name="noddymf">
 		<description>Oui-Oui - Détective d'un Jour (France)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -783,9 +851,9 @@
 		</part>
 	</software>
 
-	<software name="poohmg" supported="no">
+	<software name="poohmg">
 		<description>Winnie Puuh - Die Honigjagd (Germany)</description>
-		<year>2009?</year>
+		<year>2009</year>
 		<publisher>VTech</publisher>
 		<info name="serial" value="80-084384(GE)" />
 		<part name="cart" interface="vsmile_cart">
@@ -798,7 +866,7 @@
 		</part>
 	</software>
 
-	<software name="poohmf" cloneof="poohmg" supported="no">
+	<software name="poohmf" cloneof="poohmg">
 		<description>Disney Winnie L'ourson - La Chasse au miel de Winnie (France)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -811,7 +879,7 @@
 		</part>
 	</software>
 
-	<software name="poohms" cloneof="poohmg" supported="no">
+	<software name="poohms" cloneof="poohmg">
 		<description>Disney Winnie the Pooh - En busca de la miel (Spain)</description>
 		<year>2010</year>
 		<publisher>VTech</publisher>
@@ -826,7 +894,7 @@
 		</part>
 	</software>
 
-	<software name="prinfrogm" supported="no">
+	<software name="prinfrogm">
 		<description>Disney Princess - The Princess and the Frog - Tiana's Big Dream (UK)</description>
 		<year>2010</year>
 		<publisher>VTech</publisher>
@@ -841,8 +909,8 @@
 		</part>
 	</software>
 
-	<software name="prinfrogmg" cloneof="prinfrogm" supported="no">
-		<description>Küss den Frosch - Tianas großer Traum (Germany)</description>
+	<software name="prinfrogmg" cloneof="prinfrogm">
+		<description>Disney Princess - Disney Küss den Frosch - Tianas großer Traum (Germany)</description>
 		<year>2010</year>
 		<publisher>VTech</publisher>
 		<info name="serial" value="80-084484(GE)" />
@@ -853,8 +921,8 @@
 		</part>
 	</software>
 
-	<software name="prinfrogmf" cloneof="prinfrogm" supported="no">
-		<description>Disney La Princesse Et La Grenouille - Le grand rêve de Tiana (France)</description>
+	<software name="prinfrogmf" cloneof="prinfrogm">
+		<description>Disney Princess - Disney La Princesse Et La Grenouille - Le grand rêve de Tiana (France)</description>
 		<year>2010</year>
 		<publisher>VTech</publisher>
 		<info name="serial" value="80-084485(FR)" />
@@ -865,7 +933,7 @@
 		</part>
 	</software>
 
-	<software name="scoobyffmf" supported="no">
+	<software name="scoobyffmf">
 		<description>Scooby-Doo! - Panique à Funland (France)</description>
 		<year>2008</year> <!-- (s08) -->
 		<publisher>VTech</publisher>
@@ -878,7 +946,7 @@
 		</part>
 	</software>
 
-	<software name="scoobyffms" cloneof="scoobyffmf" supported="no">
+	<software name="scoobyffms" cloneof="scoobyffmf">
 		<description>¡¡Scooby-Doo!! - Misterio en el parque (Spain)</description>
 		<year>2009</year> <!-- (s09) -->
 		<publisher>VTech</publisher>
@@ -893,7 +961,7 @@
 		</part>
 	</software>
 
-	<software name="shrekfam" supported="no">
+	<software name="shrekfam">
 		<description>Shrek Forever After (USA)</description>
 		<year>200?</year>
 		<publisher>VTech</publisher>
@@ -909,7 +977,7 @@
 		</part>
 	</software>
 
-	<software name="shrekfamg" cloneof="shrekfam" supported="no">
+	<software name="shrekfamg" cloneof="shrekfam">
 		<description>Für immer Shrek (Germany)</description>
 		<year>2010</year>
 		<publisher>VTech</publisher>
@@ -919,29 +987,39 @@
 			<feature name="u1" value="" /> <!-- EPOXY BLOB ROM --> <!-- 2 globs, uses /CS2 for 2nd glob -->
 			<feature name="u2" value="" /> <!-- EPOXY BLOB ROM -->
 			<dataarea name="rom" size="0x1000000">
-				<rom name="vsmile84504.blob1.bin" size="0x0800000" crc="3f1c79e2" sha1="1b12b9b379dd942356e6ee6594c8b80dbb9db781" offset="0x0000000" />
-				<rom name="vsmile84504.blob2.bin" size="0x0800000" crc="78cf731b" sha1="9b1d1eed7bd216f4feca3160c31912b7c81e4efd" offset="0x0800000" />
+				<rom name="vsmile84504.blob1.bin" size="0x0800000" crc="3f1c79e2" sha1="1b12b9b379dd942356e6ee6594c8b80dbb9db781" offset="0x0800000" />
+				<rom name="vsmile84504.blob2.bin" size="0x0800000" crc="78cf731b" sha1="9b1d1eed7bd216f4feca3160c31912b7c81e4efd" offset="0x0000000" />
 			</dataarea>
 		</part>
 	</software>
 
-	<!-- Does not boot, just loops on the intro -->
-	<software name="shrekfamf" cloneof="shrekfam" supported="no">
+	<software name="shrekfamf" cloneof="shrekfam">
 		<description>Shrek 4 - Il était une fin (France)</description>
 		<year>2010?</year>
 		<publisher>VTech</publisher>
 		<info name="serial" value="80-084505(FR)" />
 		<part name="cart" interface="vsmile_cart">
 			<dataarea name="rom" size="0x1000000">
-				<rom name="084505 - Shrek 4 (MOTION) (FR)_blob1.bin" size="0x0800000" crc="bb3d3e09" sha1="539f0948ec1dad3b2465990fcf053f2cacc7e766" offset="0x0000000" />
-				<rom name="084505 - Shrek 4 (MOTION) (FR)_blob2.bin" size="0x0800000" crc="7c633e07" sha1="a07b2439473be97bc1a785ae4050297ae0e5244a" offset="0x0800000" />
+				<rom name="084505 - Shrek 4 (MOTION) (FR)_blob1.bin" size="0x0800000" crc="bb3d3e09" sha1="539f0948ec1dad3b2465990fcf053f2cacc7e766" offset="0x0800000" />
+				<rom name="084505 - Shrek 4 (MOTION) (FR)_blob2.bin" size="0x0800000" crc="7c633e07" sha1="a07b2439473be97bc1a785ae4050297ae0e5244a" offset="0x0000000" />
 			</dataarea>
 		</part>
 	</software>
 
-	<!-- Soccer Challenge -->
-	<software name="soccerchmg" supported="no">
-		<description>Fussball Meisterschaft (Germany)</description>
+	<software name="soccerchm">
+		<description>Soccer Challenge (USA)</description>
+		<year>200?</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-084300(US)" />
+		<part name="cart" interface="vsmile_cart">
+			<dataarea name="rom" size="0x0800000">
+				<rom name="vmotion80-084300.bin" size="0x0800000" crc="4d0dd939" sha1="b5411b036fa91daf56f654be4ce71b4ac15541ca" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="soccerchmg" cloneof="soccerchm">
+		<description>Fußball Meisterschaft (Germany)</description>
 		<year>20??</year>
 		<publisher>VTech</publisher>
 		<info name="serial" value="80-084304(GE)" />
@@ -955,7 +1033,32 @@
 		</part>
 	</software>
 
-	<software name="spidermnmg" supported="no">
+	<software name="soccerchmf" cloneof="soccerchm">
+		<description>Football Challenge (France)</description>
+		<year>20??</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-084305(FR)" />
+		<part name="cart" interface="vsmile_cart">
+			<feature name="u1" value="" />
+			<dataarea name="rom" size="8388608">
+				<rom name="084305 - FootballChallenge (MOTION) (FR).bin" size="8388608" crc="bca67fe6" sha1="9949f36d4584290371b0126b59b7bd0b96a7c77b" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="spidermnm">
+		<description>Marvel Spider-Man &amp; Friends - Secret Missions (USA)</description>
+		<year>2008</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-084140(US)" />
+		<part name="cart" interface="vsmile_cart">
+			<dataarea name="rom" size="0x0800000">
+				<rom name="vmotion80-084140.bin" size="0x0800000" crc="be4f9c32" sha1="9f7d77f1cdf64ab993a5d07b91d435a861c91758" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="spidermnmg" cloneof="spidermnm">
 		<description>Marvel Spider-Man &amp; Freunde - Geheime Missionen (Germany)</description>
 		<year>2010</year>
 		<publisher>VTech</publisher>
@@ -970,7 +1073,7 @@
 		</part>
 	</software>
 
-	<software name="spidermnmf" cloneof="spidermnmg" supported="no">
+	<software name="spidermnmf" cloneof="spidermnm">
 		<description>Marvel Spider-Man &amp; ses amis - Missions Secrètes (France)</description>
 		<year>2008</year>
 		<publisher>VTech</publisher>
@@ -983,7 +1086,7 @@
 		</part>
 	</software>
 
-	<software name="spongebmg" supported="no">
+	<software name="spongebmg">
 		<description>Nickelodeon Spongebob Schwammkopf - Der Tag des Schwamms (Germany)</description>
 		<year>2011</year>
 		<publisher>VTech</publisher>
@@ -998,7 +1101,7 @@
 		</part>
 	</software>
 
-	<software name="thomasmg" supported="no">
+	<software name="thomasmg">
 		<description>Thomas - Freunde halten zusammen (Germany)</description>
 		<year>2007?</year>
 		<publisher>VTech</publisher>
@@ -1010,7 +1113,7 @@
 		</part>
 	</software>
 
-	<software name="tinkerm" supported="no">
+	<software name="tinkerm">
 		<description>TinkerBell (USA, Rev. 2?)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -1023,9 +1126,9 @@
 		</part>
 	</software>
 
-	<software name="tinkermg" cloneof="tinkerm" supported="no">
+	<software name="tinkermg" cloneof="tinkerm">
 		<description>TinkerBell (Germany)</description>
-		<year>2009?</year>
+		<year>2009</year>
 		<publisher>VTech</publisher>
 		<info name="serial" value="80-084324(GE)" />
 		<part name="cart" interface="vsmile_cart">
@@ -1038,7 +1141,7 @@
 		</part>
 	</software>
 
-	<software name="tinkermf" cloneof="tinkerm" supported="no">
+	<software name="tinkermf" cloneof="tinkerm">
 		<description>La fée Clochette (France)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -1051,8 +1154,20 @@
 		</part>
 	</software>
 
-	<software name="toystor3mg" supported="no">
-		<description>Toy Story 3 (Germany)</description>
+	<software name="toystor3m">
+		<description>Disney/Pixar Toy Story 3 (USA)</description>
+		<year>2010</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-084420(US)" />
+		<part name="cart" interface="vsmile_cart">
+			<dataarea name="rom" size="0x1000000">
+				<rom name="vmotion80-084420.bin" size="0x1000000" crc="c0500151" sha1="265d55fd723ff7698154165719ff9cfe6c3bf0c3" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="toystor3mg" cloneof="toystor3m">
+		<description>Disney/Pixar Toy Story 3 (Germany)</description>
 		<year>2010</year>
 		<publisher>VTech</publisher>
 		<info name="serial" value="80-084424(GE)" />
@@ -1068,7 +1183,20 @@
 		</part>
 	</software>
 
-	<software name="toystor3ms" cloneof="toystor3mg" supported="no">
+	<software name="toystor3mf" cloneof="toystor3m">
+		<description>Disney/Pixar Toy Story 3 (France)</description>
+		<year>2010</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-084425(FR)" />
+		<part name="cart" interface="vsmile_cart">
+			<feature name="u1" value="" />
+			<dataarea name="rom" size="0x1000000">
+				<rom name="084425 - Toy Story 3 (MOTION) (FR).bin" size="0x1000000" crc="2cb9d987" sha1="1ba5162181b29757335ab92451c3e164919e9c74" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="toystor3ms" cloneof="toystor3m">
 		<description>Disney/Pixar Toy Story 3 (Spain)</description>
 		<year>2010</year>
 		<publisher>VTech</publisher>
@@ -1085,7 +1213,7 @@
 		</part>
 	</software>
 
-	<software name="upmf" supported="no">
+	<software name="upmf">
 		<description>Disney/Pixar Là-Haut (France)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -1098,7 +1226,7 @@
 		</part>
 	</software>
 
-	<software name="upms" cloneof="upmf" supported="no">
+	<software name="upms" cloneof="upmf">
 		<description>Disney/Pixar UP (Spain)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -1113,7 +1241,7 @@
 		</part>
 	</software>
 
-	<software name="wallem" supported="no">
+	<software name="wallem">
 		<description>Disney/Pixar Wall-E (USA, Rev. 2?)</description>
 		<year>2008</year>
 		<publisher>VTech</publisher>
@@ -1128,7 +1256,7 @@
 		</part>
 	</software>
 
-	<software name="wallemg" cloneof="wallem" supported="no">
+	<software name="wallemg" cloneof="wallem">
 		<description>Disney/Pixar Wall-E (Germany)</description>
 		<year>2008</year>
 		<publisher>VTech</publisher>
@@ -1143,7 +1271,7 @@
 		</part>
 	</software>
 
-	<software name="wallemf" cloneof="wallem" supported="no">
+	<software name="wallemf" cloneof="wallem">
 		<description>Disney/Pixar Wall-E (France)</description>
 		<year>2008</year>
 		<publisher>VTech</publisher>
@@ -1156,7 +1284,7 @@
 		</part>
 	</software>
 
-	<software name="wallems" cloneof="wallem" supported="no">
+	<software name="wallems" cloneof="wallem">
 		<description>Disney/Pixar Wall-E (Spain)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
@@ -1171,7 +1299,19 @@
 		</part>
 	</software>
 
-	<software name="wintrsptmg" supported="no">
+	<software name="wldwavesmf">
+		<description>Martin Le Dauphin (France)</description>
+		<year>200?</year>
+		<publisher>VTech</publisher>
+		<info name="serial" value="80-084285(FR)" />
+		<part name="cart" interface="vsmile_cart">
+			<dataarea name="rom" size="8388608">
+				<rom name="084285 - MartinLeDauphin (MOTION) (FR).bin" size="8388608" crc="0b224331" sha1="1f93ddd81648058312640c95682069267e06de9e" />
+			</dataarea>
+		</part>
+	</software>
+
+	<software name="wintrsptmg">
 		<description>Wintersport (Germany)</description>
 		<year>2009?</year>
 		<publisher>VTech</publisher>
@@ -1183,7 +1323,7 @@
 		</part>
 	</software>
 
-	<software name="wonderpetm" supported="no">
+	<software name="wonderpetm">
 		<description>Nickelodeon Wonder Pets! - Save the Animals! (UK)</description>
 		<year>2009</year>
 		<publisher>VTech</publisher>
diff -Nru mame-0.222+dfsg.1/hash/z80ne_flop.xml mame-0.224+dfsg.1/hash/z80ne_flop.xml
--- mame-0.222+dfsg.1/hash/z80ne_flop.xml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/hash/z80ne_flop.xml	2020-08-26 08:57:19.000000000 +0000
@@ -157,9 +157,9 @@
 	An interesting note from z80ne.com:
 
 	This version has been recovered by undeleting some files that were on the original
-	NE-DOS version G.1.0 floppy. Probably, Nuova Elettronica tecnicians saved that files
-	on the master floppy to be distributed, but they deleted them because that files weren't
-	part of the distribution (infact editor assembler/disassembler was sold separately).
+	NE-DOS version G.1.0 floppy. Probably, Nuova Elettronica tecnicians saved those files
+	on the master floppy to be distributed, but they deleted them because the files weren't
+	part of the distribution (in fact editor assembler/disassembler was sold separately).
 	Anyway, due to the fact that they are recovered files, I cannot guarantee that they are
 	the official version and not a test version instead. However, from the tests I made, they
 	work perfectly.
@@ -167,12 +167,12 @@
 	From the NE-DOS version G.1.0 original floppy I was able to undelete and recover the
 	following programs, that I saved on this floppy: Editor assembler, Disassembler, Super
 	Debug, Disk Print and LmOffset.
-	The Super Debug has been announced on the magazine, but it was never released.
-	It's clear that it's a preliminar version, because it's clearly a bad preliminar translation
+	The Super Debug has been announced in the magazine, but it was never released.
+	It's clear that it's a preliminary version, because it's clearly a bad preliminary translation
 	in italian of an english program, probably SuperZap that was made for Tandy TRS-80.
-	The Disk Print is a program never named on the magazine, that dumps floppy
+	The Disk Print is a program never named in the magazine, that dumps floppy
 	contents on video or printer.
-	Then the LmOffset program, also never named on the magazine, it's the same
+	Then the LmOffset program, also never named in the magazine, it's the same
 	program that can be found on the Tandy TRS-80
 	-->
 	<software name="editasmg">
@@ -562,7 +562,7 @@
 	</software>
 
 	<!--
-	This disk is a collection of games that can be found in other disks also, starting from a single main menù.
+	This disk is a collection of games that can be found in other disks also, starting from a single main menu.
 
 	- basic G.1 + ne-dos G.1.0  operating system and basic
 	- battnava/bas              naval battle
diff -Nru mame-0.222+dfsg.1/makefile mame-0.224+dfsg.1/makefile
--- mame-0.222+dfsg.1/makefile	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/makefile	2020-08-26 08:57:19.000000000 +0000
@@ -392,6 +392,13 @@
 endif
 endif
 
+# ppc has inline assembly support but no DRC
+ifeq ($(findstring ppc,$(UNAME)),ppc)
+ifndef FORCE_DRC_C_BACKEND
+	FORCE_DRC_C_BACKEND := 1
+endif
+endif
+
 # Autodetect BIGENDIAN
 # MacOSX
 ifndef BIGENDIAN
@@ -1704,14 +1711,14 @@
 
 ifeq (posix,$(SHELLTYPE))
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo '#define BARE_BUILD_VERSION "0.222"' > $@
+	@echo '#define BARE_BUILD_VERSION "0.224"' > $@
 	@echo 'extern const char bare_build_version[];' >> $@
 	@echo 'extern const char build_version[];' >> $@
 	@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
 	@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
 else
 $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS)
-	@echo #define BARE_BUILD_VERSION "0.222" > $@
+	@echo #define BARE_BUILD_VERSION "0.224" > $@
 	@echo extern const char bare_build_version[]; >> $@
 	@echo extern const char build_version[]; >> $@
 	@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@
@@ -1753,22 +1760,7 @@
 # FIXME: make this work with SEPARATE_BIN
 cleansrc:
 	@echo Cleaning up tabs/spaces/end of lines....
-ifeq ($(OS),windows)
-	$(shell for /r src %%i in (*.c) do srcclean %%i >&2 )
-	$(shell for /r src %%i in (*.cpp) do srcclean %%i >&2 )
-	$(shell for /r src %%i in (*.h) do srcclean %%i >&2 )
-	$(shell for /r src %%i in (*.hpp) do srcclean %%i >&2 )
-	$(shell for /r src %%i in (*.hxx) do srcclean %%i >&2 )
-	$(shell for /r src %%i in (*.ipp) do srcclean %%i >&2 )
-	$(shell for /r src %%i in (*.lay) do srcclean %%i >&2 )
-	$(shell for /r src %%i in (*.lst) do srcclean %%i >&2 )
-	$(shell for /r src %%i in (*.mak) do srcclean %%i >&2 )
-	$(shell for /r src %%i in (*.mm) do srcclean %%i >&2 )
-	$(shell for /r hash %%i in (*.hsi) do srcclean %%i >&2 )
-	$(shell for /r hash %%i in (*.xml) do srcclean %%i >&2 )
-	$(shell for /r plugins %%i in (*.lua) do srcclean %%i >&2 )
-	$(shell for /r scripts %%i in (*.lua) do srcclean %%i >&2 )
-else
+ifeq (posix,$(SHELLTYPE))
 	$(SILENT) find src -name \*.c -exec ./srcclean {} \; >&2
 	$(SILENT) find src -name \*.cpp -exec ./srcclean {} \; >&2
 	$(SILENT) find src -name \*.h -exec ./srcclean {} \; >&2
@@ -1783,6 +1775,21 @@
 	$(SILENT) find hash -name \*.xml -exec ./srcclean {} \; >&2
 	$(SILENT) find plugins -name \*.lua -exec ./srcclean {} \; >&2
 	$(SILENT) find scripts -name \*.lua -exec ./srcclean {} \; >&2
+else
+	$(shell for /r src %%i in (*.c) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.cpp) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.h) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.hpp) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.hxx) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.ipp) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.lay) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.lst) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.mak) do srcclean %%i >&2 )
+	$(shell for /r src %%i in (*.mm) do srcclean %%i >&2 )
+	$(shell for /r hash %%i in (*.hsi) do srcclean %%i >&2 )
+	$(shell for /r hash %%i in (*.xml) do srcclean %%i >&2 )
+	$(shell for /r plugins %%i in (*.lua) do srcclean %%i >&2 )
+	$(shell for /r scripts %%i in (*.lua) do srcclean %%i >&2 )
 endif
 
 #-------------------------------------------------
diff -Nru mame-0.222+dfsg.1/plugins/autofire/autofire_save.lua mame-0.224+dfsg.1/plugins/autofire/autofire_save.lua
--- mame-0.222+dfsg.1/plugins/autofire/autofire_save.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/plugins/autofire/autofire_save.lua	2020-08-26 08:57:19.000000000 +0000
@@ -74,11 +74,16 @@
 	elseif attr.mode ~= 'directory' then
 		return
 	end
+	if #buttons == 0 then
+		os.remove(path .. get_settings_filename())
+		return
+	end
 	local json = require('json')
 	local settings = serialize_settings(buttons)
+	local data = json.stringify(settings, {indent = true})
 	local file = io.open(path .. get_settings_filename(), 'w')
 	if file then
-		file:write(json.stringify(settings, {indent = true}))
+		file:write(data)
 		file:close()
 	end
 end
diff -Nru mame-0.222+dfsg.1/plugins/hiscore/hiscore.dat mame-0.224+dfsg.1/plugins/hiscore/hiscore.dat
--- mame-0.222+dfsg.1/plugins/hiscore/hiscore.dat	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/plugins/hiscore/hiscore.dat	2020-08-26 08:57:19.000000000 +0000
@@ -104,12 +104,20 @@
 
 ;@s:8080bw.cpp
 
+invaddlx:
+invadpt2:
+invadpt2a:
+invadpt2br:
+@:maincpu,program,20f4,2,00,05
+@:maincpu,program,2340,a,1b,1b
+
+
+alieninvp2:
 searthie:
 supinvsion:
 @:maincpu,program,20f4,02,00,50
 
 
-alieninvp2:
 cosmicin:
 galmonst:
 invader4:
@@ -301,12 +309,6 @@
 @:maincpu,program,2005,06,00,00
 
 
-invaddlx:
-invadpt2:
-@:maincpu,program,20f4,2,00,05
-@:maincpu,program,2340,a,1b,1b
-
-
 ;(space laser) and clones (by GeoMan) 
 intruder:
 laser:
@@ -804,6 +806,17 @@
 
 ;@s:arkanoid.cpp
 
+ark1ball:
+arktayt2:
+@:maincpu,program,ef79,23,00,42
+@:maincpu,program,c4df,03,00,00
+
+
+arkanoidja:
+@:maincpu,program,ef75,23,00,52
+@:maincpu,program,c4df,03,00,00
+
+
 ;**** let game run for about 5 seconds before playing **** 
 tetrsark:
 tetrsark2:
@@ -812,12 +825,10 @@
 
 
 ;arkanoid:[Special thanks to Cananas for enhancing this entry]
-ark1ball:
 arkangc:
 arkangc2:
 arkanoid:
 arkanoidj:
-arkanoidja:
 arkanoidjb:
 arkanoidjbl:
 arkanoidjbl2:
@@ -834,11 +845,6 @@
 @:maincpu,program,c4df,03,00,00
 
 
-arktayt2:
-@:maincpu,program,ef79,23,00,42
-@:maincpu,program,c4df,03,00,00
-
-
 block2:
 @:maincpu,program,ef79,23,00,4a
 @:maincpu,program,c4df,03,00,00
@@ -1099,6 +1105,7 @@
 astrof:
 astrof2:
 astrof3:
+astroff:
 sstarbtl:
 strfight:
 @:maincpu,program,0084,2,00,00
@@ -1671,6 +1678,11 @@
 
 ;@s:btime.cpp
 
+protenn:
+@:maincpu,program,db,3,00,00
+@delay=3
+
+
 ;(cassette: pro tennis & world tennis)
 cptennis:
 cptennisj:
@@ -2139,6 +2151,16 @@
 
 ;@s:cave.cpp
 
+;(donpachi)
+donpachi:
+donpachihk:
+donpachij:
+donpachijs:
+donpachikr:
+@:maincpu,program,101782,4,00,00
+@:maincpu,program,101846,5a,00,01
+
+
 ;(pretty soldier sailer moon)
 sailormn:
 sailormnh:
@@ -2230,15 +2252,6 @@
 @:maincpu,program,2024ac,4,00,00
 
 
-;(donpachi)
-donpachi:
-donpachihk:
-donpachij:
-donpachikr:
-@:maincpu,program,101782,4,00,00
-@:maincpu,program,101846,5a,00,01
-
-
 nmaster:
 @:maincpu,program,f08100,e0,30,01
 
@@ -2587,6 +2600,7 @@
 ;(tailgunner) (by GeoMan)
 tailg:
 @:maincpu,data,d8,4,0,0
+@delay=5
 
 
 ;(speed freak) (by GeoMan)
@@ -2596,6 +2610,12 @@
 
 ;@s:circus.cpp
 
+circus:
+circusb:
+springbd:
+@:maincpu,program,0036,2,00,00
+
+
 crash:
 crasha:
 smash:
@@ -2607,11 +2627,6 @@
 @:maincpu,program,36,2,0,0
 
 
-circus:
-springbd:
-@:maincpu,program,0036,2,00,00
-
-
 ;@s:circusc.cpp
 
 ;circusc3:******circus charlie (no level select)*
@@ -2633,17 +2648,18 @@
 
 ;@s:cischeat.cpp
 
+;(big run (11th rallye version))
+bigrun:
+bigrunu:
+@:cpu1,program,f61da,2bc,50,05
+
+
 f1gpstar:
 f1gpstar2:
 f1gpstar3:
 @:cpu1,program,f2803,5e3,04,4d
 
 
-;(big run (11th rallye version))
-bigrun:
-@:cpu1,program,f61da,2bc,50,05
-
-
 ;(scud hammer) (by GeoMan)
 scudhamm:
 @:maincpu,program,fd1ea,3c,00,01
@@ -2896,12 +2912,31 @@
 
 ;@s:cps1.cpp
 
-pang3:
-pang3b:
-pang3b2:
-pang3j:
-pang3r1:
-@:maincpu,program,ff9726,8c,00,09
+;varthr1:******varth - operation thunderstorm (world 920612)
+varth:
+varthb:
+varthb2:
+varthj:
+varthjr:
+varthr1:
+varthu:
+@:maincpu,program,fff9ea,50,00,01
+@:maincpu,program,fffa42,04,00,00
+
+
+;wofhfh:******Sangokushi II: Huo Fenghuang (Chinese bootleg)
+wof:
+wofa:
+wofabl:
+wofhfh:
+wofj:
+wofpic:
+wofr1:
+wofr1bl:
+wofu:
+@:maincpu,program,ff6368,0a,00,00
+@:maincpu,program,ff77d8,78,ff,10
+@:maincpu,program,ff63d4,04,00,00
 
 
 ;street fighter 2 (US 910318)(clone)(by tamphax)
@@ -2914,6 +2949,7 @@
 sf2ebbl3:
 sf2ed:
 sf2ee:
+sf2ef:
 sf2em:
 sf2en:
 sf2j:
@@ -2944,6 +2980,29 @@
 @:maincpu,program,ffd302,04,00,00
 
 
+pang3:
+pang3b:
+pang3b2:
+pang3b3:
+pang3j:
+pang3r1:
+@:maincpu,program,ff9726,8c,00,09
+
+
+gulunpa:
+@:maincpu,program,ff85eb,aa,00,01
+@:maincpu,program,ffc763,3,00,88
+
+
+ffight:
+ffightbl:
+ffightblb:
+ffightj:
+ffightjh:
+@:maincpu,program,ff850c,3c,ff,00
+@:maincpu,program,ff80a0,04,00,00
+
+
 ffightu:
 @:maincpu,program,ff850e,39,85,50
 @:maincpu,program,ff80a0,4,00,00
@@ -2978,14 +3037,6 @@
 @:maincpu,program,ff80a0,04,00,03
 
 
-ffight:
-ffightbl:
-ffightj:
-ffightjh:
-@:maincpu,program,ff850c,3c,ff,00
-@:maincpu,program,ff80a0,04,00,00
-
-
 ;******Street Fighter II' - Hyper Fighting (World 921209)
 sf2acc:
 sf2acca:
@@ -3117,15 +3168,6 @@
 @:maincpu,program,ffda2c,04,00,00
 
 
-dino:
-dinoa:
-dinohunt:
-dinoj:
-dinou:
-@:maincpu,program,fff03e,310,00,00
-@:maincpu,program,fff34e,010,99,00
-
-
 qad:
 @:maincpu,program,ffe96e,3c,00,70
 
@@ -3139,18 +3181,6 @@
 @:maincpu,program,ff5b92,004,01,00
 
 
-;wofhfh:******Sangokushi II: Huo Fenghuang (Chinese bootleg)
-wof:
-wofa:
-wofhfh:
-wofj:
-wofr1:
-wofu:
-@:maincpu,program,ff6368,0a,00,00
-@:maincpu,program,ff77d8,78,ff,10
-@:maincpu,program,ff63d4,04,00,00
-
-
 sf2accp2:
 @:maincpu,program,ffd276,27,00,4b
 @:maincpu,program,ffd2ee,4,00,00
@@ -3246,17 +3276,6 @@
 @:maincpu,program,ff0ca4,04,00,00
 
 
-;varthr1:******varth - operation thunderstorm (world 920612)
-varth:
-varthb:
-varthj:
-varthjr:
-varthr1:
-varthu:
-@:maincpu,program,fff9ea,50,00,01
-@:maincpu,program,fffa42,04,00,00
-
-
 nemo:
 nemoj:
 nemor1:
@@ -3322,6 +3341,16 @@
 
 ;@s:cps1bl_pic.cpp
 
+dino:
+dinoa:
+dinohunt:
+dinoj:
+dinou:
+jurassic99:
+@:maincpu,program,fff03e,310,00,00
+@:maincpu,program,fff34e,010,99,00
+
+
 ;Saturday Night Slam Masters clones
 mbomberj:
 slammast:
@@ -3334,6 +3363,20 @@
 
 ;@s:cps2.cpp
 
+;vsavd:******Vampire Savior: The Lord of Vampire (Euro 970519 Phoenix Edition) (bootleg)
+vhunt2:
+vhunt2d:
+vhunt2r1:
+vsav:
+vsava:
+vsavb:
+vsavd:
+vsavh:
+vsavj:
+vsavu:
+@:maincpu,program,fff426,ad,00,02
+
+
 ;19xxd:******19XX: The War Against Destiny (USA 951207 Phoenix Edition) (bootleg)
 19xx:
 19xxa:
@@ -3525,19 +3568,6 @@
 @:maincpu,program,ff256e,63,00,05
 
 
-;vsavd:******Vampire Savior: The Lord of Vampire (Euro 970519 Phoenix Edition) (bootleg)
-vhunt2:
-vhunt2d:
-vhunt2r1:
-vsav:
-vsava:
-vsavd:
-vsavh:
-vsavj:
-vsavu:
-@:maincpu,program,fff426,ad,00,02
-
-
 ;(capcom sports club (japan 970722)) and clones (by GeoMan) 
 csclub:
 csclub1:
@@ -4086,6 +4116,16 @@
 @:maincpu,program,3f803c,1e,19,10
 
 
+;@s:dblewing.cpp
+
+dblewing:
+dblewinga:
+dblewingb:
+@:maincpu,program,ff3b01,f7,2d,00
+@:maincpu,program,ff3ac1,03,00,00
+@delay=2.5
+
+
 ;@s:dbz.cpp
 
 ;(dragonball z 2 super battle) (by GeoMan)
@@ -4733,6 +4773,11 @@
 
 ;@s:dkong.cpp
 
+hunchbkd:
+@:maincpu,program,1c23,50,1b,00
+@:maincpu,program,1c73,1,01,01
+
+
 ;dkongf:******Donkey Kong Foundry (hack)
 dkong:
 dkongf:
@@ -4818,11 +4863,6 @@
 @:maincpu,program,1a27,5,30,30
 
 
-hunchbkd:
-@:maincpu,program,1c23,4f,1b,00
-@:maincpu,program,1c73,1,01,01
-
-
 herodk:
 herodku:
 @:maincpu,program,3c44,50,00,00
@@ -5408,6 +5448,14 @@
 
 ;@s:expro02.cpp
 
+galsnew:
+galsnewu:
+galsnewj:
+galsnewk:
+galsnewt:
+@:maincpu,program,c825b6,64,30,31
+
+
 ;zipzap:******Zip & Zap
 zipzap:
 zipzapa:
@@ -5454,13 +5502,6 @@
 @:maincpu,program,f825b6,64,30,00
 
 
-galsnew:
-galsnewa:
-galsnewj:
-galsnewk:
-@:maincpu,program,c825b6,64,30,31
-
-
 ;@s:exprraid.cpp
 
 ;exprraid:******Express Raider (US set 2)
@@ -5740,6 +5781,14 @@
 
 ;@s:freekick.cpp
 
+;perfect billiards (by GeoMan)
+pbillrd:
+pbillrdbl:
+pbillrds:
+pbillrdsa:
+@:maincpu,program,c940,a0,00,40
+
+
 ;*******(gigas mark II)(bootleg)(By Firebrand)
 gigasm2:
 gigasm2b:
@@ -5751,13 +5800,6 @@
 @:maincpu,program,d0d8,127,00,48
 
 
-;perfect billiards (by GeoMan)
-pbillrd:
-pbillrds:
-pbillrdsa:
-@:maincpu,program,c940,a0,00,40
-
-
 ;******free kick (bootleg)
 freekick:
 freekicka:
@@ -6042,6 +6084,7 @@
 galapx:
 galaxbsf:
 galaxbsf2:
+galaxcirsa:
 galaxian:
 galaxiana:
 galaxianbl:
@@ -6055,6 +6098,7 @@
 galaxrcgg:
 galaxrf:
 galaxrfgg:
+galaxyx:
 galemp:
 galturbo:
 gteikoku:
@@ -6077,11 +6121,7 @@
 zerotime:
 zerotimed:
 zerotimemc:
-@:maincpu,program,40a8,3,00,00
-
-
-theendss:
-@:maincpu,program,43c0,f,00,00
+zerotimeu:
 @:maincpu,program,40a8,3,00,00
 
 
@@ -6104,8 +6144,8 @@
 mooncrstu:
 mooncrstuk:
 mooncrstuku:
+mooncrstuu:
 sirio2:
-sirio2a:
 smooncrs:
 spcdrag:
 spcdraga:
@@ -6115,6 +6155,31 @@
 @:maincpu,program,8042,54,00,24
 
 
+theend:
+theends:
+@:maincpu,program,43c0,0f,00,00
+@:maincpu,program,40a8,03,00,00
+@:maincpu,program,4da1,01,00,00
+@:maincpu,program,4dc1,01,00,00
+@:maincpu,program,4de1,01,10,10
+@:maincpu,program,4e01,01,10,10
+@:maincpu,program,4e21,01,10,10
+@:maincpu,program,4e41,01,10,10
+@delay=3.5
+
+
+;(omega)
+omega:
+omegaa:
+omegab:
+@:maincpu,program,c060,4d,00,20
+
+
+theendss:
+@:maincpu,program,43c0,f,00,00
+@:maincpu,program,40a8,3,00,00
+
+
 amidars:
 mandinga:
 mandingac:
@@ -6155,15 +6220,6 @@
 @:maincpu,program,80a8,03,00,01
 
 
-;(omega)
-omega:
-omegaa:
-omegab:
-theend:
-theends:
-@:maincpu,program,c060,4d,00,20
-
-
 pacmanblv:
 @:maincpu,program,4288,03,00,00
 @:maincpu,program,426c,01,06,06
@@ -6560,6 +6616,12 @@
 
 ;@s:galaxold.cpp
 
+hunchbkg:
+@:maincpu,program,1c0a,50,1b,00
+@:maincpu,program,1c0f,1,00,00
+@:maincpu,program,1c0d,1,20,20
+
+
 ;(tazz-mania)
 ;tazzmang:******Tazz-Mania (Galaxian Hardware)
 tazmani2:
@@ -6586,12 +6648,6 @@
 @:maincpu,program,60b8,3,00,01
 
 
-hunchbkg:
-@:maincpu,program,1c0a,4f,1b,00
-@:maincpu,program,1c0f,1,00,00
-@:maincpu,program,1c0d,1,20,20
-
-
 froggerv:
 @:maincpu,program,83f1,0a,42,01
 @:maincpu,program,83ef,2,42,04
@@ -6832,6 +6888,7 @@
 gijoeea:
 gijoej:
 gijoeu:
+gijoeua:
 @:maincpu,program,18f900,f8,41,01
 
 
@@ -6888,6 +6945,12 @@
 @:maincpu,program,c076,50,05,59
 
 
+;@s:goori.cpp
+
+goori:
+@:maincpu,program,108ba8,3c,4d,20
+
+
 ;@s:gottlieb.cpp
 
 ;*** daily scores saved, others saved in nvram !!! Don't Reset game (F3) !!!   ***
@@ -7000,6 +7063,7 @@
 
 gunsmoke:
 gunsmokeb:
+gunsmokeg:
 gunsmokeu:
 gunsmokeua:
 @:maincpu,program,e680,50,00,14
@@ -7063,7 +7127,7 @@
 
 ;@s:headonb.cpp
 
-headonb:
+foolrace:
 @:maincpu,program,ff06,4,00,00
 
 
@@ -7147,6 +7211,19 @@
 @:maincpu,program,48fc,04,00,d4
 
 
+;@s:hotblock.cpp
+
+hotblock:
+hotblocka:
+@:maincpu,program,acb0,a0,50,00
+@delay=3.5
+
+
+hotblockb:
+@:maincpu,program,b3b0,a0,50,00
+@delay=3.5
+
+
 ;@s:hvyunit.cpp
 
 hvyunit:
@@ -7161,7 +7238,8 @@
 
 roadf:
 roadf2:
-roadf3:
+roadfh
+roadfu:
 @:maincpu,program,3bd0,10a,01,01
 @:maincpu,program,3066,3,01,00
 
@@ -7450,6 +7528,7 @@
 
 ;@s:kchamp.cpp
 
+karateda:
 karatedo:
 karatevs:
 kchamp:
@@ -8125,6 +8204,16 @@
 
 ;@s:m72.cpp
 
+hharryb:
+@:maincpu,program,e09a0,9f,40,20
+@:maincpu,program,e0a40,03,40,02
+
+
+airduel:
+airduelu:
+@:maincpu,program,d3d4e,82,15,20
+
+
 ;dbreed:******Dragon Breed (M81 pcb version)
 dbreed:
 @:maincpu,program,88990,82,58,2e
@@ -8140,10 +8229,6 @@
 @:maincpu,program,90950,01,06,06
 
 
-airduel:
-@:maincpu,program,d3d4e,82,15,20
-
-
 airduelm72:
 @:maincpu,program,a3d4e,82,15,20
 
@@ -8746,14 +8831,6 @@
 
 ;@s:megasys1.cpp
 
-;** top score updates when first game starts **
-lordofkb:
-lordofk:
-@:maincpu,program,f8921,97,00,4e
-@:maincpu,program,f8875,f,00,00
-@:maincpu,program,f887b,1,02,02
-
-
 p47:
 p47b:
 p47j:
@@ -8826,6 +8903,14 @@
 @:maincpu,program,64ccb,1,09,09
 
 
+;** top score updates when first game starts **
+lordofk:
+lordofkb:
+@:maincpu,program,f8921,97,00,4e
+@:maincpu,program,f8875,f,00,00
+@:maincpu,program,f887b,1,02,02
+
+
 ;(soldam (japan))
 ;** you must let the game display the highscore in attract mode before **
 ;** starting a game - just like in star force                          **
@@ -10076,6 +10161,13 @@
 
 ;@s:nemesis.cpp
 
+;(twinbee)
+twinbee:
+twinbeeb:
+@:maincpu,program,1f580,58,00,0a
+@:maincpu,program,1eba0,4,00,00
+
+
 gradius:
 gradiusb:
 @:maincpu,program,195f0,8c,00,00
@@ -10095,12 +10187,6 @@
 @:maincpu,program,42800,28,00,10
 
 
-;(twinbee)
-twinbee:
-@:maincpu,program,1f580,58,00,0a
-@:maincpu,program,1eba0,4,00,00
-
-
 konamigt:
 @:maincpu,program,60105,1,00,00
 @:maincpu,program,60106,2,10,00
@@ -10353,6 +10439,11 @@
 
 ;@s:nmk16.cpp
 
+strahljbl:
+@:maincpu,program,f3095,d9,55,2e
+@:maincpu,program,f0d31,3,00,50
+
+
 gunnailp:
 @:maincpu,program,faf00,6e,00,49
 @:maincpu,program,fae00,78,00,55
@@ -10717,7 +10808,9 @@
 othunder:
 othunderj:
 othunderjsc:
+othundero:
 othunderu:
+othunderuo:
 @:maincpu,program,839ca,438,4e,00
 @:maincpu,program,83dd9,1,01,01
 
@@ -10790,6 +10883,7 @@
 mspacii2:
 mspacmab:
 mspacmab2:
+mspacmab3:
 mspacman:
 mspacmanbcc:
 mspacmanbco:
@@ -10801,6 +10895,7 @@
 mspacmat:
 mspacmbe:
 mspacmbmc:
+mspacmbn:
 mspacmnf:
 mspacpls:
 msrumble:  ; missing
@@ -11155,6 +11250,7 @@
 ddpdoj:
 ddpdoja:
 ddpdojb:
+ddpdojp:
 @:maincpu,program,80381a,8c,00,02
 
 
@@ -11671,6 +11767,18 @@
 
 ;@s:psikyosh.cpp
 
+;tgm2: saves todays scores (rest are saved in nvram i think)
+tgm2:
+@:maincpu,program,60793f4,68,54,00
+@delay=5
+
+
+;tgm2p: saves todays scores (rest are saved in nvram i think)
+tgm2p:
+@:maincpu,program,6079454,68,54,00
+@delay=5
+
+
 ;(gunbird 2) (by Paul Priest)
 gunbird2:
 gunbird2a:
@@ -11827,12 +11935,9 @@
 
 ;@s:raiden2.cpp
 
-raiden2eup:
-@:maincpu,program,9de8,ef,50,2a
-
-
 raiden2:
 raiden2dx:
+raiden2es:
 raiden2f:
 raiden2hk:
 raiden2i:
@@ -11844,6 +11949,10 @@
 @:maincpu,program,9dd4,ef,50,2a
 
 
+raiden2eup:
+@:maincpu,program,9de8,ef,50,2a
+
+
 ;***** raiden dx fixed  (thanks to Takasaki)  **********
 raidendx:
 raidendxa1:
@@ -12129,6 +12238,15 @@
 
 ;@s:route16.cpp
 
+route16:
+route16a:
+route16b:
+route16bl:
+route16c:
+routex:
+@:cpu1,program,4032,9,0,0
+
+
 ;spacecho2:******space echo (set 1)
 ;spacecho:******space echo (set 2)
 spacecho:
@@ -12142,13 +12260,6 @@
 @:cpu1,program,4010,3,00,00
 
 
-route16:
-route16a:
-route16bl:
-routex:
-@:cpu1,program,4032,9,0,0
-
-
 ;@s:rpunch.cpp
 
 rabiolep:
@@ -12259,37 +12370,10 @@
 
 ;@s:scobra.cpp
 
-;(video hustler)
-hustler:
-hustlerb3:
-hustlerb4:
-hustlerb5:
-@:maincpu,program,84c0,f,00,00
-@:maincpu,program,80a8,3,00,02
-@:maincpu,program,8003,1,0a,0a
-
-
-aponow:
-rescue:
-@:maincpu,program,80f3,3c,01,4d
-
-
-;(minefield) (by GeoMan) 
-minefld:
-@:maincpu,program,80f3,3c,01,43
-
-
-stratgys:
-stratgyx:
-strongx:
-@:maincpu,program,80a8,3,00,00
-@:maincpu,program,81c0,1e,00,00
-@:maincpu,program,81dc,1,13,13
-
-
 ;******mighty monkey
 ;mimonsco:******mighty monkey (bootleg on super cobra hardware)
 mimonkey:
+mimonkeyug:
 mimonsco:
 @:maincpu,program,84a1,2,d0,07
 @:maincpu,program,8981,1,00,00
@@ -12316,6 +12400,34 @@
 @:maincpu,program,8ae0,1,10,10
 
 
+;(video hustler)
+hustler:
+hustlerb3:
+hustlerb4:
+hustlerb5:
+@:maincpu,program,84c0,f,00,00
+@:maincpu,program,80a8,3,00,02
+@:maincpu,program,8003,1,0a,0a
+
+
+aponow:
+rescue:
+@:maincpu,program,80f3,3c,01,4d
+
+
+;(minefield) (by GeoMan) 
+minefld:
+@:maincpu,program,80f3,3c,01,43
+
+
+stratgys:
+stratgyx:
+strongx:
+@:maincpu,program,80a8,3,00,00
+@:maincpu,program,81c0,1e,00,00
+@:maincpu,program,81dc,1,13,13
+
+
 ;(dark planet) (by GeoMan)
 darkplnt:
 @:maincpu,program,80b8,1e,00,4a
@@ -12357,6 +12469,7 @@
 scramce:
 scrampt:
 scramrf:
+spctrek:
 strfbomb:
 triplep:
 triplepa:
@@ -12364,6 +12477,12 @@
 @:maincpu,program,40a8,03,00,01
 
 
+hunchbks:
+hunchbks2:
+@:maincpu,program,3c0a,50,1b,00
+@:maincpu,program,3c25,1,20,20
+
+
 hotshock:
 hotshockb:
 @:maincpu,program,40a8,3,00,05
@@ -12397,12 +12516,6 @@
 @:maincpu,program,413d,3,0,0
 
 
-hunchbks:
-hunchbks2:
-@:maincpu,program,3c0a,4f,1b,00
-@:maincpu,program,3c25,1,20,20
-
-
 ;mrkougb2:******Mr. Kougar (bootleg Set 2)
 ;mrkougar2:******mr.kougar (earlier)
 mrkougar:
@@ -12747,7 +12860,7 @@
 toutrunj:
 toutrunj1:
 @:maincpu,program,6046e,118,05,20
-@:maincpu,program,60909,1,09,09
+@delay=3
 
 
 outrunra:
@@ -12778,6 +12891,7 @@
 shinobi5:
 shinobi6:
 shinobld:
+shinobldb:
 shinobls:
 @:maincpu,program,fffc00,142,00,54
 @:maincpu,program,fff010,4,00,00
@@ -13237,19 +13351,6 @@
 
 ;@s:seibuspi.cpp
 
-;******Viper Phase 1 (japan,new version)
-;viprp1s:******Viper Phase 1 (Switzerland, New Version)
-viprp1:
-viprp1h:
-viprp1j:
-viprp1k:
-viprp1pt:
-viprp1s:
-viprp1t:
-viprp1u:
-@:maincpu,program,1e610,c7,40,2e
-
-
 ;rdft2:******Raiden Fighters 2 
 ;rdft2us:******raiden fighters 2.1 (us, single board)
 rdft2:
@@ -13260,12 +13361,26 @@
 rdft2ja:
 rdft2jb:
 rdft2jc:
+rdft2s:
 rdft2t:
 rdft2u:
 rdft2us:
 @:maincpu,program,285dc,1ab,01,2e
 
 
+;******Viper Phase 1 (japan,new version)
+;viprp1s:******Viper Phase 1 (Switzerland, New Version)
+viprp1:
+viprp1h:
+viprp1j:
+viprp1k:
+viprp1pt:
+viprp1s:
+viprp1t:
+viprp1u:
+@:maincpu,program,1e610,c7,40,2e
+
+
 ;rdftadi:******Raiden Fighters (Dream Island Co. license)
 ;rdftu:******Raiden Fighters (US)
 rdft:
@@ -13581,6 +13696,7 @@
 
 sf:
 sfj:
+sfjbl:
 sfua:
 sfw:
 @:maincpu,program,ff8e72,9c,00,12
@@ -13956,6 +14072,13 @@
 
 ;@s:snk.cpp
 
+tnk3:
+tnk3b:
+tnk3j:
+@:maincpu,program,fed1,82,13,20
+@:maincpu,program,fc59,3,00,00
+
+
 tdfever2b:
 @:maincpu,program,df28,2c,54,06
 
@@ -14047,12 +14170,6 @@
 @:maincpu,program,c2b3,4b,00,4b
 
 
-tnk3:
-tnk3j:
-@:maincpu,program,fed1,82,13,20
-@:maincpu,program,fc59,3,00,00
-
-
 ikariram:
 @:maincpu,program,ff0b,50,00,4f
 @:maincpu,program,fc5f,3,00,00
@@ -14105,6 +14222,16 @@
 
 ;@s:snk6502.cpp
 
+;(vanguard)
+;vanguardj:******Vanguard (Japan)
+vanguard:
+vanguardc:
+vanguardg:
+vanguardj:
+@:maincpu,program,220,70,11,30
+@:maincpu,program,25,3,00,00
+
+
 fantasyg:
 fantasyg2:
 fantasyj:
@@ -14141,15 +14268,6 @@
 @:maincpu,program,0022,3,00,00
 
 
-;(vanguard)
-;vanguardj:******Vanguard (Japan)
-vanguard:
-vanguardc:
-vanguardj:
-@:maincpu,program,220,70,11,30
-@:maincpu,program,25,3,00,00
-
-
 ;@s:snk68.cpp
 
 ikari3:
@@ -14812,6 +14930,13 @@
 
 ;@s:superqix.cpp
 
+;*******prebillian(By Firebrand)(Hiscore display will not change. It is always 50,000. Please check)
+pbillian:
+pbillianb:
+@:maincpu,program,f26b,23,00,45
+@:maincpu,program,f222,3,00,00
+
+
 sqix:
 sqixb1:
 sqixb2:
@@ -14829,12 +14954,6 @@
 @:maincpu,program,f8f1,4,00,00
 
 
-;*******prebillian(By Firebrand)(Hiscore display will not change. It is always 50,000. Please check)
-pbillian:
-@:maincpu,program,f26b,23,00,45
-@:maincpu,program,f222,3,00,00
-
-
 ;@s:superwng.cpp
 
 superwng:
@@ -15454,6 +15573,14 @@
 
 ;@s:taito_f3.cpp
 
+;(cleopatras fortune (japan))
+;** you must wait untill the hiscore table has displayed in attract mode before **
+;** starting a game, for the save to work **
+cleopatr:
+cleopatro:
+@:maincpu,program,412de4,78,00,4a
+
+
 gunlocko:
 @:maincpu,program,40eff0,40,41,00
 @:maincpu,program,4022f6,4,01,00
@@ -15551,13 +15678,6 @@
 @:maincpu,program,40dbd8,1,41,41
 
 
-;(cleopatras fortune (japan))
-;** you must wait untill the hiscore table has displayed in attract mode before **
-;** starting a game, for the save to work **
-cleopatr:
-@:maincpu,program,412de4,78,00,4a
-
-
 ;(puzzle bobble 4 (world))
 ;Puzzle Bobble 4 clones
 pbobble4:
@@ -15931,10 +16051,11 @@
 
 ;@s:taitosj.cpp
 
-; Space Cruiser, taitosjc (thanks to thomas busse)
-spacecr:
-@:maincpu,program,818a,3,00,00
-@:maincpu,program,8200,7e,00,00
+tinstar:
+tinstara:
+@:maincpu,program,835d,1,00,00
+@:maincpu,program,835e,1,01,01
+@:maincpu,program,835f,1,00,00
 
 
 elevator:
@@ -15943,6 +16064,12 @@
 @:maincpu,program,8350,3,00,01
 
 
+; Space Cruiser, taitosjc (thanks to thomas busse)
+spacecr:
+@:maincpu,program,818a,3,00,00
+@:maincpu,program,8200,7e,00,00
+
+
 ;(water ski) (by GeoMan)
 waterski:
 @:maincpu,program,835b,3,0,0
@@ -16031,13 +16158,6 @@
 @:maincpu,program,816e,1,00,00
 
 
-tinstar:
-tinstara:
-@:maincpu,program,835d,1,00,00
-@:maincpu,program,835e,1,01,01
-@:maincpu,program,835f,1,00,00
-
-
 ;@s:tankbatt.cpp
 
 tankbatt:
@@ -16361,6 +16481,14 @@
 
 ;@s:thunderx.cpp
 
+scontra:
+scontraa:
+scontraj:
+@:maincpu,program,4100,50,11,00
+@:maincpu,program,4050,1,00,00
+@:maincpu,program,4051,3,01,00
+
+
 ;thunderxa:******thunder cross (set 2)
 ;thunderxb:******thunder cross (set 3)
 thunderx:
@@ -16372,13 +16500,6 @@
 @:maincpu,program,414e,1,10,10
 
 
-scontra:
-scontraj:
-@:maincpu,program,4100,50,11,00
-@:maincpu,program,4050,1,00,00
-@:maincpu,program,4051,3,01,00
-
-
 crazycop:
 gbusters:
 gbustersa:
@@ -16735,6 +16856,17 @@
 
 ;@s:toaplan2.cpp
 
+pipibibs:
+pipibibsa:
+pipibibsbl:
+pipibibsbl2:
+pipibibsbl3:
+pipibibsp:
+@:maincpu,program,0805d8,1,00,00
+@:maincpu,program,0805d9,3,05,00
+@:maincpu,program,0805e4,46,00,ff
+
+
 snowbro2:
 snowbro2b:
 snowbro2b2:
@@ -16791,16 +16923,6 @@
 @:maincpu,program,0805e6,46,00,ff
 
 
-pipibibs:
-pipibibsa:
-pipibibsbl:
-pipibibsbl2:
-pipibibsp:
-@:maincpu,program,0805d8,1,00,00
-@:maincpu,program,0805d9,3,05,00
-@:maincpu,program,0805e4,46,00,ff
-
-
 vfive:
 @:maincpu,program,1004fa,90,00,00
 @:maincpu,program,100436,4,00,00
@@ -17142,6 +17264,7 @@
 turboa:
 turbob:
 turbobl:
+turboc:
 turbod:
 @:maincpu,program,e400,1e,94,94
 @:maincpu,program,f310,1e,00,00
@@ -17345,6 +17468,10 @@
 
 ;@s:vamphalf.cpp
 
+jmpbreaka:
+@:maincpu,program,95d00,5f,00,67
+
+
 mrdig:
 @:maincpu,program,13d29e,145e,47,50
 @:maincpu,program,13e6fb,1,50,50
@@ -17590,6 +17717,7 @@
 
 ;*******(video pinball)
 videopin:
+videopina:
 @:maincpu,program,37,1,00,00
 @:maincpu,program,3c,1,00,00
 @:maincpu,program,41,1,00,00
@@ -18090,9 +18218,10 @@
 xmen6pu:
 xmena:
 xmenaa:
-xmenu:
 xmenj:
 xmenja:
+xmenu:
+xmenua:
 @:maincpu,program,113300,168,00,10
 
 
diff -Nru mame-0.222+dfsg.1/scripts/genie.lua mame-0.224+dfsg.1/scripts/genie.lua
--- mame-0.222+dfsg.1/scripts/genie.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/genie.lua	2020-08-26 08:57:19.000000000 +0000
@@ -1062,8 +1062,8 @@
 
 		local version = str_to_version(_OPTIONS["gcc_version"])
 		if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "pnacl") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then
-			if (version < 30400) then
-				print("Clang version 3.4 or later needed")
+			if (version < 50000) then
+				print("Clang version 5.0 or later needed")
 				os.exit(-1)
 			end
 			buildoptions {
@@ -1072,28 +1072,24 @@
 				"-Wno-unused-value",
 				"-Wno-constant-logical-operand",
 				"-fdiagnostics-show-note-include-stack",
+				"-Wno-unknown-warning-option",
+				"-Wno-extern-c-compat",
+				"-Wno-unknown-attributes",
+				"-Wno-ignored-qualifiers"
 			}
-			if (version >= 30500) then
-				buildoptions {
-					"-Wno-unknown-warning-option",
-					"-Wno-extern-c-compat",
-					"-Wno-unknown-attributes",
-					"-Wno-ignored-qualifiers"
-				}
-			end
 			if (version >= 60000) then
 				buildoptions {
 					"-Wno-pragma-pack" -- clang 6.0 complains when the packing change lifetime is not contained within a header file.
 				}
 			end
-			if ((version < 60000) or (_OPTIONS["targetos"]=="macosx" and (version <= 90000))) then
+			if (version >= 100000) and (_OPTIONS["targetos"] ~= 'macosx') then -- TODO when Xcode includes clang 10, update this to detect the vanity version number
 				buildoptions {
-					"-Wno-missing-braces" -- std::array brace initialization not fixed until 6.0.0 (https://reviews.llvm.org/rC314838)
+					"-Wno-xor-used-as-pow " -- clang 10.0 complains that expressions like 10 ^ 7 look like exponention
 				}
 			end
-			if (_OPTIONS["targetos"]=="macosx" and (version < 80000)) then
-				defines {
-					"TARGET_OS_OSX=1",
+			if (version < 60000) or ((_OPTIONS["targetos"] == "macosx") and (version <= 90000)) then
+				buildoptions {
+					"-Wno-missing-braces" -- std::array brace initialization not fixed until 6.0.0 (https://reviews.llvm.org/rC314838)
 				}
 			end
 		else
@@ -1269,15 +1265,18 @@
 		}
 
 configuration { "mingw*" }
-		if _OPTIONS["osd"]~="sdl"
-		then
+		if _OPTIONS["osd"]=="sdl" then
+			linkoptions {
+				"-Wl,--start-group",
+			}
+		else
 			linkoptions {
 				"-static",
 			}
+			flags {
+				"LinkSupportCircularDependencies",
+			}
 		end
-		linkoptions {
-			"-Wl,--start-group",
-		}
 		links {
 			"user32",
 			"winmm",
diff -Nru mame-0.222+dfsg.1/scripts/src/3rdparty.lua mame-0.224+dfsg.1/scripts/src/3rdparty.lua
--- mame-0.222+dfsg.1/scripts/src/3rdparty.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/src/3rdparty.lua	2020-08-26 08:57:19.000000000 +0000
@@ -723,6 +723,11 @@
 		}
 end
 
+	configuration { "asmjs" }
+		buildoptions {
+			"-Wno-misleading-indentation",
+		}
+
 	configuration { "mingw*" }
 		buildoptions_c {
 			"-Wno-strict-prototypes",
@@ -1390,6 +1395,7 @@
 		"__STDC_FORMAT_MACROS",
 		"__STDC_CONSTANT_MACROS",
 		"BGFX_CONFIG_MAX_FRAME_BUFFERS=128",
+		"IMGUI_DISABLE_OBSOLETE_FUNCTIONS",
 	}
 
 	if _OPTIONS["targetos"]=="linux" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="openbsd" then
@@ -2224,6 +2230,7 @@
 -- asmjit library
 --------------------------------------------------
 
+if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
 project "asmjit"
 	uuid "4539757c-6e99-4bae-b3d0-b342a7c49539"
 	kind "StaticLib"
@@ -2353,3 +2360,4 @@
 		MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass.cpp",
 		MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass_p.h",
 	}
+end
diff -Nru mame-0.222+dfsg.1/scripts/src/bus.lua mame-0.224+dfsg.1/scripts/src/bus.lua
--- mame-0.222+dfsg.1/scripts/src/bus.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/src/bus.lua	2020-08-26 08:57:19.000000000 +0000
@@ -331,12 +331,14 @@
 		MAME_DIR .. "src/devices/bus/bbc/fdc/cumana.h",
 		MAME_DIR .. "src/devices/bus/bbc/fdc/cv1797.cpp",
 		MAME_DIR .. "src/devices/bus/bbc/fdc/cv1797.h",
-		MAME_DIR .. "src/devices/bus/bbc/fdc/microware.cpp",
-		MAME_DIR .. "src/devices/bus/bbc/fdc/microware.h",
+		MAME_DIR .. "src/devices/bus/bbc/fdc/kenda.cpp",
+		MAME_DIR .. "src/devices/bus/bbc/fdc/kenda.h",
 		MAME_DIR .. "src/devices/bus/bbc/fdc/opus.cpp",
 		MAME_DIR .. "src/devices/bus/bbc/fdc/opus.h",
 		MAME_DIR .. "src/devices/bus/bbc/fdc/solidisk.cpp",
 		MAME_DIR .. "src/devices/bus/bbc/fdc/solidisk.h",
+		MAME_DIR .. "src/devices/bus/bbc/fdc/udm.cpp",
+		MAME_DIR .. "src/devices/bus/bbc/fdc/udm.h",
 		MAME_DIR .. "src/devices/bus/bbc/fdc/watford.cpp",
 		MAME_DIR .. "src/devices/bus/bbc/fdc/watford.h",
 	}
@@ -512,6 +514,8 @@
 		MAME_DIR .. "src/devices/bus/bbc/1mhzbus/pms64k.h",
 		MAME_DIR .. "src/devices/bus/bbc/1mhzbus/ramdisc.cpp",
 		MAME_DIR .. "src/devices/bus/bbc/1mhzbus/ramdisc.h",
+		MAME_DIR .. "src/devices/bus/bbc/1mhzbus/sasi.cpp",
+		MAME_DIR .. "src/devices/bus/bbc/1mhzbus/sasi.h",
 		MAME_DIR .. "src/devices/bus/bbc/1mhzbus/scsi.cpp",
 		MAME_DIR .. "src/devices/bus/bbc/1mhzbus/scsi.h",
 		MAME_DIR .. "src/devices/bus/bbc/1mhzbus/sprite.cpp",
@@ -591,8 +595,8 @@
 		MAME_DIR .. "src/devices/bus/bbc/userport/userport.h",
 		MAME_DIR .. "src/devices/bus/bbc/userport/beebspch.cpp",
 		MAME_DIR .. "src/devices/bus/bbc/userport/beebspch.h",
-		MAME_DIR .. "src/devices/bus/bbc/userport/palette.cpp",
-		MAME_DIR .. "src/devices/bus/bbc/userport/palette.h",
+		MAME_DIR .. "src/devices/bus/bbc/userport/palext.cpp",
+		MAME_DIR .. "src/devices/bus/bbc/userport/palext.h",
 		MAME_DIR .. "src/devices/bus/bbc/userport/pointer.cpp",
 		MAME_DIR .. "src/devices/bus/bbc/userport/pointer.h",
 		MAME_DIR .. "src/devices/bus/bbc/userport/usersplit.cpp",
@@ -1021,6 +1025,8 @@
 		MAME_DIR .. "src/devices/bus/electron/exp.h",
 		MAME_DIR .. "src/devices/bus/electron/fbjoy.cpp",
 		MAME_DIR .. "src/devices/bus/electron/fbjoy.h",
+		MAME_DIR .. "src/devices/bus/electron/mode7.cpp",
+		MAME_DIR .. "src/devices/bus/electron/mode7.h",
 		MAME_DIR .. "src/devices/bus/electron/plus1.cpp",
 		MAME_DIR .. "src/devices/bus/electron/plus1.h",
 		MAME_DIR .. "src/devices/bus/electron/plus2.cpp",
@@ -1422,6 +1428,8 @@
 		MAME_DIR .. "src/devices/bus/isa/xtide.h",
 		MAME_DIR .. "src/devices/bus/isa/side116.cpp",
 		MAME_DIR .. "src/devices/bus/isa/side116.h",
+		MAME_DIR .. "src/devices/bus/isa/acb2072.cpp",
+		MAME_DIR .. "src/devices/bus/isa/acb2072.h",
 		MAME_DIR .. "src/devices/bus/isa/aha1542b.cpp",
 		MAME_DIR .. "src/devices/bus/isa/aha1542b.h",
 		MAME_DIR .. "src/devices/bus/isa/aha1542c.cpp",
@@ -1688,8 +1696,16 @@
 		MAME_DIR .. "src/devices/bus/odyssey2/slot.h",
 		MAME_DIR .. "src/devices/bus/odyssey2/rom.cpp",
 		MAME_DIR .. "src/devices/bus/odyssey2/rom.h",
+		MAME_DIR .. "src/devices/bus/odyssey2/4in1.cpp",
+		MAME_DIR .. "src/devices/bus/odyssey2/4in1.h",
 		MAME_DIR .. "src/devices/bus/odyssey2/chess.cpp",
 		MAME_DIR .. "src/devices/bus/odyssey2/chess.h",
+		MAME_DIR .. "src/devices/bus/odyssey2/homecomp.cpp",
+		MAME_DIR .. "src/devices/bus/odyssey2/homecomp.h",
+		MAME_DIR .. "src/devices/bus/odyssey2/ktaa.cpp",
+		MAME_DIR .. "src/devices/bus/odyssey2/ktaa.h",
+		MAME_DIR .. "src/devices/bus/odyssey2/rally.cpp",
+		MAME_DIR .. "src/devices/bus/odyssey2/rally.h",
 		MAME_DIR .. "src/devices/bus/odyssey2/voice.cpp",
 		MAME_DIR .. "src/devices/bus/odyssey2/voice.h",
 	}
@@ -2352,6 +2368,8 @@
 		MAME_DIR .. "src/devices/bus/a2bus/computereyes2.h",
 		MAME_DIR .. "src/devices/bus/a2bus/byte8251.cpp",
 		MAME_DIR .. "src/devices/bus/a2bus/byte8251.h",
+		MAME_DIR .. "src/devices/bus/a2bus/cmsscsi.cpp",
+		MAME_DIR .. "src/devices/bus/a2bus/cmsscsi.h",
 	}
 end
 
@@ -2372,6 +2390,8 @@
 		MAME_DIR .. "src/devices/bus/a2gameio/joyport.h",
 		MAME_DIR .. "src/devices/bus/a2gameio/paddles.cpp",
 		MAME_DIR .. "src/devices/bus/a2gameio/paddles.h",
+		MAME_DIR .. "src/devices/bus/a2gameio/gizmo.cpp",
+		MAME_DIR .. "src/devices/bus/a2gameio/gizmo.h",
 	}
 end
 
@@ -2483,6 +2503,8 @@
 		MAME_DIR .. "src/devices/bus/centronics/printer.h",
 		MAME_DIR .. "src/devices/bus/centronics/digiblst.cpp",
 		MAME_DIR .. "src/devices/bus/centronics/digiblst.h",
+		MAME_DIR .. "src/devices/bus/centronics/samdac.cpp",
+		MAME_DIR .. "src/devices/bus/centronics/samdac.h",
 	}
 
 	dependency {
@@ -2528,6 +2550,8 @@
 		MAME_DIR .. "src/devices/bus/rs232/ie15.h",
 		MAME_DIR .. "src/devices/bus/rs232/swtpc8212.cpp",
 		MAME_DIR .. "src/devices/bus/rs232/swtpc8212.h",
+		MAME_DIR .. "src/devices/bus/rs232/exorterm.cpp",
+		MAME_DIR .. "src/devices/bus/rs232/exorterm.h",
 	}
 end
 
@@ -3509,6 +3533,22 @@
 
 ---------------------------------------------------
 --
+--@src/devices/bus/mackbd/mackbd.h,BUSES["MACKBD"] = true
+---------------------------------------------------
+
+if (BUSES["MACKBD"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/bus/mackbd/keyboard.cpp",
+		MAME_DIR .. "src/devices/bus/mackbd/keyboard.h",
+		MAME_DIR .. "src/devices/bus/mackbd/mackbd.cpp",
+		MAME_DIR .. "src/devices/bus/mackbd/mackbd.h",
+		MAME_DIR .. "src/devices/bus/mackbd/pluskbd.cpp",
+		MAME_DIR .. "src/devices/bus/mackbd/pluskbd.h",
+	}
+end
+
+---------------------------------------------------
+--
 --@src/devices/bus/macpds/macpds.h,BUSES["MACPDS"] = true
 ---------------------------------------------------
 if (BUSES["MACPDS"]~=null) then
@@ -3744,10 +3784,18 @@
 		MAME_DIR .. "src/devices/bus/spectrum/intf1.h",
 		MAME_DIR .. "src/devices/bus/spectrum/intf2.cpp",
 		MAME_DIR .. "src/devices/bus/spectrum/intf2.h",
+		MAME_DIR .. "src/devices/bus/spectrum/floppyone.cpp",
+		MAME_DIR .. "src/devices/bus/spectrum/floppyone.h",
 		MAME_DIR .. "src/devices/bus/spectrum/fuller.cpp",
 		MAME_DIR .. "src/devices/bus/spectrum/fuller.h",
 		MAME_DIR .. "src/devices/bus/spectrum/kempjoy.cpp",
 		MAME_DIR .. "src/devices/bus/spectrum/kempjoy.h",
+		MAME_DIR .. "src/devices/bus/spectrum/kempdisc.cpp",
+		MAME_DIR .. "src/devices/bus/spectrum/kempdisc.h",
+		MAME_DIR .. "src/devices/bus/spectrum/logitek.cpp",
+		MAME_DIR .. "src/devices/bus/spectrum/logitek.h",
+		MAME_DIR .. "src/devices/bus/spectrum/lprint.cpp",
+		MAME_DIR .. "src/devices/bus/spectrum/lprint.h",
 		MAME_DIR .. "src/devices/bus/spectrum/melodik.cpp",
 		MAME_DIR .. "src/devices/bus/spectrum/melodik.h",
 		MAME_DIR .. "src/devices/bus/spectrum/mface.cpp",
@@ -3762,6 +3810,12 @@
 		MAME_DIR .. "src/devices/bus/spectrum/plus2test.h",
 		MAME_DIR .. "src/devices/bus/spectrum/protek.cpp",
 		MAME_DIR .. "src/devices/bus/spectrum/protek.h",
+		MAME_DIR .. "src/devices/bus/spectrum/sdi.cpp",
+		MAME_DIR .. "src/devices/bus/spectrum/sdi.h",
+		MAME_DIR .. "src/devices/bus/spectrum/sixword.cpp",
+		MAME_DIR .. "src/devices/bus/spectrum/sixword.h",
+		MAME_DIR .. "src/devices/bus/spectrum/speccydos.cpp",
+		MAME_DIR .. "src/devices/bus/spectrum/speccydos.h",
 		MAME_DIR .. "src/devices/bus/spectrum/specdrum.cpp",
 		MAME_DIR .. "src/devices/bus/spectrum/specdrum.h",
 		MAME_DIR .. "src/devices/bus/spectrum/uslot.cpp",
@@ -4058,6 +4112,8 @@
 		MAME_DIR .. "src/devices/bus/hp9845_io/98034.h",
 		MAME_DIR .. "src/devices/bus/hp9845_io/98035.cpp",
 		MAME_DIR .. "src/devices/bus/hp9845_io/98035.h",
+		MAME_DIR .. "src/devices/bus/hp9845_io/98036.cpp",
+		MAME_DIR .. "src/devices/bus/hp9845_io/98036.h",
 		MAME_DIR .. "src/devices/bus/hp9845_io/98046.cpp",
 		MAME_DIR .. "src/devices/bus/hp9845_io/98046.h",
 		MAME_DIR .. "src/devices/bus/hp9845_io/hp9885.cpp",
@@ -4067,6 +4123,20 @@
 
 ---------------------------------------------------
 --
+--@src/devices/bus/hp_ipc_io/hp_ipc_io.h,BUSES["HP_IPC_IO"] = true
+---------------------------------------------------
+
+if (BUSES["HP_IPC_IO"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/bus/hp_ipc_io/hp_ipc_io.cpp",
+		MAME_DIR .. "src/devices/bus/hp_ipc_io/hp_ipc_io.h",
+		MAME_DIR .. "src/devices/bus/hp_ipc_io/82919.cpp",
+		MAME_DIR .. "src/devices/bus/hp_ipc_io/829919.h",
+	}
+end
+
+---------------------------------------------------
+--
 --@src/devices/bus/compis/graphics.h,BUSES["COMPIS_GRAPHICS"] = true
 ---------------------------------------------------
 
@@ -4250,3 +4320,67 @@
 		MAME_DIR .. "src/devices/bus/rtpc/kbd.h",
 	}
 end
+
+---------------------------------------------------
+--
+--@src/devices/bus/samcoupe/drive/drive.h,BUSES["SAMCOUPE_DRIVE_PORT"] = true
+---------------------------------------------------
+
+if (BUSES["SAMCOUPE_DRIVE_PORT"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/bus/samcoupe/drive/drive.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/drive/drive.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/drive/modules.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/drive/modules.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/drive/atom.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/drive/atom.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/drive/floppy.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/drive/floppy.h",
+	}
+end
+
+---------------------------------------------------
+--
+--@src/devices/bus/samcoupe/expansion/expansion.h,BUSES["SAMCOUPE_EXPANSION"] = true
+---------------------------------------------------
+
+if (BUSES["SAMCOUPE_EXPANSION"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/expansion.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/expansion.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/modules.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/modules.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/blue_sampler.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/blue_sampler.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/dallas.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/dallas.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/onemeg.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/onemeg.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/sambus.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/sambus.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/sdide.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/sdide.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/sid.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/sid.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/spi.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/spi.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/voicebox.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/expansion/voicebox.h",
+	}
+end
+
+---------------------------------------------------
+--
+--@src/devices/bus/samcoupe/mouse/mouse.h,BUSES["SAMCOUPE_MOUSE_PORT"] = true
+---------------------------------------------------
+
+if (BUSES["SAMCOUPE_MOUSE_PORT"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/bus/samcoupe/mouse/mouseport.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/mouse/mouseport.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/mouse/modules.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/mouse/modules.h",
+		MAME_DIR .. "src/devices/bus/samcoupe/mouse/mouse.cpp",
+		MAME_DIR .. "src/devices/bus/samcoupe/mouse/mouse.h",
+	}
+end
diff -Nru mame-0.222+dfsg.1/scripts/src/cpu.lua mame-0.224+dfsg.1/scripts/src/cpu.lua
--- mame-0.222+dfsg.1/scripts/src/cpu.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/src/cpu.lua	2020-08-26 08:57:19.000000000 +0000
@@ -39,13 +39,16 @@
 		MAME_DIR .. "src/devices/cpu/uml.h",
 		MAME_DIR .. "src/devices/cpu/x86log.cpp",
 		MAME_DIR .. "src/devices/cpu/x86log.h",
-		MAME_DIR .. "src/devices/cpu/drcbex86.cpp",
-		MAME_DIR .. "src/devices/cpu/drcbex86.h",
-		MAME_DIR .. "src/devices/cpu/drcbex64.cpp",
-		MAME_DIR .. "src/devices/cpu/drcbex64.h",
 		MAME_DIR .. "src/devices/cpu/drcumlsh.h",
-		MAME_DIR .. "src/devices/cpu/x86emit.h",
 	}
+	if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
+		files {
+			MAME_DIR .. "src/devices/cpu/drcbex64.cpp",
+			MAME_DIR .. "src/devices/cpu/drcbex64.h",
+			MAME_DIR .. "src/devices/cpu/drcbex86.cpp",
+			MAME_DIR .. "src/devices/cpu/drcbex86.h",
+		}
+	end
 end
 
 --------------------------------------------------
@@ -593,6 +596,23 @@
 end
 
 --------------------------------------------------
+-- Hitachi H16
+--@src/devices/cpu/h16/hd641016.h,CPUS["H16"] = true
+--------------------------------------------------
+
+if (CPUS["H16"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/cpu/h16/hd641016.cpp",
+		MAME_DIR .. "src/devices/cpu/h16/hd641016.h",
+	}
+end
+
+if (CPUS["H16"]~=null or _OPTIONS["with-tools"]) then
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/h16/h16dasm.cpp")
+	table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/h16/h16dasm.h")
+end
+
+--------------------------------------------------
 -- Hitachi H8 (16/32-bit H8/300, H8/300H, H8S2000 and H8S2600 series)
 --@src/devices/cpu/h8/h8.h,CPUS["H8"] = true
 --------------------------------------------------
@@ -1867,10 +1887,10 @@
 		MAME_DIR .. "src/devices/cpu/nec/nec80inst.hxx",
 		MAME_DIR .. "src/devices/cpu/nec/necmacro.h",
 		MAME_DIR .. "src/devices/cpu/nec/necmodrm.h",
-		MAME_DIR .. "src/devices/cpu/nec/necpriv.h",
+		MAME_DIR .. "src/devices/cpu/nec/necpriv.ipp",
 		MAME_DIR .. "src/devices/cpu/nec/v25instr.h",
 		MAME_DIR .. "src/devices/cpu/nec/v25instr.hxx",
-		MAME_DIR .. "src/devices/cpu/nec/v25priv.h",
+		MAME_DIR .. "src/devices/cpu/nec/v25priv.ipp",
 		MAME_DIR .. "src/devices/cpu/nec/v25.cpp",
 		MAME_DIR .. "src/devices/cpu/nec/v25.h",
 		MAME_DIR .. "src/devices/cpu/nec/v25sfr.cpp",
@@ -2575,6 +2595,8 @@
 		MAME_DIR .. "src/devices/cpu/tlcs900/tmp95c061.h",
 		MAME_DIR .. "src/devices/cpu/tlcs900/tmp95c063.cpp",
 		MAME_DIR .. "src/devices/cpu/tlcs900/tmp95c063.h",
+		MAME_DIR .. "src/devices/cpu/tlcs900/tmp96c141.cpp",
+		MAME_DIR .. "src/devices/cpu/tlcs900/tmp96c141.h",
 	}
 end
 
@@ -2596,8 +2618,16 @@
 		MAME_DIR .. "src/devices/cpu/z80/tmpz84c011.h",
 		MAME_DIR .. "src/devices/cpu/z80/tmpz84c015.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/tmpz84c015.h",
+		MAME_DIR .. "src/devices/cpu/z80/kc82.cpp",
+		MAME_DIR .. "src/devices/cpu/z80/kc82.h",
 		MAME_DIR .. "src/devices/cpu/z80/kl5c80a12.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/kl5c80a12.h",
+		MAME_DIR .. "src/devices/cpu/z80/kl5c80a16.cpp",
+		MAME_DIR .. "src/devices/cpu/z80/kl5c80a16.h",
+		MAME_DIR .. "src/devices/cpu/z80/kp69.cpp",
+		MAME_DIR .. "src/devices/cpu/z80/kp69.h",
+		MAME_DIR .. "src/devices/cpu/z80/ky80.cpp",
+		MAME_DIR .. "src/devices/cpu/z80/ky80.h",
 		MAME_DIR .. "src/devices/cpu/z80/lz8420m.cpp",
 		MAME_DIR .. "src/devices/cpu/z80/lz8420m.h",
 	}
diff -Nru mame-0.222+dfsg.1/scripts/src/formats.lua mame-0.224+dfsg.1/scripts/src/formats.lua
--- mame-0.222+dfsg.1/scripts/src/formats.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/src/formats.lua	2020-08-26 08:57:19.000000000 +0000
@@ -619,18 +619,6 @@
 
 --------------------------------------------------
 --
---@src/lib/formats/d40_dsk.h,FORMATS["D40_DSK"] = true
---------------------------------------------------
-
-if (FORMATS["D40_DSK"]~=null  or _OPTIONS["with-tools"]) then
-	files {
-		MAME_DIR.. "src/lib/formats/d40_dsk.cpp",
-		MAME_DIR.. "src/lib/formats/d40_dsk.h",
-	}
-end
-
---------------------------------------------------
---
 --@src/lib/formats/d80_dsk.h,FORMATS["D80_DSK"] = true
 --------------------------------------------------
 
@@ -835,6 +823,18 @@
 
 --------------------------------------------------
 --
+--@src/lib/formats/fl1_dsk.h,FORMATS["FL1_DSK"] = true
+--------------------------------------------------
+
+if (FORMATS["FL1_DSK"]~=null  or _OPTIONS["with-tools"]) then
+	files {
+		MAME_DIR.. "src/lib/formats/fl1_dsk.cpp",
+		MAME_DIR.. "src/lib/formats/fl1_dsk.h",
+	}
+end
+
+--------------------------------------------------
+--
 --@src/lib/formats/flex_dsk.h,FORMATS["FLEX_DSK"] = true
 --------------------------------------------------
 
@@ -1207,6 +1207,18 @@
 
 --------------------------------------------------
 --
+--@src/lib/formats/mdos_dsk.h,FORMATS["MDOS_DSK"] = true
+--------------------------------------------------
+
+if (FORMATS["MDOS_DSK"]~=null  or _OPTIONS["with-tools"]) then
+	files {
+		MAME_DIR.. "src/lib/formats/mdos_dsk.cpp",
+		MAME_DIR.. "src/lib/formats/mdos_dsk.h",
+	}
+end
+
+--------------------------------------------------
+--
 --@src/lib/formats/mfm_hd.h,FORMATS["MFM_HD"] = true
 --------------------------------------------------
 
@@ -1591,6 +1603,18 @@
 
 --------------------------------------------------
 --
+--@src/lib/formats/sdd_dsk.h,FORMATS["SDD_DSK"] = true
+--------------------------------------------------
+
+if (FORMATS["SDD_DSK"]~=null  or _OPTIONS["with-tools"]) then
+	files {
+		MAME_DIR.. "src/lib/formats/sdd_dsk.cpp",
+		MAME_DIR.. "src/lib/formats/sdd_dsk.h",
+	}
+end
+
+--------------------------------------------------
+--
 --@src/lib/formats/sf7000_dsk.h,FORMATS["SF7000_DSK"] = true
 --------------------------------------------------
 
@@ -1709,6 +1733,18 @@
 	}
 end
 
+--------------------------------------------------
+--
+--@src/lib/formats/swd_dsk.h,FORMATS["SWD_DSK"] = true
+--------------------------------------------------
+
+if (FORMATS["SWD_DSK"]~=null  or _OPTIONS["with-tools"]) then
+	files {
+		MAME_DIR.. "src/lib/formats/swd_dsk.cpp",
+		MAME_DIR.. "src/lib/formats/swd_dsk.h",
+	}
+end
+
 --------------------------------------------------
 --
 --@src/lib/formats/tandy2k_dsk.h,FORMATS["TANDY2K_DSK"] = true
diff -Nru mame-0.222+dfsg.1/scripts/src/machine.lua mame-0.224+dfsg.1/scripts/src/machine.lua
--- mame-0.222+dfsg.1/scripts/src/machine.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/src/machine.lua	2020-08-26 08:57:19.000000000 +0000
@@ -133,6 +133,19 @@
 
 ---------------------------------------------------
 --
+--@src/devices/machine/cop452.h,MACHINES["COP452"] = true
+---------------------------------------------------
+
+if (MACHINES["COP452"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/cop452.cpp",
+		MAME_DIR .. "src/devices/machine/cop452.h",
+	}
+end
+
+
+---------------------------------------------------
+--
 --@src/devices/machine/cr511b.h,MACHINES["CR511B"] = true
 ---------------------------------------------------
 
@@ -1228,6 +1241,26 @@
 
 ---------------------------------------------------
 --
+--@src/devices/machine/exorterm.h,MACHINES["EXORTERM"] = true
+---------------------------------------------------
+
+if (MACHINES["EXORTERM"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/exorterm.cpp",
+		MAME_DIR .. "src/devices/machine/exorterm.h",
+	}
+
+	dependency {
+		{ MAME_DIR .. "src/devices/machine/exorterm.cpp", GEN_DIR .. "emu/layout/exorterm155.lh" },
+	}
+
+	custombuildtask {
+		layoutbuildtask("emu/layout", "exorterm155"),
+	}
+end
+
+---------------------------------------------------
+--
 --@src/devices/machine/f3853.h,MACHINES["F3853"] = true
 ---------------------------------------------------
 
@@ -1505,6 +1538,18 @@
 
 ---------------------------------------------------
 --
+--@src/devices/machine/ibm21s850.h,MACHINES["IBM21S850"] = true
+---------------------------------------------------
+
+if (MACHINES["IBM21S850"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/ibm21s850.cpp",
+		MAME_DIR .. "src/devices/machine/ibm21s850.h",
+	}
+end
+
+---------------------------------------------------
+--
 --@src/devices/machine/idectrl.h,MACHINES["IDECTRL"] = true
 --@src/devices/machine/vt83c461.h,MACHINES["IDECTRL"] = true
 ---------------------------------------------------
@@ -1811,6 +1856,18 @@
 
 ---------------------------------------------------
 --
+--@src/devices/machine/m68sfdc.h,MACHINES["M68SFDC"] = true
+---------------------------------------------------
+
+if (MACHINES["M68SFDC"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/m68sfdc.cpp",
+		MAME_DIR .. "src/devices/machine/m68sfdc.h",
+	}
+end
+
+---------------------------------------------------
+--
 --@src/devices/machine/m6m80011ap.h,MACHINES["M6M80011AP"] = true
 ---------------------------------------------------
 
@@ -2758,6 +2815,18 @@
 
 ---------------------------------------------------
 --
+--@src/devices/machine/sa1110.h,MACHINES["SA1110"] = true
+---------------------------------------------------
+
+if (MACHINES["SA1110"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/sa1110.cpp",
+		MAME_DIR .. "src/devices/machine/sa1110.h",
+	}
+end
+
+---------------------------------------------------
+--
 --@src/devices/machine/saa1043.h,MACHINES["SAA1043"] = true
 ---------------------------------------------------
 
@@ -3139,6 +3208,18 @@
 	}
 end
 
+---------------------------------------------------
+--
+--@src/devices/machine/tsb12lv01a.h,MACHINES["TSB12LV01A"] = true
+---------------------------------------------------
+
+if (MACHINES["TSB12LV01A"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/machine/tsb12lv01a.cpp",
+		MAME_DIR .. "src/devices/machine/tsb12lv01a.h",
+	}
+end
+
 ---------------------------------------------------
 --
 --@src/devices/machine/tube.h,MACHINES["TUBE"] = true
diff -Nru mame-0.222+dfsg.1/scripts/src/main.lua mame-0.224+dfsg.1/scripts/src/main.lua
--- mame-0.222+dfsg.1/scripts/src/main.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/src/main.lua	2020-08-26 08:57:19.000000000 +0000
@@ -261,8 +261,12 @@
 		"wdlfft",
 		ext_lib("jpeg"),
 		"7z",
+	}
+if not _OPTIONS["FORCE_DRC_C_BACKEND"] then
+	links {
 		"asmjit",
 	}
+end
 if (STANDALONE~=true) then
 	links {
 		ext_lib("lua"),
diff -Nru mame-0.222+dfsg.1/scripts/src/netlist.lua mame-0.224+dfsg.1/scripts/src/netlist.lua
--- mame-0.222+dfsg.1/scripts/src/netlist.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/src/netlist.lua	2020-08-26 08:57:19.000000000 +0000
@@ -50,6 +50,20 @@
 		MAME_DIR .. "src/lib/netlist/nl_setup.cpp",
 		MAME_DIR .. "src/lib/netlist/nl_setup.h",
 		MAME_DIR .. "src/lib/netlist/nl_types.h",
+		MAME_DIR .. "src/lib/netlist/core/analog.h",
+		MAME_DIR .. "src/lib/netlist/core/base_objects.h",
+		MAME_DIR .. "src/lib/netlist/core/core_device.h",
+		MAME_DIR .. "src/lib/netlist/core/device.h",
+		MAME_DIR .. "src/lib/netlist/core/device_macros.h",
+		MAME_DIR .. "src/lib/netlist/core/devices.h",
+		MAME_DIR .. "src/lib/netlist/core/exec.h",
+		MAME_DIR .. "src/lib/netlist/core/logic_family.h",
+		MAME_DIR .. "src/lib/netlist/core/logic.h",
+		MAME_DIR .. "src/lib/netlist/core/nets.h",
+		MAME_DIR .. "src/lib/netlist/core/object_array.h",
+		MAME_DIR .. "src/lib/netlist/core/param.h",
+		MAME_DIR .. "src/lib/netlist/core/setup.h",
+		MAME_DIR .. "src/lib/netlist/core/state_var.h",
 		MAME_DIR .. "src/lib/netlist/plib/pconfig.h",
 		MAME_DIR .. "src/lib/netlist/plib/palloc.h",
 		MAME_DIR .. "src/lib/netlist/plib/pchrono.h",
@@ -123,6 +137,7 @@
 		MAME_DIR .. "src/lib/netlist/solver/vector_base.h",
 		MAME_DIR .. "src/lib/netlist/devices/net_lib.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/net_lib.h",
+		MAME_DIR .. "src/lib/netlist/devices/net_devinc.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_9316_base.hxx",
 		MAME_DIR .. "src/lib/netlist/devices/nld_2102A.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_2102A.h",
@@ -132,14 +147,16 @@
 		MAME_DIR .. "src/lib/netlist/devices/nld_4006.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_4013.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_4013.h",
+		MAME_DIR .. "src/lib/netlist/devices/nld_4017.cpp",
+		MAME_DIR .. "src/lib/netlist/devices/nld_4017.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_4020.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_4020.h",
+		MAME_DIR .. "src/lib/netlist/devices/nld_4053.cpp",
+		MAME_DIR .. "src/lib/netlist/devices/nld_4053.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_4066.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_4316.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_4316.h",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7442.cpp",
-		MAME_DIR .. "src/lib/netlist/devices/nld_7442.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7448.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7448.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_7450.cpp",
@@ -164,6 +181,8 @@
 		MAME_DIR .. "src/lib/netlist/devices/nld_7497.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_74107.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_74107.h",
+		MAME_DIR .. "src/lib/netlist/devices/nld_74113.cpp",
+		MAME_DIR .. "src/lib/netlist/devices/nld_74113.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_74123.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_74123.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_74125.cpp",
@@ -200,9 +219,13 @@
 		MAME_DIR .. "src/lib/netlist/devices/nld_82S16.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_82S115.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_82S115.h",
+		MAME_DIR .. "src/lib/netlist/devices/nld_8277.cpp",
+		MAME_DIR .. "src/lib/netlist/devices/nld_8277.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_9310.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_9316.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_9316.h",
+		MAME_DIR .. "src/lib/netlist/devices/nld_9321.cpp",
+		MAME_DIR .. "src/lib/netlist/devices/nld_9321.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_9322.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_9322.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_am2847.cpp",
@@ -211,6 +234,8 @@
 		MAME_DIR .. "src/lib/netlist/devices/nld_dm9314.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_dm9334.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_dm9334.h",
+		MAME_DIR .. "src/lib/netlist/devices/nld_9321.cpp",
+		MAME_DIR .. "src/lib/netlist/devices/nld_9321.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_ne555.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nld_ne555.h",
 		MAME_DIR .. "src/lib/netlist/devices/nld_mm5837.cpp",
@@ -234,18 +259,18 @@
 		MAME_DIR .. "src/lib/netlist/devices/nlid_system.h",
 		MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.cpp",
 		MAME_DIR .. "src/lib/netlist/devices/nlid_proxy.h",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_base.cpp",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_base.h",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.cpp",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx.h",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_cd4xxx.cpp",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_cd4xxx.h",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.cpp",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.h",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_other.cpp",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_other.h",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_roms.cpp",
-		MAME_DIR .. "src/lib/netlist/macro/nlm_roms.h",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_base_lib.cpp",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_base_lib.h",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx_lib.cpp",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_ttl74xx_lib.h",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_cd4xxx_lib.cpp",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_cd4xxx_lib.h",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_opamp_lib.cpp",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_opamp_lib.h",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_otheric_lib.cpp",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_otheric_lib.h",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_roms_lib.cpp",
+		MAME_DIR .. "src/lib/netlist/macro/nlm_roms_lib.h",
 
 		MAME_DIR .. "src/lib/netlist/generated/static_solvers.cpp",
 	}
diff -Nru mame-0.222+dfsg.1/scripts/src/sound.lua mame-0.224+dfsg.1/scripts/src/sound.lua
--- mame-0.222+dfsg.1/scripts/src/sound.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/src/sound.lua	2020-08-26 08:57:19.000000000 +0000
@@ -1589,3 +1589,15 @@
 		MAME_DIR .. "src/devices/sound/ks0164.h",
 	}
 end
+
+---------------------------------------------------
+--
+--@src/devices/sound/rp2c33_snd.h,SOUNDS["RP2C33_SOUND"] = true
+---------------------------------------------------
+
+if (SOUNDS["RP2C33_SOUND"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/sound/rp2c33_snd.cpp",
+		MAME_DIR .. "src/devices/sound/rp2c33_snd.h",
+	}
+end
diff -Nru mame-0.222+dfsg.1/scripts/src/video.lua mame-0.224+dfsg.1/scripts/src/video.lua
--- mame-0.222+dfsg.1/scripts/src/video.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/src/video.lua	2020-08-26 08:57:19.000000000 +0000
@@ -401,6 +401,18 @@
 
 --------------------------------------------------
 --
+--@src/devices/video/hlcd0438.h,VIDEOS["HLCD0438"] = true
+--------------------------------------------------
+
+if (VIDEOS["HLCD0438"]~=null) then
+	files {
+		MAME_DIR .. "src/devices/video/hlcd0438.cpp",
+		MAME_DIR .. "src/devices/video/hlcd0438.h",
+	}
+end
+
+--------------------------------------------------
+--
 --@src/devices/video/hlcd0488.h,VIDEOS["HLCD0488"] = true
 --------------------------------------------------
 
diff -Nru mame-0.222+dfsg.1/scripts/target/mame/arcade.lua mame-0.224+dfsg.1/scripts/target/mame/arcade.lua
--- mame-0.222+dfsg.1/scripts/target/mame/arcade.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/target/mame/arcade.lua	2020-08-26 08:57:19.000000000 +0000
@@ -3,7 +3,7 @@
 
 ---------------------------------------------------------------------------
 --
---   mame.lua
+--   arcade.lua
 --
 --   MAME target makefile
 --
@@ -284,6 +284,7 @@
 --SOUNDS["UPD934G"] = true
 SOUNDS["S_DSP"] = true
 SOUNDS["KS0164"] = true
+--SOUNDS["RP2C33_SOUND"] = true
 
 --------------------------------------------------
 -- specify available video cores
@@ -321,6 +322,7 @@
 VIDEOS["HD61830"] = true
 VIDEOS["HD63484"] = true
 --VIDEOS["HD66421"] = true
+--VIDEOS["HLCD0438"] = true
 --VIDEOS["HLCD0488"] = true
 --VIDEOS["HLCD0515"] = true
 --VIDEOS["HLCD0538"] = true
@@ -495,6 +497,7 @@
 --MACHINES["I8271"] = true
 MACHINES["I8279"] = true
 MACHINES["I8355"] = true
+MACHINES["IBM21S850"] = true
 MACHINES["IDECTRL"] = true
 MACHINES["IE15"] = true
 MACHINES["IM6402"] = true
@@ -609,6 +612,7 @@
 MACHINES["S3520CF"] = true
 MACHINES["S3C24XX"] = true
 --MACHINES["S3C44B0"] = true
+--MACHINES["SA1110"] = true
 MACHINES["SATURN"] = true
 MACHINES["SCC68070"] = true
 MACHINES["SCN_PCI"] = true
@@ -637,6 +641,7 @@
 MACHINES["TMS9901"] = true
 MACHINES["TMS9902"] = true
 --MACHINES["TPI6525"] = true
+MACHINES["TSB12LV01A"] = true
 --MACHINES["TTL74123"] = true
 --MACHINES["TTL74145"] = true
 --MACHINES["TTL74148"] = true
@@ -977,6 +982,8 @@
 
 createMAMEProjects(_target, _subtarget, "shared")
 files {
+	MAME_DIR .. "src/mame/machine/bacta_datalogger.h",
+	MAME_DIR .. "src/mame/machine/bacta_datalogger.cpp",
 	MAME_DIR .. "src/mame/machine/nmk112.cpp",
 	MAME_DIR .. "src/mame/machine/nmk112.h",
 	MAME_DIR .. "src/mame/machine/pcshare.cpp",
@@ -1131,6 +1138,8 @@
 	MAME_DIR .. "src/mame/machine/nl_gtrak10.h",
 	MAME_DIR .. "src/mame/machine/nl_stuntcyc.cpp",
 	MAME_DIR .. "src/mame/machine/nl_stuntcyc.h",
+	MAME_DIR .. "src/mame/machine/nl_tank.cpp",
+	MAME_DIR .. "src/mame/machine/nl_tank.h",
 	MAME_DIR .. "src/mame/drivers/atetris.cpp",
 	MAME_DIR .. "src/mame/includes/atetris.h",
 	MAME_DIR .. "src/mame/video/atetris.cpp",
@@ -1193,6 +1202,8 @@
 	MAME_DIR .. "src/mame/drivers/cybstorm.cpp",
 	MAME_DIR .. "src/mame/includes/cybstorm.h",
 	MAME_DIR .. "src/mame/video/cybstorm.cpp",
+	MAME_DIR .. "src/mame/audio/nl_destroyr.cpp",
+	MAME_DIR .. "src/mame/audio/nl_destroyr.h",
 	MAME_DIR .. "src/mame/drivers/destroyr.cpp",
 	MAME_DIR .. "src/mame/drivers/dragrace.cpp",
 	MAME_DIR .. "src/mame/includes/dragrace.h",
@@ -1206,6 +1217,8 @@
 	MAME_DIR .. "src/mame/includes/firetrk.h",
 	MAME_DIR .. "src/mame/audio/firetrk.cpp",
 	MAME_DIR .. "src/mame/video/firetrk.cpp",
+	MAME_DIR .. "src/mame/audio/nl_flyball.cpp",
+	MAME_DIR .. "src/mame/audio/nl_flyball.h",
 	MAME_DIR .. "src/mame/drivers/flyball.cpp",
 	MAME_DIR .. "src/mame/drivers/foodf.cpp",
 	MAME_DIR .. "src/mame/includes/foodf.h",
@@ -1564,7 +1577,33 @@
 	MAME_DIR .. "src/mame/drivers/cinemat.cpp",
 	MAME_DIR .. "src/mame/includes/cinemat.h",
 	MAME_DIR .. "src/mame/audio/cinemat.cpp",
+	MAME_DIR .. "src/mame/audio/cinemat.h",
 	MAME_DIR .. "src/mame/video/cinemat.cpp",
+	MAME_DIR .. "src/mame/audio/nl_armora.cpp",
+	MAME_DIR .. "src/mame/audio/nl_armora.h",
+	MAME_DIR .. "src/mame/audio/nl_barrier.cpp",
+	MAME_DIR .. "src/mame/audio/nl_barrier.h",
+	MAME_DIR .. "src/mame/audio/nl_boxingb.cpp",
+	MAME_DIR .. "src/mame/audio/nl_boxingb.h",
+	MAME_DIR .. "src/mame/audio/nl_cinemat_common.h",
+	MAME_DIR .. "src/mame/audio/nl_ripoff.cpp",
+	MAME_DIR .. "src/mame/audio/nl_ripoff.h",
+	MAME_DIR .. "src/mame/audio/nl_solarq.cpp",
+	MAME_DIR .. "src/mame/audio/nl_solarq.h",
+	MAME_DIR .. "src/mame/audio/nl_spacewar.cpp",
+	MAME_DIR .. "src/mame/audio/nl_spacewar.h",
+	MAME_DIR .. "src/mame/audio/nl_speedfrk.cpp",
+	MAME_DIR .. "src/mame/audio/nl_speedfrk.h",
+	MAME_DIR .. "src/mame/audio/nl_starcas.cpp",
+	MAME_DIR .. "src/mame/audio/nl_starcas.h",
+	MAME_DIR .. "src/mame/audio/nl_starhawk.cpp",
+	MAME_DIR .. "src/mame/audio/nl_starhawk.h",
+	MAME_DIR .. "src/mame/audio/nl_sundance.cpp",
+	MAME_DIR .. "src/mame/audio/nl_sundance.h",
+	MAME_DIR .. "src/mame/audio/nl_tailg.cpp",
+	MAME_DIR .. "src/mame/audio/nl_tailg.h",
+	MAME_DIR .. "src/mame/audio/nl_warrior.cpp",
+	MAME_DIR .. "src/mame/audio/nl_warrior.h",
 	MAME_DIR .. "src/mame/drivers/cchasm.cpp",
 	MAME_DIR .. "src/mame/includes/cchasm.h",
 	MAME_DIR .. "src/mame/machine/cchasm.cpp",
@@ -1884,6 +1923,8 @@
 
 createMAMEProjects(_target, _subtarget, "exidy")
 files {
+	MAME_DIR .. "src/mame/audio/nl_carpolo.h",
+	MAME_DIR .. "src/mame/audio/nl_carpolo.cpp",
 	MAME_DIR .. "src/mame/drivers/carpolo.cpp",
 	MAME_DIR .. "src/mame/includes/carpolo.h",
 	MAME_DIR .. "src/mame/machine/carpolo.cpp",
@@ -1913,6 +1954,10 @@
 	MAME_DIR .. "src/mame/video/antic.h",
 	MAME_DIR .. "src/mame/video/gtia.cpp",
 	MAME_DIR .. "src/mame/video/gtia.h",
+	MAME_DIR .. "src/mame/audio/nl_fireone.h",
+	MAME_DIR .. "src/mame/audio/nl_fireone.cpp",
+	MAME_DIR .. "src/mame/audio/nl_starfire.h",
+	MAME_DIR .. "src/mame/audio/nl_starfire.cpp",
 	MAME_DIR .. "src/mame/drivers/starfire.cpp",
 	MAME_DIR .. "src/mame/includes/starfire.h",
 	MAME_DIR .. "src/mame/video/starfire.cpp",
@@ -1974,6 +2019,7 @@
 	MAME_DIR .. "src/mame/video/gaelco3d.cpp",
 	MAME_DIR .. "src/mame/machine/gaelco3d.cpp",
 	MAME_DIR .. "src/mame/machine/gaelco3d.h",
+	MAME_DIR .. "src/mame/drivers/gaelcof3.cpp",
 	MAME_DIR .. "src/mame/drivers/gaelcopc.cpp",
 	MAME_DIR .. "src/mame/drivers/goldart.cpp",
 	MAME_DIR .. "src/mame/drivers/glass.cpp",
@@ -1984,6 +2030,7 @@
 	MAME_DIR .. "src/mame/drivers/rollext.cpp",
 	MAME_DIR .. "src/mame/drivers/splash.cpp",
 	MAME_DIR .. "src/mame/includes/splash.h",
+	MAME_DIR .. "src/mame/drivers/splash_ms.cpp",
 	MAME_DIR .. "src/mame/video/splash.cpp",
 	MAME_DIR .. "src/mame/drivers/targeth.cpp",
 	MAME_DIR .. "src/mame/includes/targeth.h",
@@ -2798,6 +2845,8 @@
 	MAME_DIR .. "src/mame/drivers/seattle.cpp",
 	MAME_DIR .. "src/mame/drivers/sspeedr.cpp",
 	MAME_DIR .. "src/mame/includes/sspeedr.h",
+	MAME_DIR .. "src/mame/audio/nl_sspeedr.cpp",
+	MAME_DIR .. "src/mame/audio/nl_sspeedr.h",
 	MAME_DIR .. "src/mame/video/sspeedr.cpp",
 	MAME_DIR .. "src/mame/drivers/starrider.cpp",
 	MAME_DIR .. "src/mame/drivers/tmaster.cpp",
@@ -2942,6 +2991,8 @@
 	MAME_DIR .. "src/mame/includes/skykid.h",
 	MAME_DIR .. "src/mame/video/skykid.cpp",
 	MAME_DIR .. "src/mame/drivers/sweetland.cpp",
+	MAME_DIR .. "src/mame/audio/nl_tankbatt.h",
+	MAME_DIR .. "src/mame/audio/nl_tankbatt.cpp",
 	MAME_DIR .. "src/mame/drivers/tankbatt.cpp",
 	MAME_DIR .. "src/mame/includes/tankbatt.h",
 	MAME_DIR .. "src/mame/video/tankbatt.cpp",
@@ -3322,6 +3373,8 @@
 	MAME_DIR .. "src/mame/drivers/starcrus.cpp",
 	MAME_DIR .. "src/mame/includes/starcrus.h",
 	MAME_DIR .. "src/mame/video/starcrus.cpp",
+	MAME_DIR .. "src/mame/audio/nl_starcrus.cpp",
+	MAME_DIR .. "src/mame/audio/nl_starcrus.h",
 }
 
 createMAMEProjects(_target, _subtarget, "rare")
@@ -3475,7 +3528,14 @@
 	MAME_DIR .. "src/mame/video/segag80r.cpp",
 	MAME_DIR .. "src/mame/drivers/segag80v.cpp",
 	MAME_DIR .. "src/mame/includes/segag80v.h",
-	MAME_DIR .. "src/mame/audio/segag80v.cpp",
+	MAME_DIR .. "src/mame/audio/segag80.cpp",
+	MAME_DIR .. "src/mame/audio/segag80.h",
+	MAME_DIR .. "src/mame/audio/nl_astrob.cpp",
+	MAME_DIR .. "src/mame/audio/nl_astrob.h",
+	MAME_DIR .. "src/mame/audio/nl_elim.cpp",
+	MAME_DIR .. "src/mame/audio/nl_elim.h",
+	MAME_DIR .. "src/mame/audio/nl_spacfury.cpp",
+	MAME_DIR .. "src/mame/audio/nl_spacfury.h",
 	MAME_DIR .. "src/mame/video/segag80v.cpp",
 	MAME_DIR .. "src/mame/drivers/segahang.cpp",
 	MAME_DIR .. "src/mame/includes/segahang.h",
@@ -3591,8 +3651,14 @@
 	MAME_DIR .. "src/mame/machine/segaic16.h",
 	MAME_DIR .. "src/mame/machine/segabill.cpp",
 	MAME_DIR .. "src/mame/machine/segabill.h",
-	MAME_DIR .. "src/mame/audio/segasnd.cpp",
-	MAME_DIR .. "src/mame/audio/segasnd.h",
+	MAME_DIR .. "src/mame/audio/segaspeech.cpp",
+	MAME_DIR .. "src/mame/audio/segaspeech.h",
+	MAME_DIR .. "src/mame/audio/segausb.cpp",
+	MAME_DIR .. "src/mame/audio/segausb.h",
+	MAME_DIR .. "src/mame/audio/nl_segausb.cpp",
+	MAME_DIR .. "src/mame/audio/nl_segausb.h",
+	MAME_DIR .. "src/mame/audio/nl_segaspeech.cpp",
+	MAME_DIR .. "src/mame/audio/nl_segaspeech.h",
 	MAME_DIR .. "src/mame/video/segaic16.cpp",
 	MAME_DIR .. "src/mame/video/segaic16.h",
 	MAME_DIR .. "src/mame/video/segaic16_road.cpp",
@@ -3745,6 +3811,7 @@
 	MAME_DIR .. "src/mame/drivers/nyny.cpp",
 	MAME_DIR .. "src/mame/drivers/r2dtank.cpp",
 	MAME_DIR .. "src/mame/drivers/sigma21.cpp",
+	MAME_DIR .. "src/mame/drivers/sigmab31.cpp",
 	MAME_DIR .. "src/mame/drivers/sigmab52.cpp",
 	MAME_DIR .. "src/mame/drivers/sigmab98.cpp",
 	MAME_DIR .. "src/mame/drivers/spiders.cpp",
@@ -4585,6 +4652,8 @@
 	MAME_DIR .. "src/mame/includes/s11b.h",
 	MAME_DIR .. "src/mame/drivers/s11c.cpp",
 	MAME_DIR .. "src/mame/includes/s11c.h",
+	MAME_DIR .. "src/mame/audio/pinsnd88.cpp",
+	MAME_DIR .. "src/mame/audio/pinsnd88.h",
 	MAME_DIR .. "src/mame/audio/s11c_bg.cpp",
 	MAME_DIR .. "src/mame/audio/s11c_bg.h",
 	MAME_DIR .. "src/mame/drivers/s3.cpp",
@@ -4982,6 +5051,9 @@
 	MAME_DIR .. "src/mame/drivers/smotor.cpp",
 	MAME_DIR .. "src/mame/drivers/smsmcorp.cpp",
 	MAME_DIR .. "src/mame/drivers/sothello.cpp",
+	MAME_DIR .. "src/mame/drivers/special_gambl.cpp",
+	MAME_DIR .. "src/mame/audio/special.cpp",
+	MAME_DIR .. "src/mame/audio/special.h",
 	MAME_DIR .. "src/mame/drivers/spool99.cpp",
 	MAME_DIR .. "src/mame/drivers/sprcros2.cpp",
 	MAME_DIR .. "src/mame/drivers/sshot.cpp",
@@ -5003,6 +5075,7 @@
 	MAME_DIR .. "src/mame/includes/taxidriv.h",
 	MAME_DIR .. "src/mame/video/taxidriv.cpp",
 	MAME_DIR .. "src/mame/drivers/teamjocs.cpp",
+	MAME_DIR .. "src/mame/drivers/tecnodar.cpp",
 	MAME_DIR .. "src/mame/drivers/thayers.cpp",
 	MAME_DIR .. "src/mame/drivers/thedeep.cpp",
 	MAME_DIR .. "src/mame/includes/thedeep.h",
diff -Nru mame-0.222+dfsg.1/scripts/target/mame/ci.lua mame-0.224+dfsg.1/scripts/target/mame/ci.lua
--- mame-0.222+dfsg.1/scripts/target/mame/ci.lua	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/target/mame/ci.lua	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,193 @@
+-- license:BSD-3-Clause
+-- copyright-holders:MAMEdev Team
+
+---------------------------------------------------------------------------
+--
+--   ci.lua
+--
+--   Small driver-specific example makefile for use in CI
+--   Use make SUBTARGET=ci to build
+--
+---------------------------------------------------------------------------
+
+
+--------------------------------------------------
+-- Specify all the CPU cores necessary for the
+-- drivers referenced in ci.lst.
+--------------------------------------------------
+
+CPUS["Z80"] = true
+CPUS["M6502"] = true
+CPUS["MCS48"] = true
+CPUS["MCS51"] = true
+CPUS["M6800"] = true
+CPUS["M6805"] = true
+CPUS["M6809"] = true
+CPUS["M680X0"] = true
+CPUS["TMS9900"] = true
+CPUS["COP400"] = true
+CPUS["MIPS3"] = true
+CPUS["ADSP21XX"] = true
+CPUS["FR"] = true
+
+--------------------------------------------------
+-- Specify all the sound cores necessary for the
+-- drivers referenced in ci.lst.
+--------------------------------------------------
+
+SOUNDS["SAMPLES"] = true
+SOUNDS["DAC"] = true
+SOUNDS["DISCRETE"] = true
+SOUNDS["AY8910"] = true
+SOUNDS["YM2151"] = true
+SOUNDS["ASTROCADE"] = true
+SOUNDS["TMS5220"] = true
+SOUNDS["OKIM6295"] = true
+SOUNDS["HC55516"] = true
+SOUNDS["YM3812"] = true
+SOUNDS["CEM3394"] = true
+SOUNDS["VOTRAX"] = true
+SOUNDS["VOLT_REG"] = true
+SOUNDS["DMADAC"] = true
+SOUNDS["CDDA"] = true
+SOUNDS["POKEY"] = true
+
+--------------------------------------------------
+-- specify available video cores
+--------------------------------------------------
+
+VIDEOS["PS2GIF"] = true
+VIDEOS["PS2GS"] = true
+
+--------------------------------------------------
+-- specify available machine cores
+--------------------------------------------------
+
+MACHINES["6821PIA"] = true
+MACHINES["ADC0808"] = true
+MACHINES["TTL74148"] = true
+MACHINES["TTL74153"] = true
+MACHINES["TTL74157"] = true
+MACHINES["TTL7474"] = true
+MACHINES["TTL74259"] = true
+MACHINES["RIOT6532"] = true
+MACHINES["PIT8253"] = true
+MACHINES["Z80CTC"] = true
+MACHINES["Z80PIO"] = true
+MACHINES["68681"] = true
+MACHINES["BANKDEV"] = true
+MACHINES["GEN_LATCH"] = true
+MACHINES["INPUT_MERGER"] = true
+MACHINES["OUTPUT_LATCH"] = true
+MACHINES["TICKET"] = true
+MACHINES["WATCHDOG"] = true
+MACHINES["Z80DAISY"] = true
+MACHINES["NETLIST"] = true
+MACHINES["IDECTRL"] = true
+MACHINES["PS2INTC"] = true
+MACHINES["ER2055"] = true
+
+--------------------------------------------------
+-- specify available bus cores
+--------------------------------------------------
+
+BUSES["CENTRONICS"] = true
+BUSES["ATA"] = true
+
+--------------------------------------------------
+-- This is the list of files that are necessary
+-- for building all of the drivers referenced
+-- in ci.lst
+--------------------------------------------------
+
+function createProjects_mame_ci(_target, _subtarget)
+	project ("mame_ci")
+	targetsubdir(_target .."_" .. _subtarget)
+	kind (LIBTYPE)
+	uuid (os.uuid("drv-mame-ci"))
+	addprojectflags()
+	precompiledheaders_novs()
+
+	includedirs {
+		MAME_DIR .. "src/osd",
+		MAME_DIR .. "src/emu",
+		MAME_DIR .. "src/devices",
+		MAME_DIR .. "src/mame",
+		MAME_DIR .. "src/lib",
+		MAME_DIR .. "src/lib/util",
+		MAME_DIR .. "3rdparty",
+		GEN_DIR  .. "mame/layout",
+	}
+
+files{
+	MAME_DIR .. "src/mame/audio/nl_carpolo.h",
+	MAME_DIR .. "src/mame/audio/nl_carpolo.cpp",
+	MAME_DIR .. "src/mame/drivers/carpolo.cpp",
+	MAME_DIR .. "src/mame/includes/carpolo.h",
+	MAME_DIR .. "src/mame/machine/carpolo.cpp",
+	MAME_DIR .. "src/mame/video/carpolo.cpp",
+	MAME_DIR .. "src/mame/drivers/circus.cpp",
+	MAME_DIR .. "src/mame/includes/circus.h",
+	MAME_DIR .. "src/mame/audio/circus.cpp",
+	MAME_DIR .. "src/mame/video/circus.cpp",
+	MAME_DIR .. "src/mame/drivers/exidy.cpp",
+	MAME_DIR .. "src/mame/includes/exidy.h",
+	MAME_DIR .. "src/mame/audio/exidy.cpp",
+	MAME_DIR .. "src/mame/audio/exidy.h",
+	MAME_DIR .. "src/mame/video/exidy.cpp",
+	MAME_DIR .. "src/mame/audio/exidy440.cpp",
+	MAME_DIR .. "src/mame/audio/exidy440.h",
+	MAME_DIR .. "src/mame/drivers/starfire.cpp",
+	MAME_DIR .. "src/mame/audio/nl_fireone.h",
+	MAME_DIR .. "src/mame/audio/nl_fireone.cpp",
+	MAME_DIR .. "src/mame/audio/nl_starfire.h",
+	MAME_DIR .. "src/mame/audio/nl_starfire.cpp",
+	MAME_DIR .. "src/mame/includes/starfire.h",
+	MAME_DIR .. "src/mame/video/starfire.cpp",
+	MAME_DIR .. "src/mame/drivers/vertigo.cpp",
+	MAME_DIR .. "src/mame/includes/vertigo.h",
+	MAME_DIR .. "src/mame/machine/vertigo.cpp",
+	MAME_DIR .. "src/mame/video/vertigo.cpp",
+	MAME_DIR .. "src/mame/drivers/victory.cpp",
+	MAME_DIR .. "src/mame/includes/victory.h",
+	MAME_DIR .. "src/mame/video/victory.cpp",
+	MAME_DIR .. "src/mame/audio/targ.cpp",
+	MAME_DIR .. "src/mame/drivers/astrocde.cpp",
+	MAME_DIR .. "src/mame/includes/astrocde.h",
+	MAME_DIR .. "src/mame/video/astrocde.cpp",
+	MAME_DIR .. "src/mame/drivers/gridlee.cpp",
+	MAME_DIR .. "src/mame/includes/gridlee.h",
+	MAME_DIR .. "src/mame/audio/gridlee.cpp",
+	MAME_DIR .. "src/mame/video/gridlee.cpp",
+	MAME_DIR .. "src/mame/drivers/williams.cpp",
+	MAME_DIR .. "src/mame/includes/williams.h",
+	MAME_DIR .. "src/mame/machine/williams.cpp",
+	MAME_DIR .. "src/mame/audio/williams.cpp",
+	MAME_DIR .. "src/mame/audio/williams.h",
+	MAME_DIR .. "src/mame/video/williams.cpp",
+	MAME_DIR .. "src/mame/drivers/gaelco.cpp",
+	MAME_DIR .. "src/mame/includes/gaelco.h",
+	MAME_DIR .. "src/mame/video/gaelco.cpp",
+	MAME_DIR .. "src/mame/machine/gaelcrpt.cpp",
+	MAME_DIR .. "src/mame/drivers/wrally.cpp",
+	MAME_DIR .. "src/mame/includes/wrally.h",
+	MAME_DIR .. "src/mame/machine/wrally.cpp",
+	MAME_DIR .. "src/mame/video/wrally.cpp",
+	MAME_DIR .. "src/mame/video/gaelco_wrally_sprites.cpp",
+	MAME_DIR .. "src/mame/video/gaelco_wrally_sprites.h",
+	MAME_DIR .. "src/mame/machine/gaelco_ds5002fp.cpp",
+	MAME_DIR .. "src/mame/machine/gaelco_ds5002fp.h",
+	MAME_DIR .. "src/mame/drivers/looping.cpp",
+	MAME_DIR .. "src/mame/drivers/supertnk.cpp",
+	MAME_DIR .. "src/mame/drivers/kinst.cpp",
+	MAME_DIR .. "src/mame/audio/dcs.cpp",
+	MAME_DIR .. "src/mame/audio/dcs.h",
+	MAME_DIR .. "src/mame/drivers/akkaarrh.cpp",
+}
+end
+
+function linkProjects_mame_ci(_target, _subtarget)
+	links {
+		"mame_ci",
+	}
+end
diff -Nru mame-0.222+dfsg.1/scripts/target/mame/mess.lua mame-0.224+dfsg.1/scripts/target/mame/mess.lua
--- mame-0.222+dfsg.1/scripts/target/mame/mess.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/target/mame/mess.lua	2020-08-26 08:57:19.000000000 +0000
@@ -71,6 +71,7 @@
 CPUS["E1"] = true
 CPUS["I860"] = true
 CPUS["I960"] = true
+CPUS["H16"] = true
 CPUS["H8"] = true
 CPUS["H8500"] = true
 CPUS["V810"] = true
@@ -307,6 +308,7 @@
 SOUNDS["SWP30"] = true
 SOUNDS["S_DSP"] = true
 SOUNDS["ROLANDPCM"] = true
+SOUNDS["RP2C33_SOUND"] = true
 
 --------------------------------------------------
 -- specify available video cores
@@ -347,6 +349,7 @@
 VIDEOS["HD61830"] = true
 --VIDEOS["HD63484"] = true
 VIDEOS["HD66421"] = true
+VIDEOS["HLCD0438"] = true
 VIDEOS["HLCD0488"] = true
 VIDEOS["HLCD0515"] = true
 VIDEOS["HLCD0538"] = true
@@ -473,6 +476,7 @@
 MACHINES["CHESSMACHINE"] = true
 MACHINES["CMOS40105"] = true
 MACHINES["COM8116"] = true
+MACHINES["COP452"] = true
 MACHINES["CR589"] = true
 MACHINES["CS4031"] = true
 MACHINES["CS8221"] = true
@@ -495,6 +499,7 @@
 MACHINES["EEPROMDEV"] = true
 MACHINES["ER1400"] = true
 MACHINES["ER2055"] = true
+MACHINES["EXORTERM"] = true
 MACHINES["F3853"] = true
 MACHINES["HD63450"] = true
 MACHINES["HD64610"] = true
@@ -520,6 +525,7 @@
 MACHINES["I8279"] = true
 MACHINES["I8291A"] = true
 MACHINES["I8355"] = true
+--MACHINES["IBM21S850"] = true
 MACHINES["ICM7170"] = true
 MACHINES["IDECTRL"] = true
 MACHINES["IE15"] = true
@@ -547,6 +553,7 @@
 MACHINES["M3002"] = true
 MACHINES["M68307"] = true
 MACHINES["M68340"] = true
+MACHINES["M68SFDC"] = true
 MACHINES["M6M80011AP"] = true
 MACHINES["MB14241"] = true
 MACHINES["MB3773"] = true
@@ -634,6 +641,7 @@
 MACHINES["S3520CF"] = true
 MACHINES["S3C24XX"] = true
 MACHINES["S3C44B0"] = true
+MACHINES["SA1110"] = true
 MACHINES["SAA1043"] = true
 MACHINES["SATURN"] = true
 MACHINES["SCC68070"] = true
@@ -669,6 +677,7 @@
 MACHINES["TPI6525"] = true
 MACHINES["TTL7400"] = true
 MACHINES["TTL7404"] = true
+--MACHINES["TSB12LV01A"] = true
 MACHINES["TTL74123"] = true
 MACHINES["TTL74145"] = true
 MACHINES["TTL74148"] = true
@@ -851,9 +860,11 @@
 BUSES["JAKKS_GAMEKEY"] = true
 BUSES["HP80_IO"] = true
 BUSES["HP9845_IO"] = true
+BUSES["HP_IPC_IO"] = true
 BUSES["KC"] = true
 BUSES["LPCI"] = true
 BUSES["M5"] = true
+BUSES["MACKBD"] = true
 BUSES["MACPDS"] = true
 BUSES["MIDI"] = true
 BUSES["MEGADRIVE"] = true
@@ -885,6 +896,9 @@
 BUSES["QBUS"] = true
 BUSES["RS232"] = true
 BUSES["S100"] = true
+BUSES["SAMCOUPE_DRIVE_PORT"] = true
+BUSES["SAMCOUPE_EXPANSION"] = true
+BUSES["SAMCOUPE_MOUSE_PORT"] = true
 BUSES["SAT_CTRL"] = true
 BUSES["SATURN"] = true
 BUSES["SBUS"] = true
@@ -983,7 +997,6 @@
 FORMATS["COUPEDSK"] = true
 FORMATS["CPIS_DSK"] = true
 FORMATS["CSW_CAS"] = true
-FORMATS["D40_DSK"] = true
 FORMATS["D64_DSK"] = true
 FORMATS["D71_DSK"] = true
 FORMATS["D80_DSK"] = true
@@ -1002,6 +1015,7 @@
 FORMATS["EXCALI64_DSK"] = true
 FORMATS["FC100_CAS"] = true
 FORMATS["FDD_DSK"] = true
+FORMATS["FL1_DSK"] = true
 FORMATS["FLEX_DSK"] = true
 FORMATS["FM7_CAS"] = true
 FORMATS["FMSX_CAS"] = true
@@ -1032,6 +1046,7 @@
 FORMATS["M20_DSK"] = true
 FORMATS["M5_DSK"] = true
 FORMATS["MBEE_CAS"] = true
+FORMATS["MDOS_DSK"] = true
 FORMATS["MFM_HD"] = true
 FORMATS["MM_DSK"] = true
 FORMATS["MS0515_DSK"] = true
@@ -1063,6 +1078,7 @@
 FORMATS["RK_CAS"] = true
 FORMATS["RX50_DSK"] = true
 FORMATS["SC3000_BIT"] = true
+FORMATS["SDD_DSK"] = true
 FORMATS["SF7000_DSK"] = true
 FORMATS["SMX_DSK"] = true
 FORMATS["SOL_CAS"] = true
@@ -1073,6 +1089,7 @@
 FORMATS["ST_DSK"] = true
 FORMATS["SVI_CAS"] = true
 FORMATS["SVI_DSK"] = true
+FORMATS["SWD_DSK"] = true
 FORMATS["TANDY2K_DSK"] = true
 FORMATS["THOM_CAS"] = true
 FORMATS["THOM_DSK"] = true
@@ -1182,6 +1199,7 @@
 		"epson",
 		"ericsson",
 		"exidy",
+		"exorterm",
 		"fairch",
 		"fairlight",
 		"fidelity",
@@ -1253,8 +1271,6 @@
 		"ne",
 		"nec",
 		"netronic",
-		"news_68k",
-		"news_r3k",
 		"next",
 		"nintendo",
 		"nokia",
@@ -1305,6 +1321,7 @@
 		"slicer",
 		"snk",
 		"sony",
+		"sony_news",
 		"sord",
 		"special",
 		"stm",
@@ -1735,8 +1752,6 @@
 	MAME_DIR .. "src/mame/machine/macadb.h",
 	MAME_DIR .. "src/mame/machine/macrtc.cpp",
 	MAME_DIR .. "src/mame/machine/macrtc.h",
-	MAME_DIR .. "src/mame/machine/mackbd.cpp",
-	MAME_DIR .. "src/mame/machine/mackbd.h",
 	MAME_DIR .. "src/mame/machine/swim.cpp",
 	MAME_DIR .. "src/mame/machine/swim.h",
 	MAME_DIR .. "src/mame/video/mac.cpp",
@@ -1876,7 +1891,6 @@
 	MAME_DIR .. "src/mame/drivers/b2m.cpp",
 	MAME_DIR .. "src/mame/includes/b2m.h",
 	MAME_DIR .. "src/mame/machine/b2m.cpp",
-	MAME_DIR .. "src/mame/video/b2m.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "bondwell")
@@ -1966,7 +1980,6 @@
 	MAME_DIR .. "src/mame/drivers/mikro80.cpp",
 	MAME_DIR .. "src/mame/includes/mikro80.h",
 	MAME_DIR .. "src/mame/machine/mikro80.cpp",
-	MAME_DIR .. "src/mame/video/mikro80.cpp",
 	MAME_DIR .. "src/mame/drivers/okean240.cpp",
 	MAME_DIR .. "src/mame/drivers/pk8000.cpp",
 	MAME_DIR .. "src/mame/includes/pk8000.h",
@@ -1984,7 +1997,6 @@
 	MAME_DIR .. "src/mame/drivers/ut88.cpp",
 	MAME_DIR .. "src/mame/includes/ut88.h",
 	MAME_DIR .. "src/mame/machine/ut88.cpp",
-	MAME_DIR .. "src/mame/video/ut88.cpp",
 	MAME_DIR .. "src/mame/drivers/vector06.cpp",
 	MAME_DIR .. "src/mame/includes/vector06.h",
 	MAME_DIR .. "src/mame/machine/vector06.cpp",
@@ -2024,6 +2036,7 @@
 	MAME_DIR .. "src/mame/drivers/cit101.cpp",
 	MAME_DIR .. "src/mame/machine/cit101_kbd.cpp",
 	MAME_DIR .. "src/mame/machine/cit101_kbd.h",
+	MAME_DIR .. "src/mame/drivers/cit101xl.cpp",
 	MAME_DIR .. "src/mame/drivers/cit220.cpp",
 	MAME_DIR .. "src/mame/machine/cit220_kbd.cpp",
 	MAME_DIR .. "src/mame/machine/cit220_kbd.h",
@@ -2118,9 +2131,6 @@
 createMESSProjects(_target, _subtarget, "ddr")
 files {
 	MAME_DIR .. "src/mame/drivers/ac1.cpp",
-	MAME_DIR .. "src/mame/includes/ac1.h",
-	MAME_DIR .. "src/mame/machine/ac1.cpp",
-	MAME_DIR .. "src/mame/video/ac1.cpp",
 	MAME_DIR .. "src/mame/drivers/bcs3.cpp",
 	MAME_DIR .. "src/mame/drivers/c80.cpp",
 	MAME_DIR .. "src/mame/includes/c80.h",
@@ -2222,7 +2232,6 @@
 	MAME_DIR .. "src/mame/drivers/bk.cpp",
 	MAME_DIR .. "src/mame/includes/bk.h",
 	MAME_DIR .. "src/mame/machine/bk.cpp",
-	MAME_DIR .. "src/mame/video/bk.cpp",
 	MAME_DIR .. "src/mame/drivers/dvk_kcgd.cpp",
 	MAME_DIR .. "src/mame/drivers/dvk_ksm.cpp",
 	MAME_DIR .. "src/mame/machine/ms7004.cpp",
@@ -2236,6 +2245,7 @@
 
 createMESSProjects(_target, _subtarget, "elektor")
 files {
+	MAME_DIR .. "src/mame/drivers/avrmax.cpp",
 	MAME_DIR .. "src/mame/drivers/ec65.cpp",
 	MAME_DIR .. "src/mame/drivers/elekscmp.cpp",
 	MAME_DIR .. "src/mame/drivers/junior.cpp",
@@ -2250,6 +2260,7 @@
 files {
 	MAME_DIR .. "src/mame/drivers/emu2.cpp",
 	MAME_DIR .. "src/mame/drivers/emu3.cpp",
+	MAME_DIR .. "src/mame/drivers/emu68k.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "ensoniq")
@@ -2321,6 +2332,11 @@
 	MAME_DIR .. "src/mame/machine/micropolis.h",
 }
 
+createMESSProjects(_target, _subtarget, "exorterm")
+files {
+	MAME_DIR .. "src/mame/drivers/exorterm.cpp",
+}
+
 createMESSProjects(_target, _subtarget, "fairch")
 files {
 	MAME_DIR .. "src/mame/drivers/channelf.cpp",
@@ -2455,6 +2471,7 @@
 
 createMESSProjects(_target, _subtarget, "hegener")
 files {
+	MAME_DIR .. "src/mame/drivers/mephisto_academy.cpp",
 	MAME_DIR .. "src/mame/drivers/mephisto_berlin.cpp",
 	MAME_DIR .. "src/mame/drivers/mephisto_brikett.cpp",
 	MAME_DIR .. "src/mame/drivers/mephisto_glasgow.cpp",
@@ -2485,7 +2502,9 @@
 files {
 	MAME_DIR .. "src/mame/drivers/4004clk.cpp",
 	MAME_DIR .. "src/mame/drivers/68ksbc.cpp",
-	MAME_DIR .. "src/mame/drivers/craft.cpp",
+	MAME_DIR .. "src/mame/drivers/lft_chiptune.cpp",
+	MAME_DIR .. "src/mame/drivers/lft_craft.cpp",
+	MAME_DIR .. "src/mame/drivers/lft_phasor.cpp",
 	MAME_DIR .. "src/mame/drivers/dcebridge.cpp",
 	MAME_DIR .. "src/mame/drivers/homez80.cpp",
 	MAME_DIR .. "src/mame/drivers/p112.cpp",
@@ -2550,7 +2569,6 @@
 	MAME_DIR .. "src/mame/includes/hec2hrp.h",
 	MAME_DIR .. "src/mame/machine/hec2hrp.cpp",
 	MAME_DIR .. "src/mame/video/hec2hrp.cpp",
-	MAME_DIR .. "src/mame/drivers/interact.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "heurikon")
@@ -2664,7 +2682,9 @@
 	MAME_DIR .. "src/mame/drivers/kawai_k1.cpp",
 	MAME_DIR .. "src/mame/drivers/kawai_k4.cpp",
 	MAME_DIR .. "src/mame/drivers/kawai_k5.cpp",
+	MAME_DIR .. "src/mame/drivers/kawai_ksp10.cpp",
 	MAME_DIR .. "src/mame/drivers/kawai_r100.cpp",
+	MAME_DIR .. "src/mame/drivers/kawai_sx240.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "kaypro")
@@ -2694,7 +2714,9 @@
 	MAME_DIR .. "src/mame/drivers/korgdvp1.cpp",
 	MAME_DIR .. "src/mame/drivers/korgdw8k.cpp",
 	MAME_DIR .. "src/mame/drivers/korgm1.cpp",
+	MAME_DIR .. "src/mame/drivers/korgws.cpp",
 	MAME_DIR .. "src/mame/drivers/korgz3.cpp",
+	MAME_DIR .. "src/mame/drivers/microkorg.cpp",
 	MAME_DIR .. "src/mame/drivers/poly800.cpp",
 	MAME_DIR .. "src/mame/drivers/polysix.cpp",
 }
@@ -2812,7 +2834,6 @@
 	MAME_DIR .. "src/mame/drivers/primo.cpp",
 	MAME_DIR .. "src/mame/includes/primo.h",
 	MAME_DIR .. "src/mame/machine/primo.cpp",
-	MAME_DIR .. "src/mame/video/primo.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "microsoft")
@@ -2881,6 +2902,7 @@
 
 createMESSProjects(_target, _subtarget, "motorola")
 files {
+	MAME_DIR .. "src/mame/drivers/exorciser.cpp",
 	MAME_DIR .. "src/mame/drivers/m6805evs.cpp",
 	MAME_DIR .. "src/mame/drivers/m68705prg.cpp",
 	MAME_DIR .. "src/mame/drivers/mekd1.cpp",
@@ -2981,24 +3003,6 @@
 	MAME_DIR .. "src/mame/includes/exp85.h",
 }
 
-createMESSProjects(_target, _subtarget, "news_68k")
-files {
-	MAME_DIR .. "src/mame/drivers/news_68k.cpp",
-	MAME_DIR .. "src/mame/machine/dmac_0266.cpp",
-	MAME_DIR .. "src/mame/machine/dmac_0266.h",
-	MAME_DIR .. "src/mame/machine/news_hid.cpp",
-	MAME_DIR .. "src/mame/machine/news_hid.h",
-}
-
-createMESSProjects(_target, _subtarget, "news_r3k")
-files {
-	MAME_DIR .. "src/mame/drivers/news_r3k.cpp",
-	MAME_DIR .. "src/mame/machine/dmac_0448.cpp",
-	MAME_DIR .. "src/mame/machine/dmac_0448.h",
-	MAME_DIR .. "src/mame/machine/news_hid.cpp",
-	MAME_DIR .. "src/mame/machine/news_hid.h",
-}
-
 createMESSProjects(_target, _subtarget, "next")
 files {
 	MAME_DIR .. "src/mame/drivers/next.cpp",
@@ -3081,6 +3085,7 @@
 	MAME_DIR .. "src/mame/drivers/novag_cforte.cpp",
 	MAME_DIR .. "src/mame/drivers/novag_const.cpp",
 	MAME_DIR .. "src/mame/drivers/novag_diablo.cpp",
+	MAME_DIR .. "src/mame/drivers/novag_micro.cpp",
 	MAME_DIR .. "src/mame/drivers/novag_micro2.cpp",
 	MAME_DIR .. "src/mame/drivers/novag_savant.cpp",
 	MAME_DIR .. "src/mame/drivers/novag_sexpert.cpp",
@@ -3200,12 +3205,7 @@
 createMESSProjects(_target, _subtarget, "pel")
 files {
 	MAME_DIR .. "src/mame/drivers/galeb.cpp",
-	MAME_DIR .. "src/mame/includes/galeb.h",
-	MAME_DIR .. "src/mame/video/galeb.cpp",
 	MAME_DIR .. "src/mame/drivers/orao.cpp",
-	MAME_DIR .. "src/mame/includes/orao.h",
-	MAME_DIR .. "src/mame/machine/orao.cpp",
-	MAME_DIR .. "src/mame/video/orao.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "philips")
@@ -3375,10 +3375,12 @@
 
 createMESSProjects(_target, _subtarget, "saitek")
 files {
+	MAME_DIR .. "src/mame/drivers/saitek_ccompan.cpp",
 	MAME_DIR .. "src/mame/drivers/saitek_chesstrv.cpp",
 	MAME_DIR .. "src/mame/drivers/saitek_cp2000.cpp",
 	MAME_DIR .. "src/mame/drivers/saitek_delta1.cpp",
 	MAME_DIR .. "src/mame/drivers/saitek_exchess.cpp",
+	MAME_DIR .. "src/mame/drivers/saitek_intchess.cpp",
 	MAME_DIR .. "src/mame/drivers/saitek_leonardo.cpp",
 	MAME_DIR .. "src/mame/drivers/saitek_mark5.cpp",
 	MAME_DIR .. "src/mame/drivers/saitek_minichess.cpp",
@@ -3397,9 +3399,6 @@
 createMESSProjects(_target, _subtarget, "samcoupe")
 files {
 	MAME_DIR .. "src/mame/drivers/samcoupe.cpp",
-	MAME_DIR .. "src/mame/includes/samcoupe.h",
-	MAME_DIR .. "src/mame/machine/samcoupe.cpp",
-	MAME_DIR .. "src/mame/video/samcoupe.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "samsung")
@@ -3627,6 +3626,19 @@
 	MAME_DIR .. "src/mame/drivers/ps2sony.cpp",
 }
 
+createMESSProjects(_target, _subtarget, "sony_news")
+files {
+	MAME_DIR .. "src/mame/drivers/news_68k.cpp",
+	MAME_DIR .. "src/mame/drivers/news_r3k.cpp",
+	MAME_DIR .. "src/mame/drivers/news_38xx.cpp",
+	MAME_DIR .. "src/mame/machine/dmac_0448.cpp",
+	MAME_DIR .. "src/mame/machine/dmac_0448.h",
+	MAME_DIR .. "src/mame/machine/dmac_0266.cpp",
+	MAME_DIR .. "src/mame/machine/dmac_0266.h",
+	MAME_DIR .. "src/mame/machine/news_hid.cpp",
+	MAME_DIR .. "src/mame/machine/news_hid.h",
+}
+
 createMESSProjects(_target, _subtarget, "sord")
 files {
 	MAME_DIR .. "src/mame/drivers/m5.cpp",
@@ -3779,7 +3791,6 @@
 	MAME_DIR .. "src/mame/drivers/ondra.cpp",
 	MAME_DIR .. "src/mame/includes/ondra.h",
 	MAME_DIR .. "src/mame/machine/ondra.cpp",
-	MAME_DIR .. "src/mame/video/ondra.cpp",
 	MAME_DIR .. "src/mame/drivers/pmd85.cpp",
 	MAME_DIR .. "src/mame/includes/pmd85.h",
 	MAME_DIR .. "src/mame/machine/pmd85.cpp",
@@ -3993,11 +4004,16 @@
 	MAME_DIR .. "src/mame/machine/generalplus_gpl16250.cpp",
 	MAME_DIR .. "src/mame/machine/generalplus_gpl16250.h",
 	MAME_DIR .. "src/mame/drivers/generalplus_gpl32612.cpp",
+	MAME_DIR .. "src/mame/drivers/generalplus_gpl_unknown.cpp",
 	MAME_DIR .. "src/mame/drivers/xavix.cpp",
+	MAME_DIR .. "src/mame/includes/xavix.h",
+	MAME_DIR .. "src/mame/drivers/xavix_2000.cpp",
+	MAME_DIR .. "src/mame/includes/xavix_2000.h",
+	MAME_DIR .. "src/mame/drivers/xavix_2002.cpp",
+	MAME_DIR .. "src/mame/includes/xavix_2002.h",
 	MAME_DIR .. "src/mame/video/xavix.cpp",
 	MAME_DIR .. "src/mame/machine/xavix.cpp",
 	MAME_DIR .. "src/mame/audio/xavix.cpp",
-	MAME_DIR .. "src/mame/includes/xavix.h",
 	MAME_DIR .. "src/mame/machine/xavix_mtrk_wheel.cpp",
 	MAME_DIR .. "src/mame/machine/xavix_mtrk_wheel.h",
 	MAME_DIR .. "src/mame/machine/xavix_madfb_ball.cpp",
@@ -4014,11 +4030,11 @@
 	MAME_DIR .. "src/mame/machine/xavix2002_io.h",
 	MAME_DIR .. "src/mame/drivers/xavix2.cpp",
 	MAME_DIR .. "src/mame/drivers/titan_soc.cpp",
-	MAME_DIR .. "src/mame/drivers/unkmandd.cpp",
-	MAME_DIR .. "src/mame/drivers/bbl380.cpp",
+	MAME_DIR .. "src/mame/drivers/unk6502_st2xxx.cpp",
 	MAME_DIR .. "src/mame/drivers/actions_atj2279b.cpp",
 	MAME_DIR .. "src/mame/drivers/pubint_storyreader.cpp",
 	MAME_DIR .. "src/mame/drivers/magiceyes_pollux_vr3520f.cpp",
+	MAME_DIR .. "src/mame/drivers/monkey_king_3b.cpp",
 }
 
 createMESSProjects(_target, _subtarget, "ultimachine")
@@ -4367,6 +4383,7 @@
 	MAME_DIR .. "src/mame/drivers/krokha.cpp",
 	MAME_DIR .. "src/mame/drivers/kron.cpp",
 	MAME_DIR .. "src/mame/drivers/lee1214.cpp",
+	MAME_DIR .. "src/mame/drivers/lee1220.cpp",
 	MAME_DIR .. "src/mame/drivers/learnwin.cpp",
 	MAME_DIR .. "src/mame/drivers/lft.cpp",
 	MAME_DIR .. "src/mame/drivers/lg-dvd.cpp",
diff -Nru mame-0.222+dfsg.1/scripts/target/mame/nl.lua mame-0.224+dfsg.1/scripts/target/mame/nl.lua
--- mame-0.222+dfsg.1/scripts/target/mame/nl.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/target/mame/nl.lua	2020-08-26 08:57:19.000000000 +0000
@@ -31,6 +31,7 @@
 --CPUS["TMS9900"] = true
 --CPUS["COP400"] = true
 CPUS["F8"] = true
+CPUS["CCPU"] = true
 
 --------------------------------------------------
 -- Specify all the sound cores necessary for the
@@ -57,6 +58,9 @@
 SOUNDS["SPEAKER"] = true
 SOUNDS["DIGITALKER"] = true
 SOUNDS["SN76477"] = true
+SOUNDS["SN76496"] = true
+SOUNDS["SP0250"] = true
+SOUNDS["TMS36XX"] = true
 
 --------------------------------------------------
 -- specify available video cores
@@ -72,18 +76,23 @@
 MACHINES["INPUT_MERGER"] = true
 MACHINES["NETLIST"] = true
 MACHINES["Z80DMA"] = true
+MACHINES["Z80CTC"] = true
 MACHINES["Z80DAISY"] = true
 MACHINES["GEN_LATCH"] = true
 MACHINES["AY31015"] = true
 MACHINES["KB3600"] = true
 MACHINES["COM8116"] = true
 
+MACHINES["TTL7474"] = true
 MACHINES["TTL74145"] = true
+MACHINES["TTL74148"] = true
+MACHINES["TTL74153"] = true
 MACHINES["TTL74259"] = true
 MACHINES["6522VIA"] = true
 
 MACHINES["6821PIA"] = true
 MACHINES["I8255"] = true
+MACHINES["I8243"] = true
 MACHINES["WATCHDOG"] = true
 MACHINES["EEPROMDEV"] = true
 MACHINES["UPD4701"] = true
@@ -92,7 +101,7 @@
 --MACHINES["TTL74153"] = true
 --MACHINES["TTL7474"] = true
 --MACHINES["RIOT6532"] = true
---MACHINES["PIT8253"] = true
+MACHINES["PIT8253"] = true
 --MACHINES["Z80CTC"] = true
 --MACHINES["68681"] = true
 --MACHINES["BANKDEV"] = true
@@ -151,6 +160,16 @@
 	MAME_DIR .. "src/mame/machine/nl_stuntcyc.h",
 	MAME_DIR .. "src/mame/machine/nl_gtrak10.cpp",
 	MAME_DIR .. "src/mame/machine/nl_gtrak10.h",
+	MAME_DIR .. "src/mame/machine/nl_tank.cpp",
+	MAME_DIR .. "src/mame/machine/nl_tank.h",
+
+	MAME_DIR .. "src/mame/audio/nl_flyball.cpp",
+	MAME_DIR .. "src/mame/audio/nl_flyball.h",
+	MAME_DIR .. "src/mame/drivers/flyball.cpp",
+
+	MAME_DIR .. "src/mame/audio/nl_destroyr.cpp",
+	MAME_DIR .. "src/mame/audio/nl_destroyr.h",
+	MAME_DIR .. "src/mame/drivers/destroyr.cpp",
 
 	MAME_DIR .. "src/mame/drivers/hazeltin.cpp",
 
@@ -185,17 +204,25 @@
 	MAME_DIR .. "src/mame/audio/nl_kidniki.cpp",
 	MAME_DIR .. "src/mame/audio/nl_kidniki.h",
 
-  MAME_DIR .. "src/mame/machine/mw8080bw.cpp",
-  MAME_DIR .. "src/mame/drivers/mw8080bw.cpp",
-  MAME_DIR .. "src/mame/includes/mw8080bw.h",
-  MAME_DIR .. "src/mame/audio/mw8080bw.h",
-  MAME_DIR .. "src/mame/audio/mw8080bw.cpp",
-  MAME_DIR .. "src/mame/video/mw8080bw.cpp",
+	MAME_DIR .. "src/mame/machine/mw8080bw.cpp",
+	MAME_DIR .. "src/mame/drivers/mw8080bw.cpp",
+	MAME_DIR .. "src/mame/includes/mw8080bw.h",
+	MAME_DIR .. "src/mame/audio/mw8080bw.h",
+	MAME_DIR .. "src/mame/audio/mw8080bw.cpp",
+	MAME_DIR .. "src/mame/video/mw8080bw.cpp",
+
 	MAME_DIR .. "src/mame/audio/nl_gunfight.cpp",
 	MAME_DIR .. "src/mame/audio/nl_gunfight.h",
 	MAME_DIR .. "src/mame/audio/nl_280zzzap.cpp",
 	MAME_DIR .. "src/mame/audio/nl_280zzzap.h",
 
+	MAME_DIR .. "src/mame/drivers/sspeedr.cpp",
+	MAME_DIR .. "src/mame/includes/sspeedr.h",
+	MAME_DIR .. "src/mame/video/sspeedr.cpp",
+
+	MAME_DIR .. "src/mame/audio/nl_sspeedr.cpp",
+	MAME_DIR .. "src/mame/audio/nl_sspeedr.h",
+
 	MAME_DIR .. "src/mame/audio/cheekyms.cpp",
 	MAME_DIR .. "src/mame/audio/cheekyms.h",
 	MAME_DIR .. "src/mame/audio/nl_cheekyms.cpp",
@@ -204,6 +231,37 @@
 	MAME_DIR .. "src/mame/includes/cheekyms.h",
 	MAME_DIR .. "src/mame/video/cheekyms.cpp",
 
+	MAME_DIR .. "src/mame/drivers/cinemat.cpp",
+	MAME_DIR .. "src/mame/includes/cinemat.h",
+	MAME_DIR .. "src/mame/audio/cinemat.cpp",
+	MAME_DIR .. "src/mame/audio/cinemat.h",
+	MAME_DIR .. "src/mame/video/cinemat.cpp",
+	MAME_DIR .. "src/mame/audio/nl_armora.cpp",
+	MAME_DIR .. "src/mame/audio/nl_armora.h",
+	MAME_DIR .. "src/mame/audio/nl_barrier.cpp",
+	MAME_DIR .. "src/mame/audio/nl_barrier.h",
+	MAME_DIR .. "src/mame/audio/nl_boxingb.cpp",
+	MAME_DIR .. "src/mame/audio/nl_boxingb.h",
+	MAME_DIR .. "src/mame/audio/nl_cinemat_common.h",
+	MAME_DIR .. "src/mame/audio/nl_ripoff.cpp",
+	MAME_DIR .. "src/mame/audio/nl_ripoff.h",
+	MAME_DIR .. "src/mame/audio/nl_solarq.cpp",
+	MAME_DIR .. "src/mame/audio/nl_solarq.h",
+	MAME_DIR .. "src/mame/audio/nl_spacewar.cpp",
+	MAME_DIR .. "src/mame/audio/nl_spacewar.h",
+	MAME_DIR .. "src/mame/audio/nl_speedfrk.cpp",
+	MAME_DIR .. "src/mame/audio/nl_speedfrk.h",
+	MAME_DIR .. "src/mame/audio/nl_starcas.cpp",
+	MAME_DIR .. "src/mame/audio/nl_starcas.h",
+	MAME_DIR .. "src/mame/audio/nl_starhawk.cpp",
+	MAME_DIR .. "src/mame/audio/nl_starhawk.h",
+	MAME_DIR .. "src/mame/audio/nl_sundance.cpp",
+	MAME_DIR .. "src/mame/audio/nl_sundance.h",
+	MAME_DIR .. "src/mame/audio/nl_tailg.cpp",
+	MAME_DIR .. "src/mame/audio/nl_tailg.h",
+	MAME_DIR .. "src/mame/audio/nl_warrior.cpp",
+	MAME_DIR .. "src/mame/audio/nl_warrior.h",
+
 	MAME_DIR .. "src/mame/drivers/galaxian.cpp",
 	MAME_DIR .. "src/mame/includes/galaxian.h",
 	MAME_DIR .. "src/mame/audio/galaxian.cpp",
@@ -231,11 +289,44 @@
 	MAME_DIR .. "src/mame/machine/nl_palestra.cpp",
 	MAME_DIR .. "src/mame/machine/nl_palestra.h",
 
+	MAME_DIR .. "src/mame/machine/segacrpt_device.cpp",
+	MAME_DIR .. "src/mame/machine/segacrpt_device.h",
+	MAME_DIR .. "src/mame/drivers/segag80r.cpp",
+	MAME_DIR .. "src/mame/includes/segag80r.h",
+	MAME_DIR .. "src/mame/machine/segag80.cpp",
+	MAME_DIR .. "src/mame/machine/segag80.h",
+	MAME_DIR .. "src/mame/audio/segag80r.cpp",
+	MAME_DIR .. "src/mame/audio/segag80r.h",
+	MAME_DIR .. "src/mame/video/segag80r.cpp",
+	MAME_DIR .. "src/mame/drivers/segag80v.cpp",
+	MAME_DIR .. "src/mame/includes/segag80v.h",
+	MAME_DIR .. "src/mame/audio/segag80.cpp",
+	MAME_DIR .. "src/mame/audio/segag80.h",
+	MAME_DIR .. "src/mame/audio/segaspeech.cpp",
+	MAME_DIR .. "src/mame/audio/segaspeech.h",
+	MAME_DIR .. "src/mame/audio/segausb.cpp",
+	MAME_DIR .. "src/mame/audio/segausb.h",
+	MAME_DIR .. "src/mame/audio/nl_astrob.cpp",
+	MAME_DIR .. "src/mame/audio/nl_astrob.h",
+	MAME_DIR .. "src/mame/audio/nl_elim.cpp",
+	MAME_DIR .. "src/mame/audio/nl_elim.h",
+	MAME_DIR .. "src/mame/audio/nl_spacfury.cpp",
+	MAME_DIR .. "src/mame/audio/nl_spacfury.h",
+	MAME_DIR .. "src/mame/video/segag80v.cpp",
+	MAME_DIR .. "src/mame/drivers/zaxxon.cpp",
+	MAME_DIR .. "src/mame/includes/zaxxon.h",
+	MAME_DIR .. "src/mame/audio/zaxxon.cpp",
+	MAME_DIR .. "src/mame/video/zaxxon.cpp",
+
 	MAME_DIR .. "src/mame/drivers/segas16b.cpp",
 	MAME_DIR .. "src/mame/includes/segas16b.h",
 	MAME_DIR .. "src/mame/video/segas16b.cpp",
 	MAME_DIR .. "src/mame/audio/nl_segas16b.cpp",
 	MAME_DIR .. "src/mame/audio/nl_segas16b.h",
+	MAME_DIR .. "src/mame/audio/nl_segausb.cpp",
+	MAME_DIR .. "src/mame/audio/nl_segausb.h",
+	MAME_DIR .. "src/mame/audio/nl_segaspeech.cpp",
+	MAME_DIR .. "src/mame/audio/nl_segaspeech.h",
 	MAME_DIR .. "src/mame/machine/315_5195.cpp",
 	MAME_DIR .. "src/mame/machine/315_5195.h",
 	MAME_DIR .. "src/mame/machine/fd1089.cpp",
@@ -259,6 +350,33 @@
 	MAME_DIR .. "src/mame/machine/nl_tp1985.cpp",
 	MAME_DIR .. "src/mame/machine/nl_tp1985.h",
 
+	MAME_DIR .. "src/mame/audio/nl_starcrus.h",
+	MAME_DIR .. "src/mame/audio/nl_starcrus.cpp",
+	MAME_DIR .. "src/mame/drivers/starcrus.cpp",
+	MAME_DIR .. "src/mame/includes/starcrus.h",
+	MAME_DIR .. "src/mame/video/starcrus.cpp",
+
+	MAME_DIR .. "src/mame/audio/nl_carpolo.h",
+	MAME_DIR .. "src/mame/audio/nl_carpolo.cpp",
+	MAME_DIR .. "src/mame/drivers/carpolo.cpp",
+	MAME_DIR .. "src/mame/includes/carpolo.h",
+	MAME_DIR .. "src/mame/machine/carpolo.cpp",
+	MAME_DIR .. "src/mame/video/carpolo.cpp",
+
+	MAME_DIR .. "src/mame/audio/nl_fireone.h",
+	MAME_DIR .. "src/mame/audio/nl_fireone.cpp",
+	MAME_DIR .. "src/mame/audio/nl_starfire.h",
+	MAME_DIR .. "src/mame/audio/nl_starfire.cpp",
+	MAME_DIR .. "src/mame/drivers/starfire.cpp",
+	MAME_DIR .. "src/mame/includes/starfire.h",
+	MAME_DIR .. "src/mame/video/starfire.cpp",
+
+	MAME_DIR .. "src/mame/audio/nl_starcrus.cpp",
+	MAME_DIR .. "src/mame/audio/nl_starcrus.h",
+	MAME_DIR .. "src/mame/drivers/starcrus.cpp",
+	MAME_DIR .. "src/mame/includes/starcrus.h",
+	MAME_DIR .. "src/mame/video/starcrus.cpp",
+
 	-- Skeletons ...
 	MAME_DIR .. "src/mame/drivers/a1supply.cpp",
 	MAME_DIR .. "src/mame/drivers/aleisttl.cpp",
diff -Nru mame-0.222+dfsg.1/scripts/target/mame/tiny.lua mame-0.224+dfsg.1/scripts/target/mame/tiny.lua
--- mame-0.222+dfsg.1/scripts/target/mame/tiny.lua	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/scripts/target/mame/tiny.lua	2020-08-26 08:57:19.000000000 +0000
@@ -73,6 +73,7 @@
 MACHINES["TICKET"] = true
 MACHINES["WATCHDOG"] = true
 MACHINES["Z80DAISY"] = true
+MACHINES["NETLIST"] = true
 
 
 --------------------------------------------------
@@ -107,6 +108,8 @@
 	}
 
 files{
+	MAME_DIR .. "src/mame/audio/nl_carpolo.h",
+	MAME_DIR .. "src/mame/audio/nl_carpolo.cpp",
 	MAME_DIR .. "src/mame/drivers/carpolo.cpp",
 	MAME_DIR .. "src/mame/includes/carpolo.h",
 	MAME_DIR .. "src/mame/machine/carpolo.cpp",
@@ -122,6 +125,10 @@
 	MAME_DIR .. "src/mame/video/exidy.cpp",
 	MAME_DIR .. "src/mame/audio/exidy440.cpp",
 	MAME_DIR .. "src/mame/audio/exidy440.h",
+	MAME_DIR .. "src/mame/audio/nl_fireone.h",
+	MAME_DIR .. "src/mame/audio/nl_fireone.cpp",
+	MAME_DIR .. "src/mame/audio/nl_starfire.h",
+	MAME_DIR .. "src/mame/audio/nl_starfire.cpp",
 	MAME_DIR .. "src/mame/drivers/starfire.cpp",
 	MAME_DIR .. "src/mame/includes/starfire.h",
 	MAME_DIR .. "src/mame/video/starfire.cpp",
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a1bus/a1cassette.cpp mame-0.224+dfsg.1/src/devices/bus/a1bus/a1cassette.cpp
--- mame-0.222+dfsg.1/src/devices/bus/a1bus/a1cassette.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a1bus/a1cassette.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,6 +10,7 @@
 
 #include "emu.h"
 #include "a1cassette.h"
+#include "speaker.h"
 
 /***************************************************************************
     PARAMETERS
@@ -38,9 +39,11 @@
 
 void a1bus_cassette_device::device_add_mconfig(machine_config &config)
 {
+	SPEAKER(config, "mono").front_center();
 	CASSETTE(config, m_cassette);
 	m_cassette->set_default_state(CASSETTE_STOPPED);
 	m_cassette->set_interface("apple1_cass");
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.08);
 }
 
 const tiny_rom_entry *a1bus_cassette_device::device_rom_region() const
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a2bus/a2diskii.h mame-0.224+dfsg.1/src/devices/bus/a2bus/a2diskii.h
--- mame-0.222+dfsg.1/src/devices/bus/a2bus/a2diskii.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a2bus/a2diskii.h	2020-08-26 08:57:19.000000000 +0000
@@ -55,6 +55,7 @@
 public:
 	a2bus_agat7flop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
@@ -63,6 +64,7 @@
 public:
 	a2bus_agat9flop_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a2bus/a2diskiing.h mame-0.224+dfsg.1/src/devices/bus/a2bus/a2diskiing.h
--- mame-0.222+dfsg.1/src/devices/bus/a2bus/a2diskiing.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a2bus/a2diskiing.h	2020-08-26 08:57:19.000000000 +0000
@@ -27,11 +27,10 @@
 	public device_t,
 	public device_a2bus_card_interface
 {
-public:
+protected:
 	// construction/destruction
 	diskiing_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 
-protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 	virtual void device_add_mconfig(machine_config &config) override;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a2bus/a2iwm.cpp mame-0.224+dfsg.1/src/devices/bus/a2bus/a2iwm.cpp
--- mame-0.222+dfsg.1/src/devices/bus/a2bus/a2iwm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a2bus/a2iwm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,10 +12,12 @@
 *********************************************************************/
 
 #include "emu.h"
-#include "formats/ap2_dsk.h"
-#include "machine/applefdintf.h"
 #include "a2iwm.h"
 
+#include "machine/applefdintf.h"
+#include "formats/ap2_dsk.h"
+
+
 //**************************************************************************
 //  GLOBAL VARIABLES
 //**************************************************************************
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a2bus/a2iwm.h mame-0.224+dfsg.1/src/devices/bus/a2bus/a2iwm.h
--- mame-0.222+dfsg.1/src/devices/bus/a2bus/a2iwm.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a2bus/a2iwm.h	2020-08-26 08:57:19.000000000 +0000
@@ -27,11 +27,10 @@
 	public device_t,
 	public device_a2bus_card_interface
 {
-public:
+protected:
 	// construction/destruction
 	a2bus_iwm_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 
-protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 	virtual void device_add_mconfig(machine_config &config) override;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a2bus/a2scsi.cpp mame-0.224+dfsg.1/src/devices/bus/a2bus/a2scsi.cpp
--- mame-0.222+dfsg.1/src/devices/bus/a2bus/a2scsi.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a2bus/a2scsi.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -94,7 +94,7 @@
 	device_t(mconfig, type, tag, owner, clock),
 	device_a2bus_card_interface(mconfig, *this),
 	m_ncr5380(*this, SCSI_5380_TAG),
-	m_scsibus(*this, SCSI_BUS_TAG), m_rom(nullptr), m_rambank(0), m_rombank(0), m_drq(0), m_bank(0), m_816block(false)
+	m_scsibus(*this, SCSI_BUS_TAG), m_rom(*this, SCSI_ROM_REGION), m_rambank(0), m_rombank(0), m_drq(0), m_bank(0), m_816block(false)
 {
 }
 
@@ -109,8 +109,6 @@
 
 void a2bus_scsi_device::device_start()
 {
-	m_rom = device().machine().root_device().memregion(this->subtag(SCSI_ROM_REGION).c_str())->base();
-
 	memset(m_ram, 0, 8192);
 
 	save_item(NAME(m_ram));
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a2bus/a2scsi.h mame-0.224+dfsg.1/src/devices/bus/a2bus/a2scsi.h
--- mame-0.222+dfsg.1/src/devices/bus/a2bus/a2scsi.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a2bus/a2scsi.h	2020-08-26 08:57:19.000000000 +0000
@@ -48,9 +48,9 @@
 
 	required_device<ncr5380n_device> m_ncr5380;
 	required_device<nscsi_bus_device> m_scsibus;
+	required_region_ptr<u8> m_rom;
 
 private:
-	uint8_t *m_rom;
 	uint8_t m_ram[8192];  // 8 banks of 1024 bytes
 	int m_rambank, m_rombank;
 	uint8_t m_drq;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a2bus/a2themill.cpp mame-0.224+dfsg.1/src/devices/bus/a2bus/a2themill.cpp
--- mame-0.222+dfsg.1/src/devices/bus/a2bus/a2themill.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a2bus/a2themill.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -18,8 +18,6 @@
     ProDOS "Stellation The Mill Disk.po" requires Mill in slot 2; boot
     the disc and type "-DEMO1" and press Enter to launch the simple demo.
 
-    TODO: Add DIP switch to select standard and OS-9 modes.
-
 *********************************************************************/
 
 #include "emu.h"
@@ -43,6 +41,23 @@
 	map(0x0000, 0xffff).rw(FUNC(a2bus_themill_device::dma_r), FUNC(a2bus_themill_device::dma_w));
 }
 
+static INPUT_PORTS_START( themill )
+	PORT_START("MILLCFG")
+	PORT_DIPNAME( 0x01, 0x01, "6809 Mapping" )
+	PORT_DIPSETTING(    0x00, "Original")
+	PORT_DIPSETTING(    0x01, "OS-9")
+INPUT_PORTS_END
+
+//-------------------------------------------------
+//  input_ports - device-specific input ports
+//-------------------------------------------------
+
+ioport_constructor a2bus_themill_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME( themill );
+}
+
+
 /***************************************************************************
     FUNCTION PROTOTYPES
 ***************************************************************************/
@@ -65,6 +80,7 @@
 	: device_t(mconfig, type, tag, owner, clock)
 	, device_a2bus_card_interface(mconfig, *this)
 	, m_6809(*this, "m6809")
+	, m_cfgsw(*this, "MILLCFG")
 	, m_bEnabled(false)
 	, m_flipAddrSpace(false)
 	, m_6809Mode(false)
@@ -93,7 +109,7 @@
 {
 	m_bEnabled = false;
 	m_flipAddrSpace = false;
-	m_6809Mode = true;
+	m_6809Mode = (m_cfgsw->read() & 1) ? true : false;
 	m_status = 0xc0;    // OS9 loader relies on this
 	m_6809->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
 	m_6809->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a2bus/a2themill.h mame-0.224+dfsg.1/src/devices/bus/a2bus/a2themill.h
--- mame-0.222+dfsg.1/src/devices/bus/a2bus/a2themill.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a2bus/a2themill.h	2020-08-26 08:57:19.000000000 +0000
@@ -33,6 +33,7 @@
 	virtual void device_start() override;
 	virtual void device_reset() override;
 	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
 
 	// overrides of standard a2bus slot functions
 	virtual uint8_t read_c0nx(uint8_t offset) override;
@@ -41,6 +42,8 @@
 
 private:
 	required_device<cpu_device> m_6809;
+	required_ioport m_cfgsw;
+
 	bool m_bEnabled;
 	bool m_flipAddrSpace;
 	bool m_6809Mode;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a2bus/cmsscsi.cpp mame-0.224+dfsg.1/src/devices/bus/a2bus/cmsscsi.cpp
--- mame-0.222+dfsg.1/src/devices/bus/a2bus/cmsscsi.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a2bus/cmsscsi.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,245 @@
+// license:BSD-3-Clause
+// copyright-holders:R. Belmont
+/*********************************************************************
+
+    cmsscsi.cpp
+
+    Implementation of the CMS SCSI II Card
+
+    Details:
+    ROM is $2000 bytes.  The last $800 bytes are 7 slot images at
+    offset (slot*$100).  There is no slot 0 image, naturally, so $1800-$18FF
+    is blank.
+
+    The other $1800 bytes of the ROM are banked at $C800.  The first $80
+    bytes at $C800 are the first $80 bytes of the 2K SRAM chip regardless
+    of the ROM bank setting.  This also means the first $80 bytes of each
+    ROM bank are inaccessible.  (Most of the SRAM is also inaccessible)
+
+    $C0(n+8)X space:
+        $0-$7: NCR5380 registers
+        $8: Appears to control SCSI delay time.  1 is shortest, 0 is longest ($FF is second longest, etc)
+        $9: ROM bank at $C800 in the low 2 bits.
+        $A: read/write to the DMA data register on the 5380
+        $B, $C, $D, $E: the jumpers on the card.  Not sure yet which is which.
+        $F: Card will not boot if it doesn't return 0.
+
+*********************************************************************/
+
+#include "emu.h"
+#include "cmsscsi.h"
+#include "bus/nscsi/devices.h"
+
+/***************************************************************************
+    PARAMETERS
+***************************************************************************/
+
+//**************************************************************************
+//  GLOBAL VARIABLES
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(A2BUS_CMSSCSI, a2bus_cmsscsi_device, "cmsscsi", "CMS SCSI II Card")
+
+#define SCSI_ROM_REGION  "scsi_rom"
+#define SCSI_BUS_TAG     "scsibus"
+#define SCSI_5380_TAG    "scsibus:7:ncr5380"
+
+ROM_START( scsi )
+	ROM_REGION(0x4000, SCSI_ROM_REGION, 0)
+		ROM_DEFAULT_BIOS("cms3190")
+		ROM_SYSTEM_BIOS( 0, "cms3190", "CMS SCSI BIOS dated 3-1-90" )
+		ROMX_LOAD( "cms scsi ii interface card rom 3-1-90.bin", 0x000000, 0x002000, CRC(9452cc76) SHA1(b981ce644dde479c22d2ba270d472fe3b5d7f3e9), ROM_BIOS(0) )
+
+		ROM_SYSTEM_BIOS( 1, "cms871109", "CMS SCSI BIOS dated 1987-11-09" )
+		ROMX_LOAD( "cms 1987-11-09 scsi.bin", 0x000000, 0x002000, CRC(89d1d917) SHA1(f6028f6f2b16250950297e2ff5317ce463006796), ROM_BIOS(1) )
+ROM_END
+
+/***************************************************************************
+    FUNCTION PROTOTYPES
+***************************************************************************/
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void a2bus_cmsscsi_device::device_add_mconfig(machine_config &config)
+{
+	NSCSI_BUS(config, m_scsibus);
+	NSCSI_CONNECTOR(config, "scsibus:0", default_scsi_devices, nullptr, false);
+	NSCSI_CONNECTOR(config, "scsibus:1", default_scsi_devices, nullptr, false);
+	NSCSI_CONNECTOR(config, "scsibus:2", default_scsi_devices, nullptr, false);
+	NSCSI_CONNECTOR(config, "scsibus:3", default_scsi_devices, nullptr, false);
+	NSCSI_CONNECTOR(config, "scsibus:4", default_scsi_devices, nullptr, false);
+	NSCSI_CONNECTOR(config, "scsibus:5", default_scsi_devices, nullptr, false);
+	NSCSI_CONNECTOR(config, "scsibus:6", default_scsi_devices, "harddisk", false);
+	NSCSI_CONNECTOR(config, "scsibus:7").option_set("ncr5380", NCR5380N);
+}
+
+//-------------------------------------------------
+//  rom_region - device-specific ROM region
+//-------------------------------------------------
+
+const tiny_rom_entry *a2bus_cmsscsi_device::device_rom_region() const
+{
+	return ROM_NAME( scsi );
+}
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+a2bus_cmsscsi_device::a2bus_cmsscsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, type, tag, owner, clock),
+	device_a2bus_card_interface(mconfig, *this),
+	m_ncr5380(*this, SCSI_5380_TAG),
+	m_scsibus(*this, SCSI_BUS_TAG), m_rom(*this, SCSI_ROM_REGION), m_rombank(0)
+{
+}
+
+a2bus_cmsscsi_device::a2bus_cmsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	a2bus_cmsscsi_device(mconfig, A2BUS_CMSSCSI, tag, owner, clock)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void a2bus_cmsscsi_device::device_start()
+{
+	memset(m_ram, 0, 2048);
+
+	save_item(NAME(m_ram));
+	save_item(NAME(m_rombank));
+}
+
+void a2bus_cmsscsi_device::device_reset()
+{
+	m_rombank = 0;
+}
+
+
+/*-------------------------------------------------
+    read_c0nx - called for reads from this card's c0nx space
+-------------------------------------------------*/
+
+uint8_t a2bus_cmsscsi_device::read_c0nx(uint8_t offset)
+{
+	switch (offset)
+	{
+		case 0:
+		case 1:
+		case 2:
+		case 3:
+		case 4:
+		case 5:
+		case 6:
+		case 7:
+//          logerror("Read 5380 @ %x\n", offset);
+			return m_ncr5380->read(offset);
+
+		case 8:     // appears to be delay time
+			return 1;
+
+		case 0xa:     // read and DACK
+			return m_ncr5380->dma_r();
+
+		case 0xb:   //
+			return 0x1;
+
+		case 0xc:   //
+			return 0x1;
+
+		case 0xd:   //
+			return 0x1;
+
+		case 0xe:   //
+			return 0x1;
+
+		case 0xf:   // must be 0 to boot
+			return 0;
+
+		default:
+			logerror("Read c0n%x (%s)\n", offset, machine().describe_context().c_str());
+			break;
+	}
+
+	return 0xff;
+}
+
+
+/*-------------------------------------------------
+    write_c0nx - called for writes to this card's c0nx space
+-------------------------------------------------*/
+
+void a2bus_cmsscsi_device::write_c0nx(uint8_t offset, uint8_t data)
+{
+	switch (offset)
+	{
+		case 0:
+		case 1:
+		case 2:
+		case 3:
+		case 4:
+		case 5:
+		case 6:
+		case 7:
+//          logerror("%02x to 5380 reg %x\n", data, offset);
+			m_ncr5380->write(offset, data);
+			break;
+
+		case 9:
+			m_rombank = (data & 3) * 0x800;
+			//printf("ROM bank to %x\n", m_rombank);
+			break;
+
+		case 0xa: // write and DACK
+			m_ncr5380->dma_w(data);
+			break;
+
+		default:
+			logerror("Write %02x to c0n%x (%s)\n", data, offset, machine().describe_context().c_str());
+			break;
+	}
+}
+
+/*-------------------------------------------------
+    read_cnxx - called for reads from this card's cnxx space
+-------------------------------------------------*/
+
+uint8_t a2bus_cmsscsi_device::read_cnxx(uint8_t offset)
+{
+	// slot images at $1800 + (slot * 100)
+	return m_rom[offset + (slotno() * 0x100) + 0x1800];
+}
+
+void a2bus_cmsscsi_device::write_cnxx(uint8_t offset, uint8_t data)
+{
+	// there are writes to cn0A, possibly misguided C0nA (bank select?) writes?
+//  logerror("Write %02x to cn%02x (%s)\n", data, offset, machine().describe_context());
+}
+
+/*-------------------------------------------------
+    read_c800 - called for reads from this card's c800 space
+-------------------------------------------------*/
+
+uint8_t a2bus_cmsscsi_device::read_c800(uint16_t offset)
+{
+	if (offset < 0x80)
+	{
+			return m_ram[offset];
+	}
+
+	return m_rom[offset + m_rombank];
+}
+
+/*-------------------------------------------------
+    write_c800 - called for writes to this card's c800 space
+-------------------------------------------------*/
+void a2bus_cmsscsi_device::write_c800(uint16_t offset, uint8_t data)
+{
+	if (offset < 0x80)
+	{
+		m_ram[offset] = data;
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a2bus/cmsscsi.h mame-0.224+dfsg.1/src/devices/bus/a2bus/cmsscsi.h
--- mame-0.222+dfsg.1/src/devices/bus/a2bus/cmsscsi.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a2bus/cmsscsi.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,61 @@
+// license:BSD-3-Clause
+// copyright-holders:R. Belmont
+/*********************************************************************
+
+    cmsscsi.h
+
+    Implementation of the CMS SCSI II Card
+
+*********************************************************************/
+
+#ifndef MAME_BUS_A2BUS_CMSSCSI_H
+#define MAME_BUS_A2BUS_CMSSCSI_H
+
+#pragma once
+
+#include "a2bus.h"
+#include "machine/ncr5380n.h"
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class a2bus_cmsscsi_device:
+	public device_t,
+	public device_a2bus_card_interface
+{
+public:
+	// construction/destruction
+	a2bus_cmsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	DECLARE_WRITE_LINE_MEMBER( drq_w );
+
+protected:
+	a2bus_cmsscsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+	virtual void device_start() override;
+	virtual void device_reset() override;
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	// overrides of standard a2bus slot functions
+	virtual uint8_t read_c0nx(uint8_t offset) override;
+	virtual void write_c0nx(uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_cnxx(uint8_t offset) override;
+	virtual void write_cnxx(uint8_t offset, uint8_t data) override;
+	virtual uint8_t read_c800(uint16_t offset) override;
+	virtual void write_c800(uint16_t offset, uint8_t data) override;
+
+	required_device<ncr5380n_device> m_ncr5380;
+	required_device<nscsi_bus_device> m_scsibus;
+	required_region_ptr<u8> m_rom;
+
+private:
+	uint8_t m_ram[2048];    // 2K SRAM chip on the card, only 128 bytes are used?
+	int m_rombank;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(A2BUS_CMSSCSI, a2bus_cmsscsi_device)
+
+#endif // MAME_BUS_A2BUS_CMSSCSI_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a2gameio/gameio.cpp mame-0.224+dfsg.1/src/devices/bus/a2gameio/gameio.cpp
--- mame-0.222+dfsg.1/src/devices/bus/a2gameio/gameio.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a2gameio/gameio.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -53,7 +53,7 @@
 #include "bus/a2gameio/joyport.h"
 #include "bus/a2gameio/computereyes.h"
 #include "bus/a2gameio/paddles.h"
-
+#include "bus/a2gameio/gizmo.h"
 
 //**************************************************************************
 //  CONNECTOR DEVICE IMPLEMENTATION
@@ -75,6 +75,7 @@
 	slot.option_add("joy", APPLE2_JOYSTICK);
 	slot.option_add("paddles", APPLE2_PADDLES);
 	slot.option_add("joyport", APPLE2_JOYPORT);
+	slot.option_add("gizmo", APPLE2_GIZMO);
 	slot.option_add("compeyes", APPLE2_COMPUTEREYES);
 }
 
@@ -82,6 +83,7 @@
 {
 	slot.option_add("joy", APPLE2_JOYSTICK);
 	slot.option_add("paddles", APPLE2_PADDLES);
+	slot.option_add("gizmo", APPLE2_GIZMO);
 	slot.option_add("compeyes", APPLE2_COMPUTEREYES);
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a2gameio/gizmo.cpp mame-0.224+dfsg.1/src/devices/bus/a2gameio/gizmo.cpp
--- mame-0.222+dfsg.1/src/devices/bus/a2gameio/gizmo.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a2gameio/gizmo.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,75 @@
+// license:BSD-3-Clause
+// copyright-holders:R. Belmont
+/*********************************************************************
+
+    gizmo.cpp - HAL Labs Gizmo digital joystick adapter
+    Used by Vindicator and Super Taxman 2.
+
+*********************************************************************/
+
+#include "emu.h"
+#include "bus/a2gameio/gizmo.h"
+
+//**************************************************************************
+//  GLOBAL VARIABLES
+//**************************************************************************
+
+// device type definition
+DEFINE_DEVICE_TYPE(APPLE2_GIZMO, apple2_gizmo_device, "a2gizmo", "HAL Labs Gizmo")
+
+//**************************************************************************
+//  INPUT PORTS
+//**************************************************************************
+
+static INPUT_PORTS_START( apple2_gizmo )
+	PORT_START("joystick_p1")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 )
+INPUT_PORTS_END
+
+//**************************************************************************
+//  DEVICE IMPLEMENTATION
+//**************************************************************************
+
+apple2_gizmo_device::apple2_gizmo_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: device_t(mconfig, APPLE2_GIZMO, tag, owner, clock)
+	, device_a2gameio_interface(mconfig, *this)
+	, m_player1(*this, "joystick_p1")
+{
+}
+
+ioport_constructor apple2_gizmo_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(apple2_gizmo);
+}
+
+void apple2_gizmo_device::device_start()
+{
+	save_item(NAME(m_an0));
+	save_item(NAME(m_an1));
+	save_item(NAME(m_an2));
+}
+
+READ_LINE_MEMBER(apple2_gizmo_device::sw0_r)
+{
+	static const int gizmo_bits[8] = { 1,3,2,0,4,5,5,5 };
+	return BIT(m_player1->read(),gizmo_bits[m_an0+(m_an1<<1)+(m_an2<<2)]);
+}
+
+WRITE_LINE_MEMBER(apple2_gizmo_device::an0_w)
+{
+	m_an0 = state;
+}
+
+WRITE_LINE_MEMBER(apple2_gizmo_device::an1_w)
+{
+	m_an1 = state;
+}
+
+WRITE_LINE_MEMBER(apple2_gizmo_device::an2_w)
+{
+	m_an2 = state;
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/a2gameio/gizmo.h mame-0.224+dfsg.1/src/devices/bus/a2gameio/gizmo.h
--- mame-0.222+dfsg.1/src/devices/bus/a2gameio/gizmo.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/a2gameio/gizmo.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,45 @@
+// license:BSD-3-Clause
+// copyright-holders:R. Belmont
+/*********************************************************************
+
+    gizmo.h - HAL Labs Gizmo digital joystick adapter
+    Used by Vindicator and Super Taxman 2.
+
+*********************************************************************/
+
+#ifndef MAME_BUS_A2GAMEIO_GIZMO_H
+#define MAME_BUS_A2GAMEIO_GIZMO_H
+
+#pragma once
+
+#include "bus/a2gameio/gameio.h"
+
+// ======================> apple2_gizmo_device
+
+class apple2_gizmo_device : public device_t, public device_a2gameio_interface
+{
+public:
+	// construction/destruction
+	apple2_gizmo_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+protected:
+	// device-level overrides
+	virtual ioport_constructor device_input_ports() const override;
+	virtual void device_start() override;
+
+	// device_a2gameio_interface overrides
+	virtual DECLARE_READ_LINE_MEMBER(sw0_r) override;
+	virtual DECLARE_WRITE_LINE_MEMBER(an0_w) override;
+	virtual DECLARE_WRITE_LINE_MEMBER(an1_w) override;
+	virtual DECLARE_WRITE_LINE_MEMBER(an2_w) override;
+
+private:
+	// input ports
+	required_ioport m_player1;
+	int m_an0, m_an1, m_an2;
+};
+
+// device type declaration
+DECLARE_DEVICE_TYPE(APPLE2_GIZMO, apple2_gizmo_device)
+
+#endif // MAME_BUS_A2GAMEIO_GIZMO_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/abcbus/abcbus.h mame-0.224+dfsg.1/src/devices/bus/abcbus/abcbus.h
--- mame-0.222+dfsg.1/src/devices/bus/abcbus/abcbus.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/abcbus/abcbus.h	2020-08-26 08:57:19.000000000 +0000
@@ -132,7 +132,8 @@
 	// optional operation overrides for ABC 1600
 	virtual int abcbus_csb() { return 1; }
 	virtual uint8_t abcbus_ops() { return 0xff; }
-	virtual void abcbus_tren(int state) { }
+	virtual uint8_t abcbus_tren() { return 0xff; }
+	virtual void abcbus_tren(uint8_t data) { }
 	virtual void abcbus_prac(int state) { }
 	virtual uint8_t abcbus_exp() { return 0xff; }
 	virtual int abcbus_xcsb2() { return 1; }
@@ -198,7 +199,8 @@
 	DECLARE_READ_LINE_MEMBER( xcsb3_r ) { return m_card ? m_card->abcbus_xcsb3() : 1; }
 	DECLARE_READ_LINE_MEMBER( xcsb4_r ) { return m_card ? m_card->abcbus_xcsb4() : 1; }
 	DECLARE_READ_LINE_MEMBER( xcsb5_r ) { return m_card ? m_card->abcbus_xcsb5() : 1; }
-	DECLARE_WRITE_LINE_MEMBER( tren_w ) { if (m_card) m_card->abcbus_tren(state); }
+	uint8_t read_tren() { return m_card ? m_card->abcbus_tren() : 0xff; }
+	void write_tren(uint8_t data) { if (m_card) m_card->abcbus_tren(data); }
 	DECLARE_WRITE_LINE_MEMBER( prac_w ) { if (m_card) m_card->abcbus_prac(state); }
 
 	void cs_w(uint8_t data) { write_cs(data); }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/abcbus/lux10828.cpp mame-0.224+dfsg.1/src/devices/bus/abcbus/lux10828.cpp
--- mame-0.222+dfsg.1/src/devices/bus/abcbus/lux10828.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/abcbus/lux10828.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -106,6 +106,9 @@
         0704: rr   a
         0706: call $073F
 
+        There is an alternate format function in the controller firmware that allows to set a secret byte which is stored in the sector header.
+        Copy protected software checks the secret byte read from the sector header and refuses to start if the disk has not been appropriately formatted.
+
 */
 
 #include "emu.h"
diff -Nru mame-0.222+dfsg.1/src/devices/bus/abcbus/lux4105.cpp mame-0.224+dfsg.1/src/devices/bus/abcbus/lux4105.cpp
--- mame-0.222+dfsg.1/src/devices/bus/abcbus/lux4105.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/abcbus/lux4105.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -41,59 +41,7 @@
 
     TODO
 
-    - command execution gets stuck in message in phase
-
-        08A88   move.l  D7,D0               D0=00000025
-        08A8A   lsl.l   #5, D0              D0=000004A0
-        08A8C   ori.l   #$7e000, D0         D0=0007E4A0
-        08A92   movea.l D0, A0              A0=0007E4A0
-        08A94   move.b  ($2,A0), D0         D0=0007E4AF
-        08A98   btst    #$2, D0
-        08A9C   beq     $8aa4
-        08AA0   bra     $8a88
-
-        [:bus2:4105:sasi:0:s1410] state=3.1 change
-        [:bus2:4105:sasi:0:s1410] state=3.0 change
-        [:bus2:4105:sasi] ctrl .....B.CI stat 0005
-        [:bus2:4105:sasi] 0=ICB
-        [:bus2:4105:sasi] ctrl .....B.CI stat 0005
-        [:bus2:4105:sasi] 0=ICB
-        [:bus2:4105:sasi] ctrl .....B.CI stat 0000
-        [:bus2:4105:sasi] 0=ICB
-        [:bus2:4105:sasi] ctrl ...Q.B.CI stat 0000
-        [:bus2:4105:sasi] 0=QICB
-        [:bus2:4105:sasi] ctrl ...Q.B.CI stat 0000
-        [:bus2:4105:sasi] 0=QICB
-        [:bus2:4105:sasi:0:s1410] state=3.4 change
-        [:bus2:4105:sasi] ctrl ...Q.B.CI stat 0000
-        [:bus2:4105:sasi] 0=QICB
-        [:] ':3f' (089A8) STAT 25: 45
-        [:bus2:4105:sasi] ctrl ..KQ.B.CI stat 0000
-        [:bus2:4105:sasi] 0=QICB
-        [:bus2:4105:sasi] 1=K
-        [:bus2:4105:sasi:0:s1410] state=3.4 change
-        [:bus2:4105:sasi] ctrl ..K..B.CI stat 0000
-        [:bus2:4105:sasi] 0=ICB
-        [:bus2:4105:sasi] 1=K
-        [:bus2:4105:sasi] ctrl .....B.CI stat 0000
-        [:bus2:4105:sasi] 0=ICB
-        [:bus2:4105:sasi:0:s1410] state=3.3 change
-        [:bus2:4105:sasi:0:s1410] state=3.0 change
-        [:bus2:4105:sasi] ctrl .....BMCI min  0000
-        [:bus2:4105:sasi] 0=MICB
-        [:bus2:4105:sasi] ctrl .....BMCI min  0000
-        [:bus2:4105:sasi] 0=MICB
-        [:bus2:4105:sasi] ctrl .....BMCI min  0000
-        [:bus2:4105:sasi] 0=MICB
-        [:bus2:4105:sasi] ctrl ...Q.BMCI min  0000
-        [:bus2:4105:sasi] 0=QMICB
-        [:bus2:4105:sasi] ctrl ...Q.BMCI min  0000
-        [:bus2:4105:sasi] 0=QMICB
-        [:bus2:4105:sasi:0:s1410] state=3.4 change
-        [:bus2:4105:sasi] ctrl ...Q.BMCI min  0000
-        [:bus2:4105:sasi] 0=QMICB
-        [:] ':3f' (089D4) INP 25: 00
-        [:] ':3f' (089E8) STAT 25: 05
+    - sector length error in read check after format
 
 */
 
@@ -109,7 +57,9 @@
 //**************************************************************************
 
 #define SASIBUS_TAG     "sasi"
-
+#define DMA_O1  BIT(m_dma, 0)
+#define DMA_O2  BIT(m_dma, 1)
+#define DMA_O3  BIT(m_dma, 2)
 
 
 //**************************************************************************
@@ -133,6 +83,7 @@
 			downcast<nscsi_callback_device&>(*device).cd_callback().set(*this, FUNC(luxor_4105_device::write_sasi_cd));
 			downcast<nscsi_callback_device&>(*device).bsy_callback().set(*this, FUNC(luxor_4105_device::write_sasi_bsy));
 			downcast<nscsi_callback_device&>(*device).req_callback().set(*this, FUNC(luxor_4105_device::write_sasi_req));
+			downcast<nscsi_callback_device&>(*device).msg_callback().set(*this, FUNC(luxor_4105_device::write_sasi_msg));
 			downcast<nscsi_callback_device&>(*device).io_callback().set(*this, FUNC(luxor_4105_device::write_sasi_io));
 		});
 }
@@ -164,6 +115,11 @@
 	PORT_DIPNAME( 0x7f, 0x25, "Card Address" ) PORT_DIPLOCATION("5E:1,2,3,4,5,6,7")
 	PORT_DIPSETTING(    0x25, "37" )
 	PORT_DIPSETTING(    0x2d, "45" )
+
+	PORT_START("S1")
+	PORT_CONFNAME( 0x01, 0x01, "DMA Timing" )
+	PORT_CONFSETTING(    0x00, "1043/1044" ) // a. TREN connected via delay circuit to OUT latch enable
+	PORT_CONFSETTING(    0x01, "1045/1046" ) // b. TREN connected directly to OUT latch enable
 INPUT_PORTS_END
 
 
@@ -206,7 +162,11 @@
 {
 	// state saving
 	save_item(NAME(m_cs));
+	save_item(NAME(m_data_out));
 	save_item(NAME(m_dma));
+	save_item(NAME(m_req));
+	save_item(NAME(m_drq));
+	save_item(NAME(m_pren));
 }
 
 
@@ -217,38 +177,93 @@
 void luxor_4105_device::device_reset()
 {
 	m_cs = false;
-	m_dma = 0;
+
+	internal_reset();
+}
+
+
+void luxor_4105_device::internal_reset()
+{
+	write_dma_register(0);
+
+	m_data_out = 0;
+
+	m_sasi->sel_w(0);
 
 	m_sasi->rst_w(1);
 	m_sasi->rst_w(0);
-
-	m_slot->trrq_w(1);
 }
 
 
-void luxor_4105_device::update_trrq_int()
+void luxor_4105_device::update_dma()
 {
-	bool cd = !m_sasi->cd_r();
-	bool req = !m_sasi->req_r();
-	int trrq = (cd & !req) ? 0 : 1;
+	// IRQ
+	bool cd = m_sasi->cd_r();
+	bool io = m_sasi->io_r();
+	bool req = m_sasi->req_r() && !m_req;
+	m_drq = (!((!cd || !io) && !(!cd && !DMA_O2))) && req;
+	bool irq = !(DMA_O3 && m_pren) || !(DMA_O1 && m_drq);
+	m_slot->irq_w(irq);
 
-	if (BIT(m_dma, 5))
+	// TRRQ
+	if (DMA_O2)
 	{
-		m_slot->irq_w(trrq ? CLEAR_LINE : ASSERT_LINE);
+		bool trrq = !(!cd && req);
+		m_slot->trrq_w(trrq);
 	}
 	else
 	{
-		m_slot->irq_w(CLEAR_LINE);
+		m_slot->trrq_w(1);
 	}
+}
 
-	if (BIT(m_dma, 6))
-	{
-		m_slot->trrq_w(trrq);
-	}
-	else
+
+void luxor_4105_device::update_ack()
+{
+	m_sasi->ack_w(m_sasi->req_r() && (m_sasi->msg_r() || m_req));
+}
+
+
+void luxor_4105_device::write_dma_register(uint8_t data)
+{
+	/*
+
+	    bit     description
+
+	    0
+	    1
+	    2
+	    3
+	    4
+	    5       byte interrupt enable?
+	    6       DMA/CPU mode (1=DMA, 0=CPU)?
+	    7       error interrupt enable?
+
+	*/
+
+	m_dma = BIT(data, 5) << 2 | BIT(data, 6) << 1 | BIT(data, 7);
+
+	// PREN
+	m_pren = !DMA_O2;
+	m_slot->pren_w(m_pren);
+
+	update_dma();
+}
+
+
+void luxor_4105_device::write_sasi_data(uint8_t data)
+{
+	m_data_out = data;
+
+	if (!m_sasi->io_r())
 	{
-		m_slot->trrq_w(1);
+		m_sasi->write(data);
 	}
+
+	// clock REQ FF
+	m_req = m_sasi->req_r();
+	update_ack();
+	update_dma();
 }
 
 
@@ -263,7 +278,7 @@
 
 WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_cd )
 {
-	update_trrq_int();
+	update_dma();
 }
 
 
@@ -271,10 +286,18 @@
 {
 	if (!state)
 	{
-		m_sasi->ack_w(0);
+		// reset REQ FF
+		m_req = 0;
 	}
 
-	update_trrq_int();
+	update_ack();
+	update_dma();
+}
+
+
+WRITE_LINE_MEMBER( luxor_4105_device::write_sasi_msg )
+{
+	update_ack();
 }
 
 
@@ -284,6 +307,12 @@
 	{
 		m_sasi->write(0);
 	}
+	else
+	{
+		m_sasi->write(m_data_out);
+	}
+
+	update_dma();
 }
 
 
@@ -321,22 +350,25 @@
 
 		    bit     description
 
-		    0       ?
-		    1       ?
-		    2       ?
-		    3       ?
+		    0       REQ
+		    1       C/D
+		    2       BSY
+		    3       I/O
 		    4       0
-		    5
-		    6       ? (tested at 014D9A, after command 08 sent and 1 byte read from SASI, should be 1)
-		    7
+		    5       DMA !O3
+		    6       PREN
+		    7       DMA request
 
 		*/
 
-		data = m_sasi->req_r();
+		data = m_sasi->req_r() && !m_req;
 		data |= !m_sasi->cd_r() << 1;
 		data |= m_sasi->bsy_r() << 2;
 		data |= !m_sasi->io_r() << 3;
-		data |= !m_sasi->msg_r() << 6;
+
+		data |= !DMA_O3 << 5;
+		data |= !m_pren << 6;
+		data |= !m_drq << 7;
 	}
 
 	return data;
@@ -351,20 +383,20 @@
 {
 	uint8_t data = 0xff;
 
-	if (m_cs)
+	if (m_sasi->bsy_r())
 	{
-		if (!m_sasi->bsy_r())
-		{
-			data = m_1e->read();
-		}
-		else
-		{
-			data = m_sasi->read();
-
-			m_sasi->ack_w(1);
-		}
+		data = m_sasi->read();
+	}
+	else
+	{
+		data = m_1e->read();
 	}
 
+	// clock REQ FF
+	m_req = m_sasi->req_r();
+	update_ack();
+	update_dma();
+
 	return data;
 }
 
@@ -377,9 +409,7 @@
 {
 	if (m_cs)
 	{
-		m_sasi->write(data);
-
-		m_sasi->ack_w(1);
+		write_sasi_data(data);
 	}
 }
 
@@ -405,12 +435,7 @@
 {
 	if (m_cs)
 	{
-		m_dma = 0;
-
-		m_sasi->sel_w(0);
-
-		m_sasi->rst_w(1);
-		m_sasi->rst_w(0);
+		internal_reset();
 	}
 }
 
@@ -423,23 +448,54 @@
 {
 	if (m_cs)
 	{
-		/*
+		write_dma_register(data);
+	}
+}
 
-		    bit     description
 
-		    0
-		    1
-		    2
-		    3
-		    4
-		    5       byte interrupt enable?
-		    6       DMA/CPU mode (1=DMA, 0=CPU)?
-		    7       error interrupt enable?
+//-------------------------------------------------
+//  abcbus_tren -
+//-------------------------------------------------
 
-		*/
+uint8_t luxor_4105_device::abcbus_tren()
+{
+	uint8_t data = 0xff;
+
+	if (m_sasi->bsy_r())
+	{
+		data = m_sasi->read();
+	}
 
-		m_dma = data;
+	// clock REQ FF
+	m_req = m_sasi->req_r();
+	update_ack();
+	update_dma();
 
-		update_trrq_int();
+	return data;
+}
+
+
+//-------------------------------------------------
+//  abcbus_tren -
+//-------------------------------------------------
+
+void luxor_4105_device::abcbus_tren(uint8_t data)
+{
+	write_sasi_data(data);
+}
+
+
+//-------------------------------------------------
+//  abcbus_prac -
+//-------------------------------------------------
+
+void luxor_4105_device::abcbus_prac(int state)
+{
+	if ((state && DMA_O2) && !m_slot->trrq_r())
+	{
+		// set REQ FF
+		m_req = 1;
+		update_ack();
+		update_dma();
 	}
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/abcbus/lux4105.h mame-0.224+dfsg.1/src/devices/bus/abcbus/lux4105.h
--- mame-0.222+dfsg.1/src/devices/bus/abcbus/lux4105.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/abcbus/lux4105.h	2020-08-26 08:57:19.000000000 +0000
@@ -50,13 +50,21 @@
 	virtual void abcbus_c1(uint8_t data) override;
 	virtual void abcbus_c3(uint8_t data) override;
 	virtual void abcbus_c4(uint8_t data) override;
+	virtual uint8_t abcbus_tren() override;
+	virtual void abcbus_tren(uint8_t data) override;
+	virtual void abcbus_prac(int state) override;
 
 private:
-	inline void update_trrq_int();
+	void internal_reset();
+	void update_ack();
+	void update_dma();
+	void write_dma_register(uint8_t data);
+	void write_sasi_data(uint8_t data);
 
 	DECLARE_WRITE_LINE_MEMBER( write_sasi_bsy );
 	DECLARE_WRITE_LINE_MEMBER( write_sasi_cd );
 	DECLARE_WRITE_LINE_MEMBER( write_sasi_req );
+	DECLARE_WRITE_LINE_MEMBER( write_sasi_msg );
 	DECLARE_WRITE_LINE_MEMBER( write_sasi_io );
 
 	required_device<nscsi_callback_device> m_sasi;
@@ -64,7 +72,11 @@
 	required_ioport m_5e;
 
 	bool m_cs;
+	uint8_t m_data_out;
 	uint8_t m_dma;
+	bool m_req;
+	bool m_drq;
+	bool m_pren;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/amiga/zorro/a590.cpp mame-0.224+dfsg.1/src/devices/bus/amiga/zorro/a590.cpp
--- mame-0.222+dfsg.1/src/devices/bus/amiga/zorro/a590.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/amiga/zorro/a590.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -159,10 +159,10 @@
 	ROMX_LOAD("390388-02.u12", 0x4001, 0x2000, NO_DUMP, ROM_SKIP(1) | ROM_BIOS(0))
 
 	ROM_SYSTEM_BIOS(1, "v592", "Version 5.92") // a2091 only?
-	ROMX_LOAD("390508-02.u13", 0x0000, 0x2000, NO_DUMP, ROM_SKIP(1) | ROM_BIOS(1)) // checksum-16: ?
-	ROMX_LOAD("390509-02.u12", 0x0001, 0x2000, NO_DUMP, ROM_SKIP(1) | ROM_BIOS(1)) // checksum-16: 288c
-	ROMX_LOAD("390508-02.u13", 0x4000, 0x2000, NO_DUMP, ROM_SKIP(1) | ROM_BIOS(1))
-	ROMX_LOAD("390509-02.u12", 0x4001, 0x2000, NO_DUMP, ROM_SKIP(1) | ROM_BIOS(1))
+	ROMX_LOAD("390508-02_a2091_low_byte_u13_v5.92.u13",  0x0000, 0x2000, CRC(4bedbcb1) SHA1(0b97991d7058a8d0c8d000409b4b82bb96ca1dc9), ROM_SKIP(1) | ROM_BIOS(1)) // checksum-16: 23d8 (?)
+	ROMX_LOAD("390509-02_a2091_high_byte_u12_v5.92.u12", 0x0001, 0x2000, CRC(8f9dd6f8) SHA1(3a8a4639a498bf9a95cb11c45c13687efa714942), ROM_SKIP(1) | ROM_BIOS(1)) // checksum-16: 288c (ok)
+	ROMX_LOAD("390508-02_a2091_low_byte_u13_v5.92.u13",  0x4000, 0x2000, CRC(4bedbcb1) SHA1(0b97991d7058a8d0c8d000409b4b82bb96ca1dc9), ROM_SKIP(1) | ROM_BIOS(1))
+	ROMX_LOAD("390509-02_a2091_high_byte_u12_v5.92.u12", 0x4001, 0x2000, CRC(8f9dd6f8) SHA1(3a8a4639a498bf9a95cb11c45c13687efa714942), ROM_SKIP(1) | ROM_BIOS(1))
 
 	ROM_SYSTEM_BIOS(2, "v60", "Version 6.0") // a590 only?
 	ROMX_LOAD("390389-03.u13", 0x0000, 0x2000, CRC(2e77bbff) SHA1(8a098845068f32cfa4d34a278cd290f61d35a52c), ROM_SKIP(1) | ROM_BIOS(2)) // checksum-16: cbe8 (ok)
diff -Nru mame-0.222+dfsg.1/src/devices/bus/amiga/zorro/buddha.cpp mame-0.224+dfsg.1/src/devices/bus/amiga/zorro/buddha.cpp
--- mame-0.222+dfsg.1/src/devices/bus/amiga/zorro/buddha.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/amiga/zorro/buddha.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -248,8 +248,8 @@
 
 uint16_t buddha_device::ide_0_cs0_r(offs_t offset, uint16_t mem_mask)
 {
-	uint16_t data = m_ata_0->cs0_r((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
-	data = (data << 8) | (data >> 8);
+	uint16_t data = m_ata_0->cs0_r((offset >> 1) & 0x07, swapendian_int16(mem_mask));
+	data = swapendian_int16(data);
 
 	LOG("ide_0_cs0_r(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
 
@@ -260,16 +260,16 @@
 {
 	LOG("ide_0_cs0_w(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
 
-	mem_mask = (mem_mask << 8) | (mem_mask >> 8);
-	data = (data << 8) | (data >> 8);
+	mem_mask = swapendian_int16(mem_mask);
+	data = swapendian_int16(data);
 
 	m_ata_0->cs0_w((offset >> 1) & 0x07, data, mem_mask);
 }
 
 uint16_t buddha_device::ide_0_cs1_r(offs_t offset, uint16_t mem_mask)
 {
-	uint16_t data = m_ata_0->cs1_r((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
-	data = (data << 8) | (data >> 8);
+	uint16_t data = m_ata_0->cs1_r((offset >> 1) & 0x07, swapendian_int16(mem_mask));
+	data = swapendian_int16(data);
 
 	LOG("ide_0_cs1_r(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
 
@@ -280,16 +280,16 @@
 {
 	LOG("ide_0_cs1_w(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
 
-	mem_mask = (mem_mask << 8) | (mem_mask >> 8);
-	data = (data << 8) | (data >> 8);
+	mem_mask = swapendian_int16(mem_mask);
+	data = swapendian_int16(data);
 
 	m_ata_0->cs1_w((offset >> 1) & 0x07, data, mem_mask);
 }
 
 uint16_t buddha_device::ide_1_cs0_r(offs_t offset, uint16_t mem_mask)
 {
-	uint16_t data = m_ata_1->cs0_r((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
-	data = (data << 8) | (data >> 8);
+	uint16_t data = m_ata_1->cs0_r((offset >> 1) & 0x07, swapendian_int16(mem_mask));
+	data = swapendian_int16(data);
 
 	LOG("ide_1_cs0_r(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
 
@@ -300,16 +300,16 @@
 {
 	LOG("ide_1_cs0_w(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
 
-	mem_mask = (mem_mask << 8) | (mem_mask >> 8);
-	data = (data << 8) | (data >> 8);
+	mem_mask = swapendian_int16(mem_mask);
+	data = swapendian_int16(data);
 
 	m_ata_1->cs0_w((offset >> 1) & 0x07, data, mem_mask);
 }
 
 uint16_t buddha_device::ide_1_cs1_r(offs_t offset, uint16_t mem_mask)
 {
-	uint16_t data = m_ata_1->cs1_r((offset >> 1) & 0x07, (mem_mask << 8) | (mem_mask >> 8));
-	data = (data << 8) | (data >> 8);
+	uint16_t data = m_ata_1->cs1_r((offset >> 1) & 0x07, swapendian_int16(mem_mask));
+	data = swapendian_int16(data);
 
 	LOG("ide_1_cs1_r(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
 
@@ -320,8 +320,8 @@
 {
 	LOG("ide_1_cs1_w(%04x) %04x [mask = %04x]\n", offset, data, mem_mask);
 
-	mem_mask = (mem_mask << 8) | (mem_mask >> 8);
-	data = (data << 8) | (data >> 8);
+	mem_mask = swapendian_int16(mem_mask);
+	data = swapendian_int16(data);
 
 	m_ata_1->cs1_w((offset >> 1) & 0x07, data, mem_mask);
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -118,6 +118,7 @@
 #include "ieee488.h"
 #include "m2000.h"
 //#include "m5000.h"
+#include "sasi.h"
 #include "scsi.h"
 #include "multiform.h"
 #include "opus3.h"
@@ -151,6 +152,7 @@
 	device.option_add("pdram",      BBC_PDRAM);           /* Micro User Pull Down RAM */
 	device.option_add("pms64k",     BBC_PMS64K);          /* PMS 64K Non-Volatile Ram Module */
 	device.option_add("ramdisc",    BBC_RAMDISC);         /* Morley Electronics RAM Disc */
+	device.option_add("torchhd",    BBC_TORCHHD);         /* Torch Hard Disc Pack */
 	device.option_add("dc",         BBC_DATACENTRE);      /* RetroClinic DataCentre */
 	//device.option_add("graduate",   BBC_GRADUATE);        /* Torch Graduate G400/G800 */
 	device.option_add("beebopl",    BBC_BEEBOPL);         /* BeebOPL */
@@ -181,6 +183,7 @@
 	device.option_add("pdram",      BBC_PDRAM);           /* Micro User Pull Down RAM */
 	device.option_add("pms64k",     BBC_PMS64K);          /* PMS 64K Non-Volatile Ram Module */
 	device.option_add("ramdisc",    BBC_RAMDISC);         /* Morley Electronics RAM Disc */
+	device.option_add("torchhd",    BBC_TORCHHD);         /* Torch Hard Disc Pack */
 	device.option_add("dc",         BBC_DATACENTRE);      /* RetroClinic DataCentre */
 	//device.option_add("graduate",   BBC_GRADUATE);        /* Torch Graduate G400/G800 */
 	device.option_add("beebopl",    BBC_BEEBOPL);         /* BeebOPL */
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/1mhzbus/ramdisc.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/1mhzbus/ramdisc.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/1mhzbus/ramdisc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/1mhzbus/ramdisc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -65,8 +65,8 @@
 	NVRAM(config, "nvram", nvram_device::DEFAULT_NONE);
 
 	BBC_1MHZBUS_SLOT(config, m_1mhzbus, DERIVED_CLOCK(1, 1), bbc_1mhzbus_devices, nullptr);
-	m_1mhzbus->irq_handler().set(m_1mhzbus, FUNC(bbc_1mhzbus_slot_device::irq_w));
-	m_1mhzbus->nmi_handler().set(m_1mhzbus, FUNC(bbc_1mhzbus_slot_device::nmi_w));
+	m_1mhzbus->irq_handler().set(DEVICE_SELF_OWNER, FUNC(bbc_1mhzbus_slot_device::irq_w));
+	m_1mhzbus->nmi_handler().set(DEVICE_SELF_OWNER, FUNC(bbc_1mhzbus_slot_device::nmi_w));
 }
 
 //-------------------------------------------------
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/1mhzbus/sasi.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/1mhzbus/sasi.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/1mhzbus/sasi.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/1mhzbus/sasi.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,175 @@
+// license:BSD-3-Clause
+// copyright-holders:Nigel Barnes
+/**********************************************************************
+
+    Torch SCSI Host Adaptor
+
+    Circuit diagram: http://mdfs.net/Info/Comp/Torch/scsi1.gif
+
+    http://mdfs.net/Docs/Comp/BBC/Hardware/TorchSCSI
+
+    Supported by Hard Disc Utilities:
+                         Mb  ss  i  c  h s
+      BASF 6188          11  256 9 360 4 32
+      BASF 6185          20  256 9 440 6 32
+      Mitsubishi MR522   19  256 9 612 4 32
+      NEC D5126          19  256 9 615 4 32
+      Rodime 200/10      10  256 9 320 4 32
+      Rodime 200/20      20  256 9 320 8 32
+      Rodime 202E        20  256 9 640 4 32
+      Rodime 204E        40  256 9 640 8 32
+      Vertex V130        23  256 9 987 5 32
+      Vertex V150        38  256 9 987 5 32
+      Vertex V170        53  256 9 987 7 32
+
+**********************************************************************/
+
+#include "emu.h"
+#include "sasi.h"
+#include "machine/nscsi_bus.h"
+#include "bus/nscsi/devices.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(BBC_SASI, bbc_sasi_device, "bbc_sasi", "Torch SCSI Host Adaptor");
+DEFINE_DEVICE_TYPE(BBC_TORCHHD, bbc_torchhd_device, "bbc_torchhd", "Torch Hard Disc Pack");
+
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void bbc_sasi_device::device_add_mconfig(machine_config& config)
+{
+	NSCSI_BUS(config, "sasi");
+	NSCSI_CONNECTOR(config, "sasi:0", default_scsi_devices, nullptr);
+	NSCSI_CONNECTOR(config, "sasi:7", default_scsi_devices, "scsicb", true)
+		.option_add_internal("scsicb", NSCSI_CB)
+		.machine_config([this](device_t* device) {
+			downcast<nscsi_callback_device&>(*device).req_callback().set(*this, FUNC(bbc_sasi_device::req_w));
+			downcast<nscsi_callback_device&>(*device).sel_callback().set(*this, FUNC(bbc_sasi_device::sel_w));
+		});
+}
+
+void bbc_torchhd_device::device_add_mconfig(machine_config &config)
+{
+	bbc_sasi_device::device_add_mconfig(config);
+
+	/* Xebec S1410 */
+	subdevice<nscsi_connector>("sasi:0")->set_default_option("s1410");
+	subdevice<nscsi_connector>("sasi:0")->set_fixed(true);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  bbc_sasi_device - constructor
+//-------------------------------------------------
+
+bbc_sasi_device::bbc_sasi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, type, tag, owner, clock)
+	, device_bbc_1mhzbus_interface(mconfig, *this)
+	, m_sasi(*this, "sasi:7:scsicb")
+	, m_sel_state(0)
+{
+}
+
+bbc_sasi_device::bbc_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: bbc_sasi_device(mconfig, BBC_SASI, tag, owner, clock)
+{
+}
+
+bbc_torchhd_device::bbc_torchhd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: bbc_sasi_device(mconfig, BBC_TORCHHD, tag, owner, clock)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void bbc_sasi_device::device_start()
+{
+	/* register for save states */
+	save_item(NAME(m_sel_state));
+}
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void bbc_sasi_device::device_reset()
+{
+	m_sasi->rst_w(1);
+	m_sasi->rst_w(0);
+}
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+uint8_t bbc_sasi_device::jim_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	switch (offset)
+	{
+	case 0xf0:
+		data = m_sasi->read();
+		m_sasi->ack_w(1);
+		break;
+	case 0xf1:
+		data = (m_sasi->req_r() << 0)
+			| (m_sasi->ack_r() << 1)
+			| (m_sasi->rst_r() << 2)
+			| (!m_sel_state << 3)
+			| (m_sasi->io_r() << 4)
+			| (m_sasi->cd_r() << 5)
+			| (m_sasi->msg_r() << 6)
+			| (m_sasi->bsy_r() << 7);
+		break;
+	case 0xf2:
+		m_sasi->ack_w(1);
+		break;
+	}
+	return data;
+}
+
+void bbc_sasi_device::jim_w(offs_t offset, uint8_t data)
+{
+	switch (offset)
+	{
+	case 0xf0:
+		m_sasi->write(data);
+		m_sasi->ack_w(1);
+		break;
+	case 0xf1:
+		m_sasi->rst_w(1);
+		m_sasi->rst_w(0);
+		break;
+	case 0xf2:
+		m_sasi->sel_w(1);
+		m_sel_state = 1;
+		break;
+	case 0xf3:
+		m_sasi->sel_w(0);
+		m_sel_state = 0;
+		break;
+	}
+}
+
+WRITE_LINE_MEMBER(bbc_sasi_device::req_w)
+{
+	m_sasi->ack_w(0);
+}
+
+WRITE_LINE_MEMBER(bbc_sasi_device::sel_w)
+{
+	m_sel_state = state;
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/1mhzbus/sasi.h mame-0.224+dfsg.1/src/devices/bus/bbc/1mhzbus/sasi.h
--- mame-0.222+dfsg.1/src/devices/bus/bbc/1mhzbus/sasi.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/1mhzbus/sasi.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,71 @@
+// license:BSD-3-Clause
+// copyright-holders:Nigel Barnes
+/**********************************************************************
+
+    Torch SCSI Host Adaptor
+
+**********************************************************************/
+
+
+#ifndef MAME_BUS_BBC_1MHZBUS_SASI_H
+#define MAME_BUS_BBC_1MHZBUS_SASI_H
+
+#include "1mhzbus.h"
+#include "machine/nscsi_cb.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class bbc_sasi_device:
+	public device_t,
+	public device_bbc_1mhzbus_interface
+{
+public:
+	// construction/destruction
+	bbc_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	DECLARE_WRITE_LINE_MEMBER(req_w);
+	DECLARE_WRITE_LINE_MEMBER(sel_w);
+
+protected:
+	bbc_sasi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config& config) override;
+
+	virtual uint8_t jim_r(offs_t offset) override;
+	virtual void jim_w(offs_t offset, uint8_t data) override;
+
+private:
+	required_device<nscsi_callback_device> m_sasi;
+
+	int m_sel_state;
+};
+
+
+// ======================> bbc_torchhd_device
+
+class bbc_torchhd_device : public bbc_sasi_device
+{
+public:
+	// construction/destruction
+	bbc_torchhd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+};
+
+
+// device type definition
+DECLARE_DEVICE_TYPE(BBC_SASI, bbc_sasi_device);
+DECLARE_DEVICE_TYPE(BBC_TORCHHD, bbc_torchhd_device);
+
+
+#endif /* MAME_BUS_BBC_1MHZBUS_SASI_H */
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/acorn.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/acorn.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/acorn.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/acorn.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -95,7 +95,7 @@
 
 void bbc_acorn8271_device::device_add_mconfig(machine_config &config)
 {
-	I8271(config, m_fdc, DERIVED_CLOCK(1, 4));
+	I8271(config, m_fdc, DERIVED_CLOCK(1, 2));
 	m_fdc->intrq_wr_callback().set(DEVICE_SELF_OWNER, FUNC(bbc_fdc_slot_device::intrq_w));
 	m_fdc->hdl_wr_callback().set(FUNC(bbc_acorn8271_device::motor_w));
 	m_fdc->opt_wr_callback().set(FUNC(bbc_acorn8271_device::side_w));
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/ams.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/ams.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/ams.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/ams.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -48,7 +48,7 @@
 
 void bbc_ams3_device::device_add_mconfig(machine_config &config)
 {
-	I8271(config, m_fdc, DERIVED_CLOCK(1, 4));
+	I8271(config, m_fdc, DERIVED_CLOCK(1, 2));
 	m_fdc->intrq_wr_callback().set(DEVICE_SELF_OWNER, FUNC(bbc_fdc_slot_device::intrq_w));
 	m_fdc->hdl_wr_callback().set(FUNC(bbc_ams3_device::motor_w));
 	m_fdc->opt_wr_callback().set(FUNC(bbc_ams3_device::side_w));
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/fdc.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/fdc.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/fdc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/fdc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -96,9 +96,10 @@
 #include "ams.h"
 #include "cumana.h"
 #include "cv1797.h"
-#include "microware.h"
+#include "kenda.h"
 #include "opus.h"
 #include "solidisk.h"
+#include "udm.h"
 #include "watford.h"
 
 
@@ -110,7 +111,7 @@
 	device.option_add("cumana1",   BBC_CUMANA1);
 	device.option_add("cumana2",   BBC_CUMANA2);
 	device.option_add("cv1797",    BBC_CV1797);
-	device.option_add("microware", BBC_MICROWARE);
+	device.option_add("kenda",     BBC_KENDA);
 	device.option_add("opus8272",  BBC_OPUS8272);
 	device.option_add("opus2791",  BBC_OPUS2791);
 	device.option_add("opus2793",  BBC_OPUS2793);
@@ -118,6 +119,7 @@
 	device.option_add("stl1770_1", BBC_STL1770_1);
 	device.option_add("stl1770_2", BBC_STL1770_2);
 	device.option_add("stldfdc_1", BBC_STLDFDC_1);
+	device.option_add("udm",       BBC_UDM);
 	device.option_add("weddb2",    BBC_WEDDB2);
 	device.option_add("weddb3",    BBC_WEDDB3);
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/kenda.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/kenda.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/kenda.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/kenda.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,166 @@
+// license:BSD-3-Clause
+// copyright-holders:Nigel Barnes
+/**********************************************************************
+
+    Kenda Professional DMFS
+
+    The Kenda Professional is packaged with the board in an epoxy blob, and is
+    quite rare. The board contents are not known as no-one has attempted to
+    remove the epoxy.
+    What we do know is that it contains:
+    - 8K ROM
+    - 2K RAM
+    - FDC (definitely WD compatible, and likely a WD2793)
+
+    The board plugs into the usual 8271 socket and has a ribbon cable with 24 pin
+    header that plugs into a ROM socket.
+
+    The 8K ROM is mirrored to fill the 16K ROM space, and has the 2K RAM overlayed
+    from offset &3000, and also mirrored upto &4000.
+
+**********************************************************************/
+
+
+#include "emu.h"
+#include "kenda.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(BBC_KENDA, bbc_kenda_device,  "bbc_kenda", "Kenda Professional DMFS")
+
+
+//-------------------------------------------------
+//  FLOPPY_FORMATS( floppy_formats )
+//-------------------------------------------------
+
+FLOPPY_FORMATS_MEMBER( bbc_kenda_device::floppy_formats )
+	FLOPPY_ACORN_SSD_FORMAT,
+	FLOPPY_ACORN_DSD_FORMAT
+FLOPPY_FORMATS_END
+
+//-------------------------------------------------
+//  SLOT_INTERFACE( bbc_floppies_525 )
+//-------------------------------------------------
+
+static void bbc_floppies_525(device_slot_interface &device)
+{
+	device.option_add("525sssd", FLOPPY_525_SSSD);
+	device.option_add("525sd",   FLOPPY_525_SD);
+	device.option_add("525ssdd", FLOPPY_525_SSDD);
+	device.option_add("525dd",   FLOPPY_525_DD);
+	device.option_add("525qd",   FLOPPY_525_QD);
+}
+
+//-------------------------------------------------
+//  ROM( kenda )
+//-------------------------------------------------
+
+ROM_START( kenda )
+	ROM_REGION(0x4000, "dfs_rom", 0)
+	ROM_LOAD("kenda102.rom", 0x0000, 0x2000, CRC(430b911c) SHA1(594ae1d1aeaa20a1d5d1c64cd94d43926dda4029))
+	ROM_RELOAD(              0x2000, 0x2000)
+ROM_END
+
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void bbc_kenda_device::device_add_mconfig(machine_config &config)
+{
+	WD2793(config, m_fdc, DERIVED_CLOCK(1, 8)); // TODO: unconfirmed FDC
+	m_fdc->intrq_wr_callback().set(DEVICE_SELF_OWNER, FUNC(bbc_fdc_slot_device::intrq_w));
+	m_fdc->drq_wr_callback().set(DEVICE_SELF_OWNER, FUNC(bbc_fdc_slot_device::drq_w));
+	m_fdc->hld_wr_callback().set(FUNC(bbc_kenda_device::motor_w));
+
+	FLOPPY_CONNECTOR(config, m_floppy[0], bbc_floppies_525, "525qd", floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, m_floppy[1], bbc_floppies_525, "525qd", floppy_formats).enable_sound(true);
+}
+
+//-------------------------------------------------
+//  rom_region - device-specific ROM region
+//-------------------------------------------------
+
+const tiny_rom_entry *bbc_kenda_device::device_rom_region() const
+{
+	return ROM_NAME( kenda );
+}
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  bbc_kenda_device - constructor
+//-------------------------------------------------
+
+bbc_kenda_device::bbc_kenda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, BBC_KENDA, tag, owner, clock)
+	, device_bbc_fdc_interface(mconfig, *this)
+	, m_fdc(*this, "fdc")
+	, m_floppy(*this, "fdc:%u", 0)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void bbc_kenda_device::device_start()
+{
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+uint8_t bbc_kenda_device::read(offs_t offset)
+{
+	uint8_t data;
+
+	if (offset & 0x04)
+	{
+		data = 0xfe;
+	}
+	else
+	{
+		data = m_fdc->read(offset & 0x03);
+	}
+
+	return data;
+}
+
+void bbc_kenda_device::write(offs_t offset, uint8_t data)
+{
+	if (offset & 0x04)
+	{
+		floppy_image_device *floppy = nullptr;
+
+		// bit 0: drive select
+		floppy = m_floppy[BIT(data, 0)]->get_device();
+		m_fdc->set_floppy(floppy);
+
+		// bit 1: side select
+		if (floppy)
+			floppy->ss_w(BIT(data, 1));
+
+		// other bits unknown, or unused
+
+		// bit 7: density
+		m_fdc->dden_w(!BIT(data, 7));
+	}
+	else
+	{
+		m_fdc->write(offset & 0x03, data);
+	}
+}
+
+WRITE_LINE_MEMBER(bbc_kenda_device::motor_w)
+{
+	if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->mon_w(!state);
+	if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->mon_w(!state);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/kenda.h mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/kenda.h
--- mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/kenda.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/kenda.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,54 @@
+// license:BSD-3-Clause
+// copyright-holders:Nigel Barnes
+/**********************************************************************
+
+    Kenda Professional DMFS
+
+**********************************************************************/
+
+
+#ifndef MAME_BUS_BBC_FDC_KENDA_H
+#define MAME_BUS_BBC_FDC_KENDA_H
+
+#pragma once
+
+#include "fdc.h"
+#include "imagedev/floppy.h"
+#include "machine/wd_fdc.h"
+#include "formats/acorn_dsk.h"
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class bbc_kenda_device : public device_t, public device_bbc_fdc_interface
+{
+public:
+	// construction/destruction
+	bbc_kenda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual uint8_t read(offs_t offset) override;
+	virtual void write(offs_t offset, uint8_t data) override;
+
+private:
+	DECLARE_FLOPPY_FORMATS(floppy_formats);
+
+	DECLARE_WRITE_LINE_MEMBER(motor_w);
+
+	required_device<wd2793_device> m_fdc;
+	required_device_array<floppy_connector, 2> m_floppy;
+};
+
+
+// device type definition
+DECLARE_DEVICE_TYPE(BBC_KENDA, bbc_kenda_device)
+
+#endif /* MAME_BUS_BBC_FDC_KENDA_H */
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/microware.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/microware.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/microware.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/microware.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Nigel Barnes
-/**********************************************************************
-
-    United Disk Memories DDFS FDC
-
-    Microware DDFS FDC
-
-**********************************************************************/
-
-
-#include "emu.h"
-#include "microware.h"
-
-
-//**************************************************************************
-//  DEVICE DEFINITIONS
-//**************************************************************************
-
-DEFINE_DEVICE_TYPE(BBC_MICROWARE, bbc_microware_device, "bbc_microware", "Microware DDFS FDC")
-
-
-//-------------------------------------------------
-//  FLOPPY_FORMATS( microware )
-//-------------------------------------------------
-
-FLOPPY_FORMATS_MEMBER( bbc_microware_device::floppy_formats )
-	FLOPPY_ACORN_SSD_FORMAT,
-	FLOPPY_ACORN_DSD_FORMAT,
-	FLOPPY_FSD_FORMAT
-FLOPPY_FORMATS_END
-
-static void bbc_floppies_525(device_slot_interface &device)
-{
-	device.option_add("525sssd", FLOPPY_525_SSSD);
-	device.option_add("525sd",   FLOPPY_525_SD);
-	device.option_add("525ssdd", FLOPPY_525_SSDD);
-	device.option_add("525dd",   FLOPPY_525_DD);
-	device.option_add("525qd",   FLOPPY_525_QD);
-}
-
-
-//-------------------------------------------------
-//  ROM( microware )
-//-------------------------------------------------
-
-ROM_START( microware )
-	ROM_REGION(0x4000, "dfs_rom", 0)
-	ROM_DEFAULT_BIOS("udm200")
-	ROM_SYSTEM_BIOS(0, "ddfs090", "Microware DDFS 0.90")
-	ROMX_LOAD("microware_ddfs090.rom", 0x0000, 0x4000, CRC(700d50e5) SHA1(6834e46cb15354003d553e6c2bdb4ed76b47a465), ROM_BIOS(0))
-	ROM_SYSTEM_BIOS(1, "udm200", "UDM DDFS 2.00")
-	ROMX_LOAD("udm_ddfs200.rom", 0x0000, 0x4000, CRC(1b4708a2) SHA1(0f37bcc73a758657cfe58c19f0cc92be9107e767), ROM_BIOS(1))
-ROM_END
-
-
-//-------------------------------------------------
-//  device_add_mconfig - add device configuration
-//-------------------------------------------------
-
-void bbc_microware_device::device_add_mconfig(machine_config &config)
-{
-	WD2793(config, m_fdc, DERIVED_CLOCK(1, 8)); // Replay advert suggests Type R8272 UDM DFS
-	m_fdc->intrq_wr_callback().set(DEVICE_SELF_OWNER, FUNC(bbc_fdc_slot_device::intrq_w));
-	m_fdc->drq_wr_callback().set(DEVICE_SELF_OWNER, FUNC(bbc_fdc_slot_device::drq_w));
-	m_fdc->hld_wr_callback().set(FUNC(bbc_microware_device::motor_w));
-
-	FLOPPY_CONNECTOR(config, m_floppy0, bbc_floppies_525, "525qd", floppy_formats).enable_sound(true);
-	FLOPPY_CONNECTOR(config, m_floppy1, bbc_floppies_525, "525qd", floppy_formats).enable_sound(true);
-}
-
-const tiny_rom_entry *bbc_microware_device::device_rom_region() const
-{
-	return ROM_NAME( microware );
-}
-
-//**************************************************************************
-//  LIVE DEVICE
-//**************************************************************************
-
-//-------------------------------------------------
-//  bbc_microware_device - constructor
-//-------------------------------------------------
-
-bbc_microware_device::bbc_microware_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: device_t(mconfig, BBC_MICROWARE, tag, owner, clock)
-	, device_bbc_fdc_interface(mconfig, *this)
-	, m_fdc(*this, "wd2793")
-	, m_floppy0(*this, "wd2793:0")
-	, m_floppy1(*this, "wd2793:1")
-	, m_drive_control(0)
-{
-}
-
-//-------------------------------------------------
-//  device_start - device-specific startup
-//-------------------------------------------------
-
-void bbc_microware_device::device_start()
-{
-	save_item(NAME(m_drive_control));
-}
-
-
-//**************************************************************************
-//  IMPLEMENTATION
-//**************************************************************************
-
-uint8_t bbc_microware_device::read(offs_t offset)
-{
-	uint8_t data;
-
-	if (offset & 0x04)
-	{
-		data = m_fdc->read(offset & 0x03);
-	}
-	else
-	{
-		data = m_drive_control;
-	}
-	return data;
-}
-
-void bbc_microware_device::write(offs_t offset, uint8_t data)
-{
-	if (offset & 0x04)
-	{
-		m_fdc->write(offset & 0x03, data);
-	}
-	else
-	{
-		floppy_image_device *floppy = nullptr;
-
-		m_drive_control = data;
-		logerror("fdc: Drive control %02x \n", data);
-		// bit 0: drive select
-		switch (BIT(data, 0))
-		{
-		case 0: floppy = m_floppy0->get_device(); break;
-		case 1: floppy = m_floppy1->get_device(); break;
-		}
-		m_fdc->set_floppy(floppy);
-
-		// bit 1: side select
-		if (floppy)
-			floppy->ss_w(BIT(data, 1));
-
-		// bit 2: density
-		m_fdc->dden_w(BIT(data, 2));
-
-		// bit 3: always set ???
-
-		// bit 4: ??? interrupt
-	}
-}
-
-WRITE_LINE_MEMBER(bbc_microware_device::motor_w)
-{
-	if (m_floppy0->get_device()) m_floppy0->get_device()->mon_w(!state);
-	if (m_floppy1->get_device()) m_floppy1->get_device()->mon_w(!state);
-}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/microware.h mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/microware.h
--- mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/microware.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/microware.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,65 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Nigel Barnes
-/**********************************************************************
-
-    United Disk Memories DDFS FDC
-
-    Microware DDFS FDC
-
-**********************************************************************/
-
-
-#ifndef MAME_BUS_BBC_FDC_MICROWARE_H
-#define MAME_BUS_BBC_FDC_MICROWARE_H
-
-#pragma once
-
-#include "fdc.h"
-#include "imagedev/floppy.h"
-#include "machine/wd_fdc.h"
-#include "formats/acorn_dsk.h"
-#include "formats/fsd_dsk.h"
-
-//**************************************************************************
-//  TYPE DEFINITIONS
-//**************************************************************************
-
-class bbc_microware_device :
-	public device_t,
-	public device_bbc_fdc_interface
-{
-public:
-	static constexpr feature_type imperfect_features() { return feature::DISK; }
-
-	// construction/destruction
-	bbc_microware_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-protected:
-	// device-level overrides
-	virtual void device_start() override;
-
-	// optional information overrides
-	virtual void device_add_mconfig(machine_config &config) override;
-	virtual const tiny_rom_entry *device_rom_region() const override;
-
-	virtual uint8_t read(offs_t offset) override;
-	virtual void write(offs_t offset, uint8_t data) override;
-
-private:
-	DECLARE_FLOPPY_FORMATS(floppy_formats);
-
-	DECLARE_WRITE_LINE_MEMBER(motor_w);
-
-	required_device<wd2793_device> m_fdc;
-	required_device<floppy_connector> m_floppy0;
-	optional_device<floppy_connector> m_floppy1;
-
-	int m_drive_control;
-};
-
-
-// device type definition
-DECLARE_DEVICE_TYPE(BBC_MICROWARE, bbc_microware_device);
-
-
-#endif /* MAME_BUS_BBC_FDC_MICROWARE_H */
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/udm.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/udm.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/udm.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/udm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,166 @@
+// license:BSD-3-Clause
+// copyright-holders:Nigel Barnes
+/**********************************************************************
+
+    Microware / United Disk Memories DDFS FDC
+
+**********************************************************************/
+
+
+#include "emu.h"
+#include "udm.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(BBC_UDM, bbc_udm_device, "bbc_udm", "United Disk Memories DDFS FDC")
+
+
+//-------------------------------------------------
+//  FLOPPY_FORMATS( udm )
+//-------------------------------------------------
+
+FLOPPY_FORMATS_MEMBER( bbc_udm_device::floppy_formats )
+	FLOPPY_ACORN_SSD_FORMAT,
+	FLOPPY_ACORN_DSD_FORMAT,
+	FLOPPY_FSD_FORMAT
+FLOPPY_FORMATS_END
+
+static void bbc_floppies_525(device_slot_interface &device)
+{
+	device.option_add("525sssd", FLOPPY_525_SSSD);
+	device.option_add("525sd",   FLOPPY_525_SD);
+	device.option_add("525ssdd", FLOPPY_525_SSDD);
+	device.option_add("525dd",   FLOPPY_525_DD);
+	device.option_add("525qd",   FLOPPY_525_QD);
+}
+
+
+//-------------------------------------------------
+//  ROM( udm )
+//-------------------------------------------------
+
+ROM_START( udm )
+	ROM_REGION(0x4000, "dfs_rom", 0)
+	ROM_SYSTEM_BIOS(0, "ddfs310", "UDM DDFS 3.10")
+	ROMX_LOAD("udm_ddfs310.rom", 0x0000, 0x4000, CRC(55851c2d) SHA1(c5b6557fa4dbfa651c8ecc5b1da93b615c3aa905), ROM_BIOS(0))
+	ROM_SYSTEM_BIOS(1, "ddfs200", "UDM DDFS 2.00")
+	ROMX_LOAD("udm_ddfs200.rom", 0x0000, 0x4000, CRC(1b4708a2) SHA1(0f37bcc73a758657cfe58c19f0cc92be9107e767), ROM_BIOS(1))
+	ROM_SYSTEM_BIOS(2, "ddfs098", "UDM DDFS 0.98")
+	ROMX_LOAD("udm_ddfs098.rom", 0x0000, 0x4000, CRC(2119f9ad) SHA1(bfb9404b34de3b489db73d886300f37081db2482), ROM_BIOS(2))
+	ROM_SYSTEM_BIOS(3, "ddfs090", "Microware DDFS 0.90")
+	ROMX_LOAD("microware_ddfs090.rom", 0x0000, 0x4000, CRC(700d50e5) SHA1(6834e46cb15354003d553e6c2bdb4ed76b47a465), ROM_BIOS(3))
+ROM_END
+
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void bbc_udm_device::device_add_mconfig(machine_config &config)
+{
+	WD2793(config, m_fdc, DERIVED_CLOCK(1, 8));
+	m_fdc->drq_wr_callback().set(FUNC(bbc_udm_device::drq_w));
+	m_fdc->intrq_wr_callback().set(FUNC(bbc_udm_device::intrq_w));
+	m_fdc->hld_wr_callback().set(FUNC(bbc_udm_device::motor_w));
+
+	FLOPPY_CONNECTOR(config, m_floppy[0], bbc_floppies_525, "525qd", floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, m_floppy[1], bbc_floppies_525, "525qd", floppy_formats).enable_sound(true);
+}
+
+const tiny_rom_entry *bbc_udm_device::device_rom_region() const
+{
+	return ROM_NAME( udm );
+}
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  bbc_udm_device - constructor
+//-------------------------------------------------
+
+bbc_udm_device::bbc_udm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, BBC_UDM, tag, owner, clock)
+	, device_bbc_fdc_interface(mconfig, *this)
+	, m_fdc(*this, "wd2793")
+	, m_floppy(*this, "wd2793:%u", 0)
+	, m_fdc_ie(0)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void bbc_udm_device::device_start()
+{
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+uint8_t bbc_udm_device::read(offs_t offset)
+{
+	uint8_t data;
+
+	if (offset & 0x04)
+	{
+		data = m_fdc->read(offset & 0x03);
+	}
+	else
+	{
+		data = 0xfe;
+	}
+	return data;
+}
+
+void bbc_udm_device::write(offs_t offset, uint8_t data)
+{
+	if (offset & 0x04)
+	{
+		m_fdc->write(offset & 0x03, data);
+	}
+	else
+	{
+		floppy_image_device *floppy = nullptr;
+
+		// bit 0: drive select
+		floppy = m_floppy[BIT(data, 0)]->get_device();
+		m_fdc->set_floppy(floppy);
+
+		// bit 1: side select
+		if (floppy)
+			floppy->ss_w(!BIT(data, 1));
+
+		// bit 2: density
+		m_fdc->dden_w(!BIT(data, 2));
+
+		// bit 3: master reset
+		m_fdc->mr_w(BIT(data, 3));
+
+		// bit 4: interrupt enable
+		m_fdc_ie = BIT(data, 4);
+	}
+}
+
+WRITE_LINE_MEMBER(bbc_udm_device::intrq_w)
+{
+	m_slot->intrq_w((state && m_fdc_ie) ? ASSERT_LINE : CLEAR_LINE);
+}
+
+WRITE_LINE_MEMBER(bbc_udm_device::drq_w)
+{
+	m_slot->drq_w((state && m_fdc_ie) ? ASSERT_LINE : CLEAR_LINE);
+}
+
+WRITE_LINE_MEMBER(bbc_udm_device::motor_w)
+{
+	if (m_floppy[0]->get_device()) m_floppy[0]->get_device()->mon_w(!state);
+	if (m_floppy[1]->get_device()) m_floppy[1]->get_device()->mon_w(!state);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/udm.h mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/udm.h
--- mame-0.222+dfsg.1/src/devices/bus/bbc/fdc/udm.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/fdc/udm.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,62 @@
+// license:BSD-3-Clause
+// copyright-holders:Nigel Barnes
+/**********************************************************************
+
+    Microware / United Disk Memories DDFS FDC
+
+**********************************************************************/
+
+
+#ifndef MAME_BUS_BBC_FDC_UDM_H
+#define MAME_BUS_BBC_FDC_UDM_H
+
+#pragma once
+
+#include "fdc.h"
+#include "imagedev/floppy.h"
+#include "machine/wd_fdc.h"
+#include "formats/acorn_dsk.h"
+#include "formats/fsd_dsk.h"
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class bbc_udm_device :
+	public device_t,
+	public device_bbc_fdc_interface
+{
+public:
+	// construction/destruction
+	bbc_udm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual uint8_t read(offs_t offset) override;
+	virtual void write(offs_t offset, uint8_t data) override;
+
+private:
+	DECLARE_FLOPPY_FORMATS(floppy_formats);
+
+	DECLARE_WRITE_LINE_MEMBER(intrq_w);
+	DECLARE_WRITE_LINE_MEMBER(drq_w);
+	DECLARE_WRITE_LINE_MEMBER(motor_w);
+
+	required_device<wd2793_device> m_fdc;
+	required_device_array<floppy_connector, 2> m_floppy;
+
+	int m_fdc_ie;
+};
+
+
+// device type definition
+DECLARE_DEVICE_TYPE(BBC_UDM, bbc_udm_device);
+
+
+#endif /* MAME_BUS_BBC_FDC_UDM_H */
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/rom/dfs.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/rom/dfs.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/rom/dfs.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/rom/dfs.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,7 +2,7 @@
 // copyright-holders:Nigel Barnes
 /***************************************************************************
 
-    BBC Micro MRM E00 DFS emulation
+    BBC Micro E00 DFS emulation
 
     Comprises of 8K ROM and 2K/4K? RAM on a carrier board, with flying lead
     to RW line to enable writing to RAM.
@@ -17,7 +17,7 @@
 //  DEVICE DEFINITIONS
 //**************************************************************************
 
-DEFINE_DEVICE_TYPE(BBC_MRME00, bbc_mrme00_device, "bbc_mrme00", "BBC Micro MRM E00 DFS")
+DEFINE_DEVICE_TYPE(BBC_DFSE00, bbc_dfse00_device, "bbc_dfse00", "BBC Micro E00 DFS")
 
 //**************************************************************************
 //  LIVE DEVICE
@@ -27,8 +27,8 @@
 //  bbc_rom_device - constructor
 //-------------------------------------------------
 
-bbc_mrme00_device::bbc_mrme00_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: device_t(mconfig, BBC_MRME00, tag, owner, clock)
+bbc_dfse00_device::bbc_dfse00_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, BBC_DFSE00, tag, owner, clock)
 	, device_bbc_rom_interface(mconfig, *this)
 {
 }
@@ -37,7 +37,7 @@
 //  device_start - device-specific startup
 //-------------------------------------------------
 
-void bbc_mrme00_device::device_start()
+void bbc_dfse00_device::device_start()
 {
 }
 
@@ -45,7 +45,7 @@
 //  read
 //-------------------------------------------------
 
-uint8_t bbc_mrme00_device::read(offs_t offset)
+uint8_t bbc_dfse00_device::read(offs_t offset)
 {
 	if (offset < get_rom_size())
 		return get_rom_base()[offset & (get_rom_size() - 1)];
@@ -57,7 +57,7 @@
 //  write
 //-------------------------------------------------
 
-void bbc_mrme00_device::write(offs_t offset, uint8_t data)
+void bbc_dfse00_device::write(offs_t offset, uint8_t data)
 {
 	get_ram_base()[offset & (get_ram_size() - 1)] = data;
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/rom/dfs.h mame-0.224+dfsg.1/src/devices/bus/bbc/rom/dfs.h
--- mame-0.222+dfsg.1/src/devices/bus/bbc/rom/dfs.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/rom/dfs.h	2020-08-26 08:57:19.000000000 +0000
@@ -2,7 +2,7 @@
 // copyright-holders:Nigel Barnes
 /***************************************************************************
 
-    BBC Micro MRM E00 DFS emulation
+    BBC Micro E00 DFS emulation
 
 ***************************************************************************/
 
@@ -17,14 +17,13 @@
 //  TYPE DEFINITIONS
 //**************************************************************************
 
-// ======================> bbc_mrme00_device
+// ======================> bbc_dfse00_device
 
-class bbc_mrme00_device : public device_t,
-							public device_bbc_rom_interface
+class bbc_dfse00_device : public device_t, public device_bbc_rom_interface
 {
 public:
 	// construction/destruction
-	bbc_mrme00_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	bbc_dfse00_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 protected:
 	// device-level overrides
@@ -36,7 +35,7 @@
 };
 
 // device type definition
-DECLARE_DEVICE_TYPE(BBC_MRME00, bbc_mrme00_device)
+DECLARE_DEVICE_TYPE(BBC_DFSE00, bbc_dfse00_device)
 
 
 #endif // MAME_BUS_BBC_ROM_DFS_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/rom/slot.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/rom/slot.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/rom/slot.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/rom/slot.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -211,6 +211,7 @@
 #include "dfs.h"
 #include "genie.h"
 #include "pal.h"
+//#include "ramagic.h"
 #include "rtc.h"
 
 
@@ -229,7 +230,8 @@
 	device.option_add_internal("palabe",  BBC_PALABE);
 	device.option_add_internal("palmo2", BBC_PALMO2);
 	device.option_add_internal("genie", BBC_PMSGENIE);
-	device.option_add_internal("mrme00", BBC_MRME00);
+	device.option_add_internal("dfse00", BBC_DFSE00);
+	//device.option_add_internal("ramagic", BBC_RAMAGIC);
 	device.option_add_internal("stlrtc",  BBC_STLRTC);
 	device.option_add_internal("pmsrtc", BBC_PMSRTC);
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/tube/tube.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/tube/tube.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/tube/tube.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/tube/tube.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -111,6 +111,7 @@
 {
 	device.option_add("6502",   BBC_TUBE_6502);    /* Acorn ANC01 6502 2nd processor */
 	device.option_add("z80",    BBC_TUBE_Z80);     /* Acorn ANC04 Z80 2nd processor */
+	device.option_add("z80w",   BBC_TUBE_Z80W);    /* Acorn ANC04 Z80 2nd processor (Winchester) */
 	device.option_add("32016",  BBC_TUBE_32016);   /* Acorn ANC05 32016 2nd processor */
 	device.option_add("arm",    BBC_TUBE_ARM);     /* Acorn ANC13 ARM Evaluation System */
 	device.option_add("80286",  BBC_TUBE_80286);   /* Acorn 80286 2nd Processor */
@@ -120,8 +121,8 @@
 	device.option_add("pcplus", BBC_TUBE_PCPLUS);  /* Solidisk PC-Plus co-processor */
 	//device.option_add("x25",    BBC_TUBE_X25);     /* Econet X25 Gateway */
 	device.option_add("zep100", BBC_TUBE_ZEP100);  /* Torch Z80 Communicator (ZEP100) (Torch) */
-	//device.option_add("zep100l", BBC_TUBE_ZEP100L); /* Torch Z80 Communicator (ZEP100) (Model B) */
-	//device.option_add("zep100w", BBC_TUBE_ZEP100W); /* Torch Z80 Communicator (ZEP100) (Model B+) */
+	device.option_add("zep100l", BBC_TUBE_ZEP100L); /* Torch Z80 Communicator (ZEP100) (Model B) */
+	device.option_add("zep100w", BBC_TUBE_ZEP100W); /* Torch Z80 Communicator (ZEP100) (Model B+) */
 
 	/* Acorn ANC21 Universal 2nd Processor Unit */
 	device.option_add("65c102", BBC_TUBE_65C102);  /* Acorn ADC06 65C102 co-processor */
@@ -139,13 +140,14 @@
 {
 	device.option_add("6502",   BBC_TUBE_6502);     /* Acorn ANC01 6502 2nd processor */
 	device.option_add("z80",    BBC_TUBE_Z80);      /* Acorn ANC04 Z80 2nd processor */
+	device.option_add("z80w",   BBC_TUBE_Z80W);     /* Acorn ANC04 Z80 2nd processor (Winchester) */
 	device.option_add("32016",  BBC_TUBE_32016);    /* Acorn ANC05 32016 2nd processor */
 	device.option_add("arm",    BBC_TUBE_ARM);      /* Acorn ANC13 ARM Evaluation System */
 	device.option_add("80286",  BBC_TUBE_80286);    /* Acorn 80286 2nd Processor */
 	device.option_add("pcplus", BBC_TUBE_PCPLUS);   /* Solidisk PC-Plus co-processor */
 	//device.option_add("a500",   BBC_TUBE_A500);   /* Acorn A500 2nd Processor */
 	//device.option_add("pmsb2p", BBC_TUBE_PMSB2P);   /* PMS B2P-6502 */
-	//device.option_add("zep100m", BBC_TUBE_ZEP100M); /* Torch Z80 Communicator (ZEP100) (Master) */
+	device.option_add("zep100m", BBC_TUBE_ZEP100M); /* Torch Z80 Communicator (ZEP100) (Master) */
 
 	/* Acorn ANC21 Universal 2nd Processor Unit */
 	device.option_add("65c102", BBC_TUBE_65C102);   /* Acorn ADC06 65C102 co-processor */
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/tube/tube_z80.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/tube/tube_z80.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/tube/tube_z80.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/tube/tube_z80.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -19,6 +19,7 @@
 //**************************************************************************
 
 DEFINE_DEVICE_TYPE(BBC_TUBE_Z80, bbc_tube_z80_device, "bbc_tube_z80", "Acorn Z80 2nd Processor")
+DEFINE_DEVICE_TYPE(BBC_TUBE_Z80W, bbc_tube_z80w_device, "bbc_tube_z80w", "Acorn Z80 2nd Processor (Winchester)")
 
 
 //-------------------------------------------------
@@ -54,7 +55,14 @@
 
 ROM_START( tube_z80 )
 	ROM_REGION(0x1000, "rom", 0)
-	ROM_LOAD("z80_120.rom", 0x0000, 0x1000, CRC(315bfc20) SHA1(069077df498599a9c880d4ec9f4bc53fcc602d82))
+	ROM_SYSTEM_BIOS(0, "120", "Z80 v1.20")
+	ROMX_LOAD("z80_120.rom", 0x0000, 0x1000, CRC(315bfc20) SHA1(069077df498599a9c880d4ec9f4bc53fcc602d82), ROM_BIOS(0))
+ROM_END
+
+ROM_START( tube_z80w )
+	ROM_REGION(0x1000, "rom", 0)
+	ROM_SYSTEM_BIOS(0, "200", "Z80 v2.00") /* supplied with Acorn Business Computer */
+	ROMX_LOAD("z80_200.rom", 0x0000, 0x1000, CRC(84672c3d) SHA1(47211cead3a1b0f9830dcdef8e54e29522c69bf8), ROM_BIOS(0))
 ROM_END
 
 //-------------------------------------------------
@@ -71,12 +79,9 @@
 
 	TUBE(config, m_ula);
 	m_ula->hirq_handler().set(DEVICE_SELF_OWNER, FUNC(bbc_tube_slot_device::irq_w));
-	m_ula->pnmi_handler().set(FUNC(bbc_tube_z80_device::nmi_w));
+	m_ula->pnmi_handler().set_inputline(m_z80, INPUT_LINE_NMI);
 	m_ula->pirq_handler().set_inputline(m_z80, INPUT_LINE_IRQ0);
 
-	/* internal ram */
-	RAM(config, m_ram).set_default_size("64K").set_default_value(0);
-
 	/* software lists */
 	SOFTWARE_LIST(config, "flop_ls_z80").set_original("bbc_flop_z80");
 }
@@ -90,6 +95,11 @@
 	return ROM_NAME( tube_z80 );
 }
 
+const tiny_rom_entry *bbc_tube_z80w_device::device_rom_region() const
+{
+	return ROM_NAME( tube_z80w );
+}
+
 //**************************************************************************
 //  LIVE DEVICE
 //**************************************************************************
@@ -98,14 +108,23 @@
 //  bbc_tube_z80_device - constructor
 //-------------------------------------------------
 
+bbc_tube_z80_device::bbc_tube_z80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, type, tag, owner, clock)
+	, device_bbc_tube_interface(mconfig, *this)
+	, m_z80(*this, "z80")
+	, m_ula(*this, "ula")
+	, m_rom(*this, "rom")
+	, m_rom_enabled(true)
+{
+}
+
 bbc_tube_z80_device::bbc_tube_z80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: device_t(mconfig, BBC_TUBE_Z80, tag, owner, clock),
-		device_bbc_tube_interface(mconfig, *this),
-		m_z80(*this, "z80"),
-		m_ula(*this, "ula"),
-		m_ram(*this, "ram"),
-		m_rom(*this, "rom"),
-		m_rom_enabled(true)
+	: bbc_tube_z80_device(mconfig, BBC_TUBE_Z80, tag, owner, clock)
+{
+}
+
+bbc_tube_z80w_device::bbc_tube_z80w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: bbc_tube_z80_device(mconfig, BBC_TUBE_Z80W, tag, owner, clock)
 {
 }
 
@@ -115,7 +134,11 @@
 
 void bbc_tube_z80_device::device_start()
 {
-	m_slot = dynamic_cast<bbc_tube_slot_device *>(owner());
+	m_ram = std::make_unique<uint8_t[]>(0x10000);
+	memset(m_ram.get(), 0xff, 0x10000);
+
+	/* register for save states */
+	save_pointer(NAME(m_ram), 0x10000);
 }
 
 //-------------------------------------------------
@@ -124,8 +147,6 @@
 
 void bbc_tube_z80_device::device_reset()
 {
-	m_ula->reset();
-
 	m_rom_enabled = true;
 }
 
@@ -165,19 +186,14 @@
 	if (m_rom_enabled && (offset < 0x1000))
 		data = m_rom->base()[offset & 0xfff];
 	else
-		data = m_ram->pointer()[offset];
+		data = m_ram[offset];
 
 	return data;
 }
 
 void bbc_tube_z80_device::mem_w(offs_t offset, uint8_t data)
 {
-	m_ram->pointer()[offset] = data;
-}
-
-WRITE_LINE_MEMBER(bbc_tube_z80_device::nmi_w)
-{
-	m_z80->set_input_line(INPUT_LINE_NMI, state);
+	m_ram[offset] = data;
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/tube/tube_z80.h mame-0.224+dfsg.1/src/devices/bus/bbc/tube/tube_z80.h
--- mame-0.222+dfsg.1/src/devices/bus/bbc/tube/tube_z80.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/tube/tube_z80.h	2020-08-26 08:57:19.000000000 +0000
@@ -14,7 +14,6 @@
 
 #include "tube.h"
 #include "cpu/z80/z80.h"
-#include "machine/ram.h"
 #include "machine/tube.h"
 
 //**************************************************************************
@@ -32,6 +31,8 @@
 	bbc_tube_z80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 protected:
+	bbc_tube_z80_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock);
+
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
@@ -45,13 +46,13 @@
 
 private:
 	IRQ_CALLBACK_MEMBER( irq_callback );
-	DECLARE_WRITE_LINE_MEMBER( nmi_w );
 
 	required_device<cpu_device> m_z80;
 	required_device<tube_device> m_ula;
-	required_device<ram_device> m_ram;
 	required_memory_region m_rom;
 
+	std::unique_ptr<uint8_t[]> m_ram;
+
 	bool m_rom_enabled;
 
 	uint8_t mem_r(offs_t offset);
@@ -64,8 +65,20 @@
 };
 
 
+class bbc_tube_z80w_device : public bbc_tube_z80_device
+{
+public:
+	bbc_tube_z80w_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock);
+
+protected:
+	// optional information overrides
+	virtual const tiny_rom_entry* device_rom_region() const override;
+};
+
+
 // device type definition
 DECLARE_DEVICE_TYPE(BBC_TUBE_Z80, bbc_tube_z80_device)
+DECLARE_DEVICE_TYPE(BBC_TUBE_Z80W, bbc_tube_z80w_device)
 
 
 #endif /* MAME_BUS_BBC_TUBE_Z80_H */
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/tube/tube_zep100.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/tube/tube_zep100.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/tube/tube_zep100.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/tube/tube_zep100.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -19,6 +19,9 @@
 //**************************************************************************
 
 DEFINE_DEVICE_TYPE(BBC_TUBE_ZEP100, bbc_tube_zep100_device, "bbc_tube_zep100", "Torch Z80 Communicator")
+DEFINE_DEVICE_TYPE(BBC_TUBE_ZEP100L, bbc_tube_zep100l_device, "bbc_tube_zep100l", "Torch Z80 Communicator (Model B)")
+DEFINE_DEVICE_TYPE(BBC_TUBE_ZEP100W, bbc_tube_zep100w_device, "bbc_tube_zep100w", "Torch Z80 Communicator (Model B+)")
+DEFINE_DEVICE_TYPE(BBC_TUBE_ZEP100M, bbc_tube_zep100m_device, "bbc_tube_zep100m", "Torch Z80 Communicator (Master)")
 
 
 //-------------------------------------------------
@@ -61,6 +64,35 @@
 	ROMX_LOAD("cccp094.rom", 0x0000, 0x2000, CRC(49989bd4) SHA1(62b57c858a3baa4ff943c31f77d331c414772a61), ROM_BIOS(2))
 ROM_END
 
+ROM_START( tube_zep100l )
+	ROM_REGION(0x4000, "exp_rom", 0)
+	ROM_SYSTEM_BIOS(0, "mcp121", "MCP v1.21 (ABL)") // 1985
+	ROMX_LOAD("mcp121abl.rom", 0x0000, 0x4000, CRC(216f1074) SHA1(ec3d285f757b1b35bd0cc65155048a55cc1146ed), ROM_BIOS(0))
+
+	ROM_REGION(0x2000, "rom", 0)
+	ROM_LOAD("cccp102.rom", 0x0000, 0x2000, CRC(2eb40a21) SHA1(e6ee738e5f2f8556002b79d18caa8ef21f14e08d))
+ROM_END
+
+ROM_START( tube_zep100w )
+	ROM_REGION(0x4000, "exp_rom", 0)
+	ROM_SYSTEM_BIOS(0, "mcp122", "MCP v1.22 (ABW)") // 1986
+	ROMX_LOAD("mcp122abw.rom", 0x0000, 0x4000, CRC(7124e9a6) SHA1(39cdd4367bfb2c8d6599b4a4420e6d311f8acaa9), ROM_BIOS(0))
+	ROM_SYSTEM_BIOS(1, "mcp121", "MCP v1.21 (ABW)") // 1985
+	ROMX_LOAD("mcp121abw.rom", 0x0000, 0x4000, CRC(5e4a4a56) SHA1(27172e29f1020147c7ae52111b4234ee4a22e627), ROM_BIOS(1))
+
+	ROM_REGION(0x2000, "rom", 0)
+	ROM_LOAD("cccp102.rom", 0x0000, 0x2000, CRC(2eb40a21) SHA1(e6ee738e5f2f8556002b79d18caa8ef21f14e08d))
+ROM_END
+
+ROM_START( tube_zep100m )
+	ROM_REGION(0x4000, "exp_rom", 0)
+	ROM_SYSTEM_BIOS(0, "mcp122", "MCP v1.22 (ABM)") // 1986
+	ROMX_LOAD("mcp122abm.rom", 0x0000, 0x4000, CRC(596be795) SHA1(35843ace281494ab40463a69a263244d0cb0ecd6), ROM_BIOS(0))
+
+	ROM_REGION(0x2000, "rom", 0)
+	ROM_LOAD("cccp102.rom", 0x0000, 0x2000, CRC(2eb40a21) SHA1(e6ee738e5f2f8556002b79d18caa8ef21f14e08d))
+ROM_END
+
 //-------------------------------------------------
 //  device_add_mconfig - add device configuration
 //-------------------------------------------------
@@ -82,9 +114,6 @@
 	m_ppi->in_pb_callback().set(FUNC(bbc_tube_zep100_device::ppi_pb_r));
 	m_ppi->out_pc_callback().set(FUNC(bbc_tube_zep100_device::ppi_pc_w));
 
-	/* internal ram */
-	RAM(config, m_ram).set_default_size("64K").set_default_value(0x00);
-
 	/* software lists */
 	SOFTWARE_LIST(config, "flop_ls_torch").set_original("bbc_flop_torch").set_filter("Z80");
 }
@@ -98,6 +127,21 @@
 	return ROM_NAME( tube_zep100 );
 }
 
+const tiny_rom_entry *bbc_tube_zep100l_device::device_rom_region() const
+{
+	return ROM_NAME( tube_zep100l );
+}
+
+const tiny_rom_entry *bbc_tube_zep100w_device::device_rom_region() const
+{
+	return ROM_NAME( tube_zep100w );
+}
+
+const tiny_rom_entry *bbc_tube_zep100m_device::device_rom_region() const
+{
+	return ROM_NAME( tube_zep100m );
+}
+
 //**************************************************************************
 //  LIVE DEVICE
 //**************************************************************************
@@ -113,7 +157,6 @@
 	, m_z80(*this, "z80")
 	, m_via(*this, "via")
 	, m_ppi(*this, "ppi")
-	, m_ram(*this, "ram")
 	, m_rom(*this, "rom")
 	, m_port_b(0)
 {
@@ -124,12 +167,32 @@
 {
 }
 
+bbc_tube_zep100l_device::bbc_tube_zep100l_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: bbc_tube_zep100_device(mconfig, BBC_TUBE_ZEP100L, tag, owner, clock)
+{
+}
+
+bbc_tube_zep100w_device::bbc_tube_zep100w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: bbc_tube_zep100_device(mconfig, BBC_TUBE_ZEP100W, tag, owner, clock)
+{
+}
+
+bbc_tube_zep100m_device::bbc_tube_zep100m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: bbc_tube_zep100_device(mconfig, BBC_TUBE_ZEP100M, tag, owner, clock)
+{
+}
+
 //-------------------------------------------------
 //  device_start - device-specific startup
 //-------------------------------------------------
 
 void bbc_tube_zep100_device::device_start()
 {
+	m_ram = std::make_unique<uint8_t[]>(0x10000);
+	memset(m_ram.get(), 0xff, 0x10000);
+
+	/* register for save states */
+	save_pointer(NAME(m_ram), 0x10000);
 }
 
 //-------------------------------------------------
@@ -167,14 +230,14 @@
 	if (m_rom_enabled)
 		data = m_rom->base()[offset];
 	else
-		data = m_ram->pointer()[offset];
+		data = m_ram[offset];
 
 	return data;
 }
 
 void bbc_tube_zep100_device::mem_w(offs_t offset, uint8_t data)
 {
-	m_ram->pointer()[offset] = data;
+	m_ram[offset] = data;
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/tube/tube_zep100.h mame-0.224+dfsg.1/src/devices/bus/bbc/tube/tube_zep100.h
--- mame-0.222+dfsg.1/src/devices/bus/bbc/tube/tube_zep100.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/tube/tube_zep100.h	2020-08-26 08:57:19.000000000 +0000
@@ -16,7 +16,6 @@
 #include "cpu/z80/z80.h"
 #include "machine/6522via.h"
 #include "machine/i8255.h"
-#include "machine/ram.h"
 
 //**************************************************************************
 //  TYPE DEFINITIONS
@@ -52,9 +51,10 @@
 	required_device<z80_device> m_z80;
 	required_device<via6522_device> m_via;
 	required_device<i8255_device> m_ppi;
-	required_device<ram_device> m_ram;
 	required_memory_region m_rom;
 
+	std::unique_ptr<uint8_t[]> m_ram;
+
 	uint8_t m_port_b;
 
 	uint8_t mem_r(offs_t offset);
@@ -70,9 +70,43 @@
 	void tube_zep100_mem(address_map &map);
 };
 
+class bbc_tube_zep100l_device : public bbc_tube_zep100_device
+{
+public:
+	bbc_tube_zep100l_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	virtual const tiny_rom_entry *device_rom_region() const override;
+};
+
+class bbc_tube_zep100w_device : public bbc_tube_zep100_device
+{
+public:
+	static constexpr feature_type imperfect_features() { return feature::DISK; }
+
+	bbc_tube_zep100w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	virtual const tiny_rom_entry *device_rom_region() const override;
+};
+
+class bbc_tube_zep100m_device : public bbc_tube_zep100_device
+{
+public:
+	static constexpr feature_type imperfect_features() { return feature::DISK; }
+
+	bbc_tube_zep100m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	virtual const tiny_rom_entry *device_rom_region() const override;
+};
+
 
 // device type definition
 DECLARE_DEVICE_TYPE(BBC_TUBE_ZEP100, bbc_tube_zep100_device)
+DECLARE_DEVICE_TYPE(BBC_TUBE_ZEP100L, bbc_tube_zep100l_device)
+DECLARE_DEVICE_TYPE(BBC_TUBE_ZEP100W, bbc_tube_zep100w_device)
+DECLARE_DEVICE_TYPE(BBC_TUBE_ZEP100M, bbc_tube_zep100m_device)
 
 
 #endif /* MAME_BUS_BBC_TUBE_ZEP100_H */
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/userport/palette.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/userport/palette.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/userport/palette.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/userport/palette.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,137 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Nigel Barnes
-/**********************************************************************
-
-    Clwyd Technics Colour Palette
-
-    Micro User Chameleon (DIY) - Micro User Jan/Feb 1990
-
-    TODO:
-    - the Chameleon should also implement a CB2 handler, as this is
-      pulsed whenever PB is written to. pb_w should only latch the
-      data, then a CB2 handler would update the palette.
-
-**********************************************************************/
-
-#include "emu.h"
-#include "palette.h"
-
-//**************************************************************************
-//  DEVICE DEFINITIONS
-//**************************************************************************
-
-DEFINE_DEVICE_TYPE(BBC_CHAMELEON, bbc_chameleon_device, "bbc_chameleon", "Micro User Chameleon (DIY)")
-DEFINE_DEVICE_TYPE(BBC_CPALETTE, bbc_cpalette_device, "bbc_cpalette", "Clwyd Technics Colour Palette")
-
-
-//-------------------------------------------------
-//  ROM( chameleon )
-//-------------------------------------------------
-
-ROM_START(chameleon)
-	ROM_REGION(0x2000, "exp_rom", 0)
-	ROM_LOAD("chameleon.rom", 0x0000, 0x2000, CRC(e0ea0252) SHA1(72cf334cdb866ba3dd2353fc7da0dfdb6abf63a7))
-ROM_END
-
-//-------------------------------------------------
-//  rom_region - device-specific ROM region
-//-------------------------------------------------
-
-const tiny_rom_entry* bbc_chameleon_device::device_rom_region() const
-{
-	return ROM_NAME(chameleon);
-}
-
-
-//**************************************************************************
-//  LIVE DEVICE
-//**************************************************************************
-
-//-------------------------------------------------
-//  bbc_palette_device - constructor
-//-------------------------------------------------
-
-bbc_palette_device::bbc_palette_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
-	: device_t(mconfig, type, tag, owner, clock)
-	, device_bbc_userport_interface(mconfig, *this)
-	, m_palette(*this, ":palette")
-	, m_colour(0)
-{
-}
-
-bbc_chameleon_device::bbc_chameleon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: bbc_palette_device(mconfig, BBC_CHAMELEON, tag, owner, clock)
-{
-}
-
-bbc_cpalette_device::bbc_cpalette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: bbc_palette_device(mconfig, BBC_CPALETTE, tag, owner, clock)
-{
-}
-
-
-//-------------------------------------------------
-//  device_start - device-specific startup
-//-------------------------------------------------
-
-void bbc_palette_device::device_start()
-{
-	memset(m_palette_ram, 0, sizeof(m_palette_ram));
-
-	/* register for save states */
-	save_item(NAME(m_colour));
-	save_item(NAME(m_palette_ram));
-}
-
-
-//**************************************************************************
-//  IMPLEMENTATION
-//**************************************************************************
-
-void bbc_chameleon_device::pb_w(uint8_t data)
-{
-	data ^= 0x0f;
-
-	switch (data >> 6)
-	{
-	case 0x00:
-		m_palette_ram[m_colour].set_r(pal4bit(data));
-		break;
-	case 0x01:
-		m_palette_ram[m_colour].set_g(pal4bit(data));
-		break;
-	case 0x02:
-		m_palette_ram[m_colour].set_b(pal4bit(data));
-		break;
-	case 0x03:
-		m_colour = data & 0x0f;
-		m_palette->set_pen_colors(0, &m_palette_ram[BIT(data, 5) << 3], 8);
-		break;
-	}
-}
-
-void bbc_cpalette_device::pb_w(uint8_t data)
-{
-	if (BIT(data, 3))
-	{
-		switch (data & 0x07)
-		{
-		case 0x00:
-			m_colour = ~(data >> 4) & 0x07;
-			break;
-		case 0x01:
-			m_palette_ram[m_colour].set_r(pal4bit(data));
-			break;
-		case 0x02:
-			m_palette_ram[m_colour].set_g(pal4bit(data));
-			break;
-		case 0x03:
-			m_palette_ram[m_colour].set_b(pal4bit(data));
-			break;
-		}
-	}
-	else
-	{
-		m_palette->set_pen_colors(0, &m_palette_ram[0], 8);
-	}
-}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/userport/palette.h mame-0.224+dfsg.1/src/devices/bus/bbc/userport/palette.h
--- mame-0.222+dfsg.1/src/devices/bus/bbc/userport/palette.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/userport/palette.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Nigel Barnes
-/**********************************************************************
-
-    Clwyd Technics Colour Palette
-
-    Micro User Chameleon (DIY) - Micro User Jan/Feb 1990
-
-**********************************************************************/
-
-
-#ifndef MAME_BUS_BBC_USERPORT_PALETTE_H
-#define MAME_BUS_BBC_USERPORT_PALETTE_H
-
-#pragma once
-
-#include "userport.h"
-#include "emupal.h"
-
-//**************************************************************************
-//  TYPE DEFINITIONS
-//**************************************************************************
-
-class bbc_palette_device :
-	public device_t,
-	public device_bbc_userport_interface
-{
-protected:
-	// construction/destruction
-	bbc_palette_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
-
-	// device-level overrides
-	virtual void device_start() override;
-
-	required_device<palette_device> m_palette;
-
-	uint8_t m_colour;
-	rgb_t m_palette_ram[16];
-};
-
-
-// ======================> bbc_chameleon_device
-
-class bbc_chameleon_device : public bbc_palette_device
-{
-public:
-	// construction/destruction
-	bbc_chameleon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-protected:
-	// optional information overrides
-	virtual const tiny_rom_entry* device_rom_region() const override;
-
-	virtual void pb_w(uint8_t data) override;
-};
-
-
-// ======================> bbc_cpalette_device
-
-class bbc_cpalette_device : public bbc_palette_device
-{
-public:
-	static constexpr feature_type imperfect_features() { return feature::PALETTE; }
-
-	// construction/destruction
-	bbc_cpalette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-protected:
-	virtual void pb_w(uint8_t data) override;
-};
-
-
-// device type definition
-DECLARE_DEVICE_TYPE(BBC_CHAMELEON, bbc_chameleon_device)
-DECLARE_DEVICE_TYPE(BBC_CPALETTE, bbc_cpalette_device)
-
-
-#endif // MAME_BUS_BBC_USERPORT_PALETTE_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/userport/palext.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/userport/palext.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/userport/palext.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/userport/palext.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,137 @@
+// license:BSD-3-Clause
+// copyright-holders:Nigel Barnes
+/**********************************************************************
+
+    Clwyd Technics Colour Palette
+
+    Micro User Chameleon (DIY) - Micro User Jan/Feb 1990
+
+    TODO:
+    - the Chameleon should also implement a CB2 handler, as this is
+      pulsed whenever PB is written to. pb_w should only latch the
+      data, then a CB2 handler would update the palette.
+
+**********************************************************************/
+
+#include "emu.h"
+#include "palext.h"
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(BBC_CHAMELEON, bbc_chameleon_device, "bbc_chameleon", "Micro User Chameleon (DIY)")
+DEFINE_DEVICE_TYPE(BBC_CPALETTE, bbc_cpalette_device, "bbc_cpalette", "Clwyd Technics Colour Palette")
+
+
+//-------------------------------------------------
+//  ROM( chameleon )
+//-------------------------------------------------
+
+ROM_START(chameleon)
+	ROM_REGION(0x2000, "exp_rom", 0)
+	ROM_LOAD("chameleon.rom", 0x0000, 0x2000, CRC(e0ea0252) SHA1(72cf334cdb866ba3dd2353fc7da0dfdb6abf63a7))
+ROM_END
+
+//-------------------------------------------------
+//  rom_region - device-specific ROM region
+//-------------------------------------------------
+
+const tiny_rom_entry* bbc_chameleon_device::device_rom_region() const
+{
+	return ROM_NAME(chameleon);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  bbc_palext_device - constructor
+//-------------------------------------------------
+
+bbc_palext_device::bbc_palext_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, type, tag, owner, clock)
+	, device_bbc_userport_interface(mconfig, *this)
+	, m_palette(*this, ":palette")
+	, m_colour(0)
+{
+}
+
+bbc_chameleon_device::bbc_chameleon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: bbc_palext_device(mconfig, BBC_CHAMELEON, tag, owner, clock)
+{
+}
+
+bbc_cpalette_device::bbc_cpalette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: bbc_palext_device(mconfig, BBC_CPALETTE, tag, owner, clock)
+{
+}
+
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void bbc_palext_device::device_start()
+{
+	memset(m_palette_ram, 0, sizeof(m_palette_ram));
+
+	/* register for save states */
+	save_item(NAME(m_colour));
+	save_item(NAME(m_palette_ram));
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+void bbc_chameleon_device::pb_w(uint8_t data)
+{
+	data ^= 0x0f;
+
+	switch (data >> 6)
+	{
+	case 0x00:
+		m_palette_ram[m_colour].set_r(pal4bit(data));
+		break;
+	case 0x01:
+		m_palette_ram[m_colour].set_g(pal4bit(data));
+		break;
+	case 0x02:
+		m_palette_ram[m_colour].set_b(pal4bit(data));
+		break;
+	case 0x03:
+		m_colour = data & 0x0f;
+		m_palette->set_pen_colors(0, &m_palette_ram[BIT(data, 5) << 3], 8);
+		break;
+	}
+}
+
+void bbc_cpalette_device::pb_w(uint8_t data)
+{
+	if (BIT(data, 3))
+	{
+		switch (data & 0x07)
+		{
+		case 0x00:
+			m_colour = ~(data >> 4) & 0x07;
+			break;
+		case 0x01:
+			m_palette_ram[m_colour].set_r(pal4bit(data));
+			break;
+		case 0x02:
+			m_palette_ram[m_colour].set_g(pal4bit(data));
+			break;
+		case 0x03:
+			m_palette_ram[m_colour].set_b(pal4bit(data));
+			break;
+		}
+	}
+	else
+	{
+		m_palette->set_pen_colors(0, &m_palette_ram[0], 8);
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/userport/palext.h mame-0.224+dfsg.1/src/devices/bus/bbc/userport/palext.h
--- mame-0.222+dfsg.1/src/devices/bus/bbc/userport/palext.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/userport/palext.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,78 @@
+// license:BSD-3-Clause
+// copyright-holders:Nigel Barnes
+/**********************************************************************
+
+    Clwyd Technics Colour Palette
+
+    Micro User Chameleon (DIY) - Micro User Jan/Feb 1990
+
+**********************************************************************/
+
+
+#ifndef MAME_BUS_BBC_USERPORT_PALEXT_H
+#define MAME_BUS_BBC_USERPORT_PALEXT_H
+
+#pragma once
+
+#include "userport.h"
+#include "emupal.h"
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class bbc_palext_device :
+	public device_t,
+	public device_bbc_userport_interface
+{
+protected:
+	// construction/destruction
+	bbc_palext_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+	// device-level overrides
+	virtual void device_start() override;
+
+	required_device<palette_device> m_palette;
+
+	uint8_t m_colour;
+	rgb_t m_palette_ram[16];
+};
+
+
+// ======================> bbc_chameleon_device
+
+class bbc_chameleon_device : public bbc_palext_device
+{
+public:
+	// construction/destruction
+	bbc_chameleon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// optional information overrides
+	virtual const tiny_rom_entry* device_rom_region() const override;
+
+	virtual void pb_w(uint8_t data) override;
+};
+
+
+// ======================> bbc_cpalette_device
+
+class bbc_cpalette_device : public bbc_palext_device
+{
+public:
+	static constexpr feature_type imperfect_features() { return feature::PALETTE; }
+
+	// construction/destruction
+	bbc_cpalette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	virtual void pb_w(uint8_t data) override;
+};
+
+
+// device type definition
+DECLARE_DEVICE_TYPE(BBC_CHAMELEON, bbc_chameleon_device)
+DECLARE_DEVICE_TYPE(BBC_CPALETTE, bbc_cpalette_device)
+
+
+#endif // MAME_BUS_BBC_USERPORT_PALEXT_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/bbc/userport/userport.cpp mame-0.224+dfsg.1/src/devices/bus/bbc/userport/userport.cpp
--- mame-0.222+dfsg.1/src/devices/bus/bbc/userport/userport.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/bbc/userport/userport.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -109,7 +109,7 @@
 #include "beebspch.h"
 //#include "digitiser.h"
 //#include "ev1.h"
-#include "palette.h"
+#include "palext.h"
 #include "pointer.h"
 #include "usersplit.h"
 //#include "vci.h"
diff -Nru mame-0.222+dfsg.1/src/devices/bus/cbmiec/c1541.cpp mame-0.224+dfsg.1/src/devices/bus/cbmiec/c1541.cpp
--- mame-0.222+dfsg.1/src/devices/bus/cbmiec/c1541.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/cbmiec/c1541.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -990,6 +990,7 @@
 	connector.set_default_option("525ssqd");
 	connector.set_fixed(true);
 	connector.set_formats(c1541_device_base::floppy_formats);
+	connector.enable_sound(true);
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/centronics/ctronics.cpp mame-0.224+dfsg.1/src/devices/bus/centronics/ctronics.cpp
--- mame-0.222+dfsg.1/src/devices/bus/centronics/ctronics.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/centronics/ctronics.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -134,6 +134,7 @@
 #include "printer.h"
 #include "covox.h"
 #include "chessmec.h"
+#include "samdac.h"
 
 void centronics_devices(device_slot_interface &device)
 {
@@ -147,4 +148,5 @@
 	device.option_add("covox", CENTRONICS_COVOX);
 	device.option_add("covox_stereo", CENTRONICS_COVOX_STEREO);
 	device.option_add("chessmec", CENTRONICS_CHESSMEC);
+	device.option_add("samdac", CENTRONICS_SAMDAC);
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/centronics/epson_lx810l.cpp mame-0.224+dfsg.1/src/devices/bus/centronics/epson_lx810l.cpp
--- mame-0.222+dfsg.1/src/devices/bus/centronics/epson_lx810l.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/centronics/epson_lx810l.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -36,6 +36,17 @@
 //extern const char layout_lx800[]; /* use layout from lx800 */
 
 
+/* The printer starts printing at x offset 44 and stops printing at x
+ * offset 1009, giving a total of 965 printable pixels. Supposedly, the
+ * border at the far right would be at x offset 1053. I've chosen the
+ * width for the paper as 1024, since it's a nicer number than 1053, so
+ * an offset must be used to centralize the pixels.
+ */
+#define CR_OFFSET    (-14)
+#define PAPER_WIDTH  1024
+#define PAPER_HEIGHT 576
+
+
 //**************************************************************************
 //  DEVICE DEFINITIONS
 //**************************************************************************
@@ -172,13 +183,15 @@
 
 	/* Buttons on printer */
 	PORT_START("ONLINE")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("On Line") PORT_CODE(KEYCODE_O) PORT_CHANGED_MEMBER(DEVICE_SELF, epson_lx810l_device, online_sw, 0)
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("On Line") PORT_CODE(KEYCODE_0_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, epson_lx810l_device, online_sw, 0)
 	PORT_START("FORMFEED")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Form Feed") PORT_CODE(KEYCODE_F) PORT_TOGGLE
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Form Feed") PORT_CODE(KEYCODE_7_PAD)
 	PORT_START("LINEFEED")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Line Feed") PORT_CODE(KEYCODE_L) PORT_TOGGLE
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Line Feed") PORT_CODE(KEYCODE_9_PAD)
 	PORT_START("LOADEJECT")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Load/Eject") PORT_CODE(KEYCODE_E)
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Load/Eject") PORT_CODE(KEYCODE_1_PAD)
+	PORT_START("PAPEREND")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Paper End Sensor") PORT_CODE(KEYCODE_6_PAD)
 
 	/* DIPSW1 */
 	PORT_START("DIPSW1")
@@ -376,10 +389,11 @@
 {
 	uint8_t result = 0;
 	uint8_t hp_sensor = m_cr_pos_abs <= 0 ? 0 : 1;
-	uint8_t pe_sensor = m_pf_pos_abs <= 0 ? 1 : 0;
+	//uint8_t pe_sensor = m_pf_pos_abs <= 0 ? 1 : 0;
 
 	result |= hp_sensor; /* home position */
-	result |= pe_sensor << 1; /* paper end */
+	//result |= pe_sensor << 1; /* paper end */
+	result |= ioport("PAPEREND")->read() << 1;  // simulate a paper out error
 	result |= ioport("LINEFEED")->read() << 6;
 	result |= ioport("FORMFEED")->read() << 7;
 
@@ -517,7 +531,8 @@
 
 WRITE_LINE_MEMBER( epson_lx810l_device::e05a30_ready )
 {
-	m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
+	// must be longer than attotime::zero - 0.09 is minimum to initialize properly
+	m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::from_double(0.09));
 }
 
 
@@ -531,7 +546,9 @@
 	copyscrollbitmap(bitmap, m_bitmap, 0, nullptr, 1, &scrolly, cliprect);
 
 	/* draw "printhead" */
-	bitmap.plot_box(m_real_cr_pos + CR_OFFSET - 10, PAPER_HEIGHT - 36, 20, 36, 0x888888);
+	int bordersize = 1;
+	bitmap.plot_box(m_real_cr_pos + CR_OFFSET - 10 - bordersize, PAPER_HEIGHT - 36 - bordersize, 20 + bordersize * 2, 36 + bordersize * 2, 0x000000 );
+	bitmap.plot_box(m_real_cr_pos + CR_OFFSET - 10, PAPER_HEIGHT - 36, 20, 36, m_e05a30->ready_led() ? 0x55ff55 : 0x337733 );
 
 	return 0;
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/centronics/epson_lx810l.h mame-0.224+dfsg.1/src/devices/bus/centronics/epson_lx810l.h
--- mame-0.222+dfsg.1/src/devices/bus/centronics/epson_lx810l.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/centronics/epson_lx810l.h	2020-08-26 08:57:19.000000000 +0000
@@ -4,7 +4,6 @@
  * Epson LX-810L dot matrix printer emulation
  *
  */
-
 #ifndef MAME_BUS_CENTRONICS_EPSON_LX810L_H
 #define MAME_BUS_CENTRONICS_EPSON_LX810L_H
 
@@ -18,16 +17,8 @@
 #include "sound/dac.h"
 #include "screen.h"
 
+#include <cstdlib>
 
-/* The printer starts printing at x offset 44 and stops printing at x
- * offset 1009, giving a total of 965 printable pixels. Supposedly, the
- * border at the far right would be at x offset 1053. I've chosen the
- * width for the paper as 1024, since it's a nicer number than 1053, so
- * an offset must be used to centralize the pixels.
- */
-#define CR_OFFSET    (-14)
-#define PAPER_WIDTH  1024
-#define PAPER_HEIGHT 576
 
 //**************************************************************************
 //  TYPE DEFINITIONS
@@ -111,8 +102,7 @@
 	/* Video hardware (simulates paper) */
 	uint32_t screen_update_lx810l(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
-#define uabs(x) ((x) > 0 ? (x) : -(x))
-	unsigned int bitmap_line(int i) { return ((uabs(m_pf_pos_abs) / 6) + i) % m_bitmap.height(); }
+	unsigned int bitmap_line(int i) { return ((std::abs(m_pf_pos_abs) / 6) + i) % m_bitmap.height(); }
 
 	required_device<cpu_device> m_maincpu;
 	required_device<stepper_device> m_pf_stepper;
@@ -147,9 +137,9 @@
 {
 public:
 	// construction/destruction
-	epson_ap2000_device(const machine_config &mconfig, const char *tag,
-					device_t *owner, uint32_t clock);
+	epson_ap2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// optional information overrides
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
diff -Nru mame-0.222+dfsg.1/src/devices/bus/centronics/samdac.cpp mame-0.224+dfsg.1/src/devices/bus/centronics/samdac.cpp
--- mame-0.222+dfsg.1/src/devices/bus/centronics/samdac.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/centronics/samdac.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,99 @@
+// license: BSD-3-Clause
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAMDAC Stereo DAC for SAM Coupe
+
+***************************************************************************/
+
+#include "emu.h"
+#include "samdac.h"
+#include "sound/volt_reg.h"
+#include "speaker.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(CENTRONICS_SAMDAC, centronics_samdac_device, "centronics_samdac", "SAMDAC")
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void centronics_samdac_device::device_add_mconfig(machine_config &config)
+{
+	SPEAKER(config, "lspeaker").front_left();
+	SPEAKER(config, "rspeaker").front_right();
+
+	DAC_8BIT_R2R(config, m_dac[0], 0).add_route(ALL_OUTPUTS, "lspeaker", 0.5);
+	DAC_8BIT_R2R(config, m_dac[1], 0).add_route(ALL_OUTPUTS, "rspeaker", 0.5);
+
+	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
+	vref.add_route(0, m_dac[0], 1.0, DAC_VREF_POS_INPUT);
+	vref.add_route(0, m_dac[0], -1.0, DAC_VREF_NEG_INPUT);
+	vref.add_route(0, m_dac[1], 1.0, DAC_VREF_POS_INPUT);
+	vref.add_route(0, m_dac[1], -1.0, DAC_VREF_NEG_INPUT);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  centronics_samdac_device - constructor
+//-------------------------------------------------
+
+centronics_samdac_device::centronics_samdac_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, CENTRONICS_SAMDAC, tag, owner, clock),
+	device_centronics_peripheral_interface(mconfig, *this),
+	m_dac(*this, "dac%u", 0U),
+	m_strobe(0),
+	m_data{ 0x00, 0x00 }
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void centronics_samdac_device::device_start()
+{
+	// register for savestates
+	save_item(NAME(m_strobe));
+	save_item(NAME(m_data), 2);
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+WRITE_LINE_MEMBER( centronics_samdac_device::input_strobe )
+{
+	// raising edge, write to left channel
+	if (m_strobe == 0 && state == 1)
+		m_dac[0]->data_w(m_data[0]);
+
+	// failing edge, write to right channel
+	if (m_strobe == 1 && state == 0)
+		m_dac[1]->data_w(m_data[1]);
+
+	m_strobe = state;
+}
+
+void centronics_samdac_device::update_data(int bit, int state)
+{
+	if (state)
+	{
+		m_data[0] |= (1 << bit);
+		m_data[1] |= (1 << bit);
+	}
+	else
+	{
+		m_data[0] &= ~(1 << bit);
+		m_data[1] &= ~(1 << bit);
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/centronics/samdac.h mame-0.224+dfsg.1/src/devices/bus/centronics/samdac.h
--- mame-0.222+dfsg.1/src/devices/bus/centronics/samdac.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/centronics/samdac.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,57 @@
+// license: BSD-3-Clause
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAMDAC Stereo DAC for SAM Coupe
+
+***************************************************************************/
+
+#ifndef MAME_BUS_CENTRONICS_SAMDAC_H
+#define MAME_BUS_CENTRONICS_SAMDAC_H
+
+#pragma once
+
+#include "ctronics.h"
+#include "sound/dac.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> centronics_samdac_device
+
+class centronics_samdac_device : public device_t, public device_centronics_peripheral_interface
+{
+public:
+	// construction/destruction
+	centronics_samdac_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	// from centronics port
+	virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override;
+	virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { update_data(0, state); }
+	virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { update_data(1, state); }
+	virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { update_data(2, state); }
+	virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { update_data(3, state); }
+	virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { update_data(4, state); }
+	virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { update_data(5, state); }
+	virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { update_data(6, state); }
+	virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { update_data(7, state); }
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+
+private:
+	void update_data(int bit, int state);
+
+	required_device_array<dac_byte_interface, 2> m_dac;
+
+	int m_strobe;
+	uint8_t m_data[2];
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(CENTRONICS_SAMDAC, centronics_samdac_device)
+
+#endif // MAME_BUS_CENTRONICS_SAMDAC_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/electron/cart/sndexp3.cpp mame-0.224+dfsg.1/src/devices/bus/electron/cart/sndexp3.cpp
--- mame-0.222+dfsg.1/src/devices/bus/electron/cart/sndexp3.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/electron/cart/sndexp3.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -66,7 +66,7 @@
 {
 	uint8_t data = 0xff;
 
-	if (oe && romqa)
+	if (oe2)
 	{
 		if (offset < 0x2000)
 		{
@@ -103,7 +103,7 @@
 			break;
 		}
 	}
-	else if (oe && romqa)
+	else if (oe2)
 	{
 		if (offset >= 0x2000)
 		{
diff -Nru mame-0.222+dfsg.1/src/devices/bus/electron/cart/sndexp.cpp mame-0.224+dfsg.1/src/devices/bus/electron/cart/sndexp.cpp
--- mame-0.222+dfsg.1/src/devices/bus/electron/cart/sndexp.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/electron/cart/sndexp.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4,10 +4,6 @@
 
     Sound Expansion cartridge (Project Expansions)
 
-    TODO:
-    - compare with actual hardware, sounds awful compared to v3
-    - implement jumper to configure 8K as sideways RAM
-
 **********************************************************************/
 
 
@@ -40,11 +36,10 @@
 //-------------------------------------------------
 
 INPUT_PORTS_START(sndexp)
-	// TODO: Not known how jumper affects RAM access
-	PORT_START("JUMPER")
-	PORT_DIPNAME(0x01, 0x00, "SOUND / RAM")
-	PORT_DIPSETTING(0x00, "SOUND")
-	PORT_DIPSETTING(0x01, "RAM")
+	PORT_START("LINK")
+	PORT_CONFNAME(0x01, 0x00, "SOUND / RAM")
+	PORT_CONFSETTING(0x00, "SOUND")
+	PORT_CONFSETTING(0x01, "RAM")
 INPUT_PORTS_END
 
 
@@ -69,7 +64,7 @@
 	: device_t(mconfig, ELECTRON_SNDEXP, tag, owner, clock)
 	, device_electron_cart_interface(mconfig, *this)
 	, m_sn(*this, "sn76489")
-	, m_jumper(*this, "JUMPER")
+	, m_link(*this, "LINK")
 	, m_sound_latch(0)
 	, m_sound_enable(0)
 {
@@ -95,26 +90,21 @@
 
 	if (oe)
 	{
-		if (m_jumper->read())
+		if (m_link->read())
 		{
-			if (romqa == 0)
-			{
-				data = m_rom[offset & 0x1fff];
-			}
-			else
-			{
-				data = m_ram[offset & 0x1fff];
-			}
+			data = m_ram[offset & 0x1fff];
 		}
 		else
 		{
-			if (offset < 0x2000)
+			switch (offset & 0x2000)
 			{
+			case 0x0000:
 				data = m_rom[offset & 0x1fff];
-			}
-			else
-			{
+				break;
+
+			case 0x2000:
 				data = m_ram[offset & 0x1fff];
+				break;
 			}
 		}
 	}
@@ -146,22 +136,20 @@
 	}
 	else if (oe)
 	{
-		if (m_jumper->read())
+		if (m_link->read())
 		{
-			if (romqa == 1)
-			{
-				m_ram[offset & 0x1fff] = data;
-			}
+			m_ram[offset & 0x1fff] = data;
 		}
 		else
 		{
-			if (offset < 0x2000)
-			{
-				m_ram[offset & 0x1fff] = data;
-			}
-			else
+			switch (offset & 0x2000)
 			{
+			case 0x0000:
+				break;
+
+			case 0x2000:
 				m_ram[offset & 0x1fff] = data;
+				break;
 			}
 		}
 	}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/electron/cart/sndexp.h mame-0.224+dfsg.1/src/devices/bus/electron/cart/sndexp.h
--- mame-0.222+dfsg.1/src/devices/bus/electron/cart/sndexp.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/electron/cart/sndexp.h	2020-08-26 08:57:19.000000000 +0000
@@ -38,7 +38,7 @@
 
 private:
 	required_device<sn76489_device> m_sn;
-	required_ioport m_jumper;
+	required_ioport m_link;
 
 	uint8_t m_sound_latch;
 	uint8_t m_sound_enable;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/electron/exp.cpp mame-0.224+dfsg.1/src/devices/bus/electron/exp.cpp
--- mame-0.222+dfsg.1/src/devices/bus/electron/exp.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/electron/exp.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -108,7 +108,7 @@
 // slot devices
 #include "fbjoy.h"
 //#include "fbprint.h"
-//#include "jafamode7.h"
+#include "mode7.h"
 //#include "lebox.h"
 #include "plus1.h"
 #include "plus2.h"
@@ -125,7 +125,7 @@
 {
 	device.option_add("fbjoy", ELECTRON_FBJOY);
 	//device.option_add("fbprint", ELECTRON_FBPRINT);
-	//device.option_add("jafamode7", ELECTRON_JAFAMODE7);
+	device.option_add("mode7", ELECTRON_MODE7);
 	//device.option_add("lebox", ELECTRON_LEBOX);
 	device.option_add("plus1", ELECTRON_PLUS1);
 	device.option_add("plus2", ELECTRON_PLUS2);
diff -Nru mame-0.222+dfsg.1/src/devices/bus/electron/mode7.cpp mame-0.224+dfsg.1/src/devices/bus/electron/mode7.cpp
--- mame-0.222+dfsg.1/src/devices/bus/electron/mode7.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/electron/mode7.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,236 @@
+// license:BSD-3-Clause
+// copyright-holders:Nigel Barnes
+/**********************************************************************
+
+    JAFA Mode 7 Display Unit
+
+    TODO:
+      The SAA5050 output is currently being sent to a separate screen, it
+      should be output to the same screen as the Electron.
+      The Electron video output is 640x312 whereas the SAA5050 output is
+      480x500 (doubled vertically to account for interlace). Only one
+      output is ever active at any time, which is selected by the MA13
+      line from the HD6845.
+
+**********************************************************************/
+
+
+#include "emu.h"
+#include "mode7.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(ELECTRON_MODE7, electron_mode7_device, "electron_mode7", "JAFA Mode 7 Display Unit")
+
+
+//-------------------------------------------------
+//  ROM( mode7 )
+//-------------------------------------------------
+
+ROM_START( mode7 )
+	ROM_REGION(0x2000, "exp_rom", 0)
+	ROM_SYSTEM_BIOS(0, "191", "Mode 7 OS v1.91")
+	ROMX_LOAD("mode7_1.91.rom", 0x0000, 0x2000, CRC(1863bfe6) SHA1(a18c12c8e4bcd5284aac5b0f0a33dc040176084a), ROM_BIOS(0))
+	ROM_SYSTEM_BIOS(1, "15", "Mode 7 OS v1.5")
+	ROMX_LOAD("mode7_1.5.rom", 0x0000, 0x2000, CRC(eeea69ee) SHA1(3689a6ca8693fa9a6e53a02cf34d613303cb34d7), ROM_BIOS(1))
+ROM_END
+
+//-------------------------------------------------
+//  INPUT_PORTS( mode7 )
+//-------------------------------------------------
+
+static INPUT_PORTS_START( mode7 )
+	PORT_START("BUTTON")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_NAME("Mode 7 Break") PORT_CODE(KEYCODE_HOME) PORT_CHANGED_MEMBER(DEVICE_SELF, electron_mode7_device, break_button, 0)
+INPUT_PORTS_END
+
+//-------------------------------------------------
+//  input_ports - device-specific input ports
+//-------------------------------------------------
+
+ioport_constructor electron_mode7_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME( mode7 );
+}
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void electron_mode7_device::device_add_mconfig(machine_config &config)
+{
+	/* video hardware */
+	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+	m_screen->set_raw(16_MHz_XTAL, 768, 0, 480, 622, 0, 500);
+	m_screen->set_screen_update("hd6845", FUNC(hd6845s_device::screen_update));
+
+	HD6845S(config, m_hd6845, DERIVED_CLOCK(1, 8)); // FIXME: double clock until interlace is implemented
+	m_hd6845->set_screen("screen");
+	m_hd6845->set_show_border_area(false);
+	m_hd6845->set_char_width(12);
+	m_hd6845->set_update_row_callback(FUNC(electron_mode7_device::crtc_update_row));
+	m_hd6845->out_vsync_callback().set(FUNC(electron_mode7_device::vsync_changed));
+
+	SAA5050(config, m_trom, 6_MHz_XTAL);
+	m_trom->set_screen_size(40, 25, 40);
+
+	/* pass-through */
+	ELECTRON_EXPANSION_SLOT(config, m_exp, DERIVED_CLOCK(1, 1), electron_expansion_devices, nullptr);
+	m_exp->irq_handler().set(DEVICE_SELF_OWNER, FUNC(electron_expansion_slot_device::irq_w));
+	m_exp->nmi_handler().set(DEVICE_SELF_OWNER, FUNC(electron_expansion_slot_device::nmi_w));
+}
+
+const tiny_rom_entry *electron_mode7_device::device_rom_region() const
+{
+	return ROM_NAME( mode7 );
+}
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  electron_mode7_device - constructor
+//-------------------------------------------------
+
+electron_mode7_device::electron_mode7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, ELECTRON_MODE7, tag, owner, clock)
+	, device_electron_expansion_interface(mconfig, *this)
+	, m_screen(*this, "screen")
+	, m_hd6845(*this, "hd6845")
+	, m_trom(*this, "saa5050")
+	, m_exp(*this, "exp")
+	, m_exp_rom(*this, "exp_rom")
+	, m_romsel(0)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void electron_mode7_device::device_start()
+{
+	m_videoram = make_unique_clear<uint8_t[]>(0x800);
+
+	/* register for save states */
+	save_pointer(NAME(m_videoram), 0x800);
+	save_item(NAME(m_romsel));
+}
+
+//-------------------------------------------------
+//  expbus_r - expansion data read
+//-------------------------------------------------
+
+uint8_t electron_mode7_device::expbus_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (offset >= 0x7c00 && offset < 0x8000)
+	{
+		data = m_videoram[offset & 0x3ff];
+	}
+	else if (offset >= 0x8000 && offset < 0xc000)
+	{
+		if (m_romsel == 15)
+		{
+			data = m_exp_rom->base()[offset & 0x1fff];
+		}
+	}
+	else
+	{
+		switch (offset)
+		{
+		case 0xfc1e:
+			data = m_hd6845->status_r();
+			break;
+		case 0xfc1f:
+			data = m_hd6845->register_r();
+			break;
+		}
+	}
+
+	data &= m_exp->expbus_r(offset);
+
+	return data;
+}
+
+//-------------------------------------------------
+//  expbus_w - expansion data write
+//-------------------------------------------------
+
+void electron_mode7_device::expbus_w(offs_t offset, uint8_t data)
+{
+	if (offset >= 0x7c00 && offset < 0x8000)
+	{
+		m_videoram[offset & 0x3ff] = data & 0x7f;
+	}
+	else
+	{
+		switch (offset)
+		{
+		case 0xfc1c:
+			m_hd6845->address_w(data);
+			break;
+		case 0xfc1d:
+			m_hd6845->register_w(data);
+			break;
+
+		case 0xfe05:
+			if ((data & 0xf0) != 0xf0)
+				m_romsel = data & 0x0f;
+			break;
+		}
+	}
+
+	m_exp->expbus_w(offset, data);
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+MC6845_UPDATE_ROW(electron_mode7_device::crtc_update_row)
+{
+	uint32_t* p = &bitmap.pix32(y);
+
+	m_trom->lose_w(1);
+	m_trom->lose_w(0);
+
+	for (int column = 0; column < x_count; column++)
+	{
+		m_trom->write(m_videoram[(ma + column) & 0x3ff]);
+
+		m_trom->f1_w(1);
+		m_trom->f1_w(0);
+
+		for (int bit = 0; bit < 12; bit++)
+		{
+			m_trom->tr6_w(1);
+			m_trom->tr6_w(0);
+
+			int col = m_trom->get_rgb() ^ ((column == cursor_x) ? 7 : 0);
+
+			int r = BIT(col, 0) * 0xff;
+			int g = BIT(col, 1) * 0xff;
+			int b = BIT(col, 2) * 0xff;
+
+			*p++ = rgb_t(r, g, b);
+		}
+	}
+}
+
+WRITE_LINE_MEMBER(electron_mode7_device::vsync_changed)
+{
+	m_trom->dew_w(state);
+}
+
+
+INPUT_CHANGED_MEMBER(electron_mode7_device::break_button)
+{
+	m_slot->nmi_w(!newval);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/electron/mode7.h mame-0.224+dfsg.1/src/devices/bus/electron/mode7.h
--- mame-0.222+dfsg.1/src/devices/bus/electron/mode7.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/electron/mode7.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,66 @@
+// license:BSD-3-Clause
+// copyright-holders:Nigel Barnes
+/**********************************************************************
+
+    JAFA Mode 7 Display Unit
+
+**********************************************************************/
+
+#ifndef MAME_BUS_ELECTRON_MODE7_H
+#define MAME_BUS_ELECTRON_MODE7_H
+
+#include "exp.h"
+#include "video/mc6845.h"
+#include "video/saa5050.h"
+#include "screen.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class electron_mode7_device:
+	public device_t,
+	public device_electron_expansion_interface
+{
+public:
+	static constexpr feature_type imperfect_features() { return feature::GRAPHICS; }
+
+	// construction/destruction
+	electron_mode7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	DECLARE_INPUT_CHANGED_MEMBER(break_button);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+	virtual ioport_constructor device_input_ports() const override;
+
+	virtual uint8_t expbus_r(offs_t offset) override;
+	virtual void expbus_w(offs_t offset, uint8_t data) override;
+
+private:
+	required_device<screen_device> m_screen;
+	required_device<mc6845_device> m_hd6845;
+	required_device<saa5050_device> m_trom;
+	required_device<electron_expansion_slot_device> m_exp;
+	required_memory_region m_exp_rom;
+
+	std::unique_ptr<uint8_t[]> m_videoram;
+
+	MC6845_UPDATE_ROW(crtc_update_row);
+	DECLARE_WRITE_LINE_MEMBER(vsync_changed);
+
+	uint8_t m_romsel;
+};
+
+
+// device type definition
+DECLARE_DEVICE_TYPE(ELECTRON_MODE7, electron_mode7_device)
+
+
+#endif // MAME_BUS_ELECTRON_MODE7_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/electron/romboxp.cpp mame-0.224+dfsg.1/src/devices/bus/electron/romboxp.cpp
--- mame-0.222+dfsg.1/src/devices/bus/electron/romboxp.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/electron/romboxp.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -34,7 +34,7 @@
 ROM_START( romboxp )
 	// Bank 12 Expansion module operating system
 	ROM_REGION(0x2000, "exp_rom", 0)
-	ROM_DEFAULT_BIOS("exp100")
+	ROM_DEFAULT_BIOS("exp202")
 	ROM_SYSTEM_BIOS(0, "exp100", "ROMBOX+ Expansion 1.00")
 	ROMX_LOAD("romboxplus.rom", 0x0000, 0x2000, CRC(0520ab6d) SHA1(2f551bea279a64e09fd4d31024799f7459fb9938), ROM_BIOS(0))
 
@@ -63,12 +63,9 @@
 
 static INPUT_PORTS_START( romboxp )
 	PORT_START("OPTION")
-	PORT_CONFNAME(0x01, 0x01, "A1") // not implemented
-	PORT_CONFSETTING(0x00, "RAM")
-	PORT_CONFSETTING(0x01, "ROM")
-	PORT_CONFNAME(0x02, 0x02, "A2")
-	PORT_CONFSETTING(0x00, "ROM 12-15")
-	PORT_CONFSETTING(0x02, "ROM 4-7")
+	PORT_CONFNAME(0x01, 0x01, "Sideways ROM Pages")
+	PORT_CONFSETTING(0x00, "12-15")
+	PORT_CONFSETTING(0x01, "4-7")
 INPUT_PORTS_END
 
 //-------------------------------------------------
@@ -124,18 +121,18 @@
 //  electron_romboxp_device - constructor
 //-------------------------------------------------
 
-electron_romboxp_device::electron_romboxp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
-	device_t(mconfig, ELECTRON_ROMBOXP, tag, owner, clock),
-	device_electron_expansion_interface(mconfig, *this),
-	m_exp_rom(*this, "exp_rom"),
-	m_rom(*this, "rom%u", 1),
-	m_cart(*this, "cart%u", 1),
-	m_centronics(*this, "centronics"),
-	m_cent_data_out(*this, "cent_data_out"),
-	m_option(*this, "OPTION"),
-	m_romsel(0),
-	m_rom_base(0),
-	m_centronics_busy(0)
+electron_romboxp_device::electron_romboxp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, ELECTRON_ROMBOXP, tag, owner, clock)
+	, device_electron_expansion_interface(mconfig, *this)
+	, m_exp_rom(*this, "exp_rom")
+	, m_rom(*this, "rom%u", 1)
+	, m_cart(*this, "cart%u", 1)
+	, m_centronics(*this, "centronics")
+	, m_cent_data_out(*this, "cent_data_out")
+	, m_option(*this, "OPTION")
+	, m_romsel(0)
+	, m_rom_base(0)
+	, m_centronics_busy(0)
 {
 }
 
@@ -145,6 +142,12 @@
 
 void electron_romboxp_device::device_start()
 {
+	m_ram = make_unique_clear<uint8_t[]>(0x10000);
+	memset(m_ram.get(), 0xff, 0x10000);
+
+	/* register for save states */
+	save_item(NAME(m_romsel));
+	save_pointer(NAME(m_ram), 0x10000);
 }
 
 //-------------------------------------------------
@@ -153,7 +156,7 @@
 
 void electron_romboxp_device::device_reset()
 {
-	m_rom_base = (m_option->read() & 0x02) ? 4 : 12;
+	m_rom_base = m_option->read() ? 4 : 12;
 }
 
 //-------------------------------------------------
@@ -186,7 +189,10 @@
 		case 7:
 			if (m_rom_base == 4)
 			{
-				data = m_rom[m_romsel - 4]->read_rom(offset & 0x3fff);
+				if (m_rom[m_romsel - 4]->exists())
+					data = m_rom[m_romsel - 4]->read_rom(offset & 0x3fff);
+				else
+					data = m_ram[(m_romsel - 4) << 14 | (offset & 0x3fff)];
 			}
 			break;
 		case 12:
@@ -199,7 +205,10 @@
 		case 15:
 			if (m_rom_base == 12)
 			{
-				data = m_rom[m_romsel - 12]->read_rom(offset & 0x3fff);
+				if (m_rom[m_romsel - 12]->exists())
+					data = m_rom[m_romsel - 12]->read_rom(offset & 0x3fff);
+				else
+					data = m_ram[(m_romsel - 12) << 14 | (offset & 0x3fff)];
 			}
 			break;
 		}
@@ -250,6 +259,26 @@
 		case 3:
 			m_cart[0]->write(offset & 0x3fff, data, 0, 0, m_romsel & 0x01, 1, 0);
 			break;
+		case 4:
+		case 5:
+		case 6:
+		case 7:
+			if (m_rom_base == 4)
+			{
+				if (!m_rom[m_romsel - 4]->exists())
+					m_ram[(m_romsel - 4) << 14 | (offset & 0x3fff)] = data;
+			}
+			break;
+		case 12:
+		case 13:
+		case 14:
+		case 15:
+			if (m_rom_base == 12)
+			{
+				if (!m_rom[m_romsel - 12]->exists())
+					m_ram[(m_romsel - 12) << 14 | (offset & 0x3fff)] = data;
+			}
+			break;
 		}
 		break;
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/electron/romboxp.h mame-0.224+dfsg.1/src/devices/bus/electron/romboxp.h
--- mame-0.222+dfsg.1/src/devices/bus/electron/romboxp.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/electron/romboxp.h	2020-08-26 08:57:19.000000000 +0000
@@ -60,6 +60,7 @@
 	required_device<output_latch_device> m_cent_data_out;
 	required_ioport m_option;
 
+	std::unique_ptr<uint8_t[]> m_ram;
 	uint8_t m_romsel;
 	uint8_t m_rom_base;
 	int m_centronics_busy;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/gio64/newport.cpp mame-0.224+dfsg.1/src/devices/bus/gio64/newport.cpp
--- mame-0.222+dfsg.1/src/devices/bus/gio64/newport.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/gio64/newport.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2199,11 +2199,6 @@
 	return ret;
 }
 
-uint32_t newport_base_device::do_endian_swap(uint32_t color)
-{
-	return (color >> 24) | (color << 24) | ((color >> 8) & 0x0000ff00) | ((color << 8) & 0x00ff0000);
-}
-
 uint32_t newport_base_device::get_host_color()
 {
 	static const uint32_t s_color_masks[4] = { 0xf, 0xff, 0xfff, 0xffffffff };
@@ -2259,7 +2254,7 @@
 		break;
 	}
 	if (BIT(m_rex3.m_draw_mode1, 11))
-		color = do_endian_swap(color);
+		color = swapendian_int32(color);
 	return color;
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/gio64/newport.h mame-0.224+dfsg.1/src/devices/bus/gio64/newport.h
--- mame-0.222+dfsg.1/src/devices/bus/gio64/newport.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/gio64/newport.h	2020-08-26 08:57:19.000000000 +0000
@@ -476,8 +476,6 @@
 	uint32_t convert_8bpp_bgr_to_24bpp_rgb(uint8_t pix_in);
 	uint32_t convert_12bpp_bgr_to_24bpp_rgb(uint16_t pix_in);
 
-	uint32_t do_endian_swap(uint32_t color);
-
 	struct bresenham_octant_info_t
 	{
 		int16_t incrx1;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/hp9845_io/98036.cpp mame-0.224+dfsg.1/src/devices/bus/hp9845_io/98036.cpp
--- mame-0.222+dfsg.1/src/devices/bus/hp9845_io/98036.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/hp9845_io/98036.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,505 @@
+// license:BSD-3-Clause
+// copyright-holders: F. Ulivi
+/*********************************************************************
+
+    98036.cpp
+
+    98036 module (RS232 interface)
+
+    Main reference for this module:
+    HP, 98036A Serial I/O interface installation & service manual
+
+*********************************************************************/
+
+#include "98036.h"
+
+// Debugging
+#define VERBOSE 0
+#include "logmacro.h"
+
+// Bit manipulation
+namespace {
+	template<typename T> constexpr T BIT_MASK(unsigned n)
+	{
+		return (T)1U << n;
+	}
+
+	template<typename T> void BIT_SET(T& w , unsigned n)
+	{
+		w |= BIT_MASK<T>(n);
+	}
+}
+
+// device type definitions
+DEFINE_DEVICE_TYPE(HP98036_IO_CARD, hp98036_io_card_device, "hp98036" , "HP98036 card")
+
+hp98036_io_card_device::hp98036_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+: device_t(mconfig, HP98036_IO_CARD, tag, owner, clock)
+	, device_hp9845_io_interface(mconfig, *this)
+	, m_uart(*this , "uart")
+	, m_clock_gen(*this , "clock_gen")
+	, m_rs232(*this , "rs232")
+	, m_s1_input(*this , "s1")
+	, m_s2_input(*this , "s2")
+	, m_s3_input(*this , "s3")
+	, m_jumper_input(*this , "jumper")
+	, m_loopback_en(*this , "loop")
+{
+}
+
+hp98036_io_card_device::~hp98036_io_card_device()
+{
+}
+
+uint16_t hp98036_io_card_device::reg_r(address_space &space, offs_t offset)
+{
+	uint16_t res = 0;
+
+	switch (offset) {
+	case 0:
+		// R4IN
+		m_r4_dir = false;
+		res = m_r4in_data;
+		break;
+
+	case 1:
+		// R5IN
+		if (m_tx_int_en) {
+			BIT_SET(res, 0);
+		}
+		if (m_rx_int_en) {
+			BIT_SET(res, 1);
+		}
+		BIT_SET(res, 4);
+		if (m_int_en) {
+			BIT_SET(res, 7);
+		}
+		break;
+
+	case 2:
+		// R6IN
+		// Bits 3&4: jumpers
+		res = (m_jumper_input->read() & 3) << 3;
+		if (m_loopback) {
+			res |= m_lineout;
+		} else {
+			if (!m_rs232->dcd_r()) {
+				BIT_SET(res, 0);
+			}
+			if (!m_rs232->ri_r()) {
+				BIT_SET(res, 1);
+			}
+			// Bit 2: secondary CD, always 0
+		}
+		BIT_SET(res, 5);
+		BIT_SET(res, 6);
+		BIT_SET(res, 7);
+		break;
+
+	default:
+		logerror("Unmapped read @%u\n" , offset);
+		break;
+	}
+
+	LOG("RD R%u=%02x\n" , offset + 4 , res);
+	return res;
+}
+
+void hp98036_io_card_device::reg_w(address_space &space, offs_t offset, uint16_t data)
+{
+	LOG("WR R%u=%02x\n" , offset + 4 , data);
+
+	switch (offset) {
+	case 0:
+		// R4OUT
+		m_r4_dir = true;
+		m_wrrq = true;
+		m_r4out_data = data;
+		uart_wr();
+		update_flg();
+		break;
+
+	case 1:
+		// R5OUT
+		m_uart_cmd = BIT(data , 0);
+		m_tx_int_en = BIT(data , 1);
+		m_rx_int_en = BIT(data , 2);
+		m_int_en = BIT(data , 7);
+		if (BIT(data , 5)) {
+			int_reset();
+		} else {
+			uart_rd();
+			uart_wr();
+			update_irq();
+			update_flg();
+		}
+		break;
+
+	case 2:
+		// R6OUT
+		m_half_baud = BIT(data , 4);
+		m_lineout = data & 7;
+		break;
+
+	case 3:
+		// R7OUT
+		if (!m_r4_dir) {
+			m_rdrq = true;
+			uart_rd();
+			update_irq();
+			update_flg();
+		}
+		break;
+
+	default:
+		logerror("Unmapped write @%u\n" , offset);
+		break;
+	}
+}
+
+void hp98036_io_card_device::device_add_mconfig(machine_config &config)
+{
+	I8251(config , m_uart , 0);
+	m_uart->txd_handler().set(FUNC(hp98036_io_card_device::txd_w));
+	m_uart->dtr_handler().set(FUNC(hp98036_io_card_device::dtr_w));
+	m_uart->rts_handler().set(FUNC(hp98036_io_card_device::rts_w));
+	m_uart->rxrdy_handler().set(FUNC(hp98036_io_card_device::rxrdy_w));
+	m_uart->txrdy_handler().set(FUNC(hp98036_io_card_device::txrdy_w));
+
+	MC14411(config , m_clock_gen , 1.8432_MHz_XTAL);
+	m_clock_gen->out_f<1>().set(FUNC(hp98036_io_card_device::bit_rate_clock));
+	m_clock_gen->out_f<3>().set(FUNC(hp98036_io_card_device::bit_rate_clock));
+	m_clock_gen->out_f<5>().set(FUNC(hp98036_io_card_device::bit_rate_clock));
+	m_clock_gen->out_f<6>().set(FUNC(hp98036_io_card_device::bit_rate_clock));
+	m_clock_gen->out_f<7>().set(FUNC(hp98036_io_card_device::bit_rate_clock));
+	m_clock_gen->out_f<8>().set(FUNC(hp98036_io_card_device::bit_rate_clock));
+	m_clock_gen->out_f<9>().set(FUNC(hp98036_io_card_device::bit_rate_clock));
+	m_clock_gen->out_f<11>().set(FUNC(hp98036_io_card_device::bit_rate_clock));
+	m_clock_gen->out_f<13>().set(FUNC(hp98036_io_card_device::bit_rate_clock));
+	m_clock_gen->out_f<14>().set(FUNC(hp98036_io_card_device::bit_rate_clock));
+	m_clock_gen->out_f<12>().set(FUNC(hp98036_io_card_device::slow_clock));
+
+	RS232_PORT(config , m_rs232 , default_rs232_devices , nullptr);
+	m_rs232->rxd_handler().set(FUNC(hp98036_io_card_device::rxd_w));
+	m_rs232->dsr_handler().set(FUNC(hp98036_io_card_device::dsr_w));
+	m_rs232->cts_handler().set(FUNC(hp98036_io_card_device::cts_w));
+}
+
+static INPUT_PORTS_START(hp98036_port)
+	PORT_HP9845_IO_SC(11)
+
+	PORT_START("s1")
+	PORT_DIPNAME(3 , 3 , "Clock factor")
+	PORT_DIPLOCATION("S1:1,2")
+	PORT_DIPSETTING(1 , "x1")
+	PORT_DIPSETTING(2 , "x16")
+	PORT_DIPSETTING(3 , "x64")
+	PORT_DIPNAME(0x0c , 0x0c , "Character length")
+	PORT_DIPLOCATION("S1:3,4")
+	PORT_DIPSETTING(0x00 , "5")
+	PORT_DIPSETTING(0x04 , "6")
+	PORT_DIPSETTING(0x08 , "7")
+	PORT_DIPSETTING(0x0c , "8")
+	PORT_DIPNAME(0x10 , 0 , "Parity enable")
+	PORT_DIPLOCATION("S1:5")
+	PORT_DIPSETTING(0x00 , DEF_STR(Off))
+	PORT_DIPSETTING(0x10 , DEF_STR(On))
+	PORT_DIPNAME(0x20 , 0 , "Parity")
+	PORT_DIPLOCATION("S1:6")
+	PORT_DIPSETTING(0x00 , "Odd")
+	PORT_DIPSETTING(0x20 , "Even")
+	PORT_DIPNAME(0xc0 , 0xc0 , "Stop bits")
+	PORT_DIPLOCATION("S1:7,8")
+	PORT_DIPSETTING(0x40 , "1")
+	PORT_DIPSETTING(0x80 , "1.5")
+	PORT_DIPSETTING(0xc0 , "2")
+
+	PORT_START("s2")
+	PORT_DIPNAME(1 , 1 , "CTS")
+	PORT_DIPLOCATION("S2:1")
+	PORT_DIPSETTING(0 , "Device controlled")
+	PORT_DIPSETTING(1 , "Always active")
+
+	PORT_START("s3")
+	PORT_CONFNAME(0xf , 6 , "Baud rate")
+	PORT_CONFSETTING(0 , "9600")
+	PORT_CONFSETTING(1 , "4800")
+	PORT_CONFSETTING(2 , "2400")
+	PORT_CONFSETTING(3 , "1800")
+	PORT_CONFSETTING(4 , "1200")
+	PORT_CONFSETTING(5 , "600")
+	PORT_CONFSETTING(6 , "300")
+	PORT_CONFSETTING(7 , "150")
+	PORT_CONFSETTING(8 , "110")
+	PORT_CONFSETTING(9 , "75")
+
+	PORT_START("jumper")
+	PORT_CONFNAME(1 , 0 , "J1")
+	PORT_CONFSETTING(0 , DEF_STR(Off))
+	PORT_CONFSETTING(1 , DEF_STR(On))
+	PORT_CONFNAME(2 , 0 , "J2")
+	PORT_CONFSETTING(0 , DEF_STR(Off))
+	PORT_CONFSETTING(2 , DEF_STR(On))
+
+	PORT_START("loop")
+	PORT_CONFNAME(1 , 0 , "Test loopback")
+	PORT_CONFSETTING(0 , DEF_STR(Off))
+	PORT_CONFSETTING(1 , DEF_STR(On))
+INPUT_PORTS_END
+
+ioport_constructor hp98036_io_card_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(hp98036_port);
+}
+
+void hp98036_io_card_device::device_start()
+{
+	save_item(NAME(m_init_state));
+	save_item(NAME(m_irq));
+	save_item(NAME(m_int_en));
+	save_item(NAME(m_tx_int_en));
+	save_item(NAME(m_rx_int_en));
+	save_item(NAME(m_txrdy));
+	save_item(NAME(m_rxrdy));
+	save_item(NAME(m_wrrq));
+	save_item(NAME(m_rdrq));
+	save_item(NAME(m_uart_cmd));
+	save_item(NAME(m_uart_wr_mode));
+	save_item(NAME(m_flg));
+	save_item(NAME(m_half_baud));
+	save_item(NAME(m_baud_div));
+	save_item(NAME(m_r4_dir));
+	save_item(NAME(m_r4in_data));
+	save_item(NAME(m_r4out_data));
+	save_item(NAME(m_lineout));
+}
+
+void hp98036_io_card_device::device_reset()
+{
+	sts_w(true);
+
+	ioport_value baud_sel = m_s3_input->read();
+	m_clock_gen->timer_enable(mc14411_device::TIMER_F1 , baud_sel == 0);
+	m_clock_gen->timer_enable(mc14411_device::TIMER_F3 , baud_sel == 1);
+	m_clock_gen->timer_enable(mc14411_device::TIMER_F5 , baud_sel == 2);
+	m_clock_gen->timer_enable(mc14411_device::TIMER_F6 , baud_sel == 3);
+	m_clock_gen->timer_enable(mc14411_device::TIMER_F7 , baud_sel == 4);
+	m_clock_gen->timer_enable(mc14411_device::TIMER_F8 , baud_sel == 5);
+	m_clock_gen->timer_enable(mc14411_device::TIMER_F9 , baud_sel == 6);
+	m_clock_gen->timer_enable(mc14411_device::TIMER_F11 , baud_sel == 7);
+	m_clock_gen->timer_enable(mc14411_device::TIMER_F13 , baud_sel == 8);
+	m_clock_gen->timer_enable(mc14411_device::TIMER_F14 , baud_sel == 9);
+
+	m_loopback = m_loopback_en->read() != 0;
+
+	if (!m_loopback && BIT(m_s2_input->read() , 0)) {
+		m_uart->write_cts(0);
+	}
+
+	int_reset();
+}
+
+WRITE_LINE_MEMBER(hp98036_io_card_device::bit_rate_clock)
+{
+	if (m_half_baud) {
+		if (state) {
+			m_baud_div = !m_baud_div;
+			m_uart->write_txc(m_baud_div);
+			m_uart->write_rxc(m_baud_div);
+		}
+	} else {
+		m_uart->write_txc(state);
+		m_uart->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp98036_io_card_device::slow_clock)
+{
+	switch (m_init_state) {
+	case 0:
+		// Reset
+		if (state) {
+			m_init_state++;
+		}
+		break;
+
+	case 1:
+		// Write mode word
+		if (state) {
+			m_init_state++;
+		} else {
+			write_uart(true , uint8_t(m_s1_input->read()));
+		}
+		break;
+
+	case 2:
+		// Write default control word
+		if (state) {
+			m_init_state++;
+			update_flg();
+		} else {
+			write_uart(true , 0x05);
+		}
+		break;
+
+	default:
+		break;
+	}
+}
+
+WRITE_LINE_MEMBER(hp98036_io_card_device::txd_w)
+{
+	if (m_loopback) {
+		m_uart->write_rxd(state);
+	} else {
+		m_rs232->write_txd(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp98036_io_card_device::dtr_w)
+{
+	if (m_loopback) {
+		m_uart->write_dsr(state);
+	} else {
+		m_rs232->write_dtr(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp98036_io_card_device::rts_w)
+{
+	if (m_loopback) {
+		m_uart->write_cts(state);
+	} else {
+		m_rs232->write_rts(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp98036_io_card_device::txrdy_w)
+{
+	if (m_txrdy != state) {
+		m_txrdy = state;
+		LOG("txrdy %d\n" , m_txrdy);
+		uart_wr();
+		update_irq();
+		update_flg();
+	}
+}
+
+WRITE_LINE_MEMBER(hp98036_io_card_device::rxrdy_w)
+{
+	if (m_rxrdy != state) {
+		m_rxrdy = state;
+		LOG("rxrdy %d\n" , m_rxrdy);
+		uart_rd();
+		update_irq();
+		update_flg();
+	}
+}
+
+WRITE_LINE_MEMBER(hp98036_io_card_device::rxd_w)
+{
+	if (!m_loopback) {
+		m_uart->write_rxd(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp98036_io_card_device::dsr_w)
+{
+	if (!m_loopback) {
+		m_uart->write_dsr(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp98036_io_card_device::cts_w)
+{
+	if (!m_loopback && !BIT(m_s2_input->read() , 0)) {
+		m_uart->write_cts(state);
+	}
+}
+
+void hp98036_io_card_device::int_reset()
+{
+	m_init_state = 0;
+	m_r4in_data = 0;
+	m_r4out_data = 0;
+	m_wrrq = false;
+	m_rdrq = false;
+	m_int_en = false;
+	m_tx_int_en = false;
+	m_rx_int_en = false;
+	m_uart_cmd = false;
+	m_uart_wr_mode = true;
+	m_half_baud = false;
+	m_lineout = 0;
+	m_clock_gen->rate_select_w(0);
+	m_flg = true; // Ensure update in update_flg
+	update_flg();
+	m_irq = true; // Ensure update in update_irq
+	update_irq();
+	m_uart->reset();
+}
+
+void hp98036_io_card_device::update_flg()
+{
+	bool new_flg = (m_init_state == 3) && (!m_wrrq || m_tx_int_en) && (!m_rdrq || m_rx_int_en);
+
+	if (m_flg != new_flg) {
+		m_flg = new_flg;
+		LOG("FLG %d\n" , m_flg);
+		flg_w(m_flg);
+	}
+}
+
+void hp98036_io_card_device::update_irq()
+{
+	bool new_irq = m_int_en && ((m_tx_int_en && m_txrdy) || (m_rx_int_en && !m_rdrq));
+
+	if (m_irq != new_irq) {
+		m_irq = new_irq;
+		LOG("IRQ %d\n" , m_irq);
+		irq_w(m_irq);
+	}
+}
+
+void hp98036_io_card_device::uart_rd()
+{
+	if (m_rdrq && (m_rxrdy || m_uart_cmd)) {
+		m_rdrq = false;
+		m_r4in_data = m_uart->read(m_uart_cmd);
+		LOG("uart rd%d=%02x\n" , m_uart_cmd ,  m_r4in_data);
+		update_flg();
+	}
+}
+
+void hp98036_io_card_device::uart_wr()
+{
+	if (m_wrrq && (m_txrdy || m_uart_cmd)) {
+		m_wrrq = false;
+		write_uart(m_uart_cmd , m_r4out_data);
+		update_flg();
+	}
+}
+
+void hp98036_io_card_device::write_uart(bool cmd , uint8_t data)
+{
+	if (cmd && m_uart_wr_mode) {
+		// Capture bits 1 & 0 of mode word (clock factor) and
+		// adjust rate selection in clock generator
+		// Mode word    RSB/RSA Factor
+		// 0 0          0 0     -- INVALID --
+		// 0 1          0 0     x1
+		// 1 0          1 0     x16
+		// 1 1          1 1     x64
+		m_clock_gen->rate_select_w((BIT(data , 1) ? mc14411_device::RSB : 0) | ((BIT(data , 1) && BIT(data , 0)) ? mc14411_device::RSA : 0));
+		LOG("RS %u\n" , data & 3);
+	}
+	if (cmd) {
+		if (BIT(data , 6)) {
+			m_uart_wr_mode = !m_uart_wr_mode;
+		} else {
+			m_uart_wr_mode = false;
+		}
+	}
+	LOG("uart wr%d=%02x\n" , cmd , data);
+	m_uart->write(cmd , data);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/hp9845_io/98036.h mame-0.224+dfsg.1/src/devices/bus/hp9845_io/98036.h
--- mame-0.222+dfsg.1/src/devices/bus/hp9845_io/98036.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/hp9845_io/98036.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,96 @@
+// license:BSD-3-Clause
+// copyright-holders: F. Ulivi
+/*********************************************************************
+
+    98036.h
+
+    98036 module (RS232 interface)
+
+*********************************************************************/
+
+#ifndef MAME_BUS_HP9845_IO_98036_H
+#define MAME_BUS_HP9845_IO_98036_H
+
+#pragma once
+
+#include "hp9845_io.h"
+#include "machine/i8251.h"
+#include "machine/mc14411.h"
+#include "bus/rs232/rs232.h"
+
+class hp98036_io_card_device : public device_t, public device_hp9845_io_interface
+{
+public:
+	// construction/destruction
+	hp98036_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	virtual ~hp98036_io_card_device();
+
+	virtual uint16_t reg_r(address_space &space, offs_t offset) override;
+	virtual void reg_w(address_space &space, offs_t offset, uint16_t data) override;
+
+protected:
+	// device-level overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+private:
+	required_device<i8251_device> m_uart;
+	required_device<mc14411_device> m_clock_gen;
+	required_device<rs232_port_device> m_rs232;
+	required_ioport m_s1_input;
+	required_ioport m_s2_input;
+	required_ioport m_s3_input;
+	required_ioport m_jumper_input;
+	required_ioport m_loopback_en;
+
+	DECLARE_WRITE_LINE_MEMBER(bit_rate_clock);
+	DECLARE_WRITE_LINE_MEMBER(slow_clock);
+	DECLARE_WRITE_LINE_MEMBER(txd_w);
+	DECLARE_WRITE_LINE_MEMBER(dtr_w);
+	DECLARE_WRITE_LINE_MEMBER(rts_w);
+	DECLARE_WRITE_LINE_MEMBER(txrdy_w);
+	DECLARE_WRITE_LINE_MEMBER(rxrdy_w);
+	DECLARE_WRITE_LINE_MEMBER(rxd_w);
+	DECLARE_WRITE_LINE_MEMBER(dsr_w);
+	DECLARE_WRITE_LINE_MEMBER(cts_w);
+
+	// State of initialization FSM
+	// State U11A-Q U11B-Q
+	// 0     0      0
+	// 1     1      0      Load mode word
+	// 2     1      1      Load control word
+	// 3     0      1      Done
+	uint8_t m_init_state;
+	bool m_irq;         // U9-2
+	bool m_int_en;      // U10-2
+	bool m_tx_int_en;   // U10-10
+	bool m_rx_int_en;   // U10-7
+	bool m_txrdy;       // U31-15
+	bool m_rxrdy;       // U31-14
+	bool m_wrrq;        // U19-13
+	bool m_rdrq;        // U19-7
+	bool m_uart_cmd;    // U10-15
+	bool m_uart_wr_mode;// U17-15
+	bool m_flg;         // U9-10
+	bool m_half_baud;   // U21-13
+	bool m_baud_div;    // U21-1
+	bool m_r4_dir;      // U19-4
+	bool m_loopback;
+	uint8_t m_r4in_data;    // U29, U30
+	uint8_t m_r4out_data;   // U26, U27
+	uint8_t m_lineout;  // U28
+
+	void int_reset();
+	void update_flg();
+	void update_irq();
+	void uart_rd();
+	void uart_wr();
+	void write_uart(bool cmd , uint8_t data);
+};
+
+// device type definitions
+DECLARE_DEVICE_TYPE(HP98036_IO_CARD, hp98036_io_card_device)
+
+#endif // MAME_BUS_HP9845_IO_98036_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/hp9845_io/hp9845_io.cpp mame-0.224+dfsg.1/src/devices/bus/hp9845_io/hp9845_io.cpp
--- mame-0.222+dfsg.1/src/devices/bus/hp9845_io/hp9845_io.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/hp9845_io/hp9845_io.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,6 +12,7 @@
 #include "hp9845_io.h"
 #include "98032.h"
 #include "98035.h"
+#include "98036.h"
 #include "98034.h"
 #include "98046.h"
 
@@ -36,6 +37,7 @@
 	option_add("98032_gpio" , HP98032_IO_CARD);
 	option_add("98034_hpib" , HP98034_IO_CARD);
 	option_add("98035_rtc" , HP98035_IO_CARD);
+	option_add("98036" , HP98036_IO_CARD);
 	option_add("98046" , HP98046_IO_CARD);
 	set_default_option(nullptr);
 	set_fixed(false);
diff -Nru mame-0.222+dfsg.1/src/devices/bus/hp_hil/hlemouse.cpp mame-0.224+dfsg.1/src/devices/bus/hp_hil/hlemouse.cpp
--- mame-0.222+dfsg.1/src/devices/bus/hp_hil/hlemouse.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/hp_hil/hlemouse.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -41,6 +41,8 @@
 void hle_hp_46060b_device::device_reset()
 {
 	m_fifo.clear();
+
+	mouse_x_delta = mouse_y_delta = 0;
 }
 
 int hle_hp_46060b_device::hil_poll()
diff -Nru mame-0.222+dfsg.1/src/devices/bus/hp_ipc_io/82919.cpp mame-0.224+dfsg.1/src/devices/bus/hp_ipc_io/82919.cpp
--- mame-0.222+dfsg.1/src/devices/bus/hp_ipc_io/82919.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/hp_ipc_io/82919.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,252 @@
+// license:BSD-3-Clause
+// copyright-holders: F. Ulivi
+/*********************************************************************
+
+    82919.cpp
+
+    82919 module (RS232 interface)
+
+    Main reference for this module is:
+    HP 82919-90009, feb 85, HP82919A Integral PC Serial Interface -
+    Component level service manual
+
+*********************************************************************/
+
+#include "emu.h"
+#include "82919.h"
+#include "coreutil.h"
+
+// Debugging
+#define VERBOSE 0
+#include "logmacro.h"
+
+// Bit manipulation
+namespace {
+	template<typename T> constexpr T BIT_MASK(unsigned n)
+	{
+		return (T)1U << n;
+	}
+
+	template<typename T> void BIT_SET(T& w , unsigned n)
+	{
+		w |= BIT_MASK<T>(n);
+	}
+}
+
+hp82919_io_card_device::hp82919_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig , HP82919_IO_CARD , tag , owner , clock)
+	, device_hp_ipc_io_interface(mconfig, *this)
+	, m_rs232_prim(*this , "rs232_prim")
+	, m_rs232_sec(*this , "rs232_sec")
+	, m_uart(*this , "uart")
+	, m_loopback_en(*this, "loop")
+{
+}
+
+hp82919_io_card_device::~hp82919_io_card_device()
+{
+}
+
+uint8_t hp82919_io_card_device::read(offs_t addr)
+{
+	uint8_t res = 0;
+	offs_t uart_addr = (addr ^ 0xc) & 0xf;
+
+	if (BIT(addr , 4)) {
+		res = m_uart->read(uart_addr);
+	} else {
+		// 2 is 82919 ID code
+		res = 2;
+		res |= (m_int_level << 4);
+		if (m_int_pending) {
+			BIT_SET(res , 6);
+		}
+		if (m_int_en) {
+			BIT_SET(res , 7);
+		}
+		m_uart->write(uart_addr , res);
+	}
+	LOG("RD %04x=%02x\n" , addr , res);
+	return res;
+}
+
+void hp82919_io_card_device::write(offs_t addr , uint8_t data)
+{
+	LOG("WR %04x=%02x\n" , addr , data);
+	offs_t uart_addr = (addr ^ 0xc) & 0xf;
+	m_uart->write(uart_addr , data);
+	if (!BIT(addr , 4)) {
+		m_int_level = (data >> 4) & 3;
+		m_int_forced = BIT(data , 6);
+		m_int_en = BIT(data , 7);
+		update_irq();
+	}
+}
+
+WRITE_LINE_MEMBER(hp82919_io_card_device::uart_irq)
+{
+	m_uart_int = state;
+	update_irq();
+}
+
+WRITE_LINE_MEMBER(hp82919_io_card_device::uart_a_tx)
+{
+	m_rs232_prim->write_txd(state);
+	if (m_loopback) {
+		m_uart->rx_b_w(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp82919_io_card_device::uart_b_tx)
+{
+	m_rs232_sec->write_txd(state);
+	if (m_loopback) {
+		m_uart->rx_a_w(state);
+	}
+}
+
+void hp82919_io_card_device::uart_output(uint8_t data)
+{
+	m_rs232_prim->write_dtr(BIT(data , 0));
+	m_rs232_prim->write_rts(BIT(data , 1));
+	// b2 is TxClock
+	m_rs232_prim->write_spds(BIT(data , 3));
+	m_rs232_sec->write_rts(BIT(data , 4));
+	if (m_loopback) {
+		m_uart->ip0_w(BIT(data , 0));
+		m_uart->ip1_w(BIT(data , 1));
+		m_uart->ip2_w(BIT(data , 2));
+		m_uart->ip3_w(BIT(data , 3));
+		m_uart->ip4_w(BIT(data , 4));
+		m_uart->ip5_w(BIT(data , 4));
+	}
+}
+
+WRITE_LINE_MEMBER(hp82919_io_card_device::prim_rxd)
+{
+	if (!m_loopback) {
+		m_uart->rx_a_w(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp82919_io_card_device::prim_dcd)
+{
+	if (!m_loopback) {
+		m_uart->ip3_w(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp82919_io_card_device::prim_dsr)
+{
+	if (!m_loopback) {
+		m_uart->ip1_w(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp82919_io_card_device::prim_ri)
+{
+	if (!m_loopback) {
+		m_uart->ip2_w(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp82919_io_card_device::prim_cts)
+{
+	if (!m_loopback) {
+		m_uart->ip0_w(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp82919_io_card_device::sec_rxd)
+{
+	if (!m_loopback) {
+		m_uart->rx_b_w(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp82919_io_card_device::sec_dcd)
+{
+	if (!m_loopback) {
+		m_uart->ip5_w(state);
+	}
+}
+
+WRITE_LINE_MEMBER(hp82919_io_card_device::sec_cts)
+{
+	if (!m_loopback) {
+		m_uart->ip4_w(state);
+	}
+}
+
+void hp82919_io_card_device::install_read_write_handlers(address_space& space , uint32_t base_addr)
+{
+	offs_t end_addr = base_addr + 0xffffU;
+
+	// Supervisor mode
+	space.install_readwrite_handler(base_addr, end_addr, read8sm_delegate(*this, FUNC(hp82919_io_card_device::read)), write8sm_delegate(*this, FUNC(hp82919_io_card_device::write)), 0x00ff);
+	// User mode
+	space.install_readwrite_handler(base_addr + USER_SPACE_OFFSET, end_addr + USER_SPACE_OFFSET, read8sm_delegate(*this, FUNC(hp82919_io_card_device::read)), write8sm_delegate(*this, FUNC(hp82919_io_card_device::write)), 0x00ff);
+}
+
+void hp82919_io_card_device::device_start()
+{
+}
+
+void hp82919_io_card_device::device_reset()
+{
+	m_loopback = m_loopback_en->read() != 0;
+	m_int_level = 0;
+	m_int_forced = false;
+	m_int_en = false;
+	m_uart_int = false;
+	m_irq = true;
+	update_irq();
+}
+
+void hp82919_io_card_device::device_add_mconfig(machine_config &config)
+{
+	RS232_PORT(config, m_rs232_prim, default_rs232_devices, nullptr);
+	RS232_PORT(config, m_rs232_sec, default_rs232_devices, nullptr);
+
+	MC68681(config , m_uart , 3.6864_MHz_XTAL);
+	m_uart->irq_cb().set(FUNC(hp82919_io_card_device::uart_irq));
+	m_uart->a_tx_cb().set(FUNC(hp82919_io_card_device::uart_a_tx));
+	m_uart->b_tx_cb().set(FUNC(hp82919_io_card_device::uart_b_tx));
+	m_uart->outport_cb().set(FUNC(hp82919_io_card_device::uart_output));
+
+	m_rs232_prim->rxd_handler().set(FUNC(hp82919_io_card_device::prim_rxd));
+	m_rs232_prim->dcd_handler().set(FUNC(hp82919_io_card_device::prim_dcd));
+	m_rs232_prim->dsr_handler().set(FUNC(hp82919_io_card_device::prim_dsr));
+	m_rs232_prim->ri_handler().set(FUNC(hp82919_io_card_device::prim_ri));
+	m_rs232_prim->cts_handler().set(FUNC(hp82919_io_card_device::prim_cts));
+
+	m_rs232_sec->rxd_handler().set(FUNC(hp82919_io_card_device::sec_rxd));
+	m_rs232_sec->dcd_handler().set(FUNC(hp82919_io_card_device::sec_dcd));
+	m_rs232_sec->cts_handler().set(FUNC(hp82919_io_card_device::sec_cts));
+}
+
+static INPUT_PORTS_START(hp82919_port)
+	PORT_START("loop")
+	PORT_CONFNAME(1 , 0 , "Test loopback")
+	PORT_CONFSETTING(0 , DEF_STR(Off))
+	PORT_CONFSETTING(1 , DEF_STR(On))
+INPUT_PORTS_END
+
+ioport_constructor hp82919_io_card_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(hp82919_port);
+}
+
+void hp82919_io_card_device::update_irq()
+{
+	m_int_pending = m_int_forced || m_uart_int;
+	bool irq = m_int_en && m_int_pending;
+	if (m_irq != irq) {
+		m_irq = irq;
+		LOG("IRQ %u=%d\n" , m_int_level , irq);
+		irq_w(m_int_level , irq);
+	}
+}
+
+// device type definition
+DEFINE_DEVICE_TYPE(HP82919_IO_CARD, hp82919_io_card_device, "hp82919", "HP82919 card")
diff -Nru mame-0.222+dfsg.1/src/devices/bus/hp_ipc_io/82919.h mame-0.224+dfsg.1/src/devices/bus/hp_ipc_io/82919.h
--- mame-0.222+dfsg.1/src/devices/bus/hp_ipc_io/82919.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/hp_ipc_io/82919.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,73 @@
+// license:BSD-3-Clause
+// copyright-holders: F. Ulivi
+/*********************************************************************
+
+    82919.h
+
+    82919 module (RS232 interface)
+
+*********************************************************************/
+
+#ifndef MAME_BUS_HP_IPC_IO_82919_H
+#define MAME_BUS_HP_IPC_IO_82919_H
+
+#pragma once
+
+#include "hp_ipc_io.h"
+#include "machine/mc68681.h"
+#include "bus/rs232/rs232.h"
+
+class hp82919_io_card_device : public device_t, public device_hp_ipc_io_interface
+{
+public:
+	// construction/destruction
+	hp82919_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	virtual ~hp82919_io_card_device();
+
+	uint8_t read(offs_t addr);
+	void write(offs_t addr , uint8_t data);
+
+	DECLARE_WRITE_LINE_MEMBER(uart_irq);
+	DECLARE_WRITE_LINE_MEMBER(uart_a_tx);
+	DECLARE_WRITE_LINE_MEMBER(uart_b_tx);
+	void uart_output(uint8_t data);
+	DECLARE_WRITE_LINE_MEMBER(prim_rxd);
+	DECLARE_WRITE_LINE_MEMBER(prim_dcd);
+	DECLARE_WRITE_LINE_MEMBER(prim_dsr);
+	DECLARE_WRITE_LINE_MEMBER(prim_ri);
+	DECLARE_WRITE_LINE_MEMBER(prim_cts);
+	DECLARE_WRITE_LINE_MEMBER(sec_rxd);
+	DECLARE_WRITE_LINE_MEMBER(sec_dcd);
+	DECLARE_WRITE_LINE_MEMBER(sec_cts);
+
+protected:
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// device-level overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
+
+	virtual void install_read_write_handlers(address_space& space , uint32_t base_addr) override;
+
+private:
+	required_device<rs232_port_device> m_rs232_prim;
+	required_device<rs232_port_device> m_rs232_sec;
+	required_device<mc68681_device> m_uart;
+	required_ioport m_loopback_en;
+
+	uint8_t m_int_level;
+	bool m_int_en;
+	bool m_int_forced;
+	bool m_int_pending;
+	bool m_uart_int;
+	bool m_irq;
+	bool m_loopback;
+
+	void update_irq();
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(HP82919_IO_CARD, hp82919_io_card_device)
+
+#endif // MAME_BUS_HP_IPC_IO_82919_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/hp_ipc_io/hp_ipc_io.cpp mame-0.224+dfsg.1/src/devices/bus/hp_ipc_io/hp_ipc_io.cpp
--- mame-0.222+dfsg.1/src/devices/bus/hp_ipc_io/hp_ipc_io.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/hp_ipc_io/hp_ipc_io.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,86 @@
+// license:BSD-3-Clause
+// copyright-holders: F. Ulivi
+/*********************************************************************
+
+    hp_ipc_io.cpp
+
+    I/O bus of HP IPC system
+
+*********************************************************************/
+
+#include "emu.h"
+#include "hp_ipc_io.h"
+
+// Debugging
+#define VERBOSE 0
+#include "logmacro.h"
+
+// device type definition
+DEFINE_DEVICE_TYPE(HP_IPC_IO_SLOT, hp_ipc_io_slot_device, "hp_ipc_io_slot", "HP IPC I/O Slot")
+
+// +---------------------+
+// |hp_ipc_io_slot_device|
+// +---------------------+
+hp_ipc_io_slot_device::hp_ipc_io_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, HP_IPC_IO_SLOT, tag, owner, clock),
+	device_single_card_slot_interface<device_hp_ipc_io_interface>(mconfig, *this),
+	m_irq_cb_func(*this),
+	m_slot_idx(0)
+{
+}
+
+hp_ipc_io_slot_device::~hp_ipc_io_slot_device()
+{
+}
+
+void hp_ipc_io_slot_device::device_start()
+{
+	m_irq_cb_func.resolve_all_safe();
+}
+
+uint32_t hp_ipc_io_slot_device::get_slot_base_addr() const
+{
+	return m_slot_idx ? 0x710000 : 0x700000;
+}
+
+void hp_ipc_io_slot_device::install_read_write_handlers(address_space& space)
+{
+	device_hp_ipc_io_interface *card = get_card_device();
+
+	if (card != nullptr) {
+		card->install_read_write_handlers(space , get_slot_base_addr());
+	}
+}
+
+void hp_ipc_io_slot_device::irq_w(unsigned idx , bool state)
+{
+	m_irq_cb_func[ 0 ](state && idx == 0);
+	m_irq_cb_func[ 1 ](state && idx == 1);
+	m_irq_cb_func[ 2 ](state && idx == 2);
+	m_irq_cb_func[ 3 ](state && idx == 3);
+}
+
+// +--------------------------+
+// |device_hp_ipc_io_interface|
+// +--------------------------+
+device_hp_ipc_io_interface::device_hp_ipc_io_interface(const machine_config &mconfig, device_t &device) :
+	device_interface(device, "hp_ipcio")
+{
+}
+
+device_hp_ipc_io_interface::~device_hp_ipc_io_interface()
+{
+}
+
+void device_hp_ipc_io_interface::irq_w(unsigned idx , bool state)
+{
+	hp_ipc_io_slot_device *slot = downcast<hp_ipc_io_slot_device *>(device().owner());
+	slot->irq_w(idx , state);
+}
+
+#include "82919.h"
+
+void hp_ipc_io_slot_devices(device_slot_interface &device)
+{
+	device.option_add("82919_serial" , HP82919_IO_CARD);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/hp_ipc_io/hp_ipc_io.h mame-0.224+dfsg.1/src/devices/bus/hp_ipc_io/hp_ipc_io.h
--- mame-0.222+dfsg.1/src/devices/bus/hp_ipc_io/hp_ipc_io.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/hp_ipc_io/hp_ipc_io.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,82 @@
+// license:BSD-3-Clause
+// copyright-holders: F. Ulivi
+/*********************************************************************
+
+    hp_ipc_io.h
+
+    I/O bus of HP IPC system
+
+*********************************************************************/
+
+#ifndef MAME_BUS_HP_IPC_IO_HP_IPC_IO_H
+#define MAME_BUS_HP_IPC_IO_HP_IPC_IO_H
+
+#pragma once
+
+void hp_ipc_io_slot_devices(device_slot_interface &device);
+
+class device_hp_ipc_io_interface;
+
+class hp_ipc_io_slot_device : public device_t,
+							  public device_single_card_slot_interface<device_hp_ipc_io_interface>
+{
+public:
+	// construction/destruction
+	hp_ipc_io_slot_device(machine_config const &mconfig, char const *tag, device_t *owner)
+		: hp_ipc_io_slot_device(mconfig, tag, owner, (uint32_t)0)
+	{
+		option_reset();
+		hp_ipc_io_slot_devices(*this);
+		set_default_option(nullptr);
+		set_fixed(false);
+	}
+
+	hp_ipc_io_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	virtual ~hp_ipc_io_slot_device();
+
+	// Set A/B slot
+	void set_slot_idx(unsigned idx) { m_slot_idx = idx; }
+
+	// Callback setups
+	auto irq3_cb() { return m_irq_cb_func[ 0 ].bind(); }
+	auto irq4_cb() { return m_irq_cb_func[ 1 ].bind(); }
+	auto irq5_cb() { return m_irq_cb_func[ 2 ].bind(); }
+	auto irq6_cb() { return m_irq_cb_func[ 3 ].bind(); }
+
+	uint32_t get_slot_base_addr() const;
+
+	void install_read_write_handlers(address_space& space);
+
+	void irq_w(unsigned idx , bool state);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+
+private:
+	devcb_write_line::array<4> m_irq_cb_func;
+	// 0: slot A
+	// 1: slot B
+	unsigned m_slot_idx;
+};
+
+class device_hp_ipc_io_interface : public device_interface
+{
+public:
+	virtual ~device_hp_ipc_io_interface();
+
+	virtual void install_read_write_handlers(address_space& space , uint32_t base_addr) = 0;
+
+	static constexpr offs_t USER_SPACE_OFFSET = 0x1800000;
+
+protected:
+	device_hp_ipc_io_interface(const machine_config &mconfig, device_t &device);
+
+	// card device handling
+	void irq_w(unsigned idx , bool state);
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(HP_IPC_IO_SLOT, hp_ipc_io_slot_device)
+
+#endif // MAME_BUS_HP_IPC_IO_HP_IPC_IO_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/ieee488/grid2102.h mame-0.224+dfsg.1/src/devices/bus/ieee488/grid2102.h
--- mame-0.222+dfsg.1/src/devices/bus/ieee488/grid2102.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/ieee488/grid2102.h	2020-08-26 08:57:19.000000000 +0000
@@ -13,8 +13,9 @@
 
 #include "ieee488.h"
 
-#include <vector>
 #include <queue>
+#include <vector>
+
 
 //**************************************************************************
 //  TYPE DEFINITIONS
diff -Nru mame-0.222+dfsg.1/src/devices/bus/ieee488/hp9122c.h mame-0.224+dfsg.1/src/devices/bus/ieee488/hp9122c.h
--- mame-0.222+dfsg.1/src/devices/bus/ieee488/hp9122c.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/ieee488/hp9122c.h	2020-08-26 08:57:19.000000000 +0000
@@ -109,9 +109,9 @@
 	DECLARE_WRITE_LINE_MEMBER(fdc_intrq_w);
 	DECLARE_WRITE_LINE_MEMBER(fdc_drq_w);
 
-	void cmd_w(uint8_t data);;
+	void cmd_w(uint8_t data);
 	uint8_t status_r();
-	void clridx_w(uint8_t data);;
+	void clridx_w(uint8_t data);
 
 	void cpu_map(address_map &map);
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/isa/acb2072.cpp mame-0.224+dfsg.1/src/devices/bus/isa/acb2072.cpp
--- mame-0.222+dfsg.1/src/devices/bus/isa/acb2072.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/isa/acb2072.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,118 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***************************************************************************
+
+    Adaptec ACB-2072 RLL Drive Controller
+
+    The PCB features the following ASICs:
+    — AIC-010FL Programmable Mass Storage Controller
+    — AIC-270L 2,7 RLL Encoder/Decoder
+    — AIC-280L (?)
+    — AIC-530L (bus interface?)
+    — AIC-540L (bus interface?)
+    — AIC-6225-15 High-Performance Monolithic Data Separator
+
+    In addition, there is a custom-badged “ACB-2072” 44-pin AMD PLCC which,
+    given that it also bears a 1980 Intel copyright as well as Adaptec's,
+    is almost certainly a Am8051, Am8053 or equivalent MCU with internal
+    ROM. A later revision replaces this IC with a Siemens SAB8052A.
+
+***************************************************************************/
+
+#include "emu.h"
+#include "acb2072.h"
+
+#include "cpu/mcs51/mcs51.h"
+
+// device type definition
+DEFINE_DEVICE_TYPE(ACB2072, acb2072_device, "acb2072", "ACB-2072 RLL Drive Controller")
+
+
+acb2072_device::acb2072_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: device_t(mconfig, ACB2072, tag, owner, clock)
+	, device_isa8_card_interface(mconfig, *this)
+	, m_mcu(*this, "mcu")
+	, m_bios(*this, "bios")
+{
+}
+
+void acb2072_device::device_start()
+{
+}
+
+void acb2072_device::device_reset()
+{
+}
+
+
+static INPUT_PORTS_START(acb2072)
+	PORT_START("ADDR")
+	PORT_DIPNAME(0x07, 0x07, "BIOS Address") PORT_DIPLOCATION("J8:3,4,1") // BD, W-X, U-V
+	PORT_DIPSETTING(0x03, "Disabled")
+	PORT_DIPSETTING(0x07, "C800")
+	PORT_DIPSETTING(0x05, "CA00")
+	PORT_DIPSETTING(0x04, "CC00")
+	PORT_DIPSETTING(0x06, "F400")
+	PORT_DIPNAME(0x08, 0x08, "Port Address") PORT_DIPLOCATION("J8:2") // 324
+	PORT_DIPSETTING(0x08, "Normal")
+	PORT_DIPSETTING(0x00, "Alternate (324)")
+	PORT_DIPNAME(0x10, 0x10, "Reserved") PORT_DIPLOCATION("J5:3") // E-F
+	PORT_DIPSETTING(0x10, DEF_STR(Off))
+	PORT_DIPSETTING(0x00, DEF_STR(On))
+	PORT_DIPNAME(0x20, 0x20, "Reserved") PORT_DIPLOCATION("J5:4") // G-H
+	PORT_DIPSETTING(0x20, DEF_STR(Off))
+	PORT_DIPSETTING(0x00, DEF_STR(On))
+	PORT_DIPNAME(0x40, 0x40, "Reserved") PORT_DIPLOCATION("J5:5") // I-J
+	PORT_DIPSETTING(0x40, DEF_STR(Off))
+	PORT_DIPSETTING(0x00, DEF_STR(On))
+
+	PORT_START("TABLES")
+	PORT_DIPNAME(0x03, 0x03, "Drive 0 Defaults") PORT_DIPLOCATION("J9:2,1") // M-N, O-P
+	PORT_DIPSETTING(0x00, "4 Heads, 612 Cylinders (30 MB)")
+	PORT_DIPSETTING(0x01, "2 Heads, 612 Cylinders (15 MB)")
+	PORT_DIPSETTING(0x02, "5 Heads, 981 Cylinders (60 MB)")
+	PORT_DIPSETTING(0x03, "4 Heads, 615 Cylinders (20 MB)")
+	PORT_DIPNAME(0x0c, 0x0c, "Drive 1 Defaults") PORT_DIPLOCATION("J9:4,3") // Q-R, S-T
+	PORT_DIPSETTING(0x00, "4 Heads, 612 Cylinders (30 MB)")
+	PORT_DIPSETTING(0x04, "2 Heads, 612 Cylinders (15 MB)")
+	PORT_DIPSETTING(0x08, "5 Heads, 981 Cylinders (60 MB)")
+	PORT_DIPSETTING(0x0c, "4 Heads, 615 Cylinders (20 MB)")
+	PORT_DIPNAME(0x10, 0x10, "Drive 0 Type") PORT_DIPLOCATION("J5:1") // A-B
+	PORT_DIPSETTING(0x10, "Normal")
+	PORT_DIPSETTING(0x00, "Syquest")
+	PORT_DIPNAME(0x20, 0x20, "Drive 1 Type") PORT_DIPLOCATION("J5:2") // C-D
+	PORT_DIPSETTING(0x20, "Normal")
+	PORT_DIPSETTING(0x00, "Syquest")
+	PORT_DIPNAME(0x40, 0x40, "Self Diagnostics") PORT_DIPLOCATION("J5:6") // K-L
+	PORT_DIPSETTING(0x40, DEF_STR(Off))
+	PORT_DIPSETTING(0x00, DEF_STR(On))
+INPUT_PORTS_END
+
+ioport_constructor acb2072_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(acb2072);
+}
+
+void acb2072_device::device_add_mconfig(machine_config &config)
+{
+	// XTAL is marked 49S150
+	AM8753(config, m_mcu, 15_MHz_XTAL / 2).set_disable();
+}
+
+
+ROM_START(acb2072)
+	ROM_REGION(0x2000, "bios", 0)
+	ROM_SYSTEM_BIOS(0, "b", "Rev. B")
+	ROMX_LOAD("adaptec_inc_408100k_bios_1987_411503_00b.u11", 0x0000, 0x2000, CRC(1b1a854e) SHA1(3550ae7a94e03e77f40bff91024dfc9aed8f6c2f), ROM_BIOS(0)) // M2764AFI
+	ROM_SYSTEM_BIOS(1, "a", "Rev. A")
+	ROMX_LOAD("adaptec_acb2072_bios_408100_h_411503-00a.u11", 0x0000, 0x2000, CRC(5ca303cf) SHA1(82800005d532f0dc35cbf9ea6af75a97cb8b2e71), ROM_BIOS(1))
+
+	ROM_REGION(0x2000, "mcu", 0)
+	ROM_LOAD("adaptec_inc_c86_acb-2072_408101-00b.u8", 0x0000, 0x2000, NO_DUMP)
+	//ROM_LOAD("adaptec_inc_c86_acb-2072mcode_408101-00c.u8", 0x0000, 0x2000, NO_DUMP) // SAB8052A-N
+ROM_END
+
+const tiny_rom_entry *acb2072_device::device_rom_region() const
+{
+	return ROM_NAME(acb2072);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/isa/acb2072.h mame-0.224+dfsg.1/src/devices/bus/isa/acb2072.h
--- mame-0.222+dfsg.1/src/devices/bus/isa/acb2072.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/isa/acb2072.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,38 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***************************************************************************
+
+    Adaptec ACB-2072 RLL Drive Controller
+
+***************************************************************************/
+
+#ifndef MAME_BUS_ISA_ACB2072_H
+#define MAME_BUS_ISA_ACB2072_H
+
+#pragma once
+
+#include "isa.h"
+
+class acb2072_device : public device_t, public device_isa8_card_interface
+{
+public:
+	acb2072_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+	static constexpr feature_type unemulated_features() { return feature::DISK; }
+
+protected:
+	virtual void device_start() override;
+	virtual void device_reset() override;
+	virtual ioport_constructor device_input_ports() const override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
+
+private:
+	required_device<cpu_device> m_mcu;
+	required_region_ptr<u8> m_bios;
+};
+
+// device type declaration
+DECLARE_DEVICE_TYPE(ACB2072, acb2072_device)
+
+#endif // MAME_BUS_ISA_ACB2072_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/isa/aha1542c.cpp mame-0.224+dfsg.1/src/devices/bus/isa/aha1542c.cpp
--- mame-0.222+dfsg.1/src/devices/bus/isa/aha1542c.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/isa/aha1542c.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -99,6 +99,13 @@
 http://download.adaptec.com/pdfs/installation_guides/aha1540cf_ig.pdf
  */
 
+/*
+Adaptec QFP ASICs
+— AHA-1540/42C: AIC-???? (covered by sticker)
+— AHA-1540/42CP: AIC-7970Q
+— AHA-1540/42CF: AIC-3370P, AIC-???? (covered by sticker)
+*/
+
 #include "emu.h"
 #include "aha1542c.h"
 #include "cpu/z80/z80.h"
@@ -141,7 +148,7 @@
 #define CMD_NOP         0x00    // No operation
 #define CMD_MBINIT      0x01    // mailbox initialization
 #define CMD_START_SCSI  0x02    // Start SCSI command
-#define CMD_BIOSCMD     0x03    // undocumented BIOS conmmand (shadow RAM etc.)
+#define CMD_BIOSCMD     0x03    // undocumented BIOS command (shadow RAM etc.)
 #define CMD_INQUIRY     0x04    // Adapter inquiry
 #define CMD_EMBOI       0x05    // enable Mailbox Out Interrupt
 #define CMD_SELTIMEOUT  0x06    // Set SEL timeout
diff -Nru mame-0.222+dfsg.1/src/devices/bus/isa/gblaster.cpp mame-0.224+dfsg.1/src/devices/bus/isa/gblaster.cpp
--- mame-0.222+dfsg.1/src/devices/bus/isa/gblaster.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/isa/gblaster.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -72,12 +72,12 @@
 {
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
-	SAA1099(config, m_saa1099_1, 7159090);
-	m_saa1099_1->add_route(ALL_OUTPUTS, "lspeaker", 0.50);
-	m_saa1099_1->add_route(ALL_OUTPUTS, "rspeaker", 0.50);
-	SAA1099(config, m_saa1099_2, 7159090);
-	m_saa1099_2->add_route(ALL_OUTPUTS, "lspeaker", 0.50);
-	m_saa1099_2->add_route(ALL_OUTPUTS, "rspeaker", 0.50);
+	SAA1099(config, m_saa1099_1, XTAL(14'318'181) / 2); // or CMS-301, from OSC pin in ISA bus
+	m_saa1099_1->add_route(0, "lspeaker", 0.50);
+	m_saa1099_1->add_route(1, "rspeaker", 0.50);
+	SAA1099(config, m_saa1099_2, XTAL(14'318'181) / 2); // or CMS-301, from OSC pin in ISA bus
+	m_saa1099_2->add_route(0, "lspeaker", 0.50);
+	m_saa1099_2->add_route(1, "rspeaker", 0.50);
 }
 
 //**************************************************************************
diff -Nru mame-0.222+dfsg.1/src/devices/bus/isa/isa_cards.cpp mame-0.224+dfsg.1/src/devices/bus/isa/isa_cards.cpp
--- mame-0.222+dfsg.1/src/devices/bus/isa/isa_cards.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/isa/isa_cards.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -33,6 +33,7 @@
 #include "ide.h"
 #include "xtide.h"
 #include "side116.h"
+#include "acb2072.h"
 #include "aha1542b.h"
 #include "aha1542c.h"
 #include "aha174x.h"
@@ -135,6 +136,7 @@
 	device.option_add("epc_mda", ISA8_EPC_MDA);
 	device.option_add("epc_twib", ISA8_EIS_TWIB);
 	device.option_add("babyblue2", ISA8_BABYBLUE2);
+	device.option_add("acb2072", ACB2072);
 }
 
 void pc_isa16_cards(device_slot_interface &device)
@@ -179,6 +181,7 @@
 	device.option_add("epc_mda", ISA8_EPC_MDA);
 	device.option_add("epc_twib", ISA8_EIS_TWIB);
 	device.option_add("babyblue2", ISA8_BABYBLUE2);
+	device.option_add("acb2072", ACB2072);
 	// 16-bit
 	device.option_add("ide", ISA16_IDE);
 	device.option_add("ne2000", NE2000);
diff -Nru mame-0.222+dfsg.1/src/devices/bus/isa/sblaster.cpp mame-0.224+dfsg.1/src/devices/bus/isa/sblaster.cpp
--- mame-0.222+dfsg.1/src/devices/bus/isa/sblaster.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/isa/sblaster.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1171,13 +1171,13 @@
 	m_ym3812->add_route(ALL_OUTPUTS, "lspeaker", 3.0);
 	m_ym3812->add_route(ALL_OUTPUTS, "rspeaker", 3.0);
 
-	SAA1099(config, m_saa1099_1, 7159090);
-	m_saa1099_1->add_route(ALL_OUTPUTS, "lspeaker", 0.5);
-	m_saa1099_1->add_route(ALL_OUTPUTS, "rspeaker", 0.5);
+	SAA1099(config, m_saa1099_1, XTAL(14'318'181) / 2); // or CMS-301, from OSC pin in ISA bus
+	m_saa1099_1->add_route(0, "lspeaker", 0.5);
+	m_saa1099_1->add_route(1, "rspeaker", 0.5);
 
-	SAA1099(config, m_saa1099_2, 7159090);
-	m_saa1099_2->add_route(ALL_OUTPUTS, "lspeaker", 0.5);
-	m_saa1099_2->add_route(ALL_OUTPUTS, "rspeaker", 0.5);
+	SAA1099(config, m_saa1099_2, XTAL(14'318'181) / 2); // or CMS-301, from OSC pin in ISA bus
+	m_saa1099_2->add_route(0, "lspeaker", 0.5);
+	m_saa1099_2->add_route(1, "rspeaker", 0.5);
 }
 
 void isa8_sblaster1_5_device::device_add_mconfig(machine_config &config)
diff -Nru mame-0.222+dfsg.1/src/devices/bus/lpci/pci.h mame-0.224+dfsg.1/src/devices/bus/lpci/pci.h
--- mame-0.222+dfsg.1/src/devices/bus/lpci/pci.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/lpci/pci.h	2020-08-26 08:57:19.000000000 +0000
@@ -12,7 +12,6 @@
 #define MAME_BUS_LPCI_PCI_H
 
 #pragma once
-#include <forward_list>
 
 //**************************************************************************
 //  TYPE DEFINITIONS
diff -Nru mame-0.222+dfsg.1/src/devices/bus/mackbd/keyboard.cpp mame-0.224+dfsg.1/src/devices/bus/mackbd/keyboard.cpp
--- mame-0.222+dfsg.1/src/devices/bus/mackbd/keyboard.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/mackbd/keyboard.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,880 @@
+// license: BSD-3-Clause
+// copyright-holders: Vas Crabb
+/***************************************************************************
+
+    Apple M0110/M0120 keyboard/keypad
+
+    These peripherals have a lot in common:
+    * Based on Intel or Philips mask-programmed 8021 microcontroller
+    * 100µH inductor as timing element (gives approximately 3MHz)
+    * Identical microcontroller programs
+    * Identical external watchdog circuits based on 74LS123
+    * Identical power-on/brownout reset circuits
+    * Identical host communication interface via P07 and P20
+    * Keys read with a mixture of matrix and dedicated inputs
+    * Neither has diodes to prevent ghosting
+
+    The program chooses keyboard or keypad mode based on whether P05
+    reads low with no outputs driven low.
+
+    The keyboard has dedicated inputs for the four modifiers (Shift,
+    Command, Option, and mechanically toggling Caps Lock - no Control
+    keys and no distinction between left/right Shift and Option).  The
+    rest of the keys (52 for ANSI or 53 for ISO) are read via a
+    nine-by-six matrix.
+
+    The keypad has dedicated inputs for the digits and (rather
+    ineffciently) reads the other eight keys via a three-by-three
+    matrix.
+
+    Known MPU silkscreens (date code from real example):
+
+     P8021H 1273
+     8409
+    ©INTEL '81
+
+      MAB8021P
+      R044
+    DND418V3 S
+      341-0222B
+
+    +-----------+---------------+-------------------+
+    | Pin       | Keyboard      | Keypad            |
+    +-----------+---------------+-------------------+
+    | P00 (4)   | column read   | row drive         |
+    | P01 (5)   | column read   | row drive         |
+    | P02 (6)   | column read   | row drive         |
+    | P03 (7)   | column read   | 8                 |
+    | P04 (8)   | column read   | 9                 |
+    | P05 (9)   | column read   | sense             |
+    | P06 (10)  | Caps Lock     | keyboard clock    |
+    | P07 (11)  | host clock    | host clock        |
+    +-----------+---------------+-------------------+
+    | P10 (18)  | row drive     | 0                 |
+    | P11 (19)  | row drive     | 1                 |
+    | P12 (20)  | row drive     | 2                 |
+    | P13 (21)  | row drive     | 3                 |
+    | P14 (22)  | row drive     | 4                 |
+    | P15 (23)  | row drive     | 5                 |
+    | P16 (24)  | row drive     | 6                 |
+    | P17 (25)  | row drive     | 7                 |
+    +-----------+---------------+-------------------+
+    | P20 (26)  | host data     | host data         |
+    | P21 (27)  | row drive*    | keyboard data     |
+    | P22 (1)   | Shift         | column read       |
+    | P23 (2)   | Command       | column read       |
+    +-----------+---------------+-------------------+
+    | T1 (13)   | Option        | column read       |
+    +-----------+---------------+-------------------+
+    * falling edge starts/resets watchdog timer
+
+    +------+-----------------------------------------------------+
+    | ANSI | P21   P10   P11   P12   P13   P14   P15   P16   P17 |
+    +------+-----------------------------------------------------+
+    | P00  |  A     Z     Q     1     =     ]    Rtn    \    Tab |
+    | P01  |  S     X     W     2     9     O     L     ,    Spc |
+    | P02  |  D     C     E     3     7     U     J     /     `  |
+    | P03  |  F     V     R     4     -     [     '     N    Bsp |
+    | P04  |  H           Y     6     8     I     K     M    Ent |
+    | P05  |  G     B     T     5     0     P     ;     .        |
+    +------+-----------------------------------------------------+
+
+    +------+-----------------------------------------------------+
+    | ISO  | P21   P10   P11   P12   P13   P14   P15   P16   P17 |
+    +------+-----------------------------------------------------+
+    | P00  |  A     `     Q     1     =     ]     \    Rtn   Tab |
+    | P01  |  S     Z     W     2     9     O     L     M    Ent |
+    | P02  |  D     X     E     3     7     U     J     .     §  |
+    | P03  |  F     C     R     4     -     [     '     B    Bsp |
+    | P04  |  H     /     Y     6     8     I     K     N    Spc |
+    | P05  |  G     V     T     5     0     P     ;     ,        |
+    +------+-----------------------------------------------------+
+
+    +------+-----------------+
+    | Pad  | P00   P01   P02 |
+    +------+-----------------+
+    | P22  |  /    Clr    .  |
+    | P23  |  -     ,     *  |
+    | T1   | Ent    +        |
+    +------+-----------------+
+
+    +------+-------+-------+-------+
+    | Code | ANSI  |  ISO  |  Pad  |
+    +------+-------+-------+-------+
+    | 0x01 |   A   |   A   |       |
+    | 0x03 |   S   |   S   |   .   |
+    | 0x05 |   D   |   D   |   *   |
+    | 0x07 |   F   |   F   |       |
+    | 0x09 |   H   |   H   |       |
+    | 0x0b |   G   |   G   |       |
+    | 0x0d |   Z   |   §   |   +   |
+    | 0x0f |   X   |   Z   |  Clr  |
+    | 0x11 |   C   |   X   |   ,   |
+    | 0x13 |   V   |   C   |       |
+    | 0x15 |       |   /   |       |
+    | 0x17 |   B   |   V   |       |
+    | 0x19 |   Q   |   Q   |  Ent  |
+    | 0x1b |   W   |   W   |   /   |
+    | 0x1d |   E   |   E   |   -   |
+    | 0x1f |   R   |   R   |       |
+    | 0x21 |   Y   |   Y   |       |
+    | 0x23 |   T   |   T   |       |
+    | 0x25 |   1   |   1   |   0   |
+    | 0x27 |   2   |   2   |   1   |
+    | 0x29 |   3   |   3   |   2   |
+    | 0x2b |   4   |   4   |   3   |
+    | 0x2d |   6   |   6   |   4   |
+    | 0x2f |   5   |   5   |   5   |
+    | 0x31 |   =   |   =   |   6   |
+    | 0x33 |   9   |   9   |   7   |
+    | 0x35 |   7   |   7   |       |
+    | 0x37 |   -   |   -   |   8   |
+    | 0x39 |   8   |   8   |   9   |
+    | 0x3b |   0   |   0   |       |
+    | 0x3d |   ]   |   ]   |       |
+    | 0x3f |   O   |   O   |       |
+    | 0x41 |   U   |   U   |       |
+    | 0x43 |   [   |   [   |       |
+    | 0x45 |   I   |   I   |       |
+    | 0x47 |   P   |   P   |       |
+    | 0x49 |  Rtn  |   \   |       |
+    | 0x4b |   L   |   L   |       |
+    | 0x4d |   J   |   J   |       |
+    | 0x4f |   '   |   '   |       |
+    | 0x51 |   K   |   K   |       |
+    | 0x53 |   ;   |   ;   |       |
+    | 0x55 |   \   |  Rtn  |       |
+    | 0x57 |   ,   |   M   |       |
+    | 0x59 |   /   |   .   |       |
+    | 0x5b |   N   |   B   |       |
+    | 0x5d |   M   |   N   |       |
+    | 0x5f |   .   |   ,   |       |
+    | 0x61 |  Tab  |  Tab  |       |
+    | 0x63 |  Spc  |  Ent  |       |
+    | 0x65 |   `   |   `   |       |
+    | 0x67 |  Bsp  |  Bsp  |       |
+    | 0x69 |  Ent  |  Spc  |       |
+    | 0x6b |       |       |       |
+    | 0x6d |       |       |       |
+    | 0x6f |  Cmd  |  Cmd  |       |
+    | 0x71 | Shift | Shift |       |
+    | 0x73 | Caps  | Caps  |       |
+    | 0x75 |  Opt  |  Opt  |       |
+    | 0x77 | error | error | error |
+    | 0x79 |       |       |  pad  |
+    | 0x7b | idle  | idle  | idle  |
+    | 0x7d | pass  | pass  | pass  |
+    | 0x7f |       |       |       |
+    +------+-------+-------+-------+
+
+    65  25  27  29  2b  2f  2d  35  39  33  3b  37  31    67
+    61    19  1b  1d  1f  23  13  41  45  3f  47  43  3d  55
+    73     01  03  05  07  0b  09  4d  51  4b  53  4f     49
+    71       0d  0f  11  13  17  5b  5d  57  5f  59       71
+        75   6f                63                69   75
+
+    65  25  27  29  2b  2f  2d  35  39  33  3b  37  31    67
+    61    19  1b  1d  1f  23  21  41  45  3f  47  43  3d  55
+    73     01  03  05  07  0b  09  4d  51  4b  53  4f  49
+    71   0d  0f  11  13  17  5b  5d  57  5f  59  15       71
+        75   6f                69                63   75
+
+    0f  1d  0d  05
+    33  37  39  1b
+    2d  2f  31  11
+    27  29  2b
+      25    03  19
+
+    Known part numbers:
+    * M0110 (U.S. - ANSI)
+    * M0110B (British - ISO)
+    * M0110F (French - ISO)
+    * M0110T (Italian - ISO)
+    * M0120 (keypad - English)
+    * M0120P (keypad - European)
+
+    ISO keyboards and the European keypad use icons rather than English
+    text for Backspace, Tab, Caps Lock, Shift, Return, Shift, Option,
+    Enter and Clear (all variants use icons for command and the cursor
+    arrows).
+
+    Also known to exist:
+    * Japanese - ANSI (U.S. with different key caps)
+
+    TODO:
+    * Determine whether P00 or P01 actually feeds the keypad watchdog
+    * Find more model numbers and implement more layouts
+
+***************************************************************************/
+
+#include "emu.h"
+#include "keyboard.h"
+
+#include "cpu/mcs48/mcs48.h"
+
+#define LOG_GENERAL     (1U << 0)
+#define LOG_WATCHDOG    (1U << 1)
+#define LOG_MATRIX      (1U << 2)
+#define LOG_COMM        (1U << 3)
+
+//#define VERBOSE (LOG_GENERAL | LOG_WATCHDOG | LOG_MATRIX | LOG_COMM)
+//#define LOG_OUTPUT_STREAM std::cerr
+#include "logmacro.h"
+
+#define LOGWATCHDOG(...)    LOGMASKED(LOG_WATCHDOG, __VA_ARGS__)
+#define LOGMATRIX(...)      LOGMASKED(LOG_MATRIX, __VA_ARGS__)
+#define LOGCOMM(...)        LOGMASKED(LOG_COMM, __VA_ARGS__)
+
+
+namespace {
+
+ROM_START(keyboard)
+	ROM_REGION(0x0400, "mpu", 0)
+	ROM_LOAD("ip8021h_2173.bin", 0x000000, 0x000400, CRC(5fbd9a94) SHA1(32a3b58afb445a8675b12a4de3aec2fa00c99222))
+ROM_END
+
+
+template <unsigned Rows>
+class peripheral_base : public device_t, public device_mac_keyboard_interface
+{
+public:
+	CUSTOM_INPUT_MEMBER(columns_r)
+	{
+		ioport_value result(make_bitmask<ioport_value>(Rows));
+		for (unsigned i = 0U; Rows > i; ++i)
+		{
+			if (!BIT(m_row_drive, i))
+				result &= m_rows[i]->read();
+		}
+		LOGMATRIX("read matrix: row drive = %X, result = %X\n", m_row_drive, result);
+		return result ^ make_bitmask<ioport_value>(Rows);
+	}
+
+	CUSTOM_INPUT_MEMBER(host_data_r)
+	{
+		return m_host_data_in ^ 0x01;
+	}
+
+protected:
+	peripheral_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock)
+		: device_t(mconfig, type, tag, owner, clock)
+		, device_mac_keyboard_interface(mconfig, *this)
+		, m_mpu{ *this, "mpu" }
+		, m_rows{ *this, "ROW%u", 0U }
+	{
+	}
+
+	virtual tiny_rom_entry const *device_rom_region() const override
+	{
+		return ROM_NAME(keyboard);
+	}
+
+	virtual void device_add_mconfig(machine_config &config) override
+	{
+		I8021(config, m_mpu, 3'000'000); // 100µH inductor gives approximately 3MHz
+		m_mpu->p0_out_cb().set(FUNC(peripheral_base::host_clock_w)).bit(7);
+		m_mpu->p2_out_cb().set(FUNC(peripheral_base::host_data_w)).bit(0);
+	}
+
+	virtual void device_start() override
+	{
+		m_watchdog_timeout = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(peripheral_base::watchdog_timeout), this));
+		m_watchdog_output = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(peripheral_base::watchdog_output), this));
+
+		m_row_drive = make_bitmask<u16>(Rows);
+		m_host_clock_out = 1U;
+		m_host_data_out = 1U;
+		m_host_data_in = 0x01U;
+		m_watchdog_in = 1U;
+
+		save_item(NAME(m_row_drive));
+		save_item(NAME(m_host_clock_out));
+		save_item(NAME(m_host_data_out));
+		save_item(NAME(m_host_data_in));
+		save_item(NAME(m_watchdog_in));
+	}
+
+	virtual DECLARE_WRITE_LINE_MEMBER(data_w) override
+	{
+		machine().scheduler().synchronize(timer_expired_delegate(FUNC(peripheral_base::update_host_data), this), state);
+	}
+
+	DECLARE_WRITE_LINE_MEMBER(watchdog_w)
+	{
+		if (bool(state) != bool(m_watchdog_in))
+		{
+			m_watchdog_in = state ? 1U : 0U;
+			if (!state)
+			{
+				// 74LS123 with Rt = 200kΩ and Cext = 1µF
+				// t = K * Rt * Cext * (1 + (0.7 / Rt)) = 0.28 * 200k * 1µ * (1 + (0.7 / 200k)) ≈ 56ms
+				m_watchdog_timeout->adjust(attotime::from_msec(56));
+				LOGWATCHDOG("%s: watchdog reset\n", machine().describe_context());
+			}
+		}
+	}
+
+	template <u16 Mask> void set_row_drive(u16 value)
+	{
+		m_row_drive = ((m_row_drive & ~Mask) | (value & Mask)) & make_bitmask<u16>(Rows);
+	}
+
+	required_device<i8021_device> m_mpu;
+
+private:
+	DECLARE_WRITE_LINE_MEMBER(host_clock_w)
+	{
+		if (bool(state) != bool(m_host_clock_out))
+		{
+			if (state)
+				LOGCOMM("%s: host clock out 0 -> 1 data=%u\n", machine().describe_context(), (m_host_data_out && m_host_data_in) ? 1U : 0U);
+			else
+				LOGCOMM("%s: host clock out 1 -> 0\n", machine().describe_context());
+			write_clock(m_host_clock_out = state ? 1U : 0U);
+		}
+	}
+
+	DECLARE_WRITE_LINE_MEMBER(host_data_w)
+	{
+		if (bool(state) != bool(m_host_data_out))
+		{
+			LOGCOMM("%s: host data out %u -> %u\n", machine().describe_context(), m_host_data_out, state ? 1U : 0U);
+			write_data(m_host_data_out = state ? 1U : 0U);
+		}
+	}
+
+	TIMER_CALLBACK_MEMBER(update_host_data)
+	{
+		if (bool(param) != bool(m_host_data_in))
+		{
+			LOGCOMM("host data in %u -> %u\n", m_host_data_in, param ? 1U : 0U);
+			m_host_data_in = param ? 0x01U : 0x00U;
+		}
+	}
+
+	TIMER_CALLBACK_MEMBER(watchdog_timeout)
+	{
+		// 74LS123 with Rt = 200kΩ and Cext = 100nF
+		// t = K * Rt * Cext * (1 + (0.7 / Rt)) = 0.28 * 200k * 100n * (1 + (0.7 / 200k)) ≈ 5.6ms
+		m_watchdog_output->adjust(attotime::from_usec(5600));
+		LOG("watchdog timeout\n");
+		m_mpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
+	}
+
+	TIMER_CALLBACK_MEMBER(watchdog_output)
+	{
+		LOGWATCHDOG("watchdog release\n");
+		m_mpu->set_input_line(INPUT_LINE_RESET, CLEAR_LINE);
+	}
+
+	required_ioport_array<Rows> m_rows;
+
+	emu_timer *m_watchdog_timeout = nullptr;
+	emu_timer *m_watchdog_output = nullptr;
+
+	u16 m_row_drive         = make_bitmask<u16>(Rows);  // current bit pattern driving rows (active low)
+	u8  m_host_clock_out    = 1U;                       // clock line drive to host (idle high)
+	u8  m_host_data_out     = 1U;                       // data line drive to host (idle high)
+	u8  m_host_data_in      = 0x01U;                    // data line drive from host (idle high)
+	u8  m_watchdog_in       = 1U;                       // watchdog start/reset (falling edge trigger)
+};
+
+
+class keyboard_base : public peripheral_base<9>
+{
+protected:
+	keyboard_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock)
+		: peripheral_base<9>(mconfig, type, tag, owner, clock)
+	{
+	}
+
+	virtual void device_add_mconfig(machine_config &config) override
+	{
+		peripheral_base<9>::device_add_mconfig(config);
+
+		m_mpu->p0_in_cb().set_ioport("P0");
+		m_mpu->p1_out_cb().set([this] (u8 data) { set_row_drive<0x01feU>(u16(data) << 1); });
+		m_mpu->p2_in_cb().set_ioport("P2");
+		m_mpu->p2_out_cb().append([this] (u8 data) { set_row_drive<0x0001U>((data >> 1) & 0x01U); });
+		m_mpu->p2_out_cb().append(FUNC(keyboard_base::watchdog_w)).bit(1);
+		m_mpu->t1_in_cb().set_ioport("T1");
+	}
+};
+
+
+class keypad_base : public peripheral_base<3>
+{
+public:
+	CUSTOM_INPUT_MEMBER(keyboard_clock_r)
+	{
+		return m_keyboard_clock_in ^ 0x01;
+	}
+
+	CUSTOM_INPUT_MEMBER(keyboard_data_r)
+	{
+		return m_keyboard_data_in ^ 0x01;
+	}
+
+protected:
+	keypad_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock)
+		: peripheral_base<3>(mconfig, type, tag, owner, clock)
+		, m_keyboard_port(*this, "kbd")
+	{
+	}
+
+	virtual void device_add_mconfig(machine_config &config) override
+	{
+		peripheral_base<3>::device_add_mconfig(config);
+
+		m_mpu->p0_in_cb().set_ioport("P0");
+		m_mpu->p0_out_cb().append(FUNC(keypad_base::set_row_drive<0x07U>));
+		m_mpu->p0_out_cb().append(FUNC(keypad_base::watchdog_w)).bit(1); // TODO: confirm whether P0 or P1 resets watchdog
+		m_mpu->p1_in_cb().set_ioport("P1");
+		m_mpu->p2_in_cb().set_ioport("P2");
+		m_mpu->p2_out_cb().append(FUNC(keypad_base::keyboard_data_out_w)).bit(1);
+		m_mpu->t1_in_cb().set([this] () { return int((~columns_r() >> 2) & 0x01U); });
+
+		MAC_KEYBOARD_PORT(config, m_keyboard_port, mac_keyboard_devices, "us");
+		m_keyboard_port->clock_cb().set(FUNC(keypad_base::keyboard_clock_in_w));
+		m_keyboard_port->data_cb().set(FUNC(keypad_base::keyboard_data_in_w));
+	}
+
+	virtual void device_start() override
+	{
+		peripheral_base<3>::device_start();
+
+		m_keyboard_data_out = 0x01U;
+		m_keyboard_clock_in = 0x01U;
+		m_keyboard_data_in = 0x01U;
+
+		save_item(NAME(m_keyboard_data_out));
+		save_item(NAME(m_keyboard_clock_in));
+		save_item(NAME(m_keyboard_data_in));
+	}
+
+	required_device<mac_keyboard_port_device> m_keyboard_port;
+
+private:
+	DECLARE_WRITE_LINE_MEMBER(keyboard_data_out_w)
+	{
+		if (bool(state) != bool(m_keyboard_data_out))
+		{
+			LOGCOMM("%s: keyboard data out %u -> %u\n", machine().describe_context(), m_keyboard_data_out, state ? 1U : 0U);
+			m_keyboard_port->data_w(m_keyboard_data_out = state ? 0x01U : 0x00U);
+		}
+	}
+
+	DECLARE_WRITE_LINE_MEMBER(keyboard_clock_in_w)
+	{
+		machine().scheduler().synchronize(timer_expired_delegate(FUNC(keypad_base::update_keyboard_clock), this), state);
+	}
+
+	DECLARE_WRITE_LINE_MEMBER(keyboard_data_in_w)
+	{
+		machine().scheduler().synchronize(timer_expired_delegate(FUNC(keypad_base::update_keyboard_data), this), state);
+	}
+
+	TIMER_CALLBACK_MEMBER(update_keyboard_clock)
+	{
+		m_keyboard_clock_in = param ? 0x01U : 0x00U;
+	}
+
+	TIMER_CALLBACK_MEMBER(update_keyboard_data)
+	{
+		m_keyboard_data_in = param ? 0x01U : 0x00U;
+	}
+
+	u8  m_keyboard_data_out = 0x01U;        // data line drive to keyboard (idle high)
+	u8  m_keyboard_clock_in = 0x01U;        // clock line driver from keyboard (idle high)
+	u8  m_keyboard_data_in  = 0x01U;        // data line drive from keyboard (idle high)
+};
+
+
+INPUT_PORTS_START(keyboard_us)
+	PORT_START("ROW0")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)          PORT_CHAR('a')  PORT_CHAR('A')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)          PORT_CHAR('s')  PORT_CHAR('S')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D)          PORT_CHAR('d')  PORT_CHAR('D')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)          PORT_CHAR('f')  PORT_CHAR('F')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H)          PORT_CHAR('h')  PORT_CHAR('H')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G)          PORT_CHAR('g')  PORT_CHAR('G')
+
+	PORT_START("ROW1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)          PORT_CHAR('z')  PORT_CHAR('Z')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)          PORT_CHAR('x')  PORT_CHAR('X')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)          PORT_CHAR('c')  PORT_CHAR('C')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)          PORT_CHAR('v')  PORT_CHAR('V')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)          PORT_CHAR('b')  PORT_CHAR('B')
+
+	PORT_START("ROW2")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)          PORT_CHAR('q')  PORT_CHAR('Q')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)          PORT_CHAR('w')  PORT_CHAR('W')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E)          PORT_CHAR('e')  PORT_CHAR('E')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R)          PORT_CHAR('r')  PORT_CHAR('R')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)          PORT_CHAR('y')  PORT_CHAR('Y')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T)          PORT_CHAR('t')  PORT_CHAR('T')
+
+	PORT_START("ROW3")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)          PORT_CHAR('1')  PORT_CHAR('!')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)          PORT_CHAR('2')  PORT_CHAR('@')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)          PORT_CHAR('3')  PORT_CHAR('#')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)          PORT_CHAR('4')  PORT_CHAR('$')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)          PORT_CHAR('6')  PORT_CHAR('^')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)          PORT_CHAR('5')  PORT_CHAR('%')
+
+	PORT_START("ROW4")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS)     PORT_CHAR('=')  PORT_CHAR('+')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)          PORT_CHAR('9')  PORT_CHAR('(')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)          PORT_CHAR('7')  PORT_CHAR('&')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)      PORT_CHAR('-')  PORT_CHAR('_')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)          PORT_CHAR('8')  PORT_CHAR('*')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)          PORT_CHAR('0')  PORT_CHAR(')')
+
+	PORT_START("ROW5")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']')  PORT_CHAR('}')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O)          PORT_CHAR('o')  PORT_CHAR('O')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U)          PORT_CHAR('u')  PORT_CHAR('U')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR('[')  PORT_CHAR('{')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I)          PORT_CHAR('i')  PORT_CHAR('I')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P)          PORT_CHAR('p')  PORT_CHAR('P')
+
+	PORT_START("ROW6")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER)      PORT_CHAR(0x0d)                PORT_NAME("Return")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L)          PORT_CHAR('l')  PORT_CHAR('L')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J)          PORT_CHAR('j')  PORT_CHAR('J')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR('\'') PORT_CHAR('"')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K)          PORT_CHAR('k')  PORT_CHAR('K')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)      PORT_CHAR(';')  PORT_CHAR(':')
+
+	PORT_START("ROW7")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH)  PORT_CHAR('\\') PORT_CHAR('|')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(',')  PORT_CHAR('<')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('/')  PORT_CHAR('?')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)          PORT_CHAR('n')  PORT_CHAR('N')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)          PORT_CHAR('m')  PORT_CHAR('M')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)       PORT_CHAR('.')  PORT_CHAR('>')
+
+	PORT_START("ROW8")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB)        PORT_CHAR(0x09)                PORT_NAME("Tab")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE)      PORT_CHAR('`')  PORT_CHAR('~')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE)  PORT_CHAR(0x08)                PORT_NAME("Backspace")
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RCONTROL)                                  PORT_NAME("Enter")
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("P0")
+	PORT_BIT(0x3f, IP_ACTIVE_LOW, IPT_CUSTOM) PORT_CUSTOM_MEMBER(keyboard_base, columns_r)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CAPSLOCK)                         PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_NAME("Caps Lock") PORT_TOGGLE
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("P2")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_CUSTOM) PORT_CUSTOM_MEMBER(keyboard_base, host_data_r)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)           PORT_NAME("Shift")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL)                                                            PORT_NAME("Command")
+	PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("T1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LALT)   PORT_CODE(KEYCODE_RALT)   PORT_CHAR(UCHAR_SHIFT_2)           PORT_NAME("Option")
+INPUT_PORTS_END
+
+INPUT_PORTS_START(keyboard_gb)
+	PORT_INCLUDE(keyboard_us)
+
+	PORT_MODIFY("ROW1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('\\')  PORT_CHAR('|')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)          PORT_CHAR('z')   PORT_CHAR('Z')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)          PORT_CHAR('x')   PORT_CHAR('X')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)          PORT_CHAR('c')   PORT_CHAR('C')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('/')   PORT_CHAR('?')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)          PORT_CHAR('v')   PORT_CHAR('V')
+
+	PORT_MODIFY("ROW3")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)          PORT_CHAR('3')   PORT_CHAR(0xa3)  // £
+
+	PORT_MODIFY("ROW6")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH)  PORT_CHAR('`')   PORT_CHAR('~')
+
+	PORT_MODIFY("ROW7")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER)      PORT_CHAR(0x0d)                   PORT_NAME("Return")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)          PORT_CHAR('m')   PORT_CHAR('M')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)       PORT_CHAR('.')   PORT_CHAR('>')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)          PORT_CHAR('b')   PORT_CHAR('B')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)          PORT_CHAR('n')   PORT_CHAR('N')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(',')   PORT_CHAR('<')
+
+	PORT_MODIFY("ROW8")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RCONTROL)                                     PORT_NAME("Enter")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE)      PORT_CHAR(0xa7)  PORT_CHAR('#')   // §
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')
+INPUT_PORTS_END
+
+INPUT_PORTS_START(keyboard_fr)
+	PORT_INCLUDE(keyboard_us)
+
+	PORT_MODIFY("ROW0")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)          PORT_CHAR('q')   PORT_CHAR('Q')
+
+	PORT_MODIFY("ROW1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('<')   PORT_CHAR('>')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)          PORT_CHAR('w')   PORT_CHAR('W')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)          PORT_CHAR('x')   PORT_CHAR('X')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)          PORT_CHAR('c')   PORT_CHAR('C')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('=')   PORT_CHAR('+')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)          PORT_CHAR('v')   PORT_CHAR('V')
+
+	PORT_MODIFY("ROW2")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)          PORT_CHAR('a')   PORT_CHAR('A')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)          PORT_CHAR('z')   PORT_CHAR('Z')
+
+	PORT_MODIFY("ROW3")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)          PORT_CHAR('&')   PORT_CHAR('1')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)          PORT_CHAR(0xe9)  PORT_CHAR('2')   // é
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)          PORT_CHAR('"')   PORT_CHAR('3')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)          PORT_CHAR('\'')  PORT_CHAR('4')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)          PORT_CHAR(0xa7)  PORT_CHAR('6')   // §
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)          PORT_CHAR('(')   PORT_CHAR('5')
+
+	PORT_MODIFY("ROW4")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS)     PORT_CHAR('-')   PORT_CHAR('_')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)          PORT_CHAR(0xe7)  PORT_CHAR('9')   // ç
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)          PORT_CHAR(0xe8)  PORT_CHAR('7')   // è
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)      PORT_CHAR(')')   PORT_CHAR(0xb0)  // °
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)          PORT_CHAR('!')   PORT_CHAR('8')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)          PORT_CHAR(0xe0)  PORT_CHAR('0')   // à
+
+	PORT_MODIFY("ROW5")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('$')   PORT_CHAR('*')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR(0x2c6) PORT_CHAR(0xa8)  // ˆ ¨
+
+	PORT_MODIFY("ROW6")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH)  PORT_CHAR('`')   PORT_CHAR(0xa3)  // £
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR(0xf9)  PORT_CHAR('%')   // ù
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)      PORT_CHAR('m')   PORT_CHAR('M')
+
+	PORT_MODIFY("ROW7")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER)      PORT_CHAR(0x0d)                   PORT_NAME("Return")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)          PORT_CHAR(',')   PORT_CHAR('?')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)       PORT_CHAR(':')   PORT_CHAR('/')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)          PORT_CHAR('b')   PORT_CHAR('B')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)          PORT_CHAR('n')   PORT_CHAR('N')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(';')   PORT_CHAR('.')
+
+	PORT_MODIFY("ROW8")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RCONTROL)                                     PORT_NAME("Enter")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE)      PORT_CHAR('@')   PORT_CHAR('#')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')
+INPUT_PORTS_END
+
+INPUT_PORTS_START(keyboard_it)
+	PORT_INCLUDE(keyboard_us)
+
+	PORT_MODIFY("ROW1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('<')   PORT_CHAR('>')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)          PORT_CHAR('w')   PORT_CHAR('W')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)          PORT_CHAR('x')   PORT_CHAR('X')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)          PORT_CHAR('c')   PORT_CHAR('C')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)      PORT_CHAR(0xf2)  PORT_CHAR('!')   // ò
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)          PORT_CHAR('v')   PORT_CHAR('V')
+
+	PORT_MODIFY("ROW2")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)          PORT_CHAR('z')   PORT_CHAR('Z')
+
+	PORT_MODIFY("ROW3")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)          PORT_CHAR('&')   PORT_CHAR('1')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)          PORT_CHAR('"')   PORT_CHAR('2')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)          PORT_CHAR('\'')  PORT_CHAR('3')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)          PORT_CHAR('(')   PORT_CHAR('4')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)          PORT_CHAR(0xe8)  PORT_CHAR('6')   // è
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)          PORT_CHAR(0xe7)  PORT_CHAR('5')   // ç
+
+	PORT_MODIFY("ROW4")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)          PORT_CHAR(0xe0)  PORT_CHAR('9')   // à
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)          PORT_CHAR(')')   PORT_CHAR('7')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)          PORT_CHAR(0xa3)  PORT_CHAR('8')   // £
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)          PORT_CHAR(0xe9)  PORT_CHAR('0')   // é
+
+	PORT_MODIFY("ROW5")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('$')   PORT_CHAR('*')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR(0xec)  PORT_CHAR(0x2c6) // ì ˆ
+
+	PORT_MODIFY("ROW6")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH)  PORT_CHAR(0xa7)  PORT_CHAR(0xb0)  // § °
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR(0xf9)  PORT_CHAR('%')   // ù
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)      PORT_CHAR('m')   PORT_CHAR('M')
+
+	PORT_MODIFY("ROW7")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER)      PORT_CHAR(0x0d)                   PORT_NAME("Return")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)          PORT_CHAR(',')   PORT_CHAR('?')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)       PORT_CHAR(':')   PORT_CHAR('/')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)          PORT_CHAR('b')   PORT_CHAR('B')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)          PORT_CHAR('n')   PORT_CHAR('N')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(';')   PORT_CHAR('.')
+
+	PORT_MODIFY("ROW8")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RCONTROL)                                     PORT_NAME("Enter")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE)      PORT_CHAR('@')   PORT_CHAR('#')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')
+INPUT_PORTS_END
+
+
+class m0110_device : public keyboard_base
+{
+public:
+	m0110_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+		: keyboard_base(mconfig, MACKBD_M0110, tag, owner, clock)
+	{
+	}
+
+protected:
+	virtual ioport_constructor device_input_ports() const override
+	{
+		return INPUT_PORTS_NAME(keyboard_us);
+	}
+};
+
+class m0110b_device : public keyboard_base
+{
+public:
+	m0110b_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+		: keyboard_base(mconfig, MACKBD_M0110B, tag, owner, clock)
+	{
+	}
+
+protected:
+	virtual ioport_constructor device_input_ports() const override
+	{
+		return INPUT_PORTS_NAME(keyboard_gb);
+	}
+};
+
+class m0110f_device : public keyboard_base
+{
+public:
+	m0110f_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+		: keyboard_base(mconfig, MACKBD_M0110F, tag, owner, clock)
+	{
+	}
+
+protected:
+	virtual ioport_constructor device_input_ports() const override
+	{
+		return INPUT_PORTS_NAME(keyboard_fr);
+	}
+};
+
+class m0110t_device : public keyboard_base
+{
+public:
+	m0110t_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+		: keyboard_base(mconfig, MACKBD_M0110T, tag, owner, clock)
+	{
+	}
+
+protected:
+	virtual ioport_constructor device_input_ports() const override
+	{
+		return INPUT_PORTS_NAME(keyboard_it);
+	}
+};
+
+
+INPUT_PORTS_START(keypad)
+	PORT_START("ROW0")
+	PORT_BIT(0x01, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_MINUS_PAD)  PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD)) PORT_NAME("Keypad / (Up)")
+	PORT_BIT(0x02, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_EQUALS_PAD) PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) PORT_NAME("Keypad -")
+	PORT_BIT(0x04, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_ENTER_PAD)  PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD)) PORT_NAME("Keypad Enter")
+
+	PORT_START("ROW1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_NUMLOCK)    PORT_CHAR(UCHAR_MAMEKEY(NUMLOCK))   PORT_NAME("Keypad Clear")
+	PORT_BIT(0x02, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_PLUS_PAD)   PORT_CHAR(UCHAR_MAMEKEY(COMMA_PAD)) PORT_NAME("Keypad , (Down)")
+	PORT_BIT(0x04, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_SLASH_PAD)  PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD))  PORT_NAME("Keypad + (Left)")
+
+	PORT_START("ROW2")
+	PORT_BIT(0x01, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_DEL_PAD)    PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD))   PORT_NAME("Keypad .")
+	PORT_BIT(0x02, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_ASTERISK)   PORT_CHAR(UCHAR_MAMEKEY(ASTERISK))  PORT_NAME("Keypad * (Right)")
+	PORT_BIT(0x04, IP_ACTIVE_LOW,  IPT_UNUSED)
+
+	PORT_START("P0")
+	PORT_BIT(0x07, IP_ACTIVE_LOW,  IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_8_PAD)      PORT_CHAR(UCHAR_MAMEKEY(8_PAD))     PORT_NAME("Keypad 8")
+	PORT_BIT(0x10, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_9_PAD)      PORT_CHAR(UCHAR_MAMEKEY(9_PAD))     PORT_NAME("Keypad 9")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_CUSTOM)
+	PORT_BIT(0x40, IP_ACTIVE_LOW,  IPT_CUSTOM) PORT_CUSTOM_MEMBER(keypad_base, keyboard_clock_r)
+	PORT_BIT(0x80, IP_ACTIVE_LOW,  IPT_UNUSED)
+
+	PORT_START("P1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_0_PAD)      PORT_CHAR(UCHAR_MAMEKEY(0_PAD))     PORT_NAME("Keypad 0")
+	PORT_BIT(0x02, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_1_PAD)      PORT_CHAR(UCHAR_MAMEKEY(1_PAD))     PORT_NAME("Keypad 1")
+	PORT_BIT(0x04, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_2_PAD)      PORT_CHAR(UCHAR_MAMEKEY(2_PAD))     PORT_NAME("Keypad 2")
+	PORT_BIT(0x08, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_3_PAD)      PORT_CHAR(UCHAR_MAMEKEY(3_PAD))     PORT_NAME("Keypad 3")
+	PORT_BIT(0x10, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_4_PAD)      PORT_CHAR(UCHAR_MAMEKEY(4_PAD))     PORT_NAME("Keypad 4")
+	PORT_BIT(0x20, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_5_PAD)      PORT_CHAR(UCHAR_MAMEKEY(5_PAD))     PORT_NAME("Keypad 5")
+	PORT_BIT(0x40, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_6_PAD)      PORT_CHAR(UCHAR_MAMEKEY(6_PAD))     PORT_NAME("Keypad 6")
+	PORT_BIT(0x80, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_7_PAD)      PORT_CHAR(UCHAR_MAMEKEY(7_PAD))     PORT_NAME("Keypad 7")
+
+	PORT_START("P2")
+	PORT_BIT(0x01, IP_ACTIVE_LOW,  IPT_CUSTOM) PORT_CUSTOM_MEMBER(keypad_base, host_data_r)
+	PORT_BIT(0x02, IP_ACTIVE_LOW,  IPT_CUSTOM) PORT_CUSTOM_MEMBER(keypad_base, keyboard_data_r)
+	PORT_BIT(0x0c, IP_ACTIVE_LOW,  IPT_CUSTOM) PORT_CUSTOM_MEMBER(keypad_base, columns_r)
+INPUT_PORTS_END
+
+INPUT_PORTS_START(keypad_eu)
+	PORT_INCLUDE(keypad)
+
+	PORT_MODIFY("ROW1")
+	PORT_BIT(0x02, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_PLUS_PAD)   PORT_CHAR(UCHAR_MAMEKEY(COMMA_PAD)) PORT_NAME("Keypad . (Down)")
+
+	PORT_MODIFY("ROW2")
+	PORT_BIT(0x01, IP_ACTIVE_LOW,  IPT_KEYPAD) PORT_CODE(KEYCODE_DEL_PAD)    PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD))   PORT_NAME("Keypad ,")
+INPUT_PORTS_END
+
+
+class m0120_device : public keypad_base
+{
+public:
+	m0120_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+		: keypad_base(mconfig, MACKBD_M0120, tag, owner, clock)
+	{
+	}
+
+protected:
+	virtual ioport_constructor device_input_ports() const override
+	{
+		return INPUT_PORTS_NAME(keypad);
+	}
+};
+
+class m0120p_device : public keypad_base
+{
+public:
+	m0120p_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+		: keypad_base(mconfig, MACKBD_M0120P, tag, owner, clock)
+	{
+	}
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override
+	{
+		keypad_base::device_add_mconfig(config);
+
+		m_keyboard_port->set_default_option("fr");
+	}
+
+	virtual ioport_constructor device_input_ports() const override
+	{
+		return INPUT_PORTS_NAME(keypad_eu);
+	}
+};
+
+} // anonymous namespace
+
+
+DEFINE_DEVICE_TYPE_PRIVATE(MACKBD_M0110,  device_mac_keyboard_interface, m0110_device,  "mackbd_m0110",  "Macintosh Keyboard (U.S. - M0110)")
+DEFINE_DEVICE_TYPE_PRIVATE(MACKBD_M0110B, device_mac_keyboard_interface, m0110b_device, "mackbd_m0110b", "Macintosh Keyboard (British - M0110B)")
+DEFINE_DEVICE_TYPE_PRIVATE(MACKBD_M0110F, device_mac_keyboard_interface, m0110f_device, "mackbd_m0110f", "Macintosh Keyboard (French - M0110F)")
+DEFINE_DEVICE_TYPE_PRIVATE(MACKBD_M0110T, device_mac_keyboard_interface, m0110t_device, "mackbd_m0110t", "Macintosh Keyboard (Italian - M0110T)")
+
+DEFINE_DEVICE_TYPE_PRIVATE(MACKBD_M0120,  device_mac_keyboard_interface, m0120_device,  "mackbd_m0120",  "Macintosh Numeric Keypad (English - M0120)")
+DEFINE_DEVICE_TYPE_PRIVATE(MACKBD_M0120P, device_mac_keyboard_interface, m0120p_device, "mackbd_m0120p", "Macintosh Numeric Keypad (European - M0120P)")
diff -Nru mame-0.222+dfsg.1/src/devices/bus/mackbd/keyboard.h mame-0.224+dfsg.1/src/devices/bus/mackbd/keyboard.h
--- mame-0.222+dfsg.1/src/devices/bus/mackbd/keyboard.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/mackbd/keyboard.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,23 @@
+// license: BSD-3-Clause
+// copyright-holders: Vas Crabb
+/***************************************************************************
+
+    Apple M0110/M0120 keyboard/keypad
+
+***************************************************************************/
+#ifndef MAME_BUS_MACKBD_KEYBOARD_H
+#define MAME_BUS_MACKBD_KEYBOARD_H
+
+#pragma once
+
+#include "mackbd.h"
+
+DECLARE_DEVICE_TYPE(MACKBD_M0110,  device_mac_keyboard_interface)
+DECLARE_DEVICE_TYPE(MACKBD_M0110B, device_mac_keyboard_interface)
+DECLARE_DEVICE_TYPE(MACKBD_M0110F, device_mac_keyboard_interface)
+DECLARE_DEVICE_TYPE(MACKBD_M0110T, device_mac_keyboard_interface)
+
+DECLARE_DEVICE_TYPE(MACKBD_M0120,  device_mac_keyboard_interface)
+DECLARE_DEVICE_TYPE(MACKBD_M0120P, device_mac_keyboard_interface)
+
+#endif // MAME_BUS_MACKBD_KEYBOARD_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/mackbd/mackbd.cpp mame-0.224+dfsg.1/src/devices/bus/mackbd/mackbd.cpp
--- mame-0.222+dfsg.1/src/devices/bus/mackbd/mackbd.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/mackbd/mackbd.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,176 @@
+// license: BSD-3-Clause
+// copyright-holders: Vas Crabb
+/***************************************************************************
+
+    Mac 128k/512k/Plus keyboard interface (pre-ADB)
+
+    Two-wire protocol designed to avoid the need for an accurate/stable
+    clock source in the keyboard.  This is not a multi-drop bus.  In
+    cases where peripherals are daisy-chained, the upstream peripheral
+    acts as a host for the downstream peripheral.
+
+    In the idle state, both signal lines are high, pulled up using
+    resistors.  All transactions are initiated by the host, but the
+    timing is controlled entirely by the peripheral.  The data signal
+    must be valid on the rising edge of the clock signal.  The data is
+    not inverted.
+
+    Transaction steps (ignoring mandatory delays):
+    * Host pulls down data line to initiate transfer
+    * Peripheral reads one octet (eight bits) from host, MSB first:
+      - Peripheral pulls clock line low
+      - Host sets bit on data line
+      - Peripheral releases clock line
+      - Peripheral samples data line
+      - Repeat for remaining bits of octet
+    * Host releases data line
+    * Peripheral sends one octet (eight bits) to host, MSB first:
+      - Peripheral places bit on data line
+      - Peripheral pulls clock line low
+      - Peripheral releases clock line
+      - Host samples data line
+      - Repeat for remaining bits of octet
+    * Peripheral releases data line
+
+    The last bit (LSB) of the octet transferred from the host to the
+    peripheral is always zero.  This allows the host to hold the data
+    line low until it's ready to receive the response from the
+    peripheral.  The last bit of the octet transferred from the
+    peripheral to the host is always high.
+
+    Some transactions expect an immediate response while others allow
+    the peripheral to delay the response if it has no data to send
+    immediately.  The host polls the peripheral continuously.  If no
+    response is received in about 500ms, the host assumes the
+    peripheral has crashed/reset or has been unplugged, and will
+    attempt to re-establish communication.
+
+    Transactions:
+    * 0x10: Permission to send
+      Peripheral responds immediately with data if avaiblable.  If no
+      data is available, peripheral waits for data and responds when it
+      becomes available.  If no data is available after 250ms, the
+      peripheral responds with 0x7b to hand control back to the host.
+    * 0x14: Request to send
+      Peripheral responds immediately with data, or 0x7b if no data is
+      available.
+    * 0x16: Reset and identify
+      Peripheral responds with identification code.
+      - 0x03: M0110 compact keyboard
+      - 0x0b: M0110A Mac Plus keyboard
+      - 0x11: M0120 numeric keypad
+      - 0x13: M0120 numeric keypad with M0110 compact keyboard
+      - 0x1b: M0120 numeric keypad with M0110A Mac Plus keyboard
+      - 0x27: Assimilation Process keypad with M0110 keyboard???
+    * 0x36: Perform self test
+      Peripheral responds with 0x7d (pass) or 0x77 (failure).
+
+    Responses to polling commands 0x10 and 0x14 have the first bit clear
+    for key down events or set for key up events.
+
+    The keypad passes polling commands 0x10 and 0x14 on to the keyboard
+    if it has no response to send.  If the keypad has a key transition
+    to report, it responds with the octet 0x79.  After receiving this
+    response, the host should send command 0x10 to receive the key
+    transition event from the keypad.
+
+    Additionally, if bit 5 of the octet sent to the peripheral is set
+    (0x40), the octet is passed on to a daisy-chained peripheral with
+    this bit cleared.  The response from the daisy-chained peripheral is
+    passed back to the host.  If the transaction to the daisy-chained
+    peripheral times out, the peripheral sends the response 0x77 to the
+    host.
+
+    TODO:
+    * Dump/emulate newer versions of Apple keyboards (GI PIC1657 based)
+    * Emulate Music Publisher music notation input pad
+    * Emulate Assimilation Process keypad (and trackball)
+
+***************************************************************************/
+
+#include "emu.h"
+#include "mackbd.h"
+
+
+DEFINE_DEVICE_TYPE(MAC_KEYBOARD_PORT, mac_keyboard_port_device, "mackbd_port", "Macintosh 128k/512k/Plus Keyboard Port")
+
+
+//**************************************************************************
+//  HOST PORT
+//**************************************************************************
+
+mac_keyboard_port_device::mac_keyboard_port_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+	: device_t(mconfig, MAC_KEYBOARD_PORT, tag, owner, clock)
+	, device_single_card_slot_interface<device_mac_keyboard_interface>(mconfig, *this)
+	, m_clock_cb{ *this }
+	, m_data_cb{ *this }
+	, m_peripheral{ nullptr }
+{
+}
+
+mac_keyboard_port_device::~mac_keyboard_port_device()
+{
+}
+
+WRITE_LINE_MEMBER(mac_keyboard_port_device::data_w)
+{
+	if (m_peripheral)
+		m_peripheral->data_w(state);
+}
+
+void mac_keyboard_port_device::device_resolve_objects()
+{
+	m_clock_cb.resolve_safe();
+	m_data_cb.resolve_safe();
+}
+
+void mac_keyboard_port_device::device_start()
+{
+	m_peripheral = dynamic_cast<device_mac_keyboard_interface *>(get_card_device());
+}
+
+
+//**************************************************************************
+//  PERIPHERAL INTERFACE
+//**************************************************************************
+
+device_mac_keyboard_interface::device_mac_keyboard_interface(machine_config const &mconfig, device_t &device)
+	: device_interface(device, "mackbd")
+	, m_host{ dynamic_cast<mac_keyboard_port_device *>(device.owner()) }
+{
+}
+
+device_mac_keyboard_interface::~device_mac_keyboard_interface()
+{
+}
+
+void device_mac_keyboard_interface::interface_validity_check(validity_checker &valid) const
+{
+	device_t *const owner(device().owner());
+	if (owner && dynamic_cast<device_slot_interface *>(owner) && !dynamic_cast<mac_keyboard_port_device *>(owner))
+		osd_printf_error("Device %s (%s) is not a Macintosh keyboard port\n", owner->tag(), owner->name());
+}
+
+
+//**************************************************************************
+//  SUPPORTED DEVICES
+//**************************************************************************
+
+#include "keyboard.h"
+#include "pluskbd.h"
+
+
+void mac_keyboard_devices(device_slot_interface &device)
+{
+	device.option_add("us",    MACKBD_M0110);
+	device.option_add("gb",    MACKBD_M0110B);
+	device.option_add("fr",    MACKBD_M0110F);
+	device.option_add("it",    MACKBD_M0110T);
+
+	device.option_add("pad",   MACKBD_M0120);
+	device.option_add("eupad", MACKBD_M0120P);
+
+	device.option_add("usp",   MACKBD_M0110A);
+	device.option_add("frp",   MACKBD_M0110A_F);
+	device.option_add("jpp",   MACKBD_M0110A_J);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/mackbd/mackbd.h mame-0.224+dfsg.1/src/devices/bus/mackbd/mackbd.h
--- mame-0.222+dfsg.1/src/devices/bus/mackbd/mackbd.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/mackbd/mackbd.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,91 @@
+// license: BSD-3-Clause
+// copyright-holders: Vas Crabb
+/***************************************************************************
+
+    Mac 128k/512k/Plus keyboard interface (pre-ADB)
+
+    4p4c RJ11 connector (cables wired straight through):
+    1: power/signal ground (black)
+    2: clock (red, peripheral to host)
+    3: data (green, bidirectional)
+    4: +5V power (yellow, maximum 200mA for all peripherals)
+
+***************************************************************************/
+#ifndef MAME_BUS_MACKBD_MACKBD_H
+#define MAME_BUS_MACKBD_MACKBD_H
+
+#pragma once
+
+
+class device_mac_keyboard_interface;
+
+DECLARE_DEVICE_TYPE(MAC_KEYBOARD_PORT, mac_keyboard_port_device)
+
+void mac_keyboard_devices(device_slot_interface &device);
+
+
+//**************************************************************************
+//  HOST PORT
+//**************************************************************************
+
+class mac_keyboard_port_device : public device_t, public device_single_card_slot_interface<device_mac_keyboard_interface>
+{
+public:
+	template <typename T>
+	mac_keyboard_port_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt)
+		: mac_keyboard_port_device(mconfig, tag, owner, 0U)
+	{
+		option_reset();
+		opts(*this);
+		set_default_option(dflt);
+		set_fixed(false);
+	}
+	mac_keyboard_port_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 0U);
+	virtual ~mac_keyboard_port_device() override;
+
+	auto clock_cb() { return m_clock_cb.bind(); }
+	auto data_cb() { return m_data_cb.bind(); }
+
+	DECLARE_WRITE_LINE_MEMBER(data_w);
+
+protected:
+	virtual void device_resolve_objects() override;
+	virtual void device_start() override;
+
+private:
+	devcb_write_line m_clock_cb;
+	devcb_write_line m_data_cb;
+
+	device_mac_keyboard_interface *m_peripheral;
+
+	friend class device_mac_keyboard_interface;
+};
+
+
+//**************************************************************************
+//  PERIPHERAL INTERFACE
+//**************************************************************************
+
+class device_mac_keyboard_interface : public device_interface
+{
+public:
+	virtual ~device_mac_keyboard_interface() override;
+
+protected:
+	device_mac_keyboard_interface(machine_config const &mconfig, device_t &device);
+
+	virtual void interface_validity_check(validity_checker &valid) const override;
+
+	DECLARE_WRITE_LINE_MEMBER(write_clock) { if (m_host) m_host->m_clock_cb(state); }
+	DECLARE_WRITE_LINE_MEMBER(write_data) { if (m_host) m_host->m_data_cb(state); }
+
+	virtual DECLARE_WRITE_LINE_MEMBER(data_w) = 0;
+
+private:
+	mac_keyboard_port_device *const m_host;
+
+	friend class mac_keyboard_port_device;
+};
+
+
+#endif // MAME_BUS_MACKBD_MACKBD_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/mackbd/pluskbd.cpp mame-0.224+dfsg.1/src/devices/bus/mackbd/pluskbd.cpp
--- mame-0.222+dfsg.1/src/devices/bus/mackbd/pluskbd.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/mackbd/pluskbd.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,505 @@
+// license: BSD-3-Clause
+// copyright-holders: Vas Crabb
+/***************************************************************************
+
+    Apple M0110A keyboard with integrated keypad
+
+    This keyboard emulates an M0120 keypad with an M0110 keyboard
+    plugged in to it.  Keypad keys and arrow keys produce scan codes
+    with the 0x79 prefix.  The keyboard simulates holding shift when
+    pressing the = / * + keys on the keypad.
+
+    This keyboard was only available in ANSI layout, no ISO layout
+    variants were made.  International markets continued to receive the
+    M0110/M0120 keyboard/keypad.  International variants of the M0110A
+    were eventually produced, differing only in key cap labels.  All
+    keys have the same shapes, sizes, positions and scan codes as they
+    do on the U.S. version.
+
+    Emulation based entirely on examining the MPU program and observing
+    behaviour.  There may be additional hardware in the keyboard that is
+    not emulated (e.g. a watchdog timer).
+
+    +-----------+---------------+
+    | Pin       | Keyboard      |
+    +-----------+---------------+
+    | P10 (27)  | row drive     |
+    | P11 (28)  | row drive     |
+    | P12 (29)  | row drive     |
+    | P13 (30)  | row drive     |
+    | P14 (31)  | row drive     |
+    | P15 (32)  | row drive     |
+    | P16 (33)  | row drive     |
+    | P17 (34)  | row drive     |
+    +-----------+---------------+
+    | P20 (21)  | row drive     |
+    | P21 (22)  | row drive     |
+    | P22 (23)  | Shift         |
+    | P23 (24)  | Caps Lock     |
+    | P24 (35)  | Option        |
+    | P25 (36)  | Command       |
+    | P26 (37)  | host clock    |
+    | P27 (38)  | host data     |
+    +-----------+---------------+
+    | DB0 (12)  | column read   |
+    | DB1 (13)  | column read   |
+    | DB2 (14)  | column read   |
+    | DB3 (15)  | column read   |
+    | DB4 (16)  | column read   |
+    | DB5 (17)  | column read   |
+    | DB6 (18)  | column read   |
+    | DB6 (19)  | column read   |
+    +-----------+---------------+
+
+    +-----+-----------------------------------------------------------+
+    |     | P10   P11   P12   P13   P14   P15   P16   P17   P20   P21 |
+    +-----+-----------------------------------------------------------+
+    | DB0 |        \    Left Right  Down  KP0   KP.   Ent             |
+    | DB1 | KP*   KP/   KP=  Clear  Bsp    =     -     0     Z        |
+    | DB2 | KP8   KP9   KP-    Up   KP1   KP2   KP3   KP+         KP7 |
+    | DB3 |  P     [     ]     '    Rtn   KP4   KP5   KP6   Spc       |
+    | DB4 |  D     F     G     H     J     K     L     ;     A     S  |
+    | DB5 |  W     E     R     T     Y     U     I     O    Tab    Q  |
+    | DB6 |  2     3     4     5     6     7     8     9     `     1  |
+    | DB7 |  V     B     N     M     ,     .     /           X     C  |
+    +-----+-----------------------------------------------------------+
+
+    Known part numbers:
+    * M0110A (U.S.)
+    * M0110A F (French)
+    * M0110A J (Japanese)
+
+    The French version has icons rather than English text for Backspace,
+    Tab, Caps Lock, Return, Shift, Option, Clear and Enter.
+
+    The Japanese version has katakana labels on the key caps in addition
+    to the Latin labels, ¥ (Yen) replacing \ (backslash), and カナ
+    (kana) replacing Caps Lock.  It is still has the ANSI "typewriter
+    shift" arrangement for Latin characters and ASCII punctuation (it
+    doesn't use the JIS "bit shift" arrangement).
+
+***************************************************************************/
+
+#include "emu.h"
+#include "pluskbd.h"
+
+#include "cpu/mcs48/mcs48.h"
+
+#define LOG_GENERAL     (1U << 0)
+#define LOG_MATRIX      (1U << 1)
+#define LOG_COMM        (1U << 2)
+
+//#define VERBOSE (LOG_GENERAL | LOG_MATRIX | LOG_COMM)
+//#define LOG_OUTPUT_STREAM std::cerr
+#include "logmacro.h"
+
+#define LOGMATRIX(...)      LOGMASKED(LOG_MATRIX, __VA_ARGS__)
+#define LOGCOMM(...)        LOGMASKED(LOG_COMM, __VA_ARGS__)
+
+
+namespace {
+
+ROM_START(keyboard)
+	ROM_REGION(0x0400, "mpu", 0)
+	ROM_LOAD("341-0332-a.bin", 0x000000, 0x000400, CRC(6554f5b6) SHA1(a80404a122d74721cda13b285c412057c2c78bd7))
+ROM_END
+
+
+class keyboard_base : public device_t, public device_mac_keyboard_interface
+{
+public:
+	CUSTOM_INPUT_MEMBER(host_data_r)
+	{
+		return m_host_data_in ^ 0x01;
+	}
+
+protected:
+	keyboard_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock)
+		: device_t(mconfig, type, tag, owner, clock)
+		, device_mac_keyboard_interface(mconfig, *this)
+		, m_mpu{ *this, "mpu" }
+		, m_rows{ *this, "ROW%u", 0U }
+	{
+	}
+
+	virtual tiny_rom_entry const *device_rom_region() const override
+	{
+		return ROM_NAME(keyboard);
+	}
+
+	virtual void device_add_mconfig(machine_config &config) override
+	{
+		I8048(config, m_mpu, 6_MHz_XTAL); // NEC 8048HC517 341-0332-A with ceramic resonator
+		m_mpu->set_addrmap(AS_IO, &keyboard_base::mpu_io);
+		m_mpu->p1_out_cb().set(FUNC(keyboard_base::p1_w));
+		m_mpu->p2_in_cb().set_ioport("P2");
+		m_mpu->p2_out_cb().set(FUNC(keyboard_base::p2_w));
+		m_mpu->bus_in_cb().set(FUNC(keyboard_base::bus_r));
+	}
+
+	virtual void device_start() override
+	{
+		m_row_drive = 0x03ffU;
+		m_host_clock_out = 1U;
+		m_host_data_out = 1U;
+		m_host_data_in = 0x01U;
+
+		save_item(NAME(m_row_drive));
+		save_item(NAME(m_host_clock_out));
+		save_item(NAME(m_host_data_out));
+		save_item(NAME(m_host_data_in));
+	}
+
+	virtual DECLARE_WRITE_LINE_MEMBER(data_w) override
+	{
+		machine().scheduler().synchronize(timer_expired_delegate(FUNC(keyboard_base::update_host_data), this), state);
+	}
+
+private:
+	void p1_w(u8 data)
+	{
+		m_row_drive = (m_row_drive & 0x0300) | u16(data);
+	}
+
+	void p2_w(u8 data)
+	{
+		m_row_drive = (m_row_drive & 0x00ff) | (u16(data & 0x03) << 8);
+
+		if (BIT(data, 6) != m_host_clock_out)
+		{
+			if (BIT(data, 6))
+				LOGCOMM("%s: host clock out 0 -> 1 data=%u\n", machine().describe_context(), (m_host_data_out && m_host_data_in) ? 1U : 0U);
+			else
+				LOGCOMM("%s: host clock out 1 -> 0\n", machine().describe_context());
+			write_clock(m_host_clock_out = BIT(data, 6));
+		}
+
+		if (BIT(data, 7) != m_host_data_out)
+		{
+			LOGCOMM("%s: host data out %u -> %u\n", machine().describe_context(), m_host_data_out, BIT(data, 7));
+			write_data(m_host_data_out = BIT(data, 7));
+		}
+	}
+
+	u8 bus_r()
+	{
+		u8 result(0xffU);
+		for (unsigned i = 0U; m_rows.size() > i; ++i)
+		{
+			if (!BIT(m_row_drive, i))
+				result &= m_rows[i]->read();
+		}
+		LOGMATRIX("read matrix: row drive = %X, result = %X\n", m_row_drive, result);
+		return result;
+	}
+
+	void mpu_io(address_map &map)
+	{
+		// MPU writes 0xff to these addresses before reading columns to ensure the bus pins aren't pulled down
+		map(0x2a, 0x33).nopw();
+	}
+
+	TIMER_CALLBACK_MEMBER(update_host_data)
+	{
+		if (bool(param) != bool(m_host_data_in))
+		{
+			LOGCOMM("host data in %u -> %u\n", m_host_data_in, param ? 1U : 0U);
+			m_host_data_in = param ? 0x01U : 0x00U;
+		}
+	}
+
+	required_device<mcs48_cpu_device> m_mpu;
+	required_ioport_array<10> m_rows;
+
+	u16 m_row_drive         = 0x03ffU;      // current bit pattern driving rows (active low)
+	u8  m_host_clock_out    = 1U;           // clock line drive to host (idle high)
+	u8  m_host_data_out     = 1U;           // data line drive to host (idle high)
+	u8  m_host_data_in      = 0x01U;        // data line drive from host (idle high)
+};
+
+
+INPUT_PORTS_START(keyboard_us)
+	PORT_START("ROW0")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ASTERISK)   PORT_CHAR(UCHAR_MAMEKEY(ASTERISK))   PORT_NAME("Keypad *")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD)      PORT_CHAR(UCHAR_MAMEKEY(8_PAD))      PORT_NAME("Keypad 8")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P)          PORT_CHAR('p')   PORT_CHAR('P')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D)          PORT_CHAR('d')   PORT_CHAR('D')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)          PORT_CHAR('w')   PORT_CHAR('W')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)          PORT_CHAR('2')   PORT_CHAR('@')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)          PORT_CHAR('v')   PORT_CHAR('V')
+
+	PORT_START("ROW1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH)  PORT_CHAR('\\')  PORT_CHAR('|')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH_PAD)  PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD))  PORT_NAME("Keypad /")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD)      PORT_CHAR(UCHAR_MAMEKEY(9_PAD))      PORT_NAME("Keypad 9")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR('[')   PORT_CHAR('{')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)          PORT_CHAR('f')   PORT_CHAR('F')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E)          PORT_CHAR('e')   PORT_CHAR('E')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)          PORT_CHAR('3')   PORT_CHAR('#')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)          PORT_CHAR('b')   PORT_CHAR('B')
+
+	PORT_START("ROW2")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT)       PORT_CHAR(UCHAR_MAMEKEY(LEFT))
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS_PAD) PORT_CHAR(UCHAR_MAMEKEY(EQUALS_PAD)) PORT_NAME("Keypad =")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS_PAD)  PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD))  PORT_NAME("Keypad -")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']')   PORT_CHAR('}')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G)          PORT_CHAR('g')   PORT_CHAR('G')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R)          PORT_CHAR('r')   PORT_CHAR('R')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)          PORT_CHAR('4')   PORT_CHAR('$')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)          PORT_CHAR('n')   PORT_CHAR('N')
+
+	PORT_START("ROW3")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT)      PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_NUMLOCK)    PORT_CHAR(UCHAR_MAMEKEY(NUMLOCK))    PORT_NAME("Keypad Clear")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP)         PORT_CHAR(UCHAR_MAMEKEY(UP))
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR('\'')  PORT_CHAR('"')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H)          PORT_CHAR('h')   PORT_CHAR('H')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T)          PORT_CHAR('t')   PORT_CHAR('T')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)          PORT_CHAR('5')   PORT_CHAR('%')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)          PORT_CHAR('m')   PORT_CHAR('M')
+
+	PORT_START("ROW4")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN)       PORT_CHAR(UCHAR_MAMEKEY(DOWN))
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE)  PORT_CHAR(0x08)                      PORT_NAME("Backspace")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1_PAD)      PORT_CHAR(UCHAR_MAMEKEY(1_PAD))      PORT_NAME("Keypad 1")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER)      PORT_CHAR(0x0d)                      PORT_NAME("Return")
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J)          PORT_CHAR('j')   PORT_CHAR('J')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)          PORT_CHAR('y')   PORT_CHAR('Y')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)          PORT_CHAR('6')   PORT_CHAR('^')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(',')   PORT_CHAR('<')
+
+	PORT_START("ROW5")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0_PAD)      PORT_CHAR(UCHAR_MAMEKEY(0_PAD))      PORT_NAME("Keypad 0")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS)     PORT_CHAR('=')   PORT_CHAR('+')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2_PAD)      PORT_CHAR(UCHAR_MAMEKEY(2_PAD))      PORT_NAME("Keypad 2")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4_PAD)      PORT_CHAR(UCHAR_MAMEKEY(4_PAD))      PORT_NAME("Keypad 4")
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K)          PORT_CHAR('k')   PORT_CHAR('K')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U)          PORT_CHAR('u')   PORT_CHAR('U')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)          PORT_CHAR('7')   PORT_CHAR('&')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)       PORT_CHAR('.')   PORT_CHAR('>')
+
+	PORT_START("ROW6")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL_PAD)    PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD))    PORT_NAME("Keypad .")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)      PORT_CHAR('-')   PORT_CHAR('_')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3_PAD)      PORT_CHAR(UCHAR_MAMEKEY(3_PAD))      PORT_NAME("Keypad 3")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5_PAD)      PORT_CHAR(UCHAR_MAMEKEY(5_PAD))      PORT_NAME("Keypad 5")
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L)          PORT_CHAR('l')   PORT_CHAR('L')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I)          PORT_CHAR('i')   PORT_CHAR('I')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)          PORT_CHAR('8')   PORT_CHAR('*')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('/')   PORT_CHAR('?')
+
+	PORT_START("ROW7")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER_PAD)  PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD))  PORT_NAME("Keypad Enter")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)          PORT_CHAR('0')   PORT_CHAR(')')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_PLUS_PAD)   PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD))   PORT_NAME("Keypad +")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6_PAD)      PORT_CHAR(UCHAR_MAMEKEY(6_PAD))      PORT_NAME("Keypad 6")
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)      PORT_CHAR(';')   PORT_CHAR(':')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O)          PORT_CHAR('o')   PORT_CHAR('O')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)          PORT_CHAR('9')   PORT_CHAR('(')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("ROW8")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)          PORT_CHAR('z')   PORT_CHAR('Z')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)          PORT_CHAR('a')   PORT_CHAR('A')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB)        PORT_CHAR(0x09)                      PORT_NAME("Tab")
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE)      PORT_CHAR('`')   PORT_CHAR('~')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)          PORT_CHAR('x')   PORT_CHAR('X')
+
+	PORT_START("ROW9")
+	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7_PAD)      PORT_CHAR(UCHAR_MAMEKEY(7_PAD))      PORT_NAME("Keypad 7")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)          PORT_CHAR('s')   PORT_CHAR('S')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)          PORT_CHAR('q')   PORT_CHAR('Q')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)          PORT_CHAR('1')   PORT_CHAR('!')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)          PORT_CHAR('c')   PORT_CHAR('C')
+
+	PORT_START("P2")
+	PORT_BIT(0x43, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)           PORT_NAME("Shift")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CAPSLOCK)                         PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_NAME("Caps Lock") PORT_TOGGLE
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LALT)   PORT_CODE(KEYCODE_RALT)   PORT_CHAR(UCHAR_SHIFT_2)           PORT_NAME("Option")
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL)                                                            PORT_NAME("Command")
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_CUSTOM) PORT_CUSTOM_MEMBER(keyboard_base, host_data_r)
+INPUT_PORTS_END
+
+INPUT_PORTS_START(keyboard_fr)
+	PORT_INCLUDE(keyboard_us)
+
+	PORT_MODIFY("ROW0")
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)          PORT_CHAR('z')   PORT_CHAR('Z')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)          PORT_CHAR(0xe9)  PORT_CHAR('2')      // é
+
+	PORT_MODIFY("ROW1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH)  PORT_CHAR('<')   PORT_CHAR('>')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR(0x2c6) PORT_CHAR(0xa8)     // ˆ ¨
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)          PORT_CHAR('"')   PORT_CHAR('3')
+
+	PORT_MODIFY("ROW2")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('$')   PORT_CHAR('*')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)          PORT_CHAR('\'')  PORT_CHAR('4')
+
+	PORT_MODIFY("ROW3")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR(0xf9)  PORT_CHAR('%')      // ù
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)          PORT_CHAR('(')   PORT_CHAR('5')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)          PORT_CHAR(',')   PORT_CHAR('?')
+
+	PORT_MODIFY("ROW4")
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)          PORT_CHAR(0xa7)  PORT_CHAR('6')      // §
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(';')   PORT_CHAR('.')
+
+	PORT_MODIFY("ROW5")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS)     PORT_CHAR('-')   PORT_CHAR('_')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)          PORT_CHAR(0xe8)  PORT_CHAR('7')      // è
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)       PORT_CHAR(':')   PORT_CHAR('/')
+
+	PORT_MODIFY("ROW6")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL_PAD)    PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD))    PORT_NAME("Keypad ,")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)      PORT_CHAR(')')   PORT_CHAR(0xb0)     // °
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)          PORT_CHAR('!')   PORT_CHAR('8')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('=')   PORT_CHAR('+')
+
+	PORT_MODIFY("ROW7")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)          PORT_CHAR(0xe0)  PORT_CHAR('0')      // à
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)      PORT_CHAR('m')   PORT_CHAR('M')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)          PORT_CHAR(0xe7)  PORT_CHAR('9')      // ç
+
+	PORT_MODIFY("ROW8")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)          PORT_CHAR('w')   PORT_CHAR('W')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)          PORT_CHAR('q')   PORT_CHAR('Q')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE)      PORT_CHAR('`')   PORT_CHAR(0xa3)     // £
+
+	PORT_MODIFY("ROW9")
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)          PORT_CHAR('a')   PORT_CHAR('A')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)          PORT_CHAR('&')   PORT_CHAR('1')
+INPUT_PORTS_END
+
+INPUT_PORTS_START(keyboard_jp)
+	PORT_INCLUDE(keyboard_us)
+
+	PORT_MODIFY("ROW0")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P)          PORT_CHAR('p')   PORT_CHAR('P')      PORT_NAME(u8"P  \u30bb")                // セ
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D)          PORT_CHAR('d')   PORT_CHAR('D')      PORT_NAME(u8"D  \u30b7")                // シ
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)          PORT_CHAR('w')   PORT_CHAR('W')      PORT_NAME(u8"W  \u30c6")                // テ
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)          PORT_CHAR('2')   PORT_CHAR('@')      PORT_NAME(u8"2  @  \u30d5")             // フ
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)          PORT_CHAR('v')   PORT_CHAR('V')      PORT_NAME(u8"V  \u30d2")                // ヒ
+
+	PORT_MODIFY("ROW1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH)  PORT_CHAR(0xa5)  PORT_CHAR('|')      PORT_NAME(u8"¥  |  \u30d8")             // ヘ
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR('[')   PORT_CHAR('{')      PORT_NAME(u8"[  {  \u309b  \u300d")     // ゛ 」
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)          PORT_CHAR('f')   PORT_CHAR('F')      PORT_NAME(u8"F  \u30cf")                // ハ
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E)          PORT_CHAR('e')   PORT_CHAR('E')      PORT_NAME(u8"E  \u30a4  \u30a3")        // イ ィ
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)          PORT_CHAR('3')   PORT_CHAR('#')      PORT_NAME(u8"3  #  \u30a2  \u30a1")     // ア ァ
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)          PORT_CHAR('b')   PORT_CHAR('B')      PORT_NAME(u8"B  \u30b3")                // コ
+
+	PORT_MODIFY("ROW2")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']')   PORT_CHAR('}')      PORT_NAME(u8"]  }  \u30e0  \u30fc")     // ム ー
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G)          PORT_CHAR('g')   PORT_CHAR('G')      PORT_NAME(u8"G  \u30ad")                // キ
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R)          PORT_CHAR('r')   PORT_CHAR('R')      PORT_NAME(u8"R  \u30b9")                // ス
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)          PORT_CHAR('4')   PORT_CHAR('$')      PORT_NAME(u8"4  $  \u30a6  \u30a5")     // ウ ゥ
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)          PORT_CHAR('n')   PORT_CHAR('N')      PORT_NAME(u8"N  \u30df")                // ミ
+
+	PORT_MODIFY("ROW3")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR('\'')  PORT_CHAR('"')      PORT_NAME(u8"'  \"  \u30b1  \u30ed")    // ケ ロ
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H)          PORT_CHAR('h')   PORT_CHAR('H')      PORT_NAME(u8"H  \u30af")                // ク
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T)          PORT_CHAR('t')   PORT_CHAR('T')      PORT_NAME(u8"T  \u30ab")                // カ
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)          PORT_CHAR('5')   PORT_CHAR('%')      PORT_NAME(u8"5  %  \u30a8  \u30a7")     // エ
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)          PORT_CHAR('m')   PORT_CHAR('M')      PORT_NAME(u8"M  \u30e2")                // モ
+
+	PORT_MODIFY("ROW4")
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J)          PORT_CHAR('j')   PORT_CHAR('J')      PORT_NAME(u8"J  \u30de")                // マ
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)          PORT_CHAR('y')   PORT_CHAR('Y')      PORT_NAME(u8"Y  \u30f3")                // ン
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)          PORT_CHAR('6')   PORT_CHAR('^')      PORT_NAME(u8"6  ^  \u30aa  \u30a9")     // オ ォ
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(',')   PORT_CHAR('<')      PORT_NAME(u8",  <  \u30cd  \u3001")     // ネ 、
+
+	PORT_MODIFY("ROW5")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS)     PORT_CHAR('=')   PORT_CHAR('+')      PORT_NAME(u8"=  +  \u309c  \u300c")     // ゜ 「
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K)          PORT_CHAR('k')   PORT_CHAR('K')      PORT_NAME(u8"K  \u30ce")                // ノ
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U)          PORT_CHAR('u')   PORT_CHAR('U')      PORT_NAME(u8"U  \u30ca")                // ナ
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)          PORT_CHAR('7')   PORT_CHAR('&')      PORT_NAME(u8"7  &  \u30e4  \u30e3")     // ヤ ャ
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)       PORT_CHAR('.')   PORT_CHAR('>')      PORT_NAME(u8".  >  \u30eb  \u3002")     // ル 。
+
+	PORT_MODIFY("ROW6")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)      PORT_CHAR('-')   PORT_CHAR('_')      PORT_NAME(u8"-  _  \u30db")             // ホ
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L)          PORT_CHAR('l')   PORT_CHAR('L')      PORT_NAME(u8"L  \u30ea")                // リ
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I)          PORT_CHAR('i')   PORT_CHAR('I')      PORT_NAME(u8"I  \u30cb")                // ニ
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)          PORT_CHAR('8')   PORT_CHAR('*')      PORT_NAME(u8"8  *  \u30e6  \u30e5")     // ユ ュ
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('/')   PORT_CHAR('?')      PORT_NAME(u8"/  ?  \u30e1  \u30fb")     // ム ・
+
+	PORT_MODIFY("ROW7")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)          PORT_CHAR('0')   PORT_CHAR(')')      PORT_NAME(u8"0  )  \u30ef  \u30f2")     // ワ ヲ
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)      PORT_CHAR(';')   PORT_CHAR(':')      PORT_NAME(u8";  :  \u30ec")             // レ
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O)          PORT_CHAR('o')   PORT_CHAR('O')      PORT_NAME(u8"O  \u30e9")                // ラ
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)          PORT_CHAR('9')   PORT_CHAR('(')      PORT_NAME(u8"9  (  \u30e8  \u30e7")     // ヨ ョ
+
+	PORT_MODIFY("ROW8")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)          PORT_CHAR('z')   PORT_CHAR('Z')      PORT_NAME(u8"Z  \u30c4  \u30c3")        // ツ ッ
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)          PORT_CHAR('a')   PORT_CHAR('A')      PORT_NAME(u8"A  \u30c1")                // チ
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)          PORT_CHAR('x')   PORT_CHAR('X')      PORT_NAME(u8"X  \u30b5")                // サ
+
+	PORT_MODIFY("ROW9")
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)          PORT_CHAR('s')   PORT_CHAR('S')      PORT_NAME(u8"S  \u30c8")                // ト
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)          PORT_CHAR('q')   PORT_CHAR('Q')      PORT_NAME(u8"Q  \u30bf")                // タ
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)          PORT_CHAR('1')   PORT_CHAR('!')      PORT_NAME(u8"1  !  \u30cc")             // ヌ
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)          PORT_CHAR('c')   PORT_CHAR('C')      PORT_NAME(u8"C  \u30bd")                // ソ
+
+	PORT_MODIFY("P2")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CAPSLOCK)   PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))   PORT_NAME(u8"\u30ab\u30ca (Kana)") PORT_TOGGLE // カナ
+INPUT_PORTS_END
+
+
+class m0110a_device : public keyboard_base
+{
+public:
+	m0110a_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+		: keyboard_base(mconfig, MACKBD_M0110A, tag, owner, clock)
+	{
+	}
+
+protected:
+	virtual ioport_constructor device_input_ports() const override
+	{
+		return INPUT_PORTS_NAME(keyboard_us);
+	}
+};
+
+class m0110a_f_device : public keyboard_base
+{
+public:
+	m0110a_f_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+		: keyboard_base(mconfig, MACKBD_M0110A_F, tag, owner, clock)
+	{
+	}
+
+protected:
+	virtual ioport_constructor device_input_ports() const override
+	{
+		return INPUT_PORTS_NAME(keyboard_fr);
+	}
+};
+
+class m0110a_j_device : public keyboard_base
+{
+public:
+	m0110a_j_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+		: keyboard_base(mconfig, MACKBD_M0110A_J, tag, owner, clock)
+	{
+	}
+
+protected:
+	virtual ioport_constructor device_input_ports() const override
+	{
+		return INPUT_PORTS_NAME(keyboard_jp);
+	}
+};
+
+} // anonymous namespace
+
+
+DEFINE_DEVICE_TYPE_PRIVATE(MACKBD_M0110A  , device_mac_keyboard_interface, m0110a_device,   "mackbd_m0110a",   "Macintosh Plus Keyboard (U.S. - M0110A)")
+DEFINE_DEVICE_TYPE_PRIVATE(MACKBD_M0110A_F, device_mac_keyboard_interface, m0110a_f_device, "mackbd_m0110a_f", "Macintosh Plus Keyboard (French - M0110A F)")
+DEFINE_DEVICE_TYPE_PRIVATE(MACKBD_M0110A_J, device_mac_keyboard_interface, m0110a_j_device, "mackbd_m0110a_j", "Macintosh Plus Keyboard (Japanese - M0110A J)")
diff -Nru mame-0.222+dfsg.1/src/devices/bus/mackbd/pluskbd.h mame-0.224+dfsg.1/src/devices/bus/mackbd/pluskbd.h
--- mame-0.222+dfsg.1/src/devices/bus/mackbd/pluskbd.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/mackbd/pluskbd.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,19 @@
+// license: BSD-3-Clause
+// copyright-holders: Vas Crabb
+/***************************************************************************
+
+    Apple M0110A keyboard with integrated keypad
+
+***************************************************************************/
+#ifndef MAME_BUS_MACKBD_PLUSKBD_H
+#define MAME_BUS_MACKBD_PLUSKBD_H
+
+#pragma once
+
+#include "mackbd.h"
+
+DECLARE_DEVICE_TYPE(MACKBD_M0110A,   device_mac_keyboard_interface)
+DECLARE_DEVICE_TYPE(MACKBD_M0110A_F, device_mac_keyboard_interface)
+DECLARE_DEVICE_TYPE(MACKBD_M0110A_J, device_mac_keyboard_interface)
+
+#endif // MAME_BUS_MACKBD_PLUSKBD_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/megadrive/md_slot.cpp mame-0.224+dfsg.1/src/devices/bus/megadrive/md_slot.cpp
--- mame-0.222+dfsg.1/src/devices/bus/megadrive/md_slot.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/megadrive/md_slot.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1033,8 +1033,8 @@
 
 	rom_start = (ROM8[0x1a1] << 24 | ROM8[0x1a0] << 16 | ROM8[0x1a3] << 8 | ROM8[0x1a2]);
 	rom_end = (ROM8[0x1a5] << 24 | ROM8[0x1a4] << 16 | ROM8[0x1a7] << 8 | ROM8[0x1a6]);
-	ram_start =  (ROM8[0x1a9] << 24 | ROM8[0x1a8] << 16 | ROM8[0x1ab] << 8 | ROM8[0x1aa]);;
-	ram_end = (ROM8[0x1ad] << 24 | ROM8[0x1ac] << 16 | ROM8[0x1af] << 8 | ROM8[0x1ae]);;
+	ram_start =  (ROM8[0x1a9] << 24 | ROM8[0x1a8] << 16 | ROM8[0x1ab] << 8 | ROM8[0x1aa]);
+	ram_end = (ROM8[0x1ad] << 24 | ROM8[0x1ac] << 16 | ROM8[0x1af] << 8 | ROM8[0x1ae]);
 	if (ROM8[0x1b1] == 'R' && ROM8[0x1b0] == 'A')
 	{
 		valid_sram = true;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/msx_slot/fs4600.cpp mame-0.224+dfsg.1/src/devices/bus/msx_slot/fs4600.cpp
--- mame-0.222+dfsg.1/src/devices/bus/msx_slot/fs4600.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/msx_slot/fs4600.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -134,7 +134,7 @@
 					break;
 
 				default:
-					logerror("msx_slot_fs4600: Unhandled write %02x to %04x\n", data, offset);;
+					logerror("msx_slot_fs4600: Unhandled write %02x to %04x\n", data, offset);
 					break;
 			}
 		}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/nes/disksys.cpp mame-0.224+dfsg.1/src/devices/bus/nes/disksys.cpp
--- mame-0.222+dfsg.1/src/devices/bus/nes/disksys.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/nes/disksys.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -23,6 +23,7 @@
 #include "disksys.h"
 #include "imagedev/flopdrv.h"
 #include "formats/nes_dsk.h"
+#include "speaker.h"
 
 #ifdef NES_PCB_DEBUG
 	#define VERBOSE 1
@@ -54,6 +55,11 @@
 void nes_disksys_device::device_add_mconfig(machine_config &config)
 {
 	LEGACY_FLOPPY(config, m_disk, 0, &nes_floppy_interface);
+
+	SPEAKER(config, "addon").front_center(); // connected to motherboard
+
+	RP2C33_SOUND(config, m_sound, XTAL(21'477'272)/12); // clock driven from motherboard?
+	m_sound->add_route(0, "addon", 0.2);
 }
 
 
@@ -102,6 +108,7 @@
 	, m_2c33_rom(*this, "drive")
 	, m_fds_data(nullptr)
 	, m_disk(*this, "floppy0")
+	, m_sound(*this, "rp2c33snd")
 	, irq_timer(nullptr)
 	, m_irq_count(0), m_irq_count_latch(0), m_irq_enable(0), m_irq_transfer(0), m_fds_motor_on(0), m_fds_door_closed(0), m_fds_current_side(0), m_fds_head_position(0), m_fds_status0(0), m_read_mode(0), m_drive_ready(0)
 	, m_fds_sides(0), m_fds_last_side(0), m_fds_count(0)
@@ -216,6 +223,8 @@
 	if (offset >= 0x20 && offset < 0x60)
 	{
 		// wavetable
+		if (m_sound_en)
+			m_sound->wave_w(offset - 0x20, data);
 	}
 
 	switch (offset)
@@ -233,6 +242,7 @@
 		case 0x03:
 			// bit0 - Enable disk I/O registers
 			// bit1 - Enable sound I/O registers
+			m_sound_en = BIT(data, 1);
 			break;
 		case 0x04:
 			// write data out to disk
@@ -277,6 +287,8 @@
 		case 0x68:  // $4088 - Mod table write
 		case 0x69:  // $4089 - Wave write / master volume
 		case 0x6a:  // $408a - Envelope speed
+			if (m_sound_en)
+				m_sound->write(offset - 0x60, data);
 			break;
 	}
 }
@@ -284,11 +296,13 @@
 uint8_t nes_disksys_device::read_ex(offs_t offset)
 {
 	LOG_MMC(("Famicom Disk System read_ex, offset: %04x\n", offset));
-	uint8_t ret;
+	uint8_t ret = 0x00;
 
 	if (offset >= 0x20 && offset < 0x60)
 	{
 		// wavetable
+		if (m_sound_en)
+			ret = m_sound->wave_r(offset - 0x20);
 	}
 
 	switch (offset)
@@ -351,6 +365,9 @@
 			break;
 		case 0x70:  // $4090 - Volume gain - write through $4080
 		case 0x72:  // $4092 - Mod gain - read through $4084
+			if (m_sound_en)
+				ret = m_sound->read(offset - 0x60);
+			break;
 		default:
 			ret = 0x00;
 			break;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/nes/disksys.h mame-0.224+dfsg.1/src/devices/bus/nes/disksys.h
--- mame-0.222+dfsg.1/src/devices/bus/nes/disksys.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/nes/disksys.h	2020-08-26 08:57:19.000000000 +0000
@@ -7,6 +7,7 @@
 
 #include "nxrom.h"
 #include "imagedev/flopdrv.h"
+#include "sound/rp2c33_snd.h"
 
 
 // ======================> nes_disksys_device
@@ -45,6 +46,7 @@
 
 	std::unique_ptr<uint8_t[]> m_fds_data;    // here, we store a copy of the disk
 	required_device<legacy_floppy_image_device> m_disk;
+	required_device<rp2c33_sound_device> m_sound;
 
 	static const device_timer_id TIMER_IRQ = 0;
 	emu_timer *irq_timer;
@@ -54,6 +56,7 @@
 
 	uint16_t m_irq_count, m_irq_count_latch;
 	int m_irq_enable, m_irq_transfer;
+	bool m_sound_en;
 
 	uint8_t m_fds_motor_on;
 	uint8_t m_fds_door_closed;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/nscsi/s1410.cpp mame-0.224+dfsg.1/src/devices/bus/nscsi/s1410.cpp
--- mame-0.222+dfsg.1/src/devices/bus/nscsi/s1410.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/nscsi/s1410.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,7 +3,15 @@
 #include "emu.h"
 #include "bus/nscsi/s1410.h"
 
-DEFINE_DEVICE_TYPE(NSCSI_S1410, nscsi_s1410_device, "scsi_s1410", "S1410 Hard Disk")
+#define LOG_GENERAL (1U << 0)
+#define LOG_COMMAND (1U << 1)
+#define LOG_DATA    (1U << 2)
+
+#define VERBOSE 0
+
+#include "logmacro.h"
+
+DEFINE_DEVICE_TYPE(NSCSI_S1410, nscsi_s1410_device, "scsi_s1410", "Xebec S1410 5.25 Inch Winchester Disk Controller")
 
 nscsi_s1410_device::nscsi_s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	nscsi_harddisk_device(mconfig, NSCSI_S1410, tag, owner, clock)
@@ -30,6 +38,7 @@
 	switch(scsi_cmdbuf[0]) {
 	case SC_TEST_UNIT_READY:
 	case SC_REZERO:
+	case SC_FORMAT_UNIT: // TODO does not support starting LBA
 	case SC_REQUEST_SENSE:
 	case SC_REASSIGN_BLOCKS:
 	case SC_READ:
@@ -42,15 +51,6 @@
 		}
 		break;
 
-	case SC_FORMAT_UNIT:
-		if (scsi_cmdbuf[1] >> 5) {
-			scsi_status_complete(SS_NOT_READY);
-			return;
-		}
-
-		scsi_status_complete(SS_GOOD);
-		break;
-
 	case SC_FORMAT_TRACK: {
 		if (scsi_cmdbuf[1] >> 5) {
 			scsi_status_complete(SS_NOT_READY);
@@ -134,15 +134,22 @@
 
 void nscsi_s1410_device::scsi_put_data(int id, int pos, uint8_t data)
 {
+	if(id != 2 && !pos) {
+		return nscsi_harddisk_device::scsi_put_data(id, pos, data);
+	}
+
 	switch(scsi_cmdbuf[0]) {
 	case SC_FORMAT_ALT_TRACK:
+		LOGMASKED(LOG_DATA, "s1410: scsi_put_data, id:%d pos:%d data:%02x %c\n", id, pos, data, data >= 0x20 && data < 0x7f ? (char)data : ' ');
 		break;
 
 	case SC_INIT_DRIVE_PARAMS:
+		LOGMASKED(LOG_DATA, "s1410: scsi_put_data, id:%d pos:%d data:%02x %c\n", id, pos, data, data >= 0x20 && data < 0x7f ? (char)data : ' ');
 		params[pos] = data;
 		break;
 
 	case SC_WRITE_SECTOR_BUFFER:
+		LOGMASKED(LOG_DATA, "s1410: scsi_put_data, id:%d pos:%d data:%02x %c\n", id, pos, data, data >= 0x20 && data < 0x7f ? (char)data : ' ');
 		block[pos] = data;
 		break;
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/nubus/nubus_image.cpp mame-0.224+dfsg.1/src/devices/bus/nubus/nubus_image.cpp
--- mame-0.222+dfsg.1/src/devices/bus/nubus/nubus_image.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/nubus/nubus_image.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -315,7 +315,7 @@
 	std::uint32_t count = 4;
 	std::uint32_t actualcount = 0;
 
-	data = ((data & 0xff) << 24) | ((data & 0xff00) << 8) | ((data & 0xff0000) >> 8) | ((data & 0xff000000) >> 24);
+	data = swapendian_int32(data);
 	if(filectx.fd) {
 		//data = big_endianize_int32(data);
 		if((filectx.bytecount + count) > filectx.filelen) count = filectx.filelen - filectx.bytecount;
@@ -345,7 +345,7 @@
 
 void nubus_image_device::file_len_w(uint32_t data)
 {
-	data = ((data & 0xff) << 24) | ((data & 0xff00) << 8) | ((data & 0xff0000) >> 8) | ((data & 0xff000000) >> 24);
+	data = swapendian_int32(data);
 	filectx.filelen = big_endianize_int32(data);
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/4in1.cpp mame-0.224+dfsg.1/src/devices/bus/odyssey2/4in1.cpp
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/4in1.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/4in1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,53 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+/******************************************************************************
+
+Videopac 31/40 cartridge emulation
+
+4KB ROM (program ROM is fixed, data ROM is 'bankswitched' via P11)
+
+Used in:
+- #31: Musician
+- #40: 4 in 1 Row
+
+******************************************************************************/
+
+#include "emu.h"
+#include "4in1.h"
+
+DEFINE_DEVICE_TYPE(O2_ROM_4IN1, o2_4in1_device, "o2_4in1", "Odyssey 2 Videopac 40")
+
+
+//-------------------------------------------------
+//  o2_4in1_device - constructor
+//-------------------------------------------------
+
+o2_4in1_device::o2_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, O2_ROM_4IN1, tag, owner, clock),
+	device_o2_cart_interface(mconfig, *this)
+{ }
+
+void o2_4in1_device::device_start()
+{
+	save_item(NAME(m_control));
+	save_item(NAME(m_bank));
+}
+
+void o2_4in1_device::cart_init()
+{
+	if (m_rom_size != 0x1000)
+		fatalerror("o2_4in1_device: ROM size must be 4KB\n");
+}
+
+
+//-------------------------------------------------
+//  mapper specific handlers
+//-------------------------------------------------
+
+u8 o2_4in1_device::io_read(offs_t offset)
+{
+	if (m_control & 2)
+		return m_rom[m_bank << 8 | offset];
+	else
+		return 0xff;
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/4in1.h mame-0.224+dfsg.1/src/devices/bus/odyssey2/4in1.h
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/4in1.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/4in1.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,47 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+/**********************************************************************
+
+    Videopac 31/40 cartridge emulation
+
+**********************************************************************/
+
+#ifndef MAME_BUS_ODYSSEY2_4IN1_H
+#define MAME_BUS_ODYSSEY2_4IN1_H
+
+#pragma once
+
+#include "slot.h"
+
+
+// ======================> o2_4in1_device
+
+class o2_4in1_device : public device_t,
+						public device_o2_cart_interface
+{
+public:
+	// construction/destruction
+	o2_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+
+	virtual void cart_init() override;
+
+	virtual u8 read_rom04(offs_t offset) override { return m_rom[offset + 0x400]; }
+	virtual u8 read_rom0c(offs_t offset) override { return m_rom[offset + 0xc00]; }
+
+	virtual void write_p1(u8 data) override { m_control = data; }
+	virtual void write_p2(u8 data) override { m_bank = data; }
+	virtual u8 io_read(offs_t offset) override;
+
+private:
+	u8 m_control = 0;
+	u8 m_bank = 0;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(O2_ROM_4IN1, o2_4in1_device)
+
+#endif // MAME_BUS_ODYSSEY2_4IN1_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/chess.cpp mame-0.224+dfsg.1/src/devices/bus/odyssey2/chess.cpp
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/chess.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/chess.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,43 +1,59 @@
 // license:BSD-3-Clause
-// copyright-holders:Fabio Priuli
-/***********************************************************************************************************
+// copyright-holders:hap
+/******************************************************************************
 
+Videopac C7010 Chess Module emulation
+The chess engine is "Gambiet", written by Wim Rens
 
- Videopac Chess Module emulation
-
- TODO:
-   - this code is just a stub... hence, almost everything is still to do!
-
- ***********************************************************************************************************/
+Hardware notes:
+- NSC800 (Z80-compatible) @ 4.43MHz
+- 8KB ROM, 2KB RAM
 
+******************************************************************************/
 
 #include "emu.h"
 #include "chess.h"
 
+DEFINE_DEVICE_TYPE(O2_ROM_CHESS, o2_chess_device, "o2_chess", "Odyssey 2 Videopac C7010")
+
 
 //-------------------------------------------------
 //  o2_chess_device - constructor
 //-------------------------------------------------
 
-DEFINE_DEVICE_TYPE(O2_ROM_CHESS, o2_chess_device, "o2_chess", "Odyssey 2 Videopac Chess Module")
+o2_chess_device::o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, O2_ROM_CHESS, tag, owner, clock),
+	device_o2_cart_interface(mconfig, *this),
+	m_maincpu(*this, "maincpu"),
+	m_latch(*this, "latch%u", 0)
+{ }
 
+void o2_chess_device::device_start()
+{
+	save_item(NAME(m_control));
+}
 
-o2_chess_device::o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: o2_rom_device(mconfig, O2_ROM_CHESS, tag, owner, clock)
-	, m_cpu(*this, "subcpu")
+void o2_chess_device::cart_init()
 {
+	if (m_rom_size != 0x2800)
+		fatalerror("o2_chess_device: Wrong ROM region size\n");
 }
 
 
+//-------------------------------------------------
+//  address maps
+//-------------------------------------------------
+
 void o2_chess_device::chess_mem(address_map &map)
 {
-	map(0x0000, 0x07ff).r(FUNC(o2_chess_device::read_rom04));
+	map(0x0000, 0x1fff).r(FUNC(o2_chess_device::internal_rom_r));
+	map(0xe000, 0xe7ff).mirror(0x1800).ram();
 }
 
 void o2_chess_device::chess_io(address_map &map)
 {
-	map.unmap_value_high();
 	map.global_mask(0xff);
+	map(0x00, 0x00).mirror(0xff).r(m_latch[1], FUNC(generic_latch_8_device::read)).w(m_latch[0], FUNC(generic_latch_8_device::write));
 }
 
 
@@ -47,7 +63,39 @@
 
 void o2_chess_device::device_add_mconfig(machine_config &config)
 {
-	NSC800(config, m_cpu, XTAL(4'000'000));
-	m_cpu->set_addrmap(AS_PROGRAM, &o2_chess_device::chess_mem);
-	m_cpu->set_addrmap(AS_IO, &o2_chess_device::chess_io);
+	// basic machine hardware
+	NSC800(config, m_maincpu, 4.433619_MHz_XTAL);
+	m_maincpu->set_addrmap(AS_PROGRAM, &o2_chess_device::chess_mem);
+	m_maincpu->set_addrmap(AS_IO, &o2_chess_device::chess_io);
+
+	GENERIC_LATCH_8(config, m_latch[0]);
+	GENERIC_LATCH_8(config, m_latch[1]);
+}
+
+
+//-------------------------------------------------
+//  mapper specific handlers
+//-------------------------------------------------
+
+void o2_chess_device::write_p1(u8 data)
+{
+	// P11: reset
+	m_maincpu->set_input_line(INPUT_LINE_RESET, (data & 2) ? CLEAR_LINE : ASSERT_LINE);
+
+	// P10,P14: must be low to access latches
+	m_control = data;
+}
+
+u8 o2_chess_device::io_read(offs_t offset)
+{
+	if ((offset & 0xa0) == 0xa0 && (m_control & 0x11) == 0)
+		return m_latch[0]->read();
+	else
+		return 0xff;
+}
+
+void o2_chess_device::io_write(offs_t offset, u8 data)
+{
+	if (offset & 0x80 && (m_control & 0x11) == 0)
+		m_latch[1]->write(data);
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/chess.h mame-0.224+dfsg.1/src/devices/bus/odyssey2/chess.h
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/chess.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/chess.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,32 +1,55 @@
 // license:BSD-3-Clause
-// copyright-holders:Fabio Priuli
+// copyright-holders:hap
+/**********************************************************************
+
+    Videopac C7010 Chess Module emulation
+
+**********************************************************************/
+
 #ifndef MAME_BUS_ODYSSEY2_CHESS_H
 #define MAME_BUS_ODYSSEY2_CHESS_H
 
 #pragma once
 
 #include "slot.h"
-#include "rom.h"
+
 #include "cpu/z80/z80.h"
+#include "machine/gen_latch.h"
 
 
 // ======================> o2_chess_device
 
-class o2_chess_device : public o2_rom_device
+class o2_chess_device : public device_t,
+						public device_o2_cart_interface
 {
 public:
 	// construction/destruction
 	o2_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 protected:
+	// device-level overrides
+	virtual void device_start() override;
 	virtual void device_add_mconfig(machine_config &config) override;
-//  virtual const rom_entry *device_rom_region() const;
+
+	virtual void cart_init() override;
+
+	virtual u8 read_rom04(offs_t offset) override { return m_rom[offset + 0x2000]; }
+	virtual u8 read_rom0c(offs_t offset) override { return read_rom04(offset); }
+
+	virtual void write_p1(u8 data) override;
+	virtual void io_write(offs_t offset, u8 data) override;
+	virtual u8 io_read(offs_t offset) override;
 
 private:
-	required_device<nsc800_device> m_cpu;
+	required_device<cpu_device> m_maincpu;
+	required_device_array<generic_latch_8_device, 2> m_latch;
+
+	u8 internal_rom_r(offs_t offset) { return m_rom[offset]; }
 
 	void chess_io(address_map &map);
 	void chess_mem(address_map &map);
+
+	u8 m_control = 0;
 };
 
 // device type definition
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/homecomp.cpp mame-0.224+dfsg.1/src/devices/bus/odyssey2/homecomp.cpp
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/homecomp.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/homecomp.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,170 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+/******************************************************************************
+
+Videopac+ C7420 Home Computer Module emulation
+
+This module only works on the Videopac+ G7400, although the cartridge can still
+be inserted into the Odyssey 2/G7000.
+
+Hardware notes:
+- Z80 @ 3.547MHz
+- 2*8KB ROM, 16KB RAM(2*TMS4416, 2 unpopulated sockets)
+- optional data recorder
+
+TODO:
+- lots of unacknowledged writes to latch 1, probably harmless
+- cassette data saved from MAME can be loaded fine, but other WAVs can't, even
+  when they are good quality, maybe a filter on the data input?
+
+******************************************************************************/
+
+#include "emu.h"
+#include "homecomp.h"
+#include "speaker.h"
+
+DEFINE_DEVICE_TYPE(O2_ROM_HOMECOMP, o2_homecomp_device, "o2_homecomp", "Odyssey 2 Videopac+ C7420")
+
+
+//-------------------------------------------------
+//  o2_homecomp_device - constructor
+//-------------------------------------------------
+
+o2_homecomp_device::o2_homecomp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, O2_ROM_HOMECOMP, tag, owner, clock),
+	device_o2_cart_interface(mconfig, *this),
+	m_maincpu(*this, "maincpu"),
+	m_latch(*this, "latch%u", 0),
+	m_cass(*this, "cassette")
+{ }
+
+void o2_homecomp_device::device_start()
+{
+	save_item(NAME(m_control));
+}
+
+void o2_homecomp_device::cart_init()
+{
+	if (m_rom_size != 0x4800)
+		fatalerror("o2_homecomp_device: Wrong ROM region size\n");
+}
+
+
+//-------------------------------------------------
+//  internal i/o
+//-------------------------------------------------
+
+u8 o2_homecomp_device::internal_io_r(offs_t offset)
+{
+	u8 data = 0;
+
+	// A7: input latch
+	if (~offset & 0x80)
+		data |= m_latch[1]->read();
+
+	// A6: other i/o
+	if (~offset & 0x40)
+	{
+		// d0: latch 0 status
+		data |= m_latch[0]->pending_r() ^ 1;
+
+		if (m_cass->is_playing() && m_cass->motor_on())
+		{
+			// d6: cass clock
+			// d7: cass data
+			double level = m_cass->input();
+			if (level > 0.04)
+				data |= 0xc0;
+			else if (level < -0.04)
+				data |= 0x80;
+		}
+	}
+
+	return data;
+}
+
+void o2_homecomp_device::internal_io_w(offs_t offset, u8 data)
+{
+	// A7: output latch
+	if (~offset & 0x80)
+		m_latch[0]->write(data);
+
+	// A6: other i/o
+	if (~offset & 0x40)
+	{
+		// d7: cass remote control (also with data)
+		m_cass->set_motor((data & 0x81) ? 1 : 0);
+
+		// d0: cass data
+		// d1: cass clock
+		double level = 0.0;
+		if (data & 1)
+			level = (data & 2) ? 0.8 : -0.8;
+		m_cass->output(level);
+	}
+}
+
+void o2_homecomp_device::homecomp_mem(address_map &map)
+{
+	map(0x0000, 0x3fff).r(FUNC(o2_homecomp_device::internal_rom_r));
+	map(0x8000, 0xbfff).ram();
+}
+
+void o2_homecomp_device::homecomp_io(address_map &map)
+{
+	map.global_mask(0xff);
+	map(0x00, 0xff).rw(FUNC(o2_homecomp_device::internal_io_r), FUNC(o2_homecomp_device::internal_io_w));
+}
+
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void o2_homecomp_device::device_add_mconfig(machine_config &config)
+{
+	// basic machine hardware
+	Z80(config, m_maincpu, 3.547_MHz_XTAL);
+	m_maincpu->set_addrmap(AS_PROGRAM, &o2_homecomp_device::homecomp_mem);
+	m_maincpu->set_addrmap(AS_IO, &o2_homecomp_device::homecomp_io);
+
+	GENERIC_LATCH_8(config, m_latch[0]);
+	GENERIC_LATCH_8(config, m_latch[1]);
+
+	// cassette
+	CASSETTE(config, m_cass);
+	m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_DISABLED);
+	SPEAKER(config, "cass_output").front_center(); // on data recorder
+	m_cass->add_route(ALL_OUTPUTS, "cass_output", 0.05);
+}
+
+
+//-------------------------------------------------
+//  mapper specific handlers
+//-------------------------------------------------
+
+void o2_homecomp_device::write_p1(u8 data)
+{
+	// P10: Z80 INT pin
+	// P10+P11: Z80 RESET pin
+	m_maincpu->set_input_line(INPUT_LINE_IRQ0, (data & 1) ? CLEAR_LINE : ASSERT_LINE);
+	m_maincpu->set_input_line(INPUT_LINE_RESET, (data & 3) ? CLEAR_LINE : ASSERT_LINE);
+
+	// P11: must be low to access latch 0
+	// P14: must be low to access latch 1
+	m_control = data;
+}
+
+u8 o2_homecomp_device::io_read(offs_t offset)
+{
+	if ((offset & 0xa0) == 0xa0 && ~m_control & 2)
+		return m_latch[0]->read();
+	else
+		return 0xff;
+}
+
+void o2_homecomp_device::io_write(offs_t offset, u8 data)
+{
+	if (offset & 0x80 && ~m_control & 0x10)
+		m_latch[1]->write(data);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/homecomp.h mame-0.224+dfsg.1/src/devices/bus/odyssey2/homecomp.h
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/homecomp.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/homecomp.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,63 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+/**********************************************************************
+
+    Videopac+ C7420 Home Computer Module emulation
+
+**********************************************************************/
+
+#ifndef MAME_BUS_ODYSSEY2_HOMECOMP_H
+#define MAME_BUS_ODYSSEY2_HOMECOMP_H
+
+#pragma once
+
+#include "slot.h"
+
+#include "cpu/z80/z80.h"
+#include "imagedev/cassette.h"
+#include "machine/gen_latch.h"
+
+
+// ======================> o2_homecomp_device
+
+class o2_homecomp_device : public device_t,
+						public device_o2_cart_interface
+{
+public:
+	// construction/destruction
+	o2_homecomp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_add_mconfig(machine_config &config) override;
+
+	virtual void cart_init() override;
+
+	virtual u8 read_rom04(offs_t offset) override { return m_rom[offset + 0x4000]; }
+	virtual u8 read_rom0c(offs_t offset) override { return read_rom04(offset); }
+
+	virtual void write_p1(u8 data) override;
+	virtual void io_write(offs_t offset, u8 data) override;
+	virtual u8 io_read(offs_t offset) override;
+	virtual DECLARE_READ_LINE_MEMBER(t0_read) override { return m_latch[0]->pending_r(); }
+
+private:
+	required_device<cpu_device> m_maincpu;
+	required_device_array<generic_latch_8_device, 2> m_latch;
+	required_device<cassette_image_device> m_cass;
+
+	void internal_io_w(offs_t offset, u8 data);
+	u8 internal_io_r(offs_t offset);
+	u8 internal_rom_r(offs_t offset) { return m_rom[offset]; }
+
+	void homecomp_io(address_map &map);
+	void homecomp_mem(address_map &map);
+
+	u8 m_control = 0;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(O2_ROM_HOMECOMP, o2_homecomp_device)
+
+#endif // MAME_BUS_ODYSSEY2_HOMECOMP_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/ktaa.cpp mame-0.224+dfsg.1/src/devices/bus/odyssey2/ktaa.cpp
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/ktaa.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/ktaa.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,52 @@
+// license:BSD-3-Clause
+// copyright-holders:Wilbert Pol, Fabio Priuli, hap
+/******************************************************************************
+
+Homebrew KTAA(Kill the Attacking Aliens) cartridge emulation
+
+Bankswitched ROM with page size of 3KB.
+
+******************************************************************************/
+
+#include "emu.h"
+#include "ktaa.h"
+
+DEFINE_DEVICE_TYPE(O2_ROM_KTAA, o2_ktaa_device, "o2_ktaa", "Odyssey 2 Homebrew KTAA")
+
+
+//-------------------------------------------------
+//  o2_ktaa_device - constructor
+//-------------------------------------------------
+
+o2_ktaa_device::o2_ktaa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, O2_ROM_KTAA, tag, owner, clock),
+	device_o2_cart_interface(mconfig, *this)
+{ }
+
+void o2_ktaa_device::device_start()
+{
+	save_item(NAME(m_bank));
+}
+
+void o2_ktaa_device::cart_init()
+{
+	if (m_rom_size != 0xc00 && m_rom_size != 0xc00*2 && m_rom_size != 0xc00*4)
+		fatalerror("o2_ktaa_device: ROM size must be multiple of 3KB\n");
+
+	m_bank_mask = (m_rom_size / 0xc00) - 1;
+}
+
+
+//-------------------------------------------------
+//  mapper specific handlers
+//-------------------------------------------------
+
+u8 o2_ktaa_device::read_rom04(offs_t offset)
+{
+	return m_rom[offset + m_bank * 0xc00];
+}
+
+u8 o2_ktaa_device::read_rom0c(offs_t offset)
+{
+	return m_rom[offset + 0x800 + m_bank * 0xc00];
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/ktaa.h mame-0.224+dfsg.1/src/devices/bus/odyssey2/ktaa.h
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/ktaa.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/ktaa.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,45 @@
+// license:BSD-3-Clause
+// copyright-holders:Wilbert Pol, Fabio Priuli, hap
+/**********************************************************************
+
+    Homebrew KTAA cartridge emulation
+
+**********************************************************************/
+
+#ifndef MAME_BUS_ODYSSEY2_KTAA_H
+#define MAME_BUS_ODYSSEY2_KTAA_H
+
+#pragma once
+
+#include "slot.h"
+
+
+// ======================> o2_ktaa_device
+
+class o2_ktaa_device : public device_t,
+						public device_o2_cart_interface
+{
+public:
+	// construction/destruction
+	o2_ktaa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+
+	virtual void cart_init() override;
+
+	virtual u8 read_rom04(offs_t offset) override;
+	virtual u8 read_rom0c(offs_t offset) override;
+
+	virtual void write_p1(u8 data) override { m_bank = data & m_bank_mask; }
+
+private:
+	u8 m_bank_mask = 0;
+	u8 m_bank = 0;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(O2_ROM_KTAA, o2_ktaa_device)
+
+#endif // MAME_BUS_ODYSSEY2_KTAA_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/rally.cpp mame-0.224+dfsg.1/src/devices/bus/odyssey2/rally.cpp
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/rally.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/rally.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,62 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+/******************************************************************************
+
+Videopac+ 55/58/59/60 cartridge emulation
+
+Bankswitched ROM via latch, either 16KB/2*8KB, or 4KB+8KB.
+
+Used in:
+- #55: Neutron Star
+- #58: Air Battle
+- #59: Helicopter Rescue
+- #60: Trans American Rally
+
+#55 and #58 also work on the G7000.
+
+******************************************************************************/
+
+#include "emu.h"
+#include "rally.h"
+
+DEFINE_DEVICE_TYPE(O2_ROM_RALLY, o2_rally_device, "o2_rally", "Odyssey 2 Videopac+ 60")
+
+
+//-------------------------------------------------
+//  o2_rally_device - constructor
+//-------------------------------------------------
+
+o2_rally_device::o2_rally_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, O2_ROM_RALLY, tag, owner, clock),
+	device_o2_cart_interface(mconfig, *this)
+{ }
+
+void o2_rally_device::device_start()
+{
+	save_item(NAME(m_control));
+	save_item(NAME(m_bank));
+}
+
+void o2_rally_device::cart_init()
+{
+	if (m_rom_size & (m_rom_size - 1) || m_rom_size < 0x800)
+		fatalerror("o2_rally_device: ROM size must be 2^x\n");
+}
+
+
+//-------------------------------------------------
+//  mapper specific handlers
+//-------------------------------------------------
+
+u8 o2_rally_device::read_rom04(offs_t offset)
+{
+	// P10 enables latch output
+	u8 bank = (m_control & 1) ? ~0 : m_bank;
+	return m_rom[(offset + bank * 0x800) & (m_rom_size - 1)];
+}
+
+void o2_rally_device::io_write(offs_t offset, u8 data)
+{
+	if (offset & 0x80 && ~m_control & 0x10)
+		m_bank = data;
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/rally.h mame-0.224+dfsg.1/src/devices/bus/odyssey2/rally.h
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/rally.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/rally.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,46 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+/**********************************************************************
+
+    Videopac+ 55/58/59/60 cartridge emulation
+
+**********************************************************************/
+
+#ifndef MAME_BUS_ODYSSEY2_RALLY_H
+#define MAME_BUS_ODYSSEY2_RALLY_H
+
+#pragma once
+
+#include "slot.h"
+
+
+// ======================> o2_rally_device
+
+class o2_rally_device : public device_t,
+						public device_o2_cart_interface
+{
+public:
+	// construction/destruction
+	o2_rally_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+
+	virtual void cart_init() override;
+
+	virtual u8 read_rom04(offs_t offset) override;
+	virtual u8 read_rom0c(offs_t offset) override { return read_rom04(offset); }
+
+	virtual void write_p1(u8 data) override { m_control = data; }
+	virtual void io_write(offs_t offset, u8 data) override;
+
+private:
+	u8 m_control = 0;
+	u8 m_bank = 0;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(O2_ROM_RALLY, o2_rally_device)
+
+#endif // MAME_BUS_ODYSSEY2_RALLY_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/rom.cpp mame-0.224+dfsg.1/src/devices/bus/odyssey2/rom.cpp
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/rom.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/rom.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,96 +1,43 @@
 // license:BSD-3-Clause
-// copyright-holders:Fabio Priuli
-/***********************************************************************************************************
+// copyright-holders:Wilbert Pol, Fabio Priuli, hap
+/******************************************************************************
 
+Standard cartridges emulation, optionally bankswitched up to 8KB.
 
- Magnavox Odyssey cart emulation
-
-
- ***********************************************************************************************************/
-
+******************************************************************************/
 
 #include "emu.h"
 #include "rom.h"
 
+DEFINE_DEVICE_TYPE(O2_ROM_STD, o2_rom_device, "o2_rom", "Odyssey 2 Standard Carts")
+
 
 //-------------------------------------------------
 //  o2_rom_device - constructor
 //-------------------------------------------------
 
-DEFINE_DEVICE_TYPE(O2_ROM_STD, o2_rom_device,   "o2_rom",   "Odyssey 2 Standard Carts")
-DEFINE_DEVICE_TYPE(O2_ROM_12K, o2_rom12_device, "o2_rom12", "Odyssey 2 12K Carts")
-DEFINE_DEVICE_TYPE(O2_ROM_16K, o2_rom16_device, "o2_rom16", "Odyssey 2 16K Carts")
-
-
-o2_rom_device::o2_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
-	: device_t(mconfig, type, tag, owner, clock)
-	, device_o2_cart_interface(mconfig, *this)
-	, m_bank_base(0)
-{
-}
-
-o2_rom_device::o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: o2_rom_device(mconfig, O2_ROM_STD, tag, owner, clock)
-{
-}
+o2_rom_device::o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, O2_ROM_STD, tag, owner, clock),
+	device_o2_cart_interface(mconfig, *this)
+{ }
 
-o2_rom12_device::o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: o2_rom_device(mconfig, O2_ROM_12K, tag, owner, clock)
+void o2_rom_device::device_start()
 {
+	save_item(NAME(m_bank));
 }
 
-o2_rom16_device::o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: o2_rom_device(mconfig, O2_ROM_16K, tag, owner, clock)
+void o2_rom_device::cart_init()
 {
+	m_cart_mask = (1 << (31 - count_leading_zeros(m_rom_size))) - 1;
 }
 
 
 //-------------------------------------------------
-//  device_start/device_reset - device-specific startup
+//  mapper specific handlers
 //-------------------------------------------------
 
-void o2_rom_device::device_start()
-{
-	save_item(NAME(m_bank_base));
-}
-
-void o2_rom_device::device_reset()
-{
-	m_bank_base = 0;
-}
-
-/*-------------------------------------------------
- mapper specific handlers
- -------------------------------------------------*/
-
-void o2_rom_device::write_bank(int bank)
-{
-	m_bank_base = bank;
-}
-
-uint8_t o2_rom_device::read_rom04(offs_t offset)
-{
-	return m_rom[(offset + (m_bank_base & 0x03) * 0x800) & (m_rom_size - 1)];
-}
-uint8_t o2_rom_device::read_rom0c(offs_t offset)
-{
-	return m_rom[(offset + (m_bank_base & 0x03) * 0x800) & (m_rom_size - 1)];
-}
-
-uint8_t o2_rom12_device::read_rom04(offs_t offset)
-{
-	return m_rom[offset + (m_bank_base & 0x03) * 0xc00];
-}
-uint8_t o2_rom12_device::read_rom0c(offs_t offset)
-{
-	return m_rom[offset + 0x800 + (m_bank_base & 0x03) * 0xc00];
-}
-
-uint8_t o2_rom16_device::read_rom04(offs_t offset)
-{
-	return m_rom[offset + 0x400 + (m_bank_base & 0x03) * 0x1000];
-}
-uint8_t o2_rom16_device::read_rom0c(offs_t offset)
+u8 o2_rom_device::read_rom04(offs_t offset)
 {
-	return m_rom[offset + 0xc00 + (m_bank_base & 0x03) * 0x1000];
+	offset = (offset + m_bank * 0x800) & m_cart_mask;
+	return (offset < m_rom_size) ? m_rom[offset] : 0xff;
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/rom.h mame-0.224+dfsg.1/src/devices/bus/odyssey2/rom.h
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/rom.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/rom.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,5 +1,11 @@
 // license:BSD-3-Clause
-// copyright-holders:Fabio Priuli
+// copyright-holders:Wilbert Pol, Fabio Priuli, hap
+/**********************************************************************
+
+    Standard cartridges emulation
+
+**********************************************************************/
+
 #ifndef MAME_BUS_ODYSSEY2_ROM_H
 #define MAME_BUS_ODYSSEY2_ROM_H
 
@@ -17,52 +23,23 @@
 	// construction/destruction
 	o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// reading and writing
-	virtual uint8_t read_rom04(offs_t offset) override;
-	virtual uint8_t read_rom0c(offs_t offset) override;
-
-	virtual void write_bank(int bank) override;
-
 protected:
-	o2_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
-
 	// device-level overrides
 	virtual void device_start() override;
-	virtual void device_reset() override;
-
-	int m_bank_base;
-};
-
-// ======================> o2_rom12_device
 
-class o2_rom12_device : public o2_rom_device
-{
-public:
-	// construction/destruction
-	o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	virtual void cart_init() override;
 
-	// reading and writing
-	virtual uint8_t read_rom04(offs_t offset) override;
-	virtual uint8_t read_rom0c(offs_t offset) override;
-};
+	virtual u8 read_rom04(offs_t offset) override;
+	virtual u8 read_rom0c(offs_t offset) override { return read_rom04(offset); }
 
-// ======================> o2_rom16_device
+	virtual void write_p1(u8 data) override { m_bank = data & 3; }
 
-class o2_rom16_device : public o2_rom_device
-{
-public:
-	// construction/destruction
-	o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-	// reading and writing
-	virtual uint8_t read_rom04(offs_t offset) override;
-	virtual uint8_t read_rom0c(offs_t offset) override;
+private:
+	u32 m_cart_mask = 0;
+	u8 m_bank = 0;
 };
 
-
 // device type definition
 DECLARE_DEVICE_TYPE(O2_ROM_STD, o2_rom_device)
-DECLARE_DEVICE_TYPE(O2_ROM_12K, o2_rom12_device)
-DECLARE_DEVICE_TYPE(O2_ROM_16K, o2_rom16_device)
 
 #endif // MAME_BUS_ODYSSEY2_ROM_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/slot.cpp mame-0.224+dfsg.1/src/devices/bus/odyssey2/slot.cpp
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/slot.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/slot.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -55,16 +55,6 @@
 }
 
 
-//-------------------------------------------------
-//  ram_alloc - alloc the space for the ram
-//-------------------------------------------------
-
-void device_o2_cart_interface::ram_alloc(uint32_t size)
-{
-	m_ram.resize(size);
-}
-
-
 //**************************************************************************
 //  LIVE DEVICE
 //**************************************************************************
@@ -78,6 +68,7 @@
 	, device_single_card_slot_interface<device_o2_cart_interface>(mconfig, *this)
 	, m_type(O2_STD)
 	, m_cart(nullptr)
+	, m_b(0)
 {
 }
 
@@ -114,9 +105,11 @@
 static const o2_slot slot_list[] =
 {
 	{ O2_STD,      "o2_rom" },
-	{ O2_ROM12,    "o2_rom12" },
-	{ O2_ROM16,    "o2_rom16" },
+	{ O2_4IN1,     "o2_4in1" },
+	{ O2_RALLY,    "o2_rally" },
+	{ O2_KTAA,     "o2_ktaa" },
 	{ O2_CHESS,    "o2_chess" },
+	{ O2_HOMECOMP, "o2_homecomp" },
 	{ O2_VOICE,    "o2_voice" }
 };
 
@@ -154,27 +147,25 @@
 		uint32_t size = !loaded_through_softlist() ? length() : get_software_region_length("rom");
 		m_cart->rom_alloc(size, tag());
 
-		if (!loaded_through_softlist())
-			fread(m_cart->get_rom_base(), size);
-		else
+		if (loaded_through_softlist())
+		{
 			memcpy(m_cart->get_rom_base(), get_software_region("rom"), size);
 
-		if (!loaded_through_softlist())
-		{
-			m_type = O2_STD;
-			if (size == 12288)
-				m_type = O2_ROM12;
-			if (size == 16384)
-				m_type = O2_ROM16;
-		}
-		else
-		{
 			const char *pcb_name = get_feature("slot");
 			if (pcb_name)
 				m_type = o2_get_pcb_id(pcb_name);
+
+			// Videopac+ determines whether the screen should have a border, with a gate connected
+			// to the cartridge B pin. This way, old Videopac games can still run in full screen.
+			m_b = bool(strtoul(get_feature("b_pin"), nullptr, 0)) ? 1 : 0;
+		}
+		else
+		{
+			fread(m_cart->get_rom_base(), size);
+			m_type = (size == 16384) ? O2_RALLY : O2_STD;
 		}
 
-		//printf("Type: %s\n", o2_get_slot(m_type));
+		m_cart->cart_init();
 
 		return image_init_result::PASS;
 	}
@@ -193,13 +184,7 @@
 	{
 		const char *slot_string;
 		uint32_t size = hook.image_file()->size();
-		int type = O2_STD;
-
-		if (size == 12288)
-			type = O2_ROM12;
-		if (size == 16384)
-			type = O2_ROM16;
-
+		int type = (size == 16384) ? O2_RALLY : O2_STD;
 		slot_string = o2_get_slot(type);
 
 		//printf("type: %s\n", slot_string);
@@ -231,7 +216,7 @@
 }
 
 /*-------------------------------------------------
- io_write
+ io
  -------------------------------------------------*/
 
 void o2_cart_slot_device::io_write(offs_t offset, uint8_t data)
@@ -240,16 +225,42 @@
 		m_cart->io_write(offset, data);
 }
 
+uint8_t o2_cart_slot_device::io_read(offs_t offset)
+{
+	if (m_cart)
+		return m_cart->io_read(offset);
+	else
+		return 0xff;
+}
+
+int o2_cart_slot_device::b_read()
+{
+	if (m_cart)
+	{
+		int b = m_cart->b_read();
+		const bool override = b != -1;
+		return override ? b : m_b;
+	}
+	else
+		return 0;
+}
+
 
 #include "bus/odyssey2/rom.h"
+#include "bus/odyssey2/4in1.h"
+#include "bus/odyssey2/rally.h"
+#include "bus/odyssey2/ktaa.h"
 #include "bus/odyssey2/chess.h"
+#include "bus/odyssey2/homecomp.h"
 #include "bus/odyssey2/voice.h"
 
 void o2_cart(device_slot_interface &device)
 {
-	device.option_add_internal("o2_rom",    O2_ROM_STD);
-	device.option_add_internal("o2_rom12",  O2_ROM_12K);
-	device.option_add_internal("o2_rom16",  O2_ROM_16K);
-	device.option_add_internal("o2_chess",  O2_ROM_CHESS);
-	device.option_add_internal("o2_voice",  O2_ROM_VOICE);
+	device.option_add_internal("o2_rom",      O2_ROM_STD);
+	device.option_add_internal("o2_4in1",     O2_ROM_4IN1);
+	device.option_add_internal("o2_rally",    O2_ROM_RALLY);
+	device.option_add_internal("o2_ktaa",     O2_ROM_KTAA);
+	device.option_add_internal("o2_chess",    O2_ROM_CHESS);
+	device.option_add_internal("o2_homecomp", O2_ROM_HOMECOMP);
+	device.option_add_internal("o2_voice",    O2_ROM_VOICE);
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/slot.h mame-0.224+dfsg.1/src/devices/bus/odyssey2/slot.h
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/slot.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/slot.h	2020-08-26 08:57:19.000000000 +0000
@@ -17,9 +17,11 @@
 enum
 {
 	O2_STD = 0,
-	O2_ROM12,
-	O2_ROM16,
+	O2_4IN1,
+	O2_RALLY,
+	O2_KTAA,
 	O2_CHESS,
+	O2_HOMECOMP,
 	O2_VOICE
 };
 
@@ -35,17 +37,19 @@
 	// reading and writing
 	virtual uint8_t read_rom04(offs_t offset) { return 0xff; }
 	virtual uint8_t read_rom0c(offs_t offset) { return 0xff; }
-	virtual void write_bank(int bank) { }
+	virtual void write_p1(uint8_t data) { }
+	virtual void write_p2(uint8_t data) { }
 
 	virtual void io_write(offs_t offset, uint8_t data) { }
+	virtual uint8_t io_read(offs_t offset) { return 0xff; }
 	virtual DECLARE_READ_LINE_MEMBER(t0_read) { return 0; }
+	virtual int b_read() { return -1; }
+
+	virtual void cart_init() { } // called after loading ROM
 
 	void rom_alloc(uint32_t size, const char *tag);
-	void ram_alloc(uint32_t size);
 	uint8_t* get_rom_base() { return m_rom; }
-	uint8_t* get_ram_base() { return &m_ram[0]; }
 	uint32_t get_rom_size() { return m_rom_size; }
-	uint32_t get_ram_size() { return m_ram.size(); }
 
 protected:
 	device_o2_cart_interface(const machine_config &mconfig, device_t &device);
@@ -53,7 +57,6 @@
 	// internal state
 	uint8_t *m_rom;
 	uint32_t m_rom_size;
-	std::vector<uint8_t> m_ram;
 };
 
 
@@ -86,7 +89,7 @@
 	virtual bool is_readable()  const noexcept override { return true; }
 	virtual bool is_writeable() const noexcept override { return false; }
 	virtual bool is_creatable() const noexcept override { return false; }
-	virtual bool must_be_loaded() const noexcept override { return false; }
+	virtual bool must_be_loaded() const noexcept override { return true; }
 	virtual bool is_reset_on_load() const noexcept override { return true; }
 	virtual const char *image_interface() const noexcept override { return "odyssey_cart"; }
 	virtual const char *file_extensions() const noexcept override { return "bin,rom"; }
@@ -100,9 +103,12 @@
 	uint8_t read_rom04(offs_t offset);
 	uint8_t read_rom0c(offs_t offset);
 	void io_write(offs_t offset, uint8_t data);
+	uint8_t io_read(offs_t offset);
 	DECLARE_READ_LINE_MEMBER(t0_read) { if (m_cart) return m_cart->t0_read(); else return 0; }
+	int b_read();
 
-	void write_bank(int bank)   { if (m_cart) m_cart->write_bank(bank); }
+	void write_p1(uint8_t data) { if (m_cart) m_cart->write_p1(data); }
+	void write_p2(uint8_t data) { if (m_cart) m_cart->write_p2(data); }
 
 protected:
 	// device-level overrides
@@ -113,6 +119,7 @@
 
 	int m_type;
 	device_o2_cart_interface* m_cart;
+	int m_b;
 };
 
 // device type definition
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/voice.cpp mame-0.224+dfsg.1/src/devices/bus/odyssey2/voice.cpp
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/voice.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/voice.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,41 +1,36 @@
 // license:BSD-3-Clause
-// copyright-holders:Fabio Priuli
-/***********************************************************************************************************
+// copyright-holders:Wilbert Pol, Fabio Priuli
+/******************************************************************************
 
+Magnavox The Voice emulation
 
- Magnavox The Voice emulation
-
- TODO:
-   - load speech ROM from softlist
-   - move external speech rom for S.I.D. the Spellbinder into the softlist entry
-
- ***********************************************************************************************************/
+TODO:
+- load speech ROM from softlist
+- move external speech rom for S.I.D. the Spellbinder into the softlist entry
 
+******************************************************************************/
 
 #include "emu.h"
 #include "voice.h"
 #include "speaker.h"
 
+DEFINE_DEVICE_TYPE(O2_ROM_VOICE, o2_voice_device, "o2_voice", "Odyssey 2 The Voice Passthrough Cart")
 
 //-------------------------------------------------
 //  o2_voice_device - constructor
 //-------------------------------------------------
 
-DEFINE_DEVICE_TYPE(O2_ROM_VOICE, o2_voice_device, "o2_voice", "Odyssey 2 The Voice Passthrough Cart")
-
-
-o2_voice_device::o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: o2_rom_device(mconfig, O2_ROM_VOICE, tag, owner, clock)
-	, m_speech(*this, "sp0256_speech")
-	, m_subslot(*this, "subslot")
-	, m_lrq_state(0)
-{
-}
-
+o2_voice_device::o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, O2_ROM_VOICE, tag, owner, clock),
+	device_o2_cart_interface(mconfig, *this),
+	m_speech(*this, "sp0256_speech"),
+	m_subslot(*this, "subslot")
+{ }
 
 void o2_voice_device::device_start()
 {
 	save_item(NAME(m_lrq_state));
+	save_item(NAME(m_control));
 }
 
 
@@ -47,7 +42,7 @@
 {
 	SPEAKER(config, "mono").front_center();
 
-	SP0256(config, m_speech, 3120000);
+	SP0256(config, m_speech, 3.12_MHz_XTAL);
 	m_speech->data_request_callback().set(FUNC(o2_voice_device::lrq_callback));
 	// The Voice uses a speaker with its own volume control so the relative volumes to use are subjective, these sound good
 	m_speech->add_route(ALL_OUTPUTS, "mono", 1.00);
@@ -81,15 +76,36 @@
 	return ROM_NAME( o2voice );
 }
 
+
+//-------------------------------------------------
+//  mapper specific handlers
+//-------------------------------------------------
+
 WRITE_LINE_MEMBER(o2_voice_device::lrq_callback)
 {
 	m_lrq_state = state;
 }
 
-void o2_voice_device::io_write(offs_t offset, uint8_t data)
+READ_LINE_MEMBER(o2_voice_device::t0_read)
 {
-	if (data & 0x20)
-		m_speech->ald_w(offset & 0x7f);
-	else
-		m_speech->reset();
+	// conflict with subslot T0
+	int state = (m_subslot->exists()) ? m_subslot->t0_read() : 0;
+	return state | (m_speech->lrq_r() ? 0 : 1);
+}
+
+void o2_voice_device::io_write(offs_t offset, u8 data)
+{
+	if (offset & 0x80 && ~m_control & 0x10)
+	{
+		// A0-A6: SP0256B A1-A7 (A8 to GND)
+		// D5: 7474 to SP0256B reset
+		if (data & 0x20)
+			m_speech->ald_w(offset & 0x7f);
+		else
+			m_speech->reset();
+	}
+
+	// possible conflict with subslot IO (works ok with 4in1, not with chess)
+	if (m_subslot->exists())
+		m_subslot->io_write(offset, data);
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/odyssey2/voice.h mame-0.224+dfsg.1/src/devices/bus/odyssey2/voice.h
--- mame-0.222+dfsg.1/src/devices/bus/odyssey2/voice.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/odyssey2/voice.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,47 +1,56 @@
 // license:BSD-3-Clause
-// copyright-holders:Fabio Priuli
+// copyright-holders:Wilbert Pol, Fabio Priuli
+/******************************************************************************
+
+    Magnavox The Voice emulation
+
+******************************************************************************/
+
 #ifndef MAME_BUS_ODYSSEY2_VOICE_H
 #define MAME_BUS_ODYSSEY2_VOICE_H
 
 #pragma once
 
 #include "slot.h"
-#include "rom.h"
 #include "sound/sp0256.h"
 
 
 // ======================> o2_voice_device
 
-class o2_voice_device : public o2_rom_device
+class o2_voice_device : public device_t,
+						public device_o2_cart_interface
 {
 public:
 	// construction/destruction
 	o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	// reading and writing
-	virtual uint8_t read_rom04(offs_t offset) override { if (m_subslot->exists()) return m_subslot->read_rom04(offset); else return 0xff; }
-	virtual uint8_t read_rom0c(offs_t offset) override { if (m_subslot->exists()) return m_subslot->read_rom0c(offset); else return 0xff; }
+	virtual u8 read_rom04(offs_t offset) override { return (m_subslot->exists()) ? m_subslot->read_rom04(offset) : 0xff; }
+	virtual u8 read_rom0c(offs_t offset) override { return (m_subslot->exists()) ? m_subslot->read_rom0c(offset) : 0xff; }
 
-	virtual void write_bank(int bank) override   { if (m_subslot->exists()) m_subslot->write_bank(bank); }
+	virtual void write_p1(u8 data) override { m_control = data; if (m_subslot->exists()) m_subslot->write_p1(data); }
+	virtual void write_p2(u8 data) override { if (m_subslot->exists()) m_subslot->write_p2(data); }
 
-	virtual void io_write(offs_t offset, uint8_t data) override;
-	virtual DECLARE_READ_LINE_MEMBER(t0_read) override { return m_speech->lrq_r() ? 0 : 1; }
+	virtual void io_write(offs_t offset, u8 data) override;
+	virtual u8 io_read(offs_t offset) override { return (m_subslot->exists()) ? m_subslot->io_read(offset) : 0xff; }
+	virtual DECLARE_READ_LINE_MEMBER(t0_read) override;
+	virtual int b_read() override { return (m_subslot->exists()) ? m_subslot->b_read() : -1; }
 
 protected:
 	// device-level overrides
 	virtual void device_start() override;
-	virtual void device_reset() override { }
 
 	virtual void device_add_mconfig(machine_config &config) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 
 private:
-	DECLARE_WRITE_LINE_MEMBER(lrq_callback);
-
 	required_device<sp0256_device> m_speech;
 	required_device<o2_cart_slot_device> m_subslot;
 
-	int m_lrq_state;
+	DECLARE_WRITE_LINE_MEMBER(lrq_callback);
+
+	int m_lrq_state = 0;
+	u8 m_control = 0;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/psx/gamebooster.cpp mame-0.224+dfsg.1/src/devices/bus/psx/gamebooster.cpp
--- mame-0.222+dfsg.1/src/devices/bus/psx/gamebooster.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/psx/gamebooster.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -80,7 +80,7 @@
 	else if (offset < 0x24000)
 	{
 		offset -= 0x20000;
-		uint16_t retval = 0;;
+		uint16_t retval = 0;
 
 		if (mem_mask & 0xff00) retval |= (m_cartslot->read_rom((offset*2)+1))<<8;
 		if (mem_mask & 0x00ff) retval |= m_cartslot->read_rom((offset*2)+0);
diff -Nru mame-0.222+dfsg.1/src/devices/bus/qbus/pc11.h mame-0.224+dfsg.1/src/devices/bus/qbus/pc11.h
--- mame-0.222+dfsg.1/src/devices/bus/qbus/pc11.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/qbus/pc11.h	2020-08-26 08:57:19.000000000 +0000
@@ -13,7 +13,7 @@
 
 #include "qbus.h"
 
-#include "includes/pdp11.h"
+#include "machine/pdp11.h"
 #include "softlist_dev.h"
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/qbus/qbus.cpp mame-0.224+dfsg.1/src/devices/bus/qbus/qbus.cpp
--- mame-0.222+dfsg.1/src/devices/bus/qbus/qbus.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/qbus/qbus.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -57,6 +57,7 @@
 	m_write_birq6(*this),
 	m_write_birq7(*this),
 	m_write_bdmr(*this),
+	m_card(nullptr),
 	m_bus(*this, DEVICE_SELF_OWNER)
 {
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/rs232/exorterm.cpp mame-0.224+dfsg.1/src/devices/bus/rs232/exorterm.cpp
--- mame-0.222+dfsg.1/src/devices/bus/rs232/exorterm.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/rs232/exorterm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,86 @@
+// license:BSD-3-Clause
+// copyright-holders:68bit
+
+#include "emu.h"
+#include "exorterm.h"
+
+exorterm155_terminal_device::exorterm155_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, SERIAL_TERMINAL_EXORTERM155, tag, owner, clock)
+	, device_rs232_port_interface(mconfig, *this)
+	, m_exorterm155(*this, "exorterm155")
+	, m_flow_control(*this, "FLOW_CONTROL")
+{
+}
+
+void exorterm155_terminal_device::device_add_mconfig(machine_config &config)
+{
+	EXORTERM155(config, m_exorterm155, 0);
+	m_exorterm155->rs232_conn_txd_handler().set(FUNC(exorterm155_terminal_device::output_rxd));
+	m_exorterm155->rs232_conn_rts_handler().set(FUNC(exorterm155_terminal_device::route_term_rts));
+	m_exorterm155->rs232_conn_dtr_handler().set(FUNC(exorterm155_terminal_device::route_term_dtr));
+}
+
+INPUT_PORTS_START(exorterm155_terminal)
+
+	PORT_START("FLOW_CONTROL")
+	PORT_CONFNAME(0x1, 1, "Flow Control") PORT_CHANGED_MEMBER(DEVICE_SELF, exorterm155_terminal_device, flow_control, 0)
+	PORT_CONFSETTING(0x00, "None")
+	PORT_CONFSETTING(0x01, "Terminal DTR to remote CTS")
+
+INPUT_PORTS_END
+
+ioport_constructor exorterm155_terminal_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(exorterm155_terminal);
+}
+
+WRITE_LINE_MEMBER(exorterm155_terminal_device::input_txd)
+{
+	m_exorterm155->rs232_conn_rxd_w(state);
+}
+
+WRITE_LINE_MEMBER(exorterm155_terminal_device::route_term_rts)
+{
+	// Loop the terminal RTS output to the terminal CTS input.
+	m_exorterm155->rs232_conn_cts_w(state);
+}
+
+// This terminal uses DTR for hardware flow control.
+WRITE_LINE_MEMBER(exorterm155_terminal_device::route_term_dtr)
+{
+	if (m_flow_control->read())
+	{
+		// Connect the terminal DTR output to CTS at the other end.
+		output_cts(state);
+	}
+
+	// Cache the state, in case the ioport setting changes.
+	m_dtr = state;
+}
+
+INPUT_CHANGED_MEMBER(exorterm155_terminal_device::flow_control)
+{
+	if (newval)
+		output_cts(m_dtr);
+	else
+		output_cts(0);
+}
+
+void exorterm155_terminal_device::device_start()
+{
+	save_item(NAME(m_dtr));
+}
+
+void exorterm155_terminal_device::device_reset()
+{
+	// To the terminal
+	m_exorterm155->rs232_conn_cts_w(0);
+
+	// To the computer
+	output_dcd(0);
+	output_dsr(0);
+	if (!m_flow_control->read())
+		output_cts(0);
+}
+
+DEFINE_DEVICE_TYPE(SERIAL_TERMINAL_EXORTERM155, exorterm155_terminal_device, "exorterm155_terminal", "EXORterm 155 Terminal")
diff -Nru mame-0.222+dfsg.1/src/devices/bus/rs232/exorterm.h mame-0.224+dfsg.1/src/devices/bus/rs232/exorterm.h
--- mame-0.222+dfsg.1/src/devices/bus/rs232/exorterm.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/rs232/exorterm.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,40 @@
+// license:BSD-3-Clause
+// copyright-holders:68bit
+
+#ifndef MAME_BUS_RS232_EXORTERM_H
+#define MAME_BUS_RS232_EXORTERM_H
+
+#pragma once
+
+#include "rs232.h"
+#include "machine/exorterm.h"
+
+
+class exorterm155_terminal_device : public device_t, public device_rs232_port_interface
+{
+public:
+	exorterm155_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	virtual DECLARE_WRITE_LINE_MEMBER(input_txd) override;
+
+	DECLARE_INPUT_CHANGED_MEMBER(flow_control);
+
+protected:
+	virtual void device_start() override;
+	virtual void device_reset() override;
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
+
+private:
+	required_device<exorterm155_device> m_exorterm155;
+	required_ioport m_flow_control;
+
+	DECLARE_WRITE_LINE_MEMBER(route_term_rts);
+	DECLARE_WRITE_LINE_MEMBER(route_term_dtr);
+
+	int m_dtr;
+};
+
+DECLARE_DEVICE_TYPE(SERIAL_TERMINAL_EXORTERM155, exorterm155_terminal_device)
+
+#endif // MAME_BUS_RS232_EXORTERM_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/rs232/printer.cpp mame-0.224+dfsg.1/src/devices/bus/rs232/printer.cpp
--- mame-0.222+dfsg.1/src/devices/bus/rs232/printer.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/rs232/printer.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -52,7 +52,7 @@
 	set_rcv_rate(rxbaud);
 
 	// TODO: make this configurable
-	output_rxd(0);
+	output_rxd(1);
 	output_dcd(0);
 	output_dsr(0);
 	output_cts(0);
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/atom.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/atom.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/atom.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/atom.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,120 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    ATOM hard disk interface for SAM Coupe
+
+***************************************************************************/
+
+#include "emu.h"
+#include "atom.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAM_ATOM_HDD, sam_atom_hdd_device, "sam_atom_hdd", "SAM Coupe ATOM HDD interface")
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void sam_atom_hdd_device::device_add_mconfig(machine_config &config)
+{
+	ATA_INTERFACE(config, m_ata).options(ata_devices, "hdd", nullptr, false);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  sam_atom_hdd_device - constructor
+//-------------------------------------------------
+
+sam_atom_hdd_device::sam_atom_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, SAM_ATOM_HDD, tag, owner, clock),
+	device_samcoupe_drive_interface(mconfig, *this),
+	m_ata(*this, "ata"),
+	m_address_latch(0),
+	m_read_latch(0x00), m_write_latch(0x00)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void sam_atom_hdd_device::device_start()
+{
+	// register for savestates
+	save_item(NAME(m_address_latch));
+	save_item(NAME(m_read_latch));
+	save_item(NAME(m_write_latch));
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+uint8_t sam_atom_hdd_device::read(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	switch (offset)
+	{
+		// high byte
+		case 0x06:
+			if (BIT(m_address_latch, 5))
+			{
+				uint16_t result = 0;
+
+				if (BIT(m_address_latch, 3) == 0)
+					result = m_ata->cs0_r(m_address_latch & 0x07);
+				if (BIT(m_address_latch, 4) == 0)
+					result = m_ata->cs1_r(m_address_latch & 0x07);
+
+				m_read_latch = result;
+				data = result >> 8;
+			}
+			break;
+
+		// low byte
+		case 0x07:
+			data = m_read_latch;
+			break;
+	}
+
+	return data;
+}
+
+void sam_atom_hdd_device::write(offs_t offset, uint8_t data)
+{
+	switch (offset)
+	{
+		// control
+		case 0x05:
+			if (BIT(data, 5))
+				m_address_latch = data;
+			break;
+
+		// high byte
+		case 0x06:
+			m_write_latch = data;
+			break;
+
+		// low byte
+		case 0x07:
+			if (BIT(m_address_latch, 5))
+			{
+				if (BIT(m_address_latch, 3) == 0)
+					m_ata->cs0_w(m_address_latch & 0x07, (m_write_latch << 8) | data);
+				if (BIT(m_address_latch, 4) == 0)
+					m_ata->cs1_w(m_address_latch & 0x07, (m_write_latch << 8) | data);
+			}
+			break;
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/atom.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/atom.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/atom.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/atom.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,48 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    ATOM hard disk interface for SAM Coupe
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_DRIVE_ATOM_H
+#define MAME_BUS_SAMCOUPE_DRIVE_ATOM_H
+
+#pragma once
+
+#include "drive.h"
+#include "bus/ata/ataintf.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> sam_atom_hdd_device
+
+class sam_atom_hdd_device : public device_t, public device_samcoupe_drive_interface
+{
+public:
+	// construction/destruction
+	sam_atom_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	// from host
+	virtual uint8_t read(offs_t offset) override;
+	virtual void write(offs_t offset, uint8_t data) override;
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+
+private:
+	required_device<ata_interface_device> m_ata;
+
+	int m_address_latch;
+	uint8_t m_read_latch, m_write_latch;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAM_ATOM_HDD, sam_atom_hdd_device)
+
+#endif // MAME_BUS_SAMCOUPE_DRIVE_ATOM_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/drive.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/drive.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/drive.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/drive.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,94 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Coupe Drive Slot
+
+    32-pin slot
+
+***************************************************************************/
+
+#include "emu.h"
+#include "drive.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAMCOUPE_DRIVE_PORT, samcoupe_drive_port_device, "samcoupe_drive_port", "SAM Coupe Drive Port")
+
+
+//**************************************************************************
+//  SLOT DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  samcoupe_drive_port_device - constructor
+//-------------------------------------------------
+
+samcoupe_drive_port_device::samcoupe_drive_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, SAMCOUPE_DRIVE_PORT, tag, owner, clock),
+	device_single_card_slot_interface<device_samcoupe_drive_interface>(mconfig, *this),
+	m_module(nullptr)
+{
+}
+
+//-------------------------------------------------
+//  samcoupe_drive_port_device - destructor
+//-------------------------------------------------
+
+samcoupe_drive_port_device::~samcoupe_drive_port_device()
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void samcoupe_drive_port_device::device_start()
+{
+	// get inserted module
+	m_module = get_card_device();
+}
+
+//-------------------------------------------------
+//  host to module interface
+//-------------------------------------------------
+
+uint8_t samcoupe_drive_port_device::read(offs_t offset)
+{
+	if (m_module)
+		return m_module->read(offset);
+
+	return 0xff;
+}
+
+void samcoupe_drive_port_device::write(offs_t offset, uint8_t data)
+{
+	if (m_module)
+		m_module->write(offset, data);
+}
+
+
+//**************************************************************************
+//  MODULE INTERFACE
+//**************************************************************************
+
+//-------------------------------------------------
+//  device_samcoupe_drive_interface - constructor
+//-------------------------------------------------
+
+device_samcoupe_drive_interface::device_samcoupe_drive_interface(const machine_config &mconfig, device_t &device) :
+	device_interface(device, "samcoupedrive")
+{
+	m_port = dynamic_cast<samcoupe_drive_port_device *>(device.owner());
+}
+
+//-------------------------------------------------
+//  ~device_samcoupe_drive_interface - destructor
+//-------------------------------------------------
+
+device_samcoupe_drive_interface::~device_samcoupe_drive_interface()
+{
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/drive.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/drive.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/drive.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/drive.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,96 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Coupe Drive Slot
+
+    32-pin slot
+
+     1A 0 VOLTS     1B WR
+     2A 0 VOLTS     2B A0
+     3A 0 VOLTS     3B A1
+     4A 0 VOLTS     4B D0
+     5A 0 VOLTS     5B D1
+     6A 0 VOLTS     6B D2
+     7A 0 VOLTS     7B D3
+     8A 0 VOLTS     8B D4
+     9A 0 VOLTS     9B D5
+    10A 0 VOLTS    10B D6
+    11A 0 VOLTS    11B D7
+    12A 0 VOLTS    12B 8 MHz
+    13A 0 VOLTS    13B RST
+    14A 0 VOLTS    14B N/C
+    15A 0 VOLTS    15B A2
+    16A 0 VOLTS    16B DISK 1 OR DISK 2
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_DRIVE_DRIVE_H
+#define MAME_BUS_SAMCOUPE_DRIVE_DRIVE_H
+
+#pragma once
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class device_samcoupe_drive_interface;
+
+// ======================> samcoupe_drive_port_device
+
+class samcoupe_drive_port_device : public device_t, public device_single_card_slot_interface<device_samcoupe_drive_interface>
+{
+public:
+	// construction/destruction
+	template <typename T>
+	samcoupe_drive_port_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, const char *dflt)
+		: samcoupe_drive_port_device(mconfig, tag, owner, uint32_t(0))
+	{
+		option_reset();
+		opts(*this);
+		set_default_option(dflt);
+		set_fixed(false);
+	}
+
+	samcoupe_drive_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	virtual ~samcoupe_drive_port_device();
+
+	// called from host
+	uint8_t read(offs_t offset);
+	void write(offs_t offset, uint8_t data);
+
+	DECLARE_WRITE_LINE_MEMBER( disk1_w );
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+
+private:
+	device_samcoupe_drive_interface *m_module;
+};
+
+// ======================> device_samcoupe_drive_interface
+
+class device_samcoupe_drive_interface : public device_interface
+{
+public:
+	// construction/destruction
+	virtual ~device_samcoupe_drive_interface();
+
+	virtual uint8_t read(offs_t offset) { return 0xff; }
+	virtual void write(offs_t offset, uint8_t data) { }
+
+protected:
+	device_samcoupe_drive_interface(const machine_config &mconfig, device_t &device);
+
+	samcoupe_drive_port_device *m_port;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAMCOUPE_DRIVE_PORT, samcoupe_drive_port_device)
+
+// include here so drivers don't need to
+#include "modules.h"
+
+#endif // MAME_BUS_SAMCOUPE_DRIVE_DRIVE_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/floppy.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/floppy.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/floppy.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/floppy.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,91 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    Internal floppy drive for SAM Coupe
+
+***************************************************************************/
+
+#include "emu.h"
+#include "floppy.h"
+#include "formats/coupedsk.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAM_FLOPPY, sam_floppy_device, "sam_floppy", "SAM Coupe Internal Floppy")
+
+FLOPPY_FORMATS_MEMBER( sam_floppy_device::floppy_formats )
+	FLOPPY_MGT_FORMAT
+FLOPPY_FORMATS_END
+
+static void samcoupe_floppies(device_slot_interface &device)
+{
+	device.option_add("35dd", FLOPPY_35_DD);
+}
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void sam_floppy_device::device_add_mconfig(machine_config &config)
+{
+	WD1772(config, m_fdc, 24_MHz_XTAL / 3);
+	FLOPPY_CONNECTOR(config, "fdc:0", samcoupe_floppies, "35dd", sam_floppy_device::floppy_formats);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  sam_floppy_device - constructor
+//-------------------------------------------------
+
+sam_floppy_device::sam_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, SAM_FLOPPY, tag, owner, clock),
+	device_samcoupe_drive_interface(mconfig, *this),
+	m_fdc(*this, "fdc"),
+	m_drive(*this, "fdc:0")
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void sam_floppy_device::device_start()
+{
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+uint8_t sam_floppy_device::read(offs_t offset)
+{
+	floppy_image_device *floppy = m_drive->get_device();
+
+	if (floppy)
+		floppy->ss_w(BIT(offset, 2));
+
+	m_fdc->set_floppy(floppy);
+
+	return m_fdc->read(offset & 0x03);
+}
+
+void sam_floppy_device::write(offs_t offset, uint8_t data)
+{
+	floppy_image_device *floppy = m_drive->get_device();
+
+	if (floppy)
+		floppy->ss_w(BIT(offset, 2));
+
+	m_fdc->set_floppy(floppy);
+
+	m_fdc->write(offset & 0x03, data);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/floppy.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/floppy.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/floppy.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/floppy.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,49 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    Internal floppy drive for SAM Coupe
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_DRIVE_FLOPPY_H
+#define MAME_BUS_SAMCOUPE_DRIVE_FLOPPY_H
+
+#pragma once
+
+#include "drive.h"
+#include "machine/wd_fdc.h"
+#include "imagedev/floppy.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> sam_floppy_device
+
+class sam_floppy_device : public device_t, public device_samcoupe_drive_interface
+{
+public:
+	// construction/destruction
+	sam_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	// from host
+	virtual uint8_t read(offs_t offset) override;
+	virtual void write(offs_t offset, uint8_t data) override;
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+
+private:
+	required_device<wd1772_device> m_fdc;
+	required_device<floppy_connector> m_drive;
+
+	DECLARE_FLOPPY_FORMATS( floppy_formats );
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAM_FLOPPY, sam_floppy_device)
+
+#endif // MAME_BUS_SAMCOUPE_DRIVE_FLOPPY_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/modules.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/modules.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/modules.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/modules.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,19 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Coupe Drive Port modules
+
+***************************************************************************/
+
+#include "emu.h"
+#include "modules.h"
+
+#include "atom.h"
+#include "floppy.h"
+
+void samcoupe_drive_modules(device_slot_interface &device)
+{
+	device.option_add("atom", SAM_ATOM_HDD);
+	device.option_add("floppy", SAM_FLOPPY);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/modules.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/modules.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/drive/modules.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/drive/modules.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,16 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Coupe Drive Port modules
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_DRIVE_MODULES_H
+#define MAME_BUS_SAMCOUPE_DRIVE_MODULES_H
+
+#pragma once
+
+void samcoupe_drive_modules(device_slot_interface &device);
+
+#endif // MAME_BUS_SAMCOUPE_DRIVE_MODULES_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/blue_sampler.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/blue_sampler.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/blue_sampler.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/blue_sampler.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,119 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    Blue Alpha Sound Sampler for SAM Coupe
+
+***************************************************************************/
+
+#include "emu.h"
+#include "machine/rescap.h"
+#include "sound/volt_reg.h"
+#include "blue_sampler.h"
+#include "speaker.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAM_BLUE_SOUND_SAMPLER, sam_blue_sound_sampler_device, "blue_sampler", "Blue Alpha Sound Sampler")
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void sam_blue_sound_sampler_device::device_add_mconfig(machine_config &config)
+{
+	SPEAKER(config, "mono").front_center();
+
+	I8255A(config, m_ppi);
+	m_ppi->out_pa_callback().set("dac", FUNC(dac_byte_interface::data_w));
+	m_ppi->out_pb_callback().set(FUNC(sam_blue_sound_sampler_device::ppi_portb_w));
+	m_ppi->in_pc_callback().set(FUNC(sam_blue_sound_sampler_device::ppi_portc_r));
+
+	ZN426E(config, m_dac, 0).add_route(ALL_OUTPUTS, "mono", 0.5);
+	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
+	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
+	vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
+
+	// TODO: ZN449E ADC
+
+	// 555 with variable resistor ~19.342hz
+	TIMER(config, "timer").configure_periodic(FUNC(sam_blue_sound_sampler_device::clock_callback), PERIOD_OF_555_MONOSTABLE(RES_K(1), CAP_N(47)));
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  sam_blue_sound_sampler_device - constructor
+//-------------------------------------------------
+
+sam_blue_sound_sampler_device::sam_blue_sound_sampler_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, SAM_BLUE_SOUND_SAMPLER, tag, owner, clock),
+	device_samcoupe_expansion_interface(mconfig, *this),
+	m_ppi(*this, "ppi"),
+	m_dac(*this, "dac"),
+	m_portc(0)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void sam_blue_sound_sampler_device::device_start()
+{
+	// register for savestates
+	save_item(NAME(m_portc));
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+TIMER_DEVICE_CALLBACK_MEMBER( sam_blue_sound_sampler_device::clock_callback )
+{
+	m_portc ^= 1;
+}
+
+void sam_blue_sound_sampler_device::ppi_portb_w(uint8_t data)
+{
+	// 765432--  not used
+	// ------1-  enable for adc
+	// -------0  enable for dac and ppi pc6
+
+	m_ppi->pc6_w(BIT(data, 0));
+}
+
+uint8_t sam_blue_sound_sampler_device::ppi_portc_r()
+{
+	// 7-------  not used
+	// -6------  from ppi pb0
+	// --5-----  not used
+	// ---4----  busy output from zn449e adc
+	// ----321-  not used
+	// --------  clock input from 555
+
+	return m_portc;
+}
+
+uint8_t sam_blue_sound_sampler_device::iorq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if ((offset & 0xff) == 0x7f)
+		return m_ppi->read(offset >> 8);
+
+	return data;
+}
+
+void sam_blue_sound_sampler_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if ((offset & 0xff) == 0x7f)
+		m_ppi->write(offset >> 8, data);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/blue_sampler.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/blue_sampler.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/blue_sampler.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/blue_sampler.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,54 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    Blue Alpha Sound Sampler for SAM Coupe
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_EXPANSION_BLUE_SAMPLER_H
+#define MAME_BUS_SAMCOUPE_EXPANSION_BLUE_SAMPLER_H
+
+#pragma once
+
+#include "expansion.h"
+#include "machine/i8255.h"
+#include "machine/timer.h"
+#include "sound/dac.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> sam_blue_sound_sampler_device
+
+class sam_blue_sound_sampler_device : public device_t, public device_samcoupe_expansion_interface
+{
+public:
+	// construction/destruction
+	sam_blue_sound_sampler_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	// from host
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+
+private:
+	TIMER_DEVICE_CALLBACK_MEMBER(clock_callback);
+	void ppi_portb_w(uint8_t data);
+	uint8_t ppi_portc_r();
+
+	required_device<i8255_device> m_ppi;
+	required_device<zn426e_device> m_dac;
+
+	uint8_t m_portc;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAM_BLUE_SOUND_SAMPLER, sam_blue_sound_sampler_device)
+
+#endif // MAME_BUS_SAMCOUPE_EXPANSION_BLUE_SAMPLER_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/dallas.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/dallas.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/dallas.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/dallas.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,80 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    Dallas Clock for SAM Coupe
+
+***************************************************************************/
+
+#include "emu.h"
+#include "dallas.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAM_DALLAS_CLOCK, sam_dallas_clock_device, "sam_dallas_clock", "Dallas Clock")
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void sam_dallas_clock_device::device_add_mconfig(machine_config &config)
+{
+	DS12885(config, m_rtc, 32.768_kHz_XTAL); // should be DS12887 or DS1287
+	m_rtc->set_24hrs(true);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  sam_dallas_clock_device - constructor
+//-------------------------------------------------
+
+sam_dallas_clock_device::sam_dallas_clock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, SAM_DALLAS_CLOCK, tag, owner, clock),
+	device_samcoupe_expansion_interface(mconfig, *this),
+	m_rtc(*this, "rtc"),
+	m_print(0)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void sam_dallas_clock_device::device_start()
+{
+	// register for savestates
+	save_item(NAME(m_print));
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+void sam_dallas_clock_device::print_w(int state)
+{
+	m_print = state;
+}
+
+uint8_t sam_dallas_clock_device::iorq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (m_print && (offset & 0xfe07) == 0xfe07)
+		data &= m_rtc->read((offset >> 8) & 0x01);
+
+	return data;
+}
+
+void sam_dallas_clock_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if (m_print && (offset & 0xfe07) == 0xfe07)
+		m_rtc->write((offset >> 8) & 0x01, data);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/dallas.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/dallas.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/dallas.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/dallas.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,49 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    Dallas Clock for SAM Coupe
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_EXPANSION_DALLAS_H
+#define MAME_BUS_SAMCOUPE_EXPANSION_DALLAS_H
+
+#pragma once
+
+#include "expansion.h"
+#include "machine/ds128x.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> sam_dallas_clock_device
+
+class sam_dallas_clock_device : public device_t, public device_samcoupe_expansion_interface
+{
+public:
+	// construction/destruction
+	sam_dallas_clock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	// from host
+	virtual void print_w(int state) override;
+
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+
+private:
+	required_device<ds12885_device> m_rtc;
+
+	int m_print;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAM_DALLAS_CLOCK, sam_dallas_clock_device)
+
+#endif // MAME_BUS_SAMCOUPE_EXPANSION_DALLAS_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/expansion.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/expansion.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/expansion.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/expansion.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,124 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Coupe Expansion Slot
+
+    64-pin slot
+
+***************************************************************************/
+
+#include "emu.h"
+#include "expansion.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAMCOUPE_EXPANSION, samcoupe_expansion_device, "samcoupe_expansion", "SAM Coupe Expansion Bus")
+
+
+//**************************************************************************
+//  SLOT DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  samcoupe_expansion_device - constructor
+//-------------------------------------------------
+
+samcoupe_expansion_device::samcoupe_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, SAMCOUPE_EXPANSION, tag, owner, clock),
+	device_single_card_slot_interface<device_samcoupe_expansion_interface>(mconfig, *this),
+	m_int_handler(*this),
+	m_module(nullptr)
+{
+}
+
+//-------------------------------------------------
+//  samcoupe_expansion_device - destructor
+//-------------------------------------------------
+
+samcoupe_expansion_device::~samcoupe_expansion_device()
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void samcoupe_expansion_device::device_start()
+{
+	// get inserted module
+	m_module = get_card_device();
+
+	// resolve callbacks
+	m_int_handler.resolve_safe();
+}
+
+//-------------------------------------------------
+//  host to module interface
+//-------------------------------------------------
+
+uint8_t samcoupe_expansion_device::mreq_r(offs_t offset)
+{
+	if (m_module)
+		return m_module->mreq_r(offset);
+
+	return 0xff;
+}
+
+void samcoupe_expansion_device::mreq_w(offs_t offset, uint8_t data)
+{
+	if (m_module)
+		m_module->mreq_w(offset, data);
+}
+
+uint8_t samcoupe_expansion_device::iorq_r(offs_t offset)
+{
+	if (m_module)
+		return m_module->iorq_r(offset);
+
+	return 0xff;
+}
+
+void samcoupe_expansion_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if (m_module)
+		m_module->iorq_w(offset, data);
+}
+
+WRITE_LINE_MEMBER( samcoupe_expansion_device::xmem_w )
+{
+		if (m_module)
+			m_module->xmem_w(state);
+}
+
+WRITE_LINE_MEMBER( samcoupe_expansion_device::print_w )
+{
+		if (m_module)
+			m_module->print_w(state);
+}
+
+
+//**************************************************************************
+//  MODULE INTERFACE
+//**************************************************************************
+
+//-------------------------------------------------
+//  device_samcoupe_expansion_interface - constructor
+//-------------------------------------------------
+
+device_samcoupe_expansion_interface::device_samcoupe_expansion_interface(const machine_config &mconfig, device_t &device) :
+	device_interface(device, "samcoupeexp")
+{
+	m_expansion = dynamic_cast<samcoupe_expansion_device *>(device.owner());
+}
+
+//-------------------------------------------------
+//  ~device_samcoupe_expansion_interface - destructor
+//-------------------------------------------------
+
+device_samcoupe_expansion_interface::~device_samcoupe_expansion_interface()
+{
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/expansion.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/expansion.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/expansion.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/expansion.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,128 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Coupe Expansion Slot
+
+    64-pin slot
+
+     1A DBDIR       1C IORQL
+     2A RDL         2C MREQL
+     3A WRL         3C HALTL
+     4A BUSAKL      4C NMIL
+     5A WAITL       5C INTL
+     6A BUSREQL     6C CD1
+     7A RESETL      7C CD0
+     8A CM1L        8C CD7
+     9A REFRESHL    9C CD2
+    10A 0 VOLTS    10C +5 VOLTS
+    11A A0         11C CD6
+    12A A1         12C CD5
+    13A A2         13C CD3
+    14A A3         14C CD4
+    15A A4         15C CPU CLK
+    16A A5         16C A15
+    17A A6         17C A14
+    18A A7         18C A13
+    19A A8         19C A12
+    20A A9         20C A11
+    21A A10        21C DISK 2L
+    22A MSEINTL    22C ROMCSL
+    23A XMEML      23C EARMIC
+    24A 8 MHz      24C DISK 1L
+    25A RED 1      25C PRINTL
+    26A GREEN 1    26C BLUE 1
+    27A C SYNC     27C ROMCSRL
+    28A SPEN       28C AUDIO RIGHT
+    29A BLUE 0     29C AUDIO LEFT
+    30A RED 0      30C COMP VIDEO
+    31A BRIGHT     31C GREEN 0
+    32A +5 VOLTS   32C 0 VOLTS
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_EXPANSION_EXPANSION_H
+#define MAME_BUS_SAMCOUPE_EXPANSION_EXPANSION_H
+
+#pragma once
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class device_samcoupe_expansion_interface;
+
+// ======================> samcoupe_expansion_device
+
+class samcoupe_expansion_device : public device_t, public device_single_card_slot_interface<device_samcoupe_expansion_interface>
+{
+public:
+	// construction/destruction
+	template <typename T>
+	samcoupe_expansion_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts)
+		: samcoupe_expansion_device(mconfig, tag, owner, uint32_t(0))
+	{
+		option_reset();
+		opts(*this);
+		set_default_option(nullptr);
+		set_fixed(false);
+	}
+
+	samcoupe_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	virtual ~samcoupe_expansion_device();
+
+	// callbacks
+	auto int_handler() { return m_int_handler.bind(); }
+
+	// called from cart device
+	DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int_handler(state); }
+
+	// called from host
+	uint8_t mreq_r(offs_t offset);
+	void mreq_w(offs_t offset, uint8_t data);
+	uint8_t iorq_r(offs_t offset);
+	void iorq_w(offs_t offset, uint8_t data);
+
+	DECLARE_WRITE_LINE_MEMBER( xmem_w );
+	DECLARE_WRITE_LINE_MEMBER( print_w );
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+
+private:
+	devcb_write_line m_int_handler;
+
+	device_samcoupe_expansion_interface *m_module;
+};
+
+// ======================> device_samcoupe_expansion_interface
+
+class device_samcoupe_expansion_interface : public device_interface
+{
+public:
+	// construction/destruction
+	virtual ~device_samcoupe_expansion_interface();
+
+	virtual uint8_t mreq_r(offs_t offset) { return 0xff; }
+	virtual void mreq_w(offs_t offset, uint8_t data) { }
+	virtual uint8_t iorq_r(offs_t offset) { return 0xff; }
+	virtual void iorq_w(offs_t offset, uint8_t data) { }
+
+	virtual void xmem_w(int state) { }
+	virtual void print_w(int state) { }
+
+protected:
+	device_samcoupe_expansion_interface(const machine_config &mconfig, device_t &device);
+
+	samcoupe_expansion_device *m_expansion;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAMCOUPE_EXPANSION, samcoupe_expansion_device)
+
+// include here so drivers don't need to
+#include "modules.h"
+
+#endif // MAME_BUS_SAMCOUPE_EXPANSION_EXPANSION_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/modules.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/modules.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/modules.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/modules.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,32 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Coupe Expansion Slot modules
+
+***************************************************************************/
+
+#include "emu.h"
+#include "modules.h"
+
+#include "blue_sampler.h"
+#include "dallas.h"
+#include "onemeg.h"
+#include "sambus.h"
+#include "sdide.h"
+#include "sid.h"
+#include "spi.h"
+#include "voicebox.h"
+
+void samcoupe_expansion_modules(device_slot_interface &device)
+{
+	device.option_add("blue_sampler", SAM_BLUE_SOUND_SAMPLER);
+	device.option_add("dallas", SAM_DALLAS_CLOCK);
+	device.option_add("onemeg", SAM_ONEMEG);
+	device.option_add("sambus", SAM_SAMBUS);
+	device.option_add("sdide", SAM_SDIDE);
+	device.option_add("sid6581", SAM_SID6581);
+	device.option_add("sid8580", SAM_SID8580);
+	device.option_add("spi", SAM_SPI);
+	device.option_add("voicebox", SAM_VOICEBOX);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/modules.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/modules.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/modules.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/modules.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,16 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Coupe Expansion Slot modules
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_EXPANSION_MODULES_H
+#define MAME_BUS_SAMCOUPE_EXPANSION_MODULES_H
+
+#pragma once
+
+void samcoupe_expansion_modules(device_slot_interface &device);
+
+#endif // MAME_BUS_SAMCOUPE_EXPANSION_MODULES_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/onemeg.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/onemeg.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/onemeg.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/onemeg.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,110 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    1 Mb Interface for SAM Coupe
+
+***************************************************************************/
+
+#include "emu.h"
+#include "onemeg.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAM_ONEMEG, sam_onemeg_device, "onemeg", "1 Mb Interface")
+
+//-------------------------------------------------
+//  input_ports - device-specific input ports
+//-------------------------------------------------
+
+static INPUT_PORTS_START( onemeg )
+	PORT_START("dip")
+	PORT_DIPNAME(0x03, 0x03, "Board ID")
+	PORT_DIPSETTING(0x00, "1")
+	PORT_DIPSETTING(0x01, "2")
+	PORT_DIPSETTING(0x02, "3")
+	PORT_DIPSETTING(0x03, "4")
+INPUT_PORTS_END
+
+ioport_constructor sam_onemeg_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME( onemeg );
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  sam_onemeg_device - constructor
+//-------------------------------------------------
+
+sam_onemeg_device::sam_onemeg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, SAM_ONEMEG, tag, owner, clock),
+	device_samcoupe_expansion_interface(mconfig, *this),
+	m_dip(*this, "dip"),
+	m_xmem(0),
+	m_expage{ 0x00, 0x00 }
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void sam_onemeg_device::device_start()
+{
+	// init ram
+	m_ram = std::make_unique<uint8_t[]>(0x100000);
+	memset(m_ram.get(), 0x55, 0x100000);
+
+	// register for savestates
+	save_item(NAME(m_xmem));
+	save_item(NAME(m_expage[0]));
+	save_item(NAME(m_expage[1]));
+	save_pointer(NAME(m_ram), 0x100000);
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+void sam_onemeg_device::xmem_w(int state)
+{
+	m_xmem = state;
+}
+
+uint8_t sam_onemeg_device::mreq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	// read if external memory is enabled and the id matches
+	if (m_xmem && (m_expage[BIT(offset, 14)] >> 6 == m_dip->read()))
+		data = m_ram[((m_expage[BIT(offset, 14)] & 0x3f) << 14) | (offset & 0x3fff)];
+
+	return data;
+}
+
+void sam_onemeg_device::mreq_w(offs_t offset, uint8_t data)
+{
+	// write if external memory is enabled and the id matches
+	if (m_xmem && (m_expage[BIT(offset, 14)] >> 6 == m_dip->read()))
+		m_ram[((m_expage[BIT(offset, 14)] & 0x3f) << 14) | (offset & 0x3fff)] = data;
+}
+
+void sam_onemeg_device::iorq_w(offs_t offset, uint8_t data)
+{
+	// 0x80: EXPAGE-C
+	// 0x81: EXPAGE-D
+
+	// 76------  selected memory expansion
+	// --543210  memory bank
+
+	if ((offset & 0xfe) == 0x80)
+		m_expage[BIT(offset, 0)] = data;
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/onemeg.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/onemeg.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/onemeg.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/onemeg.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,52 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    1 Mb Interface for SAM Coupe
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_EXPANSION_ONEMEG_H
+#define MAME_BUS_SAMCOUPE_EXPANSION_ONEMEG_H
+
+#pragma once
+
+#include "expansion.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> sam_onemeg_device
+
+class sam_onemeg_device : public device_t, public device_samcoupe_expansion_interface
+{
+public:
+	// construction/destruction
+	sam_onemeg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	// from host
+	virtual void xmem_w(int state) override;
+
+	virtual uint8_t mreq_r(offs_t offset) override;
+	virtual void mreq_w(offs_t offset, uint8_t data) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+
+protected:
+	virtual ioport_constructor device_input_ports() const override;
+	virtual void device_start() override;
+
+private:
+	required_ioport m_dip;
+
+	int m_xmem;
+	uint8_t m_expage[2];
+
+	std::unique_ptr<uint8_t[]> m_ram;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAM_ONEMEG, sam_onemeg_device)
+
+#endif // MAME_BUS_SAMCOUPE_EXPANSION_ONEMEG_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/sambus.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/sambus.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/sambus.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/sambus.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,116 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAMBUS 4-slot Expansion Interface for SAM Coupe
+
+***************************************************************************/
+
+#include "emu.h"
+#include "sambus.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAM_SAMBUS, sam_sambus_device, "sambus", "SAMBUS 4-slot Expansion Interface")
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void sam_sambus_device::device_add_mconfig(machine_config &config)
+{
+	MSM6242(config, m_rtc, 32.768_kHz_XTAL);
+
+	SAMCOUPE_EXPANSION(config, m_exp[0], samcoupe_expansion_modules);
+	SAMCOUPE_EXPANSION(config, m_exp[1], samcoupe_expansion_modules);
+	SAMCOUPE_EXPANSION(config, m_exp[2], samcoupe_expansion_modules);
+	SAMCOUPE_EXPANSION(config, m_exp[3], samcoupe_expansion_modules);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  sam_sambus_device - constructor
+//-------------------------------------------------
+
+sam_sambus_device::sam_sambus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, SAM_SAMBUS, tag, owner, clock),
+	device_samcoupe_expansion_interface(mconfig, *this),
+	m_rtc(*this, "rtc"),
+	m_exp(*this, "%u", 0U),
+	m_print(0)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void sam_sambus_device::device_start()
+{
+	// register for savestates
+	save_item(NAME(m_print));
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+void sam_sambus_device::xmem_w(int state)
+{
+	for (int i = 0; i < 4; i++)
+		m_exp[i]->xmem_w(state);
+}
+
+void sam_sambus_device::print_w(int state)
+{
+	for (int i = 0; i < 4; i++)
+		m_exp[i]->print_w(state);
+
+	m_print = state;
+}
+
+uint8_t sam_sambus_device::mreq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	for (int i = 0; i < 4; i++)
+		data &= m_exp[i]->mreq_r(offset);
+
+	return data;
+}
+
+void sam_sambus_device::mreq_w(offs_t offset, uint8_t data)
+{
+	for (int i = 0; i < 4; i++)
+		m_exp[i]->mreq_w(offset, data);
+}
+
+uint8_t sam_sambus_device::iorq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (m_print && (offset & 0x07) == 0x07)
+		data &= m_rtc->read(offset >> 12);
+
+	for (int i = 0; i < 4; i++)
+		data &= m_exp[i]->iorq_r(offset);
+
+	return data;
+}
+
+void sam_sambus_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if (m_print && (offset & 0x07) == 0x07)
+		m_rtc->write(offset >> 12, data);
+
+	for (int i = 0; i < 4; i++)
+		m_exp[i]->iorq_w(offset, data);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/sambus.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/sambus.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/sambus.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/sambus.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,53 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAMBUS 4-slot Expansion Interface for SAM Coupe
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_EXPANSION_SAMBUS_H
+#define MAME_BUS_SAMCOUPE_EXPANSION_SAMBUS_H
+
+#pragma once
+
+#include "expansion.h"
+#include "machine/msm6242.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> sam_sambus_device
+
+class sam_sambus_device : public device_t, public device_samcoupe_expansion_interface
+{
+public:
+	// construction/destruction
+	sam_sambus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	// from host
+	virtual void xmem_w(int state) override;
+	virtual void print_w(int state) override;
+
+	virtual uint8_t mreq_r(offs_t offset) override;
+	virtual void mreq_w(offs_t offset, uint8_t data) override;
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+
+private:
+	required_device<msm6242_device> m_rtc;
+	required_device_array<samcoupe_expansion_device, 4> m_exp;
+
+	int m_print;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAM_SAMBUS, sam_sambus_device)
+
+#endif // MAME_BUS_SAMCOUPE_EXPANSION_SAMBUS_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/sdide.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/sdide.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/sdide.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/sdide.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,116 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    S D IDE Adapter for SAM Coupe
+
+***************************************************************************/
+
+#include "emu.h"
+#include "sdide.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAM_SDIDE, sam_sdide_device, "sam_sdide", "S D IDE Adapter")
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void sam_sdide_device::device_add_mconfig(machine_config &config)
+{
+	ATA_INTERFACE(config, m_ata).options(ata_devices, "hdd", nullptr, false);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  sam_sdide_device - constructor
+//-------------------------------------------------
+
+sam_sdide_device::sam_sdide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, SAM_SDIDE, tag, owner, clock),
+	device_samcoupe_expansion_interface(mconfig, *this),
+	m_ata(*this, "ata"),
+	m_address_latch(0),
+	m_data_latch(0),
+	m_data_pending(false)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void sam_sdide_device::device_start()
+{
+	// register for savestates
+	save_item(NAME(m_address_latch));
+	save_item(NAME(m_data_latch));
+	save_item(NAME(m_data_pending));
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+uint8_t sam_sdide_device::iorq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	switch (offset & 0xff)
+	{
+		case 0xbd: // data
+			if (m_data_pending)
+				data = m_data_latch;
+			else
+			{
+				uint16_t result = 0;
+
+				if (BIT(m_address_latch, 3) == 0)
+					result = m_ata->cs0_r(m_address_latch & 0x07);
+				if (BIT(m_address_latch, 4) == 0)
+					result = m_ata->cs1_r(m_address_latch & 0x07);
+
+				m_data_latch = result >> 8;
+				data = result;
+			}
+
+			m_data_pending = !m_data_pending;
+			break;
+	}
+
+	return data;
+}
+
+void sam_sdide_device::iorq_w(offs_t offset, uint8_t data)
+{
+	switch (offset & 0xff)
+	{
+		case 0xbd: // data
+			if (!m_data_pending)
+				m_data_latch = data;
+			else
+			{
+				if (BIT(m_address_latch, 3) == 0)
+					m_ata->cs0_w(m_address_latch & 0x07, (data << 8) | m_data_latch);
+				if (BIT(m_address_latch, 4) == 0)
+					m_ata->cs1_w(m_address_latch & 0x07, (data << 8) | m_data_latch);
+			}
+
+			m_data_pending = !m_data_pending;
+			break;
+
+		case 0xbf: // register select
+			m_address_latch = data;
+			m_data_pending = false;
+			break;
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/sdide.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/sdide.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/sdide.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/sdide.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,49 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    S D IDE Adapter for SAM Coupe
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_EXPANSION_SDIDE_H
+#define MAME_BUS_SAMCOUPE_EXPANSION_SDIDE_H
+
+#pragma once
+
+#include "expansion.h"
+#include "bus/ata/ataintf.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> sam_sdide_device
+
+class sam_sdide_device : public device_t, public device_samcoupe_expansion_interface
+{
+public:
+	// construction/destruction
+	sam_sdide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	// from host
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+
+private:
+	required_device<ata_interface_device> m_ata;
+
+	uint8_t m_address_latch;
+	uint8_t m_data_latch;
+	bool m_data_pending;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAM_SDIDE, sam_sdide_device)
+
+#endif // MAME_BUS_SAMCOUPE_EXPANSION_SDIDE_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/sid.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/sid.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/sid.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/sid.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,90 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SID Soundchip Interface for SAM Coupe
+
+***************************************************************************/
+
+#include "emu.h"
+#include "sid.h"
+#include "speaker.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAM_SID6581, sam_sid6581_device, "sid6581", "SID Soundchip Interface (6581)")
+DEFINE_DEVICE_TYPE(SAM_SID8580, sam_sid8580_device, "sid8580", "SID Soundchip Interface (8580)")
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void sam_sid6581_device::device_add_mconfig(machine_config &config)
+{
+	SPEAKER(config, "mono").front_center();
+	MOS6581(config, m_sid, 1_MHz_XTAL);
+	m_sid->add_route(ALL_OUTPUTS, "mono", 1.00);
+}
+
+void sam_sid8580_device::device_add_mconfig(machine_config &config)
+{
+	SPEAKER(config, "mono").front_center();
+	MOS8580(config, m_sid, 1_MHz_XTAL);
+	m_sid->add_route(ALL_OUTPUTS, "mono", 1.00);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  sam_sid_device - constructor
+//-------------------------------------------------
+
+sam_sid_device::sam_sid_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, type, tag, owner, clock),
+	device_samcoupe_expansion_interface(mconfig, *this),
+	m_sid(*this, "sid")
+{
+}
+
+//-------------------------------------------------
+//  sam_sid6581_device - constructor
+//-------------------------------------------------
+
+sam_sid6581_device::sam_sid6581_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	sam_sid_device(mconfig, SAM_SID6581, tag, owner, clock)
+{
+}
+
+//-------------------------------------------------
+//  sam_sid8580_device - constructor
+//-------------------------------------------------
+
+sam_sid8580_device::sam_sid8580_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	sam_sid_device(mconfig, SAM_SID8580, tag, owner, clock)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void sam_sid_device::device_start()
+{
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+void sam_sid_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if ((offset & 0xff) == 0xd4)
+		m_sid->write(offset >> 8, data);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/sid.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/sid.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/sid.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/sid.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,67 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SID Soundchip Interface for SAM Coupe
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_EXPANSION_SID_H
+#define MAME_BUS_SAMCOUPE_EXPANSION_SID_H
+
+#pragma once
+
+#include "expansion.h"
+#include "sound/mos6581.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> sam_sid_device
+
+class sam_sid_device : public device_t, public device_samcoupe_expansion_interface
+{
+public:
+	// construction/destruction
+	sam_sid_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+	// from host
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+
+protected:
+	virtual void device_start() override;
+
+	required_device<mos6581_device> m_sid;
+};
+
+// ======================> sam_sid6581_device
+
+class sam_sid6581_device : public sam_sid_device
+{
+public:
+	// construction/destruction
+	sam_sid6581_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+};
+
+// ======================> sam_sid8580_device
+
+class sam_sid8580_device : public sam_sid_device
+{
+public:
+	// construction/destruction
+	sam_sid8580_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAM_SID6581, sam_sid6581_device)
+DECLARE_DEVICE_TYPE(SAM_SID8580, sam_sid8580_device)
+
+#endif // MAME_BUS_SAMCOUPE_EXPANSION_SID_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/spi.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/spi.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/spi.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/spi.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,120 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    S.P.I. SAM Parallel Interface for SAM Coupe
+
+***************************************************************************/
+
+#include "emu.h"
+#include "spi.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAM_SPI, sam_spi_device, "spi", "S.P.I. SAM Parallel Interface")
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void sam_spi_device::device_add_mconfig(machine_config &config)
+{
+	OUTPUT_LATCH(config, m_data_out);
+
+	CENTRONICS(config, m_centronics, centronics_devices, "printer");
+	m_centronics->busy_handler().set(FUNC(sam_spi_device::centronics_busy_w));
+	m_centronics->set_output_latch(*m_data_out);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  sambus_device - constructor
+//-------------------------------------------------
+
+sam_spi_device::sam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, SAM_SPI, tag, owner, clock),
+	device_samcoupe_expansion_interface(mconfig, *this),
+	m_data_out(*this, "data_out"),
+	m_centronics(*this, "centronics"),
+	m_print(0),
+	m_busy(0),
+	m_mode(0)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void sam_spi_device::device_start()
+{
+	// register for savestates
+	save_item(NAME(m_print));
+	save_item(NAME(m_busy));
+	save_item(NAME(m_mode));
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+WRITE_LINE_MEMBER( sam_spi_device::centronics_busy_w )
+{
+	m_busy = state;
+}
+
+void sam_spi_device::print_w(int state)
+{
+	m_print = state;
+}
+
+uint8_t sam_spi_device::iorq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (m_print)
+	{
+		switch (offset & 0x07)
+		{
+			case 0x01:
+				data = 0xfe | m_busy;
+				break;
+
+			case 0x02:
+				logerror("Warning: Data read unsupported\n");
+				data = 0xff;
+				break;
+		}
+	}
+
+	return data;
+}
+
+void sam_spi_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if (m_print)
+	{
+		switch (offset & 0x07)
+		{
+			case 0x00:
+				m_data_out->write(data);
+				break;
+
+			case 0x01:
+				m_centronics->write_strobe(BIT(data, 0));
+				break;
+
+			case 0x02:
+				m_mode = BIT(data, 0); // 0 = output (default), 1 = input
+				break;
+		}
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/spi.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/spi.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/spi.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/spi.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,54 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    S.P.I. SAM Parallel Interface for SAM Coupe
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_EXPANSION_SPI_H
+#define MAME_BUS_SAMCOUPE_EXPANSION_SPI_H
+
+#pragma once
+
+#include "expansion.h"
+#include "bus/centronics/ctronics.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> sam_spi_device
+
+class sam_spi_device : public device_t, public device_samcoupe_expansion_interface
+{
+public:
+	// construction/destruction
+	sam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	// from host
+	virtual void print_w(int state) override;
+
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+
+private:
+	required_device<output_latch_device> m_data_out;
+	required_device<centronics_device> m_centronics;
+
+	DECLARE_WRITE_LINE_MEMBER(centronics_busy_w);
+
+	int m_print;
+	int m_busy;
+	int m_mode;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAM_SPI, sam_spi_device)
+
+#endif // MAME_BUS_SAMCOUPE_EXPANSION_SPI_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/voicebox.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/voicebox.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/voicebox.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/voicebox.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,88 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    Voicebox for SAM Coupe
+
+***************************************************************************/
+
+#include "emu.h"
+#include "voicebox.h"
+#include "speaker.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAM_VOICEBOX, sam_voicebox_device, "voicebox", "Voicebox")
+
+//-------------------------------------------------
+//  rom_region - device-specific ROM region
+//-------------------------------------------------
+
+ROM_START( sp0256 )
+	ROM_REGION(0x10000, "sp0256", 0)
+	ROM_LOAD("sp0256a-al2.bin", 0x1000, 0x0800, CRC(b504ac15) SHA1(e60fcb5fa16ff3f3b69d36c7a6e955744d3feafc))
+ROM_END
+
+const tiny_rom_entry *sam_voicebox_device::device_rom_region() const
+{
+	return ROM_NAME( sp0256 );
+}
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void sam_voicebox_device::device_add_mconfig(machine_config &config)
+{
+	SPEAKER(config, "mono").front_center();
+	SP0256(config, m_sp0256, 3000000); // ???
+	m_sp0256->add_route(ALL_OUTPUTS, "mono", 1.00);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  sam_voicebox_device - constructor
+//-------------------------------------------------
+
+sam_voicebox_device::sam_voicebox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, SAM_VOICEBOX, tag, owner, clock),
+	device_samcoupe_expansion_interface(mconfig, *this),
+	m_sp0256(*this, "sp0256")
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void sam_voicebox_device::device_start()
+{
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+uint8_t sam_voicebox_device::iorq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if ((offset & 0xff) == 0x7f)
+		data = 0x18 | m_sp0256->lrq_r();
+
+	return data;
+}
+
+void sam_voicebox_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if ((offset & 0xff) == 0x7f)
+		m_sp0256->ald_w(data);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/voicebox.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/voicebox.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/expansion/voicebox.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/expansion/voicebox.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,46 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    Voicebox for SAM Coupe
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_EXPANSION_VOICEBOX_H
+#define MAME_BUS_SAMCOUPE_EXPANSION_VOICEBOX_H
+
+#pragma once
+
+#include "expansion.h"
+#include "sound/sp0256.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> sam_voicebox_device
+
+class sam_voicebox_device : public device_t, public device_samcoupe_expansion_interface
+{
+public:
+	// construction/destruction
+	sam_voicebox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	// from host
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+
+protected:
+	virtual const tiny_rom_entry *device_rom_region() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+
+private:
+	required_device<sp0256_device> m_sp0256;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAM_VOICEBOX, sam_voicebox_device)
+
+#endif // MAME_BUS_SAMCOUPE_EXPANSION_VOICEBOX_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/mouse/modules.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/mouse/modules.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/mouse/modules.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/mouse/modules.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,17 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Coupe Mouse Port modules
+
+***************************************************************************/
+
+#include "emu.h"
+#include "modules.h"
+
+#include "mouse.h"
+
+void samcoupe_mouse_modules(device_slot_interface &device)
+{
+	device.option_add("mouse", SAM_MOUSE);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/mouse/modules.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/mouse/modules.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/mouse/modules.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/mouse/modules.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,16 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Coupe Mouse Port modules
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_MOUSE_MODULES_H
+#define MAME_BUS_SAMCOUPE_MOUSE_MODULES_H
+
+#pragma once
+
+void samcoupe_mouse_modules(device_slot_interface &device);
+
+#endif // MAME_BUS_SAMCOUPE_MOUSE_MODULES_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/mouse/mouse.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/mouse/mouse.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/mouse/mouse.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/mouse/mouse.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,137 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Mouse Interface for SAM Coupe
+
+***************************************************************************/
+
+#include "emu.h"
+#include "mouse.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAM_MOUSE, sam_mouse_device, "sam_mouse", "SAM Coupe Mouse Interface")
+
+//-------------------------------------------------
+//  input_ports - device-specific input ports
+//-------------------------------------------------
+
+static INPUT_PORTS_START( mouse )
+	PORT_START("buttons")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_CODE(MOUSECODE_BUTTON1) PORT_NAME("Mouse Button 1")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_CODE(MOUSECODE_BUTTON3) PORT_NAME("Mouse Button 3")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_BUTTON2) PORT_CODE(MOUSECODE_BUTTON2) PORT_NAME("Mouse Button 2")
+	PORT_BIT(0xf8, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("x")
+	PORT_BIT(0xfff, 0x000, IPT_MOUSE_X) PORT_PLAYER(1) PORT_SENSITIVITY(50) PORT_KEYDELTA(0) PORT_REVERSE
+
+	PORT_START("y")
+	PORT_BIT(0xfff, 0x000, IPT_MOUSE_Y) PORT_PLAYER(1) PORT_SENSITIVITY(50) PORT_KEYDELTA(0)
+INPUT_PORTS_END
+
+ioport_constructor sam_mouse_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME( mouse );
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  sam_mouse_device - constructor
+//-------------------------------------------------
+
+sam_mouse_device::sam_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, SAM_MOUSE, tag, owner, clock),
+	device_samcoupe_mouse_interface(mconfig, *this),
+	m_io_buttons(*this, "buttons"),
+	m_io_x(*this, "x"),
+	m_io_y(*this, "y")
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void sam_mouse_device::device_start()
+{
+	// allocate timer
+	m_reset = timer_alloc();
+
+	// register for savestates
+	save_item(NAME(m_mouse_index));
+	save_pointer(NAME(m_mouse_data), 9);
+	save_item(NAME(m_mouse_x));
+	save_item(NAME(m_mouse_y));
+}
+
+//-------------------------------------------------
+//  device_reset - device-specific startup
+//-------------------------------------------------
+
+void sam_mouse_device::device_reset()
+{
+	m_mouse_index = 0;
+	m_mouse_data[0] = 0xff;
+	m_mouse_data[1] = 0xff;
+}
+
+//-------------------------------------------------
+//  device_timer - handler timer events
+//-------------------------------------------------
+
+void sam_mouse_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	m_mouse_index = 0;
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+uint8_t sam_mouse_device::read()
+{
+	uint8_t data;
+
+	// on a read, reset the timer
+	m_reset->adjust(attotime::from_usec(50));
+
+	// update when we are about to read the first real values
+	if (m_mouse_index == 2)
+	{
+		int mouse_x = m_io_x->read();
+		int mouse_y = m_io_y->read();
+
+		// distance moved
+		int mouse_dx = m_mouse_x - mouse_x;
+		int mouse_dy = m_mouse_y - mouse_y;
+
+		m_mouse_x = mouse_x;
+		m_mouse_y = mouse_y;
+
+		m_mouse_data[2] = m_io_buttons->read();
+		m_mouse_data[3] = (mouse_dy & 0xf00) >> 8;
+		m_mouse_data[4] = (mouse_dy & 0x0f0) >> 4;
+		m_mouse_data[5] = (mouse_dy & 0x00f) >> 0;
+		m_mouse_data[6] = (mouse_dx & 0xf00) >> 8;
+		m_mouse_data[7] = (mouse_dx & 0x0f0) >> 4;
+		m_mouse_data[8] = (mouse_dx & 0x00f) >> 0;
+	}
+
+	data = m_mouse_data[m_mouse_index++];
+
+	// reset if we are at the end
+	if (m_mouse_index == sizeof(m_mouse_data))
+		m_mouse_index = 1;
+
+	return data;
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/mouse/mouse.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/mouse/mouse.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/mouse/mouse.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/mouse/mouse.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,53 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Mouse Interface for SAM Coupe
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_MOUSE_MOUSE_H
+#define MAME_BUS_SAMCOUPE_MOUSE_MOUSE_H
+
+#pragma once
+
+#include "mouseport.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> sam_mouse_device
+
+class sam_mouse_device : public device_t, public device_samcoupe_mouse_interface
+{
+public:
+	// construction/destruction
+	sam_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	// from host
+	virtual uint8_t read() override;
+
+protected:
+	virtual ioport_constructor device_input_ports() const override;
+	virtual void device_start() override;
+	virtual void device_reset() override;
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+private:
+	required_ioport m_io_buttons;
+	required_ioport m_io_x;
+	required_ioport m_io_y;
+
+	emu_timer *m_reset;
+
+	int m_mouse_index;
+	uint8_t m_mouse_data[9];
+	int m_mouse_x, m_mouse_y;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAM_MOUSE, sam_mouse_device)
+
+#endif // MAME_BUS_SAMCOUPE_MOUSE_MOUSE_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/mouse/mouseport.cpp mame-0.224+dfsg.1/src/devices/bus/samcoupe/mouse/mouseport.cpp
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/mouse/mouseport.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/mouse/mouseport.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,92 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Coupe Mouse Port
+
+    8-pin connector
+
+***************************************************************************/
+
+#include "emu.h"
+#include "mouseport.h"
+
+
+//**************************************************************************
+//  DEVICE DEFINITIONS
+//**************************************************************************
+
+DEFINE_DEVICE_TYPE(SAMCOUPE_MOUSE_PORT, samcoupe_mouse_port_device, "samcoupe_mouse_port", "SAM Coupe Mouse Port")
+
+
+//**************************************************************************
+//  SLOT DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  samcoupe_mouse_port_device - constructor
+//-------------------------------------------------
+
+samcoupe_mouse_port_device::samcoupe_mouse_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, SAMCOUPE_MOUSE_PORT, tag, owner, clock),
+	device_single_card_slot_interface<device_samcoupe_mouse_interface>(mconfig, *this),
+	m_mseint_handler(*this),
+	m_module(nullptr)
+{
+}
+
+//-------------------------------------------------
+//  samcoupe_mouse_port_device - destructor
+//-------------------------------------------------
+
+samcoupe_mouse_port_device::~samcoupe_mouse_port_device()
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void samcoupe_mouse_port_device::device_start()
+{
+	// get inserted module
+	m_module = get_card_device();
+
+	// resolve callbacks
+	m_mseint_handler.resolve_safe();
+}
+
+//-------------------------------------------------
+//  host to module interface
+//-------------------------------------------------
+
+uint8_t samcoupe_mouse_port_device::read()
+{
+	if (m_module)
+		return m_module->read();
+
+	return 0xff;
+}
+
+
+//**************************************************************************
+//  MODULE INTERFACE
+//**************************************************************************
+
+//-------------------------------------------------
+//  device_samcoupe_mouse_interface - constructor
+//-------------------------------------------------
+
+device_samcoupe_mouse_interface::device_samcoupe_mouse_interface(const machine_config &mconfig, device_t &device) :
+	device_interface(device, "samcoupemouse")
+{
+	m_port = dynamic_cast<samcoupe_mouse_port_device *>(device.owner());
+}
+
+//-------------------------------------------------
+//  ~device_samcoupe_mouse_interface - destructor
+//-------------------------------------------------
+
+device_samcoupe_mouse_interface::~device_samcoupe_mouse_interface()
+{
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/samcoupe/mouse/mouseport.h mame-0.224+dfsg.1/src/devices/bus/samcoupe/mouse/mouseport.h
--- mame-0.222+dfsg.1/src/devices/bus/samcoupe/mouse/mouseport.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/samcoupe/mouse/mouseport.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,92 @@
+// license: GPL-2.0+
+// copyright-holders: Dirk Best
+/***************************************************************************
+
+    SAM Coupe Mouse Port
+
+    8-pin connector
+
+    1  K3
+    2  K2
+    3  K1
+    4  K5
+    5  K4
+    6  MSEINT
+    7  RDMSEL
+    8  5V
+
+***************************************************************************/
+
+#ifndef MAME_BUS_SAMCOUPE_MOUSE_MOUSEPORT_H
+#define MAME_BUS_SAMCOUPE_MOUSE_MOUSEPORT_H
+
+#pragma once
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class device_samcoupe_mouse_interface;
+
+// ======================> samcoupe_mouse_port_device
+
+class samcoupe_mouse_port_device : public device_t, public device_single_card_slot_interface<device_samcoupe_mouse_interface>
+{
+public:
+	// construction/destruction
+	template <typename T>
+	samcoupe_mouse_port_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts)
+		: samcoupe_mouse_port_device(mconfig, tag, owner, uint32_t(0))
+	{
+		option_reset();
+		opts(*this);
+		set_default_option(nullptr);
+		set_fixed(false);
+	}
+
+	samcoupe_mouse_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	virtual ~samcoupe_mouse_port_device();
+
+	// callbacks
+	auto mseint_handler() { return m_mseint_handler.bind(); }
+
+	// called from cart device
+	DECLARE_WRITE_LINE_MEMBER( mseint_w ) { m_mseint_handler(state); }
+
+	// called from host
+	uint8_t read();
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+
+private:
+	devcb_write_line m_mseint_handler;
+
+	device_samcoupe_mouse_interface *m_module;
+};
+
+// ======================> device_samcoupe_mouse_interface
+
+class device_samcoupe_mouse_interface : public device_interface
+{
+public:
+	// construction/destruction
+	virtual ~device_samcoupe_mouse_interface();
+
+	virtual uint8_t read() { return 0xff; }
+
+protected:
+	device_samcoupe_mouse_interface(const machine_config &mconfig, device_t &device);
+
+	samcoupe_mouse_port_device *m_port;
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(SAMCOUPE_MOUSE_PORT, samcoupe_mouse_port_device)
+
+// include here so drivers don't need to
+#include "modules.h"
+
+#endif // MAME_BUS_SAMCOUPE_MOUSE_MOUSEPORT_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/snes/sa1.cpp mame-0.224+dfsg.1/src/devices/bus/snes/sa1.cpp
--- mame-0.222+dfsg.1/src/devices/bus/snes/sa1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/snes/sa1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -34,13 +34,13 @@
     derbyjo2: hangs going into game
     dbzhypd, dbzhypdj: plays OK
     habumeij: boots, goes into game, on-screen timer counts down after SA-1 is enabled but controls aren't responsive
-    haruaug3a, pebble, haruaug3: uses SA-1 DMA
+    haruaug3a, pebble, haruaug3: plays OK
     itoibass: boots, some missing gfx
     jikkparo: plays OK
     jl96drem: plays OK
     jumpind: boots and runs, uses SA-1 normal DMA only but has corrupt gfx
     kakinoki: S-CPU crashes after pressing start
-    kirby3j, kirby3: uses SA-1 DMA
+    kirby3j, kirby3: plays OK
     kirbysdb, kirbyss, kirbyfun, kirbysd, kirbysda: plays OK
     marvelou: plays OK, uses SA-1 normal DMA only but has corrupt gfx
     miniyonk: plays OK
@@ -55,7 +55,7 @@
     shinshog: plays OK
     shogisai: plays OK
     shogisa2: plays OK
-    smrpgj, smrpg: needs SA-1 character conversion for level up Bonus Chance (possible to get past now)
+    smrpgj, smrpg: plays OK
     srobotg: some corrupt in-game GFX, may be SNES rendering errors
     sshogi3: plays OK
     taikyoid: plays OK
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/beta128.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/beta128.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/beta128.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/beta128.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -78,16 +78,18 @@
 	ROM_REGION(0x4000, "rom", 0)
 	ROM_DEFAULT_BIOS("trd503")
 
-	// original
+	// original, but in plain form, should be replaced with "proper dumps" with data bits 0 and 7 swapped
 	ROM_SYSTEM_BIOS(0, "trd501", "TR-DOS v5.01")
 	ROMX_LOAD("trd501.rom", 0x0000, 0x4000, CRC(3e3cdd4c) SHA1(8303ba0cc79daa6c04cd1e6ce27e8b6886a3f0de), ROM_BIOS(0))
-	ROM_SYSTEM_BIOS(1, "trd503", "TR-DOS v5.03")
-	ROMX_LOAD("trd503.rom", 0x0000, 0x4000, CRC(10751aba) SHA1(21695e3f2a8f796386ce66eea8a246b0ac44810c), ROM_BIOS(1))
+	ROM_SYSTEM_BIOS(1, "trd502", "TR-DOS v5.02")
+	ROMX_LOAD("trd502.rom", 0x0000, 0x4000, CRC(64f0fcf8) SHA1(862e0af2245f68fca3d6a5b10186d09fd1faee55), ROM_BIOS(1))
+	ROM_SYSTEM_BIOS(2, "trd503", "TR-DOS v5.03")
+	ROMX_LOAD("trd503.rom", 0x0000, 0x4000, CRC(10751aba) SHA1(21695e3f2a8f796386ce66eea8a246b0ac44810c), ROM_BIOS(2))
 
 	// clone/homebrew modifications based on original v5.03
-	ROM_SYSTEM_BIOS(2, "trd504t", "TR-DOS v5.04T (hack)")
+	ROM_SYSTEM_BIOS(3, "trd504t", "TR-DOS v5.04T (hack)")
 	// increased step rate (6ms), FORMAT command got interleave 1:1 option for faster read/write speed, this firmware was most common at post-soviet space in 90x.
-	ROMX_LOAD("trd504t.rom", 0x0000, 0x4000, CRC(e212d1e0) SHA1(745e9caf576e64a5386ad845256d28593d34cc40), ROM_BIOS(2))
+	ROMX_LOAD("trd504t.rom", 0x0000, 0x4000, CRC(e212d1e0) SHA1(745e9caf576e64a5386ad845256d28593d34cc40), ROM_BIOS(3))
 	// trd504.rom CRC ba310874 is bad dump of 5.03 with edited version text, no actual code changes.
 ROM_END
 
@@ -267,12 +269,6 @@
 	return data;
 }
 
-void spectrum_beta128_device::mreq_w(offs_t offset, uint8_t data)
-{
-	if (m_exp->romcs())
-		m_exp->mreq_w(offset, data);
-}
-
 INPUT_CHANGED_MEMBER(spectrum_beta128_device::magic_button)
 {
 	if (newval && !oldval)
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/beta128.h mame-0.224+dfsg.1/src/devices/bus/spectrum/beta128.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/beta128.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/beta128.h	2020-08-26 08:57:19.000000000 +0000
@@ -42,11 +42,16 @@
 
 	virtual void pre_opcode_fetch(offs_t offset) override;
 	virtual uint8_t mreq_r(offs_t offset) override;
-	virtual void mreq_w(offs_t offset, uint8_t data) override;
 	virtual uint8_t iorq_r(offs_t offset) override;
 	virtual void iorq_w(offs_t offset, uint8_t data) override;
 	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
 
+	// passthru
+	virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); };
+	virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); };
+	virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+	virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); }
+
 	required_memory_region m_rom;
 	required_device<wd_fdc_device_base> m_fdc;
 	required_device_array<floppy_connector, 4> m_floppy;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/beta.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/beta.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/beta.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/beta.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -46,7 +46,7 @@
      - common Brazilian clones: usually use FD1797 instead of FD1793, no ROM bits D0/D7 swap, DOS ROM area 3CXX might be disabled, equiped with printer port.
        - CBI-95
        - SYNCHRON IDS91
-       - SYNCHRON IDS2001ne
+       - SYNCHRON IDS2001ne (added interface disable jumper)
        - ARCADE AR-20
      - MIDAS Gammadisk - 3 versions known to exists:
         - straight clone
@@ -85,6 +85,7 @@
       V3-V4: D7 BDI ROM_latch (0=enable, 1=disble), D6 - FDC DDEN, D4 - SIDE, D3 - FDC HLT, D2 - FDC /MR (reset), D0-1 - floppy drive select (binary value).
       CBI clones: D5 - printer port /STROBE
     IO read port 0b1xxxx111 <- D7 - FDC INTRQ, D6 - FDC DRQ
+      CBI clones: D5 - printer port BUSY, D4 - printer standard select jumper (ABICOMP / MSX1.1)
     IO read/write ports 0b0YYxx111 - access FDC ports YY
 
     So mostly the same as beta128, except for new BDI ROM_latch bit
@@ -114,6 +115,9 @@
 static void beta_floppies(device_slot_interface &device)
 {
 	device.option_add("525qd", FLOPPY_525_QD);
+	device.option_add("525dd", FLOPPY_525_DD);
+	device.option_add("35dd", FLOPPY_35_DD);
+	device.option_add("3dsdd", FLOPPY_3_DSDD);
 }
 
 //-------------------------------------------------
@@ -198,6 +202,9 @@
 	ROM_SYSTEM_BIOS(5, "cas87", "CAS DOS 1987") // 4.12 with texts translated
 	ROMX_LOAD("cas1987.bin", 0x0000, 0x2000, CRC(a6a9450c) SHA1(b54b173a9f11ed730804d94584a1679193993e3c), ROM_BIOS(5))
 	ROM_RELOAD(0x2000,0x2000)
+	ROM_SYSTEM_BIOS(6, "icdos", "IC-DOS JUMBO v2.0") // v4.11 with name text changed
+	ROMX_LOAD("icdos.bin", 0x0000, 0x2000, CRC(1398d13a) SHA1(bf8cee39eb4b2a09a3f07db4cb8e7952bce4d3dd), ROM_BIOS(6))
+	ROM_RELOAD(0x2000,0x2000)
 ROM_END
 
 ROM_START(betaclone)
@@ -279,6 +286,9 @@
 	m_fdc->hld_wr_callback().set(FUNC(spectrum_betacbi_device::fdc_hld_w));
 
 	device_add_mconfig_base(config);
+
+	CENTRONICS(config, m_centronics, centronics_devices, "printer");
+	m_centronics->busy_handler().set([this](u8 data) { m_centronics_busy = data; });
 }
 
 void spectrum_gamma_device::device_add_mconfig(machine_config& config)
@@ -289,7 +299,15 @@
 	device_add_mconfig_base(config);
 
 	I8255(config, m_ppi);
-	// TODO hook joystick and printer ports
+	m_ppi->in_pa_callback().set_ioport("JOY");
+	m_ppi->out_pb_callback().set("cent_data_out", FUNC(output_latch_device::write));
+	m_ppi->out_pc_callback().set([this](u8 data) { m_centronics->write_strobe(BIT(data, 7)); });
+
+	output_latch_device &cent_data_out(OUTPUT_LATCH(config, "cent_data_out"));
+	CENTRONICS(config, m_centronics, centronics_devices, "printer");
+	m_centronics->busy_handler().set([this](u8 data) { m_centronics_busy = data; });
+	m_centronics->set_output_latch(cent_data_out);
+
 	ACIA6850(config, m_acia, 0); // schematics missing, wiring unknown
 }
 
@@ -380,6 +398,8 @@
 
 spectrum_betacbi_device::spectrum_betacbi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
 	: spectrum_betaclone_device(mconfig, type, tag, owner, clock)
+	, m_centronics(*this, "centronics")
+	, m_centronics_busy(0)
 {
 }
 
@@ -392,6 +412,8 @@
 	: spectrum_betaplus_device(mconfig, type, tag, owner, clock)
 	, m_ppi(*this, "PPI")
 	, m_acia(*this, "ACIA")
+	, m_centronics(*this, "centronics")
+	, m_centronics_busy(0)
 {
 }
 
@@ -422,6 +444,18 @@
 #endif
 }
 
+void spectrum_betacbi_device::device_start()
+{
+	spectrum_betav2_device::device_start();
+	save_item(NAME(m_centronics_busy));
+}
+
+void spectrum_gamma_device::device_start()
+{
+	spectrum_betav2_device::device_start();
+	save_item(NAME(m_centronics_busy));
+}
+
 //-------------------------------------------------
 //  device_reset - device-specific reset
 //-------------------------------------------------
@@ -586,6 +620,81 @@
 		m_exp->iorq_w(offset, data);
 }
 
+uint8_t spectrum_betacbi_device::iorq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (!(m_masterdisable & 0x80))
+	{
+		switch (offset & 0x87)
+		{
+		case 0x07:
+			data = m_fdc->read((offset >> 5) & 0x03);
+			break;
+
+		case 0x87:
+			data &= 0x0f; // actually open bus
+			data |= 0x10; // some switch, unk purpose
+			data |= m_centronics_busy ? 0x20: 0;
+			data |= m_fdc->drq_r() ? 0x40 : 0;
+			data |= m_fdc->intrq_r() ? 0x80 : 0;
+			break;
+		}
+	}
+	else
+		data = m_exp->iorq_r(offset);
+
+	return data;
+}
+
+void spectrum_betacbi_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if ((offset & 3) == 0)
+		m_masterdisable = data;
+
+	if (!BIT(offset, 2))
+	{
+		m_centronics->write_data0(BIT(data, 0));
+		m_centronics->write_data1(BIT(data, 1));
+		m_centronics->write_data2(BIT(data, 2));
+		m_centronics->write_data3(BIT(data, 3));
+		m_centronics->write_data4(BIT(data, 4));
+		m_centronics->write_data5(BIT(data, 5));
+		m_centronics->write_data6(BIT(data, 6));
+		m_centronics->write_data7(BIT(data, 7));
+	}
+
+	if (!(m_masterdisable & 0x80))
+	{
+		switch (offset & 0x87)
+		{
+		case 0x07:
+			m_fdc->write((offset >> 5) & 0x03, data);
+			break;
+
+		case 0x87:
+			m_control = data;
+
+			floppy_image_device* floppy = m_floppy[data & 3]->get_device();
+
+			m_fdc->set_floppy(floppy);
+			if (floppy)
+				floppy->ss_w(BIT(data, 4) ? 0 : 1);
+			m_fdc->dden_w(BIT(data, 6));
+
+			m_fdc->hlt_w(BIT(data, 3));
+
+			m_fdc->mr_w(BIT(data, 2));
+			motors_control();
+
+			m_centronics->write_strobe(!BIT(data, 5));
+			break;
+		}
+	}
+	else
+		m_exp->iorq_w(offset, data);
+}
+
 uint8_t spectrum_gamma_device::iorq_r(offs_t offset)
 {
 	uint8_t data = 0xff;
@@ -711,12 +820,6 @@
 	return m_rom->base()[(offset & 0x3fff) + (m_romcs ? 0x4000 : 0)];
 }
 
-void spectrum_betav2_device::mreq_w(offs_t offset, uint8_t data)
-{
-	if (m_exp->romcs())
-		m_exp->mreq_w(offset, data);
-}
-
 void spectrum_betav2_device::fdc_hld_w(int state)
 {
 	m_fdc->set_force_ready(state); // HLD connected to RDY pin
@@ -759,11 +862,30 @@
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_NAME("Magic Button") PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, spectrum_betaplus_device, magic_button, 0)
 INPUT_PORTS_END
 
+INPUT_PORTS_START(gamma)
+	PORT_INCLUDE(betaplus)
+
+	PORT_START("JOY")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT) PORT_8WAY
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT)  PORT_8WAY
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN)  PORT_8WAY
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP)    PORT_8WAY
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON1)
+	PORT_BIT(0x60, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_CUSTOM) PORT_CUSTOM_MEMBER(spectrum_gamma_device, busy_r)
+INPUT_PORTS_END
+
+
 ioport_constructor spectrum_betaplus_device::device_input_ports() const
 {
 	return INPUT_PORTS_NAME(betaplus);
 }
 
+ioport_constructor spectrum_gamma_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(gamma);
+}
+
 INPUT_CHANGED_MEMBER(spectrum_betaplus_device::magic_button)
 {
 	if (newval && !oldval)
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/beta.h mame-0.224+dfsg.1/src/devices/bus/spectrum/beta.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/beta.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/beta.h	2020-08-26 08:57:19.000000000 +0000
@@ -11,6 +11,7 @@
 #include "exp.h"
 #include "softlist.h"
 #include "imagedev/floppy.h"
+#include "bus/centronics/ctronics.h"
 #include "machine/wd_fdc.h"
 #include "machine/i8255.h"
 #include "machine/6850acia.h"
@@ -45,11 +46,15 @@
 	virtual void pre_opcode_fetch(offs_t offset) override;
 	virtual void pre_data_fetch(offs_t offset) override;
 	virtual uint8_t mreq_r(offs_t offset) override;
-	virtual void mreq_w(offs_t offset, uint8_t data) override;
 	virtual uint8_t iorq_r(offs_t offset) override;
 	virtual void iorq_w(offs_t offset, uint8_t data) override;
 	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
 
+	// passthru
+	virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); };
+	virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+	virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); }
+
 	required_memory_region m_rom;
 	required_device<wd_fdc_device_base> m_fdc;
 	required_device_array<floppy_connector, 4> m_floppy;
@@ -120,10 +125,16 @@
 	spectrum_betacbi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 protected:
+	virtual void device_start() override;
 	virtual void device_add_mconfig(machine_config &config) override;
 	virtual void fetch(offs_t offset) override;
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 
+	required_device<centronics_device> m_centronics;
+
+	int m_centronics_busy;
 };
 
 class spectrum_gamma_device :
@@ -134,16 +145,22 @@
 	spectrum_gamma_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 	spectrum_gamma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+	DECLARE_CUSTOM_INPUT_MEMBER(busy_r) { return !m_centronics_busy; }
 protected:
-	required_device<i8255_device> m_ppi;
-	required_device<acia6850_device> m_acia;
-
+	virtual void device_start() override;
 	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
 	virtual uint8_t mreq_r(offs_t offset) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 	virtual uint8_t iorq_r(offs_t offset) override;
 	virtual void iorq_w(offs_t offset, uint8_t data) override;
 	virtual DECLARE_READ_LINE_MEMBER(romcs) override { return 1; };
+
+	required_device<i8255_device> m_ppi;
+	required_device<acia6850_device> m_acia;
+	required_device<centronics_device> m_centronics;
+
+	int m_centronics_busy;
 };
 
 // device type definition
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/d40.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/d40.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/d40.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/d40.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,7 +3,13 @@
 /**********************************************************************
 
     Didaktik D40/D80 disk interface
-    (C) 1991 Didaktik Scalica
+    (C) 1991 Didaktik Skalica
+
+    useful commands:
+     RUN - boot disc
+     CAT - files list
+     LIST * - system information
+     LOAD *"filename" - load program
 
 **********************************************************************/
 
@@ -16,8 +22,9 @@
 //  DEVICE DEFINITIONS
 //**************************************************************************
 
-DEFINE_DEVICE_TYPE(SPECTRUM_D40, spectrum_d40_device, "spectrum_d40", "Didaktik D40 disk interface")
-DEFINE_DEVICE_TYPE(SPECTRUM_D80, spectrum_d80_device, "spectrum_d80", "Didaktik D80 disk interface")
+DEFINE_DEVICE_TYPE(SPECTRUM_D40, spectrum_d40_device, "spectrum_d40", "Didaktik D40")
+DEFINE_DEVICE_TYPE(SPECTRUM_D80, spectrum_d80_device, "spectrum_d80", "Didaktik D80 (MDOS 1, 2793 FDC)")
+DEFINE_DEVICE_TYPE(SPECTRUM_D80V2, spectrum_d80v2_device, "spectrum_d80v2", "Didaktik D80 (MDOS 2, 8272 FDC)")
 
 //-------------------------------------------------
 //  INPUT_PORTS
@@ -25,14 +32,22 @@
 
 INPUT_PORTS_START(d40)
 	PORT_START("BUTTON")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_NAME("Snapshot Button") PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, spectrum_d40_device, snapshot_button, 0)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Snapshot Button") PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, spectrum_d40base_device, snapshot_button, 0)
+
+	PORT_START("JOY")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT) PORT_8WAY
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT)  PORT_8WAY
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN)  PORT_8WAY
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP)    PORT_8WAY
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON1)
+	PORT_BIT(0xe0, IP_ACTIVE_HIGH, IPT_UNUSED)
 INPUT_PORTS_END
 
 //-------------------------------------------------
 //  input_ports - device-specific input ports
 //-------------------------------------------------
 
-ioport_constructor spectrum_d40_device::device_input_ports() const
+ioport_constructor spectrum_d40base_device::device_input_ports() const
 {
 	return INPUT_PORTS_NAME(d40);
 }
@@ -51,8 +66,8 @@
 //  floppy_format_type floppy_formats
 //-------------------------------------------------
 
-FLOPPY_FORMATS_MEMBER(spectrum_d40_device::floppy_formats)
-	FLOPPY_D40D80_FORMAT
+FLOPPY_FORMATS_MEMBER(spectrum_d40base_device::floppy_formats)
+	FLOPPY_PC_FORMAT
 FLOPPY_FORMATS_END
 
 //-------------------------------------------------
@@ -64,10 +79,15 @@
 	ROM_DEFAULT_BIOS("mdos11")
 	ROM_SYSTEM_BIOS(0, "mdos11", "MDOS 1.0 (1991)")
 	ROMX_LOAD("mdos10.bin", 0x0000, 0x4000, CRC(e6b70939) SHA1(308c4b5daf6bb1f05c68a447129d723da423326e), ROM_BIOS(0))
-	ROM_SYSTEM_BIOS(1, "mdos12", "MDOS 1.0+ (1992)")
+	ROM_SYSTEM_BIOS(1, "mdos12", "MDOS 1.0+ (1992)") // possible unofficial modification
 	ROMX_LOAD("mdos10p.bin", 0x0000, 0x4000, CRC(92c45741) SHA1(b8473235feecff4eccbace56a90cf1d8c79506eb), ROM_BIOS(1))
-	ROM_SYSTEM_BIOS(2, "mdos2", "MDOS 2.0 (1993)") // doesn't work, from different board type with GM82C765B FDC
-	ROMX_LOAD("mdos20.bin", 0x0000, 0x4000, CRC(9e79d022) SHA1(e8d3355051fb287dd0dda34ba8824442130c8254), ROM_BIOS(2))
+ROM_END
+
+ROM_START(d80v2)
+	ROM_REGION(0x4000, "rom", 0)
+	ROM_DEFAULT_BIOS("mdos2")
+	ROM_SYSTEM_BIOS(0, "mdos2", "MDOS 2.0 (1993)")
+	ROMX_LOAD("mdos20.bin", 0x0000, 0x4000, CRC(9e79d022) SHA1(e8d3355051fb287dd0dda34ba8824442130c8254), ROM_BIOS(0))
 ROM_END
 
 //-------------------------------------------------
@@ -82,6 +102,9 @@
 	FLOPPY_CONNECTOR(config, "fdc:0", didaktik_floppies, "525dd", spectrum_d40_device::floppy_formats).enable_sound(true);
 	FLOPPY_CONNECTOR(config, "fdc:1", didaktik_floppies, "525dd", spectrum_d40_device::floppy_formats).enable_sound(true);
 
+	I8255(config, m_ppi);
+	m_ppi->in_pa_callback().set_ioport("JOY");
+
 	/* software list */
 	//SOFTWARE_LIST(config, "flop_list").set_original("spectrum_d40_flop");
 }
@@ -94,6 +117,20 @@
 	FLOPPY_CONNECTOR(config, "fdc:0", didaktik_floppies, "35dd", spectrum_d80_device::floppy_formats).enable_sound(true);
 	FLOPPY_CONNECTOR(config, "fdc:1", didaktik_floppies, "35dd", spectrum_d80_device::floppy_formats).enable_sound(true);
 
+	I8255(config, m_ppi);
+
+	/* software list */
+	//SOFTWARE_LIST(config, "flop_list").set_original("spectrum_d40_flop");
+}
+
+void spectrum_d80v2_device::device_add_mconfig(machine_config &config)
+{
+	WD37C65C(config, m_fdc, 16_MHz_XTAL); // actually GM82C765B
+	FLOPPY_CONNECTOR(config, "fdc:0", didaktik_floppies, "35dd", spectrum_d80v2_device::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:1", didaktik_floppies, "35dd", spectrum_d80v2_device::floppy_formats).enable_sound(true);
+
+	I8255(config, m_ppi);
+
 	/* software list */
 	//SOFTWARE_LIST(config, "flop_list").set_original("spectrum_d40_flop");
 }
@@ -103,25 +140,39 @@
 	return ROM_NAME(d40);
 }
 
+const tiny_rom_entry *spectrum_d80v2_device::device_rom_region() const
+{
+	return ROM_NAME(d80v2);
+}
+
 //**************************************************************************
 //  LIVE DEVICE
 //**************************************************************************
 
 //-------------------------------------------------
-//  spectrum_d40_device - constructor
+//  spectrum_d40base_device - constructor
 //-------------------------------------------------
 
-spectrum_d40_device::spectrum_d40_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+spectrum_d40base_device::spectrum_d40base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, type, tag, owner, clock)
 	, device_spectrum_expansion_interface(mconfig, *this)
 	, m_rom(*this, "rom")
+	, m_ppi(*this, "ppi")
+	, m_snap(*this, "BUTTON")
+{
+}
+
+spectrum_d40_device::spectrum_d40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: spectrum_d40base_device(mconfig, SPECTRUM_D40, tag, owner, clock)
 	, m_fdc(*this, "fdc")
 	, m_floppy(*this, "fdc:%u", 0)
 {
 }
 
-spectrum_d40_device::spectrum_d40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: spectrum_d40_device(mconfig, SPECTRUM_D40, tag, owner, clock)
+spectrum_d40_device::spectrum_d40_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+	:spectrum_d40base_device(mconfig, type, tag, owner, clock)
+	, m_fdc(*this, "fdc")
+	, m_floppy(*this, "fdc:%u", 0)
 {
 }
 
@@ -130,41 +181,50 @@
 {
 }
 
+spectrum_d80v2_device::spectrum_d80v2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: spectrum_d40base_device(mconfig, SPECTRUM_D80V2, tag, owner, clock)
+	, m_fdc(*this, "fdc")
+	, m_floppy(*this, "fdc:%u", 0)
+{
+}
+
 //-------------------------------------------------
 //  device_start - device-specific startup
 //-------------------------------------------------
 
-void spectrum_d40_device::device_start()
+void spectrum_d40base_device::device_start()
 {
 	std::fill(std::begin(m_ram), std::end(m_ram), 0);
 	save_item(NAME(m_romcs));
 	save_item(NAME(m_ram));
-	save_item(NAME(m_control));
 	save_item(NAME(m_snap_flag));
+	save_item(NAME(m_8255_reset));
+	save_item(NAME(m_8255_enable));
 }
 
 //-------------------------------------------------
 //  device_reset - device-specific reset
 //-------------------------------------------------
 
-void spectrum_d40_device::device_reset()
+void spectrum_d40base_device::device_reset()
 {
 	m_romcs = 0;
-	m_control = 0;
 	m_snap_flag = 0;
+	m_8255_reset = 0;
+	m_8255_enable = 0;
 }
 
 
 //**************************************************************************
-//  IMPLEMENTATION  spectrum_d40_device
+//  IMPLEMENTATION  spectrum_d40base_device
 //**************************************************************************
 
-READ_LINE_MEMBER(spectrum_d40_device::romcs)
+READ_LINE_MEMBER(spectrum_d40base_device::romcs)
 {
 	return m_romcs;
 }
 
-void spectrum_d40_device::pre_opcode_fetch(offs_t offset)
+void spectrum_d40base_device::pre_opcode_fetch(offs_t offset)
 {
 	if (!machine().side_effects_disabled())
 	{
@@ -173,72 +233,79 @@
 		case 0x0000:
 		case 0x0008:
 			m_romcs = 1;
+			nmi_check();
 			break;
 		case 0x0066:
 			if (!m_romcs)
 			{
 				m_romcs = 1;
 				m_snap_flag = 1;
+				nmi_check();
 			}
 			break;
 		case 0x1700:
-			m_romcs = 0;
+			if (!m_snap_flag)
+				m_romcs = 0;
+			nmi_check();
 			break;
 		}
 	}
 }
 
-uint8_t spectrum_d40_device::iorq_r(offs_t offset)
+uint8_t spectrum_d40base_device::iorq_r(offs_t offset)
 {
 	uint8_t data = 0xff;
 
 	switch (offset & 0xf9)
 	{
 	case 0x81: // FDC
-		data = m_fdc->read((offset >> 1) & 0x03);
+		data = fdc0_r(offset);
+		break;
+	case 0x89: // FDC
+		data = fdc1_r(offset);
 		break;
 	}
 
+	if (!BIT(offset, 7) && m_8255_enable) // 1F/3F/5F/7F
+		data = m_ppi->read((offset >> 5) & 3);
+
 	return data;
 }
 
-void spectrum_d40_device::iorq_w(offs_t offset, uint8_t data)
+void spectrum_d40base_device::iorq_w(offs_t offset, uint8_t data)
 {
 	switch (offset & 0xf9)
 	{
 	case 0x81: // FDC
-		m_fdc->write((offset >> 1) & 0x03, data);
+		fdc0_w(offset, data);
 		break;
 	case 0x89: // control port
-	{
-		m_control = data;
-
-		floppy_image_device* floppy = nullptr;
-		if (BIT(data, 0))
-			floppy = m_floppy[0]->get_device();
-		else if (BIT(data, 1))
-			floppy = m_floppy[1]->get_device();
-		m_fdc->set_floppy(floppy);
-
-		m_floppy[0]->get_device()->mon_w(BIT(data, 2) ? 0 : 1);
-		m_floppy[1]->get_device()->mon_w(BIT(data, 3) ? 0 : 1);
-	}
+		fdc1_w(offset, data);
 		break;
 	case 0x91: // PPI reset
-		// TODO PPI
+		m_8255_reset = BIT(data, 5);
+		if (!m_8255_reset)
+		{
+			m_ppi->reset();
+			m_8255_enable = 0;
+		}
 		break;
 	case 0x99: // PPI enable
-		// TODO PPI
+		if (m_8255_reset)
+			m_8255_enable = BIT(data, 4);
 		break;
 	}
+
+	if (!BIT(offset, 7) && m_8255_enable) // 1F/3F/5F/7F
+		m_ppi->write((offset >> 5) & 3, data);
 }
 
-uint8_t spectrum_d40_device::mreq_r(offs_t offset)
+uint8_t spectrum_d40base_device::mreq_r(offs_t offset)
 {
 	if (m_snap_flag && offset == 0x66)
 	{
-		m_snap_flag = 0;
-		return 0xc7;
+		m_snap_flag = 0; // hacky, real hardware reset this latch by Z80 /WR line
+		return 0xc7; // RST 0 inject
 	}
 
 	uint8_t data = 0xff;
@@ -254,7 +321,7 @@
 	return data;
 }
 
-void spectrum_d40_device::mreq_w(offs_t offset, uint8_t data)
+void spectrum_d40base_device::mreq_w(offs_t offset, uint8_t data)
 {
 	if (m_romcs)
 	{
@@ -263,17 +330,152 @@
 	}
 }
 
-INPUT_CHANGED_MEMBER(spectrum_d40_device::snapshot_button)
+INPUT_CHANGED_MEMBER(spectrum_d40base_device::snapshot_button)
+{
+	nmi_check();
+}
+
+void spectrum_d40base_device::nmi_check()
+{
+	int state = CLEAR_LINE;
+
+	if (!m_romcs && m_snap->read())
+		state = ASSERT_LINE;
+
+	m_slot->nmi_w(state);
+}
+
+//**************************************************************************
+//  IMPLEMENTATION  spectrum_d40_device
+//**************************************************************************
+
+void spectrum_d40_device::device_start()
+{
+	spectrum_d40base_device::device_start();
+	save_item(NAME(m_control));
+	save_item(NAME(m_intrq));
+	save_item(NAME(m_drq));
+}
+
+void spectrum_d40_device::device_reset()
+{
+	spectrum_d40base_device::device_reset();
+	m_control = 0;
+	m_intrq = 0;
+	m_drq = 0;
+}
+
+uint8_t spectrum_d40_device::fdc0_r(offs_t offset)
 {
-	m_slot->nmi_w((!newval && oldval && !m_romcs) ? ASSERT_LINE : CLEAR_LINE);
+	return m_fdc->read((offset >> 1) & 0x03);
+}
+
+void spectrum_d40_device::fdc0_w(offs_t offset, uint8_t data)
+{
+	m_fdc->write((offset >> 1) & 0x03, data);
+}
+
+void spectrum_d40_device::fdc1_w(offs_t offset, uint8_t data)
+{
+	m_control = data;
+
+	floppy_image_device* floppy = nullptr;
+	if (BIT(data, 0))
+		floppy = m_floppy[0]->get_device();
+	else if (BIT(data, 1))
+		floppy = m_floppy[1]->get_device();
+	m_fdc->set_floppy(floppy);
+
+	m_floppy[0]->get_device()->mon_w(BIT(data, 2) ? 0 : 1);
+	m_floppy[1]->get_device()->mon_w(BIT(data, 3) ? 0 : 1);
+
+	nmi_check();
 }
 
 void spectrum_d40_device::fdc_intrq_w(int state)
 {
-	m_slot->nmi_w((state && BIT(m_control, 7)) ? ASSERT_LINE : CLEAR_LINE);
+	m_intrq = state;
+	nmi_check();
 }
 
 void spectrum_d40_device::fdc_drq_w(int state)
 {
-	m_slot->nmi_w((state && BIT(m_control, 6)) ? ASSERT_LINE : CLEAR_LINE);
+	m_drq = state;
+	nmi_check();
+}
+
+void spectrum_d40_device::nmi_check()
+{
+	int state = CLEAR_LINE;
+
+	if (!m_romcs && m_snap->read())
+		state = ASSERT_LINE;
+
+	if (m_intrq && BIT(m_control, 7))
+		state = ASSERT_LINE;
+
+	if (m_drq && BIT(m_control, 6))
+		state = ASSERT_LINE;
+
+	m_slot->nmi_w(state);
+}
+
+//**************************************************************************
+//  IMPLEMENTATION  spectrum_d80v2_device
+//**************************************************************************
+
+void spectrum_d80v2_device::pre_opcode_fetch(offs_t offset)
+{
+	if (!machine().side_effects_disabled())
+	{
+		switch (offset)
+		{
+		case 0x0000:
+		case 0x0008:
+		case 0x0066:
+			m_romcs = 1;
+			nmi_check();
+			break;
+		case 0x1700:
+			m_romcs = 0;
+			nmi_check();
+			break;
+		}
+	}
+}
+
+uint8_t spectrum_d80v2_device::fdc0_r(offs_t offset)
+{
+	return BIT(offset, 2) ? m_fdc->fifo_r() : m_fdc->msr_r();
+}
+
+uint8_t spectrum_d80v2_device::fdc1_r(offs_t offset)
+{
+	return m_fdc->dor_r();
+}
+
+void spectrum_d80v2_device::fdc0_w(offs_t offset, uint8_t data)
+{
+	if (BIT(offset, 2))
+		m_fdc->fifo_w(data);
+}
+
+void spectrum_d80v2_device::fdc1_w(offs_t offset, uint8_t data)
+{
+	m_fdc->dor_w(data);
+}
+
+uint8_t spectrum_d80v2_device::mreq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (m_romcs)
+	{
+		if (offset < 0x3800)
+			data = m_rom->base()[offset];
+		else
+			data = m_ram[offset & 0x7ff];
+	}
+
+	return data;
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/d40.h mame-0.224+dfsg.1/src/devices/bus/spectrum/d40.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/d40.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/d40.h	2020-08-26 08:57:19.000000000 +0000
@@ -15,32 +15,29 @@
 //#include "softlist.h"
 #include "imagedev/floppy.h"
 #include "machine/wd_fdc.h"
-#include "formats/d40_dsk.h"
+#include "machine/upd765.h"
+#include "machine/i8255.h"
+#include "formats/pc_dsk.h"
 
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
 
-class spectrum_d40_device: public device_t, public device_spectrum_expansion_interface
+class spectrum_d40base_device: public device_t, public device_spectrum_expansion_interface
 {
 public:
-	// construction/destruction
-	spectrum_d40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-	DECLARE_FLOPPY_FORMATS(floppy_formats);
 	DECLARE_INPUT_CHANGED_MEMBER(snapshot_button);
+	DECLARE_FLOPPY_FORMATS(floppy_formats);
 
 protected:
-	spectrum_d40_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+	spectrum_d40base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
 	// optional information overrides
-	virtual void device_add_mconfig(machine_config &config) override;
 	virtual ioport_constructor device_input_ports() const override;
-	virtual const tiny_rom_entry *device_rom_region() const override;
 
 	virtual void pre_opcode_fetch(offs_t offset) override;
 	virtual uint8_t mreq_r(offs_t offset) override;
@@ -49,31 +46,87 @@
 	virtual void iorq_w(offs_t offset, uint8_t data) override;
 	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
 
-	void fdc_intrq_w(int state);
-	void fdc_drq_w(int state);
+	virtual uint8_t fdc0_r(offs_t offset) { return 0xff; };
+	virtual uint8_t fdc1_r(offs_t offset) { return 0xff; };
+	virtual void fdc0_w(offs_t offset, uint8_t data) { };
+	virtual void fdc1_w(offs_t offset, uint8_t data) { };
+	virtual void nmi_check();
 
 	required_memory_region m_rom;
-	required_device<wd_fdc_device_base> m_fdc;
-	required_device_array<floppy_connector, 2> m_floppy;
+	required_device<i8255_device> m_ppi;
+	required_ioport m_snap;
 
 	int m_romcs;
 	uint8_t m_ram[2 * 1024];
-	uint8_t m_control;
 	int m_snap_flag;
+	int m_8255_reset;
+	int m_8255_enable;
+};
+
+class spectrum_d40_device :
+	public spectrum_d40base_device
+{
+public:
+	spectrum_d40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	spectrum_d40_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	required_device<wd_fdc_device_base> m_fdc;
+	required_device_array<floppy_connector, 2> m_floppy;
+
+	virtual uint8_t fdc0_r(offs_t offset) override;
+	virtual void fdc0_w(offs_t offset, uint8_t data) override;
+	virtual void fdc1_w(offs_t offset, uint8_t data) override;
+	void fdc_intrq_w(int state);
+	void fdc_drq_w(int state);
+	virtual void nmi_check() override;
+
+	uint8_t m_control;
+	int m_intrq;
+	int m_drq;
 };
 
 class spectrum_d80_device :
 	public spectrum_d40_device
 {
 public:
-	// construction/destruction
 	spectrum_d80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+};
+
+class spectrum_d80v2_device :
+	public spectrum_d40base_device
+{
+public:
+	spectrum_d80v2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
 protected:
 	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual void pre_opcode_fetch(offs_t offset) override;
+	virtual uint8_t mreq_r(offs_t offset) override;
+
+	required_device<wd37c65c_device> m_fdc;
+	required_device_array<floppy_connector, 2> m_floppy;
+
+	virtual uint8_t fdc0_r(offs_t offset) override;
+	virtual uint8_t fdc1_r(offs_t offset) override;
+	virtual void fdc0_w(offs_t offset, uint8_t data) override;
+	virtual void fdc1_w(offs_t offset, uint8_t data) override;
 };
 
 // device type definition
 DECLARE_DEVICE_TYPE(SPECTRUM_D40, spectrum_d40_device)
 DECLARE_DEVICE_TYPE(SPECTRUM_D80, spectrum_d80_device)
+DECLARE_DEVICE_TYPE(SPECTRUM_D80V2, spectrum_d80v2_device)
 
 #endif // MAME_BUS_SPECTRUM_D40_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/exp.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/exp.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/exp.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/exp.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -159,8 +159,12 @@
 #include "d40.h"
 #include "intf1.h"
 #include "intf2.h"
+#include "floppyone.h"
 #include "fuller.h"
 #include "kempjoy.h"
+#include "kempdisc.h"
+#include "logitek.h"
+#include "lprint.h"
 #include "melodik.h"
 #include "mface.h"
 #include "mgt.h"
@@ -168,7 +172,10 @@
 #include "opus.h"
 #include "plus2test.h"
 #include "protek.h"
+#include "sdi.h"
+#include "sixword.h"
 #include "specdrum.h"
+#include "speccydos.h"
 #include "uslot.h"
 #include "usource.h"
 #include "uspeech.h"
@@ -183,11 +190,21 @@
 	device.option_add("betacbi", SPECTRUM_BETACBI);
 	device.option_add("gamma", SPECTRUM_GAMMA);
 	device.option_add("beta128", SPECTRUM_BETA128);
+	device.option_add("d40", SPECTRUM_D40);
+	device.option_add("d80", SPECTRUM_D80);
+	device.option_add("d80v2", SPECTRUM_D80V2);
 	device.option_add("disciple", SPECTRUM_DISCIPLE);
 	device.option_add("intf1", SPECTRUM_INTF1);
 	device.option_add("intf2", SPECTRUM_INTF2);
+	device.option_add("flpone", SPECTRUM_FLPONE);
 	device.option_add("fuller", SPECTRUM_FULLER);
 	device.option_add("kempjoy", SPECTRUM_KEMPJOY);
+	device.option_add("kempdisc", SPECTRUM_KEMPDISC);
+	device.option_add("kempcentrs", SPECTRUM_KEMPCENTRS);
+	device.option_add("kempcentref", SPECTRUM_KEMPCENTREF);
+	device.option_add("kempcentreu", SPECTRUM_KEMPCENTREU);
+	device.option_add("lprint", SPECTRUM_LPRINT);
+	device.option_add("lprint3", SPECTRUM_LPRINT3);
 	device.option_add("melodik", SPECTRUM_MELODIK);
 	device.option_add("mface1", SPECTRUM_MFACE1);
 	device.option_add("mface128", SPECTRUM_MFACE128);
@@ -195,10 +212,14 @@
 	device.option_add("mprint", SPECTRUM_MPRINT);
 	device.option_add("opus", SPECTRUM_OPUS);
 	device.option_add("plusd", SPECTRUM_PLUSD);
-	device.option_add("d40", SPECTRUM_D40);
-	device.option_add("d80", SPECTRUM_D80);
+	device.option_add("proceed", SPECTRUM_PROCEED);
 	device.option_add("protek", SPECTRUM_PROTEK);
+	device.option_add("sdi", SPECTRUM_SDI);
+	device.option_add("speccydos", SPECTRUM_SPECCYDOS);
+	device.option_add("spdos", SPECTRUM_SPDOS);
 	device.option_add("specdrum", SPECTRUM_SPECDRUM);
+	device.option_add("swiftdisc", SPECTRUM_SWIFTDISC);
+	device.option_add("swiftdisc2", SPECTRUM_SWIFTDISC2);
 	device.option_add("uslot", SPECTRUM_USLOT);
 	device.option_add("usource", SPECTRUM_USOURCE);
 	device.option_add("uspeech", SPECTRUM_USPEECH);
@@ -208,7 +229,7 @@
 void spec128_expansion_devices(device_slot_interface &device)
 {
 	device.option_add("beta128", SPECTRUM_BETA128);
-	//device.option_add("disciple", SPECTRUM_DISCIPLE);
+	device.option_add("disciple", SPECTRUM_DISCIPLE);
 	device.option_add("intf1", SPECTRUM_INTF1);
 	device.option_add("intf2", SPECTRUM_INTF2);
 	device.option_add("kempjoy", SPECTRUM_KEMPJOY);
@@ -216,12 +237,13 @@
 	device.option_add("mikroplus", SPECTRUM_MIKROPLUS);
 	device.option_add("mprint", SPECTRUM_MPRINT);
 	device.option_add("opus", SPECTRUM_OPUS);
-	//device.option_add("d40", SPECTRUM_D40);
-	//device.option_add("d80", SPECTRUM_D80);
-	//device.option_add("plusd", SPECTRUM_PLUSD);
+	device.option_add("plusd", SPECTRUM_PLUSD);
 	device.option_add("plus2test", SPECTRUM_PLUS2TEST);
 	device.option_add("protek", SPECTRUM_PROTEK);
+	device.option_add("speccydos", SPECTRUM_SPECCYDOS);
 	device.option_add("specdrum", SPECTRUM_SPECDRUM);
+	device.option_add("swiftdisc", SPECTRUM_SWIFTDISC);
+	device.option_add("swiftdisc2", SPECTRUM_SWIFTDISC2);
 	device.option_add("wafadrive", SPECTRUM_WAFA);
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/floppyone.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/floppyone.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/floppyone.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/floppyone.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,312 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    FloppyOne DOS Interface
+    (c) 1984/5 Rocky P. Gush (RSA)
+
+    FD1791-based floppy drive and printer interface with 4K RAM and 8K ROM
+    Was mainly designed as tape replacement, and sort of emulate how tapes works,
+    which allows to copy and use most of existing software and (not protected) games with no modification.
+
+    Doube-side drives considered as 2 separate floppies (0 and 4, 1 and 5 etc) probably to mimic tape sides A/B,
+    disks is password protected.
+
+    Main commands:
+     !D=n - change current drive, where 'n' 0-3 = FDD 0-3 side 0, 4-7 = FDD 0-3 side 1, 8 = enable LOAD from tape
+     CAT - list disk contents
+     LOAD "name" - load program, LOAD "" will load first program (unless was disabled by !d=8 command)
+     LOAD *"m";1;"name" - same as above
+     SAVE "name" - save program
+     !FORMAT "diskname";"password";tracks - format disk, if disk was already formatted you'll be prompted for password.
+     !6=n - set text mode, 0 - regular 32-column, 3 - 64-column
+     !B=rs232delay, 0=use parallel printer (default)
+    There is more of special "!x=n" commands, but theirs functions is not known, manual is missing.
+    Some information about this device https://worldofspectrum.org/forums/discussion/42944/rocky-gush-floppy-drive-interface/p1
+
+    Notes / TODOs:
+     - Interface1 compatibility mode is not well understood and not fully implemented
+     - RS232 partially implemented
+
+*********************************************************************/
+
+#include "emu.h"
+#include "floppyone.h"
+
+
+/***************************************************************************
+    DEVICE DEFINITIONS
+***************************************************************************/
+
+DEFINE_DEVICE_TYPE(SPECTRUM_FLPONE, spectrum_flpone_device, "spectrum_flpone", "FloppyOne DOS Interface")
+
+
+//-------------------------------------------------
+//  INPUT_PORTS
+//-------------------------------------------------
+
+INPUT_PORTS_START(flpone)
+	PORT_START("BUTTON")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Snapshot Button") PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, spectrum_flpone_device, snapshot_button, 0)
+
+	PORT_START("SW1")
+	PORT_CONFNAME(0x01, 0x01, "Disc Interface")
+	PORT_CONFSETTING(0x01, "Enabled")
+	PORT_CONFSETTING(0x00, "Disabled")
+	PORT_START("SW2")
+	PORT_CONFNAME(0x01, 0x00, "Interface 1")
+	PORT_CONFSETTING(0x01, "Enable")
+	PORT_CONFSETTING(0x00, "Disable")
+INPUT_PORTS_END
+
+//-------------------------------------------------
+//  input_ports - device-specific input ports
+//-------------------------------------------------
+
+ioport_constructor spectrum_flpone_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(flpone);
+}
+
+//-------------------------------------------------
+//  SLOT_INTERFACE( floppies )
+//-------------------------------------------------
+
+static void flpone_floppies(device_slot_interface &device)
+{
+	device.option_add("525ssdd", FLOPPY_525_SSDD);
+	device.option_add("525dd", FLOPPY_525_DD);
+	device.option_add("525ssqd", FLOPPY_525_SSQD);
+	device.option_add("525qd", FLOPPY_525_QD);
+	device.option_add("35ssdd", FLOPPY_35_SSDD);
+	device.option_add("35dd", FLOPPY_35_DD);
+}
+
+//-------------------------------------------------
+//  floppy_format_type floppy_formats
+//-------------------------------------------------
+
+FLOPPY_FORMATS_MEMBER(spectrum_flpone_device::floppy_formats)
+	FLOPPY_FL1_FORMAT
+FLOPPY_FORMATS_END
+
+//-------------------------------------------------
+//  ROM( flpone )
+//-------------------------------------------------
+
+ROM_START(flpone)
+	ROM_REGION(0x2000, "rom", 0)
+	ROM_DEFAULT_BIOS("v4")
+
+	ROM_SYSTEM_BIOS(0, "v4", "FloppyOne DOS V4")
+	ROMX_LOAD("fldos4.bin", 0x0000, 0x2000, CRC(a012f64f) SHA1(f54b47d83c1d45c0e1e10302e519693bc734ae5c), ROM_BIOS(0))
+
+	ROM_REGION(0x4000, "prom", 0)
+	ROM_LOAD("ula.bin", 0x0000, 0x2000, CRC(d67d85aa) SHA1(eb1d28bf8aa35bfab3a45a5827f252498ac2c651)) // 1st half is not used, A13 tied to Vcc
+	ROM_CONTINUE(0x0000, 0x2000)
+ROM_END
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void spectrum_flpone_device::device_add_mconfig(machine_config &config)
+{
+	FD1791(config, m_fdc, 1_MHz_XTAL);
+
+	FLOPPY_CONNECTOR(config, "fdc:0", flpone_floppies, "525qd", spectrum_flpone_device::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:1", flpone_floppies, "525qd", spectrum_flpone_device::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:2", flpone_floppies, nullptr, spectrum_flpone_device::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:3", flpone_floppies, nullptr, spectrum_flpone_device::floppy_formats).enable_sound(true);
+
+	// parallel printer port
+	CENTRONICS(config, m_centronics, centronics_devices, "printer");
+	m_centronics->busy_handler().set(FUNC(spectrum_flpone_device::busy_w));
+
+	RS232_PORT(config, m_rs232, default_rs232_devices, nullptr);
+
+	// passthru
+	SPECTRUM_EXPANSION_SLOT(config, m_exp, spectrum_expansion_devices, nullptr);
+	m_exp->irq_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::irq_w));
+	m_exp->nmi_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::nmi_w));
+}
+
+const tiny_rom_entry *spectrum_flpone_device::device_rom_region() const
+{
+	return ROM_NAME(flpone);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  spectrum_flpone_device - constructor
+//-------------------------------------------------
+
+spectrum_flpone_device::spectrum_flpone_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, SPECTRUM_FLPONE, tag, owner, clock)
+	, device_spectrum_expansion_interface(mconfig, *this)
+	, m_rom(*this, "rom")
+	, m_prom(*this, "prom")
+	, m_fdc(*this, "fdc")
+	, m_floppy(*this, "fdc:%u", 0)
+	, m_exp(*this, "exp")
+	, m_centronics(*this, "centronics")
+	, m_rs232(*this, "rs232")
+	, m_sw1(*this, "SW1")
+	, m_sw2(*this, "SW2")
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void spectrum_flpone_device::device_start()
+{
+	memset(m_ram, 0, sizeof(m_ram));
+
+	save_item(NAME(m_romcs));
+	save_item(NAME(m_ram));
+	save_item(NAME(m_busy));
+	save_item(NAME(m_shifter));
+}
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void spectrum_flpone_device::device_reset()
+{
+	m_romcs = 0;
+	m_if1cs = 0;
+	m_busy = 1;
+	m_shifter = 0;
+}
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+READ_LINE_MEMBER(spectrum_flpone_device::romcs)
+{
+	return m_romcs | m_exp->romcs();
+}
+
+void spectrum_flpone_device::post_opcode_fetch(offs_t offset)
+{
+	m_exp->post_opcode_fetch(offset);
+
+	if (!machine().side_effects_disabled() && m_sw1->read())
+	{
+		if (offset < 0x2000)
+		{
+			u8 data = m_prom->base()[offset];
+			m_romcs |= BIT(data, 4) ^ 1;
+			m_romcs &= BIT(data, 6);
+			if (m_sw2->read())
+			{
+				m_if1cs |= BIT(data, 7) ^ 1;
+				m_if1cs &= BIT(data, 5);
+				m_romcs &= !m_if1cs;
+			}
+		}
+	}
+}
+
+uint8_t spectrum_flpone_device::mreq_r(offs_t offset)
+{
+	u8 data = 0xff;
+
+	if (m_romcs)
+	{
+		switch (offset & 0xf000)
+		{
+		case 0x0000: case 0x1000:
+			data = m_rom->base()[offset];
+			break;
+		case 0x3000:
+			data = m_ram[offset & 0xfff];
+			break;
+		case 0x2000:
+			switch (offset & 0xc)
+			{
+			case 0: case 8:
+				data = m_fdc->read(offset & 3);
+				break;
+			case 4: // D5 - Centronics /BUSY / RS232 /DSR
+				data &= ~(m_busy << 5);
+				//data &= ~(m_rs232->dsr_r() << 5); // TODO findout how both of these combined at same bit
+				break;
+			case 0xc: // Centronics STROBE pulse
+				m_centronics->write_strobe(1);
+				m_centronics->write_strobe(0);
+				m_centronics->write_strobe(1);
+				break;
+			}
+			break;
+		}
+	}
+
+	if (m_exp->romcs())
+		data &= m_exp->mreq_r(offset);
+
+	return data;
+}
+
+void spectrum_flpone_device::mreq_w(offs_t offset, uint8_t data)
+{
+	if (m_romcs)
+	{
+		switch (offset & 0xf000)
+		{
+		case 0x3000:
+			m_ram[offset & 0xfff] = data;
+			break;
+		case 0x2000:
+			switch (offset & 0xc)
+			{
+			case 0: case 8:
+				m_fdc->write(offset & 3, data);
+				break;
+			case 4: // D7 - Centronics shifter data / RS232 TX
+				m_shifter = (m_shifter << 1) | BIT(data, 7);
+
+				m_centronics->write_data0(BIT(m_shifter, 0));
+				m_centronics->write_data1(BIT(m_shifter, 1));
+				m_centronics->write_data2(BIT(m_shifter, 2));
+				m_centronics->write_data3(BIT(m_shifter, 3));
+				m_centronics->write_data4(BIT(m_shifter, 4));
+				m_centronics->write_data5(BIT(m_shifter, 5));
+				m_centronics->write_data6(BIT(m_shifter, 6));
+				m_centronics->write_data7(BIT(m_shifter, 7));
+
+				m_rs232->write_txd(BIT(data, 7));
+				break;
+			case 0xc:
+			{
+				floppy_image_device* floppy = nullptr;
+				for (int i = 3; i >= 0; i--)
+				{
+					floppy_image_device* fl = m_floppy[i]->get_device();
+					if (fl)
+					{
+						fl->ss_w(BIT(data, 4));
+						fl->mon_w((BIT(data, 5) && BIT(data, i)) ? CLEAR_LINE : ASSERT_LINE);
+						if (BIT(data, i))
+							floppy = fl;
+					}
+				}
+				m_fdc->set_floppy(floppy);
+			}
+			break;
+			}
+			break;
+		}
+	}
+
+	if (m_exp->romcs())
+		m_exp->mreq_w(offset, data);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/floppyone.h mame-0.224+dfsg.1/src/devices/bus/spectrum/floppyone.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/floppyone.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/floppyone.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,82 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    FloppyOne DOS Interface
+    (c) 1984/5 R.P.Gush
+
+*********************************************************************/
+#ifndef MAME_BUS_SPECTRUM_FLPONE_H
+#define MAME_BUS_SPECTRUM_FLPONE_H
+
+#include "exp.h"
+#include "softlist.h"
+#include "imagedev/floppy.h"
+#include "machine/wd_fdc.h"
+#include "bus/centronics/ctronics.h"
+#include "bus/rs232/rs232.h"
+#include "formats/fl1_dsk.h"
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class spectrum_flpone_device :
+	public device_t,
+	public device_spectrum_expansion_interface
+
+{
+public:
+	// construction/destruction
+	spectrum_flpone_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	DECLARE_FLOPPY_FORMATS(floppy_formats);
+	DECLARE_INPUT_CHANGED_MEMBER(snapshot_button) { m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); };
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// optional information overrides
+	virtual ioport_constructor device_input_ports() const override;
+
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual void post_opcode_fetch(offs_t offset) override;
+	virtual uint8_t mreq_r(offs_t offset) override;
+	virtual void mreq_w(offs_t offset, uint8_t data) override;
+	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
+
+	// passthru
+	virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); };
+	virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); };
+	virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+	virtual uint8_t iorq_r(offs_t offset) override { return m_exp->iorq_r(offset); }
+	virtual void iorq_w(offs_t offset, uint8_t data) override { m_exp->iorq_w(offset, data); }
+
+	DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; };
+
+	required_memory_region m_rom;
+	required_memory_region m_prom;
+	required_device<wd_fdc_device_base> m_fdc;
+	required_device_array<floppy_connector, 4> m_floppy;
+	required_device<spectrum_expansion_slot_device> m_exp;
+	required_device<centronics_device> m_centronics;
+	required_device<rs232_port_device> m_rs232;
+	required_ioport m_sw1;
+	required_ioport m_sw2;
+
+	int m_romcs, m_if1cs;
+	u8 m_ram[0x1000];
+	int m_busy;
+	uint8_t m_shifter;
+};
+
+
+// device type definition
+DECLARE_DEVICE_TYPE(SPECTRUM_FLPONE, spectrum_flpone_device)
+
+
+#endif // MAME_BUS_SPECTRUM_FLPONE_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/fuller.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/fuller.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/fuller.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/fuller.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -88,32 +88,6 @@
 //  IMPLEMENTATION
 //**************************************************************************
 
-READ_LINE_MEMBER(spectrum_fuller_device::romcs)
-{
-	return m_exp->romcs();
-}
-
-void spectrum_fuller_device::pre_opcode_fetch(offs_t offset)
-{
-	m_exp->pre_opcode_fetch(offset);
-}
-
-uint8_t spectrum_fuller_device::mreq_r(offs_t offset)
-{
-	uint8_t data = 0xff;
-
-	if (m_exp->romcs())
-		data &= m_exp->mreq_r(offset);
-
-	return data;
-}
-
-void spectrum_fuller_device::mreq_w(offs_t offset, uint8_t data)
-{
-	if (m_exp->romcs())
-		m_exp->mreq_w(offset, data);
-}
-
 uint8_t spectrum_fuller_device::iorq_r(offs_t offset)
 {
 	uint8_t data = m_exp->iorq_r(offset);
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/fuller.h mame-0.224+dfsg.1/src/devices/bus/spectrum/fuller.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/fuller.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/fuller.h	2020-08-26 08:57:19.000000000 +0000
@@ -37,12 +37,17 @@
 	virtual void device_add_mconfig(machine_config &config) override;
 	virtual ioport_constructor device_input_ports() const override;
 
-	virtual void pre_opcode_fetch(offs_t offset) override;
-	virtual uint8_t mreq_r(offs_t offset) override;
-	virtual void mreq_w(offs_t offset, uint8_t data) override;
 	virtual uint8_t iorq_r(offs_t offset) override;
 	virtual void iorq_w(offs_t offset, uint8_t data) override;
-	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
+
+	// passthru
+	virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); };
+	virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); };
+	virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); };
+	virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+	virtual uint8_t mreq_r(offs_t offset) override { return m_exp->romcs() ? m_exp->mreq_r(offset) : 0xff; }
+	virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); }
+	virtual DECLARE_READ_LINE_MEMBER(romcs) override { return m_exp->romcs(); }
 
 private:
 	required_device<spectrum_expansion_slot_device> m_exp;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/intf1.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/intf1.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/intf1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/intf1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -156,12 +156,6 @@
 	return data;
 }
 
-void spectrum_intf1_device::mreq_w(offs_t offset, uint8_t data)
-{
-	if (m_exp->romcs())
-		m_exp->mreq_w(offset, data);
-}
-
 uint8_t spectrum_intf1_device::iorq_r(offs_t offset)
 {
 	uint8_t data = 0xff;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/intf1.h mame-0.224+dfsg.1/src/devices/bus/spectrum/intf1.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/intf1.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/intf1.h	2020-08-26 08:57:19.000000000 +0000
@@ -40,11 +40,15 @@
 	virtual void pre_opcode_fetch(offs_t offset) override;
 	virtual void post_opcode_fetch(offs_t offset) override;
 	virtual uint8_t mreq_r(offs_t offset) override;
-	virtual void mreq_w(offs_t offset, uint8_t data) override;
 	virtual uint8_t iorq_r(offs_t offset) override;
 	virtual void iorq_w(offs_t offset, uint8_t data) override;
 	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
 
+	// passthru
+	virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); };
+	virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+	virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); }
+
 private:
 	required_device<spectrum_expansion_slot_device> m_exp;
 	required_device<rs232_port_device> m_rs232;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/kempdisc.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/kempdisc.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/kempdisc.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/kempdisc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,289 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    Kempston Disc Interface
+    (c) Abbeydale Designers ltd 1985
+
+    Known clones:
+     Sandy Disco Vers. 3
+
+    Few useful K-DOS commands (should be preceded with PRINT #4: ):
+     CAT - disc file list
+     LOAD "filename" - load and run program
+     COPY - tape to disc transfer utility
+     FORMAT "discname": PRINT drive#, tracks#, sides#, steprate - format disc
+
+    Manual https://archive.org/download/World_of_Spectrum_June_2017_Mirror/World%20of%20Spectrum%20June%202017%20Mirror.zip/World%20of%20Spectrum%20June%202017%20Mirror/sinclair/hardware-info/k/KempstonDiscInterface_Manual.pdf
+
+    Notes/TODO:
+     - schematics is missing, actual I/O ports decode might be not right
+     - find out port 0xDF 3 MSB bits wiring, probably FDC /DDEN, /MR
+     - implement onboard Kempston Centronics E interace and joystick port
+     - add more docs/information
+
+*********************************************************************
+
+    Watford SP-DOS Interface
+    (c) Abbeydale Designers ltd 1984
+
+    Earlier version of Kempston Disc, uses 2Kbyte ROM with small boot loader, same FDC ports but slightly different paging.
+    Require "System disk" with DOS to function, which is not dumped / missing at the moment.
+
+*********************************************************************/
+
+#include "emu.h"
+#include "kempdisc.h"
+
+
+/***************************************************************************
+    DEVICE DEFINITIONS
+***************************************************************************/
+
+DEFINE_DEVICE_TYPE(SPECTRUM_KEMPDISC, spectrum_kempdisc_device, "spectrum_kempdisc", "Kempston Disc Interface")
+DEFINE_DEVICE_TYPE(SPECTRUM_SPDOS, spectrum_spdos_device, "spectrum_spdos", "Watford SP-DOS Interface")
+
+
+//-------------------------------------------------
+//  SLOT_INTERFACE( floppies )
+//-------------------------------------------------
+
+static void kempdisc_floppies(device_slot_interface &device)
+{
+	device.option_add("525dd", FLOPPY_525_DD);
+	device.option_add("525qd", FLOPPY_525_QD);
+	device.option_add("35dd", FLOPPY_35_DD);
+	device.option_add("3dsdd", FLOPPY_3_DSDD);
+}
+
+//-------------------------------------------------
+//  floppy_format_type floppy_formats
+//-------------------------------------------------
+
+FLOPPY_FORMATS_MEMBER(spectrum_kempdisc_device::floppy_formats)
+	FLOPPY_DSK_FORMAT
+FLOPPY_FORMATS_END
+
+//-------------------------------------------------
+//  ROM( kempdisc )
+//-------------------------------------------------
+
+ROM_START(kempdisc)
+	ROM_REGION(0x2000, "rom", 0)
+	ROM_DEFAULT_BIOS("kd21")
+
+	// original
+	ROM_SYSTEM_BIOS(0, "kd20", "K-DOS v2.0")
+	ROMX_LOAD("kd20.rom", 0x0000, 0x2000, CRC(244816a7) SHA1(b08e0e30f1db4f57d38b112be0115256528c6621), ROM_BIOS(0))
+	ROM_SYSTEM_BIOS(1, "kd21", "K-DOS v2.1")
+	ROMX_LOAD("kd21.rom", 0x0000, 0x2000, CRC(3a0705eb) SHA1(adebc46c1b6718eaed7e2844506011787117cb05), ROM_BIOS(1))
+	//ROMX_LOAD("kd21.rom", 0x0000, 0x2000, CRC(d18fb812) SHA1(b3e00bc4111ef6311789159024fb4cd25c32a72f), ROM_BIOS(1)) // bad dump
+	ROM_SYSTEM_BIOS(2, "kd21it", "K-DOS v2.1 Italian") // copyrights and texts changed and translated
+	ROMX_LOAD("kd21it.rom", 0x0000, 0x2000, CRC(f8ccdf8a) SHA1(4a75fb4951d74e254c230d56b5566c924b3c38f6), ROM_BIOS(2))
+ROM_END
+
+ROM_START(spdos)
+	ROM_REGION(0x0800, "rom", 0)
+	ROM_LOAD("spdos.rom", 0x0000, 0x0800, CRC(87b954a3) SHA1(bb0706cf1538da8acd12b8c9cd2cd75ca689ec44))
+ROM_END
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void spectrum_kempdisc_device::device_add_mconfig(machine_config &config)
+{
+	WD1770(config, m_fdc, 16_MHz_XTAL / 2);
+
+	FLOPPY_CONNECTOR(config, "fdc:0", kempdisc_floppies, "525qd", spectrum_kempdisc_device::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:1", kempdisc_floppies, "525qd", spectrum_kempdisc_device::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:2", kempdisc_floppies, nullptr, spectrum_kempdisc_device::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:3", kempdisc_floppies, nullptr, spectrum_kempdisc_device::floppy_formats).enable_sound(true);
+
+	// passthru
+	SPECTRUM_EXPANSION_SLOT(config, m_exp, spectrum_expansion_devices, nullptr);
+	m_exp->irq_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::irq_w));
+	m_exp->nmi_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::nmi_w));
+}
+
+const tiny_rom_entry *spectrum_kempdisc_device::device_rom_region() const
+{
+	return ROM_NAME(kempdisc);
+}
+
+const tiny_rom_entry *spectrum_spdos_device::device_rom_region() const
+{
+	return ROM_NAME(spdos);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  spectrum_kempdisc_device - constructor
+//-------------------------------------------------
+
+spectrum_kempdisc_device::spectrum_kempdisc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, type, tag, owner, clock)
+	, device_spectrum_expansion_interface(mconfig, *this)
+	, m_rom(*this, "rom")
+	, m_fdc(*this, "fdc")
+	, m_floppy(*this, "fdc:%u", 0)
+	, m_exp(*this, "exp")
+//  , m_control(0)
+{
+}
+
+spectrum_kempdisc_device::spectrum_kempdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: spectrum_kempdisc_device(mconfig, SPECTRUM_KEMPDISC, tag, owner, clock)
+{
+}
+
+spectrum_spdos_device::spectrum_spdos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: spectrum_kempdisc_device(mconfig, SPECTRUM_SPDOS, tag, owner, clock)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void spectrum_kempdisc_device::device_start()
+{
+	save_item(NAME(m_romcs));
+//  save_item(NAME(m_control));
+}
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void spectrum_kempdisc_device::device_reset()
+{
+	m_romcs = 1;
+}
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+READ_LINE_MEMBER(spectrum_kempdisc_device::romcs)
+{
+	return m_romcs | m_exp->romcs();
+}
+
+
+uint8_t spectrum_kempdisc_device::iorq_r(offs_t offset)
+{
+	uint8_t data = m_exp->iorq_r(offset);
+
+	switch (offset & 0xff)
+	{
+	case 0xe5: case 0xe7: case 0xed: case 0xef:
+		data &= m_fdc->read(BIT(offset, 1) | (BIT(offset, 3) << 1));
+		break;
+	}
+
+	return data;
+}
+
+void spectrum_kempdisc_device::iorq_w(offs_t offset, uint8_t data)
+{
+	switch (offset & 0xff)
+	{
+	case 0xe5: case 0xe7: case 0xed: case 0xef:
+		m_fdc->write(BIT(offset, 1) | (BIT(offset, 3) << 1), data);
+		break;
+	case 0xdf:
+	{
+		floppy_image_device* floppy = nullptr;
+		for (int i = 1; i < 5; i++)
+			if (BIT(data, i))
+			{
+				floppy = m_floppy[i - 1]->get_device();
+				break;
+			}
+
+//      m_control = data;
+		m_fdc->set_floppy(floppy);
+		if (floppy) floppy->ss_w(BIT(data, 0));
+		if (data & 0xe0)
+			logerror("port DF unhandled %02X\n", data);
+	}
+	break;
+	case 0xfd:
+		m_romcs = 1;
+		break;
+	case 0xd7:
+		m_romcs = 0;
+		break;
+	}
+
+	m_exp->iorq_w(offset, data);
+}
+
+uint8_t spectrum_kempdisc_device::mreq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (m_romcs)
+		data = m_rom->base()[offset & 0x1fff];
+
+	if (m_exp->romcs())
+		data &= m_exp->mreq_r(offset);
+
+	return data;
+}
+
+
+void spectrum_spdos_device::iorq_w(offs_t offset, uint8_t data)
+{
+	switch (offset & 0xff)
+	{
+	case 0xe5: case 0xe7: case 0xed: case 0xef:
+		m_fdc->write(BIT(offset, 1) | (BIT(offset, 3) << 1), data);
+		break;
+	case 0xdf:
+	{
+		floppy_image_device* floppy = nullptr;
+		for (int i = 1; i < 5; i++)
+			if (BIT(data, i))
+			{
+				floppy = m_floppy[i - 1]->get_device();
+				break;
+			}
+
+//      m_control = data;
+		m_fdc->set_floppy(floppy);
+		if (floppy) floppy->ss_w(BIT(data, 0));
+		if (data & 0xe0)
+			logerror("port DF unhandled %02X\n", data);
+		m_romcs = 0;
+	}
+	break;
+	// below probably is wrong/different for this device
+	case 0xfd:
+		m_romcs = 1;
+		break;
+	case 0xd7:
+		m_romcs = 0;
+		break;
+	}
+
+	m_exp->iorq_w(offset, data);
+}
+
+uint8_t spectrum_spdos_device::mreq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (m_romcs)
+		data = m_rom->base()[offset & 0x7ff];
+
+	if (m_exp->romcs())
+		data &= m_exp->mreq_r(offset);
+
+	return data;
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/kempdisc.h mame-0.224+dfsg.1/src/devices/bus/spectrum/kempdisc.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/kempdisc.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/kempdisc.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,84 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    Kempston Disc Interface
+
+*********************************************************************/
+#ifndef MAME_BUS_SPECTRUM_KEMPDISC_H
+#define MAME_BUS_SPECTRUM_KEMPDISC_H
+
+#include "exp.h"
+#include "softlist.h"
+#include "imagedev/floppy.h"
+#include "machine/wd_fdc.h"
+#include "formats/dsk_dsk.h"
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class spectrum_kempdisc_device :
+	public device_t,
+	public device_spectrum_expansion_interface
+
+{
+public:
+	// construction/destruction
+	spectrum_kempdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	DECLARE_FLOPPY_FORMATS(floppy_formats);
+
+protected:
+	spectrum_kempdisc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual uint8_t mreq_r(offs_t offset) override;
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
+
+	// passthru
+	virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); };
+	virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); };
+	virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); };
+	virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+	virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); }
+
+	required_memory_region m_rom;
+	required_device<wd_fdc_device_base> m_fdc;
+	required_device_array<floppy_connector, 4> m_floppy;
+	required_device<spectrum_expansion_slot_device> m_exp;
+
+	int m_romcs;
+//  u8 m_control;
+};
+
+class spectrum_spdos_device :
+	public spectrum_kempdisc_device
+{
+public:
+	// construction/destruction
+	spectrum_spdos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// optional information overrides
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+	virtual uint8_t mreq_r(offs_t offset) override;
+};
+
+
+// device type definition
+DECLARE_DEVICE_TYPE(SPECTRUM_KEMPDISC, spectrum_kempdisc_device)
+DECLARE_DEVICE_TYPE(SPECTRUM_SPDOS, spectrum_spdos_device)
+
+
+#endif // MAME_BUS_SPECTRUM_KEMPDISC_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/logitek.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/logitek.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/logitek.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/logitek.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,216 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    Proceed 1 - Commodore IEC Bus and printer interface
+    (c) 1984 Logitek (Germany)
+
+    Allows to connect and use Commodore 1541 disk drive.
+    Components: Z8420 PIO, 8K ROM, 256x4 PROM, NMI button.
+
+    Photos and manual https://k1.spdns.de/Vintage/Sinclair/82/Peripherals/Disc%20Interfaces/Logitek%20Proceed%201%20C64%20Disc%20Interface/
+
+    Notes / TODOs:
+    - require "quantum perfect" host machine config, otherwise floppy drive access doesn't work with "Device timeout" error message.
+
+    - ROM paging performed by undumped PROM, current logic might be innacurate.
+      wiring: A0-A5 - Z80 A8-A13, A6 - PIO PB7, A7 - nc, /CE1 - A14, /CE2 - A15,
+      Q1 - ROM A11, Q2 - ROM A10, Q3 - ROM /CE, Q4 - /ROMCS
+
+*********************************************************************/
+
+#include "emu.h"
+#include "logitek.h"
+
+
+/***************************************************************************
+    DEVICE DEFINITIONS
+***************************************************************************/
+
+DEFINE_DEVICE_TYPE(SPECTRUM_PROCEED, spectrum_proceed_device, "spectrum_proceed", "Logitek Proceed 1 Interface")
+
+
+//-------------------------------------------------
+//  INPUT_PORTS
+//-------------------------------------------------
+
+INPUT_PORTS_START(proceed)
+	PORT_START("BUTTON")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("NMI Button") PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, spectrum_proceed_device, nmi_button, 0)
+INPUT_PORTS_END
+
+//-------------------------------------------------
+//  input_ports - device-specific input ports
+//-------------------------------------------------
+
+ioport_constructor spectrum_proceed_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(proceed);
+}
+
+//-------------------------------------------------
+//  ROM( proceed )
+//-------------------------------------------------
+
+ROM_START(proceed)
+	ROM_REGION(0x2000, "rom", 0)
+	ROM_DEFAULT_BIOS("ldos21")
+
+	ROM_SYSTEM_BIOS(0, "ldos21", "LDOS v2.1")
+	ROMX_LOAD("ldos_v21.bin", 0x0000, 0x2000, CRC(a7c47bac) SHA1(c999b0e4f5537405ed56c4c96beca5e7f5eb2b1e), ROM_BIOS(0))
+ROM_END
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void spectrum_proceed_device::device_add_mconfig(machine_config &config)
+{
+	Z80PIO(config, m_z80pio, 3500000);
+	m_z80pio->out_pa_callback().set(FUNC(spectrum_proceed_device::pioa_w));
+	m_z80pio->in_pb_callback().set(FUNC(spectrum_proceed_device::piob_r));
+	m_z80pio->out_pb_callback().set(FUNC(spectrum_proceed_device::piob_w));
+	m_z80pio->out_int_callback().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::irq_w));
+
+	cbm_iec_slot_device::add(config, m_iec, "c1541");
+
+	CENTRONICS(config, m_centronics, centronics_devices, "printer");
+	m_centronics->busy_handler().set(m_z80pio, FUNC(z80pio_device::pb0_w));
+}
+
+const tiny_rom_entry *spectrum_proceed_device::device_rom_region() const
+{
+	return ROM_NAME(proceed);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  spectrum_proceed_device - constructor
+//-------------------------------------------------
+
+spectrum_proceed_device::spectrum_proceed_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, SPECTRUM_PROCEED, tag, owner, clock)
+	, device_spectrum_expansion_interface(mconfig, *this)
+	, m_rom(*this, "rom")
+	, m_z80pio(*this, "z80pio")
+	, m_iec(*this, "iec_bus")
+	, m_centronics(*this, "centronics")
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void spectrum_proceed_device::device_start()
+{
+	save_item(NAME(m_romcs));
+	save_item(NAME(m_romen));
+}
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void spectrum_proceed_device::device_reset()
+{
+	m_romcs = 0;
+	m_romen = 0;
+	m_iec->reset();
+}
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+READ_LINE_MEMBER(spectrum_proceed_device::romcs)
+{
+	return m_romcs;
+}
+
+void spectrum_proceed_device::fetch(offs_t offset)
+{
+	switch (offset >> 8)
+	{
+		// always override
+	case 0x00:
+	case 0x0e:
+	case 0x39: case 0x3a: case 0x3b: case 0x3c:
+		m_romcs = 1;
+		break;
+	case 0x1b:
+		m_romcs = 1;
+		offset |= 0x0400; // 1Bxx -> 1Fxx
+		break;
+		// override only if PIO PB7 is 0
+	case 0x01: case 0x02: case 0x03: case 0x04: case 0x05: case 0x06: case 0x07: case 0x08: case 0x09: case 0x0a: case 0x0b: case 0x0c: case 0x0d:
+	case 0x0f: case 0x10: case 0x11: case 0x12: case 0x13: case 0x14: case 0x15: case 0x16: case 0x17: case 0x18:
+	case 0x1d: case 0x1e:
+		m_romcs = m_romen;
+		break;
+
+	default:
+		m_romcs = 0;
+	}
+}
+
+uint8_t spectrum_proceed_device::mreq_r(offs_t offset)
+{
+	u8 data = 0xff;
+
+	if (m_romcs)
+		data = m_rom->base()[offset & 0x1fff];
+
+	return data;
+}
+
+uint8_t spectrum_proceed_device::iorq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (!BIT(offset, 5))
+		data = m_z80pio->read((offset >> 6) & 3);
+
+	return data;
+}
+
+void spectrum_proceed_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if (!BIT(offset, 5))
+		m_z80pio->write((offset >> 6) & 3, data);
+}
+
+void spectrum_proceed_device::pioa_w(uint8_t data)
+{
+	m_centronics->write_data0(BIT(data, 0));
+	m_centronics->write_data1(BIT(data, 1));
+	m_centronics->write_data2(BIT(data, 2));
+	m_centronics->write_data3(BIT(data, 3));
+	m_centronics->write_data4(BIT(data, 4));
+	m_centronics->write_data5(BIT(data, 5));
+	m_centronics->write_data6(BIT(data, 6));
+	m_centronics->write_data7(BIT(data, 7));
+}
+
+uint8_t spectrum_proceed_device::piob_r()
+{
+	u8 data = 0;
+
+	data |= m_iec->clk_r() << 3;
+	data |= m_iec->data_r() << 2;
+
+	return data;
+}
+
+void spectrum_proceed_device::piob_w(uint8_t data)
+{
+	m_romen = !BIT(data, 7);
+	m_iec->host_atn_w(BIT(data, 6));
+	m_iec->host_clk_w(BIT(data, 5));
+	m_iec->host_data_w(BIT(data, 4));
+	m_centronics->write_strobe(BIT(data, 1));
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/logitek.h mame-0.224+dfsg.1/src/devices/bus/spectrum/logitek.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/logitek.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/logitek.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,73 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    Proceed 1 Interface
+    (c) 1984 Logitek
+
+*********************************************************************/
+#ifndef MAME_BUS_SPECTRUM_LOGITEK_H
+#define MAME_BUS_SPECTRUM_LOGITEK_H
+
+#include "exp.h"
+#include "softlist.h"
+#include "machine/z80pio.h"
+#include "bus/cbmiec/cbmiec.h"
+#include "bus/centronics/ctronics.h"
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class spectrum_proceed_device :
+	public device_t,
+	public device_spectrum_expansion_interface
+
+{
+public:
+	// construction/destruction
+	spectrum_proceed_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	static constexpr feature_type unemulated_features() { return feature::DISK; }
+
+	DECLARE_INPUT_CHANGED_MEMBER(nmi_button) { m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); };
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// optional information overrides
+	virtual ioport_constructor device_input_ports() const override;
+
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	void fetch(offs_t offset);
+
+	virtual void pre_opcode_fetch(offs_t offset) override { fetch(offset); };
+	virtual void pre_data_fetch(offs_t offset) override { fetch(offset); };
+	virtual uint8_t mreq_r(offs_t offset) override;
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
+
+	required_memory_region m_rom;
+	required_device<z80pio_device> m_z80pio;
+	required_device<cbm_iec_device> m_iec;
+	required_device<centronics_device> m_centronics;
+
+	void pioa_w(uint8_t data);
+	void piob_w(uint8_t data);
+	uint8_t piob_r();
+
+	int m_romcs;
+	int m_romen;
+};
+
+
+// device type definition
+DECLARE_DEVICE_TYPE(SPECTRUM_PROCEED, spectrum_proceed_device)
+
+
+#endif // MAME_BUS_SPECTRUM_LOGITEK_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/lprint.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/lprint.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/lprint.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/lprint.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,521 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    Common printer interfaces
+
+    ZX Lprint
+    (c) 1983 Euroelectronics (UK)
+
+    ZX Lprint III
+    (c) 1984 Euroelectronics (UK)
+    Centronics and RS232 interface, most common printer interface for ZX-Spectrum.
+
+    Hilderbay Interface (c) 1983 Hilderbay Ltd (UK)
+    AKA
+    Kempston Centronics S Interface (c) 1983 Kempston Micro Electronics Ltd (UK)
+    ROM-less device, require printer driver to be loaded from tape.
+
+    Kempston Centronics E Interface
+    (c) 1984 Kempston Micro Electronics Ltd (UK)
+
+    Notes/TODOs:
+     - add information and docs
+
+*********************************************************************/
+
+#include "emu.h"
+#include "lprint.h"
+#include <algorithm>
+
+
+/***************************************************************************
+    DEVICE DEFINITIONS
+***************************************************************************/
+
+DEFINE_DEVICE_TYPE(SPECTRUM_LPRINT, spectrum_lprint_device, "spectrum_lprint", "ZX Lprint")
+DEFINE_DEVICE_TYPE(SPECTRUM_LPRINT3, spectrum_lprint3_device, "spectrum_lprint3", "ZX Lprint III")
+DEFINE_DEVICE_TYPE(SPECTRUM_KEMPCENTRS, spectrum_kempcentrs_device, "spectrum_kempcentrs", "Hilderbay / Kempston Centronics S")
+DEFINE_DEVICE_TYPE(SPECTRUM_KEMPCENTREF, spectrum_kempcentre_device, "spectrum_kempcentref", "Kempston Centronics E (flat)")
+DEFINE_DEVICE_TYPE(SPECTRUM_KEMPCENTREU, spectrum_kempcentreu_device, "spectrum_kempcentreu", "Kempston Centronics E (upright)")
+
+//-------------------------------------------------
+//  ROMs
+//-------------------------------------------------
+
+ROM_START(lprint)
+	ROM_REGION(0x800, "rom", 0)
+	ROM_LOAD("lprint.rom", 0x0000, 0x0800, CRC(3c3483e5) SHA1(3e4c7ecd8c3eb011cdf75eb23faf8d8ea8329757)) // permanently overlay 0x0800-0x0fff ROM area
+ROM_END
+
+ROM_START(lprint3)
+	ROM_REGION(0x800, "rom", 0)
+	ROM_DEFAULT_BIOS("v2")
+
+	// original
+	ROM_SYSTEM_BIOS(0, "v1", "v1.0")
+	ROMX_LOAD("v10.rom", 0x0000, 0x0800, CRC(a5014f40) SHA1(fe823a8b87a8bdacb14aac848bc7fe946f76faae), ROM_BIOS(0))
+	ROM_SYSTEM_BIOS(1, "v2", "v2.0")
+	ROMX_LOAD("v20.rom", 0x0000, 0x0800, CRC(b8f9a58d) SHA1(4966664badbed44ddb1c1a2ca01bdef60f0a30f8), ROM_BIOS(1))
+
+	// clones
+	ROM_SYSTEM_BIOS(2, "kp", "Sandy") // from Sandy Disco V3 (Kempston Disc clone) lower PCB, also have joystick port and passthru connector
+	ROMX_LOAD("sandy.rom", 0x0000, 0x0800, CRC(77e752f2) SHA1(11f44c5e743a413e8bc0d07c4249f36d2c0a172a), ROM_BIOS(2))
+	ROM_SYSTEM_BIOS(3, "rus", "Art East Computers (RU)") // added support for popular Soviet and Eastern Block made printers
+	ROMX_LOAD("himak.rom", 0x0000, 0x0800, CRC(b1f15976) SHA1(d9c0297c05e8092fb7e0198f4172d3d4e6ed252c), ROM_BIOS(3))
+ROM_END
+
+ROM_START(kempcentref)
+	ROM_REGION(0x800, "rom", 0)
+	ROM_LOAD("kemp-e.rom", 0x0000, 0x0800, CRC(a58b1e97) SHA1(b26e9f720a215019b8710a4a094d6fde6ecae5fd))
+ROM_END
+
+ROM_START(kempcentreu)
+	ROM_REGION(0x800, "rom", 0)
+	ROM_LOAD("7f.rom", 0x0000, 0x0800, CRC(b67a416d) SHA1(6d0772e81cfd9bc994b1c91d4e01b45e0fc0d3d3)) // scrambled
+ROM_END
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void spectrum_lprint_device::device_add_mconfig(machine_config &config)
+{
+	CENTRONICS(config, m_centronics, centronics_devices, "printer");
+	m_centronics->busy_handler().set(FUNC(spectrum_lprint_device::busy_w));
+}
+
+void spectrum_lprint3_device::device_add_mconfig(machine_config &config)
+{
+	CENTRONICS(config, m_centronics, centronics_devices, "printer");
+	m_centronics->busy_handler().set(FUNC(spectrum_lprint3_device::busy_w));
+
+	RS232_PORT(config, m_rs232, default_rs232_devices, nullptr);
+
+	// passthru
+	// this is not really accurate, original ZX-Lprint boards had no passthru connector, but only some of clones
+	// TODO: populate expansion port only for devices which really had it
+	SPECTRUM_EXPANSION_SLOT(config, m_exp, spectrum_expansion_devices, nullptr);
+	m_exp->irq_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::irq_w));
+	m_exp->nmi_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::nmi_w));
+}
+
+void spectrum_kempcentrs_device::device_add_mconfig(machine_config &config)
+{
+	CENTRONICS(config, m_centronics, centronics_devices, "printer");
+	m_centronics->busy_handler().set(FUNC(spectrum_kempcentrs_device::busy_w));
+}
+
+void spectrum_kempcentre_device::device_add_mconfig(machine_config &config)
+{
+	CENTRONICS(config, m_centronics, centronics_devices, "printer");
+	m_centronics->busy_handler().set(FUNC(spectrum_kempcentre_device::busy_w));
+}
+
+const tiny_rom_entry *spectrum_lprint_device::device_rom_region() const
+{
+	return ROM_NAME(lprint);
+}
+
+const tiny_rom_entry *spectrum_lprint3_device::device_rom_region() const
+{
+	return ROM_NAME(lprint3);
+}
+
+const tiny_rom_entry *spectrum_kempcentre_device::device_rom_region() const
+{
+	return ROM_NAME(kempcentref);
+}
+
+const tiny_rom_entry *spectrum_kempcentreu_device::device_rom_region() const
+{
+	return ROM_NAME(kempcentreu);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  spectrum_lprint_device - constructors
+//-------------------------------------------------
+
+spectrum_lprint_device::spectrum_lprint_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, SPECTRUM_LPRINT, tag, owner, clock)
+	, device_spectrum_expansion_interface(mconfig, *this)
+	, m_rom(*this, "rom")
+	, m_centronics(*this, "centronics")
+{
+}
+
+spectrum_lprint3_device::spectrum_lprint3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, SPECTRUM_LPRINT3, tag, owner, clock)
+	, device_spectrum_expansion_interface(mconfig, *this)
+	, m_rom(*this, "rom")
+	, m_centronics(*this, "centronics")
+	, m_rs232(*this, "rs232")
+	, m_exp(*this, "exp")
+{
+}
+
+spectrum_kempcentrs_device::spectrum_kempcentrs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, SPECTRUM_KEMPCENTRS, tag, owner, clock)
+	, device_spectrum_expansion_interface(mconfig, *this)
+	, m_centronics(*this, "centronics")
+{
+}
+
+spectrum_kempcentre_device::spectrum_kempcentre_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, type, tag, owner, clock)
+	, device_spectrum_expansion_interface(mconfig, *this)
+	, m_rom(*this, "rom")
+	, m_centronics(*this, "centronics")
+{
+}
+
+spectrum_kempcentre_device::spectrum_kempcentre_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: spectrum_kempcentre_device(mconfig, SPECTRUM_KEMPCENTREF, tag, owner, clock)
+{
+}
+
+spectrum_kempcentreu_device::spectrum_kempcentreu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: spectrum_kempcentre_device(mconfig, SPECTRUM_KEMPCENTREU, tag, owner, clock)
+{
+}
+
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void spectrum_lprint_device::device_start()
+{
+	m_busy = 0;
+	save_item(NAME(m_romcs));
+	save_item(NAME(m_busy));
+}
+
+void spectrum_lprint3_device::device_start()
+{
+	m_busy = 0;
+	save_item(NAME(m_romcs));
+	save_item(NAME(m_busy));
+}
+
+void spectrum_kempcentrs_device::device_start()
+{
+	m_busy = 0;
+	save_item(NAME(m_busy));
+}
+
+void spectrum_kempcentre_device::device_start()
+{
+	m_busy = 0;
+	save_item(NAME(m_active));
+	save_item(NAME(m_romcs));
+	save_item(NAME(m_busy));
+}
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void spectrum_lprint_device::device_reset()
+{
+	m_romcs = 0;
+	m_centronics->write_strobe(1);
+}
+
+void spectrum_lprint3_device::device_reset()
+{
+	m_romcs = 0;
+	m_centronics->write_strobe(1);
+}
+
+void spectrum_kempcentrs_device::device_reset()
+{
+	m_centronics->write_strobe(1);
+}
+
+void spectrum_kempcentre_device::device_reset()
+{
+	m_active = 0;
+	m_romcs = 0;
+	m_centronics->write_strobe(1);
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION (lprint)
+//**************************************************************************
+
+READ_LINE_MEMBER(spectrum_lprint_device::romcs)
+{
+	return m_romcs;
+}
+
+void spectrum_lprint_device::pre_opcode_fetch(offs_t offset)
+{
+	if (!machine().side_effects_disabled())
+		m_romcs = offset >= 0x0800 && offset < 0x1000;
+}
+
+void spectrum_lprint_device::pre_data_fetch(offs_t offset)
+{
+	if (!machine().side_effects_disabled())
+		m_romcs = offset >= 0x0800 && offset < 0x1000;
+}
+
+uint8_t spectrum_lprint_device::mreq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (m_romcs)
+		data = m_rom->base()[offset & 0x7ff];
+
+	return data;
+}
+
+uint8_t spectrum_lprint_device::iorq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (!BIT(offset, 2))
+	{
+		// code check this like - if (value & 0xe0) == 0x40, bit 6 probably /BUSY
+		data &= ~0xe0;
+		data |= !m_busy << 6;
+	}
+
+	return data;
+}
+
+void spectrum_lprint_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if (!BIT(offset, 2))
+	{
+		m_centronics->write_data0(BIT(data, 0));
+		m_centronics->write_data1(BIT(data, 1));
+		m_centronics->write_data2(BIT(data, 2));
+		m_centronics->write_data3(BIT(data, 3));
+		m_centronics->write_data4(BIT(data, 4));
+		m_centronics->write_data5(BIT(data, 5));
+		m_centronics->write_data6(BIT(data, 6));
+		m_centronics->write_data7(BIT(data, 7));
+		m_centronics->write_strobe(1); // strobe probably fired automatically
+		m_centronics->write_strobe(0);
+		m_centronics->write_strobe(1);
+	}
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION (lprint3)
+//**************************************************************************
+
+READ_LINE_MEMBER(spectrum_lprint3_device::romcs)
+{
+	return m_romcs | m_exp->romcs();
+}
+
+uint8_t spectrum_lprint3_device::iorq_r(offs_t offset)
+{
+	uint8_t data = m_exp->iorq_r(offset);
+
+	if (!BIT(offset, 2))
+	{
+		if (!machine().side_effects_disabled())
+			m_romcs = BIT(offset, 7);
+		data &= ~0xc0;
+		data |= !m_rs232->dsr_r() << 6;
+		data |= m_busy << 7;
+	}
+
+	return data;
+}
+
+void spectrum_lprint3_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if (!BIT(offset, 2))
+	{
+		m_centronics->write_data0(BIT(data, 0));
+		m_centronics->write_data1(BIT(data, 1));
+		m_centronics->write_data2(BIT(data, 2));
+		m_centronics->write_data3(BIT(data, 3));
+		m_centronics->write_data4(BIT(data, 4));
+		m_centronics->write_data5(BIT(data, 5));
+		m_centronics->write_data6(BIT(data, 6));
+		m_centronics->write_data7(BIT(data, 7));
+		m_centronics->write_strobe(BIT(offset, 7));
+		m_rs232->write_txd(!BIT(data, 7));
+	}
+
+	m_exp->iorq_w(offset, data);
+}
+
+uint8_t spectrum_lprint3_device::mreq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (m_romcs)
+		data = m_rom->base()[offset & 0x7ff];
+
+	if (m_exp->romcs())
+		data &= m_exp->mreq_r(offset);
+
+	return data;
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION (kempcentrs)
+//**************************************************************************
+
+uint8_t spectrum_kempcentrs_device::iorq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	switch (offset)
+	{
+	case 0xe2bf:
+		data &= ~1;
+		data |= m_busy << 0;
+		break;
+	}
+
+	return data;
+}
+
+void spectrum_kempcentrs_device::iorq_w(offs_t offset, uint8_t data)
+{
+	switch (offset)
+	{
+	case 0xe0bf:
+		m_centronics->write_data0(BIT(data, 0));
+		m_centronics->write_data1(BIT(data, 1));
+		m_centronics->write_data2(BIT(data, 2));
+		m_centronics->write_data3(BIT(data, 3));
+		m_centronics->write_data4(BIT(data, 4));
+		m_centronics->write_data5(BIT(data, 5));
+		m_centronics->write_data6(BIT(data, 6));
+		m_centronics->write_data7(BIT(data, 7));
+		break;
+	case 0xe3bf:
+		// bit 0 is /STROBE, other bits not known, upon init driver writes to this port 0x81 then 0x0f
+		m_centronics->write_strobe(BIT(data, 0));
+		break;
+	}
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION (kempcentre)
+//**************************************************************************
+
+READ_LINE_MEMBER(spectrum_kempcentre_device::romcs)
+{
+	return m_romcs;
+}
+
+void spectrum_kempcentre_device::pre_opcode_fetch(offs_t offset)
+{
+	if (!machine().side_effects_disabled())
+		m_romcs = m_active && offset >= 0x0800 && offset < 0x1000;
+}
+
+void spectrum_kempcentre_device::pre_data_fetch(offs_t offset)
+{
+	if (!machine().side_effects_disabled())
+		m_romcs = m_active && offset >= 0x0800 && offset < 0x1000;
+}
+
+uint8_t spectrum_kempcentre_device::iorq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (!BIT(offset, 2)) // earlier version ? uses same paging as Lprint III
+	{
+		if (!machine().side_effects_disabled())
+			m_active = BIT(offset, 7);
+	}
+
+	if ((offset & 0xf0) == 0xb0) // BB or BF, actual address decode is not known
+	{
+		data &= ~0xc0;
+		data |= m_busy << 6;
+	}
+
+	return data;
+}
+
+void spectrum_kempcentre_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if ((offset & 0xf0) == 0xb0) // BB or BF, actual address decode is not known
+	{
+		m_centronics->write_data0(BIT(data, 0));
+		m_centronics->write_data1(BIT(data, 1));
+		m_centronics->write_data2(BIT(data, 2));
+		m_centronics->write_data3(BIT(data, 3));
+		m_centronics->write_data4(BIT(data, 4));
+		m_centronics->write_data5(BIT(data, 5));
+		m_centronics->write_data6(BIT(data, 6));
+		m_centronics->write_data7(BIT(data, 7));
+		m_centronics->write_strobe(BIT(offset, 2));
+	}
+}
+
+uint8_t spectrum_kempcentre_device::mreq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if (m_romcs)
+		data = m_rom->base()[offset & 0x7ff];
+
+	return data;
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION (kempcentreu)
+//**************************************************************************
+
+void spectrum_kempcentreu_device::device_start()
+{
+	// descramble ROM
+	std::vector<uint8_t> temp(m_rom->bytes());
+	std::copy_n(m_rom->base(), m_rom->bytes(), &temp[0]);
+	for (int i = 0; i < m_rom->bytes(); i++)
+	{
+		uint16_t addr = bitswap<11>(i, 10, 1, 0, 3, 7, 2, 6, 5, 4, 8, 9);
+		m_rom->base()[i] = bitswap<8>(temp[addr], 4, 5, 0, 1, 6, 7, 2, 3);
+	}
+	spectrum_kempcentre_device::device_start();
+}
+
+void spectrum_kempcentreu_device::pre_opcode_fetch(offs_t offset)
+{
+	if (!machine().side_effects_disabled())
+	{
+		if (offset == 0x09F4 || offset == 0x0eb4) // later version ? paged at PRINT and COPY routines
+			m_active = 1;
+
+		m_romcs = m_active && offset >= 0x0800 && offset < 0x1000;
+	}
+}
+
+uint8_t spectrum_kempcentreu_device::iorq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if ((offset & 0xf0) == 0xb0) // BB or BF, actual address decode is not known
+	{
+		if (!machine().side_effects_disabled())
+			m_active = !BIT(offset, 2);
+		data &= ~0xc0;
+		data |= m_busy << 6;
+		//data |= something_centronics << 7; // wired to centronics port, but connected to GND via wire-mod
+	}
+
+	return data;
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/lprint.h mame-0.224+dfsg.1/src/devices/bus/spectrum/lprint.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/lprint.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/lprint.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,185 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    Common printer interfaces
+
+*********************************************************************/
+#ifndef MAME_BUS_SPECTRUM_LPRINT_H
+#define MAME_BUS_SPECTRUM_LPRINT_H
+
+#include "exp.h"
+#include "bus/centronics/ctronics.h"
+#include "bus/rs232/rs232.h"
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class spectrum_lprint_device :
+	public device_t,
+	public device_spectrum_expansion_interface
+
+{
+public:
+	// construction/destruction
+	spectrum_lprint_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual void pre_opcode_fetch(offs_t offset) override;
+	virtual void pre_data_fetch(offs_t offset) override;
+	virtual uint8_t mreq_r(offs_t offset) override;
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
+
+	DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; };
+
+	required_memory_region m_rom;
+	required_device<centronics_device> m_centronics;
+
+	int m_romcs;
+	int m_busy;
+};
+
+class spectrum_lprint3_device :
+	public device_t,
+	public device_spectrum_expansion_interface
+
+{
+public:
+	// construction/destruction
+	spectrum_lprint3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual uint8_t mreq_r(offs_t offset) override;
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
+
+	// passthru
+	virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); };
+	virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); };
+	virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); };
+	virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+	virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); }
+
+	DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; };
+
+	required_memory_region m_rom;
+	required_device<centronics_device> m_centronics;
+	required_device<rs232_port_device> m_rs232;
+	required_device<spectrum_expansion_slot_device> m_exp;
+
+	int m_romcs;
+	int m_busy;
+};
+
+class spectrum_kempcentrs_device :
+	public device_t,
+	public device_spectrum_expansion_interface
+
+{
+public:
+	// construction/destruction
+	spectrum_kempcentrs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+
+	DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; };
+
+	required_device<centronics_device> m_centronics;
+
+	int m_busy;
+};
+
+class spectrum_kempcentre_device :
+	public device_t,
+	public device_spectrum_expansion_interface
+
+{
+public:
+	// construction/destruction
+	spectrum_kempcentre_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	spectrum_kempcentre_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual void pre_opcode_fetch(offs_t offset) override;
+	virtual void pre_data_fetch(offs_t offset) override;
+	virtual uint8_t mreq_r(offs_t offset) override;
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
+
+	DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; };
+
+	required_memory_region m_rom;
+	required_device<centronics_device> m_centronics;
+
+	int m_active;
+	int m_romcs;
+	int m_busy;
+};
+
+class spectrum_kempcentreu_device :
+	public spectrum_kempcentre_device
+{
+public:
+	// construction/destruction
+	spectrum_kempcentreu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+
+	// optional information overrides
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual void pre_opcode_fetch(offs_t offset) override;
+	virtual uint8_t iorq_r(offs_t offset) override;
+};
+
+
+// device type definition
+DECLARE_DEVICE_TYPE(SPECTRUM_LPRINT, spectrum_lprint_device)
+DECLARE_DEVICE_TYPE(SPECTRUM_LPRINT3, spectrum_lprint3_device)
+DECLARE_DEVICE_TYPE(SPECTRUM_KEMPCENTRS, spectrum_kempcentrs_device)
+DECLARE_DEVICE_TYPE(SPECTRUM_KEMPCENTREF, spectrum_kempcentre_device)
+DECLARE_DEVICE_TYPE(SPECTRUM_KEMPCENTREU, spectrum_kempcentreu_device)
+
+
+#endif // MAME_BUS_SPECTRUM_LPRINT_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/melodik.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/melodik.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/melodik.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/melodik.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -64,32 +64,6 @@
 //  IMPLEMENTATION
 //**************************************************************************
 
-READ_LINE_MEMBER(spectrum_melodik_device::romcs)
-{
-	return m_exp->romcs();
-}
-
-void spectrum_melodik_device::pre_opcode_fetch(offs_t offset)
-{
-	m_exp->pre_opcode_fetch(offset);
-}
-
-uint8_t spectrum_melodik_device::mreq_r(offs_t offset)
-{
-	uint8_t data = 0xff;
-
-	if (m_exp->romcs())
-		data &= m_exp->mreq_r(offset);
-
-	return data;
-}
-
-void spectrum_melodik_device::mreq_w(offs_t offset, uint8_t data)
-{
-	if (m_exp->romcs())
-		m_exp->mreq_w(offset, data);
-}
-
 uint8_t spectrum_melodik_device::iorq_r(offs_t offset)
 {
 	uint8_t data = m_exp->iorq_r(offset);
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/melodik.h mame-0.224+dfsg.1/src/devices/bus/spectrum/melodik.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/melodik.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/melodik.h	2020-08-26 08:57:19.000000000 +0000
@@ -36,12 +36,17 @@
 	// optional information overrides
 	virtual void device_add_mconfig(machine_config &config) override;
 
-	virtual void pre_opcode_fetch(offs_t offset) override;
-	virtual uint8_t mreq_r(offs_t offset) override;
-	virtual void mreq_w(offs_t offset, uint8_t data) override;
 	virtual uint8_t iorq_r(offs_t offset) override;
 	virtual void iorq_w(offs_t offset, uint8_t data) override;
-	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
+
+	// passthru
+	virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); };
+	virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); };
+	virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); };
+	virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+	virtual uint8_t mreq_r(offs_t offset) override { return m_exp->romcs() ? m_exp->mreq_r(offset) : 0xff; }
+	virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); }
+	virtual DECLARE_READ_LINE_MEMBER(romcs) override { return m_exp->romcs(); }
 
 private:
 	required_device<spectrum_expansion_slot_device> m_exp;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/mface.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/mface.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/mface.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/mface.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -381,11 +381,6 @@
 	return data;
 }
 
-void spectrum_mface_base_device::iorq_w(offs_t offset, uint8_t data)
-{
-	m_exp->iorq_w(offset, data);
-}
-
 void spectrum_mface1_device::iorq_w(offs_t offset, uint8_t data)
 {
 	switch (offset & 0xff)
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/mface.h mame-0.224+dfsg.1/src/devices/bus/spectrum/mface.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/mface.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/mface.h	2020-08-26 08:57:19.000000000 +0000
@@ -40,9 +40,15 @@
 	virtual void pre_opcode_fetch(offs_t offset) override;
 	virtual uint8_t mreq_r(offs_t offset) override;
 	virtual void mreq_w(offs_t offset, uint8_t data) override;
-	virtual void iorq_w(offs_t offset, uint8_t data) override;
 	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
 
+	// passthru
+	virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); };
+	virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); };
+	virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+	virtual uint8_t iorq_r(offs_t offset) override { return m_exp->iorq_r(offset); }
+	virtual void iorq_w(offs_t offset, uint8_t data) override { m_exp->iorq_w(offset, data); }
+
 	required_memory_region m_rom;
 	required_device<spectrum_expansion_slot_device> m_exp;
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/mgt.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/mgt.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/mgt.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/mgt.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -136,7 +136,7 @@
     --------------
 
     DISCiPLE
-    GDOS v3: all ok, occassional "no system file" when loading system disk, ok on 2nd attempt
+    GDOS v3: all ok
     GDOS v2: all ok
     UNIDOS:  all ok
 
@@ -145,7 +145,9 @@
     UNIDOS: all ok
 
 
-    Not working with 128K/+2 yet...
+    DISCiPLE and 128K compatibility notes:
+     there is some magic involved and its still not clear how exactly it boots on 128K (but it was confirmed to work on real hardware),
+     currently we assume paging in cannot be triggered for a while after reset.
 
 **********************************************************************/
 
@@ -193,6 +195,11 @@
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN)  PORT_8WAY PORT_PLAYER(2) PORT_NAME("Sinclair P2 Down")     PORT_CODE(KEYCODE_2_PAD)
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)    PORT_8WAY PORT_PLAYER(2) PORT_NAME("Sinclair P2 Up")       PORT_CODE(KEYCODE_8_PAD)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON1)                  PORT_PLAYER(2) PORT_NAME("Sinclair P2 Button 1") PORT_CODE(KEYCODE_0_PAD)
+
+	PORT_START("INH")
+	PORT_CONFNAME(0x01, 0x01, "Inhibit Button") PORT_CHANGED_MEMBER(DEVICE_SELF, spectrum_disciple_device, inhibit_button, 0)
+	PORT_CONFSETTING(0x01, "Off (Disciple enabled)")
+	PORT_CONFSETTING(0x00, "On (Disciple disabled)")
 INPUT_PORTS_END
 
 //-------------------------------------------------
@@ -343,6 +350,8 @@
 	, m_exp(*this, "exp")
 	, m_joy1(*this, "JOY1")
 	, m_joy2(*this, "JOY2")
+	, m_inhibit(*this, "INH")
+	, m_control(0) // CHECKME: what is 74LS374 power-on state ?
 {
 }
 
@@ -352,6 +361,7 @@
 
 void spectrum_plusd_device::device_start()
 {
+	m_romcs = 0;
 	std::fill(std::begin(m_ram), std::end(m_ram), 0);
 	save_item(NAME(m_romcs));
 	save_item(NAME(m_ram));
@@ -362,6 +372,8 @@
 {
 	spectrum_plusd_device::device_start();
 	save_item(NAME(m_map));
+	save_item(NAME(m_control));
+	save_item(NAME(m_reset_delay));
 }
 
 //-------------------------------------------------
@@ -370,13 +382,15 @@
 
 void spectrum_plusd_device::device_reset()
 {
-	m_romcs = 0;
+	m_centronics->write_strobe(0);
 }
 
 void spectrum_disciple_device::device_reset()
 {
-	spectrum_plusd_device::device_reset();
+	m_romcs = 0;
 	m_map = false;
+	m_reset_delay = true;
+	timer_set(attotime::from_usec(10), TIMER_RESET); // delay time is a guess
 }
 
 //**************************************************************************
@@ -394,7 +408,6 @@
 	{
 		switch (offset)
 		{
-		case 0x0000:
 		case 0x0008:
 		case 0x003a:
 		case 0x0066:
@@ -408,19 +421,19 @@
 {
 	uint8_t data = 0xff;
 
-	switch (offset & 0xff)
+	switch (offset & 0x7e) // address lines 0 and 7-15 ignored
 	{
-	case 0xe3: // fdc status reg
-	case 0xeb: // fdc track reg
-	case 0xf3: // fdc sector reg
-	case 0xfb: // fdc data reg
+	case 0x62: // fdc status reg
+	case 0x6a: // fdc track reg
+	case 0x72: // fdc sector reg
+	case 0x7a: // fdc data reg
 		data = m_fdc->read((offset >> 3) & 0x03);
 		break;
-	case 0xe7: // page in
+	case 0x66: // page in
 		if (!machine().side_effects_disabled())
 			m_romcs = 1;
 		break;
-	case 0xf7: // bit 7: printer busy
+	case 0x76: // bit 7: printer busy
 		data = m_centronics_busy ? 0x80 : 0x00;
 		break;
 	}
@@ -430,15 +443,15 @@
 
 void spectrum_plusd_device::iorq_w(offs_t offset, uint8_t data)
 {
-	switch (offset & 0xff)
+	switch (offset & 0x7e) // address lines 0 and 7-15 ignored
 	{
-	case 0xe3: // fdc command reg
-	case 0xeb: // fdc track reg
-	case 0xf3: // fdc sector reg
-	case 0xfb: // fdc data reg
+	case 0x62: // fdc command reg
+	case 0x6a: // fdc track reg
+	case 0x72: // fdc sector reg
+	case 0x7a: // fdc data reg
 		m_fdc->write((offset >> 3) & 0x03, data);
 		break;
-	case 0xef: // bit 0-1: drive select, 6: printer strobe, 7: side select
+	case 0x6e: // bit 0-1: drive select, 6: printer strobe, 7: side select
 		{
 			floppy_image_device* floppy = nullptr;
 			if (data & 1)
@@ -450,10 +463,10 @@
 			if (floppy) floppy->ss_w(BIT(data, 7));
 		}
 		break;
-	case 0xe7: // page out
+	case 0x66: // page out
 		m_romcs = 0;
 		break;
-	case 0xf7: // printer data
+	case 0x76: // printer data
 		m_centronics->write_data0(BIT(data, 0));
 		m_centronics->write_data1(BIT(data, 1));
 		m_centronics->write_data2(BIT(data, 2));
@@ -527,17 +540,19 @@
 
 void spectrum_disciple_device::pre_opcode_fetch(offs_t offset)
 {
-	m_exp->pre_opcode_fetch(offset);
+	if (m_inhibit->read() || !BIT(m_control, 4)) // when inhibit button pressed - /M1 passthrought might be blocked
+		m_exp->pre_opcode_fetch(offset);
 
 	if (!machine().side_effects_disabled())
 	{
 		switch (offset)
 		{
-		case 0x0000:
+		case 0x0001:
 		case 0x0008:
 		case 0x0066:
 		case 0x028e:
-			m_romcs = 1;
+			if (!m_reset_delay && (m_inhibit->read() || BIT(m_control, 4)))
+				m_romcs = 1;
 			break;
 		}
 	}
@@ -561,11 +576,11 @@
 		// 7: network...
 		break;
 	case 0x7b: // reset boot
-		if (!machine().side_effects_disabled())
+		if (!machine().side_effects_disabled() && !m_reset_delay)
 			m_map = false;
 		break;
 	case 0xbb: // page in
-		if (!machine().side_effects_disabled())
+		if (!machine().side_effects_disabled() && !m_reset_delay && (m_inhibit->read() || BIT(m_control, 4)))
 			m_romcs = 1;
 		break;
 	case 0xfe: // sinclair joysticks
@@ -600,16 +615,21 @@
 			// 5: exp select...
 			m_centronics->write_strobe(BIT(data, 6));
 			// 7: network...
+			m_control = data;
+			if (!m_inhibit->read() && !BIT(m_control, 4))
+				m_romcs = 0;
 		}
 		break;
 	case 0x3b: // wait when net=1
 		// ...
 		break;
 	case 0x7b: // set boot
-		m_map = true;
+		if (!m_reset_delay)
+			m_map = true;
 		break;
 	case 0xbb: // page out
-		m_romcs = 0;
+		if (!m_reset_delay)
+			m_romcs = 0;
 		break;
 	case 0xfb: // printer data
 		m_centronics->write_data0(BIT(data, 0));
@@ -691,3 +711,15 @@
 	if (m_exp->romcs())
 		m_exp->mreq_w(offset, data);
 }
+
+void spectrum_disciple_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	switch (id)
+	{
+	case TIMER_RESET:
+		m_reset_delay = false;
+		break;
+	default:
+		throw emu_fatalerror("Unknown id in spectrum_disciple_device::device_timer");
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/mgt.h mame-0.224+dfsg.1/src/devices/bus/spectrum/mgt.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/mgt.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/mgt.h	2020-08-26 08:57:19.000000000 +0000
@@ -71,10 +71,18 @@
 	// construction/destruction
 	spectrum_disciple_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+	DECLARE_INPUT_CHANGED_MEMBER(inhibit_button) { if (!newval) m_romcs = 0; };
+
 protected:
+	enum
+	{
+		TIMER_RESET
+	};
+
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
 	// optional information overrides
 	virtual void device_add_mconfig(machine_config &config) override;
@@ -92,8 +100,11 @@
 	required_device<spectrum_expansion_slot_device> m_exp;
 	required_ioport m_joy1;
 	required_ioport m_joy2;
+	required_ioport m_inhibit;
 
 	bool m_map;
+	u8 m_control;
+	bool m_reset_delay;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/opus.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/opus.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/opus.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/opus.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -139,7 +139,6 @@
 
 	save_item(NAME(m_romcs));
 	save_item(NAME(m_ram));
-	save_item(NAME(m_last_pc));
 }
 
 //-------------------------------------------------
@@ -149,7 +148,6 @@
 void spectrum_opus_device::device_reset()
 {
 	m_romcs = 0;
-	m_last_pc = 0x0000;
 }
 
 
@@ -162,13 +160,13 @@
 	return m_romcs | m_exp->romcs();
 }
 
-void spectrum_opus_device::pre_opcode_fetch(offs_t offset)
+void spectrum_opus_device::post_opcode_fetch(offs_t offset)
 {
-	m_exp->pre_opcode_fetch(offset);
+	m_exp->post_opcode_fetch(offset);
 
 	if (!machine().side_effects_disabled())
 	{
-		switch (m_last_pc)
+		switch (offset)
 		{
 		case 0x0008: case 0x0048: case 0x1708:
 			m_romcs = 1;
@@ -178,7 +176,6 @@
 			break;
 		}
 	}
-	m_last_pc = offset;
 }
 
 uint8_t spectrum_opus_device::iorq_r(offs_t offset)
@@ -193,11 +190,6 @@
 	return data;
 }
 
-void spectrum_opus_device::iorq_w(offs_t offset, uint8_t data)
-{
-	m_exp->iorq_w(offset, data);
-}
-
 uint8_t spectrum_opus_device::mreq_r(offs_t offset)
 {
 	uint8_t data = 0xff;
@@ -274,6 +266,7 @@
 
 void spectrum_opus_device::pia_out_b(uint8_t data)
 {
+	m_centronics->write_data0(BIT(data, 0));
 	m_centronics->write_data1(BIT(data, 1));
 	m_centronics->write_data2(BIT(data, 2));
 	m_centronics->write_data3(BIT(data, 3));
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/opus.h mame-0.224+dfsg.1/src/devices/bus/spectrum/opus.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/opus.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/opus.h	2020-08-26 08:57:19.000000000 +0000
@@ -42,13 +42,18 @@
 	virtual ioport_constructor device_input_ports() const override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 
-	virtual void pre_opcode_fetch(offs_t offset) override;
+	virtual void post_opcode_fetch(offs_t offset) override;
 	virtual uint8_t mreq_r(offs_t offset) override;
 	virtual void mreq_w(offs_t offset, uint8_t data) override;
 	virtual uint8_t iorq_r(offs_t offset) override;
-	virtual void iorq_w(offs_t offset, uint8_t data) override;
 	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
 
+	// passthru
+	virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); };
+	virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); };
+	virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+	virtual void iorq_w(offs_t offset, uint8_t data) override { m_exp->iorq_w(offset, data); }
+
 private:
 	void pia_out_a(uint8_t data);
 	void pia_out_b(uint8_t data);
@@ -65,7 +70,6 @@
 
 	int m_romcs;
 	uint8_t m_ram[4 * 1024];
-	offs_t m_last_pc;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/sdi.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/sdi.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/sdi.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/sdi.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,159 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    SDI - Commodore IEC Bus / VC1541 interface
+    (c) 198? Milan Uroševič, Ivan Gerenčir
+
+    Simple DIY device from Yugoslavian / Slovenian "Moj mikro" magazine.
+    Article scan http://www.zxspectrum.it.omegahg.com/rom/SDI/SDI.pdf
+    Components: i8255, 4K ROM.
+
+    Enter "RANDOMIZE USR 16000" to init / activate interface.
+
+    Notes / TODOs:
+    - floppy drive access doesn't work even with "quantum perfect" host machine config, cause is unknown.
+
+*********************************************************************/
+
+#include "emu.h"
+#include "sdi.h"
+
+
+/***************************************************************************
+    DEVICE DEFINITIONS
+***************************************************************************/
+
+DEFINE_DEVICE_TYPE(SPECTRUM_SDI, spectrum_sdi_device, "spectrum_sdi", "SDI Interface")
+
+
+//-------------------------------------------------
+//  ROM( sdi )
+//-------------------------------------------------
+
+ROM_START(sdi)
+	ROM_REGION(0x1000, "rom", 0)
+	ROM_DEFAULT_BIOS("sdiv1")
+
+	ROM_SYSTEM_BIOS(0, "sdiv1", "DOS v1.0")
+	ROMX_LOAD("sdi10.bin", 0x0000, 0x1000, CRC(d0678a71) SHA1(52405bb42e46a12b57806fd7f26691681afe2d8e), ROM_BIOS(0))
+ROM_END
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void spectrum_sdi_device::device_add_mconfig(machine_config &config)
+{
+	I8255(config, m_ppi);
+	m_ppi->in_pc_callback().set(FUNC(spectrum_sdi_device::ppic_r));
+	m_ppi->out_pc_callback().set(FUNC(spectrum_sdi_device::ppic_w));
+
+	cbm_iec_slot_device::add(config, m_iec, "c1541");
+}
+
+const tiny_rom_entry *spectrum_sdi_device::device_rom_region() const
+{
+	return ROM_NAME(sdi);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  spectrum_sdi_device - constructor
+//-------------------------------------------------
+
+spectrum_sdi_device::spectrum_sdi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, SPECTRUM_SDI, tag, owner, clock)
+	, device_spectrum_expansion_interface(mconfig, *this)
+	, m_rom(*this, "rom")
+	, m_ppi(*this, "ppi")
+	, m_iec(*this, "iec_bus")
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void spectrum_sdi_device::device_start()
+{
+	save_item(NAME(m_romcs));
+}
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void spectrum_sdi_device::device_reset()
+{
+	m_romcs = 0;
+	m_iec->reset();
+}
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+READ_LINE_MEMBER(spectrum_sdi_device::romcs)
+{
+	return m_romcs;
+}
+
+void spectrum_sdi_device::pre_opcode_fetch(offs_t offset)
+{
+	if (!machine().side_effects_disabled())
+	{
+		if ((offset & 0xfc00) == 0x3c00)
+			m_romcs = 1;
+
+		if (offset < 0x3000)
+			m_romcs = 0;
+	}
+}
+
+uint8_t spectrum_sdi_device::mreq_r(offs_t offset)
+{
+	u8 data = 0xff;
+
+	if (m_romcs)
+		data = m_rom->base()[offset & 0xfff];
+
+	return data;
+}
+
+uint8_t spectrum_sdi_device::iorq_r(offs_t offset)
+{
+	uint8_t data = 0xff;
+
+	if ((offset & 0x9f) == 0x9f)
+		data = m_ppi->read((offset >> 5) & 3);
+
+	return data;
+}
+
+void spectrum_sdi_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if ((offset & 0x9f) == 0x9f)
+		m_ppi->write((offset >> 5) & 3, data);
+}
+
+uint8_t spectrum_sdi_device::ppic_r()
+{
+	u8 data = 0;
+
+	data |= m_iec->clk_r() << 6;
+	data |= m_iec->data_r() << 7;
+
+	return data;
+}
+
+void spectrum_sdi_device::ppic_w(uint8_t data)
+{
+	m_iec->host_atn_w(!BIT(data, 0));
+	m_iec->host_clk_w(!BIT(data, 2));
+	m_iec->host_data_w(!BIT(data, 3));
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/sdi.h mame-0.224+dfsg.1/src/devices/bus/spectrum/sdi.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/sdi.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/sdi.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,61 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    SDI Interface
+
+*********************************************************************/
+#ifndef MAME_BUS_SPECTRUM_SDI_H
+#define MAME_BUS_SPECTRUM_SDI_H
+
+#include "exp.h"
+#include "softlist.h"
+#include "machine/i8255.h"
+#include "bus/cbmiec/cbmiec.h"
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class spectrum_sdi_device :
+	public device_t,
+	public device_spectrum_expansion_interface
+
+{
+public:
+	// construction/destruction
+	spectrum_sdi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	static constexpr feature_type unemulated_features() { return feature::DISK; }
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual void pre_opcode_fetch(offs_t offset) override;
+	virtual uint8_t mreq_r(offs_t offset) override;
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
+
+	required_memory_region m_rom;
+	required_device<i8255_device> m_ppi;
+	required_device<cbm_iec_device> m_iec;
+
+	void ppic_w(uint8_t data);
+	uint8_t ppic_r();
+
+	int m_romcs;
+};
+
+
+// device type definition
+DECLARE_DEVICE_TYPE(SPECTRUM_SDI, spectrum_sdi_device)
+
+
+#endif // MAME_BUS_SPECTRUM_SDI_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/sixword.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/sixword.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/sixword.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/sixword.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,598 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    Swift Disc
+    (c) 1987 SIXWORD ltd (UK)
+
+    WD1770-based floppy drive interface with 8KB RAM and 16KB ROM, serial printer interface, joystick port and "interrupt" button,
+    supports up to 4x 3'5 (normally) or 5"25 drives, 640KB per disk, compatible with ZX Spectrum 128, was positioned as luxury device.
+    For additional charge was available ZX Interface 1 microdrive emulator software (currently missing).
+
+    How to use:
+    Press "Interrupt" button and you'll get into console where you may type commands, like:
+     C[AT] [drive] - list disk contents, drive 0-3
+     D[ATE] [dd-mm-yy] - set current date, or show firmware build date
+     F[ORMAT] diskname - format disk
+     S[AVE] filename - save snapshot to disk
+     L[OAD] filename - load snapshot from disk
+     A[LTER] address data - change value in RAM
+     Q[UIT] - return to BASIC/game
+     * - reset
+    Starting from Swift Disc O/S V2 most of commands may be called from BASIC using syntax like "COMMAND %drive;"filename"", for example:
+     CAT %0
+     LOAD %0;"game"
+    and so on, plus additional commands for sequential file access.
+     FORMAT %#4;"T",1200,79 - printer setup: channel 4, text mode, 1200 baud, 79 column
+
+    Manual: https://k1.spdns.de/Vintage/Sinclair/82/Peripherals/Disc%20Interfaces/SixWord%20Swift%20Disc%20Interface/Swift%20Disc%20Operating%20Manual.pdf
+
+
+    Swift Disc II
+    (c) 1989 SIXWORD ltd (UK)
+
+    Same as above but extended to 32KB ROM, most of discrete ICs replaced with PALs, smaller form factor.
+    Was available in several favours - with serial or parallel printer port.
+    It seems RAM was planned to be extended to 16KB, but 2nd RAM IC is not populated on known devices.
+    Dumped v4.2 firmware supports only 2 disk drives (but PCB still have wired drive 3 and 4 select) and serial port.
+
+    Notes / TODOs:
+     - serial out not working properly with v4.2 ROM, it produce short TX low pulse after each character, which (mistakenly) considered as start bit by current diserial.cpp.
+     - parallel port hookup based on ROM disassembly and may be not accurate (i.e. ports may require to be enabled by some of m_control bits, or something like that)
+
+*********************************************************************/
+
+#include "emu.h"
+#include "sixword.h"
+
+
+/***************************************************************************
+    DEVICE DEFINITIONS
+***************************************************************************/
+
+DEFINE_DEVICE_TYPE(SPECTRUM_SWIFTDISC, spectrum_swiftdisc_device, "spectrum_swiftdisc", "Swift Disc Interface")
+DEFINE_DEVICE_TYPE(SPECTRUM_SWIFTDISC2, spectrum_swiftdisc2_device, "spectrum_swiftdisc2", "Swift Disc II Interface")
+
+
+//-------------------------------------------------
+//  INPUT_PORTS
+//-------------------------------------------------
+
+INPUT_PORTS_START(swiftdisc)
+	PORT_START("BUTTON")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Interrupt Button") PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, spectrum_swiftdisc_device, nmi_button, 0)
+
+	PORT_START("JOY")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT) PORT_8WAY
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT)  PORT_8WAY
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN)  PORT_8WAY
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP)    PORT_8WAY
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON1)
+	PORT_BIT(0xe0, IP_ACTIVE_HIGH, IPT_UNUSED)
+INPUT_PORTS_END
+
+INPUT_PORTS_START(swiftdisc2)
+	PORT_INCLUDE(swiftdisc)
+
+	PORT_START("CONF")
+	PORT_CONFNAME(0x01, 0x01, "Printer intrface")
+	PORT_CONFSETTING(0x01, "Serial")
+	PORT_CONFSETTING(0x00, "Parallel")
+INPUT_PORTS_END
+
+//-------------------------------------------------
+//  input_ports - device-specific input ports
+//-------------------------------------------------
+
+ioport_constructor spectrum_swiftdisc_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(swiftdisc);
+}
+
+ioport_constructor spectrum_swiftdisc2_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(swiftdisc2);
+}
+
+//-------------------------------------------------
+//  SLOT_INTERFACE( floppies )
+//-------------------------------------------------
+
+static void swiftdisc_floppies(device_slot_interface &device)
+{
+	device.option_add("35dd", FLOPPY_35_DD);
+	device.option_add("525qd", FLOPPY_525_QD);
+}
+
+//-------------------------------------------------
+//  floppy_format_type floppy_formats
+//-------------------------------------------------
+
+FLOPPY_FORMATS_MEMBER(spectrum_swiftdisc_device::floppy_formats)
+	FLOPPY_SWD_FORMAT
+FLOPPY_FORMATS_END
+
+//-------------------------------------------------
+//  ROM( swiftdisc )
+//-------------------------------------------------
+
+ROM_START(swiftdisc)
+	ROM_REGION(0x4000, "rom", 0)
+	ROM_DEFAULT_BIOS("v34")
+
+	// v2.3 known to exists, not dumped
+	ROM_SYSTEM_BIOS(0, "v24", "v2.4")
+	ROMX_LOAD("24.ic8", 0x0000, 0x4000, CRC(547f660a) SHA1(73a1b96271760fb0edfc1302368372501455bbfc), ROM_BIOS(0))
+	ROM_SYSTEM_BIOS(1, "v34", "v3.4")
+	ROMX_LOAD("34.ic8", 0x0000, 0x4000, CRC(f7092c0c) SHA1(5afe0364afedc83c03995d44914fe7f207fb5c28), ROM_BIOS(1))
+ROM_END
+
+ROM_START(swiftdisc2)
+	ROM_REGION(0x8000, "rom", 0)
+	ROM_DEFAULT_BIOS("v42")
+
+	ROM_SYSTEM_BIOS(0, "v42", "v4.2")
+	ROMX_LOAD("42.bin", 0x0000, 0x8000, CRC(a6fde15b) SHA1(496be6f655974b6162ff430b6ba0c7002164b736), ROM_BIOS(0))
+
+	ROM_REGION(260, "pals", 0)
+	ROM_LOAD("dec1_pal16l8.bin", 0, 260, BAD_DUMP CRC(1433067c) SHA1(a0cf09a86a0d7a71332005bbb04d27d3aa45291c)) // one of logic equations clearly wrong
+	ROM_LOAD("dec2_pal16l8.bin", 0, 260, CRC(4d088879) SHA1(d1d60b38068d457db25f5df304a705999f285fd9))
+	ROM_LOAD("dec3_pal16l8.bin", 0, 260, CRC(8306722c) SHA1(2ad28d44bc33a50ed5f93f2520f25100dd36841d))
+ROM_END
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void spectrum_swiftdisc_device::device_add_mconfig(machine_config &config)
+{
+	WD1770(config, m_fdc, 8_MHz_XTAL);
+	m_fdc->intrq_wr_callback().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::nmi_w));
+	m_fdc->drq_wr_callback().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::nmi_w));
+
+	FLOPPY_CONNECTOR(config, "fdc:0", swiftdisc_floppies, "35dd",  spectrum_swiftdisc_device::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:1", swiftdisc_floppies, "35dd",  spectrum_swiftdisc_device::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:2", swiftdisc_floppies, nullptr, spectrum_swiftdisc_device::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:3", swiftdisc_floppies, nullptr, spectrum_swiftdisc_device::floppy_formats).enable_sound(true);
+
+	RS232_PORT(config, m_rs232, default_rs232_devices, "printer");
+
+	// passthru
+	SPECTRUM_EXPANSION_SLOT(config, m_exp, spectrum_expansion_devices, nullptr);
+	m_exp->irq_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::irq_w));
+	m_exp->nmi_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::nmi_w));
+}
+
+void spectrum_swiftdisc2_device::device_add_mconfig(machine_config &config)
+{
+	spectrum_swiftdisc_device::device_add_mconfig(config);
+
+	// parallel printer port
+	CENTRONICS(config, m_centronics, centronics_devices, nullptr);
+	m_centronics->busy_handler().set(FUNC(spectrum_swiftdisc2_device::busy_w));
+}
+
+const tiny_rom_entry *spectrum_swiftdisc_device::device_rom_region() const
+{
+	return ROM_NAME(swiftdisc);
+}
+
+const tiny_rom_entry *spectrum_swiftdisc2_device::device_rom_region() const
+{
+	return ROM_NAME(swiftdisc2);
+}
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  spectrum_swiftdisc_device - constructor
+//-------------------------------------------------
+
+spectrum_swiftdisc_device::spectrum_swiftdisc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, type, tag, owner, clock)
+	, device_spectrum_expansion_interface(mconfig, *this)
+	, m_rom(*this, "rom")
+	, m_fdc(*this, "fdc")
+	, m_floppy(*this, "fdc:%u", 0)
+	, m_exp(*this, "exp")
+	, m_rs232(*this, "rs232")
+	, m_joy(*this, "JOY")
+{
+}
+
+spectrum_swiftdisc_device::spectrum_swiftdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: spectrum_swiftdisc_device(mconfig, SPECTRUM_SWIFTDISC, tag, owner, clock)
+{
+}
+
+spectrum_swiftdisc2_device::spectrum_swiftdisc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: spectrum_swiftdisc_device(mconfig, SPECTRUM_SWIFTDISC2, tag, owner, clock)
+	, m_centronics(*this, "centronics")
+	, m_conf(*this, "CONF")
+{
+}
+
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void spectrum_swiftdisc_device::device_start()
+{
+	memset(m_ram, 0, sizeof(m_ram));
+
+	save_item(NAME(m_romcs));
+	save_item(NAME(m_ram));
+	save_item(NAME(m_rombank));
+	save_item(NAME(m_control));
+}
+
+void spectrum_swiftdisc2_device::device_start()
+{
+	spectrum_swiftdisc_device::device_start();
+	save_item(NAME(m_rambank));
+	save_item(NAME(m_busy));
+	save_item(NAME(m_txd_on));
+}
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void spectrum_swiftdisc_device::device_reset()
+{
+	m_romcs = 0;
+	m_rombank = 0;
+	m_control = 0;
+	m_rs232->write_txd(1);
+}
+
+void spectrum_swiftdisc2_device::device_reset()
+{
+	spectrum_swiftdisc_device::device_reset();
+	m_rambank = 0;
+	m_busy = 0;
+	m_txd_on = 0;
+	m_rs232->write_dtr(1);
+	m_centronics->write_strobe(1);
+}
+
+//**************************************************************************
+//  IMPLEMENTATION (swiftdisc)
+//**************************************************************************
+
+READ_LINE_MEMBER(spectrum_swiftdisc_device::romcs)
+{
+	return m_romcs | m_exp->romcs();
+}
+
+void spectrum_swiftdisc_device::post_opcode_fetch(offs_t offset)
+{
+	m_exp->post_opcode_fetch(offset);
+
+	if (!machine().side_effects_disabled())
+	{
+		switch (offset)
+		{
+		case 0x000b:
+			m_romcs = !m_romcs;
+			break;
+		case 0x0066:
+			if (m_rombank & 0x1000)
+				m_romcs = !m_romcs;
+			break;
+		}
+	}
+}
+
+uint8_t spectrum_swiftdisc_device::mreq_r(offs_t offset)
+{
+	u8 data = 0xff;
+
+	if (m_romcs)
+	{
+		switch (offset & 0xf000)
+		{
+		case 0x0000:
+			data = m_rom->base()[m_rombank + offset];
+			break;
+		case 0x1000:
+		case 0x2000:
+			data = m_ram[offset - 0x1000];
+			break;
+		case 0x3000:
+			if (!BIT(offset, 3))
+				data = m_fdc->read(offset & 3);
+			else
+			{
+				// D0 - RS232 DSR, D1 - RS232 RX
+				data &= ~3;
+				data |= m_rs232->dsr_r() << 0;
+				data |= m_rs232->rxd_r() << 1;
+			}
+			break;
+		}
+	}
+
+	if (m_exp->romcs())
+		data &= m_exp->mreq_r(offset);
+
+	return data;
+}
+
+void spectrum_swiftdisc_device::mreq_w(offs_t offset, uint8_t data)
+{
+	if (m_romcs)
+	{
+		switch (offset & 0xf000)
+		{
+		case 0x0000:
+			if (BIT(offset, 3))
+				m_rombank ^= 0x1000;
+			else
+			{
+				floppy_image_device* floppy = nullptr;
+				for (int i = 3; i >= 0; i--)
+				{
+					floppy_image_device* fl = m_floppy[i]->get_device();
+					if (fl)
+					{
+						fl->ss_w(BIT(data, 4));
+						if (BIT(data, i))
+							floppy = fl;
+					}
+				}
+				m_fdc->set_floppy(floppy);
+
+				m_rombank &= ~0x2000;
+				m_rombank |= BIT(data, 5) << 13;
+
+				// D3 - RS232 /TX
+				m_rs232->write_txd(!BIT(data, 3));
+				m_control = data;
+			}
+			break;
+		case 0x1000:
+		case 0x2000:
+			m_ram[offset - 0x1000] = data;
+			break;
+		case 0x3000:
+			if (!BIT(offset, 3))
+				m_fdc->write(offset & 3, data);
+			break;
+		}
+	}
+
+	if (m_exp->romcs())
+		m_exp->mreq_w(offset, data);
+}
+
+uint8_t spectrum_swiftdisc_device::iorq_r(offs_t offset)
+{
+	uint8_t data = m_exp->iorq_r(offset);
+
+	if (!BIT(offset, 5))
+		data &= m_joy->read();
+
+	return data;
+}
+
+
+//**************************************************************************
+//  IMPLEMENTATION (swiftdisc2)
+//**************************************************************************
+
+void spectrum_swiftdisc2_device::post_opcode_fetch(offs_t offset)
+{
+	m_exp->post_opcode_fetch(offset);
+
+	if (!machine().side_effects_disabled())
+	{
+		switch (offset)
+		{
+		case 0x000b:
+			m_romcs = !m_romcs;
+			break;
+		case 0x0066:
+			if (m_rombank & 0x1000)
+				m_romcs = !m_romcs;
+			break;
+		case 0x1709:
+			if (BIT(m_control,2))
+				m_romcs = !m_romcs;
+			break;
+		}
+	}
+}
+
+uint8_t spectrum_swiftdisc2_device::mreq_r(offs_t offset)
+{
+	u8 data = 0xff;
+
+	if (m_romcs)
+	{
+		switch (offset & 0xf000)
+		{
+		case 0x0000:
+			data = m_rom->base()[m_rombank + offset];
+			break;
+		case 0x1000:
+		case 0x2000:
+			if (!m_rambank)
+				data = m_ram[offset - 0x1000];
+			else
+			{
+				data = 0xff; // 2nd RAM IC not populated
+				logerror("Swift2 RAM2 read %04x\n", offset);
+			}
+			break;
+		case 0x3000:
+			if (!BIT(offset, 4))
+				data = m_fdc->read(offset & 3);
+			else
+				data = control_r();
+			break;
+		}
+	}
+
+	if (m_exp->romcs())
+		data &= m_exp->mreq_r(offset);
+
+	return data;
+}
+
+void spectrum_swiftdisc2_device::mreq_w(offs_t offset, uint8_t data)
+{
+	if (m_romcs)
+	{
+		switch (offset & 0xf000)
+		{
+		case 0x0000:
+			if (BIT(offset, 8))
+				m_rambank = !m_rambank;
+			break;
+		case 0x1000:
+		case 0x2000:
+			if (!m_rambank)
+				m_ram[offset - 0x1000] = data;
+			else
+			{
+				// 2nd RAM IC not populated
+				logerror("Swift2 RAM2 write %04x %02x\n", offset, data);
+			}
+			break;
+		case 0x3000:
+			if ((offset & 0x890) == 0)
+				m_fdc->write(offset & 3, data);
+
+			if (BIT(offset, 4))
+				control_w(data);
+			break;
+		}
+	}
+
+	if (m_exp->romcs())
+		m_exp->mreq_w(offset, data);
+}
+
+uint8_t spectrum_swiftdisc2_device::iorq_r(offs_t offset)
+{
+	uint8_t data = m_exp->iorq_r(offset);
+
+	if (m_romcs && (offset & 0xf890) == 0x3000)
+		data &= control_r();
+
+	if (!BIT(offset, 5) && !BIT(m_control, 3))
+		data &= m_joy->read();
+
+	if (m_conf->read())
+	{
+		if (BIT(m_control, 2))
+		{
+			if (!BIT(offset, 3)) // port F7
+			{
+				// D7 - RS232 /RX
+				data &= ~(m_rs232->rxd_r() << 7);
+			}
+			if (!BIT(offset, 4)) // port EF
+			{
+				data &= ~4;
+				data |= 0x0b;
+				// D3 - RS232 /DSR
+				data &= ~(m_rs232->dsr_r() << 3);
+			}
+		}
+	}
+	else
+	{
+		if (!BIT(offset, 3)) // port F7
+		{
+			// D7 - Centronics /BUSY
+			data &= ~(m_busy << 7);
+		}
+	}
+
+	return data;
+}
+
+void spectrum_swiftdisc2_device::iorq_w(offs_t offset, uint8_t data)
+{
+	if (m_romcs && (offset & 0xf890) == 0x3000)
+		control_w(data);
+
+	if (m_conf->read())
+	{
+		if (BIT(m_control, 2))
+		{
+			if (!BIT(offset, 3)) // port F7
+			{
+				// D0 - RS232 /TX
+				if (m_txd_on)
+					m_rs232->write_txd(!BIT(data, 0));
+			}
+			if (!BIT(offset, 4)) // port EF
+			{
+				// D0 - 0=reset /TX latch (set output to 1)
+				// D4 - RS232 /DTR
+				m_txd_on = BIT(data, 0);
+				if (!m_txd_on)
+					m_rs232->write_txd(1);
+				m_rs232->write_dtr(!BIT(data, 4));
+			}
+		}
+	}
+	else
+	{
+		if (!BIT(offset, 3)) // F7
+		{
+			// D0 - Centronics /STROBE
+			m_centronics->write_strobe(BIT(data, 0));
+		}
+		if (!BIT(offset, 4)) // EF
+		{
+			// D0 - D7 - Centronics data
+			m_centronics->write_data0(BIT(data, 0));
+			m_centronics->write_data1(BIT(data, 1));
+			m_centronics->write_data2(BIT(data, 2));
+			m_centronics->write_data3(BIT(data, 3));
+			m_centronics->write_data4(BIT(data, 4));
+			m_centronics->write_data5(BIT(data, 5));
+			m_centronics->write_data6(BIT(data, 6));
+			m_centronics->write_data7(BIT(data, 7));
+		}
+	}
+
+	m_exp->iorq_w(offset, data);
+}
+
+uint8_t spectrum_swiftdisc2_device::control_r()
+{
+	// D0 - printer interface type, 0 - parallel, 1 - serial
+	return 0xfe | m_conf->read();
+}
+
+void spectrum_swiftdisc2_device::control_w(uint8_t data)
+{
+	floppy_image_device* floppy = nullptr;
+	for (int i = 3; i >= 0; i--)
+	{
+		floppy_image_device* fl = m_floppy[i]->get_device();
+		if (fl)
+		{
+			fl->ss_w(BIT(data, 4));
+			if (!BIT(data, i))
+				floppy = fl;
+		}
+	}
+	m_fdc->set_floppy(floppy);
+
+	m_rombank &= ~0x6000;
+	m_rombank |= BIT(data, 5) << 13;
+	m_rombank |= BIT(data, 6) << 14;
+
+	if (BIT(data, 7) && !BIT(m_control, 7)) // swap bank at 0->1
+		m_rombank ^= 0x1000;
+	m_control = data;
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/sixword.h mame-0.224+dfsg.1/src/devices/bus/spectrum/sixword.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/sixword.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/sixword.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,115 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    SIXWORD Swift Disc Interface
+
+*********************************************************************/
+#ifndef MAME_BUS_SPECTRUM_SIXWORD_H
+#define MAME_BUS_SPECTRUM_SIXWORD_H
+
+#include "exp.h"
+#include "softlist.h"
+#include "imagedev/floppy.h"
+#include "machine/wd_fdc.h"
+#include "bus/centronics/ctronics.h"
+#include "bus/rs232/rs232.h"
+#include "formats/swd_dsk.h"
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class spectrum_swiftdisc_device :
+	public device_t,
+	public device_spectrum_expansion_interface
+
+{
+public:
+	// construction/destruction
+	spectrum_swiftdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	DECLARE_FLOPPY_FORMATS(floppy_formats);
+	DECLARE_INPUT_CHANGED_MEMBER(nmi_button) { m_rombank |= newval << 12; m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); };
+
+protected:
+	spectrum_swiftdisc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// optional information overrides
+	virtual ioport_constructor device_input_ports() const override;
+
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual void post_opcode_fetch(offs_t offset) override;
+	virtual uint8_t mreq_r(offs_t offset) override;
+	virtual void mreq_w(offs_t offset, uint8_t data) override;
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
+
+	// passthru
+	virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); };
+	virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); };
+	virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+	virtual void iorq_w(offs_t offset, uint8_t data) override { m_exp->iorq_w(offset, data); }
+
+	required_memory_region m_rom;
+	required_device<wd_fdc_device_base> m_fdc;
+	required_device_array<floppy_connector, 4> m_floppy;
+	required_device<spectrum_expansion_slot_device> m_exp;
+	required_device<rs232_port_device> m_rs232;
+	required_ioport m_joy;
+
+	int m_romcs;
+	u8 m_ram[0x2000];
+	u16 m_rombank;
+	u8 m_control;
+};
+
+class spectrum_swiftdisc2_device :
+	public spectrum_swiftdisc_device
+{
+public:
+	// construction/destruction
+	spectrum_swiftdisc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	virtual ioport_constructor device_input_ports() const override;
+
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual void post_opcode_fetch(offs_t offset) override;
+	virtual uint8_t mreq_r(offs_t offset) override;
+	virtual void mreq_w(offs_t offset, uint8_t data) override;
+	virtual uint8_t iorq_r(offs_t offset) override;
+	virtual void iorq_w(offs_t offset, uint8_t data) override;
+	DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; };
+
+	required_device<centronics_device> m_centronics;
+	required_ioport m_conf;
+
+	uint8_t control_r();
+	void control_w(uint8_t data);
+
+	int m_rambank;
+	int m_busy;
+	int m_txd_on;
+};
+
+
+
+// device type definition
+DECLARE_DEVICE_TYPE(SPECTRUM_SWIFTDISC, spectrum_swiftdisc_device)
+DECLARE_DEVICE_TYPE(SPECTRUM_SWIFTDISC2, spectrum_swiftdisc2_device)
+
+
+#endif // MAME_BUS_SPECTRUM_SIXWORD_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/speccydos.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/speccydos.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/speccydos.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/speccydos.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,246 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    Speccy-DOS Interface
+    (c) 1987? Philips(?)
+
+    WD1770/2-based floppy drive interface with 1K RAM and 8K ROM,
+    presumable developed by Philips & MBLE Belgium, had some popularity in Hungary.
+
+    Main commands:
+     LIST * - list disc contents
+     LOAD *"filename" - load and run program
+     SAVE *"filename" - save program
+     FORMAT *"diskname"dd80 - format double side double density 80 tracks disk
+     ASN *drive# - change drive
+
+    Manual: https://sinclair.hu/speccyalista/konyvtar/kezikonyvek/SpeccyDOSv4_manual.pdf
+
+    Partially compatible with Spectrum128, useable after "USR 0" from basic128 or switch to 48K mode.
+
+    Notes / TODOs:
+     - address decoding performed by large DIP28 chip, probably PROM, not dumped, exact logic is not known.
+     - program ROMs have swapped data lines/bits 1 and 5.
+     - original software disc mentioned in manual is missing.
+     - Magic/NMI function require NMI routine preloaded in RAM by "MAGIC2.x" program (which is missing).
+
+*********************************************************************/
+
+#include "emu.h"
+#include "speccydos.h"
+
+
+/***************************************************************************
+    DEVICE DEFINITIONS
+***************************************************************************/
+
+DEFINE_DEVICE_TYPE(SPECTRUM_SPECCYDOS, spectrum_speccydos_device, "spectrum_speccydos", "Speccy-DOS Interface")
+
+
+//-------------------------------------------------
+//  INPUT_PORTS
+//-------------------------------------------------
+
+INPUT_PORTS_START(speccydos)
+	PORT_START("BUTTON")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Magic Button") PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, spectrum_speccydos_device, magic_button, 0)
+INPUT_PORTS_END
+
+//-------------------------------------------------
+//  input_ports - device-specific input ports
+//-------------------------------------------------
+
+ioport_constructor spectrum_speccydos_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(speccydos);
+}
+
+//-------------------------------------------------
+//  SLOT_INTERFACE( floppies )
+//-------------------------------------------------
+
+static void speccydos_floppies(device_slot_interface &device)
+{
+	device.option_add("525sssd_35t", FLOPPY_525_SSSD_35T);
+	device.option_add("525ssdd", FLOPPY_525_SSDD);
+	device.option_add("525dsdd", FLOPPY_525_DD);
+	device.option_add("525ssqd", FLOPPY_525_SSQD);
+	device.option_add("525dsqd", FLOPPY_525_QD);
+	device.option_add("35ssdd", FLOPPY_35_SSDD);
+	device.option_add("35dsdd", FLOPPY_35_DD);
+}
+
+//-------------------------------------------------
+//  floppy_format_type floppy_formats
+//-------------------------------------------------
+
+FLOPPY_FORMATS_MEMBER(spectrum_speccydos_device::floppy_formats)
+	FLOPPY_SDD_FORMAT
+FLOPPY_FORMATS_END
+
+//-------------------------------------------------
+//  ROM( speccydos )
+//-------------------------------------------------
+
+ROM_START(speccydos)
+	ROM_REGION(0x2000, "rom", 0)
+	ROM_DEFAULT_BIOS("sdos42")
+
+	ROM_SYSTEM_BIOS(0, "sdos41", "Speccy DOS v4.1")
+	ROMX_LOAD("sdos41.bin", 0x0000, 0x2000, CRC(fcfa6dac) SHA1(bcae27b334bbbee257900682859132f476c3be99), ROM_BIOS(0))
+	ROM_SYSTEM_BIOS(1, "sdos42", "Speccy DOS v4.2 (WD1770)")
+	ROMX_LOAD("sdos42.bin", 0x0000, 0x2000, CRC(208e7baa) SHA1(80e82c1dd77ff04b86989f7d2a25d93c5aa1dc42), ROM_BIOS(1))
+	ROM_SYSTEM_BIOS(2, "sdos422", "Speccy DOS v4.2 (WD1772)") // only 4 byte different from above - step rates for 1772
+	ROMX_LOAD("sdos422.bin", 0x0000, 0x2000, CRC(a7317e1d) SHA1(e72d2ea19cbe8f3459e4fc9d3c57975dc9917bd6), ROM_BIOS(2))
+ROM_END
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+void spectrum_speccydos_device::device_add_mconfig(machine_config &config)
+{
+	WD1770(config, m_fdc, 8_MHz_XTAL);
+
+	FLOPPY_CONNECTOR(config, "fdc:0", speccydos_floppies, "525dsqd", spectrum_speccydos_device::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:1", speccydos_floppies, "525dsqd", spectrum_speccydos_device::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:2", speccydos_floppies, nullptr, spectrum_speccydos_device::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:3", speccydos_floppies, nullptr, spectrum_speccydos_device::floppy_formats).enable_sound(true);
+
+	// passthru
+	SPECTRUM_EXPANSION_SLOT(config, m_exp, spectrum_expansion_devices, nullptr);
+	m_exp->irq_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::irq_w));
+	m_exp->nmi_handler().set(DEVICE_SELF_OWNER, FUNC(spectrum_expansion_slot_device::nmi_w));
+}
+
+const tiny_rom_entry *spectrum_speccydos_device::device_rom_region() const
+{
+	return ROM_NAME(speccydos);
+}
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  spectrum_speccydos_device - constructor
+//-------------------------------------------------
+
+spectrum_speccydos_device::spectrum_speccydos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, SPECTRUM_SPECCYDOS, tag, owner, clock)
+	, device_spectrum_expansion_interface(mconfig, *this)
+	, m_rom(*this, "rom")
+	, m_fdc(*this, "fdc")
+	, m_floppy(*this, "fdc:%u", 0)
+	, m_exp(*this, "exp")
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void spectrum_speccydos_device::device_start()
+{
+	memset(m_ram, 0, sizeof(m_ram));
+
+	save_item(NAME(m_romcs));
+	save_item(NAME(m_control));
+	save_item(NAME(m_ram));
+}
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void spectrum_speccydos_device::device_reset()
+{
+	m_romcs = 0;
+	m_control = 0;
+}
+
+//**************************************************************************
+//  IMPLEMENTATION
+//**************************************************************************
+
+READ_LINE_MEMBER(spectrum_speccydos_device::romcs)
+{
+	return m_romcs | m_exp->romcs();
+}
+
+void spectrum_speccydos_device::pre_opcode_fetch(offs_t offset)
+{
+	m_exp->pre_opcode_fetch(offset);
+
+	if (!machine().side_effects_disabled())
+	{
+		switch (offset)
+		{
+		case 0x0066:
+		case 0x1292:
+		case 0x1b41:
+			if (!BIT(m_control, 6))
+				m_romcs = 1;
+			break;
+		}
+	}
+}
+
+uint8_t spectrum_speccydos_device::mreq_r(offs_t offset)
+{
+	u8 data = 0xff;
+
+	if (m_romcs)
+	{
+		if (offset < 0x2000)
+		{
+			data = m_rom->base()[offset];
+			data = bitswap<8>(data, 7, 6, 1, 4, 3, 2, 5, 0);
+		}
+		else if (offset < 0x2400)
+			data = m_ram[offset & 0x3ff];
+		else if (offset >= 0x3290 && offset < 0x3294)
+			data = m_fdc->read(offset & 3);
+		else
+			logerror("SpeccyDOS unhandled read %04X\n", offset);
+	}
+
+	if (m_exp->romcs())
+		data &= m_exp->mreq_r(offset);
+
+	return data;
+}
+
+void spectrum_speccydos_device::mreq_w(offs_t offset, uint8_t data)
+{
+	if (offset == 0x3b41)
+	{
+		m_control = data;
+		floppy_image_device* floppy = m_floppy[data & 3]->get_device();
+		m_fdc->set_floppy(floppy);
+
+		if (floppy)
+			floppy->ss_w(BIT(data, 2));
+		m_fdc->dden_w(BIT(data, 7));
+
+		m_romcs = BIT(data, 6) ? 0 : BIT(data, 3);
+	}
+	else
+		if (m_romcs)
+		{
+			if (offset >= 0x2000 && offset < 0x2400)
+				m_ram[offset & 0x3ff] = data;
+			else if (offset >= 0x3290 && offset < 0x3294)
+				m_fdc->write(offset & 3, data);
+			else
+			{
+				logerror("SpeccyDOS unhandled write %04X %02X\n", offset, data);
+				//machine().debug_break();
+			}
+		}
+
+	if (m_exp->romcs())
+		m_exp->mreq_w(offset, data);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/speccydos.h mame-0.224+dfsg.1/src/devices/bus/spectrum/speccydos.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/speccydos.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/speccydos.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,71 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    Speccy DOS Interface
+
+*********************************************************************/
+#ifndef MAME_BUS_SPECTRUM_SPECCYDOS_H
+#define MAME_BUS_SPECTRUM_SPECCYDOS_H
+
+#include "exp.h"
+#include "softlist.h"
+#include "imagedev/floppy.h"
+#include "machine/wd_fdc.h"
+#include "formats/sdd_dsk.h"
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class spectrum_speccydos_device :
+	public device_t,
+	public device_spectrum_expansion_interface
+
+{
+public:
+	// construction/destruction
+	spectrum_speccydos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	DECLARE_FLOPPY_FORMATS(floppy_formats);
+	DECLARE_INPUT_CHANGED_MEMBER(magic_button) { m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); };
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// optional information overrides
+	virtual ioport_constructor device_input_ports() const override;
+
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+	virtual void pre_opcode_fetch(offs_t offset) override;
+	virtual uint8_t mreq_r(offs_t offset) override;
+	virtual void mreq_w(offs_t offset, uint8_t data) override;
+	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
+
+	// passthru
+	virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); };
+	virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); };
+	virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+	virtual uint8_t iorq_r(offs_t offset) override { return m_exp->iorq_r(offset); }
+	virtual void iorq_w(offs_t offset, uint8_t data) override { m_exp->iorq_w(offset, data); }
+
+	required_memory_region m_rom;
+	required_device<wd_fdc_device_base> m_fdc;
+	required_device_array<floppy_connector, 4> m_floppy;
+	required_device<spectrum_expansion_slot_device> m_exp;
+
+	int m_romcs;
+	u8 m_control;
+	u8 m_ram[0x400];
+};
+
+
+// device type definition
+DECLARE_DEVICE_TYPE(SPECTRUM_SPECCYDOS, spectrum_speccydos_device)
+
+
+#endif // MAME_BUS_SPECTRUM_SPECCYDOS_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/uslot.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/uslot.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/uslot.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/uslot.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -82,6 +82,24 @@
 	m_exp2->pre_opcode_fetch(offset);
 }
 
+void spectrum_uslot_device::post_opcode_fetch(offs_t offset)
+{
+	m_exp1->post_opcode_fetch(offset);
+	m_exp2->post_opcode_fetch(offset);
+}
+
+void spectrum_uslot_device::pre_data_fetch(offs_t offset)
+{
+	m_exp1->pre_data_fetch(offset);
+	m_exp2->pre_data_fetch(offset);
+}
+
+void spectrum_uslot_device::post_data_fetch(offs_t offset)
+{
+	m_exp1->post_data_fetch(offset);
+	m_exp2->post_data_fetch(offset);
+}
+
 uint8_t spectrum_uslot_device::mreq_r(offs_t offset)
 {
 	uint8_t data = 0xff;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/uslot.h mame-0.224+dfsg.1/src/devices/bus/spectrum/uslot.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/uslot.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/uslot.h	2020-08-26 08:57:19.000000000 +0000
@@ -37,6 +37,9 @@
 	virtual void device_add_mconfig(machine_config &config) override;
 
 	virtual void pre_opcode_fetch(offs_t offset) override;
+	virtual void post_opcode_fetch(offs_t offset) override;
+	virtual void pre_data_fetch(offs_t offset) override;
+	virtual void post_data_fetch(offs_t offset) override;
 	virtual uint8_t mreq_r(offs_t offset) override;
 	virtual void mreq_w(offs_t offset, uint8_t data) override;
 	virtual uint8_t iorq_r(offs_t offset) override;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/usource.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/usource.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/usource.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/usource.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -93,5 +93,10 @@
 
 uint8_t spectrum_usource_device::mreq_r(offs_t offset)
 {
-	return m_rom->base()[offset & 0x1fff];
+	u8 data = 0xff;
+
+	if (m_romcs)
+		data = m_rom->base()[offset & 0x1fff];
+
+	return data;
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/uspeech.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/uspeech.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/uspeech.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/uspeech.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -121,14 +121,17 @@
 {
 	uint8_t data = 0xff;
 
-	switch (offset & 0xf000)
+	if (m_romcs)
 	{
-	case 0x0000:
-		data = m_rom->base()[offset & 0x7ff];
-		break;
-	case 0x1000:
-		data = !m_nsp->lrq_r();
-		break;
+		switch (offset & 0xf000)
+		{
+		case 0x0000:
+			data = m_rom->base()[offset & 0x7ff];
+			break;
+		case 0x1000:
+			data = !m_nsp->lrq_r();
+			break;
+		}
 	}
 
 	return data;
@@ -136,22 +139,25 @@
 
 void spectrum_uspeech_device::mreq_w(offs_t offset, uint8_t data)
 {
-	switch (offset & 0xf001)
+	if (m_romcs)
 	{
-	case 0x1000:
-	case 0x1001:
-		// allophone
-		m_nsp->ald_w(data & 0x3f);
-		break;
+		switch (offset & 0xf001)
+		{
+		case 0x1000:
+		case 0x1001:
+			// allophone
+			m_nsp->ald_w(data & 0x3f);
+			break;
 
-	case 0x3000:
-		// intonation low
-		m_nsp->set_clock(3050000); // oscillator frequency read from hardware
-		break;
+		case 0x3000:
+			// intonation low
+			m_nsp->set_clock(3050000); // oscillator frequency read from hardware
+			break;
 
-	case 0x3001:
-		// intonation high
-		m_nsp->set_clock(3260000); // oscillator frequency read from hardware
-		break;
+		case 0x3001:
+			// intonation high
+			m_nsp->set_clock(3260000); // oscillator frequency read from hardware
+			break;
+		}
 	}
 }
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/wafa.cpp mame-0.224+dfsg.1/src/devices/bus/spectrum/wafa.cpp
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/wafa.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/wafa.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -158,12 +158,6 @@
 	return data;
 }
 
-void spectrum_wafa_device::mreq_w(offs_t offset, uint8_t data)
-{
-	if (m_exp->romcs())
-		m_exp->mreq_w(offset, data);
-}
-
 uint8_t spectrum_wafa_device::iorq_r(offs_t offset)
 {
 	uint8_t data = 0xff;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/spectrum/wafa.h mame-0.224+dfsg.1/src/devices/bus/spectrum/wafa.h
--- mame-0.222+dfsg.1/src/devices/bus/spectrum/wafa.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/spectrum/wafa.h	2020-08-26 08:57:19.000000000 +0000
@@ -42,11 +42,15 @@
 	virtual void pre_opcode_fetch(offs_t offset) override;
 	virtual void post_opcode_fetch(offs_t offset) override;
 	virtual uint8_t mreq_r(offs_t offset) override;
-	virtual void mreq_w(offs_t offset, uint8_t data) override;
 	virtual uint8_t iorq_r(offs_t offset) override;
 	virtual void iorq_w(offs_t offset, uint8_t data) override;
 	virtual DECLARE_READ_LINE_MEMBER(romcs) override;
 
+	// passthru
+	virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); };
+	virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); };
+	virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); }
+
 private:
 	required_device<spectrum_expansion_slot_device> m_exp;
 	required_memory_region m_rom;
diff -Nru mame-0.222+dfsg.1/src/devices/bus/ti99/internal/992board.cpp mame-0.224+dfsg.1/src/devices/bus/ti99/internal/992board.cpp
--- mame-0.222+dfsg.1/src/devices/bus/ti99/internal/992board.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/ti99/internal/992board.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,7 +7,12 @@
     This component implements the custom video controller and interface chip
     from the TI-99/2 console.
 
+    Also, we emulate the expansion port at the backside of the console; there
+    are no known expansions except for a RAM expansion that is mentioned
+    in the specifications.
+
     May 2018
+    June 2020
 
 ***************************************************************************/
 
@@ -20,8 +25,9 @@
 #define LOG_HEXBUS      (1U<<4)     // Hexbus logging
 #define LOG_BANK        (1U<<5)     // Change ROM banks
 #define LOG_KEYBOARD    (1U<<6)   // Keyboard operation
+#define LOG_EXPRAM      (1U<<7)   // Expansion RAM
 
-#define VERBOSE ( LOG_WARN )
+#define VERBOSE ( LOG_GENERAL | LOG_WARN )
 
 #include "logmacro.h"
 
@@ -128,6 +134,8 @@
 DEFINE_DEVICE_TYPE_NS(IO99224, bus::ti99::internal, io992_24_device, "io992_24", "TI-99/2 I/O controller 24K version")
 DEFINE_DEVICE_TYPE_NS(IO99232, bus::ti99::internal, io992_32_device, "io992_32", "TI-99/2 I/O controller 32K version")
 
+DEFINE_DEVICE_TYPE_NS(TI992_EXPPORT, bus::ti99::internal, ti992_expport_device, "ti992_expport", "TI-99/2 Expansion Port")
+DEFINE_DEVICE_TYPE_NS(TI992_RAM32K, bus::ti99::internal, ti992_expram_device, "ti992_ram32k", "TI-99/2 RAM Expansion 32K")
 
 namespace bus { namespace ti99 { namespace internal {
 
@@ -596,6 +604,82 @@
 	return INPUT_PORTS_NAME( keys992 );
 }
 
+/********************************************************************
+    Expansion port
+********************************************************************/
+
+ti992_expport_device::ti992_expport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	:   device_t(mconfig, TI992_EXPPORT, tag, owner, clock),
+		device_slot_interface(mconfig, *this),
+		m_connected(nullptr)
+{
+}
+
+void ti992_expport_device::readz(offs_t offset, uint8_t *value)
+{
+	if (m_connected != nullptr)
+		m_connected->readz(offset, value);
+}
+
+void ti992_expport_device::write(offs_t offset, uint8_t data)
+{
+	if (m_connected != nullptr)
+		m_connected->write(offset, data);
+}
+
+void ti992_expport_device::device_config_complete()
+{
+	m_connected = static_cast<ti992_expport_attached_device*>(subdevices().first());
+}
+
+/*
+    32K Expansion cartridge
+    Maps at 6000 - DFFF
+    This is the only known expansion device
+*/
+ti992_expram_device::ti992_expram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	ti992_expport_attached_device(mconfig, TI992_RAM32K, tag, owner, clock),
+	m_ram(*this, "ram32k")
+{
+}
+
+void ti992_expram_device::readz(offs_t offset, uint8_t *value)
+{
+	// 000 -> 100     100 -> 000
+	// 001 -> 101     101 -> 001
+	// 010 -> 110     110 -> 010
+	// 011 -> 011     111 -> 111
+	offs_t address = offset;
+	if ((offset & 0x6000) != 0x6000) address ^= 0x8000;
+	if ((address & 0x8000)==0)
+	{
+		*value = m_ram->read(address);
+		LOGMASKED(LOG_EXPRAM, "expram %04x -> %02x\n", offset, *value);
+	}
+}
+
+void ti992_expram_device::write(offs_t offset, uint8_t value)
+{
+	offs_t address = offset;
+	if ((offset & 0x6000) != 0x6000) address ^= 0x8000;
+	if ((address & 0x8000)==0)
+	{
+		m_ram->write(address, value);
+		LOGMASKED(LOG_EXPRAM, "expram %04x <- %02x\n", offset, value);
+	}
+}
+
+void ti992_expram_device::device_add_mconfig(machine_config &config)
+{
+	RAM(config, m_ram, 0);
+	m_ram->set_default_size("32k");
+	m_ram->set_default_value(0);
+}
+
 }   }   }
 
+void ti992_expport_options(device_slot_interface &device)
+{
+	device.option_add("ram32k", TI992_RAM32K);
+}
 
diff -Nru mame-0.222+dfsg.1/src/devices/bus/ti99/internal/992board.h mame-0.224+dfsg.1/src/devices/bus/ti99/internal/992board.h
--- mame-0.222+dfsg.1/src/devices/bus/ti99/internal/992board.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/ti99/internal/992board.h	2020-08-26 08:57:19.000000000 +0000
@@ -21,6 +21,7 @@
 #include "screen.h"
 #include "bus/hexbus/hexbus.h"
 #include "imagedev/cassette.h"
+#include "machine/ram.h"
 
 #define TI992_CASSETTE   "cassette"
 #define TI992_VDC_TAG    "vdc"
@@ -149,11 +150,87 @@
 	io992_32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 };
 
+/********************************************************************
+
+    Expansion port
+    This is modeled after the ioport connector of the TI-99/4A
+
+    However, since there are basically no expansion cards available,
+    and only the memory expansion was described in the specs, we
+    only include the necessary connections.
+
+********************************************************************/
+#define TI992_EXPPORT_TAG      "expport"
+
+class ti992_expport_attached_device : public device_t
+{
+public:
+	ti992_expport_attached_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+		device_t(mconfig, type, tag, owner, clock)
+	{ }
+
+	// Methods called from the console
+	virtual void readz(offs_t offset, uint8_t *value) { }
+	virtual void write(offs_t offset, uint8_t data) { }
+};
+
+class ti992_expport_device : public device_t, public device_slot_interface
+{
+	friend class expport_attached_device;
+
+public:
+	template <typename U>
+	ti992_expport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, U &&opts, const char *dflt)
+		: ti992_expport_device(mconfig, tag, owner, clock)
+	{
+		option_reset();
+		opts(*this);
+		set_default_option(dflt);
+		set_fixed(false);
+	}
+
+	ti992_expport_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	// Methods called from the console
+	// More methods should be added, once we can find further 99/2 cartridges
+	void readz(offs_t offset, uint8_t *value);
+	void write(offs_t offset, uint8_t data);
+
+protected:
+	void device_start() override { };
+	void device_config_complete() override;
+
+private:
+	ti992_expport_attached_device*    m_connected;
+};
+
+// RAM expansion
+
+class ti992_expram_device : public ti992_expport_attached_device
+{
+public:
+	ti992_expram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	void readz(offs_t offset, uint8_t *value) override;
+	void write(offs_t offset, uint8_t data) override;
+
+private:
+	void device_start() override {};
+	void device_add_mconfig(machine_config &config) override;
+	required_device<ram_device> m_ram;
+};
+
+
 } } } // end namespace bus::ti99::internal
 
+DECLARE_DEVICE_TYPE_NS(TI992_EXPPORT, bus::ti99::internal, ti992_expport_device)
+
+void ti992_expport_options(device_slot_interface &device);
+
 DECLARE_DEVICE_TYPE_NS(VIDEO99224, bus::ti99::internal, video992_24_device)
 DECLARE_DEVICE_TYPE_NS(VIDEO99232, bus::ti99::internal, video992_32_device)
 DECLARE_DEVICE_TYPE_NS(IO99224, bus::ti99::internal, io992_24_device)
 DECLARE_DEVICE_TYPE_NS(IO99232, bus::ti99::internal, io992_32_device)
 
+DECLARE_DEVICE_TYPE_NS(TI992_RAM32K, bus::ti99::internal, ti992_expram_device)
+
 #endif // MAME_BUS_TI99_INTERNAL_992BOARD_H
diff -Nru mame-0.222+dfsg.1/src/devices/bus/ti99/internal/datamux.cpp mame-0.224+dfsg.1/src/devices/bus/ti99/internal/datamux.cpp
--- mame-0.222+dfsg.1/src/devices/bus/ti99/internal/datamux.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/ti99/internal/datamux.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -312,14 +312,14 @@
 			if ((addrb & 0xe000)==0x6000)
 			{
 				m_gromport->romgq_line(ASSERT_LINE);
-				m_gromport->write(addr+1, data & 0xff);
-				m_gromport->write(addr, (data>>8) & 0xff);
+				m_gromport->write(addrb+1, data & 0xff);
+				m_gromport->write(addrb, (data>>8) & 0xff);
 				m_gromport->romgq_line(m_romgq_state);  // reset to previous state
 			}
 
 			m_ioport->memen_in(ASSERT_LINE);
-			m_ioport->write(addr+1, data & 0xff);
-			m_ioport->write(addr,  (data>>8) & 0xff);
+			m_ioport->write(addrb+1, data & 0xff);
+			m_ioport->write(addrb,  (data>>8) & 0xff);
 			m_ioport->memen_in(m_memen_state);   // reset to previous state
 		}
 	}
diff -Nru mame-0.222+dfsg.1/src/devices/bus/vsmile/vsmile_ctrl.cpp mame-0.224+dfsg.1/src/devices/bus/vsmile/vsmile_ctrl.cpp
--- mame-0.222+dfsg.1/src/devices/bus/vsmile/vsmile_ctrl.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/bus/vsmile/vsmile_ctrl.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -72,7 +72,7 @@
 
 void vsmile_ctrl_port_device::device_resolve_objects()
 {
-	m_device = get_card_device();;
+	m_device = get_card_device();
 
 	m_rts_cb.resolve_safe();
 	m_data_cb.resolve_safe();
@@ -252,7 +252,7 @@
 	{
 		LOG("select deasserted, waiting to transmit\n");
 		m_tx_active = false;
-		m_rts_timer->adjust(attotime::from_msec(500));
+		//m_rts_timer->adjust(attotime::from_msec(2000));
 	}
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/adsp2100/2100dasm.h mame-0.224+dfsg.1/src/devices/cpu/adsp2100/2100dasm.h
--- mame-0.222+dfsg.1/src/devices/cpu/adsp2100/2100dasm.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/adsp2100/2100dasm.h	2020-08-26 08:57:19.000000000 +0000
@@ -24,7 +24,7 @@
 	static const char *const mac_xop[];
 	static const char *const mac_yop[];
 	static const char *const mac_dst[];
-	static const char *const shift_xop[];;
+	static const char *const shift_xop[];
 	static const char *const reg_grp[][16];
 	static const char *const dual_xreg[];
 	static const char *const dual_yreg[];
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/am29000/am29000.cpp mame-0.224+dfsg.1/src/devices/cpu/am29000/am29000.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/am29000/am29000.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/am29000/am29000.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -108,7 +108,7 @@
 	m_fpe = 0;
 	m_inte = 0;
 	m_fps = 0;
-	memset( m_exception_queue, 0, sizeof( m_exception_queue) );;
+	memset( m_exception_queue, 0, sizeof( m_exception_queue) );
 	m_irq_active = 0;
 	m_irq_lines = 0;
 	m_exec_ir = 0;
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/arm7/arm7.cpp mame-0.224+dfsg.1/src/devices/cpu/arm7/arm7.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/arm7/arm7.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/arm7/arm7.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -66,7 +66,9 @@
 DEFINE_DEVICE_TYPE(ARM946ES,     arm946es_cpu_device,     "arm946es",     "ARM946ES")
 DEFINE_DEVICE_TYPE(ARM11,        arm11_cpu_device,        "arm11",        "ARM11")
 DEFINE_DEVICE_TYPE(ARM1176JZF_S, arm1176jzf_s_cpu_device, "arm1176jzf_s", "ARM1176JZF-S")
+DEFINE_DEVICE_TYPE(PXA250,       pxa250_cpu_device,       "pxa250",       "Intel XScale PXA250")
 DEFINE_DEVICE_TYPE(PXA255,       pxa255_cpu_device,       "pxa255",       "Intel XScale PXA255")
+DEFINE_DEVICE_TYPE(PXA270,       pxa270_cpu_device,       "pxa270",       "Intel XScale PXA270")
 DEFINE_DEVICE_TYPE(SA1110,       sa1110_cpu_device,       "sa1110",       "Intel StrongARM SA-1110")
 DEFINE_DEVICE_TYPE(IGS036,       igs036_cpu_device,       "igs036",       "IGS036")
 
@@ -236,13 +238,30 @@
 {
 }
 
+pxa250_cpu_device::pxa250_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: arm7_cpu_device(mconfig, PXA250, tag, owner, clock, 5, ARCHFLAG_T | ARCHFLAG_E | ARCHFLAG_XSCALE, ENDIANNESS_LITTLE)
+{
+	m_copro_id = ARM9_COPRO_ID_MFR_INTEL
+			   | ARM9_COPRO_ID_ARCH_V5TE
+			   | ARM9_COPRO_ID_PART_PXA250
+			   | ARM9_COPRO_ID_STEP_PXA255_A0;
+}
+
 pxa255_cpu_device::pxa255_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: arm7_cpu_device(mconfig, PXA255, tag, owner, clock, 5, ARCHFLAG_T | ARCHFLAG_E | ARCHFLAG_XSCALE, ENDIANNESS_LITTLE)
 {
 	m_copro_id = ARM9_COPRO_ID_MFR_INTEL
 			   | ARM9_COPRO_ID_ARCH_V5TE
-			   | ARM9_COPRO_ID_PXA255_CORE_GEN_XSCALE
-			   | (3 << ARM9_COPRO_ID_PXA255_CORE_REV_SHIFT)
+			   | ARM9_COPRO_ID_PART_PXA255
+			   | ARM9_COPRO_ID_STEP_PXA255_A0;
+}
+
+pxa270_cpu_device::pxa270_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: arm7_cpu_device(mconfig, PXA270, tag, owner, clock, 5, ARCHFLAG_T | ARCHFLAG_E | ARCHFLAG_XSCALE, ENDIANNESS_LITTLE)
+{
+	m_copro_id = ARM9_COPRO_ID_MFR_INTEL
+			   | ARM9_COPRO_ID_ARCH_V5TE
+			   | ARM9_COPRO_ID_PART_PXA270
 			   | ARM9_COPRO_ID_STEP_PXA255_A0;
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/arm7/arm7.h mame-0.224+dfsg.1/src/devices/cpu/arm7/arm7.h
--- mame-0.222+dfsg.1/src/devices/cpu/arm7/arm7.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/arm7/arm7.h	2020-08-26 08:57:19.000000000 +0000
@@ -89,10 +89,12 @@
 		ARM9_COPRO_ID_PART_ARM946 = 0x946 << 4,
 		ARM9_COPRO_ID_PART_ARM920 = 0x920 << 4,
 		ARM9_COPRO_ID_PART_ARM710 = 0x710 << 4,
+		ARM9_COPRO_ID_PART_PXA250 = 0x200 << 4,
+		ARM9_COPRO_ID_PART_PXA255 = 0x2d0 << 4,
+		ARM9_COPRO_ID_PART_PXA270 = 0x411 << 4,
 		ARM9_COPRO_ID_PART_GENERICARM7 = 0x700 << 4,
 
 		ARM9_COPRO_ID_PXA255_CORE_REV_SHIFT = 10,
-		ARM9_COPRO_ID_PXA255_CORE_GEN_XSCALE = 0x01 << 13,
 
 		ARM9_COPRO_ID_ARCH_V4     = 0x01 << 16,
 		ARM9_COPRO_ID_ARCH_V4T    = 0x02 << 16,
@@ -691,6 +693,13 @@
 	igs036_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 };
 
+class pxa250_cpu_device : public arm7_cpu_device
+{
+public:
+	// construction/destruction
+	pxa250_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+};
+
 class pxa255_cpu_device : public arm7_cpu_device
 {
 public:
@@ -698,6 +707,12 @@
 	pxa255_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 };
 
+class pxa270_cpu_device : public arm7_cpu_device
+{
+public:
+	// construction/destruction
+	pxa270_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+};
 
 class sa1110_cpu_device : public arm7_cpu_device
 {
@@ -716,7 +731,9 @@
 DECLARE_DEVICE_TYPE(ARM946ES,     arm946es_cpu_device)
 DECLARE_DEVICE_TYPE(ARM11,        arm11_cpu_device)
 DECLARE_DEVICE_TYPE(ARM1176JZF_S, arm1176jzf_s_cpu_device)
+DECLARE_DEVICE_TYPE(PXA250,       pxa250_cpu_device)
 DECLARE_DEVICE_TYPE(PXA255,       pxa255_cpu_device)
+DECLARE_DEVICE_TYPE(PXA270,       pxa270_cpu_device)
 DECLARE_DEVICE_TYPE(SA1110,       sa1110_cpu_device)
 DECLARE_DEVICE_TYPE(IGS036,       igs036_cpu_device)
 
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/arm7/arm7thmb.cpp mame-0.224+dfsg.1/src/devices/cpu/arm7/arm7thmb.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/arm7/arm7thmb.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/arm7/arm7thmb.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -654,18 +654,22 @@
 
 void arm7_cpu_device::tg04_00_07(uint32_t pc, uint32_t op) /* ROR Rd, Rs */
 {
-	uint32_t rs = (op & THUMB_ADDSUB_RS) >> THUMB_ADDSUB_RS_SHIFT;
-	uint32_t rd = (op & THUMB_ADDSUB_RD) >> THUMB_ADDSUB_RD_SHIFT;
-	uint32_t rrd = GetRegister(rd);
-	uint32_t imm = GetRegister(rs) & 0x0000001f;
-	SetRegister(rd, (rrd >> imm) | (rrd << (32 - imm)));
-	if (rrd & (1 << (imm - 1)))
+	const uint32_t rs = (op & THUMB_ADDSUB_RS) >> THUMB_ADDSUB_RS_SHIFT;
+	const uint32_t rd = (op & THUMB_ADDSUB_RD) >> THUMB_ADDSUB_RD_SHIFT;
+	const uint32_t rrd = GetRegister(rd);
+	const uint32_t imm = GetRegister(rs) & 0xff;
+	const uint32_t imm_masked = imm & 0x1f;
+	if (imm > 0)
 	{
-		set_cpsr(GET_CPSR | C_MASK);
-	}
-	else
-	{
-		set_cpsr(GET_CPSR & ~C_MASK);
+		SetRegister(rd, (rrd >> imm_masked) | (rrd << (32 - imm_masked)));
+		if (rrd & (1 << ((imm - 1) & 0x1f)))
+		{
+			set_cpsr(GET_CPSR | C_MASK);
+		}
+		else
+		{
+			set_cpsr(GET_CPSR & ~C_MASK);
+		}
 	}
 	set_cpsr(GET_CPSR & ~(Z_MASK | N_MASK));
 	set_cpsr(GET_CPSR | HandleALUNZFlags(GetRegister(rd)));
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/avr8/avr8.cpp mame-0.224+dfsg.1/src/devices/cpu/avr8/avr8.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/avr8/avr8.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/avr8/avr8.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -6,7 +6,7 @@
 
     - Notes -
       Cycle counts are generally considered to be 100% accurate per-instruction, does not support mid-instruction
-      interrupts although no software has been countered yet that requires it. Evidence of cycle accuracy is given
+      interrupts although no software has been encountered yet that requires it. Evidence of cycle accuracy is given
       in the form of the demoscene 'wild' demo, Craft, by [lft], which uses an ATmega88 to write video out a 6-bit
       RGB DAC pixel-by-pixel, synchronously with the frame timing. Intentionally modifying the timing of any of
       the existing opcodes has been shown to wildly corrupt the video output in Craft, so one can assume that the
@@ -92,7 +92,7 @@
 #define LOG_TIMERS          (LOG_TIMER0 | LOG_TIMER1 | LOG_TIMER2 | LOG_TIMER3 | LOG_TIMER4 | LOG_TIMER5)
 #define LOG_TIMER_TICKS     (LOG_TIMER0_TICK | LOG_TIMER1_TICK | LOG_TIMER2_TICK | LOG_TIMER3_TICK | LOG_TIMER4_TICK | LOG_TIMER5_TICK)
 #define LOG_ALL             (LOG_UNKNOWN | LOG_BOOT | LOG_TIMERS | LOG_TIMER_TICKS | LOG_EEPROM | LOG_GPIO | LOG_WDOG | LOG_CLOCK | LOG_POWER \
-							 LOG_OSC | LOG_PINCHG | LOG_EXTMEM | LOG_ADC | LOG_DIGINPUT | LOG_ASYNC | LOG_TWI | LOG_UART)
+							 | LOG_OSC | LOG_PINCHG | LOG_EXTMEM | LOG_ADC | LOG_DIGINPUT | LOG_ASYNC | LOG_TWI | LOG_UART)
 
 #define VERBOSE             (0)
 #include "logmacro.h"
@@ -870,6 +870,7 @@
 	// Misc.
 	save_item(NAME(m_addr_mask));
 	save_item(NAME(m_interrupt_pending));
+	save_item(NAME(m_opcycles));
 
 	// set our instruction counter
 	set_icountptr(m_icount);
@@ -1040,7 +1041,6 @@
 
 void avr8_device::set_irq_line(uint16_t vector, int state)
 {
-	// Horrible hack, not accurate
 	if (state)
 	{
 		if (SREG_R(AVR8_SREG_I))
@@ -1058,17 +1058,16 @@
 	}
 }
 
-class CInterruptCondition
+struct interrupt_condition
 {
-	public:
-		uint8_t m_intindex;
-		uint8_t m_intreg;
-		uint8_t m_intmask;
-		uint8_t m_regindex;
-		uint8_t m_regmask;
+	uint8_t m_intindex;
+	uint8_t m_intreg;
+	uint8_t m_intmask;
+	uint8_t m_regindex;
+	uint8_t m_regmask;
 };
 
-static const CInterruptCondition s_int_conditions[AVR8_INTIDX_COUNT] =
+static const interrupt_condition s_int_conditions[AVR8_INTIDX_COUNT] =
 {
 	{ AVR8_INT_SPI_STC, AVR8_REGIDX_SPCR,   AVR8_SPCR_SPIE_MASK,     AVR8_REGIDX_SPSR,    AVR8_SPSR_SPIF_MASK },
 	{ AVR8_INT_T0COMPB, AVR8_REGIDX_TIMSK0, AVR8_TIMSK0_OCIE0B_MASK, AVR8_REGIDX_TIFR0,   AVR8_TIFR0_OCF0B_MASK },
@@ -1085,7 +1084,7 @@
 
 void avr8_device::update_interrupt(int source)
 {
-	const CInterruptCondition &condition = s_int_conditions[source];
+	const interrupt_condition &condition = s_int_conditions[source];
 
 	int intstate = 0;
 	if (m_r[condition.m_intreg] & condition.m_intmask)
@@ -1101,7 +1100,7 @@
 
 void atmega328_device::update_interrupt(int source)
 {
-	const CInterruptCondition &condition = s_int_conditions[source];
+	const interrupt_condition &condition = s_int_conditions[source];
 
 	int intstate = 0;
 	if (m_r[condition.m_intreg] & condition.m_intmask)
@@ -1115,7 +1114,7 @@
 	}
 }
 
-static const CInterruptCondition s_mega644_int_conditions[AVR8_INTIDX_COUNT] =
+static const interrupt_condition s_mega644_int_conditions[AVR8_INTIDX_COUNT] =
 {
 	{ ATMEGA644_INT_SPI_STC, AVR8_REGIDX_SPCR,   AVR8_SPCR_SPIE_MASK,     AVR8_REGIDX_SPSR,    AVR8_SPSR_SPIF_MASK },
 	{ ATMEGA644_INT_T0COMPB, AVR8_REGIDX_TIMSK0, AVR8_TIMSK0_OCIE0B_MASK, AVR8_REGIDX_TIFR0,   AVR8_TIFR0_OCF0B_MASK },
@@ -1132,7 +1131,7 @@
 
 void atmega644_device::update_interrupt(int source)
 {
-	const CInterruptCondition &condition = s_mega644_int_conditions[source];
+	const interrupt_condition &condition = s_mega644_int_conditions[source];
 
 	int intstate = 0;
 	if (m_r[condition.m_intreg] & condition.m_intmask)
@@ -1149,7 +1148,7 @@
 //TODO: review this!
 void atmega1280_device::update_interrupt(int source)
 {
-	const CInterruptCondition &condition = s_mega644_int_conditions[source];
+	const interrupt_condition &condition = s_mega644_int_conditions[source];
 
 	int intstate = 0;
 	if (m_r[condition.m_intreg] & condition.m_intmask)
@@ -1166,7 +1165,7 @@
 //TODO: review this!
 void atmega2560_device::update_interrupt(int source)
 {
-	const CInterruptCondition &condition = s_mega644_int_conditions[source];
+	const interrupt_condition &condition = s_mega644_int_conditions[source];
 
 	int intstate = 0;
 	if (m_r[condition.m_intreg] & condition.m_intmask)
@@ -1224,20 +1223,17 @@
 	}
 }
 
-//  uint8_t ocr0[2] = { m_r[AVR8_REGIDX_OCR0A], m_r[AVR8_REGIDX_OCR0B] };
-//TODO  uint8_t ocf0[2] = { (1 << AVR8_TIFR0_OCF0A_SHIFT), (1 << AVR8_TIFR4_OCF0B_SHIFT) };
-//TODO  uint8_t int0[2] = { AVR8_INTIDX_OCF0A, AVR8_INTIDX_OCF0B };
-
-#define LOG_TIMER_0 0
-#define LOG_TIMER_5 0
 // Timer 0 Handling
 void avr8_device::timer0_tick()
 {
+	static const uint8_t s_ocf0[2] = { (1 << AVR8_TIFR0_OCF0A_SHIFT), (1 << AVR8_TIFR0_OCF0B_SHIFT) };
+	static const uint8_t s_int0[2] = { AVR8_INTIDX_OCF0A, AVR8_INTIDX_OCF0B };
+
 	LOGMASKED(LOG_TIMER0_TICK, "%s: AVR8_WGM0: %d\n", machine().describe_context(), AVR8_WGM0);
 	LOGMASKED(LOG_TIMER0_TICK, "%s: AVR8_TCCR0A_COM0B: %d\n", machine().describe_context(), AVR8_TCCR0A_COM0B);
 
 	uint8_t count = m_r[AVR8_REGIDX_TCNT0];
-	int32_t increment = m_timer_increment[0];
+	count++;
 
 	switch (AVR8_WGM0)
 	{
@@ -1253,10 +1249,16 @@
 		switch (AVR8_TCCR0A_COM0B)
 		{
 		case 0: /* Normal Operation */
-			if (count == m_timer_top[0])
+			if (count == AVR8_OCR0A)
 			{
-				LOGMASKED(LOG_TIMER0, "%s: timer0: Set normal OC0B behavior\n", machine().describe_context());
-				m_timer_top[0] = 0;
+				m_r[AVR8_REGIDX_TIFR0] |= s_ocf0[AVR8_REG_A];
+				update_interrupt(s_int0[AVR8_REG_A]);
+				count = 0;
+			}
+			else if (count == AVR8_OCR0B)
+			{
+				m_r[AVR8_REGIDX_TIFR0] |= s_ocf0[AVR8_REG_B];
+				update_interrupt(s_int0[AVR8_REG_B]);
 			}
 			break;
 
@@ -1290,26 +1292,23 @@
 		break;
 
 	case WGM02_FAST_PWM:
-	LOGMASKED(LOG_TIMER0 | LOG_UNKNOWN, "%s: WGM02_FAST_PWM: Unimplemented timer0 waveform generation mode\n", machine().describe_context());
-	break;
+		LOGMASKED(LOG_TIMER0 | LOG_UNKNOWN, "%s: WGM02_FAST_PWM: Unimplemented timer0 waveform generation mode\n", machine().describe_context());
+		break;
 
 	case WGM02_PWM_PC_CMP:
-	LOGMASKED(LOG_TIMER0 | LOG_UNKNOWN, "%s: WGM02_PWM_PC_CMP: Unimplemented timer0 waveform generation mode\n", machine().describe_context());
-	break;
+		LOGMASKED(LOG_TIMER0 | LOG_UNKNOWN, "%s: WGM02_PWM_PC_CMP: Unimplemented timer0 waveform generation mode\n", machine().describe_context());
+		break;
 
 	case WGM02_FAST_PWM_CMP:
-	LOGMASKED(LOG_TIMER0 | LOG_UNKNOWN, "%s: WGM02_FAST_PWM_CMP: Unimplemented timer0 waveform generation mode\n", machine().describe_context());
-	break;
+		LOGMASKED(LOG_TIMER0 | LOG_UNKNOWN, "%s: WGM02_FAST_PWM_CMP: Unimplemented timer0 waveform generation mode\n", machine().describe_context());
+		break;
 
 	default:
 		LOGMASKED(LOG_TIMER0 | LOG_UNKNOWN, "%s: update_timer0_compare_mode: Unknown waveform generation mode: %02x\n", machine().describe_context(), AVR8_WGM0);
 		break;
 	}
 
-	count = count & 0xff;
-
-	count += increment;
-	m_r[AVR8_REGIDX_TCNT0] = count & 0xff;
+	m_r[AVR8_REGIDX_TCNT0] = count;
 }
 
 void avr8_device::changed_tccr0a(uint8_t data)
@@ -1377,6 +1376,7 @@
 
 	static const uint8_t s_ocf1[2] = { (1 << AVR8_TIFR1_OCF1A_SHIFT), (1 << AVR8_TIFR1_OCF1B_SHIFT) };
 	static const uint8_t s_int1[2] = { AVR8_INTIDX_OCF1A, AVR8_INTIDX_OCF1B };
+	const uint16_t icr1 = AVR8_ICR1;
 	int32_t increment = m_timer_increment[1];
 
 	for (int32_t reg = AVR8_REG_A; reg <= AVR8_REG_B; reg++)
@@ -1384,6 +1384,8 @@
 		switch (m_wgm1)
 		{
 		case WGM1_CTC_OCR:
+			LOGMASKED(LOG_TIMER1_TICK, "%s: timer1_count: %04x\n", machine().describe_context(), m_timer1_count);
+			LOGMASKED(LOG_TIMER1_TICK, "%s: OCR1%c: %04x\n", machine().describe_context(), reg ? 'A' : 'B', m_ocr1[reg]);
 			if (m_timer1_count == 0xffff)
 			{
 				m_r[AVR8_REGIDX_TIFR1] |= AVR8_TIFR1_TOV1_MASK;
@@ -1409,9 +1411,6 @@
 					m_r[AVR8_REGIDX_TIFR1] &= ~AVR8_TIFR1_TOV1_MASK;
 					update_interrupt(AVR8_INTIDX_TOV1);
 				}
-
-				m_r[AVR8_REGIDX_TIFR1] &= ~s_ocf1[reg];
-				update_interrupt(s_int1[reg]);
 			}
 			break;
 
@@ -1484,10 +1483,79 @@
 					m_io->write_byte(AVR8_IO_PORTB, m_io->read_byte(AVR8_IO_PORTB) & ~(2 << reg));
 					break;
 				}
+			}
+			break;
+
+		case WGM1_FAST_PWM_ICR:
+			if (m_timer1_count == m_ocr1[reg])
+			{
+				switch (m_timer1_compare_mode[reg] & 3)
+				{
+				case 0: /* Normal Operation; OC1A/B disconnected */
+					break;
+
+				case 1: /* Toggle OC1A on compare match */
+					if (reg == 0)
+					{
+						LOGMASKED(LOG_TIMER1, "%s: timer1: Toggle OC1%c on match\n", machine().describe_context());
+						m_io->write_byte(AVR8_IO_PORTB, m_io->read_byte(AVR8_IO_PORTB) ^ (2 << reg));
+					}
+					break;
+
+				case 2: /* Clear OC1A/B on compare match */
+					LOGMASKED(LOG_TIMER1, "%s: timer1: Clear OC1%c on match\n", machine().describe_context(), reg ? 'B' : 'A');
+					m_io->write_byte(AVR8_IO_PORTB, m_io->read_byte(AVR8_IO_PORTB) & ~(2 << reg));
+					break;
+
+				case 3: /* Set OC1A/B on compare match */
+					LOGMASKED(LOG_TIMER1, "%s: timer1: Set OC1%c on match\n", machine().describe_context(), reg ? 'B' : 'A');
+					m_io->write_byte(AVR8_IO_PORTB, m_io->read_byte(AVR8_IO_PORTB) | (2 << reg));
+					break;
+				}
 
-				m_r[AVR8_REGIDX_TIFR1] &= ~s_ocf1[reg];
+				m_r[AVR8_REGIDX_TIFR1] |= s_ocf1[reg];
 				update_interrupt(s_int1[reg]);
 			}
+			else if (m_timer1_count == 0)
+			{
+				if (reg == 0)
+				{
+					m_r[AVR8_REGIDX_TIFR1] &= ~AVR8_TIFR1_TOV1_MASK;
+					update_interrupt(AVR8_INTIDX_TOV1);
+				}
+
+				switch (m_timer1_compare_mode[reg] & 3)
+				{
+				case 0: /* Normal Operation; OC1A/B disconnected */
+					break;
+
+				case 1: /* Toggle OC1A at BOTTOM*/
+					if (reg == 0)
+					{
+						LOGMASKED(LOG_TIMER1, "%s: timer1: Toggle OC1A at BOTTOM\n", machine().describe_context());
+						m_io->write_byte(AVR8_IO_PORTB, m_io->read_byte(AVR8_IO_PORTB) ^ (2 << reg));
+					}
+					break;
+
+				case 2: /* Set OC1A/B at BOTTOM*/
+					LOGMASKED(LOG_TIMER1, "%s: timer1: Set OC1%c at BOTTOM\n", machine().describe_context(), reg ? 'B' : 'A');
+					m_io->write_byte(AVR8_IO_PORTB, m_io->read_byte(AVR8_IO_PORTB) | (2 << reg));
+					break;
+
+				case 3: /* Clear OC1A/B at BOTTOM */
+					LOGMASKED(LOG_TIMER1, "%s: timer1: Clear OC1%c at BOTTOM\n", machine().describe_context(), reg ? 'B' : 'A');
+					m_io->write_byte(AVR8_IO_PORTB, m_io->read_byte(AVR8_IO_PORTB) & ~(2 << reg));
+					break;
+				}
+			}
+
+			if (m_timer1_count == icr1 && reg == 1)
+			{
+				m_r[AVR8_REGIDX_TIFR1] |= AVR8_TIFR1_TOV1_MASK;
+				update_interrupt(AVR8_INTIDX_TOV1);
+				m_timer1_count = 0;
+				increment = 0;
+			}
 			break;
 
 		default:
@@ -1655,6 +1723,13 @@
 	{
 		switch (wgm2)
 		{
+		case WGM02_NORMAL:
+			if (count == 0xff)
+			{
+				m_r[AVR8_REGIDX_TIFR2] |= AVR8_TIFR2_TOV2_MASK;
+			}
+			break;
+
 		case WGM02_FAST_PWM:
 			if (reg == 0)
 			{
@@ -1868,13 +1943,14 @@
 
 void avr8_device::update_timer_clock_source(uint8_t t, uint8_t clock_select)
 {
-	static const int s_prescale_values[8] =
+	static const int s_prescale_values[2][8] =
 	{
-		0, 1, 8, 64, 256, 1024, -1, -1
+		{ 0, 1, 8, 64, 256, 1024, -1, -1 }, // T0/T1/T3/T4/T5
+		{ 0, 1, 8, 32, 64, 128, 256, 1024 } // T2
 	};
-	m_timer_prescale[t] = s_prescale_values[clock_select];
+	m_timer_prescale[t] = s_prescale_values[(t == 2) ? 1 : 0][clock_select];
 
-	LOGMASKED((LOG_TIMER0 + t), "%s: update_timer_clock_source: t = %d, cs = %d\n", t, machine().describe_context(), clock_select);
+	LOGMASKED((LOG_TIMER0 + t), "%s: update_timer_clock_source: t = %d, cs = %d\n", machine().describe_context(), t, clock_select);
 
 	if (m_timer_prescale[t] == 0xffff)
 	{
@@ -2242,56 +2318,67 @@
 		break;
 
 	case AVR8_REGIDX_PORTA:
+		LOGMASKED(LOG_GPIO, "%s: PORTA Write: %02x\n", machine().describe_context(), data);
 		m_io->write_byte(AVR8_IO_PORTA, data);
 		m_r[AVR8_REGIDX_PORTA] = data;
 		break;
 
 	case AVR8_REGIDX_PORTB:
+		LOGMASKED(LOG_GPIO, "%s: PORTB Write: %02x\n", machine().describe_context(), data);
 		m_io->write_byte(AVR8_IO_PORTB, data);
 		m_r[AVR8_REGIDX_PORTB] = data;
 		break;
 
 	case AVR8_REGIDX_PORTC:
+		LOGMASKED(LOG_GPIO, "%s: PORTC Write: %02x\n", machine().describe_context(), data);
 		m_io->write_byte(AVR8_IO_PORTC, data);
 		m_r[AVR8_REGIDX_PORTC] = data;
 		break;
 
 	case AVR8_REGIDX_PORTD:
+		LOGMASKED(LOG_GPIO, "%s: PORTD Write: %02x\n", machine().describe_context(), data);
 		m_io->write_byte(AVR8_IO_PORTD, data);
 		m_r[AVR8_REGIDX_PORTD] = data;
 		break;
 
 	case AVR8_REGIDX_PORTE:
+		LOGMASKED(LOG_GPIO, "%s: PORTE Write: %02x\n", machine().describe_context(), data);
 		m_io->write_byte(AVR8_IO_PORTE, data);
 		m_r[AVR8_REGIDX_PORTE] = data;
 		break;
 
 	case AVR8_REGIDX_PORTF:
+		LOGMASKED(LOG_GPIO, "%s: PORTF Write: %02x\n", machine().describe_context(), data);
 		m_io->write_byte(AVR8_IO_PORTF, data);
 		m_r[AVR8_REGIDX_PORTF] = data;
 		break;
 
 	case AVR8_REGIDX_PORTG:
+		LOGMASKED(LOG_GPIO, "%s: PORTG Write: %02x\n", machine().describe_context(), data);
 		m_io->write_byte(AVR8_IO_PORTG, data);
 		m_r[AVR8_REGIDX_PORTG] = data;
 		break;
 
 	case AVR8_REGIDX_PORTH:
+		LOGMASKED(LOG_GPIO, "%s: PORTH Write: %02x\n", machine().describe_context(), data);
 		m_io->write_byte(AVR8_IO_PORTH, data);
 		m_r[AVR8_REGIDX_PORTH] = data;
 		break;
 
 	case AVR8_REGIDX_PORTJ:
+		LOGMASKED(LOG_GPIO, "%s: PORTJ Write: %02x\n", machine().describe_context(), data);
 		m_io->write_byte(AVR8_IO_PORTJ, data);
 		m_r[AVR8_REGIDX_PORTJ] = data;
 		break;
 
 	case AVR8_REGIDX_PORTK:
+		LOGMASKED(LOG_GPIO, "%s: PORTK Write: %02x\n", machine().describe_context(), data);
 		m_io->write_byte(AVR8_IO_PORTK, data);
 		m_r[AVR8_REGIDX_PORTK] = data;
 		break;
 
 	case AVR8_REGIDX_PORTL:
+		LOGMASKED(LOG_GPIO, "%s: PORTL Write: %02x\n", machine().describe_context(), data);
 		m_io->write_byte(AVR8_IO_PORTL, data);
 		m_r[AVR8_REGIDX_PORTL] = data;
 		break;
@@ -2319,12 +2406,12 @@
 
 	case AVR8_REGIDX_OCR0A:
 		LOGMASKED(LOG_TIMER0, "%s: OCR0A = %02x\n", machine().describe_context(), data);
-		update_ocr0(AVR8_OCR0A, AVR8_REG_A);
+		update_ocr0(data, AVR8_REG_A);
 		break;
 
 	case AVR8_REGIDX_OCR0B:
 		LOGMASKED(LOG_TIMER0, "%s: OCR0B = %02x\n", machine().describe_context(), data);
-		update_ocr0(AVR8_OCR0B, AVR8_REG_B);
+		update_ocr0(data, AVR8_REG_B);
 		break;
 
 	case AVR8_REGIDX_TIFR0:
@@ -2400,7 +2487,12 @@
 		break;
 
 	case AVR8_REGIDX_GPIOR1:
+		LOGMASKED(LOG_GPIO, "%s: GPIOR1 Write: %02x\n", machine().describe_context(), data);
+		m_r[offset] = data;
+		break;
+
 	case AVR8_REGIDX_GPIOR2:
+		LOGMASKED(LOG_GPIO, "%s: GPIOR2 Write: %02x\n", machine().describe_context(), data);
 		m_r[offset] = data;
 		break;
 
@@ -2805,6 +2897,8 @@
 
 uint8_t avr8_device::regs_r(offs_t offset)
 {
+	uint8_t data = m_r[offset];
+
 	switch (offset)
 	{
 	case AVR8_REGIDX_R0:
@@ -2839,7 +2933,7 @@
 	case AVR8_REGIDX_R29:
 	case AVR8_REGIDX_R30:
 	case AVR8_REGIDX_R31:
-		return m_r[offset];
+		return data;
 
 	case AVR8_REGIDX_PINA:
 		// TODO: account for DDRA
@@ -2896,7 +2990,7 @@
 	case AVR8_REGIDX_PORTJ:
 	case AVR8_REGIDX_PORTK:
 	case AVR8_REGIDX_PORTL:
-		return m_r[offset];
+		return data;
 
 	case AVR8_REGIDX_DDRA:
 	case AVR8_REGIDX_DDRB:
@@ -2909,19 +3003,25 @@
 	case AVR8_REGIDX_DDRJ:
 	case AVR8_REGIDX_DDRK:
 	case AVR8_REGIDX_DDRL:
-		return m_r[offset];
+		return data;
 
 	// EEPROM registers
 	case AVR8_REGIDX_EECR:
 	case AVR8_REGIDX_EEDR:
-		return m_r[offset];
+		return data;
 
 	// Miscellaneous registers
 	// TODO: Implement readback for all applicable registers.
 
 	case AVR8_REGIDX_GPIOR0:
+		LOGMASKED(LOG_GPIO, "%s: GPIOR0 Read: %02x\n", machine().describe_context(), data);
+		return data;
 	case AVR8_REGIDX_GPIOR1:
+		LOGMASKED(LOG_GPIO, "%s: GPIOR1 Read: %02x\n", machine().describe_context(), data);
+		return data;
 	case AVR8_REGIDX_GPIOR2:
+		LOGMASKED(LOG_GPIO, "%s: GPIOR2 Read: %02x\n", machine().describe_context(), data);
+		return data;
 //    case AVR8_REGIDX_UCSR0B:   // TODO: needed for Replicator 1
 	case AVR8_REGIDX_SPDR:   // TODO: needed for Replicator 1
 	case AVR8_REGIDX_SPSR:   // TODO: needed for Replicator 1
@@ -2931,12 +3031,26 @@
 	case AVR8_REGIDX_SPH:
 	case AVR8_REGIDX_SREG:
 	case AVR8_REGIDX_TIMSK0:
+		LOGMASKED(LOG_TIMER0, "%s: TIMSK0 Read: %02x\n", machine().describe_context(), data);
+		return data;
 	case AVR8_REGIDX_TIMSK1:
+		LOGMASKED(LOG_TIMER1, "%s: TIMSK1 Read: %02x\n", machine().describe_context(), data);
+		return data;
 	case AVR8_REGIDX_TIMSK2:
-//    case AVR8_REGIDX_TIMSK3:  // TODO: needed for Replicator 1
+		LOGMASKED(LOG_TIMER2, "%s: TIMSK2 Read: %02x\n", machine().describe_context(), data);
+		return data;
+	case AVR8_REGIDX_TIMSK3:
+		LOGMASKED(LOG_TIMER3, "%s: TIMSK3 Read: %02x\n", machine().describe_context(), data);
+		return data;
 	case AVR8_REGIDX_TIMSK4:
+		LOGMASKED(LOG_TIMER4, "%s: TIMSK4 Read: %02x\n", machine().describe_context(), data);
+		return data;
 	case AVR8_REGIDX_TIMSK5:
-		return m_r[offset];
+		LOGMASKED(LOG_TIMER5, "%s: TIMSK5 Read: %02x\n", machine().describe_context(), data);
+		return data;
+	case AVR8_REGIDX_TIFR1:
+		//LOGMASKED(LOG_TIMER0, "%s: TIFR1 Read: %02x\n", machine().describe_context(), data);
+		return data;
 
 	// Two-wire registers
 	case AVR8_REGIDX_TWCR:
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/avr8/avr8dasm.cpp mame-0.224+dfsg.1/src/devices/cpu/avr8/avr8dasm.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/avr8/avr8dasm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/avr8/avr8dasm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -106,572 +106,539 @@
 
 	switch(op & 0xf000)
 	{
+	case 0x0000:
+		switch(op & 0x0f00)
+		{
 		case 0x0000:
-			switch(op & 0x0f00)
+			util::stream_format(stream, "NOP");
+			break;
+		case 0x0100:
+			util::stream_format(stream, "MOVW    R%d:R%d, R%d:R%d", (RD4(op) << 1)+1, RD4(op) << 1, (RR4(op) << 1)+1, RR4(op) << 1);
+			break;
+		case 0x0200:
+			util::stream_format(stream, "MULS    R%d, R%d", 16+RD4(op), 16+RR4(op));
+			break;
+		case 0x0300:
+			switch(MULCONST2(op))
+			{
+			case 0:
+				util::stream_format(stream, "MULSU   R%d, R%d", 16+RD3(op), 16+RR3(op));
+				break;
+			case 1:
+				util::stream_format(stream, "FMUL    R%d, R%d", 16+RD3(op), 16+RR3(op));
+				break;
+			case 2:
+				util::stream_format(stream, "FMULS   R%d, R%d", 16+RD3(op), 16+RR3(op));
+				break;
+			case 3:
+				util::stream_format(stream, "FMULSU  R%d, R%d", 16+RD3(op), 16+RR3(op));
+				break;
+			}
+			break;
+		case 0x0400:
+		case 0x0500:
+		case 0x0600:
+		case 0x0700:
+			util::stream_format(stream, "CPC     R%d, R%d", RD5(op), RR5(op));
+			break;
+		case 0x0800:
+		case 0x0900:
+		case 0x0a00:
+		case 0x0b00:
+			util::stream_format(stream, "SBC     R%d, R%d", RD5(op), RR5(op));
+			break;
+		case 0x0c00:
+		case 0x0d00:
+		case 0x0e00:
+		case 0x0f00:
+			util::stream_format(stream, "ADD     R%d, R%d", RD5(op), RR5(op));
+			break;
+		}
+		break;
+	case 0x1000:
+		switch(op & 0x0c00)
+		{
+		case 0x0000:
+			util::stream_format(stream, "CPSE    R%d, R%d", RD5(op), RR5(op));
+			break;
+		case 0x0400:
+			util::stream_format(stream, "CP      R%d, R%d", RD5(op), RR5(op));
+			break;
+		case 0x0800:
+			util::stream_format(stream, "SUB     R%d, R%d", RD5(op), RR5(op));
+			break;
+		case 0x0c00:
+			util::stream_format(stream, "ADC     R%d, R%d", RD5(op), RR5(op));
+			break;
+		}
+		break;
+	case 0x2000:
+		switch(op & 0x0c00)
+	{
+		case 0x0000:
+			util::stream_format(stream, "AND     R%d, R%d", RD5(op), RR5(op));
+			break;
+		case 0x0400:
+			util::stream_format(stream, "EOR     R%d, R%d", RD5(op), RR5(op));
+			break;
+		case 0x0800:
+			util::stream_format(stream, "OR      R%d, R%d", RD5(op), RR5(op));
+			break;
+		case 0x0c00:
+			util::stream_format(stream, "MOV     R%d, R%d", RD5(op), RR5(op));
+			break;
+		}
+		break;
+	case 0x3000:
+		util::stream_format(stream, "CPI     R%d, 0x%02x", 16+RD4(op), KCONST8(op));
+		break;
+	case 0x4000:
+		util::stream_format(stream, "SBCI    R%d, 0x%02x", 16+RD4(op), KCONST8(op));
+		break;
+	case 0x5000:
+		util::stream_format(stream, "SUBI    R%d, 0x%02x", 16+RD4(op), KCONST8(op));
+		break;
+	case 0x6000:
+		util::stream_format(stream, "ORI     R%d, 0x%02x", 16+RD4(op), KCONST8(op));
+		break;
+	case 0x7000:
+		util::stream_format(stream, "ANDI    R%d, 0x%02x", 16+RD4(op), KCONST8(op));
+		break;
+	case 0x8000:
+	case 0xa000:
+		switch(op & 0x0208)
+		{
+		case 0x0000:
+			util::stream_format(stream, "LD(D)   R%d, Z+%02x", RD5(op), QCONST6(op));
+			break;
+		case 0x0008:
+			util::stream_format(stream, "LD(D)   R%d, Y+%02x", RD5(op), QCONST6(op));
+			break;
+		case 0x0200:
+			util::stream_format(stream, "ST(D)   Z+%02x, R%d", QCONST6(op), RD5(op));
+			break;
+		case 0x0208:
+			util::stream_format(stream, "ST(D)   Y+%02x, R%d", QCONST6(op), RD5(op));
+			break;
+		}
+		break;
+	case 0x9000:
+		switch(op & 0x0f00)
+		{
+		case 0x0000:
+		case 0x0100:
+			switch(op & 0x000f)
 			{
+			case 0x0000:
+				op <<= 16;
+				op |= opcodes.r16(pc);
+				pc += 2;
+				util::stream_format(stream, "LDS     R%d, (0x%04x)", RD5(op >> 16), op & 0x0000ffff);
+				break;
+			case 0x0001:
+				util::stream_format(stream, "LD      R%d, Z+", RD5(op));
+				break;
+			case 0x0002:
+				util::stream_format(stream, "LD      R%d,-Z", RD5(op));
+				break;
+			case 0x0004:
+				util::stream_format(stream, "LPM     R%d, Z", RD5(op));
+				break;
+			case 0x0005:
+				util::stream_format(stream, "LPM     R%d, Z+", RD5(op));
+				break;
+			case 0x0006:
+				util::stream_format(stream, "ELPM    R%d, Z", RD5(op));
+				break;
+			case 0x0007:
+				util::stream_format(stream, "ELPM    R%d, Z+", RD5(op));
+				break;
+			case 0x0009:
+				util::stream_format(stream, "LD      R%d, Y+", RD5(op));
+				break;
+			case 0x000a:
+				util::stream_format(stream, "LD      R%d,-Y", RD5(op));
+				break;
+			case 0x000c:
+				util::stream_format(stream, "LD      R%d, X", RD5(op));
+				break;
+			case 0x000d:
+				util::stream_format(stream, "LD      R%d, X+", RD5(op));
+				break;
+			case 0x000e:
+				util::stream_format(stream, "LD      R%d,-X", RD5(op));
+				break;
+			case 0x000f:
+				util::stream_format(stream, "POP     R%d", RD5(op));
+				break;
+			default:
+				util::stream_format(stream, "Undefined (%08x)", op);
+				break;
+			}
+			break;
+		case 0x0200:
+		case 0x0300:
+			switch(op & 0x000f)
+			{
+			case 0x0000:
+				op <<= 16;
+				op |= opcodes.r16(pc);
+				pc += 2;
+				util::stream_format(stream, "STS     (0x%04x), R%d", op & 0x0000ffff, RD5(op >> 16));
+				break;
+			case 0x0001:
+				util::stream_format(stream, "ST       Z+, R%d", RD5(op));
+				break;
+			case 0x0002:
+				util::stream_format(stream, "ST      -Z , R%d", RD5(op));
+				break;
+			case 0x0009:
+				util::stream_format(stream, "ST       Y+, R%d", RD5(op));
+				break;
+			case 0x000a:
+				util::stream_format(stream, "ST      -Y , R%d", RD5(op));
+				break;
+			case 0x000c:
+				util::stream_format(stream, "ST       X , R%d", RD5(op));
+				break;
+			case 0x000d:
+				util::stream_format(stream, "ST       X+, R%d", RD5(op));
+				break;
+			case 0x000e:
+				util::stream_format(stream, "ST      -X , R%d", RD5(op));
+				break;
+			case 0x000f:
+				util::stream_format(stream, "PUSH    R%d", RD5(op));
+				break;
+			default:
+				util::stream_format(stream, "Undefined (%08x)", op);
+				break;
+			}
+			break;
+		case 0x0400:
+			switch(op & 0x000f)
+			{
+			case 0x0000:
+				util::stream_format(stream, "COM     R%d", RD5(op));
+				break;
+			case 0x0001:
+				util::stream_format(stream, "NEG     R%d", RD5(op));
+				break;
+			case 0x0002:
+				util::stream_format(stream, "SWAP    R%d", RD5(op));
+				break;
+			case 0x0003:
+				util::stream_format(stream, "INC     R%d", RD5(op));
+				break;
+			case 0x0005:
+				util::stream_format(stream, "ASR     R%d", RD5(op));
+				break;
+			case 0x0006:
+				util::stream_format(stream, "LSR     R%d", RD5(op));
+				break;
+			case 0x0007:
+				util::stream_format(stream, "ROR     R%d", RD5(op));
+				break;
+			case 0x0008:
+				switch(op & 0x00f0)
+				{
 				case 0x0000:
-					util::stream_format(stream, "NOP");
+					util::stream_format(stream, "SEC");
 					break;
-				case 0x0100:
-					util::stream_format(stream, "MOVW    R%d:R%d, R%d:R%d", (RD4(op) << 1)+1, RD4(op) << 1, (RR4(op) << 1)+1, RR4(op) << 1);
+				case 0x0010:
+					util::stream_format(stream, "SEZ");
 					break;
-				case 0x0200:
-					util::stream_format(stream, "MULS    R%d, R%d", 16+RD4(op), 16+RR4(op));
+				case 0x0020:
+					util::stream_format(stream, "SEN");
 					break;
-				case 0x0300:
-					switch(MULCONST2(op))
-					{
-						case 0:
-							util::stream_format(stream, "MULSU   R%d, R%d", 16+RD3(op), 16+RR3(op));
-							break;
-						case 1:
-							util::stream_format(stream, "FMUL    R%d, R%d", 16+RD3(op), 16+RR3(op));
-							break;
-						case 2:
-							util::stream_format(stream, "FMULS   R%d, R%d", 16+RD3(op), 16+RR3(op));
-							break;
-						case 3:
-							util::stream_format(stream, "FMULSU  R%d, R%d", 16+RD3(op), 16+RR3(op));
-							break;
-					}
-					break;
-				case 0x0400:
-				case 0x0500:
-				case 0x0600:
-				case 0x0700:
-					util::stream_format(stream, "CPC     R%d, R%d", RD5(op), RR5(op));
-					break;
-				case 0x0800:
-				case 0x0900:
-				case 0x0a00:
-				case 0x0b00:
-					util::stream_format(stream, "SBC     R%d, R%d", RD5(op), RR5(op));
-					break;
-				case 0x0c00:
-				case 0x0d00:
-				case 0x0e00:
-				case 0x0f00:
-					util::stream_format(stream, "ADD     R%d, R%d", RD5(op), RR5(op));
+				case 0x0030:
+					util::stream_format(stream, "SEV");
 					break;
-			}
-			break;
-		case 0x1000:
-			switch(op & 0x0c00)
-			{
-				case 0x0000:
-					util::stream_format(stream, "CPSE    R%d, R%d", RD5(op), RR5(op));
+				case 0x0040:
+					util::stream_format(stream, "SES");
 					break;
-				case 0x0400:
-					util::stream_format(stream, "CP      R%d, R%d", RD5(op), RR5(op));
+				case 0x0050:
+					util::stream_format(stream, "SEH");
 					break;
-				case 0x0800:
-					util::stream_format(stream, "SUB     R%d, R%d", RD5(op), RR5(op));
+				case 0x0060:
+					util::stream_format(stream, "SET");
 					break;
-				case 0x0c00:
-					util::stream_format(stream, "ADC     R%d, R%d", RD5(op), RR5(op));
+				case 0x0070:
+					util::stream_format(stream, "SEI");
 					break;
-			}
-			break;
-		case 0x2000:
-			switch(op & 0x0c00)
-			{
-				case 0x0000:
-					util::stream_format(stream, "AND     R%d, R%d", RD5(op), RR5(op));
+				case 0x0080:
+					util::stream_format(stream, "CLC");
 					break;
-				case 0x0400:
-					util::stream_format(stream, "EOR     R%d, R%d", RD5(op), RR5(op));
+				case 0x0090:
+					util::stream_format(stream, "CLZ");
 					break;
-				case 0x0800:
-					util::stream_format(stream, "OR      R%d, R%d", RD5(op), RR5(op));
+				case 0x00a0:
+					util::stream_format(stream, "CLN");
 					break;
-				case 0x0c00:
-					util::stream_format(stream, "MOV     R%d, R%d", RD5(op), RR5(op));
+				case 0x00b0:
+					util::stream_format(stream, "CLV");
 					break;
-			}
-			break;
-		case 0x3000:
-			util::stream_format(stream, "CPI     R%d, 0x%02x", 16+RD4(op), KCONST8(op));
-			break;
-		case 0x4000:
-			util::stream_format(stream, "SBCI    R%d, 0x%02x", 16+RD4(op), KCONST8(op));
-			break;
-		case 0x5000:
-				util::stream_format(stream, "SUBI    R%d, 0x%02x", 16+RD4(op), KCONST8(op));
-			break;
-		case 0x6000:
-				util::stream_format(stream, "ORI     R%d, 0x%02x", 16+RD4(op), KCONST8(op));
-			break;
-		case 0x7000:
-				util::stream_format(stream, "ANDI    R%d, 0x%02x", 16+RD4(op), KCONST8(op));
-			break;
-		case 0x8000:
-		case 0xa000:
-			switch(op & 0x0208)
-			{
-				case 0x0000:
-					util::stream_format(stream, "LD(D)   R%d, Z+%02x", RD5(op), QCONST6(op));
+				case 0x00c0:
+					util::stream_format(stream, "CLS");
+					break;
+				case 0x00d0:
+					util::stream_format(stream, "CLH");
 					break;
-				case 0x0008:
-					util::stream_format(stream, "LD(D)   R%d, Y+%02x", RD5(op), QCONST6(op));
+				case 0x00e0:
+					util::stream_format(stream, "CLT");
 					break;
-				case 0x0200:
-					util::stream_format(stream, "ST(D)   Z+%02x, R%d", QCONST6(op), RD5(op));
+				case 0x00f0:
+					util::stream_format(stream, "CLI");
 					break;
-				case 0x0208:
-					util::stream_format(stream, "ST(D)   Y+%02x, R%d", QCONST6(op), RD5(op));
+				default:
+					util::stream_format(stream, "Undefined (%08x)", op);
+					break;
+				}
+				break;
+			case 0x0009:
+				switch(op & 0x00f0)
+				{
+				case 0x0000:
+					util::stream_format(stream, "IJMP");
 					break;
+				case 0x0010:
+					util::stream_format(stream, "EIJMP");
+					break;
+				default:
+					util::stream_format(stream, "Undefined (%08x)", op);
+					break;
+				}
+				break;
+			case 0x000a:
+				util::stream_format(stream, "DEC     R%d", RD5(op));
+				break;
+			case 0x000c:
+			case 0x000d:
+				addr = KCONST22(op) << 16;
+				addr |= opcodes.r16(pc);
+				pc += 2;
+				util::stream_format(stream, "JMP     0x%06x", addr << 1);
+				break;
+			case 0x000e:
+			case 0x000f:
+				addr = KCONST22(op) << 16;
+				addr |= opcodes.r16(pc);
+				pc += 2;
+				util::stream_format(stream, "CALL    0x%06x", addr << 1);
+				break;
+			default:
+				util::stream_format(stream, "Undefined (%08x)", op);
+				break;
 			}
 			break;
-		case 0x9000:
-			switch(op & 0x0f00)
+		case 0x0500:
+			switch(op & 0x000f)
 			{
+			case 0x0000:
+				util::stream_format(stream, "COM     R%d", RD5(op));
+				break;
+			case 0x0001:
+				util::stream_format(stream, "NEG     R%d", RD5(op));
+				break;
+			case 0x0002:
+				util::stream_format(stream, "SWAP    R%d", RD5(op));
+				break;
+			case 0x0003:
+				util::stream_format(stream, "INC     R%d", RD5(op));
+				break;
+			case 0x0005:
+				util::stream_format(stream, "ASR     R%d", RD5(op));
+				break;
+			case 0x0006:
+				util::stream_format(stream, "LSR     R%d", RD5(op));
+				break;
+			case 0x0007:
+				util::stream_format(stream, "ROR     R%d", RD5(op));
+				break;
+			case 0x0008:
+				switch(op & 0x00f0)
+				{
 				case 0x0000:
-				case 0x0100:
-					switch(op & 0x000f)
-					{
-						case 0x0000:
-							op <<= 16;
-							op |= opcodes.r16(pc);
-							pc += 2;
-							util::stream_format(stream, "LDS     R%d, (0x%04x)", RD5(op >> 16), op & 0x0000ffff);
-							break;
-						case 0x0001:
-							util::stream_format(stream, "LD      R%d, Z+", RD5(op));
-							break;
-						case 0x0002:
-							util::stream_format(stream, "LD      R%d,-Z", RD5(op));
-							break;
-						case 0x0004:
-							util::stream_format(stream, "LPM     R%d, Z", RD5(op));
-							break;
-						case 0x0005:
-							util::stream_format(stream, "LPM     R%d, Z+", RD5(op));
-							break;
-						case 0x0006:
-							util::stream_format(stream, "ELPM    R%d, Z", RD5(op));
-							break;
-						case 0x0007:
-							util::stream_format(stream, "ELPM    R%d, Z+", RD5(op));
-							break;
-						case 0x0009:
-							util::stream_format(stream, "LD      R%d, Y+", RD5(op));
-							break;
-						case 0x000a:
-							util::stream_format(stream, "LD      R%d,-Y", RD5(op));
-							break;
-						case 0x000c:
-							util::stream_format(stream, "LD      R%d, X", RD5(op));
-							break;
-						case 0x000d:
-							util::stream_format(stream, "LD      R%d, X+", RD5(op));
-							break;
-						case 0x000e:
-							util::stream_format(stream, "LD      R%d,-X", RD5(op));
-							break;
-						case 0x000f:
-							util::stream_format(stream, "POP     R%d", RD5(op));
-							break;
-						default:
-							util::stream_format(stream, "Undefined (%08x)", op);
-							break;
-					}
-					break;
-				case 0x0200:
-				case 0x0300:
-					switch(op & 0x000f)
-					{
-						case 0x0000:
-							op <<= 16;
-							op |= opcodes.r16(pc);
-							pc += 2;
-							util::stream_format(stream, "STS     (0x%04x), R%d", op & 0x0000ffff, RD5(op >> 16));
-							break;
-						case 0x0001:
-							util::stream_format(stream, "ST       Z+, R%d", RD5(op));
-							break;
-						case 0x0002:
-							util::stream_format(stream, "ST      -Z , R%d", RD5(op));
-							break;
-						case 0x0009:
-							util::stream_format(stream, "ST       Y+, R%d", RD5(op));
-							break;
-						case 0x000a:
-							util::stream_format(stream, "ST      -Y , R%d", RD5(op));
-							break;
-						case 0x000c:
-							util::stream_format(stream, "ST       X , R%d", RD5(op));
-							break;
-						case 0x000d:
-							util::stream_format(stream, "ST       X+, R%d", RD5(op));
-							break;
-						case 0x000e:
-							util::stream_format(stream, "ST      -X , R%d", RD5(op));
-							break;
-						case 0x000f:
-							util::stream_format(stream, "PUSH    R%d", RD5(op));
-							break;
-						default:
-							util::stream_format(stream, "Undefined (%08x)", op);
-							break;
-					}
-					break;
-				case 0x0400:
-					switch(op & 0x000f)
-					{
-						case 0x0000:
-							util::stream_format(stream, "COM     R%d", RD5(op));
-							break;
-						case 0x0001:
-							util::stream_format(stream, "NEG     R%d", RD5(op));
-							break;
-						case 0x0002:
-							util::stream_format(stream, "SWAP    R%d", RD5(op));
-							break;
-						case 0x0003:
-							util::stream_format(stream, "INC     R%d", RD5(op));
-							break;
-						case 0x0005:
-							util::stream_format(stream, "ASR     R%d", RD5(op));
-							break;
-						case 0x0006:
-							util::stream_format(stream, "LSR     R%d", RD5(op));
-							break;
-						case 0x0007:
-							util::stream_format(stream, "ROR     R%d", RD5(op));
-							break;
-						case 0x0008:
-							switch(op & 0x00f0)
-							{
-								case 0x0000:
-									util::stream_format(stream, "SEC");
-									break;
-								case 0x0010:
-									util::stream_format(stream, "SEZ");
-									break;
-								case 0x0020:
-									util::stream_format(stream, "SEN");
-									break;
-								case 0x0030:
-									util::stream_format(stream, "SEV");
-									break;
-								case 0x0040:
-									util::stream_format(stream, "SES");
-									break;
-								case 0x0050:
-									util::stream_format(stream, "SEH");
-									break;
-								case 0x0060:
-									util::stream_format(stream, "SET");
-									break;
-								case 0x0070:
-									util::stream_format(stream, "SEI");
-									break;
-								case 0x0080:
-									util::stream_format(stream, "CLC");
-									break;
-								case 0x0090:
-									util::stream_format(stream, "CLZ");
-									break;
-								case 0x00a0:
-									util::stream_format(stream, "CLN");
-									break;
-								case 0x00b0:
-									util::stream_format(stream, "CLV");
-									break;
-								case 0x00c0:
-									util::stream_format(stream, "CLS");
-									break;
-								case 0x00d0:
-									util::stream_format(stream, "CLH");
-									break;
-								case 0x00e0:
-									util::stream_format(stream, "CLT");
-									break;
-								case 0x00f0:
-									util::stream_format(stream, "CLI");
-									break;
-								default:
-									util::stream_format(stream, "Undefined (%08x)", op);
-									break;
-							}
-							break;
-						case 0x0009:
-							switch(op & 0x00f0)
-							{
-								case 0x0000:
-									util::stream_format(stream, "IJMP");
-									break;
-								case 0x0010:
-									util::stream_format(stream, "EIJMP");
-									break;
-								default:
-									util::stream_format(stream, "Undefined (%08x)", op);
-									break;
-							}
-							break;
-						case 0x000a:
-							util::stream_format(stream, "DEC     R%d", RD5(op));
-							break;
-						case 0x000c:
-						case 0x000d:
-							addr = KCONST22(op) << 16;
-							addr |= opcodes.r16(pc);
-							pc += 2;
-							util::stream_format(stream, "JMP     0x%06x", addr << 1);
-							break;
-						case 0x000e:
-						case 0x000f:
-							addr = KCONST22(op) << 16;
-							addr |= opcodes.r16(pc);
-							pc += 2;
-							util::stream_format(stream, "CALL    0x%06x", addr << 1);
-							break;
-						default:
-							util::stream_format(stream, "Undefined (%08x)", op);
-							break;
-					}
-					break;
-				case 0x0500:
-					switch(op & 0x000f)
-					{
-						case 0x0000:
-							util::stream_format(stream, "COM     R%d", RD5(op));
-							break;
-						case 0x0001:
-							util::stream_format(stream, "NEG     R%d", RD5(op));
-							break;
-						case 0x0002:
-							util::stream_format(stream, "SWAP    R%d", RD5(op));
-							break;
-						case 0x0003:
-							util::stream_format(stream, "INC     R%d", RD5(op));
-							break;
-						case 0x0005:
-							util::stream_format(stream, "ASR     R%d", RD5(op));
-							break;
-						case 0x0006:
-							util::stream_format(stream, "LSR     R%d", RD5(op));
-							break;
-						case 0x0007:
-							util::stream_format(stream, "ROR     R%d", RD5(op));
-							break;
-						case 0x0008:
-							switch(op & 0x00f0)
-							{
-								case 0x0000:
-									util::stream_format(stream, "RET");
-									break;
-								case 0x0010:
-									util::stream_format(stream, "RETI");
-									break;
-								case 0x0080:
-									util::stream_format(stream, "SLEEP");
-									break;
-								case 0x0090:
-									util::stream_format(stream, "BREAK");
-									break;
-								case 0x00a0:
-									util::stream_format(stream, "WDR");
-									break;
-								case 0x00c0:
-									util::stream_format(stream, "LPM");
-									break;
-								case 0x00d0:
-									util::stream_format(stream, "ELPM");
-									break;
-								case 0x00e0:
-									util::stream_format(stream, "SPM");
-									break;
-								case 0x00f0:
-									util::stream_format(stream, "SPM     Z+");
-									break;
-								default:
-									util::stream_format(stream, "Undefined (%08x)", op);
-									break;
-							}
-							break;
-						case 0x0009:
-							switch(op & 0x00f0)
-							{
-								case 0x0000:
-									util::stream_format(stream, "ICALL");
-									break;
-								case 0x0010:
-									util::stream_format(stream, "EICALL");
-									break;
-								default:
-									util::stream_format(stream, "Undefined (%08x)", op);
-									break;
-							}
-							break;
-						case 0x000a:
-							util::stream_format(stream, "DEC     R%d", RD5(op));
-							break;
-						case 0x000c:
-						case 0x000d:
-							op <<= 16;
-							op |= opcodes.r16(pc);
-							pc += 2;
-							util::stream_format(stream, "JMP     0x%06x", KCONST22(op) << 1);
-							break;
-						case 0x000e:
-						case 0x000f:
-							op <<= 16;
-							op |= opcodes.r16(pc);
-							pc += 2;
-							util::stream_format(stream, "CALL    0x%06x", KCONST22(op) << 1);
-							break;
-					}
+					util::stream_format(stream, "RET");
 					break;
-				case 0x0600:
-					util::stream_format(stream, "ADIW    R%d:R%d, 0x%02x", 24+(RD2(op) << 1)+1, 24+(RD2(op) << 1), KCONST6(op));
+				case 0x0010:
+					util::stream_format(stream, "RETI");
 					break;
-				case 0x0700:
-					util::stream_format(stream, "SBIW    R%d:R%d, 0x%02x", 24+(RD2(op) << 1)+1, 24+(RD2(op) << 1), KCONST6(op));
+				case 0x0080:
+					util::stream_format(stream, "SLEEP");
 					break;
-				case 0x0800:
-			if (ACONST5(op) < 0x20)
-			util::stream_format(stream, "CBI     %s, %s", register_names[ACONST5(op)], register_bit_names[ACONST5(op)][RR3(op)]);
-			else
-			util::stream_format(stream, "CBI     0x%02x, %d", ACONST5(op), RR3(op));
+				case 0x0090:
+					util::stream_format(stream, "BREAK");
 					break;
-				case 0x0900:
-			if (ACONST5(op) < 0x20)
-			util::stream_format(stream, "SBIC    %s, %s", register_names[ACONST5(op)],  register_bit_names[ACONST5(op)][RR3(op)]);
-			else
-			util::stream_format(stream, "SBIC    0x%02x, %d", ACONST5(op), RR3(op));
+				case 0x00a0:
+					util::stream_format(stream, "WDR");
 					break;
-				case 0x0a00:
-			if (ACONST5(op) < 0x20)
-			util::stream_format(stream, "SBI     %s, %s", register_names[ACONST5(op)],  register_bit_names[ACONST5(op)][RR3(op)]);
-			else
-			util::stream_format(stream, "SBI     0x%02x, %d", ACONST5(op), RR3(op));
+				case 0x00c0:
+					util::stream_format(stream, "LPM");
 					break;
-				case 0x0b00:
-			if (ACONST5(op) < 0x20)
-			util::stream_format(stream, "SBIS    %s, %s", register_names[ACONST5(op)],  register_bit_names[ACONST5(op)][RR3(op)]);
-			else
-			util::stream_format(stream, "SBIS    0x%02x, %d", ACONST5(op), RR3(op));
+				case 0x00d0:
+					util::stream_format(stream, "ELPM");
+					break;
+				case 0x00e0:
+					util::stream_format(stream, "SPM");
+					break;
+				case 0x00f0:
+					util::stream_format(stream, "SPM     Z+");
+					break;
+				default:
+					util::stream_format(stream, "Undefined (%08x)", op);
+					break;
+				}
+				break;
+			case 0x0009:
+				switch(op & 0x00f0)
+				{
+				case 0x0000:
+					util::stream_format(stream, "ICALL");
 					break;
-				case 0x0c00:
-				case 0x0d00:
-				case 0x0e00:
-				case 0x0f00:
-					util::stream_format(stream, "MUL     R%d, R%d", RD5(op), RR5(op));
+				case 0x0010:
+					util::stream_format(stream, "EICALL");
 					break;
+				default:
+					util::stream_format(stream, "Undefined (%08x)", op);
+					break;
+				}
+				break;
+			case 0x000a:
+				util::stream_format(stream, "DEC     R%d", RD5(op));
+				break;
+			case 0x000c:
+			case 0x000d:
+				op <<= 16;
+				op |= opcodes.r16(pc);
+				pc += 2;
+				util::stream_format(stream, "JMP     0x%06x", KCONST22(op) << 1);
+				break;
+			case 0x000e:
+			case 0x000f:
+				op <<= 16;
+				op |= opcodes.r16(pc);
+				pc += 2;
+				util::stream_format(stream, "CALL    0x%06x", KCONST22(op) << 1);
+				break;
 			}
 			break;
-		case 0xb000:
-			if(op & 0x0800)
-			{
-		if (ACONST6(op) < 0x40 ) {
-			util::stream_format(stream, "OUT     %s, R%d", register_names[ACONST6(op)], RD5(op));
-		} else {
-			util::stream_format(stream, "OUT     0x%02x, R%d", ACONST6(op), RD5(op));
-		}
-			}
-			else
-			{
-		if (ACONST6(op) < 0x40 ) {
-			util::stream_format(stream, "IN      R%d, %s", RD5(op), register_names[ACONST6(op)]);
-		} else {
-			util::stream_format(stream, "IN      R%d, 0x%02x", RD5(op), ACONST6(op));
-		}
-			}
+		case 0x0600:
+			util::stream_format(stream, "ADIW    R%d:R%d, 0x%02x", 24+(RD2(op) << 1)+1, 24+(RD2(op) << 1), KCONST6(op));
 			break;
-		case 0xc000:
-		//I'm not sure if this is correct. why pc + ... : pc + 8 + ... ?
-			util::stream_format(stream, "RJMP    %08x", (((op & 0x0800) ? pc + ((op & 0x0fff) | 0xfffff000) : pc + 8 + (op & 0x0fff)) << 0));
+		case 0x0700:
+			util::stream_format(stream, "SBIW    R%d:R%d, 0x%02x", 24+(RD2(op) << 1)+1, 24+(RD2(op) << 1), KCONST6(op));
 			break;
-		case 0xd000:
-			util::stream_format(stream, "RCALL   %08x", (((op & 0x0800) ? ((op & 0x0fff) | 0xfffff000) : (op & 0x0fff)) << 1));
+		case 0x0800:
+			util::stream_format(stream, "CBI     %s, %s", register_names[ACONST5(op)], register_bit_names[ACONST5(op)][RR3(op)]);
 			break;
-		case 0xe000:
-			util::stream_format(stream, "LDI     R%d, 0x%02x", 16 + RD4(op), KCONST8(op));
+		case 0x0900:
+			util::stream_format(stream, "SBIC    %s, %s", register_names[ACONST5(op)],  register_bit_names[ACONST5(op)][RR3(op)]);
 			break;
-		case 0xf000:
-			switch(op & 0x0c00)
+		case 0x0a00:
+			util::stream_format(stream, "SBI     %s, %s", register_names[ACONST5(op)],  register_bit_names[ACONST5(op)][RR3(op)]);
+			break;
+		case 0x0b00:
+			util::stream_format(stream, "SBIS    %s, %s", register_names[ACONST5(op)],  register_bit_names[ACONST5(op)][RR3(op)]);
+			break;
+		case 0x0c00:
+		case 0x0d00:
+		case 0x0e00:
+		case 0x0f00:
+			util::stream_format(stream, "MUL     R%d, R%d", RD5(op), RR5(op));
+			break;
+		}
+		break;
+	case 0xb000:
+		if(op & 0x0800)
+			util::stream_format(stream, "OUT     %s, R%d", register_names[ACONST6(op)], RD5(op));
+		else
+			util::stream_format(stream, "IN      R%d, %s", RD5(op), register_names[ACONST6(op)]);
+		break;
+	case 0xc000:
+		util::stream_format(stream, "RJMP    %08x", (((op & 0x0800) ? pc + ((op & 0x0fff) | 0xfffff000) : pc + 2 + (op & 0x0fff)) << 0));
+		break;
+	case 0xd000:
+		util::stream_format(stream, "RCALL   %08x", (((op & 0x0800) ? ((op & 0x0fff) | 0xfffff000) : (op & 0x0fff)) << 1));
+		break;
+	case 0xe000:
+		util::stream_format(stream, "LDI     R%d, 0x%02x", 16 + RD4(op), KCONST8(op));
+		break;
+	case 0xf000:
+		switch(op & 0x0c00)
+		{
+		case 0x0000:
+			switch(op & 0x0007)
 			{
-				case 0x0000:
-					switch(op & 0x0007)
-					{
-						case 0x0000:
-							util::stream_format(stream, "BRLO    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0001:
-							util::stream_format(stream, "BREQ    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0002:
-							util::stream_format(stream, "BRMI    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0003:
-							util::stream_format(stream, "BRVS    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0004:
-							util::stream_format(stream, "BRLT    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0005:
-							util::stream_format(stream, "BRHS    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0006:
-							util::stream_format(stream, "BRTS    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0007:
-							util::stream_format(stream, "BRIE    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-					}
-					break;
-				case 0x0400:
-					switch(op & 0x0007)
-					{
-						case 0x0000:
-							util::stream_format(stream, "BRSH    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0001:
-							util::stream_format(stream, "BRNE    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0002:
-							util::stream_format(stream, "BRPL    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0003:
-							util::stream_format(stream, "BRVC    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0004:
-							util::stream_format(stream, "BRGE    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0005:
-							util::stream_format(stream, "BRHC    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0006:
-							util::stream_format(stream, "BRTC    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-						case 0x0007:
-							util::stream_format(stream, "BRID    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
-							break;
-					}
-					break;
-				case 0x0800:
-					if(op & 0x0200)
-					{
-						util::stream_format(stream, "BST     R%d, %d", RD5(op), RR3(op));
-					}
-					else
-					{
-						util::stream_format(stream, "BLD     R%d, %d", RD5(op), RR3(op));
-					}
-					break;
-				case 0x0c00:
-					if(op & 0x0200)
-					{
-						util::stream_format(stream, "SBRS    R%d, %d", RD5(op), RR3(op));
-					}
-					else
-					{
-						util::stream_format(stream, "SBRC    R%d, %d", RD5(op), RR3(op));
-					}
-					break;
+			case 0x0000:
+				util::stream_format(stream, "BRLO    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0001:
+				util::stream_format(stream, "BREQ    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0002:
+				util::stream_format(stream, "BRMI    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0003:
+				util::stream_format(stream, "BRVS    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0004:
+				util::stream_format(stream, "BRLT    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0005:
+				util::stream_format(stream, "BRHS    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0006:
+				util::stream_format(stream, "BRTS    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0007:
+				util::stream_format(stream, "BRIE    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			}
+			break;
+		case 0x0400:
+			switch(op & 0x0007)
+			{
+			case 0x0000:
+				util::stream_format(stream, "BRSH    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0001:
+				util::stream_format(stream, "BRNE    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0002:
+				util::stream_format(stream, "BRPL    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0003:
+				util::stream_format(stream, "BRVC    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0004:
+				util::stream_format(stream, "BRGE    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0005:
+				util::stream_format(stream, "BRHC    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0006:
+				util::stream_format(stream, "BRTC    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
+			case 0x0007:
+				util::stream_format(stream, "BRID    %08x", (((op & 0x0200) ? (KCONST7(op) | 0xff80) : KCONST7(op)) << 1));
+				break;
 			}
 			break;
+		case 0x0800:
+			if(op & 0x0200)
+				util::stream_format(stream, "BST     R%d, %d", RD5(op), RR3(op));
+			else
+				util::stream_format(stream, "BLD     R%d, %d", RD5(op), RR3(op));
+			break;
+		case 0x0c00:
+			if(op & 0x0200)
+				util::stream_format(stream, "SBRS    R%d, %d", RD5(op), RR3(op));
+			else
+				util::stream_format(stream, "SBRC    R%d, %d", RD5(op), RR3(op));
+			break;
+		}
+		break;
 	}
 
 	return (pc - base_pc) | SUPPORTED;
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/avr8/avr8.h mame-0.224+dfsg.1/src/devices/cpu/avr8/avr8.h
--- mame-0.222+dfsg.1/src/devices/cpu/avr8/avr8.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/avr8/avr8.h	2020-08-26 08:57:19.000000000 +0000
@@ -3,38 +3,6 @@
 /*
     Atmel 8-bit AVR simulator
 
-    - Notes -
-      Cycle counts are generally considered to be 100% accurate per-instruction, does not support mid-instruction
-      interrupts although no software has been encountered yet that requires it. Evidence of cycle accuracy is given
-      in the form of the demoscene 'wild' demo, Craft, by [lft], which uses an ATmega88 to write video out a 6-bit
-      RGB DAC pixel-by-pixel, synchronously with the frame timing. Intentionally modifying the timing of any of
-      the existing opcodes has been shown to wildly corrupt the video output in Craft, so one can assume that the
-      existing timing is 100% correct.
-
-      Unimplemented opcodes: SPM, SPM Z+, SLEEP, BREAK, WDR, EICALL, JMP, CALL
-
-    - Changelist -
-      23 Dec. 2012 [Sandro Ronco]
-      - Added CPSE, LD Z+, ST -Z/-Y/-X and ICALL opcodes
-      - Fixed Z flag in CPC, SBC and SBCI opcodes
-      - Fixed V and C flags in SBIW opcode
-
-      30 Oct. 2012
-      - Added FMUL, FMULS, FMULSU opcodes [Ryan Holtz]
-      - Fixed incorrect flag calculation in ROR opcode [Ryan Holtz]
-      - Fixed incorrect bit testing in SBIC/SBIS opcodes [Ryan Holtz]
-
-      25 Oct. 2012
-      - Added MULS, ANDI, STI Z+, LD -Z, LD -Y, LD -X, LD Y+q, LD Z+q, SWAP, ASR, ROR and SBIS opcodes [Ryan Holtz]
-      - Corrected cycle counts for LD and ST opcodes [Ryan Holtz]
-      - Moved opcycles init into inner while loop, fixes 2-cycle and 3-cycle opcodes effectively forcing
-        all subsequent 1-cycle opcodes to be 2 or 3 cycles [Ryan Holtz]
-      - Fixed register behavior in MULSU, LD -Z, and LD -Y opcodes [Ryan Holtz]
-
-      18 Oct. 2012
-      - Added OR, SBCI, ORI, ST Y+, ADIQ opcodes [Ryan Holtz]
-      - Fixed COM, NEG, LSR opcodes [Ryan Holtz]
-
 */
 
 #ifndef MAME_CPU_AVR8_AVR8_H
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/avr8/avr8ops.hxx mame-0.224+dfsg.1/src/devices/cpu/avr8/avr8ops.hxx
--- mame-0.222+dfsg.1/src/devices/cpu/avr8/avr8ops.hxx	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/avr8/avr8ops.hxx	2020-08-26 08:57:19.000000000 +0000
@@ -523,7 +523,7 @@
 			flags |= (((rd & 8) && (rr & 8)) || ((rr & 8) && !(res & 8)) || (!(res & 8) && (rd & 8))) ? AVR8_SREG_MASK_H : 0;
 			flags |= (((rd & 0x80) && (rr & 0x80) && !(res & 0x80)) | (!(rd & 0x80) & !(rr & 0x80) & (res & 0x80))) ? AVR8_SREG_MASK_V : 0;
 			flags |= (res & 0x80) ? AVR8_SREG_MASK_N : 0;
-			flags |= ((SREG & AVR8_SREG_MASK_N) != (SREG & AVR8_SREG_MASK_V)) ? AVR8_SREG_MASK_S : 0;
+			flags |= (bool(flags & AVR8_SREG_MASK_N) != bool(flags & AVR8_SREG_MASK_V)) ? AVR8_SREG_MASK_S : 0;
 			flags |= (res == 0) ? AVR8_SREG_MASK_Z : 0;
 			flags |= (((rd & 0x80) && (rr & 0x80)) || ((rr & 0x80) && !(res & 0x80)) || (!(res & 0x80) && (rd & 0x80))) ? AVR8_SREG_MASK_C : 0;
 			m_add_flag_cache[(rd << 8) | rr] = flags;
@@ -544,7 +544,7 @@
 				flags |= (((rd & 8) && (rr & 8)) || ((rr & 8) && !(res & 8)) || (!(res & 8) && (rd & 8))) ? AVR8_SREG_MASK_H : 0;
 				flags |= (((rd & 0x80) && (rr & 0x80) && !(res & 0x80)) | (!(rd & 0x80) & !(rr & 0x80) & (res & 0x80))) ? AVR8_SREG_MASK_V : 0;
 				flags |= (res & 0x80) ? AVR8_SREG_MASK_N : 0;
-				flags |= ((SREG & AVR8_SREG_MASK_N) != (SREG & AVR8_SREG_MASK_V)) ? AVR8_SREG_MASK_S : 0;
+				flags |= (bool(flags & AVR8_SREG_MASK_N) != bool(flags & AVR8_SREG_MASK_V)) ? AVR8_SREG_MASK_S : 0;
 				flags |= (res == 0) ? AVR8_SREG_MASK_Z : 0;
 				flags |= (((rd & 0x80) && (rr & 0x80)) || ((rr & 0x80) && !(res & 0x80)) || (!(res & 0x80) && (rd & 0x80))) ? AVR8_SREG_MASK_C : 0;
 				m_adc_flag_cache[(c << 16) | (rd << 8) | rr] = flags;
@@ -564,7 +564,7 @@
 			flags |= ((!(rd & 8) && (rr & 8)) || ((rr & 8) && (res & 8)) || ((res & 8) && !(rd & 8))) ? AVR8_SREG_MASK_H : 0;
 			flags |= (((rd & 0x80) && !(rr & 0x80) && !(res & 0x80)) || (!(rd & 0x80) && (rr & 0x80) && (res & 0x80))) ? AVR8_SREG_MASK_V : 0;
 			flags |= (res & 0x80) ? AVR8_SREG_MASK_N : 0;
-			flags |= ((SREG & AVR8_SREG_MASK_N) != (SREG & AVR8_SREG_MASK_V)) ? AVR8_SREG_MASK_S : 0;
+			flags |= (bool(flags & AVR8_SREG_MASK_N) != bool(flags & AVR8_SREG_MASK_V)) ? AVR8_SREG_MASK_S : 0;
 			flags |= (res == 0) ? AVR8_SREG_MASK_Z : 0;
 			flags |= ((!(rd & 0x80) && (rr & 0x80)) || ((rr & 0x80) && (res & 0x80)) || ((res & 0x80) && !(rd & 0x80))) ? AVR8_SREG_MASK_C : 0;
 			m_sub_flag_cache[(rd << 8) | rr] = flags;
@@ -587,7 +587,7 @@
 					flags |= ((!(rd & 8) && (rr & 8)) || ((rr & 8) && (res & 8)) || ((res & 8) && !(rd & 8))) ? AVR8_SREG_MASK_H : 0;
 					flags |= (((rd & 0x80) && !(rr & 0x80) && !(res & 0x80)) || (!(rd & 0x80) && (rr & 0x80) && (res & 0x80))) ? AVR8_SREG_MASK_V : 0;
 					flags |= (res & 0x80) ? AVR8_SREG_MASK_N : 0;
-					flags |= ((SREG & AVR8_SREG_MASK_N) != (SREG & AVR8_SREG_MASK_V)) ? AVR8_SREG_MASK_S : 0;
+					flags |= (bool(flags & AVR8_SREG_MASK_N) != bool(flags & AVR8_SREG_MASK_V)) ? AVR8_SREG_MASK_S : 0;
 					flags |= (res == 0) ? (z ? AVR8_SREG_MASK_Z : 0) : 0;
 					flags |= ((!(rd & 0x80) && (rr & 0x80)) || ((rr & 0x80) && (res & 0x80)) || ((res & 0x80) && !(rd & 0x80))) ? AVR8_SREG_MASK_C : 0;
 					m_sbc_flag_cache[(z << 17) | (c << 16) | (rd << 8) | rr] = flags;
@@ -603,7 +603,7 @@
 	{
 		uint8_t flags = 0;
 		flags |= (res & 0x80) ? AVR8_SREG_MASK_N : 0;
-		flags |= ((SREG & AVR8_SREG_MASK_N) != (SREG & AVR8_SREG_MASK_V)) ? AVR8_SREG_MASK_S : 0;
+		flags |= (bool(flags & AVR8_SREG_MASK_N) != bool(flags & AVR8_SREG_MASK_V)) ? AVR8_SREG_MASK_S : 0;
 		flags |= (res == 0) ? AVR8_SREG_MASK_Z : 0;
 		m_bool_flag_cache[res] = flags;
 	}
@@ -619,8 +619,8 @@
 			flags |= (rd & 1) ? AVR8_SREG_MASK_C : 0;
 			flags |= (res == 0) ? AVR8_SREG_MASK_Z : 0;
 			flags |= (rd & 0x80) ? AVR8_SREG_MASK_N : 0;
-			flags |= ((SREG & AVR8_SREG_MASK_N) != (SREG & AVR8_SREG_MASK_C)) ? AVR8_SREG_MASK_V : 0;
-			flags |= ((SREG & AVR8_SREG_MASK_N) != (SREG & AVR8_SREG_MASK_V)) ? AVR8_SREG_MASK_S : 0;
+			flags |= (bool(flags & AVR8_SREG_MASK_N) != bool(flags & AVR8_SREG_MASK_C)) ? AVR8_SREG_MASK_V : 0;
+			flags |= (bool(flags & AVR8_SREG_MASK_N) != bool(flags & AVR8_SREG_MASK_V)) ? AVR8_SREG_MASK_S : 0;
 			m_shift_flag_cache[(rd << 8) | res] = flags;
 		}
 	}
@@ -1165,7 +1165,7 @@
 void avr8_device::op_wdr(uint16_t op)
 {
 	LOGMASKED(LOG_WDOG, "%s: Watchdog reset opcode\n", machine().describe_context());
-	op_unimpl(op);
+	//op_unimpl(op);
 }
 
 void avr8_device::op_lpm(uint16_t op)
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/cp1610/cp1610.cpp mame-0.224+dfsg.1/src/devices/cpu/cp1610/cp1610.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/cp1610/cp1610.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/cp1610/cp1610.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -196,11 +196,11 @@
  ***************************************************/
 void cp1610_cpu_device::cp1610_negr(int n)
 {
-	uint32_t temp;
+	uint16_t temp;
 	CLR_SZOC;
 	temp = (m_r[n] ^ 0xffff) + 1;
 	SET_COV(0,temp,1);
-	m_r[n] = temp&0xffff;
+	m_r[n] = temp;
 	SET_SZ(m_r[n]);
 	m_icount -= 6;
 }
@@ -1643,13 +1643,12 @@
  ***************************************************/
 void cp1610_cpu_device::cp1610_sdbd_subat(int r, int d)
 {
-	uint32_t temp;
+	uint16_t temp;
 	CLR_SZOC;
 	temp = cp1610_readmem16(m_r[r]) & 0xff;
 	temp |= (cp1610_readmem16(m_r[r]) << 8);
 	temp = (temp ^ 0xffff) + 1;
 	SET_COV(m_r[d],temp,1);
-	temp &= 0xffff;
 	m_r[d] += temp;
 	SET_SZ(m_r[d]);
 	m_icount -= 14;
@@ -1661,7 +1660,7 @@
  ***************************************************/
 void cp1610_cpu_device::cp1610_sdbd_subat_i(int r, int d)
 {
-	uint32_t temp;
+	uint16_t temp;
 	CLR_SZOC;
 	temp = cp1610_readmem16(m_r[r]) & 0xff;
 	m_r[r]++;
@@ -1669,7 +1668,6 @@
 	m_r[r]++;
 	temp = (temp ^ 0xffff) + 1;
 	SET_COV(m_r[d],temp,1);
-	temp &= 0xffff;
 	m_r[d] += temp;
 	SET_SZ(m_r[d]);
 	m_icount -= 14;
@@ -1681,7 +1679,7 @@
  ***************************************************/
 void cp1610_cpu_device::cp1610_sdbd_subat_d(int r, int d)
 {
-	uint32_t temp;
+	uint16_t temp;
 	CLR_SZOC;
 	m_r[r]--;
 	temp = cp1610_readmem16(m_r[r]) & 0xff;
@@ -1689,7 +1687,6 @@
 	temp |= (cp1610_readmem16(m_r[r]) << 8);
 	temp = (temp ^ 0xffff) + 1;
 	SET_COV(m_r[d],temp,1);
-	temp &= 0xffff;
 	m_r[d] += temp;
 	SET_SZ(m_r[d]);
 	m_icount -= 17;
@@ -1702,7 +1699,7 @@
 void cp1610_cpu_device::cp1610_sdbd_subi(int d)
 {
 	uint16_t addr;
-	uint32_t temp;
+	uint16_t temp;
 	CLR_SZOC;
 	addr = cp1610_readop(m_r[7]) & 0xff;
 	m_r[7]++;
@@ -1711,7 +1708,6 @@
 	temp = addr;
 	temp = (temp ^ 0xffff) + 1;
 	SET_COV(m_r[d],temp,1);
-	temp &= 0xffff;
 	m_r[d] += temp;
 	SET_SZ(m_r[d]);
 	m_icount -= 14;
@@ -1723,14 +1719,13 @@
  ***************************************************/
 void cp1610_cpu_device::cp1610_sdbd_cmpat(int r, int d)
 {
-	uint32_t temp;
+	uint16_t temp;
 	uint16_t temp2;
 	CLR_SZOC;
 	temp = cp1610_readmem16(m_r[r]) & 0xff;
 	temp |= (cp1610_readmem16(m_r[r]) << 8);
 	temp = (temp ^ 0xffff) + 1;
 	SET_COV(m_r[d],temp,1);
-	temp &= 0xffff;
 	temp2 = m_r[d] + temp;
 	SET_SZ(temp2);
 	m_icount -= 14;
@@ -1742,7 +1737,7 @@
  ***************************************************/
 void cp1610_cpu_device::cp1610_sdbd_cmpat_i(int r, int d)
 {
-	uint32_t temp;
+	uint16_t temp;
 	uint16_t temp2;
 	CLR_SZOC;
 	temp = cp1610_readmem16(m_r[r]) & 0xff;
@@ -1751,7 +1746,6 @@
 	m_r[r]++;
 	temp = (temp ^ 0xffff) + 1;
 	SET_COV(m_r[d],temp,1);
-	temp &= 0xffff;
 	temp2 = m_r[d] + temp;
 	SET_SZ(temp2);
 	m_icount -= 14;
@@ -1763,7 +1757,7 @@
  ***************************************************/
 void cp1610_cpu_device::cp1610_sdbd_cmpat_d(int r, int d)
 {
-	uint32_t temp;
+	uint16_t temp;
 	uint16_t temp2;
 	CLR_SZOC;
 	m_r[r]--;
@@ -1772,7 +1766,6 @@
 	temp |= (cp1610_readmem16(m_r[r]) << 8);
 	temp = (temp ^ 0xffff) + 1;
 	SET_COV(m_r[d],temp,1);
-	temp &= 0xffff;
 	temp2 = m_r[d] + temp;
 	SET_SZ(temp2);
 	m_icount -= 17;
@@ -1785,7 +1778,7 @@
 void cp1610_cpu_device::cp1610_sdbd_cmpi(int d)
 {
 	uint16_t addr;
-	uint32_t temp;
+	uint16_t temp;
 	uint16_t temp2;
 	CLR_SZOC;
 	addr = cp1610_readop(m_r[7]) & 0xff;
@@ -1795,7 +1788,6 @@
 	temp = addr;
 	temp = (temp ^ 0xffff) + 1;
 	SET_COV(m_r[d],temp,1);
-	temp &= 0xffff;
 	temp2 = m_r[d] + temp;
 	SET_SZ(temp2);
 	m_icount -= 14;
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/drcbex64.cpp mame-0.224+dfsg.1/src/devices/cpu/drcbex64.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/drcbex64.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/drcbex64.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -177,28 +177,6 @@
 // and the x64 SDK declares ::REG_Exx and ::REG_Rxx
 namespace drc {
 using namespace uml;
-using namespace x64emit;
-
-using x64emit::REG_EAX;
-using x64emit::REG_ECX;
-using x64emit::REG_EDX;
-using x64emit::REG_RAX;
-using x64emit::REG_RCX;
-using x64emit::REG_RDX;
-using x64emit::REG_RBX;
-using x64emit::REG_RSP;
-using x64emit::REG_RBP;
-using x64emit::REG_RSI;
-using x64emit::REG_RDI;
-
-using x64emit::REG_R8;
-using x64emit::REG_R9;
-using x64emit::REG_R10;
-using x64emit::REG_R11;
-using x64emit::REG_R12;
-using x64emit::REG_R13;
-using x64emit::REG_R14;
-using x64emit::REG_R15;
 
 
 
@@ -231,17 +209,17 @@
 
 #ifdef X64_WINDOWS_ABI
 
-const int REG_PARAM1    = REG_RCX;
-const int REG_PARAM2    = REG_RDX;
-const int REG_PARAM3    = REG_R8;
-const int REG_PARAM4    = REG_R9;
+const Gp::Id REG_PARAM1    = Gp::kIdCx;
+const Gp::Id REG_PARAM2    = Gp::kIdDx;
+const Gp::Id REG_PARAM3    = Gp::kIdR8;
+const Gp::Id REG_PARAM4    = Gp::kIdR9;
 
 #else
 
-const int REG_PARAM1    = REG_RDI;
-const int REG_PARAM2    = REG_RSI;
-const int REG_PARAM3    = REG_RDX;
-const int REG_PARAM4    = REG_RCX;
+const Gp::Id REG_PARAM1    = Gp::kIdDi;
+const Gp::Id REG_PARAM2    = Gp::kIdSi;
+const Gp::Id REG_PARAM3    = Gp::kIdDx;
+const Gp::Id REG_PARAM4    = Gp::kIdCx;
 
 #endif
 
@@ -254,11 +232,6 @@
 #define X86_CONDITION(condition)        (condition_map[condition - uml::COND_Z])
 #define X86_NOT_CONDITION(condition)    (condition_map[condition - uml::COND_Z] ^ 1)
 
-inline x86_memref drcbe_x64::MABS(const void *ptr)
-{
-	return MBD(REG_BP, offset_from_rbp(ptr));
-}
-
 #define assert_no_condition(inst)       assert((inst).condition() == uml::COND_ALWAYS)
 #define assert_any_condition(inst)      assert((inst).condition() == uml::COND_ALWAYS || ((inst).condition() >= uml::COND_Z && (inst).condition() < uml::COND_MAX))
 #define assert_no_flags(inst)           assert((inst).flags() == 0)
@@ -276,45 +249,45 @@
 //static const uint64_t size_to_mask[] = { 0, 0xff, 0xffff, 0, 0xffffffff, 0, 0, 0, 0xffffffffffffffffU };
 
 // register mapping tables
-static const uint8_t int_register_map[REG_I_COUNT] =
+static const Gp::Id int_register_map[REG_I_COUNT] =
 {
 #ifdef X64_WINDOWS_ABI
-	REG_RBX, REG_RSI, REG_RDI, REG_R12, REG_R13, REG_R14, REG_R15
+	Gp::kIdBx, Gp::kIdSi, Gp::kIdDi, Gp::kIdR12, Gp::kIdR13, Gp::kIdR14, Gp::kIdR15,
 #else
-	REG_RBX, REG_R12, REG_R13, REG_R14, REG_R15
+	Gp::kIdBx, Gp::kIdR12, Gp::kIdR13, Gp::kIdR14, Gp::kIdR15
 #endif
 };
 
-static uint8_t float_register_map[REG_F_COUNT] =
+static uint32_t float_register_map[REG_F_COUNT] =
 {
 #ifdef X64_WINDOWS_ABI
-	REG_XMM6, REG_XMM7, REG_XMM8, REG_XMM9, REG_XMM10, REG_XMM11, REG_XMM12, REG_XMM13, REG_XMM14, REG_XMM15
+	6, 7, 8, 9, 10, 11, 12, 13, 14, 15
 #else
 	// on AMD x64 ABI, XMM0-7 are FP function args.  since this code has no args, and we
 	// save/restore them around CALLC, they should be safe for our use.
-	REG_XMM0, REG_XMM1, REG_XMM2, REG_XMM3, REG_XMM4, REG_XMM5, REG_XMM6, REG_XMM7
+	0, 1, 2, 3, 4, 5, 6, 7
 #endif
 };
 
 // condition mapping table
-static const uint8_t condition_map[uml::COND_MAX - uml::COND_Z] =
+static const Condition::Code condition_map[uml::COND_MAX - uml::COND_Z] =
 {
-	x64emit::COND_Z,    // COND_Z = 0x80,    requires Z
-	x64emit::COND_NZ,   // COND_NZ,          requires Z
-	x64emit::COND_S,    // COND_S,           requires S
-	x64emit::COND_NS,   // COND_NS,          requires S
-	x64emit::COND_C,    // COND_C,           requires C
-	x64emit::COND_NC,   // COND_NC,          requires C
-	x64emit::COND_O,    // COND_V,           requires V
-	x64emit::COND_NO,   // COND_NV,          requires V
-	x64emit::COND_P,    // COND_U,           requires U
-	x64emit::COND_NP,   // COND_NU,          requires U
-	x64emit::COND_A,    // COND_A,           requires CZ
-	x64emit::COND_BE,   // COND_BE,          requires CZ
-	x64emit::COND_G,    // COND_G,           requires SVZ
-	x64emit::COND_LE,   // COND_LE,          requires SVZ
-	x64emit::COND_L,    // COND_L,           requires SV
-	x64emit::COND_GE,   // COND_GE,          requires SV
+	Condition::Code::kZ,    // COND_Z = 0x80,    requires Z
+	Condition::Code::kNZ,   // COND_NZ,          requires Z
+	Condition::Code::kS,    // COND_S,           requires S
+	Condition::Code::kNS,   // COND_NS,          requires S
+	Condition::Code::kC,    // COND_C,           requires C
+	Condition::Code::kNC,   // COND_NC,          requires C
+	Condition::Code::kO,    // COND_V,           requires V
+	Condition::Code::kNO,   // COND_NV,          requires V
+	Condition::Code::kP,    // COND_U,           requires U
+	Condition::Code::kNP,   // COND_NU,          requires U
+	Condition::Code::kA,    // COND_A,           requires CZ
+	Condition::Code::kBE,   // COND_BE,          requires CZ
+	Condition::Code::kG,    // COND_G,           requires SVZ
+	Condition::Code::kLE,   // COND_LE,          requires SVZ
+	Condition::Code::kL,    // COND_L,           requires SV
+	Condition::Code::kGE,   // COND_GE,          requires SV
 };
 
 #if 0
@@ -393,13 +366,13 @@
 	{ uml::OP_LZCNT,   &drcbe_x64::op_lzcnt },      // LZCNT   dst,src[,f]
 	{ uml::OP_TZCNT,   &drcbe_x64::op_tzcnt },      // TZCNT   dst,src[,f]
 	{ uml::OP_BSWAP,   &drcbe_x64::op_bswap },      // BSWAP   dst,src
-	{ uml::OP_SHL,     &drcbe_x64::op_shl },        // SHL     dst,src,count[,f]
-	{ uml::OP_SHR,     &drcbe_x64::op_shr },        // SHR     dst,src,count[,f]
-	{ uml::OP_SAR,     &drcbe_x64::op_sar },        // SAR     dst,src,count[,f]
-	{ uml::OP_ROL,     &drcbe_x64::op_rol },        // ROL     dst,src,count[,f]
-	{ uml::OP_ROLC,    &drcbe_x64::op_rolc },       // ROLC    dst,src,count[,f]
-	{ uml::OP_ROR,     &drcbe_x64::op_ror },        // ROR     dst,src,count[,f]
-	{ uml::OP_RORC,    &drcbe_x64::op_rorc },       // RORC    dst,src,count[,f]
+	{ uml::OP_SHL,     &drcbe_x64::op_shift<Inst::kIdShl> },        // SHL     dst,src,count[,f]
+	{ uml::OP_SHR,     &drcbe_x64::op_shift<Inst::kIdShr> },        // SHR     dst,src,count[,f]
+	{ uml::OP_SAR,     &drcbe_x64::op_shift<Inst::kIdSar> },        // SAR     dst,src,count[,f]
+	{ uml::OP_ROL,     &drcbe_x64::op_shift<Inst::kIdRol> },        // ROL     dst,src,count[,f]
+	{ uml::OP_ROLC,    &drcbe_x64::op_shift<Inst::kIdRcl> },        // ROLC    dst,src,count[,f]
+	{ uml::OP_ROR,     &drcbe_x64::op_shift<Inst::kIdRor> },        // ROR     dst,src,count[,f]
+	{ uml::OP_RORC,    &drcbe_x64::op_shift<Inst::kIdRcr> },        // RORC    dst,src,count[,f]
 
 	// Floating Point Operations
 	{ uml::OP_FLOAD,   &drcbe_x64::op_fload },      // FLOAD   dst,base,index
@@ -425,6 +398,14 @@
 	{ uml::OP_ICOPYF,  &drcbe_x64::op_icopyf }      // ICOPYF  dst,src
 };
 
+class ThrowableErrorHandler : public ErrorHandler
+{
+public:
+	void handleError(Error err, const char *message, BaseEmitter *origin) override
+	{
+		throw emu_fatalerror("asmjit error %d: %s", err, message);
+	}
+};
 
 
 //**************************************************************************
@@ -489,21 +470,28 @@
 //  checkparam
 //-------------------------------------------------
 
-inline int drcbe_x64::be_parameter::select_register(int defreg) const
+inline Gp drcbe_x64::be_parameter::select_register(Gp defreg) const
 {
-	if (m_type == PTYPE_INT_REGISTER || m_type == PTYPE_FLOAT_REGISTER || m_type == PTYPE_VECTOR_REGISTER)
-		return m_value;
+	if (m_type == PTYPE_INT_REGISTER)
+		return Gp(defreg, m_value);
 	return defreg;
 }
 
-inline int drcbe_x64::be_parameter::select_register(int defreg, const be_parameter &checkparam) const
+inline Xmm drcbe_x64::be_parameter::select_register(Xmm defreg) const
+{
+	if (m_type == PTYPE_FLOAT_REGISTER)
+		return Xmm(m_value);
+	return defreg;
+}
+
+template <typename T> T drcbe_x64::be_parameter::select_register(T defreg, be_parameter const &checkparam) const
 {
 	if (*this == checkparam)
 		return defreg;
 	return select_register(defreg);
 }
 
-inline int drcbe_x64::be_parameter::select_register(int defreg, const be_parameter &checkparam, const be_parameter &checkparam2) const
+template <typename T> T drcbe_x64::be_parameter::select_register(T defreg, be_parameter const &checkparam, be_parameter const &checkparam2) const
 {
 	if (*this == checkparam || *this == checkparam2)
 		return defreg;
@@ -542,7 +530,7 @@
 //  from rbp
 //-------------------------------------------------
 
-inline int32_t drcbe_x64::offset_from_rbp(const void *ptr)
+inline int32_t drcbe_x64::offset_from_rbp(const void *ptr) const
 {
 	const int64_t delta = reinterpret_cast<const uint8_t *>(ptr) - m_rbpvalue;
 	if (int32_t(delta) != delta)
@@ -557,53 +545,53 @@
 //  target address
 //-------------------------------------------------
 
-inline int drcbe_x64::get_base_register_and_offset(x86code *&dst, void *target, uint8_t reg, int32_t &offset)
+inline Gp drcbe_x64::get_base_register_and_offset(Assembler &a, void *target, Gp const &reg, int32_t &offset)
 {
 	const int64_t delta = reinterpret_cast<uint8_t *>(target) - m_rbpvalue;
 	if (short_immediate(delta))
 	{
 		offset = delta;
-		return REG_RBP;
+		return rbp;
 	}
 	else
 	{
 		offset = 0;
-		emit_mov_r64_imm(dst, reg, uintptr_t(target));                                       // mov   reg,target
+		mov_r64_imm(a, reg, uintptr_t(target));                                         // mov   reg,target
 		return reg;
 	}
 }
 
 
 //-------------------------------------------------
-//  emit_smart_call_r64 - generate a call either
+//  smart_call_r64 - generate a call either
 //  directly or via a call through pointer
 //-------------------------------------------------
 
-inline void drcbe_x64::emit_smart_call_r64(x86code *&dst, x86code *target, uint8_t reg)
+inline void drcbe_x64::smart_call_r64(Assembler &a, x86code *target, Gp const &reg)
 {
-	const int64_t delta = target - (dst + 5);
+	const int64_t delta = target - (x86code *)(a.code()->baseAddress() + a.offset() + 5);
 	if (short_immediate(delta))
-		emit_call(dst, target);                                                         // call  target
+		a.call(imm(target));                                                            // call  target
 	else
 	{
-		emit_mov_r64_imm(dst, reg, uintptr_t(target));                                  // mov   reg,target
-		emit_call_r64(dst, reg);                                                        // call  reg
+		mov_r64_imm(a, reg, uintptr_t(target));                                         // mov   reg,target
+		a.call(reg);                                                                    // call  reg
 	}
 }
 
 
 //-------------------------------------------------
-//  emit_smart_call_m64 - generate a call either
+//  smart_call_m64 - generate a call either
 //  directly or via a call through pointer
 //-------------------------------------------------
 
-inline void drcbe_x64::emit_smart_call_m64(x86code *&dst, x86code **target)
+inline void drcbe_x64::smart_call_m64(Assembler &a, x86code **target)
 {
-	const int64_t delta = *target - (dst + 5);
+	const int64_t delta = *target - (x86code *)(a.code()->baseAddress() + a.offset() + 5);
 	if (short_immediate(delta))
-		emit_call(dst, *target);                                                        // call  *target
+		a.call(imm(*target));                                                           // call  *target
 	else
-		emit_call_m64(dst, MABS(target));                                               // call  [target]
+		a.call(MABS(target));                                                           // call  [target]
 }
 
 
@@ -620,17 +608,14 @@
 	: drcbe_interface(drcuml, cache, device),
 		m_hash(cache, modes, addrbits, ignorebits),
 		m_map(cache, 0xaaaaaaaa5555),
-		m_labels(cache),
 		m_log(nullptr),
-		m_sse41(false),
+		m_log_asmjit(nullptr),
 		m_absmask32((uint32_t *)cache.alloc_near(16*2 + 15)),
 		m_absmask64(nullptr),
 		m_rbpvalue(cache.near() + 0x80),
 		m_entry(nullptr),
 		m_exit(nullptr),
 		m_nocode(nullptr),
-		m_fixup_label(&drcbe_x64::fixup_label, this),
-		m_fixup_exception(&drcbe_x64::fixup_exception, this),
 		m_near(*(near_state *)cache.alloc_near(sizeof(m_near)))
 {
 	// build up necessary arrays
@@ -693,6 +678,7 @@
 	{
 		std::string filename = std::string("drcbex64_").append(device.shortname()).append(".asm");
 		m_log = x86log_create_context(filename.c_str());
+		m_log_asmjit = fopen(std::string("drcbex64_asmjit_").append(device.shortname()).append(".asm").c_str(), "w");
 	}
 }
 
@@ -706,8 +692,50 @@
 	// free the log context
 	if (m_log != nullptr)
 		x86log_free_context(m_log);
+
+	if (m_log_asmjit)
+		fclose(m_log_asmjit);
 }
 
+size_t drcbe_x64::emit(CodeHolder &ch)
+{
+	Error err;
+
+	// the following three calls aren't currently required, but may be if
+	// other asmjist features are used in future
+	if (false)
+	{
+		err = ch.flatten();
+		if (err)
+			throw emu_fatalerror("asmjit::CodeHolder::flatten() error %d", err);
+
+		err = ch.resolveUnresolvedLinks();
+		if (err)
+			throw emu_fatalerror("asmjit::CodeHolder::resolveUnresolvedLinks() error %d", err);
+
+		err = ch.relocateToBase(ch.baseAddress());
+		if (err)
+			throw emu_fatalerror("asmjit::CodeHolder::relocateToBase() error %d", err);
+	}
+
+	size_t const alignment = ch.baseAddress() - uint64_t(m_cache.top());
+	size_t const code_size = ch.codeSize();
+
+	// test if enough room remains in drc cache
+	drccodeptr *cachetop = m_cache.begin_codegen(alignment + code_size);
+	if (cachetop == nullptr)
+		return 0;
+
+	err = ch.copyFlattenedData(drccodeptr(ch.baseAddress()), code_size, CodeHolder::kCopyWithPadding);
+	if (err)
+		throw emu_fatalerror("asmjit::CodeHolder::copyFlattenedData() error %d", err);
+
+	// update the drc cache and end codegen
+	*cachetop += alignment + code_size;
+	m_cache.end_codegen();
+
+	return code_size;
+}
 
 //-------------------------------------------------
 //  reset - reset back-end specific state
@@ -720,70 +748,70 @@
 		x86log_printf(m_log, "%s", "\n\n===========\nCACHE RESET\n===========\n\n");
 
 	// generate a little bit of glue code to set up the environment
-	drccodeptr *cachetop = m_cache.begin_codegen(500);
-	if (cachetop == nullptr)
-		fatalerror("Out of cache space after a reset!\n");
+	x86code *dst = (x86code *)m_cache.top();
 
-	x86code *dst = (x86code *)*cachetop;
+	CodeHolder ch;
+	ch.init(hostEnvironment(), uint64_t(dst));
 
-	// generate a simple CPUID stub
-	uint32_t (*cpuid_ecx_stub)(void) = (uint32_t (*)(void))dst;
-	emit_push_r64(dst, REG_RBX);                                                        // push  rbx
-	emit_mov_r32_imm(dst, REG_EAX, 1);                                                  // mov   eax,1
-	emit_cpuid(dst);                                                                    // cpuid
-	emit_mov_r32_r32(dst, REG_EAX, REG_ECX);                                            // mov   eax,ecx
-	emit_pop_r64(dst, REG_RBX);                                                         // pop   rbx
-	emit_ret(dst);                                                                      // ret
+	FileLogger logger(m_log_asmjit);
+	if (logger.file())
+	{
+		logger.setFlags(FormatOptions::Flags::kFlagHexOffsets | FormatOptions::Flags::kFlagHexImms | FormatOptions::Flags::kFlagMachineCode);
+		logger.setIndentation(FormatOptions::IndentationType::kIndentationCode, 4);
+		ch.setLogger(&logger);
+	}
 
-	// call it to determine if we have SSE4.1 support
-	m_sse41 = (((*cpuid_ecx_stub)() & 0x80000) != 0);
+	Assembler a(&ch);
+	if (logger.file())
+		a.addValidationOptions(BaseEmitter::kValidationOptionIntermediate);
 
 	// generate an entry point
 	m_entry = (x86_entry_point_func)dst;
-	emit_push_r64(dst, REG_RBX);                                                        // push  rbx
-	emit_push_r64(dst, REG_RSI);                                                        // push  rsi
-	emit_push_r64(dst, REG_RDI);                                                        // push  rdi
-	emit_push_r64(dst, REG_RBP);                                                        // push  rbp
-	emit_push_r64(dst, REG_R12);                                                        // push  r12
-	emit_push_r64(dst, REG_R13);                                                        // push  r13
-	emit_push_r64(dst, REG_R14);                                                        // push  r14
-	emit_push_r64(dst, REG_R15);                                                        // push  r15
-	emit_mov_r64_r64(dst, REG_RBP, REG_PARAM1);                                         // mov   rbp,param1
-	emit_sub_r64_imm(dst, REG_RSP, 32);                                                 // sub   rsp,32
-	emit_mov_m64_r64(dst, MABS(&m_near.hashstacksave), REG_RSP);                        // mov   [hashstacksave],rsp
-	emit_sub_r64_imm(dst, REG_RSP, 8);                                                  // sub   rsp,8
-	emit_mov_m64_r64(dst, MABS(&m_near.stacksave), REG_RSP);                            // mov   [stacksave],rsp
-	emit_stmxcsr_m32(dst, MABS(&m_near.ssemode));                                       // stmxcsr [ssemode]
-	emit_jmp_r64(dst, REG_PARAM2);                                                      // jmp   param2
-	if (m_log != nullptr)
-		x86log_disasm_code_range(m_log, "entry_point", (x86code *)m_entry, dst);
+	a.bind(a.newNamedLabel("entry_point"));
+
+	FuncDetail entry_point;
+	entry_point.init(FuncSignatureT<uint32_t, uint8_t *, x86code *>(CallConv::kIdHost), hostEnvironment());
+
+	FuncFrame frame;
+	frame.init(entry_point);
+	frame.addDirtyRegs(rbx, rbp, rsi, rdi, r12, r13, r14, r15);
+	FuncArgsAssignment args(&entry_point);
+	args.assignAll(rbp);
+	args.updateFuncFrame(frame);
+	frame.finalize();
+
+	a.emitProlog(frame);
+	a.emitArgsAssignment(frame, args);
+
+	a.sub(rsp, 32);
+	a.mov(MABS(&m_near.hashstacksave), rsp);
+	a.sub(rsp, 8);
+	a.mov(MABS(&m_near.stacksave), rsp);
+	a.stmxcsr(MABS(&m_near.ssemode));
+	a.jmp(Gpq(REG_PARAM2));
 
 	// generate an exit point
-	m_exit = dst;
-	emit_ldmxcsr_m32(dst, MABS(&m_near.ssemode));                                       // ldmxcsr [ssemode]
-	emit_mov_r64_m64(dst, REG_RSP, MABS(&m_near.hashstacksave));                        // mov   rsp,[hashstacksave]
-	emit_add_r64_imm(dst, REG_RSP, 32);                                                 // add   rsp,32
-	emit_pop_r64(dst, REG_R15);                                                         // pop   r15
-	emit_pop_r64(dst, REG_R14);                                                         // pop   r14
-	emit_pop_r64(dst, REG_R13);                                                         // pop   r13
-	emit_pop_r64(dst, REG_R12);                                                         // pop   r12
-	emit_pop_r64(dst, REG_RBP);                                                         // pop   rbp
-	emit_pop_r64(dst, REG_RDI);                                                         // pop   rdi
-	emit_pop_r64(dst, REG_RSI);                                                         // pop   rsi
-	emit_pop_r64(dst, REG_RBX);                                                         // pop   rbx
-	emit_ret(dst);                                                                      // ret
-	if (m_log != nullptr)
-		x86log_disasm_code_range(m_log, "exit_point", m_exit, dst);
+	m_exit = dst + a.offset();
+	a.bind(a.newNamedLabel("exit_point"));
+	a.ldmxcsr(MABS(&m_near.ssemode));
+	a.mov(rsp, MABS(&m_near.hashstacksave));
+	a.add(rsp, 32);
+	a.emitEpilog(frame);
 
 	// generate a no code point
-	m_nocode = dst;
-	emit_ret(dst);                                                                      // ret
-	if (m_log != nullptr)
-		x86log_disasm_code_range(m_log, "nocode", m_nocode, dst);
+	m_nocode = dst + a.offset();
+	a.bind(a.newNamedLabel("nocode_point"));
+	a.ret();
 
-	// finish up codegen
-	*cachetop = (drccodeptr)dst;
-	m_cache.end_codegen();
+	// emit the generated code
+	size_t bytes = emit(ch);
+
+	if (m_log != nullptr)
+	{
+		x86log_disasm_code_range(m_log, "entry_point", dst, m_exit);
+		x86log_disasm_code_range(m_log, "exit_point", m_exit, m_nocode);
+		x86log_disasm_code_range(m_log, "nocode_point", m_nocode, dst + bytes);
+	}
 
 	// reset our hash tables
 	m_hash.reset();
@@ -811,56 +839,71 @@
 {
 	// tell all of our utility objects that a block is beginning
 	m_hash.block_begin(block, instlist, numinst);
-	m_labels.block_begin(block);
 	m_map.block_begin(block);
 
-	// begin codegen; fail if we can't
-	drccodeptr *cachetop = m_cache.begin_codegen(numinst * 8 * 4);
-	if (cachetop == nullptr)
-		block.abort();
-
 	// compute the base by aligning the cache top to a cache line (assumed to be 64 bytes)
-	x86code *base = (x86code *)(((uintptr_t)*cachetop + 63) & ~63);
-	x86code *dst = base;
+	x86code *dst = (x86code *)(uint64_t(m_cache.top() + 63) & ~63);
+
+	CodeHolder ch;
+	ch.init(hostEnvironment(), uint64_t(dst));
+	ThrowableErrorHandler e;
+	ch.setErrorHandler(&e);
+
+	FileLogger logger(m_log_asmjit);
+	if (logger.file())
+	{
+		logger.setFlags(FormatOptions::Flags::kFlagHexOffsets | FormatOptions::Flags::kFlagHexImms | FormatOptions::Flags::kFlagMachineCode);
+		logger.setIndentation(FormatOptions::IndentationType::kIndentationCode, 4);
+		ch.setLogger(&logger);
+	}
+
+	Assembler a(&ch);
+	if (logger.file())
+		a.addValidationOptions(BaseEmitter::kValidationOptionIntermediate);
 
 	// generate code
-	const char *blockname = nullptr;
+	std::string blockname;
 	for (int inum = 0; inum < numinst; inum++)
 	{
 		const instruction &inst = instlist[inum];
 		assert(inst.opcode() < ARRAY_LENGTH(s_opcode_table));
 
+		// must remain in scope until output
+		std::string dasm;
+
 		// add a comment
 		if (m_log != nullptr)
 		{
-			std::string dasm = inst.disasm(&m_drcuml);
-			x86log_add_comment(m_log, dst, "%s", dasm.c_str());
+			dasm = inst.disasm(&m_drcuml);
+
+			x86log_add_comment(m_log, dst + a.offset(), "%s", dasm.c_str());
+			a.setInlineComment(dasm.c_str());
 		}
 
 		// extract a blockname
-		if (blockname == nullptr)
+		if (blockname.empty())
 		{
 			if (inst.opcode() == OP_HANDLE)
 				blockname = inst.param(0).handle().string();
 			else if (inst.opcode() == OP_HASH)
-				blockname = string_format("Code: mode=%d PC=%08X", (uint32_t)inst.param(0).immediate(), (offs_t)inst.param(1).immediate()).c_str();
+				blockname = string_format("Code: mode=%d PC=%08X", (uint32_t)inst.param(0).immediate(), (offs_t)inst.param(1).immediate());
 		}
 
 		// generate code
-		(this->*s_opcode_table[inst.opcode()])(dst, inst);
+		(this->*s_opcode_table[inst.opcode()])(a, inst);
 	}
 
-	// complete codegen
-	*cachetop = (drccodeptr)dst;
-	m_cache.end_codegen();
+	// emit the generated code
+	size_t const bytes = emit(ch);
+	if (!bytes)
+		block.abort();
 
 	// log it
 	if (m_log != nullptr)
-		x86log_disasm_code_range(m_log, (blockname == nullptr) ? "Unknown block" : blockname, base, m_cache.top());
+		x86log_disasm_code_range(m_log, (blockname.empty()) ? "Unknown block" : blockname.c_str(), dst, dst + bytes);
 
 	// tell all of our utility objects that the block is finished
 	m_hash.block_end(block);
-	m_labels.block_end(block);
 	m_map.block_end(block);
 }
 
@@ -891,4180 +934,1863 @@
 			break;
 }
 
-
-
-/***************************************************************************
-    EMITTERS FOR 32-BIT OPERATIONS WITH PARAMETERS
-***************************************************************************/
-
-//-------------------------------------------------
-//  emit_mov_r32_p32 - move a 32-bit parameter
-//  into a register
-//-------------------------------------------------
-
-void drcbe_x64::emit_mov_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param)
+void drcbe_x64::alu_op_param(Assembler &a, Inst::Id const opcode, Operand const &dst, be_parameter const &param, std::function<bool(Assembler &a, Operand const &dst, be_parameter const &src)> optimize)
 {
+	bool const is64 = dst.size() == 8;
+	u32 const rs = is64 ? Gpq::kSignature : Gpd::kSignature;
+
 	if (param.is_immediate())
 	{
-		if (param.immediate() == 0)
-			emit_xor_r32_r32(dst, reg, reg);                                            // xor   reg,reg
-		else
-			emit_mov_r32_imm(dst, reg, param.immediate());                              // mov   reg,param
+		if (!optimize(a, dst, param))
+		{
+			if (is64 && !short_immediate(param.immediate()))
+			{
+				// use scratch register for 64-bit immediate
+				a.mov(r11, param.immediate());                                          // mov   r11,param
+				a.emit(opcode, dst, r11);                                               // op    dst,r11
+			}
+			else
+				a.emit(opcode, dst, param.immediate());                                 // op    dst,param
+		}
 	}
 	else if (param.is_memory())
-		emit_mov_r32_m32(dst, reg, MABS(param.memory()));                               // mov   reg,[param]
+	{
+		if (dst.isMem())
+		{
+			// use temporary register for memory,memory
+			Gp const reg = param.select_register(is64 ? rax : eax);
+
+			a.mov(reg, MABS(param.memory()));                                           // mov   reg,param
+			a.emit(opcode, dst, reg);                                                   // op    [dst],reg
+		}
+		else if (opcode != Inst::kIdTest)
+			// most instructions are register,memory
+			a.emit(opcode, dst, MABS(param.memory()));                                  // op    dst,[param]
+		else
+			// test instruction requires memory,register
+			a.emit(opcode, MABS(param.memory()), dst);                                  // op    [param],dst
+	}
 	else if (param.is_int_register())
 	{
-		if (reg != param.ireg())
-			emit_mov_r32_r32(dst, reg, param.ireg());                                   // mov   reg,param
+		Gp const src = Gp(rs, param.ireg());
+
+		a.emit(opcode, dst, src);                                                       // op    dst,param
 	}
 }
 
+void drcbe_x64::shift_op_param(Assembler &a, Inst::Id const opcode, Operand const &dst, be_parameter const &param)
+{
+	Operand shift = cl;
+	if (param.is_immediate())
+		shift = imm(param.immediate());
+	else
+		mov_reg_param(a, ecx, param);
 
-//-------------------------------------------------
-//  emit_movsx_r64_p32 - move a 32-bit parameter
-//  sign-extended into a register
-//-------------------------------------------------
+	a.emit(opcode, dst, shift);
+}
 
-void drcbe_x64::emit_movsx_r64_p32(x86code *&dst, uint8_t reg, const be_parameter &param)
+void drcbe_x64::mov_reg_param(Assembler &a, Gp const &reg, be_parameter const &param, bool const keepflags)
 {
 	if (param.is_immediate())
 	{
-		if (param.immediate() == 0)
-			emit_xor_r32_r32(dst, reg, reg);                                            // xor   reg,reg
-		else if ((int32_t)param.immediate() >= 0)
-			emit_mov_r32_imm(dst, reg, param.immediate());                              // mov   reg,param
+		if (param.immediate() == 0 && !keepflags)
+			a.xor_(reg.r32(), reg.r32());                                               // xor   reg,reg
+		else if (reg.isGpq())
+			mov_r64_imm(a, reg, param.immediate());
 		else
-			emit_mov_r64_imm(dst, reg, (int32_t)param.immediate());                       // mov   reg,param
+			a.mov(reg, param.immediate());                                              // mov   reg,param
 	}
 	else if (param.is_memory())
-		emit_movsxd_r64_m32(dst, reg, MABS(param.memory()));                            // movsxd reg,[param]
+		a.mov(reg, MABS(param.memory()));                                               // mov   reg,[param]
 	else if (param.is_int_register())
-		emit_movsxd_r64_r32(dst, reg, param.ireg());                                    // movsdx reg,param
+	{
+		if (reg.id() != param.ireg())
+			a.mov(reg, Gp(reg, param.ireg()));                                          // mov   reg,param
+	}
 }
 
+void drcbe_x64::mov_param_reg(Assembler &a, be_parameter const &param, Gp const &reg)
+{
+	assert(!param.is_immediate());
 
-//-------------------------------------------------
-//  emit_mov_r32_p32_keepflags - move a 32-bit
-//  parameter into a register without affecting
-//  any flags
-//-------------------------------------------------
+	if (param.is_memory())
+		a.mov(MABS(param.memory()), reg);                                               // mov   [param],reg
+	else if (param.is_int_register())
+	{
+		if (reg.id() != param.ireg())
+			a.mov(Gp(reg, param.ireg()), reg);                                          // mov   param,reg
+	}
+}
 
-void drcbe_x64::emit_mov_r32_p32_keepflags(x86code *&dst, uint8_t reg, const be_parameter &param)
+void drcbe_x64::mov_mem_param(Assembler &a, Mem const &mem, be_parameter const &param)
 {
+	bool const is64 = mem.size() == 8;
+	u32 const rs = is64 ? Gpq::kSignature : Gpd::kSignature;
+
 	if (param.is_immediate())
-		emit_mov_r32_imm(dst, reg, param.immediate());                                  // mov   reg,param
+	{
+		if (is64 && !short_immediate(param.immediate()))
+		{
+			Gp const tmp = Gp(rs, Gp::kIdAx);
+
+			a.mov(tmp, param.immediate());                                              // mov   tmp,param
+			a.mov(mem, tmp);                                                            // mov   [mem],tmp
+		}
+		else
+			a.mov(mem, param.immediate());                                              // mov   [mem],param
+	}
 	else if (param.is_memory())
-		emit_mov_r32_m32(dst, reg, MABS(param.memory()));                               // mov   reg,[param]
+	{
+		Gp const tmp = Gp(rs, Gp::kIdAx);
+
+		a.mov(tmp, MABS(param.memory()));                                               // mov   tmp,[param]
+		a.mov(mem, tmp);                                                                // mov   [mem],tmp
+	}
 	else if (param.is_int_register())
 	{
-		if (reg != param.ireg())
-			emit_mov_r32_r32(dst, reg, param.ireg());                                   // mov   reg,param
+		Gp const src = Gp(rs, param.ireg());
+
+		a.mov(mem, src);                                                                // mov   [mem],param
 	}
 }
 
-
-//-------------------------------------------------
-//  emit_mov_m32_p32 - move a 32-bit parameter
-//  into a memory location
-//-------------------------------------------------
-
-void drcbe_x64::emit_mov_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param)
+void drcbe_x64::movsx_r64_p32(Assembler &a, Gp const &reg, be_parameter const &param)
 {
 	if (param.is_immediate())
-		emit_mov_m32_imm(dst, memref, param.immediate());                           // mov   [mem],param
-	else if (param.is_memory())
 	{
-		emit_mov_r32_m32(dst, REG_EAX, MABS(param.memory()));                           // mov   eax,[param]
-		emit_mov_m32_r32(dst, memref, REG_EAX);                                     // mov   [mem],eax
+		if (param.immediate() == 0)
+			a.xor_(reg.r32(), reg.r32());                                               // xor   reg,reg
+		else if ((int32_t)param.immediate() >= 0)
+			a.mov(reg.r32(), param.immediate());                                        // mov   reg,param
+		else
+			mov_r64_imm(a, reg, int32_t(param.immediate()));                            // mov   reg,param
 	}
+	else if (param.is_memory())
+		a.movsxd(reg, MABS(param.memory()));                                            // movsxd reg,[param]
 	else if (param.is_int_register())
-		emit_mov_m32_r32(dst, memref, param.ireg());                                    // mov   [mem],param
+		a.movsxd(reg, Gpd(param.ireg()));                                               // movsxd reg,param
+}
+
+void drcbe_x64::mov_r64_imm(Assembler &a, Gp const &reg, uint64_t const imm)
+{
+	if (u32(imm) == imm)
+		a.mov(reg.r32(), imm);
+	else if (s32(imm) == imm)
+		a.mov(reg.r64(), s32(imm));
+	else
+		a.mov(reg.r64(), imm);
 }
 
 
+/***************************************************************************
+    EMITTERS FOR FLOATING POINT OPERATIONS WITH PARAMETERS
+***************************************************************************/
+
 //-------------------------------------------------
-//  emit_mov_p32_r32 - move a register into a
-//  32-bit parameter
+//  movss_r128_p32 - move a 32-bit parameter
+//  into a register
 //-------------------------------------------------
 
-void drcbe_x64::emit_mov_p32_r32(x86code *&dst, const be_parameter &param, uint8_t reg)
+void drcbe_x64::movss_r128_p32(Assembler &a, Xmm const &reg, be_parameter const &param)
 {
 	assert(!param.is_immediate());
 	if (param.is_memory())
-		emit_mov_m32_r32(dst, MABS(param.memory()), reg);                               // mov   [param],reg
-	else if (param.is_int_register())
+		a.movss(reg, MABS(param.memory(), 4));                                          // movss reg,[param]
+	else if (param.is_float_register())
 	{
-		if (reg != param.ireg())
-			emit_mov_r32_r32(dst, param.ireg(), reg);                                   // mov   param,reg
+		if (reg.id() != param.freg())
+			a.movss(reg, Xmm(param.freg()));                                            // movss reg,param
 	}
 }
 
 
 //-------------------------------------------------
-//  emit_add_r32_p32 - add operation to a 32-bit
-//  register from a 32-bit parameter
+//  movss_p32_r128 - move a register into a
+//  32-bit parameter
 //-------------------------------------------------
 
-void drcbe_x64::emit_add_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
+void drcbe_x64::movss_p32_r128(Assembler &a, be_parameter const &param, Xmm const &reg)
 {
-	if (param.is_immediate())
+	assert(!param.is_immediate());
+	if (param.is_memory())
+		a.movss(MABS(param.memory(), 4), reg);                                          // movss [param],reg
+	else if (param.is_float_register())
 	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-			emit_add_r32_imm(dst, reg, param.immediate());                              // add   reg,param
+		if (reg.id() != param.freg())
+			a.movss(Xmm(param.freg()), reg);                                            // movss param,reg
 	}
-	else if (param.is_memory())
-		emit_add_r32_m32(dst, reg, MABS(param.memory()));                               // add   reg,[param]
-	else if (param.is_int_register())
-		emit_add_r32_r32(dst, reg, param.ireg());                                       // add   reg,param
 }
 
 
 //-------------------------------------------------
-//  emit_add_m32_p32 - add operation to a 32-bit
-//  memory location from a 32-bit parameter
+//  movsd_r128_p64 - move a 64-bit parameter
+//  into a register
 //-------------------------------------------------
 
-void drcbe_x64::emit_add_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x64::movsd_r128_p64(Assembler &a, Xmm const &reg, be_parameter const &param)
 {
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-			emit_add_m32_imm(dst, memref, param.immediate());                       // add   [dest],param
-	}
-	else
+	assert(!param.is_immediate());
+	if (param.is_memory())
+		a.movsd(reg, MABS(param.memory(), 8));                                          // movsd reg,[param]
+	else if (param.is_float_register())
 	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32(dst, reg, param);                                              // mov   reg,param
-		emit_add_m32_r32(dst, memref, reg);                                         // add   [dest],reg
+		if (reg.id() != param.freg())
+			a.movsd(reg, Xmm(param.freg()));                                            // movsd reg,param
 	}
 }
 
 
 //-------------------------------------------------
-//  emit_adc_r32_p32 - adc operation to a 32-bit
-//  register from a 32-bit parameter
+//  movsd_p64_r128 - move a register into a
+//  64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x64::emit_adc_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
+void drcbe_x64::movsd_p64_r128(Assembler &a, be_parameter const &param, Xmm const &reg)
 {
-	if (param.is_immediate())
-		emit_adc_r32_imm(dst, reg, param.immediate());                                  // adc   reg,param
-	else if (param.is_memory())
-		emit_adc_r32_m32(dst, reg, MABS(param.memory()));                               // adc   reg,[param]
-	else if (param.is_int_register())
-		emit_adc_r32_r32(dst, reg, param.ireg());                                       // adc   reg,param
+	assert(!param.is_immediate());
+	if (param.is_memory())
+		a.movsd(MABS(param.memory(), 8), reg);                                          // movsd [param],reg
+	else if (param.is_float_register())
+	{
+		if (reg.id() != param.freg())
+			a.movsd(Xmm(param.freg()), reg);                                            // movsd param,reg
+	}
 }
 
 
+//**************************************************************************
+//  DEBUG HELPERS
+//**************************************************************************
+
 //-------------------------------------------------
-//  emit_adc_m32_p32 - adc operation to a 32-bit
-//  memory location from a 32-bit parameter
+//  debug_log_hashjmp - callback to handle
+//  logging of hashjmps
 //-------------------------------------------------
 
-void drcbe_x64::emit_adc_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x64::debug_log_hashjmp(offs_t pc, int mode)
 {
-	if (param.is_immediate())
-		emit_adc_m32_imm(dst, memref, param.immediate());                           // adc   [dest],param
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32_keepflags(dst, reg, param);                                    // mov   reg,param
-		emit_adc_m32_r32(dst, memref, reg);                                         // adc   [dest],reg
-	}
+	printf("mode=%d PC=%08X\n", mode, pc);
 }
 
 
 //-------------------------------------------------
-//  emit_sub_r32_p32 - sub operation to a 32-bit
-//  register from a 32-bit parameter
+//  debug_log_hashjmp - callback to handle
+//  logging of hashjmps
 //-------------------------------------------------
 
-void drcbe_x64::emit_sub_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
+void drcbe_x64::debug_log_hashjmp_fail()
 {
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-			emit_sub_r32_imm(dst, reg, param.immediate());                              // sub   reg,param
-	}
-	else if (param.is_memory())
-		emit_sub_r32_m32(dst, reg, MABS(param.memory()));                               // sub   reg,[param]
-	else if (param.is_int_register())
-		emit_sub_r32_r32(dst, reg, param.ireg());                                       // sub   reg,param
+	printf("  (FAIL)\n");
 }
 
 
+/***************************************************************************
+    COMPILE-TIME OPCODES
+***************************************************************************/
+
 //-------------------------------------------------
-//  emit_sub_m32_p32 - sub operation to a 32-bit
-//  memory location from a 32-bit parameter
+//  op_handle - process a HANDLE opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_sub_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_handle(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-			emit_sub_m32_imm(dst, memref, param.immediate());                       // sub   [dest],param
-	}
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32(dst, reg, param);                                              // mov   reg,param
-		emit_sub_m32_r32(dst, memref, reg);                                         // sub   [dest],reg
-	}
+	assert_no_condition(inst);
+	assert_no_flags(inst);
+	assert(inst.numparams() == 1);
+	assert(inst.param(0).is_code_handle());
+
+	// make a label for documentation
+	Label handle = a.newNamedLabel(inst.param(0).handle().string());
+	a.bind(handle);
+
+	// emit a jump around the stack adjust in case code falls through here
+	Label skip = a.newLabel();
+	a.short_().jmp(skip);                                                               // jmp   skip
+
+	// register the current pointer for the handle
+	inst.param(0).handle().set_codeptr(drccodeptr(a.code()->baseAddress() + a.offset()));
+
+	// by default, the handle points to prolog code that moves the stack pointer
+	a.lea(rsp, ptr(rsp, -40));                                                          // lea   rsp,[rsp-40]
+	a.bind(skip);                                                                   // skip:
 }
 
 
 //-------------------------------------------------
-//  emit_sbb_r32_p32 - sbb operation to a 32-bit
-//  register from a 32-bit parameter
+//  op_hash - process a HASH opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_sbb_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_hash(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-		emit_sbb_r32_imm(dst, reg, param.immediate());                                  // sbb   reg,param
-	else if (param.is_memory())
-		emit_sbb_r32_m32(dst, reg, MABS(param.memory()));                               // sbb   reg,[param]
-	else if (param.is_int_register())
-		emit_sbb_r32_r32(dst, reg, param.ireg());                                       // sbb   reg,param
+	assert_no_condition(inst);
+	assert_no_flags(inst);
+	assert(inst.numparams() == 2);
+	assert(inst.param(0).is_immediate());
+	assert(inst.param(1).is_immediate());
+
+	// register the current pointer for the mode/PC
+	m_hash.set_codeptr(inst.param(0).immediate(), inst.param(1).immediate(), drccodeptr(a.code()->baseAddress() + a.offset()));
 }
 
 
 //-------------------------------------------------
-//  emit_sbb_m32_p32 - sbb operation to a 32-bit
-//  memory location from a 32-bit parameter
+//  op_label - process a LABEL opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_sbb_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_label(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-		emit_sbb_m32_imm(dst, memref, param.immediate());                           // sbb   [dest],param
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32_keepflags(dst, reg, param);                                    // mov   reg,param
-		emit_sbb_m32_r32(dst, memref, reg);                                         // sbb   [dest],reg
-	}
+	assert_no_condition(inst);
+	assert_no_flags(inst);
+	assert(inst.numparams() == 1);
+	assert(inst.param(0).is_code_label());
+
+	std::string labelName = util::string_format("PC$%x", inst.param(0).label());
+	Label label = a.labelByName(labelName.c_str());
+	if (!label.isValid())
+		label = a.newNamedLabel(labelName.c_str());
+
+	// register the current pointer for the label
+	a.bind(label);
 }
 
 
 //-------------------------------------------------
-//  emit_cmp_r32_p32 - cmp operation to a 32-bit
-//  register from a 32-bit parameter
+//  op_comment - process a COMMENT opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_cmp_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_comment(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-		emit_cmp_r32_imm(dst, reg, param.immediate());                                  // cmp   reg,param
-	else if (param.is_memory())
-		emit_cmp_r32_m32(dst, reg, MABS(param.memory()));                               // cmp   reg,[param]
-	else if (param.is_int_register())
-		emit_cmp_r32_r32(dst, reg, param.ireg());                                       // cmp   reg,param
+	assert_no_condition(inst);
+	assert_no_flags(inst);
+	assert(inst.numparams() == 1);
+	assert(inst.param(0).is_string());
+
+	// do nothing
 }
 
 
 //-------------------------------------------------
-//  emit_cmp_m32_p32 - cmp operation to a 32-bit
-//  memory location from a 32-bit parameter
+//  op_mapvar - process a MAPVAR opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_cmp_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_mapvar(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-		emit_cmp_m32_imm(dst, memref, param.immediate());                           // cmp   [dest],param
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32(dst, reg, param);                                              // mov   reg,param
-		emit_cmp_m32_r32(dst, memref, reg);                                         // cmp   [dest],reg
-	}
+	assert_no_condition(inst);
+	assert_no_flags(inst);
+	assert(inst.numparams() == 2);
+	assert(inst.param(0).is_mapvar());
+	assert(inst.param(1).is_immediate());
+
+	// set the value of the specified mapvar
+	m_map.set_value(drccodeptr(a.code()->baseAddress() + a.offset()), inst.param(0).mapvar(), inst.param(1).immediate());
 }
 
 
+
+/***************************************************************************
+    CONTROL FLOW OPCODES
+***************************************************************************/
+
 //-------------------------------------------------
-//  emit_and_r32_p32 - and operation to a 32-bit
-//  register from a 32-bit parameter
+//  op_nop - process a NOP opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_and_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_nop(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			emit_xor_r32_r32(dst, reg, reg);                                            // xor   reg,reg
-		else
-			emit_and_r32_imm(dst, reg, param.immediate());                              // and   reg,param
-	}
-	else if (param.is_memory())
-		emit_and_r32_m32(dst, reg, MABS(param.memory()));                               // and   reg,[param]
-	else if (param.is_int_register())
-		emit_and_r32_r32(dst, reg, param.ireg());                                       // and   reg,param
+	// nothing
 }
 
 
 //-------------------------------------------------
-//  emit_and_m32_p32 - and operation to a 32-bit
-//  memory location from a 32-bit parameter
+//  op_debug - process a DEBUG opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_and_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_debug(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			emit_mov_m32_imm(dst, memref, 0);                                       // mov   [dest],0
-		else
-			emit_and_m32_imm(dst, memref, param.immediate());                       // and   [dest],param
-	}
-	else
+	// validate instruction
+	assert(inst.size() == 4);
+	assert_no_condition(inst);
+	assert_no_flags(inst);
+
+	if ((m_device.machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
 	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32(dst, reg, param);                                              // mov   reg,param
-		emit_and_m32_r32(dst, memref, reg);                                         // and   [dest],reg
+		// normalize parameters
+		be_parameter pcp(*this, inst.param(0), PTYPE_MRI);
+
+		// test and branch
+		mov_r64_imm(a, rax, (uintptr_t)&m_device.machine().debug_flags);                // mov   rax,&debug_flags
+		a.test(dword_ptr(rax), DEBUG_FLAG_CALL_HOOK);                                   // test  [debug_flags],DEBUG_FLAG_CALL_HOOK
+		Label skip = a.newLabel();
+		a.short_().jz(skip);
+
+		// push the parameter
+		mov_r64_imm(a, Gpq(REG_PARAM1), (uintptr_t)m_device.debug());                   // mov   param1,device.debug
+		mov_reg_param(a, Gpd(REG_PARAM2), pcp);                                         // mov   param2,pcp
+		smart_call_m64(a, &m_near.debug_cpu_instruction_hook);                          // call  debug_cpu_instruction_hook
+
+		a.bind(skip);
 	}
 }
 
 
 //-------------------------------------------------
-//  emit_test_r32_p32 - test operation to a 32-bit
-//  register from a 32-bit parameter
+//  op_exit - process an EXIT opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_test_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_exit(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-		emit_test_r32_imm(dst, reg, param.immediate());                                 // test   reg,param
-	else if (param.is_memory())
-		emit_test_m32_r32(dst, MABS(param.memory()), reg);                              // test   [param],reg
-	else if (param.is_int_register())
-		emit_test_r32_r32(dst, reg, param.ireg());                                      // test   reg,param
+	// validate instruction
+	assert(inst.size() == 4);
+	assert_any_condition(inst);
+	assert_no_flags(inst);
+
+	// normalize parameters
+	be_parameter retp(*this, inst.param(0), PTYPE_MRI);
+
+	// load the parameter into EAX
+	mov_reg_param(a, eax, retp);                                                        // mov   eax,retp
+	if (inst.condition() == uml::COND_ALWAYS)
+		a.jmp(imm(m_exit));                                                             // jmp   exit
+	else
+		a.j(X86_CONDITION(inst.condition()), imm(m_exit));                              // jcc   exit
 }
 
 
 //-------------------------------------------------
-//  emit_test_m32_p32 - test operation to a 32-bit
-//  memory location from a 32-bit parameter
+//  op_hashjmp - process a HASHJMP opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_test_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_hashjmp(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-		emit_test_m32_imm(dst, memref, param.immediate());                          // test  [dest],param
-	else if (param.is_memory())
+	// validate instruction
+	assert(inst.size() == 4);
+	assert_no_condition(inst);
+	assert_no_flags(inst);
+
+	// normalize parameters
+	be_parameter modep(*this, inst.param(0), PTYPE_MRI);
+	be_parameter pcp(*this, inst.param(1), PTYPE_MRI);
+	const parameter &exp = inst.param(2);
+	assert(exp.is_code_handle());
+
+	if (LOG_HASHJMPS)
 	{
-		emit_mov_r32_p32(dst, REG_EAX, param);                                          // mov   reg,param
-		emit_test_m32_r32(dst, memref, REG_EAX);                                        // test  [dest],reg
+		mov_reg_param(a, Gpd(REG_PARAM1), pcp);
+		mov_reg_param(a, Gpd(REG_PARAM2), modep);
+		smart_call_m64(a, &m_near.debug_log_hashjmp);
 	}
-	else if (param.is_int_register())
-		emit_test_m32_r32(dst, memref, param.ireg());                               // test  [dest],param
-}
 
+	// load the stack base one word early so we end up at the right spot after our call below
+	a.mov(rsp, MABS(&m_near.hashstacksave));                                            // mov   rsp,[hashstacksave]
 
-//-------------------------------------------------
-//  emit_or_r32_p32 - or operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
+	// fixed mode cases
+	if (modep.is_immediate() && m_hash.is_mode_populated(modep.immediate()))
+	{
+		// a straight immediate jump is direct, though we need the PC in EAX in case of failure
+		if (pcp.is_immediate())
+		{
+			uint32_t l1val = (pcp.immediate() >> m_hash.l1shift()) & m_hash.l1mask();
+			uint32_t l2val = (pcp.immediate() >> m_hash.l2shift()) & m_hash.l2mask();
+			a.call(MABS(&m_hash.base()[modep.immediate()][l1val][l2val]));              // call  hash[modep][l1val][l2val]
+		}
 
-void drcbe_x64::emit_or_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
+		// a fixed mode but variable PC
+		else
+		{
+			mov_reg_param(a, eax, pcp);                                                 // mov   eax,pcp
+			a.mov(edx, eax);                                                            // mov   edx,eax
+			a.shr(edx, m_hash.l1shift());                                               // shr   edx,l1shift
+			a.and_(eax, m_hash.l2mask() << m_hash.l2shift());                           // and  eax,l2mask << l2shift
+			a.mov(rdx, ptr(rbp, rdx, 3, offset_from_rbp(&m_hash.base()[modep.immediate()][0])));
+																						// mov   rdx,hash[modep+edx*8]
+			a.call(ptr(rdx, rax, 3 - m_hash.l2shift()));                                // call  [rdx+rax*shift]
+		}
+	}
+	else
 	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			emit_mov_r32_imm(dst, reg, 0xffffffff);                                     // mov  reg,-1
+		// variable mode
+		Gp modereg = modep.select_register(ecx);
+		mov_reg_param(a, modereg, modep);                                               // mov   modereg,modep
+		a.mov(rcx, ptr(rbp, modereg, 3, offset_from_rbp(m_hash.base())));               // mov   rcx,hash[modereg*8]
+
+		// fixed PC
+		if (pcp.is_immediate())
+		{
+			uint32_t l1val = (pcp.immediate() >> m_hash.l1shift()) & m_hash.l1mask();
+			uint32_t l2val = (pcp.immediate() >> m_hash.l2shift()) & m_hash.l2mask();
+			a.mov(rdx, ptr(rcx, l1val * 8));                                            // mov   rdx,[rcx+l1val*8]
+			a.call(ptr(rdx, l2val * 8));                                                // call  [l2val*8]
+		}
+
+		// variable PC
 		else
-			emit_or_r32_imm(dst, reg, param.immediate());                               // or   reg,param
+		{
+			mov_reg_param(a, eax, pcp);                                                 // mov   eax,pcp
+			a.mov(edx, eax);                                                            // mov   edx,eax
+			a.shr(edx, m_hash.l1shift());                                               // shr   edx,l1shift
+			a.mov(rdx, ptr(rcx, rdx, 3));                                               // mov   rdx,[rcx+rdx*8]
+			a.and_(eax, m_hash.l2mask() << m_hash.l2shift());                           // and   eax,l2mask << l2shift
+			a.call(ptr(rdx, rax, 3 - m_hash.l2shift()));                                // call  [rdx+rax*shift]
+		}
 	}
-	else if (param.is_memory())
-		emit_or_r32_m32(dst, reg, MABS(param.memory()));                                // or   reg,[param]
-	else if (param.is_int_register())
-		emit_or_r32_r32(dst, reg, param.ireg());                                        // or   reg,param
+
+	// in all cases, if there is no code, we return here to generate the exception
+	if (LOG_HASHJMPS)
+		smart_call_m64(a, &m_near.debug_log_hashjmp_fail);
+
+	mov_mem_param(a, MABS(&m_state.exp, 4), pcp);                                       // mov   [exp],param
+	a.sub(rsp, 8);                                                                      // sub   rsp,8
+	a.call(MABS(exp.handle().codeptr_addr()));                                          // call  [exp]
 }
 
 
 //-------------------------------------------------
-//  emit_or_m32_p32 - or operation to a 32-bit
-//  memory location from a 32-bit parameter
+//  op_jmp - process a JMP opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_or_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_jmp(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			emit_mov_m32_imm(dst, memref, 0xffffffff);                                  // mov   [dest],-1
-		else
-			emit_or_m32_imm(dst, memref, param.immediate());                            // or   [dest],param
-	}
+	// validate instruction
+	assert(inst.size() == 4);
+	assert_any_condition(inst);
+	assert_no_flags(inst);
+
+	// normalize parameters
+	const parameter &labelp = inst.param(0);
+	assert(labelp.is_code_label());
+
+	std::string labelName = util::string_format("PC$%x", labelp.label());
+	Label jmptarget = a.labelByName(labelName.c_str());
+	if (!jmptarget.isValid())
+		jmptarget = a.newNamedLabel(labelName.c_str());
+
+	if (inst.condition() == uml::COND_ALWAYS)
+		a.jmp(jmptarget);                                                               // jmp   target
 	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32(dst, reg, param);                                              // mov   reg,param
-		emit_or_m32_r32(dst, memref, reg);                                          // or   [dest],reg
-	}
+		a.j(X86_CONDITION(inst.condition()), jmptarget);                                // jcc   target
 }
 
 
 //-------------------------------------------------
-//  emit_xor_r32_p32 - xor operation to a 32-bit
-//  register from a 32-bit parameter
+//  op_exh - process an EXH opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_xor_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_exh(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			emit_not_r32(dst, reg);                                                     // not   reg
-		else
-			emit_xor_r32_imm(dst, reg, param.immediate());                              // xor   reg,param
-	}
-	else if (param.is_memory())
-		emit_xor_r32_m32(dst, reg, MABS(param.memory()));                               // xor   reg,[param]
-	else if (param.is_int_register())
-		emit_xor_r32_r32(dst, reg, param.ireg());                                       // xor   reg,param
+	// validate instruction
+	assert(inst.size() == 4);
+	assert_any_condition(inst);
+	assert_no_flags(inst);
+
+	// normalize parameters
+	const parameter &handp = inst.param(0);
+	assert(handp.is_code_handle());
+	be_parameter exp(*this, inst.param(1), PTYPE_MRI);
+
+	// look up the handle target
+	drccodeptr *targetptr = handp.handle().codeptr_addr();
+
+	// perform the exception processing
+	Label no_exception = a.newLabel();
+	if (inst.condition() != uml::COND_ALWAYS)
+		a.short_().j(X86_NOT_CONDITION(inst.condition()), no_exception);                // jcc   no_exception
+	mov_mem_param(a, MABS(&m_state.exp, 4), exp);                                       // mov   [exp],exp
+	if (*targetptr != nullptr)
+		a.call(imm(*targetptr));                                                        // call  *targetptr
+	else
+		a.call(MABS(targetptr));                                                        // call  [targetptr]
+	if (inst.condition() != uml::COND_ALWAYS)
+		a.bind(no_exception);
 }
 
 
 //-------------------------------------------------
-//  emit_xor_m32_p32 - xor operation to a 32-bit
-//  memory location from a 32-bit parameter
+//  op_callh - process a CALLH opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_xor_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_callh(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			emit_not_m32(dst, memref);                                              // not   [dest]
-		else
-			emit_xor_m32_imm(dst, memref, param.immediate());                       // xor   [dest],param
-	}
+	// validate instruction
+	assert(inst.size() == 4);
+	assert_any_condition(inst);
+	assert_no_flags(inst);
+
+	// normalize parameters
+	const parameter &handp = inst.param(0);
+	assert(handp.is_code_handle());
+
+	// look up the handle target
+	drccodeptr *targetptr = handp.handle().codeptr_addr();
+
+	// skip if conditional
+	Label skip = a.newLabel();
+	if (inst.condition() != uml::COND_ALWAYS)
+		a.short_().j(X86_NOT_CONDITION(inst.condition()), skip);                        // jcc   skip
+
+	// jump through the handle; directly if a normal jump
+	if (*targetptr != nullptr)
+		a.call(imm(*targetptr));                                                        // call  *targetptr
 	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32(dst, reg, param);                                              // mov   reg,param
-		emit_xor_m32_r32(dst, memref, reg);                                         // xor   [dest],reg
-	}
+		a.call(MABS(targetptr));                                                        // call  [targetptr]
+
+	// resolve the conditional link
+	if (inst.condition() != uml::COND_ALWAYS)
+		a.bind(skip);                                                               // skip:
 }
 
 
 //-------------------------------------------------
-//  emit_shl_r32_p32 - shl operation to a 32-bit
-//  register from a 32-bit parameter
+//  op_ret - process a RET opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_shl_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_ret(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_shl_r32_imm(dst, reg, param.immediate());                              // shl   reg,param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                          // mov   ecx,param
-		emit_shl_r32_cl(dst, reg);                                                      // shl   reg,cl
-	}
+	// validate instruction
+	assert(inst.size() == 4);
+	assert_any_condition(inst);
+	assert_no_flags(inst);
+	assert(inst.numparams() == 0);
+
+	// skip if conditional
+	Label skip = a.newLabel();
+	if (inst.condition() != uml::COND_ALWAYS)
+		a.short_().j(X86_NOT_CONDITION(inst.condition()), skip);                        // jcc   skip
+
+	// return
+	a.lea(rsp, ptr(rsp, 40));                                                           // lea   rsp,[rsp+40]
+	a.ret();                                                                            // ret
+
+	// resolve the conditional link
+	if (inst.condition() != uml::COND_ALWAYS)
+		a.bind(skip);                                                               // skip:
 }
 
 
 //-------------------------------------------------
-//  emit_shl_m32_p32 - shl operation to a 32-bit
-//  memory location from a 32-bit parameter
+//  op_callc - process a CALLC opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_shl_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_callc(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_shl_m32_imm(dst, memref, param.immediate());                       // shl   [dest],param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                          // mov   ecx,param
-		emit_shl_m32_cl(dst, memref);                                               // shl   [dest],cl
-	}
+	// validate instruction
+	assert(inst.size() == 4);
+	assert_any_condition(inst);
+	assert_no_flags(inst);
+
+	// normalize parameters
+	const parameter &funcp = inst.param(0);
+	assert(funcp.is_c_function());
+	be_parameter paramp(*this, inst.param(1), PTYPE_M);
+
+	// skip if conditional
+	Label skip = a.newLabel();
+	if (inst.condition() != uml::COND_ALWAYS)
+		a.short_().j(X86_NOT_CONDITION(inst.condition()), skip);                        // jcc   skip
+
+	// perform the call
+	mov_r64_imm(a, Gpq(REG_PARAM1), (uintptr_t)paramp.memory());                        // mov   param1,paramp
+	smart_call_r64(a, (x86code *)(uintptr_t)funcp.cfunc(), rax);                        // call  funcp
+
+	// resolve the conditional link
+	if (inst.condition() != uml::COND_ALWAYS)
+		a.bind(skip);                                                               // skip:
 }
 
 
 //-------------------------------------------------
-//  emit_shr_r32_p32 - shr operation to a 32-bit
-//  register from a 32-bit parameter
+//  op_recover - process a RECOVER opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_shr_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_recover(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_shr_r32_imm(dst, reg, param.immediate());                              // shr   reg,param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                          // mov   ecx,param
-		emit_shr_r32_cl(dst, reg);                                                      // shr   reg,cl
-	}
+	// validate instruction
+	assert(inst.size() == 4);
+	assert_no_condition(inst);
+	assert_no_flags(inst);
+
+	// normalize parameters
+	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
+
+	// call the recovery code
+	a.mov(rax, MABS(&m_near.stacksave));                                                // mov   rax,stacksave
+	a.mov(rax, ptr(rax, -8));                                                           // mov   rax,[rax-8]
+	mov_r64_imm(a, Gpq(REG_PARAM1), (uintptr_t)&m_map);                                 // mov   param1,m_map
+	a.lea(Gpq(REG_PARAM2), ptr(rax, -1));                                               // lea   param2,[rax-1]
+	mov_r64_imm(a, Gpq(REG_PARAM3), inst.param(1).mapvar());                            // mov   param3,param[1].value
+	smart_call_m64(a, &m_near.drcmap_get_value);                                        // call  drcmap_get_value
+	mov_param_reg(a, dstp, eax);                                                        // mov   dstp,eax
 }
 
 
+
+/***************************************************************************
+    INTERNAL REGISTER OPCODES
+***************************************************************************/
+
 //-------------------------------------------------
-//  emit_shr_m32_p32 - shr operation to a 32-bit
-//  memory location from a 32-bit parameter
+//  op_setfmod - process a SETFMOD opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_shr_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_setfmod(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
+	// validate instruction
+	assert(inst.size() == 4);
+	assert_no_condition(inst);
+	assert_no_flags(inst);
+
+	// normalize parameters
+	be_parameter srcp(*this, inst.param(0), PTYPE_MRI);
+
+	// immediate case
+	if (srcp.is_immediate())
 	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_shr_m32_imm(dst, memref, param.immediate());                       // shr   [dest],param
+		int value = srcp.immediate() & 3;
+		a.mov(MABS(&m_state.fmod), value);                                              // mov   [fmod],srcp
+		a.ldmxcsr(MABS(&m_near.ssecontrol[value]));                                     // ldmxcsr fp_control[srcp]
 	}
+
+	// register/memory case
 	else
 	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                          // mov   ecx,param
-		emit_shr_m32_cl(dst, memref);                                               // shr   [dest],cl
+		mov_reg_param(a, eax, srcp);                                                    // mov   eax,srcp
+		a.and_(eax, 3);                                                                 // and   eax,3
+		a.mov(MABS(&m_state.fmod), al);                                                 // mov   [fmod],al
+		a.ldmxcsr(ptr(rbp, rax, 2, offset_from_rbp(&m_near.ssecontrol[0])));            // ldmxcsr fp_control[eax]
 	}
 }
 
 
 //-------------------------------------------------
-//  emit_sar_r32_p32 - sar operation to a 32-bit
-//  register from a 32-bit parameter
+//  op_getfmod - process a GETFMOD opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_sar_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
+void drcbe_x64::op_getfmod(Assembler &a, const instruction &inst)
 {
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_sar_r32_imm(dst, reg, param.immediate());                              // sar   reg,param
-	}
+	// validate instruction
+	assert(inst.size() == 4);
+	assert_no_condition(inst);
+	assert_no_flags(inst);
+
+	// normalize parameters
+	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
+
+	Mem fmod = MABS(&m_state.fmod);
+	fmod.setSize(1);
+
+	// fetch the current mode and store to the destination
+	if (dstp.is_int_register())
+		a.movzx(Gpd(dstp.ireg()), fmod);                                                // movzx reg,[fmod]
 	else
 	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                          // mov   ecx,param
-		emit_sar_r32_cl(dst, reg);                                                      // sar   reg,cl
+		a.movzx(eax, fmod);                                                             // movzx eax,[fmod]
+		a.mov(MABS(dstp.memory()), eax);                                                // mov   [dstp],eax
 	}
 }
 
 
 //-------------------------------------------------
-//  emit_sar_m32_p32 - sar operation to a 32-bit
-//  memory location from a 32-bit parameter
+//  op_getexp - process a GETEXP opcode
 //-------------------------------------------------
 
-void drcbe_x64::emit_sar_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_sar_m32_imm(dst, memref, param.immediate());                       // sar   [dest],param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                          // mov   ecx,param
-		emit_sar_m32_cl(dst, memref);                                               // sar   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rol_r32_p32 - rol operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_rol_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rol_r32_imm(dst, reg, param.immediate());                              // rol   reg,param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                          // mov   ecx,param
-		emit_rol_r32_cl(dst, reg);                                                      // rol   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rol_m32_p32 - rol operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_rol_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rol_m32_imm(dst, memref, param.immediate());                       // rol   [dest],param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                          // mov   ecx,param
-		emit_rol_m32_cl(dst, memref);                                               // rol   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_ror_r32_p32 - ror operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_ror_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_ror_r32_imm(dst, reg, param.immediate());                              // ror   reg,param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                          // mov   ecx,param
-		emit_ror_r32_cl(dst, reg);                                                      // ror   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_ror_m32_p32 - ror operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_ror_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_ror_m32_imm(dst, memref, param.immediate());                       // ror   [dest],param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                          // mov   ecx,param
-		emit_ror_m32_cl(dst, memref);                                               // ror   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rcl_r32_p32 - rcl operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_rcl_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rcl_r32_imm(dst, reg, param.immediate());                              // rcl   reg,param
-	}
-	else
-	{
-		emit_mov_r32_p32_keepflags(dst, REG_ECX, param);                                // mov   ecx,param
-		emit_rcl_r32_cl(dst, reg);                                                      // rcl   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rcl_m32_p32 - rcl operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_rcl_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rcl_m32_imm(dst, memref, param.immediate());                       // rcl   [dest],param
-	}
-	else
-	{
-		emit_mov_r32_p32_keepflags(dst, REG_ECX, param);                                // mov   ecx,param
-		emit_rcl_m32_cl(dst, memref);                                               // rcl   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rcr_r32_p32 - rcr operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_rcr_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rcr_r32_imm(dst, reg, param.immediate());                              // rcr   reg,param
-	}
-	else
-	{
-		emit_mov_r32_p32_keepflags(dst, REG_ECX, param);                                // mov   ecx,param
-		emit_rcr_r32_cl(dst, reg);                                                      // rcr   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rcr_m32_p32 - rcr operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_rcr_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rcr_m32_imm(dst, memref, param.immediate());                       // rcr   [dest],param
-	}
-	else
-	{
-		emit_mov_r32_p32_keepflags(dst, REG_ECX, param);                                // mov   ecx,param
-		emit_rcr_m32_cl(dst, memref);                                               // rcr   [dest],cl
-	}
-}
-
-
-
-/***************************************************************************
-    EMITTERS FOR 64-BIT OPERATIONS WITH PARAMETERS
-***************************************************************************/
-
-//-------------------------------------------------
-//  emit_mov_r64_p64 - move a 64-bit parameter
-//  into a register
-//-------------------------------------------------
-
-void drcbe_x64::emit_mov_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param)
-{
-	if (param.is_immediate())
-	{
-		if (param.immediate() == 0)
-			emit_xor_r32_r32(dst, reg, reg);                                            // xor   reg,reg
-		else
-			emit_mov_r64_imm(dst, reg, param.immediate());                              // mov   reg,param
-	}
-	else if (param.is_memory())
-		emit_mov_r64_m64(dst, reg, MABS(param.memory()));                               // mov   reg,[param]
-	else if (param.is_int_register())
-	{
-		if (reg != param.ireg())
-			emit_mov_r64_r64(dst, reg, param.ireg());                                   // mov   reg,param
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_mov_r64_p64_keepflags - move a 64-bit
-//  parameter into a register without affecting
-//  any flags
-//-------------------------------------------------
-
-void drcbe_x64::emit_mov_r64_p64_keepflags(x86code *&dst, uint8_t reg, const be_parameter &param)
-{
-	if (param.is_immediate())
-		emit_mov_r64_imm(dst, reg, param.immediate());                                  // mov   reg,param
-	else if (param.is_memory())
-		emit_mov_r64_m64(dst, reg, MABS(param.memory()));                               // mov   reg,[param]
-	else if (param.is_int_register())
-	{
-		if (reg != param.ireg())
-			emit_mov_r64_r64(dst, reg, param.ireg());                                   // mov   reg,param
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_mov_p64_r64 - move a registers into a
-//  64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_mov_p64_r64(x86code *&dst, const be_parameter &param, uint8_t reg)
-{
-	assert(!param.is_immediate());
-	if (param.is_memory())
-		emit_mov_m64_r64(dst, MABS(param.memory()), reg);                               // mov   [param],reg
-	else if (param.is_int_register())
-	{
-		if (reg != param.ireg())
-			emit_mov_r64_r64(dst, param.ireg(), reg);                                   // mov   param,reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_add_r64_p64 - add operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_add_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-		{
-			if (short_immediate(param.immediate()))
-				emit_add_r64_imm(dst, reg, param.immediate());                          // add   reg,param
-			else
-			{
-				emit_mov_r64_imm(dst, REG_R11, param.immediate());                      // mov   r11,param
-				emit_add_r64_r64(dst, reg, REG_R11);                                    // add   reg,r11
-			}
-		}
-	}
-	else if (param.is_memory())
-		emit_add_r64_m64(dst, reg, MABS(param.memory()));                               // add   reg,[param]
-	else if (param.is_int_register())
-		emit_add_r64_r64(dst, reg, param.ireg());                                       // add   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_add_m64_p64 - add operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_add_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-		{
-			if (short_immediate(param.immediate()))
-				emit_add_m64_imm(dst, memref, param.immediate());                   // add   [mem],param
-			else
-			{
-				emit_mov_r64_imm(dst, REG_R11, param.immediate());                      // mov   r11,param
-				emit_add_m64_r64(dst, memref, REG_R11);                             // add   [mem],r11
-			}
-		}
-	}
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r64_p64(dst, reg, param);                                              // mov   reg,param
-		emit_add_m64_r64(dst, memref, reg);                                         // add   [dest],reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_adc_r64_p64 - adc operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_adc_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (short_immediate(param.immediate()))
-			emit_adc_r64_imm(dst, reg, param.immediate());                              // adc   reg,param
-		else
-		{
-			emit_mov_r64_imm(dst, REG_R11, param.immediate());                          // mov   r11,param
-			emit_adc_r64_r64(dst, reg, REG_R11);                                        // adc   reg,r11
-		}
-	}
-	else if (param.is_memory())
-		emit_adc_r64_m64(dst, reg, MABS(param.memory()));                               // adc   reg,[param]
-	else if (param.is_int_register())
-		emit_adc_r64_r64(dst, reg, param.ireg());                                       // adc   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_adc_m64_p64 - adc operation to a 64-bit
-//  memory locaiton from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_adc_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate() && short_immediate(param.immediate()))
-		emit_adc_m64_imm(dst, memref, param.immediate());                           // adc   [mem],param
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r64_p64_keepflags(dst, reg, param);                                // mov   reg,param
-		emit_adc_m64_r64(dst, memref, reg);                                         // adc   [dest],reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_sub_r64_p64 - sub operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_sub_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-		{
-			if (short_immediate(param.immediate()))
-				emit_sub_r64_imm(dst, reg, param.immediate());                          // sub   reg,param
-			else
-			{
-				emit_mov_r64_imm(dst, REG_R11, param.immediate());                      // mov   r11,param
-				emit_sub_r64_r64(dst, reg, REG_R11);                                    // sub   reg,r11
-			}
-		}
-	}
-	else if (param.is_memory())
-		emit_sub_r64_m64(dst, reg, MABS(param.memory()));                               // sub   reg,[param]
-	else if (param.is_int_register())
-		emit_sub_r64_r64(dst, reg, param.ireg());                                       // sub   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_sub_m64_p64 - sub operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_sub_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-		{
-			if (short_immediate(param.immediate()))
-				emit_sub_m64_imm(dst, memref, param.immediate());                   // sub   [mem],param
-			else
-			{
-				emit_mov_r64_imm(dst, REG_R11, param.immediate());                      // mov   r11,param
-				emit_sub_m64_r64(dst, memref, REG_R11);                             // sub   [mem],r11
-			}
-		}
-	}
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r64_p64(dst, reg, param);                                              // mov   reg,param
-		emit_sub_m64_r64(dst, memref, reg);                                         // sub   [dest],reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_sbb_r64_p64 - sbb operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_sbb_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (short_immediate(param.immediate()))
-			emit_sbb_r64_imm(dst, reg, param.immediate());                              // sbb   reg,param
-		else
-		{
-			emit_mov_r64_imm(dst, REG_R11, param.immediate());                          // mov   r11,param
-			emit_sbb_r64_r64(dst, reg, REG_R11);                                        // sbb   reg,r11
-		}
-	}
-	else if (param.is_memory())
-		emit_sbb_r64_m64(dst, reg, MABS(param.memory()));                               // sbb   reg,[param]
-	else if (param.is_int_register())
-		emit_sbb_r64_r64(dst, reg, param.ireg());                                       // sbb   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_sbb_m64_p64 - sbb operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_sbb_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate() && short_immediate(param.immediate()))
-		emit_sbb_m64_imm(dst, memref, param.immediate());                           // sbb   [mem],param
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r64_p64_keepflags(dst, reg, param);                                    // mov   reg,param
-		emit_sbb_m64_r64(dst, memref, reg);                                         // sbb   [dest],reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_cmp_r64_p64 - cmp operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_cmp_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (short_immediate(param.immediate()))
-			emit_cmp_r64_imm(dst, reg, param.immediate());                              // cmp   reg,param
-		else
-		{
-			emit_mov_r64_imm(dst, REG_R11, param.immediate());                          // mov   r11,param
-			emit_cmp_r64_r64(dst, reg, REG_R11);                                        // cmp   reg,r11
-		}
-	}
-	else if (param.is_memory())
-		emit_cmp_r64_m64(dst, reg, MABS(param.memory()));                               // cmp   reg,[param]
-	else if (param.is_int_register())
-		emit_cmp_r64_r64(dst, reg, param.ireg());                                       // cmp   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_cmp_m64_p64 - cmp operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_cmp_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate() && short_immediate(param.immediate()))
-		emit_cmp_m64_imm(dst, memref, param.immediate());                           // cmp   [dest],param
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r64_p64(dst, reg, param);                                              // mov   reg,param
-		emit_cmp_m64_r64(dst, memref, reg);                                         // cmp   [dest],reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_and_r64_p64 - and operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_and_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0xffffffffffffffffU)
-		{
-			if (short_immediate(param.immediate()))
-				emit_and_r64_imm(dst, reg, param.immediate());                          // and   reg,param
-			else
-			{
-				emit_mov_r64_imm(dst, REG_R11, param.immediate());                      // mov   r11,param
-				emit_and_r64_r64(dst, reg, REG_R11);                                    // and   reg,r11
-			}
-		}
-	}
-	else if (param.is_memory())
-		emit_and_r64_m64(dst, reg, MABS(param.memory()));                               // and   reg,[param]
-	else if (param.is_int_register())
-		emit_and_r64_r64(dst, reg, param.ireg());                                       // and   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_and_m64_p64 - and operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_and_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0xffffffffffffffffU)
-		{
-			if (short_immediate(param.immediate()))
-				emit_and_m64_imm(dst, memref, param.immediate());                   // and   [mem],param
-			else
-			{
-				emit_mov_r64_imm(dst, REG_R11, param.immediate());                      // mov   r11,param
-				emit_and_m64_r64(dst, memref, REG_R11);                             // and   [mem],r11
-			}
-		}
-	}
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r64_p64(dst, reg, param);                                              // mov   reg,param
-		emit_and_m64_r64(dst, memref, reg);                                         // and   [dest],reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_test_r64_p64 - test operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_test_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (short_immediate(param.immediate()))
-			emit_test_r64_imm(dst, reg, param.immediate());                             // test  reg,param
-		else
-		{
-			emit_mov_r64_imm(dst, REG_R11, param.immediate());                          // mov   r11,param
-			emit_test_r64_r64(dst, reg, REG_R11);                                       // test  reg,r11
-		}
-	}
-	else if (param.is_memory())
-		emit_test_m64_r64(dst, MABS(param.memory()), reg);                              // test  [param],reg
-	else if (param.is_int_register())
-		emit_test_r64_r64(dst, reg, param.ireg());                                      // test  reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_test_m64_p64 - test operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_test_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate() && short_immediate(param.immediate()))
-		emit_test_m64_imm(dst, memref, param.immediate());                          // test  [dest],param
-	else if (param.is_memory())
-	{
-		emit_mov_r64_p64(dst, REG_EAX, param);                                          // mov   reg,param
-		emit_test_m64_r64(dst, memref, REG_EAX);                                        // test  [dest],reg
-	}
-	else if (param.is_int_register())
-		emit_test_m64_r64(dst, memref, param.ireg());                               // test  [dest],param
-}
-
-
-//-------------------------------------------------
-//  emit_or_r64_p64 - or operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_or_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-		{
-			if (short_immediate(param.immediate()))
-				emit_or_r64_imm(dst, reg, param.immediate());                           // or    reg,param
-			else
-			{
-				emit_mov_r64_imm(dst, REG_R11, param.immediate());                      // mov   r11,param
-				emit_or_r64_r64(dst, reg, REG_R11);                                     // or    reg,r11
-			}
-		}
-	}
-	else if (param.is_memory())
-		emit_or_r64_m64(dst, reg, MABS(param.memory()));                                // or    reg,[param]
-	else if (param.is_int_register())
-		emit_or_r64_r64(dst, reg, param.ireg());                                        // or    reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_or_m64_p64 - or operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_or_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-		{
-			if (short_immediate(param.immediate()))
-				emit_or_m64_imm(dst, memref, param.immediate());                        // or    [mem],param
-			else
-			{
-				emit_mov_r64_imm(dst, REG_R11, param.immediate());                      // mov   r11,param
-				emit_or_m64_r64(dst, memref, REG_R11);                              // or    [mem],r11
-			}
-		}
-	}
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r64_p64(dst, reg, param);                                              // mov   reg,param
-		emit_or_m64_r64(dst, memref, reg);                                          // or    [dest],reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_xor_r64_p64 - xor operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_xor_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-		{
-			if (param.immediate() == 0xffffffffffffffffU)
-				emit_not_r64(dst, reg);                                                 // not   reg
-			else if (short_immediate(param.immediate()))
-				emit_xor_r64_imm(dst, reg, param.immediate());                          // xor   reg,param
-			else
-			{
-				emit_mov_r64_imm(dst, REG_R11, param.immediate());                      // mov   r11,param
-				emit_xor_r64_r64(dst, reg, REG_R11);                                    // xor   reg,r11
-			}
-		}
-	}
-	else if (param.is_memory())
-		emit_xor_r64_m64(dst, reg, MABS(param.memory()));                               // xor   reg,[param]
-	else if (param.is_int_register())
-		emit_xor_r64_r64(dst, reg, param.ireg());                                       // xor   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_xor_m64_p64 - xor operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_xor_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-		{
-			if (param.immediate() == 0xffffffffffffffffU)
-				emit_not_m64(dst, memref);                                          // not   [mem]
-			else if (short_immediate(param.immediate()))
-				emit_xor_m64_imm(dst, memref, param.immediate());                   // xor   [mem],param
-			else
-			{
-				emit_mov_r64_imm(dst, REG_R11, param.immediate());                      // mov   r11,param
-				emit_xor_m64_r64(dst, memref, REG_R11);                             // xor   [mem],r11
-			}
-		}
-	}
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r64_p64(dst, reg, param);                                              // mov   reg,param
-		emit_xor_m64_r64(dst, memref, reg);                                         // xor   [dest],reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_shl_r64_p64 - shl operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_shl_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_shl_r64_imm(dst, reg, param.immediate());                              // shl   reg,param
-	}
-	else
-	{
-		emit_mov_r64_p64(dst, REG_RCX, param);                                          // mov   rcx,param
-		emit_shl_r64_cl(dst, reg);                                                      // shl   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_shl_m64_p64 - shl operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_shl_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint64_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_shl_m64_imm(dst, memref, param.immediate());                       // shl   [dest],param
-	}
-	else
-	{
-		emit_mov_r64_p64(dst, REG_RCX, param);                                          // mov   rcx,param
-		emit_shl_m64_cl(dst, memref);                                               // shl   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_shr_r64_p64 - shr operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_shr_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_shr_r64_imm(dst, reg, param.immediate());                              // shr   reg,param
-	}
-	else
-	{
-		emit_mov_r64_p64(dst, REG_RCX, param);                                          // mov   rcx,param
-		emit_shr_r64_cl(dst, reg);                                                      // shr   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_shr_m64_p64 - shr operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_shr_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint64_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_shr_m64_imm(dst, memref, param.immediate());                       // shr   [dest],param
-	}
-	else
-	{
-		emit_mov_r64_p64(dst, REG_RCX, param);                                          // mov   rcx,param
-		emit_shr_m64_cl(dst, memref);                                               // shr   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_sar_r64_p64 - sar operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_sar_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_sar_r64_imm(dst, reg, param.immediate());                              // sar   reg,param
-	}
-	else
-	{
-		emit_mov_r64_p64(dst, REG_RCX, param);                                          // mov   rcx,param
-		emit_sar_r64_cl(dst, reg);                                                      // sar   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_sar_m64_p64 - sar operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_sar_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint64_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_sar_m64_imm(dst, memref, param.immediate());                       // sar   [dest],param
-	}
-	else
-	{
-		emit_mov_r64_p64(dst, REG_RCX, param);                                          // mov   rcx,param
-		emit_sar_m64_cl(dst, memref);                                               // sar   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rol_r64_p64 - rol operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_rol_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rol_r64_imm(dst, reg, param.immediate());                              // rol   reg,param
-	}
-	else
-	{
-		emit_mov_r64_p64(dst, REG_RCX, param);                                          // mov   rcx,param
-		emit_rol_r64_cl(dst, reg);                                                      // rol   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rol_m64_p64 - rol operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_rol_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint64_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rol_m64_imm(dst, memref, param.immediate());                       // rol   [dest],param
-	}
-	else
-	{
-		emit_mov_r64_p64(dst, REG_RCX, param);                                          // mov   rcx,param
-		emit_rol_m64_cl(dst, memref);                                               // rol   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_ror_r64_p64 - ror operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_ror_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_ror_r64_imm(dst, reg, param.immediate());                              // ror   reg,param
-	}
-	else
-	{
-		emit_mov_r64_p64(dst, REG_RCX, param);                                          // mov   rcx,param
-		emit_ror_r64_cl(dst, reg);                                                      // ror   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_ror_m64_p64 - ror operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_ror_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint64_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_ror_m64_imm(dst, memref, param.immediate());                       // ror   [dest],param
-	}
-	else
-	{
-		emit_mov_r64_p64(dst, REG_RCX, param);                                          // mov   rcx,param
-		emit_ror_m64_cl(dst, memref);                                               // ror   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rcl_r64_p64 - rcl operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_rcl_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rcl_r64_imm(dst, reg, param.immediate());                              // rcl   reg,param
-	}
-	else
-	{
-		emit_mov_r64_p64_keepflags(dst, REG_RCX, param);                                // mov   rcx,param
-		emit_rcl_r64_cl(dst, reg);                                                      // rcl   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rcl_m64_p64 - rcl operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_rcl_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint64_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rcl_m64_imm(dst, memref, param.immediate());                       // rcl   [dest],param
-	}
-	else
-	{
-		emit_mov_r64_p64_keepflags(dst, REG_RCX, param);                                // mov   rcx,param
-		emit_rcl_m64_cl(dst, memref);                                               // rcl   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rcr_r64_p64 - rcr operation to a 64-bit
-//  register from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_rcr_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rcr_r64_imm(dst, reg, param.immediate());                              // rcr   reg,param
-	}
-	else
-	{
-		emit_mov_r64_p64_keepflags(dst, REG_RCX, param);                                // mov   rcx,param
-		emit_rcr_r64_cl(dst, reg);                                                      // rcr   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rcr_m64_p64 - rcr operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_rcr_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint64_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rcr_m64_imm(dst, memref, param.immediate());                       // rcr   [dest],param
-	}
-	else
-	{
-		emit_mov_r64_p64_keepflags(dst, REG_RCX, param);                                // mov   rcx,param
-		emit_rcr_m64_cl(dst, memref);                                               // rcr   [dest],cl
-	}
-}
-
-
-
-/***************************************************************************
-    EMITTERS FOR FLOATING POINT OPERATIONS WITH PARAMETERS
-***************************************************************************/
-
-//-------------------------------------------------
-//  emit_movss_r128_p32 - move a 32-bit parameter
-//  into a register
-//-------------------------------------------------
-
-void drcbe_x64::emit_movss_r128_p32(x86code *&dst, uint8_t reg, const be_parameter &param)
-{
-	assert(!param.is_immediate());
-	if (param.is_memory())
-		emit_movss_r128_m32(dst, reg, MABS(param.memory()));                            // movss reg,[param]
-	else if (param.is_float_register())
-	{
-		if (reg != param.freg())
-			emit_movss_r128_r128(dst, reg, param.freg());                               // movss reg,param
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_movss_p32_r128 - move a register into a
-//  32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_movss_p32_r128(x86code *&dst, const be_parameter &param, uint8_t reg)
-{
-	assert(!param.is_immediate());
-	if (param.is_memory())
-		emit_movss_m32_r128(dst, MABS(param.memory()), reg);                            // movss [param],reg
-	else if (param.is_float_register())
-	{
-		if (reg != param.freg())
-			emit_movss_r128_r128(dst, param.freg(), reg);                               // movss param,reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_movsd_r128_p64 - move a 64-bit parameter
-//  into a register
-//-------------------------------------------------
-
-void drcbe_x64::emit_movsd_r128_p64(x86code *&dst, uint8_t reg, const be_parameter &param)
-{
-	assert(!param.is_immediate());
-	if (param.is_memory())
-		emit_movsd_r128_m64(dst, reg, MABS(param.memory()));                            // movsd reg,[param]
-	else if (param.is_float_register())
-	{
-		if (reg != param.freg())
-			emit_movsd_r128_r128(dst, reg, param.freg());                               // movsd reg,param
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_movsd_p64_r128 - move a register into a
-//  64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x64::emit_movsd_p64_r128(x86code *&dst, const be_parameter &param, uint8_t reg)
-{
-	assert(!param.is_immediate());
-	if (param.is_memory())
-		emit_movsd_m64_r128(dst, MABS(param.memory()), reg);                            // movsd [param],reg
-	else if (param.is_float_register())
-	{
-		if (reg != param.freg())
-			emit_movsd_r128_r128(dst, param.freg(), reg);                               // movsd param,reg
-	}
-}
-
-
-
-/***************************************************************************
-    OUT-OF-BAND CODE FIXUP CALLBACKS
-***************************************************************************/
-
-//-------------------------------------------------
-//  fixup_label - callback to fixup forward-
-//  referenced labels
-//-------------------------------------------------
-
-void drcbe_x64::fixup_label(void *parameter, drccodeptr labelcodeptr)
-{
-	drccodeptr src = (drccodeptr)parameter;
-
-	// find the end of the instruction
-	if (src[0] == 0xe3)
-	{
-		src += 1 + 1;
-		src[-1] = labelcodeptr - src;
-	}
-	else if (src[0] == 0xe9)
-	{
-		src += 1 + 4;
-		((uint32_t *)src)[-1] = labelcodeptr - src;
-	}
-	else if (src[0] == 0x0f && (src[1] & 0xf0) == 0x80)
-	{
-		src += 2 + 4;
-		((uint32_t *)src)[-1] = labelcodeptr - src;
-	}
-	else
-		fatalerror("fixup_label called with invalid jmp source!\n");
-}
-
-
-//-------------------------------------------------
-//  fixup_exception - callback to perform cleanup
-//  and jump to an exception handler
-//-------------------------------------------------
-
-void drcbe_x64::fixup_exception(drccodeptr *codeptr, void *param1, void *param2)
-{
-	drccodeptr src = (drccodeptr)param1;
-	const instruction &inst = *(const instruction *)param2;
-
-	// normalize parameters
-	const parameter &handp = inst.param(0);
-	assert(handp.is_code_handle());
-	be_parameter exp(*this, inst.param(1), PTYPE_MRI);
-
-	// look up the handle target
-	drccodeptr *targetptr = handp.handle().codeptr_addr();
-
-	// first fixup the jump to get us here
-	drccodeptr dst = *codeptr;
-	((uint32_t *)src)[-1] = dst - src;
-
-	// then store the exception parameter
-	emit_mov_m32_p32(dst, MABS(&m_state.exp), exp);                                     // mov   [exp],exp
-
-	// push the original return address on the stack
-	emit_lea_r64_m64(dst, REG_RAX, MABS(src));                                          // lea   rax,[return]
-	emit_push_r64(dst, REG_RAX);                                                        // push  rax
-	if (*targetptr != nullptr)
-		emit_jmp(dst, *targetptr);                                                      // jmp   *targetptr
-	else
-		emit_jmp_m64(dst, MABS(targetptr));                                             // jmp   [targetptr]
-
-	*codeptr = dst;
-}
-
-
-
-//**************************************************************************
-//  DEBUG HELPERS
-//**************************************************************************
-
-//-------------------------------------------------
-//  debug_log_hashjmp - callback to handle
-//  logging of hashjmps
-//-------------------------------------------------
-
-void drcbe_x64::debug_log_hashjmp(offs_t pc, int mode)
-{
-	printf("mode=%d PC=%08X\n", mode, pc);
-}
-
-
-//-------------------------------------------------
-//  debug_log_hashjmp - callback to handle
-//  logging of hashjmps
-//-------------------------------------------------
-
-void drcbe_x64::debug_log_hashjmp_fail()
-{
-	printf("  (FAIL)\n");
-}
-
-
-
-/***************************************************************************
-    COMPILE-TIME OPCODES
-***************************************************************************/
-
-//-------------------------------------------------
-//  op_handle - process a HANDLE opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_handle(x86code *&dst, const instruction &inst)
-{
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-	assert(inst.numparams() == 1);
-	assert(inst.param(0).is_code_handle());
-
-	// emit a jump around the stack adjust in case code falls through here
-	emit_link skip;
-	emit_jmp_short_link(dst, skip);                                                     // jmp   skip
-
-	// register the current pointer for the handle
-	inst.param(0).handle().set_codeptr(dst);
-
-	// by default, the handle points to prolog code that moves the stack pointer
-	emit_lea_r64_m64(dst, REG_RSP, MBD(REG_RSP, -40));                                  // lea   rsp,[rsp-40]
-	resolve_link(dst, skip);                                                        // skip:
-}
-
-
-//-------------------------------------------------
-//  op_hash - process a HASH opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_hash(x86code *&dst, const instruction &inst)
-{
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-	assert(inst.numparams() == 2);
-	assert(inst.param(0).is_immediate());
-	assert(inst.param(1).is_immediate());
-
-	// register the current pointer for the mode/PC
-	m_hash.set_codeptr(inst.param(0).immediate(), inst.param(1).immediate(), dst);
-}
-
-
-//-------------------------------------------------
-//  op_label - process a LABEL opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_label(x86code *&dst, const instruction &inst)
-{
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-	assert(inst.numparams() == 1);
-	assert(inst.param(0).is_code_label());
-
-	// register the current pointer for the label
-	m_labels.set_codeptr(inst.param(0).label(), dst);
-}
-
-
-//-------------------------------------------------
-//  op_comment - process a COMMENT opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_comment(x86code *&dst, const instruction &inst)
-{
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-	assert(inst.numparams() == 1);
-	assert(inst.param(0).is_string());
-
-	// do nothing
-}
-
-
-//-------------------------------------------------
-//  op_mapvar - process a MAPVAR opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_mapvar(x86code *&dst, const instruction &inst)
-{
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-	assert(inst.numparams() == 2);
-	assert(inst.param(0).is_mapvar());
-	assert(inst.param(1).is_immediate());
-
-	// set the value of the specified mapvar
-	m_map.set_value(dst, inst.param(0).mapvar(), inst.param(1).immediate());
-}
-
-
-
-/***************************************************************************
-    CONTROL FLOW OPCODES
-***************************************************************************/
-
-//-------------------------------------------------
-//  op_nop - process a NOP opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_nop(x86code *&dst, const instruction &inst)
-{
-	// nothing
-}
-
-
-//-------------------------------------------------
-//  op_debug - process a DEBUG opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_debug(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-
-	if ((m_device.machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
-	{
-		// normalize parameters
-		be_parameter pcp(*this, inst.param(0), PTYPE_MRI);
-
-		// test and branch
-		emit_mov_r64_imm(dst, REG_RAX, (uintptr_t)&m_device.machine().debug_flags);     // mov   rax,&debug_flags
-		emit_test_m32_imm(dst, MBD(REG_RAX, 0), DEBUG_FLAG_CALL_HOOK);                  // test  [debug_flags],DEBUG_FLAG_CALL_HOOK
-		emit_link skip = { nullptr };
-		emit_jcc_short_link(dst, x64emit::COND_Z, skip);                                // jz    skip
-
-		// push the parameter
-		emit_mov_r64_imm(dst, REG_PARAM1, (uintptr_t)m_device.debug());                 // mov   param1,device.debug
-		emit_mov_r32_p32(dst, REG_PARAM2, pcp);                                         // mov   param2,pcp
-		emit_smart_call_m64(dst, &m_near.debug_cpu_instruction_hook);                   // call  debug_cpu_instruction_hook
-
-		resolve_link(dst, skip);                                                        // skip:
-	}
-}
-
-
-//-------------------------------------------------
-//  op_exit - process an EXIT opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_exit(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_any_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	be_parameter retp(*this, inst.param(0), PTYPE_MRI);
-
-	// load the parameter into EAX
-	emit_mov_r32_p32(dst, REG_EAX, retp);                                               // mov   eax,retp
-	if (inst.condition() == uml::COND_ALWAYS)
-		emit_jmp(dst, m_exit);                                                          // jmp   exit
-	else
-		emit_jcc(dst, X86_CONDITION(inst.condition()), m_exit);                         // jcc   exit
-}
-
-
-//-------------------------------------------------
-//  op_hashjmp - process a HASHJMP opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_hashjmp(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	be_parameter modep(*this, inst.param(0), PTYPE_MRI);
-	be_parameter pcp(*this, inst.param(1), PTYPE_MRI);
-	const parameter &exp = inst.param(2);
-	assert(exp.is_code_handle());
-
-	if (LOG_HASHJMPS)
-	{
-		emit_mov_r32_p32(dst, REG_PARAM1, pcp);
-		emit_mov_r32_p32(dst, REG_PARAM2, modep);
-		emit_smart_call_m64(dst, &m_near.debug_log_hashjmp);
-	}
-
-	// load the stack base one word early so we end up at the right spot after our call below
-	emit_mov_r64_m64(dst, REG_RSP, MABS(&m_near.hashstacksave));                        // mov   rsp,[hashstacksave]
-
-	// fixed mode cases
-	if (modep.is_immediate() && m_hash.is_mode_populated(modep.immediate()))
-	{
-		// a straight immediate jump is direct, though we need the PC in EAX in case of failure
-		if (pcp.is_immediate())
-		{
-			uint32_t l1val = (pcp.immediate() >> m_hash.l1shift()) & m_hash.l1mask();
-			uint32_t l2val = (pcp.immediate() >> m_hash.l2shift()) & m_hash.l2mask();
-			emit_call_m64(dst, MABS(&m_hash.base()[modep.immediate()][l1val][l2val]));
-																						// call  hash[modep][l1val][l2val]
-		}
-
-		// a fixed mode but variable PC
-		else
-		{
-			emit_mov_r32_p32(dst, REG_EAX, pcp);                                        // mov   eax,pcp
-			emit_mov_r32_r32(dst, REG_EDX, REG_EAX);                                    // mov   edx,eax
-			emit_shr_r32_imm(dst, REG_EDX, m_hash.l1shift());                           // shr   edx,l1shift
-			emit_and_r32_imm(dst, REG_EAX, m_hash.l2mask() << m_hash.l2shift());        // and  eax,l2mask << l2shift
-			emit_mov_r64_m64(dst, REG_RDX, MBISD(REG_RBP, REG_RDX, 8, offset_from_rbp(&m_hash.base()[modep.immediate()][0])));
-																						// mov   rdx,hash[modep+edx*8]
-			emit_call_m64(dst, MBISD(REG_RDX, REG_RAX, 8 >> m_hash.l2shift(), 0));      // call  [rdx+rax*shift]
-		}
-	}
-	else
-	{
-		// variable mode
-		int modereg = modep.select_register(REG_ECX);
-		emit_mov_r32_p32(dst, modereg, modep);                                          // mov   modereg,modep
-		emit_mov_r64_m64(dst, REG_RCX, MBISD(REG_RBP, modereg, 8, offset_from_rbp(m_hash.base())));
-																						// mov   rcx,hash[modereg*8]
-
-		// fixed PC
-		if (pcp.is_immediate())
-		{
-			uint32_t l1val = (pcp.immediate() >> m_hash.l1shift()) & m_hash.l1mask();
-			uint32_t l2val = (pcp.immediate() >> m_hash.l2shift()) & m_hash.l2mask();
-			emit_mov_r64_m64(dst, REG_RDX, MBD(REG_RCX, l1val*8));                      // mov   rdx,[rcx+l1val*8]
-			emit_call_m64(dst, MBD(REG_RDX, l2val*8));                                  // call  [l2val*8]
-		}
-
-		// variable PC
-		else
-		{
-			emit_mov_r32_p32(dst, REG_EAX, pcp);                                        // mov   eax,pcp
-			emit_mov_r32_r32(dst, REG_EDX, REG_EAX);                                    // mov   edx,eax
-			emit_shr_r32_imm(dst, REG_EDX, m_hash.l1shift());                           // shr   edx,l1shift
-			emit_mov_r64_m64(dst, REG_RDX, MBISD(REG_RCX, REG_RDX, 8, 0));              // mov   rdx,[rcx+rdx*8]
-			emit_and_r32_imm(dst, REG_EAX, m_hash.l2mask() << m_hash.l2shift());        // and  eax,l2mask << l2shift
-			emit_call_m64(dst, MBISD(REG_RDX, REG_RAX, 8 >> m_hash.l2shift(), 0));      // call  [rdx+rax*shift]
-		}
-	}
-
-	// in all cases, if there is no code, we return here to generate the exception
-	if (LOG_HASHJMPS)
-		emit_smart_call_m64(dst, &m_near.debug_log_hashjmp_fail);
-
-	emit_mov_m32_p32(dst, MABS(&m_state.exp), pcp);                                     // mov   [exp],param
-	emit_sub_r64_imm(dst, REG_RSP, 8);                                                  // sub   rsp,8
-	emit_call_m64(dst, MABS(exp.handle().codeptr_addr()));                              // call  [exp]
-}
-
-
-//-------------------------------------------------
-//  op_jmp - process a JMP opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_jmp(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_any_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	const parameter &labelp = inst.param(0);
-	assert(labelp.is_code_label());
-
-	// look up the jump target and jump there
-	x86code *jmptarget = (x86code *)m_labels.get_codeptr(labelp.label(), m_fixup_label, dst);
-	if (jmptarget == nullptr)
-		jmptarget = dst + 0x7ffffff0;
-	if (inst.condition() == uml::COND_ALWAYS)
-		emit_jmp(dst, jmptarget);                                                       // jmp   target
-	else
-		emit_jcc(dst, X86_CONDITION(inst.condition()), jmptarget);                      // jcc   target
-
-}
-
-
-//-------------------------------------------------
-//  op_exh - process an EXH opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_exh(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_any_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	const parameter &handp = inst.param(0);
-	assert(handp.is_code_handle());
-	be_parameter exp(*this, inst.param(1), PTYPE_MRI);
-
-	// look up the handle target
-	drccodeptr *targetptr = handp.handle().codeptr_addr();
-
-	// perform the exception processing inline if unconditional
-	if (inst.condition() == uml::COND_ALWAYS)
-	{
-		emit_mov_m32_p32(dst, MABS(&m_state.exp), exp);                                 // mov   [exp],exp
-		if (*targetptr != nullptr)
-			emit_call(dst, *targetptr);                                                 // call  *targetptr
-		else
-			emit_call_m64(dst, MABS(targetptr));                                        // call  [targetptr]
-	}
-
-	// otherwise, jump to an out-of-band handler
-	else
-	{
-		emit_jcc(dst, X86_CONDITION(inst.condition()), dst + 0x7ffffff0);               // jcc   exception
-		m_cache.request_oob_codegen(m_fixup_exception, dst, &const_cast<instruction &>(inst));
-	}
-}
-
-
-//-------------------------------------------------
-//  op_callh - process a CALLH opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_callh(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_any_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	const parameter &handp = inst.param(0);
-	assert(handp.is_code_handle());
-
-	// look up the handle target
-	drccodeptr *targetptr = handp.handle().codeptr_addr();
-
-	// skip if conditional
-	emit_link skip = { nullptr };
-	if (inst.condition() != uml::COND_ALWAYS)
-		emit_jcc_short_link(dst, X86_NOT_CONDITION(inst.condition()), skip);            // jcc   skip
-
-	// jump through the handle; directly if a normal jump
-	if (*targetptr != nullptr)
-		emit_call(dst, *targetptr);                                                     // call  *targetptr
-	else
-		emit_call_m64(dst, MABS(targetptr));                                            // call  [targetptr]
-
-	// resolve the conditional link
-	if (inst.condition() != uml::COND_ALWAYS)
-		resolve_link(dst, skip);                                                    // skip:
-}
-
-
-//-------------------------------------------------
-//  op_ret - process a RET opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_ret(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_any_condition(inst);
-	assert_no_flags(inst);
-	assert(inst.numparams() == 0);
-
-	// skip if conditional
-	emit_link skip = { nullptr };
-	if (inst.condition() != uml::COND_ALWAYS)
-		emit_jcc_short_link(dst, X86_NOT_CONDITION(inst.condition()), skip);            // jcc   skip
-
-	// return
-	emit_lea_r64_m64(dst, REG_RSP, MBD(REG_RSP, 40));                                   // lea   rsp,[rsp+40]
-	emit_ret(dst);                                                                      // ret
-
-	// resolve the conditional link
-	if (inst.condition() != uml::COND_ALWAYS)
-		resolve_link(dst, skip);                                                    // skip:
-}
-
-
-//-------------------------------------------------
-//  op_callc - process a CALLC opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_callc(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_any_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	const parameter &funcp = inst.param(0);
-	assert(funcp.is_c_function());
-	be_parameter paramp(*this, inst.param(1), PTYPE_M);
-
-	// skip if conditional
-	emit_link skip = { nullptr };
-	if (inst.condition() != uml::COND_ALWAYS)
-		emit_jcc_short_link(dst, X86_NOT_CONDITION(inst.condition()), skip);            // jcc   skip
-
-	// perform the call
-	emit_mov_r64_imm(dst, REG_PARAM1, (uintptr_t)paramp.memory());                           // mov   param1,paramp
-	emit_smart_call_r64(dst, (x86code *)(uintptr_t)funcp.cfunc(), REG_RAX);                  // call  funcp
-
-	// resolve the conditional link
-	if (inst.condition() != uml::COND_ALWAYS)
-		resolve_link(dst, skip);                                                    // skip:
-}
-
-
-//-------------------------------------------------
-//  op_recover - process a RECOVER opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_recover(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-
-	// call the recovery code
-	emit_mov_r64_m64(dst, REG_RAX, MABS(&m_near.stacksave));                            // mov   rax,stacksave
-	emit_mov_r64_m64(dst, REG_RAX, MBD(REG_RAX, -8));                                   // mov   rax,[rax-4]
-	emit_mov_r64_imm(dst, REG_PARAM1, (uintptr_t)&m_map);                                    // mov   param1,m_map
-	emit_lea_r64_m64(dst, REG_PARAM2, MBD(REG_RAX, -1));                                // lea   param2,[rax-1]
-	emit_mov_r64_imm(dst, REG_PARAM3, inst.param(1).mapvar());                          // mov   param3,param[1].value
-	emit_smart_call_m64(dst, &m_near.drcmap_get_value);                                 // call  drcmap_get_value
-	emit_mov_p32_r32(dst, dstp, REG_EAX);                                               // mov   dstp,eax
-
-}
-
-
-
-/***************************************************************************
-    INTERNAL REGISTER OPCODES
-***************************************************************************/
-
-//-------------------------------------------------
-//  op_setfmod - process a SETFMOD opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_setfmod(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	be_parameter srcp(*this, inst.param(0), PTYPE_MRI);
-
-	// immediate case
-	if (srcp.is_immediate())
-	{
-		int value = srcp.immediate() & 3;
-		emit_mov_m8_imm(dst, MABS(&m_state.fmod), value);                               // mov   [fmod],srcp
-		emit_ldmxcsr_m32(dst, MABS(&m_near.ssecontrol[value]));                         // ldmxcsr fp_control[srcp]
-	}
-
-	// register/memory case
-	else
-	{
-		emit_mov_r32_p32(dst, REG_EAX, srcp);                                           // mov   eax,srcp
-		emit_and_r32_imm(dst, REG_EAX, 3);                                              // and   eax,3
-		emit_mov_m8_r8(dst, MABS(&m_state.fmod), REG_AL);                               // mov   [fmod],al
-		emit_ldmxcsr_m32(dst, MBISD(REG_RBP, REG_RAX, 4, offset_from_rbp(&m_near.ssecontrol[0])));
-																						// ldmxcsr fp_control[eax]
-	}
-}
-
-
-//-------------------------------------------------
-//  op_getfmod - process a GETFMOD opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_getfmod(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-
-	// fetch the current mode and store to the destination
-	if (dstp.is_int_register())
-		emit_movzx_r32_m8(dst, dstp.ireg(), MABS(&m_state.fmod));                       // movzx reg,[fmod]
-	else
-	{
-		emit_movzx_r32_m8(dst, REG_EAX, MABS(&m_state.fmod));                           // movzx eax,[fmod]
-		emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX);                            // mov   [dstp],eax
-	}
-}
-
-
-//-------------------------------------------------
-//  op_getexp - process a GETEXP opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_getexp(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-
-	// fetch the exception parameter and store to the destination
-	if (dstp.is_int_register())
-		emit_mov_r32_m32(dst, dstp.ireg(), MABS(&m_state.exp));                         // mov   reg,[exp]
-	else
-	{
-		emit_mov_r32_m32(dst, REG_EAX, MABS(&m_state.exp));                             // mov   eax,[exp]
-		emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX);                            // mov   [dstp],eax
-	}
-}
-
-
-//-------------------------------------------------
-//  op_getflgs - process a GETFLGS opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_getflgs(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter maskp(*this, inst.param(1), PTYPE_I);
-
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
-
-	// compute mask for flags
-	uint32_t flagmask = 0;
-	if (maskp.immediate() & FLAG_C) flagmask |= 0x001;
-	if (maskp.immediate() & FLAG_V) flagmask |= 0x800;
-	if (maskp.immediate() & FLAG_Z) flagmask |= 0x040;
-	if (maskp.immediate() & FLAG_S) flagmask |= 0x080;
-	if (maskp.immediate() & FLAG_U) flagmask |= 0x004;
-
-	switch (maskp.immediate())
-	{
-		// single flags only
-		case FLAG_C:
-			emit_setcc_r8(dst, x64emit::COND_C, REG_AL);                                            // setc   al
-			emit_movzx_r32_r8(dst, dstreg, REG_AL);                                     // movzx  dstreg,al
-			break;
-
-		case FLAG_V:
-			emit_setcc_r8(dst, x64emit::COND_O, REG_AL);                                            // seto   al
-			emit_movzx_r32_r8(dst, dstreg, REG_AL);                                     // movzx  dstreg,al
-			emit_shl_r32_imm(dst, dstreg, 1);                                           // shl    dstreg,1
-			break;
-
-		case FLAG_Z:
-			emit_setcc_r8(dst, x64emit::COND_Z, REG_AL);                                            // setz   al
-			emit_movzx_r32_r8(dst, dstreg, REG_AL);                                     // movzx  dstreg,al
-			emit_shl_r32_imm(dst, dstreg, 2);                                           // shl    dstreg,2
-			break;
-
-		case FLAG_S:
-			emit_setcc_r8(dst, x64emit::COND_S, REG_AL);                                            // sets   al
-			emit_movzx_r32_r8(dst, dstreg, REG_AL);                                     // movzx  dstreg,al
-			emit_shl_r32_imm(dst, dstreg, 3);                                           // shl    dstreg,3
-			break;
-
-		case FLAG_U:
-			emit_setcc_r8(dst, x64emit::COND_P, REG_AL);                                            // setp   al
-			emit_movzx_r32_r8(dst, dstreg, REG_AL);                                     // movzx  dstreg,al
-			emit_shl_r32_imm(dst, dstreg, 4);                                           // shl    dstreg,4
-			break;
-
-		// carry plus another flag
-		case FLAG_C | FLAG_V:
-			emit_setcc_r8(dst, x64emit::COND_C, REG_AL);                                            // setc   al
-			emit_setcc_r8(dst, x64emit::COND_O, REG_CL);                                            // seto   cl
-			emit_movzx_r32_r8(dst, REG_EAX, REG_AL);                                    // movzx  eax,al
-			emit_movzx_r32_r8(dst, REG_ECX, REG_CL);                                    // movzx  ecx,cl
-			emit_lea_r32_m32(dst, dstreg, MBISD(REG_EAX, REG_ECX, 2, 0));               // lea    dstreg,[eax+ecx*2]
-			break;
-
-		case FLAG_C | FLAG_Z:
-			emit_setcc_r8(dst, x64emit::COND_C, REG_AL);                                            // setc   al
-			emit_setcc_r8(dst, x64emit::COND_Z, REG_CL);                                            // setz   cl
-			emit_movzx_r32_r8(dst, REG_EAX, REG_AL);                                    // movzx  eax,al
-			emit_movzx_r32_r8(dst, REG_ECX, REG_CL);                                    // movzx  ecx,cl
-			emit_lea_r32_m32(dst, dstreg, MBISD(REG_EAX, REG_ECX, 4, 0));               // lea    dstreg,[eax+ecx*4]
-			break;
-
-		case FLAG_C | FLAG_S:
-			emit_setcc_r8(dst, x64emit::COND_C, REG_AL);                                            // setc   al
-			emit_setcc_r8(dst, x64emit::COND_S, REG_CL);                                            // sets   cl
-			emit_movzx_r32_r8(dst, REG_EAX, REG_AL);                                    // movzx  eax,al
-			emit_movzx_r32_r8(dst, REG_ECX, REG_CL);                                    // movzx  ecx,cl
-			emit_lea_r32_m32(dst, dstreg, MBISD(REG_EAX, REG_ECX, 8, 0));               // lea    dstreg,[eax+ecx*8]
-			break;
-
-		// overflow plus another flag
-		case FLAG_V | FLAG_Z:
-			emit_setcc_r8(dst, x64emit::COND_O, REG_AL);                                            // seto   al
-			emit_setcc_r8(dst, x64emit::COND_Z, REG_CL);                                            // setz   cl
-			emit_movzx_r32_r8(dst, REG_EAX, REG_AL);                                    // movzx  eax,al
-			emit_movzx_r32_r8(dst, REG_ECX, REG_CL);                                    // movzx  ecx,cl
-			emit_lea_r32_m32(dst, dstreg, MBISD(REG_EAX, REG_ECX, 2, 0));               // lea    dstreg,[eax+ecx*2]
-			emit_shl_r32_imm(dst, dstreg, 1);                                           // shl    dstreg,1
-			break;
-
-		case FLAG_V | FLAG_S:
-			emit_setcc_r8(dst, x64emit::COND_O, REG_AL);                                            // seto   al
-			emit_setcc_r8(dst, x64emit::COND_S, REG_CL);                                            // sets   cl
-			emit_movzx_r32_r8(dst, REG_EAX, REG_AL);                                    // movzx  eax,al
-			emit_movzx_r32_r8(dst, REG_ECX, REG_CL);                                    // movzx  ecx,al
-			emit_lea_r32_m32(dst, dstreg, MBISD(REG_EAX, REG_ECX, 4, 0));               // lea    dstreg,[eax+ecx*4]
-			emit_shl_r32_imm(dst, dstreg, 1);                                           // shl    dstreg,1
-			break;
-
-		// zero plus another flag
-		case FLAG_Z | FLAG_S:
-			emit_setcc_r8(dst, x64emit::COND_Z, REG_AL);                                            // setz   al
-			emit_setcc_r8(dst, x64emit::COND_S, REG_CL);                                            // sets   cl
-			emit_movzx_r32_r8(dst, REG_EAX, REG_AL);                                    // movzx  eax,al
-			emit_movzx_r32_r8(dst, REG_ECX, REG_CL);                                    // movzx  ecx,al
-			emit_lea_r32_m32(dst, dstreg, MBISD(REG_EAX, REG_ECX, 2, 0));               // lea    dstreg,[eax+ecx*2]
-			emit_shl_r32_imm(dst, dstreg, 2);                                           // shl    dstreg,2
-			break;
-
-		// default cases
-		default:
-			emit_pushf(dst);                                                            // pushf
-			emit_pop_r64(dst, REG_EAX);                                                 // pop    eax
-			emit_and_r32_imm(dst, REG_EAX, flagmask);                                   // and    eax,flagmask
-			emit_movzx_r32_m8(dst, dstreg, MBISD(REG_RBP, REG_RAX, 1, offset_from_rbp(&m_near.flagsmap[0])));
-																						// movzx  dstreg,[flags_map]
-			break;
-	}
-
-	// 32-bit form
-	if (inst.size() == 4)
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-
-	// 64-bit form
-	else if (inst.size() == 8)
-		emit_mov_p64_r64(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-}
-
-
-//-------------------------------------------------
-//  op_save - process a SAVE opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_save(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_M);
-
-	// copy live state to the destination
-	emit_mov_r64_imm(dst, REG_RCX, (uintptr_t)dstp.memory());                                // mov    rcx,dstp
-
-	// copy flags
-	emit_pushf(dst);                                                                    // pushf
-	emit_pop_r64(dst, REG_RAX);                                                         // pop    rax
-	emit_and_r32_imm(dst, REG_EAX, 0x8c5);                                              // and    eax,0x8c5
-	emit_mov_r8_m8(dst, REG_AL, MBISD(REG_RBP, REG_RAX, 1, offset_from_rbp(&m_near.flagsmap[0])));
-																						// mov    al,[flags_map]
-	emit_mov_m8_r8(dst, MBD(REG_RCX, offsetof(drcuml_machine_state, flags)), REG_AL);   // mov    state->flags,al
-
-	// copy fmod and exp
-	emit_mov_r8_m8(dst, REG_AL, MABS(&m_state.fmod));                                   // mov    al,[fmod]
-	emit_mov_m8_r8(dst, MBD(REG_RCX, offsetof(drcuml_machine_state, fmod)), REG_AL);    // mov    state->fmod,al
-	emit_mov_r32_m32(dst, REG_EAX, MABS(&m_state.exp));                                 // mov    eax,[exp]
-	emit_mov_m32_r32(dst, MBD(REG_RCX, offsetof(drcuml_machine_state, exp)), REG_EAX);  // mov    state->exp,eax
-
-	// copy integer registers
-	int regoffs = offsetof(drcuml_machine_state, r);
-	for (int regnum = 0; regnum < ARRAY_LENGTH(m_state.r); regnum++)
-	{
-		if (int_register_map[regnum] != 0)
-			emit_mov_m64_r64(dst, MBD(REG_RCX, regoffs + 8 * regnum), int_register_map[regnum]);
-		else
-		{
-			emit_mov_r64_m64(dst, REG_RAX, MABS(&m_state.r[regnum].d));
-			emit_mov_m64_r64(dst, MBD(REG_RCX, regoffs + 8 * regnum), REG_RAX);
-		}
-	}
-
-	// copy FP registers
-	regoffs = offsetof(drcuml_machine_state, f);
-	for (int regnum = 0; regnum < ARRAY_LENGTH(m_state.f); regnum++)
-	{
-		if (float_register_map[regnum] != 0)
-			emit_movsd_m64_r128(dst, MBD(REG_RCX, regoffs + 8 * regnum), float_register_map[regnum]);
-		else
-		{
-			emit_mov_r64_m64(dst, REG_RAX, MABS(&m_state.f[regnum].d));
-			emit_mov_m64_r64(dst, MBD(REG_RCX, regoffs + 8 * regnum), REG_RAX);
-		}
-	}
-}
-
-
-//-------------------------------------------------
-//  op_restore - process a RESTORE opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_restore(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4);
-	assert_no_condition(inst);
-
-	// normalize parameters
-	be_parameter srcp(*this, inst.param(0), PTYPE_M);
-
-	// copy live state from the destination
-	emit_mov_r64_imm(dst, REG_ECX, (uintptr_t)srcp.memory());                                // mov    rcx,dstp
-
-	// copy integer registers
-	int regoffs = offsetof(drcuml_machine_state, r);
-	for (int regnum = 0; regnum < ARRAY_LENGTH(m_state.r); regnum++)
-	{
-		if (int_register_map[regnum] != 0)
-			emit_mov_r64_m64(dst, int_register_map[regnum], MBD(REG_RCX, regoffs + 8 * regnum));
-		else
-		{
-			emit_mov_r64_m64(dst, REG_RAX, MBD(REG_RCX, regoffs + 8 * regnum));
-			emit_mov_m64_r64(dst, MABS(&m_state.r[regnum].d), REG_RAX);
-		}
-	}
-
-	// copy FP registers
-	regoffs = offsetof(drcuml_machine_state, f);
-	for (int regnum = 0; regnum < ARRAY_LENGTH(m_state.f); regnum++)
-	{
-		if (float_register_map[regnum] != 0)
-			emit_movsd_r128_m64(dst, float_register_map[regnum], MBD(REG_RCX, regoffs + 8 * regnum));
-		else
-		{
-			emit_mov_r64_m64(dst, REG_RAX, MBD(REG_RCX, regoffs + 8 * regnum));
-			emit_mov_m64_r64(dst, MABS(&m_state.f[regnum].d), REG_RAX);
-		}
-	}
-
-	// copy fmod and exp
-	emit_movzx_r32_m8(dst, REG_EAX, MBD(REG_RCX, offsetof(drcuml_machine_state, fmod)));// movzx eax,state->fmod
-	emit_and_r32_imm(dst, REG_EAX, 3);                                                  // and   eax,3
-	emit_mov_m8_r8(dst, MABS(&m_state.fmod), REG_AL);                                   // mov   [fmod],al
-	emit_ldmxcsr_m32(dst, MBISD(REG_RBP, REG_RAX, 4, offset_from_rbp(&m_near.ssecontrol[0])));
-	emit_mov_r32_m32(dst, REG_EAX, MBD(REG_RCX, offsetof(drcuml_machine_state, exp)));  // mov    eax,state->exp
-	emit_mov_m32_r32(dst, MABS(&m_state.exp), REG_EAX);                                 // mov    [exp],eax
-
-	// copy flags
-	emit_movzx_r32_m8(dst, REG_EAX, MBD(REG_RCX, offsetof(drcuml_machine_state, flags)));// movzx eax,state->flags
-	emit_push_m64(dst, MBISD(REG_RBP, REG_RAX, 8, offset_from_rbp(&m_near.flagsunmap[0])));
-																						// push   flags_unmap[eax*8]
-	emit_popf(dst);                                                                     // popf
-}
-
-
-
-/***************************************************************************
-    INTEGER OPERATIONS
-***************************************************************************/
-
-//-------------------------------------------------
-//  op_load - process a LOAD opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_load(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4 || inst.size() == 8);
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter basep(*this, inst.param(1), PTYPE_M);
-	be_parameter indp(*this, inst.param(2), PTYPE_MRI);
-	const parameter &scalesizep = inst.param(3);
-	assert(scalesizep.is_size_scale());
-	int scale = 1 << scalesizep.scale();
-	int size = scalesizep.size();
-
-	// determine the pointer base
-	int32_t baseoffs;
-	int basereg = get_base_register_and_offset(dst, basep.memory(), REG_RDX, baseoffs);
-
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
-
-	// immediate index
-	if (indp.is_immediate())
-	{
-		if (size == SIZE_BYTE)
-			emit_movzx_r32_m8(dst, dstreg, MBD(basereg, baseoffs + scale*indp.immediate()));// movzx dstreg,[basep + scale*indp]
-		else if (size == SIZE_WORD)
-			emit_movzx_r32_m16(dst, dstreg, MBD(basereg, baseoffs + scale*indp.immediate()));// movzx dstreg,[basep + scale*indp]
-		else if (size == SIZE_DWORD)
-			emit_mov_r32_m32(dst, dstreg, MBD(basereg, baseoffs + scale*indp.immediate())); // mov   dstreg,[basep + scale*indp]
-		else if (size == SIZE_QWORD)
-			emit_mov_r64_m64(dst, dstreg, MBD(basereg, baseoffs + scale*indp.immediate())); // mov   dstreg,[basep + scale*indp]
-	}
-
-	// other index
-	else
-	{
-		int indreg = indp.select_register(REG_ECX);
-		emit_movsx_r64_p32(dst, indreg, indp);
-		if (size == SIZE_BYTE)
-			emit_movzx_r32_m8(dst, dstreg, MBISD(basereg, indreg, scale, baseoffs));    // movzx dstreg,[basep + scale*indp]
-		else if (size == SIZE_WORD)
-			emit_movzx_r32_m16(dst, dstreg, MBISD(basereg, indreg, scale, baseoffs));   // movzx dstreg,[basep + scale*indp]
-		else if (size == SIZE_DWORD)
-			emit_mov_r32_m32(dst, dstreg, MBISD(basereg, indreg, scale, baseoffs));     // mov   dstreg,[basep + scale*indp]
-		else if (size == SIZE_QWORD)
-			emit_mov_r64_m64(dst, dstreg, MBISD(basereg, indreg, scale, baseoffs));     // mov   dstreg,[basep + scale*indp]
-	}
-
-	// store result
-	if (inst.size() == 4)
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-	else
-		emit_mov_p64_r64(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-
-}
-
-
-//-------------------------------------------------
-//  op_loads - process a LOADS opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_loads(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4 || inst.size() == 8);
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter basep(*this, inst.param(1), PTYPE_M);
-	be_parameter indp(*this, inst.param(2), PTYPE_MRI);
-	const parameter &scalesizep = inst.param(3);
-	assert(scalesizep.is_size_scale());
-	int scale = 1 << scalesizep.scale();
-	int size = scalesizep.size();
-
-	// determine the pointer base
-	int32_t baseoffs;
-	int basereg = get_base_register_and_offset(dst, basep.memory(), REG_RDX, baseoffs);
-
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
-
-	// immediate index
-	if (indp.is_immediate())
-	{
-		if (inst.size() == 4)
-		{
-			if (size == SIZE_BYTE)
-				emit_movsx_r32_m8(dst, dstreg, MBD(basereg, baseoffs + scale*indp.immediate()));// movsx dstreg,[basep + scale*indp]
-			else if (size == SIZE_WORD)
-				emit_movsx_r32_m16(dst, dstreg, MBD(basereg, baseoffs + scale*indp.immediate()));// movsx dstreg,[basep + scale*indp]
-			else if (size == SIZE_DWORD)
-				emit_mov_r32_m32(dst, dstreg, MBD(basereg, baseoffs + scale*indp.immediate())); // mov   dstreg,[basep + scale*indp]
-		}
-		else if (inst.size() == 8)
-		{
-			if (size == SIZE_BYTE)
-				emit_movsx_r64_m8(dst, dstreg, MBD(basereg, baseoffs + scale*indp.immediate()));// movzx dstreg,[basep + scale*indp]
-			else if (size == SIZE_WORD)
-				emit_movsx_r64_m16(dst, dstreg, MBD(basereg, baseoffs + scale*indp.immediate()));// movzx dstreg,[basep + scale*indp]
-			else if (size == SIZE_DWORD)
-				emit_movsxd_r64_m32(dst, dstreg, MBD(basereg, baseoffs + scale*indp.immediate()));// movsxd dstreg,[basep + scale*indp]
-			else if (size == SIZE_QWORD)
-				emit_mov_r64_m64(dst, dstreg, MBD(basereg, baseoffs + scale*indp.immediate())); // mov   dstreg,[basep + scale*indp]
-		}
-	}
-
-	// other index
-	else
-	{
-		int indreg = indp.select_register(REG_ECX);
-		emit_movsx_r64_p32(dst, indreg, indp);
-		if (inst.size() == 4)
-		{
-			if (size == SIZE_BYTE)
-				emit_movsx_r32_m8(dst, dstreg, MBISD(basereg, indreg, scale, baseoffs));// movsx dstreg,[basep + scale*indp]
-			else if (size == SIZE_WORD)
-				emit_movsx_r32_m16(dst, dstreg, MBISD(basereg, indreg, scale, baseoffs));// movsx dstreg,[basep + scale*indp]
-			else if (size == SIZE_DWORD)
-				emit_mov_r32_m32(dst, dstreg, MBISD(basereg, indreg, scale, baseoffs)); // mov   dstreg,[basep + scale*indp]
-		}
-		else if (inst.size() == 8)
-		{
-			if (size == SIZE_BYTE)
-				emit_movsx_r64_m8(dst, dstreg, MBISD(basereg, indreg, scale, baseoffs));// movsx dstreg,[basep + scale*indp]
-			else if (size == SIZE_WORD)
-				emit_movsx_r64_m16(dst, dstreg, MBISD(basereg, indreg, scale, baseoffs));// movsx dstreg,[basep + scale*indp]
-			else if (size == SIZE_DWORD)
-				emit_movsxd_r64_m32(dst, dstreg, MBISD(basereg, indreg, scale, baseoffs));// movsxd dstreg,[basep + scale*indp]
-			else if (size == SIZE_QWORD)
-				emit_mov_r64_m64(dst, dstreg, MBISD(basereg, indreg, scale, baseoffs)); // mov   dstreg,[basep + scale*indp]
-		}
-	}
-
-	// store result
-	if (inst.size() == 4)
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-	else
-		emit_mov_p64_r64(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-
-}
-
-
-//-------------------------------------------------
-//  op_store - process a STORE opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_store(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4 || inst.size() == 8);
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	be_parameter basep(*this, inst.param(0), PTYPE_M);
-	be_parameter indp(*this, inst.param(1), PTYPE_MRI);
-	be_parameter srcp(*this, inst.param(2), PTYPE_MRI);
-	const parameter &scalesizep = inst.param(3);
-	int scale = 1 << (scalesizep.scale());
-	int size = scalesizep.size();
-
-	// determine the pointer base
-	int32_t baseoffs;
-	int basereg = get_base_register_and_offset(dst, basep.memory(), REG_RDX, baseoffs);
-
-	// pick a source register for the general case
-	int srcreg = srcp.select_register(REG_EAX);
-
-	// degenerate case: constant index
-	if (indp.is_immediate())
-	{
-		// immediate source
-		if (srcp.is_immediate())
-		{
-			if (size == SIZE_BYTE)
-				emit_mov_m8_imm(dst, MBD(basereg, baseoffs + scale*indp.immediate()), srcp.immediate());// mov   [basep + scale*indp],srcp
-			else if (size == SIZE_WORD)
-				emit_mov_m16_imm(dst, MBD(basereg, baseoffs + scale*indp.immediate()), srcp.immediate());// mov   [basep + scale*indp],srcp
-			else if (size == SIZE_DWORD)
-				emit_mov_m32_imm(dst, MBD(basereg, baseoffs + scale*indp.immediate()), srcp.immediate());// mov   [basep + scale*indp],srcp
-			else if (size == SIZE_QWORD)
-			{
-				if (short_immediate(srcp.immediate()))
-					emit_mov_m64_imm(dst, MBD(basereg, baseoffs + scale*indp.immediate()), srcp.immediate());// mov   [basep + scale*indp],srcp
-				else
-				{
-					emit_mov_m32_imm(dst, MBD(basereg, baseoffs + scale*indp.immediate()), srcp.immediate());// mov   [basep + scale*indp],srcp
-					emit_mov_m32_imm(dst, MBD(basereg, baseoffs + scale*indp.immediate() + 4), srcp.immediate() >> 32);
-																						// mov   [basep + scale*indp + 4],srcp >> 32
-				}
-			}
-		}
-
-		// variable source
-		else
-		{
-			if (size != SIZE_QWORD)
-				emit_mov_r32_p32(dst, srcreg, srcp);                                    // mov   srcreg,srcp
-			else
-				emit_mov_r64_p64(dst, srcreg, srcp);                                    // mov   srcreg,srcp
-			if (size == SIZE_BYTE)
-				emit_mov_m8_r8(dst, MBD(basereg, baseoffs + scale*indp.immediate()), srcreg);   // mov   [basep + scale*indp],srcreg
-			else if (size == SIZE_WORD)
-				emit_mov_m16_r16(dst, MBD(basereg, baseoffs + scale*indp.immediate()), srcreg); // mov   [basep + scale*indp],srcreg
-			else if (size == SIZE_DWORD)
-				emit_mov_m32_r32(dst, MBD(basereg, baseoffs + scale*indp.immediate()), srcreg); // mov   [basep + scale*indp],srcreg
-			else if (size == SIZE_QWORD)
-				emit_mov_m64_r64(dst, MBD(basereg, baseoffs + scale*indp.immediate()), srcreg); // mov   [basep + scale*indp],srcreg
-		}
-	}
-
-	// normal case: variable index
-	else
-	{
-		int indreg = indp.select_register(REG_ECX);
-		emit_movsx_r64_p32(dst, indreg, indp);                                          // mov   indreg,indp
-
-		// immediate source
-		if (srcp.is_immediate())
-		{
-			if (size == SIZE_BYTE)
-				emit_mov_m8_imm(dst, MBISD(basereg, indreg, scale, baseoffs), srcp.immediate());// mov   [basep + scale*ecx],srcp
-			else if (size == SIZE_WORD)
-				emit_mov_m16_imm(dst, MBISD(basereg, indreg, scale, baseoffs), srcp.immediate());// mov   [basep + scale*ecx],srcp
-			else if (size == SIZE_DWORD)
-				emit_mov_m32_imm(dst, MBISD(basereg, indreg, scale, baseoffs), srcp.immediate());// mov   [basep + scale*ecx],srcp
-			else if (size == SIZE_QWORD)
-			{
-				if (short_immediate(srcp.immediate()))
-					emit_mov_m64_imm(dst, MBISD(basereg, indreg, scale, baseoffs), srcp.immediate());// mov   [basep + scale*indp],srcp
-				else
-				{
-					emit_mov_m32_imm(dst, MBISD(basereg, indreg, scale, baseoffs), srcp.immediate());// mov   [basep + scale*ecx],srcp
-					emit_mov_m32_imm(dst, MBISD(basereg, indreg, scale, baseoffs + 4), srcp.immediate() >> 32);
-																						// mov   [basep + scale*ecx + 4],srcp >> 32
-				}
-			}
-		}
-
-		// variable source
-		else
-		{
-			if (size != SIZE_QWORD)
-				emit_mov_r32_p32(dst, srcreg, srcp);                                    // mov   srcreg,srcp
-			else
-				emit_mov_r64_p64(dst, srcreg, srcp);                                    // mov   edx:srcreg,srcp
-			if (size == SIZE_BYTE)
-				emit_mov_m8_r8(dst, MBISD(basereg, indreg, scale, baseoffs), srcreg);   // mov   [basep + scale*ecx],srcreg
-			else if (size == SIZE_WORD)
-				emit_mov_m16_r16(dst, MBISD(basereg, indreg, scale, baseoffs), srcreg); // mov   [basep + scale*ecx],srcreg
-			else if (size == SIZE_DWORD)
-				emit_mov_m32_r32(dst, MBISD(basereg, indreg, scale, baseoffs), srcreg); // mov   [basep + scale*ecx],srcreg
-			else if (size == SIZE_QWORD)
-				emit_mov_m64_r64(dst, MBISD(basereg, indreg, scale, baseoffs), srcreg); // mov   [basep + scale*ecx],srcreg
-		}
-	}
-}
-
-
-//-------------------------------------------------
-//  op_read - process a READ opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_read(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4 || inst.size() == 8);
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter addrp(*this, inst.param(1), PTYPE_MRI);
-	const parameter &spacesizep = inst.param(2);
-	assert(spacesizep.is_size_space());
-
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
-
-	// set up a call to the read byte handler
-	emit_mov_r64_imm(dst, REG_PARAM1, (uintptr_t)(m_space[spacesizep.space()]));             // mov    param1,space
-	emit_mov_r32_p32(dst, REG_PARAM2, addrp);                                           // mov    param2,addrp
-	if (spacesizep.size() == SIZE_BYTE)
-	{
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].read_byte);
-																						// call   read_byte
-		emit_movzx_r32_r8(dst, dstreg, REG_AL);                                         // movzx  dstreg,al
-	}
-	else if (spacesizep.size() == SIZE_WORD)
-	{
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].read_word);
-																						// call   read_word
-		emit_movzx_r32_r16(dst, dstreg, REG_AX);                                        // movzx  dstreg,ax
-	}
-	else if (spacesizep.size() == SIZE_DWORD)
-	{
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].read_dword);
-																						// call   read_dword
-		if (dstreg != REG_EAX || inst.size() == 8)
-			emit_mov_r32_r32(dst, dstreg, REG_EAX);                                     // mov    dstreg,eax
-	}
-	else if (spacesizep.size() == SIZE_QWORD)
-	{
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].read_qword);
-																						// call   read_qword
-		if (dstreg != REG_RAX)
-			emit_mov_r64_r64(dst, dstreg, REG_RAX);                                     // mov    dstreg,rax
-	}
-
-	// store result
-	if (inst.size() == 4)
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-	else
-		emit_mov_p64_r64(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-}
-
-
-//-------------------------------------------------
-//  op_readm - process a READM opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_readm(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4 || inst.size() == 8);
-	assert_no_condition(inst);
-	assert_no_flags(inst);
-
-	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter addrp(*this, inst.param(1), PTYPE_MRI);
-	be_parameter maskp(*this, inst.param(2), PTYPE_MRI);
-	const parameter &spacesizep = inst.param(3);
-	assert(spacesizep.is_size_space());
-
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
-
-	// set up a call to the read byte handler
-	emit_mov_r64_imm(dst, REG_PARAM1, (uintptr_t)(m_space[spacesizep.space()]));             // mov    param1,space
-	emit_mov_r32_p32(dst, REG_PARAM2, addrp);                                           // mov    param2,addrp
-	if (spacesizep.size() != SIZE_QWORD)
-		emit_mov_r32_p32(dst, REG_PARAM3, maskp);                                       // mov    param3,maskp
-	else
-		emit_mov_r64_p64(dst, REG_PARAM3, maskp);                                       // mov    param3,maskp
-	if (spacesizep.size() == SIZE_WORD)
-	{
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].read_word_masked);
-																						// call   read_word_masked
-		emit_movzx_r32_r16(dst, dstreg, REG_AX);                                        // movzx  dstreg,ax
-	}
-	else if (spacesizep.size() == SIZE_DWORD)
-	{
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].read_dword_masked);
-																						// call   read_dword_masked
-		if (dstreg != REG_EAX || inst.size() == 8)
-			emit_mov_r32_r32(dst, dstreg, REG_EAX);                                     // mov    dstreg,eax
-	}
-	else if (spacesizep.size() == SIZE_QWORD)
-	{
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].read_qword_masked);
-																						// call   read_qword_masked
-		if (dstreg != REG_RAX)
-			emit_mov_r64_r64(dst, dstreg, REG_RAX);                                     // mov    dstreg,rax
-	}
-
-	// store result
-	if (inst.size() == 4)
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-	else
-		emit_mov_p64_r64(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-}
-
-
-//-------------------------------------------------
-//  op_write - process a WRITE opcode
-//-------------------------------------------------
-
-void drcbe_x64::op_write(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_getexp(Assembler &a, const instruction &inst)
 {
 	// validate instruction
-	assert(inst.size() == 4 || inst.size() == 8);
+	assert(inst.size() == 4);
 	assert_no_condition(inst);
 	assert_no_flags(inst);
 
 	// normalize parameters
-	be_parameter addrp(*this, inst.param(0), PTYPE_MRI);
-	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
-	const parameter &spacesizep = inst.param(2);
-	assert(spacesizep.is_size_space());
+	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
 
-	// set up a call to the write byte handler
-	emit_mov_r64_imm(dst, REG_PARAM1, (uintptr_t)(m_space[spacesizep.space()]));             // mov    param1,space
-	emit_mov_r32_p32(dst, REG_PARAM2, addrp);                                           // mov    param2,addrp
-	if (spacesizep.size() != SIZE_QWORD)
-		emit_mov_r32_p32(dst, REG_PARAM3, srcp);                                        // mov    param3,srcp
+	// fetch the exception parameter and store to the destination
+	if (dstp.is_int_register())
+		a.mov(Gpd(dstp.ireg()), MABS(&m_state.exp));                                    // mov   reg,[exp]
 	else
-		emit_mov_r64_p64(dst, REG_PARAM3, srcp);                                        // mov    param3,srcp
-	if (spacesizep.size() == SIZE_BYTE)
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].write_byte);
-																						// call   write_byte
-	else if (spacesizep.size() == SIZE_WORD)
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].write_word);
-																						// call   write_word
-	else if (spacesizep.size() == SIZE_DWORD)
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].write_dword);
-																						// call   write_dword
-	else if (spacesizep.size() == SIZE_QWORD)
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].write_qword);
-																						// call   write_qword
+	{
+		a.mov(eax, MABS(&m_state.exp));                                                 // mov   eax,[exp]
+		a.mov(MABS(dstp.memory()), eax);                                                // mov   [dstp],eax
+	}
 }
 
 
 //-------------------------------------------------
-//  op_writem - process a WRITEM opcode
+//  op_getflgs - process a GETFLGS opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_writem(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_getflgs(Assembler &a, const instruction &inst)
 {
 	// validate instruction
-	assert(inst.size() == 4 || inst.size() == 8);
+	assert(inst.size() == 4);
 	assert_no_condition(inst);
 	assert_no_flags(inst);
 
 	// normalize parameters
-	be_parameter addrp(*this, inst.param(0), PTYPE_MRI);
-	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
-	be_parameter maskp(*this, inst.param(2), PTYPE_MRI);
-	const parameter &spacesizep = inst.param(3);
-	assert(spacesizep.is_size_space());
-
-	// set up a call to the write byte handler
-	emit_mov_r64_imm(dst, REG_PARAM1, (uintptr_t)(m_space[spacesizep.space()]));             // mov    param1,space
-	emit_mov_r32_p32(dst, REG_PARAM2, addrp);                                           // mov    param2,addrp
-	if (spacesizep.size() != SIZE_QWORD)
-	{
-		emit_mov_r32_p32(dst, REG_PARAM3, srcp);                                        // mov    param3,srcp
-		emit_mov_r32_p32(dst, REG_PARAM4, maskp);                                       // mov    param4,maskp
-	}
-	else
-	{
-		emit_mov_r64_p64(dst, REG_PARAM3, srcp);                                        // mov    param3,srcp
-		emit_mov_r64_p64(dst, REG_PARAM4, maskp);                                       // mov    param4,maskp
-	}
-	if (spacesizep.size() == SIZE_WORD)
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].write_word_masked);
-																						// call   write_word_masked
-	else if (spacesizep.size() == SIZE_DWORD)
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].write_dword_masked);
-																						// call   write_dword_masked
-	else if (spacesizep.size() == SIZE_QWORD)
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacesizep.space()].write_qword_masked);
-																						// call   write_qword_masked
-}
+	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
+	be_parameter maskp(*this, inst.param(1), PTYPE_I);
 
+	// pick a target register for the general case
+	Gp dstreg = dstp.select_register(eax);
 
-//-------------------------------------------------
-//  op_carry - process a CARRY opcode
-//-------------------------------------------------
+	// compute mask for flags
+	uint32_t flagmask = 0;
+	if (maskp.immediate() & FLAG_C) flagmask |= 0x001;
+	if (maskp.immediate() & FLAG_V) flagmask |= 0x800;
+	if (maskp.immediate() & FLAG_Z) flagmask |= 0x040;
+	if (maskp.immediate() & FLAG_S) flagmask |= 0x080;
+	if (maskp.immediate() & FLAG_U) flagmask |= 0x004;
 
-void drcbe_x64::op_carry(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4 || inst.size() == 8);
-	assert_no_condition(inst);
-	assert_flags(inst, FLAG_C);
+	switch (maskp.immediate())
+	{
+		// single flags only
+		case FLAG_C:
+			a.setc(al);                                                                 // setc   al
+			a.movzx(dstreg, al);                                                        // movzx  dstreg,al
+			break;
 
-	// normalize parameters
-	be_parameter srcp(*this, inst.param(0), PTYPE_MRI);
-	be_parameter bitp(*this, inst.param(1), PTYPE_MRI);
+		case FLAG_V:
+			a.seto(al);                                                                 // seto   al
+			a.movzx(dstreg, al);                                                        // movzx  dstreg,al
+			a.shl(dstreg, 1);                                                           // shl    dstreg,1
+			break;
 
-	// degenerate case: source is immediate
-	if (srcp.is_immediate() && bitp.is_immediate())
-	{
-		if (srcp.immediate() & ((uint64_t)1 << bitp.immediate()))
-			emit_stc(dst);
-		else
-			emit_clc(dst);
-		}
+		case FLAG_Z:
+			a.setz(al);                                                                 // setz   al
+			a.movzx(dstreg, al);                                                        // movzx  dstreg,al
+			a.shl(dstreg, 2);                                                           // shl    dstreg,2
+			break;
 
-	// load non-immediate bit numbers into a register
-	if (!bitp.is_immediate())
-	{
-		emit_mov_r32_p32(dst, REG_ECX, bitp);
-		emit_and_r32_imm(dst, REG_ECX, inst.size() * 8 - 1);
-	}
+		case FLAG_S:
+			a.sets(al);                                                                 // sets   al
+			a.movzx(dstreg, al);                                                        // movzx  dstreg,al
+			a.shl(dstreg, 3);                                                           // shl    dstreg,3
+			break;
 
-	// 32-bit form
-	if (inst.size() == 4)
-	{
-		if (bitp.is_immediate())
-		{
-			if (srcp.is_memory())
-				emit_bt_m32_imm(dst, MABS(srcp.memory()), bitp.immediate());            // bt     [srcp],bitp
-			else if (srcp.is_int_register())
-				emit_bt_r32_imm(dst, srcp.ireg(), bitp.immediate());                    // bt     srcp,bitp
-		}
-		else
-		{
-			if (srcp.is_memory())
-				emit_bt_m32_r32(dst, MABS(srcp.memory()), REG_ECX);                     // bt     [srcp],ecx
-			else if (srcp.is_int_register())
-				emit_bt_r32_r32(dst, srcp.ireg(), REG_ECX);                             // bt     srcp,ecx
-		}
-	}
+		case FLAG_U:
+			a.setp(al);                                                                 // setp   al
+			a.movzx(dstreg, al);                                                        // movzx  dstreg,al
+			a.shl(dstreg, 4);                                                           // shl    dstreg,4
+			break;
 
-	// 64-bit form
-	else
-	{
-		if (bitp.is_immediate())
-		{
-			if (srcp.is_memory())
-				emit_bt_m64_imm(dst, MABS(srcp.memory()), bitp.immediate());            // bt     [srcp],bitp
-			else if (srcp.is_int_register())
-				emit_bt_r64_imm(dst, srcp.ireg(), bitp.immediate());                    // bt     srcp,bitp
-		}
-		else
-		{
-			if (srcp.is_memory())
-				emit_bt_m64_r64(dst, MABS(srcp.memory()), REG_ECX);                     // bt     [srcp],ecx
-			else if (srcp.is_int_register())
-				emit_bt_r64_r64(dst, srcp.ireg(), REG_ECX);                             // bt     srcp,ecx
-		}
-	}
-}
+		// carry plus another flag
+		case FLAG_C | FLAG_V:
+			a.setc(al);                                                                 // setc   al
+			a.seto(cl);                                                                 // seto   cl
+			a.movzx(eax, al);                                                           // movzx  eax,al
+			a.movzx(ecx, cl);                                                           // movzx  ecx,cl
+			a.lea(dstreg, ptr(eax, ecx, 1));                                            // lea    dstreg,[eax+ecx*2]
+			break;
 
+		case FLAG_C | FLAG_Z:
+			a.setc(al);                                                                 // setc   al
+			a.setz(cl);                                                                 // setz   cl
+			a.movzx(eax, al);                                                           // movzx  eax,al
+			a.movzx(ecx, cl);                                                           // movzx  ecx,cl
+			a.lea(dstreg, ptr(eax, ecx, 2));                                            // lea    dstreg,[eax+ecx*4]
+			break;
 
-//-------------------------------------------------
-//  op_set - process a SET opcode
-//-------------------------------------------------
+		case FLAG_C | FLAG_S:
+			a.setc(al);                                                                 // setc   al
+			a.sets(cl);                                                                 // sets   cl
+			a.movzx(eax, al);                                                           // movzx  eax,al
+			a.movzx(ecx, cl);                                                           // movzx  ecx,cl
+			a.lea(dstreg, ptr(eax, ecx, 3));                                            // lea    dstreg,[eax+ecx*8]
+			break;
 
-void drcbe_x64::op_set(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4 || inst.size() == 8);
-	assert_any_condition(inst);
-	assert_no_flags(inst);
+		// overflow plus another flag
+		case FLAG_V | FLAG_Z:
+			a.seto(al);                                                                 // seto   al
+			a.setz(cl);                                                                 // setz   cl
+			a.movzx(eax, al);                                                           // movzx  eax,al
+			a.movzx(ecx, cl);                                                           // movzx  ecx,cl
+			a.lea(dstreg, ptr(eax, ecx, 1));                                            // lea    dstreg,[eax+ecx*2]
+			a.shl(dstreg, 1);                                                           // shl    dstreg,1
+			break;
 
-	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
+		case FLAG_V | FLAG_S:
+			a.seto(al);                                                                 // seto   al
+			a.sets(cl);                                                                 // sets   cl
+			a.movzx(eax, al);                                                           // movzx  eax,al
+			a.movzx(ecx, cl);                                                           // movzx  ecx,cl
+			a.lea(dstreg, ptr(eax, ecx, 2));                                            // lea    dstreg,[eax+ecx*4]
+			a.shl(dstreg, 1);                                                           // shl    dstreg,1
+			break;
 
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+		// zero plus another flag
+		case FLAG_Z | FLAG_S:
+			a.setz(al);                                                                 // setz   al
+			a.sets(cl);                                                                 // sets   cl
+			a.movzx(eax, al);                                                           // movzx  eax,al
+			a.movzx(ecx, cl);                                                           // movzx  ecx,cl
+			a.lea(dstreg, ptr(eax, ecx, 1));                                            // lea    dstreg,[eax+ecx*2]
+			a.shl(dstreg, 2);                                                           // shl    dstreg,2
+			break;
 
-	// set to AL
-	emit_setcc_r8(dst, X86_CONDITION(inst.condition()), REG_AL);                        // setcc  al
-	emit_movzx_r32_r8(dst, dstreg, REG_AL);                                             // movzx  dstreg,al
+		// default cases
+		default:
+			a.pushfq();                                                                 // pushf
+			a.pop(eax);                                                                 // pop    eax
+			a.and_(eax, flagmask);                                                      // and    eax,flagmask
+			a.movzx(dstreg, byte_ptr(rbp, rax, 0, offset_from_rbp(&m_near.flagsmap[0]))); // movzx  dstreg,[flags_map]
+			break;
+	}
 
 	// 32-bit form
 	if (inst.size() == 4)
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 
 	// 64-bit form
 	else if (inst.size() == 8)
-		emit_mov_p64_r64(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-
+		mov_param_reg(a, dstp, dstreg.r64());                                           // mov   dstp,dstreg
 }
 
 
 //-------------------------------------------------
-//  op_mov - process a MOV opcode
+//  op_save - process a SAVE opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_mov(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_save(Assembler &a, const instruction &inst)
 {
-	x86code *savedst = dst;
-
 	// validate instruction
-	assert(inst.size() == 4 || inst.size() == 8);
-	assert_any_condition(inst);
+	assert(inst.size() == 4);
+	assert_no_condition(inst);
 	assert_no_flags(inst);
 
 	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
+	be_parameter dstp(*this, inst.param(0), PTYPE_M);
 
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+	// copy live state to the destination
+	mov_r64_imm(a, rcx, (uintptr_t)dstp.memory());                                      // mov    rcx,dstp
 
-	// always start with a jmp
-	emit_link skip = { nullptr };
-	if (inst.condition() != uml::COND_ALWAYS)
-		emit_jcc_short_link(dst, X86_NOT_CONDITION(inst.condition()), skip);            // jcc   skip
+	// copy flags
+	a.pushfq();                                                                         // pushf
+	a.pop(rax);                                                                         // pop    rax
+	a.and_(eax, 0x8c5);                                                                 // and    eax,0x8c5
+	a.mov(al, ptr(rbp, rax, 0, offset_from_rbp(&m_near.flagsmap[0])));                  // mov    al,[flags_map]
+	a.mov(ptr(rcx, offsetof(drcuml_machine_state, flags)), al);                         // mov    state->flags,al
 
-	// 32-bit form
-	if (inst.size() == 4)
-	{
-		// register to memory
-		if (dstp.is_memory() && srcp.is_int_register())
-			emit_mov_m32_r32(dst, MABS(dstp.memory()), srcp.ireg());                    // mov   [dstp],srcp
-
-		// immediate to memory
-		else if (dstp.is_memory() && srcp.is_immediate())
-			emit_mov_m32_imm(dst, MABS(dstp.memory()), srcp.immediate());               // mov   [dstp],srcp
-
-		// conditional memory to register
-		else if (inst.condition() != 0 && dstp.is_int_register() && srcp.is_memory())
-		{
-			dst = savedst;
-			skip.target = nullptr;
-			emit_cmovcc_r32_m32(dst, X86_CONDITION(inst.condition()), dstp.ireg(), MABS(srcp.memory()));
-																						// cmovcc dstp,[srcp]
-		}
-
-		// conditional register to register
-		else if (inst.condition() != 0 && dstp.is_int_register() && srcp.is_int_register())
-		{
-			dst = savedst;
-			skip.target = nullptr;
-			emit_cmovcc_r32_r32(dst, X86_CONDITION(inst.condition()), dstp.ireg(), srcp.ireg());
-																						// cmovcc dstp,srcp
-		}
+	// copy fmod and exp
+	a.mov(al, MABS(&m_state.fmod));                                                     // mov    al,[fmod]
+	a.mov(ptr(rcx, offsetof(drcuml_machine_state, fmod)), al);                          // mov    state->fmod,al
+	a.mov(eax, MABS(&m_state.exp));                                                     // mov    eax,[exp]
+	a.mov(ptr(rcx, offsetof(drcuml_machine_state, exp)), eax);                          // mov    state->exp,eax
 
-		// general case
+	// copy integer registers
+	int regoffs = offsetof(drcuml_machine_state, r);
+	for (int regnum = 0; regnum < ARRAY_LENGTH(m_state.r); regnum++)
+	{
+		if (int_register_map[regnum] != 0)
+			a.mov(ptr(rcx, regoffs + 8 * regnum), Gpq(regnum));
 		else
 		{
-			emit_mov_r32_p32_keepflags(dst, dstreg, srcp);                              // mov   dstreg,srcp
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+			a.mov(rax, MABS(&m_state.r[regnum].d));
+			a.mov(ptr(rcx, regoffs + 8 * regnum), rax);
 		}
 	}
 
-	// 64-bit form
-	else if (inst.size() == 8)
+	// copy FP registers
+	regoffs = offsetof(drcuml_machine_state, f);
+	for (int regnum = 0; regnum < ARRAY_LENGTH(m_state.f); regnum++)
 	{
-		// register to memory
-		if (dstp.is_memory() && srcp.is_int_register())
-			emit_mov_m64_r64(dst, MABS(dstp.memory()), srcp.ireg());                    // mov   [dstp],srcp
-
-		// immediate to memory
-		else if (dstp.is_memory() && srcp.is_immediate() && short_immediate(srcp.immediate()))
-			emit_mov_m64_imm(dst, MABS(dstp.memory()), srcp.immediate());               // mov   [dstp],srcp
-
-		// conditional memory to register
-		else if (inst.condition() != 0 && dstp.is_int_register() && srcp.is_memory())
-		{
-			dst = savedst;
-			skip.target = nullptr;
-			emit_cmovcc_r64_m64(dst, X86_CONDITION(inst.condition()), dstp.ireg(), MABS(srcp.memory()));
-																						// cmovcc dstp,[srcp]
-		}
-
-		// conditional register to register
-		else if (inst.condition() != 0 && dstp.is_int_register() && srcp.is_int_register())
-		{
-			dst = savedst;
-			skip.target = nullptr;
-			emit_cmovcc_r64_r64(dst, X86_CONDITION(inst.condition()), dstp.ireg(), srcp.ireg());
-																						// cmovcc dstp,srcp
-		}
-
-		// general case
+		if (float_register_map[regnum] != 0)
+			a.movsd(ptr(rcx, regoffs + 8 * regnum), Xmm(regnum));
 		else
 		{
-			emit_mov_r64_p64_keepflags(dst, dstreg, srcp);                              // mov   dstreg,srcp
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+			a.mov(rax, MABS(&m_state.f[regnum].d));
+			a.mov(ptr(rcx, regoffs + 8 * regnum), rax);
 		}
 	}
-
-	// resolve the jump
-	if (skip.target != nullptr)
-		resolve_link(dst, skip);
 }
 
 
 //-------------------------------------------------
-//  op_sext - process a SEXT opcode
+//  op_restore - process a RESTORE opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_sext(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_restore(Assembler &a, const instruction &inst)
 {
 	// validate instruction
-	assert(inst.size() == 4 || inst.size() == 8);
+	assert(inst.size() == 4);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_S | FLAG_Z);
 
 	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
-	const parameter &sizep = inst.param(2);
-	assert(sizep.is_size());
+	be_parameter srcp(*this, inst.param(0), PTYPE_M);
 
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+	// copy live state from the destination
+	mov_r64_imm(a, rcx, (uintptr_t)srcp.memory());                                      // mov    rcx,dstp
 
-	// 32-bit form
-	if (inst.size() == 4)
+	// copy integer registers
+	int regoffs = offsetof(drcuml_machine_state, r);
+	for (int regnum = 0; regnum < ARRAY_LENGTH(m_state.r); regnum++)
 	{
-		// general case
-		if (srcp.is_memory())
-		{
-			if (sizep.size() == SIZE_BYTE)
-				emit_movsx_r32_m8(dst, dstreg, MABS(srcp.memory()));                    // movsx dstreg,[srcp]
-			else if (sizep.size() == SIZE_WORD)
-				emit_movsx_r32_m16(dst, dstreg, MABS(srcp.memory()));                   // movsx dstreg,[srcp]
-			else if (sizep.size() == SIZE_DWORD)
-				emit_mov_r32_m32(dst, dstreg, MABS(srcp.memory()));                     // mov   dstreg,[srcp]
-		}
-		else if (srcp.is_int_register())
+		if (int_register_map[regnum] != 0)
+			a.mov(Gpq(regnum), ptr(rcx, regoffs + 8 * regnum));
+		else
 		{
-			if (sizep.size() == SIZE_BYTE)
-				emit_movsx_r32_r8(dst, dstreg, srcp.ireg());                            // movsx dstreg,srcp
-			else if (sizep.size() == SIZE_WORD)
-				emit_movsx_r32_r16(dst, dstreg, srcp.ireg());                           // movsx dstreg,srcp
-			else if (sizep.size() == SIZE_DWORD)
-				emit_mov_r32_r32(dst, dstreg, srcp.ireg());                             // mov   dstreg,srcp
+			a.mov(rax, ptr(rcx, regoffs + 8 * regnum));
+			a.mov(MABS(&m_state.r[regnum].d), rax);
 		}
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-		if (inst.flags() != 0)
-			emit_test_r32_r32(dst, dstreg, dstreg);                                     // test  dstreg,dstreg
 	}
 
-	// 64-bit form
-	else if (inst.size() == 8)
+	// copy FP registers
+	regoffs = offsetof(drcuml_machine_state, f);
+	for (int regnum = 0; regnum < ARRAY_LENGTH(m_state.f); regnum++)
 	{
-		// general case
-		if (srcp.is_memory())
-		{
-			if (sizep.size() == SIZE_BYTE)
-				emit_movsx_r64_m8(dst, dstreg, MABS(srcp.memory()));                    // movsx dstreg,[srcp]
-			else if (sizep.size() == SIZE_WORD)
-				emit_movsx_r64_m16(dst, dstreg, MABS(srcp.memory()));                   // movsx dstreg,[srcp]
-			else if (sizep.size() == SIZE_DWORD)
-				emit_movsxd_r64_m32(dst, dstreg, MABS(srcp.memory()));                  // movsxd dstreg,[srcp]
-			else if (sizep.size() == SIZE_QWORD)
-				emit_mov_r64_m64(dst, dstreg, MABS(srcp.memory()));                     // mov   dstreg,[srcp]
-		}
-		else if (srcp.is_int_register())
+		if (float_register_map[regnum] != 0)
+			a.movsd(Xmm(regnum), ptr(rcx, regoffs + 8 * regnum));
+		else
 		{
-			if (sizep.size() == SIZE_BYTE)
-				emit_movsx_r64_r8(dst, dstreg, srcp.ireg());                            // movsx dstreg,srcp
-			else if (sizep.size() == SIZE_WORD)
-				emit_movsx_r64_r16(dst, dstreg, srcp.ireg());                           // movsx dstreg,srcp
-			else if (sizep.size() == SIZE_DWORD)
-				emit_movsxd_r64_r32(dst, dstreg, srcp.ireg());                          // movsxd dstreg,srcp
-			else if (sizep.size() == SIZE_QWORD)
-				emit_mov_r64_r64(dst, dstreg, srcp.ireg());                             // mov   dstreg,srcp
+			a.mov(rax, ptr(rcx, regoffs + 8 * regnum));
+			a.mov(MABS(&m_state.f[regnum].d), rax);
 		}
-		emit_mov_p64_r64(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-		if (inst.flags() != 0)
-			emit_test_r64_r64(dst, dstreg, dstreg);                                     // test  dstreg,dstreg
 	}
+
+	Mem fmod = MABS(&m_state.fmod);
+	fmod.setSize(1);
+
+	// copy fmod and exp
+	a.movzx(eax, byte_ptr(rcx, offsetof(drcuml_machine_state, fmod)));                  // movzx  eax,state->fmod
+	a.and_(eax, 3);                                                                     // and    eax,3
+	a.mov(MABS(&m_state.fmod), al);                                                     // mov    [fmod],al
+	a.ldmxcsr(ptr(rbp, rax, 2, offset_from_rbp(&m_near.ssecontrol[0])));                // ldmxcsr fp_control[eax]
+	a.mov(eax, ptr(rcx, offsetof(drcuml_machine_state, exp)));                          // mov    eax,state->exp
+	a.mov(MABS(&m_state.exp), eax);                                                     // mov    [exp],eax
+
+	// copy flags
+	a.movzx(eax, byte_ptr(rcx, offsetof(drcuml_machine_state, flags)));                 // movzx  eax,state->flags
+	a.push(ptr(rbp, rax, 3, offset_from_rbp(&m_near.flagsunmap[0])));                   // push   flags_unmap[eax*8]
+	a.popfq();                                                                          // popf
 }
 
 
+
+/***************************************************************************
+    INTEGER OPERATIONS
+***************************************************************************/
+
 //-------------------------------------------------
-//  op_roland - process an ROLAND opcode
+//  op_load - process a LOAD opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_roland(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_load(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_S | FLAG_Z);
+	assert_no_flags(inst);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
-	be_parameter shiftp(*this, inst.param(2), PTYPE_MRI);
-	be_parameter maskp(*this, inst.param(3), PTYPE_MRI);
+	be_parameter basep(*this, inst.param(1), PTYPE_M);
+	be_parameter indp(*this, inst.param(2), PTYPE_MRI);
+	const parameter &scalesizep = inst.param(3);
+	assert(scalesizep.is_size_scale());
+	int size = scalesizep.size();
+
+	// determine the pointer base
+	int32_t baseoffs;
+	Gp basereg = get_base_register_and_offset(a, basep.memory(), rdx, baseoffs);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, shiftp, maskp);
+	Gp dstreg = dstp.select_register(eax);
 
-	// 32-bit form
-	if (inst.size() == 4)
+	// immediate index
+	if (indp.is_immediate())
 	{
-		emit_mov_r32_p32(dst, dstreg, srcp);                                            // mov   dstreg,srcp
-		emit_rol_r32_p32(dst, dstreg, shiftp, inst);                                    // rol   dstreg,shiftp
-		emit_and_r32_p32(dst, dstreg, maskp, inst);                                     // and   dstreg,maskp
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
+		s32 const offset = baseoffs + (s32(indp.immediate()) << scalesizep.scale());
+
+		if (size == SIZE_BYTE)
+			a.movzx(dstreg, byte_ptr(basereg, offset));                                 // movzx dstreg,[basep + scale*indp]
+		else if (size == SIZE_WORD)
+			a.movzx(dstreg, word_ptr(basereg, offset));                                 // movzx dstreg,[basep + scale*indp]
+		else if (size == SIZE_DWORD)
+			a.mov(dstreg, ptr(basereg, offset));                                        // mov   dstreg,[basep + scale*indp]
+		else if (size == SIZE_QWORD)
+			a.mov(dstreg.r64(), ptr(basereg, offset));                                  // mov   dstreg,[basep + scale*indp]
 	}
 
-	// 64-bit form
-	else if (inst.size() == 8)
+	// other index
+	else
 	{
-		emit_mov_r64_p64(dst, dstreg, srcp);                                            // mov   dstreg,srcp
-		emit_rol_r64_p64(dst, dstreg, shiftp, inst);                                    // rol   dstreg,shiftp
-		emit_and_r64_p64(dst, dstreg, maskp, inst);                                     // and   dstreg,maskp
-		emit_mov_p64_r64(dst, dstp, dstreg);                                            // mov   dstp,dstreg
+		Gp indreg = indp.select_register(rcx);
+		movsx_r64_p32(a, indreg, indp);
+		if (size == SIZE_BYTE)
+			a.movzx(dstreg, byte_ptr(basereg, indreg, scalesizep.scale(), baseoffs));   // movzx dstreg,[basep + scale*indp]
+		else if (size == SIZE_WORD)
+			a.movzx(dstreg, word_ptr(basereg, indreg, scalesizep.scale(), baseoffs));   // movzx dstreg,[basep + scale*indp]
+		else if (size == SIZE_DWORD)
+			a.mov(dstreg, ptr(basereg, indreg, scalesizep.scale(), baseoffs));          // mov   dstreg,[basep + scale*indp]
+		else if (size == SIZE_QWORD)
+			a.mov(dstreg.r64(), ptr(basereg, indreg, scalesizep.scale(), baseoffs));    // mov   dstreg,[basep + scale*indp]
 	}
+
+	// store result
+	if (inst.size() == 4)
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
+	else
+		mov_param_reg(a, dstp, dstreg.r64());                                           // mov   dstp,dstreg
 }
 
 
 //-------------------------------------------------
-//  op_rolins - process an ROLINS opcode
+//  op_loads - process a LOADS opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_rolins(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_loads(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_S | FLAG_Z);
+	assert_no_flags(inst);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
-	be_parameter shiftp(*this, inst.param(2), PTYPE_MRI);
-	be_parameter maskp(*this, inst.param(3), PTYPE_MRI);
+	be_parameter basep(*this, inst.param(1), PTYPE_M);
+	be_parameter indp(*this, inst.param(2), PTYPE_MRI);
+	const parameter &scalesizep = inst.param(3);
+	assert(scalesizep.is_size_scale());
+	int size = scalesizep.size();
+
+	// determine the pointer base
+	int32_t baseoffs;
+	Gp basereg = get_base_register_and_offset(a, basep.memory(), rdx, baseoffs);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_ECX, shiftp, maskp);
+	Gp dstreg = dstp.select_register((inst.size() == 4) ? eax : rax);
 
-	// 32-bit form
-	if (inst.size() == 4)
+	// immediate index
+	if (indp.is_immediate())
 	{
-		emit_mov_r32_p32(dst, REG_EAX, srcp);                                           // mov   eax,srcp
-		emit_rol_r32_p32(dst, REG_EAX, shiftp, inst);                                   // rol   eax,shiftp
-		emit_mov_r32_p32(dst, dstreg, dstp);                                            // mov   dstreg,dstp
-		if (maskp.is_immediate())
-		{
-			emit_and_r32_imm(dst, REG_EAX, maskp.immediate());                          // and   eax,maskp
-			emit_and_r32_imm(dst, dstreg, ~maskp.immediate());                          // and   dstreg,~maskp
-		}
-		else
-		{
-			emit_mov_r32_p32(dst, REG_EDX, maskp);                                      // mov   edx,maskp
-			emit_and_r32_r32(dst, REG_EAX, REG_EDX);                                    // and   eax,edx
-			emit_not_r32(dst, REG_EDX);                                                 // not   edx
-			emit_and_r32_r32(dst, dstreg, REG_EDX);                                     // and   dstreg,edx
-		}
-		emit_or_r32_r32(dst, dstreg, REG_EAX);                                          // or    dstreg,eax
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
+		s32 const offset = baseoffs + (s32(indp.immediate()) << scalesizep.scale());
+
+		if (size == SIZE_BYTE)
+			a.movsx(dstreg, byte_ptr(basereg, offset));                                 // movsx dstreg,[basep + scale*indp]
+		else if (size == SIZE_WORD)
+			a.movsx(dstreg, word_ptr(basereg, offset));                                 // movsx dstreg,[basep + scale*indp]
+		else if (size == SIZE_DWORD && inst.size() == 4)
+			a.mov(dstreg, ptr(basereg, offset));                                        // mov   dstreg,[basep + scale*indp]
+		else if (size == SIZE_DWORD)
+			a.movsxd(dstreg, ptr(basereg, offset));                                     // movsxd dstreg,[basep + scale*indp]
+		else if (size == SIZE_QWORD)
+			a.mov(dstreg, ptr(basereg, offset));                                        // mov   dstreg,[basep + scale*indp]
 	}
 
-	// 64-bit form
-	else if (inst.size() == 8)
+	// other index
+	else
 	{
-		emit_mov_r64_p64(dst, REG_RAX, srcp);                                           // mov   rax,srcp
-		emit_mov_r64_p64(dst, REG_RDX, maskp);                                          // mov   rdx,maskp
-		emit_rol_r64_p64(dst, REG_RAX, shiftp, inst);                                   // rol   rax,shiftp
-		emit_mov_r64_p64(dst, dstreg, dstp);                                            // mov   dstreg,dstp
-		emit_and_r64_r64(dst, REG_RAX, REG_RDX);                                        // and   eax,rdx
-		emit_not_r64(dst, REG_RDX);                                                     // not   rdx
-		emit_and_r64_r64(dst, dstreg, REG_RDX);                                         // and   dstreg,rdx
-		emit_or_r64_r64(dst, dstreg, REG_RAX);                                          // or    dstreg,rax
-		emit_mov_p64_r64(dst, dstp, dstreg);                                            // mov   dstp,dstreg
+		Gp indreg = indp.select_register(rcx);
+		movsx_r64_p32(a, indreg, indp);
+		if (size == SIZE_BYTE)
+			a.movsx(dstreg, byte_ptr(basereg, indreg, scalesizep.scale(), baseoffs));   // movsx dstreg,[basep + scale*indp]
+		else if (size == SIZE_WORD)
+			a.movsx(dstreg, word_ptr(basereg, indreg, scalesizep.scale(), baseoffs));   // movsx dstreg,[basep + scale*indp]
+		else if (size == SIZE_DWORD && inst.size() == 4)
+			a.mov(dstreg, ptr(basereg, indreg, scalesizep.scale(), baseoffs));          // mov   dstreg,[basep + scale*indp]
+		else if (size == SIZE_DWORD)
+			a.movsxd(dstreg, ptr(basereg, indreg, scalesizep.scale(), baseoffs));       // movsxd dstreg,[basep + scale*indp]
+		else if (size == SIZE_QWORD)
+			a.mov(dstreg, ptr(basereg, indreg, scalesizep.scale(), baseoffs));          // mov   dstreg,[basep + scale*indp]
 	}
+
+	// store result
+	mov_param_reg(a, dstp, dstreg);                                                     // mov   dstp,dstreg
 }
 
 
 //-------------------------------------------------
-//  op_add - process a ADD opcode
+//  op_store - process a STORE opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_add(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_store(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_C | FLAG_V | FLAG_Z | FLAG_S);
+	assert_no_flags(inst);
 
 	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
-	normalize_commutative(src1p, src2p);
+	be_parameter basep(*this, inst.param(0), PTYPE_M);
+	be_parameter indp(*this, inst.param(1), PTYPE_MRI);
+	be_parameter srcp(*this, inst.param(2), PTYPE_MRI);
+	const parameter &scalesizep = inst.param(3);
+	int size = scalesizep.size();
 
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	// determine the pointer base
+	int32_t baseoffs;
+	Gp basereg = get_base_register_and_offset(a, basep.memory(), rdx, baseoffs);
 
-	// 32-bit form
-	if (inst.size() == 4)
+	// pick a source register for the general case
+	Gp srcreg = srcp.select_register(rax);
+
+	// degenerate case: constant index
+	if (indp.is_immediate())
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_add_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                    // add   [dstp],src2p
+		s32 const offset = baseoffs + (s32(indp.immediate()) << scalesizep.scale());
 
-		// dstp == src2p in memory
-		else if (dstp.is_memory() && dstp == src2p)
-			emit_add_m32_p32(dst, MABS(dstp.memory()), src1p, inst);                    // add   [dstp],src1p
-
-		// reg = reg + imm
-		else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_immediate() && inst.flags() == 0)
-			emit_lea_r32_m32(dst, dstp.ireg(), MBD(src1p.ireg(), src2p.immediate()));   // lea   dstp,[src1p+src2p]
-
-		// reg = reg + reg
-		else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_int_register() && inst.flags() == 0)
-			emit_lea_r32_m32(dst, dstp.ireg(), MBISD(src1p.ireg(), src2p.ireg(), 1, 0));// lea   dstp,[src1p+src2p]
+		// immediate source
+		if (srcp.is_immediate())
+		{
+			if (size == SIZE_QWORD)
+			{
+				if (short_immediate(srcp.immediate()))
+					a.mov(qword_ptr(basereg, offset), s32(srcp.immediate()));           // mov   [basep + scale*indp],srcp
+				else
+				{
+					a.mov(ptr(basereg, offset + 0), u32(srcp.immediate() >>  0));       // mov   [basep + scale*indp],srcp
+					a.mov(ptr(basereg, offset + 4), u32(srcp.immediate() >> 32));       // mov   [basep + scale*indp + 4],srcp >> 32
+				}
+			}
+			else
+				a.mov(ptr(basereg, offset, 1 << size), srcp.immediate());               // mov   [basep + scale*indp],srcp
+		}
 
-		// general case
+		// variable source
 		else
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_add_r32_p32(dst, dstreg, src2p, inst);                                 // add   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+			if (size != SIZE_QWORD)
+				mov_reg_param(a, srcreg.r32(), srcp);                                   // mov   srcreg,srcp
+			else
+				mov_reg_param(a, srcreg.r64(), srcp);                                   // mov   srcreg,srcp
+			if (size == SIZE_BYTE)
+				a.mov(ptr(basereg, offset), srcreg.r8());                               // mov   [basep + scale*indp],srcreg
+			else if (size == SIZE_WORD)
+				a.mov(ptr(basereg, offset), srcreg.r16());                              // mov   [basep + scale*indp],srcreg
+			else if (size == SIZE_DWORD)
+				a.mov(ptr(basereg, offset), srcreg.r32());                              // mov   [basep + scale*indp],srcreg
+			else if (size == SIZE_QWORD)
+				a.mov(ptr(basereg, offset), srcreg.r64());                              // mov   [basep + scale*indp],srcreg
 		}
 	}
 
-	// 64-bit form
-	else if (inst.size() == 8)
+	// normal case: variable index
+	else
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_add_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                    // add   [dstp],src2p
+		Gp indreg = indp.select_register(rcx);
+		movsx_r64_p32(a, indreg, indp);                                                 // mov   indreg,indp
 
-		// dstp == src2p in memory
-		else if (dstp.is_memory() && dstp == src2p)
-			emit_add_m64_p64(dst, MABS(dstp.memory()), src1p, inst);                    // add   [dstp],src1p
-
-		// reg = reg + imm
-		else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_immediate() && short_immediate(src2p.immediate()) && inst.flags() == 0)
-			emit_lea_r64_m64(dst, dstp.ireg(), MBD(src1p.ireg(), src2p.immediate()));   // lea   dstp,[src1p+src2p]
-
-		// reg = reg + reg
-		else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_int_register() && inst.flags() == 0)
-			emit_lea_r64_m64(dst, dstp.ireg(), MBISD(src1p.ireg(), src2p.ireg(), 1, 0));// lea   dstp,[src1p+src2p]
+		// immediate source
+		if (srcp.is_immediate())
+		{
+			if (size == SIZE_QWORD)
+			{
+				if (short_immediate(srcp.immediate()))
+					a.mov(qword_ptr(basereg, indreg, scalesizep.scale(), baseoffs), s32(srcp.immediate()));     // mov   [basep + scale*indp],srcp
+				else
+				{
+					a.mov(ptr(basereg, indreg, scalesizep.scale(), baseoffs + 0), u32(srcp.immediate() >>  0)); // mov   [basep + scale*ecx],srcp
+					a.mov(ptr(basereg, indreg, scalesizep.scale(), baseoffs + 4), u32(srcp.immediate() >> 32)); // mov   [basep + scale*ecx + 4],srcp >> 32
+				}
+			}
+			else
+				a.mov(ptr(basereg, indreg, scalesizep.scale(), baseoffs, 1 << size), srcp.immediate());         // mov   [basep + scale*ecx],srcp
+		}
 
-		// general case
+		// variable source
 		else
 		{
-			emit_mov_r64_p64(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_add_r64_p64(dst, dstreg, src2p, inst);                                 // add   dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+			if (size != SIZE_QWORD)
+				mov_reg_param(a, srcreg.r32(), srcp);                                   // mov   srcreg,srcp
+			else
+				mov_reg_param(a, srcreg.r64(), srcp);                                   // mov   edx:srcreg,srcp
+			if (size == SIZE_BYTE)
+				a.mov(ptr(basereg, indreg, scalesizep.scale(), baseoffs), srcreg.r8()); // mov   [basep + scale*ecx],srcreg
+			else if (size == SIZE_WORD)
+				a.mov(ptr(basereg, indreg, scalesizep.scale(), baseoffs), srcreg.r16());// mov   [basep + scale*ecx],srcreg
+			else if (size == SIZE_DWORD)
+				a.mov(ptr(basereg, indreg, scalesizep.scale(), baseoffs), srcreg.r32());// mov   [basep + scale*ecx],srcreg
+			else if (size == SIZE_QWORD)
+				a.mov(ptr(basereg, indreg, scalesizep.scale(), baseoffs), srcreg.r64());// mov   [basep + scale*ecx],srcreg
 		}
 	}
 }
 
 
 //-------------------------------------------------
-//  op_addc - process a ADDC opcode
+//  op_read - process a READ opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_addc(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_read(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_C | FLAG_V | FLAG_Z | FLAG_S);
+	assert_no_flags(inst);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
-	normalize_commutative(src1p, src2p);
+	be_parameter addrp(*this, inst.param(1), PTYPE_MRI);
+	const parameter &spacesizep = inst.param(2);
+	assert(spacesizep.is_size_space());
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp dstreg = dstp.select_register(eax);
 
-	// 32-bit form
-	if (inst.size() == 4)
+	// set up a call to the read byte handler
+	mov_r64_imm(a, Gpq(REG_PARAM1), (uintptr_t)m_space[spacesizep.space()]);            // mov    param1,space
+	mov_reg_param(a, Gpd(REG_PARAM2), addrp);                                           // mov    param2,addrp
+	if (spacesizep.size() == SIZE_BYTE)
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_adc_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                    // adc   [dstp],src2p
-
-		// general case
-		else
-		{
-			emit_mov_r32_p32_keepflags(dst, dstreg, src1p);                             // mov   dstreg,src1p
-			emit_adc_r32_p32(dst, dstreg, src2p, inst);                                 // adc   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].read_byte);
+																						// call   read_byte
+		a.movzx(dstreg, al);                                                            // movzx  dstreg,al
 	}
-
-	// 64-bit form
-	else if (inst.size() == 8)
+	else if (spacesizep.size() == SIZE_WORD)
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_adc_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                    // adc   [dstp],src2p
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].read_word);
+																						// call   read_word
+		a.movzx(dstreg, ax);                                                            // movzx  dstreg,ax
+	}
+	else if (spacesizep.size() == SIZE_DWORD)
+	{
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].read_dword);
+																						// call   read_dword
+		if (dstreg != eax || inst.size() == 8)
+			a.mov(dstreg, eax);                                                         // mov    dstreg,eax
+	}
+	else if (spacesizep.size() == SIZE_QWORD)
+	{
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].read_qword);
+																						// call   read_qword
+		if (dstreg != eax)
+			a.mov(dstreg.r64(), rax);                                                   // mov    dstreg,rax
+	}
 
-		// general case
-		else
-		{
-			emit_mov_r64_p64_keepflags(dst, dstreg, src1p);                             // mov   dstreg,src1p
-			emit_adc_r64_p64(dst, dstreg, src2p, inst);                                 // adc   dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+	// store result
+	if (inst.size() == 4)
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
+	else
+		mov_param_reg(a, dstp, dstreg.r64());                                           // mov   dstp,dstreg
+}
+
+
+//-------------------------------------------------
+//  op_readm - process a READM opcode
+//-------------------------------------------------
+
+void drcbe_x64::op_readm(Assembler &a, const instruction &inst)
+{
+	// validate instruction
+	assert(inst.size() == 4 || inst.size() == 8);
+	assert_no_condition(inst);
+	assert_no_flags(inst);
+
+	// normalize parameters
+	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
+	be_parameter addrp(*this, inst.param(1), PTYPE_MRI);
+	be_parameter maskp(*this, inst.param(2), PTYPE_MRI);
+	const parameter &spacesizep = inst.param(3);
+	assert(spacesizep.is_size_space());
+
+	// pick a target register for the general case
+	Gp dstreg = dstp.select_register(eax);
+
+	// set up a call to the read byte handler
+	mov_r64_imm(a, Gpq(REG_PARAM1), (uintptr_t)m_space[spacesizep.space()]);            // mov    param1,space
+	mov_reg_param(a, Gpd(REG_PARAM2), addrp);                                           // mov    param2,addrp
+	if (spacesizep.size() != SIZE_QWORD)
+		mov_reg_param(a, Gpd(REG_PARAM3), maskp);                                       // mov    param3,maskp
+	else
+		mov_reg_param(a, Gpq(REG_PARAM3), maskp);                                       // mov    param3,maskp
+	if (spacesizep.size() == SIZE_WORD)
+	{
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].read_word_masked);
+																						// call   read_word_masked
+		a.movzx(dstreg, ax);                                                            // movzx  dstreg,ax
+	}
+	else if (spacesizep.size() == SIZE_DWORD)
+	{
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].read_dword_masked);
+																						// call   read_dword_masked
+		if (dstreg != eax || inst.size() == 8)
+			a.mov(dstreg, eax);                                                         // mov    dstreg,eax
 	}
+	else if (spacesizep.size() == SIZE_QWORD)
+	{
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].read_qword_masked);
+																						// call   read_qword_masked
+		if (dstreg != eax)
+			a.mov(dstreg.r64(), rax);                                                   // mov    dstreg,rax
+	}
+
+	// store result
+	if (inst.size() == 4)
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
+	else
+		mov_param_reg(a, dstp, dstreg.r64());                                           // mov   dstp,dstreg
+}
+
+
+//-------------------------------------------------
+//  op_write - process a WRITE opcode
+//-------------------------------------------------
+
+void drcbe_x64::op_write(Assembler &a, const instruction &inst)
+{
+	// validate instruction
+	assert(inst.size() == 4 || inst.size() == 8);
+	assert_no_condition(inst);
+	assert_no_flags(inst);
+
+	// normalize parameters
+	be_parameter addrp(*this, inst.param(0), PTYPE_MRI);
+	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
+	const parameter &spacesizep = inst.param(2);
+	assert(spacesizep.is_size_space());
+
+	// set up a call to the write byte handler
+	mov_r64_imm(a, Gpq(REG_PARAM1), (uintptr_t)m_space[spacesizep.space()]);            // mov    param1,space
+	mov_reg_param(a, Gpd(REG_PARAM2), addrp);                                           // mov    param2,addrp
+	if (spacesizep.size() != SIZE_QWORD)
+		mov_reg_param(a, Gpd(REG_PARAM3), srcp);                                        // mov    param3,srcp
+	else
+		mov_reg_param(a, Gpq(REG_PARAM3), srcp);                                        // mov    param3,srcp
+	if (spacesizep.size() == SIZE_BYTE)
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].write_byte);     // call   write_byte
+	else if (spacesizep.size() == SIZE_WORD)
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].write_word);     // call   write_word
+	else if (spacesizep.size() == SIZE_DWORD)
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].write_dword);    // call   write_dword
+	else if (spacesizep.size() == SIZE_QWORD)
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].write_qword);    // call   write_qword
 }
 
 
 //-------------------------------------------------
-//  op_sub - process a SUB opcode
+//  op_writem - process a WRITEM opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_sub(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_writem(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_C | FLAG_V | FLAG_Z | FLAG_S);
+	assert_no_flags(inst);
 
 	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
-
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	be_parameter addrp(*this, inst.param(0), PTYPE_MRI);
+	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
+	be_parameter maskp(*this, inst.param(2), PTYPE_MRI);
+	const parameter &spacesizep = inst.param(3);
+	assert(spacesizep.is_size_space());
 
-	// 32-bit form
-	if (inst.size() == 4)
+	// set up a call to the write byte handler
+	mov_r64_imm(a, Gpq(REG_PARAM1), (uintptr_t)m_space[spacesizep.space()]);            // mov    param1,space
+	mov_reg_param(a, Gpd(REG_PARAM2), addrp);                                           // mov    param2,addrp
+	if (spacesizep.size() != SIZE_QWORD)
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_sub_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                    // sub   [dstp],src2p
-
-		// reg = reg - imm
-		else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_immediate() && inst.flags() == 0)
-			emit_lea_r32_m32(dst, dstp.ireg(), MBD(src1p.ireg(), -src2p.immediate()));  // lea   dstp,[src1p-src2p]
-
-		// general case
-		else
-		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_sub_r32_p32(dst, dstreg, src2p, inst);                                 // sub   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+		mov_reg_param(a, Gpd(REG_PARAM3), srcp);                                        // mov    param3,srcp
+		mov_reg_param(a, Gpd(REG_PARAM4), maskp);                                       // mov    param4,maskp
 	}
-
-	// 64-bit form
-	else if (inst.size() == 8)
+	else
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_sub_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                    // sub   [dstp],src2p
-
-		// reg = reg - imm
-		else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_immediate() && short_immediate(src2p.immediate()) && inst.flags() == 0)
-			emit_lea_r64_m64(dst, dstp.ireg(), MBD(src1p.ireg(), -src2p.immediate()));  // lea   dstp,[src1p-src2p]
-
-		// general case
-		else
-		{
-			emit_mov_r64_p64(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_sub_r64_p64(dst, dstreg, src2p, inst);                                 // sub   dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+		mov_reg_param(a, Gpq(REG_PARAM3), srcp);                                        // mov    param3,srcp
+		mov_reg_param(a, Gpq(REG_PARAM4), maskp);                                       // mov    param4,maskp
 	}
+	if (spacesizep.size() == SIZE_WORD)
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].write_word_masked);
+																						// call   write_word_masked
+	else if (spacesizep.size() == SIZE_DWORD)
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].write_dword_masked);
+																						// call   write_dword_masked
+	else if (spacesizep.size() == SIZE_QWORD)
+		smart_call_m64(a, (x86code **)&m_accessors[spacesizep.space()].write_qword_masked);
+																						// call   write_qword_masked
 }
 
 
 //-------------------------------------------------
-//  op_subc - process a SUBC opcode
+//  op_carry - process a CARRY opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_subc(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_carry(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_C | FLAG_V | FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_C);
 
 	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
+	be_parameter srcp(*this, inst.param(0), PTYPE_MRI);
+	be_parameter bitp(*this, inst.param(1), PTYPE_MRI);
 
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	u32 const rs = (inst.size() == 4) ? Gpd::kSignature : Gpq::kSignature;
 
-	// 32-bit form
-	if (inst.size() == 4)
+	// degenerate case: source is immediate
+	if (srcp.is_immediate() && bitp.is_immediate())
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_sbb_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                    // sbb   [dstp],src2p
-
-		// general case
+		if (srcp.immediate() & ((uint64_t)1 << bitp.immediate()))
+			a.stc();
 		else
-		{
-			emit_mov_r32_p32_keepflags(dst, dstreg, src1p);                             // mov   dstreg,src1p
-			emit_sbb_r32_p32(dst, dstreg, src2p, inst);                                 // sbb   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+			a.clc();
 	}
 
-	// 64-bit form
-	else if (inst.size() == 8)
+	// load non-immediate bit numbers into a register
+	if (!bitp.is_immediate())
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_sbb_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                    // sbb   [dstp],src2p
+		mov_reg_param(a, ecx, bitp);
+		a.and_(ecx, inst.size() * 8 - 1);
+	}
 
-		// general case
-		else
-		{
-			emit_mov_r64_p64_keepflags(dst, dstreg, src1p);                             // mov   dstreg,src1p
-			emit_sbb_r64_p64(dst, dstreg, src2p, inst);                                 // sbb   dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+	if (bitp.is_immediate())
+	{
+		if (srcp.is_memory())
+			a.bt(MABS(srcp.memory(), inst.size()), bitp.immediate());                   // bt     [srcp],bitp
+		else if (srcp.is_int_register())
+			a.bt(Gp(rs, srcp.ireg()), bitp.immediate());                                // bt     srcp,bitp
+	}
+	else
+	{
+		if (srcp.is_memory())
+			a.bt(MABS(srcp.memory(), inst.size()), ecx);                                // bt     [srcp],ecx
+		else if (srcp.is_int_register())
+			a.bt(Gp(rs, srcp.ireg()), ecx);                                             // bt     srcp,ecx
 	}
 }
 
 
 //-------------------------------------------------
-//  op_cmp - process a CMP opcode
+//  op_set - process a SET opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_cmp(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_set(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
-	assert_no_condition(inst);
-	assert_flags(inst, FLAG_C | FLAG_V | FLAG_Z | FLAG_S);
+	assert_any_condition(inst);
+	assert_no_flags(inst);
 
 	// normalize parameters
-	be_parameter src1p(*this, inst.param(0), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(1), PTYPE_MRI);
+	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
 
 	// pick a target register for the general case
-	int src1reg = src1p.select_register(REG_EAX);
-
-	// 32-bit form
-	if (inst.size() == 4)
-	{
-		// memory versus anything
-		if (src1p.is_memory())
-			emit_cmp_m32_p32(dst, MABS(src1p.memory()), src2p, inst);                   // cmp   [dstp],src2p
-
-		// general case
-		else
-		{
-			if (src1p.is_immediate())
-				emit_mov_r32_imm(dst, src1reg, src1p.immediate());                      // mov   src1reg,imm
-			emit_cmp_r32_p32(dst, src1reg, src2p, inst);                                // cmp   src1reg,src2p
-		}
-	}
-
-	// 64-bit form
-	else
-	{
-		// memory versus anything
-		if (src1p.is_memory())
-			emit_cmp_m64_p64(dst, MABS(src1p.memory()), src2p, inst);                   // cmp   [dstp],src2p
+	Gp dstreg = dstp.select_register(inst.size() == 4 ? eax : rax);
 
-		// general case
-		else
-		{
-			if (src1p.is_immediate())
-				emit_mov_r64_imm(dst, src1reg, src1p.immediate());                      // mov   src1reg,imm
-			emit_cmp_r64_p64(dst, src1reg, src2p, inst);                                // cmp   src1reg,src2p
-		}
-	}
+	// set to AL
+	a.set(X86_CONDITION(inst.condition()), al);                                         // setcc  al
+	a.movzx(dstreg.r32(), al);                                                          // movzx  dstreg,al
+	mov_param_reg(a, dstp, dstreg);                                                     // mov   dstp,dstreg
 }
 
 
 //-------------------------------------------------
-//  op_mulu - process a MULU opcode
+//  op_mov - process a MOV opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_mulu(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_mov(Assembler &a, const instruction &inst)
 {
-	uint8_t zsflags = inst.flags() & (FLAG_Z | FLAG_S);
-	uint8_t vflag = inst.flags() & FLAG_V;
-
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
-	assert_no_condition(inst);
-	assert_flags(inst, FLAG_V | FLAG_Z | FLAG_S);
+	assert_any_condition(inst);
+	assert_no_flags(inst);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter edstp(*this, inst.param(1), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(2), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(3), PTYPE_MRI);
-	normalize_commutative(src1p, src2p);
-	bool compute_hi = (dstp != edstp);
+	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
 
-	// 32-bit form
-	if (inst.size() == 4)
-	{
-		// general case
-		emit_mov_r32_p32(dst, REG_EAX, src1p);                                          // mov   eax,src1p
-		if (src2p.is_memory())
-			emit_mul_m32(dst, MABS(src2p.memory()));                                    // mul   [src2p]
-		else if (src2p.is_int_register())
-			emit_mul_r32(dst, src2p.ireg());                                            // mul   src2p
-		else if (src2p.is_immediate())
-		{
-			emit_mov_r32_imm(dst, REG_EDX, src2p.immediate());                          // mov   edx,src2p
-			emit_mul_r32(dst, REG_EDX);                                                 // mul   edx
-		}
-		emit_mov_p32_r32(dst, dstp, REG_EAX);                                           // mov   dstp,eax
-		if (compute_hi)
-			emit_mov_p32_r32(dst, edstp, REG_EDX);                                      // mov   edstp,edx
+	u32 const rs = (inst.size() == 4) ? Gpd::kSignature : Gpq::kSignature;
 
-		// compute flags
-		if (inst.flags() != 0)
-		{
-			if (zsflags != 0)
-			{
-				if (vflag)
-					emit_pushf(dst);                                                    // pushf
-				if (compute_hi)
-				{
-					if (zsflags == FLAG_Z)
-						emit_or_r32_r32(dst, REG_EDX, REG_EAX);                         // or    edx,eax
-					else if (zsflags == FLAG_S)
-						emit_test_r32_r32(dst, REG_EDX, REG_EDX);                       // test  edx,edx
-					else
-					{
-						emit_movzx_r32_r16(dst, REG_ECX, REG_AX);                       // movzx ecx,ax
-						emit_shr_r32_imm(dst, REG_EAX, 16);                             // shr   eax,16
-						emit_or_r32_r32(dst, REG_EDX, REG_ECX);                         // or    edx,ecx
-						emit_or_r32_r32(dst, REG_EDX, REG_EAX);                         // or    edx,eax
-					}
-				}
-				else
-					emit_test_r32_r32(dst, REG_EAX, REG_EAX);                           // test  eax,eax
+	// add a conditional branch unless a conditional move is possible
+	Label skip = a.newLabel();
+	if (inst.condition() != uml::COND_ALWAYS && !(dstp.is_int_register() && !srcp.is_immediate()))
+		a.short_().j(X86_NOT_CONDITION(inst.condition()), skip);                        // jcc   skip
 
-				// we rely on the fact that OF is cleared by all logical operations above
-				if (vflag)
-				{
-					emit_pushf(dst);                                                    // pushf
-					emit_pop_r64(dst, REG_RAX);                                         // pop   rax
-					emit_and_m64_imm(dst, MBD(REG_RSP, 0), ~0x84);                      // and   [rsp],~0x84
-					emit_or_m64_r64(dst, MBD(REG_RSP, 0), REG_RAX);                     // or    [rsp],rax
-					emit_popf(dst);                                                     // popf
-				}
-			}
-		}
+	// register to memory
+	if (dstp.is_memory() && srcp.is_int_register())
+		a.mov(MABS(dstp.memory()), Gp(rs, srcp.ireg()));                                // mov   [dstp],srcp
+
+	// immediate to memory
+	else if (dstp.is_memory() && srcp.is_immediate() && short_immediate(srcp.immediate()))
+		a.mov(MABS(dstp.memory(), inst.size()), s32(srcp.immediate()));                 // mov   [dstp],srcp
+
+	// conditional memory to register
+	else if (inst.condition() != 0 && dstp.is_int_register() && srcp.is_memory())
+	{
+		a.cmov(X86_CONDITION(inst.condition()), Gp(rs, dstp.ireg()), MABS(srcp.memory())); // cmovcc dstp,[srcp]
 	}
 
-	// 64-bit form
-	else if (inst.size() == 8)
+	// conditional register to register
+	else if (inst.condition() != 0 && dstp.is_int_register() && srcp.is_int_register())
 	{
-		// general case
-		emit_mov_r64_p64(dst, REG_RAX, src1p);                                          // mov   rax,src1p
-		if (src2p.is_memory())
-			emit_mul_m64(dst, MABS(src2p.memory()));                                    // mul   [src2p]
-		else if (src2p.is_int_register())
-			emit_mul_r64(dst, src2p.ireg());                                            // mul   src2p
-		else if (src2p.is_immediate())
-		{
-			emit_mov_r64_imm(dst, REG_RDX, src2p.immediate());                          // mov   rdx,src2p
-			emit_mul_r64(dst, REG_RDX);                                                 // mul   rdx
-		}
-		emit_mov_p64_r64(dst, dstp, REG_RAX);                                           // mov   dstp,rax
-		if (compute_hi)
-			emit_mov_p64_r64(dst, edstp, REG_RDX);                                      // mov   edstp,rdx
+		a.cmov(X86_CONDITION(inst.condition()), Gp(rs, dstp.ireg()), Gp(rs, srcp.ireg())); // cmovcc dstp,srcp
+	}
 
-		// compute flags
-		if (inst.flags() != 0)
-		{
-			if (zsflags != 0)
-			{
-				if (vflag)
-					emit_pushf(dst);                                                    // pushf
-				if (compute_hi)
-				{
-					if (zsflags == FLAG_Z)
-						emit_or_r64_r64(dst, REG_RDX, REG_RAX);                         // or    rdx,rax
-					else if (zsflags == FLAG_S)
-						emit_test_r64_r64(dst, REG_RDX, REG_RDX);                       // test  rdx,rdx
-					else
-					{
-						emit_mov_r32_r32(dst, REG_ECX, REG_EAX);                        // mov   ecx,eax
-						emit_shr_r64_imm(dst, REG_RAX, 32);                             // shr   rax,32
-						emit_or_r64_r64(dst, REG_RDX, REG_RCX);                         // or    rdx,rcx
-						emit_or_r64_r64(dst, REG_RDX, REG_RAX);                         // or    rdx,rax
-					}
-				}
-				else
-					emit_test_r64_r64(dst, REG_RAX, REG_RAX);                           // test  rax,rax
+	// general case
+	else
+	{
+		Gp dstreg = dstp.select_register(inst.size() == 4 ? eax : rax);
 
-				// we rely on the fact that OF is cleared by all logical operations above
-				if (vflag)
-				{
-					emit_pushf(dst);                                                    // pushf
-					emit_pop_r64(dst, REG_RAX);                                         // pop   rax
-					emit_and_m64_imm(dst, MBD(REG_RSP, 0), ~0x84);                      // and   [rsp],~0x84
-					emit_or_m64_r64(dst, MBD(REG_RSP, 0), REG_RAX);                     // or    [rsp],rax
-					emit_popf(dst);                                                     // popf
-				}
-			}
-		}
+		mov_reg_param(a, dstreg, srcp, true);                                           // mov   dstreg,srcp
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
+
+	// resolve the jump
+	if (inst.condition() != uml::COND_ALWAYS && !(dstp.is_int_register() && !srcp.is_immediate()))
+		a.bind(skip);
 }
 
 
 //-------------------------------------------------
-//  op_muls - process a MULS opcode
+//  op_sext - process a SEXT opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_muls(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_sext(Assembler &a, const instruction &inst)
 {
-	uint8_t zsflags = inst.flags() & (FLAG_Z | FLAG_S);
-	uint8_t vflag =  inst.flags() & FLAG_V;
-
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_V | FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_S | FLAG_Z);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter edstp(*this, inst.param(1), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(2), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(3), PTYPE_MRI);
-	normalize_commutative(src1p, src2p);
-	bool compute_hi = (dstp != edstp);
+	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
+	const parameter &sizep = inst.param(2);
+	assert(sizep.is_size());
+
+	Gp dstreg = dstp.select_register(rax);
 
 	// 32-bit form
 	if (inst.size() == 4)
-	{
-		// 32-bit destination with memory/immediate or register/immediate
-		if (!compute_hi && !src1p.is_immediate() && src2p.is_immediate())
-		{
-			int dstreg = dstp.is_int_register() ? dstp.ireg() : REG_EAX;
-			if (src1p.is_memory())
-				emit_imul_r32_m32_imm(dst, dstreg, MABS(src1p.memory()), src2p.immediate()); // imul  dstreg,[src1p],src2p
-			else if (src1p.is_int_register())
-				emit_imul_r32_r32_imm(dst, dstreg, src1p.ireg(), src2p.immediate());   // imul  dstreg,src1p,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                       // mov   dstp,eax
-		}
-
-		// 32-bit destination, general case
-		else if (!compute_hi)
-		{
-			int dstreg = dstp.is_int_register() ? dstp.ireg() : REG_EAX;
-			emit_mov_r32_p32(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			if (src2p.is_memory())
-				emit_imul_r32_m32(dst, dstreg, MABS(src2p.memory()));                   // imul  dstreg,[src2p]
-			else if (src2p.is_int_register())
-				emit_imul_r32_r32(dst, dstreg, src2p.ireg());                           // imul  dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
-
-		// 64-bit destination, general case
-		else
-		{
-			emit_mov_r32_p32(dst, REG_EAX, src1p);                                      // mov   eax,src1p
-			if (src2p.is_memory())
-				emit_imul_m32(dst, MABS(src2p.memory()));                               // imul  [src2p]
-			else if (src2p.is_int_register())
-				emit_imul_r32(dst, src2p.ireg());                                       // imul  src2p
-			else if (src2p.is_immediate())
-			{
-				emit_mov_r32_imm(dst, REG_EDX, src2p.immediate());                      // mov   edx,src2p
-				emit_imul_r32(dst, REG_EDX);                                            // imul  edx
-			}
-			emit_mov_p32_r32(dst, dstp, REG_EAX);                                       // mov   dstp,eax
-			emit_mov_p32_r32(dst, edstp, REG_EDX);                                      // mov   edstp,edx
-		}
-
-		// compute flags
-		if (inst.flags() != 0)
-		{
-			if (zsflags != 0)
-			{
-				if (vflag)
-					emit_pushf(dst);                                                    // pushf
-				if (compute_hi)
-				{
-					if (zsflags == FLAG_Z)
-						emit_or_r32_r32(dst, REG_EDX, REG_EAX);                         // or    edx,eax
-					else if (zsflags == FLAG_S)
-						emit_test_r32_r32(dst, REG_EDX, REG_EDX);                       // test  edx,edx
-					else
-					{
-						emit_movzx_r32_r16(dst, REG_ECX, REG_AX);                       // movzx ecx,ax
-						emit_shr_r32_imm(dst, REG_EAX, 16);                             // shr   eax,16
-						emit_or_r32_r32(dst, REG_EDX, REG_ECX);                         // or    edx,ecx
-						emit_or_r32_r32(dst, REG_EDX, REG_EAX);                         // or    edx,eax
-					}
-				}
-				else
-					emit_test_r32_r32(dst, REG_EAX, REG_EAX);                           // test  eax,eax
+	{
+		dstreg = dstreg.r32();
 
-				// we rely on the fact that OF is cleared by all logical operations above
-				if (vflag)
-				{
-					emit_pushf(dst);                                                    // pushf
-					emit_pop_r64(dst, REG_RAX);                                         // pop   rax
-					emit_and_m64_imm(dst, MBD(REG_RSP, 0), ~0x84);                      // and   [rsp],~0x84
-					emit_or_m64_r64(dst, MBD(REG_RSP, 0), REG_RAX);                     // or    [rsp],rax
-					emit_popf(dst);                                                     // popf
-				}
-			}
+		// general case
+		if (srcp.is_memory())
+		{
+			if (sizep.size() == SIZE_BYTE)
+				a.movsx(dstreg, MABS(srcp.memory(), 1));                                // movsx dstreg,[srcp]
+			else if (sizep.size() == SIZE_WORD)
+				a.movsx(dstreg, MABS(srcp.memory(), 2));                                // movsx dstreg,[srcp]
+			else if (sizep.size() == SIZE_DWORD)
+				a.mov(dstreg, MABS(srcp.memory()));                                     // mov   dstreg,[srcp]
+		}
+		else if (srcp.is_int_register())
+		{
+			if (sizep.size() == SIZE_BYTE)
+				a.movsx(dstreg, GpbLo(srcp.ireg()));                                    // movsx dstreg,srcp
+			else if (sizep.size() == SIZE_WORD)
+				a.movsx(dstreg, Gpw(srcp.ireg()));                                      // movsx dstreg,srcp
+			else if (sizep.size() == SIZE_DWORD)
+				a.mov(dstreg, Gpd(srcp.ireg()));                                        // mov   dstreg,srcp
 		}
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		// 64-bit destination with memory/immediate or register/immediate
-		if (!compute_hi && !src1p.is_immediate() && src2p.is_immediate() && short_immediate(src2p.immediate()))
+		// general case
+		if (srcp.is_memory())
 		{
-			int dstreg = dstp.is_int_register() ? dstp.ireg() : REG_RAX;
-			if (src1p.is_memory())
-				emit_imul_r64_m64_imm(dst, dstreg, MABS(src1p.memory()), src2p.immediate());// imul  dstreg,[src1p],src2p
-			else if (src1p.is_int_register())
-				emit_imul_r64_r64_imm(dst, dstreg, src1p.ireg(), src2p.immediate());    // imul  rax,src1p,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,rax
+			if (sizep.size() == SIZE_BYTE)
+				a.movsx(dstreg, MABS(srcp.memory(), 1));                                // movsx dstreg,[srcp]
+			else if (sizep.size() == SIZE_WORD)
+				a.movsx(dstreg, MABS(srcp.memory(), 2));                                // movsx dstreg,[srcp]
+			else if (sizep.size() == SIZE_DWORD)
+				a.movsxd(dstreg, MABS(srcp.memory(), 4));                               // movsxd dstreg,[srcp]
+			else if (sizep.size() == SIZE_QWORD)
+				a.mov(dstreg, MABS(srcp.memory()));                                     // mov   dstreg,[srcp]
 		}
-
-		// 64-bit destination, general case
-		else if (!compute_hi)
+		else if (srcp.is_int_register())
 		{
-			int dstreg = dstp.is_int_register() ? dstp.ireg() : REG_RAX;
-			emit_mov_r64_p64(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			if (src2p.is_memory())
-				emit_imul_r64_m64(dst, dstreg, MABS(src2p.memory()));                   // imul  dstreg,[src2p]
-			else if (src2p.is_int_register())
-				emit_imul_r64_r64(dst, dstreg, src2p.ireg());                           // imul  dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+			if (sizep.size() == SIZE_BYTE)
+				a.movsx(dstreg, GpbLo(srcp.ireg()));                                    // movsx dstreg,srcp
+			else if (sizep.size() == SIZE_WORD)
+				a.movsx(dstreg, Gpw(srcp.ireg()));                                      // movsx dstreg,srcp
+			else if (sizep.size() == SIZE_DWORD)
+				a.movsxd(dstreg, Gpd(srcp.ireg()));                                     // movsxd dstreg,srcp
+			else if (sizep.size() == SIZE_QWORD)
+				a.mov(dstreg, Gpq(srcp.ireg()));                                        // mov   dstreg,srcp
 		}
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
+	}
 
-		// 128-bit destination, general case
-		else
-		{
-			emit_mov_r64_p64(dst, REG_RAX, src1p);                                      // mov   rax,src1p
-			if (src2p.is_memory())
-				emit_imul_m64(dst, MABS(src2p.memory()));                               // imul  [src2p]
-			else if (src2p.is_int_register())
-				emit_imul_r64(dst, src2p.ireg());                                       // imul  src2p
-			else if (src2p.is_immediate())
-			{
-				emit_mov_r64_imm(dst, REG_RDX, src2p.immediate());                      // mov   rdx,src2p
-				emit_imul_r64(dst, REG_RDX);                                            // imul  rdx
-			}
-			emit_mov_p64_r64(dst, dstp, REG_RAX);                                       // mov   dstp,rax
-			emit_mov_p64_r64(dst, edstp, REG_RDX);                                      // mov   edstp,rdx
-		}
+	if (inst.flags() != 0)
+		a.test(dstreg, dstreg);                                                         // test  dstreg,dstreg
+}
 
-		// compute flags
-		if (inst.flags() != 0)
+
+//-------------------------------------------------
+//  op_roland - process an ROLAND opcode
+//-------------------------------------------------
+
+void drcbe_x64::op_roland(Assembler &a, const instruction &inst)
+{
+	// validate instruction
+	assert(inst.size() == 4 || inst.size() == 8);
+	assert_no_condition(inst);
+	assert_flags(inst, FLAG_S | FLAG_Z);
+
+	// normalize parameters
+	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
+	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
+	be_parameter shiftp(*this, inst.param(2), PTYPE_MRI);
+	be_parameter maskp(*this, inst.param(3), PTYPE_MRI);
+
+	// pick a target register
+	Gp dstreg = dstp.select_register((inst.size() == 4) ? eax : rax, shiftp, maskp);
+
+	mov_reg_param(a, dstreg, srcp);                                                     // mov   dstreg,srcp
+	if (!shiftp.is_immediate_value(0))
+		shift_op_param(a, Inst::kIdRol, dstreg, shiftp);                                // rol   dstreg,shiftp
+	alu_op_param(a, Inst::kIdAnd, dstreg, maskp,                                        // and   dstreg,maskp
+		[inst](Assembler &a, Operand const &dst, be_parameter const &src)
 		{
-			if (zsflags != 0)
+			// optimize all-zero and all-one cases
+			if (!inst.flags() && !src.immediate())
 			{
-				if (vflag)
-					emit_pushf(dst);                                                    // pushf
-				if (compute_hi)
-				{
-					if (zsflags == FLAG_Z)
-						emit_or_r64_r64(dst, REG_RDX, REG_RAX);                         // or    rdx,rax
-					else if (zsflags == FLAG_S)
-						emit_test_r64_r64(dst, REG_RDX, REG_RDX);                       // test  rdx,rdx
-					else
-					{
-						emit_mov_r32_r32(dst, REG_ECX, REG_EAX);                        // mov   ecx,eax
-						emit_shr_r64_imm(dst, REG_RAX, 32);                             // shr   rax,32
-						emit_or_r64_r64(dst, REG_RDX, REG_RCX);                         // or    rdx,rcx
-						emit_or_r64_r64(dst, REG_RDX, REG_RAX);                         // or    rdx,rax
-					}
-				}
-				else
-					emit_test_r64_r64(dst, REG_RAX, REG_RAX);                           // test  rax,rax
-
-				// we rely on the fact that OF is cleared by all logical operations above
-				if (vflag)
-				{
-					emit_pushf(dst);                                                    // pushf
-					emit_pop_r64(dst, REG_RAX);                                         // pop   rax
-					emit_and_m64_imm(dst, MBD(REG_RSP, 0), ~0x84);                      // and   [rsp],~0x84
-					emit_or_m64_r64(dst, MBD(REG_RSP, 0), REG_RAX);                     // or    [rsp],rax
-					emit_popf(dst);                                                     // popf
-				}
+				a.xor_(dst.as<Gpd>(), dst.as<Gpd>());
+				return true;
 			}
-		}
-	}
+			else if (!inst.flags() && ones(src.immediate(), inst.size()))
+				return true;
+
+			return false;
+		});
+	mov_param_reg(a, dstp, dstreg);                                                     // mov   dstp,dstreg
 }
 
 
 //-------------------------------------------------
-//  op_divu - process a DIVU opcode
+//  op_rolins - process an ROLINS opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_divu(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_rolins(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_V | FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_S | FLAG_Z);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter edstp(*this, inst.param(1), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(2), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(3), PTYPE_MRI);
-	bool compute_rem = (dstp != edstp);
+	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
+	be_parameter shiftp(*this, inst.param(2), PTYPE_MRI);
+	be_parameter maskp(*this, inst.param(3), PTYPE_MRI);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		// general case
-		emit_mov_r32_p32(dst, REG_ECX, src2p);                                          // mov   ecx,src2p
-		if (inst.flags() != 0)
+		// pick a target register
+		Gp dstreg = dstp.select_register(ecx, shiftp, maskp);
+
+		mov_reg_param(a, eax, srcp);                                                    // mov   eax,srcp
+		if (!shiftp.is_immediate_value(0))
+			shift_op_param(a, Inst::kIdRol, eax, shiftp);                               // rol   eax,shiftp
+		mov_reg_param(a, dstreg, dstp);                                                 // mov   dstreg,dstp
+		if (maskp.is_immediate())
 		{
-			emit_mov_r32_imm(dst, REG_EAX, 0xa0000000);                                 // mov   eax,0xa0000000
-			emit_add_r32_r32(dst, REG_EAX, REG_EAX);                                    // add   eax,eax
+			a.and_(eax, maskp.immediate());                                             // and   eax,maskp
+			a.and_(dstreg, ~maskp.immediate());                                         // and   dstreg,~maskp
 		}
-		emit_link skip;
-		emit_jecxz_link(dst, skip);                                                     // jecxz skip
-		emit_mov_r32_p32(dst, REG_EAX, src1p);                                          // mov   eax,src1p
-		emit_xor_r32_r32(dst, REG_EDX, REG_EDX);                                        // xor   edx,edx
-		emit_div_r32(dst, REG_ECX);                                                     // div   ecx
-		emit_mov_p32_r32(dst, dstp, REG_EAX);                                           // mov   dstp,eax
-		if (compute_rem)
-			emit_mov_p32_r32(dst, edstp, REG_EDX);                                      // mov   edstp,edx
-		if (inst.flags() != 0)
-			emit_test_r32_r32(dst, REG_EAX, REG_EAX);                                   // test  eax,eax
-		resolve_link(dst, skip);                                                    // skip:
+		else
+		{
+			mov_reg_param(a, edx, maskp);                                               // mov   edx,maskp
+			a.and_(eax, edx);                                                           // and   eax,edx
+			a.not_(edx);                                                                // not   edx
+			a.and_(dstreg, edx);                                                        // and   dstreg,edx
+		}
+		a.or_(dstreg, eax);                                                             // or    dstreg,eax
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		// general case
-		emit_mov_r64_p64(dst, REG_RCX, src2p);                                          // mov   rcx,src2p
-		if (inst.flags() != 0)
-		{
-			emit_mov_r32_imm(dst, REG_EAX, 0xa0000000);                                 // mov   eax,0xa0000000
-			emit_add_r32_r32(dst, REG_EAX, REG_EAX);                                    // add   eax,eax
-		}
-		emit_link skip;
-		emit_jrcxz_link(dst, skip);                                                     // jrcxz skip
-		emit_mov_r64_p64(dst, REG_RAX, src1p);                                          // mov   rax,src1p
-		emit_xor_r32_r32(dst, REG_EDX, REG_EDX);                                        // xor   edx,edx
-		emit_div_r64(dst, REG_RCX);                                                     // div   rcx
-		emit_mov_p64_r64(dst, dstp, REG_RAX);                                           // mov   dstp,rax
-		if (compute_rem)
-			emit_mov_p64_r64(dst, edstp, REG_RDX);                                      // mov   edstp,rdx
-		if (inst.flags() != 0)
-			emit_test_r64_r64(dst, REG_RAX, REG_RAX);                                   // test  eax,eax
-		resolve_link(dst, skip);                                                    // skip:
+		// pick a target register
+		Gp dstreg = dstp.select_register(rcx, shiftp, maskp);
+
+		mov_reg_param(a, rax, srcp);                                                    // mov   rax,srcp
+		mov_reg_param(a, rdx, maskp);                                                   // mov   rdx,maskp
+		if (!shiftp.is_immediate_value(0))
+			shift_op_param(a, Inst::kIdRol, rax, shiftp);                               // rol   rax,shiftp
+		mov_reg_param(a, dstreg, dstp);                                                 // mov   dstreg,dstp
+		a.and_(rax, rdx);                                                               // and   eax,rdx
+		a.not_(rdx);                                                                    // not   rdx
+		a.and_(dstreg, rdx);                                                            // and   dstreg,rdx
+		a.or_(dstreg, rax);                                                             // or    dstreg,rax
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
 }
 
 
 //-------------------------------------------------
-//  op_divs - process a DIVS opcode
+//  op_add - process a ADD opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_divs(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_add(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_V | FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_C | FLAG_V | FLAG_Z | FLAG_S);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter edstp(*this, inst.param(1), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(2), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(3), PTYPE_MRI);
-	bool compute_rem = (dstp != edstp);
+	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
+	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
+	normalize_commutative(src1p, src2p);
 
-	// 32-bit form
-	if (inst.size() == 4)
+	// dstp == src1p in memory
+	if (dstp.is_memory() && dstp == src1p)
+		alu_op_param(a, Inst::kIdAdd, MABS(dstp.memory(), inst.size()), src2p,          // add   [dstp],src2p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize zero case
+				return (!inst.flags() && !src.immediate());
+			});
+
+	// dstp == src2p in memory
+	else if (dstp.is_memory() && dstp == src2p)
+		alu_op_param(a, Inst::kIdAdd, MABS(dstp.memory(), inst.size()), src1p,          // add   [dstp],src1p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize zero case
+				return (!inst.flags() && !src.immediate());
+			});
+
+	// reg = reg + imm
+	else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_immediate() && short_immediate(src2p.immediate()) && !inst.flags())
 	{
-		// general case
-		emit_mov_r32_p32(dst, REG_ECX, src2p);                                          // mov   ecx,src2p
-		if (inst.flags() != 0)
-		{
-			emit_mov_r32_imm(dst, REG_EAX, 0xa0000000);                                 // mov   eax,0xa0000000
-			emit_add_r32_r32(dst, REG_EAX, REG_EAX);                                    // add   eax,eax
-		}
-		emit_link skip;
-		emit_jecxz_link(dst, skip);                                                     // jecxz skip
-		emit_mov_r32_p32(dst, REG_EAX, src1p);                                          // mov   eax,src1p
-		emit_cdq(dst);                                                                  // cdq
-		emit_idiv_r32(dst, REG_ECX);                                                    // idiv  ecx
-		emit_mov_p32_r32(dst, dstp, REG_EAX);                                           // mov   dstp,eax
-		if (compute_rem)
-			emit_mov_p32_r32(dst, edstp, REG_EDX);                                      // mov   edstp,edx
-		if (inst.flags() != 0)
-			emit_test_r32_r32(dst, REG_EAX, REG_EAX);                                   // test  eax,eax
-		resolve_link(dst, skip);                                                    // skip:
+		u32 const rs = (inst.size() == 4) ? Gpd::kSignature : Gpq::kSignature;
+
+		a.lea(Gp(rs, dstp.ireg()), ptr(Gp(rs, src1p.ireg()), src2p.immediate()));       // lea   dstp,[src1p+src2p]
 	}
 
-	// 64-bit form
-	else if (inst.size() == 8)
+	// reg = reg + reg
+	else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_int_register() && !inst.flags())
 	{
-		// general case
-		emit_mov_r64_p64(dst, REG_RCX, src2p);                                          // mov   rcx,src2p
-		if (inst.flags() != 0)
-		{
-			emit_mov_r32_imm(dst, REG_EAX, 0xa0000000);                                 // mov   eax,0xa0000000
-			emit_add_r32_r32(dst, REG_EAX, REG_EAX);                                    // add   eax,eax
-		}
-		emit_link skip;
-		emit_jrcxz_link(dst, skip);                                                     // jrcxz skip
-		emit_mov_r64_p64(dst, REG_RAX, src1p);                                          // mov   rax,src1p
-		emit_cqo(dst);                                                                  // cqo
-		emit_idiv_r64(dst, REG_RCX);                                                    // idiv  rcx
-		emit_mov_p64_r64(dst, dstp, REG_RAX);                                           // mov   dstp,rax
-		if (compute_rem)
-			emit_mov_p64_r64(dst, edstp, REG_RDX);                                      // mov   edstp,rdx
-		if (inst.flags() != 0)
-			emit_test_r64_r64(dst, REG_RAX, REG_RAX);                                   // test  eax,eax
-		resolve_link(dst, skip);                                                    // skip:
+		u32 const rs = (inst.size() == 4) ? Gpd::kSignature : Gpq::kSignature;
+
+		a.lea(Gp(rs, dstp.ireg()), ptr(Gp(rs, src1p.ireg()), Gp(rs, src2p.ireg())));    // lea   dstp,[src1p+src2p]
+	}
+
+	// general case
+	else
+	{
+		// pick a target register for the general case
+		Gp dstreg = dstp.select_register((inst.size() == 4) ? eax : rax, src2p);
+
+		mov_reg_param(a, dstreg, src1p);                                                // mov   dstreg,src1p
+		alu_op_param(a, Inst::kIdAdd, dstreg, src2p,                                    // add   dstreg,src2p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize zero case
+				return (!inst.flags() && !src.immediate());
+			});
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
 }
 
 
 //-------------------------------------------------
-//  op_and - process a AND opcode
+//  op_addc - process a ADDC opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_and(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_addc(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_C | FLAG_V | FLAG_Z | FLAG_S);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
@@ -5072,372 +2798,601 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
 	normalize_commutative(src1p, src2p);
 
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	// dstp == src1p in memory
+	if (dstp.is_memory() && dstp == src1p)
+		alu_op_param(a, Inst::kIdAdc, MABS(dstp.memory(), inst.size()), src2p);         // adc   [dstp],src2p
 
-	// 32-bit form
-	if (inst.size() == 4)
+	// general case
+	else
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_and_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                    // and   [dstp],src2p
-
-		// dstp == src2p in memory
-		else if (dstp.is_memory() && dstp == src2p)
-			emit_and_m32_p32(dst, MABS(dstp.memory()), src1p, inst);                    // and   [dstp],src1p
-
-		// AND with immediate 0xff
-		else if (src2p.is_immediate_value(0xff) && inst.flags() == 0)
-		{
-			if (src1p.is_int_register())
-				emit_movzx_r32_r8(dst, dstreg, src1p.ireg());                           // movzx dstreg,src1p
-			else if (src1p.is_memory())
-				emit_movzx_r32_m8(dst, dstreg, MABS(src1p.memory()));                   // movzx dstreg,[src1p]
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
-
-		// AND with immediate 0xffff
-		else if (src2p.is_immediate_value(0xffff) && inst.flags() == 0)
-		{
-			if (src1p.is_int_register())
-				emit_movzx_r32_r16(dst, dstreg, src1p.ireg());                          // movzx dstreg,src1p
-			else if (src1p.is_memory())
-				emit_movzx_r32_m16(dst, dstreg, MABS(src1p.memory()));                  // movzx dstreg,[src1p]
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+		// pick a target register for the general case
+		Gp dstreg = dstp.select_register((inst.size() == 4) ? eax : rax, src2p);
 
-		// general case
-		else
-		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_and_r32_p32(dst, dstreg, src2p, inst);                                 // and   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+		mov_reg_param(a, dstreg, src1p, true);                                          // mov   dstreg,src1p
+		alu_op_param(a, Inst::kIdAdc, dstreg, src2p);                                   // adc   dstreg,src2p
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
+}
 
-	// 64-bit form
-	else if (inst.size() == 8)
-	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_and_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                    // and   [dstp],src2p
 
-		// dstp == src2p in memory
-		else if (dstp.is_memory() && dstp == src2p)
-			emit_and_m64_p64(dst, MABS(dstp.memory()), src1p, inst);                    // and   [dstp],src1p
+//-------------------------------------------------
+//  op_sub - process a SUB opcode
+//-------------------------------------------------
 
-		// AND with immediate 0xff
-		else if (src2p.is_immediate_value(0xff) && inst.flags() == 0)
-		{
-			if (src1p.is_int_register())
-				emit_movzx_r32_r8(dst, dstreg, src1p.ireg());                           // movzx dstreg,src1p
-			else if (src1p.is_memory())
-				emit_movzx_r32_m8(dst, dstreg, MABS(src1p.memory()));                   // movzx dstreg,[src1p]
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+void drcbe_x64::op_sub(Assembler &a, const instruction &inst)
+{
+	// validate instruction
+	assert(inst.size() == 4 || inst.size() == 8);
+	assert_no_condition(inst);
+	assert_flags(inst, FLAG_C | FLAG_V | FLAG_Z | FLAG_S);
 
-		// AND with immediate 0xffff
-		else if (src2p.is_immediate_value(0xffff) && inst.flags() == 0)
-		{
-			if (src1p.is_int_register())
-				emit_movzx_r32_r16(dst, dstreg, src1p.ireg());                          // movzx dstreg,src1p
-			else if (src1p.is_memory())
-				emit_movzx_r32_m16(dst, dstreg, MABS(src1p.memory()));                  // movzx dstreg,[src1p]
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+	// normalize parameters
+	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
+	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
+	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
 
-		// AND with immediate 0xffffffff
-		else if (src2p.is_immediate_value(0xffffffff) && inst.flags() == 0)
-		{
-			if (dstp.is_int_register() && src1p == dstp)
-				emit_mov_r32_r32(dst, dstreg, dstreg);                                  // mov   dstreg,dstreg
-			else
+	// dstp == src1p in memory
+	if (dstp.is_memory() && dstp == src1p)
+		alu_op_param(a, Inst::kIdSub, MABS(dstp.memory(), inst.size()), src2p,          // sub   [dstp],src2p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
 			{
-				emit_mov_r32_p32(dst, dstreg, src1p);                                   // mov   dstreg,src1p
-				emit_mov_p64_r64(dst, dstp, dstreg);                                    // mov   dstp,dstreg
-			}
-		}
+				// optimize zero case
+				return (!inst.flags() && !src.immediate());
+			});
+
+	// reg = reg - imm
+	else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_immediate() && short_immediate(src2p.immediate()) && !inst.flags())
+	{
+		u32 const rs = (inst.size() == 4) ? Gpd::kSignature : Gpq::kSignature;
+		Gp const dst = Gp(rs, dstp.ireg());
+		Gp const src1 = Gp(rs, src1p.ireg());
 
-		// general case
-		else
-		{
-			emit_mov_r64_p64(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_and_r64_p64(dst, dstreg, src2p, inst);                                 // and   dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+		a.lea(dst, ptr(src1, -src2p.immediate()));                                      // lea   dstp,[src1p-src2p]
+	}
+
+	// general case
+	else
+	{
+		// pick a target register for the general case
+		Gp dstreg = dstp.select_register((inst.size() == 4) ? eax : rax, src2p);
+
+		mov_reg_param(a, dstreg, src1p);                                                // mov   dstreg,src1p
+		alu_op_param(a, Inst::kIdSub, dstreg, src2p,                                    // sub   dstreg,src2p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize zero case
+				return (!inst.flags() && !src.immediate());
+			});
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
 }
 
 
 //-------------------------------------------------
-//  op_test - process a TEST opcode
+//  op_subc - process a SUBC opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_test(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_subc(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_C | FLAG_V | FLAG_Z | FLAG_S);
 
 	// normalize parameters
-	be_parameter src1p(*this, inst.param(0), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(1), PTYPE_MRI);
-	normalize_commutative(src1p, src2p);
+	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
+	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
+	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
 
-	// pick a target register for the general case
-	int src1reg = src1p.select_register(REG_EAX);
+	// dstp == src1p in memory
+	if (dstp.is_memory() && dstp == src1p)
+		alu_op_param(a, Inst::kIdSbb, MABS(dstp.memory(), inst.size()), src2p);         // sbb   [dstp],src2p
 
-	// 32-bit form
-	if (inst.size() == 4)
+	// general case
+	else
 	{
-		// src1p in memory
-		if (src1p.is_memory())
-			emit_test_m32_p32(dst, MABS(src1p.memory()), src2p, inst);                  // test  [src1p],src2p
+		// pick a target register for the general case
+		Gp dstreg = dstp.select_register((inst.size() == 4) ? eax : rax, src2p);
 
-		// general case
-		else
-		{
-			emit_mov_r32_p32(dst, src1reg, src1p);                                      // mov   src1reg,src1p
-			emit_test_r32_p32(dst, src1reg, src2p, inst);                               // test  src1reg,src2p
-		}
+		mov_reg_param(a, dstreg, src1p, true);                                          // mov   dstreg,src1p
+		alu_op_param(a, Inst::kIdSbb, dstreg, src2p);                                   // sbb   dstreg,src2p
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
+}
 
-	// 64-bit form
-	else if (inst.size() == 8)
+
+//-------------------------------------------------
+//  op_cmp - process a CMP opcode
+//-------------------------------------------------
+
+void drcbe_x64::op_cmp(Assembler &a, const instruction &inst)
+{
+	// validate instruction
+	assert(inst.size() == 4 || inst.size() == 8);
+	assert_no_condition(inst);
+	assert_flags(inst, FLAG_C | FLAG_V | FLAG_Z | FLAG_S);
+
+	// normalize parameters
+	be_parameter src1p(*this, inst.param(0), PTYPE_MRI);
+	be_parameter src2p(*this, inst.param(1), PTYPE_MRI);
+
+	// memory versus anything
+	if (src1p.is_memory())
+		alu_op_param(a, Inst::kIdCmp, MABS(src1p.memory(), inst.size()), src2p);        // cmp   [dstp],src2p
+
+	// general case
+	else
 	{
-		// src1p in memory
-		if (src1p.is_memory())
-			emit_test_m64_p64(dst, MABS(src1p.memory()), src2p, inst);                  // test  [src1p],src2p
+		// pick a target register for the general case
+		Gp src1reg = src1p.select_register((inst.size() == 4) ? eax : rax);
 
-		// general case
-		else
+		if (src1p.is_immediate())
 		{
-			emit_mov_r64_p64(dst, src1reg, src1p);                                      // mov   src1reg,src1p
-			emit_test_r64_p64(dst, src1reg, src2p, inst);                               // test  src1reg,src2p
+			if (inst.size() == 4)
+				a.mov(src1reg, src1p.immediate());                                      // mov   src1reg,imm
+			else
+				mov_r64_imm(a, src1reg, src1p.immediate());                             // mov   src1reg,imm
 		}
+		alu_op_param(a, Inst::kIdCmp, src1reg, src2p);                                  // cmp   src1reg,src2p
 	}
 }
 
 
 //-------------------------------------------------
-//  op_or - process a OR opcode
+//  op_mulu - process a MULU opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_or(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_mulu(Assembler &a, const instruction &inst)
 {
+	uint8_t zsflags = inst.flags() & (FLAG_Z | FLAG_S);
+	uint8_t vflag = inst.flags() & FLAG_V;
+
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_V | FLAG_Z | FLAG_S);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
+	be_parameter edstp(*this, inst.param(1), PTYPE_MR);
+	be_parameter src1p(*this, inst.param(2), PTYPE_MRI);
+	be_parameter src2p(*this, inst.param(3), PTYPE_MRI);
 	normalize_commutative(src1p, src2p);
-
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	bool compute_hi = (dstp != edstp);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_or_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                     // or    [dstp],src2p
-
-		// dstp == src2p in memory
-		else if (dstp.is_memory() && dstp == src2p)
-			emit_or_m32_p32(dst, MABS(dstp.memory()), src1p, inst);                     // or    [dstp],src1p
-
 		// general case
-		else
+		mov_reg_param(a, eax, src1p);                                                   // mov   eax,src1p
+		if (src2p.is_memory())
+			a.mul(MABS(src2p.memory(), 4));                                             // mul   [src2p]
+		else if (src2p.is_int_register())
+			a.mul(Gpd(src2p.ireg()));                                                   // mul   src2p
+		else if (src2p.is_immediate())
+		{
+			a.mov(edx, src2p.immediate());                                              // mov   edx,src2p
+			a.mul(edx);                                                                 // mul   edx
+		}
+		mov_param_reg(a, dstp, eax);                                                    // mov   dstp,eax
+		if (compute_hi)
+			mov_param_reg(a, edstp, edx);                                               // mov   edstp,edx
+
+		// compute flags
+		if (inst.flags() != 0)
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_or_r32_p32(dst, dstreg, src2p, inst);                                  // or    dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+			if (zsflags != 0)
+			{
+				if (vflag)
+					a.pushfq();                                                         // pushf
+				if (compute_hi)
+				{
+					if (zsflags == FLAG_Z)
+						a.or_(edx, eax);                                                // or    edx,eax
+					else if (zsflags == FLAG_S)
+						a.test(edx, edx);                                               // test  edx,edx
+					else
+					{
+						a.movzx(ecx, ax);                                               // movzx ecx,ax
+						a.shr(eax, 16);                                                 // shr   eax,16
+						a.or_(edx, ecx);                                                // or    edx,ecx
+						a.or_(edx, eax);                                                // or    edx,eax
+					}
+				}
+				else
+					a.test(eax, eax);                                                   // test  eax,eax
+
+				// we rely on the fact that OF is cleared by all logical operations above
+				if (vflag)
+				{
+					a.pushfq();                                                         // pushf
+					a.pop(rax);                                                         // pop   rax
+					a.and_(qword_ptr(rsp), ~0x84);                                      // and   [rsp],~0x84
+					a.or_(ptr(rsp), rax);                                               // or    [rsp],rax
+					a.popfq();                                                          // popf
+				}
+			}
 		}
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_or_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                     // or    [dstp],src2p
-
-		// dstp == src2p in memory
-		else if (dstp.is_memory() && dstp == src2p)
-			emit_or_m64_p64(dst, MABS(dstp.memory()), src1p, inst);                     // or    [dstp],src1p
-
 		// general case
-		else
+		mov_reg_param(a, rax, src1p);                                                   // mov   rax,src1p
+		if (src2p.is_memory())
+			a.mul(MABS(src2p.memory(), 8));                                             // mul   [src2p]
+		else if (src2p.is_int_register())
+			a.mul(Gpq(src2p.ireg()));                                                   // mul   src2p
+		else if (src2p.is_immediate())
+		{
+			mov_r64_imm(a, rdx, src2p.immediate());                                     // mov   rdx,src2p
+			a.mul(rdx);                                                                 // mul   rdx
+		}
+		mov_param_reg(a, dstp, rax);                                                    // mov   dstp,rax
+		if (compute_hi)
+			mov_param_reg(a, edstp, rdx);                                               // mov   edstp,rdx
+
+		// compute flags
+		if (inst.flags() != 0)
 		{
-			emit_mov_r64_p64(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_or_r64_p64(dst, dstreg, src2p, inst);                                  // or    dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+			if (zsflags != 0)
+			{
+				if (vflag)
+					a.pushfq();                                                         // pushf
+				if (compute_hi)
+				{
+					if (zsflags == FLAG_Z)
+						a.or_(rdx, rax);                                                // or    rdx,rax
+					else if (zsflags == FLAG_S)
+						a.test(rdx, rdx);                                               // test  rdx,rdx
+					else
+					{
+						a.mov(ecx, eax);                                                // mov   ecx,eax
+						a.shr(rax, 32);                                                 // shr   rax,32
+						a.or_(rdx, rcx);                                                // or    rdx,rcx
+						a.or_(rdx, rax);                                                // or    rdx,rax
+					}
+				}
+				else
+					a.test(rax, rax);                                                   // test  rax,rax
+
+				// we rely on the fact that OF is cleared by all logical operations above
+				if (vflag)
+				{
+					a.pushfq();                                                         // pushf
+					a.pop(rax);                                                         // pop   rax
+					a.and_(qword_ptr(rsp), ~0x84);                                      // and   [rsp],~0x84
+					a.or_(ptr(rsp), rax);                                               // or    [rsp],rax
+					a.popfq();                                                          // popf
+				}
+			}
 		}
 	}
 }
 
 
 //-------------------------------------------------
-//  op_xor - process a XOR opcode
+//  op_muls - process a MULS opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_xor(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_muls(Assembler &a, const instruction &inst)
 {
+	uint8_t zsflags = inst.flags() & (FLAG_Z | FLAG_S);
+	uint8_t vflag =  inst.flags() & FLAG_V;
+
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_V | FLAG_Z | FLAG_S);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
+	be_parameter edstp(*this, inst.param(1), PTYPE_MR);
+	be_parameter src1p(*this, inst.param(2), PTYPE_MRI);
+	be_parameter src2p(*this, inst.param(3), PTYPE_MRI);
 	normalize_commutative(src1p, src2p);
-
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	bool compute_hi = (dstp != edstp);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_xor_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                    // xor   [dstp],src2p
+		// 32-bit destination with memory/immediate or register/immediate
+		if (!compute_hi && !src1p.is_immediate() && src2p.is_immediate())
+		{
+			Gp dstreg = dstp.is_int_register() ? Gpd(dstp.ireg()) : eax;
+			if (src1p.is_memory())
+				a.imul(dstreg, MABS(src1p.memory()), src2p.immediate());                // imul  dstreg,[src1p],src2p
+			else if (src1p.is_int_register())
+				a.imul(dstreg, Gpd(src1p.ireg()), src2p.immediate());                   // imul  dstreg,src1p,src2p
+			mov_param_reg(a, dstp, dstreg);                                             // mov   dstp,eax
+		}
 
-		// dstp == src2p in memory
-		else if (dstp.is_memory() && dstp == src2p)
-			emit_xor_m32_p32(dst, MABS(dstp.memory()), src1p, inst);                    // xor   [dstp],src1p
-
-		// dstp == src1p register
-		else if (dstp.is_int_register() && dstp == src1p)
-			emit_xor_r32_p32(dst, dstp.ireg(), src2p, inst);                            // xor   dstp,src2p
+		// 32-bit destination, general case
+		else if (!compute_hi)
+		{
+			Gp dstreg = dstp.is_int_register() ? Gpd(dstp.ireg()) : eax;
+			mov_reg_param(a, dstreg, src1p);                                            // mov   dstreg,src1p
+			if (src2p.is_memory())
+				a.imul(dstreg, MABS(src2p.memory()));                                   // imul  dstreg,[src2p]
+			else if (src2p.is_int_register())
+				a.imul(dstreg, Gpd(src2p.ireg()));                                      // imul  dstreg,src2p
+			mov_param_reg(a, dstp, dstreg);                                             // mov   dstp,dstreg
+		}
 
-		// general case
+		// 64-bit destination, general case
 		else
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_xor_r32_p32(dst, dstreg, src2p, inst);                                 // xor   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+			mov_reg_param(a, eax, src1p);                                               // mov   eax,src1p
+			if (src2p.is_memory())
+				a.imul(MABS(src2p.memory(), 4));                                        // imul  [src2p]
+			else if (src2p.is_int_register())
+				a.imul(Gpd(src2p.ireg()));                                              // imul  src2p
+			else if (src2p.is_immediate())
+			{
+				a.mov(edx, src2p.immediate());                                          // mov   edx,src2p
+				a.imul(edx);                                                            // imul  edx
+			}
+			mov_param_reg(a, dstp, eax);                                                // mov   dstp,eax
+			mov_param_reg(a, edstp, edx);                                               // mov   edstp,edx
+		}
+
+		// compute flags
+		if (inst.flags() != 0)
+		{
+			if (zsflags != 0)
+			{
+				if (vflag)
+					a.pushfq();                                                         // pushf
+				if (compute_hi)
+				{
+					if (zsflags == FLAG_Z)
+						a.or_(edx, eax);                                                // or    edx,eax
+					else if (zsflags == FLAG_S)
+						a.test(edx, edx);                                               // test  edx,edx
+					else
+					{
+						a.movzx(ecx, ax);                                               // movzx ecx,ax
+						a.shr(eax, 16);                                                 // shr   eax,16
+						a.or_(edx, ecx);                                                // or    edx,ecx
+						a.or_(edx, eax);                                                // or    edx,eax
+					}
+				}
+				else
+					a.test(eax, eax);                                                   // test  eax,eax
+
+				// we rely on the fact that OF is cleared by all logical operations above
+				if (vflag)
+				{
+					a.pushfq();                                                         // pushf
+					a.pop(rax);                                                         // pop   rax
+					a.and_(qword_ptr(rsp), ~0x84);                                      // and   [rsp],~0x84
+					a.or_(ptr(rsp), rax);                                               // or    [rsp],rax
+					a.popfq();                                                          // popf
+				}
+			}
 		}
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_xor_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                    // xor   [dstp],src2p
+		// 64-bit destination with memory/immediate or register/immediate
+		if (!compute_hi && !src1p.is_immediate() && src2p.is_immediate() && short_immediate(src2p.immediate()))
+		{
+			Gp dstreg = dstp.is_int_register() ? Gpq(dstp.ireg()) : rax;
+			if (src1p.is_memory())
+				a.imul(dstreg, MABS(src1p.memory()), src2p.immediate());                // imul  dstreg,[src1p],src2p
+			else if (src1p.is_int_register())
+				a.imul(dstreg, Gpq(src1p.ireg()), src2p.immediate());                   // imul  rax,src1p,src2p
+			mov_param_reg(a, dstp, dstreg);                                             // mov   dstp,rax
+		}
 
-		// dstp == src2p in memory
-		else if (dstp.is_memory() && dstp == src2p)
-			emit_xor_m64_p64(dst, MABS(dstp.memory()), src1p, inst);                    // xor   [dstp],src1p
-
-		// dstp == src1p register
-		else if (dstp.is_int_register() && dstp == src1p)
-			emit_xor_r64_p64(dst, dstp.ireg(), src2p, inst);                            // xor   dstp,src2p
+		// 64-bit destination, general case
+		else if (!compute_hi)
+		{
+			Gp dstreg = dstp.is_int_register() ? Gpq(dstp.ireg()) : rax;
+			mov_reg_param(a, dstreg, src1p);                                            // mov   dstreg,src1p
+			if (src2p.is_memory())
+				a.imul(dstreg, MABS(src2p.memory()));                                   // imul  dstreg,[src2p]
+			else if (src2p.is_int_register())
+				a.imul(dstreg, Gpq(src2p.ireg()));                                      // imul  dstreg,src2p
+			mov_param_reg(a, dstp, dstreg);                                             // mov   dstp,dstreg
+		}
 
-		// general case
+		// 128-bit destination, general case
 		else
 		{
-			emit_mov_r64_p64(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_xor_r64_p64(dst, dstreg, src2p, inst);                                 // xor   dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+			mov_reg_param(a, rax, src1p);                                               // mov   rax,src1p
+			if (src2p.is_memory())
+				a.imul(MABS(src2p.memory(), 8));                                        // imul  [src2p]
+			else if (src2p.is_int_register())
+				a.imul(Gpq(src2p.ireg()));                                              // imul  src2p
+			else if (src2p.is_immediate())
+			{
+				mov_r64_imm(a, rdx, src2p.immediate());                                 // mov   rdx,src2p
+				a.imul(rdx);                                                            // imul  rdx
+			}
+			mov_param_reg(a, dstp, rax);                                                // mov   dstp,rax
+			mov_param_reg(a, edstp, rdx);                                               // mov   edstp,rdx
+		}
+
+		// compute flags
+		if (inst.flags() != 0)
+		{
+			if (zsflags != 0)
+			{
+				if (vflag)
+					a.pushfq();                                                         // pushf
+				if (compute_hi)
+				{
+					if (zsflags == FLAG_Z)
+						a.or_(rdx, rax);                                                // or    rdx,rax
+					else if (zsflags == FLAG_S)
+						a.test(rdx, rdx);                                               // test  rdx,rdx
+					else
+					{
+						a.mov(ecx, eax);                                                // mov   ecx,eax
+						a.shr(rax, 32);                                                 // shr   rax,32
+						a.or_(rdx, rcx);                                                // or    rdx,rcx
+						a.or_(rdx, rax);                                                // or    rdx,rax
+					}
+				}
+				else
+					a.test(rax, rax);                                                   // test  rax,rax
+
+				// we rely on the fact that OF is cleared by all logical operations above
+				if (vflag)
+				{
+					a.pushfq();                                                         // pushf
+					a.pop(rax);                                                         // pop   rax
+					a.and_(qword_ptr(rsp), ~0x84);                                      // and   [rsp],~0x84
+					a.or_(ptr(rsp), rax);                                               // or    [rsp],rax
+					a.popfq();                                                          // popf
+				}
+			}
 		}
 	}
 }
 
 
 //-------------------------------------------------
-//  op_lzcnt - process a LZCNT opcode
+//  op_divu - process a DIVU opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_lzcnt(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_divu(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_V | FLAG_Z | FLAG_S);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
+	be_parameter edstp(*this, inst.param(1), PTYPE_MR);
+	be_parameter src1p(*this, inst.param(2), PTYPE_MRI);
+	be_parameter src2p(*this, inst.param(3), PTYPE_MRI);
+	bool compute_rem = (dstp != edstp);
 
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+	Label skip = a.newLabel();
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_mov_r32_p32(dst, dstreg, srcp);                                            // mov   dstreg,src1p
-		emit_mov_r32_imm(dst, REG_ECX, 32 ^ 31);                                        // mov   ecx,32 ^ 31
-		emit_bsr_r32_r32(dst, dstreg, dstreg);                                          // bsr   dstreg,dstreg
-		emit_cmovcc_r32_r32(dst, x64emit::COND_Z, dstreg, REG_ECX);                             // cmovz dstreg,ecx
-		emit_xor_r32_imm(dst, dstreg, 31);                                              // xor   dstreg,31
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
+		// general case
+		mov_reg_param(a, ecx, src2p);                                                   // mov   ecx,src2p
+		if (inst.flags() != 0)
+		{
+			a.mov(eax, 0xa0000000);                                                     // mov   eax,0xa0000000
+			a.add(eax, eax);                                                            // add   eax,eax
+		}
+		a.short_().jecxz(skip);                                                         // jecxz skip
+		mov_reg_param(a, eax, src1p);                                                   // mov   eax,src1p
+		a.xor_(edx, edx);                                                               // xor   edx,edx
+		a.div(ecx);                                                                     // div   ecx
+		mov_param_reg(a, dstp, eax);                                                    // mov   dstp,eax
+		if (compute_rem)
+			mov_param_reg(a, edstp, edx);                                               // mov   edstp,edx
+		if (inst.flags() != 0)
+			a.test(eax, eax);                                                           // test  eax,eax
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_mov_r64_p64(dst, dstreg, srcp);                                            // mov   dstreg,src1p
-		emit_mov_r64_imm(dst, REG_RCX, 64 ^ 63);                                        // mov   rcx,64 ^ 63
-		emit_bsr_r64_r64(dst, dstreg, dstreg);                                          // bsr   dstreg,dstreg
-		emit_cmovcc_r64_r64(dst, x64emit::COND_Z, dstreg, REG_RCX);                             // cmovz dstreg,rcx
-		emit_xor_r32_imm(dst, dstreg, 63);                                              // xor   dstreg,63
-		emit_mov_p64_r64(dst, dstp, dstreg);                                            // mov   dstp,dstreg
+		// general case
+		mov_reg_param(a, rcx, src2p);                                                   // mov   rcx,src2p
+		if (inst.flags() != 0)
+		{
+			a.mov(eax, 0xa0000000);                                                     // mov   eax,0xa0000000
+			a.add(eax, eax);                                                            // add   eax,eax
+		}
+		a.short_().jecxz(skip);                                                         // jrcxz skip
+		mov_reg_param(a, rax, src1p);                                                   // mov   rax,src1p
+		a.xor_(edx, edx);                                                               // xor   edx,edx
+		a.div(rcx);                                                                     // div   rcx
+		mov_param_reg(a, dstp, rax);                                                    // mov   dstp,rax
+		if (compute_rem)
+			mov_param_reg(a, edstp, rdx);                                               // mov   edstp,rdx
+		if (inst.flags() != 0)
+			a.test(rax, rax);                                                           // test  eax,eax
 	}
+
+	a.bind(skip);                                                                   // skip:
 }
 
 
 //-------------------------------------------------
-//  op_tzcnt - process a TZCNT opcode
+//  op_divs - process a DIVS opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_tzcnt(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_divs(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_V | FLAG_Z | FLAG_S);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
+	be_parameter edstp(*this, inst.param(1), PTYPE_MR);
+	be_parameter src1p(*this, inst.param(2), PTYPE_MRI);
+	be_parameter src2p(*this, inst.param(3), PTYPE_MRI);
+	bool compute_rem = (dstp != edstp);
+
+	Label skip = a.newLabel();
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		int dstreg = dstp.select_register(REG_EAX);
-		emit_mov_r32_p32(dst, dstreg, srcp);                                            // mov   dstreg,srcp
-		emit_mov_r32_imm(dst, REG_ECX, 32);                                             // mov   ecx,32
-		emit_bsf_r32_r32(dst, dstreg, dstreg);                                          // bsf   dstreg,dstreg
-		emit_cmovcc_r32_r32(dst, x64emit::COND_Z, dstreg, REG_ECX);                     // cmovz dstreg,ecx
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
+		// general case
+		mov_reg_param(a, ecx, src2p);                                                   // mov   ecx,src2p
+		if (inst.flags() != 0)
+		{
+			a.mov(eax, 0xa0000000);                                                     // mov   eax,0xa0000000
+			a.add(eax, eax);                                                            // add   eax,eax
+		}
+		a.short_().jecxz(skip);                                                         // jecxz skip
+		mov_reg_param(a, eax, src1p);                                                   // mov   eax,src1p
+		a.cdq();                                                                        // cdq
+		a.idiv(ecx);                                                                    // idiv  ecx
+		mov_param_reg(a, dstp, eax);                                                    // mov   dstp,eax
+		if (compute_rem)
+			mov_param_reg(a, edstp, edx);                                               // mov   edstp,edx
+		if (inst.flags() != 0)
+			a.test(eax, eax);                                                           // test  eax,eax
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		int dstreg = dstp.select_register(REG_RAX);
-		emit_mov_r64_p64(dst, dstreg, srcp);                                            // mov   dstreg,srcp
-		emit_mov_r64_imm(dst, REG_RCX, 64);                                             // mov   rcx,64
-		emit_bsf_r64_r64(dst, dstreg, dstreg);                                          // bsf   dstreg,dstreg
-		emit_cmovcc_r64_r64(dst, x64emit::COND_Z, dstreg, REG_RCX);                     // cmovz dstreg,rcx
-		emit_mov_p64_r64(dst, dstp, dstreg);                                            // mov   dstp,dstreg
+		// general case
+		mov_reg_param(a, rcx, src2p);                                                   // mov   rcx,src2p
+		if (inst.flags() != 0)
+		{
+			a.mov(eax, 0xa0000000);                                                     // mov   eax,0xa0000000
+			a.add(eax, eax);                                                            // add   eax,eax
+		}
+		a.short_().jecxz(skip);                                                         // jrcxz skip
+		mov_reg_param(a, rax, src1p);                                                   // mov   rax,src1p
+		a.cqo();                                                                        // cqo
+		a.idiv(rcx);                                                                    // idiv  rcx
+		mov_param_reg(a, dstp, rax);                                                    // mov   dstp,rax
+		if (compute_rem)
+			mov_param_reg(a, edstp, rdx);                                               // mov   edstp,rdx
+		if (inst.flags() != 0)
+			a.test(rax, rax);                                                           // test  eax,eax
 	}
+
+	a.bind(skip);                                                                   // skip:
 }
 
 
 //-------------------------------------------------
-//  op_bswap - process a BSWAP opcode
+//  op_and - process a AND opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_bswap(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_and(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5446,356 +3401,420 @@
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
-
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_RAX);
-
-	// 32-bit form
-	if (inst.size() == 4)
-	{
-		emit_mov_r32_p32(dst, dstreg, srcp);                                            // mov   dstreg,src1p
-		emit_bswap_r32(dst, dstreg);                                                    // bswap dstreg
-		if (inst.flags() != 0)
-			emit_test_r32_r32(dst, dstreg, dstreg);                                     // test  dstreg,dstreg
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-	}
+	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
+	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
+	normalize_commutative(src1p, src2p);
 
-	// 64-bit form
-	else if (inst.size() == 8)
-	{
-		emit_mov_r64_p64(dst, dstreg, srcp);                                            // mov   dstreg,src1p
-		emit_bswap_r64(dst, dstreg);                                                    // bswap dstreg
-		if (inst.flags() != 0)
-			emit_test_r64_r64(dst, dstreg, dstreg);                                     // test  dstreg,dstreg
-		emit_mov_p64_r64(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-	}
-}
+	// pick a target register
+	Gp dstreg = dstp.select_register((inst.size() == 4) ? eax : rax, src2p);
 
+	// dstp == src1p in memory
+	if (dstp.is_memory() && dstp == src1p)
+		alu_op_param(a, Inst::kIdAnd, MABS(dstp.memory(), inst.size()), src2p,          // and   [dstp],src2p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize all-zero and all-one cases
+				if (!inst.flags() && !src.immediate())
+				{
+					a.mov(dst.as<Mem>(), imm(0));
+					return true;
+				}
+				else if (!inst.flags() && ones(src.immediate(), inst.size()))
+					return true;
 
-//-------------------------------------------------
-//  op_shl - process a SHL opcode
-//-------------------------------------------------
+				return false;
+			});
 
-void drcbe_x64::op_shl(x86code *&dst, const instruction &inst)
-{
-	// validate instruction
-	assert(inst.size() == 4 || inst.size() == 8);
-	assert_no_condition(inst);
-	assert_flags(inst, FLAG_C | FLAG_Z | FLAG_S);
+	// dstp == src2p in memory
+	else if (dstp.is_memory() && dstp == src2p)
+		alu_op_param(a, Inst::kIdAnd, MABS(dstp.memory(), inst.size()), src1p,          // and   [dstp],src1p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize all-zero and all-one cases
+				if (!inst.flags() && !src.immediate())
+				{
+					a.mov(dst.as<Mem>(), imm(0));
+					return true;
+				}
+				else if (!inst.flags() && ones(src.immediate(), inst.size()))
+					return true;
 
-	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
+				return false;
+			});
 
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	// immediate 0xff
+	else if (src2p.is_immediate_value(0xff) && !inst.flags())
+	{
+		if (src1p.is_int_register())
+			a.movzx(dstreg, GpbLo(src1p.ireg()));                                       // movzx dstreg,src1p
+		else if (src1p.is_memory())
+			a.movzx(dstreg, MABS(src1p.memory(), 1));                                   // movzx dstreg,[src1p]
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
+	}
 
-	// 32-bit form
-	if (inst.size() == 4)
+	// immediate 0xffff
+	else if (src2p.is_immediate_value(0xffff) && !inst.flags())
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_shl_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                    // shl   [dstp],src2p
+		if (src1p.is_int_register())
+			a.movzx(dstreg, Gpw(src1p.ireg()));                                         // movzx dstreg,src1p
+		else if (src1p.is_memory())
+			a.movzx(dstreg, MABS(src1p.memory(), 2));                                   // movzx dstreg,[src1p]
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
+	}
 
-		// general case
+	// immediate 0xffffffff
+	else if (src2p.is_immediate_value(0xffffffff) && !inst.flags() && inst.size() == 8)
+	{
+		if (dstp.is_int_register() && src1p == dstp)
+			a.mov(dstreg.r32(), dstreg.r32());                                          // mov   dstreg,dstreg
 		else
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_shl_r32_p32(dst, dstreg, src2p, inst);                                 // shl   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+			mov_reg_param(a, dstreg.r32(), src1p);                                      // mov   dstreg,src1p
+			mov_param_reg(a, dstp, dstreg);                                             // mov   dstp,dstreg
 		}
 	}
 
-	// 64-bit form
-	else if (inst.size() == 8)
+	// general case
+	else
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_shl_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                    // shl   [dstp],src2p
+		mov_reg_param(a, dstreg, src1p);                                                // mov   dstreg,src1p
+		alu_op_param(a, Inst::kIdAnd, dstreg, src2p,                                    // and   dstreg,src2p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize all-zero and all-one cases
+				if (!inst.flags() && !src.immediate())
+				{
+					a.xor_(dst.as<Gpd>(), dst.as<Gpd>());
+					return true;
+				}
+				else if (!inst.flags() && ones(src.immediate(), inst.size()))
+					return true;
 
-		// general case
-		else
-		{
-			emit_mov_r64_p64(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_shl_r64_p64(dst, dstreg, src2p, inst);                                 // shl   dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+				return false;
+			});
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
 }
 
 
 //-------------------------------------------------
-//  op_shr - process a SHR opcode
+//  op_test - process a TEST opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_shr(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_test(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_C | FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_Z | FLAG_S);
 
 	// normalize parameters
-	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
-
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
-
-	// 32-bit form
-	if (inst.size() == 4)
-	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_shr_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                    // shr   [dstp],src2p
+	be_parameter src1p(*this, inst.param(0), PTYPE_MRI);
+	be_parameter src2p(*this, inst.param(1), PTYPE_MRI);
+	normalize_commutative(src1p, src2p);
 
-		// general case
-		else
-		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_shr_r32_p32(dst, dstreg, src2p, inst);                                 // shr   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
-	}
+	// src1p in memory
+	if (src1p.is_memory())
+		alu_op_param(a, Inst::kIdTest, MABS(src1p.memory(), inst.size()), src2p);       // test  [src1p],src2p
 
-	// 64-bit form
-	else if (inst.size() == 8)
+	// general case
+	else
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_shr_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                    // shr   [dstp],src2p
+		// pick a target register for the general case
+		Gp src1reg = src1p.select_register((inst.size() == 4) ? eax : rax);
 
-		// general case
-		else
-		{
-			emit_mov_r64_p64(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_shr_r64_p64(dst, dstreg, src2p, inst);                                 // shr   dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+		mov_reg_param(a, src1reg, src1p);                                               // mov   src1reg,src1p
+		alu_op_param(a, Inst::kIdTest, src1reg, src2p);                                 // test  src1reg,src2p
 	}
 }
 
 
 //-------------------------------------------------
-//  op_sar - process a SAR opcode
+//  op_or - process a OR opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_sar(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_or(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_C | FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_Z | FLAG_S);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
 	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
 	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
+	normalize_commutative(src1p, src2p);
 
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	// dstp == src1p in memory
+	if (dstp.is_memory() && dstp == src1p)
+		alu_op_param(a, Inst::kIdOr, MABS(dstp.memory(), inst.size()), src2p,           // or    [dstp],src2p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize all-zero and all-one cases
+				if (!inst.flags() && ones(src.immediate(), inst.size()))
+				{
+					a.mov(dst.as<Mem>(), imm(-1));
+					return true;
+				}
+				else if (!inst.flags() && !src.immediate())
+					return true;
 
-	// 32-bit form
-	if (inst.size() == 4)
-	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_sar_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                    // sar   [dstp],src2p
+				return false;
+			});
 
-		// general case
-		else
-		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_sar_r32_p32(dst, dstreg, src2p, inst);                                 // sar   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
-	}
+	// dstp == src2p in memory
+	else if (dstp.is_memory() && dstp == src2p)
+		alu_op_param(a, Inst::kIdOr, MABS(dstp.memory(), inst.size()), src1p,           // or    [dstp],src1p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize all-zero and all-one cases
+				if (!inst.flags() && ones(src.immediate(), inst.size()))
+				{
+					a.mov(dst.as<Mem>(), imm(-1));
+					return true;
+				}
+				else if (!inst.flags() && !src.immediate())
+					return true;
 
-	// 64-bit form
-	else if (inst.size() == 8)
+				return false;
+			});
+
+	// general case
+	else
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_sar_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                    // sar   [dstp],src2p
+		// pick a target register for the general case
+		Gp dstreg = dstp.select_register((inst.size() == 4) ? eax : rax, src2p);
 
-		// general case
-		else
-		{
-			emit_mov_r64_p64(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_sar_r64_p64(dst, dstreg, src2p, inst);                                 // sar   dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+		mov_reg_param(a, dstreg, src1p);                                                // mov   dstreg,src1p
+		alu_op_param(a, Inst::kIdOr, dstreg, src2p,                                     // or    dstreg,src2p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize all-zero and all-one cases
+				if (!inst.flags() && ones(src.immediate(), inst.size()))
+				{
+					a.mov(dst.as<Gp>(), imm(-1));
+					return true;
+				}
+				else if (!inst.flags() && !src.immediate())
+					return true;
+
+				return false;
+			});
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
 }
 
 
 //-------------------------------------------------
-//  op_rol - process a rol opcode
+//  op_xor - process a XOR opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_rol(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_xor(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_C | FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_Z | FLAG_S);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
 	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
 	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
+	normalize_commutative(src1p, src2p);
 
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	// dstp == src1p in memory
+	if (dstp.is_memory() && dstp == src1p)
+		alu_op_param(a, Inst::kIdXor, MABS(dstp.memory(), inst.size()), src2p,          // xor   [dstp],src2p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize all-zero and all-one cases
+				if (!inst.flags() && ones(src.immediate(), inst.size()))
+				{
+					a.not_(dst.as<Mem>());
+					return true;
+				}
+				else if (!inst.flags() && !src.immediate())
+					return true;
 
-	// 32-bit form
-	if (inst.size() == 4)
+				return false;
+			});
+
+	// dstp == src2p in memory
+	else if (dstp.is_memory() && dstp == src2p)
+		alu_op_param(a, Inst::kIdXor, MABS(dstp.memory(), inst.size()), src1p,          // xor   [dstp],src1p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize all-zero and all-one cases
+				if (!inst.flags() && ones(src.immediate(), inst.size()))
+				{
+					a.not_(dst.as<Mem>());
+					return true;
+				}
+				else if (!inst.flags() && !src.immediate())
+					return true;
+
+				return false;
+			});
+
+	// dstp == src1p register
+	else if (dstp.is_int_register() && dstp == src1p)
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_rol_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                    // rol   [dstp],src2p
+		u32 const rs = (inst.size() == 4) ? Gpd::kSignature : Gpq::kSignature;
 
-		// general case
-		else
-		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_rol_r32_p32(dst, dstreg, src2p, inst);                                 // rol   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
-	}
+		alu_op_param(a, Inst::kIdXor, Gp(rs, dstp.ireg()), src2p,                       // xor   dstp,src2p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize all-zero and all-one cases
+				if (!inst.flags() && ones(src.immediate(), inst.size()))
+				{
+					a.not_(dst.as<Gp>());
+					return true;
+				}
+				else if (!inst.flags() && !src.immediate())
+					return true;
 
-	// 64-bit form
-	else if (inst.size() == 8)
+				return false;
+			});
+	}
+	// general case
+	else
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_rol_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                    // rol   [dstp],src2p
+		// pick a target register for the general case
+		Gp dstreg = dstp.select_register((inst.size() == 4) ? eax : rax, src2p);
 
-		// general case
-		else
-		{
-			emit_mov_r64_p64(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_rol_r64_p64(dst, dstreg, src2p, inst);                                 // rol   dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+		mov_reg_param(a, dstreg, src1p);                                                // mov   dstreg,src1p
+		alu_op_param(a, Inst::kIdXor, dstreg, src2p,                                    // xor   dstreg,src2p
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize all-zero and all-one cases
+				if (!inst.flags() && ones(src.immediate(), inst.size()))
+				{
+					a.not_(dst.as<Gp>());
+					return true;
+				}
+				else if (!inst.flags() && !src.immediate())
+					return true;
+
+				return false;
+			});
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
 }
 
 
 //-------------------------------------------------
-//  op_ror - process a ROR opcode
+//  op_lzcnt - process a LZCNT opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_ror(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_lzcnt(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_C | FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_Z | FLAG_S);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
-
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_ror_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                    // ror   [dstp],src2p
+		// pick a target register
+		Gp dstreg = dstp.select_register(eax);
 
-		// general case
-		else
-		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_ror_r32_p32(dst, dstreg, src2p, inst);                                 // ror   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+		mov_reg_param(a, dstreg, srcp);                                                 // mov   dstreg,src1p
+		a.mov(ecx, 32 ^ 31);                                                            // mov   ecx,32 ^ 31
+		a.bsr(dstreg, dstreg);                                                          // bsr   dstreg,dstreg
+		a.cmovz(dstreg, ecx);                                                           // cmovz dstreg,ecx
+		a.xor_(dstreg, 31);                                                             // xor   dstreg,31
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_ror_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                    // ror   [dstp],src2p
+		// pick a target register
+		Gp dstreg = dstp.select_register(rax);
 
-		// general case
-		else
-		{
-			emit_mov_r64_p64(dst, dstreg, src1p);                                       // mov   dstreg,src1p
-			emit_ror_r64_p64(dst, dstreg, src2p, inst);                                 // ror   dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+		mov_reg_param(a, dstreg, srcp);                                                 // mov   dstreg,src1p
+		a.mov(ecx, 64 ^ 63);                                                            // mov   ecx,64 ^ 63
+		a.bsr(dstreg, dstreg);                                                          // bsr   dstreg,dstreg
+		a.cmovz(dstreg, rcx);                                                           // cmovz dstreg,rcx
+		a.xor_(dstreg, 63);                                                             // xor   dstreg,63
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
 }
 
 
 //-------------------------------------------------
-//  op_rolc - process a ROLC opcode
+//  op_tzcnt - process a TZCNT opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_rolc(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_tzcnt(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_no_condition(inst);
-	assert_flags(inst, FLAG_C | FLAG_Z | FLAG_S);
+	assert_flags(inst, FLAG_Z | FLAG_S);
 
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
-	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
-	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
-
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_rcl_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                    // rcl   [dstp],src2p
+		Gp dstreg = dstp.select_register(eax);
 
-		// general case
-		else
-		{
-			emit_mov_r32_p32_keepflags(dst, dstreg, src1p);                             // mov   dstreg,src1p
-			emit_rcl_r32_p32(dst, dstreg, src2p, inst);                                 // rcl   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+		mov_reg_param(a, dstreg, srcp);                                                 // mov   dstreg,srcp
+		a.mov(ecx, 32);                                                                 // mov   ecx,32
+		a.bsf(dstreg, dstreg);                                                          // bsf   dstreg,dstreg
+		a.cmovz(dstreg, ecx);                                                           // cmovz dstreg,ecx
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_rcl_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                    // rcl   [dstp],src2p
+		Gp dstreg = dstp.select_register(rax);
 
-		// general case
-		else
-		{
-			emit_mov_r64_p64_keepflags(dst, dstreg, src1p);                             // mov   dstreg,src1p
-			emit_rcl_r64_p64(dst, dstreg, src2p, inst);                                 // rcl   dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
+		mov_reg_param(a, dstreg, srcp);                                                 // mov   dstreg,srcp
+		a.mov(ecx, 64);                                                                 // mov   ecx,64
+		a.bsf(dstreg, dstreg);                                                          // bsf   dstreg,dstreg
+		a.cmovz(dstreg, rcx);                                                           // cmovz dstreg,rcx
+		mov_param_reg(a, dstp, dstreg);                                                 // mov   dstp,dstreg
 	}
 }
 
 
 //-------------------------------------------------
-//  op_rorc - process a RORC opcode
+//  op_bswap - process a BSWAP opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_rorc(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_bswap(Assembler &a, const instruction &inst)
+{
+	// validate instruction
+	assert(inst.size() == 4 || inst.size() == 8);
+	assert_no_condition(inst);
+	assert_flags(inst, FLAG_Z | FLAG_S);
+
+	// normalize parameters
+	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
+	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
+
+	// pick a target register
+	Gp dstreg = dstp.select_register(inst.size() == 4 ? eax : rax);
+
+	mov_reg_param(a, dstreg, srcp);                                                     // mov   dstreg,src1p
+	a.bswap(dstreg);                                                                    // bswap dstreg
+	if (inst.flags() != 0)
+		a.test(dstreg, dstreg);                                                         // test  dstreg,dstreg
+	mov_param_reg(a, dstp, dstreg);                                                     // mov   dstp,dstreg
+}
+
+template <Inst::Id Opcode> void drcbe_x64::op_shift(Assembler &a, const uml::instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5807,44 +3826,32 @@
 	be_parameter src1p(*this, inst.param(1), PTYPE_MRI);
 	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
 
-	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	const bool carry = (Opcode == Inst::kIdRcl) || (Opcode == Inst::kIdRcr);
 
-	// 32-bit form
-	if (inst.size() == 4)
+	// optimize immediate zero case
+	if (carry || inst.flags() || !src2p.is_immediate_value(0))
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_rcr_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                    // rcr   [dstp],src2p
+			shift_op_param(a, Opcode, MABS(dstp.memory(), inst.size()), src2p);         // op   [dstp],src2p
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32_keepflags(dst, dstreg, src1p);                             // mov   dstreg,src1p
-			emit_rcr_r32_p32(dst, dstreg, src2p, inst);                                 // rcr   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
-		}
-	}
-
-	// 64-bit form
-	else if (inst.size() == 8)
-	{
-		// dstp == src1p in memory
-		if (dstp.is_memory() && dstp == src1p)
-			emit_rcr_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                    // rcr   [dstp],src2p
+			// pick a target register
+			Gp dstreg = dstp.select_register(inst.size() == 4 ? eax : rax, src2p);
 
-		// general case
-		else
-		{
-			emit_mov_r64_p64_keepflags(dst, dstreg, src1p);                             // mov   dstreg,src1p
-			emit_rcr_r64_p64(dst, dstreg, src2p, inst);                                 // rcr   dstreg,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+			if (carry)
+				mov_reg_param(a, dstreg, src1p, true);                                  // mov   dstreg,src1p
+			else
+				mov_reg_param(a, dstreg, src1p);                                        // mov   dstreg,src1p
+			shift_op_param(a, Opcode, dstreg, src2p);                                   // op    dstreg,src2p
+			mov_param_reg(a, dstp, dstreg);                                             // mov   dstp,dstreg
 		}
 	}
 }
 
 
-
 /***************************************************************************
     FLOATING POINT OPERATIONS
 ***************************************************************************/
@@ -5853,7 +3860,7 @@
 //  op_fload - process a FLOAD opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fload(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fload(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5866,38 +3873,38 @@
 	be_parameter indp(*this, inst.param(2), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0);
+	Xmm dstreg = dstp.select_register(xmm0);
 
 	// determine the pointer base
 	int32_t baseoffs;
-	int basereg = get_base_register_and_offset(dst, basep.memory(), REG_RDX, baseoffs);
+	Gp basereg = get_base_register_and_offset(a, basep.memory(), rdx, baseoffs);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		if (indp.is_immediate())
-			emit_movss_r128_m32(dst, dstreg, MBD(basereg, baseoffs + 4*indp.immediate()));  // movss  dstreg,[basep + 4*indp]
+			a.movss(dstreg, ptr(basereg, baseoffs + 4*indp.immediate()));               // movss  dstreg,[basep + 4*indp]
 		else
 		{
-			int indreg = indp.select_register(REG_ECX);
-			emit_mov_r32_p32(dst, indreg, indp);                                        // mov    indreg,indp
-			emit_movss_r128_m32(dst, dstreg, MBISD(basereg, indreg, 4, baseoffs));      // movss  dstreg,[basep + 4*indp]
+			Gp indreg = indp.select_register(ecx);
+			mov_reg_param(a, indreg, indp);                                             // mov    indreg,indp
+			a.movss(dstreg, ptr(basereg, indreg, 2, baseoffs));                         // movss  dstreg,[basep + 4*indp]
 		}
-		emit_movss_p32_r128(dst, dstp, dstreg);                                         // movss  dstp,dstreg
+		movss_p32_r128(a, dstp, dstreg);                                                // movss  dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
 		if (indp.is_immediate())
-			emit_movsd_r128_m64(dst, dstreg, MBD(basereg, baseoffs + 8*indp.immediate()));  // movsd  dstreg,[basep + 8*indp]
+			a.movsd(dstreg, ptr(basereg, baseoffs + 8*indp.immediate()));               // movsd  dstreg,[basep + 8*indp]
 		else
 		{
-			int indreg = indp.select_register(REG_ECX);
-			emit_mov_r32_p32(dst, indreg, indp);                                        // mov    indreg,indp
-			emit_movsd_r128_m64(dst, dstreg, MBISD(basereg, indreg, 8, baseoffs));      // movsd  dstreg,[basep + 8*indp]
+			Gp indreg = indp.select_register(ecx);
+			mov_reg_param(a, indreg, indp);                                             // mov    indreg,indp
+			a.movsd(dstreg, ptr(basereg, indreg, 3, baseoffs));                         // movsd  dstreg,[basep + 8*indp]
 		}
-		emit_movsd_p64_r128(dst, dstp, dstreg);                                         // movsd  dstp,dstreg
+		movsd_p64_r128(a, dstp, dstreg);                                                // movsd  dstp,dstreg
 	}
 }
 
@@ -5906,7 +3913,7 @@
 //  op_fstore - process a FSTORE opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fstore(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fstore(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5919,37 +3926,37 @@
 	be_parameter srcp(*this, inst.param(2), PTYPE_MF);
 
 	// pick a target register for the general case
-	int srcreg = srcp.select_register(REG_XMM0);
+	Xmm srcreg = srcp.select_register(xmm0);
 
 	// determine the pointer base
 	int32_t baseoffs;
-	int basereg = get_base_register_and_offset(dst, basep.memory(), REG_RDX, baseoffs);
+	Gp basereg = get_base_register_and_offset(a, basep.memory(), rdx, baseoffs);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_movss_r128_p32(dst, srcreg, srcp);                                         // movss  srcreg,srcp
+		movss_r128_p32(a, srcreg, srcp);                                                // movss  srcreg,srcp
 		if (indp.is_immediate())
-			emit_movss_m32_r128(dst, MBD(basereg, baseoffs + 4*indp.immediate()), srcreg);  // movss  [basep + 4*indp],srcreg
+			a.movss(ptr(basereg, baseoffs + 4*indp.immediate()), srcreg);               // movss  [basep + 4*indp],srcreg
 		else
 		{
-			int indreg = indp.select_register(REG_ECX);
-			emit_mov_r32_p32(dst, indreg, indp);                                        // mov    indreg,indp
-			emit_movss_m32_r128(dst, MBISD(basereg, indreg, 4, baseoffs), srcreg);      // movss  [basep + 4*indp],srcreg
+			Gp indreg = indp.select_register(ecx);
+			mov_reg_param(a, indreg, indp);                                             // mov    indreg,indp
+			a.movss(ptr(basereg, indreg, 2, baseoffs), srcreg);                         // movss  [basep + 4*indp],srcreg
 		}
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_movsd_r128_p64(dst, srcreg, srcp);                                         // movsd  srcreg,srcp
+		movsd_r128_p64(a, srcreg, srcp);                                                // movsd  srcreg,srcp
 		if (indp.is_immediate())
-			emit_movsd_m64_r128(dst, MBD(basereg, baseoffs + 8*indp.immediate()), srcreg);  // movsd  [basep + 8*indp],srcreg
+			a.movsd(ptr(basereg, baseoffs + 8*indp.immediate()), srcreg);               // movsd  [basep + 8*indp],srcreg
 		else
 		{
-			int indreg = indp.select_register(REG_ECX);
-			emit_mov_r32_p32(dst, indreg, indp);                                        // mov    indreg,indp
-			emit_movsd_m64_r128(dst, MBISD(basereg, indreg, 8, baseoffs), srcreg);      // movsd  [basep + 8*indp],srcreg
+			Gp indreg = indp.select_register(ecx);
+			mov_reg_param(a, indreg, indp);                                             // mov    indreg,indp
+			a.movsd(ptr(basereg, indreg, 3, baseoffs), srcreg);                         // movsd  [basep + 8*indp],srcreg
 		}
 	}
 }
@@ -5959,7 +3966,7 @@
 //  op_fread - process a FREAD opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fread(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fread(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5974,27 +3981,27 @@
 	assert((1 << spacep.size()) == inst.size());
 
 	// set up a call to the read dword/qword handler
-	emit_mov_r64_imm(dst, REG_PARAM1, (uintptr_t)(m_space[spacep.space()]));                 // mov    param1,space
-	emit_mov_r32_p32(dst, REG_PARAM2, addrp);                                           // mov    param2,addrp
+	mov_r64_imm(a, Gpq(REG_PARAM1), (uintptr_t)m_space[spacep.space()]);                // mov    param1,space
+	mov_reg_param(a, Gpd(REG_PARAM2), addrp);                                           // mov    param2,addrp
 	if (inst.size() == 4)
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacep.space()].read_dword);  // call   read_dword
+		smart_call_m64(a, (x86code **)&m_accessors[spacep.space()].read_dword);         // call   read_dword
 	else if (inst.size() == 8)
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacep.space()].read_qword);  // call   read_qword
+		smart_call_m64(a, (x86code **)&m_accessors[spacep.space()].read_qword);         // call   read_qword
 
 	// store result
 	if (inst.size() == 4)
 	{
 		if (dstp.is_memory())
-			emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX);                        // mov   [dstp],eax
+			a.mov(MABS(dstp.memory()), eax);                                            // mov   [dstp],eax
 		else if (dstp.is_float_register())
-			emit_movd_r128_r32(dst, dstp.freg(), REG_EAX);                              // movd  dstp,eax
+			a.movd(Xmm(dstp.freg()), eax);                                              // movd  dstp,eax
 	}
 	else if (inst.size() == 8)
 	{
 		if (dstp.is_memory())
-			emit_mov_m64_r64(dst, MABS(dstp.memory()), REG_RAX);                        // mov   [dstp],rax
+			a.mov(MABS(dstp.memory()), rax);                                            // mov   [dstp],rax
 		else if (dstp.is_float_register())
-			emit_movq_r128_r64(dst, dstp.freg(), REG_RAX);                              // movq  dstp,rax
+			a.movq(Xmm(dstp.freg()), rax);                                              // movq  dstp,rax
 	}
 }
 
@@ -6003,7 +4010,7 @@
 //  op_fwrite - process a FWRITE opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fwrite(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fwrite(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6018,27 +4025,27 @@
 	assert((1 << spacep.size()) == inst.size());
 
 	// general case
-	emit_mov_r64_imm(dst, REG_PARAM1, (uintptr_t)(m_space[spacep.space()]));                 // mov    param1,space
-	emit_mov_r32_p32(dst, REG_PARAM2, addrp);                                           // mov    param21,addrp
+	mov_r64_imm(a, Gpq(REG_PARAM1), (uintptr_t)m_space[spacep.space()]);                // mov    param1,space
+	mov_reg_param(a, Gpd(REG_PARAM2), addrp);                                           // mov    param21,addrp
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		if (srcp.is_memory())
-			emit_mov_r32_m32(dst, REG_PARAM3, MABS(srcp.memory()));                     // mov    param3,[srcp]
+			a.mov(Gpd(REG_PARAM3), MABS(srcp.memory()));                                // mov    param3,[srcp]
 		else if (srcp.is_float_register())
-			emit_movd_r32_r128(dst, REG_PARAM3, srcp.freg());                           // movd   param3,srcp
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacep.space()].write_dword); // call   write_dword
+			a.movd(Gpd(REG_PARAM3), Xmm(srcp.freg()));                                  // movd   param3,srcp
+		smart_call_m64(a, (x86code **)&m_accessors[spacep.space()].write_dword);        // call   write_dword
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
 		if (srcp.is_memory())
-			emit_mov_r64_m64(dst, REG_PARAM3, MABS(srcp.memory()));                     // mov    param3,[srcp]
+			a.mov(Gpq(REG_PARAM3), MABS(srcp.memory()));                                // mov    param3,[srcp]
 		else if (srcp.is_float_register())
-			emit_movq_r64_r128(dst, REG_PARAM3, srcp.freg());                           // movq   param3,srcp
-		emit_smart_call_m64(dst, (x86code **)&m_accessors[spacep.space()].write_qword); // call   write_qword
+			a.movq(Gpq(REG_PARAM3), Xmm(srcp.freg()));                                  // movq   param3,srcp
+		smart_call_m64(a, (x86code **)&m_accessors[spacep.space()].write_qword);        // call   write_qword
 	}
 }
 
@@ -6047,7 +4054,7 @@
 //  op_fmov - process a FMOV opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fmov(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fmov(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6059,24 +4066,24 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0);
+	Xmm dstreg = dstp.select_register(xmm0);
 
 	// always start with a jmp
-	emit_link skip = { nullptr };
+	Label skip = a.newLabel();
 	if (inst.condition() != uml::COND_ALWAYS)
-		emit_jcc_short_link(dst, X86_NOT_CONDITION(inst.condition()), skip);            // jcc   skip
+		a.short_().j(X86_NOT_CONDITION(inst.condition()), skip);                        // jcc   skip
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		if (srcp.is_float_register())
 		{
-			emit_movss_p32_r128(dst, dstp, srcp.freg());                                // movss dstp,srcp
+			movss_p32_r128(a, dstp, Xmm(srcp.freg()));                                  // movss dstp,srcp
 		}
 		else
 		{
-			emit_movss_r128_p32(dst, dstreg, srcp);                                     // movss dstreg,srcp
-			emit_movss_p32_r128(dst, dstp, dstreg);                                     // movss dstp,dstreg
+			movss_r128_p32(a, dstreg, srcp);                                            // movss dstreg,srcp
+			movss_p32_r128(a, dstp, dstreg);                                            // movss dstp,dstreg
 		}
 	}
 
@@ -6085,18 +4092,18 @@
 	{
 		if (srcp.is_float_register())
 		{
-			emit_movsd_p64_r128(dst, dstp, srcp.freg());                                // movsd dstp,srcp
+			movsd_p64_r128(a, dstp, Xmm(srcp.freg()));                                  // movsd dstp,srcp
 		}
 		else
 		{
-			emit_movsd_r128_p64(dst, dstreg, srcp);                                     // movsd dstreg,srcp
-			emit_movsd_p64_r128(dst, dstp, dstreg);                                     // movsd dstp,dstreg
+			movsd_r128_p64(a, dstreg, srcp);                                            // movsd dstreg,srcp
+			movsd_p64_r128(a, dstp, dstreg);                                            // movsd dstp,dstreg
 		}
 	}
 
 	// resolve the jump
 	if (inst.condition() != uml::COND_ALWAYS)
-		resolve_link(dst, skip);                                                    // skip:
+		a.bind(skip);                                                               // skip:
 }
 
 
@@ -6104,7 +4111,7 @@
 //  op_ftoint - process a FTOINT opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_ftoint(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_ftoint(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6120,108 +4127,58 @@
 	assert(roundp.is_rounding());
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+	Gp dstreg = dstp.select_register((sizep.size() == SIZE_DWORD) ? eax : rax);
 
 	// set rounding mode if necessary
 	if (roundp.rounding() != ROUND_DEFAULT && roundp.rounding() != ROUND_TRUNC)
 	{
-		emit_stmxcsr_m32(dst, MABS(&m_near.ssemodesave));                               // stmxcsr [ssemodesave]
-		emit_ldmxcsr_m32(dst, MABS(&m_near.ssecontrol[roundp.rounding()]));             // ldmxcsr fpcontrol[mode]
+		a.stmxcsr(MABS(&m_near.ssemodesave));                                           // stmxcsr [ssemodesave]
+		a.ldmxcsr(MABS(&m_near.ssecontrol[roundp.rounding()]));                         // ldmxcsr fpcontrol[mode]
 	}
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		// 32-bit integer source
-		if (sizep.size() == SIZE_DWORD)
+		if (srcp.is_memory())
 		{
-			if (srcp.is_memory())
-			{
-				if (roundp.rounding() != ROUND_TRUNC)
-					emit_cvtss2si_r32_m32(dst, dstreg, MABS(srcp.memory()));            // cvtss2si dstreg,[srcp]
-				else
-					emit_cvttss2si_r32_m32(dst, dstreg, MABS(srcp.memory()));           // cvttss2si dstreg,[srcp]
-			}
-			else if (srcp.is_float_register())
-			{
-				if (roundp.rounding() != ROUND_TRUNC)
-					emit_cvtss2si_r32_r128(dst, dstreg, srcp.freg());                   // cvtss2si dstreg,srcp
-				else
-					emit_cvttss2si_r32_r128(dst, dstreg, srcp.freg());                  // cvttss2si dstreg,srcp
-			}
+			if (roundp.rounding() != ROUND_TRUNC)
+				a.cvtss2si(dstreg, MABS(srcp.memory()));                                // cvtss2si dstreg,[srcp]
+			else
+				a.cvttss2si(dstreg, MABS(srcp.memory()));                               // cvttss2si dstreg,[srcp]
 		}
-
-		// 64-bit integer source
-		else if (sizep.size() == SIZE_QWORD)
+		else if (srcp.is_float_register())
 		{
-			if (srcp.is_memory())
-			{
-				if (roundp.rounding() != ROUND_TRUNC)
-					emit_cvtss2si_r64_m32(dst, dstreg, MABS(srcp.memory()));            // cvtss2si dstreg,[srcp]
-				else
-					emit_cvttss2si_r64_m32(dst, dstreg, MABS(srcp.memory()));           // cvttss2si dstreg,[srcp]
-			}
-			else if (srcp.is_float_register())
-			{
-				if (roundp.rounding() != ROUND_TRUNC)
-					emit_cvtss2si_r64_r128(dst, dstreg, srcp.freg());                   // cvtss2si dstreg,srcp
-				else
-					emit_cvttss2si_r64_r128(dst, dstreg, srcp.freg());                  // cvttss2si dstreg,srcp
-			}
+			if (roundp.rounding() != ROUND_TRUNC)
+				a.cvtss2si(dstreg, Xmm(srcp.freg()));                                   // cvtss2si dstreg,srcp
+			else
+				a.cvttss2si(dstreg, Xmm(srcp.freg()));                                  // cvttss2si dstreg,srcp
 		}
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		// 32-bit integer source
-		if (sizep.size() == SIZE_DWORD)
+		if (srcp.is_memory())
 		{
-			if (srcp.is_memory())
-			{
-				if (roundp.rounding() != ROUND_TRUNC)
-					emit_cvtsd2si_r32_m64(dst, dstreg, MABS(srcp.memory()));            // cvtsd2si dstreg,[srcp]
-				else
-					emit_cvttsd2si_r32_m64(dst, dstreg, MABS(srcp.memory()));           // cvttsd2si dstreg,[srcp]
-			}
-			else if (srcp.is_float_register())
-			{
-				if (roundp.rounding() != ROUND_TRUNC)
-					emit_cvtsd2si_r32_r128(dst, dstreg, srcp.freg());                   // cvtsd2si dstreg,srcp
-				else
-					emit_cvttsd2si_r32_r128(dst, dstreg, srcp.freg());                  // cvttsd2si dstreg,srcp
-			}
+			if (roundp.rounding() != ROUND_TRUNC)
+				a.cvtsd2si(dstreg, MABS(srcp.memory()));                                // cvtsd2si dstreg,[srcp]
+			else
+				a.cvttsd2si(dstreg, MABS(srcp.memory()));                               // cvttsd2si dstreg,[srcp]
 		}
-
-		// 64-bit integer source
-		else if (sizep.size() == SIZE_QWORD)
+		else if (srcp.is_float_register())
 		{
-			if (srcp.is_memory())
-			{
-				if (roundp.rounding() != ROUND_TRUNC)
-					emit_cvtsd2si_r64_m64(dst, dstreg, MABS(srcp.memory()));            // cvtsd2si dstreg,[srcp]
-				else
-					emit_cvttsd2si_r64_m64(dst, dstreg, MABS(srcp.memory()));           // cvttsd2si dstreg,[srcp]
-			}
-			else if (srcp.is_float_register())
-			{
-				if (roundp.rounding() != ROUND_TRUNC)
-					emit_cvtsd2si_r64_r128(dst, dstreg, srcp.freg());                   // cvtsd2si dstreg,srcp
-				else
-					emit_cvttsd2si_r64_r128(dst, dstreg, srcp.freg());                  // cvttsd2si dstreg,srcp
-			}
+			if (roundp.rounding() != ROUND_TRUNC)
+				a.cvtsd2si(dstreg, Xmm(srcp.freg()));                                   // cvtsd2si dstreg,srcp
+			else
+				a.cvttsd2si(dstreg, Xmm(srcp.freg()));                                  // cvttsd2si dstreg,srcp
 		}
 	}
 
-	// general case
-	if (sizep.size() == SIZE_DWORD)
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
-	else
-		emit_mov_p64_r64(dst, dstp, dstreg);                                            // mov   dstp,dstreg
+	mov_param_reg(a, dstp, dstreg);                                                     // mov   dstp,dstreg
 
 	// restore rounding mode
 	if (roundp.rounding() != ROUND_DEFAULT && roundp.rounding() != ROUND_TRUNC)
-		emit_ldmxcsr_m32(dst, MABS(&m_near.ssemodesave));                               // ldmxcsr [ssemodesave]
+		a.ldmxcsr(MABS(&m_near.ssemodesave));                                           // ldmxcsr [ssemodesave]
 }
 
 
@@ -6229,7 +4186,7 @@
 //  op_ffrint - process a FFRINT opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_ffrint(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_ffrint(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6243,7 +4200,7 @@
 	assert(sizep.is_size());
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0);
+	Xmm dstreg = dstp.select_register(xmm0);
 
 	// 32-bit form
 	if (inst.size() == 4)
@@ -6252,12 +4209,12 @@
 		if (sizep.size() == SIZE_DWORD)
 		{
 			if (srcp.is_memory())
-				emit_cvtsi2ss_r128_m32(dst, dstreg, MABS(srcp.memory()));               // cvtsi2ss dstreg,[srcp]
+				a.cvtsi2ss(dstreg, MABS(srcp.memory(), 4));                             // cvtsi2ss dstreg,[srcp]
 			else
 			{
-				int srcreg = srcp.select_register(REG_EAX);
-				emit_mov_r32_p32(dst, srcreg, srcp);                                    // mov      srcreg,srcp
-				emit_cvtsi2ss_r128_r32(dst, dstreg, srcreg);                            // cvtsi2ss dstreg,srcreg
+				Gp srcreg = srcp.select_register(eax);
+				mov_reg_param(a, srcreg, srcp);                                         // mov      srcreg,srcp
+				a.cvtsi2ss(dstreg, srcreg);                                             // cvtsi2ss dstreg,srcreg
 			}
 		}
 
@@ -6265,15 +4222,15 @@
 		else
 		{
 			if (srcp.is_memory())
-				emit_cvtsi2ss_r128_m64(dst, dstreg, MABS(srcp.memory()));               // cvtsi2ss dstreg,[srcp]
+				a.cvtsi2ss(dstreg, MABS(srcp.memory(), 8));                             // cvtsi2ss dstreg,[srcp]
 			else
 			{
-				int srcreg = srcp.select_register(REG_RAX);
-				emit_mov_r64_p64(dst, srcreg, srcp);                                    // mov      srcreg,srcp
-				emit_cvtsi2ss_r128_r64(dst, dstreg, srcreg);                            // cvtsi2ss dstreg,srcreg
+				Gp srcreg = srcp.select_register(rax);
+				mov_reg_param(a, srcreg, srcp);                                         // mov      srcreg,srcp
+				a.cvtsi2ss(dstreg, srcreg);                                             // cvtsi2ss dstreg,srcreg
 			}
 		}
-		emit_movss_p32_r128(dst, dstp, dstreg);                                         // movss    dstp,dstreg
+		movss_p32_r128(a, dstp, dstreg);                                                // movss    dstp,dstreg
 	}
 
 	// 64-bit form
@@ -6283,12 +4240,12 @@
 		if (sizep.size() == SIZE_DWORD)
 		{
 			if (srcp.is_memory())
-				emit_cvtsi2sd_r128_m32(dst, dstreg, MABS(srcp.memory()));               // cvtsi2sd dstreg,[srcp]
+				a.cvtsi2sd(dstreg, MABS(srcp.memory(), 4));                             // cvtsi2sd dstreg,[srcp]
 			else
 			{
-				int srcreg = srcp.select_register(REG_EAX);
-				emit_mov_r32_p32(dst, srcreg, srcp);                                    // mov      srcreg,srcp
-				emit_cvtsi2sd_r128_r32(dst, dstreg, srcreg);                            // cvtsi2sd dstreg,srcreg
+				Gp srcreg = srcp.select_register(eax);
+				mov_reg_param(a, srcreg, srcp);                                         // mov      srcreg,srcp
+				a.cvtsi2sd(dstreg, srcreg);                                             // cvtsi2sd dstreg,srcreg
 			}
 		}
 
@@ -6296,15 +4253,15 @@
 		else
 		{
 			if (srcp.is_memory())
-				emit_cvtsi2sd_r128_m64(dst, dstreg, MABS(srcp.memory()));               // cvtsi2sd dstreg,[srcp]
+				a.cvtsi2sd(dstreg, MABS(srcp.memory(), 8));                             // cvtsi2sd dstreg,[srcp]
 			else
 			{
-				int srcreg = srcp.select_register(REG_EAX);
-				emit_mov_r64_p64(dst, srcreg, srcp);                                    // mov      srcreg,srcp
-				emit_cvtsi2sd_r128_r64(dst, dstreg, srcreg);                            // cvtsi2sd dstreg,srcreg
+				Gp srcreg = srcp.select_register(rax);
+				mov_reg_param(a, srcreg, srcp);                                         // mov      srcreg,srcp
+				a.cvtsi2sd(dstreg, srcreg);                                             // cvtsi2sd dstreg,srcreg
 			}
 		}
-		emit_movsd_p64_r128(dst, dstp, dstreg);                                         // movsd    dstp,dstreg
+		movsd_p64_r128(a, dstp, dstreg);                                                // movsd    dstp,dstreg
 	}
 }
 
@@ -6313,7 +4270,7 @@
 //  op_ffrflt - process a FFRFLT opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_ffrflt(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_ffrflt(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6327,26 +4284,26 @@
 	assert(sizep.is_size());
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0);
+	Xmm dstreg = dstp.select_register(xmm0);
 
 	// single-to-double
 	if (inst.size() == 8 && sizep.size() == SIZE_DWORD)
 	{
 		if (srcp.is_memory())
-			emit_cvtss2sd_r128_m32(dst, dstreg, MABS(srcp.memory()));                   // cvtss2sd dstreg,[srcp]
+			a.cvtss2sd(dstreg, MABS(srcp.memory()));                                    // cvtss2sd dstreg,[srcp]
 		else if (srcp.is_float_register())
-			emit_cvtss2sd_r128_r128(dst, dstreg, srcp.freg());                          // cvtss2sd dstreg,srcp
-		emit_movsd_p64_r128(dst, dstp, dstreg);                                         // movsd    dstp,dstreg
+			a.cvtss2sd(dstreg, Xmm(srcp.freg()));                                       // cvtss2sd dstreg,srcp
+		movsd_p64_r128(a, dstp, dstreg);                                                // movsd    dstp,dstreg
 	}
 
 	// double-to-single
 	else if (inst.size() == 4 && sizep.size() == SIZE_QWORD)
 	{
 		if (srcp.is_memory())
-			emit_cvtsd2ss_r128_m64(dst, dstreg, MABS(srcp.memory()));                   // cvtsd2ss dstreg,[srcp]
+			a.cvtsd2ss(dstreg, MABS(srcp.memory()));                                    // cvtsd2ss dstreg,[srcp]
 		else if (srcp.is_float_register())
-			emit_cvtsd2ss_r128_r128(dst, dstreg, srcp.freg());                          // cvtsd2ss dstreg,srcp
-		emit_movss_p32_r128(dst, dstp, dstreg);                                         // movss    dstp,dstreg
+			a.cvtsd2ss(dstreg, Xmm(srcp.freg()));                                       // cvtsd2ss dstreg,srcp
+		movss_p32_r128(a, dstp, dstreg);                                                // movss    dstp,dstreg
 	}
 }
 
@@ -6355,7 +4312,7 @@
 //  op_frnds - process a FRNDS opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_frnds(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_frnds(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 8);
@@ -6367,15 +4324,15 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0);
+	Xmm dstreg = dstp.select_register(xmm0);
 
 	// 64-bit form
 	if (srcp.is_memory())
-		emit_cvtsd2ss_r128_m64(dst, dstreg, MABS(srcp.memory()));                       // cvtsd2ss dstreg,[srcp]
+		a.cvtsd2ss(dstreg, MABS(srcp.memory(), 8));                                     // cvtsd2ss dstreg,[srcp]
 	else if (srcp.is_float_register())
-		emit_cvtsd2ss_r128_r128(dst, dstreg, srcp.freg());                              // cvtsd2ss dstreg,srcp
-	emit_cvtss2sd_r128_r128(dst, dstreg, dstreg);                                       // cvtss2sd dstreg,dstreg
-	emit_movsd_p64_r128(dst, dstp, dstreg);                                             // movsd    dstp,dstreg
+		a.cvtsd2ss(dstreg, Xmm(srcp.freg()));                                           // cvtsd2ss dstreg,srcp
+	a.cvtss2sd(dstreg, dstreg);                                                         // cvtss2sd dstreg,dstreg
+	movsd_p64_r128(a, dstp, dstreg);                                                    // movsd    dstp,dstreg
 }
 
 
@@ -6383,7 +4340,7 @@
 //  op_fadd - process a FADD opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fadd(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fadd(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6397,28 +4354,28 @@
 	normalize_commutative(src1p, src2p);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0, src2p);
+	Xmm dstreg = dstp.select_register(xmm0, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_movss_r128_p32(dst, dstreg, src1p);                                        // movss dstreg,src1p
+		movss_r128_p32(a, dstreg, src1p);                                               // movss dstreg,src1p
 		if (src2p.is_memory())
-			emit_addss_r128_m32(dst, dstreg, MABS(src2p.memory()));                     // addss dstreg,[src2p]
+			a.addss(dstreg, MABS(src2p.memory()));                                      // addss dstreg,[src2p]
 		else if (src2p.is_float_register())
-			emit_addss_r128_r128(dst, dstreg, src2p.freg());                            // addss dstreg,src2p
-		emit_movss_p32_r128(dst, dstp, dstreg);                                         // movss dstp,dstreg
+			a.addss(dstreg, Xmm(src2p.freg()));                                         // addss dstreg,src2p
+		movss_p32_r128(a, dstp, dstreg);                                                // movss dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_movsd_r128_p64(dst, dstreg, src1p);                                        // movsd dstreg,src1p
+		movsd_r128_p64(a, dstreg, src1p);                                               // movsd dstreg,src1p
 		if (src2p.is_memory())
-			emit_addsd_r128_m64(dst, dstreg, MABS(src2p.memory()));                     // addsd dstreg,[src2p]
+			a.addsd(dstreg, MABS(src2p.memory()));                                      // addsd dstreg,[src2p]
 		else if (src2p.is_float_register())
-			emit_addsd_r128_r128(dst, dstreg, src2p.freg());                            // addsd dstreg,src2p
-		emit_movsd_p64_r128(dst, dstp, dstreg);                                         // movsd dstp,dstreg
+			a.addsd(dstreg, Xmm(src2p.freg()));                                         // addsd dstreg,src2p
+		movsd_p64_r128(a, dstp, dstreg);                                                // movsd dstp,dstreg
 	}
 }
 
@@ -6427,7 +4384,7 @@
 //  op_fsub - process a FSUB opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fsub(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fsub(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6440,28 +4397,28 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MF);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0, src2p);
+	Xmm dstreg = dstp.select_register(xmm0, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_movss_r128_p32(dst, dstreg, src1p);                                        // movss dstreg,src1p
+		movss_r128_p32(a, dstreg, src1p);                                               // movss dstreg,src1p
 		if (src2p.is_memory())
-			emit_subss_r128_m32(dst, dstreg, MABS(src2p.memory()));                     // subss dstreg,[src2p]
+			a.subss(dstreg, MABS(src2p.memory()));                                      // subss dstreg,[src2p]
 		else if (src2p.is_float_register())
-			emit_subss_r128_r128(dst, dstreg, src2p.freg());                            // subss dstreg,src2p
-		emit_movss_p32_r128(dst, dstp, dstreg);                                         // movss dstp,dstreg
+			a.subss(dstreg, Xmm(src2p.freg()));                                         // subss dstreg,src2p
+		movss_p32_r128(a, dstp, dstreg);                                                // movss dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_movsd_r128_p64(dst, dstreg, src1p);                                        // movsd dstreg,src1p
+		movsd_r128_p64(a, dstreg, src1p);                                               // movsd dstreg,src1p
 		if (src2p.is_memory())
-			emit_subsd_r128_m64(dst, dstreg, MABS(src2p.memory()));                     // subsd dstreg,[src2p]
+			a.subsd(dstreg, MABS(src2p.memory()));                                      // subsd dstreg,[src2p]
 		else if (src2p.is_float_register())
-			emit_subsd_r128_r128(dst, dstreg, src2p.freg());                            // subsd dstreg,src2p
-		emit_movsd_p64_r128(dst, dstp, dstreg);                                         // movsd dstp,dstreg
+			a.subsd(dstreg, Xmm(src2p.freg()));                                         // subsd dstreg,src2p
+		movsd_p64_r128(a, dstp, dstreg);                                                // movsd dstp,dstreg
 	}
 }
 
@@ -6470,7 +4427,7 @@
 //  op_fcmp - process a FCMP opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fcmp(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fcmp(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6482,26 +4439,26 @@
 	be_parameter src2p(*this, inst.param(1), PTYPE_MF);
 
 	// pick a target register for the general case
-	int src1reg = src1p.select_register(REG_XMM0);
+	Xmm src1reg = src1p.select_register(xmm0);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_movss_r128_p32(dst, src1reg, src1p);                                       // movss src1reg,src1p
+		movss_r128_p32(a, src1reg, src1p);                                              // movss src1reg,src1p
 		if (src2p.is_memory())
-			emit_comiss_r128_m32(dst, src1reg, MABS(src2p.memory()));                   // comiss src1reg,[src2p]
+			a.comiss(src1reg, MABS(src2p.memory()));                                    // comiss src1reg,[src2p]
 		else if (src2p.is_float_register())
-			emit_comiss_r128_r128(dst, src1reg, src2p.freg());                          // comiss src1reg,src2p
+			a.comiss(src1reg, Xmm(src2p.freg()));                                       // comiss src1reg,src2p
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_movsd_r128_p64(dst, src1reg, src1p);                                       // movsd src1reg,src1p
+		movsd_r128_p64(a, src1reg, src1p);                                              // movsd src1reg,src1p
 		if (src2p.is_memory())
-			emit_comisd_r128_m64(dst, src1reg, MABS(src2p.memory()));                   // comisd src1reg,[src2p]
+			a.comisd(src1reg, MABS(src2p.memory()));                                    // comisd src1reg,[src2p]
 		else if (src2p.is_float_register())
-			emit_comisd_r128_r128(dst, src1reg, src2p.freg());                          // comisd src1reg,src2p
+			a.comisd(src1reg, Xmm(src2p.freg()));                                       // comisd src1reg,src2p
 	}
 }
 
@@ -6510,7 +4467,7 @@
 //  op_fmul - process a FMUL opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fmul(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fmul(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6524,28 +4481,28 @@
 	normalize_commutative(src1p, src2p);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0, src2p);
+	Xmm dstreg = dstp.select_register(xmm0, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_movss_r128_p32(dst, dstreg, src1p);                                        // movss dstreg,src1p
+		movss_r128_p32(a, dstreg, src1p);                                               // movss dstreg,src1p
 		if (src2p.is_memory())
-			emit_mulss_r128_m32(dst, dstreg, MABS(src2p.memory()));                     // mulss dstreg,[src2p]
+			a.mulss(dstreg, MABS(src2p.memory()));                                      // mulss dstreg,[src2p]
 		else if (src2p.is_float_register())
-			emit_mulss_r128_r128(dst, dstreg, src2p.freg());                            // mulss dstreg,src2p
-		emit_movss_p32_r128(dst, dstp, dstreg);                                         // movss dstp,dstreg
+			a.mulss(dstreg, Xmm(src2p.freg()));                                         // mulss dstreg,src2p
+		movss_p32_r128(a, dstp, dstreg);                                                // movss dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_movsd_r128_p64(dst, dstreg, src1p);                                        // movsd dstreg,src1p
+		movsd_r128_p64(a, dstreg, src1p);                                               // movsd dstreg,src1p
 		if (src2p.is_memory())
-			emit_mulsd_r128_m64(dst, dstreg, MABS(src2p.memory()));                     // mulsd dstreg,[src2p]
+			a.mulsd(dstreg, MABS(src2p.memory()));                                      // mulsd dstreg,[src2p]
 		else if (src2p.is_float_register())
-			emit_mulsd_r128_r128(dst, dstreg, src2p.freg());                            // mulsd dstreg,src2p
-		emit_movsd_p64_r128(dst, dstp, dstreg);                                         // movsd dstp,dstreg
+			a.mulsd(dstreg, Xmm(src2p.freg()));                                         // mulsd dstreg,src2p
+		movsd_p64_r128(a, dstp, dstreg);                                                // movsd dstp,dstreg
 	}
 }
 
@@ -6554,7 +4511,7 @@
 //  op_fdiv - process a FDIV opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fdiv(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fdiv(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6567,28 +4524,28 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MF);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0, src2p);
+	Xmm dstreg = dstp.select_register(xmm0, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_movss_r128_p32(dst, dstreg, src1p);                                        // movss dstreg,src1p
+		movss_r128_p32(a, dstreg, src1p);                                               // movss dstreg,src1p
 		if (src2p.is_memory())
-			emit_divss_r128_m32(dst, dstreg, MABS(src2p.memory()));                     // divss dstreg,[src2p]
+			a.divss(dstreg, MABS(src2p.memory()));                                      // divss dstreg,[src2p]
 		else if (src2p.is_float_register())
-			emit_divss_r128_r128(dst, dstreg, src2p.freg());                            // divss dstreg,src2p
-		emit_movss_p32_r128(dst, dstp, dstreg);                                         // movss dstp,dstreg
+			a.divss(dstreg, Xmm(src2p.freg()));                                         // divss dstreg,src2p
+		movss_p32_r128(a, dstp, dstreg);                                                // movss dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_movsd_r128_p64(dst, dstreg, src1p);                                        // movsd dstreg,src1p
+		movsd_r128_p64(a, dstreg, src1p);                                               // movsd dstreg,src1p
 		if (src2p.is_memory())
-			emit_divsd_r128_m64(dst, dstreg, MABS(src2p.memory()));                     // divsd dstreg,[src2p]
+			a.divsd(dstreg, MABS(src2p.memory()));                                      // divsd dstreg,[src2p]
 		else if (src2p.is_float_register())
-			emit_divsd_r128_r128(dst, dstreg, src2p.freg());                            // divsd dstreg,src2p
-		emit_movsd_p64_r128(dst, dstp, dstreg);                                         // movsd dstp,dstreg
+			a.divsd(dstreg, Xmm(src2p.freg()));                                         // divsd dstreg,src2p
+		movsd_p64_r128(a, dstp, dstreg);                                                // movsd dstp,dstreg
 	}
 }
 
@@ -6597,7 +4554,7 @@
 //  op_fneg - process a FNEG opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fneg(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fneg(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6609,28 +4566,28 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0, srcp);
+	Xmm dstreg = dstp.select_register(xmm0, srcp);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_xorps_r128_r128(dst, dstreg, dstreg);                                      // xorps dstreg,dstreg
+		a.xorps(dstreg, dstreg);                                                        // xorps dstreg,dstreg
 		if (srcp.is_memory())
-			emit_subss_r128_m32(dst, dstreg, MABS(srcp.memory()));                      // subss dstreg,[srcp]
+			a.subss(dstreg, MABS(srcp.memory()));                                       // subss dstreg,[srcp]
 		else if (srcp.is_float_register())
-			emit_subss_r128_r128(dst, dstreg, srcp.freg());                             // subss dstreg,srcp
-		emit_movss_p32_r128(dst, dstp, dstreg);                                         // movss dstp,dstreg
+			a.subss(dstreg, Xmm(srcp.freg()));                                          // subss dstreg,srcp
+		movss_p32_r128(a, dstp, dstreg);                                                // movss dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_xorpd_r128_r128(dst, dstreg, dstreg);                                      // xorpd dstreg,dstreg
+		a.xorpd(dstreg, dstreg);                                                        // xorpd dstreg,dstreg
 		if (srcp.is_memory())
-			emit_subsd_r128_m64(dst, dstreg, MABS(srcp.memory()));                      // subsd dstreg,[srcp]
+			a.subsd(dstreg, MABS(srcp.memory()));                                       // subsd dstreg,[srcp]
 		else if (srcp.is_float_register())
-			emit_subsd_r128_r128(dst, dstreg, srcp.freg());                             // subsd dstreg,srcp
-		emit_movsd_p64_r128(dst, dstp, dstreg);                                         // movsd dstp,dstreg
+			a.subsd(dstreg, Xmm(srcp.freg()));                                          // subsd dstreg,srcp
+		movsd_p64_r128(a, dstp, dstreg);                                                // movsd dstp,dstreg
 	}
 }
 
@@ -6639,7 +4596,7 @@
 //  op_fabs - process a FABS opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fabs(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fabs(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6651,22 +4608,22 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0, srcp);
+	Xmm dstreg = dstp.select_register(xmm0, srcp);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_movss_r128_p32(dst, dstreg, srcp);                                         // movss dstreg,srcp
-		emit_andps_r128_m128(dst, dstreg, MABS(m_absmask32));                           // andps dstreg,[absmask32]
-		emit_movss_p32_r128(dst, dstp, dstreg);                                         // movss dstp,dstreg
+		movss_r128_p32(a, dstreg, srcp);                                                // movss dstreg,srcp
+		a.andps(dstreg, MABS(m_absmask32));                                             // andps dstreg,[absmask32]
+		movss_p32_r128(a, dstp, dstreg);                                                // movss dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_movsd_r128_p64(dst, dstreg, srcp);                                         // movsd dstreg,srcp
-		emit_andpd_r128_m128(dst, dstreg, MABS(m_absmask64));                           // andpd dstreg,[absmask64]
-		emit_movsd_p64_r128(dst, dstp, dstreg);                                         // movsd dstp,dstreg
+		movsd_r128_p64(a, dstreg, srcp);                                                // movsd dstreg,srcp
+		a.andpd(dstreg, MABS(m_absmask64));                                             // andpd dstreg,[absmask64]
+		movsd_p64_r128(a, dstp, dstreg);                                                // movsd dstp,dstreg
 	}
 }
 
@@ -6675,7 +4632,7 @@
 //  op_fsqrt - process a FSQRT opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fsqrt(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fsqrt(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6687,26 +4644,26 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0);
+	Xmm dstreg = dstp.select_register(xmm0);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		if (srcp.is_memory())
-			emit_sqrtss_r128_m32(dst, dstreg, MABS(srcp.memory()));                     // sqrtss dstreg,[srcp]
+			a.sqrtss(dstreg, MABS(srcp.memory()));                                      // sqrtss dstreg,[srcp]
 		else if (srcp.is_float_register())
-			emit_sqrtss_r128_r128(dst, dstreg, srcp.freg());                            // sqrtss dstreg,srcp
-		emit_movss_p32_r128(dst, dstp, dstreg);                                         // movss dstp,dstreg
+			a.sqrtss(dstreg, Xmm(srcp.freg()));                                         // sqrtss dstreg,srcp
+		movss_p32_r128(a, dstp, dstreg);                                                // movss dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
 		if (srcp.is_memory())
-			emit_sqrtsd_r128_m64(dst, dstreg, MABS(srcp.memory()));                     // sqrtsd dstreg,[srcp]
+			a.sqrtsd(dstreg, MABS(srcp.memory()));                                      // sqrtsd dstreg,[srcp]
 		else if (srcp.is_float_register())
-			emit_sqrtsd_r128_r128(dst, dstreg, srcp.freg());                            // sqrtsd dstreg,srcp
-		emit_movsd_p64_r128(dst, dstp, dstreg);                                         // movsd dstp,dstreg
+			a.sqrtsd(dstreg, Xmm(srcp.freg()));                                         // sqrtsd dstreg,srcp
+		movsd_p64_r128(a, dstp, dstreg);                                                // movsd dstp,dstreg
 	}
 }
 
@@ -6715,7 +4672,7 @@
 //  op_frecip - process a FRECIP opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_frecip(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_frecip(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6727,7 +4684,7 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0);
+	Xmm dstreg = dstp.select_register(xmm0);
 
 	// 32-bit form
 	if (inst.size() == 4)
@@ -6735,19 +4692,19 @@
 		if (USE_RCPSS_FOR_SINGLES)
 		{
 			if (srcp.is_memory())
-				emit_rcpss_r128_m32(dst, dstreg, MABS(srcp.memory()));                  // rcpss dstreg,[srcp]
+				a.rcpss(dstreg, MABS(srcp.memory()));                                   // rcpss dstreg,[srcp]
 			else if (srcp.is_float_register())
-				emit_rcpss_r128_r128(dst, dstreg, srcp.freg());                         // rcpss dstreg,srcp
-			emit_movss_p32_r128(dst, dstp, dstreg);                                     // movss dstp,dstreg
+				a.rcpss(dstreg, Xmm(srcp.freg()));                                      // rcpss dstreg,srcp
+			movss_p32_r128(a, dstp, dstreg);                                            // movss dstp,dstreg
 		}
 		else
 		{
-			emit_movss_r128_m32(dst, REG_XMM1, MABS(&m_near.single1));                  // movss xmm1,1.0
+			a.movss(xmm1, MABS(&m_near.single1));                                       // movss xmm1,1.0
 			if (srcp.is_memory())
-				emit_divss_r128_m32(dst, REG_XMM1, MABS(srcp.memory()));                // divss xmm1,[srcp]
+				a.divss(xmm1, MABS(srcp.memory()));                                     // divss xmm1,[srcp]
 			else if (srcp.is_float_register())
-				emit_divss_r128_r128(dst, REG_XMM1, srcp.freg());                       // divss xmm1,srcp
-			emit_movss_p32_r128(dst, dstp, REG_XMM1);                                   // movss dstp,xmm1
+				a.divss(xmm1, Xmm(srcp.freg()));                                        // divss xmm1,srcp
+			movss_p32_r128(a, dstp, xmm1);                                              // movss dstp,xmm1
 		}
 	}
 
@@ -6757,21 +4714,21 @@
 		if (USE_RCPSS_FOR_DOUBLES)
 		{
 			if (srcp.is_memory())
-				emit_cvtsd2ss_r128_m64(dst, dstreg, MABS(srcp.memory()));               // cvtsd2ss dstreg,[srcp]
+				a.cvtsd2ss(dstreg, MABS(srcp.memory()));                                // cvtsd2ss dstreg,[srcp]
 			else if (srcp.is_float_register())
-				emit_cvtsd2ss_r128_r128(dst, dstreg, srcp.freg());                      // cvtsd2ss dstreg,srcp
-			emit_rcpss_r128_r128(dst, dstreg, dstreg);                                  // rcpss dstreg,dstreg
-			emit_cvtss2sd_r128_r128(dst, dstreg, dstreg);                               // cvtss2sd dstreg,dstreg
-			emit_movsd_p64_r128(dst, dstp, REG_XMM1);                                   // movsd dstp,dstreg
+				a.cvtsd2ss(dstreg, Xmm(srcp.freg()));                                   // cvtsd2ss dstreg,srcp
+			a.rcpss(dstreg, dstreg);                                                    // rcpss dstreg,dstreg
+			a.cvtss2sd(dstreg, dstreg);                                                 // cvtss2sd dstreg,dstreg
+			movsd_p64_r128(a, dstp, dstreg);                                            // movsd dstp,dstreg
 		}
 		else
 		{
-			emit_movsd_r128_m64(dst, REG_XMM1, MABS(&m_near.double1));                  // movsd xmm1,1.0
+			a.movsd(xmm1, MABS(&m_near.double1));                                       // movsd xmm1,1.0
 			if (srcp.is_memory())
-				emit_divsd_r128_m64(dst, REG_XMM1, MABS(srcp.memory()));                // divsd xmm1,[srcp]
+				a.divsd(xmm1, MABS(srcp.memory()));                                     // divsd xmm1,[srcp]
 			else if (srcp.is_float_register())
-				emit_divsd_r128_r128(dst, REG_XMM1, srcp.freg());                       // divsd xmm1,srcp
-			emit_movsd_p64_r128(dst, dstp, REG_XMM1);                                   // movsd dstp,xmm1
+				a.divsd(xmm1, Xmm(srcp.freg()));                                        // divsd xmm1,srcp
+			movsd_p64_r128(a, dstp, xmm1);                                              // movsd dstp,xmm1
 		}
 	}
 }
@@ -6781,7 +4738,7 @@
 //  op_frsqrt - process a FRSQRT opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_frsqrt(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_frsqrt(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6793,7 +4750,7 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0);
+	Xmm dstreg = dstp.select_register(xmm0);
 
 	// 32-bit form
 	if (inst.size() == 4)
@@ -6801,20 +4758,20 @@
 		if (USE_RSQRTSS_FOR_SINGLES)
 		{
 			if (srcp.is_memory())
-				emit_rsqrtss_r128_m32(dst, dstreg, MABS(srcp.memory()));                // rsqrtss dstreg,[srcp]
+				a.rsqrtss(dstreg, MABS(srcp.memory()));                                 // rsqrtss dstreg,[srcp]
 			else if (srcp.is_float_register())
-				emit_rsqrtss_r128_r128(dst, dstreg, srcp.freg());                       // rsqrtss dstreg,srcp
+				a.rsqrtss(dstreg, Xmm(srcp.freg()));                                    // rsqrtss dstreg,srcp
 		}
 		else
 		{
 			if (srcp.is_memory())
-				emit_sqrtss_r128_m32(dst, REG_XMM1, MABS(srcp.memory()));               // sqrtss xmm1,[srcp]
+				a.sqrtss(xmm1, MABS(srcp.memory()));                                    // sqrtss xmm1,[srcp]
 			else if (srcp.is_float_register())
-				emit_sqrtss_r128_r128(dst, REG_XMM1, srcp.freg());                      // sqrtss xmm1,srcp
-			emit_movss_r128_m32(dst, dstreg, MABS(&m_near.single1));                    // movss dstreg,1.0
-			emit_divss_r128_r128(dst, dstreg, REG_XMM1);                                // divss dstreg,xmm1
+				a.sqrtss(xmm1, Xmm(srcp.freg()));                                       // sqrtss xmm1,srcp
+			a.movss(dstreg, MABS(&m_near.single1));                                     // movss dstreg,1.0
+			a.divss(dstreg, xmm1);                                                      // divss dstreg,xmm1
 		}
-		emit_movss_p32_r128(dst, dstp, dstreg);                                         // movss dstp,dstreg
+		movss_p32_r128(a, dstp, dstreg);                                                // movss dstp,dstreg
 	}
 
 	// 64-bit form
@@ -6823,22 +4780,22 @@
 		if (USE_RSQRTSS_FOR_DOUBLES)
 		{
 			if (srcp.is_memory())
-				emit_cvtsd2ss_r128_m64(dst, dstreg, MABS(srcp.memory()));               // cvtsd2ss dstreg,[srcp]
+				a.cvtsd2ss(dstreg, MABS(srcp.memory()));                                // cvtsd2ss dstreg,[srcp]
 			else if (srcp.is_float_register())
-				emit_cvtsd2ss_r128_r128(dst, dstreg, srcp.freg());                      // cvtsd2ss dstreg,srcp
-			emit_rsqrtss_r128_r128(dst, dstreg, dstreg);                                // rsqrtss dstreg,dstreg
-			emit_cvtss2sd_r128_r128(dst, dstreg, dstreg);                               // cvtss2sd dstreg,dstreg
+				a.cvtsd2ss(dstreg, Xmm(srcp.freg()));                                   // cvtsd2ss dstreg,srcp
+			a.rsqrtss(dstreg, dstreg);                                                  // rsqrtss dstreg,dstreg
+			a.cvtss2sd(dstreg, dstreg);                                                 // cvtss2sd dstreg,dstreg
 		}
 		else
 		{
 			if (srcp.is_memory())
-				emit_sqrtsd_r128_m64(dst, REG_XMM1, MABS(srcp.memory()));               // sqrtsd xmm1,[srcp]
+				a.sqrtsd(xmm1, MABS(srcp.memory()));                                    // sqrtsd xmm1,[srcp]
 			else if (srcp.is_float_register())
-				emit_sqrtsd_r128_r128(dst, REG_XMM1, srcp.freg());                      // sqrtsd xmm1,srcp
-			emit_movsd_r128_m64(dst, dstreg, MABS(&m_near.double1));                    // movsd dstreg,1.0
-			emit_divsd_r128_r128(dst, dstreg, REG_XMM1);                                // divsd dstreg,xmm1
+				a.sqrtsd(xmm1, Xmm(srcp.freg()));                                       // sqrtsd xmm1,srcp
+			a.movsd(dstreg, MABS(&m_near.double1));                                     // movsd dstreg,1.0
+			a.divsd(dstreg, xmm1);                                                      // divsd dstreg,xmm1
 		}
-		emit_movsd_p64_r128(dst, dstp, dstreg);                                         // movsd dstp,dstreg
+		movsd_p64_r128(a, dstp, dstreg);                                                // movsd dstp,dstreg
 	}
 }
 
@@ -6847,7 +4804,7 @@
 //  op_fcopyi - process a FCOPYI opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_fcopyi(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_fcopyi(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6859,26 +4816,26 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MR);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_XMM0);
+	Xmm dstreg = dstp.select_register(xmm0);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		if (srcp.is_memory())
 		{
-			emit_movd_r128_m32(dst, dstreg, MABS(srcp.memory()));                       // movd     dstreg,[srcp]
-			emit_movss_p32_r128(dst, dstp, dstreg);                                     // movss    dstp,dstreg
+			a.movd(dstreg, MABS(srcp.memory()));                                        // movd     dstreg,[srcp]
+			movss_p32_r128(a, dstp, dstreg);                                            // movss    dstp,dstreg
 		}
 		else
 		{
 			if (dstp.is_memory())
 			{
-				emit_mov_p32_r32(dst, dstp, srcp.ireg());                               // mov      dstp,srcp
+				mov_param_reg(a, dstp, Gpd(srcp.ireg()));                               // mov      dstp,srcp
 			}
 			else
 			{
-				emit_movd_r128_r32(dst, dstreg, srcp.ireg());                           // movd     dstreg,srcp
-				emit_movss_p32_r128(dst, dstp, dstreg);                                 // movss    dstp,dstreg
+				a.movd(dstreg, Gpd(srcp.ireg()));                                       // movd     dstreg,srcp
+				movss_p32_r128(a, dstp, dstreg);                                        // movss    dstp,dstreg
 			}
 		}
 
@@ -6889,19 +4846,19 @@
 	{
 		if (srcp.is_memory())
 		{
-			emit_movq_r128_m64(dst, dstreg, MABS(srcp.memory()));                       // movq     dstreg,[srcp]
-			emit_movsd_p64_r128(dst, dstp, dstreg);                                     // movsd    dstp,dstreg
+			a.movq(dstreg, MABS(srcp.memory()));                                        // movq     dstreg,[srcp]
+			movsd_p64_r128(a, dstp, dstreg);                                            // movsd    dstp,dstreg
 		}
 		else
 		{
 			if (dstp.is_memory())
 			{
-				emit_mov_p64_r64(dst, dstp, srcp.ireg());                               // mov      dstp,srcp
+				mov_param_reg(a, dstp, Gpq(srcp.ireg()));                               // mov      dstp,srcp
 			}
 			else
 			{
-				emit_movq_r128_r64(dst, dstreg, srcp.ireg());                           // movq     dstreg,srcp
-				emit_movsd_p64_r128(dst, dstp, dstreg);                                 // movsd    dstp,dstreg
+				a.movq(dstreg, Gpq(srcp.ireg()));                                       // movq     dstreg,srcp
+				movsd_p64_r128(a, dstp, dstreg);                                        // movsd    dstp,dstreg
 			}
 		}
 
@@ -6913,7 +4870,7 @@
 //  op_icopyf - process a ICOPYF opcode
 //-------------------------------------------------
 
-void drcbe_x64::op_icopyf(x86code *&dst, const instruction &inst)
+void drcbe_x64::op_icopyf(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6929,19 +4886,19 @@
 	{
 		if (srcp.is_memory())
 		{
-			int dstreg = dstp.select_register(REG_EAX);
-			emit_mov_r32_m32(dst, dstreg, MABS(srcp.memory()));                         // mov      dstreg,[srcp]
-			emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov      dstp,dstreg
+			Gp dstreg = dstp.select_register(eax);
+			a.mov(dstreg, MABS(srcp.memory()));                                         // mov      dstreg,[srcp]
+			mov_param_reg(a, dstp, dstreg);                                             // mov      dstp,dstreg
 		}
 		else
 		{
 			if (dstp.is_memory())
 			{
-				emit_movd_m32_r128(dst, MABS(dstp.memory()), srcp.freg());              // movd     dstp,srcp
+				a.movd(MABS(dstp.memory()), Xmm(srcp.freg()));                          // movd     dstp,srcp
 			}
 			else
 			{
-				emit_movd_r32_r128(dst, dstp.ireg(), srcp.freg());                      // movd     dstp,srcp
+				a.movd(Gpd(dstp.ireg()), Xmm(srcp.freg()));                             // movd     dstp,srcp
 			}
 		}
 	}
@@ -6951,19 +4908,19 @@
 	{
 		if (srcp.is_memory())
 		{
-			int dstreg = dstp.select_register(REG_RAX);
-			emit_mov_r64_m64(dst, dstreg, MABS(srcp.memory()));                         // mov      dstreg,[srcp]
-			emit_mov_p64_r64(dst, dstp, dstreg);                                        // mov      dstp,dstreg
+			Gp dstreg = dstp.select_register(rax);
+			a.mov(dstreg, MABS(srcp.memory()));                                         // mov      dstreg,[srcp]
+			mov_param_reg(a, dstp, dstreg);                                             // mov      dstp,dstreg
 		}
 		else
 		{
 			if (dstp.is_memory())
 			{
-				emit_movq_m64_r128(dst, MABS(dstp.memory()), srcp.freg());              // movq     dstp,srcp
+				a.movq(MABS(dstp.memory()), Xmm(srcp.freg()));                          // movq     dstp,srcp
 			}
 			else
 			{
-				emit_movq_r64_r128(dst, dstp.ireg(), srcp.freg());                      // movq     dstp,srcp
+				a.movq(Gpq(dstp.ireg()), Xmm(srcp.freg()));                             // movq     dstp,srcp
 			}
 		}
 	}
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/drcbex64.h mame-0.224+dfsg.1/src/devices/cpu/drcbex64.h
--- mame-0.222+dfsg.1/src/devices/cpu/drcbex64.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/drcbex64.h	2020-08-26 08:57:19.000000000 +0000
@@ -17,9 +17,10 @@
 #include "drcbeut.h"
 #include "x86log.h"
 
-#define X86EMIT_SIZE 64
-#include "x86emit.h"
+#include "asmjit/src/asmjit/asmjit.h"
 
+using namespace asmjit;
+using namespace asmjit::x86;
 
 namespace drc {
 //**************************************************************************
@@ -48,6 +49,9 @@
 	class be_parameter
 	{
 	public:
+		// HACK: leftover from x86emit
+		static int const REG_MAX = 16;
+
 		// parameter types
 		enum be_parameter_type
 		{
@@ -65,43 +69,41 @@
 
 		// construction
 		be_parameter() : m_type(PTYPE_NONE), m_value(0) { }
-		be_parameter(const be_parameter &param) : m_type(param.m_type), m_value(param.m_value) { }
+		be_parameter(be_parameter const &param) : m_type(param.m_type), m_value(param.m_value) { }
 		be_parameter(uint64_t val) : m_type(PTYPE_IMMEDIATE), m_value(val) { }
 		be_parameter(drcbe_x64 &drcbe, const uml::parameter &param, uint32_t allowed);
 
 		// creators for types that don't safely default
-		static inline be_parameter make_ireg(int regnum) { assert(regnum >= 0 && regnum < x64emit::REG_MAX); return be_parameter(PTYPE_INT_REGISTER, regnum); }
-		static inline be_parameter make_freg(int regnum) { assert(regnum >= 0 && regnum < x64emit::REG_MAX); return be_parameter(PTYPE_FLOAT_REGISTER, regnum); }
-		static inline be_parameter make_vreg(int regnum) { assert(regnum >= 0 && regnum < x64emit::REG_MAX); return be_parameter(PTYPE_VECTOR_REGISTER, regnum); }
+		static inline be_parameter make_ireg(int regnum) { assert(regnum >= 0 && regnum < REG_MAX); return be_parameter(PTYPE_INT_REGISTER, regnum); }
+		static inline be_parameter make_freg(int regnum) { assert(regnum >= 0 && regnum < REG_MAX); return be_parameter(PTYPE_FLOAT_REGISTER, regnum); }
 		static inline be_parameter make_memory(void *base) { return be_parameter(PTYPE_MEMORY, reinterpret_cast<be_parameter_value>(base)); }
 		static inline be_parameter make_memory(const void *base) { return be_parameter(PTYPE_MEMORY, reinterpret_cast<be_parameter_value>(const_cast<void *>(base))); }
 
 		// operators
-		bool operator==(const be_parameter &rhs) const { return (m_type == rhs.m_type && m_value == rhs.m_value); }
-		bool operator!=(const be_parameter &rhs) const { return (m_type != rhs.m_type || m_value != rhs.m_value); }
+		bool operator==(be_parameter const &rhs) const { return (m_type == rhs.m_type && m_value == rhs.m_value); }
+		bool operator!=(be_parameter const &rhs) const { return (m_type != rhs.m_type || m_value != rhs.m_value); }
 
 		// getters
 		be_parameter_type type() const { return m_type; }
 		uint64_t immediate() const { assert(m_type == PTYPE_IMMEDIATE); return m_value; }
-		int ireg() const { assert(m_type == PTYPE_INT_REGISTER); assert(m_value < x64emit::REG_MAX); return m_value; }
-		int freg() const { assert(m_type == PTYPE_FLOAT_REGISTER); assert(m_value < x64emit::REG_MAX); return m_value; }
-		int vreg() const { assert(m_type == PTYPE_VECTOR_REGISTER); assert(m_value < x64emit::REG_MAX); return m_value; }
+		uint32_t ireg() const { assert(m_type == PTYPE_INT_REGISTER); assert(m_value < REG_MAX); return m_value; }
+		uint32_t freg() const { assert(m_type == PTYPE_FLOAT_REGISTER); assert(m_value < REG_MAX); return m_value; }
 		void *memory() const { assert(m_type == PTYPE_MEMORY); return reinterpret_cast<void *>(m_value); }
 
 		// type queries
 		bool is_immediate() const { return (m_type == PTYPE_IMMEDIATE); }
 		bool is_int_register() const { return (m_type == PTYPE_INT_REGISTER); }
 		bool is_float_register() const { return (m_type == PTYPE_FLOAT_REGISTER); }
-		bool is_vector_register() const { return (m_type == PTYPE_VECTOR_REGISTER); }
 		bool is_memory() const { return (m_type == PTYPE_MEMORY); }
 
 		// other queries
 		bool is_immediate_value(uint64_t value) const { return (m_type == PTYPE_IMMEDIATE && m_value == value); }
 
 		// helpers
-		int select_register(int defreg) const;
-		int select_register(int defreg, const be_parameter &checkparam) const;
-		int select_register(int defreg, const be_parameter &checkparam, const be_parameter &checkparam2) const;
+		Gp select_register(Gp defreg) const;
+		Xmm select_register(Xmm defreg) const;
+		template <typename T> T select_register(T defreg, be_parameter const &checkparam) const;
+		template <typename T> T select_register(T defreg, be_parameter const &checkparam, be_parameter const &checkparam2) const;
 
 	private:
 		// private constructor
@@ -113,192 +115,122 @@
 	};
 
 	// helpers
-	x86_memref MABS(const void *ptr);
+	Mem MABS(const void *ptr, const uint32_t size = 0) const { return Mem(rbp, offset_from_rbp(ptr), size); }
 	bool short_immediate(int64_t immediate) const { return (int32_t)immediate == immediate; }
 	void normalize_commutative(be_parameter &inner, be_parameter &outer);
-	int32_t offset_from_rbp(const void *ptr);
-	int get_base_register_and_offset(x86code *&dst, void *target, uint8_t reg, int32_t &offset);
-	void emit_smart_call_r64(x86code *&dst, x86code *target, uint8_t reg);
-	void emit_smart_call_m64(x86code *&dst, x86code **target);
-
-	void fixup_label(void *parameter, drccodeptr labelcodeptr);
-	void fixup_exception(drccodeptr *codeptr, void *param1, void *param2);
+	int32_t offset_from_rbp(const void *ptr) const;
+	Gp get_base_register_and_offset(Assembler &a, void *target, Gp const &reg, int32_t &offset);
+	void smart_call_r64(Assembler &a, x86code *target, Gp const &reg);
+	void smart_call_m64(Assembler &a, x86code **target);
 
 	static void debug_log_hashjmp(offs_t pc, int mode);
 	static void debug_log_hashjmp_fail();
 
 	// code generators
-	void op_handle(x86code *&dst, const uml::instruction &inst);
-	void op_hash(x86code *&dst, const uml::instruction &inst);
-	void op_label(x86code *&dst, const uml::instruction &inst);
-	void op_comment(x86code *&dst, const uml::instruction &inst);
-	void op_mapvar(x86code *&dst, const uml::instruction &inst);
-
-	void op_nop(x86code *&dst, const uml::instruction &inst);
-	void op_debug(x86code *&dst, const uml::instruction &inst);
-	void op_exit(x86code *&dst, const uml::instruction &inst);
-	void op_hashjmp(x86code *&dst, const uml::instruction &inst);
-	void op_jmp(x86code *&dst, const uml::instruction &inst);
-	void op_exh(x86code *&dst, const uml::instruction &inst);
-	void op_callh(x86code *&dst, const uml::instruction &inst);
-	void op_ret(x86code *&dst, const uml::instruction &inst);
-	void op_callc(x86code *&dst, const uml::instruction &inst);
-	void op_recover(x86code *&dst, const uml::instruction &inst);
-
-	void op_setfmod(x86code *&dst, const uml::instruction &inst);
-	void op_getfmod(x86code *&dst, const uml::instruction &inst);
-	void op_getexp(x86code *&dst, const uml::instruction &inst);
-	void op_getflgs(x86code *&dst, const uml::instruction &inst);
-	void op_save(x86code *&dst, const uml::instruction &inst);
-	void op_restore(x86code *&dst, const uml::instruction &inst);
-
-	void op_load(x86code *&dst, const uml::instruction &inst);
-	void op_loads(x86code *&dst, const uml::instruction &inst);
-	void op_store(x86code *&dst, const uml::instruction &inst);
-	void op_read(x86code *&dst, const uml::instruction &inst);
-	void op_readm(x86code *&dst, const uml::instruction &inst);
-	void op_write(x86code *&dst, const uml::instruction &inst);
-	void op_writem(x86code *&dst, const uml::instruction &inst);
-	void op_carry(x86code *&dst, const uml::instruction &inst);
-	void op_set(x86code *&dst, const uml::instruction &inst);
-	void op_mov(x86code *&dst, const uml::instruction &inst);
-	void op_sext(x86code *&dst, const uml::instruction &inst);
-	void op_roland(x86code *&dst, const uml::instruction &inst);
-	void op_rolins(x86code *&dst, const uml::instruction &inst);
-	void op_add(x86code *&dst, const uml::instruction &inst);
-	void op_addc(x86code *&dst, const uml::instruction &inst);
-	void op_sub(x86code *&dst, const uml::instruction &inst);
-	void op_subc(x86code *&dst, const uml::instruction &inst);
-	void op_cmp(x86code *&dst, const uml::instruction &inst);
-	void op_mulu(x86code *&dst, const uml::instruction &inst);
-	void op_muls(x86code *&dst, const uml::instruction &inst);
-	void op_divu(x86code *&dst, const uml::instruction &inst);
-	void op_divs(x86code *&dst, const uml::instruction &inst);
-	void op_and(x86code *&dst, const uml::instruction &inst);
-	void op_test(x86code *&dst, const uml::instruction &inst);
-	void op_or(x86code *&dst, const uml::instruction &inst);
-	void op_xor(x86code *&dst, const uml::instruction &inst);
-	void op_lzcnt(x86code *&dst, const uml::instruction &inst);
-	void op_tzcnt(x86code *&dst, const uml::instruction &inst);
-	void op_bswap(x86code *&dst, const uml::instruction &inst);
-	void op_shl(x86code *&dst, const uml::instruction &inst);
-	void op_shr(x86code *&dst, const uml::instruction &inst);
-	void op_sar(x86code *&dst, const uml::instruction &inst);
-	void op_ror(x86code *&dst, const uml::instruction &inst);
-	void op_rol(x86code *&dst, const uml::instruction &inst);
-	void op_rorc(x86code *&dst, const uml::instruction &inst);
-	void op_rolc(x86code *&dst, const uml::instruction &inst);
-
-	void op_fload(x86code *&dst, const uml::instruction &inst);
-	void op_fstore(x86code *&dst, const uml::instruction &inst);
-	void op_fread(x86code *&dst, const uml::instruction &inst);
-	void op_fwrite(x86code *&dst, const uml::instruction &inst);
-	void op_fmov(x86code *&dst, const uml::instruction &inst);
-	void op_ftoint(x86code *&dst, const uml::instruction &inst);
-	void op_ffrint(x86code *&dst, const uml::instruction &inst);
-	void op_ffrflt(x86code *&dst, const uml::instruction &inst);
-	void op_frnds(x86code *&dst, const uml::instruction &inst);
-	void op_fadd(x86code *&dst, const uml::instruction &inst);
-	void op_fsub(x86code *&dst, const uml::instruction &inst);
-	void op_fcmp(x86code *&dst, const uml::instruction &inst);
-	void op_fmul(x86code *&dst, const uml::instruction &inst);
-	void op_fdiv(x86code *&dst, const uml::instruction &inst);
-	void op_fneg(x86code *&dst, const uml::instruction &inst);
-	void op_fabs(x86code *&dst, const uml::instruction &inst);
-	void op_fsqrt(x86code *&dst, const uml::instruction &inst);
-	void op_frecip(x86code *&dst, const uml::instruction &inst);
-	void op_frsqrt(x86code *&dst, const uml::instruction &inst);
-	void op_fcopyi(x86code *&dst, const uml::instruction &inst);
-	void op_icopyf(x86code *&dst, const uml::instruction &inst);
-
-	// 32-bit code emission helpers
-	void emit_mov_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param);
-	void emit_movsx_r64_p32(x86code *&dst, uint8_t reg, const be_parameter &param);
-	void emit_mov_r32_p32_keepflags(x86code *&dst, uint8_t reg, const be_parameter &param);
-	void emit_mov_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param);
-	void emit_mov_p32_r32(x86code *&dst, const be_parameter &param, uint8_t reg);
-	void emit_add_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_add_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_adc_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_adc_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_sub_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_sub_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_sbb_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_sbb_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_cmp_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_cmp_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_and_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_and_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_test_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_test_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_or_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_or_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_xor_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_xor_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_shl_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_shl_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_shr_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_shr_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_sar_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_sar_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_rol_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_rol_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_ror_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_ror_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcl_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcl_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcr_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcr_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-
-	// 64-bit code emission helpers
-	void emit_mov_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param);
-	void emit_mov_r64_p64_keepflags(x86code *&dst, uint8_t reg, const be_parameter &param);
-	void emit_mov_p64_r64(x86code *&dst, const be_parameter &param, uint8_t reg);
-	void emit_add_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_add_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_adc_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_adc_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_sub_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_sub_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_sbb_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_sbb_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_cmp_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_cmp_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_and_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_and_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_test_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_test_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_or_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_or_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_xor_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_xor_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_shl_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_shl_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_shr_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_shr_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_sar_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_sar_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_rol_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_rol_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_ror_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_ror_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcl_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcl_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcr_r64_p64(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcr_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-
-	// floating-point code emission helpers
-	void emit_movss_r128_p32(x86code *&dst, uint8_t reg, const be_parameter &param);
-	void emit_movss_p32_r128(x86code *&dst, const be_parameter &param, uint8_t reg);
-	void emit_movsd_r128_p64(x86code *&dst, uint8_t reg, const be_parameter &param);
-	void emit_movsd_p64_r128(x86code *&dst, const be_parameter &param, uint8_t reg);
+	void op_handle(Assembler &a, const uml::instruction &inst);
+	void op_hash(Assembler &a, const uml::instruction &inst);
+	void op_label(Assembler &a, const uml::instruction &inst);
+	void op_comment(Assembler &a, const uml::instruction &inst);
+	void op_mapvar(Assembler &a, const uml::instruction &inst);
+
+	void op_nop(Assembler &a, const uml::instruction &inst);
+	void op_debug(Assembler &a, const uml::instruction &inst);
+	void op_exit(Assembler &a, const uml::instruction &inst);
+	void op_hashjmp(Assembler &a, const uml::instruction &inst);
+	void op_jmp(Assembler &a, const uml::instruction &inst);
+	void op_exh(Assembler &a, const uml::instruction &inst);
+	void op_callh(Assembler &a, const uml::instruction &inst);
+	void op_ret(Assembler &a, const uml::instruction &inst);
+	void op_callc(Assembler &a, const uml::instruction &inst);
+	void op_recover(Assembler &a, const uml::instruction &inst);
+
+	void op_setfmod(Assembler &a, const uml::instruction &inst);
+	void op_getfmod(Assembler &a, const uml::instruction &inst);
+	void op_getexp(Assembler &a, const uml::instruction &inst);
+	void op_getflgs(Assembler &a, const uml::instruction &inst);
+	void op_save(Assembler &a, const uml::instruction &inst);
+	void op_restore(Assembler &a, const uml::instruction &inst);
+
+	void op_load(Assembler &a, const uml::instruction &inst);
+	void op_loads(Assembler &a, const uml::instruction &inst);
+	void op_store(Assembler &a, const uml::instruction &inst);
+	void op_read(Assembler &a, const uml::instruction &inst);
+	void op_readm(Assembler &a, const uml::instruction &inst);
+	void op_write(Assembler &a, const uml::instruction &inst);
+	void op_writem(Assembler &a, const uml::instruction &inst);
+	void op_carry(Assembler &a, const uml::instruction &inst);
+	void op_set(Assembler &a, const uml::instruction &inst);
+	void op_mov(Assembler &a, const uml::instruction &inst);
+	void op_sext(Assembler &a, const uml::instruction &inst);
+	void op_roland(Assembler &a, const uml::instruction &inst);
+	void op_rolins(Assembler &a, const uml::instruction &inst);
+	void op_add(Assembler &a, const uml::instruction &inst);
+	void op_addc(Assembler &a, const uml::instruction &inst);
+	void op_sub(Assembler &a, const uml::instruction &inst);
+	void op_subc(Assembler &a, const uml::instruction &inst);
+	void op_cmp(Assembler &a, const uml::instruction &inst);
+	void op_mulu(Assembler &a, const uml::instruction &inst);
+	void op_muls(Assembler &a, const uml::instruction &inst);
+	void op_divu(Assembler &a, const uml::instruction &inst);
+	void op_divs(Assembler &a, const uml::instruction &inst);
+	void op_and(Assembler &a, const uml::instruction &inst);
+	void op_test(Assembler &a, const uml::instruction &inst);
+	void op_or(Assembler &a, const uml::instruction &inst);
+	void op_xor(Assembler &a, const uml::instruction &inst);
+	void op_lzcnt(Assembler &a, const uml::instruction &inst);
+	void op_tzcnt(Assembler &a, const uml::instruction &inst);
+	void op_bswap(Assembler &a, const uml::instruction &inst);
+	template <Inst::Id Opcode> void op_shift(Assembler &a, const uml::instruction &inst);
+
+	void op_fload(Assembler &a, const uml::instruction &inst);
+	void op_fstore(Assembler &a, const uml::instruction &inst);
+	void op_fread(Assembler &a, const uml::instruction &inst);
+	void op_fwrite(Assembler &a, const uml::instruction &inst);
+	void op_fmov(Assembler &a, const uml::instruction &inst);
+	void op_ftoint(Assembler &a, const uml::instruction &inst);
+	void op_ffrint(Assembler &a, const uml::instruction &inst);
+	void op_ffrflt(Assembler &a, const uml::instruction &inst);
+	void op_frnds(Assembler &a, const uml::instruction &inst);
+	void op_fadd(Assembler &a, const uml::instruction &inst);
+	void op_fsub(Assembler &a, const uml::instruction &inst);
+	void op_fcmp(Assembler &a, const uml::instruction &inst);
+	void op_fmul(Assembler &a, const uml::instruction &inst);
+	void op_fdiv(Assembler &a, const uml::instruction &inst);
+	void op_fneg(Assembler &a, const uml::instruction &inst);
+	void op_fabs(Assembler &a, const uml::instruction &inst);
+	void op_fsqrt(Assembler &a, const uml::instruction &inst);
+	void op_frecip(Assembler &a, const uml::instruction &inst);
+	void op_frsqrt(Assembler &a, const uml::instruction &inst);
+	void op_fcopyi(Assembler &a, const uml::instruction &inst);
+	void op_icopyf(Assembler &a, const uml::instruction &inst);
+
+	// alu and shift operation helpers
+	static bool ones(u64 const value, unsigned const size) noexcept { return (size == 4) ? u32(value) == 0xffffffffU : value == 0xffffffff'ffffffffULL; }
+	void alu_op_param(Assembler &a, Inst::Id const opcode, Operand const &dst, be_parameter const &param, std::function<bool(Assembler &a, Operand const &dst, be_parameter const &src)> optimize = [](Assembler &a, Operand dst, be_parameter const &src) { return false; });
+	void shift_op_param(Assembler &a, Inst::Id const opcode, Operand const &dst, be_parameter const &param);
+
+	// parameter helpers
+	void mov_reg_param(Assembler &a, Gp const &reg, be_parameter const &param, bool const keepflags = false);
+	void mov_param_reg(Assembler &a, be_parameter const &param, Gp const &reg);
+	void mov_mem_param(Assembler &a, Mem const &memref, be_parameter const &param);
+
+	// special-case move helpers
+	void movsx_r64_p32(Assembler &a, Gp const &reg, be_parameter const &param);
+	void mov_r64_imm(Assembler &a, Gp const &reg, uint64_t const imm);
+
+	// floating-point helpers
+	void movss_r128_p32(Assembler &a, Xmm const &reg, be_parameter const &param);
+	void movss_p32_r128(Assembler &a, be_parameter const &param, Xmm const &reg);
+	void movsd_r128_p64(Assembler &a, Xmm const &reg, be_parameter const &param);
+	void movsd_p64_r128(Assembler &a, be_parameter const &param, Xmm const &reg);
+
+	size_t emit(CodeHolder &ch);
 
 	// internal state
 	drc_hash_table          m_hash;                 // hash table state
 	drc_map_variables       m_map;                  // code map
-	drc_label_list          m_labels;               // label list
 	x86log_context *        m_log;                  // logging
-	bool                    m_sse41;                // do we have SSE4.1 support?
+	FILE *                  m_log_asmjit;
 
 	uint32_t *                m_absmask32;            // absolute value mask (32-bit)
 	uint64_t *                m_absmask64;            // absolute value mask (32-bit)
@@ -308,9 +240,6 @@
 	x86code *               m_exit;                 // exit point
 	x86code *               m_nocode;               // nocode handler
 
-	drc_label_fixup_delegate m_fixup_label;         // precomputed delegate for fixups
-	drc_oob_delegate        m_fixup_exception;      // precomputed delegate for exception fixups
-
 	// state to live in the near cache
 	struct near_state
 	{
@@ -334,7 +263,7 @@
 	near_state &            m_near;
 
 	// globals
-	typedef void (drcbe_x64::*opcode_generate_func)(x86code *&dst, const uml::instruction &inst);
+	typedef void (drcbe_x64::*opcode_generate_func)(Assembler &a, const uml::instruction &inst);
 	struct opcode_table_entry
 	{
 		uml::opcode_t           opcode;             // opcode in question
@@ -348,5 +277,4 @@
 
 using drc::drcbe_x64;
 
-
 #endif /* MAME_DEVICES_CPU_DRCBEX64_H */
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/drcbex86.cpp mame-0.224+dfsg.1/src/devices/cpu/drcbex86.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/drcbex86.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/drcbex86.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -89,19 +89,8 @@
 #include "drcuml.h"
 #include "drcbex86.h"
 
-// This is a trick to make it build on Android where the x86 SDK declares ::REG_Exx
 namespace drc {
 using namespace uml;
-using namespace x86emit;
-
-using x86emit::REG_EAX;
-using x86emit::REG_ECX;
-using x86emit::REG_EDX;
-using x86emit::REG_EBX;
-using x86emit::REG_ESP;
-using x86emit::REG_EBP;
-using x86emit::REG_ESI;
-using x86emit::REG_EDI;
 
 //**************************************************************************
 //  DEBUGGING
@@ -151,9 +140,9 @@
 //static const uint64_t size_to_mask[] = { 0, 0xff, 0xffff, 0, 0xffffffff, 0, 0, 0, 0xffffffffffffffffU };
 
 // register mapping tables
-static const uint8_t int_register_map[REG_I_COUNT] =
+static const Gp::Id int_register_map[REG_I_COUNT] =
 {
-	REG_EBX, REG_ESI, REG_EDI, REG_EBP
+	Gp::kIdBx, Gp::kIdSi, Gp::kIdDi, Gp::kIdBp
 };
 
 // flags mapping tables
@@ -161,24 +150,24 @@
 static uint32_t flags_unmap[0x20];
 
 // condition mapping table
-static const uint8_t condition_map[uml::COND_MAX - uml::COND_Z] =
+static const Condition::Code condition_map[uml::COND_MAX - uml::COND_Z] =
 {
-	x86emit::COND_Z,    // COND_Z = 0x80,    requires Z
-	x86emit::COND_NZ,   // COND_NZ,          requires Z
-	x86emit::COND_S,    // COND_S,           requires S
-	x86emit::COND_NS,   // COND_NS,          requires S
-	x86emit::COND_C,    // COND_C,           requires C
-	x86emit::COND_NC,   // COND_NC,          requires C
-	x86emit::COND_O,    // COND_V,           requires V
-	x86emit::COND_NO,   // COND_NV,          requires V
-	x86emit::COND_P,    // COND_U,           requires U
-	x86emit::COND_NP,   // COND_NU,          requires U
-	x86emit::COND_A,    // COND_A,           requires CZ
-	x86emit::COND_BE,   // COND_BE,          requires CZ
-	x86emit::COND_G,    // COND_G,           requires SVZ
-	x86emit::COND_LE,   // COND_LE,          requires SVZ
-	x86emit::COND_L,    // COND_L,           requires SV
-	x86emit::COND_GE,   // COND_GE,          requires SV
+	Condition::Code::kZ,    // COND_Z = 0x80,    requires Z
+	Condition::Code::kNZ,   // COND_NZ,          requires Z
+	Condition::Code::kS,    // COND_S,           requires S
+	Condition::Code::kNS,   // COND_NS,          requires S
+	Condition::Code::kC,    // COND_C,           requires C
+	Condition::Code::kNC,   // COND_NC,          requires C
+	Condition::Code::kO,    // COND_V,           requires V
+	Condition::Code::kNO,   // COND_NV,          requires V
+	Condition::Code::kP,    // COND_U,           requires U
+	Condition::Code::kNP,   // COND_NU,          requires U
+	Condition::Code::kA,    // COND_A,           requires CZ
+	Condition::Code::kBE,   // COND_BE,          requires CZ
+	Condition::Code::kG,    // COND_G,           requires SVZ
+	Condition::Code::kLE,   // COND_LE,          requires SVZ
+	Condition::Code::kL,    // COND_L,           requires SV
+	Condition::Code::kGE,   // COND_GE,          requires SV
 };
 
 // FPU control register mapping
@@ -287,6 +276,14 @@
 	{ uml::OP_ICOPYF,  &drcbe_x86::op_icopyf },     // ICOPYF  dst,src
 };
 
+class ThrowableErrorHandler : public ErrorHandler
+{
+public:
+	void handleError(Error err, const char *message, BaseEmitter *origin) override
+	{
+		throw emu_fatalerror("asmjit error %d: %s", err, message);
+	}
+};
 
 
 //**************************************************************************
@@ -298,7 +295,7 @@
 //  into a reduced set
 //-------------------------------------------------
 
-drcbe_x86::be_parameter::be_parameter(drcbe_x86 &drcbe, const parameter &param, uint32_t allowed)
+drcbe_x86::be_parameter::be_parameter(drcbe_x86 &drcbe, parameter const &param, uint32_t allowed)
 {
 	int regnum;
 
@@ -347,21 +344,28 @@
 //  checkparam
 //-------------------------------------------------
 
-inline int drcbe_x86::be_parameter::select_register(int defreg) const
+inline Gp drcbe_x86::be_parameter::select_register(Gp const &defreg) const
+{
+	if (m_type == PTYPE_INT_REGISTER)
+		return Gpd(m_value);
+	return defreg;
+}
+
+inline Xmm drcbe_x86::be_parameter::select_register(Xmm defreg) const
 {
-	if (m_type == PTYPE_INT_REGISTER || m_type == PTYPE_FLOAT_REGISTER || m_type == PTYPE_VECTOR_REGISTER)
-		return m_value;
+	if (m_type == PTYPE_FLOAT_REGISTER)
+		return Xmm(m_value);
 	return defreg;
 }
 
-inline int drcbe_x86::be_parameter::select_register(int defreg, const be_parameter &checkparam) const
+template <typename T> T drcbe_x86::be_parameter::select_register(T defreg, be_parameter const &checkparam) const
 {
 	if (*this == checkparam)
 		return defreg;
 	return select_register(defreg);
 }
 
-inline int drcbe_x86::be_parameter::select_register(int defreg, const be_parameter &checkparam, const be_parameter &checkparam2) const
+template <typename T> T drcbe_x86::be_parameter::select_register(T defreg, be_parameter const &checkparam, be_parameter const &checkparam2) const
 {
 	if (*this == checkparam || *this == checkparam2)
 		return defreg;
@@ -400,16 +404,16 @@
 //  two 32-bit operations
 //-------------------------------------------------
 
-inline void drcbe_x86::emit_combine_z_flags(x86code *&dst)
+inline void drcbe_x86::emit_combine_z_flags(Assembler &a)
 {
 	// this assumes that the flags from the low 32-bit op are on the stack
 	// and the flags from the high 32-bit op are live
-	emit_pushf(dst);                                                                    // pushf
-	emit_mov_r32_m32(dst, REG_ECX, MBD(REG_ESP, 4));                                    // mov   ecx,[esp+4]
-	emit_or_r32_imm(dst, REG_ECX, ~0x40);                                               // or    ecx,~0x40
-	emit_and_m32_r32(dst, MBD(REG_ESP, 0), REG_ECX);                                    // and   [esp],ecx
-	emit_popf(dst);                                                                     // popf
-	emit_lea_r32_m32(dst, REG_ESP, MBD(REG_ESP, 4));                                    // lea   esp,[esp+4]
+	a.pushfd();                                                                         // pushf
+	a.mov(ecx, ptr(esp, 4));                                                            // mov   ecx,[esp+4]
+	a.or_(ecx, ~0x40);                                                                  // or    ecx,~0x40
+	a.and_(ptr(esp, 0), ecx);                                                           // and   [esp],ecx
+	a.popfd();                                                                          // popf
+	a.lea(esp, ptr(esp, 4));                                                            // lea   esp,[esp+4]
 }
 
 
@@ -418,15 +422,15 @@
 //  flags from two 32-bit shift left operations
 //-------------------------------------------------
 
-inline void drcbe_x86::emit_combine_z_shl_flags(x86code *&dst)
+inline void drcbe_x86::emit_combine_z_shl_flags(Assembler &a)
 {
 	// this assumes that the flags from the high 32-bit op are on the stack
 	// and the flags from the low 32-bit op are live
-	emit_pushf(dst);                                                                    // pushf
-	emit_pop_r32(dst, REG_ECX);                                                         // pop   ecx
-	emit_or_r32_imm(dst, REG_ECX, ~0x40);                                               // or    ecx,~0x40
-	emit_and_m32_r32(dst, MBD(REG_ESP, 0), REG_ECX);                                    // and   [esp],ecx
-	emit_popf(dst);                                                                     // popf
+	a.pushfd();                                                                         // pushf
+	a.pop(ecx);                                                                         // pop   ecx
+	a.or_(ecx, ~0x40);                                                                  // or    ecx,~0x40
+	a.and_(ptr(esp, 0), ecx);                                                           // and   [esp],ecx
+	a.popfd();                                                                          // popf
 }
 
 
@@ -437,8 +441,8 @@
 
 inline void drcbe_x86::reset_last_upper_lower_reg()
 {
-	m_last_lower_reg = REG_NONE;
-	m_last_upper_reg = REG_NONE;
+	m_last_lower_reg = Gp();
+	m_last_upper_reg = Gp();
 }
 
 
@@ -447,13 +451,13 @@
 //  loaded a lower register
 //-------------------------------------------------
 
-inline void drcbe_x86::set_last_lower_reg(x86code *&dst, const be_parameter &param, uint8_t reglo)
+inline void drcbe_x86::set_last_lower_reg(Assembler &a, be_parameter const &param, Gp const &reglo)
 {
 	if (param.is_memory())
 	{
 		m_last_lower_reg = reglo;
 		m_last_lower_addr = (uint32_t *)((uintptr_t)param.memory());
-		m_last_lower_pc = dst;
+		m_last_lower_pc = (x86code *)(a.code()->baseAddress() + a.offset());
 	}
 }
 
@@ -463,11 +467,11 @@
 //  loaded an upper register
 //-------------------------------------------------
 
-inline void drcbe_x86::set_last_upper_reg(x86code *&dst, const be_parameter &param, uint8_t reghi)
+inline void drcbe_x86::set_last_upper_reg(Assembler &a, be_parameter const &param, Gp const &reghi)
 {
 	m_last_upper_reg = reghi;
 	m_last_upper_addr = (param.is_int_register()) ? m_reghi[param.ireg()] : (uint32_t *)((uintptr_t)param.memory(4));
-	m_last_upper_pc = dst;
+	m_last_upper_pc = (x86code *)(a.code()->baseAddress() + a.offset());
 }
 
 
@@ -476,9 +480,9 @@
 //  skip re-loading a lower half of a register
 //-------------------------------------------------
 
-inline bool drcbe_x86::can_skip_lower_load(x86code *&dst, uint32_t *memref, uint8_t reglo)
+inline bool drcbe_x86::can_skip_lower_load(Assembler &a, uint32_t *memref, Gp const &reglo)
 {
-	return (dst == m_last_lower_pc && memref == m_last_lower_addr && reglo == m_last_lower_reg);
+	return ((x86code *)(a.code()->baseAddress() + a.offset()) == m_last_lower_pc && memref == m_last_lower_addr && reglo == m_last_lower_reg);
 }
 
 
@@ -487,30 +491,11 @@
 //  skip re-loading an upper half of a register
 //-------------------------------------------------
 
-inline bool drcbe_x86::can_skip_upper_load(x86code *&dst, uint32_t *memref, uint8_t reghi)
-{
-	return (dst == m_last_upper_pc && memref == m_last_upper_addr && reghi == m_last_upper_reg);
-}
-
-
-//-------------------------------------------------
-//  track_resolve_link - wrapper for resolve_link
-//  that resets all register tracking info
-//-------------------------------------------------
-
-inline void drcbe_x86::track_resolve_link(x86code *&destptr, const emit_link &linkinfo)
+inline bool drcbe_x86::can_skip_upper_load(Assembler &a, uint32_t *memref, Gp const &reghi)
 {
-	reset_last_upper_lower_reg();
-	resolve_link(destptr, linkinfo);
+	return ((x86code *)(a.code()->baseAddress() + a.offset()) == m_last_upper_pc && memref == m_last_upper_addr && reghi == m_last_upper_reg);
 }
 
-#define resolve_link INVALID
-
-
-
-//**************************************************************************
-//  BACKEND CALLBACKS
-//**************************************************************************
 
 //-------------------------------------------------
 //  drcbe_x86 - constructor
@@ -520,19 +505,19 @@
 	: drcbe_interface(drcuml, cache, device),
 		m_hash(cache, modes, addrbits, ignorebits),
 		m_map(cache, 0),
-		m_labels(cache),
 		m_log(nullptr),
+		m_log_asmjit(nullptr),
 		m_logged_common(false),
-		m_sse3(false),
+		m_sse3(CpuInfo::host().features().as<Features>().hasSSE3()),
 		m_entry(nullptr),
 		m_exit(nullptr),
 		m_nocode(nullptr),
 		m_save(nullptr),
 		m_restore(nullptr),
-		m_last_lower_reg(REG_NONE),
+		m_last_lower_reg(Gp()),
 		m_last_lower_pc(nullptr),
 		m_last_lower_addr(nullptr),
-		m_last_upper_reg(REG_NONE),
+		m_last_upper_reg(Gp()),
 		m_last_upper_pc(nullptr),
 		m_last_upper_addr(nullptr),
 		m_fptemp(0),
@@ -541,9 +526,7 @@
 		m_stacksave(nullptr),
 		m_hashstacksave(nullptr),
 		m_reslo(0),
-		m_reshi(0),
-		m_fixup_label(&drcbe_x86::fixup_label, this),
-		m_fixup_exception(&drcbe_x86::fixup_exception, this)
+		m_reshi(0)
 {
 	// compute hi pointers for each register
 	for (int regnum = 0; regnum < ARRAY_LENGTH(int_register_map); regnum++)
@@ -584,6 +567,7 @@
 	{
 		std::string filename = std::string("drcbex86_").append(device.shortname()).append(".asm");
 		m_log = x86log_create_context(filename.c_str());
+		m_log_asmjit = fopen(std::string("drcbex86_asmjit_").append(device.shortname()).append(".asm").c_str(), "w");
 	}
 }
 
@@ -597,8 +581,50 @@
 	// free the log context
 	if (m_log != nullptr)
 		x86log_free_context(m_log);
+
+	if (m_log_asmjit)
+		fclose(m_log_asmjit);
 }
 
+size_t drcbe_x86::emit(CodeHolder &ch)
+{
+	Error err;
+
+	// the following three calls aren't currently required, but may be if
+	// other asmjist features are used in future
+	if (false)
+	{
+		err = ch.flatten();
+		if (err)
+			throw emu_fatalerror("asmjit::CodeHolder::flatten() error %d", err);
+
+		err = ch.resolveUnresolvedLinks();
+		if (err)
+			throw emu_fatalerror("asmjit::CodeHolder::resolveUnresolvedLinks() error %d", err);
+
+		err = ch.relocateToBase(ch.baseAddress());
+		if (err)
+			throw emu_fatalerror("asmjit::CodeHolder::relocateToBase() error %d", err);
+	}
+
+	size_t const alignment = ch.baseAddress() - uint64_t(m_cache.top());
+	size_t const code_size = ch.codeSize();
+
+	// test if enough room remains in drc cache
+	drccodeptr *cachetop = m_cache.begin_codegen(alignment + code_size);
+	if (cachetop == nullptr)
+		return 0;
+
+	err = ch.copyFlattenedData(drccodeptr(ch.baseAddress()), code_size, CodeHolder::kCopyWithPadding);
+	if (err)
+		throw emu_fatalerror("asmjit::CodeHolder::copyFlattenedData() error %d", err);
+
+	// update the drc cache and end codegen
+	*cachetop += alignment + code_size;
+	m_cache.end_codegen();
+
+	return code_size;
+}
 
 //-------------------------------------------------
 //  reset - reset back-end specific state
@@ -611,139 +637,148 @@
 		x86log_printf(m_log, "%s", "\n\n===========\nCACHE RESET\n===========\n\n");
 
 	// generate a little bit of glue code to set up the environment
-	drccodeptr *cachetop = m_cache.begin_codegen(500);
-	if (cachetop == nullptr)
-		fatalerror("Out of cache space after a reset!\n");
+	x86code *dst = (x86code *)m_cache.top();
 
-	x86code *dst = (x86code *)*cachetop;
+	CodeHolder ch;
+	ch.init(hostEnvironment(), uint64_t(dst));
 
-	// generate a simple CPUID stub
-	uint32_t (*cpuid_ecx_stub)(void) = (uint32_t (*)(void))dst;
-	emit_push_r32(dst, REG_EBX);                                                        // push  ebx
-	emit_mov_r32_imm(dst, REG_EAX, 1);                                                  // mov   eax,1
-	emit_cpuid(dst);                                                                    // cpuid
-	emit_mov_r32_r32(dst, REG_EAX, REG_ECX);                                            // mov   eax,ecx
-	emit_pop_r32(dst, REG_EBX);                                                         // pop   ebx
-	emit_ret(dst);                                                                      // ret
+	FileLogger logger(m_log_asmjit);
+	if (logger.file())
+	{
+		logger.setFlags(FormatOptions::Flags::kFlagHexOffsets | FormatOptions::Flags::kFlagHexImms | FormatOptions::Flags::kFlagMachineCode);
+		logger.setIndentation(FormatOptions::IndentationType::kIndentationCode, 4);
+		ch.setLogger(&logger);
+	}
 
-	// call it to determine if we have SSE3 support
-	m_sse3 = (((*cpuid_ecx_stub)() & 1) != 0);
+	Assembler a(&ch);
+	if (logger.file())
+		a.addValidationOptions(BaseEmitter::kValidationOptionIntermediate);
 
 	// generate an entry point
 	m_entry = (x86_entry_point_func)dst;
-	emit_mov_r32_m32(dst, REG_EAX, MBD(REG_ESP, 4));                                    // mov   eax,[esp+4]
-	emit_push_r32(dst, REG_EBX);                                                        // push  ebx
-	emit_push_r32(dst, REG_ESI);                                                        // push  esi
-	emit_push_r32(dst, REG_EDI);                                                        // push  edi
-	emit_push_r32(dst, REG_EBP);                                                        // push  ebp
-	emit_sub_r32_imm(dst, REG_ESP, 24);                                                 // sub   esp,24
-	emit_mov_m32_r32(dst, MABS(&m_hashstacksave), REG_ESP);                     // mov   [hashstacksave],esp
-	emit_sub_r32_imm(dst, REG_ESP, 4);                                                  // sub   esp,4
-	emit_mov_m32_r32(dst, MABS(&m_stacksave), REG_ESP);                         // mov   [stacksave],esp
-	emit_fstcw_m16(dst, MABS(&m_fpumode));                                          // fstcw [fpumode]
-	emit_jmp_r32(dst, REG_EAX);                                                         // jmp   eax
-	if (m_log != nullptr && !m_logged_common)
-		x86log_disasm_code_range(m_log, "entry_point", (x86code *)m_entry, dst);
+	a.bind(a.newNamedLabel("entry_point"));
+
+	FuncDetail entry_point;
+	entry_point.init(FuncSignatureT<uint32_t, x86code *>(CallConv::kIdHost), hostEnvironment());
+
+	FuncFrame frame;
+	frame.init(entry_point);
+	frame.addDirtyRegs(ebx, esi, edi, ebp);
+	FuncArgsAssignment args(&entry_point);
+	args.assignAll(eax);
+	args.updateFuncFrame(frame);
+	frame.finalize();
+
+	a.emitProlog(frame);
+	a.emitArgsAssignment(frame, args);
+	a.sub(esp, 24);                                                                     // sub   esp,24
+	a.mov(MABS(&m_hashstacksave), esp);                                                 // mov   [hashstacksave],esp
+	a.sub(esp, 4);                                                                      // sub   esp,4
+	a.mov(MABS(&m_stacksave), esp);                                                     // mov   [stacksave],esp
+	a.fnstcw(MABS(&m_fpumode));                                                         // fstcw [fpumode]
+	a.jmp(eax);                                                                         // jmp   eax
 
 	// generate an exit point
-	m_exit = dst;
-	emit_fldcw_m16(dst, MABS(&m_fpumode));                                          // fldcw [fpumode]
-	emit_mov_r32_m32(dst, REG_ESP, MABS(&m_hashstacksave));                     // mov   esp,[hashstacksave]
-	emit_add_r32_imm(dst, REG_ESP, 24);                                                 // add   esp,24
-	emit_pop_r32(dst, REG_EBP);                                                         // pop   ebp
-	emit_pop_r32(dst, REG_EDI);                                                         // pop   edi
-	emit_pop_r32(dst, REG_ESI);                                                         // pop   esi
-	emit_pop_r32(dst, REG_EBX);                                                         // pop   ebx
-	emit_ret(dst);                                                                      // ret
-	if (m_log != nullptr && !m_logged_common)
-		x86log_disasm_code_range(m_log, "exit_point", m_exit, dst);
+	m_exit = dst + a.offset();
+	a.bind(a.newNamedLabel("exit_point"));
+	a.fldcw(MABS(&m_fpumode));                                                          // fldcw [fpumode]
+	a.mov(esp, MABS(&m_hashstacksave));                                                 // mov   esp,[hashstacksave]
+	a.add(esp, 24);                                                                     // add   esp,24
+	a.emitEpilog(frame);
 
 	// generate a no code point
-	m_nocode = dst;
-	emit_ret(dst);                                                                      // ret
-	if (m_log != nullptr && !m_logged_common)
-		x86log_disasm_code_range(m_log, "nocode", m_nocode, dst);
+	m_nocode = dst + a.offset();
+	a.bind(a.newNamedLabel("nocode_point"));
+	a.ret();                                                                            // ret
 
 	// generate a save subroutine
-	m_save = dst;
-	emit_pushf(dst);                                                                    // pushf
-	emit_pop_r32(dst, REG_EAX);                                                         // pop    eax
-	emit_and_r32_imm(dst, REG_EAX, 0x8c5);                                              // and    eax,0x8c5
-	emit_mov_r8_m8(dst, REG_AL, MABSI(flags_map, REG_EAX));                             // mov    al,[flags_map]
-	emit_mov_m8_r8(dst, MBD(REG_ECX, offsetof(drcuml_machine_state, flags)), REG_AL);   // mov    state->flags,al
-	emit_mov_r8_m8(dst, REG_AL, MABS(&m_state.fmod));                               // mov    al,[fmod]
-	emit_mov_m8_r8(dst, MBD(REG_ECX, offsetof(drcuml_machine_state, fmod)), REG_AL);    // mov    state->fmod,al
-	emit_mov_r32_m32(dst, REG_EAX, MABS(&m_state.exp));                         // mov    eax,[exp]
-	emit_mov_m32_r32(dst, MBD(REG_ECX, offsetof(drcuml_machine_state, exp)), REG_EAX);  // mov    state->exp,eax
+	m_save = dst + a.offset();
+	a.bind(a.newNamedLabel("save"));
+	a.pushfd();                                                                         // pushf
+	a.pop(eax);                                                                         // pop    eax
+	a.and_(eax, 0x8c5);                                                                 // and    eax,0x8c5
+	a.mov(al, ptr(u64(flags_map), eax));                                                // mov    al,[flags_map]
+	a.mov(ptr(ecx, offsetof(drcuml_machine_state, flags)), al);                         // mov    state->flags,al
+	a.mov(al, MABS(&m_state.fmod));                                                     // mov    al,[fmod]
+	a.mov(ptr(ecx, offsetof(drcuml_machine_state, fmod)), al);                          // mov    state->fmod,al
+	a.mov(eax, MABS(&m_state.exp));                                                     // mov    eax,[exp]
+	a.mov(ptr(ecx, offsetof(drcuml_machine_state, exp)), eax);                          // mov    state->exp,eax
 	for (int regnum = 0; regnum < ARRAY_LENGTH(m_state.r); regnum++)
 	{
 		uintptr_t regoffsl = (uintptr_t)&((drcuml_machine_state *)nullptr)->r[regnum].w.l;
 		uintptr_t regoffsh = (uintptr_t)&((drcuml_machine_state *)nullptr)->r[regnum].w.h;
 		if (int_register_map[regnum] != 0)
-			emit_mov_m32_r32(dst, MBD(REG_ECX, regoffsl), int_register_map[regnum]);
+			a.mov(ptr(ecx, regoffsl), Gpd(int_register_map[regnum]));
 		else
 		{
-			emit_mov_r32_m32(dst, REG_EAX, MABS(&m_state.r[regnum].w.l));
-			emit_mov_m32_r32(dst, MBD(REG_ECX, regoffsl), REG_EAX);
+			a.mov(eax, MABS(&m_state.r[regnum].w.l));
+			a.mov(ptr(ecx, regoffsl), eax);
 		}
-		emit_mov_r32_m32(dst, REG_EAX, MABS(&m_state.r[regnum].w.h));
-		emit_mov_m32_r32(dst, MBD(REG_ECX, regoffsh), REG_EAX);
+		a.mov(eax, MABS(&m_state.r[regnum].w.h));
+		a.mov(ptr(ecx, regoffsh), eax);
 	}
 	for (int regnum = 0; regnum < ARRAY_LENGTH(m_state.f); regnum++)
 	{
 		uintptr_t regoffsl = (uintptr_t)&((drcuml_machine_state *)nullptr)->f[regnum].s.l;
 		uintptr_t regoffsh = (uintptr_t)&((drcuml_machine_state *)nullptr)->f[regnum].s.h;
-		emit_mov_r32_m32(dst, REG_EAX, MABS(&m_state.f[regnum].s.l));
-		emit_mov_m32_r32(dst, MBD(REG_ECX, regoffsl), REG_EAX);
-		emit_mov_r32_m32(dst, REG_EAX, MABS(&m_state.f[regnum].s.h));
-		emit_mov_m32_r32(dst, MBD(REG_ECX, regoffsh), REG_EAX);
+		a.mov(eax, MABS(&m_state.f[regnum].s.l));
+		a.mov(ptr(ecx, regoffsl), eax);
+		a.mov(eax, MABS(&m_state.f[regnum].s.h));
+		a.mov(ptr(ecx, regoffsh), eax);
 	}
-	emit_ret(dst);                                                                      // ret
-	if (m_log != nullptr && !m_logged_common)
-		x86log_disasm_code_range(m_log, "save", m_save, dst);
+	a.ret();                                                                            // ret
 
 	// generate a restore subroutine
-	m_restore = dst;
+	m_restore = dst + a.offset();
+	a.bind(a.newNamedLabel("restore"));
 	for (int regnum = 0; regnum < ARRAY_LENGTH(m_state.r); regnum++)
 	{
 		uintptr_t regoffsl = (uintptr_t)&((drcuml_machine_state *)nullptr)->r[regnum].w.l;
 		uintptr_t regoffsh = (uintptr_t)&((drcuml_machine_state *)nullptr)->r[regnum].w.h;
 		if (int_register_map[regnum] != 0)
-			emit_mov_r32_m32(dst, int_register_map[regnum], MBD(REG_ECX, regoffsl));
+			a.mov(Gpd(int_register_map[regnum]), ptr(ecx, regoffsl));
 		else
 		{
-			emit_mov_r32_m32(dst, REG_EAX, MBD(REG_ECX, regoffsl));
-			emit_mov_m32_r32(dst, MABS(&m_state.r[regnum].w.l), REG_EAX);
+			a.mov(eax, ptr(ecx, regoffsl));
+			a.mov(MABS(&m_state.r[regnum].w.l), eax);
 		}
-		emit_mov_r32_m32(dst, REG_EAX, MBD(REG_ECX, regoffsh));
-		emit_mov_m32_r32(dst, MABS(&m_state.r[regnum].w.h), REG_EAX);
+		a.mov(eax, ptr(ecx, regoffsh));
+		a.mov(MABS(&m_state.r[regnum].w.h), eax);
 	}
 	for (int regnum = 0; regnum < ARRAY_LENGTH(m_state.f); regnum++)
 	{
 		uintptr_t regoffsl = (uintptr_t)&((drcuml_machine_state *)nullptr)->f[regnum].s.l;
 		uintptr_t regoffsh = (uintptr_t)&((drcuml_machine_state *)nullptr)->f[regnum].s.h;
-		emit_mov_r32_m32(dst, REG_EAX, MBD(REG_ECX, regoffsl));
-		emit_mov_m32_r32(dst, MABS(&m_state.f[regnum].s.l), REG_EAX);
-		emit_mov_r32_m32(dst, REG_EAX, MBD(REG_ECX, regoffsh));
-		emit_mov_m32_r32(dst, MABS(&m_state.f[regnum].s.h), REG_EAX);
-	}
-	emit_movzx_r32_m8(dst, REG_EAX, MBD(REG_ECX, offsetof(drcuml_machine_state, fmod)));// movzx eax,state->fmod
-	emit_and_r32_imm(dst, REG_EAX, 3);                                                  // and    eax,3
-	emit_mov_m8_r8(dst, MABS(&m_state.fmod), REG_AL);                               // mov    [fmod],al
-	emit_fldcw_m16(dst, MABSI(&fp_control[0], REG_EAX, 2));                             // fldcw  fp_control[eax]
-	emit_mov_r32_m32(dst, REG_EAX, MBD(REG_ECX, offsetof(drcuml_machine_state, exp)));  // mov    eax,state->exp
-	emit_mov_m32_r32(dst, MABS(&m_state.exp), REG_EAX);                         // mov    [exp],eax
-	emit_movzx_r32_m8(dst, REG_EAX, MBD(REG_ECX, offsetof(drcuml_machine_state, flags)));// movzx eax,state->flags
-	emit_push_m32(dst, MABSI(flags_unmap, REG_EAX, 4));                                 // push   flags_unmap[eax*4]
-	emit_popf(dst);                                                                     // popf
-	emit_ret(dst);                                                                      // ret
+		a.mov(eax, ptr(ecx, regoffsl));
+		a.mov(MABS(&m_state.f[regnum].s.l), eax);
+		a.mov(eax, ptr(ecx, regoffsh));
+		a.mov(MABS(&m_state.f[regnum].s.h), eax);
+	}
+	a.movzx(eax, byte_ptr(ecx, offsetof(drcuml_machine_state, fmod)));                  // movzx eax,state->fmod
+	a.and_(eax, 3);                                                                     // and    eax,3
+	a.mov(MABS(&m_state.fmod), al);                                                     // mov    [fmod],al
+	a.fldcw(word_ptr(u64(&fp_control[0]), eax, 1));                                     // fldcw  fp_control[eax*2]
+	a.mov(eax, ptr(ecx, offsetof(drcuml_machine_state, exp)));                          // mov    eax,state->exp
+	a.mov(MABS(&m_state.exp), eax);                                                     // mov    [exp],eax
+	a.movzx(eax, byte_ptr(ecx, offsetof(drcuml_machine_state, flags)));                 // movzx eax,state->flags
+	a.push(dword_ptr(u64(flags_unmap), eax, 2));                                        // push   flags_unmap[eax*4]
+	a.popfd();                                                                          // popf
+	a.ret();                                                                            // ret
+
+
+	// emit the generated code
+	size_t bytes = emit(ch);
+
 	if (m_log != nullptr && !m_logged_common)
-		x86log_disasm_code_range(m_log, "restore", m_restore, dst);
+	{
+		x86log_disasm_code_range(m_log, "entry_point", dst, m_exit);
+		x86log_disasm_code_range(m_log, "exit_point", m_exit, m_nocode);
+		x86log_disasm_code_range(m_log, "nocode_point", m_nocode, m_save);
+		x86log_disasm_code_range(m_log, "save", m_save, m_restore);
+		x86log_disasm_code_range(m_log, "restore", m_restore, dst + bytes);
 
-	// finish up codegen
-	*cachetop = dst;
-	m_cache.end_codegen();
-	m_logged_common = true;
+		m_logged_common = true;
+	}
 
 	// reset our hash tables
 	m_hash.reset();
@@ -771,56 +806,70 @@
 {
 	// tell all of our utility objects that a block is beginning
 	m_hash.block_begin(block, instlist, numinst);
-	m_labels.block_begin(block);
 	m_map.block_begin(block);
 
-	// begin codegen; fail if we can't
-	drccodeptr *cachetop = m_cache.begin_codegen(numinst * 8 * 4);
-	if (cachetop == nullptr)
-		block.abort();
-
 	// compute the base by aligning the cache top to a cache line (assumed to be 64 bytes)
-	x86code *base = (x86code *)(((uintptr_t)*cachetop + 63) & ~63);
-	x86code *dst = base;
+	x86code *dst = (x86code *)(uint64_t(m_cache.top() + 63) & ~63);
+
+	CodeHolder ch;
+	ch.init(hostEnvironment(), uint64_t(dst));
+	ThrowableErrorHandler e;
+	ch.setErrorHandler(&e);
+
+	FileLogger logger(m_log_asmjit);
+	if (logger.file())
+	{
+		logger.setFlags(FormatOptions::Flags::kFlagHexOffsets | FormatOptions::Flags::kFlagHexImms | FormatOptions::Flags::kFlagMachineCode);
+		logger.setIndentation(FormatOptions::IndentationType::kIndentationCode, 4);
+		ch.setLogger(&logger);
+	}
+
+	Assembler a(&ch);
+	if (logger.file())
+		a.addValidationOptions(BaseEmitter::kValidationOptionIntermediate);
 
 	// generate code
-	const char *blockname = nullptr;
+	std::string blockname;
 	for (int inum = 0; inum < numinst; inum++)
 	{
 		const instruction &inst = instlist[inum];
 		assert(inst.opcode() < ARRAY_LENGTH(s_opcode_table));
 
+		// must remain in scope until output
+		std::string dasm;
+
 		// add a comment
 		if (m_log != nullptr)
 		{
-			std::string dasm = inst.disasm(&m_drcuml);
-			x86log_add_comment(m_log, dst, "%s", dasm.c_str());
+			dasm = inst.disasm(&m_drcuml);
+			x86log_add_comment(m_log, dst + a.offset(), "%s", dasm.c_str());
+			a.setInlineComment(dasm.c_str());
 		}
 
 		// extract a blockname
-		if (blockname == nullptr)
+		if (blockname.empty())
 		{
 			if (inst.opcode() == OP_HANDLE)
 				blockname = inst.param(0).handle().string();
 			else if (inst.opcode() == OP_HASH)
-				blockname = string_format("Code: mode=%d PC=%08X", (uint32_t)inst.param(0).immediate(), (offs_t)inst.param(1).immediate()).c_str();
+				blockname = string_format("Code: mode=%d PC=%08X", (uint32_t)inst.param(0).immediate(), (offs_t)inst.param(1).immediate());
 		}
 
 		// generate code
-		(this->*s_opcode_table[inst.opcode()])(dst, inst);
+		(this->*s_opcode_table[inst.opcode()])(a, inst);
 	}
 
-	// complete codegen
-	*cachetop = (drccodeptr)dst;
-	m_cache.end_codegen();
+	// emit the generated code
+	size_t const bytes = emit(ch);
+	if (!bytes)
+		block.abort();
 
 	// log it
 	if (m_log != nullptr)
-		x86log_disasm_code_range(m_log, (blockname == nullptr) ? "Unknown block" : blockname, base, m_cache.top());
+		x86log_disasm_code_range(m_log, (blockname.empty()) ? "Unknown block" : blockname.c_str(), dst, dst + bytes);
 
 	// tell all of our utility objects that the block is finished
 	m_hash.block_end(block);
-	m_labels.block_end(block);
 	m_map.block_end(block);
 }
 
@@ -860,21 +909,21 @@
 //  into a register
 //-------------------------------------------------
 
-void drcbe_x86::emit_mov_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param)
+void drcbe_x86::emit_mov_r32_p32(Assembler &a, Gp const &reg, be_parameter const &param)
 {
 	if (param.is_immediate())
 	{
 		if (param.immediate() == 0)
-			emit_xor_r32_r32(dst, reg, reg);                                            // xor   reg,reg
+			a.xor_(reg, reg);                                                           // xor   reg,reg
 		else
-			emit_mov_r32_imm(dst, reg, param.immediate());                                  // mov   reg,param
+			a.mov(reg, param.immediate());                                              // mov   reg,param
 	}
 	else if (param.is_memory())
-		emit_mov_r32_m32(dst, reg, MABS(param.memory()));                                   // mov   reg,[param]
+		a.mov(reg, MABS(param.memory()));                                               // mov   reg,[param]
 	else if (param.is_int_register())
 	{
-		if (reg != param.ireg())
-			emit_mov_r32_r32(dst, reg, param.ireg());                                   // mov   reg,param
+		if (reg.id() != param.ireg())
+			a.mov(reg, Gpd(param.ireg()));                                              // mov   reg,param
 	}
 }
 
@@ -885,19 +934,19 @@
 //  any flags
 //-------------------------------------------------
 
-void drcbe_x86::emit_mov_r32_p32_keepflags(x86code *&dst, uint8_t reg, const be_parameter &param)
+void drcbe_x86::emit_mov_r32_p32_keepflags(Assembler &a, Gp const &reg, be_parameter const &param)
 {
 	if (param.is_immediate())
-		emit_mov_r32_imm(dst, reg, param.immediate());                                      // mov   reg,param
+		a.mov(reg, param.immediate());                                                  // mov   reg,param
 	else if (param.is_memory())
 	{
-		if (!can_skip_lower_load(dst, (uint32_t *)((uintptr_t)param.memory()), reg))
-			emit_mov_r32_m32(dst, reg, MABS(param.memory()));                               // mov   reg,[param]
+		if (!can_skip_lower_load(a, (uint32_t *)((uintptr_t)param.memory()), reg))
+			a.mov(reg, MABS(param.memory()));                                           // mov   reg,[param]
 	}
 	else if (param.is_int_register())
 	{
-		if (reg != param.ireg())
-			emit_mov_r32_r32(dst, reg, param.ireg());                                   // mov   reg,param
+		if (reg.id() != param.ireg())
+			a.mov(reg, Gpd(param.ireg()));                                              // mov   reg,param
 	}
 }
 
@@ -907,18 +956,18 @@
 //  into a memory location
 //-------------------------------------------------
 
-void drcbe_x86::emit_mov_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param)
+void drcbe_x86::emit_mov_m32_p32(Assembler &a, Mem memref, be_parameter const &param)
 {
 	if (param.is_immediate())
-		emit_mov_m32_imm(dst, memref, param.immediate());                                   // mov   [mem],param
+		a.mov(memref, param.immediate());                                               // mov   [mem],param
 	else if (param.is_memory())
 	{
-		if (!can_skip_lower_load(dst, (uint32_t *)((uintptr_t)param.memory()), REG_EAX))
-			emit_mov_r32_m32(dst, REG_EAX, MABS(param.memory()));                           // mov   eax,[param]
-		emit_mov_m32_r32(dst, memref, REG_EAX);                                     // mov   [mem],eax
+		if (!can_skip_lower_load(a, (uint32_t *)((uintptr_t)param.memory()), eax))
+			a.mov(eax, MABS(param.memory()));                                           // mov   eax,[param]
+		a.mov(memref, eax);                                                             // mov   [mem],eax
 	}
 	else if (param.is_int_register())
-		emit_mov_m32_r32(dst, memref, param.ireg());                                    // mov   [mem],param
+		a.mov(memref, Gpd(param.ireg()));                                               // mov   [mem],param
 }
 
 
@@ -927,1225 +976,282 @@
 //  32-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_mov_p32_r32(x86code *&dst, const be_parameter &param, uint8_t reg)
+void drcbe_x86::emit_mov_p32_r32(Assembler &a, be_parameter const &param, Gp const &reg)
 {
 	assert(!param.is_immediate());
 	if (param.is_memory())
 	{
-		emit_mov_m32_r32(dst, MABS(param.memory()), reg);                                   // mov   [param],reg
-		set_last_lower_reg(dst, param, reg);
-	}
-	else if (param.is_int_register())
-	{
-		if (reg != param.ireg())
-			emit_mov_r32_r32(dst, param.ireg(), reg);                                   // mov   param,reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_add_r32_p32 - add operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_add_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-			emit_add_r32_imm(dst, reg, param.immediate());                                  // add   reg,param
-	}
-	else if (param.is_memory())
-		emit_add_r32_m32(dst, reg, MABS(param.memory()));                                   // add   reg,[param]
-	else if (param.is_int_register())
-		emit_add_r32_r32(dst, reg, param.ireg());                                       // add   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_add_m32_p32 - add operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_add_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-			emit_add_m32_imm(dst, memref, param.immediate());                               // add   [dest],param
-	}
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32(dst, reg, param);                                      // mov   reg,param
-		emit_add_m32_r32(dst, memref, reg);                                         // add   [dest],reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_adc_r32_p32 - adc operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_adc_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-		emit_adc_r32_imm(dst, reg, param.immediate());                                      // adc   reg,param
-	else if (param.is_memory())
-		emit_adc_r32_m32(dst, reg, MABS(param.memory()));                                   // adc   reg,[param]
-	else if (param.is_int_register())
-		emit_adc_r32_r32(dst, reg, param.ireg());                                       // adc   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_adc_m32_p32 - adc operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_adc_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-		emit_adc_m32_imm(dst, memref, param.immediate());                                   // adc   [dest],param
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32_keepflags(dst, reg, param);                                // mov   reg,param
-		emit_adc_m32_r32(dst, memref, reg);                                         // adc   [dest],reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_sub_r32_p32 - sub operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_sub_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-			emit_sub_r32_imm(dst, reg, param.immediate());                                  // sub   reg,param
-	}
-	else if (param.is_memory())
-		emit_sub_r32_m32(dst, reg, MABS(param.memory()));                                   // sub   reg,[param]
-	else if (param.is_int_register())
-		emit_sub_r32_r32(dst, reg, param.ireg());                                       // sub   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_sub_m32_p32 - sub operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_sub_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() != 0 || param.immediate() != 0)
-			emit_sub_m32_imm(dst, memref, param.immediate());                               // sub   [dest],param
-	}
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32(dst, reg, param);                                      // mov   reg,param
-		emit_sub_m32_r32(dst, memref, reg);                                         // sub   [dest],reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_sbb_r32_p32 - sbb operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_sbb_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-		emit_sbb_r32_imm(dst, reg, param.immediate());                                      // sbb   reg,param
-	else if (param.is_memory())
-		emit_sbb_r32_m32(dst, reg, MABS(param.memory()));                                   // sbb   reg,[param]
-	else if (param.is_int_register())
-		emit_sbb_r32_r32(dst, reg, param.ireg());                                       // sbb   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_sbb_m32_p32 - sbb operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_sbb_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-		emit_sbb_m32_imm(dst, memref, param.immediate());                                   // sbb   [dest],param
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32_keepflags(dst, reg, param);                                // mov   reg,param
-		emit_sbb_m32_r32(dst, memref, reg);                                         // sbb   [dest],reg
+		a.mov(MABS(param.memory()), reg);                                               // mov   [param],reg
+		set_last_lower_reg(a, param, reg);
 	}
-}
-
-
-//-------------------------------------------------
-//  emit_cmp_r32_p32 - cmp operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_cmp_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-		emit_cmp_r32_imm(dst, reg, param.immediate());                                      // cmp   reg,param
-	else if (param.is_memory())
-		emit_cmp_r32_m32(dst, reg, MABS(param.memory()));                                   // cmp   reg,[param]
 	else if (param.is_int_register())
-		emit_cmp_r32_r32(dst, reg, param.ireg());                                       // cmp   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_cmp_m32_p32 - cmp operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_cmp_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-		emit_cmp_m32_imm(dst, memref, param.immediate());                                   // cmp   [dest],param
-	else
 	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32(dst, reg, param);                                      // mov   reg,param
-		emit_cmp_m32_r32(dst, memref, reg);                                         // cmp   [dest],reg
+		if (reg.id() != param.ireg())
+			a.mov(Gpd(param.ireg()), reg);                                              // mov   param,reg
 	}
 }
 
 
-//-------------------------------------------------
-//  emit_and_r32_p32 - and operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_and_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			emit_xor_r32_r32(dst, reg, reg);                                            // xor   reg,reg
-		else
-			emit_and_r32_imm(dst, reg, param.immediate());                                  // and   reg,param
-	}
-	else if (param.is_memory())
-		emit_and_r32_m32(dst, reg, MABS(param.memory()));                                   // and   reg,[param]
-	else if (param.is_int_register())
-		emit_and_r32_r32(dst, reg, param.ireg());                                       // and   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_and_m32_p32 - and operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_and_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x86::alu_op_param(Assembler &a, Inst::Id const opcode, Operand const &dst, be_parameter const &param, std::function<bool(Assembler &a, Operand const &dst, be_parameter const &src)> optimize)
 {
 	if (param.is_immediate())
 	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			emit_mov_m32_imm(dst, memref, 0);                                       // mov   [dest],0
-		else
-			emit_and_m32_imm(dst, memref, param.immediate());                               // and   [dest],param
-	}
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32(dst, reg, param);                                      // mov   reg,param
-		emit_and_m32_r32(dst, memref, reg);                                         // and   [dest],reg
+		if (!optimize(a, dst, param))
+			a.emit(opcode, dst, param.immediate());                                     // op    dst,param
 	}
-}
-
-
-//-------------------------------------------------
-//  emit_test_r32_p32 - test operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_test_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-		emit_test_r32_imm(dst, reg, param.immediate());                                     // test   reg,param
-	else if (param.is_memory())
-		emit_test_m32_r32(dst, MABS(param.memory()), reg);                              // test   [param],reg
-	else if (param.is_int_register())
-		emit_test_r32_r32(dst, reg, param.ireg());                                      // test   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_test_m32_p32 - test operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_test_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-		emit_test_m32_imm(dst, memref, param.immediate());                              // test  [dest],param
 	else if (param.is_memory())
 	{
-		emit_mov_r32_p32(dst, REG_EAX, param);                                  // mov   reg,param
-		emit_test_m32_r32(dst, memref, REG_EAX);                                        // test  [dest],reg
-	}
-	else if (param.is_int_register())
-		emit_test_m32_r32(dst, memref, param.ireg());                               // test  [dest],param
-}
-
-
-//-------------------------------------------------
-//  emit_or_r32_p32 - or operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
+		if (dst.isMem())
+		{
+			// use temporary register for memory,memory
+			Gp const reg = param.select_register(eax);
 
-void drcbe_x86::emit_or_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			emit_mov_r32_imm(dst, reg, ~0);                                             // mov  reg,-1
+			a.mov(reg, MABS(param.memory()));                                           // mov   reg,param
+			a.emit(opcode, dst, reg);                                                   // op    [dst],reg
+		}
+		else if (opcode != Inst::kIdTest)
+			// most instructions are register,memory
+			a.emit(opcode, dst, MABS(param.memory()));                                  // op    dst,[param]
 		else
-			emit_or_r32_imm(dst, reg, param.immediate());                                   // or   reg,param
+			// test instruction requires memory,register
+			a.emit(opcode, MABS(param.memory()), dst);                                  // op    [param],dst
 	}
-	else if (param.is_memory())
-		emit_or_r32_m32(dst, reg, MABS(param.memory()));                                    // or   reg,[param]
 	else if (param.is_int_register())
-		emit_or_r32_r32(dst, reg, param.ireg());                                        // or   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_or_m32_p32 - or operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_or_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			emit_mov_m32_imm(dst, memref, ~0);                                      // mov   [dest],-1
-		else
-			emit_or_m32_imm(dst, memref, param.immediate());                                // or   [dest],param
-	}
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32(dst, reg, param);                                      // mov   reg,param
-		emit_or_m32_r32(dst, memref, reg);                                          // or   [dest],reg
-	}
+		a.emit(opcode, dst, Gpd(param.ireg()));                                         // op    dst,param
 }
 
 
-//-------------------------------------------------
-//  emit_xor_r32_p32 - xor operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_xor_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
+void drcbe_x86::shift_op_param(Assembler &a, Inst::Id const opcode, Operand const &dst, be_parameter const &param, std::function<bool(Assembler &a, Operand const &dst, be_parameter const &src)> optimize)
 {
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			emit_not_r32(dst, reg);                                                     // not   reg
-		else
-			emit_xor_r32_imm(dst, reg, param.immediate());                                  // xor   reg,param
-	}
-	else if (param.is_memory())
-		emit_xor_r32_m32(dst, reg, MABS(param.memory()));                                   // xor   reg,[param]
-	else if (param.is_int_register())
-		emit_xor_r32_r32(dst, reg, param.ireg());                                       // xor   reg,param
-}
-
-
-//-------------------------------------------------
-//  emit_xor_m32_p32 - xor operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_xor_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			emit_not_m32(dst, memref);                                              // not   [dest]
-		else
-			emit_xor_m32_imm(dst, memref, param.immediate());                               // xor   [dest],param
-	}
-	else
-	{
-		int reg = param.select_register(REG_EAX);
-		emit_mov_r32_p32(dst, reg, param);                                      // mov   reg,param
-		emit_xor_m32_r32(dst, memref, reg);                                         // xor   [dest],reg
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_shl_r32_p32 - shl operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_shl_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_shl_r32_imm(dst, reg, param.immediate());                                  // shl   reg,param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_shl_r32_cl(dst, reg);                                                      // shl   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_shl_m32_p32 - shl operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_shl_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_shl_m32_imm(dst, memref, param.immediate());                               // shl   [dest],param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_shl_m32_cl(dst, memref);                                               // shl   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_shr_r32_p32 - shr operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_shr_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_shr_r32_imm(dst, reg, param.immediate());                                  // shr   reg,param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_shr_r32_cl(dst, reg);                                                      // shr   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_shr_m32_p32 - shr operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_shr_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_shr_m32_imm(dst, memref, param.immediate());                               // shr   [dest],param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_shr_m32_cl(dst, memref);                                               // shr   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_sar_r32_p32 - sar operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_sar_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_sar_r32_imm(dst, reg, param.immediate());                                  // sar   reg,param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_sar_r32_cl(dst, reg);                                                      // sar   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_sar_m32_p32 - sar operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_sar_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_sar_m32_imm(dst, memref, param.immediate());                               // sar   [dest],param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_sar_m32_cl(dst, memref);                                               // sar   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rol_r32_p32 - rol operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_rol_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rol_r32_imm(dst, reg, param.immediate());                                  // rol   reg,param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_rol_r32_cl(dst, reg);                                                      // rol   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rol_m32_p32 - rol operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_rol_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rol_m32_imm(dst, memref, param.immediate());                               // rol   [dest],param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_rol_m32_cl(dst, memref);                                               // rol   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_ror_r32_p32 - ror operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_ror_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_ror_r32_imm(dst, reg, param.immediate());                                  // ror   reg,param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_ror_r32_cl(dst, reg);                                                      // ror   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_ror_m32_p32 - ror operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_ror_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_ror_m32_imm(dst, memref, param.immediate());                               // ror   [dest],param
-	}
-	else
-	{
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_ror_m32_cl(dst, memref);                                               // ror   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rcl_r32_p32 - rcl operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_rcl_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rcl_r32_imm(dst, reg, param.immediate());                                  // rcl   reg,param
-	}
-	else
-	{
-		emit_mov_r32_p32_keepflags(dst, REG_ECX, param);                            // mov   ecx,param
-		emit_rcl_r32_cl(dst, reg);                                                      // rcl   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rcl_m32_p32 - rcl operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_rcl_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rcl_m32_imm(dst, memref, param.immediate());                               // rcl   [dest],param
-	}
-	else
-	{
-		emit_mov_r32_p32_keepflags(dst, REG_ECX, param);                            // mov   ecx,param
-		emit_rcl_m32_cl(dst, memref);                                               // rcl   [dest],cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rcr_r32_p32 - rcr operation to a 32-bit
-//  register from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_rcr_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rcr_r32_imm(dst, reg, param.immediate());                                  // rcr   reg,param
-	}
-	else
-	{
-		emit_mov_r32_p32_keepflags(dst, REG_ECX, param);                            // mov   ecx,param
-		emit_rcr_r32_cl(dst, reg);                                                      // rcr   reg,cl
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_rcr_m32_p32 - rcr operation to a 32-bit
-//  memory location from a 32-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_rcr_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	if (param.is_immediate())
-	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			;// skip
-		else
-			emit_rcr_m32_imm(dst, memref, param.immediate());                               // rcr   [dest],param
-	}
-	else
-	{
-		emit_mov_r32_p32_keepflags(dst, REG_ECX, param);                            // mov   ecx,param
-		emit_rcr_m32_cl(dst, memref);                                               // rcr   [dest],cl
-	}
-}
-
-
-
-//**************************************************************************
-//  EMITTERS FOR 64-BIT OPERATIONS WITH PARAMETERS
-//**************************************************************************
-
-//-------------------------------------------------
-//  emit_mov_r64_p64 - move a 64-bit parameter
-//  into a pair of registers
-//-------------------------------------------------
-
-void drcbe_x86::emit_mov_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param)
-{
-	if (param.is_immediate())
-	{
-		if (reglo == REG_NONE)
-			;
-		else if ((uint32_t)param.immediate() == 0)
-			emit_xor_r32_r32(dst, reglo, reglo);                                        // xor   reglo,reglo
-		else
-			emit_mov_r32_imm(dst, reglo, param.immediate());                                    // mov   reglo,param
-		if (reghi == REG_NONE)
-			;
-		else if ((uint32_t)(param.immediate() >> 32) == 0)
-			emit_xor_r32_r32(dst, reghi, reghi);                                        // xor   reghi,reghi
-		else
-			emit_mov_r32_imm(dst, reghi, param.immediate() >> 32);                          // mov   reghi,param >> 32
-	}
-	else if (param.is_memory())
-	{
-		int skip_lower = can_skip_lower_load(dst, (uint32_t *)((uintptr_t)param.memory()), reglo);
-		int skip_upper = can_skip_upper_load(dst, (uint32_t *)((uintptr_t)param.memory(4)), reghi);
-		if (reglo != REG_NONE && !skip_lower)
-			emit_mov_r32_m32(dst, reglo, MABS(param.memory()));                         // mov   reglo,[param]
-		if (reghi != REG_NONE && !skip_upper)
-			emit_mov_r32_m32(dst, reghi, MABS(param.memory(4)));                        // mov   reghi,[param+4]
-	}
-	else if (param.is_int_register())
-	{
-		int skip_upper = can_skip_upper_load(dst, m_reghi[param.ireg()], reghi);
-		if (reglo != REG_NONE && reglo != param.ireg())
-			emit_mov_r32_r32(dst, reglo, param.ireg());                                 // mov   reglo,param
-		if (reghi != REG_NONE && !skip_upper)
-			emit_mov_r32_m32(dst, reghi, MABS(m_reghi[param.ireg()]));              // mov   reghi,reghi[param]
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_mov_r64_p64_keepflags - move a 64-bit
-//  parameter into a pair of registers without
-//  affecting any flags
-//-------------------------------------------------
-
-void drcbe_x86::emit_mov_r64_p64_keepflags(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param)
-{
-	if (param.is_immediate())
-	{
-		if (reglo != REG_NONE)
-			emit_mov_r32_imm(dst, reglo, param.immediate());                                    // mov   reglo,param
-		if (reghi != REG_NONE)
-			emit_mov_r32_imm(dst, reghi, param.immediate() >> 32);                          // mov   reghi,param >> 32
-	}
-	else if (param.is_memory())
-	{
-		int skip_lower = can_skip_lower_load(dst, (uint32_t *)((uintptr_t)param.memory()), reglo);
-		int skip_upper = can_skip_upper_load(dst, (uint32_t *)((uintptr_t)param.memory(4)), reghi);
-		if (reglo != REG_NONE && !skip_lower)
-			emit_mov_r32_m32(dst, reglo, MABS(param.memory()));                         // mov   reglo,[param]
-		if (reghi != REG_NONE && !skip_upper)
-			emit_mov_r32_m32(dst, reghi, MABS(param.memory(4)));                        // mov   reghi,[param+4]
-	}
-	else if (param.is_int_register())
-	{
-		int skip_upper = can_skip_upper_load(dst, m_reghi[param.ireg()], reghi);
-		if (reglo != REG_NONE && reglo != param.ireg())
-			emit_mov_r32_r32(dst, reglo, param.ireg());                                 // mov   reglo,param
-		if (reghi != REG_NONE && !skip_upper)
-			emit_mov_r32_m32(dst, reghi, MABS(m_reghi[param.ireg()]));              // mov   reghi,reghi[param]
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_mov_m64_p64 - move a 64-bit parameter
-//  into a memory location
-//-------------------------------------------------
-
-void drcbe_x86::emit_mov_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param)
-{
-	if (param.is_immediate())
-	{
-		emit_mov_m32_imm(dst, memref + 0, param.immediate());                               // mov   [mem],param
-		emit_mov_m32_imm(dst, memref + 4, param.immediate() >> 32);                     // mov   [mem],param >> 32
-	}
-	else if (param.is_memory())
-	{
-		int skip_lower = can_skip_lower_load(dst, (uint32_t *)((uintptr_t)param.memory()), REG_EAX);
-		if (!skip_lower)
-			emit_mov_r32_m32(dst, REG_EAX, MABS(param.memory()));                           // mov   eax,[param]
-		emit_mov_m32_r32(dst, memref + 0, REG_EAX);                                 // mov   [mem],eax
-		emit_mov_r32_m32(dst, REG_EAX, MABS(param.memory(4)));                          // mov   eax,[param+4]
-		emit_mov_m32_r32(dst, memref + 4, REG_EAX);                                 // mov   [mem+4],eax
-	}
-	else if (param.is_int_register())
-	{
-		emit_mov_m32_r32(dst, memref + 0, param.ireg());                                // mov   [mem],param
-		emit_mov_r32_m32(dst, REG_EAX, MABS(m_reghi[param.ireg()]));                // mov   eax,[param.hi]
-		emit_mov_m32_r32(dst, memref + 4, REG_EAX);                                 // mov   [mem+4],eax
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_mov_p64_r64 - move a pair of registers
-//  into a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_mov_p64_r64(x86code *&dst, const be_parameter &param, uint8_t reglo, uint8_t reghi)
-{
-	assert(!param.is_immediate());
-	if (param.is_memory())
-	{
-		emit_mov_m32_r32(dst, MABS(param.memory()), reglo);                             // mov   [param],reglo
-		emit_mov_m32_r32(dst, MABS(param.memory(4)), reghi);                            // mov   [param+4],reghi
-	}
-	else if (param.is_int_register())
-	{
-		if (reglo != param.ireg())
-			emit_mov_r32_r32(dst, param.ireg(), reglo);                                 // mov   param,reglo
-		emit_mov_m32_r32(dst, MABS(m_reghi[param.ireg()]), reghi);                  // mov   reghi[param],reghi
-	}
-	set_last_lower_reg(dst, param, reglo);
-	set_last_upper_reg(dst, param, reghi);
-}
-
-
-//-------------------------------------------------
-//  emit_add_r64_p64 - add operation to a 64-bit
-//  pair of registers from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_add_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
-{
-	int saveflags = ((inst.flags() & FLAG_Z) != 0);
-	if (param.is_memory())
-	{
-		emit_add_r32_m32(dst, reglo, MABS(param.memory()));                             // add   reglo,[param]
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_adc_r32_m32(dst, reghi, MABS(param.memory(4)));                            // adc   reghi,[param]
-	}
-	else if (param.is_immediate())
-	{
-		emit_add_r32_imm(dst, reglo, param.immediate());                                        // add   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_adc_r32_imm(dst, reghi, param.immediate() >> 32);                              // adc   reghi,param >> 32
-	}
-	else if (param.is_int_register())
-	{
-		emit_add_r32_r32(dst, reglo, param.ireg());                                     // add   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_adc_r32_m32(dst, reghi, MABS(m_reghi[param.ireg()]));                  // adc   reghi,reghi[param]
-	}
-	if (saveflags)
-		emit_combine_z_flags(dst);
-}
-
-
-//-------------------------------------------------
-//  emit_add_m64_p64 - add operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_add_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	int saveflags = ((inst.flags() & FLAG_Z) != 0);
-	if (param.is_immediate())
-	{
-		emit_add_m32_imm(dst, memref, param.immediate());                                   // add   [dest],param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_adc_m32_imm(dst, memref + 4, param.immediate() >> 32);                     // adc   [dest+4],param >> 32
-	}
-	else
-	{
-		int reglo = (param.is_int_register()) ? param.ireg() : REG_EAX;
-		emit_mov_r64_p64(dst, reglo, REG_EDX, param);                           // mov   edx:reglo,param
-		emit_add_m32_r32(dst, memref, reglo);                                       // add   [dest],reglo
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_adc_m32_r32(dst, memref + 4, REG_EDX);                                 // adc   [dest+4],edx
-	}
-	if (saveflags)
-		emit_combine_z_flags(dst);
-}
-
-
-//-------------------------------------------------
-//  emit_adc_r64_p64 - adc operation to a 64-bit
-//  pair of registers from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_adc_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
-{
-	int saveflags = ((inst.flags() & FLAG_Z) != 0);
-	if (param.is_memory())
-	{
-		emit_adc_r32_m32(dst, reglo, MABS(param.memory()));                             // adc   reglo,[param]
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_adc_r32_m32(dst, reghi, MABS(param.memory(4)));                            // adc   reghi,[param]
-	}
-	else if (param.is_immediate())
-	{
-		emit_adc_r32_imm(dst, reglo, param.immediate());                                        // adc   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_adc_r32_imm(dst, reghi, param.immediate() >> 32);                              // adc   reghi,param >> 32
-	}
-	else if (param.is_int_register())
-	{
-		emit_adc_r32_r32(dst, reglo, param.ireg());                                     // adc   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_adc_r32_m32(dst, reghi, MABS(m_reghi[param.ireg()]));                  // adc   reghi,reghi[param]
-	}
-	if (saveflags)
-		emit_combine_z_flags(dst);
-}
-
-
-//-------------------------------------------------
-//  emit_adc_m64_p64 - adc operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_adc_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	int saveflags = ((inst.flags() & FLAG_Z) != 0);
-	if (param.is_immediate())
-	{
-		emit_adc_m32_imm(dst, memref, param.immediate());                                   // adc   [dest],param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_adc_m32_imm(dst, memref + 4, param.immediate() >> 32);                     // adc   [dest+4],param >> 32
-	}
-	else
-	{
-		int reglo = (param.is_int_register()) ? param.ireg() : REG_EAX;
-		emit_mov_r64_p64_keepflags(dst, reglo, REG_EDX, param);                 // mov   edx:reglo,param
-		emit_adc_m32_r32(dst, memref, reglo);                                       // adc   [dest],reglo
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_adc_m32_r32(dst, memref + 4, REG_EDX);                                 // adc   [dest+4],edx
-	}
-	if (saveflags)
-		emit_combine_z_flags(dst);
-}
-
-
-//-------------------------------------------------
-//  emit_sub_r64_p64 - sub operation to a 64-bit
-//  pair of registers from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_sub_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
-{
-	int saveflags = ((inst.flags() & FLAG_Z) != 0);
-	if (param.is_memory())
-	{
-		emit_sub_r32_m32(dst, reglo, MABS(param.memory()));                             // sub   reglo,[param]
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sbb_r32_m32(dst, reghi, MABS(param.memory(4)));                            // sbb   reghi,[param]
-	}
-	else if (param.is_immediate())
-	{
-		emit_sub_r32_imm(dst, reglo, param.immediate());                                        // sub   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sbb_r32_imm(dst, reghi, param.immediate() >> 32);                              // sbb   reghi,param >> 32
-	}
-	else if (param.is_int_register())
-	{
-		emit_sub_r32_r32(dst, reglo, param.ireg());                                     // sub   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sbb_r32_m32(dst, reghi, MABS(m_reghi[param.ireg()]));                  // sbb   reghi,reghi[param]
-	}
-	if (saveflags)
-		emit_combine_z_flags(dst);
-}
-
-
-//-------------------------------------------------
-//  emit_sub_m64_p64 - sub operation to a 64-bit
-//  memory location from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_sub_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
-{
-	int saveflags = ((inst.flags() & FLAG_Z) != 0);
-	if (param.is_immediate())
-	{
-		emit_sub_m32_imm(dst, memref, param.immediate());                                   // sub   [dest],param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sbb_m32_imm(dst, memref + 4, param.immediate() >> 32);                     // sbb   [dest+4],param >> 32
-	}
-	else
-	{
-		int reglo = (param.is_int_register()) ? param.ireg() : REG_EAX;
-		emit_mov_r64_p64(dst, reglo, REG_EDX, param);                           // mov   edx:reglo,param
-		emit_sub_m32_r32(dst, memref, reglo);                                       // sub   [dest],reglo
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sbb_m32_r32(dst, memref + 4, REG_EDX);                                 // sbb   [dest+4],edx
-	}
-	if (saveflags)
-		emit_combine_z_flags(dst);
-}
-
-
-//-------------------------------------------------
-//  emit_sbb_r64_p64 - sbb operation to a 64-bit
-//  pair of registers from a 64-bit parameter
-//-------------------------------------------------
-
-void drcbe_x86::emit_sbb_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
-{
-	int saveflags = ((inst.flags() & FLAG_Z) != 0);
-	if (param.is_memory())
-	{
-		emit_sbb_r32_m32(dst, reglo, MABS(param.memory()));                             // sbb   reglo,[param]
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sbb_r32_m32(dst, reghi, MABS(param.memory(4)));                            // sbb   reghi,[param]
-	}
-	else if (param.is_immediate())
-	{
-		emit_sbb_r32_imm(dst, reglo, param.immediate());                                        // sbb   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sbb_r32_imm(dst, reghi, param.immediate() >> 32);                              // sbb   reghi,param >> 32
-	}
-	else if (param.is_int_register())
+	Operand shift = cl;
+	if (param.is_immediate())
 	{
-		emit_sbb_r32_r32(dst, reglo, param.ireg());                                     // sbb   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sbb_r32_m32(dst, reghi, MABS(m_reghi[param.ireg()]));                  // sbb   reghi,reghi[param]
+		if (optimize(a, dst, param))
+			return;
+
+		shift = imm(param.immediate());
 	}
-	if (saveflags)
-		emit_combine_z_flags(dst);
+	else
+		emit_mov_r32_p32(a, ecx, param);
+
+	a.emit(opcode, dst, shift);
 }
 
 
+
+//**************************************************************************
+//  EMITTERS FOR 64-BIT OPERATIONS WITH PARAMETERS
+//**************************************************************************
+
 //-------------------------------------------------
-//  emit_sbb_m64_p64 - sbb operation to a 64-bit
-//  memory location from a 64-bit parameter
+//  emit_mov_r64_p64 - move a 64-bit parameter
+//  into a pair of registers
 //-------------------------------------------------
 
-void drcbe_x86::emit_sbb_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_mov_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param)
 {
-	int saveflags = ((inst.flags() & FLAG_Z) != 0);
 	if (param.is_immediate())
 	{
-		emit_sbb_m32_imm(dst, memref, param.immediate());                                   // sbb   [dest],param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sbb_m32_imm(dst, memref + 4, param.immediate() >> 32);                     // sbb   [dest+4],param >> 32
+		if (!reglo.isValid())
+			;
+		else if (u32(param.immediate()) == 0)
+			a.xor_(reglo, reglo);                                                       // xor   reglo,reglo
+		else
+			a.mov(reglo, param.immediate());                                            // mov   reglo,param
+		if (!reghi.isValid())
+			;
+		else if (u32(param.immediate() >> 32) == 0)
+			a.xor_(reghi, reghi);                                                       // xor   reghi,reghi
+		else
+			a.mov(reghi, param.immediate() >> 32);                                      // mov   reghi,param >> 32
+	}
+	else if (param.is_memory())
+	{
+		int skip_lower = can_skip_lower_load(a, (uint32_t *)((uintptr_t)param.memory(0)), reglo);
+		int skip_upper = can_skip_upper_load(a, (uint32_t *)((uintptr_t)param.memory(4)), reghi);
+		if (reglo.isValid() && !skip_lower)
+			a.mov(reglo, MABS(param.memory(0)));                                        // mov   reglo,[param]
+		if (reghi.isValid() && !skip_upper)
+			a.mov(reghi, MABS(param.memory(4)));                                        // mov   reghi,[param+4]
 	}
-	else
+	else if (param.is_int_register())
 	{
-		int reglo = (param.is_int_register()) ? param.ireg() : REG_EAX;
-		emit_mov_r64_p64_keepflags(dst, reglo, REG_EDX, param);                 // mov   edx:reglo,param
-		emit_sbb_m32_r32(dst, memref, reglo);                                       // sbb   [dest],reglo
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sbb_m32_r32(dst, memref + 4, REG_EDX);                                 // sbb   [dest+4],edx
+		int skip_upper = can_skip_upper_load(a, m_reghi[param.ireg()], reghi);
+		if (reglo.isValid() && reglo.id() != param.ireg())
+			a.mov(reglo, Gpd(param.ireg()));                                            // mov   reglo,param
+		if (reghi.isValid() && !skip_upper)
+			a.mov(reghi, MABS(m_reghi[param.ireg()]));                                  // mov   reghi,reghi[param]
 	}
-	if (saveflags)
-		emit_combine_z_flags(dst);
 }
 
 
 //-------------------------------------------------
-//  emit_cmp_r64_p64 - sub operation to a 64-bit
-//  pair of registers from a 64-bit parameter
+//  emit_mov_r64_p64_keepflags - move a 64-bit
+//  parameter into a pair of registers without
+//  affecting any flags
 //-------------------------------------------------
 
-void drcbe_x86::emit_cmp_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_mov_r64_p64_keepflags(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param)
 {
-	int saveflags = (inst.flags() != FLAG_Z && (inst.flags() & FLAG_Z) != 0);
-	if (param.is_memory())
+	if (param.is_immediate())
 	{
-		emit_sub_r32_m32(dst, reglo, MABS(param.memory()));                             // sub   reglo,[param]
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sbb_r32_m32(dst, reghi, MABS(param.memory(4)));                            // sbb   reghi,[param]
+		if (reglo.isValid())
+			a.mov(reglo, param.immediate());                                            // mov   reglo,param
+		if (reghi.isValid())
+			a.mov(reghi, param.immediate() >> 32);                                      // mov   reghi,param >> 32
 	}
-	else if (param.is_immediate())
+	else if (param.is_memory())
 	{
-		emit_sub_r32_imm(dst, reglo, param.immediate());                                        // sub   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sbb_r32_imm(dst, reghi, param.immediate() >> 32);                              // sbb   reghi,param >> 32
+		int skip_lower = can_skip_lower_load(a, (uint32_t *)((uintptr_t)param.memory(0)), reglo);
+		int skip_upper = can_skip_upper_load(a, (uint32_t *)((uintptr_t)param.memory(4)), reghi);
+		if (reglo.isValid() && !skip_lower)
+			a.mov(reglo, MABS(param.memory(0)));                                        // mov   reglo,[param]
+		if (reghi.isValid() && !skip_upper)
+			a.mov(reghi, MABS(param.memory(4)));                                        // mov   reghi,[param+4]
 	}
 	else if (param.is_int_register())
 	{
-		emit_sub_r32_r32(dst, reglo, param.ireg());                                     // sub   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sbb_r32_m32(dst, reghi, MABS(m_reghi[param.ireg()]));                  // sbb   reghi,reghi[param]
-	}
-	if (inst.flags() == FLAG_Z)
-		emit_or_r32_r32(dst, reghi, reglo);                                             // or    reghi,reglo
-	else if (saveflags)
-		emit_combine_z_flags(dst);
+		int skip_upper = can_skip_upper_load(a, m_reghi[param.ireg()], reghi);
+		if (reglo.isValid() && reglo.id() != param.ireg())
+			a.mov(reglo, Gpd(param.ireg()));                                            // mov   reglo,param
+		if (reghi.isValid() && !skip_upper)
+			a.mov(reghi, MABS(m_reghi[param.ireg()]));                                  // mov   reghi,reghi[param]
+	}
 }
 
 
 //-------------------------------------------------
-//  emit_and_r64_p64 - and operation to a 64-bit
-//  pair of registers from a 64-bit parameter
+//  emit_mov_m64_p64 - move a 64-bit parameter
+//  into a memory location
 //-------------------------------------------------
 
-void drcbe_x86::emit_and_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_mov_m64_p64(Assembler &a, Mem const &memref, be_parameter const &param)
 {
-	int saveflags = ((inst.flags() & FLAG_Z) != 0);
-	if (param.is_memory())
+	Mem memref_lo = memref.cloneAdjusted(0); memref_lo.setSize(4);
+	Mem memref_hi = memref.cloneAdjusted(4); memref_hi.setSize(4);
+
+	if (param.is_immediate())
 	{
-		emit_and_r32_m32(dst, reglo, MABS(param.memory()));                             // and   reglo,[param]
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_and_r32_m32(dst, reghi, MABS(param.memory(4)));                            // and   reghi,[param]
+		a.mov(memref_lo, param.immediate());                                            // mov   [mem],param
+		a.mov(memref_hi, param.immediate() >> 32);                                      // mov   [mem],param >> 32
 	}
-	else if (param.is_immediate())
+	else if (param.is_memory())
 	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			emit_xor_r32_r32(dst, reglo, reglo);                                        // xor   reglo,reglo
-		else
-			emit_and_r32_imm(dst, reglo, param.immediate());                                    // and   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		if (inst.flags() == 0 && (uint32_t)(param.immediate() >> 32) == 0xffffffff)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)(param.immediate() >> 32) == 0)
-			emit_xor_r32_r32(dst, reghi, reghi);                                        // xor   reghi,reghi
-		else
-			emit_and_r32_imm(dst, reghi, param.immediate() >> 32);                          // and   reghi,param >> 32
+		int skip_lower = can_skip_lower_load(a, (uint32_t *)((uintptr_t)param.memory()), eax);
+		if (!skip_lower)
+			a.mov(eax, MABS(param.memory(0)));                                          // mov   eax,[param]
+		a.mov(memref_lo, eax);                                                          // mov   [mem],eax
+		a.mov(eax, MABS(param.memory(4)));                                              // mov   eax,[param+4]
+		a.mov(memref_hi, eax);                                                          // mov   [mem+4],eax
 	}
 	else if (param.is_int_register())
 	{
-		emit_and_r32_r32(dst, reglo, param.ireg());                                     // and   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_and_r32_m32(dst, reghi, MABS(m_reghi[param.ireg()]));                  // and   reghi,reghi[param]
+		a.mov(memref_lo, Gpd(param.ireg()));                                            // mov   [mem],param
+		a.mov(eax, MABS(m_reghi[param.ireg()]));                                        // mov   eax,[param.hi]
+		a.mov(memref_hi, eax);                                                          // mov   [mem+4],eax
 	}
-	if (saveflags)
-		emit_combine_z_flags(dst);
 }
 
 
 //-------------------------------------------------
-//  emit_and_m64_p64 - and operation to a 64-bit
-//  memory location from a 64-bit parameter
+//  emit_mov_p64_r64 - move a pair of registers
+//  into a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_and_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_mov_p64_r64(Assembler &a, be_parameter const &param, Gp const &reglo, Gp const &reghi)
 {
-	int saveflags = ((inst.flags() & FLAG_Z) != 0);
-	if (param.is_immediate())
+	assert(!param.is_immediate());
+	if (param.is_memory())
 	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
-			emit_mov_m32_imm(dst, memref, 0);                                       // mov   [dest],0
-		else
-			emit_and_m32_imm(dst, memref, param.immediate());                               // and   [dest],param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		if (inst.flags() == 0 && (uint32_t)(param.immediate() >> 32) == 0xffffffff)
-			;// skip
-		else if (inst.flags() == 0 && (uint32_t)(param.immediate() >> 32) == 0)
-			emit_mov_m32_imm(dst, memref + 4, 0);                                   // mov   [dest+4],0
-		else
-			emit_and_m32_imm(dst, memref + 4, param.immediate() >> 32);                 // and   [dest+4],param >> 32
+		a.mov(MABS(param.memory(0)), reglo);                                            // mov   [param],reglo
+		a.mov(MABS(param.memory(4)), reghi);                                            // mov   [param+4],reghi
 	}
-	else
+	else if (param.is_int_register())
 	{
-		int reglo = (param.is_int_register()) ? param.ireg() : REG_EAX;
-		emit_mov_r64_p64(dst, reglo, REG_EDX, param);                           // mov   edx:reglo,param
-		emit_and_m32_r32(dst, memref, reglo);                                       // and   [dest],reglo
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_and_m32_r32(dst, memref + 4, REG_EDX);                                 // and   [dest+4],edx
+		if (reglo.id() != param.ireg())
+			a.mov(Gpd(param.ireg()), reglo);                                            // mov   param,reglo
+		a.mov(MABS(m_reghi[param.ireg()]), reghi);                                      // mov   reghi[param],reghi
 	}
-	if (saveflags)
-		emit_combine_z_flags(dst);
+	set_last_lower_reg(a, param, reglo);
+	set_last_upper_reg(a, param, reghi);
 }
 
 
 //-------------------------------------------------
-//  emit_test_r64_p64 - test operation to a 64-bit
+//  emit_and_r64_p64 - and operation to a 64-bit
 //  pair of registers from a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_test_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_and_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const instruction &inst)
 {
 	int saveflags = ((inst.flags() & FLAG_Z) != 0);
 	if (param.is_memory())
 	{
-		emit_test_m32_r32(dst, MABS(param.memory()), reglo);                                // test  [param],reglo
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_test_m32_r32(dst, MABS(param.memory(4)), reghi);                           // test  [param],reghi
+		a.and_(reglo, MABS(param.memory(0)));                                           // and   reglo,[param]
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.and_(reghi, MABS(param.memory(4)));                                           // and   reghi,[param]
 	}
 	else if (param.is_immediate())
 	{
-		emit_test_r32_imm(dst, reglo, param.immediate());                                   // test  reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_test_r32_imm(dst, reghi, param.immediate() >> 32);                             // test  reghi,param >> 32
+		if (!inst.flags() && u32(param.immediate()) == 0xffffffffU)
+			;// skip
+		else if (!inst.flags() && u32(param.immediate()) == 0)
+			a.xor_(reglo, reglo);                                                       // xor   reglo,reglo
+		else
+			a.and_(reglo, param.immediate());                                           // and   reglo,param
+		if (saveflags) a.pushfd();                                                      // pushf
+		if (!inst.flags() && u32(param.immediate() >> 32) == 0xffffffffU)
+			;// skip
+		else if (!inst.flags() && u32(param.immediate() >> 32) == 0)
+			a.xor_(reghi, reghi);                                                       // xor   reghi,reghi
+		else
+			a.and_(reghi, param.immediate() >> 32);                                     // and   reghi,param >> 32
 	}
 	else if (param.is_int_register())
 	{
-		emit_test_r32_r32(dst, reglo, param.ireg());                                    // test  reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_test_m32_r32(dst, MABS(m_reghi[param.ireg()]), reghi);             // test  reghi[param],reghi
+		a.and_(reglo, Gpd(param.ireg()));                                               // and   reglo,param
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.and_(reghi, MABS(m_reghi[param.ireg()]));                                     // and   reghi,reghi[param]
 	}
 	if (saveflags)
-		emit_combine_z_flags(dst);
+		emit_combine_z_flags(a);
 }
 
 
 //-------------------------------------------------
-//  emit_test_m64_p64 - test operation to a 64-bit
+//  emit_and_m64_p64 - and operation to a 64-bit
 //  memory location from a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_test_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_and_m64_p64(Assembler &a, Mem const &memref_lo, Mem const &memref_hi, be_parameter const &param, const instruction &inst)
 {
 	int saveflags = ((inst.flags() & FLAG_Z) != 0);
 	if (param.is_immediate())
 	{
-		emit_test_m32_imm(dst, memref, param.immediate());                              // test   [dest],param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_test_m32_imm(dst, memref + 4, param.immediate() >> 32);                        // test   [dest+4],param >> 32
+		if (!inst.flags() && u32(param.immediate()) == 0xffffffffU)
+			;// skip
+		else if (!inst.flags() && u32(param.immediate()) == 0)
+			a.mov(memref_lo, 0);                                                        // mov   [dest],0
+		else
+			a.and_(memref_lo, param.immediate());                                       // and   [dest],param
+		if (saveflags) a.pushfd();                                                      // pushf
+		if (!inst.flags() && u32(param.immediate() >> 32) == 0xffffffffU)
+			;// skip
+		else if (!inst.flags() && u32(param.immediate() >> 32) == 0)
+			a.mov(memref_hi, 0);                                                        // mov   [dest+4],0
+		else
+			a.and_(memref_hi, param.immediate() >> 32);                                 // and   [dest+4],param >> 32
 	}
 	else
 	{
-		int reglo = (param.is_int_register()) ? param.ireg() : REG_EAX;
-		emit_mov_r64_p64(dst, reglo, REG_EDX, param);                           // mov   edx:reglo,param
-		emit_test_m32_r32(dst, memref, reglo);                                      // test  [dest],reglo
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_test_m32_r32(dst, memref + 4, REG_EDX);                                    // test  [dest+4],edx
+		Gp const reglo = (param.is_int_register()) ? Gpd(param.ireg()) : eax;
+		emit_mov_r64_p64(a, reglo, edx, param);                                         // mov   edx:reglo,param
+		a.and_(memref_lo, reglo);                                                       // and   [dest],reglo
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.and_(memref_hi, edx);                                                         // and   [dest+4],edx
 	}
 	if (saveflags)
-		emit_combine_z_flags(dst);
+		emit_combine_z_flags(a);
 }
 
 
@@ -2154,39 +1260,39 @@
 //  pair of registers from a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_or_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_or_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const instruction &inst)
 {
 	int saveflags = ((inst.flags() & FLAG_Z) != 0);
 	if (param.is_memory())
 	{
-		emit_or_r32_m32(dst, reglo, MABS(param.memory()));                              // or    reglo,[param]
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_or_r32_m32(dst, reghi, MABS(param.memory(4)));                         // or    reghi,[param]
+		a.or_(reglo, MABS(param.memory(0)));                                            // or    reglo,[param]
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.or_(reghi, MABS(param.memory(4)));                                            // or    reghi,[param]
 	}
 	else if (param.is_immediate())
 	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
+		if (!inst.flags() && u32(param.immediate()) == 0)
 			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			emit_mov_r32_imm(dst, reglo, ~0);                                           // mov   reglo,-1
+		else if (!inst.flags() && u32(param.immediate()) == 0xffffffffU)
+			a.mov(reglo, ~0);                                                           // mov   reglo,-1
 		else
-			emit_or_r32_imm(dst, reglo, param.immediate());                                 // or    reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		if (inst.flags() == 0 && (uint32_t)(param.immediate() >> 32) == 0)
+			a.or_(reglo, param.immediate());                                            // or    reglo,param
+		if (saveflags) a.pushfd();                                                      // pushf
+		if (!inst.flags() && u32(param.immediate() >> 32) == 0)
 			;// skip
-		else if (inst.flags() == 0 && (uint32_t)(param.immediate() >> 32) == 0xffffffff)
-			emit_mov_r32_imm(dst, reghi, ~0);                                           // mov   reghi,-1
+		else if (!inst.flags() && u32(param.immediate() >> 32) == 0xffffffffU)
+			a.mov(reghi, ~0);                                                           // mov   reghi,-1
 		else
-			emit_or_r32_imm(dst, reghi, param.immediate() >> 32);                           // or    reghi,param >> 32
+			a.or_(reghi, param.immediate() >> 32);                                      // or    reghi,param >> 32
 	}
 	else if (param.is_int_register())
 	{
-		emit_or_r32_r32(dst, reglo, param.ireg());                                      // or    reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_or_r32_m32(dst, reghi, MABS(m_reghi[param.ireg()]));                   // or    reghi,reghi[param]
+		a.or_(reglo, Gpd(param.ireg()));                                                // or    reglo,param
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.or_(reghi, MABS(m_reghi[param.ireg()]));                                      // or    reghi,reghi[param]
 	}
 	if (saveflags)
-		emit_combine_z_flags(dst);
+		emit_combine_z_flags(a);
 }
 
 
@@ -2195,35 +1301,35 @@
 //  memory location from a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_or_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_or_m64_p64(Assembler &a, Mem const &memref_lo, Mem const &memref_hi, be_parameter const &param, const instruction &inst)
 {
 	int saveflags = ((inst.flags() & FLAG_Z) != 0);
 	if (param.is_immediate())
 	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
+		if (!inst.flags() && u32(param.immediate()) == 0)
 			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			emit_mov_m32_imm(dst, memref, ~0);                                      // mov   [dest],-1
+		else if (!inst.flags() && u32(param.immediate()) == 0xffffffffU)
+			a.mov(memref_lo, ~0);                                                       // mov   [dest],-1
 		else
-			emit_or_m32_imm(dst, memref, param.immediate());                                // or    [dest],param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		if (inst.flags() == 0 && (uint32_t)(param.immediate() >> 32) == 0)
+			a.or_(memref_lo, param.immediate());                                        // or    [dest],param
+		if (saveflags) a.pushfd();                                                      // pushf
+		if (!inst.flags() && u32(param.immediate() >> 32) == 0)
 			;// skip
-		else if (inst.flags() == 0 && (uint32_t)(param.immediate() >> 32) == 0xffffffff)
-			emit_mov_m32_imm(dst, memref + 4, ~0);                                  // mov   [dest+4],-1
+		else if (!inst.flags() && u32(param.immediate() >> 32) == 0xffffffffU)
+			a.mov(memref_hi, ~0);                                                       // mov   [dest+4],-1
 		else
-			emit_or_m32_imm(dst, memref + 4, param.immediate() >> 32);                  // or    [dest+4],param >> 32
+			a.or_(memref_hi, param.immediate() >> 32);                                  // or    [dest+4],param >> 32
 	}
 	else
 	{
-		int reglo = (param.is_int_register()) ? param.ireg() : REG_EAX;
-		emit_mov_r64_p64(dst, reglo, REG_EDX, param);                           // mov   edx:reglo,param
-		emit_or_m32_r32(dst, memref, reglo);                                            // or    [dest],reglo
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_or_m32_r32(dst, memref + 4, REG_EDX);                                  // or    [dest+4],edx
+		Gp const reglo = (param.is_int_register()) ? Gpd(param.ireg()) : eax;
+		emit_mov_r64_p64(a, reglo, edx, param);                                         // mov   edx:reglo,param
+		a.or_(memref_lo, reglo);                                                        // or    [dest],reglo
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.or_(memref_hi, edx);                                                          // or    [dest+4],edx
 	}
 	if (saveflags)
-		emit_combine_z_flags(dst);
+		emit_combine_z_flags(a);
 }
 
 
@@ -2232,39 +1338,39 @@
 //  pair of registers from a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_xor_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_xor_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const instruction &inst)
 {
 	int saveflags = ((inst.flags() & FLAG_Z) != 0);
 	if (param.is_memory())
 	{
-		emit_xor_r32_m32(dst, reglo, MABS(param.memory()));                             // xor   reglo,[param]
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_xor_r32_m32(dst, reghi, MABS(param.memory(4)));                            // xor   reghi,[param]
+		a.xor_(reglo, MABS(param.memory(0)));                                           // xor   reglo,[param]
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.xor_(reghi, MABS(param.memory(4)));                                           // xor   reghi,[param]
 	}
 	else if (param.is_immediate())
 	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
+		if (!inst.flags() && u32(param.immediate()) == 0)
 			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			emit_not_r32(dst, reglo);                                                   // not   reglo
+		else if (!inst.flags() && u32(param.immediate()) == 0xffffffffU)
+			a.not_(reglo);                                                              // not   reglo
 		else
-			emit_xor_r32_imm(dst, reglo, param.immediate());                                    // xor   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		if (inst.flags() == 0 && (uint32_t)(param.immediate() >> 32) == 0)
+			a.xor_(reglo, param.immediate());                                           // xor   reglo,param
+		if (saveflags) a.pushfd();                                                      // pushf
+		if (!inst.flags() && u32(param.immediate() >> 32) == 0)
 			;// skip
-		else if (inst.flags() == 0 && (uint32_t)(param.immediate() >> 32) == 0xffffffff)
-			emit_not_r32(dst, reghi);                                                   // not   reghi
+		else if (!inst.flags() && u32(param.immediate() >> 32) == 0xffffffffU)
+			a.not_(reghi);                                                              // not   reghi
 		else
-			emit_xor_r32_imm(dst, reghi, param.immediate() >> 32);                          // xor   reghi,param >> 32
+			a.xor_(reghi, param.immediate() >> 32);                                     // xor   reghi,param >> 32
 	}
 	else if (param.is_int_register())
 	{
-		emit_xor_r32_r32(dst, reglo, param.ireg());                                     // xor   reglo,param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_xor_r32_m32(dst, reghi, MABS(m_reghi[param.ireg()]));                  // xor   reghi,reghi[param]
+		a.xor_(reglo, Gpd(param.ireg()));                                               // xor   reglo,param
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.xor_(reghi, MABS(m_reghi[param.ireg()]));                                     // xor   reghi,reghi[param]
 	}
 	if (saveflags)
-		emit_combine_z_flags(dst);
+		emit_combine_z_flags(a);
 }
 
 
@@ -2273,35 +1379,35 @@
 //  memory location from a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_xor_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_xor_m64_p64(Assembler &a, Mem const &memref_lo, Mem const &memref_hi, be_parameter const &param, const instruction &inst)
 {
 	int saveflags = ((inst.flags() & FLAG_Z) != 0);
 	if (param.is_immediate())
 	{
-		if (inst.flags() == 0 && (uint32_t)param.immediate() == 0)
+		if (!inst.flags() && u32(param.immediate()) == 0)
 			;// skip
-		else if (inst.flags() == 0 && (uint32_t)param.immediate() == 0xffffffff)
-			emit_not_m32(dst, memref);                                              // not   [dest]
+		else if (!inst.flags() && u32(param.immediate()) == 0xffffffffU)
+			a.not_(memref_lo);                                                          // not   [dest]
 		else
-			emit_xor_m32_imm(dst, memref, param.immediate());                               // xor   [dest],param
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		if (inst.flags() == 0 && (uint32_t)(param.immediate() >> 32) == 0)
+			a.xor_(memref_lo, param.immediate());                                       // xor   [dest],param
+		if (saveflags) a.pushfd();                                                      // pushf
+		if (!inst.flags() && u32(param.immediate() >> 32) == 0)
 			;// skip
-		else if (inst.flags() == 0 && (uint32_t)(param.immediate() >> 32) == 0xffffffff)
-			emit_not_m32(dst, memref + 4);                                          // not   [dest+4]
+		else if (!inst.flags() && u32(param.immediate() >> 32) == 0xffffffffU)
+			a.not_(memref_hi);                                                          // not   [dest+4]
 		else
-			emit_xor_m32_imm(dst, memref + 4, param.immediate() >> 32);                 // xor   [dest+4],param >> 32
+			a.xor_(memref_hi, param.immediate() >> 32);                                 // xor   [dest+4],param >> 32
 	}
 	else
 	{
-		int reglo = (param.is_int_register()) ? param.ireg() : REG_EAX;
-		emit_mov_r64_p64(dst, reglo, REG_EDX, param);                           // mov   edx:reglo,param
-		emit_xor_m32_r32(dst, memref, reglo);                                       // xor   [dest],reglo
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_xor_m32_r32(dst, memref + 4, REG_EDX);                                 // xor   [dest+4],edx
+		Gp const reglo = (param.is_int_register()) ? Gpd(param.ireg()) : eax;
+		emit_mov_r64_p64(a, reglo, edx, param);                                         // mov   edx:reglo,param
+		a.xor_(memref_lo, reglo);                                                       // xor   [dest],reglo
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.xor_(memref_hi, edx);                                                         // xor   [dest+4],edx
 	}
 	if (saveflags)
-		emit_combine_z_flags(dst);
+		emit_combine_z_flags(a);
 }
 
 
@@ -2310,13 +1416,13 @@
 //  pair of registers from a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_shl_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_shl_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const instruction &inst)
 {
 	int saveflags = (inst.flags() != 0);
 	if (param.is_immediate())
 	{
 		int count = param.immediate() & 63;
-		if (inst.flags() == 0 && count == 0)
+		if (!inst.flags() && count == 0)
 			;// skip
 		else
 		{
@@ -2324,55 +1430,58 @@
 			{
 				if (inst.flags() != 0)
 				{
-					emit_shld_r32_r32_imm(dst, reghi, reglo, 31);                       // shld  reghi,reglo,31
-					emit_shl_r32_imm(dst, reglo, 31);                                   // shl   reglo,31
+					a.shld(reghi, reglo, 31);                                           // shld  reghi,reglo,31
+					a.shl(reglo, 31);                                                   // shl   reglo,31
 					count -= 31;
 				}
 				else
 				{
-					emit_mov_r32_r32(dst, reghi, reglo);                                // mov   reghi,reglo
-					emit_xor_r32_r32(dst, reglo, reglo);                                // xor   reglo,reglo
+					a.mov(reghi, reglo);                                                // mov   reghi,reglo
+					a.xor_(reglo, reglo);                                               // xor   reglo,reglo
 					count -= 32;
 				}
 			}
 			if (inst.flags() != 0 || count > 0)
 			{
-				emit_shld_r32_r32_imm(dst, reghi, reglo, count);                        // shld  reghi,reglo,count
-				if (saveflags) emit_pushf(dst);                                         // pushf
-				emit_shl_r32_imm(dst, reglo, count);                                    // shl   reglo,count
+				a.shld(reghi, reglo, count);                                            // shld  reghi,reglo,count
+				if (saveflags) a.pushfd();                                              // pushf
+				a.shl(reglo, count);                                                    // shl   reglo,count
 			}
 		}
 	}
 	else
 	{
-		emit_link skip1, skip2;
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_test_r32_imm(dst, REG_ECX, 0x20);                                          // test  ecx,0x20
-		emit_jcc_short_link(dst, x86emit::COND_Z, skip1);                               // jz    skip1
+		Label skip1 = a.newLabel();
+		Label skip2 = a.newLabel();
+		emit_mov_r32_p32(a, ecx, param);                                                // mov   ecx,param
+		a.test(ecx, 0x20);                                                              // test  ecx,0x20
+		a.short_().jz(skip1);                                                           // jz    skip1
 		if (inst.flags() != 0)
 		{
-			emit_sub_r32_imm(dst, REG_ECX, 31);                                         // sub   ecx,31
-			emit_shld_r32_r32_imm(dst, reghi, reglo, 31);                               // shld  reghi,reglo,31
-			emit_shl_r32_imm(dst, reglo, 31);                                           // shl   reglo,31
-			emit_test_r32_imm(dst, REG_ECX, 0x20);                                      // test  ecx,0x20
-			emit_jcc_short_link(dst, x86emit::COND_Z, skip2);                           // jz    skip2
-			emit_sub_r32_imm(dst, REG_ECX, 31);                                         // sub   ecx,31
-			emit_shld_r32_r32_imm(dst, reghi, reglo, 31);                               // shld  reghi,reglo,31
-			emit_shl_r32_imm(dst, reglo, 31);                                           // shl   reglo,31
-			track_resolve_link(dst, skip2);                                         // skip2:
+			a.sub(ecx, 31);                                                             // sub   ecx,31
+			a.shld(reghi, reglo, 31);                                                   // shld  reghi,reglo,31
+			a.shl(reglo, 31);                                                           // shl   reglo,31
+			a.test(ecx, 0x20);                                                          // test  ecx,0x20
+			a.short_().jz(skip2);                                                       // jz    skip2
+			a.sub(ecx, 31);                                                             // sub   ecx,31
+			a.shld(reghi, reglo, 31);                                                   // shld  reghi,reglo,31
+			a.shl(reglo, 31);                                                           // shl   reglo,31
+			a.bind(skip2);                                                          // skip2:
+			reset_last_upper_lower_reg();
 		}
 		else
 		{
-			emit_mov_r32_r32(dst, reghi, reglo);                                        // mov   reghi,reglo
-			emit_xor_r32_r32(dst, reglo, reglo);                                        // xor   reglo,reglo
-		}
-		track_resolve_link(dst, skip1);                                             // skip1:
-		emit_shld_r32_r32_cl(dst, reghi, reglo);                                        // shld  reghi,reglo,cl
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_shl_r32_cl(dst, reglo);                                                    // shl   reglo,cl
+			a.mov(reghi, reglo);                                                        // mov   reghi,reglo
+			a.xor_(reglo, reglo);                                                       // xor   reglo,reglo
+		}
+		a.bind(skip1);                                                              // skip1:
+		reset_last_upper_lower_reg();
+		a.shld(reghi, reglo, cl);                                                       // shld  reghi,reglo,cl
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.shl(reglo, cl);                                                               // shl   reglo,cl
 	}
 	if (saveflags)
-		emit_combine_z_shl_flags(dst);
+		emit_combine_z_shl_flags(a);
 }
 
 
@@ -2381,13 +1490,13 @@
 //  pair of registers from a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_shr_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_shr_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const instruction &inst)
 {
 	int saveflags = ((inst.flags() & FLAG_Z) != 0);
 	if (param.is_immediate())
 	{
 		int count = param.immediate() & 63;
-		if (inst.flags() == 0 && count == 0)
+		if (!inst.flags() && count == 0)
 			;// skip
 		else
 		{
@@ -2395,55 +1504,58 @@
 			{
 				if (inst.flags() != 0)
 				{
-					emit_shrd_r32_r32_imm(dst, reglo, reghi, 31);                       // shrd  reglo,reghi,31
-					emit_shr_r32_imm(dst, reghi, 31);                                   // shr   reghi,31
+					a.shrd(reglo, reghi, 31);                                           // shrd  reglo,reghi,31
+					a.shr(reghi, 31);                                                   // shr   reghi,31
 					count -= 31;
 				}
 				else
 				{
-					emit_mov_r32_r32(dst, reglo, reghi);                                // mov   reglo,reghi
-					emit_xor_r32_r32(dst, reghi, reghi);                                // xor   reghi,reghi
+					a.mov(reglo, reghi);                                                // mov   reglo,reghi
+					a.xor_(reghi, reghi);                                               // xor   reghi,reghi
 					count -= 32;
 				}
 			}
 			if (inst.flags() != 0 || count > 0)
 			{
-				emit_shrd_r32_r32_imm(dst, reglo, reghi, count);                        // shrd  reglo,reghi,count
-				if (saveflags) emit_pushf(dst);                                         // pushf
-				emit_shr_r32_imm(dst, reghi, count);                                    // shr   reghi,count
+				a.shrd(reglo, reghi, count);                                            // shrd  reglo,reghi,count
+				if (saveflags) a.pushfd();                                              // pushf
+				a.shr(reghi, count);                                                    // shr   reghi,count
 			}
 		}
 	}
 	else
 	{
-		emit_link skip1, skip2;
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_test_r32_imm(dst, REG_ECX, 0x20);                                          // test  ecx,0x20
-		emit_jcc_short_link(dst, x86emit::COND_Z, skip1);                               // jz    skip1
+		Label skip1 = a.newLabel();
+		Label skip2 = a.newLabel();
+		emit_mov_r32_p32(a, ecx, param);                                                // mov   ecx,param
+		a.test(ecx, 0x20);                                                              // test  ecx,0x20
+		a.short_().jz(skip1);                                                           // jz    skip1
 		if (inst.flags() != 0)
 		{
-			emit_sub_r32_imm(dst, REG_ECX, 31);                                         // sub   ecx,31
-			emit_shrd_r32_r32_imm(dst, reglo, reghi, 31);                               // shrd  reglo,reghi,31
-			emit_shr_r32_imm(dst, reghi, 31);                                           // shr   reghi,31
-			emit_test_r32_imm(dst, REG_ECX, 0x20);                                      // test  ecx,0x20
-			emit_jcc_short_link(dst, x86emit::COND_Z, skip2);                           // jz    skip2
-			emit_sub_r32_imm(dst, REG_ECX, 31);                                         // sub   ecx,31
-			emit_shrd_r32_r32_imm(dst, reglo, reghi, 31);                               // shrd  reglo,reghi,31
-			emit_shr_r32_imm(dst, reghi, 31);                                           // shr   reghi,31
-			track_resolve_link(dst, skip2);                                         // skip2:
+			a.sub(ecx, 31);                                                             // sub   ecx,31
+			a.shrd(reglo, reghi, 31);                                                   // shrd  reglo,reghi,31
+			a.shr(reghi, 31);                                                           // shr   reghi,31
+			a.test(ecx, 0x20);                                                          // test  ecx,0x20
+			a.short_().jz(skip2);                                                       // jz    skip2
+			a.sub(ecx, 31);                                                             // sub   ecx,31
+			a.shrd(reglo, reghi, 31);                                                   // shrd  reglo,reghi,31
+			a.shr(reghi, 31);                                                           // shr   reghi,31
+			a.bind(skip2);                                                          // skip2:
+			reset_last_upper_lower_reg();
 		}
 		else
 		{
-			emit_mov_r32_r32(dst, reglo, reghi);                                        // mov   reglo,reghi
-			emit_xor_r32_r32(dst, reghi, reghi);                                        // xor   reghi,reghi
-		}
-		track_resolve_link(dst, skip1);                                             // skip1:
-		emit_shrd_r32_r32_cl(dst, reglo, reghi);                                        // shrd  reglo,reghi,cl
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_shr_r32_cl(dst, reghi);                                                    // shr   reghi,cl
+			a.mov(reglo, reghi);                                                        // mov   reglo,reghi
+			a.xor_(reghi, reghi);                                                       // xor   reghi,reghi
+		}
+		a.bind(skip1);                                                              // skip1:
+		reset_last_upper_lower_reg();
+		a.shrd(reglo, reghi, cl);                                                       // shrd  reglo,reghi,cl
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.shr(reghi, cl);                                                               // shr   reghi,cl
 	}
 	if (saveflags)
-		emit_combine_z_flags(dst);
+		emit_combine_z_flags(a);
 }
 
 
@@ -2452,13 +1564,13 @@
 //  pair of registers from a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_sar_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_sar_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const instruction &inst)
 {
 	int saveflags = ((inst.flags() & FLAG_Z) != 0);
 	if (param.is_immediate())
 	{
 		int count = param.immediate() & 63;
-		if (inst.flags() == 0 && count == 0)
+		if (!inst.flags() && count == 0)
 			;// skip
 		else
 		{
@@ -2466,55 +1578,58 @@
 			{
 				if (inst.flags() != 0)
 				{
-					emit_shrd_r32_r32_imm(dst, reglo, reghi, 31);                       // shrd  reglo,reghi,31
-					emit_sar_r32_imm(dst, reghi, 31);                                   // sar   reghi,31
+					a.shrd(reglo, reghi, 31);                                           // shrd  reglo,reghi,31
+					a.sar(reghi, 31);                                                   // sar   reghi,31
 					count -= 31;
 				}
 				else
 				{
-					emit_mov_r32_r32(dst, reglo, reghi);                                // mov   reglo,reghi
-					emit_sar_r32_imm(dst, reghi, 31);                                   // sar   reghi,31
+					a.mov(reglo, reghi);                                                // mov   reglo,reghi
+					a.sar(reghi, 31);                                                   // sar   reghi,31
 					count -= 32;
 				}
 			}
 			if (inst.flags() != 0 || count > 0)
 			{
-				emit_shrd_r32_r32_imm(dst, reglo, reghi, count);                        // shrd  reglo,reghi,count
-				if (saveflags) emit_pushf(dst);                                         // pushf
-				emit_sar_r32_imm(dst, reghi, count);                                    // sar   reghi,count
+				a.shrd(reglo, reghi, count);                                            // shrd  reglo,reghi,count
+				if (saveflags) a.pushfd();                                              // pushf
+				a.sar(reghi, count);                                                    // sar   reghi,count
 			}
 		}
 	}
 	else
 	{
-		emit_link skip1, skip2;
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_test_r32_imm(dst, REG_ECX, 0x20);                                          // test  ecx,0x20
-		emit_jcc_short_link(dst, x86emit::COND_Z, skip1);                               // jz    skip1
+		Label skip1 = a.newLabel();
+		Label skip2 = a.newLabel();
+		emit_mov_r32_p32(a, ecx, param);                                                // mov   ecx,param
+		a.test(ecx, 0x20);                                                              // test  ecx,0x20
+		a.short_().jz(skip1);                                                           // jz    skip1
 		if (inst.flags() != 0)
 		{
-			emit_sub_r32_imm(dst, REG_ECX, 31);                                         // sub   ecx,31
-			emit_shrd_r32_r32_imm(dst, reglo, reghi, 31);                               // shrd  reglo,reghi,31
-			emit_sar_r32_imm(dst, reghi, 31);                                           // sar   reghi,31
-			emit_test_r32_imm(dst, REG_ECX, 0x20);                                      // test  ecx,0x20
-			emit_jcc_short_link(dst, x86emit::COND_Z, skip2);                           // jz    skip
-			emit_sub_r32_imm(dst, REG_ECX, 31);                                         // sub   ecx,31
-			emit_shrd_r32_r32_imm(dst, reglo, reghi, 31);                               // shrd  reglo,reghi,31
-			emit_sar_r32_imm(dst, reghi, 31);                                           // sar   reghi,31
-			track_resolve_link(dst, skip2);                                         // skip2:
+			a.sub(ecx, 31);                                                             // sub   ecx,31
+			a.shrd(reglo, reghi, 31);                                                   // shrd  reglo,reghi,31
+			a.sar(reghi, 31);                                                           // sar   reghi,31
+			a.test(ecx, 0x20);                                                          // test  ecx,0x20
+			a.short_().jz(skip2);                                                       // jz    skip
+			a.sub(ecx, 31);                                                             // sub   ecx,31
+			a.shrd(reglo, reghi, 31);                                                   // shrd  reglo,reghi,31
+			a.sar(reghi, 31);                                                           // sar   reghi,31
+			a.bind(skip2);                                                          // skip2:
+			reset_last_upper_lower_reg();
 		}
 		else
 		{
-			emit_mov_r32_r32(dst, reglo, reghi);                                        // mov   reglo,reghi
-			emit_sar_r32_imm(dst, reghi, 31);                                           // sar   reghi,31
-		}
-		track_resolve_link(dst, skip1);                                             // skip1:
-		emit_shrd_r32_r32_cl(dst, reglo, reghi);                                        // shrd  reglo,reghi,cl
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_sar_r32_cl(dst, reghi);                                                    // sar   reghi,cl
+			a.mov(reglo, reghi);                                                        // mov   reglo,reghi
+			a.sar(reghi, 31);                                                           // sar   reghi,31
+		}
+		a.bind(skip1);                                                              // skip1:
+		reset_last_upper_lower_reg();
+		a.shrd(reglo, reghi, cl);                                                       // shrd  reglo,reghi,cl
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.sar(reghi, cl);                                                               // sar   reghi,cl
 	}
 	if (saveflags)
-		emit_combine_z_flags(dst);
+		emit_combine_z_flags(a);
 }
 
 
@@ -2523,13 +1638,13 @@
 //  pair of registers from a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_rol_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_rol_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const instruction &inst)
 {
 	int saveflags = ((inst.flags() & FLAG_Z) != 0);
 	if (param.is_immediate())
 	{
 		int count = param.immediate() & 63;
-		if (inst.flags() == 0 && count == 0)
+		if (!inst.flags() && count == 0)
 			;// skip
 		else
 		{
@@ -2537,59 +1652,61 @@
 			{
 				if (inst.flags() != 0)
 				{
-					emit_mov_r32_r32(dst, REG_ECX, reglo);                              // mov   ecx,reglo
-					emit_shld_r32_r32_imm(dst, reglo, reghi, 31);                       // shld  reglo,reghi,31
-					emit_shld_r32_r32_imm(dst, reghi, REG_ECX, 31);                     // shld  reghi,ecx,31
+					a.mov(ecx, reglo);                                                  // mov   ecx,reglo
+					a.shld(reglo, reghi, 31);                                           // shld  reglo,reghi,31
+					a.shld(reghi, ecx, 31);                                             // shld  reghi,ecx,31
 					count -= 31;
 				}
 				else
 				{
-					emit_xchg_r32_r32(dst, reghi, reglo);                               // xchg  reghi,reglo
+					a.xchg(reghi, reglo);                                               // xchg  reghi,reglo
 					count -= 32;
 				}
 			}
 			if (inst.flags() != 0 || count > 0)
 			{
-				emit_mov_r32_r32(dst, REG_ECX, reglo);                                  // mov   ecx,reglo
-				emit_shld_r32_r32_imm(dst, reglo, reghi, count);                        // shld  reglo,reghi,count
-				if (saveflags) emit_pushf(dst);                                         // pushf
-				emit_shld_r32_r32_imm(dst, reghi, REG_ECX, count);                      // shld  reghi,ecx,count
+				a.mov(ecx, reglo);                                                      // mov   ecx,reglo
+				a.shld(reglo, reghi, count);                                            // shld  reglo,reghi,count
+				if (saveflags) a.pushfd();                                              // pushf
+				a.shld(reghi, ecx, count);                                              // shld  reghi,ecx,count
 			}
 		}
 	}
 	else
 	{
-		emit_link skip1, skip2;
-		int tempreg = REG_EBX;
-		emit_mov_m32_r32(dst, MBD(REG_ESP, -8), tempreg);                               // mov   [esp-8],ebx
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_test_r32_imm(dst, REG_ECX, 0x20);                                          // test  ecx,0x20
-		emit_jcc_short_link(dst, x86emit::COND_Z, skip1);                               // jz    skip1
+		Label skip1 = a.newLabel();
+		Label skip2 = a.newLabel();
+		a.mov(ptr(esp, -8), ebx);                                                       // mov   [esp-8],ebx
+		emit_mov_r32_p32(a, ecx, param);                                                // mov   ecx,param
+		a.test(ecx, 0x20);                                                              // test  ecx,0x20
+		a.short_().jz(skip1);                                                           // jz    skip1
 		if (inst.flags() != 0)
 		{
-			emit_sub_r32_imm(dst, REG_ECX, 31);                                         // sub   ecx,31
-			emit_mov_r32_r32(dst, tempreg, reglo);                                      // mov   ebx,reglo
-			emit_shld_r32_r32_imm(dst, reglo, reghi, 31);                               // shld  reglo,reghi,31
-			emit_shld_r32_r32_imm(dst, reghi, tempreg, 31);                             // shld  reghi,ebx,31
-			emit_test_r32_imm(dst, REG_ECX, 0x20);                                      // test  ecx,0x20
-			emit_jcc_short_link(dst, x86emit::COND_Z, skip2);                           // jz    skip2
-			emit_sub_r32_imm(dst, REG_ECX, 31);                                         // sub   ecx,31
-			emit_mov_r32_r32(dst, tempreg, reglo);                                      // mov   ebx,reglo
-			emit_shld_r32_r32_imm(dst, reglo, reghi, 31);                               // shld  reglo,reghi,31
-			emit_shld_r32_r32_imm(dst, reghi, tempreg, 31);                             // shld  reghi,ebx,31
-			track_resolve_link(dst, skip2);                                         // skip2:
-		}
-		else
-			emit_xchg_r32_r32(dst, reghi, reglo);                                       // xchg  reghi,reglo
-		track_resolve_link(dst, skip1);                                             // skip1:
-		emit_mov_r32_r32(dst, tempreg, reglo);                                          // mov   ebx,reglo
-		emit_shld_r32_r32_cl(dst, reglo, reghi);                                        // shld  reglo,reghi,cl
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_shld_r32_r32_cl(dst, reghi, tempreg);                                      // shld  reghi,ebx,cl
-		emit_mov_r32_m32(dst, tempreg, MBD(REG_ESP, saveflags ? -4 : -8));              // mov   ebx,[esp-8]
+			a.sub(ecx, 31);                                                             // sub   ecx,31
+			a.mov(ebx, reglo);                                                          // mov   ebx,reglo
+			a.shld(reglo, reghi, 31);                                                   // shld  reglo,reghi,31
+			a.shld(reghi, ebx, 31);                                                     // shld  reghi,ebx,31
+			a.test(ecx, 0x20);                                                          // test  ecx,0x20
+			a.short_().jz(skip2);                                                       // jz    skip2
+			a.sub(ecx, 31);                                                             // sub   ecx,31
+			a.mov(ebx, reglo);                                                          // mov   ebx,reglo
+			a.shld(reglo, reghi, 31);                                                   // shld  reglo,reghi,31
+			a.shld(reghi, ebx, 31);                                                     // shld  reghi,ebx,31
+			a.bind(skip2);                                                          // skip2:
+			reset_last_upper_lower_reg();
+		}
+		else
+			a.xchg(reghi, reglo);                                                       // xchg  reghi,reglo
+		a.bind(skip1);                                                              // skip1:
+		reset_last_upper_lower_reg();
+		a.mov(ebx, reglo);                                                              // mov   ebx,reglo
+		a.shld(reglo, reghi, cl);                                                       // shld  reglo,reghi,cl
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.shld(reghi, ebx, cl);                                                         // shld  reghi,ebx,cl
+		a.mov(ebx, ptr(esp, saveflags ? -4 : -8));                                      // mov   ebx,[esp-8]
 	}
 	if (saveflags)
-		emit_combine_z_flags(dst);
+		emit_combine_z_flags(a);
 }
 
 
@@ -2598,13 +1715,13 @@
 //  pair of registers from a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_ror_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_ror_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const instruction &inst)
 {
 	int saveflags = ((inst.flags() & FLAG_Z) != 0);
 	if (param.is_immediate())
 	{
 		int count = param.immediate() & 63;
-		if (inst.flags() == 0 && count == 0)
+		if (!inst.flags() && count == 0)
 			;// skip
 		else
 		{
@@ -2612,59 +1729,61 @@
 			{
 				if (inst.flags() != 0)
 				{
-					emit_mov_r32_r32(dst, REG_ECX, reglo);                              // mov   ecx,reglo
-					emit_shrd_r32_r32_imm(dst, reglo, reghi, 31);                       // shrd  reglo,reghi,31
-					emit_shrd_r32_r32_imm(dst, reghi, REG_ECX, 31);                     // shrd  reghi,ecx,31
+					a.mov(ecx, reglo);                                                  // mov   ecx,reglo
+					a.shrd(reglo, reghi, 31);                                           // shrd  reglo,reghi,31
+					a.shrd(reghi, ecx, 31);                                             // shrd  reghi,ecx,31
 					count -= 31;
 				}
 				else
 				{
-					emit_xchg_r32_r32(dst, reghi, reglo);                               // xchg  reghi,reglo
+					a.xchg(reghi, reglo);                                               // xchg  reghi,reglo
 					count -= 32;
 				}
 			}
 			if (inst.flags() != 0 || count > 0)
 			{
-				emit_mov_r32_r32(dst, REG_ECX, reglo);                                  // mov   ecx,reglo
-				emit_shrd_r32_r32_imm(dst, reglo, reghi, count);                        // shrd  reglo,reghi,count
-				if (saveflags) emit_pushf(dst);                                         // pushf
-				emit_shrd_r32_r32_imm(dst, reghi, REG_ECX, count);                      // shrd  reghi,ecx,count
+				a.mov(ecx, reglo);                                                      // mov   ecx,reglo
+				a.shrd(reglo, reghi, count);                                            // shrd  reglo,reghi,count
+				if (saveflags) a.pushfd();                                              // pushf
+				a.shrd(reghi, ecx, count);                                              // shrd  reghi,ecx,count
 			}
 		}
 	}
 	else
 	{
-		emit_link skip1, skip2;
-		int tempreg = REG_EBX;
-		emit_mov_m32_r32(dst, MBD(REG_ESP, -8), tempreg);                               // mov   [esp-8],ebx
-		emit_mov_r32_p32(dst, REG_ECX, param);                                  // mov   ecx,param
-		emit_test_r32_imm(dst, REG_ECX, 0x20);                                          // test  ecx,0x20
-		emit_jcc_short_link(dst, x86emit::COND_Z, skip1);                               // jz    skip1
+		Label skip1 = a.newLabel();
+		Label skip2 = a.newLabel();
+		a.mov(ptr(esp, -8), ebx);                                                       // mov   [esp-8],ebx
+		emit_mov_r32_p32(a, ecx, param);                                                // mov   ecx,param
+		a.test(ecx, 0x20);                                                              // test  ecx,0x20
+		a.short_().jz(skip1);                                                           // jz    skip1
 		if (inst.flags() != 0)
 		{
-			emit_sub_r32_imm(dst, REG_ECX, 31);                                         // sub   ecx,31
-			emit_mov_r32_r32(dst, tempreg, reglo);                                      // mov   ebx,reglo
-			emit_shrd_r32_r32_imm(dst, reglo, reghi, 31);                               // shrd  reglo,reghi,31
-			emit_shrd_r32_r32_imm(dst, reghi, tempreg, 31);                             // shrd  reghi,ebx,31
-			emit_test_r32_imm(dst, REG_ECX, 0x20);                                      // test  ecx,0x20
-			emit_jcc_short_link(dst, x86emit::COND_Z, skip2);                           // jz    skip2
-			emit_sub_r32_imm(dst, REG_ECX, 31);                                         // sub   ecx,31
-			emit_mov_r32_r32(dst, tempreg, reglo);                                      // mov   ebx,reglo
-			emit_shrd_r32_r32_imm(dst, reglo, reghi, 31);                               // shrd  reglo,reghi,31
-			emit_shrd_r32_r32_imm(dst, reghi, tempreg, 31);                             // shrd  reghi,ebx,31
-			track_resolve_link(dst, skip2);                                         // skip2:
-		}
-		else
-			emit_xchg_r32_r32(dst, reghi, reglo);                                       // xchg  reghi,reglo
-		track_resolve_link(dst, skip1);                                             // skip1:
-		emit_mov_r32_r32(dst, tempreg, reglo);                                          // mov   ebx,reglo
-		emit_shrd_r32_r32_cl(dst, reglo, reghi);                                        // shrd  reglo,reghi,cl
-		if (saveflags) emit_pushf(dst);                                                 // pushf
-		emit_shrd_r32_r32_cl(dst, reghi, tempreg);                                      // shrd  reghi,ebx,cl
-		emit_mov_r32_m32(dst, tempreg, MBD(REG_ESP, saveflags ? -4 : -8));              // mov   ebx,[esp-8]
+			a.sub(ecx, 31);                                                             // sub   ecx,31
+			a.mov(ebx, reglo);                                                          // mov   ebx,reglo
+			a.shrd(reglo, reghi, 31);                                                   // shrd  reglo,reghi,31
+			a.shrd(reghi, ebx, 31);                                                     // shrd  reghi,ebx,31
+			a.test(ecx, 0x20);                                                          // test  ecx,0x20
+			a.short_().jz(skip2);                                                       // jz    skip2
+			a.sub(ecx, 31);                                                             // sub   ecx,31
+			a.mov(ebx, reglo);                                                          // mov   ebx,reglo
+			a.shrd(reglo, reghi, 31);                                                   // shrd  reglo,reghi,31
+			a.shrd(reghi, ebx, 31);                                                     // shrd  reghi,ebx,31
+			a.bind(skip2);                                                          // skip2:
+			reset_last_upper_lower_reg();
+		}
+		else
+			a.xchg(reghi, reglo);                                                       // xchg  reghi,reglo
+		a.bind(skip1);                                                              // skip1:
+		reset_last_upper_lower_reg();
+		a.mov(ebx, reglo);                                                              // mov   ebx,reglo
+		a.shrd(reglo, reghi, cl);                                                       // shrd  reglo,reghi,cl
+		if (saveflags) a.pushfd();                                                      // pushf
+		a.shrd(reghi, ebx, cl);                                                         // shrd  reghi,ebx,cl
+		a.mov(ebx, ptr(esp, saveflags ? -4 : -8));                                      // mov   ebx,[esp-8]
 	}
 	if (saveflags)
-		emit_combine_z_flags(dst);
+		emit_combine_z_flags(a);
 }
 
 
@@ -2673,39 +1792,43 @@
 //  pair of registers from a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_rcl_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_rcl_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const instruction &inst)
 {
 	int saveflags = ((inst.flags() & FLAG_Z) != 0);
-	emit_link skipall, skiploop;
-	x86code *loop;
+	Label loop = a.newLabel();
+	Label skipall = a.newLabel();
+	Label skiploop = a.newLabel();
 
-	emit_mov_r32_p32_keepflags(dst, REG_ECX, param);                                // mov   ecx,param
+	emit_mov_r32_p32_keepflags(a, ecx, param);                                          // mov   ecx,param
 	if (!saveflags)
 	{
-		loop = dst;                                                                 // loop:
-		emit_jecxz_link(dst, skipall);                                                  // jecxz skipall
-		emit_lea_r32_m32(dst, REG_ECX, MBD(REG_ECX, -1));                               // lea   ecx,[ecx-1]
-		emit_rcl_r32_imm(dst, reglo, 1);                                                // rcl   reglo,1
-		emit_rcl_r32_imm(dst, reghi, 1);                                                // rcl   reghi,1
-		emit_jmp(dst, loop);                                                            // jmp   loop
-		track_resolve_link(dst, skipall);                                           // skipall:
+		a.bind(loop);                                                               // loop:
+		a.jecxz(skipall);                                                               // jecxz skipall
+		a.lea(ecx, ptr(ecx, -1));                                                       // lea   ecx,[ecx-1]
+		a.rcl(reglo, 1);                                                                // rcl   reglo,1
+		a.rcl(reghi, 1);                                                                // rcl   reghi,1
+		a.jmp(loop);                                                                    // jmp   loop
+		a.bind(skipall);                                                            // skipall:
+		reset_last_upper_lower_reg();
 	}
 	else
 	{
-		emit_jecxz_link(dst, skipall);                                                  // jecxz skipall
-		emit_lea_r32_m32(dst, REG_ECX, MBD(REG_ECX, -1));                               // lea   ecx,[ecx-1]
-		loop = dst;                                                                 // loop:
-		emit_jecxz_link(dst, skiploop);                                             // jecxz skiploop
-		emit_lea_r32_m32(dst, REG_ECX, MBD(REG_ECX, -1));                               // lea   ecx,[ecx-1]
-		emit_rcl_r32_imm(dst, reglo, 1);                                                // rcl   reglo,1
-		emit_rcl_r32_imm(dst, reghi, 1);                                                // rcl   reghi,1
-		emit_jmp(dst, loop);                                                            // jmp   loop
-		track_resolve_link(dst, skiploop);                                          // skiploop:
-		emit_rcl_r32_imm(dst, reglo, 1);                                                // rcl   reglo,1
-		emit_pushf(dst);                                                                // pushf
-		emit_rcl_r32_imm(dst, reghi, 1);                                                // rcl   reghi,1
-		track_resolve_link(dst, skipall);                                           // skipall:
-		emit_combine_z_flags(dst);
+		a.jecxz(skipall);                                                               // jecxz skipall
+		a.lea(ecx, ptr(ecx, -1));                                                       // lea   ecx,[ecx-1]
+		a.bind(loop);                                                               // loop:
+		a.jecxz(skiploop);                                                              // jecxz skiploop
+		a.lea(ecx, ptr(ecx, -1));                                                       // lea   ecx,[ecx-1]
+		a.rcl(reglo, 1);                                                                // rcl   reglo,1
+		a.rcl(reghi, 1);                                                                // rcl   reghi,1
+		a.jmp(loop);                                                                    // jmp   loop
+		a.bind(skiploop);                                                           // skiploop:
+		reset_last_upper_lower_reg();
+		a.rcl(reglo, 1);                                                                // rcl   reglo,1
+		a.pushfd();                                                                     // pushf
+		a.rcl(reghi, 1);                                                                // rcl   reghi,1
+		a.bind(skipall);                                                            // skipall:
+		reset_last_upper_lower_reg();
+		emit_combine_z_flags(a);
 	}
 }
 
@@ -2715,43 +1838,95 @@
 //  pair of registers from a 64-bit parameter
 //-------------------------------------------------
 
-void drcbe_x86::emit_rcr_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const instruction &inst)
+void drcbe_x86::emit_rcr_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const instruction &inst)
 {
 	int saveflags = (inst.flags() != 0);
-	emit_link skipall, skiploop;
-	x86code *loop;
+	Label loop = a.newLabel();
+	Label skipall = a.newLabel();
+	Label skiploop = a.newLabel();
 
-	emit_mov_r32_p32_keepflags(dst, REG_ECX, param);                                // mov   ecx,param
+	emit_mov_r32_p32_keepflags(a, ecx, param);                                          // mov   ecx,param
 	if (!saveflags)
 	{
-		loop = dst;                                                                 // loop:
-		emit_jecxz_link(dst, skipall);                                                  // jecxz skipall
-		emit_lea_r32_m32(dst, REG_ECX, MBD(REG_ECX, -1));                               // lea   ecx,[ecx-1]
-		emit_rcr_r32_imm(dst, reghi, 1);                                                // rcr   reghi,1
-		emit_rcr_r32_imm(dst, reglo, 1);                                                // rcr   reglo,1
-		emit_jmp(dst, loop);                                                            // jmp   loop
-		track_resolve_link(dst, skipall);                                           // skipall:
+		a.bind(loop);                                                               // loop:
+		a.jecxz(skipall);                                                               // jecxz skipall
+		a.lea(ecx, ptr(ecx, -1));                                                       // lea   ecx,[ecx-1]
+		a.rcr(reghi, 1);                                                                // rcr   reghi,1
+		a.rcr(reglo, 1);                                                                // rcr   reglo,1
+		a.jmp(loop);                                                                    // jmp   loop
+		a.bind(skipall);                                                            // skipall:
+		reset_last_upper_lower_reg();
 	}
 	else
 	{
-		emit_jecxz_link(dst, skipall);                                                  // jecxz skipall
-		emit_lea_r32_m32(dst, REG_ECX, MBD(REG_ECX, -1));                               // lea   ecx,[ecx-1]
-		loop = dst;                                                                 // loop:
-		emit_jecxz_link(dst, skiploop);                                             // jecxz skiploop
-		emit_lea_r32_m32(dst, REG_ECX, MBD(REG_ECX, -1));                               // lea   ecx,[ecx-1]
-		emit_rcr_r32_imm(dst, reghi, 1);                                                // rcr   reghi,1
-		emit_rcr_r32_imm(dst, reglo, 1);                                                // rcr   reglo,1
-		emit_jmp(dst, loop);                                                            // jmp   loop
-		track_resolve_link(dst, skiploop);                                          // skiploop:
-		emit_rcr_r32_imm(dst, reghi, 1);                                                // rcr   reghi,1
-		emit_pushf(dst);                                                                // pushf
-		emit_rcr_r32_imm(dst, reglo, 1);                                                // rcr   reglo,1
-		track_resolve_link(dst, skipall);                                           // skipall:
-		emit_combine_z_shl_flags(dst);
+		a.jecxz(skipall);                                                               // jecxz skipall
+		a.lea(ecx, ptr(ecx, -1));                                                       // lea   ecx,[ecx-1]
+		a.bind(loop);                                                               // loop:
+		a.jecxz(skiploop);                                                              // jecxz skiploop
+		a.lea(ecx, ptr(ecx, -1));                                                       // lea   ecx,[ecx-1]
+		a.rcr(reghi, 1);                                                                // rcr   reghi,1
+		a.rcr(reglo, 1);                                                                // rcr   reglo,1
+		a.jmp(loop);                                                                    // jmp   loop
+		a.bind(skiploop);                                                           // skiploop:
+		reset_last_upper_lower_reg();
+		a.rcr(reghi, 1);                                                                // rcr   reghi,1
+		a.pushfd();                                                                     // pushf
+		a.rcr(reglo, 1);                                                                // rcr   reglo,1
+		a.bind(skipall);                                                            // skipall:
+		reset_last_upper_lower_reg();
+		emit_combine_z_shl_flags(a);
+	}
+}
+
+
+void drcbe_x86::alu_op_param(Assembler &a, Inst::Id const opcode_lo, Inst::Id const opcode_hi, Gp const &lo, Gp const &hi, be_parameter const &param, bool saveflags)
+{
+	if (param.is_memory())
+	{
+		a.emit(opcode_lo, lo, MABS(param.memory(0)));                               // opl   reglo,[param]
+		if (saveflags) a.pushfd();                                                  // pushf
+		a.emit(opcode_hi, hi, MABS(param.memory(4)));                               // oph   reghi,[param]
+	}
+	else if (param.is_immediate())
+	{
+		a.emit(opcode_lo, lo, param.immediate());                                   // opl   reglo,param
+		if (saveflags) a.pushfd();                                                  // pushf
+		a.emit(opcode_hi, hi, param.immediate() >> 32);                             // oph   reghi,param >> 32
 	}
+	else if (param.is_int_register())
+	{
+		a.emit(opcode_lo, lo, Gpd(param.ireg()));                                   // opl   reglo,param
+		if (saveflags) a.pushfd();                                                  // pushf
+		a.emit(opcode_hi, hi, MABS(m_reghi[param.ireg()]));                         // oph   reghi,reghi[param]
+	}
+
+	if (saveflags)
+		emit_combine_z_flags(a);
 }
 
 
+void drcbe_x86::alu_op_param(Assembler &a, Inst::Id const opcode_lo, Inst::Id const opcode_hi, Mem const &lo, Mem const &hi, be_parameter const &param, bool saveflags)
+{
+	if (param.is_immediate())
+	{
+		a.emit(opcode_lo, lo, param.immediate());                                   // opl   [dest],param
+		if (saveflags) a.pushfd();                                                  // pushf
+		a.emit(opcode_hi, hi, param.immediate() >> 32);                             // oph   [dest+4],param >> 32
+	}
+	else
+	{
+		Gp const reg = (param.is_int_register()) ? Gpd(param.ireg()) : eax;
+
+		emit_mov_r64_p64(a, reg, edx, param);                                       // mov   edx:reglo,param
+		a.emit(opcode_lo, lo, reg);                                                 // opl   [dest],reglo
+		if (saveflags) a.pushfd();                                                  // pushf
+		a.emit(opcode_hi, hi, edx);                                                 // oph   [dest+4],edx
+	}
+
+	if (saveflags)
+		emit_combine_z_flags(a);
+}
+
 
 //**************************************************************************
 //  EMITTERS FOR FLOATING POINT
@@ -2762,14 +1937,11 @@
 //  onto the stack
 //-------------------------------------------------
 
-void drcbe_x86::emit_fld_p(x86code *&dst, int size, const be_parameter &param)
+void drcbe_x86::emit_fld_p(Assembler &a, int size, be_parameter const &param)
 {
 	assert(param.is_memory());
 	assert(size == 4 || size == 8);
-	if (size == 4)
-		emit_fld_m32(dst, MABS(param.memory()));
-	else if (size == 8)
-		emit_fld_m64(dst, MABS(param.memory()));
+	a.fld(ptr(u64(param.memory()), size));
 }
 
 
@@ -2778,85 +1950,12 @@
 //  from the stack and pop it
 //-------------------------------------------------
 
-void drcbe_x86::emit_fstp_p(x86code *&dst, int size, const be_parameter &param)
+void drcbe_x86::emit_fstp_p(Assembler &a, int size, be_parameter const &param)
 {
 	assert(param.is_memory());
 	assert(size == 4 || size == 8);
-	if (size == 4)
-		emit_fstp_m32(dst, MABS(param.memory()));
-	else if (size == 8)
-		emit_fstp_m64(dst, MABS(param.memory()));
-}
-
-
-
-//**************************************************************************
-//  OUT-OF-BAND CODE FIXUP CALLBACKS
-//**************************************************************************
-
-//-------------------------------------------------
-//  fixup_label - callback to fixup forward-
-//  referenced labels
-//-------------------------------------------------
-
-void drcbe_x86::fixup_label(void *parameter, drccodeptr labelcodeptr)
-{
-	drccodeptr src = (drccodeptr)parameter;
-
-	// find the end of the instruction
-	if (src[0] == 0xe3)
-	{
-		src += 1 + 1;
-		src[-1] = labelcodeptr - src;
-	}
-	else if (src[0] == 0xe9)
-	{
-		src += 1 + 4;
-		((uint32_t *)src)[-1] = labelcodeptr - src;
-	}
-	else if (src[0] == 0x0f && (src[1] & 0xf0) == 0x80)
-	{
-		src += 2 + 4;
-		((uint32_t *)src)[-1] = labelcodeptr - src;
-	}
-	else
-		fatalerror("fixup_label called with invalid jmp source!\n");
-}
-
-
-//-------------------------------------------------
-//  fixup_exception - callback to perform cleanup
-//  and jump to an exception handler
-//-------------------------------------------------
-
-void drcbe_x86::fixup_exception(drccodeptr *codeptr, void *param1, void *param2)
-{
-	drccodeptr src = (drccodeptr)param1;
-	const instruction &inst = *(const instruction *)param2;
-
-	// normalize parameters
-	const parameter &handp = inst.param(0);
-	assert(handp.is_code_handle());
-	be_parameter exp(*this, inst.param(1), PTYPE_MRI);
-
-	// look up the handle target
-	drccodeptr *targetptr = handp.handle().codeptr_addr();
-
-	// first fixup the jump to get us here
-	drccodeptr dst = *codeptr;
-	((uint32_t *)src)[-1] = dst - src;
-
-	// then store the exception parameter
-	emit_mov_m32_p32(dst, MABS(&m_state.exp), exp);                     // mov   [exp],exp
 
-	// push the original return address on the stack
-	emit_push_imm(dst, (uintptr_t)src);                                                      // push  <return>
-	if (*targetptr != nullptr)
-		emit_jmp(dst, *targetptr);                                                      // jmp   *targetptr
-	else
-		emit_jmp_m32(dst, MABS(targetptr));                                         // jmp   [targetptr]
-
-	*codeptr = dst;
+	a.fstp(ptr(u64(param.memory()), size));
 }
 
 
@@ -2885,7 +1984,7 @@
 //  op_handle - process a HANDLE opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_handle(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_handle(Assembler &a, const instruction &inst)
 {
 	assert_no_condition(inst);
 	assert_no_flags(inst);
@@ -2894,16 +1993,21 @@
 
 	reset_last_upper_lower_reg();
 
+	// make a label for documentation
+	Label handle = a.newNamedLabel(inst.param(0).handle().string());
+	a.bind(handle);
+
 	// emit a jump around the stack adjust in case code falls through here
-	emit_link skip;
-	emit_jmp_short_link(dst, skip);                                                 // jmp   skip
+	Label skip = a.newLabel();
+	a.short_().jmp(skip);                                                               // jmp   skip
 
 	// register the current pointer for the handle
-	inst.param(0).handle().set_codeptr(dst);
+	inst.param(0).handle().set_codeptr(drccodeptr(a.code()->baseAddress() + a.offset()));
 
 	// by default, the handle points to prolog code that moves the stack pointer
-	emit_lea_r32_m32(dst, REG_ESP, MBD(REG_ESP, -28));                                  // lea   rsp,[rsp-28]
-	track_resolve_link(dst, skip);                                                  // skip:
+	a.lea(esp, ptr(esp, -28));                                                          // lea   rsp,[rsp-28]
+	a.bind(skip);                                                                   // skip:
+	reset_last_upper_lower_reg();
 }
 
 
@@ -2911,7 +2015,7 @@
 //  op_hash - process a HASH opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_hash(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_hash(Assembler &a, const instruction &inst)
 {
 	assert_no_condition(inst);
 	assert_no_flags(inst);
@@ -2920,7 +2024,7 @@
 	assert(inst.param(1).is_immediate());
 
 	// register the current pointer for the mode/PC
-	m_hash.set_codeptr(inst.param(0).immediate(), inst.param(1).immediate(), dst);
+	m_hash.set_codeptr(inst.param(0).immediate(), inst.param(1).immediate(), drccodeptr(a.code()->baseAddress() + a.offset()));
 	reset_last_upper_lower_reg();
 }
 
@@ -2929,15 +2033,21 @@
 //  op_label - process a LABEL opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_label(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_label(Assembler &a, const instruction &inst)
 {
 	assert_no_condition(inst);
 	assert_no_flags(inst);
 	assert(inst.numparams() == 1);
 	assert(inst.param(0).is_code_label());
 
+	std::string labelName = util::string_format("PC$%x", inst.param(0).label());
+	Label label = a.labelByName(labelName.c_str());
+	if (!label.isValid())
+		label = a.newNamedLabel(labelName.c_str());
+
 	// register the current pointer for the label
-	m_labels.set_codeptr(inst.param(0).label(), dst);
+	a.bind(label);
+
 	reset_last_upper_lower_reg();
 }
 
@@ -2946,7 +2056,7 @@
 //  op_comment - process a COMMENT opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_comment(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_comment(Assembler &a, const instruction &inst)
 {
 	assert_no_condition(inst);
 	assert_no_flags(inst);
@@ -2961,7 +2071,7 @@
 //  op_mapvar - process a MAPVAR opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_mapvar(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_mapvar(Assembler &a, const instruction &inst)
 {
 	assert_no_condition(inst);
 	assert_no_flags(inst);
@@ -2970,7 +2080,7 @@
 	assert(inst.param(1).is_immediate());
 
 	// set the value of the specified mapvar
-	m_map.set_value(dst, inst.param(0).mapvar(), inst.param(1).immediate());
+	m_map.set_value(drccodeptr(a.code()->baseAddress() + a.offset()), inst.param(0).mapvar(), inst.param(1).immediate());
 }
 
 
@@ -2983,7 +2093,7 @@
 //  op_nop - process a NOP opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_nop(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_nop(Assembler &a, const instruction &inst)
 {
 	// nothing
 }
@@ -2993,7 +2103,7 @@
 //  op_debug - process a DEBUG opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_debug(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_debug(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3006,19 +2116,20 @@
 	if ((m_device.machine().debug_flags & DEBUG_FLAG_ENABLED) != 0)
 	{
 		// normalize parameters
-		be_parameter pcp(*this, inst.param(0), PTYPE_MRI);
+		be_parameter const pcp(*this, inst.param(0), PTYPE_MRI);
 
 		// test and branch
-		emit_test_m32_imm(dst, MABS(&m_device.machine().debug_flags), DEBUG_FLAG_CALL_HOOK);        // test  [debug_flags],DEBUG_FLAG_CALL_HOOK
-		emit_link skip = { nullptr };
-		emit_jcc_short_link(dst, x86emit::COND_Z, skip);                        // jz    skip
+		a.test(MABS(&m_device.machine().debug_flags, 4), DEBUG_FLAG_CALL_HOOK);         // test  [debug_flags],DEBUG_FLAG_CALL_HOOK
+		Label skip = a.newLabel();
+		a.short_().jz(skip);                                                            // jz    skip
 
 		// push the parameter
-		emit_mov_m32_p32(dst, MBD(REG_ESP, 4), pcp);                            // mov   [esp+4],pcp
-		emit_mov_m32_imm(dst, MBD(REG_ESP, 0), (uintptr_t)m_device.debug());    // mov   [esp],device.debug
-		emit_call(dst, (x86code *)debugger_inst_hook);                          // call  debugger_inst_hook
+		emit_mov_m32_p32(a, dword_ptr(esp, 4), pcp);                                    // mov   [esp+4],pcp
+		a.mov(dword_ptr(esp, 0), imm(m_device.debug()));                                // mov   [esp],device.debug
+		a.call(imm(debugger_inst_hook));                                                // call  debugger_inst_hook
 
-		track_resolve_link(dst, skip);                                          // skip:
+		a.bind(skip);                                                               // skip:
+		reset_last_upper_lower_reg();
 	}
 }
 
@@ -3027,7 +2138,7 @@
 //  op_exit - process an EXIT opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_exit(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_exit(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3038,11 +2149,11 @@
 	be_parameter retp(*this, inst.param(0), PTYPE_MRI);
 
 	// load the parameter into EAX
-	emit_mov_r32_p32(dst, REG_EAX, retp);                                       // mov   eax,retp
+	emit_mov_r32_p32(a, eax, retp);                                                     // mov   eax,retp
 	if (inst.condition() == uml::COND_ALWAYS)
-		emit_jmp(dst, m_exit);                                                  // jmp   exit
+		a.jmp(imm(m_exit));                                                             // jmp   exit
 	else
-		emit_jcc(dst, X86_CONDITION(inst.condition()), m_exit);                 // jcc   exit
+		a.j(X86_CONDITION(inst.condition()), imm(m_exit));                              // jcc   exit
 }
 
 
@@ -3050,7 +2161,7 @@
 //  op_hashjmp - process a HASHJMP opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_hashjmp(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_hashjmp(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3060,18 +2171,18 @@
 	// normalize parameters
 	be_parameter modep(*this, inst.param(0), PTYPE_MRI);
 	be_parameter pcp(*this, inst.param(1), PTYPE_MRI);
-	const parameter &exp = inst.param(2);
+	parameter const &exp = inst.param(2);
 	assert(exp.is_code_handle());
 
 	if (LOG_HASHJMPS)
 	{
-		emit_mov_m32_p32(dst, MBD(REG_ESP, 4), pcp);
-		emit_mov_m32_p32(dst, MBD(REG_ESP, 0), modep);
-		emit_call(dst, (x86code *)debug_log_hashjmp);
+		emit_mov_m32_p32(a, dword_ptr(esp, 4), pcp);
+		emit_mov_m32_p32(a, dword_ptr(esp, 0), modep);
+		a.call(imm(debug_log_hashjmp));
 	}
 
 	// load the stack base one word early so we end up at the right spot after our call below
-	emit_mov_r32_m32(dst, REG_ESP, MABS(&m_hashstacksave));                     // mov   esp,[hashstacksave]
+	a.mov(esp, MABS(&m_hashstacksave));                                                 // mov   esp,[hashstacksave]
 
 	// fixed mode cases
 	if (modep.is_immediate() && m_hash.is_mode_populated(modep.immediate()))
@@ -3081,53 +2192,53 @@
 		{
 			uint32_t l1val = (pcp.immediate() >> m_hash.l1shift()) & m_hash.l1mask();
 			uint32_t l2val = (pcp.immediate() >> m_hash.l2shift()) & m_hash.l2mask();
-			emit_call_m32(dst, MABS(&m_hash.base()[modep.immediate()][l1val][l2val]));  // call  hash[modep][l1val][l2val]
+			a.call(MABS(&m_hash.base()[modep.immediate()][l1val][l2val]));              // call  hash[modep][l1val][l2val]
 		}
 
 		// a fixed mode but variable PC
 		else
 		{
-			emit_mov_r32_p32(dst, REG_EAX, pcp);                                // mov   eax,pcp
-			emit_mov_r32_r32(dst, REG_EDX, REG_EAX);                                    // mov   edx,eax
-			emit_shr_r32_imm(dst, REG_EDX, m_hash.l1shift());                   // shr   edx,l1shift
-			emit_and_r32_imm(dst, REG_EAX, m_hash.l2mask() << m_hash.l2shift());// and  eax,l2mask << l2shift
-			emit_mov_r32_m32(dst, REG_EDX, MABSI(&m_hash.base()[modep.immediate()][0], REG_EDX, 4));
+			emit_mov_r32_p32(a, eax, pcp);                                              // mov   eax,pcp
+			a.mov(edx, eax);                                                            // mov   edx,eax
+			a.shr(edx, m_hash.l1shift());                                               // shr   edx,l1shift
+			a.and_(eax, m_hash.l2mask() << m_hash.l2shift());                           // and  eax,l2mask << l2shift
+			a.mov(edx, ptr(u64(&m_hash.base()[modep.immediate()][0]), edx, 2));
 																						// mov   edx,hash[modep+edx*4]
-			emit_call_m32(dst, MBISD(REG_EDX, REG_EAX, 4 >> m_hash.l2shift(), 0));// call  [edx+eax*shift]
+			a.call(ptr(edx, eax, 2 - m_hash.l2shift()));                                // call  [edx+eax*shift]
 		}
 	}
 	else
 	{
 		// variable mode
-		int modereg = modep.select_register(REG_ECX);
-		emit_mov_r32_p32(dst, modereg, modep);                                  // mov   modereg,modep
-		emit_mov_r32_m32(dst, REG_ECX, MABSI(m_hash.base(), modereg, 4));           // mov   ecx,hash[modereg*4]
+		Gp const modereg = modep.select_register(ecx);
+		emit_mov_r32_p32(a, modereg, modep);                                            // mov   modereg,modep
+		a.mov(ecx, ptr(u64(m_hash.base()), modereg, 2));                                // mov   ecx,hash[modereg*4]
 
 		// fixed PC
 		if (pcp.is_immediate())
 		{
 			uint32_t l1val = (pcp.immediate() >> m_hash.l1shift()) & m_hash.l1mask();
 			uint32_t l2val = (pcp.immediate() >> m_hash.l2shift()) & m_hash.l2mask();
-			emit_mov_r32_m32(dst, REG_EDX, MBD(REG_ECX, l1val*4));                      // mov   edx,[ecx+l1val*4]
-			emit_call_m32(dst, MBD(REG_EDX, l2val*4));                                  // call  [l2val*4]
+			a.mov(edx, ptr(ecx, l1val*4));                                              // mov   edx,[ecx+l1val*4]
+			a.call(ptr(edx, l2val*4));                                                  // call  [l2val*4]
 		}
 
 		// variable PC
 		else
 		{
-			emit_mov_r32_p32(dst, REG_EAX, pcp);                                // mov   eax,pcp
-			emit_mov_r32_r32(dst, REG_EDX, REG_EAX);                                    // mov   edx,eax
-			emit_shr_r32_imm(dst, REG_EDX, m_hash.l1shift());                   // shr   edx,l1shift
-			emit_mov_r32_m32(dst, REG_EDX, MBISD(REG_ECX, REG_EDX, 4, 0));              // mov   edx,[ecx+edx*4]
-			emit_and_r32_imm(dst, REG_EAX, m_hash.l2mask() << m_hash.l2shift());// and  eax,l2mask << l2shift
-			emit_call_m32(dst, MBISD(REG_EDX, REG_EAX, 4 >> m_hash.l2shift(), 0));// call  [edx+eax*shift]
+			emit_mov_r32_p32(a, eax, pcp);                                              // mov   eax,pcp
+			a.mov(edx, eax);                                                            // mov   edx,eax
+			a.shr(edx, m_hash.l1shift());                                               // shr   edx,l1shift
+			a.mov(edx, ptr(ecx, edx, 2));                                               // mov   edx,[ecx+edx*4]
+			a.and_(eax, m_hash.l2mask() << m_hash.l2shift());                           // and  eax,l2mask << l2shift
+			a.call(ptr(edx, eax, 2 - m_hash.l2shift()));                                // call  [edx+eax*shift]
 		}
 	}
 
 	// in all cases, if there is no code, we return here to generate the exception
-	emit_mov_m32_p32(dst, MABS(&m_state.exp), pcp);                     // mov   [exp],param
-	emit_sub_r32_imm(dst, REG_ESP, 4);                                                  // sub   esp,4
-	emit_call_m32(dst, MABS(exp.handle().codeptr_addr()));                                              // call  [exp]
+	emit_mov_m32_p32(a, MABS(&m_state.exp, 4), pcp);                                    // mov   [exp],param
+	a.sub(esp, 4);                                                                      // sub   esp,4
+	a.call(MABS(exp.handle().codeptr_addr()));                                          // call  [exp]
 }
 
 
@@ -3135,7 +2246,7 @@
 //  op_jmp - process a JMP opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_jmp(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_jmp(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3143,15 +2254,18 @@
 	assert_no_flags(inst);
 
 	// normalize parameters
-	const parameter &labelp = inst.param(0);
+	parameter const &labelp = inst.param(0);
 	assert(labelp.is_code_label());
 
-	// look up the jump target and jump there
-	x86code *jmptarget = (x86code *)m_labels.get_codeptr(labelp.label(), m_fixup_label, dst);
+	std::string labelName = util::string_format("PC$%x", labelp.label());
+	Label jmptarget = a.labelByName(labelName.c_str());
+	if (!jmptarget.isValid())
+		jmptarget = a.newNamedLabel(labelName.c_str());
+
 	if (inst.condition() == uml::COND_ALWAYS)
-		emit_jmp(dst, jmptarget);                                                       // jmp   target
+		a.jmp(jmptarget);                                                               // jmp   target
 	else
-		emit_jcc(dst, X86_CONDITION(inst.condition()), jmptarget);                      // jcc   target
+		a.j(X86_CONDITION(inst.condition()), jmptarget);                                // jcc   target
 }
 
 
@@ -3159,7 +2273,7 @@
 //  op_exh - process an EXH opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_exh(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_exh(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3167,29 +2281,24 @@
 	assert_no_flags(inst);
 
 	// normalize parameters
-	const parameter &handp = inst.param(0);
+	parameter const &handp = inst.param(0);
 	assert(handp.is_code_handle());
 	be_parameter exp(*this, inst.param(1), PTYPE_MRI);
 
 	// look up the handle target
 	drccodeptr *targetptr = handp.handle().codeptr_addr();
 
-	// perform the exception processing inline if unconditional
-	if (inst.condition() == uml::COND_ALWAYS)
-	{
-		emit_mov_m32_p32(dst, MABS(&m_state.exp), exp);                 // mov   [exp],exp
-		if (*targetptr != nullptr)
-			emit_call(dst, *targetptr);                                             // call  *targetptr
-		else
-			emit_call_m32(dst, MABS(targetptr));                                        // call  [targetptr]
-	}
-
-	// otherwise, jump to an out-of-band handler
+	// perform the exception processing
+	Label no_exception = a.newLabel();
+	if (inst.condition() != uml::COND_ALWAYS)
+		a.short_().j(X86_NOT_CONDITION(inst.condition()), no_exception);                // jcc   no_exception
+	emit_mov_m32_p32(a, MABS(&m_state.exp, 4), exp);                                    // mov   [exp],exp
+	if (*targetptr != nullptr)
+		a.call(imm(*targetptr));                                                        // call  *targetptr
 	else
-	{
-		emit_jcc(dst, X86_CONDITION(inst.condition()), nullptr);                              // jcc   exception
-		m_cache.request_oob_codegen(m_fixup_exception, dst, &const_cast<instruction &>(inst));
-	}
+		a.call(MABS(targetptr));                                                        // call  [targetptr]
+	if (inst.condition() != uml::COND_ALWAYS)
+		a.bind(no_exception);
 }
 
 
@@ -3197,7 +2306,7 @@
 //  op_callh - process a CALLH opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_callh(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_callh(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3205,26 +2314,29 @@
 	assert_no_flags(inst);
 
 	// normalize parameters
-	const parameter &handp = inst.param(0);
+	parameter const &handp = inst.param(0);
 	assert(handp.is_code_handle());
 
 	// look up the handle target
 	drccodeptr *targetptr = handp.handle().codeptr_addr();
 
 	// skip if conditional
-	emit_link skip = { nullptr };
+	Label skip = a.newLabel();
 	if (inst.condition() != uml::COND_ALWAYS)
-		emit_jcc_short_link(dst, X86_NOT_CONDITION(inst.condition()), skip);            // jcc   skip
+		a.short_().j(X86_NOT_CONDITION(inst.condition()), skip);                        // jcc   skip
 
 	// jump through the handle; directly if a normal jump
 	if (*targetptr != nullptr)
-		emit_call(dst, *targetptr);                                                 // call  *targetptr
+		a.call(imm(*targetptr));                                                        // call  *targetptr
 	else
-		emit_call_m32(dst, MABS(targetptr));                                            // call  [targetptr]
+		a.call(MABS(targetptr));                                                        // call  [targetptr]
 
 	// resolve the conditional link
 	if (inst.condition() != uml::COND_ALWAYS)
-		track_resolve_link(dst, skip);                                              // skip:
+	{
+		a.bind(skip);                                                               // skip:
+		reset_last_upper_lower_reg();
+	}
 }
 
 
@@ -3232,7 +2344,7 @@
 //  op_ret - process a RET opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_ret(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_ret(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3241,17 +2353,20 @@
 	assert(inst.numparams() == 0);
 
 	// skip if conditional
-	emit_link skip = { nullptr };
+	Label skip = a.newLabel();
 	if (inst.condition() != uml::COND_ALWAYS)
-		emit_jcc_short_link(dst, X86_NOT_CONDITION(inst.condition()), skip);            // jcc   skip
+		a.j(X86_NOT_CONDITION(inst.condition()), skip);                                 // jcc   skip
 
 	// return
-	emit_lea_r32_m32(dst, REG_ESP, MBD(REG_ESP, 28));                                   // lea   rsp,[rsp+28]
-	emit_ret(dst);                                                                      // ret
+	a.lea(esp, ptr(esp, 28));                                                           // lea   rsp,[rsp+28]
+	a.ret();                                                                            // ret
 
 	// resolve the conditional link
 	if (inst.condition() != uml::COND_ALWAYS)
-		track_resolve_link(dst, skip);                                              // skip:
+	{
+		a.bind(skip);                                                               // skip:
+		reset_last_upper_lower_reg();
+	}
 }
 
 
@@ -3259,7 +2374,7 @@
 //  op_callc - process a CALLC opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_callc(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_callc(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3267,22 +2382,25 @@
 	assert_no_flags(inst);
 
 	// normalize parameters
-	const parameter &funcp = inst.param(0);
+	parameter const &funcp = inst.param(0);
 	assert(funcp.is_c_function());
 	be_parameter paramp(*this, inst.param(1), PTYPE_M);
 
 	// skip if conditional
-	emit_link skip = { nullptr };
+	Label skip = a.newLabel();
 	if (inst.condition() != uml::COND_ALWAYS)
-		emit_jcc_short_link(dst, X86_NOT_CONDITION(inst.condition()), skip);            // jcc   skip
+		a.j(X86_NOT_CONDITION(inst.condition()), skip);                                 // jcc   skip
 
 	// perform the call
-	emit_mov_m32_imm(dst, MBD(REG_ESP, 0), (uintptr_t)paramp.memory());                          // mov   [esp],paramp
-	emit_call(dst, (x86code *)(uintptr_t)funcp.cfunc());                                     // call  funcp
+	a.mov(dword_ptr(esp, 0), imm(paramp.memory()));                                     // mov   [esp],paramp
+	a.call(imm(funcp.cfunc()));                                                         // call  funcp
 
 	// resolve the conditional link
 	if (inst.condition() != uml::COND_ALWAYS)
-		track_resolve_link(dst, skip);                                              // skip:
+	{
+		a.bind(skip);                                                               // skip:
+		reset_last_upper_lower_reg();
+	}
 }
 
 
@@ -3290,7 +2408,7 @@
 //  op_recover - process a RECOVER opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_recover(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_recover(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3301,14 +2419,14 @@
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
 
 	// call the recovery code
-	emit_mov_r32_m32(dst, REG_EAX, MABS(&m_stacksave));                         // mov   eax,stacksave
-	emit_mov_r32_m32(dst, REG_EAX, MBD(REG_EAX, -4));                                   // mov   eax,[eax-4]
-	emit_sub_r32_imm(dst, REG_EAX, 1);                                                  // sub   eax,1
-	emit_mov_m32_imm(dst, MBD(REG_ESP, 8), inst.param(1).mapvar());                     // mov   [esp+8],param1
-	emit_mov_m32_r32(dst, MBD(REG_ESP, 4), REG_EAX);                                    // mov   [esp+4],eax
-	emit_mov_m32_imm(dst, MBD(REG_ESP, 0), (uintptr_t)&m_map);                           // mov   [esp],m_map
-	emit_call(dst, (x86code *)&drc_map_variables::static_get_value);                    // call  drcmap_get_value
-	emit_mov_p32_r32(dst, dstp, REG_EAX);                                       // mov   dstp,eax
+	a.mov(eax, MABS(&m_stacksave));                                                     // mov   eax,stacksave
+	a.mov(eax, ptr(eax, -4));                                                           // mov   eax,[eax-4]
+	a.sub(eax, 1);                                                                      // sub   eax,1
+	a.mov(dword_ptr(esp, 8), inst.param(1).mapvar());                                   // mov   [esp+8],param1
+	a.mov(ptr(esp, 4), eax);                                                            // mov   [esp+4],eax
+	a.mov(dword_ptr(esp, 0), imm(&m_map));                                              // mov   [esp],m_map
+	a.call(imm(&drc_map_variables::static_get_value));                                  // call  drcmap_get_value
+	emit_mov_p32_r32(a, dstp, eax);                                                     // mov   dstp,eax
 }
 
 
@@ -3321,7 +2439,7 @@
 //  op_setfmod - process a SETFMOD opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_setfmod(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_setfmod(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3335,17 +2453,17 @@
 	if (srcp.is_immediate())
 	{
 		int value = srcp.immediate() & 3;
-		emit_mov_m8_imm(dst, MABS(&m_state.fmod), value);                   // mov   [fmod],srcp
-		emit_fldcw_m16(dst, MABS(&fp_control[value]));                          // fldcw fp_control[srcp]
+		a.mov(MABS(&m_state.fmod, 1), value);                                           // mov   [fmod],srcp
+		a.fldcw(MABS(&fp_control[value], 2));                                           // fldcw fp_control[srcp]
 	}
 
 	// register/memory case
 	else
 	{
-		emit_mov_r32_p32(dst, REG_EAX, srcp);                                   // mov   eax,srcp
-		emit_and_r32_imm(dst, REG_EAX, 3);                                              // and   eax,3
-		emit_mov_m8_r8(dst, MABS(&m_state.fmod), REG_AL);                           // mov   [fmod],al
-		emit_fldcw_m16(dst, MABSI(&fp_control[0], REG_EAX, 2));                         // fldcw fp_control[eax]
+		emit_mov_r32_p32(a, eax, srcp);                                                 // mov   eax,srcp
+		a.and_(eax, 3);                                                                 // and   eax,3
+		a.mov(MABS(&m_state.fmod), al);                                                 // mov   [fmod],al
+		a.fldcw(ptr(u64(&fp_control[0]), eax, 1, 2));                                   // fldcw fp_control[eax]
 	}
 }
 
@@ -3354,7 +2472,7 @@
 //  op_getfmod - process a GETFMOD opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_getfmod(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_getfmod(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3366,11 +2484,11 @@
 
 	// fetch the current mode and store to the destination
 	if (dstp.is_int_register())
-		emit_movzx_r32_m8(dst, dstp.ireg(), MABS(&m_state.fmod));                   // movzx reg,[fmod]
+		a.movzx(Gpd(dstp.ireg()), MABS(&m_state.fmod, 1));                              // movzx reg,[fmod]
 	else
 	{
-		emit_movzx_r32_m8(dst, REG_EAX, MABS(&m_state.fmod));                       // movzx eax,[fmod]
-		emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX);                                // mov   [dstp],eax
+		a.movzx(eax, MABS(&m_state.fmod, 1));                                           // movzx eax,[fmod]
+		a.mov(MABS(dstp.memory()), eax);                                                // mov   [dstp],eax
 	}
 }
 
@@ -3379,7 +2497,7 @@
 //  op_getexp - process a GETEXP opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_getexp(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_getexp(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3391,11 +2509,11 @@
 
 	// fetch the exception parameter and store to the destination
 	if (dstp.is_int_register())
-		emit_mov_r32_m32(dst, dstp.ireg(), MABS(&m_state.exp));                 // mov   reg,[exp]
+		a.mov(Gpd(dstp.ireg()), MABS(&m_state.exp));                                    // mov   reg,[exp]
 	else
 	{
-		emit_mov_r32_m32(dst, REG_EAX, MABS(&m_state.exp));                     // mov   eax,[exp]
-		emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX);                                // mov   [dstp],eax
+		a.mov(eax, MABS(&m_state.exp));                                                 // mov   eax,[exp]
+		a.mov(MABS(dstp.memory()), eax);                                                // mov   [dstp],eax
 	}
 }
 
@@ -3404,7 +2522,7 @@
 //  op_getflgs - process a GETFLGS opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_getflgs(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_getflgs(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3416,7 +2534,7 @@
 	be_parameter maskp(*this, inst.param(1), PTYPE_I);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+	Gp const dstreg = dstp.select_register(eax);
 
 	// compute mask for flags
 	uint32_t flagmask = 0;
@@ -3430,108 +2548,108 @@
 	{
 		// single flags only
 		case FLAG_C:
-			emit_setcc_r8(dst, x86emit::COND_C, REG_AL);                                        // setc   al
-			emit_movzx_r32_r8(dst, dstreg, REG_AL);                                 // movzx  dstreg,al
+			a.setc(al);                                                                 // setc   al
+			a.movzx(dstreg, al);                                                        // movzx  dstreg,al
 			break;
 
 		case FLAG_V:
-			emit_setcc_r8(dst, x86emit::COND_O, REG_AL);                                        // seto   al
-			emit_movzx_r32_r8(dst, dstreg, REG_AL);                                 // movzx  dstreg,al
-			emit_shl_r32_imm(dst, dstreg, 1);                                           // shl    dstreg,1
+			a.seto(al);                                                                 // seto   al
+			a.movzx(dstreg, al);                                                        // movzx  dstreg,al
+			a.shl(dstreg, 1);                                                           // shl    dstreg,1
 			break;
 
 		case FLAG_Z:
-			emit_setcc_r8(dst, x86emit::COND_Z, REG_AL);                                        // setz   al
-			emit_movzx_r32_r8(dst, dstreg, REG_AL);                                 // movzx  dstreg,al
-			emit_shl_r32_imm(dst, dstreg, 2);                                           // shl    dstreg,2
+			a.setz(al);                                                                 // setz   al
+			a.movzx(dstreg, al);                                                        // movzx  dstreg,al
+			a.shl(dstreg, 2);                                                           // shl    dstreg,2
 			break;
 
 		case FLAG_S:
-			emit_setcc_r8(dst, x86emit::COND_S, REG_AL);                                        // sets   al
-			emit_movzx_r32_r8(dst, dstreg, REG_AL);                                 // movzx  dstreg,al
-			emit_shl_r32_imm(dst, dstreg, 3);                                           // shl    dstreg,3
+			a.sets(al);                                                                 // sets   al
+			a.movzx(dstreg, al);                                                        // movzx  dstreg,al
+			a.shl(dstreg, 3);                                                           // shl    dstreg,3
 			break;
 
 		case FLAG_U:
-			emit_setcc_r8(dst, x86emit::COND_P, REG_AL);                                        // setp   al
-			emit_movzx_r32_r8(dst, dstreg, REG_AL);                                 // movzx  dstreg,al
-			emit_shl_r32_imm(dst, dstreg, 4);                                           // shl    dstreg,4
+			a.setp(al);                                                                 // setp   al
+			a.movzx(dstreg, al);                                                        // movzx  dstreg,al
+			a.shl(dstreg, 4);                                                           // shl    dstreg,4
 			break;
 
 		// carry plus another flag
 		case FLAG_C | FLAG_V:
-			emit_setcc_r8(dst, x86emit::COND_C, REG_AL);                                        // setc   al
-			emit_setcc_r8(dst, x86emit::COND_O, REG_CL);                                        // seto   cl
-			emit_movzx_r32_r8(dst, REG_EAX, REG_AL);                                    // movzx  eax,al
-			emit_movzx_r32_r8(dst, REG_ECX, REG_CL);                                    // movzx  ecx,al
-			emit_lea_r32_m32(dst, dstreg, MBISD(REG_EAX, REG_ECX, 2, 0));               // lea    dstreg,[eax+ecx*2]
+			a.setc(al);                                                                 // setc   al
+			a.seto(cl);                                                                 // seto   cl
+			a.movzx(eax, al);                                                           // movzx  eax,al
+			a.movzx(ecx, cl);                                                           // movzx  ecx,al
+			a.lea(dstreg, ptr(eax, ecx, 1));                                            // lea    dstreg,[eax+ecx*2]
 			break;
 
 		case FLAG_C | FLAG_Z:
-			emit_setcc_r8(dst, x86emit::COND_C, REG_AL);                                        // setc   al
-			emit_setcc_r8(dst, x86emit::COND_Z, REG_CL);                                        // setz   cl
-			emit_movzx_r32_r8(dst, REG_EAX, REG_AL);                                    // movzx  eax,al
-			emit_movzx_r32_r8(dst, REG_ECX, REG_CL);                                    // movzx  ecx,al
-			emit_lea_r32_m32(dst, dstreg, MBISD(REG_EAX, REG_ECX, 4, 0));               // lea    dstreg,[eax+ecx*4]
+			a.setc(al);                                                                 // setc   al
+			a.setz(cl);                                                                 // setz   cl
+			a.movzx(eax, al);                                                           // movzx  eax,al
+			a.movzx(ecx, cl);                                                           // movzx  ecx,al
+			a.lea(dstreg, ptr(eax, ecx, 2));                                            // lea    dstreg,[eax+ecx*4]
 			break;
 
 		case FLAG_C | FLAG_S:
-			emit_setcc_r8(dst, x86emit::COND_C, REG_AL);                                        // setc   al
-			emit_setcc_r8(dst, x86emit::COND_S, REG_CL);                                        // sets   cl
-			emit_movzx_r32_r8(dst, REG_EAX, REG_AL);                                    // movzx  eax,al
-			emit_movzx_r32_r8(dst, REG_ECX, REG_CL);                                    // movzx  ecx,al
-			emit_lea_r32_m32(dst, dstreg, MBISD(REG_EAX, REG_ECX, 8, 0));               // lea    dstreg,[eax+ecx*8]
+			a.setc(al);                                                                 // setc   al
+			a.sets(cl);                                                                 // sets   cl
+			a.movzx(eax, al);                                                           // movzx  eax,al
+			a.movzx(ecx, cl);                                                           // movzx  ecx,al
+			a.lea(dstreg, ptr(eax, ecx, 3));                                            // lea    dstreg,[eax+ecx*8]
 			break;
 
 		// overflow plus another flag
 		case FLAG_V | FLAG_Z:
-			emit_setcc_r8(dst, x86emit::COND_O, REG_AL);                                        // seto   al
-			emit_setcc_r8(dst, x86emit::COND_Z, REG_CL);                                        // setz   cl
-			emit_movzx_r32_r8(dst, REG_EAX, REG_AL);                                    // movzx  eax,al
-			emit_movzx_r32_r8(dst, REG_ECX, REG_CL);                                    // movzx  ecx,al
-			emit_lea_r32_m32(dst, dstreg, MBISD(REG_EAX, REG_ECX, 2, 0));               // lea    dstreg,[eax+ecx*2]
-			emit_shl_r32_imm(dst, dstreg, 1);                                           // shl    dstreg,1
+			a.seto(al);                                                                 // seto   al
+			a.setz(cl);                                                                 // setz   cl
+			a.movzx(eax, al);                                                           // movzx  eax,al
+			a.movzx(ecx, cl);                                                           // movzx  ecx,al
+			a.lea(dstreg, ptr(eax, ecx, 1));                                            // lea    dstreg,[eax+ecx*2]
+			a.shl(dstreg, 1);                                                           // shl    dstreg,1
 			break;
 
 		case FLAG_V | FLAG_S:
-			emit_setcc_r8(dst, x86emit::COND_O, REG_AL);                                        // seto   al
-			emit_setcc_r8(dst, x86emit::COND_S, REG_CL);                                        // sets   cl
-			emit_movzx_r32_r8(dst, REG_EAX, REG_AL);                                    // movzx  eax,al
-			emit_movzx_r32_r8(dst, REG_ECX, REG_CL);                                    // movzx  ecx,al
-			emit_lea_r32_m32(dst, dstreg, MBISD(REG_EAX, REG_ECX, 4, 0));               // lea    dstreg,[eax+ecx*4]
-			emit_shl_r32_imm(dst, dstreg, 1);                                           // shl    dstreg,1
+			a.seto(al);                                                                 // seto   al
+			a.sets(cl);                                                                 // sets   cl
+			a.movzx(eax, al);                                                           // movzx  eax,al
+			a.movzx(ecx, cl);                                                           // movzx  ecx,al
+			a.lea(dstreg, ptr(eax, ecx, 2));                                            // lea    dstreg,[eax+ecx*4]
+			a.shl(dstreg, 1);                                                           // shl    dstreg,1
 			break;
 
 		// zero plus another flag
 		case FLAG_Z | FLAG_S:
-			emit_setcc_r8(dst, x86emit::COND_Z, REG_AL);                                        // setz   al
-			emit_setcc_r8(dst, x86emit::COND_S, REG_CL);                                        // sets   cl
-			emit_movzx_r32_r8(dst, REG_EAX, REG_AL);                                    // movzx  eax,al
-			emit_movzx_r32_r8(dst, REG_ECX, REG_CL);                                    // movzx  ecx,al
-			emit_lea_r32_m32(dst, dstreg, MBISD(REG_EAX, REG_ECX, 2, 0));               // lea    dstreg,[eax+ecx*2]
-			emit_shl_r32_imm(dst, dstreg, 2);                                           // shl    dstreg,2
+			a.setz(al);                                                                 // setz   al
+			a.sets(cl);                                                                 // sets   cl
+			a.movzx(eax, al);                                                           // movzx  eax,al
+			a.movzx(ecx, cl);                                                           // movzx  ecx,al
+			a.lea(dstreg, ptr(eax, ecx, 1));                                            // lea    dstreg,[eax+ecx*2]
+			a.shl(dstreg, 2);                                                           // shl    dstreg,2
 			break;
 
 		// default cases
 		default:
-			emit_pushf(dst);                                                            // pushf
-			emit_pop_r32(dst, REG_EAX);                                             // pop    eax
-			emit_and_r32_imm(dst, REG_EAX, flagmask);                                   // and    eax,flagmask
-			emit_movzx_r32_m8(dst, dstreg, MABSI(flags_map, REG_EAX));                  // movzx  dstreg,[flags_map]
+			a.pushfd();                                                                 // pushf
+			a.pop(eax);                                                                 // pop    eax
+			a.and_(eax, flagmask);                                                      // and    eax,flagmask
+			a.movzx(dstreg, byte_ptr(u64(flags_map), eax));                             // movzx  dstreg,[flags_map]
 			break;
 	}
 
 	// store low 32 bits
-	emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+	emit_mov_p32_r32(a, dstp, dstreg);                                                  // mov   dstp,dstreg
 
 	// 64-bit form stores upper 32 bits
 	if (inst.size() == 8)
 	{
 		// general case
 		if (dstp.is_memory())
-			emit_mov_m32_imm(dst, MABS(dstp.memory(4)), 0);                         // mov   [dstp+4],0
+			a.mov(MABS(dstp.memory(4), 4), 0);                                          // mov   [dstp+4],0
 		else if (dstp.is_int_register())
-			emit_mov_m32_imm(dst, MABS(m_reghi[dstp.ireg()]), 0);                   // mov   [reghi],0
+			a.mov(MABS(m_reghi[dstp.ireg()], 4), 0);                                    // mov   [reghi],0
 	}
 }
 
@@ -3540,7 +2658,7 @@
 //  op_save - process a SAVE opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_save(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_save(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3551,8 +2669,8 @@
 	be_parameter dstp(*this, inst.param(0), PTYPE_M);
 
 	// copy live state to the destination
-	emit_mov_r32_imm(dst, REG_ECX, (uintptr_t)dstp.memory());                                        // mov    ecx,dstp
-	emit_call(dst, m_save);                                                     // call   save
+	a.mov(ecx, imm(dstp.memory()));                                                     // mov    ecx,dstp
+	a.call(imm(m_save));                                                                // call   save
 }
 
 
@@ -3560,7 +2678,7 @@
 //  op_restore - process a RESTORE opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_restore(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_restore(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4);
@@ -3570,8 +2688,8 @@
 	be_parameter srcp(*this, inst.param(0), PTYPE_M);
 
 	// copy live state from the destination
-	emit_mov_r32_imm(dst, REG_ECX, (uintptr_t)srcp.memory());                                        // mov    ecx,dstp
-	emit_call(dst, m_restore);                                                  // call   restore
+	a.mov(ecx, imm(srcp.memory()));                                                     // mov    ecx,dstp
+	a.call(imm(m_restore));                                                             // call   restore
 }
 
 
@@ -3584,7 +2702,7 @@
 //  op_load - process a LOAD opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_load(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_load(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -3595,50 +2713,51 @@
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
 	be_parameter basep(*this, inst.param(1), PTYPE_M);
 	be_parameter indp(*this, inst.param(2), PTYPE_MRI);
-	const parameter &scalesizep = inst.param(3);
+	parameter const &scalesizep = inst.param(3);
 	assert(scalesizep.is_size_scale());
-	int scale = 1 << scalesizep.scale();
-	int size = scalesizep.size();
+	int const size = scalesizep.size();
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+	Gp const dstreg = dstp.select_register(eax);
 
 	// immediate index
 	if (indp.is_immediate())
 	{
+		int const scale = 1 << scalesizep.scale();
+
 		if (size == SIZE_BYTE)
-			emit_movzx_r32_m8(dst, dstreg, MABS(basep.memory(scale*indp.immediate())));     // movzx dstreg,[basep + scale*indp]
+			a.movzx(dstreg, MABS(basep.memory(scale*indp.immediate()), 1));             // movzx dstreg,[basep + scale*indp]
 		else if (size == SIZE_WORD)
-			emit_movzx_r32_m16(dst, dstreg, MABS(basep.memory(scale*indp.immediate())));        // movzx dstreg,[basep + scale*indp]
+			a.movzx(dstreg, MABS(basep.memory(scale*indp.immediate()), 2));             // movzx dstreg,[basep + scale*indp]
 		else if (size == SIZE_DWORD)
-			emit_mov_r32_m32(dst, dstreg, MABS(basep.memory(scale*indp.immediate())));      // mov   dstreg,[basep + scale*indp]
+			a.mov(dstreg, MABS(basep.memory(scale*indp.immediate())));                  // mov   dstreg,[basep + scale*indp]
 		else if (size == SIZE_QWORD)
 		{
-			emit_mov_r32_m32(dst, REG_EDX, MABS(basep.memory(scale*indp.immediate() + 4))); // mov   edx,[basep + scale*indp + 4]
-			emit_mov_r32_m32(dst, dstreg, MABS(basep.memory(scale*indp.immediate())));      // mov   dstreg,[basep + scale*indp]
+			a.mov(edx, MABS(basep.memory(scale*indp.immediate() + 4)));                 // mov   edx,[basep + scale*indp + 4]
+			a.mov(dstreg, MABS(basep.memory(scale*indp.immediate())));                  // mov   dstreg,[basep + scale*indp]
 		}
 	}
 
 	// other index
 	else
 	{
-		int indreg = indp.select_register(REG_ECX);
-		emit_mov_r32_p32(dst, indreg, indp);
+		Gp const indreg = indp.select_register(ecx);
+		emit_mov_r32_p32(a, indreg, indp);
 		if (size == SIZE_BYTE)
-			emit_movzx_r32_m8(dst, dstreg, MABSI(basep.memory(), indreg, scale));           // movzx dstreg,[basep + scale*indp]
+			a.movzx(dstreg, ptr(u64(basep.memory()), indreg, scalesizep.scale(), 1));   // movzx dstreg,[basep + scale*indp]
 		else if (size == SIZE_WORD)
-			emit_movzx_r32_m16(dst, dstreg, MABSI(basep.memory(), indreg, scale));          // movzx dstreg,[basep + scale*indp]
+			a.movzx(dstreg, ptr(u64(basep.memory()), indreg, scalesizep.scale(), 2));   // movzx dstreg,[basep + scale*indp]
 		else if (size == SIZE_DWORD)
-			emit_mov_r32_m32(dst, dstreg, MABSI(basep.memory(), indreg, scale));            // mov   dstreg,[basep + scale*indp]
+			a.mov(dstreg, ptr(u64(basep.memory()), indreg, scalesizep.scale()));        // mov   dstreg,[basep + scale*indp]
 		else if (size == SIZE_QWORD)
 		{
-			emit_mov_r32_m32(dst, REG_EDX, MABSI(basep.memory(4), indreg, scale));      // mov   edx,[basep + scale*indp + 4]
-			emit_mov_r32_m32(dst, dstreg, MABSI(basep.memory(), indreg, scale));            // mov   dstreg,[basep + scale*indp]
+			a.mov(edx, ptr(u64(basep.memory(4)), indreg, scalesizep.scale()));          // mov   edx,[basep + scale*indp + 4]
+			a.mov(dstreg, ptr(u64(basep.memory(0)), indreg, scalesizep.scale()));       // mov   dstreg,[basep + scale*indp]
 		}
 	}
 
 	// store low 32 bits
-	emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+	emit_mov_p32_r32(a, dstp, dstreg);                                                  // mov   dstp,dstreg
 
 	// 64-bit form stores upper 32 bits
 	if (inst.size() == 8)
@@ -3647,22 +2766,22 @@
 		if (size != SIZE_QWORD)
 		{
 			if (dstp.is_memory())
-				emit_mov_m32_imm(dst, MABS(dstp.memory(4)), 0);                     // mov   [dstp+4],0
+				a.mov(MABS(dstp.memory(4), 4), 0);                                      // mov   [dstp+4],0
 			else if (dstp.is_int_register())
-				emit_mov_m32_imm(dst, MABS(m_reghi[dstp.ireg()]), 0);               // mov   [reghi],0
+				a.mov(MABS(m_reghi[dstp.ireg()], 4), 0);                                // mov   [reghi],0
 		}
 
 		// 8-byte case
 		else
 		{
 			if (dstp.is_memory())
-				emit_mov_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX);                   // mov   [dstp+4],edx
+				a.mov(MABS(dstp.memory(4)), edx);                                       // mov   [dstp+4],edx
 			else if (dstp.is_int_register())
-				emit_mov_m32_r32(dst, MABS(m_reghi[dstp.ireg()]), REG_EDX);     // mov   [reghi],edx
-			set_last_upper_reg(dst, dstp, REG_EDX);
+				a.mov(MABS(m_reghi[dstp.ireg()]), edx);                                 // mov   [reghi],edx
+			set_last_upper_reg(a, dstp, edx);
 		}
 	}
-	set_last_lower_reg(dst, dstp, dstreg);
+	set_last_lower_reg(a, dstp, dstreg);
 }
 
 
@@ -3670,7 +2789,7 @@
 //  op_loads - process a LOADS opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_loads(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_loads(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -3681,62 +2800,63 @@
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
 	be_parameter basep(*this, inst.param(1), PTYPE_M);
 	be_parameter indp(*this, inst.param(2), PTYPE_MRI);
-	const parameter &scalesizep = inst.param(3);
+	parameter const &scalesizep = inst.param(3);
 	assert(scalesizep.is_size_scale());
-	int scale = 1 << scalesizep.scale();
-	int size = scalesizep.size();
+	int const size = scalesizep.size();
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+	Gp const dstreg = dstp.select_register(eax);
 
 	// immediate index
 	if (indp.is_immediate())
 	{
+		int const scale = 1 << scalesizep.scale();
+
 		if (size == SIZE_BYTE)
-			emit_movsx_r32_m8(dst, dstreg, MABS(basep.memory(scale*indp.immediate())));     // movsx dstreg,[basep + scale*indp]
+			a.movsx(dstreg, MABS(basep.memory(scale*indp.immediate()), 1));             // movsx dstreg,[basep + scale*indp]
 		else if (size == SIZE_WORD)
-			emit_movsx_r32_m16(dst, dstreg, MABS(basep.memory(scale*indp.immediate())));        // movsx dstreg,[basep + scale*indp]
+			a.movsx(dstreg, MABS(basep.memory(scale*indp.immediate()), 2));             // movsx dstreg,[basep + scale*indp]
 		else if (size == SIZE_DWORD)
-			emit_mov_r32_m32(dst, dstreg, MABS(basep.memory(scale*indp.immediate())));      // mov   dstreg,[basep + scale*indp]
+			a.mov(dstreg, MABS(basep.memory(scale*indp.immediate())));                  // mov   dstreg,[basep + scale*indp]
 		else if (size == SIZE_QWORD)
 		{
-			emit_mov_r32_m32(dst, REG_EDX, MABS(basep.memory(scale*indp.immediate() + 4))); // mov   edx,[basep + scale*indp + 4]
-			emit_mov_r32_m32(dst, dstreg, MABS(basep.memory(scale*indp.immediate())));      // mov   dstreg,[basep + scale*indp]
+			a.mov(edx, MABS(basep.memory(scale*indp.immediate() + 4)));                 // mov   edx,[basep + scale*indp + 4]
+			a.mov(dstreg, MABS(basep.memory(scale*indp.immediate())));                  // mov   dstreg,[basep + scale*indp]
 		}
 	}
 
 	// other index
 	else
 	{
-		int indreg = indp.select_register(REG_ECX);
-		emit_mov_r32_p32(dst, indreg, indp);
+		Gp const indreg = indp.select_register(ecx);
+		emit_mov_r32_p32(a, indreg, indp);
 		if (size == SIZE_BYTE)
-			emit_movsx_r32_m8(dst, dstreg, MABSI(basep.memory(), indreg, scale));           // movsx dstreg,[basep + scale*indp]
+			a.movsx(dstreg, ptr(u64(basep.memory()), indreg, scalesizep.scale(), 1));   // movsx dstreg,[basep + scale*indp]
 		else if (size == SIZE_WORD)
-			emit_movsx_r32_m16(dst, dstreg, MABSI(basep.memory(), indreg, scale));          // movsx dstreg,[basep + scale*indp]
+			a.movsx(dstreg, ptr(u64(basep.memory()), indreg, scalesizep.scale(), 2));   // movsx dstreg,[basep + scale*indp]
 		else if (size == SIZE_DWORD)
-			emit_mov_r32_m32(dst, dstreg, MABSI(basep.memory(), indreg, scale));            // mov   dstreg,[basep + scale*indp]
+			a.mov(dstreg, ptr(u64(basep.memory()), indreg, scalesizep.scale()));        // mov   dstreg,[basep + scale*indp]
 		else if (size == SIZE_QWORD)
 		{
-			emit_mov_r32_m32(dst, REG_EDX, MABSI(basep.memory(4), indreg, scale));      // mov   edx,[basep + scale*indp + 4]
-			emit_mov_r32_m32(dst, dstreg, MABSI(basep.memory(), indreg, scale));            // mov   dstreg,[basep + scale*indp]
+			a.mov(edx, ptr(u64(basep.memory(4)), indreg, scalesizep.scale()));          // mov   edx,[basep + scale*indp + 4]
+			a.mov(dstreg, ptr(u64(basep.memory(0)), indreg, scalesizep.scale()));       // mov   dstreg,[basep + scale*indp]
 		}
 	}
 
 	// store low 32 bits
-	emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+	emit_mov_p32_r32(a, dstp, dstreg);                                                  // mov   dstp,dstreg
 
 	// 64-bit form stores upper 32 bits
 	if (inst.size() == 8)
 	{
-		emit_cdq(dst);                                                                  // cdq
+		a.cdq();                                                                        // cdq
 		if (dstp.is_memory())
-			emit_mov_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX);                       // mov   [dstp+4],edx
+			a.mov(MABS(dstp.memory(4)), edx);                                           // mov   [dstp+4],edx
 		else if (dstp.is_int_register())
-			emit_mov_m32_r32(dst, MABS(m_reghi[dstp.ireg()]), REG_EDX);         // mov   [reghi],edx
-		set_last_upper_reg(dst, dstp, REG_EDX);
+			a.mov(MABS(m_reghi[dstp.ireg()]), edx);                                     // mov   [reghi],edx
+		set_last_upper_reg(a, dstp, edx);
 	}
-	set_last_lower_reg(dst, dstp, dstreg);
+	set_last_lower_reg(a, dstp, dstreg);
 }
 
 
@@ -3744,7 +2864,7 @@
 //  op_store - process a STORE opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_store(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_store(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -3755,31 +2875,32 @@
 	be_parameter basep(*this, inst.param(0), PTYPE_M);
 	be_parameter indp(*this, inst.param(1), PTYPE_MRI);
 	be_parameter srcp(*this, inst.param(2), PTYPE_MRI);
-	const parameter &scalesizep = inst.param(3);
-	int scale = 1 << (scalesizep.scale());
-	int size = scalesizep.size();
+	parameter const &scalesizep = inst.param(3);
+	int const size = scalesizep.size();
 
 	// pick a source register for the general case
-	int srcreg = srcp.select_register(REG_EAX);
-	if (size == SIZE_BYTE && (srcreg & 4))
-		srcreg = REG_EAX;
+	Gp srcreg = srcp.select_register(eax);
+	if (size == SIZE_BYTE && (srcreg.id() & 4)) // FIXME: &4?
+		srcreg = eax;
 
 	// degenerate case: constant index
 	if (indp.is_immediate())
 	{
+		int const scale = 1 << (scalesizep.scale());
+
 		// immediate source
 		if (srcp.is_immediate())
 		{
 			if (size == SIZE_BYTE)
-				emit_mov_m8_imm(dst, MABS(basep.memory(scale*indp.immediate())), srcp.immediate()); // mov   [basep + scale*indp],srcp
+				a.mov(MABS(basep.memory(scale*indp.immediate()), 1), srcp.immediate()); // mov   [basep + scale*indp],srcp
 			else if (size == SIZE_WORD)
-				emit_mov_m16_imm(dst, MABS(basep.memory(scale*indp.immediate())), srcp.immediate());    // mov   [basep + scale*indp],srcp
+				a.mov(MABS(basep.memory(scale*indp.immediate()), 2), srcp.immediate()); // mov   [basep + scale*indp],srcp
 			else if (size == SIZE_DWORD)
-				emit_mov_m32_imm(dst, MABS(basep.memory(scale*indp.immediate())), srcp.immediate());    // mov   [basep + scale*indp],srcp
+				a.mov(MABS(basep.memory(scale*indp.immediate()), 4), srcp.immediate()); // mov   [basep + scale*indp],srcp
 			else if (size == SIZE_QWORD)
 			{
-				emit_mov_m32_imm(dst, MABS(basep.memory(scale*indp.immediate())), srcp.immediate());    // mov   [basep + scale*indp],srcp
-				emit_mov_m32_imm(dst, MABS(basep.memory(scale*indp.immediate() + 4)), srcp.immediate() >> 32);
+				a.mov(MABS(basep.memory(scale*indp.immediate()), 4), srcp.immediate()); // mov   [basep + scale*indp],srcp
+				a.mov(MABS(basep.memory(scale*indp.immediate() + 4), 4), srcp.immediate() >> 32);
 																						// mov   [basep + scale*indp + 4],srcp >> 32
 			}
 		}
@@ -3788,19 +2909,19 @@
 		else
 		{
 			if (size != SIZE_QWORD)
-				emit_mov_r32_p32(dst, srcreg, srcp);                            // mov   srcreg,srcp
+				emit_mov_r32_p32(a, srcreg, srcp);                                      // mov   srcreg,srcp
 			else
-				emit_mov_r64_p64(dst, srcreg, REG_EDX, srcp);                   // mov   edx:srcreg,srcp
+				emit_mov_r64_p64(a, srcreg, edx, srcp);                                 // mov   edx:srcreg,srcp
 			if (size == SIZE_BYTE)
-				emit_mov_m8_r8(dst, MABS(basep.memory(scale*indp.immediate())), srcreg);        // mov   [basep + scale*indp],srcreg
+				a.mov(MABS(basep.memory(scale*indp.immediate())), srcreg.r8());         // mov   [basep + scale*indp],srcreg
 			else if (size == SIZE_WORD)
-				emit_mov_m16_r16(dst, MABS(basep.memory(scale*indp.immediate())), srcreg);  // mov   [basep + scale*indp],srcreg
+				a.mov(MABS(basep.memory(scale*indp.immediate())), srcreg.r16());        // mov   [basep + scale*indp],srcreg
 			else if (size == SIZE_DWORD)
-				emit_mov_m32_r32(dst, MABS(basep.memory(scale*indp.immediate())), srcreg);  // mov   [basep + scale*indp],srcreg
+				a.mov(MABS(basep.memory(scale*indp.immediate())), srcreg);              // mov   [basep + scale*indp],srcreg
 			else if (size == SIZE_QWORD)
 			{
-				emit_mov_m32_r32(dst, MABS(basep.memory(scale*indp.immediate())), srcreg);  // mov   [basep + scale*indp],srcreg
-				emit_mov_m32_r32(dst, MABS(basep.memory(scale*indp.immediate() + 4)), REG_EDX); // mov   [basep + scale*indp + 4],edx
+				a.mov(MABS(basep.memory(scale*indp.immediate())), srcreg);              // mov   [basep + scale*indp],srcreg
+				a.mov(MABS(basep.memory(scale*indp.immediate() + 4)), edx);             // mov   [basep + scale*indp + 4],edx
 			}
 		}
 	}
@@ -3808,22 +2929,22 @@
 	// normal case: variable index
 	else
 	{
-		int indreg = indp.select_register(REG_ECX);
-		emit_mov_r32_p32(dst, indreg, indp);                                    // mov   indreg,indp
+		Gp const indreg = indp.select_register(ecx);
+		emit_mov_r32_p32(a, indreg, indp);                                              // mov   indreg,indp
 
 		// immediate source
 		if (srcp.is_immediate())
 		{
 			if (size == SIZE_BYTE)
-				emit_mov_m8_imm(dst, MABSI(basep.memory(), indreg, scale), srcp.immediate());   // mov   [basep + 1*ecx],srcp
+				a.mov(ptr(u64(basep.memory()), indreg, scalesizep.scale(), 1), srcp.immediate());   // mov   [basep + 1*ecx],srcp
 			else if (size == SIZE_WORD)
-				emit_mov_m16_imm(dst, MABSI(basep.memory(), indreg, scale), srcp.immediate());  // mov   [basep + 2*ecx],srcp
+				a.mov(ptr(u64(basep.memory()), indreg, scalesizep.scale(), 2), srcp.immediate());  // mov   [basep + 2*ecx],srcp
 			else if (size == SIZE_DWORD)
-				emit_mov_m32_imm(dst, MABSI(basep.memory(), indreg, scale), srcp.immediate());  // mov   [basep + 4*ecx],srcp
+				a.mov(ptr(u64(basep.memory()), indreg, scalesizep.scale(), 4), srcp.immediate());  // mov   [basep + 4*ecx],srcp
 			else if (size == SIZE_QWORD)
 			{
-				emit_mov_m32_imm(dst, MABSI(basep.memory(), indreg, scale), srcp.immediate());  // mov   [basep + 8*ecx],srcp
-				emit_mov_m32_imm(dst, MABSI(basep.memory(4), indreg, scale), srcp.immediate() >> 32);
+				a.mov(ptr(u64(basep.memory(0)), indreg, scalesizep.scale(), 4), srcp.immediate());  // mov   [basep + 8*ecx],srcp
+				a.mov(ptr(u64(basep.memory(4)), indreg, scalesizep.scale(), 4), srcp.immediate() >> 32);
 																						// mov   [basep + 8*ecx + 4],srcp >> 32
 			}
 		}
@@ -3832,19 +2953,19 @@
 		else
 		{
 			if (size != SIZE_QWORD)
-				emit_mov_r32_p32(dst, srcreg, srcp);                            // mov   srcreg,srcp
+				emit_mov_r32_p32(a, srcreg, srcp);                                      // mov   srcreg,srcp
 			else
-				emit_mov_r64_p64(dst, srcreg, REG_EDX, srcp);                   // mov   edx:srcreg,srcp
+				emit_mov_r64_p64(a, srcreg, edx, srcp);                                 // mov   edx:srcreg,srcp
 			if (size == SIZE_BYTE)
-				emit_mov_m8_r8(dst, MABSI(basep.memory(), indreg, scale), srcreg);          // mov   [basep + 1*ecx],srcreg
+				a.mov(ptr(u64(basep.memory()), indreg, scalesizep.scale()), srcreg.r8());   // mov   [basep + 1*ecx],srcreg
 			else if (size == SIZE_WORD)
-				emit_mov_m16_r16(dst, MABSI(basep.memory(), indreg, scale), srcreg);        // mov   [basep + 2*ecx],srcreg
+				a.mov(ptr(u64(basep.memory()), indreg, scalesizep.scale()), srcreg.r16());  // mov   [basep + 2*ecx],srcreg
 			else if (size == SIZE_DWORD)
-				emit_mov_m32_r32(dst, MABSI(basep.memory(), indreg, scale), srcreg);        // mov   [basep + 4*ecx],srcreg
+				a.mov(ptr(u64(basep.memory()), indreg, scalesizep.scale()), srcreg);    // mov   [basep + 4*ecx],srcreg
 			else if (size == SIZE_QWORD)
 			{
-				emit_mov_m32_r32(dst, MABSI(basep.memory(), indreg, scale), srcreg);        // mov   [basep + 8*ecx],srcreg
-				emit_mov_m32_r32(dst, MABSI(basep.memory(4), indreg, scale), REG_EDX);  // mov   [basep + 8*ecx],edx
+				a.mov(ptr(u64(basep.memory(0)), indreg, scalesizep.scale()), srcreg);   // mov   [basep + 8*ecx],srcreg
+				a.mov(ptr(u64(basep.memory(4)), indreg, scalesizep.scale()), edx);      // mov   [basep + 8*ecx],edx
 			}
 		}
 	}
@@ -3855,7 +2976,7 @@
 //  op_read - process a READ opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_read(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_read(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -3865,42 +2986,38 @@
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
 	be_parameter addrp(*this, inst.param(1), PTYPE_MRI);
-	const parameter &spacesizep = inst.param(2);
+	parameter const &spacesizep = inst.param(2);
 	assert(spacesizep.is_size_space());
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+	Gp const dstreg = dstp.select_register(eax);
 
 	// set up a call to the read byte handler
-	emit_mov_m32_p32(dst, MBD(REG_ESP, 4), addrp);                              // mov    [esp+4],addrp
-	emit_mov_m32_imm(dst, MBD(REG_ESP, 0), (uintptr_t)m_space[spacesizep.space()]);  // mov    [esp],space
+	emit_mov_m32_p32(a, dword_ptr(esp, 4), addrp);                                      // mov    [esp+4],addrp
+	a.mov(dword_ptr(esp, 0), imm(m_space[spacesizep.space()]));                         // mov    [esp],space
 	if (spacesizep.size() == SIZE_BYTE)
 	{
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].read_byte);
-																						// call   read_byte
-		emit_movzx_r32_r8(dst, dstreg, REG_AL);                                     // movzx  dstreg,al
+		a.call(imm(m_accessors[spacesizep.space()].read_byte));                         // call   read_byte
+		a.movzx(dstreg, al);                                                            // movzx  dstreg,al
 	}
 	else if (spacesizep.size() == SIZE_WORD)
 	{
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].read_word);
-																						// call   read_word
-		emit_movzx_r32_r16(dst, dstreg, REG_AX);                                        // movzx  dstreg,ax
+		a.call(imm(m_accessors[spacesizep.space()].read_word));                         // call   read_word
+		a.movzx(dstreg, ax);                                                            // movzx  dstreg,ax
 	}
 	else if (spacesizep.size() == SIZE_DWORD)
 	{
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].read_dword);
-																						// call   read_dword
-		emit_mov_r32_r32(dst, dstreg, REG_EAX);                                     // mov    dstreg,eax
+		a.call(imm(m_accessors[spacesizep.space()].read_dword));                        // call   read_dword
+		a.mov(dstreg, eax);                                                             // mov    dstreg,eax
 	}
 	else if (spacesizep.size() == SIZE_QWORD)
 	{
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].read_qword);
-																						// call   read_qword
-		emit_mov_r32_r32(dst, dstreg, REG_EAX);                                     // mov    dstreg,eax
+		a.call(imm(m_accessors[spacesizep.space()].read_qword));                        // call   read_qword
+		a.mov(dstreg, eax);                                                             // mov    dstreg,eax
 	}
 
 	// store low 32 bits
-	emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov    dstp,dstreg
+	emit_mov_p32_r32(a, dstp, dstreg);                                                  // mov    dstp,dstreg
 
 	// 64-bit form stores upper 32 bits
 	if (inst.size() == 8)
@@ -3909,18 +3026,18 @@
 		if (spacesizep.size() != SIZE_QWORD)
 		{
 			if (dstp.is_memory())
-				emit_mov_m32_imm(dst, MABS(dstp.memory(4)), 0);                     // mov   [dstp+4],0
+				a.mov(MABS(dstp.memory(4), 4), 0);                                      // mov   [dstp+4],0
 			else if (dstp.is_int_register())
-				emit_mov_m32_imm(dst, MABS(m_reghi[dstp.ireg()]), 0);               // mov   [reghi],0
+				a.mov(MABS(m_reghi[dstp.ireg()], 4), 0);                                // mov   [reghi],0
 		}
 
 		// 8-byte case
 		else
 		{
 			if (dstp.is_memory())
-				emit_mov_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX);                   // mov   [dstp+4],edx
+				a.mov(MABS(dstp.memory(4)), edx);                                       // mov   [dstp+4],edx
 			else if (dstp.is_int_register())
-				emit_mov_m32_r32(dst, MABS(m_reghi[dstp.ireg()]), REG_EDX);     // mov   [reghi],edx
+				a.mov(MABS(m_reghi[dstp.ireg()]), edx);                                 // mov   [reghi],edx
 		}
 	}
 }
@@ -3930,7 +3047,7 @@
 //  op_readm - process a READM opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_readm(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_readm(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -3941,40 +3058,37 @@
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
 	be_parameter addrp(*this, inst.param(1), PTYPE_MRI);
 	be_parameter maskp(*this, inst.param(2), PTYPE_MRI);
-	const parameter &spacesizep = inst.param(3);
+	parameter const &spacesizep = inst.param(3);
 	assert(spacesizep.is_size_space());
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+	Gp const dstreg = dstp.select_register(eax);
 
 	// set up a call to the read byte handler
 	if (spacesizep.size() != SIZE_QWORD)
-		emit_mov_m32_p32(dst, MBD(REG_ESP, 8), maskp);                          // mov    [esp+8],maskp
+		emit_mov_m32_p32(a, dword_ptr(esp, 8), maskp);                                  // mov    [esp+8],maskp
 	else
-		emit_mov_m64_p64(dst, MBD(REG_ESP, 8), maskp);                          // mov    [esp+8],maskp
-	emit_mov_m32_p32(dst, MBD(REG_ESP, 4), addrp);                              // mov    [esp+4],addrp
-	emit_mov_m32_imm(dst, MBD(REG_ESP, 0), (uintptr_t)m_space[spacesizep.space()]);  // mov    [esp],space
+		emit_mov_m64_p64(a, qword_ptr(esp, 8), maskp);                                  // mov    [esp+8],maskp
+	emit_mov_m32_p32(a, dword_ptr(esp, 4), addrp);                                      // mov    [esp+4],addrp
+	a.mov(dword_ptr(esp, 0), imm(m_space[spacesizep.space()]));                         // mov    [esp],space
 	if (spacesizep.size() == SIZE_WORD)
 	{
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].read_word_masked);
-																						// call   read_word_masked
-		emit_movzx_r32_r16(dst, dstreg, REG_AX);                                        // movzx  dstreg,ax
+		a.call(imm(m_accessors[spacesizep.space()].read_word_masked));                  // call   read_word_masked
+		a.movzx(dstreg, ax);                                                            // movzx  dstreg,ax
 	}
 	else if (spacesizep.size() == SIZE_DWORD)
 	{
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].read_dword_masked);
-																						// call   read_dword_masked
-		emit_mov_r32_r32(dst, dstreg, REG_EAX);                                     // mov    dstreg,eax
+		a.call(imm(m_accessors[spacesizep.space()].read_dword_masked));                 // call   read_dword_masked
+		a.mov(dstreg, eax);                                                             // mov    dstreg,eax
 	}
 	else if (spacesizep.size() == SIZE_QWORD)
 	{
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].read_qword_masked);
-																						// call   read_qword_masked
-		emit_mov_r32_r32(dst, dstreg, REG_EAX);                                     // mov    dstreg,eax
+		a.call(imm(m_accessors[spacesizep.space()].read_qword_masked));                 // call   read_qword_masked
+		a.mov(dstreg, eax);                                                             // mov    dstreg,eax
 	}
 
 	// store low 32 bits
-	emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov    dstp,dstreg
+	emit_mov_p32_r32(a, dstp, dstreg);                                                  // mov    dstp,dstreg
 
 	// 64-bit form stores upper 32 bits
 	if (inst.size() == 8)
@@ -3983,18 +3097,18 @@
 		if (spacesizep.size() != SIZE_QWORD)
 		{
 			if (dstp.is_memory())
-				emit_mov_m32_imm(dst, MABS(dstp.memory(4)), 0);                     // mov   [dstp+4],0
+				a.mov(MABS(dstp.memory(4), 4), 0);                                      // mov   [dstp+4],0
 			else if (dstp.is_int_register())
-				emit_mov_m32_imm(dst, MABS(m_reghi[dstp.ireg()]), 0);               // mov   [reghi],0
+				a.mov(MABS(m_reghi[dstp.ireg()], 4), 0);                                // mov   [reghi],0
 		}
 
 		// 8-byte case
 		else
 		{
 			if (dstp.is_memory())
-				emit_mov_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX);                   // mov   [dstp+4],edx
+				a.mov(MABS(dstp.memory(4)), edx);                                       // mov   [dstp+4],edx
 			else if (dstp.is_int_register())
-				emit_mov_m32_r32(dst, MABS(m_reghi[dstp.ireg()]), REG_EDX);     // mov   [reghi],edx
+				a.mov(MABS(m_reghi[dstp.ireg()]), edx);                                 // mov   [reghi],edx
 		}
 	}
 }
@@ -4004,7 +3118,7 @@
 //  op_write - process a WRITE opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_write(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_write(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -4014,28 +3128,24 @@
 	// normalize parameters
 	be_parameter addrp(*this, inst.param(0), PTYPE_MRI);
 	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
-	const parameter &spacesizep = inst.param(2);
+	parameter const &spacesizep = inst.param(2);
 	assert(spacesizep.is_size_space());
 
 	// set up a call to the write byte handler
 	if (spacesizep.size() != SIZE_QWORD)
-		emit_mov_m32_p32(dst, MBD(REG_ESP, 8), srcp);                           // mov    [esp+8],srcp
+		emit_mov_m32_p32(a, dword_ptr(esp, 8), srcp);                                   // mov    [esp+8],srcp
 	else
-		emit_mov_m64_p64(dst, MBD(REG_ESP, 8), srcp);                           // mov    [esp+8],srcp
-	emit_mov_m32_p32(dst, MBD(REG_ESP, 4), addrp);                              // mov    [esp+4],addrp
-	emit_mov_m32_imm(dst, MBD(REG_ESP, 0), (uintptr_t)m_space[spacesizep.space()]);  // mov    [esp],space
+		emit_mov_m64_p64(a, qword_ptr(esp, 8), srcp);                                   // mov    [esp+8],srcp
+	emit_mov_m32_p32(a, dword_ptr(esp, 4), addrp);                                      // mov    [esp+4],addrp
+	a.mov(dword_ptr(esp, 0), imm(m_space[spacesizep.space()]));                         // mov    [esp],space
 	if (spacesizep.size() == SIZE_BYTE)
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].write_byte);
-																						// call   write_byte
+		a.call(imm(m_accessors[spacesizep.space()].write_byte));                        // call   write_byte
 	else if (spacesizep.size() == SIZE_WORD)
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].write_word);
-																						// call   write_word
+		a.call(imm(m_accessors[spacesizep.space()].write_word));                        // call   write_word
 	else if (spacesizep.size() == SIZE_DWORD)
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].write_dword);
-																						// call   write_dword
+		a.call(imm(m_accessors[spacesizep.space()].write_dword));                       // call   write_dword
 	else if (spacesizep.size() == SIZE_QWORD)
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].write_qword);
-																						// call   write_qword
+		a.call(imm(m_accessors[spacesizep.space()].write_qword));                       // call   write_qword
 }
 
 
@@ -4043,7 +3153,7 @@
 //  op_writem - process a WRITEM opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_writem(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_writem(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -4054,31 +3164,28 @@
 	be_parameter addrp(*this, inst.param(0), PTYPE_MRI);
 	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
 	be_parameter maskp(*this, inst.param(2), PTYPE_MRI);
-	const parameter &spacesizep = inst.param(3);
+	parameter const &spacesizep = inst.param(3);
 	assert(spacesizep.is_size_space());
 
 	// set up a call to the write byte handler
 	if (spacesizep.size() != SIZE_QWORD)
 	{
-		emit_mov_m32_p32(dst, MBD(REG_ESP, 12), maskp);                     // mov    [esp+12],maskp
-		emit_mov_m32_p32(dst, MBD(REG_ESP, 8), srcp);                           // mov    [esp+8],srcp
+		emit_mov_m32_p32(a, dword_ptr(esp, 12), maskp);                                 // mov    [esp+12],maskp
+		emit_mov_m32_p32(a, dword_ptr(esp, 8), srcp);                                   // mov    [esp+8],srcp
 	}
 	else
 	{
-		emit_mov_m64_p64(dst, MBD(REG_ESP, 16), maskp);                     // mov    [esp+16],maskp
-		emit_mov_m64_p64(dst, MBD(REG_ESP, 8), srcp);                           // mov    [esp+8],srcp
+		emit_mov_m64_p64(a, qword_ptr(esp, 16), maskp);                                 // mov    [esp+16],maskp
+		emit_mov_m64_p64(a, qword_ptr(esp, 8), srcp);                                   // mov    [esp+8],srcp
 	}
-	emit_mov_m32_p32(dst, MBD(REG_ESP, 4), addrp);                              // mov    [esp+4],addrp
-	emit_mov_m32_imm(dst, MBD(REG_ESP, 0), (uintptr_t)m_space[spacesizep.space()]);  // mov    [esp],space
+	emit_mov_m32_p32(a, dword_ptr(esp, 4), addrp);                                      // mov    [esp+4],addrp
+	a.mov(dword_ptr(esp, 0), imm(m_space[spacesizep.space()]));                         // mov    [esp],space
 	if (spacesizep.size() == SIZE_WORD)
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].write_word_masked);
-																						// call   write_word_masked
+		a.call(imm(m_accessors[spacesizep.space()].write_word_masked));                 // call   write_word_masked
 	else if (spacesizep.size() == SIZE_DWORD)
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].write_dword_masked);
-																						// call   write_dword_masked
+		a.call(imm(m_accessors[spacesizep.space()].write_dword_masked));                // call   write_dword_masked
 	else if (spacesizep.size() == SIZE_QWORD)
-		emit_call(dst, (x86code *)m_accessors[spacesizep.space()].write_qword_masked);
-																						// call   write_qword_masked
+		a.call(imm(m_accessors[spacesizep.space()].write_qword_masked));                // call   write_qword_masked
 }
 
 
@@ -4086,7 +3193,7 @@
 //  op_carry - process a CARRY opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_carry(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_carry(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -4101,16 +3208,16 @@
 	if (srcp.is_immediate() && bitp.is_immediate())
 	{
 		if (srcp.immediate() & ((uint64_t)1 << bitp.immediate()))
-			emit_stc(dst);
+			a.stc();
 		else
-			emit_clc(dst);
+			a.clc();
 		}
 
 	// load non-immediate bit numbers into a register
 	if (!bitp.is_immediate())
 	{
-		emit_mov_r32_p32(dst, REG_ECX, bitp);
-		emit_and_r32_imm(dst, REG_ECX, inst.size() * 8 - 1);
+		emit_mov_r32_p32(a, ecx, bitp);
+		a.and_(ecx, inst.size() * 8 - 1);
 	}
 
 	// 32-bit form
@@ -4119,16 +3226,16 @@
 		if (bitp.is_immediate())
 		{
 			if (srcp.is_memory())
-				emit_bt_m32_imm(dst, MABS(srcp.memory()), bitp.immediate());                    // bt     [srcp],bitp
+				a.bt(MABS(srcp.memory(), 4), bitp.immediate());                         // bt     [srcp],bitp
 			else if (srcp.is_int_register())
-				emit_bt_r32_imm(dst, srcp.ireg(), bitp.immediate());                            // bt     srcp,bitp
+				a.bt(Gpd(srcp.ireg()), bitp.immediate());                               // bt     srcp,bitp
 		}
 		else
 		{
 			if (srcp.is_memory())
-				emit_bt_m32_r32(dst, MABS(srcp.memory()), REG_ECX);                     // bt     [srcp],ecx
+				a.bt(MABS(srcp.memory()), ecx);                                         // bt     [srcp],ecx
 			else if (srcp.is_int_register())
-				emit_bt_r32_r32(dst, srcp.ireg(), REG_ECX);                             // bt     [srcp],ecx
+				a.bt(Gpd(srcp.ireg()), ecx);                                            // bt     [srcp],ecx
 		}
 	}
 
@@ -4138,20 +3245,20 @@
 		if (bitp.is_immediate())
 		{
 			if (srcp.is_memory())
-				emit_bt_m32_imm(dst, MABS(srcp.memory()), bitp.immediate());                    // bt     [srcp],bitp
+				a.bt(MABS(srcp.memory(), 4), bitp.immediate());                         // bt     [srcp],bitp
 			else if (srcp.is_int_register() && bitp.immediate() < 32)
-				emit_bt_r32_imm(dst, srcp.ireg(), bitp.immediate());                            // bt     srcp,bitp
+				a.bt(Gpd(srcp.ireg()), bitp.immediate());                               // bt     srcp,bitp
 			else if (srcp.is_int_register() && bitp.immediate() >= 32)
-				emit_bt_m32_imm(dst, MABS(m_reghi[srcp.ireg()]), bitp.immediate() - 32);    // bt     [srcp.hi],bitp
+				a.bt(MABS(m_reghi[srcp.ireg()], 4), bitp.immediate() - 32);             // bt     [srcp.hi],bitp
 		}
 		else
 		{
 			if (srcp.is_memory())
-				emit_bt_m32_r32(dst, MABS(srcp.memory()), REG_ECX);                     // bt     [srcp],ecx
+				a.bt(MABS(srcp.memory()), ecx);                                         // bt     [srcp],ecx
 			else if (srcp.is_int_register())
 			{
-				emit_mov_m32_r32(dst, MABS(m_reglo[srcp.ireg()]), srcp.ireg());     // mov    [srcp.lo],srcp
-				emit_bt_m32_r32(dst, MABS(m_reglo[srcp.ireg()]), REG_ECX);          // bt     [srcp],ecx
+				a.mov(MABS(m_reglo[srcp.ireg()]), Gpd(srcp.ireg()));                    // mov    [srcp.lo],srcp
+				a.bt(MABS(m_reglo[srcp.ireg()]), ecx);                                  // bt     [srcp],ecx
 			}
 		}
 	}
@@ -4162,7 +3269,7 @@
 //  op_set - process a SET opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_set(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_set(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -4173,23 +3280,23 @@
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+	Gp const dstreg = dstp.select_register(eax);
 
 	// set to AL
-	emit_setcc_r8(dst, X86_CONDITION(inst.condition()), REG_AL);                        // setcc  al
-	emit_movzx_r32_r8(dst, dstreg, REG_AL);                                         // movzx  dstreg,al
+	a.set(X86_CONDITION(inst.condition()), al);                                         // setcc  al
+	a.movzx(dstreg, al);                                                                // movzx  dstreg,al
 
 	// store low 32 bits
-	emit_mov_p32_r32(dst, dstp, dstreg);                                        // mov   dstp,dstreg
+	emit_mov_p32_r32(a, dstp, dstreg);                                                  // mov   dstp,dstreg
 
 	// 64-bit form stores upper 32 bits
 	if (inst.size() == 8)
 	{
 		// general case
 		if (dstp.is_memory())
-			emit_mov_m32_imm(dst, MABS(dstp.memory(4)), 0);                         // mov   [dstp+4],0
+			a.mov(MABS(dstp.memory(4), 4), 0);                                          // mov   [dstp+4],0
 		else if (dstp.is_int_register())
-			emit_mov_m32_imm(dst, MABS(m_reghi[dstp.ireg()]), 0);                   // mov   [reghi],0
+			a.mov(MABS(m_reghi[dstp.ireg()], 4), 0);                                    // mov   [reghi],0
 	}
 }
 
@@ -4198,10 +3305,8 @@
 //  op_mov - process a MOV opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_mov(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_mov(Assembler &a, const instruction &inst)
 {
-	x86code *savedst = dst;
-
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
 	assert_any_condition(inst);
@@ -4212,47 +3317,39 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+	Gp const dstreg = dstp.select_register(eax);
 
-	// always start with a jmp
-	emit_link skip = { nullptr };
-	if (inst.condition() != uml::COND_ALWAYS)
-		emit_jcc_short_link(dst, X86_NOT_CONDITION(inst.condition()), skip);            // jcc   skip
+	// add a conditional branch unless a conditional move is possible
+	Label skip = a.newLabel();
+	if (inst.condition() != uml::COND_ALWAYS && ((inst.size() == 8) || !(dstp.is_int_register() && !srcp.is_immediate())))
+		a.short_().j(X86_NOT_CONDITION(inst.condition()), skip);                        // jcc   skip
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// register to memory
 		if (dstp.is_memory() && srcp.is_int_register())
-			emit_mov_m32_r32(dst, MABS(dstp.memory()), srcp.ireg());                        // mov   [dstp],srcp
+			a.mov(MABS(dstp.memory()), Gpd(srcp.ireg()));                               // mov   [dstp],srcp
 
 		// immediate to memory
 		else if (dstp.is_memory() && srcp.is_immediate())
-			emit_mov_m32_imm(dst, MABS(dstp.memory()), srcp.immediate());                       // mov   [dstp],srcp
+			a.mov(MABS(dstp.memory(), 4), srcp.immediate());                            // mov   [dstp],srcp
 
 		// conditional memory to register
 		else if (inst.condition() != uml::COND_ALWAYS && dstp.is_int_register() && srcp.is_memory())
-		{
-			dst = savedst;
-			skip.target = nullptr;
-			emit_cmovcc_r32_m32(dst, X86_CONDITION(inst.condition()), dstp.ireg(), MABS(srcp.memory()));
+			a.cmov(X86_CONDITION(inst.condition()), Gpd(dstp.ireg()), MABS(srcp.memory()));
 																						// cmovcc dstp,[srcp]
-		}
 
 		// conditional register to register
 		else if (inst.condition() != uml::COND_ALWAYS && dstp.is_int_register() && srcp.is_int_register())
-		{
-			dst = savedst;
-			skip.target = nullptr;
-			emit_cmovcc_r32_r32(dst, X86_CONDITION(inst.condition()), dstp.ireg(), srcp.ireg());
+			a.cmov(X86_CONDITION(inst.condition()), Gpd(dstp.ireg()), Gpd(srcp.ireg()));
 																						// cmovcc dstp,srcp
-		}
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32_keepflags(dst, dstreg, srcp);                      // mov   dstreg,srcp
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32_keepflags(a, dstreg, srcp);                                // mov   dstreg,srcp
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -4262,29 +3359,32 @@
 		// register to memory
 		if (dstp.is_memory() && srcp.is_int_register())
 		{
-			emit_mov_r32_m32(dst, REG_EAX, MABS(m_reghi[srcp.ireg()]));         // mov   eax,reghi[srcp]
-			emit_mov_m32_r32(dst, MABS(dstp.memory()), srcp.ireg());                        // mov   [dstp],srcp
-			emit_mov_m32_r32(dst, MABS(dstp.memory(4)), REG_EAX);                       // mov   [dstp+4],eax
+			a.mov(eax, MABS(m_reghi[srcp.ireg()]));                                     // mov   eax,reghi[srcp]
+			a.mov(MABS(dstp.memory(0)), Gpd(srcp.ireg()));                              // mov   [dstp],srcp
+			a.mov(MABS(dstp.memory(4)), eax);                                           // mov   [dstp+4],eax
 		}
 
 		// immediate to memory
 		else if (dstp.is_memory() && srcp.is_immediate())
 		{
-			emit_mov_m32_imm(dst, MABS(dstp.memory()), srcp.immediate());                       // mov   [dstp],srcp
-			emit_mov_m32_imm(dst, MABS(dstp.memory(4)), srcp.immediate() >> 32);                // mov   [dstp+4],srcp >> 32
+			a.mov(MABS(dstp.memory(0), 4), srcp.immediate());                           // mov   [dstp],srcp
+			a.mov(MABS(dstp.memory(4), 4), srcp.immediate() >> 32);                     // mov   [dstp+4],srcp >> 32
 		}
 
 		// general case
 		else
 		{
-			emit_mov_r64_p64(dst, dstreg, REG_EDX, srcp);                       // mov   edx:dstreg,srcp
-			emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                       // mov   dstp,edx:dstreg
+			emit_mov_r64_p64(a, dstreg, edx, srcp);                                     // mov   edx:dstreg,srcp
+			emit_mov_p64_r64(a, dstp, dstreg, edx);                                     // mov   dstp,edx:dstreg
 		}
 	}
 
-	// resolve the jump
-	if (skip.target != nullptr)
-		track_resolve_link(dst, skip);
+	// bind the label
+	if (inst.condition() != uml::COND_ALWAYS && ((inst.size() == 8) || !(dstp.is_int_register() && !srcp.is_immediate())))
+	{
+		a.bind(skip);
+		reset_last_upper_lower_reg();
+	}
 }
 
 
@@ -4292,7 +3392,7 @@
 //  op_sext - process a SEXT opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_sext(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_sext(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -4302,50 +3402,50 @@
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
 	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
-	const parameter &sizep = inst.param(2);
+	parameter const &sizep = inst.param(2);
 	assert(sizep.is_size());
 
 	// pick a target register for the general case
-	int dstreg = (inst.size() == 8) ? REG_EAX : dstp.select_register(REG_EAX);
+	Gp const dstreg = (inst.size() == 8) ? eax : dstp.select_register(eax);
 
 	// convert 8-bit source registers to EAX
 	if (sizep.size() == SIZE_BYTE && srcp.is_int_register() && (srcp.ireg() & 4))
 	{
-		emit_mov_r32_r32(dst, REG_EAX, srcp.ireg());                                    // mov   eax,srcp
-		srcp = be_parameter::make_ireg(REG_EAX);
+		a.mov(eax, Gpd(srcp.ireg()));                                                   // mov   eax,srcp
+		srcp = be_parameter::make_ireg(eax.id());
 	}
 
 	// general case
 	if (srcp.is_memory())
 	{
 		if (sizep.size() == SIZE_BYTE)
-			emit_movsx_r32_m8(dst, dstreg, MABS(srcp.memory()));                            // movsx dstreg,[srcp]
+			a.movsx(dstreg, MABS(srcp.memory(), 1));                                    // movsx dstreg,[srcp]
 		else if (sizep.size() == SIZE_WORD)
-			emit_movsx_r32_m16(dst, dstreg, MABS(srcp.memory()));                           // movsx dstreg,[srcp]
+			a.movsx(dstreg, MABS(srcp.memory(), 2));                                    // movsx dstreg,[srcp]
 		else if (sizep.size() == SIZE_DWORD)
-			emit_mov_r32_m32(dst, dstreg, MABS(srcp.memory()));                         // mov   dstreg,[srcp]
+			a.mov(dstreg, MABS(srcp.memory()));                                         // mov   dstreg,[srcp]
 	}
 	else if (srcp.is_int_register())
 	{
 		if (sizep.size() == SIZE_BYTE)
-			emit_movsx_r32_r8(dst, dstreg, srcp.ireg());                                // movsx dstreg,srcp
+			a.movsx(dstreg, GpbLo(srcp.ireg()));                                        // movsx dstreg,srcp
 		else if (sizep.size() == SIZE_WORD)
-			emit_movsx_r32_r16(dst, dstreg, srcp.ireg());                               // movsx dstreg,srcp
-		else if (sizep.size() == SIZE_DWORD && dstreg != srcp.ireg())
-			emit_mov_r32_r32(dst, dstreg, srcp.ireg());                                 // mov   dstreg,srcp
+			a.movsx(dstreg, Gpw(srcp.ireg()));                                          // movsx dstreg,srcp
+		else if (sizep.size() == SIZE_DWORD && dstreg.id() != srcp.ireg())
+			a.mov(dstreg, Gpd(srcp.ireg()));                                            // mov   dstreg,srcp
 	}
 	if (inst.flags() != 0)
-		emit_test_r32_r32(dst, dstreg, dstreg);                                     // test  dstreg,dstreg
+		a.test(dstreg, dstreg);                                                         // test  dstreg,dstreg
 
 	// 32-bit form: store the low 32 bits
 	if (inst.size() == 4)
-		emit_mov_p32_r32(dst, dstp, dstreg);                                    // mov   dstp,dstreg
+		emit_mov_p32_r32(a, dstp, dstreg);                                              // mov   dstp,dstreg
 
 	// 64-bit form: sign extend to 64 bits and store edx:eax
 	else if (inst.size() == 8)
 	{
-		emit_cdq(dst);                                                                  // cdq
-		emit_mov_p64_r64(dst, dstp, REG_EAX, REG_EDX);                          // mov   dstp,edx:eax
+		a.cdq();                                                                        // cdq
+		emit_mov_p64_r64(a, dstp, eax, edx);                                            // mov   dstp,edx:eax
 	}
 }
 
@@ -4354,7 +3454,7 @@
 //  op_roland - process an ROLAND opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_roland(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_roland(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -4368,24 +3468,42 @@
 	be_parameter maskp(*this, inst.param(3), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, shiftp, maskp);
+	Gp const dstreg = dstp.select_register(eax, shiftp, maskp);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_mov_r32_p32(dst, dstreg, srcp);                                    // mov   dstreg,srcp
-		emit_rol_r32_p32(dst, dstreg, shiftp, inst);                            // rol   dstreg,shiftp
-		emit_and_r32_p32(dst, dstreg, maskp, inst);                         // and   dstreg,maskp
-		emit_mov_p32_r32(dst, dstp, dstreg);                                    // mov   dstp,dstreg
+		emit_mov_r32_p32(a, dstreg, srcp);                                              // mov   dstreg,srcp
+		shift_op_param(a, Inst::kIdRol, dstreg, shiftp,                                 // rol   dstreg,shiftp
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize zero case
+				return (!inst.flags() && !src.immediate());
+			});
+		alu_op_param(a, Inst::kIdAnd, dstreg, maskp,                                    // and   dstreg,maskp
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize all-zero and all-one cases
+				if (!inst.flags() && !src.immediate())
+				{
+					a.xor_(dst.as<Gpd>(), dst.as<Gpd>());
+					return true;
+				}
+				else if (!inst.flags() && u32(src.immediate()) == 0xffffffffU)
+					return true;
+
+				return false;
+			});
+		emit_mov_p32_r32(a, dstp, dstreg);                                              // mov   dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_mov_r64_p64(dst, dstreg, REG_EDX, srcp);                           // mov   edx:dstreg,srcp
-		emit_rol_r64_p64(dst, dstreg, REG_EDX, shiftp, inst);                   // rol   edx:dstreg,shiftp
-		emit_and_r64_p64(dst, dstreg, REG_EDX, maskp, inst);                    // and   edx:dstreg,maskp
-		emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                           // mov   dstp,edx:dstreg
+		emit_mov_r64_p64(a, dstreg, edx, srcp);                                         // mov   edx:dstreg,srcp
+		emit_rol_r64_p64(a, dstreg, edx, shiftp, inst);                                 // rol   edx:dstreg,shiftp
+		emit_and_r64_p64(a, dstreg, edx, maskp, inst);                                  // and   edx:dstreg,maskp
+		emit_mov_p64_r64(a, dstp, dstreg, edx);                                         // mov   dstp,edx:dstreg
 	}
 }
 
@@ -4394,7 +3512,7 @@
 //  op_rolins - process an ROLINS opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_rolins(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_rolins(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -4408,89 +3526,93 @@
 	be_parameter maskp(*this, inst.param(3), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_ECX, shiftp, maskp);
+	Gp const dstreg = dstp.select_register(ecx, shiftp, maskp);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_mov_r32_p32(dst, REG_EAX, srcp);                                   // mov   eax,srcp
-		emit_rol_r32_p32(dst, REG_EAX, shiftp, inst);                           // rol   eax,shiftp
-		emit_mov_r32_p32(dst, dstreg, dstp);                                    // mov   dstreg,dstp
+		emit_mov_r32_p32(a, eax, srcp);                                                 // mov   eax,srcp
+		shift_op_param(a, Inst::kIdRol, eax, shiftp,                                    // rol   eax,shiftp
+			[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+			{
+				// optimize zero case
+				return (!inst.flags() && !src.immediate());
+			});
+		emit_mov_r32_p32(a, dstreg, dstp);                                              // mov   dstreg,dstp
 		if (maskp.is_immediate())
 		{
-			emit_and_r32_imm(dst, REG_EAX, maskp.immediate());                              // and   eax,maskp
-			emit_and_r32_imm(dst, dstreg, ~maskp.immediate());                              // and   dstreg,~maskp
+			a.and_(eax, maskp.immediate());                                             // and   eax,maskp
+			a.and_(dstreg, ~maskp.immediate());                                         // and   dstreg,~maskp
 		}
 		else
 		{
-			emit_mov_r32_p32(dst, REG_EDX, maskp);                              // mov   edx,maskp
-			emit_and_r32_r32(dst, REG_EAX, REG_EDX);                                    // and   eax,edx
-			emit_not_r32(dst, REG_EDX);                                             // not   edx
-			emit_and_r32_r32(dst, dstreg, REG_EDX);                                 // and   dstreg,edx
+			emit_mov_r32_p32(a, edx, maskp);                                            // mov   edx,maskp
+			a.and_(eax, edx);                                                           // and   eax,edx
+			a.not_(edx);                                                                // not   edx
+			a.and_(dstreg, edx);                                                        // and   dstreg,edx
 		}
-		emit_or_r32_r32(dst, dstreg, REG_EAX);                                          // or    dstreg,eax
-		emit_mov_p32_r32(dst, dstp, dstreg);                                    // mov   dstp,dstreg
+		a.or_(dstreg, eax);                                                             // or    dstreg,eax
+		emit_mov_p32_r32(a, dstp, dstreg);                                              // mov   dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_mov_r64_p64(dst, REG_EAX, REG_EDX, srcp);                          // mov   edx:eax,srcp
-		emit_rol_r64_p64(dst, REG_EAX, REG_EDX, shiftp, inst);                  // rol   edx:eax,shiftp
+		emit_mov_r64_p64(a, eax, edx, srcp);                                            // mov   edx:eax,srcp
+		emit_rol_r64_p64(a, eax, edx, shiftp, inst);                                    // rol   edx:eax,shiftp
 		if (maskp.is_immediate())
 		{
-			emit_and_r32_imm(dst, REG_EAX, maskp.immediate());                              // and   eax,maskp
-			emit_and_r32_imm(dst, REG_EDX, maskp.immediate() >> 32);                            // and   edx,maskp >> 32
+			a.and_(eax, maskp.immediate());                                             // and   eax,maskp
+			a.and_(edx, maskp.immediate() >> 32);                                       // and   edx,maskp >> 32
 			if (dstp.is_int_register())
 			{
-				emit_and_r32_imm(dst, dstp.ireg(), ~maskp.immediate());                     // and   dstp.lo,~maskp
-				emit_and_m32_imm(dst, MABS(m_reghi[dstp.ireg()]), ~maskp.immediate() >> 32);// and   dstp.hi,~maskp >> 32
-				emit_or_r32_r32(dst, dstp.ireg(), REG_EAX);                             // or    dstp.lo,eax
-				emit_or_m32_r32(dst, MABS(m_reghi[dstp.ireg()]), REG_EDX);          // or    dstp.hi,edx
+				a.and_(Gpd(dstp.ireg()), ~maskp.immediate());                           // and   dstp.lo,~maskp
+				a.and_(MABS(m_reghi[dstp.ireg()], 4), ~maskp.immediate() >> 32);        // and   dstp.hi,~maskp >> 32
+				a.or_(Gpd(dstp.ireg()), eax);                                           // or    dstp.lo,eax
+				a.or_(MABS(m_reghi[dstp.ireg()]), edx);                                 // or    dstp.hi,edx
 			}
 			else
 			{
-				emit_and_m32_imm(dst, MABS(dstp.memory()), ~maskp.immediate());                 // and   dstp.lo,~maskp
-				emit_and_m32_imm(dst, MABS(dstp.memory(4)), ~maskp.immediate() >> 32);      // and   dstp.hi,~maskp >> 32
-				emit_or_m32_r32(dst, MABS(dstp.memory()), REG_EAX);                     // or    dstp.lo,eax
-				emit_or_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX);                    // or    dstp.hi,edx
+				a.and_(MABS(dstp.memory(0), 4), ~maskp.immediate());                    // and   dstp.lo,~maskp
+				a.and_(MABS(dstp.memory(4), 4), ~maskp.immediate() >> 32);              // and   dstp.hi,~maskp >> 32
+				a.or_(MABS(dstp.memory(0)), eax);                                       // or    dstp.lo,eax
+				a.or_(MABS(dstp.memory(4)), edx);                                       // or    dstp.hi,edx
 			}
 		}
 		else
 		{
-			int tempreg = REG_EBX;
-			emit_mov_m32_r32(dst, MBD(REG_ESP, -8), tempreg);                           // mov   [esp-8],ebx
-			emit_mov_r64_p64(dst, tempreg, REG_ECX, maskp);                 // mov   ecx:ebx,maskp
-			emit_and_r32_r32(dst, REG_EAX, tempreg);                                    // and   eax,ebx
-			emit_and_r32_r32(dst, REG_EDX, REG_ECX);                                    // and   edx,ecx
-			emit_not_r32(dst, tempreg);                                             // not   ebx
-			emit_not_r32(dst, REG_ECX);                                             // not   ecx
+			a.mov(ptr(esp, -8), ebx);                                                   // mov   [esp-8],ebx
+			emit_mov_r64_p64(a, ebx, ecx, maskp);                                       // mov   ecx:ebx,maskp
+			a.and_(eax, ebx);                                                           // and   eax,ebx
+			a.and_(edx, ecx);                                                           // and   edx,ecx
+			a.not_(ebx);                                                                // not   ebx
+			a.not_(ecx);                                                                // not   ecx
 			if (dstp.is_int_register())
 			{
-				emit_and_r32_r32(dst, dstp.ireg(), tempreg);                            // and   dstp.lo,ebx
-				emit_and_m32_r32(dst, MABS(m_reghi[dstp.ireg()]), REG_ECX);     // and   dstp.hi,ecx
-				emit_or_r32_r32(dst, dstp.ireg(), REG_EAX);                             // or    dstp.lo,eax
-				emit_or_m32_r32(dst, MABS(m_reghi[dstp.ireg()]), REG_EDX);          // or    dstp.hi,edx
+				a.and_(Gpd(dstp.ireg()), ebx);                                          // and   dstp.lo,ebx
+				a.and_(MABS(m_reghi[dstp.ireg()]), ecx);                                // and   dstp.hi,ecx
+				a.or_(Gpd(dstp.ireg()), eax);                                           // or    dstp.lo,eax
+				a.or_(MABS(m_reghi[dstp.ireg()]), edx);                                 // or    dstp.hi,edx
 			}
 			else
 			{
-				emit_and_m32_r32(dst, MABS(dstp.memory()), tempreg);                        // and   dstp.lo,ebx
-				emit_and_m32_r32(dst, MABS(dstp.memory(4)), REG_ECX);                   // and   dstp.hi,ecx
-				emit_or_m32_r32(dst, MABS(dstp.memory()), REG_EAX);                     // or    dstp.lo,eax
-				emit_or_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX);                    // or    dstp.hi,edx
+				a.and_(MABS(dstp.memory(0)), ebx);                                      // and   dstp.lo,ebx
+				a.and_(MABS(dstp.memory(4)), ecx);                                      // and   dstp.hi,ecx
+				a.or_(MABS(dstp.memory(0)), eax);                                       // or    dstp.lo,eax
+				a.or_(MABS(dstp.memory(4)), edx);                                       // or    dstp.hi,edx
 			}
-			emit_mov_r32_m32(dst, tempreg, MBD(REG_ESP, -8));                           // mov   ebx,[esp-8]
+			a.mov(ebx, ptr(esp, -8));                                                   // mov   ebx,[esp-8]
 		}
 		if (inst.flags() == FLAG_Z)
-			emit_or_r32_r32(dst, REG_EAX, REG_EDX);                                 // or    eax,edx
+			a.or_(eax, edx);                                                            // or    eax,edx
 		else if (inst.flags() == FLAG_S)
 			;// do nothing -- final OR will have the right result
 		else if (inst.flags() == (FLAG_Z | FLAG_S))
 		{
-			emit_movzx_r32_r16(dst, REG_ECX, REG_AX);                                   // movzx ecx,ax
-			emit_shr_r32_imm(dst, REG_EAX, 16);                                     // shr   eax,16
-			emit_or_r32_r32(dst, REG_EDX, REG_ECX);                                 // or    edx,ecx
-			emit_or_r32_r32(dst, REG_EDX, REG_EAX);                                 // or    edx,eax
+			a.movzx(ecx, ax);                                                           // movzx ecx,ax
+			a.shr(eax, 16);                                                             // shr   eax,16
+			a.or_(edx, ecx);                                                            // or    edx,ecx
+			a.or_(edx, eax);                                                            // or    edx,eax
 		}
 	}
 }
@@ -4500,7 +3622,7 @@
 //  op_add - process a ADD opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_add(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_add(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -4514,29 +3636,39 @@
 	normalize_commutative(src1p, src2p);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_add_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                // add   [dstp],src2p
+			alu_op_param(a, Inst::kIdAdd, MABS(dstp.memory(), 4), src2p,                // add   [dstp],src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
 
 		// reg = reg + imm
-		else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_immediate() && inst.flags() == 0)
-			emit_lea_r32_m32(dst, dstp.ireg(), MBD(src1p.ireg(), src2p.immediate()));           // lea   dstp,[src1p+src2p]
+		else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_immediate() && !inst.flags())
+			a.lea(Gpd(dstp.ireg()), ptr(Gpd(src1p.ireg()), src2p.immediate()));         // lea   dstp,[src1p+src2p]
 
 		// reg = reg + reg
-		else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_int_register() && inst.flags() == 0)
-			emit_lea_r32_m32(dst, dstp.ireg(), MBISD(src1p.ireg(), src2p.ireg(), 1, 0));    // lea   dstp,[src1p+src2p]
+		else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_int_register() && !inst.flags())
+			a.lea(Gpd(dstp.ireg()), ptr(Gpd(src1p.ireg()), Gpd(src2p.ireg())));         // lea   dstp,[src1p+src2p]
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                               // mov   dstreg,src1p
-			emit_add_r32_p32(dst, dstreg, src2p, inst);                     // add   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32(a, dstreg, src1p);                                         // mov   dstreg,src1p
+			alu_op_param(a, Inst::kIdAdd, dstreg, src2p,                                // add   dstreg,src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -4545,14 +3677,16 @@
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_add_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                // add   [dstp],src2p
+			alu_op_param(a, Inst::kIdAdd, Inst::kIdAdc,                                 // add   [dstp],src2p
+				MABS(dstp.memory(0), 4), MABS(dstp.memory(4), 4), src2p, inst.flags() & FLAG_Z);
 
 		// general case
 		else
 		{
-			emit_mov_r64_p64(dst, dstreg, REG_EDX, src1p);                      // mov   dstreg:dstp,[src1p]
-			emit_add_r64_p64(dst, dstreg, REG_EDX, src2p, inst);                // add   dstreg:dstp,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                       // mov   dstp,dstreg:eax
+			emit_mov_r64_p64(a, dstreg, edx, src1p);                                    // mov   edx:dstreg,[src1p]
+			alu_op_param(a, Inst::kIdAdd, Inst::kIdAdc,                                 // add   edx:dstreg,src2p
+				dstreg, edx, src2p, inst.flags() & FLAG_Z);
+			emit_mov_p64_r64(a, dstp, dstreg, edx);                                     // mov   dstp,edx:dstreg
 		}
 	}
 }
@@ -4562,7 +3696,7 @@
 //  op_addc - process a ADDC opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_addc(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_addc(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -4576,21 +3710,21 @@
 	normalize_commutative(src1p, src2p);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_adc_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                // adc   [dstp],src2p
+			alu_op_param(a, Inst::kIdAdc, MABS(dstp.memory(), 4), src2p);               // adc   [dstp],src2p
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32_keepflags(dst, dstreg, src1p);                 // mov   dstreg,src1p
-			emit_adc_r32_p32(dst, dstreg, src2p, inst);                     // adc   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32_keepflags(a, dstreg, src1p);                               // mov   dstreg,src1p
+			alu_op_param(a, Inst::kIdAdc, dstreg, src2p);                               // adc   dstreg,src2p
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -4599,14 +3733,16 @@
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_adc_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                // adc   [dstp],src2p
+			alu_op_param(a, Inst::kIdAdc, Inst::kIdAdc,                                 // adc   [dstp],src2p
+				MABS(dstp.memory(0), 4), MABS(dstp.memory(4), 4), src2p, inst.flags() & FLAG_Z);
 
 		// general case
 		else
 		{
-			emit_mov_r64_p64_keepflags(dst, dstreg, REG_EDX, src1p);            // mov   dstreg:dstp,[src1p]
-			emit_adc_r64_p64(dst, dstreg, REG_EDX, src2p, inst);                // adc   dstreg:dstp,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                       // mov   dstp,dstreg:eax
+			emit_mov_r64_p64_keepflags(a, dstreg, edx, src1p);                          // mov   edx:dstreg,[src1p]
+			alu_op_param(a, Inst::kIdAdc, Inst::kIdAdc,                                 // adc   edx:dstreg,src2p
+				dstreg, edx, src2p, inst.flags() & FLAG_Z);
+			emit_mov_p64_r64(a, dstp, dstreg, edx);                                     // mov   dstp,edx:dstreg
 		}
 	}
 }
@@ -4616,7 +3752,7 @@
 //  op_sub - process a SUB opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_sub(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_sub(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -4629,25 +3765,35 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_sub_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                // sub   [dstp],src2p
+			alu_op_param(a, Inst::kIdSub, MABS(dstp.memory(), 4), src2p,                // sub   [dstp],src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
 
 		// reg = reg - imm
-		else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_immediate() && inst.flags() == 0)
-			emit_lea_r32_m32(dst, dstp.ireg(), MBD(src1p.ireg(), -src2p.immediate()));          // lea   dstp,[src1p-src2p]
+		else if (dstp.is_int_register() && src1p.is_int_register() && src2p.is_immediate() && !inst.flags())
+			a.lea(Gpd(dstp.ireg()), ptr(Gpd(src1p.ireg()), -src2p.immediate()));        // lea   dstp,[src1p-src2p]
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                               // mov   dstreg,src1p
-			emit_sub_r32_p32(dst, dstreg, src2p, inst);                     // sub   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32(a, dstreg, src1p);                                         // mov   dstreg,src1p
+			alu_op_param(a, Inst::kIdSub, dstreg, src2p,                                // sub   dstreg,src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -4656,14 +3802,16 @@
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_sub_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                // sub   [dstp],src2p
+			alu_op_param(a, Inst::kIdSub, Inst::kIdSbb,                                 // sub   [dstp],src2p
+				MABS(dstp.memory(0), 4), MABS(dstp.memory(4), 4), src2p, inst.flags() & FLAG_Z);
 
 		// general case
 		else
 		{
-			emit_mov_r64_p64(dst, dstreg, REG_EDX, src1p);                      // mov   dstreg:dstp,[src1p]
-			emit_sub_r64_p64(dst, dstreg, REG_EDX, src2p, inst);                // sub   dstreg:dstp,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                       // mov   dstp,dstreg:eax
+			emit_mov_r64_p64(a, dstreg, edx, src1p);                                    // mov   edx:dstreg,[src1p]
+			alu_op_param(a, Inst::kIdSub, Inst::kIdSbb,                                 // sub   edx:dstreg,src2p
+				dstreg, edx, src2p, inst.flags() & FLAG_Z);
+			emit_mov_p64_r64(a, dstp, dstreg, edx);                                     // mov   dstp,edx:dstreg
 		}
 	}
 }
@@ -4673,7 +3821,7 @@
 //  op_subc - process a SUBC opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_subc(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_subc(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -4686,21 +3834,21 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_sbb_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                // sbb   [dstp],src2p
+			alu_op_param(a, Inst::kIdSbb, MABS(dstp.memory(), 4), src2p);               // sbb   [dstp],src2p
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32_keepflags(dst, dstreg, src1p);                 // mov   dstreg,src1p
-			emit_sbb_r32_p32(dst, dstreg, src2p, inst);                     // sbb   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32_keepflags(a, dstreg, src1p);                               // mov   dstreg,src1p
+			alu_op_param(a, Inst::kIdSbb, dstreg, src2p);                               // sbb   dstreg,src2p
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -4709,14 +3857,16 @@
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_sbb_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                // sbb   [dstp],src2p
+			alu_op_param(a, Inst::kIdSbb, Inst::kIdSbb,                                 // sbb   [dstp],src2p
+				MABS(dstp.memory(0), 4), MABS(dstp.memory(4), 4), src2p, inst.flags() & FLAG_Z);
 
 		// general case
 		else
 		{
-			emit_mov_r64_p64_keepflags(dst, dstreg, REG_EDX, src1p);            // mov   dstreg:dstp,[src1p]
-			emit_sbb_r64_p64(dst, dstreg, REG_EDX, src2p, inst);                // sbb   dstreg:dstp,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                       // mov   dstp,dstreg:eax
+			emit_mov_r64_p64_keepflags(a, dstreg, edx, src1p);                          // mov   edx:dstreg,[src1p]
+			alu_op_param(a, Inst::kIdSbb, Inst::kIdSbb,                                 // sbb   edx:dstreg,src2p
+				dstreg, edx, src2p, inst.flags() & FLAG_Z);
+			emit_mov_p64_r64(a, dstp, dstreg, edx);                                     // mov   dstp,edx:dstreg
 		}
 	}
 }
@@ -4726,7 +3876,7 @@
 //  op_cmp - process a CMP opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_cmp(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_cmp(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -4738,21 +3888,21 @@
 	be_parameter src2p(*this, inst.param(1), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int src1reg = src1p.select_register(REG_EAX);
+	Gp const src1reg = src1p.select_register(eax);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// memory versus anything
 		if (src1p.is_memory())
-			emit_cmp_m32_p32(dst, MABS(src1p.memory()), src2p, inst);               // cmp   [dstp],src2p
+			alu_op_param(a, Inst::kIdCmp, MABS(src1p.memory(), 4), src2p);              // cmp   [src1p],src2p
 
 		// general case
 		else
 		{
 			if (src1p.is_immediate())
-				emit_mov_r32_imm(dst, src1reg, src1p.immediate());                          // mov   src1reg,imm
-			emit_cmp_r32_p32(dst, src1reg, src2p, inst);                        // cmp   src1reg,src2p
+				a.mov(src1reg, src1p.immediate());                                      // mov   src1reg,imm
+			alu_op_param(a, Inst::kIdCmp, src1reg, src2p);                              // cmp   src1reg,src2p
 		}
 	}
 
@@ -4760,8 +3910,11 @@
 	else
 	{
 		// general case
-		emit_mov_r64_p64(dst, REG_EAX, REG_EDX, src1p);                     // mov   eax:dstp,[src1p]
-		emit_cmp_r64_p64(dst, REG_EAX, REG_EDX, src2p, inst);                   // cmp   eax:dstp,src2p
+		emit_mov_r64_p64(a, eax, edx, src1p);                                           // mov   edx:eax,[src1p]
+		alu_op_param(a, Inst::kIdSub, Inst::kIdSbb,                                     // cmp   edx:eax,src2p
+			eax, edx, src2p, (inst.flags() & FLAG_Z) && (inst.flags() != FLAG_Z));
+		if (inst.flags() == FLAG_Z)
+			a.or_(edx, eax);
 	}
 }
 
@@ -4770,7 +3923,7 @@
 //  op_mulu - process a MULU opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_mulu(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_mulu(Assembler &a, const instruction &inst)
 {
 	uint8_t zsflags = inst.flags() & (FLAG_Z | FLAG_S);
 	uint8_t vflag = inst.flags() & FLAG_V;
@@ -4792,19 +3945,19 @@
 	if (inst.size() == 4)
 	{
 		// general case
-		emit_mov_r32_p32(dst, REG_EAX, src1p);                                  // mov   eax,src1p
+		emit_mov_r32_p32(a, eax, src1p);                                                // mov   eax,src1p
 		if (src2p.is_memory())
-			emit_mul_m32(dst, MABS(src2p.memory()));                                        // mul   [src2p]
+			a.mul(MABS(src2p.memory(), 4));                                             // mul   [src2p]
 		else if (src2p.is_int_register())
-			emit_mul_r32(dst, src2p.ireg());                                            // mul   src2p
+			a.mul(Gpd(src2p.ireg()));                                                   // mul   src2p
 		else if (src2p.is_immediate())
 		{
-			emit_mov_r32_imm(dst, REG_EDX, src2p.immediate());                              // mov   edx,src2p
-			emit_mul_r32(dst, REG_EDX);                                             // mul   edx
+			a.mov(edx, src2p.immediate());                                              // mov   edx,src2p
+			a.mul(edx);                                                                 // mul   edx
 		}
-		emit_mov_p32_r32(dst, dstp, REG_EAX);                                   // mov   dstp,eax
+		emit_mov_p32_r32(a, dstp, eax);                                                 // mov   dstp,eax
 		if (compute_hi)
-			emit_mov_p32_r32(dst, edstp, REG_EDX);                              // mov   edstp,edx
+			emit_mov_p32_r32(a, edstp, edx);                                            // mov   edstp,edx
 
 		// compute flags
 		if (inst.flags() != 0)
@@ -4812,32 +3965,32 @@
 			if (zsflags != 0)
 			{
 				if (vflag)
-					emit_pushf(dst);                                                    // pushf
+					a.pushfd();                                                         // pushf
 				if (compute_hi)
 				{
 					if (zsflags == FLAG_Z)
-						emit_or_r32_r32(dst, REG_EDX, REG_EAX);                     // or    edx,eax
+						a.or_(edx, eax);                                                // or    edx,eax
 					else if (zsflags == FLAG_S)
-						emit_test_r32_r32(dst, REG_EDX, REG_EDX);                       // test  edx,edx
+						a.test(edx, edx);                                               // test  edx,edx
 					else
 					{
-						emit_movzx_r32_r16(dst, REG_ECX, REG_AX);                       // movzx ecx,ax
-						emit_shr_r32_imm(dst, REG_EAX, 16);                         // shr   eax,16
-						emit_or_r32_r32(dst, REG_EDX, REG_ECX);                     // or    edx,ecx
-						emit_or_r32_r32(dst, REG_EDX, REG_EAX);                     // or    edx,eax
+						a.movzx(ecx, ax);                                               // movzx ecx,ax
+						a.shr(eax, 16);                                                 // shr   eax,16
+						a.or_(edx, ecx);                                                // or    edx,ecx
+						a.or_(edx, eax);                                                // or    edx,eax
 					}
 				}
 				else
-					emit_test_r32_r32(dst, REG_EAX, REG_EAX);                           // test  eax,eax
+					a.test(eax, eax);                                                   // test  eax,eax
 
 				// we rely on the fact that OF is cleared by all logical operations above
 				if (vflag)
 				{
-					emit_pushf(dst);                                                    // pushf
-					emit_pop_r32(dst, REG_EAX);                                     // pop   eax
-					emit_and_m32_imm(dst, MBD(REG_ESP, 0), ~0x84);                      // and   [esp],~0x84
-					emit_or_m32_r32(dst, MBD(REG_ESP, 0), REG_EAX);                 // or    [esp],eax
-					emit_popf(dst);                                                 // popf
+					a.pushfd();                                                         // pushf
+					a.pop(eax);                                                         // pop   eax
+					a.and_(dword_ptr(esp, 0), ~0x84);                                   // and   [esp],~0x84
+					a.or_(ptr(esp, 0), eax);                                            // or    [esp],eax
+					a.popfd();                                                          // popf
 				}
 			}
 		}
@@ -4847,28 +4000,28 @@
 	else if (inst.size() == 8)
 	{
 		// general case
-		emit_mov_m32_imm(dst, MBD(REG_ESP, 24), inst.flags());                          // mov   [esp+24],flags
-		emit_mov_m64_p64(dst, MBD(REG_ESP, 16), src2p);                     // mov   [esp+16],src2p
-		emit_mov_m64_p64(dst, MBD(REG_ESP, 8), src1p);                          // mov   [esp+8],src1p
+		a.mov(dword_ptr(esp, 24), inst.flags());                                        // mov   [esp+24],flags
+		emit_mov_m64_p64(a, qword_ptr(esp, 16), src2p);                                 // mov   [esp+16],src2p
+		emit_mov_m64_p64(a, qword_ptr(esp, 8), src1p);                                  // mov   [esp+8],src1p
 		if (!compute_hi)
-			emit_mov_m32_imm(dst, MBD(REG_ESP, 4), (uintptr_t)&m_reslo);             // mov   [esp+4],&reslo
+			a.mov(dword_ptr(esp, 4), imm(&m_reslo));                                    // mov   [esp+4],&reslo
 		else
-			emit_mov_m32_imm(dst, MBD(REG_ESP, 4), (uintptr_t)&m_reshi);             // mov   [esp+4],&reshi
-		emit_mov_m32_imm(dst, MBD(REG_ESP, 0), (uintptr_t)&m_reslo);                 // mov   [esp],&reslo
-		emit_call(dst, (x86code *)dmulu);                                               // call  dmulu
+			a.mov(dword_ptr(esp, 4), imm(&m_reshi));                                    // mov   [esp+4],&reshi
+		a.mov(dword_ptr(esp, 0), imm(&m_reslo));                                        // mov   [esp],&reslo
+		a.call(imm(dmulu));                                                             // call  dmulu
 		if (inst.flags() != 0)
-			emit_push_m32(dst, MABSI(flags_unmap, REG_EAX, 4));                         // push   flags_unmap[eax*4]
-		emit_mov_r32_m32(dst, REG_EAX, MABS((uint32_t *)&m_reslo + 0));               // mov   eax,reslo.lo
-		emit_mov_r32_m32(dst, REG_EDX, MABS((uint32_t *)&m_reslo + 1));               // mov   edx,reslo.hi
-		emit_mov_p64_r64(dst, dstp, REG_EAX, REG_EDX);                          // mov   dstp,edx:eax
+			a.push(ptr(u64(flags_unmap), eax, 2));                                      // push   flags_unmap[eax*4]
+		a.mov(eax, MABS((uint32_t *)&m_reslo + 0));                                     // mov   eax,reslo.lo
+		a.mov(edx, MABS((uint32_t *)&m_reslo + 1));                                     // mov   edx,reslo.hi
+		emit_mov_p64_r64(a, dstp, eax, edx);                                            // mov   dstp,edx:eax
 		if (compute_hi)
 		{
-			emit_mov_r32_m32(dst, REG_EAX, MABS((uint32_t *)&m_reshi + 0));           // mov   eax,reshi.lo
-			emit_mov_r32_m32(dst, REG_ECX, MABS((uint32_t *)&m_reshi + 1));           // mov   ecx,reshi.hi
-			emit_mov_p64_r64(dst, edstp, REG_EAX, REG_ECX);                 // mov   edstp,ecx:eax
+			a.mov(eax, MABS((uint32_t *)&m_reshi + 0));                                 // mov   eax,reshi.lo
+			a.mov(ecx, MABS((uint32_t *)&m_reshi + 1));                                 // mov   ecx,reshi.hi
+			emit_mov_p64_r64(a, edstp, eax, ecx);                                       // mov   edstp,ecx:eax
 		}
 		if (inst.flags() != 0)
-			emit_popf(dst);                                                         // popf
+			a.popfd();                                                                  // popf
 	}
 }
 
@@ -4877,7 +4030,7 @@
 //  op_muls - process a MULS opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_muls(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_muls(Assembler &a, const instruction &inst)
 {
 	uint8_t zsflags = inst.flags() & (FLAG_Z | FLAG_S);
 	uint8_t vflag =  inst.flags() & FLAG_V;
@@ -4902,38 +4055,38 @@
 		if (!compute_hi && !src1p.is_immediate() && src2p.is_immediate())
 		{
 			if (src1p.is_memory())
-				emit_imul_r32_m32_imm(dst, REG_EAX, MABS(src1p.memory()), src2p.immediate());   // imul  eax,[src1p],src2p
+				a.imul(eax, MABS(src1p.memory(), 4), src2p.immediate());                // imul  eax,[src1p],src2p
 			else if (src1p.is_int_register())
-				emit_imul_r32_r32_imm(dst, REG_EAX, src1p.ireg(), src2p.immediate());           // imul  eax,src1p,src2p
-			emit_mov_p32_r32(dst, dstp, REG_EAX);                               // mov   dstp,eax
+				a.imul(eax, Gpd(src1p.ireg()), src2p.immediate());                      // imul  eax,src1p,src2p
+			emit_mov_p32_r32(a, dstp, eax);                                             // mov   dstp,eax
 		}
 
 		// 32-bit destination, general case
 		else if (!compute_hi)
 		{
-			emit_mov_r32_p32(dst, REG_EAX, src1p);                              // mov   eax,src1p
+			emit_mov_r32_p32(a, eax, src1p);                                            // mov   eax,src1p
 			if (src2p.is_memory())
-				emit_imul_r32_m32(dst, REG_EAX, MABS(src2p.memory()));                  // imul  eax,[src2p]
+				a.imul(eax, MABS(src2p.memory(), 4));                                   // imul  eax,[src2p]
 			else if (src2p.is_int_register())
-				emit_imul_r32_r32(dst, REG_EAX, src2p.ireg());                          // imul  eax,src2p
-			emit_mov_p32_r32(dst, dstp, REG_EAX);                               // mov   dstp,eax
+				a.imul(eax, Gpd(src2p.ireg()));                                         // imul  eax,src2p
+			emit_mov_p32_r32(a, dstp, eax);                                             // mov   dstp,eax
 		}
 
 		// 64-bit destination, general case
 		else
 		{
-			emit_mov_r32_p32(dst, REG_EAX, src1p);                              // mov   eax,src1p
+			emit_mov_r32_p32(a, eax, src1p);                                            // mov   eax,src1p
 			if (src2p.is_memory())
-				emit_imul_m32(dst, MABS(src2p.memory()));                                   // imul  [src2p]
+				a.imul(MABS(src2p.memory(), 4));                                        // imul  [src2p]
 			else if (src2p.is_int_register())
-				emit_imul_r32(dst, src2p.ireg());                                       // imul  src2p
+				a.imul(Gpd(src2p.ireg()));                                              // imul  src2p
 			else if (src2p.is_immediate())
 			{
-				emit_mov_r32_imm(dst, REG_EDX, src2p.immediate());                          // mov   edx,src2p
-				emit_imul_r32(dst, REG_EDX);                                            // imul  edx
+				a.mov(edx, src2p.immediate());                                          // mov   edx,src2p
+				a.imul(edx);                                                            // imul  edx
 			}
-			emit_mov_p32_r32(dst, dstp, REG_EAX);                               // mov   dstp,eax
-			emit_mov_p32_r32(dst, edstp, REG_EDX);                              // mov   edstp,edx
+			emit_mov_p32_r32(a, dstp, eax);                                             // mov   dstp,eax
+			emit_mov_p32_r32(a, edstp, edx);                                            // mov   edstp,edx
 		}
 
 		// compute flags
@@ -4942,32 +4095,32 @@
 			if (zsflags != 0)
 			{
 				if (vflag)
-					emit_pushf(dst);                                                    // pushf
+					a.pushfd();                                                         // pushf
 				if (compute_hi)
 				{
 					if (inst.flags() == FLAG_Z)
-						emit_or_r32_r32(dst, REG_EDX, REG_EAX);                     // or    edx,eax
+						a.or_(edx, eax);                                                // or    edx,eax
 					else if (inst.flags() == FLAG_S)
-						emit_test_r32_r32(dst, REG_EDX, REG_EDX);                       // test  edx,edx
+						a.test(edx, edx);                                               // test  edx,edx
 					else
 					{
-						emit_movzx_r32_r16(dst, REG_ECX, REG_AX);                       // movzx ecx,ax
-						emit_shr_r32_imm(dst, REG_EAX, 16);                         // shr   eax,16
-						emit_or_r32_r32(dst, REG_EDX, REG_ECX);                     // or    edx,ecx
-						emit_or_r32_r32(dst, REG_EDX, REG_EAX);                     // or    edx,eax
+						a.movzx(ecx, ax);                                               // movzx ecx,ax
+						a.shr(eax, 16);                                                 // shr   eax,16
+						a.or_(edx, ecx);                                                // or    edx,ecx
+						a.or_(edx, eax);                                                // or    edx,eax
 					}
 				}
 				else
-					emit_test_r32_r32(dst, REG_EAX, REG_EAX);                           // test  eax,eax
+					a.test(eax, eax);                                                   // test  eax,eax
 
 				// we rely on the fact that OF is cleared by all logical operations above
 				if (vflag)
 				{
-					emit_pushf(dst);                                                    // pushf
-					emit_pop_r32(dst, REG_EAX);                                     // pop   eax
-					emit_and_m32_imm(dst, MBD(REG_ESP, 0), ~0x84);                      // and   [esp],~0x84
-					emit_or_m32_r32(dst, MBD(REG_ESP, 0), REG_EAX);                 // or    [esp],eax
-					emit_popf(dst);                                                 // popf
+					a.pushfd();                                                         // pushf
+					a.pop(eax);                                                         // pop   eax
+					a.and_(dword_ptr(esp, 0), ~0x84);                                   // and   [esp],~0x84
+					a.or_(ptr(esp, 0), eax);                                            // or    [esp],eax
+					a.popfd();                                                          // popf
 				}
 			}
 		}
@@ -4977,28 +4130,28 @@
 	else if (inst.size() == 8)
 	{
 		// general case
-		emit_mov_m32_imm(dst, MBD(REG_ESP, 24), inst.flags());                          // mov   [esp+24],flags
-		emit_mov_m64_p64(dst, MBD(REG_ESP, 16), src2p);                     // mov   [esp+16],src2p
-		emit_mov_m64_p64(dst, MBD(REG_ESP, 8), src1p);                          // mov   [esp+8],src1p
+		a.mov(dword_ptr(esp, 24), inst.flags());                                        // mov   [esp+24],flags
+		emit_mov_m64_p64(a, qword_ptr(esp, 16), src2p);                                 // mov   [esp+16],src2p
+		emit_mov_m64_p64(a, qword_ptr(esp, 8), src1p);                                  // mov   [esp+8],src1p
 		if (!compute_hi)
-			emit_mov_m32_imm(dst, MBD(REG_ESP, 4), (uintptr_t)&m_reslo);             // mov   [esp+4],&reslo
+			a.mov(dword_ptr(esp, 4), imm(&m_reslo));                                    // mov   [esp+4],&reslo
 		else
-			emit_mov_m32_imm(dst, MBD(REG_ESP, 4), (uintptr_t)&m_reshi);             // push  [esp+4],&reshi
-		emit_mov_m32_imm(dst, MBD(REG_ESP, 0), (uintptr_t)&m_reslo);                 // mov   [esp],&reslo
-		emit_call(dst, (x86code *)dmuls);                                               // call  dmuls
+			a.mov(dword_ptr(esp, 4), imm(&m_reshi));                                    // push  [esp+4],&reshi
+		a.mov(dword_ptr(esp, 0), imm(&m_reslo));                                        // mov   [esp],&reslo
+		a.call(imm(dmuls));                                                             // call  dmuls
 		if (inst.flags() != 0)
-			emit_push_m32(dst, MABSI(flags_unmap, REG_EAX, 4));                         // push   flags_unmap[eax*4]
-		emit_mov_r32_m32(dst, REG_EAX, MABS((uint32_t *)&m_reslo + 0));               // mov   eax,reslo.lo
-		emit_mov_r32_m32(dst, REG_EDX, MABS((uint32_t *)&m_reslo + 1));               // mov   edx,reslo.hi
-		emit_mov_p64_r64(dst, dstp, REG_EAX, REG_EDX);                          // mov   dstp,edx:eax
+			a.push(ptr(u64(flags_unmap), eax, 2));                                      // push   flags_unmap[eax*4]
+		a.mov(eax, MABS((uint32_t *)&m_reslo + 0));                                     // mov   eax,reslo.lo
+		a.mov(edx, MABS((uint32_t *)&m_reslo + 1));                                     // mov   edx,reslo.hi
+		emit_mov_p64_r64(a, dstp, eax, edx);                                            // mov   dstp,edx:eax
 		if (compute_hi)
 		{
-			emit_mov_r32_m32(dst, REG_EAX, MABS((uint32_t *)&m_reshi + 0));           // mov   eax,reshi.lo
-			emit_mov_r32_m32(dst, REG_EDX, MABS((uint32_t *)&m_reshi + 1));           // mov   edx,reshi.hi
-			emit_mov_p64_r64(dst, edstp, REG_EAX, REG_EDX);                 // mov   edstp,edx:eax
+			a.mov(eax, MABS((uint32_t *)&m_reshi + 0));                                 // mov   eax,reshi.lo
+			a.mov(edx, MABS((uint32_t *)&m_reshi + 1));                                 // mov   edx,reshi.hi
+			emit_mov_p64_r64(a, edstp, eax, edx);                                       // mov   edstp,edx:eax
 		}
 		if (inst.flags() != 0)
-			emit_popf(dst);                                                         // popf
+			a.popfd();                                                                  // popf
 	}
 }
 
@@ -5007,7 +4160,7 @@
 //  op_divu - process a DIVU opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_divu(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_divu(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5025,50 +4178,51 @@
 	if (inst.size() == 4)
 	{
 		// general case
-		emit_mov_r32_p32(dst, REG_ECX, src2p);                                  // mov   ecx,src2p
+		emit_mov_r32_p32(a, ecx, src2p);                                                // mov   ecx,src2p
 		if (inst.flags() != 0)
 		{
-			emit_mov_r32_imm(dst, REG_EAX, 0xa0000000);                             // mov   eax,0xa0000000
-			emit_add_r32_r32(dst, REG_EAX, REG_EAX);                                    // add   eax,eax
+			a.mov(eax, 0xa0000000);                                                     // mov   eax,0xa0000000
+			a.add(eax, eax);                                                            // add   eax,eax
 		}
-		emit_link skip;
-		emit_jecxz_link(dst, skip);                                                 // jecxz skip
-		emit_mov_r32_p32(dst, REG_EAX, src1p);                                  // mov   eax,src1p
-		emit_xor_r32_r32(dst, REG_EDX, REG_EDX);                                        // xor   edx,edx
-		emit_div_r32(dst, REG_ECX);                                                 // div   ecx
-		emit_mov_p32_r32(dst, dstp, REG_EAX);                                   // mov   dstp,eax
+		Label skip = a.newLabel();
+		a.jecxz(skip);                                                                  // jecxz skip
+		emit_mov_r32_p32(a, eax, src1p);                                                // mov   eax,src1p
+		a.xor_(edx, edx);                                                               // xor   edx,edx
+		a.div(ecx);                                                                     // div   ecx
+		emit_mov_p32_r32(a, dstp, eax);                                                 // mov   dstp,eax
 		if (compute_rem)
-			emit_mov_p32_r32(dst, edstp, REG_EDX);                              // mov   edstp,edx
+			emit_mov_p32_r32(a, edstp, edx);                                            // mov   edstp,edx
 		if (inst.flags() != 0)
-			emit_test_r32_r32(dst, REG_EAX, REG_EAX);                                   // test  eax,eax
-		track_resolve_link(dst, skip);                                              // skip:
+			a.test(eax, eax);                                                           // test  eax,eax
+		a.bind(skip);                                                               // skip:
+		reset_last_upper_lower_reg();
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
 		// general case
-		emit_mov_m64_p64(dst, MBD(REG_ESP, 16), src2p);                     // mov   [esp+16],src2p
-		emit_mov_m64_p64(dst, MBD(REG_ESP, 8), src1p);                          // mov   [esp+8],src1p
+		emit_mov_m64_p64(a, qword_ptr(esp, 16), src2p);                                 // mov   [esp+16],src2p
+		emit_mov_m64_p64(a, qword_ptr(esp, 8), src1p);                                  // mov   [esp+8],src1p
 		if (!compute_rem)
-			emit_mov_m32_imm(dst, MBD(REG_ESP, 4), (uintptr_t)&m_reslo);             // mov   [esp+4],&reslo
+			a.mov(dword_ptr(esp, 4), imm(&m_reslo));                                    // mov   [esp+4],&reslo
 		else
-			emit_mov_m32_imm(dst, MBD(REG_ESP, 4), (uintptr_t)&m_reshi);             // push  [esp+4],&reshi
-		emit_mov_m32_imm(dst, MBD(REG_ESP, 0), (uintptr_t)&m_reslo);                 // mov   [esp],&reslo
-		emit_call(dst, (x86code *)ddivu);                                               // call  ddivu
+			a.mov(dword_ptr(esp, 4), imm(&m_reshi));                                    // push  [esp+4],&reshi
+		a.mov(dword_ptr(esp, 0), imm(&m_reslo));                                        // mov   [esp],&reslo
+		a.call(imm(ddivu));                                                             // call  ddivu
 		if (inst.flags() != 0)
-			emit_push_m32(dst, MABSI(flags_unmap, REG_EAX, 4));                         // push   flags_unmap[eax*4]
-		emit_mov_r32_m32(dst, REG_EAX, MABS((uint32_t *)&m_reslo + 0));               // mov   eax,reslo.lo
-		emit_mov_r32_m32(dst, REG_EDX, MABS((uint32_t *)&m_reslo + 1));               // mov   edx,reslo.hi
-		emit_mov_p64_r64(dst, dstp, REG_EAX, REG_EDX);                          // mov   dstp,edx:eax
+			a.push(ptr(u64(flags_unmap), eax, 2));                                      // push   flags_unmap[eax*4]
+		a.mov(eax, MABS((uint32_t *)&m_reslo + 0));                                     // mov   eax,reslo.lo
+		a.mov(edx, MABS((uint32_t *)&m_reslo + 1));                                     // mov   edx,reslo.hi
+		emit_mov_p64_r64(a, dstp, eax, edx);                                            // mov   dstp,edx:eax
 		if (compute_rem)
 		{
-			emit_mov_r32_m32(dst, REG_EAX, MABS((uint32_t *)&m_reshi + 0));           // mov   eax,reshi.lo
-			emit_mov_r32_m32(dst, REG_EDX, MABS((uint32_t *)&m_reshi + 1));           // mov   edx,reshi.hi
-			emit_mov_p64_r64(dst, edstp, REG_EAX, REG_EDX);                 // mov   edstp,edx:eax
+			a.mov(eax, MABS((uint32_t *)&m_reshi + 0));                                 // mov   eax,reshi.lo
+			a.mov(edx, MABS((uint32_t *)&m_reshi + 1));                                 // mov   edx,reshi.hi
+			emit_mov_p64_r64(a, edstp, eax, edx);                                       // mov   edstp,edx:eax
 		}
 		if (inst.flags() != 0)
-			emit_popf(dst);                                                         // popf
+			a.popfd();                                                                  // popf
 	}
 }
 
@@ -5077,7 +4231,7 @@
 //  op_divs - process a DIVS opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_divs(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_divs(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5095,50 +4249,51 @@
 	if (inst.size() == 4)
 	{
 		// general case
-		emit_mov_r32_p32(dst, REG_ECX, src2p);                                  // mov   ecx,src2p
+		emit_mov_r32_p32(a, ecx, src2p);                                                // mov   ecx,src2p
 		if (inst.flags() != 0)
 		{
-			emit_mov_r32_imm(dst, REG_EAX, 0xa0000000);                             // mov   eax,0xa0000000
-			emit_add_r32_r32(dst, REG_EAX, REG_EAX);                                    // add   eax,eax
+			a.mov(eax, 0xa0000000);                                                     // mov   eax,0xa0000000
+			a.add(eax, eax);                                                            // add   eax,eax
 		}
-		emit_link skip;
-		emit_jecxz_link(dst, skip);                                                 // jecxz skip
-		emit_mov_r32_p32(dst, REG_EAX, src1p);                                  // mov   eax,src1p
-		emit_cdq(dst);                                                                  // cdq
-		emit_idiv_r32(dst, REG_ECX);                                                    // idiv  ecx
-		emit_mov_p32_r32(dst, dstp, REG_EAX);                                   // mov   dstp,eax
+		Label skip = a.newLabel();
+		a.jecxz(skip);                                                                  // jecxz skip
+		emit_mov_r32_p32(a, eax, src1p);                                                // mov   eax,src1p
+		a.cdq();                                                                        // cdq
+		a.idiv(ecx);                                                                    // idiv  ecx
+		emit_mov_p32_r32(a, dstp, eax);                                                 // mov   dstp,eax
 		if (compute_rem)
-			emit_mov_p32_r32(dst, edstp, REG_EDX);                              // mov   edstp,edx
+			emit_mov_p32_r32(a, edstp, edx);                                            // mov   edstp,edx
 		if (inst.flags() != 0)
-			emit_test_r32_r32(dst, REG_EAX, REG_EAX);                                   // test  eax,eax
-		track_resolve_link(dst, skip);                                              // skip:
+			a.test(eax, eax);                                                           // test  eax,eax
+		a.bind(skip);                                                               // skip:
+		reset_last_upper_lower_reg();
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
 		// general case
-		emit_mov_m64_p64(dst, MBD(REG_ESP, 16), src2p);                     // mov   [esp+16],src2p
-		emit_mov_m64_p64(dst, MBD(REG_ESP, 8), src1p);                          // mov   [esp+8],src1p
+		emit_mov_m64_p64(a, qword_ptr(esp, 16), src2p);                                 // mov   [esp+16],src2p
+		emit_mov_m64_p64(a, qword_ptr(esp, 8), src1p);                                  // mov   [esp+8],src1p
 		if (!compute_rem)
-			emit_mov_m32_imm(dst, MBD(REG_ESP, 4), (uintptr_t)&m_reslo);             // mov   [esp+4],&reslo
+			a.mov(dword_ptr(esp, 4), imm(&m_reslo));                                    // mov   [esp+4],&reslo
 		else
-			emit_mov_m32_imm(dst, MBD(REG_ESP, 4), (uintptr_t)&m_reshi);             // push  [esp+4],&reshi
-		emit_mov_m32_imm(dst, MBD(REG_ESP, 0), (uintptr_t)&m_reslo);                 // mov   [esp],&reslo
-		emit_call(dst, (x86code *)ddivs);                                               // call  ddivs
+			a.mov(dword_ptr(esp, 4), imm(&m_reshi));                                    // push  [esp+4],&reshi
+		a.mov(dword_ptr(esp, 0), imm(&m_reslo));                                        // mov   [esp],&reslo
+		a.call(imm(ddivs));                                                             // call  ddivs
 		if (inst.flags() != 0)
-			emit_push_m32(dst, MABSI(flags_unmap, REG_EAX, 4));                         // push   flags_unmap[eax*4]
-		emit_mov_r32_m32(dst, REG_EAX, MABS((uint32_t *)&m_reslo + 0));               // mov   eax,reslo.lo
-		emit_mov_r32_m32(dst, REG_EDX, MABS((uint32_t *)&m_reslo + 1));               // mov   edx,reslo.hi
-		emit_mov_p64_r64(dst, dstp, REG_EAX, REG_EDX);                          // mov   dstp,edx:eax
+			a.push(ptr(u64(flags_unmap), eax, 2));                                      // push   flags_unmap[eax*4]
+		a.mov(eax, MABS((uint32_t *)&m_reslo + 0));                                     // mov   eax,reslo.lo
+		a.mov(edx, MABS((uint32_t *)&m_reslo + 1));                                     // mov   edx,reslo.hi
+		emit_mov_p64_r64(a, dstp, eax, edx);                                            // mov   dstp,edx:eax
 		if (compute_rem)
 		{
-			emit_mov_r32_m32(dst, REG_EAX, MABS((uint32_t *)&m_reshi + 0));           // mov   eax,reshi.lo
-			emit_mov_r32_m32(dst, REG_EDX, MABS((uint32_t *)&m_reshi + 1));           // mov   edx,reshi.hi
-			emit_mov_p64_r64(dst, edstp, REG_EAX, REG_EDX);                 // mov   edstp,edx:eax
+			a.mov(eax, MABS((uint32_t *)&m_reshi + 0));                                 // mov   eax,reshi.lo
+			a.mov(edx, MABS((uint32_t *)&m_reshi + 1));                                 // mov   edx,reshi.hi
+			emit_mov_p64_r64(a, edstp, eax, edx);                                       // mov   edstp,edx:eax
 		}
 		if (inst.flags() != 0)
-			emit_popf(dst);                                                         // popf
+			a.popfd();                                                                  // popf
 	}
 }
 
@@ -5147,7 +4302,7 @@
 //  op_and - process a AND opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_and(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_and(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5161,41 +4316,93 @@
 	normalize_commutative(src1p, src2p);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_and_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                // and   [dstp],src2p
+			alu_op_param(a, Inst::kIdAnd, MABS(dstp.memory(), 4), src2p,                // and   [dstp],src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize all-zero and all-one cases
+					if (!inst.flags() && !src.immediate())
+					{
+						a.mov(dst.as<Mem>(), imm(0));
+						return true;
+					}
+					else if (!inst.flags() && u32(src.immediate()) == 0xffffffffU)
+						return true;
+
+					return false;
+				});
+
+		// dstp == src2p in memory
+		else if (dstp.is_memory() && dstp == src2p)
+			alu_op_param(a, Inst::kIdAnd, MABS(dstp.memory(), 4), src1p,                // and   [dstp],src1p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize all-zero and all-one cases
+					if (!inst.flags() && !src.immediate())
+					{
+						a.mov(dst.as<Mem>(), imm(0));
+						return true;
+					}
+					else if (!inst.flags() && u32(src.immediate()) == 0xffffffffU)
+						return true;
+
+					return false;
+				});
 
 		// AND with immediate 0xff
-		else if (src2p.is_immediate_value(0xff) && inst.flags() == 0)
+		else if (src2p.is_immediate_value(0xff) && !inst.flags())
 		{
 			if (src1p.is_int_register())
-				emit_movzx_r32_r8(dst, dstreg, src1p.ireg());                           // movzx dstreg,src1p
+			{
+				if (src1p.ireg() & 4)
+				{
+					if (dstreg.id() != src1p.ireg())
+						a.mov(dstreg, Gpd(src1p.ireg()));                               // mov   dstreg,src1p
+					a.and_(dstreg, 0xff);                                               // and   dstreg,0xff
+				}
+				else
+					a.movzx(dstreg, GpbLo(src1p.ireg()));                               // movzx dstreg,src1p
+			}
 			else if (src1p.is_memory())
-				emit_movzx_r32_m8(dst, dstreg, MABS(src1p.memory()));                       // movzx dstreg,[src1p]
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+				a.movzx(dstreg, MABS(src1p.memory(), 1));                               // movzx dstreg,[src1p]
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 
 		// AND with immediate 0xffff
-		else if (src2p.is_immediate_value(0xffff) && inst.flags() == 0)
+		else if (src2p.is_immediate_value(0xffff) && !inst.flags())
 		{
 			if (src1p.is_int_register())
-				emit_movzx_r32_r16(dst, dstreg, src1p.ireg());                          // movzx dstreg,src1p
+				a.movzx(dstreg, Gpw(src1p.ireg()));                                     // movzx dstreg,src1p
 			else if (src1p.is_memory())
-				emit_movzx_r32_m16(dst, dstreg, MABS(src1p.memory()));                  // movzx dstreg,[src1p]
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+				a.movzx(dstreg, MABS(src1p.memory(), 2));                               // movzx dstreg,[src1p]
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                               // mov   dstreg,src1p
-			emit_and_r32_p32(dst, dstreg, src2p, inst);                     // and   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32(a, dstreg, src1p);                                         // mov   dstreg,src1p
+			alu_op_param(a, Inst::kIdAnd, dstreg, src2p,                                // and   dstreg,src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize all-zero and all-one cases
+					if (!inst.flags() && !src.immediate())
+					{
+						a.xor_(dst.as<Gpd>(), dst.as<Gpd>());
+						return true;
+					}
+					else if (!inst.flags() && u32(src.immediate()) == 0xffffffffU)
+						return true;
+
+					return false;
+				});
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -5204,79 +4411,107 @@
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_and_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                // and   [dstp],src2p
+			emit_and_m64_p64(a, MABS(dstp.memory(0), 4), MABS(dstp.memory(4), 4),       // and   [dstp],src2p
+				src2p, inst);
+
+		// dstp == src2p in memory
+		else if (dstp.is_memory() && dstp == src2p)
+			emit_and_m64_p64(a, MABS(dstp.memory(0), 4), MABS(dstp.memory(4), 4),       // and   [dstp],src1p
+				src1p, inst);
 
 		// AND with immediate 0xff
-		else if (src2p.is_immediate_value(0xff) && inst.flags() == 0)
+		else if (src2p.is_immediate_value(0xff) && !inst.flags())
 		{
 			if (src1p.is_int_register())
-				emit_movzx_r32_r8(dst, dstreg, src1p.ireg());                           // movzx dstreg,src1p
+			{
+				if (src1p.ireg() & 4)
+				{
+					if (dstreg.id() != src1p.ireg())
+						a.mov(dstreg, Gpd(src1p.ireg()));                               // mov   dstreg,src1p
+					a.and_(dstreg, 0xff);                                               // and   dstreg,0xff
+				}
+				else
+					a.movzx(dstreg, GpbLo(src1p.ireg()));                               // movzx dstreg,src1p
+			}
 			else if (src1p.is_memory())
-				emit_movzx_r32_m8(dst, dstreg, MABS(src1p.memory()));                       // movzx dstreg,[src1p]
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+				a.movzx(dstreg, MABS(src1p.memory(), 1));                               // movzx dstreg,[src1p]
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 			if (dstp.is_int_register())
-				emit_mov_m32_imm(dst, MABS(m_reghi[dstp.ireg()]), 0);               // mov   dsthi,0
+				a.mov(MABS(m_reghi[dstp.ireg()], 4), 0);                                // mov   dsthi,0
 			else if (dstp.is_memory())
-				emit_mov_m32_imm(dst, MABS(dstp.memory(4)), 0);                     // mov   dsthi,0
+				a.mov(MABS(dstp.memory(4), 4), 0);                                      // mov   dsthi,0
 		}
 
 		// AND with immediate 0xffff
-		else if (src2p.is_immediate_value(0xffff) && inst.flags() == 0)
+		else if (src2p.is_immediate_value(0xffff) && !inst.flags())
 		{
 			if (src1p.is_int_register())
-				emit_movzx_r32_r16(dst, dstreg, src1p.ireg());                          // movzx dstreg,src1p
+				a.movzx(dstreg, Gpw(src1p.ireg()));                                     // movzx dstreg,src1p
 			else if (src1p.is_memory())
-				emit_movzx_r32_m16(dst, dstreg, MABS(src1p.memory()));                  // movzx dstreg,[src1p]
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+				a.movzx(dstreg, MABS(src1p.memory(), 2));                               // movzx dstreg,[src1p]
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 			if (dstp.is_int_register())
-				emit_mov_m32_imm(dst, MABS(m_reghi[dstp.ireg()]), 0);               // mov   dsthi,0
+				a.mov(MABS(m_reghi[dstp.ireg()], 4), 0);                                // mov   dsthi,0
 			else if (dstp.is_memory())
-				emit_mov_m32_imm(dst, MABS(dstp.memory(4)), 0);                     // mov   dsthi,0
+				a.mov(MABS(dstp.memory(4), 4), 0);                                      // mov   dsthi,0
 		}
 
 		// AND with immediate 0xffffffff
-		else if (src2p.is_immediate_value(0xffffffff) && inst.flags() == 0)
+		else if (src2p.is_immediate_value(0xffffffffU) && !inst.flags())
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                               // mov   dstreg,src1p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32(a, dstreg, src1p);                                         // mov   dstreg,src1p
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 			if (dstp.is_int_register())
-				emit_mov_m32_imm(dst, MABS(m_reghi[dstp.ireg()]), 0);               // mov   dsthi,0
+				a.mov(MABS(m_reghi[dstp.ireg()], 4), 0);                                // mov   dsthi,0
 			else if (dstp.is_memory())
-				emit_mov_m32_imm(dst, MABS(dstp.memory(4)), 0);                     // mov   dsthi,0
+				a.mov(MABS(dstp.memory(4), 4), 0);                                      // mov   dsthi,0
 		}
 
 		// AND with immediate 0xffffffff00000000
-		else if (src2p.is_immediate_value(0xffffffff00000000U) && inst.flags() == 0)
+		else if (src2p.is_immediate_value(0xffffffff00000000ULL) && !inst.flags())
 		{
 			if (src1p != dstp)
 			{
-				emit_mov_r64_p64(dst, REG_NONE, REG_EDX, src1p);                // mov   dstreg,src1p
-				emit_mov_p64_r64(dst, dstp, REG_NONE, REG_EDX);             // mov   dstp,dstreg
+				emit_mov_r64_p64(a, Gp(), edx, src1p);                                  // mov   dstreg,src1p
+				emit_mov_p64_r64(a, dstp, Gp(), edx);                                   // mov   dstp,dstreg
 			}
 			if (dstp.is_int_register())
-				emit_xor_r32_r32(dst, dstp.ireg(), dstp.ireg());                            // xor   dstlo,dstlo
+				a.xor_(Gpd(dstp.ireg()), Gpd(dstp.ireg()));                             // xor   dstlo,dstlo
 			else if (dstp.is_memory())
-				emit_mov_m32_imm(dst, MABS(dstp.memory()), 0);                          // mov   dstlo,0
+				a.mov(MABS(dstp.memory(0), 4), 0);                                      // mov   dstlo,0
 		}
 
 		// AND with immediate <= 0xffffffff
-		else if (src2p.is_immediate() && src2p.immediate() <= 0xffffffff && inst.flags() == 0)
+		else if (src2p.is_immediate() && src2p.immediate() <= 0xffffffffU && !inst.flags())
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                               // mov   dstreg,src1p
-			emit_and_r32_p32(dst, dstreg, src2p, inst);                     // and   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32(a, dstreg, src1p);                                         // mov   dstreg,src1p
+			alu_op_param(a, Inst::kIdAnd, dstreg, src2p,                                // and   dstreg,src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize all-zero and all-one cases
+					if (!inst.flags() && !src.immediate())
+					{
+						a.xor_(dst.as<Gpd>(), dst.as<Gpd>());
+						return true;
+					}
+					else if (!inst.flags() && u32(src.immediate()) == 0xffffffffU)
+						return true;
+
+					return false;
+				});
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 			if (dstp.is_int_register())
-				emit_mov_m32_imm(dst, MABS(m_reghi[dstp.ireg()]), 0);               // mov   dsthi,0
+				a.mov(MABS(m_reghi[dstp.ireg()], 4), 0);                                // mov   dsthi,0
 			else if (dstp.is_memory())
-				emit_mov_m32_imm(dst, MABS(dstp.memory(4)), 0);                     // mov   dsthi,0
+				a.mov(MABS(dstp.memory(4), 4), 0);                                      // mov   dsthi,0
 		}
 
 		// general case
 		else
 		{
-			emit_mov_r64_p64(dst, dstreg, REG_EDX, src1p);                      // mov   dstreg:dstp,[src1p]
-			emit_and_r64_p64(dst, dstreg, REG_EDX, src2p, inst);                // and   dstreg:dstp,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                       // mov   dstp,dstreg:eax
+			emit_mov_r64_p64(a, dstreg, edx, src1p);                                    // mov   edx:dstreg,[src1p]
+			emit_and_r64_p64(a, dstreg, edx, src2p, inst);                              // and   edx:dstreg,src2p
+			emit_mov_p64_r64(a, dstp, dstreg, edx);                                     // mov   dstp,edx:dstreg
 		}
 	}
 }
@@ -5286,7 +4521,7 @@
 //  op_test - process a TEST opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_test(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_test(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5299,20 +4534,20 @@
 	normalize_commutative(src1p, src2p);
 
 	// pick a target register for the general case
-	int src1reg = src1p.select_register(REG_EAX);
+	Gp const src1reg = src1p.select_register(eax);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// src1p in memory
 		if (src1p.is_memory())
-			emit_test_m32_p32(dst, MABS(src1p.memory()), src2p, inst);          // test  [src1p],src2p
+			alu_op_param(a, Inst::kIdTest, MABS(src1p.memory(), 4), src2p);             // test  [src1p],src2p
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32(dst, src1reg, src1p);                              // mov   src1reg,src1p
-			emit_test_r32_p32(dst, src1reg, src2p, inst);                       // test  src1reg,src2p
+			emit_mov_r32_p32(a, src1reg, src1p);                                        // mov   src1reg,src1p
+			alu_op_param(a, Inst::kIdTest, src1reg, src2p);                             // test  src1reg,src2p
 		}
 	}
 
@@ -5321,13 +4556,15 @@
 	{
 		// src1p in memory
 		if (src1p.is_memory())
-			emit_test_m64_p64(dst, MABS(src1p.memory()), src2p, inst);          // test  [dstp],src2p
+			alu_op_param(a, Inst::kIdTest, Inst::kIdTest,                               // test  [dstp],src2p
+				MABS(src1p.memory(0), 4), MABS(src1p.memory(4), 4), src2p, inst.flags() & FLAG_Z);
 
 		// general case
 		else
 		{
-			emit_mov_r64_p64(dst, src1reg, REG_EDX, src1p);                 // mov   src1reg:dstp,[src1p]
-			emit_test_r64_p64(dst, src1reg, REG_EDX, src2p, inst);              // test  src1reg:dstp,src2p
+			emit_mov_r64_p64(a, src1reg, edx, src1p);                                   // mov   src1reg:dstp,[src1p]
+			alu_op_param(a, Inst::kIdTest, Inst::kIdTest,                               // test  src1reg:dstp,src2p
+				src1reg, edx, src2p, inst.flags() & FLAG_Z);
 		}
 	}
 }
@@ -5337,7 +4574,7 @@
 //  op_or - process a OR opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_or(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_or(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5351,21 +4588,62 @@
 	normalize_commutative(src1p, src2p);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_or_m32_p32(dst, MABS(dstp.memory()), src2p, inst);             // or    [dstp],src2p
+			alu_op_param(a, Inst::kIdOr, MABS(dstp.memory(), 4), src2p,                 // or    [dstp],src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize all-zero and all-one cases
+					if (!inst.flags() && u32(src.immediate()) == 0xffffffffU)
+					{
+						a.mov(dst.as<Mem>(), imm(-1));
+						return true;
+					}
+					else if (!inst.flags() && !src.immediate())
+						return true;
+
+					return false;
+				});
+		// dstp == src2p in memory
+		else if (dstp.is_memory() && dstp == src2p)
+			alu_op_param(a, Inst::kIdOr, MABS(dstp.memory(), 4), src1p,                 // or    [dstp],src1p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize all-zero and all-one cases
+					if (!inst.flags() && u32(src.immediate()) == 0xffffffffU)
+					{
+						a.mov(dst.as<Mem>(), imm(-1));
+						return true;
+					}
+					else if (!inst.flags() && !src.immediate())
+						return true;
 
+					return false;
+				});
 		// general case
 		else
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                               // mov   dstreg,src1p
-			emit_or_r32_p32(dst, dstreg, src2p, inst);                          // or    dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32(a, dstreg, src1p);                                         // mov   dstreg,src1p
+			alu_op_param(a, Inst::kIdOr, dstreg, src2p,                                 // or    dstreg,src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize all-zero and all-one cases
+					if (!inst.flags() && u32(src.immediate()) == 0xffffffffU)
+					{
+						a.mov(dst.as<Gp>(), imm(-1));
+						return true;
+					}
+					else if (!inst.flags() && !src.immediate())
+						return true;
+
+					return false;
+				});
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -5374,14 +4652,20 @@
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_or_m64_p64(dst, MABS(dstp.memory()), src2p, inst);             // or    [dstp],src2p
+			emit_or_m64_p64(a, MABS(dstp.memory(0), 4), MABS(dstp.memory(4), 4),        // or    [dstp],src2p
+				src2p, inst);
+
+		// dstp == src2p in memory
+		else if (dstp.is_memory() && dstp == src2p)
+			emit_or_m64_p64(a, MABS(dstp.memory(0), 4), MABS(dstp.memory(4), 4),        // or    [dstp],src1p
+				src1p, inst);
 
 		// general case
 		else
 		{
-			emit_mov_r64_p64(dst, dstreg, REG_EDX, src1p);                      // mov   dstreg:dstp,[src1p]
-			emit_or_r64_p64(dst, dstreg, REG_EDX, src2p, inst);             // or    dstreg:dstp,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                       // mov   dstp,dstreg:eax
+			emit_mov_r64_p64(a, dstreg, edx, src1p);                                    // mov   edx:dstreg,[src1p]
+			emit_or_r64_p64(a, dstreg, edx, src2p, inst);                               // or    edx:dstreg,src2p
+			emit_mov_p64_r64(a, dstp, dstreg, edx);                                     // mov   dstp,edx:dstreg
 		}
 	}
 }
@@ -5391,7 +4675,7 @@
 //  op_xor - process a XOR opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_xor(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_xor(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5405,21 +4689,64 @@
 	normalize_commutative(src1p, src2p);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_xor_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                // xor   [dstp],src2p
+			alu_op_param(a, Inst::kIdXor, MABS(dstp.memory(), 4), src2p,                // xor   [dstp],src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize all-zero and all-one cases
+					if (!inst.flags() && u32(src.immediate()) == 0xffffffffU)
+					{
+						a.not_(dst.as<Mem>());
+						return true;
+					}
+					else if (!inst.flags() && !src.immediate())
+						return true;
+
+					return false;
+				});
+
+		// dstp == src2p in memory
+		else if (dstp.is_memory() && dstp == src2p)
+			alu_op_param(a, Inst::kIdXor, MABS(dstp.memory(), 4), src1p,                // xor   [dstp],src1p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize all-zero and all-one cases
+					if (!inst.flags() && u32(src.immediate()) == 0xffffffffU)
+					{
+						a.not_(dst.as<Mem>());
+						return true;
+					}
+					else if (!inst.flags() && !src.immediate())
+						return true;
+
+					return false;
+				});
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                               // mov   dstreg,src1p
-			emit_xor_r32_p32(dst, dstreg, src2p, inst);                     // xor   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32(a, dstreg, src1p);                                         // mov   dstreg,src1p
+			alu_op_param(a, Inst::kIdXor, dstreg, src2p,                                // xor   dstreg,src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize all-zero and all-one cases
+					if (!inst.flags() && u32(src.immediate()) == 0xffffffffU)
+					{
+						a.not_(dst.as<Gp>());
+						return true;
+					}
+					else if (!inst.flags() && !src.immediate())
+						return true;
+
+					return false;
+				});
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -5428,14 +4755,20 @@
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_xor_m64_p64(dst, MABS(dstp.memory()), src2p, inst);                // xor   [dstp],src2p
+			emit_xor_m64_p64(a, MABS(dstp.memory(0), 4), MABS(dstp.memory(4), 4),       // xor   [dstp],src2p
+				src2p, inst);
+
+		// dstp == src1p in memory
+		else if (dstp.is_memory() && dstp == src2p)
+			emit_xor_m64_p64(a, MABS(dstp.memory(0), 4), MABS(dstp.memory(4), 4),       // xor   [dstp],src1p
+				src1p, inst);
 
 		// general case
 		else
 		{
-			emit_mov_r64_p64(dst, dstreg, REG_EDX, src1p);                      // mov   dstreg:dstp,[src1p]
-			emit_xor_r64_p64(dst, dstreg, REG_EDX, src2p, inst);                // xor   dstreg:dstp,src2p
-			emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                       // mov   dstp,dstreg:eax
+			emit_mov_r64_p64(a, dstreg, edx, src1p);                                    // mov   edx:dstreg,[src1p]
+			emit_xor_r64_p64(a, dstreg, edx, src2p, inst);                              // xor   edx:dstreg,src2p
+			emit_mov_p64_r64(a, dstp, dstreg, edx);                                     // mov   dstp,edx:dstreg
 		}
 	}
 }
@@ -5445,7 +4778,7 @@
 //  op_lzcnt - process a LZCNT opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_lzcnt(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_lzcnt(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5457,34 +4790,35 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+	Gp const dstreg = dstp.select_register(eax);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_mov_r32_p32(dst, dstreg, srcp);                                    // mov   dstreg,src1p
-		emit_mov_r32_imm(dst, REG_ECX, 32 ^ 31);                                        // mov   ecx,32 ^ 31
-		emit_bsr_r32_r32(dst, dstreg, dstreg);                                          // bsr   dstreg,dstreg
-		emit_cmovcc_r32_r32(dst, x86emit::COND_Z, dstreg, REG_ECX);                             // cmovz dstreg,ecx
-		emit_xor_r32_imm(dst, dstreg, 31);                                              // xor   dstreg,31
-		emit_mov_p32_r32(dst, dstp, dstreg);                                    // mov   dstp,dstreg
+		emit_mov_r32_p32(a, dstreg, srcp);                                              // mov   dstreg,src1p
+		a.mov(ecx, 32 ^ 31);                                                            // mov   ecx,32 ^ 31
+		a.bsr(dstreg, dstreg);                                                          // bsr   dstreg,dstreg
+		a.cmovz(dstreg, ecx);                                                           // cmovz dstreg,ecx
+		a.xor_(dstreg, 31);                                                             // xor   dstreg,31
+		emit_mov_p32_r32(a, dstp, dstreg);                                              // mov   dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_mov_r64_p64(dst, REG_EDX, dstreg, srcp);                           // mov   dstreg:edx,srcp
-		emit_bsr_r32_r32(dst, dstreg, dstreg);                                          // bsr   dstreg,dstreg
-		emit_link skip;
-		emit_jcc_short_link(dst, x86emit::COND_NZ, skip);                                       // jnz   skip
-		emit_mov_r32_imm(dst, REG_ECX, 32 ^ 31);                                        // mov   ecx,32 ^ 31
-		emit_bsr_r32_r32(dst, dstreg, REG_EDX);                                     // bsr   dstreg,edx
-		emit_cmovcc_r32_r32(dst, x86emit::COND_Z, dstreg, REG_ECX);                             // cmovz dstreg,ecx
-		emit_add_r32_imm(dst, REG_ECX, 32);                                         // add   ecx,32
-		track_resolve_link(dst, skip);                                              // skip:
-		emit_xor_r32_r32(dst, REG_EDX, REG_EDX);                                        // xor   edx,edx
-		emit_xor_r32_imm(dst, dstreg, 31);                                              // xor   dstreg,31
-		emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                           // mov   dstp,edx:dstreg
+		emit_mov_r64_p64(a, edx, dstreg, srcp);                                         // mov   dstreg:edx,srcp
+		a.bsr(dstreg, dstreg);                                                          // bsr   dstreg,dstreg
+		Label skip = a.newLabel();
+		a.jnz(skip);                                                                    // jnz   skip
+		a.mov(ecx, 32 ^ 31);                                                            // mov   ecx,32 ^ 31
+		a.bsr(dstreg, edx);                                                             // bsr   dstreg,edx
+		a.cmovz(dstreg, ecx);                                                           // cmovz dstreg,ecx
+		a.add(ecx, 32);                                                                 // add   ecx,32
+		a.bind(skip);                                                               // skip:
+		reset_last_upper_lower_reg();
+		a.xor_(edx, edx);                                                               // xor   edx,edx
+		a.xor_(dstreg, 31);                                                             // xor   dstreg,31
+		emit_mov_p64_r64(a, dstp, dstreg, edx);                                         // mov   dstp,edx:dstreg
 	}
 }
 
@@ -5493,7 +4827,7 @@
 //  op_tzcnt - process a TZCNT opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_tzcnt(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_tzcnt(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5504,32 +4838,33 @@
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
 	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
 
-	int dstreg = dstp.select_register(REG_EAX);
+	Gp const dstreg = dstp.select_register(eax);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_mov_r32_p32(dst, dstreg, srcp);                                            // mov   dstreg,src1p
-		emit_mov_r32_imm(dst, REG_ECX, 32);                                             // mov   ecx,32
-		emit_bsf_r32_r32(dst, dstreg, dstreg);                                          // bsf   dstreg,dstreg
-		emit_cmovcc_r32_r32(dst, x86emit::COND_Z, dstreg, REG_ECX);                     // cmovz dstreg,ecx
-		emit_mov_p32_r32(dst, dstp, dstreg);                                            // mov   dstp,dstreg
+		emit_mov_r32_p32(a, dstreg, srcp);                                              // mov   dstreg,src1p
+		a.mov(ecx, 32);                                                                 // mov   ecx,32
+		a.bsf(dstreg, dstreg);                                                          // bsf   dstreg,dstreg
+		a.cmovz(dstreg, ecx);                                                           // cmovz dstreg,ecx
+		emit_mov_p32_r32(a, dstp, dstreg);                                              // mov   dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_link skip;
-		emit_mov_r64_p64(dst, REG_EDX, dstreg, srcp);                                   // mov   dstreg:edx,srcp
-		emit_bsf_r32_r32(dst, dstreg, dstreg);                                          // bsf   dstreg,dstreg
-		emit_jcc_short_link(dst, x86emit::COND_NZ, skip);                               // jnz   skip
-		emit_mov_r32_imm(dst, REG_ECX, 32);                                             // mov   ecx,32
-		emit_bsf_r32_r32(dst, dstreg, REG_EDX);                                         // bsf   dstreg,edx
-		emit_cmovcc_r32_r32(dst, x86emit::COND_Z, dstreg, REG_ECX);                     // cmovz dstreg,ecx
-		emit_add_r32_imm(dst, dstreg, 32);                                              // add   dstreg,32
-		track_resolve_link(dst, skip);                                                  // skip:
-		emit_xor_r32_r32(dst, REG_EDX, REG_EDX);                                        // xor   edx,edx
-		emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                                   // mov   dstp,edx:dstreg
+		Label skip = a.newLabel();
+		emit_mov_r64_p64(a, edx, dstreg, srcp);                                         // mov   dstreg:edx,srcp
+		a.bsf(dstreg, dstreg);                                                          // bsf   dstreg,dstreg
+		a.jz(skip);                                                                     // jnz   skip
+		a.mov(ecx, 32);                                                                 // mov   ecx,32
+		a.bsf(dstreg, edx);                                                             // bsf   dstreg,edx
+		a.cmovz(dstreg, ecx);                                                           // cmovz dstreg,ecx
+		a.add(dstreg, 32);                                                              // add   dstreg,32
+		a.bind(skip);                                                               // skip:
+		reset_last_upper_lower_reg();
+		a.xor_(edx, edx);                                                               // xor   edx,edx
+		emit_mov_p64_r64(a, dstp, dstreg, edx);                                         // mov   dstp,edx:dstreg
 	}
 }
 
@@ -5538,7 +4873,7 @@
 //  op_bswap - process a BSWAP opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_bswap(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_bswap(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5550,36 +4885,36 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX);
+	Gp const dstreg = dstp.select_register(eax);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
-		emit_mov_r32_p32(dst, dstreg, srcp);                                    // mov   dstreg,src1p
-		emit_bswap_r32(dst, dstreg);                                                    // bswap dstreg
+		emit_mov_r32_p32(a, dstreg, srcp);                                              // mov   dstreg,src1p
+		a.bswap(dstreg);                                                                // bswap dstreg
 		if (inst.flags() != 0)
-			emit_test_r32_r32(dst, dstreg, dstreg);                                 // test  dstreg,dstreg
-		emit_mov_p32_r32(dst, dstp, dstreg);                                    // mov   dstp,dstreg
+			a.test(dstreg, dstreg);                                                     // test  dstreg,dstreg
+		emit_mov_p32_r32(a, dstp, dstreg);                                              // mov   dstp,dstreg
 	}
 
 	// 64-bit form
 	else if (inst.size() == 8)
 	{
-		emit_mov_r64_p64(dst, REG_EDX, dstreg, srcp);                           // mov   dstreg:edx,srcp
-		emit_bswap_r32(dst, dstreg);                                                    // bswap dstreg
-		emit_bswap_r32(dst, REG_EDX);                                                   // bswap edx
-		emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                           // mov   dstp,edx:dstreg
+		emit_mov_r64_p64(a, edx, dstreg, srcp);                                         // mov   dstreg:edx,srcp
+		a.bswap(dstreg);                                                                // bswap dstreg
+		a.bswap(edx);                                                                   // bswap edx
+		emit_mov_p64_r64(a, dstp, dstreg, edx);                                         // mov   dstp,edx:dstreg
 		if (inst.flags() == FLAG_Z)
-			emit_or_r32_r32(dst, REG_EDX, dstreg);                                      // or    edx,eax
+			a.or_(edx, dstreg);                                                         // or    edx,eax
 		else if (inst.flags() == FLAG_S)
-			emit_test_r32_r32(dst, REG_EDX, REG_EDX);                                   // test  edx,edx
+			a.test(edx, edx);                                                           // test  edx,edx
 		else
 		{
-			emit_movzx_r32_r16(dst, REG_ECX, dstreg);                                   // movzx ecx,dstreg
-			emit_or_r32_r32(dst, REG_EDX, REG_ECX);                                 // or    edx,ecx
-			emit_mov_r32_r32(dst, REG_ECX, dstreg);                                 // mov   ecx,dstreg
-			emit_shr_r32_imm(dst, REG_ECX, 16);                                     // shr   ecx,16
-			emit_or_r32_r32(dst, REG_EDX, REG_ECX);                                 // or    edx,ecx
+			a.movzx(ecx, dstreg.r16());                                                 // movzx ecx,dstreg
+			a.or_(edx, ecx);                                                            // or    edx,ecx
+			a.mov(ecx, dstreg);                                                         // mov   ecx,dstreg
+			a.shr(ecx, 16);                                                             // shr   ecx,16
+			a.or_(edx, ecx);                                                            // or    edx,ecx
 		}
 	}
 }
@@ -5589,7 +4924,7 @@
 //  op_shl - process a SHL opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_shl(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_shl(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5602,21 +4937,31 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_shl_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                // shl   [dstp],src2p
+			shift_op_param(a, Inst::kIdShl, MABS(dstp.memory(), 4), src2p,              // shl   [dstp],src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                               // mov   dstreg,src1p
-			emit_shl_r32_p32(dst, dstreg, src2p, inst);                     // shl   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32(a, dstreg, src1p);                                         // mov   dstreg,src1p
+			shift_op_param(a, Inst::kIdShl, dstreg, src2p,                              // shl   dstreg,src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -5624,9 +4969,9 @@
 	else if (inst.size() == 8)
 	{
 		// general case
-		emit_mov_r64_p64(dst, dstreg, REG_EDX, src1p);                          // mov   dstreg:dstp,[src1p]
-		emit_shl_r64_p64(dst, dstreg, REG_EDX, src2p, inst);                    // shl   dstreg:dstp,src2p
-		emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                           // mov   dstp,dstreg:eax
+		emit_mov_r64_p64(a, dstreg, edx, src1p);                                        // mov   edx:dstreg,[src1p]
+		emit_shl_r64_p64(a, dstreg, edx, src2p, inst);                                  // shl   edx:dstreg,src2p
+		emit_mov_p64_r64(a, dstp, dstreg, edx);                                         // mov   dstp,edx:dstreg
 	}
 }
 
@@ -5635,7 +4980,7 @@
 //  op_shr - process a SHR opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_shr(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_shr(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5648,21 +4993,31 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_shr_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                // shr   [dstp],src2p
+			shift_op_param(a, Inst::kIdShr, MABS(dstp.memory(), 4), src2p,              // shr   [dstp],src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                               // mov   dstreg,src1p
-			emit_shr_r32_p32(dst, dstreg, src2p, inst);                     // shr   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32(a, dstreg, src1p);                                         // mov   dstreg,src1p
+			shift_op_param(a, Inst::kIdShr, dstreg, src2p,                              // shr   dstreg,src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -5670,9 +5025,9 @@
 	else if (inst.size() == 8)
 	{
 		// general case
-		emit_mov_r64_p64(dst, dstreg, REG_EDX, src1p);                          // mov   dstreg:dstp,[src1p]
-		emit_shr_r64_p64(dst, dstreg, REG_EDX, src2p, inst);                    // shr   dstreg:dstp,src2p
-		emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                           // mov   dstp,dstreg:eax
+		emit_mov_r64_p64(a, dstreg, edx, src1p);                                        // mov   edx:dstreg,[src1p]
+		emit_shr_r64_p64(a, dstreg, edx, src2p, inst);                                  // shr   edx:dstreg,src2p
+		emit_mov_p64_r64(a, dstp, dstreg, edx);                                         // mov   dstp,edx:dstreg
 	}
 }
 
@@ -5681,7 +5036,7 @@
 //  op_sar - process a SAR opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_sar(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_sar(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5694,21 +5049,31 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_sar_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                // sar   [dstp],src2p
+			shift_op_param(a, Inst::kIdSar, MABS(dstp.memory(), 4), src2p,              // sar   [dstp],src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                               // mov   dstreg,src1p
-			emit_sar_r32_p32(dst, dstreg, src2p, inst);                     // sar   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32(a, dstreg, src1p);                                         // mov   dstreg,src1p
+			shift_op_param(a, Inst::kIdSar, dstreg, src2p,                              // sar   dstreg,src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -5716,9 +5081,9 @@
 	else if (inst.size() == 8)
 	{
 		// general case
-		emit_mov_r64_p64(dst, dstreg, REG_EDX, src1p);                          // mov   dstreg:dstp,[src1p]
-		emit_sar_r64_p64(dst, dstreg, REG_EDX, src2p, inst);                    // sar   dstreg:dstp,src2p
-		emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                           // mov   dstp,dstreg:eax
+		emit_mov_r64_p64(a, dstreg, edx, src1p);                                        // mov   edx:dstreg,[src1p]
+		emit_sar_r64_p64(a, dstreg, edx, src2p, inst);                                  // sar   edx:dstreg,src2p
+		emit_mov_p64_r64(a, dstp, dstreg, edx);                                         // mov   dstp,edx:dstreg
 	}
 }
 
@@ -5727,7 +5092,7 @@
 //  op_rol - process a rol opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_rol(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_rol(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5740,21 +5105,31 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_rol_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                // rol   [dstp],src2p
+			shift_op_param(a, Inst::kIdRol, MABS(dstp.memory(), 4), src2p,              // rol   [dstp],src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                               // mov   dstreg,src1p
-			emit_rol_r32_p32(dst, dstreg, src2p, inst);                     // rol   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32(a, dstreg, src1p);                                         // mov   dstreg,src1p
+			shift_op_param(a, Inst::kIdRol, dstreg, src2p,                              // rol   dstreg,src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -5762,9 +5137,9 @@
 	else if (inst.size() == 8)
 	{
 		// general case
-		emit_mov_r64_p64(dst, dstreg, REG_EDX, src1p);                          // mov   dstreg:dstp,[src1p]
-		emit_rol_r64_p64(dst, dstreg, REG_EDX, src2p, inst);                    // rol   dstreg:dstp,src2p
-		emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                           // mov   dstp,dstreg:eax
+		emit_mov_r64_p64(a, dstreg, edx, src1p);                                        // mov   edx:dstreg,[src1p]
+		emit_rol_r64_p64(a, dstreg, edx, src2p, inst);                                  // rol   edx:dstreg,src2p
+		emit_mov_p64_r64(a, dstp, dstreg, edx);                                         // mov   dstp,edx:dstreg
 	}
 }
 
@@ -5773,7 +5148,7 @@
 //  op_ror - process a ROR opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_ror(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_ror(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5786,21 +5161,31 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_ror_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                // ror   [dstp],src2p
+			shift_op_param(a, Inst::kIdRor, MABS(dstp.memory(), 4), src2p,              // ror   [dstp],src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32(dst, dstreg, src1p);                               // mov   dstreg,src1p
-			emit_ror_r32_p32(dst, dstreg, src2p, inst);                     // ror   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32(a, dstreg, src1p);                                         // mov   dstreg,src1p
+			shift_op_param(a, Inst::kIdRor, dstreg, src2p,                              // rol   dstreg,src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -5808,9 +5193,9 @@
 	else if (inst.size() == 8)
 	{
 		// general case
-		emit_mov_r64_p64(dst, dstreg, REG_EDX, src1p);                          // mov   dstreg:dstp,[src1p]
-		emit_ror_r64_p64(dst, dstreg, REG_EDX, src2p, inst);                    // ror   dstreg:dstp,src2p
-		emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                           // mov   dstp,dstreg:eax
+		emit_mov_r64_p64(a, dstreg, edx, src1p);                                        // mov   edx:dstreg,[src1p]
+		emit_ror_r64_p64(a, dstreg, edx, src2p, inst);                                  // ror   edx:dstreg,src2p
+		emit_mov_p64_r64(a, dstp, dstreg, edx);                                         // mov   dstp,edx:dstreg
 	}
 }
 
@@ -5819,7 +5204,7 @@
 //  op_rolc - process a ROLC opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_rolc(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_rolc(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5832,21 +5217,31 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_rcl_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                // rcl   [dstp],src2p
+			shift_op_param(a, Inst::kIdRcl, MABS(dstp.memory(), 4), src2p,              // rcl   [dstp],src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32_keepflags(dst, dstreg, src1p);                 // mov   dstreg,src1p
-			emit_rcl_r32_p32(dst, dstreg, src2p, inst);                     // rcl   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32_keepflags(a, dstreg, src1p);                               // mov   dstreg,src1p
+			shift_op_param(a, Inst::kIdRcl, dstreg, src2p,                              // rcl   dstreg,src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -5854,9 +5249,9 @@
 	else if (inst.size() == 8)
 	{
 		// general case
-		emit_mov_r64_p64_keepflags(dst, dstreg, REG_EDX, src1p);                // mov   dstreg:dstp,[src1p]
-		emit_rcl_r64_p64(dst, dstreg, REG_EDX, src2p, inst);                    // rcl   dstreg:dstp,src2p
-		emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                           // mov   dstp,dstreg:eax
+		emit_mov_r64_p64_keepflags(a, dstreg, edx, src1p);                              // mov   edx:dstreg,[src1p]
+		emit_rcl_r64_p64(a, dstreg, edx, src2p, inst);                                  // rcl   edx:dstreg,src2p
+		emit_mov_p64_r64(a, dstp, dstreg, edx);                                         // mov   dstp,edx:dstreg
 	}
 }
 
@@ -5865,7 +5260,7 @@
 //  op_rorc - process a RORC opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_rorc(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_rorc(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5878,21 +5273,31 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MRI);
 
 	// pick a target register for the general case
-	int dstreg = dstp.select_register(REG_EAX, src2p);
+	Gp const dstreg = dstp.select_register(eax, src2p);
 
 	// 32-bit form
 	if (inst.size() == 4)
 	{
 		// dstp == src1p in memory
 		if (dstp.is_memory() && dstp == src1p)
-			emit_rcr_m32_p32(dst, MABS(dstp.memory()), src2p, inst);                // rcr   [dstp],src2p
+			shift_op_param(a, Inst::kIdRcr, MABS(dstp.memory(), 4), src2p,              // rcr   [dstp],src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
 
 		// general case
 		else
 		{
-			emit_mov_r32_p32_keepflags(dst, dstreg, src1p);                 // mov   dstreg,src1p
-			emit_rcr_r32_p32(dst, dstreg, src2p, inst);                     // rcr   dstreg,src2p
-			emit_mov_p32_r32(dst, dstp, dstreg);                                // mov   dstp,dstreg
+			emit_mov_r32_p32_keepflags(a, dstreg, src1p);                               // mov   dstreg,src1p
+			shift_op_param(a, Inst::kIdRcr, dstreg, src2p,                              // rcr   dstreg,src2p
+				[inst](Assembler &a, Operand const &dst, be_parameter const &src)
+				{
+					// optimize zero case
+					return (!inst.flags() && !src.immediate());
+				});
+			emit_mov_p32_r32(a, dstp, dstreg);                                          // mov   dstp,dstreg
 		}
 	}
 
@@ -5900,9 +5305,9 @@
 	else if (inst.size() == 8)
 	{
 		// general case
-		emit_mov_r64_p64_keepflags(dst, dstreg, REG_EDX, src1p);                // mov   dstreg:dstp,[src1p]
-		emit_rcr_r64_p64(dst, dstreg, REG_EDX, src2p, inst);                    // rcr   dstreg:dstp,src2p
-		emit_mov_p64_r64(dst, dstp, dstreg, REG_EDX);                           // mov   dstp,dstreg:eax
+		emit_mov_r64_p64_keepflags(a, dstreg, edx, src1p);                              // mov   edx:dstreg,[src1p]
+		emit_rcr_r64_p64(a, dstreg, edx, src2p, inst);                                  // rcr   edx:dstreg,src2p
+		emit_mov_p64_r64(a, dstp, dstreg, edx);                                         // mov   dstp,edx:dstreg
 	}
 }
 
@@ -5916,7 +5321,7 @@
 //  op_fload - process a FLOAD opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fload(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fload(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5931,25 +5336,25 @@
 	// immediate index
 	if (indp.is_immediate())
 	{
-		emit_mov_r32_m32(dst, REG_EAX, MABS(basep.memory(4*indp.immediate())));             // mov   eax,[basep + 4*indp]
+		a.mov(eax, MABS(basep.memory(4*indp.immediate())));                             // mov   eax,[basep + 4*indp]
 		if (inst.size() == 8)
-			emit_mov_r32_m32(dst, REG_EDX, MABS(basep.memory(4 + 4*indp.immediate())));     // mov   edx,[basep + 4*indp + 4]
+			a.mov(edx, MABS(basep.memory(4 + 4*indp.immediate())));                     // mov   edx,[basep + 4*indp + 4]
 	}
 
 	// other index
 	else
 	{
-		int indreg = indp.select_register(REG_ECX);
-		emit_mov_r32_p32(dst, indreg, indp);
-		emit_mov_r32_m32(dst, REG_EAX, MABSI(basep.memory(), indreg, 4));                   // mov   eax,[basep + 4*indp]
+		Gp const indreg = indp.select_register(ecx);
+		emit_mov_r32_p32(a, indreg, indp);
+		a.mov(eax, ptr(u64(basep.memory(0)), indreg, 2));                               // mov   eax,[basep + 4*indp]
 		if (inst.size() == 8)
-			emit_mov_r32_m32(dst, REG_EDX, MABSI(basep.memory(4), indreg, 4));          // mov   edx,[basep + 4*indp + 4]
+			a.mov(edx, ptr(u64(basep.memory(4)), indreg, 2));                           // mov   edx,[basep + 4*indp + 4]
 	}
 
 	// general case
-	emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX);                                    // mov   [dstp],eax
+	a.mov(MABS(dstp.memory(0)), eax);                                                   // mov   [dstp],eax
 	if (inst.size() == 8)
-		emit_mov_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX);                           // mov   [dstp + 4],edx
+		a.mov(MABS(dstp.memory(4)), edx);                                               // mov   [dstp + 4],edx
 }
 
 
@@ -5957,7 +5362,7 @@
 //  op_fstore - process a FSTORE opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fstore(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fstore(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -5970,26 +5375,26 @@
 	be_parameter srcp(*this, inst.param(2), PTYPE_MF);
 
 	// general case
-	emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory()));                                    // mov   eax,[srcp]
+	a.mov(eax, MABS(srcp.memory(0)));                                                   // mov   eax,[srcp]
 	if (inst.size() == 8)
-		emit_mov_r32_m32(dst, REG_EDX, MABS(srcp.memory(4)));                           // mov   edx,[srcp + 4]
+		a.mov(edx, MABS(srcp.memory(4)));                                               // mov   edx,[srcp + 4]
 
 	// immediate index
 	if (indp.is_immediate())
 	{
-		emit_mov_m32_r32(dst, MABS(basep.memory(4*indp.immediate())), REG_EAX);             // mov   [basep + 4*indp],eax
+		a.mov(MABS(basep.memory(4*indp.immediate())), eax);                             // mov   [basep + 4*indp],eax
 		if (inst.size() == 8)
-			emit_mov_m32_r32(dst, MABS(basep.memory(4 + 4*indp.immediate())), REG_EDX);     // mov   [basep + 4*indp + 4],edx
+			a.mov(MABS(basep.memory(4 + 4*indp.immediate())), edx);                     // mov   [basep + 4*indp + 4],edx
 	}
 
 	// other index
 	else
 	{
-		int indreg = indp.select_register(REG_ECX);
-		emit_mov_r32_p32(dst, indreg, indp);
-		emit_mov_m32_r32(dst, MABSI(basep.memory(), indreg, 4), REG_EAX);                   // mov   [basep + 4*indp],eax
+		Gp const indreg = indp.select_register(ecx);
+		emit_mov_r32_p32(a, indreg, indp);
+		a.mov(ptr(u64(basep.memory(0)), indreg, 2), eax);                               // mov   [basep + 4*indp],eax
 		if (inst.size() == 8)
-			emit_mov_m32_r32(dst, MABSI(basep.memory(4), indreg, 4), REG_EDX);          // mov   [basep + 4*indp + 4],edx
+			a.mov(ptr(u64(basep.memory(4)), indreg, 2), edx);                           // mov   [basep + 4*indp + 4],edx
 	}
 }
 
@@ -5998,7 +5403,7 @@
 //  op_fread - process a FREAD opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fread(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fread(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6008,23 +5413,23 @@
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MF);
 	be_parameter addrp(*this, inst.param(1), PTYPE_MRI);
-	const parameter &spacep = inst.param(2);
+	parameter const &spacep = inst.param(2);
 	assert(spacep.is_size_space());
 	assert((1 << spacep.size()) == inst.size());
 
 	// set up a call to the read dword/qword handler
-	emit_mov_m32_p32(dst, MBD(REG_ESP, 4), addrp);                              // mov    [esp+4],addrp
-	emit_mov_m32_imm(dst, MBD(REG_ESP, 0), (uintptr_t)m_space[spacep.space()]);      // mov    [esp],space
+	emit_mov_m32_p32(a, dword_ptr(esp, 4), addrp);                                      // mov    [esp+4],addrp
+	a.mov(dword_ptr(esp, 0), imm(m_space[spacep.space()]));                             // mov    [esp],space
 	if (inst.size() == 4)
-		emit_call(dst, (x86code *)m_accessors[spacep.space()].read_dword);  // call   read_dword
+		a.call(imm(m_accessors[spacep.space()].read_dword));                            // call   read_dword
 	else if (inst.size() == 8)
-		emit_call(dst, (x86code *)m_accessors[spacep.space()].read_qword);  // call   read_qword
+		a.call(imm(m_accessors[spacep.space()].read_qword));                            // call   read_qword
 
 	// store result
 	if (inst.size() == 4)
-		emit_mov_p32_r32(dst, dstp, REG_EAX);                                   // mov   dstp,eax
+		emit_mov_p32_r32(a, dstp, eax);                                                 // mov   dstp,eax
 	else if (inst.size() == 8)
-		emit_mov_p64_r64(dst, dstp, REG_EAX, REG_EDX);                          // mov   dstp,edx:eax
+		emit_mov_p64_r64(a, dstp, eax, edx);                                            // mov   dstp,edx:eax
 }
 
 
@@ -6032,7 +5437,7 @@
 //  op_fwrite - process a FWRITE opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fwrite(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fwrite(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6042,21 +5447,21 @@
 	// normalize parameters
 	be_parameter addrp(*this, inst.param(0), PTYPE_MRI);
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
-	const parameter &spacep = inst.param(2);
+	parameter const &spacep = inst.param(2);
 	assert(spacep.is_size_space());
 	assert((1 << spacep.size()) == inst.size());
 
 	// set up a call to the write dword/qword handler
 	if (inst.size() == 4)
-		emit_mov_m32_p32(dst, MBD(REG_ESP, 8), srcp);                           // mov    [esp+8],srcp
+		emit_mov_m32_p32(a, dword_ptr(esp, 8), srcp);                                   // mov    [esp+8],srcp
 	else if (inst.size() == 8)
-		emit_mov_m64_p64(dst, MBD(REG_ESP, 8), srcp);                           // mov    [esp+8],srcp
-	emit_mov_m32_p32(dst, MBD(REG_ESP, 4), addrp);                              // mov    [esp+4],addrp
-	emit_mov_m32_imm(dst, MBD(REG_ESP, 0), (uintptr_t)m_space[spacep.space()]);      // mov    [esp],space
+		emit_mov_m64_p64(a, qword_ptr(esp, 8), srcp);                                   // mov    [esp+8],srcp
+	emit_mov_m32_p32(a, dword_ptr(esp, 4), addrp);                                      // mov    [esp+4],addrp
+	a.mov(dword_ptr(esp, 0), imm(m_space[spacep.space()]));                             // mov    [esp],space
 	if (inst.size() == 4)
-		emit_call(dst, (x86code *)m_accessors[spacep.space()].write_dword); // call   write_dword
+		a.call(imm(m_accessors[spacep.space()].write_dword));                           // call   write_dword
 	else if (inst.size() == 8)
-		emit_call(dst, (x86code *)m_accessors[spacep.space()].write_qword); // call   write_qword
+		a.call(imm(m_accessors[spacep.space()].write_qword));                           // call   write_qword
 }
 
 
@@ -6064,7 +5469,7 @@
 //  op_fmov - process a FMOV opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fmov(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fmov(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6076,21 +5481,24 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// always start with a jmp
-	emit_link skip = { nullptr };
+	Label skip = a.newLabel();
 	if (inst.condition() != uml::COND_ALWAYS)
-		emit_jcc_short_link(dst, X86_NOT_CONDITION(inst.condition()), skip);            // jcc   skip
+		a.j(X86_NOT_CONDITION(inst.condition()), skip);                                 // jcc   skip
 
 	// general case
-	emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory()));                                    // mov   eax,[srcp]
+	a.mov(eax, MABS(srcp.memory(0)));                                                   // mov   eax,[srcp]
 	if (inst.size() == 8)
-		emit_mov_r32_m32(dst, REG_EDX, MABS(srcp.memory(4)));                           // mov   edx,[srcp + 4]
-	emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX);                                    // mov   [dstp],eax
+		a.mov(edx, MABS(srcp.memory(4)));                                               // mov   edx,[srcp + 4]
+	a.mov(MABS(dstp.memory(0)), eax);                                                   // mov   [dstp],eax
 	if (inst.size() == 8)
-		emit_mov_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX);                           // mov   [dstp + 4],edx
+		a.mov(MABS(dstp.memory(4)), edx);                                               // mov   [dstp + 4],edx
 
 	// resolve the jump
-	if (skip.target != nullptr)
-		track_resolve_link(dst, skip);                                              // skip:
+	if (inst.condition() != uml::COND_ALWAYS)
+	{
+		a.bind(skip);                                                               // skip:
+		reset_last_upper_lower_reg();
+	}
 }
 
 
@@ -6098,7 +5506,7 @@
 //  op_ftoint - process a FTOINT opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_ftoint(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_ftoint(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6108,20 +5516,20 @@
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MR);
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
-	const parameter &sizep = inst.param(2);
+	parameter const &sizep = inst.param(2);
 	assert(sizep.is_size());
-	const parameter &roundp = inst.param(3);
+	parameter const &roundp = inst.param(3);
 	assert(roundp.is_rounding());
 
 	// set rounding mode if necessary
 	if (roundp.rounding() != ROUND_DEFAULT && (!m_sse3 || roundp.rounding() != ROUND_TRUNC))
 	{
-		emit_fstcw_m16(dst, MABS(&m_fmodesave));                                    // fstcw [fmodesave]
-		emit_fldcw_m16(dst, MABS(&fp_control[roundp.rounding()]));                          // fldcw fpcontrol[roundp]
+		a.fstcw(MABS(&m_fmodesave));                                                    // fstcw [fmodesave]
+		a.fldcw(MABS(&fp_control[roundp.rounding()]));                                  // fldcw fpcontrol[roundp]
 	}
 
 	// general case
-	emit_fld_p(dst, inst.size(), srcp);                                             // fld   srcp
+	emit_fld_p(a, inst.size(), srcp);                                                   // fld   srcp
 
 	// 4-byte integer case
 	if (sizep.size() == SIZE_DWORD)
@@ -6129,17 +5537,17 @@
 		if (dstp.is_memory())
 		{
 			if (!m_sse3 || roundp.rounding() != ROUND_TRUNC)
-				emit_fistp_m32(dst, MABS(dstp.memory()));                                   // fistp [dstp]
+				a.fistp(MABS(dstp.memory(), 4));                                        // fistp [dstp]
 			else
-				emit_fisttp_m32(dst, MABS(dstp.memory()));                              // fisttp [dstp]
+				a.fisttp(MABS(dstp.memory(), 4));                                       // fisttp [dstp]
 		}
 		else if (dstp.is_int_register())
 		{
 			if (!m_sse3 || roundp.rounding() != ROUND_TRUNC)
-				emit_fistp_m32(dst, MABS(m_reglo[dstp.ireg()]));                    // fistp reglo[dstp]
+				a.fistp(MABS(m_reglo[dstp.ireg()], 4));                                 // fistp reglo[dstp]
 			else
-				emit_fisttp_m32(dst, MABS(m_reglo[dstp.ireg()]));                   // fisttp reglo[dstp]
-			emit_mov_r32_m32(dst, dstp.ireg(), MABS(m_reglo[dstp.ireg()]));         // mov   dstp,reglo[dstp]
+				a.fisttp(MABS(m_reglo[dstp.ireg()], 4));                                // fisttp reglo[dstp]
+			a.mov(Gpd(dstp.ireg()), MABS(m_reglo[dstp.ireg()]));                        // mov   dstp,reglo[dstp]
 		}
 	}
 
@@ -6149,23 +5557,23 @@
 		if (dstp.is_memory())
 		{
 			if (!m_sse3 || roundp.rounding() != ROUND_TRUNC)
-				emit_fistp_m64(dst, MABS(dstp.memory()));                                   // fistp [dstp]
+				a.fistp(MABS(dstp.memory(), 8));                                        // fistp [dstp]
 			else
-				emit_fisttp_m64(dst, MABS(dstp.memory()));                              // fisttp [dstp]
+				a.fisttp(MABS(dstp.memory(), 8));                                       // fisttp [dstp]
 		}
 		else if (dstp.is_int_register())
 		{
 			if (!m_sse3 || roundp.rounding() != ROUND_TRUNC)
-				emit_fistp_m64(dst, MABS(m_reglo[dstp.ireg()]));                    // fistp reglo[dstp]
+				a.fistp(MABS(m_reglo[dstp.ireg()], 8));                                 // fistp reglo[dstp]
 			else
-				emit_fisttp_m64(dst, MABS(m_reglo[dstp.ireg()]));                   // fisttp reglo[dstp]
-			emit_mov_r32_m32(dst, dstp.ireg(), MABS(m_reglo[dstp.ireg()]));         // mov   dstp,reglo[dstp]
+				a.fisttp(MABS(m_reglo[dstp.ireg()], 8));                                // fisttp reglo[dstp]
+			a.mov(Gpd(dstp.ireg()), MABS(m_reglo[dstp.ireg()]));                        // mov   dstp,reglo[dstp]
 		}
 	}
 
 	// restore control word and proceed
 	if (roundp.rounding() != ROUND_DEFAULT && (!m_sse3 || roundp.rounding() != ROUND_TRUNC))
-		emit_fldcw_m16(dst, MABS(&m_fmodesave));                                    // fldcw [fmodesave]
+		a.fldcw(MABS(&m_fmodesave));                                                    // fldcw [fmodesave]
 }
 
 
@@ -6173,7 +5581,7 @@
 //  op_ffrint - process a FFRINT opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_ffrint(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_ffrint(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6183,7 +5591,7 @@
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MF);
 	be_parameter srcp(*this, inst.param(1), PTYPE_MRI);
-	const parameter &sizep = inst.param(2);
+	parameter const &sizep = inst.param(2);
 	assert(sizep.is_size());
 
 	// 4-byte integer case
@@ -6191,15 +5599,15 @@
 	{
 		if (srcp.is_immediate())
 		{
-			emit_mov_m32_imm(dst, MABS(&m_fptemp), srcp.immediate());                   // mov   [fptemp],srcp
-			emit_fild_m32(dst, MABS(&m_fptemp));                                    // fild  [fptemp]
+			a.mov(MABS(&m_fptemp, 4), srcp.immediate());                                // mov   [fptemp],srcp
+			a.fild(MABS(&m_fptemp, 4));                                                 // fild  [fptemp]
 		}
 		else if (srcp.is_memory())
-			emit_fild_m32(dst, MABS(srcp.memory()));                                        // fild  [srcp]
+			a.fild(MABS(srcp.memory(), 4));                                             // fild  [srcp]
 		else if (srcp.is_int_register())
 		{
-			emit_mov_m32_r32(dst, MABS(m_reglo[srcp.ireg()]), srcp.ireg());         // mov   reglo[srcp],srcp
-			emit_fild_m32(dst, MABS(m_reglo[srcp.ireg()]));                     // fild  reglo[srcp]
+			a.mov(MABS(m_reglo[srcp.ireg()]), Gpd(srcp.ireg()));                        // mov   reglo[srcp],srcp
+			a.fild(MABS(m_reglo[srcp.ireg()], 4));                                      // fild  reglo[srcp]
 		}
 	}
 
@@ -6208,21 +5616,21 @@
 	{
 		if (srcp.is_immediate())
 		{
-			emit_mov_m32_imm(dst, MABS(&m_fptemp), srcp.immediate());                   // mov   [fptemp],srcp
-			emit_mov_m32_imm(dst, MABS((uint8_t *)&m_fptemp + 4), srcp.immediate());      // mov   [fptemp+4],srcp
-			emit_fild_m64(dst, MABS(&m_fptemp));                                    // fild  [fptemp]
+			a.mov(MABS(&m_fptemp, 4), srcp.immediate());                                // mov   [fptemp],srcp
+			a.mov(MABS((uint8_t *)&m_fptemp + 4, 4), srcp.immediate());                 // mov   [fptemp+4],srcp
+			a.fild(MABS(&m_fptemp, 8));                                                 // fild  [fptemp]
 		}
 		else if (srcp.is_memory())
-			emit_fild_m64(dst, MABS(srcp.memory()));                                        // fild  [srcp]
+			a.fild(MABS(srcp.memory(), 8));                                             // fild  [srcp]
 		else if (srcp.is_int_register())
 		{
-			emit_mov_m32_r32(dst, MABS(m_reglo[srcp.ireg()]), srcp.ireg());         // mov   reglo[srcp],srcp
-			emit_fild_m64(dst, MABS(m_reglo[srcp.ireg()]));                     // fild  reglo[srcp]
+			a.mov(MABS(m_reglo[srcp.ireg()]), Gpd(srcp.ireg()));                        // mov   reglo[srcp],srcp
+			a.fild(MABS(m_reglo[srcp.ireg()], 8));                                      // fild  reglo[srcp]
 		}
 	}
 
 	// store the result and be done
-	emit_fstp_p(dst, inst.size(), dstp);                                                // fstp  [dstp]
+	emit_fstp_p(a, inst.size(), dstp);                                                  // fstp  [dstp]
 }
 
 
@@ -6230,7 +5638,7 @@
 //  op_ffrflt - process a FFRFLT opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_ffrflt(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_ffrflt(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6240,15 +5648,15 @@
 	// normalize parameters
 	be_parameter dstp(*this, inst.param(0), PTYPE_MF);
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
-	const parameter &sizep = inst.param(2);
+	parameter const &sizep = inst.param(2);
 	assert(sizep.is_size());
 
 	// general case
 	if (sizep.size() == SIZE_DWORD)
-		emit_fld_m32(dst, MABS(srcp.memory()));                                         // fld   [srcp]
+		a.fld(MABS(srcp.memory(), 4));                                                  // fld   [srcp]
 	else if (sizep.size() == SIZE_QWORD)
-		emit_fld_m64(dst, MABS(srcp.memory()));                                         // fld   [srcp]
-	emit_fstp_p(dst, inst.size(), dstp);                                                // fstp  dstp
+		a.fld(MABS(srcp.memory(), 8));                                                  // fld   [srcp]
+	emit_fstp_p(a, inst.size(), dstp);                                                  // fstp  dstp
 }
 
 
@@ -6256,7 +5664,7 @@
 //  op_frnds - process a FRNDS opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_frnds(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_frnds(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 8);
@@ -6268,10 +5676,10 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// general case
-	emit_fld_p(dst, inst.size(), srcp);                                             // fld   srcp
-	emit_fstp_m32(dst, MABS(&m_fptemp));                                            // fstp  [fptemp]
-	emit_fld_m32(dst, MABS(&m_fptemp));                                         // fld   [fptemp]
-	emit_fstp_p(dst, inst.size(), dstp);                                                // fstp  [dstp]
+	emit_fld_p(a, inst.size(), srcp);                                                   // fld   srcp
+	a.fstp(MABS(&m_fptemp, 4));                                                         // fstp  [fptemp]
+	a.fld(MABS(&m_fptemp, 4));                                                          // fld   [fptemp]
+	emit_fstp_p(a, inst.size(), dstp);                                                  // fstp  [dstp]
 }
 
 
@@ -6279,7 +5687,7 @@
 //  op_fadd - process a FADD opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fadd(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fadd(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6293,10 +5701,10 @@
 	normalize_commutative(src1p, src2p);
 
 	// general case
-	emit_fld_p(dst, inst.size(), src1p);                                                // fld   src1p
-	emit_fld_p(dst, inst.size(), src2p);                                                // fld   src2p
-	emit_faddp(dst);                                                                    // faddp
-	emit_fstp_p(dst, inst.size(), dstp);                                                // fstp  dstp
+	emit_fld_p(a, inst.size(), src1p);                                                  // fld   src1p
+	emit_fld_p(a, inst.size(), src2p);                                                  // fld   src2p
+	a.faddp();                                                                          // faddp
+	emit_fstp_p(a, inst.size(), dstp);                                                  // fstp  dstp
 }
 
 
@@ -6304,7 +5712,7 @@
 //  op_fsub - process a FSUB opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fsub(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fsub(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6317,10 +5725,10 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MF);
 
 	// general case
-	emit_fld_p(dst, inst.size(), src1p);                                                // fld   src1p
-	emit_fld_p(dst, inst.size(), src2p);                                                // fld   src2p
-	emit_fsubp(dst);                                                                    // fsubp
-	emit_fstp_p(dst, inst.size(), dstp);                                                // fstp  dstp
+	emit_fld_p(a, inst.size(), src1p);                                                  // fld   src1p
+	emit_fld_p(a, inst.size(), src2p);                                                  // fld   src2p
+	a.fsubp();                                                                          // fsubp
+	emit_fstp_p(a, inst.size(), dstp);                                                  // fstp  dstp
 }
 
 
@@ -6328,7 +5736,7 @@
 //  op_fcmp - process a FCMP opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fcmp(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fcmp(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6340,11 +5748,11 @@
 	be_parameter src2p(*this, inst.param(1), PTYPE_MF);
 
 	// general case
-	emit_fld_p(dst, inst.size(), src2p);                                                // fld   src2p
-	emit_fld_p(dst, inst.size(), src1p);                                                // fld   src1p
-	emit_fcompp(dst);                                                                   // fcompp
-	emit_fstsw_ax(dst);                                                             // fnstsw ax
-	emit_sahf(dst);                                                                 // sahf
+	emit_fld_p(a, inst.size(), src2p);                                                  // fld   src2p
+	emit_fld_p(a, inst.size(), src1p);                                                  // fld   src1p
+	a.fcompp();                                                                         // fcompp
+	a.fnstsw(ax);                                                                       // fnstsw ax
+	a.sahf();                                                                           // sahf
 }
 
 
@@ -6352,7 +5760,7 @@
 //  op_fmul - process a FMUL opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fmul(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fmul(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6366,10 +5774,10 @@
 	normalize_commutative(src1p, src2p);
 
 	// general case
-	emit_fld_p(dst, inst.size(), src1p);                                                // fld   src1p
-	emit_fld_p(dst, inst.size(), src2p);                                                // fld   src2p
-	emit_fmulp(dst);                                                                    // fmulp
-	emit_fstp_p(dst, inst.size(), dstp);                                                // fstp  dstp
+	emit_fld_p(a, inst.size(), src1p);                                                  // fld   src1p
+	emit_fld_p(a, inst.size(), src2p);                                                  // fld   src2p
+	a.fmulp();                                                                          // fmulp
+	emit_fstp_p(a, inst.size(), dstp);                                                  // fstp  dstp
 }
 
 
@@ -6377,7 +5785,7 @@
 //  op_fdiv - process a FDIV opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fdiv(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fdiv(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6390,10 +5798,10 @@
 	be_parameter src2p(*this, inst.param(2), PTYPE_MF);
 
 	// general case
-	emit_fld_p(dst, inst.size(), src1p);                                                // fld   src1p
-	emit_fld_p(dst, inst.size(), src2p);                                                // fld   src2p
-	emit_fdivp(dst);                                                                    // fdivp
-	emit_fstp_p(dst, inst.size(), dstp);                                                // fstp  dstp
+	emit_fld_p(a, inst.size(), src1p);                                                  // fld   src1p
+	emit_fld_p(a, inst.size(), src2p);                                                  // fld   src2p
+	a.fdivp();                                                                          // fdivp
+	emit_fstp_p(a, inst.size(), dstp);                                                  // fstp  dstp
 }
 
 
@@ -6401,7 +5809,7 @@
 //  op_fneg - process a FNEG opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fneg(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fneg(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6413,9 +5821,9 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// general case
-	emit_fld_p(dst, inst.size(), srcp);                                             // fld   srcp
-	emit_fchs(dst);                                                                 // fchs
-	emit_fstp_p(dst, inst.size(), dstp);                                                // fstp  dstp
+	emit_fld_p(a, inst.size(), srcp);                                                   // fld   srcp
+	a.fchs();                                                                           // fchs
+	emit_fstp_p(a, inst.size(), dstp);                                                  // fstp  dstp
 }
 
 
@@ -6423,7 +5831,7 @@
 //  op_fabs - process a FABS opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fabs(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fabs(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6435,9 +5843,9 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// general case
-	emit_fld_p(dst, inst.size(), srcp);                                             // fld   srcp
-	emit_fabs(dst);                                                                 // fabs
-	emit_fstp_p(dst, inst.size(), dstp);                                                // fstp  dstp
+	emit_fld_p(a, inst.size(), srcp);                                                   // fld   srcp
+	a.fabs();                                                                           // fabs
+	emit_fstp_p(a, inst.size(), dstp);                                                  // fstp  dstp
 }
 
 
@@ -6445,7 +5853,7 @@
 //  op_fsqrt - process a FSQRT opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fsqrt(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fsqrt(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6457,9 +5865,9 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// general case
-	emit_fld_p(dst, inst.size(), srcp);                                             // fld   srcp
-	emit_fsqrt(dst);                                                                    // fsqrt
-	emit_fstp_p(dst, inst.size(), dstp);                                                // fstp  dstp
+	emit_fld_p(a, inst.size(), srcp);                                                   // fld   srcp
+	a.fsqrt();                                                                          // fsqrt
+	emit_fstp_p(a, inst.size(), dstp);                                                  // fstp  dstp
 }
 
 
@@ -6467,7 +5875,7 @@
 //  op_frecip - process a FRECIP opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_frecip(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_frecip(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6479,10 +5887,10 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// general case
-	emit_fld1(dst);                                                                 // fld1
-	emit_fld_p(dst, inst.size(), srcp);                                             // fld   srcp
-	emit_fdivp(dst);                                                                    // fdivp
-	emit_fstp_p(dst, inst.size(), dstp);                                                // fstp  dstp
+	a.fld1();                                                                           // fld1
+	emit_fld_p(a, inst.size(), srcp);                                                   // fld   srcp
+	a.fdivp();                                                                          // fdivp
+	emit_fstp_p(a, inst.size(), dstp);                                                  // fstp  dstp
 }
 
 
@@ -6490,7 +5898,7 @@
 //  op_frsqrt - process a FRSQRT opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_frsqrt(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_frsqrt(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6502,11 +5910,11 @@
 	be_parameter srcp(*this, inst.param(1), PTYPE_MF);
 
 	// general case
-	emit_fld1(dst);                                                                 // fld1
-	emit_fld_p(dst, inst.size(), srcp);                                             // fld   srcp
-	emit_fsqrt(dst);                                                                    // fsqrt
-	emit_fdivp(dst);                                                                    // fdivp
-	emit_fstp_p(dst, inst.size(), dstp);                                                // fstp  dstp
+	a.fld1();                                                                           // fld1
+	emit_fld_p(a, inst.size(), srcp);                                                   // fld   srcp
+	a.fsqrt();                                                                          // fsqrt
+	a.fdivp();                                                                          // fdivp
+	emit_fstp_p(a, inst.size(), dstp);                                                  // fstp  dstp
 }
 
 
@@ -6514,7 +5922,7 @@
 //  op_fcopyi - process a FCOPYI opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_fcopyi(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_fcopyi(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6530,12 +5938,12 @@
 	{
 		if (srcp.is_memory())
 		{
-			emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory()));                            // mov eax,[srcp]
-			emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX);                            // mov [dstp],eax
+			a.mov(eax, MABS(srcp.memory()));                                            // mov eax,[srcp]
+			a.mov(MABS(dstp.memory()), eax);                                            // mov [dstp],eax
 		}
 		else if (srcp.is_int_register())
 		{
-			emit_mov_m32_r32(dst, MABS(dstp.memory()), srcp.ireg());                        // mov [dstp],srcp
+			a.mov(MABS(dstp.memory()), Gpd(srcp.ireg()));                               // mov [dstp],srcp
 		}
 	}
 
@@ -6544,17 +5952,17 @@
 	{
 		if (srcp.is_memory())
 		{
-			emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory()));                            // mov eax,[srcp]
-			emit_mov_r32_m32(dst, REG_EDX, MABS(srcp.memory(4)));                       // mov edx,[srcp+4]
+			a.mov(eax, MABS(srcp.memory(0)));                                           // mov eax,[srcp]
+			a.mov(edx, MABS(srcp.memory(4)));                                           // mov edx,[srcp+4]
 		}
 		else if (srcp.is_int_register())
 		{
-			emit_mov_r32_m32(dst, REG_EDX, MABS(m_reghi[srcp.ireg()]));                 // mov edx,[reghi[srcp]]
-			emit_mov_r32_r32(dst, REG_EAX, srcp.ireg());                                    // mov eax,srcp
+			a.mov(edx, MABS(m_reghi[srcp.ireg()]));                                     // mov edx,[reghi[srcp]]
+			a.mov(eax, Gpd(srcp.ireg()));                                               // mov eax,srcp
 		}
 
-		emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX);                                // mov [dstp],eax
-		emit_mov_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX);                           // mov [dstp+4],edx
+		a.mov(MABS(dstp.memory(0)), eax);                                               // mov [dstp],eax
+		a.mov(MABS(dstp.memory(4)), edx);                                               // mov [dstp+4],edx
 	}
 }
 
@@ -6563,7 +5971,7 @@
 //  op_icopyf - process a ICOPYF opcode
 //-------------------------------------------------
 
-void drcbe_x86::op_icopyf(x86code *&dst, const instruction &inst)
+void drcbe_x86::op_icopyf(Assembler &a, const instruction &inst)
 {
 	// validate instruction
 	assert(inst.size() == 4 || inst.size() == 8);
@@ -6577,33 +5985,33 @@
 	// 32-bit case
 	if (inst.size() == 4)
 	{
-		emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory()));                                // mov eax,[srcp]
+		a.mov(eax, MABS(srcp.memory()));                                                // mov eax,[srcp]
 
 		if (dstp.is_memory())
 		{
-			emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX);                            // mov [dstp],eax
+			a.mov(MABS(dstp.memory()), eax);                                            // mov [dstp],eax
 		}
 		else if (dstp.is_int_register())
 		{
-			emit_mov_r32_r32(dst, dstp.ireg(), REG_EAX);                                    // mov dstp,eax
+			a.mov(Gpd(dstp.ireg()), eax);                                               // mov dstp,eax
 		}
 	}
 
 	// 64-bit case
 	else if (inst.size() == 8)
 	{
-		emit_mov_r32_m32(dst, REG_EAX, MABS(srcp.memory()));                                // mov eax,[srcp]
-		emit_mov_r32_m32(dst, REG_EDX, MABS(srcp.memory(4)));                           // mov edx,[srcp+4]
+		a.mov(eax, MABS(srcp.memory(0)));                                               // mov eax,[srcp]
+		a.mov(edx, MABS(srcp.memory(4)));                                               // mov edx,[srcp+4]
 
 		if (dstp.is_memory())
 		{
-			emit_mov_m32_r32(dst, MABS(dstp.memory()), REG_EAX);                            // mov [dstp],eax
-			emit_mov_m32_r32(dst, MABS(dstp.memory(4)), REG_EDX);                       // mov [dstp+4],edx
+			a.mov(MABS(dstp.memory(0)), eax);                                           // mov [dstp],eax
+			a.mov(MABS(dstp.memory(4)), edx);                                           // mov [dstp+4],edx
 		}
 		else
 		{
-			emit_mov_m32_r32(dst, MABS(m_reghi[dstp.ireg()]), REG_EDX);                 // mov [reghi[dstp]],edx
-			emit_mov_r32_r32(dst, dstp.ireg(), REG_EAX);                                    // mov dstp,eax
+			a.mov(MABS(m_reghi[dstp.ireg()]), edx);                                     // mov [reghi[dstp]],edx
+			a.mov(Gpd(dstp.ireg()), eax);                                               // mov dstp,eax
 		}
 	}
 }
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/drcbex86.h mame-0.224+dfsg.1/src/devices/cpu/drcbex86.h
--- mame-0.222+dfsg.1/src/devices/cpu/drcbex86.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/drcbex86.h	2020-08-26 08:57:19.000000000 +0000
@@ -17,10 +17,10 @@
 #include "drcbeut.h"
 #include "x86log.h"
 
-#define X86EMIT_SIZE 32
-#include "x86emit.h"
-
+#include "asmjit/src/asmjit/asmjit.h"
 
+using namespace asmjit;
+using namespace asmjit::x86;
 
 namespace drc {
 //**************************************************************************
@@ -45,6 +45,9 @@
 	virtual bool logging() const override { return m_log != nullptr; }
 
 private:
+	// HACK: leftover from x86emit
+	static int const REG_MAX = 16;
+
 	// a be_parameter is similar to a uml::parameter but maps to native registers/memory
 	class be_parameter
 	{
@@ -66,43 +69,41 @@
 
 		// construction
 		be_parameter() : m_type(PTYPE_NONE), m_value(0) { }
-		be_parameter(const be_parameter &param) : m_type(param.m_type), m_value(param.m_value) { }
+		be_parameter(be_parameter const &param) : m_type(param.m_type), m_value(param.m_value) { }
 		be_parameter(uint64_t val) : m_type(PTYPE_IMMEDIATE), m_value(val) { }
 		be_parameter(drcbe_x86 &drcbe, const uml::parameter &param, uint32_t allowed);
 
 		// creators for types that don't safely default
-		static inline be_parameter make_ireg(int regnum) { assert(regnum >= 0 && regnum < x86emit::REG_MAX); return be_parameter(PTYPE_INT_REGISTER, regnum); }
-		static inline be_parameter make_freg(int regnum) { assert(regnum >= 0 && regnum < x86emit::REG_MAX); return be_parameter(PTYPE_FLOAT_REGISTER, regnum); }
-		static inline be_parameter make_vreg(int regnum) { assert(regnum >= 0 && regnum < x86emit::REG_MAX); return be_parameter(PTYPE_VECTOR_REGISTER, regnum); }
+		static inline be_parameter make_ireg(int regnum) { assert(regnum >= 0 && regnum < REG_MAX); return be_parameter(PTYPE_INT_REGISTER, regnum); }
+		static inline be_parameter make_freg(int regnum) { assert(regnum >= 0 && regnum < REG_MAX); return be_parameter(PTYPE_FLOAT_REGISTER, regnum); }
 		static inline be_parameter make_memory(void *base) { return be_parameter(PTYPE_MEMORY, reinterpret_cast<be_parameter_value>(base)); }
 		static inline be_parameter make_memory(const void *base) { return be_parameter(PTYPE_MEMORY, reinterpret_cast<be_parameter_value>(const_cast<void *>(base))); }
 
 		// operators
-		bool operator==(const be_parameter &rhs) const { return (m_type == rhs.m_type && m_value == rhs.m_value); }
-		bool operator!=(const be_parameter &rhs) const { return (m_type != rhs.m_type || m_value != rhs.m_value); }
+		bool operator==(be_parameter const &rhs) const { return (m_type == rhs.m_type && m_value == rhs.m_value); }
+		bool operator!=(be_parameter const &rhs) const { return (m_type != rhs.m_type || m_value != rhs.m_value); }
 
 		// getters
 		be_parameter_type type() const { return m_type; }
 		uint64_t immediate() const { assert(m_type == PTYPE_IMMEDIATE); return m_value; }
-		int ireg() const { assert(m_type == PTYPE_INT_REGISTER); assert(m_value < x86emit::REG_MAX); return m_value; }
-		int freg() const { assert(m_type == PTYPE_FLOAT_REGISTER); assert(m_value < x86emit::REG_MAX); return m_value; }
-		int vreg() const { assert(m_type == PTYPE_VECTOR_REGISTER); assert(m_value < x86emit::REG_MAX); return m_value; }
+		uint32_t ireg() const { assert(m_type == PTYPE_INT_REGISTER); assert(m_value < REG_MAX); return m_value; }
+		uint32_t freg() const { assert(m_type == PTYPE_FLOAT_REGISTER); assert(m_value < REG_MAX); return m_value; }
 		void *memory(uint32_t offset = 0) const { assert(m_type == PTYPE_MEMORY); return reinterpret_cast<void *>(m_value + offset); }
 
 		// type queries
 		bool is_immediate() const { return (m_type == PTYPE_IMMEDIATE); }
 		bool is_int_register() const { return (m_type == PTYPE_INT_REGISTER); }
 		bool is_float_register() const { return (m_type == PTYPE_FLOAT_REGISTER); }
-		bool is_vector_register() const { return (m_type == PTYPE_VECTOR_REGISTER); }
 		bool is_memory() const { return (m_type == PTYPE_MEMORY); }
 
 		// other queries
 		bool is_immediate_value(uint64_t value) const { return (m_type == PTYPE_IMMEDIATE && m_value == value); }
 
 		// helpers
-		int select_register(int defreg) const;
-		int select_register(int defreg, const be_parameter &checkparam) const;
-		int select_register(int defreg, const be_parameter &checkparam, const be_parameter &checkparam2) const;
+		Gp select_register(Gp const &defreg) const;
+		Xmm select_register(Xmm defreg) const;
+		template <typename T> T select_register(T defreg, be_parameter const &checkparam) const;
+		template <typename T> T select_register(T defreg, be_parameter const &checkparam, be_parameter const &checkparam2) const;
 
 	private:
 		// private constructor
@@ -114,176 +115,136 @@
 	};
 
 	// helpers
+	Mem MABS(void const *base, u32 const size = 0) const { return Mem(u64(base), size); }
 	void normalize_commutative(be_parameter &inner, be_parameter &outer);
-	void emit_combine_z_flags(x86code *&dst);
-	void emit_combine_z_shl_flags(x86code *&dst);
+	void emit_combine_z_flags(Assembler &a);
+	void emit_combine_z_shl_flags(Assembler &a);
 	void reset_last_upper_lower_reg();
-	void set_last_lower_reg(x86code *&dst, const be_parameter &param, uint8_t reglo);
-	void set_last_upper_reg(x86code *&dst, const be_parameter &param, uint8_t reghi);
-	bool can_skip_lower_load(x86code *&dst, uint32_t *memref, uint8_t reglo);
-	bool can_skip_upper_load(x86code *&dst, uint32_t *memref, uint8_t reghi);
-	void track_resolve_link(x86code *&destptr, const emit_link &linkinfo);
-
-	void fixup_label(void *parameter, drccodeptr labelcodeptr);
-	void fixup_exception(drccodeptr *codeptr, void *param1, void *param2);
+	void set_last_lower_reg(Assembler &a, be_parameter const &param, Gp const &reglo);
+	void set_last_upper_reg(Assembler &a, be_parameter const &param, Gp const &reghi);
+	bool can_skip_lower_load(Assembler &a, uint32_t *memref, Gp const &reglo);
+	bool can_skip_upper_load(Assembler &a, uint32_t *memref, Gp const &reghi);
 
 	static void debug_log_hashjmp(int mode, offs_t pc);
 
 	// code generators
-	void op_handle(x86code *&dst, const uml::instruction &inst);
-	void op_hash(x86code *&dst, const uml::instruction &inst);
-	void op_label(x86code *&dst, const uml::instruction &inst);
-	void op_comment(x86code *&dst, const uml::instruction &inst);
-	void op_mapvar(x86code *&dst, const uml::instruction &inst);
-
-	void op_nop(x86code *&dst, const uml::instruction &inst);
-	void op_debug(x86code *&dst, const uml::instruction &inst);
-	void op_exit(x86code *&dst, const uml::instruction &inst);
-	void op_hashjmp(x86code *&dst, const uml::instruction &inst);
-	void op_jmp(x86code *&dst, const uml::instruction &inst);
-	void op_exh(x86code *&dst, const uml::instruction &inst);
-	void op_callh(x86code *&dst, const uml::instruction &inst);
-	void op_ret(x86code *&dst, const uml::instruction &inst);
-	void op_callc(x86code *&dst, const uml::instruction &inst);
-	void op_recover(x86code *&dst, const uml::instruction &inst);
-
-	void op_setfmod(x86code *&dst, const uml::instruction &inst);
-	void op_getfmod(x86code *&dst, const uml::instruction &inst);
-	void op_getexp(x86code *&dst, const uml::instruction &inst);
-	void op_getflgs(x86code *&dst, const uml::instruction &inst);
-	void op_save(x86code *&dst, const uml::instruction &inst);
-	void op_restore(x86code *&dst, const uml::instruction &inst);
-
-	void op_load(x86code *&dst, const uml::instruction &inst);
-	void op_loads(x86code *&dst, const uml::instruction &inst);
-	void op_store(x86code *&dst, const uml::instruction &inst);
-	void op_read(x86code *&dst, const uml::instruction &inst);
-	void op_readm(x86code *&dst, const uml::instruction &inst);
-	void op_write(x86code *&dst, const uml::instruction &inst);
-	void op_writem(x86code *&dst, const uml::instruction &inst);
-	void op_carry(x86code *&dst, const uml::instruction &inst);
-	void op_set(x86code *&dst, const uml::instruction &inst);
-	void op_mov(x86code *&dst, const uml::instruction &inst);
-	void op_sext(x86code *&dst, const uml::instruction &inst);
-	void op_roland(x86code *&dst, const uml::instruction &inst);
-	void op_rolins(x86code *&dst, const uml::instruction &inst);
-	void op_add(x86code *&dst, const uml::instruction &inst);
-	void op_addc(x86code *&dst, const uml::instruction &inst);
-	void op_sub(x86code *&dst, const uml::instruction &inst);
-	void op_subc(x86code *&dst, const uml::instruction &inst);
-	void op_cmp(x86code *&dst, const uml::instruction &inst);
-	void op_mulu(x86code *&dst, const uml::instruction &inst);
-	void op_muls(x86code *&dst, const uml::instruction &inst);
-	void op_divu(x86code *&dst, const uml::instruction &inst);
-	void op_divs(x86code *&dst, const uml::instruction &inst);
-	void op_and(x86code *&dst, const uml::instruction &inst);
-	void op_test(x86code *&dst, const uml::instruction &inst);
-	void op_or(x86code *&dst, const uml::instruction &inst);
-	void op_xor(x86code *&dst, const uml::instruction &inst);
-	void op_lzcnt(x86code *&dst, const uml::instruction &inst);
-	void op_tzcnt(x86code *&dst, const uml::instruction &inst);
-	void op_bswap(x86code *&dst, const uml::instruction &inst);
-	void op_shl(x86code *&dst, const uml::instruction &inst);
-	void op_shr(x86code *&dst, const uml::instruction &inst);
-	void op_sar(x86code *&dst, const uml::instruction &inst);
-	void op_ror(x86code *&dst, const uml::instruction &inst);
-	void op_rol(x86code *&dst, const uml::instruction &inst);
-	void op_rorc(x86code *&dst, const uml::instruction &inst);
-	void op_rolc(x86code *&dst, const uml::instruction &inst);
-
-	void op_fload(x86code *&dst, const uml::instruction &inst);
-	void op_fstore(x86code *&dst, const uml::instruction &inst);
-	void op_fread(x86code *&dst, const uml::instruction &inst);
-	void op_fwrite(x86code *&dst, const uml::instruction &inst);
-	void op_fmov(x86code *&dst, const uml::instruction &inst);
-	void op_ftoint(x86code *&dst, const uml::instruction &inst);
-	void op_ffrint(x86code *&dst, const uml::instruction &inst);
-	void op_ffrflt(x86code *&dst, const uml::instruction &inst);
-	void op_frnds(x86code *&dst, const uml::instruction &inst);
-	void op_fadd(x86code *&dst, const uml::instruction &inst);
-	void op_fsub(x86code *&dst, const uml::instruction &inst);
-	void op_fcmp(x86code *&dst, const uml::instruction &inst);
-	void op_fmul(x86code *&dst, const uml::instruction &inst);
-	void op_fdiv(x86code *&dst, const uml::instruction &inst);
-	void op_fneg(x86code *&dst, const uml::instruction &inst);
-	void op_fabs(x86code *&dst, const uml::instruction &inst);
-	void op_fsqrt(x86code *&dst, const uml::instruction &inst);
-	void op_frecip(x86code *&dst, const uml::instruction &inst);
-	void op_frsqrt(x86code *&dst, const uml::instruction &inst);
-	void op_fcopyi(x86code *&dst, const uml::instruction &inst);
-	void op_icopyf(x86code *&dst, const uml::instruction &inst);
+	void op_handle(Assembler &a, const uml::instruction &inst);
+	void op_hash(Assembler &a, const uml::instruction &inst);
+	void op_label(Assembler &a, const uml::instruction &inst);
+	void op_comment(Assembler &a, const uml::instruction &inst);
+	void op_mapvar(Assembler &a, const uml::instruction &inst);
+
+	void op_nop(Assembler &a, const uml::instruction &inst);
+	void op_debug(Assembler &a, const uml::instruction &inst);
+	void op_exit(Assembler &a, const uml::instruction &inst);
+	void op_hashjmp(Assembler &a, const uml::instruction &inst);
+	void op_jmp(Assembler &a, const uml::instruction &inst);
+	void op_exh(Assembler &a, const uml::instruction &inst);
+	void op_callh(Assembler &a, const uml::instruction &inst);
+	void op_ret(Assembler &a, const uml::instruction &inst);
+	void op_callc(Assembler &a, const uml::instruction &inst);
+	void op_recover(Assembler &a, const uml::instruction &inst);
+
+	void op_setfmod(Assembler &a, const uml::instruction &inst);
+	void op_getfmod(Assembler &a, const uml::instruction &inst);
+	void op_getexp(Assembler &a, const uml::instruction &inst);
+	void op_getflgs(Assembler &a, const uml::instruction &inst);
+	void op_save(Assembler &a, const uml::instruction &inst);
+	void op_restore(Assembler &a, const uml::instruction &inst);
+
+	void op_load(Assembler &a, const uml::instruction &inst);
+	void op_loads(Assembler &a, const uml::instruction &inst);
+	void op_store(Assembler &a, const uml::instruction &inst);
+	void op_read(Assembler &a, const uml::instruction &inst);
+	void op_readm(Assembler &a, const uml::instruction &inst);
+	void op_write(Assembler &a, const uml::instruction &inst);
+	void op_writem(Assembler &a, const uml::instruction &inst);
+	void op_carry(Assembler &a, const uml::instruction &inst);
+	void op_set(Assembler &a, const uml::instruction &inst);
+	void op_mov(Assembler &a, const uml::instruction &inst);
+	void op_sext(Assembler &a, const uml::instruction &inst);
+	void op_roland(Assembler &a, const uml::instruction &inst);
+	void op_rolins(Assembler &a, const uml::instruction &inst);
+	void op_add(Assembler &a, const uml::instruction &inst);
+	void op_addc(Assembler &a, const uml::instruction &inst);
+	void op_sub(Assembler &a, const uml::instruction &inst);
+	void op_subc(Assembler &a, const uml::instruction &inst);
+	void op_cmp(Assembler &a, const uml::instruction &inst);
+	void op_mulu(Assembler &a, const uml::instruction &inst);
+	void op_muls(Assembler &a, const uml::instruction &inst);
+	void op_divu(Assembler &a, const uml::instruction &inst);
+	void op_divs(Assembler &a, const uml::instruction &inst);
+	void op_and(Assembler &a, const uml::instruction &inst);
+	void op_test(Assembler &a, const uml::instruction &inst);
+	void op_or(Assembler &a, const uml::instruction &inst);
+	void op_xor(Assembler &a, const uml::instruction &inst);
+	void op_lzcnt(Assembler &a, const uml::instruction &inst);
+	void op_tzcnt(Assembler &a, const uml::instruction &inst);
+	void op_bswap(Assembler &a, const uml::instruction &inst);
+	void op_shl(Assembler &a, const uml::instruction &inst);
+	void op_shr(Assembler &a, const uml::instruction &inst);
+	void op_sar(Assembler &a, const uml::instruction &inst);
+	void op_ror(Assembler &a, const uml::instruction &inst);
+	void op_rol(Assembler &a, const uml::instruction &inst);
+	void op_rorc(Assembler &a, const uml::instruction &inst);
+	void op_rolc(Assembler &a, const uml::instruction &inst);
+
+	void op_fload(Assembler &a, const uml::instruction &inst);
+	void op_fstore(Assembler &a, const uml::instruction &inst);
+	void op_fread(Assembler &a, const uml::instruction &inst);
+	void op_fwrite(Assembler &a, const uml::instruction &inst);
+	void op_fmov(Assembler &a, const uml::instruction &inst);
+	void op_ftoint(Assembler &a, const uml::instruction &inst);
+	void op_ffrint(Assembler &a, const uml::instruction &inst);
+	void op_ffrflt(Assembler &a, const uml::instruction &inst);
+	void op_frnds(Assembler &a, const uml::instruction &inst);
+	void op_fadd(Assembler &a, const uml::instruction &inst);
+	void op_fsub(Assembler &a, const uml::instruction &inst);
+	void op_fcmp(Assembler &a, const uml::instruction &inst);
+	void op_fmul(Assembler &a, const uml::instruction &inst);
+	void op_fdiv(Assembler &a, const uml::instruction &inst);
+	void op_fneg(Assembler &a, const uml::instruction &inst);
+	void op_fabs(Assembler &a, const uml::instruction &inst);
+	void op_fsqrt(Assembler &a, const uml::instruction &inst);
+	void op_frecip(Assembler &a, const uml::instruction &inst);
+	void op_frsqrt(Assembler &a, const uml::instruction &inst);
+	void op_fcopyi(Assembler &a, const uml::instruction &inst);
+	void op_icopyf(Assembler &a, const uml::instruction &inst);
 
 	// 32-bit code emission helpers
-	void emit_mov_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param);
-	void emit_mov_r32_p32_keepflags(x86code *&dst, uint8_t reg, const be_parameter &param);
-	void emit_mov_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param);
-	void emit_mov_p32_r32(x86code *&dst, const be_parameter &param, uint8_t reg);
-	void emit_add_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_add_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_adc_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_adc_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_sub_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_sub_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_sbb_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_sbb_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_cmp_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_cmp_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_and_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_and_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_test_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_test_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_or_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_or_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_xor_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_xor_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_shl_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_shl_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_shr_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_shr_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_sar_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_sar_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_rol_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_rol_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_ror_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_ror_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcl_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcl_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcr_r32_p32(x86code *&dst, uint8_t reg, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcr_m32_p32(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
+	void emit_mov_r32_p32(Assembler &a, Gp const &reg, be_parameter const &param);
+	void emit_mov_r32_p32_keepflags(Assembler &a, Gp const &reg, be_parameter const &param);
+	void emit_mov_m32_p32(Assembler &a, Mem memref, be_parameter const &param);
+	void emit_mov_p32_r32(Assembler &a, be_parameter const &param, Gp const &reg);
+
+	void alu_op_param(Assembler &a, Inst::Id const opcode, Operand const &dst, be_parameter const &param, std::function<bool(Assembler &a, Operand const &dst, be_parameter const &src)> optimize = [](Assembler &a, Operand dst, be_parameter const &src) { return false; });
+	void shift_op_param(Assembler &a, Inst::Id const opcode, Operand const &dst, be_parameter const &param, std::function<bool(Assembler &a, Operand const &dst, be_parameter const &src)> optimize);
 
 	// 64-bit code emission helpers
-	void emit_mov_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param);
-	void emit_mov_r64_p64_keepflags(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param);
-	void emit_mov_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param);
-	void emit_mov_p64_r64(x86code *&dst, const be_parameter &param, uint8_t reglo, uint8_t reghi);
-	void emit_add_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_add_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_adc_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_adc_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_sub_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_sub_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_sbb_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_sbb_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_cmp_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_and_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_and_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_test_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_test_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_or_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_or_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_xor_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_xor_m64_p64(x86code *&dst, x86_memref memref, const be_parameter &param, const uml::instruction &inst);
-	void emit_shl_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_shr_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_sar_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_rol_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_ror_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcl_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
-	void emit_rcr_r64_p64(x86code *&dst, uint8_t reglo, uint8_t reghi, const be_parameter &param, const uml::instruction &inst);
+	void emit_mov_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param);
+	void emit_mov_r64_p64_keepflags(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param);
+	void emit_mov_m64_p64(Assembler &a, Mem const &memref, be_parameter const &param);
+	void emit_mov_p64_r64(Assembler &a, be_parameter const &param, Gp const &reglo, Gp const &reghi);
+	void emit_and_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const uml::instruction &inst);
+	void emit_and_m64_p64(Assembler &a, Mem const &memref_lo, Mem const &memref_hi, be_parameter const &param, const uml::instruction &inst);
+	void emit_or_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const uml::instruction &inst);
+	void emit_or_m64_p64(Assembler &a, Mem const &memref_lo, Mem const &memref_hi, be_parameter const &param, const uml::instruction &inst);
+	void emit_xor_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const uml::instruction &inst);
+	void emit_xor_m64_p64(Assembler &a, Mem const &memref_lo, Mem const &memref_hi, be_parameter const &param, const uml::instruction &inst);
+	void emit_shl_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const uml::instruction &inst);
+	void emit_shr_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const uml::instruction &inst);
+	void emit_sar_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const uml::instruction &inst);
+	void emit_rol_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const uml::instruction &inst);
+	void emit_ror_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const uml::instruction &inst);
+	void emit_rcl_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const uml::instruction &inst);
+	void emit_rcr_r64_p64(Assembler &a, Gp const &reglo, Gp const &reghi, be_parameter const &param, const uml::instruction &inst);
+
+	void alu_op_param(Assembler &a, Inst::Id const opcode_lo, Inst::Id const opcode_hi, Gp const &lo, Gp const &hi, be_parameter const &param, bool const saveflags);
+	void alu_op_param(Assembler &a, Inst::Id const opcode_lo, Inst::Id const opcode_hi, Mem const &lo, Mem const &hi, be_parameter const &param, bool const saveflags);
 
 	// floating-point code emission helpers
-	void emit_fld_p(x86code *&dst, int size, const be_parameter &param);
-	void emit_fstp_p(x86code *&dst, int size, const be_parameter &param);
+	void emit_fld_p(Assembler &a, int size, be_parameter const &param);
+	void emit_fstp_p(Assembler &a, int size, be_parameter const &param);
 
 	// callback helpers
 	static int dmulu(uint64_t &dstlo, uint64_t &dsthi, uint64_t src1, uint64_t src2, bool flags);
@@ -291,13 +252,15 @@
 	static int ddivu(uint64_t &dstlo, uint64_t &dsthi, uint64_t src1, uint64_t src2);
 	static int ddivs(uint64_t &dstlo, uint64_t &dsthi, int64_t src1, int64_t src2);
 
+	size_t emit(CodeHolder &ch);
+
 	// internal state
 	drc_hash_table          m_hash;                 // hash table state
 	drc_map_variables       m_map;                  // code map
-	drc_label_list          m_labels;               // label list
 	x86log_context *        m_log;                  // logging
+	FILE *                  m_log_asmjit;
 	bool                    m_logged_common;        // logged common code already?
-	bool                    m_sse3;                 // do we have SSE3 support?
+	bool const              m_sse3;                 // do we have SSE3 support?
 
 	x86_entry_point_func    m_entry;                // entry point
 	x86code *               m_exit;                 // exit point
@@ -305,29 +268,26 @@
 	x86code *               m_save;                 // save handler
 	x86code *               m_restore;              // restore handler
 
-	uint32_t *                m_reglo[x86emit::REG_MAX];// pointer to low part of data for each register
-	uint32_t *                m_reghi[x86emit::REG_MAX];// pointer to high part of data for each register
-	uint8_t                   m_last_lower_reg;       // last register we stored a lower from
+	uint32_t *              m_reglo[REG_MAX];       // pointer to low part of data for each register
+	uint32_t *              m_reghi[REG_MAX];       // pointer to high part of data for each register
+	Gp                      m_last_lower_reg;       // last register we stored a lower from
 	x86code *               m_last_lower_pc;        // PC after instruction where we last stored a lower register
-	uint32_t *                m_last_lower_addr;      // address where we last stored an lower register
-	uint8_t                   m_last_upper_reg;       // last register we stored an upper from
+	uint32_t *              m_last_lower_addr;      // address where we last stored an lower register
+	Gp                      m_last_upper_reg;       // last register we stored an upper from
 	x86code *               m_last_upper_pc;        // PC after instruction where we last stored an upper register
-	uint32_t *                m_last_upper_addr;      // address where we last stored an upper register
+	uint32_t *              m_last_upper_addr;      // address where we last stored an upper register
 	double                  m_fptemp;               // temporary storage for floating point
 
-	uint16_t                  m_fpumode;              // saved FPU mode
-	uint16_t                  m_fmodesave;            // temporary location for saving
+	uint16_t                m_fpumode;              // saved FPU mode
+	uint16_t                m_fmodesave;            // temporary location for saving
 
 	void *                  m_stacksave;            // saved stack pointer
 	void *                  m_hashstacksave;        // saved stack pointer for hashjmp
-	uint64_t                  m_reslo;                // extended low result
-	uint64_t                  m_reshi;                // extended high result
-
-	drc_label_fixup_delegate m_fixup_label;         // precomputed delegate for fixups
-	drc_oob_delegate        m_fixup_exception;      // precomputed delegate for exception fixups
+	uint64_t                m_reslo;                // extended low result
+	uint64_t                m_reshi;                // extended high result
 
 	// globals
-	typedef void (drcbe_x86::*opcode_generate_func)(x86code *&dst, const uml::instruction &inst);
+	typedef void (drcbe_x86::*opcode_generate_func)(Assembler &a, const uml::instruction &inst);
 	struct opcode_table_entry
 	{
 		uml::opcode_t           opcode;             // opcode in question
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/drcuml.cpp mame-0.224+dfsg.1/src/devices/cpu/drcuml.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/drcuml.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/drcuml.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -36,8 +36,10 @@
 
 #include "emuopts.h"
 #include "drcbec.h"
+#ifdef NATIVE_DRC
 #include "drcbex86.h"
 #include "drcbex64.h"
+#endif
 
 #include <fstream>
 
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/es5510/es5510.cpp mame-0.224+dfsg.1/src/devices/cpu/es5510/es5510.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/es5510/es5510.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/es5510/es5510.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -793,7 +793,7 @@
 			// --- RAM cycle N-2 (if a Read cycle): data read from bus is stored in DIL
 			if (ram_pp.cycle != RAM_CYCLE_WRITE) {
 				if (ram_pp.io) { // read from I/O and store into DIL
-					dil = 0; // read_io(ram_pp.address);;
+					dil = 0; // read_io(ram_pp.address);
 				} else { // read from DRAM and store into DIL
 					dil = dram_r(ram_pp.address) << 8;
 					LOG_EXEC(("  . RAM: read %x (%d) from address %x\n", dil, dil, ram_pp.address));
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/gigatron/gigatron.cpp mame-0.224+dfsg.1/src/devices/cpu/gigatron/gigatron.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/gigatron/gigatron.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/gigatron/gigatron.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,12 +2,15 @@
 // copyright-holders:Sterophonick, Phil Thomas
 /*****************************************************************************
  *
- * Skeleton device for Gigatron CPU Core
+ * Gigatron CPU Core
+ *
+ * Based on Gigatron.js by Phil Thomas
+ * https://github.com/PhilThomas/gigatron
+ *
+ * Ported to MAME framework by Sterophonick
  *
  *****************************************************************************/
 
- //https://github.com/PhilThomas/gigatron/blob/master/src/gigatron.js
-
 #include "emu.h"
 #include "gigatron.h"
 #include "gigatrondasm.h"
@@ -24,14 +27,12 @@
 #define C  0x10
 #endif
 
-
 #define gigatron_readop(A) m_program->read_word(A)
 #define gigatron_readmem16(A) m_data->read_dword(A)
 #define gigatron_readmem8(A) m_data->read_byte(A)
 #define gigatron_writemem16(A,B) m_data->write_dword((A),B)
 #define gigatron_writemem8(A,B) m_data->write_byte((A),B)
 
-
 /***********************************
  *  illegal opcodes
  ***********************************/
@@ -41,18 +42,74 @@
 	m_icount -= 1;
 }
 
+
+void gigatron_cpu_device::device_start()
+{
+	m_program = &space(AS_PROGRAM);
+	m_data = &space(AS_DATA);
+
+	state_add(GTRON_PC,        "PC",        m_pc);
+	state_add(GTRON_NPC,       "NPC",       m_npc);
+	state_add(STATE_GENPC,     "GENPC",     m_pc).noshow();
+	state_add(STATE_GENPCBASE, "CURPC",     m_ppc).noshow();
+	state_add(GTRON_AC,        "AC",        m_ac);
+	state_add(GTRON_X,         "X",         m_x);
+	state_add(GTRON_Y,         "Y",         m_y);
+	state_add(GTRON_IREG,      "IREG",      m_inReg);
+	state_add(GTRON_OUTX,      "OUTX",      m_outx);
+	state_add(GTRON_OUT,       "OUT",       m_out);
+
+	set_icountptr(m_icount);
+
+	save_item(NAME(m_ac));
+	save_item(NAME(m_x));
+	save_item(NAME(m_y));
+	save_item(NAME(m_npc));
+	save_item(NAME(m_ppc));
+	save_item(NAME(m_inReg));
+	save_item(NAME(m_pc));
+	save_item(NAME(m_outx));
+	save_item(NAME(m_out));
+
+	m_outx_cb.resolve_safe();
+	m_out_cb.resolve_safe();
+	m_ir_cb.resolve_safe(0);
+
+	reset_cpu();
+}
+
+void gigatron_cpu_device::reset_cpu()
+{
+	m_ac = 0;
+	m_x = 0;
+	m_y = 0;
+	m_pc = 0;
+	m_npc = (m_pc + 1) & m_romMask;
+	m_ppc = 0;
+	m_inReg = 0xff;
+	m_outx = 0;
+	m_out = 0;
+
+	m_out_cb(0, 0);
+	m_outx_cb(0, 0);
+
+	for(uint16_t i = 0; i < m_ramMask; i++)
+		gigatron_writemem8(i, floor(machine().rand() & 0xff));
+}
+
 /* Execute cycles */
 void gigatron_cpu_device::execute_run()
 {
 	uint16_t opcode;
-
+	m_inReg = m_ir_cb();
 	do
 	{
 		m_ppc = m_pc;
 		debugger_instruction_hook(m_pc);
 
 		opcode = gigatron_readop(m_pc);
-		m_pc = m_npc++;
+		m_pc = m_npc;
+		m_npc = (m_pc + 1) & m_romMask;
 
 		uint8_t op = (opcode >> 13) & 0x0007;
 		uint8_t mode = (opcode >> 10) & 0x0007;
@@ -83,77 +140,37 @@
 	} while (m_icount > 0);
 }
 
-
-void gigatron_cpu_device::device_start()
-{
-	m_program = &space(AS_PROGRAM);
-	m_data = &space(AS_DATA);
-
-	init();
-}
-
-void gigatron_cpu_device::init()
-{
-	m_ac = 0;
-	m_x = 0;
-	m_y = 0;
-	m_pc = 0;
-	m_npc = (m_pc + 1);
-	m_ppc = 0;
-	m_inReg = 0xFF;
-
-	state_add(GTRON_PC,        "PC",        m_pc);
-	state_add(GTRON_NPC,       "NPC",       m_npc);
-	state_add(STATE_GENPC,     "GENPC",     m_pc).noshow();
-	state_add(STATE_GENPCBASE, "CURPC",     m_ppc).noshow();
-	state_add(GTRON_AC,        "AC",        m_ac);
-	state_add(GTRON_X,         "X",         m_x);
-	state_add(GTRON_Y,         "Y",         m_y);
-
-	set_icountptr(m_icount);
-
-	save_item(NAME(m_ac));
-	save_item(NAME(m_x));
-	save_item(NAME(m_y));
-	save_item(NAME(m_npc));
-	save_item(NAME(m_ppc));
-	save_item(NAME(m_inReg));
-	save_item(NAME(m_pc));
-
-	m_outx_cb.resolve_safe();
-}
-
 void gigatron_cpu_device::branchOp(uint8_t op, uint8_t mode, uint8_t bus, uint8_t d)
 {
 	const uint8_t ZERO = 0x80;
 	bool c = false;
-	uint8_t ac2 = m_ac ^ ZERO;
+	uint8_t ac = m_ac ^ ZERO;
 	uint16_t base = m_pc & 0xff00;
 	switch (mode)
 	{
-	case 0:
+	case 0: //jmp
 		c = true;
 		base = m_y << 8;
 		break;
-	case 1:
-		c = (ac2 > ZERO);
+	case 1: //bgt
+		c = (ac > ZERO);
 		break;
-	case 2:
-		c = (ac2 < ZERO);
+	case 2: //blt
+		c = (ac < ZERO);
 		break;
-	case 3:
-		c = (ac2 != ZERO);
+	case 3: //bne
+		c = (ac != ZERO);
 		break;
-	case 4:
-		c = (ac2 == ZERO);
+	case 4: //beq
+		c = (ac == ZERO);
 		break;
-	case 5:
-		c = (ac2 >= ZERO);
+	case 5: //bge
+		c = (ac >= ZERO);
 		break;
-	case 6:
-		c = (ac2 <= ZERO);
+	case 6: //ble
+		c = (ac <= ZERO);
 		break;
-	case 7:
+	case 7: //bra
 		c = true;
 		break;
 	}
@@ -217,9 +234,16 @@
 		break;
 	case 6:
 	case 7:
-		uint16_t rising = ~(m_out & b);
+		uint16_t rising = ~m_out & b;
+		m_out = b;
+		m_out_cb(0, m_out);
+
+		// rising edge of out[6] registers outx from ac
 		if (rising & 0x40)
+		{
 			m_outx = m_ac;
+			m_outx_cb(0, m_outx);
+		}
 		break;
 	}
 }
@@ -271,6 +295,9 @@
 	case 0:
 		b = d;
 		break;
+	case 1:
+		b = 0;
+		break;
 	case 2:
 		b = m_ac;
 		break;
@@ -287,7 +314,7 @@
 
 	switch (mode)
 	{
-	case 4:
+	case 4: // XXX not clear whether x++ mode takes priority
 		m_x = b;
 		break;
 	case 5:
@@ -298,6 +325,7 @@
 
 void gigatron_cpu_device::device_reset()
 {
+	reset_cpu();
 }
 
 void gigatron_cpu_device::execute_set_input(int irqline, int state)
@@ -313,10 +341,13 @@
 
 gigatron_cpu_device::gigatron_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: cpu_device(mconfig, GTRON, tag, owner, clock)
-	, m_ramMask(0x7fff)
-	, m_program_config("program", ENDIANNESS_BIG, 16, 14, -1)
-	, m_data_config("data", ENDIANNESS_BIG, 8, 15, 0)
+	, m_ramMask(0xffff)
+	, m_romMask(0xffff)
+	, m_program_config("program", ENDIANNESS_BIG, 16, 16, -1)
+	, m_data_config("data", ENDIANNESS_BIG, 8, 16, 0)
 	, m_outx_cb(*this)
+	, m_out_cb(*this)
+	, m_ir_cb(*this)
 {
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/gigatron/gigatron.h mame-0.224+dfsg.1/src/devices/cpu/gigatron/gigatron.h
--- mame-0.222+dfsg.1/src/devices/cpu/gigatron/gigatron.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/gigatron/gigatron.h	2020-08-26 08:57:19.000000000 +0000
@@ -2,12 +2,15 @@
 // copyright-holders:Sterophonick, Phil Thomas
 /*****************************************************************************
  *
- * Skeleton device for Gigatron CPU Core
+ * Gigatron CPU Core
+ *
+ * Based on Gigatron.js by Phil Thomas
+ * https://github.com/PhilThomas/gigatron
+ *
+ * Ported to MAME framework by Sterophonick
  *
  *****************************************************************************/
 
- //https://github.com/PhilThomas/gigatron/blob/master/src/gigatron.js
-
 #ifndef MAME_CPU_GTRON_H
 #define MAME_CPU_GTRON_H
 
@@ -16,7 +19,8 @@
 enum
 {
 	GTRON_PC, GTRON_NPC,
-	GTRON_AC, GTRON_X, GTRON_Y
+	GTRON_AC, GTRON_X, GTRON_Y, GTRON_IREG,
+	GTRON_OUTX, GTRON_OUT
 };
 
 
@@ -26,6 +30,8 @@
 	// construction/destruction
 	gigatron_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 	auto outx_cb() { return m_outx_cb.bind(); }
+	auto out_cb() { return m_out_cb.bind(); }
+	auto ir_cb() { return m_ir_cb.bind(); }
 
 protected:
 	// device-level overrides
@@ -48,6 +54,8 @@
 	// device_memory_interface overrides
 	virtual space_config_vector memory_space_config() const override;
 
+	void reset_cpu();
+
 	void branchOp(uint8_t op, uint8_t mode, uint8_t bus, uint8_t d);
 	void aluOp(uint8_t op, uint8_t mode, uint8_t bus, uint8_t d);
 	void storeOp(uint8_t op, uint8_t mode, uint8_t bus, uint8_t d);
@@ -61,16 +69,15 @@
 	uint16_t m_ppc;
 	uint8_t m_inReg;
 	uint16_t m_ramMask;
-	uint16_t m_out;
-	uint16_t m_outx;
-
-	virtual void init();
+	uint16_t m_romMask;
+	uint8_t m_out;
+	uint8_t m_outx;
 
 private:
 	address_space_config m_program_config;
 	address_space_config m_data_config;
 
-	uint16_t  m_pc;   /* registers */
+	uint16_t  m_pc;   /* program counter */
 	uint8_t   m_flags;  /* flags */
 	address_space *m_program;
 	address_space *m_data;
@@ -79,6 +86,8 @@
 	void gigatron_illegal();
 
 	devcb_write8 m_outx_cb;
+	devcb_write8 m_out_cb;
+	devcb_read8 m_ir_cb;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/h16/h16dasm.cpp mame-0.224+dfsg.1/src/devices/cpu/h16/h16dasm.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/h16/h16dasm.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/h16/h16dasm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,1052 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***************************************************************************
+
+    Hitachi H16 (HD641016) disassembler
+
+***************************************************************************/
+
+#include "emu.h"
+#include "h16dasm.h"
+
+h16_disassembler::h16_disassembler()
+	: util::disasm_interface()
+{
+}
+
+u32 h16_disassembler::opcode_alignment() const
+{
+	return 1;
+}
+
+const char *const h16_disassembler::s_conditions[16] = {
+	"T", "F",
+	"HI", "LS",
+	"CC", "CS",
+	"NE", "EQ",
+	"VC", "VS",
+	"PL", "MI",
+	"GE", "LT",
+	"GT", "LE"
+};
+
+const char *const h16_disassembler::s_term_conditions[16] = {
+	"T", "F",
+	"HI", "LS",
+	"HS", "LO",
+	"NE", "EQ",
+	"VC", "VS",
+	"PL", "MI",
+	"GE", "LT",
+	"GT", "LE"
+};
+
+const char *const h16_disassembler::s_basic_ops[4] = {
+	"ADD", "SUB", "CMP", "MOV"
+};
+
+const char *const h16_disassembler::s_logical_ops[3] = {
+	"AND", "XOR", "OR"
+};
+
+const char *const h16_disassembler::s_sft_ops[8] = {
+	"SHAR", "SHLR", "ROTR", "ROTXR",
+	"SHAL", "SHLL", "ROTL", "ROTXL"
+};
+
+const char *const h16_disassembler::s_bit_ops[4] = {
+	"BSET", "BNOT", "BCLR", "BTST"
+};
+
+const char *const h16_disassembler::s_bf_ops[3] = {
+	"BFEXT", "BFINS", "BFSCH"
+};
+
+const char *const h16_disassembler::s_cr_ops[5] = {
+	"ANDC", "ORC", "XORC", "LDC", "STC"
+};
+
+void h16_disassembler::format_register(std::ostream &stream, char bank, u8 n) const
+{
+	if (bank != 0)
+		util::stream_format(stream, "%cR%d", bank, n);
+	else if (n == 15)
+		stream << "SP";
+	else
+		util::stream_format(stream, "R%d", n);
+}
+
+void h16_disassembler::format_register_to_register(std::ostream &stream, u8 rr) const
+{
+	format_register(stream, 0, rr >> 4);
+	stream << ", ";
+	format_register(stream, 0, rr & 0x0f);
+}
+
+void h16_disassembler::format_register_list(std::ostream &stream, u16 rl) const
+{
+	stream << "[";
+	bool first = false;
+	for (int n = 0; n < 16; n++)
+	{
+		if (BIT(rl, n))
+		{
+			if (first)
+				stream << ",";
+			else
+				first = true;
+			int m = n + 1;
+			while (m < 16 && BIT(rl, m))
+				m++;
+			m--;
+			if (m > n)
+			{
+				util::stream_format(stream, "R%d-R%d", n, m);
+				n = m;
+			}
+			else
+				util::stream_format(stream, "R%d", n);
+		}
+	}
+	stream << "]";
+}
+
+u8 h16_disassembler::get_cr_size(u8 cr) const
+{
+	switch (cr)
+	{
+	case 0x01: case 0x80: case 0x81:
+		return 0;
+
+	case 0x20: case 0xa0:
+		return 1;
+
+	default:
+		return 2;
+	}
+}
+
+void h16_disassembler::format_cr(std::ostream &stream, u8 cr) const
+{
+	switch (cr)
+	{
+	case 0x01:
+		stream << "VBNR";
+		break;
+
+	case 0x20:
+		stream << "CCR";
+		break;
+
+	case 0x40:
+		stream << "CBNR";
+		break;
+
+	case 0x41:
+		stream << "BSP";
+		break;
+
+	case 0x80:
+		stream << "BMR";
+		break;
+
+	case 0x81:
+		stream << "GBNR";
+		break;
+
+	case 0xa0:
+		stream << "SR";
+		break;
+
+	case 0xc0:
+		stream << "EBR";
+		break;
+
+	case 0xc1:
+		stream << "RBR";
+		break;
+
+	case 0xc2:
+		stream << "USP";
+		break;
+
+	case 0xc3:
+		stream << "IBR";
+		break;
+
+	default:
+		stream << "<unknown CR>";
+		break;
+	}
+}
+
+void h16_disassembler::format_s8(std::ostream &stream, u8 data) const
+{
+	if (s8(data) < 0)
+	{
+		stream << "-";
+		data = 0x100 - data;
+	}
+	if (data >= 0x0a)
+		stream << "H'";
+	util::stream_format(stream, "%X", data);
+}
+
+void h16_disassembler::format_s16(std::ostream &stream, u16 data) const
+{
+	if (s16(data) < 0)
+	{
+		stream << "-";
+		data = 0x10000 - data;
+	}
+	if (data >= 0x000a)
+		stream << "H'";
+	util::stream_format(stream, "%X", data);
+}
+
+void h16_disassembler::format_s32(std::ostream &stream, u32 data) const
+{
+	if (s32(data) < 0)
+	{
+		stream << "-";
+		data = u32(-data);
+	}
+	if (data >= 0x0000000a)
+		stream << "H'";
+	util::stream_format(stream, "%X", data);
+}
+
+void h16_disassembler::dasm_displacement(std::ostream &stream, offs_t &pc, const h16_disassembler::data_buffer &opcodes, u8 sd) const
+{
+	switch (sd)
+	{
+	case 0:
+		// No displacement
+		break;
+
+	case 1:
+	{
+		// 8-bit displacement
+		format_s8(stream, opcodes.r8(pc++));
+		stream << ", ";
+		break;
+	}
+
+	case 2:
+	{
+		// 16-bit displacement
+		u16 disp = opcodes.r16(pc);
+		pc += 2;
+		format_s16(stream, disp);
+		if (disp < 0x0080 || disp >= 0xff80)
+			stream << ":16";
+		stream << ", ";
+		break;
+	}
+
+	case 3:
+	{
+		// 32-bit displacement
+		u32 disp = opcodes.r32(pc);
+		pc += 4;
+		format_s32(stream, disp);
+		if (disp < 0x00008000 || disp >= 0xffff8000U)
+			stream << ":32";
+		stream << ", ";
+		break;
+	}
+	}
+}
+
+void h16_disassembler::dasm_ea(std::ostream &stream, offs_t &pc, const h16_disassembler::data_buffer &opcodes, u8 ea, char bank, h16_disassembler::ea_mode mode, u8 sz) const
+{
+	if (ea < 0x10)
+	{
+		// Register indirect
+		stream << "@";
+		format_register(stream, bank, ea);
+	}
+	else if (ea < 0x40)
+	{
+		// Register indirect (with displacement)
+		stream << "@(";
+		dasm_displacement(stream, pc, opcodes, ea >> 4);
+		format_register(stream, bank, ea & 0x0f);
+		stream << ")";
+	}
+	else if (ea < 0x50)
+	{
+		// Register direct
+		if (mode != ea_mode::ADDRESS && mode != ea_mode::MEMORY && mode != ea_mode::PLAIN_MEMORY)
+			format_register(stream, bank, ea & 0x0f);
+		else
+			stream << "<RIE>";
+	}
+	else if (ea < 0x70 && mode != ea_mode::PLAIN_MEMORY && mode != ea_mode::BITFIELD)
+	{
+		// Register indirect auto-increment/auto-decrement
+		stream << "@";
+		if (BIT(ea, 5))
+			stream << "-";
+		format_register(stream, bank, ea & 0x0f);
+		if (BIT(ea, 4))
+			stream << "+";
+	}
+	else switch (ea)
+	{
+	case 0x70:
+		// Current bank
+		ea = opcodes.r8(pc++);
+		dasm_ea(stream, pc, opcodes, ea & 0x7f, 'C', mode, sz);
+		break;
+
+	case 0x71:
+		// Immediate (Imm8)
+		switch (mode)
+		{
+		case ea_mode::SIGNED:
+			stream << "#";
+			format_s8(stream, opcodes.r8(pc++));
+			if (sz != 0)
+				stream << ".B";
+			break;
+
+		case ea_mode::UNSIGNED:
+			stream << "#";
+			if (sz == 0)
+				util::stream_format(stream, "H'%02X", opcodes.r8(pc++));
+			else
+			{
+				u8 imm = opcodes.r8(pc++);
+				if (imm >= 0x0a)
+					stream << "H'";
+				util::stream_format(stream, "%X.B", imm);
+			}
+			break;
+
+		default:
+			stream << "<RIE>";
+			break;
+		}
+		break;
+
+	case 0x72:
+		// Immediate (Imm16)
+		switch (mode)
+		{
+		case ea_mode::SIGNED:
+			stream << "#";
+			format_s16(stream, opcodes.r16(pc));
+			pc += 2;
+			if (sz != 1)
+				stream << ".W";
+			break;
+
+		case ea_mode::UNSIGNED:
+			stream << "#";
+			if (sz == 1)
+				util::stream_format(stream, "H'%04X", opcodes.r16(pc));
+			else
+			{
+				u16 imm = opcodes.r16(pc);
+				if (imm >= 0x000a)
+					stream << "H'";
+				util::stream_format(stream, "%X.W", imm);
+			}
+			pc += 2;
+			break;
+
+		default:
+			stream << "<RIE>";
+			break;
+		}
+		break;
+
+	case 0x73:
+		// Immediate (Imm32)
+		switch (mode)
+		{
+		case ea_mode::SIGNED:
+			stream << "#";
+			format_s32(stream, opcodes.r32(pc));
+			pc += 4;
+			if (sz != 2)
+				stream << ".L";
+			break;
+
+		case ea_mode::UNSIGNED:
+			stream << "#";
+			if (sz == 2)
+				util::stream_format(stream, "H'%08X", opcodes.r32(pc));
+			else
+			{
+				u32 imm = opcodes.r32(pc);
+				if (imm >= 0x0000000a)
+					stream << "H'";
+				util::stream_format(stream, "%X.L", imm);
+			}
+			pc += 4;
+			break;
+
+		default:
+			stream << "<RIE>";
+			break;
+		}
+		break;
+
+	case 0x74:
+		// Previous bank
+		ea = opcodes.r8(pc++);
+		dasm_ea(stream, pc, opcodes, ea & 0x7f, 'P', mode, sz);
+		break;
+
+	case 0x75:
+	{
+		// Absolute address (Abs8)
+		u8 aa = opcodes.r8(pc++);
+		if (aa < 0x80)
+			util::stream_format(stream, "@H'%02X", aa);
+		else
+			util::stream_format(stream, "@H'%X", aa + (mode != ea_mode::ADDRESS ? 0xffff00U : 0xffffff00U));
+		break;
+	}
+
+	case 0x76:
+	{
+		// Absolute address (Abs16)
+		u16 aa = opcodes.r16(pc);
+		pc += 2;
+		if (aa < 0x80)
+			util::stream_format(stream, "@H'%X.W", aa);
+		else if (aa < 0x8000)
+			util::stream_format(stream, "@H'%04X", aa);
+		else
+		{
+			util::stream_format(stream, "@H'%X", aa + (mode != ea_mode::ADDRESS ? 0xff0000U : 0xffff0000U));
+			if (aa >= 0xff80)
+				stream << ".W";
+		}
+		break;
+	}
+
+	case 0x77:
+	{
+		// Absolute address (Abs32)
+		u32 aa = opcodes.r32(pc);
+		pc += 4;
+		if (aa < 0x8000)
+			util::stream_format(stream, "@H'%X.L", aa);
+		else if (mode != ea_mode::ADDRESS)
+		{
+			aa &= 0xffffff;
+			util::stream_format(stream, "@H'%06X", aa);
+			if (aa >= 0xff8000)
+				stream << ".L";
+		}
+		else
+		{
+			util::stream_format(stream, "@H'%08X", aa);
+			if (aa >= 0xffff8000U)
+				stream << ".L";
+		}
+		break;
+	}
+
+	case 0x78:
+	{
+		// Register indirect with scale
+		u8 xb = opcodes.r8(pc++);
+		stream << "@";
+		format_register(stream, bank, xb & 0x0f);
+		util::stream_format(stream, "*%d", 1 << BIT(xb, 4, 2));
+		break;
+	}
+
+	case 0x79: case 0x7a: case 0x7b:
+	{
+		// Register indirect with scale (and displacement)
+		u8 xb = opcodes.r8(pc++);
+		stream << "@(";
+		dasm_displacement(stream, pc, opcodes, ea & 0x03);
+		format_register(stream, bank, xb & 0x0f);
+		util::stream_format(stream, "*%d)", 1 << BIT(xb, 4, 2));
+		break;
+	}
+
+	case 0x7c:
+	{
+		u8 xb1 = opcodes.r8(pc++);
+		if (xb1 < 0x80)
+		{
+			// Register indirect with index
+			u8 xb2 = opcodes.r8(pc++);
+			stream << "@(";
+			dasm_displacement(stream, pc, opcodes, BIT(xb1, 4, 2));
+			format_register(stream, 0, xb2 & 0x0f);
+			util::stream_format(stream, ".%c", BIT(xb1, 6) ? 'L' : 'W');
+			if ((xb2 & 0x30) != 0)
+				util::stream_format(stream, "*%d", 1 << BIT(xb2, 4, 2));
+			stream << ", ";
+			format_register(stream, bank, xb1 & 0x0f);
+			stream << ")";
+		}
+		else
+			stream << "<RIE>";
+		break;
+	}
+
+	case 0x7d:
+	{
+		u8 xb1 = opcodes.r8(pc++);
+		if (xb1 < 0x80)
+		{
+			// Program counter relative with index
+			u8 xb2 = opcodes.r8(pc++);
+			stream << "@(";
+			dasm_displacement(stream, pc, opcodes, BIT(xb1, 4, 2));
+			format_register(stream, bank, xb2 & 0x0f);
+			util::stream_format(stream, ".%c", BIT(xb1, 6) ? 'L' : 'W');
+			if ((xb2 & 0x30) != 0)
+				util::stream_format(stream, "*%d", 1 << BIT(xb2, 4, 2));
+			stream << ", PC)";
+		}
+		else if (xb1 < 0x90)
+			stream << "@PC";
+		else if (xb1 < 0xc0)
+		{
+			// Program counter relative
+			stream << "@(";
+			dasm_displacement(stream, pc, opcodes, BIT(xb1, 4, 2));
+			stream << "PC)";
+		}
+		else
+			stream << "<RIE>";
+		break;
+	}
+
+	case 0x7e:
+	{
+		// Register double indirect (only 8-bit and 32-bit displacements allowed)
+		u8 xb = opcodes.r8(pc++);
+		if ((xb & 0x50) == 0x50)
+		{
+			stream << "@";
+			u32 ds1 = BIT(xb, 5) ? opcodes.r32(std::exchange(pc, pc + 4)) : s32(s8(opcodes.r8(pc++)));
+			u32 ds2 = BIT(xb, 7) ? opcodes.r32(std::exchange(pc, pc + 4)) : s32(s8(opcodes.r8(pc++)));
+			if (ds2 != 0)
+			{
+				stream << "(";
+				format_s32(stream, ds2);
+				if (BIT(xb, 7) && (ds2 < 0x00000080 || ds2 >= 0xffffff80U))
+					stream << ":32";
+				stream << ", ";
+			}
+			stream << "@";
+			if (ds1 != 0)
+			{
+				stream << "(";
+				format_s32(stream, ds1);
+				if (BIT(xb, 5) && (ds1 < 0x00000080 || ds1 >= 0xffffff80U))
+					stream << ":32";
+				stream << ", ";
+			}
+			format_register(stream, bank, xb & 0x0f);
+			if (ds1 != 0)
+				stream << ")";
+			if (ds2 != 0)
+				stream << ")";
+		}
+		else
+			stream << "<RIE>";
+		break;
+	}
+
+	default:
+		// Not used
+		stream << "<RIE>";
+		break;
+	}
+}
+
+void h16_disassembler::dasm_eas_ead(std::ostream &stream, offs_t &pc, const h16_disassembler::data_buffer &opcodes, h16_disassembler::ea_mode smode, h16_disassembler::ea_mode dmode, u8 sz) const
+{
+	dasm_eas_ead(stream, pc, opcodes, smode, dmode, sz, sz);
+}
+
+void h16_disassembler::dasm_eas_ead(std::ostream &stream, offs_t &pc, const h16_disassembler::data_buffer &opcodes, h16_disassembler::ea_mode smode, h16_disassembler::ea_mode dmode, u8 szs, u8 szd) const
+{
+	const offs_t pcs = pc;
+	u8 eas = opcodes.r8(pc++);
+	dasm_ea(stream, pc, opcodes, eas & 0x7f, 0, smode, szs);
+	stream << ", ";
+	u8 ead = BIT(eas, 7) ? 0x40 : opcodes.r8(pc++);
+	dasm_ea(stream, pc, opcodes, ead & 0x7f, 0, dmode, szd);
+
+	// Reinterpret PC-relative source offsets by working backwards
+	if ((eas & 0x7f) == 0x7d)
+	{
+		u8 xb1 = opcodes.r8(pcs + 1);
+		const offs_t disppc = pcs + (BIT(xb1, 7) ? 2 : 3);
+		switch (xb1 & 0xf0)
+		{
+		case 0x00: case 0x40: case 0x80:
+			util::stream_format(stream, " ; H'%06X", disppc & 0xffffff);
+			break;
+
+		case 0x10: case 0x50: case 0x90:
+			util::stream_format(stream, " ; H'%06X", (disppc + 1 + s8(opcodes.r8(disppc))) & 0xffffff);
+			break;
+
+		case 0x20: case 0x60: case 0xa0:
+			util::stream_format(stream, " ; H'%06X", (disppc + 2 + s16(opcodes.r16(disppc))) & 0xffffff);
+			break;
+
+		case 0x30: case 0x70: case 0xb0:
+			util::stream_format(stream, " ; H'%06X", (disppc + 4 + opcodes.r32(disppc)) & 0xffffff);
+			break;
+		}
+	}
+}
+
+void h16_disassembler::dasm_branch_disp(std::ostream &stream, offs_t &pc, const h16_disassembler::data_buffer &opcodes, u8 sz) const
+{
+	switch (sz)
+	{
+	case 0:
+	{
+		u8 disp = opcodes.r8(pc++);
+		util::stream_format(stream, "H'%06X", (pc + s8(disp)) & 0xffffff);
+		break;
+	}
+
+	case 1:
+	{
+		u16 disp = opcodes.r16(pc);
+		pc += 2;
+		util::stream_format(stream, "H'%06X", (pc + s16(disp)) & 0xffffff);
+		break;
+	}
+
+	case 2:
+	{
+		u32 disp = opcodes.r32(pc);
+		pc += 4;
+		util::stream_format(stream, "H'%06X", (pc + disp) & 0xffffff);
+		break;
+	}
+	}
+}
+
+offs_t h16_disassembler::disassemble(std::ostream &stream, offs_t pc, const h16_disassembler::data_buffer &opcodes, const h16_disassembler::data_buffer &params)
+{
+	const offs_t pc0 = pc;
+	offs_t flags = SUPPORTED;
+	u8 op = opcodes.r8(pc++);
+	switch (op)
+	{
+	case 0x00: case 0x01: case 0x02:
+	case 0x04: case 0x05: case 0x06:
+	case 0x08: case 0x09: case 0x0a:
+	case 0x0c: case 0x0d: case 0x0e:
+		util::stream_format(stream, "%-9s", string_format("%s.%c", s_basic_ops[BIT(op, 2, 2)], "BWL"[op & 0x03]));
+		dasm_eas_ead(stream, pc, opcodes,
+						(op & 0x0c) == 0x0c ? ea_mode::UNSIGNED : ea_mode::SIGNED,
+						(op & 0x0c) == 0x08 ? ea_mode::SIGNED : ea_mode::DESTINATION,
+						op & 0x03);
+		break;
+
+	case 0x10: case 0x11: case 0x12:
+	case 0x18: case 0x19: case 0x1a:
+	case 0x1c: case 0x1d: case 0x1e:
+		util::stream_format(stream, "%-9s#", string_format("%s.%c", s_basic_ops[BIT(op, 2, 2)], "BWL"[op & 0x03]));
+		if (op == 0x1c)
+			util::stream_format(stream, "H'%02X", opcodes.r8(pc++));
+		else
+			format_s8(stream, opcodes.r8(pc++));
+		stream << ", ";
+		dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, (op & 0x0c) == 0x08 ? ea_mode::SIGNED : ea_mode::DESTINATION, op & 0x03);
+		break;
+
+	case 0x14: case 0x15: case 0x16:
+		util::stream_format(stream, "%-9s", string_format("CLR.%c", "BWL"[op & 0x03]));
+		dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::DESTINATION, op & 0x03);
+		break;
+
+	case 0x20: case 0x21: case 0x22:
+	case 0x24: case 0x25: case 0x26:
+	case 0x28: case 0x29: case 0x2a:
+	case 0x2c: case 0x2d: case 0x2e:
+		util::stream_format(stream, "%-9s", string_format("%s.%c", s_basic_ops[BIT(op, 2, 2)], "BWL"[op & 0x03]));
+		format_register_to_register(stream, opcodes.r8(pc++));
+		break;
+
+	case 0x30: case 0x31: case 0x32:
+	case 0x34: case 0x35: case 0x36:
+	case 0x38: case 0x39: case 0x3a:
+	case 0x3c: case 0x3d: case 0x3e:
+	{
+		u8 xb = opcodes.r8(pc++);
+		util::stream_format(stream, "%-9s", string_format("%s.%c", s_basic_ops[BIT(op, 2, 2)], "BWL"[op & 0x03]));
+		util::stream_format(stream, "#%d, ", !BIT(op, 3) || !BIT(xb, 3) ? xb & 0x0f : int(xb & 0x0f) - 16);
+		format_register(stream, 0, xb >> 4);
+		break;
+	}
+
+	case 0x40: case 0x41: case 0x42:
+	case 0x44: case 0x45: case 0x46:
+	case 0x48: case 0x49: case 0x4a:
+	case 0x4c: case 0x4d: case 0x4e:
+		util::stream_format(stream, "%-9s", string_format("%sS.%c", s_basic_ops[BIT(op, 2, 2)], "BWL"[op & 0x03]));
+		dasm_eas_ead(stream, pc, opcodes, ea_mode::SIGNED, ea_mode::DESTINATION, op & 0x03, 2);
+		break;
+
+	case 0x50: case 0x51: case 0x52:
+	case 0x54: case 0x55: case 0x56:
+		util::stream_format(stream, "%-9s", string_format("%sX.%c", s_basic_ops[BIT(op, 2, 2)], "BWL"[op & 0x03]));
+		dasm_eas_ead(stream, pc, opcodes, ea_mode::UNSIGNED, ea_mode::DESTINATION, op & 0x03);
+		break;
+
+	case 0x58: case 0x59: case 0x5a:
+		util::stream_format(stream, "%-9s", string_format("TST.%c", "BWL"[op & 0x03]));
+		dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::SIGNED, op & 0x03);
+		break;
+
+	case 0x5c: case 0x5d: case 0x5e:
+		util::stream_format(stream, "%-9s", string_format("MOVF.%c", "BWL"[op & 0x03]));
+		dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::DESTINATION, op & 0x03);
+		break;
+
+	case 0x60: case 0x61: case 0x62:
+	case 0x64: case 0x65: case 0x66:
+	case 0x68: case 0x69: case 0x6a:
+	case 0x6c: case 0x6d: case 0x6e:
+	{
+		u8 xb = opcodes.r8(pc++);
+		if (BIT(op, 3))
+			util::stream_format(stream, "%-9s", string_format("%s.%c", s_bit_ops[BIT(xb, 5, 2)], "BWL"[op & 0x03]));
+		else
+			util::stream_format(stream, "%-9s", string_format("%s.%c", s_sft_ops[BIT(xb, 5, 3)], "BWL"[op & 0x03]));
+		if (BIT(op, 2))
+			util::stream_format(stream, "#%d", xb & 0x1f);
+		else
+			format_register(stream, 0, xb & 0x0f);
+		stream << ", ";
+		dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::DESTINATION, op & 0x03);
+		break;
+	}
+
+	case 0x70: case 0x71: case 0x72:
+	{
+		util::stream_format(stream, "%-9s", string_format("STM.%c", "BWL"[op & 0x03]));
+		std::ostringstream eadbuf;
+		dasm_ea(eadbuf, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::MEMORY, op & 0x03);
+		format_register_list(stream, opcodes.r16(pc));
+		pc += 2;
+		util::stream_format(stream, ", %s", eadbuf.str());
+		break;
+	}
+
+	case 0x74: case 0x75: case 0x76:
+		util::stream_format(stream, "%-9s", string_format("LDM.%c", "BWL"[op & 0x03]));
+		dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::MEMORY, op & 0x03);
+		stream << ", ";
+		format_register_list(stream, opcodes.r16(pc));
+		pc += 2;
+		break;
+
+	case 0x78: case 0x79: case 0x7a:
+		util::stream_format(stream, "%-9s", string_format("MOVTPE.%c", "BWL"[op & 0x03]));
+		dasm_eas_ead(stream, pc, opcodes, ea_mode::UNSIGNED, ea_mode::PLAIN_MEMORY, op & 0x03);
+		break;
+
+	case 0x7c: case 0x7d: case 0x7e:
+		util::stream_format(stream, "%-9s", string_format("MOVFPE.%c", "BWL"[op & 0x03]));
+		dasm_eas_ead(stream, pc, opcodes, ea_mode::PLAIN_MEMORY, ea_mode::DESTINATION, op & 0x03);
+		break;
+
+	case 0x80: case 0x81: case 0x82:
+	case 0x84: case 0x85: case 0x86:
+	case 0x88: case 0x89: case 0x8a:
+		util::stream_format(stream, "%-9s", string_format("%s.%c", s_logical_ops[BIT(op, 2, 2)], "BWL"[op & 0x03]));
+		dasm_eas_ead(stream, pc, opcodes, ea_mode::UNSIGNED, ea_mode::DESTINATION, op & 0x03);
+		break;
+
+	case 0x8c: case 0x8d: case 0x8e:
+	case 0x9c: case 0x9d: case 0x9e:
+		util::stream_format(stream, "%-9s", string_format("NEG%s.%c", BIT(op, 4) ? "X" : "", "BWL"[op & 0x03]));
+		dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::DESTINATION, op & 0x03);
+		break;
+
+	case 0x90: case 0x91: case 0x92:
+		util::stream_format(stream, "%-9s", string_format("NOT.%c", "BWL"[op & 0x03]));
+		dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::DESTINATION, op & 0x03);
+		break;
+
+	case 0x94: case 0x95:
+	{
+		u8 xb1 = opcodes.r8(pc++);
+		if ((xb1 & 0x30) == 0 || (xb1 & 0x70) == 0x20 || (xb1 & 0x70) == 0x50)
+		{
+			u8 xb2 = opcodes.r8(pc++);
+			if (BIT(xb1, 7))
+			{
+				u8 xb3 = opcodes.r8(pc++);
+				util::stream_format(stream, "S%s/%s/%c.%c ", (xb1 & 0x30) == 0 ? "SCH" : "CMP", s_term_conditions[xb3 & 0x0f], "FB"[BIT(xb1, 6)], "BW"[BIT(op, 0)]);
+				format_register_to_register(stream, xb2);
+				stream << ", ";
+				format_register(stream, 0, xb1 & 0x0f);
+				stream << ", ";
+				format_register(stream, 0, xb3 >> 4);
+			}
+			else
+			{
+				util::stream_format(stream, "S%s/%c.%c ", (xb1 & 0x30) == 0 ? "MOV" : "STR", "FB"[BIT(xb1, 6)], "BW"[BIT(op, 0)]);
+				format_register_to_register(stream, xb2);
+				stream << ", ";
+				format_register(stream, 0, xb1 & 0x0f);
+			}
+		}
+		else
+			stream << "{RIE}";
+		break;
+	}
+
+	case 0x98: case 0x99: case 0x9a:
+		util::stream_format(stream, "%-9s", string_format("BRA.%c", "BWL"[op & 0x03]));
+		dasm_branch_disp(stream, pc, opcodes, op & 0x03);
+		break;
+
+	case 0x9b:
+		util::stream_format(stream, "%-9s", "JMP");
+		dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::MEMORY, 2);
+		break;
+
+	case 0xa0: case 0xa1: case 0xa2: case 0xb0: case 0xb1: case 0xb2:
+		util::stream_format(stream, "%-9s", string_format("B%s.%c", BIT(op, 4) ? "NE" : "EQ", "BWL"[op & 0x03]));
+		dasm_branch_disp(stream, pc, opcodes, op & 0x03);
+		break;
+
+	case 0xa3: case 0xa7:
+		util::stream_format(stream, "%-9s", BIT(op, 2) ? "DSUB" : "DADD");
+		dasm_eas_ead(stream, pc, opcodes, ea_mode::SIGNED, ea_mode::DESTINATION, 0);
+		break;
+
+	case 0xa4: case 0xa5: case 0xa6:
+		util::stream_format(stream, "%-9s", string_format("B%s.%c", s_conditions[opcodes.r8(pc++) & 0x0f], "BWL"[op & 0x03]));
+		dasm_branch_disp(stream, pc, opcodes, op & 0x03);
+		break;
+
+	case 0xa8: case 0xa9: case 0xaa:
+		util::stream_format(stream, "%-9s", string_format("BSR.%c", "BWL"[op & 0x03]));
+		dasm_branch_disp(stream, pc, opcodes, op & 0x03);
+		flags |= STEP_OVER;
+		break;
+
+	case 0xab:
+		util::stream_format(stream, "%-9s", "JSR");
+		dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::MEMORY, 2);
+		flags |= STEP_OVER;
+		break;
+
+	case 0xac: case 0xad: case 0xae: case 0xbc: case 0xbd: case 0xbe:
+		util::stream_format(stream, "%-9s", string_format("EXT%c.%c", "US"[BIT(op, 4)], "WLB"[op & 0x03]));
+		format_register(stream, 0, opcodes.r8(pc++) & 0x0f);
+		break;
+
+	case 0xb3:
+		util::stream_format(stream, "%-9s", "XCH");
+		format_register_to_register(stream, opcodes.r8(pc++));
+		break;
+
+	case 0xb4: case 0xb5: case 0xb6:
+	{
+		u8 xb = opcodes.r8(pc++);
+		util::stream_format(stream, "%-9s", string_format("SCB/%s.%c", s_conditions[xb & 0x0f], "BWL"[op & 0x03]));
+		format_register(stream, 0, xb >> 4);
+		stream << ", ";
+		dasm_branch_disp(stream, pc, opcodes, op & 0x03);
+		break;
+	}
+
+	case 0xb7:
+		util::stream_format(stream, "%-9s", string_format("SET/%s", s_conditions[opcodes.r8(pc++) & 0x0f]));
+		dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::DESTINATION, 0);
+		break;
+
+	case 0xb8: case 0xb9: case 0xba:
+		util::stream_format(stream, "%-9s", string_format("RTD.%c", "BWL"[op & 0x03]));
+		dasm_ea(stream, pc, opcodes, 0x71 + (op & 0x03), 0, ea_mode::SIGNED, op & 0x03);
+		flags |= STEP_OUT;
+		break;
+
+	case 0xbb:
+		stream << "RTS";
+		flags |= STEP_OUT;
+		break;
+
+	case 0xbf:
+		util::stream_format(stream, "%-9s", "MOVA");
+		dasm_eas_ead(stream, pc, opcodes, ea_mode::ADDRESS, ea_mode::DESTINATION, 2);
+		break;
+
+	case 0xd0: case 0xd1: case 0xd2:
+		util::stream_format(stream, "%-9s", string_format("LINK", "BWL"[op & 0x03]));
+		format_register(stream, 0, opcodes.r8(pc++) & 0x0f);
+		stream << ", ";
+		dasm_ea(stream, pc, opcodes, 0x71 + (op & 0x03), 0, ea_mode::SIGNED, op & 0x03);
+		break;
+
+	case 0xd3:
+		util::stream_format(stream, "%-9s", "UNLK");
+		format_register(stream, 0, opcodes.r8(pc++) & 0x0f);
+		break;
+
+	case 0xd4: case 0xd5: case 0xd6:
+		util::stream_format(stream, "%-9s", s_bf_ops[op & 0x03]);
+		format_register_to_register(stream, opcodes.r8(pc++));
+		stream << ", ";
+		if (op == 0xd5)
+			dasm_eas_ead(stream, pc, opcodes, ea_mode::BITFIELD, ea_mode::BITFIELD, 1, 2);
+		else
+			dasm_eas_ead(stream, pc, opcodes, ea_mode::BITFIELD, ea_mode::BITFIELD, 2, 1);
+		break;
+
+	case 0xd7:
+		util::stream_format(stream, "%-9s", "BFMOV");
+		format_register_to_register(stream, opcodes.r8(pc++));
+		stream << ", ";
+		format_register_to_register(stream, opcodes.r8(pc++));
+		stream << ", ";
+		format_register_to_register(stream, opcodes.r8(pc++));
+		break;
+
+	case 0xe0: case 0xe1:
+		util::stream_format(stream, "%-9s", string_format("MOVTP.%c", "WL"[BIT(op, 0)]));
+		dasm_eas_ead(stream, pc, opcodes, ea_mode::UNSIGNED, ea_mode::PLAIN_MEMORY, BIT(op, 0) ? 2 : 1);
+		break;
+
+	case 0xe2: case 0xe3:
+		util::stream_format(stream, "%-9s", string_format("MOVFP.%c", "WL"[BIT(op, 0)]));
+		dasm_eas_ead(stream, pc, opcodes, ea_mode::PLAIN_MEMORY, ea_mode::DESTINATION, BIT(op, 0) ? 2 : 1);
+		break;
+
+	case 0xe4: case 0xe5: case 0xe6: case 0xe7:
+		util::stream_format(stream, "%-9s", "CGBN");
+		if (BIT(op, 1))
+			util::stream_format(stream, "#H'%02X", opcodes.r8(pc++));
+		else
+			format_register(stream, 0, opcodes.r8(pc++) & 0x0f);
+		if (BIT(op, 0))
+		{
+			stream << ", ";
+			format_register_list(stream, opcodes.r16(pc));
+			pc += 2;
+		}
+		break;
+
+	case 0xe8:
+		stream << "PGBN";
+		break;
+
+	case 0xe9:
+		util::stream_format(stream, "%-9s", "PGBN");
+		format_register_list(stream, opcodes.r16(pc));
+		pc += 2;
+		break;
+
+	case 0xea: case 0xeb:
+		util::stream_format(stream, "%-9s", string_format("SWAP.%c", "BW"[BIT(op, 0)]));
+		dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::DESTINATION, BIT(op, 0) + 1);
+		break;
+
+	case 0xec:
+		util::stream_format(stream, "%-9s", "TAS");
+		dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::DESTINATION, 0);
+		break;
+
+	case 0xee: case 0xef:
+	{
+		u8 xb = opcodes.r8(pc++);
+		if ((xb & 0xa0) == 0)
+		{
+			util::stream_format(stream, "%-9s", string_format("%sX%c.%c ", BIT(op, 0) ? "DIV" : "MUL", "SU"[BIT(xb, 6)], "BW"[BIT(xb, 4)]));
+			if (BIT(xb, 4))
+				dasm_eas_ead(stream, pc, opcodes, BIT(xb, 6) ? ea_mode::UNSIGNED : ea_mode::SIGNED, ea_mode::DESTINATION, 1, 2);
+			else
+				dasm_eas_ead(stream, pc, opcodes, BIT(xb, 6) ? ea_mode::UNSIGNED : ea_mode::SIGNED, ea_mode::DESTINATION, 0, 1);
+		}
+		else
+			stream << "{RIE}";
+		break;
+	}
+
+	case 0xf0:
+		stream << "RESET";
+		break;
+
+	case 0xf1:
+		stream << "RTE";
+		flags |= STEP_OUT;
+		break;
+
+	case 0xf2:
+		util::stream_format(stream, "%-9s#%d", "TRAPA", opcodes.r8(pc++) & 0x0f);
+		flags |= STEP_OVER;
+		break;
+
+	case 0xf3:
+		util::stream_format(stream, "TRAP/%s", s_conditions[opcodes.r8(pc++) & 0x0f]);
+		flags |= STEP_OVER;
+		break;
+
+	case 0xf4:
+		stream << "RTR";
+		flags |= STEP_OUT;
+		break;
+
+	case 0xf5:
+		stream << "SLEEP";
+		break;
+
+	case 0xf8: case 0xf9: case 0xfa: case 0xfb: case 0xfc:
+	{
+		u8 cr = opcodes.r8(pc++);
+		util::stream_format(stream, "%-9s", s_cr_ops[op & 0x07]);
+		if (op >= 0xfb)
+		{
+			format_cr(stream, cr);
+			stream << ", ";
+		}
+		if (op == 0xfc)
+			dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::DESTINATION, get_cr_size(cr));
+		else
+		{
+			dasm_ea(stream, pc, opcodes, opcodes.r8(pc++) & 0x7f, 0, ea_mode::UNSIGNED, get_cr_size(cr));
+			if (op < 0xfb)
+			{
+				stream << ", ";
+				format_cr(stream, cr);
+			}
+		}
+		break;
+	}
+
+	case 0xfd:
+		stream << "ICBN";
+		break;
+
+	case 0xfe:
+		stream << "DCBN";
+		break;
+
+	case 0xff:
+		stream << "NOP";
+		break;
+
+	default:
+		stream << "{RIE}";
+		break;
+	}
+
+	return ((pc - pc0) & LENGTHMASK) | flags;
+}
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/h16/h16dasm.h mame-0.224+dfsg.1/src/devices/cpu/h16/h16dasm.h
--- mame-0.222+dfsg.1/src/devices/cpu/h16/h16dasm.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/h16/h16dasm.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,55 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+
+#ifndef MAME_CPU_H16_H16DASM_H
+#define MAME_CPU_H16_H16DASM_H
+
+#pragma once
+
+class h16_disassembler : public util::disasm_interface
+{
+public:
+	// construction/destruction
+	h16_disassembler();
+
+	// disassembler overrides
+	virtual u32 opcode_alignment() const override;
+	virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override;
+
+private:
+	enum class ea_mode {
+		SIGNED,
+		UNSIGNED,
+		DESTINATION,
+		MEMORY,
+		PLAIN_MEMORY,
+		ADDRESS,
+		BITFIELD
+	};
+
+	static const char *const s_conditions[16];
+	static const char *const s_term_conditions[16];
+	static const char *const s_basic_ops[4];
+	static const char *const s_logical_ops[3];
+	static const char *const s_sft_ops[8];
+	static const char *const s_bit_ops[4];
+	static const char *const s_bf_ops[3];
+	static const char *const s_cr_ops[5];
+
+	// formatting/disassembly helpers
+	void format_register(std::ostream &stream, char bank, u8 n) const;
+	void format_register_to_register(std::ostream &stream, u8 rr) const;
+	void format_register_list(std::ostream &stream, u16 rl) const;
+	u8 get_cr_size(u8 cr) const;
+	void format_cr(std::ostream &stream, u8 cr) const;
+	void format_s8(std::ostream &stream, u8 data) const;
+	void format_s16(std::ostream &stream, u16 data) const;
+	void format_s32(std::ostream &stream, u32 data) const;
+	void dasm_displacement(std::ostream &stream, offs_t &pc, const data_buffer &opcodes, u8 sd) const;
+	void dasm_ea(std::ostream &stream, offs_t &pc, const h16_disassembler::data_buffer &opcodes, u8 ea, char bank, ea_mode mode, u8 sz) const;
+	void dasm_eas_ead(std::ostream &stream, offs_t &pc, const h16_disassembler::data_buffer &opcodes, ea_mode smode, ea_mode dmode, u8 sz) const;
+	void dasm_eas_ead(std::ostream &stream, offs_t &pc, const h16_disassembler::data_buffer &opcodes, ea_mode smode, ea_mode dmode, u8 szs, u8 szd) const;
+	void dasm_branch_disp(std::ostream &stream, offs_t &pc, const h16_disassembler::data_buffer &opcodes, u8 sz) const;
+};
+
+#endif // MAME_CPU_H16_H16DASM_H
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/h16/hd641016.cpp mame-0.224+dfsg.1/src/devices/cpu/h16/hd641016.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/h16/hd641016.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/h16/hd641016.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,235 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***************************************************************************
+
+    Hitachi HD641016 16-bit MPU
+
+    Currently this device is just a stub with no actual execution core.
+
+***************************************************************************/
+
+#include "emu.h"
+#include "hd641016.h"
+#include "h16dasm.h"
+
+// device type definition
+DEFINE_DEVICE_TYPE(HD641016, hd641016_device, "hd641016", "Hitachi HD641016")
+
+hd641016_device::hd641016_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cpu_device(mconfig, HD641016, tag, owner, clock)
+	, m_program_config("program", ENDIANNESS_BIG, 16, 24, 0)
+	, m_data_config("data", ENDIANNESS_BIG, 32, 10, 0, address_map_constructor(FUNC(hd641016_device::ram_map), this))
+	, m_io_config("I/O", ENDIANNESS_BIG, 32, 9, 0, address_map_constructor(FUNC(hd641016_device::io_map), this))
+	, m_pc(0)
+	, m_ssp(0)
+	, m_bsp(0)
+	, m_ebr(0)
+	, m_rbr(0)
+	, m_ibr(0)
+	, m_cbnr(0)
+	, m_sr(0)
+	, m_bmr(0)
+	, m_gbnr(0)
+	, m_vbnr(0)
+	, m_icount(0)
+{
+}
+
+void hd641016_device::ram_map(address_map &map)
+{
+	map(0x000, 0x3ff).ram().share("ram"); // 1K on-chip high-speed RAM
+}
+
+void hd641016_device::io_map(address_map &map)
+{
+	map.unmap_value_low();
+	//map(0x128, 0x129).rw(FUNC(hd641016_device::abr0_r), FUNC(hd641016_device::abr0_w));
+	//map(0x12a, 0x12b).rw(FUNC(hd641016_device::arr0_r), FUNC(hd641016_device::arr0_w));
+	//map(0x12c, 0x12d).rw(FUNC(hd641016_device::awcr0_r), FUNC(hd641016_device::awcr0_w));
+	//map(0x12e, 0x12f).rw(FUNC(hd641016_device::abr1_r), FUNC(hd641016_device::abr1_w));
+	//map(0x130, 0x131).rw(FUNC(hd641016_device::arr1_r), FUNC(hd641016_device::arr1_w));
+	//map(0x132, 0x133).rw(FUNC(hd641016_device::awcr1_r), FUNC(hd641016_device::awcr1_w));
+	//map(0x134, 0x135).rw(FUNC(hd641016_device::abr2_r), FUNC(hd641016_device::abr2_w));
+	//map(0x136, 0x137).rw(FUNC(hd641016_device::arr2_r), FUNC(hd641016_device::arr2_w));
+	//map(0x138, 0x139).rw(FUNC(hd641016_device::awcr2_r), FUNC(hd641016_device::awcr2_w));
+	//map(0x13a, 0x13b).rw(FUNC(hd641016_device::abr3_r), FUNC(hd641016_device::abr3_w));
+	//map(0x13c, 0x13d).rw(FUNC(hd641016_device::arr3_r), FUNC(hd641016_device::arr3_w));
+	//map(0x13e, 0x13f).rw(FUNC(hd641016_device::awcr3_r), FUNC(hd641016_device::awcr3_w));
+	//map(0x140, 0x141).rw(FUNC(hd641016_device::ipr0_r), FUNC(hd641016_device::ipr0_w));
+	//map(0x142, 0x143).rw(FUNC(hd641016_device::ipr1_r), FUNC(hd641016_device::ipr1_w));
+	//map(0x144, 0x145).rw(FUNC(hd641016_device::ipr2_r), FUNC(hd641016_device::ipr2_w));
+	//map(0x146, 0x147).rw(FUNC(hd641016_device::icr_r), FUNC(hd641016_device::icr_w));
+	//map(0x14e, 0x14f).rw(FUNC(hd641016_device::pcr0_r), FUNC(hd641016_device::pcr0_w));
+	//map(0x158, 0x158).rw(FUNC(hd641016_device::asci0_rxb_r), FUNC(hd641016_device::asci0_txb_w));
+	//map(0x159, 0x159).r(FUNC(hd641016_device::asci0_st0_r));
+	//map(0x15a, 0x15a).rw(FUNC(hd641016_device::asci0_st1_r), FUNC(hd641016_device::asci0_st1_w));
+	//map(0x15b, 0x15b).rw(FUNC(hd641016_device::asci0_st2_r), FUNC(hd641016_device::asci0_st2_w));
+	//map(0x15e, 0x15e).rw(FUNC(hd641016_device::asci0_ie0_r), FUNC(hd641016_device::asci0_ie0_w));
+	//map(0x15f, 0x15f).rw(FUNC(hd641016_device::asci0_ie1_r), FUNC(hd641016_device::asci0_ie1_w));
+	//map(0x160, 0x160).rw(FUNC(hd641016_device::asci0_ie2_r), FUNC(hd641016_device::asci0_ie2_w));
+	//map(0x162, 0x162).w(FUNC(hd641016_device::asci0_cmd_w));
+	//map(0x163, 0x163).rw(FUNC(hd641016_device::asci0_md0_r), FUNC(hd641016_device::asci0_md0_w));
+	//map(0x164, 0x164).rw(FUNC(hd641016_device::asci0_md1_r), FUNC(hd641016_device::asci0_md1_w));
+	//map(0x165, 0x165).rw(FUNC(hd641016_device::asci0_md2_r), FUNC(hd641016_device::asci0_md2_w));
+	//map(0x166, 0x166).rw(FUNC(hd641016_device::asci0_ctl_r), FUNC(hd641016_device::asci0_ctl_w));
+	//map(0x16a, 0x16a).rw(FUNC(hd641016_device::asci0_tmc_r), FUNC(hd641016_device::asci0_tmc_w));
+	//map(0x16b, 0x16b).rw(FUNC(hd641016_device::asci0_rxs_r), FUNC(hd641016_device::asci0_rxs_w));
+	//map(0x16c, 0x16c).rw(FUNC(hd641016_device::asci0_txs_r), FUNC(hd641016_device::asci0_txs_w));
+	//map(0x170, 0x170).rw(FUNC(hd641016_device::asci1_rxb_r), FUNC(hd641016_device::asci1_txb_w));
+	//map(0x171, 0x171).r(FUNC(hd641016_device::asci1_st0_r));
+	//map(0x172, 0x172).rw(FUNC(hd641016_device::asci1_st1_r), FUNC(hd641016_device::asci1_st1_w));
+	//map(0x173, 0x173).rw(FUNC(hd641016_device::asci1_st2_r), FUNC(hd641016_device::asci1_st2_w));
+	//map(0x176, 0x176).rw(FUNC(hd641016_device::asci1_ie0_r), FUNC(hd641016_device::asci1_ie0_w));
+	//map(0x177, 0x177).rw(FUNC(hd641016_device::asci1_ie1_r), FUNC(hd641016_device::asci1_ie1_w));
+	//map(0x178, 0x178).rw(FUNC(hd641016_device::asci1_ie2_r), FUNC(hd641016_device::asci1_ie2_w));
+	//map(0x17a, 0x17a).w(FUNC(hd641016_device::asci1_cmd_w));
+	//map(0x17b, 0x17b).rw(FUNC(hd641016_device::asci1_md0_r), FUNC(hd641016_device::asci1_md0_w));
+	//map(0x17c, 0x17c).rw(FUNC(hd641016_device::asci1_md1_r), FUNC(hd641016_device::asci1_md1_w));
+	//map(0x17d, 0x17d).rw(FUNC(hd641016_device::asci1_md2_r), FUNC(hd641016_device::asci1_md2_w));
+	//map(0x17e, 0x17e).rw(FUNC(hd641016_device::asci1_ctl_r), FUNC(hd641016_device::asci1_ctl_w));
+	//map(0x182, 0x182).rw(FUNC(hd641016_device::asci1_tmc_r), FUNC(hd641016_device::asci1_tmc_w));
+	//map(0x183, 0x183).rw(FUNC(hd641016_device::asci1_rxs_r), FUNC(hd641016_device::asci1_rxs_w));
+	//map(0x184, 0x184).rw(FUNC(hd641016_device::asci1_txs_r), FUNC(hd641016_device::asci1_txs_w));
+	//map(0x18e, 0x18f).rw(FUNC(hd641016_device::tmr1_ucr_r), FUNC(hd641016_device::tmr1_ucr_w));
+	//map(0x190, 0x191).rw(FUNC(hd641016_device::tmr1_ccra_r), FUNC(hd641016_device::tmr1_ccra_w));
+	//map(0x192, 0x193).rw(FUNC(hd641016_device::tmr1_ccrb_r), FUNC(hd641016_device::tmr1_ccrb_w));
+	//map(0x194, 0x195).rw(FUNC(hd641016_device::tmr1_cntr_r), FUNC(hd641016_device::tmr1_cntr_w));
+	//map(0x196, 0x197).r(FUNC(hd641016_device::tmr1_str_r));
+	//map(0x198, 0x189).rw(FUNC(hd641016_device::tmr2_ucr_r), FUNC(hd641016_device::tmr2_ucr_w));
+	//map(0x19a, 0x19b).rw(FUNC(hd641016_device::tmr2_ccra_r), FUNC(hd641016_device::tmr2_ccra_w));
+	//map(0x19c, 0x19d).rw(FUNC(hd641016_device::tmr2_ccrb_r), FUNC(hd641016_device::tmr2_ccrb_w));
+	//map(0x19e, 0x19f).rw(FUNC(hd641016_device::tmr2_cntr_r), FUNC(hd641016_device::tmr2_cntr_w));
+	//map(0x1a0, 0x1a1).r(FUNC(hd641016_device::tmr2_str_r));
+	//map(0x1b0, 0x1b3).rw(FUNC(hd641016_device::dmac0_madr_r), FUNC(hd641016_device::dmac0_madr_w));
+	//map(0x1b4, 0x1b7).rw(FUNC(hd641016_device::dmac0_dadr_r), FUNC(hd641016_device::dmac0_dadr_w));
+	//map(0x1b8, 0x1b9).rw(FUNC(hd641016_device::dmac0_etcr_r), FUNC(hd641016_device::dmac0_etcr_w));
+	//map(0x1ba, 0x1bb).rw(FUNC(hd641016_device::dmac0_btcr_r), FUNC(hd641016_device::dmac0_btcr_w));
+	//map(0x1bc, 0x1bd).rw(FUNC(hd641016_device::dmac0_chcra_r), FUNC(hd641016_device::dmac0_chcra_w));
+	//map(0x1be, 0x1bf).rw(FUNC(hd641016_device::dmac0_chcrb_r), FUNC(hd641016_device::dmac0_chcrb_w));
+	//map(0x1c0, 0x1c3).rw(FUNC(hd641016_device::dmac1_madr_r), FUNC(hd641016_device::dmac1_madr_w));
+	//map(0x1c4, 0x1c7).rw(FUNC(hd641016_device::dmac1_dadr_r), FUNC(hd641016_device::dmac1_dadr_w));
+	//map(0x1c8, 0x1c9).rw(FUNC(hd641016_device::dmac1_etcr_r), FUNC(hd641016_device::dmac1_etcr_w));
+	//map(0x1ca, 0x1cb).rw(FUNC(hd641016_device::dmac1_btcr_r), FUNC(hd641016_device::dmac1_btcr_w));
+	//map(0x1cc, 0x1cd).rw(FUNC(hd641016_device::dmac1_chcra_r), FUNC(hd641016_device::dmac1_chcra_w));
+	//map(0x1ce, 0x1cf).rw(FUNC(hd641016_device::dmac1_chcrb_r), FUNC(hd641016_device::dmac1_chcrb_w));
+	//map(0x1d0, 0x1d3).rw(FUNC(hd641016_device::dmac2_madr_r), FUNC(hd641016_device::dmac2_madr_w));
+	//map(0x1d4, 0x1d7).rw(FUNC(hd641016_device::dmac2_dadr_r), FUNC(hd641016_device::dmac2_dadr_w));
+	//map(0x1d8, 0x1d9).rw(FUNC(hd641016_device::dmac2_etcr_r), FUNC(hd641016_device::dmac2_etcr_w));
+	//map(0x1da, 0x1db).rw(FUNC(hd641016_device::dmac2_btcr_r), FUNC(hd641016_device::dmac2_btcr_w));
+	//map(0x1dc, 0x1dd).rw(FUNC(hd641016_device::dmac2_chcra_r), FUNC(hd641016_device::dmac2_chcra_w));
+	//map(0x1de, 0x1df).rw(FUNC(hd641016_device::dmac2_chcrb_r), FUNC(hd641016_device::dmac2_chcrb_w));
+	//map(0x1e0, 0x1e3).rw(FUNC(hd641016_device::dmac3_madr_r), FUNC(hd641016_device::dmac3_madr_w));
+	//map(0x1e4, 0x1e7).rw(FUNC(hd641016_device::dmac3_dadr_r), FUNC(hd641016_device::dmac3_dadr_w));
+	//map(0x1e8, 0x1e9).rw(FUNC(hd641016_device::dmac3_etcr_r), FUNC(hd641016_device::dmac3_etcr_w));
+	//map(0x1ea, 0x1eb).rw(FUNC(hd641016_device::dmac3_btcr_r), FUNC(hd641016_device::dmac3_btcr_w));
+	//map(0x1ec, 0x1ed).rw(FUNC(hd641016_device::dmac3_chcra_r), FUNC(hd641016_device::dmac3_chcra_w));
+	//map(0x1ee, 0x1ef).rw(FUNC(hd641016_device::dmac3_chcrb_r), FUNC(hd641016_device::dmac3_chcrb_w));
+	//map(0x1f0, 0x1f1).rw(FUNC(hd641016_device::dmac_opcr_r), FUNC(hd641016_device::dmac_opcr_w));
+	//map(0x1f8, 0x1f9).rw(FUNC(hd641016_device::mcr_r), FUNC(hd641016_device::mcr_w));
+}
+
+device_memory_interface::space_config_vector hd641016_device::memory_space_config() const
+{
+	return space_config_vector {
+		std::make_pair(AS_PROGRAM, &m_program_config),
+		std::make_pair(AS_DATA, &m_data_config),
+		std::make_pair(AS_IO, &m_io_config)
+	};
+}
+
+std::unique_ptr<util::disasm_interface> hd641016_device::create_disassembler()
+{
+	return std::make_unique<h16_disassembler>();
+}
+
+void hd641016_device::device_start()
+{
+	space(AS_PROGRAM).specific(m_program);
+	space(AS_PROGRAM).cache(m_cache);
+	space(AS_DATA).cache(m_data);
+	space(AS_IO).specific(m_io);
+
+	set_icountptr(m_icount);
+
+	// register state
+	state_add(H16_PC, "PC", m_pc).mask(0xffffff);
+	state_add(STATE_GENPC, "GENPC", m_pc).mask(0xffffff).noshow();
+	state_add(STATE_GENPCBASE, "CURPC", m_pc).mask(0xffffff).noshow();
+	state_add(H16_SSP, "SSP", m_ssp);
+	state_add(H16_BSP, "BSP", m_bsp);
+	state_add(H16_EBR, "EBR", m_ebr);
+	state_add(H16_RBR, "RBR", m_rbr);
+	state_add(H16_IBR, "IBR", m_ibr);
+	state_add(H16_CBNR, "CBNR", m_cbnr);
+	state_add(H16_SR, "SR", m_sr).mask(0xb71f);
+	state_add<u16>(H16_CCR, "CCR",
+		[this]() { return m_sr & 0x001f; },
+		[this](u16 data) { m_sr = (m_sr & 0xb700) | data; }
+	).mask(0x001f).noshow();
+	state_add(STATE_GENFLAGS, "FLAGS", m_sr).mask(0xb71f).formatstr("%14s").noshow();
+	state_add(H16_BMR, "BMR", m_bmr);
+	state_add(H16_GBNR, "GBNR", m_gbnr);
+	state_add(H16_VBNR, "VBNR", m_vbnr);
+	u32 *const internal_ram = static_cast<u32 *>(memshare("ram")->ptr());
+	for (int n = 0; n < 16; n++)
+	{
+		std::string rname = n == 15 ? "USP" : string_format("R%d", n);
+		state_add<u32>(H16_R0 + n, rname.c_str(),
+			[this, n, internal_ram]() { return internal_ram[0xf0 - ((m_gbnr & global_bank_mask()) << 4) + n]; },
+			[this, n, internal_ram](u32 data) { internal_ram[0xf0 - ((m_gbnr & global_bank_mask()) << 4) + n] = data; }
+		);
+	}
+
+	// save state
+	save_item(NAME(m_pc));
+	save_item(NAME(m_ssp));
+	save_item(NAME(m_bsp));
+	save_item(NAME(m_ebr));
+	save_item(NAME(m_rbr));
+	save_item(NAME(m_ibr));
+	save_item(NAME(m_cbnr));
+	save_item(NAME(m_sr));
+	save_item(NAME(m_bmr));
+	save_item(NAME(m_gbnr));
+	save_item(NAME(m_vbnr));
+}
+
+void hd641016_device::device_reset()
+{
+	m_ebr &= 0xff000000;
+	m_rbr = 0x00fff800 | (m_rbr & 0xff0003ff);
+	m_ibr = 0x00ff0000 | (m_ibr & 0xff00ffff);
+	m_cbnr = 0x00000000;
+	m_sr = 0x2700 | (m_sr & 0x001f);
+	m_bmr = 0xa4;
+	m_gbnr &= 0xf0;
+	m_vbnr &= 0xf7;
+}
+
+void hd641016_device::execute_run()
+{
+	m_ssp = m_program.read_dword(0x000000);
+	m_pc = m_program.read_dword(0x000004);
+	debugger_instruction_hook(m_pc);
+
+	m_icount = 0;
+}
+
+void hd641016_device::state_string_export(const device_state_entry &entry, std::string &str) const
+{
+	switch (entry.index())
+	{
+	case STATE_GENFLAGS:
+		str = string_format("%c-%c%c-<%d> %c%c%c%c%c",
+				BIT(m_sr, 15) ? 'T' : '.',
+				BIT(m_sr, 13) ? 'S' : 'U',
+				BIT(m_sr, 12) ? 'I' : '.',
+				BIT(m_sr, 8, 3),
+				BIT(m_sr, 4) ? 'X' : '.',
+				BIT(m_sr, 3) ? 'N' : '.',
+				BIT(m_sr, 2) ? 'Z' : '.',
+				BIT(m_sr, 1) ? 'V' : '.',
+				BIT(m_sr, 0) ? 'C' : '.');
+		break;
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/h16/hd641016.h mame-0.224+dfsg.1/src/devices/cpu/h16/hd641016.h
--- mame-0.222+dfsg.1/src/devices/cpu/h16/hd641016.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/h16/hd641016.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,142 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/****************************************************************************
+                                     Vss
+     A11/D10 -----------------------+ | +---------------------- A10/D9
+     A12/D11 ---------------------+ | | | +-------------------- A9/D8
+     A13/D12 -------------------+ | | | | | +------------------ A8/D7
+     A14/D13 -----------------+ | | | | | | | +---------------- A7/D6
+     A15/D14 ---------------+ | | | | | | | | | +-------------- A6/D5
+     A16/D15 -------------+ | | | | | | | | | | | +------------ A5/D4
+         A17 -----------+ | | | | | | | | | | | | | +---------- A4/D3
+         A18 ---------+ | | | | | | | | | | | | | | | +-------- A3/D2
+         A19 -------+ | | | | | | | | | | | | | | | | | +------ A2/D1
+         A20 -----+ | | | | | | | | | | | | | | | | | | | +---- A1/D0
+                 _1_1_|_|_|_|_|_|_|_|_|_8_8_8_8_8_7_7_7_7_7_
+                / 1 0 9 8 7 6 5 4 3 2 1 4 3 2 1 0 9 8 7 6 5 \
+               /--------------------------------------------|
+         A21 --| 12                   *                  74 |-- _IRQ1
+         A22 --| 13                                      73 |-- _IRQ0
+         A23 --| 14                                      72 |-- _NMI
+         Vss --| 15                                      71 |-- _BRTRY
+         _AS --| 16                                      70 |-- _RES
+       _WAIT --| 17                                      69 |-- Vss
+         Vcc --| 18                                      68 |-- EXTAL
+        _HDS --| 19                                      67 |-- (NC)
+        _LDS --| 20                                      66 |-- XTAL
+        R/_W --| 21                                      65 |-- _BREQ
+        S/_U --| 22               HD641016CP             64 |-- (NC)
+         Vss --| 23                                      63 |-- Vcc
+          PF --| 24                                      62 |-- E
+        (NC) --| 25                                      61 |-- ϕ
+        (NC) --| 26                                      60 |-- _BACK
+       TIOB2 --| 27                                      59 |-- _IACK
+       TIOA2 --| 28                                      58 |-- PCS1
+       TIOB1 --| 29                                      57 |-- PCS0
+       TIOA1 --| 30                                      56 |-- ST2
+        (NC) --| 31                                      55 |-- ST1
+        RXD0 --| 32                                      54 |-- ST0
+               |--------------------------------------------|
+               \  3 3 3 3 3 3 3 4 4 4 4 4 4 4 4 4 4 5 5 5 5 /
+                --3-4-5-6-7-8-9-0-1-2-3-4-5-6-7-8-9-0-1-2-3-
+        TXD0 -----+ | | | | | | | | | | | | | | | | | | | +---- _DONE
+        RXC0 -------+ | | | | | | | | | | | | | | | | | +------ _DACK0
+        TXC0 ---------+ | | | | | | | | | | | | | | | +-------- _DREQ0
+       _CTS0 -----------+ | | | | | | | | | | | | | +---------- _DACK1
+       _DCD0 -------------+ | | | | | | | | | | | +------------ _DREQ1
+       _RTS0 ---------------+ | | | | | | | | | +-------------- _DACK2
+        RXD1 -----------------+ | | | | | | | +---------------- _DREQ2
+        TXD1 -------------------+ | | | | | +------------------ _RTS1/_DACK3
+        RXC1 ---------------------+ | | | +-------------------- _DCD1/_DREQ3
+        TXC1 -----------------------+ | +---------------------- Vss
+                                    _CTS1
+
+****************************************************************************/
+
+#ifndef MAME_CPU_H16_HD641016_H
+#define MAME_CPU_H16_HD641016_H
+
+#pragma once
+
+class hd641016_device : public cpu_device
+{
+public:
+	enum
+	{
+		H16_PC,
+		H16_SSP,
+		H16_BSP,
+		H16_EBR,
+		H16_RBR,
+		H16_IBR,
+		H16_CBNR,
+		H16_SR,
+		H16_CCR,
+		H16_BMR,
+		H16_GBNR,
+		H16_VBNR,
+		H16_R0, H16_R1, H16_R2, H16_R3, H16_R4, H16_R5, H16_R6, H16_R7,
+		H16_R8, H16_R9, H16_R10, H16_R11, H16_R12, H16_R13, H16_R14,
+		H16_USP,
+		H16_CR0, H16_CR1, H16_CR2, H16_CR3, H16_CR4, H16_CR5, H16_CR6, H16_CR7,
+		H16_CR8, H16_CR9, H16_CR10, H16_CR11, H16_CR12, H16_CR13, H16_CR14, H16_CR15,
+		H16_PR0, H16_PR1, H16_PR2, H16_PR3, H16_PR4, H16_PR5, H16_PR6, H16_PR7,
+		H16_PR8, H16_PR9, H16_PR10, H16_PR11, H16_PR12, H16_PR13, H16_PR14, H16_PR15
+	};
+
+	// device type constructor
+	hd641016_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// device_execute_interface overrides
+	virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return (clocks + 2 - 1) / 2; }
+	virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return (cycles * 2); }
+	virtual void execute_run() override;
+
+	// device_disasm_interface overrides
+	virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
+
+	// device_memory_interface overrides
+	virtual space_config_vector memory_space_config() const override;
+
+	// device_state_interface overrides
+	virtual void state_string_export(const device_state_entry &entry, std::string &str) const override;
+
+private:
+	u8 global_bank_mask() const { return BIT(m_bmr, 4) ? 7 : (2 << (m_bmr & 3)) - 1; }
+
+	// internal maps
+	void ram_map(address_map &map);
+	void io_map(address_map &map);
+
+	// address spaces
+	address_space_config m_program_config;
+	address_space_config m_data_config;
+	address_space_config m_io_config;
+	memory_access<24, 1, 0, ENDIANNESS_BIG>::specific m_program;
+	memory_access<24, 1, 0, ENDIANNESS_BIG>::cache m_cache;
+	memory_access<10, 2, 0, ENDIANNESS_BIG>::cache m_data;
+	memory_access<9, 2, 0, ENDIANNESS_BIG>::specific m_io;
+
+	u32 m_pc;
+	u32 m_ssp;
+	u32 m_bsp;
+	u32 m_ebr;
+	u32 m_rbr;
+	u32 m_ibr;
+	u32 m_cbnr;
+	u16 m_sr;
+	u8 m_bmr;
+	u8 m_gbnr;
+	u8 m_vbnr;
+	s32 m_icount;
+};
+
+// device type declaration
+DECLARE_DEVICE_TYPE(HD641016, hd641016_device)
+
+#endif // MAME_CPU_H16_HD641016_H
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/h8/h8_dma.cpp mame-0.224+dfsg.1/src/devices/cpu/h8/h8_dma.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/h8/h8_dma.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/h8/h8_dma.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -154,6 +154,7 @@
 	mar[0] = mar[1] = 0;
 	ioar[0] = ioar[1] = 0;
 	etcr[0] = etcr[1] = 0;
+	dtcr[0] = dtcr[1] = 0;
 	fae = sae = false;
 	dta = dte = dtie = 0;
 }
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/h8/h8_sci.cpp mame-0.224+dfsg.1/src/devices/cpu/h8/h8_sci.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/h8/h8_sci.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/h8/h8_sci.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -464,7 +464,7 @@
 
 	case CLKM_EXTERNAL_ASYNC:
 	case CLKM_EXTERNAL_SYNC:
-		break;;
+		break;
 	}
 	if(event) {
 		attotime ctime = machine().time();
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/hpc/hpcdasm.cpp mame-0.224+dfsg.1/src/devices/cpu/hpc/hpcdasm.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/hpc/hpcdasm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/hpc/hpcdasm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -5,22 +5,16 @@
     National Semiconductor HPC disassembler
 
     Note that though all 16-bit fields in instructions have the MSB first,
-    the HPC's memory organization is in fact little-endian. This is why r16
-    is not used to read them.
+    the HPC's memory organization is in fact little-endian (including
+    vector and JIDW tables). This is why r16 is always swapped here.
 
 ***************************************************************************/
 
 #include "emu.h"
-#include "util/disasmintf.h"
 #include "hpcdasm.h"
 
-#include "util/strformat.h"
 #include <cctype>
 
-using osd::u32;
-using util::BIT;
-using offs_t = u32;
-
 const char *const hpc16083_disassembler::s_regs[128] =
 {
 	"psw", nullptr, "SP", "PC", "A", "K", "B", "X",
@@ -270,7 +264,7 @@
 		if (BIT(opcode, 1))
 			imm = true;
 
-		src = (opcodes.r8(pc + 1) << 8) | opcodes.r8(pc + 2);
+		src = swapendian_int16(opcodes.r16(pc + 1));
 		reg = opcodes.r8(pc + 3);
 		opcode = opcodes.r8(pc + 4);
 		bytes = 5;
@@ -284,7 +278,7 @@
 			imm = true;
 
 		src = opcodes.r8(pc + 1);
-		reg = (opcodes.r8(pc + 2) << 8) | opcodes.r8(pc + 3);
+		reg = swapendian_int16(opcodes.r16(pc + 2));
 		opcode = opcodes.r8(pc + 4);
 		bytes = 5;
 		break;
@@ -304,15 +298,15 @@
 		if (BIT(opcode, 1))
 			imm = true;
 
-		src = (opcodes.r8(pc + 1) << 8) | opcodes.r8(pc + 2);
-		reg = (opcodes.r8(pc + 3) << 8) | opcodes.r8(pc + 4);
+		src = swapendian_int16(opcodes.r16(pc + 1));
+		reg = swapendian_int16(opcodes.r16(pc + 3));
 		opcode = opcodes.r8(pc + 5);
 		bytes = 6;
 		break;
 
 	case 0xa6:
 		idx = true;
-		reg = (opcodes.r8(pc + 1) << 8) | opcodes.r8(pc + 2);
+		reg = swapendian_int16(opcodes.r16(pc + 1));
 		src = opcodes.r8(pc + 3);
 		opcode = opcodes.r8(pc + 4);
 		bytes = 5;
@@ -389,8 +383,8 @@
 
 	case 0xa7:
 		imm = true;
-		src = (opcodes.r8(pc + 1) << 8) | opcodes.r8(pc + 2);
-		reg = (opcodes.r8(pc + 3) << 8) | opcodes.r8(pc + 4);
+		src = swapendian_int16(opcodes.r16(pc + 1));
+		reg = swapendian_int16(opcodes.r16(pc + 3));
 		bytes = 5;
 		break;
 
@@ -403,33 +397,33 @@
 	case 0xb0: case 0xb1: case 0xb2: case 0xb3:
 		imm = true;
 		reg = 0x00c8 | ((opcode & 0x03) << 1);
-		src = (opcodes.r8(pc + 1) << 8) | opcodes.r8(pc + 2);
+		src = swapendian_int16(opcodes.r16(pc + 1));
 		bytes = 3;
 		break;
 
 	case 0xb8: case 0xb9: case 0xba: case 0xbb:
 	case 0xbc: case 0xbd: case 0xbe: case 0xbf:
 		imm = true;
-		src = (opcodes.r8(pc + 1) << 8) | opcodes.r8(pc + 2);
+		src = swapendian_int16(opcodes.r16(pc + 1));
 		bytes = 3;
 		break;
 
 	case 0xb4: case 0xb5:
 		jmp = true;
-		src = pc + 3 + ((opcodes.r8(pc + 1) << 8) | opcodes.r8(pc + 2));
+		src = pc + 3 + swapendian_int16(opcodes.r16(pc + 1));
 		bytes = 3;
 		break;
 
 	case 0xb6:
 		indir = false;
-		src = (opcodes.r8(pc + 1) << 8) | opcodes.r8(pc + 2);
+		src = swapendian_int16(opcodes.r16(pc + 1));
 		opcode = opcodes.r8(pc + 3);
 		bytes = 4;
 		break;
 
 	case 0xb7:
 		imm = true;
-		src = (opcodes.r8(pc + 1) << 8) | opcodes.r8(pc + 2);
+		src = swapendian_int16(opcodes.r16(pc + 1));
 		reg = opcodes.r8(pc + 3);
 		bytes = 4;
 		break;
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/i86/i86.cpp mame-0.224+dfsg.1/src/devices/cpu/i86/i86.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/i86/i86.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/i86/i86.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2266,10 +2266,10 @@
 					CLKM(NEGNOT_R8,NEGNOT_M8);
 					break;
 				case 0x18:  /* NEG */
-					m_CarryVal = (tmp!=0) ? 1 : 0;
-					tmp = (~tmp)+1;
-					set_SZPF_Byte(tmp);
-					PutbackRMByte(tmp&0xff);
+					m_dst = 0;
+					m_src = tmp;
+					set_CFB(SUBB());
+					PutbackRMByte(m_dst);
 					CLKM(NEGNOT_R8,NEGNOT_M8);
 					break;
 				case 0x20:  /* MUL */
@@ -2356,10 +2356,10 @@
 					CLKM(NEGNOT_R16,NEGNOT_M16);
 					break;
 				case 0x18:  /* NEG */
-					m_CarryVal = (tmp!=0) ? 1 : 0;
-					tmp = (~tmp) + 1;
-					set_SZPF_Word(tmp);
-					PutbackRMWord(tmp);
+					m_dst = 0;
+					m_src = tmp;
+					set_CFW(SUBX());
+					PutbackRMWord(m_dst);
 					CLKM(NEGNOT_R16,NEGNOT_M16);
 					break;
 				case 0x20:  /* MUL */
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/i860/i860dec.hxx mame-0.224+dfsg.1/src/devices/cpu/i860/i860dec.hxx
--- mame-0.222+dfsg.1/src/devices/cpu/i860/i860dec.hxx	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/i860/i860dec.hxx	2020-08-26 08:57:19.000000000 +0000
@@ -57,21 +57,6 @@
 };
 
 
-/*  TODO: THESE WILL BE REPLACED BY MAME FUNCTIONS
-#define BYTE_REV32(t)   \
-  do { \
-    (t) = ((uint32_t)(t) >> 16) | ((uint32_t)(t) << 16); \
-    (t) = (((uint32_t)(t) >> 8) & 0x00ff00ff) | (((uint32_t)(t) << 8) & 0xff00ff00); \
-  } while (0);
-
-#define BYTE_REV16(t)   \
-  do { \
-    (t) = (((uint16_t)(t) >> 8) & 0x00ff) | (((uint16_t)(t) << 8) & 0xff00); \
-  } while (0);
-#endif
-*/
-
-
 /* Get/set general register value -- watch for r0 on writes.  */
 #define get_iregval(gr)       (m_iregs[(gr)])
 #define set_iregval(gr, val)  (m_iregs[(gr)] = ((gr) == 0 ? 0 : (val)))
@@ -352,7 +337,7 @@
 	   the BE bit), we need to adjust the instruction below on MSB hosts.  */
 	w1 = m_program->read_dword(phys_pc);
 #ifdef HOST_MSB
-	BYTE_REV32 (w1);
+	w1 = swapendian_int32(w1);
 #endif /* HOST_MSB.  */
 	return w1;
 }
@@ -390,7 +375,7 @@
 	pg_dir_entry_a = dtb | (vdir << 2);
 	pg_dir_entry = m_program->read_dword(pg_dir_entry_a);
 #ifdef HOST_MSB
-	BYTE_REV32 (pg_dir_entry);
+	pg_dir_entry = swapendian_int32(pg_dir_entry);
 #endif
 
 	/* Check for non-present PDE.  */
@@ -438,7 +423,7 @@
 	pg_tbl_entry_a = pfa1 | (vpage << 2);
 	pg_tbl_entry = m_program->read_dword(pg_tbl_entry_a);
 #ifdef HOST_MSB
-	BYTE_REV32 (pg_tbl_entry);
+	pg_tbl_entry = swapendian_int32(pg_tbl_entry);
 #endif
 
 	/* Check for non-present PTE.  */
@@ -483,8 +468,8 @@
 	ttpde = pg_dir_entry | 0x20;
 	ttpte = pg_tbl_entry | 0x20;
 #ifdef HOST_MSB
-	BYTE_REV32 (ttpde);
-	BYTE_REV32 (ttpte);
+	ttpde = swapendian_int32(ttpde);
+	ttpte = swapendian_int32(ttpte);
 #endif
 	m_program->write_dword(pg_dir_entry_a, ttpde);
 	m_program->write_dword(pg_tbl_entry_a, ttpte);
@@ -555,7 +540,7 @@
 	{
 		uint32_t ret = m_program->read_word(addr);
 #ifdef HOST_MSB
-		BYTE_REV16 (ret);
+		ret = swapendian_int16(ret);
 #endif
 		return ret & 0xffff;
 	}
@@ -563,7 +548,7 @@
 	{
 		uint32_t ret = m_program->read_dword(addr);
 #ifdef HOST_MSB
-		BYTE_REV32 (ret);
+		ret = swapendian_int32(ret);
 #endif
 		return ret;
 	}
@@ -615,14 +600,14 @@
 	else if (size == 2)
 	{
 #ifdef HOST_MSB
-		BYTE_REV16 (data);
+		data = swapendian_int16(data);
 #endif
 		m_program->write_word(addr, data);
 	}
 	else if (size == 4)
 	{
 #ifdef HOST_MSB
-		BYTE_REV32 (data);
+		data = swapendian_int32(data);
 #endif
 		m_program->write_dword(addr, data);
 	}
@@ -4523,7 +4508,7 @@
 		fprintf (stderr, "  (%s) 0x%08x: ", m_device->tag(), addr);
 		insn = m_program->read_dword(phys_addr);
 #ifdef HOST_MSB
-		BYTE_REV32 (insn);
+		insn = swapendian_int32(insn);
 #endif /* HOST_MSB.  */
 		disasm_i860 (buf, addr, insn); fprintf (stderr, "%s", buf);
 		fprintf (stderr, "\n");
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/m6502.cpp mame-0.224+dfsg.1/src/devices/cpu/m6502/m6502.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/m6502.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/m6502.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -31,7 +31,7 @@
 	sync_w(*this),
 	program_config("program", ENDIANNESS_LITTLE, 8, 16),
 	sprogram_config("decrypted_opcodes", ENDIANNESS_LITTLE, 8, 16), PPC(0), NPC(0), PC(0), SP(0), TMP(0), TMP2(0), A(0), X(0), Y(0), P(0), IR(0), inst_state_base(0), mintf(nullptr),
-	inst_state(0), inst_substate(0), icount(0), nmi_state(false), irq_state(false), apu_irq_state(false), v_state(false), irq_taken(false), sync(false), inhibit_interrupts(false)
+	inst_state(0), inst_substate(0), icount(0), nmi_state(false), irq_state(false), apu_irq_state(false), v_state(false), nmi_pending(false), irq_taken(false), sync(false), inhibit_interrupts(false)
 {
 }
 
@@ -82,10 +82,11 @@
 	save_item(NAME(irq_state));
 	save_item(NAME(apu_irq_state));
 	save_item(NAME(v_state));
+	save_item(NAME(nmi_pending));
+	save_item(NAME(irq_taken));
 	save_item(NAME(inst_state));
 	save_item(NAME(inst_substate));
 	save_item(NAME(inst_state_base));
-	save_item(NAME(irq_taken));
 	save_item(NAME(inhibit_interrupts));
 
 	set_icountptr(icount);
@@ -103,8 +104,9 @@
 	nmi_state = false;
 	irq_state = false;
 	apu_irq_state = false;
-	irq_taken = false;
 	v_state = false;
+	nmi_pending = false;
+	irq_taken = false;
 	inst_state = STATE_RESET;
 	inst_substate = 0;
 	inst_state_base = 0;
@@ -118,11 +120,12 @@
 	inst_state = STATE_RESET;
 	inst_substate = 0;
 	inst_state_base = 0;
-	nmi_state = false;
 	irq_state = false;
+	nmi_state = false;
 	apu_irq_state = false;
-	irq_taken = false;
 	v_state = false;
+	nmi_pending = false;
+	irq_taken = false;
 	sync = false;
 	sync_w(CLEAR_LINE);
 	inhibit_interrupts = false;
@@ -410,7 +413,11 @@
 	switch(inputnum) {
 	case IRQ_LINE: irq_state = state == ASSERT_LINE; break;
 	case APU_IRQ_LINE: apu_irq_state = state == ASSERT_LINE; break;
-	case NMI_LINE: nmi_state = nmi_state || (state == ASSERT_LINE); break;
+	case NMI_LINE:
+		if(!nmi_state && state == ASSERT_LINE)
+			nmi_pending = true;
+		nmi_state = state == ASSERT_LINE;
+		break;
 	case V_LINE:
 		if(!v_state && state == ASSERT_LINE)
 			P |= F_V;
@@ -484,7 +491,7 @@
 	sync = false;
 	sync_w(CLEAR_LINE);
 
-	if((nmi_state || ((irq_state || apu_irq_state) && !(P & F_I))) && !inhibit_interrupts) {
+	if((nmi_pending || ((irq_state || apu_irq_state) && !(P & F_I))) && !inhibit_interrupts) {
 		irq_taken = true;
 		IR = 0x00;
 	} else
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/m6502.h mame-0.224+dfsg.1/src/devices/cpu/m6502/m6502.h
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/m6502.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/m6502.h	2020-08-26 08:57:19.000000000 +0000
@@ -122,7 +122,7 @@
 	int inst_state, inst_substate;
 	int icount, bcount, count_before_instruction_step;
 	bool nmi_state, irq_state, apu_irq_state, v_state;
-	bool irq_taken, sync, inhibit_interrupts;
+	bool nmi_pending, irq_taken, sync, inhibit_interrupts;
 
 	uint8_t read(uint16_t adr) { return mintf->read(adr); }
 	uint8_t read_9(uint16_t adr) { return mintf->read_9(adr); }
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/m740.cpp mame-0.224+dfsg.1/src/devices/cpu/m6502/m740.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/m740.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/m740.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -52,6 +52,7 @@
 	m_irq_vector = 0xfffc;
 	apu_irq_state = false;
 	irq_taken = false;
+	nmi_pending = false;
 	v_state = false;
 	sync = false;
 	inhibit_interrupts = false;
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/odeco16.lst mame-0.224+dfsg.1/src/devices/cpu/m6502/odeco16.lst
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/odeco16.lst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/odeco16.lst	2020-08-26 08:57:19.000000000 +0000
@@ -2,7 +2,7 @@
 # copyright-holders:Olivier Galibert
 # deco 16 opcodes
 brk_16_imp
-	// The 6502 bug when a nmi occurs in a brk is reproduced (case !irq_taken && nmi_state)
+	// The 6502 bug when a nmi occurs in a brk is reproduced (case !irq_taken && nmi_pending)
 	if(irq_taken) {
 		read_pc_noinc();
 	} else {
@@ -14,10 +14,10 @@
 	dec_SP();
 	write(SP, irq_taken ? P & ~F_B : P);
 	dec_SP();
-	if(nmi_state) {
+	if(nmi_pending) {
 		PC = read_arg(0xfff7);
 		PC = set_h(PC, read_arg(0xfff6));
-		nmi_state = false;
+		nmi_pending = false;
 		standard_irq_callback(NMI_LINE);
 	} else {
 		PC = read_arg(0xfff3);
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/om6502.lst mame-0.224+dfsg.1/src/devices/cpu/m6502/om6502.lst
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/om6502.lst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/om6502.lst	2020-08-26 08:57:19.000000000 +0000
@@ -259,7 +259,7 @@
 	prefetch();
 
 brk_imp
-	// The 6502 bug when a nmi occurs in a brk is reproduced (case !irq_taken && nmi_state)
+	// The 6502 bug when a nmi occurs in a brk is reproduced (case !irq_taken && nmi_pending)
 	if(irq_taken) {
 		read_pc_noinc();
 	} else {
@@ -271,10 +271,10 @@
 	dec_SP();
 	write(SP, irq_taken ? P & ~F_B : P);
 	dec_SP();
-	if(nmi_state) {
+	if(nmi_pending) {
 		PC = read_arg(0xfffa);
 		PC = set_h(PC, read_arg(0xfffb));
-		nmi_state = false;
+		nmi_pending = false;
 		standard_irq_callback(NMI_LINE);
 	} else {
 		PC = read_arg(0xfffe);
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/om65c02.lst mame-0.224+dfsg.1/src/devices/cpu/m6502/om65c02.lst
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/om65c02.lst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/om65c02.lst	2020-08-26 08:57:19.000000000 +0000
@@ -220,7 +220,7 @@
 	prefetch();
 
 brk_c_imp
-	if(irq_taken || nmi_state) {
+	if(irq_taken || nmi_pending) {
 		read_pc_noinc();
 	} else {
 		read_pc();
@@ -229,12 +229,12 @@
 	dec_SP();
 	write(SP, PC);
 	dec_SP();
-	write(SP, irq_taken || nmi_state ? P & ~F_B : P);
+	write(SP, irq_taken || nmi_pending ? P & ~F_B : P);
 	dec_SP();
-	if(irq_taken && nmi_state) {
+	if(irq_taken && nmi_pending) {
 		PC = read_arg(0xfffa);
 		PC = set_h(PC, read_arg(0xfffb));
-		nmi_state = false;
+		nmi_pending = false;
 		standard_irq_callback(NMI_LINE);
 	} else {
 		PC = read_arg(0xfffe);
@@ -766,7 +766,7 @@
 wai_imp
 	read_pc_noinc();
 	read_pc_noinc();
-	while(!nmi_state && !irq_state) {
+	while(!nmi_pending && !irq_state) {
 		eat-all-cycles;
 	}
 	prefetch();
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/om65ce02.lst mame-0.224+dfsg.1/src/devices/cpu/m6502/om65ce02.lst
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/om65ce02.lst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/om65ce02.lst	2020-08-26 08:57:19.000000000 +0000
@@ -359,12 +359,12 @@
 	dec_SP_ce();
 	write(SP, PC);
 	dec_SP_ce();
-	write(SP, irq_taken || nmi_state ? P & ~F_B : P);
+	write(SP, irq_taken || nmi_pending ? P & ~F_B : P);
 	dec_SP_ce();
-	if(nmi_state) {
+	if(nmi_pending) {
 		PC = read_arg(0xfffa);
 		PC = set_h(PC, read_arg(0xfffb));
-		nmi_state = false;
+		nmi_pending = false;
 	} else {
 		PC = read_arg(0xfffe);
 		PC = set_h(PC, read_arg(0xffff));
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/om740.lst mame-0.224+dfsg.1/src/devices/cpu/m6502/om740.lst
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/om740.lst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/om740.lst	2020-08-26 08:57:19.000000000 +0000
@@ -120,7 +120,7 @@
 	inst_state = -1;
 
 brk740_imp
-	// The 6502 bug when a nmi occurs in a brk is reproduced (case !irq_taken && nmi_state)
+	// The 6502 bug when a nmi occurs in a brk is reproduced (case !irq_taken && nmi_pending)
 	if(irq_taken) {
 		read_pc_noinc();
 	} else {
@@ -132,10 +132,10 @@
 	dec_SP();
 	write(SP, irq_taken ? P & ~F_B : P);
 	dec_SP();
-	if(nmi_state) {
+	if(nmi_pending) {
 		PC = read_arg(0xfffa);
 		PC = set_h(PC, read_arg(0xfffb));
-		nmi_state = false;
+		nmi_pending = false;
 		standard_irq_callback(NMI_LINE);
 	} else {
 		PC = read_arg(m_irq_vector);
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/or65c19.lst mame-0.224+dfsg.1/src/devices/cpu/m6502/or65c19.lst
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/or65c19.lst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/or65c19.lst	2020-08-26 08:57:19.000000000 +0000
@@ -95,7 +95,7 @@
 	prefetch();
 
 brk_r_imp
-	if(irq_taken || nmi_state) {
+	if(irq_taken || nmi_pending) {
 		read_pc_noinc();
 	} else {
 		read_pc();
@@ -104,12 +104,12 @@
 	dec_SP();
 	write(SP, PC);
 	dec_SP();
-	write(SP, irq_taken || nmi_state ? P & ~F_B : P);
+	write(SP, irq_taken || nmi_pending ? P & ~F_B : P);
 	dec_SP();
-	if(irq_taken && nmi_state) {
+	if(irq_taken && nmi_pending) {
 		PC = read_arg(0xfffc);
 		PC = set_h(PC, read_arg(0xfffd));
-		nmi_state = false;
+		nmi_pending = false;
 		standard_irq_callback(NMI_LINE);
 	} else {
 		TMP = get_irq_vector();
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/ost2xxx.lst mame-0.224+dfsg.1/src/devices/cpu/m6502/ost2xxx.lst
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/ost2xxx.lst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/ost2xxx.lst	2020-08-26 08:57:19.000000000 +0000
@@ -3,7 +3,7 @@
 # m65c02 opcodes, with a twist
 
 brk_st_imp
-	if(irq_taken || nmi_state) {
+	if(irq_taken || nmi_pending) {
 		read_pc_noinc();
 	} else {
 		read_pc();
@@ -12,13 +12,13 @@
 	dec_SP();
 	write(SP, PC);
 	dec_SP();
-	write(SP, irq_taken || nmi_state ? P & ~F_B : P);
+	write(SP, irq_taken || nmi_pending ? P & ~F_B : P);
 	dec_SP();
 	set_irq_service(true);
-	if(irq_taken && nmi_state) { // NMI is not present on actual parts
+	if(irq_taken && nmi_pending) { // NMI is not present on actual parts
 		PC = read_vector(0x7ffa);
 		PC = set_h(PC, read_vector(0x7ffb));
-		nmi_state = false;
+		nmi_pending = false;
 	} else if(irq_taken) {
 		TMP = acknowledge_irq();
 		PC = read_vector(0x7ff8 - (TMP << 1));
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/oxavix2000.lst mame-0.224+dfsg.1/src/devices/cpu/m6502/oxavix2000.lst
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/oxavix2000.lst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/oxavix2000.lst	2020-08-26 08:57:19.000000000 +0000
@@ -355,8 +355,8 @@
 	prefetch();
 
 cmppa_imp
-	fatalerror("unhandled opcode %02x%04x: %02x\n", m_codebank, PPC, inst_state);
-	read_pc_noinc();
+	TMP = read_full_data(m_pa);
+	do_cmp(A, TMP);
 	prefetch();
 
 sbcpa_imp
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/oxavix.lst mame-0.224+dfsg.1/src/devices/cpu/m6502/oxavix.lst
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/oxavix.lst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/oxavix.lst	2020-08-26 08:57:19.000000000 +0000
@@ -40,8 +40,8 @@
 	prefetch();
 
 brk_xav_imp
-	// there is code in soem games to indicate this doesn't always push the far bank to the stack..
-	// The 6502 bug when a nmi occurs in a brk is reproduced (case !irq_taken && nmi_state)
+	// there is code in some games to indicate this doesn't always push the far bank to the stack..
+	// The 6502 bug when a nmi occurs in a brk is reproduced (case !irq_taken && nmi_pending)
 	if(irq_taken) {
 		read_pc_noinc();
 	} else {
@@ -56,7 +56,7 @@
 	dec_SP();
 	write_stack(SP, irq_taken ? P & ~F_B : P);
 	dec_SP();
-	if(nmi_state) {
+	if(nmi_pending) {
 		if (m_vector_callback.isnull())
 		{
 			PC = read_arg(0xfffa);
@@ -76,7 +76,7 @@
 			}
 		}
 
-		nmi_state = false;
+		nmi_pending = false;
 		standard_irq_callback(NMI_LINE);
 	} else {
 		if (m_vector_callback.isnull())
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/st2204.cpp mame-0.224+dfsg.1/src/devices/cpu/m6502/st2204.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/st2204.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/st2204.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -29,7 +29,7 @@
     by TSMC, and ST2204B, fabricated by Hyundai. A PDF document
     describing the differences between these two was once available.
 
-    Reverse-engineered documentation for SS2204's internal registers:
+    Reverse-engineered documentation for ST2204's internal registers:
     http://blog.kevtris.org/blogfiles/Game%20King%20Inside.txt
 
 **********************************************************************/
@@ -42,12 +42,16 @@
 
 st2204_device::st2204_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor map)
 	: st2xxx_device(mconfig, type, tag, owner, clock, map, 26, false) // logical; only 23 address lines are brought out
+	, m_dac_callback(*this)
 	, m_tmode{0}
 	, m_tcntr{0}
 	, m_tload{0}
 	, m_timer{0}
 	, m_psg{0}
 	, m_psgc(0)
+	, m_vol(0)
+	, m_dac(0)
+	, m_psg_timer(nullptr)
 	, m_dms(0)
 	, m_dmd(0)
 	, m_dcnth(0)
@@ -64,6 +68,13 @@
 {
 }
 
+void st2204_device::device_resolve_objects()
+{
+	st2xxx_device::device_resolve_objects();
+
+	m_dac_callback.resolve_safe();
+}
+
 void st2204_device::device_start()
 {
 	std::unique_ptr<mi_st2204> intf = std::make_unique<mi_st2204>();
@@ -82,12 +93,15 @@
 
 	m_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(st2204_device::t0_interrupt), this));
 	m_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(st2204_device::t1_interrupt), this));
+	m_psg_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(st2204_device::psg_interrupt), this));
 
 	save_item(NAME(m_tmode));
 	save_item(NAME(m_tcntr));
 	save_item(NAME(m_tload));
 	save_item(NAME(m_psg));
 	save_item(NAME(m_psgc));
+	save_item(NAME(m_vol));
+	save_item(NAME(m_dac));
 	save_item(NAME(m_dms));
 	save_item(NAME(m_dmd));
 	save_item(NAME(m_dcnth));
@@ -123,6 +137,8 @@
 	state_add(ST_PSG0, "PSG0", m_psg[0]).mask(0xfff);
 	state_add(ST_PSG1, "PSG1", m_psg[1]).mask(0xfff);
 	state_add(ST_PSGC, "PSGC", m_psgc).mask(0x7f);
+	state_add(ST_VOL, "VOL", m_vol);
+	state_add(ST_DAC, "DAC", m_dac);
 	state_add<u8>(ST_SYS, "SYS", [this]() { return m_sys; }, [this](u8 data) { sys_w(data); });
 	state_add(ST_MISC, "MISC", m_misc).mask(st2xxx_misc_mask());
 	state_add(ST_LSSA, "LSSA", m_lssa);
@@ -155,6 +171,10 @@
 
 	m_psg[0] = m_psg[1] = 0;
 	m_psgc = 0;
+	m_vol = 0;
+	m_dac = 0;
+	m_psg_timer->enable(false);
+	m_dac_callback(0);
 }
 
 const char *st2204_device::st2xxx_irq_name(int i) const
@@ -403,6 +423,41 @@
 	}
 }
 
+TIMER_CALLBACK_MEMBER(st2204_device::psg_interrupt)
+{
+	m_ireq |= 0x002;
+	update_irq_state();
+
+	psg_timer_reload();
+}
+
+void st2204_device::psg_timer_reload()
+{
+	unsigned count;
+	if (BIT(m_psgc, 0))
+		count = (0x40 - BIT(m_psg[1], 6, 6)) * (0x40 - BIT(m_psg[1], 0, 6)) * 64;
+	else if ((m_psgc & 0x0d) == 0x04)
+		count = 0x1000 - m_psg[1];
+	else
+		return;
+
+	if ((m_psgc & 0x70) == 0x40)
+		m_psg_timer->adjust(cycles_to_attotime(count));
+	else if ((m_psgc & 0x70) == 0x70)
+		m_psg_timer->adjust(attotime::from_ticks(count, 32768));
+	else
+		m_psg_timer->adjust(cycles_to_attotime(count << (BIT(m_psgc, 4, 2) + 1)));
+}
+
+u8 st2204_device::psg_r(offs_t offset)
+{
+	// TODO: instantaneous upcount value
+	if (BIT(offset, 0))
+		return (m_psg[offset >> 1] >> 8) | 0xf0;
+	else
+		return m_psg[offset >> 1] & 0x0ff;
+}
+
 void st2204_device::psg_w(offs_t offset, u8 data)
 {
 	if (BIT(offset, 0))
@@ -411,14 +466,39 @@
 		m_psg[offset >> 1] = data | (m_psg[offset >> 1] & 0xf00);
 }
 
+u8 st2204_device::psgc_r()
+{
+	return m_psgc | 0x80;
+}
+
 void st2204_device::psgc_w(u8 data)
 {
 	m_psgc = data & 0x7f;
+
+	if (!m_psg_timer->enabled())
+		psg_timer_reload();
+}
+
+u8 st2204_device::vol_r()
+{
+	return m_vol;
+}
+
+void st2204_device::vol_w(u8 data)
+{
+	m_vol = data;
+}
+
+u8 st2204_device::dac_r()
+{
+	return m_dac;
 }
 
 void st2204_device::dac_w(u8 data)
 {
-	// TODO
+	// TODO: emulate PSG/PWM more accurately within device
+	m_dac_callback(data);
+	m_dac = data;
 }
 
 unsigned st2204_device::st2xxx_lfr_clocks() const
@@ -533,6 +613,7 @@
 	map(0x0010, 0x0013).w(FUNC(st2204_device::psg_w));
 	map(0x0014, 0x0014).w(FUNC(st2204_device::dac_w));
 	map(0x0016, 0x0016).w(FUNC(st2204_device::psgc_w));
+	map(0x0017, 0x0017).w(FUNC(st2204_device::vol_w));
 	map(0x0020, 0x0020).rw(FUNC(st2204_device::bten_r), FUNC(st2204_device::bten_w));
 	map(0x0021, 0x0021).rw(FUNC(st2204_device::btsr_r), FUNC(st2204_device::btclr_all_w));
 	map(0x0023, 0x0023).rw(FUNC(st2204_device::prs_r), FUNC(st2204_device::prs_w));
@@ -589,6 +670,11 @@
 void st2204_device::int_map(address_map &map)
 {
 	common_map(map);
+	// PSG registers may or may not be readable on ST2202, but are readable here
+	map(0x0010, 0x0013).r(FUNC(st2204_device::psg_r));
+	map(0x0014, 0x0014).r(FUNC(st2204_device::dac_r));
+	map(0x0016, 0x0016).r(FUNC(st2204_device::psgc_r));
+	map(0x0017, 0x0017).r(FUNC(st2204_device::vol_r));
 	// Source/destination registers are supposedly not readable on ST2202, but may be readable here (count register isn't)
 	map(0x0028, 0x0028).r(FUNC(st2204_device::dmsl_r));
 	map(0x0029, 0x0029).r(FUNC(st2204_device::dmsh_r));
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/st2204.h mame-0.224+dfsg.1/src/devices/cpu/m6502/st2204.h
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/st2204.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/st2204.h	2020-08-26 08:57:19.000000000 +0000
@@ -24,15 +24,20 @@
 		ST_T1C,
 		ST_PSG0,
 		ST_PSG1,
+		ST_VOL,
+		ST_DAC,
 		ST_DMS,
 		ST_DMD
 	};
 
 	st2204_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
 
+	auto dac_callback() { return m_dac_callback.bind(); }
+
 protected:
 	st2204_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor int_map);
 
+	virtual void device_resolve_objects() override;
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
@@ -85,8 +90,15 @@
 	void t1m_w(u8 data);
 	u8 t1c_r();
 	void t1c_w(u8 data);
+	TIMER_CALLBACK_MEMBER(psg_interrupt);
+	void psg_timer_reload();
+	u8 psg_r(offs_t offset);
 	void psg_w(offs_t offset, u8 data);
+	u8 psgc_r();
 	void psgc_w(u8 data);
+	u8 vol_r();
+	void vol_w(u8 data);
+	u8 dac_r();
 	void dac_w(u8 data);
 	u8 dmsl_r();
 	void dmsl_w(u8 data);
@@ -106,12 +118,17 @@
 
 	void int_map(address_map &map);
 
+	devcb_write8 m_dac_callback;
+
 	u8 m_tmode[2];
 	u8 m_tcntr[2];
 	u8 m_tload[2];
 	emu_timer *m_timer[2];
 	u16 m_psg[2];
 	u8 m_psgc;
+	u8 m_vol;
+	u8 m_dac;
+	emu_timer *m_psg_timer;
 	u16 m_dms;
 	u16 m_dmd;
 	u8 m_dcnth;
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6502/xavix2000.cpp mame-0.224+dfsg.1/src/devices/cpu/m6502/xavix2000.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/m6502/xavix2000.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6502/xavix2000.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -60,10 +60,10 @@
 {
 	xavix_device::device_start();
 
-	state_add(SXAVIX_J, "J", m_j).callimport().formatstr("%8s");;
-	state_add(SXAVIX_K, "K", m_k).callimport().formatstr("%8s");;
-	state_add(SXAVIX_L, "L", m_l).callimport().formatstr("%8s");;
-	state_add(SXAVIX_M, "M", m_m).callimport().formatstr("%8s");;
+	state_add(SXAVIX_J, "J", m_j).callimport().formatstr("%8s");
+	state_add(SXAVIX_K, "K", m_k).callimport().formatstr("%8s");
+	state_add(SXAVIX_L, "L", m_l).callimport().formatstr("%8s");
+	state_add(SXAVIX_M, "M", m_m).callimport().formatstr("%8s");
 	state_add(SXAVIX_PA, "PA", m_pa).callimport().formatstr("%8s");
 	state_add(SXAVIX_PB, "PB", m_pb).callimport().formatstr("%8s");
 }
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m68000/m68kfpu.hxx mame-0.224+dfsg.1/src/devices/cpu/m68000/m68kfpu.hxx
--- mame-0.222+dfsg.1/src/devices/cpu/m68000/m68kfpu.hxx	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m68000/m68kfpu.hxx	2020-08-26 08:57:19.000000000 +0000
@@ -1514,8 +1514,11 @@
 		}
 		case 0x25:      // FREM
 		{
+			s8 const mode = float_rounding_mode;
+			float_rounding_mode = float_round_nearest_even;
 			m_fpr[dst] = floatx80_rem(m_fpr[dst], source);
 			SET_CONDITION_CODES(m_fpr[dst]);
+			float_rounding_mode = mode;
 			m_icount -= 43;   // guess
 			break;
 		}
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6805/m68hc05.cpp mame-0.224+dfsg.1/src/devices/cpu/m6805/m68hc05.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/m6805/m68hc05.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6805/m68hc05.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -478,7 +478,7 @@
 	save_item(NAME(m_counter));
 	save_item(NAME(m_icr));
 	save_item(NAME(m_ocr));
-	save_item(NAME(m_inhibit_cap));;
+	save_item(NAME(m_inhibit_cap));
 	save_item(NAME(m_inhibit_cmp));
 	save_item(NAME(m_trl_buf));
 	save_item(NAME(m_trl_latched));
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6809/base6x09.ops mame-0.224+dfsg.1/src/devices/cpu/m6809/base6x09.ops
--- mame-0.222+dfsg.1/src/devices/cpu/m6809/base6x09.ops	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6809/base6x09.ops	2020-08-26 08:57:19.000000000 +0000
@@ -82,7 +82,7 @@
 
 ASR8:
 	@m_temp.b.l = read_operand();
-	m_cc &= ~CC_NZC;
+	m_cc &= ~CC_C;
 	m_cc |= (m_temp.b.l & 1) ? CC_C : 0;
 	m_temp.b.l = set_flags<uint8_t>(CC_NZ, ((int8_t) m_temp.b.l) >> 1);
 	@eat(hd6309_native_mode() ? 0 : 1);
@@ -168,7 +168,7 @@
 ASR16:
 	@m_temp.b.h = read_operand(0);
 	@m_temp.b.l = read_operand(1);
-	m_cc &= ~CC_NZC;
+	m_cc &= ~CC_C;
 	m_cc |= (m_temp.w & 1) ? CC_C : 0;
 	m_temp.w = set_flags<uint16_t>(CC_NZ, ((int16_t) m_temp.w) >> 1);
 	@eat(hd6309_native_mode() ? 0 : 1);
@@ -504,6 +504,7 @@
 	// doesn't use SOFTWARE_INTERRUPT label because SWI will
 	// inhibit IRQ/FIRQ
 	set_ea(VECTOR_SWI);
+	standard_irq_callback(M6809_SWI);
 	m_cc |= CC_E;
 	set_regop16(m_s);
 	m_temp.w = entire_state_registers();
@@ -513,10 +514,12 @@
 
 SWI2:
 	set_ea(VECTOR_SWI2);
+	standard_irq_callback(M6809_SWI);
 	goto SOFTWARE_INTERRUPT;
 
 SWI3:
 	set_ea(VECTOR_SWI3);
+	standard_irq_callback(M6809_SWI);
 	goto SOFTWARE_INTERRUPT;
 
 SOFTWARE_INTERRUPT:
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6809/m6809.cpp mame-0.224+dfsg.1/src/devices/cpu/m6809/m6809.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/m6809/m6809.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6809/m6809.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -616,7 +616,7 @@
 //-------------------------------------------------
 
 mc6809e_device::mc6809e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-		: m6809_base_device(mconfig, tag, owner, clock, MC6809E, 1)
+	: m6809_base_device(mconfig, tag, owner, clock, MC6809E, 1)
 {
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/m6809/m6809.h mame-0.224+dfsg.1/src/devices/cpu/m6809/m6809.h
--- mame-0.222+dfsg.1/src/devices/cpu/m6809/m6809.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/m6809/m6809.h	2020-08-26 08:57:19.000000000 +0000
@@ -332,5 +332,6 @@
 
 #define M6809_IRQ_LINE  0   /* IRQ line number */
 #define M6809_FIRQ_LINE 1   /* FIRQ line number */
+#define M6809_SWI       2   /* Virtual SWI line to be used during SWI acknowledge cycle */
 
 #endif // MAME_CPU_M6809_M6809_H
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/mcs48/mcs48.cpp mame-0.224+dfsg.1/src/devices/cpu/mcs48/mcs48.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/mcs48/mcs48.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/mcs48/mcs48.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,37 +1,24 @@
 // license:BSD-3-Clause
 // copyright-holders:Mirko Buffoni
-/*
-    TODO:
-    - EA pin - defined by architecture, must implement:
-      1 means external access, bypassing internal ROM
-      reimplement as a push, not a pull
-    - add CMOS devices, 1 new opcode (01 IDL)
-    - add special 8022 opcodes (RAD, SEL AN0, SEL AN1, RETI)
-    - make timer update cleaner:
-      timer is updated on S4 while I/O happens on S5
-      due to very bad coding, Kaypro 10 keyboard depends on being able to see T=0 before interrupt is taken
-      right now this is implemented with a hack in the mov_a_t handler
-      in theory it should also be possible to see the timer flag before the interrupt is taken
-      mov_t_a should also update the T register after it's incremented
-    - IRQ timing is similarly hacked due to WY-100 needing to take JNI branch before servicing interrupt
-*/
-
 /***************************************************************************
 
-    mcs48.c
-
     Intel MCS-48/UPI-41 Portable Emulator
 
     Copyright Mirko Buffoni
     Based on the original work Copyright Dan Boris, an 8048 emulator
 
+    TODO:
+    - EA pin - defined by architecture, must implement:
+      1 means external access, bypassing internal ROM
+      reimplement as a push, not a pull
+    - add CMOS devices, 1 new opcode (01 IDL)
+    - add special 8022 opcodes (RAD, SEL AN0, SEL AN1, RETI)
+
 ****************************************************************************
 
     Note that the default internal divisor for this chip is by 3 and
     then again by 5, or by 15 total.
 
-****************************************************************************
-
     Chip   RAM  ROM  I/O
     ----   ---  ---  ---
     8021    64   1k   21  (ROM, reduced instruction set)
@@ -429,7 +416,7 @@
 	uint8_t sp = m_psw & 0x07;
 	ram_w(8 + 2*sp, m_pc);
 	ram_w(9 + 2*sp, ((m_pc >> 8) & 0x0f) | (m_psw & 0xf0));
-	m_psw = (m_psw & 0xf8) | ((sp + 1) & 0x07);
+	m_psw = (m_psw & 0xf0) | ((sp + 1) & 0x07);
 }
 
 
@@ -443,7 +430,7 @@
 	uint8_t sp = (m_psw - 1) & 0x07;
 	m_pc = ram_r(8 + 2*sp);
 	m_pc |= ram_r(9 + 2*sp) << 8;
-	m_psw = ((m_pc >> 8) & 0xf0) | 0x08 | sp;
+	m_psw = ((m_pc >> 8) & 0xf0) | sp;
 	m_pc &= 0xfff;
 	update_regptr();
 }
@@ -460,7 +447,7 @@
 	m_pc = ram_r(8 + 2*sp);
 	m_pc |= ram_r(9 + 2*sp) << 8;
 	m_pc &= 0xfff;
-	m_psw = (m_psw & 0xf0) | 0x08 | sp;
+	m_psw = (m_psw & 0xf0) | sp;
 }
 
 
@@ -530,9 +517,10 @@
 
 void mcs48_cpu_device::execute_jcc(uint8_t result)
 {
+	uint16_t pch = m_pc & 0xf00;
 	uint8_t offset = argument_fetch();
 	if (result != 0)
-		m_pc = ((m_pc - 1) & 0xf00) | offset;
+		m_pc = pch | offset;
 }
 
 
@@ -589,80 +577,82 @@
     OPCODE HANDLERS
 ***************************************************************************/
 
-#define OPHANDLER(_name) int mcs48_cpu_device::_name()
+#define OPHANDLER(_name) void mcs48_cpu_device::_name()
 
 
 OPHANDLER( illegal )
 {
-	logerror("MCS-48 PC:%04X - Illegal opcode = %02x\n", m_pc - 1, program_r(m_pc - 1));
-	return 1;
+	burn_cycles(1);
+	logerror("MCS-48 PC:%04X - Illegal opcode = %02x\n", m_prevpc, program_r(m_prevpc));
 }
 
-OPHANDLER( add_a_r0 )       { execute_add(R0); return 1; }
-OPHANDLER( add_a_r1 )       { execute_add(R1); return 1; }
-OPHANDLER( add_a_r2 )       { execute_add(R2); return 1; }
-OPHANDLER( add_a_r3 )       { execute_add(R3); return 1; }
-OPHANDLER( add_a_r4 )       { execute_add(R4); return 1; }
-OPHANDLER( add_a_r5 )       { execute_add(R5); return 1; }
-OPHANDLER( add_a_r6 )       { execute_add(R6); return 1; }
-OPHANDLER( add_a_r7 )       { execute_add(R7); return 1; }
-OPHANDLER( add_a_xr0 )      { execute_add(ram_r(R0)); return 1; }
-OPHANDLER( add_a_xr1 )      { execute_add(ram_r(R1)); return 1; }
-OPHANDLER( add_a_n )        { execute_add(argument_fetch()); return 2; }
-
-OPHANDLER( adc_a_r0 )       { execute_addc(R0); return 1; }
-OPHANDLER( adc_a_r1 )       { execute_addc(R1); return 1; }
-OPHANDLER( adc_a_r2 )       { execute_addc(R2); return 1; }
-OPHANDLER( adc_a_r3 )       { execute_addc(R3); return 1; }
-OPHANDLER( adc_a_r4 )       { execute_addc(R4); return 1; }
-OPHANDLER( adc_a_r5 )       { execute_addc(R5); return 1; }
-OPHANDLER( adc_a_r6 )       { execute_addc(R6); return 1; }
-OPHANDLER( adc_a_r7 )       { execute_addc(R7); return 1; }
-OPHANDLER( adc_a_xr0 )      { execute_addc(ram_r(R0)); return 1; }
-OPHANDLER( adc_a_xr1 )      { execute_addc(ram_r(R1)); return 1; }
-OPHANDLER( adc_a_n )        { execute_addc(argument_fetch()); return 2; }
-
-OPHANDLER( anl_a_r0 )       { m_a &= R0; return 1; }
-OPHANDLER( anl_a_r1 )       { m_a &= R1; return 1; }
-OPHANDLER( anl_a_r2 )       { m_a &= R2; return 1; }
-OPHANDLER( anl_a_r3 )       { m_a &= R3; return 1; }
-OPHANDLER( anl_a_r4 )       { m_a &= R4; return 1; }
-OPHANDLER( anl_a_r5 )       { m_a &= R5; return 1; }
-OPHANDLER( anl_a_r6 )       { m_a &= R6; return 1; }
-OPHANDLER( anl_a_r7 )       { m_a &= R7; return 1; }
-OPHANDLER( anl_a_xr0 )      { m_a &= ram_r(R0); return 1; }
-OPHANDLER( anl_a_xr1 )      { m_a &= ram_r(R1); return 1; }
-OPHANDLER( anl_a_n )        { m_a &= argument_fetch(); return 2; }
-
-OPHANDLER( anl_bus_n )      { bus_w(bus_r() & argument_fetch()); return 2; }
-OPHANDLER( anl_p1_n )       { port_w(1, m_p1 &= argument_fetch()); return 2; }
-OPHANDLER( anl_p2_n )       { port_w(2, m_p2 &= argument_fetch() | ~p2_mask()); return 2; }
-OPHANDLER( anld_p4_a )      { expander_operation(EXPANDER_OP_AND, 4); return 2; }
-OPHANDLER( anld_p5_a )      { expander_operation(EXPANDER_OP_AND, 5); return 2; }
-OPHANDLER( anld_p6_a )      { expander_operation(EXPANDER_OP_AND, 6); return 2; }
-OPHANDLER( anld_p7_a )      { expander_operation(EXPANDER_OP_AND, 7); return 2; }
-
-OPHANDLER( call_0 )         { execute_call(argument_fetch() | 0x000); return 2; }
-OPHANDLER( call_1 )         { execute_call(argument_fetch() | 0x100); return 2; }
-OPHANDLER( call_2 )         { execute_call(argument_fetch() | 0x200); return 2; }
-OPHANDLER( call_3 )         { execute_call(argument_fetch() | 0x300); return 2; }
-OPHANDLER( call_4 )         { execute_call(argument_fetch() | 0x400); return 2; }
-OPHANDLER( call_5 )         { execute_call(argument_fetch() | 0x500); return 2; }
-OPHANDLER( call_6 )         { execute_call(argument_fetch() | 0x600); return 2; }
-OPHANDLER( call_7 )         { execute_call(argument_fetch() | 0x700); return 2; }
-
-OPHANDLER( clr_a )          { m_a = 0; return 1; }
-OPHANDLER( clr_c )          { m_psw &= ~C_FLAG; return 1; }
-OPHANDLER( clr_f0 )         { m_psw &= ~F_FLAG; m_sts &= ~STS_F0; return 1; }
-OPHANDLER( clr_f1 )         { m_sts &= ~STS_F1; return 1; }
-
-OPHANDLER( cpl_a )          { m_a ^= 0xff; return 1; }
-OPHANDLER( cpl_c )          { m_psw ^= C_FLAG; return 1; }
-OPHANDLER( cpl_f0 )         { m_psw ^= F_FLAG; m_sts ^= STS_F0; return 1; }
-OPHANDLER( cpl_f1 )         { m_sts ^= STS_F1; return 1; }
+OPHANDLER( add_a_r0 )       { burn_cycles(1); execute_add(R0); }
+OPHANDLER( add_a_r1 )       { burn_cycles(1); execute_add(R1); }
+OPHANDLER( add_a_r2 )       { burn_cycles(1); execute_add(R2); }
+OPHANDLER( add_a_r3 )       { burn_cycles(1); execute_add(R3); }
+OPHANDLER( add_a_r4 )       { burn_cycles(1); execute_add(R4); }
+OPHANDLER( add_a_r5 )       { burn_cycles(1); execute_add(R5); }
+OPHANDLER( add_a_r6 )       { burn_cycles(1); execute_add(R6); }
+OPHANDLER( add_a_r7 )       { burn_cycles(1); execute_add(R7); }
+OPHANDLER( add_a_xr0 )      { burn_cycles(1); execute_add(ram_r(R0)); }
+OPHANDLER( add_a_xr1 )      { burn_cycles(1); execute_add(ram_r(R1)); }
+OPHANDLER( add_a_n )        { burn_cycles(2); execute_add(argument_fetch()); }
+
+OPHANDLER( adc_a_r0 )       { burn_cycles(1); execute_addc(R0); }
+OPHANDLER( adc_a_r1 )       { burn_cycles(1); execute_addc(R1); }
+OPHANDLER( adc_a_r2 )       { burn_cycles(1); execute_addc(R2); }
+OPHANDLER( adc_a_r3 )       { burn_cycles(1); execute_addc(R3); }
+OPHANDLER( adc_a_r4 )       { burn_cycles(1); execute_addc(R4); }
+OPHANDLER( adc_a_r5 )       { burn_cycles(1); execute_addc(R5); }
+OPHANDLER( adc_a_r6 )       { burn_cycles(1); execute_addc(R6); }
+OPHANDLER( adc_a_r7 )       { burn_cycles(1); execute_addc(R7); }
+OPHANDLER( adc_a_xr0 )      { burn_cycles(1); execute_addc(ram_r(R0)); }
+OPHANDLER( adc_a_xr1 )      { burn_cycles(1); execute_addc(ram_r(R1)); }
+OPHANDLER( adc_a_n )        { burn_cycles(2); execute_addc(argument_fetch()); }
+
+OPHANDLER( anl_a_r0 )       { burn_cycles(1); m_a &= R0; }
+OPHANDLER( anl_a_r1 )       { burn_cycles(1); m_a &= R1; }
+OPHANDLER( anl_a_r2 )       { burn_cycles(1); m_a &= R2; }
+OPHANDLER( anl_a_r3 )       { burn_cycles(1); m_a &= R3; }
+OPHANDLER( anl_a_r4 )       { burn_cycles(1); m_a &= R4; }
+OPHANDLER( anl_a_r5 )       { burn_cycles(1); m_a &= R5; }
+OPHANDLER( anl_a_r6 )       { burn_cycles(1); m_a &= R6; }
+OPHANDLER( anl_a_r7 )       { burn_cycles(1); m_a &= R7; }
+OPHANDLER( anl_a_xr0 )      { burn_cycles(1); m_a &= ram_r(R0); }
+OPHANDLER( anl_a_xr1 )      { burn_cycles(1); m_a &= ram_r(R1); }
+OPHANDLER( anl_a_n )        { burn_cycles(2); m_a &= argument_fetch(); }
+
+OPHANDLER( anl_bus_n )      { burn_cycles(2); bus_w(bus_r() & argument_fetch()); }
+OPHANDLER( anl_p1_n )       { burn_cycles(2); port_w(1, m_p1 &= argument_fetch()); }
+OPHANDLER( anl_p2_n )       { burn_cycles(2); port_w(2, m_p2 &= argument_fetch() | ~p2_mask()); }
+OPHANDLER( anld_p4_a )      { burn_cycles(2); expander_operation(EXPANDER_OP_AND, 4); }
+OPHANDLER( anld_p5_a )      { burn_cycles(2); expander_operation(EXPANDER_OP_AND, 5); }
+OPHANDLER( anld_p6_a )      { burn_cycles(2); expander_operation(EXPANDER_OP_AND, 6); }
+OPHANDLER( anld_p7_a )      { burn_cycles(2); expander_operation(EXPANDER_OP_AND, 7); }
+
+OPHANDLER( call_0 )         { burn_cycles(2); execute_call(argument_fetch() | 0x000); }
+OPHANDLER( call_1 )         { burn_cycles(2); execute_call(argument_fetch() | 0x100); }
+OPHANDLER( call_2 )         { burn_cycles(2); execute_call(argument_fetch() | 0x200); }
+OPHANDLER( call_3 )         { burn_cycles(2); execute_call(argument_fetch() | 0x300); }
+OPHANDLER( call_4 )         { burn_cycles(2); execute_call(argument_fetch() | 0x400); }
+OPHANDLER( call_5 )         { burn_cycles(2); execute_call(argument_fetch() | 0x500); }
+OPHANDLER( call_6 )         { burn_cycles(2); execute_call(argument_fetch() | 0x600); }
+OPHANDLER( call_7 )         { burn_cycles(2); execute_call(argument_fetch() | 0x700); }
+
+OPHANDLER( clr_a )          { burn_cycles(1); m_a = 0; }
+OPHANDLER( clr_c )          { burn_cycles(1); m_psw &= ~C_FLAG; }
+OPHANDLER( clr_f0 )         { burn_cycles(1); m_psw &= ~F_FLAG; m_sts &= ~STS_F0; }
+OPHANDLER( clr_f1 )         { burn_cycles(1); m_sts &= ~STS_F1; }
+
+OPHANDLER( cpl_a )          { burn_cycles(1); m_a ^= 0xff; }
+OPHANDLER( cpl_c )          { burn_cycles(1); m_psw ^= C_FLAG; }
+OPHANDLER( cpl_f0 )         { burn_cycles(1); m_psw ^= F_FLAG; m_sts ^= STS_F0; }
+OPHANDLER( cpl_f1 )         { burn_cycles(1); m_sts ^= STS_F1; }
 
 OPHANDLER( da_a )
 {
+	burn_cycles(1);
+
 	if ((m_a & 0x0f) > 0x09 || (m_psw & A_FLAG))
 	{
 		m_a += 0x06;
@@ -674,52 +664,52 @@
 		m_a += 0x60;
 		m_psw |= C_FLAG;
 	}
-	else
-		m_psw &= ~C_FLAG;
-	return 1;
 }
 
-OPHANDLER( dec_a )          { m_a--; return 1; }
-OPHANDLER( dec_r0 )         { R0--; return 1; }
-OPHANDLER( dec_r1 )         { R1--; return 1; }
-OPHANDLER( dec_r2 )         { R2--; return 1; }
-OPHANDLER( dec_r3 )         { R3--; return 1; }
-OPHANDLER( dec_r4 )         { R4--; return 1; }
-OPHANDLER( dec_r5 )         { R5--; return 1; }
-OPHANDLER( dec_r6 )         { R6--; return 1; }
-OPHANDLER( dec_r7 )         { R7--; return 1; }
-
-OPHANDLER( dis_i )          { m_xirq_enabled = false; return 1; }
-OPHANDLER( dis_tcnti )      { m_tirq_enabled = false; m_timer_overflow = false; return 1; }
-
-OPHANDLER( djnz_r0 )        { execute_jcc(--R0 != 0); return 2; }
-OPHANDLER( djnz_r1 )        { execute_jcc(--R1 != 0); return 2; }
-OPHANDLER( djnz_r2 )        { execute_jcc(--R2 != 0); return 2; }
-OPHANDLER( djnz_r3 )        { execute_jcc(--R3 != 0); return 2; }
-OPHANDLER( djnz_r4 )        { execute_jcc(--R4 != 0); return 2; }
-OPHANDLER( djnz_r5 )        { execute_jcc(--R5 != 0); return 2; }
-OPHANDLER( djnz_r6 )        { execute_jcc(--R6 != 0); return 2; }
-OPHANDLER( djnz_r7 )        { execute_jcc(--R7 != 0); return 2; }
-
-OPHANDLER( en_i )           { m_xirq_enabled = true; return 1 + check_irqs(); }
-OPHANDLER( en_tcnti )       { m_tirq_enabled = true; return 1 + check_irqs(); }
-OPHANDLER( en_dma )         { m_dma_enabled = true; port_w(2, m_p2); return 1; }
-OPHANDLER( en_flags )       { m_flags_enabled = true; port_w(2, m_p2); return 1; }
+OPHANDLER( dec_a )          { burn_cycles(1); m_a--; }
+OPHANDLER( dec_r0 )         { burn_cycles(1); R0--; }
+OPHANDLER( dec_r1 )         { burn_cycles(1); R1--; }
+OPHANDLER( dec_r2 )         { burn_cycles(1); R2--; }
+OPHANDLER( dec_r3 )         { burn_cycles(1); R3--; }
+OPHANDLER( dec_r4 )         { burn_cycles(1); R4--; }
+OPHANDLER( dec_r5 )         { burn_cycles(1); R5--; }
+OPHANDLER( dec_r6 )         { burn_cycles(1); R6--; }
+OPHANDLER( dec_r7 )         { burn_cycles(1); R7--; }
+
+OPHANDLER( dis_i )          { burn_cycles(1); m_xirq_enabled = false; }
+OPHANDLER( dis_tcnti )      { burn_cycles(1); m_tirq_enabled = false; m_timer_overflow = false; }
+
+OPHANDLER( djnz_r0 )        { burn_cycles(2); execute_jcc(--R0 != 0); }
+OPHANDLER( djnz_r1 )        { burn_cycles(2); execute_jcc(--R1 != 0); }
+OPHANDLER( djnz_r2 )        { burn_cycles(2); execute_jcc(--R2 != 0); }
+OPHANDLER( djnz_r3 )        { burn_cycles(2); execute_jcc(--R3 != 0); }
+OPHANDLER( djnz_r4 )        { burn_cycles(2); execute_jcc(--R4 != 0); }
+OPHANDLER( djnz_r5 )        { burn_cycles(2); execute_jcc(--R5 != 0); }
+OPHANDLER( djnz_r6 )        { burn_cycles(2); execute_jcc(--R6 != 0); }
+OPHANDLER( djnz_r7 )        { burn_cycles(2); execute_jcc(--R7 != 0); }
+
+OPHANDLER( en_i )           { burn_cycles(1); m_xirq_enabled = true; }
+OPHANDLER( en_tcnti )       { burn_cycles(1); m_tirq_enabled = true; }
+OPHANDLER( en_dma )         { burn_cycles(1); m_dma_enabled = true; port_w(2, m_p2); }
+OPHANDLER( en_flags )       { burn_cycles(1); m_flags_enabled = true; port_w(2, m_p2); }
 OPHANDLER( ent0_clk )
 {
+	burn_cycles(1);
+
 	if (!m_t0_clk_func.isnull())
 		m_t0_clk_func(clock() / 3);
 	else
 		logerror("T0 clock enabled\n");
-	return 1;
 }
 
-OPHANDLER( in_a_p0 )        { m_a = bus_r() & m_dbbo; return 2; }
-OPHANDLER( in_a_p1 )        { m_a = port_r(1) & m_p1; return 2; }
-OPHANDLER( in_a_p2 )        { m_a = port_r(2) & m_p2; return 2; }
-OPHANDLER( ins_a_bus )      { m_a = bus_r(); return 2; }
+OPHANDLER( in_a_p0 )        { burn_cycles(2); m_a = bus_r() & m_dbbo; }
+OPHANDLER( in_a_p1 )        { burn_cycles(2); m_a = port_r(1) & m_p1; }
+OPHANDLER( in_a_p2 )        { burn_cycles(2); m_a = port_r(2) & m_p2; }
+OPHANDLER( ins_a_bus )      { burn_cycles(2); m_a = bus_r(); }
 OPHANDLER( in_a_dbb )
 {
+	burn_cycles(2);
+
 	/* acknowledge the IBF IRQ and clear the bit in STS */
 	if ((m_sts & STS_IBF) != 0)
 		standard_irq_callback(UPI41_INPUT_IBF);
@@ -729,137 +719,138 @@
 	if (m_flags_enabled && (m_p2 & P2_NIBF) == 0)
 		port_w(2, m_p2 |= P2_NIBF);
 	m_a = m_dbbi;
-	return 2;
 }
 
-OPHANDLER( inc_a )          { m_a++; return 1; }
-OPHANDLER( inc_r0 )         { R0++; return 1; }
-OPHANDLER( inc_r1 )         { R1++; return 1; }
-OPHANDLER( inc_r2 )         { R2++; return 1; }
-OPHANDLER( inc_r3 )         { R3++; return 1; }
-OPHANDLER( inc_r4 )         { R4++; return 1; }
-OPHANDLER( inc_r5 )         { R5++; return 1; }
-OPHANDLER( inc_r6 )         { R6++; return 1; }
-OPHANDLER( inc_r7 )         { R7++; return 1; }
-OPHANDLER( inc_xr0 )        { ram_w(R0, ram_r(R0) + 1); return 1; }
-OPHANDLER( inc_xr1 )        { ram_w(R1, ram_r(R1) + 1); return 1; }
-
-OPHANDLER( jb_0 )           { execute_jcc((m_a & 0x01) != 0); return 2; }
-OPHANDLER( jb_1 )           { execute_jcc((m_a & 0x02) != 0); return 2; }
-OPHANDLER( jb_2 )           { execute_jcc((m_a & 0x04) != 0); return 2; }
-OPHANDLER( jb_3 )           { execute_jcc((m_a & 0x08) != 0); return 2; }
-OPHANDLER( jb_4 )           { execute_jcc((m_a & 0x10) != 0); return 2; }
-OPHANDLER( jb_5 )           { execute_jcc((m_a & 0x20) != 0); return 2; }
-OPHANDLER( jb_6 )           { execute_jcc((m_a & 0x40) != 0); return 2; }
-OPHANDLER( jb_7 )           { execute_jcc((m_a & 0x80) != 0); return 2; }
-OPHANDLER( jc )             { execute_jcc((m_psw & C_FLAG) != 0); return 2; }
-OPHANDLER( jf0 )            { execute_jcc((m_psw & F_FLAG) != 0); return 2; }
-OPHANDLER( jf1 )            { execute_jcc((m_sts & STS_F1) != 0); return 2; }
-OPHANDLER( jnc )            { execute_jcc((m_psw & C_FLAG) == 0); return 2; }
-OPHANDLER( jni )            { m_irq_polled = (m_irq_state == 0); execute_jcc(m_irq_state != 0); return 2; }
-OPHANDLER( jnibf )          { m_irq_polled = (m_sts & STS_IBF) != 0; execute_jcc((m_sts & STS_IBF) == 0); return 2; }
-OPHANDLER( jnt_0 )          { execute_jcc(test_r(0) == 0); return 2; }
-OPHANDLER( jnt_1 )          { execute_jcc(test_r(1) == 0); return 2; }
-OPHANDLER( jnz )            { execute_jcc(m_a != 0); return 2; }
-OPHANDLER( jobf )           { execute_jcc((m_sts & STS_OBF) != 0); return 2; }
-OPHANDLER( jtf )            { execute_jcc(m_timer_flag); m_timer_flag = false; return 2; }
-OPHANDLER( jt_0 )           { execute_jcc(test_r(0) != 0); return 2; }
-OPHANDLER( jt_1 )           { execute_jcc(test_r(1) != 0); return 2; }
-OPHANDLER( jz )             { execute_jcc(m_a == 0); return 2; }
-
-OPHANDLER( jmp_0 )          { execute_jmp(argument_fetch() | 0x000); return 2; }
-OPHANDLER( jmp_1 )          { execute_jmp(argument_fetch() | 0x100); return 2; }
-OPHANDLER( jmp_2 )          { execute_jmp(argument_fetch() | 0x200); return 2; }
-OPHANDLER( jmp_3 )          { execute_jmp(argument_fetch() | 0x300); return 2; }
-OPHANDLER( jmp_4 )          { execute_jmp(argument_fetch() | 0x400); return 2; }
-OPHANDLER( jmp_5 )          { execute_jmp(argument_fetch() | 0x500); return 2; }
-OPHANDLER( jmp_6 )          { execute_jmp(argument_fetch() | 0x600); return 2; }
-OPHANDLER( jmp_7 )          { execute_jmp(argument_fetch() | 0x700); return 2; }
-OPHANDLER( jmpp_xa )        { m_pc &= 0xf00; m_pc |= program_r(m_pc | m_a); return 2; }
-
-OPHANDLER( mov_a_n )        { m_a = argument_fetch(); return 2; }
-OPHANDLER( mov_a_psw )      { m_a = m_psw; return 1; }
-OPHANDLER( mov_a_r0 )       { m_a = R0; return 1; }
-OPHANDLER( mov_a_r1 )       { m_a = R1; return 1; }
-OPHANDLER( mov_a_r2 )       { m_a = R2; return 1; }
-OPHANDLER( mov_a_r3 )       { m_a = R3; return 1; }
-OPHANDLER( mov_a_r4 )       { m_a = R4; return 1; }
-OPHANDLER( mov_a_r5 )       { m_a = R5; return 1; }
-OPHANDLER( mov_a_r6 )       { m_a = R6; return 1; }
-OPHANDLER( mov_a_r7 )       { m_a = R7; return 1; }
-OPHANDLER( mov_a_xr0 )      { m_a = ram_r(R0); return 1; }
-OPHANDLER( mov_a_xr1 )      { m_a = ram_r(R1); return 1; }
-OPHANDLER( mov_a_t )        { m_a = m_timer + ((m_timecount_enabled & TIMER_ENABLED) ? 1 : 0); return 1; }
-
-OPHANDLER( mov_psw_a )      { m_psw = m_a; update_regptr(); return 1; }
-OPHANDLER( mov_sts_a )      { m_sts = (m_sts & 0x0f) | (m_a & 0xf0); return 1; }
-OPHANDLER( mov_r0_a )       { R0 = m_a; return 1; }
-OPHANDLER( mov_r1_a )       { R1 = m_a; return 1; }
-OPHANDLER( mov_r2_a )       { R2 = m_a; return 1; }
-OPHANDLER( mov_r3_a )       { R3 = m_a; return 1; }
-OPHANDLER( mov_r4_a )       { R4 = m_a; return 1; }
-OPHANDLER( mov_r5_a )       { R5 = m_a; return 1; }
-OPHANDLER( mov_r6_a )       { R6 = m_a; return 1; }
-OPHANDLER( mov_r7_a )       { R7 = m_a; return 1; }
-OPHANDLER( mov_r0_n )       { R0 = argument_fetch(); return 2; }
-OPHANDLER( mov_r1_n )       { R1 = argument_fetch(); return 2; }
-OPHANDLER( mov_r2_n )       { R2 = argument_fetch(); return 2; }
-OPHANDLER( mov_r3_n )       { R3 = argument_fetch(); return 2; }
-OPHANDLER( mov_r4_n )       { R4 = argument_fetch(); return 2; }
-OPHANDLER( mov_r5_n )       { R5 = argument_fetch(); return 2; }
-OPHANDLER( mov_r6_n )       { R6 = argument_fetch(); return 2; }
-OPHANDLER( mov_r7_n )       { R7 = argument_fetch(); return 2; }
-OPHANDLER( mov_t_a )        { m_timer = m_a; return 1; }
-OPHANDLER( mov_xr0_a )      { ram_w(R0, m_a); return 1; }
-OPHANDLER( mov_xr1_a )      { ram_w(R1, m_a); return 1; }
-OPHANDLER( mov_xr0_n )      { ram_w(R0, argument_fetch()); return 2; }
-OPHANDLER( mov_xr1_n )      { ram_w(R1, argument_fetch()); return 2; }
-
-OPHANDLER( movd_a_p4 )      { expander_operation(EXPANDER_OP_READ, 4); return 2; }
-OPHANDLER( movd_a_p5 )      { expander_operation(EXPANDER_OP_READ, 5); return 2; }
-OPHANDLER( movd_a_p6 )      { expander_operation(EXPANDER_OP_READ, 6); return 2; }
-OPHANDLER( movd_a_p7 )      { expander_operation(EXPANDER_OP_READ, 7); return 2; }
-OPHANDLER( movd_p4_a )      { expander_operation(EXPANDER_OP_WRITE, 4); return 2; }
-OPHANDLER( movd_p5_a )      { expander_operation(EXPANDER_OP_WRITE, 5); return 2; }
-OPHANDLER( movd_p6_a )      { expander_operation(EXPANDER_OP_WRITE, 6); return 2; }
-OPHANDLER( movd_p7_a )      { expander_operation(EXPANDER_OP_WRITE, 7); return 2; }
-
-OPHANDLER( movp_a_xa )      { m_a = program_r((m_pc & 0xf00) | m_a); return 2; }
-OPHANDLER( movp3_a_xa )     { m_a = program_r(0x300 | m_a); return 2; }
-
-OPHANDLER( movx_a_xr0 )     { m_a = ext_r(R0); return 2; }
-OPHANDLER( movx_a_xr1 )     { m_a = ext_r(R1); return 2; }
-OPHANDLER( movx_xr0_a )     { ext_w(R0, m_a); return 2; }
-OPHANDLER( movx_xr1_a )     { ext_w(R1, m_a); return 2; }
-
-OPHANDLER( nop )            { return 1; }
-
-OPHANDLER( orl_a_r0 )       { m_a |= R0; return 1; }
-OPHANDLER( orl_a_r1 )       { m_a |= R1; return 1; }
-OPHANDLER( orl_a_r2 )       { m_a |= R2; return 1; }
-OPHANDLER( orl_a_r3 )       { m_a |= R3; return 1; }
-OPHANDLER( orl_a_r4 )       { m_a |= R4; return 1; }
-OPHANDLER( orl_a_r5 )       { m_a |= R5; return 1; }
-OPHANDLER( orl_a_r6 )       { m_a |= R6; return 1; }
-OPHANDLER( orl_a_r7 )       { m_a |= R7; return 1; }
-OPHANDLER( orl_a_xr0 )      { m_a |= ram_r(R0); return 1; }
-OPHANDLER( orl_a_xr1 )      { m_a |= ram_r(R1); return 1; }
-OPHANDLER( orl_a_n )        { m_a |= argument_fetch(); return 2; }
-
-OPHANDLER( orl_bus_n )      { bus_w(bus_r() | argument_fetch()); return 2; }
-OPHANDLER( orl_p1_n )       { port_w(1, m_p1 |= argument_fetch()); return 2; }
-OPHANDLER( orl_p2_n )       { port_w(2, m_p2 |= argument_fetch() & p2_mask()); return 2; }
-OPHANDLER( orld_p4_a )      { expander_operation(EXPANDER_OP_OR, 4); return 2; }
-OPHANDLER( orld_p5_a )      { expander_operation(EXPANDER_OP_OR, 5); return 2; }
-OPHANDLER( orld_p6_a )      { expander_operation(EXPANDER_OP_OR, 6); return 2; }
-OPHANDLER( orld_p7_a )      { expander_operation(EXPANDER_OP_OR, 7); return 2; }
-
-OPHANDLER( outl_bus_a )     { bus_w(m_a); return 2; }
-OPHANDLER( outl_p0_a )      { bus_w(m_dbbo = m_a); return 2; }
-OPHANDLER( outl_p1_a )      { port_w(1, m_p1 = m_a); return 2; }
-OPHANDLER( outl_p2_a )      { uint8_t mask = p2_mask(); port_w(2, m_p2 = (m_p2 & ~mask) | (m_a & mask)); return 2; }
+OPHANDLER( inc_a )          { burn_cycles(1); m_a++; }
+OPHANDLER( inc_r0 )         { burn_cycles(1); R0++; }
+OPHANDLER( inc_r1 )         { burn_cycles(1); R1++; }
+OPHANDLER( inc_r2 )         { burn_cycles(1); R2++; }
+OPHANDLER( inc_r3 )         { burn_cycles(1); R3++; }
+OPHANDLER( inc_r4 )         { burn_cycles(1); R4++; }
+OPHANDLER( inc_r5 )         { burn_cycles(1); R5++; }
+OPHANDLER( inc_r6 )         { burn_cycles(1); R6++; }
+OPHANDLER( inc_r7 )         { burn_cycles(1); R7++; }
+OPHANDLER( inc_xr0 )        { burn_cycles(1); ram_w(R0, ram_r(R0) + 1); }
+OPHANDLER( inc_xr1 )        { burn_cycles(1); ram_w(R1, ram_r(R1) + 1); }
+
+OPHANDLER( jb_0 )           { burn_cycles(2); execute_jcc((m_a & 0x01) != 0); }
+OPHANDLER( jb_1 )           { burn_cycles(2); execute_jcc((m_a & 0x02) != 0); }
+OPHANDLER( jb_2 )           { burn_cycles(2); execute_jcc((m_a & 0x04) != 0); }
+OPHANDLER( jb_3 )           { burn_cycles(2); execute_jcc((m_a & 0x08) != 0); }
+OPHANDLER( jb_4 )           { burn_cycles(2); execute_jcc((m_a & 0x10) != 0); }
+OPHANDLER( jb_5 )           { burn_cycles(2); execute_jcc((m_a & 0x20) != 0); }
+OPHANDLER( jb_6 )           { burn_cycles(2); execute_jcc((m_a & 0x40) != 0); }
+OPHANDLER( jb_7 )           { burn_cycles(2); execute_jcc((m_a & 0x80) != 0); }
+OPHANDLER( jc )             { burn_cycles(2); execute_jcc((m_psw & C_FLAG) != 0); }
+OPHANDLER( jf0 )            { burn_cycles(2); execute_jcc((m_psw & F_FLAG) != 0); }
+OPHANDLER( jf1 )            { burn_cycles(2); execute_jcc((m_sts & STS_F1) != 0); }
+OPHANDLER( jnc )            { burn_cycles(2); execute_jcc((m_psw & C_FLAG) == 0); }
+OPHANDLER( jni )            { burn_cycles(2); execute_jcc(m_irq_state != 0); }
+OPHANDLER( jnibf )          { burn_cycles(2); execute_jcc((m_sts & STS_IBF) == 0); }
+OPHANDLER( jnt_0 )          { burn_cycles(2); execute_jcc(test_r(0) == 0); }
+OPHANDLER( jnt_1 )          { burn_cycles(2); execute_jcc(test_r(1) == 0); }
+OPHANDLER( jnz )            { burn_cycles(2); execute_jcc(m_a != 0); }
+OPHANDLER( jobf )           { burn_cycles(2); execute_jcc((m_sts & STS_OBF) != 0); }
+OPHANDLER( jtf )            { burn_cycles(2); execute_jcc(m_timer_flag); m_timer_flag = false; }
+OPHANDLER( jt_0 )           { burn_cycles(2); execute_jcc(test_r(0) != 0); }
+OPHANDLER( jt_1 )           { burn_cycles(2); execute_jcc(test_r(1) != 0); }
+OPHANDLER( jz )             { burn_cycles(2); execute_jcc(m_a == 0); }
+
+OPHANDLER( jmp_0 )          { burn_cycles(2); execute_jmp(argument_fetch() | 0x000); }
+OPHANDLER( jmp_1 )          { burn_cycles(2); execute_jmp(argument_fetch() | 0x100); }
+OPHANDLER( jmp_2 )          { burn_cycles(2); execute_jmp(argument_fetch() | 0x200); }
+OPHANDLER( jmp_3 )          { burn_cycles(2); execute_jmp(argument_fetch() | 0x300); }
+OPHANDLER( jmp_4 )          { burn_cycles(2); execute_jmp(argument_fetch() | 0x400); }
+OPHANDLER( jmp_5 )          { burn_cycles(2); execute_jmp(argument_fetch() | 0x500); }
+OPHANDLER( jmp_6 )          { burn_cycles(2); execute_jmp(argument_fetch() | 0x600); }
+OPHANDLER( jmp_7 )          { burn_cycles(2); execute_jmp(argument_fetch() | 0x700); }
+OPHANDLER( jmpp_xa )        { burn_cycles(2); m_pc &= 0xf00; m_pc |= program_r(m_pc | m_a); }
+
+OPHANDLER( mov_a_n )        { burn_cycles(2); m_a = argument_fetch(); }
+OPHANDLER( mov_a_psw )      { burn_cycles(1); m_a = m_psw | 0x08; }
+OPHANDLER( mov_a_r0 )       { burn_cycles(1); m_a = R0; }
+OPHANDLER( mov_a_r1 )       { burn_cycles(1); m_a = R1; }
+OPHANDLER( mov_a_r2 )       { burn_cycles(1); m_a = R2; }
+OPHANDLER( mov_a_r3 )       { burn_cycles(1); m_a = R3; }
+OPHANDLER( mov_a_r4 )       { burn_cycles(1); m_a = R4; }
+OPHANDLER( mov_a_r5 )       { burn_cycles(1); m_a = R5; }
+OPHANDLER( mov_a_r6 )       { burn_cycles(1); m_a = R6; }
+OPHANDLER( mov_a_r7 )       { burn_cycles(1); m_a = R7; }
+OPHANDLER( mov_a_xr0 )      { burn_cycles(1); m_a = ram_r(R0); }
+OPHANDLER( mov_a_xr1 )      { burn_cycles(1); m_a = ram_r(R1); }
+OPHANDLER( mov_a_t )        { burn_cycles(1); m_a = m_timer; }
+
+OPHANDLER( mov_psw_a )      { burn_cycles(1); m_psw = m_a & ~0x08; update_regptr(); }
+OPHANDLER( mov_sts_a )      { burn_cycles(1); m_sts = (m_sts & 0x0f) | (m_a & 0xf0); }
+OPHANDLER( mov_r0_a )       { burn_cycles(1); R0 = m_a; }
+OPHANDLER( mov_r1_a )       { burn_cycles(1); R1 = m_a; }
+OPHANDLER( mov_r2_a )       { burn_cycles(1); R2 = m_a; }
+OPHANDLER( mov_r3_a )       { burn_cycles(1); R3 = m_a; }
+OPHANDLER( mov_r4_a )       { burn_cycles(1); R4 = m_a; }
+OPHANDLER( mov_r5_a )       { burn_cycles(1); R5 = m_a; }
+OPHANDLER( mov_r6_a )       { burn_cycles(1); R6 = m_a; }
+OPHANDLER( mov_r7_a )       { burn_cycles(1); R7 = m_a; }
+OPHANDLER( mov_r0_n )       { burn_cycles(2); R0 = argument_fetch(); }
+OPHANDLER( mov_r1_n )       { burn_cycles(2); R1 = argument_fetch(); }
+OPHANDLER( mov_r2_n )       { burn_cycles(2); R2 = argument_fetch(); }
+OPHANDLER( mov_r3_n )       { burn_cycles(2); R3 = argument_fetch(); }
+OPHANDLER( mov_r4_n )       { burn_cycles(2); R4 = argument_fetch(); }
+OPHANDLER( mov_r5_n )       { burn_cycles(2); R5 = argument_fetch(); }
+OPHANDLER( mov_r6_n )       { burn_cycles(2); R6 = argument_fetch(); }
+OPHANDLER( mov_r7_n )       { burn_cycles(2); R7 = argument_fetch(); }
+OPHANDLER( mov_t_a )        { burn_cycles(1); m_timer = m_a; }
+OPHANDLER( mov_xr0_a )      { burn_cycles(1); ram_w(R0, m_a); }
+OPHANDLER( mov_xr1_a )      { burn_cycles(1); ram_w(R1, m_a); }
+OPHANDLER( mov_xr0_n )      { burn_cycles(2); ram_w(R0, argument_fetch()); }
+OPHANDLER( mov_xr1_n )      { burn_cycles(2); ram_w(R1, argument_fetch()); }
+
+OPHANDLER( movd_a_p4 )      { burn_cycles(2); expander_operation(EXPANDER_OP_READ, 4); }
+OPHANDLER( movd_a_p5 )      { burn_cycles(2); expander_operation(EXPANDER_OP_READ, 5); }
+OPHANDLER( movd_a_p6 )      { burn_cycles(2); expander_operation(EXPANDER_OP_READ, 6); }
+OPHANDLER( movd_a_p7 )      { burn_cycles(2); expander_operation(EXPANDER_OP_READ, 7); }
+OPHANDLER( movd_p4_a )      { burn_cycles(2); expander_operation(EXPANDER_OP_WRITE, 4); }
+OPHANDLER( movd_p5_a )      { burn_cycles(2); expander_operation(EXPANDER_OP_WRITE, 5); }
+OPHANDLER( movd_p6_a )      { burn_cycles(2); expander_operation(EXPANDER_OP_WRITE, 6); }
+OPHANDLER( movd_p7_a )      { burn_cycles(2); expander_operation(EXPANDER_OP_WRITE, 7); }
+
+OPHANDLER( movp_a_xa )      { burn_cycles(2); m_a = program_r((m_pc & 0xf00) | m_a); }
+OPHANDLER( movp3_a_xa )     { burn_cycles(2); m_a = program_r(0x300 | m_a); }
+
+OPHANDLER( movx_a_xr0 )     { burn_cycles(2); m_a = ext_r(R0); }
+OPHANDLER( movx_a_xr1 )     { burn_cycles(2); m_a = ext_r(R1); }
+OPHANDLER( movx_xr0_a )     { burn_cycles(2); ext_w(R0, m_a); }
+OPHANDLER( movx_xr1_a )     { burn_cycles(2); ext_w(R1, m_a); }
+
+OPHANDLER( nop )            { burn_cycles(1); }
+
+OPHANDLER( orl_a_r0 )       { burn_cycles(1); m_a |= R0; }
+OPHANDLER( orl_a_r1 )       { burn_cycles(1); m_a |= R1; }
+OPHANDLER( orl_a_r2 )       { burn_cycles(1); m_a |= R2; }
+OPHANDLER( orl_a_r3 )       { burn_cycles(1); m_a |= R3; }
+OPHANDLER( orl_a_r4 )       { burn_cycles(1); m_a |= R4; }
+OPHANDLER( orl_a_r5 )       { burn_cycles(1); m_a |= R5; }
+OPHANDLER( orl_a_r6 )       { burn_cycles(1); m_a |= R6; }
+OPHANDLER( orl_a_r7 )       { burn_cycles(1); m_a |= R7; }
+OPHANDLER( orl_a_xr0 )      { burn_cycles(1); m_a |= ram_r(R0); }
+OPHANDLER( orl_a_xr1 )      { burn_cycles(1); m_a |= ram_r(R1); }
+OPHANDLER( orl_a_n )        { burn_cycles(2); m_a |= argument_fetch(); }
+
+OPHANDLER( orl_bus_n )      { burn_cycles(2); bus_w(bus_r() | argument_fetch()); }
+OPHANDLER( orl_p1_n )       { burn_cycles(2); port_w(1, m_p1 |= argument_fetch()); }
+OPHANDLER( orl_p2_n )       { burn_cycles(2); port_w(2, m_p2 |= argument_fetch() & p2_mask()); }
+OPHANDLER( orld_p4_a )      { burn_cycles(2); expander_operation(EXPANDER_OP_OR, 4); }
+OPHANDLER( orld_p5_a )      { burn_cycles(2); expander_operation(EXPANDER_OP_OR, 5); }
+OPHANDLER( orld_p6_a )      { burn_cycles(2); expander_operation(EXPANDER_OP_OR, 6); }
+OPHANDLER( orld_p7_a )      { burn_cycles(2); expander_operation(EXPANDER_OP_OR, 7); }
+
+OPHANDLER( outl_bus_a )     { burn_cycles(2); bus_w(m_a); }
+OPHANDLER( outl_p0_a )      { burn_cycles(2); bus_w(m_dbbo = m_a); }
+OPHANDLER( outl_p1_a )      { burn_cycles(2); port_w(1, m_p1 = m_a); }
+OPHANDLER( outl_p2_a )      { burn_cycles(2); uint8_t mask = p2_mask(); port_w(2, m_p2 = (m_p2 & ~mask) | (m_a & mask)); }
 OPHANDLER( out_dbb_a )
 {
+	burn_cycles(2);
+
 	/* copy to the DBBO and update the bit in STS */
 	m_dbbo = m_a;
 	m_sts |= STS_OBF;
@@ -867,64 +858,63 @@
 	/* if P2 flags are enabled, update the state of P2 */
 	if (m_flags_enabled && (m_p2 & P2_OBF) == 0)
 		port_w(2, m_p2 |= P2_OBF);
-	return 2;
 }
 
 
-OPHANDLER( ret )            { pull_pc(); return 2; }
+OPHANDLER( ret )            { burn_cycles(2); pull_pc(); }
 OPHANDLER( retr )
 {
+	burn_cycles(2);
 	pull_pc_psw();
 
-	/* implicitly clear the IRQ in progress flip flop and re-check interrupts */
+	/* implicitly clear the IRQ in progress flip flop */
 	m_irq_in_progress = false;
-	return 2 + check_irqs();
 }
 
-OPHANDLER( rl_a )           { m_a = (m_a << 1) | (m_a >> 7); return 1; }
-OPHANDLER( rlc_a )          { uint8_t newc = m_a & C_FLAG; m_a = (m_a << 1) | (m_psw >> 7); m_psw = (m_psw & ~C_FLAG) | newc; return 1; }
+OPHANDLER( rl_a )           { burn_cycles(1); m_a = (m_a << 1) | (m_a >> 7); }
+OPHANDLER( rlc_a )          { burn_cycles(1); uint8_t newc = m_a & C_FLAG; m_a = (m_a << 1) | (m_psw >> 7); m_psw = (m_psw & ~C_FLAG) | newc; }
 
-OPHANDLER( rr_a )           { m_a = (m_a >> 1) | (m_a << 7); return 1; }
-OPHANDLER( rrc_a )          { uint8_t newc = (m_a << 7) & C_FLAG; m_a = (m_a >> 1) | (m_psw & C_FLAG); m_psw = (m_psw & ~C_FLAG) | newc; return 1; }
+OPHANDLER( rr_a )           { burn_cycles(1); m_a = (m_a >> 1) | (m_a << 7); }
+OPHANDLER( rrc_a )          { burn_cycles(1); uint8_t newc = (m_a << 7) & C_FLAG; m_a = (m_a >> 1) | (m_psw & C_FLAG); m_psw = (m_psw & ~C_FLAG) | newc; }
 
-OPHANDLER( sel_mb0 )        { m_a11 = 0x000; return 1; }
-OPHANDLER( sel_mb1 )        { m_a11 = 0x800; return 1; }
-
-OPHANDLER( sel_rb0 )        { m_psw &= ~B_FLAG; update_regptr(); return 1; }
-OPHANDLER( sel_rb1 )        { m_psw |=  B_FLAG; update_regptr(); return 1; }
-
-OPHANDLER( stop_tcnt )      { m_timecount_enabled = 0; return 1; }
-
-OPHANDLER( strt_cnt )       { m_timecount_enabled = COUNTER_ENABLED; m_t1_history = test_r(1); return 1; }
-OPHANDLER( strt_t )         { m_timecount_enabled = TIMER_ENABLED; m_prescaler = 0; return 1; }
-
-OPHANDLER( swap_a )         { m_a = (m_a << 4) | (m_a >> 4); return 1; }
-
-OPHANDLER( xch_a_r0 )       { uint8_t tmp = m_a; m_a = R0; R0 = tmp; return 1; }
-OPHANDLER( xch_a_r1 )       { uint8_t tmp = m_a; m_a = R1; R1 = tmp; return 1; }
-OPHANDLER( xch_a_r2 )       { uint8_t tmp = m_a; m_a = R2; R2 = tmp; return 1; }
-OPHANDLER( xch_a_r3 )       { uint8_t tmp = m_a; m_a = R3; R3 = tmp; return 1; }
-OPHANDLER( xch_a_r4 )       { uint8_t tmp = m_a; m_a = R4; R4 = tmp; return 1; }
-OPHANDLER( xch_a_r5 )       { uint8_t tmp = m_a; m_a = R5; R5 = tmp; return 1; }
-OPHANDLER( xch_a_r6 )       { uint8_t tmp = m_a; m_a = R6; R6 = tmp; return 1; }
-OPHANDLER( xch_a_r7 )       { uint8_t tmp = m_a; m_a = R7; R7 = tmp; return 1; }
-OPHANDLER( xch_a_xr0 )      { uint8_t tmp = m_a; m_a = ram_r(R0); ram_w(R0, tmp); return 1; }
-OPHANDLER( xch_a_xr1 )      { uint8_t tmp = m_a; m_a = ram_r(R1); ram_w(R1, tmp); return 1; }
-
-OPHANDLER( xchd_a_xr0 )     { uint8_t oldram = ram_r(R0); ram_w(R0, (oldram & 0xf0) | (m_a & 0x0f)); m_a = (m_a & 0xf0) | (oldram & 0x0f); return 1; }
-OPHANDLER( xchd_a_xr1 )     { uint8_t oldram = ram_r(R1); ram_w(R1, (oldram & 0xf0) | (m_a & 0x0f)); m_a = (m_a & 0xf0) | (oldram & 0x0f); return 1; }
-
-OPHANDLER( xrl_a_r0 )       { m_a ^= R0; return 1; }
-OPHANDLER( xrl_a_r1 )       { m_a ^= R1; return 1; }
-OPHANDLER( xrl_a_r2 )       { m_a ^= R2; return 1; }
-OPHANDLER( xrl_a_r3 )       { m_a ^= R3; return 1; }
-OPHANDLER( xrl_a_r4 )       { m_a ^= R4; return 1; }
-OPHANDLER( xrl_a_r5 )       { m_a ^= R5; return 1; }
-OPHANDLER( xrl_a_r6 )       { m_a ^= R6; return 1; }
-OPHANDLER( xrl_a_r7 )       { m_a ^= R7; return 1; }
-OPHANDLER( xrl_a_xr0 )      { m_a ^= ram_r(R0); return 1; }
-OPHANDLER( xrl_a_xr1 )      { m_a ^= ram_r(R1); return 1; }
-OPHANDLER( xrl_a_n )        { m_a ^= argument_fetch(); return 2; }
+OPHANDLER( sel_mb0 )        { burn_cycles(1); m_a11 = 0x000; }
+OPHANDLER( sel_mb1 )        { burn_cycles(1); m_a11 = 0x800; }
+
+OPHANDLER( sel_rb0 )        { burn_cycles(1); m_psw &= ~B_FLAG; update_regptr(); }
+OPHANDLER( sel_rb1 )        { burn_cycles(1); m_psw |=  B_FLAG; update_regptr(); }
+
+OPHANDLER( stop_tcnt )      { burn_cycles(1); m_timecount_enabled = 0; }
+
+OPHANDLER( strt_cnt )       { burn_cycles(1); m_timecount_enabled = COUNTER_ENABLED; m_t1_history = test_r(1); }
+OPHANDLER( strt_t )         { burn_cycles(1); m_timecount_enabled = TIMER_ENABLED; m_prescaler = 0; }
+
+OPHANDLER( swap_a )         { burn_cycles(1); m_a = (m_a << 4) | (m_a >> 4); }
+
+OPHANDLER( xch_a_r0 )       { burn_cycles(1); uint8_t tmp = m_a; m_a = R0; R0 = tmp; }
+OPHANDLER( xch_a_r1 )       { burn_cycles(1); uint8_t tmp = m_a; m_a = R1; R1 = tmp; }
+OPHANDLER( xch_a_r2 )       { burn_cycles(1); uint8_t tmp = m_a; m_a = R2; R2 = tmp; }
+OPHANDLER( xch_a_r3 )       { burn_cycles(1); uint8_t tmp = m_a; m_a = R3; R3 = tmp; }
+OPHANDLER( xch_a_r4 )       { burn_cycles(1); uint8_t tmp = m_a; m_a = R4; R4 = tmp; }
+OPHANDLER( xch_a_r5 )       { burn_cycles(1); uint8_t tmp = m_a; m_a = R5; R5 = tmp; }
+OPHANDLER( xch_a_r6 )       { burn_cycles(1); uint8_t tmp = m_a; m_a = R6; R6 = tmp; }
+OPHANDLER( xch_a_r7 )       { burn_cycles(1); uint8_t tmp = m_a; m_a = R7; R7 = tmp; }
+OPHANDLER( xch_a_xr0 )      { burn_cycles(1); uint8_t tmp = m_a; m_a = ram_r(R0); ram_w(R0, tmp); }
+OPHANDLER( xch_a_xr1 )      { burn_cycles(1); uint8_t tmp = m_a; m_a = ram_r(R1); ram_w(R1, tmp); }
+
+OPHANDLER( xchd_a_xr0 )     { burn_cycles(1); uint8_t oldram = ram_r(R0); ram_w(R0, (oldram & 0xf0) | (m_a & 0x0f)); m_a = (m_a & 0xf0) | (oldram & 0x0f); }
+OPHANDLER( xchd_a_xr1 )     { burn_cycles(1); uint8_t oldram = ram_r(R1); ram_w(R1, (oldram & 0xf0) | (m_a & 0x0f)); m_a = (m_a & 0xf0) | (oldram & 0x0f); }
+
+OPHANDLER( xrl_a_r0 )       { burn_cycles(1); m_a ^= R0; }
+OPHANDLER( xrl_a_r1 )       { burn_cycles(1); m_a ^= R1; }
+OPHANDLER( xrl_a_r2 )       { burn_cycles(1); m_a ^= R2; }
+OPHANDLER( xrl_a_r3 )       { burn_cycles(1); m_a ^= R3; }
+OPHANDLER( xrl_a_r4 )       { burn_cycles(1); m_a ^= R4; }
+OPHANDLER( xrl_a_r5 )       { burn_cycles(1); m_a ^= R5; }
+OPHANDLER( xrl_a_r6 )       { burn_cycles(1); m_a ^= R6; }
+OPHANDLER( xrl_a_r7 )       { burn_cycles(1); m_a ^= R7; }
+OPHANDLER( xrl_a_xr0 )      { burn_cycles(1); m_a ^= ram_r(R0); }
+OPHANDLER( xrl_a_xr1 )      { burn_cycles(1); m_a ^= ram_r(R1); }
+OPHANDLER( xrl_a_n )        { burn_cycles(2); m_a ^= argument_fetch(); }
 
 
 
@@ -1109,7 +1099,6 @@
 	m_dbbi = 0;
 	m_dbbo = 0;
 	m_irq_state = 0;
-	m_irq_polled = 0;
 
 	/* FIXME: Current implementation suboptimal */
 	m_ea = (m_int_rom_size ? 0 : 1);
@@ -1178,7 +1167,6 @@
 	save_item(NAME(m_dbbo));
 
 	save_item(NAME(m_irq_state));
-	save_item(NAME(m_irq_polled));
 	save_item(NAME(m_irq_in_progress));
 	save_item(NAME(m_timer_overflow));
 	save_item(NAME(m_timer_flag));
@@ -1198,7 +1186,8 @@
 {
 	/* confirmed from reset description */
 	m_pc = 0;
-	m_psw = (m_psw & (C_FLAG | A_FLAG)) | 0x08;
+	m_psw = m_psw & (C_FLAG | A_FLAG);
+	update_regptr();
 	m_a11 = 0x000;
 	m_dbbo = 0xff;
 	bus_w(0xff);
@@ -1230,33 +1219,30 @@
     check_irqs - check for and process IRQs
 -------------------------------------------------*/
 
-int mcs48_cpu_device::check_irqs()
+void mcs48_cpu_device::check_irqs()
 {
 	/* if something is in progress, we do nothing */
 	if (m_irq_in_progress)
-		return 0;
+		return;
 
 	/* external interrupts take priority */
-	if ((m_irq_state || (m_sts & STS_IBF) != 0) && m_xirq_enabled)
+	else if ((m_irq_state || (m_sts & STS_IBF) != 0) && m_xirq_enabled)
 	{
+		burn_cycles(2);
 		m_irq_in_progress = true;
 
-		// force JNI to be taken (hack)
-		if (m_irq_polled)
-			m_pc = ((m_pc - 1) & 0xf00) | m_program.read_byte(m_pc - 1);
-
 		/* transfer to location 0x03 */
 		push_pc_psw();
 		m_pc = 0x03;
 
 		/* indicate we took the external IRQ */
 		standard_irq_callback(0);
-		return 2;
 	}
 
 	/* timer overflow interrupts follow */
-	if (m_timer_overflow && m_tirq_enabled)
+	else if (m_timer_overflow && m_tirq_enabled)
 	{
+		burn_cycles(2);
 		m_irq_in_progress = true;
 
 		/* transfer to location 0x07 */
@@ -1265,9 +1251,7 @@
 
 		/* timer overflow flip-flop is reset once taken */
 		m_timer_overflow = false;
-		return 2;
 	}
-	return 0;
 }
 
 
@@ -1278,7 +1262,10 @@
 
 void mcs48_cpu_device::burn_cycles(int count)
 {
-	int timerover = false;
+	if (count == 0)
+		return;
+
+	bool timerover = false;
 
 	/* if the timer is enabled, accumulate prescaler cycles */
 	if (m_timecount_enabled & TIMER_ENABLED)
@@ -1292,13 +1279,19 @@
 
 	/* if the counter is enabled, poll the T1 test input once for each cycle */
 	else if (m_timecount_enabled & COUNTER_ENABLED)
-		for ( ; count > 0; count--)
+		for ( ; count > 0; count--, m_icount--)
 		{
 			m_t1_history = (m_t1_history << 1) | (test_r(1) & 1);
 			if ((m_t1_history & 3) == 2)
-				timerover = (++m_timer == 0);
+			{
+				if (++m_timer == 0)
+					timerover = true;
+			}
 		}
 
+	/* if timer counter was disabled, adjust icount here (otherwise count is 0) */
+	m_icount -= count;
+
 	/* if either source caused a timer overflow, set the flags and check IRQs */
 	if (timerover)
 	{
@@ -1306,10 +1299,7 @@
 
 		/* according to the docs, if an overflow occurs with interrupts disabled, the overflow is not stored */
 		if (m_tirq_enabled)
-		{
 			m_timer_overflow = true;
-			check_irqs();
-		}
 	}
 }
 
@@ -1321,34 +1311,20 @@
 
 void mcs48_cpu_device::execute_run()
 {
-	int curcycles;
-
 	update_regptr();
 
-	/* external interrupts may have been set since we last checked */
-	curcycles = check_irqs();
-	m_icount -= curcycles;
-	if (m_timecount_enabled != 0)
-		burn_cycles(curcycles);
-
-	/* iterate over remaining cycles, guaranteeing at least one instruction */
+	// iterate over remaining cycles, guaranteeing at least one instruction
 	do
 	{
-		unsigned opcode;
-
-		/* fetch next opcode */
 		m_prevpc = m_pc;
-		m_irq_polled = false;
 		debugger_instruction_hook(m_pc);
-		opcode = opcode_fetch();
 
-		/* process opcode and count cycles */
-		curcycles = (this->*m_opcode_table[opcode])();
+		// fetch and process opcode
+		unsigned opcode = opcode_fetch();
+		(this->*m_opcode_table[opcode])();
 
-		/* burn the cycles */
-		m_icount -= curcycles;
-		if (m_timecount_enabled != 0)
-			burn_cycles(curcycles);
+		// check interrupts
+		check_irqs();
 
 	} while (m_icount > 0);
 }
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/mcs48/mcs48.h mame-0.224+dfsg.1/src/devices/cpu/mcs48/mcs48.h
--- mame-0.222+dfsg.1/src/devices/cpu/mcs48/mcs48.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/mcs48/mcs48.h	2020-08-26 08:57:19.000000000 +0000
@@ -2,8 +2,6 @@
 // copyright-holders:Mirko Buffoni
 /***************************************************************************
 
-    mcs48.c
-
     Intel MCS-48/UPI-41 Portable Emulator
 
     Copyright Mirko Buffoni
@@ -140,7 +138,7 @@
 	template <typename... T> void set_t0_clk_cb(T &&... args) { m_t0_clk_func.set(std::forward<T>(args)...); }
 
 protected:
-	typedef int (mcs48_cpu_device::*mcs48_ophandler)();
+	typedef void (mcs48_cpu_device::*mcs48_ophandler)();
 
 	// construction/destruction
 	mcs48_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int rom_size, int ram_size, uint8_t feature_mask, const mcs48_ophandler *opcode_table);
@@ -154,7 +152,7 @@
 	virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 15 - 1) / 15; }
 	virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 15); }
 	virtual uint32_t execute_min_cycles() const noexcept override { return 1; }
-	virtual uint32_t execute_max_cycles() const noexcept override { return 3; }
+	virtual uint32_t execute_max_cycles() const noexcept override { return 2+2; } // opcode+irq
 	virtual uint32_t execute_input_lines() const noexcept override { return 2; }
 	virtual void execute_run() override;
 	virtual void execute_set_input(int inputnum, int state) override;
@@ -201,7 +199,6 @@
 	uint8_t       m_dbbo;               /* 8-bit output data buffer (UPI-41 only) */
 
 	bool          m_irq_state;          /* true if the IRQ line is active */
-	bool          m_irq_polled;         /* true if last instruction was JNI (and not taken) */
 	bool          m_irq_in_progress;    /* true if an IRQ is in progress */
 	bool          m_timer_overflow;     /* true on a timer overflow; cleared by taking interrupt */
 	bool          m_timer_flag;         /* true on a timer overflow; cleared on JTF */
@@ -213,7 +210,7 @@
 
 	uint16_t      m_a11;                /* A11 value, either 0x000 or 0x800 */
 
-	int         m_icount;
+	int           m_icount;
 
 	/* Memory spaces */
 	memory_access<12, 0, 0, ENDIANNESS_LITTLE>::cache m_program;
@@ -263,254 +260,258 @@
 	void execute_jcc(uint8_t result);
 	uint8_t p2_mask();
 	void expander_operation(expander_op operation, uint8_t port);
-	int check_irqs();
+	void check_irqs();
 	void burn_cycles(int count);
 
-	int illegal();
-	int add_a_r0();
-	int add_a_r1();
-	int add_a_r2();
-	int add_a_r3();
-	int add_a_r4();
-	int add_a_r5();
-	int add_a_r6();
-	int add_a_r7();
-	int add_a_xr0();
-	int add_a_xr1();
-	int add_a_n();
-	int adc_a_r0();
-	int adc_a_r1();
-	int adc_a_r2();
-	int adc_a_r3();
-	int adc_a_r4();
-	int adc_a_r5();
-	int adc_a_r6();
-	int adc_a_r7();
-	int adc_a_xr0();
-	int adc_a_xr1();
-	int adc_a_n();
-	int anl_a_r0();
-	int anl_a_r1();
-	int anl_a_r2();
-	int anl_a_r3();
-	int anl_a_r4();
-	int anl_a_r5();
-	int anl_a_r6();
-	int anl_a_r7();
-	int anl_a_xr0();
-	int anl_a_xr1();
-	int anl_a_n();
-	int anl_bus_n();
-	int anl_p1_n();
-	int anl_p2_n();
-	int anld_p4_a();
-	int anld_p5_a();
-	int anld_p6_a();
-	int anld_p7_a();
-	int call_0();
-	int call_1();
-	int call_2();
-	int call_3();
-	int call_4();
-	int call_5();
-	int call_6();
-	int call_7();
-	int clr_a();
-	int clr_c();
-	int clr_f0();
-	int clr_f1();
-	int cpl_a();
-	int cpl_c();
-	int cpl_f0();
-	int cpl_f1();
-	int da_a();
-	int dec_a();
-	int dec_r0();
-	int dec_r1();
-	int dec_r2();
-	int dec_r3();
-	int dec_r4();
-	int dec_r5();
-	int dec_r6();
-	int dec_r7();
-	int dis_i();
-	int dis_tcnti();
-	int djnz_r0();
-	int djnz_r1();
-	int djnz_r2();
-	int djnz_r3();
-	int djnz_r4();
-	int djnz_r5();
-	int djnz_r6();
-	int djnz_r7();
-	int en_i();
-	int en_tcnti();
-	int en_dma();
-	int en_flags();
-	int ent0_clk();
-	int in_a_p0();
-	int in_a_p1();
-	int in_a_p2();
-	int ins_a_bus();
-	int in_a_dbb();
-	int inc_a();
-	int inc_r0();
-	int inc_r1();
-	int inc_r2();
-	int inc_r3();
-	int inc_r4();
-	int inc_r5();
-	int inc_r6();
-	int inc_r7();
-	int inc_xr0();
-	int inc_xr1();
-	int jb_0();
-	int jb_1();
-	int jb_2();
-	int jb_3();
-	int jb_4();
-	int jb_5();
-	int jb_6();
-	int jb_7();
-	int jc();
-	int jf0();
-	int jf1();
-	int jnc();
-	int jni();
-	int jnibf();
-	int jnt_0();
-	int jnt_1();
-	int jnz();
-	int jobf();
-	int jtf();
-	int jt_0();
-	int jt_1();
-	int jz();
-	int jmp_0();
-	int jmp_1();
-	int jmp_2();
-	int jmp_3();
-	int jmp_4();
-	int jmp_5();
-	int jmp_6();
-	int jmp_7();
-	int jmpp_xa();
-	int mov_a_n();
-	int mov_a_psw();
-	int mov_a_r0();
-	int mov_a_r1();
-	int mov_a_r2();
-	int mov_a_r3();
-	int mov_a_r4();
-	int mov_a_r5();
-	int mov_a_r6();
-	int mov_a_r7();
-	int mov_a_xr0();
-	int mov_a_xr1();
-	int mov_a_t();
-	int mov_psw_a();
-	int mov_sts_a();
-	int mov_r0_a();
-	int mov_r1_a();
-	int mov_r2_a();
-	int mov_r3_a();
-	int mov_r4_a();
-	int mov_r5_a();
-	int mov_r6_a();
-	int mov_r7_a();
-	int mov_r0_n();
-	int mov_r1_n();
-	int mov_r2_n();
-	int mov_r3_n();
-	int mov_r4_n();
-	int mov_r5_n();
-	int mov_r6_n();
-	int mov_r7_n();
-	int mov_t_a();
-	int mov_xr0_a();
-	int mov_xr1_a();
-	int mov_xr0_n();
-	int mov_xr1_n();
-	int movd_a_p4();
-	int movd_a_p5();
-	int movd_a_p6();
-	int movd_a_p7();
-	int movd_p4_a();
-	int movd_p5_a();
-	int movd_p6_a();
-	int movd_p7_a();
-	int movp_a_xa();
-	int movp3_a_xa();
-	int movx_a_xr0();
-	int movx_a_xr1();
-	int movx_xr0_a();
-	int movx_xr1_a();
-	int nop();
-	int orl_a_r0();
-	int orl_a_r1();
-	int orl_a_r2();
-	int orl_a_r3();
-	int orl_a_r4();
-	int orl_a_r5();
-	int orl_a_r6();
-	int orl_a_r7();
-	int orl_a_xr0();
-	int orl_a_xr1();
-	int orl_a_n();
-	int orl_bus_n();
-	int orl_p1_n();
-	int orl_p2_n();
-	int orld_p4_a();
-	int orld_p5_a();
-	int orld_p6_a();
-	int orld_p7_a();
-	int outl_bus_a();
-	int outl_p0_a();
-	int outl_p1_a();
-	int outl_p2_a();
-	int out_dbb_a();
-	int ret();
-	int retr();
-	int rl_a();
-	int rlc_a();
-	int rr_a();
-	int rrc_a();
-	int sel_mb0();
-	int sel_mb1();
-	int sel_rb0();
-	int sel_rb1();
-	int stop_tcnt();
-	int strt_cnt();
-	int strt_t();
-	int swap_a();
-	int xch_a_r0();
-	int xch_a_r1();
-	int xch_a_r2();
-	int xch_a_r3();
-	int xch_a_r4();
-	int xch_a_r5();
-	int xch_a_r6();
-	int xch_a_r7();
-	int xch_a_xr0();
-	int xch_a_xr1();
-	int xchd_a_xr0();
-	int xchd_a_xr1();
-	int xrl_a_r0();
-	int xrl_a_r1();
-	int xrl_a_r2();
-	int xrl_a_r3();
-	int xrl_a_r4();
-	int xrl_a_r5();
-	int xrl_a_r6();
-	int xrl_a_r7();
-	int xrl_a_xr0();
-	int xrl_a_xr1();
-	int xrl_a_n();
+	void illegal();
+	void add_a_r0();
+	void add_a_r1();
+	void add_a_r2();
+	void add_a_r3();
+	void add_a_r4();
+	void add_a_r5();
+	void add_a_r6();
+	void add_a_r7();
+	void add_a_xr0();
+	void add_a_xr1();
+	void add_a_n();
+	void adc_a_r0();
+	void adc_a_r1();
+	void adc_a_r2();
+	void adc_a_r3();
+	void adc_a_r4();
+	void adc_a_r5();
+	void adc_a_r6();
+	void adc_a_r7();
+	void adc_a_xr0();
+	void adc_a_xr1();
+	void adc_a_n();
+	void anl_a_r0();
+	void anl_a_r1();
+	void anl_a_r2();
+	void anl_a_r3();
+	void anl_a_r4();
+	void anl_a_r5();
+	void anl_a_r6();
+	void anl_a_r7();
+	void anl_a_xr0();
+	void anl_a_xr1();
+	void anl_a_n();
+	void anl_bus_n();
+	void anl_p1_n();
+	void anl_p2_n();
+	void anld_p4_a();
+	void anld_p5_a();
+	void anld_p6_a();
+	void anld_p7_a();
+	void call_0();
+	void call_1();
+	void call_2();
+	void call_3();
+	void call_4();
+	void call_5();
+	void call_6();
+	void call_7();
+	void clr_a();
+	void clr_c();
+	void clr_f0();
+	void clr_f1();
+	void cpl_a();
+	void cpl_c();
+	void cpl_f0();
+	void cpl_f1();
+	void da_a();
+	void dec_a();
+	void dec_r0();
+	void dec_r1();
+	void dec_r2();
+	void dec_r3();
+	void dec_r4();
+	void dec_r5();
+	void dec_r6();
+	void dec_r7();
+	void dis_i();
+	void dis_tcnti();
+	void djnz_r0();
+	void djnz_r1();
+	void djnz_r2();
+	void djnz_r3();
+	void djnz_r4();
+	void djnz_r5();
+	void djnz_r6();
+	void djnz_r7();
+	void en_i();
+	void en_tcnti();
+	void en_dma();
+	void en_flags();
+	void ent0_clk();
+	void in_a_p0();
+	void in_a_p1();
+	void in_a_p2();
+	void ins_a_bus();
+	void in_a_dbb();
+	void inc_a();
+	void inc_r0();
+	void inc_r1();
+	void inc_r2();
+	void inc_r3();
+	void inc_r4();
+	void inc_r5();
+	void inc_r6();
+	void inc_r7();
+	void inc_xr0();
+	void inc_xr1();
+	void jb_0();
+	void jb_1();
+	void jb_2();
+	void jb_3();
+	void jb_4();
+	void jb_5();
+	void jb_6();
+	void jb_7();
+	void jc();
+	void jf0();
+	void jf1();
+	void jnc();
+	void jni();
+	void jnibf();
+	void jnt_0();
+	void jnt_1();
+	void jnz();
+	void jobf();
+	void jtf();
+	void jt_0();
+	void jt_1();
+	void jz();
+	void jmp_0();
+	void jmp_1();
+	void jmp_2();
+	void jmp_3();
+	void jmp_4();
+	void jmp_5();
+	void jmp_6();
+	void jmp_7();
+	void jmpp_xa();
+	void mov_a_n();
+	void mov_a_psw();
+	void mov_a_r0();
+	void mov_a_r1();
+	void mov_a_r2();
+	void mov_a_r3();
+	void mov_a_r4();
+	void mov_a_r5();
+	void mov_a_r6();
+	void mov_a_r7();
+	void mov_a_xr0();
+	void mov_a_xr1();
+	void mov_a_t();
+	void mov_psw_a();
+	void mov_sts_a();
+	void mov_r0_a();
+	void mov_r1_a();
+	void mov_r2_a();
+	void mov_r3_a();
+	void mov_r4_a();
+	void mov_r5_a();
+	void mov_r6_a();
+	void mov_r7_a();
+	void mov_r0_n();
+	void mov_r1_n();
+	void mov_r2_n();
+	void mov_r3_n();
+	void mov_r4_n();
+	void mov_r5_n();
+	void mov_r6_n();
+	void mov_r7_n();
+	void mov_t_a();
+	void mov_xr0_a();
+	void mov_xr1_a();
+	void mov_xr0_n();
+	void mov_xr1_n();
+	void movd_a_p4();
+	void movd_a_p5();
+	void movd_a_p6();
+	void movd_a_p7();
+	void movd_p4_a();
+	void movd_p5_a();
+	void movd_p6_a();
+	void movd_p7_a();
+	void movp_a_xa();
+	void movp3_a_xa();
+	void movx_a_xr0();
+	void movx_a_xr1();
+	void movx_xr0_a();
+	void movx_xr1_a();
+	void nop();
+	void orl_a_r0();
+	void orl_a_r1();
+	void orl_a_r2();
+	void orl_a_r3();
+	void orl_a_r4();
+	void orl_a_r5();
+	void orl_a_r6();
+	void orl_a_r7();
+	void orl_a_xr0();
+	void orl_a_xr1();
+	void orl_a_n();
+	void orl_bus_n();
+	void orl_p1_n();
+	void orl_p2_n();
+	void orld_p4_a();
+	void orld_p5_a();
+	void orld_p6_a();
+	void orld_p7_a();
+	void outl_bus_a();
+	void outl_p0_a();
+	void outl_p1_a();
+	void outl_p2_a();
+	void out_dbb_a();
+	void ret();
+	void retr();
+	void rl_a();
+	void rlc_a();
+	void rr_a();
+	void rrc_a();
+	void sel_mb0();
+	void sel_mb1();
+	void sel_rb0();
+	void sel_rb1();
+	void stop_tcnt();
+	void strt_cnt();
+	void strt_t();
+	void swap_a();
+	void xch_a_r0();
+	void xch_a_r1();
+	void xch_a_r2();
+	void xch_a_r3();
+	void xch_a_r4();
+	void xch_a_r5();
+	void xch_a_r6();
+	void xch_a_r7();
+	void xch_a_xr0();
+	void xch_a_xr1();
+	void xchd_a_xr0();
+	void xchd_a_xr1();
+	void xrl_a_r0();
+	void xrl_a_r1();
+	void xrl_a_r2();
+	void xrl_a_r3();
+	void xrl_a_r4();
+	void xrl_a_r5();
+	void xrl_a_r6();
+	void xrl_a_r7();
+	void xrl_a_xr0();
+	void xrl_a_xr1();
+	void xrl_a_n();
 };
 
 class i8021_device : public mcs48_cpu_device
 {
 public:
+	// configuration
+	auto p0_in_cb() { return bus_in_cb(); }
+	auto p0_out_cb() { return bus_out_cb(); }
+
 	// construction/destruction
 	i8021_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/mips/mips3.cpp mame-0.224+dfsg.1/src/devices/cpu/mips/mips3.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/mips/mips3.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/mips/mips3.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -5044,11 +5044,6 @@
 	}
 }
 
-void mips3_device::burn_cycles(int32_t cycles)
-{
-	execute_burn(cycles);
-}
-
 #if ENABLE_O2_DPRINTF
 #include "o2dprintf.hxx"
 #endif
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/mips/mips3drc.cpp mame-0.224+dfsg.1/src/devices/cpu/mips/mips3drc.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/mips/mips3drc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/mips/mips3drc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1247,6 +1247,8 @@
 			UML_CALLC(block, cfunc_printf_debug, this);                            // callc   printf_debug
 		}
 		UML_EXH(block, *m_tlb_mismatch, 0);                      // exh     tlb_mismatch,0
+		// Unconditional tlb exception, no point going further
+		return;
 	}
 
 	/* validate our TLB entry at this PC; if we fail, we need to handle it */
@@ -1280,6 +1282,8 @@
 				UML_CALLC(block, cfunc_printf_debug, this);                        // callc   printf_debug
 			}
 			UML_EXH(block, *m_tlb_mismatch, 0);                  // exh     tlb_mismatch,0
+			// Unconditional tlb exception, no point going further
+			return;
 		}
 	}
 
@@ -1331,7 +1335,7 @@
 	if (desc->targetpc != BRANCH_TARGET_DYNAMIC)
 	{
 		generate_update_cycles(block, compiler_temp, desc->targetpc, true); // <subtract cycles>
-		if (desc->flags & OPFLAG_INTRABLOCK_BRANCH)
+		if (!(m_drcoptions & MIPS3DRC_DISABLE_INTRABLOCK) && desc->flags & OPFLAG_INTRABLOCK_BRANCH)
 		{
 			UML_JMP(block, desc->targetpc | 0x80000000);                            // jmp     desc->targetpc | 0x80000000
 		}
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/mips/mips3.h mame-0.224+dfsg.1/src/devices/cpu/mips/mips3.h
--- mame-0.222+dfsg.1/src/devices/cpu/mips/mips3.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/mips/mips3.h	2020-08-26 08:57:19.000000000 +0000
@@ -310,7 +310,6 @@
 	void clear_fastram(uint32_t select_start);
 	void mips3drc_set_options(uint32_t options);
 	void mips3drc_add_hotspot(offs_t pc, uint32_t opcode, uint32_t cycles);
-	void burn_cycles(int32_t cycles);
 
 protected:
 	// device-level overrides
@@ -324,7 +323,6 @@
 	virtual uint32_t execute_input_lines() const noexcept override { return 6; }
 	virtual void execute_run() override;
 	virtual void execute_set_input(int inputnum, int state) override;
-	virtual void execute_burn(int32_t cycles) override { m_totalcycles += cycles; }
 
 	// device_memory_interface overrides
 	virtual space_config_vector memory_space_config() const override;
@@ -976,11 +974,11 @@
 #define MIPS3DRC_STRICT_COP0        0x0002          /* validate all COP0 instructions */
 #define MIPS3DRC_STRICT_COP1        0x0004          /* validate all COP1 instructions */
 #define MIPS3DRC_STRICT_COP2        0x0008          /* validate all COP2 instructions */
-#define MIPS3DRC_FLUSH_PC           0x0010          /* flush the PC value before each memory access */
+#define MIPS3DRC_DISABLE_INTRABLOCK 0x0010          /* disable intrablock branching */
 #define MIPS3DRC_CHECK_OVERFLOWS    0x0020          /* actually check overflows on add/sub instructions */
 #define MIPS3DRC_ACCURATE_DIVZERO   0x0040          /* load correct values into HI/LO on integer divide-by-zero */
 
-#define MIPS3DRC_COMPATIBLE_OPTIONS (MIPS3DRC_STRICT_VERIFY | MIPS3DRC_STRICT_COP1 | MIPS3DRC_STRICT_COP0 | MIPS3DRC_STRICT_COP2 | MIPS3DRC_FLUSH_PC)
+#define MIPS3DRC_COMPATIBLE_OPTIONS (MIPS3DRC_STRICT_VERIFY | MIPS3DRC_STRICT_COP1 | MIPS3DRC_STRICT_COP0 | MIPS3DRC_STRICT_COP2)
 #define MIPS3DRC_FASTEST_OPTIONS    (0)
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/mips/ps2vu.cpp mame-0.224+dfsg.1/src/devices/cpu/mips/ps2vu.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/mips/ps2vu.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/mips/ps2vu.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -996,7 +996,7 @@
 
 	save_item(NAME(m_p));
 
-	state_add(SONYVU1_P, "P", *(uint32_t*)&m_p).formatstr("%17s");;
+	state_add(SONYVU1_P, "P", *(uint32_t*)&m_p).formatstr("%17s");
 }
 
 void sonyvu1_device::device_reset()
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/nec/nec.cpp mame-0.224+dfsg.1/src/devices/cpu/nec/nec.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/nec/nec.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/nec/nec.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -107,6 +107,7 @@
 #include "emu.h"
 #include "nec.h"
 #include "necdasm.h"
+
 #include "debugger.h"
 
 typedef uint8_t BOOLEAN;
@@ -114,7 +115,7 @@
 typedef uint16_t WORD;
 typedef uint32_t DWORD;
 
-#include "necpriv.h"
+#include "necpriv.ipp"
 
 DEFINE_DEVICE_TYPE(V20,  v20_device,  "v20",  "NEC V20")
 DEFINE_DEVICE_TYPE(V30,  v30_device,  "v30",  "NEC V30")
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/nec/necpriv.h mame-0.224+dfsg.1/src/devices/cpu/nec/necpriv.h
--- mame-0.222+dfsg.1/src/devices/cpu/nec/necpriv.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/nec/necpriv.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,130 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Bryan McPhail
-/* Cpu types, steps of 8 to help the cycle count calculation */
-#define V33_TYPE 0
-#define V30_TYPE 8
-#define V20_TYPE 16
-
-/* interrupt vectors */
-enum
-{
-	NEC_DIVIDE_VECTOR   = 0,
-	NEC_TRAP_VECTOR     = 1,
-	NEC_NMI_VECTOR      = 2,
-	NEC_BRKV_VECTOR     = 4,
-	NEC_CHKIND_VECTOR   = 5
-};
-
-/* interrupt sources */
-enum INTSOURCES
-{
-	BRK = 0,
-	INT_IRQ = 1,
-	NMI_IRQ = 2
-};
-
-
-enum SREGS { DS1=0, PS, SS, DS0 };
-enum WREGS { AW=0, CW, DW, BW, SP, BP, IX, IY };
-enum BREGS {
-	AL = NATIVE_ENDIAN_VALUE_LE_BE(0x0, 0x1),
-	AH = NATIVE_ENDIAN_VALUE_LE_BE(0x1, 0x0),
-	CL = NATIVE_ENDIAN_VALUE_LE_BE(0x2, 0x3),
-	CH = NATIVE_ENDIAN_VALUE_LE_BE(0x3, 0x2),
-	DL = NATIVE_ENDIAN_VALUE_LE_BE(0x4, 0x5),
-	DH = NATIVE_ENDIAN_VALUE_LE_BE(0x5, 0x4),
-	BL = NATIVE_ENDIAN_VALUE_LE_BE(0x6, 0x7),
-	BH = NATIVE_ENDIAN_VALUE_LE_BE(0x7, 0x6)
-};
-
-#define Sreg(x)         m_sregs[x]
-#define Wreg(x)         m_regs.w[x]
-#define Breg(x)         m_regs.b[x]
-
-#define PC()       ((Sreg(PS)<<4)+m_ip)
-
-#define CF      (m_CarryVal!=0)
-#define SF      (m_SignVal<0)
-#define ZF      (m_ZeroVal==0)
-#define PF      parity_table[(BYTE)m_ParityVal]
-#define AF      (m_AuxVal!=0)
-#define OF      (m_OverVal!=0)
-
-/************************************************************************/
-
-#define read_mem_byte(a)            m_program->read_byte(m_chip_type == V33_TYPE ? v33_translate(a) : (a))
-#define read_mem_word(a)            m_program->read_word_unaligned(m_chip_type == V33_TYPE ? v33_translate(a) : (a))
-#define write_mem_byte(a,d)         m_program->write_byte(m_chip_type == V33_TYPE ? v33_translate(a) : (a), (d))
-#define write_mem_word(a,d)         m_program->write_word_unaligned(m_chip_type == V33_TYPE ? v33_translate(a) : (a), (d))
-
-#define read_port_byte(a)       io_read_byte(a)
-#define read_port_word(a)       io_read_word(a)
-#define write_port_byte(a,d)    io_write_byte((a),(d))
-#define write_port_word(a,d)    io_write_word((a),(d))
-
-/************************************************************************/
-
-#define CHANGE_PC do { EMPTY_PREfetch(); } while (0)
-
-#define SegBase(Seg) (Sreg(Seg) << 4)
-
-#define DefaultBase(Seg) ((m_seg_prefix && (Seg==DS0 || Seg==SS)) ? m_prefix_base : Sreg(Seg) << 4)
-
-#define GetMemB(Seg,Off) (read_mem_byte(DefaultBase(Seg) + (Off)))
-#define GetMemW(Seg,Off) (read_mem_word(DefaultBase(Seg) + (Off)))
-
-#define PutMemB(Seg,Off,x) { write_mem_byte(DefaultBase(Seg) + (Off), (x)); }
-#define PutMemW(Seg,Off,x) { write_mem_word(DefaultBase(Seg) + (Off), (x)); }
-
-/* prefetch timing */
-
-#define EMPTY_PREfetch()    m_prefetch_reset = 1
-
-
-#define PUSH(val) { Wreg(SP) -= 2; write_mem_word(((Sreg(SS)<<4)+Wreg(SP)), val); }
-#define POP(var) { Wreg(SP) += 2; var = read_mem_word(((Sreg(SS)<<4) + ((Wreg(SP)-2) & 0xffff))); }
-
-#define PUSH80(val) { Wreg(BP) -= 2; write_mem_word(((Sreg(DS0)<<4)+Wreg(BP)), val); }
-#define POP80(var) { Wreg(BP) += 2; var = read_mem_word(((Sreg(DS0)<<4) + ((Wreg(BP)-2) & 0xffff))); }
-
-#define BRKXA(xa) { if (m_chip_type == V33_TYPE) { nec_brk(fetch()); m_xa = xa; } else logerror("%06x: %sXA instruction is V33 exclusive\n", PC(), xa ? "BRK" : "RET"); }
-#define BRKEM { if (m_chip_type == V33_TYPE) logerror("%06x: BRKEM not supported on V33\n",PC()); else nec_brk(fetch()); }
-
-#define GetModRM uint32_t ModRM=fetch()
-
-/* Cycle count macros:
-    CLK  - cycle count is the same on all processors
-    CLKS - cycle count differs between processors, list all counts
-    CLKW - cycle count for word read/write differs for odd/even source/destination address
-    CLKM - cycle count for reg/mem instructions
-    CLKR - cycle count for reg/mem instructions with different counts for odd/even addresses
-
-
-    Prefetch & buswait time is not emulated.
-    Extra cycles for PUSH'ing or POP'ing registers to odd addresses is not emulated.
-*/
-
-#define CLK(all) m_icount-=all
-#define CLKS(v20,v30,v33) { const uint32_t ccount=(v20<<16)|(v30<<8)|v33; m_icount-=(ccount>>m_chip_type)&0x7f; }
-#define CLKW(v20o,v30o,v33o,v20e,v30e,v33e,addr) { const uint32_t ocount=(v20o<<16)|(v30o<<8)|v33o, ecount=(v20e<<16)|(v30e<<8)|v33e; m_icount-=(addr&1)?((ocount>>m_chip_type)&0x7f):((ecount>>m_chip_type)&0x7f); }
-#define CLKM(v20,v30,v33,v20m,v30m,v33m) { const uint32_t ccount=(v20<<16)|(v30<<8)|v33, mcount=(v20m<<16)|(v30m<<8)|v33m; m_icount-=( ModRM >=0xc0 )?((ccount>>m_chip_type)&0x7f):((mcount>>m_chip_type)&0x7f); }
-#define CLKR(v20o,v30o,v33o,v20e,v30e,v33e,vall,addr) { const uint32_t ocount=(v20o<<16)|(v30o<<8)|v33o, ecount=(v20e<<16)|(v30e<<8)|v33e; if (ModRM >=0xc0) m_icount-=vall; else m_icount-=(addr&1)?((ocount>>m_chip_type)&0x7f):((ecount>>m_chip_type)&0x7f); }
-
-/************************************************************************/
-#define CompressFlags() (WORD)(int(CF) | 0x02 | (int(PF) << 2) | (int(AF) << 4) | (int(ZF) << 6) \
-				| (int(SF) << 7) | (m_TF << 8) | (m_IF << 9) \
-				| (m_DF << 10) | (int(OF) << 11) | 0x7000 | (m_MF << 15))
-
-#define ExpandFlags(f) \
-{ \
-	m_CarryVal = (f) & 0x0001; \
-	m_ParityVal = !((f) & 0x0004); \
-	m_AuxVal = (f) & 0x0010; \
-	m_ZeroVal = !((f) & 0x0040); \
-	m_SignVal = (f) & 0x0080 ? -1 : 0; \
-	m_TF = ((f) & 0x0100) == 0x0100; \
-	m_IF = ((f) & 0x0200) == 0x0200; \
-	m_DF = ((f) & 0x0400) == 0x0400; \
-	m_OverVal = (f) & 0x0800; \
-	m_MF = (((f) & 0x8000) == 0x8000) || m_em; \
-}
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/nec/necpriv.ipp mame-0.224+dfsg.1/src/devices/cpu/nec/necpriv.ipp
--- mame-0.222+dfsg.1/src/devices/cpu/nec/necpriv.ipp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/nec/necpriv.ipp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,135 @@
+// license:BSD-3-Clause
+// copyright-holders:Bryan McPhail
+
+namespace {
+
+/* Cpu types, steps of 8 to help the cycle count calculation */
+#define V33_TYPE 0
+#define V30_TYPE 8
+#define V20_TYPE 16
+
+/* interrupt vectors */
+enum
+{
+	NEC_DIVIDE_VECTOR   = 0,
+	NEC_TRAP_VECTOR     = 1,
+	NEC_NMI_VECTOR      = 2,
+	NEC_BRKV_VECTOR     = 4,
+	NEC_CHKIND_VECTOR   = 5
+};
+
+/* interrupt sources */
+enum INTSOURCES
+{
+	BRK = 0,
+	INT_IRQ = 1,
+	NMI_IRQ = 2
+};
+
+
+enum SREGS { DS1=0, PS, SS, DS0 };
+enum WREGS { AW=0, CW, DW, BW, SP, BP, IX, IY };
+enum BREGS {
+	AL = NATIVE_ENDIAN_VALUE_LE_BE(0x0, 0x1),
+	AH = NATIVE_ENDIAN_VALUE_LE_BE(0x1, 0x0),
+	CL = NATIVE_ENDIAN_VALUE_LE_BE(0x2, 0x3),
+	CH = NATIVE_ENDIAN_VALUE_LE_BE(0x3, 0x2),
+	DL = NATIVE_ENDIAN_VALUE_LE_BE(0x4, 0x5),
+	DH = NATIVE_ENDIAN_VALUE_LE_BE(0x5, 0x4),
+	BL = NATIVE_ENDIAN_VALUE_LE_BE(0x6, 0x7),
+	BH = NATIVE_ENDIAN_VALUE_LE_BE(0x7, 0x6)
+};
+
+#define Sreg(x)         m_sregs[x]
+#define Wreg(x)         m_regs.w[x]
+#define Breg(x)         m_regs.b[x]
+
+#define PC()       ((Sreg(PS)<<4)+m_ip)
+
+#define CF      (m_CarryVal!=0)
+#define SF      (m_SignVal<0)
+#define ZF      (m_ZeroVal==0)
+#define PF      parity_table[(BYTE)m_ParityVal]
+#define AF      (m_AuxVal!=0)
+#define OF      (m_OverVal!=0)
+
+/************************************************************************/
+
+#define read_mem_byte(a)            m_program->read_byte(m_chip_type == V33_TYPE ? v33_translate(a) : (a))
+#define read_mem_word(a)            m_program->read_word_unaligned(m_chip_type == V33_TYPE ? v33_translate(a) : (a))
+#define write_mem_byte(a,d)         m_program->write_byte(m_chip_type == V33_TYPE ? v33_translate(a) : (a), (d))
+#define write_mem_word(a,d)         m_program->write_word_unaligned(m_chip_type == V33_TYPE ? v33_translate(a) : (a), (d))
+
+#define read_port_byte(a)       io_read_byte(a)
+#define read_port_word(a)       io_read_word(a)
+#define write_port_byte(a,d)    io_write_byte((a),(d))
+#define write_port_word(a,d)    io_write_word((a),(d))
+
+/************************************************************************/
+
+#define CHANGE_PC do { EMPTY_PREfetch(); } while (0)
+
+#define SegBase(Seg) (Sreg(Seg) << 4)
+
+#define DefaultBase(Seg) ((m_seg_prefix && (Seg==DS0 || Seg==SS)) ? m_prefix_base : Sreg(Seg) << 4)
+
+#define GetMemB(Seg,Off) (read_mem_byte(DefaultBase(Seg) + (Off)))
+#define GetMemW(Seg,Off) (read_mem_word(DefaultBase(Seg) + (Off)))
+
+#define PutMemB(Seg,Off,x) { write_mem_byte(DefaultBase(Seg) + (Off), (x)); }
+#define PutMemW(Seg,Off,x) { write_mem_word(DefaultBase(Seg) + (Off), (x)); }
+
+/* prefetch timing */
+
+#define EMPTY_PREfetch()    m_prefetch_reset = 1
+
+
+#define PUSH(val) { Wreg(SP) -= 2; write_mem_word(((Sreg(SS)<<4)+Wreg(SP)), val); }
+#define POP(var) { Wreg(SP) += 2; var = read_mem_word(((Sreg(SS)<<4) + ((Wreg(SP)-2) & 0xffff))); }
+
+#define PUSH80(val) { Wreg(BP) -= 2; write_mem_word(((Sreg(DS0)<<4)+Wreg(BP)), val); }
+#define POP80(var) { Wreg(BP) += 2; var = read_mem_word(((Sreg(DS0)<<4) + ((Wreg(BP)-2) & 0xffff))); }
+
+#define BRKXA(xa) { if (m_chip_type == V33_TYPE) { nec_brk(fetch()); m_xa = xa; } else logerror("%06x: %sXA instruction is V33 exclusive\n", PC(), xa ? "BRK" : "RET"); }
+#define BRKEM { if (m_chip_type == V33_TYPE) logerror("%06x: BRKEM not supported on V33\n",PC()); else nec_brk(fetch()); }
+
+#define GetModRM uint32_t ModRM=fetch()
+
+/* Cycle count macros:
+    CLK  - cycle count is the same on all processors
+    CLKS - cycle count differs between processors, list all counts
+    CLKW - cycle count for word read/write differs for odd/even source/destination address
+    CLKM - cycle count for reg/mem instructions
+    CLKR - cycle count for reg/mem instructions with different counts for odd/even addresses
+
+
+    Prefetch & buswait time is not emulated.
+    Extra cycles for PUSH'ing or POP'ing registers to odd addresses is not emulated.
+*/
+
+#define CLK(all) m_icount-=all
+#define CLKS(v20,v30,v33) { const uint32_t ccount=(v20<<16)|(v30<<8)|v33; m_icount-=(ccount>>m_chip_type)&0x7f; }
+#define CLKW(v20o,v30o,v33o,v20e,v30e,v33e,addr) { const uint32_t ocount=(v20o<<16)|(v30o<<8)|v33o, ecount=(v20e<<16)|(v30e<<8)|v33e; m_icount-=(addr&1)?((ocount>>m_chip_type)&0x7f):((ecount>>m_chip_type)&0x7f); }
+#define CLKM(v20,v30,v33,v20m,v30m,v33m) { const uint32_t ccount=(v20<<16)|(v30<<8)|v33, mcount=(v20m<<16)|(v30m<<8)|v33m; m_icount-=( ModRM >=0xc0 )?((ccount>>m_chip_type)&0x7f):((mcount>>m_chip_type)&0x7f); }
+#define CLKR(v20o,v30o,v33o,v20e,v30e,v33e,vall,addr) { const uint32_t ocount=(v20o<<16)|(v30o<<8)|v33o, ecount=(v20e<<16)|(v30e<<8)|v33e; if (ModRM >=0xc0) m_icount-=vall; else m_icount-=(addr&1)?((ocount>>m_chip_type)&0x7f):((ecount>>m_chip_type)&0x7f); }
+
+/************************************************************************/
+#define CompressFlags() (WORD)(int(CF) | 0x02 | (int(PF) << 2) | (int(AF) << 4) | (int(ZF) << 6) \
+				| (int(SF) << 7) | (m_TF << 8) | (m_IF << 9) \
+				| (m_DF << 10) | (int(OF) << 11) | 0x7000 | (m_MF << 15))
+
+#define ExpandFlags(f) \
+{ \
+	m_CarryVal = (f) & 0x0001; \
+	m_ParityVal = !((f) & 0x0004); \
+	m_AuxVal = (f) & 0x0010; \
+	m_ZeroVal = !((f) & 0x0040); \
+	m_SignVal = (f) & 0x0080 ? -1 : 0; \
+	m_TF = ((f) & 0x0100) == 0x0100; \
+	m_IF = ((f) & 0x0200) == 0x0200; \
+	m_DF = ((f) & 0x0400) == 0x0400; \
+	m_OverVal = (f) & 0x0800; \
+	m_MF = (((f) & 0x8000) == 0x8000) || m_em; \
+}
+
+} // anonymous namespace
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/nec/v25.cpp mame-0.224+dfsg.1/src/devices/cpu/nec/v25.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/nec/v25.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/nec/v25.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -35,6 +35,9 @@
 ****************************************************************************/
 
 #include "emu.h"
+#include "v25.h"
+#include "necdasm.h"
+
 #include "debugger.h"
 
 typedef uint8_t BOOLEAN;
@@ -42,9 +45,8 @@
 typedef uint16_t WORD;
 typedef uint32_t DWORD;
 
-#include "v25.h"
-#include "v25priv.h"
-#include "necdasm.h"
+#include "v25priv.ipp"
+
 
 DEFINE_DEVICE_TYPE(V25, v25_device, "v25", "NEC V25")
 DEFINE_DEVICE_TYPE(V35, v35_device, "v35", "NEC V35")
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/nec/v25priv.h mame-0.224+dfsg.1/src/devices/cpu/nec/v25priv.h
--- mame-0.222+dfsg.1/src/devices/cpu/nec/v25priv.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/nec/v25priv.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,188 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Bryan McPhail, Alex W. Jackson
-/* Cpu types, steps of 8 to help the cycle count calculation */
-#define V33_TYPE 0
-#define V30_TYPE 8
-#define V20_TYPE 16
-
-/* interrupt vectors */
-enum
-{
-	NEC_DIVIDE_VECTOR   = 0,
-	NEC_TRAP_VECTOR     = 1,
-	NEC_NMI_VECTOR      = 2,
-	NEC_BRKV_VECTOR     = 4,
-	NEC_CHKIND_VECTOR   = 5,
-	NEC_IBRK_VECTOR     = 19,
-	NEC_INTTU0_VECTOR   = 28,
-	NEC_INTTU1_VECTOR   = 29,
-	NEC_INTTU2_VECTOR   = 30,
-	NEC_INTD0_VECTOR    = 20,
-	NEC_INTD1_VECTOR    = 21,
-	NEC_INTP0_VECTOR    = 24,
-	NEC_INTP1_VECTOR    = 25,
-	NEC_INTP2_VECTOR    = 26,
-	NEC_INTSER0_VECTOR  = 12,
-	NEC_INTSR0_VECTOR   = 13,
-	NEC_INTST0_VECTOR   = 14,
-	NEC_INTSER1_VECTOR  = 16,
-	NEC_INTSR1_VECTOR   = 17,
-	NEC_INTST1_VECTOR   = 18,
-	NEC_INTTB_VECTOR    = 31
-};
-
-/* interrupt sources */
-enum INTSOURCES
-{
-	BRK     = 0,
-	INT_IRQ = 1,
-	NMI_IRQ = 1 << 1,
-	INTTU0  = 1 << 2,
-	INTTU1  = 1 << 3,
-	INTTU2  = 1 << 4,
-	INTD0   = 1 << 5,
-	INTD1   = 1 << 6,
-	INTP0   = 1 << 7,
-	INTP1   = 1 << 8,
-	INTP2   = 1 << 9,
-	INTSER0 = 1 << 10,
-	INTSR0  = 1 << 11,
-	INTST0  = 1 << 12,
-	INTSER1 = 1 << 13,
-	INTSR1  = 1 << 14,
-	INTST1  = 1 << 15,
-	INTTB   = 1 << 16,
-	BRKN    = 1 << 17,
-	BRKS    = 1 << 18
-};
-
-enum {
-	VECTOR_PC = 0x02/2,
-	PSW_SAVE  = 0x04/2,
-	PC_SAVE   = 0x06/2
-};
-
-enum SREGS {
-	DS1 = 0x0E/2,
-	PS  = 0x0C/2,
-	SS  = 0x0A/2,
-	DS0 = 0x08/2
-};
-
-enum WREGS {
-	AW = 0x1E/2,
-	CW = 0x1C/2,
-	DW = 0x1A/2,
-	BW = 0x18/2,
-	SP = 0x16/2,
-	BP = 0x14/2,
-	IX = 0x12/2,
-	IY = 0x10/2
-};
-
-enum BREGS {
-	AL = NATIVE_ENDIAN_VALUE_LE_BE(0x1E, 0x1F),
-	AH = NATIVE_ENDIAN_VALUE_LE_BE(0x1F, 0x1E),
-	CL = NATIVE_ENDIAN_VALUE_LE_BE(0x1C, 0x1D),
-	CH = NATIVE_ENDIAN_VALUE_LE_BE(0x1D, 0x1C),
-	DL = NATIVE_ENDIAN_VALUE_LE_BE(0x1A, 0x1B),
-	DH = NATIVE_ENDIAN_VALUE_LE_BE(0x1B, 0x1A),
-	BL = NATIVE_ENDIAN_VALUE_LE_BE(0x18, 0x19),
-	BH = NATIVE_ENDIAN_VALUE_LE_BE(0x19, 0x18)
-};
-
-#define SetRB(x)        do { m_RBW = (x) << 4; m_RBB = (x) << 5; } while (0)
-
-#define Sreg(x)         m_internal_ram[m_RBW + (x)]
-#define Wreg(x)         m_internal_ram[m_RBW + (x)]
-#define Breg(x)         reinterpret_cast<uint8_t *>(&m_internal_ram[0])[m_RBB + (x)]
-
-#define PC()       ((Sreg(PS)<<4)+m_ip)
-
-#define CF      (m_CarryVal!=0)
-#define SF      (m_SignVal<0)
-#define ZF      (m_ZeroVal==0)
-#define PF      parity_table[(BYTE)m_ParityVal]
-#define AF      (m_AuxVal!=0)
-#define OF      (m_OverVal!=0)
-#define RB      (m_RBW >> 4)
-
-/************************************************************************/
-
-#define read_mem_byte(a)            v25_read_byte((a))
-#define read_mem_word(a)            v25_read_word((a))
-#define write_mem_byte(a,d)         v25_write_byte((a),(d))
-#define write_mem_word(a,d)         v25_write_word((a),(d))
-
-#define read_port_byte(a)       m_io->read_byte(a)
-#define read_port_word(a)       m_io->read_word_unaligned(a)
-#define write_port_byte(a,d)    m_io->write_byte((a),(d))
-#define write_port_word(a,d)    m_io->write_word_unaligned((a),(d))
-
-/************************************************************************/
-
-#define CHANGE_PC do { EMPTY_PREfetch(); } while (0)
-
-#define SegBase(Seg) (Sreg(Seg) << 4)
-
-#define DefaultBase(Seg) ((m_seg_prefix && (Seg==DS0 || Seg==SS)) ? m_prefix_base : Sreg(Seg) << 4)
-
-#define GetMemB(Seg,Off) (read_mem_byte(DefaultBase(Seg) + (Off)))
-#define GetMemW(Seg,Off) (read_mem_word(DefaultBase(Seg) + (Off)))
-
-#define PutMemB(Seg,Off,x) { write_mem_byte(DefaultBase(Seg) + (Off), (x)); }
-#define PutMemW(Seg,Off,x) { write_mem_word(DefaultBase(Seg) + (Off), (x)); }
-
-/* prefetch timing */
-
-#define EMPTY_PREfetch()    m_prefetch_reset = 1
-
-
-#define PUSH(val) { Wreg(SP) -= 2; write_mem_word(((Sreg(SS)<<4)+Wreg(SP)), val); }
-#define POP(var) { Wreg(SP) += 2; var = read_mem_word(((Sreg(SS)<<4) + ((Wreg(SP)-2) & 0xffff))); }
-
-#define BRKXA(xa) { logerror("%06x: %sXA instruction is V33 exclusive\n", PC(), xa ? "BRK" : "RET"); }
-#define BRKEM
-
-#define GetModRM uint32_t ModRM=fetch()
-
-/* Cycle count macros:
-    CLK  - cycle count is the same on all processors
-    CLKS - cycle count differs between processors, list all counts
-    CLKW - cycle count for word read/write differs for odd/even source/destination address
-    CLKM - cycle count for reg/mem instructions
-    CLKR - cycle count for reg/mem instructions with different counts for odd/even addresses
-
-
-    Prefetch & buswait time is not emulated.
-    Extra cycles for PUSH'ing or POP'ing registers to odd addresses is not emulated.
-*/
-
-#define CLK(all) m_icount-=all
-#define CLKS(v20,v30,v33) { const uint32_t ccount=(v20<<16)|(v30<<8)|v33; m_icount-=(ccount>>m_chip_type)&0x7f; }
-#define CLKW(v20o,v30o,v33o,v20e,v30e,v33e,addr) { const uint32_t ocount=(v20o<<16)|(v30o<<8)|v33o, ecount=(v20e<<16)|(v30e<<8)|v33e; m_icount-=(addr&1)?((ocount>>m_chip_type)&0x7f):((ecount>>m_chip_type)&0x7f); }
-#define CLKM(v20,v30,v33,v20m,v30m,v33m) { const uint32_t ccount=(v20<<16)|(v30<<8)|v33, mcount=(v20m<<16)|(v30m<<8)|v33m; m_icount-=( ModRM >=0xc0 )?((ccount>>m_chip_type)&0x7f):((mcount>>m_chip_type)&0x7f); }
-#define CLKR(v20o,v30o,v33o,v20e,v30e,v33e,vall,addr) { const uint32_t ocount=(v20o<<16)|(v30o<<8)|v33o, ecount=(v20e<<16)|(v30e<<8)|v33e; if (ModRM >=0xc0) m_icount-=vall; else m_icount-=(addr&1)?((ocount>>m_chip_type)&0x7f):((ecount>>m_chip_type)&0x7f); }
-
-/************************************************************************/
-#define CompressFlags() (WORD)(CF | (m_IBRK << 1) | (PF << 2) | (m_F0 << 3) | (AF << 4) \
-				| (m_F1 << 5) | (ZF << 6) | (SF << 7) | (m_TF << 8) | (m_IF << 9) \
-				| (m_DF << 10) | (OF << 11) | (RB << 12) | (m_MF << 15))
-
-#define ExpandFlags(f) \
-{ \
-	m_CarryVal = (f) & 0x0001; \
-	m_IBRK = ((f) & 0x0002) == 0x0002; \
-	m_ParityVal = !((f) & 0x0004); \
-	m_F0 = ((f) & 0x0008) == 0x0008; \
-	m_AuxVal = (f) & 0x0010; \
-	m_F1 = ((f) & 0x0020) == 0x0020; \
-	m_ZeroVal = !((f) & 0x0040); \
-	m_SignVal = (f) & 0x0080 ? -1 : 0; \
-	m_TF = ((f) & 0x0100) == 0x0100; \
-	m_IF = ((f) & 0x0200) == 0x0200; \
-	m_DF = ((f) & 0x0400) == 0x0400; \
-	m_OverVal = (f) & 0x0800; \
-	/* RB only changes on BRKCS/RETRBI/TSKSW, so skip it */ \
-	m_MF = ((f) & 0x8000) == 0x8000; \
-}
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/nec/v25priv.ipp mame-0.224+dfsg.1/src/devices/cpu/nec/v25priv.ipp
--- mame-0.222+dfsg.1/src/devices/cpu/nec/v25priv.ipp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/nec/v25priv.ipp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,193 @@
+// license:BSD-3-Clause
+// copyright-holders:Bryan McPhail, Alex W. Jackson
+
+namespace {
+
+/* Cpu types, steps of 8 to help the cycle count calculation */
+#define V33_TYPE 0
+#define V30_TYPE 8
+#define V20_TYPE 16
+
+/* interrupt vectors */
+enum
+{
+	NEC_DIVIDE_VECTOR   = 0,
+	NEC_TRAP_VECTOR     = 1,
+	NEC_NMI_VECTOR      = 2,
+	NEC_BRKV_VECTOR     = 4,
+	NEC_CHKIND_VECTOR   = 5,
+	NEC_IBRK_VECTOR     = 19,
+	NEC_INTTU0_VECTOR   = 28,
+	NEC_INTTU1_VECTOR   = 29,
+	NEC_INTTU2_VECTOR   = 30,
+	NEC_INTD0_VECTOR    = 20,
+	NEC_INTD1_VECTOR    = 21,
+	NEC_INTP0_VECTOR    = 24,
+	NEC_INTP1_VECTOR    = 25,
+	NEC_INTP2_VECTOR    = 26,
+	NEC_INTSER0_VECTOR  = 12,
+	NEC_INTSR0_VECTOR   = 13,
+	NEC_INTST0_VECTOR   = 14,
+	NEC_INTSER1_VECTOR  = 16,
+	NEC_INTSR1_VECTOR   = 17,
+	NEC_INTST1_VECTOR   = 18,
+	NEC_INTTB_VECTOR    = 31
+};
+
+/* interrupt sources */
+enum INTSOURCES
+{
+	BRK     = 0,
+	INT_IRQ = 1,
+	NMI_IRQ = 1 << 1,
+	INTTU0  = 1 << 2,
+	INTTU1  = 1 << 3,
+	INTTU2  = 1 << 4,
+	INTD0   = 1 << 5,
+	INTD1   = 1 << 6,
+	INTP0   = 1 << 7,
+	INTP1   = 1 << 8,
+	INTP2   = 1 << 9,
+	INTSER0 = 1 << 10,
+	INTSR0  = 1 << 11,
+	INTST0  = 1 << 12,
+	INTSER1 = 1 << 13,
+	INTSR1  = 1 << 14,
+	INTST1  = 1 << 15,
+	INTTB   = 1 << 16,
+	BRKN    = 1 << 17,
+	BRKS    = 1 << 18
+};
+
+enum {
+	VECTOR_PC = 0x02/2,
+	PSW_SAVE  = 0x04/2,
+	PC_SAVE   = 0x06/2
+};
+
+enum SREGS {
+	DS1 = 0x0E/2,
+	PS  = 0x0C/2,
+	SS  = 0x0A/2,
+	DS0 = 0x08/2
+};
+
+enum WREGS {
+	AW = 0x1E/2,
+	CW = 0x1C/2,
+	DW = 0x1A/2,
+	BW = 0x18/2,
+	SP = 0x16/2,
+	BP = 0x14/2,
+	IX = 0x12/2,
+	IY = 0x10/2
+};
+
+enum BREGS {
+	AL = NATIVE_ENDIAN_VALUE_LE_BE(0x1E, 0x1F),
+	AH = NATIVE_ENDIAN_VALUE_LE_BE(0x1F, 0x1E),
+	CL = NATIVE_ENDIAN_VALUE_LE_BE(0x1C, 0x1D),
+	CH = NATIVE_ENDIAN_VALUE_LE_BE(0x1D, 0x1C),
+	DL = NATIVE_ENDIAN_VALUE_LE_BE(0x1A, 0x1B),
+	DH = NATIVE_ENDIAN_VALUE_LE_BE(0x1B, 0x1A),
+	BL = NATIVE_ENDIAN_VALUE_LE_BE(0x18, 0x19),
+	BH = NATIVE_ENDIAN_VALUE_LE_BE(0x19, 0x18)
+};
+
+#define SetRB(x)        do { m_RBW = (x) << 4; m_RBB = (x) << 5; } while (0)
+
+#define Sreg(x)         m_internal_ram[m_RBW + (x)]
+#define Wreg(x)         m_internal_ram[m_RBW + (x)]
+#define Breg(x)         reinterpret_cast<uint8_t *>(&m_internal_ram[0])[m_RBB + (x)]
+
+#define PC()       ((Sreg(PS)<<4)+m_ip)
+
+#define CF      (m_CarryVal!=0)
+#define SF      (m_SignVal<0)
+#define ZF      (m_ZeroVal==0)
+#define PF      parity_table[(BYTE)m_ParityVal]
+#define AF      (m_AuxVal!=0)
+#define OF      (m_OverVal!=0)
+#define RB      (m_RBW >> 4)
+
+/************************************************************************/
+
+#define read_mem_byte(a)            v25_read_byte((a))
+#define read_mem_word(a)            v25_read_word((a))
+#define write_mem_byte(a,d)         v25_write_byte((a),(d))
+#define write_mem_word(a,d)         v25_write_word((a),(d))
+
+#define read_port_byte(a)       m_io->read_byte(a)
+#define read_port_word(a)       m_io->read_word_unaligned(a)
+#define write_port_byte(a,d)    m_io->write_byte((a),(d))
+#define write_port_word(a,d)    m_io->write_word_unaligned((a),(d))
+
+/************************************************************************/
+
+#define CHANGE_PC do { EMPTY_PREfetch(); } while (0)
+
+#define SegBase(Seg) (Sreg(Seg) << 4)
+
+#define DefaultBase(Seg) ((m_seg_prefix && (Seg==DS0 || Seg==SS)) ? m_prefix_base : Sreg(Seg) << 4)
+
+#define GetMemB(Seg,Off) (read_mem_byte(DefaultBase(Seg) + (Off)))
+#define GetMemW(Seg,Off) (read_mem_word(DefaultBase(Seg) + (Off)))
+
+#define PutMemB(Seg,Off,x) { write_mem_byte(DefaultBase(Seg) + (Off), (x)); }
+#define PutMemW(Seg,Off,x) { write_mem_word(DefaultBase(Seg) + (Off), (x)); }
+
+/* prefetch timing */
+
+#define EMPTY_PREfetch()    m_prefetch_reset = 1
+
+
+#define PUSH(val) { Wreg(SP) -= 2; write_mem_word(((Sreg(SS)<<4)+Wreg(SP)), val); }
+#define POP(var) { Wreg(SP) += 2; var = read_mem_word(((Sreg(SS)<<4) + ((Wreg(SP)-2) & 0xffff))); }
+
+#define BRKXA(xa) { logerror("%06x: %sXA instruction is V33 exclusive\n", PC(), xa ? "BRK" : "RET"); }
+#define BRKEM
+
+#define GetModRM uint32_t ModRM=fetch()
+
+/* Cycle count macros:
+    CLK  - cycle count is the same on all processors
+    CLKS - cycle count differs between processors, list all counts
+    CLKW - cycle count for word read/write differs for odd/even source/destination address
+    CLKM - cycle count for reg/mem instructions
+    CLKR - cycle count for reg/mem instructions with different counts for odd/even addresses
+
+
+    Prefetch & buswait time is not emulated.
+    Extra cycles for PUSH'ing or POP'ing registers to odd addresses is not emulated.
+*/
+
+#define CLK(all) m_icount-=all
+#define CLKS(v20,v30,v33) { const uint32_t ccount=(v20<<16)|(v30<<8)|v33; m_icount-=(ccount>>m_chip_type)&0x7f; }
+#define CLKW(v20o,v30o,v33o,v20e,v30e,v33e,addr) { const uint32_t ocount=(v20o<<16)|(v30o<<8)|v33o, ecount=(v20e<<16)|(v30e<<8)|v33e; m_icount-=(addr&1)?((ocount>>m_chip_type)&0x7f):((ecount>>m_chip_type)&0x7f); }
+#define CLKM(v20,v30,v33,v20m,v30m,v33m) { const uint32_t ccount=(v20<<16)|(v30<<8)|v33, mcount=(v20m<<16)|(v30m<<8)|v33m; m_icount-=( ModRM >=0xc0 )?((ccount>>m_chip_type)&0x7f):((mcount>>m_chip_type)&0x7f); }
+#define CLKR(v20o,v30o,v33o,v20e,v30e,v33e,vall,addr) { const uint32_t ocount=(v20o<<16)|(v30o<<8)|v33o, ecount=(v20e<<16)|(v30e<<8)|v33e; if (ModRM >=0xc0) m_icount-=vall; else m_icount-=(addr&1)?((ocount>>m_chip_type)&0x7f):((ecount>>m_chip_type)&0x7f); }
+
+/************************************************************************/
+#define CompressFlags() (WORD)(CF | (m_IBRK << 1) | (PF << 2) | (m_F0 << 3) | (AF << 4) \
+				| (m_F1 << 5) | (ZF << 6) | (SF << 7) | (m_TF << 8) | (m_IF << 9) \
+				| (m_DF << 10) | (OF << 11) | (RB << 12) | (m_MF << 15))
+
+#define ExpandFlags(f) \
+{ \
+	m_CarryVal = (f) & 0x0001; \
+	m_IBRK = ((f) & 0x0002) == 0x0002; \
+	m_ParityVal = !((f) & 0x0004); \
+	m_F0 = ((f) & 0x0008) == 0x0008; \
+	m_AuxVal = (f) & 0x0010; \
+	m_F1 = ((f) & 0x0020) == 0x0020; \
+	m_ZeroVal = !((f) & 0x0040); \
+	m_SignVal = (f) & 0x0080 ? -1 : 0; \
+	m_TF = ((f) & 0x0100) == 0x0100; \
+	m_IF = ((f) & 0x0200) == 0x0200; \
+	m_DF = ((f) & 0x0400) == 0x0400; \
+	m_OverVal = (f) & 0x0800; \
+	/* RB only changes on BRKCS/RETRBI/TSKSW, so skip it */ \
+	m_MF = ((f) & 0x8000) == 0x8000; \
+}
+
+} // anonymous namespace
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/nec/v25sfr.cpp mame-0.224+dfsg.1/src/devices/cpu/nec/v25sfr.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/nec/v25sfr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/nec/v25sfr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -8,7 +8,7 @@
 
 #include "emu.h"
 #include "v25.h"
-#include "v25priv.h"
+#include "v25priv.ipp"
 
 void v25_common_device::ida_sfr_map(address_map &map)
 {
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/nec/v5x.cpp mame-0.224+dfsg.1/src/devices/cpu/nec/v5x.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/nec/v5x.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/nec/v5x.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -30,7 +30,7 @@
 #include "emu.h"
 #include "v5x.h"
 
-#include "necpriv.h"
+#include "necpriv.ipp"
 
 #define VERBOSE 0
 #include "logmacro.h"
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/rsp/rspdrc.cpp mame-0.224+dfsg.1/src/devices/cpu/rsp/rspdrc.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/rsp/rspdrc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/rsp/rspdrc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -142,7 +142,7 @@
 
 static void cfunc_read32(void *param)
 {
-	((rsp_device *)param)->ccfunc_read32();;
+	((rsp_device *)param)->ccfunc_read32();
 }
 
 inline void rsp_device::ccfunc_write8()
@@ -152,7 +152,7 @@
 
 static void cfunc_write8(void *param)
 {
-	((rsp_device *)param)->ccfunc_write8();;
+	((rsp_device *)param)->ccfunc_write8();
 }
 
 inline void rsp_device::ccfunc_write16()
@@ -162,7 +162,7 @@
 
 static void cfunc_write16(void *param)
 {
-	((rsp_device *)param)->ccfunc_write16();;
+	((rsp_device *)param)->ccfunc_write16();
 }
 
 inline void rsp_device::ccfunc_write32()
@@ -172,7 +172,7 @@
 
 static void cfunc_write32(void *param)
 {
-	((rsp_device *)param)->ccfunc_write32();;
+	((rsp_device *)param)->ccfunc_write32();
 }
 
 /*****************************************************************************/
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/tlcs870/tlcs870_ops.cpp mame-0.224+dfsg.1/src/devices/cpu/tlcs870/tlcs870_ops.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/tlcs870/tlcs870_ops.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/tlcs870/tlcs870_ops.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1077,7 +1077,7 @@
 	int val = READ8();
 	if (val & 0x80) val -= 0x100;
 
-	m_addr = m_tmppc + 2 + val;;
+	m_addr = m_tmppc + 2 + val;
 
 	set_JF();
 }
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/tlcs900/900tbl.hxx mame-0.224+dfsg.1/src/devices/cpu/tlcs900/900tbl.hxx
--- mame-0.222+dfsg.1/src/devices/cpu/tlcs900/900tbl.hxx	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/tlcs900/900tbl.hxx	2020-08-26 08:57:19.000000000 +0000
@@ -2569,7 +2569,7 @@
 
 void tlcs900_device::op_MAX()
 {
-	m_sr.b.h |= 0x04;
+	m_sr.b.h |= 0x08;
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/tlcs900/tmp96c141.cpp mame-0.224+dfsg.1/src/devices/cpu/tlcs900/tmp96c141.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/tlcs900/tmp96c141.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/tlcs900/tmp96c141.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,197 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/****************************************************************************
+
+    Toshiba TMP96C141 microcontroller
+
+    TMP96CM40 is the same as TMP96C141 with the addition of 32K of on-chip
+    ROM. TMP96PM40 is similar but with 32K OTP. TMP96C041 is RAMless as well
+    as ROMless.
+
+****************************************************************************/
+
+#include "emu.h"
+#include "tmp96c141.h"
+
+
+//**************************************************************************
+//  GLOBAL VARIABLES
+//**************************************************************************
+
+// device type definition
+DEFINE_DEVICE_TYPE(TMP96C141, tmp96c141_device, "tmp96c141", "Toshiba TMP96C141")
+
+
+//**************************************************************************
+//  DEVICE CONSTRUCTION AND INITIALIZATION
+//**************************************************************************
+
+//-------------------------------------------------
+//  tmp96c141_device - constructor
+//-------------------------------------------------
+
+tmp96c141_device::tmp96c141_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: tlcs900_device(mconfig, TMP96C141, tag, owner, clock)
+{
+}
+
+
+//-------------------------------------------------
+//  device_config_complete - device-specific startup
+//-------------------------------------------------
+
+void tmp96c141_device::device_config_complete()
+{
+	if (m_am8_16 == 0)
+		m_program_config = address_space_config("program", ENDIANNESS_LITTLE, 16, 24, 0, address_map_constructor(FUNC(tmp96c141_device::internal_mem), this));
+	else
+		m_program_config = address_space_config("program", ENDIANNESS_LITTLE, 8, 24, 0, address_map_constructor(FUNC(tmp96c141_device::internal_mem), this));
+}
+
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void tmp96c141_device::device_start()
+{
+	tlcs900_device::device_start();
+}
+
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void tmp96c141_device::device_reset()
+{
+	tlcs900_device::device_reset();
+}
+
+
+//**************************************************************************
+//  INTERNAL REGISTERS
+//**************************************************************************
+
+//-------------------------------------------------
+//  internal_mem - memory map for internal RAM and
+//  I/O registers
+//-------------------------------------------------
+
+void tmp96c141_device::internal_mem(address_map &map)
+{
+	map(0x000000, 0x00007f).unmaprw();
+	//map(0x000000, 0x000000).rw(FUNC(tmp96c141_device::p0_r), FUNC(tmp96c141_device::p0_w));
+	//map(0x000001, 0x000001).rw(FUNC(tmp96c141_device::p1_r), FUNC(tmp96c141_device::p1_w));
+	//map(0x000002, 0x000002).w(FUNC(tmp96c141_device::p0cr_w));
+	//map(0x000004, 0x000004).w(FUNC(tmp96c141_device::p1cr_w));
+	//map(0x000005, 0x000005).w(FUNC(tmp96c141_device::p1fc_w));
+	//map(0x000006, 0x000006).rw(FUNC(tmp96c141_device::p2_r), FUNC(tmp96c141_device::p2_w));
+	//map(0x000007, 0x000007).rw(FUNC(tmp96c141_device::p3_r), FUNC(tmp96c141_device::p3_w));
+	//map(0x000008, 0x000008).w(FUNC(tmp96c141_device::p2cr_w));
+	//map(0x000009, 0x000009).w(FUNC(tmp96c141_device::p2fc_w));
+	//map(0x00000a, 0x00000a).w(FUNC(tmp96c141_device::p3cr_w));
+	//map(0x00000b, 0x00000b).w(FUNC(tmp96c141_device::p3fc_w));
+	//map(0x00000c, 0x00000c).rw(FUNC(tmp96c141_device::p4_r), FUNC(tmp96c141_device::p4_w));
+	//map(0x00000d, 0x00000d).r(FUNC(tmp96c141_device::p5_r));
+	//map(0x00000e, 0x00000e).w(FUNC(tmp96c141_device::p4cr_w));
+	//map(0x000010, 0x000010).w(FUNC(tmp96c141_device::p4fc_w));
+	//map(0x000012, 0x000012).rw(FUNC(tmp96c141_device::p6_r), FUNC(tmp96c141_device::p6_w));
+	//map(0x000013, 0x000013).rw(FUNC(tmp96c141_device::p7_r), FUNC(tmp96c141_device::p7_w));
+	//map(0x000014, 0x000014).w(FUNC(tmp96c141_device::p6cr_w));
+	//map(0x000015, 0x000015).w(FUNC(tmp96c141_device::p6fc_w));
+	//map(0x000016, 0x000016).w(FUNC(tmp96c141_device::p7cr_w));
+	//map(0x000017, 0x000017).w(FUNC(tmp96c141_device::p7fc_w));
+	//map(0x000018, 0x000018).rw(FUNC(tmp96c141_device::p8_r), FUNC(tmp96c141_device::p8_w));
+	//map(0x000019, 0x000019).rw(FUNC(tmp96c141_device::p9_r), FUNC(tmp96c141_device::p9_w));
+	//map(0x00001a, 0x00001a).w(FUNC(tmp96c141_device::p8cr_w));
+	//map(0x00001b, 0x00001b).w(FUNC(tmp96c141_device::p8fc_w));
+	//map(0x00001c, 0x00001c).w(FUNC(tmp96c141_device::p9cr_w));
+	//map(0x00001d, 0x00001d).w(FUNC(tmp96c141_device::p9fc_w));
+	//map(0x000020, 0x000020).rw(FUNC(tmp96c141_device::trun_r), FUNC(tmp96c141_device::trun_w));
+	//map(0x000022, 0x000023).w(FUNC(tmp96c141_device::treg01_w));
+	//map(0x000024, 0x000024).w(FUNC(tmp96c141_device::tmod_w));
+	//map(0x000025, 0x000025).rw(FUNC(tmp96c141_device::tffcr_r), FUNC(tmp96c141_device::tffcr_w));
+	//map(0x000026, 0x000027).rw(FUNC(tmp96c141_device::treg23_r), FUNC(tmp96c141_device::treg23_w));
+	//map(0x000028, 0x000029).rw(FUNC(tmp96c141_device::pwmod_r), FUNC(tmp96c141_device::pwmod_w));
+	//map(0x00002a, 0x00002a).rw(FUNC(tmp96c141_device::pffcr_r), FUNC(tmp96c141_device::pffcr_w));
+	//map(0x000030, 0x000033).w(FUNC(tmp96c141_device::treg45_w));
+	//map(0x000034, 0x000037).r(FUNC(tmp96c141_device::cap12_r));
+	//map(0x000038, 0x000038).rw(FUNC(tmp96c141_device::t4mod_r), FUNC(tmp96c141_device::t4mod_w));
+	//map(0x000039, 0x000039).rw(FUNC(tmp96c141_device::t4ffcr_r), FUNC(tmp96c141_device::t4ffcr_w));
+	//map(0x00003a, 0x00003a).rw(FUNC(tmp96c141_device::t45cr_r), FUNC(tmp96c141_device::t45cr_w));
+	//map(0x000040, 0x000043).w(FUNC(tmp96c141_device::treg67_w));
+	//map(0x000044, 0x000047).r(FUNC(tmp96c141_device::cap34_r));
+	//map(0x000048, 0x000048).rw(FUNC(tmp96c141_device::t5mod_r), FUNC(tmp96c141_device::t5mod_w));
+	//map(0x000049, 0x000049).rw(FUNC(tmp96c141_device::t5ffcr_r), FUNC(tmp96c141_device::t5ffcr_w));
+	//map(0x00004c, 0x00004d).rw(FUNC(tmp96c141_device::pgreg_r), FUNC(tmp96c141_device::pgreg_w));
+	//map(0x00004e, 0x00004e).rw(FUNC(tmp96c141_device::pg01cr_r), FUNC(tmp96c141_device::pg01cr_w));
+	//map(0x000050, 0x000050).rw(FUNC(tmp96c141_device::sc0buf_r), FUNC(tmp96c141_device::sc0buf_w));
+	//map(0x000051, 0x000051).rw(FUNC(tmp96c141_device::sc0cr_r), FUNC(tmp96c141_device::sc0cr_w));
+	//map(0x000052, 0x000052).rw(FUNC(tmp96c141_device::sc0mod_r), FUNC(tmp96c141_device::sc0mod_w));
+	//map(0x000053, 0x000053).rw(FUNC(tmp96c141_device::br0cr_r), FUNC(tmp96c141_device::br0cr_w));
+	//map(0x000054, 0x000054).rw(FUNC(tmp96c141_device::sc1buf_r), FUNC(tmp96c141_device::sc1buf_w));
+	//map(0x000055, 0x000055).rw(FUNC(tmp96c141_device::sc1cr_r), FUNC(tmp96c141_device::sc1cr_w));
+	//map(0x000056, 0x000056).rw(FUNC(tmp96c141_device::sc1mod_r), FUNC(tmp96c141_device::sc1mod_w));
+	//map(0x000057, 0x000057).rw(FUNC(tmp96c141_device::br1cr_r), FUNC(tmp96c141_device::br1cr_w));
+	//map(0x000058, 0x000058).rw(FUNC(tmp96c141_device::ode_r), FUNC(tmp96c141_device::ode_w));
+	//map(0x00005c, 0x00005c).rw(FUNC(tmp96c141_device::wdmod_r), FUNC(tmp96c141_device::wdmod_w));
+	//map(0x00005d, 0x00005d).w(FUNC(tmp96c141_device::wdcr_w));
+	//map(0x00005e, 0x00005e).rw(FUNC(tmp96c141_device::admod_r), FUNC(tmp96c141_device::admod_w));
+	//map(0x000060, 0x000067).r(FUNC(tmp96c141_device::adreg_r));
+	//map(0x000068, 0x00006a).w(FUNC(tmp96c141_device::bcs_w));
+	//map(0x000070, 0x000078).rw(FUNC(tmp96c141_device::inte_r), FUNC(tmp96c141_device::inte_w));
+	//map(0x00007b, 0x00007b).w(FUNC(tmp96c141_device::iimc_w));
+	//map(0x00007c, 0x00007f).w(FUNC(tmp96c141_device::dmav_w));
+	map(0x000080, 0x00047f).ram();
+}
+
+
+//**************************************************************************
+//  EXECUTION CALLBACKS
+//**************************************************************************
+
+//-------------------------------------------------
+//  tlcs900_check_hdma -
+//-------------------------------------------------
+
+void tmp96c141_device::tlcs900_check_hdma()
+{
+}
+
+
+//-------------------------------------------------
+//  tlcs900_check_irqs -
+//-------------------------------------------------
+
+void tmp96c141_device::tlcs900_check_irqs()
+{
+}
+
+
+//-------------------------------------------------
+//  tlcs900_handle_ad -
+//-------------------------------------------------
+
+void tmp96c141_device::tlcs900_handle_ad()
+{
+}
+
+
+//-------------------------------------------------
+//  tlcs900_handle_timers -
+//-------------------------------------------------
+
+void tmp96c141_device::tlcs900_handle_timers()
+{
+}
+
+
+//-------------------------------------------------
+//  execute_set_input - called when a synchronized
+//  input is changed
+//-------------------------------------------------
+
+void tmp96c141_device::execute_set_input(int inputnum, int state)
+{
+}
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/tlcs900/tmp96c141.h mame-0.224+dfsg.1/src/devices/cpu/tlcs900/tmp96c141.h
--- mame-0.222+dfsg.1/src/devices/cpu/tlcs900/tmp96c141.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/tlcs900/tmp96c141.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,98 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/****************************************************************************
+
+    Toshiba TMP96C141 microcontroller
+
+*****************************************************************************
+
+       (AN0)PS0  73 ----------------+ +---------------- 72  P42(_CS2/_CAS2)
+       (AN1)PS1  74 --------------+ | | +-------------- 71  P41(_CS1/_CAS1)
+       (AN2)PS2  75 ------------+ | | | | +------------ 70  P40(_CS0/_CAS0)
+       (AN3)PS3  76 ----------+ | | | | | | +---------- 69  P37(_RAS)
+            VCC  77 --------+ | | | | | | | | +-------- 68  P36(R/_W)
+           VREF  78 ------+ | | | | | | | | | | +------ 67  P35(_BUSAK)
+           AGND  79 ----+ | | | | | | | | | | | | +---- 66  P34(_BUSRQ)
+            VSS  80 --+ | | | | | | | | | | | | | | +-- 65  P33(_WAIT)
+                     _|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_
+      (PG00)P60   1 |   _                             | 64  P32(_HWR)
+      (PG01)P61   2 |  (_)                            | 63  P31(_WR)
+      (PG02)P62   3 |                                 | 62  P30(_RD)
+      (PG03)P63   4 |                                 | 61  P27(A7/A23)
+      (PG10)P64   5 |                                 | 60  P26(A6/A22)
+      (PG11)P65   6 |                                 | 59  P25(A5/A21)
+      (PG12)P66   7 |                                 | 58  P24(A4/A20)
+      (PG13)P67   8 |                                 | 57  P23(A3/A19)
+       (TI0)P70   9 |                                 | 56  P22(A2/A18)
+       (TO1)P71  10 |                                 | 55  P21(A1/A17)
+       (TO2)P72  11 |                                 | 54  P20(A0/A16)
+       (TO3)P73  12 |           TMP96C141AF           | 53  VSS
+  (INT4/TI4)P80  13 |             (QFP80)             | 52  P17(AD15/A15)
+  (INT5/TI5)P81  14 |                                 | 51  P16(AD14/A14)
+       (TO4)P82  15 |                                 | 50  P15(AD13/A13)
+       (TO5)P83  16 |                                 | 49  P14(AD12/A12)
+  (INT6/TI6)P84  17 |                                 | 48  P13(AD11/A11)
+  (INT7/TI7)P85  18 |                                 | 47  P12(AD10/A10)
+       (TO6)P86  19 |                                 | 46  P11(AD9/A9)
+       (TO7)P87  20 |                                 | 45  P10(AD8/A8)
+           _NMI  21 |                                 | 44  P07(AD7)
+        _WDTOUT  22 |                                 | 43  P06(AD6)
+         _RESET  23 |                                 | 42  P05(AD5)
+            CLK  24 |_________________________________| 41  P04(AD4)
+                      | | | | | | | | | | | | | | | |
+            VSS  25 --+ | | | | | | | | | | | | | | +-- 40  P03(AD3)
+             X1  26 ----+ | | | | | | | | | | | | +---- 39  P02(AD2)
+             X2  27 ------+ | | | | | | | | | | +------ 38  P01(AD1)
+            _EA  28 --------+ | | | | | | | | +-------- 37  P00(AD0)
+      (TXD0)P90  29 ----------+ | | | | | | +---------- 36  VCC
+      (RXD0)P91  30 ------------+ | | | | +------------ 35  ALE
+     (_CTS0)P92  31 --------------+ | | +-------------- 34  P95(SCLK1)
+      (TXD1)P93  32 ----------------+ +---------------- 33  P94(RXD1)
+
+****************************************************************************/
+
+#ifndef MAME_CPU_TLCS900_TMP96C141_H
+#define MAME_CPU_TLCS900_TMP96C141_H
+
+#pragma once
+
+#include "tlcs900.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> tmp96c141_device
+
+class tmp96c141_device : public tlcs900_device
+{
+public:
+	// device type constructor
+	tmp96c141_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+	// TODO: configuration helpers
+
+protected:
+	// device-level overrides
+	virtual void device_config_complete() override;
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// device_execute_interface overrides
+	virtual void execute_set_input(int inputnum, int state) override;
+
+	// tlcs900_device overrides
+	virtual void tlcs900_check_hdma() override;
+	virtual void tlcs900_check_irqs() override;
+	virtual void tlcs900_handle_ad() override;
+	virtual void tlcs900_handle_timers() override;
+
+private:
+	void internal_mem(address_map &map);
+};
+
+// device type declaration
+DECLARE_DEVICE_TYPE(TMP96C141, tmp96c141_device)
+
+#endif // MAME_CPU_TLCS900_TMP96C141_H
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/tms34010/34010fld.hxx mame-0.224+dfsg.1/src/devices/cpu/tms34010/34010fld.hxx
--- mame-0.222+dfsg.1/src/devices/cpu/tms34010/34010fld.hxx	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/tms34010/34010fld.hxx	2020-08-26 08:57:19.000000000 +0000
@@ -484,13 +484,7 @@
 uint32_t tms340x0_device::rfield_s_08(offs_t offset)
 {
 	uint32_t ret;
-	if (offset & 0x07)
-	{
-		RFIELDMAC(0xff,9);
-	}
-
-	else
-		ret = TMS34010_RDMEM(offset);
+	RFIELDMAC_8();
 	return (int32_t)(int8_t)ret;
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/tms34010/34010gfx.hxx mame-0.224+dfsg.1/src/devices/cpu/tms34010/34010gfx.hxx
--- mame-0.222+dfsg.1/src/devices/cpu/tms34010/34010gfx.hxx	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/tms34010/34010gfx.hxx	2020-08-26 08:57:19.000000000 +0000
@@ -205,40 +205,40 @@
 
 
 /* Shift register handling */
-void tms340x0_device::memory_w(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t offset,uint16_t data)
+void tms340x0_device::memory_w(offs_t offset, uint16_t data)
 {
 	//logerror("memory_w %08x %04x\n", offset << 3, data);
 	if((offset << 3) == 0x02005010 && data == 0x0000) {
 		machine().debug_break();
 		//      abort();
 	}
-	space.write_word(offset, data);
+	TMS34010_WRMEM_WORD(offset, data);
 }
 
-uint16_t tms340x0_device::memory_r(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t offset)
+uint16_t tms340x0_device::memory_r(offs_t offset)
 {
-	return space.read_word(offset);
+	return TMS34010_RDMEM_WORD(offset);
 }
 
-void tms340x0_device::shiftreg_w(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t offset,uint16_t data)
+void tms340x0_device::shiftreg_w(offs_t offset, uint16_t data)
 {
 	//logerror("shiftreg_w %08x %04x\n", offset << 3, data);
 	if (!m_from_shiftreg_cb.isnull())
-		m_from_shiftreg_cb(space, offset, &m_shiftreg[0]);
+		m_from_shiftreg_cb(offset, &m_shiftreg[0]);
 	else
 		logerror("From ShiftReg function not set. PC = %08X\n", m_pc);
 }
 
-uint16_t tms340x0_device::shiftreg_r(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t offset)
+uint16_t tms340x0_device::shiftreg_r(offs_t offset)
 {
 	if (!m_to_shiftreg_cb.isnull())
-		m_to_shiftreg_cb(space, offset, &m_shiftreg[0]);
+		m_to_shiftreg_cb(offset, &m_shiftreg[0]);
 	else
 		logerror("To ShiftReg function not set. PC = %08X\n", m_pc);
 	return m_shiftreg[0];
 }
 
-uint16_t tms340x0_device::dummy_shiftreg_r(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t offset)
+uint16_t tms340x0_device::dummy_shiftreg_r(offs_t offset)
 {
 	return m_shiftreg[0];
 }
@@ -1034,13 +1034,13 @@
 			uint32_t srcword, dstword = 0;
 
 			/* fetch the initial source word */
-			srcword = (this->*word_read)(m_program, srcwordaddr++ << 4);
+			srcword = (this->*word_read)(srcwordaddr++ << 4);
 			readwrites++;
 
 			/* fetch the initial dest word */
 			if (PIXEL_OP_REQUIRES_SOURCE || TRANSPARENCY || (daddr & 0x0f) != 0)
 			{
-				dstword = (this->*word_read)(m_program, dstwordaddr << 4);
+				dstword = (this->*word_read)(dstwordaddr << 4);
 				readwrites++;
 			}
 
@@ -1053,7 +1053,7 @@
 				/* fetch more words if necessary */
 				if (srcbit + BITS_PER_PIXEL > 16)
 				{
-					srcword |= (this->*word_read)(m_program, srcwordaddr++ << 4) << 16;
+					srcword |= (this->*word_read)(srcwordaddr++ << 4) << 16;
 					readwrites++;
 				}
 
@@ -1070,7 +1070,7 @@
 				if (PIXEL_OP_REQUIRES_SOURCE || TRANSPARENCY)
 					if (dstbit + BITS_PER_PIXEL > 16)
 					{
-						dstword |= (this->*word_read)(m_program, (dstwordaddr + 1) << 4) << 16;
+						dstword |= (this->*word_read)((dstwordaddr + 1) << 4) << 16;
 						readwrites++;
 					}
 
@@ -1085,7 +1085,7 @@
 				dstbit += BITS_PER_PIXEL;
 				if (dstbit > 16)
 				{
-					(this->*word_write)(m_program, dstwordaddr++ << 4, dstword);
+					(this->*word_write)(dstwordaddr++ << 4, dstword);
 					readwrites++;
 					dstbit -= 16;
 					dstword >>= 16;
@@ -1098,13 +1098,13 @@
 				/* if we're right-partial, read and mask the remaining bits */
 				if (dstbit != 16)
 				{
-					uint16_t origdst = (this->*word_read)(m_program, dstwordaddr << 4);
+					uint16_t origdst = (this->*word_read)(dstwordaddr << 4);
 					uint16_t mask = 0xffff << dstbit;
 					dstword = (dstword & ~mask) | (origdst & mask);
 					readwrites++;
 				}
 
-				(this->*word_write)(m_program, dstwordaddr++ << 4, dstword);
+				(this->*word_write)(dstwordaddr++ << 4, dstword);
 				readwrites++;
 			}
 
@@ -1136,14 +1136,14 @@
 			dwordaddr = daddr >> 4;
 
 			/* fetch the initial source word */
-			srcword = (this->*word_read)(m_program, swordaddr++ << 4);
+			srcword = (this->*word_read)(swordaddr++ << 4);
 			srcmask = PIXEL_MASK << (saddr & 15);
 
 			/* handle the left partial word */
 			if (left_partials != 0)
 			{
 				/* fetch the destination word */
-				dstword = (this->*word_read)(m_program, dwordaddr << 4);
+				dstword = (this->*word_read)(dwordaddr << 4);
 				dstmask = PIXEL_MASK << (daddr & 15);
 
 				/* loop over partials */
@@ -1152,7 +1152,7 @@
 					/* fetch another word if necessary */
 					if (srcmask == 0)
 					{
-						srcword = (this->*word_read)(m_program, swordaddr++ << 4);
+						srcword = (this->*word_read)(swordaddr++ << 4);
 						srcmask = PIXEL_MASK;
 					}
 
@@ -1174,7 +1174,7 @@
 				}
 
 				/* write the result */
-				(this->*word_write)(m_program, dwordaddr++ << 4, dstword);
+				(this->*word_write)(dwordaddr++ << 4, dstword);
 			}
 
 			/* loop over full words */
@@ -1182,7 +1182,7 @@
 			{
 				/* fetch the destination word (if necessary) */
 				if (PIXEL_OP_REQUIRES_SOURCE || TRANSPARENCY)
-					dstword = (this->*word_read)(m_program, dwordaddr << 4);
+					dstword = (this->*word_read)(dwordaddr << 4);
 				else
 					dstword = 0;
 				dstmask = PIXEL_MASK;
@@ -1193,7 +1193,7 @@
 					/* fetch another word if necessary */
 					if (srcmask == 0)
 					{
-						srcword = (this->*word_read)(m_program, swordaddr++ << 4);
+						srcword = (this->*word_read)(swordaddr++ << 4);
 						srcmask = PIXEL_MASK;
 					}
 
@@ -1215,14 +1215,14 @@
 				}
 
 				/* write the result */
-				(this->*word_write)(m_program, dwordaddr++ << 4, dstword);
+				(this->*word_write)(dwordaddr++ << 4, dstword);
 			}
 
 			/* handle the right partial word */
 			if (right_partials != 0)
 			{
 				/* fetch the destination word */
-				dstword = (this->*word_read)(m_program, dwordaddr << 4);
+				dstword = (this->*word_read)(dwordaddr << 4);
 				dstmask = PIXEL_MASK;
 
 				/* loop over partials */
@@ -1232,7 +1232,7 @@
 					if (srcmask == 0)
 					{
 		LOGGFX(("  right fetch @ %08x\n", swordaddr));
-						srcword = (this->*word_read)(m_program, swordaddr++ << 4);
+						srcword = (this->*word_read)(swordaddr++ << 4);
 						srcmask = PIXEL_MASK;
 					}
 
@@ -1254,7 +1254,7 @@
 				}
 
 				/* write the result */
-				(this->*word_write)(m_program, dwordaddr++ << 4, dstword);
+				(this->*word_write)(dwordaddr++ << 4, dstword);
 			}
 #endif
 
@@ -1405,14 +1405,14 @@
 			dwordaddr = (daddr + 15) >> 4;
 
 			/* fetch the initial source word */
-			srcword = (this->*word_read)(m_program, --swordaddr << 4);
+			srcword = (this->*word_read)(--swordaddr << 4);
 			srcmask = PIXEL_MASK << ((saddr - BITS_PER_PIXEL) & 15);
 
 			/* handle the right partial word */
 			if (right_partials != 0)
 			{
 				/* fetch the destination word */
-				dstword = (this->*word_read)(m_program, --dwordaddr << 4);
+				dstword = (this->*word_read)(--dwordaddr << 4);
 				dstmask = PIXEL_MASK << ((daddr - BITS_PER_PIXEL) & 15);
 
 				/* loop over partials */
@@ -1421,7 +1421,7 @@
 					/* fetch source pixel if necessary */
 					if (srcmask == 0)
 					{
-						srcword = (this->*word_read)(m_program, --swordaddr << 4);
+						srcword = (this->*word_read)(--swordaddr << 4);
 						srcmask = PIXEL_MASK << (16 - BITS_PER_PIXEL);
 					}
 
@@ -1448,7 +1448,7 @@
 				}
 
 				/* write the result */
-				(this->*word_write)(m_program, dwordaddr << 4, dstword);
+				(this->*word_write)(dwordaddr << 4, dstword);
 			}
 
 			/* loop over full words */
@@ -1457,7 +1457,7 @@
 				/* fetch the destination word (if necessary) */
 				dwordaddr--;
 				if (PIXEL_OP_REQUIRES_SOURCE || TRANSPARENCY)
-					dstword = (this->*word_read)(m_program, dwordaddr << 4);
+					dstword = (this->*word_read)(dwordaddr << 4);
 				else
 					dstword = 0;
 				dstmask = PIXEL_MASK << (16 - BITS_PER_PIXEL);
@@ -1468,7 +1468,7 @@
 					/* fetch source pixel if necessary */
 					if (srcmask == 0)
 					{
-						srcword = (this->*word_read)(m_program, --swordaddr << 4);
+						srcword = (this->*word_read)(--swordaddr << 4);
 						srcmask = PIXEL_MASK << (16 - BITS_PER_PIXEL);
 					}
 
@@ -1495,14 +1495,14 @@
 				}
 
 				/* write the result */
-				(this->*word_write)(m_program, dwordaddr << 4, dstword);
+				(this->*word_write)(dwordaddr << 4, dstword);
 			}
 
 			/* handle the left partial word */
 			if (left_partials != 0)
 			{
 				/* fetch the destination word */
-				dstword = (this->*word_read)(m_program, --dwordaddr << 4);
+				dstword = (this->*word_read)(--dwordaddr << 4);
 				dstmask = PIXEL_MASK << (16 - BITS_PER_PIXEL);
 
 				/* loop over partials */
@@ -1511,7 +1511,7 @@
 					/* fetch the source pixel if necessary */
 					if (srcmask == 0)
 					{
-						srcword = (this->*word_read)(m_program, --swordaddr << 4);
+						srcword = (this->*word_read)(--swordaddr << 4);
 						srcmask = PIXEL_MASK << (16 - BITS_PER_PIXEL);
 					}
 
@@ -1538,7 +1538,7 @@
 				}
 
 				/* write the result */
-				(this->*word_write)(m_program, dwordaddr << 4, dstword);
+				(this->*word_write)(dwordaddr << 4, dstword);
 			}
 
 			/* update for next row */
@@ -1663,14 +1663,14 @@
 			dwordaddr = daddr >> 4;
 
 			/* fetch the initial source word */
-			srcword = (this->*word_read)(m_program, swordaddr++ << 4);
+			srcword = (this->*word_read)(swordaddr++ << 4);
 			srcmask = 1 << (saddr & 15);
 
 			/* handle the left partial word */
 			if (left_partials != 0)
 			{
 				/* fetch the destination word */
-				dstword = (this->*word_read)(m_program, dwordaddr << 4);
+				dstword = (this->*word_read)(dwordaddr << 4);
 				dstmask = PIXEL_MASK << (daddr & 15);
 
 				/* loop over partials */
@@ -1687,7 +1687,7 @@
 					srcmask <<= 1;
 					if (srcmask == 0)
 					{
-						srcword = (this->*word_read)(m_program, swordaddr++ << 4);
+						srcword = (this->*word_read)(swordaddr++ << 4);
 						srcmask = 0x0001;
 					}
 
@@ -1696,7 +1696,7 @@
 				}
 
 				/* write the result */
-				(this->*word_write)(m_program, dwordaddr++ << 4, dstword);
+				(this->*word_write)(dwordaddr++ << 4, dstword);
 			}
 
 			/* loop over full words */
@@ -1704,7 +1704,7 @@
 			{
 				/* fetch the destination word (if necessary) */
 				if (PIXEL_OP_REQUIRES_SOURCE || TRANSPARENCY)
-					dstword = (this->*word_read)(m_program, dwordaddr << 4);
+					dstword = (this->*word_read)(dwordaddr << 4);
 				else
 					dstword = 0;
 				dstmask = PIXEL_MASK;
@@ -1723,7 +1723,7 @@
 					srcmask <<= 1;
 					if (srcmask == 0)
 					{
-						srcword = (this->*word_read)(m_program, swordaddr++ << 4);
+						srcword = (this->*word_read)(swordaddr++ << 4);
 						srcmask = 0x0001;
 					}
 
@@ -1732,14 +1732,14 @@
 				}
 
 				/* write the result */
-				(this->*word_write)(m_program, dwordaddr++ << 4, dstword);
+				(this->*word_write)(dwordaddr++ << 4, dstword);
 			}
 
 			/* handle the right partial word */
 			if (right_partials != 0)
 			{
 				/* fetch the destination word */
-				dstword = (this->*word_read)(m_program, dwordaddr << 4);
+				dstword = (this->*word_read)(dwordaddr << 4);
 				dstmask = PIXEL_MASK;
 
 				/* loop over partials */
@@ -1756,7 +1756,7 @@
 					srcmask <<= 1;
 					if (srcmask == 0)
 					{
-						srcword = (this->*word_read)(m_program, swordaddr++ << 4);
+						srcword = (this->*word_read)(swordaddr++ << 4);
 						srcmask = 0x0001;
 					}
 
@@ -1765,7 +1765,7 @@
 				}
 
 				/* write the result */
-				(this->*word_write)(m_program, dwordaddr++ << 4, dstword);
+				(this->*word_write)(dwordaddr++ << 4, dstword);
 			}
 
 			/* update for next row */
@@ -1879,7 +1879,7 @@
 			if (left_partials != 0)
 			{
 				/* fetch the destination word */
-				dstword = (this->*word_read)(m_program, dwordaddr << 4);
+				dstword = (this->*word_read)(dwordaddr << 4);
 				dstmask = PIXEL_MASK << (daddr & 15);
 
 				/* loop over partials */
@@ -1896,7 +1896,7 @@
 				}
 
 				/* write the result */
-				(this->*word_write)(m_program, dwordaddr++ << 4, dstword);
+				(this->*word_write)(dwordaddr++ << 4, dstword);
 			}
 
 			/* loop over full words */
@@ -1904,7 +1904,7 @@
 			{
 				/* fetch the destination word (if necessary) */
 				if (PIXEL_OP_REQUIRES_SOURCE || TRANSPARENCY)
-					dstword = (this->*word_read)(m_program, dwordaddr << 4);
+					dstword = (this->*word_read)(dwordaddr << 4);
 				else
 					dstword = 0;
 				dstmask = PIXEL_MASK;
@@ -1923,14 +1923,14 @@
 				}
 
 				/* write the result */
-				(this->*word_write)(m_program, dwordaddr++ << 4, dstword);
+				(this->*word_write)(dwordaddr++ << 4, dstword);
 			}
 
 			/* handle the right partial word */
 			if (right_partials != 0)
 			{
 				/* fetch the destination word */
-				dstword = (this->*word_read)(m_program, dwordaddr << 4);
+				dstword = (this->*word_read)(dwordaddr << 4);
 				dstmask = PIXEL_MASK;
 
 				/* loop over partials */
@@ -1947,7 +1947,7 @@
 				}
 
 				/* write the result */
-				(this->*word_write)(m_program, dwordaddr++ << 4, dstword);
+				(this->*word_write)(dwordaddr++ << 4, dstword);
 			}
 
 			/* update for next row */
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/tms34010/34010ops.h mame-0.224+dfsg.1/src/devices/cpu/tms34010/34010ops.h
--- mame-0.222+dfsg.1/src/devices/cpu/tms34010/34010ops.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/tms34010/34010ops.h	2020-08-26 08:57:19.000000000 +0000
@@ -21,24 +21,6 @@
     MEMORY I/O MACROS
 ***************************************************************************/
 
-#define TMS34010_RDMEM(A)         ((unsigned)m_program.read_byte (A))
-#define TMS34010_RDMEM_WORD(A)    ((unsigned)m_program.read_word (A))
-inline uint32_t tms340x0_device::TMS34010_RDMEM_DWORD(offs_t A)
-{
-	uint32_t result = m_program.read_word(A);
-	return result | (m_program.read_word(A+16)<<16);
-}
-
-#define TMS34010_WRMEM(A,V)       (m_program.write_byte(A,V))
-#define TMS34010_WRMEM_WORD(A,V)  (m_program.write_word(A,V))
-inline void tms340x0_device::TMS34010_WRMEM_DWORD(offs_t A, uint32_t V)
-{
-	m_program.write_word(A,V);
-	m_program.write_word(A+16,V>>16);
-}
-
-
-
 /* IO registers accessor */
 #define IOREG(reg)                (m_IOregs[reg])
 #define SMART_IOREG(reg)          (m_IOregs[m_is_34020 ? (int)REG020_##reg : (int)REG_##reg])
@@ -86,20 +68,16 @@
 	}
 
 #define WFIELDMAC_8()                                                               \
-	if (offset & 0x07)                                                              \
+	if (true)                                                                       \
 	{                                                                               \
 		WFIELDMAC(0xff,9);                                                          \
-	}                                                                               \
-	else                                                                            \
-		TMS34010_WRMEM(offset, data);
+	}
 
 #define RFIELDMAC_8()                                                               \
-	if (offset & 0x07)                                                              \
+	if (true)                                                                       \
 	{                                                                               \
 		RFIELDMAC(0xff,9);                                                          \
-	}                                                                               \
-	else                                                                            \
-		ret = TMS34010_RDMEM(offset);
+	}
 
 #define WFIELDMAC_32()                                                              \
 	if (offset & 0x0f)                                                              \
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/tms34010/34010ops.hxx mame-0.224+dfsg.1/src/devices/cpu/tms34010/34010ops.hxx
--- mame-0.222+dfsg.1/src/devices/cpu/tms34010/34010ops.hxx	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/tms34010/34010ops.hxx	2020-08-26 08:57:19.000000000 +0000
@@ -80,13 +80,13 @@
 {
 	/* kludge for Super High Impact -- this doesn't seem to cause */
 	/* an illegal opcode exception */
-	if (m_cache.read_word(m_pc - 0x10) == 0x0007)
+	if (space(AS_PROGRAM).read_word(m_pc - 0x10) == 0x0007)
 		return;
 
 	/* 9 Ball Shootout calls to FFDF7468, expecting it */
 	/* to execute the next instruction from FFDF7470 */
 	/* but the instruction at FFDF7460 is an 0x0001 */
-	if (m_cache.read_word(m_pc - 0x10) == 0x0001)
+	if (space(AS_PROGRAM).read_word(m_pc - 0x10) == 0x0001)
 		return;
 
 	PUSH(m_pc);
@@ -96,7 +96,7 @@
 	COUNT_UNKNOWN_CYCLES(16);
 
 	/* extra check to prevent bad things */
-	if (m_pc == 0 || s_opcode_table[m_cache.read_word(m_pc) >> 4] == &tms34010_device::unimpl)
+	if (m_pc == 0 || s_opcode_table[space(AS_PROGRAM).read_word(m_pc) >> 4] == &tms34010_device::unimpl)
 	{
 		set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
 		machine().debug_break();
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/tms34010/tms34010.cpp mame-0.224+dfsg.1/src/devices/cpu/tms34010/tms34010.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/tms34010/tms34010.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/tms34010/tms34010.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -59,10 +59,10 @@
     GLOBAL VARIABLES
 ***************************************************************************/
 
-tms340x0_device::tms340x0_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor internal_regs_map)
+tms340x0_device::tms340x0_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor internal_regs_map, bool is_34020)
 	: cpu_device(mconfig, type, tag, owner, clock)
 	, device_video_interface(mconfig, *this)
-	, m_program_config("program", ENDIANNESS_LITTLE, 16, 32, 3, internal_regs_map)
+	, m_program_config("program", ENDIANNESS_LITTLE, is_34020 ? 32 : 16, 32, 3, internal_regs_map)
 	, m_pc(0)
 	, m_ppc(0)
 	, m_st(0)
@@ -76,7 +76,7 @@
 	, m_convmp(0)
 	, m_gfxcycles(0)
 	, m_pixelshift(0)
-	, m_is_34020(0)
+	, m_is_34020(is_34020)
 	, m_reset_deferred(false)
 	, m_halt_on_reset(false)
 	, m_hblank_stable(0)
@@ -97,16 +97,14 @@
 
 
 tms34010_device::tms34010_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: tms340x0_device(mconfig, TMS34010, tag, owner, clock, address_map_constructor(FUNC(tms34010_device::internal_regs_map), this))
+	: tms340x0_device(mconfig, TMS34010, tag, owner, clock, address_map_constructor(FUNC(tms34010_device::internal_regs_map), this), false)
 {
-	m_is_34020 = 0;
 }
 
 
 tms34020_device::tms34020_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: tms340x0_device(mconfig, TMS34020, tag, owner, clock, address_map_constructor(FUNC(tms34020_device::internal_regs_map), this))
+	: tms340x0_device(mconfig, TMS34020, tag, owner, clock, address_map_constructor(FUNC(tms34020_device::internal_regs_map), this), true)
 {
-	m_is_34020 = 1;
 }
 
 device_memory_interface::space_config_vector tms340x0_device::memory_space_config() const
@@ -230,38 +228,121 @@
 }
 
 /* shortcuts for reading opcodes */
-inline uint32_t tms340x0_device::ROPCODE()
+uint32_t tms34010_device::ROPCODE()
 {
 	uint32_t pc = m_pc;
 	m_pc += 2 << 3;
 	return m_cache.read_word(pc);
 }
 
-inline int16_t tms340x0_device::PARAM_WORD()
+uint32_t tms34020_device::ROPCODE()
 {
 	uint32_t pc = m_pc;
 	m_pc += 2 << 3;
 	return m_cache.read_word(pc);
 }
 
-inline int32_t tms340x0_device::PARAM_LONG()
+int16_t tms34010_device::PARAM_WORD()
+{
+	uint32_t pc = m_pc;
+	m_pc += 2 << 3;
+	return m_cache.read_word(pc);
+}
+
+int16_t tms34020_device::PARAM_WORD()
+{
+	uint32_t pc = m_pc;
+	m_pc += 2 << 3;
+	return m_cache.read_word(pc);
+}
+
+int32_t tms34010_device::PARAM_LONG()
 {
 	uint32_t pc = m_pc;
 	m_pc += 4 << 3;
 	return (uint16_t)m_cache.read_word(pc) | (m_cache.read_word(pc + 16) << 16);
 }
 
-inline int16_t tms340x0_device::PARAM_WORD_NO_INC()
+int32_t tms34020_device::PARAM_LONG()
+{
+	uint32_t pc = m_pc;
+	m_pc += 4 << 3;
+	return m_cache.read_dword_unaligned(pc);
+}
+
+int16_t tms34010_device::PARAM_WORD_NO_INC()
 {
 	return m_cache.read_word(m_pc);
 }
 
-inline int32_t tms340x0_device::PARAM_LONG_NO_INC()
+int16_t tms34020_device::PARAM_WORD_NO_INC()
+{
+	return m_cache.read_word(m_pc);
+}
+
+int32_t tms34010_device::PARAM_LONG_NO_INC()
 {
 	uint32_t pc = m_pc;
 	return (uint16_t)m_cache.read_word(pc) | (m_cache.read_word(pc + 16) << 16);
 }
 
+int32_t tms34020_device::PARAM_LONG_NO_INC()
+{
+	return m_cache.read_dword_unaligned(m_pc);
+}
+
+uint32_t tms34010_device::TMS34010_RDMEM_WORD(offs_t A)
+{
+	return m_program.read_word(A);
+}
+
+uint32_t tms34020_device::TMS34010_RDMEM_WORD(offs_t A)
+{
+	return m_program.read_word(A);
+}
+
+uint32_t tms34010_device::TMS34010_RDMEM_DWORD(offs_t A)
+{
+	uint32_t result = m_program.read_word(A);
+	return result | (m_program.read_word(A+16)<<16);
+}
+
+uint32_t tms34020_device::TMS34010_RDMEM_DWORD(offs_t A)
+{
+	return m_program.read_dword_unaligned(A);
+}
+
+void tms34010_device::TMS34010_WRMEM_WORD(offs_t A, uint32_t V)
+{
+	m_program.write_word(A,V);
+}
+
+void tms34020_device::TMS34010_WRMEM_WORD(offs_t A, uint32_t V)
+{
+	if (BIT(A, 4))
+		m_program.write_dword(A-16,(V<<16)|(V>>16),0xffff0000);
+	else
+		m_program.write_dword(A,V,0x0000ffff);
+}
+
+void tms34010_device::TMS34010_WRMEM_DWORD(offs_t A, uint32_t V)
+{
+	m_program.write_word(A,V);
+	m_program.write_word(A+16,V>>16);
+}
+
+void tms34020_device::TMS34010_WRMEM_DWORD(offs_t A, uint32_t V)
+{
+	if (BIT(A, 4))
+	{
+		m_program.write_dword(A-16,(V<<16)|(V>>16),0xffff0000);
+		m_program.write_dword(A+16,(V<<16)|(V>>16),0x0000ffff);
+	}
+	else
+		m_program.write_dword(A,V);
+}
+
+
 /* read memory byte */
 inline uint32_t tms340x0_device::RBYTE(offs_t offset)
 {
@@ -331,7 +412,7 @@
 uint32_t tms340x0_device::read_pixel_shiftreg(offs_t offset)
 {
 	if (!m_to_shiftreg_cb.isnull())
-		m_to_shiftreg_cb(m_program, offset, &m_shiftreg[0]);
+		m_to_shiftreg_cb(offset, &m_shiftreg[0]);
 	else
 		fatalerror("To ShiftReg function not set. PC = %08X\n", m_pc);
 	return m_shiftreg[0];
@@ -473,7 +554,7 @@
 void tms340x0_device::write_pixel_shiftreg(offs_t offset, uint32_t data)
 {
 	if (!m_from_shiftreg_cb.isnull())
-		m_from_shiftreg_cb(m_program, offset, &m_shiftreg[0]);
+		m_from_shiftreg_cb(offset, &m_shiftreg[0]);
 	else
 		fatalerror("From ShiftReg function not set. PC = %08X\n", m_pc);
 }
@@ -640,9 +721,6 @@
 
 	m_external_host_access = false;
 
-	space(AS_PROGRAM).cache(m_cache);
-	space(AS_PROGRAM).specific(m_program);
-
 	/* set up the state table */
 	{
 		state_add(TMS34010_PC,     "PC",        m_pc);
@@ -682,6 +760,22 @@
 	set_icountptr(m_icount);
 }
 
+void tms34010_device::device_start()
+{
+	tms340x0_device::device_start();
+
+	space(AS_PROGRAM).cache(m_cache);
+	space(AS_PROGRAM).specific(m_program);
+}
+
+void tms34020_device::device_start()
+{
+	tms340x0_device::device_start();
+
+	space(AS_PROGRAM).cache(m_cache);
+	space(AS_PROGRAM).specific(m_program);
+}
+
 void tms340x0_device::device_reset()
 {
 	m_ppc = 0;
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/tms34010/tms34010.h mame-0.224+dfsg.1/src/devices/cpu/tms34010/tms34010.h
--- mame-0.222+dfsg.1/src/devices/cpu/tms34010/tms34010.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/tms34010/tms34010.h	2020-08-26 08:57:19.000000000 +0000
@@ -105,8 +105,8 @@
 
 #define TMS340X0_SCANLINE_IND16_CB_MEMBER(_name) void _name(screen_device &screen, bitmap_ind16 &bitmap, int scanline, const tms340x0_device::display_params *params)
 #define TMS340X0_SCANLINE_RGB32_CB_MEMBER(_name) void _name(screen_device &screen, bitmap_rgb32 &bitmap, int scanline, const tms340x0_device::display_params *params)
-#define TMS340X0_TO_SHIFTREG_CB_MEMBER(_name) void _name(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t address, uint16_t *shiftreg)
-#define TMS340X0_FROM_SHIFTREG_CB_MEMBER(_name) void _name(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t address, uint16_t *shiftreg)
+#define TMS340X0_TO_SHIFTREG_CB_MEMBER(_name) void _name(offs_t address, uint16_t *shiftreg)
+#define TMS340X0_FROM_SHIFTREG_CB_MEMBER(_name) void _name(offs_t address, uint16_t *shiftreg)
 
 
 class tms340x0_device : public cpu_device,
@@ -126,8 +126,8 @@
 
 	typedef device_delegate<void (screen_device &screen, bitmap_ind16 &bitmap, int scanline, const display_params *params)> scanline_ind16_cb_delegate;
 	typedef device_delegate<void (screen_device &screen, bitmap_rgb32 &bitmap, int scanline, const display_params *params)> scanline_rgb32_cb_delegate;
-	typedef device_delegate<void (memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t address, uint16_t *shiftreg)> shiftreg_in_cb_delegate;
-	typedef device_delegate<void (memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t address, uint16_t *shiftreg)> shiftreg_out_cb_delegate;
+	typedef device_delegate<void (offs_t address, uint16_t *shiftreg)> shiftreg_in_cb_delegate;
+	typedef device_delegate<void (offs_t address, uint16_t *shiftreg)> shiftreg_out_cb_delegate;
 
 	void set_halt_on_reset(bool halt_on_reset) { m_halt_on_reset = halt_on_reset; }
 	void set_pixel_clock(uint32_t pixclock) { m_pixclock = pixclock; }
@@ -252,7 +252,7 @@
 	};
 
 	// construction/destruction
-	tms340x0_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor internal_regs_map = address_map_constructor());
+	tms340x0_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor internal_regs_map, bool is_34020);
 
 	// device-level overrides
 	virtual void device_start() override;
@@ -281,8 +281,8 @@
 	typedef uint32_t (tms340x0_device::*pixel_op_func)(uint32_t, uint32_t, uint32_t);
 	typedef void (tms340x0_device::*pixblt_op_func)(int, int);
 	typedef void (tms340x0_device::*pixblt_b_op_func)(int);
-	typedef void (tms340x0_device::*word_write_func)(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t offset,uint16_t data);
-	typedef uint16_t (tms340x0_device::*word_read_func)(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t offset);
+	typedef void (tms340x0_device::*word_write_func)(offs_t offset, uint16_t data);
+	typedef uint16_t (tms340x0_device::*word_read_func)(offs_t offset);
 
 	static const wfield_func s_wfield_functions[32];
 	static const rfield_func s_rfield_functions[64];
@@ -312,14 +312,13 @@
 	uint32_t           m_convmp;
 	int32_t            m_gfxcycles;
 	uint8_t            m_pixelshift;
-	uint8_t            m_is_34020;
+	const bool         m_is_34020;
 	bool             m_reset_deferred;
 	bool             m_halt_on_reset; /* /HCS pin, which determines HALT state after reset */
 	uint8_t            m_hblank_stable;
 	uint8_t            m_external_host_access;
 	uint8_t            m_executing;
-	memory_access<32, 1, 3, ENDIANNESS_LITTLE>::cache m_cache;
-	memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific m_program;
+
 	uint32_t  m_pixclock;                           /* the pixel clock (0 means don't adjust screen size) */
 	int     m_pixperclock;                        /* pixels per clock */
 	emu_timer *m_scantimer;
@@ -354,15 +353,18 @@
 	uint16_t m_IOregs[64];
 	uint16_t              m_shiftreg[(8 * 512 * sizeof(uint16_t))/2];
 
-	uint32_t TMS34010_RDMEM_DWORD(offs_t A);
-	void TMS34010_WRMEM_DWORD(offs_t A, uint32_t V);
+
+	virtual uint32_t TMS34010_RDMEM_WORD(offs_t A) = 0;
+	virtual uint32_t TMS34010_RDMEM_DWORD(offs_t A) = 0;
+	virtual void TMS34010_WRMEM_WORD(offs_t A, uint32_t V) = 0;
+	virtual void TMS34010_WRMEM_DWORD(offs_t A, uint32_t V) = 0;
 	void SET_ST(uint32_t st);
 	void RESET_ST();
-	uint32_t ROPCODE();
-	int16_t PARAM_WORD();
-	int32_t PARAM_LONG();
-	int16_t PARAM_WORD_NO_INC();
-	int32_t PARAM_LONG_NO_INC();
+	virtual uint32_t ROPCODE() = 0;
+	virtual int16_t PARAM_WORD() = 0;
+	virtual int32_t PARAM_LONG() = 0;
+	virtual int16_t PARAM_WORD_NO_INC() = 0;
+	virtual int32_t PARAM_LONG_NO_INC() = 0;
 	uint32_t RBYTE(offs_t offset);
 	void WBYTE(offs_t offset, uint32_t data);
 	uint32_t RLONG(offs_t offset);
@@ -892,11 +894,11 @@
 	int compute_fill_cycles(int left_partials, int right_partials, int full_words, int op_timing);
 	int compute_pixblt_cycles(int left_partials, int right_partials, int full_words, int op_timing);
 	int compute_pixblt_b_cycles(int left_partials, int right_partials, int full_words, int rows, int op_timing, int bpp);
-	void memory_w(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t offset,uint16_t data);
-	uint16_t memory_r(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t offset);
-	void shiftreg_w(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t offset, uint16_t data);
-	uint16_t shiftreg_r(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t offset);
-	uint16_t dummy_shiftreg_r(memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific &space, offs_t offset);
+	void memory_w(offs_t offset, uint16_t data);
+	uint16_t memory_r(offs_t offset);
+	void shiftreg_w(offs_t offset, uint16_t data);
+	uint16_t shiftreg_r(offs_t offset);
+	uint16_t dummy_shiftreg_r(offs_t offset);
 	uint32_t pixel_op00(uint32_t dstpix, uint32_t mask, uint32_t srcpix);
 	uint32_t pixel_op01(uint32_t dstpix, uint32_t mask, uint32_t srcpix);
 	uint32_t pixel_op02(uint32_t dstpix, uint32_t mask, uint32_t srcpix);
@@ -1016,10 +1018,27 @@
 	virtual u16 io_register_r(offs_t offset) override;
 
 protected:
+	// device-level overrides
+	virtual void device_start() override;
+
 	virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 8 - 1) / 8; }
 	virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 8); }
 	virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
 	void internal_regs_map(address_map &map);
+
+	virtual uint32_t ROPCODE() override;
+	virtual int16_t PARAM_WORD() override;
+	virtual int32_t PARAM_LONG() override;
+	virtual int16_t PARAM_WORD_NO_INC() override;
+	virtual int32_t PARAM_LONG_NO_INC() override;
+	virtual uint32_t TMS34010_RDMEM_WORD(offs_t A) override;
+	virtual uint32_t TMS34010_RDMEM_DWORD(offs_t A) override;
+	virtual void TMS34010_WRMEM_WORD(offs_t A, uint32_t V) override;
+	virtual void TMS34010_WRMEM_DWORD(offs_t A, uint32_t V) override;
+
+private:
+	memory_access<32, 1, 3, ENDIANNESS_LITTLE>::cache m_cache;
+	memory_access<32, 1, 3, ENDIANNESS_LITTLE>::specific m_program;
 };
 
 DECLARE_DEVICE_TYPE(TMS34010, tms34010_device)
@@ -1034,10 +1053,27 @@
 	virtual u16 io_register_r(offs_t offset) override;
 
 protected:
+	// device-level overrides
+	virtual void device_start() override;
+
 	virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override { return (clocks + 4 - 1) / 4; }
 	virtual uint64_t execute_cycles_to_clocks(uint64_t cycles) const noexcept override { return (cycles * 4); }
 	virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
 	void internal_regs_map(address_map &map);
+
+	virtual uint32_t ROPCODE() override;
+	virtual int16_t PARAM_WORD() override;
+	virtual int32_t PARAM_LONG() override;
+	virtual int16_t PARAM_WORD_NO_INC() override;
+	virtual int32_t PARAM_LONG_NO_INC() override;
+	virtual uint32_t TMS34010_RDMEM_WORD(offs_t A) override;
+	virtual uint32_t TMS34010_RDMEM_DWORD(offs_t A) override;
+	virtual void TMS34010_WRMEM_WORD(offs_t A, uint32_t V) override;
+	virtual void TMS34010_WRMEM_DWORD(offs_t A, uint32_t V) override;
+
+private:
+	memory_access<32, 2, 3, ENDIANNESS_LITTLE>::cache m_cache;
+	memory_access<32, 2, 3, ENDIANNESS_LITTLE>::specific m_program;
 };
 
 DECLARE_DEVICE_TYPE(TMS34020, tms34020_device)
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/tms9900/9900dasm.cpp mame-0.224+dfsg.1/src/devices/cpu/tms9900/9900dasm.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/tms9900/9900dasm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/tms9900/9900dasm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -210,7 +210,7 @@
 inline uint16_t tms9900_disassembler::readop_arg(const data_buffer &params, offs_t &PC)
 {
 	uint16_t result = params.r16(PC);
-	PC += 2;;
+	PC += 2;
 	return result;
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/unsp/unsp_exxx.cpp mame-0.224+dfsg.1/src/devices/cpu/unsp/unsp_exxx.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/unsp/unsp_exxx.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/unsp/unsp_exxx.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -42,8 +42,29 @@
 		uint8_t bitop = (op & 0x0030) >> 4;
 		uint8_t rd =    (op & 0x0e00) >> 9;
 		uint8_t rs =    (op & 0x0007) >> 0;
-		logerror("%s %s,%s\n", bitops[bitop], regs[rd], regs[rs]);
-		unimplemented_opcode(op);
+
+		const uint8_t offset = (m_core->m_r[rs] & 0xf);
+
+		m_core->m_r[REG_SR] &= ~UNSP_Z;
+		m_core->m_r[REG_SR] |= BIT(m_core->m_r[rd], offset) ? 0 : UNSP_Z;
+
+		switch (bitop)
+		{
+		case 0x00: // tstb
+			return;
+
+		case 0x01: // setb
+			m_core->m_r[rd] |= (1 << offset);
+			return;
+
+		case 0x02: // clrb
+			m_core->m_r[rd] &= ~(1 << offset);
+			return;
+
+		case 0x03:
+			m_core->m_r[rd] ^= (1 << offset);
+			return;
+		}
 		return;
 	}
 	else if (((op & 0xf1c0) == 0xe040))
@@ -140,7 +161,7 @@
 		const uint8_t bitop =  (op & 0x0030) >> 4;
 		const uint8_t rd =     (op & 0x0e00) >> 9;
 		const uint8_t rs =     (op & 0x0007) >> 0;
-		const uint8_t offset = (1 << (m_core->m_r[rs] & 0xf));
+		const uint8_t offset = (m_core->m_r[rs] & 0xf);
 		const uint16_t addr =  m_core->m_r[rd];
 		const uint16_t orig =  read16(addr);
 		m_core->m_r[REG_SR] &= ~UNSP_Z;
@@ -171,11 +192,11 @@
 		const uint8_t bitop =  (op & 0x0030) >> 4;
 		const uint8_t rd =     (op & 0x0e00) >> 9;
 		const uint8_t rs =     (op & 0x0007) >> 0;
-		const uint8_t offset = (1 << m_core->m_r[rs]);
+		const uint8_t offset = (m_core->m_r[rs] & 0xf);
 		const uint32_t addr =  m_core->m_r[rd] | (get_ds() << 16);
 		const uint16_t orig =  read16(addr);
 		m_core->m_r[REG_SR] &= ~UNSP_Z;
-		m_core->m_r[REG_SR] |= BIT(m_core->m_r[rd], offset) ? 0 : UNSP_Z;
+		m_core->m_r[REG_SR] |= BIT(orig, offset) ? 0 : UNSP_Z;
 
 		switch (bitop)
 		{
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/unsp/unsp_fxxx.cpp mame-0.224+dfsg.1/src/devices/cpu/unsp/unsp_fxxx.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/unsp/unsp_fxxx.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/unsp/unsp_fxxx.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -109,55 +109,72 @@
 
 		if (d)
 		{
+			const uint32_t addr = imm16 | (get_ds() << 16);
+			const uint16_t orig = read16(addr);
+
+			// manual seems to indicate that the zero flag always gets changed based on original value
+			// even for opcodes other than tstb
+			m_core->m_r[REG_SR] &= ~UNSP_Z;
+			m_core->m_r[REG_SR] |= BIT(orig, offset) ? 0 : UNSP_Z;
+
 			switch (bitop)
 			{
 			case 0x0: // tstb
-				logerror("tstb ds:[%04x],%d\n", imm16, offset);
-				unimplemented_opcode(op);
+			{
+				// handled above
 				break;
-
-			case 0x1: // setb
-				logerror("setb ds:[%04x],%d\n", imm16, offset);
-				unimplemented_opcode(op);
+			}
+			case 0x1: // setb    (bkrankp uses this)
+			{
+				write16(addr, orig | (1 << offset));
 				break;
-
+			}
 			case 0x2: // clrb
-				logerror("clrb ds:[%04x],%d\n", imm16, offset);
-				unimplemented_opcode(op);
+			{
+				write16(addr, orig & ~(1 << offset));
 				break;
+			}
 
 			case 0x3: // invb
-				logerror("invb ds:[%04x],%d\n", imm16, offset);
-				unimplemented_opcode(op);
+			{
+				write16(addr, orig ^ (1 << offset));
 				break;
 			}
+			}
 		}
 		else
 		{
+			const uint16_t orig =  read16(imm16);
+
+			// manual seems to indicate that the zero flag always gets changed based on original value
+			// even for opcodes other than tstb
+			m_core->m_r[REG_SR] &= ~UNSP_Z;
+			m_core->m_r[REG_SR] |= BIT(orig, offset) ? 0 : UNSP_Z;
+
 			switch (bitop)
 			{
 			case 0x0: // tstb
-				logerror("tstb [%04x],%d\n", imm16, offset);
-				unimplemented_opcode(op);
+			{
+				// handled above
 				break;
-
+			}
 			case 0x1: // setb    (bkrankp uses this)
 			{
-				uint16_t temp = read16(imm16);
-				temp |= (1 << offset);
-				write16(imm16, temp);
+				write16(imm16, orig | (1 << offset));
 				break;
 			}
 			case 0x2: // clrb
-				logerror("clrb [%04x],%d\n", imm16, offset);
-				unimplemented_opcode(op);
+			{
+				write16(imm16, orig & ~(1 << offset));
 				break;
+			}
 
 			case 0x3: // invb
-				logerror("invb [%04x],%d\n", imm16, offset);
-				unimplemented_opcode(op);
+			{
+				write16(imm16, orig ^ (1 << offset));
 				break;
 			}
+			}
 		}
 
 		return;
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/upd7810/upd7810.cpp mame-0.224+dfsg.1/src/devices/cpu/upd7810/upd7810.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/upd7810/upd7810.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/upd7810/upd7810.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -406,14 +406,7 @@
 	, m_co1_func(*this)
 	, m_txd_func(*this)
 	, m_rxd_func(*this)
-	, m_an0_func(*this)
-	, m_an1_func(*this)
-	, m_an2_func(*this)
-	, m_an3_func(*this)
-	, m_an4_func(*this)
-	, m_an5_func(*this)
-	, m_an6_func(*this)
-	, m_an7_func(*this)
+	, m_an_func(*this)
 	, m_pa_in_cb(*this)
 	, m_pb_in_cb(*this)
 	, m_pc_in_cb(*this)
@@ -749,16 +742,16 @@
 	int irqline = 0;
 
 	/* global interrupt disable? */
-	if (0 == IFF && !(IRR & INTNMI))
+	if (0 == IFF && !(IRR & INTFNMI))
 		return;
 
 	/* check the interrupts in priority sequence */
-	if (IRR & INTNMI)
+	if (IRR & INTFNMI)
 	{
 		/* Nonmaskable interrupt */
 		irqline = INPUT_LINE_NMI;
 		vector = 0x0004;
-		IRR &= ~INTNMI;
+		IRR &= ~INTFNMI;
 	}
 	else
 	if ((IRR & INTFT0)  && 0 == (MKL & 0x02))
@@ -1492,30 +1485,13 @@
 		/* select mode */
 		if (m_shdone == 0)
 		{
-			switch (m_adin)
-			{
-				case 0: m_tmpcr = m_an0_func(); break;
-				case 1: m_tmpcr = m_an1_func(); break;
-				case 2: m_tmpcr = m_an2_func(); break;
-				case 3: m_tmpcr = m_an3_func(); break;
-				case 4: m_tmpcr = m_an4_func(); break;
-				case 5: m_tmpcr = m_an5_func(); break;
-				case 6: m_tmpcr = m_an6_func(); break;
-				case 7: m_tmpcr = m_an7_func(); break;
-			}
+			m_tmpcr = m_an_func[m_adin]();
 			m_shdone = 1;
 		}
 		if (m_adcnt > m_adtot)
 		{
 			m_adcnt -= m_adtot;
-			switch (m_adout)
-			{
-				// volfied code checks bit 0x80, old code set bit 0x01, TODO: verify which bits are set on real hw
-				case 0: CR0 = m_tmpcr ? 0xff:0x00; break;
-				case 1: CR1 = m_tmpcr ? 0xff:0x00; break;
-				case 2: CR2 = m_tmpcr ? 0xff:0x00; break;
-				case 3: CR3 = m_tmpcr ? 0xff:0x00; break;
-			}
+			CR[m_adout] = m_tmpcr;
 			m_adout = (m_adout + 1) & 0x03;
 			if (m_adout == 0)
 				IRR |= INTFAD;
@@ -1527,34 +1503,19 @@
 		/* scan mode */
 		if (m_shdone == 0)
 		{
-			switch (m_adin | m_adrange)
-			{
-				case 0: m_tmpcr = m_an0_func(); break;
-				case 1: m_tmpcr = m_an1_func(); break;
-				case 2: m_tmpcr = m_an2_func(); break;
-				case 3: m_tmpcr = m_an3_func(); break;
-				case 4: m_tmpcr = m_an4_func(); break;
-				case 5: m_tmpcr = m_an5_func(); break;
-				case 6: m_tmpcr = m_an6_func(); break;
-				case 7: m_tmpcr = m_an7_func(); break;
-			}
+			m_tmpcr = m_an_func[m_adin | m_adrange]();
 			m_shdone = 1;
 		}
 		if (m_adcnt > m_adtot)
 		{
 			m_adcnt -= m_adtot;
-			switch (m_adout)
-			{
-				case 0: CR0 = m_tmpcr ? 0xff:0x00; break;
-				case 1: CR1 = m_tmpcr ? 0xff:0x00; break;
-				case 2: CR2 = m_tmpcr ? 0xff:0x00; break;
-				case 3: CR3 = m_tmpcr ? 0xff:0x00; break;
-			}
-			m_adin  = (m_adin  + 1) & 0x07;
+			CR[m_adout] = m_tmpcr;
+			m_adin  = (m_adin  + 1) & 0x03;  // should loop from 0 to 3 for AN0-AN3 or AN4-AN7
 			m_adout = (m_adout + 1) & 0x03;
 			if (m_adout == 0)
 				IRR |= INTFAD;
 			m_shdone = 0;
+
 		}
 	}
 
@@ -1610,14 +1571,7 @@
 	m_co1_func.resolve_safe();
 	m_txd_func.resolve_safe();
 	m_rxd_func.resolve_safe(1);
-	m_an0_func.resolve_safe(0);
-	m_an1_func.resolve_safe(0);
-	m_an2_func.resolve_safe(0);
-	m_an3_func.resolve_safe(0);
-	m_an4_func.resolve_safe(0);
-	m_an5_func.resolve_safe(0);
-	m_an6_func.resolve_safe(0);
-	m_an7_func.resolve_safe(0);
+	m_an_func.resolve_all_safe(0);
 
 	m_pa_in_cb.resolve();
 	m_pb_in_cb.resolve();
@@ -1678,10 +1632,7 @@
 	save_item(NAME(m_pc_out));
 	save_item(NAME(m_pd_out));
 	save_item(NAME(m_pf_out));
-	save_item(NAME(m_cr0));
-	save_item(NAME(m_cr1));
-	save_item(NAME(m_cr2));
-	save_item(NAME(m_cr3));
+	save_item(NAME(m_cr));
 	save_item(NAME(m_txb));
 	save_item(NAME(m_rxb));
 	save_item(NAME(m_txd));
@@ -1750,10 +1701,10 @@
 	state_add( UPD7810_MKL,  "MKL",  m_mkl).formatstr("%02X");
 	state_add( UPD7810_MKH,  "MKH",  m_mkh).formatstr("%02X");
 	state_add( UPD7810_ZCM,  "ZCM",  m_zcm).formatstr("%02X");
-	state_add( UPD7810_CR0,  "CR0",  m_cr0).formatstr("%02X");
-	state_add( UPD7810_CR1,  "CR1",  m_cr1).formatstr("%02X");
-	state_add( UPD7810_CR2,  "CR2",  m_cr2).formatstr("%02X");
-	state_add( UPD7810_CR3,  "CR3",  m_cr3).formatstr("%02X");
+	state_add( UPD7810_CR0,  "CR0",  m_cr[0]).formatstr("%02X");
+	state_add( UPD7810_CR1,  "CR1",  m_cr[1]).formatstr("%02X");
+	state_add( UPD7810_CR2,  "CR2",  m_cr[2]).formatstr("%02X");
+	state_add( UPD7810_CR3,  "CR3",  m_cr[3]).formatstr("%02X");
 	state_add( UPD7810_RXB,  "RXB",  m_rxb).formatstr("%02X");
 	state_add( UPD7810_TXB,  "TXB",  m_txb).formatstr("%02X");
 	state_add( UPD7810_TXD,  "TXD",  m_txd).formatstr("%3u");
@@ -1870,10 +1821,10 @@
 	m_pc_out = 0;
 	m_pd_out = 0;
 	m_pf_out = 0;
-	m_cr0 = 0;
-	m_cr1 = 0;
-	m_cr2 = 0;
-	m_cr3 = 0;
+	m_cr[0] = 0;
+	m_cr[1] = 0;
+	m_cr[2] = 0;
+	m_cr[3] = 0;
 	m_txb = 0;
 	m_rxb = 0;
 	m_txd = 0;
@@ -2059,7 +2010,7 @@
 	case INPUT_LINE_NMI:
 		/* NMI is falling edge sensitive */
 		if ( m_nmi == CLEAR_LINE && state == ASSERT_LINE )
-			IRR |= INTNMI;
+			IRR |= INTFNMI;
 
 		m_nmi = state;
 		break;
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/upd7810/upd7810.h mame-0.224+dfsg.1/src/devices/cpu/upd7810/upd7810.h
--- mame-0.222+dfsg.1/src/devices/cpu/upd7810/upd7810.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/upd7810/upd7810.h	2020-08-26 08:57:19.000000000 +0000
@@ -49,14 +49,14 @@
 	auto co1_func() { return m_co1_func.bind(); }
 	auto txd_func() { return m_txd_func.bind(); }
 	auto rxd_func() { return m_rxd_func.bind(); }
-	auto an0_func() { return m_an0_func.bind(); }
-	auto an1_func() { return m_an1_func.bind(); }
-	auto an2_func() { return m_an2_func.bind(); }
-	auto an3_func() { return m_an3_func.bind(); }
-	auto an4_func() { return m_an4_func.bind(); }
-	auto an5_func() { return m_an5_func.bind(); }
-	auto an6_func() { return m_an6_func.bind(); }
-	auto an7_func() { return m_an7_func.bind(); }
+	auto an0_func() { return m_an_func[0].bind(); }
+	auto an1_func() { return m_an_func[1].bind(); }
+	auto an2_func() { return m_an_func[2].bind(); }
+	auto an3_func() { return m_an_func[3].bind(); }
+	auto an4_func() { return m_an_func[4].bind(); }
+	auto an5_func() { return m_an_func[5].bind(); }
+	auto an6_func() { return m_an_func[6].bind(); }
+	auto an7_func() { return m_an_func[7].bind(); }
 
 	auto pa_in_cb() { return m_pa_in_cb.bind(); }
 	auto pb_in_cb() { return m_pb_in_cb.bind(); }
@@ -104,7 +104,7 @@
 	// IRR flags
 	enum
 	{
-		INTNMI  = 0x0001,
+		INTFNMI = 0x0001,
 		INTFT0  = 0x0002,
 		INTFT1  = 0x0004,
 		INTF1   = 0x0008,
@@ -169,14 +169,7 @@
 	devcb_write_line  m_co1_func;
 	devcb_write_line  m_txd_func;
 	devcb_read_line   m_rxd_func;
-	devcb_read8       m_an0_func;
-	devcb_read8       m_an1_func;
-	devcb_read8       m_an2_func;
-	devcb_read8       m_an3_func;
-	devcb_read8       m_an4_func;
-	devcb_read8       m_an5_func;
-	devcb_read8       m_an6_func;
-	devcb_read8       m_an7_func;
+	devcb_read8::array<8> m_an_func;
 
 	devcb_read8       m_pa_in_cb;
 	devcb_read8       m_pb_in_cb;
@@ -293,10 +286,7 @@
 	uint8_t   m_pc_pullups;
 	uint8_t   m_pd_pullups;
 	uint8_t   m_pf_pullups;
-	uint8_t   m_cr0;    /* analog digital conversion register 0 */
-	uint8_t   m_cr1;    /* analog digital conversion register 1 */
-	uint8_t   m_cr2;    /* analog digital conversion register 2 */
-	uint8_t   m_cr3;    /* analog digital conversion register 3 */
+	uint8_t   m_cr[4];  /* analog digital conversion registers */
 	uint8_t   m_txb;    /* transmitter buffer */
 	uint8_t   m_rxb;    /* receiver buffer */
 	uint8_t   m_txd;    /* port C control line states */
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/upd7810/upd7810_macros.h mame-0.224+dfsg.1/src/devices/cpu/upd7810/upd7810_macros.h
--- mame-0.222+dfsg.1/src/devices/cpu/upd7810/upd7810_macros.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/upd7810/upd7810_macros.h	2020-08-26 08:57:19.000000000 +0000
@@ -79,10 +79,7 @@
 #define MKH     m_mkh
 #define ZCM     m_zcm
 
-#define CR0     m_cr0
-#define CR1     m_cr1
-#define CR2     m_cr2
-#define CR3     m_cr3
+#define CR      m_cr
 #define RXB     m_rxb
 #define TXB     m_txb
 
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/upd7810/upd7810_opcodes.cpp mame-0.224+dfsg.1/src/devices/cpu/upd7810/upd7810_opcodes.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/upd7810/upd7810_opcodes.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/upd7810/upd7810_opcodes.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -323,7 +323,10 @@
 		B = remainder;
 	}
 	else
-		EA = 0xffff;    /* guess */
+	{
+		B = EAL;
+		EA = 0xffff;
+	}
 }
 
 /* 48 3f: 0100 1000 0011 1111 */
@@ -337,15 +340,18 @@
 		C = remainder;
 	}
 	else
-		EA = 0xffff;    /* guess */
+	{
+		C = EAL;
+		EA = 0xffff;
+	}
 }
 
 /* 48 40: 0100 1000 0100 0000 */
 void upd7810_device::SKIT_NMI()
 {
-	if (IRR & INTNMI)
+	if (m_nmi == CLEAR_LINE) // 1 pin level
 		PSW |= SK;
-	IRR &= ~INTNMI;
+	// INTFNMI is not tested or changed
 }
 
 /* 48 41: 0100 1000 0100 0001 */
@@ -487,9 +493,9 @@
 /* 48 60: 0100 1000 0110 0000 */
 void upd7810_device::SKNIT_NMI()
 {
-	if (0 == (IRR & INTNMI))
+	if (m_nmi == ASSERT_LINE) // 0 pin level
 		PSW |= SK;
-	IRR &= ~INTNMI;
+	// INTFNMI is not tested or changed
 }
 
 /* 48 61: 0100 1000 0110 0001 */
@@ -931,25 +937,25 @@
 /* 4c e0: 0100 1100 1110 0000 */
 void upd7810_device::MOV_A_CR0()
 {
-	A = CR0;
+	A = CR[0];
 }
 
 /* 4c e1: 0100 1100 1110 0001 */
 void upd7810_device::MOV_A_CR1()
 {
-	A = CR1;
+	A = CR[1];
 }
 
 /* 4c e2: 0100 1100 1110 0010 */
 void upd7810_device::MOV_A_CR2()
 {
-	A = CR2;
+	A = CR[2];
 }
 
 /* 4c e3: 0100 1100 1110 0011 */
 void upd7810_device::MOV_A_CR3()
 {
-	A = CR3;
+	A = CR[3];
 }
 
 /* prefix 4D */
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/upd78k/upd78k1d.cpp mame-0.224+dfsg.1/src/devices/cpu/upd78k/upd78k1d.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/upd78k/upd78k1d.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/upd78k/upd78k1d.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -122,7 +122,7 @@
 			util::stream_format(stream, "%s.%d,", s_r_names[(op2 & 0x08) >> 3], op2 & 0x07);
 		else
 			util::stream_format(stream, "%s,", s_psw_bits[op2 & 0x07]);
-		format_jdisp8(stream, pc + 4, opcodes.r8(pc + 3));
+		format_jdisp8(stream, pc + 3, opcodes.r8(pc + 2));
 		return 3 | SUPPORTED;
 	}
 	else
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/upd78k/upd78k3d.cpp mame-0.224+dfsg.1/src/devices/cpu/upd78k/upd78k3d.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/upd78k/upd78k3d.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/upd78k/upd78k3d.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -234,7 +234,7 @@
 			util::stream_format(stream, "%c.%d,", BIT(op2, 3) ? 'A' : 'X', op2 & 0x07);
 		else
 			util::stream_format(stream, "%s,", m_psw_bits[op2 & 0x0f]);
-		format_jdisp8(stream, pc + 4, opcodes.r8(pc + 3));
+		format_jdisp8(stream, pc + 3, opcodes.r8(pc + 2));
 		return 3 | SUPPORTED;
 	}
 	else
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/x86emit.h mame-0.224+dfsg.1/src/devices/cpu/x86emit.h
--- mame-0.222+dfsg.1/src/devices/cpu/x86emit.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/x86emit.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,3197 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/***************************************************************************
-
-    x86emit.h
-
-    Generic x86/x64 code emitters.
-
-****************************************************************************
-
-    Important note:
-
-    It is assumed in 64-bit mode that all byte register accesses are
-    intended to be to the low 8 bits (SPL,BPL,SIL,DIL) and not to the
-    upper half (AH,CH,DH,BH).
-
-***************************************************************************/
-
-
-//**************************************************************************
-//  SHARED DEFINITIONS
-//**************************************************************************
-
-#ifndef __X86EMIT_H__
-#define __X86EMIT_H__
-
-// use x86code * to reference generated code
-typedef uint8_t       x86code;
-
-// this structure tracks information about a link
-struct emit_link
-{
-	x86code *       target;
-	uint8_t           size;
-};
-
-// structure for describing memory references
-class x86_memref
-{
-public:
-	x86_memref(uint8_t basereg, uint8_t indreg, uint8_t scale, int32_t disp)
-		: m_base(basereg),
-			m_index(indreg),
-			m_scale(scale),
-			m_disp(disp) { }
-
-	x86_memref operator+(int32_t offset) { return x86_memref(m_base, m_index, m_scale, m_disp + offset); }
-
-	uint8_t m_base;
-	uint8_t m_index;
-	uint8_t m_scale;
-	int32_t m_disp;
-};
-
-#endif
-
-
-
-//**************************************************************************
-//  32-BIT and 64-BIT SPECIFIC DEFINITIONS
-//**************************************************************************
-
-#ifdef X86EMIT_SIZE
-
-#if (X86EMIT_SIZE != 32 && X86EMIT_SIZE != 64)
-#error Must specify X86EMIT_SIZE as either 32 or 64!
-#endif
-
-// put emitters into their own namespace so they don't clash
-#if (X86EMIT_SIZE == 32)
-namespace x86emit
-#else
-namespace x64emit
-#endif
-{
-//**************************************************************************
-//  CONSTANTS
-//**************************************************************************
-
-// opcode size flag; low 4 bits must match REX low 4 bits, hence the odd numbers here
-const uint8_t OP_16BIT        = 0x10;
-const uint8_t OP_32BIT        = 0x00;
-const uint8_t OP_64BIT        = 0x08;
-
-// 16 registers on x64, only 8 on x86
-#if (X86EMIT_SIZE == 64)
-const int REG_MAX           = 16;
-#else
-const int REG_MAX           = 8;
-#endif
-
-// invalid register index for "none"
-const uint8_t REG_NONE        = REG_MAX;
-
-// 8-bit registers -- note that we assume a flat model for 64-bit
-const uint8_t REG_AL          = 0;
-const uint8_t REG_CL          = 1;
-const uint8_t REG_DL          = 2;
-const uint8_t REG_BL          = 3;
-#if (X86EMIT_SIZE == 32)
-const uint8_t REG_AH          = 4;
-const uint8_t REG_CH          = 5;
-const uint8_t REG_DH          = 6;
-const uint8_t REG_BH          = 7;
-#else
-const uint8_t REG_SPL         = 4;
-const uint8_t REG_BPL         = 5;
-const uint8_t REG_SIL         = 6;
-const uint8_t REG_DIL         = 7;
-const uint8_t REG_R8L         = 8;
-const uint8_t REG_R9L         = 9;
-const uint8_t REG_R10L        = 10;
-const uint8_t REG_R11L        = 11;
-const uint8_t REG_R12L        = 12;
-const uint8_t REG_R13L        = 13;
-const uint8_t REG_R14L        = 14;
-const uint8_t REG_R15L        = 15;
-#endif
-
-// 16-bit registers
-const uint8_t REG_AX          = 0;
-const uint8_t REG_CX          = 1;
-const uint8_t REG_DX          = 2;
-const uint8_t REG_BX          = 3;
-const uint8_t REG_SP          = 4;
-const uint8_t REG_BP          = 5;
-const uint8_t REG_SI          = 6;
-const uint8_t REG_DI          = 7;
-#if (X86EMIT_SIZE == 64)
-const uint8_t REG_R8W         = 8;
-const uint8_t REG_R9W         = 9;
-const uint8_t REG_R10W        = 10;
-const uint8_t REG_R11W        = 11;
-const uint8_t REG_R12W        = 12;
-const uint8_t REG_R13W        = 13;
-const uint8_t REG_R14W        = 14;
-const uint8_t REG_R15W        = 15;
-#endif
-
-// 32-bit registers
-const uint8_t REG_EAX         = 0;
-const uint8_t REG_ECX         = 1;
-const uint8_t REG_EDX         = 2;
-const uint8_t REG_EBX         = 3;
-const uint8_t REG_ESP         = 4;
-const uint8_t REG_EBP         = 5;
-const uint8_t REG_ESI         = 6;
-const uint8_t REG_EDI         = 7;
-#if (X86EMIT_SIZE == 64)
-const uint8_t REG_R8D         = 8;
-const uint8_t REG_R9D         = 9;
-const uint8_t REG_R10D        = 10;
-const uint8_t REG_R11D        = 11;
-const uint8_t REG_R12D        = 12;
-const uint8_t REG_R13D        = 13;
-const uint8_t REG_R14D        = 14;
-const uint8_t REG_R15D        = 15;
-#endif
-
-// 64-bit registers
-#if (X86EMIT_SIZE == 64)
-const uint8_t REG_RAX         = 0;
-const uint8_t REG_RCX         = 1;
-const uint8_t REG_RDX         = 2;
-const uint8_t REG_RBX         = 3;
-const uint8_t REG_RSP         = 4;
-const uint8_t REG_RBP         = 5;
-const uint8_t REG_RSI         = 6;
-const uint8_t REG_RDI         = 7;
-const uint8_t REG_R8          = 8;
-const uint8_t REG_R9          = 9;
-const uint8_t REG_R10         = 10;
-const uint8_t REG_R11         = 11;
-const uint8_t REG_R12         = 12;
-const uint8_t REG_R13         = 13;
-const uint8_t REG_R14         = 14;
-const uint8_t REG_R15         = 15;
-#endif
-
-// 64-bit MMX registers
-const uint8_t REG_MM0         = 0;
-const uint8_t REG_MM1         = 1;
-const uint8_t REG_MM2         = 2;
-const uint8_t REG_MM3         = 3;
-const uint8_t REG_MM4         = 4;
-const uint8_t REG_MM5         = 5;
-const uint8_t REG_MM6         = 6;
-const uint8_t REG_MM7         = 7;
-#if (X86EMIT_SIZE == 64)
-const uint8_t REG_MM8         = 8;
-const uint8_t REG_MM9         = 9;
-const uint8_t REG_MM10        = 10;
-const uint8_t REG_MM11        = 11;
-const uint8_t REG_MM12        = 12;
-const uint8_t REG_MM13        = 13;
-const uint8_t REG_MM14        = 14;
-const uint8_t REG_MM15        = 15;
-#endif
-
-// 128-bit XMM registers
-const uint8_t REG_XMM0        = 0;
-const uint8_t REG_XMM1        = 1;
-const uint8_t REG_XMM2        = 2;
-const uint8_t REG_XMM3        = 3;
-const uint8_t REG_XMM4        = 4;
-const uint8_t REG_XMM5        = 5;
-const uint8_t REG_XMM6        = 6;
-const uint8_t REG_XMM7        = 7;
-#if (X86EMIT_SIZE == 64)
-const uint8_t REG_XMM8        = 8;
-const uint8_t REG_XMM9        = 9;
-const uint8_t REG_XMM10       = 10;
-const uint8_t REG_XMM11       = 11;
-const uint8_t REG_XMM12       = 12;
-const uint8_t REG_XMM13       = 13;
-const uint8_t REG_XMM14       = 14;
-const uint8_t REG_XMM15       = 15;
-#endif
-
-// conditions
-const uint8_t COND_A          = 7;
-const uint8_t COND_AE         = 3;
-const uint8_t COND_B          = 2;
-const uint8_t COND_BE         = 6;
-const uint8_t COND_C          = 2;
-const uint8_t COND_E          = 4;
-const uint8_t COND_Z          = 4;
-const uint8_t COND_G          = 15;
-const uint8_t COND_GE         = 13;
-const uint8_t COND_L          = 12;
-const uint8_t COND_LE         = 14;
-const uint8_t COND_NA         = 6;
-const uint8_t COND_NAE        = 2;
-const uint8_t COND_NB         = 3;
-const uint8_t COND_NBE        = 7;
-const uint8_t COND_NC         = 3;
-const uint8_t COND_NE         = 5;
-const uint8_t COND_NG         = 14;
-const uint8_t COND_NGE        = 12;
-const uint8_t COND_NL         = 13;
-const uint8_t COND_NLE        = 15;
-const uint8_t COND_NO         = 1;
-const uint8_t COND_NP         = 11;
-const uint8_t COND_NS         = 9;
-const uint8_t COND_NZ         = 5;
-const uint8_t COND_O          = 0;
-const uint8_t COND_P          = 10;
-const uint8_t COND_PE         = 10;
-const uint8_t COND_PO         = 11;
-const uint8_t COND_S          = 8;
-
-// floating point rounding modes
-const uint8_t FPRND_NEAR      = 0;
-const uint8_t FPRND_DOWN      = 1;
-const uint8_t FPRND_UP        = 2;
-const uint8_t FPRND_CHOP      = 3;
-
-
-
-//**************************************************************************
-//  OPCODE DEFINITIONS
-//**************************************************************************
-
-// opcode flags (in upper 8 bits of opcode)
-const uint32_t OPFLAG_8BITREG             = (1 << 24);
-const uint32_t OPFLAG_8BITRM              = (1 << 25);
-
-// single byte opcodes
-const uint32_t OP_ADD_Eb_Gb               = (0x00 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_ADD_Ev_Gv               = 0x01;
-const uint32_t OP_ADD_Gb_Eb               = (0x02 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_ADD_Gv_Ev               = 0x03;
-const uint32_t OP_ADD_AL_Ib               = 0x04;
-const uint32_t OP_ADD_rAX_Iz              = 0x05;
-const uint32_t OP_PUSH_ES                 = 0x06;
-const uint32_t OP_POP_ES                  = 0x07;
-const uint32_t OP_OR_Eb_Gb                = (0x08 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_OR_Ev_Gv                = 0x09;
-const uint32_t OP_OR_Gb_Eb                = (0x0a | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_OR_Gv_Ev                = 0x0b;
-const uint32_t OP_OR_AL_Ib                = 0x0c;
-const uint32_t OP_OR_eAX_Iv               = 0x0d;
-const uint32_t OP_PUSH_CS                 = 0x0e;
-const uint32_t OP_EXTENDED                = 0x0f;
-
-const uint32_t OP_ADC_Eb_Gb               = (0x10 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_ADC_Ev_Gv               = 0x11;
-const uint32_t OP_ADC_Gb_Eb               = (0x12 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_ADC_Gv_Ev               = 0x13;
-const uint32_t OP_ADC_AL_Ib               = 0x14;
-const uint32_t OP_ADC_rAX_Iz              = 0x15;
-const uint32_t OP_PUSH_SS                 = 0x16;
-const uint32_t OP_POP_SS                  = 0x17;
-const uint32_t OP_SBB_Eb_Gb               = (0x18 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_SBB_Ev_Gv               = 0x19;
-const uint32_t OP_SBB_Gb_Eb               = (0x1a | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_SBB_Gv_Ev               = 0x1b;
-const uint32_t OP_SBB_AL_Ib               = 0x1c;
-const uint32_t OP_SBB_eAX_Iv              = 0x1d;
-const uint32_t OP_PUSH_DS                 = 0x1e;
-const uint32_t OP_POP_DS                  = 0x1f;
-
-const uint32_t OP_AND_Eb_Gb               = (0x20 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_AND_Ev_Gv               = 0x21;
-const uint32_t OP_AND_Gb_Eb               = (0x22 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_AND_Gv_Ev               = 0x23;
-const uint32_t OP_AND_AL_Ib               = 0x24;
-const uint32_t OP_AND_rAX_Iz              = 0x25;
-const uint32_t PREFIX_ES                  = 0x26;
-const uint32_t OP_DAA                     = 0x27;
-const uint32_t OP_SUB_Eb_Gb               = (0x28 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_SUB_Ev_Gv               = 0x29;
-const uint32_t OP_SUB_Gb_Eb               = (0x2a | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_SUB_Gv_Ev               = 0x2b;
-const uint32_t OP_SUB_AL_Ib               = 0x2c;
-const uint32_t OP_SUB_eAX_Iv              = 0x2d;
-const uint32_t PREFIX_CS                  = 0x2e;
-const uint32_t OP_DAS                     = 0x2f;
-
-const uint32_t OP_XOR_Eb_Gb               = (0x30 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_XOR_Ev_Gv               = 0x31;
-const uint32_t OP_XOR_Gb_Eb               = (0x32 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_XOR_Gv_Ev               = 0x33;
-const uint32_t OP_XOR_AL_Ib               = 0x34;
-const uint32_t OP_XOR_rAX_Iz              = 0x35;
-const uint32_t PREFIX_SS                  = 0x36;
-const uint32_t OP_AAA                     = 0x37;
-const uint32_t OP_CMP_Eb_Gb               = (0x38 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_CMP_Ev_Gv               = 0x39;
-const uint32_t OP_CMP_Gb_Eb               = (0x3a | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_CMP_Gv_Ev               = 0x3b;
-const uint32_t OP_CMP_AL_Ib               = 0x3c;
-const uint32_t OP_CMP_eAX_Iv              = 0x3d;
-const uint32_t PREFIX_DS                  = 0x3e;
-const uint32_t OP_AAS                     = 0x3f;
-
-const uint32_t OP_REX                     = 0x40;
-const uint32_t OP_REX_B                   = 0x41;
-const uint32_t OP_REX_X                   = 0x42;
-const uint32_t OP_REX_XB                  = 0x43;
-const uint32_t OP_REX_R                   = 0x44;
-const uint32_t OP_REX_RB                  = 0x45;
-const uint32_t OP_REX_RX                  = 0x46;
-const uint32_t OP_REX_RXB                 = 0x47;
-const uint32_t OP_REX_W                   = 0x48;
-const uint32_t OP_REX_WB                  = 0x49;
-const uint32_t OP_REX_WX                  = 0x4a;
-const uint32_t OP_REX_WXB                 = 0x4b;
-const uint32_t OP_REX_WR                  = 0x4c;
-const uint32_t OP_REX_WRB                 = 0x4d;
-const uint32_t OP_REX_WRX                 = 0x4e;
-const uint32_t OP_REX_WRXB                = 0x4f;
-
-const uint32_t OP_PUSH_rAX                = 0x50;
-const uint32_t OP_PUSH_rCX                = 0x51;
-const uint32_t OP_PUSH_rDX                = 0x52;
-const uint32_t OP_PUSH_rBX                = 0x53;
-const uint32_t OP_PUSH_rSP                = 0x54;
-const uint32_t OP_PUSH_rBP                = 0x55;
-const uint32_t OP_PUSH_rSI                = 0x56;
-const uint32_t OP_PUSH_rDI                = 0x57;
-const uint32_t OP_POP_rAX                 = 0x58;
-const uint32_t OP_POP_rCX                 = 0x59;
-const uint32_t OP_POP_rDX                 = 0x5a;
-const uint32_t OP_POP_rBX                 = 0x5b;
-const uint32_t OP_POP_rSP                 = 0x5c;
-const uint32_t OP_POP_rBP                 = 0x5d;
-const uint32_t OP_POP_rSI                 = 0x5e;
-const uint32_t OP_POP_rDI                 = 0x5f;
-
-const uint32_t OP_PUSHA                   = 0x60;
-const uint32_t OP_POPA                    = 0x61;
-const uint32_t OP_BOUND_Gv_Ma             = 0x62;
-const uint32_t OP_ARPL_Ew_Gw              = 0x63;
-const uint32_t OP_MOVSXD_Gv_Ev            = 0x63;
-const uint32_t PREFIX_FS                  = 0x64;
-const uint32_t PREFIX_GS                  = 0x65;
-const uint32_t PREFIX_OPSIZE              = 0x66;
-const uint32_t PREFIX_ADSIZE              = 0x67;
-const uint32_t OP_PUSH_Iz                 = 0x68;
-const uint32_t OP_IMUL_Gv_Ev_Iz           = 0x69;
-const uint32_t OP_PUSH_Ib                 = 0x6a;
-const uint32_t OP_IMUL_Gv_Ev_Ib           = 0x6b;
-const uint32_t OP_INS_Yb_DX               = 0x6c;
-const uint32_t OP_INS_Yz_DX               = 0x6d;
-const uint32_t OP_OUTS_DX_Xb              = 0x6e;
-const uint32_t OP_OUTS_DX_Xz              = 0x6f;
-
-const uint32_t OP_JCC_O_Jb                = 0x70;
-const uint32_t OP_JCC_NO_Jb               = 0x71;
-const uint32_t OP_JCC_B_Jb                = 0x72;
-const uint32_t OP_JCC_C_Jb                = 0x72;
-const uint32_t OP_JCC_NAE_Jb              = 0x72;
-const uint32_t OP_JCC_AE_Jb               = 0x73;
-const uint32_t OP_JCC_NB_Jb               = 0x73;
-const uint32_t OP_JCC_NC_Jb               = 0x73;
-const uint32_t OP_JCC_E_Jb                = 0x74;
-const uint32_t OP_JCC_Z_Jb                = 0x74;
-const uint32_t OP_JCC_NE_Jb               = 0x75;
-const uint32_t OP_JCC_NZ_Jb               = 0x75;
-const uint32_t OP_JCC_BE_Jb               = 0x76;
-const uint32_t OP_JCC_NA_Jb               = 0x76;
-const uint32_t OP_JCC_A_Jb                = 0x77;
-const uint32_t OP_JCC_NBE_Jb              = 0x77;
-const uint32_t OP_JCC_S_Jb                = 0x78;
-const uint32_t OP_JCC_NS_Jb               = 0x79;
-const uint32_t OP_JCC_P_Jb                = 0x7a;
-const uint32_t OP_JCC_PE_Jb               = 0x7a;
-const uint32_t OP_JCC_NP_Jb               = 0x7b;
-const uint32_t OP_JCC_PO_Jb               = 0x7b;
-const uint32_t OP_JCC_L_Jb                = 0x7c;
-const uint32_t OP_JCC_NGE_Jb              = 0x7c;
-const uint32_t OP_JCC_NL_Jb               = 0x7d;
-const uint32_t OP_JCC_GE_Jb               = 0x7d;
-const uint32_t OP_JCC_LE_Jb               = 0x7e;
-const uint32_t OP_JCC_NG_Jb               = 0x7e;
-const uint32_t OP_JCC_NLE_Jb              = 0x7f;
-const uint32_t OP_JCC_G_Jb                = 0x7f;
-
-const uint32_t OP_G1_Eb_Ib                = (0x80 | OPFLAG_8BITRM);
-const uint32_t OP_G1_Ev_Iz                = 0x81;
-const uint32_t OP_G1_Eb_Ibx               = (0x82 | OPFLAG_8BITRM);
-const uint32_t OP_G1_Ev_Ib                = 0x83;
-const uint32_t OP_TEST_Eb_Gb              = (0x84 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_TEST_Ev_Gv              = 0x85;
-const uint32_t OP_XCHG_Eb_Gb              = (0x86 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_XCHG_Ev_Gv              = 0x87;
-const uint32_t OP_MOV_Eb_Gb               = (0x88 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_MOV_Ev_Gv               = 0x89;
-const uint32_t OP_MOV_Gb_Eb               = (0x8a | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_MOV_Gv_Ev               = 0x8b;
-const uint32_t OP_MOV_Ev_Sw               = 0x8c;
-const uint32_t OP_LEA_Gv_M                = 0x8d;
-const uint32_t OP_MOV_Sw_Ew               = 0x8e;
-const uint32_t OP_G1A_Ev                  = 0x8f;
-
-const uint32_t OP_NOP                     = 0x90;
-const uint32_t OP_PAUSE                   = 0x90;
-const uint32_t OP_XCHG_rCX                = 0x91;
-const uint32_t OP_XCHG_rDX                = 0x92;
-const uint32_t OP_XCHG_rBX                = 0x93;
-const uint32_t OP_XCHG_rSP                = 0x94;
-const uint32_t OP_XCHG_rBP                = 0x95;
-const uint32_t OP_XCHG_rSI                = 0x96;
-const uint32_t OP_XCHG_rDI                = 0x97;
-const uint32_t OP_CBW                     = 0x98;
-const uint32_t OP_CWDE                    = 0x98;
-const uint32_t OP_CDQE                    = 0x98;
-const uint32_t OP_CWD                     = 0x99;
-const uint32_t OP_CDQ                     = 0x99;
-const uint32_t OP_CQO                     = 0x99;
-const uint32_t OP_CALLF_Ap                = 0x9a;
-const uint32_t OP_FWAIT                   = 0x9b;
-const uint32_t OP_PUSHF_Fv                = 0x9c;
-const uint32_t OP_POPF_Fv                 = 0x9d;
-const uint32_t OP_SAHF                    = 0x9e;
-const uint32_t OP_LAHF                    = 0x9f;
-
-const uint32_t OP_MOV_AL_Ob               = 0xa0;
-const uint32_t OP_MOV_rAX_Ov              = 0xa1;
-const uint32_t OP_MOV_Ob_AL               = 0xa2;
-const uint32_t OP_MOV_Ov_rAX              = 0xa3;
-const uint32_t OP_MOVS_Xb_Yb              = 0xa4;
-const uint32_t OP_MOVS_Xv_Yv              = 0xa5;
-const uint32_t OP_CMPS_Xb_Yb              = 0xa6;
-const uint32_t OP_CMPS_Xv_Yv              = 0xa7;
-const uint32_t OP_TEST_AL_Ib              = 0xa8;
-const uint32_t OP_TEST_rAX_Iz             = 0xa9;
-const uint32_t OP_STOS_Yb_AL              = 0xaa;
-const uint32_t OP_STOS_Yv_rAX             = 0xab;
-const uint32_t OP_LODS_AL_Xb              = 0xac;
-const uint32_t OP_LODS_rAX_Xv             = 0xad;
-const uint32_t OP_SCAS_AL_Yb              = 0xae;
-const uint32_t OP_SCAC_rAX_Yv             = 0xaf;
-
-const uint32_t OP_MOV_AL_Ib               = 0xb0;
-const uint32_t OP_MOV_CL_Ib               = 0xb1;
-const uint32_t OP_MOV_DL_Ib               = 0xb2;
-const uint32_t OP_MOV_BL_Ib               = 0xb3;
-const uint32_t OP_MOV_AH_Ib               = 0xb4;
-const uint32_t OP_MOV_CH_Ib               = 0xb5;
-const uint32_t OP_MOV_DH_Ib               = 0xb6;
-const uint32_t OP_MOV_BH_Ib               = 0xb7;
-const uint32_t OP_MOV_rAX_Iv              = 0xb8;
-const uint32_t OP_MOV_rCX_Iv              = 0xb9;
-const uint32_t OP_MOV_rDX_Iv              = 0xba;
-const uint32_t OP_MOV_rBX_Iv              = 0xbb;
-const uint32_t OP_MOV_rSP_Iv              = 0xbc;
-const uint32_t OP_MOV_rBP_Iv              = 0xbd;
-const uint32_t OP_MOV_rSI_Iv              = 0xbe;
-const uint32_t OP_MOV_rDI_Iv              = 0xbf;
-
-const uint32_t OP_G2_Eb_Ib                = (0xc0 | OPFLAG_8BITRM);
-const uint32_t OP_G2_Ev_Ib                = 0xc1;
-const uint32_t OP_RETN_Iw                 = 0xc2;
-const uint32_t OP_RETN                    = 0xc3;
-const uint32_t OP_LES_Gz_Mp               = 0xc4;
-const uint32_t OP_LDS_Gz_Mp               = 0xc5;
-const uint32_t OP_G11_Eb_Ib               = (0xc6 | OPFLAG_8BITRM);
-const uint32_t OP_G11_Ev_Iz               = 0xc7;
-const uint32_t OP_ENTER_Iw_Ib             = 0xc8;
-const uint32_t OP_LEAVE                   = 0xc9;
-const uint32_t OP_RETF_Iw                 = 0xca;
-const uint32_t OP_RETF                    = 0xcb;
-const uint32_t OP_INT_3                   = 0xcc;
-const uint32_t OP_INT_Ib                  = 0xcd;
-const uint32_t OP_INTO                    = 0xce;
-const uint32_t OP_IRET                    = 0xcf;
-
-const uint32_t OP_G2_Eb_1                 = (0xd0 | OPFLAG_8BITRM);
-const uint32_t OP_G2_Ev_1                 = 0xd1;
-const uint32_t OP_G2_Eb_CL                = (0xd2 | OPFLAG_8BITRM);
-const uint32_t OP_G2_Ev_CL                = 0xd3;
-const uint32_t OP_AAM                     = 0xd4;
-const uint32_t OP_AAD                     = 0xd5;
-const uint32_t OP_XLAT                    = 0xd7;
-const uint32_t OP_ESC_D8                  = 0xd8;
-const uint32_t OP_ESC_D9                  = 0xd9;
-const uint32_t OP_ESC_DA                  = 0xda;
-const uint32_t OP_ESC_DB                  = 0xdb;
-const uint32_t OP_ESC_DC                  = 0xdc;
-const uint32_t OP_ESC_DD                  = 0xdd;
-const uint32_t OP_ESC_DE                  = 0xde;
-const uint32_t OP_ESC_DF                  = 0xdf;
-
-const uint32_t OP_LOOPNE_Jb               = 0xe0;
-const uint32_t OP_LOOPE_Jb                = 0xe1;
-const uint32_t OP_LOOP_Jb                 = 0xe2;
-const uint32_t OP_JrCXZ_Jb                = 0xe3;
-const uint32_t OP_IN_AL_Ib                = 0xe4;
-const uint32_t OP_IN_eAX_Ib               = 0xe5;
-const uint32_t OP_OUT_Ib_AL               = 0xe6;
-const uint32_t OP_OUT_Ib_eAX              = 0xe7;
-const uint32_t OP_CALL_Jz                 = 0xe8;
-const uint32_t OP_JMP_Jz                  = 0xe9;
-const uint32_t OP_JMPF_AP                 = 0xea;
-const uint32_t OP_JMP_Jb                  = 0xeb;
-const uint32_t OP_IN_AL_DX                = 0xec;
-const uint32_t OP_IN_eAX_D                = 0xed;
-const uint32_t OP_OUT_DX_AL               = 0xee;
-const uint32_t OP_OUT_DX_eAX              = 0xef;
-
-const uint32_t PREFIX_LOCK                = 0xf0;
-const uint32_t PREFIX_REPNE               = 0xf2;
-const uint32_t PREFIX_REPE                = 0xf3;
-const uint32_t OP_HLT                     = 0xf4;
-const uint32_t OP_CMC                     = 0xf5;
-const uint32_t OP_G3_Eb                   = (0xf6 | OPFLAG_8BITRM);
-const uint32_t OP_G3_Ev                   = 0xf7;
-const uint32_t OP_CLC                     = 0xf8;
-const uint32_t OP_STC                     = 0xf9;
-const uint32_t OP_CLI                     = 0xfa;
-const uint32_t OP_STI                     = 0xfb;
-const uint32_t OP_CLD                     = 0xfc;
-const uint32_t OP_STD                     = 0xfd;
-const uint32_t OP_G4                      = 0xfe;
-const uint32_t OP_G5                      = 0xff;
-
-
-// double byte opcodes
-const uint32_t OP_G6                      = 0x0f00;
-const uint32_t OP_G7                      = 0x0f01;
-const uint32_t OP_LAR_Gv_Ew               = 0x0f02;
-const uint32_t OP_LSL_Gv_Ew               = 0x0f03;
-const uint32_t OP_SYSCALL                 = 0x0f05;
-const uint32_t OP_CLTS                    = 0x0f06;
-const uint32_t OP_SYSRET                  = 0x0f07;
-const uint32_t OP_INVD                    = 0x0f08;
-const uint32_t OP_WBINVD                  = 0x0f09;
-const uint32_t OP_UD2                     = 0x0f0b;
-const uint32_t OP_NOP0d_Ev                = 0x0f0d;
-
-const uint32_t OP_MOVUPS_Vps_Wps          = 0x0f10;
-const uint32_t OP_MOVSS_Vss_Wss           = 0xf30f10;
-const uint32_t OP_MOVUPD_Vpd_Wpd          = 0x660f10;
-const uint32_t OP_MOVSD_Vsd_Wsd           = 0xf20f10;
-const uint32_t OP_MOVUPS_Wps_Vps          = 0x0f11;
-const uint32_t OP_MOVSS_Wss_Vss           = 0xf30f11;
-const uint32_t OP_MOVUPD_Wpd_Vpd          = 0x660f11;
-const uint32_t OP_MOVSD_Wsd_Vsd           = 0xf20f11;
-const uint32_t OP_MOVLPS_Vq_Mq            = 0x0f12;
-const uint32_t OP_MOVLPD_Vq_Mq            = 0x660f12;
-const uint32_t OP_MOVHLPS_Vq_Uq           = 0x0f12;
-const uint32_t OP_MOVDDUP_Vq_Wq           = 0xf20f12;
-const uint32_t OP_MOVSLDUP_Vq_Wq          = 0xf30f12;
-const uint32_t OP_MOVLPS_Mq_Vq            = 0x0f13;
-const uint32_t OP_MOVLPD_Mq_Vq            = 0x660f13;
-const uint32_t OP_UNPCKLPS_Vps_Wq         = 0x0f14;
-const uint32_t OP_UNPCKLPD_Vpd_Wq         = 0x660f14;
-const uint32_t OP_UNPCKHPS_Vps_Wq         = 0x0f15;
-const uint32_t OP_UNPCKHPD_Vpd_Wq         = 0x660f15;
-const uint32_t OP_MOVHPS_Vq_Mq            = 0x0f16;
-const uint32_t OP_MOVHPD_Vq_Mq            = 0x660f16;
-const uint32_t OP_MOVLHPS_Vq_Uq           = 0x0f16;
-const uint32_t OP_MOVSHDUP_Vq_Wq          = 0xf30f16;
-const uint32_t OP_MOVHPS_Mq_Vq            = 0x0f17;
-const uint32_t OP_MOVHPD_Mq_Vq            = 0x660f17;
-const uint32_t OP_PREFETCH_G16            = 0x0f18;
-const uint32_t OP_NOP1f_Ev                = 0x0f1f;
-
-const uint32_t OP_MOV_Rd_Cd               = 0x0f20;
-const uint32_t OP_MOV_Rd_Dd               = 0x0f21;
-const uint32_t OP_MOV_Cd_Rd               = 0x0f22;
-const uint32_t OP_MOV_Dd_Rd               = 0x0f23;
-const uint32_t OP_MOVAPS_Vps_Wps          = 0x0f28;
-const uint32_t OP_MOVAPD_Vpd_Wpd          = 0x660f28;
-const uint32_t OP_MOVAPS_Wps_Vps          = 0x0f29;
-const uint32_t OP_MOVAPD_Wpd_Vpd          = 0x660f29;
-const uint32_t OP_CVTPI2PS_Vps_Qq         = 0x0f2a;
-const uint32_t OP_CVTSI2SS_Vss_Ed         = 0xf30f2a;
-const uint32_t OP_CVTPI2PD_Vpd_Qq         = 0x660f2a;
-const uint32_t OP_CVTSI2SD_Vsd_Ed         = 0xf20f2a;
-const uint32_t OP_MOVNTPS_Mps_Vps         = 0x0f2b;
-const uint32_t OP_MOVNTPD_Mpd_Vpd         = 0x660f2b;
-const uint32_t OP_CVTTPS2PI_Pq_Wq         = 0x0f2c;
-const uint32_t OP_CVTTSS2SI_Gd_Wss        = 0xf30f2c;
-const uint32_t OP_CVTTPD2PI_Pq_Wpd        = 0x660f2c;
-const uint32_t OP_CVTTSD2SI_Gd_Wsd        = 0xf20f2c;
-const uint32_t OP_CVTPS2PI_Pq_Wq          = 0x0f2d;
-const uint32_t OP_CVTSS2SI_Gd_Wss         = 0xf30f2d;
-const uint32_t OP_CVTPD2PI_Pq_Wpd         = 0x660f2d;
-const uint32_t OP_CVTSD2SI_Gd_Wsd         = 0xf20f2d;
-const uint32_t OP_UCOMISS_Vss_Wss         = 0x0f2e;
-const uint32_t OP_UCOMISD_Vsd_Wsd         = 0x660f2e;
-const uint32_t OP_COMISS_Vss_Wss          = 0x0f2f;
-const uint32_t OP_COMISD_Vsd_Wsd          = 0x660f2f;
-
-const uint32_t OP_WRMSR                   = 0x0f30;
-const uint32_t OP_RDTSC                   = 0x0f31;
-const uint32_t OP_RDMSR                   = 0x0f32;
-const uint32_t OP_RDPMC                   = 0x0f33;
-const uint32_t OP_SYSENTER                = 0x0f34;
-const uint32_t OP_SYSEXIT                 = 0x0f35;
-const uint32_t OP_GETSEC                  = 0x0f37;
-
-const uint32_t OP_CMOV_O_Gv_Ev            = 0x0f40;
-const uint32_t OP_CMOV_NO_Gv_Ev           = 0x0f41;
-const uint32_t OP_CMOV_B_Gv_Ev            = 0x0f42;
-const uint32_t OP_CMOV_C_Gv_Ev            = 0x0f42;
-const uint32_t OP_CMOV_AE_Gv_Ev           = 0x0f43;
-const uint32_t OP_CMOV_NC_Gv_Ev           = 0x0f43;
-const uint32_t OP_CMOV_E_Gv_Ev            = 0x0f44;
-const uint32_t OP_CMOV_Z_Gv_Ev            = 0x0f44;
-const uint32_t OP_CMOV_NE_Gv_Ev           = 0x0f45;
-const uint32_t OP_CMOV_NZ_Gv_Ev           = 0x0f45;
-const uint32_t OP_CMOV_BE_Gv_Ev           = 0x0f46;
-const uint32_t OP_CMOV_A_Gv_Ev            = 0x0f47;
-const uint32_t OP_CMOV_S_Gv_Ev            = 0x0f48;
-const uint32_t OP_CMOV_NS_Gv_Ev           = 0x0f49;
-const uint32_t OP_CMOV_P_Gv_Ev            = 0x0f4a;
-const uint32_t OP_CMOV_PE_Gv_Ev           = 0x0f4a;
-const uint32_t OP_CMOV_NP_Gv_Ev           = 0x0f4b;
-const uint32_t OP_CMOV_PO_Gv_Ev           = 0x0f4b;
-const uint32_t OP_CMOV_L_Gv_Ev            = 0x0f4c;
-const uint32_t OP_CMOV_NGE_Gv_Ev          = 0x0f4c;
-const uint32_t OP_CMOV_NL_Gv_Ev           = 0x0f4d;
-const uint32_t OP_CMOV_GE_Gv_Ev           = 0x0f4d;
-const uint32_t OP_CMOV_LE_Gv_Ev           = 0x0f4e;
-const uint32_t OP_CMOV_NG_Gv_Ev           = 0x0f4e;
-const uint32_t OP_CMOV_NLE_Gv_Ev          = 0x0f4f;
-const uint32_t OP_CMOV_G_Gv_Ev            = 0x0f4f;
-
-const uint32_t OP_MOVMSKPS_Gd_Ups         = 0x0f50;
-const uint32_t OP_MOVMSKPD_Gd_Upd         = 0x660f50;
-const uint32_t OP_SQRTPS_Vps_Wps          = 0x0f51;
-const uint32_t OP_SQRTSS_Vss_Wss          = 0xf30f51;
-const uint32_t OP_SQRTPD_Vpd_Wpd          = 0x660f51;
-const uint32_t OP_SQRTSD_Vsd_Wsd          = 0xf20f51;
-const uint32_t OP_RSQRTPS_Vps_Wps         = 0x0f52;
-const uint32_t OP_RSQRTSS_Vss_Wss         = 0xf30f52;
-const uint32_t OP_RCPPS_Vps_Wps           = 0x0f53;
-const uint32_t OP_RCPSS_Vss_Wss           = 0xf30f53;
-const uint32_t OP_ANDPS_Vps_Wps           = 0x0f54;
-const uint32_t OP_ANDPD_Vpd_Wpd           = 0x660f54;
-const uint32_t OP_ANDNPS_Vps_Wps          = 0x0f55;
-const uint32_t OP_ANDNPD_Vpd_Wpd          = 0x660f55;
-const uint32_t OP_ORPS_Vps_Wps            = 0x0f56;
-const uint32_t OP_ORPD_Vpd_Wpd            = 0x660f56;
-const uint32_t OP_XORPS_Vps_Wps           = 0x0f57;
-const uint32_t OP_XORPD_Vpd_Wpd           = 0x660f57;
-const uint32_t OP_ADDPS_Vps_Wps           = 0x0f58;
-const uint32_t OP_ADDSS_Vss_Wss           = 0xf30f58;
-const uint32_t OP_ADDPD_Vpd_Wpd           = 0x660f58;
-const uint32_t OP_ADDSD_Vsd_Wsd           = 0xf20f58;
-const uint32_t OP_MULPS_Vps_Wps           = 0x0f59;
-const uint32_t OP_MULSS_Vss_Wss           = 0xf30f59;
-const uint32_t OP_MULPD_Vpd_Wpd           = 0x660f59;
-const uint32_t OP_MULSD_Vsd_Wsd           = 0xf20f59;
-const uint32_t OP_CVTPS2PD_Vpd_Wq         = 0x0f5a;
-const uint32_t OP_CVTSS2SD_Vsd_Wss        = 0xf30f5a;
-const uint32_t OP_CVTPD2PS_Vps_Wpd        = 0x660f5a;
-const uint32_t OP_CVTSD2SS_Vss_Wsd        = 0xf20f5a;
-const uint32_t OP_CVTDQ2PS_Vps_Wdq        = 0x0f5b;
-const uint32_t OP_CVTPS2DQ_Vdq_Wps        = 0x660f5b;
-const uint32_t OP_CVTTPS2DQ_Vdq_Wps       = 0xf30f5b;
-const uint32_t OP_SUBPS_Vps_Wps           = 0x0f5c;
-const uint32_t OP_SUBSS_Vss_Wss           = 0xf30f5c;
-const uint32_t OP_SUBPD_Vpd_Wpd           = 0x660f5c;
-const uint32_t OP_SUBSD_Vsd_Wsd           = 0xf20f5c;
-const uint32_t OP_MINPS_Vps_Wps           = 0x0f5d;
-const uint32_t OP_MINSS_Vss_Wss           = 0xf30f5d;
-const uint32_t OP_MINPD_Vpd_Wpd           = 0x660f5d;
-const uint32_t OP_MINSD_Vsd_Wsd           = 0xf20f5d;
-const uint32_t OP_DIVPS_Vps_Wps           = 0x0f5e;
-const uint32_t OP_DIVSS_Vss_Wss           = 0xf30f5e;
-const uint32_t OP_DIVPD_Vpd_Wpd           = 0x660f5e;
-const uint32_t OP_DIVSD_Vsd_Wsd           = 0xf20f5e;
-const uint32_t OP_MAXPS_Vps_Wps           = 0x0f5f;
-const uint32_t OP_MAXSS_Vss_Wss           = 0xf30f5f;
-const uint32_t OP_MAXPD_Vpd_Wpd           = 0x660f5f;
-const uint32_t OP_MAXSD_Vsd_Wsd           = 0xf20f5f;
-
-const uint32_t OP_PUNPCKLBW_Pq_Qd         = 0x0f60;
-const uint32_t OP_PUNPCKLBW_Vdq_Wdq       = 0x660f60;
-const uint32_t OP_PUNPCKLWD_Pq_Qd         = 0x0f61;
-const uint32_t OP_PUNPCKLWD_Vdq_Wdq       = 0x660f61;
-const uint32_t OP_PUNPCKLDQ_Pq_Qd         = 0x0f62;
-const uint32_t OP_PUNPCKLDQ_Vdq_Wdq       = 0x660f62;
-const uint32_t OP_PACKSSWB_Pq_Qq          = 0x0f63;
-const uint32_t OP_PACKSSWB_Vdq_Wdq        = 0x660f63;
-const uint32_t OP_PCMPGTB_Pq_Qq           = 0x0f64;
-const uint32_t OP_PCMPGTB_Vdq_Wdq         = 0x660f64;
-const uint32_t OP_PCMPGTW_Pq_Qq           = 0x0f65;
-const uint32_t OP_PCMPGTW_Vdq_Wdq         = 0x660f65;
-const uint32_t OP_PCMPGTD_Pq_Qq           = 0x0f66;
-const uint32_t OP_PCMPGTD_Vdq_Wdq         = 0x660f66;
-const uint32_t OP_PACKUSWB_Pq_Qq          = 0x0f67;
-const uint32_t OP_PACKUSWB_Vdq_Wdq        = 0x660f67;
-const uint32_t OP_PUNPCKHBW_Pq_Qq         = 0x0f68;
-const uint32_t OP_PUNPCKHBW_Vdq_Qdq       = 0x660f68;
-const uint32_t OP_PUNPCKHWD_Pq_Qq         = 0x0f69;
-const uint32_t OP_PUNPCKHWD_Vdq_Qdq       = 0x660f69;
-const uint32_t OP_PUNPCKHDQ_Pq_Qq         = 0x0f6a;
-const uint32_t OP_PUNPCKHDQ_Vdq_Qdq       = 0x660f6a;
-const uint32_t OP_PACKSSDW_Pq_Qq          = 0x0f6b;
-const uint32_t OP_PACKSSDW_Vdq_Qdq        = 0x660f6b;
-const uint32_t OP_PUNPCKLQDQ_Vdq_Wdq      = 0x660f6c;
-const uint32_t OP_PUNPCKHQDQ_Vdq_Wdq      = 0x660f6d;
-const uint32_t OP_MOVD_Pd_Ed              = 0x0f6e;
-const uint32_t OP_MOVD_Vd_Ed              = 0x660f6e;
-const uint32_t OP_MOVQ_Pq_Qq              = 0x0f6f;
-const uint32_t OP_MOVDQA_Vdq_Wdq          = 0x660f6f;
-const uint32_t OP_MOVDQU_Vdq_Wdq          = 0xf30f6f;
-
-const uint32_t OP_PSHUFW_Pq_Qq_Ib         = 0x0f70;
-const uint32_t OP_PSHUFD_Vdq_Wdq_Ib       = 0x660f70;
-const uint32_t OP_PSHUFHW_Vdq_Wdq_Ib      = 0xf30f70;
-const uint32_t OP_PSHUFLW_Vdq_Wdq_Ib      = 0xf20f70;
-const uint32_t OP_G12                     = 0x0f71;
-const uint32_t OP_G13                     = 0x0f72;
-const uint32_t OP_G14                     = 0x0f73;
-const uint32_t OP_PCMPEQB_Pq_Qq           = 0x0f74;
-const uint32_t OP_PCMPEQB_Vdq_Wdq         = 0x660f74;
-const uint32_t OP_PCMPEQW_Pq_Qq           = 0x0f75;
-const uint32_t OP_PCMPEQW_Vdq_Wdq         = 0x660f75;
-const uint32_t OP_PCMPEQD_Pq_Qq           = 0x0f76;
-const uint32_t OP_PCMPEQD_Vdq_Wdq         = 0x660f76;
-const uint32_t OP_EMMS                    = 0x0f77;
-const uint32_t OP_VMREAD_Ed_Gd            = 0x0f78;
-const uint32_t OP_VMWRITE_Gd_Ed           = 0x0f79;
-const uint32_t OP_HADDPD_Vpd_Wpd          = 0x660f7c;
-const uint32_t OP_HADDPS_Vps_Wps          = 0xf20f7c;
-const uint32_t OP_HSUBPD_Vpd_Wpd          = 0x660f7d;
-const uint32_t OP_HSUBPS_Vps_Wps          = 0xf20f7d;
-const uint32_t OP_MOVD_Ed_Pd              = 0x0f7e;
-const uint32_t OP_MOVD_Ed_Vd              = 0x660f7e;
-const uint32_t OP_MOVQ_Vq_Wq              = 0xf30f7e;
-const uint32_t OP_MOVQ_Qq_Pq              = 0x0f7f;
-const uint32_t OP_MOVDQA_Wdq_Vdq          = 0x660f7f;
-const uint32_t OP_MOVDQU_Wdq_Vdq          = 0xf30f7f;
-
-const uint32_t OP_JCC_O_Jv                = 0x0f80;
-const uint32_t OP_JCC_NO_Jv               = 0x0f81;
-const uint32_t OP_JCC_B_Jv                = 0x0f82;
-const uint32_t OP_JCC_C_Jv                = 0x0f82;
-const uint32_t OP_JCC_NAE_Jv              = 0x0f82;
-const uint32_t OP_JCC_AE_Jv               = 0x0f83;
-const uint32_t OP_JCC_NB_Jv               = 0x0f83;
-const uint32_t OP_JCC_NC_Jv               = 0x0f83;
-const uint32_t OP_JCC_E_Jv                = 0x0f84;
-const uint32_t OP_JCC_Z_Jv                = 0x0f84;
-const uint32_t OP_JCC_NE_Jv               = 0x0f85;
-const uint32_t OP_JCC_NZ_Jv               = 0x0f85;
-const uint32_t OP_JCC_BE_Jv               = 0x0f86;
-const uint32_t OP_JCC_NA_Jv               = 0x0f86;
-const uint32_t OP_JCC_A_Jv                = 0x0f87;
-const uint32_t OP_JCC_NBE_Jv              = 0x0f87;
-const uint32_t OP_JCC_S_Jv                = 0x0f88;
-const uint32_t OP_JCC_NS_Jv               = 0x0f89;
-const uint32_t OP_JCC_P_Jv                = 0x0f8a;
-const uint32_t OP_JCC_PE_Jv               = 0x0f8a;
-const uint32_t OP_JCC_NP_Jv               = 0x0f8b;
-const uint32_t OP_JCC_PO_Jv               = 0x0f8b;
-const uint32_t OP_JCC_L_Jv                = 0x0f8c;
-const uint32_t OP_JCC_NGE_Jv              = 0x0f8c;
-const uint32_t OP_JCC_NL_Jv               = 0x0f8d;
-const uint32_t OP_JCC_GE_Jv               = 0x0f8d;
-const uint32_t OP_JCC_LE_Jv               = 0x0f8e;
-const uint32_t OP_JCC_NG_Jv               = 0x0f8e;
-const uint32_t OP_JCC_NLE_Jv              = 0x0f8f;
-const uint32_t OP_JCC_G_Jv                = 0x0f8f;
-
-const uint32_t OP_SETCC_O_Eb              = (0x0f90 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NO_Eb             = (0x0f91 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_B_Eb              = (0x0f92 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_C_Eb              = (0x0f92 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NAE_Eb            = (0x0f92 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_AE_Eb             = (0x0f93 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NB_Eb             = (0x0f93 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NC_Eb             = (0x0f93 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_E_Eb              = (0x0f94 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_Z_Eb              = (0x0f94 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NE_Eb             = (0x0f95 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NZ_Eb             = (0x0f95 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_BE_Eb             = (0x0f96 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NA_Eb             = (0x0f96 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_A_Eb              = (0x0f97 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NBE_Eb            = (0x0f97 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_S_Eb              = (0x0f98 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NS_Eb             = (0x0f99 | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_P_Eb              = (0x0f9a | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_PE_Eb             = (0x0f9a | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NP_Eb             = (0x0f9b | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_PO_Eb             = (0x0f9b | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_L_Eb              = (0x0f9c | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NGE_Eb            = (0x0f9c | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NL_Eb             = (0x0f9d | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_GE_Eb             = (0x0f9d | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_LE_Eb             = (0x0f9e | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NG_Eb             = (0x0f9e | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_NLE_Eb            = (0x0f9f | OPFLAG_8BITRM);
-const uint32_t OP_SETCC_G_Eb              = (0x0f9f | OPFLAG_8BITRM);
-
-const uint32_t OP_PUSH_FS                 = 0x0fa0;
-const uint32_t OP_POP_FS                  = 0x0fa1;
-const uint32_t OP_CPUID                   = 0x0fa2;
-const uint32_t OP_BT_Ev_Gv                = 0x0fa3;
-const uint32_t OP_SHLD_Ev_Gv_Ib           = 0x0fa4;
-const uint32_t OP_SHLD_Ev_Gv_CL           = 0x0fa5;
-const uint32_t OP_PUSH_GS                 = 0x0fa8;
-const uint32_t OP_POP_GS                  = 0x0fa9;
-const uint32_t OP_RSM                     = 0x0faa;
-const uint32_t OP_BTS_Ev_Gv               = 0x0fab;
-const uint32_t OP_SHRD_Ev_Gv_Ib           = 0x0fac;
-const uint32_t OP_SHRD_Ev_Gv_CL           = 0x0fad;
-const uint32_t OP_G16                     = 0x0fae;
-const uint32_t OP_IMUL_Gv_Ev              = 0x0faf;
-
-const uint32_t OP_CMPXCHG_Eb_Gb           = (0x0fb0 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_CMPXCHG_Ev_Gv           = 0x0fb1;
-const uint32_t OP_LSS_Mp                  = 0x0fb2;
-const uint32_t OP_BTR_Ev_Gv               = 0x0fb3;
-const uint32_t OP_LFS_Mp                  = 0x0fb4;
-const uint32_t OP_LGS_Mp                  = 0x0fb5;
-const uint32_t OP_MOVZX_Gv_Eb             = (0x0fb6 | OPFLAG_8BITRM);
-const uint32_t OP_MOVZX_Gv_Ew             = 0x0fb7;
-const uint32_t OP_JMPE                    = 0x0fb8;
-const uint32_t OP_POPCNT_Gv_Ev            = 0xf30fb8;
-const uint32_t OP_G10_INVALID             = 0x0fb9;
-const uint32_t OP_G8_Ev_Ib                = 0x0fba;
-const uint32_t OP_BTC_Ev_Gv               = 0x0fbb;
-const uint32_t OP_BSF_Gv_Ev               = 0x0fbc;
-const uint32_t OP_BSR_Gv_Ev               = 0x0fbd;
-const uint32_t OP_MOVSX_Gv_Eb             = (0x0fbe | OPFLAG_8BITRM);
-const uint32_t OP_MOVSX_Gv_Ew             = 0x0fbf;
-
-const uint32_t OP_XADD_Eb_Gb              = (0x0fc0 | OPFLAG_8BITRM | OPFLAG_8BITREG);
-const uint32_t OP_XADD_Ev_Gv              = 0x0fc1;
-const uint32_t OP_CMPPS_Vps_Wps_Ib        = 0x0fc2;
-const uint32_t OP_CMPSS_Vss_Wss_Ib        = 0xf30fc2;
-const uint32_t OP_CMPPD_Vpd_Wpd_Ib        = 0x660fc2;
-const uint32_t OP_CMPSD_Vsd_Wsd_Ib        = 0xf20fc2;
-const uint32_t OP_MOVNTI_Md_Gd            = 0x0fc3;
-const uint32_t OP_PINSRW_Pw_Ew_Ib         = 0x0fc4;
-const uint32_t OP_PINSRW_Vw_Ew_Ib         = 0x660fc4;
-const uint32_t OP_PEXTRW_Gw_Pw_Ib         = 0x0fc5;
-const uint32_t OP_PEXTRW_Gw_Vw_Ib         = 0x660fc5;
-const uint32_t OP_SHUFPS_Vps_Wps_Ib       = 0x0fc6;
-const uint32_t OP_SHUFPD_Vpd_Wpd_Ib       = 0x660fc6;
-const uint32_t OP_G9                      = 0x0fc7;
-const uint32_t OP_BSWAP_EAX               = 0x0fc8;
-const uint32_t OP_BSWAP_ECX               = 0x0fc9;
-const uint32_t OP_BSWAP_EDX               = 0x0fca;
-const uint32_t OP_BSWAP_EBX               = 0x0fcb;
-const uint32_t OP_BSWAP_ESP               = 0x0fcc;
-const uint32_t OP_BSWAP_EBP               = 0x0fcd;
-const uint32_t OP_BSWAP_ESI               = 0x0fce;
-const uint32_t OP_BSWAP_EDI               = 0x0fcf;
-
-const uint32_t OP_ADDSUBPD_Vpd_Wpd        = 0x0fd0;
-const uint32_t OP_ADDSUBPS_Vps_Wps        = 0xf20fd0;
-const uint32_t OP_PSRLW_Pq_Qq             = 0x0fd1;
-const uint32_t OP_PSRLW_Vdq_Wdq           = 0x660fd1;
-const uint32_t OP_PSRLD_Pq_Qq             = 0x0fd2;
-const uint32_t OP_PSRLD_Vdq_Wdq           = 0x660fd2;
-const uint32_t OP_PSRLQ_Pq_Qq             = 0x0fd3;
-const uint32_t OP_PSRLQ_Vdq_Wdq           = 0x660fd3;
-const uint32_t OP_PADDQ_Pq_Qq             = 0x0fd4;
-const uint32_t OP_PADDQ_Vdq_Wdq           = 0x660fd4;
-const uint32_t OP_PMULLW_Pq_Qq            = 0x0fd5;
-const uint32_t OP_PMULLW_Vdq_Wdq          = 0x660fd5;
-const uint32_t OP_MOVQ_Wq_Vq              = 0x0fd6;
-const uint32_t OP_MOVQ2DQ_Vdq_Qq          = 0xf30fd6;
-const uint32_t OP_MOVDQ2Q_Pq_Vq           = 0xf20fd6;
-const uint32_t OP_PMOVMSKB_Gd_Pq          = 0x0fd7;
-const uint32_t OP_PMOVMSKB_Gd_Vdq         = 0x660fd7;
-const uint32_t OP_PSUBUSB_Pq_Qq           = 0x0fd8;
-const uint32_t OP_PSUBUSB_Vdq_Wdq         = 0x660fd8;
-const uint32_t OP_PSUBUSW_Pq_Qq           = 0x0fd9;
-const uint32_t OP_PSUBUSW_Vdq_Wdq         = 0x660fd9;
-const uint32_t OP_PMINUB_Pq_Qq            = 0x0fda;
-const uint32_t OP_PMINUB_Vdq_Wdq          = 0x660fda;
-const uint32_t OP_PAND_Pq_Qq              = 0x0fdb;
-const uint32_t OP_PAND_Vdq_Wdq            = 0x660fdb;
-const uint32_t OP_PADDUSB_Pq_Qq           = 0x0fdc;
-const uint32_t OP_PADDUSB_Vdq_Wdq         = 0x660fdc;
-const uint32_t OP_PADDUSW_Pq_Qq           = 0x0fdd;
-const uint32_t OP_PADDUSW_Vdq_Wdq         = 0x660fdd;
-const uint32_t OP_PMAXUB_Pq_Qq            = 0x0fde;
-const uint32_t OP_PMAXUB_Vdq_Wdq          = 0x660fde;
-const uint32_t OP_PANDN_Pq_Qq             = 0x0fdf;
-const uint32_t OP_PANDN_Vdq_Wdq           = 0x660fdf;
-
-const uint32_t OP_PAVGB_Pq_Qq             = 0x0fe0;
-const uint32_t OP_PAVGB_Vdq_Wdq           = 0x660fe0;
-const uint32_t OP_PSRAW_Pq_Qq             = 0x0fe1;
-const uint32_t OP_PSRAW_Vdq_Wdq           = 0x660fe1;
-const uint32_t OP_PSRAD_Pq_Qq             = 0x0fe2;
-const uint32_t OP_PSRAD_Vdq_Wdq           = 0x660fe2;
-const uint32_t OP_PAVGW_Pq_Qq             = 0x0fe3;
-const uint32_t OP_PAVGW_Vdq_Wdq           = 0x660fe3;
-const uint32_t OP_PMULHUW_Pq_Qq           = 0x0fe4;
-const uint32_t OP_PMULHUW_Vdq_Wdq         = 0x660fe4;
-const uint32_t OP_PMULHW_Pq_Qq            = 0x0fe5;
-const uint32_t OP_PMULHW_Vdq_Wdq          = 0x660fe5;
-const uint32_t OP_CVTPD2DQ_Vdq_Wpd        = 0xf20fe6;
-const uint32_t OP_CVTTPD2DQ_Vdq_Wpd       = 0x660fe6;
-const uint32_t OP_CVTDQ2PD_Vpd_Wq         = 0xf30fe6;
-const uint32_t OP_MOVNTQ_Mq_Vq            = 0x0fe7;
-const uint32_t OP_MOVNTDQ_Mdq_Vdq         = 0x660fe7;
-const uint32_t OP_PSUBSB_Pq_Qq            = 0x0fe8;
-const uint32_t OP_PSUBSB_Vdq_Wdq          = 0x660fe8;
-const uint32_t OP_PSUBSW_Pq_Qq            = 0x0fe9;
-const uint32_t OP_PSUBSW_Vdq_Wdq          = 0x660fe9;
-const uint32_t OP_PMINSW_Pq_Qq            = 0x0fea;
-const uint32_t OP_PMINSW_Vdq_Wdq          = 0x660fea;
-const uint32_t OP_POR_Pq_Qq               = 0x0feb;
-const uint32_t OP_POR_Vdq_Wdq             = 0x660feb;
-const uint32_t OP_PADDSB_Pq_Qq            = 0x0fec;
-const uint32_t OP_PADDSB_Vdq_Wdq          = 0x660fec;
-const uint32_t OP_PADDSW_Pq_Qq            = 0x0fed;
-const uint32_t OP_PADDSW_Vdq_Wdq          = 0x660fed;
-const uint32_t OP_PMAXSW_Pq_Qq            = 0x0fee;
-const uint32_t OP_PMAXSW_Vdq_Wdq          = 0x660fee;
-const uint32_t OP_PXOR_Pq_Qq              = 0x0fef;
-const uint32_t OP_PXOR_Vdq_Wdq            = 0x660fef;
-
-const uint32_t OP_LDDQU_Vdq_Mdq           = 0xf20ff0;
-const uint32_t OP_PSLLW_Pq_Qq             = 0x0ff1;
-const uint32_t OP_PSLLW_Vdq_Wdq           = 0x660ff1;
-const uint32_t OP_PSLLD_Pq_Qq             = 0x0ff2;
-const uint32_t OP_PSLLD_Vdq_Wdq           = 0x660ff2;
-const uint32_t OP_PSLLQ_Pq_Qq             = 0x0ff3;
-const uint32_t OP_PSLLQ_Vdq_Wdq           = 0x660ff3;
-const uint32_t OP_PMULUDQ_Pq_Qq           = 0x0ff4;
-const uint32_t OP_PMULUDQ_Vdq_Wdq         = 0x660ff4;
-const uint32_t OP_PMADDWD_Pq_Qq           = 0x0ff5;
-const uint32_t OP_PMADDWD_Vdq_Wdq         = 0x660ff5;
-const uint32_t OP_PSADBW_Pq_Qq            = 0x0ff6;
-const uint32_t OP_PSADBW_Vdq_Wdq          = 0x660ff6;
-const uint32_t OP_MASKMOVQ_Pq_Qq          = 0x0ff7;
-const uint32_t OP_MASKMOVDQU_Vdq_Wdq      = 0x660ff7;
-const uint32_t OP_PSUBB_Pq_Qq             = 0x0ff8;
-const uint32_t OP_PSUBB_Vdq_Wdq           = 0x660ff8;
-const uint32_t OP_PSUBW_Pq_Qq             = 0x0ff9;
-const uint32_t OP_PSUBW_Vdq_Wdq           = 0x660ff9;
-const uint32_t OP_PSUBD_Pq_Qq             = 0x0ffa;
-const uint32_t OP_PSUBD_Vdq_Wdq           = 0x660ffa;
-const uint32_t OP_PSUBQ_Pq_Qq             = 0x0ffb;
-const uint32_t OP_PSUBQ_Vdq_Wdq           = 0x660ffb;
-const uint32_t OP_PADDB_Pq_Qq             = 0x0ffc;
-const uint32_t OP_PADDB_Vdq_Wdq           = 0x660ffc;
-const uint32_t OP_PADDW_Pq_Qq             = 0x0ffd;
-const uint32_t OP_PADDW_Vdq_Wdq           = 0x660ffd;
-const uint32_t OP_PADDD_Pq_Qq             = 0x0ffe;
-const uint32_t OP_PADDD_Vdq_Wdq           = 0x660ffe;
-
-
-// triple byte opcodes (0f 38)
-const uint32_t OP_PSHUFB_Pq_Qq            = 0x0f3800;
-const uint32_t OP_PSHUFB_Vdq_Wdq          = 0x660f3800;
-const uint32_t OP_PHADDW_Pq_Qq            = 0x0f3801;
-const uint32_t OP_PHADDW_Vdq_Wdq          = 0x660f3801;
-const uint32_t OP_PHADDD_Pq_Qq            = 0x0f3802;
-const uint32_t OP_PHADDD_Vdq_Wdq          = 0x660f3802;
-const uint32_t OP_PHADDSW_Pq_Qq           = 0x0f3803;
-const uint32_t OP_PHADDSW_Vdq_Wdq         = 0x660f3803;
-const uint32_t OP_PMADDUBSW_Pq_Qq         = 0x0f3804;
-const uint32_t OP_PMADDUBSW_Vdq_Wdq       = 0x660f3804;
-const uint32_t OP_PHSUBW_Pq_Qq            = 0x0f3805;
-const uint32_t OP_PHSUBW_Vdq_Wdq          = 0x660f3805;
-const uint32_t OP_PHSUBD_Pq_Qq            = 0x0f3806;
-const uint32_t OP_PHSUBD_Vdq_Wdq          = 0x660f3806;
-const uint32_t OP_PHSUBSW_Pq_Qq           = 0x0f3807;
-const uint32_t OP_PHSUBSW_Vdq_Wdq         = 0x660f3807;
-const uint32_t OP_PSIGNB_Pq_Qq            = 0x0f3808;
-const uint32_t OP_PSIGNB_Vdq_Wdq          = 0x660f3808;
-const uint32_t OP_PSIGNW_Pq_Qq            = 0x0f3809;
-const uint32_t OP_PSIGNW_Vdq_Wdq          = 0x660f3809;
-const uint32_t OP_PSIGND_Pq_Qq            = 0x0f380a;
-const uint32_t OP_PSIGND_Vdq_Wdq          = 0x660f380a;
-const uint32_t OP_PMULHRSW_Pq_Qq          = 0x0f380b;
-const uint32_t OP_PMULHRSW_Vdq_Wdq        = 0x660f380b;
-
-const uint32_t OP_PBLENDVB_Vdq_Wdq        = 0x660f3810;
-const uint32_t OP_PBLENDVPS_Vdq_Wdq       = 0x660f3814;
-const uint32_t OP_PBLENDVPD_Vdq_Wdq       = 0x660f3815;
-const uint32_t OP_PTEST_Vdq_Wdq           = 0x660f3817;
-const uint32_t OP_PABSB_Pq_Qq             = 0x0f381c;
-const uint32_t OP_PABSB_Vdq_Wdq           = 0x660f381c;
-const uint32_t OP_PABSW_Pq_Qq             = 0x0f381d;
-const uint32_t OP_PABSW_Vdq_Wdq           = 0x660f381d;
-const uint32_t OP_PABSD_Pq_Qq             = 0x0f381e;
-const uint32_t OP_PABSD_Vdq_Wdq           = 0x660f381e;
-
-const uint32_t OP_PMOVSXBW_Vdq_Udq        = 0x660f3820;
-const uint32_t OP_PMOVSXBD_Vdq_Udq        = 0x660f3821;
-const uint32_t OP_PMOVSXBQ_Vdq_Udq        = 0x660f3822;
-const uint32_t OP_PMOVSXWD_Vdq_Udq        = 0x660f3823;
-const uint32_t OP_PMOVSXWQ_Vdq_Udq        = 0x660f3824;
-const uint32_t OP_PMOVSXDQ_Vdq_Udq        = 0x660f3825;
-const uint32_t OP_PMULDQ_Vdq_Udq          = 0x660f3828;
-const uint32_t OP_PCMPEQQ_Vdq_Udq         = 0x660f3829;
-const uint32_t OP_MOVNTDQA_Vdq_Udq        = 0x660f382a;
-const uint32_t OP_PACKUSDW_Vdq_Udq        = 0x660f382b;
-
-const uint32_t OP_PMOVZXBW_Vdq_Udq        = 0x660f3830;
-const uint32_t OP_PMOVZXBD_Vdq_Udq        = 0x660f3831;
-const uint32_t OP_PMOVZXBQ_Vdq_Udq        = 0x660f3832;
-const uint32_t OP_PMOVZXWD_Vdq_Udq        = 0x660f3833;
-const uint32_t OP_PMOVZXWQ_Vdq_Udq        = 0x660f3834;
-const uint32_t OP_PMOVZXDQ_Vdq_Udq        = 0x660f3835;
-const uint32_t OP_PMINSB_Vdq_Udq          = 0x660f3838;
-const uint32_t OP_PMINSD_Vdq_Udq          = 0x660f3839;
-const uint32_t OP_PMINUW_Vdq_Udq          = 0x660f383a;
-const uint32_t OP_PMINUD_Vdq_Udq          = 0x660f383b;
-const uint32_t OP_PMAXSB_Vdq_Udq          = 0x660f383c;
-const uint32_t OP_PMAXSD_Vdq_Udq          = 0x660f383d;
-const uint32_t OP_PMAXUW_Vdq_Udq          = 0x660f383e;
-const uint32_t OP_PMAXUD_Vdq_Udq          = 0x660f383f;
-
-const uint32_t OP_MULLD_Vdq_Wdq           = 0x660f3840;
-const uint32_t OP_PHMINPOSUW_Vdq_Wdq      = 0x660f3841;
-
-const uint32_t OP_NVEPT_Gd_Mdq            = 0x660f3880;
-const uint32_t OP_NVVPID_Gd_Mdq           = 0x660f3881;
-
-const uint32_t OP_MOVBE_Gv_Mv             = 0x0f38f0;
-const uint32_t OP_CRC32_Gd_Eb             = 0xf20f38f0;
-const uint32_t OP_MOVBE_Mv_Gv             = 0x0f38f1;
-const uint32_t OP_CRC32_Gd_Ev             = 0xf20f38f1;
-
-
-// triple byte opcodes (0f 3a)
-const uint32_t OP_ROUNDPS_Vdq_Wdq_Ib      = 0x660f3a08;
-const uint32_t OP_ROUNDPD_Vdq_Wdq_Ib      = 0x660f3a09;
-const uint32_t OP_ROUNDSS_Vss_Wss_Ib      = 0x660f3a0a;
-const uint32_t OP_ROUNDSD_Vsd_Wsd_Ib      = 0x660f3a0b;
-const uint32_t OP_BLENDPS_Vdq_Wdq_Ib      = 0x660f3a0c;
-const uint32_t OP_BLENDPD_Vdq_Wdq_Ib      = 0x660f3a0d;
-const uint32_t OP_PBLENDW_Vdq_Wdq_Ib      = 0x660f3a0e;
-const uint32_t OP_PALIGNR_Pq_Qq_Ib        = 0x0f3a0f;
-const uint32_t OP_PALIGNR_Vdq_Wdq_Ib      = 0x660f3a0f;
-
-const uint32_t OP_EXTRB_Rd_Vdq_Ib         = 0x660f3a14;
-const uint32_t OP_EXTRW_Rd_Vdq_Ib         = 0x660f3a15;
-const uint32_t OP_EXTRD_Rd_Vdq_Ib         = 0x660f3a16;
-const uint32_t OP_EXTRACTPS_Ed_Vdq_Ib     = 0x660f3a17;
-
-const uint32_t OP_PINSRB_Vdq_Rd_Ib        = 0x660f3a20;
-const uint32_t OP_INSERTPS_Vdq_Udq_Ib     = 0x660f3a21;
-const uint32_t OP_PINSRD_Vdq_Ed_Ib        = 0x660f3a22;
-
-const uint32_t OP_DPPS_Vdq_Wdq_Ib         = 0x660f3a40;
-const uint32_t OP_DPPD_Vdq_Wdq_Ib         = 0x660f3a41;
-const uint32_t OP_MPSADBW_Vdq_Wdq_Ib      = 0x660f3a42;
-
-const uint32_t OP_PCMPESTRM_Vdq_Wdq_Ib    = 0x660f3a60;
-const uint32_t OP_PCMPESTRI_Vdq_Wdq_Ib    = 0x660f3a61;
-const uint32_t OP_PCMPISTRM_Vdq_Wdq_Ib    = 0x660f3a62;
-const uint32_t OP_PCMPISTRI_Vdq_Wdq_Ib    = 0x660f3a63;
-
-
-// floating point opcodes
-const uint32_t OP_FADD_ST0_STn            = 0xd8c0;
-const uint32_t OP_FMUL_ST0_STn            = 0xd8c8;
-const uint32_t OP_FCOM_ST0_STn            = 0xd8d0;
-const uint32_t OP_FCOMP_ST0_STn           = 0xd8d8;
-const uint32_t OP_FSUB_ST0_STn            = 0xd8e0;
-const uint32_t OP_FSUBR_ST0_STn           = 0xd8e8;
-const uint32_t OP_FDIV_ST0_STn            = 0xd8f0;
-const uint32_t OP_FDIVR_ST0_STn           = 0xd8f8;
-const uint32_t OP_FLD_ST0_STn             = 0xd9c0;
-const uint32_t OP_FXCH_ST0_STn            = 0xd9c8;
-const uint32_t OP_FNOP                    = 0xd9d0;
-const uint32_t OP_FCHS                    = 0xd9e0;
-const uint32_t OP_FABS                    = 0xd9e1;
-const uint32_t OP_FTST                    = 0xd9e4;
-const uint32_t OP_FXAM                    = 0xd9e5;
-const uint32_t OP_FLD1                    = 0xd9e8;
-const uint32_t OP_FLDL2T                  = 0xd9e9;
-const uint32_t OP_FLDL2E                  = 0xd9ea;
-const uint32_t OP_FLDPI                   = 0xd9eb;
-const uint32_t OP_FLDLG2                  = 0xd9ec;
-const uint32_t OP_FLDLN2                  = 0xd9ed;
-const uint32_t OP_FLDZ                    = 0xd9ee;
-const uint32_t OP_F2XM1                   = 0xd9f0;
-const uint32_t OP_FYL2X                   = 0xd9f1;
-const uint32_t OP_FPTAN                   = 0xd9f2;
-const uint32_t OP_FPATAN                  = 0xd9f3;
-const uint32_t OP_FXTRACT                 = 0xd9f4;
-const uint32_t OP_FPREM1                  = 0xd9f5;
-const uint32_t OP_FDECSTP                 = 0xd9f6;
-const uint32_t OP_FINCSTP                 = 0xd9f7;
-const uint32_t OP_FPREM                   = 0xd9f8;
-const uint32_t OP_FYL2XP1                 = 0xd9f9;
-const uint32_t OP_FSQRT                   = 0xd9fa;
-const uint32_t OP_FSINCOS                 = 0xd9fb;
-const uint32_t OP_FRNDINT                 = 0xd9fc;
-const uint32_t OP_FSCALE                  = 0xd9fd;
-const uint32_t OP_FSIN                    = 0xd9fe;
-const uint32_t OP_FCOS                    = 0xd9ff;
-const uint32_t OP_FCMOVB_ST0_STn          = 0xdac0;
-const uint32_t OP_FCMOVE_ST0_STn          = 0xdac8;
-const uint32_t OP_FCMOVBE_ST0_STn         = 0xdad0;
-const uint32_t OP_FCMOVU_ST0_STn          = 0xdad8;
-const uint32_t OP_FUCOMPP                 = 0xdae9;
-const uint32_t OP_FCMOVNB_ST0_STn         = 0xdbc0;
-const uint32_t OP_FCMOVNE_ST0_STn         = 0xdbc8;
-const uint32_t OP_FCMOVNBE_ST0_STn        = 0xdbd0;
-const uint32_t OP_FCMOVNU_ST0_STn         = 0xdbd8;
-const uint32_t OP_FCLEX                   = 0xdbe2;
-const uint32_t OP_FINIT                   = 0xdbe3;
-const uint32_t OP_FUCOMI_ST0_STn          = 0xdbe8;
-const uint32_t OP_FCOMI_ST0_STn           = 0xdbf0;
-const uint32_t OP_FADD_STn_ST0            = 0xdcc0;
-const uint32_t OP_FMUL_STn_ST0            = 0xdcc8;
-const uint32_t OP_FSUBR_STn_ST0           = 0xdce0;
-const uint32_t OP_FSUB_STn_ST0            = 0xdce8;
-const uint32_t OP_FDIVR_STn_ST0           = 0xdcf0;
-const uint32_t OP_FDIV_STn_ST0            = 0xdcf8;
-const uint32_t OP_FFREE_STn               = 0xddc0;
-const uint32_t OP_FST_STn                 = 0xddd0;
-const uint32_t OP_FSTP_STn                = 0xddd8;
-const uint32_t OP_FUCOM_STn_ST0           = 0xdde0;
-const uint32_t OP_FUCOMP_STn              = 0xdde8;
-const uint32_t OP_FADDP_STn_ST0           = 0xdec0;
-const uint32_t OP_FMULP_STn_ST0           = 0xdec8;
-const uint32_t OP_FCOMPP                  = 0xded9;
-const uint32_t OP_FSUBRP_STn_ST0          = 0xdee0;
-const uint32_t OP_FSUBP_STn_ST0           = 0xdee8;
-const uint32_t OP_FDIVRP_STn_ST0          = 0xdef0;
-const uint32_t OP_FDIVP_STn_ST0           = 0xdef8;
-const uint32_t OP_FSTSW_AX                = 0xdfe0;
-const uint32_t OP_FCOMIP_ST0_STn          = 0xdff0;
-
-
-
-//**************************************************************************
-//  MEMORY REFERENCES
-//**************************************************************************
-
-inline x86_memref MBD(uint8_t base, int32_t disp) { return x86_memref(base, REG_NONE, 1, disp); }
-inline x86_memref MBISD(uint8_t base, uint8_t ind, uint8_t scale, int32_t disp) { return x86_memref(base, ind, scale, disp); }
-
-#if (X86EMIT_SIZE == 32)
-inline x86_memref MABS(const void *mem) { return x86_memref(REG_NONE, REG_NONE, 1, reinterpret_cast<uintptr_t>(const_cast<void *>(mem))); }
-inline x86_memref MABSI(const void *mem, uint8_t index) { return x86_memref(index, REG_NONE, 1, reinterpret_cast<uintptr_t>(const_cast<void *>(mem))); }
-inline x86_memref MABSI(const void *mem, uint8_t index, uint8_t scale) { return x86_memref(REG_NONE, index, scale, reinterpret_cast<uintptr_t>(const_cast<void *>(mem))); }
-#endif
-
-
-
-//**************************************************************************
-//  CORE FUNCTIONS
-//**************************************************************************
-
-//-------------------------------------------------
-//  make_modrm - assemble a modrm byte from the
-//  three components
-//-------------------------------------------------
-
-inline uint8_t make_modrm(uint8_t mode, uint8_t reg, uint8_t rm)
-{
-	assert(mode < 4);
-	assert(reg < REG_MAX);
-	assert(rm < REG_MAX);
-	return (mode << 6) | ((reg & 7) << 3) | (rm & 7);
-}
-
-
-//-------------------------------------------------
-//  make_sib - assemble an sib byte from the
-//  three components
-//-------------------------------------------------
-
-inline uint8_t make_sib(uint8_t scale, uint8_t index, uint8_t base)
-{
-	static const uint8_t scale_lookup[9] = { 0<<6, 0<<6, 1<<6, 0<<6, 2<<6, 0<<6, 0<<6, 0<<6, 3<<6 };
-	assert(scale == 1 || scale == 2 || scale == 4 || scale == 8);
-	assert(index < REG_MAX);
-	assert(base < REG_MAX);
-	return scale_lookup[scale] | ((index & 7) << 3) | (base & 7);
-}
-
-
-//-------------------------------------------------
-//  emit_byte - emit a byte
-//-------------------------------------------------
-
-inline void emit_byte(x86code *&emitptr, uint8_t byte)
-{
-	*((uint8_t *)emitptr) = byte;
-	emitptr += 1;
-}
-
-
-//-------------------------------------------------
-//  emit_word - emit a word
-//-------------------------------------------------
-
-inline void emit_word(x86code *&emitptr, uint16_t word)
-{
-	*((uint16_t *)emitptr) = word;
-	emitptr += 2;
-}
-
-
-//-------------------------------------------------
-//  emit_dword - emit a dword
-//-------------------------------------------------
-
-inline void emit_dword(x86code *&emitptr, uint32_t dword)
-{
-	*((uint32_t *)emitptr) = dword;
-	emitptr += 4;
-}
-
-
-//-------------------------------------------------
-//  emit_qword - emit a dword
-//-------------------------------------------------
-
-inline void emit_qword(x86code *&emitptr, uint64_t qword)
-{
-	*((uint64_t *)emitptr) = qword;
-	emitptr += 8;
-}
-
-
-
-//**************************************************************************
-//  GENERIC OPCODE EMITTERS
-//**************************************************************************
-
-//-------------------------------------------------
-//  emit_op - emit a 1, 2, or 3-byte opcode,
-//  along with any necessary REX prefixes for x64
-//-------------------------------------------------
-
-inline void emit_op(x86code *&emitptr, uint32_t op, uint8_t opsize, uint8_t reg, uint8_t sib, uint8_t rm)
-{
-	if (opsize == OP_16BIT)
-		emit_byte(emitptr, PREFIX_OPSIZE);
-
-	bool has_prefix = (op & 0xff0000) == 0x660000 || (op & 0xff0000) == 0xf20000 || (op & 0xff0000) == 0xf30000;
-
-	if (has_prefix)
-		emit_byte(emitptr, op >> 16);
-
-#if (X86EMIT_SIZE == 64)
-{
-	uint8_t rex;
-
-	assert(opsize == OP_16BIT || opsize == OP_32BIT || opsize == OP_64BIT);
-
-	rex = (opsize & 8) | ((reg & 8) >> 1) | ((sib & 8) >> 2) | ((rm & 8) >> 3);
-	if (rex != 0 || ((op & OPFLAG_8BITREG) && reg >= 4) || ((op & OPFLAG_8BITRM) && rm >= 4))
-		emit_byte(emitptr, OP_REX + rex);
-}
-#else
-	assert(opsize != OP_64BIT);
-#endif
-
-	if ((op & 0xff0000) != 0 && !has_prefix)
-		emit_byte(emitptr, op >> 16);
-	if ((op & 0xff00) != 0)
-		emit_byte(emitptr, op >> 8);
-	emit_byte(emitptr, op);
-}
-
-
-//-------------------------------------------------
-//  emit_op_simple - emit a simple opcode
-//-------------------------------------------------
-
-inline void emit_op_simple(x86code *&emitptr, uint32_t op, uint8_t opsize)
-{
-	emit_op(emitptr, op, opsize, 0, 0, 0);
-}
-
-
-//-------------------------------------------------
-//  emit_op_reg - emit a simple opcode that has
-//  a register parameter
-//-------------------------------------------------
-
-inline void emit_op_reg(x86code *&emitptr, uint32_t op, uint8_t opsize, uint8_t reg)
-{
-	emit_op(emitptr, op, opsize, 0, 0, reg);
-}
-
-
-//-------------------------------------------------
-//  emit_op_modrm_reg - emit an opcode with a
-//  register modrm byte
-//-------------------------------------------------
-
-inline void emit_op_modrm_reg(x86code *&emitptr, uint32_t op, uint8_t opsize, uint8_t reg, uint8_t rm)
-{
-	assert(reg < REG_MAX);
-	assert(rm < REG_MAX);
-
-	emit_op(emitptr, op, opsize, reg, 0, rm);
-	emit_byte(emitptr, make_modrm(3, reg, rm));
-}
-
-
-//-------------------------------------------------
-//  emit_op_modrm_mem - emit an opcode with a
-//  memory modrm byte
-//-------------------------------------------------
-
-inline void emit_op_modrm_mem(x86code *&emitptr, uint32_t op, uint8_t opsize, uint8_t reg, x86_memref memref)
-{
-	assert(reg < REG_MAX);
-	assert(memref.m_base < REG_MAX || memref.m_base == REG_NONE);
-	assert(memref.m_index < REG_MAX || memref.m_index == REG_NONE);
-
-	// turn off the OPFLAG_8BITRM flag since it only applies to register operands
-	op &= ~OPFLAG_8BITRM;
-
-	// displacement only case
-	if (memref.m_base == REG_NONE && memref.m_index == REG_NONE)
-	{
-#if (X86EMIT_SIZE == 32)
-		emit_op(emitptr, op, opsize, reg, 0, 5);
-		emit_byte(emitptr, make_modrm(0, reg, 5));
-		emit_dword(emitptr, memref.m_disp);
-#else
-		fatalerror("Invalid absolute mode in 64-bits!\n");
-#endif
-	}
-
-	// base only case
-	else if (memref.m_index == REG_NONE && (memref.m_base & 7) != REG_ESP)
-	{
-		emit_op(emitptr, op, opsize, reg, 0, memref.m_base);
-
-		// mode 0 for no offset
-		if (memref.m_disp == 0 && (memref.m_base & 7) != REG_EBP)
-			emit_byte(emitptr, make_modrm(0, reg, memref.m_base));
-
-		// mode 1 for 1-byte offset
-		else if ((int8_t)memref.m_disp == memref.m_disp)
-		{
-			emit_byte(emitptr, make_modrm(1, reg, memref.m_base));
-			emit_byte(emitptr, (int8_t)memref.m_disp);
-		}
-
-		// mode 2 for 4-byte offset
-		else
-		{
-			emit_byte(emitptr, make_modrm(2, reg, memref.m_base));
-			emit_dword(emitptr, memref.m_disp);
-		}
-	}
-
-	// full BISD case
-	else
-	{
-		assert(memref.m_index != REG_ESP);
-		emit_op(emitptr, op, opsize, reg, memref.m_index, memref.m_base);
-
-		// a "none" index == REG_ESP
-		if (memref.m_index == REG_NONE)
-			memref.m_index = REG_ESP;
-
-		// no base is a special case
-		if (memref.m_base == REG_NONE)
-		{
-			emit_byte(emitptr, make_modrm(0, reg, 4));
-			emit_byte(emitptr, make_sib(memref.m_scale, memref.m_index, REG_EBP));
-			emit_dword(emitptr, memref.m_disp);
-		}
-
-		// mode 0 for no offset
-		else if (memref.m_disp == 0 && (memref.m_base & 7) != REG_EBP)
-		{
-			emit_byte(emitptr, make_modrm(0, reg, 4));
-			emit_byte(emitptr, make_sib(memref.m_scale, memref.m_index, memref.m_base));
-		}
-
-		// mode 1 for 1-byte offset
-		else if ((int8_t)memref.m_disp == memref.m_disp)
-		{
-			emit_byte(emitptr, make_modrm(1, reg, 4));
-			emit_byte(emitptr, make_sib(memref.m_scale, memref.m_index, memref.m_base));
-			emit_byte(emitptr, (int8_t)memref.m_disp);
-		}
-
-		// mode 2 for 4-byte offset
-		else
-		{
-			emit_byte(emitptr, make_modrm(2, reg, 4));
-			emit_byte(emitptr, make_sib(memref.m_scale, memref.m_index, memref.m_base));
-			emit_dword(emitptr, memref.m_disp);
-		}
-	}
-}
-
-
-
-//**************************************************************************
-//  GENERIC OPCODE + IMMEDIATE EMITTERS
-//**************************************************************************
-
-//-------------------------------------------------
-//  emit_op_modrm_reg_imm8 - emit an opcode with a
-//  register modrm byte and an 8-bit immediate
-//-------------------------------------------------
-
-inline void emit_op_modrm_reg_imm8(x86code *&emitptr, uint32_t op, uint8_t opsize, uint8_t reg, uint8_t rm, uint8_t imm)
-{
-	emit_op_modrm_reg(emitptr, op, opsize, reg, rm);
-	emit_byte(emitptr, imm);
-}
-
-
-//-------------------------------------------------
-//  emit_op_modrm_mem_imm8 - emit an opcode with a
-//  memory modrm byte and an 8-bit immediate
-//-------------------------------------------------
-
-inline void emit_op_modrm_mem_imm8(x86code *&emitptr, uint32_t op, uint8_t opsize, uint8_t reg, x86_memref memref, uint8_t imm)
-{
-	emit_op_modrm_mem(emitptr, op, opsize, reg, memref);
-	emit_byte(emitptr, imm);
-}
-
-
-//-------------------------------------------------
-//  emit_op_modrm_reg_imm16 - emit an opcode with a
-//  register modrm byte and a 16-bit immediate
-//-------------------------------------------------
-
-inline void emit_op_modrm_reg_imm16(x86code *&emitptr, uint32_t op, uint8_t opsize, uint8_t reg, uint8_t rm, uint16_t imm)
-{
-	emit_op_modrm_reg(emitptr, op, opsize, reg, rm);
-	emit_word(emitptr, imm);
-}
-
-
-//-------------------------------------------------
-//  emit_op_modrm_mem_imm16 - emit an opcode with a
-//  memory modrm byte and a 16-bit immediate
-//-------------------------------------------------
-
-inline void emit_op_modrm_mem_imm16(x86code *&emitptr, uint32_t op, uint8_t opsize, uint8_t reg, x86_memref memref, uint16_t imm)
-{
-	emit_op_modrm_mem(emitptr, op, opsize, reg, memref);
-	emit_word(emitptr, imm);
-}
-
-
-//-------------------------------------------------
-//  emit_op_modrm_reg_imm816 - emit an opcode with
-//  a register modrm byte and an 8-bit or 16-bit
-//  immediate
-//-------------------------------------------------
-
-inline void emit_op_modrm_reg_imm816(x86code *&emitptr, uint32_t op8, uint32_t op16, uint8_t opsize, uint8_t reg, uint8_t rm, uint16_t imm)
-{
-	if ((int8_t)imm == (int16_t)imm)
-	{
-		emit_op_modrm_reg(emitptr, op8, opsize, reg, rm);
-		emit_byte(emitptr, imm);
-	}
-	else
-	{
-		emit_op_modrm_reg(emitptr, op16, opsize, reg, rm);
-		emit_word(emitptr, imm);
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_op_modrm_mem_imm816 - emit an opcode with
-//  a memory modrm byte and an 8-bit or 16-bit
-//  immediate
-//-------------------------------------------------
-
-inline void emit_op_modrm_mem_imm816(x86code *&emitptr, uint32_t op8, uint32_t op16, uint8_t opsize, uint8_t reg, x86_memref memref, uint16_t imm)
-{
-	if ((int8_t)imm == (int16_t)imm)
-	{
-		emit_op_modrm_mem(emitptr, op8, opsize, reg, memref);
-		emit_byte(emitptr, imm);
-	}
-	else
-	{
-		emit_op_modrm_mem(emitptr, op16, opsize, reg, memref);
-		emit_word(emitptr, imm);
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_op_modrm_reg_imm32 - emit an opcode with a
-//  register modrm byte and a 32-bit immediate
-//-------------------------------------------------
-
-inline void emit_op_modrm_reg_imm32(x86code *&emitptr, uint32_t op, uint8_t opsize, uint8_t reg, uint8_t rm, uint32_t imm)
-{
-	emit_op_modrm_reg(emitptr, op, opsize, reg, rm);
-	emit_dword(emitptr, imm);
-}
-
-
-//-------------------------------------------------
-//  emit_op_modrm_mem_imm32 - emit an opcode with a
-//  memory modrm byte and a 32-bit immediate
-//-------------------------------------------------
-
-inline void emit_op_modrm_mem_imm32(x86code *&emitptr, uint32_t op, uint8_t opsize, uint8_t reg, x86_memref memref, uint32_t imm)
-{
-	emit_op_modrm_mem(emitptr, op, opsize, reg, memref);
-	emit_dword(emitptr, imm);
-}
-
-
-//-------------------------------------------------
-//  emit_op_modrm_reg_imm832 - emit an opcode with
-//  a register modrm byte and an 8-bit or 32-bit
-//  immediate
-//-------------------------------------------------
-
-inline void emit_op_modrm_reg_imm832(x86code *&emitptr, uint32_t op8, uint32_t op32, uint8_t opsize, uint8_t reg, uint8_t rm, uint32_t imm)
-{
-	if ((int8_t)imm == (int32_t)imm)
-	{
-		emit_op_modrm_reg(emitptr, op8, opsize, reg, rm);
-		emit_byte(emitptr, imm);
-	}
-	else
-	{
-		emit_op_modrm_reg(emitptr, op32, opsize, reg, rm);
-		emit_dword(emitptr, imm);
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_op_modrm_mem_imm832 - emit an opcode with
-//  a memory modrm byte and an 8-bit or 32-bit
-//  immediate
-//-------------------------------------------------
-
-inline void emit_op_modrm_mem_imm832(x86code *&emitptr, uint32_t op8, uint32_t op32, uint8_t opsize, uint8_t reg, x86_memref memref, uint32_t imm)
-{
-	if ((int8_t)imm == (int32_t)imm)
-	{
-		emit_op_modrm_mem(emitptr, op8, opsize, reg, memref);
-		emit_byte(emitptr, imm);
-	}
-	else
-	{
-		emit_op_modrm_mem(emitptr, op32, opsize, reg, memref);
-		emit_dword(emitptr, imm);
-	}
-}
-
-
-
-//**************************************************************************
-//  SIMPLE OPCODE EMITTERS
-//**************************************************************************
-
-inline void emit_nop(x86code *&emitptr)    { emit_op_simple(emitptr, OP_NOP, OP_32BIT); }
-inline void emit_int_3(x86code *&emitptr)  { emit_op_simple(emitptr, OP_INT_3, OP_32BIT); }
-inline void emit_ret(x86code *&emitptr)    { emit_op_simple(emitptr, OP_RETN, OP_32BIT); }
-inline void emit_cdq(x86code *&emitptr)    { emit_op_simple(emitptr, OP_CDQ, OP_32BIT); }
-inline void emit_clc(x86code *&emitptr)    { emit_op_simple(emitptr, OP_CLC, OP_32BIT); }
-inline void emit_stc(x86code *&emitptr)    { emit_op_simple(emitptr, OP_STC, OP_32BIT); }
-inline void emit_cmc(x86code *&emitptr)    { emit_op_simple(emitptr, OP_CMC, OP_32BIT); }
-inline void emit_pushf(x86code *&emitptr)  { emit_op_simple(emitptr, OP_PUSHF_Fv, OP_32BIT); }
-inline void emit_popf(x86code *&emitptr)   { emit_op_simple(emitptr, OP_POPF_Fv, OP_32BIT); }
-inline void emit_cpuid(x86code *&emitptr)  { emit_op_simple(emitptr, OP_CPUID, OP_32BIT); }
-
-#if (X86EMIT_SIZE == 32)
-inline void emit_pushad(x86code *&emitptr) { emit_op_simple(emitptr, OP_PUSHA, OP_32BIT); }
-inline void emit_popad(x86code *&emitptr)  { emit_op_simple(emitptr, OP_POPA, OP_32BIT); }
-inline void emit_lahf(x86code *&emitptr)   { emit_op_simple(emitptr, OP_LAHF, OP_32BIT); }
-inline void emit_sahf(x86code *&emitptr)   { emit_op_simple(emitptr, OP_SAHF, OP_32BIT); }
-#endif
-
-#if (X86EMIT_SIZE == 64)
-inline void emit_cqo(x86code *&emitptr)    { emit_op_simple(emitptr, OP_CQO, OP_64BIT); }
-#endif
-
-
-
-//**************************************************************************
-//  CALL/JUMP EMITTERS
-//**************************************************************************
-
-//-------------------------------------------------
-//  resolve_link - resolve a link in a jump
-//  instruction
-//-------------------------------------------------
-
-inline void resolve_link(x86code *&destptr, const emit_link &linkinfo)
-{
-	int64_t delta = destptr - linkinfo.target;
-	if (linkinfo.size == 1)
-	{
-		assert((int8_t)delta == delta);
-		((int8_t *)linkinfo.target)[-1] = (int8_t)delta;
-	}
-	else if (linkinfo.size == 2)
-	{
-		assert((int16_t)delta == delta);
-		((int16_t *)linkinfo.target)[-1] = (int16_t)delta;
-	}
-	else
-	{
-		assert((int32_t)delta == delta);
-		((int32_t *)linkinfo.target)[-1] = (int32_t)delta;
-	}
-}
-
-
-//-------------------------------------------------
-//  emit_call_*
-//-------------------------------------------------
-
-inline void emit_call_link(x86code *&emitptr, emit_link &linkinfo)
-{
-	emit_op_simple(emitptr, OP_CALL_Jz, OP_32BIT);
-	emit_dword(emitptr, 0);
-	linkinfo.target = emitptr;
-	linkinfo.size = 4;
-}
-
-inline void emit_call(x86code *&emitptr, x86code *target)
-{
-	emit_link link;
-	emit_call_link(emitptr, link);
-	resolve_link(target, link);
-}
-
-
-//-------------------------------------------------
-//  emit_jmp_*
-//-------------------------------------------------
-
-inline void emit_jmp_short_link(x86code *&emitptr, emit_link &linkinfo)
-{
-	emit_op_simple(emitptr, OP_JMP_Jb, OP_32BIT);
-	emit_byte(emitptr, 0);
-	linkinfo.target = emitptr;
-	linkinfo.size = 1;
-}
-
-inline void emit_jmp_near_link(x86code *&emitptr, emit_link &linkinfo)
-{
-	emit_op_simple(emitptr, OP_JMP_Jz, OP_32BIT);
-	emit_dword(emitptr, 0);
-	linkinfo.target = emitptr;
-	linkinfo.size = 4;
-}
-
-inline void emit_jmp(x86code *&emitptr, x86code *target)
-{
-	int32_t delta = target - (emitptr + 2);
-	emit_link link;
-
-	if ((int8_t)delta == delta)
-		emit_jmp_short_link(emitptr, link);
-	else
-		emit_jmp_near_link(emitptr, link);
-	resolve_link(target, link);
-}
-
-
-//-------------------------------------------------
-//  emit_jcc_*
-//-------------------------------------------------
-
-inline void emit_jcc_short_link(x86code *&emitptr, uint8_t cond, emit_link &linkinfo)
-{
-	emit_op_simple(emitptr, OP_JCC_O_Jb + cond, OP_32BIT);
-	emit_byte(emitptr, 0);
-	linkinfo.target = emitptr;
-	linkinfo.size = 1;
-}
-
-inline void emit_jcc_near_link(x86code *&emitptr, uint8_t cond, emit_link &linkinfo)
-{
-	emit_op_simple(emitptr, OP_JCC_O_Jv + cond, OP_32BIT);
-	emit_dword(emitptr, 0);
-	linkinfo.target = emitptr;
-	linkinfo.size = 4;
-}
-
-inline void emit_jcc(x86code *&emitptr, uint8_t cond, x86code *target)
-{
-	int32_t delta = emitptr + 2 - target;
-	emit_link link;
-
-	if ((int8_t)delta == delta)
-		emit_jcc_short_link(emitptr, cond, link);
-	else
-		emit_jcc_near_link(emitptr, cond, link);
-	resolve_link(target, link);
-}
-
-
-//-------------------------------------------------
-//  emit_jecxz_*
-//-------------------------------------------------
-
-inline void emit_jecxz_link(x86code *&emitptr, emit_link &linkinfo)
-{
-	emit_op_simple(emitptr, OP_JrCXZ_Jb, OP_32BIT);
-	emit_byte(emitptr, 0);
-	linkinfo.target = emitptr;
-	linkinfo.size = 1;
-}
-
-inline void emit_jecxz(x86code *&emitptr, x86code *target)
-{
-	emit_link link;
-	emit_jecxz_link(emitptr, link);
-	resolve_link(target, link);
-}
-
-#if (X86EMIT_SIZE == 64)
-
-inline void emit_jrcxz_link(x86code *&emitptr, emit_link &linkinfo)
-{
-	emit_op_simple(emitptr, OP_JrCXZ_Jb, OP_64BIT);
-	emit_byte(emitptr, 0);
-	linkinfo.target = emitptr;
-	linkinfo.size = 1;
-}
-
-inline void emit_jrcxz(x86code *&emitptr, x86code *target)
-{
-	emit_link link;
-	emit_jrcxz_link(emitptr, link);
-	resolve_link(target, link);
-}
-
-#endif
-
-
-//-------------------------------------------------
-//  emit_call/jmp_*
-//-------------------------------------------------
-
-#if (X86EMIT_SIZE == 32)
-inline void emit_call_r32(x86code *&emitptr, uint8_t dreg)        { emit_op_modrm_reg(emitptr, OP_G5, OP_32BIT, 2, dreg); }
-inline void emit_call_m32(x86code *&emitptr, x86_memref memref) { emit_op_modrm_mem(emitptr, OP_G5, OP_32BIT, 2, memref); }
-inline void emit_jmp_r32(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G5, OP_32BIT, 4, dreg); }
-inline void emit_jmp_m32(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G5, OP_32BIT, 4, memref); }
-#else
-inline void emit_call_r64(x86code *&emitptr, uint8_t dreg)        { emit_op_modrm_reg(emitptr, OP_G5, OP_32BIT, 2, dreg); }
-inline void emit_call_m64(x86code *&emitptr, x86_memref memref) { emit_op_modrm_mem(emitptr, OP_G5, OP_32BIT, 2, memref); }
-inline void emit_jmp_r64(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G5, OP_32BIT, 4, dreg); }
-inline void emit_jmp_m64(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G5, OP_32BIT, 4, memref); }
-#endif
-
-
-//-------------------------------------------------
-//  emit_ret_*
-//-------------------------------------------------
-
-inline void emit_ret_imm(x86code *&emitptr, uint16_t imm)
-{
-	emit_op_simple(emitptr, OP_RETN_Iw, OP_32BIT);
-	emit_word(emitptr, imm);
-}
-
-
-
-//**************************************************************************
-//  PUSH/POP EMITTERS
-//**************************************************************************
-
-inline void emit_push_imm(x86code *&emitptr, int32_t imm)
-{
-	if ((int8_t)imm == imm)
-	{
-		emit_op_simple(emitptr, OP_PUSH_Ib, OP_32BIT);
-		emit_byte(emitptr, (int8_t)imm);
-	}
-	else
-	{
-		emit_op_simple(emitptr, OP_PUSH_Iz, OP_32BIT);
-		emit_dword(emitptr, imm);
-	}
-}
-
-#if (X86EMIT_SIZE == 32)
-
-inline void emit_push_r32(x86code *&emitptr, uint8_t reg)                         { emit_op_reg(emitptr, OP_PUSH_rAX + (reg & 7), OP_32BIT, reg); }
-inline void emit_push_m32(x86code *&emitptr, x86_memref memref)                 { emit_op_modrm_mem(emitptr, OP_G5, OP_32BIT, 6, memref); }
-inline void emit_pop_r32(x86code *&emitptr, uint8_t reg)                          { emit_op_reg(emitptr, OP_POP_rAX + (reg & 7), OP_32BIT, reg); }
-inline void emit_pop_m32(x86code *&emitptr, x86_memref memref)                  { emit_op_modrm_mem(emitptr, OP_G1A_Ev, OP_32BIT, 0, memref); }
-
-#else
-
-inline void emit_push_r64(x86code *&emitptr, uint8_t reg)                         { emit_op_reg(emitptr, OP_PUSH_rAX + (reg & 7), OP_32BIT, reg); }
-inline void emit_push_m64(x86code *&emitptr, x86_memref memref)                 { emit_op_modrm_mem(emitptr, OP_G5, OP_32BIT, 6, memref); }
-inline void emit_pop_r64(x86code *&emitptr, uint8_t reg)                          { emit_op_reg(emitptr, OP_POP_rAX + (reg & 7), OP_32BIT, reg); }
-inline void emit_pop_m64(x86code *&emitptr, x86_memref memref)                  { emit_op_modrm_mem(emitptr, OP_G1A_Ev, OP_32BIT, 0, memref); }
-
-#endif
-
-
-
-//**************************************************************************
-//  MOVE EMITTERS
-//**************************************************************************
-
-//-------------------------------------------------
-//  emit_mov_r8_*
-//-------------------------------------------------
-
-inline void emit_mov_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)
-{
-	emit_op_reg(emitptr, OP_MOV_AL_Ib | (dreg & 7), OP_32BIT, dreg);
-	emit_byte(emitptr, imm);
-}
-
-inline void emit_mov_r8_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_MOV_Gb_Eb, OP_32BIT, dreg, sreg); }
-inline void emit_mov_r8_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_MOV_Gb_Eb, OP_32BIT, dreg, memref); }
-inline void emit_mov_m8_r8(x86code *&emitptr, x86_memref memref, uint8_t sreg)    { emit_op_modrm_mem(emitptr, OP_MOV_Eb_Gb, OP_32BIT, sreg, memref); }
-inline void emit_mov_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_op_modrm_mem_imm8(emitptr, OP_G11_Eb_Ib, OP_32BIT, 0, memref, imm); }
-
-
-//-------------------------------------------------
-//  emit_xchg_r8_*
-//-------------------------------------------------
-
-inline void emit_xchg_r8_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)
-{
-	if (dreg == REG_EAX)
-		emit_op_reg(emitptr, OP_NOP | (sreg & 7), OP_32BIT, sreg);
-	else if (sreg == REG_EAX)
-		emit_op_reg(emitptr, OP_NOP | (dreg & 7), OP_32BIT, dreg);
-	else
-		emit_op_modrm_reg(emitptr, OP_XCHG_Eb_Gb, OP_32BIT, dreg, sreg);
-}
-
-
-//-------------------------------------------------
-//  emit_mov_r16_*
-//-------------------------------------------------
-
-inline void emit_mov_r16_imm(x86code *&emitptr, uint8_t dreg, uint16_t imm)
-{
-	emit_op_reg(emitptr, OP_MOV_rAX_Iv | (dreg & 7), OP_16BIT, dreg);
-	emit_word(emitptr, imm);
-}
-
-inline void emit_mov_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                         { emit_op_modrm_reg(emitptr, OP_MOV_Gv_Ev, OP_16BIT, dreg, sreg); }
-inline void emit_mov_r16_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)                  { emit_op_modrm_mem(emitptr, OP_MOV_Gv_Ev, OP_16BIT, dreg, memref); }
-inline void emit_mov_m16_imm(x86code *&emitptr, x86_memref memref, uint16_t imm)                  { emit_op_modrm_mem_imm16(emitptr, OP_G11_Ev_Iz, OP_16BIT, 0, memref, imm); }
-inline void emit_mov_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg)                  { emit_op_modrm_mem(emitptr, OP_MOV_Ev_Gv, OP_16BIT, sreg, memref); }
-inline void emit_movsx_r16_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                        { emit_op_modrm_reg(emitptr, OP_MOVSX_Gv_Eb, OP_16BIT, dreg, sreg); }
-inline void emit_movsx_r16_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)                 { emit_op_modrm_mem(emitptr, OP_MOVSX_Gv_Eb, OP_16BIT, dreg, memref); }
-inline void emit_movzx_r16_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                        { emit_op_modrm_reg(emitptr, OP_MOVZX_Gv_Eb, OP_16BIT, dreg, sreg); }
-inline void emit_movzx_r16_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)                 { emit_op_modrm_mem(emitptr, OP_MOVZX_Gv_Eb, OP_16BIT, dreg, memref); }
-inline void emit_cmovcc_r16_r16(x86code *&emitptr, uint8_t cond, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CMOV_O_Gv_Ev + cond, OP_16BIT, dreg, sreg); }
-inline void emit_cmovcc_r16_m16(x86code *&emitptr, uint8_t cond, uint8_t dreg, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_CMOV_O_Gv_Ev + cond, OP_16BIT, dreg, memref); }
-
-
-//-------------------------------------------------
-//  emit_xchg_r16_*
-//-------------------------------------------------
-
-inline void emit_xchg_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)
-{
-	if (dreg == REG_EAX)
-		emit_op_reg(emitptr, OP_NOP | (sreg & 7), OP_16BIT, sreg);
-	else if (sreg == REG_EAX)
-		emit_op_reg(emitptr, OP_NOP | (dreg & 7), OP_16BIT, dreg);
-	else
-		emit_op_modrm_reg(emitptr, OP_XCHG_Ev_Gv, OP_16BIT, dreg, sreg);
-}
-
-
-//-------------------------------------------------
-//  emit_mov_r32_*
-//-------------------------------------------------
-
-inline void emit_mov_r32_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)
-{
-	emit_op_reg(emitptr, OP_MOV_rAX_Iv | (dreg & 7), OP_32BIT, dreg);
-	emit_dword(emitptr, imm);
-}
-
-inline void emit_mov_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                         { emit_op_modrm_reg(emitptr, OP_MOV_Gv_Ev, OP_32BIT, dreg, sreg); }
-inline void emit_mov_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)                  { emit_op_modrm_mem(emitptr, OP_MOV_Gv_Ev, OP_32BIT, dreg, memref); }
-inline void emit_mov_m32_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)                  { emit_op_modrm_mem_imm32(emitptr, OP_G11_Ev_Iz, OP_32BIT, 0, memref, imm); }
-inline void emit_mov_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg)                  { emit_op_modrm_mem(emitptr, OP_MOV_Ev_Gv, OP_32BIT, sreg, memref); }
-inline void emit_movsx_r32_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                        { emit_op_modrm_reg(emitptr, OP_MOVSX_Gv_Eb, OP_32BIT, dreg, sreg); }
-inline void emit_movsx_r32_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)                 { emit_op_modrm_mem(emitptr, OP_MOVSX_Gv_Eb, OP_32BIT, dreg, memref); }
-inline void emit_movsx_r32_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                       { emit_op_modrm_reg(emitptr, OP_MOVSX_Gv_Ew, OP_32BIT, dreg, sreg); }
-inline void emit_movsx_r32_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)                { emit_op_modrm_mem(emitptr, OP_MOVSX_Gv_Ew, OP_32BIT, dreg, memref); }
-inline void emit_movzx_r32_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)
-{
-#if (X86EMIT_SIZE == 32)
-	if (sreg >= 4)
-	{
-		emit_op_modrm_reg(emitptr, OP_MOV_Gv_Ev, OP_32BIT, dreg, sreg);                         // mov dreg,sreg
-		emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 4, dreg, 0xff);   // and dreg,0xff
-	}
-	else
-#endif
-	emit_op_modrm_reg(emitptr, OP_MOVZX_Gv_Eb, OP_32BIT, dreg, sreg);
-}
-inline void emit_movzx_r32_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)                 { emit_op_modrm_mem(emitptr, OP_MOVZX_Gv_Eb, OP_32BIT, dreg, memref); }
-inline void emit_movzx_r32_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                       { emit_op_modrm_reg(emitptr, OP_MOVZX_Gv_Ew, OP_32BIT, dreg, sreg); }
-inline void emit_movzx_r32_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)                { emit_op_modrm_mem(emitptr, OP_MOVZX_Gv_Ew, OP_32BIT, dreg, memref); }
-inline void emit_cmovcc_r32_r32(x86code *&emitptr, uint8_t cond, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CMOV_O_Gv_Ev + cond, OP_32BIT, dreg, sreg); }
-inline void emit_cmovcc_r32_m32(x86code *&emitptr, uint8_t cond, uint8_t dreg, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_CMOV_O_Gv_Ev + cond, OP_32BIT, dreg, memref); }
-
-
-//-------------------------------------------------
-//  emit_xchg_r32_*
-//-------------------------------------------------
-
-inline void emit_xchg_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)
-{
-	if (dreg == REG_EAX)
-		emit_op_reg(emitptr, OP_NOP | (sreg & 7), OP_32BIT, sreg);
-	else if (sreg == REG_EAX)
-		emit_op_reg(emitptr, OP_NOP | (dreg & 7), OP_32BIT, dreg);
-	else
-		emit_op_modrm_reg(emitptr, OP_XCHG_Ev_Gv, OP_32BIT, dreg, sreg);
-}
-
-
-//-------------------------------------------------
-//  emit_mov_r64_*
-//-------------------------------------------------
-
-#if (X86EMIT_SIZE == 64)
-
-inline void emit_mov_r64_imm(x86code *&emitptr, uint8_t dreg, uint64_t imm)
-{
-	if ((uint32_t)imm == imm)
-	{
-		emit_op_reg(emitptr, OP_MOV_rAX_Iv | (dreg & 7), OP_32BIT, dreg);
-		emit_dword(emitptr, imm);
-	}
-	else if ((int32_t)imm == imm)
-		emit_op_modrm_reg_imm32(emitptr, OP_G11_Ev_Iz, OP_64BIT, 0, dreg, imm);
-	else
-	{
-		emit_op_reg(emitptr, OP_MOV_rAX_Iv | (dreg & 7), OP_64BIT, dreg);
-		emit_qword(emitptr, imm);
-	}
-}
-
-inline void emit_mov_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                         { emit_op_modrm_reg(emitptr, OP_MOV_Gv_Ev, OP_64BIT, dreg, sreg); }
-inline void emit_mov_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)                  { emit_op_modrm_mem(emitptr, OP_MOV_Gv_Ev, OP_64BIT, dreg, memref); }
-inline void emit_mov_m64_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)                  { emit_op_modrm_mem_imm32(emitptr, OP_G11_Ev_Iz, OP_64BIT, 0, memref, imm); }
-inline void emit_mov_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg)                  { emit_op_modrm_mem(emitptr, OP_MOV_Ev_Gv, OP_64BIT, sreg, memref); }
-inline void emit_movsx_r64_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                        { emit_op_modrm_reg(emitptr, OP_MOVSX_Gv_Eb, OP_64BIT, dreg, sreg); }
-inline void emit_movsx_r64_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)                 { emit_op_modrm_mem(emitptr, OP_MOVSX_Gv_Eb, OP_64BIT, dreg, memref); }
-inline void emit_movsx_r64_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                       { emit_op_modrm_reg(emitptr, OP_MOVSX_Gv_Ew, OP_64BIT, dreg, sreg); }
-inline void emit_movsx_r64_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)                { emit_op_modrm_mem(emitptr, OP_MOVSX_Gv_Ew, OP_64BIT, dreg, memref); }
-inline void emit_movsxd_r64_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                      { emit_op_modrm_reg(emitptr, OP_MOVSXD_Gv_Ev, OP_64BIT, dreg, sreg); }
-inline void emit_movsxd_r64_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_MOVSXD_Gv_Ev, OP_64BIT, dreg, memref); }
-inline void emit_movzx_r64_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                        { emit_op_modrm_reg(emitptr, OP_MOVZX_Gv_Eb, OP_64BIT, dreg, sreg); }
-inline void emit_movzx_r64_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)                 { emit_op_modrm_mem(emitptr, OP_MOVZX_Gv_Eb, OP_64BIT, dreg, memref); }
-inline void emit_movzx_r64_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                       { emit_op_modrm_reg(emitptr, OP_MOVZX_Gv_Ew, OP_64BIT, dreg, sreg); }
-inline void emit_movzx_r64_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)                { emit_op_modrm_mem(emitptr, OP_MOVZX_Gv_Ew, OP_64BIT, dreg, memref); }
-inline void emit_cmovcc_r64_r64(x86code *&emitptr, uint8_t cond, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CMOV_O_Gv_Ev + cond, OP_64BIT, dreg, sreg); }
-inline void emit_cmovcc_r64_m64(x86code *&emitptr, uint8_t cond, uint8_t dreg, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_CMOV_O_Gv_Ev + cond, OP_64BIT, dreg, memref); }
-
-
-//-------------------------------------------------
-//  emit_xchg_r64_*
-//-------------------------------------------------
-
-inline void emit_xchg_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)
-{
-	if (dreg == REG_EAX)
-		emit_op_reg(emitptr, OP_NOP | (sreg & 7), OP_64BIT, sreg);
-	else if (sreg == REG_EAX)
-		emit_op_reg(emitptr, OP_NOP | (dreg & 7), OP_64BIT, dreg);
-	else
-		emit_op_modrm_reg(emitptr, OP_XCHG_Ev_Gv, OP_64BIT, dreg, sreg);
-}
-
-#endif
-
-
-//**************************************************************************
-//  ARITHMETIC EMITTERS
-//**************************************************************************
-
-//-------------------------------------------------
-//  emit_arith_r8_*
-//-------------------------------------------------
-
-inline void emit_add_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_op_modrm_reg_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 0, dreg, imm); }
-inline void emit_add_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_op_modrm_mem_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 0, memref, imm); }
-inline void emit_add_r8_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_ADD_Gb_Eb, OP_32BIT, dreg, sreg); }
-inline void emit_add_r8_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ADD_Gb_Eb, OP_32BIT, dreg, memref); }
-inline void emit_add_m8_r8(x86code *&emitptr, x86_memref memref, uint8_t sreg)    { emit_op_modrm_mem(emitptr, OP_ADD_Eb_Gb, OP_32BIT, sreg, memref); }
-
-inline void emit_or_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)            { emit_op_modrm_reg_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 1, dreg, imm); }
-inline void emit_or_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)     { emit_op_modrm_mem_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 1, memref, imm); }
-inline void emit_or_r8_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)            { emit_op_modrm_reg(emitptr, OP_OR_Gb_Eb, OP_32BIT, dreg, sreg); }
-inline void emit_or_r8_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_OR_Gb_Eb, OP_32BIT, dreg, memref); }
-inline void emit_or_m8_r8(x86code *&emitptr, x86_memref memref, uint8_t sreg)     { emit_op_modrm_mem(emitptr, OP_OR_Eb_Gb, OP_32BIT, sreg, memref); }
-
-inline void emit_adc_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_op_modrm_reg_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 2, dreg, imm); }
-inline void emit_adc_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_op_modrm_mem_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 2, memref, imm); }
-inline void emit_adc_r8_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_ADC_Gb_Eb, OP_32BIT, dreg, sreg); }
-inline void emit_adc_r8_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ADC_Gb_Eb, OP_32BIT, dreg, memref); }
-inline void emit_adc_m8_r8(x86code *&emitptr, x86_memref memref, uint8_t sreg)    { emit_op_modrm_mem(emitptr, OP_ADC_Eb_Gb, OP_32BIT, sreg, memref); }
-
-inline void emit_sbb_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_op_modrm_reg_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 3, dreg, imm); }
-inline void emit_sbb_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_op_modrm_mem_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 3, memref, imm); }
-inline void emit_sbb_r8_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_SBB_Gb_Eb, OP_32BIT, dreg, sreg); }
-inline void emit_sbb_r8_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_SBB_Gb_Eb, OP_32BIT, dreg, memref); }
-inline void emit_sbb_m8_r8(x86code *&emitptr, x86_memref memref, uint8_t sreg)    { emit_op_modrm_mem(emitptr, OP_SBB_Eb_Gb, OP_32BIT, sreg, memref); }
-
-inline void emit_and_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_op_modrm_reg_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 4, dreg, imm); }
-inline void emit_and_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_op_modrm_mem_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 4, memref, imm); }
-inline void emit_and_r8_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_AND_Gb_Eb, OP_32BIT, dreg, sreg); }
-inline void emit_and_r8_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_AND_Gb_Eb, OP_32BIT, dreg, memref); }
-inline void emit_and_m8_r8(x86code *&emitptr, x86_memref memref, uint8_t sreg)    { emit_op_modrm_mem(emitptr, OP_AND_Eb_Gb, OP_32BIT, sreg, memref); }
-
-inline void emit_sub_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_op_modrm_reg_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 5, dreg, imm); }
-inline void emit_sub_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_op_modrm_mem_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 5, memref, imm); }
-inline void emit_sub_r8_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_SUB_Gb_Eb, OP_32BIT, dreg, sreg); }
-inline void emit_sub_r8_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_SUB_Gb_Eb, OP_32BIT, dreg, memref); }
-inline void emit_sub_m8_r8(x86code *&emitptr, x86_memref memref, uint8_t sreg)    { emit_op_modrm_mem(emitptr, OP_SUB_Eb_Gb, OP_32BIT, sreg, memref); }
-
-inline void emit_xor_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_op_modrm_reg_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 6, dreg, imm); }
-inline void emit_xor_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_op_modrm_mem_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 6, memref, imm); }
-inline void emit_xor_r8_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_XOR_Gb_Eb, OP_32BIT, dreg, sreg); }
-inline void emit_xor_r8_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_XOR_Gb_Eb, OP_32BIT, dreg, memref); }
-inline void emit_xor_m8_r8(x86code *&emitptr, x86_memref memref, uint8_t sreg)    { emit_op_modrm_mem(emitptr, OP_XOR_Eb_Gb, OP_32BIT, sreg, memref); }
-
-inline void emit_cmp_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_op_modrm_reg_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 7, dreg, imm); }
-inline void emit_cmp_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_op_modrm_mem_imm8(emitptr, OP_G1_Eb_Ib, OP_32BIT, 7, memref, imm); }
-inline void emit_cmp_r8_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_CMP_Gb_Eb, OP_32BIT, dreg, sreg); }
-inline void emit_cmp_r8_m8(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_CMP_Gb_Eb, OP_32BIT, dreg, memref); }
-inline void emit_cmp_m8_r8(x86code *&emitptr, x86_memref memref, uint8_t sreg)    { emit_op_modrm_mem(emitptr, OP_CMP_Eb_Gb, OP_32BIT, sreg, memref); }
-
-inline void emit_test_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_op_modrm_reg_imm8(emitptr, OP_G3_Eb, OP_32BIT, 0, dreg, imm); }
-inline void emit_test_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_op_modrm_mem_imm8(emitptr, OP_G3_Eb, OP_32BIT, 0, memref, imm); }
-inline void emit_test_r8_r8(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_TEST_Eb_Gb, OP_32BIT, sreg, dreg); }
-inline void emit_test_m8_r8(x86code *&emitptr, x86_memref memref, uint8_t sreg)   { emit_op_modrm_mem(emitptr, OP_TEST_Eb_Gb, OP_32BIT, sreg, memref); }
-
-
-//-------------------------------------------------
-//  emit_arith_r16_*
-//-------------------------------------------------
-
-inline void emit_add_r16_imm(x86code *&emitptr, uint8_t dreg, uint16_t imm)         { emit_op_modrm_reg_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 0, dreg, imm); }
-inline void emit_add_m16_imm(x86code *&emitptr, x86_memref memref, uint16_t imm)  { emit_op_modrm_mem_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 0, memref, imm); }
-inline void emit_add_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_ADD_Gv_Ev, OP_16BIT, dreg, sreg); }
-inline void emit_add_r16_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_ADD_Gv_Ev, OP_16BIT, dreg, memref); }
-inline void emit_add_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_ADD_Ev_Gv, OP_16BIT, sreg, memref); }
-
-inline void emit_or_r16_imm(x86code *&emitptr, uint8_t dreg, uint16_t imm)          { emit_op_modrm_reg_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 1, dreg, imm); }
-inline void emit_or_m16_imm(x86code *&emitptr, x86_memref memref, uint16_t imm)   { emit_op_modrm_mem_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 1, memref, imm); }
-inline void emit_or_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_OR_Gv_Ev, OP_16BIT, dreg, sreg); }
-inline void emit_or_r16_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_OR_Gv_Ev, OP_16BIT, dreg, memref); }
-inline void emit_or_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg)   { emit_op_modrm_mem(emitptr, OP_OR_Ev_Gv, OP_16BIT, sreg, memref); }
-
-inline void emit_adc_r16_imm(x86code *&emitptr, uint8_t dreg, uint16_t imm)         { emit_op_modrm_reg_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 2, dreg, imm); }
-inline void emit_adc_m16_imm(x86code *&emitptr, x86_memref memref, uint16_t imm)  { emit_op_modrm_mem_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 2, memref, imm); }
-inline void emit_adc_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_ADC_Gv_Ev, OP_16BIT, dreg, sreg); }
-inline void emit_adc_r16_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_ADC_Gv_Ev, OP_16BIT, dreg, memref); }
-inline void emit_adc_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_ADC_Ev_Gv, OP_16BIT, sreg, memref); }
-
-inline void emit_sbb_r16_imm(x86code *&emitptr, uint8_t dreg, uint16_t imm)         { emit_op_modrm_reg_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 3, dreg, imm); }
-inline void emit_sbb_m16_imm(x86code *&emitptr, x86_memref memref, uint16_t imm)  { emit_op_modrm_mem_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 3, memref, imm); }
-inline void emit_sbb_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_SBB_Gv_Ev, OP_16BIT, dreg, sreg); }
-inline void emit_sbb_r16_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_SBB_Gv_Ev, OP_16BIT, dreg, memref); }
-inline void emit_sbb_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_SBB_Ev_Gv, OP_16BIT, sreg, memref); }
-
-inline void emit_and_r16_imm(x86code *&emitptr, uint8_t dreg, uint16_t imm)         { emit_op_modrm_reg_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 4, dreg, imm); }
-inline void emit_and_m16_imm(x86code *&emitptr, x86_memref memref, uint16_t imm)  { emit_op_modrm_mem_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 4, memref, imm); }
-inline void emit_and_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_AND_Gv_Ev, OP_16BIT, dreg, sreg); }
-inline void emit_and_r16_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_AND_Gv_Ev, OP_16BIT, dreg, memref); }
-inline void emit_and_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_AND_Ev_Gv, OP_16BIT, sreg, memref); }
-
-inline void emit_sub_r16_imm(x86code *&emitptr, uint8_t dreg, uint16_t imm)         { emit_op_modrm_reg_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 5, dreg, imm); }
-inline void emit_sub_m16_imm(x86code *&emitptr, x86_memref memref, uint16_t imm)  { emit_op_modrm_mem_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 5, memref, imm); }
-inline void emit_sub_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_SUB_Gv_Ev, OP_16BIT, dreg, sreg); }
-inline void emit_sub_r16_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_SUB_Gv_Ev, OP_16BIT, dreg, memref); }
-inline void emit_sub_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_SUB_Ev_Gv, OP_16BIT, sreg, memref); }
-
-inline void emit_xor_r16_imm(x86code *&emitptr, uint8_t dreg, uint16_t imm)         { emit_op_modrm_reg_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 6, dreg, imm); }
-inline void emit_xor_m16_imm(x86code *&emitptr, x86_memref memref, uint16_t imm)  { emit_op_modrm_mem_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 6, memref, imm); }
-inline void emit_xor_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_XOR_Gv_Ev, OP_16BIT, dreg, sreg); }
-inline void emit_xor_r16_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_XOR_Gv_Ev, OP_16BIT, dreg, memref); }
-inline void emit_xor_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_XOR_Ev_Gv, OP_16BIT, sreg, memref); }
-
-inline void emit_cmp_r16_imm(x86code *&emitptr, uint8_t dreg, uint16_t imm)         { emit_op_modrm_reg_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 7, dreg, imm); }
-inline void emit_cmp_m16_imm(x86code *&emitptr, x86_memref memref, uint16_t imm)  { emit_op_modrm_mem_imm816(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_16BIT, 7, memref, imm); }
-inline void emit_cmp_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_CMP_Gv_Ev, OP_16BIT, dreg, sreg); }
-inline void emit_cmp_r16_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_CMP_Gv_Ev, OP_16BIT, dreg, memref); }
-inline void emit_cmp_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_CMP_Ev_Gv, OP_16BIT, sreg, memref); }
-
-inline void emit_test_r16_imm(x86code *&emitptr, uint8_t dreg, uint16_t imm)        { emit_op_modrm_reg_imm16(emitptr, OP_G3_Ev, OP_16BIT, 0, dreg, imm); }
-inline void emit_test_m16_imm(x86code *&emitptr, x86_memref memref, uint16_t imm) { emit_op_modrm_mem_imm16(emitptr, OP_G3_Ev, OP_16BIT, 0, memref, imm); }
-inline void emit_test_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)        { emit_op_modrm_reg(emitptr, OP_TEST_Ev_Gv, OP_16BIT, sreg, dreg); }
-inline void emit_test_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_TEST_Ev_Gv, OP_16BIT, sreg, memref); }
-
-
-//-------------------------------------------------
-//  emit_arith_r32_*
-//-------------------------------------------------
-
-inline void emit_add_r32_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 0, dreg, imm); }
-inline void emit_add_m32_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 0, memref, imm); }
-inline void emit_add_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_ADD_Gv_Ev, OP_32BIT, dreg, sreg); }
-inline void emit_add_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_ADD_Gv_Ev, OP_32BIT, dreg, memref); }
-inline void emit_add_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_ADD_Ev_Gv, OP_32BIT, sreg, memref); }
-
-inline void emit_or_r32_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)          { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 1, dreg, imm); }
-inline void emit_or_m32_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)   { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 1, memref, imm); }
-inline void emit_or_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_OR_Gv_Ev, OP_32BIT, dreg, sreg); }
-inline void emit_or_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_OR_Gv_Ev, OP_32BIT, dreg, memref); }
-inline void emit_or_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg)   { emit_op_modrm_mem(emitptr, OP_OR_Ev_Gv, OP_32BIT, sreg, memref); }
-
-inline void emit_adc_r32_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 2, dreg, imm); }
-inline void emit_adc_m32_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 2, memref, imm); }
-inline void emit_adc_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_ADC_Gv_Ev, OP_32BIT, dreg, sreg); }
-inline void emit_adc_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_ADC_Gv_Ev, OP_32BIT, dreg, memref); }
-inline void emit_adc_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_ADC_Ev_Gv, OP_32BIT, sreg, memref); }
-
-inline void emit_sbb_r32_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 3, dreg, imm); }
-inline void emit_sbb_m32_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 3, memref, imm); }
-inline void emit_sbb_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_SBB_Gv_Ev, OP_32BIT, dreg, sreg); }
-inline void emit_sbb_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_SBB_Gv_Ev, OP_32BIT, dreg, memref); }
-inline void emit_sbb_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_SBB_Ev_Gv, OP_32BIT, sreg, memref); }
-
-inline void emit_and_r32_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 4, dreg, imm); }
-inline void emit_and_m32_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 4, memref, imm); }
-inline void emit_and_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_AND_Gv_Ev, OP_32BIT, dreg, sreg); }
-inline void emit_and_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_AND_Gv_Ev, OP_32BIT, dreg, memref); }
-inline void emit_and_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_AND_Ev_Gv, OP_32BIT, sreg, memref); }
-
-inline void emit_sub_r32_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 5, dreg, imm); }
-inline void emit_sub_m32_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 5, memref, imm); }
-inline void emit_sub_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_SUB_Gv_Ev, OP_32BIT, dreg, sreg); }
-inline void emit_sub_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_SUB_Gv_Ev, OP_32BIT, dreg, memref); }
-inline void emit_sub_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_SUB_Ev_Gv, OP_32BIT, sreg, memref); }
-
-inline void emit_xor_r32_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 6, dreg, imm); }
-inline void emit_xor_m32_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 6, memref, imm); }
-inline void emit_xor_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_XOR_Gv_Ev, OP_32BIT, dreg, sreg); }
-inline void emit_xor_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_XOR_Gv_Ev, OP_32BIT, dreg, memref); }
-inline void emit_xor_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_XOR_Ev_Gv, OP_32BIT, sreg, memref); }
-
-inline void emit_cmp_r32_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 7, dreg, imm); }
-inline void emit_cmp_m32_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_32BIT, 7, memref, imm); }
-inline void emit_cmp_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_CMP_Gv_Ev, OP_32BIT, dreg, sreg); }
-inline void emit_cmp_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_CMP_Gv_Ev, OP_32BIT, dreg, memref); }
-inline void emit_cmp_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_CMP_Ev_Gv, OP_32BIT, sreg, memref); }
-
-inline void emit_test_r32_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)        { emit_op_modrm_reg_imm32(emitptr, OP_G3_Ev, OP_32BIT, 0, dreg, imm); }
-inline void emit_test_m32_imm(x86code *&emitptr, x86_memref memref, uint32_t imm) { emit_op_modrm_mem_imm32(emitptr, OP_G3_Ev, OP_32BIT, 0, memref, imm); }
-inline void emit_test_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)        { emit_op_modrm_reg(emitptr, OP_TEST_Ev_Gv, OP_32BIT, sreg, dreg); }
-inline void emit_test_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_TEST_Ev_Gv, OP_32BIT, sreg, memref); }
-
-
-//-------------------------------------------------
-//  emit_arith_r64_*
-//-------------------------------------------------
-
-#if (X86EMIT_SIZE == 64)
-
-inline void emit_add_r64_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 0, dreg, imm); }
-inline void emit_add_m64_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 0, memref, imm); }
-inline void emit_add_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_ADD_Gv_Ev, OP_64BIT, dreg, sreg); }
-inline void emit_add_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_ADD_Gv_Ev, OP_64BIT, dreg, memref); }
-inline void emit_add_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_ADD_Ev_Gv, OP_64BIT, sreg, memref); }
-
-inline void emit_or_r64_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)          { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 1, dreg, imm); }
-inline void emit_or_m64_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)   { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 1, memref, imm); }
-inline void emit_or_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_OR_Gv_Ev, OP_64BIT, dreg, sreg); }
-inline void emit_or_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_OR_Gv_Ev, OP_64BIT, dreg, memref); }
-inline void emit_or_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg)   { emit_op_modrm_mem(emitptr, OP_OR_Ev_Gv, OP_64BIT, sreg, memref); }
-
-inline void emit_adc_r64_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 2, dreg, imm); }
-inline void emit_adc_m64_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 2, memref, imm); }
-inline void emit_adc_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_ADC_Gv_Ev, OP_64BIT, dreg, sreg); }
-inline void emit_adc_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_ADC_Gv_Ev, OP_64BIT, dreg, memref); }
-inline void emit_adc_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_ADC_Ev_Gv, OP_64BIT, sreg, memref); }
-
-inline void emit_sbb_r64_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 3, dreg, imm); }
-inline void emit_sbb_m64_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 3, memref, imm); }
-inline void emit_sbb_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_SBB_Gv_Ev, OP_64BIT, dreg, sreg); }
-inline void emit_sbb_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_SBB_Gv_Ev, OP_64BIT, dreg, memref); }
-inline void emit_sbb_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_SBB_Ev_Gv, OP_64BIT, sreg, memref); }
-
-inline void emit_and_r64_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 4, dreg, imm); }
-inline void emit_and_m64_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 4, memref, imm); }
-inline void emit_and_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_AND_Gv_Ev, OP_64BIT, dreg, sreg); }
-inline void emit_and_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_AND_Gv_Ev, OP_64BIT, dreg, memref); }
-inline void emit_and_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_AND_Ev_Gv, OP_64BIT, sreg, memref); }
-
-inline void emit_sub_r64_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 5, dreg, imm); }
-inline void emit_sub_m64_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 5, memref, imm); }
-inline void emit_sub_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_SUB_Gv_Ev, OP_64BIT, dreg, sreg); }
-inline void emit_sub_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_SUB_Gv_Ev, OP_64BIT, dreg, memref); }
-inline void emit_sub_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_SUB_Ev_Gv, OP_64BIT, sreg, memref); }
-
-inline void emit_xor_r64_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 6, dreg, imm); }
-inline void emit_xor_m64_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 6, memref, imm); }
-inline void emit_xor_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_XOR_Gv_Ev, OP_64BIT, dreg, sreg); }
-inline void emit_xor_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_XOR_Gv_Ev, OP_64BIT, dreg, memref); }
-inline void emit_xor_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_XOR_Ev_Gv, OP_64BIT, sreg, memref); }
-
-inline void emit_cmp_r64_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 7, dreg, imm); }
-inline void emit_cmp_m64_imm(x86code *&emitptr, x86_memref memref, uint32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_G1_Ev_Ib, OP_G1_Ev_Iz, OP_64BIT, 7, memref, imm); }
-inline void emit_cmp_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_CMP_Gv_Ev, OP_64BIT, dreg, sreg); }
-inline void emit_cmp_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_CMP_Gv_Ev, OP_64BIT, dreg, memref); }
-inline void emit_cmp_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_CMP_Ev_Gv, OP_64BIT, sreg, memref); }
-
-inline void emit_test_r64_imm(x86code *&emitptr, uint8_t dreg, uint32_t imm)        { emit_op_modrm_reg_imm32(emitptr, OP_G3_Ev, OP_64BIT, 0, dreg, imm); }
-inline void emit_test_m64_imm(x86code *&emitptr, x86_memref memref, uint32_t imm) { emit_op_modrm_mem_imm32(emitptr, OP_G3_Ev, OP_64BIT, 0, memref, imm); }
-inline void emit_test_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)        { emit_op_modrm_reg(emitptr, OP_TEST_Ev_Gv, OP_64BIT, sreg, dreg); }
-inline void emit_test_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_TEST_Ev_Gv, OP_64BIT, sreg, memref); }
-
-#endif
-
-
-
-//**************************************************************************
-//  SHIFT EMITTERS
-//**************************************************************************
-
-//-------------------------------------------------
-//  emit_shift_reg_imm
-//-------------------------------------------------
-
-inline void emit_shift_reg_imm(x86code *&emitptr, uint32_t op1, uint32_t opn, uint8_t opsize, uint8_t opindex, uint8_t dreg, uint8_t imm)
-{
-	if (imm == 1)
-		emit_op_modrm_reg(emitptr, op1, opsize, opindex, dreg);
-	else
-		emit_op_modrm_reg_imm8(emitptr, opn, opsize, opindex, dreg, imm);
-}
-
-inline void emit_shift_mem_imm(x86code *&emitptr, uint32_t op1, uint32_t opn, uint8_t opsize, uint8_t opindex, x86_memref memref, uint8_t imm)
-{
-	if (imm == 1)
-		emit_op_modrm_mem(emitptr, op1, opsize, opindex, memref);
-	else
-		emit_op_modrm_mem_imm8(emitptr, opn, opsize, opindex, memref, imm);
-}
-
-
-//-------------------------------------------------
-//  emit_shift_r8_*
-//-------------------------------------------------
-
-inline void emit_rol_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_shift_reg_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 0, dreg, imm); }
-inline void emit_rol_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_shift_mem_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 0, memref, imm); }
-inline void emit_rol_r8_cl(x86code *&emitptr, uint8_t dreg)                       { emit_op_modrm_reg(emitptr, OP_G2_Eb_CL, OP_32BIT, 0, dreg); }
-inline void emit_rol_m8_cl(x86code *&emitptr, x86_memref memref)                { emit_op_modrm_mem(emitptr, OP_G2_Eb_CL, OP_32BIT, 0, memref); }
-
-inline void emit_ror_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_shift_reg_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 1, dreg, imm); }
-inline void emit_ror_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_shift_mem_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 1, memref, imm); }
-inline void emit_ror_r8_cl(x86code *&emitptr, uint8_t dreg)                       { emit_op_modrm_reg(emitptr, OP_G2_Eb_CL, OP_32BIT, 1, dreg); }
-inline void emit_ror_m8_cl(x86code *&emitptr, x86_memref memref)                { emit_op_modrm_mem(emitptr, OP_G2_Eb_CL, OP_32BIT, 1, memref); }
-
-inline void emit_rcl_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_shift_reg_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 2, dreg, imm); }
-inline void emit_rcl_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_shift_mem_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 2, memref, imm); }
-inline void emit_rcl_r8_cl(x86code *&emitptr, uint8_t dreg)                       { emit_op_modrm_reg(emitptr, OP_G2_Eb_CL, OP_32BIT, 2, dreg); }
-inline void emit_rcl_m8_cl(x86code *&emitptr, x86_memref memref)                { emit_op_modrm_mem(emitptr, OP_G2_Eb_CL, OP_32BIT, 2, memref); }
-
-inline void emit_rcr_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_shift_reg_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 3, dreg, imm); }
-inline void emit_rcr_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_shift_mem_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 3, memref, imm); }
-inline void emit_rcr_r8_cl(x86code *&emitptr, uint8_t dreg)                       { emit_op_modrm_reg(emitptr, OP_G2_Eb_CL, OP_32BIT, 3, dreg); }
-inline void emit_rcr_m8_cl(x86code *&emitptr, x86_memref memref)                { emit_op_modrm_mem(emitptr, OP_G2_Eb_CL, OP_32BIT, 3, memref); }
-
-inline void emit_shl_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_shift_reg_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 4, dreg, imm); }
-inline void emit_shl_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_shift_mem_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 4, memref, imm); }
-inline void emit_shl_r8_cl(x86code *&emitptr, uint8_t dreg)                       { emit_op_modrm_reg(emitptr, OP_G2_Eb_CL, OP_32BIT, 4, dreg); }
-inline void emit_shl_m8_cl(x86code *&emitptr, x86_memref memref)                { emit_op_modrm_mem(emitptr, OP_G2_Eb_CL, OP_32BIT, 4, memref); }
-
-inline void emit_shr_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_shift_reg_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 5, dreg, imm); }
-inline void emit_shr_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_shift_mem_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 5, memref, imm); }
-inline void emit_shr_r8_cl(x86code *&emitptr, uint8_t dreg)                       { emit_op_modrm_reg(emitptr, OP_G2_Eb_CL, OP_32BIT, 5, dreg); }
-inline void emit_shr_m8_cl(x86code *&emitptr, x86_memref memref)                { emit_op_modrm_mem(emitptr, OP_G2_Eb_CL, OP_32BIT, 5, memref); }
-
-inline void emit_sar_r8_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)           { emit_shift_reg_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 7, dreg, imm); }
-inline void emit_sar_m8_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)    { emit_shift_mem_imm(emitptr, OP_G2_Eb_1, OP_G2_Eb_Ib, OP_32BIT, 7, memref, imm); }
-inline void emit_sar_r8_cl(x86code *&emitptr, uint8_t dreg)                       { emit_op_modrm_reg(emitptr, OP_G2_Eb_CL, OP_32BIT, 7, dreg); }
-inline void emit_sar_m8_cl(x86code *&emitptr, x86_memref memref)                { emit_op_modrm_mem(emitptr, OP_G2_Eb_CL, OP_32BIT, 7, memref); }
-
-
-//-------------------------------------------------
-//  emit_shift_r16_*
-//-------------------------------------------------
-
-inline void emit_rol_r16_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 0, dreg, imm); }
-inline void emit_rol_m16_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 0, memref, imm); }
-inline void emit_rol_r16_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_16BIT, 0, dreg); }
-inline void emit_rol_m16_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_16BIT, 0, memref); }
-
-inline void emit_ror_r16_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 1, dreg, imm); }
-inline void emit_ror_m16_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 1, memref, imm); }
-inline void emit_ror_r16_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_16BIT, 1, dreg); }
-inline void emit_ror_m16_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_16BIT, 1, memref); }
-
-inline void emit_rcl_r16_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 2, dreg, imm); }
-inline void emit_rcl_m16_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 2, memref, imm); }
-inline void emit_rcl_r16_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_16BIT, 2, dreg); }
-inline void emit_rcl_m16_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_16BIT, 2, memref); }
-
-inline void emit_rcr_r16_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 3, dreg, imm); }
-inline void emit_rcr_m16_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 3, memref, imm); }
-inline void emit_rcr_r16_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_16BIT, 3, dreg); }
-inline void emit_rcr_m16_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_16BIT, 3, memref); }
-
-inline void emit_shl_r16_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 4, dreg, imm); }
-inline void emit_shl_m16_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 4, memref, imm); }
-inline void emit_shl_r16_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_16BIT, 4, dreg); }
-inline void emit_shl_m16_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_16BIT, 4, memref); }
-
-inline void emit_shr_r16_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 5, dreg, imm); }
-inline void emit_shr_m16_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 5, memref, imm); }
-inline void emit_shr_r16_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_16BIT, 5, dreg); }
-inline void emit_shr_m16_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_16BIT, 5, memref); }
-
-inline void emit_sar_r16_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 7, dreg, imm); }
-inline void emit_sar_m16_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_16BIT, 7, memref, imm); }
-inline void emit_sar_r16_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_16BIT, 7, dreg); }
-inline void emit_sar_m16_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_16BIT, 7, memref); }
-
-
-//-------------------------------------------------
-//  emit_shift_r32_*
-//-------------------------------------------------
-
-inline void emit_rol_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 0, dreg, imm); }
-inline void emit_rol_m32_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 0, memref, imm); }
-inline void emit_rol_r32_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_32BIT, 0, dreg); }
-inline void emit_rol_m32_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_32BIT, 0, memref); }
-
-inline void emit_ror_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 1, dreg, imm); }
-inline void emit_ror_m32_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 1, memref, imm); }
-inline void emit_ror_r32_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_32BIT, 1, dreg); }
-inline void emit_ror_m32_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_32BIT, 1, memref); }
-
-inline void emit_rcl_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 2, dreg, imm); }
-inline void emit_rcl_m32_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 2, memref, imm); }
-inline void emit_rcl_r32_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_32BIT, 2, dreg); }
-inline void emit_rcl_m32_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_32BIT, 2, memref); }
-
-inline void emit_rcr_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 3, dreg, imm); }
-inline void emit_rcr_m32_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 3, memref, imm); }
-inline void emit_rcr_r32_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_32BIT, 3, dreg); }
-inline void emit_rcr_m32_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_32BIT, 3, memref); }
-
-inline void emit_shl_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 4, dreg, imm); }
-inline void emit_shl_m32_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 4, memref, imm); }
-inline void emit_shl_r32_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_32BIT, 4, dreg); }
-inline void emit_shl_m32_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_32BIT, 4, memref); }
-
-inline void emit_shr_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 5, dreg, imm); }
-inline void emit_shr_m32_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 5, memref, imm); }
-inline void emit_shr_r32_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_32BIT, 5, dreg); }
-inline void emit_shr_m32_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_32BIT, 5, memref); }
-
-inline void emit_sar_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 7, dreg, imm); }
-inline void emit_sar_m32_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_32BIT, 7, memref, imm); }
-inline void emit_sar_r32_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_32BIT, 7, dreg); }
-inline void emit_sar_m32_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_32BIT, 7, memref); }
-
-inline void emit_shld_r32_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t sreg, uint8_t imm)         { emit_op_modrm_reg_imm8(emitptr, OP_SHLD_Ev_Gv_Ib, OP_32BIT, sreg, dreg, imm); }
-inline void emit_shld_m32_r32_imm(x86code *&emitptr, x86_memref memref, uint8_t sreg, uint8_t imm)  { emit_op_modrm_mem_imm8(emitptr, OP_SHLD_Ev_Gv_Ib, OP_32BIT, sreg, memref, imm); }
-inline void emit_shld_r32_r32_cl(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                     { emit_op_modrm_reg(emitptr, OP_SHLD_Ev_Gv_CL, OP_32BIT, sreg, dreg); }
-inline void emit_shld_m32_r32_cl(x86code *&emitptr, x86_memref memref, uint8_t sreg)              { emit_op_modrm_mem(emitptr, OP_SHLD_Ev_Gv_CL, OP_32BIT, sreg, memref); }
-
-inline void emit_shrd_r32_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t sreg, uint8_t imm)         { emit_op_modrm_reg_imm8(emitptr, OP_SHRD_Ev_Gv_Ib, OP_32BIT, sreg, dreg, imm); }
-inline void emit_shrd_m32_r32_imm(x86code *&emitptr, x86_memref memref, uint8_t sreg, uint8_t imm)  { emit_op_modrm_mem_imm8(emitptr, OP_SHRD_Ev_Gv_Ib, OP_32BIT, sreg, memref, imm); }
-inline void emit_shrd_r32_r32_cl(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                     { emit_op_modrm_reg(emitptr, OP_SHRD_Ev_Gv_CL, OP_32BIT, sreg, dreg); }
-inline void emit_shrd_m32_r32_cl(x86code *&emitptr, x86_memref memref, uint8_t sreg)              { emit_op_modrm_mem(emitptr, OP_SHRD_Ev_Gv_CL, OP_32BIT, sreg, memref); }
-
-
-//-------------------------------------------------
-//  emit_shift_r64_*
-//-------------------------------------------------
-
-#if (X86EMIT_SIZE == 64)
-
-inline void emit_rol_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 0, dreg, imm); }
-inline void emit_rol_m64_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 0, memref, imm); }
-inline void emit_rol_r64_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_64BIT, 0, dreg); }
-inline void emit_rol_m64_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_64BIT, 0, memref); }
-
-inline void emit_ror_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 1, dreg, imm); }
-inline void emit_ror_m64_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 1, memref, imm); }
-inline void emit_ror_r64_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_64BIT, 1, dreg); }
-inline void emit_ror_m64_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_64BIT, 1, memref); }
-
-inline void emit_rcl_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 2, dreg, imm); }
-inline void emit_rcl_m64_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 2, memref, imm); }
-inline void emit_rcl_r64_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_64BIT, 2, dreg); }
-inline void emit_rcl_m64_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_64BIT, 2, memref); }
-
-inline void emit_rcr_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 3, dreg, imm); }
-inline void emit_rcr_m64_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 3, memref, imm); }
-inline void emit_rcr_r64_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_64BIT, 3, dreg); }
-inline void emit_rcr_m64_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_64BIT, 3, memref); }
-
-inline void emit_shl_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 4, dreg, imm); }
-inline void emit_shl_m64_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 4, memref, imm); }
-inline void emit_shl_r64_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_64BIT, 4, dreg); }
-inline void emit_shl_m64_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_64BIT, 4, memref); }
-
-inline void emit_shr_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 5, dreg, imm); }
-inline void emit_shr_m64_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 5, memref, imm); }
-inline void emit_shr_r64_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_64BIT, 5, dreg); }
-inline void emit_shr_m64_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_64BIT, 5, memref); }
-
-inline void emit_sar_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_shift_reg_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 7, dreg, imm); }
-inline void emit_sar_m64_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_shift_mem_imm(emitptr, OP_G2_Ev_1, OP_G2_Ev_Ib, OP_64BIT, 7, memref, imm); }
-inline void emit_sar_r64_cl(x86code *&emitptr, uint8_t dreg)                      { emit_op_modrm_reg(emitptr, OP_G2_Ev_CL, OP_64BIT, 7, dreg); }
-inline void emit_sar_m64_cl(x86code *&emitptr, x86_memref memref)               { emit_op_modrm_mem(emitptr, OP_G2_Ev_CL, OP_64BIT, 7, memref); }
-
-inline void emit_shld_r64_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t sreg, uint8_t imm)         { emit_op_modrm_reg_imm8(emitptr, OP_SHLD_Ev_Gv_Ib, OP_64BIT, sreg, dreg, imm); }
-inline void emit_shld_m64_r64_imm(x86code *&emitptr, x86_memref memref, uint8_t sreg, uint8_t imm)  { emit_op_modrm_mem_imm8(emitptr, OP_SHLD_Ev_Gv_Ib, OP_64BIT, sreg, memref, imm); }
-inline void emit_shld_r64_r64_cl(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                     { emit_op_modrm_reg(emitptr, OP_SHLD_Ev_Gv_CL, OP_64BIT, sreg, dreg); }
-inline void emit_shld_m64_r64_cl(x86code *&emitptr, x86_memref memref, uint8_t sreg)              { emit_op_modrm_mem(emitptr, OP_SHLD_Ev_Gv_CL, OP_64BIT, sreg, memref); }
-
-inline void emit_shrd_r64_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t sreg, uint8_t imm)         { emit_op_modrm_reg_imm8(emitptr, OP_SHRD_Ev_Gv_Ib, OP_64BIT, sreg, dreg, imm); }
-inline void emit_shrd_m64_r64_imm(x86code *&emitptr, x86_memref memref, uint8_t sreg, uint8_t imm)  { emit_op_modrm_mem_imm8(emitptr, OP_SHRD_Ev_Gv_Ib, OP_64BIT, sreg, memref, imm); }
-inline void emit_shrd_r64_r64_cl(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                     { emit_op_modrm_reg(emitptr, OP_SHRD_Ev_Gv_CL, OP_64BIT, sreg, dreg); }
-inline void emit_shrd_m64_r64_cl(x86code *&emitptr, x86_memref memref, uint8_t sreg)              { emit_op_modrm_mem(emitptr, OP_SHRD_Ev_Gv_CL, OP_64BIT, sreg, memref); }
-
-#endif
-
-
-
-//**************************************************************************
-//  GROUP3 EMITTERS
-//**************************************************************************
-
-//-------------------------------------------------
-//  emit_group3_r8_*
-//-------------------------------------------------
-
-inline void emit_not_r8(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_32BIT, 2, dreg); }
-inline void emit_not_m8(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_32BIT, 2, memref); }
-
-inline void emit_neg_r8(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_32BIT, 3, dreg); }
-inline void emit_neg_m8(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_32BIT, 3, memref); }
-
-inline void emit_mul_r8(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_32BIT, 4, dreg); }
-inline void emit_mul_m8(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_32BIT, 4, memref); }
-
-inline void emit_imul_r8(x86code *&emitptr, uint8_t dreg)        { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_32BIT, 5, dreg); }
-inline void emit_imul_m8(x86code *&emitptr, x86_memref memref) { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_32BIT, 5, memref); }
-
-inline void emit_div_r8(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_32BIT, 6, dreg); }
-inline void emit_div_m8(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_32BIT, 6, memref); }
-
-inline void emit_idiv_r8(x86code *&emitptr, uint8_t dreg)        { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_32BIT, 7, dreg); }
-inline void emit_idiv_m8(x86code *&emitptr, x86_memref memref) { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_32BIT, 7, memref); }
-
-
-//-------------------------------------------------
-//  emit_group3_r16_*
-//-------------------------------------------------
-
-inline void emit_not_r16(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_16BIT, 2, dreg); }
-inline void emit_not_m16(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_16BIT, 2, memref); }
-
-inline void emit_neg_r16(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_16BIT, 3, dreg); }
-inline void emit_neg_m16(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_16BIT, 3, memref); }
-
-inline void emit_mul_r16(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_16BIT, 4, dreg); }
-inline void emit_mul_m16(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_16BIT, 4, memref); }
-
-inline void emit_imul_r16(x86code *&emitptr, uint8_t dreg)        { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_16BIT, 5, dreg); }
-inline void emit_imul_m16(x86code *&emitptr, x86_memref memref) { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_16BIT, 5, memref); }
-
-inline void emit_div_r16(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_16BIT, 6, dreg); }
-inline void emit_div_m16(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_16BIT, 6, memref); }
-
-inline void emit_idiv_r16(x86code *&emitptr, uint8_t dreg)        { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_16BIT, 7, dreg); }
-inline void emit_idiv_m16(x86code *&emitptr, x86_memref memref) { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_16BIT, 7, memref); }
-
-
-//-------------------------------------------------
-//  emit_group3_r32_*
-//-------------------------------------------------
-
-inline void emit_not_r32(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_32BIT, 2, dreg); }
-inline void emit_not_m32(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_32BIT, 2, memref); }
-
-inline void emit_neg_r32(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_32BIT, 3, dreg); }
-inline void emit_neg_m32(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_32BIT, 3, memref); }
-
-inline void emit_mul_r32(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_32BIT, 4, dreg); }
-inline void emit_mul_m32(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_32BIT, 4, memref); }
-
-inline void emit_imul_r32(x86code *&emitptr, uint8_t dreg)        { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_32BIT, 5, dreg); }
-inline void emit_imul_m32(x86code *&emitptr, x86_memref memref) { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_32BIT, 5, memref); }
-
-inline void emit_div_r32(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_32BIT, 6, dreg); }
-inline void emit_div_m32(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_32BIT, 6, memref); }
-
-inline void emit_idiv_r32(x86code *&emitptr, uint8_t dreg)        { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_32BIT, 7, dreg); }
-inline void emit_idiv_m32(x86code *&emitptr, x86_memref memref) { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_32BIT, 7, memref); }
-
-
-//-------------------------------------------------
-//  emit_group3_r64_*
-//-------------------------------------------------
-
-#if (X86EMIT_SIZE == 64)
-
-inline void emit_not_r64(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_64BIT, 2, dreg); }
-inline void emit_not_m64(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_64BIT, 2, memref); }
-
-inline void emit_neg_r64(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_64BIT, 3, dreg); }
-inline void emit_neg_m64(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_64BIT, 3, memref); }
-
-inline void emit_mul_r64(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_64BIT, 4, dreg); }
-inline void emit_mul_m64(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_64BIT, 4, memref); }
-
-inline void emit_imul_r64(x86code *&emitptr, uint8_t dreg)        { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_64BIT, 5, dreg); }
-inline void emit_imul_m64(x86code *&emitptr, x86_memref memref) { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_64BIT, 5, memref); }
-
-inline void emit_div_r64(x86code *&emitptr, uint8_t dreg)         { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_64BIT, 6, dreg); }
-inline void emit_div_m64(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_64BIT, 6, memref); }
-
-inline void emit_idiv_r64(x86code *&emitptr, uint8_t dreg)        { emit_op_modrm_reg(emitptr, OP_G3_Ev, OP_64BIT, 7, dreg); }
-inline void emit_idiv_m64(x86code *&emitptr, x86_memref memref) { emit_op_modrm_mem(emitptr, OP_G3_Ev, OP_64BIT, 7, memref); }
-
-#endif
-
-
-
-//**************************************************************************
-//  IMUL EMITTERS
-//**************************************************************************
-
-//-------------------------------------------------
-//  emit_imul_r16_*
-//-------------------------------------------------
-
-inline void emit_imul_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                        { emit_op_modrm_reg(emitptr, OP_IMUL_Gv_Ev, OP_16BIT, dreg, sreg); }
-inline void emit_imul_r16_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)                 { emit_op_modrm_mem(emitptr, OP_IMUL_Gv_Ev, OP_16BIT, dreg, memref); }
-inline void emit_imul_r16_r16_imm(x86code *&emitptr, uint8_t dreg, uint8_t sreg, int16_t imm)         { emit_op_modrm_reg_imm816(emitptr, OP_IMUL_Gv_Ev_Ib, OP_IMUL_Gv_Ev_Iz, OP_16BIT, dreg, sreg, imm); }
-inline void emit_imul_r16_m16_imm(x86code *&emitptr, uint8_t dreg, x86_memref memref, int16_t imm)  { emit_op_modrm_mem_imm816(emitptr, OP_IMUL_Gv_Ev_Ib, OP_IMUL_Gv_Ev_Iz, OP_16BIT, dreg, memref, imm); }
-
-inline void emit_imul_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                        { emit_op_modrm_reg(emitptr, OP_IMUL_Gv_Ev, OP_32BIT, dreg, sreg); }
-inline void emit_imul_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)                 { emit_op_modrm_mem(emitptr, OP_IMUL_Gv_Ev, OP_32BIT, dreg, memref); }
-inline void emit_imul_r32_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t sreg, int32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_IMUL_Gv_Ev_Ib, OP_IMUL_Gv_Ev_Iz, OP_32BIT, dreg, sreg, imm); }
-inline void emit_imul_r32_m32_imm(x86code *&emitptr, uint8_t dreg, x86_memref memref, int32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_IMUL_Gv_Ev_Ib, OP_IMUL_Gv_Ev_Iz, OP_32BIT, dreg, memref, imm); }
-
-#if (X86EMIT_SIZE == 64)
-
-inline void emit_imul_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)                        { emit_op_modrm_reg(emitptr, OP_IMUL_Gv_Ev, OP_64BIT, dreg, sreg); }
-inline void emit_imul_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)                 { emit_op_modrm_mem(emitptr, OP_IMUL_Gv_Ev, OP_64BIT, dreg, memref); }
-inline void emit_imul_r64_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t sreg, int32_t imm)         { emit_op_modrm_reg_imm832(emitptr, OP_IMUL_Gv_Ev_Ib, OP_IMUL_Gv_Ev_Iz, OP_64BIT, dreg, sreg, imm); }
-inline void emit_imul_r64_m64_imm(x86code *&emitptr, uint8_t dreg, x86_memref memref, int32_t imm)  { emit_op_modrm_mem_imm832(emitptr, OP_IMUL_Gv_Ev_Ib, OP_IMUL_Gv_Ev_Iz, OP_64BIT, dreg, memref, imm); }
-
-#endif
-
-
-
-//**************************************************************************
-//  BIT OPERATION EMITTERS
-//**************************************************************************
-
-//-------------------------------------------------
-//  emit_bswap_*
-//-------------------------------------------------
-
-inline void emit_bswap_r32(x86code *&emitptr, uint8_t dreg)                       { emit_op_reg(emitptr, OP_BSWAP_EAX + (dreg & 7), OP_32BIT, dreg); }
-inline void emit_bswap_r64(x86code *&emitptr, uint8_t dreg)                       { emit_op_reg(emitptr, OP_BSWAP_EAX + (dreg & 7), OP_64BIT, dreg); }
-
-
-//-------------------------------------------------
-//  emit_bsr/bsf_r16_*
-//-------------------------------------------------
-
-inline void emit_bsf_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_BSF_Gv_Ev, OP_16BIT, dreg, sreg); }
-inline void emit_bsf_r16_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_BSF_Gv_Ev, OP_16BIT, dreg, memref); }
-inline void emit_bsr_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_BSR_Gv_Ev, OP_16BIT, dreg, sreg); }
-inline void emit_bsr_r16_m16(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_BSR_Gv_Ev, OP_16BIT, dreg, memref); }
-
-inline void emit_bsf_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_BSF_Gv_Ev, OP_32BIT, dreg, sreg); }
-inline void emit_bsf_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_BSF_Gv_Ev, OP_32BIT, dreg, memref); }
-inline void emit_bsr_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_BSR_Gv_Ev, OP_32BIT, dreg, sreg); }
-inline void emit_bsr_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_BSR_Gv_Ev, OP_32BIT, dreg, memref); }
-
-#if (X86EMIT_SIZE == 64)
-inline void emit_bsf_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_BSF_Gv_Ev, OP_64BIT, dreg, sreg); }
-inline void emit_bsf_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_BSF_Gv_Ev, OP_64BIT, dreg, memref); }
-inline void emit_bsr_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_BSR_Gv_Ev, OP_64BIT, dreg, sreg); }
-inline void emit_bsr_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_BSR_Gv_Ev, OP_64BIT, dreg, memref); }
-#endif
-
-
-//-------------------------------------------------
-//  emit_bit_r16_*
-//-------------------------------------------------
-
-inline void emit_bt_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_BT_Ev_Gv, OP_16BIT, sreg, dreg); }
-inline void emit_bt_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_BT_Ev_Gv, OP_16BIT, sreg, memref); }
-inline void emit_bt_r16_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_op_modrm_reg_imm8(emitptr, OP_G8_Ev_Ib, OP_16BIT, 4, dreg, imm); }
-inline void emit_bt_m16_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_op_modrm_mem_imm8(emitptr, OP_G8_Ev_Ib, OP_16BIT, 4, memref, imm); }
-
-inline void emit_bts_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)        { emit_op_modrm_reg(emitptr, OP_BTS_Ev_Gv, OP_16BIT, sreg, dreg); }
-inline void emit_bts_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_BTS_Ev_Gv, OP_16BIT, sreg, memref); }
-inline void emit_bts_r16_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)         { emit_op_modrm_reg_imm8(emitptr, OP_G8_Ev_Ib, OP_16BIT, 5, dreg, imm); }
-inline void emit_bts_m16_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)  { emit_op_modrm_mem_imm8(emitptr, OP_G8_Ev_Ib, OP_16BIT, 5, memref, imm); }
-
-inline void emit_btr_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)        { emit_op_modrm_reg(emitptr, OP_BTR_Ev_Gv, OP_16BIT, sreg, dreg); }
-inline void emit_btr_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_BTR_Ev_Gv, OP_16BIT, sreg, memref); }
-inline void emit_btr_r16_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)         { emit_op_modrm_reg_imm8(emitptr, OP_G8_Ev_Ib, OP_16BIT, 6, dreg, imm); }
-inline void emit_btr_m16_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)  { emit_op_modrm_mem_imm8(emitptr, OP_G8_Ev_Ib, OP_16BIT, 6, memref, imm); }
-
-inline void emit_btc_r16_r16(x86code *&emitptr, uint8_t dreg, uint8_t sreg)        { emit_op_modrm_reg(emitptr, OP_BTC_Ev_Gv, OP_16BIT, sreg, dreg); }
-inline void emit_btc_m16_r16(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_BTC_Ev_Gv, OP_16BIT, sreg, memref); }
-inline void emit_btc_r16_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)         { emit_op_modrm_reg_imm8(emitptr, OP_G8_Ev_Ib, OP_16BIT, 7, dreg, imm); }
-inline void emit_btc_m16_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)  { emit_op_modrm_mem_imm8(emitptr, OP_G8_Ev_Ib, OP_16BIT, 7, memref, imm); }
-
-
-//-------------------------------------------------
-//  emit_bit_r32_*
-//-------------------------------------------------
-
-inline void emit_bt_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_BT_Ev_Gv, OP_32BIT, sreg, dreg); }
-inline void emit_bt_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_BT_Ev_Gv, OP_32BIT, sreg, memref); }
-inline void emit_bt_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_op_modrm_reg_imm8(emitptr, OP_G8_Ev_Ib, OP_32BIT, 4, dreg, imm); }
-inline void emit_bt_m32_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_op_modrm_mem_imm8(emitptr, OP_G8_Ev_Ib, OP_32BIT, 4, memref, imm); }
-
-inline void emit_bts_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)        { emit_op_modrm_reg(emitptr, OP_BTS_Ev_Gv, OP_32BIT, sreg, dreg); }
-inline void emit_bts_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_BTS_Ev_Gv, OP_32BIT, sreg, memref); }
-inline void emit_bts_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)         { emit_op_modrm_reg_imm8(emitptr, OP_G8_Ev_Ib, OP_32BIT, 5, dreg, imm); }
-inline void emit_bts_m32_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)  { emit_op_modrm_mem_imm8(emitptr, OP_G8_Ev_Ib, OP_32BIT, 5, memref, imm); }
-
-inline void emit_btr_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)        { emit_op_modrm_reg(emitptr, OP_BTR_Ev_Gv, OP_32BIT, sreg, dreg); }
-inline void emit_btr_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_BTR_Ev_Gv, OP_32BIT, sreg, memref); }
-inline void emit_btr_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)         { emit_op_modrm_reg_imm8(emitptr, OP_G8_Ev_Ib, OP_32BIT, 6, dreg, imm); }
-inline void emit_btr_m32_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)  { emit_op_modrm_mem_imm8(emitptr, OP_G8_Ev_Ib, OP_32BIT, 6, memref, imm); }
-
-inline void emit_btc_r32_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)        { emit_op_modrm_reg(emitptr, OP_BTC_Ev_Gv, OP_32BIT, sreg, dreg); }
-inline void emit_btc_m32_r32(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_BTC_Ev_Gv, OP_32BIT, sreg, memref); }
-inline void emit_btc_r32_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)         { emit_op_modrm_reg_imm8(emitptr, OP_G8_Ev_Ib, OP_32BIT, 7, dreg, imm); }
-inline void emit_btc_m32_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)  { emit_op_modrm_mem_imm8(emitptr, OP_G8_Ev_Ib, OP_32BIT, 7, memref, imm); }
-
-
-//-------------------------------------------------
-//  emit_bit_r64_*
-//-------------------------------------------------
-
-#if (X86EMIT_SIZE == 64)
-
-inline void emit_bt_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_BT_Ev_Gv, OP_64BIT, sreg, dreg); }
-inline void emit_bt_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg)  { emit_op_modrm_mem(emitptr, OP_BT_Ev_Gv, OP_64BIT, sreg, memref); }
-inline void emit_bt_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)          { emit_op_modrm_reg_imm8(emitptr, OP_G8_Ev_Ib, OP_64BIT, 4, dreg, imm); }
-inline void emit_bt_m64_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)   { emit_op_modrm_mem_imm8(emitptr, OP_G8_Ev_Ib, OP_64BIT, 4, memref, imm); }
-
-inline void emit_bts_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)        { emit_op_modrm_reg(emitptr, OP_BTS_Ev_Gv, OP_64BIT, sreg, dreg); }
-inline void emit_bts_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_BTS_Ev_Gv, OP_64BIT, sreg, memref); }
-inline void emit_bts_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)         { emit_op_modrm_reg_imm8(emitptr, OP_G8_Ev_Ib, OP_64BIT, 5, dreg, imm); }
-inline void emit_bts_m64_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)  { emit_op_modrm_mem_imm8(emitptr, OP_G8_Ev_Ib, OP_64BIT, 5, memref, imm); }
-
-inline void emit_btr_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)        { emit_op_modrm_reg(emitptr, OP_BTR_Ev_Gv, OP_64BIT, sreg, dreg); }
-inline void emit_btr_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_BTR_Ev_Gv, OP_64BIT, sreg, memref); }
-inline void emit_btr_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)         { emit_op_modrm_reg_imm8(emitptr, OP_G8_Ev_Ib, OP_64BIT, 6, dreg, imm); }
-inline void emit_btr_m64_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)  { emit_op_modrm_mem_imm8(emitptr, OP_G8_Ev_Ib, OP_64BIT, 6, memref, imm); }
-
-inline void emit_btc_r64_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)        { emit_op_modrm_reg(emitptr, OP_BTC_Ev_Gv, OP_64BIT, sreg, dreg); }
-inline void emit_btc_m64_r64(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_BTC_Ev_Gv, OP_64BIT, sreg, memref); }
-inline void emit_btc_r64_imm(x86code *&emitptr, uint8_t dreg, uint8_t imm)         { emit_op_modrm_reg_imm8(emitptr, OP_G8_Ev_Ib, OP_64BIT, 7, dreg, imm); }
-inline void emit_btc_m64_imm(x86code *&emitptr, x86_memref memref, uint8_t imm)  { emit_op_modrm_mem_imm8(emitptr, OP_G8_Ev_Ib, OP_64BIT, 7, memref, imm); }
-
-#endif
-
-
-
-//**************************************************************************
-//  LEA EMITTERS
-//**************************************************************************
-
-inline void emit_lea_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_LEA_Gv_M, OP_32BIT, dreg, memref); }
-
-#if (X86EMIT_SIZE == 64)
-inline void emit_lea_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_LEA_Gv_M, OP_64BIT, dreg, memref); }
-#endif
-
-
-
-//**************************************************************************
-//  SET EMITTERS
-//**************************************************************************
-
-//-------------------------------------------------
-//  emit_setcc_*
-//-------------------------------------------------
-
-inline void emit_setcc_r8(x86code *&emitptr, uint8_t cond, uint8_t dreg)            { emit_op_modrm_reg(emitptr, OP_SETCC_O_Eb + cond, OP_32BIT, 0, dreg); }
-inline void emit_setcc_m8(x86code *&emitptr, uint8_t cond, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_SETCC_O_Eb + cond, OP_32BIT, 0, memref); }
-
-
-
-//**************************************************************************
-//  SIMPLE FPU EMITTERS
-//**************************************************************************
-
-#if (X86EMIT_SIZE == 32)
-
-inline void emit_fnop(x86code *&emitptr)     { emit_op_simple(emitptr, OP_FNOP, OP_32BIT); }
-inline void emit_fchs(x86code *&emitptr)     { emit_op_simple(emitptr, OP_FCHS, OP_32BIT); }
-inline void emit_fabs(x86code *&emitptr)     { emit_op_simple(emitptr, OP_FABS, OP_32BIT); }
-inline void emit_ftst(x86code *&emitptr)     { emit_op_simple(emitptr, OP_FTST, OP_32BIT); }
-inline void emit_fxam(x86code *&emitptr)     { emit_op_simple(emitptr, OP_FXAM, OP_32BIT); }
-inline void emit_fld1(x86code *&emitptr)     { emit_op_simple(emitptr, OP_FLD1, OP_32BIT); }
-inline void emit_fldl2t(x86code *&emitptr)   { emit_op_simple(emitptr, OP_FLDL2T, OP_32BIT); }
-inline void emit_fldl2e(x86code *&emitptr)   { emit_op_simple(emitptr, OP_FLDL2E, OP_32BIT); }
-inline void emit_fldpi(x86code *&emitptr)    { emit_op_simple(emitptr, OP_FLDPI, OP_32BIT); }
-inline void emit_fldlg2(x86code *&emitptr)   { emit_op_simple(emitptr, OP_FLDLG2, OP_32BIT); }
-inline void emit_fldln2(x86code *&emitptr)   { emit_op_simple(emitptr, OP_FLDLN2, OP_32BIT); }
-inline void emit_fldz(x86code *&emitptr)     { emit_op_simple(emitptr, OP_FLDZ, OP_32BIT); }
-inline void emit_f2xm1(x86code *&emitptr)    { emit_op_simple(emitptr, OP_F2XM1, OP_32BIT); }
-inline void emit_fyl2x(x86code *&emitptr)    { emit_op_simple(emitptr, OP_FYL2X, OP_32BIT); }
-inline void emit_fptan(x86code *&emitptr)    { emit_op_simple(emitptr, OP_FPTAN, OP_32BIT); }
-inline void emit_fpatan(x86code *&emitptr)   { emit_op_simple(emitptr, OP_FPATAN, OP_32BIT); }
-inline void emit_fxtract(x86code *&emitptr)  { emit_op_simple(emitptr, OP_FXTRACT, OP_32BIT); }
-inline void emit_fprem1(x86code *&emitptr)   { emit_op_simple(emitptr, OP_FPREM1, OP_32BIT); }
-inline void emit_fdecstp(x86code *&emitptr)  { emit_op_simple(emitptr, OP_FDECSTP, OP_32BIT); }
-inline void emit_fincstp(x86code *&emitptr)  { emit_op_simple(emitptr, OP_FINCSTP, OP_32BIT); }
-inline void emit_fprem(x86code *&emitptr)    { emit_op_simple(emitptr, OP_FPREM, OP_32BIT); }
-inline void emit_fyl2xp1(x86code *&emitptr)  { emit_op_simple(emitptr, OP_FYL2XP1, OP_32BIT); }
-inline void emit_fsqrt(x86code *&emitptr)    { emit_op_simple(emitptr, OP_FSQRT, OP_32BIT); }
-inline void emit_fsincos(x86code *&emitptr)  { emit_op_simple(emitptr, OP_FSINCOS, OP_32BIT); }
-inline void emit_frndint(x86code *&emitptr)  { emit_op_simple(emitptr, OP_FRNDINT, OP_32BIT); }
-inline void emit_fscale(x86code *&emitptr)   { emit_op_simple(emitptr, OP_FSCALE, OP_32BIT); }
-inline void emit_fsin(x86code *&emitptr)     { emit_op_simple(emitptr, OP_FSIN, OP_32BIT); }
-inline void emit_fcos(x86code *&emitptr)     { emit_op_simple(emitptr, OP_FCOS, OP_32BIT); }
-inline void emit_fucompp(x86code *&emitptr)  { emit_op_simple(emitptr, OP_FUCOMPP, OP_32BIT); }
-inline void emit_fclex(x86code *&emitptr)    { emit_op_simple(emitptr, OP_FCLEX, OP_32BIT); }
-inline void emit_finit(x86code *&emitptr)    { emit_op_simple(emitptr, OP_FINIT, OP_32BIT); }
-inline void emit_fcompp(x86code *&emitptr)   { emit_op_simple(emitptr, OP_FCOMPP, OP_32BIT); }
-inline void emit_fstsw_ax(x86code *&emitptr) { emit_op_simple(emitptr, OP_FSTSW_AX, OP_32BIT); }
-
-#endif
-
-
-
-//**************************************************************************
-//  REGISTER-BASED FPU EMITTERS
-//**************************************************************************
-
-#if (X86EMIT_SIZE == 32)
-
-inline void emit_ffree_stn(x86code *&emitptr, uint8_t reg)        { emit_op_simple(emitptr, OP_FFREE_STn + reg, OP_32BIT); }
-inline void emit_fst_stn(x86code *&emitptr, uint8_t reg)          { emit_op_simple(emitptr, OP_FST_STn + reg, OP_32BIT); }
-inline void emit_fstp_stn(x86code *&emitptr, uint8_t reg)         { emit_op_simple(emitptr, OP_FSTP_STn + reg, OP_32BIT); }
-inline void emit_fucomp_stn(x86code *&emitptr, uint8_t reg)       { emit_op_simple(emitptr, OP_FUCOMP_STn + reg, OP_32BIT); }
-
-inline void emit_fadd_st0_stn(x86code *&emitptr, uint8_t reg)     { emit_op_simple(emitptr, OP_FADD_ST0_STn + reg, OP_32BIT); }
-inline void emit_fmul_st0_stn(x86code *&emitptr, uint8_t reg)     { emit_op_simple(emitptr, OP_FMUL_ST0_STn + reg, OP_32BIT); }
-inline void emit_fcom_st0_stn(x86code *&emitptr, uint8_t reg)     { emit_op_simple(emitptr, OP_FCOM_ST0_STn + reg, OP_32BIT); }
-inline void emit_fcomp_st0_stn(x86code *&emitptr, uint8_t reg)    { emit_op_simple(emitptr, OP_FCOMP_ST0_STn + reg, OP_32BIT); }
-inline void emit_fsub_st0_stn(x86code *&emitptr, uint8_t reg)     { emit_op_simple(emitptr, OP_FSUB_ST0_STn + reg, OP_32BIT); }
-inline void emit_fsubr_st0_stn(x86code *&emitptr, uint8_t reg)    { emit_op_simple(emitptr, OP_FSUBR_ST0_STn + reg, OP_32BIT); }
-inline void emit_fdiv_st0_stn(x86code *&emitptr, uint8_t reg)     { emit_op_simple(emitptr, OP_FDIV_ST0_STn + reg, OP_32BIT); }
-inline void emit_fdivr_st0_stn(x86code *&emitptr, uint8_t reg)    { emit_op_simple(emitptr, OP_FDIVR_ST0_STn + reg, OP_32BIT); }
-inline void emit_fld_st0_stn(x86code *&emitptr, uint8_t reg)      { emit_op_simple(emitptr, OP_FLD_ST0_STn + reg, OP_32BIT); }
-inline void emit_fxch_st0_stn(x86code *&emitptr, uint8_t reg)     { emit_op_simple(emitptr, OP_FXCH_ST0_STn + reg, OP_32BIT); }
-inline void emit_fcmovb_st0_stn(x86code *&emitptr, uint8_t reg)   { emit_op_simple(emitptr, OP_FCMOVB_ST0_STn + reg, OP_32BIT); }
-inline void emit_fcmove_st0_stn(x86code *&emitptr, uint8_t reg)   { emit_op_simple(emitptr, OP_FCMOVE_ST0_STn + reg, OP_32BIT); }
-inline void emit_fcmovbe_st0_stn(x86code *&emitptr, uint8_t reg)  { emit_op_simple(emitptr, OP_FCMOVBE_ST0_STn + reg, OP_32BIT); }
-inline void emit_fcmovu_st0_stn(x86code *&emitptr, uint8_t reg)   { emit_op_simple(emitptr, OP_FCMOVU_ST0_STn + reg, OP_32BIT); }
-inline void emit_fcmovnb_st0_stn(x86code *&emitptr, uint8_t reg)  { emit_op_simple(emitptr, OP_FCMOVNB_ST0_STn + reg, OP_32BIT); }
-inline void emit_fcmovne_st0_stn(x86code *&emitptr, uint8_t reg)  { emit_op_simple(emitptr, OP_FCMOVNE_ST0_STn + reg, OP_32BIT); }
-inline void emit_fcmovnbe_st0_stn(x86code *&emitptr, uint8_t reg) { emit_op_simple(emitptr, OP_FCMOVNBE_ST0_STn + reg, OP_32BIT); }
-inline void emit_fcmovnu_st0_stn(x86code *&emitptr, uint8_t reg)  { emit_op_simple(emitptr, OP_FCMOVNU_ST0_STn + reg, OP_32BIT); }
-inline void emit_fucomi_st0_stn(x86code *&emitptr, uint8_t reg)   { emit_op_simple(emitptr, OP_FUCOMI_ST0_STn + reg, OP_32BIT); }
-inline void emit_fcomi_st0_stn(x86code *&emitptr, uint8_t reg)    { emit_op_simple(emitptr, OP_FCOMI_ST0_STn + reg, OP_32BIT); }
-inline void emit_fcomip_st0_stn(x86code *&emitptr, uint8_t reg)   { emit_op_simple(emitptr, OP_FCOMIP_ST0_STn + reg, OP_32BIT); }
-
-inline void emit_fadd_stn_st0(x86code *&emitptr, uint8_t reg)     { emit_op_simple(emitptr, OP_FADD_STn_ST0 + reg, OP_32BIT); }
-inline void emit_fmul_stn_st0(x86code *&emitptr, uint8_t reg)     { emit_op_simple(emitptr, OP_FMUL_STn_ST0 + reg, OP_32BIT); }
-inline void emit_fsubr_stn_st0(x86code *&emitptr, uint8_t reg)    { emit_op_simple(emitptr, OP_FSUBR_STn_ST0 + reg, OP_32BIT); }
-inline void emit_fsub_stn_st0(x86code *&emitptr, uint8_t reg)     { emit_op_simple(emitptr, OP_FSUB_STn_ST0 + reg, OP_32BIT); }
-inline void emit_fdivr_stn_st0(x86code *&emitptr, uint8_t reg)    { emit_op_simple(emitptr, OP_FDIVR_STn_ST0 + reg, OP_32BIT); }
-inline void emit_fdiv_stn_st0(x86code *&emitptr, uint8_t reg)     { emit_op_simple(emitptr, OP_FDIV_STn_ST0 + reg, OP_32BIT); }
-inline void emit_fucom_stn_st0(x86code *&emitptr, uint8_t reg)    { emit_op_simple(emitptr, OP_FUCOM_STn_ST0 + reg, OP_32BIT); }
-inline void emit_faddp_stn_st0(x86code *&emitptr, uint8_t reg)    { emit_op_simple(emitptr, OP_FADDP_STn_ST0 + reg, OP_32BIT); }
-inline void emit_fmulp_stn_st0(x86code *&emitptr, uint8_t reg)    { emit_op_simple(emitptr, OP_FMULP_STn_ST0 + reg, OP_32BIT); }
-inline void emit_fsubrp_stn_st0(x86code *&emitptr, uint8_t reg)   { emit_op_simple(emitptr, OP_FSUBRP_STn_ST0 + reg, OP_32BIT); }
-inline void emit_fsubp_stn_st0(x86code *&emitptr, uint8_t reg)    { emit_op_simple(emitptr, OP_FSUBP_STn_ST0 + reg, OP_32BIT); }
-inline void emit_fdivrp_stn_st0(x86code *&emitptr, uint8_t reg)   { emit_op_simple(emitptr, OP_FDIVRP_STn_ST0 + reg, OP_32BIT); }
-inline void emit_fdivp_stn_st0(x86code *&emitptr, uint8_t reg)    { emit_op_simple(emitptr, OP_FDIVP_STn_ST0 + reg, OP_32BIT); }
-
-inline void emit_faddp(x86code *&emitptr)                       { emit_faddp_stn_st0(emitptr, 1); }
-inline void emit_fmulp(x86code *&emitptr)                       { emit_fmulp_stn_st0(emitptr, 1); }
-inline void emit_fsubrp(x86code *&emitptr)                      { emit_fsubrp_stn_st0(emitptr, 1); }
-inline void emit_fsubp(x86code *&emitptr)                       { emit_fsubp_stn_st0(emitptr, 1); }
-inline void emit_fdivrp(x86code *&emitptr)                      { emit_fdivrp_stn_st0(emitptr, 1); }
-inline void emit_fdivp(x86code *&emitptr)                       { emit_fdivp_stn_st0(emitptr, 1); }
-
-#endif
-
-
-
-//**************************************************************************
-//  MEMORY FPU EMITTERS
-//**************************************************************************
-
-#if (X86EMIT_SIZE == 32)
-
-inline void emit_fadd_m32(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_D8, OP_32BIT, 0, memref); }
-inline void emit_fmul_m32(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_D8, OP_32BIT, 1, memref); }
-inline void emit_fcom_m32(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_D8, OP_32BIT, 2, memref); }
-inline void emit_fcomp_m32(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_D8, OP_32BIT, 3, memref); }
-inline void emit_fsub_m32(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_D8, OP_32BIT, 4, memref); }
-inline void emit_fsubr_m32(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_D8, OP_32BIT, 5, memref); }
-inline void emit_fdiv_m32(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_D8, OP_32BIT, 6, memref); }
-inline void emit_fdivr_m32(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_D8, OP_32BIT, 7, memref); }
-
-inline void emit_fld_m32(x86code *&emitptr, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_ESC_D9, OP_32BIT, 0, memref); }
-inline void emit_fst_m32(x86code *&emitptr, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_ESC_D9, OP_32BIT, 2, memref); }
-inline void emit_fstp_m32(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_D9, OP_32BIT, 3, memref); }
-inline void emit_fldenv_m(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_D9, OP_32BIT, 4, memref); }
-inline void emit_fldcw_m16(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_D9, OP_32BIT, 5, memref); }
-inline void emit_fstenv_m(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_D9, OP_32BIT, 6, memref); }
-inline void emit_fstcw_m16(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_D9, OP_32BIT, 7, memref); }
-
-inline void emit_fiadd_m32(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DA, OP_32BIT, 0, memref); }
-inline void emit_fimul_m32(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DA, OP_32BIT, 1, memref); }
-inline void emit_ficom_m32(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DA, OP_32BIT, 2, memref); }
-inline void emit_ficomp_m32(x86code *&emitptr, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_ESC_DA, OP_32BIT, 3, memref); }
-inline void emit_fisub_m32(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DA, OP_32BIT, 4, memref); }
-inline void emit_fisubr_m32(x86code *&emitptr, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_ESC_DA, OP_32BIT, 5, memref); }
-inline void emit_fidiv_m32(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DA, OP_32BIT, 6, memref); }
-inline void emit_fidivr_m32(x86code *&emitptr, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_ESC_DA, OP_32BIT, 7, memref); }
-
-inline void emit_fild_m32(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DB, OP_32BIT, 0, memref); }
-inline void emit_fisttp_m32(x86code *&emitptr, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_ESC_DB, OP_32BIT, 1, memref); }
-inline void emit_fist_m32(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DB, OP_32BIT, 2, memref); }
-inline void emit_fistp_m32(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DB, OP_32BIT, 3, memref); }
-inline void emit_fld_m80(x86code *&emitptr, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_ESC_DB, OP_32BIT, 5, memref); }
-inline void emit_fstp_m80(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DB, OP_32BIT, 7, memref); }
-
-inline void emit_fadd_m64(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DC, OP_32BIT, 0, memref); }
-inline void emit_fmul_m64(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DC, OP_32BIT, 1, memref); }
-inline void emit_fcom_m64(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DC, OP_32BIT, 2, memref); }
-inline void emit_fcomp_m64(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DC, OP_32BIT, 3, memref); }
-inline void emit_fsub_m64(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DC, OP_32BIT, 4, memref); }
-inline void emit_fsubr_m64(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DC, OP_32BIT, 5, memref); }
-inline void emit_fdiv_m64(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DC, OP_32BIT, 6, memref); }
-inline void emit_fdivr_m64(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DC, OP_32BIT, 7, memref); }
-
-inline void emit_fld_m64(x86code *&emitptr, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_ESC_DD, OP_32BIT, 0, memref); }
-inline void emit_fisttp_m64(x86code *&emitptr, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_ESC_DD, OP_32BIT, 1, memref); }
-inline void emit_fst_m64(x86code *&emitptr, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_ESC_DD, OP_32BIT, 2, memref); }
-inline void emit_fstp_m64(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DD, OP_32BIT, 3, memref); }
-inline void emit_frstor_m(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DD, OP_32BIT, 4, memref); }
-inline void emit_fsave_m(x86code *&emitptr, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_ESC_DD, OP_32BIT, 6, memref); }
-inline void emit_fstsw_m16(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DD, OP_32BIT, 7, memref); }
-
-inline void emit_fiadd_m16(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DE, OP_32BIT, 0, memref); }
-inline void emit_fimul_m16(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DE, OP_32BIT, 1, memref); }
-inline void emit_ficom_m16(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DE, OP_32BIT, 2, memref); }
-inline void emit_ficomp_m16(x86code *&emitptr, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_ESC_DE, OP_32BIT, 3, memref); }
-inline void emit_fisub_m16(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DE, OP_32BIT, 4, memref); }
-inline void emit_fisubr_m16(x86code *&emitptr, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_ESC_DE, OP_32BIT, 5, memref); }
-inline void emit_fidiv_m16(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DE, OP_32BIT, 6, memref); }
-inline void emit_fidivr_m16(x86code *&emitptr, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_ESC_DE, OP_32BIT, 7, memref); }
-
-inline void emit_fild_m16(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DF, OP_32BIT, 0, memref); }
-inline void emit_fisttp_m16(x86code *&emitptr, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_ESC_DF, OP_32BIT, 1, memref); }
-inline void emit_fist_m16(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DF, OP_32BIT, 2, memref); }
-inline void emit_fistp_m16(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DF, OP_32BIT, 3, memref); }
-inline void emit_fbld_m80(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DF, OP_32BIT, 4, memref); }
-inline void emit_fild_m64(x86code *&emitptr, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ESC_DF, OP_32BIT, 5, memref); }
-inline void emit_fbstp_m80(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DF, OP_32BIT, 6, memref); }
-inline void emit_fistp_m64(x86code *&emitptr, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_ESC_DF, OP_32BIT, 7, memref); }
-
-#endif
-
-
-
-//**************************************************************************
-//  GROUP16 EMITTERS
-//**************************************************************************
-
-inline void emit_ldmxcsr_m32(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G16, OP_32BIT, 2, memref); }
-inline void emit_stmxcsr_m32(x86code *&emitptr, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_G16, OP_32BIT, 3, memref); }
-
-
-
-//**************************************************************************
-//  MISC SSE EMITTERS
-//**************************************************************************
-
-inline void emit_movd_r128_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)               { emit_op_modrm_reg(emitptr, OP_MOVD_Vd_Ed, OP_32BIT, dreg, sreg); }
-inline void emit_movd_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)        { emit_op_modrm_mem(emitptr, OP_MOVD_Vd_Ed, OP_32BIT, dreg, memref); }
-inline void emit_movd_r32_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)               { emit_op_modrm_reg(emitptr, OP_MOVD_Ed_Vd, OP_32BIT, sreg, dreg); }
-inline void emit_movd_m32_r128(x86code *&emitptr, x86_memref memref, uint8_t sreg)        { emit_op_modrm_mem(emitptr, OP_MOVD_Ed_Vd, OP_32BIT, sreg, memref); }
-
-#if (X86EMIT_SIZE == 64)
-
-inline void emit_movq_r128_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)               { emit_op_modrm_reg(emitptr, OP_MOVD_Vd_Ed, OP_64BIT, dreg, sreg); }
-inline void emit_movq_r128_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)        { emit_op_modrm_mem(emitptr, OP_MOVD_Vd_Ed, OP_64BIT, dreg, memref); }
-inline void emit_movq_r64_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)               { emit_op_modrm_reg(emitptr, OP_MOVD_Ed_Vd, OP_64BIT, sreg, dreg); }
-inline void emit_movq_m64_r128(x86code *&emitptr, x86_memref memref, uint8_t sreg)        { emit_op_modrm_mem(emitptr, OP_MOVD_Ed_Vd, OP_64BIT, sreg, memref); }
-
-#endif
-
-inline void emit_movdqa_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref) { emit_op_modrm_mem(emitptr, OP_MOVDQA_Vdq_Wdq, OP_32BIT, dreg, memref); }
-inline void emit_movdqa_m128_r128(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_MOVDQA_Wdq_Vdq, OP_32BIT, sreg, memref); }
-inline void emit_movdqu_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref) { emit_op_modrm_mem(emitptr, OP_MOVDQU_Vdq_Wdq, OP_32BIT, dreg, memref); }
-inline void emit_movdqu_m128_r128(x86code *&emitptr, x86_memref memref, uint8_t sreg) { emit_op_modrm_mem(emitptr, OP_MOVDQU_Wdq_Vdq, OP_32BIT, sreg, memref); }
-
-
-//**************************************************************************
-//  SSE SCALAR SINGLE EMITTERS
-//**************************************************************************
-
-inline void emit_movss_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_MOVSS_Vss_Wss, OP_32BIT, dreg, sreg); }
-inline void emit_movss_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)       { emit_op_modrm_mem(emitptr, OP_MOVSS_Vss_Wss, OP_32BIT, dreg, memref); }
-inline void emit_movss_m32_r128(x86code *&emitptr, x86_memref memref, uint8_t sreg)       { emit_op_modrm_mem(emitptr, OP_MOVSS_Wss_Vss, OP_32BIT, sreg, memref); }
-
-inline void emit_addss_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_ADDSS_Vss_Wss, OP_32BIT, dreg, sreg); }
-inline void emit_addss_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)       { emit_op_modrm_mem(emitptr, OP_ADDSS_Vss_Wss, OP_32BIT, dreg, memref); }
-
-inline void emit_subss_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_SUBSS_Vss_Wss, OP_32BIT, dreg, sreg); }
-inline void emit_subss_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)       { emit_op_modrm_mem(emitptr, OP_SUBSS_Vss_Wss, OP_32BIT, dreg, memref); }
-
-inline void emit_mulss_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_MULSS_Vss_Wss, OP_32BIT, dreg, sreg); }
-inline void emit_mulss_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)       { emit_op_modrm_mem(emitptr, OP_MULSS_Vss_Wss, OP_32BIT, dreg, memref); }
-
-inline void emit_divss_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_DIVSS_Vss_Wss, OP_32BIT, dreg, sreg); }
-inline void emit_divss_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)       { emit_op_modrm_mem(emitptr, OP_DIVSS_Vss_Wss, OP_32BIT, dreg, memref); }
-
-inline void emit_rcpss_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_RCPSS_Vss_Wss, OP_32BIT, dreg, sreg); }
-inline void emit_rcpss_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)       { emit_op_modrm_mem(emitptr, OP_RCPSS_Vss_Wss, OP_32BIT, dreg, memref); }
-
-inline void emit_sqrtss_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)            { emit_op_modrm_reg(emitptr, OP_SQRTSS_Vss_Wss, OP_32BIT, dreg, sreg); }
-inline void emit_sqrtss_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_SQRTSS_Vss_Wss, OP_32BIT, dreg, memref); }
-
-inline void emit_rsqrtss_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_RSQRTSS_Vss_Wss, OP_32BIT, dreg, sreg); }
-inline void emit_rsqrtss_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_RSQRTSS_Vss_Wss, OP_32BIT, dreg, memref); }
-
-inline void emit_comiss_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)            { emit_op_modrm_reg(emitptr, OP_COMISS_Vss_Wss, OP_32BIT, dreg, sreg); }
-inline void emit_comiss_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_COMISS_Vss_Wss, OP_32BIT, dreg, memref); }
-
-inline void emit_ucomiss_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_UCOMISS_Vss_Wss, OP_32BIT, dreg, sreg); }
-inline void emit_ucomiss_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_UCOMISS_Vss_Wss, OP_32BIT, dreg, memref); }
-
-inline void emit_cvtsi2ss_r128_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_CVTSI2SS_Vss_Ed, OP_32BIT, dreg, sreg); }
-inline void emit_cvtsi2ss_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_CVTSI2SS_Vss_Ed, OP_32BIT, dreg, memref); }
-
-#if (X86EMIT_SIZE == 64)
-inline void emit_cvtsi2ss_r128_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_CVTSI2SS_Vss_Ed, OP_64BIT, dreg, sreg); }
-inline void emit_cvtsi2ss_r128_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_CVTSI2SS_Vss_Ed, OP_64BIT, dreg, memref); }
-#endif
-
-inline void emit_cvtsd2ss_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CVTSD2SS_Vss_Wsd, OP_32BIT, dreg, sreg); }
-inline void emit_cvtsd2ss_r128_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_CVTSD2SS_Vss_Wsd, OP_32BIT, dreg, memref); }
-
-inline void emit_cvtss2si_r32_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_CVTSS2SI_Gd_Wss, OP_32BIT, dreg, sreg); }
-inline void emit_cvtss2si_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_CVTSS2SI_Gd_Wss, OP_32BIT, dreg, memref); }
-
-#if (X86EMIT_SIZE == 64)
-inline void emit_cvtss2si_r64_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_CVTSS2SI_Gd_Wss, OP_64BIT, dreg, sreg); }
-inline void emit_cvtss2si_r64_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_CVTSS2SI_Gd_Wss, OP_64BIT, dreg, memref); }
-#endif
-
-inline void emit_cvttss2si_r32_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CVTTSS2SI_Gd_Wss, OP_32BIT, dreg, sreg); }
-inline void emit_cvttss2si_r32_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_CVTTSS2SI_Gd_Wss, OP_32BIT, dreg, memref); }
-
-#if (X86EMIT_SIZE == 64)
-inline void emit_cvttss2si_r64_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CVTTSS2SI_Gd_Wss, OP_64BIT, dreg, sreg); }
-inline void emit_cvttss2si_r64_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_CVTTSS2SI_Gd_Wss, OP_64BIT, dreg, memref); }
-#endif
-
-inline void emit_roundss_r128_r128_imm(x86code *&emitptr, uint8_t dreg, uint8_t sreg, uint8_t imm)        { emit_op_modrm_reg(emitptr, OP_ROUNDSS_Vss_Wss_Ib, OP_32BIT, dreg, sreg); emit_byte(emitptr, imm); }
-inline void emit_roundss_r128_m32_imm(x86code *&emitptr, uint8_t dreg, x86_memref memref, uint8_t imm)  { emit_op_modrm_mem(emitptr, OP_ROUNDSS_Vss_Wss_Ib, OP_32BIT, dreg, memref); emit_byte(emitptr, imm); }
-
-
-
-//**************************************************************************
-//  SSE PACKED SINGLE EMITTERS
-//**************************************************************************
-
-inline void emit_movps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_MOVAPS_Vps_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_movps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_MOVAPS_Vps_Wps, OP_32BIT, dreg, memref); }
-inline void emit_movps_m128_r128(x86code *&emitptr, x86_memref memref, uint8_t sreg)      { emit_op_modrm_mem(emitptr, OP_MOVAPS_Wps_Vps, OP_32BIT, sreg, memref); }
-
-inline void emit_addps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_ADDPS_Vps_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_addps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_ADDPS_Vps_Wps, OP_32BIT, dreg, memref); }
-
-inline void emit_subps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_SUBPS_Vps_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_subps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_SUBPS_Vps_Wps, OP_32BIT, dreg, memref); }
-
-inline void emit_mulps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_MULPS_Vps_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_mulps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_MULPS_Vps_Wps, OP_32BIT, dreg, memref); }
-
-inline void emit_divps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_DIVPS_Vps_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_divps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_DIVPS_Vps_Wps, OP_32BIT, dreg, memref); }
-
-inline void emit_rcpps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_RCPPS_Vps_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_rcpps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_RCPPS_Vps_Wps, OP_32BIT, dreg, memref); }
-
-inline void emit_sqrtps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)            { emit_op_modrm_reg(emitptr, OP_SQRTPS_Vps_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_sqrtps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_SQRTPS_Vps_Wps, OP_32BIT, dreg, memref); }
-
-inline void emit_rsqrtps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_RSQRTPS_Vps_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_rsqrtps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_RSQRTPS_Vps_Wps, OP_32BIT, dreg, memref); }
-
-inline void emit_andps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_ANDPS_Vps_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_andps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_ANDPS_Vps_Wps, OP_32BIT, dreg, memref); }
-
-inline void emit_andnps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)            { emit_op_modrm_reg(emitptr, OP_ANDNPS_Vps_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_andnps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ANDNPS_Vps_Wps, OP_32BIT, dreg, memref); }
-
-inline void emit_orps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)              { emit_op_modrm_reg(emitptr, OP_ORPS_Vps_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_orps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)       { emit_op_modrm_mem(emitptr, OP_ORPS_Vps_Wps, OP_32BIT, dreg, memref); }
-
-inline void emit_xorps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_XORPS_Vps_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_xorps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_XORPS_Vps_Wps, OP_32BIT, dreg, memref); }
-
-inline void emit_cvtdq2ps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CVTDQ2PS_Vps_Wdq, OP_32BIT, dreg, sreg); }
-inline void emit_cvtdq2ps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_CVTDQ2PS_Vps_Wdq, OP_32BIT, dreg, memref); }
-
-inline void emit_cvtpd2ps_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CVTPD2PS_Vps_Wpd, OP_32BIT, dreg, sreg); }
-inline void emit_cvtpd2ps_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_CVTPD2PS_Vps_Wpd, OP_32BIT, dreg, memref); }
-
-inline void emit_cvtps2dq_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CVTPS2DQ_Vdq_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_cvtps2dq_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_CVTPS2DQ_Vdq_Wps, OP_32BIT, dreg, memref); }
-
-inline void emit_cvttps2dq_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_CVTTPS2DQ_Vdq_Wps, OP_32BIT, dreg, sreg); }
-inline void emit_cvttps2dq_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_CVTTPS2DQ_Vdq_Wps, OP_32BIT, dreg, memref); }
-
-inline void emit_roundps_r128_r128_imm(x86code *&emitptr, uint8_t dreg, uint8_t sreg, uint8_t imm)        { emit_op_modrm_reg(emitptr, OP_ROUNDPS_Vdq_Wdq_Ib, OP_32BIT, dreg, sreg); emit_byte(emitptr, imm); }
-inline void emit_roundps_r128_m128_imm(x86code *&emitptr, uint8_t dreg, x86_memref memref, uint8_t imm) { emit_op_modrm_mem(emitptr, OP_ROUNDPS_Vdq_Wdq_Ib, OP_32BIT, dreg, memref); emit_byte(emitptr, imm); }
-
-
-
-//**************************************************************************
-//  SSE SCALAR DOUBLE EMITTERS
-//**************************************************************************
-
-inline void emit_movsd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_MOVSD_Vsd_Wsd, OP_32BIT, dreg, sreg); }
-inline void emit_movsd_r128_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)       { emit_op_modrm_mem(emitptr, OP_MOVSD_Vsd_Wsd, OP_32BIT, dreg, memref); }
-inline void emit_movsd_m64_r128(x86code *&emitptr, x86_memref memref, uint8_t sreg)       { emit_op_modrm_mem(emitptr, OP_MOVSD_Wsd_Vsd, OP_32BIT, sreg, memref); }
-
-inline void emit_addsd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_ADDSD_Vsd_Wsd, OP_32BIT, dreg, sreg); }
-inline void emit_addsd_r128_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)       { emit_op_modrm_mem(emitptr, OP_ADDSD_Vsd_Wsd, OP_32BIT, dreg, memref); }
-
-inline void emit_subsd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_SUBSD_Vsd_Wsd, OP_32BIT, dreg, sreg); }
-inline void emit_subsd_r128_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)       { emit_op_modrm_mem(emitptr, OP_SUBSD_Vsd_Wsd, OP_32BIT, dreg, memref); }
-
-inline void emit_mulsd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_MULSD_Vsd_Wsd, OP_32BIT, dreg, sreg); }
-inline void emit_mulsd_r128_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)       { emit_op_modrm_mem(emitptr, OP_MULSD_Vsd_Wsd, OP_32BIT, dreg, memref); }
-
-inline void emit_divsd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_DIVSD_Vsd_Wsd, OP_32BIT, dreg, sreg); }
-inline void emit_divsd_r128_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)       { emit_op_modrm_mem(emitptr, OP_DIVSD_Vsd_Wsd, OP_32BIT, dreg, memref); }
-
-inline void emit_sqrtsd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)            { emit_op_modrm_reg(emitptr, OP_SQRTSD_Vsd_Wsd, OP_32BIT, dreg, sreg); }
-inline void emit_sqrtsd_r128_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_SQRTSD_Vsd_Wsd, OP_32BIT, dreg, memref); }
-
-inline void emit_comisd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)            { emit_op_modrm_reg(emitptr, OP_COMISD_Vsd_Wsd, OP_32BIT, dreg, sreg); }
-inline void emit_comisd_r128_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_COMISD_Vsd_Wsd, OP_32BIT, dreg, memref); }
-
-inline void emit_ucomisd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_UCOMISD_Vsd_Wsd, OP_32BIT, dreg, sreg); }
-inline void emit_ucomisd_r128_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_UCOMISD_Vsd_Wsd, OP_32BIT, dreg, memref); }
-
-inline void emit_cvtsi2sd_r128_r32(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_CVTSI2SD_Vsd_Ed, OP_32BIT, dreg, sreg); }
-inline void emit_cvtsi2sd_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_CVTSI2SD_Vsd_Ed, OP_32BIT, dreg, memref); }
-
-#if (X86EMIT_SIZE == 64)
-inline void emit_cvtsi2sd_r128_r64(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_CVTSI2SD_Vsd_Ed, OP_64BIT, dreg, sreg); }
-inline void emit_cvtsi2sd_r128_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_CVTSI2SD_Vsd_Ed, OP_64BIT, dreg, memref); }
-#endif
-
-inline void emit_cvtss2sd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CVTSS2SD_Vsd_Wss, OP_32BIT, dreg, sreg); }
-inline void emit_cvtss2sd_r128_m32(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_CVTSS2SD_Vsd_Wss, OP_32BIT, dreg, memref); }
-
-inline void emit_cvtsd2si_r32_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_CVTSD2SI_Gd_Wsd, OP_32BIT, dreg, sreg); }
-inline void emit_cvtsd2si_r32_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_CVTSD2SI_Gd_Wsd, OP_32BIT, dreg, memref); }
-
-#if (X86EMIT_SIZE == 64)
-inline void emit_cvtsd2si_r64_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)           { emit_op_modrm_reg(emitptr, OP_CVTSD2SI_Gd_Wsd, OP_64BIT, dreg, sreg); }
-inline void emit_cvtsd2si_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_CVTSD2SI_Gd_Wsd, OP_64BIT, dreg, memref); }
-#endif
-
-inline void emit_cvttsd2si_r32_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CVTTSD2SI_Gd_Wsd, OP_32BIT, dreg, sreg); }
-inline void emit_cvttsd2si_r32_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_CVTTSD2SI_Gd_Wsd, OP_32BIT, dreg, memref); }
-
-#if (X86EMIT_SIZE == 64)
-inline void emit_cvttsd2si_r64_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CVTTSD2SI_Gd_Wsd, OP_64BIT, dreg, sreg); }
-inline void emit_cvttsd2si_r64_m64(x86code *&emitptr, uint8_t dreg, x86_memref memref)    { emit_op_modrm_mem(emitptr, OP_CVTTSD2SI_Gd_Wsd, OP_64BIT, dreg, memref); }
-#endif
-
-inline void emit_roundsd_r128_r128_imm(x86code *&emitptr, uint8_t dreg, uint8_t sreg, uint8_t imm)        { emit_op_modrm_reg(emitptr, OP_ROUNDSD_Vsd_Wsd_Ib, OP_32BIT, dreg, sreg); emit_byte(emitptr, imm); }
-inline void emit_roundsd_r128_m64_imm(x86code *&emitptr, uint8_t dreg, x86_memref memref, uint8_t imm)  { emit_op_modrm_mem(emitptr, OP_ROUNDSD_Vsd_Wsd_Ib, OP_32BIT, dreg, memref); emit_byte(emitptr, imm); }
-
-
-
-//**************************************************************************
-//  SSE PACKED DOUBLE EMITTERS
-//**************************************************************************
-
-inline void emit_movpd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_MOVAPD_Vpd_Wpd, OP_32BIT, dreg, sreg); }
-inline void emit_movpd_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_MOVAPD_Vpd_Wpd, OP_32BIT, dreg, memref); }
-inline void emit_movpd_m128_r128(x86code *&emitptr, x86_memref memref, uint8_t sreg)      { emit_op_modrm_mem(emitptr, OP_MOVAPD_Wpd_Vpd, OP_32BIT, sreg, memref); }
-
-inline void emit_addpd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_ADDPD_Vpd_Wpd, OP_32BIT, dreg, sreg); }
-inline void emit_addpd_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_ADDPD_Vpd_Wpd, OP_32BIT, dreg, memref); }
-
-inline void emit_subpd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_SUBPD_Vpd_Wpd, OP_32BIT, dreg, sreg); }
-inline void emit_subpd_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_SUBPD_Vpd_Wpd, OP_32BIT, dreg, memref); }
-
-inline void emit_mulpd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_MULPD_Vpd_Wpd, OP_32BIT, dreg, sreg); }
-inline void emit_mulpd_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_MULPD_Vpd_Wpd, OP_32BIT, dreg, memref); }
-
-inline void emit_divpd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_DIVPD_Vpd_Wpd, OP_32BIT, dreg, sreg); }
-inline void emit_divpd_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_DIVPD_Vpd_Wpd, OP_32BIT, dreg, memref); }
-
-inline void emit_sqrtpd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)            { emit_op_modrm_reg(emitptr, OP_SQRTPD_Vpd_Wpd, OP_32BIT, dreg, sreg); }
-inline void emit_sqrtpd_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_SQRTPD_Vpd_Wpd, OP_32BIT, dreg, memref); }
-
-inline void emit_andpd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_ANDPD_Vpd_Wpd, OP_32BIT, dreg, sreg); }
-inline void emit_andpd_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_ANDPD_Vpd_Wpd, OP_32BIT, dreg, memref); }
-
-inline void emit_andnpd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)            { emit_op_modrm_reg(emitptr, OP_ANDNPD_Vpd_Wpd, OP_32BIT, dreg, sreg); }
-inline void emit_andnpd_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)     { emit_op_modrm_mem(emitptr, OP_ANDNPD_Vpd_Wpd, OP_32BIT, dreg, memref); }
-
-inline void emit_orpd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)              { emit_op_modrm_reg(emitptr, OP_ORPD_Vpd_Wpd, OP_32BIT, dreg, sreg); }
-inline void emit_orpd_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)       { emit_op_modrm_mem(emitptr, OP_ORPD_Vpd_Wpd, OP_32BIT, dreg, memref); }
-
-inline void emit_xorpd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)             { emit_op_modrm_reg(emitptr, OP_XORPD_Vpd_Wpd, OP_32BIT, dreg, sreg); }
-inline void emit_xorpd_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)      { emit_op_modrm_mem(emitptr, OP_XORPD_Vpd_Wpd, OP_32BIT, dreg, memref); }
-
-inline void emit_cvtdq2pd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CVTDQ2PD_Vpd_Wq, OP_32BIT, dreg, sreg); }
-inline void emit_cvtdq2pd_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_CVTDQ2PD_Vpd_Wq, OP_32BIT, dreg, memref); }
-
-inline void emit_cvtps2pd_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CVTPS2PD_Vpd_Wq, OP_32BIT, dreg, sreg); }
-inline void emit_cvtps2pd_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_CVTPS2PD_Vpd_Wq, OP_32BIT, dreg, memref); }
-
-inline void emit_cvtpd2dq_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)          { emit_op_modrm_reg(emitptr, OP_CVTPD2DQ_Vdq_Wpd, OP_32BIT, dreg, sreg); }
-inline void emit_cvtpd2dq_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)   { emit_op_modrm_mem(emitptr, OP_CVTPD2DQ_Vdq_Wpd, OP_32BIT, dreg, memref); }
-
-inline void emit_cvttpd2dq_r128_r128(x86code *&emitptr, uint8_t dreg, uint8_t sreg)         { emit_op_modrm_reg(emitptr, OP_CVTTPD2DQ_Vdq_Wpd, OP_32BIT, dreg, sreg); }
-inline void emit_cvttpd2dq_r128_m128(x86code *&emitptr, uint8_t dreg, x86_memref memref)  { emit_op_modrm_mem(emitptr, OP_CVTTPD2DQ_Vdq_Wpd, OP_32BIT, dreg, memref); }
-
-inline void emit_roundpd_r128_r128_imm(x86code *&emitptr, uint8_t dreg, uint8_t sreg, uint8_t imm)        { emit_op_modrm_reg(emitptr, OP_ROUNDPD_Vdq_Wdq_Ib, OP_32BIT, dreg, sreg); emit_byte(emitptr, imm); }
-inline void emit_roundpd_r128_m128_imm(x86code *&emitptr, uint8_t dreg, x86_memref memref, uint8_t imm) { emit_op_modrm_mem(emitptr, OP_ROUNDPD_Vdq_Wdq_Ib, OP_32BIT, dreg, memref); emit_byte(emitptr, imm); }
-
-}
-
-#undef X86EMIT_SIZE
-
-#endif
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/x86log.h mame-0.224+dfsg.1/src/devices/cpu/x86log.h
--- mame-0.222+dfsg.1/src/devices/cpu/x86log.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/x86log.h	2020-08-26 08:57:19.000000000 +0000
@@ -15,7 +15,6 @@
 
 #include <cstdint>
 #include <cassert>
-#include "x86emit.h"
 
 
 /***************************************************************************
@@ -32,6 +31,10 @@
     TYPE DEFINITIONS
 ***************************************************************************/
 
+// use x86code * to reference generated code
+typedef uint8_t       x86code;
+
+
 /* code logging info */
 struct log_comment
 {
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z180/z180.cpp mame-0.224+dfsg.1/src/devices/cpu/z180/z180.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/z180/z180.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z180/z180.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1786,9 +1786,7 @@
 	save_item(NAME(m_nmi_pending));
 	save_item(NAME(m_irq_state));
 	save_item(NAME(m_int_pending));
-	save_item(NAME(m_timer_cnt));
-	save_item(NAME(m_dma0_cnt));
-	save_item(NAME(m_dma1_cnt));
+	save_item(NAME(m_frc_prescale));
 	save_item(NAME(m_after_EI));
 
 	save_item(NAME(m_read_tcr_tmdr));
@@ -1906,9 +1904,8 @@
 		m_int_pending[i] = 0;
 	}
 
-	m_timer_cnt = 0;
-	m_dma0_cnt = 0;
-	m_dma1_cnt = 0;
+	m_frc = 0xff;
+	m_frc_prescale = 0;
 
 	/* reset io registers */
 	m_asci_cntla[0] = (m_asci_cntla[0] & Z180_CNTLA0_MPBR_EFR) | Z180_CNTLA0_RTS0;
@@ -1949,52 +1946,42 @@
 /* Handle PRT timers, decreasing them after 20 clocks and returning the new icount base that needs to be used for the next check */
 void z180_device::clock_timers()
 {
-	m_timer_cnt++;
-	if (m_timer_cnt >= 20)
+	/* Programmable Reload Timer 0 */
+	if(m_tcr & Z180_TCR_TDE0)
 	{
-		m_timer_cnt = 0;
-		/* Programmable Reload Timer 0 */
-		if(m_tcr & Z180_TCR_TDE0)
+		if(m_tmdr_value[0] == 0)
 		{
-			if(m_tmdr_value[0] == 0)
-			{
-				m_tmdr_value[0] = m_rldr[0].w;
-				m_tcr |= Z180_TCR_TIF0;
-			}
-			else
-				m_tmdr_value[0]--;
-		}
-
-		/* Programmable Reload Timer 1 */
-		if(m_tcr & Z180_TCR_TDE1)
-		{
-			if(m_tmdr_value[1] == 0)
-			{
-				m_tmdr_value[1] = m_rldr[1].w;
-				m_tcr |= Z180_TCR_TIF1;
-			}
-			else
-				m_tmdr_value[1]--;
+			m_tmdr_value[0] = m_rldr[0].w;
+			m_tcr |= Z180_TCR_TIF0;
 		}
+		else
+			m_tmdr_value[0]--;
+	}
 
-		if((m_tcr & Z180_TCR_TIE0) && (m_tcr & Z180_TCR_TIF0))
+	/* Programmable Reload Timer 1 */
+	if(m_tcr & Z180_TCR_TDE1)
+	{
+		if(m_tmdr_value[1] == 0)
 		{
-			// check if we can take the interrupt
-			if(m_IFF1 && !m_after_EI)
-			{
-				m_int_pending[Z180_INT_PRT0] = 1;
-			}
+			m_tmdr_value[1] = m_rldr[1].w;
+			m_tcr |= Z180_TCR_TIF1;
 		}
+		else
+			m_tmdr_value[1]--;
+	}
 
-		if((m_tcr & Z180_TCR_TIE1) && (m_tcr & Z180_TCR_TIF1))
-		{
-			// check if we can take the interrupt
-			if(m_IFF1 && !m_after_EI)
-			{
-				m_int_pending[Z180_INT_PRT1] = 1;
-			}
-		}
+	if((m_tcr & Z180_TCR_TIE0) && (m_tcr & Z180_TCR_TIF0))
+	{
+		// check if we can take the interrupt
+		if(m_IFF1 && !m_after_EI)
+			m_int_pending[Z180_INT_PRT0] = 1;
+	}
 
+	if((m_tcr & Z180_TCR_TIE1) && (m_tcr & Z180_TCR_TIF1))
+	{
+		// check if we can take the interrupt
+		if(m_IFF1 && !m_after_EI)
+			m_int_pending[Z180_INT_PRT1] = 1;
 	}
 }
 
@@ -2035,7 +2022,17 @@
 {
 	while (cycles-- > 0)
 	{
-		clock_timers();
+		// FRC counts down by 1 every 10 cycles
+		m_frc_prescale++;
+		if (m_frc_prescale >= 10)
+		{
+			m_frc_prescale = 0;
+			m_frc--;
+
+			// Programmable reload timers are clocked once every 20 cycles
+			if ((m_frc & 1) == 0)
+				clock_timers();
+		}
 	}
 }
 
@@ -2096,7 +2093,6 @@
 				if (!m_HALT)
 				{
 					m_R++;
-					m_frc++;   /* Added FRC counting, not implemented yet */
 					m_extra_cycles = 0;
 					curcycles = exec_op(ROP());
 					curcycles += m_extra_cycles;
@@ -2155,7 +2151,6 @@
 			if (!m_HALT)
 			{
 				m_R++;
-				m_frc++;   /* Added FRC counting, not implemented yet */
 				m_extra_cycles = 0;
 				curcycles = exec_op(ROP());
 				curcycles += m_extra_cycles;
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z180/z180dasm.cpp mame-0.224+dfsg.1/src/devices/cpu/z180/z180dasm.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/z180/z180dasm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z180/z180dasm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -402,7 +402,7 @@
 		if( op1 == 0xcb )
 		{
 			offset = (int8_t) params.r8(pos++);
-			op1 = params.r8(pos++); /* fourth byte from opbase.ram! */
+			op1 = opcodes.r8(pos++); // M1 fetch, unlike Z80
 			d = &mnemonic_xx_cb[op1];
 		}
 		else d = &mnemonic_xx[op1];
@@ -413,7 +413,7 @@
 		if( op1 == 0xcb )
 		{
 			offset = (int8_t) params.r8(pos++);
-			op1 = params.r8(pos++); /* fourth byte from opbase.ram! */
+			op1 = opcodes.r8(pos++); // M1 fetch, unlike Z80
 			d = &mnemonic_xx_cb[op1];
 		}
 		else d = &mnemonic_xx[op1];
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z180/z180dd.hxx mame-0.224+dfsg.1/src/devices/cpu/z180/z180dd.hxx
--- mame-0.222+dfsg.1/src/devices/cpu/z180/z180dd.hxx	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z180/z180dd.hxx	2020-08-26 08:57:19.000000000 +0000
@@ -236,7 +236,7 @@
 OP(dd,c8) { illegal_1(); op_c8();                                   } /* DB   DD          */
 OP(dd,c9) { illegal_1(); op_c9();                                   } /* DB   DD          */
 OP(dd,ca) { illegal_1(); op_ca();                                   } /* DB   DD          */
-OP(dd,cb) { m_R++; EAX(); m_extra_cycles += exec_xycb(ARG());                          } /* **   DD CB xx    */
+OP(dd,cb) { m_R++; EAX(); m_extra_cycles += exec_xycb(ROP());                          } /* **   DD CB xx    */
 OP(dd,cc) { illegal_1(); op_cc();                                   } /* DB   DD          */
 OP(dd,cd) { illegal_1(); op_cd();                                   } /* DB   DD          */
 OP(dd,ce) { illegal_1(); op_ce();                                   } /* DB   DD          */
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z180/z180fd.hxx mame-0.224+dfsg.1/src/devices/cpu/z180/z180fd.hxx
--- mame-0.222+dfsg.1/src/devices/cpu/z180/z180fd.hxx	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z180/z180fd.hxx	2020-08-26 08:57:19.000000000 +0000
@@ -231,7 +231,7 @@
 OP(fd,c8) { illegal_1(); op_c8();                                   } /* DB   FD          */
 OP(fd,c9) { illegal_1(); op_c9();                                   } /* DB   FD          */
 OP(fd,ca) { illegal_1(); op_ca();                                   } /* DB   FD          */
-OP(fd,cb) { m_R++; EAY(); m_extra_cycles += exec_xycb(ARG());                          } /* **   FD CB xx    */
+OP(fd,cb) { m_R++; EAY(); m_extra_cycles += exec_xycb(ROP());                          } /* **   FD CB xx    */
 OP(fd,cc) { illegal_1(); op_cc();                                   } /* DB   FD          */
 OP(fd,cd) { illegal_1(); op_cd();                                   } /* DB   FD          */
 OP(fd,ce) { illegal_1(); op_ce();                                   } /* DB   FD          */
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z180/z180.h mame-0.224+dfsg.1/src/devices/cpu/z180/z180.h
--- mame-0.222+dfsg.1/src/devices/cpu/z180/z180.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z180/z180.h	2020-08-26 08:57:19.000000000 +0000
@@ -171,10 +171,11 @@
 	uint8_t   m_asci_rdr[2];                    // ASCI receive data register 0-1
 	uint8_t   m_csio_cntr;                      // CSI/O control/status register
 	uint8_t   m_csio_trdr;                      // CSI/O transmit/receive register
-	PAIR16    m_tmdr[2];                        // TIMER data register ch 0-1
-	PAIR16    m_rldr[2];                        // TIMER reload register ch 0-1
-	uint8_t   m_tcr;                            // TIMER control register
-	uint8_t   m_frc;                            // free running counter
+	PAIR16    m_tmdr[2];                        // PRT data register ch 0-1
+	PAIR16    m_rldr[2];                        // PRT reload register ch 0-1
+	uint8_t   m_tcr;                            // PRT control register
+	uint8_t   m_frc;                            // free running counter (also time base for ASCI, CSI/O & PRT)
+	uint8_t   m_frc_prescale;                   // divide CPU clock by 10
 	PAIR      m_dma_sar0;                       // DMA source address register ch 0
 	PAIR      m_dma_dar0;                       // DMA destination address register ch 0
 	PAIR16    m_dma_bcr[2];                     // DMA byte register ch 0-1
@@ -200,9 +201,6 @@
 	uint8_t   m_int_pending[11 + 1];            // interrupt pending
 	uint8_t   m_after_EI;                       // are we in the EI shadow?
 	uint32_t  m_ea;
-	uint8_t   m_timer_cnt;                      // timer counter / divide by 20
-	uint8_t   m_dma0_cnt;                       // DMA0 counter / divide by 20
-	uint8_t   m_dma1_cnt;                       // DMA1 counter / divide by 20
 	memory_access<20, 0, 0, ENDIANNESS_LITTLE>::cache m_cprogram, m_copcodes;
 	memory_access<20, 0, 0, ENDIANNESS_LITTLE>::specific m_program;
 	memory_access<16, 0, 0, ENDIANNESS_LITTLE>::specific m_io;
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z8/z8.cpp mame-0.224+dfsg.1/src/devices/cpu/z8/z8.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/z8/z8.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z8/z8.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -138,6 +138,7 @@
 
 void z8_device::register_map(address_map &map)
 {
+	map.unmap_value_high();
 	map(0x00, 0x00).rw(FUNC(z8_device::p0_read), FUNC(z8_device::p0_write));
 	map(0x01, 0x01).rw(FUNC(z8_device::p1_read), FUNC(z8_device::p1_write));
 	map(0x02, 0x02).rw(FUNC(z8_device::p2_read), FUNC(z8_device::p2_write));
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z8/z8ops.hxx mame-0.224+dfsg.1/src/devices/cpu/z8/z8ops.hxx
--- mame-0.222+dfsg.1/src/devices/cpu/z8/z8ops.hxx	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z8/z8ops.hxx	2020-08-26 08:57:19.000000000 +0000
@@ -325,7 +325,7 @@
 		if (flag(C) | (data>0x99)) new_data+=0x60;
 	}
 
-	set_flag_c(new_data & 0x100);
+	set_flag_c(flag(C)|(new_data & 0x100));
 	set_flag_s(new_data & 0x80);
 	new_data &= 0xff;
 	set_flag_z(new_data == 0);
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z80/kc82.cpp mame-0.224+dfsg.1/src/devices/cpu/z80/kc82.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/z80/kc82.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z80/kc82.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,260 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***************************************************************************
+
+    Kawasaki Steel (Kawatetsu) KC82 CPU core with MMU
+
+***************************************************************************/
+
+#include "emu.h"
+#include "kc82.h"
+
+#define VERBOSE 0
+#include "logmacro.h"
+
+
+//-------------------------------------------------
+//  kc82_device - constructor
+//-------------------------------------------------
+
+kc82_device::kc82_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor mem_map, address_map_constructor io_map)
+	: z80_device(mconfig, type, tag, owner, clock)
+	, m_program_config("program", ENDIANNESS_LITTLE, 8, 20, 0, 16, 10, mem_map)
+	, m_opcodes_config("opcodes", ENDIANNESS_LITTLE, 8, 20, 0, 16, 10, mem_map)
+	, m_io_config("io", ENDIANNESS_LITTLE, 8, 16, 0, io_map)
+{
+	std::fill_n(&m_mmu_a[0], 4, 0);
+	std::fill_n(&m_mmu_b[0], 5, 0);
+	std::fill_n(&m_mmu_base[0], 0x40, 0);
+}
+
+
+//-------------------------------------------------
+//  memory_space_config - return a vector of
+//  address space configurations for this device
+//-------------------------------------------------
+
+device_memory_interface::space_config_vector kc82_device::memory_space_config() const
+{
+	if (has_space(AS_OPCODES))
+	{
+		return space_config_vector {
+			std::make_pair(AS_PROGRAM, &m_program_config),
+			std::make_pair(AS_IO,      &m_io_config),
+			std::make_pair(AS_OPCODES, &m_opcodes_config)
+		};
+	}
+	else
+	{
+		return space_config_vector {
+			std::make_pair(AS_PROGRAM, &m_program_config),
+			std::make_pair(AS_IO,      &m_io_config)
+		};
+	}
+}
+
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void kc82_device::device_start()
+{
+	z80_device::device_start();
+
+	for (int n = 1; n <= 4; n++)
+	{
+		state_add<u8>(KC82_B1 + n - 1, string_format("B%d", n).c_str(),
+			[this, n]() { return m_mmu_b[n]; },
+			[this, n](u8 data) { m_mmu_b[n] = data; mmu_remap_pages(); }
+		).mask(0x3f);
+		if (n != 4)
+			state_add<u16>(KC82_A1 + n - 1, string_format("A%d", n).c_str(),
+				[this, n]() { return m_mmu_a[n]; },
+				[this, n](u16 data) { m_mmu_a[n] = data; mmu_remap_pages(); }
+			).mask(0x3ff);
+	}
+
+	save_item(NAME(m_mmu_a));
+	save_item(NAME(m_mmu_b));
+}
+
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void kc82_device::device_reset()
+{
+	z80_device::device_reset();
+
+	std::fill_n(&m_mmu_a[1], 3, 0);
+	std::fill_n(&m_mmu_b[1], 4, 0x3f);
+	std::fill_n(&m_mmu_base[0], 0x40, 0);
+}
+
+
+//-------------------------------------------------
+//  device_post_load - called after loading a
+//  saved state
+//-------------------------------------------------
+
+void kc82_device::device_post_load()
+{
+	z80_device::device_post_load();
+
+	mmu_remap_pages();
+}
+
+
+//**************************************************************************
+//  KC82 MMU
+//**************************************************************************
+
+//-------------------------------------------------
+//  mmu_remap_pages - recalculate base addresses
+//  for memory pages
+//-------------------------------------------------
+
+void kc82_device::mmu_remap_pages()
+{
+	int n = 4;
+	u32 base = 0xf0000; // A4 is fixed
+	for (u8 i = 0x3f; i != 0; --i)
+	{
+		while (n != 0 && m_mmu_b[n] >= i)
+		{
+			--n;
+			base = u32(m_mmu_a[n]) << 10;
+		}
+		if (m_mmu_base[i] != base)
+		{
+			u32 old_mapping = ((i << 10) + base) & 0xffc00;
+			u32 new_mapping = ((i << 10) + m_mmu_base[i]) & 0xffc00;
+			LOG("%s: MMU: %04X-%04XH => %05X-%05XH (was %05X-%05XH)\n",
+				machine().describe_context(),
+				i << 10, (i << 10) | 0x3ff,
+				old_mapping, old_mapping | 0x3ff,
+				new_mapping, new_mapping | 0x3ff);
+		}
+		m_mmu_base[i] = base;
+	}
+}
+
+
+//-------------------------------------------------
+//  mmu_r - read MMU register
+//-------------------------------------------------
+
+u8 kc82_device::mmu_r(offs_t offset)
+{
+	int n = (offset >> 1) + 1;
+	if (BIT(offset, 0))
+	{
+		// read base register BRn
+		return n == 4 ? 0xf0 : (m_mmu_a[n] & 0x3fc) >> 2;
+	}
+	else
+	{
+		// read boundary/base register BBRn
+		return (n == 4 ? 0 : (m_mmu_a[n] & 0x003) << 6) | m_mmu_b[n];
+	}
+}
+
+
+//-------------------------------------------------
+//  mmu_w - write to MMU register
+//-------------------------------------------------
+
+void kc82_device::mmu_w(offs_t offset, u8 data)
+{
+	int n = (offset >> 1) + 1;
+	if (BIT(offset, 0))
+	{
+		// write to base register BRn
+		if (n != 4)
+			m_mmu_a[n] = u16(data) << 2 | (m_mmu_a[n] & 0x003);
+		else if (data != 0xf0)
+			logerror("%s: Attempt to write %02X to upper 8 bits of A4\n", machine().describe_context(), data);
+	}
+	else
+	{
+		// write to boundary/base register BBRn
+		m_mmu_b[n] = data & 0x3f;
+		if (n != 4)
+			m_mmu_a[n] = (m_mmu_a[n] & 0x3fc) | (data & 0xc0) >> 6;
+		else if ((data & 0xc0) != 0)
+			logerror("%s: Attempt to write %d to lower 2 bits of A4\n", machine().describe_context(), (data & 0xc0) >> 6);
+	}
+	mmu_remap_pages();
+}
+
+
+//-------------------------------------------------
+//  memory_translate - translate from logical to
+//  physical addresses
+//-------------------------------------------------
+
+bool kc82_device::memory_translate(int spacenum, int intention, offs_t &address)
+{
+	if (spacenum == AS_PROGRAM || spacenum == AS_OPCODES)
+		address = (address + m_mmu_base[(address & 0xfc00) >> 10]) & 0xfffff;
+	return true;
+}
+
+
+//-------------------------------------------------
+//  rm - read one byte from memory
+//-------------------------------------------------
+
+u8 kc82_device::rm(u16 addr)
+{
+	return m_data.read_byte(addr + m_mmu_base[addr >> 10]);
+}
+
+
+//-------------------------------------------------
+//  wm - write one byte to memory
+//-------------------------------------------------
+
+void kc82_device::wm(u16 addr, u8 value)
+{
+	m_data.write_byte(addr + m_mmu_base[addr >> 10], value);
+}
+
+
+//-------------------------------------------------
+//  rop - read opcode
+//-------------------------------------------------
+
+u8 kc82_device::rop()
+{
+	u32 pc = m_pc.w.l + m_mmu_base[m_pc.b.h >> 2];
+	m_pc.w.l++;
+	// no refresh
+	return m_opcodes.read_byte(pc);
+}
+
+
+//-------------------------------------------------
+//  arg - read 8-bit argument
+//-------------------------------------------------
+
+u8 kc82_device::arg()
+{
+	u32 pc = m_pc.w.l + m_mmu_base[m_pc.b.h >> 2];
+	m_pc.w.l++;
+	return m_args.read_byte(pc);
+}
+
+
+//-------------------------------------------------
+//  arg16 - read 16-bit argument
+//-------------------------------------------------
+
+u16 kc82_device::arg16()
+{
+	u16 d16 = arg();
+	d16 |= u16(arg()) << 8;
+	return d16;
+}
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z80/kc82.h mame-0.224+dfsg.1/src/devices/cpu/z80/kc82.h
--- mame-0.222+dfsg.1/src/devices/cpu/z80/kc82.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z80/kc82.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,70 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***************************************************************************
+
+    Kawasaki Steel (Kawatetsu) KC82 CPU core with MMU
+
+***************************************************************************/
+
+#ifndef MAME_CPU_Z80_KC82_H
+#define MAME_CPU_Z80_KC82_H
+
+#pragma once
+
+#include "z80.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class kc82_device : public z80_device
+{
+public:
+	enum
+	{
+		KC82_B1 = Z80_WZ + 1, KC82_B2, KC82_B3, KC82_B4,
+		KC82_A1, KC82_A2, KC82_A3
+	};
+
+protected:
+	// construction/destruction
+	kc82_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor mem_map, address_map_constructor io_map);
+
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+	virtual void device_post_load() override;
+
+	// device_memory_interface overrides
+	virtual space_config_vector memory_space_config() const override;
+	virtual bool memory_translate(int spacenum, int intention, offs_t &address) override;
+
+	// z80_device overrides
+	virtual u8 rm(u16 addr) override;
+	virtual void wm(u16 addr, u8 value) override;
+	virtual u8 rop() override;
+	virtual u8 arg() override;
+	virtual u16 arg16() override;
+
+	// MMU access
+	u8 mmu_r(offs_t offset);
+	void mmu_w(offs_t offset, u8 data);
+
+private:
+	// internal helpers
+	void mmu_remap_pages();
+
+	// address spaces
+	address_space_config m_program_config;
+	address_space_config m_opcodes_config;
+	address_space_config m_io_config;
+
+	// MMU registers
+	u16 m_mmu_a[4];
+	u8 m_mmu_b[5];
+	u32 m_mmu_base[0x40];
+};
+
+
+#endif // MAME_CPU_Z80_KC82_H
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z80/kl5c80a12.cpp mame-0.224+dfsg.1/src/devices/cpu/z80/kl5c80a12.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/z80/kl5c80a12.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z80/kl5c80a12.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,27 +1,68 @@
 // license:BSD-3-Clause
-// copyright-holders:David Haywood
+// copyright-holders:AJR
 /***************************************************************************
 
-    Kawasaki LSI
-    KL5C80A12 CPU (KL5C80A12CFP on hng64.c)
+    Kawasaki Steel (Kawatetsu) KL5C80A12 CPU
 
-    Binary compatible with Z80, significantly faster opcode timings, operating at up to 10Mhz
-    Timers / Counters, Parallel / Serial ports/ MMU, Interrupt Controller
-
-    (is this different enough to need it's own core?)
-    (todo: everything, some code currently lives in machine/hng64_net.c but not much)
+    This is based on KC82, an MMU-enhanced version of KC80 (KL5C8400),
+    Kawasaki's Z80-compatible core with an internal 16-bit architecture
+    and significantly faster opcode timings, operating at up to 10 MHz
+    (CLK = XIN/2).
+
+    Important functional blocks:
+    — MMU
+    — USART (KP51) (unemulated)
+    — 16-bit timer/counters (KP64, KP63) (unemulated)
+    — 16-level interrupt controller (KP69)
+    — Parallel ports (KP65, KP66) (unemulated)
+    — 512-byte high-speed RAM
+    — External bus interface unit (unemulated)
 
 ***************************************************************************/
 
 #include "emu.h"
 #include "kl5c80a12.h"
 
-DEFINE_DEVICE_TYPE(KL5C80A12, kl5c80a12_device, "kl5c80a12", "Kawasaki LSI KL5C80A12")
+// device type definition
+DEFINE_DEVICE_TYPE(KL5C80A12, kl5c80a12_device, "kl5c80a12", "Kawasaki Steel KL5C80A12")
+
+static const z80_daisy_config pseudo_daisy_config[] = { { "kp69" }, { nullptr } };
+
+
+//-------------------------------------------------
+//  kl5c80a12_device - constructor
+//-------------------------------------------------
+
+kl5c80a12_device::kl5c80a12_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: kc82_device(mconfig, KL5C80A12, tag, owner, clock,
+					address_map_constructor(FUNC(kl5c80a12_device::internal_ram), this),
+					address_map_constructor(FUNC(kl5c80a12_device::internal_io), this))
+	, m_kp69(*this, "kp69")
+{
+}
+
+
+//-------------------------------------------------
+//  internal_ram - map for high-speed internal RAM
+//-------------------------------------------------
+
+void kl5c80a12_device::internal_ram(address_map &map)
+{
+	map(0xffe00, 0xfffff).ram().share("ram");
+}
+
 
+//-------------------------------------------------
+//  internal_io - map for internal I/O registers
+//-------------------------------------------------
 
-kl5c80a12_device::kl5c80a12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: z80_device(mconfig, KL5C80A12, tag, owner, clock)
+void kl5c80a12_device::internal_io(address_map &map)
 {
+	map(0x00, 0x07).mirror(0xff00).rw(FUNC(kl5c80a12_device::mmu_r), FUNC(kl5c80a12_device::mmu_w));
+	map(0x34, 0x34).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::isrl_r), FUNC(kp69_device::lerl_pgrl_w));
+	map(0x35, 0x35).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::isrh_r), FUNC(kp69_device::lerh_pgrh_w));
+	map(0x36, 0x36).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::imrl_r), FUNC(kp69_device::imrl_w));
+	map(0x37, 0x37).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::imrh_r), FUNC(kp69_device::ivr_imrh_w));
 }
 
 
@@ -31,7 +72,9 @@
 
 void kl5c80a12_device::device_start()
 {
-	z80_device::device_start();
+	kc82_device::device_start();
+
+	m_kp69->add_to_state(*this, KP69_IRR);
 }
 
 
@@ -41,11 +84,29 @@
 
 void kl5c80a12_device::device_reset()
 {
-	z80_device::device_reset();
+	kc82_device::device_reset();
 }
 
 
-/* CPU interface */
+//-------------------------------------------------
+//  device_add_mconfig - add device-specific
+//  machine configuration
+//-------------------------------------------------
+
 void kl5c80a12_device::device_add_mconfig(machine_config &config)
 {
+	KP69(config, m_kp69);
+	m_kp69->int_callback().set_inputline(*this, INPUT_LINE_IRQ0);
+}
+
+
+//-------------------------------------------------
+//  device_config_complete - perform any
+//  operations now that the configuration is
+//  complete
+//-------------------------------------------------
+
+void kl5c80a12_device::device_config_complete()
+{
+	set_daisy_config(pseudo_daisy_config);
 }
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z80/kl5c80a12.h mame-0.224+dfsg.1/src/devices/cpu/z80/kl5c80a12.h
--- mame-0.222+dfsg.1/src/devices/cpu/z80/kl5c80a12.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z80/kl5c80a12.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,15 +1,8 @@
 // license:BSD-3-Clause
-// copyright-holders:David Haywood
+// copyright-holders:AJR
 /***************************************************************************
 
-    Kawasaki LSI
-    KL5C80A12 CPU (KL5C80A12CFP on hng64.c)
-
-    Binary compatible with Z80, significantly faster opcode timings, operating at up to 10Mhz
-    Timers / Counters, Parallel / Serial ports/ MMU, Interrupt Controller
-
-    (is this different enough to need it's own core?)
-    (todo: everything, some code currently lives in machine/hng64_net.c but not much)
+    Kawasaki Steel (Kawatetsu) KL5C80A12 CPU
 
 ***************************************************************************/
 
@@ -18,33 +11,47 @@
 
 #pragma once
 
-#include "z80.h"
-#include "machine/z80ctc.h"
-
+#include "kc82.h"
+#include "kp69.h"
 
-/***************************************************************************
-    DEVICE CONFIGURATION MACROS
-***************************************************************************/
 
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
 
-/***************************************************************************
-    TYPE DEFINITIONS
-***************************************************************************/
-
-class kl5c80a12_device : public z80_device
+class kl5c80a12_device : public kc82_device
 {
 public:
-	kl5c80a12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t);
+	enum
+	{
+		KP69_IRR = KC82_A3 + 1, KP69_ISR, KP69_IVR, KP69_LER, KP69_PGR, KP69_IMR
+	};
+
+	// device type constructor
+	kl5c80a12_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
 
 protected:
 	// device-level overrides
 	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_config_complete() override;
 	virtual void device_start() override;
 	virtual void device_reset() override;
+
+	// device_execute_interface overrides
+	virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return (clocks + 2 - 1) / 2; }
+	virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return (cycles * 2); }
+
+private:
+	// internal address maps
+	void internal_ram(address_map &map);
+	void internal_io(address_map &map);
+
+	// subdevice finders
+	required_device<kp69_device> m_kp69;
 };
 
 
-// device type definition
+// device type declaration
 DECLARE_DEVICE_TYPE(KL5C80A12, kl5c80a12_device)
 
 #endif // MAME_CPU_Z80_KL5C80A12_H
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z80/kl5c80a16.cpp mame-0.224+dfsg.1/src/devices/cpu/z80/kl5c80a16.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/z80/kl5c80a16.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z80/kl5c80a16.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,98 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***************************************************************************
+
+    Kawasaki Steel (Kawatetsu) KL5C80A16 CPU
+
+    Important functional blocks:
+    — MMU
+    — DMA controller (KP27) (unemulated)
+    — UART (KP61) (unemulated)
+    — Synchronous serial port (KP62) (unemulated)
+    — 16-bit timer/counters (KP63A) (unemulated)
+    — 16-level interrupt controller (KP69)
+    — Parallel ports (KP67) (unemulated)
+    — External bus/DRAM interface unit (unemulated)
+
+***************************************************************************/
+
+#include "emu.h"
+#include "kl5c80a16.h"
+
+// device type definition
+DEFINE_DEVICE_TYPE(KL5C80A16, kl5c80a16_device, "kl5c80a16", "Kawasaki Steel KL5C80A16")
+
+static const z80_daisy_config pseudo_daisy_config[] = { { "kp69" }, { nullptr } };
+
+
+//-------------------------------------------------
+//  kl5c80a16_device - constructor
+//-------------------------------------------------
+
+kl5c80a16_device::kl5c80a16_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: kc82_device(mconfig, KL5C80A16, tag, owner, clock,
+					address_map_constructor(),
+					address_map_constructor(FUNC(kl5c80a16_device::internal_io), this))
+	, m_kp69(*this, "kp69")
+{
+}
+
+
+//-------------------------------------------------
+//  internal_io - map for internal I/O registers
+//-------------------------------------------------
+
+void kl5c80a16_device::internal_io(address_map &map)
+{
+	map(0x00, 0x07).mirror(0xff00).rw(FUNC(kl5c80a16_device::mmu_r), FUNC(kl5c80a16_device::mmu_w));
+	map(0x34, 0x34).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::isrl_r), FUNC(kp69_device::lerl_pgrl_w));
+	map(0x35, 0x35).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::isrh_r), FUNC(kp69_device::lerh_pgrh_w));
+	map(0x36, 0x36).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::imrl_r), FUNC(kp69_device::imrl_w));
+	map(0x37, 0x37).mirror(0xff00).rw(m_kp69, FUNC(kp69_device::imrh_r), FUNC(kp69_device::ivr_imrh_w));
+}
+
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void kl5c80a16_device::device_start()
+{
+	kc82_device::device_start();
+
+	m_kp69->add_to_state(*this, KP69_IRR);
+}
+
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void kl5c80a16_device::device_reset()
+{
+	kc82_device::device_reset();
+}
+
+
+//-------------------------------------------------
+//  device_add_mconfig - add device-specific
+//  machine configuration
+//-------------------------------------------------
+
+void kl5c80a16_device::device_add_mconfig(machine_config &config)
+{
+	KP69(config, m_kp69);
+	m_kp69->int_callback().set_inputline(*this, INPUT_LINE_IRQ0);
+}
+
+
+//-------------------------------------------------
+//  device_config_complete - perform any
+//  operations now that the configuration is
+//  complete
+//-------------------------------------------------
+
+void kl5c80a16_device::device_config_complete()
+{
+	set_daisy_config(pseudo_daisy_config);
+}
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z80/kl5c80a16.h mame-0.224+dfsg.1/src/devices/cpu/z80/kl5c80a16.h
--- mame-0.222+dfsg.1/src/devices/cpu/z80/kl5c80a16.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z80/kl5c80a16.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,56 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***************************************************************************
+
+    Kawasaki Steel (Kawatetsu) KL5C80A16 CPU
+
+***************************************************************************/
+
+#ifndef MAME_CPU_Z80_KL5C80A16_H
+#define MAME_CPU_Z80_KL5C80A16_H
+
+#pragma once
+
+#include "kc82.h"
+#include "kp69.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class kl5c80a16_device : public kc82_device
+{
+public:
+	enum
+	{
+		KP69_IRR = KC82_A3 + 1, KP69_ISR, KP69_IVR, KP69_LER, KP69_PGR, KP69_IMR
+	};
+
+	// device type constructor
+	kl5c80a16_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+protected:
+	// device-level overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_config_complete() override;
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// device_execute_interface overrides
+	virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return (clocks + 2 - 1) / 2; }
+	virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return (cycles * 2); }
+
+private:
+	// internal address map
+	void internal_io(address_map &map);
+
+	// subdevice finders
+	required_device<kp69_device> m_kp69;
+};
+
+
+// device type declaration
+DECLARE_DEVICE_TYPE(KL5C80A16, kl5c80a16_device)
+
+#endif // MAME_CPU_Z80_KL5C80A16_H
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z80/kp69.cpp mame-0.224+dfsg.1/src/devices/cpu/z80/kp69.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/z80/kp69.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z80/kp69.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,477 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***************************************************************************
+
+    Kawasaki Steel (Kawatetsu) KP69 Interrupt Controller
+
+    This macro cell is the sole provider of maskable interrupts for
+    KC80/KC82-based microcontrollers. It responds to the CPU's internal
+    IACK and EOI outputs (the latter associated with the RETI instruction)
+    with prioritized Mode 2 vectors and nested in-service lockouts. It
+    offers no support for polled operation or daisy-chaining other
+    interrupt controllers, but it does allow code to recognize spurious
+    interrupts.
+
+    Each of the 16 interrupt sources may be programmed either as level-
+    triggered or edge-triggered, though the latter is required for
+    interrupts that are internal timer/counter outputs. These and the
+    interrupt vector register must be written first after a reset before
+    the mask and priority group registers can be defined, with no way of
+    returning to the initial mode once the vector has been set.
+
+***************************************************************************/
+
+#include "emu.h"
+#include "kp69.h"
+
+#define VERBOSE 0
+#include "logmacro.h"
+
+// device type definition
+DEFINE_DEVICE_TYPE(KP69, kp69_device, "kp69", "Kawasaki Steel KP69 Interrupt Controller")
+
+
+//-------------------------------------------------
+//  kp69_base_device - constructor
+//-------------------------------------------------
+
+kp69_base_device::kp69_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+	: device_t(mconfig, type, tag, owner, clock)
+	, device_z80daisy_interface(mconfig, *this)
+	, m_int_callback(*this)
+	, m_input_levels(0)
+	, m_irr(0)
+	, m_isr(0)
+	, m_illegal_state(false)
+	, m_ivr(0)
+	, m_imr(0xffff)
+	, m_ler(0)
+	, m_pgr(0)
+	, m_int_active(false)
+{
+}
+
+
+//-------------------------------------------------
+//  kp69_device - constructor
+//-------------------------------------------------
+
+kp69_device::kp69_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: kp69_base_device(mconfig, KP69, tag, owner, clock)
+	, m_ivr_written(false)
+{
+}
+
+
+//-------------------------------------------------
+//  device_resolve_objects - resolve objects that
+//  may be needed for other devices to set
+//  initial conditions at start time
+//-------------------------------------------------
+
+void kp69_base_device::device_resolve_objects()
+{
+	// Resolve output callback
+	m_int_callback.resolve_safe();
+}
+
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void kp69_base_device::device_start()
+{
+	// Register state for saving
+	save_item(NAME(m_input_levels));
+	save_item(NAME(m_irr));
+	save_item(NAME(m_isr));
+	save_item(NAME(m_illegal_state));
+	save_item(NAME(m_ivr));
+	save_item(NAME(m_imr));
+	save_item(NAME(m_ler));
+	save_item(NAME(m_pgr));
+	save_item(NAME(m_int_active));
+}
+
+void kp69_device::device_start()
+{
+	kp69_base_device::device_start();
+	save_item(NAME(m_ivr_written));
+}
+
+
+//-------------------------------------------------
+//  add_to_state - debug state interface for MCU
+//-------------------------------------------------
+
+void kp69_base_device::add_to_state(device_state_interface &state, int index)
+{
+	state.state_add<u16>(index, "IRR", [this]() { return m_irr; }, [this](u16 data) { set_irr(data); });
+	state.state_add<u16>(index + 1, "ISR", [this]() { return m_isr; }, [this](u16 data) { set_isr(data); });
+	state.state_add(index + 2, "IVR", m_ivr).mask(0xe0);
+	state.state_add<u16>(index + 3, "LER", [this]() { return m_ler; }, [this](u16 data) { set_ler(data); });
+	state.state_add<u16>(index + 4, "PGR", [this]() { return m_pgr; }, [this](u16 data) { set_pgr(data); });
+	state.state_add<u16>(index + 5, "IMR", [this]() { return m_imr; }, [this](u16 data) { set_imr(data); });
+}
+
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void kp69_base_device::device_reset()
+{
+	// Reset inputs to level mode
+	m_ler = 0;
+
+	// Mask all interrupts, cancel requests and end service
+	m_imr = 0xffff;
+	m_irr = 0;
+	m_isr = 0;
+	m_illegal_state = false;
+
+	// Reset priority groups
+	m_pgr = 0;
+
+	// Deassert interrupt output
+	set_int(false);
+}
+
+void kp69_device::device_reset()
+{
+	kp69_base_device::device_reset();
+
+	// Allow LER and IVR to be written first
+	m_ivr_written = false;
+}
+
+
+//-------------------------------------------------
+//  isrl_r - read lower 8 bits of ISR
+//-------------------------------------------------
+
+u8 kp69_base_device::isrl_r()
+{
+	return m_isr & 0x00ff;
+}
+
+
+//-------------------------------------------------
+//  isrh_r - read upper 8 bits of ISR
+//-------------------------------------------------
+
+u8 kp69_base_device::isrh_r()
+{
+	return (m_isr & 0xff00) >> 8;
+}
+
+
+//-------------------------------------------------
+//  imrl_r - read lower 8 bits of IMR
+//-------------------------------------------------
+
+u8 kp69_base_device::imrl_r()
+{
+	return m_imr & 0x00ff;
+}
+
+
+//-------------------------------------------------
+//  imrh_r - read upper 8 bits of IMR
+//-------------------------------------------------
+
+u8 kp69_base_device::imrh_r()
+{
+	return (m_imr & 0xff00) >> 8;
+}
+
+
+//-------------------------------------------------
+//  lerl_pgrl_w - write lower 8 bits of LER or PGR
+//-------------------------------------------------
+
+void kp69_device::lerl_pgrl_w(u8 data)
+{
+	if (m_ivr_written)
+		set_pgr((m_pgr & 0xff00) | data);
+	else
+		set_ler((m_ler & 0xff00) | data);
+}
+
+
+//-------------------------------------------------
+//  lerh_pgrh_w - write upper 8 bits of LER or PGR
+//-------------------------------------------------
+
+void kp69_device::lerh_pgrh_w(u8 data)
+{
+	if (m_ivr_written)
+		set_pgr(u16(data) << 8 | (m_pgr & 0x00ff));
+	else
+		set_ler(u16(data) << 8 | (m_ler & 0x00ff));
+}
+
+
+//-------------------------------------------------
+//  imrl_w - write lower 8 bits of IMR
+//-------------------------------------------------
+
+void kp69_device::imrl_w(u8 data)
+{
+	if (!m_ivr_written)
+		logerror("%s: IMRL written before IVR\n", machine().describe_context());
+
+	set_imr((m_imr & 0xff00) | data);
+}
+
+
+//-------------------------------------------------
+//  ivr_imrh_w - write IVR or upper 8 bits of IMR
+//-------------------------------------------------
+
+void kp69_device::ivr_imrh_w(u8 data)
+{
+	if (m_ivr_written)
+		set_imr(u16(data) << 8 | (m_imr & 0x00ff));
+	else
+	{
+		m_ivr = data & 0xe0;
+		m_ivr_written = true;
+	}
+}
+
+
+//-------------------------------------------------
+//  int_active - determine whether or not the INT
+//  output is currently active
+//-------------------------------------------------
+
+bool kp69_base_device::int_active() const
+{
+	if (m_illegal_state)
+		return false;
+
+	// Compare priority of pending interrupt request with any being serviced
+	if ((m_irr & m_pgr) != 0 || (m_isr & m_pgr) != 0)
+		return (m_irr & ~m_isr & m_pgr) > (m_isr & m_pgr);
+	else
+		return (m_irr & ~m_isr) > m_isr;
+}
+
+
+//-------------------------------------------------
+//  set_int - update the INT output state
+//-------------------------------------------------
+
+void kp69_base_device::set_int(bool active)
+{
+	if (m_int_active != active)
+	{
+		m_int_active = active;
+		m_int_callback(m_int_active ? ASSERT_LINE : CLEAR_LINE);
+	}
+}
+
+
+//-------------------------------------------------
+//  set_input_level - set the level state of one
+//  out of 16 interrupt inputs
+//-------------------------------------------------
+
+void kp69_base_device::set_input_level(int level, bool state)
+{
+	if (!BIT(m_input_levels, level) && state)
+	{
+		m_input_levels |= 1 << level;
+
+		// Masked-out interrupts cannot be requested
+		if (!BIT(m_irr, level) && !BIT(m_imr, level))
+		{
+			u16 old_ints = m_irr | m_isr;
+			m_irr |= 1 << level;
+			LOG("IRR[%d] asserted\n", level);
+			if (!m_illegal_state && (1 << level) > (BIT(m_pgr, level) ? old_ints & m_pgr : old_ints))
+				set_int(true);
+		}
+	}
+	else if (BIT(m_input_levels, level) && !state)
+	{
+		m_input_levels &= ~(1 << level);
+
+		// Level-triggered interrupts may be deasserted
+		if (!BIT(m_ler, level) && BIT(m_irr, level))
+		{
+			m_irr &= ~(1 << level);
+			LOG("IRR[%d] cleared\n", level);
+			if (!m_illegal_state)
+				set_int(int_active());
+		}
+	}
+}
+
+
+//-------------------------------------------------
+//  set_irr - write a new value to the Interrupt
+//  Request Register (not accessible by software)
+//-------------------------------------------------
+
+void kp69_base_device::set_irr(u16 data)
+{
+	m_irr = (data & ~m_imr & m_ler) | (m_irr & ~m_ler);
+	set_int(int_active());
+}
+
+
+//-------------------------------------------------
+//  set_isr - write a new value to the In Service
+//  Register (not writable by software)
+//-------------------------------------------------
+
+void kp69_base_device::set_isr(u16 data)
+{
+	m_isr = data;
+	set_int(int_active());
+}
+
+
+//-------------------------------------------------
+//  set_imr - write a new value to the Interrupt
+//  Mask Register
+//-------------------------------------------------
+
+void kp69_base_device::set_imr(u16 data)
+{
+	u16 old_irr = m_irr;
+	m_imr = data;
+	m_irr = (m_irr & ~data & m_ler) | (m_input_levels & ~data & ~m_ler);
+	if (m_irr != old_irr)
+	{
+		bool active = int_active();
+		if (active != m_int_active)
+			LOG("%s: INT %s (IRR = %04X, was %04X)\n", machine().describe_context(), active ? "unmasked" : "masked out", m_irr, old_irr);
+		set_int(active);
+	}
+}
+
+
+//-------------------------------------------------
+//  set_ler - write a new value to the Level/Edge
+//  Register
+//-------------------------------------------------
+
+void kp69_base_device::set_ler(u16 data)
+{
+	u16 old_irr = m_irr;
+	m_irr = (m_input_levels & ~data) | (m_irr & m_ler & data);
+	m_ler = data;
+	if (m_irr != old_irr)
+		set_int(int_active());
+}
+
+
+//-------------------------------------------------
+//  set_pgr - write a new value to the Priority
+//  Group Register
+//-------------------------------------------------
+
+void kp69_base_device::set_pgr(u16 data)
+{
+	if (m_pgr != data)
+	{
+		m_pgr = data;
+		if (!m_illegal_state && m_isr != 0)
+			set_int(int_active());
+	}
+}
+
+
+//-------------------------------------------------
+//  z80daisy_irq_state - return the overall IRQ
+//  state for this device
+//-------------------------------------------------
+
+int kp69_base_device::z80daisy_irq_state()
+{
+	return m_int_active ? (Z80_DAISY_INT | Z80_DAISY_IEO) : Z80_DAISY_IEO;
+}
+
+
+//-------------------------------------------------
+//  z80daisy_irq_ack - acknowledge an IRQ and
+//  return the appropriate vector
+//-------------------------------------------------
+
+int kp69_base_device::z80daisy_irq_ack()
+{
+	int level = -1;
+
+	// Restrict to high-priority interrupts if any of those are pending
+	if ((m_irr & m_pgr) != 0)
+	{
+		level = 31 - count_leading_zeros(u32(m_irr & m_pgr));
+		assert(level >= 0 && level < 16);
+		if ((1 << level) < (m_isr & m_pgr))
+			level = -1;
+	}
+	else if (m_irr != 0 && (m_isr & m_pgr) == 0)
+	{
+		level = 31 - count_leading_zeros(u32(m_irr));
+		assert(level >= 0 && level < 16);
+		if ((1 << level) < m_isr)
+			level = -1;
+	}
+
+	if (level != -1)
+	{
+		u8 vector = m_ivr | (level << 1);
+		if (BIT(m_ler, level))
+		{
+			LOG("%s: IRR[%d] acknowledged and cleared (vector = %02X)\n", machine().describe_context(), level, vector);
+			m_irr &= ~(1 << level);
+		}
+		else
+			LOG("%s: IR[%d] acknowledged (vector = %02X)\n", machine().describe_context(), level, vector);
+
+		m_isr |= 1 << level;
+		set_int(false);
+
+		return vector;
+	}
+
+	// Illegal interrupt operation: same vector as IR[0] but ISR[0] not set
+	LOG("%s: Illegal interrupt at IACK (vector = %02X)\n", machine().describe_context(), m_ivr);
+	m_illegal_state = true;
+	set_int(false);
+	return m_ivr;
+}
+
+
+//-------------------------------------------------
+//  z80daisy_irq_reti - clear the interrupt
+//  pending state to allow other interrupts through
+//-------------------------------------------------
+
+void kp69_base_device::z80daisy_irq_reti()
+{
+	if (m_illegal_state)
+	{
+		LOG("%s: End of illegal interrupt\n", machine().describe_context());
+		m_illegal_state = false;
+	}
+	else if (m_isr != 0)
+	{
+		int level = 31 - count_leading_zeros(u32((m_isr & m_pgr) != 0 ? (m_isr & m_pgr) : m_isr));
+		assert(level >= 0 && level < 16);
+
+		m_isr &= ~(1 << level);
+		LOG("%s: EOI for ISR[%d]\n", machine().describe_context(), level);
+	}
+	else
+	{
+		logerror("%s: RETI before interrupt acknowledged\n", machine().describe_context());
+		return;
+	}
+
+	set_int(int_active());
+}
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z80/kp69.h mame-0.224+dfsg.1/src/devices/cpu/z80/kp69.h
--- mame-0.222+dfsg.1/src/devices/cpu/z80/kp69.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z80/kp69.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,105 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***************************************************************************
+
+    Kawasaki Steel (Kawatetsu) KP69 Interrupt Controller
+
+***************************************************************************/
+
+#ifndef MAME_CPU_Z80_KP69_H
+#define MAME_CPU_Z80_KP69_H
+
+#pragma once
+
+#include "machine/z80daisy.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class kp69_base_device : public device_t, public device_z80daisy_interface
+{
+public:
+	// callback to CPU
+	auto int_callback() { return m_int_callback.bind(); }
+
+	// read handlers
+	u8 isrl_r();
+	u8 isrh_r();
+	u8 imrl_r();
+	u8 imrh_r();
+
+	// interrupt inputs
+	template <int N> DECLARE_WRITE_LINE_MEMBER(ir_w)
+	{
+		static_assert(N >= 0 && N < 16, "Invalid level");
+		set_input_level(N, state);
+	}
+
+	void add_to_state(device_state_interface &state, int index);
+
+protected:
+	// construction/destruction
+	kp69_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+
+	// device-level overrides
+	virtual void device_resolve_objects() override;
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	// device_z80daisy_interface overrides
+	virtual int z80daisy_irq_state() override;
+	virtual int z80daisy_irq_ack() override;
+	virtual void z80daisy_irq_reti() override;
+
+	// internal helpers
+	bool int_active() const;
+	void set_int(bool active);
+	void set_input_level(int level, bool state);
+	void set_irr(u16 data);
+	void set_isr(u16 data);
+	void set_imr(u16 data);
+	void set_ler(u16 data);
+	void set_pgr(u16 data);
+
+	// callback object
+	devcb_write_line m_int_callback;
+
+	// internal state
+	u16 m_input_levels;
+	u16 m_irr;
+	u16 m_isr;
+	bool m_illegal_state;
+	u8 m_ivr;
+	u16 m_imr;
+	u16 m_ler;
+	u16 m_pgr;
+	bool m_int_active;
+};
+
+class kp69_device : public kp69_base_device
+{
+public:
+	// device type constructor
+	kp69_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
+
+	// write handlers
+	void lerl_pgrl_w(u8 data);
+	void lerh_pgrh_w(u8 data);
+	void imrl_w(u8 data);
+	void ivr_imrh_w(u8 data);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+private:
+	bool m_ivr_written;
+};
+
+// device type declaration
+DECLARE_DEVICE_TYPE(KP69, kp69_device)
+
+#endif // MAME_CPU_Z80_KP69_H
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z80/ky80.cpp mame-0.224+dfsg.1/src/devices/cpu/z80/ky80.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/z80/ky80.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z80/ky80.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,56 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***************************************************************************
+
+    Taxan KY-80
+
+    This 160-pin QFP device seems to be a custom derivative of the
+    Kawasaki KC82 CPU core (fast Z80-like with built-in MMU). It seems
+    possible that it was built entirely out of Kawasaki LSI macrocells,
+    but the on-chip peripherals are at least mapped differently than in
+    either KL5C80A12 or KL5C80A16 (in the top 3/8ths of the I/O space
+    rather the bottom quarter).
+
+    On-chip features appear to include 1024 bytes of RAM, an interrupt
+    controller (not quite the same as KP69), 5 parallel ports and 2 8251-
+    like serial ports.
+
+***************************************************************************/
+
+#include "emu.h"
+#include "ky80.h"
+
+// device type definition
+DEFINE_DEVICE_TYPE(KY80, ky80_device, "ky80", "Taxan KY-80")
+
+
+//-------------------------------------------------
+//  ky80_device - constructor
+//-------------------------------------------------
+
+ky80_device::ky80_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: kc82_device(mconfig, KY80, tag, owner, clock,
+					address_map_constructor(FUNC(ky80_device::internal_ram), this),
+					address_map_constructor(FUNC(ky80_device::internal_io), this))
+{
+}
+
+
+//-------------------------------------------------
+//  internal_ram - map for high-speed internal RAM
+//-------------------------------------------------
+
+void ky80_device::internal_ram(address_map &map)
+{
+	map(0xffc00, 0xfffff).ram().share("ram");
+}
+
+
+//-------------------------------------------------
+//  internal_io - map for internal I/O registers
+//-------------------------------------------------
+
+void ky80_device::internal_io(address_map &map)
+{
+	map(0xa0, 0xa7).mirror(0xff00).rw(FUNC(ky80_device::mmu_r), FUNC(ky80_device::mmu_w));
+}
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z80/ky80.h mame-0.224+dfsg.1/src/devices/cpu/z80/ky80.h
--- mame-0.222+dfsg.1/src/devices/cpu/z80/ky80.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z80/ky80.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,42 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***************************************************************************
+
+    Taxan KY-80
+
+***************************************************************************/
+
+#ifndef MAME_CPU_Z80_KY80_H
+#define MAME_CPU_Z80_KY80_H
+
+#pragma once
+
+#include "kc82.h"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class ky80_device : public kc82_device
+{
+public:
+	// device type constructor
+	ky80_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+protected:
+	// device_execute_interface overrides
+	virtual u64 execute_clocks_to_cycles(u64 clocks) const noexcept override { return (clocks + 2 - 1) / 2; }
+	virtual u64 execute_cycles_to_clocks(u64 cycles) const noexcept override { return (cycles * 2); }
+
+private:
+	// internal address maps
+	void internal_ram(address_map &map);
+	void internal_io(address_map &map);
+};
+
+
+// device type declaration
+DECLARE_DEVICE_TYPE(KY80, ky80_device)
+
+#endif // MAME_CPU_Z80_KY80_H
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z80/z80.cpp mame-0.224+dfsg.1/src/devices/cpu/z80/z80.cpp
--- mame-0.222+dfsg.1/src/devices/cpu/z80/z80.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z80/z80.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -125,7 +125,7 @@
 
 /****************************************************************************/
 /* The Z80 registers. halt is set to 1 when the CPU is halted, the refresh  */
-/* register is calculated as follows: refresh=(r&127)|(r2&128)    */
+/* register is calculated as follows: refresh=(r&127)|(r2&128)              */
 /****************************************************************************/
 
 #define CF      0x01
@@ -400,7 +400,6 @@
  ***************************************************************/
 inline void z80_device::halt()
 {
-	PC--;
 	if (!m_halt)
 	{
 		m_halt = 1;
@@ -413,11 +412,10 @@
  ***************************************************************/
 inline void z80_device::leave_halt()
 {
-	if( m_halt )
+	if (m_halt)
 	{
 		m_halt = 0;
 		m_halt_cb(0);
-		PC++;
 	}
 }
 
@@ -440,7 +438,7 @@
 /***************************************************************
  * Read a byte from given memory location
  ***************************************************************/
-inline uint8_t z80_device::rm(uint16_t addr)
+uint8_t z80_device::rm(uint16_t addr)
 {
 	return m_data.read_byte(addr);
 }
@@ -457,7 +455,7 @@
 /***************************************************************
  * Write a byte to given memory location
  ***************************************************************/
-inline void z80_device::wm(uint16_t addr, uint8_t value)
+void z80_device::wm(uint16_t addr, uint8_t value)
 {
 	m_data.write_byte(addr, value);
 }
@@ -476,7 +474,7 @@
  * reading opcodes. In case of system with memory mapped I/O,
  * this function can be used to greatly speed up emulation
  ***************************************************************/
-inline uint8_t z80_device::rop()
+uint8_t z80_device::rop()
 {
 	unsigned pc = PCD;
 	PC++;
@@ -493,14 +491,14 @@
  * support systems that use different encoding mechanisms for
  * opcodes and opcode arguments
  ***************************************************************/
-inline uint8_t z80_device::arg()
+uint8_t z80_device::arg()
 {
 	unsigned pc = PCD;
 	PC++;
 	return m_args.read_byte(pc);
 }
 
-inline uint16_t z80_device::arg16()
+uint16_t z80_device::arg16()
 {
 	unsigned pc = PCD;
 	PC += 2;
@@ -2844,7 +2842,7 @@
  **********************************************************/
 OP(op,00) {                                                                       } /* NOP              */
 OP(op,01) { BC = arg16();                                                         } /* LD   BC,w        */
-OP(op,02) { wm(BC,A); WZ_L = (BC + 1) & 0xFF;  WZ_H = A;                          } /* LD (BC),A */
+OP(op,02) { wm(BC,A); WZ_L = (BC + 1) & 0xFF;  WZ_H = A;                          } /* LD (BC),A        */
 OP(op,03) { BC++;                                                                 } /* INC  BC          */
 OP(op,04) { B = inc(B);                                                           } /* INC  B           */
 OP(op,05) { B = dec(B);                                                           } /* DEC  B           */
@@ -2862,7 +2860,7 @@
 
 OP(op,10) { B--; jr_cond(B, 0x10);                                                } /* DJNZ o           */
 OP(op,11) { DE = arg16();                                                         } /* LD   DE,w        */
-OP(op,12) { wm(DE,A); WZ_L = (DE + 1) & 0xFF;  WZ_H = A;                          } /* LD (DE),A */
+OP(op,12) { wm(DE,A); WZ_L = (DE + 1) & 0xFF;  WZ_H = A;                          } /* LD (DE),A        */
 OP(op,13) { DE++;                                                                 } /* INC  DE          */
 OP(op,14) { D = inc(D);                                                           } /* INC  D           */
 OP(op,15) { D = dec(D);                                                           } /* DEC  D           */
@@ -2912,7 +2910,7 @@
 OP(op,3c) { A = inc(A);                                                           } /* INC  A           */
 OP(op,3d) { A = dec(A);                                                           } /* DEC  A           */
 OP(op,3e) { A = arg();                                                            } /* LD   A,n         */
-OP(op,3f) { F = ((F&(SF|ZF|YF|XF|PF|CF))|((F&CF)<<4)|(A&(YF|XF)))^CF;             } /* CCF        */
+OP(op,3f) { F = ((F&(SF|ZF|YF|XF|PF|CF))|((F&CF)<<4)|(A&(YF|XF)))^CF;             } /* CCF              */
 
 OP(op,40) {                                                                       } /* LD   B,B         */
 OP(op,41) { B = C;                                                                } /* LD   B,C         */
@@ -2974,7 +2972,7 @@
 OP(op,73) { wm(HL, E);                                                            } /* LD   (HL),E      */
 OP(op,74) { wm(HL, H);                                                            } /* LD   (HL),H      */
 OP(op,75) { wm(HL, L);                                                            } /* LD   (HL),L      */
-OP(op,76) { halt();                                                               } /* halt             */
+OP(op,76) { halt();                                                               } /* HALT             */
 OP(op,77) { wm(HL, A);                                                            } /* LD   (HL),A      */
 
 OP(op,78) { A = B;                                                                } /* LD   A,B         */
@@ -3088,7 +3086,7 @@
 OP(op,d8) { ret_cond(F & CF, 0xd8);                                               } /* RET  C           */
 OP(op,d9) { exx();                                                                } /* EXX              */
 OP(op,da) { jp_cond(F & CF);                                                      } /* JP   C,a         */
-OP(op,db) { unsigned n = arg() | (A << 8); A = in(n); WZ = n + 1;                 } /* IN   A,(n)  */
+OP(op,db) { unsigned n = arg() | (A << 8); A = in(n); WZ = n + 1;                 } /* IN   A,(n)       */
 OP(op,dc) { call_cond(F & CF, 0xdc);                                              } /* CALL C,a         */
 OP(op,dd) { m_r++; EXEC(dd,rop());                                                } /* **** DD xx       */
 OP(op,de) { sbc_a(arg());                                                         } /* SBC  A,n         */
@@ -3496,6 +3494,7 @@
 /****************************************************************************
  * Execute 'cycles' T-states.
  ****************************************************************************/
+
 void z80_device::execute_run()
 {
 	do
@@ -3508,50 +3507,35 @@
 		}
 
 		// check for interrupts before each instruction
-		if (m_nmi_pending)
-			take_nmi();
-		else if (m_irq_state != CLEAR_LINE && m_iff1 && !m_after_ei)
-			take_interrupt();
+		check_interrupts();
 
 		m_after_ei = false;
 		m_after_ldair = false;
 
 		PRVPC = PCD;
 		debugger_instruction_hook(PCD);
+
 		m_r++;
-		EXEC(op,rop());
-	} while (m_icount > 0);
-}
+		uint8_t opcode = rop();
 
-void nsc800_device::execute_run()
-{
-	do
-	{
-		if (m_wait_state)
+		// when in HALT state, the fetched opcode is not dispatched (aka a NOP)
+		if (m_halt)
 		{
-			// stalled
-			m_icount = 0;
-			return;
+			PC--;
+			opcode = 0;
 		}
-
-		// check for interrupts before each instruction
-		if (m_nmi_pending)
-			take_nmi();
-		else if ((m_nsc800_irq_state[NSC800_RSTA] != CLEAR_LINE || m_nsc800_irq_state[NSC800_RSTB] != CLEAR_LINE || m_nsc800_irq_state[NSC800_RSTC] != CLEAR_LINE) && m_iff1 && !m_after_ei)
-			take_interrupt_nsc800();
-		else if (m_irq_state != CLEAR_LINE && m_iff1 && !m_after_ei)
-			take_interrupt();
-
-		m_after_ei = false;
-		m_after_ldair = false;
-
-		PRVPC = PCD;
-		debugger_instruction_hook(PCD);
-		m_r++;
-		EXEC(op,rop());
+		EXEC(op,opcode);
 	} while (m_icount > 0);
 }
 
+void z80_device::check_interrupts()
+{
+	if (m_nmi_pending)
+		take_nmi();
+	else if (m_irq_state != CLEAR_LINE && m_iff1 && !m_after_ei)
+		take_interrupt();
+}
+
 void z80_device::execute_set_input(int inputnum, int state)
 {
 	switch (inputnum)
@@ -3585,6 +3569,16 @@
 	}
 }
 
+void nsc800_device::check_interrupts()
+{
+	if (m_nmi_pending)
+		take_nmi();
+	else if ((m_nsc800_irq_state[NSC800_RSTA] != CLEAR_LINE || m_nsc800_irq_state[NSC800_RSTB] != CLEAR_LINE || m_nsc800_irq_state[NSC800_RSTC] != CLEAR_LINE) && m_iff1 && !m_after_ei)
+		take_interrupt_nsc800();
+	else if (m_irq_state != CLEAR_LINE && m_iff1 && !m_after_ei)
+		take_interrupt();
+}
+
 void nsc800_device::execute_set_input(int inputnum, int state)
 {
 	switch (inputnum)
diff -Nru mame-0.222+dfsg.1/src/devices/cpu/z80/z80.h mame-0.224+dfsg.1/src/devices/cpu/z80/z80.h
--- mame-0.222+dfsg.1/src/devices/cpu/z80/z80.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/cpu/z80/z80.h	2020-08-26 08:57:19.000000000 +0000
@@ -148,13 +148,13 @@
 	void leave_halt();
 	uint8_t in(uint16_t port);
 	void out(uint16_t port, uint8_t value);
-	uint8_t rm(uint16_t addr);
+	virtual uint8_t rm(uint16_t addr);
 	void rm16(uint16_t addr, PAIR &r);
-	void wm(uint16_t addr, uint8_t value);
+	virtual void wm(uint16_t addr, uint8_t value);
 	void wm16(uint16_t addr, PAIR &r);
-	uint8_t rop();
-	uint8_t arg();
-	uint16_t arg16();
+	virtual uint8_t rop();
+	virtual uint8_t arg();
+	virtual uint16_t arg16();
 	void eax();
 	void eay();
 	void pop(PAIR &r);
@@ -229,6 +229,7 @@
 	void otdr();
 	void ei();
 
+	virtual void check_interrupts();
 	void take_interrupt();
 	void take_nmi();
 
@@ -299,9 +300,9 @@
 
 	// device_execute_interface overrides
 	virtual uint32_t execute_input_lines() const noexcept override { return 7; }
-	virtual void execute_run() override;
 	virtual void execute_set_input(int inputnum, int state) override;
 
+	virtual void check_interrupts() override;
 	void take_interrupt_nsc800();
 	uint8_t m_nsc800_irq_state[4]; /* state of NSC800 restart interrupts A, B, C */
 };
diff -Nru mame-0.222+dfsg.1/src/devices/imagedev/cassette.cpp mame-0.224+dfsg.1/src/devices/imagedev/cassette.cpp
--- mame-0.222+dfsg.1/src/devices/imagedev/cassette.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/imagedev/cassette.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -72,23 +72,11 @@
     cassette IO
 *********************************************************************/
 
-bool cassette_image_device::is_motor_on()
-{
-	if ((m_state & CASSETTE_MASK_UISTATE) == CASSETTE_STOPPED)
-		return false;
-	if ((m_state & CASSETTE_MASK_MOTOR) != CASSETTE_MOTOR_ENABLED)
-		return false;
-	else
-		return true;
-}
-
-
-
 void cassette_image_device::update()
 {
 	double cur_time = machine().time().as_double();
 
-	if (is_motor_on())
+	if (!is_stopped() && motor_on())
 	{
 		double new_position = m_position + (cur_time - m_position_time)*m_speed*m_direction;
 
@@ -170,7 +158,7 @@
 {
 	double position = m_position;
 
-	if (is_motor_on())
+	if (!is_stopped() && motor_on())
 		position += (machine().time().as_double() - m_position_time)*m_speed*m_direction;
 	return position;
 }
@@ -369,7 +357,7 @@
 	std::string result;
 
 	// only show the image when a cassette is loaded and the motor is on
-	if (exists() && is_motor_on())
+	if (exists() && !is_stopped() && motor_on())
 	{
 		static char const *const shapes[] = { u8"\u2500", u8"\u2572", u8"\u2502", u8"\u2571" };
 
diff -Nru mame-0.222+dfsg.1/src/devices/imagedev/cassette.h mame-0.224+dfsg.1/src/devices/imagedev/cassette.h
--- mame-0.222+dfsg.1/src/devices/imagedev/cassette.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/imagedev/cassette.h	2020-08-26 08:57:19.000000000 +0000
@@ -74,13 +74,23 @@
 	virtual const char *image_interface() const noexcept override { return m_interface; }
 	virtual const char *file_extensions() const noexcept override { return m_extension_list; }
 
+	double input();
+	void output(double value);
+
 	// specific implementation
 	cassette_state get_state() { return m_state; }
 	void set_state(cassette_state state) { change_state(state, cassette_state(~0)); }
 	void change_state(cassette_state state, cassette_state mask);
 
-	double input();
-	void output(double value);
+	// state getters/setters
+	bool is_stopped() { return (m_state & CASSETTE_MASK_UISTATE) == CASSETTE_STOPPED; }
+	bool is_playing() { return (m_state & CASSETTE_MASK_UISTATE) == CASSETTE_PLAY; }
+	bool is_recording() { return (m_state & CASSETTE_MASK_UISTATE) == CASSETTE_RECORD; }
+
+	void set_motor(int state) { change_state(state ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR); } // aka remote control
+	int motor_on() { return ((m_state & CASSETTE_MASK_MOTOR) == CASSETTE_MOTOR_ENABLED) ? 1 : 0; }
+	void set_speaker(int state) { change_state(state ? CASSETTE_SPEAKER_ENABLED : CASSETTE_SPEAKER_MUTED, CASSETTE_MASK_SPEAKER); }
+	int speaker_on() { return ((m_state & CASSETTE_MASK_SPEAKER) == CASSETTE_SPEAKER_ENABLED) ? 1 : 0; }
 
 	cassette_image *get_image() { return m_cassette; }
 	double get_position();
@@ -96,9 +106,6 @@
 	device_sound_interface& set_stereo() { m_stereo = true; return *this; }
 
 protected:
-	bool is_motor_on();
-	void update();
-
 	// device-level overrides
 	virtual void device_config_complete() override;
 	virtual void device_start() override;
@@ -107,12 +114,14 @@
 	// device_image_interface implementation
 	virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); }
 
+	void update();
+
 private:
 	cassette_image  *m_cassette;
 	cassette_state  m_state;
 	double          m_position;
 	double          m_position_time;
-	int32_t           m_value;
+	int32_t         m_value;
 	int             m_channel;
 	double          m_speed; // speed multiplier for tape speeds other than standard 1.875ips (used in adam driver)
 	int             m_direction; // direction select
diff -Nru mame-0.222+dfsg.1/src/devices/machine/6821pia.cpp mame-0.224+dfsg.1/src/devices/machine/6821pia.cpp
--- mame-0.222+dfsg.1/src/devices/machine/6821pia.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/6821pia.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -228,7 +228,8 @@
 			// assume pins are disconnected and simulate the internal pullups.
 			port_a_data = 0xff;
 
-			if (!m_logged_port_a_not_connected && (m_ddr_a != 0xff))
+			if (!m_logged_port_a_not_connected && (m_ddr_a != 0xff) &&
+				!machine().side_effects_disabled())
 			{
 				logerror("Warning! No port A read handler. Assuming pins 0x%02X not connected\n", m_ddr_a ^ 0xff);
 				m_logged_port_a_not_connected = true;
@@ -277,7 +278,8 @@
 			}
 			else
 			{
-				if (!m_logged_port_b_not_connected && (m_ddr_b != 0xff))
+				if (!m_logged_port_b_not_connected && (m_ddr_b != 0xff)
+					&& !machine().side_effects_disabled())
 				{
 					logerror("Error! No port B read handler. Three-state pins 0x%02X are undefined\n", m_ddr_b ^ 0xff);
 					m_logged_port_b_not_connected = true;
@@ -393,23 +395,26 @@
 {
 	uint8_t ret = get_in_a_value();
 
-	// IRQ flags implicitly cleared by a read
-	m_irq_a1 = false;
-	m_irq_a2 = false;
-	update_interrupts();
-
-	// CA2 is configured as output and in read strobe mode
-	if (c2_output(m_ctl_a) && c2_strobe_mode(m_ctl_a))
+	if (!machine().side_effects_disabled())
 	{
-		// this will cause a transition low
-		set_out_ca2(false);
+		// IRQ flags implicitly cleared by a read
+		m_irq_a1 = false;
+		m_irq_a2 = false;
+		update_interrupts();
 
-		// if the CA2 strobe is cleared by the E, reset it right away
-		if (strobe_e_reset(m_ctl_a))
-			set_out_ca2(true);
-	}
+		// CA2 is configured as output and in read strobe mode
+		if (c2_output(m_ctl_a) && c2_strobe_mode(m_ctl_a))
+		{
+			// this will cause a transition low
+			set_out_ca2(false);
+
+			// if the CA2 strobe is cleared by the E, reset it right away
+			if (strobe_e_reset(m_ctl_a))
+				set_out_ca2(true);
+		}
 
-	LOG("PIA port A read = %02X\n", ret);
+		LOG("PIA port A read = %02X\n", ret);
+	}
 
 	return ret;
 }
@@ -437,19 +442,23 @@
 {
 	const uint8_t ret = get_in_b_value();
 
-	// This read will implicitly clear the IRQ B1 flag.  If CB2 is in write-strobe
-	// mode with CB1 restore, and a CB1 active transition set the flag,
-	// clearing it will cause CB2 to go high again.  Note that this is different
-	// from what happens with port A.
-	if (m_irq_b1 && c2_strobe_mode(m_ctl_b) && strobe_c1_reset(m_ctl_b))
-		set_out_cb2(true);
-
-	// IRQ flags implicitly cleared by a read
-	m_irq_b1 = false;
-	m_irq_b2 = false;
-	update_interrupts();
+	if (!machine().side_effects_disabled())
+	{
+		// This read will implicitly clear the IRQ B1 flag.  If CB2 is
+		// in write-strobe mode with CB1 restore, and a CB1 active
+		// transition set the flag, clearing it will cause CB2 to go
+		// high again.  Note that this is different from what happens
+		// with port A.
+		if (m_irq_b1 && c2_strobe_mode(m_ctl_b) && strobe_c1_reset(m_ctl_b))
+			set_out_cb2(true);
+
+		// IRQ flags implicitly cleared by a read
+		m_irq_b1 = false;
+		m_irq_b2 = false;
+		update_interrupts();
 
-	LOG("PIA port B read = %02X\n", ret);
+		LOG("PIA port B read = %02X\n", ret);
+	}
 
 	return ret;
 }
@@ -477,25 +486,28 @@
 {
 	uint8_t ret;
 
-	// update CA1 & CA2 if callback exists, these in turn may update IRQ's
-	if (!m_in_ca1_handler.isnull())
+	if (!machine().side_effects_disabled())
 	{
-		ca1_w(m_in_ca1_handler());
-	}
-	else if(!m_logged_ca1_not_connected && (!m_in_ca1_pushed))
-	{
-		logerror("Warning! No CA1 read handler. Assuming pin not connected\n");
-		m_logged_ca1_not_connected = true;
-	}
+		// update CA1 & CA2 if callback exists, these in turn may update IRQ's
+		if (!m_in_ca1_handler.isnull())
+		{
+			ca1_w(m_in_ca1_handler());
+		}
+		else if(!m_logged_ca1_not_connected && (!m_in_ca1_pushed))
+		{
+			logerror("Warning! No CA1 read handler. Assuming pin not connected\n");
+			m_logged_ca1_not_connected = true;
+		}
 
-	if (!m_in_ca2_handler.isnull())
-	{
-		ca2_w(m_in_ca2_handler());
-	}
-	else if ( !m_logged_ca2_not_connected && c2_input(m_ctl_a) && !m_in_ca2_pushed)
-	{
-		logerror("Warning! No CA2 read handler. Assuming pin not connected\n");
-		m_logged_ca2_not_connected = true;
+		if (!m_in_ca2_handler.isnull())
+		{
+			ca2_w(m_in_ca2_handler());
+		}
+		else if ( !m_logged_ca2_not_connected && c2_input(m_ctl_a) && !m_in_ca2_pushed)
+		{
+			logerror("Warning! No CA2 read handler. Assuming pin not connected\n");
+			m_logged_ca2_not_connected = true;
+		}
 	}
 
 	// read control register
@@ -522,21 +534,24 @@
 {
 	uint8_t ret;
 
-	// update CB1 & CB2 if callback exists, these in turn may update IRQ's
-	if(!m_in_cb1_handler.isnull())
-	{
-		cb1_w(m_in_cb1_handler());
-	}
-	else if(!m_logged_cb1_not_connected && !m_in_cb1_pushed)
+	if (!machine().side_effects_disabled())
 	{
-		logerror("Error! no CB1 read handler. Three-state pin is undefined\n");
-		m_logged_cb1_not_connected = true;
-	}
+		// update CB1 & CB2 if callback exists, these in turn may update IRQ's
+		if(!m_in_cb1_handler.isnull())
+		{
+			cb1_w(m_in_cb1_handler());
+		}
+		else if(!m_logged_cb1_not_connected && !m_in_cb1_pushed)
+		{
+			logerror("Error! no CB1 read handler. Three-state pin is undefined\n");
+			m_logged_cb1_not_connected = true;
+		}
 
-	if(!m_logged_cb2_not_connected && c2_input(m_ctl_b) && !m_in_cb2_pushed)
-	{
-		logerror("Error! Three-state pin is undefined\n");
-		m_logged_cb2_not_connected = true;
+		if(!m_logged_cb2_not_connected && c2_input(m_ctl_b) && !m_in_cb2_pushed)
+		{
+			logerror("Error! Three-state pin is undefined\n");
+			m_logged_cb2_not_connected = true;
+		}
 	}
 
 	// read control register
diff -Nru mame-0.222+dfsg.1/src/devices/machine/6821pia.h mame-0.224+dfsg.1/src/devices/machine/6821pia.h
--- mame-0.222+dfsg.1/src/devices/machine/6821pia.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/6821pia.h	2020-08-26 08:57:19.000000000 +0000
@@ -57,7 +57,7 @@
 	uint8_t read_alt(offs_t offset) { return read(((offset << 1) & 0x02) | ((offset >> 1) & 0x01)); }
 	void write_alt(offs_t offset, uint8_t data) { write(((offset << 1) & 0x02) | ((offset >> 1) & 0x01), data); }
 
-	uint8_t port_b_z_mask() const { return ~m_ddr_b; }          // see first note in .c
+	uint8_t port_b_z_mask() const { return ~m_ddr_b; } // see notes
 
 	void porta_w(uint8_t data);
 	void write_porta_line(int line, bool state);
diff -Nru mame-0.222+dfsg.1/src/devices/machine/6840ptm.cpp mame-0.224+dfsg.1/src/devices/machine/6840ptm.cpp
--- mame-0.222+dfsg.1/src/devices/machine/6840ptm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/6840ptm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -324,17 +324,18 @@
 	if (m_control_reg[counter] & INTERNAL_CLK_EN)
 	{
 		clk = static_cast<double>(clock());
-		LOGMASKED(LOG_COUNTERS, "Timer #%d internal clock freq %f \n", counter + 1, clk);
 	}
 	else
 	{
 		clk = m_external_clock[counter];
-		if (counter == 2)
-		{
-			clk /= m_t3_divisor;
-		}
-		LOGMASKED(LOG_COUNTERS, "Timer #%d external clock freq %f \n", counter + 1, clk);
 	}
+
+	if (counter == 2)
+	{
+		clk /= m_t3_divisor;
+	}
+	LOGMASKED(LOG_COUNTERS, "Timer #%d %s clock freq %f \n", counter + 1, (m_control_reg[counter] & INTERNAL_CLK_EN) ? "internal" : "external", clk);
+
 	// See how many are left
 	int remaining = (m_timer[counter]->remaining() * clk).as_double();
 
@@ -346,6 +347,7 @@
 		int lsb = remaining % divisor;
 		remaining = (msb << 8) | lsb;
 	}
+
 	LOGMASKED(LOG_COUNTERS, "Timer #%d read counter: %d\n", counter + 1, remaining);
 	return remaining;
 }
@@ -506,9 +508,9 @@
 		{
 			int idx = (offset == 1) ? 1 : (m_control_reg[1] & CR1_SELECT) ? 0 : 2;
 			uint8_t diffs = data ^ m_control_reg[idx];
-			m_t3_divisor = (m_control_reg[2] & T3_PRESCALE_EN) ? 8 : 1;
 			m_mode[idx] = (data >> 3) & 0x07;
 			m_control_reg[idx] = data;
+			m_t3_divisor = (m_control_reg[2] & T3_PRESCALE_EN) ? 8 : 1;
 
 			LOGMASKED(LOG_CONTROL, "Control register #%d selected\n", idx + 1);
 			LOGMASKED(LOG_CONTROL, "operation mode   = %s\n", opmode[m_mode[idx]]);
diff -Nru mame-0.222+dfsg.1/src/devices/machine/6850acia.cpp mame-0.224+dfsg.1/src/devices/machine/6850acia.cpp
--- mame-0.222+dfsg.1/src/devices/machine/6850acia.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/6850acia.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,7 +2,7 @@
 // copyright-holders:smf
 /*********************************************************************
 
-    6850acia.c
+    6850acia.cpp
 
     6850 ACIA code
 
@@ -92,6 +92,7 @@
 	, m_irq(0)
 	, m_txc(0)
 	, m_txd(0)
+	, m_tx_state(0)
 	, m_tx_counter(0)
 	, m_tx_irq_enable(false)
 	, m_rxc(0)
diff -Nru mame-0.222+dfsg.1/src/devices/machine/8042kbdc.cpp mame-0.224+dfsg.1/src/devices/machine/8042kbdc.cpp
--- mame-0.222+dfsg.1/src/devices/machine/8042kbdc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/8042kbdc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -72,6 +72,7 @@
 	m_last_write_to_control = 0;
 	m_status_read_mode = 0;
 	m_speaker = 0;
+	m_offset1 = 0;
 
 	m_update_timer = timer_alloc(TIMER_UPDATE);
 	m_update_timer->adjust(attotime::never);
@@ -208,7 +209,8 @@
 	if (id == TIMER_UPDATE)
 	{
 		at_8042_check_keyboard();
-		at_8042_check_mouse();
+		if (m_mouse.on)
+			at_8042_check_mouse();
 	}
 }
 
@@ -276,7 +278,8 @@
 
 	case 4:
 		at_8042_check_keyboard();
-		at_8042_check_mouse();
+		if (m_mouse.on)
+			at_8042_check_mouse();
 
 		if (m_keyboard.received || m_mouse.received)
 			data |= 1;
@@ -320,7 +323,7 @@
 		switch (m_operation_write_state) {
 		case 0:
 			m_data = data;
-			m_sending=1;
+			m_sending = 1;
 			m_keyboard_dev->write(data);
 			break;
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/arm_iomd.cpp mame-0.224+dfsg.1/src/devices/machine/arm_iomd.cpp
--- mame-0.222+dfsg.1/src/devices/machine/arm_iomd.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/arm_iomd.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -308,7 +308,10 @@
 
 	m_sound_dma_on = false;
 	for (i=0; i<sounddma_ch_size; i++)
+	{
 		m_sndbuffer_ok[i] = false;
+		m_sndcur_reg[i] = 0;
+	}
 
 	// ...
 }
diff -Nru mame-0.222+dfsg.1/src/devices/machine/chessmachine.cpp mame-0.224+dfsg.1/src/devices/machine/chessmachine.cpp
--- mame-0.222+dfsg.1/src/devices/machine/chessmachine.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/chessmachine.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -131,7 +131,7 @@
 {
 	map(0x00000000, 0x000fffff).ram().share("ram");
 	map(0x00000000, 0x0000007f).r(FUNC(chessmachine_device::bootstrap_r));
-	map(0x00400000, 0x00400000).mirror(0x003ffffc).rw(FUNC(chessmachine_device::internal_r), FUNC(chessmachine_device::internal_w));
+	map(0x00400000, 0x00400003).mirror(0x003ffffc).rw(FUNC(chessmachine_device::internal_r), FUNC(chessmachine_device::internal_w)).umask32(0x000000ff);
 	map(0x01800000, 0x01800003).r(FUNC(chessmachine_device::disable_bootstrap_r));
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/cop452.cpp mame-0.224+dfsg.1/src/devices/machine/cop452.cpp
--- mame-0.222+dfsg.1/src/devices/machine/cop452.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/cop452.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,345 @@
+// license:BSD-3-Clause
+// copyright-holders:F. Ulivi
+/***************************************************************************
+
+    cop452.h
+
+    Frequency generator & counter
+
+***************************************************************************/
+
+#include "emu.h"
+#include "cop452.h"
+
+// Debugging
+//#define VERBOSE LOG_GENERAL
+#define VERBOSE 0
+#include "logmacro.h"
+
+// Device type definition
+DEFINE_DEVICE_TYPE(COP452, cop452_device, "cop452", "National Semiconductor COP452 frequency generator")
+
+cop452_device::cop452_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+: device_t(mconfig , COP452 , tag , owner , clock)
+	, m_out_handlers(*this)
+{
+}
+
+WRITE_LINE_MEMBER(cop452_device::cs_w)
+{
+	m_cs = state;
+	if (m_cs) {
+		// CS removed
+		m_spi_state = 0;
+		m_sr = 0;
+	}
+}
+
+WRITE_LINE_MEMBER(cop452_device::sk_w)
+{
+	if (!m_cs && !m_sk && state) {
+		// Rising edge on SK
+		LOG("bit %d %u\n" , m_di , m_spi_state);
+		if (m_spi_state == 0 && m_di) {
+			// Got start bit
+			m_spi_state = 1;
+		} else if (m_spi_state >= 1 && m_spi_state < 6) {
+			// Shifting instruction in
+			m_sr = (m_sr << 1) | m_di;
+			m_spi_state++;
+			if (m_spi_state == 6) {
+				LOG("Inst = %x\n" , m_sr);
+				m_spi_state = 22;
+				unsigned idx = !BIT(m_sr , 0);
+				char reg = idx ? 'B' : 'A';
+				switch (m_sr) {
+				case 0b00000:
+				case 0b00001:
+					// LDRA/B
+					LOG("LDR%c\n" , reg);
+					m_spi_state = 6;
+					m_reg[ idx ] = 0;
+					break;
+
+				case 0b00010:
+				case 0b00011:
+					// RDRA/B
+					// TODO: not implemented ATM
+					LOG("RDR%c\n" , reg);
+					break;
+
+				case 0b00100:
+				case 0b00101:
+					// TRCA/B
+					LOG("TRC%c\n" , reg);
+					m_cnt[ idx ] = m_reg[ idx ];
+					set_timer(idx);
+					break;
+
+				case 0b00110:
+				case 0b00111:
+					// TCRA/B
+					// TODO:
+					LOG("TCR%c\n" , reg);
+					break;
+
+				case 0b01000:
+					// CK1
+					LOG("CK1\n");
+					m_clk_div_4 = false;
+					break;
+
+				case 0b01001:
+					// CK4
+					LOG("CK4\n");
+					m_clk_div_4 = true;
+					break;
+
+				default:
+					if (m_sr & 0b10000) {
+						// LDM
+						m_mode = m_sr & 0b01111;
+						LOG("LDM %x\n" , m_mode);
+						set_timer(0);
+						set_timer(1);
+						if (m_mode == MODE_NUMBER_PULSES) {
+							// Always start with OA = 1
+							set_output(0 , true);
+						} else if (m_mode == MODE_WHITE_NOISE ||
+								   m_mode == MODE_GATED_WHITE) {
+							// Preset bit 15 & 16 of register A when entering
+							// white noise modes
+							m_reg[ 0 ] |= 0x8000;
+							m_regA_b16 = true;
+						}
+					} else {
+						// Unknown instruction
+						LOG("Unknown instruction\n");
+					}
+					break;
+				}
+			}
+		} else if (m_spi_state >= 6 && m_spi_state < 22) {
+			// Loading A/B register
+			unsigned idx = !BIT(m_sr , 0);
+			char reg = idx ? 'B' : 'A';
+			m_reg[ idx ] = (m_reg[ idx ] << 1) | m_di;
+			m_spi_state++;
+			if (m_spi_state == 22) {
+				LOG("REG%c = %04x\n" , reg , m_reg[ idx ]);
+			}
+		}
+	}
+	m_sk = state;
+}
+
+WRITE_LINE_MEMBER(cop452_device::di_w)
+{
+	m_di = state;
+}
+
+READ_LINE_MEMBER(cop452_device::do_r)
+{
+	// TODO:
+	return 0;
+}
+
+void cop452_device::device_start()
+{
+	m_out_handlers.resolve_all_safe();
+
+	m_timers[ 0 ] = timer_alloc(0);
+	m_timers[ 1 ] = timer_alloc(1);
+
+	save_item(NAME(m_mode));
+	save_item(NAME(m_clk_div_4));
+	save_item(NAME(m_cs));
+	save_item(NAME(m_sk));
+	save_item(NAME(m_di));
+	save_item(NAME(m_out));
+	save_item(NAME(m_regA_b16));
+	save_item(NAME(m_reg));
+	save_item(NAME(m_cnt));
+	save_item(NAME(m_spi_state));
+	save_item(NAME(m_sr));
+}
+
+void cop452_device::device_reset()
+{
+	// Set reset mode
+	m_mode = MODE_RESET;
+	m_clk_div_4 = true;
+	m_out[ 0 ] = m_out[ 1 ] = true;
+	set_output(0 , false);
+	set_output(1 , false);
+	m_spi_state = 0;
+	m_sr = 0;
+	m_timers[ 0 ]->reset();
+	m_timers[ 1 ]->reset();
+}
+
+void cop452_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	switch (m_mode) {
+	case MODE_DUAL_FREQ:
+		toggle_n_reload(id);
+		break;
+
+	case MODE_TRIG_PULSE:
+		// TODO: NOT IMPLEMENTED
+		break;
+
+	case MODE_NUMBER_PULSES:
+		if (id == 0) {
+			toggle_n_reload(0);
+			if (!m_out[ 0 ]) {
+				// It seems that cnt B decrements each time OA goes low
+				if (m_cnt[ 1 ] != 0) {
+					m_cnt[ 1 ]--;
+				} else {
+					// End of pulse train
+					toggle_n_reload(1);
+					m_mode = MODE_RESET;
+				}
+			}
+		}
+		break;
+
+	case MODE_DUTY_CYCLE:
+		// TODO: NOT IMPLEMENTED
+		break;
+
+	case MODE_FREQ_COUNT:
+		// TODO: NOT IMPLEMENTED
+		break;
+
+	case MODE_DUAL_COUNT:
+		// TODO: NOT IMPLEMENTED
+		break;
+
+	case MODE_WAVE_MEAS:
+		// TODO: NOT IMPLEMENTED
+		break;
+
+	case MODE_TRIG_COUNT:
+		// TODO: NOT IMPLEMENTED
+		break;
+
+	case MODE_WHITE_NOISE:
+	case MODE_GATED_WHITE:
+		{
+			if (id == 0) {
+				// Reg A & its 17th bit (m_regA_b16) form a 17-bit LFSR
+				// LFSR uses X^17+X^14+1 polynomial to generate a pseudo-random
+				// maximal-length sequence
+				bool feedback = m_regA_b16 ^ BIT(m_reg[ 0 ] , 13);
+				m_regA_b16 = BIT(m_reg[ 0 ] , 15);
+				m_reg[ 0 ] <<= 1;
+				m_reg[ 0 ] |= feedback;
+			} else {
+				toggle_n_reload(1);
+			}
+			bool new_out_0 = m_regA_b16;
+			if (m_mode == MODE_GATED_WHITE) {
+				new_out_0 &= m_out[ 1 ];
+			}
+			set_output(0 , new_out_0);
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	set_timer(id);
+}
+
+attotime cop452_device::counts_to_attotime(unsigned counts) const
+{
+	if (m_clk_div_4) {
+		return clocks_to_attotime((counts + 1) * 4);
+	} else {
+		return clocks_to_attotime(counts + 1);
+	}
+}
+
+void cop452_device::set_timer(unsigned idx)
+{
+	attotime target = attotime::never;
+
+	switch (m_mode) {
+	case MODE_DUAL_FREQ:
+		// Cnt A & B count independently
+		target = counts_to_attotime(m_cnt[ idx ]);
+		break;
+
+	case MODE_TRIG_PULSE:
+		// TODO: NOT IMPLEMENTED
+		break;
+
+	case MODE_NUMBER_PULSES:
+		// Cnt A generates OA frequency
+		// Cnt B counts the periods to output
+		if (idx == 0) {
+			target = counts_to_attotime(m_cnt[ 0 ]);
+		}
+		break;
+
+	case MODE_DUTY_CYCLE:
+		// TODO: NOT IMPLEMENTED
+		break;
+
+	case MODE_FREQ_COUNT:
+		// TODO: NOT IMPLEMENTED
+		break;
+
+	case MODE_DUAL_COUNT:
+		// TODO: NOT IMPLEMENTED
+		break;
+
+	case MODE_WAVE_MEAS:
+		// TODO: NOT IMPLEMENTED
+		break;
+
+	case MODE_TRIG_COUNT:
+		// TODO: NOT IMPLEMENTED
+		break;
+
+	case MODE_WHITE_NOISE:
+	case MODE_GATED_WHITE:
+		// Cnt A is not used. Timer 0 expires once per internal clock period.
+		// Cnt B generates squarewave signal on OB
+		if (idx == 0) {
+			target = counts_to_attotime(0);
+		} else {
+			target = counts_to_attotime(m_cnt[ 1 ]);
+		}
+		break;
+
+	default:
+		break;
+	}
+
+	m_timers[ idx ]->adjust(target);
+}
+
+void cop452_device::set_output(unsigned idx , bool state)
+{
+	if (m_out[ idx ] != state) {
+		m_out[ idx ] = state;
+		LOG("OUT %u=%d @%s\n" , idx , state , machine().time().as_string());
+		m_out_handlers[ idx ](state);
+	}
+}
+
+void cop452_device::toggle_output(unsigned idx)
+{
+	set_output(idx , !m_out[ idx ]);
+}
+
+void cop452_device::toggle_n_reload(unsigned idx)
+{
+	// Toggle output OA/OB and reload its associated counter
+	toggle_output(idx);
+	m_cnt[ idx ] = m_reg[ idx ];
+}
diff -Nru mame-0.222+dfsg.1/src/devices/machine/cop452.h mame-0.224+dfsg.1/src/devices/machine/cop452.h
--- mame-0.222+dfsg.1/src/devices/machine/cop452.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/cop452.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,96 @@
+// license:BSD-3-Clause
+// copyright-holders:F. Ulivi
+/***************************************************************************
+
+    cop452.h
+
+    Frequency generator & counter
+
+****************************************************************************
+                                ____   ____
+                        ZO   1 |*   \_/    | 14   ZI
+                        OA   2 |           | 13   DO
+                        INB  3 |           | 12   DI
+                        ENB  4 |  COP452   | 11   SK
+                        OB   5 |           | 10  CS/
+                        Vcc  6 |           |  9  GND
+                        CKO  7 |___________|  8  CKI
+
+***************************************************************************/
+
+#ifndef MAME_MACHINE_COP452_H
+#define MAME_MACHINE_COP452_H
+
+#pragma once
+
+class cop452_device : public device_t
+{
+public:
+	cop452_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
+
+	// SPI I/O
+	DECLARE_WRITE_LINE_MEMBER(cs_w);
+	DECLARE_WRITE_LINE_MEMBER(sk_w);
+	DECLARE_WRITE_LINE_MEMBER(di_w);
+	DECLARE_READ_LINE_MEMBER(do_r);
+
+	// Signal outputs
+	auto oa_w() { return m_out_handlers[ 0 ].bind(); }
+	auto ob_w() { return m_out_handlers[ 1 ].bind(); }
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+private:
+	// Index 0 is for "A" side, 1 is for "B" side
+	devcb_write_line::array<2> m_out_handlers;
+
+	// Timers
+	emu_timer *m_timers[ 2 ];
+
+	// State
+	uint8_t m_mode;
+	bool m_clk_div_4;
+	bool m_cs;
+	bool m_sk;
+	bool m_di;
+	bool m_out[ 2 ];
+	bool m_regA_b16;
+	uint16_t m_reg[ 2 ];
+	uint16_t m_cnt[ 2 ];
+	// 0    : idle
+	// 1..5 : shifting instruction in
+	// 6..21: shifting register in
+	// >= 22: done
+	unsigned m_spi_state;
+	uint8_t m_sr;
+
+	// Operating modes
+	enum : uint8_t {
+					MODE_DUAL_FREQ,     // 0000 Dual frequency
+					MODE_TRIG_PULSE,    // 0001 Triggered pulse
+					MODE_NUMBER_PULSES, // 0010 Number of pulses
+					MODE_DUTY_CYCLE,    // 0011 Duty cycle
+					MODE_FREQ_COUNT,    // 0100 Frequency and count
+					MODE_DUAL_COUNT,    // 0101 Dual count
+					MODE_WAVE_MEAS,     // 0110 Waveform measurement
+					MODE_TRIG_COUNT,    // 0111 Triggered pulse and count
+					MODE_WHITE_NOISE,   // 1000 White noise & frequency
+					MODE_GATED_WHITE,   // 1001 Gated white noise
+					MODE_RESET = 15     // 1111 Reset
+	};
+
+	attotime counts_to_attotime(unsigned counts) const;
+	void set_timer(unsigned idx);
+	void set_output(unsigned idx , bool state);
+	void toggle_output(unsigned idx);
+	void toggle_n_reload(unsigned idx);
+};
+
+// device type definition
+DECLARE_DEVICE_TYPE(COP452, cop452_device)
+
+#endif // MAME_MACHINE_COP452_H
diff -Nru mame-0.222+dfsg.1/src/devices/machine/dp8390.cpp mame-0.224+dfsg.1/src/devices/machine/dp8390.cpp
--- mame-0.222+dfsg.1/src/devices/machine/dp8390.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/dp8390.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,7 +3,7 @@
 #include "emu.h"
 #include "dp8390.h"
 
-#define DP8390_BYTE_ORDER(w) ((m_regs.dcr & 3) == 3 ? ((data << 8) | (data >> 8)) : data)
+#define DP8390_BYTE_ORDER(w) ((m_regs.dcr & 3) == 3 ? swapendian_int16(data) : data)
 #define LOOPBACK (!(m_regs.dcr & 8) && (m_regs.tcr & 6))
 
 DEFINE_DEVICE_TYPE(DP8390D,  dp8390d_device,  "dp8390d",  "DP8390D NIC")
diff -Nru mame-0.222+dfsg.1/src/devices/machine/e05a30.h mame-0.224+dfsg.1/src/devices/machine/e05a30.h
--- mame-0.222+dfsg.1/src/devices/machine/e05a30.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/e05a30.h	2020-08-26 08:57:19.000000000 +0000
@@ -39,6 +39,8 @@
 	DECLARE_WRITE_LINE_MEMBER( centronics_input_data6 ) { if (state) m_centronics_data |= 0x40; else m_centronics_data &= ~0x40; }
 	DECLARE_WRITE_LINE_MEMBER( centronics_input_data7 ) { if (state) m_centronics_data |= 0x80; else m_centronics_data &= ~0x80; }
 
+		int ready_led() { return !m_centronics_busy; }
+
 protected:
 	// device-level overrides
 	virtual void device_start() override;
diff -Nru mame-0.222+dfsg.1/src/devices/machine/exorterm.cpp mame-0.224+dfsg.1/src/devices/machine/exorterm.cpp
--- mame-0.222+dfsg.1/src/devices/machine/exorterm.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/exorterm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,903 @@
+// license:BSD-3-Clause
+// copyright-holders: 68bit
+/****************************************************************************
+
+Motorola EXORterm 155 (M68SDS)
+
+The terminfo database has an entry for this terminal named 'ex155'.
+
+TODO
+ - Keyboard layout. All the codes appear to have been implemented following
+   the manual but have not been checked with hardware. The key repetition
+   rate and delay need to be checked.
+ - Video character ROM needs dumping. An apparently close Motorola published
+   7x9 character set has been substituted for now, but three of the codes
+   (0x1a, 0x1b, and 0x1c) do not match the characters listed in the manual.
+
+****************************************************************************/
+
+#include "emu.h"
+#include "machine/exorterm.h"
+#include "speaker.h"
+
+#include "exorterm155.lh"
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+exorterm155_device::exorterm155_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+	: device_t(mconfig, type, tag, owner, clock)
+	, m_maincpu(*this, "maincpu")
+	, m_irqs(*this, "irqs")
+	, m_acia(*this, "acia")
+	, m_brg(*this, "brg")
+	, m_rs232_baud(*this, "RS232_BAUD")
+	, m_disable_fac(*this, "DISABLE_FAC")
+	, m_display_fac(*this, "DISPLAY_FAC")
+	, m_pia_kbd(*this, "pia_kbd")
+	, m_pia_cfg(*this, "pia_cfg")
+	, m_pia_disp(*this, "pia_disp")
+	, m_screen(*this, "screen")
+	, m_palette(*this, "palette")
+	, m_sys_timer_clock(*this, "sys_timer_clock")
+	, m_vram(*this, "videoram")
+	, m_chargen(*this, "chargen")
+	, m_beeper(*this, "beeper")
+	, m_online_led(*this, "online_led")
+	, m_auto_lf_led(*this, "auto_lf_led")
+	, m_page_mode_led(*this, "page_mode_led")
+	, m_insert_char_led(*this, "insert_char_led")
+	, m_rs232_conn_txd_handler(*this)
+	, m_rs232_conn_dtr_handler(*this)
+	, m_rs232_conn_rts_handler(*this)
+	  // Keyboard
+	, m_kbd_scan_timer(nullptr)
+	, m_kbd_repeat_timer(nullptr)
+	, m_kbd_modifiers(*this, "KBD_MOD")
+	, m_kbd_rows(*this, "KBD_ROW%u", 0)
+	, m_kbd_next_row(0)
+	, m_kbd_processing(0)
+	, m_kbd_repeat_row(0)
+	, m_kbd_repeat_column(0)
+	, m_kbd_last_modifiers(0)
+{
+}
+
+exorterm155_device::exorterm155_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: exorterm155_device(mconfig, EXORTERM155, tag, owner, clock)
+{
+}
+
+//**************************************************************************
+//  ADDRESS MAPS
+//**************************************************************************
+
+void exorterm155_device::mem_map(address_map &map)
+{
+	// 2 x 1Kx4 static RAM.
+	map(0x0000, 0x03ff).ram(); // Scratch RAM
+
+	map(0xa000, 0xa7ff).rom(); // U89  68K edit mode
+	//map(0xa800, 0xafff).rom(); // U70 (reserved)
+	//map(0xb000, 0xb7ff).rom(); // U59 (reserved)
+	map(0xc000, 0xc7ff).rom(); // U49  Extended display
+	map(0xc800, 0xcfff).rom(); // U104 Basic display #1
+	map(0xd000, 0xd7ff).rom(); // U98  Basic display #2
+	// Appears to mirror to ff00-ffff for the reset vectors.
+	map(0xd800, 0xdfff).rom().mirror(0x2000); // U78  Terminal control
+
+	// 4 x 1Kx4 static RAM.
+	map(0xe000, 0xe7ff).ram().share(m_vram);
+
+	map(0xef00, 0xef01).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write));
+	map(0xef04, 0xef07).rw(m_pia_kbd, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0xef08, 0xef0b).rw(m_pia_cfg, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0xef0c, 0xef0f).rw(m_pia_disp, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+}
+
+
+//**************************************************************************
+//  INPUT PORT DEFINITIONS
+//**************************************************************************
+
+INPUT_PORTS_START( exorterm155 )
+
+	PORT_START("DISABLE_FAC")
+	PORT_DIPNAME(0x01, 0x01, "Disable FAC codes") PORT_DIPLOCATION("SW1:1")
+	PORT_DIPSETTING(0x00, "On")
+	PORT_DIPSETTING(0x01, "Off")
+
+	PORT_START("DISPLAY_FAC")
+	PORT_DIPNAME(0x01, 0x01, "Display FAC codes") PORT_DIPLOCATION("SW1:2")
+	PORT_DIPSETTING(0x00, "On")
+	PORT_DIPSETTING(0x01, "Off")
+
+	PORT_START("DIP_SWITCHES_A")
+	PORT_DIPNAME(0x01, 0x01, "Stop bits") PORT_DIPLOCATION("SW2:5")
+	PORT_DIPSETTING(0x00, "2")
+	PORT_DIPSETTING(0x01, "1")
+	PORT_DIPNAME(0x02, 0x02, "Duplex") PORT_DIPLOCATION("SW2:1")
+	PORT_DIPSETTING(0x00, "Half")
+	PORT_DIPSETTING(0x02, "Full")
+	PORT_DIPNAME(0x04, 0x04, "Parity") PORT_DIPLOCATION("SW2:2")
+	PORT_DIPSETTING(0x00, "Yes")
+	PORT_DIPSETTING(0x04, "No")
+	PORT_DIPNAME(0x08, 0x08, "Parity") PORT_DIPLOCATION("SW2:3")
+	PORT_DIPSETTING(0x00, "Odd")
+	PORT_DIPSETTING(0x08, "Even")
+	PORT_DIPNAME(0x10, 0x00, "Word size") PORT_DIPLOCATION("SW2:4")
+	PORT_DIPSETTING(0x00, "8-bit")
+	PORT_DIPSETTING(0x10, "7-bit")
+	PORT_DIPNAME(0x20, 0x00, "Connection") PORT_DIPLOCATION("SW2:6")
+	PORT_DIPSETTING(0x00, "Direct")
+	PORT_DIPSETTING(0x20, "Modem")
+	PORT_DIPNAME(0x40, 0x40, "Modem Type") PORT_DIPLOCATION("SW2:7")
+	PORT_DIPSETTING(0x00, "202")
+	PORT_DIPSETTING(0x40, "103")
+	PORT_DIPNAME(0x80, 0x80, "Turnaround") PORT_DIPLOCATION("SW2:8")
+	PORT_DIPSETTING(0x00, "Code")
+	PORT_DIPSETTING(0x80, "S-chan")
+
+	PORT_START("DIP_SWITCHES_B")
+	PORT_DIPNAME(0x01, 0x01, "Code") PORT_DIPLOCATION("SW2:9")
+	PORT_DIPSETTING(0x00, "ETX")
+	PORT_DIPSETTING(0x01, "EOT")
+	PORT_DIPNAME(0x02, 0x02, "Spare 1") PORT_DIPLOCATION("SW1:5")
+	PORT_DIPSETTING(0x00, "On")
+	PORT_DIPSETTING(0x02, "Off")
+	PORT_DIPNAME(0x04, 0x04, "Spare 2") PORT_DIPLOCATION("SW1:6")
+	PORT_DIPSETTING(0x00, "On")
+	PORT_DIPSETTING(0x04, "Off")
+	PORT_DIPNAME(0x08, 0x08, "Spare 3") PORT_DIPLOCATION("SW1:7")
+	PORT_DIPSETTING(0x00, "On")
+	PORT_DIPSETTING(0x08, "Off")
+	PORT_DIPNAME(0x10, 0x10, "Display special characters") PORT_DIPLOCATION("SW1:8")
+	PORT_DIPSETTING(0x00, "On")
+	PORT_DIPSETTING(0x10, "Off")
+	PORT_DIPNAME(0x40, 0x40, "Transparent mode") PORT_DIPLOCATION("SW1:3")
+	PORT_DIPSETTING(0x00, "On")
+	PORT_DIPSETTING(0x40, "Off")
+	PORT_DIPNAME(0x80, 0x80, "Video invert") PORT_DIPLOCATION("SW1:4")
+	PORT_DIPSETTING(0x00, "Invert")
+	PORT_DIPSETTING(0x80, "Normal")
+
+	PORT_START("RS232_BAUD")
+	PORT_DIPNAME(0x1ff, 0x01, "RS232 Baud Rate")
+	PORT_DIPSETTING(0x100, "110") PORT_DIPLOCATION("SW3:1,2,3,4,5,6,7,8,9")
+	PORT_DIPSETTING(0x080, "150") PORT_DIPLOCATION("SW3:1,2,3,4,5,6,7,8,9")
+	PORT_DIPSETTING(0x040, "300") PORT_DIPLOCATION("SW3:1,2,3,4,5,6,7,8,9")
+	PORT_DIPSETTING(0x020, "600") PORT_DIPLOCATION("SW3:1,2,3,4,5,6,7,8,9")
+	PORT_DIPSETTING(0x010, "1200") PORT_DIPLOCATION("SW3:1,2,3,4,5,6,7,8,9")
+	PORT_DIPSETTING(0x008, "1800") PORT_DIPLOCATION("SW3:1,2,3,4,5,6,7,8,9")
+	PORT_DIPSETTING(0x004, "2400") PORT_DIPLOCATION("SW3:1,2,3,4,5,6,7,8,9")
+	PORT_DIPSETTING(0x002, "4800") PORT_DIPLOCATION("SW3:1,2,3,4,5,6,7,8,9")
+	PORT_DIPSETTING(0x001, "9600") PORT_DIPLOCATION("SW3:1,2,3,4,5,6,7,8,9")
+
+	// Keyboard
+
+	PORT_START("KBD_MOD")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Ctrl")       PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL)             PORT_CHAR(UCHAR_MAMEKEY(LCONTROL))
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift")      PORT_CODE(KEYCODE_LSHIFT)   PORT_CODE(KEYCODE_RSHIFT)               PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("All Caps")   PORT_CODE(KEYCODE_CAPSLOCK)                             PORT_TOGGLE PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
+
+	PORT_START("KBD_ROW0")
+	PORT_BIT( 0x00001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F1)         PORT_CHAR(UCHAR_MAMEKEY(F1))
+	PORT_BIT( 0x00002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F2)         PORT_CHAR(UCHAR_MAMEKEY(F2))
+	PORT_BIT( 0x00004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F3)         PORT_CHAR(UCHAR_MAMEKEY(F3))
+	PORT_BIT( 0x00008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F4)         PORT_CHAR(UCHAR_MAMEKEY(F4))
+	PORT_BIT( 0x00010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F5)         PORT_CHAR(UCHAR_MAMEKEY(F5))
+	PORT_BIT( 0x00020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F6)         PORT_CHAR(UCHAR_MAMEKEY(F6))
+	PORT_BIT( 0x00040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F7)         PORT_CHAR(UCHAR_MAMEKEY(F7))
+	PORT_BIT( 0x00080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F8)         PORT_CHAR(UCHAR_MAMEKEY(F8))
+	PORT_BIT( 0x00100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F9)         PORT_CHAR(UCHAR_MAMEKEY(F9))
+	PORT_BIT( 0x00200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F10)        PORT_CHAR(UCHAR_MAMEKEY(F10))
+	PORT_BIT( 0x00400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F11)        PORT_CHAR(UCHAR_MAMEKEY(F11))
+	PORT_BIT( 0x00800, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F12)        PORT_CHAR(UCHAR_MAMEKEY(F12))
+	PORT_BIT( 0x01000, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_BIT( 0x02000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH_PAD)  PORT_NAME("Auto LF")
+	PORT_BIT( 0x04000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ASTERISK)   PORT_NAME("Online")
+	PORT_BIT( 0x08000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS_PAD)  PORT_NAME("Page Mode")
+	PORT_BIT( 0x10000, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("KBD_ROW1")
+	PORT_BIT( 0x00001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1)          PORT_CHAR('1')   PORT_CHAR('!')
+	PORT_BIT( 0x00002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2)          PORT_CHAR('2')   PORT_CHAR('@')
+	PORT_BIT( 0x00004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3)          PORT_CHAR('3')   PORT_CHAR('#')
+	PORT_BIT( 0x00008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4)          PORT_CHAR('4')   PORT_CHAR('$')
+	PORT_BIT( 0x00010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5)          PORT_CHAR('5')   PORT_CHAR('%')
+	PORT_BIT( 0x00020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6)          PORT_CHAR('6')   PORT_CHAR('^')
+	PORT_BIT( 0x00040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7)          PORT_CHAR('7')   PORT_CHAR('&')
+	PORT_BIT( 0x00080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8)          PORT_CHAR('8')   PORT_CHAR('*')
+	PORT_BIT( 0x00100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9)          PORT_CHAR('9')   PORT_CHAR('(')
+	PORT_BIT( 0x00200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0)          PORT_CHAR('0')   PORT_CHAR(')')
+	PORT_BIT( 0x00400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TILDE)      PORT_CHAR('`')   PORT_CHAR('~')
+	PORT_BIT( 0x00800, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS)      PORT_CHAR('-')   PORT_CHAR('_')
+	PORT_BIT( 0x01000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_EQUALS)     PORT_CHAR('=')   PORT_CHAR('+')
+	PORT_BIT( 0x02000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PAUSE)      PORT_NAME("Break") PORT_CHAR(UCHAR_MAMEKEY(CANCEL))
+	PORT_BIT( 0x04000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_INSERT)     PORT_NAME("Insert Character") PORT_CHAR(UCHAR_MAMEKEY(INSERT))
+	PORT_BIT( 0x08000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DEL)        PORT_NAME("Delete Character")  PORT_CHAR(UCHAR_MAMEKEY(DEL))
+	PORT_BIT( 0x10000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PLUS_PAD)   PORT_NAME("Set Tabs")
+
+	PORT_START("KBD_ROW2")
+	PORT_BIT( 0x00001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ESC)        PORT_NAME("Escape")    PORT_CHAR(UCHAR_MAMEKEY(ESC))
+	PORT_BIT( 0x00002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q)          PORT_CHAR('q')   PORT_CHAR('Q')
+	PORT_BIT( 0x00004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W)          PORT_CHAR('w')   PORT_CHAR('W')
+	PORT_BIT( 0x00008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E)          PORT_CHAR('e')   PORT_CHAR('E')
+	PORT_BIT( 0x00010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R)          PORT_CHAR('r')   PORT_CHAR('R')
+	PORT_BIT( 0x00020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T)          PORT_CHAR('t')   PORT_CHAR('T')
+	PORT_BIT( 0x00040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Y)          PORT_CHAR('y')   PORT_CHAR('Y')
+	PORT_BIT( 0x00080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U)          PORT_CHAR('u')   PORT_CHAR('U')
+	PORT_BIT( 0x00100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I)          PORT_CHAR('i')   PORT_CHAR('I')
+	PORT_BIT( 0x00200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O)          PORT_CHAR('o')   PORT_CHAR('O')
+	PORT_BIT( 0x00400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P)          PORT_CHAR('p')   PORT_CHAR('P')
+	PORT_BIT( 0x00800, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSLASH)  PORT_CHAR('\\')  PORT_CHAR('|')
+	PORT_BIT( 0x01000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_END)        PORT_NAME("Linefeed")
+	PORT_BIT( 0x02000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER)      PORT_NAME("Return")    PORT_CHAR(0x0dU)
+	PORT_BIT( 0x04000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_TAB)        PORT_NAME("Forward Tab") PORT_CHAR('\t')
+	PORT_BIT( 0x08000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4_PAD)      PORT_NAME("Back Tab")
+	PORT_BIT( 0x10000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DEL_PAD)    PORT_NAME("Line Delete")
+
+	PORT_START("KBD_ROW3")
+	PORT_BIT( 0x00001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A)          PORT_CHAR('a')   PORT_CHAR('A')
+	PORT_BIT( 0x00002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S)          PORT_CHAR('s')   PORT_CHAR('S')
+	PORT_BIT( 0x00004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D)          PORT_CHAR('d')   PORT_CHAR('D')
+	PORT_BIT( 0x00008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F)          PORT_CHAR('f')   PORT_CHAR('F')
+	PORT_BIT( 0x00010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G)          PORT_CHAR('g')   PORT_CHAR('G')
+	PORT_BIT( 0x00020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H)          PORT_CHAR('h')   PORT_CHAR('H')
+	PORT_BIT( 0x00040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J)          PORT_CHAR('j')   PORT_CHAR('J')
+	PORT_BIT( 0x00080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K)          PORT_CHAR('k')   PORT_CHAR('K')
+	PORT_BIT( 0x00100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L)          PORT_CHAR('l')   PORT_CHAR('L')
+	PORT_BIT( 0x00200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON)      PORT_CHAR(';')   PORT_CHAR(':')
+	PORT_BIT( 0x00400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR('\'')  PORT_CHAR('"')
+	PORT_BIT( 0x00800, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR('[')   PORT_CHAR('{')
+	PORT_BIT( 0x01000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']')   PORT_CHAR('}')
+	PORT_BIT( 0x02000, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_BIT( 0x04000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_UP)         PORT_NAME("Cursor Up") PORT_CHAR(UCHAR_MAMEKEY(UP))
+	PORT_BIT( 0x08000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_DOWN)       PORT_NAME("Cursor Down") PORT_CHAR(UCHAR_MAMEKEY(DOWN))
+	PORT_BIT( 0x10000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0_PAD)      PORT_NAME("Line Insert")
+
+	PORT_START("KBD_ROW4")
+	PORT_BIT( 0x00001, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_HOME)       PORT_NAME("Home / Clear")
+	PORT_BIT( 0x00002, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z)          PORT_CHAR('z')   PORT_CHAR('Z')
+	PORT_BIT( 0x00004, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X)          PORT_CHAR('x')   PORT_CHAR('X')
+	PORT_BIT( 0x00008, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C)          PORT_CHAR('c')   PORT_CHAR('C')
+	PORT_BIT( 0x00010, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V)          PORT_CHAR('v')   PORT_CHAR('V')
+	PORT_BIT( 0x00020, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B)          PORT_CHAR('b')   PORT_CHAR('B')
+	PORT_BIT( 0x00040, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N)          PORT_CHAR('n')   PORT_CHAR('N')
+	PORT_BIT( 0x00080, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M)          PORT_CHAR('m')   PORT_CHAR('M')
+	PORT_BIT( 0x00100, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(',')   PORT_CHAR('<')
+	PORT_BIT( 0x00200, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP)       PORT_CHAR('.')   PORT_CHAR('>')
+	PORT_BIT( 0x00400, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('/')   PORT_CHAR('?')
+	PORT_BIT( 0x00800, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PGUP)       PORT_NAME("Page Send / Line Send")
+	PORT_BIT( 0x01000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')
+	PORT_BIT( 0x02000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_BACKSPACE)  PORT_NAME("Backspace") PORT_CHAR(0x08U)
+	PORT_BIT( 0x04000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_LEFT)       PORT_NAME("Cursor Left") PORT_CHAR(UCHAR_MAMEKEY(LEFT))
+	PORT_BIT( 0x08000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_RIGHT)      PORT_NAME("Cursor Right") PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
+	PORT_BIT( 0x10000, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PGDN)       PORT_NAME("Page Erase / Line Erase")
+
+INPUT_PORTS_END
+
+
+// PA0 to PA6 - Keyboard data.
+u8 exorterm155_device::pia_kbd_pa_r()
+{
+	u8 ret = m_term_data;
+	m_term_data = 0;
+	return ret;
+}
+
+u8 exorterm155_device::pia_kbd_pb_r()
+{
+	// PB7 is a 'keyboard attached' signal, low when a keyboard is attached.
+	return 0x00;
+}
+
+void exorterm155_device::pia_kbd_pb_w(u8 data)
+{
+	m_online_led = BIT(data, 0) ? 0 : 1;
+	m_auto_lf_led = BIT(data, 1) ? 0 : 1;
+	m_page_mode_led = BIT(data, 2) ? 0 : 1;
+	m_insert_char_led = BIT(data, 5) ? 0 : 1;
+	// Bit 3 is AUX ON, and bit 4 is AUX EN, but it is not clear
+	// if the firmware uses these?
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::pia_cfg_cb2_w)
+{
+	m_beeper->set_state(!state);
+}
+
+void exorterm155_device::pia_disp_pa_w(u8 data)
+{
+	m_cursor_addr = (m_cursor_addr & 0x700) | data;
+}
+
+u8 exorterm155_device::pia_disp_pb_r()
+{
+	u8 ret = 0;
+
+	if (m_dsr)
+		ret |= 0x20;
+
+	return ret;
+}
+
+void exorterm155_device::pia_disp_pb_w(u8 data)
+{
+	m_cursor_addr = (m_cursor_addr & 0x0ff) | ((data & 0x7) << 8);
+
+	m_inv_video = BIT(data, 3);
+	m_special_char_disp = BIT(data, 4);
+
+	m_rs232_conn_dtr_handler(BIT(data, 7));
+}
+
+READ_LINE_MEMBER(exorterm155_device::pia_disp_ca2_r)
+{
+	return m_ring;
+}
+
+//**************************************************************************
+//  VIDEO EMULATION
+//**************************************************************************
+
+u32 exorterm155_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+{
+	u16 sy = 0, ma = 0;
+	u8 disable_fac = m_disable_fac->read() == 0;
+	u8 display_fac = m_display_fac->read() == 0;
+	const rgb_t *palette = m_palette->palette()->entry_list_raw();
+
+	m_framecnt++;
+
+	for (u8 y = 0; y < 24; y++)
+	{
+		for (u8 ra = 0; ra < 12; ra++)
+		{
+			u32 *p = &bitmap.pix32(sy++);
+			// FAC codes are cleared on horizontal sync.
+			u8 underline1 = 0;
+			u8 underline2 = 0;
+			u8 non_display = 0;
+			u8 invert = 0;
+			u8 half_bright = 0;
+			u8 blink = 0;
+
+			for (u16 x = ma; x < ma + 80; x++)
+			{
+				u8 code = m_vram[x + 0x80];
+				u16 gfx = 0;
+
+				if (BIT(code, 7) && !disable_fac)
+				{
+					underline1 = BIT(code, 4);
+					non_display = BIT(code, 3);
+					invert = BIT(code, 2);
+					half_bright = BIT(code, 1);
+					blink = BIT(code, 0);
+				}
+
+				// Copying the circuit logic for loading from
+				// the character generator which occurs when:
+				//
+				// 1. Special character display is enabled or
+				// it is not a special character 0x00 to 0x1f.
+				//
+				// AND
+				//
+				// 2. Not 'non display'
+				//
+				// AND
+				//
+				// 3. Not 'blink' and blinked off.
+				//
+				// AND
+				//
+				// 4. Not FAC code or Display FAC enabled.
+				//
+				if ((m_special_char_disp || (code & 0xe0)) &&
+					!non_display &&
+					!(blink && (m_framecnt & 8)) &&
+					(!BIT(code, 7) || display_fac))
+				{
+					offs_t address = ((code & 0x7f) << 4) | (ra & 0x0f);
+					gfx = m_chargen[address];
+				}
+
+				if (underline1 && underline2 && ra == 10)
+					gfx |= 0x1ff;
+
+				u8 cursor_display = x + 0x80 == m_cursor_addr;
+				cursor_display = cursor_display && (m_framecnt & 4);
+
+				if (m_inv_video ^ invert ^ cursor_display)
+					gfx ^= 0x1ff; // invert
+
+				u32 font_color = palette[2 - half_bright];
+
+				/* Display a scanline of a character */
+				*p++ = (BIT(gfx, 7)) ? font_color : 0;
+				*p++ = (BIT(gfx, 6)) ? font_color : 0;
+				*p++ = (BIT(gfx, 5)) ? font_color : 0;
+				*p++ = (BIT(gfx, 4)) ? font_color : 0;
+				*p++ = (BIT(gfx, 3)) ? font_color : 0;
+				*p++ = (BIT(gfx, 2)) ? font_color : 0;
+				*p++ = (BIT(gfx, 1)) ? font_color : 0;
+				*p++ = (BIT(gfx, 0)) ? font_color : 0;
+				*p++ = (BIT(gfx, 8)) ? font_color : 0;
+
+				// The circuit has logic to delay underlining
+				// but not for the other attributes.
+				underline2 = underline1;
+			}
+		}
+		ma += 80;
+	}
+
+	return 0;
+}
+
+static const gfx_layout char_layout =
+{
+	8,12,
+	RGN_FRAC(1,1),
+	1,
+	{ 0 },
+	{ 0, 1, 2, 3, 4, 5, 6, 7 },
+	{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8, 8*8, 9*8, 10*8, 11*8 },
+	8*16
+};
+
+static GFXDECODE_START(chars)
+	GFXDECODE_ENTRY("chargen", 0, char_layout, 0, 1)
+GFXDECODE_END
+
+//**************************************************************************
+//  MACHINE EMULATION
+//**************************************************************************
+
+WRITE_LINE_MEMBER(exorterm155_device::sys_timer_w)
+{
+	// 3.4ms
+	m_pia_disp->cb1_w(state);
+
+	// Divide by 16, giving 27.5ms.
+	if (state == 1) m_sys_timer_count++;
+	m_pia_disp->ca1_w((m_sys_timer_count & 8) != 0);
+
+	// The terminal firmware does not initialize properly if a key
+	// interrupt is received too soon after reset, so a hold off period is
+	// implemented and measured in terms of these timer interrupts.
+	if (m_kbd_start_holdoff > 0)
+	{
+		if (m_kbd_start_holdoff == 1)
+			kbd_start_processing();
+		m_kbd_start_holdoff--;
+	}
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::write_f1_clock)
+{
+	if (BIT(m_rs232_baud->read(), 0))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::write_f3_clock)
+{
+	if (BIT(m_rs232_baud->read(), 1))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::write_f5_clock)
+{
+	if (BIT(m_rs232_baud->read(), 2))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::write_f6_clock)
+{
+	if (BIT(m_rs232_baud->read(), 3))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::write_f7_clock)
+{
+	if (BIT(m_rs232_baud->read(), 4))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::write_f8_clock)
+{
+	if (BIT(m_rs232_baud->read(), 5))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::write_f9_clock)
+{
+	if (BIT(m_rs232_baud->read(), 6))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::write_f11_clock)
+{
+	if (BIT(m_rs232_baud->read(), 7))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::write_f13_clock)
+{
+	if (BIT(m_rs232_baud->read(), 8))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::acia_txd_w)
+{
+	m_rs232_conn_txd_handler(state);
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::acia_rts_w)
+{
+	m_rs232_conn_rts_handler(state);
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::rs232_conn_dcd_w)
+{
+	m_acia->write_dcd(state);
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::rs232_conn_dsr_w)
+{
+	// Input of Display PIA PB5, pulled high.
+	m_dsr = state;
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::rs232_conn_ri_w)
+{
+	m_ring = state;
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::rs232_conn_cts_w)
+{
+	m_acia->write_cts(state);
+}
+
+WRITE_LINE_MEMBER(exorterm155_device::rs232_conn_rxd_w)
+{
+	m_acia->write_rxd(state);
+}
+
+
+// Keyboard
+
+u8 const exorterm155_device::translation_table[][5][17] = {
+	{   // Standard
+		{ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xff, 0xf7, 0xf8, 0xc7, 0xff },
+		{  '1',  '2',  '3',  '4',  '5',  '6',  '7',  '8',  '9',  '0',  '`',  '-',  '=', 0x8c, 0xd0, 0xd1, 0xdc },
+		{ 0x1b,  'q',  'w',  'e',  'r',  't',  'y',  'u',  'i',  'o',  'p', '\\', 0x0a, 0x0d, 0xda, 0xdb, 0xd7 },
+		{  'a',  's',  'd',  'f',  'g',  'h',  'j',  'k',  'l',  ';', '\'',  '[',  ']', 0xff, 0xc1, 0xc2, 0xd6 },
+		{ 0xc0,  'z',  'x',  'c',  'v',  'b',  'n',  'm',  ',',  '.',  '/', 0xd9,  ' ', 0x08, 0xc3, 0xc4, 0xd4 }
+	},
+	{   // Shift
+		{ 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xff, 0xff, 0xff, 0xff, 0xff },
+		{  '!',  '@',  '#',  '$',  '%',  '^',  '&',  '*',  '(',  ')',  '~',  '_',  '+', 0xff, 0xd6, 0xd7, 0xff },
+		{ 0x1b , 'Q',  'W',  'E',  'R',  'T',  'Y',  'U',  'I',  'O',  'P',  '|', 0x0a, 0x0d, 0xdb, 0xff, 0xff },
+		{  'A',  'S',  'D',  'F',  'G',  'H',  'J',  'K',  'L',  ':',  '"',  '{',  '}', 0xff, 0xff, 0xff, 0xff },
+		{ 0xd8,  'Z',  'X',  'C',  'V',  'B',  'N',  'M',  '<',  '>',  '?', 0xdf,  ' ', 0x08, 0xff, 0xff, 0xd5 }
+	},
+	{   // Ctrl
+		{ 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xff, 0xff, 0xff, 0xff, 0xff },
+		{  '1',  '2',  '3',  '4',  '5',  '6',  '7',  '8',  '9',  '0', 0x00, 0x1f, 0x1e, 0xff, 0xff, 0xff, 0xff },
+		{ 0x1b, 0x11, 0x17, 0x05, 0x12, 0x14, 0x19, 0x15, 0x09, 0x0f, 0x10, 0x1c, 0x0a, 0x0d, 0x09, 0xff, 0xff },
+		{ 0x01, 0x13, 0x04, 0x06, 0x07, 0x08, 0x0a, 0x0b, 0x0c,  ';', '\'', 0x1b, 0x1d, 0xff, 0xff, 0xff, 0xff },
+		{ 0xff, 0x1a, 0x18, 0x03, 0x16, 0x02, 0x0e, 0x0d, ',',   '.', 0x1f, 0xff, 0x00, 0x08, 0xff, 0xff, 0xff }
+	}
+};
+
+bool const exorterm155_device::caps_table[5][17] = {
+	{ false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false },
+	{ false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false },
+	{ false, true,  true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false },
+	{ true,  true,  true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false },
+	{ false, true,  true,  true,  true,  true,  true,  true,  false, false, false, false, false, false, false, false, false }
+};
+
+void exorterm155_device::kbd_start_processing()
+{
+	attotime period = attotime::from_hz(2'400);
+	m_kbd_processing = 1;
+	m_kbd_scan_timer->adjust(period, 0, period);
+}
+
+void exorterm155_device::kbd_reset_state()
+{
+	std::fill(std::begin(m_kbd_states), std::end(m_kbd_states), ioport_value(0));
+	m_kbd_next_row = 0;
+}
+
+void exorterm155_device::kbd_repeat_start(uint8_t row, uint8_t column)
+{
+	attotime delay = attotime::from_msec(750);
+	attotime interval = attotime::from_msec(100);
+
+	m_kbd_repeat_row = row;
+	m_kbd_repeat_column = column;
+	m_kbd_repeat_timer->adjust(delay, 0, interval);
+}
+
+void exorterm155_device::kbd_repeat_restart()
+{
+	attotime delay = attotime::from_msec(750);
+	attotime interval = attotime::from_msec(100);
+
+	if ((m_kbd_repeat_row != 0xff) || (m_kbd_repeat_column != 0xff))
+		m_kbd_repeat_timer->adjust(delay, 0, interval);
+}
+
+void exorterm155_device::kbd_repeat_stop()
+{
+	m_kbd_repeat_row = 0xff;
+	m_kbd_repeat_column = 0xff;
+	m_kbd_repeat_timer->reset();
+}
+
+void exorterm155_device::kbd_send_translated(u8 code)
+{
+	unsigned row = (code >> 5) & 0x07;
+	unsigned col = (code >> 0) & 0x1f;
+
+	u16 modifiers = m_kbd_modifiers->read();
+	bool shift = BIT(modifiers, 1) != ((modifiers & 4) && caps_table[row][col]);
+	bool ctrl = BIT(modifiers, 0);
+
+	unsigned map = ctrl ? 2 : shift ? 1 : 0;
+	u8 result = translation_table[map][row][col];
+
+	if (result == 0xff)
+		return;
+
+	m_term_data = result;
+	// Triggers on the falling edge.
+	m_pia_kbd->ca1_w(ASSERT_LINE);
+	m_pia_kbd->ca1_w(CLEAR_LINE);
+	m_pia_kbd->ca1_w(ASSERT_LINE);
+}
+
+TIMER_CALLBACK_MEMBER(exorterm155_device::kbd_scan_row)
+{
+	u16 const modifiers(m_kbd_modifiers->read());
+	if (modifiers != m_kbd_last_modifiers)
+		kbd_repeat_restart();
+
+	m_kbd_last_modifiers = modifiers;
+
+	ioport_value &state(m_kbd_states[m_kbd_next_row]);
+	ioport_value const keys(m_kbd_rows[m_kbd_next_row]->read());
+	ioport_value const change(state ^ keys);
+
+	ioport_value mask(1U);
+	for (uint8_t column = 0U; m_kbd_processing && (state != keys); ++column, mask <<= 1)
+	{
+		if (change & mask)
+		{
+			state ^= mask;
+			if (keys & mask)
+			{
+				kbd_send_translated((m_kbd_next_row << 5) | column);
+				kbd_repeat_start(m_kbd_next_row, column);
+			}
+			else
+			{
+				if (m_kbd_repeat_row == m_kbd_next_row && m_kbd_repeat_column == column)
+					kbd_repeat_stop();
+			}
+		}
+	}
+
+	m_kbd_next_row = (m_kbd_next_row + 1) % 5;
+}
+
+TIMER_CALLBACK_MEMBER(exorterm155_device::kbd_repeat)
+{
+	assert((m_kbd_repeat_row != 0xff) || (m_kbd_repeat_column != 0xff));
+	kbd_send_translated((m_kbd_repeat_row << 5) | m_kbd_repeat_column);
+}
+
+
+
+
+void exorterm155_device::device_resolve_objects()
+{
+	m_rs232_conn_dtr_handler.resolve_safe();
+	m_rs232_conn_rts_handler.resolve_safe();
+	m_rs232_conn_txd_handler.resolve_safe();
+}
+
+void exorterm155_device::device_start()
+{
+	m_online_led.resolve();
+	m_auto_lf_led.resolve();
+	m_page_mode_led.resolve();
+	m_insert_char_led.resolve();
+
+	// register for save states
+	save_item(NAME(m_term_data));
+	save_item(NAME(m_framecnt));
+	save_item(NAME(m_cursor_addr));
+	save_item(NAME(m_inv_video));
+	save_item(NAME(m_special_char_disp));
+
+	save_item(NAME(m_sys_timer_count));
+	save_item(NAME(m_dsr));
+	save_item(NAME(m_ring));
+	save_item(NAME(m_kbd_start_holdoff));
+
+	// Keyboard
+	m_kbd_scan_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(exorterm155_device::kbd_scan_row), this));
+	m_kbd_repeat_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(exorterm155_device::kbd_repeat), this));
+	kbd_reset_state();
+	kbd_repeat_stop();
+
+	save_item(NAME(m_kbd_states));
+	save_item(NAME(m_kbd_next_row));
+	save_item(NAME(m_kbd_processing));
+	save_item(NAME(m_kbd_repeat_row));
+	save_item(NAME(m_kbd_repeat_column));
+	save_item(NAME(m_kbd_last_modifiers));
+
+	m_dsr = 1;
+	m_ring = 0;
+}
+
+void exorterm155_device::device_reset()
+{
+	m_brg->rsa_w(CLEAR_LINE);
+	m_brg->rsb_w(ASSERT_LINE);
+
+	m_online_led = 0;
+	m_auto_lf_led = 0;
+	m_page_mode_led = 0;
+	m_insert_char_led = 0;
+
+	m_framecnt = 0;
+	m_cursor_addr = 0;
+	m_inv_video = 0;
+	m_special_char_disp = 0;
+	m_sys_timer_count = 0;
+
+	m_beeper->set_state(0);
+
+	// Keyboard
+	kbd_reset_state();
+	kbd_repeat_stop();
+	m_kbd_start_holdoff = 180;
+	m_kbd_last_modifiers = 0;
+}
+
+
+//**************************************************************************
+//  ROM DEFINITIONS
+//**************************************************************************
+
+ROM_START( exorterm155 )
+	ROM_REGION(0x10000, "maincpu", 0)
+	ROM_LOAD("51aw1018b25.bin", 0xa000, 0x0800, CRC(5f9352ba) SHA1(9fb52992bd3f3409fa8ec1002e2ebdf61318d260))
+	ROM_LOAD("51aw1018b22.bin", 0xc000, 0x0800, CRC(b6bb9df0) SHA1(5c0bda69d94fd58c21f07c810525043cd22a9d7d))
+	ROM_LOAD("51aw1018b27.bin", 0xc800, 0x0800, CRC(15f77b53) SHA1(1f73098ebf83d7255efcf2b509d12e559001ca5b))
+	ROM_LOAD("51aw1018b26.bin", 0xd000, 0x0800, CRC(f5b204bc) SHA1(9815fd7d7ba617ebb3f55e595e4931d75942b6a9))
+	ROM_LOAD("51aw1018b24.bin", 0xd800, 0x0800, CRC(18a0ed66) SHA1(5fa6e4b3c27969c1d7e27c79fc2993e4cc9262cf))
+
+	ROM_REGION(0x0800, "chargen", 0)
+	ROM_LOAD("chargen.rom", 0x0000, 0x0800, CRC(0087cbad) SHA1(a6d3dd0512db4c459944c60d728536755a570964) BAD_DUMP) // constructed from an apparently similar published Motorola character set
+
+ROM_END
+
+//**************************************************************************
+//  MACHINE DEFINTIONS
+//**************************************************************************
+
+void exorterm155_device::device_add_mconfig(machine_config &config)
+{
+	M6800(config, m_maincpu, 16.6698_MHz_XTAL / 18);
+	m_maincpu->set_addrmap(AS_PROGRAM, &exorterm155_device::mem_map);
+
+	INPUT_MERGER_ANY_HIGH(config, m_irqs).output_handler().set_inputline(m_maincpu, M6800_IRQ_LINE);
+
+	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+	m_screen->set_refresh_hz(50);
+	m_screen->set_size(80*9, 24*12);
+	m_screen->set_visarea(0, 80*9-1, 0, 24*12-1);
+	m_screen->set_screen_update(FUNC(exorterm155_device::screen_update));
+
+	PALETTE(config, m_palette, palette_device::MONOCHROME_HIGHLIGHT);
+
+	GFXDECODE(config, "gfxdecode", m_palette, chars);
+
+	config.set_default_layout(layout_exorterm155);
+
+	ACIA6850(config, m_acia, 0);
+	m_acia->txd_handler().set(FUNC(exorterm155_device::acia_txd_w));
+	m_acia->rts_handler().set(FUNC(exorterm155_device::acia_rts_w));
+	m_acia->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<0>));
+
+	MC14411(config, m_brg, XTAL(1'843'200));
+	m_brg->out_f<1>().set(FUNC(exorterm155_device::write_f1_clock));
+	m_brg->out_f<3>().set(FUNC(exorterm155_device::write_f3_clock));
+	m_brg->out_f<5>().set(FUNC(exorterm155_device::write_f5_clock));
+	m_brg->out_f<6>().set(FUNC(exorterm155_device::write_f6_clock));
+	m_brg->out_f<7>().set(FUNC(exorterm155_device::write_f7_clock));
+	m_brg->out_f<8>().set(FUNC(exorterm155_device::write_f8_clock));
+	m_brg->out_f<9>().set(FUNC(exorterm155_device::write_f9_clock));
+	m_brg->out_f<11>().set(FUNC(exorterm155_device::write_f11_clock));
+	m_brg->out_f<13>().set(FUNC(exorterm155_device::write_f13_clock));
+
+	PIA6821(config, m_pia_kbd);
+	m_pia_kbd->readpa_handler().set(FUNC(exorterm155_device::pia_kbd_pa_r));
+	m_pia_kbd->readpb_handler().set(FUNC(exorterm155_device::pia_kbd_pb_r));
+	m_pia_kbd->writepb_handler().set(FUNC(exorterm155_device::pia_kbd_pb_w));
+	m_pia_kbd->irqa_handler().set(m_irqs, FUNC(input_merger_device::in_w<1>));
+	m_pia_kbd->irqb_handler().set(m_irqs, FUNC(input_merger_device::in_w<2>));
+
+	PIA6821(config, m_pia_cfg);
+	m_pia_cfg->readpa_handler().set_ioport("DIP_SWITCHES_A");
+	m_pia_cfg->readpb_handler().set_ioport("DIP_SWITCHES_B");
+	m_pia_cfg->cb2_handler().set(FUNC(exorterm155_device::pia_cfg_cb2_w));
+	m_pia_cfg->irqa_handler().set(m_irqs, FUNC(input_merger_device::in_w<3>));
+	m_pia_cfg->irqb_handler().set(m_irqs, FUNC(input_merger_device::in_w<4>));
+
+	PIA6821(config, m_pia_disp);
+	m_pia_disp->writepa_handler().set(FUNC(exorterm155_device::pia_disp_pa_w));
+	m_pia_disp->readpb_handler().set(FUNC(exorterm155_device::pia_disp_pb_r));
+	m_pia_disp->writepb_handler().set(FUNC(exorterm155_device::pia_disp_pb_w));
+	m_pia_disp->readca2_handler().set(FUNC(exorterm155_device::pia_disp_ca2_r));
+	m_pia_disp->irqa_handler().set(m_irqs, FUNC(input_merger_device::in_w<5>));
+	m_pia_disp->irqb_handler().set(m_irqs, FUNC(input_merger_device::in_w<6>));
+
+	// Derived from the horizontal blanking, 3.4ms.
+	CLOCK(config, m_sys_timer_clock, 4706 / 16);
+	m_sys_timer_clock->signal_handler().set(FUNC(exorterm155_device::sys_timer_w));
+
+	SPEAKER(config, "bell").front_center();
+	BEEP(config, m_beeper, 2000);
+	m_beeper->add_route(ALL_OUTPUTS, "bell", 0.25);
+}
+
+ioport_constructor exorterm155_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(exorterm155);
+}
+
+const tiny_rom_entry *exorterm155_device::device_rom_region() const
+{
+	return ROM_NAME(exorterm155);
+}
+
+DEFINE_DEVICE_TYPE(EXORTERM155, exorterm155_device, "exorterm155_device", "EXORTERM155")
diff -Nru mame-0.222+dfsg.1/src/devices/machine/exorterm.h mame-0.224+dfsg.1/src/devices/machine/exorterm.h
--- mame-0.222+dfsg.1/src/devices/machine/exorterm.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/exorterm.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,154 @@
+// license:BSD-3-Clause
+// copyright-holders: 68bit
+/****************************************************************************
+
+Motorola EXORterm 155 (M68SDS)
+
+****************************************************************************/
+
+#ifndef MAME_MACHINE_EXORTERM_H
+#define MAME_MACHINE_EXORTERM_H
+
+#pragma once
+
+#include "cpu/m6800/m6800.h"
+#include "machine/clock.h"
+#include "machine/input_merger.h"
+#include "machine/mc14411.h"
+#include "machine/6850acia.h"
+#include "machine/6821pia.h"
+#include "sound/spkrdev.h"
+#include "bus/rs232/rs232.h"
+#include "emupal.h"
+#include "screen.h"
+
+#include "machine/terminal.h"
+
+
+INPUT_PORTS_EXTERN(exorterm155);
+
+class exorterm155_device : public device_t
+{
+public:
+	exorterm155_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+	// Interface to a RS232 connection.
+	auto rs232_conn_txd_handler() { return m_rs232_conn_txd_handler.bind(); }
+	auto rs232_conn_dtr_handler() { return m_rs232_conn_dtr_handler.bind(); }
+	auto rs232_conn_rts_handler() { return m_rs232_conn_rts_handler.bind(); }
+	DECLARE_WRITE_LINE_MEMBER(rs232_conn_dcd_w);
+	DECLARE_WRITE_LINE_MEMBER(rs232_conn_dsr_w);
+	DECLARE_WRITE_LINE_MEMBER(rs232_conn_ri_w);
+	DECLARE_WRITE_LINE_MEMBER(rs232_conn_cts_w);
+	DECLARE_WRITE_LINE_MEMBER(rs232_conn_rxd_w);
+
+protected:
+	exorterm155_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+
+	virtual void device_resolve_objects() override;
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+
+private:
+	required_device<m6800_cpu_device> m_maincpu;
+	required_device<input_merger_device> m_irqs;
+	required_device<acia6850_device> m_acia;
+	required_device<mc14411_device> m_brg;
+	required_ioport m_rs232_baud;
+	required_ioport m_disable_fac;
+	required_ioport m_display_fac;
+	required_device<pia6821_device> m_pia_kbd;
+	required_device<pia6821_device> m_pia_cfg;
+	required_device<pia6821_device> m_pia_disp;
+	required_device<screen_device> m_screen;
+	required_device<palette_device> m_palette;
+	required_device<clock_device> m_sys_timer_clock;
+	required_shared_ptr<u8> m_vram;
+	required_region_ptr<u8> m_chargen;
+	required_device<beep_device> m_beeper;
+	output_finder<> m_online_led;
+	output_finder<> m_auto_lf_led;
+	output_finder<> m_page_mode_led;
+	output_finder<> m_insert_char_led;
+
+	void mem_map(address_map &map);
+
+	DECLARE_WRITE_LINE_MEMBER(acia_txd_w);
+	DECLARE_WRITE_LINE_MEMBER(acia_rts_w);
+
+	// Clocks
+	DECLARE_WRITE_LINE_MEMBER(write_f1_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f3_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f5_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f6_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f7_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f8_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f9_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f11_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f13_clock);
+
+	u8 m_dsr;
+	u8 m_ring;
+
+	devcb_write_line m_rs232_conn_txd_handler;
+	devcb_write_line m_rs232_conn_dtr_handler;
+	devcb_write_line m_rs232_conn_rts_handler;
+
+	u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+	u8 m_framecnt;
+	u16 m_cursor_addr;
+	u8 m_inv_video;
+	u8 m_special_char_disp;
+
+	DECLARE_WRITE_LINE_MEMBER(sys_timer_w);
+	u8 m_sys_timer_count;
+
+	DECLARE_WRITE_LINE_MEMBER(pia_cfg_cb2_w);
+
+	u8 pia_kbd_pa_r();
+	u8 pia_kbd_pb_r();
+	void pia_kbd_pb_w(u8 data);
+	u8 m_term_data;
+
+	u8 pia_disp_pb_r();
+	void pia_disp_pa_w(u8 data);
+	void pia_disp_pb_w(u8 data);
+	DECLARE_READ_LINE_MEMBER(pia_disp_ca2_r);
+
+	u8 m_kbd_start_holdoff;
+
+	// Keyboard
+
+	static u8 const translation_table[][5][17];
+	static bool const caps_table[5][17];
+	void kbd_start_processing();
+	void kbd_reset_state();
+	void kbd_repeat_start(u8 row, u8 column);
+	void kbd_repeat_restart();
+	void kbd_repeat_stop();
+	void kbd_repeat();
+	void kbd_send_translated(u8 code);
+
+	TIMER_CALLBACK_MEMBER(kbd_scan_row);
+	TIMER_CALLBACK_MEMBER(kbd_repeat);
+
+	emu_timer       *m_kbd_scan_timer;
+	emu_timer       *m_kbd_repeat_timer;
+	required_ioport m_kbd_modifiers;
+	required_ioport_array<5> m_kbd_rows;
+	ioport_value    m_kbd_states[5];
+	u8              m_kbd_next_row;
+	u8              m_kbd_processing;
+	u8              m_kbd_repeat_row;
+	u8              m_kbd_repeat_column;
+	u16             m_kbd_last_modifiers;
+
+};
+
+DECLARE_DEVICE_TYPE(EXORTERM155, exorterm155_device)
+
+#endif // MAME_MACHINE_EXORTERM_H
diff -Nru mame-0.222+dfsg.1/src/devices/machine/fdc37c93x.cpp mame-0.224+dfsg.1/src/devices/machine/fdc37c93x.cpp
--- mame-0.222+dfsg.1/src/devices/machine/fdc37c93x.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/fdc37c93x.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -491,7 +491,7 @@
 		if (config_index < 0x30)
 			write_global_configuration_register(config_index, byt);
 		else
-			write_logical_configuration_register(config_index, byt);;
+			write_logical_configuration_register(config_index, byt);
 	}
 	else
 		return;
@@ -882,12 +882,12 @@
 	if (index == 0xe8)
 	{
 		if (data & 16)
-			logerror("GP20 used as 8042 P20 keyboard reset line\n");;
+			logerror("GP20 used as 8042 P20 keyboard reset line\n");
 	}
 	if (index == 0xed)
 	{
 		if (data & 8)
-			logerror("GP25 used as GATEA20 line\n");;
+			logerror("GP25 used as GATEA20 line\n");
 	}
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/gayle.cpp mame-0.224+dfsg.1/src/devices/machine/gayle.cpp
--- mame-0.222+dfsg.1/src/devices/machine/gayle.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/gayle.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -86,7 +86,7 @@
 	offset <<= 1;
 
 	// swap
-	mem_mask = (mem_mask << 8) | (mem_mask >> 8);
+	mem_mask = swapendian_int16(mem_mask);
 
 	if (BIT(offset, 15))
 	{
@@ -113,7 +113,7 @@
 		logerror("gayle_r(%06x): %04x & %04x\n", offset, data, mem_mask);
 
 	// swap data
-	data = (data << 8) | (data >> 8);
+	data = swapendian_int16(data);
 
 	return data;
 }
@@ -123,8 +123,8 @@
 	offset <<= 1;
 
 	// swap
-	mem_mask = (mem_mask << 8) | (mem_mask >> 8);
-	data = ((data << 8) | (data >> 8)) & mem_mask;
+	mem_mask = swapendian_int16(mem_mask);
+	data = swapendian_int16(data) & mem_mask;
 
 	if (VERBOSE)
 		logerror("gayle_w(%06x): %04x & %04x\n", offset, data, mem_mask);
diff -Nru mame-0.222+dfsg.1/src/devices/machine/generalplus_gpl16250soc.h mame-0.224+dfsg.1/src/devices/machine/generalplus_gpl16250soc.h
--- mame-0.222+dfsg.1/src/devices/machine/generalplus_gpl16250soc.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/generalplus_gpl16250soc.h	2020-08-26 08:57:19.000000000 +0000
@@ -45,6 +45,7 @@
 		m_portd_out(*this),
 		m_nand_read_cb(*this),
 		m_csbase(0x20000),
+		m_cs_space(nullptr),
 		m_romtype(0),
 		m_space_read_cb(*this),
 		m_space_write_cb(*this),
diff -Nru mame-0.222+dfsg.1/src/devices/machine/genpc.cpp mame-0.224+dfsg.1/src/devices/machine/genpc.cpp
--- mame-0.222+dfsg.1/src/devices/machine/genpc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/genpc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -635,6 +635,8 @@
 
 	CASSETTE(config, m_cassette);
 	m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
+	m_cassette->set_interface("ibm5150_cass");
 }
 
 //**************************************************************************
diff -Nru mame-0.222+dfsg.1/src/devices/machine/i82371sb.h mame-0.224+dfsg.1/src/devices/machine/i82371sb.h
--- mame-0.222+dfsg.1/src/devices/machine/i82371sb.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/i82371sb.h	2020-08-26 08:57:19.000000000 +0000
@@ -141,7 +141,7 @@
 
 	// southbridge
 	uint8_t at_page8_r(offs_t offset);
-	void at_page8_w(offs_t offset, uint8_t data);;
+	void at_page8_w(offs_t offset, uint8_t data);
 	uint8_t at_portb_r();
 	void at_portb_w(uint8_t data);
 	DECLARE_WRITE_LINE_MEMBER(iochck_w);
diff -Nru mame-0.222+dfsg.1/src/devices/machine/i8255.cpp mame-0.224+dfsg.1/src/devices/machine/i8255.cpp
--- mame-0.222+dfsg.1/src/devices/machine/i8255.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/i8255.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -612,6 +612,7 @@
 	if (port_mode(PORT_A) == MODE_OUTPUT)
 	{
 		m_out_pa_cb((offs_t)0, m_output[PORT_A]);
+		m_ibf[PORT_A] = 1; // correct? needed by SAM Coupe Blue Alpha sampler
 	}
 	else
 	{
diff -Nru mame-0.222+dfsg.1/src/devices/machine/ibm21s850.cpp mame-0.224+dfsg.1/src/devices/machine/ibm21s850.cpp
--- mame-0.222+dfsg.1/src/devices/machine/ibm21s850.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/ibm21s850.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,166 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+/*************************************************************
+
+  IBM 21S850 IEEE-1394 400Mb/s 1-Port PHY
+  IBM 21S851 IEEE-1394 400Mb/s 3-Port PHY
+
+  Skeleton device
+
+**************************************************************/
+
+#include "emu.h"
+#include "ibm21s850.h"
+
+#define LOG_READS       (1 << 1)
+#define LOG_WRITES      (1 << 2)
+#define LOG_UNKNOWNS    (1 << 3)
+#define LOG_ALL         (LOG_READS | LOG_WRITES | LOG_UNKNOWNS)
+
+#define VERBOSE         (LOG_ALL)
+#include "logmacro.h"
+
+DEFINE_DEVICE_TYPE(IBM21S850, ibm21s850_device, "ibm21s850", "IBM 21S850 IEEE-1394 1-Port PHY")
+DEFINE_DEVICE_TYPE(IBM21S851, ibm21s851_device, "ibm21s851", "IBM 21S850 IEEE-1394 3-Port PHY")
+
+ibm21s85x_base_device::ibm21s85x_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, type, tag, owner, clock)
+	, m_reset_cb(*this)
+{
+}
+
+ibm21s850_device::ibm21s850_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: ibm21s85x_base_device(mconfig, IBM21S850, tag, owner, clock)
+{
+}
+
+ibm21s851_device::ibm21s851_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: ibm21s85x_base_device(mconfig, IBM21S851, tag, owner, clock)
+{
+}
+
+void ibm21s85x_base_device::device_start()
+{
+	save_item(NAME(m_regs));
+
+	m_reset_timer = timer_alloc(TIMER_RESET);
+
+	m_reset_cb.resolve_safe();
+}
+
+void ibm21s85x_base_device::device_reset()
+{
+	memset(m_regs, 0, 0x10);
+
+	m_regs[ROOT_OFFS] |= ROOT_MASK;                     // Root node
+	m_regs[GAP_COUNT_OFFS] |= 0x3f;                     // Initial reset value
+	m_regs[SPEED_OFFS] |= SPEED_400MBIT << SPEED_SHIFT; // 21S850 and 21S851 both indicate maximum 400Mb/s rate
+	m_regs[ENHANCED_REGS_OFFS] |= ENHANCED_REGS_MASK;   // 21S850 and 21S851 both have an enhanced register map
+	m_regs[CABLE_PWR_OFFS] |= CABLE_PWR_MASK;           // Cable is powered
+	m_regs[CONNECTION1_OFFS] |= CONNECTION1_MASK;       // Port 1 connected
+	m_regs[ARB_PHASE_OFFS] |= PHASE_BUS_RESET << ARB_PHASE_OFFS; // Power up in Bus Reset phase
+
+	power_on_reset();
+}
+
+void ibm21s850_device::device_reset()
+{
+	ibm21s85x_base_device::device_reset();
+
+	m_regs[NUM_PORTS_OFFS] |= 0x01;     // 1 port available
+	m_regs[ENV_OFFS] |= 1 << ENV_SHIFT; // Cable PHY environment
+	m_regs[REG_COUNT_OFFS] |= 0x09;     // 9 registers following the standard block on 21S850
+}
+
+void ibm21s851_device::device_reset()
+{
+	ibm21s85x_base_device::device_reset();
+
+	m_regs[NUM_PORTS_OFFS] |= 0x03;     // 3 port available
+	m_regs[ENV_OFFS] |= 1 << ENV_SHIFT; // Cable PHY environment
+	m_regs[REG_COUNT_OFFS] |= 0x0b;     // 11 registers following the standard block on 21S851
+}
+
+void ibm21s85x_base_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	if (id == TIMER_RESET)
+	{
+		if (param)
+		{
+			m_reset_cb(0);
+			m_reset_timer->adjust(attotime::never);
+		}
+		else
+		{
+			m_reset_cb(1);
+			m_reset_timer->adjust(attotime::from_usec(26266), 1); // RC reset circuit, 3.3V in, 2.3V out, 10KOhm resistor, 2.2uF capacitor
+		}
+	}
+}
+
+uint8_t ibm21s85x_base_device::read(offs_t offset)
+{
+	if (offset < 0x10)
+	{
+		LOGMASKED(LOG_READS, "%s: Register %02x read: %02x\n", machine().describe_context(), offset, m_regs[offset]);
+		return m_regs[offset];
+	}
+	LOGMASKED(LOG_READS | LOG_UNKNOWNS, "%s: Unknown Register (%02x) read\n", machine().describe_context(), offset);
+	return 0;
+}
+
+void ibm21s85x_base_device::power_on_reset()
+{
+	m_reset_timer->adjust(attotime::zero, 0);
+}
+
+void ibm21s85x_base_device::write(offs_t offset, uint8_t data)
+{
+	switch (offset)
+	{
+		default:
+			LOGMASKED(LOG_WRITES, "%s: Register %02x write (ignored): %02x\n", machine().describe_context(), offset, data);
+			break;
+		case 0x01:
+			LOGMASKED(LOG_WRITES, "%s: Register 01 write: %02x\n", machine().describe_context(), data);
+			LOGMASKED(LOG_WRITES, "%s:     Root Hold-off: %d\n", machine().describe_context(), (data & ROOT_HOLD_MASK) ? 1 : 0);
+			LOGMASKED(LOG_WRITES, "%s:     Initiate Bus Reset: %d\n", machine().describe_context(), (data & BUS_RESET_MASK) ? 1 : 0);
+			LOGMASKED(LOG_WRITES, "%s:     Gap Offset: %02x\n", machine().describe_context(), data & GAP_COUNT_MASK);
+			if (data & BUS_RESET_MASK)
+			{
+				data &= ~BUS_RESET_MASK;
+			}
+			m_regs[offset] = data;
+			break;
+		case 0x0d:
+			LOGMASKED(LOG_WRITES, "%s: Register 0d write: %02x\n", machine().describe_context(), data);
+			LOGMASKED(LOG_WRITES, "%s:     Enable L-P Selftest: %d\n", machine().describe_context(), (data & LP_TEST_EN_MASK) ? 1 : 0);
+			LOGMASKED(LOG_WRITES, "%s:     Enable Ack Accel Arbitration: %d\n", machine().describe_context(), (data & ACK_ACCEL_EN_MASK) ? 1 : 0);
+			LOGMASKED(LOG_WRITES, "%s:     Enable Multi-Speed Concat: %d\n", machine().describe_context(), (data & MULTISP_CONCAT_EN_MASK) ? 1 : 0);
+			LOGMASKED(LOG_WRITES, "%s:     Mask LPS Bit: %d\n", machine().describe_context(), (data & MASK_LPS_MASK) ? 1 : 0);
+			m_regs[offset] = data;
+			break;
+		case 0x0e:
+			LOGMASKED(LOG_WRITES, "%s: Register 0e write: %02x\n", machine().describe_context(), data);
+			LOGMASKED(LOG_WRITES, "%s:     Enable Tx/Rx Timeout: %d\n", machine().describe_context(), (data & EN_TIMEOUT_MASK) ? 1 : 0);
+			LOGMASKED(LOG_WRITES, "%s:     Ignore Unplug: %d\n", machine().describe_context(), (data & IGNORE_UNPLUG_MASK) ? 1 : 0);
+			LOGMASKED(LOG_WRITES, "%s:     Override CMC: %d\n", machine().describe_context(), (data & OVERRIDE_CMC_MASK) ? 1 : 0);
+			LOGMASKED(LOG_WRITES, "%s:     Software CMC: %d\n", machine().describe_context(), (data & SOFT_CMC_MASK) ? 1 : 0);
+			LOGMASKED(LOG_WRITES, "%s:     Disable Port 1: %d\n", machine().describe_context(), (data & DISABLE_P1_MASK) ? 1 : 0);
+			m_regs[offset] = data;
+			break;
+		case 0x0f:
+			LOGMASKED(LOG_WRITES, "%s: Register 0f write: %02x\n", machine().describe_context(), data);
+			LOGMASKED(LOG_WRITES, "%s:     Soft POR: %d\n", machine().describe_context(), (data & SOFT_POR_MASK) ? 1 : 0);
+			LOGMASKED(LOG_WRITES, "%s:     Send PHY-Link Diag (SID) Packet: %d\n", machine().describe_context(), (data & SEND_PL_DIAG_MASK) ? 1 : 0);
+			LOGMASKED(LOG_WRITES, "%s:     Degate Ack_Acc_Arb: %d\n", machine().describe_context(), (data & ACK_ACCEL_SYNC_MASK) ? 1 : 0);
+			LOGMASKED(LOG_WRITES, "%s:     Initiate Short Bus Reset: %d\n", machine().describe_context(), (data & ISBR_MASK) ? 1 : 0);
+			if (data & SOFT_POR_MASK)
+			{
+				data &= ~SOFT_POR_MASK;
+				power_on_reset();
+			}
+			m_regs[offset] = data;
+			break;
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/devices/machine/ibm21s850.h mame-0.224+dfsg.1/src/devices/machine/ibm21s850.h
--- mame-0.222+dfsg.1/src/devices/machine/ibm21s850.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/ibm21s850.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,210 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+/*************************************************************
+
+  IBM 21S850/1 IEEE 1394 400Mb/s Physical Layer
+  Transceiver (PHY)
+
+  Skeleton device
+
+**************************************************************/
+
+#ifndef MAME_MACHINE_IBM21S850_H
+#define MAME_MACHINE_IBM21S850_H
+
+#pragma once
+
+class ibm21s85x_base_device : public device_t
+{
+public:
+	uint8_t read(offs_t offset);
+	void write(offs_t offset, uint8_t data);
+
+	auto reset_cb() { return m_reset_cb.bind(); }
+
+	static constexpr feature_type unemulated_features() { return feature::COMMS; }
+
+protected:
+	ibm21s85x_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+	void power_on_reset();
+
+	static const device_timer_id TIMER_RESET = 0;
+
+	enum : uint32_t
+	{
+		PHYSICAL_ID_OFFS    = 0,
+		PHYSICAL_ID_SHIFT   = 2,
+		PHYSICAL_ID_MASK    = 0xfc,
+		ROOT_OFFS           = 0,
+		ROOT_MASK           = 0x02,
+		CABLE_PWR_OFFS      = 0,
+		CABLE_PWR_MASK      = 0x01,
+
+		ROOT_HOLD_OFFS      = 1,
+		ROOT_HOLD_MASK      = 0x80,
+		BUS_RESET_OFFS      = 1,
+		BUS_RESET_MASK      = 0x40,
+		GAP_COUNT_OFFS      = 1,
+		GAP_COUNT_MASK      = 0x3f,
+
+		SPEED_OFFS          = 2,
+		SPEED_SHIFT         = 6,
+		SPEED_MASK          = 0xc0,
+		ENHANCED_REGS_OFFS  = 2,
+		ENHANCED_REGS_MASK  = 0x20,
+		NUM_PORTS_OFFS      = 2,
+		NUM_PORTS_MASK      = 0x1f,
+		SPEED_100MBIT       = 0,
+		SPEED_200MBIT       = 1,
+		SPEED_400MBIT       = 2,
+		SPEED_RESERVED      = 3,
+
+		ASTAT1_OFFS         = 3,
+		ASTAT1_SHIFT        = 6,
+		ASTAT1_MASK         = 0xc0,
+		BSTAT1_OFFS         = 3,
+		BSTAT1_SHIFT        = 4,
+		BSTAT1_MASK         = 0x30,
+		CHILD1_OFFS         = 3,
+		CHILD1_MASK         = 0x08,
+		CONNECTION1_OFFS    = 3,
+		CONNECTION1_MASK    = 0x04,
+		PEER_SPEED1_OFFS    = 3,
+		PEER_SPEED1_MASK    = 0x03,
+
+		LPS_OFFS            = 11,
+		LPS_MASK            = 0x80,
+		PHY_DELAY_OFFS      = 11,
+		PHY_DELAY_SHIFT     = 5,
+		PHY_DELAY_MASK      = 0x60,
+		CONFIG_MGR_CAP_OFFS = 11,
+		CONFIG_MGR_CAP_MASK = 0x10,
+		POWER_CLASS_OFFS    = 11,
+		POWER_CLASS_SHIFT   = 1,
+		POWER_CLASS_MASK    = 0x0e,
+
+		CMC_PIN_OFFS        = 12,
+		CMC_PIN_MASK        = 0x80,
+		CPS_INT_OFFS        = 12,
+		CPS_INT_MASK        = 0x40,
+		LP_TEST_ERR_OFFS    = 12,
+		LP_TEST_ERR_MASK    = 0x20,
+		ARB_PHASE_OFFS      = 12,
+		ARB_PHASE_SHIFT     = 3,
+		ARB_PHASE_MASK      = 0x18,
+		ARB_STATE_OFFS      = 12,
+		ARB_STATE_MASK      = 0x07,
+		PHASE_BUS_RESET     = 0,
+		PHASE_TREE_ID       = 1,
+		PHASE_SELF_ID       = 2,
+		PHASE_NORMAL        = 3,
+
+		LP_TEST_EN_OFFS         = 13,
+		LP_TEST_EN_MASK         = 0x40,
+		ACK_ACCEL_EN_OFFS       = 13,
+		ACK_ACCEL_EN_MASK       = 0x08,
+		MULTISP_CONCAT_EN_OFFS  = 13,
+		MULTISP_CONCAT_EN_MASK  = 0x02,
+		MASK_LPS_OFFS           = 13,
+		MASK_LPS_MASK           = 0x01,
+
+		EN_TIMEOUT_OFFS     = 14,
+		EN_TIMEOUT_MASK     = 0x80,
+		IGNORE_UNPLUG_OFFS  = 14,
+		IGNORE_UNPLUG_MASK  = 0x40,
+		OVERRIDE_CMC_OFFS   = 14,
+		OVERRIDE_CMC_MASK   = 0x20,
+		SOFT_CMC_OFFS       = 14,
+		SOFT_CMC_MASK       = 0x10,
+		DISABLE_P1_OFFS     = 14,
+		DISABLE_P1_MASK     = 0x04,
+
+		SOFT_POR_OFFS       = 15,
+		SOFT_POR_MASK       = 0x80,
+		SEND_PL_DIAG_OFFS   = 15,
+		SEND_PL_DIAG_MASK   = 0x20,
+		ACK_ACCEL_SYNC_OFFS = 15,
+		ACK_ACCEL_SYNC_MASK = 0x10,
+		ISBR_OFFS           = 15,
+		ISBR_MASK           = 0x08
+	};
+
+	uint8_t m_regs[16];
+
+	emu_timer *m_reset_timer;
+	devcb_write_line m_reset_cb;
+};
+
+class ibm21s850_device : public ibm21s85x_base_device
+{
+public:
+	ibm21s850_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+private:
+	virtual void device_reset() override;
+
+	enum : uint32_t
+	{
+		ENV_OFFS            = 4,
+		ENV_SHIFT           = 6,
+		ENV_MASK            = 0xc0,
+		REG_COUNT_OFFS      = 4,
+		REG_COUNT_MASK      = 0x3f
+	};
+};
+
+class ibm21s851_device : public ibm21s85x_base_device
+{
+public:
+	ibm21s851_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+private:
+	virtual void device_reset() override;
+
+	enum : uint32_t
+	{
+		ASTAT2_OFFS         = 4,
+		ASTAT2_SHIFT        = 6,
+		ASTAT2_MASK         = 0xc0,
+		BSTAT2_OFFS         = 4,
+		BSTAT2_SHIFT        = 4,
+		BSTAT2_MASK         = 0x30,
+		CHILD2_OFFS         = 4,
+		CHILD2_MASK         = 0x08,
+		CONNECTION2_OFFS    = 4,
+		CONNECTION2_MASK    = 0x04,
+		PEER_SPEED2_OFFS    = 4,
+		PEER_SPEED2_MASK    = 0x03,
+
+		ASTAT3_OFFS         = 5,
+		ASTAT3_SHIFT        = 6,
+		ASTAT3_MASK         = 0xc0,
+		BSTAT3_OFFS         = 5,
+		BSTAT3_SHIFT        = 4,
+		BSTAT3_MASK         = 0x30,
+		CHILD3_OFFS         = 5,
+		CHILD3_MASK         = 0x08,
+		CONNECTION3_OFFS    = 5,
+		CONNECTION3_MASK    = 0x04,
+		PEER_SPEED3_OFFS    = 5,
+		PEER_SPEED3_MASK    = 0x03,
+
+		ENV_OFFS            = 6,
+		ENV_SHIFT           = 6,
+		ENV_MASK            = 0xc0,
+		REG_COUNT_OFFS      = 6,
+		REG_COUNT_MASK      = 0x3f
+	};
+};
+
+//device type definition
+DECLARE_DEVICE_TYPE(IBM21S850, ibm21s850_device)
+DECLARE_DEVICE_TYPE(IBM21S851, ibm21s851_device)
+
+#endif // MAME_MACHINE_IBM21S850_H
diff -Nru mame-0.222+dfsg.1/src/devices/machine/icm7170.cpp mame-0.224+dfsg.1/src/devices/machine/icm7170.cpp
--- mame-0.222+dfsg.1/src/devices/machine/icm7170.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/icm7170.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,7 +10,7 @@
 #include "icm7170.h"
 #include "coreutil.h"
 
-#define VERBOSE (1)
+#define VERBOSE (0)
 #include "logmacro.h"
 
 DEFINE_DEVICE_TYPE(ICM7170, icm7170_device, "icm7170", "Intersil/Renesas ICM7170 Real Time Clock")
@@ -73,7 +73,8 @@
 	: device_t(mconfig, ICM7170, tag, owner, clock),
 		device_rtc_interface(mconfig, *this),
 		device_nvram_interface(mconfig, *this),
-		m_out_irq_cb(*this)
+		m_out_irq_cb(*this),
+		m_out_irq_state(false)
 {
 }
 
@@ -87,9 +88,13 @@
 	m_out_irq_cb.resolve_safe();
 
 	m_timer = timer_alloc(ICM7170_TIMER_ID);
-	m_timer->adjust(attotime::never);
+
+	// TODO: frequency should be based on input clock and divisor
+	m_timer->adjust(attotime::from_hz(100), 0, attotime::from_hz(100));
+	m_timer->enable(false);
 
 	save_item(NAME(m_regs));
+	save_item(NAME(m_out_irq_state));
 }
 
 //-------------------------------------------------
@@ -109,6 +114,93 @@
 
 void icm7170_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
 {
+	// advance hundredths
+	m_irq_status |= IRQ_BIT_100TH_SECOND;
+	if (m_regs[REG_CNT_100TH_SEC]++ == 99)
+	{
+		m_regs[REG_CNT_100TH_SEC] = 0;
+
+		if (m_regs[REG_COMMAND] & CMD_REG_24_HOUR)
+			LOG("device_timer %02d-%02d-%02d %02d:%02d:%02d\n",
+				m_regs[REG_CNT_YEAR], m_regs[REG_CNT_MONTH], m_regs[REG_CNT_DAY],
+				m_regs[REG_CNT_HOURS], m_regs[REG_CNT_MINUTES], m_regs[REG_CNT_SECONDS]);
+		else
+			LOG("device_timer %02d-%02d-%02d %02d:%02d:%02d %s\n",
+				m_regs[REG_CNT_YEAR], m_regs[REG_CNT_MONTH], m_regs[REG_CNT_DAY],
+				m_regs[REG_CNT_HOURS] & 0xf, m_regs[REG_CNT_MINUTES], m_regs[REG_CNT_SECONDS],
+				(m_regs[REG_CNT_HOURS] & 0x80) ? "pm" : "am");
+
+		// advance seconds
+		m_irq_status |= IRQ_BIT_SECOND;
+		if (m_regs[REG_CNT_SECONDS]++ == 59)
+		{
+			m_regs[REG_CNT_SECONDS] = 0;
+
+			// advance minutes
+			m_irq_status |= IRQ_BIT_MINUTE;
+			if (m_regs[REG_CNT_MINUTES]++ == 59)
+			{
+				m_regs[REG_CNT_MINUTES] = 0;
+
+				// invert am/pm bit at 12:00
+				if (!(m_regs[REG_COMMAND] & CMD_REG_24_HOUR) && (m_regs[REG_CNT_HOURS] & 0xf) == 11)
+					m_regs[REG_CNT_HOURS] ^= 0x80;
+
+				// advance hours
+				m_irq_status |= IRQ_BIT_HOUR;
+				if (((m_regs[REG_COMMAND] & CMD_REG_24_HOUR) && (m_regs[REG_CNT_HOURS] == 23))
+				|| (!(m_regs[REG_COMMAND] & CMD_REG_24_HOUR) && (m_regs[REG_CNT_HOURS] & 0xf) == 12))
+				{
+					if (m_regs[REG_COMMAND] & CMD_REG_24_HOUR)
+						m_regs[REG_CNT_HOURS] = 0;
+					else
+						m_regs[REG_CNT_HOURS] = (m_regs[REG_CNT_HOURS] & 0x80) | 1;
+
+					// advance days
+					m_irq_status |= IRQ_BIT_DAY;
+					if (m_regs[REG_CNT_DAY]++ == gregorian_days_in_month(m_regs[REG_CNT_MONTH] & 0xf, (m_regs[REG_CNT_YEAR] & 0x7f) + 2000))
+					{
+						m_regs[REG_CNT_DAY] = 1;
+
+						// advance months
+						if (m_regs[REG_CNT_MONTH]++ == 12)
+						{
+							m_regs[REG_CNT_MONTH] = 1;
+
+							// advance years
+							if (m_regs[REG_CNT_YEAR]++ == 99)
+								m_regs[REG_CNT_YEAR] = 0;
+						}
+					}
+
+					// advance day of week
+					if (m_regs[REG_CNT_DAY_OF_WEEK]++ == 6)
+						m_regs[REG_CNT_DAY_OF_WEEK] = 0;
+				}
+				else
+					m_regs[REG_CNT_HOURS]++;
+			}
+		}
+	}
+
+	// check tenths interrupt
+	if (!(m_regs[REG_CNT_100TH_SEC] % 10))
+		m_irq_status |= IRQ_BIT_10TH_SECOND;
+
+	// check alarm
+	if (m_irq_mask & IRQ_BIT_ALARM)
+		if (BIT(m_regs[REG_RAM_YEAR], 7) || !((m_regs[REG_RAM_YEAR] ^ m_regs[REG_CNT_YEAR]) & 0x7f))
+			if (BIT(m_regs[REG_RAM_MONTH], 7) || !((m_regs[REG_RAM_MONTH] ^ m_regs[REG_CNT_MONTH]) & 0xf))
+				if (BIT(m_regs[REG_RAM_DAY], 7) || !((m_regs[REG_RAM_DAY] ^ m_regs[REG_CNT_DAY]) & 0x1f))
+					if (BIT(m_regs[REG_RAM_HOURS], 6)
+					|| ((m_regs[REG_COMMAND] & CMD_REG_24_HOUR) && !((m_regs[REG_RAM_HOURS] ^ m_regs[REG_CNT_HOURS]) & 0x1f))
+					|| (!(m_regs[REG_COMMAND] & CMD_REG_24_HOUR) && !((m_regs[REG_RAM_HOURS] ^ m_regs[REG_CNT_HOURS]) & 0x8f)))
+						if (BIT(m_regs[REG_RAM_MINUTES], 7) || !((m_regs[REG_RAM_MINUTES] ^ m_regs[REG_CNT_MINUTES]) & 0x3f))
+							if (BIT(m_regs[REG_RAM_SECONDS], 7) || !((m_regs[REG_RAM_SECONDS] ^ m_regs[REG_CNT_SECONDS]) & 0x3f))
+								if (BIT(m_regs[REG_RAM_100TH_SEC], 7) || !((m_regs[REG_RAM_100TH_SEC] ^ m_regs[REG_CNT_100TH_SEC]) & 0x7f))
+									m_irq_status |= IRQ_BIT_ALARM;
+
+	recalc_irqs();
 }
 
 
@@ -124,9 +216,29 @@
 		m_regs[REG_CNT_MONTH] = month;
 		m_regs[REG_CNT_DAY] = day;
 		m_regs[REG_CNT_DAY_OF_WEEK] = day_of_week;
-		m_regs[REG_CNT_HOURS] = hour;
+		if (!(m_regs[REG_COMMAND] & CMD_REG_24_HOUR))
+		{
+			// transform hours from 0..23 to 1..12
+			m_regs[REG_CNT_HOURS] = (hour > 12) ? hour - 12 : hour ? hour : 1;
+
+			// set am/pm bit
+			if (hour > 11)
+				m_regs[REG_CNT_HOURS] |= 0x80;
+		}
+		else
+			m_regs[REG_CNT_HOURS] = hour;
 		m_regs[REG_CNT_MINUTES] = minute;
 		m_regs[REG_CNT_SECONDS] = second;
+
+		if (m_regs[REG_COMMAND] & CMD_REG_24_HOUR)
+			LOG("rtc_clock_updated %02d-%02d-%02d %02d:%02d:%02d\n",
+				m_regs[REG_CNT_YEAR], m_regs[REG_CNT_MONTH], m_regs[REG_CNT_DAY],
+				m_regs[REG_CNT_HOURS], m_regs[REG_CNT_MINUTES], m_regs[REG_CNT_SECONDS]);
+		else
+			LOG("rtc_clock_updated %02d-%02d-%02d %02d:%02d:%02d %s\n",
+				m_regs[REG_CNT_YEAR], m_regs[REG_CNT_MONTH], m_regs[REG_CNT_DAY],
+				m_regs[REG_CNT_HOURS] & 0xf, m_regs[REG_CNT_MINUTES], m_regs[REG_CNT_SECONDS],
+				(m_regs[REG_CNT_HOURS] & 0x80) ? "pm" : "am");
 	}
 }
 
@@ -166,11 +278,13 @@
 // non-inherited device functions
 uint8_t icm7170_device::read(offs_t offset)
 {
-	uint8_t data =  m_regs[offset & 0x1f];
+	uint8_t data = m_regs[offset & 0x1f];
 
 	if ((offset & 0x1f) == REG_INT_STATUS_AND_MASK)
 	{
 		data = m_irq_status;
+		m_irq_status = 0;
+		recalc_irqs();
 	}
 
 	LOG("ICM7170 Register %d Read %02x\n", offset, data);
@@ -180,6 +294,7 @@
 
 void icm7170_device::write(offs_t offset, uint8_t data)
 {
+	// TODO: unused register bits should be masked
 	switch (offset & 0x1f)
 	{
 		case REG_INT_STATUS_AND_MASK:
@@ -188,6 +303,10 @@
 			recalc_irqs();
 			break;
 
+		case REG_COMMAND:
+			m_timer->enable(data & CMD_REG_RUN);
+			// fall through
+
 		default:
 			m_regs[offset & 0x1f] = data;
 			LOG("ICM7170 Register %d Write %02x\n", offset & 0x1f, data);
@@ -197,5 +316,16 @@
 
 void icm7170_device::recalc_irqs()
 {
+	if (m_irq_status & m_irq_mask & ~IRQ_BIT_GLOBAL)
+		m_irq_status |= IRQ_BIT_GLOBAL;
+	else
+		m_irq_status &= ~IRQ_BIT_GLOBAL;
+
+	bool const irq_state = (m_regs[REG_COMMAND] & CMD_REG_IRQ_ENABLE) && (m_irq_status & IRQ_BIT_GLOBAL);
+	if (m_out_irq_state != irq_state)
+	{
+		m_out_irq_state = irq_state;
+		m_out_irq_cb(m_out_irq_state);
+	}
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/icm7170.h mame-0.224+dfsg.1/src/devices/machine/icm7170.h
--- mame-0.222+dfsg.1/src/devices/machine/icm7170.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/icm7170.h	2020-08-26 08:57:19.000000000 +0000
@@ -75,6 +75,7 @@
 	void recalc_irqs();
 
 	devcb_write_line m_out_irq_cb;
+	bool m_out_irq_state;
 
 	uint8_t m_regs[0x20];
 	uint8_t m_irq_mask, m_irq_status;
diff -Nru mame-0.222+dfsg.1/src/devices/machine/iwm.cpp mame-0.224+dfsg.1/src/devices/machine/iwm.cpp
--- mame-0.222+dfsg.1/src/devices/machine/iwm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/iwm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,7 +2,7 @@
 // copyright-holders:Olivier Galibert
 /*********************************************************************
 
-    iwm.c
+    iwm.cpp
 
     Implementation of the Apple IWM floppy disk controller
 
@@ -15,10 +15,13 @@
 
 iwm_device::iwm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, uint32_t q3_clock) :
 	applefdintf_device(mconfig, IWM, tag, owner, clock),
+	m_floppy(nullptr),
 	m_q3_clock(q3_clock)
 {
-	m_q3_fclk_ratio = double(clock)/double(q3_clock); // ~0.25
-	m_fclk_q3_ratio = double(q3_clock)/double(clock); // ~4
+	if (q3_clock != 0)
+		m_q3_fclk_ratio = double(clock)/double(q3_clock); // ~0.25
+	if (clock != 0)
+		m_fclk_q3_ratio = double(q3_clock)/double(clock); // ~4
 }
 
 u64 iwm_device::q3_to_fclk(u64 cycles) const
@@ -60,7 +63,6 @@
 {
 	applefdintf_device::device_reset();
 
-	m_floppy = nullptr;
 	m_last_sync = machine().time().as_ticks(clock());
 	m_next_state_change = 0;
 	m_active = MODE_IDLE;
diff -Nru mame-0.222+dfsg.1/src/devices/machine/iwm.h mame-0.224+dfsg.1/src/devices/machine/iwm.h
--- mame-0.222+dfsg.1/src/devices/machine/iwm.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/iwm.h	2020-08-26 08:57:19.000000000 +0000
@@ -5,14 +5,14 @@
     Apple IWM floppy disk controller
 
 *********************************************************************/
-
-#pragma once
-
 #ifndef MAME_MACHINE_IWM_H
 #define MAME_MACHINE_IWM_H
 
+#pragma once
+
 #include "applefdintf.h"
 
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
diff -Nru mame-0.222+dfsg.1/src/devices/machine/m68sfdc.cpp mame-0.224+dfsg.1/src/devices/machine/m68sfdc.cpp
--- mame-0.222+dfsg.1/src/devices/machine/m68sfdc.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/m68sfdc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,869 @@
+// license:BSD-3-Clause
+// copyright-holders:68bit
+//
+// Motorola M68SFDC floppy disk controller
+//
+// References:
+//
+// "M68SFDC2(D) EXORdisk II Floppy disk controller module - Users's guide.",
+// Motorola, June 1978.
+//
+// "AN-764: A floppy disk controller using the MC6852 SSDA and other M6800
+// microprocessor family parts", Motorola 1976.
+
+#include "emu.h"
+#include "m68sfdc.h"
+
+m68sfdc_device::m68sfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+	device_t(mconfig, M68SFDC, tag, owner, clock),
+	m_pia(*this, "pia"),
+	m_ssda(*this, "ssda"),
+	m_timer_head_load(nullptr),
+	m_timer_timeout(nullptr),
+	m_irq_handler(*this),
+	m_nmi_handler(*this),
+	m_select2_mode(*this, "SELECT2_MODE"),
+	m_select3_mode(*this, "SELECT3_MODE"),
+	m_disk_sides(*this, "DISK_SIDES"),
+	m_write_protect_mode(*this, "WRITE_PROTECT_MODE"),
+	m_stepper_mode(*this, "STEPPER_MODE")
+{
+}
+
+INPUT_PORTS_START(m68sfdc)
+
+	PORT_START("SELECT2_MODE")
+	PORT_CONFNAME(0x01, 0x00, "Select 2 line mode")
+	PORT_CONFSETTING(0, "Not connected")
+	PORT_CONFSETTING(1, "Selects drives 2 and 3")
+
+	PORT_START("SELECT3_MODE")
+	PORT_CONFNAME(0x01, 0x00, "Select 3 line mode")
+	PORT_CONFSETTING(0, "Not connected")
+	PORT_CONFSETTING(1, "Selects drive head")
+
+	PORT_START("DISK_SIDES")
+	PORT_CONFNAME(0x20, 0x20, "Disk sides switch")
+	PORT_CONFSETTING(0x20, "Single sided")
+	PORT_CONFSETTING(0x00, "Double sided")
+
+	PORT_START("WRITE_PROTECT_MODE")
+	PORT_CONFNAME(0x1, 0x1, "Write-enabled line mode")
+	PORT_CONFSETTING(0x0, "Active low write protect")
+	PORT_CONFSETTING(0x1, "Active low write enabled")
+
+	PORT_START("STEPPER_MODE")
+	PORT_CONFNAME(0x1, 0x0, "Stepper control lines mode")
+	PORT_CONFSETTING(0x0, "Conventional")
+	PORT_CONFSETTING(0x1, "'Step' line steps in, 'direction' line steps out")
+
+INPUT_PORTS_END
+
+ioport_constructor m68sfdc_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(m68sfdc);
+}
+
+void m68sfdc_device::device_resolve_objects()
+{
+}
+
+void m68sfdc_device::device_start()
+{
+	m_irq_handler.resolve_safe();
+	m_nmi_handler.resolve_safe();
+
+	m_timer_head_load = timer_alloc(TM_HEAD_LOAD);
+	m_timer_timeout = timer_alloc(TM_TIMEOUT);
+	save_item(NAME(m_select_0));
+	save_item(NAME(m_select_1));
+	save_item(NAME(m_select_2));
+	save_item(NAME(m_select_3));
+	save_item(NAME(m_step));
+	save_item(NAME(m_direction));
+	save_item(NAME(m_head_load1));
+	save_item(NAME(m_head_load2));
+	save_item(NAME(m_head_load));
+	save_item(NAME(m_crc));
+	save_item(NAME(m_last_crc));
+	save_item(NAME(m_pia_ca1));
+	save_item(NAME(m_pia_cb2));
+	save_item(NAME(m_reset));
+	save_item(NAME(m_enable_drive_write));
+	save_item(NAME(m_enable_read));
+	save_item(NAME(m_shift_crc));
+	save_item(NAME(m_shift_crc_count));
+	save_item(NAME(m_tuf_count));
+	save_item(NAME(m_ssda_reg));
+
+	m_floppy = nullptr;
+
+	t_gen = timer_alloc(TM_GEN);
+}
+
+void m68sfdc_device::device_reset()
+{
+	m_select_0 = 0;
+	m_select_1 = 0;
+	m_select_2 = 0;
+	m_select_3 = 0;
+	m_step = 1;
+	m_direction = 0;
+	m_head_load1 = 0;
+	m_head_load2 = 0;
+	m_head_load = 0;
+	m_crc = 0;
+	m_last_crc = 0;
+	m_pia_ca1 = 0;
+	m_pia_cb2 = 0;
+	m_reset = 1;
+	m_enable_drive_write = 0;
+	m_enable_read = 0;
+	m_shift_crc = 0;
+	m_shift_crc_count = 0;
+	m_tuf_count = 0;
+
+	m_irq_handler(false);
+	m_nmi_handler(false);
+}
+
+void m68sfdc_device::set_floppies_4(floppy_connector *f0, floppy_connector *f1, floppy_connector *f2, floppy_connector *f3)
+{
+	m_floppy0 = f0;
+	m_floppy1 = f1;
+	m_floppy2 = f2;
+	m_floppy3 = f3;
+
+	if (m_floppy0)
+	{
+		m_floppy = m_floppy0->get_device();
+	}
+}
+
+WRITE_LINE_MEMBER(m68sfdc_device::handle_irq)
+{
+	m_irq_handler(state);
+}
+
+WRITE_LINE_MEMBER(m68sfdc_device::handle_nmi)
+{
+	m_nmi_handler(state);
+}
+
+void m68sfdc_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	switch (id)
+	{
+	case TM_HEAD_LOAD:
+	{
+		live_sync();
+		m_head_load2 = 0;
+		u8 head_load = m_head_load1 && m_head_load2;
+		if (head_load != m_head_load)
+		{
+			// TODO sound?
+			m_head_load = head_load;
+		}
+		break;
+	}
+	case TM_TIMEOUT:
+	{
+		live_sync();
+		m_pia->ca1_w(0);
+		m_pia_ca1 = 0;
+		break;
+	}
+	case TM_GEN:
+		live_sync();
+		live_run();
+		break;
+	default:
+		throw emu_fatalerror("Unknown id in m68sfdc_device::device_timer");
+	}
+}
+
+
+
+uint8_t m68sfdc_device::flip_bits(uint8_t data)
+{
+	data = (data & 0b11110000) >> 4 | (data & 0b00001111) << 4;
+	data = (data & 0b11001100) >> 2 | (data & 0b00110011) << 2;
+	data = (data & 0b10101010) >> 1 | (data & 0b01010101) << 1;
+	return data;
+}
+
+
+u8 m68sfdc_device::read(offs_t offset)
+{
+	if (!machine().side_effects_disabled())
+	{
+		live_sync();
+		// Triggers the 0.8 second head-load timer.
+		m_timer_head_load->reset(attotime::from_msec(800));
+	}
+
+	if (offset > 3)
+	{
+		u8 data = m_ssda->read(offset - 4);
+		// The data bits are connected in reverse.
+		data = (data & 0b11110000) >> 4 | (data & 0b00001111) << 4;
+		data = (data & 0b11001100) >> 2 | (data & 0b00110011) << 2;
+		data = (data & 0b10101010) >> 1 | (data & 0b01010101) << 1;
+		return data;
+
+	}
+
+	// The 6821 address lines are swapped.
+	offset = ((offset & 1) << 1) | (offset >> 1);
+	return m_pia->read(offset);
+}
+
+#define C1_RX_RS 0x01
+#define C1_AC_MASK 0xc0
+#define C1_AC_C2 0x00
+#define C2_PC_MASK 0x03
+#define C2_PC1 0x01
+
+
+void m68sfdc_device::write(offs_t offset, u8 data)
+{
+	live_sync();
+
+	// Triggers the 0.8 second head-load timer.
+	m_head_load2 = 1;
+	m_timer_head_load->reset(attotime::from_msec(800));
+
+	if (offset > 3)
+	{
+		// Address line A1 is not decoded for the SSDA
+		offset = (offset - 4) & 0x0001;
+
+		// The data bits are connected in reverse.
+		data = (data & 0b11110000) >> 4 | (data & 0b00001111) << 4;
+		data = (data & 0b11001100) >> 2 | (data & 0b00110011) << 2;
+		data = (data & 0b10101010) >> 1 | (data & 0b01010101) << 1;
+		m_ssda->write(offset, data);
+
+		// Maintain shadow copies of the 6852 register writes.
+		if (offset == 0)
+			m_ssda_reg[0] = data;
+		else
+			m_ssda_reg[(m_ssda_reg[0] >> 6) + 1] = data;
+
+		if (offset == 1 && (m_ssda_reg[0] & C1_AC_MASK) == C1_AC_C2 &&
+			(data & C2_PC_MASK) == C2_PC1 && m_enable_read)
+		{
+			// This a write to the 6852 CR2 register which enables
+			// the SM output (PC2 = 0, PC1 = 1), while the read
+			// logic is enabled. At this point all is setup to
+			// search for a sync code.
+			if (m_reset == 0 && m_enable_read)
+			{
+				live_start(SYNC1);
+			}
+		}
+
+		if (offset == 0 && m_enable_read && (data & C1_RX_RS) != 0)
+		{
+			live_abort();
+		}
+
+		return;
+	}
+
+	// The 6821 address lines are swapped.
+	offset = ((offset & 1) << 1) | (offset >> 1);
+	m_pia->write(offset, data);
+}
+
+
+uint8_t m68sfdc_device::pia_pa_r()
+{
+	int ready = 1;
+	int track0 = 1;
+	if (m_floppy)
+	{
+		ready = m_floppy->ready_r();
+		track0 = m_floppy->trk00_r();
+	}
+
+	// While this is not connected in the schematic, the MDOS 3 format
+	// command probes this input to determine if a disk is to be formatted
+	// singled sided (1) or double sided (0), and it is assumed to be a
+	// later revision.
+	int sides = m_disk_sides->read();
+
+	return (track0 ? 0 : 0x80) | (ready << 6) | sides;
+}
+
+void m68sfdc_device::update_floppy_selection()
+{
+	floppy_image_device *floppy = nullptr;
+	u8 select2_mode = m_select2_mode->read();
+
+	if (select2_mode == 0 || m_select_2 == 0)
+	{
+		if (!m_select_1 && m_select_0)
+			floppy = m_floppy0->get_device();
+		else if (m_select_1 && !m_select_0)
+			floppy = m_floppy1->get_device();
+	}
+	else
+	{
+		if (!m_select_1 && m_select_0)
+			floppy = m_floppy2->get_device();
+		else if (m_select_1 && !m_select_0)
+			floppy = m_floppy3->get_device();
+	}
+
+	if (floppy != m_floppy)
+	{
+		if (m_floppy)
+		{
+			m_floppy->mon_w(1); // Active low
+			m_floppy->setup_index_pulse_cb(floppy_image_device::index_pulse_cb());
+		}
+		m_floppy = floppy;
+		if (m_floppy)
+		{
+			// Assume the motors are always on?
+			m_floppy->mon_w(0); // Active low
+			if (m_stepper_mode->read())
+			{
+				m_floppy->dir_w(0);
+				m_floppy->stp_w(0);
+			}
+			else
+			{
+				m_floppy->dir_w(m_direction);
+				m_floppy->stp_w(m_step);
+			}
+			m_floppy->ss_w(m_select3_mode->read() ? m_select_3 : 0);
+			m_floppy->setup_index_pulse_cb(floppy_image_device::index_pulse_cb(&m68sfdc_device::fdc_index_callback, this));
+		}
+	}
+}
+
+void m68sfdc_device::pia_pa_w(u8 data)
+{
+	// Select 0 and select 1 are used for drive selection. When 0x02 these
+	// select drive 0 or 2, and when 0x01 select drive 1 or 3. These are
+	// used in conjuction with select 2 to decode four drives.
+	m_select_0 = !BIT(data, 0);
+	m_select_1 = !BIT(data, 1);
+	// u8 m_gt_trk43 = !BIT(data, 2);
+	u8 direction = !BIT(data, 3);
+	m_head_load1 = !BIT(data, 4);
+
+	if (m_floppy)
+	{
+		if (m_stepper_mode->read())
+		{
+			if (m_direction == 0 && direction == 1)
+			{
+				m_floppy->dir_w(0);
+				m_floppy->stp_w(1);
+				m_floppy->stp_w(0);
+			}
+		}
+		else
+		{
+			m_floppy->dir_w(m_direction);
+			m_floppy->stp_w(m_step);
+		}
+
+		m_floppy->ss_w(m_select3_mode->read() ? m_select_3 : 0);
+	}
+	m_direction = direction;
+
+	update_floppy_selection();
+
+	u8 head_load = m_head_load1 && m_head_load2;
+	if (head_load != m_head_load)
+	{
+		// TODO sound?
+		m_head_load = head_load;
+	}
+}
+
+int m68sfdc_device::pia_ca1_r()
+{
+	return m_pia_ca1;
+}
+
+void m68sfdc_device::pia_ca2_w(int state)
+{
+	if (m_floppy)
+	{
+		if (m_stepper_mode->read())
+		{
+			if (m_step == 1 && state == 0)
+			{
+				m_floppy->dir_w(1);
+				m_floppy->stp_w(1);
+				m_floppy->stp_w(0);
+			}
+		}
+		else
+		{
+			m_floppy->dir_w(m_direction);
+			m_floppy->stp_w(state);
+		}
+	}
+	m_step = state;
+}
+
+uint8_t m68sfdc_device::pia_pb_r()
+{
+	int wpt = m_floppy ? m_floppy->wpt_r() : 1;
+
+	if (m_write_protect_mode->read())
+		wpt = !wpt;
+
+	return (wpt << 4) | (m_crc << 7);
+}
+
+void m68sfdc_device::pia_pb_w(u8 data)
+{
+	u8 reset = BIT(data, 0);
+	u8 enable_drive_write = !BIT(data, 1);
+	m_enable_read = BIT(data, 2);
+	u8 shift_crc = BIT(data, 3);
+	// Select 2 is used for drive selection in MDOS, expanding the
+	// capability from 2 to 4 drives. A port value of 1 selects drives 0
+	// and 1, and a port value of 0 selects drives 2 and 3.
+	m_select_2 = !BIT(data, 5);
+	// Select 3 is used for head selection in MDOS 3. A port value of 1
+	// selects head 0, and a port value of 0 selects head 1.
+	m_select_3 = !BIT(data, 6);
+
+	int reset_edge = m_reset == 0 && reset == 1;
+	int disable_write_edge = m_enable_drive_write == 1 && enable_drive_write == 0;
+	int enable_write_edge = m_enable_drive_write == 0 && enable_drive_write == 1;
+	int shift_crc_edge = m_shift_crc == 0 && shift_crc == 1;
+
+	m_reset = reset;
+	m_enable_drive_write = enable_drive_write;
+	m_shift_crc = shift_crc;
+
+	if (m_floppy)
+		m_floppy->ss_w(m_select3_mode->read() ? m_select_3 : 0);
+
+	update_floppy_selection();
+
+	if (shift_crc_edge)
+		m_shift_crc_count = 2;
+
+	if (reset_edge)
+		m_shift_crc_count = 0;
+
+	// When reset goes high the read circuit switches to using a 500kHz
+	// clock to search for the sync byte. It also resets the CRC
+	// calculation. A reset may occur during a write, in a format
+	// operation, so don't idle if still writing.
+	if ((reset_edge && !enable_drive_write) || disable_write_edge)
+	{
+		// End of read or write operations.
+		// typically m_enable_read will be low here too.
+		live_abort();
+	}
+
+	if (enable_write_edge && m_floppy && !(m_select_0 && m_select_1))
+	{
+		// Start of write operations, even if the logic is in reset.
+		m_tuf_count = 0;
+		live_start(WRITE);
+	}
+}
+
+int m68sfdc_device::pia_cb1_r()
+{
+	// Index pulse, active high at CB1.
+	if (m_floppy)
+	{
+		int index = m_floppy->idx_r() ? 0 : 1;
+		return index;
+	}
+	return 0;
+}
+
+void m68sfdc_device::pia_cb2_w(int state)
+{
+	if (m_pia_cb2 == 1 && state == 0)
+	{
+		// Trigger the timeout timer on a high to low transition of CB2
+		m_pia->ca1_w(1);
+		m_pia_ca1 = 1;
+		m_timer_timeout->reset(attotime::from_msec(800));
+	}
+	m_pia_cb2 = state;
+}
+
+void m68sfdc_device::fdc_index_callback(floppy_image_device *floppy, int state)
+{
+	live_sync();
+	m_pia->cb1_w(state ? 0 : 1);
+	live_run();
+}
+
+
+void m68sfdc_device::live_start(int state)
+{
+	cur_live.tm = machine().time();
+	cur_live.state = state;
+	cur_live.next_state = -1;
+	cur_live.shift_reg = 0;
+	cur_live.crc = 0xffff;
+	cur_live.bit_counter = 0;
+	cur_live.data_separator_phase = false;
+	cur_live.data_reg = 0;
+
+	pll_reset(cur_live.tm);
+	checkpoint_live = cur_live;
+	pll_save_checkpoint();
+
+	live_run();
+}
+
+void m68sfdc_device::checkpoint()
+{
+	pll_commit(m_floppy, cur_live.tm);
+	checkpoint_live = cur_live;
+	pll_save_checkpoint();
+}
+
+void m68sfdc_device::rollback()
+{
+	cur_live = checkpoint_live;
+	pll_retrieve_checkpoint();
+}
+
+
+void m68sfdc_device::pll_reset(const attotime &when)
+{
+	cur_pll.reset(when);
+	// 500kHz
+	cur_pll.set_clock(attotime::from_nsec(2000));
+}
+
+void m68sfdc_device::live_delay(int state)
+{
+	cur_live.next_state = state;
+	t_gen->adjust(cur_live.tm - machine().time());
+}
+
+void m68sfdc_device::live_sync()
+{
+	if(!cur_live.tm.is_never()) {
+		if(cur_live.tm > machine().time()) {
+			rollback();
+			live_run(machine().time());
+			pll_commit(m_floppy, cur_live.tm);
+		} else {
+			pll_commit(m_floppy, cur_live.tm);
+			if(cur_live.next_state != -1) {
+				cur_live.state = cur_live.next_state;
+				cur_live.next_state = -1;
+			}
+			if(cur_live.state == IDLE) {
+				pll_stop_writing(m_floppy, cur_live.tm);
+				cur_live.tm = attotime::never;
+			}
+		}
+		cur_live.next_state = -1;
+		checkpoint();
+	}
+}
+
+void m68sfdc_device::live_abort()
+{
+	if(!cur_live.tm.is_never() && cur_live.tm > machine().time()) {
+		rollback();
+		live_run(machine().time());
+	}
+
+	pll_stop_writing(m_floppy, cur_live.tm);
+	cur_live.tm = attotime::never;
+	cur_live.state = IDLE;
+	cur_live.next_state = -1;
+}
+
+bool m68sfdc_device::read_one_bit(const attotime &limit)
+{
+	int bit = pll_get_next_bit(cur_live.tm, m_floppy, limit);
+	if(bit < 0)
+		return true;
+	cur_live.shift_reg = (cur_live.shift_reg << 1) | bit;
+	cur_live.bit_counter++;
+	if(cur_live.data_separator_phase) {
+		cur_live.data_reg = (cur_live.data_reg << 1) | bit;
+		if((cur_live.crc ^ (bit ? 0x8000 : 0x0000)) & 0x8000)
+			cur_live.crc = (cur_live.crc << 1) ^ 0x1021;
+		else
+			cur_live.crc = cur_live.crc << 1;
+	}
+	cur_live.data_separator_phase = !cur_live.data_separator_phase;
+	return false;
+}
+
+bool m68sfdc_device::write_one_bit(const attotime &limit)
+{
+	bool bit = cur_live.shift_reg & 0x8000;
+	if(pll_write_next_bit(bit, cur_live.tm, m_floppy, limit))
+		return true;
+	if(cur_live.bit_counter & 1) {
+		if((cur_live.crc ^ (bit ? 0x8000 : 0x0000)) & 0x8000)
+			cur_live.crc = (cur_live.crc << 1) ^ 0x1021;
+		else
+			cur_live.crc = cur_live.crc << 1;
+	}
+	cur_live.shift_reg = cur_live.shift_reg << 1;
+	cur_live.bit_counter--;
+	return false;
+}
+
+void m68sfdc_device::live_write_fm(uint8_t fm)
+{
+	uint16_t raw = 0xaaaa;
+	for(int i=0; i<8; i++)
+		if(fm & (0x80 >> i))
+			raw |= 0x4000 >> (2*i);
+	cur_live.data_reg = fm;
+	cur_live.shift_reg = raw;
+}
+
+void m68sfdc_device::live_run(attotime limit)
+{
+	if(cur_live.state == IDLE || cur_live.next_state != -1)
+		return;
+
+	if(limit == attotime::never) {
+		if(m_floppy)
+			limit = m_floppy->time_next_index();
+		if(limit == attotime::never) {
+			// Happens when there's no disk or if the wd is not
+			// connected to a drive, hence no index pulse. Force a
+			// sync from time to time in that case, so that the main
+			// cpu timeout isn't too painful.  Avoids looping into
+			// infinity looking for data too.
+
+			limit = machine().time() + attotime::from_msec(1);
+			t_gen->adjust(attotime::from_msec(1));
+		}
+	}
+
+	for(;;) {
+		switch(cur_live.state) {
+		case SYNC1: {
+			if(read_one_bit(limit))
+				return;
+
+			// The SSDA performs the sync code search, and the code
+			// will have been loaded into the SSDA sync code
+			// register. This is emulated here, and the code loaded
+			// from a copy of SSDA register writes.
+			int sync = flip_bits(m_ssda_reg[3]);
+
+			// The SSDA searches for only the 8-bit 0xf5 code, and
+			// the CPU loads and checks the subsequent code. The
+			// 0xaa prefix check is an emulator hack for now to
+			// improve detection reliability.
+			if ((cur_live.shift_reg & 0xff) == sync &&
+				(cur_live.shift_reg >> 8) == 0xaa)
+			{
+				// Initialize the CRC. The hardware has an 8
+				// bit shift register to delay the bit stream
+				// so that it can reset the CRC on this sync
+				// event and then feed it the delayed sync
+				// code.
+				cur_live.crc = 0xffff;
+				cur_live.data_separator_phase = false;
+				cur_live.bit_counter = 0;
+				for (int i = 6; i >= 0; i-=2)
+				{
+					int bit = BIT(cur_live.shift_reg, i);
+					if((cur_live.crc ^ (bit ? 0x8000 : 0x0000)) & 0x8000)
+						cur_live.crc = (cur_live.crc << 1) ^ 0x1021;
+					else
+						cur_live.crc = cur_live.crc << 1;
+				}
+				live_delay(SYNC_BYTE1);
+				return;
+			}
+
+			break;
+		}
+		case SYNC_BYTE1:
+			m_ssda->receive_byte(flip_bits(cur_live.shift_reg & 0xff));
+			cur_live.state = SYNC2;
+			checkpoint();
+			break;
+
+		case SYNC2: {
+			if(read_one_bit(limit))
+				return;
+
+			if(cur_live.bit_counter == 8)
+			{
+				live_delay(SYNC_BYTE2);
+				return;
+			}
+
+			break;
+		}
+		case SYNC_BYTE2:
+			m_ssda->receive_byte(flip_bits(cur_live.shift_reg & 0xff));
+			cur_live.bit_counter = 0;
+			cur_live.state = READ;
+			checkpoint();
+			break;
+
+		case READ: {
+			if(read_one_bit(limit))
+				return;
+
+			if(cur_live.bit_counter & 15)
+				break;
+
+			live_delay(READ_BYTE);
+			return;
+		}
+
+		case READ_BYTE:
+			m_ssda->receive_byte(flip_bits(cur_live.data_reg));
+			cur_live.state = READ;
+
+			// The data to the CRC generator is delayed 8 bits behind
+			// the SSDA data input delaying the CRC line.
+			m_crc = m_last_crc;
+			m_last_crc = cur_live.crc != 0;
+
+			// Unfortunately the emulated system can at times read
+			// the CRC line early, the timing needs work, so as a
+			// workaround for now the CRC line is asserted early at
+			// expected CRC end positions: address marks, and 128
+			// and 256 byte data sectors.
+			if (cur_live.bit_counter == (4 + 2) * 16 ||
+				cur_live.bit_counter == (128 + 2) * 16 ||
+				cur_live.bit_counter == (256 + 2) * 16)
+			{
+				m_crc = m_last_crc;
+			}
+
+			checkpoint();
+			break;
+
+		case WRITE:
+		{
+			int tuf;
+			u8 data = flip_bits(m_ssda->get_tx_byte(&tuf));
+
+			if (tuf)
+			{
+				m_tuf_count = 3;
+			}
+			else if (m_tuf_count > 0)
+			{
+				if (m_tuf_count == 2)
+				{
+					// Start of the sync code,
+					// initialize the CRC.
+					cur_live.crc = 0xffff;
+				}
+
+			}
+
+			if (m_tuf_count > 0)
+			{
+				// Data clocked at 500kHz
+				cur_live.shift_reg = data << 8;
+				cur_live.bit_counter = 8;
+				m_tuf_count--;
+			}
+			else
+			{
+				// Data clocked at 250kHz
+
+				// If the 'shift crc' line has been asserted
+				// then write the CRC code rather than the SSDA
+				// data, and for two bytes.
+				if (m_shift_crc_count > 0)
+				{
+					// Two CRC bytes
+					data = cur_live.crc >> 8;
+					m_shift_crc_count--;
+				}
+
+				live_write_fm(data);
+				cur_live.bit_counter = 16;
+			}
+
+			cur_live.state = WRITE_BITS;
+			checkpoint();
+			break;
+		}
+
+		case WRITE_BITS:
+			if(write_one_bit(limit))
+				return;
+			if(cur_live.bit_counter == 0) {
+				live_delay(WRITE);
+				return;
+			}
+			break;
+
+		default:
+			logerror("%s: Unknown live state %d\n", cur_live.tm.to_string(), cur_live.state);
+			return;
+		}
+	}
+}
+
+void m68sfdc_device::pll_commit(floppy_image_device *floppy, const attotime &tm)
+{
+	cur_pll.commit(floppy, tm);
+}
+
+void m68sfdc_device::pll_stop_writing(floppy_image_device *floppy, const attotime &tm)
+{
+	cur_pll.stop_writing(floppy, tm);
+}
+
+void m68sfdc_device::pll_save_checkpoint()
+{
+	checkpoint_pll = cur_pll;
+}
+
+void m68sfdc_device::pll_retrieve_checkpoint()
+{
+	cur_pll = checkpoint_pll;
+}
+
+int m68sfdc_device::pll_get_next_bit(attotime &tm, floppy_image_device *floppy, const attotime &limit)
+{
+	return cur_pll.get_next_bit(tm, m_floppy, limit);
+}
+
+bool m68sfdc_device::pll_write_next_bit(bool bit, attotime &tm, floppy_image_device *floppy, const attotime &limit)
+{
+	return cur_pll.write_next_bit(bit, tm, m_floppy, limit);
+}
+
+void m68sfdc_device::device_add_mconfig(machine_config &config)
+{
+	PIA6821(config, m_pia, 0);
+	m_pia->readpa_handler().set(FUNC(m68sfdc_device::pia_pa_r));
+	m_pia->writepa_handler().set(FUNC(m68sfdc_device::pia_pa_w));
+	m_pia->readca1_handler().set(FUNC(m68sfdc_device::pia_ca1_r));
+	m_pia->ca2_handler().set(FUNC(m68sfdc_device::pia_ca2_w));
+	m_pia->readpb_handler().set(FUNC(m68sfdc_device::pia_pb_r));
+	m_pia->writepb_handler().set(FUNC(m68sfdc_device::pia_pb_w));
+	m_pia->readcb1_handler().set(FUNC(m68sfdc_device::pia_cb1_r));
+	m_pia->cb2_handler().set(FUNC(m68sfdc_device::pia_cb2_w));
+	m_pia->irqa_handler().set(FUNC(m68sfdc_device::handle_nmi));
+	m_pia->irqb_handler().set(FUNC(m68sfdc_device::handle_irq));
+
+	MC6852(config, m_ssda, 0);
+}
+
+DEFINE_DEVICE_TYPE(M68SFDC, m68sfdc_device, "m68sfdc", "M68SFDC")
diff -Nru mame-0.222+dfsg.1/src/devices/machine/m68sfdc.h mame-0.224+dfsg.1/src/devices/machine/m68sfdc.h
--- mame-0.222+dfsg.1/src/devices/machine/m68sfdc.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/m68sfdc.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,149 @@
+// license:BSD-3-Clause
+// copyright-holders:68bit
+//
+// Motorola M68SFDC floppy disk controller
+
+#ifndef MAME_MACHINE_M68SFDC_H
+#define MAME_MACHINE_M68SFDC_H
+
+#pragma once
+
+#include "machine/6821pia.h"
+#include "machine/clock.h"
+#include "machine/fdc_pll.h"
+#include "machine/mc6852.h"
+#include "machine/timer.h"
+#include "imagedev/floppy.h"
+
+INPUT_PORTS_EXTERN(m68sfdc);
+
+class m68sfdc_device : public device_t {
+public:
+	m68sfdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	void write(offs_t reg, uint8_t val);
+	uint8_t read(offs_t reg);
+
+	auto irq_handler() { return m_irq_handler.bind(); }
+	auto nmi_handler() { return m_nmi_handler.bind(); }
+
+	void set_floppies_4(floppy_connector*, floppy_connector*, floppy_connector*, floppy_connector*);
+
+private:
+	required_device<pia6821_device> m_pia;
+	required_device<mc6852_device> m_ssda;
+	emu_timer *m_timer_head_load;
+	emu_timer *m_timer_timeout;
+
+	devcb_write_line m_irq_handler;
+	devcb_write_line m_nmi_handler;
+	DECLARE_WRITE_LINE_MEMBER(handle_irq);
+	DECLARE_WRITE_LINE_MEMBER(handle_nmi);
+
+	uint8_t flip_bits(uint8_t data);
+	uint8_t pia_pa_r();
+	void pia_pa_w(u8 data);
+	int pia_ca1_r();
+	void pia_ca2_w(int state);
+	uint8_t pia_pb_r();
+	void pia_pb_w(u8 data);
+	int pia_cb1_r();
+	void pia_cb2_w(int state);
+	u8 m_select_0;
+	u8 m_select_1;
+	u8 m_select_2;
+	u8 m_select_3;
+	u8 m_step;
+	u8 m_direction;
+	u8 m_head_load1;
+	u8 m_head_load2;
+	u8 m_head_load;
+	u8 m_crc;
+	u8 m_last_crc;
+	u8 m_pia_ca1;
+	u8 m_pia_cb2;
+	u8 m_reset;
+	u8 m_enable_drive_write;
+	u8 m_enable_read;
+	u8 m_shift_crc;
+	u8 m_shift_crc_count;
+	u8 m_tuf_count;
+	u8 m_ssda_reg[5];          // Copy of register writes
+
+	required_ioport m_select2_mode;
+	required_ioport m_select3_mode;
+	required_ioport m_disk_sides;
+	required_ioport m_write_protect_mode;
+	required_ioport m_stepper_mode;
+	void update_floppy_selection();
+	void fdc_index_callback(floppy_image_device *floppy, int state);
+
+	floppy_connector *m_floppy0, *m_floppy1, *m_floppy2, *m_floppy3;
+	floppy_image_device *m_floppy; // Currently selected floppy.
+
+	virtual void device_resolve_objects() override;
+	virtual void device_start() override;
+	virtual void device_reset() override;
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
+
+	enum { TM_HEAD_LOAD, TM_TIMEOUT, TM_GEN };
+
+	enum {
+		// General "doing nothing" state
+		IDLE,
+
+		//
+		SYNC1,
+		SYNC_BYTE1,
+		SYNC2,
+		SYNC_BYTE2,
+		READ,
+		READ_BYTE,
+		WRITE,
+		WRITE_BITS,
+	};
+
+	struct live_info {
+		enum { PT_NONE, PT_CRC_1, PT_CRC_2 };
+
+		attotime tm;
+		int state, next_state;
+		uint16_t shift_reg;
+		uint16_t crc;
+		int bit_counter;
+		bool data_separator_phase;
+		uint8_t data_reg;
+	};
+
+	live_info cur_live, checkpoint_live;
+	fdc_pll_t cur_pll, checkpoint_pll;
+
+	void pll_reset(const attotime &when);
+	//void pll_start_writing(const attotime &tm);
+	void pll_commit(floppy_image_device *floppy, const attotime &tm);
+	void pll_stop_writing(floppy_image_device *floppy, const attotime &tm);
+	int pll_get_next_bit(attotime &tm, floppy_image_device *floppy, const attotime &limit);
+	bool pll_write_next_bit(bool bit, attotime &tm, floppy_image_device *floppy, const attotime &limit);
+	void pll_save_checkpoint();
+	void pll_retrieve_checkpoint();
+
+	void live_start(int live_state);
+	void live_abort();
+	void checkpoint();
+	void rollback();
+	void live_delay(int state);
+	void live_sync();
+	void live_run(attotime limit = attotime::never);
+	bool read_one_bit(const attotime &limit);
+	bool write_one_bit(const attotime &limit);
+
+	void live_write_fm(uint8_t fm);
+
+	emu_timer *t_gen;
+};
+
+DECLARE_DEVICE_TYPE(M68SFDC, m68sfdc_device)
+
+#endif // MAME_MACHINE_M68SFDC_H
diff -Nru mame-0.222+dfsg.1/src/devices/machine/mc6843.cpp mame-0.224+dfsg.1/src/devices/machine/mc6843.cpp
--- mame-0.222+dfsg.1/src/devices/machine/mc6843.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/mc6843.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -56,6 +56,7 @@
 /* coarse delays */
 #define DELAY_SEEK   attotime::from_usec( 100 )  /* track seek time */
 #define DELAY_ADDR   attotime::from_usec( 100 )  /* search-address time */
+#define DELAY_CRC    attotime::from_usec(  64 )  /* read crc time */
 
 
 
@@ -68,7 +69,7 @@
 
 
 
-DEFINE_DEVICE_TYPE(MC6843, mc6843_device, "mc5843", "Motorola MC6843 FDC")
+DEFINE_DEVICE_TYPE(MC6843, mc6843_device, "mc6843", "Motorola MC6843 FDC")
 
 mc6843_device::mc6843_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, MC6843, tag, owner, clock),
@@ -90,6 +91,7 @@
 	m_data_idx(0),
 	m_data_id(0),
 	m_index_pulse(0),
+	m_crc_wait(0),
 	m_timer_cont(nullptr)
 {
 	for (auto & elem : m_data)
@@ -124,6 +126,7 @@
 	save_item(NAME(m_data_size));
 	save_item(NAME(m_data_idx));
 	save_item(NAME(m_data_id));
+	save_item(NAME(m_crc_wait));
 }
 
 //-------------------------------------------------
@@ -155,6 +158,7 @@
 
 	m_data_size = 0;
 	m_data_idx = 0;
+	m_crc_wait = 0;
 	m_timer_cont->adjust( attotime::never );
 }
 
@@ -219,6 +223,7 @@
 void mc6843_device::cmd_end( )
 {
 	int cmd = m_CMR & 0x0f;
+
 	if ( ( cmd == CMD_STZ ) || ( cmd == CMD_SEK ) )
 	{
 		m_ISR |= 0x02; /* set Settling Time Complete */
@@ -392,7 +397,11 @@
 	status_update( );
 }
 
-
+void mc6843_device::finish_SR( )
+{
+	m_crc_wait = 0;
+	cmd_end( );
+}
 
 /* Single / Multiple Sector Write bottom half */
 void mc6843_device::cont_SW( )
@@ -430,12 +439,17 @@
 				{
 					case CMD_STZ: finish_STZ( ); break;
 					case CMD_SEK: finish_SEK( ); break;
-					case CMD_SSR: cont_SR( );    break;
+					case CMD_SSR:
+					case CMD_MSR:
+						if ( m_crc_wait )
+							finish_SR( );
+						else
+							cont_SR( );
+						break;
 					case CMD_SSW: cont_SW( );    break;
 					case CMD_RCR: finish_RCR( ); break;
 					case CMD_SWD: cont_SW( );    break;
 					case CMD_MSW: cont_SW( );    break;
-					case CMD_MSR: cont_SR( );    break;
 				}
 			}
 			break;
@@ -460,6 +474,12 @@
 	{
 		int cmd = m_CMR & 0x0f;
 
+		if (machine().side_effects_disabled())
+		{
+			data = m_data[0];
+			break;
+		}
+
 		LOG( "%f %s mc6843_r: data input cmd=%s(%i), pos=%i/%i, GCR=%i, ",
 				machine().time().as_double(), machine().describe_context(),
 				mc6843_cmd[cmd], cmd, m_data_idx,
@@ -487,13 +507,15 @@
 					m_SAR++;
 					if ( m_GCR == 0xff )
 					{
-						cmd_end( );
+						m_crc_wait = 1;
+						m_timer_cont->adjust( DELAY_CRC );
 					}
 					else if ( m_SAR > 26 )
 
 					{
 						m_STRB |= 0x08; /* set Sector Address Undetected */
-						cmd_end( );
+						m_crc_wait = 1;
+						m_timer_cont->adjust( DELAY_CRC );
 					}
 					else
 					{
@@ -502,7 +524,8 @@
 				}
 				else
 				{
-					cmd_end( );
+					m_crc_wait = 1;
+					m_timer_cont->adjust( DELAY_CRC );
 				}
 			}
 		}
@@ -524,6 +547,8 @@
 
 	case 1: /* Current-Track Address Register (CTAR) */
 		data = m_CTAR;
+		if (machine().side_effects_disabled())
+			break;
 		LOG( "%f %s mc6843_r: read CTAR %i (actual=%i)\n",
 				machine().time().as_double(), machine().describe_context(), data,
 				floppy_image()->floppy_drive_get_current_track());
@@ -531,6 +556,8 @@
 
 	case 2: /* Interrupt Status Register (ISR) */
 		data = m_ISR;
+		if (machine().side_effects_disabled())
+			break;
 		LOG( "%f %s mc6843_r: read ISR %02X: cmd=%scomplete settle=%scomplete sense-rq=%i STRB=%i\n",
 				machine().time().as_double(), machine().describe_context(), data,
 				(data & 1) ? "" : "not-" , (data & 2) ? "" : "not-",
@@ -546,17 +573,20 @@
 		/* update */
 		legacy_floppy_image_device* img = floppy_image( );
 		int flag = img->floppy_drive_get_flag_state( FLOPPY_DRIVE_READY);
-		m_STRA &= 0xa3;
+		data = m_STRA & 0xa3;
 		if ( flag & FLOPPY_DRIVE_READY )
-			m_STRA |= 0x04;
+			data |= 0x04;
 
-		m_STRA |= !img->floppy_tk00_r() << 3;
-		m_STRA |= !img->floppy_wpt_r() << 4;
+		data |= !img->floppy_tk00_r() << 3;
+		data |= !img->floppy_wpt_r() << 4;
 
 		if ( m_index_pulse )
-			m_STRA |= 0x40;
+			data |= 0x40;
 
-		data = m_STRA;
+		if (machine().side_effects_disabled())
+			break;
+
+		m_STRA = data;
 		LOG( "%f %s mc6843_r: read STRA %02X: data-rq=%i del-dta=%i ready=%i t0=%i wp=%i trk-dif=%i idx=%i busy=%i\n",
 				machine().time().as_double(), machine().describe_context(), data,
 				data & 1, (data >> 1) & 1, (data >> 2) & 1, (data >> 3) & 1,
@@ -566,6 +596,8 @@
 
 	case 4: /* Status Register B (STRB) */
 		data = m_STRB;
+		if (machine().side_effects_disabled())
+			break;
 		LOG( "%f %s mc6843_r: read STRB %02X: data-err=%i CRC-err=%i dta--mrk-err=%i sect-mrk-err=%i seek-err=%i fi=%i wr-err=%i hard-err=%i\n",
 				machine().time().as_double(), machine().describe_context(), data,
 				data & 1, (data >> 1) & 1, (data >> 2) & 1, (data >> 3) & 1,
@@ -578,6 +610,8 @@
 
 	case 7: /* Logical-Track Address Register (LTAR) */
 		data = m_LTAR;
+		if (machine().side_effects_disabled())
+			break;
 		LOG( "%f %s mc6843_r: read LTAR %i (actual=%i)\n",
 				machine().time().as_double(), machine().describe_context(), data,
 				floppy_image()->floppy_drive_get_current_track());
@@ -682,6 +716,7 @@
 					uint8_t filler = 0xe5; /* standard Thomson filler */
 					LOG( "%f %s mc6843_w: address id detected track=%i sector=%i\n", machine().time().as_double(), machine().describe_context(), track, sector);
 					img->floppy_drive_format_sector( m_side, sector, track, 0, sector, 0, filler );
+					m_data_idx = 0;
 				}
 				else
 				{
diff -Nru mame-0.222+dfsg.1/src/devices/machine/mc6843.h mame-0.224+dfsg.1/src/devices/machine/mc6843.h
--- mame-0.222+dfsg.1/src/devices/machine/mc6843.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/mc6843.h	2020-08-26 08:57:19.000000000 +0000
@@ -75,6 +75,7 @@
 	uint32_t m_data_idx;    /* current read/write position in data */
 	uint32_t m_data_id;     /* chrd_id for sector write */
 	uint8_t  m_index_pulse;
+	uint8_t  m_crc_wait;
 
 	/* trigger delayed actions (bottom halves) */
 	emu_timer* m_timer_cont;
@@ -88,6 +89,7 @@
 	int address_search_read(chrn_id* id);
 	void finish_RCR();
 	void cont_SR();
+	void finish_SR();
 	void cont_SW();
 
 };
diff -Nru mame-0.222+dfsg.1/src/devices/machine/mc6852.cpp mame-0.224+dfsg.1/src/devices/machine/mc6852.cpp
--- mame-0.222+dfsg.1/src/devices/machine/mc6852.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/mc6852.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,7 +10,7 @@
 
     TODO:
 
-    - FIFO
+    - FIFO flags
     - receive
     - transmit
     - parity
@@ -56,7 +56,8 @@
 	m_cts(1),
 	m_dcd(1),
 	m_sm_dtr(0),
-	m_tuf(0)
+	m_tuf(0),
+	m_in_sync(0)
 {
 }
 
@@ -88,6 +89,7 @@
 	save_item(NAME(m_dcd));
 	save_item(NAME(m_sm_dtr));
 	save_item(NAME(m_tuf));
+	save_item(NAME(m_in_sync));
 }
 
 
@@ -106,7 +108,7 @@
 	/* reset and inhibit receiver/transmitter sections */
 	m_cr[0] |= (C1_TX_RS | C1_RX_RS);
 	m_cr[1] &= ~(C2_EIE | C2_PC2 | C2_PC1);
-	m_status &= ~S_TDRA;
+	m_status |= S_TDRA;
 
 	/* set receiver shift register to all 1's */
 	m_rsr = 0xff;
@@ -132,6 +134,51 @@
 	// TODO
 }
 
+//-------------------------------------------------
+//  receive_byte -
+//-------------------------------------------------
+void mc6852_device::receive_byte(uint8_t data)
+{
+	// Ignore if the receiver is in reset or sync is not enabled
+	if (m_cr[0] & (C1_RX_RS | C1_CLEAR_SYNC))
+		return;
+
+	// Handle sync detection
+	if (!m_in_sync)
+	{
+		// TODO also handle two sync codes.
+		if (data == m_scr)
+		{
+			m_in_sync = 1;
+			// TODO handle the various SM responses
+		}
+		return;
+	}
+
+	if ((m_cr[0] & C1_STRIP_SYNC) && (data == m_scr))
+		return;
+
+	int size = m_rx_fifo.size();
+
+	if (size < 3)
+	{
+		m_rx_fifo.push(data);
+		size++;
+	}
+	else
+	{
+		// Overrun.
+		// TODO this should override the last data pushed
+		m_status |= S_RX_OVRN;
+	}
+
+	int trigger = (m_cr[1] & C2_1_2_BYTE) ? 1 : 2;
+
+	if (size >= trigger)
+	{
+		m_status |= S_RDA;
+	}
+}
 
 //-------------------------------------------------
 //  rcv_complete -
@@ -142,29 +189,113 @@
 	// TODO
 }
 
-
 //-------------------------------------------------
 //  read -
 //-------------------------------------------------
 
+// TODO each RX fifo element needs an associated PE status flag, and reading
+// the status register should return the PE for the last element of the fifo.
+
+// TODO RX overrun should be cleared by reading the status register followed
+// by reading the RX fifo.
+
 uint8_t mc6852_device::read(offs_t offset)
 {
 	uint8_t data = 0;
 
 	if (BIT(offset, 0))
 	{
-		if (m_rx_fifo.size() > 0)
+		int size = m_rx_fifo.size();
+		if (size > 0)
 		{
 			data = m_rx_fifo.front();
 			if (!machine().side_effects_disabled())
+			{
 				m_rx_fifo.pop();
+				int trigger = (m_cr[1] & C2_1_2_BYTE) ? 1 : 2;
+				if (size <= trigger)
+				{
+					m_status &= ~S_RDA;
+				}
+			}
 		}
 	}
 	else
 	{
 		data = m_status;
+
+		// TS reset inhibits the TDRA status bit (in the
+		// one-sync-character and two-sync-character modes) The
+		// m_status S_TDRA bit is allowed to reflect the actual fifo
+		// availability, masking it here on a read of the status, so
+		// that the TDRA status bit is simply unmasked here when the
+		// TX is taken out of reset.
+		if (m_cr[0] & C1_TX_RS)
+		{
+			data &= ~S_TDRA;
+		}
+
+		if (!machine().side_effects_disabled())
+		{
+			// TODO this might not be quite right, the datasheet
+			// states that the RX overrun flag is cleared by
+			// reading the status, and the RX data fifo?
+			m_status &= S_RX_OVRN;
+		}
+	}
+
+	return data;
+}
+
+//-------------------------------------------------
+//  tx_start -
+//-------------------------------------------------
+
+// The corresponds in time to just before the first bit of the next word is
+// transmitted by this device. At this time the TX shift register is loaded
+// the TUF line may be asserted if there is a TX FIFO underflow.
+uint8_t mc6852_device::get_tx_byte(int *tuf)
+{
+	if (m_cr[0] & C1_TX_RS)
+	{
+		// FIFO is not popped when the TX is reset, but may be loaded
+		// so that it is pre-loaded when the reset is cleared.  But
+		// will is send a sync code if that is enabled, of just ones?
+		*tuf = 0;
+		return 0xff;
+	}
+
+	int size = m_tx_fifo.size();
+
+	if (size == 0)
+	{
+		// TX underflow
+		if (m_cr[1] & C2_TX_SYNC)
+		{
+			m_status |= S_TUF;
+			// TODO should the TUF callback be called, TUF is to
+			// be pulsed.
+			*tuf = 1;
+			return m_scr;
+		}
+
+		*tuf = 0;
+		return 0xff;
+	}
+
+	uint8_t data = m_tx_fifo.front();
+	m_tx_fifo.pop();
+	size--;
+
+	int trigger = (m_cr[1] & C2_1_2_BYTE) ? 1 : 2;
+	int available = 3 - size;
+
+	if (available >= trigger)
+	{
+		m_status |= S_TDRA;
 	}
 
+	*tuf = 0;
 	return data;
 }
 
@@ -201,13 +332,40 @@
 			}
 
 			set_data_frame(1, data_bit_count, parity, stop_bits);
-			}
+
+			// The fifo trigger levels may have changed, so update
+			// the status bits.
+
+			int trigger = (m_cr[1] & C2_1_2_BYTE) ? 1 : 2;
+
+			if (m_rx_fifo.size() >= trigger)
+				m_status |= S_RDA;
+			else
+				m_status &= ~S_RDA;
+
+			int tx_fifo_available = 3 - m_tx_fifo.size();
+			if (tx_fifo_available >= trigger)
+				m_status |= S_TDRA;
+			else
+				m_status &= ~S_TDRA;
+
 			break;
+			}
 
 		case C1_AC_C3:
 			/* control 3 */
 			LOG("MC6852 Control 3 %02x\n", data);
 			m_cr[2] = data;
+			if (m_cr[2] & C3_CTUF)
+			{
+				m_cr[2] &= ~C3_CTUF;
+				m_status &= ~S_TUF;
+			}
+			if (m_cr[2] & C3_CTS)
+			{
+				m_cr[2] &= ~C3_CTS;
+				m_status &= ~S_CTS;
+			}
 			break;
 
 		case C1_AC_SYNC:
@@ -216,14 +374,26 @@
 			m_scr = data;
 			break;
 
-		case C1_AC_TX_FIFO:
+		case C1_AC_TX_FIFO: {
 			/* transmit data FIFO */
-			if (m_tx_fifo.size() < 3)
+			int available = 3 - m_tx_fifo.size();
+			if (available > 0)
 			{
 				LOG("MC6852 Transmit FIFO %02x\n", data);
 				m_tx_fifo.push(data);
+				available--;
+			}
+			else
+			{
+				LOG("MC6852 Transmit FIFO OVERFLOW %02x\n", data);
+			}
+			int trigger = (m_cr[1] & C2_1_2_BYTE) ? 1 : 2;
+			if (available < trigger)
+			{
+				m_status &= ~S_TDRA;
 			}
 			break;
+			}
 		}
 	}
 	else
@@ -243,6 +413,7 @@
 
 			m_status &= ~(S_RX_OVRN | S_PE | S_DCD | S_RDA);
 			m_rsr = 0xff;
+			m_rx_fifo = std::queue<uint8_t>();
 
 			receive_register_reset();
 		}
@@ -250,22 +421,29 @@
 		/* transmitter reset */
 		if (data & C1_TX_RS)
 		{
-			/* When Tx Rs is set, it clears the transmitter
-			control section, Transmitter Shift Register, Tx Data FIFO
-			Control (the Tx Data FIFO can be reloaded after one E clock
-			pulse), the Transmitter Underflow status bit, and the CTS interrupt,
-			and inhibits the TDRA status bit (in the one-sync-character
-			and two-sync-character modes).*/
+			// When Tx Rs is set, it clears the transmitter
+			// control section, Transmitter Shift Register, Tx
+			// Data FIFO Control (the Tx Data FIFO can be reloaded
+			// after one E clock pulse), the Transmitter Underflow
+			// status bit, and the CTS interrupt.
 
 			LOG("MC6852 Transmitter Reset\n");
 
-			m_status &= ~(S_TUF | S_CTS | S_TDRA);
+			m_status &= ~(S_TUF | S_CTS);
+			m_status |= S_TDRA;
+			m_tx_fifo = std::queue<uint8_t>();
 
 			transmit_register_reset();
 		}
 
-		if (data & C1_STRIP_SYNC) LOG("MC6852 Strip Synchronization Characters\n");
-		if (data & C1_CLEAR_SYNC) LOG("MC6852 Clear Synchronization\n");
+		if (data & C1_STRIP_SYNC)
+			LOG("MC6852 Strip Synchronization Characters\n");
+
+		if (data & C1_CLEAR_SYNC)
+		{
+			LOG("MC6852 Clear Synchronization\n");
+			m_in_sync = 0;
+		}
 
 		m_cr[0] = data;
 	}
diff -Nru mame-0.222+dfsg.1/src/devices/machine/mc6852.h mame-0.224+dfsg.1/src/devices/machine/mc6852.h
--- mame-0.222+dfsg.1/src/devices/machine/mc6852.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/mc6852.h	2020-08-26 08:57:19.000000000 +0000
@@ -64,6 +64,11 @@
 	DECLARE_READ_LINE_MEMBER( sm_dtr_r ) { return m_sm_dtr; }
 	DECLARE_READ_LINE_MEMBER( tuf_r ) { return m_tuf; }
 
+	// These are to allow integration of this driver with code
+	// controlling floppy disks.
+	void receive_byte(uint8_t data);
+	uint8_t get_tx_byte(int *tuf);
+
 protected:
 	// device-level overrides
 	virtual void device_start() override;
@@ -148,6 +153,7 @@
 	int m_dcd;              // data carrier detect
 	int m_sm_dtr;           // sync match/data terminal ready
 	int m_tuf;              // transmitter underflow
+	int m_in_sync;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/mc68681.cpp mame-0.224+dfsg.1/src/devices/machine/mc68681.cpp
--- mame-0.222+dfsg.1/src/devices/machine/mc68681.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/mc68681.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -439,28 +439,25 @@
 		}
 
 		// timer driving any serial channels?
-		if (BIT(ACR, 7) == 1)
-		{
-			uint8_t csr = m_chanA->get_chan_CSR();
+		uint8_t csr = m_chanA->get_chan_CSR();
 
-			if ((csr & 0xf0) == 0xd0)   // tx is timer driven
-			{
-				m_chanA->tx_clock_w(half_period);
-			}
-			if ((csr & 0x0f) == 0x0d)   // rx is timer driven
-			{
-				m_chanA->rx_clock_w(half_period);
-			}
+		if ((csr & 0x0f) == 0x0d)   // tx is timer driven
+		{
+			m_chanA->tx_16x_clock_w(half_period);
+		}
+		if ((csr & 0xf0) == 0xd0)   // rx is timer driven
+		{
+			m_chanA->rx_16x_clock_w(half_period);
+		}
 
-			csr = m_chanB->get_chan_CSR();
-			if ((csr & 0xf0) == 0xd0)   // tx is timer driven
-			{
-				m_chanB->tx_clock_w(half_period);
-			}
-			if ((csr & 0x0f) == 0x0d)   // rx is timer driven
-			{
-				m_chanB->rx_clock_w(half_period);
-			}
+		csr = m_chanB->get_chan_CSR();
+		if ((csr & 0x0f) == 0x0d)   // tx is timer driven
+		{
+			m_chanB->tx_16x_clock_w(half_period);
+		}
+		if ((csr & 0xf0) == 0xd0)   // rx is timer driven
+		{
+			m_chanB->rx_16x_clock_w(half_period);
 		}
 
 		if (!half_period)
@@ -1148,8 +1145,9 @@
 	, rx_enabled(0)
 	, rx_fifo_num(0)
 	, tx_enabled(0)
+	, m_tx_break(false)
 {
-	std::fill_n(&rx_fifo[0], MC68681_RX_FIFO_SIZE, 0);
+	std::fill_n(&rx_fifo[0], MC68681_RX_FIFO_SIZE + 1, 0);
 }
 
 void duart_channel::device_start()
@@ -1173,6 +1171,7 @@
 	save_item(NAME(tx_enabled));
 	save_item(NAME(tx_data));
 	save_item(NAME(tx_ready));
+	save_item(NAME(m_tx_break));
 }
 
 void duart_channel::device_reset()
@@ -1186,6 +1185,7 @@
 
 	tx_baud_rate = rx_baud_rate = 0;
 	CSR = 0;
+	m_tx_break = false;
 }
 
 // serial device virtual overrides
@@ -1208,18 +1208,28 @@
 
 void duart_channel::rx_fifo_push(uint8_t data, uint8_t errors)
 {
-	if (rx_fifo_num >= MC68681_RX_FIFO_SIZE)
+	if (rx_fifo_num == (MC68681_RX_FIFO_SIZE + 1))
 	{
 		logerror("68681: FIFO overflow\n");
 		SR |= STATUS_OVERRUN_ERROR;
-		return;
+		// In case of overrun the FIFO tail entry is overwritten
+		// Back rx_fifo_write_ptr up by one position
+		if (rx_fifo_write_ptr)
+			rx_fifo_write_ptr--;
+		else
+			rx_fifo_write_ptr = MC68681_RX_FIFO_SIZE;
 	}
 
 	rx_fifo[rx_fifo_write_ptr++] = data | (errors << 8);
-	if (rx_fifo_write_ptr == MC68681_RX_FIFO_SIZE)
+	if (rx_fifo_write_ptr > MC68681_RX_FIFO_SIZE)
 		rx_fifo_write_ptr = 0;
 
-	if (rx_fifo_num++ == 0)
+	if (rx_fifo_num <= MC68681_RX_FIFO_SIZE)
+	{
+		rx_fifo_num++;
+	}
+
+	if (rx_fifo_num == 1)
 	{
 		SR |= STATUS_RECEIVER_READY;
 		if (!(MR1 & MODE_BLOCK_ERROR))
@@ -1238,9 +1248,9 @@
 	SR |= STATUS_TRANSMITTER_READY;
 
 	if (m_ch == 0)
-		m_uart->clear_ISR_bits(INT_TXRDYA);
+		m_uart->set_ISR_bits(INT_TXRDYA);
 	else
-		m_uart->clear_ISR_bits(INT_TXRDYB);
+		m_uart->set_ISR_bits(INT_TXRDYB);
 
 	// if local loopback is on, write the transmitted data as if a byte had been received
 	if ((MR2 & 0xc0) == 0x80)
@@ -1363,13 +1373,17 @@
 	}
 
 	rv = rx_fifo[rx_fifo_read_ptr++];
-	if (rx_fifo_read_ptr == MC68681_RX_FIFO_SIZE)
+	if (rx_fifo_read_ptr > MC68681_RX_FIFO_SIZE)
 	{
 		rx_fifo_read_ptr = 0;
 	}
 
 	rx_fifo_num--;
-	SR &= ~STATUS_FIFO_FULL;
+	if (rx_fifo_num == (MC68681_RX_FIFO_SIZE - 1))
+	{
+		SR &= ~STATUS_FIFO_FULL;
+	}
+
 	if (!(MR1 & MODE_BLOCK_ERROR))
 		SR &= ~(STATUS_RECEIVED_BREAK | STATUS_FRAMING_ERROR | STATUS_PARITY_ERROR);
 	if (rx_fifo_num == 0)
@@ -1549,7 +1563,36 @@
 		else
 			m_uart->clear_ISR_bits(INT_DELTA_BREAK_B);
 		break;
-	/* TODO: case 6 and case 7 are start break and stop break respectively, which start or stop holding the TxDA or TxDB line low (space) after whatever data is in the buffer finishes transmitting (following the stop bit?), or after two bit-times if no data is being transmitted  */
+	case 6: /* Start Tx break */
+		if (!m_tx_break)
+		{
+			m_tx_break = true;
+			if ((MR2 & 0xc0) == 0x80)
+			{
+				// Local loopback mode: set delta break in ISR, simulate break rx
+				if (m_ch == 0)
+					m_uart->set_ISR_bits(INT_DELTA_BREAK_A);
+				else
+					m_uart->set_ISR_bits(INT_DELTA_BREAK_B);
+				rx_fifo_push(0 , STATUS_RECEIVED_BREAK);
+			}
+			// TODO: Actually send break signal
+		}
+		break;
+	case 7: /* Stop tx break */
+		if (m_tx_break)
+		{
+			m_tx_break = false;
+			if ((MR2 & 0xc0) == 0x80)
+			{
+				// Local loopback mode: set delta break in ISR
+				if (m_ch == 0)
+					m_uart->set_ISR_bits(INT_DELTA_BREAK_A);
+				else
+					m_uart->set_ISR_bits(INT_DELTA_BREAK_B);
+			}
+		}
+		break;
 	default:
 		LOG("68681: Unhandled command (%x) in CR%d\n", (data >> 4) & 0x07, m_ch);
 		break;
@@ -1623,3 +1666,43 @@
 {
 	return CSR;
 }
+
+void duart_channel::tx_16x_clock_w(bool state)
+{
+	if (state)
+	{
+		m_tx_prescaler--;
+		if (m_tx_prescaler == 8)
+		{
+			tx_clock_w(true);
+		}
+		else if (m_tx_prescaler == 0)
+		{
+			m_tx_prescaler = 16;
+			tx_clock_w(false);
+		}
+	}
+}
+
+void duart_channel::rx_16x_clock_w(bool state)
+{
+	if (!is_receive_register_synchronized())
+	{
+		// Skip over the start bit once synchonization is achieved
+		m_rx_prescaler = 32;
+		rx_clock_w(true);
+	}
+	else if (state)
+	{
+		m_rx_prescaler--;
+		if (m_rx_prescaler == 8)
+		{
+			rx_clock_w(false);
+		}
+		else if (m_rx_prescaler == 0)
+		{
+			m_rx_prescaler = 16;
+			rx_clock_w(true);
+		}
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/devices/machine/mc68681.h mame-0.224+dfsg.1/src/devices/machine/mc68681.h
--- mame-0.222+dfsg.1/src/devices/machine/mc68681.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/mc68681.h	2020-08-26 08:57:19.000000000 +0000
@@ -44,6 +44,9 @@
 	void write_MR1(uint8_t data){ MR1 = data; }
 	void write_MR2(uint8_t data){ MR2 = data; }
 
+	void tx_16x_clock_w(bool state);
+	void rx_16x_clock_w(bool state);
+
 private:
 	/* Registers */
 	uint8_t CR;  /* Command register */
@@ -58,7 +61,7 @@
 
 	/* Receiver */
 	uint8_t rx_enabled;
-	uint16_t rx_fifo[MC68681_RX_FIFO_SIZE];
+	uint16_t rx_fifo[MC68681_RX_FIFO_SIZE + 1];
 	int   rx_fifo_read_ptr;
 	int   rx_fifo_write_ptr;
 	int   rx_fifo_num;
@@ -69,6 +72,10 @@
 	uint8_t tx_enabled;
 	uint8_t tx_data;
 	uint8_t tx_ready;
+	bool m_tx_break;
+
+	/* Rx/Tx clocking */
+	uint8_t m_rx_prescaler , m_tx_prescaler;
 
 	duart_base_device *m_uart;
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/microtch.cpp mame-0.224+dfsg.1/src/devices/machine/microtch.cpp
--- mame-0.222+dfsg.1/src/devices/machine/microtch.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/microtch.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -359,9 +359,11 @@
 ROM_START(microtouch)
 	ROM_REGION(0x10000, "bios", 0)
 	ROM_SYSTEM_BIOS(0, "microtouch_5_6", "MicroTouch Rev.5.6") // "Excalibur", ISA card
-	ROMX_LOAD("microtouch_5604010_rev_5.6.u1",  0x0000, 0x10000, CRC(d19ee080) SHA1(c695405ec8c2ac4408a63bacfc68a5a4b878928c), ROM_BIOS(0)) // 27c512
+	ROMX_LOAD("microtouch_5604010_rev_5.6.u1", 0x0000, 0x10000, CRC(d19ee080) SHA1(c695405ec8c2ac4408a63bacfc68a5a4b878928c), ROM_BIOS(0)) // 27c512
 	ROM_SYSTEM_BIOS(1, "microtouch_5_5", "MicroTouch Rev.5.5") // "Kahuna", daughterboard integrated on monitor
 	ROMX_LOAD("microtouch_5603920_rev_5.5.u1", 0x0000, 0x08000, CRC(5cc164e7) SHA1(753277ce54e8be1b759c37ae760fe4a6846d1fae), ROM_BIOS(1))
+	ROM_SYSTEM_BIOS(2, "microtouch_2_2", "MicroTouch Rev.2.2") // "Excalibur, ISA card
+	ROMX_LOAD("microtouch_5604340_rev_2.2.u1", 0x0000, 0x10000, CRC(110f312f) SHA1(5a60d7d1f8a0b3898aabcabe43dc51e9f90306f7), ROM_BIOS(2)) // 27c512
 ROM_END
 
 static INPUT_PORTS_START(microtouch)
@@ -396,4 +398,3 @@
 {
 	return ROM_NAME(microtouch);
 }
-
diff -Nru mame-0.222+dfsg.1/src/devices/machine/mm74c922.cpp mame-0.224+dfsg.1/src/devices/machine/mm74c922.cpp
--- mame-0.222+dfsg.1/src/devices/machine/mm74c922.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/mm74c922.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -34,15 +34,15 @@
 
 mm74c922_device::mm74c922_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int max_y) :
 	device_t(mconfig, type, tag, owner, clock),
-	m_write_da(*this),
-	m_read_x(*this),
+	m_write_da(*this), m_read_x(*this), m_tristate_data(*this),
 	m_cap_osc(0), m_cap_debounce(0),
 	m_max_y(max_y),
 	m_inhibit(false),
 	m_x(0),
-	m_y(0), m_data(0),
-	m_da(false),
-	m_next_da(false), m_scan_timer(nullptr)
+	m_y(0),
+	m_data(0), m_next_data(0),
+	m_da(false), m_next_da(false),
+	m_scan_timer(nullptr)
 {
 }
 
@@ -66,6 +66,7 @@
 	// resolve callbacks
 	m_write_da.resolve_safe();
 	m_read_x.resolve_all_safe((1 << m_max_y) - 1);
+	m_tristate_data.resolve_safe((1 << m_max_y) - 1);
 
 	// set initial values
 	change_output_lines();
@@ -79,6 +80,7 @@
 	save_item(NAME(m_x));
 	save_item(NAME(m_y));
 	save_item(NAME(m_data));
+	save_item(NAME(m_next_data));
 	save_item(NAME(m_da));
 	save_item(NAME(m_next_da));
 }
@@ -123,6 +125,12 @@
 		// active high output
 		m_write_da(m_da ? 1 : 0);
 	}
+
+	// clock data latches
+	if (m_next_data != m_data)
+	{
+		m_data = m_next_data;
+	}
 }
 
 
@@ -156,7 +164,7 @@
 			// key released
 			m_inhibit = false;
 			m_next_da = false;
-			m_data = 0xff; // high-Z
+			m_next_data = m_tristate_data(); // high-Z
 
 			LOG("MM74C922 Key Released\n");
 		}
@@ -172,10 +180,9 @@
 				m_next_da = true;
 				m_y = y;
 
-				m_data = (y << 2) | m_x;
+				m_next_data = (y << 2) | m_x;
 
-				LOG("MM74C922 Key Depressed: X %u Y %u = %02x\n", m_x, y, m_data);
-				return;
+				LOG("MM74C922 Key Depressed: X %u Y %u = %02x\n", m_x, y, m_next_data);
 			}
 		}
 	}
diff -Nru mame-0.222+dfsg.1/src/devices/machine/mm74c922.h mame-0.224+dfsg.1/src/devices/machine/mm74c922.h
--- mame-0.222+dfsg.1/src/devices/machine/mm74c922.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/mm74c922.h	2020-08-26 08:57:19.000000000 +0000
@@ -56,6 +56,7 @@
 	auto x2_rd_callback() { return m_read_x[1].bind(); }
 	auto x3_rd_callback() { return m_read_x[2].bind(); }
 	auto x4_rd_callback() { return m_read_x[3].bind(); }
+	auto data_tri_callback() { return m_tristate_data.bind(); }
 
 	uint8_t read();
 
@@ -75,6 +76,7 @@
 
 	devcb_write_line m_write_da;
 	devcb_read8::array<4> m_read_x;
+	devcb_read8 m_tristate_data;
 
 	double m_cap_osc;
 	double m_cap_debounce;
@@ -86,6 +88,7 @@
 	int m_y;                    // latched row
 
 	uint8_t m_data;             // data latch
+	uint8_t m_next_data;        // next value of data latch
 
 	bool m_da;                  // data available flag
 	bool m_next_da;             // next value of data available flag
diff -Nru mame-0.222+dfsg.1/src/devices/machine/ncr5380n.h mame-0.224+dfsg.1/src/devices/machine/ncr5380n.h
--- mame-0.222+dfsg.1/src/devices/machine/ncr5380n.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/ncr5380n.h	2020-08-26 08:57:19.000000000 +0000
@@ -133,7 +133,7 @@
 
 	// state machine
 	emu_timer *m_state_timer;
-	enum state : unsigned
+	enum state : uint32_t
 	{
 		IDLE,
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/ncr539x.cpp mame-0.224+dfsg.1/src/devices/machine/ncr539x.cpp
--- mame-0.222+dfsg.1/src/devices/machine/ncr539x.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/ncr539x.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -160,6 +160,7 @@
 	m_control1 = m_control2 = m_control3 = m_control4 = 0;
 	m_chipid_available = false;
 	m_chipid_lock = false;
+	m_fifo_internal_state = 0;
 
 	m_out_irq_cb(CLEAR_LINE);
 	m_out_drq_cb(CLEAR_LINE);
diff -Nru mame-0.222+dfsg.1/src/devices/machine/netlist.cpp mame-0.224+dfsg.1/src/devices/machine/netlist.cpp
--- mame-0.222+dfsg.1/src/devices/machine/netlist.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/netlist.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -19,6 +19,9 @@
 //#include "netlist/devices/nlid_system.h"
 
 #include "netlist/plib/palloc.h"
+#include "netlist/plib/pmempool.h"
+#include "netlist/plib/pdynlib.h"
+#include "netlist/plib/pstonum.h"
 
 #include "debugger.h"
 #include "romload.h"
@@ -32,12 +35,15 @@
 #define LOG_GENERAL     (1U << 0)
 #define LOG_DEV_CALLS   (1U << 1)
 #define LOG_DEBUG       (1U << 2)
+#define LOG_TIMING      (1U << 3)
 
 //#define LOG_MASK (LOG_GENERAL | LOG_DEV_CALLS | LOG_DEBUG)
+//#define LOG_MASK        (LOG_TIMING)
 #define LOG_MASK        (0)
 
 #define LOGDEVCALLS(...) LOGMASKED(LOG_DEV_CALLS, __VA_ARGS__)
 #define LOGDEBUG(...) LOGMASKED(LOG_DEBUG, __VA_ARGS__)
+#define LOGTIMING(...) LOGMASKED(LOG_TIMING, __VA_ARGS__)
 
 #define LOG_OUTPUT_FUNC printf
 
@@ -63,7 +69,7 @@
 // Special netlist extension devices  ....
 // ----------------------------------------------------------------------------------------
 
-extern plib::dynlib_static_sym nl_static_solver_syms[];
+extern const plib::dynlib_static_sym nl_static_solver_syms[];
 
 static netlist::netlist_time_ext nltime_from_attotime(attotime t)
 {
@@ -116,10 +122,10 @@
 		}
 	}
 
-	netlist::host_arena::unique_ptr<plib::dynlib_base> static_solver_lib() const noexcept override
+	std::unique_ptr<plib::dynlib_base> static_solver_lib() const noexcept override
 	{
 		//return plib::make_unique<plib::dynlib_static>(nullptr);
-		return plib::make_unique<plib::dynlib_static, netlist::host_arena>(nl_static_solver_syms);
+		return std::make_unique<plib::dynlib_static>(nl_static_solver_syms);
 	}
 
 private:
@@ -159,9 +165,9 @@
 		}
 	}
 
-	netlist::host_arena::unique_ptr<plib::dynlib_base> static_solver_lib() const noexcept override
+	std::unique_ptr<plib::dynlib_base> static_solver_lib() const noexcept override
 	{
-		return plib::make_unique<plib::dynlib_static, netlist::host_arena>(nullptr);
+		return std::make_unique<plib::dynlib_static>(nullptr);
 	}
 
 private:
@@ -258,8 +264,8 @@
 	if (m_dev.has_running_machine())
 	{
 		memory_region *mem = m_dev.memregion(m_name.c_str());
-		stream_ptr ret(std::make_unique<std::istringstream>(pstring(reinterpret_cast<char *>(mem->base()), mem->bytes())));
-		ret->imbue(std::locale::classic());
+		stream_ptr ret(std::make_unique<std::istringstream>(pstring(reinterpret_cast<char *>(mem->base()), mem->bytes())), name);
+		ret.stream().imbue(std::locale::classic());
 		return ret;
 	}
 	else
@@ -299,12 +305,12 @@
 		memory_region *mem = m_dev.memregion(name.c_str());
 		if (mem != nullptr)
 		{
-			stream_ptr ret(std::make_unique<std::istringstream>(std::string(reinterpret_cast<char *>(mem->base()), mem->bytes()), std::ios_base::binary));
-			ret->imbue(std::locale::classic());
+			stream_ptr ret(std::make_unique<std::istringstream>(std::string(reinterpret_cast<char *>(mem->base()), mem->bytes()), std::ios_base::binary), name);
+			ret.stream().imbue(std::locale::classic());
 			return ret;
 		}
 		else
-			return stream_ptr(nullptr);
+			return stream_ptr();
 	}
 	else
 	{
@@ -312,12 +318,12 @@
 		if (rom_exists(m_dev.mconfig().root_device(), pstring(m_dev.tag()) + ":" + name))
 		{
 			// Create an empty stream.
-			stream_ptr ret(std::make_unique<std::istringstream>(std::ios_base::binary));
-			ret->imbue(std::locale::classic());
+			stream_ptr ret(std::make_unique<std::istringstream>(std::ios_base::binary), name);
+			ret.stream().imbue(std::locale::classic());
 			return ret;
 		}
 		else
-			return stream_ptr(nullptr);
+			return stream_ptr();
 	}
 }
 
@@ -327,7 +333,7 @@
 // sound_in
 // ----------------------------------------------------------------------------------------
 
-using sound_in_type = netlist::interface::NETLIB_NAME(buffered_param_setter)<stream_sample_t, 16>;
+using sound_in_type = netlist::interface::NETLIB_NAME(buffered_param_setter)<stream_sample_t *>;
 
 class NETLIB_NAME(sound_in) : public sound_in_type
 {
@@ -353,7 +359,6 @@
 	m_value_for_device_timer = val * m_mult + m_offset;
 	if (m_value_for_device_timer != (*m_param)())
 	{
-		LOGDEBUG("write %s\n", this->tag());
 		synchronize(0, 0, &m_value_for_device_timer);
 }
 }
@@ -361,6 +366,9 @@
 void netlist_mame_analog_input_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
 {
 	update_to_current_time();
+#if NETLIST_CREATE_CSV
+	nl_owner().log_add(m_param_name, *((double *) ptr), true);
+#endif
 	m_param->set(*((double *) ptr));
 }
 
@@ -381,18 +389,24 @@
 	{
 		LOGDEBUG("write %s\n", this->tag());
 		synchronize(0, v);
-}
+	}
 }
 
 void netlist_mame_int_input_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
 {
 	update_to_current_time();
+#if NETLIST_CREATE_CSV
+	nl_owner().log_add(m_param_name, param, false);
+#endif
 	m_param->set(param);
 }
 
 void netlist_mame_logic_input_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
 {
 	update_to_current_time();
+#if NETLIST_CREATE_CSV
+	nl_owner().log_add(m_param_name, param, false);
+#endif
 	m_param->set(param);
 }
 
@@ -430,6 +444,57 @@
 	m_offset = offset;
 }
 
+#if NETLIST_CREATE_CSV
+void netlist_mame_device::log_add(char const* param, double value, bool isfloat)
+{
+	// skip if no file
+	if (m_csv_file == nullptr)
+		return;
+
+	// make a new entry
+	buffer_entry entry = { machine().scheduler().time(), isfloat, value, param };
+
+	// flush out half of the old entries if we hit the buffer limit
+	if (m_buffer.size() >= MAX_BUFFER_ENTRIES)
+		log_flush(MAX_BUFFER_ENTRIES / 2);
+
+	// fast common case: if we go at the end, just push_back
+	if (m_buffer.size() == 0 || entry.time >= m_buffer.back().time)
+	{
+		m_buffer.push_back(entry);
+		return;
+	}
+
+	// find our place in the queue
+	for (auto cur = m_buffer.rbegin(); cur != m_buffer.rend(); cur++)
+		if (entry.time >= cur->time)
+		{
+			m_buffer.insert(cur.base(), entry);
+			return;
+		}
+
+	// if we're too early, drop this entry rather than risk putting an out-of-order
+	// entry after the last one we flushed
+}
+
+void netlist_mame_device::log_flush(int count)
+{
+	if (m_csv_file == nullptr)
+		return;
+	if (count > m_buffer.size())
+		count = m_buffer.size();
+	while (count--)
+	{
+		auto &entry = m_buffer.front();
+		if (entry.isfloat)
+			fprintf(m_csv_file, "%s,%s,%f\n", entry.time.as_string(), entry.string, entry.value);
+		else
+			fprintf(m_csv_file, "%s,%s,%d\n", entry.time.as_string(), entry.string, int(entry.value));
+		m_buffer.pop_front();
+	}
+}
+#endif
+
 netlist_mame_analog_input_device::netlist_mame_analog_input_device(const machine_config &mconfig, const char *tag, device_t *owner, const char *param_name)
 	: device_t(mconfig, NETLIST_ANALOG_INPUT, tag, owner, 0)
 	, netlist_mame_sub_interface(*owner)
@@ -745,15 +810,13 @@
 
 void netlist_mame_stream_input_device::custom_netlist_additions(netlist::nlparse_t &parser)
 {
-	if (!parser.device_exists("STREAM_INPUT"))
-		parser.register_dev("NETDEV_SOUND_IN", "STREAM_INPUT");
+	pstring name = plib::pfmt("STREAM_INPUT_{}")(m_channel);
+	parser.register_dev("NETDEV_SOUND_IN", name);
 
-	pstring sparam = plib::pfmt("STREAM_INPUT.CHAN{1}")(m_channel);
-	parser.register_param(sparam, pstring(m_param_name));
-	sparam = plib::pfmt("STREAM_INPUT.MULT{1}")(m_channel);
-	parser.register_param_val(sparam, m_mult);
-	sparam = plib::pfmt("STREAM_INPUT.OFFSET{1}")(m_channel);
-	parser.register_param_val(sparam, m_offset);
+	parser.register_param(name + ".CHAN", pstring(m_param_name));
+	parser.register_param_val(name + ".MULT", m_mult);
+	parser.register_param_val(name + ".OFFSET", m_offset);
+	parser.register_param_val(name + ".ID", m_channel);
 }
 
 
@@ -821,14 +884,16 @@
 void netlist_mame_stream_output_device::device_reset()
 {
 	LOGDEVCALLS("reset %s\n", name());
+#if 0
 	m_cur = 0.0;
 	m_last_buffer_time = netlist::netlist_time_ext::zero();
+#endif
 }
 
 void netlist_mame_stream_output_device::sound_update_fill(std::size_t samples, stream_sample_t *target)
 {
 	if (samples < m_buffer.size())
-		throw emu_fatalerror("sound %s: samples %d less bufsize %d\n", name(), samples, m_buffer.size());
+		osd_printf_warning("sound %s: samples %d less bufsize %d\n", name(), samples, m_buffer.size());
 
 	std::copy(m_buffer.begin(), m_buffer.end(), target);
 	std::size_t pos = m_buffer.size();
@@ -845,7 +910,7 @@
 
 	const auto lambda = [this](auto &in, netlist::nl_fptype val)
 	{
-		this->process(in.exec().time(), val);;
+		this->process(in.exec().time(), val);
 	};
 
 	using lb_t = decltype(lambda);
@@ -876,13 +941,15 @@
 		m_buffer.push_back(static_cast<stream_sample_t>(m_cur));
 	}
 
-	/* ignore spikes */
-	if (plib::abs(val) < 32767.0)
+	// clamp to avoid spikes, but not too hard, as downstream processing, volume
+	// controls, etc may bring values above 32767 back down in range; some clamping
+	// is still useful, however, as the mixing is done with integral values
+	if (plib::abs(val) < 32767.0*256.0)
 		m_cur = val;
 	else if (val > 0.0)
-		m_cur = 32767.0;
+		m_cur = 32767.0*256.0;
 	else
-		m_cur = -32767.0;
+		m_cur = -32767.0*256.0;
 
 }
 
@@ -898,11 +965,8 @@
 
 netlist_mame_device::netlist_mame_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, type, tag, owner, clock)
-	, m_icount(0)
-	, m_cur_time(attotime::zero)
-	, m_attotime_per_clock(attotime::zero)
-	, m_old(netlist::netlist_time_ext::zero())
 	, m_setup_func(nullptr)
+	, m_device_reset_called(false)
 {
 }
 
@@ -966,11 +1030,13 @@
 	}
 }
 
-netlist::host_arena::unique_ptr<netlist::netlist_state_t> netlist_mame_device::base_validity_check(validity_checker &valid) const
+std::unique_ptr<netlist::netlist_state_t> netlist_mame_device::base_validity_check(validity_checker &valid) const
 {
 	try
 	{
-		auto lnetlist = plib::make_unique<netlist::netlist_state_t, netlist::host_arena>("netlist",
+		plib::chrono::timer<plib::chrono::system_ticks> t;
+		t.start();
+		auto lnetlist = std::make_unique<netlist::netlist_state_t>("netlist",
 			plib::make_unique<netlist_validate_callbacks_t, netlist::host_arena>());
 		// enable validation mode
 		lnetlist->set_extended_validation(true);
@@ -987,6 +1053,8 @@
 			}
 		}
 
+		t.stop();
+		//printf("time %s %f\n", this->mconfig().gamedrv().name, t.as_seconds<double>());
 		return lnetlist;
 	}
 	catch (memregion_not_set &err)
@@ -1002,27 +1070,20 @@
 	{
 		osd_printf_error("%s\n", err.what());
 	}
-	return netlist::host_arena::unique_ptr<netlist::netlist_state_t>(nullptr);
+	return std::unique_ptr<netlist::netlist_state_t>(nullptr);
 }
 
 void netlist_mame_device::device_validity_check(validity_checker &valid) const
 {
+
 	base_validity_check(valid);
 	//rom_exists(mconfig().root_device());
 	LOGDEVCALLS("device_validity_check %s\n", this->mconfig().gamedrv().name);
 }
 
 
-void netlist_mame_device::device_start()
+void netlist_mame_device::device_start_common()
 {
-	LOGDEVCALLS("device_start entry\n");
-
-	m_attotime_per_clock = attotime(0, m_attoseconds_per_clock);
-
-	//netlist().save(*this, m_cur_time, pstring(this->name()), "m_cur_time");
-	save_item(NAME(m_cur_time));
-	save_item(NAME(m_attotime_per_clock));
-
 	m_netlist = std::make_unique<netlist_mame_t>(*this, "netlist");
 	if (!machine().options().verbose())
 	{
@@ -1033,41 +1094,62 @@
 	common_dev_start(m_netlist.get());
 	m_netlist->setup().prepare_to_run();
 
-	// FIXME: use save_helper
-	m_netlist->save(*this, m_rem, pstring(this->name()), "m_rem");
-	m_netlist->save(*this, m_div, pstring(this->name()), "m_div");
-	m_netlist->save(*this, m_old, pstring(this->name()), "m_old");
 
-	save_state();
+	m_device_reset_called = false;
+
+#if NETLIST_CREATE_CSV
+	std::string name = machine().system().name;
+	name += tag();
+	for (int index = 0; index < name.size(); index++)
+		if (name[index] == ':')
+			name[index] = '_';
+	name += ".csv";
+	m_csv_file = fopen(name.c_str(), "wb");
+#endif
 
-	m_old = netlist::netlist_time_ext::zero();
-	m_rem = netlist::netlist_time_ext::zero();
 	LOGDEVCALLS("device_start exit\n");
 }
 
-void netlist_mame_device::device_clock_changed()
+
+void netlist_mame_device::device_start()
 {
-	m_div = static_cast<netlist::netlist_time_ext>(
-		(netlist::netlist_time_ext::resolution() << MDIV_SHIFT) / clock());
-	//printf("m_div %d\n", (int) m_div.as_raw());
-	netlist().log().debug("Setting clock {1} and divisor {2}\n", clock(), m_div.as_double());
-	m_attotime_per_clock = attotime(0, m_attoseconds_per_clock);
+	LOGDEVCALLS("device_start entry\n");
+
+	device_start_common();
+	save_state();
+
+	LOGDEVCALLS("device_start exit\n");
 }
 
 
 void netlist_mame_device::device_reset()
 {
 	LOGDEVCALLS("device_reset\n");
-	m_cur_time = attotime::zero;
-	m_old = netlist::netlist_time_ext::zero();
-	m_rem = netlist::netlist_time_ext::zero();
-	netlist().exec().reset();
+	if (!m_device_reset_called)
+	{
+		// netlists don't have a reset line, doing a soft-reset is pointless
+		// the only reason we call these here once after device_start
+		// is that netlist input devices may be started after the netlist device
+		// and because the startup code may trigger actions which need all
+		// devices set up.
+		netlist().free_setup_resources();
+		netlist().exec().reset();
+		m_device_reset_called = true;
+	}
 }
 
 void netlist_mame_device::device_stop()
 {
 	LOGDEVCALLS("device_stop\n");
-	netlist().exec().stop();
+	if (m_netlist)
+		netlist().exec().stop();
+#if NETLIST_CREATE_CSV
+	if (m_csv_file != nullptr)
+	{
+		log_flush();
+		fclose(m_csv_file);
+	}
+#endif
 }
 
 void netlist_mame_device::device_post_load()
@@ -1085,7 +1167,7 @@
 	netlist().run_state_manager().pre_save();
 }
 
-void netlist_mame_device::update_icount(netlist::netlist_time_ext time) noexcept
+void netlist_mame_cpu_device::update_icount(netlist::netlist_time_ext time) noexcept
 {
 	const netlist::netlist_time_ext delta = (time - m_old).shl(MDIV_SHIFT) + m_rem;
 	const uint64_t d = delta / m_div;
@@ -1095,7 +1177,7 @@
 	m_icount -= d;
 }
 
-void netlist_mame_device::check_mame_abort_slice() noexcept
+void netlist_mame_cpu_device::check_mame_abort_slice() noexcept
 {
 	if (m_icount <= 0)
 		netlist().exec().abort_current_queue_slice();
@@ -1150,6 +1232,8 @@
 	, device_disasm_interface(mconfig, *this)
 	, device_memory_interface(mconfig, *this)
 	, m_program_config("program", ENDIANNESS_LITTLE, 8, 12) // Interface is needed to keep debugger happy
+	, m_icount(0)
+	, m_old(netlist::netlist_time_ext::zero())
 	, m_genPC(0)
 {
 }
@@ -1186,9 +1270,18 @@
 
 void netlist_mame_cpu_device::device_start()
 {
-	netlist_mame_device::device_start();
+	LOGDEVCALLS("device_start entry\n");
+
+	device_start_common();
+	// FIXME: use save_helper
+	netlist().save(*this, m_rem, pstring(this->name()), "m_rem");
+	netlist().save(*this, m_div, pstring(this->name()), "m_div");
+	netlist().save(*this, m_old, pstring(this->name()), "m_old");
+
+	m_old = netlist::netlist_time_ext::zero();
+	m_rem = netlist::netlist_time_ext::zero();
 
-	// State support
+	save_state();
 
 	state_add(STATE_GENPC, "GENPC", m_genPC).noshow();
 	state_add(STATE_GENPCBASE, "CURPC", m_genPC).noshow();
@@ -1218,8 +1311,17 @@
 
 	// set our instruction counter
 	set_icountptr(m_icount);
+
+	LOGDEVCALLS("device_start exit\n");
 }
 
+void netlist_mame_cpu_device::device_clock_changed()
+{
+	m_div = static_cast<netlist::netlist_time_ext>(
+		(netlist::netlist_time_ext::resolution() << MDIV_SHIFT) / clock());
+	//printf("m_div %d\n", (int) m_div.as_raw());
+	netlist().log().debug("Setting clock {1} and divisor {2}\n", clock(), m_div.as_double());
+}
 
 void netlist_mame_cpu_device::nl_register_devices(netlist::nlparse_t &parser) const
 {
@@ -1290,11 +1392,13 @@
 // ----------------------------------------------------------------------------------------
 
 netlist_mame_sound_device::netlist_mame_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: netlist_mame_device(mconfig, NETLIST_SOUND, tag, owner, clock)
+	: netlist_mame_device(mconfig, NETLIST_SOUND, tag, owner, 0)
 	, device_sound_interface(mconfig, *this)
-	, m_in(nullptr)
 	, m_stream(nullptr)
-	, m_is_device_call(false)
+	, m_cur_time(attotime::zero)
+	, m_sound_clock(clock)
+	, m_attotime_per_clock(attotime::zero)
+	, m_last_update_to_current_time(attotime::zero)
 {
 }
 
@@ -1304,7 +1408,7 @@
 	auto lnetlist = base_validity_check(valid);
 	if (lnetlist)
 	{
-		/*Ok - do some more checks */
+		/* Ok - do some more checks */
 		if (m_out.size() == 0)
 			osd_printf_error("No output devices\n");
 		else
@@ -1312,63 +1416,66 @@
 			for (auto &outdev : m_out)
 			{
 				if (outdev.first < 0 || outdev.first >= m_out.size())
-					osd_printf_error("illegal channel number %d\n", outdev.first);
+					osd_printf_error("illegal output channel number %d\n", outdev.first);
 			}
 		}
 		std::vector<nld_sound_in *> indevs = lnetlist->get_device_list<nld_sound_in>();
-		if (indevs.size() > 1)
-			osd_printf_error("A maximum of one input device is allowed but found %d!\n", (int)indevs.size());
+		for (auto &e : indevs)
+		{
+			if (e->id() >= indevs.size())
+				osd_printf_error("illegal input channel number %d\n", e->id());
+		}
 	}
-
-}
-
-
-void netlist_mame_sound_device::device_reset()
-{
-	netlist_mame_device::device_reset();
 }
 
 void netlist_mame_sound_device::device_start()
 {
-	netlist_mame_device::device_start();
-
 	LOGDEVCALLS("sound device_start\n");
 
+	m_attotime_per_clock = attotime::from_hz(m_sound_clock);
+
+	save_item(NAME(m_cur_time));
+	save_item(NAME(m_attotime_per_clock));
+
+	device_start_common();
+	save_state();
+
+	m_cur_time = attotime::zero;
+
 	// Configure outputs
 
 	if (m_out.size() == 0)
 		fatalerror("No output devices");
 
-	//m_num_outputs = outdevs.size();
-
 	/* resort channels */
 	for (auto &outdev : m_out)
 	{
 		if (outdev.first < 0 || outdev.first >= m_out.size())
-			fatalerror("illegal channel number %d", outdev.first);
-		outdev.second->set_sample_time(netlist::netlist_time::from_hz(clock()));
+			fatalerror("illegal output channel number %d", outdev.first);
+		outdev.second->set_sample_time(netlist::netlist_time::from_hz(m_sound_clock));
 		outdev.second->buffer_reset(netlist::netlist_time_ext::zero());
 	}
 
 	// Configure inputs
-	// FIXME: The limitation to one input device seems artificial.
-	//        We should allow multiple devices with one channel each.
 
-	m_in = nullptr;
+	m_in.clear();
 
 	std::vector<nld_sound_in *> indevs = netlist().get_device_list<nld_sound_in>();
-	if (indevs.size() > 1)
-		fatalerror("A maximum of one input device is allowed!");
-	if (indevs.size() == 1)
-	{
-		m_in = indevs[0];
-		const auto sample_time = netlist::netlist_time::from_raw(static_cast<netlist::netlist_time::internal_type>(nltime_from_attotime(clocks_to_attotime(1)).as_raw()));
-		m_in->resolve_params(sample_time);
+	for (auto &e : indevs)
+	{
+		m_in.emplace(e->id(), e);
+		const auto sample_time = netlist::netlist_time::from_raw(static_cast<netlist::netlist_time::internal_type>(nltime_from_attotime(m_attotime_per_clock).as_raw()));
+		e->resolve_params(sample_time);
+	}
+	for (auto &e : m_in)
+	{
+		if (e.first < 0 || e.first >= m_in.size())
+			fatalerror("illegal input channel number %d", e.first);
 	}
-
 	/* initialize the stream(s) */
-	m_is_device_call = false;
-	m_stream = machine().sound().stream_alloc(*this, m_in ? m_in->num_channels() : 0, m_out.size(), clock());
+	m_stream = machine().sound().stream_alloc(*this, m_in.size(), m_out.size(), m_sound_clock);
+
+	LOGDEVCALLS("sound device_start exit\n");
 }
 
 
@@ -1385,61 +1492,47 @@
 	m_out[channel] = so;
 }
 
-void netlist_mame_sound_device::device_clock_changed()
-{
-	netlist_mame_device::device_clock_changed();
-
-	for (auto &e : m_out)
-	{
-		e.second->set_sample_time(nltime_from_clocks(1));
-	}
-}
-
-static attotime last;
-
 void netlist_mame_sound_device::update_to_current_time()
 {
 	LOGDEBUG("before update\n");
-	m_is_device_call = true;
+
 	get_stream()->update();
-	m_is_device_call = false;
 
-	if (machine().time() < last)
-		LOGDEBUG("machine.time() decreased 2\n");
+	if (machine().time() < m_last_update_to_current_time)
+		LOGTIMING("machine.time() decreased 2\n");
 
-	last = machine().time();
+	m_last_update_to_current_time = machine().time();
 
 	const auto mtime = nltime_from_attotime(machine().time());
 	const auto cur(netlist().exec().time());
 
 	if (mtime > cur)
 	{
-		if ((mtime - cur) >= nltime_from_clocks(1))
-			LOGDEBUG("%f us\n", (mtime - cur).as_double() * 1000000.0);
+		//expected don't log
+		//LOGTIMING("%f us\n", (mtime - cur).as_double() * 1000000.0);
 		netlist().exec().process_queue(mtime - cur);
 	}
 	else if (mtime < cur)
-		LOGDEBUG("%s : %f ns before machine time\n", this->name(), (cur - mtime).as_double() * 1000000000.0);
+		LOGTIMING("%s : %f us before machine time\n", this->name(), (cur - mtime).as_double() * 1000000.0);
 }
 
 void netlist_mame_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
 {
-	if (machine().time() < last)
-		LOGDEBUG("machine.time() decreased 1\n");
-	last = machine().time();
-	LOGDEBUG("samples %d %d\n", (int) m_is_device_call, samples);
+	const auto mtime = machine().time();
+	if (mtime < m_last_update_to_current_time)
+		LOGTIMING("machine.time() decreased 1\n");
+	m_last_update_to_current_time = mtime;
+	LOGDEBUG("samples %d\n", samples);
 
-	if (m_in)
+	for (auto &e : m_in)
 	{
 		auto sample_time = netlist::netlist_time::from_raw(static_cast<netlist::netlist_time::internal_type>(nltime_from_attotime(m_attotime_per_clock).as_raw()));
-		m_in->buffer_reset(sample_time, samples, inputs);
+		e.second->buffer_reset(sample_time, samples, &inputs[e.first]);
 	}
 
 	m_cur_time += (samples * m_attotime_per_clock);
-	auto nl_target_time = nltime_from_attotime(m_cur_time);
 
-	if (!m_is_device_call)
-		nl_target_time -= netlist::netlist_time_ext::from_usec(2); // FIXME make adjustment a parameter
+	auto nl_target_time = std::min(nltime_from_attotime(mtime), nltime_from_attotime(m_cur_time));
 
 	auto nltime(netlist().exec().time());
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/netlist.h mame-0.224+dfsg.1/src/devices/machine/netlist.h
--- mame-0.222+dfsg.1/src/devices/machine/netlist.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/netlist.h	2020-08-26 08:57:19.000000000 +0000
@@ -12,9 +12,14 @@
 #define MAME_MACHINE_NETLIST_H
 
 #include <functional>
+#include <deque>
 
 #include "../../lib/netlist/nltypes.h"
 
+#ifndef NETLIST_CREATE_CSV
+#define NETLIST_CREATE_CSV (0)
+#endif
+
 class netlist_mame_stream_output_device;
 class nld_sound_in;
 
@@ -75,25 +80,8 @@
 	netlist::setup_t &setup();
 	netlist_mame_t &netlist() noexcept { return *m_netlist; }
 
-	void update_icount(netlist::netlist_time_ext time) noexcept;
-	void check_mame_abort_slice() noexcept;
-
 	static void register_memregion_source(netlist::nlparse_t &parser, device_t &dev, const char *name);
 
-	int m_icount;
-
-	static constexpr const unsigned MDIV_SHIFT = 16;
-
-	netlist::netlist_time_ext nltime_ext_from_clocks(unsigned c) const noexcept
-	{
-		return (m_div * c).shr(MDIV_SHIFT);
-	}
-
-	netlist::netlist_time nltime_from_clocks(unsigned c) const noexcept
-	{
-		return static_cast<netlist::netlist_time>((m_div * c).shr(MDIV_SHIFT));
-	}
-
 protected:
 
 	netlist_mame_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -109,43 +97,39 @@
 	virtual void device_reset() override;
 	virtual void device_post_load() override;
 	virtual void device_pre_save() override;
-	virtual void device_clock_changed() override;
-
-	netlist::host_arena::unique_ptr<netlist::netlist_state_t> base_validity_check(validity_checker &valid) const;
+	//virtual void device_clock_changed() override;
 
-	attotime m_cur_time;
-	attotime m_attotime_per_clock;
-private:
+	void device_start_common();
 	void save_state();
 
-	void common_dev_start(netlist::netlist_state_t *lnetlist) const;
+	std::unique_ptr<netlist::netlist_state_t> base_validity_check(validity_checker &valid) const;
 
-	netlist::netlist_time_ext    m_div;
-	netlist::netlist_time_ext    m_rem;
-	netlist::netlist_time_ext    m_old;
+private:
+	void common_dev_start(netlist::netlist_state_t *lnetlist) const;
 
 	std::unique_ptr<netlist_mame_t> m_netlist;
 
 	func_type m_setup_func;
-};
+	bool m_device_reset_called;
 
-// ----------------------------------------------------------------------------------------
-// netlist_mame_cpu_device
-// ----------------------------------------------------------------------------------------
+#if NETLIST_CREATE_CSV
+	static constexpr int MAX_BUFFER_ENTRIES = 1000;
 
-class netlist_mame_cpu_device;
-
-class netlist_disassembler : public util::disasm_interface
-{
 public:
-	netlist_disassembler(netlist_mame_cpu_device *dev);
-	virtual ~netlist_disassembler() = default;
-
-	virtual u32 opcode_alignment() const override;
-	virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override;
+	void log_add(char const* param, double value, bool isfloat);
+	void log_flush(int count = MAX_BUFFER_ENTRIES);
 
 private:
-	netlist_mame_cpu_device *m_dev;
+	struct buffer_entry
+	{
+		attotime time;
+		bool isfloat;
+		double value;
+		char const *string;
+	};
+	std::deque<buffer_entry> m_buffer;
+	FILE* m_csv_file = nullptr;
+#endif
 };
 
 class netlist_mame_cpu_device : public netlist_mame_device,
@@ -155,6 +139,8 @@
 								public device_memory_interface
 {
 public:
+	static constexpr const unsigned MDIV_SHIFT = 16;
+
 	// construction/destruction
 	netlist_mame_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
@@ -178,12 +164,26 @@
 		return *this;
 	}
 
+	void update_icount(netlist::netlist_time_ext time) noexcept;
+	void check_mame_abort_slice() noexcept;
+
+	netlist::netlist_time_ext nltime_ext_from_clocks(unsigned c) const noexcept
+	{
+		return (m_div * c).shr(MDIV_SHIFT);
+	}
+
+	netlist::netlist_time nltime_from_clocks(unsigned c) const noexcept
+	{
+		return static_cast<netlist::netlist_time>((m_div * c).shr(MDIV_SHIFT));
+	}
+
 protected:
 	// netlist_mame_device
 	virtual void nl_register_devices(netlist::nlparse_t &parser) const override;
 
 	// device_t overrides
 	virtual void device_start() override;
+	virtual void device_clock_changed() override;
 
 	// device_execute_interface overrides
 	virtual uint64_t execute_clocks_to_cycles(uint64_t clocks) const noexcept override;
@@ -203,10 +203,31 @@
 	address_space_config m_program_config;
 
 private:
+	int m_icount;
+	netlist::netlist_time_ext    m_div;
+	netlist::netlist_time_ext    m_rem;
+	netlist::netlist_time_ext    m_old;
 	offs_t m_genPC;
 };
 
 // ----------------------------------------------------------------------------------------
+// netlist_mame_cpu_device
+// ----------------------------------------------------------------------------------------
+
+class netlist_disassembler : public util::disasm_interface
+{
+public:
+	netlist_disassembler(netlist_mame_cpu_device *dev);
+	virtual ~netlist_disassembler() = default;
+
+	virtual u32 opcode_alignment() const override;
+	virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer &params) override;
+
+private:
+	netlist_mame_cpu_device *m_dev;
+};
+
+// ----------------------------------------------------------------------------------------
 // netlist_mame_sound_device
 // ----------------------------------------------------------------------------------------
 
@@ -234,27 +255,28 @@
 	inline sound_stream *get_stream() { return m_stream; }
 	void update_to_current_time();
 
-
-	// device_sound_interface overrides
-	virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-	virtual void device_validity_check(validity_checker &valid) const override;
-
 	void register_stream_output(int channel, netlist_mame_stream_output_device *so);
 
 protected:
+
 	// netlist_mame_device
 	virtual void nl_register_devices(netlist::nlparse_t &parser) const override;
 
 	// device_t overrides
 	virtual void device_start() override;
-	virtual void device_reset() override;
-	virtual void device_clock_changed() override;
+	// device_sound_interface overrides
+	virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
+	virtual void device_validity_check(validity_checker &valid) const override;
+	//virtual void device_reset() override;
 
 private:
 	std::map<int, netlist_mame_stream_output_device *> m_out;
-	nld_sound_in *m_in;
+	std::map<std::size_t, nld_sound_in *> m_in;
 	sound_stream *m_stream;
-	bool m_is_device_call;
+	attotime m_cur_time;
+	uint32_t m_sound_clock;
+	attotime m_attotime_per_clock;
+	attotime m_last_update_to_current_time;
 };
 
 // ----------------------------------------------------------------------------------------
diff -Nru mame-0.222+dfsg.1/src/devices/machine/nscsi_bus.cpp mame-0.224+dfsg.1/src/devices/machine/nscsi_bus.cpp
--- mame-0.222+dfsg.1/src/devices/machine/nscsi_bus.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/nscsi_bus.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -630,6 +630,10 @@
 void nscsi_full_device::scsi_command()
 {
 	switch(scsi_cmdbuf[0]) {
+	case SC_REZERO:
+		LOG("command REZERO\n");
+		scsi_status_complete(SS_GOOD);
+		break;
 	case SC_REQUEST_SENSE:
 		LOG("command REQUEST SENSE alloc=%d\n", scsi_cmdbuf[4]);
 		scsi_data_in(SBUF_SENSE, scsi_cmdbuf[4] ? std::min(scsi_cmdbuf[4], u8(sizeof(scsi_sense_buffer))) : 4);
diff -Nru mame-0.222+dfsg.1/src/devices/machine/pdp11.h mame-0.224+dfsg.1/src/devices/machine/pdp11.h
--- mame-0.222+dfsg.1/src/devices/machine/pdp11.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/pdp11.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,37 @@
+// license:BSD-3-Clause
+// copyright-holders:Sergey Svishchev
+/*****************************************************************************
+ *
+ * machine/pdp11.h
+ *
+ ****************************************************************************/
+
+#ifndef MAME_MACHINE_PDP11_H
+#define MAME_MACHINE_PDP11_H
+
+#pragma once
+
+// bit definitions for generic device CSR
+
+enum : uint16_t
+{
+	CSR_GO =    0000001,
+	CSR_IE =    0000100,    // interrupt enable
+	CSR_DONE =  0000200,
+	CSR_BUSY =  0004000,
+	CSR_ERR =   0100000
+};
+
+
+#define clear_virq(_callback, _csr, _ie, _intrq) \
+	if ((_csr) & (_ie)) { (_intrq) = CLEAR_LINE; }
+
+#define raise_virq(_callback, _csr, _ie, _intrq) \
+	if ((_csr) & (_ie)) { (_intrq) = ASSERT_LINE; _callback (ASSERT_LINE); }
+
+
+#define UPDATE_16BIT(_storage, _data, _mask) \
+	do { *_storage = ((*_storage & ~_mask) | (_data & _mask)); } while (0)
+
+
+#endif // MAME_MACHINE_PDP11_H
diff -Nru mame-0.222+dfsg.1/src/devices/machine/pit8253.cpp mame-0.224+dfsg.1/src/devices/machine/pit8253.cpp
--- mame-0.222+dfsg.1/src/devices/machine/pit8253.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/pit8253.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -101,6 +101,7 @@
 		m_out_handler[timer].resolve_safe();
 		m_counter[timer]->m_index = timer;
 		m_counter[timer]->m_clockin = m_clk[timer];
+		m_counter[timer]->m_clock_period = (m_clk[timer] != 0) ? attotime::from_hz(m_clk[timer]) : attotime::never;
 	}
 }
 
@@ -112,11 +113,12 @@
 void pit_counter_device::device_start()
 {
 	/* initialize timer */
-	m_updatetimer = timer_alloc();
-	m_updatetimer->adjust(attotime::never);
+	m_updatetimer = timer_alloc(TID_UPDATE);
+	adjust_timer(attotime::never);
 
 	/* set up state save values */
 	save_item(NAME(m_clockin));
+	save_item(NAME(m_clock_period));
 	save_item(NAME(m_control));
 	save_item(NAME(m_status));
 	save_item(NAME(m_lowcount));
@@ -197,6 +199,14 @@
 #define CTRL_MODE(control)          (((control) >> 1) & (((control) & 0x04) ? 0x03 : 0x07))
 #define CTRL_BCD(control)           (((control) >> 0) & 0x01)
 
+inline void pit_counter_device::adjust_timer(attotime target)
+{
+//  if (target != m_next_update)
+	{
+		m_next_update = target;
+		m_updatetimer->adjust(target - machine().time());
+	}
+}
 
 inline uint32_t pit_counter_device::adjusted_count() const
 {
@@ -684,15 +694,9 @@
 	}
 
 	if (cycles_to_output == CYCLES_NEVER || m_clockin == 0)
-	{
-		m_updatetimer->adjust(attotime::never);
-	}
+		adjust_timer(attotime::never);
 	else
-	{
-		attotime next_fire_time = m_last_updated + cycles_to_output * attotime::from_hz(m_clockin);
-
-		m_updatetimer->adjust(next_fire_time - machine().time());
-	}
+		adjust_timer(m_last_updated + cycles_to_output * m_clock_period);
 
 	LOG2("simulate(): simulating %d cycles in mode %d, bcd = %d, phase = %d, gate = %d, output %d, value = 0x%04x, cycles_to_output = %04x\n",
 			(int)elapsed_cycles, mode, bcd, m_phase, m_gate, m_output, m_value, cycles_to_output);
@@ -704,13 +708,56 @@
 	/* With the 82C54's maximum clockin of 10MHz, 64 bits is nearly 60,000
 	   years of time. Should be enough for now. */
 	attotime now = machine().time();
-	attotime elapsed_time = now - m_last_updated;
-	int64_t elapsed_cycles = elapsed_time.as_double() * m_clockin;
+	int64_t elapsed_cycles = 0;
+	if (m_clockin != 0)
+	{
+		if (now > m_last_updated)
+		{
+			attotime elapsed_time = now - m_last_updated;
+
+			// in the case of sub-Hz frequencies, just loop; there's not going to be many
+			if (m_clock_period.m_seconds != 0)
+			{
+				while (elapsed_time >= m_clock_period)
+				{
+					elapsed_cycles++;
+					elapsed_time -= m_clock_period;
+				}
+			}
 
-	LOG2("update(): %d elapsed_cycles\n", elapsed_cycles);
+			// otherwise, compute it a straightforward way
+			else
+			{
+				elapsed_cycles = elapsed_time.m_attoseconds / m_clock_period.m_attoseconds;
+
+				// not expecting to see many cases of this, but just in case, let's do it right
+				if (elapsed_time.m_seconds != 0)
+				{
+					// first account for the elapsed_cycles counted above (guaranteed to be <= elapsed_time.m_attoseconds)
+					elapsed_time.m_attoseconds -= elapsed_cycles * m_clock_period.m_attoseconds;
 
-	if (m_clockin)
-		m_last_updated += elapsed_cycles * attotime::from_hz(m_clockin);
+					// now compute the integral cycles per second based on the clock period
+					int64_t cycles_per_second = ATTOSECONDS_PER_SECOND / m_clock_period.m_attoseconds;
+
+					// add that many times the number of elapsed seconds
+					elapsed_cycles += cycles_per_second * elapsed_time.m_seconds;
+
+					// now compute how many attoseconds we missed for each full second (will be 0 for integral values)
+					int64_t remainder_per_second = ATTOSECONDS_PER_SECOND - cycles_per_second * m_clock_period.m_attoseconds;
+
+					// add those to the elapsed attoseconds
+					elapsed_time.m_attoseconds += elapsed_time.m_seconds * remainder_per_second;
+
+					// finally, see if that adds up to any additional cycles
+					elapsed_cycles += elapsed_time.m_attoseconds / m_clock_period.m_attoseconds;
+				}
+			}
+
+			LOG2("update(): %d elapsed_cycles\n", elapsed_cycles);
+
+			m_last_updated += elapsed_cycles * m_clock_period;
+		}
+	}
 	else
 		m_last_updated = now;
 
@@ -718,8 +765,8 @@
 	   sections punctuated by callbacks. */
 	if (elapsed_cycles > 0)
 		simulate(elapsed_cycles);
-	else if (m_clockin)
-		m_updatetimer->adjust(attotime::from_hz(m_clockin));
+	else if (m_clockin != 0)
+		adjust_timer(m_last_updated + m_clock_period);
 }
 
 
@@ -928,12 +975,27 @@
 void pit_counter_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
 {
 	update();
+	switch (id)
+	{
+		case TID_UPDATE:
+			break;
+
+		case TID_CONTROL:
+			control_w_deferred(param);
+			break;
+
+		case TID_COUNT:
+			count_w_deferred(param);
+			break;
+
+		case TID_GATE:
+			gate_w_deferred(param);
+			break;
+	}
 }
 
-void pit_counter_device::control_w(uint8_t data)
+void pit_counter_device::control_w_deferred(uint8_t data)
 {
-	update();
-
 	if (CTRL_ACCESS(data) == 0)
 	{
 		LOG1("write(): readback\n");
@@ -955,10 +1017,8 @@
 	}
 }
 
-void pit_counter_device::count_w(uint8_t data)
+void pit_counter_device::count_w_deferred(uint8_t data)
 {
-	update();
-
 	bool middle_of_a_cycle = (machine().time() > m_last_updated && m_clockin != 0);
 
 	switch (CTRL_ACCESS(m_control))
@@ -972,7 +1032,7 @@
 
 		/* check if we should compensate for not being on a cycle boundary */
 		if (middle_of_a_cycle)
-			m_last_updated += attotime::from_hz(m_clockin);
+			m_last_updated += m_clock_period;
 
 		load_count(data);
 		simulate(0);
@@ -986,7 +1046,7 @@
 
 		/* check if we should compensate for not being on a cycle boundary */
 		if (middle_of_a_cycle)
-			m_last_updated += attotime::from_hz(m_clockin);
+			m_last_updated += m_clock_period;
 
 		load_count(data << 8);
 		simulate(0);
@@ -1001,7 +1061,7 @@
 		{
 			/* check if we should compensate for not being on a cycle boundary */
 			if (middle_of_a_cycle)
-				m_last_updated += attotime::from_hz(m_clockin);
+				m_last_updated += m_clock_period;
 
 			load_count(m_lowcount | (data << 8));
 			simulate(0);
@@ -1042,7 +1102,7 @@
 		m_counter[offset]->count_w(data);
 }
 
-void pit_counter_device::gate_w(int state)
+void pit_counter_device::gate_w_deferred(int state)
 {
 	LOG2("gate_w(): state=%d\n", state);
 
@@ -1070,6 +1130,7 @@
 	if (started())
 		update();
 	m_clockin = new_clockin;
+	m_clock_period = (new_clockin != 0) ? attotime::from_hz(new_clockin) : attotime::never;
 	if (started())
 		update();
 }
diff -Nru mame-0.222+dfsg.1/src/devices/machine/pit8253.h mame-0.224+dfsg.1/src/devices/machine/pit8253.h
--- mame-0.222+dfsg.1/src/devices/machine/pit8253.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/pit8253.h	2020-08-26 08:57:19.000000000 +0000
@@ -42,6 +42,14 @@
 	friend class pit8253_device;
 	friend class pit8254_device;
 
+	enum
+	{
+		TID_UPDATE = 1,
+		TID_CONTROL,
+		TID_COUNT,
+		TID_GATE
+	};
+
 public:
 	// construction/destruction
 	pit_counter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
@@ -54,6 +62,7 @@
 
 private:
 	inline uint32_t adjusted_count() const;
+	inline void adjust_timer(attotime target);
 	void decrease_counter_value(int64_t cycles);
 	void load_counter_value();
 	void set_output(int output);
@@ -63,18 +72,23 @@
 	uint8_t read();
 	void load_count(uint16_t newcount);
 	void readback(int command);
-	void control_w(uint8_t data);
-	void count_w(uint8_t data);
-	void gate_w(int state);
+	void control_w(uint8_t data) { synchronize(TID_CONTROL, data); }
+	void control_w_deferred(uint8_t data);
+	void count_w(uint8_t data) { synchronize(TID_COUNT, data); }
+	void count_w_deferred(uint8_t data);
+	void gate_w(int state) { synchronize(TID_GATE, state); }
+	void gate_w_deferred(int state);
 	void set_clock_signal(int state);
 	void set_clockin(double new_clockin);
 
 	// internal state
 	int m_index;                // index number of the timer
 	double m_clockin;           // input clock frequency in Hz
+	attotime m_clock_period;    // precomputed input clock period
 	int m_clock_signal;         // clock signal when clockin is 0
 
 	attotime m_last_updated;    // time when last updated
+	attotime m_next_update;     // time of next update
 
 	emu_timer *m_updatetimer;   // MAME timer to process updates
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/pxa255.cpp mame-0.224+dfsg.1/src/devices/machine/pxa255.cpp
--- mame-0.222+dfsg.1/src/devices/machine/pxa255.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/pxa255.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -23,9 +23,12 @@
 #define LOG_GPIO        (1 << 6)
 #define LOG_LCD_DMA     (1 << 7)
 #define LOG_LCD         (1 << 8)
-#define LOG_ALL         (LOG_UNKNOWN | LOG_I2S | LOG_DMA | LOG_OSTIMER | LOG_INTC | LOG_GPIO | LOG_LCD_DMA | LOG_LCD)
+#define LOG_POWER       (1 << 9)
+#define LOG_RTC         (1 << 10)
+#define LOG_CLOCKS      (1 << 11)
+#define LOG_ALL         (LOG_UNKNOWN | LOG_I2S | LOG_DMA | LOG_OSTIMER | LOG_INTC | LOG_GPIO | LOG_LCD_DMA | LOG_LCD | LOG_POWER | LOG_RTC | LOG_CLOCKS)
 
-#define VERBOSE         (0)
+#define VERBOSE         (LOG_ALL)
 #include "logmacro.h"
 
 DEFINE_DEVICE_TYPE(PXA255_PERIPHERALS, pxa255_periphs_device, "pxa255_periphs", "Intel XScale PXA255 Peripherals")
@@ -198,14 +201,14 @@
 	m_dma_regs.dcsr[channel] &= ~PXA255_DCSR_STOPSTATE;
 }
 
-TIMER_CALLBACK_MEMBER(pxa255_periphs_device::dma_dma_end)
+void pxa255_periphs_device::dma_end_tick(int channel)
 {
-	uint32_t sadr = m_dma_regs.dsadr[param];
-	uint32_t tadr = m_dma_regs.dtadr[param];
-	uint32_t count = m_dma_regs.dcmd[param] & 0x00001fff;
+	uint32_t sadr = m_dma_regs.dsadr[channel];
+	uint32_t tadr = m_dma_regs.dtadr[channel];
+	uint32_t count = m_dma_regs.dcmd[channel] & 0x00001fff;
 
 	address_space &space = m_maincpu->space(AS_PROGRAM);
-	switch (param)
+	switch (channel)
 	{
 		case 3:
 			for (uint32_t index = 0; index < count; index += 4)
@@ -224,7 +227,7 @@
 		default:
 			for (uint32_t index = 0; index < count;)
 			{
-				switch (m_dma_regs.dcmd[param] & PXA255_DCMD_SIZE)
+				switch (m_dma_regs.dcmd[channel] & PXA255_DCMD_SIZE)
 				{
 					case PXA255_DCMD_SIZE_8:
 						space.write_byte(tadr, space.read_byte(sadr));
@@ -243,9 +246,9 @@
 						break;
 				}
 
-				if (m_dma_regs.dcmd[param] & PXA255_DCMD_INCSRCADDR)
+				if (m_dma_regs.dcmd[channel] & PXA255_DCMD_INCSRCADDR)
 				{
-					switch(m_dma_regs.dcmd[param] & PXA255_DCMD_SIZE)
+					switch(m_dma_regs.dcmd[channel] & PXA255_DCMD_SIZE)
 					{
 						case PXA255_DCMD_SIZE_8:
 							sadr++;
@@ -260,9 +263,9 @@
 							break;
 					}
 				}
-				if(m_dma_regs.dcmd[param] & PXA255_DCMD_INCTRGADDR)
+				if(m_dma_regs.dcmd[channel] & PXA255_DCMD_INCTRGADDR)
 				{
-					switch(m_dma_regs.dcmd[param] & PXA255_DCMD_SIZE)
+					switch(m_dma_regs.dcmd[channel] & PXA255_DCMD_SIZE)
 					{
 						case PXA255_DCMD_SIZE_8:
 							tadr++;
@@ -281,27 +284,27 @@
 			break;
 	}
 
-	if (m_dma_regs.dcmd[param] & PXA255_DCMD_ENDIRQEN)
+	if (m_dma_regs.dcmd[channel] & PXA255_DCMD_ENDIRQEN)
 	{
-		m_dma_regs.dcsr[param] |= PXA255_DCSR_ENDINTR;
+		m_dma_regs.dcsr[channel] |= PXA255_DCSR_ENDINTR;
 	}
 
-	if (!(m_dma_regs.ddadr[param] & PXA255_DDADR_STOP) && (m_dma_regs.dcsr[param] & PXA255_DCSR_RUN))
+	if (!(m_dma_regs.ddadr[channel] & PXA255_DDADR_STOP) && (m_dma_regs.dcsr[channel] & PXA255_DCSR_RUN))
 	{
-		if (m_dma_regs.dcsr[param] & PXA255_DCSR_RUN)
+		if (m_dma_regs.dcsr[channel] & PXA255_DCSR_RUN)
 		{
-			dma_load_descriptor_and_start(param);
+			dma_load_descriptor_and_start(channel);
 		}
 		else
 		{
-			m_dma_regs.dcsr[param] &= ~PXA255_DCSR_RUN;
-			m_dma_regs.dcsr[param] |= PXA255_DCSR_STOPSTATE;
+			m_dma_regs.dcsr[channel] &= ~PXA255_DCSR_RUN;
+			m_dma_regs.dcsr[channel] |= PXA255_DCSR_STOPSTATE;
 		}
 	}
 	else
 	{
-		m_dma_regs.dcsr[param] &= ~PXA255_DCSR_RUN;
-		m_dma_regs.dcsr[param] |= PXA255_DCSR_STOPSTATE;
+		m_dma_regs.dcsr[channel] &= ~PXA255_DCSR_RUN;
+		m_dma_regs.dcsr[channel] |= PXA255_DCSR_STOPSTATE;
 	}
 
 	dma_irq_check();
@@ -446,6 +449,95 @@
 
 /*
 
+  PXA255 Real-Time Clock
+
+  pg. 132 to 138, PXA255 Processor Developers Manual [278693-002].pdf
+
+*/
+
+void pxa255_periphs_device::rtc_tick()
+{
+	m_rtc_regs.rcnr++;
+	if (BIT(m_rtc_regs.rtsr, 3))
+	{
+		m_rtc_regs.rtsr |= (1 << 1);
+		set_irq_line(PXA255_INT_RTC_HZ, 1);
+	}
+
+	if (m_rtc_regs.rcnr == m_rtc_regs.rtar)
+	{
+		if (BIT(m_rtc_regs.rtsr, 2))
+		{
+			m_rtc_regs.rtsr |= (1 << 0);
+			set_irq_line(PXA255_INT_RTC_ALARM, 1);
+		}
+	}
+}
+
+uint32_t pxa255_periphs_device::rtc_r(offs_t offset, uint32_t mem_mask)
+{
+	switch(PXA255_RTC_BASE_ADDR | (offset << 2))
+	{
+		case PXA255_RCNR:
+			LOGMASKED(LOG_RTC, "%s: pxa255 rtc_r: RTC Counter Register: %08x\n", machine().describe_context(), m_rtc_regs.rcnr);
+			return m_rtc_regs.rcnr;
+		case PXA255_RTAR:
+			LOGMASKED(LOG_RTC, "%s: pxa255 rtc_r: RTC Alarm Register: %08x\n", machine().describe_context(), m_rtc_regs.rtar);
+			return m_rtc_regs.rtar;
+		case PXA255_RTSR:
+			LOGMASKED(LOG_RTC, "%s: pxa255 rtc_r: RTC Status Register: %08x\n", machine().describe_context(), m_rtc_regs.rtsr);
+			return m_rtc_regs.rtsr;
+		case PXA255_RTTR:
+			LOGMASKED(LOG_RTC, "%s: pxa255 rtc_r: RTC Trim Register: %08x\n", machine().describe_context(), m_rtc_regs.rttr);
+			return m_rtc_regs.rttr;
+		default:
+			LOGMASKED(LOG_RTC | LOG_UNKNOWN, "pxa255 rtc_r: Unknown address: %08x\n", PXA255_RTC_BASE_ADDR | (offset << 2));
+			break;
+	}
+	return 0;
+}
+
+void pxa255_periphs_device::rtc_w(offs_t offset, uint32_t data, uint32_t mem_mask)
+{
+	switch(PXA255_RTC_BASE_ADDR | (offset << 2))
+	{
+		case PXA255_RCNR:
+			LOGMASKED(LOG_RTC, "pxa255 rtc_w: RTC Counter Register: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_rtc_regs.rcnr);
+			break;
+		case PXA255_RTAR:
+			LOGMASKED(LOG_RTC, "pxa255 rtc_w: RTC Alarm Register: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_rtc_regs.rtar);
+			break;
+		case PXA255_RTSR:
+		{
+			LOGMASKED(LOG_RTC, "pxa255 rtc_w: RTC Status Register: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			const uint32_t old = m_rtc_regs.rtsr;
+			m_rtc_regs.rtsr &= ~(data & 0x00000003);
+			m_rtc_regs.rtsr &= ~0x0000000c;
+			m_rtc_regs.rtsr |= data & 0x0000000c;
+			const uint32_t diff = old ^ m_rtc_regs.rtsr;
+			if (BIT(diff, 1))
+				set_irq_line(PXA255_INT_RTC_HZ, 0);
+			if (BIT(diff, 0))
+				set_irq_line(PXA255_INT_RTC_ALARM, 0);
+			break;
+		}
+		case PXA255_RTTR:
+			LOGMASKED(LOG_RTC, "pxa255 rtc_w: RTC Trim Register (not yet implemented): %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			if (!BIT(m_rtc_regs.rttr, 31))
+			{
+				COMBINE_DATA(&m_rtc_regs.rttr);
+			}
+			break;
+		default:
+			LOGMASKED(LOG_RTC | LOG_UNKNOWN, "pxa255 rtc_w: Unknown address: %08x = %08x & %08x\n", PXA255_RTC_BASE_ADDR | (offset << 2), data, mem_mask);
+			break;
+	}
+}
+
+/*
+
   PXA255 OS Timer register
 
   pg. 138 to 142, PXA255 Processor Developers Manual [278693-002].pdf
@@ -460,10 +552,10 @@
 	//set_irq_line(PXA255_INT_OSTIMER3, (m_ostimer_regs.oier & PXA255_OIER_E3) ? ((m_ostimer_regs.ossr & PXA255_OSSR_M3) ? 1 : 0) : 0);
 }
 
-TIMER_CALLBACK_MEMBER(pxa255_periphs_device::ostimer_match)
+void pxa255_periphs_device::ostimer_match_tick(int channel)
 {
-	m_ostimer_regs.ossr |= (1 << param);
-	m_ostimer_regs.oscr = m_ostimer_regs.osmr[param];
+	m_ostimer_regs.ossr |= (1 << channel);
+	m_ostimer_regs.oscr = m_ostimer_regs.osmr[channel];
 	ostimer_irq_check();
 }
 
@@ -663,6 +755,77 @@
 
 */
 
+void pxa255_periphs_device::gpio_bit_w(offs_t offset, uint8_t data, uint8_t mem_mask)
+{
+	const uint32_t val = (data != 0 ? 1 : 0);
+	LOGMASKED(LOG_GPIO, "pxa255: GPIO%d written: %d\n", offset, val);
+	if (offset < 32)
+	{
+		const uint32_t old = m_gpio_regs.gplr0;
+		m_gpio_regs.gplr0 &= ~(1   << offset);
+		m_gpio_regs.gplr0 |= (val << offset);
+
+		LOGMASKED(LOG_GPIO, "pxa255: Old GPLR0 %08x, New GPLR0 %08x\n", old, m_gpio_regs.gplr0);
+
+		const uint32_t rising = ~old & m_gpio_regs.gplr0;
+		const uint32_t falling = old & ~m_gpio_regs.gplr0;
+
+		LOGMASKED(LOG_GPIO, "pxa255: Rising %08x, Falling %08x\n", rising, falling);
+
+		const uint32_t old_gedr = m_gpio_regs.gedr0;
+		m_gpio_regs.gedr0 |= (rising & m_gpio_regs.grer0);
+		m_gpio_regs.gedr0 |= (falling & m_gpio_regs.gfer0);
+
+		LOGMASKED(LOG_GPIO, "pxa255: Old GEDR0 %08x, New GEDR0 %08x\n", old_gedr, m_gpio_regs.gedr0);
+		if (old_gedr != m_gpio_regs.gedr0)
+		{
+			LOGMASKED(LOG_GPIO, "pxa255: Edge detected on GPIO%d\n", offset);
+			if (offset > 1)
+				set_irq_line(PXA255_INT_GPIO84_2, 1);
+			else if (offset == 1)
+				set_irq_line(PXA255_INT_GPIO1, 1);
+			else
+				set_irq_line(PXA255_INT_GPIO0, 1);
+		}
+	}
+	else if (offset < 64)
+	{
+		const uint32_t old = m_gpio_regs.gplr1;
+		m_gpio_regs.gplr1 &= ~(1   << (offset - 32));
+		m_gpio_regs.gplr1 |= ~(val << (offset - 32));
+
+		const uint32_t rising = ~old & m_gpio_regs.gplr1;
+		const uint32_t falling = old & ~m_gpio_regs.gplr1;
+
+		const uint32_t old_gedr = m_gpio_regs.gedr1;
+		m_gpio_regs.gedr1 |= (rising & m_gpio_regs.grer1);
+		m_gpio_regs.gedr1 |= (falling & m_gpio_regs.gfer1);
+		if (old_gedr != m_gpio_regs.gedr1)
+		{
+			LOGMASKED(LOG_GPIO, "pxa255: Edge detected on GPIO%d\n", offset);
+			set_irq_line(PXA255_INT_GPIO84_2, 1);
+		}
+	}
+	else if (offset < 85)
+	{
+		const uint32_t old = m_gpio_regs.gplr2;
+		m_gpio_regs.gplr2 &= ~(1   << (offset - 64));
+		m_gpio_regs.gplr2 |= ~(val << (offset - 64));
+
+		const uint32_t rising = ~old & m_gpio_regs.gplr2;
+		const uint32_t falling = old & ~m_gpio_regs.gplr2;
+
+		const uint32_t old_gedr = m_gpio_regs.gedr2;
+		m_gpio_regs.gedr2 |= (rising & m_gpio_regs.grer2);
+		m_gpio_regs.gedr2 |= (falling & m_gpio_regs.gfer2);
+		if (old_gedr != m_gpio_regs.gedr2)
+		{
+			LOGMASKED(LOG_GPIO, "pxa255: Edge detected on GPIO%d\n", offset);
+			set_irq_line(PXA255_INT_GPIO84_2, 1);
+		}
+	}
+}
+
 uint32_t pxa255_periphs_device::gpio_r(offs_t offset, uint32_t mem_mask)
 {
 	switch(PXA255_GPIO_BASE_ADDR | (offset << 2))
@@ -844,17 +1007,39 @@
 			m_gpio_regs.gfer2 = data;
 			break;
 		case PXA255_GEDR0:
+		{
 			LOGMASKED(LOG_GPIO, "pxa255_gpio_w: GPIO Edge Detect Status Register 0: %08x & %08x\n", m_gpio_regs.gedr0, mem_mask);
+			const uint32_t old = m_gpio_regs.gedr0;
 			m_gpio_regs.gedr0 &= ~data;
+			const uint32_t lowered = old & ~m_gpio_regs.gedr0;
+			if (BIT(lowered, 0))
+				set_irq_line(PXA255_INT_GPIO0, 0);
+			else if (BIT(lowered, 1))
+				set_irq_line(PXA255_INT_GPIO1, 0);
+			else if ((lowered & 0xfffffffc) && !m_gpio_regs.gedr0 && !m_gpio_regs.gedr1 && !m_gpio_regs.gedr2)
+				set_irq_line(PXA255_INT_GPIO84_2, 0);
 			break;
+		}
 		case PXA255_GEDR1:
+		{
 			LOGMASKED(LOG_GPIO, "pxa255_gpio_w: GPIO Edge Detect Status Register 1: %08x & %08x\n", m_gpio_regs.gedr1, mem_mask);
+			const uint32_t old = m_gpio_regs.gedr1;
 			m_gpio_regs.gedr1 &= ~data;
+			const uint32_t lowered = old & !m_gpio_regs.gedr1;
+			if (lowered && !m_gpio_regs.gedr0 && !m_gpio_regs.gedr1 && !m_gpio_regs.gedr2)
+				set_irq_line(PXA255_INT_GPIO84_2, 0);
 			break;
+		}
 		case PXA255_GEDR2:
+		{
 			LOGMASKED(LOG_GPIO, "pxa255_gpio_w: GPIO Edge Detect Status Register 2: %08x & %08x\n", m_gpio_regs.gedr2, mem_mask);
+			const uint32_t old = m_gpio_regs.gedr2;
 			m_gpio_regs.gedr2 &= ~data;
+			const uint32_t lowered = old & !m_gpio_regs.gedr2;
+			if (lowered && !m_gpio_regs.gedr0 && !m_gpio_regs.gedr1 && !m_gpio_regs.gedr2)
+				set_irq_line(PXA255_INT_GPIO84_2, 0);
 			break;
+		}
 		case PXA255_GAFR0_L:
 			LOGMASKED(LOG_GPIO, "pxa255_gpio_w: GPIO Alternate Function Register 0 Lower: %08x & %08x\n", m_gpio_regs.gafr0l, mem_mask);
 			m_gpio_regs.gafr0l = data;
@@ -987,15 +1172,15 @@
 	}
 }
 
-TIMER_CALLBACK_MEMBER(pxa255_periphs_device::lcd_dma_eof)
+void pxa255_periphs_device::lcd_dma_eof_tick(int channel)
 {
 	LOGMASKED(LOG_LCD_DMA, "End of frame callback\n" );
-	if(m_lcd_regs.dma[param].ldcmd & PXA255_LDCMD_EOFINT)
+	if(m_lcd_regs.dma[channel].ldcmd & PXA255_LDCMD_EOFINT)
 	{
-		m_lcd_regs.liidr = m_lcd_regs.dma[param].fidr;
+		m_lcd_regs.liidr = m_lcd_regs.dma[channel].fidr;
 		m_lcd_regs.lcsr |= PXA255_LCSR_EOF;
 	}
-	lcd_check_load_next_branch(param);
+	lcd_check_load_next_branch(channel);
 	lcd_irq_check();
 }
 
@@ -1168,20 +1353,182 @@
 	}
 }
 
+uint32_t pxa255_periphs_device::power_r(offs_t offset, uint32_t mem_mask)
+{
+	switch(PXA255_POWER_BASE_ADDR | (offset << 2))
+	{
+		case PXA255_PMCR:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager Control Register: %08x\n", machine().describe_context(), m_power_regs.pmcr);
+			return m_power_regs.pmcr;
+		case PXA255_PSSR:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager Sleep Status Register: %08x\n", machine().describe_context(), m_power_regs.pssr);
+			return m_power_regs.pssr;
+		case PXA255_PSPR:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager Scratch Pad Register: %08x\n", machine().describe_context(), m_power_regs.pspr);
+			return m_power_regs.pspr;
+		case PXA255_PWER:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager Wake-up Enable Register: %08x\n", machine().describe_context(), m_power_regs.pwer);
+			return m_power_regs.pwer;
+		case PXA255_PRER:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager GPIO Rising-Edge Detect Enable Register: %08x\n", machine().describe_context(), m_power_regs.prer);
+			return m_power_regs.prer;
+		case PXA255_PFER:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager GPIO Falling-Edge Detect Enable Register: %08x\n", machine().describe_context(), m_power_regs.pfer);
+			return m_power_regs.pfer;
+		case PXA255_PEDR:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager GPIO Edge Detect Status Register: %08x\n", machine().describe_context(), m_power_regs.pedr);
+			return m_power_regs.pedr;
+		case PXA255_PCFR:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager General Configuration Register: %08x\n", machine().describe_context(), m_power_regs.pcfr);
+			return m_power_regs.pcfr;
+		case PXA255_PGSR0:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager GPIO Sleep State Register for GP[31-0]: %08x\n", machine().describe_context(), m_power_regs.pgsr0);
+			return m_power_regs.pgsr0;
+		case PXA255_PGSR1:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager GPIO Sleep State Register for GP[63-32]: %08x\n", machine().describe_context(), m_power_regs.pgsr1);
+			return m_power_regs.pgsr1;
+		case PXA255_PGSR2:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager GPIO Sleep State Register for GP[84-64]: %08x\n", machine().describe_context(), m_power_regs.pgsr2);
+			return m_power_regs.pgsr2;
+		case PXA255_RCSR:
+			LOGMASKED(LOG_POWER, "%s: power_r: Reset Controller Status Register: %08x\n", machine().describe_context(), m_power_regs.rcsr);
+			return m_power_regs.rcsr;
+		case PXA255_PMFW:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager Fast Sleep Walk-Up Configuration Register: %08x\n", machine().describe_context(), m_power_regs.pmfw);
+			return m_power_regs.pmfw;
+		default:
+			LOGMASKED(LOG_POWER | LOG_UNKNOWN, "%s: power_r: Unknown address: %08x\n", machine().describe_context(), PXA255_POWER_BASE_ADDR | (offset << 2));
+			break;
+	}
+	return 0;
+}
+
+void pxa255_periphs_device::power_w(offs_t offset, uint32_t data, uint32_t mem_mask)
+{
+	switch(PXA255_POWER_BASE_ADDR | (offset << 2))
+	{
+		case PXA255_PMCR:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager Control Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pmcr);
+			break;
+		case PXA255_PSSR:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager Sleep Status Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			m_power_regs.pssr &= ~(data & 0x00000037);
+			break;
+		case PXA255_PSPR:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager Scratch Pad Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pspr);
+			break;
+		case PXA255_PWER:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager Wake-Up Enable Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pwer);
+			break;
+		case PXA255_PRER:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager Rising-Edge Detect Enable Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.prer);
+			break;
+		case PXA255_PFER:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager Falling-Edge Detect Enable Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pfer);
+			break;
+		case PXA255_PEDR:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager GPIO Edge Detect Status Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			m_power_regs.pedr &= ~(data & 0x0000ffff);
+			break;
+		case PXA255_PCFR:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager General Configuration Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pcfr);
+			break;
+		case PXA255_PGSR0:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager GPIO Sleep State Register 0 = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pgsr0);
+			break;
+		case PXA255_PGSR1:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager GPIO Sleep State Register 1 = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pgsr1);
+			break;
+		case PXA255_PGSR2:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager GPIO Sleep State Register 2 = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pgsr2);
+			break;
+		case PXA255_PMFW:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager Fast Sleep Walk-Up Configuration Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pmfw);
+			break;
+		default:
+			LOGMASKED(LOG_POWER | LOG_UNKNOWN, "%s: power_w: Unknown address: %08x = %08x & %08x\n", machine().describe_context(), PXA255_POWER_BASE_ADDR | (offset << 2),
+				data, mem_mask);
+			break;
+	}
+}
+
+/*
+  PXA255 Clock controller
+
+  pg. 96 to 100, PXA255 Processor Developers Manual [278693-002].pdf
+
+*/
+
+uint32_t pxa255_periphs_device::clocks_r(offs_t offset, uint32_t mem_mask)
+{
+	switch(PXA255_CLOCKS_BASE_ADDR | (offset << 2))
+	{
+		case PXA255_CCCR:
+			LOGMASKED(LOG_CLOCKS, "%s: clocks_r: Core Clock Configuration Register: %08x\n", machine().describe_context(), m_clocks_regs.cccr);
+			return m_clocks_regs.cccr;
+		case PXA255_CKEN:
+			LOGMASKED(LOG_CLOCKS, "%s: clocks_r: Clock Enable Register: %08x\n", machine().describe_context(), m_clocks_regs.cken);
+			return m_clocks_regs.cken;
+		case PXA255_OSCC:
+			LOGMASKED(LOG_CLOCKS, "%s: clocks_r: Oscillator Configuration Register: %08x\n", machine().describe_context(), m_clocks_regs.oscc);
+			return BIT(m_clocks_regs.oscc, 0);
+		default:
+			LOGMASKED(LOG_CLOCKS | LOG_UNKNOWN, "%s: clocks_r: Unknown address: %08x\n", machine().describe_context(), PXA255_CLOCKS_BASE_ADDR | (offset << 2));
+			break;
+	}
+	return 0;
+}
+
+void pxa255_periphs_device::clocks_w(offs_t offset, uint32_t data, uint32_t mem_mask)
+{
+	switch(PXA255_CLOCKS_BASE_ADDR | (offset << 2))
+	{
+		case PXA255_CCCR:
+			LOGMASKED(LOG_CLOCKS, "%s: clocks_w: Core Clock Configuration Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_clocks_regs.cccr);
+			break;
+		case PXA255_CKEN:
+			LOGMASKED(LOG_CLOCKS, "%s: clocks_w: Clock Enable Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_clocks_regs.cken);
+			break;
+		case PXA255_OSCC:
+			LOGMASKED(LOG_CLOCKS, "%s: clocks_w: Oscillator Configuration Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			if (BIT(data, 1))
+			{
+				m_clocks_regs.oscc |= 0x00000003;
+			}
+			break;
+		default:
+			LOGMASKED(LOG_CLOCKS | LOG_UNKNOWN, "%s: clocks_w: Unknown address: %08x = %08x & %08x\n", machine().describe_context(), PXA255_CLOCKS_BASE_ADDR | (offset << 2),
+				data, mem_mask);
+			break;
+	}
+}
+
 void pxa255_periphs_device::device_start()
 {
 	for (int index = 0; index < 16; index++)
 	{
-		m_dma_regs.timer[index] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pxa255_periphs_device::dma_dma_end),this));
+		m_dma_regs.timer[index] = timer_alloc(TIMER_DMA0 + index);
 	}
 
 	for (int index = 0; index < 4; index++)
 	{
-		m_ostimer_regs.timer[index] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pxa255_periphs_device::ostimer_match),this));
+		m_ostimer_regs.timer[index] = timer_alloc(TIMER_OSTIMER0 + index);
 	}
 
-	m_lcd_regs.dma[0].eof = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pxa255_periphs_device::lcd_dma_eof),this));
-	m_lcd_regs.dma[1].eof = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pxa255_periphs_device::lcd_dma_eof),this));
+	m_lcd_regs.dma[0].eof = timer_alloc(TIMER_LCD_EOF0);
+	m_lcd_regs.dma[1].eof = timer_alloc(TIMER_LCD_EOF0 + 1);
 
 	m_lcd_palette = make_unique_clear<uint32_t[]>(0x100);
 	m_lcd_framebuffer = make_unique_clear<uint8_t[]>(0x100000);
@@ -1194,6 +1541,8 @@
 	m_gpio0_r.resolve_safe(0xffffffff);
 	m_gpio1_r.resolve_safe(0xffffffff);
 	m_gpio2_r.resolve_safe(0xffffffff);
+
+	m_rtc_regs.timer = timer_alloc(TIMER_RTC);
 }
 
 void pxa255_periphs_device::device_reset()
@@ -1203,10 +1552,31 @@
 		m_dma_regs.dcsr[index] = 0x00000008;
 	}
 
+	m_rtc_regs.rcnr = 0x00000000;
+	m_rtc_regs.rtar = 0x00000000;
+	m_rtc_regs.rtsr = 0x00000000;
+	m_rtc_regs.rttr = 0x00007fff;
+	m_rtc_regs.timer->adjust(attotime::from_hz(1));
+
 	memset(&m_intc_regs, 0, sizeof(m_intc_regs));
 
 	m_lcd_regs.trgbr = 0x00aa5500;
 	m_lcd_regs.tcr = 0x0000754f;
+
+	memset(&m_power_regs, 0, sizeof(m_power_regs));
+	memset(&m_clocks_regs, 0, sizeof(m_clocks_regs));
+}
+
+void pxa255_periphs_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	if (id < TIMER_OSTIMER0)
+		dma_end_tick(id);
+	else if (id < TIMER_LCD_EOF0)
+		ostimer_match_tick(id - TIMER_OSTIMER0);
+	else if (id < TIMER_RTC)
+		lcd_dma_eof_tick(id - TIMER_LCD_EOF0);
+	else if (id == TIMER_RTC)
+		rtc_tick();
 }
 
 uint32_t pxa255_periphs_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff -Nru mame-0.222+dfsg.1/src/devices/machine/pxa255defs.h mame-0.224+dfsg.1/src/devices/machine/pxa255defs.h
--- mame-0.222+dfsg.1/src/devices/machine/pxa255defs.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/pxa255defs.h	2020-08-26 08:57:19.000000000 +0000
@@ -214,6 +214,20 @@
 
 /*
 
+  PXA255 Real-Time Clock
+
+  pg. 132 to 138, PXA255 Processor Developers Manual [278693-002].pdf
+
+*/
+
+#define PXA255_RTC_BASE_ADDR    (0x40900000)
+#define PXA255_RCNR             (PXA255_RTC_BASE_ADDR + 0x00000000)
+#define PXA255_RTAR             (PXA255_RTC_BASE_ADDR + 0x00000004)
+#define PXA255_RTSR             (PXA255_RTC_BASE_ADDR + 0x00000008)
+#define PXA255_RTTR             (PXA255_RTC_BASE_ADDR + 0x0000000c)
+
+/*
+
   PXA255 OS Timer register
 
   pg. 138 to 142, PXA255 Processor Developers Manual [278693-002].pdf
@@ -376,4 +390,37 @@
 #define PXA255_FIDR1            (PXA255_LCD_BASE_ADDR + 0x00000218)
 #define PXA255_LDCMD1           (PXA255_LCD_BASE_ADDR + 0x0000021c)
 
+/*
+  PXA255 Power controller
+
+  pg. 85 to 96, PXA255 Processor Developers Manual [278693-002].pdf
+*/
+
+#define PXA255_POWER_BASE_ADDR  (0x40f00000)
+#define PXA255_PMCR             (PXA255_POWER_BASE_ADDR + 0x00000000)
+#define PXA255_PSSR             (PXA255_POWER_BASE_ADDR + 0x00000004)
+#define PXA255_PSPR             (PXA255_POWER_BASE_ADDR + 0x00000008)
+#define PXA255_PWER             (PXA255_POWER_BASE_ADDR + 0x0000000c)
+#define PXA255_PRER             (PXA255_POWER_BASE_ADDR + 0x00000010)
+#define PXA255_PFER             (PXA255_POWER_BASE_ADDR + 0x00000014)
+#define PXA255_PEDR             (PXA255_POWER_BASE_ADDR + 0x00000018)
+#define PXA255_PCFR             (PXA255_POWER_BASE_ADDR + 0x0000001c)
+#define PXA255_PGSR0            (PXA255_POWER_BASE_ADDR + 0x00000020)
+#define PXA255_PGSR1            (PXA255_POWER_BASE_ADDR + 0x00000024)
+#define PXA255_PGSR2            (PXA255_POWER_BASE_ADDR + 0x00000028)
+#define PXA255_RCSR             (PXA255_POWER_BASE_ADDR + 0x00000030)
+#define PXA255_PMFW             (PXA255_POWER_BASE_ADDR + 0x00000034)
+
+/*
+  PXA255 Clock controller
+
+  pg. 96 to 100, PXA255 Processor Developers Manual [278693-002].pdf
+
+*/
+
+#define PXA255_CLOCKS_BASE_ADDR (0x41300000)
+#define PXA255_CCCR             (PXA255_CLOCKS_BASE_ADDR + 0x00000000)
+#define PXA255_CKEN             (PXA255_CLOCKS_BASE_ADDR + 0x00000004)
+#define PXA255_OSCC             (PXA255_CLOCKS_BASE_ADDR + 0x00000008)
+
 #endif // MAME_MACHINE_PXA255DEFS
diff -Nru mame-0.222+dfsg.1/src/devices/machine/pxa255.h mame-0.224+dfsg.1/src/devices/machine/pxa255.h
--- mame-0.222+dfsg.1/src/devices/machine/pxa255.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/pxa255.h	2020-08-26 08:57:19.000000000 +0000
@@ -36,26 +36,41 @@
 
 	auto gpio0_write() { return m_gpio0_w.bind(); }
 	auto gpio0_read() { return m_gpio0_r.bind(); }
+	auto gpio1_write() { return m_gpio1_w.bind(); }
+	auto gpio1_read() { return m_gpio1_r.bind(); }
+	auto gpio2_write() { return m_gpio2_w.bind(); }
+	auto gpio2_read() { return m_gpio2_r.bind(); }
 
-	uint32_t i2s_r(offs_t offset, uint32_t mem_mask = ~0);
-	void i2s_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
 	uint32_t dma_r(offs_t offset, uint32_t mem_mask = ~0);
 	void dma_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+	uint32_t i2s_r(offs_t offset, uint32_t mem_mask = ~0);
+	void i2s_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+	uint32_t rtc_r(offs_t offset, uint32_t mem_mask = ~0);
+	void rtc_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
 	uint32_t ostimer_r(offs_t offset, uint32_t mem_mask = ~0);
 	void ostimer_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
 	uint32_t intc_r(offs_t offset, uint32_t mem_mask = ~0);
 	void intc_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+	void gpio_bit_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0);
 	uint32_t gpio_r(offs_t offset, uint32_t mem_mask = ~0);
 	void gpio_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
 	uint32_t lcd_r(offs_t offset, uint32_t mem_mask = ~0);
 	void lcd_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
-
-	void set_irq_line(uint32_t line, int state);
+	uint32_t power_r(offs_t offset, uint32_t mem_mask = ~0);
+	void power_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+	uint32_t clocks_r(offs_t offset, uint32_t mem_mask = ~0);
+	void clocks_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
 
 protected:
 	virtual void device_add_mconfig(machine_config &config) override;
 	virtual void device_start() override;
 	virtual void device_reset() override;
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+	static const device_timer_id TIMER_DMA0 = 0;
+	static const device_timer_id TIMER_OSTIMER0 = 16;
+	static const device_timer_id TIMER_LCD_EOF0 = 20;
+	static const device_timer_id TIMER_RTC = 22;
 
 	void dma_irq_check();
 	void dma_load_descriptor_and_start(int channel);
@@ -68,11 +83,14 @@
 
 	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
-	TIMER_CALLBACK_MEMBER(dma_dma_end);
-	TIMER_CALLBACK_MEMBER(ostimer_match);
-	TIMER_CALLBACK_MEMBER(lcd_dma_eof);
+	void dma_end_tick(int channel);
+	void ostimer_match_tick(int channel);
+	void lcd_dma_eof_tick(int channel);
+	void rtc_tick();
 
-	struct dma_regs_t
+	void set_irq_line(uint32_t line, int state);
+
+	struct dma_regs
 	{
 		uint32_t dcsr[16];
 		uint32_t pad0[44];
@@ -91,7 +109,7 @@
 		emu_timer* timer[16];
 	};
 
-	struct i2s_regs_t
+	struct i2s_regs
 	{
 		uint32_t sacr0;
 		uint32_t sacr1;
@@ -110,7 +128,16 @@
 		uint32_t sadr;
 	};
 
-	struct ostmr_regs_t
+	struct rtc_regs
+	{
+		uint32_t rcnr;
+		uint32_t rtar;
+		uint32_t rtsr;
+		uint32_t rttr;
+		emu_timer *timer;
+	};
+
+	struct ostmr_regs
 	{
 		uint32_t osmr[4];
 		uint32_t oscr;
@@ -121,7 +148,7 @@
 		emu_timer* timer[4];
 	};
 
-	struct intc_regs_t
+	struct intc_regs
 	{
 		uint32_t icip;
 		uint32_t icmr;
@@ -131,7 +158,7 @@
 		uint32_t iccr;
 	};
 
-	struct gpio_regs_t
+	struct gpio_regs
 	{
 		uint32_t gplr0; // GPIO Pin-Level
 		uint32_t gplr1;
@@ -169,7 +196,7 @@
 		uint32_t gafr2u;
 	};
 
-	struct lcd_dma_regs_t
+	struct lcd_dma_regs
 	{
 		uint32_t fdadr;
 		uint32_t fsadr;
@@ -178,32 +205,56 @@
 		emu_timer *eof;
 	};
 
-	struct lcd_regs_t
+	struct lcd_regs
 	{
 		uint32_t lccr0;
 		uint32_t lccr1;
 		uint32_t lccr2;
 		uint32_t lccr3;
-		uint32_t pad0[4];
 
 		uint32_t fbr[2];
-		uint32_t pad1[4];
 
 		uint32_t lcsr;
 		uint32_t liidr;
 		uint32_t trgbr;
 		uint32_t tcr;
-		uint32_t pad2[110];
 
-		lcd_dma_regs_t dma[2];
+		lcd_dma_regs dma[2];
 	};
 
-	dma_regs_t m_dma_regs;
-	i2s_regs_t m_i2s_regs;
-	ostmr_regs_t m_ostimer_regs;
-	intc_regs_t m_intc_regs;
-	gpio_regs_t m_gpio_regs;
-	lcd_regs_t m_lcd_regs;
+	struct power_regs
+	{
+		uint32_t pmcr;
+		uint32_t pssr;
+		uint32_t pspr;
+		uint32_t pwer;
+		uint32_t prer;
+		uint32_t pfer;
+		uint32_t pedr;
+		uint32_t pcfr;
+		uint32_t pgsr0;
+		uint32_t pgsr1;
+		uint32_t pgsr2;
+		uint32_t rcsr;
+		uint32_t pmfw;
+	};
+
+	struct clocks_regs
+	{
+		uint32_t cccr;
+		uint32_t cken;
+		uint32_t oscc;
+	};
+
+	dma_regs m_dma_regs;
+	i2s_regs m_i2s_regs;
+	rtc_regs m_rtc_regs;
+	ostmr_regs m_ostimer_regs;
+	intc_regs m_intc_regs;
+	gpio_regs m_gpio_regs;
+	lcd_regs m_lcd_regs;
+	power_regs m_power_regs;
+	clocks_regs m_clocks_regs;
 
 	devcb_write32 m_gpio0_w;
 	devcb_write32 m_gpio1_w;
diff -Nru mame-0.222+dfsg.1/src/devices/machine/r10696.h mame-0.224+dfsg.1/src/devices/machine/r10696.h
--- mame-0.222+dfsg.1/src/devices/machine/r10696.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/r10696.h	2020-08-26 08:57:19.000000000 +0000
@@ -18,8 +18,6 @@
 
 #pragma once
 
-#include "device.h"
-
 
 class r10696_device : public device_t
 {
diff -Nru mame-0.222+dfsg.1/src/devices/machine/r10788.h mame-0.224+dfsg.1/src/devices/machine/r10788.h
--- mame-0.222+dfsg.1/src/devices/machine/r10788.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/r10788.h	2020-08-26 08:57:19.000000000 +0000
@@ -17,8 +17,6 @@
 
 #pragma once
 
-#include "device.h"
-
 
 class r10788_device : public device_t
 {
diff -Nru mame-0.222+dfsg.1/src/devices/machine/ra17xx.h mame-0.224+dfsg.1/src/devices/machine/ra17xx.h
--- mame-0.222+dfsg.1/src/devices/machine/ra17xx.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/ra17xx.h	2020-08-26 08:57:19.000000000 +0000
@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "device.h"
 #include "cpu/pps4/pps4.h"
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/rtc9701.cpp mame-0.224+dfsg.1/src/devices/machine/rtc9701.cpp
--- mame-0.222+dfsg.1/src/devices/machine/rtc9701.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/rtc9701.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -377,7 +377,7 @@
 					if (cmd_stream_pos>4)
 					{
 						rtc9701_data_pos++;
-						rtc9701_current_data = (rtc9701_current_data << 1) | (m_latch&1);;
+						rtc9701_current_data = (rtc9701_current_data << 1) | (m_latch&1);
 					}
 
 					if (cmd_stream_pos==12)
@@ -438,7 +438,7 @@
 					if (cmd_stream_pos>12)
 					{
 						rtc9701_data_pos++;
-						rtc9701_current_data = (rtc9701_current_data << 1) | (m_latch&1);;
+						rtc9701_current_data = (rtc9701_current_data << 1) | (m_latch&1);
 					}
 
 					if (cmd_stream_pos==28)
diff -Nru mame-0.222+dfsg.1/src/devices/machine/sa1110.cpp mame-0.224+dfsg.1/src/devices/machine/sa1110.cpp
--- mame-0.222+dfsg.1/src/devices/machine/sa1110.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/sa1110.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,227 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+/**************************************************************************
+ *
+ * Intel XScale SA1110 peripheral emulation
+ *
+ **************************************************************************/
+
+#include "emu.h"
+#include "sa1110.h"
+
+#define LOG_UNKNOWN     (1 << 1)
+#define LOG_INTC        (1 << 2)
+#define LOG_POWER       (1 << 3)
+#define LOG_ALL         (LOG_UNKNOWN | LOG_INTC | LOG_POWER)
+
+#define VERBOSE         (LOG_ALL)
+#include "logmacro.h"
+
+DEFINE_DEVICE_TYPE(SA1110_PERIPHERALS, sa1110_periphs_device, "sa1110_periphs", "Intel XScale SA1110 Peripherals")
+
+sa1110_periphs_device::sa1110_periphs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, SA1110_PERIPHERALS, tag, owner, clock)
+	, m_maincpu(*this, finder_base::DUMMY_TAG)
+{
+}
+
+/*
+
+  Intel SA-1110 Interrupt Controller
+
+  pg. 81 to 88 Intel StrongARM SA-1110 Microprocessor Developer's Manual
+
+*/
+
+void sa1110_periphs_device::update_interrupts()
+{
+	m_intc_regs.icfp = (m_intc_regs.icpr & m_intc_regs.icmr) & m_intc_regs.iclr;
+	m_intc_regs.icip = (m_intc_regs.icpr & m_intc_regs.icmr) & (~m_intc_regs.iclr);
+	m_maincpu->set_input_line(ARM7_FIRQ_LINE, m_intc_regs.icfp ? ASSERT_LINE : CLEAR_LINE);
+	m_maincpu->set_input_line(ARM7_IRQ_LINE,  m_intc_regs.icip ? ASSERT_LINE : CLEAR_LINE);
+}
+
+void sa1110_periphs_device::set_irq_line(uint32_t line, int irq_state)
+{
+	m_intc_regs.icpr &= ~line;
+	m_intc_regs.icpr |= irq_state ? line : 0;
+	update_interrupts();
+}
+
+uint32_t sa1110_periphs_device::intc_r(offs_t offset, uint32_t mem_mask)
+{
+	switch (offset)
+	{
+		case REG_ICIP:
+			LOGMASKED(LOG_INTC, "sa1110 intc_r: Interrupt Controller IRQ Pending Register: %08x & %08x\n", m_intc_regs.icip, mem_mask);
+			return m_intc_regs.icip;
+		case REG_ICMR:
+			LOGMASKED(LOG_INTC, "sa1110 intc_r: Interrupt Controller Mask Register: %08x & %08x\n", m_intc_regs.icmr, mem_mask);
+			return m_intc_regs.icmr;
+		case REG_ICLR:
+			LOGMASKED(LOG_INTC, "sa1110 intc_r: Interrupt Controller Level Register: %08x & %08x\n", m_intc_regs.iclr, mem_mask);
+			return m_intc_regs.iclr;
+		case REG_ICFP:
+			LOGMASKED(LOG_INTC, "sa1110 intc_r: Interrupt Controller FIQ Pending Register: %08x & %08x\n", m_intc_regs.icfp, mem_mask);
+			return m_intc_regs.icfp;
+		case REG_ICPR:
+			LOGMASKED(LOG_INTC, "sa1110 intc_r: Interrupt Controller Pending Register: %08x & %08x\n", m_intc_regs.icpr, mem_mask);
+			return m_intc_regs.icpr;
+		case REG_ICCR:
+			LOGMASKED(LOG_INTC, "sa1110 intc_r: Interrupt Controller Control Register: %08x & %08x\n", m_intc_regs.iccr, mem_mask);
+			return m_intc_regs.iccr;
+		default:
+			LOGMASKED(LOG_INTC | LOG_UNKNOWN, "sa1110 intc_r: Unknown address: %08x\n", INTC_BASE_ADDR | (offset << 2));
+			break;
+	}
+	return 0;
+}
+
+void sa1110_periphs_device::intc_w(offs_t offset, uint32_t data, uint32_t mem_mask)
+{
+	switch (offset)
+	{
+		case REG_ICIP:
+			LOGMASKED(LOG_INTC, "sa1110 intc_w: (Invalid Write) Interrupt Controller IRQ Pending Register: %08x & %08x\n", data, mem_mask);
+			break;
+		case REG_ICMR:
+			LOGMASKED(LOG_INTC, "sa1110 intc_w: Interrupt Controller Mask Register: %08x & %08x\n", data, mem_mask);
+			COMBINE_DATA(&m_intc_regs.icmr);
+			break;
+		case REG_ICLR:
+			LOGMASKED(LOG_INTC, "sa1110 intc_w: Interrupt Controller Level Register: %08x & %08x\n", data, mem_mask);
+			COMBINE_DATA(&m_intc_regs.iclr);
+			break;
+		case REG_ICFP:
+			LOGMASKED(LOG_INTC, "sa1110 intc_w: (Invalid Write) Interrupt Controller FIQ Pending Register: %08x & %08x\n", data, mem_mask);
+			break;
+		case REG_ICPR:
+			LOGMASKED(LOG_INTC, "sa1110_intc_w: (Invalid Write) Interrupt Controller Pending Register: %08x & %08x\n", data, mem_mask);
+			break;
+		case REG_ICCR:
+			LOGMASKED(LOG_INTC, "sa1110 intc_w: Interrupt Controller Control Register: %08x & %08x\n", data, mem_mask);
+			m_intc_regs.iccr = BIT(data, 0);
+			break;
+		default:
+			LOGMASKED(LOG_INTC | LOG_UNKNOWN, "sa1110 intc_w: Unknown address: %08x = %08x & %08x\n", INTC_BASE_ADDR | (offset << 2), data, mem_mask);
+			break;
+	}
+}
+
+/*
+
+  Intel SA-1110 Power Controller
+
+  pg. 104 to 111 Intel StrongARM SA-1110 Microprocessor Developer's Manual
+
+*/
+
+uint32_t sa1110_periphs_device::power_r(offs_t offset, uint32_t mem_mask)
+{
+	switch (offset)
+	{
+		case REG_PMCR:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager Control Register: %08x\n", machine().describe_context(), m_power_regs.pmcr);
+			return m_power_regs.pmcr;
+		case REG_PSSR:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager Sleep Status Register: %08x\n", machine().describe_context(), m_power_regs.pssr);
+			return m_power_regs.pssr;
+		case REG_PSPR:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager Scratch Pad Register: %08x\n", machine().describe_context(), m_power_regs.pspr);
+			return m_power_regs.pspr;
+		case REG_PWER:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager Wake-up Enable Register: %08x\n", machine().describe_context(), m_power_regs.pwer);
+			return m_power_regs.pwer;
+		case REG_PCFR:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager General Configuration Register: %08x\n", machine().describe_context(), m_power_regs.pcfr);
+			return m_power_regs.pcfr;
+		case REG_PPCR:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager PLL Configuration Register: %08x\n", machine().describe_context(), m_power_regs.ppcr);
+			return m_power_regs.ppcr;
+		case REG_PGSR:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager GPIO Sleep State Register: %08x\n", machine().describe_context(), m_power_regs.pgsr);
+			return m_power_regs.pgsr;
+		case REG_POSR:
+			LOGMASKED(LOG_POWER, "%s: power_r: Power Manager Oscillator Status Register: %08x\n", machine().describe_context(), m_power_regs.posr);
+			return m_power_regs.posr;
+		default:
+			LOGMASKED(LOG_POWER | LOG_UNKNOWN, "%s: power_r: Unknown address: %08x\n", machine().describe_context(), POWER_BASE_ADDR | (offset << 2));
+			break;
+	}
+	return 0;
+}
+
+void sa1110_periphs_device::power_w(offs_t offset, uint32_t data, uint32_t mem_mask)
+{
+	switch (offset)
+	{
+		case REG_PMCR:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager Control Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pmcr);
+			break;
+		case REG_PSSR:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager Sleep Status Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			m_power_regs.pssr &= ~(data & 0x0000001f);
+			break;
+		case REG_PSPR:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager Scratch Pad Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pspr);
+			break;
+		case REG_PWER:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager Wake-Up Enable Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pwer);
+			break;
+		case REG_PCFR:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager General Configuration Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pcfr);
+			break;
+		case REG_PPCR:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager PLL Configuration Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.ppcr);
+			break;
+		case REG_PGSR:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager GPIO Sleep State Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_power_regs.pgsr);
+			break;
+		case REG_POSR:
+			LOGMASKED(LOG_POWER, "%s: power_w: Power Manager Oscillator Status Register = %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			break;
+		default:
+			LOGMASKED(LOG_POWER | LOG_UNKNOWN, "%s: power_w: Unknown address: %08x = %08x & %08x\n", machine().describe_context(), POWER_BASE_ADDR | (offset << 2),
+				data, mem_mask);
+			break;
+	}
+}
+
+void sa1110_periphs_device::device_start()
+{
+	save_item(NAME(m_intc_regs.icip), m_intc_regs.icip);
+	save_item(NAME(m_intc_regs.icmr), m_intc_regs.icmr);
+	save_item(NAME(m_intc_regs.iclr), m_intc_regs.iclr);
+	save_item(NAME(m_intc_regs.iccr), m_intc_regs.iccr);
+	save_item(NAME(m_intc_regs.icfp), m_intc_regs.icfp);
+	save_item(NAME(m_intc_regs.icpr), m_intc_regs.icpr);
+
+	save_item(NAME(m_power_regs.pmcr), m_power_regs.pmcr);
+	save_item(NAME(m_power_regs.pssr), m_power_regs.pssr);
+	save_item(NAME(m_power_regs.pspr), m_power_regs.pspr);
+	save_item(NAME(m_power_regs.pwer), m_power_regs.pwer);
+	save_item(NAME(m_power_regs.pcfr), m_power_regs.pcfr);
+	save_item(NAME(m_power_regs.ppcr), m_power_regs.ppcr);
+	save_item(NAME(m_power_regs.pgsr), m_power_regs.pgsr);
+	save_item(NAME(m_power_regs.posr), m_power_regs.posr);
+}
+
+void sa1110_periphs_device::device_reset()
+{
+	memset(&m_intc_regs, 0, sizeof(m_intc_regs));
+	memset(&m_power_regs, 0, sizeof(m_power_regs));
+}
+
+void sa1110_periphs_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+}
+
+void sa1110_periphs_device::device_add_mconfig(machine_config &config)
+{
+}
diff -Nru mame-0.222+dfsg.1/src/devices/machine/sa1110.h mame-0.224+dfsg.1/src/devices/machine/sa1110.h
--- mame-0.222+dfsg.1/src/devices/machine/sa1110.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/sa1110.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,96 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+/**************************************************************************
+ *
+ * Intel XScale SA1110 peripheral emulation
+ *
+ **************************************************************************/
+
+#ifndef MAME_MACHINE_SA1110
+#define MAME_MACHINE_SA1110
+
+#pragma once
+
+#include "cpu/arm7/arm7.h"
+#include "cpu/arm7/arm7core.h"
+#include "sound/dmadac.h"
+#include "emupal.h"
+
+class sa1110_periphs_device : public device_t
+{
+public:
+	template <typename T>
+	sa1110_periphs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&cpu_tag)
+		: sa1110_periphs_device(mconfig, tag, owner, clock)
+	{
+		m_maincpu.set_tag(std::forward<T>(cpu_tag));
+	}
+
+	sa1110_periphs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	uint32_t intc_r(offs_t offset, uint32_t mem_mask = ~0);
+	void intc_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+	uint32_t power_r(offs_t offset, uint32_t mem_mask = ~0);
+	void power_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+	virtual void device_reset() override;
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+	void update_interrupts();
+	void set_irq_line(uint32_t line, int state);
+
+	enum
+	{
+		INTC_BASE_ADDR  = 0x90050000,
+		REG_ICIP        = (0x00000000 >> 2),
+		REG_ICMR        = (0x00000004 >> 2),
+		REG_ICLR        = (0x00000008 >> 2),
+		REG_ICCR        = (0x0000000c >> 2),
+		REG_ICFP        = (0x00000010 >> 2),
+		REG_ICPR        = (0x00000020 >> 2),
+
+		POWER_BASE_ADDR = 0x90020000,
+		REG_PMCR        = (0x00000000 >> 2),
+		REG_PSSR        = (0x00000004 >> 2),
+		REG_PSPR        = (0x00000008 >> 2),
+		REG_PWER        = (0x0000000c >> 2),
+		REG_PCFR        = (0x00000010 >> 2),
+		REG_PPCR        = (0x00000014 >> 2),
+		REG_PGSR        = (0x00000018 >> 2),
+		REG_POSR        = (0x0000001c >> 2)
+	};
+
+	struct intc_regs
+	{
+		uint32_t icip;
+		uint32_t icmr;
+		uint32_t iclr;
+		uint32_t iccr;
+		uint32_t icfp;
+		uint32_t icpr;
+	};
+
+	struct power_regs
+	{
+		uint32_t pmcr;
+		uint32_t pssr;
+		uint32_t pspr;
+		uint32_t pwer;
+		uint32_t pcfr;
+		uint32_t ppcr;
+		uint32_t pgsr;
+		uint32_t posr;
+	};
+
+	intc_regs m_intc_regs;
+	power_regs m_power_regs;
+
+	required_device<cpu_device> m_maincpu;
+};
+
+DECLARE_DEVICE_TYPE(SA1110_PERIPHERALS, sa1110_periphs_device)
+
+#endif // MAME_MACHINE_SA1110
diff -Nru mame-0.222+dfsg.1/src/devices/machine/saa1043.cpp mame-0.224+dfsg.1/src/devices/machine/saa1043.cpp
--- mame-0.222+dfsg.1/src/devices/machine/saa1043.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/saa1043.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -22,6 +22,7 @@
 saa1043_device::saa1043_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, SAA1043, tag, owner, clock)
 	, m_outputs(*this)
+	, m_type(PAL)
 {
 	std::fill(std::begin(m_outputs_hooked), std::end(m_outputs_hooked), false);
 }
diff -Nru mame-0.222+dfsg.1/src/devices/machine/sensorboard.cpp mame-0.224+dfsg.1/src/devices/machine/sensorboard.cpp
--- mame-0.222+dfsg.1/src/devices/machine/sensorboard.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/sensorboard.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -84,7 +84,7 @@
 	m_nosensors = false;
 	m_magnets = false;
 	m_inductive = false;
-	m_ui_enabled = 3;
+	m_ui_enabled = 7;
 	set_delay(attotime::never);
 
 	// set defaults for most common use case (aka chess)
@@ -789,16 +789,25 @@
 	PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("SS_CHECK", 1<<15, EQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_spawn, 16) PORT_NAME("Spawn Piece 16")
 
 	PORT_START("UI")
-	PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 1, NOTEQUALS, 0) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_NAME("Modifier 2 / Force Sensor") // hold while clicking to force sensor (ignore piece)
-	PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 1, NOTEQUALS, 0) PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_NAME("Modifier 1 / Force Piece") // hold while clicking to force piece (ignore sensor)
+	PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 1<<0, NOTEQUALS, 0) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_NAME("Modifier 2 / Force Sensor") // hold while clicking to force sensor (ignore piece)
+	PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 1<<0, NOTEQUALS, 0) PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_NAME("Modifier 1 / Force Piece") // hold while clicking to force piece (ignore sensor)
 	PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(sensorboard_device, check_sensor_busy) // check if any sensor is busy / pressed (read-only)
-	PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 2, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_hand, 0) PORT_NAME("Remove Piece")
-	PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 2, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_undo, 0) PORT_NAME("Undo Buffer First")
-	PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 2, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_undo, 1) PORT_NAME("Undo Buffer Previous")
-	PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 2, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_undo, 2) PORT_NAME("Undo Buffer Next")
-	PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 2, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_undo, 3) PORT_NAME("Undo Buffer Last")
-	PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 2, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_init, 0) PORT_NAME("Board Clear")
-	PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 2, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_init, 1) PORT_NAME("Board Reset")
+	PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 1<<1, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_hand, 0) PORT_NAME("Remove Piece")
+	PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 1<<1, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_undo, 0) PORT_NAME("Undo Buffer First")
+	PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 1<<1, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_undo, 1) PORT_NAME("Undo Buffer Previous")
+	PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 1<<1, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_undo, 2) PORT_NAME("Undo Buffer Next")
+	PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 1<<1, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_undo, 3) PORT_NAME("Undo Buffer Last")
+	PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 1<<1, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_init, 0) PORT_NAME("Board Clear")
+	PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CONDITION("UI_CHECK", 1<<1, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_init, 1) PORT_NAME("Board Reset")
+
+	PORT_START("CONF")
+	PORT_CONFNAME( 0x03, 0x00, "Remember Position" ) PORT_CONDITION("UI_CHECK", 1<<2, NOTEQUALS, 0)
+	PORT_CONFSETTING(    0x01, DEF_STR( No ) )
+	PORT_CONFSETTING(    0x02, DEF_STR( Yes ) )
+	PORT_CONFSETTING(    0x00, "Auto" )
+	PORT_CONFNAME( 0x04, 0x00, "Show Pieces" ) PORT_CONDITION("UI_CHECK", 1<<2, NOTEQUALS, 0) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_refresh, 0)
+	PORT_CONFSETTING(    0x04, DEF_STR( No ) )
+	PORT_CONFSETTING(    0x00, DEF_STR( Yes ) )
 
 	PORT_START("BS_CHECK") // board size (internal use)
 	PORT_BIT( 0xffffffff, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(sensorboard_device, check_bs_mask)
@@ -807,16 +816,7 @@
 	PORT_BIT( 0xffffffff, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(sensorboard_device, check_ss_mask)
 
 	PORT_START("UI_CHECK") // UI enabled (internal use)
-	PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(sensorboard_device, check_ui_enabled)
-
-	PORT_START("CONF")
-	PORT_CONFNAME( 0x03, 0x00, "Remember Position" )
-	PORT_CONFSETTING(    0x01, DEF_STR( No ) )
-	PORT_CONFSETTING(    0x02, DEF_STR( Yes ) )
-	PORT_CONFSETTING(    0x00, "Auto" )
-	PORT_CONFNAME( 0x04, 0x00, "Show Pieces" ) PORT_CHANGED_MEMBER(DEVICE_SELF, sensorboard_device, ui_refresh, 0)
-	PORT_CONFSETTING(    0x04, DEF_STR( No ) )
-	PORT_CONFSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_BIT( 0xffffffff, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(sensorboard_device, check_ui_enabled)
 INPUT_PORTS_END
 
 ioport_constructor sensorboard_device::device_input_ports() const
diff -Nru mame-0.222+dfsg.1/src/devices/machine/sensorboard.h mame-0.224+dfsg.1/src/devices/machine/sensorboard.h
--- mame-0.222+dfsg.1/src/devices/machine/sensorboard.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/sensorboard.h	2020-08-26 08:57:19.000000000 +0000
@@ -31,8 +31,8 @@
 	sensorboard_device &set_max_id(u8 i) { m_maxid = i; return *this; } // maximum piece id (if larger than set_spawnpoints)
 	sensorboard_device &set_delay(attotime delay) { m_sensordelay = delay; return *this; } // delay when activating a sensor (like PORT_IMPULSE), set to attotime::never to disable
 	sensorboard_device &set_nvram_enable(bool b) { m_nvram_auto = b; return *this; } // load last board position on start
-	sensorboard_device &set_ui_enable(bool b) { if (!b) m_maxspawn = 0; m_ui_enabled = (b) ? 3 : 0; return *this; } // enable UI inputs
-	sensorboard_device &set_mod_enable(bool b) { if (b) m_ui_enabled |= 1; else m_ui_enabled &= 2; return *this; } // enable modifier keys
+	sensorboard_device &set_ui_enable(bool b) { if (!b) m_maxspawn = 0; m_ui_enabled = (b) ? 7 : 0; return *this; } // enable UI inputs
+	sensorboard_device &set_mod_enable(bool b) { if (b) m_ui_enabled |= 1; else m_ui_enabled &= ~1; return *this; } // enable modifier keys
 
 	auto init_cb() { return m_custom_init_cb.bind(); } // for setting pieces starting position
 	auto sensor_cb() { return m_custom_sensor_cb.bind(); } // x = offset & 0xf, y = offset >> 4 & 0xf
diff -Nru mame-0.222+dfsg.1/src/devices/machine/smc91c9x.cpp mame-0.224+dfsg.1/src/devices/machine/smc91c9x.cpp
--- mame-0.222+dfsg.1/src/devices/machine/smc91c9x.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/smc91c9x.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -839,7 +839,7 @@
 			if ( m_reg[B2_POINTER] & 0x8000 )
 				buffer = &m_buffer[curr_completed_rx() * ETHER_BUFFER_SIZE];
 			else
-				buffer = &m_buffer[(m_reg[B2_PNR_ARR] & 0x1f) * ETHER_BUFFER_SIZE];;
+				buffer = &m_buffer[(m_reg[B2_PNR_ARR] & 0x1f) * ETHER_BUFFER_SIZE];
 
 			result = buffer[addr++];
 			if ( ACCESSING_BITS_8_15 )
@@ -1000,7 +1000,7 @@
 			if (m_reg[B2_POINTER] & RCV)
 				buffer = &m_buffer[curr_completed_rx() * ETHER_BUFFER_SIZE];
 			else
-				buffer = &m_buffer[(m_reg[B2_PNR_ARR] & 0x1f) * ETHER_BUFFER_SIZE];;
+				buffer = &m_buffer[(m_reg[B2_PNR_ARR] & 0x1f) * ETHER_BUFFER_SIZE];
 
 			buffer[addr++] = data;
 			if ( ACCESSING_BITS_8_15 )
diff -Nru mame-0.222+dfsg.1/src/devices/machine/spg110_video.cpp mame-0.224+dfsg.1/src/devices/machine/spg110_video.cpp
--- mame-0.222+dfsg.1/src/devices/machine/spg110_video.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/spg110_video.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -564,6 +564,9 @@
 	m_bg_scrolly = 0;
 	m_2036_scroll = 0;
 
+	std::fill(std::begin(tmap0_regs), std::end(tmap0_regs), 0);
+	std::fill(std::begin(tmap1_regs), std::end(tmap1_regs), 0);
+
 	// is there actually an enable register here?
 	m_video_irq_enable = 0xffff;
 	m_video_irq_status = 0x0000;
diff -Nru mame-0.222+dfsg.1/src/devices/machine/spg290_cdservo.cpp mame-0.224+dfsg.1/src/devices/machine/spg290_cdservo.cpp
--- mame-0.222+dfsg.1/src/devices/machine/spg290_cdservo.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/spg290_cdservo.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -145,7 +145,7 @@
 		m_irq_cb(ASSERT_LINE);
 	}
 
-	if (m_cur_sector < m_seek_lba + SPG290_LEADIN_LEN and m_cur_sector < m_tot_sectors)
+	if ((m_cur_sector < m_seek_lba + SPG290_LEADIN_LEN) && (m_cur_sector < m_tot_sectors))
 		m_cur_sector++;
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/spg2xx_io.cpp mame-0.224+dfsg.1/src/devices/machine/spg2xx_io.cpp
--- mame-0.222+dfsg.1/src/devices/machine/spg2xx_io.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/spg2xx_io.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -406,8 +406,11 @@
 	switch (offset)
 	{
 	case REG_IOA_DATA: case REG_IOB_DATA: case REG_IOC_DATA:
-		do_gpio(offset, false);
-		LOGMASKED(LOG_GPIO, "%s: io_r: %s %c = %04x\n", machine().describe_context(), gpioregs[(offset - REG_IOA_DATA) % 5], gpioports[(offset - REG_IOA_DATA) / 5], m_io_regs[offset]);
+		if (!machine().side_effects_disabled())
+		{
+			do_gpio(offset, false);
+			LOGMASKED(LOG_GPIO, "%s: io_r: %s %c = %04x\n", machine().describe_context(), gpioregs[(offset - REG_IOA_DATA) % 5], gpioports[(offset - REG_IOA_DATA) / 5], m_io_regs[offset]);
+		}
 		val = m_io_regs[offset];
 		break;
 
@@ -455,15 +458,16 @@
 		break;
 
 	case REG_ADC_DATA:
-	{
-		const uint16_t old = IO_IRQ_STATUS;
-		IO_IRQ_STATUS &= ~0x2000;
-		const uint16_t changed = (old & IO_IRQ_ENABLE) ^ (IO_IRQ_STATUS & IO_IRQ_ENABLE);
-		if (changed)
-			check_irqs(changed);
-		LOGMASKED(LOG_IO_READS | LOG_ADC, "%s: io_r: ADC Data = %04x\n", machine().describe_context(), val);
+		if (!machine().side_effects_disabled())
+		{
+			const uint16_t old = IO_IRQ_STATUS;
+			IO_IRQ_STATUS &= ~0x2000;
+			const uint16_t changed = (old & IO_IRQ_ENABLE) ^ (IO_IRQ_STATUS & IO_IRQ_ENABLE);
+			if (changed)
+				check_irqs(changed);
+			LOGMASKED(LOG_IO_READS | LOG_ADC, "%s: io_r: ADC Data = %04x\n", machine().describe_context(), val);
+		}
 		break;
-	}
 
 	case REG_WAKEUP_SOURCE:
 		LOGMASKED(LOG_IO_READS, "%s: io_r: Wakeup Source = %04x\n", machine().describe_context(), val);
@@ -475,10 +479,14 @@
 		break;
 
 	case REG_PRNG1:
-		return clock_rng(0);
+		if (!machine().side_effects_disabled())
+			return clock_rng(0);
+		return m_io_regs[REG_PRNG1];
 
 	case REG_PRNG2:
-		return clock_rng(1);
+		if (!machine().side_effects_disabled())
+			return clock_rng(1);
+		return m_io_regs[REG_PRNG2];
 
 	case REG_FIQ_SEL:
 		LOGMASKED(LOG_FIQ, "%s: io_r: FIQ Source Select = %04x\n", machine().describe_context(), val);
@@ -516,40 +524,43 @@
 		break;
 
 	case REG_UART_RXBUF:
-		if (m_uart_rx_available)
+		if (!machine().side_effects_disabled())
 		{
-			m_io_regs[REG_UART_STATUS] &= ~0x0081;
-			LOGMASKED(LOG_UART, "UART Rx data is available, clearing bits\n");
-			if (m_uart_rx_fifo_count)
+			if (m_uart_rx_available)
 			{
-				LOGMASKED(LOG_UART, "%s: Remaining count %d, value %02x\n", machine().describe_context(), m_uart_rx_fifo_count, m_uart_rx_fifo[m_uart_rx_fifo_start]);
-				m_io_regs[REG_UART_RXBUF] = m_uart_rx_fifo[m_uart_rx_fifo_start];
-				val = m_io_regs[REG_UART_RXBUF];
-				m_uart_rx_fifo_start = (m_uart_rx_fifo_start + 1) % ARRAY_LENGTH(m_uart_rx_fifo);
-				m_uart_rx_fifo_count--;
-
-				if (m_uart_rx_fifo_count == 0)
+				m_io_regs[REG_UART_STATUS] &= ~0x0081;
+				LOGMASKED(LOG_UART, "UART Rx data is available, clearing bits\n");
+				if (m_uart_rx_fifo_count)
 				{
-					m_uart_rx_available = false;
+					LOGMASKED(LOG_UART, "%s: Remaining count %d, value %02x\n", machine().describe_context(), m_uart_rx_fifo_count, m_uart_rx_fifo[m_uart_rx_fifo_start]);
+					m_io_regs[REG_UART_RXBUF] = m_uart_rx_fifo[m_uart_rx_fifo_start];
+					val = m_io_regs[REG_UART_RXBUF];
+					m_uart_rx_fifo_start = (m_uart_rx_fifo_start + 1) % ARRAY_LENGTH(m_uart_rx_fifo);
+					m_uart_rx_fifo_count--;
+
+					if (m_uart_rx_fifo_count == 0)
+					{
+						m_uart_rx_available = false;
+					}
+					else
+					{
+						LOGMASKED(LOG_UART, "Remaining count %d, setting up timer\n", m_uart_rx_fifo_count);
+						//uart_receive_tick();
+						if (m_uart_rx_timer->remaining() == attotime::never)
+							m_uart_rx_timer->adjust(attotime::from_ticks(BIT(m_io_regs[REG_UART_CTRL], 5) ? 11 : 10, m_uart_baud_rate));
+					}
 				}
 				else
 				{
-					LOGMASKED(LOG_UART, "Remaining count %d, setting up timer\n", m_uart_rx_fifo_count);
-					//uart_receive_tick();
-					if (m_uart_rx_timer->remaining() == attotime::never)
-						m_uart_rx_timer->adjust(attotime::from_ticks(BIT(m_io_regs[REG_UART_CTRL], 5) ? 11 : 10, m_uart_baud_rate));
+					m_uart_rx_available = false;
 				}
 			}
 			else
 			{
-				m_uart_rx_available = false;
+				m_io_regs[REG_UART_RXFIFO] |= 0x2000;
 			}
+			LOGMASKED(LOG_UART, "%s: io_r: UART Rx Data = %04x\n", machine().describe_context(), val);
 		}
-		else
-		{
-			m_io_regs[REG_UART_RXFIFO] |= 0x2000;
-		}
-		LOGMASKED(LOG_UART, "%s: io_r: UART Rx Data = %04x\n", machine().describe_context(), val);
 		break;
 
 	case REG_UART_RXFIFO:
@@ -576,7 +587,7 @@
 
 	case REG_SPI_RXDATA:
 		LOGMASKED(LOG_SPI, "%s: io_r: SPI Rx Data = %04x, FIFO count %d\n", machine().describe_context(), val, m_spi_rx_fifo_count);
-		if (m_spi_rx_fifo_count > 0)
+		if (m_spi_rx_fifo_count > 0 && !machine().side_effects_disabled())
 		{
 			m_spi_rx_fifo_count--;
 			if (m_spi_rx_fifo_count > 0)
@@ -608,7 +619,7 @@
 
 	case REG_SIO_DATA:
 		LOGMASKED(LOG_SIO, "%s: io_r: SIO Data = %04x\n", machine().describe_context(), val);
-		if ((m_io_regs[REG_SIO_STATUS] & 0x8000) && !m_sio_writing)
+		if ((m_io_regs[REG_SIO_STATUS] & 0x8000) && !m_sio_writing && !machine().side_effects_disabled())
 		{
 			m_sio_bits_remaining--;
 			if (m_sio_bits_remaining == 0)
@@ -1625,12 +1636,8 @@
 void spg2xx_io_device::extint_w(int channel, bool state)
 {
 	LOGMASKED(LOG_EXTINT, "Setting extint channel %d to %s\n", channel, state ? "true" : "false");
-	bool old = m_extint[channel];
 	m_extint[channel] = state;
-	if (old != state)
-	{
-		check_extint_irq(channel);
-	}
+	check_extint_irq(channel);
 }
 
 void spg2xx_io_device::check_extint_irq(int channel)
@@ -1673,7 +1680,7 @@
 
 	if (changed & 0x1200) // External IRQ
 	{
-		LOGMASKED(LOG_UART, "%ssserting IRQ5 (%04x, %04x)\n", (IO_IRQ_ENABLE & IO_IRQ_STATUS & 0x1200) ? "A" : "Dea", (IO_IRQ_ENABLE & IO_IRQ_STATUS & 0x1200), changed);
+		LOGMASKED(LOG_EXTINT, "%ssserting IRQ5 (%04x, %04x)\n", (IO_IRQ_ENABLE & IO_IRQ_STATUS & 0x1200) ? "A" : "Dea", (IO_IRQ_ENABLE & IO_IRQ_STATUS & 0x1200), changed);
 		if (m_external_irq_cb)
 			m_external_irq_cb((IO_IRQ_ENABLE & IO_IRQ_STATUS & 0x1200) ? ASSERT_LINE : CLEAR_LINE);
 		else
diff -Nru mame-0.222+dfsg.1/src/devices/machine/stvcd.cpp mame-0.224+dfsg.1/src/devices/machine/stvcd.cpp
--- mame-0.222+dfsg.1/src/devices/machine/stvcd.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/stvcd.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -882,7 +882,7 @@
 		if (cr2 >> 8)
 		{
 			cd_stat = CD_STAT_PAUSE;
-			cur_track = cr2>>8;;
+			cur_track = cr2>>8;
 			cd_curfad = cdrom_get_track_start(cdrom, cur_track-1);
 			m_cdda->pause_audio(1);
 			// (index is cr2 low byte)
diff -Nru mame-0.222+dfsg.1/src/devices/machine/swim1.h mame-0.224+dfsg.1/src/devices/machine/swim1.h
--- mame-0.222+dfsg.1/src/devices/machine/swim1.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/swim1.h	2020-08-26 08:57:19.000000000 +0000
@@ -5,14 +5,14 @@
     Apple SWIM1 floppy disk controller
 
 *********************************************************************/
-
-#pragma once
-
 #ifndef MAME_MACHINE_SWIM1_H
 #define MAME_MACHINE_SWIM1_H
 
+#pragma once
+
 #include "applefdintf.h"
 
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
diff -Nru mame-0.222+dfsg.1/src/devices/machine/swim2.h mame-0.224+dfsg.1/src/devices/machine/swim2.h
--- mame-0.222+dfsg.1/src/devices/machine/swim2.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/swim2.h	2020-08-26 08:57:19.000000000 +0000
@@ -5,14 +5,14 @@
     Apple SWIM2 floppy disk controller
 
 *********************************************************************/
-
-#pragma once
-
 #ifndef MAME_MACHINE_SWIM2_H
 #define MAME_MACHINE_SWIM2_H
 
+#pragma once
+
 #include "applefdintf.h"
 
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
diff -Nru mame-0.222+dfsg.1/src/devices/machine/swim3.h mame-0.224+dfsg.1/src/devices/machine/swim3.h
--- mame-0.222+dfsg.1/src/devices/machine/swim3.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/swim3.h	2020-08-26 08:57:19.000000000 +0000
@@ -5,14 +5,14 @@
     Apple SWIM3 floppy disk controller
 
 *********************************************************************/
-
-#pragma once
-
 #ifndef MAME_MACHINE_SWIM3_H
 #define MAME_MACHINE_SWIM3_H
 
+#pragma once
+
 #include "applefdintf.h"
 
+
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
diff -Nru mame-0.222+dfsg.1/src/devices/machine/tms1024.h mame-0.224+dfsg.1/src/devices/machine/tms1024.h
--- mame-0.222+dfsg.1/src/devices/machine/tms1024.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/tms1024.h	2020-08-26 08:57:19.000000000 +0000
@@ -68,7 +68,7 @@
 	auto write_port5_callback() { return m_write_port[4].bind(); }
 	auto write_port6_callback() { return m_write_port[5].bind(); }
 	auto write_port7_callback() { return m_write_port[6].bind(); }
-	tms1024_device &set_ms(u8 i) { m_ms = i & 1; return *this; } // if hardwired, can just set MS pin state here
+	tms1024_device &set_ms(int state) { m_ms = state ? 1 : 0; return *this; } // if hardwired, can just set MS pin state here
 
 	void write_h(u8 data);
 	u8 read_h();
diff -Nru mame-0.222+dfsg.1/src/devices/machine/tsb12lv01a.cpp mame-0.224+dfsg.1/src/devices/machine/tsb12lv01a.cpp
--- mame-0.222+dfsg.1/src/devices/machine/tsb12lv01a.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/tsb12lv01a.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,279 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+/*************************************************************
+
+  Texas Instruments TSB12LV01A/TSB12LV01AI IEEE 1394-1995
+  High-Speed Serial-Bus Link-Layer Controller
+
+  Skeleton device
+
+**************************************************************/
+
+#include "emu.h"
+#include "tsb12lv01a.h"
+
+#define LOG_READS       (1 << 1)
+#define LOG_WRITES      (1 << 2)
+#define LOG_UNKNOWNS    (1 << 3)
+#define LOG_IRQS        (1 << 4)
+#define LOG_ALL         (LOG_READS | LOG_WRITES | LOG_UNKNOWNS | LOG_IRQS)
+
+#define VERBOSE         (LOG_ALL)
+#include "logmacro.h"
+
+DEFINE_DEVICE_TYPE(TSB12LV01A, tsb12lv01a_device, "tsb12lv01a", "TSB12LV01A IEEE 1394 Link Controller")
+
+tsb12lv01a_device::tsb12lv01a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, TSB12LV01A, tag, owner, clock)
+	, m_int_cb(*this)
+	, m_phy_read_cb(*this)
+	, m_phy_write_cb(*this)
+{
+}
+
+void tsb12lv01a_device::device_start()
+{
+	save_item(NAME(m_version));
+	save_item(NAME(m_node_address));
+	save_item(NAME(m_ctrl));
+	save_item(NAME(m_int_status));
+	save_item(NAME(m_int_mask));
+	save_item(NAME(m_cycle_timer));
+	save_item(NAME(m_isoch_port_num));
+	save_item(NAME(m_fifo_ctrl));
+	save_item(NAME(m_diag_ctrl));
+	save_item(NAME(m_phy_access));
+	save_item(NAME(m_atf_status));
+	save_item(NAME(m_itf_status));
+	save_item(NAME(m_grf_status));
+
+	m_int_cb.resolve_safe();
+	m_phy_read_cb.resolve_safe(0x00);
+	m_phy_write_cb.resolve_safe();
+}
+
+void tsb12lv01a_device::device_reset()
+{
+	m_version = 0x30313042;
+	m_node_address = 0xffff0000;
+	m_ctrl = 0x00000000;
+	m_int_status = 0x10000000;
+	m_int_mask = 0x00000000;
+	m_cycle_timer = 0x00000000;
+	m_isoch_port_num = 0x00000000;
+	m_fifo_ctrl = 0x00000000;
+	m_diag_ctrl = 0x00000000;
+	m_phy_access = 0x00000000;
+	m_atf_status = 0x00000000;
+	m_itf_status = 0x00000000;
+	m_grf_status = 0x00000000;
+}
+
+WRITE_LINE_MEMBER(tsb12lv01a_device::phy_reset_w)
+{
+	if (state)
+	{
+		set_interrupt(INT_PHRST);
+	}
+}
+
+void tsb12lv01a_device::set_interrupt(uint32_t bit)
+{
+	m_int_status |= bit;
+	LOGMASKED(LOG_IRQS, "Setting IRQ: %08x\n", bit);
+	check_interrupts();
+}
+
+void tsb12lv01a_device::check_interrupts()
+{
+	const uint32_t active_bits = m_int_status & m_int_mask;
+	if (active_bits & 0x7fffffff)
+		m_int_status |= INT_INT;
+	else
+		m_int_status &= ~INT_INT;
+
+	const int state = (m_int_status & m_int_mask & INT_INT) ? 1 : 0;
+	LOGMASKED(LOG_IRQS, "Active IRQs: %08x, %sing IRQ\n", active_bits, state ? "rais" : "lower");
+	m_int_cb(state);
+}
+
+void tsb12lv01a_device::reset_tx()
+{
+	// TODO
+	set_interrupt(INT_TXRDY);
+}
+
+void tsb12lv01a_device::reset_rx()
+{
+}
+
+void tsb12lv01a_device::clear_atf()
+{
+	const uint32_t atf_size = (m_fifo_ctrl & FIFO_CTRL_ATF_SIZE_MASK) >> FIFO_CTRL_ATF_SIZE_SHIFT;
+	m_atf_status &= ~(ATF_STATUS_FULL | ATF_STATUS_CONERR | ATF_STATUS_ADRCOUNTER_MASK | ATF_STATUS_ATFSPACE_MASK);
+	m_atf_status |= ATF_STATUS_EMPTY;
+	m_atf_status |= (atf_size << ATF_STATUS_ATFSPACE_SHIFT);
+}
+
+void tsb12lv01a_device::clear_itf()
+{
+	const uint32_t itf_size = (m_fifo_ctrl & FIFO_CTRL_ITF_SIZE_MASK) >> FIFO_CTRL_ITF_SIZE_SHIFT;
+	m_itf_status &= ~(ITF_STATUS_FULL | ITF_STATUS_ITFSPACE_MASK);
+	m_itf_status |= ITF_STATUS_EMPTY;
+	m_itf_status |= (itf_size << ITF_STATUS_ITFSPACE_SHIFT);
+}
+
+void tsb12lv01a_device::clear_grf()
+{
+	const uint32_t atf_size = (m_fifo_ctrl & FIFO_CTRL_ATF_SIZE_MASK) >> FIFO_CTRL_ATF_SIZE_SHIFT;
+	const uint32_t itf_size = (m_fifo_ctrl & FIFO_CTRL_ITF_SIZE_MASK) >> FIFO_CTRL_ITF_SIZE_SHIFT;
+	const uint32_t grf_size = 0x200 - (atf_size + itf_size);
+	m_grf_status &= ~(GRF_STATUS_CD | GRF_STATUS_PACCOM | GRF_STATUS_GRFTOTAL_MASK | GRF_STATUS_WRITECOUNT_MASK);
+	m_grf_status |= GRF_STATUS_EMPTY;
+	m_grf_status |= grf_size << GRF_STATUS_GRFSIZE_SHIFT;
+}
+
+uint32_t tsb12lv01a_device::read(offs_t offset)
+{
+	switch (offset)
+	{
+		case 0x00:
+			LOGMASKED(LOG_READS, "%s: TSB12 Version register read: %08x\n", machine().describe_context(), m_version);
+			return m_version;
+		case 0x04:
+			LOGMASKED(LOG_READS, "%s: TSB12 Node Address register read: %08x\n", machine().describe_context(), m_node_address);
+			return m_node_address;
+		case 0x08:
+			LOGMASKED(LOG_READS, "%s: TSB12 Control register read: %08x\n", machine().describe_context(), m_ctrl);
+			return m_ctrl;
+		case 0x0c:
+			LOGMASKED(LOG_READS, "%s: TSB12 Interrupt Status register read: %08x\n", machine().describe_context(), m_int_status);
+			return m_int_status;
+		case 0x10:
+			LOGMASKED(LOG_READS, "%s: TSB12 Interrupt Mask register read: %08x\n", machine().describe_context(), m_int_mask);
+			return m_int_mask;
+		case 0x14:
+			LOGMASKED(LOG_READS, "%s: TSB12 Cycle Timer register read: %08x\n", machine().describe_context(), m_cycle_timer);
+			return m_cycle_timer;
+		case 0x18:
+			LOGMASKED(LOG_READS, "%s: TSB12 Isochronous Receive-Port Number register read: %08x\n", machine().describe_context(), m_isoch_port_num);
+			return m_isoch_port_num;
+		case 0x1c:
+			LOGMASKED(LOG_READS, "%s: TSB12 FIFO Control register read: %08x\n", machine().describe_context(), m_fifo_ctrl);
+			return m_fifo_ctrl;
+		case 0x20:
+			LOGMASKED(LOG_READS, "%s: TSB12 Diagnostic Control register read: %08x\n", machine().describe_context(), m_diag_ctrl);
+			return m_diag_ctrl;
+		case 0x24:
+			LOGMASKED(LOG_READS, "%s: TSB12 Phy-Chip Access register read: %08x\n", machine().describe_context(), m_phy_access);
+			return m_phy_access;
+		case 0x30:
+			LOGMASKED(LOG_READS, "%s: TSB12 Asynchronous Transmit-FIFO (ATF) register read: %08x\n", machine().describe_context(), m_atf_status);
+			return m_atf_status;
+		case 0x34:
+			LOGMASKED(LOG_READS, "%s: TSB12 Isochronous Transmit-FIFO (ITF) register read: %08x\n", machine().describe_context(), m_itf_status);
+			return m_itf_status;
+		case 0x3c:
+			LOGMASKED(LOG_READS, "%s: TSB12 General Receive-FIFO (GRF) register read: %08x\n", machine().describe_context(), m_grf_status);
+			return m_grf_status;
+		default:
+			LOGMASKED(LOG_READS | LOG_UNKNOWNS, "%s: TSB12 Unknown read: %08x\n", machine().describe_context(), offset << 2);
+			return 0;
+	}
+}
+
+void tsb12lv01a_device::write(offs_t offset, uint32_t data, uint32_t mem_mask)
+{
+	switch (offset)
+	{
+		case 0x00:
+			LOGMASKED(LOG_WRITES, "%s: TSB12 Version register write: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			break;
+		case 0x04:
+			LOGMASKED(LOG_WRITES, "%s: TSB12 Node Address register write: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			break;
+		case 0x08:
+			LOGMASKED(LOG_WRITES, "%s: TSB12 Control register write: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			if (data & CTRL_RSTTX)
+			{
+				data &= ~CTRL_RSTTX;
+				reset_tx();
+			}
+			if (data & CTRL_RSTRX)
+			{
+				data &= ~CTRL_RSTRX;
+				reset_rx();
+			}
+			COMBINE_DATA(&m_ctrl);
+			break;
+		case 0x0c:
+			LOGMASKED(LOG_WRITES, "%s: TSB12 Interrupt Status register write: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			m_int_status &= ~data;
+			check_interrupts();
+			break;
+		case 0x10:
+			LOGMASKED(LOG_WRITES, "%s: TSB12 Interrupt Mask register write: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			COMBINE_DATA(&m_int_mask);
+			check_interrupts();
+			break;
+		case 0x14:
+			LOGMASKED(LOG_WRITES, "%s: TSB12 Cycle Timer register write: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			break;
+		case 0x18:
+			LOGMASKED(LOG_WRITES, "%s: TSB12 Isochronous Receive-Port Number register write: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			break;
+		case 0x1c:
+			LOGMASKED(LOG_WRITES, "%s: TSB12 FIFO Control register write: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			m_fifo_ctrl &= ~FIFO_CTRL_RW_BITS;
+			m_fifo_ctrl |= data & FIFO_CTRL_RW_BITS;
+			if (data & FIFO_CTRL_CLRATF)
+				clear_atf();
+			if (data & FIFO_CTRL_CLRITF)
+				clear_itf();
+			if (data & FIFO_CTRL_CLRGRF)
+				clear_grf();
+			break;
+		case 0x20:
+			LOGMASKED(LOG_WRITES, "%s: TSB12 Diagnostic Control register write: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			break;
+		case 0x24:
+			LOGMASKED(LOG_WRITES, "%s: TSB12 Phy-Chip Access register write: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			if (data & PHY_WRPHY)
+			{
+				const uint8_t phy_addr = (data & PHY_PHYRGAD_MASK) >> PHY_PHYRGAD_SHIFT;
+				const uint8_t phy_data = (data & PHY_PHYRGDATA_MASK) >> PHY_PHYRGDATA_SHIFT;
+				m_phy_write_cb(phy_addr, phy_data);
+			}
+			if (data & PHY_RDPHY)
+			{
+				const uint8_t phy_addr = (data & PHY_PHYRGAD_MASK) >> PHY_PHYRGAD_SHIFT;
+				m_phy_access &= ~PHY_PHYRXAD_MASK;
+				m_phy_access |= phy_addr << PHY_PHYRXAD_SHIFT;
+				m_phy_access &= ~PHY_PHYRXDATA_MASK;
+				m_phy_access |= m_phy_read_cb(phy_addr);
+
+				if (phy_addr == 0)
+				{
+				}
+
+				m_int_status |= INT_PHYRRX;
+				check_interrupts();
+			}
+
+			m_phy_access &= ~(PHY_PHYRGAD_MASK | PHY_PHYRGDATA_MASK);
+			m_phy_access |= data & (PHY_PHYRGAD_MASK | PHY_PHYRGDATA_MASK);
+			break;
+		case 0x30:
+			LOGMASKED(LOG_WRITES, "%s: TSB12 Asynchronous Transmit-FIFO (ATF) register write: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			break;
+		case 0x34:
+			LOGMASKED(LOG_WRITES, "%s: TSB12 Isochronous Transmit-FIFO (ITF) register write: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			break;
+		case 0x3c:
+			LOGMASKED(LOG_WRITES, "%s: TSB12 General Receive-FIFO (GRF) register write: %08x & %08x\n", machine().describe_context(), data, mem_mask);
+			break;
+		default:
+			LOGMASKED(LOG_WRITES | LOG_UNKNOWNS, "%s: TSB12 Unknown write: %08x = %08x & %08x\n", machine().describe_context(), offset << 2, data, mem_mask);
+			break;
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/devices/machine/tsb12lv01a.h mame-0.224+dfsg.1/src/devices/machine/tsb12lv01a.h
--- mame-0.222+dfsg.1/src/devices/machine/tsb12lv01a.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/tsb12lv01a.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,195 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+/*************************************************************
+
+  Texas Instruments TSB12LV01A/TSB12LV01AI IEEE 1394-1995
+  High-Speed Serial-Bus Link-Layer Controller
+
+  Skeleton device
+
+**************************************************************/
+
+#ifndef MAME_MACHINE_TSB12LV01A_H
+#define MAME_MACHINE_TSB12LV01A_H
+
+#pragma once
+
+class tsb12lv01a_device : public device_t
+{
+public:
+	tsb12lv01a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+
+	uint32_t read(offs_t offset);
+	void write(offs_t offset, uint32_t data, uint32_t mem_mask);
+
+	auto int_cb() { return m_int_cb.bind(); }
+	auto phy_read() { return m_phy_read_cb.bind(); }
+	auto phy_write() { return m_phy_write_cb.bind(); }
+
+	DECLARE_WRITE_LINE_MEMBER(phy_reset_w);
+
+private:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	void set_interrupt(uint32_t bit);
+	void check_interrupts();
+
+	void reset_tx();
+	void reset_rx();
+
+	void clear_atf();
+	void clear_itf();
+	void clear_grf();
+
+	enum
+	{
+		NODE_ADDR_BUSNUM_SHIFT  = 22,
+		NODE_ADDR_BUSNUM_MASK   = 0xffc00000,
+		NODE_ADDR_NODENUM_SHIFT = 16,
+		NODE_ADDR_NODENUM_MASK  = 0x003f0000,
+		NODE_ADDR_ROOT          = 0x8000,
+		NODE_ADDR_ATACK_SHIFT   = 4,
+		NODE_ADDR_ATACK_MASK    = 0x000001f0,
+		NODE_ADDR_ACKV          = 0x00000001,
+
+		CTRL_IDVAL      = 0x80000000,
+		CTRL_RXSID      = 0x40000000,
+		CTRL_BSYCTRL    = 0x20000000,
+		CTRL_RAI        = 0x10000000,
+		CTRL_RCVCYST    = 0x08000000,
+		CTRL_TXAEN      = 0x04000000,
+		CTRL_RXAEN      = 0x02000000,
+		CTRL_TXIEN      = 0x01000000,
+		CTRL_RXIEN      = 0x00800000,
+		CTRL_ACKCEN     = 0x00400000,
+		CTRL_RSTTX      = 0x00200000,
+		CTRL_RSTRX      = 0x00100000,
+		CTRL_CYMAS      = 0x00000800,
+		CTRL_CYSRC      = 0x00000400,
+		CTRL_CYTEN      = 0x00000200,
+		CTRL_TRGEN      = 0x00000100,
+		CTRL_IRP1EN     = 0x00000080,
+		CTRL_IRP2EN     = 0x00000040,
+		CTRL_FHBAD      = 0x00000001,
+		CTRL_RW_BITS    = CTRL_IDVAL | CTRL_RXSID | CTRL_BSYCTRL | CTRL_RAI | CTRL_RCVCYST |
+						  CTRL_TXAEN | CTRL_RXAEN | CTRL_TXIEN | CTRL_RXIEN | CTRL_ACKCEN |
+						  CTRL_CYMAS | CTRL_CYSRC | CTRL_CYTEN | CTRL_TRGEN | CTRL_IRP1EN |
+						  CTRL_IRP2EN | CTRL_FHBAD,
+
+		INT_INT     = 0x80000000,
+		INT_PHINT   = 0x40000000,
+		INT_PHYRRX  = 0x20000000,
+		INT_PHRST   = 0x10000000,
+		INT_SIDCOMP = 0x08000000,
+		INT_TXRDY   = 0x04000000,
+		INT_RXDTA   = 0x02000000,
+		INT_CMDRST  = 0x01000000,
+		INT_ACKRCV  = 0x00800000,
+		INT_ITBADF  = 0x00100000,
+		INT_ATBADF  = 0x00080000,
+		INT_SNTRJ   = 0x00020000,
+		INT_HDRDR   = 0x00010000,
+		INT_TCERR   = 0x00008000,
+		INT_CYTMOUT = 0x00001000,
+		INT_CYSEC   = 0x00000800,
+		INT_CYST    = 0x00000400,
+		INT_CYDNE   = 0x00000200,
+		INT_CYPND   = 0x00000100,
+		INT_CYLST   = 0x00000080,
+		INT_CARBFL  = 0x00000040,
+		INT_ARBGP   = 0x00000004,
+		INT_FRGP    = 0x00000002,
+		INT_IARBFL  = 0x00000001,
+
+		CYTMR_SEC_COUNT_SHIFT   = 25,
+		CYTMR_SEC_COUNT_MASK    = 0xfe000000,
+		CYTMR_CYC_COUNT_SHIFT   = 12,
+		CYTMR_CYC_COUNT_MASK    = 0x01fff000,
+		CYTMR_CYC_OFFSET_SHIFT  = 0,
+		CYTMR_CYC_OFFSET_MASK   = 0x00000fff,
+
+		ISOCH_PORT_TAG_SHIFT        = 30,
+		ISOCH_PORT_TAG_MASK         = 0xc0000000,
+		ISOCH_PORT_IRPORT1_SHIFT    = 24,
+		ISOCH_PORT_IRPORT1_MASK     = 0x3f000000,
+		ISOCH_PORT_TAG2_SHIFT       = 22,
+		ISOCH_PORT_TAG2_MASK        = 0x00c00000,
+		ISOCH_PORT_IRPORT2_SHIFT    = 16,
+		ISOCH_PORT_IRPORT2_MASK     = 0x003f0000,
+		ISOCH_PORT_MON_TAG          = 0x00000001,
+
+		FIFO_CTRL_CLRATF            = 0x80000000,
+		FIFO_CTRL_CLRITF            = 0x40000000,
+		FIFO_CTRL_CLRGRF            = 0x20000000,
+		FIFO_CTRL_TRIG_SIZE_SHIFT   = 18,
+		FIFO_CTRL_TRIG_SIZE_MASK    = 0x07fc0000,
+		FIFO_CTRL_ATF_SIZE_SHIFT    = 9,
+		FIFO_CTRL_ATF_SIZE_MASK     = 0x0003fe00,
+		FIFO_CTRL_ITF_SIZE_SHIFT    = 0,
+		FIFO_CTRL_ITF_SIZE_MASK     = 0x000001ff,
+		FIFO_CTRL_RW_BITS           = (FIFO_CTRL_TRIG_SIZE_MASK | FIFO_CTRL_ATF_SIZE_MASK | FIFO_CTRL_ITF_SIZE_MASK),
+
+		PHY_RDPHY           = 0x80000000,
+		PHY_WRPHY           = 0x40000000,
+		PHY_PHYRGAD_SHIFT   = 24,
+		PHY_PHYRGAD_MASK    = 0x0f000000,
+		PHY_PHYRGDATA_SHIFT = 16,
+		PHY_PHYRGDATA_MASK  = 0x00ff0000,
+		PHY_PHYRXAD_SHIFT   = 8,
+		PHY_PHYRXAD_MASK    = 0x00000f00,
+		PHY_PHYRXDATA_SHIFT = 0,
+		PHY_PHYRXDATA_MASK  = 0x000000ff,
+		PHY_RW_BITS         = 0x0fff0fff,
+
+		ATF_STATUS_FULL             = 0x80000000,
+		ATF_STATUS_EMPTY            = 0x40000000,
+		ATF_STATUS_CONERR           = 0x20000000,
+		ATF_STATUS_ADRCLR           = 0x10000000,
+		ATF_STATUS_CONTROL          = 0x08000000,
+		ATF_STATUS_RAMTEST          = 0x04000000,
+		ATF_STATUS_ADRCOUNTER_SHIFT = 17,
+		ATF_STATUS_ADRCOUNTER_MASK  = 0x03fe0000,
+		ATF_STATUS_ATFSPACE_SHIFT   = 0,
+		ATF_STATUS_ATFSPACE_MASK    = 0x000001ff,
+
+		ITF_STATUS_FULL             = 0x80000000,
+		ITF_STATUS_EMPTY            = 0x40000000,
+		ITF_STATUS_ITFSPACE_SHIFT   = 0,
+		ITF_STATUS_ITFSPACE_MASK    = 0x000001ff,
+
+		GRF_STATUS_EMPTY            = 0x80000000,
+		GRF_STATUS_CD               = 0x40000000,
+		GRF_STATUS_PACCOM           = 0x20000000,
+		GRF_STATUS_GRFTOTAL_SHIFT   = 19,
+		GRF_STATUS_GRFTOTAL_MASK    = 0x1ff80000,
+		GRF_STATUS_GRFSIZE_SHIFT    = 9,
+		GRF_STATUS_GRFSIZE_MASK     = 0x0007fe00,
+		GRF_STATUS_WRITECOUNT_SHIFT = 0,
+		GRF_STATUS_WRITECOUNT_MASK  = 0x000001ff
+	};
+
+	uint32_t m_version;
+	uint32_t m_node_address;
+	uint32_t m_ctrl;
+	uint32_t m_int_status;
+	uint32_t m_int_mask;
+	uint32_t m_cycle_timer;
+	uint32_t m_isoch_port_num;
+	uint32_t m_fifo_ctrl;
+	uint32_t m_diag_ctrl;
+	uint32_t m_phy_access;
+	uint32_t m_atf_status;
+	uint32_t m_itf_status;
+	uint32_t m_grf_status;
+
+	devcb_write_line m_int_cb;
+	devcb_read8 m_phy_read_cb;
+	devcb_write8 m_phy_write_cb;
+};
+
+//device type definition
+DECLARE_DEVICE_TYPE(TSB12LV01A, tsb12lv01a_device)
+
+#endif // MAME_MACHINE_TSB12LV01A_H
diff -Nru mame-0.222+dfsg.1/src/devices/machine/upd4992.cpp mame-0.224+dfsg.1/src/devices/machine/upd4992.cpp
--- mame-0.222+dfsg.1/src/devices/machine/upd4992.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/upd4992.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -38,6 +38,7 @@
 	, device_rtc_interface(mconfig, *this)
 	, m_timer_clock(nullptr)
 {
+	std::fill(std::begin(m_rtc_regs), std::end(m_rtc_regs), 0);
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/v3021.cpp mame-0.224+dfsg.1/src/devices/machine/v3021.cpp
--- mame-0.222+dfsg.1/src/devices/machine/v3021.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/v3021.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,14 +1,96 @@
 // license:BSD-3-Clause
-// copyright-holders:Angelo Salese
+// copyright-holders:Angelo Salese,cam900
 /***************************************************************************
 
-    v3021.c
+    v3021.cpp
 
-    EM Microelectronic-Marin SA Ultra Low Power 32kHz CMOS RTC (DIP8)
+    EM Microelectronic-Marin SA Ultra Low Power 32kHz CMOS RTC (DIP8/SO8)
 
     Serial Real Time Clock
 
-    - very preliminary, borrowed from hard-coded PGM implementation.
+    - Reference: https://www.emmicroelectronic.com/product/real-time-clocks-ic/v3021
+
+    Pin assignment (SO8)
+
+          |-------------------------|
+         _|o                        |_
+     XI |_|                         |_| Vdd
+          |                         |
+         _|                         |_
+     XO |_|                         |_| WR
+          |          V3021          |
+         _|                         |_
+     CS |_|                         |_| RD
+          |                         |
+         _|                         |_
+    Vss |_|                         |_| I/O
+          |-------------------------|
+
+    Pin description
+
+    |-----|------|-----------------------------------------|
+    | Pin | Name | Description                             |
+    |-----|------|-----------------------------------------|
+    1  1  |  XI  | 32 kHz Crystal input                    |
+    |-----|------|-----------------------------------------|
+    1  2  |  XO  | 32 kHz Crystal output                   |
+    |-----|------|-----------------------------------------|
+    1  3  |  CS  | Chip select input                       |
+    |-----|------|-----------------------------------------|
+    1  4  | Vss  | Ground supply                           |
+    |-----|------|-----------------------------------------|
+    1  5  | I/O  | Data input and output                   |
+    |-----|------|-----------------------------------------|
+    1  6  |  RD  | Intel RD, Motorola DS (or tie to CS)    |
+    |-----|------|-----------------------------------------|
+    1  7  |  WR  | Intel WR, Motorola R/W                  |
+    |-----|------|-----------------------------------------|
+    1  8  | Vdd  | Positive supply                         |
+    |-----|------|-----------------------------------------|
+
+    Register map (Unused bits are reserved)
+
+    Address Bits     Description
+            76543210
+    Data space
+    0       ---x---- Time set lock
+            ---0---- Enable copy RAM to clock
+            ---1---- Disable copy RAM to clock
+            ----xx-- Test mode
+            ----00-- Normal operation
+            ----01-- All time keeping accelerated by 32
+            ----10-- Parallel increment of all time data
+                     at 1 Hz with no carry over
+            ----11-- Parallel increment of all time data
+                     at 32 Hz with no carry over
+            -------x Frequency measurement mode
+
+    1       (Read only)
+            x------- Week number is changed
+            -x------ Weekday is changed
+            --x----- Year is changed
+            ---x---- Month is changed
+            ----x--- Day of month is changed
+            -----x-- Hours is changed
+            ------x- Minutes is changed
+            -------x Seconds is changed
+
+    2       -xxxxxxx Seconds (BCD 00-59)
+    3       -xxxxxxx Minutes (BCD 00-59)
+    4       --xxxxxx Hours (BCD 00-23)
+    5       --xxxxxx Day of month (BCD 1-31)
+    6       ---xxxxx Month (BCD 01-12)
+    7       xxxxxxxx Year (BCD 00-99)
+    8       ----xxxx Week day (BCD 01-07)
+    9       -xxxxxxx Week number (BCD 00-52)
+
+    Address command space
+    e       Copy RAM to clock
+    f       Copy clock to RAM
+
+    TODO:
+    - verify status bit (RAM 0x00)
+    - Support Week number correctly
 
 ***************************************************************************/
 
@@ -16,13 +98,12 @@
 #include "machine/v3021.h"
 
 
-
 //**************************************************************************
 //  GLOBAL VARIABLES
 //**************************************************************************
 
 // device type definition
-DEFINE_DEVICE_TYPE(V3021, v3021_device, "v3021", "V3021 RTC")
+DEFINE_DEVICE_TYPE(V3021, v3021_device, "v3021", "EM Microelectronic-Marin SA V3021 RTC")
 
 
 //**************************************************************************
@@ -34,39 +115,26 @@
 //-------------------------------------------------
 
 v3021_device::v3021_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: device_t(mconfig, V3021, tag, owner, clock), m_cal_mask(0), m_cal_com(0), m_cal_cnt(0), m_cal_val(0)
+	: device_t(mconfig, V3021, tag, owner, clock)
+	, device_rtc_interface(mconfig, *this)
 {
 }
 
-TIMER_CALLBACK_MEMBER(v3021_device::timer_callback)
+void v3021_device::rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second)
 {
-	static constexpr uint8_t dpm[12] = { 0x31, 0x28, 0x31, 0x30, 0x31, 0x30, 0x31, 0x31, 0x30, 0x31, 0x30, 0x31 };
-	int dpm_count;
-
-	m_rtc.sec++;
-
-	if((m_rtc.sec & 0x0f) >= 0x0a)              { m_rtc.sec+=0x10; m_rtc.sec&=0xf0; }
-	if((m_rtc.sec & 0xf0) >= 0x60)              { m_rtc.min++; m_rtc.sec = 0; }
-	if((m_rtc.min & 0x0f) >= 0x0a)              { m_rtc.min+=0x10; m_rtc.min&=0xf0; }
-	if((m_rtc.min & 0xf0) >= 0x60)              { m_rtc.hour++; m_rtc.min = 0; }
-	if((m_rtc.hour & 0x0f) >= 0x0a)             { m_rtc.hour+=0x10; m_rtc.hour&=0xf0; }
-	if((m_rtc.hour & 0xff) >= 0x24)             { m_rtc.day++; m_rtc.wday<<=1; m_rtc.hour = 0; }
-	if(m_rtc.wday & 0x80)                       { m_rtc.wday = 1; }
-	if((m_rtc.day & 0x0f) >= 0x0a)              { m_rtc.day+=0x10; m_rtc.day&=0xf0; }
-
-	/* TODO: crude leap year support */
-	dpm_count = (m_rtc.month & 0xf) + (((m_rtc.month & 0x10) >> 4)*10)-1;
+	m_rtc.year = convert_to_bcd(year);
+	m_rtc.month = convert_to_bcd(month);
+	m_rtc.day = convert_to_bcd(day);
+	m_rtc.wday_bcd = convert_to_bcd(day_of_week);
+	m_rtc.wnum = convert_to_bcd((day % 7) + 1); // TODO: placeholder
+	m_rtc.hour = convert_to_bcd(hour);
+	m_rtc.min = convert_to_bcd(minute);
+	m_rtc.sec = convert_to_bcd(second);
+}
 
-	if(((m_rtc.year % 4) == 0) && m_rtc.month == 2)
-	{
-		if((m_rtc.day & 0xff) >= dpm[dpm_count]+1+1)
-			{ m_rtc.month++; m_rtc.day = 0x01; }
-	}
-	else if((m_rtc.day & 0xff) >= dpm[dpm_count]+1){ m_rtc.month++; m_rtc.day = 0x01; }
-	if((m_rtc.month & 0x0f) >= 0x0a)            { m_rtc.month = 0x10; }
-	if(m_rtc.month >= 0x13)                     { m_rtc.year++; m_rtc.month = 1; }
-	if((m_rtc.year & 0x0f) >= 0x0a)             { m_rtc.year+=0x10; m_rtc.year&=0xf0; }
-	if((m_rtc.year & 0xf0) >= 0xa0)             { m_rtc.year = 0; } //2000-2099 possible timeframe
+TIMER_CALLBACK_MEMBER(v3021_device::timer_callback)
+{
+	advance_seconds();
 }
 
 //-------------------------------------------------
@@ -88,16 +156,25 @@
 	m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(v3021_device::timer_callback), this));
 	m_timer->adjust(attotime::from_hz(clock() / XTAL(32'768)), 0, attotime::from_hz(clock() / XTAL(32'768)));
 
-	system_time systime;
-	machine().base_datetime(systime);
+	copy_clock_to_ram();
 
-	m_rtc.day = ((systime.local_time.mday / 10)<<4) | ((systime.local_time.mday % 10) & 0xf);
-	m_rtc.month = (((systime.local_time.month+1) / 10) << 4) | (((systime.local_time.month+1) % 10) & 0xf);
-	m_rtc.wday = 1 << systime.local_time.weekday;
-	m_rtc.year = (((systime.local_time.year % 100)/10)<<4) | ((systime.local_time.year % 10) & 0xf);
-	m_rtc.hour = ((systime.local_time.hour / 10)<<4) | ((systime.local_time.hour % 10) & 0xf);
-	m_rtc.min = ((systime.local_time.minute / 10)<<4) | ((systime.local_time.minute % 10) & 0xf);
-	m_rtc.sec = ((systime.local_time.second / 10)<<4) | ((systime.local_time.second % 10) & 0xf);
+	save_item(NAME(m_cs));
+	save_item(NAME(m_io));
+	save_item(NAME(m_addr));
+	save_item(NAME(m_data));
+	save_item(NAME(m_ram));
+	save_item(NAME(m_cnt));
+	save_item(NAME(m_mode));
+
+	save_item(NAME(m_rtc.sec));
+	save_item(NAME(m_rtc.min));
+	save_item(NAME(m_rtc.hour));
+	save_item(NAME(m_rtc.day));
+	save_item(NAME(m_rtc.wday));
+	save_item(NAME(m_rtc.wday_bcd));
+	save_item(NAME(m_rtc.wnum));
+	save_item(NAME(m_rtc.month));
+	save_item(NAME(m_rtc.year));
 }
 
 
@@ -107,75 +184,162 @@
 
 void v3021_device::device_reset()
 {
-	m_cal_cnt = 0;
+	m_cs = false;
+	m_io = 0;
+	m_addr = 0;
+	m_data = 0;
+	m_ram[0] = m_ram[1] = 0;
+	m_cnt = 0;
+	m_mode = 0;
 }
 
 
-//**************************************************************************
-//  READ/WRITE HANDLERS
-//**************************************************************************
+//-------------------------------------------------
+//  read/write - parallel interface, verified from
+//  "typical applications" section from datasheet
+//-------------------------------------------------
 
-uint8_t v3021_device::read()
+u8 v3021_device::read()
 {
-	uint8_t calr = (m_cal_val & m_cal_mask) ? 1 : 0;
-
-	m_cal_mask <<= 1;
-	return calr;
+	u8 ret = io_r();
+	if (!machine().side_effects_disabled())
+	{
+		cs_w(1);
+		cs_w(0);
+	}
+	return ret & 1;
 }
 
-void v3021_device::write(uint8_t data)
+void v3021_device::write(u8 data)
 {
-	m_cal_com <<= 1;
-	m_cal_com |= data & 1;
-	++m_cal_cnt;
-
-	if (m_cal_cnt == 4)
+	io_w(BIT(data, 0));
+	if (!machine().side_effects_disabled())
 	{
-		m_cal_mask = 1;
-		m_cal_val = 1;
-		m_cal_cnt = 0;
+		cs_w(1);
+		cs_w(0);
+	}
+}
+
+//-------------------------------------------------
+//  cs_w - CS pin handler
+//-------------------------------------------------
 
-		switch (m_cal_com & 0xf)
+WRITE_LINE_MEMBER(v3021_device::cs_w)
+{
+	if (m_cs != state)
+	{
+		m_cs = state;
+		if (m_cs)
 		{
-			case 1: case 3: case 5: case 7: case 9: case 0xb: case 0xd:
-				m_cal_val++;
-				break;
-
-			case 0:
-				m_cal_val = (m_rtc.wday); //??
-				break;
-
-			case 2:  //Hours
-				m_cal_val = (m_rtc.hour);
-				break;
-
-			case 4:  //Seconds
-				m_cal_val = (m_rtc.sec);
-				break;
-
-			case 6:  //Month
-				m_cal_val = (m_rtc.month); //?? not bcd in MVS
-				break;
-
-			case 8:
-				m_cal_val = 0; //Controls blinking speed, maybe milliseconds
-				break;
-
-			case 0xa: //Day
-				m_cal_val = (m_rtc.day);
-				break;
-
-			case 0xc: //Minute
-				m_cal_val = (m_rtc.min);
-				break;
-
-			case 0xe:  //Year
-				m_cal_val = (m_rtc.year % 100);
-				break;
-
-			case 0xf:  //Load Date
-				//machine().base_datetime(m_systime);
-				break;
+			if (!m_mode) // address
+			{
+				m_addr = ((m_addr >> 1) | (m_io << 3)) & 0xf;
+				if (++m_cnt >= 4)
+				{
+					if (m_addr == 0xe) // copy RAM to clock
+					{
+						if (!BIT(m_ram[0x0], 4)) // time set lock
+							copy_ram_to_clock();
+					}
+					else if (m_addr == 0xf) // copy clock to RAM
+					{
+						copy_clock_to_ram();
+					}
+					else // normal accessing
+					{
+						m_data = m_ram[m_addr & 0xf];
+						m_mode = 1;
+					}
+					m_cnt = 0;
+				}
+			}
+			else // data
+			{
+				m_data = ((m_data >> 1) | (m_io << 7)) & 0xff;
+				if (++m_cnt >= 8)
+				{
+					if (m_addr != 1 && m_addr <= 9)
+						m_ram[m_addr & 0xf] = m_data;
+					else
+						logerror("%s: Writing undocumented register %02X at %02X\n", this->tag(), m_data, m_addr);
+
+					m_mode = 0;
+					m_cnt = 0;
+				}
+			}
 		}
 	}
 }
+
+//-------------------------------------------------
+//  io_w - I/O pin write handler
+//-------------------------------------------------
+
+WRITE_LINE_MEMBER(v3021_device::io_w)
+{
+	m_io = state;
+}
+
+//-------------------------------------------------
+//  io_r - I/O pin read handler
+//-------------------------------------------------
+
+READ_LINE_MEMBER(v3021_device::io_r)
+{
+	return m_data & 1;
+}
+
+//-------------------------------------------------
+//  copy_clock_to_ram - copy current clock to RAM
+//-------------------------------------------------
+
+void v3021_device::copy_clock_to_ram()
+{
+	// set status1
+	m_ram[0x1] = 0;
+	if (m_ram[0x2] != m_rtc.sec)
+		m_ram[0x1] |= (1 << 0);
+	if (m_ram[0x3] != m_rtc.min)
+		m_ram[0x1] |= (1 << 1);
+	if (m_ram[0x4] != m_rtc.hour)
+		m_ram[0x1] |= (1 << 2);
+	if (m_ram[0x5] != m_rtc.day)
+		m_ram[0x1] |= (1 << 3);
+	if (m_ram[0x6] != m_rtc.month)
+		m_ram[0x1] |= (1 << 4);
+	if (m_ram[0x7] != m_rtc.year)
+		m_ram[0x1] |= (1 << 5);
+	if (m_ram[0x8] != m_rtc.wday_bcd)
+		m_ram[0x1] |= (1 << 6);
+	if (m_ram[0x9] != m_rtc.wnum)
+		m_ram[0x1] |= (1 << 7);
+
+	m_ram[0x2] = m_rtc.sec;
+	m_ram[0x3] = m_rtc.min;
+	m_ram[0x4] = m_rtc.hour;
+	m_ram[0x5] = m_rtc.day;
+	m_ram[0x6] = m_rtc.month;
+	m_ram[0x7] = m_rtc.year;
+	m_ram[0x8] = m_rtc.wday_bcd;
+	m_ram[0x9] = m_rtc.wnum;
+}
+
+//-------------------------------------------------
+//  copy_ram_to_clock - copy RAM data to clock
+//-------------------------------------------------
+
+void v3021_device::copy_ram_to_clock()
+{
+	// clear status1
+	m_ram[0x1] = 0;
+	m_rtc.sec = m_ram[0x2];
+	m_rtc.min = m_ram[0x3];
+	m_rtc.hour = m_ram[0x4];
+	m_rtc.day = m_ram[0x5];
+	m_rtc.month = m_ram[0x6];
+	m_rtc.year = m_ram[0x7];
+	m_rtc.wday_bcd = m_ram[0x8];
+	m_rtc.wnum = m_ram[0x9];
+	set_time(true, bcd_to_integer(m_rtc.year), bcd_to_integer(m_rtc.month), bcd_to_integer(m_rtc.day),
+					bcd_to_integer(m_rtc.wday_bcd), bcd_to_integer(m_rtc.hour), bcd_to_integer(m_rtc.min), bcd_to_integer(m_rtc.sec));
+}
diff -Nru mame-0.222+dfsg.1/src/devices/machine/v3021.h mame-0.224+dfsg.1/src/devices/machine/v3021.h
--- mame-0.222+dfsg.1/src/devices/machine/v3021.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/v3021.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,10 +1,10 @@
 // license:BSD-3-Clause
-// copyright-holders:Angelo Salese
+// copyright-holders:Angelo Salese,cam900
 /***************************************************************************
 
     v3021.h
 
-    EM Microelectronic-Marin SA Ultra Low Power 32kHz CMOS RTC (DIP8)
+    EM Microelectronic-Marin SA Ultra Low Power 32kHz CMOS RTC (DIP8/SO8)
 
     Serial Real Time Clock
 
@@ -15,6 +15,7 @@
 
 #pragma once
 
+#include "dirtc.h"
 
 //**************************************************************************
 //  TYPE DEFINITIONS
@@ -22,32 +23,62 @@
 
 // ======================> v3021_device
 
-class v3021_device : public device_t
+class v3021_device : public device_t, public device_rtc_interface
 {
 public:
 	// construction/destruction
 	v3021_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 32'768);
 
-	// I/O operations
-	void write(uint8_t data);
-	uint8_t read();
+	// parallel interface
+	void write(u8 data);
+	u8 read();
+
+	// serial interface
+	DECLARE_WRITE_LINE_MEMBER(cs_w);
+	DECLARE_WRITE_LINE_MEMBER(io_w);
+	DECLARE_READ_LINE_MEMBER(io_r);
+
 	TIMER_CALLBACK_MEMBER(timer_callback);
 
 protected:
-	struct rtc_regs_t
-	{
-		uint8_t sec, min, hour, day, wday, month, year;
-	};
-
 	// device-level overrides
 	virtual void device_validity_check(validity_checker &valid) const override;
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
-	uint8_t m_cal_mask,m_cal_com,m_cal_cnt,m_cal_val;
+	// device_rtc_interface overrides
+	virtual bool rtc_feature_y2k() const override { return false; }
+	virtual bool rtc_feature_leap_year() const override { return true; }
+	virtual bool rtc_battery_backed() const override { return true; }
+	virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override;
+
+private:
+	struct rtc_regs_t
+	{
+		u8 sec = 0;
+		u8 min = 0;
+		u8 hour = 0;
+		u8 day = 1;
+		u8 wday = 1;
+		u8 wday_bcd = 1;
+		u8 wnum = 0;
+		u8 month = 1;
+		u8 year = 0;
+	};
+
+	bool m_cs = false;
+	bool m_io = false;
+	u8 m_addr = 0;
+	u8 m_data = 0;
+	u8 m_ram[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
+	u8 m_cnt = 0;
+	u8 m_mode = 0;
 
 	rtc_regs_t m_rtc;
 
+	void copy_clock_to_ram();
+	void copy_ram_to_clock();
+
 	emu_timer *m_timer;
 };
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/wd_fdc.cpp mame-0.224+dfsg.1/src/devices/machine/wd_fdc.cpp
--- mame-0.222+dfsg.1/src/devices/machine/wd_fdc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/wd_fdc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -203,11 +203,13 @@
 		intrq_cond = 0;
 		live_abort();
 	} else if(state && !mr) {
-		// trigger a restore after everything else is reset too, in particular the floppy device itself
-		// CHECKME: WD1770/72 supposedly may not perform RESTORE after reset
-		status |= S_BUSY;
-		sub_state = INITIAL_RESTORE;
-		t_gen->adjust(attotime::zero);
+		// WD1770/72 (supposedly) not perform RESTORE after reset
+		if (!motor_control) {
+			// trigger a restore after everything else is reset too, in particular the floppy device itself
+			status |= S_BUSY;
+			sub_state = INITIAL_RESTORE;
+			t_gen->adjust(attotime::zero);
+		}
 		mr = true;
 	}
 }
@@ -979,6 +981,8 @@
 
 	if (spinup_on_interrupt)  // see notes in FD1771 and WD1772 constructors, might be true for other FDC types as well.
 	{
+		motor_timeout = 0;
+
 		if (head_control)
 			set_hld();
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/z80dma.cpp mame-0.224+dfsg.1/src/devices/machine/z80dma.cpp
--- mame-0.222+dfsg.1/src/devices/machine/z80dma.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/z80dma.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -154,6 +154,7 @@
 	, device_z80daisy_interface(mconfig, *this)
 	, m_out_busreq_cb(*this)
 	, m_out_int_cb(*this)
+	, m_out_ieo_cb(*this)
 	, m_out_bao_cb(*this)
 	, m_in_mreq_cb(*this)
 	, m_out_mreq_cb(*this)
@@ -172,6 +173,7 @@
 	// resolve callbacks
 	m_out_busreq_cb.resolve_safe();
 	m_out_int_cb.resolve_safe();
+	m_out_ieo_cb.resolve_safe();
 	m_out_bao_cb.resolve_safe();
 	m_in_mreq_cb.resolve_safe(0);
 	m_out_mreq_cb.resolve_safe();
@@ -189,6 +191,7 @@
 	save_item(NAME(m_status));
 	save_item(NAME(m_dma_enabled));
 	save_item(NAME(m_vector));
+	save_item(NAME(m_iei));
 	save_item(NAME(m_ip));
 	save_item(NAME(m_ius));
 	save_item(NAME(m_addressA));
@@ -331,6 +334,7 @@
 void z80dma_device::interrupt_check()
 {
 	m_out_int_cb(m_ip ? ASSERT_LINE : CLEAR_LINE);
+	m_out_ieo_cb(m_iei && !m_ip);
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/machine/z80dma.h mame-0.224+dfsg.1/src/devices/machine/z80dma.h
--- mame-0.222+dfsg.1/src/devices/machine/z80dma.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/machine/z80dma.h	2020-08-26 08:57:19.000000000 +0000
@@ -53,6 +53,7 @@
 
 	auto out_busreq_callback() { return m_out_busreq_cb.bind(); }
 	auto out_int_callback() { return m_out_int_cb.bind(); }
+	auto out_ieo_callback() { return m_out_ieo_cb.bind(); }
 	auto out_bao_callback() { return m_out_bao_cb.bind(); }
 	auto in_mreq_callback() { return m_in_mreq_cb.bind(); }
 	auto out_mreq_callback() { return m_out_mreq_cb.bind(); }
@@ -62,6 +63,7 @@
 	uint8_t read();
 	void write(uint8_t data);
 
+	DECLARE_WRITE_LINE_MEMBER(iei_w) { m_iei = state; interrupt_check(); }
 	DECLARE_WRITE_LINE_MEMBER(rdy_w);
 	DECLARE_WRITE_LINE_MEMBER(wait_w);
 	DECLARE_WRITE_LINE_MEMBER(bai_w);
@@ -94,6 +96,7 @@
 	// internal state
 	devcb_write_line   m_out_busreq_cb;
 	devcb_write_line   m_out_int_cb;
+	devcb_write_line   m_out_ieo_cb;
 	devcb_write_line   m_out_bao_cb;
 	devcb_read8        m_in_mreq_cb;
 	devcb_write8       m_out_mreq_cb;
@@ -125,6 +128,7 @@
 	uint8_t m_latch;
 
 	// interrupts
+	bool m_iei;
 	int m_ip;                   // interrupt pending
 	int m_ius;                  // interrupt under service
 	uint8_t m_vector;             // interrupt vector
diff -Nru mame-0.222+dfsg.1/src/devices/sound/c140.cpp mame-0.224+dfsg.1/src/devices/sound/c140.cpp
--- mame-0.222+dfsg.1/src/devices/sound/c140.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/c140.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -206,7 +206,7 @@
 
 	/* allocate a pair of buffers to mix into - 1 second's worth should be more than enough */
 	m_mixer_buffer_left = std::make_unique<s16[]>(m_sample_rate);
-	m_mixer_buffer_right = std::make_unique<s16[]>(m_sample_rate);;
+	m_mixer_buffer_right = std::make_unique<s16[]>(m_sample_rate);
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/sound/dac.h mame-0.224+dfsg.1/src/devices/sound/dac.h
--- mame-0.222+dfsg.1/src/devices/sound/dac.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/dac.h	2020-08-26 08:57:19.000000000 +0000
@@ -285,6 +285,7 @@
 DAC_GENERATOR(PCM54HP, pcm54hp_device, dac_word_interface, dac_code_binary<16>, dac_gain_r2r, "PCM54HP", "pcm54hp")
 DAC_GENERATOR(UDA1341TS, uda1341ts_device, dac_word_interface, dac_code_twos_complement<16>, dac_gain_r2r, "UDA1341TS", "uda1341ts") // I2C stereo audio codec
 DAC_GENERATOR(ZN425E, zn425e_device, dac_byte_interface, dac_code_binary<8>, dac_gain_r2r, "ZN425E", "zn425e")
+DAC_GENERATOR(ZN426E, zn426e_device, dac_byte_interface, dac_code_binary<8>, dac_gain_r2r, "ZN426E-8", "zn426e")
 DAC_GENERATOR(ZN428E, zn428e_device, dac_byte_interface, dac_code_binary<8>, dac_gain_r2r, "ZN428E-8", "zn428e")
 DAC_GENERATOR(ZN429E, zn429e_device, dac_byte_interface, dac_code_binary<8>, dac_gain_r2r, "ZN429E-8", "zn429e")
 
diff -Nru mame-0.222+dfsg.1/src/devices/sound/disc_dev.hxx mame-0.224+dfsg.1/src/devices/sound/disc_dev.hxx
--- mame-0.222+dfsg.1/src/devices/sound/disc_dev.hxx	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/disc_dev.hxx	2020-08-26 08:57:19.000000000 +0000
@@ -1653,7 +1653,7 @@
 	double  freq, t1;
 	double  v_freq_2, v_freq_3, v_freq_4;
 	double  t_used = m_t_used;
-	double  dt = this->sample_time();;
+	double  dt = this->sample_time();
 	double  v_freq = DSD_LS624__VMOD;
 	double  v_rng = DSD_LS624__VRNG;
 	int     count_f = 0, count_r = 0;
diff -Nru mame-0.222+dfsg.1/src/devices/sound/disc_wav.hxx mame-0.224+dfsg.1/src/devices/sound/disc_wav.hxx
--- mame-0.222+dfsg.1/src/devices/sound/disc_wav.hxx	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/disc_wav.hxx	2020-08-26 08:57:19.000000000 +0000
@@ -998,7 +998,7 @@
 			m_charge_exp[0] = RC_CHARGE_EXP(m_charge_rc[0]);
 			m_charge_exp[1] = RC_CHARGE_EXP(m_charge_rc[1]);
 			m_threshold_low  = (info->vP - OP_AMP_NORTON_VBE) / info->r4;
-			m_threshold_high = m_threshold_low + (info->vP - 2 * OP_AMP_NORTON_VBE) / info->r3;;
+			m_threshold_high = m_threshold_low + (info->vP - 2 * OP_AMP_NORTON_VBE) / info->r3;
 			m_threshold_low  = m_threshold_low * info->r2 + OP_AMP_NORTON_VBE;
 			m_threshold_high = m_threshold_high * info->r2 + OP_AMP_NORTON_VBE;
 
diff -Nru mame-0.222+dfsg.1/src/devices/sound/ics2115.cpp mame-0.224+dfsg.1/src/devices/sound/ics2115.cpp
--- mame-0.222+dfsg.1/src/devices/sound/ics2115.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/ics2115.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -14,6 +14,11 @@
     - DRAM, DMA, MIDI interface is unimplemented
     - Verify interrupt, envelope, timer period
     - Verify unemulated registers
+
+    Changelog:
+
+    25th july 2020 [cam900]:
+    - Improve envelope behavior, Improve debugging registers, Fix ramping
 */
 
 #include "emu.h"
@@ -77,7 +82,7 @@
 
 	//u-Law table as per MIL-STD-188-113
 	u16 lut[8];
-	u16 lut_initial = 33 << 2;   //shift up 2-bits for 16-bit range.
+	const u16 lut_initial = 33 << 2;   //shift up 2-bits for 16-bit range.
 	for (int i = 0; i < 8; i++)
 		lut[i] = (lut_initial << i) - lut_initial;
 	for (int i = 0; i < 256; i++)
@@ -101,11 +106,14 @@
 	save_item(NAME(m_irq_on));
 	save_item(NAME(m_active_osc));
 	save_item(NAME(m_vmode));
+	save_item(NAME(m_regs));
+	save_item(STRUCT_MEMBER(m_voice, regs));
 
 	for (int i = 0; i < 32; i++)
 	{
 		save_item(NAME(m_voice[i].osc_conf.value), i);
-		save_item(NAME(m_voice[i].state.value), i);
+		save_item(NAME(m_voice[i].state.on), i);
+		save_item(NAME(m_voice[i].state.ramp), i);
 		save_item(NAME(m_voice[i].vol_ctrl.value), i);
 		save_item(NAME(m_voice[i].osc.left), i);
 		save_item(NAME(m_voice[i].osc.acc), i);
@@ -165,7 +173,8 @@
 		elem.vol.pan = 0x7f;
 		elem.vol_ctrl.value = 1;
 		elem.vol.mode = 0;
-		elem.state.value = 0;
+		elem.state.on = false;
+		elem.state.ramp = 0;
 	}
 }
 
@@ -233,14 +242,7 @@
 			vol.acc = vol.start - vol.left;
 	}
 	else
-	{
-		state.bitflags.on = false;
 		vol_ctrl.bitflags.done = true;
-		if (vol_ctrl.bitflags.invert)
-			vol.acc = vol.end;
-		else
-			vol.acc = vol.start;
-	}
 
 	return ret;
 }
@@ -303,7 +305,7 @@
 	}
 	else
 	{
-		state.bitflags.on = false;
+		state.on = false;
 		osc_conf.bitflags.stop = true;
 		if (!osc_conf.bitflags.invert)
 			osc.acc = osc.end;
@@ -316,11 +318,11 @@
 //TODO: proper interpolation for 8-bit samples (looping)
 stream_sample_t ics2115_device::get_sample(ics2115_voice& voice)
 {
-	u32 curaddr = voice.osc.acc >> 12;
+	const u32 curaddr = voice.osc.acc >> 12;
 	u32 nextaddr;
 
-	if (voice.state.bitflags.on && voice.osc_conf.bitflags.loop && !voice.osc_conf.bitflags.loop_bidir &&
-			(voice.osc.left < (voice.osc.fc <<2)))
+	if (voice.state.on && voice.osc_conf.bitflags.loop && !voice.osc_conf.bitflags.loop_bidir &&
+			(voice.osc.left < (voice.osc.fc << 2)))
 	{
 		//logerror("C?[%x:%x]", voice.osc.left, voice.osc.acc);
 		nextaddr = voice.osc.start >> 12;
@@ -348,55 +350,53 @@
 
 	//linear interpolation as in US patent 6,246,774 B1, column 2 row 59
 	//LEN=1, BLEN=0, DIR=0, start+end interpolation
-	s32 sample, diff;
-	u16 fract;
-	diff = sample2 - sample1;
-	fract = (voice.osc.acc >> 3) & 0x1ff;
+	const s32 diff = sample2 - sample1;
+	const u16 fract = (voice.osc.acc >> 3) & 0x1ff;
 
 	//no need for interpolation since it's around 1 note a cycle?
 	//if (!fract)
 	//    return sample1;
 
-	sample = (((s32)sample1 << 9) + diff * fract) >> 9;
+	const s32 sample = (((s32)sample1 << 9) + diff * fract) >> 9;
 	//sample = sample1;
 	return sample;
 }
 
 bool ics2115_device::ics2115_voice::playing()
 {
-	return state.bitflags.on && !((vol_ctrl.bitflags.done || vol_ctrl.bitflags.stop) && osc_conf.bitflags.stop);
+	return state.on && !(osc_conf.bitflags.stop);
 }
 
 void ics2115_device::ics2115_voice::update_ramp()
 {
 	//slow attack
-	if (state.bitflags.on && !osc_conf.bitflags.stop)
+	if (state.on && !osc_conf.bitflags.stop)
 	{
-		if (state.bitflags.ramp < 0x40)
-			state.bitflags.ramp += 0x1;
+		if (state.ramp < 0x40)
+			state.ramp += 0x1;
 		else
-			state.bitflags.ramp = 0x40;
+			state.ramp = 0x40;
 	}
 	//slow release
 	else
 	{
-		if (state.bitflags.ramp)
-			state.bitflags.ramp -= 0x1;
+		if (state.ramp)
+			state.ramp -= 0x1;
 	}
 }
 
 int ics2115_device::fill_output(ics2115_voice& voice, stream_sample_t *outputs[2], int samples)
 {
 	bool irq_invalid = false;
-	u16 fine = 1 << (3*(voice.vol.incr >> 6));
+	const u16 fine = 1 << (3*(voice.vol.incr >> 6));
 	voice.vol.add = (voice.vol.incr & 0x3f)<< (10 - fine);
 
 	for (int i = 0; i < samples; i++)
 	{
-		u32 volacc = (voice.vol.acc >> 10) & 0xffff;
-		u32 volume = (m_volume[volacc >> 4] * voice.state.bitflags.ramp) >> 6;
-		u16 vleft = volume; //* (255 - voice.vol.pan) / 0x80];
-		u16 vright = volume; //* (voice.vol.pan + 1) / 0x80];
+		const u32 volacc = (voice.vol.acc >> 10) & 0xffff;
+		const u32 volume = (m_volume[volacc >> 4] * voice.state.ramp) >> 6;
+		const u16 vleft = volume; //* (255 - voice.vol.pan) / 0x80];
+		const u16 vright = volume; //* (voice.vol.pan + 1) / 0x80];
 
 		//From GUS doc:
 		//In general, it is necessary to remember that all voices are being summed in to the
@@ -494,7 +494,7 @@
 //Helper Function (Reads off current register)
 u16 ics2115_device::reg_read()
 {
-	u16 ret;
+	u16 ret = 0;
 	ics2115_voice& voice = m_voice[m_osc_select];
 
 	switch (m_reg_select)
@@ -669,6 +669,10 @@
 void ics2115_device::reg_write(u16 data, u16 mem_mask)
 {
 	ics2115_voice& voice = m_voice[m_osc_select];
+	if (m_reg_select < 0x20)
+		COMBINE_DATA(&voice.regs[m_reg_select]);
+	else if (m_reg_select >= 0x40 && m_reg_select < 0x80)
+		COMBINE_DATA(&m_regs[m_reg_select - 0x40]);
 
 	switch (m_reg_select)
 	{
@@ -796,6 +800,7 @@
 			{
 				data >>= 8;
 				voice.osc.ctl = data;
+				voice.state.on = !voice.osc.ctl; // some early PGM games need this
 				if (!data)
 					keyon();
 				//guessing here
@@ -810,10 +815,9 @@
 #endif
 					if (!m_vmode)
 					{
+						//try to key it off as well!
 						voice.osc_conf.bitflags.stop = true;
 						voice.vol_ctrl.bitflags.stop = true;
-						//try to key it off as well!
-						voice.state.bitflags.on = false;
 					}
 				}
 #ifdef ICS2115_DEBUG
@@ -1012,9 +1016,8 @@
 		return;
 #endif
 	//set initial condition (may need to invert?) -- does NOT work since these are set to zero even
-	m_voice[m_osc_select].state.bitflags.on = true;
 	//no ramp up...
-	m_voice[m_osc_select].state.bitflags.ramp = 0x40;
+	m_voice[m_osc_select].state.ramp = 0x40;
 
 #ifdef ICS2115_DEBUG
 	logerror("[%02d vs:%04x ve:%04x va:%04x vi:%02x vc:%02x os:%06x oe:%06x oa:%06x of:%04x SA:%02x oc:%02x][%04x]\n", m_osc_select,
diff -Nru mame-0.222+dfsg.1/src/devices/sound/ics2115.h mame-0.224+dfsg.1/src/devices/sound/ics2115.h
--- mame-0.222+dfsg.1/src/devices/sound/ics2115.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/ics2115.h	2020-08-26 08:57:19.000000000 +0000
@@ -52,8 +52,8 @@
 	struct ics2115_voice {
 		struct {
 			s32 left;
-			u32 acc, start, end;
-			u16 fc;
+			u32 acc, start, end; // address counters (20.9 fixed point)
+			u16 fc;              // frequency (6.9 fixed point)
 			u8 ctl, saddr;
 		} osc;
 
@@ -69,58 +69,56 @@
 
 		union {
 			struct {
-				u8 ulaw       : 1;
-				u8 stop       : 1;   //stops wave + vol envelope
-				u8 eightbit   : 1;
-				u8 loop       : 1;
-				u8 loop_bidir : 1;
-				u8 irq        : 1;
-				u8 invert     : 1;
-				u8 irq_pending: 1;
-				//IRQ on variable?
+				u8 ulaw       : 1;   // compressed sample format
+				u8 stop       : 1;   // stops wave + vol envelope
+				u8 eightbit   : 1;   // 8 bit sample format
+				u8 loop       : 1;   // loop enable
+				u8 loop_bidir : 1;   // bi-directional loop enable
+				u8 irq        : 1;   // enable IRQ generation
+				u8 invert     : 1;   // invert direction
+				u8 irq_pending: 1;   // (read only?) IRQ pending
+				// IRQ on variable?
 			} bitflags;
 			u8 value;
 		} osc_conf;
 
 		union {
 			struct {
-				u8 done       : 1;   //indicates ramp has stopped
-				u8 stop       : 1;   //stops the ramp
-				u8 rollover   : 1;   //rollover (TODO)
-				u8 loop       : 1;
-				u8 loop_bidir : 1;
-				u8 irq        : 1;   //enable IRQ generation
-				u8 invert     : 1;   //invert direction
-				u8 irq_pending: 1;   //(read only) IRQ pending
-				//noenvelope == (done | disable)
+				u8 done       : 1;   // indicates ramp has stopped
+				u8 stop       : 1;   // stops the ramp
+				u8 rollover   : 1;   // rollover (TODO)
+				u8 loop       : 1;   // loop enable
+				u8 loop_bidir : 1;   // bi-directional loop enable
+				u8 irq        : 1;   // enable IRQ generation
+				u8 invert     : 1;   // invert direction
+				u8 irq_pending: 1;   // (read only?) IRQ pending
+				// noenvelope == (done | stop)
 			} bitflags;
 			u8 value;
 		} vol_ctrl;
 
-		//Possibly redundant state. => improvements of wavetable logic
-		//may lead to its elimination.
-		union {
-			struct {
-				u8 on         : 1;
-				u8 ramp       : 7;       // 100 0000 = 0x40 maximum
-			} bitflags;
-			u8 value;
+		// Possibly redundant state. => improvements of wavetable logic
+		// may lead to its elimination.
+		struct {
+			bool on;
+			int ramp;       // 100 0000 = 0x40 maximum
 		} state;
 
+		u16 regs[0x20]; // channel registers
 		bool playing();
 		int update_volume_envelope();
 		int update_oscillator();
 		void update_ramp();
 	};
 
-	//internal register helper functions
+	// internal register helper functions
 	u16 reg_read();
 	void reg_write(u16 data, u16 mem_mask);
 	void recalc_timer(int timer);
 	void keyon();
 	void recalc_irq();
 
-	//stream helper functions
+	// stream helper functions
 	int fill_output(ics2115_voice& voice, stream_sample_t *outputs[2], int samples);
 	stream_sample_t get_sample(ics2115_voice& voice);
 	u8 read_sample(ics2115_voice& voice, u32 addr) { return m_cache.read_byte((voice.osc.saddr << 20) | (addr & 0xfffff)); }
@@ -149,6 +147,8 @@
 	u8 m_irq_enabled, m_irq_pending;
 	bool m_irq_on;
 
+	u16 m_regs[0x40]; // global registers
+
 	/*
 	    Unknown variable, seems to be effected by 0x12. Further investigation
 	    Required.
diff -Nru mame-0.222+dfsg.1/src/devices/sound/k007232.cpp mame-0.224+dfsg.1/src/devices/sound/k007232.cpp
--- mame-0.222+dfsg.1/src/devices/sound/k007232.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/k007232.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -26,18 +26,24 @@
 #include "emu.h"
 #include "k007232.h"
 #include "wavwrite.h"
+#include <algorithm>
 
 #define K007232_LOG_PCM (0)
-#define BASE_SHIFT      (12)
 
 DEFINE_DEVICE_TYPE(K007232, k007232_device, "k007232", "K007232 PCM Controller")
 
-k007232_device::k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+k007232_device::k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
 	: device_t(mconfig, K007232, tag, owner, clock)
 	, device_sound_interface(mconfig, *this)
+	, device_memory_interface(mconfig, *this)
+	, m_data_config("data", ENDIANNESS_LITTLE, 8, 17) // 17 bit address, 8 bit data, can be bankswitched per each voices
 	, m_rom(*this, DEVICE_SELF)
+	, m_pcmlimit(~0)
+	, m_bank(0)
+	, m_stream(nullptr)
 	, m_port_write_handler(*this)
 {
+	std::fill(std::begin(m_wreg), std::end(m_wreg), 0);
 }
 
 //-------------------------------------------------
@@ -46,59 +52,77 @@
 
 void k007232_device::device_start()
 {
-	/* Set up the chips */
-	m_pcmlimit = m_rom.bytes();
+	m_pcmlimit = 1 << 17;
+	// default mapping (bankswitched ROM)
+	if ((m_rom.target() != nullptr) && (!has_configured_map(0)))
+	{
+		if (m_rom.bytes() > 0x20000)
+			space(0).install_read_handler(0x00000, std::min<offs_t>(0x1ffff, m_rom.bytes() - 1), read8sm_delegate(*this, FUNC(k007232_device::read_rom_default)));
+		else
+		{
+			space(0).install_rom(0x00000, m_rom.mask(), m_rom.target());
+			m_pcmlimit = m_rom.bytes();
+		}
+	}
+	space(0).cache(m_cache);
 
+	/* Set up the chips */
 	m_port_write_handler.resolve_safe();
 
 	for (int i = 0; i < KDAC_A_PCM_MAX; i++)
 	{
-		m_addr[i] = 0;
-		m_start[i] = 0;
-		m_step[i] = 0;
-		m_play[i] = 0;
-		m_bank[i] = 0;
-	}
-	m_vol[0][0] = 255;  /* channel A output to output A */
-	m_vol[0][1] = 0;
-	m_vol[1][0] = 0;
-	m_vol[1][1] = 255;  /* channel B output to output B */
+		m_channel[i].addr = 0;
+		m_channel[i].start = 0;
+		m_channel[i].counter = 0x200;
+		m_channel[i].step = 0;
+		m_channel[i].play = 0;
+		m_channel[i].bank = 0;
+	}
+	m_channel[0].vol[0] = 255;  /* channel A output to output A */
+	m_channel[0].vol[1] = 0;
+	m_channel[1].vol[0] = 0;
+	m_channel[1].vol[1] = 255;  /* channel B output to output B */
 
 	for (auto & elem : m_wreg)
 		elem = 0;
 
-	m_stream = machine().sound().stream_alloc(*this, 0 , 2, clock()/128);
-
-	make_fncodes();
+	m_stream = machine().sound().stream_alloc(*this, 0, 2, clock()/128);
 
-	save_item(NAME(m_vol));
-	save_item(NAME(m_addr));
-	save_item(NAME(m_start));
-	save_item(NAME(m_step));
-	save_item(NAME(m_bank));
-	save_item(NAME(m_play));
+	save_item(STRUCT_MEMBER(m_channel, vol));
+	save_item(STRUCT_MEMBER(m_channel, addr));
+	save_item(STRUCT_MEMBER(m_channel, counter));
+	save_item(STRUCT_MEMBER(m_channel, start));
+	save_item(STRUCT_MEMBER(m_channel, step));
+	save_item(STRUCT_MEMBER(m_channel, bank));
+	save_item(STRUCT_MEMBER(m_channel, play));
 	save_item(NAME(m_wreg));
 }
 
-void k007232_device::make_fncodes()
+//-------------------------------------------------
+//  device_clock_changed - called if the clock
+//  changes
+//-------------------------------------------------
+
+void k007232_device::device_clock_changed()
 {
-	for (int i = 0; i < 0x200; i++)
-	{
-		m_fncode[i] = (32 << BASE_SHIFT) / (0x200 - i);
-	}
+	m_stream->set_sample_rate(clock()/128);
 }
 
-uint32_t k007232_device::get_start_address(int channel)
+//-------------------------------------------------
+//  memory_space_config - return a description of
+//  any address spaces owned by this device
+//-------------------------------------------------
+
+device_memory_interface::space_config_vector k007232_device::memory_space_config() const
 {
-	const uint32_t reg_index = (channel ? 6 : 0);
-	return (BIT(m_wreg[reg_index + 4], 0) << 16) | (m_wreg[reg_index + 3] << 8) | m_wreg[reg_index + 2] | m_bank[channel];
+	return space_config_vector{ std::make_pair(0, &m_data_config) };
 }
 
 /************************************************/
 /*    Konami PCM write register                 */
 /************************************************/
 
-void k007232_device::write(offs_t offset, uint8_t data)
+void k007232_device::write(offs_t offset, u8 data)
 {
 	m_stream->update();
 
@@ -115,7 +139,7 @@
 	}
 	else
 	{
-		int channel = (offset >= 6 ? 1 : 0);
+		channel_t *channel = &m_channel[(offset >= 6 ? 1 : 0)];
 		int reg_index = (offset >= 6 ? 6 : 0);
 		if (offset >= 6)
 			offset -= 6;
@@ -124,19 +148,20 @@
 		{
 		case 0: // address step, LSB
 		case 1: // address step, MSB
-			m_step[channel] = m_fncode[(BIT(m_wreg[reg_index + 1], 0) << 8) | m_wreg[reg_index]];
+			channel->step = (BIT(m_wreg[reg_index + 1], 0) << 8) | m_wreg[reg_index];
 			break;
 		case 2:
 		case 3:
 		case 4:
 			// working data for start address
+			channel->start = (BIT(m_wreg[reg_index + 4], 0) << 16) | (m_wreg[reg_index + 3] << 8) | m_wreg[reg_index + 2];
 			break;
 		case 5: // start address
-			m_start[channel] = get_start_address(channel);
-			if (m_start[channel] < m_pcmlimit)
+			if (channel->start < m_pcmlimit)
 			{
-				m_play[channel] = 1;
-				m_addr[channel] = 0;
+				channel->play = true;
+				channel->addr = channel->start;
+				channel->counter = 0x200;
 			}
 			break;
 		}
@@ -147,18 +172,17 @@
 /*    Konami PCM read register                  */
 /************************************************/
 
-uint8_t k007232_device::read(offs_t offset)
+u8 k007232_device::read(offs_t offset)
 {
 	if (offset == 5 || offset == 11)
 	{
-		int channel = (offset == 11) ? 1 : 0;
+		channel_t *channel = &m_channel[(offset == 11) ? 1 : 0];
 
-		m_start[channel] = get_start_address(channel);
-
-		if (m_start[channel] <  m_pcmlimit)
+		if (channel->start < m_pcmlimit)
 		{
-			m_play[channel] = 1;
-			m_addr[channel] = 0;
+			channel->play = true;
+			channel->addr = channel->start;
+			channel->counter = 0x200;
 		}
 	}
 	return 0;
@@ -168,14 +192,14 @@
 
 void k007232_device::set_volume(int channel, int vol_a, int vol_b)
 {
-	m_vol[channel][0] = vol_a;
-	m_vol[channel][1] = vol_b;
+	m_channel[channel].vol[0] = vol_a;
+	m_channel[channel].vol[1] = vol_b;
 }
 
 void k007232_device::set_bank(int chan_a_bank, int chan_b_bank)
 {
-	m_bank[0] = chan_a_bank << 17;
-	m_bank[1] = chan_b_bank << 17;
+	m_channel[0].bank = chan_a_bank << 17;
+	m_channel[1].bank = chan_b_bank << 17;
 }
 
 /*****************************************************************************/
@@ -194,17 +218,18 @@
 	{
 		for (int i = 0; i < KDAC_A_PCM_MAX; i++)
 		{
-			if (m_play[i])
+			channel_t *channel = &m_channel[i];
+			if (channel->play)
 			{
 				char filebuf[256];
-				snprintf(filebuf, 256, "pcm%08x.wav", m_start[i]);
+				snprintf(filebuf, 256, "pcm%08x.wav", channel->start);
 				wav_file *file = wav_open(filebuf, stream.sample_rate(), 1);
 				if (file != nullptr)
 				{
-					uint32_t addr = m_start[i];
-					while (!BIT(m_rom[addr], 7) && addr < m_pcmlimit)
+					u32 addr = channel->start;
+					while (!BIT(read_sample(i, addr), 7) && addr < m_pcmlimit)
 					{
-						int16_t out = ((m_rom[addr] & 0x7f) - 0x40) << 7;
+						int16_t out = ((read_sample(i, addr) & 0x7f) - 0x40) << 7;
 						wav_add_data_16(file, &out, 1);
 						addr++;
 					}
@@ -214,50 +239,45 @@
 		}
 	}
 
-	for (int i = 0; i < KDAC_A_PCM_MAX; i++)
+	for (int j = 0; j < samples; j++)
 	{
-		if (m_play[i])
+		for (int i = 0; i < KDAC_A_PCM_MAX; i++)
 		{
-			/**** PCM setup ****/
-			uint32_t addr_lsb = (m_addr[i] >> BASE_SHIFT) & 0x000fffff;
-			uint32_t addr = m_start[i] + addr_lsb;
-			int vol_a = m_vol[i][0] * 2;
-			int vol_b = m_vol[i][1] * 2;
-
-			for (int j = 0; j < samples; j++)
+			channel_t *channel = &m_channel[i];
+			if (channel->play)
 			{
-				uint32_t old_addr = addr;
-				addr_lsb = (m_addr[i] >> BASE_SHIFT) & 0x000fffff;
-				addr = m_start[i] + addr_lsb;
-				while (old_addr <= addr)
+				/**** PCM setup ****/
+				int vol_a = channel->vol[0] * 2;
+				int vol_b = channel->vol[1] * 2;
+
+				u32 addr = channel->addr & 0x1ffff;
+				while (channel->counter <= channel->step) // result : clock / (4 * (512 - frequency))
 				{
-					if (BIT(m_rom[old_addr], 7) || old_addr >= m_pcmlimit)
+					if (BIT(read_sample(i, addr++), 7) || addr >= m_pcmlimit)
 					{
 						// end of sample
 						if (BIT(m_wreg[13], i))
 						{
 							/* loop to the beginning */
-							m_start[i] = get_start_address(i);
-							addr = m_start[i];
-							m_addr[i] = 0;
-							old_addr = addr; /* skip loop */
+							addr = channel->start;
 						}
 						else
 						{
 							/* stop sample */
-							m_play[i] = 0;
+							channel->play = false;
+							break;
 						}
-						break;
 					}
-					old_addr++;
+					channel->counter += (0x200 - channel->step);
 				}
+				channel->addr = addr;
 
-				if (m_play[i] == 0)
+				if (!channel->play)
 					break;
 
-				m_addr[i] += m_step[i];
+				channel->counter -= 32;
 
-				int out = (m_rom[addr] & 0x7f) - 0x40;
+				int out = (read_sample(i, addr) & 0x7f) - 0x40;
 
 				outputs[0][j] += out * vol_a;
 				outputs[1][j] += out * vol_b;
diff -Nru mame-0.222+dfsg.1/src/devices/sound/k007232.h mame-0.224+dfsg.1/src/devices/sound/k007232.h
--- mame-0.222+dfsg.1/src/devices/sound/k007232.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/k007232.h	2020-08-26 08:57:19.000000000 +0000
@@ -9,15 +9,15 @@
 
 #pragma once
 
-class k007232_device : public device_t, public device_sound_interface
+class k007232_device : public device_t, public device_sound_interface, public device_memory_interface
 {
 public:
-	k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	k007232_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
 
 	auto port_write() { return m_port_write_handler.bind(); }
 
-	void write(offs_t offset, uint8_t data);
-	uint8_t read(offs_t offset);
+	void write(offs_t offset, u8 data);
+	u8 read(offs_t offset);
 
 	/*
 	The 007232 has two channels and produces two outputs. The volume control
@@ -34,34 +34,46 @@
 protected:
 	// device-level overrides
 	virtual void device_start() override;
+	virtual void device_clock_changed() override;
 
 	// sound stream update overrides
 	virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
 
-	void make_fncodes();
+	// device_memory_interface configuration
+	virtual space_config_vector memory_space_config() const override;
 
-private:
-	uint32_t get_start_address(int channel);
+	address_space_config m_data_config;
 
+private:
 	static constexpr unsigned KDAC_A_PCM_MAX = 2;      /* Channels per chip */
 
 	// internal state
-	required_region_ptr<uint8_t> m_rom;
+	memory_access<17, 0, 0, ENDIANNESS_LITTLE>::cache m_cache;
+	optional_region_ptr<u8> m_rom;
+
+	struct channel_t
+	{
+		u8           vol[2]; /* volume for the left and right channel */
+		u32          addr;
+		int          counter;
+		u32          start;
+		u16          step;
+		u32          bank;
+		bool         play;
+	};
+
+	u8 read_rom_default(offs_t offset) { return m_rom[(m_bank + (offset & 0x1ffff)) & m_rom.mask()]; }
+	inline u8 read_sample(int channel, u32 addr) { m_bank = m_channel[channel].bank; return m_cache.read_byte(addr & 0x1ffff); }
+
+	channel_t     m_channel[KDAC_A_PCM_MAX]; // 2 channels
+
+	u8            m_wreg[0x10]; /* write data */
+
+	u32           m_pcmlimit;
+	u32           m_bank;
 
-	uint8_t           m_vol[KDAC_A_PCM_MAX][2]; /* volume for the left and right channel */
-	uint32_t          m_addr[KDAC_A_PCM_MAX];
-	uint32_t          m_start[KDAC_A_PCM_MAX];
-	uint32_t          m_step[KDAC_A_PCM_MAX];
-	uint32_t          m_bank[KDAC_A_PCM_MAX];
-	int               m_play[KDAC_A_PCM_MAX];
-
-	uint8_t           m_wreg[0x10]; /* write data */
-
-	uint32_t          m_pcmlimit;
-
-	sound_stream *    m_stream;
-	uint32_t          m_fncode[0x200];
-	devcb_write8      m_port_write_handler;
+	sound_stream *m_stream;
+	devcb_write8  m_port_write_handler;
 };
 
 DECLARE_DEVICE_TYPE(K007232, k007232_device)
diff -Nru mame-0.222+dfsg.1/src/devices/sound/k051649.cpp mame-0.224+dfsg.1/src/devices/sound/k051649.cpp
--- mame-0.222+dfsg.1/src/devices/sound/k051649.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/k051649.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -28,7 +28,6 @@
 #include "k051649.h"
 #include <algorithm>
 
-#define FREQ_BITS   16
 #define DEF_GAIN    8
 
 void k051649_device::scc_map(address_map &map)
@@ -56,7 +55,6 @@
 	: device_t(mconfig, K051649, tag, owner, clock)
 	, device_sound_interface(mconfig, *this)
 	, m_stream(nullptr)
-	, m_mclock(0)
 	, m_rate(0)
 	, m_mixer_table(nullptr)
 	, m_mixer_lookup(nullptr)
@@ -74,7 +72,6 @@
 	// get stream channels
 	m_rate = clock()/16;
 	m_stream = stream_alloc(0, 1, m_rate);
-	m_mclock = clock();
 
 	// allocate a buffer to mix into - 1 second's worth should be more than enough
 	m_mixer_buffer.resize(2 * m_rate);
@@ -83,14 +80,12 @@
 	make_mixer_table(5);
 
 	// save states
-	for (int voice = 0; voice < 5; voice++)
-	{
-		save_item(NAME(m_channel_list[voice].counter), voice);
-		save_item(NAME(m_channel_list[voice].frequency), voice);
-		save_item(NAME(m_channel_list[voice].volume), voice);
-		save_item(NAME(m_channel_list[voice].key), voice);
-		save_item(NAME(m_channel_list[voice].waveram), voice);
-	}
+	save_item(STRUCT_MEMBER(m_channel_list, counter));
+	save_item(STRUCT_MEMBER(m_channel_list, clock));
+	save_item(STRUCT_MEMBER(m_channel_list, frequency));
+	save_item(STRUCT_MEMBER(m_channel_list, volume));
+	save_item(STRUCT_MEMBER(m_channel_list, key));
+	save_item(STRUCT_MEMBER(m_channel_list, waveram));
 	save_item(NAME(m_test));
 }
 
@@ -107,6 +102,7 @@
 		voice.frequency = 0;
 		voice.volume = 0xf;
 		voice.counter = 0;
+		voice.clock = 0;
 		voice.key = false;
 	}
 
@@ -134,7 +130,6 @@
 {
 	const u32 old_rate = m_rate;
 	m_rate = clock()/16;
-	m_mclock = clock();
 
 	if (old_rate < m_rate)
 	{
@@ -159,19 +154,25 @@
 		if (voice.frequency > 8)
 		{
 			const int v = voice.volume * voice.key;
-			int c = voice.counter;
-			const int step = ((s64(m_mclock) << FREQ_BITS) / float((voice.frequency + 1) * 16 * (m_rate / 32))) + 0.5f;
+			int a = voice.counter;
+			int c = voice.clock;
+			const int step = voice.frequency;
 
 			// add our contribution
 			for (int i = 0; i < samples; i++)
 			{
-				c += step;
-				const int offs = (c >> FREQ_BITS) & 0x1f;
-				m_mixer_buffer[i] += (voice.waveram[offs] * v) >> 3;
+				c += 32;
+				while (c > step)
+				{
+					a = (a + 1) & 0x1f;
+					c -= step+1;
+				}
+				m_mixer_buffer[i] += (voice.waveram[a] * v) >> 3;
 			}
 
 			// update the counter for this voice
-			voice.counter = c;
+			voice.counter = a;
+			voice.clock = c;
 		}
 	}
 
@@ -212,9 +213,9 @@
 		m_stream->update();
 
 		if (offset >= 0x60)
-			offset += (m_channel_list[3 + (m_test >> 6 & 1)].counter >> FREQ_BITS);
+			offset += m_channel_list[3 + (m_test >> 6 & 1)].counter;
 		else if (m_test & 0x40)
-			offset += (m_channel_list[offset >> 5].counter >> FREQ_BITS);
+			offset += m_channel_list[offset >> 5].counter;
 	}
 	return m_channel_list[offset >> 5].waveram[offset & 0x1f];
 }
@@ -237,7 +238,7 @@
 	if (m_test & 0x40)
 	{
 		m_stream->update();
-		offset += (m_channel_list[offset >> 5].counter >> FREQ_BITS);
+		offset += m_channel_list[offset >> 5].counter;
 	}
 	return m_channel_list[offset >> 5].waveram[offset & 0x1f];
 }
@@ -259,9 +260,13 @@
 
 	// test-register bit 5 resets the internal counter
 	if (m_test & 0x20)
-		m_channel_list[offset].counter = ~0;
+	{
+		m_channel_list[offset].counter = 0;
+		m_channel_list[offset].clock = 0;
+	}
+	// TODO: correct?
 	else if (m_channel_list[offset].frequency < 9)
-		m_channel_list[offset].counter |= ((1 << FREQ_BITS) - 1);
+		m_channel_list[offset].clock = 0;
 
 	// update frequency
 	if (freq_hi)
diff -Nru mame-0.222+dfsg.1/src/devices/sound/k051649.h mame-0.224+dfsg.1/src/devices/sound/k051649.h
--- mame-0.222+dfsg.1/src/devices/sound/k051649.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/k051649.h	2020-08-26 08:57:19.000000000 +0000
@@ -46,6 +46,7 @@
 	{
 		sound_channel() :
 			counter(0),
+			clock(0),
 			frequency(0),
 			volume(0),
 			key(false)
@@ -53,11 +54,12 @@
 			std::fill(std::begin(waveram), std::end(waveram), 0);
 		}
 
-		u64 counter;
-		int frequency;
-		int volume;
-		bool key;
-		s8 waveram[32];
+		u8 counter;     // address counter for wavetable
+		u32 clock;      // internal clock
+		u16 frequency;  // frequency; result: (input clock / (32 * (frequency + 1)))
+		int volume;     // volume
+		bool key;       // keyon/off
+		s8 waveram[32]; // 32 byte wavetable
 	};
 
 	void make_mixer_table(int voices);
@@ -66,7 +68,6 @@
 
 	/* global sound parameters */
 	sound_stream *m_stream;
-	int m_mclock;
 	int m_rate;
 
 	/* mixer tables and internal buffers */
diff -Nru mame-0.222+dfsg.1/src/devices/sound/k053260.cpp mame-0.224+dfsg.1/src/devices/sound/k053260.cpp
--- mame-0.222+dfsg.1/src/devices/sound/k053260.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/k053260.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -65,7 +65,6 @@
 
 // device type definition
 DEFINE_DEVICE_TYPE(K053260, k053260_device, "k053260", "K053260 KDSC")
-	;
 
 
 // Pan multipliers.  Set according to integer angles in degrees, amusingly.
@@ -210,7 +209,7 @@
 
 		case 0x2e: // read ROM
 			if (m_mode & 1)
-				ret = m_voice[0].read_rom();
+				ret = m_voice[0].read_rom(!(machine().side_effects_disabled()));
 			else
 				logerror("%s: Attempting to read K053260 ROM without mode bit set\n", machine().describe_context());
 			break;
@@ -494,11 +493,12 @@
 	outputs[1] += (m_output * m_pan_volume[1]) >> 15;
 }
 
-u8 k053260_device::KDSC_Voice::read_rom()
+u8 k053260_device::KDSC_Voice::read_rom(bool side_effects)
 {
 	u32 offs = m_start + m_position;
 
-	m_position = (m_position + 1) & 0xffff;
+	if (side_effects)
+		m_position = (m_position + 1) & 0xffff;
 
 	return m_device.read_byte(offs);
 }
diff -Nru mame-0.222+dfsg.1/src/devices/sound/k053260.h mame-0.224+dfsg.1/src/devices/sound/k053260.h
--- mame-0.222+dfsg.1/src/devices/sound/k053260.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/k053260.h	2020-08-26 08:57:19.000000000 +0000
@@ -81,7 +81,7 @@
 		inline void key_off();
 		inline void play(stream_sample_t *outputs);
 		inline bool playing() { return m_playing; }
-		inline u8 read_rom();
+		inline u8 read_rom(bool side_effects);
 
 	private:
 		// pointer to owning device
diff -Nru mame-0.222+dfsg.1/src/devices/sound/k054539.cpp mame-0.224+dfsg.1/src/devices/sound/k054539.cpp
--- mame-0.222+dfsg.1/src/devices/sound/k054539.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/k054539.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -483,9 +483,12 @@
 	case 0x22d:
 		if(regs[0x22f] & 0x10) {
 			uint8_t res = (rom_addr == 0x80) ? ram[cur_ptr] : read_byte((0x20000*rom_addr)+cur_ptr);
-			cur_ptr++;
-			if(cur_ptr == cur_limit)
-				cur_ptr = 0;
+			if (!machine().side_effects_disabled())
+			{
+				cur_ptr++;
+				if(cur_ptr == cur_limit)
+					cur_ptr = 0;
+			}
 			return res;
 		} else
 			return 0;
diff -Nru mame-0.222+dfsg.1/src/devices/sound/k054539.h mame-0.224+dfsg.1/src/devices/sound/k054539.h
--- mame-0.222+dfsg.1/src/devices/sound/k054539.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/k054539.h	2020-08-26 08:57:19.000000000 +0000
@@ -20,6 +20,8 @@
 					   public device_rom_interface<24>
 {
 public:
+	static constexpr feature_type imperfect_features() { return feature::SOUND; } // effector and/or some registers aren't verified/emulated
+
 	// control flags, may be set at DRIVER_INIT().
 	enum {
 		RESET_FLAGS     = 0,
diff -Nru mame-0.222+dfsg.1/src/devices/sound/ks0164.cpp mame-0.224+dfsg.1/src/devices/sound/ks0164.cpp
--- mame-0.222+dfsg.1/src/devices/sound/ks0164.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/ks0164.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -134,15 +134,6 @@
 	if(m_mpu_status & MPUS_RX_FULL)
 		res |= 0x40;
 
-	static std::string pc;
-	static u8 pr;
-
-	std::string cc = machine().describe_context();
-	if(pc != cc || pr != res) {
-		//      logerror("status read %02x (%s)\n", res, cc);
-		pc = cc;
-		pr = res;
-	}
 	return res;
 }
 
diff -Nru mame-0.222+dfsg.1/src/devices/sound/okim9810.cpp mame-0.224+dfsg.1/src/devices/sound/okim9810.cpp
--- mame-0.222+dfsg.1/src/devices/sound/okim9810.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/okim9810.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -16,6 +16,9 @@
 #include "emu.h"
 #include "okim9810.h"
 
+#define VERBOSE 0
+#include "logmacro.h"
+
 
 //**************************************************************************
 //  GLOBAL VARIABLES
@@ -135,26 +138,28 @@
 	{
 		okim_voice *voice = &m_voice[i];
 
+		// can't use STRUCT_MEMBER on nested structs
 		save_item(NAME(voice->m_adpcm.m_signal), i);
 		save_item(NAME(voice->m_adpcm.m_step), i);
 		save_item(NAME(voice->m_adpcm2.m_signal), i);
 		save_item(NAME(voice->m_adpcm2.m_step), i);
-		save_item(NAME(voice->m_playbackAlgo), i);
-		save_item(NAME(voice->m_looping), i);
-		save_item(NAME(voice->m_startFlags), i);
-		save_item(NAME(voice->m_endFlags), i);
-		save_item(NAME(voice->m_base_offset), i);
-		save_item(NAME(voice->m_count), i);
-		save_item(NAME(voice->m_samplingFreq), i);
-		save_item(NAME(voice->m_playing), i);
-		save_item(NAME(voice->m_sample), i);
-		save_item(NAME(voice->m_channel_volume), i);
-		save_item(NAME(voice->m_pan_volume_left), i);
-		save_item(NAME(voice->m_pan_volume_right), i);
-		save_item(NAME(voice->m_startSample), i);
-		save_item(NAME(voice->m_endSample), i);
-		save_item(NAME(voice->m_interpSampleNum), i);
 	}
+
+	save_item(STRUCT_MEMBER(m_voice, m_playbackAlgo));
+	save_item(STRUCT_MEMBER(m_voice, m_looping));
+	save_item(STRUCT_MEMBER(m_voice, m_startFlags));
+	save_item(STRUCT_MEMBER(m_voice, m_endFlags));
+	save_item(STRUCT_MEMBER(m_voice, m_base_offset));
+	save_item(STRUCT_MEMBER(m_voice, m_count));
+	save_item(STRUCT_MEMBER(m_voice, m_samplingFreq));
+	save_item(STRUCT_MEMBER(m_voice, m_playing));
+	save_item(STRUCT_MEMBER(m_voice, m_sample));
+	save_item(STRUCT_MEMBER(m_voice, m_channel_volume));
+	save_item(STRUCT_MEMBER(m_voice, m_pan_volume_left));
+	save_item(STRUCT_MEMBER(m_voice, m_pan_volume_right));
+	save_item(STRUCT_MEMBER(m_voice, m_startSample));
+	save_item(STRUCT_MEMBER(m_voice, m_endSample));
+	save_item(STRUCT_MEMBER(m_voice, m_interpSampleNum));
 }
 
 
@@ -263,14 +268,14 @@
 	{
 		case 0x00:  // START
 		{
-			osd_printf_debug("START channel mask %02x\n", m_TMP_register);
+			LOG("START channel mask %02x\n", m_TMP_register);
 			uint8_t channelMask = 0x01;
 			for (int i = 0; i < OKIM9810_VOICES; i++, channelMask <<= 1)
 			{
 				if (channelMask & m_TMP_register)
 				{
 					m_voice[i].m_playing = true;
-					osd_printf_debug("\t\tPlaying channel %d: encoder type %d @ %dhz (volume = %d %d).  From %08x for %d samples (looping=%d).\n",
+					LOG("\t\tPlaying channel %d: encoder type %d @ %dhz (volume = %d %d).  From %08x for %d samples (looping=%d).\n",
 										i,
 										m_voice[i].m_playbackAlgo,
 										m_voice[i].m_samplingFreq,
@@ -285,52 +290,52 @@
 		}
 		case 0x01:  // STOP
 		{
-			osd_printf_debug("STOP  channel mask %02x\n", m_TMP_register);
+			LOG("STOP  channel mask %02x\n", m_TMP_register);
 			uint8_t channelMask = 0x01;
 			for (int i = 0; i < OKIM9810_VOICES; i++, channelMask <<= 1)
 			{
 				if (channelMask & m_TMP_register)
 				{
 					m_voice[i].m_playing = false;
-					osd_printf_debug("\tChannel %d stopping.\n", i);
+					LOG("\tChannel %d stopping.\n", i);
 				}
 			}
 			break;
 		}
 		case 0x02:  // LOOP
 		{
-			osd_printf_debug("LOOP  channel mask %02x\n", m_TMP_register);
+			LOG("LOOP  channel mask %02x\n", m_TMP_register);
 			uint8_t channelMask = 0x01;
 			for (int i = 0; i < OKIM9810_VOICES; i++, channelMask <<= 1)
 			{
 				if (channelMask & m_TMP_register)
 				{
 					m_voice[i].m_looping = true;
-					osd_printf_debug("\tChannel %d looping.\n", i);
+					LOG("\tChannel %d looping.\n", i);
 				}
 				else
 				{
 					m_voice[i].m_looping = false;
-					osd_printf_debug("\tChannel %d done looping.\n", i);
+					LOG("\tChannel %d done looping.\n", i);
 				}
 			}
 			break;
 		}
 		case 0x03:  // OPT (options)
 		{
-			osd_printf_debug("OPT   complex data %02x\n", m_TMP_register);
+			LOG("OPT   complex data %02x\n", m_TMP_register);
 			m_global_volume = (m_TMP_register & 0x18) >> 3;
 			m_filter_type =   (m_TMP_register & 0x06) >> 1;
 			m_output_level =  (m_TMP_register & 0x01);
-			osd_printf_debug("\tOPT setting main volume scale to Vdd/%d\n", m_global_volume+1);
-			osd_printf_debug("\tOPT setting output filter type to %d\n", m_filter_type);
-			osd_printf_debug("\tOPT setting output amp level to %d\n", m_output_level);
+			LOG("\tOPT setting main volume scale to Vdd/%d\n", m_global_volume+1);
+			LOG("\tOPT setting output filter type to %d\n", m_filter_type);
+			LOG("\tOPT setting output amp level to %d\n", m_output_level);
 			break;
 		}
 		case 0x04:  // MUON (silence)
 		{
-			osd_printf_warning("MUON  channel %d length %02x\n", channel, m_TMP_register);
-			osd_printf_warning("MSM9810: UNIMPLEMENTED COMMAND!\n");
+			logerror("MUON  channel %d length %02x\n", channel, m_TMP_register);
+			logerror("MSM9810: UNIMPLEMENTED COMMAND!\n");
 			break;
 		}
 
@@ -379,10 +384,10 @@
 				m_voice[channel].m_playbackAlgo == ADPCM2_PLAYBACK)
 				m_voice[channel].m_count *= 2;
 			else if (m_voice[channel].m_playbackAlgo == NONLINEAR8_PLAYBACK)
-				osd_printf_warning("MSM9810: UNIMPLEMENTED PLAYBACK METHOD %d\n", m_voice[channel].m_playbackAlgo);
+				logerror("MSM9810: UNIMPLEMENTED PLAYBACK METHOD %d\n", m_voice[channel].m_playbackAlgo);
 
-			osd_printf_debug("FADR  channel %d phrase offset %02x => ", channel, m_TMP_register);
-			osd_printf_debug("startFlags(%02x) startAddr(%06x) endFlags(%02x) endAddr(%06x) bytes(%d)\n", startFlags, startAddr, endFlags, endAddr, endAddr-startAddr);
+			LOG("FADR  channel %d phrase offset %02x => ", channel, m_TMP_register);
+			LOG("startFlags(%02x) startAddr(%06x) endFlags(%02x) endAddr(%06x) bytes(%d)\n", startFlags, startAddr, endFlags, endAddr, endAddr-startAddr);
 			break;
 		}
 
@@ -407,20 +412,20 @@
 					m_voice[channel].m_playbackAlgo == ADPCM2_PLAYBACK)
 					m_voice[channel].m_count *= 2;
 				else if (m_voice[channel].m_playbackAlgo == NONLINEAR8_PLAYBACK)
-					osd_printf_warning("MSM9810: UNIMPLEMENTED PLAYBACK METHOD %d\n", m_voice[channel].m_playbackAlgo);
+					logerror("MSM9810: UNIMPLEMENTED PLAYBACK METHOD %d\n", m_voice[channel].m_playbackAlgo);
 
-				osd_printf_debug("startFlags(%02x) startAddr(%06x) endAddr(%06x) bytes(%d)\n", startFlags, startAddr, endAddr, endAddr-startAddr);
+				LOG("startFlags(%02x) startAddr(%06x) endAddr(%06x) bytes(%d)\n", startFlags, startAddr, endAddr, endAddr-startAddr);
 			}
 			else
 			{
-				osd_printf_warning("MSM9810: UNKNOWN COMMAND!\n");
+				logerror("MSM9810: UNKNOWN COMMAND!\n");
 			}
 			break;
 		}
 		case 0x07:  // CVOL (channel volume)
 		{
-			osd_printf_debug("CVOL  channel %d data %02x\n", channel, m_TMP_register);
-			osd_printf_debug("\tChannel %d -> volume index %d.\n", channel, m_TMP_register & 0x0f);
+			LOG("CVOL  channel %d data %02x\n", channel, m_TMP_register);
+			LOG("\tChannel %d -> volume index %d.\n", channel, m_TMP_register & 0x0f);
 
 			m_voice[channel].m_channel_volume = m_TMP_register & 0x0f;
 			break;
@@ -429,15 +434,15 @@
 		{
 			const uint8_t leftVolIndex = (m_TMP_register & 0xf0) >> 4;
 			const uint8_t rightVolIndex = m_TMP_register & 0x0f;
-			osd_printf_debug("PAN   channel %d left index: %02x right index: %02x (%02x)\n", channel, leftVolIndex, rightVolIndex, m_TMP_register);
-			osd_printf_debug("\tChannel %d left -> %d right -> %d\n", channel, leftVolIndex, rightVolIndex);
+			LOG("PAN   channel %d left index: %02x right index: %02x (%02x)\n", channel, leftVolIndex, rightVolIndex, m_TMP_register);
+			LOG("\tChannel %d left -> %d right -> %d\n", channel, leftVolIndex, rightVolIndex);
 			m_voice[channel].m_pan_volume_left = leftVolIndex;
 			m_voice[channel].m_pan_volume_right = rightVolIndex;
 			break;
 		}
 		default:
 		{
-			osd_printf_warning("MSM9810: UNKNOWN COMMAND!\n");
+			logerror("MSM9810: UNKNOWN COMMAND!\n");
 			break;
 		}
 	}
@@ -488,7 +493,7 @@
 			default:
 				break;
 		}
-		osd_printf_debug("DADR direct offset %02x = %02x => ", m_dadr, m_TMP_register);
+		LOG("DADR direct offset %02x = %02x => ", m_dadr, m_TMP_register);
 		m_dadr++;
 	}
 }
diff -Nru mame-0.222+dfsg.1/src/devices/sound/rf5c400.cpp mame-0.224+dfsg.1/src/devices/sound/rf5c400.cpp
--- mame-0.222+dfsg.1/src/devices/sound/rf5c400.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/rf5c400.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -159,41 +159,49 @@
 	save_item(NAME(m_ext_mem_address));
 	save_item(NAME(m_ext_mem_data));
 
-	for (int i = 0; i < ARRAY_LENGTH(m_channels); i++)
-	{
-		save_item(NAME(m_channels[i].startH), i);
-		save_item(NAME(m_channels[i].startL), i);
-		save_item(NAME(m_channels[i].freq), i);
-		save_item(NAME(m_channels[i].endL), i);
-		save_item(NAME(m_channels[i].endHloopH), i);
-		save_item(NAME(m_channels[i].loopL), i);
-		save_item(NAME(m_channels[i].pan), i);
-		save_item(NAME(m_channels[i].effect), i);
-		save_item(NAME(m_channels[i].volume), i);
-		save_item(NAME(m_channels[i].attack), i);
-		save_item(NAME(m_channels[i].decay), i);
-		save_item(NAME(m_channels[i].release), i);
-		save_item(NAME(m_channels[i].cutoff), i);
-		save_item(NAME(m_channels[i].pos), i);
-		save_item(NAME(m_channels[i].step), i);
-		save_item(NAME(m_channels[i].keyon), i);
-		save_item(NAME(m_channels[i].env_phase), i);
-		save_item(NAME(m_channels[i].env_level), i);
-		save_item(NAME(m_channels[i].env_step), i);
-		save_item(NAME(m_channels[i].env_scale), i);
-	}
+	save_item(STRUCT_MEMBER(m_channels, startH));
+	save_item(STRUCT_MEMBER(m_channels, startL));
+	save_item(STRUCT_MEMBER(m_channels, freq));
+	save_item(STRUCT_MEMBER(m_channels, endL));
+	save_item(STRUCT_MEMBER(m_channels, endHloopH));
+	save_item(STRUCT_MEMBER(m_channels, loopL));
+	save_item(STRUCT_MEMBER(m_channels, pan));
+	save_item(STRUCT_MEMBER(m_channels, effect));
+	save_item(STRUCT_MEMBER(m_channels, volume));
+	save_item(STRUCT_MEMBER(m_channels, attack));
+	save_item(STRUCT_MEMBER(m_channels, decay));
+	save_item(STRUCT_MEMBER(m_channels, release));
+	save_item(STRUCT_MEMBER(m_channels, cutoff));
+	save_item(STRUCT_MEMBER(m_channels, pos));
+	save_item(STRUCT_MEMBER(m_channels, step));
+	save_item(STRUCT_MEMBER(m_channels, keyon));
+	save_item(STRUCT_MEMBER(m_channels, env_phase));
+	save_item(STRUCT_MEMBER(m_channels, env_level));
+	save_item(STRUCT_MEMBER(m_channels, env_step));
+	save_item(STRUCT_MEMBER(m_channels, env_scale));
 
 	m_stream = stream_alloc(0, 2, clock() / 384);
 }
 
 //-------------------------------------------------
+//  device_clock_changed - called if the clock
+//  changes
+//-------------------------------------------------
+
+void rf5c400_device::device_clock_changed()
+{
+	m_env_tables.init(clock());
+	m_stream->set_sample_rate(clock() / 384);
+}
+
+//-------------------------------------------------
 //  sound_stream_update - handle a stream update
 //-------------------------------------------------
 
 void rf5c400_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
 {
 	int i, ch;
-	uint32_t end, loop;
+	uint64_t end, loop;
 	uint64_t pos;
 	uint8_t vol, lvol, rvol, type;
 	uint8_t env_phase;
@@ -299,7 +307,7 @@
 			if ((pos>>16) > end)
 			{
 				pos -= loop<<16;
-				pos &= 0xFFFFFF0000U;
+				pos &= 0xFFFFFF0000ULL;
 			}
 
 		}
diff -Nru mame-0.222+dfsg.1/src/devices/sound/rf5c400.h mame-0.224+dfsg.1/src/devices/sound/rf5c400.h
--- mame-0.222+dfsg.1/src/devices/sound/rf5c400.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/rf5c400.h	2020-08-26 08:57:19.000000000 +0000
@@ -21,6 +21,8 @@
 					   public device_rom_interface<25, 1, 0, ENDIANNESS_LITTLE>
 {
 public:
+	static constexpr feature_type imperfect_features() { return feature::SOUND; } // unemulated and/or unverified effects and envelopes
+
 	rf5c400_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	uint16_t rf5c400_r(offs_t offset, uint16_t mem_mask = ~0);
@@ -29,6 +31,7 @@
 protected:
 	// device-level overrides
 	virtual void device_start() override;
+	virtual void device_clock_changed() override;
 
 	// sound stream update overrides
 	virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
diff -Nru mame-0.222+dfsg.1/src/devices/sound/rp2c33_snd.cpp mame-0.224+dfsg.1/src/devices/sound/rp2c33_snd.cpp
--- mame-0.222+dfsg.1/src/devices/sound/rp2c33_snd.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/rp2c33_snd.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,361 @@
+// license:BSD-3-Clause
+// copyright-holders:cam900, Brad Smith, Brezza
+/***************************************************************************
+
+    Ricoh RP2C33 Sound emulation
+
+    Based on:
+    - NSFplay github code by Brad Smith/Brezza
+    - Information from NESDev wiki
+      (https://wiki.nesdev.com/w/index.php/FDS_audio)
+
+    TODO:
+    - verify register behaviors
+    - verify unknown read, writes
+    - Lowpass filter?
+
+***************************************************************************/
+
+#include "emu.h"
+#include "rp2c33_snd.h"
+
+
+//**************************************************************************
+//  GLOBAL VARIABLES
+//**************************************************************************
+
+// device type definition
+DEFINE_DEVICE_TYPE(RP2C33_SOUND, rp2c33_sound_device, "rp2c33_snd", "Ricoh RP2C33 (sound)")
+
+
+//**************************************************************************
+//  LIVE DEVICE
+//**************************************************************************
+
+//-------------------------------------------------
+//  rp2c33_sound_device - constructor
+//-------------------------------------------------
+
+rp2c33_sound_device::rp2c33_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: device_t(mconfig, RP2C33_SOUND, tag, owner, clock)
+	, device_sound_interface(mconfig, *this)
+{
+	std::fill(std::begin(m_wave), std::end(m_wave), 0);
+	std::fill(std::begin(m_mod_table), std::end(m_mod_table), 0);
+	std::fill(std::begin(m_mvol_table), std::end(m_mvol_table), 0);
+}
+
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void rp2c33_sound_device::device_start()
+{
+	// normalize output to 16 bit
+	for (int i = 0; i < 4; i++)
+		m_mvol_table[i] = int((65536.0 / (32.0 * 64.0)) * 2.0 / double(i + 2));
+
+	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock());
+
+	// save states
+	save_item(NAME(m_regs));
+	save_item(NAME(m_wave));
+	save_item(NAME(m_vol_env_disable));
+	save_item(NAME(m_vol_env_mode));
+	save_item(NAME(m_vol_env_spd));
+	save_item(NAME(m_vol_env_clk));
+	save_item(NAME(m_vol_env_out));
+	save_item(NAME(m_wave_halt));
+	save_item(NAME(m_env_halt));
+	save_item(NAME(m_wave_freq));
+	save_item(NAME(m_wave_acc));
+	save_item(NAME(m_wave_addr));
+
+	save_item(NAME(m_mod_env_disable));
+	save_item(NAME(m_mod_env_mode));
+	save_item(NAME(m_mod_env_spd));
+	save_item(NAME(m_mod_env_clk));
+	save_item(NAME(m_mod_env_out));
+	save_item(NAME(m_mod_halt));
+	save_item(NAME(m_mod_freq));
+	save_item(NAME(m_mod_table));
+	save_item(NAME(m_mod_acc));
+	save_item(NAME(m_mod_addr));
+	save_item(NAME(m_mod_pos));
+
+	save_item(NAME(m_env_spd));
+	save_item(NAME(m_wave_write));
+	save_item(NAME(m_mvol));
+	save_item(NAME(m_output));
+}
+
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void rp2c33_sound_device::device_reset()
+{
+}
+
+
+//-------------------------------------------------
+//  device_clock_changed - called if the clock
+//  changes
+//-------------------------------------------------
+
+void rp2c33_sound_device::device_clock_changed()
+{
+	m_stream->set_sample_rate(clock());
+}
+
+//**************************************************************************
+//  READ/WRITE HANDLERS
+//**************************************************************************
+
+u8 rp2c33_sound_device::read(offs_t offset)
+{
+	m_stream->update();
+
+	offset += 0x4080;
+	// TODO: open bus?
+	u8 ret = 0;
+	switch (offset)
+	{
+		case 0x4090: // volume envelope output
+			ret = (m_vol_env_out & 0x3f) | 0x40;
+			break;
+		case 0x4091: // bit 12-19 of accumulator
+			ret = (m_wave_addr << 4) + (m_wave_acc >> 12);
+			break;
+		case 0x4092: // modulator envelope output
+			ret = (m_mod_env_out & 0x3f) | 0x40;
+			break;
+		case 0x4093: // bit 5-11 of modtable address
+			ret = (m_mod_addr >> 5) & 0x7f;
+			break;
+		case 0x4094: // mod counter + gain result
+			break;
+		case 0x4095: // mod counter increment
+			ret = mod_inc[m_mod_table[(m_mod_addr >> 1) & 0x1f]] & 0xf;
+			// bit 4-7 : unknown counter
+			break;
+		case 0x4096: // wavetable value
+			ret = (m_wave[m_wave_addr & 0x3f] & 0x3f) | 0x40;
+			break;
+		case 0x4097: // modulator position
+			ret = m_mod_pos & 0x7f;
+			break;
+	}
+	return ret;
+}
+
+void rp2c33_sound_device::write(offs_t offset, u8 data)
+{
+	m_regs[offset & 0xf] = data;
+	m_stream->update();
+
+	offset += 0x4080;
+	switch (offset)
+	{
+		case 0x4080: // volume envelope
+			m_vol_env_disable = BIT(data, 7);
+			m_vol_env_mode = BIT(data, 6);
+			m_vol_env_spd = data & 0x3f;
+			m_vol_env_clk = 0;
+			if (m_vol_env_disable)
+				m_vol_env_out = m_vol_env_spd;
+			break;
+		case 0x4082: // wave frequency low
+			m_wave_freq = (m_wave_freq & 0xf00) | (data & 0xff);
+			break;
+		case 0x4083: // wave frequency high
+			m_wave_halt = BIT(data, 7);
+			m_env_halt = BIT(data, 6);
+			m_wave_freq = (m_wave_freq & 0x0ff) | ((data & 0xf) << 8);
+			if (m_wave_halt)
+				m_wave_acc = 0;
+			if (m_env_halt)
+				m_vol_env_clk = m_mod_env_clk = 0;
+			break;
+		case 0x4084: // modulator envelope
+			m_mod_env_disable = BIT(data, 7);
+			m_mod_env_mode = BIT(data, 6);
+			m_mod_env_spd = data & 0x3f;
+			m_mod_env_clk = 0;
+			if (m_mod_env_disable)
+				m_mod_env_out = m_mod_env_spd;
+			break;
+		case 0x4085: // modulator position
+			m_mod_pos = data & 0x7f;
+			break;
+		case 0x4086: // modulator frequency low
+			m_mod_freq = (m_mod_freq & 0xf00) | (data & 0xff);
+			break;
+		case 0x4087: // modulator frequency high
+			m_mod_halt = BIT(data, 7);
+			// TODO: bit 6?
+			m_mod_freq = (m_mod_freq & 0x0ff) | ((data & 0xf) << 8);
+			if (m_mod_halt)
+				m_mod_acc = 0;
+			break;
+		case 0x4088: // modulator table
+			if (m_mod_halt)
+			{
+				m_mod_table[(m_mod_addr >> 1) & 0x1f] = data & 7;
+				m_mod_addr += 2;
+			}
+			break;
+		case 0x4089: // wave write, master volume
+			m_wave_write = BIT(data, 7);
+			m_mvol = data & 3;
+			break;
+		case 0x408a: // envelope speed
+			m_env_spd = data;
+			break;
+	}
+}
+
+//-------------------------------------------------
+//  sound_stream_update - handle a stream update
+//-------------------------------------------------
+
+void rp2c33_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
+{
+	for (int i = 0; i < samples; i++)
+	{
+		m_output = 0;
+		if (!m_env_halt && !m_wave_halt)
+		{
+			exec_vol_env();
+			exec_mod_env();
+		}
+		exec_mod();
+		exec_wave();
+		/* Update the buffers */
+		outputs[0][i] = m_output * m_mvol_table[m_mvol];
+	}
+}
+
+//-------------------------------------------------
+//  exec_vol_env - execute volume envelope
+//-------------------------------------------------
+
+inline void rp2c33_sound_device::exec_vol_env()
+{
+	if (!m_vol_env_disable)
+	{
+		const u32 period = ((m_vol_env_spd + 1) * (m_env_spd + 1)) << 3; // input clock / ((overall speed + 1) * (volume envelope speed + 1) * 8)
+		if (++m_vol_env_clk > period)
+		{
+			// clock the envelope
+			if (m_vol_env_mode)
+			{
+				if (m_vol_env_out < 32) ++m_vol_env_out;
+			}
+			else
+			{
+				if (m_vol_env_out >  0) --m_vol_env_out;
+			}
+			m_vol_env_clk = 0;
+		}
+	}
+}
+
+//-------------------------------------------------
+//  exec_mod_env - execute modulator envelope
+//-------------------------------------------------
+
+inline void rp2c33_sound_device::exec_mod_env()
+{
+	if (!m_mod_env_disable)
+	{
+		const u32 period = ((m_mod_env_spd + 1) * (m_env_spd + 1)) << 3; // input clock / ((overall speed + 1) * (modulator envelope speed + 1) * 8)
+		if (++m_mod_env_clk > period)
+		{
+			// clock the envelope
+			if (m_mod_env_mode)
+			{
+				if (m_mod_env_out < 32) ++m_mod_env_out;
+			}
+			else
+			{
+				if (m_mod_env_out >  0) --m_mod_env_out;
+			}
+			m_mod_env_clk = 0;
+		}
+	}
+}
+
+//-------------------------------------------------
+//  exec_mod - execute modulator table
+//-------------------------------------------------
+
+inline void rp2c33_sound_device::exec_mod()
+{
+	if (!m_mod_halt)
+	{
+		m_mod_acc += m_mod_freq; // input clock * frequency / 65536
+		while (m_mod_acc > 0xffff)
+		{
+			int val = m_mod_table[((m_mod_addr++) >> 1) & 0x1f] & 7;
+			m_mod_acc -= (1 << 16);
+			if (val == 4)
+				m_mod_pos = 0;
+			else
+				m_mod_pos = (m_mod_pos + mod_inc[val]) & 0x7f;
+		}
+	}
+}
+
+//-------------------------------------------------
+//  exec_wave - execute wavetable output
+//-------------------------------------------------
+
+inline void rp2c33_sound_device::exec_wave()
+{
+	if (!m_wave_halt)
+	{
+		int mod = 0;
+		if (m_mod_env_out != 0) // skip if modulator off
+		{
+			// convert mod_pos to 7-bit signed
+			int pos = (m_mod_pos & 0x3f) - (m_mod_pos & 0x40);
+
+			// multiply pos by gain,
+			// shift off 4 bits but with odd "rounding" behaviour
+			int temp = pos * m_mod_env_out;
+			int rem = temp & 0x0f;
+			temp >>= 4;
+			if ((rem > 0) && ((temp & 0x80) == 0))
+			{
+				if (pos < 0) temp -= 1;
+				else         temp += 2;
+			}
+
+			// wrap if range is exceeded
+			while (temp >= 192) temp -= 256;
+			while (temp <  -64) temp += 256;
+
+			// multiply result by pitch,
+			// shift off 6 bits, round to nearest
+			temp = m_wave_freq * temp;
+			rem = temp & 0x3f;
+			temp >>= 6;
+			if (rem >= 32) temp += 1;
+
+			mod = temp;
+		}
+
+		// accumulate
+		m_wave_acc += std::max<int>(0, m_wave_freq + mod); // input clock * (frequency + modulator output) / 65536
+		m_wave_addr += m_wave_acc >> 16;
+		m_wave_acc &= 0xffff;
+	}
+
+	// calculate output
+	if (!m_wave_write)
+		m_output = (m_wave[m_wave_addr & 0x3f] - 0x20) * std::min<int>(32, m_vol_env_out);
+
+}
diff -Nru mame-0.222+dfsg.1/src/devices/sound/rp2c33_snd.h mame-0.224+dfsg.1/src/devices/sound/rp2c33_snd.h
--- mame-0.222+dfsg.1/src/devices/sound/rp2c33_snd.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/rp2c33_snd.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,105 @@
+// license:BSD-3-Clause
+// copyright-holders:cam900, Brad Smith, Brezza
+/***************************************************************************
+
+    Ricoh RP2C33 Sound emulation
+
+***************************************************************************/
+
+#ifndef MAME_MACHINE_RP2C33_SND_H
+#define MAME_MACHINE_RP2C33_SND_H
+
+#pragma once
+
+#include <algorithm>
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+// ======================> rp2c33_sound_device
+
+class rp2c33_sound_device : public device_t, public device_sound_interface
+{
+public:
+	static constexpr feature_type imperfect_features() { return feature::SOUND; } // one or more features are not verified, and possibly incorrect
+
+	// construction/destruction
+	rp2c33_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+	// host interface
+	void write(offs_t offset, u8 data);
+	u8 read(offs_t offset);
+
+	// wavetable handlers
+	void wave_w(offs_t offset, u8 data) { if (m_wave_write) { m_stream->update(); m_wave[offset & 0x3f] = data & 0x3f; } }
+	u8 wave_r(offs_t offset) { return (m_wave[offset & 0x3f] & 0x3f) | 0x40; } // TODO: bit 6-7 is open bus? not allowed when wave is not halted?
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+	virtual void device_clock_changed() override;
+
+	// sound stream update overrides
+	virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
+
+private:
+	sound_stream *m_stream = nullptr;
+
+	// sound states
+	u8 m_regs[16];
+	u8 m_wave[64];                  // 64 entries of wavetable, 6 bit unsigned
+
+	bool m_vol_env_disable = true;  // disable volume envelope
+	bool m_vol_env_mode    = false; // volume envelope direction, increase or decrease
+	int m_vol_env_spd      = 0;     // volume envelope speed/gain
+	u32 m_vol_env_clk      = 0;     // volume envelope clock counter
+	int m_vol_env_out      = 0;     // output result of volume envelope
+	bool m_wave_halt       = true;  // halt wavetable
+	bool m_env_halt        = true;  // halt envelope
+	int m_wave_freq        = 0;     // wavetable frequency
+	u32 m_wave_acc         = 0;     // wavetable accumulator (.16 fixed point)
+	u8 m_wave_addr         = 0;     // wavetable address counter (.16 fixed point)
+
+	u8 m_mod_table[32];             // 32 entries of modulator table, 3 bit unsigned
+	bool m_mod_env_disable = true;  // disable modulator envelope
+	bool m_mod_env_mode    = false; // modulator envelope direction, increase or decrease
+	int m_mod_env_spd      = 0;     // modulator envelope speed/gain
+	u32 m_mod_env_clk      = 0;     // modulator envelope clock counter
+	int m_mod_env_out      = 0;     // output result of modulator envelope
+	bool m_mod_halt        = true;  // halt modulator
+	int m_mod_freq         = 0;     // modulator frequency
+	u32 m_mod_acc          = 0;     // modulator accumulator (.16 fixed point)
+	u8 m_mod_addr          = 0;     // modulator table address counter (.16 fixed point)
+	int m_mod_pos          = 0;     // modulator position, 7 bit signed
+
+	int m_env_spd          = 0;     // overall envelope speed
+	bool m_wave_write      = true;  // play sound or write wavetable
+	int m_mvol             = 0;     // master volume
+	int m_output           = 0;     // output result
+	int m_mvol_table[4];            // master volume table
+
+	const int mod_inc[8] = { 0, 1, 2, 4, -4, -4, -2, -1 };
+
+	// inlines
+	inline void exec_vol_env();
+	inline void exec_mod_env();
+
+	inline void exec_mod();
+	inline void exec_wave();
+};
+
+
+// device type definition
+DECLARE_DEVICE_TYPE(RP2C33_SOUND, rp2c33_sound_device)
+
+
+
+//**************************************************************************
+//  GLOBAL VARIABLES
+//**************************************************************************
+
+
+#endif // MAME_MACHINE_RP2C33_SND_H
diff -Nru mame-0.222+dfsg.1/src/devices/sound/saa1099.cpp mame-0.224+dfsg.1/src/devices/sound/saa1099.cpp
--- mame-0.222+dfsg.1/src/devices/sound/saa1099.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/saa1099.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -70,8 +70,10 @@
 #include "emu.h"
 #include "saa1099.h"
 
-#define LEFT    0x00
-#define RIGHT   0x01
+static constexpr int clock_divider = 256;
+
+static constexpr int LEFT   = 0x00;
+static constexpr int RIGHT  = 0x01;
 
 static constexpr u16 amplitude_lookup[16] = {
 		0*32767/16,  1*32767/16,  2*32767/16,   3*32767/16,
@@ -123,7 +125,6 @@
 		0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15 }
 };
 
-
 // device type definition
 DEFINE_DEVICE_TYPE(SAA1099, saa1099_device, "saa1099", "Philips SAA1099")
 
@@ -149,7 +150,6 @@
 	, m_all_ch_enable(false)
 	, m_sync_state(false)
 	, m_selected_reg(0)
-	, m_sample_rate(0.0)
 {
 }
 
@@ -160,11 +160,8 @@
 
 void saa1099_device::device_start()
 {
-	/* copy global parameters */
-	m_sample_rate = clock() / 256;
-
 	/* for each chip allocate one stream */
-	m_stream = stream_alloc(0, 2, m_sample_rate);
+	m_stream = stream_alloc(0, 2, clock()/clock_divider);
 
 	save_item(NAME(m_noise_params));
 	save_item(NAME(m_env_enable));
@@ -184,7 +181,6 @@
 	save_item(STRUCT_MEMBER(m_channels, amplitude));
 	save_item(STRUCT_MEMBER(m_channels, envelope));
 	save_item(STRUCT_MEMBER(m_channels, counter));
-	save_item(STRUCT_MEMBER(m_channels, freq));
 	save_item(STRUCT_MEMBER(m_channels, level));
 
 	save_item(STRUCT_MEMBER(m_noise, counter));
@@ -199,9 +195,7 @@
 
 void saa1099_device::device_clock_changed()
 {
-	m_sample_rate = clock() / 256;
-
-	m_stream->set_sample_rate(m_sample_rate);
+	m_stream->set_sample_rate(clock()/clock_divider);
 }
 
 
@@ -225,10 +219,10 @@
 	{
 		switch (m_noise_params[ch])
 		{
-		case 0: m_noise[ch].freq = clock()/256.0 * 2; break;
-		case 1: m_noise[ch].freq = clock()/512.0 * 2; break;
-		case 2: m_noise[ch].freq = clock()/1024.0 * 2; break;
-		case 3: m_noise[ch].freq = m_channels[ch * 3].freq;   break; // todo: this case will be clock()/[ch*3's octave divisor, 0 is = 256*2, higher numbers are higher] * 2 if the tone generator phase reset bit (0x1c bit 1) is set.
+		case 0:
+		case 1:
+		case 2: m_noise[ch].freq = 256 << m_noise_params[ch]; break;
+		case 3: m_noise[ch].freq = m_channels[ch * 3].freq(); break; // todo: this case will be clock()/[ch*3's octave divisor, 0 is = 256*2, higher numbers are higher] * 2 if the tone generator phase reset bit (0x1c bit 1) is set.
 		}
 	}
 
@@ -240,19 +234,11 @@
 		/* for each channel */
 		for (ch = 0; ch < 6; ch++)
 		{
-			if (m_channels[ch].freq == 0.0)
-				m_channels[ch].freq = (double)((2 * clock() / 512) << m_channels[ch].octave) /
-					(511.0 - (double)m_channels[ch].frequency);
-
 			/* check the actual position in the square wave */
-			m_channels[ch].counter -= m_channels[ch].freq;
-			while (m_channels[ch].counter < 0)
+			while (m_channels[ch].counter <= 0)
 			{
 				/* calculate new frequency now after the half wave is updated */
-				m_channels[ch].freq = (double)((2 * clock() / 512) << m_channels[ch].octave) /
-					(511.0 - (double)m_channels[ch].frequency);
-
-				m_channels[ch].counter += m_sample_rate;
+				m_channels[ch].counter += m_channels[ch].freq();
 				m_channels[ch].level ^= 1;
 
 				/* eventually clock the envelope counters */
@@ -261,27 +247,25 @@
 				if (ch == 4 && m_env_clock[1] == 0)
 					envelope_w(1);
 			}
+			m_channels[ch].counter -= clock_divider;
 
 			// if the noise is enabled
+			u8 level = 0;
 			if (m_channels[ch].noise_enable)
 			{
 				// if the noise level is high (noise 0: chan 0-2, noise 1: chan 3-5)
-				if (m_noise[ch/3].level & 1)
-				{
-					// subtract to avoid overflows, also use only half amplitude
-					output_l -= m_channels[ch].amplitude[ LEFT] * m_channels[ch].envelope[ LEFT] / 16 / 2;
-					output_r -= m_channels[ch].amplitude[RIGHT] * m_channels[ch].envelope[RIGHT] / 16 / 2;
-				}
+				level ^= m_noise[ch/3].level & 1;
 			}
 			// if the square wave is enabled
 			if (m_channels[ch].freq_enable)
 			{
 				// if the channel level is high
-				if (m_channels[ch].level & 1)
-				{
-					output_l += m_channels[ch].amplitude[ LEFT] * m_channels[ch].envelope[ LEFT] / 16;
-					output_r += m_channels[ch].amplitude[RIGHT] * m_channels[ch].envelope[RIGHT] / 16;
-				}
+				level ^= m_channels[ch].level & 1;
+			}
+			if (level)
+			{
+				output_l += m_channels[ch].amplitude[ LEFT] * m_channels[ch].envelope[ LEFT] / 16;
+				output_r += m_channels[ch].amplitude[RIGHT] * m_channels[ch].envelope[RIGHT] / 16;
 			}
 		}
 
@@ -290,15 +274,15 @@
 			/* update the state of the noise generator
 			 * polynomial is x^18 + x^11 + x (i.e. 0x20400) and is a plain XOR, initial state is probably all 1s
 			 * see http://www.vogons.org/viewtopic.php?f=9&t=51695 */
-			m_noise[ch].counter -= m_noise[ch].freq;
-			while (m_noise[ch].counter < 0)
+			while (m_noise[ch].counter <= 0)
 			{
-				m_noise[ch].counter += m_sample_rate;
+				m_noise[ch].counter += m_noise[ch].freq; // clock / ((511 - frequency) * 2^(8 - octave)) or clock / 2^(8 + noise period)
 				if( ((m_noise[ch].level & 0x20000) == 0) != ((m_noise[ch].level & 0x0400) == 0) )
 					m_noise[ch].level = (m_noise[ch].level << 1) | 1;
 				else
 					m_noise[ch].level <<= 1;
 			}
+			m_noise[ch].counter -= clock_divider;
 		}
 		/* write sound data to the buffer */
 		outputs[LEFT][j] = output_l / 6;
@@ -434,7 +418,7 @@
 			for (int i = 0; i < 6; i++)
 			{
 				m_channels[i].level = 0;
-				m_channels[i].counter = 0.0;
+				m_channels[i].counter = m_channels[i].freq();
 			}
 		}
 		break;
diff -Nru mame-0.222+dfsg.1/src/devices/sound/saa1099.h mame-0.224+dfsg.1/src/devices/sound/saa1099.h
--- mame-0.222+dfsg.1/src/devices/sound/saa1099.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/saa1099.h	2020-08-26 08:57:19.000000000 +0000
@@ -47,22 +47,19 @@
 		u8 envelope[2];             // envelope (0x00..0x0f or 0x10 == off)
 
 		/* vars to simulate the square wave */
-		double counter = 0.0;
-		double freq = 0.0;
+		inline u32 freq() const { return (511 - frequency) << (8 - octave); } // clock / ((511 - frequency) * 2^(8 - octave))
+		int counter = 0;
 		u8 level = 0;
 	};
 
 	struct saa1099_noise
 	{
-		saa1099_noise() { (void)pad; }
+		saa1099_noise() { }
 
 		/* vars to simulate the noise generator output */
-		double counter = 0.0;
-		double freq = 0.0;
+		int counter = 0;
+		int freq = 0;
 		u32 level = 0xffffffffU;    // noise polynomial shifter
-
-	private:
-		u32 pad; // pad out structure to multiple of sizeof(double)
 	};
 
 	void envelope_w(int ch);
@@ -80,7 +77,6 @@
 	u8 m_selected_reg;              // selected register
 	saa1099_channel m_channels[6];  // channels
 	saa1099_noise m_noise[2];       // noise generators
-	double m_sample_rate;
 };
 
 DECLARE_DEVICE_TYPE(SAA1099, saa1099_device)
diff -Nru mame-0.222+dfsg.1/src/devices/sound/sp0250.cpp mame-0.224+dfsg.1/src/devices/sound/sp0250.cpp
--- mame-0.222+dfsg.1/src/devices/sound/sp0250.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/sp0250.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -5,50 +5,39 @@
 
    By O. Galibert.
 
-   Unknown:
-   - Exact clock divider
-   - Exact noise algorithm
-   - Exact noise pitch (probably ok)
-   - 7 bits output mapping
-   - Whether the pitch starts counting from 0 or 1
-
    Unimplemented:
    - Direct Data test mode (pin 7)
-
-   Sound quite reasonably already though.
 */
 
 #include "emu.h"
 #include "sp0250.h"
 
-/*
-standard external clock is 3.12MHz
-the chip provides a 445.7kHz output clock, which is = 3.12MHz / 7
-therefore I expect the clock divider to be a multiple of 7
-Also there are 6 cascading filter stages so I expect the divider to be a multiple of 6.
+//
+// Input clock is divided by 2 to make ROMCLOCK.
+// Output is via pulse-width modulation (PWM) over the course of 39 ROMCLOCKs.
+// 4 PWM periods per frame.
+//
+static constexpr int PWM_CLOCKS = 39;
 
-The SP0250 manual states that the original speech is sampled at 10kHz, so the divider
-should be 312, but 312 = 39*8 so it doesn't look right because a divider by 39 is unlikely.
-
-7*6*8 = 336 gives a 9.286kHz sample rate and matches the samples from the Sega boards.
-*/
-#define CLOCK_DIVIDER (7*6*8)
 
 DEFINE_DEVICE_TYPE(SP0250, sp0250_device, "sp0250", "GI SP0250 LPC")
 
 sp0250_device::sp0250_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, SP0250, tag, owner, clock),
 	device_sound_interface(mconfig, *this),
+	m_pwm_mode(false),
+	m_pwm_index(PWM_CLOCKS),
+	m_pwm_count(0),
+	m_pwm_counts(0),
+	m_voiced(0),
 	m_amp(0),
+	m_lfsr(0x7fff),
 	m_pitch(0),
-	m_repeat(0),
 	m_pcount(0),
+	m_repeat(0),
 	m_rcount(0),
-	m_playing(0),
-	m_RNG(0),
-	m_stream(nullptr),
-	m_voiced(0),
 	m_fifo_pos(0),
+	m_stream(nullptr),
 	m_drq(*this)
 {
 	for (auto & elem : m_fifo)
@@ -71,29 +60,55 @@
 
 void sp0250_device::device_start()
 {
-	m_RNG = 1;
+	// output PWM data at the ROMCLOCK frequency
+	int sample_rate = clock() / 2;
+	int frame_rate = sample_rate / (4 * PWM_CLOCKS);
+	if (!m_pwm_mode)
+		m_stream = machine().sound().stream_alloc(*this, 0, 1, frame_rate);
+	else
+		m_stream = machine().sound().stream_alloc(*this, 0, 1, sample_rate);
+
+	// if a DRQ callback is offered, run a timer at the frame rate
+	// to ensure the DRQ gets picked up in a timely manner
 	m_drq.resolve_safe();
 	if (!m_drq.isnull())
 	{
 		m_drq(ASSERT_LINE);
-		m_tick_timer= machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(sp0250_device::timer_tick), this));
-		m_tick_timer->adjust(attotime::from_hz(clock()) * CLOCK_DIVIDER, 0, attotime::from_hz(clock()) * CLOCK_DIVIDER);
+		attotime period = attotime::from_hz(frame_rate);
+		timer_alloc()->adjust(period, 0, period);
 	}
 
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, clock() / CLOCK_DIVIDER);
+	// PWM state
+	save_item(NAME(m_pwm_index));
+	save_item(NAME(m_pwm_count));
+	save_item(NAME(m_pwm_counts));
 
+	// LPC state
+	save_item(NAME(m_voiced));
 	save_item(NAME(m_amp));
+	save_item(NAME(m_lfsr));
 	save_item(NAME(m_pitch));
-	save_item(NAME(m_repeat));
 	save_item(NAME(m_pcount));
+	save_item(NAME(m_repeat));
 	save_item(NAME(m_rcount));
-	save_item(NAME(m_playing));
-	save_item(NAME(m_RNG));
-	save_item(NAME(m_voiced));
+	for (int index = 0; index < 6; index++)
+	{
+		save_item(NAME(m_filter[index].F), index);
+		save_item(NAME(m_filter[index].B), index);
+		save_item(NAME(m_filter[index].z1), index);
+		save_item(NAME(m_filter[index].z2), index);
+	}
+
+	// FIFO state
 	save_item(NAME(m_fifo));
 	save_item(NAME(m_fifo_pos));
 }
 
+void sp0250_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	m_stream->update();
+}
+
 static uint16_t sp0250_ga(uint8_t v)
 {
 	return (v & 0x1f) << (v>>5);
@@ -140,19 +155,11 @@
 	m_filter[5].F = sp0250_gc(m_fifo[14]);
 	m_fifo_pos = 0;
 	m_drq(ASSERT_LINE);
-
 	m_pcount = 0;
 	m_rcount = 0;
 
 	for (int f = 0; f < 6; f++)
-		m_filter[f].z1 = m_filter[f].z2 = 0;
-
-	m_playing = 1;
-}
-
-TIMER_CALLBACK_MEMBER( sp0250_device::timer_tick )
-{
-	m_stream->update();
+		m_filter[f].reset();
 }
 
 void sp0250_device::write(uint8_t data)
@@ -175,6 +182,77 @@
 	return (m_fifo_pos == 15) ? CLEAR_LINE : ASSERT_LINE;
 }
 
+int8_t sp0250_device::next()
+{
+	if (m_rcount >= m_repeat)
+	{
+		if (m_fifo_pos == 15)
+			load_values();
+		else
+		{
+			// According to http://www.cpcwiki.eu/index.php/SP0256_Measured_Timings
+			// the SP0250 executes "NOPs" with a repeat count of 1 and unchanged
+			// pitch while waiting for input
+			m_repeat = 1;
+			m_pcount = 0;
+			m_rcount = 0;
+		}
+	}
+
+	// 15-bit LFSR algorithm verified by dump from actual hardware
+	// clocks every cycle regardless of voiced/unvoiced setting
+	m_lfsr ^= (m_lfsr ^ (m_lfsr >> 1)) << 15;
+	m_lfsr >>= 1;
+
+	int16_t z0;
+	if (m_voiced)
+		z0 = (m_pcount == 0) ? m_amp : 0;
+	else
+		z0 = (m_lfsr & 1) ? m_amp : -m_amp;
+
+	for (int f = 0; f < 6; f++)
+		z0 = m_filter[f].apply(z0);
+
+	// maximum amp value is effectively 13 bits
+	// reduce to 7 bits; due to filter effects it
+	// may occasionally clip
+	int dac = z0 >> 6;
+	if (dac < -64)
+		dac = -64;
+	if (dac > 63)
+		dac = 63;
+
+	// PWM is divided into 4x 5-bit sections; the lower
+	// bits of the original 7-bit value are added to only
+	// some of the pulses in the following pattern:
+	//
+	//    DAC -64 -> 1,1,1,1
+	//    DAC -63 -> 2,1,1,1
+	//    DAC -62 -> 2,1,2,1
+	//    DAC -61 -> 2,2,2,1
+	//    DAC -60 -> 2,2,2,2
+	//    ...
+	//    DAC  -1 -> 17,17,17,16
+	//    DAC   0 -> 17,17,17,17
+	//    DAC   1 -> 18,17,17,17
+	//    ...
+	//    DAC  60 -> 32,32,32,32
+	//    DAC  61 -> 33,32,32,32
+	//    DAC  62 -> 33,32,33,32
+	//    DAC  63 -> 33,33,33,32
+	m_pwm_counts = (((dac + 68 + 3) >> 2) << 0) +
+				   (((dac + 68 + 1) >> 2) << 8) +
+				   (((dac + 68 + 2) >> 2) << 16) +
+				   (((dac + 68 + 0) >> 2) << 24);
+
+	if (m_pcount++ == m_pitch)
+	{
+		m_pcount = 0;
+		m_rcount++;
+	}
+	return dac;
+}
+
 //-------------------------------------------------
 //  sound_stream_update - handle a stream update
 //-------------------------------------------------
@@ -182,62 +260,49 @@
 void sp0250_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
 {
 	stream_sample_t *output = outputs[0];
-	for (int i = 0; i < samples; i++)
+	if (!m_pwm_mode)
 	{
-		if (m_playing)
+		while (samples-- != 0)
+			*output++ = next() << 8;
+	}
+	else
+	{
+		while (samples != 0)
 		{
-			int16_t z0;
-
-			if (m_voiced)
+			// see where we're at in the current PWM cycle
+			if (m_pwm_index >= PWM_CLOCKS)
 			{
-				if(!m_pcount)
-					z0 = m_amp;
-				else
-					z0 = 0;
-			}
-			else
-			{
-				// Borrowing the ay noise generation LFSR
-				if(m_RNG & 1)
-				{
-					z0 = m_amp;
-					m_RNG ^= 0x24000;
-				}
-				else
-					z0 = -m_amp;
-
-				m_RNG >>= 1;
+				m_pwm_index = 0;
+				if (m_pwm_counts == 0)
+					next();
+				m_pwm_count = m_pwm_counts & 0xff;
+				m_pwm_counts >>= 8;
 			}
 
-			for (int f = 0; f < 6; f++)
+			// determine the value to fill and the number of samples remaining
+			// until it changes
+			stream_sample_t value;
+			int remaining;
+			if (m_pwm_index < m_pwm_count)
 			{
-				z0 += ((m_filter[f].z1 * m_filter[f].F) >> 8)
-					+ ((m_filter[f].z2 * m_filter[f].B) >> 9);
-				m_filter[f].z2 = m_filter[f].z1;
-				m_filter[f].z1 = z0;
+				value = 32767;
+				remaining = m_pwm_count - m_pwm_index;
 			}
-
-			// Physical resolution is only 7 bits, but heh
-
-			// max amplitude is 0x0f80 so we have margin to push up the output
-			output[i] = z0 << 3;
-
-			m_pcount++;
-			if (m_pcount >= m_pitch)
+			else
 			{
-				m_pcount = 0;
-				m_rcount++;
-				if (m_rcount >= m_repeat)
-					m_playing = 0;
+				value = 0;
+				remaining = PWM_CLOCKS - m_pwm_index;
 			}
-		}
-		else
-			output[i] = 0;
 
-		if (!m_playing)
-		{
-			if(m_fifo_pos == 15)
-				load_values();
+			// clamp to the number of samples requested and advance the counters
+			if (remaining > samples)
+				remaining = samples;
+			m_pwm_index += remaining;
+			samples -= remaining;
+
+			// fill the output
+			while (remaining-- != 0)
+				*output++ = value;
 		}
 	}
 }
diff -Nru mame-0.222+dfsg.1/src/devices/sound/sp0250.h mame-0.224+dfsg.1/src/devices/sound/sp0250.h
--- mame-0.222+dfsg.1/src/devices/sound/sp0250.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/sp0250.h	2020-08-26 08:57:19.000000000 +0000
@@ -11,6 +11,7 @@
 	sp0250_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	auto drq() { return m_drq.bind(); }
+	void set_pwm_mode() { m_pwm_mode = true; }
 
 	void write(uint8_t data);
 	uint8_t drq_r();
@@ -18,33 +19,56 @@
 protected:
 	// device-level overrides
 	virtual void device_start() override;
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
 	// sound stream update overrides
 	virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
 
 private:
-	// internal state
-	int16_t m_amp;
-	uint8_t m_pitch;
-	uint8_t m_repeat;
-	int m_pcount, m_rcount;
-	int m_playing;
-	uint32_t m_RNG;
-	sound_stream * m_stream;
-	int m_voiced;
-	uint8_t m_fifo[15];
-	int m_fifo_pos;
-	devcb_write_line m_drq;
+	// internal helpers
+	int8_t next();
+	void load_values();
 
-	struct
+	// state for each filter
+	class filter
 	{
+	public:
+		filter() : z1(0), z2(0) { }
+		void reset() { z1 = z2 = 0; }
+		int16_t apply(int16_t in)
+		{
+			int16_t z0 = in + ((z1 * F) >> 8) + ((z2 * B) >> 9);
+			z2 = z1;
+			z1 = z0;
+			return z0;
+		}
 		int16_t F, B;
 		int16_t z1, z2;
-	} m_filter[6];
+	};
 
-	void load_values();
-	TIMER_CALLBACK_MEMBER( timer_tick );
-	emu_timer * m_tick_timer;
+	// PWM state
+	bool m_pwm_mode;
+	uint8_t m_pwm_index;
+	uint8_t m_pwm_count;
+	uint32_t m_pwm_counts;
+
+	// LPC state
+	bool m_voiced;
+	int16_t m_amp;
+	uint16_t m_lfsr;
+	uint8_t m_pitch;
+	uint8_t m_pcount;
+	uint8_t m_repeat;
+	uint8_t m_rcount;
+	filter m_filter[6];
+
+	// FIFO state
+	uint8_t m_fifo[15];
+	uint8_t m_fifo_pos;
+
+	// external interfacing
+	sound_stream *m_stream;
+	devcb_write_line m_drq;
 };
 
 DECLARE_DEVICE_TYPE(SP0250, sp0250_device)
diff -Nru mame-0.222+dfsg.1/src/devices/sound/ym2151.cpp mame-0.224+dfsg.1/src/devices/sound/ym2151.cpp
--- mame-0.222+dfsg.1/src/devices/sound/ym2151.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/ym2151.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,7 @@
 
 #include "emu.h"
 #include "ym2151.h"
+#include <algorithm>
 
 DEFINE_DEVICE_TYPE(YM2151, ym2151_device, "ym2151", "Yamaha YM2151 OPM")
 DEFINE_DEVICE_TYPE(YM2164, ym2164_device, "ym2164", "Yamaha YM2164 OPP")
@@ -383,15 +384,6 @@
 			dt1_freq[ (j+4)*32 + i ] = -dt1_freq[ (j+0)*32 + i ];
 		}
 	}
-
-	/* calculate noise periods table */
-	for (int i=0; i<32; i++)
-	{
-		int j = (i!=31 ? i : 30);               /* rate 30 and 31 are the same */
-		j = 32-j;
-		j = (65536.0 / (double)(j*32.0));   /* number of samples per one shift of the shift register */
-		noise_tab[i] = j * 64;    /* number of chip clock cycles per one shift */
-	}
 }
 
 void ym2151_device::calculate_timers()
@@ -679,7 +671,7 @@
 
 		case 0x0f:  /* noise mode enable, noise period */
 			noise = v;
-			noise_f = noise_tab[ v & 0x1f ];
+			noise_f = std::max<u32>(2, 32 - (v & 0x1f)); /* rate 30 and 31 are the same */
 			break;
 
 		case 0x10:  /* timer A hi */
@@ -1587,15 +1579,13 @@
 	*   Output of the register is negated (bit0 XOR bit3).
 	*   Simply use bit16 as the noise output.
 	*/
-	noise_p += noise_f;
-	i = (noise_p>>16);     /* number of events (shifts of the shift register) */
-	noise_p &= 0xffff;
-	while (i)
+	noise_p += 2; // 32 clock per noise (2 * sample rate)
+	while (noise_p >= noise_f)
 	{
 		uint32_t j;
 		j = ( (noise_rng ^ (noise_rng>>3) ) & 1) ^ 1;
 		noise_rng = (j<<16) | (noise_rng>>1);
-		i--;
+		noise_p -= noise_f;
 	}
 
 
@@ -1813,7 +1803,7 @@
 	noise     = 0;
 	noise_rng = 0;
 	noise_p   = 0;
-	noise_f   = noise_tab[0];
+	noise_f   = 32;
 
 	csm_req   = 0;
 	status    = 0;
diff -Nru mame-0.222+dfsg.1/src/devices/sound/ym2151.h mame-0.224+dfsg.1/src/devices/sound/ym2151.h
--- mame-0.222+dfsg.1/src/devices/sound/ym2151.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/ym2151.h	2020-08-26 08:57:19.000000000 +0000
@@ -248,8 +248,6 @@
 	*/
 	int32_t       dt1_freq[8*32];         /* 8 DT1 levels, 32 KC values */
 
-	uint32_t      noise_tab[32];          /* 17bit Noise Generator periods */
-
 	// internal state
 	sound_stream *         m_stream;
 	uint8_t                  m_lastreg;
diff -Nru mame-0.222+dfsg.1/src/devices/sound/ymz280b.cpp mame-0.224+dfsg.1/src/devices/sound/ymz280b.cpp
--- mame-0.222+dfsg.1/src/devices/sound/ymz280b.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/ymz280b.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -25,7 +25,7 @@
     hardware currently emulated that uses external handlers.
     It also happens to be the only one using 16-bit PCM.
 
-    Some other drivers (eg. bishi.c, bfm_sc4/5.c) also use ROM readback.
+    Some other drivers (eg. bishi.cpp, bfm_sc4/5.cpp) also use ROM readback.
 
 */
 
@@ -40,11 +40,10 @@
 
 #define MAX_SAMPLE_CHUNK    10000
 
-#define FRAC_BITS           14
-#define FRAC_ONE            (1 << FRAC_BITS)
-#define FRAC_MASK           (FRAC_ONE - 1)
+static constexpr unsigned FRAC_BITS = 9;
+static constexpr s32      FRAC_ONE = 1 << FRAC_BITS;
 
-#define INTERNAL_BUFFER_SIZE    (1 << 15)
+//#define INTERNAL_BUFFER_SIZE    (1 << 15)
 #define INTERNAL_SAMPLE_RATE    (m_master_clock * 2.0)
 
 
@@ -84,14 +83,14 @@
 
 void ymz280b_device::update_step(struct YMZ280BVoice *voice)
 {
-	double frequency;
+	int frequency;
 
 	/* compute the frequency */
 	if (voice->mode == 1)
-		frequency = m_master_clock * (double)((voice->fnum & 0x0ff) + 1) * (1.0 / 256.0);
+		frequency = voice->fnum & 0x0ff;
 	else
-		frequency = m_master_clock * (double)((voice->fnum & 0x1ff) + 1) * (1.0 / 256.0);
-	voice->output_step = (uint32_t)(frequency * (double)FRAC_ONE / INTERNAL_SAMPLE_RATE);
+		frequency = voice->fnum & 0x1ff;
+	voice->output_step = frequency + 1; // ((fnum + 1) * (input clock / 384)) / 256
 }
 
 
@@ -165,7 +164,7 @@
 
 ***********************************************************************************************/
 
-int ymz280b_device::generate_adpcm(struct YMZ280BVoice *voice, int16_t *buffer, int samples)
+int ymz280b_device::generate_adpcm(struct YMZ280BVoice *voice, s16 *buffer, int samples)
 {
 	int position = voice->position;
 	int signal = voice->signal;
@@ -277,7 +276,7 @@
 
 ***********************************************************************************************/
 
-int ymz280b_device::generate_pcm8(struct YMZ280BVoice *voice, int16_t *buffer, int samples)
+int ymz280b_device::generate_pcm8(struct YMZ280BVoice *voice, s16 *buffer, int samples)
 {
 	int position = voice->position;
 	int val;
@@ -292,7 +291,7 @@
 			val = read_byte(position / 2);
 
 			/* output to the buffer, scaling by the volume */
-			*buffer++ = (int8_t)val * 256;
+			*buffer++ = (s8)val * 256;
 			samples--;
 
 			/* next! */
@@ -315,7 +314,7 @@
 			val = read_byte(position / 2);
 
 			/* output to the buffer, scaling by the volume */
-			*buffer++ = (int8_t)val * 256;
+			*buffer++ = (s8)val * 256;
 			samples--;
 
 			/* next! */
@@ -347,7 +346,7 @@
 
 ***********************************************************************************************/
 
-int ymz280b_device::generate_pcm16(struct YMZ280BVoice *voice, int16_t *buffer, int samples)
+int ymz280b_device::generate_pcm16(struct YMZ280BVoice *voice, s16 *buffer, int samples)
 {
 	int position = voice->position;
 	int val;
@@ -359,7 +358,7 @@
 		while (samples)
 		{
 			/* fetch the current value */
-			val = (int16_t)((read_byte(position / 2 + 1) << 8) + read_byte(position / 2 + 0));
+			val = (s16)((read_byte(position / 2 + 1) << 8) + read_byte(position / 2 + 0));
 
 			/* output to the buffer, scaling by the volume */
 			*buffer++ = val;
@@ -382,7 +381,7 @@
 		while (samples)
 		{
 			/* fetch the current value */
-			val = (int16_t)((read_byte(position / 2 + 1) << 8) + read_byte(position / 2 + 0));
+			val = (s16)((read_byte(position / 2 + 1) << 8) + read_byte(position / 2 + 0));
 
 			/* output to the buffer, scaling by the volume */
 			*buffer++ = val;
@@ -430,13 +429,13 @@
 	for (v = 0; v < 8; v++)
 	{
 		struct YMZ280BVoice *voice = &m_voice[v];
-		int16_t prev = voice->last_sample;
-		int16_t curr = voice->curr_sample;
-		int16_t *curr_data = m_scratch.get();
-		int32_t *ldest = lacc;
-		int32_t *rdest = racc;
-		uint32_t new_samples, samples_left;
-		uint32_t final_pos;
+		s16 prev = voice->last_sample;
+		s16 curr = voice->curr_sample;
+		s16 *curr_data = m_scratch.get();
+		s32 *ldest = lacc;
+		s32 *rdest = racc;
+		u32 new_samples, samples_left;
+		u32 final_pos;
 		int remaining = samples;
 		int lvol = voice->output_left;
 		int rvol = voice->output_right;
@@ -446,7 +445,6 @@
 		{
 			/* make sure next sound plays immediately */
 			voice->output_pos = FRAC_ONE;
-
 			continue;
 		}
 
@@ -454,7 +452,7 @@
 		/* interpolate */
 		while (remaining > 0 && voice->output_pos < FRAC_ONE)
 		{
-			int interp_sample = (((int32_t)prev * (FRAC_ONE - voice->output_pos)) + ((int32_t)curr * voice->output_pos)) >> FRAC_BITS;
+			int interp_sample = ((s32(prev) * (FRAC_ONE - voice->output_pos)) + (s32(curr) * voice->output_pos)) >> FRAC_BITS;
 			*ldest++ += interp_sample * lvol;
 			*rdest++ += interp_sample * rvol;
 			voice->output_pos += voice->output_step;
@@ -518,7 +516,7 @@
 			/* interpolate */
 			while (remaining > 0 && voice->output_pos < FRAC_ONE)
 			{
-				int interp_sample = (((int32_t)prev * (FRAC_ONE - voice->output_pos)) + ((int32_t)curr * voice->output_pos)) >> FRAC_BITS;
+				int interp_sample = ((s32(prev) * (FRAC_ONE - voice->output_pos)) + (s32(curr) * voice->output_pos)) >> FRAC_BITS;
 				*ldest++ += interp_sample * lvol;
 				*rdest++ += interp_sample * rvol;
 				voice->output_pos += voice->output_step;
@@ -571,7 +569,7 @@
 
 	/* allocate memory */
 	assert(MAX_SAMPLE_CHUNK < 0x10000);
-	m_scratch = std::make_unique<int16_t[]>(MAX_SAMPLE_CHUNK);
+	m_scratch = std::make_unique<s16[]>(MAX_SAMPLE_CHUNK);
 
 	/* state save */
 	save_item(NAME(m_current_register));
@@ -585,33 +583,31 @@
 	save_item(NAME(m_ext_readlatch));
 	save_item(NAME(m_ext_mem_address_hi));
 	save_item(NAME(m_ext_mem_address_mid));
-	for (int j = 0; j < 8; j++)
-	{
-		save_item(NAME(m_voice[j].playing), j);
-		save_item(NAME(m_voice[j].ended), j);
-		save_item(NAME(m_voice[j].keyon), j);
-		save_item(NAME(m_voice[j].looping), j);
-		save_item(NAME(m_voice[j].mode), j);
-		save_item(NAME(m_voice[j].fnum), j);
-		save_item(NAME(m_voice[j].level), j);
-		save_item(NAME(m_voice[j].pan), j);
-		save_item(NAME(m_voice[j].start), j);
-		save_item(NAME(m_voice[j].stop), j);
-		save_item(NAME(m_voice[j].loop_start), j);
-		save_item(NAME(m_voice[j].loop_end), j);
-		save_item(NAME(m_voice[j].position), j);
-		save_item(NAME(m_voice[j].signal), j);
-		save_item(NAME(m_voice[j].step), j);
-		save_item(NAME(m_voice[j].loop_signal), j);
-		save_item(NAME(m_voice[j].loop_step), j);
-		save_item(NAME(m_voice[j].loop_count), j);
-		save_item(NAME(m_voice[j].output_left), j);
-		save_item(NAME(m_voice[j].output_right), j);
-		save_item(NAME(m_voice[j].output_pos), j);
-		save_item(NAME(m_voice[j].last_sample), j);
-		save_item(NAME(m_voice[j].curr_sample), j);
-		save_item(NAME(m_voice[j].irq_schedule), j);
-	}
+
+	save_item(STRUCT_MEMBER(m_voice, playing));
+	save_item(STRUCT_MEMBER(m_voice, ended));
+	save_item(STRUCT_MEMBER(m_voice, keyon));
+	save_item(STRUCT_MEMBER(m_voice, looping));
+	save_item(STRUCT_MEMBER(m_voice, mode));
+	save_item(STRUCT_MEMBER(m_voice, fnum));
+	save_item(STRUCT_MEMBER(m_voice, level));
+	save_item(STRUCT_MEMBER(m_voice, pan));
+	save_item(STRUCT_MEMBER(m_voice, start));
+	save_item(STRUCT_MEMBER(m_voice, stop));
+	save_item(STRUCT_MEMBER(m_voice, loop_start));
+	save_item(STRUCT_MEMBER(m_voice, loop_end));
+	save_item(STRUCT_MEMBER(m_voice, position));
+	save_item(STRUCT_MEMBER(m_voice, signal));
+	save_item(STRUCT_MEMBER(m_voice, step));
+	save_item(STRUCT_MEMBER(m_voice, loop_signal));
+	save_item(STRUCT_MEMBER(m_voice, loop_step));
+	save_item(STRUCT_MEMBER(m_voice, loop_count));
+	save_item(STRUCT_MEMBER(m_voice, output_left));
+	save_item(STRUCT_MEMBER(m_voice, output_right));
+	save_item(STRUCT_MEMBER(m_voice, output_pos));
+	save_item(STRUCT_MEMBER(m_voice, last_sample));
+	save_item(STRUCT_MEMBER(m_voice, curr_sample));
+	save_item(STRUCT_MEMBER(m_voice, irq_schedule));
 
 #if YMZ280B_MAKE_WAVS
 	m_wavresample = wav_open("resamp.wav", INTERNAL_SAMPLE_RATE, 2);
@@ -868,17 +864,19 @@
 
 int ymz280b_device::compute_status()
 {
-	uint8_t result;
+	u8 result;
 
 	/* force an update */
 	m_stream->update();
 
 	result = m_status_register;
 
-	/* clear the IRQ state */
-	m_status_register = 0;
-	update_irq_state();
-
+	if (!machine().side_effects_disabled())
+	{
+		/* clear the IRQ state */
+		m_status_register = 0;
+		update_irq_state();
+	}
 	return result;
 }
 
@@ -898,9 +896,10 @@
 			return 0xff;
 
 		/* read from external memory */
-		uint8_t ret = m_ext_readlatch;
+		u8 ret = m_ext_readlatch;
 		m_ext_readlatch = read_byte(m_ext_mem_address);
-		m_ext_mem_address = (m_ext_mem_address + 1) & 0xffffff;
+		if (!machine().side_effects_disabled())
+			m_ext_mem_address = (m_ext_mem_address + 1) & 0xffffff;
 		return ret;
 	}
 	else
@@ -924,7 +923,7 @@
 
 DEFINE_DEVICE_TYPE(YMZ280B, ymz280b_device, "ymz280b", "Yamaha YMZ280B PCMD8")
 
-ymz280b_device::ymz280b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+ymz280b_device::ymz280b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
 	: device_t(mconfig, YMZ280B, tag, owner, clock)
 	, device_sound_interface(mconfig, *this)
 	, device_rom_interface(mconfig, *this)
diff -Nru mame-0.222+dfsg.1/src/devices/sound/ymz280b.h mame-0.224+dfsg.1/src/devices/sound/ymz280b.h
--- mame-0.222+dfsg.1/src/devices/sound/ymz280b.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/sound/ymz280b.h	2020-08-26 08:57:19.000000000 +0000
@@ -19,7 +19,7 @@
 class ymz280b_device : public device_t, public device_sound_interface, public device_rom_interface<24>
 {
 public:
-	ymz280b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+	ymz280b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
 
 	// configuration helpers
 	auto irq_handler() { return m_irq_handler.bind(); }
@@ -45,36 +45,36 @@
 	/* struct describing a single playing ADPCM voice */
 	struct YMZ280BVoice
 	{
-		uint8_t playing;          /* 1 if we are actively playing */
-		bool ended;             /* indicate voice has ended in case samples_left is 0 */
+		u8 playing;          /* 1 if we are actively playing */
+		bool ended;          /* indicate voice has ended in case samples_left is 0 */
 
-		uint8_t keyon;            /* 1 if the key is on */
-		uint8_t looping;          /* 1 if looping is enabled */
-		uint8_t mode;             /* current playback mode */
-		uint16_t fnum;            /* frequency */
-		uint8_t level;            /* output level */
-		uint8_t pan;              /* panning */
-
-		uint32_t start;           /* start address, in nibbles */
-		uint32_t stop;            /* stop address, in nibbles */
-		uint32_t loop_start;      /* loop start address, in nibbles */
-		uint32_t loop_end;        /* loop end address, in nibbles */
-		uint32_t position;        /* current position, in nibbles */
-
-		int32_t signal;           /* current ADPCM signal */
-		int32_t step;             /* current ADPCM step */
-
-		int32_t loop_signal;      /* signal at loop start */
-		int32_t loop_step;        /* step at loop start */
-		uint32_t loop_count;      /* number of loops so far */
-
-		int32_t output_left;      /* output volume (left) */
-		int32_t output_right;     /* output volume (right) */
-		int32_t output_step;      /* step value for frequency conversion */
-		int32_t output_pos;       /* current fractional position */
-		int16_t last_sample;      /* last sample output */
-		int16_t curr_sample;      /* current sample target */
-		uint8_t irq_schedule;     /* 1 if the IRQ state is updated by timer */
+		u8 keyon;            /* 1 if the key is on */
+		u8 looping;          /* 1 if looping is enabled */
+		u8 mode;             /* current playback mode */
+		u16 fnum;            /* frequency */
+		u8 level;            /* output level */
+		u8 pan;              /* panning */
+
+		u32 start;           /* start address, in nibbles */
+		u32 stop;            /* stop address, in nibbles */
+		u32 loop_start;      /* loop start address, in nibbles */
+		u32 loop_end;        /* loop end address, in nibbles */
+		u32 position;        /* current position, in nibbles */
+
+		s32 signal;          /* current ADPCM signal */
+		s32 step;            /* current ADPCM step */
+
+		s32 loop_signal;     /* signal at loop start */
+		s32 loop_step;       /* step at loop start */
+		u32 loop_count;      /* number of loops so far */
+
+		s32 output_left;     /* output volume (left) */
+		s32 output_right;    /* output volume (right) */
+		s32 output_step;     /* step value for frequency conversion */
+		s32 output_pos;      /* current fractional position */
+		s16 last_sample;     /* last sample output */
+		s16 curr_sample;     /* current sample target */
+		u8 irq_schedule;     /* 1 if the IRQ state is updated by timer */
 
 		emu_timer *timer;
 	};
@@ -83,31 +83,31 @@
 	void update_step(struct YMZ280BVoice *voice);
 	void update_volumes(struct YMZ280BVoice *voice);
 	void update_irq_state_timer_common(int voicenum);
-	int generate_adpcm(struct YMZ280BVoice *voice, int16_t *buffer, int samples);
-	int generate_pcm8(struct YMZ280BVoice *voice, int16_t *buffer, int samples);
-	int generate_pcm16(struct YMZ280BVoice *voice, int16_t *buffer, int samples);
+	int generate_adpcm(struct YMZ280BVoice *voice, s16 *buffer, int samples);
+	int generate_pcm8(struct YMZ280BVoice *voice, s16 *buffer, int samples);
+	int generate_pcm16(struct YMZ280BVoice *voice, s16 *buffer, int samples);
 	void write_to_register(int data);
 	int compute_status();
 
 	// internal state
 	struct YMZ280BVoice m_voice[8];   /* the 8 voices */
-	uint8_t m_current_register;         /* currently accessible register */
-	uint8_t m_status_register;          /* current status register */
-	uint8_t m_irq_state;                /* current IRQ state */
-	uint8_t m_irq_mask;                 /* current IRQ mask */
-	uint8_t m_irq_enable;               /* current IRQ enable */
-	uint8_t m_keyon_enable;             /* key on enable */
-	uint8_t m_ext_mem_enable;           /* external memory enable */
-	uint8_t m_ext_readlatch;            /* external memory prefetched data */
-	uint32_t m_ext_mem_address_hi;
-	uint32_t m_ext_mem_address_mid;
-	uint32_t m_ext_mem_address;         /* where the CPU can read the ROM */
+	u8 m_current_register;            /* currently accessible register */
+	u8 m_status_register;             /* current status register */
+	u8 m_irq_state;                   /* current IRQ state */
+	u8 m_irq_mask;                    /* current IRQ mask */
+	u8 m_irq_enable;                  /* current IRQ enable */
+	u8 m_keyon_enable;                /* key on enable */
+	u8 m_ext_mem_enable;              /* external memory enable */
+	u8 m_ext_readlatch;               /* external memory prefetched data */
+	u32 m_ext_mem_address_hi;
+	u32 m_ext_mem_address_mid;
+	u32 m_ext_mem_address;            /* where the CPU can read the ROM */
 
-	devcb_write_line m_irq_handler;  /* IRQ callback */
+	devcb_write_line m_irq_handler;   /* IRQ callback */
 
 	double m_master_clock;            /* master clock frequency */
 	sound_stream *m_stream;           /* which stream are we using */
-	std::unique_ptr<int16_t[]> m_scratch;
+	std::unique_ptr<s16[]> m_scratch;
 #if YMZ280B_MAKE_WAVS
 	void *m_wavresample;              /* resampled waveform */
 #endif
diff -Nru mame-0.222+dfsg.1/src/devices/video/dp8350.cpp mame-0.224+dfsg.1/src/devices/video/dp8350.cpp
--- mame-0.222+dfsg.1/src/devices/video/dp8350.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/dp8350.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -98,6 +98,7 @@
 	, m_dots_per_line(char_width * chars_per_line)
 	, m_dots_per_row(char_width * chars_per_row)
 	, m_video_scan_lines(char_height * rows_per_frame)
+	, m_half_shift(false)
 	, m_lrc_callback(*this)
 	, m_clc_callback(*this)
 	, m_lc_callback(*this)
diff -Nru mame-0.222+dfsg.1/src/devices/video/ef9340_1.cpp mame-0.224+dfsg.1/src/devices/video/ef9340_1.cpp
--- mame-0.222+dfsg.1/src/devices/video/ef9340_1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/ef9340_1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,11 +1,24 @@
 // license:BSD-3-Clause
-// copyright-holders:Wilbert Pol
+// copyright-holders:Wilbert Pol, hap
 /***************************************************************************
 
-    ef9340_1.h
+Thomson EF9340 + EF9341 teletext graphics, this device is a combination of chips.
 
-    Thomson EF9340 + EF9341 teletext graphics chips with 1KB external
-    character ram.
+Minimal components:
+- Thomson EF9340 "VIN"
+- Thomson EF9341 "GEN"
+- 2*1KB RAM, A for attributes, B for character codes
+
+There's also an optional extended character memory, it can be RAM or ROM.
+This is implemented with a callback. The datasheet explains how to hook up
+1KB RAM, but it's possible to have more.
+
+TODO:
+- busy state (right now it is immediate)
+- internal display timing (on g7400, most of it is done externally)
+- read slice from internal ROM
+- window boxing
+- Y zoom
 
 ***************************************************************************/
 
@@ -14,32 +27,27 @@
 
 #include "screen.h"
 
+//#define VERBOSE (LOG_GENERAL)
+#include "logmacro.h"
+
 
 // device type definition
 DEFINE_DEVICE_TYPE(EF9340_1, ef9340_1_device, "ef9340_1", "Thomson EF9340+EF9341")
 
 
-static constexpr uint8_t bgr2rgb[8] =
-{
-	0x00, 0x04, 0x02, 0x06, 0x01, 0x05, 0x03, 0x07
-};
-
-
 ef9340_1_device::ef9340_1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, EF9340_1, tag, owner, clock)
 	, device_video_interface(mconfig, *this)
-	, m_line_timer(nullptr)
 	, m_charset(*this, "ef9340_1")
-//, m_start_vpos(START_Y)
-	//, m_start_vblank(START_Y + SCREEN_HEIGHT)
-	//, m_screen_lines(LINES)
+	, m_write_exram(*this)
+	, m_read_exram(*this)
 {
 }
 
 
 ROM_START( ef9340_1 )
 	ROM_REGION( 0xA00, "ef9340_1", 0 )
-	ROM_LOAD( "charset_ef9340_1.rom", 0x0000, 0x0A00, CRC(d557a7bf) SHA1(d100b0f6a0d5a2d540844bf362788659ed9a6eb4) )
+	ROM_LOAD( "charset_ef9340_1.rom", 0x0000, 0x0a00, BAD_DUMP CRC(8de85988) SHA1(f8e3892234da6626eb4302e171179ada5a51fca8) ) // taken from datasheet
 ROM_END
 
 
@@ -51,41 +59,51 @@
 
 void ef9340_1_device::device_start()
 {
+	m_write_exram.resolve_safe();
+	m_read_exram.resolve_safe(0xff);
+
 	// Let the screen create our temporary bitmap with the screen's dimensions
 	screen().register_screen_bitmap(m_tmp_bitmap);
 
 	m_line_timer = timer_alloc(TIMER_LINE);
-	m_line_timer->adjust( screen().time_until_pos(0, 0), 0,  screen().scan_period() );
+	m_line_timer->adjust( screen().time_until_pos(0, 0), 0, screen().scan_period() );
+
+	m_blink_timer = timer_alloc(TIMER_BLINK);
+	m_blink_timer->adjust( screen().time_until_pos(0, 0), 0, screen().frame_period() );
+
+	// zerofill
+	m_ef9341.TA = 0;
+	m_ef9341.TB = 0;
+	m_ef9341.busy = false;
+
+	m_ef9340.X = 0;
+	m_ef9340.Y = 0;
+	m_ef9340.Y0 = 0;
+	m_ef9340.R = 0;
+	m_ef9340.M = 0;
+	m_ef9340.blink = false;
+	m_ef9340.blink_prescaler = 0;
+	m_ef9340.h_parity = false;
+
+	memset(m_ram_a, 0, sizeof(m_ram_a));
+	memset(m_ram_b, 0, sizeof(m_ram_b));
 
 	// register our state
 	save_item(NAME(m_ef9341.TA));
 	save_item(NAME(m_ef9341.TB));
 	save_item(NAME(m_ef9341.busy));
+
 	save_item(NAME(m_ef9340.X));
 	save_item(NAME(m_ef9340.Y));
 	save_item(NAME(m_ef9340.Y0));
 	save_item(NAME(m_ef9340.R));
 	save_item(NAME(m_ef9340.M));
-	save_pointer(NAME(m_ef934x_ram_a), 1024);
-	save_pointer(NAME(m_ef934x_ram_b), 1024);
-	save_pointer(NAME(m_ef934x_ext_char_ram), 1024);
-}
-
+	save_item(NAME(m_ef9340.blink));
+	save_item(NAME(m_ef9340.blink_prescaler));
+	save_item(NAME(m_ef9340.h_parity));
 
-void ef9340_1_device::device_reset()
-{
-	memset(m_ef934x_ram_a, 0, sizeof(m_ef934x_ram_a));
-	memset(m_ef934x_ram_b, 0, sizeof(m_ef934x_ram_b));
-
-	m_ef9340.X = 0;
-	m_ef9340.Y = 0;
-	m_ef9340.Y0 = 0;
-	m_ef9340.R = 0;
-	m_ef9340.M = 0;
-	m_ef9340.max_vpos = 210;
-	m_ef9341.TA = 0;
-	m_ef9341.TB = 0;
-	m_ef9341.busy = 0;
+	save_item(NAME(m_ram_a));
+	save_item(NAME(m_ram_b));
 }
 
 
@@ -96,6 +114,17 @@
 		case TIMER_LINE:
 			ef9340_scanline(screen().vpos());
 			break;
+
+		case TIMER_BLINK:
+			// blink rate is approximately 0.5s
+			m_ef9340.blink_prescaler = (m_ef9340.blink_prescaler + 1) & 0x1f;
+			if (m_ef9340.R & 0x40 && m_ef9340.blink_prescaler == 24)
+				m_ef9340.blink_prescaler = 0;
+
+			if (m_ef9340.blink_prescaler == 0)
+				m_ef9340.blink = !m_ef9340.blink;
+
+			break;
 	}
 }
 
@@ -110,7 +139,7 @@
 	{
 		return 0x300 | ( ( y & 0x07 ) << 5 ) | ( y & 0x18 ) | ( x & 0x07 );
 	}
-	return y << 5 | x;
+	return ( y & 0x1f ) << 5 | ( x & 0x1f );
 }
 
 
@@ -129,30 +158,16 @@
 }
 
 
-uint16_t ef9340_1_device::external_chargen_address(uint8_t b, uint8_t slice)
-{
-	uint8_t cc = b & 0x7f;
-
-	if ( slice & 8 )
-	{
-		// 0 0 CCE4 CCE3 CCE2 CCE1 CCE0 CCE6 CCE5 ADR0
-		return ( ( cc << 3 ) & 0xf8 ) | ( ( cc >> 4 ) & 0x06) | ( slice & 0x01 );
-	}
-	// CCE6 CCE5 CCE4 CCE3 CCE2 CCE1 CCE0 ADR2 ADR1 ADR0
-	return  ( cc << 3 ) | ( slice & 0x07 );
-}
-
-
 void ef9340_1_device::ef9341_write( uint8_t command, uint8_t b, uint8_t data )
 {
-	logerror("ef9341 %s write, t%s, data %02X\n", command ? "command" : "data", b ? "B" : "A", data );
+	LOG("ef9341 %s write, t%s, data %02X\n", command ? "command" : "data", b ? "B" : "A", data );
 
 	if ( command )
 	{
 		if ( b )
 		{
 			m_ef9341.TB = data;
-			m_ef9341.busy = 0x80;
+			m_ef9341.busy = true;
 			switch( m_ef9341.TB & 0xE0 )
 			{
 			case 0x00:  /* Begin row */
@@ -173,13 +188,14 @@
 				break;
 			case 0xA0:  /* Load R */
 				m_ef9340.R = m_ef9341.TA;
-				m_ef9340.max_vpos = ( m_ef9340.R & 0x40 ) ? 250 : 210;
 				break;
 			case 0xC0:  /* Load Y0 */
 				m_ef9340.Y0 = m_ef9341.TA & 0x3F;
 				break;
+			case 0xE0:  /* Not interpreted */
+				break;
 			}
-			m_ef9341.busy = 0;
+			m_ef9341.busy = false;
 		}
 		else
 		{
@@ -193,52 +209,38 @@
 			uint16_t addr = ef9340_get_c_addr( m_ef9340.X, m_ef9340.Y ) & 0x3ff;
 
 			m_ef9341.TB = data;
-			m_ef9341.busy = 0x80;
+			m_ef9341.busy = true;
 			switch ( m_ef9340.M & 0xE0 )
 			{
 				case 0x00:  /* Write */
-					m_ef934x_ram_a[addr] = m_ef9341.TA;
-					m_ef934x_ram_b[addr] = m_ef9341.TB;
-					ef9340_inc_c();
-					break;
-
-				case 0x20:  /* Read */
-					m_ef9341.TA = m_ef934x_ram_a[addr];
-					m_ef9341.TB = m_ef934x_ram_b[addr];
+					m_ram_a[addr] = m_ef9341.TA;
+					m_ram_b[addr] = m_ef9341.TB;
 					ef9340_inc_c();
 					break;
 
 				case 0x40:  /* Write without increment */
-					m_ef934x_ram_a[addr] = m_ef9341.TA;
-					m_ef934x_ram_b[addr] = m_ef9341.TB;
-					break;
-
-				case 0x60:  /* Read without increment */
-					m_ef9341.TA = m_ef934x_ram_a[addr];
-					m_ef9341.TB = m_ef934x_ram_b[addr];
+					m_ram_a[addr] = m_ef9341.TA;
+					m_ram_b[addr] = m_ef9341.TB;
 					break;
 
 				case 0x80:  /* Write slice */
 					{
-						uint8_t a = m_ef934x_ram_a[addr];
-						uint8_t b = m_ef934x_ram_b[addr];
-						uint8_t slice = ( m_ef9340.M & 0x0f ) % 10;
-
-						if ( b >= 0xa0 )
-						{
-							m_ef934x_ext_char_ram[ ( ( a & 0x80 ) << 3 ) | external_chargen_address( b, slice ) ] = bitswap<8>(m_ef9341.TA,0,1,2,3,4,5,6,7);
-						}
+						uint8_t a = m_ram_a[addr];
+						uint8_t b = m_ram_b[addr];
+						uint8_t slice = m_ef9340.M & 0x0f;
+
+						if (b >= 0xa0)
+							m_write_exram(a << 12 | b << 4 | slice, m_ef9341.TA);
 
 						// Increment slice number
 						m_ef9340.M = ( m_ef9340.M & 0xf0) | ( ( slice + 1 ) % 10 );
 					}
 					break;
 
-				case 0xA0:  /* Read slice */
-				default:
-					fatalerror/*logerror*/("ef9341 unimplemented data action %02X\n", m_ef9340.M & 0xE0 );
+				default:    /* Illegal or Read command */
+					break;
 			}
-			m_ef9341.busy = 0;
+			m_ef9341.busy = false;
 		}
 		else
 		{
@@ -252,7 +254,8 @@
 {
 	uint8_t   data;
 
-	logerror("ef9341 %s read, t%s\n", command ? "command" : "data", b ? "B" : "A" );
+	LOG("ef9341 %s read, t%s\n", command ? "command" : "data", b ? "B" : "A" );
+
 	if ( command )
 	{
 		if ( b )
@@ -261,14 +264,53 @@
 		}
 		else
 		{
-			data = m_ef9341.busy;
+			data = (m_ef9341.busy) ? 0x80 : 0;
 		}
 	}
 	else
 	{
 		if ( b )
 		{
+			uint16_t addr = ef9340_get_c_addr( m_ef9340.X, m_ef9340.Y ) & 0x3ff;
+
 			data = m_ef9341.TB;
+			m_ef9341.busy = true;
+			switch ( m_ef9340.M & 0xE0 )
+			{
+				case 0x20:  /* Read */
+					m_ef9341.TA = m_ram_a[addr];
+					m_ef9341.TB = m_ram_b[addr];
+					ef9340_inc_c();
+					break;
+
+				case 0x60:  /* Read without increment */
+					m_ef9341.TA = m_ram_a[addr];
+					m_ef9341.TB = m_ram_b[addr];
+					break;
+
+				case 0xA0:  /* Read slice */
+					{
+						uint8_t a = m_ram_a[addr];
+						uint8_t b = m_ram_b[addr];
+						uint8_t slice = m_ef9340.M & 0x0f;
+
+						m_ef9341.TA = 0xff;
+						m_ef9341.TB = 0xff;
+
+						if (b >= 0xa0)
+							m_ef9341.TA = m_read_exram(a << 12 | b << 4 | slice);
+						else
+							logerror("ef9341 read slice from internal\n");
+
+						// Increment slice number
+						m_ef9340.M = ( m_ef9340.M & 0xf0) | ( ( slice + 1 ) % 10 );
+					}
+					break;
+
+				default:    /* Illegal or Write command */
+					break;
+			}
+			m_ef9341.busy = false;
 		}
 		else
 		{
@@ -281,119 +323,181 @@
 
 void ef9340_1_device::ef9340_scanline(int vpos)
 {
-	if ( vpos < m_ef9340.max_vpos )
+	for (int i = 0; i < m_tmp_bitmap.width(); i++)
+		m_tmp_bitmap.pix16(vpos, i) = 0;
+
+	vpos -= m_offset_y;
+	if (vpos < 0)
+		return;
+
+	int slice = vpos % 10;
+	bool dh = false;
+	if (vpos == 0)
+		m_ef9340.h_parity = false;
+
+	// display automaton active at 40-290, or 32-242
+	int max_vpos = (m_ef9340.R & 0x40) ? 250 : 210;
+
+	if (m_ef9340.R & 0x01 && vpos < max_vpos)
 	{
-		int y = vpos - 0;
-		int y_row, slice;
+		int y_row = 0;
+		uint16_t char_data = 0x00;
+		uint8_t fg = 0;
+		uint8_t bg = 0;
+		bool underline = false;
+		bool blank = false;
+		bool w_parity = false;
 
-		if ( y < 10 )
+		if ( vpos < 10 )
 		{
 			// Service row
-
-			if ( m_ef9340.R & 0x08 )
+			if (m_ef9340.R & 0x08)
 			{
 				// Service row is enabled
-
 				y_row = 31;
-				slice = y;
 			}
 			else
 			{
 				// Service row is disabled
-
-				for ( int i = 0; i < 40 * 8; i++ )
-				{
-					m_tmp_bitmap.pix16(vpos, 0 + i ) = 24;
-				}
+				for (int i = 0; i < 40 * 8; i++)
+					m_tmp_bitmap.pix16(vpos, i) = 8;
 				return;
 			}
 		}
 		else
 		{
 			// Displaying regular row
-			y_row = (y - 10) / 10;
-			slice = (y - 10) % 10;
+			y_row = ((m_ef9340.Y0 & 0x1f) + (vpos - 10) / 10) % 24;
 		}
 
-		for ( int x = 0; x < 40; x++ )
+		for (int x = 0; x < 40; x++)
 		{
-			uint16_t addr = ef9340_get_c_addr( x, y_row );
-			uint8_t a = m_ef934x_ram_a[addr];
-			uint8_t b = m_ef934x_ram_b[addr];
-			uint8_t fg = 0;
-			uint8_t bg = 0;
-			uint8_t char_data = 0x00;
+			int s = slice;
+			uint16_t addr = ef9340_get_c_addr(x, y_row);
+			uint8_t a = m_ram_a[addr];
+			uint8_t b = m_ram_b[addr];
+			bool blink = m_ef9340.R & 0x80 && m_ef9340.blink;
+			bool cursor = m_ef9340.R & 0x10 && x == m_ef9340.X && y_row == m_ef9340.Y;
+			bool invert = cursor && !blink;
+			bool dw = false;
+			bool del = false;
 
-			if ( a & 0x80 )
+			if (a & 0x80)
 			{
-				// Graphics
-				if ( b & 0x80 )
+				// graphics
+				if ((b & 0xe0) != 0x80)
 				{
-					if ( b & 0x60 )
-					{
-						// Extension
-						char_data = m_ef934x_ext_char_ram[ 0x400 | external_chargen_address( b & 0x7f, slice ) ];
-						fg = bgr2rgb[ a & 0x07 ];
-						bg = bgr2rgb[ ( a >> 4 ) & 0x07 ];
-					}
+					fg = a & 0x07;
+					bg = a >> 4 & 0x07;
+
+					if (b & 0x80)
+						char_data = m_read_exram(a << 12 | b << 4 | s);
+					else
+						char_data = m_charset[((b | 0x80) * 10) + s];
 				}
+
+				// illegal
 				else
-				{
-					// Normal
-					char_data = m_charset[((b | 0x80) * 10) + slice];
-					fg = bgr2rgb[ a & 0x07 ];
-					bg = bgr2rgb[ ( a >> 4 ) & 0x07 ];
-				}
+					char_data = 0xff;
 			}
 			else
 			{
-				// Alphannumeric
-				if ( b & 0x80 )
+				// alphanumeric
+				if ((b & 0xe0) != 0x80)
 				{
-					if ( b & 0x60 )
+					// double height
+					if (a & 0x10)
 					{
-						// Extension
-						char_data = m_ef934x_ext_char_ram[ external_chargen_address( b & 0x7f, slice ) ];
+						dh = true;
+						if (m_ef9340.h_parity)
+							s += 10;
+						if (s > 0)
+							s = (s - 1) / 2;
+					}
 
-						if ( a & 0x40 )
-						{
-							fg = bg;
-							bg = bgr2rgb[ a & 0x07 ];
-						}
-						else
-						{
-							fg = bgr2rgb[ a & 0x07 ];
-						}
+					fg = a & 0x07;
+					u16 c = 0;
+
+					if (b & 0x80)
+						c = m_read_exram(a << 12 | b << 4 | s);
+					else if (s == 9 && underline)
+						c = 0xff;
+					else
+						c = m_charset[((b & 0x7f) * 10) + s];
+
+					// double width
+					dw = bool(a & 0x20);
+					if (dw)
+					{
+						if (!w_parity)
+							char_data = bitswap<16>(c,7,7,6,6,5,5,4,4,3,3,2,2,1,1,0,0);
 					}
 					else
+						char_data = c;
+
+					// inverted
+					if (a & 0x40)
 					{
-						// DEL
-						char_data = 0xff;
-						fg = bgr2rgb[ a & 0x07 ];
+						invert = !invert;
+						blink = m_ef9340.R & 0x80 && !m_ef9340.blink;
 					}
 				}
+
+				// deliminator
 				else
 				{
-					// Normal
-					char_data = m_charset[((b & 0x7f) * 10) + slice];
+					fg = a & 0x07;
+					bg = a >> 4 & 0x07;
+					char_data = 0xff;
 
-					if ( a & 0x40 )
-					{
-						fg = bg;
-						bg = bgr2rgb[ a & 0x07 ];
-					}
-					else
-					{
-						fg = bgr2rgb[ a & 0x07 ];
-					}
+					del = true;
 				}
 			}
 
-			for ( int i = 0; i < 8; i++ )
+			// blink character
+			if (blink && !cursor && (b & 0xe0) != 0x80 && ~a & 0x08)
+				char_data &= ~0xff;
+
+			if (invert)
+				char_data ^= 0xff;
+
+			if (dw)
+				w_parity = !w_parity;
+			else
+				w_parity = false;
+
+			for (int i = 0; i < 8; i++)
 			{
-				m_tmp_bitmap.pix16(vpos, 0 + x*8 + i ) = (char_data & 0x80) ? fg : bg;
-				char_data <<= 1;
+				uint16_t d = blank ? 0 : (char_data & 1) ? fg : bg;
+				m_tmp_bitmap.pix16(m_offset_y + vpos, m_offset_x + x*8 + i) = d | 8;
+				char_data >>= 1;
+			}
+
+			if (del)
+			{
+				blank = m_ef9340.R & 0x04 && b & 0x01;
+				underline = bool(b & 0x04);
 			}
 		}
 	}
+
+	// determine next h parity
+	if (vpos >= 10 && slice == 9)
+	{
+		if (dh)
+			m_ef9340.h_parity = !m_ef9340.h_parity;
+		else
+			m_ef9340.h_parity = false;
+	}
+}
+
+
+uint32_t ef9340_1_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	// note: palette d3 is transparency (datasheet calls it "I"), this handler masks it off
+	for (int y = cliprect.min_y; y <= cliprect.max_y; y++)
+		for (int x = cliprect.min_x; x <= cliprect.max_x; x++)
+			bitmap.pix16(y, x) = m_tmp_bitmap.pix16(y, x) & 7;
+
+	return 0;
 }
diff -Nru mame-0.222+dfsg.1/src/devices/video/ef9340_1.h mame-0.224+dfsg.1/src/devices/video/ef9340_1.h
--- mame-0.222+dfsg.1/src/devices/video/ef9340_1.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/ef9340_1.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,11 +1,8 @@
 // license:BSD-3-Clause
-// copyright-holders:Wilbert Pol
+// copyright-holders:Wilbert Pol, hap
 /***************************************************************************
 
-    ef9340_1.h
-
-    Thomson EF9340 + EF9341 teletext graphics chips with 1KB external
-    character ram.
+    Thomson EF9340 + EF9341 teletext graphics chips
 
 ***************************************************************************/
 
@@ -27,9 +24,15 @@
 		set_screen(std::forward<T>(screen_tag));
 	}
 
+	// configuration helpers
+	ef9340_1_device &set_offsets(int x, int y) { m_offset_x = x; m_offset_y = y; return *this; } // when used with overlay chip
+	auto write_exram() { return m_write_exram.bind(); } // ADR0-ADR3 in a0-a3, B in a4-a11, A in a12-a19
+	auto read_exram() { return m_read_exram.bind(); } // "
+
 	ef9340_1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	inline bitmap_ind16 *get_bitmap() { return &m_tmp_bitmap; }
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	void ef9341_write( uint8_t command, uint8_t b, uint8_t data );
 	uint8_t ef9341_read( uint8_t command, uint8_t b );
@@ -37,45 +40,52 @@
 protected:
 	// device-level overrides
 	virtual void device_start() override;
-	virtual void device_reset() override;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 
 	inline uint16_t ef9340_get_c_addr(uint8_t x, uint8_t y);
 	inline void ef9340_inc_c();
 
-	// Calculate the external chargen address for a character and slice
-	inline uint16_t external_chargen_address(uint8_t b, uint8_t slice);
-
 	void ef9340_scanline(int vpos);
 
 	/* timers */
 	static constexpr device_timer_id TIMER_LINE = 0;
+	static constexpr device_timer_id TIMER_BLINK = 1;
 
 	emu_timer *m_line_timer;
+	emu_timer *m_blink_timer;
 
 	required_region_ptr<uint8_t> m_charset;
 
 	bitmap_ind16 m_tmp_bitmap;
 
+	int m_offset_x = 0;
+	int m_offset_y = 0;
+
 	struct
 	{
-		uint8_t   TA;
-		uint8_t   TB;
-		uint8_t   busy;
+		uint8_t TA;
+		uint8_t TB;
+		bool busy;
 	} m_ef9341;
+
 	struct
 	{
-		uint8_t   X;
-		uint8_t   Y;
-		uint8_t   Y0;
-		uint8_t   R;
-		uint8_t   M;
-		int     max_vpos;
+		uint8_t X;
+		uint8_t Y;
+		uint8_t Y0;
+		uint8_t R;
+		uint8_t M;
+		bool blink;
+		int blink_prescaler;
+		bool h_parity;
 	} m_ef9340;
-	uint8_t   m_ef934x_ram_a[1024];
-	uint8_t   m_ef934x_ram_b[1024];
-	uint8_t   m_ef934x_ext_char_ram[2048];   /* The G7400 has 2KB of external ram hooked up. The datasheet only describes how to hookup 1KB. */
+
+	uint8_t m_ram_a[0x400];
+	uint8_t m_ram_b[0x400];
+
+	devcb_write8 m_write_exram;
+	devcb_read8 m_read_exram;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/video/epic12.cpp mame-0.224+dfsg.1/src/devices/video/epic12.cpp
--- mame-0.222+dfsg.1/src/devices/video/epic12.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/epic12.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -49,7 +49,7 @@
 	m_clip = m_bitmaps->cliprect();
 	m_clip.set(0, 0x2000 - 1, 0, 0x1000 - 1);
 
-#ifdef DEBUG_VRAM_VIEWER
+#if DEBUG_VRAM_VIEWER
 	m_debug_vram_view_en = false;
 	m_prev_screen_width = m_curr_screen_width = screen().width();
 	m_prev_screen_height = m_curr_screen_height = screen().height();
@@ -140,6 +140,23 @@
 	return data;
 }
 
+/*
+    Upload command
+    This command uploads gfx data to VRAM, from Main CPU RAM.
+
+    Offset Bits              Description
+           fedcba98 76543210
+    00     0010---- -------- 0x2 for upload
+           ----0000 00000000 Fixed for upload?
+    02     00000000 00000000 ""
+    04     10011001 10011001 ""
+    06     10011001 10011001 ""
+    08     ---xxxxx xxxxxxxx Destination X start position
+    0a     ----xxxx xxxxxxxx Destination Y start position
+    0c     ---xxxxx xxxxxxxx Source Width
+    0e     ----xxxx xxxxxxxx Source Height
+    10...10 + (Width * Height * 2) Source GFX data (ARGB1555 format)
+*/
 
 inline void epic12_device::gfx_upload_shadow_copy(address_space &space, offs_t *addr)
 {
@@ -301,6 +318,41 @@
 };
 
 
+/*
+    Draw command
+    This command draws gfx data.
+
+    Offset Bits              Description
+           fedcba98 76543210
+    00     0001---- -------- 0x1 for draw
+           ----x--- -------- Flip X
+           -----x-- -------- Flip Y
+           ------x- -------- Enable Blending
+           -------x -------- Enable Transparent
+           -------- -xxx---- Source Blending mode
+           -------- -----xxx Destination Blending mode
+    02     xxxxxxxx -------- Source Alpha value
+           -------- xxxxxxxx Destination Alpha value
+    04     ---xxxxx xxxxxxxx Source X start position
+    06     ----xxxx xxxxxxxx Source Y start position
+    08     sxxxxxxx xxxxxxxx Destination X start position
+    0a     sxxxxxxx xxxxxxxx Destination Y start position
+    0c     ---xxxxx xxxxxxxx Source Width
+    0e     ----xxxx xxxxxxxx Source Height
+    10     -------- xxxxxxxx Source Red multiplication (0x80 = 100%)
+    12     xxxxxxxx -------- Source Green multiplication (0x80 = 100%)
+           -------- xxxxxxxx Source Blue multiplication (0x80 = 100%)
+
+    Blending mode (description from ibara test mode)
+    000 +alpha
+    001 +source
+    010 +destination
+    100 -alpha
+    101 -source
+    110 -destination
+    others are reserved/disable?
+*/
+
 inline void epic12_device::gfx_draw_shadow_copy(address_space &space, offs_t *addr)
 {
 	COPY_NEXT_WORD(space, addr);
@@ -534,6 +586,7 @@
 
 	while (1)
 	{
+		// request commands from main CPU RAM
 		const u16 data = COPY_NEXT_WORD(space, &addr);
 
 		switch (data & 0xf000)
@@ -576,6 +629,7 @@
 
 	while (1)
 	{
+		// request commands from main CPU RAM
 		const u16 data = READ_NEXT_WORD(&addr);
 
 		switch (data & 0xf000)
@@ -618,6 +672,7 @@
 
 	while (1)
 	{
+		// request commands from main CPU RAM
 		const u16 data = READ_NEXT_WORD(&addr);
 
 		switch (data & 0xf000)
@@ -714,7 +769,7 @@
 			}
 
 			m_gfx_addr_shadowcopy = m_gfx_addr;
-			m_gfx_scroll_0_x_shadowcopy =  m_gfx_scroll_0_x;
+			m_gfx_scroll_0_x_shadowcopy = m_gfx_scroll_0_x;
 			m_gfx_scroll_0_y_shadowcopy = m_gfx_scroll_0_y;
 			m_gfx_scroll_1_x_shadowcopy = m_gfx_scroll_1_x;
 			m_gfx_scroll_1_y_shadowcopy = m_gfx_scroll_1_y;
@@ -782,7 +837,7 @@
 
 	bitmap.fill(0, cliprect);
 
-#ifdef DEBUG_VRAM_VIEWER
+#if DEBUG_VRAM_VIEWER
 	int curr_width = m_curr_screen_width;
 	int curr_height = m_curr_screen_height;
 	rectangle curr_visarea = m_curr_screen_visarea;
@@ -809,7 +864,7 @@
 
 	//printf("SCREEN UPDATE\n %d %d %d %d\n", scroll_0_x, scroll_0_y, scroll_1_x, scroll_1_y);
 
-#ifdef DEBUG_VRAM_VIEWER
+#if DEBUG_VRAM_VIEWER
 	if (m_debug_vram_view_en)
 		copybitmap(bitmap, *m_bitmaps, 0, 0, 0, 0, cliprect);
 	else
diff -Nru mame-0.222+dfsg.1/src/devices/video/fixfreq.cpp mame-0.224+dfsg.1/src/devices/video/fixfreq.cpp
--- mame-0.222+dfsg.1/src/devices/video/fixfreq.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/fixfreq.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -75,30 +75,31 @@
 	if (!last_vsync && m_sig_vsync)
 	{
 		LOG("VSYNC UP %f %d\n", m_last_x, m_last_y);
-		m_intf.vsync_end_cb(time - m_last_vsync_time);
-		//auto d=time - m_last_vsync_time;
-		//printf("%f\n", 1.0 / d);
-		m_last_vsync_time = time;
-		// FIXME: this is wrong: we need to count lines with half-scanline width
-		//        to determine the field.
-		m_sig_field = last_comp;   /* force false-progressive */
-		m_sig_field = (m_sig_field ^ 1) ^ last_comp;   /* if there is no field switch, auto switch */
-		m_last_y = 0; //m_desc.vbackporch_width();
+		const int has_fields = (m_desc.m_fieldcount > 1) ? 1: 0;
 
-		// discharge
-		//m_vsync_filter = 0.0;
+		// FIXME: add modes: true interlaced, overlayed, false progressive (see popeye video)
+		if (has_fields)
+		{
+			const auto avg_line_dur = (time - m_last_field_time) * m_desc.m_fieldcount / (m_last_y + 1);
+			m_last_field_time = time;
+			m_sig_field = avg_line_dur * 0.75 > m_last_line_duration;
+		}
+		if (!has_fields || (m_sig_field == 0))
+		{
+			m_intf.vsync_end_cb(time - m_last_vsync_time);
+			m_last_vsync_time = time;
+		}
+		m_last_y = 0; //m_desc.vbackporch_width();
 	}
 	else if (last_vsync && !m_sig_vsync)
 	{
 		LOG("VSYNC DOWN %f %d\n", m_last_x, m_last_y);
-		//LOG("Field: %d\n", m_sig_field);
 	}
 
 	if (!last_comp && m_sig_composite)
 	{
 		if (m_sig_vsync)
 			LOG("Hsync in vsync\n");
-		/* TODO - time since last hsync and field detection */
 		//LOG("HSYNC up %d\n", m_last_x);
 		// FIXME: pixels > 50 filters some spurious hysnc on line 23/24 in breakout
 		//        The hsync signal transition from high to low is 7 pixels too
@@ -110,16 +111,18 @@
 			m_last_y += m_desc.m_fieldcount;
 			m_last_x = 0;
 			m_line_time = time + 1.0 / m_desc.hsync_filter_timeconst();
+
+			m_last_line_duration = time - m_last_hsync_time;
+			m_last_hsync_time = time;
+
 		}
-		//if (!m_sig_vsync && (m_last_x < m_desc.m_hscale * 100))
-		//  printf("HSYNC up %d %f\n", m_last_y, m_last_x);
 	}
 	else if (last_comp && !m_sig_composite)
 	{
 		/* falling composite */
 		//LOG("HSYNC down %f %d %f\n", time * 1e6, m_last_x, m_sync_signal);
 	}
-	m_last_sync = newval;
+	m_last_sync_val = newval;
 	m_last_sync_time = time;
 }
 
@@ -237,13 +240,15 @@
 	m_state.start();
 
 	// FIXME: will be done by netlist going forward
-	save_item(NAME(m_state.m_last_sync));
+	save_item(NAME(m_state.m_last_sync_val));
 	save_item(NAME(m_state.m_last_x));
 	save_item(NAME(m_state.m_last_y));
 	save_item(NAME(m_state.m_last_sync_time));
 	save_item(NAME(m_state.m_line_time));
 	save_item(NAME(m_state.m_last_hsync_time));
 	save_item(NAME(m_state.m_last_vsync_time));
+	save_item(NAME(m_state.m_last_line_duration));
+	save_item(NAME(m_state.m_last_field_time));
 
 	/* sync separator */
 	save_item(NAME(m_state.m_vsync_filter));
diff -Nru mame-0.222+dfsg.1/src/devices/video/fixfreq.h mame-0.224+dfsg.1/src/devices/video/fixfreq.h
--- mame-0.222+dfsg.1/src/devices/video/fixfreq.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/fixfreq.h	2020-08-26 08:57:19.000000000 +0000
@@ -123,7 +123,7 @@
 	fixedfreq_monitor_state(fixedfreq_monitor_desc &desc, fixedfreq_monitor_intf &intf)
 	: m_desc(desc),
 	m_intf(intf),
-	m_last_sync(0),
+	m_last_sync_val(0),
 	m_col(0),
 	m_last_x(0),
 	m_last_y(0),
@@ -131,6 +131,8 @@
 	m_line_time(time_type(0)),
 	m_last_hsync_time(time_type(0)),
 	m_last_vsync_time(time_type(0)),
+	m_last_line_duration(time_type(0)),
+	m_last_field_time(time_type(0)),
 	m_vsync_filter(0),
 	m_sig_vsync(0),
 	m_sig_composite(0),
@@ -145,7 +147,7 @@
 		// FIXME: once moved to netlist this may no longer be necessary.
 		//        Only copies constructor init
 
-		m_last_sync = 0.0;
+		m_last_sync_val = 0.0;
 		m_col = rgb_t(0,0,0);
 		m_last_x = 0;
 		m_last_y = 0;
@@ -177,18 +179,11 @@
 
 	void reset()
 	{
-		m_last_sync = 0;
+		m_last_sync_val = 0;
 		m_col = 0;
 		m_last_x = 0;
 		m_last_y = 0;
-		//m_last_sync_time = time_type(0);
-		//m_line_time = time_type(0);
-		//m_last_hsync_time = time_type(0);
-		//m_last_vsync_time = time_type(0);
-		//m_clock_period = time_type(0);
 		m_vsync_filter = 0;
-		//m_vsync_threshold = 0;
-		//m_vsync_filter_timeconst = 0;
 		m_sig_vsync = 0;
 		m_sig_composite = 0;
 		m_sig_field = 0;
@@ -206,7 +201,7 @@
 	const fixedfreq_monitor_desc &m_desc;
 	fixedfreq_monitor_intf &m_intf;
 
-	double m_last_sync;
+	double m_last_sync_val;
 	uint32_t m_col;
 	float m_last_x;
 	int m_last_y;
@@ -215,6 +210,9 @@
 	time_type m_last_hsync_time;
 	time_type m_last_vsync_time;
 
+	time_type m_last_line_duration;
+	time_type m_last_field_time;
+
 	/* sync separator */
 	double m_vsync_filter;
 
@@ -240,6 +238,7 @@
 	fixedfreq_device &set_monitor_clock(uint32_t clock) { m_monitor.m_monitor_clock = clock; return *this;}
 	fixedfreq_device &set_fieldcount(int count) { m_monitor.m_fieldcount = count; return *this; }
 	fixedfreq_device &set_threshold(double threshold) { m_monitor.m_sync_threshold = threshold; return *this; }
+	fixedfreq_device &set_vsync_threshold(double threshold) { m_monitor.m_vsync_threshold = threshold; return *this; }
 	fixedfreq_device &set_gain(double gain) { m_monitor.m_gain = gain; return *this; }
 	fixedfreq_device &set_horz_params(int visible, int frontporch, int sync, int backporch)
 	{
diff -Nru mame-0.222+dfsg.1/src/devices/video/hlcd0438.cpp mame-0.224+dfsg.1/src/devices/video/hlcd0438.cpp
--- mame-0.222+dfsg.1/src/devices/video/hlcd0438.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/hlcd0438.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,95 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+/*
+
+Hughes HLCD 0438 LCD Driver
+32 segment outputs, may also be used as a column driver
+
+LCD pin can be driven manually, or oscillating.
+
+*/
+
+#include "emu.h"
+#include "video/hlcd0438.h"
+
+
+DEFINE_DEVICE_TYPE(HLCD0438, hlcd0438_device, "hlcd0438", "Hughes HLCD 0438 LCD Driver")
+
+//-------------------------------------------------
+//  constructor
+//-------------------------------------------------
+
+hlcd0438_device::hlcd0438_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) :
+	device_t(mconfig, HLCD0438, tag, owner, clock),
+	m_write_segs(*this), m_write_data(*this)
+{ }
+
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void hlcd0438_device::device_start()
+{
+	// resolve callbacks
+	m_write_segs.resolve_safe();
+	m_write_data.resolve_safe();
+
+	// timer (when LCD pin is oscillator)
+	m_lcd_timer = timer_alloc();
+	attotime period = (clock() != 0) ? attotime::from_hz(2 * clock()) : attotime::never;
+	m_lcd_timer->adjust(period, 0, period);
+
+	// register for savestates
+	save_item(NAME(m_data_in));
+	save_item(NAME(m_data_out));
+	save_item(NAME(m_clk));
+	save_item(NAME(m_load));
+	save_item(NAME(m_lcd));
+	save_item(NAME(m_shift));
+	save_item(NAME(m_latch));
+}
+
+
+//-------------------------------------------------
+//  handlers
+//-------------------------------------------------
+
+void hlcd0438_device::clock_w(int state)
+{
+	state = state ? 1 : 0;
+
+	// shift on falling edge
+	if (m_clk && !state)
+	{
+		// DATA OUT pin follows carry out
+		m_data_out = BIT(m_shift, 31);
+
+		m_shift = m_shift << 1 | m_data_in;
+
+		m_write_data(m_data_out);
+		load_w(m_load);
+	}
+
+	m_clk = state;
+}
+
+void hlcd0438_device::load_w(int state)
+{
+	m_load = state ? 1 : 0;
+
+	// load to output latches while LOAD pin is high
+	if (m_load)
+		m_latch = m_shift;
+}
+
+void hlcd0438_device::lcd_w(int state)
+{
+	state = state ? 1 : 0;
+
+	// LCD pin drives backplate
+	if (state != m_lcd)
+		m_write_segs(m_lcd, m_latch);
+
+	m_lcd = state;
+}
diff -Nru mame-0.222+dfsg.1/src/devices/video/hlcd0438.h mame-0.224+dfsg.1/src/devices/video/hlcd0438.h
--- mame-0.222+dfsg.1/src/devices/video/hlcd0438.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/hlcd0438.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,83 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+/*
+
+  Hughes HLCD 0438 LCD Driver
+
+*/
+
+#ifndef MAME_VIDEO_HLCD0438_H
+#define MAME_VIDEO_HLCD0438_H
+
+#pragma once
+
+// pinout reference
+
+/*
+               ____   ____
+       VDD  1 |*   \_/    | 40 CLOCK
+      LOAD  2 |           | 39 SEG 1
+    SEG 32  3 |           | 38 SEG 2
+    SEG 31  4 |           | 37 SEG 3
+    SEG 30  5 |           | 36 GND
+    SEG 29  6 |           | 35 DATA OUT
+    SEG 28  7 |           | 34 DATA IN
+    SEG 27  8 |           | 33 SEG 4
+    SEG 26  9 |           | 32 SEG 5
+    SEG 25 10 | HLCD 0438 | 31 LCD
+    SEG 24 11 |           | 30 BP
+    SEG 23 12 |           | 29 SEG 6
+    SEG 22 13 |           | 28 SEG 7
+    SEG 21 14 |           | 27 SEG 8
+    SEG 20 15 |           | 26 SEG 9
+    SEG 19 16 |           | 25 SEG 10
+    SEG 18 17 |           | 24 SEG 11
+    SEG 17 18 |           | 23 SEG 12
+    SEG 16 19 |           | 22 SEG 13
+    SEG 15 20 |___________| 21 SEG 14
+
+*/
+
+
+class hlcd0438_device : public device_t
+{
+public:
+	hlcd0438_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+	// configuration helpers
+	auto write_segs() { return m_write_segs.bind(); } // BP pin in offset, SEG pins in data
+	auto write_data() { return m_write_data.bind(); } // DATA OUT pin
+	hlcd0438_device &set_load(int state) { m_load = state ? 1 : 0; return *this; } // if hardwired, can just set LOAD pin state here
+
+	void data_w(int state) { m_data_in = state ? 1 : 0; }
+	int data_r() { return m_data_out; }
+	void clock_w(int state);
+	void load_w(int state);
+	void lcd_w(int state);
+
+protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override { lcd_w(!m_lcd); }
+
+private:
+	emu_timer *m_lcd_timer;
+
+	// pin state
+	int m_data_in = 0;
+	int m_data_out = 0;
+	int m_clk = 0;
+	int m_load = 0;
+	int m_lcd = 0;
+
+	u32 m_shift = 0;
+	u32 m_latch = 0;
+
+	devcb_write32 m_write_segs;
+	devcb_write_line m_write_data;
+};
+
+
+DECLARE_DEVICE_TYPE(HLCD0438, hlcd0438_device)
+
+#endif // MAME_VIDEO_HLCD0438_H
diff -Nru mame-0.222+dfsg.1/src/devices/video/hlcd0488.cpp mame-0.224+dfsg.1/src/devices/video/hlcd0488.cpp
--- mame-0.222+dfsg.1/src/devices/video/hlcd0488.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/hlcd0488.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Wilbert Pol
+// copyright-holders:Wilbert Pol, hap
 /*
 
 Hughes HLCD 0488 LCD Driver
diff -Nru mame-0.222+dfsg.1/src/devices/video/hlcd0488.h mame-0.224+dfsg.1/src/devices/video/hlcd0488.h
--- mame-0.222+dfsg.1/src/devices/video/hlcd0488.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/hlcd0488.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Wilbert Pol
+// copyright-holders:Wilbert Pol, hap
 /*
 
   Hughes HLCD 0488 LCD Driver
diff -Nru mame-0.222+dfsg.1/src/devices/video/huc6261.cpp mame-0.224+dfsg.1/src/devices/video/huc6261.cpp
--- mame-0.222+dfsg.1/src/devices/video/huc6261.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/huc6261.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -275,7 +275,7 @@
 					break;
 
 				case 0x09:
-					data = m_priority[0] | ( m_priority[1] << 4 ) | ( m_priority[2] << 8 ) | ( m_priority[3] << 12 );;
+					data = m_priority[0] | ( m_priority[1] << 4 ) | ( m_priority[2] << 8 ) | ( m_priority[3] << 12 );
 					break;
 			}
 			break;
diff -Nru mame-0.222+dfsg.1/src/devices/video/i8244.cpp mame-0.224+dfsg.1/src/devices/video/i8244.cpp
--- mame-0.222+dfsg.1/src/devices/video/i8244.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/i8244.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,11 +1,11 @@
 // license:BSD-3-Clause
-// copyright-holders:Wilbert Pol
+// copyright-holders:Wilbert Pol, hap
+// thanks-to:Kevin Horton
 /***************************************************************************
 
-    i8244.c
-
-    Intel 8244 (NTSC)/8245 (PAL) Graphics and sound chip
+Intel 8244 (NTSC)/8245 (PAL) Graphics and sound chip
 
+Exclusively used in Odyssey 2 series. See driver file for known problems.
 
 ***************************************************************************/
 
@@ -15,117 +15,85 @@
 #include "screen.h"
 
 
-
 // device type definition
 DEFINE_DEVICE_TYPE(I8244, i8244_device, "i8244", "Intel 8244")
 DEFINE_DEVICE_TYPE(I8245, i8245_device, "i8245", "Intel 8245")
 
 
-// Kevtris verified that the data below matches a dump
-// taken from a real chip.
-static const uint8_t c_shape[0x40 * 8] =
-{
-	0x7C,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x00, // 0
-	0x18,0x38,0x18,0x18,0x18,0x18,0x3C,0x00,
-	0x3C,0x66,0x0C,0x18,0x30,0x60,0x7E,0x00,
-	0x7C,0xC6,0x06,0x3C,0x06,0xC6,0x7C,0x00,
-	0xCC,0xCC,0xCC,0xFE,0x0C,0x0C,0x0C,0x00,
-	0xFE,0xC0,0xC0,0x7C,0x06,0xC6,0x7C,0x00,
-	0x7C,0xC6,0xC0,0xFC,0xC6,0xC6,0x7C,0x00,
-	0xFE,0x06,0x0C,0x18,0x30,0x60,0xC0,0x00,
-	0x7C,0xC6,0xC6,0x7C,0xC6,0xC6,0x7C,0x00,
-	0x7C,0xC6,0xC6,0x7E,0x06,0xC6,0x7C,0x00,
-	0x00,0x18,0x18,0x00,0x18,0x18,0x00,0x00,
-	0x18,0x7E,0x58,0x7E,0x1A,0x7E,0x18,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-	0x3C,0x66,0x0C,0x18,0x18,0x00,0x18,0x00,
-	0xC0,0xC0,0xC0,0xC0,0xC0,0xC0,0xFE,0x00,
-	0xFC,0xC6,0xC6,0xFC,0xC0,0xC0,0xC0,0x00,
-	0x00,0x18,0x18,0x7E,0x18,0x18,0x00,0x00,
-	0xC6,0xC6,0xC6,0xD6,0xFE,0xEE,0xC6,0x00,
-	0xFE,0xC0,0xC0,0xF8,0xC0,0xC0,0xFE,0x00,
-	0xFC,0xC6,0xC6,0xFC,0xD8,0xCC,0xC6,0x00,
-	0x7E,0x18,0x18,0x18,0x18,0x18,0x18,0x00,
-	0xC6,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x00,
-	0x3C,0x18,0x18,0x18,0x18,0x18,0x3C,0x00,
-	0x7C,0xC6,0xC6,0xC6,0xC6,0xC6,0x7C,0x00,
-	0x7C,0xC6,0xC6,0xC6,0xDE,0xCC,0x76,0x00,
-	0x7C,0xC6,0xC0,0x7C,0x06,0xC6,0x7C,0x00,
-	0xFC,0xC6,0xC6,0xC6,0xC6,0xC6,0xFC,0x00,
-	0xFE,0xC0,0xC0,0xF8,0xC0,0xC0,0xC0,0x00,
-	0x7C,0xC6,0xC0,0xC0,0xCE,0xC6,0x7E,0x00,
-	0xC6,0xC6,0xC6,0xFE,0xC6,0xC6,0xC6,0x00,
-	0x06,0x06,0x06,0x06,0x06,0xC6,0x7C,0x00,
-	0xC6,0xCC,0xD8,0xF0,0xD8,0xCC,0xC6,0x00,
-	0x38,0x6C,0xC6,0xC6,0xFE,0xC6,0xC6,0x00,
-	0x7E,0x06,0x0C,0x18,0x30,0x60,0x7E,0x00,
-	0xC6,0xC6,0x6C,0x38,0x6C,0xC6,0xC6,0x00,
-	0x7C,0xC6,0xC0,0xC0,0xC0,0xC6,0x7C,0x00,
-	0xC6,0xC6,0xC6,0xC6,0xC6,0x6C,0x38,0x00,
-	0xFC,0xC6,0xC6,0xFC,0xC6,0xC6,0xFC,0x00,
-	0xC6,0xEE,0xFE,0xD6,0xC6,0xC6,0xC6,0x00,
-	0x00,0x00,0x00,0x00,0x00,0x18,0x18,0x00,
-	0x00,0x00,0x00,0x7E,0x00,0x00,0x00,0x00,
-	0x00,0x66,0x3C,0x18,0x3C,0x66,0x00,0x00,
-	0x00,0x18,0x00,0x7E,0x00,0x18,0x00,0x00,
-	0x00,0x00,0x7E,0x00,0x7E,0x00,0x00,0x00,
-	0x66,0x66,0x66,0x3C,0x18,0x18,0x18,0x00,
-	0xC6,0xE6,0xF6,0xFE,0xDE,0xCE,0xC6,0x00,
-	0x03,0x06,0x0C,0x18,0x30,0x60,0xC0,0x00,
-	0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0x00,
-	0xCE,0xDB,0xDB,0xDB,0xDB,0xDB,0xCE,0x00,
-	0x00,0x00,0x3C,0x7E,0x7E,0x7E,0x3C,0x00,
-	0x1C,0x1C,0x18,0x1E,0x18,0x18,0x1C,0x00,
-	0x1C,0x1C,0x18,0x1E,0x18,0x34,0x26,0x00,
-	0x38,0x38,0x18,0x78,0x18,0x2C,0x64,0x00,
-	0x38,0x38,0x18,0x78,0x18,0x18,0x38,0x00,
-	0x00,0x18,0x0C,0xFE,0x0C,0x18,0x00,0x00,
-	0x18,0x3C,0x7E,0xFF,0xFF,0x18,0x18,0x00,
-	0x03,0x07,0x0F,0x1F,0x3F,0x7F,0xFF,0x00,
-	0xC0,0xE0,0xF0,0xF8,0xFC,0xFE,0xFF,0x00,
-	0x38,0x38,0x12,0xFE,0xB8,0x28,0x6C,0x00,
-	0xC0,0x60,0x30,0x18,0x0C,0x06,0x03,0x00,
-	0x00,0x00,0x0C,0x08,0x08,0x7F,0x3E,0x00,
-	0x00,0x03,0x63,0xFF,0xFF,0x18,0x08,0x00,
-	0x00,0x00,0x00,0x10,0x38,0xFF,0x7E,0x00
-};
-
-
-// Background and grid information is stored in RGB format
-// while the character and sprite colors are stored in BGR
-// format.
-static const uint8_t bgr2rgb[8] =
-{
-	0x00, 0x04, 0x02, 0x06, 0x01, 0x05, 0x03, 0x07
-};
-
-
 //-------------------------------------------------
 //  i8244_device - constructor
 //-------------------------------------------------
 
 i8244_device::i8244_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: i8244_device(mconfig, I8244, tag, owner, clock, i8244_device::LINES)
+	: i8244_device(mconfig, I8244, tag, owner, clock)
 {
 }
 
 
-i8244_device::i8244_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int lines)
+i8244_device::i8244_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, type, tag, owner, clock)
 	, device_sound_interface(mconfig, *this)
 	, device_video_interface(mconfig, *this)
 	, m_irq_func(*this)
-	, m_postprocess_func(*this)
-	, m_start_vpos(START_Y)
-	, m_start_vblank(START_Y + SCREEN_HEIGHT)
-	, m_screen_lines(lines)
+	, m_charset(*this, "cgrom")
 {
 }
 
 
 i8245_device::i8245_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: i8244_device(mconfig, I8245, tag, owner, clock, i8245_device::LINES)
+	: i8244_device(mconfig, I8245, tag, owner, clock)
+{
+}
+
+void i8244_device::set_default_params()
+{
+	m_htotal = 455;
+	m_vtotal = 263;
+	m_vblank_start = 242;
+	m_vblank_end = 0;
+	m_hblank_start = 366;
+	m_hblank_end = 453;
+	m_bgate_start = 413;
+}
+
+void i8245_device::set_default_params()
+{
+	// this timing is partially derived externally, 8245 on the PAL console is set to slave mode in vblank (M/S pin)
+	m_htotal = 456;
+	m_vtotal = 313;
+	m_vblank_start = 242;
+	m_vblank_end = 312;
+	m_hblank_start = 366;
+	m_hblank_end = 454;
+	m_bgate_start = 414;
+}
+
+i8244_device &i8244_device::set_screen_size(int width, int height, int cropx, int cropy)
+{
+	m_width = width;
+	m_height = height;
+	m_cropx = cropx;
+	m_cropy = cropy;
+
+	set_default_params();
+
+	return *this;
+}
+
+
+//-------------------------------------------------
+//  internal character set rom
+//-------------------------------------------------
+
+ROM_START( i8244 )
+	ROM_REGION( 0x200, "cgrom", 0 )
+	ROM_LOAD( "charset_i8244.bin", 0x0000, 0x0200, CRC(b46a3f31) SHA1(415382715455b47b69401b3d60bd8f0036dd7fef) )
+ROM_END
+
+
+const tiny_rom_entry *i8244_device::device_rom_region() const
 {
+	return ROM_NAME( i8244 );
 }
 
 
@@ -141,7 +109,7 @@
 		return;
 
 	if (!screen().refresh_attoseconds())
-		screen().set_raw(clock(), LINE_CLOCKS, START_ACTIVE_SCAN, END_ACTIVE_SCAN, m_screen_lines, START_Y, START_Y + SCREEN_HEIGHT);
+		screen().set_raw(clock()*2, m_htotal, m_cropx, m_cropx + m_width, m_vtotal, m_cropy, m_cropy + m_height);
 }
 
 
@@ -151,68 +119,60 @@
 
 void i8244_device::device_start()
 {
-	// Let the screen create our temporary bitmap with the screen's dimensions
-	screen().register_screen_bitmap(m_tmp_bitmap);
-
-	m_line_timer = timer_alloc(TIMER_LINE);
-	m_line_timer->adjust( screen().time_until_pos(1, START_ACTIVE_SCAN ), 0,  screen().scan_period() );
+	m_irq_func.resolve_safe();
 
-	m_hblank_timer = timer_alloc(TIMER_HBLANK);
-	m_hblank_timer->adjust( screen().time_until_pos(1, END_ACTIVE_SCAN + 18 ), 0, screen().scan_period() );
+	// allocate timers
+	m_vblank_timer = timer_alloc(TIMER_VBLANK_START);
+	m_vblank_timer->adjust(screen().time_until_pos(m_vblank_start, m_hblank_start - 1), 0, screen().frame_period());
 
-	m_irq_func.resolve_safe();
-	m_postprocess_func.resolve_safe();
+	m_hblank_timer = timer_alloc(TIMER_HBLANK_START);
+	m_hblank_timer->adjust(screen().time_until_pos(0, m_hblank_start), 0, screen().scan_period());
 
 	// allocate a stream
-	m_stream = stream_alloc( 0, 1, clock()/(LINE_CLOCKS*4) );
+	m_stream = stream_alloc(0, 1, clock());
 
 	// register our state
+	memset(m_vdc.reg, 0, 0x100);
 	save_pointer(NAME(m_vdc.reg), 0x100);
-	save_item(NAME(m_sh_count));
+
+	memset( m_collision_map, 0, sizeof( m_collision_map ) );
+	save_item(NAME(m_collision_map));
+
 	save_item(NAME(m_x_beam_pos));
 	save_item(NAME(m_y_beam_pos));
+	save_item(NAME(m_y_latch));
 	save_item(NAME(m_control_status));
 	save_item(NAME(m_collision_status));
-	save_item(NAME(m_iff));
-}
-
-
-//-------------------------------------------------
-//  device_reset - device-specific reset
-//-------------------------------------------------
-
-void i8244_device::device_reset()
-{
-	memset(m_vdc.reg, 0, 0x100);
-
-	m_sh_count = 0;
-	m_x_beam_pos = 0;
-	m_y_beam_pos = 0;
-	m_control_status = 0;
-	m_collision_status = 0;
-	m_iff = 0;
+	save_item(NAME(m_pos_hold));
+	save_item(NAME(m_y_hold));
+	save_item(NAME(m_sh_written));
+	save_item(NAME(m_sh_pending));
+	save_item(NAME(m_sh_prescaler));
+	save_item(NAME(m_sh_output));
+	save_item(NAME(m_sh_duty));
 }
 
 
 void i8244_device::i8244_palette(palette_device &palette) const
 {
+	// RGB output, before any NTSC/PAL RF encoder
 	static constexpr rgb_t i8244_colors[16] =
 	{
 		{ 0x00, 0x00, 0x00 }, // i r g b
-		{ 0x00, 0x00, 0xaa }, // i r g B
-		{ 0x00, 0xaa, 0x00 }, // i r G b
-		{ 0x00, 0xaa, 0xaa }, // i r G B
-		{ 0xaa, 0x00, 0x00 }, // i R g b
-		{ 0xaa, 0x00, 0xaa }, // i R g B
-		{ 0xaa, 0xaa, 0x00 }, // i R G b
-		{ 0xaa, 0xaa, 0xaa }, // i R G B
-		{ 0x55, 0x55, 0x55 }, // I r g b
-		{ 0x55, 0x55, 0xff }, // I r g B
-		{ 0x55, 0xff, 0x55 }, // I r G b
-		{ 0x55, 0xff, 0xff }, // I r G B
-		{ 0xff, 0x55, 0x55 }, // I R g b
-		{ 0xff, 0x55, 0xff }, // I R g B
-		{ 0xff, 0xff, 0x55 }, // I R G b
+		{ 0xb6, 0x00, 0x00 }, // i R g b
+		{ 0x00, 0xb6, 0x00 }, // i r G b
+		{ 0xb6, 0xb6, 0x00 }, // i R G b
+		{ 0x00, 0x00, 0xb6 }, // i r g B
+		{ 0xb6, 0x00, 0xb6 }, // i R g B
+		{ 0x00, 0xb6, 0xb6 }, // i r G B
+		{ 0xb6, 0xb6, 0xb6 }, // i R G B
+		{ 0x49, 0x49, 0x49 }, // I r g b
+		{ 0xff, 0x49, 0x49 }, // I R g b
+		{ 0x49, 0xff, 0x49 }, // I r G b
+		{ 0xff, 0xff, 0x49 }, // I R G b
+		{ 0x49, 0x49, 0xff }, // I r g B
+		{ 0xff, 0x49, 0xff }, // I R g B
+		{ 0x49, 0xff, 0xff }, // I r G B
 		{ 0xff, 0xff, 0xff }  // I R G B
 	};
 
@@ -222,73 +182,103 @@
 
 void i8244_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
 {
-	int vpos = screen().vpos();
-
 	switch ( id )
 	{
-		case TIMER_LINE:
-			// handle i824x line timer
-			render_scanline(vpos);
+		case TIMER_HBLANK_START:
+			// hblank starts (updates sound shift register)
+			sound_update();
 			break;
 
-		case TIMER_HBLANK:
-			// handle i824x HBlank timer
-			if ( vpos < m_start_vpos - 1 )
-			{
-				return;
-			}
+		case TIMER_VBLANK_START:
+			// vblank starts
+			m_control_status |= 0x08;
+			m_irq_func(ASSERT_LINE);
+			break;
 
-			if ( vpos < m_start_vblank - 1 )
-			{
-				m_control_status |= 0x01;
-			}
+		default:
 			break;
 	}
 }
 
 
-int i8244_device::get_y_beam()
+offs_t i8244_device::fix_register_mirrors( offs_t offset )
 {
-	int y = screen().vpos() - m_start_vpos;
+	// quad x/y registers are mirrored for each quad
+	if ( ( offset & 0xC2 ) == 0x40 )
+	{
+		offset &= ~0x0C;
+	}
 
-	// The Y register becomes 0 only when the VBlank signal is turned off!
-	if ( y < 0 || ( y == 0 && screen().hpos() < 366+42 ) )
+	// registers $A0-$AF are mirrored at $B0-$BF
+	if ( ( offset & 0xE0 ) == 0xA0 )
 	{
-		y += m_screen_lines;
+		offset &= ~0x10;
 	}
 
-	return y;
+	return offset & 0xFF;
 }
 
 
-int i8244_device::get_x_beam()
+bool i8244_device::invalid_register( offs_t offset, bool rw )
 {
-	int x = screen().hpos() - START_ACTIVE_SCAN;
+	// object x/y/attr registers are not accessible when display is enabled
+	// (sprite shape registers still are)
+	if (offset < 0x80 && m_vdc.s.control & 0x20)
+		return true;
 
-	if ( x < 0 )
-	{
-		x += LINE_CLOCKS;
-	}
+	// grid registers are not accessible when grid is enabled
+	if (offset >= 0xc0 && m_vdc.s.control & 0x08)
+		return true;
 
-	return x >> 1;
-}
+	bool invalid = false;
 
+	u8 n = offset & 0xf;
 
-offs_t i8244_device::fix_register_mirrors( offs_t offset )
-{
-	// registers $40,$41 are mirrored at $44,$45, $48,$49, and $4C,$4D
-	if ( ( offset & 0xF2 ) == 0x40 )
+	// these registers are always inaccessible
+	switch (offset & 0xf0)
 	{
-		offset &= ~0x0C;
-	}
+		case 0x00:
+			invalid = ((n & 0x3) == 0x3);
 
-	// registers $A0-$AF are mirrored at $B0-$BF
-	if ( ( offset & 0xF0 ) == 0xB0 )
-	{
-		offset &= ~0x10;
+			// write-only
+			if (!invalid && rw)
+				invalid = ((n & 0x3) == 0x2);
+
+			break;
+
+		case 0xa0:
+			invalid = (n == 0x6 || n >= 0xb);
+
+			if (!invalid)
+			{
+				// write-only
+				if (rw)
+					invalid = (n == 0x3 || n == 0x7 || n == 0x8 || n == 0x9);
+
+				// read-only
+				else
+					invalid = (n == 0x1 || n == 0x4 || n == 0x5);
+			}
+
+			break;
+
+		case 0xc0: case 0xd0:
+			invalid = (n >= 0x9);
+			break;
+
+		case 0xe0:
+			invalid = (n >= 0xa);
+			break;
+
+		case 0xf0:
+			invalid = true;
+			break;
+
+		default:
+			break;
 	}
 
-	return offset;
+	return invalid;
 }
 
 
@@ -296,20 +286,36 @@
 {
 	uint8_t data;
 
-	offset = fix_register_mirrors( offset );
+	offset = fix_register_mirrors(offset);
+
+	if (machine().side_effects_disabled())
+		return m_vdc.reg[offset];
+
+	if (invalid_register(offset, true))
+		return 0;
+
+	// update screen before accessing video status registers
+	if (offset == 0xa1 || offset == 0xa2)
+		screen().update_now();
 
 	switch (offset)
 	{
 		case 0xa1:
-			data = m_control_status & 0xFE;
-			m_iff = 0;
+		{
+			data = m_control_status;
+
+			// hstatus (not same as hblank), goes high at falling edge of X=0x70
+			int h = screen().hpos();
+			data |= (h >= 225 && h < m_bgate_start && get_y_beam() <= m_vblank_start) ? 1 : 0;
+
+			// position strobe status
+			data |= m_pos_hold ? 2 : 0;
+
 			m_irq_func(CLEAR_LINE);
-			m_control_status &= ~0x08;
-			if ( hblank() )
-			{
-				data |= 1;
-			}
+			m_control_status &= ~0xcc;
+
 			break;
+		}
 
 		case 0xa2:
 			data = m_collision_status;
@@ -317,21 +323,34 @@
 			break;
 
 		case 0xa4:
-			if (m_vdc.s.control & VDC_CONTROL_REG_STROBE_XY)
+			if (m_y_hold)
 			{
-				m_y_beam_pos = get_y_beam();
+				data = m_y_latch;
+				m_y_hold = false;
 			}
-			data = m_y_beam_pos;
-			break;
+			else if (m_pos_hold)
+				data = m_y_beam_pos;
+			else
+				data = get_y_beam();
 
+			break;
 
 		case 0xa5:
-			if ((m_vdc.s.control & VDC_CONTROL_REG_STROBE_XY))
+		{
+			if (m_pos_hold)
 			{
-				m_x_beam_pos = get_x_beam();
+				data = m_x_beam_pos;
+				m_pos_hold = false;
 			}
-			data = m_x_beam_pos;
+			else
+				data = get_x_beam();
+
+			// Y is latched when reading X
+			m_y_hold = true;
+			m_y_latch = get_y_beam();
+
 			break;
+		}
 
 		default:
 			data = m_vdc.reg[offset];
@@ -344,127 +363,207 @@
 
 void i8244_device::write(offs_t offset, uint8_t data)
 {
-	offset = fix_register_mirrors( offset );
+	offset = fix_register_mirrors(offset);
 
-	/* Update the sound */
-	if( offset >= 0xa7 && offset <= 0xaa )
-	{
-		m_stream->update();
-	}
+	if (invalid_register(offset, false))
+		return;
 
-	if (offset == 0xa0)
+	// update screen before accessing video registers
+	if (offset >= 0x80 && offset < 0xa4)
+		screen().update_now();
+
+	// color registers d4-d7 are not connected
+	if ((offset & 0x83) == 0x03)
+		data &= 0x0f;
+
+	// major systems Y CAM d0 is not connected!
+	if (offset >= 0x10 && (offset & 0x83) == 0x00)
+		data &= ~0x01;
+
+	// horizontal grid high byte only d0 is connected
+	if ((offset & 0xf0) == 0xd0)
+		data &= 0x01;
+
+	switch (offset)
 	{
-		if ( ( m_vdc.s.control & VDC_CONTROL_REG_STROBE_XY )
-			&& !(data & VDC_CONTROL_REG_STROBE_XY))
-		{
-			/* Toggling strobe bit, tuck away values */
-			m_x_beam_pos = get_x_beam();
-			m_y_beam_pos = get_y_beam();
-		}
+		case 0xa0:
+			if ((m_vdc.s.control & 0x02) && !(data & 0x02) && !m_pos_hold)
+			{
+				// toggling strobe bit, tuck away values
+				m_x_beam_pos = get_x_beam();
+				m_y_beam_pos = get_y_beam();
+				m_pos_hold = true;
+			}
+			// note: manual talks about a hblank interrupt on d0, and a sound interrupt on d2,
+			// but tests done on 8244 reveal no such features
+			break;
+
+		case 0xa7: case 0xa8: case 0xa9:
+			m_sh_written = true;
+			break;
+
+		case 0xaa:
+			// update the sound
+			m_stream->update();
+			data &= ~0x40;
+			break;
+
+		default:
+			break;
 	}
 
 	m_vdc.reg[offset] = data;
 }
 
 
-int i8244_device::vblank()
+int i8244_device::get_y_beam()
 {
-	if ( screen().vpos() > m_start_vpos && screen().vpos() < m_start_vblank )
-	{
-		return 0;
-	}
-	return 1;
+	int h = screen().hpos();
+	int v = screen().vpos();
+
+	// Y resets before hblank on the first scanline
+	if (v == 0 && h < m_hblank_start)
+		v = m_vtotal;
+
+	// Y increments on BG sync
+	if (h >= m_bgate_start)
+		v++;
+
+	return (v > 263) ? 263 : v;
 }
 
 
-int i8244_device::hblank()
+int i8244_device::get_x_beam()
 {
-	int hpos = screen().hpos();
-	int vpos = screen().vpos();
+	return screen().hpos() >> 1;
+}
 
-	if ( hpos >= START_ACTIVE_SCAN && hpos < END_ACTIVE_SCAN )
-	{
-		return 0;
-	}
 
-	// Before active area?
-	if ( vpos < m_start_vpos - 1 )
-	{
-		return 0;
-	}
+int i8244_device::vblank()
+{
+	int h = screen().hpos();
+	int v = screen().vpos();
+	int start = m_vblank_start;
+	int end = m_vblank_end;
 
-	// During active area?
-	if ( vpos < m_start_vblank - 1 )
-	{
+	if ((v == start && h >= (m_hblank_start - 1)) || (v == end && h <= (m_hblank_start - 1)))
 		return 1;
-	}
 
-	// After active area
-	return 0;
+	if (end < start)
+		return (v > start || v < end) ? 1 : 0;
+	else
+		return (v > start && v < end) ? 1 : 0;
 }
 
 
-void i8244_device::render_scanline(int vpos)
+int i8244_device::hblank()
 {
-	// Some local constants for this method
-	//static const uint8_t COLLISION_SPRITE_0        = 0x01;
-	//static const uint8_t COLLISION_SPRITE_1        = 0x02;
-	//static const uint8_t COLLISION_SPRITE_2        = 0x04;
-	//static const uint8_t COLLISION_SPRITE_3        = 0x08;
-	static const uint8_t COLLISION_VERTICAL_GRID   = 0x10;
-	static const uint8_t COLLISION_HORIZ_GRID_DOTS = 0x20;
-	//static const uint8_t COLLISION_EXTERNAL_UNUSED = 0x40;
-	static const uint8_t COLLISION_CHARACTERS      = 0x80;
+	int h = screen().hpos();
+	int start = m_hblank_start;
+	int end = m_hblank_end;
 
-	uint8_t   collision_map[160];
+	if (end < start)
+		return (h >= start || h < end) ? 1 : 0;
+	else
+		return (h >= start && h < end) ? 1 : 0;
+}
 
-	if ( vpos == m_start_vpos )
-	{
-		m_control_status &= ~0x08;
-	}
 
-	if ( m_start_vpos < vpos && vpos < m_start_vblank )
+void i8244_device::write_cx(int x, bool cx)
+{
+	if (cx)
 	{
-		rectangle rect;
-		int scanline = vpos - m_start_vpos;
+		u8 colx = m_collision_map[x] & 0x3f;
 
-		m_control_status &= ~ 0x01;
+		// Check if we collide with an already drawn source object
+		if (colx)
+		{
+			// external overlap interrupt
+			if (m_vdc.s.control & 0x10)
+			{
+				m_irq_func(ASSERT_LINE);
+				m_control_status |= 0x40;
+			}
+
+			if (colx & m_vdc.s.collision)
+				m_collision_status |= 0x40;
+		}
+		// Check if an already drawn object would collide with us
+		if (m_vdc.s.collision & 0x40)
+		{
+			m_collision_status |= colx;
+		}
+	}
+}
 
-		/* Draw a line */
-		rect.set(START_ACTIVE_SCAN, END_ACTIVE_SCAN - 1, vpos, vpos);
-		m_tmp_bitmap.fill( (m_vdc.s.color >> 3) & 0x7, rect );
 
+uint32_t i8244_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	/* Draw background color */
+	bitmap.fill(bitswap<3>(m_vdc.s.color,3,4,5), cliprect);
+
+	for (int scanline = cliprect.min_y; scanline <= cliprect.max_y; scanline++)
+	{
 		/* Clear collision map */
-		memset( collision_map, 0, sizeof( collision_map ) );
+		memset( m_collision_map, 0, sizeof( m_collision_map ) );
 
 		/* Display grid if enabled */
 		if ( m_vdc.s.control & 0x08 )
 		{
-			uint16_t color = ( m_vdc.s.color & 7 ) | ( ( m_vdc.s.color >> 3 ) & 0x08 );
-			int    x_grid_offset = 8;
-			int    y_grid_offset = 24;
-			int    width = 16;
-			int    height = 24;
-			int    w = ( m_vdc.s.control & 0x80 ) ? width : 2;
+			uint16_t color = bitswap<4>(m_vdc.s.color,6,0,1,2);
+			int x_grid_offset = 13;
+			int y_grid_offset = 24;
+			int width = 16;
+			int height = 24;
+			int w = ( m_vdc.s.control & 0x80 ) ? width : 2;
 
-			/* Draw horizontal part of grid */
-			for ( int j = 1, y = 0; y < 9; y++, j <<= 1 )
+			/* Draw horizontal part of the grid */
+			for ( int y = 0; y < 9; y++ )
 			{
 				if ( y_grid_offset + y * height <= scanline && scanline < y_grid_offset + y * height + 3 )
 				{
 					for ( int i = 0; i < 9; i++ )
 					{
-						if ( ( m_vdc.s.hgrid[0][i] & j ) || ( m_vdc.s.hgrid[1][i] & ( j >> 8 ) ) )
+						if ( BIT(m_vdc.s.hgrid[1][i] << 8 | m_vdc.s.hgrid[0][i], y) )
 						{
 							for ( int k = 0; k < width + 2; k++ )
 							{
-								int px = x_grid_offset + i * width + k;
+								int x = (x_grid_offset + i * width + k) * 2;
+
+								for (int px = x; px < x + 2; px++)
+								{
+									if (cliprect.contains(px, scanline))
+									{
+										m_collision_map[ px ] |= 0x20;
+										bitmap.pix16( scanline, px ) = color;
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+
+			/* Draw dots part of the grid */
+			if ( m_vdc.s.control & 0x40 )
+			{
+				for ( int y = 0; y < 9; y++ )
+				{
+					if ( y_grid_offset + y * height <= scanline && scanline < y_grid_offset + y * height + 3 )
+					{
+						for ( int i = 0; i < 10; i++ )
+						{
+							for ( int k = 0; k < 2; k++ )
+							{
+								int x = (x_grid_offset + i * width + k) * 2;
 
-								if ( px < 160 )
+								for (int px = x; px < x + 2; px++)
 								{
-									collision_map[ px ] |= COLLISION_HORIZ_GRID_DOTS;
-									m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + 2 * px ) = color;
-									m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + 2 * px + 1 ) = color;
+									if (cliprect.contains(px, scanline))
+									{
+										m_collision_map[ px ] |= 0x20;
+										bitmap.pix16( scanline, px ) = color;
+									}
 								}
 							}
 						}
@@ -472,7 +571,7 @@
 				}
 			}
 
-			/* Draw vertical part of grid */
+			/* Draw vertical part of the grid */
 			for( int j = 1, y = 0; y < 8; y++, j <<= 1 )
 			{
 				if ( y_grid_offset + y * height <= scanline && scanline < y_grid_offset + ( y + 1 ) * height )
@@ -483,23 +582,15 @@
 						{
 							for ( int k = 0; k < w; k++ )
 							{
-								int px = x_grid_offset + i * width + k;
+								int x = (x_grid_offset + i * width + k) * 2;
 
-								if ( px < 160 )
+								for (int px = x; px < x + 2; px++)
 								{
-									/* Check if we collide with an already drawn source object */
-									if ( collision_map[ px ] & m_vdc.s.collision )
-									{
-										m_collision_status |= COLLISION_VERTICAL_GRID;
-									}
-									/* Check if an already drawn object would collide with us */
-									if ( COLLISION_VERTICAL_GRID & m_vdc.s.collision && collision_map[ px ] )
+									if (cliprect.contains(px, scanline))
 									{
-										m_collision_status |= collision_map[ px ];
+										m_collision_map[ px ] |= 0x10;
+										bitmap.pix16( scanline, px ) = color;
 									}
-									collision_map[ px ] |= COLLISION_VERTICAL_GRID;
-									m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + 2 * px ) = color;
-									m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + 2 * px + 1 ) = color;
 								}
 							}
 						}
@@ -509,40 +600,49 @@
 		}
 
 		/* Display objects if enabled */
-		if ( m_vdc.s.control & 0x20 )
+		if ( m_vdc.s.control & 0x20 && scanline <= 242 )
 		{
 			/* Regular foreground objects */
-			for ( int i = 0; i < ARRAY_LENGTH( m_vdc.s.foreground ); i++ )
+			for ( int i = ARRAY_LENGTH( m_vdc.s.foreground ) - 1; i >= 0; i-- )
 			{
-				int y = m_vdc.s.foreground[i].y & 0xFE;
+				int y = m_vdc.s.foreground[i].y;
 				int height = 8 - ( ( ( y >> 1 ) + m_vdc.s.foreground[i].ptr ) & 7 );
+				if (height == 1) height = 8;
 
-				if ( y >= 0x0E && y <= scanline && scanline < y + height * 2 )
+				if ( y <= scanline && scanline < y + height * 2 )
 				{
-					uint16_t color = 8 + bgr2rgb[ ( ( m_vdc.s.foreground[i].color >> 1 ) & 0x07 ) ];
-					int    offset = ( m_vdc.s.foreground[i].ptr | ( ( m_vdc.s.foreground[i].color & 0x01 ) << 8 ) ) + ( y >> 1 ) + ( ( scanline - y ) >> 1 );
-					uint8_t  chr = c_shape[ offset & 0x1FF ];
-					int    x = m_vdc.s.foreground[i].x;
+					uint16_t color = 8 + ( ( m_vdc.s.foreground[i].color >> 1 ) & 0x07 );
+					int offset = ( m_vdc.s.foreground[i].ptr | ( ( m_vdc.s.foreground[i].color & 0x01 ) << 8 ) ) + ( y >> 1 ) + ( ( scanline - y ) >> 1 );
+					uint8_t chr = m_charset[ offset & 0x1FF ];
+					int x = (m_vdc.s.foreground[i].x + 5) * 2;
 
-					for ( uint8_t m = 0x80; m > 0; m >>= 1, x++ )
+					for ( uint8_t m = 0x80; m > 0; m >>= 1, x += 2 )
 					{
 						if ( chr & m )
 						{
-							if ( x >= 0 && x < 160 )
+							for (int px = x; px < x + 2; px++)
 							{
-								/* Check if we collide with an already drawn source object */
-								if ( collision_map[ x ] & m_vdc.s.collision )
+								if (cliprect.contains(px, scanline))
 								{
-									m_collision_status |= COLLISION_CHARACTERS;
-								}
-								/* Check if an already drawn object would collide with us */
-								if ( COLLISION_CHARACTERS & m_vdc.s.collision && collision_map[ x ] )
-								{
-									m_collision_status |= collision_map[ x ];
+									// Check collision with self
+									u8 colx = m_collision_map[ px ];
+									if (colx & 0x80)
+									{
+										colx &= ~0x80;
+										m_control_status |= 0x80;
+									}
+
+									// Check if we collide with an already drawn source object
+									if (m_vdc.s.collision & colx)
+										m_collision_status |= 0x80;
+
+									// Check if an already drawn object would collide with us
+									if (m_vdc.s.collision & 0x80)
+										m_collision_status |= colx;
+
+									m_collision_map[ px ] |= 0x80;
+									bitmap.pix16( scanline, px ) = color;
 								}
-								collision_map[ x ] |= COLLISION_CHARACTERS;
-								m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + 2 * x ) = color;
-								m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + 2 * x + 1 ) = color;
 							}
 						}
 					}
@@ -550,172 +650,110 @@
 			}
 
 			/* Quad objects */
-			for ( int i = 0; i < ARRAY_LENGTH( m_vdc.s.quad ); i++ )
+			for ( int i = ARRAY_LENGTH( m_vdc.s.quad ) - 1; i >= 0; i-- )
 			{
 				int y = m_vdc.s.quad[i].single[0].y;
-				int height = 8;
+
+				// Character height is always determined by the height of the 4th character
+				int height = 8 - ( ( ( y >> 1 ) + m_vdc.s.quad[i].single[3].ptr ) & 7 );
+				if (height == 1) height = 8;
 
 				if ( y <= scanline && scanline < y + height * 2 )
 				{
-					int x = m_vdc.s.quad[i].single[0].x;
-
-					// Charaecter height is always determined by the height of the 4th character
-					int char_height = 8 - ( ( ( y >> 1 ) + m_vdc.s.quad[i].single[3].ptr ) & 7 );
+					int x = (m_vdc.s.quad[i].single[0].x + 5) * 2;
 
-					for ( int j = 0; j < ARRAY_LENGTH( m_vdc.s.quad[0].single ); j++, x += 8 )
+					for ( int j = 0; j < ARRAY_LENGTH( m_vdc.s.quad[0].single ); j++, x += 16 )
 					{
-						if ( y <= scanline && scanline < y + char_height * 2 )
-						{
-							uint16_t color = 8 + bgr2rgb[ ( ( m_vdc.s.quad[i].single[j].color >> 1 ) & 0x07 ) ];
-							int offset = ( m_vdc.s.quad[i].single[j].ptr | ( ( m_vdc.s.quad[i].single[j].color & 0x01 ) << 8 ) ) + ( y >> 1 ) + ( ( scanline - y ) >> 1 );
-							uint8_t chr = c_shape[ offset & 0x1FF ];
+						uint16_t color = 8 + ( ( m_vdc.s.quad[i].single[j].color >> 1 ) & 0x07 );
+						int offset = ( m_vdc.s.quad[i].single[j].ptr | ( ( m_vdc.s.quad[i].single[j].color & 0x01 ) << 8 ) ) + ( y >> 1 ) + ( ( scanline - y ) >> 1 );
+						uint8_t chr = m_charset[ offset & 0x1FF ];
 
-							for ( uint8_t m = 0x80; m > 0; m >>= 1, x++ )
+						for ( uint8_t m = 0x80; m > 0; m >>= 1, x += 2 )
+						{
+							if ( chr & m )
 							{
-								if ( chr & m )
+								for (int px = x; px < x + 2; px++)
 								{
-									if ( x >= 0 && x < 160 )
+									if (cliprect.contains(px, scanline))
 									{
-										/* Check if we collide with an already drawn source object */
-										if ( collision_map[ x ] & m_vdc.s.collision )
-										{
-											m_collision_status |= COLLISION_CHARACTERS;
-										}
-										/* Check if an already drawn object would collide with us */
-										if ( COLLISION_CHARACTERS & m_vdc.s.collision && collision_map[ x ] )
+										// Check collision with self
+										u8 colx = m_collision_map[ px ];
+										if (colx & 0x80)
 										{
-											m_collision_status |= collision_map[ x ];
+											colx &= ~0x80;
+											m_control_status |= 0x80;
 										}
-										collision_map[ x ] |= COLLISION_CHARACTERS;
-										m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + 2 * x ) = color;
-										m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + 2 * x + 1 ) = color;
+
+										// Check if we collide with an already drawn source object
+										if (m_vdc.s.collision & colx)
+											m_collision_status |= 0x80;
+
+										// Check if an already drawn object would collide with us
+										if (m_vdc.s.collision & 0x80)
+											m_collision_status |= colx;
+
+										m_collision_map[ px ] |= 0x80;
+										bitmap.pix16( scanline, px ) = color;
 									}
 								}
 							}
 						}
-						else
-						{
-							x += 8;
-						}
 					}
 				}
 			}
 
 			/* Sprites */
-			for ( int i = 0; i < ARRAY_LENGTH( m_vdc.s.sprites ); i++ )
+			for ( int i = ARRAY_LENGTH( m_vdc.s.sprites ) - 1; i >= 0; i-- )
 			{
 				int y = m_vdc.s.sprites[i].y;
 				int height = 8;
+				bool zoom_enable = bool(m_vdc.s.sprites[i].color & 4);
+				int zoom_px = zoom_enable ? 4 : 2;
 
-				if ( m_vdc.s.sprites[i].color & 4 )
+				if ( y <= scanline && scanline < y + height * zoom_px )
 				{
-					/* Zoomed sprite */
-					if ( y <= scanline && scanline < y + height * 4 )
+					uint16_t color = 8 + ( ( m_vdc.s.sprites[i].color >> 3 ) & 0x07 );
+					uint8_t chr = m_vdc.s.shape[i][ ( ( scanline - y ) / zoom_px ) ];
+					int x = (m_vdc.s.sprites[i].x + 5) * 2;
+					int x_shift = 0;
+
+					switch ( m_vdc.s.sprites[i].color & 0x03 )
 					{
-						uint16_t color = 8 + bgr2rgb[ ( ( m_vdc.s.sprites[i].color >> 3 ) & 0x07 ) ];
-						uint8_t  chr = m_vdc.s.shape[i][ ( ( scanline - y ) >> 2 ) ];
-						int    x = m_vdc.s.sprites[i].x;
-						int    x_shift = 0;
+						case 1:    // Xg attribute set
+							x_shift = 1;
+							break;
+						case 2:    // S attribute set
+							x_shift = ( ( ( scanline - y ) / zoom_px ) & 0x01 ) ^ 0x01;
+							break;
+						case 3:    // Xg and S attributes set
+							x_shift = ( ( scanline - y ) / zoom_px ) & 0x01;
+							break;
+						default:
+							break;
+					}
 
-						switch ( m_vdc.s.sprites[i].color & 0x03 )
-						{
-							case 1:    // Xg attribute set
-								x_shift = 2;
-								break;
-							case 2:    // S attribute set
-								x_shift = ( ( ( scanline - y ) >> 1 ) & 0x01 ) ^ 0x01;
-								break;
-							case 3:    // Xg and S attributes set
-								x_shift = ( ( scanline - y ) >> 1 ) & 0x01;
-								break;
-						}
-						x_shift <<= 1;
+					x += x_shift * (zoom_px / 2);
 
-						for ( uint8_t m = 0x01; m > 0; m <<= 1, x += 2 )
+					for ( uint8_t m = 0x01; m > 0; m <<= 1, x += zoom_px )
+					{
+						if ( chr & m )
 						{
-							if ( chr & m )
+							for (int px = x; px < x + zoom_px; px++)
 							{
-								if ( x >= 0 && x < 160 )
+								if (cliprect.contains(px, scanline))
 								{
-									/* Check if we collide with an already drawn source object */
-									if ( collision_map[ x ] & m_vdc.s.collision )
-									{
-										m_collision_status |= ( 1 << i );
-									}
-									/* Check if an already drawn object would collide with us */
-									if ( ( 1 << i ) & m_vdc.s.collision && collision_map[ x ] )
-									{
-										m_collision_status |= collision_map[ x ];
-									}
-									collision_map[ x ] |= ( 1 << i );
-									m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + x_shift + 2 * x ) = color;
-									m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + x_shift + 2 * x + 1 ) = color;
-								}
-								if ( x >= -1 && x < 159 )
-								{
-									if ( x >= 0 )
-									{
-										/* Check if we collide with an already drawn source object */
-										if ( collision_map[ x ] & m_vdc.s.collision )
-										{
-											m_collision_status |= ( 1 << i );
-										}
-										/* Check if an already drawn object would collide with us */
-										if ( ( 1 << i ) & m_vdc.s.collision && collision_map[ x ] )
-										{
-											m_collision_status |= collision_map[ x ];
-										}
-										collision_map[ x ] |= ( 1 << i );
-									}
-									m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + x_shift + 2 * x + 2 ) = color;
-									m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + x_shift + 2 * x + 3 ) = color;
-								}
-							}
-						}
-					}
-				}
-				else
-				{
-					/* Regular sprite */
-					if ( y <= scanline && scanline < y + height * 2 )
-					{
-						uint16_t color = 8 + bgr2rgb[ ( ( m_vdc.s.sprites[i].color >> 3 ) & 0x07 ) ];
-						uint8_t  chr = m_vdc.s.shape[i][ ( ( scanline - y ) >> 1 ) ];
-						int    x = m_vdc.s.sprites[i].x;
-						int    x_shift = 0;
+									u8 mask = 1 << i;
 
-						switch ( m_vdc.s.sprites[i].color & 0x03 )
-						{
-							case 1:    // Xg attribute set
-								x_shift = 1;
-								break;
-							case 2:    // S attribute set
-								x_shift = ( ( ( scanline - y ) >> 1 ) & 0x01 ) ^ 0x01;
-								break;
-							case 3:    // Xg and S attributes set
-								x_shift = ( ( scanline - y ) >> 1 ) & 0x01;
-								break;
-						}
+									// Check if we collide with an already drawn source object
+									if (m_vdc.s.collision & m_collision_map[ px ])
+										m_collision_status |= mask;
+
+									// Check if an already drawn object would collide with us
+									if (m_vdc.s.collision & mask)
+										m_collision_status |= m_collision_map[ px ];
 
-						for ( uint8_t m = 0x01; m > 0; m <<= 1, x++ )
-						{
-							if ( chr & m )
-							{
-								if ( x >= 0 && x < 160 )
-								{
-									/* Check if we collide with an already drawn source object */
-									if ( collision_map[ x ] & m_vdc.s.collision )
-									{
-										m_collision_status |= ( 1 << i );
-									}
-									/* Check if an already drawn object would collide with us */
-									if ( ( 1 << i ) & m_vdc.s.collision && collision_map[ x ] )
-									{
-										m_collision_status |= collision_map[ x ];
-									}
-									collision_map[ x ] |= ( 1 << i );
-									m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + x_shift + 2 * x ) = color;
-									m_tmp_bitmap.pix16( vpos, START_ACTIVE_SCAN + 10 + x_shift + 2 * x + 1 ) = color;
+									m_collision_map[ px ] |= mask;
+									bitmap.pix16( scanline, px ) = color;
 								}
 							}
 						}
@@ -725,83 +763,56 @@
 		}
 	}
 
-	// Allow driver to do additional processing
-	m_postprocess_func( vpos );
+	return 0;
+}
+
 
-	/* Check for start of VBlank */
-	if ( vpos == m_start_vblank )
+void i8244_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
+{
+	u8 volume = m_vdc.s.sound & 0xf;
+	int sample_on = (m_sh_output & m_vdc.s.sound >> 7) * 0x4000;
+
+	for (int i = 0; i < samples; i++)
 	{
-		m_control_status |= 0x08;
-		if ( ! m_iff )
-		{
-			m_iff = 1;
-			m_irq_func(ASSERT_LINE);
-		}
+		// clock duty cycle
+		m_sh_duty = (m_sh_duty + 1) & 0xf;
+		outputs[0][i] = (m_sh_duty < volume) ? sample_on : 0;
 	}
 }
 
 
-void i8244_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
+void i8244_device::sound_update()
 {
-	uint32_t old_signal, signal;
-	int ii;
-	int period;
-	stream_sample_t *buffer = outputs[0];
-
-	/* Generate the signal */
-	old_signal = signal = m_vdc.s.shift3 | (m_vdc.s.shift2 << 8) | (m_vdc.s.shift1 << 16);
+	// clock prescaler
+	m_sh_prescaler++;
+	u8 prescaler_mask = (m_vdc.s.sound & 0x20) ? 3 : 0xf;
+	if ((m_sh_prescaler & prescaler_mask) == 0)
+		m_sh_pending = true;
 
-	if( m_vdc.s.sound & 0x80 )  /* Sound is enabled */
+	// clock shift registers
+	if (m_sh_pending && !m_sh_written)
 	{
-		for( ii = 0; ii < samples; ii++, buffer++ )
-		{
-			*buffer = signal & 0x1;
-			period = (m_vdc.s.sound & 0x20) ? 1 : 4;
-			if( ++m_sh_count >= period )
-			{
-				m_sh_count = 0;
-				signal >>= 1;
-				/* Loop sound */
-				signal |= *buffer << 23;
-				/* Check if noise should be applied */
-				if ( m_vdc.s.sound & 0x10 )
-				{
-					/* Noise tap is on bits 0 and 5 and fed back to bits 15 (and 23!) */
-					uint32_t new_bit = ( ( old_signal ) ^ ( old_signal >> 5 ) ) & 0x01;
-					signal = ( old_signal & 0xFF0000 ) | ( ( old_signal & 0xFFFF ) >> 1 ) | ( new_bit << 15 ) | ( new_bit << 23 );
-				}
-				m_vdc.s.shift3 = signal & 0xFF;
-				m_vdc.s.shift2 = ( signal >> 8 ) & 0xFF;
-				m_vdc.s.shift1 = ( signal >> 16 ) & 0xFF;
-				old_signal = signal;
-			}
+		m_stream->update();
+		m_sh_pending = false;
 
-			/* Throw an interrupt if enabled */
-			if( m_vdc.s.control & 0x4 )
-			{
-				// This feature does not seem to be finished/enabled in hardware!
-			}
+		u32 signal = m_vdc.s.shift3 | (m_vdc.s.shift2 << 8) | (m_vdc.s.shift1 << 16);
+		m_sh_output = signal & 1;
+		int feedback = m_sh_output;
+		signal >>= 1;
 
-			/* Adjust volume */
-			*buffer *= m_vdc.s.sound & 0xf;
-			/* Pump the volume up */
-			*buffer <<= 10;
-		}
-	}
-	else
-	{
-		/* Sound disabled, so clear the buffer */
-		for( ii = 0; ii < samples; ii++, buffer++ )
+		/* Noise tap is on bits 0 and 5 and fed back to bit 15 */
+		if (m_vdc.s.sound & 0x10)
 		{
-			*buffer = 0;
+			feedback ^= signal >> 4 & 1; // pre-shift bit 5
+			signal = (signal & ~0x8000) | (feedback << 15);
 		}
-	}
-}
-
 
-uint32_t i8244_device::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	copybitmap( bitmap, m_tmp_bitmap, 0, 0, 0, 0, cliprect );
+		/* Loop sound */
+		signal |= feedback << 23;
 
-	return 0;
+		m_vdc.s.shift3 = signal & 0xFF;
+		m_vdc.s.shift2 = ( signal >> 8 ) & 0xFF;
+		m_vdc.s.shift1 = ( signal >> 16 ) & 0xFF;
+	}
+	m_sh_written = false;
 }
diff -Nru mame-0.222+dfsg.1/src/devices/video/i8244.h mame-0.224+dfsg.1/src/devices/video/i8244.h
--- mame-0.222+dfsg.1/src/devices/video/i8244.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/i8244.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,9 +1,7 @@
 // license:BSD-3-Clause
-// copyright-holders:Wilbert Pol
+// copyright-holders:Wilbert Pol, hap
 /***************************************************************************
 
-    i8244.h
-
     Intel 8244 (NTSC)/8245 (PAL) Graphics and sound chip
 
 ***************************************************************************/
@@ -33,103 +31,126 @@
 
 	// configuration helpers
 	auto irq_cb() { return m_irq_func.bind(); }
-	auto postprocess_cb() { return m_postprocess_func.bind(); }
+	i8244_device &set_screen_size(int width, int height, int cropx = 0, int cropy = 0);
 
 	uint8_t read(offs_t offset);
 	void write(offs_t offset, uint8_t data);
+	void write_cx(int x, bool cx); // CX pin on current scanline
+
 	int vblank();
 	int hblank();
 	void i8244_palette(palette_device &palette) const;
 
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	inline bitmap_ind16 *get_bitmap() { return &m_tmp_bitmap; }
-
-	// Global constants
-	static constexpr int START_ACTIVE_SCAN = 42;
-	static constexpr int BORDER_SIZE       = 10;
-	static constexpr int END_ACTIVE_SCAN   = 42 + 10 + 320 + 10;
-	static constexpr int START_Y           = 1;
-	static constexpr int SCREEN_HEIGHT     = 243;
-	static constexpr int LINE_CLOCKS       = 455;
-	static constexpr int LINES             = 262;
-
 protected:
 	union vdc_t {
 		uint8_t reg[0x100];
 		struct {
+			// 0x00
 			struct {
-				uint8_t y,x,color,res;
+				uint8_t y,x,color,unused;
 			} sprites[4];
+
+			// 0x10
 			struct {
 				uint8_t y,x,ptr,color;
 			} foreground[12];
+
+			// 0x40
 			struct {
 				struct {
 					uint8_t y,x,ptr,color;
 				} single[4];
 			} quad[4];
+
+			// 0x80
 			uint8_t shape[4][8];
+
+			// 0xa0
 			uint8_t control;
 			uint8_t status;
 			uint8_t collision;
 			uint8_t color;
 			uint8_t y;
 			uint8_t x;
-			uint8_t res;
+			uint8_t unused;
 			uint8_t shift1;
 			uint8_t shift2;
 			uint8_t shift3;
 			uint8_t sound;
-			uint8_t res2[5+0x10];
+			uint8_t unused2[5+0x10];
+
+			// 0xc0
 			uint8_t hgrid[2][0x10];
 			uint8_t vgrid[0x10];
+			uint8_t unused3[0x10];
 		} s;
 	};
 
-	i8244_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int lines);
+	i8244_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 
 	// device-level overrides
 	virtual void device_config_complete() override;
 	virtual void device_start() override;
-	virtual void device_reset() override;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
 
 	// device_sound_interface overrides
 	virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
 
-	void render_scanline(int vpos);
+	virtual void set_default_params();
+
+	//void render_scanline(int vpos);
 	int get_y_beam();
 	int get_x_beam();
 	offs_t fix_register_mirrors( offs_t offset );
-
-	// Local constants
-	static constexpr uint8_t VDC_CONTROL_REG_STROBE_XY = 0x02;
+	bool invalid_register( offs_t offset, bool rw );
 
 	/* timers */
-	static constexpr device_timer_id TIMER_LINE = 0;
-	static constexpr device_timer_id TIMER_HBLANK = 1;
+	static constexpr device_timer_id TIMER_VBLANK_START = 0;
+	static constexpr device_timer_id TIMER_HBLANK_START = 1;
 
 	// callbacks
 	devcb_write_line m_irq_func;
-	devcb_write16 m_postprocess_func;
 
-	bitmap_ind16 m_tmp_bitmap;
-	emu_timer *m_line_timer;
+	required_region_ptr<uint8_t> m_charset;
+
 	emu_timer *m_hblank_timer;
+	emu_timer *m_vblank_timer;
 	sound_stream *m_stream;
 
-	int m_start_vpos;
-	int m_start_vblank;
-	int m_screen_lines;
+	void sound_update();
+
+	int m_htotal;
+	int m_vtotal;
+	int m_width;
+	int m_height;
+	int m_cropx;
+	int m_cropy;
+
+	int m_vblank_start;
+	int m_vblank_end;
+	int m_hblank_start;
+	int m_hblank_end;
+	int m_bgate_start;
 
 	vdc_t m_vdc;
-	uint16_t m_sh_count;
-	uint8_t m_x_beam_pos;
-	uint8_t m_y_beam_pos;
-	uint8_t m_control_status;
-	uint8_t m_collision_status;
-	int m_iff;
+	uint8_t m_collision_map[0x200];
+
+	uint8_t m_x_beam_pos = 0;
+	uint8_t m_y_beam_pos = 0;
+	uint8_t m_y_latch = 0;
+	uint8_t m_control_status = 0;
+	uint8_t m_collision_status = 0;
+	bool m_pos_hold = false;
+	bool m_y_hold = false;
+
+	bool m_sh_written = false;
+	bool m_sh_pending = false;
+	u8 m_sh_prescaler = 0 ;
+	int m_sh_output = 0;
+	u8 m_sh_duty = 0;
 };
 
 
@@ -139,7 +160,8 @@
 	// construction/destruction
 	i8245_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	static constexpr int LINES = 312;
+protected:
+	virtual void set_default_params() override;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/video/imagetek_i4100.cpp mame-0.224+dfsg.1/src/devices/video/imagetek_i4100.cpp
--- mame-0.222+dfsg.1/src/devices/video/imagetek_i4100.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/imagetek_i4100.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -24,7 +24,7 @@
     - puzzli: emulate hblank irq and fix video routines here (water effect not emulated,
       confirmed on PCB ref). Are the screen_ctrl_w "led" bits actually buffer latches
       for the layers? They get written in the middle of the screen, may also be v2 specific.
-    - Unemulated flip screen.
+    - Unemulated/Unverified scrolling in flip screen.
 
 ============================================================================
 
@@ -271,6 +271,8 @@
 	, m_support_16x16(has_ext_tiles)
 	, m_tilemap_scrolldx{0, 0, 0}
 	, m_tilemap_scrolldy{0, 0, 0}
+	, m_tilemap_flip_scrolldx{0, 0, 0}
+	, m_tilemap_flip_scrolldy{0, 0, 0}
 	, m_spriteram_buffered(false)
 {
 }
@@ -1066,8 +1068,8 @@
 
 				if (m_screen_flip)
 				{
-					flipx = !flipx;     x = max_x - x - width;
-					flipy = !flipy;     y = max_y - y - height;
+					flipx = !flipx;     x = max_x - x - ((width * sprite_ptr->zoom) >> 16);
+					flipy = !flipy;     y = max_y - y - ((height * sprite_ptr->zoom) >> 16);
 				}
 
 				draw_spritegfx(screen, bitmap, cliprect,
@@ -1184,54 +1186,27 @@
 	int const windowwidth  = width >> 2;
 	int const windowheight = height >> 3;
 
-	int const dx = m_tilemap_scrolldx[layer] * (m_screen_flip ? 1 : -1);
-	int const dy = m_tilemap_scrolldy[layer] * (m_screen_flip ? 1 : -1);
+	int const dx = m_screen_flip ? m_tilemap_flip_scrolldx[layer] : m_tilemap_scrolldx[layer];
+	int const dy = m_screen_flip ? m_tilemap_flip_scrolldy[layer] : m_tilemap_scrolldy[layer];
 
 	sx += dx;
 	sy += dy;
 
-	int min_x, max_x, min_y, max_y;
-
-	// TODO : allow cliprect related drawing with flipscreen
-	if (dx != 0)
-	{
-		min_x = 0;
-		max_x = scrwidth - 1;
-	}
-	else
-	{
-		min_x = cliprect.min_x;
-		max_x = cliprect.max_x;
-	}
-
-	if (dy != 0)
-	{
-		min_y = 0;
-		max_y = scrheight - 1;
-	}
-	else
-	{
-		min_y = cliprect.min_y;
-		max_y = cliprect.max_y;
-	}
-
-	int draw_y = m_screen_flip ? scrheight - min_y - 1 : min_y;
-	int draw_inc = m_screen_flip ? -1 : 1;
-
-	for (int y = min_y; y <= max_y; draw_y += draw_inc, y++)
+	for (int y = cliprect.min_y; y <= cliprect.max_y; y++)
 	{
-		int const scrolly = (sy + y - wy) & (windowheight - 1);
+		int const resy = (sy + y - wy);
+		int const scrolly = (m_screen_flip ? (scrheight - resy - 1) : resy) & (windowheight - 1);
 		int srcline = (wy + scrolly) & (height - 1);
 		int const srctilerow = srcline >> tileshift;
 		srcline &= tilemask;
 
-		u32 *dst = &bitmap.pix32(draw_y);
-		u8 *priority_baseaddr = &priority_bitmap.pix8(draw_y);
+		u32 *dst = &bitmap.pix32(y);
+		u8 *priority_baseaddr = &priority_bitmap.pix8(y);
 
-		int draw_x = m_screen_flip ? scrwidth - min_x - 1 : min_x;
-		for (int x = min_x; x <= max_x; draw_x += draw_inc, x++)
+		for (int x = cliprect.min_x; x <= cliprect.max_x; x++)
 		{
-			int const scrollx = (sx + x - wx) & (windowwidth - 1);
+			int const resx = (sx + x - wx);
+			int const scrollx = (m_screen_flip ? (scrwidth - resx - 1) : resx) & (windowwidth - 1);
 			int srccol = (wx + scrollx) & (width - 1);
 			int const srctilecol = srccol >> tileshift;
 			srccol &= tilemask;
@@ -1244,8 +1219,8 @@
 
 			if (draw)
 			{
-				dst[draw_x] = dat;
-				priority_baseaddr[draw_x] = pcode;
+				dst[x] = dat;
+				priority_baseaddr[x] = pcode;
 			}
 		}
 	}
diff -Nru mame-0.222+dfsg.1/src/devices/video/imagetek_i4100.h mame-0.224+dfsg.1/src/devices/video/imagetek_i4100.h
--- mame-0.222+dfsg.1/src/devices/video/imagetek_i4100.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/imagetek_i4100.h	2020-08-26 08:57:19.000000000 +0000
@@ -32,8 +32,24 @@
 
 	void map(address_map &map);
 
-	void set_tmap_xoffsets(int x1, int x2, int x3) { m_tilemap_scrolldx[0] = x1; m_tilemap_scrolldx[1] = x2; m_tilemap_scrolldx[2] = x3; }
-	void set_tmap_yoffsets(int y1, int y2, int y3) { m_tilemap_scrolldy[0] = y1; m_tilemap_scrolldy[1] = y2; m_tilemap_scrolldy[2] = y3; }
+	void set_tmap_flip_xoffsets(int x1, int x2, int x3) { m_tilemap_flip_scrolldx[0] = x1; m_tilemap_flip_scrolldx[1] = x2; m_tilemap_flip_scrolldx[2] = x3; }
+	void set_tmap_flip_yoffsets(int y1, int y2, int y3) { m_tilemap_flip_scrolldy[0] = y1; m_tilemap_flip_scrolldy[1] = y2; m_tilemap_flip_scrolldy[2] = y3; }
+	void set_tmap_xoffsets(int x1, int x2, int x3)
+	{
+		m_tilemap_scrolldx[0] = x1;
+		m_tilemap_scrolldx[1] = x2;
+		m_tilemap_scrolldx[2] = x3;
+		// default flip xoffset
+		set_tmap_flip_xoffsets(-x1, -x2, -x3);
+	}
+	void set_tmap_yoffsets(int y1, int y2, int y3)
+	{
+		m_tilemap_scrolldy[0] = y1;
+		m_tilemap_scrolldy[1] = y2;
+		m_tilemap_scrolldy[2] = y3;
+		// default flip yoffset
+		set_tmap_flip_yoffsets(-y1, -y2, -y3);
+	}
 
 	auto blit_irq_cb() { return m_blit_irq_cb.bind(); }
 	void set_spriteram_buffered(bool buffer) { m_spriteram_buffered = buffer; }
@@ -97,6 +113,8 @@
 	const bool m_support_8bpp, m_support_16x16;
 	int  m_tilemap_scrolldx[3];
 	int  m_tilemap_scrolldy[3];
+	int  m_tilemap_flip_scrolldx[3];
+	int  m_tilemap_flip_scrolldy[3];
 	bool m_spriteram_buffered;
 
 	void blt_write(const int tmap, const offs_t offs, const u16 data, const u16 mask);
diff -Nru mame-0.222+dfsg.1/src/devices/video/jangou_blitter.cpp mame-0.224+dfsg.1/src/devices/video/jangou_blitter.cpp
--- mame-0.222+dfsg.1/src/devices/video/jangou_blitter.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/jangou_blitter.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -94,6 +94,7 @@
 {
 	memset(m_pen_data, 0, ARRAY_LENGTH(m_pen_data));
 	m_bltflip = false;
+	m_src_addr = 0;
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/devices/video/mc6845.cpp mame-0.224+dfsg.1/src/devices/video/mc6845.cpp
--- mame-0.222+dfsg.1/src/devices/video/mc6845.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/mc6845.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Wilbert Pol, Bartman/Abyss (HD6345)
+// copyright-holders:Wilbert Pol,Nigel Barnes
 /**********************************************************************
 
     Motorola MC6845 and compatible CRT controller emulation
@@ -32,12 +32,16 @@
     - Support 'interlace and video' mode
 
     - mos8563
-
         - horizontal scroll
         - vertical scroll
         - bitmap modes
         - display enable begin/end
 
+    - hd6345
+        - smooth scrolling
+        - second cursor
+        - interrupt request
+
 */
 
 #include "emu.h"
@@ -65,7 +69,7 @@
 DEFINE_DEVICE_TYPE(HD6845S,  hd6845s_device,  "hd6845s",  "Hitachi HD6845S CRTC") // same as HD46505S
 DEFINE_DEVICE_TYPE(SY6545_1, sy6545_1_device, "sy6545_1", "Synertek SY6545-1 CRTC")
 DEFINE_DEVICE_TYPE(SY6845E,  sy6845e_device,  "sy6845e",  "Synertek SY6845E CRTC")
-DEFINE_DEVICE_TYPE(HD6345,   hd6345_device,   "hd6345",   "Hitachi HD6345 CRTC")
+DEFINE_DEVICE_TYPE(HD6345,   hd6345_device,   "hd6345",   "Hitachi HD6345 CRTC-II")
 DEFINE_DEVICE_TYPE(AMS40489, ams40489_device, "ams40489", "AMS40489 ASIC (CRTC)")
 DEFINE_DEVICE_TYPE(MOS8563,  mos8563_device,  "mos8563",  "MOS 8563 VDC")
 DEFINE_DEVICE_TYPE(MOS8568,  mos8568_device,  "mos8568",  "MOS 8568 VDC")
@@ -101,25 +105,25 @@
 
 
 mc6845_device::mc6845_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
-	: device_t(mconfig, type, tag, owner, clock),
-		device_video_interface(mconfig, *this, false),
-		m_show_border_area(true),
-		m_interlace_adjust(0),
-		m_clk_scale(1),
-		m_visarea_adjust_min_x(0),
-		m_visarea_adjust_max_x(0),
-		m_visarea_adjust_min_y(0),
-		m_visarea_adjust_max_y(0),
-		m_hpixels_per_column(0),
-		m_reconfigure_cb(*this),
-		m_begin_update_cb(*this),
-		m_update_row_cb(*this),
-		m_end_update_cb(*this),
-		m_on_update_addr_changed_cb(*this),
-		m_out_de_cb(*this),
-		m_out_cur_cb(*this),
-		m_out_hsync_cb(*this),
-		m_out_vsync_cb(*this)
+	: device_t(mconfig, type, tag, owner, clock)
+	, device_video_interface(mconfig, *this, false)
+	, m_show_border_area(true)
+	, m_interlace_adjust(0)
+	, m_clk_scale(1)
+	, m_visarea_adjust_min_x(0)
+	, m_visarea_adjust_max_x(0)
+	, m_visarea_adjust_min_y(0)
+	, m_visarea_adjust_max_y(0)
+	, m_hpixels_per_column(0)
+	, m_reconfigure_cb(*this)
+	, m_begin_update_cb(*this)
+	, m_update_row_cb(*this)
+	, m_end_update_cb(*this)
+	, m_on_update_addr_changed_cb(*this)
+	, m_out_de_cb(*this)
+	, m_out_cur_cb(*this)
+	, m_out_hsync_cb(*this)
+	, m_out_vsync_cb(*this)
 {
 }
 
@@ -234,7 +238,7 @@
 		 {{ "R0 - Horizontal Total",       "R1 - Horizontal Displayed",   "R2 - Horizontal Sync Position",
 			"R3 - Sync Width",             "R4 - Vertical Total",         "R5 - Vertical Total Adjust",
 			"R6 - Vertical Displayed",     "R7 - Vertical Sync Position", "R8 - Interlace & Skew",
-			"R9 - Maximum Raster Address", "R10 - Cursor Start Address",  "R11 - Cursor End Address",
+			"R9 - Maximum Raster Address", "R10 - Cursor Start Raster",   "R11 - Cursor End Raster",
 			"R12 - Start Address (H)",     "R13 - Start Address (L)",     "R14 - Cursor (H)",
 			"R15 - Cursor (L)" }}[(m_register_address_latch & 0x0f)]);
 
@@ -434,17 +438,34 @@
 
 uint8_t hd6345_device::register_r()
 {
-	uint8_t ret = 0xff;
+	uint8_t ret = 0;
 
 	switch (m_register_address_latch)
 	{
-		case 0x0c:  ret = m_supports_disp_start_addr_r ? (m_disp_start_addr >> 8) & 0xff : 0; break;
-		case 0x0d:  ret = m_supports_disp_start_addr_r ? (m_disp_start_addr >> 0) & 0xff : 0; break;
-		case 0x0e:  ret = (m_cursor_addr    >> 8) & 0xff; break;
-		case 0x0f:  ret = (m_cursor_addr    >> 0) & 0xff; break;
-		case 0x10:  ret = (m_light_pen_addr >> 8) & 0xff; m_light_pen_latched = false; break;
-		case 0x11:  ret = (m_light_pen_addr >> 0) & 0xff; m_light_pen_latched = false; break;
-		// TODO: REST
+		case 0x0c:  ret = (m_disp_start_addr  >> 8) & 0xff; break;
+		case 0x0d:  ret = (m_disp_start_addr  >> 0) & 0xff; break;
+		case 0x0e:  ret = (m_cursor_addr      >> 8) & 0xff; break;
+		case 0x0f:  ret = (m_cursor_addr      >> 0) & 0xff; break;
+		case 0x10:  ret = (m_light_pen_addr   >> 8) & 0xff; m_light_pen_latched = false; break;
+		case 0x11:  ret = (m_light_pen_addr   >> 0) & 0xff; m_light_pen_latched = false; break;
+		case 0x12:  ret = m_disp2_pos; break;
+		case 0x13:  ret = (m_disp2_start_addr >> 8) & 0xff; break;
+		case 0x14:  ret = (m_disp2_start_addr >> 0) & 0xff; break;
+		case 0x15:  ret = m_disp3_pos; break;
+		case 0x16:  ret = (m_disp3_start_addr >> 8) & 0xff; break;
+		case 0x17:  ret = (m_disp3_start_addr >> 0) & 0xff; break;
+		case 0x18:  ret = m_disp4_pos; break;
+		case 0x19:  ret = (m_disp4_start_addr >> 8) & 0xff; break;
+		case 0x1a:  ret = (m_disp4_start_addr >> 0) & 0xff; break;
+		case 0x1b:  ret = m_vert_sync_pos_adj; break;
+		case 0x1c: /* TODO: light pen raster */ break;
+		case 0x1d:  ret = m_smooth_scroll_ras; break;
+		case 0x1f: /* TODO: status */ break;
+		case 0x21:  ret = m_mem_width_offs; break;
+		case 0x24:  ret = (m_cursor2_addr     >> 8) & 0xff; break;
+		case 0x25:  ret = (m_cursor2_addr     >> 0) & 0xff; break;
+		case 0x26:  ret = m_cursor_width; break;
+		case 0x27:  ret = m_cursor2_width; break;
 	}
 
 	return ret;
@@ -454,6 +475,26 @@
 {
 	LOGREGS("%s:HD6345 reg 0x%02x = 0x%02x\n", machine().describe_context(), m_register_address_latch, data);
 
+	/* Omits LOGSETUP logs of cursor registers as they tend to be spammy */
+	if (m_register_address_latch < 0x28 &&
+		m_register_address_latch != 0x0a && m_register_address_latch != 0x0a &&
+		m_register_address_latch != 0x0e && m_register_address_latch != 0x0f)
+		LOGSETUP(" * %02x <= %3u [%02x] %s\n", m_register_address_latch, data, data, std::array<char const *, 40>
+		 {{ "R0 - Horizontal Total",            "R1 - Horizontal Displayed",        "R2 - Horizontal Sync Position",
+			"R3 - Sync Width",                  "R4 - Vertical Total",              "R5 - Vertical Total Adjust",
+			"R6 - Vertical Displayed",          "R7 - Vertical Sync Position",      "R8 - Interlace Mode & Skew",
+			"R9 - Maximum Raster Address",      "R10 - Cursor 1 Start",             "R11 - Cursor 1 End",
+			"R12 - Screen 1 Start Address (H)", "R13 - Screen 1 Start Address (L)", "R14 - Cursor 1 Address (H)",
+			"R15 - Cursor 1 Address (L)",       "R16 - Light Pen (H)",              "R17 - Light Pen (L)",
+			"R18 - Screen 2 Start Position",    "R19 - Screen 2 Start Address (H)", "R20 - Screen 2 Start Address (L)",
+			"R21 - Screen 3 Start Position",    "R22 - Screen 3 Start Address (H)", "R23 - Screen 3 Start Address (L)",
+			"R24 - Screen 4 Start Position",    "R25 - Screen 4 Start Address (H)", "R26 - Screen 4 Start Address (L)",
+			"R27 - Vertical Sync Position Adj", "R28 - Light Pen Raster",           "R29 - Smooth Scrolling",
+			"R30 - Control 1",                  "R31 - Control 2",                  "R32 - Control 3",
+			"R33 - Memory Width Offset",        "R34 - Cursor 2 Start",             "R35 - Cursor 2 End",
+			"R36 - Cursor 2 Address (H)",       "R37 - Cursor 2 Address (L)",       "R38 - Cursor 1 Width",
+			"R39 - Cursor 2 Width" }}[(m_register_address_latch & 0x3f)]);
+
 	switch (m_register_address_latch)
 	{
 		case 0x00:  m_horiz_char_total =   data & 0xff; break;
@@ -464,7 +505,7 @@
 		case 0x05:  m_vert_total_adj   =   data & 0x1f; break;
 		case 0x06:  m_vert_disp        =   data & 0xff; break;
 		case 0x07:  m_vert_sync_pos    =   data & 0xff; break;
-		case 0x08:  m_mode_control     =   data & 0xff; break;
+		case 0x08:  m_mode_control     =   data & 0xf3; break;
 		case 0x09:  m_max_ras_addr     =   data & 0x1f; break;
 		case 0x0a:  m_cursor_start_ras =   data & 0x7f; break;
 		case 0x0b:  m_cursor_end_ras   =   data & 0x1f; break;
@@ -474,7 +515,28 @@
 		case 0x0f:  m_cursor_addr      = ((data & 0xff) << 0) | (m_cursor_addr & 0xff00); break;
 		case 0x10: /* read-only */ break;
 		case 0x11: /* read-only */ break;
-		// TODO: rest
+		case 0x12:  m_disp2_pos         =   data & 0xff; break;
+		case 0x13:  m_disp2_start_addr  = ((data & 0x3f) << 8) | (m_disp2_start_addr & 0x00ff); break;
+		case 0x14:  m_disp2_start_addr  = ((data & 0xff) << 0) | (m_disp2_start_addr & 0xff00); break;
+		case 0x15:  m_disp3_pos         =   data & 0xff; break;
+		case 0x16:  m_disp3_start_addr  = ((data & 0x3f) << 8) | (m_disp3_start_addr & 0x00ff); break;
+		case 0x17:  m_disp3_start_addr  = ((data & 0xff) << 0) | (m_disp3_start_addr & 0xff00); break;
+		case 0x18:  m_disp4_pos         =   data & 0xff; break;
+		case 0x19:  m_disp4_start_addr  = ((data & 0x3f) << 8) | (m_disp4_start_addr & 0x00ff); break;
+		case 0x1a:  m_disp4_start_addr  = ((data & 0xff) << 0) | (m_disp4_start_addr & 0xff00); break;
+		case 0x1b:  m_vert_sync_pos_adj =   data & 0x1f; break;
+		case 0x1c: /* read-only */ break;
+		case 0x1d:  m_smooth_scroll_ras =   data & 0x1f; break;
+		case 0x1e:  m_control1          =   data & 0xff; break;
+		case 0x1f:  m_control2          =   data & 0xf8; break;
+		case 0x20:  m_control3          =   data & 0xfe; break;
+		case 0x21:  m_mem_width_offs    =   data & 0xff; break;
+		case 0x22:  m_cursor2_start_ras =   data & 0x7f; break;
+		case 0x23:  m_cursor2_end_ras   =   data & 0x1f; break;
+		case 0x24:  m_cursor2_addr      = ((data & 0x3f) << 8) | (m_cursor2_addr & 0x00ff); break;
+		case 0x25:  m_cursor2_addr      = ((data & 0xff) << 0) | (m_cursor2_addr & 0xff00); break;
+		case 0x26:  m_cursor_width      =   data & 0xff; break;
+		case 0x27:  m_cursor2_width     =   data & 0xff; break;
 	}
 
 	recompute_parameters(false);
@@ -1088,6 +1150,26 @@
 }
 
 
+uint8_t hd6345_device::draw_scanline(int y, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+{
+	uint8_t ra = hd6845s_device::draw_scanline(y, bitmap, cliprect);
+
+	/* update MA for screen split */
+	if (ra == m_max_ras_addr + (MODE_INTERLACE_AND_VIDEO ? m_interlace_adjust : m_noninterlace_adjust) - 1)
+	{
+		int y_pos = y / (m_max_ras_addr + (MODE_INTERLACE_AND_VIDEO ? m_interlace_adjust : m_noninterlace_adjust));
+		if ((m_control1 & 0x03) > 0 && y_pos == m_disp2_pos && m_disp2_pos != m_disp3_pos && m_disp2_pos != m_disp4_pos)
+			m_current_disp_addr = m_disp2_start_addr;
+		if ((m_control1 & 0x03) > 1 && y_pos == m_disp3_pos && m_disp3_pos != m_disp2_pos && m_disp3_pos != m_disp4_pos)
+			m_current_disp_addr = m_disp3_start_addr;
+		if ((m_control1 & 0x03) > 2 && y_pos == m_disp4_pos && m_disp4_pos != m_disp2_pos && m_disp4_pos != m_disp3_pos)
+			m_current_disp_addr = m_disp4_start_addr;
+	}
+
+	return ra;
+}
+
+
 uint32_t mc6845_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
 	assert(bitmap.valid());
@@ -1338,12 +1420,38 @@
 {
 	hd6845s_device::device_start();
 
-	m_supports_disp_start_addr_r = true;
-	m_supports_vert_sync_width = true;
-	m_supports_status_reg_d5 = true;
-	m_supports_status_reg_d6 = true;
-	m_supports_status_reg_d7 = true;
-	//m_supports_transparent = true;
+	m_disp2_pos = 0;
+	m_disp3_pos = 0;
+	m_disp4_pos = 0;
+	m_disp2_start_addr = 0;
+	m_disp3_start_addr = 0;
+	m_disp4_start_addr = 0;
+	m_vert_sync_pos_adj = 0;
+	m_smooth_scroll_ras = 0;
+	m_mem_width_offs = 0;
+	m_cursor2_start_ras = 0;
+	m_cursor2_end_ras = 0;
+	m_cursor2_addr = 0;
+	m_cursor_width = 0;
+	m_cursor2_width = 0;
+
+	save_item(NAME(m_disp2_pos));
+	save_item(NAME(m_disp2_start_addr));
+	save_item(NAME(m_disp3_pos));
+	save_item(NAME(m_disp3_start_addr));
+	save_item(NAME(m_disp4_pos));
+	save_item(NAME(m_disp4_start_addr));
+	save_item(NAME(m_vert_sync_pos_adj));
+	save_item(NAME(m_smooth_scroll_ras));
+	save_item(NAME(m_control1));
+	save_item(NAME(m_control2));
+	save_item(NAME(m_control3));
+	save_item(NAME(m_mem_width_offs));
+	save_item(NAME(m_cursor2_start_ras));
+	save_item(NAME(m_cursor2_end_ras));
+	save_item(NAME(m_cursor2_addr));
+	save_item(NAME(m_cursor_width));
+	save_item(NAME(m_cursor2_width));
 }
 
 
@@ -1481,7 +1589,16 @@
 void c6545_1_device::device_reset() { mc6845_device::device_reset(); }
 void sy6545_1_device::device_reset() { mc6845_device::device_reset(); }
 void sy6845e_device::device_reset() { mc6845_device::device_reset(); }
-void hd6345_device::device_reset() { mc6845_device::device_reset(); }
+
+void hd6345_device::device_reset()
+{
+	hd6845s_device::device_reset();
+
+	m_control1 = 0;
+	m_control2 = 0;
+	m_control3 = 0;
+}
+
 void ams40489_device::device_reset() { mc6845_device::device_reset(); }
 
 void mos8563_device::device_reset()
@@ -1569,10 +1686,10 @@
 
 
 mos8563_device::mos8563_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
-	: mc6845_device(mconfig, type, tag, owner, clock),
-		device_memory_interface(mconfig, *this),
-		device_palette_interface(mconfig, *this),
-		m_videoram_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, address_map_constructor(FUNC(mos8563_device::mos8563_videoram_map), this))
+	: mc6845_device(mconfig, type, tag, owner, clock)
+	, device_memory_interface(mconfig, *this)
+	, device_palette_interface(mconfig, *this)
+	, m_videoram_space_config("videoram", ENDIANNESS_LITTLE, 8, 16, 0, address_map_constructor(FUNC(mos8563_device::mos8563_videoram_map), this))
 {
 	m_clk_scale = 8;
 }
diff -Nru mame-0.222+dfsg.1/src/devices/video/mc6845.h mame-0.224+dfsg.1/src/devices/video/mc6845.h
--- mame-0.222+dfsg.1/src/devices/video/mc6845.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/mc6845.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Wilbert Pol, Bartman/Abyss (HD6345)
+// copyright-holders:Wilbert Pol,Nigel Barnes
 /**********************************************************************
 
     Motorola MC6845 and compatible CRT controller emulation
@@ -357,8 +357,6 @@
 	virtual void device_reset() override;
 };
 
-// HD6345/HD6445 CRTC-II
-// http://bitsavers.informatik.uni-stuttgart.de/pdf/hitachi/_dataBooks/1987_Hitachi_8_16_Bit_Peripheral_LSI_Data_Book.pdf, pp. 99
 class hd6345_device : public hd6845s_device
 {
 public:
@@ -371,6 +369,27 @@
 protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
+
+	/* register file */
+	uint8_t   m_disp2_pos;            /* 0x12 */
+	uint16_t  m_disp2_start_addr;     /* 0x13/0x14 */
+	uint8_t   m_disp3_pos;            /* 0x15 */
+	uint16_t  m_disp3_start_addr;     /* 0x16/0x17 */
+	uint8_t   m_disp4_pos;            /* 0x18 */
+	uint16_t  m_disp4_start_addr;     /* 0x19/0x1a */
+	uint8_t   m_vert_sync_pos_adj;    /* 0x1b */
+	uint8_t   m_smooth_scroll_ras;    /* 0x1d */
+	uint8_t   m_control1;             /* 0x1e */
+	uint8_t   m_control2;             /* 0x1f */
+	uint8_t   m_control3;             /* 0x20 */
+	uint8_t   m_mem_width_offs;       /* 0x21 */
+	uint8_t   m_cursor2_start_ras;    /* 0x22 */
+	uint8_t   m_cursor2_end_ras;      /* 0x23 */
+	uint16_t  m_cursor2_addr;         /* 0x24/0x25 */
+	uint8_t   m_cursor_width;         /* 0x26 */
+	uint8_t   m_cursor2_width;        /* 0x27 */
+
+	virtual uint8_t draw_scanline(int y, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
 };
 
 class ams40489_device : public mc6845_device
diff -Nru mame-0.222+dfsg.1/src/devices/video/md4330b.cpp mame-0.224+dfsg.1/src/devices/video/md4330b.cpp
--- mame-0.222+dfsg.1/src/devices/video/md4330b.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/md4330b.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -70,7 +70,7 @@
 //  handlers
 //-------------------------------------------------
 
-void md4330b_device::update_q()
+void md4330b_device::update_output()
 {
 	u32 out = m_shift;
 	if (m_tc)
@@ -96,8 +96,8 @@
 			m_shift = (m_shift << 1) | m_di;
 
 		// output
-		update_q();
 		m_write_do(m_do);
+		update_output();
 	}
 
 	m_clk = state;
diff -Nru mame-0.222+dfsg.1/src/devices/video/md4330b.h mame-0.224+dfsg.1/src/devices/video/md4330b.h
--- mame-0.222+dfsg.1/src/devices/video/md4330b.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/md4330b.h	2020-08-26 08:57:19.000000000 +0000
@@ -49,7 +49,7 @@
 	auto write_do() { return m_write_do.bind(); }
 
 	DECLARE_WRITE_LINE_MEMBER(clk_w);
-	DECLARE_WRITE_LINE_MEMBER(tc_w) { m_tc = (state) ? 1 : 0; update_q(); }
+	DECLARE_WRITE_LINE_MEMBER(tc_w) { m_tc = (state) ? 1 : 0; update_output(); }
 	DECLARE_WRITE_LINE_MEMBER(di_w) { m_di = (state) ? 1 : 0; }
 	DECLARE_WRITE_LINE_MEMBER(rst_w) { m_rst = (state) ? 1 : 0; }
 	DECLARE_READ_LINE_MEMBER(do_r) { return m_do; }
@@ -60,7 +60,7 @@
 	// device-level overrides
 	virtual void device_start() override;
 
-	void update_q();
+	void update_output();
 
 	const u8 m_qmax; // number of Q pins
 	u32 m_shift;
diff -Nru mame-0.222+dfsg.1/src/devices/video/pc_vga.cpp mame-0.224+dfsg.1/src/devices/video/pc_vga.cpp
--- mame-0.222+dfsg.1/src/devices/video/pc_vga.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/pc_vga.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1750,7 +1750,7 @@
 			break;
 		case 0x05:
 			res  = (vga.gc.shift256 & 1) << 6;
-			res |= (vga.gc.shift_reg & 1) << 5;;
+			res |= (vga.gc.shift_reg & 1) << 5;
 			res |= (vga.gc.host_oe & 1) << 4;
 			res |= (vga.gc.read_mode & 1) << 3;
 			res |= (vga.gc.write_mode & 3);
diff -Nru mame-0.222+dfsg.1/src/devices/video/polylgcy.cpp mame-0.224+dfsg.1/src/devices/video/polylgcy.cpp
--- mame-0.222+dfsg.1/src/devices/video/polylgcy.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/polylgcy.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -300,7 +300,7 @@
 #endif
 	}
 #if KEEP_STATISTICS
-	poly->polygon_max = MAX(poly->polygon_max, poly->polygon_next + 1);
+	poly->polygon_max = std::max(poly->polygon_max, poly->polygon_next + 1);
 #endif
 	return poly->polygon[poly->polygon_next++];
 }
@@ -373,9 +373,9 @@
 	else
 		printf("Total pixels   = %d\n", (uint32_t)poly->pixels);
 	printf("Conflicts:  %d resolved, %d total\n", resolved, conflicts);
-	printf("Units:      %5d used, %5d allocated, %5d waits, %4d bytes each, %7d total\n", poly->unit_max, poly->unit_count, poly->unit_waits, poly->unit_size, poly->unit_count * poly->unit_size);
-	printf("Polygons:   %5d used, %5d allocated, %5d waits, %4d bytes each, %7d total\n", poly->polygon_max, poly->polygon_count, poly->polygon_waits, poly->polygon_size, poly->polygon_count * poly->polygon_size);
-	printf("Extra data: %5d used, %5d allocated, %5d waits, %4d bytes each, %7d total\n", poly->extra_max, poly->extra_count, poly->extra_waits, poly->extra_size, poly->extra_count * poly->extra_size);
+	printf("Units:      %5d used, %5d allocated, %5d waits, %4d bytes each, %7d total\n", poly->unit_max, poly->unit_count, poly->unit_waits, (u32) poly->unit_size, poly->unit_count * (u32) poly->unit_size);
+	printf("Polygons:   %5d used, %5d allocated, %5d waits, %4d bytes each, %7d total\n", poly->polygon_max, poly->polygon_count, poly->polygon_waits, (u32) poly->polygon_size, poly->polygon_count * (u32) poly->polygon_size);
+	printf("Extra data: %5d used, %5d allocated, %5d waits, %4d bytes each, %7d total\n", poly->extra_max, poly->extra_count, poly->extra_waits, (u32) poly->extra_size, poly->extra_count * (u32) poly->extra_size);
 }
 #endif
 
@@ -452,7 +452,7 @@
 
 	/* return a pointer to the extra data for the next item */
 #if KEEP_STATISTICS
-	poly->extra_max = MAX(poly->extra_max, poly->extra_next + 1);
+	poly->extra_max = std::max(poly->extra_max, poly->extra_next + 1);
 #endif
 	return poly->extra[poly->extra_next++];
 }
@@ -596,7 +596,7 @@
 		}
 	}
 #if KEEP_STATISTICS
-	poly->unit_max = MAX(poly->unit_max, poly->unit_next);
+	poly->unit_max = std::max(poly->unit_max, poly->unit_next);
 #endif
 
 	/* compute parameter starting points and deltas */
@@ -740,7 +740,7 @@
 		}
 	}
 #if KEEP_STATISTICS
-	poly->unit_max = MAX(poly->unit_max, poly->unit_next);
+	poly->unit_max = std::max(poly->unit_max, poly->unit_next);
 #endif
 
 	/* enqueue the work items */
@@ -965,7 +965,7 @@
 		}
 	}
 #if KEEP_STATISTICS
-	poly->unit_max = MAX(poly->unit_max, poly->unit_next);
+	poly->unit_max = std::max(poly->unit_max, poly->unit_next);
 #endif
 
 	/* enqueue the work items */
@@ -1197,7 +1197,7 @@
 		}
 	}
 #if KEEP_STATISTICS
-	poly->unit_max = MAX(poly->unit_max, poly->unit_next);
+	poly->unit_max = std::max(poly->unit_max, poly->unit_next);
 #endif
 
 	/* enqueue the work items */
diff -Nru mame-0.222+dfsg.1/src/devices/video/v9938.cpp mame-0.224+dfsg.1/src/devices/video/v9938.cpp
--- mame-0.222+dfsg.1/src/devices/video/v9938.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/v9938.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -33,7 +33,6 @@
 - vdp engine -- make run at correct speed
 - vr/hr/fh flags: double-check all of that
 - make vdp engine work in exp. ram
-- fix save state support
 */
 
 #include "emu.h"
@@ -643,9 +642,8 @@
 	save_item(NAME(m_stat_reg));
 	save_item(NAME(m_cont_reg));
 	save_item(NAME(m_read_ahead));
-	//  save_item(NAME(m_vram));
-	//  if ( m_vram_exp != nullptr )
-	//      save_pointer(NAME(m_vram_exp), 0x10000);
+	save_item(NAME(m_v9958_sp_mode));
+	save_item(NAME(m_address_latch));
 	save_item(NAME(m_int_state));
 	save_item(NAME(m_scanline));
 	save_item(NAME(m_blink));
@@ -716,7 +714,6 @@
 	set_screen_parameters();
 }
 
-
 void v99x8_device::reset_palette()
 {
 	// taken from V9938 Technical Data book, page 148. it's in G-R-B format
@@ -3059,3 +3056,45 @@
 		if(m_vdp_engine) (this->*m_vdp_engine)();
 	}
 }
+
+void v99x8_device::device_post_load() // TODO: is there a better way to restore this?
+{
+	switch(m_mmc.CM)
+	{
+	case CM_ABRT:
+	case CM_POINT:
+	case CM_PSET:
+		m_vdp_engine=nullptr;
+		break;
+	case CM_SRCH:
+		m_vdp_engine=&v99x8_device::srch_engine;
+		break;
+	case CM_LINE:
+		m_vdp_engine=&v99x8_device::line_engine;
+		break;
+	case CM_LMMV:
+		m_vdp_engine=&v99x8_device::lmmv_engine;
+		break;
+	case CM_LMMM:
+		m_vdp_engine=&v99x8_device::lmmm_engine;
+		break;
+	case CM_LMCM:
+		m_vdp_engine=&v99x8_device::lmcm_engine;
+		break;
+	case CM_LMMC:
+		m_vdp_engine=&v99x8_device::lmmc_engine;
+		break;
+	case CM_HMMV:
+		m_vdp_engine=&v99x8_device::hmmv_engine;
+		break;
+	case CM_HMMM:
+		m_vdp_engine=&v99x8_device::hmmm_engine;
+		break;
+	case CM_YMMM:
+		m_vdp_engine=&v99x8_device::ymmm_engine;
+		break;
+	case CM_HMMC:
+		m_vdp_engine=&v99x8_device::hmmc_engine;
+		break;
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/devices/video/v9938.h mame-0.224+dfsg.1/src/devices/video/v9938.h
--- mame-0.222+dfsg.1/src/devices/video/v9938.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/v9938.h	2020-08-26 08:57:19.000000000 +0000
@@ -101,6 +101,7 @@
 	virtual void device_start() override;
 	virtual void device_reset() override;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+	virtual void device_post_load() override;
 
 	// device_memory_interface overrides
 	virtual space_config_vector memory_space_config() const override;
diff -Nru mame-0.222+dfsg.1/src/devices/video/vector.cpp mame-0.224+dfsg.1/src/devices/video/vector.cpp
--- mame-0.222+dfsg.1/src/devices/video/vector.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/vector.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -54,12 +54,14 @@
 float vector_options::s_flicker = 0.0f;
 float vector_options::s_beam_width_min = 0.0f;
 float vector_options::s_beam_width_max = 0.0f;
+float vector_options::s_beam_dot_size = 0.0f;
 float vector_options::s_beam_intensity_weight = 0.0f;
 
 void vector_options::init(emu_options& options)
 {
 	s_beam_width_min = options.beam_width_min();
 	s_beam_width_max = options.beam_width_max();
+	s_beam_dot_size = options.beam_dot_size();
 	s_beam_intensity_weight = options.beam_intensity_weight();
 	s_flicker = options.flicker();
 }
@@ -176,6 +178,10 @@
 		// normalize width
 		beam_width *= 1.0f / (float)VECTOR_WIDTH_DENOM;
 
+		// apply point scale for points
+		if (lastx == curpoint->x && lasty == curpoint->y)
+			beam_width *= vector_options::s_beam_dot_size;
+
 		coords.x0 = ((float)lastx - xoffs) * xscale;
 		coords.y0 = ((float)lasty - yoffs) * yscale;
 		coords.x1 = ((float)curpoint->x - xoffs) * xscale;
diff -Nru mame-0.222+dfsg.1/src/devices/video/vector.h mame-0.224+dfsg.1/src/devices/video/vector.h
--- mame-0.222+dfsg.1/src/devices/video/vector.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/vector.h	2020-08-26 08:57:19.000000000 +0000
@@ -16,6 +16,7 @@
 	static float s_flicker;
 	static float s_beam_width_min;
 	static float s_beam_width_max;
+	static float s_beam_dot_size;
 	static float s_beam_intensity_weight;
 
 protected:
diff -Nru mame-0.222+dfsg.1/src/devices/video/vooddefs.ipp mame-0.224+dfsg.1/src/devices/video/vooddefs.ipp
--- mame-0.222+dfsg.1/src/devices/video/vooddefs.ipp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/vooddefs.ipp	2020-08-26 08:57:19.000000000 +0000
@@ -2843,7 +2843,12 @@
 	}
 	else
 	{
+#if ((!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || defined(_MSC_VER)) && defined(PTR64))
+		// Extra shift by 8 due to how sse class is stored
+		iterstw.get_st_shiftr(s, t, (14 + 10 + 8));
+#else
 		iterstw.get_st_shiftr(s, t, (14 + 10));
+#endif
 	}
 
 	/* clamp W */
diff -Nru mame-0.222+dfsg.1/src/devices/video/voodoo.cpp mame-0.224+dfsg.1/src/devices/video/voodoo.cpp
--- mame-0.222+dfsg.1/src/devices/video/voodoo.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/voodoo.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -156,7 +156,8 @@
  *************************************/
 
 #define DEBUG_DEPTH         (0)
-#define DEBUG_LOD           (0)
+#define DEBUG_BACKBUF       (0)
+#define DEBUG_STATS         (0)
 
 #define LOG_VBLANK_SWAP     (0)
 #define LOG_FIFO            (0)
@@ -824,7 +825,6 @@
 {
 	int changed = fbi.video_changed;
 	int drawbuf = fbi.frontbuf;
-	int statskey;
 	int x, y;
 
 	/* reset the video changed flag */
@@ -910,7 +910,7 @@
 	}
 
 	/* debugging! */
-	if (machine().input().code_pressed(KEYCODE_L))
+	if (DEBUG_BACKBUF && machine().input().code_pressed(KEYCODE_L))
 		drawbuf = fbi.backbuf;
 
 	/* copy from the current front buffer */
@@ -924,25 +924,31 @@
 		}
 
 	/* update stats display */
-	statskey = (machine().input().code_pressed(KEYCODE_BACKSLASH) != 0);
-	if (statskey && statskey != stats.lastkey)
-		stats.display = !stats.display;
-	stats.lastkey = statskey;
-
-	/* display stats */
-	if (stats.display)
-		popmessage(stats.buffer, 0, 0);
+	if (DEBUG_STATS)
+	{
+		int statskey = (machine().input().code_pressed(KEYCODE_BACKSLASH));
+		if (statskey && statskey != stats.lastkey)
+			stats.display = !stats.display;
+		stats.lastkey = statskey;
+
+		/* display stats */
+		if (stats.display)
+			popmessage(stats.buffer, 0, 0);
+	}
 
 	/* update render override */
-	stats.render_override = machine().input().code_pressed(KEYCODE_ENTER);
-	if (DEBUG_DEPTH && stats.render_override)
+	if (DEBUG_DEPTH)
 	{
-		for (y = cliprect.min_y; y <= cliprect.max_y; y++)
+		stats.render_override = machine().input().code_pressed(KEYCODE_ENTER);
+		if (stats.render_override)
 		{
-			uint16_t *src = (uint16_t *)(fbi.ram + fbi.auxoffs) + (y - fbi.yoffs) * fbi.rowpixels - fbi.xoffs;
-			uint32_t *dst = &bitmap.pix32(y);
-			for (x = cliprect.min_x; x <= cliprect.max_x; x++)
-				dst[x] = ((src[x] << 8) & 0xff0000) | ((src[x] >> 0) & 0xff00) | ((src[x] >> 8) & 0xff);
+			for (y = cliprect.min_y; y <= cliprect.max_y; y++)
+			{
+				uint16_t* src = (uint16_t*)(fbi.ram + fbi.auxoffs) + (y - fbi.yoffs) * fbi.rowpixels - fbi.xoffs;
+				uint32_t* dst = &bitmap.pix32(y);
+				for (x = cliprect.min_x; x <= cliprect.max_x; x++)
+					dst[x] = ((src[x] << 8) & 0xff0000) | ((src[x] >> 0) & 0xff00) | ((src[x] >> 8) & 0xff);
+			}
 		}
 	}
 	return changed;
@@ -1086,7 +1092,7 @@
 	ram = reinterpret_cast<uint8_t *>(memory);
 	mask = tmem - 1;
 	reg = r;
-	regdirty = true;
+	regdirty = false;
 	bilinear_mask = (vdt >= TYPE_VOODOO_2) ? 0xff : 0xf0;
 
 	/* mark the NCC tables dirty and configure their registers */
@@ -3395,16 +3401,21 @@
 		case texBaseAddr_1:
 		case texBaseAddr_2:
 		case texBaseAddr_3_8:
-			poly_wait(vd->poly, vd->regnames[regnum]);
 			if (chips & 2)
 			{
-				vd->tmu[0].reg[regnum].u = data;
-				vd->tmu[0].regdirty = true;
+				if (vd->tmu[0].reg[regnum].u != data) {
+					poly_wait(vd->poly, vd->regnames[regnum]);
+					vd->tmu[0].regdirty = true;
+					vd->tmu[0].reg[regnum].u = data;
+				}
 			}
 			if (chips & 4)
 			{
-				vd->tmu[1].reg[regnum].u = data;
-				vd->tmu[1].regdirty = true;
+				if (vd->tmu[1].reg[regnum].u != data) {
+					poly_wait(vd->poly, vd->regnames[regnum]);
+					vd->tmu[1].regdirty = true;
+					vd->tmu[1].reg[regnum].u = data;
+				}
 			}
 			break;
 
diff -Nru mame-0.222+dfsg.1/src/devices/video/voodoo.h mame-0.224+dfsg.1/src/devices/video/voodoo.h
--- mame-0.222+dfsg.1/src/devices/video/voodoo.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/devices/video/voodoo.h	2020-08-26 08:57:19.000000000 +0000
@@ -1416,7 +1416,7 @@
 	stw_t(const stw_t& other) = default;
 	stw_t &operator=(const stw_t& other) = default;
 
-	void set(s64 s, s64 t, s64 w) { m_st = _mm_set_pd(s, t); m_w = _mm_set1_pd(w); }
+	void set(s64 s, s64 t, s64 w) { m_st = _mm_set_pd(s << 8, t << 8); m_w = _mm_set1_pd(w); }
 	int is_w_neg() const { return _mm_comilt_sd(m_w, _mm_set1_pd(0.0)); }
 	void get_st_shiftr(s32 &s, s32 &t, const s32 &shift) const
 	{
@@ -1434,7 +1434,7 @@
 	{
 		__m128d tmp = _mm_div_pd(m_st, m_w);
 		// Allow for 8 bits of decimal in integer
-		tmp = _mm_mul_pd(tmp, _mm_set1_pd(256.0));
+		//tmp = _mm_mul_pd(tmp, _mm_set1_pd(256.0));
 		__m128i tmp2 = _mm_cvttpd_epi32(tmp);
 #ifdef __SSE4_1__
 		sow = _mm_extract_epi32(tmp2, 1);
diff -Nru mame-0.222+dfsg.1/src/emu/addrmap.h mame-0.224+dfsg.1/src/emu/addrmap.h
--- mame-0.222+dfsg.1/src/emu/addrmap.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/addrmap.h	2020-08-26 08:57:19.000000000 +0000
@@ -483,7 +483,6 @@
 	void global_mask(offs_t mask);
 	void unmap_value_low() { m_unmapval = 0; }
 	void unmap_value_high() { m_unmapval = ~0; }
-	void unmap_value(u8 value) { m_unmapval = value; }
 
 	// add a new entry of the given type
 	address_map_entry &operator()(offs_t start, offs_t end);
diff -Nru mame-0.222+dfsg.1/src/emu/debug/debugcmd.cpp mame-0.224+dfsg.1/src/emu/debug/debugcmd.cpp
--- mame-0.222+dfsg.1/src/emu/debug/debugcmd.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/debug/debugcmd.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -233,11 +233,13 @@
 	m_console.register_command("saved",     CMDFLAG_NONE, AS_DATA, 3, 4, std::bind(&debugger_commands::execute_save, this, _1, _2));
 	m_console.register_command("savei",     CMDFLAG_NONE, AS_IO, 3, 4, std::bind(&debugger_commands::execute_save, this, _1, _2));
 	m_console.register_command("saveo",     CMDFLAG_NONE, AS_OPCODES, 3, 4, std::bind(&debugger_commands::execute_save, this, _1, _2));
+	m_console.register_command("saver",     CMDFLAG_NONE, 0, 4, 4, std::bind(&debugger_commands::execute_saveregion, this, _1, _2));
 
 	m_console.register_command("load",      CMDFLAG_NONE, AS_PROGRAM, 2, 4, std::bind(&debugger_commands::execute_load, this, _1, _2));
 	m_console.register_command("loadd",     CMDFLAG_NONE, AS_DATA, 2, 4, std::bind(&debugger_commands::execute_load, this, _1, _2));
 	m_console.register_command("loadi",     CMDFLAG_NONE, AS_IO, 2, 4, std::bind(&debugger_commands::execute_load, this, _1, _2));
 	m_console.register_command("loado",     CMDFLAG_NONE, AS_OPCODES, 2, 4, std::bind(&debugger_commands::execute_load, this, _1, _2));
+	m_console.register_command("loadr",     CMDFLAG_NONE, 0, 4, 4, std::bind(&debugger_commands::execute_loadregion, this, _1, _2));
 
 	m_console.register_command("dump",      CMDFLAG_NONE, AS_PROGRAM, 3, 7, std::bind(&debugger_commands::execute_dump, this, _1, _2));
 	m_console.register_command("dumpd",     CMDFLAG_NONE, AS_DATA, 3, 7, std::bind(&debugger_commands::execute_dump, this, _1, _2));
@@ -270,6 +272,11 @@
 	m_console.register_command("fo",        CMDFLAG_KEEP_QUOTES, AS_OPCODES, 3, MAX_COMMAND_PARAMS, std::bind(&debugger_commands::execute_find, this, _1, _2));
 	m_console.register_command("findo",     CMDFLAG_KEEP_QUOTES, AS_OPCODES, 3, MAX_COMMAND_PARAMS, std::bind(&debugger_commands::execute_find, this, _1, _2));
 
+	m_console.register_command("fill",      CMDFLAG_KEEP_QUOTES, AS_PROGRAM, 3, MAX_COMMAND_PARAMS, std::bind(&debugger_commands::execute_fill, this, _1, _2));
+	m_console.register_command("filld",     CMDFLAG_KEEP_QUOTES, AS_DATA, 3, MAX_COMMAND_PARAMS, std::bind(&debugger_commands::execute_fill, this, _1, _2));
+	m_console.register_command("filli",     CMDFLAG_KEEP_QUOTES, AS_IO, 3, MAX_COMMAND_PARAMS, std::bind(&debugger_commands::execute_fill, this, _1, _2));
+	m_console.register_command("fillo",     CMDFLAG_KEEP_QUOTES, AS_OPCODES, 3, MAX_COMMAND_PARAMS, std::bind(&debugger_commands::execute_fill, this, _1, _2));
+
 	m_console.register_command("dasm",      CMDFLAG_NONE, 0, 3, 5, std::bind(&debugger_commands::execute_dasm, this, _1, _2));
 
 	m_console.register_command("trace",     CMDFLAG_NONE, 0, 1, 4, std::bind(&debugger_commands::execute_trace, this, _1, _2));
@@ -530,6 +537,25 @@
 
 
 /*-------------------------------------------------
+    validate_memory_region_parameter - validates
+    a parameter as a memory region name and
+    retrieves the given memory region
+-------------------------------------------------*/
+
+bool debugger_commands::validate_memory_region_parameter(const std::string &param, memory_region *&result)
+{
+	auto &regions = m_machine.memory().regions();
+	auto iter = regions.find(param);
+	if(iter == regions.end()) {
+		m_console.printf("No matching memory region found for '%s'\n", param);
+		return false;
+	}
+	result = iter->second.get();
+	return true;
+}
+
+
+/*-------------------------------------------------
     debug_command_parameter_expression - validates
     an expression parameter
 -------------------------------------------------*/
@@ -1949,6 +1975,45 @@
 
 
 /*-------------------------------------------------
+    execute_saveregion - execute the save command on region memory
+-------------------------------------------------*/
+
+void debugger_commands::execute_saveregion(int ref, const std::vector<std::string> &params)
+{
+	u64 offset, length;
+	memory_region *region;
+
+	/* validate parameters */
+	if (!validate_number_parameter(params[1], offset))
+		return;
+	if (!validate_number_parameter(params[2], length))
+		return;
+	if (!validate_memory_region_parameter(params[3], region))
+		return;
+
+	if (offset >= region->bytes())
+	{
+		m_console.printf("Invalid offset\n");
+		return;
+	}
+	if ((length <= 0) || ((length + offset) >= region->bytes()))
+		length = region->bytes() - offset;
+
+	/* open the file */
+	FILE *f = fopen(params[0].c_str(), "wb");
+	if (!f)
+	{
+		m_console.printf("Error opening file '%s'\n", params[0].c_str());
+		return;
+	}
+	fwrite(region->base() + offset, 1, length, f);
+
+	fclose(f);
+	m_console.printf("Data saved successfully\n");
+}
+
+
+/*-------------------------------------------------
     execute_load - execute the load command
 -------------------------------------------------*/
 
@@ -2057,6 +2122,54 @@
 
 
 /*-------------------------------------------------
+    execute_loadregion - execute the load command on region memory
+-------------------------------------------------*/
+
+void debugger_commands::execute_loadregion(int ref, const std::vector<std::string> &params)
+{
+	u64 offset, length;
+	memory_region *region;
+
+	/* validate parameters */
+	if (!validate_number_parameter(params[1], offset))
+		return;
+	if (!validate_number_parameter(params[2], length))
+		return;
+	if (!validate_memory_region_parameter(params[3], region))
+		return;
+
+	if (offset >= region->bytes())
+	{
+		m_console.printf("Invalid offset\n");
+		return;
+	}
+	if ((length <= 0) || ((length + offset) >= region->bytes()))
+		length = region->bytes() - offset;
+
+	/* open the file */
+	FILE *f = fopen(params[0].c_str(), "rb");
+	if (!f)
+	{
+		m_console.printf("Error opening file '%s'\n", params[0].c_str());
+		return;
+	}
+
+	fseek(f, 0L, SEEK_END);
+	u64 size = ftell(f);
+	rewind(f);
+
+	// check file size
+	if (length >= size)
+		length = size;
+
+	fread(region->base() + offset, 1, length, f);
+
+	fclose(f);
+	m_console.printf("Data loaded successfully to memory : 0x%X to 0x%X\n", offset, offset + length - 1);
+}
+
+
+/*-------------------------------------------------
     execute_dump - execute the dump command
 -------------------------------------------------*/
 
@@ -2799,6 +2912,113 @@
 }
 
 
+//-------------------------------------------------
+//  execute_fill - execute the fill command
+//-------------------------------------------------
+
+void debugger_commands::execute_fill(int ref, const std::vector<std::string> &params)
+{
+	u64 offset, length;
+	address_space *space;
+
+	// validate parameters
+	if (!validate_number_parameter(params[0], offset))
+		return;
+	if (!validate_number_parameter(params[1], length))
+		return;
+	if (!validate_cpu_space_parameter(nullptr, ref, space))
+		return;
+
+	// further validation
+	offset = space->address_to_byte(offset & space->addrmask());
+	int cur_data_size = space->addr_shift() > 0 ? 2 : 1 << -space->addr_shift();
+	if (cur_data_size == 0)
+		cur_data_size = 1;
+
+	// parse the data parameters
+	u64 fill_data[256];
+	u8 fill_data_size[256];
+	int data_count = 0;
+	for (int i = 2; i < params.size(); i++)
+	{
+		const char *pdata = params[i].c_str();
+		size_t pdatalen = strlen(pdata) - 1;
+
+		// check for a string
+		if (pdata[0] == '"' && pdata[pdatalen] == '"')
+		{
+			for (int j = 1; j < pdatalen; j++)
+			{
+				fill_data[data_count] = pdata[j];
+				fill_data_size[data_count++] = 1;
+			}
+		}
+
+		// otherwise, validate as a number
+		else
+		{
+			// check for a 'b','w','d',or 'q' prefix
+			fill_data_size[data_count] = cur_data_size;
+			if (tolower(u8(pdata[0])) == 'b' && pdata[1] == '.') { fill_data_size[data_count] = cur_data_size = 1; pdata += 2; }
+			if (tolower(u8(pdata[0])) == 'w' && pdata[1] == '.') { fill_data_size[data_count] = cur_data_size = 2; pdata += 2; }
+			if (tolower(u8(pdata[0])) == 'd' && pdata[1] == '.') { fill_data_size[data_count] = cur_data_size = 4; pdata += 2; }
+			if (tolower(u8(pdata[0])) == 'q' && pdata[1] == '.') { fill_data_size[data_count] = cur_data_size = 8; pdata += 2; }
+
+			// validate as a number
+			if (!validate_number_parameter(pdata, fill_data[data_count++]))
+				return;
+		}
+	}
+	if (data_count == 0)
+		return;
+
+	// now fill memory
+	device_memory_interface &memory = space->device().memory();
+	auto dis = space->device().machine().disable_side_effects();
+	u64 count = space->address_to_byte(length);
+	while (count != 0)
+	{
+		// write the entire string
+		for (int j = 0; j < data_count; j++)
+		{
+			offs_t address = space->byte_to_address(offset) & space->logaddrmask();
+			if (!memory.translate(space->spacenum(), TRANSLATE_WRITE_DEBUG, address))
+			{
+				m_console.printf("Fill aborted due to page fault at %0*X\n", space->logaddrchars(), space->byte_to_address(offset) & space->logaddrmask());
+				length = 0;
+				break;
+			}
+			switch (fill_data_size[j])
+			{
+			case 1:
+				space->write_byte(address, fill_data[j]);
+				break;
+
+			case 2:
+				space->write_word_unaligned(address, fill_data[j]);
+				break;
+
+			case 4:
+				space->write_dword_unaligned(address, fill_data[j]);
+				break;
+
+			case 8:
+				space->read_qword_unaligned(address, fill_data[j]);
+				break;
+			}
+			offset += fill_data_size[j];
+			if (count <= fill_data_size[j])
+			{
+				count = 0;
+				break;
+			}
+			else
+				count -= fill_data_size[j];
+		}
+	}
+}
+
+
 /*-------------------------------------------------
     execute_dasm - execute the dasm command
 -------------------------------------------------*/
diff -Nru mame-0.222+dfsg.1/src/emu/debug/debugcmd.h mame-0.224+dfsg.1/src/emu/debug/debugcmd.h
--- mame-0.222+dfsg.1/src/emu/debug/debugcmd.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/debug/debugcmd.h	2020-08-26 08:57:19.000000000 +0000
@@ -34,6 +34,9 @@
 	/* validates a parameter as a cpu and retrieves the given address space */
 	bool validate_cpu_space_parameter(const char *param, int spacenum, address_space *&result);
 
+	/* validates a parameter as a memory region name and retrieves the given region */
+	bool validate_memory_region_parameter(const std::string &param, memory_region *&result);
+
 private:
 	struct global_entry
 	{
@@ -139,7 +142,9 @@
 	void execute_stateload(int ref, const std::vector<std::string> &params);
 	void execute_rewind(int ref, const std::vector<std::string> &params);
 	void execute_save(int ref, const std::vector<std::string> &params);
+	void execute_saveregion(int ref, const std::vector<std::string> &params);
 	void execute_load(int ref, const std::vector<std::string> &params);
+	void execute_loadregion(int ref, const std::vector<std::string> &params);
 	void execute_dump(int ref, const std::vector<std::string> &params);
 	void execute_cheatinit(int ref, const std::vector<std::string> &params);
 	void execute_cheatnext(int ref, const std::vector<std::string> &params);
@@ -147,6 +152,7 @@
 	void execute_cheatundo(int ref, const std::vector<std::string> &params);
 	void execute_dasm(int ref, const std::vector<std::string> &params);
 	void execute_find(int ref, const std::vector<std::string> &params);
+	void execute_fill(int ref, const std::vector<std::string> &params);
 	void execute_trace(int ref, const std::vector<std::string> &params);
 	void execute_traceover(int ref, const std::vector<std::string> &params);
 	void execute_traceflush(int ref, const std::vector<std::string> &params);
diff -Nru mame-0.222+dfsg.1/src/emu/debug/debughlp.cpp mame-0.224+dfsg.1/src/emu/debug/debughlp.cpp
--- mame-0.222+dfsg.1/src/emu/debug/debughlp.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/debug/debughlp.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -112,10 +112,10 @@
 		"  f[ind] <address>,<length>[,<data>[,...]] -- search program memory for data\n"
 		"  f[ind]d <address>,<length>[,<data>[,...]] -- search data memory for data\n"
 		"  f[ind]i <address>,<length>[,<data>[,...]] -- search I/O memory for data\n"
-		"  dump <filename>,<address>,<length>[,<size>[,<ascii>[,<CPU>]]] -- dump program memory as text\n"
-		"  dumpd <filename>,<address>,<length>[,<size>[,<ascii>[,<CPU>]]] -- dump data memory as text\n"
-		"  dumpi <filename>,<address>,<length>[,<size>[,<ascii>[,<CPU>]]] -- dump I/O memory as text\n"
-		"  dumpo <filename>,<address>,<length>[,<size>[,<ascii>[,<CPU>]]] -- dump opcodes memory as text\n"
+		"  dump <filename>,<address>,<length>[,<size>[,<ascii>[,<rowsize>[,<CPU>]]]] -- dump program memory as text\n"
+		"  dumpd <filename>,<address>,<length>[,<size>[,<ascii>[,<rowsize>[,<CPU>]]]] -- dump data memory as text\n"
+		"  dumpi <filename>,<address>,<length>[,<size>[,<ascii>[,<rowsize>[,<CPU>]]]] -- dump I/O memory as text\n"
+		"  dumpo <filename>,<address>,<length>[,<size>[,<ascii>[,<rowsize>[,<CPU>]]]] -- dump opcodes memory as text\n"
 		"  save <filename>,<address>,<length>[,<CPU>] -- save binary program memory to the given file\n"
 		"  saved <filename>,<address>,<length>[,<CPU>] -- save binary data memory to the given file\n"
 		"  savei <filename>,<address>,<length>[,<CPU>] -- save binary I/O memory to the given file\n"
@@ -603,6 +603,23 @@
 		"followed by the string \"BEN\", followed by a word-sized 0.\n"
 	},
 	{
+		"fill",
+		"\n"
+		"  fill[{d|i}] <address>,<length>[,<data>[,...]]\n"
+		"\n"
+		"The fill/filld/filli commands overwrite a block of memory with copies of the specified "
+		"sequence of data. 'fill' will fill program space memory, while 'filld' will fill data space "
+		"memory and 'filli' will fill I/O space memory. <address> indicates the address to begin "
+		"writing, and <length> indicates how much memory to fill. <data> can either be a quoted "
+		"string or a numeric value or expression. Non-string data is written by default in the "
+		"native word size of the CPU. To override the data size for non-strings, you can prefix "
+		"the value with b. to force byte-sized fill, w. for word-sized fill, d. for dword-sized, "
+		"and q. for qword-sized. Overrides are remembered, so if you want to fill with a series of "
+		"words, you need only to prefix the first value with a w. Note also that you can intermix "
+		"sizes in order to perform more complex fills. The fill operation may be truncated if a page "
+		"fault occurs or if part of the sequence or string would fall beyond <address>+<length>-1.\n"
+	},
+	{
 		"dump",
 		"\n"
 		"  dump[{d|i}] <filename>,<address>,<length>[,<size>[,<ascii>[,<CPU>]]]\n"
diff -Nru mame-0.222+dfsg.1/src/emu/devcb.h mame-0.224+dfsg.1/src/emu/devcb.h
--- mame-0.222+dfsg.1/src/emu/devcb.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/devcb.h	2020-08-26 08:57:19.000000000 +0000
@@ -30,12 +30,16 @@
 //**************************************************************************
 
 #if defined(__GNUC__) && !defined(__clang__)
-#if __GNUC__ >= 8
+#if (__GNUC__ >= 8)
 #define MAME_DEVCB_GNUC_BROKEN_FRIEND 1
-#endif // __GNUC__ >= 8
-#endif // defined(__GNUC__) && !defined(__clang__)
-
+#endif // (__GNUC__ >= 8) && !defined(__clang__)
+#endif // defined(__GNUC__)
 
+#if defined(__clang__)
+#if (__clang_major__ == 8)
+#define MAME_DEVCB_GNUC_BROKEN_FRIEND 1
+#endif // (__clang_major__ == 8)
+#endif // defined(__clang__)
 
 //**************************************************************************
 //  DELEGATE TYPES
diff -Nru mame-0.222+dfsg.1/src/emu/device.cpp mame-0.224+dfsg.1/src/emu/device.cpp
--- mame-0.222+dfsg.1/src/emu/device.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/device.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -812,7 +812,7 @@
 
 
 //-------------------------------------------------
-//  device_post_load - called after the loading a
+//  device_post_load - called after loading a
 //  saved state, so that registered variables can
 //  be expanded as necessary
 //-------------------------------------------------
@@ -1095,7 +1095,7 @@
 
 
 //-------------------------------------------------
-//  interface_post_load - called after the loading a
+//  interface_post_load - called after loading a
 //  saved state, so that registered variables can
 //  be expanded as necessary
 //-------------------------------------------------
diff -Nru mame-0.222+dfsg.1/src/emu/diexec.h mame-0.224+dfsg.1/src/emu/diexec.h
--- mame-0.222+dfsg.1/src/emu/diexec.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/diexec.h	2020-08-26 08:57:19.000000000 +0000
@@ -317,9 +317,7 @@
 	s32                     m_inttrigger;               // interrupt trigger index
 
 	// clock and timing information
-protected: // FIXME: MIPS3 accesses m_totalcycles directly from execute_burn - devise a better solution
 	u64                     m_totalcycles;              // total device cycles executed
-private:
 	attotime                m_localtime;                // local time, relative to the timer system's global time
 	s32                     m_divisor;                  // 32-bit attoseconds_per_cycle divisor
 	u8                      m_divshift;                 // right shift amount to fit the divisor into 32 bits
diff -Nru mame-0.222+dfsg.1/src/emu/dimemory.cpp mame-0.224+dfsg.1/src/emu/dimemory.cpp
--- mame-0.222+dfsg.1/src/emu/dimemory.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/dimemory.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -58,7 +58,7 @@
 
 //-------------------------------------------------
 //  memory_translate - translate from logical to
-//  phyiscal addresses; designed to be overridden
+//  physical addresses; designed to be overridden
 //  by the actual device implementation if address
 //  translation is supported
 //-------------------------------------------------
diff -Nru mame-0.222+dfsg.1/src/emu/dinetwork.cpp mame-0.224+dfsg.1/src/emu/dinetwork.cpp
--- mame-0.222+dfsg.1/src/emu/dinetwork.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/dinetwork.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -9,7 +9,7 @@
 	m_promisc = false;
 	m_bandwidth = bandwidth;
 	set_mac("\0\0\0\0\0\0");
-	m_intf = 0;
+	m_intf = -1;
 	m_loopback_control = false;
 }
 
diff -Nru mame-0.222+dfsg.1/src/emu/emumem.cpp mame-0.224+dfsg.1/src/emu/emumem.cpp
--- mame-0.222+dfsg.1/src/emu/emumem.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -599,7 +599,7 @@
 	// native read
 	NativeType read_native(offs_t offset, NativeType mask)
 	{
-		return dispatch_read<Level, Width, AddrShift, Endian>(offs_t(-1), offset & m_addrmask, mask, m_dispatch_read);;
+		return dispatch_read<Level, Width, AddrShift, Endian>(offs_t(-1), offset & m_addrmask, mask, m_dispatch_read);
 	}
 
 	// mask-less native read
@@ -611,13 +611,13 @@
 	// native write
 	void write_native(offs_t offset, NativeType data, NativeType mask)
 	{
-		dispatch_write<Level, Width, AddrShift, Endian>(offs_t(-1), offset & m_addrmask, data, mask, m_dispatch_write);;
+		dispatch_write<Level, Width, AddrShift, Endian>(offs_t(-1), offset & m_addrmask, data, mask, m_dispatch_write);
 	}
 
 	// mask-less native write
 	void write_native(offs_t offset, NativeType data)
 	{
-		dispatch_write<Level, Width, AddrShift, Endian>(offs_t(-1), offset & m_addrmask, data, uX(0xffffffffffffffffU), m_dispatch_write);;
+		dispatch_write<Level, Width, AddrShift, Endian>(offs_t(-1), offset & m_addrmask, data, uX(0xffffffffffffffffU), m_dispatch_write);
 	}
 
 	// virtual access to these functions
@@ -940,6 +940,11 @@
 				case 0x0000|0x100|16|(4-1): memory.allocate<address_space_specific<1, 1, -1, ENDIANNESS_LITTLE>>(*this, spacenum); break;
 				case 0x1000|0x100|16|(4-1): memory.allocate<address_space_specific<1, 1, -1, ENDIANNESS_BIG   >>(*this, spacenum); break;
 
+				case 0x0000|0x000|32|(4+3): memory.allocate<address_space_specific<0, 2,  3, ENDIANNESS_LITTLE>>(*this, spacenum); break;
+				case 0x1000|0x000|32|(4+3): memory.allocate<address_space_specific<0, 2,  3, ENDIANNESS_BIG   >>(*this, spacenum); break;
+				case 0x0000|0x100|32|(4+3): memory.allocate<address_space_specific<1, 2,  3, ENDIANNESS_LITTLE>>(*this, spacenum); break;
+				case 0x1000|0x100|32|(4+3): memory.allocate<address_space_specific<1, 2,  3, ENDIANNESS_BIG   >>(*this, spacenum); break;
+
 				case 0x0000|0x000|32|(4-0): memory.allocate<address_space_specific<0, 2,  0, ENDIANNESS_LITTLE>>(*this, spacenum); break;
 				case 0x1000|0x000|32|(4-0): memory.allocate<address_space_specific<0, 2,  0, ENDIANNESS_BIG   >>(*this, spacenum); break;
 				case 0x0000|0x100|32|(4-0): memory.allocate<address_space_specific<1, 2,  0, ENDIANNESS_LITTLE>>(*this, spacenum); break;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_hedp.cpp mame-0.224+dfsg.1/src/emu/emumem_hedp.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_hedp.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_hedp.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -180,6 +180,8 @@
 template class handler_entry_read_delegate<1,  0, ENDIANNESS_BIG,    read16_delegate>;
 template class handler_entry_read_delegate<1, -1, ENDIANNESS_LITTLE, read16_delegate>;
 template class handler_entry_read_delegate<1, -1, ENDIANNESS_BIG,    read16_delegate>;
+template class handler_entry_read_delegate<2,  3, ENDIANNESS_LITTLE, read32_delegate>;
+template class handler_entry_read_delegate<2,  3, ENDIANNESS_BIG,    read32_delegate>;
 template class handler_entry_read_delegate<2,  0, ENDIANNESS_LITTLE, read32_delegate>;
 template class handler_entry_read_delegate<2,  0, ENDIANNESS_BIG,    read32_delegate>;
 template class handler_entry_read_delegate<2, -1, ENDIANNESS_LITTLE, read32_delegate>;
@@ -205,6 +207,8 @@
 template class handler_entry_read_delegate<1,  0, ENDIANNESS_BIG,    read16m_delegate>;
 template class handler_entry_read_delegate<1, -1, ENDIANNESS_LITTLE, read16m_delegate>;
 template class handler_entry_read_delegate<1, -1, ENDIANNESS_BIG,    read16m_delegate>;
+template class handler_entry_read_delegate<2,  3, ENDIANNESS_LITTLE, read32m_delegate>;
+template class handler_entry_read_delegate<2,  3, ENDIANNESS_BIG,    read32m_delegate>;
 template class handler_entry_read_delegate<2,  0, ENDIANNESS_LITTLE, read32m_delegate>;
 template class handler_entry_read_delegate<2,  0, ENDIANNESS_BIG,    read32m_delegate>;
 template class handler_entry_read_delegate<2, -1, ENDIANNESS_LITTLE, read32m_delegate>;
@@ -230,6 +234,8 @@
 template class handler_entry_read_delegate<1,  0, ENDIANNESS_BIG,    read16s_delegate>;
 template class handler_entry_read_delegate<1, -1, ENDIANNESS_LITTLE, read16s_delegate>;
 template class handler_entry_read_delegate<1, -1, ENDIANNESS_BIG,    read16s_delegate>;
+template class handler_entry_read_delegate<2,  3, ENDIANNESS_LITTLE, read32s_delegate>;
+template class handler_entry_read_delegate<2,  3, ENDIANNESS_BIG,    read32s_delegate>;
 template class handler_entry_read_delegate<2,  0, ENDIANNESS_LITTLE, read32s_delegate>;
 template class handler_entry_read_delegate<2,  0, ENDIANNESS_BIG,    read32s_delegate>;
 template class handler_entry_read_delegate<2, -1, ENDIANNESS_LITTLE, read32s_delegate>;
@@ -255,6 +261,8 @@
 template class handler_entry_read_delegate<1,  0, ENDIANNESS_BIG,    read16sm_delegate>;
 template class handler_entry_read_delegate<1, -1, ENDIANNESS_LITTLE, read16sm_delegate>;
 template class handler_entry_read_delegate<1, -1, ENDIANNESS_BIG,    read16sm_delegate>;
+template class handler_entry_read_delegate<2,  3, ENDIANNESS_LITTLE, read32sm_delegate>;
+template class handler_entry_read_delegate<2,  3, ENDIANNESS_BIG,    read32sm_delegate>;
 template class handler_entry_read_delegate<2,  0, ENDIANNESS_LITTLE, read32sm_delegate>;
 template class handler_entry_read_delegate<2,  0, ENDIANNESS_BIG,    read32sm_delegate>;
 template class handler_entry_read_delegate<2, -1, ENDIANNESS_LITTLE, read32sm_delegate>;
@@ -280,6 +288,8 @@
 template class handler_entry_read_delegate<1,  0, ENDIANNESS_BIG,    read16mo_delegate>;
 template class handler_entry_read_delegate<1, -1, ENDIANNESS_LITTLE, read16mo_delegate>;
 template class handler_entry_read_delegate<1, -1, ENDIANNESS_BIG,    read16mo_delegate>;
+template class handler_entry_read_delegate<2,  3, ENDIANNESS_LITTLE, read32mo_delegate>;
+template class handler_entry_read_delegate<2,  3, ENDIANNESS_BIG,    read32mo_delegate>;
 template class handler_entry_read_delegate<2,  0, ENDIANNESS_LITTLE, read32mo_delegate>;
 template class handler_entry_read_delegate<2,  0, ENDIANNESS_BIG,    read32mo_delegate>;
 template class handler_entry_read_delegate<2, -1, ENDIANNESS_LITTLE, read32mo_delegate>;
@@ -305,6 +315,8 @@
 template class handler_entry_read_delegate<1,  0, ENDIANNESS_BIG,    read16smo_delegate>;
 template class handler_entry_read_delegate<1, -1, ENDIANNESS_LITTLE, read16smo_delegate>;
 template class handler_entry_read_delegate<1, -1, ENDIANNESS_BIG,    read16smo_delegate>;
+template class handler_entry_read_delegate<2,  3, ENDIANNESS_LITTLE, read32smo_delegate>;
+template class handler_entry_read_delegate<2,  3, ENDIANNESS_BIG,    read32smo_delegate>;
 template class handler_entry_read_delegate<2,  0, ENDIANNESS_LITTLE, read32smo_delegate>;
 template class handler_entry_read_delegate<2,  0, ENDIANNESS_BIG,    read32smo_delegate>;
 template class handler_entry_read_delegate<2, -1, ENDIANNESS_LITTLE, read32smo_delegate>;
@@ -330,6 +342,8 @@
 template class handler_entry_write_delegate<1,  0, ENDIANNESS_BIG,    write16_delegate>;
 template class handler_entry_write_delegate<1, -1, ENDIANNESS_LITTLE, write16_delegate>;
 template class handler_entry_write_delegate<1, -1, ENDIANNESS_BIG,    write16_delegate>;
+template class handler_entry_write_delegate<2,  3, ENDIANNESS_LITTLE, write32_delegate>;
+template class handler_entry_write_delegate<2,  3, ENDIANNESS_BIG,    write32_delegate>;
 template class handler_entry_write_delegate<2,  0, ENDIANNESS_LITTLE, write32_delegate>;
 template class handler_entry_write_delegate<2,  0, ENDIANNESS_BIG,    write32_delegate>;
 template class handler_entry_write_delegate<2, -1, ENDIANNESS_LITTLE, write32_delegate>;
@@ -355,6 +369,8 @@
 template class handler_entry_write_delegate<1,  0, ENDIANNESS_BIG,    write16m_delegate>;
 template class handler_entry_write_delegate<1, -1, ENDIANNESS_LITTLE, write16m_delegate>;
 template class handler_entry_write_delegate<1, -1, ENDIANNESS_BIG,    write16m_delegate>;
+template class handler_entry_write_delegate<2,  3, ENDIANNESS_LITTLE, write32m_delegate>;
+template class handler_entry_write_delegate<2,  3, ENDIANNESS_BIG,    write32m_delegate>;
 template class handler_entry_write_delegate<2,  0, ENDIANNESS_LITTLE, write32m_delegate>;
 template class handler_entry_write_delegate<2,  0, ENDIANNESS_BIG,    write32m_delegate>;
 template class handler_entry_write_delegate<2, -1, ENDIANNESS_LITTLE, write32m_delegate>;
@@ -380,6 +396,8 @@
 template class handler_entry_write_delegate<1,  0, ENDIANNESS_BIG,    write16s_delegate>;
 template class handler_entry_write_delegate<1, -1, ENDIANNESS_LITTLE, write16s_delegate>;
 template class handler_entry_write_delegate<1, -1, ENDIANNESS_BIG,    write16s_delegate>;
+template class handler_entry_write_delegate<2,  3, ENDIANNESS_LITTLE, write32s_delegate>;
+template class handler_entry_write_delegate<2,  3, ENDIANNESS_BIG,    write32s_delegate>;
 template class handler_entry_write_delegate<2,  0, ENDIANNESS_LITTLE, write32s_delegate>;
 template class handler_entry_write_delegate<2,  0, ENDIANNESS_BIG,    write32s_delegate>;
 template class handler_entry_write_delegate<2, -1, ENDIANNESS_LITTLE, write32s_delegate>;
@@ -405,6 +423,8 @@
 template class handler_entry_write_delegate<1,  0, ENDIANNESS_BIG,    write16sm_delegate>;
 template class handler_entry_write_delegate<1, -1, ENDIANNESS_LITTLE, write16sm_delegate>;
 template class handler_entry_write_delegate<1, -1, ENDIANNESS_BIG,    write16sm_delegate>;
+template class handler_entry_write_delegate<2,  3, ENDIANNESS_LITTLE, write32sm_delegate>;
+template class handler_entry_write_delegate<2,  3, ENDIANNESS_BIG,    write32sm_delegate>;
 template class handler_entry_write_delegate<2,  0, ENDIANNESS_LITTLE, write32sm_delegate>;
 template class handler_entry_write_delegate<2,  0, ENDIANNESS_BIG,    write32sm_delegate>;
 template class handler_entry_write_delegate<2, -1, ENDIANNESS_LITTLE, write32sm_delegate>;
@@ -430,6 +450,8 @@
 template class handler_entry_write_delegate<1,  0, ENDIANNESS_BIG,    write16mo_delegate>;
 template class handler_entry_write_delegate<1, -1, ENDIANNESS_LITTLE, write16mo_delegate>;
 template class handler_entry_write_delegate<1, -1, ENDIANNESS_BIG,    write16mo_delegate>;
+template class handler_entry_write_delegate<2,  3, ENDIANNESS_LITTLE, write32mo_delegate>;
+template class handler_entry_write_delegate<2,  3, ENDIANNESS_BIG,    write32mo_delegate>;
 template class handler_entry_write_delegate<2,  0, ENDIANNESS_LITTLE, write32mo_delegate>;
 template class handler_entry_write_delegate<2,  0, ENDIANNESS_BIG,    write32mo_delegate>;
 template class handler_entry_write_delegate<2, -1, ENDIANNESS_LITTLE, write32mo_delegate>;
@@ -455,6 +477,8 @@
 template class handler_entry_write_delegate<1,  0, ENDIANNESS_BIG,    write16smo_delegate>;
 template class handler_entry_write_delegate<1, -1, ENDIANNESS_LITTLE, write16smo_delegate>;
 template class handler_entry_write_delegate<1, -1, ENDIANNESS_BIG,    write16smo_delegate>;
+template class handler_entry_write_delegate<2,  3, ENDIANNESS_LITTLE, write32smo_delegate>;
+template class handler_entry_write_delegate<2,  3, ENDIANNESS_BIG,    write32smo_delegate>;
 template class handler_entry_write_delegate<2,  0, ENDIANNESS_LITTLE, write32smo_delegate>;
 template class handler_entry_write_delegate<2,  0, ENDIANNESS_BIG,    write32smo_delegate>;
 template class handler_entry_write_delegate<2, -1, ENDIANNESS_LITTLE, write32smo_delegate>;
@@ -481,6 +505,8 @@
 template class handler_entry_read_ioport<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_ioport<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_read_ioport<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_read_ioport<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_ioport<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_read_ioport<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_read_ioport<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_ioport<2, -1, ENDIANNESS_LITTLE>;
@@ -506,6 +532,8 @@
 template class handler_entry_write_ioport<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_ioport<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_write_ioport<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_write_ioport<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_ioport<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_write_ioport<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_write_ioport<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_ioport<2, -1, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_hedr0.cpp mame-0.224+dfsg.1/src/emu/emumem_hedr0.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_hedr0.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_hedr0.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -90,6 +90,21 @@
 template class handler_entry_read_dispatch< 8, 1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_read_dispatch< 8, 1, -1, ENDIANNESS_BIG>;
 
+template class handler_entry_read_dispatch< 2, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch< 2, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch< 3, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch< 3, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch< 4, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch< 4, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch< 5, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch< 5, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch< 6, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch< 6, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch< 7, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch< 7, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch< 8, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch< 8, 2,  3, ENDIANNESS_BIG>;
+
 template class handler_entry_read_dispatch< 2, 2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_read_dispatch< 2, 2,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_dispatch< 3, 2,  0, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_hedr1.cpp mame-0.224+dfsg.1/src/emu/emumem_hedr1.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_hedr1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_hedr1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -89,6 +89,23 @@
 template class handler_entry_read_dispatch<16, 1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_read_dispatch<16, 1, -1, ENDIANNESS_BIG>;
 
+template class handler_entry_read_dispatch< 9, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch< 9, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<10, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<10, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<11, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<11, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<12, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<12, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<13, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<13, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<14, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<14, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<15, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<15, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<16, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<16, 2,  3, ENDIANNESS_BIG>;
+
 template class handler_entry_read_dispatch< 9, 2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_read_dispatch< 9, 2,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_dispatch<10, 2,  0, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_hedr2.cpp mame-0.224+dfsg.1/src/emu/emumem_hedr2.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_hedr2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_hedr2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -89,6 +89,23 @@
 template class handler_entry_read_dispatch<24, 1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_read_dispatch<24, 1, -1, ENDIANNESS_BIG>;
 
+template class handler_entry_read_dispatch<17, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<17, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<18, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<18, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<19, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<19, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<20, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<20, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<21, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<21, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<22, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<22, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<23, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<23, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<24, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<24, 2,  3, ENDIANNESS_BIG>;
+
 template class handler_entry_read_dispatch<17, 2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_read_dispatch<17, 2,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_dispatch<18, 2,  0, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_hedr3.cpp mame-0.224+dfsg.1/src/emu/emumem_hedr3.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_hedr3.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_hedr3.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -90,6 +90,23 @@
 template class handler_entry_read_dispatch<32, 1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_read_dispatch<32, 1, -1, ENDIANNESS_BIG>;
 
+template class handler_entry_read_dispatch<25, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<25, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<26, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<26, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<27, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<27, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<28, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<28, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<29, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<29, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<31, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<31, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<30, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<30, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_read_dispatch<32, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_dispatch<32, 2,  3, ENDIANNESS_BIG>;
+
 template class handler_entry_read_dispatch<25, 2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_read_dispatch<25, 2,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_dispatch<26, 2,  0, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_hedw0.cpp mame-0.224+dfsg.1/src/emu/emumem_hedw0.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_hedw0.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_hedw0.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -90,6 +90,21 @@
 template class handler_entry_write_dispatch< 8, 1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_write_dispatch< 8, 1, -1, ENDIANNESS_BIG>;
 
+template class handler_entry_write_dispatch< 2, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch< 2, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch< 3, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch< 3, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch< 4, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch< 4, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch< 5, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch< 5, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch< 6, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch< 6, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch< 7, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch< 7, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch< 8, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch< 8, 2,  3, ENDIANNESS_BIG>;
+
 template class handler_entry_write_dispatch< 2, 2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_write_dispatch< 2, 2,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_dispatch< 3, 2,  0, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_hedw1.cpp mame-0.224+dfsg.1/src/emu/emumem_hedw1.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_hedw1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_hedw1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -89,6 +89,23 @@
 template class handler_entry_write_dispatch<16, 1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_write_dispatch<16, 1, -1, ENDIANNESS_BIG>;
 
+template class handler_entry_write_dispatch< 9, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch< 9, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<10, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<10, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<11, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<11, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<12, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<12, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<13, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<13, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<14, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<14, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<15, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<15, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<16, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<16, 2,  3, ENDIANNESS_BIG>;
+
 template class handler_entry_write_dispatch< 9, 2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_write_dispatch< 9, 2,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_dispatch<10, 2,  0, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_hedw2.cpp mame-0.224+dfsg.1/src/emu/emumem_hedw2.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_hedw2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_hedw2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -89,6 +89,23 @@
 template class handler_entry_write_dispatch<24, 1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_write_dispatch<24, 1, -1, ENDIANNESS_BIG>;
 
+template class handler_entry_write_dispatch<17, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<17, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<18, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<18, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<19, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<19, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<20, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<20, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<21, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<21, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<22, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<22, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<23, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<23, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<24, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<24, 2,  3, ENDIANNESS_BIG>;
+
 template class handler_entry_write_dispatch<17, 2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_write_dispatch<17, 2,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_dispatch<18, 2,  0, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_hedw3.cpp mame-0.224+dfsg.1/src/emu/emumem_hedw3.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_hedw3.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_hedw3.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -90,6 +90,23 @@
 template class handler_entry_write_dispatch<32, 1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_write_dispatch<32, 1, -1, ENDIANNESS_BIG>;
 
+template class handler_entry_write_dispatch<25, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<25, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<26, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<26, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<27, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<27, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<28, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<28, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<29, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<29, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<31, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<31, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<30, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<30, 2,  3, ENDIANNESS_BIG>;
+template class handler_entry_write_dispatch<32, 2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_dispatch<32, 2,  3, ENDIANNESS_BIG>;
+
 template class handler_entry_write_dispatch<25, 2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_write_dispatch<25, 2,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_dispatch<26, 2,  0, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_hem.cpp mame-0.224+dfsg.1/src/emu/emumem_hem.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_hem.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_hem.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -105,6 +105,8 @@
 template class handler_entry_read_memory<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_memory<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_read_memory<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_read_memory<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_memory<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_read_memory<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_read_memory<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_memory<2, -1, ENDIANNESS_LITTLE>;
@@ -130,6 +132,8 @@
 template class handler_entry_write_memory<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_memory<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_write_memory<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_write_memory<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_memory<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_write_memory<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_write_memory<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_memory<2, -1, ENDIANNESS_LITTLE>;
@@ -156,6 +160,8 @@
 template class handler_entry_read_memory_bank<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_memory_bank<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_read_memory_bank<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_read_memory_bank<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_memory_bank<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_read_memory_bank<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_read_memory_bank<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_memory_bank<2, -1, ENDIANNESS_LITTLE>;
@@ -181,6 +187,8 @@
 template class handler_entry_write_memory_bank<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_memory_bank<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_write_memory_bank<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_write_memory_bank<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_memory_bank<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_write_memory_bank<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_write_memory_bank<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_memory_bank<2, -1, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_hep.cpp mame-0.224+dfsg.1/src/emu/emumem_hep.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_hep.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_hep.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -60,6 +60,8 @@
 template class handler_entry_read_passthrough<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_passthrough<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_read_passthrough<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_read_passthrough<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_passthrough<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_read_passthrough<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_read_passthrough<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_passthrough<2, -1, ENDIANNESS_LITTLE>;
@@ -85,6 +87,8 @@
 template class handler_entry_write_passthrough<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_passthrough<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_write_passthrough<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_write_passthrough<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_passthrough<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_write_passthrough<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_write_passthrough<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_passthrough<2, -1, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_het.cpp mame-0.224+dfsg.1/src/emu/emumem_het.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_het.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_het.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -60,6 +60,8 @@
 template class handler_entry_read_tap<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_tap<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_read_tap<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_read_tap<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_tap<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_read_tap<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_read_tap<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_tap<2, -1, ENDIANNESS_LITTLE>;
@@ -85,6 +87,8 @@
 template class handler_entry_write_tap<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_tap<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_write_tap<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_write_tap<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_tap<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_write_tap<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_write_tap<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_tap<2, -1, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_heu.cpp mame-0.224+dfsg.1/src/emu/emumem_heu.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_heu.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_heu.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -248,6 +248,8 @@
 template class handler_entry_read_units<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_units<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_read_units<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_read_units<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_units<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_read_units<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_read_units<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_units<2, -1, ENDIANNESS_LITTLE>;
@@ -273,6 +275,8 @@
 template class handler_entry_write_units<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_units<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_write_units<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_write_units<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_units<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_write_units<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_write_units<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_units<2, -1, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_heun.cpp mame-0.224+dfsg.1/src/emu/emumem_heun.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_heun.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_heun.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -74,6 +74,8 @@
 template class handler_entry_read_unmapped<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_unmapped<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_read_unmapped<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_read_unmapped<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_unmapped<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_read_unmapped<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_read_unmapped<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_unmapped<2, -1, ENDIANNESS_LITTLE>;
@@ -99,6 +101,8 @@
 template class handler_entry_write_unmapped<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_unmapped<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_write_unmapped<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_write_unmapped<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_unmapped<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_write_unmapped<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_write_unmapped<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_unmapped<2, -1, ENDIANNESS_LITTLE>;
@@ -125,6 +129,8 @@
 template class handler_entry_read_nop<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_nop<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_read_nop<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_read_nop<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_read_nop<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_read_nop<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_read_nop<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_read_nop<2, -1, ENDIANNESS_LITTLE>;
@@ -150,6 +156,8 @@
 template class handler_entry_write_nop<1,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_nop<1, -1, ENDIANNESS_LITTLE>;
 template class handler_entry_write_nop<1, -1, ENDIANNESS_BIG>;
+template class handler_entry_write_nop<2,  3, ENDIANNESS_LITTLE>;
+template class handler_entry_write_nop<2,  3, ENDIANNESS_BIG>;
 template class handler_entry_write_nop<2,  0, ENDIANNESS_LITTLE>;
 template class handler_entry_write_nop<2,  0, ENDIANNESS_BIG>;
 template class handler_entry_write_nop<2, -1, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emumem_mud.cpp mame-0.224+dfsg.1/src/emu/emumem_mud.cpp
--- mame-0.222+dfsg.1/src/emu/emumem_mud.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emumem_mud.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -116,6 +116,8 @@
 template class memory_units_descriptor<1,  0, ENDIANNESS_BIG>;
 template class memory_units_descriptor<1, -1, ENDIANNESS_LITTLE>;
 template class memory_units_descriptor<1, -1, ENDIANNESS_BIG>;
+template class memory_units_descriptor<2,  3, ENDIANNESS_LITTLE>;
+template class memory_units_descriptor<2,  3, ENDIANNESS_BIG>;
 template class memory_units_descriptor<2,  0, ENDIANNESS_LITTLE>;
 template class memory_units_descriptor<2,  0, ENDIANNESS_BIG>;
 template class memory_units_descriptor<2, -1, ENDIANNESS_LITTLE>;
diff -Nru mame-0.222+dfsg.1/src/emu/emuopts.cpp mame-0.224+dfsg.1/src/emu/emuopts.cpp
--- mame-0.222+dfsg.1/src/emu/emuopts.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emuopts.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -129,6 +129,7 @@
 	{ nullptr,                                           nullptr,     OPTION_HEADER,     "CORE VECTOR OPTIONS" },
 	{ OPTION_BEAM_WIDTH_MIN,                             "1.0",       OPTION_FLOAT,      "set vector beam width minimum" },
 	{ OPTION_BEAM_WIDTH_MAX,                             "1.0",       OPTION_FLOAT,      "set vector beam width maximum" },
+	{ OPTION_BEAM_DOT_SIZE,                              "1.0",       OPTION_FLOAT,      "set vector beam size for dots" },
 	{ OPTION_BEAM_INTENSITY_WEIGHT,                      "0",         OPTION_FLOAT,      "set vector beam intensity weight " },
 	{ OPTION_FLICKER,                                    "0",         OPTION_FLOAT,      "set vector flicker effect" },
 
@@ -137,6 +138,7 @@
 	{ OPTION_SAMPLERATE ";sr(1000-1000000)",             "48000",     OPTION_INTEGER,    "set sound output sample rate" },
 	{ OPTION_SAMPLES,                                    "1",         OPTION_BOOLEAN,    "enable the use of external samples if available" },
 	{ OPTION_VOLUME ";vol",                              "0",         OPTION_INTEGER,    "sound volume in decibels (-32 min, 0 max)" },
+	{ OPTION_SPEAKER_REPORT,                             "0",         OPTION_INTEGER,    "print report of speaker ouput maxima (0=none, or 1-4 for more detail)" },
 
 	// input options
 	{ nullptr,                                           nullptr,     OPTION_HEADER,     "CORE INPUT OPTIONS" },
diff -Nru mame-0.222+dfsg.1/src/emu/emuopts.h mame-0.224+dfsg.1/src/emu/emuopts.h
--- mame-0.222+dfsg.1/src/emu/emuopts.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/emuopts.h	2020-08-26 08:57:19.000000000 +0000
@@ -111,6 +111,7 @@
 // core vector options
 #define OPTION_BEAM_WIDTH_MIN       "beam_width_min"
 #define OPTION_BEAM_WIDTH_MAX       "beam_width_max"
+#define OPTION_BEAM_DOT_SIZE        "beam_dot_size"
 #define OPTION_BEAM_INTENSITY_WEIGHT   "beam_intensity_weight"
 #define OPTION_FLICKER              "flicker"
 
@@ -118,6 +119,7 @@
 #define OPTION_SAMPLERATE           "samplerate"
 #define OPTION_SAMPLES              "samples"
 #define OPTION_VOLUME               "volume"
+#define OPTION_SPEAKER_REPORT       "speaker_report"
 
 // core input options
 #define OPTION_COIN_LOCKOUT         "coin_lockout"
@@ -390,6 +392,7 @@
 	// core vector options
 	float beam_width_min() const { return float_value(OPTION_BEAM_WIDTH_MIN); }
 	float beam_width_max() const { return float_value(OPTION_BEAM_WIDTH_MAX); }
+	float beam_dot_size() const { return float_value(OPTION_BEAM_DOT_SIZE); }
 	float beam_intensity_weight() const { return float_value(OPTION_BEAM_INTENSITY_WEIGHT); }
 	float flicker() const { return float_value(OPTION_FLICKER); }
 
@@ -397,6 +400,7 @@
 	int sample_rate() const { return int_value(OPTION_SAMPLERATE); }
 	bool samples() const { return bool_value(OPTION_SAMPLES); }
 	int volume() const { return int_value(OPTION_VOLUME); }
+	int speaker_report() const { return int_value(OPTION_SPEAKER_REPORT); }
 
 	// core input options
 	bool coin_lockout() const { return bool_value(OPTION_COIN_LOCKOUT); }
diff -Nru mame-0.222+dfsg.1/src/emu/inputdev.cpp mame-0.224+dfsg.1/src/emu/inputdev.cpp
--- mame-0.222+dfsg.1/src/emu/inputdev.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/inputdev.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -570,8 +570,7 @@
 	if (nullptr != m_device[newindex].get())
 		m_device[newindex]->set_devindex(newindex);
 
-	// update the maximum index found, since newindex may
-	// exceed current m_maxindex
+	// update the maximum index found, since newindex may exceed current m_maxindex
 	m_maxindex = std::max(m_maxindex, newindex);
 }
 
diff -Nru mame-0.222+dfsg.1/src/emu/ioport.cpp mame-0.224+dfsg.1/src/emu/ioport.cpp
--- mame-0.222+dfsg.1/src/emu/ioport.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/ioport.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1378,7 +1378,7 @@
 	if (field.type_class() == INPUT_CLASS_KEYBOARD && field.specific_name() == nullptr)
 	{
 		// loop through each character on the field
-		for (int which = 0; which < 4; which++)
+		for (int which = 0; which < (1 << (UCHAR_SHIFT_END - UCHAR_SHIFT_BEGIN + 1)); which++)
 		{
 			std::vector<char32_t> const codes = field.keyboard_codes(which);
 			if (codes.empty())
diff -Nru mame-0.222+dfsg.1/src/emu/layout/exorterm155.lay mame-0.224+dfsg.1/src/emu/layout/exorterm155.lay
--- mame-0.222+dfsg.1/src/emu/layout/exorterm155.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/layout/exorterm155.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+
+LEDs for the Motorola EXORterm 155
+-->
+
+<mamelayout version="2">
+
+	<element name="red_led">
+		<disk>
+			<color red="1.0" green="0.0" blue="0.0" />
+		</disk>
+	</element>
+
+	<element name="ON_LINE">
+		<text string="ON LINE">
+			<color red="1.0" green="1.0" blue="1.0" />
+		</text>
+	</element>
+	<element name="AUTO_LF">
+		<text string="AUTO LF">
+			<color red="1.0" green="1.0" blue="1.0" />
+		</text>
+	</element>
+	<element name="PAGE_MODE">
+		<text string="PAGE MODE">
+			<color red="1.0" green="1.0" blue="1.0" />
+		</text>
+	</element>
+	<element name="INS_CHAR">
+		<text string="INS CHAR">
+			<color red="1.0" green="1.0" blue="1.0" />
+		</text>
+	</element>
+	<element name="background">
+		<rect>
+			<bounds left="0" top="0" right="1" bottom="1" />
+			<color red="0.0" green="0.0" blue="0.0" />
+		</rect>
+	</element>
+
+	<view name="Keyboard LEDs">
+		<bezel name="auto_lf_txt" element="AUTO_LF">
+			<bounds left="0" right="70" top="520" bottom="528" />
+		</bezel>
+		<bezel name="auto_lf_led" element="red_led">
+			<bounds left="31" right="39" top="532" bottom="540" />
+		</bezel>
+
+		<bezel name="online_txt" element="ON_LINE">
+			<bounds left="70" right="140" top="520" bottom="528" />
+		</bezel>
+		<bezel name="online_led" element="red_led">
+			<bounds left="101" right="109" top="532" bottom="540" />
+		</bezel>
+
+		<bezel name="page_mode_txt" element="PAGE_MODE">
+			<bounds left="140" right="210" top="520" bottom="528" />
+		</bezel>
+		<bezel name="page_mode_led" element="red_led">
+			<bounds left="171" right="179" top="532" bottom="540" />
+		</bezel>
+
+		<bezel name="insert_char_txt" element="INS_CHAR">
+			<bounds left="281" right="351" top="520" bottom="528" />
+		</bezel>
+		<bezel name="insert_char_led" element="red_led">
+			<bounds left="312" right="320" top="532" bottom="540" />
+		</bezel>
+
+		<bezel element="background">
+			<bounds left="0" top="540" right="720" bottom="544" />
+		</bezel>
+		<screen index="0">
+			<bounds x="0" y="0" width="720" height="512" />
+		</screen>
+	</view>
+
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/emu/main.h mame-0.224+dfsg.1/src/emu/main.h
--- mame-0.222+dfsg.1/src/emu/main.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/main.h	2020-08-26 08:57:19.000000000 +0000
@@ -43,16 +43,16 @@
 {
 public:
 	// construction/destruction
-	emulator_info() {};
+	emulator_info() = default;
 
-	static const char * get_appname();
-	static const char * get_appname_lower();
-	static const char * get_configname();
-	static const char * get_copyright();
-	static const char * get_copyright_info();
-	static const char * get_bare_build_version();
-	static const char * get_build_version();
-	static void display_ui_chooser(running_machine& machine);
+	static const char *get_appname();
+	static const char *get_appname_lower();
+	static const char *get_configname();
+	static const char *get_copyright();
+	static const char *get_copyright_info();
+	static const char *get_bare_build_version();
+	static const char *get_build_version();
+	static void display_ui_chooser(running_machine &machine);
 	static int start_frontend(emu_options &options, osd_interface &osd, std::vector<std::string> &args);
 	static int start_frontend(emu_options &options, osd_interface &osd, int argc, char *argv[]);
 	static void draw_user_interface(running_machine& machine);
diff -Nru mame-0.222+dfsg.1/src/emu/natkeyboard.cpp mame-0.224+dfsg.1/src/emu/natkeyboard.cpp
--- mame-0.222+dfsg.1/src/emu/natkeyboard.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/natkeyboard.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -660,9 +660,9 @@
 								newcode.field[fieldnum] = &field;
 								if (m_keycode_map.end() == found)
 								{
-									keycode_map_list map_list;
-									map_list.emplace_back(newcode);
-									m_keycode_map.emplace(code, map_list);
+									keycode_map_entries entries;
+									entries.emplace_back(newcode);
+									m_keycode_map.emplace(code, std::move(entries));
 								}
 								else
 									found->second.emplace_back(newcode);
@@ -679,6 +679,15 @@
 			}
 		}
 	}
+
+	// sort mapping entries by shift state
+	for (auto &mapping : m_keycode_map)
+	{
+		std::sort(
+				mapping.second.begin(),
+				mapping.second.end(),
+				[] (keycode_map_entry const &x, keycode_map_entry const &y) { return x.shift < y.shift; });
+	}
 }
 
 
@@ -880,7 +889,8 @@
 const natural_keyboard::keycode_map_entry *natural_keyboard::find_code(char32_t ch) const
 {
 	keycode_map::const_iterator const found(m_keycode_map.find(ch));
-	if (m_keycode_map.end() == found) return nullptr;
+	if (m_keycode_map.end() == found)
+		return nullptr;
 	for (keycode_map_entry const &entry : found->second)
 	{
 		if (entry.condition.eval())
diff -Nru mame-0.222+dfsg.1/src/emu/natkeyboard.h mame-0.224+dfsg.1/src/emu/natkeyboard.h
--- mame-0.222+dfsg.1/src/emu/natkeyboard.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/natkeyboard.h	2020-08-26 08:57:19.000000000 +0000
@@ -76,8 +76,8 @@
 		unsigned                                    shift;
 		ioport_condition                        condition;
 	};
-	typedef std::list<keycode_map_entry> keycode_map_list;
-	typedef std::unordered_map<char32_t, keycode_map_list> keycode_map;
+	typedef std::vector<keycode_map_entry> keycode_map_entries;
+	typedef std::unordered_map<char32_t, keycode_map_entries> keycode_map;
 
 	// internal helpers
 	void build_codes(ioport_manager &manager);
diff -Nru mame-0.222+dfsg.1/src/emu/render.cpp mame-0.224+dfsg.1/src/emu/render.cpp
--- mame-0.222+dfsg.1/src/emu/render.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/render.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1441,7 +1441,7 @@
 
 bool render_target::map_point_input(s32 target_x, s32 target_y, ioport_port *&input_port, ioport_value &input_mask, float &input_x, float &input_y)
 {
-	return map_point_internal(target_x, target_y, nullptr, input_x, input_y, input_port, input_mask);;
+	return map_point_internal(target_x, target_y, nullptr, input_x, input_y, input_port, input_mask);
 }
 
 
@@ -1593,10 +1593,13 @@
 		int cloneof = driver_list::clone(system);
 		while (0 <= cloneof)
 		{
-			if (!load_layout_file(driver_list::driver(cloneof).name, driver_list::driver(cloneof).name))
-				m_external_artwork |= load_layout_file(driver_list::driver(cloneof).name, "default");
-			else
-				m_external_artwork = true;
+			if (!m_external_artwork || driver_list::driver(cloneof).flags & MACHINE_IS_BIOS_ROOT)
+			{
+				if (!load_layout_file(driver_list::driver(cloneof).name, driver_list::driver(cloneof).name))
+					m_external_artwork |= load_layout_file(driver_list::driver(cloneof).name, "default");
+				else
+					m_external_artwork = true;
+			}
 
 			// Check the parent of the parent to cover bios based artwork
 			const game_driver &parent(driver_list::driver(cloneof));
diff -Nru mame-0.222+dfsg.1/src/emu/rendlay.cpp mame-0.224+dfsg.1/src/emu/rendlay.cpp
--- mame-0.222+dfsg.1/src/emu/rendlay.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/rendlay.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2244,7 +2244,7 @@
 
 			int endpos = basey+ourheight/num_shown;
 
-			// only render the symbol / text if it's atually in view because the code is SLOW
+			// only render the symbol / text if it's actually in view because the code is SLOW
 			if ((endpos >= bounds.top()) && (basey <= bounds.bottom()))
 			{
 				while (1)
@@ -2403,7 +2403,7 @@
 
 			int endpos = basex+(ourwidth/num_shown);
 
-			// only render the symbol / text if it's atually in view because the code is SLOW
+			// only render the symbol / text if it's actually in view because the code is SLOW
 			if ((endpos >= bounds.left()) && (basex <= bounds.right()))
 			{
 				while (1)
diff -Nru mame-0.222+dfsg.1/src/emu/screen.cpp mame-0.224+dfsg.1/src/emu/screen.cpp
--- mame-0.222+dfsg.1/src/emu/screen.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/screen.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -569,7 +569,7 @@
 	, m_curtexture(0)
 	, m_changed(true)
 	, m_last_partial_scan(0)
-	, m_partial_scan_hpos(0)
+	, m_partial_scan_hpos(-1)
 	, m_color(rgb_t(0xff, 0xff, 0xff, 0xff))
 	, m_brightness(0xff)
 	, m_frame_period(DEFAULT_FRAME_PERIOD.as_attoseconds())
@@ -1260,6 +1260,7 @@
 
 	// remember where we left off
 	m_last_partial_scan = scanline + 1;
+	m_partial_scan_hpos = -1;
 	return true;
 }
 
@@ -1293,16 +1294,30 @@
 	int current_hpos = hpos();
 	rectangle clip = m_visarea;
 
+	// skip if we already rendered this line
+	if (current_vpos < m_last_partial_scan)
+	{
+		LOG_PARTIAL_UPDATES(("skipped because line was already rendered\n"));
+		return;
+	}
+
+	// if beam position is the same, there's nothing to update
+	if (current_vpos == m_last_partial_scan && current_hpos == m_partial_scan_hpos)
+	{
+		LOG_PARTIAL_UPDATES(("skipped because beam position is unchanged\n"));
+		return;
+	}
+
 	LOG_PARTIAL_UPDATES(("update_now(): Y=%d, X=%d, last partial %d, partial hpos %d  (vis %d %d)\n", current_vpos, current_hpos, m_last_partial_scan, m_partial_scan_hpos, m_visarea.right(), m_visarea.bottom()));
 
 	// start off by doing a partial update up to the line before us, in case that was necessary
 	if (current_vpos > m_last_partial_scan)
 	{
 		// if the line before us was incomplete, we must do it in two pieces
-		if (m_partial_scan_hpos > 0)
+		if (m_partial_scan_hpos >= 0)
 		{
 			// now finish the previous partial scanline
-			clip.set((std::max)(clip.left(), m_partial_scan_hpos),
+			clip.set((std::max)(clip.left(), m_partial_scan_hpos + 1),
 					 clip.right(),
 					 (std::max)(clip.top(), m_last_partial_scan),
 					 (std::min)(clip.bottom(), m_last_partial_scan));
@@ -1312,6 +1327,7 @@
 			{
 				g_profiler.start(PROFILER_VIDEO);
 
+				u32 flags = 0;
 				screen_bitmap &curbitmap = m_bitmap[m_curbitmap];
 				if (m_video_attributes & VIDEO_VARIABLE_WIDTH)
 				{
@@ -1319,8 +1335,8 @@
 					switch (curbitmap.format())
 					{
 						default:
-						case BITMAP_FORMAT_IND16: m_screen_update_ind16(*this, *(bitmap_ind16 *)m_scan_bitmaps[m_curbitmap][m_last_partial_scan], clip);   break;
-						case BITMAP_FORMAT_RGB32: m_screen_update_rgb32(*this, *(bitmap_rgb32 *)m_scan_bitmaps[m_curbitmap][m_last_partial_scan], clip);   break;
+						case BITMAP_FORMAT_IND16:   flags = m_screen_update_ind16(*this, *(bitmap_ind16 *)m_scan_bitmaps[m_curbitmap][m_last_partial_scan], clip);   break;
+						case BITMAP_FORMAT_RGB32:   flags = m_screen_update_rgb32(*this, *(bitmap_rgb32 *)m_scan_bitmaps[m_curbitmap][m_last_partial_scan], clip);   break;
 					}
 				}
 				else
@@ -1328,16 +1344,20 @@
 					switch (curbitmap.format())
 					{
 						default:
-						case BITMAP_FORMAT_IND16: m_screen_update_ind16(*this, curbitmap.as_ind16(), clip);   break;
-						case BITMAP_FORMAT_RGB32: m_screen_update_rgb32(*this, curbitmap.as_rgb32(), clip);   break;
+						case BITMAP_FORMAT_IND16:   flags = m_screen_update_ind16(*this, curbitmap.as_ind16(), clip);   break;
+						case BITMAP_FORMAT_RGB32:   flags = m_screen_update_rgb32(*this, curbitmap.as_rgb32(), clip);   break;
 					}
 				}
 
-				m_partial_updates_this_frame++;
 				g_profiler.stop();
-				m_partial_scan_hpos = 0;
-				m_last_partial_scan++;
+				m_partial_updates_this_frame++;
+
+				// if we modified the bitmap, we have to commit
+				m_changed |= ~flags & UPDATE_HAS_NOT_CHANGED;
 			}
+
+			m_partial_scan_hpos = -1;
+			m_last_partial_scan++;
 		}
 		if (current_vpos > m_last_partial_scan)
 		{
@@ -1348,7 +1368,7 @@
 	// now draw this partial scanline
 	clip = m_visarea;
 
-	clip.set((std::max)(clip.left(), m_partial_scan_hpos),
+	clip.set((std::max)(clip.left(), m_partial_scan_hpos + 1),
 			 (std::min)(clip.right(), current_hpos),
 			 (std::max)(clip.top(), current_vpos),
 			 (std::min)(clip.bottom(), current_vpos));
@@ -1387,18 +1407,11 @@
 
 		// if we modified the bitmap, we have to commit
 		m_changed |= ~flags & UPDATE_HAS_NOT_CHANGED;
-
-		// remember where we left off
-		m_partial_scan_hpos = current_hpos;
-		m_last_partial_scan = current_vpos;
-
-		// if we completed the line, mark it so
-		if (current_hpos >= m_visarea.right())
-		{
-			m_partial_scan_hpos = 0;
-			m_last_partial_scan = current_vpos + 1;
-		}
 	}
+
+	// remember where we left off
+	m_partial_scan_hpos = current_hpos;
+	m_last_partial_scan = current_vpos;
 }
 
 
@@ -1410,7 +1423,7 @@
 void screen_device::reset_partial_updates()
 {
 	m_last_partial_scan = 0;
-	m_partial_scan_hpos = 0;
+	m_partial_scan_hpos = -1;
 	m_partial_updates_this_frame = 0;
 	m_scanline0_timer->adjust(time_until_pos(0));
 }
diff -Nru mame-0.222+dfsg.1/src/emu/screen.h mame-0.224+dfsg.1/src/emu/screen.h
--- mame-0.222+dfsg.1/src/emu/screen.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/screen.h	2020-08-26 08:57:19.000000000 +0000
@@ -398,6 +398,7 @@
 	attotime time_until_vblank_end() const;
 	attotime time_until_update() const { return (m_video_attributes & VIDEO_UPDATE_AFTER_VBLANK) ? time_until_vblank_end() : time_until_vblank_start(); }
 	attotime scan_period() const { return attotime(0, m_scantime); }
+	attotime pixel_period() const { return attotime(0, m_pixeltime); }
 	attotime frame_period() const { return attotime(0, m_frame_period); }
 	u64 frame_number() const { return m_frame_number; }
 
@@ -407,6 +408,7 @@
 
 	// updating
 	int partial_updates() const { return m_partial_updates_this_frame; }
+	int partial_scan_hpos() const { return m_partial_scan_hpos; }
 	bool update_partial(int scanline);
 	void update_now();
 	void reset_partial_updates();
diff -Nru mame-0.222+dfsg.1/src/emu/speaker.cpp mame-0.224+dfsg.1/src/emu/speaker.cpp
--- mame-0.222+dfsg.1/src/emu/speaker.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/speaker.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -9,6 +9,7 @@
 ***************************************************************************/
 
 #include "emu.h"
+#include "emuopts.h"
 #include "speaker.h"
 
 
@@ -36,11 +37,8 @@
 	, m_x(0.0)
 	, m_y(0.0)
 	, m_z(0.0)
-#ifdef MAME_DEBUG
-	, m_max_sample(0)
-	, m_clipped_samples(0)
-	, m_total_samples(0)
-#endif
+	, m_current_max(0)
+	, m_samples_this_bucket(0)
 {
 }
 
@@ -51,11 +49,6 @@
 
 speaker_device::~speaker_device()
 {
-#ifdef MAME_DEBUG
-	// log the maximum sample values for all speakers
-	if (m_max_sample > 0)
-		osd_printf_debug("Speaker \"%s\" - max = %d (gain *= %f) - %d%% samples clipped\n", tag(), m_max_sample, 32767.0 / (m_max_sample ? m_max_sample : 1), (int)((double)m_clipped_samples * 100.0 / m_total_samples));
-#endif
 }
 
 
@@ -84,19 +77,21 @@
 	}
 	assert(samples_this_update == numsamples);
 
-#ifdef MAME_DEBUG
-	// debug version: keep track of the maximum sample
-	for (int sample = 0; sample < samples_this_update; sample++)
+	// track maximum sample value for each 0.1s bucket
+	if (machine().options().speaker_report() != 0)
 	{
-		if (stream_buf[sample] > m_max_sample)
-			m_max_sample = stream_buf[sample];
-		else if (-stream_buf[sample] > m_max_sample)
-			m_max_sample = -stream_buf[sample];
-		if (stream_buf[sample] > 32767 || stream_buf[sample] < -32768)
-			m_clipped_samples++;
-		m_total_samples++;
+		u32 samples_per_bucket = m_mixer_stream->sample_rate() / BUCKETS_PER_SECOND;
+		for (int sample = 0; sample < samples_this_update; sample++)
+		{
+			m_current_max = std::max(m_current_max, abs(stream_buf[sample]));
+			if (++m_samples_this_bucket >= samples_per_bucket)
+			{
+				m_max_sample.push_back(m_current_max);
+				m_current_max = 0;
+				m_samples_this_bucket = 0;
+			}
+		}
 	}
-#endif
 
 	// mix if sound is enabled
 	if (!suppress)
@@ -130,3 +125,48 @@
 {
 	// dummy save to make device.c happy
 }
+
+
+//-------------------------------------------------
+//  device_stop - cleanup and report
+//-------------------------------------------------
+
+void speaker_device::device_stop()
+{
+	// level 1: just report if there was any clipping
+	// level 2: report the overall maximum, even if no clipping
+	// level 3: print a detailed list of all the times there was clipping
+	// level 4: print a detailed list of every bucket
+	int report = machine().options().speaker_report();
+	if (report != 0)
+	{
+		m_max_sample.push_back(m_current_max);
+
+		// determine overall maximum and number of clipped buckets
+		s32 overallmax = 0;
+		u32 clipped = 0;
+		for (auto &curmax : m_max_sample)
+		{
+			overallmax = std::max(overallmax, curmax);
+			if (curmax > 32767)
+				clipped++;
+		}
+
+		// levels 1 and 2 just get a summary
+		if (clipped != 0 || report == 2 || report == 4)
+			osd_printf_info("Speaker \"%s\" - max = %d (gain *= %.3f) - clipped in %d/%d (%d%%) buckets\n", tag(), overallmax, 32767.0 / (overallmax ? overallmax : 1), clipped, m_max_sample.size(), clipped * 100 / m_max_sample.size());
+
+		// levels 3 and 4 get a full dump
+		if (report >= 3)
+		{
+			double t = 0;
+			for (auto &curmax : m_max_sample)
+			{
+				if (curmax > 32767 || report == 4)
+					osd_printf_info("   t=%5.1f  max=%6d\n", t, curmax);
+				t += 1.0 / double(BUCKETS_PER_SECOND);
+			}
+		}
+	}
+}
+
diff -Nru mame-0.222+dfsg.1/src/emu/speaker.h mame-0.224+dfsg.1/src/emu/speaker.h
--- mame-0.222+dfsg.1/src/emu/speaker.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/speaker.h	2020-08-26 08:57:19.000000000 +0000
@@ -74,6 +74,7 @@
 protected:
 	// device-level overrides
 	virtual void device_start() override ATTR_COLD;
+	virtual void device_stop() override ATTR_COLD;
 
 	// inline configuration state
 	double              m_x;
@@ -81,11 +82,10 @@
 	double              m_z;
 
 	// internal state
-#ifdef MAME_DEBUG
-	s32                 m_max_sample;           // largest sample value we've seen
-	s32                 m_clipped_samples;      // total number of clipped samples
-	s32                 m_total_samples;        // total number of samples
-#endif
+	static constexpr int BUCKETS_PER_SECOND = 10;
+	std::vector<s32>    m_max_sample;
+	s32                 m_current_max;
+	u32                 m_samples_this_bucket;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/emu/tilemap.h mame-0.224+dfsg.1/src/emu/tilemap.h
--- mame-0.222+dfsg.1/src/emu/tilemap.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/tilemap.h	2020-08-26 08:57:19.000000000 +0000
@@ -487,10 +487,10 @@
 	void configure_groups(gfx_element &gfx, indirect_pen_t transcolor);
 
 	// drawing
-	void draw(screen_device &screen, bitmap_ind16 &dest, const rectangle &cliprect, u32 flags, u8 priority = 0, u8 priority_mask = 0xff);
-	void draw(screen_device &screen, bitmap_rgb32 &dest, const rectangle &cliprect, u32 flags, u8 priority = 0, u8 priority_mask = 0xff);
-	void draw_roz(screen_device &screen, bitmap_ind16 &dest, const rectangle &cliprect, u32 startx, u32 starty, int incxx, int incxy, int incyx, int incyy, bool wraparound, u32 flags, u8 priority = 0, u8 priority_mask = 0xff);
-	void draw_roz(screen_device &screen, bitmap_rgb32 &dest, const rectangle &cliprect, u32 startx, u32 starty, int incxx, int incxy, int incyx, int incyy, bool wraparound, u32 flags, u8 priority = 0, u8 priority_mask = 0xff);
+	void draw(screen_device &screen, bitmap_ind16 &dest, const rectangle &cliprect, u32 flags = TILEMAP_DRAW_ALL_CATEGORIES, u8 priority = 0, u8 priority_mask = 0xff);
+	void draw(screen_device &screen, bitmap_rgb32 &dest, const rectangle &cliprect, u32 flags = TILEMAP_DRAW_ALL_CATEGORIES, u8 priority = 0, u8 priority_mask = 0xff);
+	void draw_roz(screen_device &screen, bitmap_ind16 &dest, const rectangle &cliprect, u32 startx, u32 starty, int incxx, int incxy, int incyx, int incyy, bool wraparound, u32 flags = TILEMAP_DRAW_ALL_CATEGORIES, u8 priority = 0, u8 priority_mask = 0xff);
+	void draw_roz(screen_device &screen, bitmap_rgb32 &dest, const rectangle &cliprect, u32 startx, u32 starty, int incxx, int incxy, int incyx, int incyy, bool wraparound, u32 flags = TILEMAP_DRAW_ALL_CATEGORIES, u8 priority = 0, u8 priority_mask = 0xff);
 	void draw_debug(screen_device &screen, bitmap_rgb32 &dest, u32 scrollx, u32 scrolly, u32 flags = TILEMAP_DRAW_ALL_CATEGORIES);
 
 	// mappers
diff -Nru mame-0.222+dfsg.1/src/emu/validity.cpp mame-0.224+dfsg.1/src/emu/validity.cpp
--- mame-0.222+dfsg.1/src/emu/validity.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/validity.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -560,8 +560,6 @@
 	    scale2_add_and_clamp(const rgbaint_t&, const rgbaint_t&, const rgbaint_t&)
 	    scale_add_and_clamp(const rgbaint_t&, const rgbaint_t&);
 	    scale_imm_add_and_clamp(const s32, const rgbaint_t&);
-	    static bilinear_filter(u32, u32, u32, u32, u8, u8)
-	    bilinear_filter_rgbaint(u32, u32, u32, u32, u8, u8)
 	*/
 
 	auto random_i32_nolimit = [this]
@@ -1392,6 +1390,62 @@
 	rgb.set(actual_a, actual_r, actual_g, actual_b);
 	rgb.cmplt_imm_rgba(actual_a + 1, std::numeric_limits<s32>::min(), std::numeric_limits<s32>::max(), actual_b);
 	check_expected("rgbaint_t::cmplt_imm_rgba");
+
+	// test bilinear_filter and bilinear_filter_rgbaint
+	// SSE implementation carries more internal precision between the bilinear stages
+#if defined(MAME_RGB_HIGH_PRECISION)
+	const int first_shift = 1;
+#else
+	const int first_shift = 8;
+#endif
+	for (int index = 0; index < 1000; index++)
+	{
+		u8 u, v;
+		rgbaint_t rgb_point[4];
+		u32 top_row, bottom_row;
+
+		for (int i = 0; i < 4; i++)
+		{
+			rgb_point[i].set(random_u32());
+		}
+
+		switch (index)
+		{
+			case 0: u = 0; v = 0; break;
+			case 1: u = 255; v = 255; break;
+			case 2: u = 0; v = 255; break;
+			case 3: u = 255; v = 0; break;
+			case 4: u = 128; v = 128; break;
+			case 5: u = 63; v = 32; break;
+			default:
+				u = random_u32() & 0xff;
+				v = random_u32() & 0xff;
+				break;
+		}
+
+		top_row = (rgb_point[0].get_a() * (256 - u) + rgb_point[1].get_a() * u) >> first_shift;
+		bottom_row = (rgb_point[2].get_a() * (256 - u) + rgb_point[3].get_a() * u) >> first_shift;
+		expected_a = (top_row * (256 - v) + bottom_row * v) >> (16 - first_shift);
+
+		top_row = (rgb_point[0].get_r() * (256 - u) + rgb_point[1].get_r() * u) >> first_shift;
+		bottom_row = (rgb_point[2].get_r() * (256 - u) + rgb_point[3].get_r() * u) >> first_shift;
+		expected_r = (top_row * (256 - v) + bottom_row * v) >> (16 - first_shift);
+
+		top_row = (rgb_point[0].get_g() * (256 - u) + rgb_point[1].get_g() * u) >> first_shift;
+		bottom_row = (rgb_point[2].get_g() * (256 - u) + rgb_point[3].get_g() * u) >> first_shift;
+		expected_g = (top_row * (256 - v) + bottom_row * v) >> (16 - first_shift);
+
+		top_row = (rgb_point[0].get_b() * (256 - u) + rgb_point[1].get_b() * u) >> first_shift;
+		bottom_row = (rgb_point[2].get_b() * (256 - u) + rgb_point[3].get_b() * u) >> first_shift;
+		expected_b = (top_row * (256 - v) + bottom_row * v) >> (16 - first_shift);
+
+		imm = rgbaint_t::bilinear_filter(rgb_point[0].to_rgba(), rgb_point[1].to_rgba(), rgb_point[2].to_rgba(), rgb_point[3].to_rgba(), u, v);
+		rgb.set(imm);
+		check_expected("rgbaint_t::bilinear_filter");
+
+		rgb.bilinear_filter_rgbaint(rgb_point[0].to_rgba(), rgb_point[1].to_rgba(), rgb_point[2].to_rgba(), rgb_point[3].to_rgba(), u, v);
+		check_expected("rgbaint_t::bilinear_filter_rgbaint");
+	}
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/emu/video/rgbgen.cpp mame-0.224+dfsg.1/src/emu/video/rgbgen.cpp
--- mame-0.222+dfsg.1/src/emu/video/rgbgen.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/video/rgbgen.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,8 +10,7 @@
 
 #include "emu.h"
 
-
-#if !(defined(__ALTIVEC__) || ((!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || defined(_MSC_VER)) && defined(PTR64)))
+#if ((defined(MAME_DEBUG) && !defined(__OPTIMIZE__)) || (!defined(__SSE2__) && (!defined(_M_IX86_FP) || (_M_IX86_FP < 2)))) && !defined(__ALTIVEC__)
 
 #include "rgbgen.h"
 
@@ -115,4 +114,4 @@
 	if (u32(m_b) > 255) { m_b = (m_b < 0) ? 0 : 255; }
 }
 
-#endif // !defined(__ALTIVEC__)
+#endif // ((defined(MAME_DEBUG) && !defined(__OPTIMIZE__)) || (!defined(__SSE2__) && (!defined(_M_IX86_FP) || (_M_IX86_FP < 2)))) && !defined(__ALTIVEC__)
diff -Nru mame-0.222+dfsg.1/src/emu/video/rgbsse.cpp mame-0.224+dfsg.1/src/emu/video/rgbsse.cpp
--- mame-0.222+dfsg.1/src/emu/video/rgbsse.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/video/rgbsse.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,11 +12,11 @@
 
 #include "emu.h"
 
-#if (!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || defined(_MSC_VER)) && defined(PTR64)
+#if (!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 2)))
 
-#include <emmintrin.h>
 #include "rgbsse.h"
 
+
 /***************************************************************************
     TABLES
 ***************************************************************************/
@@ -185,4 +185,4 @@
 	clamp_to_uint8();
 }
 
-#endif // defined(__SSE2__) || defined(_MSC_VER)
+#endif // (!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 2)))
diff -Nru mame-0.222+dfsg.1/src/emu/video/rgbutil.h mame-0.224+dfsg.1/src/emu/video/rgbutil.h
--- mame-0.222+dfsg.1/src/emu/video/rgbutil.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/video/rgbutil.h	2020-08-26 08:57:19.000000000 +0000
@@ -13,13 +13,20 @@
 #define MAME_EMU_VIDEO_RGBUTIL_H
 
 // use SSE on 64-bit implementations, where it can be assumed
-#if (!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || defined(_MSC_VER)) && defined(PTR64)
+#if (!defined(MAME_DEBUG) || defined(__OPTIMIZE__)) && (defined(__SSE2__) || (defined(_M_IX86_FP) && (_M_IX86_FP >= 2)))
 
+#define MAME_RGB_HIGH_PRECISION
 #include "rgbsse.h"
+
 #elif defined(__ALTIVEC__)
+
+#define MAME_RGB_HIGH_PRECISION
 #include "rgbvmx.h"
+
 #else
+
 #include "rgbgen.h"
+
 #endif
 
 #endif // MAME_EMU_VIDEO_RGBUTIL_H
diff -Nru mame-0.222+dfsg.1/src/emu/video.cpp mame-0.224+dfsg.1/src/emu/video.cpp
--- mame-0.222+dfsg.1/src/emu/video.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/video.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -266,7 +266,7 @@
 		screen_device *const screen = screen_device_iterator(machine().root_device()).first();
 		bool const debugger_enabled = machine().debug_flags & DEBUG_FLAG_ENABLED;
 		bool const within_instruction_hook = debugger_enabled && machine().debugger().within_instruction_hook();
-		if (screen && (machine().paused() || from_debugger || within_instruction_hook))
+		if (screen && ((machine().paused() && machine().options().update_in_pause()) || from_debugger || within_instruction_hook))
 			screen->reset_partial_updates();
 	}
 }
@@ -642,7 +642,10 @@
 	bool has_live_screen = false;
 	for (screen_device &screen : iter)
 	{
+		if (screen.partial_scan_hpos() >= 0) // previous update ended mid-scanline
+			screen.update_now();
 		screen.update_partial(screen.visible_area().max_y);
+
 		if (machine().render().is_live(screen))
 			has_live_screen = true;
 	}
diff -Nru mame-0.222+dfsg.1/src/emu/xtal.cpp mame-0.224+dfsg.1/src/emu/xtal.cpp
--- mame-0.222+dfsg.1/src/emu/xtal.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/emu/xtal.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -80,6 +80,7 @@
 	  2'000'000, /* 2_MHz_XTAL             - */
 	  2'012'160, /* 2.01216_MHz_XTAL       Cidelsa Draco sound board */
 	  2'097'152, /* 2.097152_MHz_XTAL      Icatel 1995 - Brazilian public payphone */
+	  2'376'000, /* 2.376_MHz_XTAL         CIT-101 keyboard */
 	  2'457'600, /* 2.4576_MHz_XTAL        Atari ST MFP */
 	  2'500'000, /* 2.5_MHz_XTAL           Janken Man units */
 	  2'600'000, /* 2.6_MHz_XTAL           Sharp PC-1500 */
@@ -89,6 +90,9 @@
 	  3'120'000, /* 3.12_MHz_XTAL          SP0250 clock on Gottlieb games */
 	  3'276'800, /* 3.2768_MHz_XTAL        SP0256 clock in Speech Synthesis for Dragon 32 */
 	  3'521'280, /* 3.52128_MHz_XTAL       RCA COSMAC VIP */
+	  3'546'800, /* 3.5468_MHz_XTAL        Atari 400 PAL */
+	  3'547'000, /* 3.547_MHz_XTAL         Philips G7200, Philips C7240 */
+	  3'562'500, /* 3.5625_MHz_XTAL        Jopac JO7400 */
 	  3'570'000, /* 3.57_MHz_XTAL          Telmac TMC-600 */
 	  3'578'640, /* 3.57864_MHz_XTAL       Atari Portfolio PCD3311T */
 	  3'579'000, /* 3.579_MHz_XTAL         BeebOPL */
@@ -141,6 +145,7 @@
 	  8'467'200, /* 8.4672_MHz_XTAL        Subsino's Ying Hua Lian */
 	  8'664'000, /* 8.664_MHz_XTAL         Touchmaster */
 	  8'700'000, /* 8.7_MHz_XTAL           Tandberg TDV 2324 */
+	  8'867'000, /* 8.867_MHz_XTAL         Philips G7400 (~2x PAL subcarrier) */
 	  8'867'236, /* 8.867236_MHz_XTAL      RCA CDP1869 PAL color clock (~2x PAL subcarrier) */
 	  8'867'238, /* 8.867238_MHz_XTAL      ETI-660 (~2x PAL subcarrier) */
 	  8'945'000, /* 8.945_MHz_XTAL         Hit Me */
@@ -261,8 +266,11 @@
 	 17'430'000, /* 17.43_MHz_XTAL         Videx Videoterm */
 	 17'550'000, /* 17.55_MHz_XTAL         HP 264x display clock (50 Hz configuration) */
 	 17'600'000, /* 17.6_MHz_XTAL          LSI Octopus */
-	 17'734'470, /* 17.73447_MHz_XTAL      (~4x PAL subcarrier) */
-	 17'734'472, /* 17.734472_MHz_XTAL     actually ~4x PAL subcarrier */
+	 17'734'470, /* 17.73447_MHz_XTAL      4x PAL subcarrier */
+	 17'734'472, /* 17.734472_MHz_XTAL     4x PAL subcarrier - All of these exist, exact 4x PAL is actually 17'734'475 */
+	 17'734'475, /* 17.734475_MHz_XTAL     4x PAL subcarrier - " */
+	 17'734'476, /* 17.734476_MHz_XTAL     4x PAL subcarrier - " */
+	 17'812'000, /* 17.812_MHz_XTAL        Videopac C52 */
 	 17'971'200, /* 17.9712_MHz_XTAL       Compucolor II, Hazeltine Esprit III */
 	 18'000'000, /* 18_MHz_XTAL            S.A.R, Ikari Warriors 3 */
 	 18'414'000, /* 18.414_MHz_XTAL        Ann Arbor Ambassador */
@@ -296,7 +304,7 @@
 	 21'300'000, /* 21.3_MHz_XTAL          - */
 	 21'328'100, /* 21.3281_MHz_XTAL       Philips NMS8245 */
 	 21'477'272, /* 21.477272_MHz_XTAL     BMC bowling, some Data East 90's games, Vtech Socrates; (6x NTSC subcarrier) */
-	 21'667'500, /* 21.6675_MHz_XTAL       AT&T 610 (80-column display clock) */
+	 21'667'500, /* 21.6675_MHz_XTAL       AT&T 610 80-column display clock */
 	 22'000'000, /* 22_MHz_XTAL            - */
 	 22'032'000, /* 22.032_MHz_XTAL        Intellec Series II I/O controller */
 	 22'096'000, /* 22.096_MHz_XTAL        ADDS Viewpoint 122 */
@@ -312,6 +320,7 @@
 	 23'961'600, /* 23.9616_MHz_XTAL       Osborne 4 (Vixen) */
 	 24'000'000, /* 24_MHz_XTAL            Mario, 80's Data East games, 80's Konami games */
 	 24'073'400, /* 24.0734_MHz_XTAL       DEC Rainbow 100 */
+	 24'270'000, /* 24.27_MHz_XTAL         CIT-101XL */
 	 24'300'000, /* 24.3_MHz_XTAL          ADM 36 132-column display clock */
 	 24'576'000, /* 24.576_MHz_XTAL        Pole Position h/w, Model 3 CPU board */
 	 24'883'200, /* 24.8832_MHz_XTAL       DEC VT100 */
@@ -339,7 +348,8 @@
 	 27'164'000, /* 27.164_MHz_XTAL        Typically used on 90's Taito PCBs to drive the custom chips */
 	 27'210'900, /* 27.2109_MHz_XTAL       LA Girl */
 	 27'562'000, /* 27.562_MHz_XTAL        Visual 220 */
-	 27'720'000, /* 27.72_MHz_XTAL         AT&T 610 (132-column display clock) */
+	 27'720'000, /* 27.72_MHz_XTAL         AT&T 610 132-column display clock */
+	 27'956'000, /* 27.956_MHz_XTAL        CIT-101e 132-column display clock */
 	 28'000'000, /* 28_MHz_XTAL            - */
 	 28'322'000, /* 28.322_MHz_XTAL        Saitek RISC 2500, Mephisto Montreux */
 	 28'375'160, /* 28.37516_MHz_XTAL      Amiga PAL systems */
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/audit.cpp mame-0.224+dfsg.1/src/frontend/mame/audit.cpp
--- mame-0.222+dfsg.1/src/frontend/mame/audit.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/audit.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -72,10 +72,11 @@
 
 				char const *const name(ROM_GETNAME(rom));
 				util::hash_collection const hashes(ROM_GETHASHDATA(rom));
-				device_t *const shared_device(find_shared_device(device, name, hashes, ROM_GETLENGTH(rom)));
+				device_t *const shared_device(find_shared_device(device, name, hashes, rom_file_size(rom)));
+				const auto dumped(!hashes.flag(util::hash_collection::FLAG_NO_DUMP));
 
 				// count the number of files with hashes
-				if (!hashes.flag(util::hash_collection::FLAG_NO_DUMP) && !ROM_ISOPTIONAL(rom))
+				if (dumped && !ROM_ISOPTIONAL(rom))
 				{
 					required++;
 					if (shared_device)
@@ -91,7 +92,7 @@
 				if (record)
 				{
 					// count the number of files that are found.
-					if ((record->status() == audit_status::GOOD) || ((record->status() == audit_status::FOUND_INVALID) && !find_shared_device(device, name, record->actual_hashes(), record->actual_length())))
+					if (!device.owner() && ((record->status() == audit_status::GOOD && dumped) || (record->status() == audit_status::FOUND_INVALID && !find_shared_device(device, name, record->actual_hashes(), record->actual_length()))))
 					{
 						found++;
 						if (shared_device)
@@ -515,7 +516,7 @@
 		{
 			for (const rom_entry *rom = rom_first_file(region); rom; rom = rom_next_file(rom))
 			{
-				if (ROM_GETLENGTH(rom) == romlength)
+				if (rom_file_size(rom) == romlength)
 				{
 					util::hash_collection hashes(ROM_GETHASHDATA(rom));
 					if ((dumped && hashes == romhashes) || (!dumped && ROM_GETNAME(rom) == name))
@@ -535,7 +536,7 @@
 				{
 					for (const rom_entry *rom = rom_first_file(region); rom; rom = rom_next_file(rom))
 					{
-						if (ROM_GETLENGTH(rom) == romlength)
+						if (rom_file_size(rom) == romlength)
 						{
 							util::hash_collection hashes(ROM_GETHASHDATA(rom));
 							if ((dumped && hashes == romhashes) || (!dumped && ROM_GETNAME(rom) == name))
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/audit.h mame-0.224+dfsg.1/src/frontend/mame/audit.h
--- mame-0.222+dfsg.1/src/frontend/mame/audit.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/audit.h	2020-08-26 08:57:19.000000000 +0000
@@ -12,8 +12,6 @@
 
 #pragma once
 
-#include "hash.h"
-
 #include <iosfwd>
 #include <list>
 #include <utility>
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/clifront.cpp mame-0.224+dfsg.1/src/frontend/mame/clifront.cpp
--- mame-0.222+dfsg.1/src/frontend/mame/clifront.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/clifront.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1729,16 +1729,25 @@
 
 void cli_frontend::display_help(const char *exename)
 {
-	osd_printf_info("%s v%s\n%s\n\n", emulator_info::get_appname(),build_version,emulator_info::get_copyright_info());
-	osd_printf_info("This software reproduces, more or less faithfully, the behaviour of a wide range\n"
-					"of machines. But hardware is useless without software, so images of the ROMs and\n"
-					"other media which run on that hardware are also required.\n\n");
-	osd_printf_info("Usage:  %s [machine] [media] [software] [options]",exename);
-	osd_printf_info("\n\n"
-			"        %s -showusage    for a list of options\n"
-			"        %s -showconfig   to show your current %s.ini\n"
-			"        %s -listmedia    for a full list of supported media\n"
-			"        %s -createconfig to create a %s.ini\n\n"
-			"For usage instructions, please consult the files config.txt and windows.txt.\n",exename,
-			exename,emulator_info::get_configname(),exename,exename,emulator_info::get_configname());
+	osd_printf_info(
+			"%3$s v%2$s\n"
+			"%5$s\n"
+			"\n"
+			"This software reproduces, more or less faithfully, the behaviour of a wide range\n"
+			"of machines. But hardware is useless without software, so images of the ROMs and\n"
+			"other media which run on that hardware are also required.\n"
+			"\n"
+			"Usage:  %1$s [machine] [media] [software] [options]\n"
+			"\n"
+			"        %1$s -showusage    for a list of options\n"
+			"        %1$s -showconfig   to show current configuration in %4$s.ini format\n"
+			"        %1$s -listmedia    for a full list of supported media\n"
+			"        %1$s -createconfig to create a %4$s.ini file\n"
+			"\n"
+			"For usage instructions, please visit https://docs.mamedev.org/\n",
+			exename,
+			build_version,
+			emulator_info::get_appname(),
+			emulator_info::get_configname(),
+			emulator_info::get_copyright_info());
 }
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/ui/info.cpp mame-0.224+dfsg.1/src/frontend/mame/ui/info.cpp
--- mame-0.222+dfsg.1/src/frontend/mame/ui/info.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/ui/info.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -293,10 +293,6 @@
 			buf << '\n';
 	}
 
-	// add the 'press OK' string
-	if (!buf.str().empty())
-		buf << _("\n\nPress any key to continue");
-
 	return buf.str();
 }
 
@@ -451,9 +447,8 @@
 
 
 /*-------------------------------------------------
-  menu_game_info - handle the game information
-  menu
- -------------------------------------------------*/
+  menu_game_info - handle the game information menu
+-------------------------------------------------*/
 
 menu_game_info::menu_game_info(mame_ui_manager &mui, render_container &container) : menu(mui, container)
 {
@@ -477,9 +472,33 @@
 
 
 /*-------------------------------------------------
-  menu_image_info - handle the image information
-  menu
- -------------------------------------------------*/
+  menu_warn_info - handle the emulation warnings menu
+-------------------------------------------------*/
+
+menu_warn_info::menu_warn_info(mame_ui_manager &mui, render_container &container) : menu(mui, container)
+{
+}
+
+menu_warn_info::~menu_warn_info()
+{
+}
+
+void menu_warn_info::populate(float &customtop, float &custombottom)
+{
+	std::string tempstring = ui().machine_info().warnings_string();
+	item_append(std::move(tempstring), "", FLAG_MULTILINE, nullptr);
+}
+
+void menu_warn_info::handle()
+{
+	// process the menu
+	process(0);
+}
+
+
+/*-------------------------------------------------
+  menu_image_info - handle the image information menu
+-------------------------------------------------*/
 
 menu_image_info::menu_image_info(mame_ui_manager &mui, render_container &container) : menu(mui, container)
 {
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/ui/info.h mame-0.224+dfsg.1/src/frontend/mame/ui/info.h
--- mame-0.222+dfsg.1/src/frontend/mame/ui/info.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/ui/info.h	2020-08-26 08:57:19.000000000 +0000
@@ -96,6 +96,18 @@
 };
 
 
+class menu_warn_info : public menu
+{
+public:
+	menu_warn_info(mame_ui_manager &mui, render_container &container);
+	virtual ~menu_warn_info() override;
+
+private:
+	virtual void populate(float &customtop, float &custombottom) override;
+	virtual void handle() override;
+};
+
+
 class menu_image_info : public menu
 {
 public:
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/ui/mainmenu.cpp mame-0.224+dfsg.1/src/frontend/mame/ui/mainmenu.cpp
--- mame-0.222+dfsg.1/src/frontend/mame/ui/mainmenu.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/ui/mainmenu.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -75,6 +75,9 @@
 
 	item_append(_("Machine Information"), "", 0, (void *)GAME_INFO);
 
+	if (ui().found_machine_warnings())
+		item_append(_("Warning Information"), "", 0, (void *)WARN_INFO);
+
 	for (device_image_interface &image : image_interface_iterator(machine().root_device()))
 	{
 		if (image.user_loadable())
@@ -184,6 +187,10 @@
 			menu::stack_push<menu_game_info>(ui(), container());
 			break;
 
+		case WARN_INFO:
+			menu::stack_push<menu_warn_info>(ui(), container());
+			break;
+
 		case IMAGE_MENU_IMAGE_INFO:
 			menu::stack_push<menu_image_info>(ui(), container());
 			break;
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/ui/menu.h mame-0.224+dfsg.1/src/frontend/mame/ui/menu.h
--- mame-0.222+dfsg.1/src/frontend/mame/ui/menu.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/ui/menu.h	2020-08-26 08:57:19.000000000 +0000
@@ -57,6 +57,7 @@
 		ANALOG,
 		BOOKKEEPING,
 		GAME_INFO,
+		WARN_INFO,
 		IMAGE_MENU_IMAGE_INFO,
 		IMAGE_MENU_FILE_MANAGER,
 		TAPE_CONTROL,
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/ui/menuitem.h mame-0.224+dfsg.1/src/frontend/mame/ui/menuitem.h
--- mame-0.222+dfsg.1/src/frontend/mame/ui/menuitem.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/ui/menuitem.h	2020-08-26 08:57:19.000000000 +0000
@@ -9,13 +9,14 @@
 
 ***************************************************************************/
 
-#pragma once
-
 #ifndef MAME_FRONTEND_UI_MENUITEM_H
 #define MAME_FRONTEND_UI_MENUITEM_H
 
+#pragma once
+
 
 namespace ui {
+
 // special menu item for separators
 #define MENU_SEPARATOR_ITEM         "---"
 
@@ -38,7 +39,7 @@
 
 	std::string     text;
 	std::string     subtext;
-	uint32_t          flags;
+	uint32_t        flags;
 	void            *ref;
 	menu_item_type  type;   // item type (eventually will go away when itemref is proper ui_menu_item class rather than void*)
 };
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/ui/state.cpp mame-0.224+dfsg.1/src/frontend/mame/ui/state.cpp
--- mame-0.222+dfsg.1/src/frontend/mame/ui/state.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/ui/state.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,7 +10,9 @@
 
 #include "emu.h"
 #include "ui/state.h"
+
 #include "emuopts.h"
+#include "inputdev.h"
 
 
 namespace ui {
@@ -21,20 +23,6 @@
 
 namespace {
 
-const int MAX_SAVED_STATE_JOYSTICK = 4;
-
-//-------------------------------------------------
-//  keyboard_code
-//-------------------------------------------------
-
-input_code keyboard_code(input_item_id id)
-{
-	// only supported for A-Z|0-9
-	assert((id >= ITEM_ID_A && id <= ITEM_ID_Z) || (id >= ITEM_ID_0 && id <= ITEM_ID_9));
-	return input_code(DEVICE_CLASS_KEYBOARD, 0, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, id);
-}
-
-
 //-------------------------------------------------
 //  keyboard_input_item_name
 //-------------------------------------------------
@@ -57,20 +45,15 @@
 
 std::pair<std::string, std::string> code_item_pair(const running_machine &machine, input_item_id id)
 {
-	// identify the input code name (translated appropriately)
-	input_code code = keyboard_code(id);
-	std::string code_name = machine.input().code_name(code);
-	strmakelower(code_name);
-
-	// identify the keyboard item name
-	std::string input_item_name = keyboard_input_item_name(id);
+	// only supported for A-Z|0-9
+	assert((id >= ITEM_ID_A && id <= ITEM_ID_Z) || (id >= ITEM_ID_0 && id <= ITEM_ID_9));
+	input_code const code = input_code(DEVICE_CLASS_KEYBOARD, 0, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, id);
 
-	// return them
-	return std::make_pair(code_name, input_item_name);
+	return std::make_pair(keyboard_input_item_name(id), machine.input().code_name(code));
 }
 
+} // anonymous namespace
 
-};
 
 /***************************************************************************
     FILE ENTRY
@@ -104,8 +87,8 @@
 	, m_header(header)
 	, m_footer(footer)
 	, m_must_exist(must_exist)
-	, m_pause_checked(false)
 	, m_was_paused(false)
+	, m_keys_released(false)
 {
 }
 
@@ -139,11 +122,33 @@
 			m_filename_to_code_map.emplace(code_item_pair(machine(), id));
 		for (input_item_id id = ITEM_ID_0; id <= ITEM_ID_9; id++)
 			m_filename_to_code_map.emplace(code_item_pair(machine(), id));
+
+		// do joysticks
+		input_class const &sticks = machine().input().device_class(DEVICE_CLASS_JOYSTICK);
+		if (sticks.enabled())
+		{
+			for (int i = 0; sticks.maxindex() >= i; ++i)
+			{
+				input_device const *const stick = sticks.device(i);
+				if (stick)
+				{
+					for (input_item_id j = ITEM_ID_BUTTON1; (ITEM_ID_BUTTON32 >= j) && (stick->maxitem() >= j); ++j)
+					{
+						input_device_item const *const item = stick->item(j);
+						if (item && (item->itemclass() == ITEM_CLASS_SWITCH))
+						{
+							m_filename_to_code_map.emplace(
+									util::string_format("joy%i-%i", i, j - ITEM_ID_BUTTON1 + 1),
+									machine().input().code_name(item->code()));
+						}
+					}
+				}
+			}
+		}
 	}
 
 	// open the state directory
-	std::string statedir = state_directory();
-	osd::directory::ptr dir = osd::directory::open(statedir);
+	osd::directory::ptr dir = osd::directory::open(state_directory());
 
 	// create a separate vector, so we can add sorted entries to the menu
 	std::vector<const file_entry *> m_entries_vec;
@@ -173,12 +178,12 @@
 
 	// sort the vector; put recently modified state files at the top
 	std::sort(
-		m_entries_vec.begin(),
-		m_entries_vec.end(),
-		[](const file_entry *a, const file_entry *b)
-		{
-			return a->last_modified() > b->last_modified();
-		});
+			m_entries_vec.begin(),
+			m_entries_vec.end(),
+			[] (const file_entry *a, const file_entry *b)
+			{
+				return a->last_modified() > b->last_modified();
+			});
 
 	// add the entries
 	for (const file_entry *entry : m_entries_vec)
@@ -190,11 +195,11 @@
 
 		// format the text
 		std::string text = util::string_format("%s: %s",
-			entry->visible_name(),
-			time_string);
+				entry->visible_name(),
+				time_string);
 
 		// append the menu item
-		void *itemref = itemref_from_file_entry(*entry);
+		void *const itemref = itemref_from_file_entry(*entry);
 		item_append(std::move(text), std::string(), 0, itemref);
 
 		// is this item selected?
@@ -202,18 +207,25 @@
 			set_selection(itemref);
 	}
 
+	if (m_entries_vec.empty())
+	{
+		item_append(_("No save states found"), std::string(), 0, nullptr);
+		set_selection(nullptr);
+	}
+	item_append(menu_item_type::SEPARATOR);
+
 	// set up custom render proc
 	customtop = ui().get_line_height() + 3.0f * ui().box_tb_border();
 	custombottom = ui().get_line_height() + 3.0f * ui().box_tb_border();
 
 	// pause if appropriate
-	if (!m_pause_checked)
-	{
-		m_was_paused = machine().paused();
-		if (!m_was_paused)
-			machine().pause();
-		m_pause_checked = true;
-	}
+	m_was_paused = machine().paused();
+	if (!m_was_paused)
+		machine().pause();
+
+	// get ready to poll inputs
+	machine().input().reset_polling();
+	m_keys_released = false;
 }
 
 
@@ -224,14 +236,17 @@
 void menu_load_save_state_base::handle()
 {
 	// process the menu
-	const event *event = process(0);
+	event const *const event = process(0);
 
 	// process the event
 	if (event && (event->iptkey == IPT_UI_SELECT))
 	{
-		// user selected one of the entries
-		const file_entry &entry = file_entry_from_itemref(event->itemref);
-		slot_selected(std::string(entry.file_name()));
+		if (event->itemref)
+		{
+			// user selected one of the entries
+			file_entry const &entry = file_entry_from_itemref(event->itemref);
+			slot_selected(std::string(entry.file_name()));
+		}
 	}
 	else
 	{
@@ -249,12 +264,9 @@
 
 std::string menu_load_save_state_base::get_visible_name(const std::string &file_name)
 {
-	if (file_name.size() == 1)
-	{
-		auto iter = m_filename_to_code_map.find(file_name);
-		if (iter != m_filename_to_code_map.end())
-			return iter->second;
-	}
+	auto const iter = m_filename_to_code_map.find(file_name);
+	if (iter != m_filename_to_code_map.end())
+		return iter->second;
 
 	// otherwise these are the same
 	return file_name;
@@ -267,28 +279,22 @@
 
 std::string menu_load_save_state_base::poll_inputs()
 {
-	// poll A-Z
-	for (input_item_id id = ITEM_ID_A; id <= ITEM_ID_Z; id++)
+	input_code const code = machine().input().poll_switches();
+	if (INPUT_CODE_INVALID == code)
 	{
-		if (machine().input().code_pressed_once(keyboard_code(id)))
-			return keyboard_input_item_name(id);
+		m_keys_released = true;
 	}
-
-	// poll 0-9
-	for (input_item_id id = ITEM_ID_0; id <= ITEM_ID_9; id++)
+	else if (m_keys_released)
 	{
-		if (machine().input().code_pressed_once(keyboard_code(id)))
+		input_item_id const id = code.item_id();
+
+		// keyboard A-Z and 0-9
+		if (((ITEM_ID_A <= id) && (ITEM_ID_Z >= id)) || ((ITEM_ID_0 <= id) && (ITEM_ID_9 >= id)))
 			return keyboard_input_item_name(id);
-	}
 
-	// poll joysticks
-	for (int joy_index = 0; joy_index <= MAX_SAVED_STATE_JOYSTICK; joy_index++)
-	{
-		for (input_item_id id = ITEM_ID_BUTTON1; id <= ITEM_ID_BUTTON32; ++id)
-		{
-			if (machine().input().code_pressed_once(input_code(DEVICE_CLASS_JOYSTICK, joy_index, ITEM_CLASS_SWITCH, ITEM_MODIFIER_NONE, id)))
-				return util::string_format("joy%i-%i", joy_index, id - ITEM_ID_BUTTON1 + 1);
-		}
+		// joystick buttons
+		if ((DEVICE_CLASS_JOYSTICK == code.device_class()) && (ITEM_CLASS_SWITCH == code.item_class()) && (ITEM_MODIFIER_NONE == code.item_modifier()) && (ITEM_ID_BUTTON1 <= id) && (ITEM_ID_BUTTON32 >= id))
+			return util::string_format("joy%i-%i", code.device_index(), id - ITEM_ID_BUTTON1 + 1);
 	}
 	return "";
 }
@@ -328,7 +334,16 @@
 
 void menu_load_save_state_base::custom_render(void *selectedref, float top, float bottom, float origx1, float origy1, float origx2, float origy2)
 {
-	extra_text_render(top, bottom, origx1, origy1, origx2, origy2, m_header, m_footer);
+	extra_text_render(top, bottom, origx1, origy1, origx2, origy2, m_header, nullptr);
+	if (m_footer)
+	{
+		char const *const text[] = { m_footer };
+		draw_text_box(
+				std::begin(text), std::end(text),
+				origx1, origx2, origy2 + ui().box_tb_border(), origy2 + bottom,
+				ui::text_layout::CENTER, ui::text_layout::NEVER, false,
+				ui().colors().text_color(), ui().colors().background_color(), 1.0f);
+	}
 }
 
 
@@ -360,9 +375,9 @@
 {
 	const char *stateopt = machine().options().state_name();
 	return util::string_format("%s%s%s",
-		machine().options().state_directory(),
-		PATH_SEPARATOR,
-		machine().get_statename(stateopt));
+			machine().options().state_directory(),
+			PATH_SEPARATOR,
+			machine().get_statename(stateopt));
 }
 
 
@@ -385,7 +400,7 @@
 //-------------------------------------------------
 
 menu_load_state::menu_load_state(mame_ui_manager &mui, render_container &container)
-	: menu_load_save_state_base(mui, container, _("Load State"), _("Select position to load from"), true)
+	: menu_load_save_state_base(mui, container, _("Load State"), _("Select state to load"), true)
 {
 }
 
@@ -409,7 +424,7 @@
 //-------------------------------------------------
 
 menu_save_state::menu_save_state(mame_ui_manager &mui, render_container &container)
-	: menu_load_save_state_base(mui, container, _("Save State"), _("Select position to save to"), false)
+	: menu_load_save_state_base(mui, container, _("Save State"), _("Press a key or joystick button, or select state to overwrite"), false)
 {
 }
 
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/ui/state.h mame-0.224+dfsg.1/src/frontend/mame/ui/state.h
--- mame-0.222+dfsg.1/src/frontend/mame/ui/state.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/ui/state.h	2020-08-26 08:57:19.000000000 +0000
@@ -7,14 +7,16 @@
     Menus for saving and loading state
 
 ***************************************************************************/
-
-#pragma once
-
 #ifndef MAME_FRONTEND_UI_STATE_H
 #define MAME_FRONTEND_UI_STATE_H
 
+#pragma once
+
 #include "ui/menu.h"
 
+#include <chrono>
+#include <unordered_map>
+
 namespace ui {
 
 // ======================> menu_load_save_state_base
@@ -54,14 +56,15 @@
 
 	std::unordered_map<std::string, file_entry>     m_file_entries;
 	std::unordered_map<std::string, std::string>    m_filename_to_code_map;
-	const char *                                    m_header;
-	const char *                                    m_footer;
-	bool                                            m_must_exist;
-	bool                                            m_pause_checked;
+	char const *const                               m_header;
+	char const *const                               m_footer;
+	bool const                                      m_must_exist;
 	bool                                            m_was_paused;
+	bool                                            m_keys_released;
 
 	static void *itemref_from_file_entry(const file_entry &entry);
 	static const file_entry &file_entry_from_itemref(void *itemref);
+
 	void try_select_slot(std::string &&name);
 	void slot_selected(std::string &&name);
 	std::string state_directory() const;
@@ -92,6 +95,6 @@
 	virtual void process_file(std::string &&file_name) override;
 };
 
-};
+} // namespace ui
 
 #endif // MAME_FRONTEND_UI_STATE_H
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/ui/text.h mame-0.224+dfsg.1/src/frontend/mame/ui/text.h
--- mame-0.222+dfsg.1/src/frontend/mame/ui/text.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/ui/text.h	2020-08-26 08:57:19.000000000 +0000
@@ -13,9 +13,6 @@
 #ifndef MAME_FRONTEND_UI_TEXT_H
 #define MAME_FRONTEND_UI_TEXT_H
 
-#include "palette.h"
-#include "unicode.h"
-
 class render_font;
 class render_container;
 
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/ui/ui.cpp mame-0.224+dfsg.1/src/frontend/mame/ui/ui.cpp
--- mame-0.222+dfsg.1/src/frontend/mame/ui/ui.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/ui/ui.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -166,7 +166,9 @@
 	, m_mouse_bitmap(32, 32)
 	, m_mouse_arrow_texture(nullptr)
 	, m_mouse_show(false)
-	, m_target_font_height(0) {}
+	, m_target_font_height(0)
+	, m_has_warnings(false)
+{ }
 
 mame_ui_manager::~mame_ui_manager()
 {
@@ -329,20 +331,24 @@
 		switch (state)
 		{
 		case 0:
-			if (show_warnings)
-				messagebox_text = machine_info().warnings_string();
+			if (show_gameinfo)
+				messagebox_text = machine_info().game_info_string();
 			if (!messagebox_text.empty())
 			{
+				messagebox_text.append("\n\nPress any key to continue");
 				set_handler(ui_callback_type::MODAL, std::bind(&mame_ui_manager::handler_messagebox_anykey, this, _1));
-				messagebox_backcolor = machine_info().warnings_color();
 			}
 			break;
 
 		case 1:
-			if (show_gameinfo)
-				messagebox_text = machine_info().game_info_string();
-			if (!messagebox_text.empty())
+			messagebox_text = machine_info().warnings_string();
+			m_has_warnings = !messagebox_text.empty();
+			if (m_has_warnings && show_warnings)
+			{
+				messagebox_text.append("\n\nPress any key to continue");
 				set_handler(ui_callback_type::MODAL, std::bind(&mame_ui_manager::handler_messagebox_anykey, this, _1));
+				messagebox_backcolor = machine_info().warnings_color();
+			}
 			break;
 
 		case 2:
@@ -1471,6 +1477,7 @@
 			m_sliders.push_back(slider_alloc(SLIDER_ID_FLICKER + slider_index, _("Vector Flicker"), 0, 0, 1000, 10, nullptr));
 			m_sliders.push_back(slider_alloc(SLIDER_ID_BEAM_WIDTH_MIN + slider_index, _("Beam Width Minimum"), 100, 100, 1000, 1, nullptr));
 			m_sliders.push_back(slider_alloc(SLIDER_ID_BEAM_WIDTH_MAX + slider_index, _("Beam Width Maximum"), 100, 100, 1000, 1, nullptr));
+			m_sliders.push_back(slider_alloc(SLIDER_ID_BEAM_DOT_SIZE + slider_index, _("Beam Dot Size"), 100, 100, 1000, 1, nullptr));
 			m_sliders.push_back(slider_alloc(SLIDER_ID_BEAM_INTENSITY + slider_index, _("Beam Intensity Weight"), -1000, 0, 1000, 10, nullptr));
 			slider_index++;
 			break;
@@ -1554,6 +1561,8 @@
 			return slider_beam_width_min(machine, arg, id, str, newval);
 	else if (id >= SLIDER_ID_BEAM_WIDTH_MAX && id <= SLIDER_ID_BEAM_WIDTH_MAX_LAST)
 			return slider_beam_width_max(machine, arg, id, str, newval);
+	else if (id >= SLIDER_ID_BEAM_DOT_SIZE && id <= SLIDER_ID_BEAM_DOT_SIZE_LAST)
+			return slider_beam_dot_size(machine, arg, id, str, newval);
 	else if (id >= SLIDER_ID_BEAM_INTENSITY && id <= SLIDER_ID_BEAM_INTENSITY_LAST)
 			return slider_beam_intensity_weight(machine, arg, id, str, newval);
 #ifdef MAME_DEBUG
@@ -1952,6 +1961,21 @@
 }
 
 
+//-------------------------------------------------
+//  slider_beam_dot_size - beam dot size slider
+//  callback
+//-------------------------------------------------
+
+int32_t mame_ui_manager::slider_beam_dot_size(running_machine &machine, void *arg, int id, std::string *str, int32_t newval)
+{
+	if (newval != SLIDER_NOCHANGE)
+		vector_options::s_beam_dot_size = std::max((float)newval * 0.01f, 0.1f);
+	if (str != nullptr)
+		*str = string_format(_("%1$1.2f"), vector_options::s_beam_dot_size);
+	return floor(vector_options::s_beam_dot_size * 100.0f + 0.5f);
+}
+
+
 //-------------------------------------------------
 //  slider_beam_intensity_weight - vector beam intensity weight slider
 //  callback
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/ui/ui.h mame-0.224+dfsg.1/src/frontend/mame/ui/ui.h
--- mame-0.222+dfsg.1/src/frontend/mame/ui/ui.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/ui/ui.h	2020-08-26 08:57:19.000000000 +0000
@@ -91,6 +91,8 @@
 	SLIDER_ID_BEAM_WIDTH_MAX_LAST   = SLIDER_ID_BEAM_WIDTH_MAX + SLIDER_SCREEN_SPACING,
 	SLIDER_ID_BEAM_INTENSITY,
 	SLIDER_ID_BEAM_INTENSITY_LAST   = SLIDER_ID_BEAM_INTENSITY + SLIDER_SCREEN_SPACING,
+	SLIDER_ID_BEAM_DOT_SIZE,
+	SLIDER_ID_BEAM_DOT_SIZE_LAST    = SLIDER_ID_BEAM_DOT_SIZE + SLIDER_SCREEN_SPACING,
 	SLIDER_ID_CROSSHAIR_SCALE,
 	SLIDER_ID_CROSSHAIR_SCALE_LAST  = SLIDER_ID_CROSSHAIR_SCALE + SLIDER_INPUT_SPACING,
 	SLIDER_ID_CROSSHAIR_OFFSET,
@@ -223,6 +225,7 @@
 	void show_mouse(bool status);
 	virtual bool is_menu_active() override;
 	bool can_paste();
+	bool found_machine_warnings() const { return m_has_warnings; }
 	void image_handler_ingame();
 	void increase_frameskip();
 	void decrease_frameskip();
@@ -261,7 +264,7 @@
 	render_font *           m_font;
 	std::function<uint32_t (render_container &)> m_handler_callback;
 	ui_callback_type        m_handler_callback_type;
-	uint32_t                  m_handler_param;
+	uint32_t                m_handler_param;
 	bool                    m_single_step;
 	bool                    m_showfps;
 	osd_ticks_t             m_showfps_end;
@@ -274,6 +277,7 @@
 	ui_options              m_ui_options;
 	ui_colors               m_ui_colors;
 	float                   m_target_font_height;
+	bool                    m_has_warnings;
 
 	std::unique_ptr<ui::machine_info> m_machine_info;
 
@@ -318,6 +322,7 @@
 	int32_t slider_flicker(running_machine &machine, void *arg, int id, std::string *str, int32_t newval);
 	int32_t slider_beam_width_min(running_machine &machine, void *arg, int id, std::string *str, int32_t newval);
 	int32_t slider_beam_width_max(running_machine &machine, void *arg, int id, std::string *str, int32_t newval);
+	int32_t slider_beam_dot_size(running_machine &machine, void *arg, int id, std::string *str, int32_t newval);
 	int32_t slider_beam_intensity_weight(running_machine &machine, void *arg, int id, std::string *str, int32_t newval);
 	std::string slider_get_screen_desc(screen_device &screen);
 	#ifdef MAME_DEBUG
diff -Nru mame-0.222+dfsg.1/src/frontend/mame/ui/utils.h mame-0.224+dfsg.1/src/frontend/mame/ui/utils.h
--- mame-0.222+dfsg.1/src/frontend/mame/ui/utils.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/frontend/mame/ui/utils.h	2020-08-26 08:57:19.000000000 +0000
@@ -12,8 +12,6 @@
 
 #pragma once
 
-#include "unicode.h"
-
 #include <algorithm>
 #include <limits>
 #include <memory>
diff -Nru mame-0.222+dfsg.1/src/lib/formats/acorn_dsk.cpp mame-0.224+dfsg.1/src/lib/formats/acorn_dsk.cpp
--- mame-0.222+dfsg.1/src/lib/formats/acorn_dsk.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/acorn_dsk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -50,6 +50,18 @@
 		if (memcmp(cat, "\x00\x28\x43\x29\x4a\x47\x48\x00", 4) == 0 && size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count)
 			return i;
 
+		// test for Kenda SD - offset &0962 = 0 SD/1 DD, offset &0963 = disk size blocks / 4 (block size = 1K, ie. 0x400 bytes), reserved tracks = 3, ie. 0x1e00 bytes, soft stagger = 2 sectors, ie. 0x200 bytes
+		io_generic_read(io, cat, 0x0960, 8);
+		if (cat[2] == 0 && ((uint64_t)cat[3] * 4 * 0x400 + 0x2000) == size && size == (uint64_t)compute_track_size(f) * f.track_count * f.head_count)
+		{
+			// valid blocks for single sided
+			if (f.head_count == 1 && (cat[3] == 0x17 || cat[3] == 0x30))
+				return i;
+			// valid blocks for double sided
+			if (f.head_count == 2 && (cat[3] == 0x2f || cat[3] == 0x62))
+				return i;
+		}
+
 		// read sector count from side 0 catalogue
 		io_generic_read(io, cat, 0x100, 8);
 		sectors0 = ((cat[6] & 3) << 8) + cat[7];
@@ -59,7 +71,7 @@
 			if (f.head_count == 2)
 			{
 				// read sector count from side 2 catalogue
-				io_generic_read(io, cat, compute_track_size(f) * f.track_count + 0x100, 8); // sequential
+				io_generic_read(io, cat, (uint64_t)compute_track_size(f) * f.track_count + 0x100, 8); // sequential
 				sectors2 = ((cat[6] & 3) << 8) + cat[7];
 
 				// exception case for Acorn CP/M System Disc 1
@@ -282,7 +294,7 @@
 			if (f.head_count == 2)
 			{
 				// read sector count from side 2 catalogue
-				io_generic_read(io, cat, compute_track_size(f) * f.track_count + 0x1000, 8); // sequential
+				io_generic_read(io, cat, (uint64_t)compute_track_size(f) * f.track_count + 0x1000, 8); // sequential
 				sectors2 = (cat[1] << 8) + cat[2];
 				LOG_FORMATS("ddos: sector count 2: %d %s\n", sectors2, sectors2 % 18 != 0 ? "invalid" : "");
 			}
diff -Nru mame-0.222+dfsg.1/src/lib/formats/apridisk.cpp mame-0.224+dfsg.1/src/lib/formats/apridisk.cpp
--- mame-0.222+dfsg.1/src/lib/formats/apridisk.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/apridisk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,8 +12,6 @@
 
 #include "imageutl.h"
 
-#include "emucore.h" // emu_fatalerror
-
 
 apridisk_format::apridisk_format()
 {
@@ -100,7 +98,10 @@
 					uint16_t length = pick_integer_le(comp, 0, 2);
 
 					if (length != SECTOR_SIZE)
-						throw emu_fatalerror("apridisk_format: Invalid compression length %04x\n", length);
+					{
+						osd_printf_error("apridisk_format: Invalid compression length %04x\n", length);
+						return false;
+					}
 
 					memset(data_ptr, comp[2], SECTOR_SIZE);
 				}
@@ -111,7 +112,8 @@
 				break;
 
 			default:
-				throw emu_fatalerror("apridisk_format: Invalid compression %04x\n", compression);
+				osd_printf_error("apridisk_format: Invalid compression %04x\n", compression);
+				return false;
 			}
 
 			sectors[track][head][sector - 1].data = data_ptr;
diff -Nru mame-0.222+dfsg.1/src/lib/formats/atom_tap.cpp mame-0.224+dfsg.1/src/lib/formats/atom_tap.cpp
--- mame-0.222+dfsg.1/src/lib/formats/atom_tap.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/atom_tap.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,7 +10,7 @@
 
 /*
 
-    http://beebwiki.jonripley.com/Acorn_cassette_format#Atom
+    http://beebwiki.mdfs.net/Acorn_cassette_format#Atom
 
     The Atom supports the System series format (as a 'nameless file') and its own format. The data consists of files separated
     by carrier breaks and the appropriate leaders and trailers, and further subdivided into blocks separated by inter-block gaps.
@@ -21,7 +21,7 @@
         One end of file name marker byte (&0D).
         Block flag, one byte.
         Block number, two bytes, high byte first.
-        Data block length ? 1, one byte.
+        Data block length - 1, one byte.
         Execution address, two bytes, high byte first.
         Load address, two bytes, high byte first.
         Data, 0 to 256 bytes.
diff -Nru mame-0.222+dfsg.1/src/lib/formats/d40_dsk.cpp mame-0.224+dfsg.1/src/lib/formats/d40_dsk.cpp
--- mame-0.222+dfsg.1/src/lib/formats/d40_dsk.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/d40_dsk.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:MetalliC
-/*********************************************************************
-
-    formats/d40_dsk.c
-
-    Didaktik D40/D80 disk images
-
-*********************************************************************/
-
-#include <cassert>
-
-#include "formats/d40_dsk.h"
-
-d40_format::d40_format() : wd177x_format(formats)
-{
-}
-
-const char *d40_format::name() const
-{
-	return "d40";
-}
-
-const char *d40_format::description() const
-{
-	return "Didaktik D40/D80 floppy disk image";
-}
-
-const char *d40_format::extensions() const
-{
-	return "d40,d80";
-}
-
-const d40_format::format d40_format::formats[] = {
-	{   //  400K 5"25 double density, gaps unverified
-		floppy_image::FF_525, floppy_image::DSDD, floppy_image::MFM,
-		2000, 10, 40, 2, 512, {}, 1, {}, 50, 22, 36
-	},
-	{   //  720K 3'5 double density, gaps unverified
-		floppy_image::FF_35, floppy_image::DSDD, floppy_image::MFM,
-		2000,  9, 80, 2, 512, {}, 1, {}, 50, 22, 80
-	},
-	{}
-};
-
-const floppy_format_type FLOPPY_D40D80_FORMAT = &floppy_image_format_creator<d40_format>;
diff -Nru mame-0.222+dfsg.1/src/lib/formats/d40_dsk.h mame-0.224+dfsg.1/src/lib/formats/d40_dsk.h
--- mame-0.222+dfsg.1/src/lib/formats/d40_dsk.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/d40_dsk.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:MetalliC
-/*********************************************************************
-
-    formats/d40_dsk.h
-
-    Didaktik D40/D80 disk images
-
-*********************************************************************/
-#ifndef MAME_FORMATS_D40_DSK_H
-#define MAME_FORMATS_D40_DSK_H
-
-#pragma once
-
-#include "wd177x_dsk.h"
-
-class d40_format : public wd177x_format {
-public:
-	d40_format();
-
-	virtual const char *name() const override;
-	virtual const char *description() const override;
-	virtual const char *extensions() const override;
-
-private:
-	static const format formats[];
-};
-
-extern const floppy_format_type FLOPPY_D40D80_FORMAT;
-
-#endif // MAME_FORMATS_D40_DSK_H
diff -Nru mame-0.222+dfsg.1/src/lib/formats/dfi_dsk.cpp mame-0.224+dfsg.1/src/lib/formats/dfi_dsk.cpp
--- mame-0.222+dfsg.1/src/lib/formats/dfi_dsk.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/dfi_dsk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -13,8 +13,6 @@
 
 #include "dfi_dsk.h"
 
-#include "emucore.h" // emu_fatalerror
-
 #include <zlib.h>
 
 #define NUMBER_OF_MULTIREADS 3
@@ -62,13 +60,19 @@
 {
 	char sign[4];
 	io_generic_read(io, sign, 0, 4);
-	if (memcmp(sign, "DFER", 4) == 0)
-		throw emu_fatalerror("Old type Discferret image detected; the mess Discferret decoder will not handle this properly, bailing out!\n");
 	return memcmp(sign, "DFE2", 4) ? 0 : 100;
 }
 
 bool dfi_format::load(io_generic *io, uint32_t form_factor, floppy_image *image)
 {
+	char sign[4];
+	io_generic_read(io, sign, 0, 4);
+	if (memcmp(sign, "DFER", 4) == 0)
+	{
+		osd_printf_error("dfi_dsk: Old type Discferret image detected; the mess Discferret decoder will not handle this properly, bailing out!\n");
+		return false;
+	}
+
 	uint64_t size = io_generic_size(io);
 	uint64_t pos = 4;
 	std::vector<uint8_t> data;
@@ -102,7 +106,10 @@
 		int total_time = 0; // total sampled time per track
 		for(int i=0; i<tsize; i++) {
 			uint8_t v = data[i];
-			if (v == 0xFF) { fprintf(stderr,"DFI stream contained a 0xFF at t%d, position%d, THIS SHOULD NEVER HAPPEN! Bailing out!\n", track, i); exit(1); }
+			if (v == 0xFF) {
+				osd_printf_error("dfi_dsk: DFI stream contained a 0xFF at t%d, position%d, THIS SHOULD NEVER HAPPEN! Bailing out!\n", track, i);
+				return false;
+			}
 			if((v & 0x7f) == 0x7f)
 				total_time += 0x7f;
 			else if(v & 0x80) {
@@ -121,30 +128,30 @@
 		if (onerev_time == 0) onerev_time = total_time;
 
 		if(!track && !head)
-			fprintf(stderr, "%02d:%d tt=%10d it=%10d\n", track, head, total_time, index_time);
+			osd_printf_verbose("dfi_dsk: %02d:%d tt=%10d it=%10d\n", track, head, total_time, index_time);
 		if(!track && !head) {
-			fprintf(stderr, "index_count: %d, onerev_time: %d\n", index_count, onerev_time);
+			osd_printf_verbose("dfi_dsk: index_count: %d, onerev_time: %d\n", index_count, onerev_time);
 			if ((onerev_time > REV25_MIN) && (onerev_time < REV25_MAX)) {
-				fprintf(stderr, "Guess: speed: 360rpm, clock 25MHz\n");
+				osd_printf_verbose("dfi_dsk: Guess: speed: 360rpm, clock 25MHz\n");
 				clock_rate = 25000000; rpm = 360;
 			} else if ((onerev_time > REV25_MIN*1.2) && (onerev_time < REV25_MAX*1.2)) {
-				fprintf(stderr, "Guess: speed: 300rpm, clock 25MHz\n");
+				osd_printf_verbose("dfi_dsk: Guess: speed: 300rpm, clock 25MHz\n");
 				clock_rate = 25000000; rpm = 300;
 			} else if ((onerev_time > REV25_MIN*2) && (onerev_time < REV25_MAX*2)) {
-				fprintf(stderr, "Guess: speed: 360rpm, clock 50MHz\n");
+				osd_printf_verbose("dfi_dsk: Guess: speed: 360rpm, clock 50MHz\n");
 				clock_rate = 50000000; rpm = 360;
 			} else if ((onerev_time > (REV25_MIN*2)*1.2) && (onerev_time < (REV25_MAX*2)*1.2)) {
-				fprintf(stderr, "Guess: speed: 300rpm, clock 50MHz\n");
+				osd_printf_verbose("dfi_dsk: Guess: speed: 300rpm, clock 50MHz\n");
 				clock_rate = 50000000; rpm = 300;
 			} else if ((onerev_time > REV25_MIN*4) && (onerev_time < REV25_MAX*4)) {
-				fprintf(stderr, "Guess: speed: 360rpm, clock 100MHz\n");
+				osd_printf_verbose("dfi_dsk: Guess: speed: 360rpm, clock 100MHz\n");
 				clock_rate = 100000000; rpm = 360;
 			} else if ((onerev_time > (REV25_MIN*4)*1.2) && (onerev_time < (REV25_MAX*4)*1.2)) {
-				fprintf(stderr, "Guess: speed: 300rpm, clock 100MHz\n");
+				osd_printf_verbose("dfi_dsk: Guess: speed: 300rpm, clock 100MHz\n");
 				clock_rate = 100000000; rpm = 300;
 			} else
-				fprintf(stderr, "WARNING: Cannot Guess Speed! Assuming 360rpm, 100Mhz clock!\n");
-			fprintf(stderr,"Actual rpm based on index: %f\n", ((double)clock_rate/(double)onerev_time)*60);
+				osd_printf_warning("dfi_dsk: WARNING: Cannot Guess Speed! Assuming 360rpm, 100Mhz clock!\n");
+			osd_printf_verbose("dfi_dsk: Actual rpm based on index: %f\n", ((double)clock_rate/(double)onerev_time)*60);
 		}
 
 		rpm += 0;   // HACK: prevent GCC 4.6+ from warning "variable set but unused"
@@ -187,7 +194,7 @@
 				// cur_time and onerev_time need to be converted to something standard, so we'll stick with 300rpm at the standard 200mhz rate that mfi uses internally
 				// TODO for 4/22/2012: ACTUALLY DO THIS RESCALING STEP
 				// filter out spurious crap
-				//if (trans_time <= MIN_THRESH) fprintf(stderr, "DFI: Throwing out short transition of length %d\n", trans_time);
+				//if (trans_time <= MIN_THRESH) osd_printf_verbose("dfi_dsk: Throwing out short transition of length %d\n", trans_time);
 				// the normal case: write the transition at the appropriate time
 				if ((prev_time == 0) || ((trans_time > MIN_THRESH) && (trans_time <= MAX_THRESH))) {
 					mg = mg == floppy_image::MG_A ? floppy_image::MG_B : floppy_image::MG_A;
@@ -197,7 +204,7 @@
 				// the long case: we probably missed a transition, stuff an extra guessed one in there to see if it helps
 				if (trans_time > MAX_THRESH) {
 					mg = mg == floppy_image::MG_A ? floppy_image::MG_B : floppy_image::MG_A;
-					if (((track%2)==0)&&(head==0)) fprintf(stderr,"missed transition, total time for transition is %d\n",trans_time);
+					if (((track%2)==0)&&(head==0)) osd_printf_info("dfi_dsk: missed transition, total time for transition is %d\n",trans_time);
 #ifndef FAKETRANS_ONE
 					buf[tpos++] = mg | uint32_t((200000000ULL*(cur_time-(trans_time/2)))/index_time); // generate imaginary transition at half period
 #else
@@ -208,7 +215,7 @@
 					mg = mg == floppy_image::MG_A ? floppy_image::MG_B : floppy_image::MG_A;
 					buf[tpos++] = mg | uint32_t(200000000ULL*cur_time/index_time); // generate transition now
 					prev_time = cur_time;
-					}
+				}
 			}
 		}
 #ifdef TRACK_HISTOGRAM
diff -Nru mame-0.222+dfsg.1/src/lib/formats/fl1_dsk.cpp mame-0.224+dfsg.1/src/lib/formats/fl1_dsk.cpp
--- mame-0.222+dfsg.1/src/lib/formats/fl1_dsk.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/fl1_dsk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,59 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    formats/fl1_dsk.c
+
+    FloppyOne DOS disk images
+
+*********************************************************************/
+
+#include <cassert>
+
+#include "formats/fl1_dsk.h"
+
+fl1_format::fl1_format() : wd177x_format(formats)
+{
+}
+
+const char *fl1_format::name() const
+{
+	return "fl1";
+}
+
+const char *fl1_format::description() const
+{
+	return "FloppyOne floppy disk image";
+}
+
+const char *fl1_format::extensions() const
+{
+	return "fl1";
+}
+
+int fl1_format::get_image_offset(const format &f, int head, int track)
+{
+	return (f.track_count * head + track) * compute_track_size(f);
+}
+
+const fl1_format::format fl1_format::formats[] = {
+	{   // 5"25 800K 80 track double sided double density
+		floppy_image::FF_525,  floppy_image::DSQD, floppy_image::MFM,
+		2000, 5, 80, 2, 1024, {}, 0, {}, 80, 22, 54
+	},
+	{   // 5"25 400K 80 track single sided double density
+		floppy_image::FF_525,  floppy_image::SSQD, floppy_image::MFM,
+		2000, 5, 80, 1, 1024, {}, 0, {}, 80, 22, 54
+	},
+	{   // 3'5 800K 80 track double sided double density
+		floppy_image::FF_35,  floppy_image::DSDD, floppy_image::MFM,
+		2000, 5, 80, 2, 1024, {}, 0, {}, 80, 22, 54
+	},
+	{   // 3'5 400K 80 track single sided double density
+		floppy_image::FF_35,  floppy_image::SSDD, floppy_image::MFM,
+		2000, 5, 80, 1, 1024, {}, 0, {}, 80, 22, 54
+	},
+	{}
+};
+
+const floppy_format_type FLOPPY_FL1_FORMAT = &floppy_image_format_creator<fl1_format>;
diff -Nru mame-0.222+dfsg.1/src/lib/formats/fl1_dsk.h mame-0.224+dfsg.1/src/lib/formats/fl1_dsk.h
--- mame-0.222+dfsg.1/src/lib/formats/fl1_dsk.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/fl1_dsk.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,32 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    formats/fl1_dsk.h
+
+    FloppyOne DOS disk images
+
+*********************************************************************/
+#ifndef MAME_FORMATS_FL1_DSK_H
+#define MAME_FORMATS_FL1_DSK_H
+
+#pragma once
+
+#include "wd177x_dsk.h"
+
+class fl1_format : public wd177x_format {
+public:
+	fl1_format();
+
+	virtual const char *name() const override;
+	virtual const char *description() const override;
+	virtual const char *extensions() const override;
+
+private:
+	static const format formats[];
+	virtual int get_image_offset(const format &f, int head, int track) override;
+};
+
+extern const floppy_format_type FLOPPY_FL1_FORMAT;
+
+#endif // MAME_FORMATS_FL1_DSK_H
diff -Nru mame-0.222+dfsg.1/src/lib/formats/jvc_dsk.cpp mame-0.224+dfsg.1/src/lib/formats/jvc_dsk.cpp
--- mame-0.222+dfsg.1/src/lib/formats/jvc_dsk.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/jvc_dsk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -106,8 +106,6 @@
 
 #include "jvc_dsk.h"
 
-#include "emucore.h" // emu_fatalerror
-
 
 jvc_format::jvc_format()
 {
@@ -136,8 +134,7 @@
 	header_size = size % 256;
 	uint8_t header[5];
 
-	// if we know that this is a header of a bad size, we can fail
-	// immediately; otherwise read the header
+	// if we know that this is a header of a bad size, we can fail immediately; otherwise read the header
 	if (header_size >= sizeof(header))
 		return false;
 	if (header_size > 0)
@@ -152,7 +149,8 @@
 	switch (header_size)
 	{
 	case 5:
-		throw emu_fatalerror("jvc_format: sector attribute flag unsupported\n");
+		osd_printf_info("jvc_format: sector attribute flag unsupported\n");
+		return false;
 	case 4: base_sector_id = header[3];
 		// no break
 	case 3: sector_size = 128 << header[2];
@@ -185,7 +183,10 @@
 
 	// safety check
 	if (sector_count * sector_size > 10000)
-		throw emu_fatalerror("jvc_format: incorrect track layout\n");
+	{
+		osd_printf_error("jvc_format: incorrect track layout\n");
+		return false;
+	}
 
 	int file_offset = header_size;
 
@@ -254,7 +255,10 @@
 			for (int i = 0; i < 18; i++)
 			{
 				if (sectors[1 + i].size != 256)
-					throw emu_fatalerror("jvc_format: invalid sector size: %d\n", sectors[1 + i].size);
+				{
+					osd_printf_error("jvc_format: invalid sector size: %d\n", sectors[1 + i].size);
+					return false;
+				}
 
 				io_generic_write(io, sectors[1 + i].data, file_offset, sectors[1 + i].size);
 				file_offset += sectors[1 + i].size;
diff -Nru mame-0.222+dfsg.1/src/lib/formats/mdos_dsk.cpp mame-0.224+dfsg.1/src/lib/formats/mdos_dsk.cpp
--- mame-0.222+dfsg.1/src/lib/formats/mdos_dsk.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/mdos_dsk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,284 @@
+// license:BSD-3-Clause
+// copyright-holders: 68bit
+/*
+ * mdos_dsk.c  -  Motorola MDOS compatible disk images
+ *
+ * The format is largely IBM 3740 compatible, with 77 tracks, and 26 sectors
+ * per track, and a sector size of 128 bytes. Single sided disks were initially
+ * supported and later software supported double sided disk with 52 sectors per
+ * cylinder. The sectors are numbered from one, and the sectors indexes on the
+ * second side continue from the first side rather than starting again at
+ * one.
+ *
+ * The disk drives run at 360rpm, and the bit clock frequency at 500kHz.  This
+ * gives 6 revs per second, and 500000 / 6 = 83333 cells per track. MAME uses
+ * disk rotation position units of 1/200000000 of a turn and the cells size in
+ * this unit is 200000000 / (500000 / 6) = 2400.
+ *
+ * The M68SFDC2 user guide details the format gaps. "The Post-Index Gap is
+ * defined as the 32 bytes between Index Address Mark and the ID Address Mark
+ * for sector 1 (excluding the address mark bytes). This gap is always 32 bytes
+ * in length and is not affect by any up-dating process. The ID Gap consists of
+ * 17 bytes between the ID Field and the Data Field. This gap may vary in size
+ * slightly after the Data Field has been updated. The Data Gap consists of 33
+ * bytes between the Data Field and the next ID File. This gap may also vary
+ * slightly after the Data Field has been updated. The Pre-Index Gap is a space
+ * of 320 bytes between the last data field on the track and the Index Address
+ * Mark. This gap may also vary in length."
+ *
+ * These gaps do appear to include the leading zero bytes before the sync
+ * marks, in contrast to the gaps defined in the formats below so corrections
+ * have been applied. The trailing gap has been checked and it close to the 320
+ * bytes expected.
+ *
+ * The MDOS 3.05 FORMAT command with (the current emulator timing) varies from
+ * the above slightly. An index marker has been added, 106 bytes after the
+ * start of the track - a 100 byte gap and then 6 bytes of zeros and an index
+ * marker 0xf77a. This index marker does not appear to be used. The post-index
+ * marker gap is 30 bytes between the index marker and the address marker - a
+ * gap of 24 bytes and then 6 bytes of zeros and then the address marker
+ * 0xf57e. The ID Gap consist of roughly 18 bytes between the ID Field and the
+ * Data file - 12 bytes gap and 6 bytes of zero, and then the data marker
+ * 0xf565. The Data Gap consists of 33 bytes - a gap of 27 bytes and 6 bytes of
+ * zeros and then the address marker 0xf57e. The Pre-Index gap is a space of
+ * 209 bytes, but this now extends to the start of the track to the index
+ * marker.
+ *
+ * TODO The MDOS 3 FORMAT command writes a zero in the address mark 'head'
+ * field irrespective of the disk head and the software ignores this field when
+ * read.
+ */
+
+#include "mdos_dsk.h"
+#include "formats/imageutl.h"
+
+
+mdos_format::mdos_format() : wd177x_format(formats)
+{
+}
+
+const char *mdos_format::name() const
+{
+	return "mdos";
+}
+
+const char *mdos_format::description() const
+{
+	return "Motorola MDOS compatible disk image";
+}
+
+const char *mdos_format::extensions() const
+{
+	return "dsk";
+}
+
+int mdos_format::identify(io_generic *io, uint32_t form_factor)
+{
+	int type = find_size(io, form_factor);
+
+	if (type != -1)
+		return 75;
+	return 0;
+}
+
+bool mdos_format::check_ascii(uint8_t *str, size_t len, const char* name)
+{
+	LOG_FORMATS(" %s: \"", name);
+	for (int i = 0; i < len; i++) {
+		uint8_t ch = str[i];
+		if (ch == 0) {
+			LOG_FORMATS("\\0");
+		} else if (ch < 0x20 || ch > 0x7f) {
+			return 0;
+		} else {
+			LOG_FORMATS("%c", ch);
+		}
+	}
+	LOG_FORMATS("\"\n");
+	return 1;
+}
+
+int mdos_format::parse_date_field(uint8_t *str)
+{
+	uint8_t high = str[0];
+	uint8_t low = str[1];
+
+	if (high < 0x30 || high > 0x39 || low < 0x30 || low > 0x39)
+		return -1;
+
+	return (high - 0x30) * 10 + (low - 0x30);
+}
+
+int mdos_format::find_size(io_generic *io, uint32_t form_factor)
+{
+	uint64_t size = io_generic_size(io);
+
+	// Look at the disk id sector.
+	io_generic_read(io, &info, 0, sizeof(struct disk_id_sector));
+
+	LOG_FORMATS("MDOS floppy dsk: size %d bytes, %d total sectors, %d remaining bytes, expected form factor %x\n", (uint32_t)size, (uint32_t)size / 128, (uint32_t)size % 128, form_factor);
+
+	// The 'unused' area is not necessarily zero filled and is ignoded
+	// in the identification of a MDOS format image.
+
+	// Expect an ASCII id, version, revision, and 'user name' strings.
+	if (!check_ascii(info.id, sizeof(info.id), "id"))
+		return -1;
+
+	if (!check_ascii(info.version, sizeof(info.version), "version"))
+		return -1;
+
+	if (!check_ascii(info.revision, sizeof(info.revision), "revision"))
+		return -1;
+
+	if (!check_ascii(info.date, sizeof(info.date), "date"))
+		return -1;
+
+	if (!check_ascii(info.username, sizeof(info.username), "username"))
+		return -1;
+
+	// The date should be the numeric day, month and year.
+	int month = parse_date_field(info.date);
+	int day = parse_date_field(info.date + 2);
+	int year = parse_date_field(info.date + 4);
+
+	LOG_FORMATS(" day %d, month %d, year %d\n", day, month, year);
+	if (day < 1 || day > 32 || month < 1 || month > 12 || year < 0)
+		return -1;
+
+	// The RIB address seems to be a sequence of 16 bit cluster numbers,
+	// ending in a zero word. The maximum size appears to be 20 bytes, or
+	// 10 words. The area beyond the zero word is not always zero filled,
+	// and is ignored here. Check that it is consistent with this.
+	for (int i = 0; i < 10; i++) {
+		uint8_t high = info.rib_addr[i * 2];
+		uint8_t low = info.rib_addr[i * 2 + 1];
+		uint16_t cluster = (high << 8) | low;
+
+		if (cluster == 0)
+			break;
+
+		// The lowest value cluster here appears to be 92, just after
+		// the director sectors.
+		if (cluster < 92) {
+			LOG_FORMATS(" id sector rib address %d unexpectedly low\n", cluster);
+			return -1;
+		}
+
+		if (cluster * 4 * 128 + 4 * 128 > size) {
+			LOG_FORMATS(" id sector rib address %d beyond disk extent\n", cluster);
+			return -1;
+		}
+	}
+
+	// Check that the cluster allocation table and the cluster available
+	// table are consistent with the disk size, that no clusters beyond
+	// the extent of the disk are free or available.
+
+	uint8_t cluster_allocation[128], cluster_available[128];
+	io_generic_read(io, &cluster_allocation, 1 * 128, sizeof(cluster_allocation));
+	io_generic_read(io, &cluster_available, 2 * 128, sizeof(cluster_available));
+
+	for (int cluster = 0; cluster < sizeof(cluster_allocation) * 8; cluster++) {
+		if (cluster * 4 * 128 + 4 * 128 > size) {
+			// This cluster does not fit within the disk size, so
+			// should be marked as not free and not available.
+			uint8_t mask = 1 << (7 - (cluster & 7));
+			uint8_t offset = cluster >> 3;
+			if ((cluster_allocation[offset] & mask) == 0) {
+				LOG_FORMATS("  unexpected free cluster %d beyond disk extent\n", cluster);
+				return -1;
+			}
+			if ((cluster_available[offset] & mask) == 0) {
+				LOG_FORMATS("  unexpected available cluster %d beyond disk extent\n", cluster);
+				return -1;
+			}
+		}
+	}
+
+	for (int i=0; formats[i].form_factor; i++) {
+		const format &f = formats[i];
+		LOG_FORMATS(" checking format %d with form factor %02x, %d sectors, %d heads\n",
+				i, f.form_factor, f.sector_count, f.head_count);
+		if (form_factor != floppy_image::FF_UNKNOWN && form_factor != f.form_factor)
+			continue;
+
+		unsigned int format_size = 0;
+		for (int track=0; track < f.track_count; track++) {
+			for (int head=0; head < f.head_count; head++) {
+				const format &tf = get_track_format(f, head, track);
+				format_size += compute_track_size(tf);
+			}
+		}
+
+		LOG_FORMATS(" image size %u\n", format_size);
+		if (format_size != size)
+			continue;
+
+		LOG_FORMATS("MDOS matching format index %d\n", i);
+		return i;
+	}
+	return -1;
+}
+
+const wd177x_format::format &mdos_format::get_track_format(const format &f, int head, int track)
+{
+	int n = -1;
+
+	for (int i = 0; formats[i].form_factor; i++) {
+		if (&formats[i] == &f) {
+			n = i;
+			break;
+		}
+	}
+
+	if (n < 0) {
+		LOG_FORMATS("Error format not found\n");
+		return f;
+	}
+
+	if (head >= f.head_count) {
+		LOG_FORMATS("Error invalid head %d\n", head);
+		return f;
+	}
+
+	if (track >= f.track_count) {
+		LOG_FORMATS("Error invalid track %d\n", track);
+		return f;
+	}
+
+	if (head == 1) {
+		const format &fh1 = formats_head1[n];
+		if (!fh1.form_factor) {
+			LOG_FORMATS("Error expected a head 1 format\n");
+			return f;
+		}
+		return fh1;
+	}
+
+	return f;
+}
+
+const mdos_format::format mdos_format::formats[] = {
+	{ // 55 250.25K 8 inch single sided single density
+		floppy_image::FF_8, floppy_image::SSSD, floppy_image::FM,
+		2400, 26, 77, 1, 128, {}, 1, {}, 32-6, 17-6, 33-6
+	},
+	{ // 57 500.5K 8 inch double sided single density
+		floppy_image::FF_8, floppy_image::DSSD, floppy_image::FM,
+		2400, 26, 77, 2, 128, {}, 1, {}, 32-6, 17-6, 33-6
+	},
+	{}
+};
+
+const mdos_format::format mdos_format::formats_head1[] = {
+	{ // 55 250.25K 8 inch single sided single density
+	},
+	{ // 57 500.5K 8 inch double sided single density
+		floppy_image::FF_8, floppy_image::DSSD, floppy_image::FM,
+		2400, 26, 77, 2, 128, {}, 27, {}, 32-6, 17-6, 33-6
+	},
+	{}
+};
+
+const floppy_format_type FLOPPY_MDOS_FORMAT = &floppy_image_format_creator<mdos_format>;
diff -Nru mame-0.222+dfsg.1/src/lib/formats/mdos_dsk.h mame-0.224+dfsg.1/src/lib/formats/mdos_dsk.h
--- mame-0.222+dfsg.1/src/lib/formats/mdos_dsk.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/mdos_dsk.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,45 @@
+// license:BSD-3-Clause
+// copyright-holders:68bit
+/*
+ * mdos_dsk.h  -  Motorola MDOS compatible disk images
+ */
+#ifndef MAME_FORMATS_MDOS_DSK_H
+#define MAME_FORMATS_MDOS_DSK_H
+
+#pragma once
+
+#include "flopimg.h"
+#include "wd177x_dsk.h"
+
+class mdos_format : public wd177x_format
+{
+public:
+	mdos_format();
+
+	virtual const char *name() const override;
+	virtual const char *description() const override;
+	virtual const char *extensions() const override;
+	virtual int identify(io_generic *io, uint32_t form_factor) override;
+	virtual int find_size(io_generic *io, uint32_t form_factor) override;
+	virtual const wd177x_format::format &get_track_format(const format &f, int head, int track) override;
+
+private:
+	struct disk_id_sector
+	{
+		uint8_t id[8];
+		uint8_t version[2];
+		uint8_t revision[2];
+		uint8_t date[6];
+		uint8_t username[20];
+		uint8_t rib_addr[20];
+		uint8_t unused[70];
+	} info;
+	static const format formats[];
+	static const format formats_head1[];
+	bool check_ascii(uint8_t *, size_t len, const char* name);
+	int parse_date_field(uint8_t *str);
+};
+
+extern const floppy_format_type FLOPPY_MDOS_FORMAT;
+
+#endif // MAME_FORMATS_MDOS_DSK_H
diff -Nru mame-0.222+dfsg.1/src/lib/formats/os9_dsk.cpp mame-0.224+dfsg.1/src/lib/formats/os9_dsk.cpp
--- mame-0.222+dfsg.1/src/lib/formats/os9_dsk.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/os9_dsk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -412,27 +412,35 @@
 		floppy_image::FF_8, floppy_image::DSSD, floppy_image::FM,
 		2000, 15, 77, 2, 256, {}, -1, {0, 2, 4, 6, 8, 10, 12, 14, 1, 3, 5, 7, 9, 11, 13}, 40, 12, 12
 	},
-	{ // 38 497.75K 8 inch double density (single density track 0)
+	{ // 38 308K 8 inch single density
+		floppy_image::FF_8, floppy_image::SSSD, floppy_image::FM,
+		2000, 16, 77, 1, 256, {}, -1, {0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15}, 35, 12, 12
+	},
+	{ // 39 616K 8 inch single density
+		floppy_image::FF_8, floppy_image::DSSD, floppy_image::FM,
+		2000, 16, 77, 2, 256, {}, -1, {0, 8, 1, 9, 2, 10, 3, 11, 4, 12, 5, 13, 6, 14, 7, 15}, 35, 12, 12
+	},
+	{ // 40 497.75K 8 inch double density (single density track 0)
 		floppy_image::FF_8, floppy_image::SSDD, floppy_image::MFM,
 		1000, 26, 77, 1, 256, {}, -1, {0, 19, 12, 5, 24, 17, 10, 3, 22, 15, 8, 1, 20, 13, 6, 25, 18, 11, 4, 23, 16, 9, 2, 21, 14, 7}, 80, 22, 24
 	},
-	{ // 39 500.5K 8 inch double density
+	{ // 41 500.5K 8 inch double density
 		floppy_image::FF_8, floppy_image::SSDD, floppy_image::MFM,
 		1000, 26, 77, 1, 256, {}, -1, {0, 19, 12, 5, 24, 17, 10, 3, 22, 15, 8, 1, 20, 13, 6, 25, 18, 11, 4, 23, 16, 9, 2, 21, 14, 7}, 80, 22, 24
 	},
-	{ // 40 995.5K 8 inch double density (single density track 0)
+	{ // 42 995.5K 8 inch double density (single density track 0)
 		floppy_image::FF_8, floppy_image::DSDD, floppy_image::MFM,
 		1000, 26, 77, 2, 256, {}, -1, {0, 19, 12, 5, 24, 17, 10, 3, 22, 15, 8, 1, 20, 13, 6, 25, 18, 11, 4, 23, 16, 9, 2, 21, 14, 7}, 80, 22, 24
 	},
-	{ // 41 1001K 8 inch double density
+	{ // 43 1001K 8 inch double density
 		floppy_image::FF_8, floppy_image::DSDD, floppy_image::MFM,
 		1000, 26, 77, 2, 256, {}, -1, {0, 19, 12, 5, 24, 17, 10, 3, 22, 15, 8, 1, 20, 13, 6, 25, 18, 11, 4, 23, 16, 9, 2, 21, 14, 7}, 80, 22, 24
 	},
-	{ // 42 1440K 3 1/2 inch high density (single density track 0)
+	{ // 44 1440K 3 1/2 inch high density (single density track 0)
 		floppy_image::FF_35,  floppy_image::DSHD, floppy_image::MFM,
 		1000, 36, 80, 2, 256, {}, -1, {0, 25, 14, 3, 28, 17, 6, 31, 20, 9, 34, 23, 12, 1, 26, 15, 4, 29, 18, 7, 32, 21, 10, 35, 24, 13, 2, 27, 16, 5, 30, 19, 8, 33, 22, 11}, 80, 22, 24
 	},
-	{ // 43 1440K 3 1/2 inch high density.
+	{ // 45 1440K 3 1/2 inch high density.
 		floppy_image::FF_35,  floppy_image::DSHD, floppy_image::MFM,
 		1000, 36, 80, 2, 256, {}, -1, {0, 25, 14, 3, 28, 17, 6, 31, 20, 9, 34, 23, 12, 1, 26, 15, 4, 29, 18, 7, 32, 21, 10, 35, 24, 13, 2, 27, 16, 5, 30, 19, 8, 33, 22, 11}, 80, 22, 24
 	},
@@ -545,23 +553,27 @@
 	},
 	{ // 37 577.5K 8 inch single density
 	},
-	{ // 38 497.75K 8 inch double density (single density track 0)
+	{ // 38 308K 8 inch single density
+	},
+	{ // 39 616K 8 inch single density
+	},
+	{ // 40 497.75K 8 inch double density (single density track 0)
 		floppy_image::FF_8, floppy_image::DSSD, floppy_image::FM,
 		2000, 15, 77, 1, 256, {}, -1, {0, 2, 4, 6, 8, 10, 12, 14, 1, 3, 5, 7, 9, 11, 13}, 40, 12, 12
 	},
-	{ // 39 500.5K 8 inch double density
+	{ // 41 500.5K 8 inch double density
 	},
-	{ // 40 995.5K 8 inch double density (single density track 0)
+	{ // 42 995.5K 8 inch double density (single density track 0)
 		floppy_image::FF_8, floppy_image::DSSD, floppy_image::FM,
 		2000, 15, 77, 2, 256, {}, -1, {0, 2, 4, 6, 8, 10, 12, 14, 1, 3, 5, 7, 9, 11, 13}, 40, 12, 12
 	},
-	{ // 41 1001K 8 inch double density
+	{ // 43 1001K 8 inch double density
 	},
-	{ // 42 1440K 3 1/2 inch high density (single density track 0)
+	{ // 44 1440K 3 1/2 inch high density (single density track 0)
 		floppy_image::FF_35,  floppy_image::DSSD, floppy_image::FM,
 		2000, 18, 80, 2, 256, {}, -1, {0, 5, 10, 15, 2, 7, 12, 17, 4, 9, 14, 1, 6, 11, 16, 3, 8, 13}, 40, 12, 12
 	},
-	{ // 43 1440K 3 1/2 inch high density.
+	{ // 45 1440K 3 1/2 inch high density.
 	},
 	{}
 };
diff -Nru mame-0.222+dfsg.1/src/lib/formats/sdd_dsk.cpp mame-0.224+dfsg.1/src/lib/formats/sdd_dsk.cpp
--- mame-0.222+dfsg.1/src/lib/formats/sdd_dsk.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/sdd_dsk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,63 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    formats/sdd_dsk.c
+
+    Speccy-DOS SDD disk images
+
+*********************************************************************/
+
+#include <cassert>
+
+#include "formats/sdd_dsk.h"
+
+sdd_format::sdd_format() : wd177x_format(formats)
+{
+}
+
+const char *sdd_format::name() const
+{
+	return "sdd";
+}
+
+const char *sdd_format::description() const
+{
+	return "SDD floppy disk image";
+}
+
+const char *sdd_format::extensions() const
+{
+	return "sdd";
+}
+
+int sdd_format::get_image_offset(const format &f, int head, int track)
+{
+	return (f.track_count * head + track) * compute_track_size(f);
+}
+
+const sdd_format::format sdd_format::formats[] = {
+	{   // 5"25 640K 80 track double sided double density
+		floppy_image::FF_525,  floppy_image::DSQD, floppy_image::MFM,
+		2000, 16, 80, 2, 256, {}, -1, {1,12,7,2,13,8,3,14,9,4,15,10,5,16,11,6}, 60, 22, 24
+	},
+	{   // 5"25 140K 35 track single sided double density
+		floppy_image::FF_525,  floppy_image::SSDD, floppy_image::MFM,
+		2000, 16, 35, 1, 256, {}, -1, {1,12,7,2,13,8,3,14,9,4,15,10,5,16,11,6}, 60, 22, 24
+	},
+	{   // 5"25 400K 80 track double sided single density
+		floppy_image::FF_525,  floppy_image::DSQD, floppy_image::FM,
+		4000, 10, 80, 2, 256, {}, -1, {1,8,5,2,9,6,3,10,7,4}, 40, 11, 10
+	},
+	{   // 3'5 640K 80 track double sided double density
+		floppy_image::FF_35,  floppy_image::DSDD, floppy_image::MFM,
+		2000, 16, 80, 2, 256, {}, -1, {1,12,7,2,13,8,3,14,9,4,15,10,5,16,11,6}, 60, 22, 24
+	},
+	{   // 3'5 400K 80 track double sided single density
+		floppy_image::FF_35,  floppy_image::DSDD, floppy_image::FM,
+		4000, 10, 80, 2, 256, {}, -1, {1,8,5,2,9,6,3,10,7,4}, 40, 11, 10
+	},
+	{}
+};
+
+const floppy_format_type FLOPPY_SDD_FORMAT = &floppy_image_format_creator<sdd_format>;
diff -Nru mame-0.222+dfsg.1/src/lib/formats/sdd_dsk.h mame-0.224+dfsg.1/src/lib/formats/sdd_dsk.h
--- mame-0.222+dfsg.1/src/lib/formats/sdd_dsk.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/sdd_dsk.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,32 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    formats/sdd_dsk.h
+
+    Speccy-DOS SDD disk images
+
+*********************************************************************/
+#ifndef MAME_FORMATS_SDD_DSK_H
+#define MAME_FORMATS_SDD_DSK_H
+
+#pragma once
+
+#include "wd177x_dsk.h"
+
+class sdd_format : public wd177x_format {
+public:
+	sdd_format();
+
+	virtual const char *name() const override;
+	virtual const char *description() const override;
+	virtual const char *extensions() const override;
+
+private:
+	static const format formats[];
+	virtual int get_image_offset(const format &f, int head, int track) override;
+};
+
+extern const floppy_format_type FLOPPY_SDD_FORMAT;
+
+#endif // MAME_FORMATS_SDD_DSK_H
diff -Nru mame-0.222+dfsg.1/src/lib/formats/swd_dsk.cpp mame-0.224+dfsg.1/src/lib/formats/swd_dsk.cpp
--- mame-0.222+dfsg.1/src/lib/formats/swd_dsk.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/swd_dsk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,52 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    formats/swd_dsk.c
+
+    Swift Disc disk images
+
+*********************************************************************/
+
+#include <cassert>
+
+#include "formats/swd_dsk.h"
+
+swd_format::swd_format() : wd177x_format(formats)
+{
+}
+
+const char *swd_format::name() const
+{
+	return "swd";
+}
+
+const char *swd_format::description() const
+{
+	return "SWD floppy disk image";
+}
+
+const char *swd_format::extensions() const
+{
+	return "swd";
+}
+
+int swd_format::get_image_offset(const format &f, int head, int track)
+{
+	return (f.track_count * head + track) * compute_track_size(f);
+}
+
+const swd_format::format swd_format::formats[] = {
+	// note: original formatted disks use side# 1/2 instead of usual 0/1
+	{   // 3'5 640K 80 track double sided double density
+		floppy_image::FF_35,  floppy_image::DSDD, floppy_image::MFM,
+		2000, 16, 80, 2, 256, {}, 1, {}, 60, 22, 56
+	},
+	{   // 5"25 640K 80 track double sided double density
+		floppy_image::FF_525,  floppy_image::DSQD, floppy_image::MFM,
+		2000, 16, 80, 2, 256, {}, 1, {}, 60, 22, 56
+	},
+	{}
+};
+
+const floppy_format_type FLOPPY_SWD_FORMAT = &floppy_image_format_creator<swd_format>;
diff -Nru mame-0.222+dfsg.1/src/lib/formats/swd_dsk.h mame-0.224+dfsg.1/src/lib/formats/swd_dsk.h
--- mame-0.222+dfsg.1/src/lib/formats/swd_dsk.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/swd_dsk.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,32 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+/*********************************************************************
+
+    formats/swd_dsk.h
+
+    Swift Disc disk images
+
+*********************************************************************/
+#ifndef MAME_FORMATS_SWD_DSK_H
+#define MAME_FORMATS_SWD_DSK_H
+
+#pragma once
+
+#include "wd177x_dsk.h"
+
+class swd_format : public wd177x_format {
+public:
+	swd_format();
+
+	virtual const char *name() const override;
+	virtual const char *description() const override;
+	virtual const char *extensions() const override;
+
+private:
+	static const format formats[];
+	virtual int get_image_offset(const format &f, int head, int track) override;
+};
+
+extern const floppy_format_type FLOPPY_SWD_FORMAT;
+
+#endif // MAME_FORMATS_SWD_DSK_H
diff -Nru mame-0.222+dfsg.1/src/lib/formats/trd_dsk.cpp mame-0.224+dfsg.1/src/lib/formats/trd_dsk.cpp
--- mame-0.222+dfsg.1/src/lib/formats/trd_dsk.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/trd_dsk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -31,12 +31,67 @@
 	return "trd";
 }
 
+int trd_format::find_size(io_generic *io, uint32_t form_factor)
+{
+	int index = -1;
+	uint64_t size = io_generic_size(io);
+	for (int i = 0; formats[i].form_factor; i++)
+	{
+		const format &f = formats[i];
+		if (form_factor != floppy_image::FF_UNKNOWN && form_factor != f.form_factor)
+			continue;
+
+		uint64_t format_size = f.track_count * f.head_count * compute_track_size(f);
+
+		if (size == format_size)
+		{
+			index = i; // at least size match, save it for the case if there will be no exact matches
+
+			uint8_t sectdata[0x100];
+			if (f.encoding == floppy_image::MFM)
+				io_generic_read(io, sectdata, 0x800, 0x100);
+			else
+			{
+				io_generic_read(io, sectdata, 0x100, 0x100);
+				for (int i = 0; i < 0x100; i++)
+					sectdata[i] ^= 0xff;
+			}
+
+			uint8_t disktype = sectdata[0xe3]; // 16 - DS80, 17 - DS40, 18 - SS80, 19 - SS40
+			if (disktype < 0x16 || disktype > 0x19)
+				continue;
+
+			uint8_t heads = ((disktype == 0x16) || disktype == 0x17) ? 2 : 1;
+			uint8_t tracks = ((disktype == 0x16) || disktype == 0x18) ? 80 : 40;
+
+			if (f.sector_count != sectdata[0xe7] || f.head_count != heads || f.track_count != tracks)
+				continue;
+
+			return i;
+		}
+	}
+	return index;
+}
+
 const trd_format::format trd_format::formats[] = {
+	// GAP4A should be 0 bytes
 	{   // 5"25 640K 80 track double sided double density
 		floppy_image::FF_525,  floppy_image::DSQD, floppy_image::MFM,
-		// GAP4A - 0(!!!) bytes, GAP1 - 10 bytes, GAP2 - 22 bytes, GAP3 - 60 bytes, GAP4B - upto track end
 		2000, 16, 80, 2, 256, {}, -1, { 1,9,2,10,3,11,4,12,5,13,6,14,7,15,8,16 }, 10, 22, 60
 	},
+	{   // 5"25 320K 80 track single sided double density
+		floppy_image::FF_525,  floppy_image::SSQD, floppy_image::MFM,
+		2000, 16, 80, 1, 256, {}, -1, { 1,9,2,10,3,11,4,12,5,13,6,14,7,15,8,16 }, 10, 22, 60
+	},
+	{   // 5"25 320K 40 track double sided double density
+		floppy_image::FF_525,  floppy_image::DSSD, floppy_image::MFM,
+		2000, 16, 40, 2, 256, {}, -1, { 1,9,2,10,3,11,4,12,5,13,6,14,7,15,8,16 }, 10, 22, 60
+	},
+	{   // 5"25 160K 40 track single sided double density
+		floppy_image::FF_525,  floppy_image::SSSD, floppy_image::MFM,
+		2000, 16, 40, 1, 256, {}, -1, { 1,9,2,10,3,11,4,12,5,13,6,14,7,15,8,16 }, 10, 22, 60
+	},
+
 	{   // 5"25 400K 80 track double sided single density
 		floppy_image::FF_525,  floppy_image::DSQD, floppy_image::FM,
 		// GAPs and interleave probably not correct
diff -Nru mame-0.222+dfsg.1/src/lib/formats/trd_dsk.h mame-0.224+dfsg.1/src/lib/formats/trd_dsk.h
--- mame-0.222+dfsg.1/src/lib/formats/trd_dsk.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/trd_dsk.h	2020-08-26 08:57:19.000000000 +0000
@@ -24,6 +24,7 @@
 
 private:
 	static const format formats[];
+	virtual int find_size(io_generic *io, uint32_t form_factor) override;
 };
 
 extern const floppy_format_type FLOPPY_TRD_FORMAT;
diff -Nru mame-0.222+dfsg.1/src/lib/formats/wd177x_dsk.cpp mame-0.224+dfsg.1/src/lib/formats/wd177x_dsk.cpp
--- mame-0.222+dfsg.1/src/lib/formats/wd177x_dsk.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/formats/wd177x_dsk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -460,7 +460,12 @@
 						}
 						ns++;
 					}
-				if(ns != tf.sector_count)
+
+				if(ns > tf.sector_count)
+					goto fail;
+
+				// Be permissive of some missing sectors in later tracks
+				if(ns < tf.sector_count && track < 2)
 					goto fail;
 			}
 		}
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/analog/nld_bjt.cpp mame-0.224+dfsg.1/src/lib/netlist/analog/nld_bjt.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/analog/nld_bjt.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/analog/nld_bjt.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,7 +2,7 @@
 // copyright-holders:Couriersud
 
 #include "netlist/solver/nld_solver.h"
-#include "netlist/nl_setup.h"
+#include "netlist/nl_base.h"
 #include "nlid_twoterm.h"
 
 // FIXME: Remove QBJT_switch - no more use
@@ -142,7 +142,6 @@
 		NETLIB_IS_DYNAMIC(true)
 
 		//NETLIB_RESETI();
-		NETLIB_UPDATEI();
 
 		bjt_type qtype() const noexcept { return m_qtype; }
 		bool is_qtype(bjt_type atype) const noexcept { return m_qtype == atype; }
@@ -176,9 +175,9 @@
 	{
 		NETLIB_CONSTRUCTOR(QBJT_switch)
 		, m_modacc(m_model)
-		, m_RB(*this, "m_RB", true)
-		, m_RC(*this, "m_RC", true)
-		, m_BC(*this, "m_BC", true)
+		, m_RB(*this, "m_RB", NETLIB_DELEGATE(termhandler))
+		, m_RC(*this, "m_RC", NETLIB_DELEGATE(termhandler))
+		, m_BC(*this, "m_BC", NETLIB_DELEGATE(termhandler))
 		, m_gB(nlconst::cgmin())
 		, m_gC(nlconst::cgmin())
 		, m_V(nlconst::zero())
@@ -194,7 +193,15 @@
 		}
 
 		NETLIB_RESETI();
-		NETLIB_UPDATEI();
+		NETLIB_HANDLERI(termhandler)
+		{
+			auto *solv(m_RB.solver());
+			if (solv != nullptr)
+				solv->solve_now();
+			else
+				m_RC.solver()->solve_now();
+		}
+
 		NETLIB_UPDATE_PARAMI();
 		NETLIB_UPDATE_TERMINALSI();
 
@@ -223,9 +230,9 @@
 		, m_modacc(m_model)
 		, m_gD_BC(*this, "m_D_BC")
 		, m_gD_BE(*this, "m_D_BE")
-		, m_D_CB(*this, "m_D_CB", true)
-		, m_D_EB(*this, "m_D_EB", true)
-		, m_D_EC(*this, "m_D_EC", true)
+		, m_D_CB(*this, "m_D_CB", NETLIB_DELEGATE(termhandler))
+		, m_D_EB(*this, "m_D_EB", NETLIB_DELEGATE(termhandler))
+		, m_D_EC(*this, "m_D_EC", NETLIB_DELEGATE(termhandler))
 		, m_alpha_f(0)
 		, m_alpha_r(0)
 		{
@@ -256,7 +263,15 @@
 	protected:
 
 		NETLIB_RESETI();
-		NETLIB_UPDATEI();
+		NETLIB_HANDLERI(termhandler)
+		{
+			auto *solv(m_D_EB.solver());
+			if (solv != nullptr)
+				solv->solve_now();
+			else
+				m_D_CB.solver()->solve_now();
+		}
+
 		NETLIB_UPDATE_PARAMI();
 		NETLIB_UPDATE_TERMINALSI();
 
@@ -278,15 +293,6 @@
 
 
 	// ----------------------------------------------------------------------------------------
-	// nld_Q
-	// ----------------------------------------------------------------------------------------
-
-	NETLIB_UPDATE(QBJT)
-	{
-	//    netlist().solver()->schedule1();
-	}
-
-	// ----------------------------------------------------------------------------------------
 	// nld_QBJT_switch
 	// ----------------------------------------------------------------------------------------
 
@@ -307,16 +313,6 @@
 
 	}
 
-	NETLIB_UPDATE(QBJT_switch)
-	{
-		auto *solv(m_RB.solver());
-		if (solv != nullptr)
-			solv->solve_now();
-		else
-			m_RC.solver()->solve_now();
-	}
-
-
 	NETLIB_UPDATE_PARAM(QBJT_switch)
 	{
 		nl_fptype IS = m_modacc.m_IS;
@@ -371,15 +367,6 @@
 	// nld_Q - Ebers Moll
 	// ----------------------------------------------------------------------------------------
 
-	NETLIB_UPDATE(QBJT_EB)
-	{
-		auto *solv(m_D_EB.solver());
-		if (solv != nullptr)
-			solv->solve_now();
-		else
-			m_D_CB.solver()->solve_now();
-	}
-
 	NETLIB_RESET(QBJT_EB)
 	{
 		if (m_D_EB.solver() == nullptr && m_D_CB.solver() == nullptr)
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/analog/nld_generic_models.h mame-0.224+dfsg.1/src/lib/netlist/analog/nld_generic_models.h
--- mame-0.222+dfsg.1/src/lib/netlist/analog/nld_generic_models.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/analog/nld_generic_models.h	2020-08-26 08:57:19.000000000 +0000
@@ -84,6 +84,11 @@
 			m_v = v;
 		}
 
+		void restore_state() noexcept
+		{
+			// no state used
+		}
+
 		void setparams(nl_fptype gmin) noexcept { m_gmin = gmin; }
 
 	private:
@@ -126,7 +131,7 @@
 		nl_fptype m_gmin;
 	};
 
-#if 1
+#if (NL_USE_BACKWARD_EULER)
 	// Constant model for constant capacitor model
 	// Backward Euler
 	// "Circuit simulation", page 274
@@ -146,6 +151,10 @@
 			const nl_fptype G(cap * h + m_gmin);
 			return { G, - G * v };
 		}
+		void restore_state() noexcept
+		{
+			// this one has no state
+		}
 		void setparams(nl_fptype gmin) noexcept { m_gmin = gmin; }
 	private:
 		nl_fptype m_gmin;
@@ -157,7 +166,7 @@
 	struct generic_capacitor_const
 	{
 	public:
-		generic_capacitor_const(device_t &dev, const pstring &name)
+		generic_capacitor_const(core_device_t &dev, const pstring &name)
 		: m_gmin(nlconst::zero())
 		, m_vn(0)
 		, m_in(0)
@@ -186,6 +195,10 @@
 			m_trn = h;
 			return { G + m_gmin, -Ieq };
 		}
+		void restore_state() noexcept
+		{
+			// this one has no state
+		}
 		void setparams(nl_fptype gmin) noexcept { m_gmin = gmin; }
 	private:
 		nl_fptype m_gmin;
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/analog/nld_mosfet.cpp mame-0.224+dfsg.1/src/lib/netlist/analog/nld_mosfet.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/analog/nld_mosfet.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/analog/nld_mosfet.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -162,7 +162,6 @@
 		NETLIB_IS_DYNAMIC(true)
 
 		//NETLIB_RESETI();
-		NETLIB_UPDATEI() { }
 
 		q_type qtype() const noexcept { return m_qtype; }
 		bool is_qtype(q_type atype) const noexcept { return m_qtype == atype; }
@@ -182,9 +181,9 @@
 	{
 	public:
 		NETLIB_CONSTRUCTOR(MOSFET)
-		, m_DG(*this, "m_DG", true)
-		, m_SG(*this, "m_SG", true)
-		, m_SD(*this, "m_SD", true)
+		, m_DG(*this, "m_DG", NETLIB_DELEGATE(termhandler))
+		, m_SG(*this, "m_SG", NETLIB_DELEGATE(termhandler))
+		, m_SD(*this, "m_SD", NETLIB_DELEGATE(termhandler))
 		, m_D_BD(*this, "m_D_BD")
 #if (!BODY_CONNECTED_TO_SOURCE)
 		, m_D_BS(*this, "m_D_BS")
@@ -280,7 +279,7 @@
 
 			m_vto = m_modacc.m_VTO;
 			// FIXME zero conversion
-			if(m_vto != nlconst::zero())
+			if(m_vto == nlconst::zero())
 				log().warning(MW_MOSFET_THRESHOLD_VOLTAGE(m_model.name()));
 
 			// FIXME: VTO if missing may be calculated from TPG, NSS and temperature. Usually models
@@ -297,16 +296,25 @@
 		{
 			if (m_capmod != 0)
 			{
-				//const nl_nl_fptype Ugd = -m_DG.deltaV() * m_polarity; // Gate - Drain
-				//const nl_nl_fptype Ugs = -m_SG.deltaV() * m_polarity; // Gate - Source
-				const nl_fptype Ugd = m_Vgd; // Gate - Drain
-				const nl_fptype Ugs = m_Vgs; // Gate - Source
-				const nl_fptype Ubs = nlconst::zero(); // Bulk - Source == 0 if connected
-				const nl_fptype Ugb = Ugs - Ubs;
-
-				m_cap_gb.timestep(m_Cgb, Ugb, step);
-				m_cap_gs.timestep(m_Cgs, Ugs, step);
-				m_cap_gd.timestep(m_Cgd, Ugd, step);
+				if (ts_type == timestep_type::FORWARD)
+				{
+					//const nl_nl_fptype Ugd = -m_DG.deltaV() * m_polarity; // Gate - Drain
+					//const nl_nl_fptype Ugs = -m_SG.deltaV() * m_polarity; // Gate - Source
+					const nl_fptype Ugd = m_Vgd; // Gate - Drain
+					const nl_fptype Ugs = m_Vgs; // Gate - Source
+					const nl_fptype Ubs = nlconst::zero(); // Bulk - Source == 0 if connected
+					const nl_fptype Ugb = Ugs - Ubs;
+
+					m_cap_gb.timestep(m_Cgb, Ugb, step);
+					m_cap_gs.timestep(m_Cgs, Ugs, step);
+					m_cap_gd.timestep(m_Cgd, Ugd, step);
+				}
+				else
+				{
+					m_cap_gb.restore_state();
+					m_cap_gs.restore_state();
+					m_cap_gd.restore_state();
+				}
 			}
 		}
 
@@ -323,7 +331,15 @@
 			#endif
 		}
 
-		NETLIB_UPDATEI();
+		NETLIB_HANDLERI(termhandler)
+		{
+			// only called if connected to a rail net ==> notify the solver to recalculate
+			auto *solv(m_SG.solver());
+			if (solv != nullptr)
+				solv->solve_now();
+			else
+				m_DG.solver()->solve_now();
+		}
 		NETLIB_UPDATE_PARAMI();
 		NETLIB_UPDATE_TERMINALSI();
 
@@ -429,17 +445,6 @@
 	// MOSFET
 	// ----------------------------------------------------------------------------------------
 
-	NETLIB_UPDATE(MOSFET)
-	{
-		// FIXME: This should never be called
-		if (!m_SG.P().net().is_rail_net())
-			m_SG.P().solve_now();   // Basis
-		else if (!m_SG.N().net().is_rail_net())
-			m_SG.N().solve_now();   // Emitter
-		else
-			m_DG.N().solve_now();   // Collector
-	}
-
 	NETLIB_UPDATE_TERMINALS(MOSFET)
 	{
 		nl_fptype Vgd = -m_DG.deltaV() * m_polarity; // Gate - Drain
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/analog/nld_opamps.cpp mame-0.224+dfsg.1/src/lib/netlist/analog/nld_opamps.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/analog/nld_opamps.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/analog/nld_opamps.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -107,8 +107,8 @@
 		NETLIB_CONSTRUCTOR(opamp)
 		, m_RP(*this, "RP1")
 		, m_G1(*this, "G1")
-		, m_VCC(*this, "VCC")
-		, m_GND(*this, "GND")
+		, m_VCC(*this, "VCC", NETLIB_DELEGATE(supply))
+		, m_GND(*this, "GND", NETLIB_DELEGATE(supply))
 		, m_model(*this, "MODEL", "LM324")
 		, m_modacc(m_model)
 		, m_VH(*this, "VH")
@@ -183,10 +183,21 @@
 
 		}
 
-		NETLIB_UPDATEI();
+		NETLIB_HANDLERI(supply)
+		{
+			const nl_fptype cVt = nlconst::np_VT(nlconst::one()); // * m_n;
+			const nl_fptype cId = m_modacc.m_DAB; // 3 mA
+			const nl_fptype cVd = cVt * plib::log(cId / nlconst::np_Is() + nlconst::one());
+
+			m_VH.push(m_VCC() - m_modacc.m_VLH - cVd);
+			m_VL.push(m_GND() + m_modacc.m_VLL + cVd);
+			m_VREF.push((m_VCC() + m_GND()) / nlconst::two());
+		}
+
 		NETLIB_RESETI()
 		{
 		}
+
 		NETLIB_UPDATE_PARAMI();
 
 	private:
@@ -214,17 +225,6 @@
 		int m_type;
 	};
 
-	NETLIB_UPDATE(opamp)
-	{
-		const nl_fptype cVt = nlconst::np_VT(nlconst::one()); // * m_n;
-		const nl_fptype cId = m_modacc.m_DAB; // 3 mA
-		const nl_fptype cVd = cVt * plib::log(cId / nlconst::np_Is() + nlconst::one());
-
-		m_VH.push(m_VCC() - m_modacc.m_VLH - cVd);
-		m_VL.push(m_GND() + m_modacc.m_VLL + cVd);
-		m_VREF.push((m_VCC() + m_GND()) / nlconst::two());
-	}
-
 	NETLIB_UPDATE_PARAM(opamp)
 	{
 		m_G1.m_RI.set(m_modacc.m_RI);
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/analog/nld_switches.cpp mame-0.224+dfsg.1/src/lib/netlist/analog/nld_switches.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/analog/nld_switches.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/analog/nld_switches.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -29,33 +29,23 @@
 			register_subalias("2", m_R.N());
 		}
 
-		NETLIB_RESETI();
-		NETLIB_UPDATEI();
-		NETLIB_UPDATE_PARAMI();
+		NETLIB_RESETI()
+		{
+			m_R.set_R(R_OFF);
+		}
+		NETLIB_UPDATE_PARAMI()
+		{
+			m_R.change_state([this]()
+			{
+				m_R.set_R(m_POS() ? R_ON : R_OFF);
+			});
+		}
 
 	private:
 		analog::NETLIB_SUB(R_base) m_R;
 		param_logic_t              m_POS;
 	};
 
-
-	NETLIB_RESET(switch1)
-	{
-		m_R.set_R(R_OFF);
-	}
-
-	NETLIB_UPDATE(switch1)
-	{
-	}
-
-	NETLIB_UPDATE_PARAM(switch1)
-	{
-		m_R.change_state([this]()
-		{
-			m_R.set_R(m_POS() ? R_ON : R_OFF);
-		});
-	}
-
 // ----------------------------------------------------------------------------------------
 // SWITCH2
 // ----------------------------------------------------------------------------------------
@@ -76,7 +66,6 @@
 		}
 
 		NETLIB_RESETI();
-		NETLIB_UPDATEI();
 		NETLIB_UPDATE_PARAMI();
 
 	private:
@@ -91,6 +80,7 @@
 		m_R2.set_R(R_OFF);
 	}
 
+#ifdef FIXMELATER
 	NETLIB_UPDATE(switch2)
 	{
 		if (!m_POS())
@@ -104,7 +94,7 @@
 			m_R2.set_R(R_ON);
 		}
 	}
-
+#endif
 	NETLIB_UPDATE_PARAM(switch2)
 	{
 		// R1 and R2 are connected. However this net may be a rail net.
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/analog/nlid_fourterm.cpp mame-0.224+dfsg.1/src/lib/netlist/analog/nlid_fourterm.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/analog/nlid_fourterm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/analog/nlid_fourterm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -30,17 +30,18 @@
 	m_ON1.set_go_gt(-m_mult, nlconst::zero());
 }
 
-NETLIB_UPDATE(VCCS)
+NETLIB_HANDLER(VCCS, termhandler)
 {
+	solver::matrix_solver_t *solv = nullptr;
 	// only called if connected to a rail net ==> notify the solver to recalculate
-	if (!m_IP.net().is_rail_net())
-		m_IP.solve_now();
-	else if (!m_IN.net().is_rail_net())
-		m_IN.solve_now();
-	else if (!m_OP.net().is_rail_net())
-		m_OP.solve_now();
-	else if (!m_ON.net().is_rail_net())
-		m_ON.solve_now();
+	if ((solv = m_IP.solver()) != nullptr)
+		solv->solve_now();
+	else if ((solv = m_IN.solver()) != nullptr)
+		solv->solve_now();
+	else if ((solv = m_OP.solver()) != nullptr)
+		solv->solve_now();
+	else if ((solv = m_ON.solver()) != nullptr)
+		solv->solve_now();
 }
 
 // ----------------------------------------------------------------------------------------
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/analog/nlid_fourterm.h mame-0.224+dfsg.1/src/lib/netlist/analog/nlid_fourterm.h
--- mame-0.222+dfsg.1/src/lib/netlist/analog/nlid_fourterm.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/analog/nlid_fourterm.h	2020-08-26 08:57:19.000000000 +0000
@@ -39,12 +39,12 @@
 		NETLIB_CONSTRUCTOR_EX(VCCS, nl_fptype ri = nlconst::magic(1e9))
 		, m_G(*this, "G", nlconst::one())
 		, m_RI(*this, "RI", ri)
-		, m_OP(*this, "OP", &m_IP)
-		, m_ON(*this, "ON", &m_IP)
-		, m_IP(*this, "IP", &m_IN)   // <= this should be NULL and terminal be filtered out prior to solving...
-		, m_IN(*this, "IN", &m_IP)   // <= this should be NULL and terminal be filtered out prior to solving...
-		, m_OP1(*this, "_OP1", &m_IN)
-		, m_ON1(*this, "_ON1", &m_IN)
+		, m_OP(*this, "OP", &m_IP, NETLIB_DELEGATE(termhandler))
+		, m_ON(*this, "ON", &m_IP, NETLIB_DELEGATE(termhandler))
+		, m_IP(*this, "IP", &m_IN, NETLIB_DELEGATE(termhandler))   // <= this should be NULL and terminal be filtered out prior to solving...
+		, m_IN(*this, "IN", &m_IP, NETLIB_DELEGATE(termhandler))   // <= this should be NULL and terminal be filtered out prior to solving...
+		, m_OP1(*this, "_OP1", &m_IN, NETLIB_DELEGATE(termhandler))
+		, m_ON1(*this, "_ON1", &m_IN, NETLIB_DELEGATE(termhandler))
 		, m_gfac(nlconst::one())
 		{
 			connect(m_OP, m_OP1);
@@ -57,7 +57,7 @@
 		param_fp_t m_RI;
 
 	protected:
-		NETLIB_UPDATEI();
+		NETLIB_HANDLERI(termhandler);
 		NETLIB_UPDATE_PARAMI()
 		{
 			NETLIB_NAME(VCCS)::reset();
@@ -181,8 +181,8 @@
 	public:
 		NETLIB_CONSTRUCTOR(VCVS)
 		, m_RO(*this, "RO", nlconst::one())
-		, m_OP2(*this, "_OP2", &m_ON2)
-		, m_ON2(*this, "_ON2", &m_OP2)
+		, m_OP2(*this, "_OP2", &m_ON2, NETLIB_DELEGATE(termhandler))
+		, m_ON2(*this, "_ON2", &m_OP2, NETLIB_DELEGATE(termhandler))
 		{
 			connect(m_OP2, m_OP1);
 			connect(m_ON2, m_ON1);
@@ -193,8 +193,11 @@
 		param_fp_t m_RO;
 
 	private:
-		//NETLIB_UPDATEI();
 		//NETLIB_UPDATE_PARAMI();
+		NETLIB_HANDLERI(termhandler)
+		{
+			NETLIB_NAME(VCCS) :: termhandler();
+		}
 
 		terminal_t m_OP2;
 		terminal_t m_ON2;
@@ -233,8 +236,8 @@
 	public:
 		NETLIB_CONSTRUCTOR_PASS(CCVS, nlconst::one())
 		, m_RO(*this, "RO", nlconst::one())
-		, m_OP2(*this, "_OP2", &m_ON2)
-		, m_ON2(*this, "_ON2", &m_OP2)
+		, m_OP2(*this, "_OP2", &m_ON2, NETLIB_DELEGATE(termhandler))
+		, m_ON2(*this, "_ON2", &m_OP2, NETLIB_DELEGATE(termhandler))
 		{
 			connect(m_OP2, m_OP1);
 			connect(m_ON2, m_ON1);
@@ -245,9 +248,13 @@
 		param_fp_t m_RO;
 
 	private:
-		//NETLIB_UPDATEI();
 		//NETLIB_UPDATE_PARAMI();
 
+		NETLIB_HANDLERI(termhandler)
+		{
+			NETLIB_NAME(VCCS) :: termhandler();
+		}
+
 		terminal_t m_OP2;
 		terminal_t m_ON2;
 	};
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/analog/nlid_twoterm.cpp mame-0.224+dfsg.1/src/lib/netlist/analog/nlid_twoterm.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/analog/nlid_twoterm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/analog/nlid_twoterm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -31,22 +31,12 @@
 			solv->solve_now();
 	}
 
-	NETLIB_UPDATE(twoterm)
+	NETLIB_HANDLER(twoterm, termhandler)
 	{
 		// only called if connected to a rail net ==> notify the solver to recalculate
+		//printf("%s update\n", this->name().c_str());
 		solve_now();
 	}
-
-	// ----------------------------------------------------------------------------------------
-	// nld_R_base
-	// ----------------------------------------------------------------------------------------
-
-	NETLIB_RESET(R_base)
-	{
-		NETLIB_NAME(twoterm)::reset();
-		set_R(plib::reciprocal(exec().gmin()));
-	}
-
 	// ----------------------------------------------------------------------------------------
 	// nld_POT
 	// ----------------------------------------------------------------------------------------
@@ -132,11 +122,21 @@
 
 	NETLIB_TIMESTEP(L)
 	{
-		// Gpar should support convergence
-		m_I += m_G * deltaV();
-		m_G = step / m_L() + m_gmin;
-		set_mat( m_G, -m_G, -m_I,
-				-m_G,  m_G,  m_I);
+		if (ts_type == timestep_type::FORWARD)
+		{
+			m_last_I = m_I;
+			m_last_G = m_G;
+			// Gpar should support convergence
+			m_I += m_G * deltaV();
+			m_G = step / m_L() + m_gmin;
+			set_mat( m_G, -m_G, -m_I,
+					-m_G,  m_G,  m_I);
+		}
+		else
+		{
+			m_I = m_last_I;
+			m_G = m_last_G;
+		}
 	}
 
 	// ----------------------------------------------------------------------------------------
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/analog/nlid_twoterm.h mame-0.224+dfsg.1/src/lib/netlist/analog/nlid_twoterm.h
--- mame-0.222+dfsg.1/src/lib/netlist/analog/nlid_twoterm.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/analog/nlid_twoterm.h	2020-08-26 08:57:19.000000000 +0000
@@ -32,7 +32,7 @@
 ///  current source. This is suitable to model voltage sources, current sources,
 ///  resistors, capacitors, inductances and diodes.
 ///
-////
+//
 
 #include "netlist/nl_base.h"
 #include "netlist/nl_setup.h"
@@ -70,30 +70,37 @@
 
 	NETLIB_BASE_OBJECT(twoterm)
 	{
-		// FIXME locate use case of owned = true and eliminate them if possible
-		NETLIB_CONSTRUCTOR_EX(twoterm, bool terminals_owned = false)
-		, m_P(bselect(terminals_owned, owner, *this), (terminals_owned ? name + "." : "") + "1", &m_N)
-		, m_N(bselect(terminals_owned, owner, *this), (terminals_owned ? name + "." : "") + "2", &m_P)
+		NETLIB_CONSTRUCTOR(twoterm)
+		, m_P(*this, "1", &m_N, NETLIB_DELEGATE(termhandler))
+		, m_N(*this, "2", &m_P, NETLIB_DELEGATE(termhandler))
+		{
+		}
+		//NETLIB_CONSTRUCTOR_EX(twoterm, nldelegate owner_delegate)
+		template <class C>
+		NETLIB_NAME(twoterm)(C &owner, const pstring &name, nldelegate owner_delegate) \
+				: base_type(owner, name)
+		, m_P(owner, name + ".1", &m_N, owner_delegate)
+		, m_N(owner, name + ".2", &m_P, owner_delegate)
 		{
 		}
 
 		//NETLIB_UPDATE_TERMINALSI() { }
-		//NETLIB_RESETI() { }
+		//NETLIB_RESETI() {}
 
 	public:
 
-		NETLIB_UPDATEI();
+		NETLIB_HANDLERI(termhandler);
 
 		solver::matrix_solver_t *solver() const noexcept;
 
 		void solve_now() const;
 
 		template <typename F>
-		void change_state(F f, netlist_time delay = netlist_time::quantum()) const
+		void change_state(F f) const
 		{
 			auto *solv(solver());
 			if (solv)
-				solv->change_state(f, delay);
+				solv->change_state(f);
 		}
 
 		void set_G_V_I(nl_fptype G, nl_fptype V, nl_fptype I) const noexcept
@@ -126,6 +133,14 @@
 			m_N.set_go_gt_I(a21, a22, rhs2);
 		}
 
+		void clear_mat() const noexcept
+		{
+			const auto z = nlconst::zero();
+			//               GO,  GT,     I
+			m_P.set_go_gt_I(z, z, z);
+			m_N.set_go_gt_I(z, z, z);
+		}
+
 		/// \brief Get a const reference to the m_P terminal
 		///
 		/// This is typically called during initialization to connect
@@ -188,7 +203,7 @@
 					-G,  G, nlconst::zero());
 		}
 
-		NETLIB_RESETI();
+		//NETLIB_RESETI();
 
 	protected:
 		//NETLIB_UPDATEI();
@@ -205,7 +220,6 @@
 
 	protected:
 
-		//NETLIB_UPDATEI() { }
 		NETLIB_RESETI()
 		{
 			set_R(std::max(m_R(), exec().gmin()));
@@ -306,12 +320,17 @@
 		NETLIB_IS_TIMESTEP(true)
 		NETLIB_TIMESTEPI()
 		{
-			// G, Ieq
-			const auto res(m_cap.timestep(m_C(), deltaV(), step));
-			const nl_fptype G = res.first;
-			const nl_fptype I = res.second;
-			set_mat( G, -G, -I,
-					-G,  G,  I);
+			if (ts_type == timestep_type::FORWARD)
+			{
+				// G, Ieq
+				const auto res(m_cap.timestep(m_C(), deltaV(), step));
+				const nl_fptype G = res.first;
+				const nl_fptype I = res.second;
+				set_mat( G, -G, -I,
+						-G,  G,  I);
+			}
+			else
+				m_cap.restore_state();
 		}
 
 		NETLIB_RESETI()
@@ -401,8 +420,10 @@
 		NETLIB_CONSTRUCTOR(L)
 		, m_L(*this, "L", nlconst::magic(1e-6))
 		, m_gmin(nlconst::zero())
-		, m_G(nlconst::zero())
-		, m_I(nlconst::zero())
+		, m_G(*this, "m_G", nlconst::zero())
+		, m_I(*this, "m_I", nlconst::zero())
+		, m_last_I(*this, "m_last_I", nlconst::zero())
+		, m_last_G(*this, "m_last_G", nlconst::zero())
 		{
 			//register_term("1", m_P);
 			//register_term("2", m_N);
@@ -420,8 +441,10 @@
 		param_fp_t m_L;
 
 		nl_fptype m_gmin;
-		nl_fptype m_G;
-		nl_fptype m_I;
+		state_var<nl_fptype> m_G;
+		state_var<nl_fptype> m_I;
+		state_var<nl_fptype> m_last_I;
+		state_var<nl_fptype> m_last_G;
 	};
 
 	/// \brief Class representing the diode model paramers.
@@ -569,11 +592,16 @@
 
 		NETLIB_TIMESTEPI()
 		{
-			m_t += step;
-			m_funcparam[0] = m_t;
-			this->set_G_V_I(plib::reciprocal(m_R()),
-					m_compiled->evaluate(m_funcparam),
-					nlconst::zero());
+			if (ts_type == timestep_type::FORWARD)
+			{
+				m_t += step;
+				m_funcparam[0] = m_t;
+				this->set_G_V_I(plib::reciprocal(m_R()),
+						m_compiled->evaluate(m_funcparam),
+						nlconst::zero());
+			}
+			else
+				m_t -= step; // only need to restore state, will be called again
 		}
 
 	protected:
@@ -616,12 +644,17 @@
 		NETLIB_IS_TIMESTEP(!m_func().empty())
 		NETLIB_TIMESTEPI()
 		{
-			m_t += step;
-			m_funcparam[0] = m_t;
-			const nl_fptype I = m_compiled->evaluate(m_funcparam);
-			const auto zero(nlconst::zero());
-			set_mat(zero, zero, -I,
-					zero, zero,  I);
+			if (ts_type == timestep_type::FORWARD)
+			{
+				m_t += step;
+				m_funcparam[0] = m_t;
+				const nl_fptype I = m_compiled->evaluate(m_funcparam);
+				const auto zero(nlconst::zero());
+				set_mat(zero, zero, -I,
+						zero, zero,  I);
+			}
+			else
+				m_t -= step;
 		}
 
 	protected:
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/build/doxygen.conf mame-0.224+dfsg.1/src/lib/netlist/build/doxygen.conf
--- mame-0.222+dfsg.1/src/lib/netlist/build/doxygen.conf	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/build/doxygen.conf	2020-08-26 08:57:19.000000000 +0000
@@ -771,7 +771,7 @@
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT = .. ../analog ../documentation ../devices ../macro
+INPUT = .. ../analog ../documentation ../devices ../macro ../core 
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -844,7 +844,7 @@
 # that contain example code fragments that are included (see the \include
 # command).
 
-EXAMPLE_PATH = ../documentation ../examples 
+EXAMPLE_PATH = ../documentation ../examples ./html
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/build/makefile mame-0.224+dfsg.1/src/lib/netlist/build/makefile
--- mame-0.222+dfsg.1/src/lib/netlist/build/makefile	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/build/makefile	2020-08-26 08:57:19.000000000 +0000
@@ -53,7 +53,7 @@
 
 #TIDY_SOURCES = $(SRC)/devices/nld_7442.cpp $(SRC)/devices/nld_7492.cpp
 
-#TIDY_FLAGS = -p $(OBJ) -checks=llvm-include-order,llvm-namespace-comment,modernize-use-override,modernize-use-using -fix
+TIDY_FLAGS = -p $(OBJ) -checks=llvm-include-order,llvm-namespace-comment,modernize-use-override,modernize-use-using -fix
 #TIDY_FLAGS = -checks=llvm-include-order -fix
 #TIDY_FLAGS = -checks=llvm-namespace-comment -fix
 #TIDY_FLAGS = -checks=modernize-use-override -fix
@@ -92,7 +92,7 @@
 
 
 ifndef FAST
-FAST=1
+FAST=0
 endif
 
 ifeq ($(FAST),1)
@@ -103,6 +103,7 @@
 
 NLOBJ = $(OBJ)
 POBJ = $(OBJ)/plib
+TESTOBJ = $(OBJ)/tests
 
 DEPEND = $(OBJ)/.depend
 
@@ -113,12 +114,13 @@
 			$(OBJ)/plib \
 			$(OBJ)/devices \
 			$(OBJ)/macro \
+			$(OBJ)/tests \
 			$(OBJ)/tools \
 			$(OBJ)/prg \
 			$(OBJ)/generated \
 
 
-OBJS = $(POBJS) $(NLOBJS)
+OBJS = $(POBJS) $(NLOBJS) $(TESTOBJS)
 
 POBJS := \
 	$(POBJ)/pstring.o \
@@ -152,10 +154,11 @@
 	$(NLOBJ)/devices/nld_tms4800.o \
 	$(NLOBJ)/devices/nld_4006.o \
 	$(NLOBJ)/devices/nld_4013.o \
+	$(NLOBJ)/devices/nld_4017.o \
 	$(NLOBJ)/devices/nld_4020.o \
+	$(NLOBJ)/devices/nld_4053.o \
 	$(NLOBJ)/devices/nld_4066.o \
 	$(NLOBJ)/devices/nld_4316.o \
-	$(NLOBJ)/devices/nld_7442.o \
 	$(NLOBJ)/devices/nld_7448.o \
 	$(NLOBJ)/devices/nld_7450.o \
 	$(NLOBJ)/devices/nld_7473.o \
@@ -168,6 +171,7 @@
 	$(NLOBJ)/devices/nld_7493.o \
 	$(NLOBJ)/devices/nld_7497.o \
 	$(NLOBJ)/devices/nld_74107.o \
+	$(NLOBJ)/devices/nld_74113.o \
 	$(NLOBJ)/devices/nld_74123.o \
 	$(NLOBJ)/devices/nld_74125.o \
 	$(NLOBJ)/devices/nld_74153.o \
@@ -185,10 +189,12 @@
 	$(NLOBJ)/devices/nld_74377.o \
 	$(NLOBJ)/devices/nld_74393.o \
 	$(NLOBJ)/devices/nld_74ls629.o \
+	$(NLOBJ)/devices/nld_8277.o \
 	$(NLOBJ)/devices/nld_82S16.o \
 	$(NLOBJ)/devices/nld_82S115.o \
 	$(NLOBJ)/devices/nld_9310.o \
 	$(NLOBJ)/devices/nld_9316.o \
+	$(NLOBJ)/devices/nld_9321.o \
 	$(NLOBJ)/devices/nld_9322.o \
 	$(NLOBJ)/devices/nld_am2847.o \
 	$(NLOBJ)/devices/nld_dm9314.o \
@@ -205,12 +211,15 @@
 	$(NLOBJ)/devices/nlid_proxy.o \
 	$(NLOBJ)/devices/nld_system.o \
 	$(NLOBJ)/devices/nlid_truthtable.o \
-	$(NLOBJ)/macro/nlm_base.o \
-	$(NLOBJ)/macro/nlm_cd4xxx.o \
-	$(NLOBJ)/macro/nlm_opamp.o \
-	$(NLOBJ)/macro/nlm_other.o \
-	$(NLOBJ)/macro/nlm_roms.o \
-	$(NLOBJ)/macro/nlm_ttl74xx.o \
+	$(NLOBJ)/macro/nlm_base_lib.o \
+	$(NLOBJ)/macro/nlm_cd4xxx_lib.o \
+	$(NLOBJ)/macro/nlm_opamp_lib.o \
+	$(NLOBJ)/macro/nlm_otheric_lib.o \
+	$(NLOBJ)/macro/nlm_roms_lib.o \
+	$(NLOBJ)/macro/nlm_ttl74xx_lib.o \
+
+TESTOBJS := \
+	$(TESTOBJ)/test_pfunction.o \
 
 VSBUILDS = \
 	$(VSBUILD/netlistlib.vcxproj) \
@@ -234,7 +243,7 @@
 SOURCES = $(patsubst $(OBJ)%, $(SRC)%, $(ALL_OBJS:.o=.cpp))
 ALLFILES = $(SOURCES) $(VSBUILDS) $(DOCS)
 
-MAKEFILE_TARGETS_WITHOUT_INCLUDE := gcc9 clang clang-5 mingw doc native maketree tidy
+MAKEFILE_TARGETS_WITHOUT_INCLUDE := gcc9 clang clang-5 mingw doc native maketree tidy runtests
 
 
 # git archive HEAD --prefix=project-name-version/ \
@@ -244,7 +253,7 @@
 # PHONY
 #-------------------------------------------------
 
-.PHONY: all gcc9 clang clang-5 mingw doc native maketree $(DEPEND) depend 
+.PHONY: all gcc9 clang clang-5 mingw doc man native maketree $(DEPEND) depend runtests
 
 #-------------------------------------------------
 # all
@@ -297,24 +306,25 @@
 		-mllvm -inline-threshold=2000 \
 		-Wunknown-warning-option \
 		-Weverything -Wall -pedantic -Wpedantic -Wunused-private-field  \
-		-Werror -Wno-padded -Wno-weak-vtables -Wno-weak-template-vtables -Wno-unused-template \
+		-Werror -Wno-padded -Wno-weak-vtables -Wno-weak-template-vtables -Wunused-template \
 		-Wmissing-variable-declarations -Wno-float-equal -Wconversion \
-		-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-format-nonliteral \
+		-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wformat-nonliteral \
 		-Wno-exit-time-destructors -Winconsistent-missing-destructor-override \
-		-Wno-return-std-move-in-c++11 -Wno-unreachable-code"
+		-Wno-return-std-move-in-c++11 -Wno-unreachable-code \
+		-Wno-missing-prototypes"
 
 clang-libc:
 	#clang-11 currently broken
-	#$(MAKE) CC=clang++-11 LD=clang++-11 OBJ=obj/clang CEXTRAFLAGS="-march=native -msse4.2 -Weverything -Wall -pedantic -Wpedantic -Wunused-private-field -Wno-padded -Wno-unused-template -Wno-missing-variable-declarations -Wno-float-equal -Wconversion -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-format-nonliteral  -Wno-exit-time-destructors"
+	#$(MAKE) CC=clang++-11 LD=clang++-11 OBJ=obj/clang CEXTRAFLAGS="-march=native
 	$(MAKE) CC=clang++-10 LD=clang++-10 OBJ=obj/clang-libc CEXTRAFLAGS="-march=native \
 		-stdlib=libc++ -mllvm -inline-threshold=2000 \
 		-Wunknown-warning-option \
 		-Weverything -Wall -pedantic -Wpedantic -Wunused-private-field  \
-		-Werror -Wno-padded -Wno-weak-vtables -Wno-weak-template-vtables -Wno-unused-template \
+		-Werror -Wno-padded -Wno-weak-vtables -Wno-weak-template-vtables -Wunused-template \
 		-Wmissing-variable-declarations -Wno-float-equal -Wconversion \
-		-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-format-nonliteral \
+		-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wformat-nonliteral \
 		-Wno-exit-time-destructors -Winconsistent-missing-destructor-override \
-		-Wno-return-std-move-in-c++11 -Wno-unreachable-code"
+		-Wno-return-std-move-in-c++11 -Wno-unreachable-code" \
 		LDEXTRAFLAGS=-stdlib=libc++
 
 clang-5:
@@ -328,6 +338,9 @@
 		-Xcompiler -O6 -Xcompiler -march=native -ccbin g++-8 " \
 		DEPENDCC=g++
 
+runtests:
+	./nltool$(EXESUFFIX) -c tests
+
 tidy_db: compile_commands_prefix $(ALL_TIDY_FILES) compile_commands_postfix
 
 #
@@ -351,8 +364,13 @@
 #     LDEXTRAFLAGS = -municode
 #
 
+man: nltool$(EXESUFFIX) nlwav$(EXESUFFIX)
+	@mkdir -p man
+	@mkdir -p html
+	help2man --include=nltool.help2man --no-info ./nltool$(EXESUFFIX) > man/nltool.1
+	groff -mandoc -Thtml man/nltool.1 > html/nltool.html
 
-doc: nltool$(EXESUFFIX)
+doc:
 	./nltool$(EXESUFFIX) -c docheader > ../documentation/devsyn.dox.h
 	$(DOXYGEN) doxygen.conf
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/build/nltool.help2man mame-0.224+dfsg.1/src/lib/netlist/build/nltool.help2man
--- mame-0.222+dfsg.1/src/lib/netlist/build/nltool.help2man	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/build/nltool.help2man	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,5 @@
+[see also]
+More documentation for the
+.B nltool
+program is available in doxygen format.
+ 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/buildVS/netlistlib.vcxproj mame-0.224+dfsg.1/src/lib/netlist/buildVS/netlistlib.vcxproj
--- mame-0.222+dfsg.1/src/lib/netlist/buildVS/netlistlib.vcxproj	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/buildVS/netlistlib.vcxproj	2020-08-26 08:57:19.000000000 +0000
@@ -131,6 +131,7 @@
     <ClCompile Include="..\devices\nld_4066.cpp" />
     <ClCompile Include="..\devices\nld_4316.cpp" />
     <ClCompile Include="..\devices\nld_74107.cpp" />
+    <ClCompile Include="..\devices\nld_74113.cpp" />
     <ClCompile Include="..\devices\nld_74123.cpp" />
     <ClCompile Include="..\devices\nld_74153.cpp" />
     <ClCompile Include="..\devices\nld_74161.cpp" />
@@ -217,6 +218,7 @@
     <ClInclude Include="..\devices\nld_4066.h" />
     <ClInclude Include="..\devices\nld_4316.h" />
     <ClInclude Include="..\devices\nld_74107.h" />
+    <ClInclude Include="..\devices\nld_74113.h" />
     <ClInclude Include="..\devices\nld_74123.h" />
     <ClInclude Include="..\devices\nld_74153.h" />
     <ClInclude Include="..\devices\nld_74161.h" />
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/buildVS/netlistlib.vcxproj.filters mame-0.224+dfsg.1/src/lib/netlist/buildVS/netlistlib.vcxproj.filters
--- mame-0.222+dfsg.1/src/lib/netlist/buildVS/netlistlib.vcxproj.filters	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/buildVS/netlistlib.vcxproj.filters	2020-08-26 08:57:19.000000000 +0000
@@ -174,6 +174,9 @@
     <ClCompile Include="..\devices\nld_7473.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\devices\nld_74113.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\devices\nld_4066.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -509,6 +512,9 @@
     <ClInclude Include="..\devices\nld_7473.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\devices\nld_74113.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\devices\nld_74161.h">
       <Filter>Header Files</Filter>
     </ClInclude>
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/buildVS/nltool.vcxproj mame-0.224+dfsg.1/src/lib/netlist/buildVS/nltool.vcxproj
--- mame-0.222+dfsg.1/src/lib/netlist/buildVS/nltool.vcxproj	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/buildVS/nltool.vcxproj	2020-08-26 08:57:19.000000000 +0000
@@ -149,6 +149,7 @@
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)..\;$(SolutionDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">/bigobj</AdditionalOptions>
     </ClCompile>
+    <ClCompile Include="..\tests\test_pfunction.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="netlistlib.vcxproj">
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/buildVS/nltool.vcxproj.filters mame-0.224+dfsg.1/src/lib/netlist/buildVS/nltool.vcxproj.filters
--- mame-0.222+dfsg.1/src/lib/netlist/buildVS/nltool.vcxproj.filters	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/buildVS/nltool.vcxproj.filters	2020-08-26 08:57:19.000000000 +0000
@@ -18,5 +18,8 @@
     <ClCompile Include="..\prg\nltool.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\tests\test_pfunction.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/analog.h mame-0.224+dfsg.1/src/lib/netlist/core/analog.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/analog.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/analog.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,167 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file param.h
+///
+
+#ifndef NL_CORE_ANALOG_H_
+#define NL_CORE_ANALOG_H_
+
+#include "../nltypes.h"
+#include "base_objects.h"
+#include "nets.h"
+
+#include "../plib/plists.h"
+#include "../plib/pstring.h"
+
+#include <array>
+#include <utility>
+
+namespace netlist
+{
+	// -----------------------------------------------------------------------------
+	// analog_t
+	// -----------------------------------------------------------------------------
+
+	class analog_t : public detail::core_terminal_t
+	{
+	public:
+
+		analog_t(core_device_t &dev, const pstring &aname, state_e state,
+			nldelegate delegate);
+
+		const analog_net_t & net() const noexcept
+		{
+			return plib::downcast<const analog_net_t &>(core_terminal_t::net());
+		}
+
+		analog_net_t & net() noexcept
+		{
+			return plib::downcast<analog_net_t &>(core_terminal_t::net());
+		}
+
+		solver::matrix_solver_t *solver() const noexcept;
+	};
+
+	/// \brief Base class for terminals.
+	///
+	/// Each \ref nld_twoterm object consists of two terminals. Terminals
+	/// are at the core of analog netlists and are connected to  \ref net_t
+	/// objects.
+	///
+	class terminal_t : public analog_t
+	{
+	public:
+
+		/// \brief constructor
+		///
+		/// @param dev core_devict_t object owning the terminal
+		/// @param aname name of this terminal
+		/// @param otherterm pointer to the sibling terminal
+		terminal_t(core_device_t &dev, const pstring &aname, terminal_t *otherterm, nldelegate delegate);
+
+		/// \brief Returns voltage of connected net
+		///
+		/// @return voltage of net this terminal is connected to
+		nl_fptype operator ()() const  noexcept
+		{
+			return net().Q_Analog();
+		}
+
+		/// @brief sets conductivity value of this terminal
+		///
+		/// @param G Conductivity
+		void set_conductivity(nl_fptype G) const noexcept
+		{
+			set_go_gt_I(-G, G, nlconst::zero());
+		}
+
+		void set_go_gt(nl_fptype GO, nl_fptype GT) const noexcept
+		{
+			set_go_gt_I(GO, GT, nlconst::zero());
+		}
+
+		void set_go_gt_I(nl_fptype GO, nl_fptype GT, nl_fptype I) const noexcept
+		{
+			// Check for rail nets ...
+			if (m_go != nullptr)
+			{
+				*m_Idr = I;
+				*m_go = GO;
+				*m_gt = GT;
+			}
+		}
+
+		void set_ptrs(nl_fptype *gt, nl_fptype *go, nl_fptype *Idr) noexcept(false);
+
+	private:
+		nl_fptype *m_Idr; ///< drive current
+		nl_fptype *m_go;  ///< conductance for Voltage from other term
+		nl_fptype *m_gt;  ///< conductance for total conductance
+
+	};
+
+	// -----------------------------------------------------------------------------
+	// analog_input_t
+	// -----------------------------------------------------------------------------
+
+	/// \brief terminal providing analog input voltage.
+	///
+	/// This terminal class provides a voltage measurement. The conductance against
+	/// ground is infinite.
+
+	class analog_input_t : public analog_t
+	{
+	public:
+		/// \brief Constructor
+		analog_input_t(core_device_t &dev,  ///< owning device
+				const pstring &aname,       ///< name of terminal
+				nldelegate delegate ///< delegate
+		);
+
+		/// \brief returns voltage at terminal.
+		///  \returns voltage at terminal.
+		nl_fptype operator()() const noexcept { return Q_Analog(); }
+
+		/// \brief returns voltage at terminal.
+		///  \returns voltage at terminal.
+		nl_fptype Q_Analog() const noexcept
+		{
+			return net().Q_Analog();
+		}
+	};
+
+	// -----------------------------------------------------------------------------
+	// analog_output_t
+	// -----------------------------------------------------------------------------
+
+	class analog_output_t : public analog_t
+	{
+	public:
+		analog_output_t(core_device_t &dev, const pstring &aname);
+
+		void push(nl_fptype val) noexcept
+		{
+			if (val != m_my_net.Q_Analog())
+			{
+				m_my_net.set_Q_Analog(val);
+				m_my_net.toggle_and_push_to_queue(netlist_time::quantum());
+			}
+		}
+
+		void initial(nl_fptype val) noexcept;
+
+	private:
+		analog_net_t m_my_net;
+	};
+
+	inline solver::matrix_solver_t *analog_t::solver() const noexcept
+	{
+		return (this->has_net() ? net().solver() : nullptr);
+	}
+
+} // namespace netlist
+
+
+#endif // NL_CORE_ANALOG_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/base_objects.h mame-0.224+dfsg.1/src/lib/netlist/core/base_objects.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/base_objects.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/base_objects.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,286 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file param.h
+///
+
+#ifndef NL_CORE_BASE_OBJECTS_H_
+#define NL_CORE_BASE_OBJECTS_H_
+
+#include "netlist_state.h"
+#include "state_var.h"
+
+#include "../nltypes.h"
+
+#include "../plib/palloc.h"
+#include "../plib/pchrono.h"
+#include "../plib/pexception.h"
+#include "../plib/plists.h"
+#include "../plib/pmempool.h"
+
+#include <unordered_map>
+
+namespace netlist
+{
+
+	namespace detail {
+
+		template <typename C, typename T>
+		struct property_store_t
+		{
+			using value_type = T;
+			using key_type = const C *;
+			static void add(key_type obj, const value_type &aname) noexcept
+			{
+				store().insert({obj, aname});
+			}
+
+			static value_type *get(key_type obj) noexcept
+			{
+				try
+				{
+					auto ret(store().find(obj));
+					if (ret == store().end())
+						return nullptr;
+					return &ret->second;
+				}
+				catch (...)
+				{
+					plib::terminate("exception in property_store_t.get()");
+					return static_cast<value_type *>(nullptr);
+				}
+			}
+
+			static void remove(key_type obj) noexcept
+			{
+				store().erase(store().find(obj));
+			}
+
+			static std::unordered_map<key_type, value_type> &store() noexcept
+			{
+				static std::unordered_map<key_type, value_type> lstore;
+				return lstore;
+			}
+
+		};
+
+		// -----------------------------------------------------------------------------
+		// object_t
+		// -----------------------------------------------------------------------------
+
+		/// \brief The base class for netlist devices, terminals and parameters.
+		///
+		///  This class serves as the base class for all device, terminal and
+		///  objects.
+
+		class object_t
+		{
+		public:
+
+			/// \brief Constructor.
+			/// Every class derived from the object_t class must have a name.
+			///
+			/// \param aname string containing name of the object
+
+			explicit object_t(const pstring &aname)
+			{
+				props::add(this, aname);
+			}
+
+			PCOPYASSIGNMOVE(object_t, delete)
+			/// \brief return name of the object
+			///
+			/// \returns name of the object.
+
+			const pstring &name() const noexcept
+			{
+				return *props::get(this);
+			}
+
+		protected:
+
+			using props = property_store_t<object_t, pstring>;
+
+			// only childs should be destructible
+			~object_t() noexcept
+			{
+				props::remove(this);
+			}
+
+		private:
+		};
+
+		/// \brief Base class for all objects bejng owned by a netlist
+		///
+		/// The object provides adds \ref netlist_state_t and \ref netlist_t
+		/// accessors.
+		///
+
+		class netlist_object_t : public object_t
+		{
+		public:
+			explicit netlist_object_t(netlist_t &nl, const pstring &name)
+			: object_t(name)
+			, m_netlist(nl)
+			{ }
+
+			~netlist_object_t() = default;
+
+			PCOPYASSIGNMOVE(netlist_object_t, delete)
+
+			netlist_state_t & state() noexcept;
+			const netlist_state_t & state() const noexcept;
+
+			netlist_t & exec() noexcept { return m_netlist; }
+			const netlist_t & exec() const noexcept { return m_netlist; }
+
+			// to ease template design
+			template<typename T, typename... Args>
+			device_arena::unique_ptr<T> make_pool_object(Args&&... args)
+			{
+				return state().make_pool_object<T>(std::forward<Args>(args)...);
+			}
+
+		private:
+			netlist_t & m_netlist;
+
+		};
+
+		// -----------------------------------------------------------------------------
+		// device_object_t
+		// -----------------------------------------------------------------------------
+
+		/// \brief Base class for all objects being owned by a device.
+		///
+		/// Serves as the base class of all objects being owned by a device.
+		///
+		/// The class also supports device-less objects. In this case,
+		/// nullptr is passed in as the device object.
+		///
+
+		class device_object_t : public object_t
+		{
+		public:
+			/// \brief Constructor.
+			///
+			/// \param dev  pointer to device owning the object.
+			/// \param name string holding the name of the device
+
+			device_object_t(core_device_t *dev, const pstring &name);
+
+			/// \brief returns reference to owning device.
+			/// \returns reference to owning device.
+
+			core_device_t &device() noexcept { return *m_device; }
+			const core_device_t &device() const noexcept { return *m_device; }
+
+			/// \brief The netlist owning the owner of this object.
+			/// \returns reference to netlist object.
+
+			netlist_state_t &state() noexcept;
+			const netlist_state_t &state() const noexcept;
+
+		private:
+			core_device_t * m_device;
+		};
+
+		// -----------------------------------------------------------------------------
+		// core_terminal_t
+		// -----------------------------------------------------------------------------
+
+		/// \brief Base class for all terminals.
+		///
+		/// All terminals are derived from this class.
+		///
+		class core_terminal_t : public device_object_t,
+								public plib::linkedlist_t<core_terminal_t>::element_t
+		{
+		public:
+			/// \brief Number of signal bits
+			///
+			/// Going forward setting this to 8 will allow 8-bit signal
+			/// busses to be used in netlist, e.g. for more complex memory
+			/// arrangements.
+			/// Mimimum value is 2 here to support tristate output on proxies.
+			static constexpr const unsigned int INP_BITS = 2;
+
+			static constexpr const unsigned int INP_MASK = (1 << INP_BITS) - 1;
+			static constexpr const unsigned int INP_HL_SHIFT = 0;
+			static constexpr const unsigned int INP_LH_SHIFT = INP_BITS;
+
+			static constexpr netlist_sig_t OUT_TRISTATE() { return INP_MASK; }
+
+			static_assert(INP_BITS * 2 <= sizeof(netlist_sig_t) * 8, "netlist_sig_t size not sufficient");
+
+			enum state_e {
+				STATE_INP_PASSIVE = 0,
+				STATE_INP_HL      = (INP_MASK << INP_HL_SHIFT),
+				STATE_INP_LH      = (INP_MASK << INP_LH_SHIFT),
+				STATE_INP_ACTIVE  = STATE_INP_HL | STATE_INP_LH,
+				STATE_OUT         = (1 << (2*INP_BITS)),
+				STATE_BIDIR       = (1 << (2*INP_BITS + 1))
+			};
+
+			core_terminal_t(core_device_t &dev, const pstring &aname,
+					state_e state, nldelegate delegate);
+			virtual ~core_terminal_t() noexcept = default;
+
+			PCOPYASSIGNMOVE(core_terminal_t, delete)
+
+			/// \brief The object type.
+			/// \returns type of the object
+			terminal_type type() const noexcept(false);
+
+			/// \brief Checks if object is of specified type.
+			/// \param atype type to check object against.
+			/// \returns true if object is of specified type else false.
+			bool is_type(const terminal_type atype) const noexcept(false) { return (type() == atype); }
+
+			void set_net(net_t *anet) noexcept { m_net = anet; }
+			void clear_net() noexcept { m_net = nullptr; }
+			bool has_net() const noexcept { return (m_net != nullptr); }
+
+			net_t & net() const noexcept { return *m_net;}
+
+			bool is_logic() const noexcept;
+			bool is_logic_input() const noexcept;
+			bool is_logic_output() const noexcept;
+			bool is_tristate_output() const noexcept;
+			bool is_analog() const noexcept;
+			bool is_analog_input() const noexcept;
+			bool is_analog_output() const noexcept;
+
+			bool is_state(state_e astate) const noexcept { return (m_state == astate); }
+			state_e terminal_state() const noexcept { return m_state; }
+			void set_state(state_e astate) noexcept { m_state = astate; }
+
+			void reset() noexcept { set_state(is_type(terminal_type::OUTPUT) ? STATE_OUT : STATE_INP_ACTIVE); }
+
+	#if NL_USE_COPY_INSTEAD_OF_REFERENCE
+			void set_copied_input(netlist_sig_t val) noexcept
+			{
+				m_Q = val;
+			}
+
+			state_var_sig m_Q;
+	#else
+			void set_copied_input(netlist_sig_t val) const noexcept { plib::unused_var(val); } // NOLINT: static means more message elsewhere
+	#endif
+
+			void set_delegate(const nldelegate &delegate) noexcept { m_delegate = delegate; }
+			const nldelegate &delegate() const noexcept { return m_delegate; }
+			inline void run_delegate() noexcept { return m_delegate(); }
+		private:
+			nldelegate m_delegate;
+			net_t * m_net;
+			state_var<state_e> m_state;
+		};
+
+
+	} // namespace detail
+
+} // namespace netlist
+
+
+#endif // NL_CORE_BASE_OBJECTS_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/core_device.h mame-0.224+dfsg.1/src/lib/netlist/core/core_device.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/core_device.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/core_device.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,132 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file device.h
+///
+
+#ifndef NL_CORE_DEVICE_H_
+#define NL_CORE_DEVICE_H_
+
+#include "../nltypes.h"
+#include "../plib/pstring.h"
+#include "base_objects.h"
+#include "logic_family.h"
+
+namespace netlist
+{
+	// -----------------------------------------------------------------------------
+	// core_device_t
+	// -----------------------------------------------------------------------------
+	// FIXME: belongs into detail namespace
+	class core_device_t : public detail::netlist_object_t
+	{
+	public:
+		core_device_t(netlist_state_t &owner, const pstring &name);
+		core_device_t(core_device_t &owner, const pstring &name);
+
+		PCOPYASSIGNMOVE(core_device_t, delete)
+
+		virtual ~core_device_t() noexcept = default;
+
+		void do_inc_active() noexcept
+		{
+			if (m_hint_deactivate)
+			{
+				if (++m_active_outputs == 1)
+				{
+					if (m_stats)
+						m_stats->m_stat_inc_active.inc();
+					inc_active();
+				}
+			}
+		}
+
+		void do_dec_active() noexcept
+		{
+			if (m_hint_deactivate)
+				if (--m_active_outputs == 0)
+				{
+					dec_active();
+				}
+		}
+
+		void set_hint_deactivate(bool v) noexcept { m_hint_deactivate = v; }
+		bool get_hint_deactivate() const noexcept { return m_hint_deactivate; }
+		// Has to be set in device reset
+		void set_active_outputs(int n) noexcept { m_active_outputs = n; }
+
+		// stats
+		struct stats_t
+		{
+			// NL_KEEP_STATISTICS
+			plib::pperftime_t<true>  m_stat_total_time;
+			plib::pperfcount_t<true> m_stat_call_count;
+			plib::pperfcount_t<true> m_stat_inc_active;
+		};
+
+		stats_t * stats() const noexcept { return m_stats.get(); }
+
+		virtual void reset() { }
+
+		void handler_noop()
+		{
+		}
+
+	protected:
+
+		virtual void inc_active() noexcept {  }
+		virtual void dec_active() noexcept {  }
+
+		log_type & log();
+
+	public:
+		virtual void timestep(timestep_type ts_type, nl_fptype st) noexcept { plib::unused_var(ts_type, st); }
+		virtual void update_terminals() noexcept { }
+
+		virtual void update_param() noexcept {}
+		virtual bool is_dynamic() const noexcept { return false; }
+		virtual bool is_timestep() const noexcept { return false; }
+
+	private:
+		bool            m_hint_deactivate;
+		state_var_s32   m_active_outputs;
+		device_arena::unique_ptr<stats_t> m_stats;
+	};
+
+	// -----------------------------------------------------------------------------
+	// base_device_t
+	// -----------------------------------------------------------------------------
+
+	class base_device_t :   public core_device_t
+	{
+	public:
+		base_device_t(netlist_state_t &owner, const pstring &name);
+		base_device_t(base_device_t &owner, const pstring &name);
+
+		PCOPYASSIGNMOVE(base_device_t, delete)
+
+		~base_device_t() noexcept override = default;
+
+		template<class O, class C, typename... Args>
+		void create_and_register_subdevice(O& owner, const pstring &name, device_arena::unique_ptr<C> &dev, Args&&... args)
+		{
+			dev = state().make_pool_object<C>(owner, name, std::forward<Args>(args)...);
+		}
+
+		void register_subalias(const pstring &name, const detail::core_terminal_t &term);
+		void register_subalias(const pstring &name, const pstring &aliased);
+
+		void connect(const pstring &t1, const pstring &t2);
+		void connect(const detail::core_terminal_t &t1, const detail::core_terminal_t &t2);
+	protected:
+
+		//NETLIB_UPDATE_TERMINALSI() { }
+
+	private:
+	};
+
+} // namespace netlist
+
+
+#endif // NL_CORE_DEVICE_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/device.h mame-0.224+dfsg.1/src/lib/netlist/core/device.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/device.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/device.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,51 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file device.h
+///
+
+#ifndef NL_DEVICE_H_
+#define NL_DEVICE_H_
+
+#include "core_device.h"
+#include "param.h"
+
+namespace netlist
+{
+	// -----------------------------------------------------------------------------
+	// device_t
+	// -----------------------------------------------------------------------------
+
+	class device_t : public base_device_t,
+					 public logic_family_t
+	{
+	public:
+		device_t(netlist_state_t &owner, const pstring &name);
+		device_t(netlist_state_t &owner, const pstring &name,
+			const pstring &model);
+		// only needed by proxies
+		device_t(netlist_state_t &owner, const pstring &name,
+			const logic_family_desc_t *desc);
+
+		device_t(device_t &owner, const pstring &name);
+		// pass in a default model - this may be overwritten by PARAM(DEVICE.MODEL, "XYZ(...)")
+		device_t(device_t &owner, const pstring &name,
+			const pstring &model);
+
+		PCOPYASSIGNMOVE(device_t, delete)
+
+		~device_t() noexcept override = default;
+
+	protected:
+
+		//NETLIB_UPDATE_TERMINALSI() { }
+
+	private:
+		param_model_t m_model;
+	};
+
+} // namespace netlist
+
+
+#endif // NL_DEVICE_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/device_macros.h mame-0.224+dfsg.1/src/lib/netlist/core/device_macros.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/device_macros.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/device_macros.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,174 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#ifndef NL_CORE_DEVICE_MACROS_H_
+#define NL_CORE_DEVICE_MACROS_H_
+
+///
+/// \file device_macros.h
+///
+
+//============================================================
+//  MACROS / New Syntax
+//============================================================
+
+/// \brief Construct a netlist device name
+///
+#define NETLIB_NAME(chip) nld_ ## chip
+
+/// \brief Start a netlist device class.
+///
+/// Used to start defining a netlist device class.
+/// The simplest device without inputs or outputs would look like this:
+///
+///      NETLIB_OBJECT(some_object)
+///      {
+///      public:
+///          NETLIB_CONSTRUCTOR(some_object) { }
+///      };
+///
+///  Also refer to #NETLIB_CONSTRUCTOR.
+#define NETLIB_OBJECT(name)                                                    \
+class NETLIB_NAME(name) : public delegator_t<device_t>
+
+/// \brief Start a derived netlist device class.
+///
+/// Used to define a derived device class based on plcass.
+/// The simplest device without inputs or outputs would look like this:
+///
+///      NETLIB_OBJECT_DERIVED(some_object, parent_object)
+///      {
+///      public:
+///          NETLIB_CONSTRUCTOR(some_object) { }
+///      };
+///
+///  Also refer to #NETLIB_CONSTRUCTOR.
+#define NETLIB_OBJECT_DERIVED(name, pclass)                                   \
+class NETLIB_NAME(name) : public delegator_t<NETLIB_NAME(pclass)>
+
+
+
+// Only used for analog objects like diodes and resistors
+
+#define NETLIB_BASE_OBJECT(name)                                               \
+class NETLIB_NAME(name) : public delegator_t<base_device_t>
+
+#define NETLIB_CONSTRUCTOR_PASS(cname, ...)                                    \
+	using this_type = NETLIB_NAME(cname);                                      \
+	public: template <class CLASS> NETLIB_NAME(cname)(CLASS &owner, const pstring &name) \
+	: base_type(owner, name, __VA_ARGS__)
+
+/// \brief Used to define the constructor of a netlist device.
+///
+///  Use this to define the constructor of a netlist device. Please refer to
+///  #NETLIB_OBJECT for an example.
+#define NETLIB_CONSTRUCTOR(cname)                                              \
+	using this_type = NETLIB_NAME(cname);                                      \
+	public: template <class CLASS> NETLIB_NAME(cname)(CLASS &owner, const pstring &name)\
+		: base_type(owner, name)
+
+/// \brief Used to define the constructor of a netlist device and define a default model.
+///
+///
+///      NETLIB_CONSTRUCTOR_MODEL(some_object, "TTL")
+///      {
+///      public:
+///          NETLIB_CONSTRUCTOR(some_object) { }
+///      };
+///
+#define NETLIB_CONSTRUCTOR_MODEL(cname, cmodel)                                              \
+	using this_type = NETLIB_NAME(cname);                                      \
+	public: template <class CLASS> NETLIB_NAME(cname)(CLASS &owner, const pstring &name) \
+		: base_type(owner, name, cmodel)
+
+/// \brief Define an extended constructor and add further parameters to it.
+/// The macro allows to add further parameters to a device constructor. This is
+/// normally used for sub-devices and system devices only.
+#define NETLIB_CONSTRUCTOR_EX(cname, ...)                                      \
+	using this_type = NETLIB_NAME(cname);                                      \
+	public: template <class CLASS> NETLIB_NAME(cname)(CLASS &owner, const pstring &name, __VA_ARGS__) \
+		: base_type(owner, name)
+
+/// \brief Used to define the destructor of a netlist device.
+/// The use of a destructor for netlist device should normally not be necessary.
+#define NETLIB_DESTRUCTOR(name) public: virtual ~NETLIB_NAME(name)() noexcept override
+
+/// \brief Add this to a device definition to mark the device as dynamic.
+///
+///  If NETLIB_IS_DYNAMIC(true) is added to the device definition the device
+///  is treated as an analog dynamic device, i.e. \ref NETLIB_UPDATE_TERMINALSI
+///  is called on a each step of the Newton-Raphson step
+///  of solving the linear equations.
+///
+///  You may also use e.g. NETLIB_IS_DYNAMIC(m_func() != "") to only make the
+///  device a dynamic device if parameter m_func is set.
+///
+///  \param expr boolean expression
+///
+#define NETLIB_IS_DYNAMIC(expr)                                                \
+	public: virtual bool is_dynamic() const noexcept override { return expr; }
+
+/// \brief Add this to a device definition to mark the device as a time-stepping device.
+///
+///  You have to implement NETLIB_TIMESTEP in this case as well. Currently, only
+///  the capacitor and inductor devices uses this.
+///
+///  You may also use e.g. NETLIB_IS_TIMESTEP(m_func() != "") to only make the
+///  device a dynamic device if parameter m_func is set. This is used by the
+///  Voltage Source element.
+///
+///  Example:
+///
+///  \code
+///  NETLIB_TIMESTEP_IS_TIMESTEP()
+///  NETLIB_TIMESTEPI()
+///  {
+///      // Gpar should support convergence
+///      const nl_fptype G = m_C.Value() / step +  m_GParallel;
+///      const nl_fptype I = -G/// deltaV();
+///      set(G, 0.0, I);
+///  }
+///  \endcode
+
+#define NETLIB_IS_TIMESTEP(expr)                                               \
+	public: virtual bool is_timestep() const  noexcept override { return expr; }
+
+/// \brief Used to implement the time stepping code.
+///
+/// Please see \ref NETLIB_IS_TIMESTEP for an example.
+
+#define NETLIB_TIMESTEPI()                                                     \
+	public: virtual void timestep(timestep_type ts_type, nl_fptype step)  noexcept override
+
+/// \brief Used to implement the body of the time stepping code.
+///
+/// Used when the implementation is outside the class definition
+///
+/// Please see \ref NETLIB_IS_TIMESTEP for an example.
+///
+/// \param cname Name of object as given to \ref NETLIB_OBJECT
+///
+#define NETLIB_TIMESTEP(cname)                                                 \
+	void NETLIB_NAME(cname) :: timestep(timestep_type ts_type, nl_fptype step) noexcept
+
+#define NETLIB_DELEGATE(name) nldelegate(&this_type :: name, this)
+
+#define NETLIB_DELEGATE_NOOP() nldelegate(&core_device_t::handler_noop, static_cast<core_device_t *>(this))
+
+#define NETLIB_UPDATE_TERMINALSI() virtual void update_terminals() noexcept override
+#define NETLIB_HANDLERI(name) void name() noexcept
+#define NETLIB_UPDATE_PARAMI() virtual void update_param() noexcept override
+#define NETLIB_RESETI() virtual void reset() override
+
+#define NETLIB_SUB(chip) nld_ ## chip
+#define NETLIB_SUB_UPTR(ns, chip) device_arena::unique_ptr< ns :: nld_ ## chip >
+
+#define NETLIB_HANDLER(chip, name) void NETLIB_NAME(chip) :: name() noexcept
+
+#define NETLIB_RESET(chip) void NETLIB_NAME(chip) :: reset(void)
+
+#define NETLIB_UPDATE_PARAM(chip) void NETLIB_NAME(chip) :: update_param() noexcept
+
+#define NETLIB_UPDATE_TERMINALS(chip) void NETLIB_NAME(chip) :: update_terminals() noexcept
+
+#endif // NL_CORE_DEVICE_MACROS_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/devices.h mame-0.224+dfsg.1/src/lib/netlist/core/devices.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/devices.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/devices.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,177 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#ifndef NL_CORE_DEVICES_H_
+#define NL_CORE_DEVICES_H_
+
+///
+/// \file devices.h
+///
+/// The core is accessing members or type definitions of devices defined
+/// here directly (e.g. nld_nc_pin).
+///
+
+#if 0
+#include "core/base_objects.h"
+#include "core/logic.h"
+#include "core/logic_family.h"
+#include "core/netlist_state.h"
+#include "core/nets.h"
+#include "core/object_array.h"
+#include "core/param.h"
+#include "core/state_var.h"
+#include "core/exec.h"
+#endif
+#include "analog.h"
+#include "device.h"
+#include "device_macros.h"
+
+//============================================================
+// Namespace starts
+//============================================================
+
+namespace netlist
+{
+	namespace devices
+	{
+		// -----------------------------------------------------------------------------
+		// mainclock
+		// -----------------------------------------------------------------------------
+
+		NETLIB_OBJECT(mainclock)
+		{
+			NETLIB_CONSTRUCTOR(mainclock)
+			, m_Q(*this, "Q")
+			, m_freq(*this, "FREQ", nlconst::magic(7159000.0 * 5))
+			{
+				m_inc = netlist_time::from_fp(plib::reciprocal(m_freq()*nlconst::two()));
+			}
+
+			NETLIB_RESETI()
+			{
+				m_Q.net().set_next_scheduled_time(exec().time());
+			}
+
+			NETLIB_UPDATE_PARAMI()
+			{
+				m_inc = netlist_time::from_fp(plib::reciprocal(m_freq()*nlconst::two()));
+			}
+
+		public:
+			logic_output_t m_Q; // NOLINT: needed in core
+			netlist_time m_inc; // NOLINT: needed in core
+		private:
+			param_fp_t m_freq;
+		};
+
+		// -----------------------------------------------------------------------------
+		// power pins - not a device, but a helper
+		// -----------------------------------------------------------------------------
+
+		/// \brief Power pins class.
+		///
+		/// Power Pins are passive inputs. Delegate noop will silently ignore any
+		/// updates.
+
+		class nld_power_pins
+		{
+		public:
+			using this_type = nld_power_pins;
+
+			explicit nld_power_pins(device_t &owner)
+			: m_VCC(owner, owner.logic_family()->vcc_pin(), NETLIB_DELEGATE(noop))
+			, m_GND(owner, owner.logic_family()->gnd_pin(), NETLIB_DELEGATE(noop))
+			{
+			}
+
+			// Some devices like the 74LS629 have two pairs of supply pins.
+			explicit nld_power_pins(device_t &owner,
+				const pstring &vcc, const pstring &gnd)
+			: m_VCC(owner, vcc, NETLIB_DELEGATE(noop))
+			, m_GND(owner, gnd, NETLIB_DELEGATE(noop))
+			{
+			}
+
+			const analog_input_t &VCC() const noexcept
+			{
+				return m_VCC;
+			}
+			const analog_input_t &GND() const noexcept
+			{
+				return m_GND;
+			}
+
+		private:
+			void noop() { }
+			analog_input_t m_VCC;
+			analog_input_t m_GND;
+		};
+
+		// -----------------------------------------------------------------------------
+		// netlistparams
+		// -----------------------------------------------------------------------------
+
+		NETLIB_OBJECT(netlistparams)
+		{
+			NETLIB_CONSTRUCTOR(netlistparams)
+			, m_use_deactivate(*this, "USE_DEACTIVATE", false)
+			, m_startup_strategy(*this, "STARTUP_STRATEGY", 0)
+			, m_mos_capmodel(*this, "DEFAULT_MOS_CAPMODEL", 2)
+			, m_max_link_loops(*this, "MAX_LINK_RESOLVE_LOOPS", 100)
+			{
+			}
+			//NETLIB_RESETI() {}
+			//NETLIB_UPDATE_PARAMI() { }
+		public:
+			param_logic_t m_use_deactivate;
+			param_num_t<unsigned>   m_startup_strategy;
+			param_num_t<unsigned>   m_mos_capmodel;
+			//! How many times do we try to resolve links (connections)
+			param_num_t<unsigned>   m_max_link_loops;
+		};
+
+		// -----------------------------------------------------------------------------
+		// nld_nc_pin
+		// -----------------------------------------------------------------------------
+
+		NETLIB_OBJECT(nc_pin)
+		{
+		public:
+			NETLIB_CONSTRUCTOR(nc_pin)
+			, m_I(*this, "I", NETLIB_DELEGATE_NOOP())
+			{
+			}
+
+		protected:
+			//NETLIB_RESETI() {}
+
+		private:
+			analog_input_t m_I;
+
+		};
+
+		// -----------------------------------------------------------------------------
+		// nld_gnd
+		// -----------------------------------------------------------------------------
+
+		NETLIB_OBJECT(gnd)
+		{
+			NETLIB_CONSTRUCTOR(gnd)
+			, m_Q(*this, "Q")
+			{
+			}
+
+			NETLIB_UPDATE_PARAMI()
+			{
+				m_Q.push(nlconst::zero());
+			}
+
+			//NETLIB_RESETI() {}
+		protected:
+			analog_output_t m_Q;
+		};
+
+	} // namespace devices
+} // namespace netlist
+
+#endif // NL_CORE_DEVICES_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/exec.h mame-0.224+dfsg.1/src/lib/netlist/core/exec.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/exec.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/exec.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,120 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file exec.h
+///
+
+#ifndef NL_CORE_EXEC_H_
+#define NL_CORE_EXEC_H_
+
+#include "base_objects.h"
+#include "state_var.h"
+
+#include "../nltypes.h"
+#include "../plib/plists.h"
+#include "../plib/pstring.h"
+
+namespace netlist
+{
+	// -----------------------------------------------------------------------------
+	// netlist_t
+	// -----------------------------------------------------------------------------
+
+	class netlist_t // NOLINT(clang-analyzer-optin.performance.Padding)
+	{
+	public:
+
+		explicit netlist_t(netlist_state_t &state, const pstring &aname);
+
+		PCOPYASSIGNMOVE(netlist_t, delete)
+
+		virtual ~netlist_t() noexcept = default;
+
+		// run functions
+
+		netlist_time_ext time() const noexcept { return m_time; }
+
+		void process_queue(netlist_time_ext delta) noexcept;
+		void abort_current_queue_slice() noexcept
+		{
+			if (!NL_USE_QUEUE_STATS || !m_use_stats)
+				m_queue.retime<false>(detail::queue_t::entry_t(m_time, nullptr));
+			else
+				m_queue.retime<true>(detail::queue_t::entry_t(m_time, nullptr));
+		}
+
+		const detail::queue_t &queue() const noexcept { return m_queue; }
+
+		template<typename... Args>
+		void qpush(Args&&...args) noexcept
+		{
+			if (!NL_USE_QUEUE_STATS || !m_use_stats)
+				m_queue.emplace<false>(std::forward<Args>(args)...); // NOLINT(performance-move-const-arg)
+			else
+				m_queue.emplace<true>(std::forward<Args>(args)...); // NOLINT(performance-move-const-arg)
+		}
+
+		template <class R>
+		void qremove(const R &elem) noexcept
+		{
+			if (!NL_USE_QUEUE_STATS || !m_use_stats)
+				m_queue.remove<false>(elem);
+			else
+				m_queue.remove<true>(elem);
+		}
+
+		// Control functions
+
+		void stop();
+		void reset();
+
+		// only used by nltool to create static c-code
+		devices::nld_solver *solver() const noexcept { return m_solver; }
+
+		// force late type resolution
+		template <typename X = devices::nld_solver>
+		nl_fptype gmin(X *solv = nullptr) const noexcept
+		{
+			plib::unused_var(solv);
+			return static_cast<X *>(m_solver)->gmin();
+		}
+
+		netlist_state_t &nlstate() noexcept { return m_state; }
+		const netlist_state_t &nlstate() const noexcept { return m_state; }
+
+		log_type & log() noexcept { return m_state.log(); }
+		const log_type &log() const noexcept { return m_state.log(); }
+
+		void print_stats() const;
+		bool use_stats() const { return m_use_stats; }
+
+		bool stats_enabled() const noexcept { return m_use_stats; }
+		void enable_stats(bool val) noexcept { m_use_stats = val; }
+
+	private:
+
+		template <bool KEEP_STATS>
+		void process_queue_stats(netlist_time_ext delta) noexcept;
+
+		netlist_state_t &                   m_state;
+		devices::nld_solver *               m_solver;
+
+		// mostly rw
+		//PALIGNAS(16)
+		netlist_time_ext                    m_time;
+		devices::nld_mainclock *            m_mainclock;
+
+		//PALIGNAS_CACHELINE()
+		//PALIGNAS(16)
+		detail::queue_t                     m_queue;
+		bool                                m_use_stats;
+		// performance
+		plib::pperftime_t<true>             m_stat_mainloop;
+		plib::pperfcount_t<true>            m_perf_out_processed;
+	};
+
+} // namespace netlist
+
+
+#endif // NL_CORE_EXEC_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/logic_family.h mame-0.224+dfsg.1/src/lib/netlist/core/logic_family.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/logic_family.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/logic_family.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,93 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file logic_family.h
+///
+
+#ifndef NL_CORE_LOGIC_FAMILY_H_
+#define NL_CORE_LOGIC_FAMILY_H_
+
+#include "../nltypes.h"
+#include "../plib/pstring.h"
+
+namespace netlist
+{
+	/// \brief Logic families descriptors are used to create proxy devices.
+	///  The logic family describes the analog capabilities of logic devices,
+	///  inputs and outputs.
+
+	class logic_family_desc_t
+	{
+	public:
+		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init, modernize-use-equals-default)
+		logic_family_desc_t()
+		{
+		}
+
+		PCOPYASSIGNMOVE(logic_family_desc_t, delete)
+
+		virtual ~logic_family_desc_t() noexcept = default;
+
+		virtual device_arena::unique_ptr<devices::nld_base_d_to_a_proxy> create_d_a_proxy(netlist_state_t &anetlist, const pstring &name,
+				const logic_output_t *proxied) const = 0;
+		virtual device_arena::unique_ptr<devices::nld_base_a_to_d_proxy> create_a_d_proxy(netlist_state_t &anetlist, const pstring &name,
+				const logic_input_t *proxied) const = 0;
+
+		nl_fptype low_thresh_V(nl_fptype VN, nl_fptype VP) const noexcept{ return VN + (VP - VN) * m_low_thresh_PCNT; }
+		nl_fptype high_thresh_V(nl_fptype VN, nl_fptype VP) const noexcept{ return VN + (VP - VN) * m_high_thresh_PCNT; }
+		nl_fptype low_offset_V() const noexcept{ return m_low_VO; }
+		nl_fptype high_offset_V() const noexcept{ return m_high_VO; }
+		nl_fptype R_low() const noexcept{ return m_R_low; }
+		nl_fptype R_high() const noexcept{ return m_R_high; }
+
+		bool is_above_high_thresh_V(nl_fptype V, nl_fptype VN, nl_fptype VP) const noexcept
+		{ return V > high_thresh_V(VN, VP); }
+
+		bool is_below_low_thresh_V(nl_fptype V, nl_fptype VN, nl_fptype VP) const noexcept
+		{ return V < low_thresh_V(VN, VP); }
+
+		pstring vcc_pin() const { return pstring(m_vcc); }
+		pstring gnd_pin() const { return pstring(m_gnd); }
+
+		nl_fptype m_low_thresh_PCNT;   //!< low input threshhold offset. If the input voltage is below this value times supply voltage, a "0" input is signalled
+		nl_fptype m_high_thresh_PCNT;  //!< high input threshhold offset. If the input voltage is above the value times supply voltage, a "0" input is signalled
+		nl_fptype m_low_VO;            //!< low output voltage offset. This voltage is output if the ouput is "0"
+		nl_fptype m_high_VO;           //!< high output voltage offset. The supply voltage minus this offset is output if the ouput is "1"
+		nl_fptype m_R_low;             //!< low output resistance. Value of series resistor used for low output
+		nl_fptype m_R_high;            //!< high output resistance. Value of series resistor used for high output
+		const char *m_vcc;             //!< default power pin name for positive supply
+		const char *m_gnd;             //!< default power pin name for negative supply
+	};
+
+	/// \brief Base class for devices, terminals, outputs and inputs which support
+	///  logic families.
+	///  This class is a storage container to store the logic family for a
+	///  netlist object. You will not directly use it. Please refer to
+	///  \ref NETLIB_FAMILY to learn how to define a logic family for a device.
+	///
+	/// All terminals inherit the family description from the device
+	/// The default is the ttl family, but any device can override the family.
+	/// For individual terminals, the family can be overwritten as well.
+	///
+
+	class logic_family_t
+	{
+	public:
+		logic_family_t() : m_logic_family(nullptr) {}
+		logic_family_t(const logic_family_desc_t *d) : m_logic_family(d) {}
+		PCOPYASSIGNMOVE(logic_family_t, delete)
+
+		const logic_family_desc_t *logic_family() const noexcept { return m_logic_family; }
+		void set_logic_family(const logic_family_desc_t *fam) noexcept { m_logic_family = fam; }
+
+	protected:
+		~logic_family_t() noexcept = default; // prohibit polymorphic destruction
+	private:
+		const logic_family_desc_t *m_logic_family;
+	};
+
+} // namespace netlist
+
+
+#endif // NL_CORE_LOGIC_FAMILY_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/logic.h mame-0.224+dfsg.1/src/lib/netlist/core/logic.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/logic.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/logic.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,208 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file param.h
+///
+
+#ifndef NL_CORE_LOGIC_H_
+#define NL_CORE_LOGIC_H_
+
+#include "../nltypes.h"
+#include "base_objects.h"
+#include "logic_family.h"
+#include "nets.h"
+#include "state_var.h"
+
+#include "../plib/plists.h"
+#include "../plib/pstring.h"
+
+#include <array>
+#include <utility>
+
+namespace netlist
+{
+	// -----------------------------------------------------------------------------
+	// logic_t
+	// -----------------------------------------------------------------------------
+
+	class logic_t : public detail::core_terminal_t, public logic_family_t
+	{
+	public:
+		logic_t(device_t &dev, const pstring &aname,
+				state_e terminal_state, nldelegate delegate);
+
+		logic_net_t & net() noexcept
+		{
+			return plib::downcast<logic_net_t &>(core_terminal_t::net());
+		}
+		const logic_net_t &  net() const noexcept
+		{
+			return plib::downcast<const logic_net_t &>(core_terminal_t::net());
+		}
+	};
+
+	// -----------------------------------------------------------------------------
+	// logic_input_t
+	// -----------------------------------------------------------------------------
+
+	class logic_input_t : public logic_t
+	{
+	public:
+		logic_input_t(device_t &dev, const pstring &aname,
+				nldelegate delegate);
+
+		inline netlist_sig_t operator()() const noexcept
+		{
+			nl_assert(terminal_state() != STATE_INP_PASSIVE);
+	#if NL_USE_COPY_INSTEAD_OF_REFERENCE
+			return m_Q;
+	#else
+			return net().Q();
+	#endif
+		}
+
+		void inactivate() noexcept
+		{
+			if (!is_state(STATE_INP_PASSIVE))
+			{
+				set_state(STATE_INP_PASSIVE);
+				net().remove_from_active_list(*this);
+			}
+		}
+
+		void activate() noexcept
+		{
+			if (is_state(STATE_INP_PASSIVE))
+			{
+				net().add_to_active_list(*this);
+				set_state(STATE_INP_ACTIVE);
+			}
+		}
+
+		void activate_hl() noexcept
+		{
+			if (is_state(STATE_INP_PASSIVE))
+			{
+				net().add_to_active_list(*this);
+				set_state(STATE_INP_HL);
+			}
+		}
+
+		void activate_lh() noexcept
+		{
+			if (is_state(STATE_INP_PASSIVE))
+			{
+				net().add_to_active_list(*this);
+				set_state(STATE_INP_LH);
+			}
+		}
+	};
+
+	// -----------------------------------------------------------------------------
+	// logic_output_t
+	// -----------------------------------------------------------------------------
+
+	class logic_output_t : public logic_t
+	{
+	public:
+
+		/// \brief logic output constructor
+		///
+		/// The third parameter does nothing. It is provided only for
+		/// compatibility with tristate_output_t in templatized device models
+		///
+		/// \param dev Device owning this output
+		/// \param aname The name of this output
+		/// \param dummy Dummy parameter to allow construction like tristate output
+		///
+		logic_output_t(device_t &dev, const pstring &aname, bool dummy = false);
+
+		void initial(netlist_sig_t val) noexcept;
+
+		inline void push(const netlist_sig_t &newQ, const netlist_time &delay) noexcept
+		{
+			m_my_net.set_Q_and_push(newQ, delay); // take the shortcut
+		}
+
+		inline void set_Q_time(const netlist_sig_t &newQ, const netlist_time_ext &at) noexcept
+		{
+			m_my_net.set_Q_time(newQ, at); // take the shortcut
+		}
+
+		/// \brief Dummy implementation for templatized generic devices
+		///
+		/// This function shall never be called. It is defined here so that
+		/// templatized generic device models do not have to do tons of
+		/// template magic.
+		///
+		/// This function terminates if actually called.
+		///
+		[[noreturn]] static void set_tristate(netlist_sig_t v,
+			netlist_time ts_off_on, netlist_time ts_on_off)
+		{
+			plib::unused_var(v, ts_off_on, ts_on_off);
+			plib::terminate("set_tristate on logic_output should never be called!");
+		}
+	private:
+		logic_net_t m_my_net;
+	};
+
+	// -----------------------------------------------------------------------------
+	// tristate_output_t
+	// -----------------------------------------------------------------------------
+
+	/// \brief Tristate output
+	///
+	/// In a lot of applications tristate enable inputs are just connected to
+	/// VCC/GND to permanently enable the outputs. In this case a pure
+	/// implementation using analog outputs would not perform well.
+	///
+	/// For this object during creation it can be decided if a logic output or
+	/// a tristate output is used. Generally the owning device uses parameter
+	/// FORCE_TRISTATE_LOGIC to determine this.
+	///
+	/// This is the preferred way to implement tristate outputs.
+	///
+
+	class tristate_output_t : public logic_output_t
+	{
+	public:
+
+		tristate_output_t(device_t &dev, const pstring &aname, bool force_logic);
+
+		void push(netlist_sig_t newQ, netlist_time delay) noexcept
+		{
+			if (!m_tristate)
+				logic_output_t::push(newQ, delay);
+			m_last_logic = newQ;
+		}
+
+		void set_tristate(netlist_sig_t v,
+			netlist_time ts_off_on, netlist_time ts_on_off) noexcept
+		{
+			if (!m_force_logic)
+				if (v != m_tristate)
+				{
+					logic_output_t::push((v != 0) ? OUT_TRISTATE() : m_last_logic, v ? ts_off_on : ts_on_off);
+					m_tristate = v;
+				}
+		}
+
+		bool is_force_logic() const noexcept
+		{
+			return m_force_logic;
+		}
+
+	private:
+		using logic_output_t::initial;
+		using logic_output_t::set_Q_time;
+		state_var<netlist_sig_t> m_last_logic;
+		state_var<netlist_sig_t> m_tristate;
+		bool m_force_logic;
+	};
+
+} // namespace netlist
+
+
+#endif // NL_CORE_LOGIC_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/netlist_state.h mame-0.224+dfsg.1/src/lib/netlist/core/netlist_state.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/netlist_state.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/netlist_state.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,275 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file netlist_state.h
+///
+
+#ifndef NL_CORE_NETLIST_STATE_H_
+#define NL_CORE_NETLIST_STATE_H_
+
+#include "queue.h"
+
+#include "../nltypes.h"
+
+#include "../plib/plists.h"
+#include "../plib/pstate.h"
+#include "../plib/pstring.h"
+
+#include <array>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+namespace netlist
+{
+	// -----------------------------------------------------------------------------
+	// netlist_state__t
+	// -----------------------------------------------------------------------------
+
+	class netlist_state_t
+	{
+	public:
+
+		using nets_collection_type = std::vector<device_arena::owned_ptr<detail::net_t>>;
+		using family_collection_type = std::unordered_map<pstring, host_arena::unique_ptr<logic_family_desc_t>>;
+
+		// need to preserve order of device creation ...
+		using devices_collection_type = std::vector<std::pair<pstring, device_arena::owned_ptr<core_device_t>>>;
+		netlist_state_t(const pstring &name, host_arena::unique_ptr<callbacks_t> &&callbacks);
+
+		PCOPYASSIGNMOVE(netlist_state_t, delete)
+
+		/// \brief Destructor
+		///
+		/// The destructor is virtual to allow implementation specific devices
+		/// to connect to the outside world. For examples see MAME netlist.cpp.
+		///
+		virtual ~netlist_state_t() noexcept = default;
+
+		template<class C>
+		static bool check_class(core_device_t *p) noexcept
+		{
+			return dynamic_cast<C *>(p) != nullptr;
+		}
+
+		core_device_t *get_single_device(const pstring &classname, bool (*cc)(core_device_t *)) const noexcept(false);
+
+		/// \brief Get single device filtered by class and name
+		///
+		/// \tparam C Device class for which devices will be returned
+		/// \param  name Name of the device
+		///
+		/// \return pointers to device
+
+		template<class C>
+		C *get_single_device(const pstring &name) const
+		{
+			return dynamic_cast<C *>(get_single_device(name, check_class<C>));
+		}
+
+		/// \brief Get vector of devices
+		///
+		/// \tparam C Device class for which devices will be returned
+		///
+		/// \return vector with pointers to devices
+
+		template<class C>
+		inline std::vector<C *> get_device_list() const
+		{
+			std::vector<C *> tmp;
+			for (const auto &d : m_devices)
+			{
+				auto * const dev = dynamic_cast<C *>(d.second.get());
+				if (dev != nullptr)
+					tmp.push_back(dev);
+			}
+			return tmp;
+		}
+
+		// logging
+
+		log_type & log() noexcept { return m_log; }
+		const log_type &log() const noexcept { return m_log; }
+
+		plib::dynlib_base &lib() const noexcept { return *m_lib; }
+
+		netlist_t &exec() noexcept { return *m_netlist; }
+		const netlist_t &exec() const noexcept { return *m_netlist; }
+
+		// state handling
+		plib::state_manager_t &run_state_manager() noexcept { return m_state; }
+
+		template<typename O, typename C>
+		void save(O &owner, C &state, const pstring &module, const pstring &stname)
+		{
+			this->run_state_manager().save_item(static_cast<void *>(&owner), state, module + "." + stname);
+		}
+
+		template<typename O, typename C>
+		void save(O &owner, C *state, const pstring &module, const pstring &stname, const std::size_t count)
+		{
+			this->run_state_manager().save_state_ptr(static_cast<void *>(&owner), module + "." + stname, plib::state_manager_t::dtype<C>(), count, state);
+		}
+
+		// FIXME: only used by queue_t save state
+		std::size_t find_net_id(const detail::net_t *net) const;
+		detail::net_t *net_by_id(std::size_t id) const;
+
+		template <typename T>
+		void register_net(device_arena::owned_ptr<T> &&net) { m_nets.push_back(std::move(net)); }
+
+		/// \brief Get device pointer by name
+		///
+		///
+		/// \param name Name of the device
+		///
+		/// \return core_device_t pointer if device exists, else nullptr
+
+		core_device_t *find_device(const pstring &name) const
+		{
+			for (const auto & d : m_devices)
+				if (d.first == name)
+					return d.second.get();
+			return nullptr;
+		}
+
+		/// \brief Register device using owned_ptr
+		///
+		/// Used to register owned devices. These are devices declared as objects
+		/// in another devices.
+		///
+		/// \param name Name of the device
+		/// \param dev Device to be registered
+
+		template <typename T>
+		void register_device(const pstring &name, device_arena::owned_ptr<T> &&dev) noexcept(false)
+		{
+			for (auto & d : m_devices)
+				if (d.first == name)
+				{
+					dev.release();
+					log().fatal(MF_DUPLICATE_NAME_DEVICE_LIST(name));
+					throw nl_exception(MF_DUPLICATE_NAME_DEVICE_LIST(name));
+				}
+			//m_devices.push_back(std::move(dev));
+			m_devices.insert(m_devices.end(), { name, std::move(dev) });
+		}
+
+		/// \brief Register device using unique_ptr
+		///
+		/// Used to register devices.
+		///
+		/// \param name Name of the device
+		/// \param dev Device to be registered
+
+		template <typename T>
+		void register_device(const pstring &name, device_arena::unique_ptr<T> &&dev)
+		{
+			register_device(name, device_arena::owned_ptr<T>(dev.release(), true, dev.get_deleter()));
+		}
+
+		/// \brief Remove device
+		///
+		/// Care needs to be applied if this is called to remove devices with
+		/// sub-devices which may have registered state.
+		///
+		/// \param dev Device to be removed
+
+		void remove_device(core_device_t *dev);
+
+		setup_t &setup() noexcept { return *m_setup; }
+		const setup_t &setup() const noexcept { return *m_setup; }
+
+		nlparse_t &parser();
+		const nlparse_t &parser() const;
+
+		// FIXME: make a postload member and include code there
+		void rebuild_lists(); // must be called after post_load !
+
+		static void compile_defines(std::vector<std::pair<pstring, pstring>> &defs);
+		static pstring version();
+		static pstring version_patchlevel();
+
+		nets_collection_type & nets() noexcept { return m_nets; }
+		const nets_collection_type & nets() const noexcept { return m_nets; }
+
+		devices_collection_type & devices() noexcept { return m_devices; }
+		const devices_collection_type & devices() const noexcept { return m_devices; }
+
+		family_collection_type &family_cache() { return m_family_cache; }
+
+		template<typename T, typename... Args>
+		device_arena::unique_ptr<T> make_pool_object(Args&&... args)
+		{
+			return plib::make_unique<T>(m_pool, std::forward<Args>(args)...);
+		}
+		// memory pool - still needed in some places
+		device_arena &pool() noexcept { return m_pool; }
+		const device_arena &pool() const noexcept { return m_pool; }
+
+		/// \brief set extended validation mode.
+		///
+		/// The extended validation mode is not intended for running.
+		/// The intention is to identify power pins which are not properly
+		/// connected. The downside is that this mode creates a netlist which
+		/// is different (and not able to run).
+		///
+		/// Extended validation is supported by nltool validate option.
+		///
+		/// \param val Boolean value enabling/disabling extended validation mode
+		void set_extended_validation(bool val) { m_extended_validation = val; }
+
+		/// \brief State of extended validation mode.
+		///
+		/// \returns boolean value indicating if extended validation mode is
+		/// turned on.
+		bool is_extended_validation() const { return m_extended_validation; }
+
+		struct stats_info
+		{
+			const detail::queue_t               &m_queue;// performance
+			const plib::pperftime_t<true>       &m_stat_mainloop;
+			const plib::pperfcount_t<true>      &m_perf_out_processed;
+		};
+
+		/// \brief print statistics gathered during run
+		///
+		void print_stats(stats_info &si) const;
+
+		/// \brief call reset on all netlist components
+		///
+		void reset();
+
+		/// \brief prior to running free no longer needed resources
+		///
+		void free_setup_resources();
+
+	private:
+
+		device_arena                               m_pool; // must be deleted last!
+
+		device_arena::unique_ptr<netlist_t>        m_netlist;
+		std::unique_ptr<plib::dynlib_base>         m_lib;
+		plib::state_manager_t                      m_state;
+		host_arena::unique_ptr<callbacks_t>        m_callbacks;
+		log_type                                   m_log;
+
+		// FIXME: should only be available during device construcion
+		host_arena::unique_ptr<setup_t>            m_setup;
+
+		nets_collection_type                       m_nets;
+		// sole use is to manage lifetime of net objects
+		devices_collection_type                    m_devices;
+		// sole use is to manage lifetime of family objects
+		family_collection_type                     m_family_cache;
+		bool                                       m_extended_validation;
+
+		// dummy version
+		int                                        m_dummy_version;
+	};
+
+} // namespace netlist
+
+
+#endif // NL_CORE_NETLIST_STATE_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/nets.h mame-0.224+dfsg.1/src/lib/netlist/core/nets.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/nets.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/nets.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,293 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file nets.h
+///
+
+#ifndef NL_CORE_NETS_H_
+#define NL_CORE_NETS_H_
+
+#include "base_objects.h"
+#include "state_var.h"
+#include "core_device.h"
+#include "exec.h"
+
+#include "../nltypes.h"
+#include "../plib/plists.h"
+#include "../plib/pstring.h"
+
+namespace netlist
+{
+
+	namespace detail {
+
+		// -----------------------------------------------------------------------------
+		// net_t
+		// -----------------------------------------------------------------------------
+
+		class net_t : public netlist_object_t
+		{
+		public:
+
+			enum class queue_status
+			{
+				DELAYED_DUE_TO_INACTIVE = 0,
+				QUEUED,
+				DELIVERED
+			};
+
+			net_t(netlist_state_t &nl, const pstring &aname, core_terminal_t *railterminal = nullptr);
+
+			PCOPYASSIGNMOVE(net_t, delete)
+
+			virtual ~net_t() noexcept = default;
+
+			virtual void reset() noexcept;
+
+			// -----------------------------------------------------------------------------
+			// Hot section
+			//
+			// Any changes below will impact performance.
+			// -----------------------------------------------------------------------------
+
+			void toggle_new_Q() noexcept { m_new_Q = (m_cur_Q ^ 1);   }
+
+			void toggle_and_push_to_queue(const netlist_time &delay) noexcept
+			{
+				toggle_new_Q();
+				push_to_queue(delay);
+			}
+
+			void push_to_queue(const netlist_time &delay) noexcept
+			{
+				if (has_connections())
+				{
+					if (!!is_queued())
+						exec().qremove(this);
+
+					const auto nst(exec().time() + delay);
+					m_next_scheduled_time = nst;
+
+					if (!m_list_active.empty())
+					{
+						m_in_queue = queue_status::QUEUED;
+						exec().qpush(nst, this);
+					}
+					else
+					{
+						m_in_queue = queue_status::DELAYED_DUE_TO_INACTIVE;
+						update_inputs();
+					}
+				}
+			}
+			NVCC_CONSTEXPR bool is_queued() const noexcept { return m_in_queue == queue_status::QUEUED; }
+
+			template <bool KEEP_STATS>
+			inline void update_devs() noexcept
+			{
+				nl_assert(this->is_rail_net());
+
+				m_in_queue = queue_status::DELIVERED; // mark as taken ...
+				if (m_new_Q ^ m_cur_Q)
+				{
+					process<KEEP_STATS>((m_new_Q << core_terminal_t::INP_LH_SHIFT)
+						| (m_cur_Q << core_terminal_t::INP_HL_SHIFT), m_new_Q);
+				}
+			}
+
+			netlist_time_ext next_scheduled_time() const noexcept { return m_next_scheduled_time; }
+			void set_next_scheduled_time(netlist_time_ext ntime) noexcept { m_next_scheduled_time = ntime; }
+
+			NVCC_CONSTEXPR bool is_rail_net() const noexcept { return !(m_railterminal == nullptr); }
+			core_terminal_t & railterminal() const noexcept { return *m_railterminal; }
+
+			bool has_connections() const noexcept { return !m_core_terms.empty(); }
+
+			void add_to_active_list(core_terminal_t &term) noexcept
+			{
+				if (!m_list_active.empty())
+				{
+					term.set_copied_input(m_cur_Q);
+					m_list_active.push_front(&term);
+				}
+				else
+				{
+					m_list_active.push_front(&term);
+					railterminal().device().do_inc_active();
+					if (m_in_queue == queue_status::DELAYED_DUE_TO_INACTIVE)
+					{
+						if (m_next_scheduled_time > exec().time())
+						{
+							m_in_queue = queue_status::QUEUED;     // pending
+							exec().qpush(m_next_scheduled_time, this);
+						}
+						else
+						{
+							m_in_queue = queue_status::DELIVERED;
+							m_cur_Q = m_new_Q;
+						}
+						update_inputs();
+					}
+					else
+						term.set_copied_input(m_cur_Q);
+				}
+			}
+
+			void remove_from_active_list(core_terminal_t &term) noexcept
+			{
+				gsl_Expects(!m_list_active.empty());
+				m_list_active.remove(&term);
+				if (m_list_active.empty())
+					railterminal().device().do_dec_active();
+			}
+
+			// -----------------------------------------------------------------------------
+			// setup stuff - cold
+			// -----------------------------------------------------------------------------
+
+			bool is_logic() const noexcept;
+			bool is_analog() const noexcept;
+
+			void rebuild_list();     // rebuild m_list after a load
+
+			std::vector<core_terminal_t *> &core_terms() noexcept { return m_core_terms; }
+
+			void update_inputs() noexcept
+			{
+#if NL_USE_COPY_INSTEAD_OF_REFERENCE
+				for (auto & term : m_core_terms)
+					term->m_Q = m_cur_Q;
+#endif
+				// nothing needs to be done if define not set
+			}
+
+		protected:
+
+			// only used for logic nets
+			NVCC_CONSTEXPR netlist_sig_t Q() const noexcept { return m_cur_Q; }
+
+			// only used for logic nets
+			void initial(netlist_sig_t val) noexcept
+			{
+				m_cur_Q = m_new_Q = val;
+				update_inputs();
+			}
+
+			// only used for logic nets
+			inline void set_Q_and_push(const netlist_sig_t &newQ, const netlist_time &delay) noexcept
+			{
+				if (newQ != m_new_Q)
+				{
+					m_new_Q = newQ;
+					push_to_queue(delay);
+				}
+			}
+
+			// only used for logic nets
+			inline void set_Q_time(const netlist_sig_t &newQ, const netlist_time_ext &at) noexcept
+			{
+				if (newQ != m_new_Q)
+				{
+					m_in_queue = queue_status::DELAYED_DUE_TO_INACTIVE;
+					m_next_scheduled_time = at;
+					m_cur_Q = m_new_Q = newQ;
+					update_inputs();
+				}
+				else
+				{
+					m_cur_Q = newQ;
+					update_inputs();
+				}
+			}
+
+		private:
+			state_var<netlist_sig_t>     m_new_Q;
+			state_var<netlist_sig_t>     m_cur_Q;
+			state_var<queue_status>      m_in_queue;
+			state_var<netlist_time_ext>  m_next_scheduled_time;
+
+			core_terminal_t * m_railterminal;
+			plib::linkedlist_t<core_terminal_t> m_list_active;
+			std::vector<core_terminal_t *> m_core_terms; // save post-start m_list ...
+
+			// -----------------------------------------------------------------------------
+			// Very hot
+			// -----------------------------------------------------------------------------
+
+			template <bool KEEP_STATS, typename T, typename S>
+			void process(T mask, const S &sig) noexcept
+			{
+				m_cur_Q = sig;
+
+				if (KEEP_STATS)
+				{
+					for (auto & p : m_list_active)
+					{
+						p.set_copied_input(sig);
+						auto *stats(p.device().stats());
+						stats->m_stat_call_count.inc();
+						if ((p.terminal_state() & mask))
+						{
+							auto g(stats->m_stat_total_time.guard());
+							p.run_delegate();
+						}
+					}
+				}
+				else
+				{
+					for (auto &p : m_list_active)
+					{
+						p.set_copied_input(sig);
+						if ((p.terminal_state() & mask) != 0)
+							p.run_delegate();
+					}
+				}
+			}
+		};
+	} // namespace detail
+
+	class analog_net_t : public detail::net_t
+	{
+	public:
+
+		analog_net_t(netlist_state_t &nl, const pstring &aname, detail::core_terminal_t *railterminal = nullptr);
+
+		void reset() noexcept override;
+
+		nl_fptype Q_Analog() const noexcept { return m_cur_Analog; }
+		void set_Q_Analog(nl_fptype v) noexcept { m_cur_Analog = v; }
+		// used by solver code ...
+		nl_fptype *Q_Analog_state_ptr() noexcept { return &m_cur_Analog(); }
+
+		//FIXME: needed by current solver code
+		solver::matrix_solver_t *solver() const noexcept { return m_solver; }
+		void set_solver(solver::matrix_solver_t *solver) noexcept { m_solver = solver; }
+
+		friend constexpr bool operator==(const analog_net_t &lhs, const analog_net_t &rhs) noexcept
+		{
+			return &lhs == &rhs;
+		}
+
+	private:
+		state_var<nl_fptype>     m_cur_Analog;
+		solver::matrix_solver_t *m_solver;
+	};
+
+	class logic_net_t : public detail::net_t
+	{
+	public:
+
+		logic_net_t(netlist_state_t &nl, const pstring &aname, detail::core_terminal_t *railterminal = nullptr);
+
+		using detail::net_t::Q;
+		using detail::net_t::initial;
+		using detail::net_t::set_Q_and_push;
+		using detail::net_t::set_Q_time;
+	};
+
+
+} // namespace netlist
+
+
+#endif // NL_CORE_NETS_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/object_array.h mame-0.224+dfsg.1/src/lib/netlist/core/object_array.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/object_array.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/object_array.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,225 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file param.h
+///
+
+#ifndef NL_CORE_OBJECT_ARRAY_H_
+#define NL_CORE_OBJECT_ARRAY_H_
+
+#include "../nltypes.h"
+
+#include "../plib/plists.h"
+#include "../plib/pstring.h"
+
+#include <array>
+#include <utility>
+
+namespace netlist
+{
+	template<class C, std::size_t N>
+	class object_array_base_t : public plib::static_vector<C, N>
+	{
+	public:
+		template<class D, typename... Args>
+		//object_array_base_t(D &dev, const std::initializer_list<const char *> &names, Args&&... args)
+		object_array_base_t(D &dev, std::array<const char *, N> &&names, Args&&... args)
+		{
+			for (std::size_t i = 0; i<N; i++)
+				this->emplace_back(dev, pstring(names[i]), std::forward<Args>(args)...);
+		}
+
+		template<class D>
+		object_array_base_t(D &dev, const pstring &fmt)
+		{
+			for (std::size_t i = 0; i<N; i++)
+				this->emplace_back(dev, formatted(fmt, i));
+		}
+
+		template<class D, typename... Args>
+		object_array_base_t(D &dev, std::size_t offset, const pstring &fmt, Args&&... args)
+		{
+			for (std::size_t i = 0; i<N; i++)
+				this->emplace_back(dev, formatted(fmt, i+offset), std::forward<Args>(args)...);
+		}
+
+		template<class D>
+		object_array_base_t(D &dev, std::size_t offset, const pstring &fmt, nldelegate delegate)
+		{
+			for (std::size_t i = 0; i<N; i++)
+				this->emplace_back(dev, formatted(fmt, i+offset), delegate);
+		}
+
+		template<class D>
+		object_array_base_t(D &dev, std::size_t offset, std::size_t qmask, const pstring &fmt)
+		{
+			for (std::size_t i = 0; i<N; i++)
+			{
+				pstring name(formatted(fmt, i+offset));
+				if ((qmask >> i) & 1)
+					name += "Q";
+				this->emplace(i, dev, name);
+			}
+		}
+	protected:
+		object_array_base_t() = default;
+
+		static pstring formatted(const pstring &fmt, std::size_t n)
+		{
+			if (N != 1)
+				return plib::pfmt(fmt)(n);
+			return plib::pfmt(fmt)("");
+		}
+	};
+
+
+	template<class C, std::size_t N>
+	class object_array_t : public object_array_base_t<C, N>
+	{
+	public:
+		using base_type = object_array_base_t<C, N>;
+		using base_type::base_type;
+	};
+
+	template<std::size_t N>
+	class object_array_t<logic_input_t,N> : public object_array_base_t<logic_input_t, N>
+	{
+	public:
+		using base_type = object_array_base_t<logic_input_t, N>;
+		using base_type::base_type;
+
+		template<class D, std::size_t ND>
+		object_array_t(D &dev, std::size_t offset, std::size_t qmask,
+			const pstring &fmt, std::array<nldelegate, ND> &&delegates)
+		{
+			static_assert(N <= ND, "initializer_list size mismatch");
+			std::size_t i = 0;
+			for (auto &e : delegates)
+			{
+				if (i < N)
+				{
+					pstring name(this->formatted(fmt, i+offset));
+					if ((qmask >> i) & 1)
+						name += "Q";
+					this->emplace_back(dev, name, e);
+				}
+				i++;
+			}
+		}
+
+		//using value_type = typename plib::fast_type_for_bits<N>::type;
+		using value_type = std::uint32_t;
+		value_type operator ()()
+		{
+			if (N == 1) return e<0>() ;
+			if (N == 2) return e<0>() | (e<1>() << 1);
+			if (N == 3) return e<0>() | (e<1>() << 1) | (e<2>() << 2);
+			if (N == 4) return e<0>() | (e<1>() << 1) | (e<2>() << 2) | (e<3>() << 3);
+			if (N == 5) return e<0>() | (e<1>() << 1) | (e<2>() << 2) | (e<3>() << 3)
+				| (e<4>() << 4);
+			if (N == 6) return e<0>() | (e<1>() << 1) | (e<2>() << 2) | (e<3>() << 3)
+				| (e<4>() << 4) | (e<5>() << 5);
+			if (N == 7) return e<0>() | (e<1>() << 1) | (e<2>() << 2) | (e<3>() << 3)
+				| (e<4>() << 4) | (e<5>() << 5) | (e<6>() << 6);
+			if (N == 8) return e<0>() | (e<1>() << 1) | (e<2>() << 2) | (e<3>() << 3)
+				| (e<4>() << 4) | (e<5>() << 5) | (e<6>() << 6) | (e<7>() << 7);
+
+			value_type r(0);
+			for (std::size_t i = 0; i < N; i++)
+				r = static_cast<value_type>((*this)[i]() << (N-1)) | (r >> 1);
+			return r;
+		}
+
+	private:
+		template <std::size_t P>
+		inline constexpr value_type e() const { return (*this)[P](); }
+	};
+
+	template<std::size_t N>
+	class object_array_t<logic_output_t,N> : public object_array_base_t<logic_output_t, N>
+	{
+	public:
+		using base_type = object_array_base_t<logic_output_t, N>;
+		using base_type::base_type;
+
+		template <typename T>
+		inline void push(const T &v, const netlist_time &t)
+		{
+			if (N >= 1) (*this)[0].push((v >> 0) & 1, t);
+			if (N >= 2) (*this)[1].push((v >> 1) & 1, t);
+			if (N >= 3) (*this)[2].push((v >> 2) & 1, t);
+			if (N >= 4) (*this)[3].push((v >> 3) & 1, t);
+			if (N >= 5) (*this)[4].push((v >> 4) & 1, t);
+			if (N >= 6) (*this)[5].push((v >> 5) & 1, t);
+			if (N >= 7) (*this)[6].push((v >> 6) & 1, t);
+			if (N >= 8) (*this)[7].push((v >> 7) & 1, t);
+			for (std::size_t i = 8; i < N; i++)
+				(*this)[i].push((v >> i) & 1, t);
+		}
+
+		template<typename T>
+		void push(const T &v, const netlist_time * t)
+		{
+			if (N >= 1) (*this)[0].push((v >> 0) & 1, t[0]);
+			if (N >= 2) (*this)[1].push((v >> 1) & 1, t[1]);
+			if (N >= 3) (*this)[2].push((v >> 2) & 1, t[2]);
+			if (N >= 4) (*this)[3].push((v >> 3) & 1, t[3]);
+			if (N >= 5) (*this)[4].push((v >> 4) & 1, t[4]);
+			if (N >= 6) (*this)[5].push((v >> 5) & 1, t[5]);
+			if (N >= 7) (*this)[6].push((v >> 6) & 1, t[6]);
+			if (N >= 8) (*this)[7].push((v >> 7) & 1, t[7]);
+			for (std::size_t i = 8; i < N; i++)
+				(*this)[i].push((v >> i) & 1, t[i]);
+		}
+
+		template<typename T, std::size_t NT>
+		void push(const T &v, const std::array<netlist_time, NT> &t)
+		{
+			static_assert(NT >= N, "Not enough timing entries provided");
+
+			push(v, t.data());
+		}
+
+		void set_tristate(netlist_sig_t v,
+			netlist_time ts_off_on, netlist_time ts_on_off) noexcept
+		{
+			for (std::size_t i = 0; i < N; i++)
+				(*this)[i].set_tristate(v, ts_off_on, ts_on_off);
+		}
+	};
+
+	template<std::size_t N>
+	class object_array_t<tristate_output_t, N> : public object_array_base_t<tristate_output_t, N>
+	{
+	public:
+		using base_type = object_array_base_t<tristate_output_t, N>;
+		using base_type::base_type;
+
+		template <typename T>
+		inline void push(const T &v, const netlist_time &t)
+		{
+			if (N >= 1) (*this)[0].push((v >> 0) & 1, t);
+			if (N >= 2) (*this)[1].push((v >> 1) & 1, t);
+			if (N >= 3) (*this)[2].push((v >> 2) & 1, t);
+			if (N >= 4) (*this)[3].push((v >> 3) & 1, t);
+			if (N >= 5) (*this)[4].push((v >> 4) & 1, t);
+			if (N >= 6) (*this)[5].push((v >> 5) & 1, t);
+			if (N >= 7) (*this)[6].push((v >> 6) & 1, t);
+			if (N >= 8) (*this)[7].push((v >> 7) & 1, t);
+			for (std::size_t i = 8; i < N; i++)
+				(*this)[i].push((v >> i) & 1, t);
+		}
+
+		void set_tristate(netlist_sig_t v,
+			netlist_time ts_off_on, netlist_time ts_on_off) noexcept
+		{
+			for (std::size_t i = 0; i < N; i++)
+				(*this)[i].set_tristate(v, ts_off_on, ts_on_off);
+		}
+	};
+
+} // namespace netlist
+
+
+#endif // NL_CORE_OBJECT_ARRAY_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/param.h mame-0.224+dfsg.1/src/lib/netlist/core/param.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/param.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/param.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,335 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file param.h
+///
+
+#ifndef NL_CORE_PARAM_H_
+#define NL_CORE_PARAM_H_
+
+#if 0
+#include "../nl_config.h"
+#include "../nl_factory.h"
+#include "../nl_setup.h"
+
+#include "../plib/ppreprocessor.h"
+
+#include <initializer_list>
+#include <stack>
+#include <unordered_map>
+#include <vector>
+#endif
+
+#include "../nltypes.h"
+
+#include "base_objects.h"
+#include "core_device.h"
+#include "setup.h"
+
+#include "../plib/palloc.h"
+#include "../plib/pstream.h"
+#include "../plib/pstring.h"
+#include "../plib/putil.h" // psource_t
+#include "../plib/pfunction.h"
+
+#include <memory>
+
+namespace netlist
+{
+	/// @brief Base class for all device parameters
+	///
+	/// All device parameters classes derive from this object.
+	class param_t : public detail::device_object_t
+	{
+	public:
+
+		enum param_type_t {
+			STRING,
+			DOUBLE,
+			INTEGER,
+			LOGIC,
+			POINTER // Special-case which is always initialized at MAME startup time
+		};
+
+		//deviceless, it's the responsibility of the owner to register!
+		param_t(const pstring &name);
+
+		param_t(core_device_t &device, const pstring &name);
+
+		PCOPYASSIGNMOVE(param_t, delete)
+		virtual ~param_t() noexcept;
+
+		param_type_t param_type() const noexcept(false);
+
+		virtual pstring valstr() const = 0;
+
+	protected:
+
+		pstring get_initial(const core_device_t *dev, bool *found) const;
+
+		template<typename C>
+		void set_and_update_param(C &p, const C v) noexcept
+		{
+			if (p != v)
+			{
+				p = v;
+				device().update_param();
+			}
+		}
+
+	};
+
+	// -----------------------------------------------------------------------------
+	// numeric parameter template
+	// -----------------------------------------------------------------------------
+
+	template <typename T>
+	class param_num_t final: public param_t
+	{
+	public:
+		using value_type = T;
+
+		param_num_t(core_device_t &device, const pstring &name, T val) noexcept(false);
+
+		T operator()() const noexcept { return m_param; }
+		operator T() const noexcept { return m_param; }
+
+		void set(const T &param) noexcept { set_and_update_param(m_param, param); }
+
+		pstring valstr() const override
+		{
+			return plib::pfmt("{}").e(gsl::narrow<nl_fptype>(m_param));
+		}
+
+	private:
+		T m_param;
+	};
+
+	template <typename T>
+	class param_enum_t final: public param_t
+	{
+	public:
+		using value_type = T;
+
+		param_enum_t(core_device_t &device, const pstring &name, T val) noexcept(false);
+
+		T operator()() const noexcept { return m_param; }
+		operator T() const noexcept { return m_param; }
+		void set(const T &param) noexcept { set_and_update_param(m_param, param); }
+
+		pstring valstr() const override
+		{
+			// returns the numerical value
+			return plib::pfmt("{}")(static_cast<int>(m_param));
+		}
+	private:
+		T m_param;
+	};
+
+	// FIXME: these should go as well
+	using param_logic_t = param_num_t<bool>;
+	using param_int_t = param_num_t<int>;
+	using param_fp_t = param_num_t<nl_fptype>;
+
+	// -----------------------------------------------------------------------------
+	// pointer parameter
+	// -----------------------------------------------------------------------------
+
+	// FIXME: not a core component -> legacy
+	class param_ptr_t final: public param_t
+	{
+	public:
+		param_ptr_t(core_device_t &device, const pstring &name, std::uint8_t* val);
+		std::uint8_t * operator()() const noexcept { return m_param; }
+		void set(std::uint8_t *param) noexcept { set_and_update_param(m_param, param); }
+
+		pstring valstr() const override
+		{
+			// returns something which errors
+			return pstring("PTRERROR");
+		}
+
+	private:
+		std::uint8_t* m_param;
+	};
+
+	// -----------------------------------------------------------------------------
+	// string parameter
+	// -----------------------------------------------------------------------------
+
+	class param_str_t : public param_t
+	{
+	public:
+		param_str_t(core_device_t &device, const pstring &name, const pstring &val);
+		param_str_t(netlist_state_t &state, const pstring &name, const pstring &val);
+
+		pstring operator()() const noexcept { return str(); }
+		void set(const pstring &param)
+		{
+			if (*m_param != param)
+			{
+				*m_param = param;
+				changed();
+				device().update_param();
+			}
+		}
+		pstring valstr() const override
+		{
+			return *m_param;
+		}
+
+	protected:
+		virtual void changed() noexcept;
+		pstring str() const noexcept { return *m_param; }
+	private:
+		host_arena::unique_ptr<pstring> m_param;
+	};
+
+	// -----------------------------------------------------------------------------
+	// model parameter
+	// -----------------------------------------------------------------------------
+
+	class param_model_t : public param_str_t
+	{
+	public:
+
+		template <typename T>
+		class value_base_t
+		{
+		public:
+			template <typename P, typename Y=T, typename DUMMY = std::enable_if_t<plib::is_arithmetic<Y>::value>>
+			value_base_t(P &param, const pstring &name)
+			: m_value(gsl::narrow<T>(param.value(name)))
+			{
+			}
+			template <typename P, typename Y=T, std::enable_if_t<!plib::is_arithmetic<Y>::value, int> = 0>
+			value_base_t(P &param, const pstring &name)
+			: m_value(static_cast<T>(param.value_str(name)))
+			{
+			}
+			T operator()() const noexcept { return m_value; }
+			operator T() const noexcept { return m_value; }
+		private:
+			const T m_value;
+		};
+
+		using value_t = value_base_t<nl_fptype>;
+		using value_str_t = value_base_t<pstring>;
+
+		param_model_t(core_device_t &device, const pstring &name, const pstring &val)
+		: param_str_t(device, name, val)
+		{
+		}
+
+		pstring value_str(const pstring &entity);
+		nl_fptype value(const pstring &entity);
+		pstring type();
+		// hide this
+		void set(const pstring &param) = delete;
+	protected:
+		void changed() noexcept override;
+	private:
+	};
+
+	// -----------------------------------------------------------------------------
+	// data parameter
+	// -----------------------------------------------------------------------------
+
+	class param_data_t : public param_str_t
+	{
+	public:
+		param_data_t(core_device_t &device, const pstring &name)
+		: param_str_t(device, name, "")
+		{
+		}
+
+		plib::psource_t::stream_ptr stream();
+	protected:
+		void changed() noexcept override { }
+	};
+
+	// -----------------------------------------------------------------------------
+	// rom parameter
+	// -----------------------------------------------------------------------------
+
+	template <typename ST, std::size_t AW, std::size_t DW>
+	class param_rom_t final: public param_data_t
+	{
+	public:
+
+		param_rom_t(core_device_t &device, const pstring &name);
+
+		const ST & operator[] (std::size_t n) const noexcept { return m_data[n]; }
+	protected:
+		void changed() noexcept override
+		{
+			plib::istream_read(stream().stream(), m_data.data(), 1<<AW);
+		}
+
+	private:
+		std::array<ST, 1 << AW> m_data;
+	};
+
+	template <typename T>
+	param_num_t<T>::param_num_t(core_device_t &device, const pstring &name, const T val)
+	: param_t(device, name)
+	, m_param(val)
+	{
+		bool found = false;
+		pstring p = this->get_initial(&device, &found);
+		if (found)
+		{
+			plib::pfunction<nl_fptype> func;
+			func.compile_infix(p, {});
+			auto valx = func.evaluate();
+			if (plib::is_integral<T>::value)
+				if (plib::abs(valx - plib::trunc(valx)) > nlconst::magic(1e-6))
+					throw nl_exception(MF_INVALID_NUMBER_CONVERSION_1_2(device.name() + "." + name, p));
+			m_param = plib::narrow_cast<T>(valx);
+		}
+
+		device.state().save(*this, m_param, this->name(), "m_param");
+	}
+
+	template <typename T>
+	param_enum_t<T>::param_enum_t(core_device_t &device, const pstring &name, const T val)
+	: param_t(device, name)
+	, m_param(val)
+	{
+		bool found = false;
+		pstring p = this->get_initial(&device, &found);
+		if (found)
+		{
+			T temp(val);
+			bool ok = temp.set_from_string(p);
+			if (!ok)
+			{
+				device.state().log().fatal(MF_INVALID_ENUM_CONVERSION_1_2(name, p));
+				throw nl_exception(MF_INVALID_ENUM_CONVERSION_1_2(name, p));
+			}
+			m_param = temp;
+		}
+
+		device.state().save(*this, m_param, this->name(), "m_param");
+	}
+
+	template <typename ST, std::size_t AW, std::size_t DW>
+	param_rom_t<ST, AW, DW>::param_rom_t(core_device_t &device, const pstring &name)
+	: param_data_t(device, name)
+	{
+		auto f = this->stream();
+		if (!f.empty())
+		{
+			plib::istream_read(f.stream(), m_data.data(), 1<<AW);
+			// FIXME: check for failbit if not in validation.
+		}
+		else
+			device.state().log().warning(MW_ROM_NOT_FOUND(str()));
+	}
+
+
+} // namespace netlist
+
+
+#endif // NL_CORE_PARAM_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/queue.h mame-0.224+dfsg.1/src/lib/netlist/core/queue.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/queue.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/queue.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,114 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file queue.h
+///
+
+#ifndef NL_CORE_QUEUE_H_
+#define NL_CORE_QUEUE_H_
+
+#include "queue.h"
+
+#include "../nl_errstr.h"
+#include "../nltypes.h"
+
+#include "../plib/pstate.h"
+#include "../plib/pstring.h"
+#include "../plib/ptimed_queue.h"
+
+#include <array>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+namespace netlist
+{
+	namespace detail {
+		// Use timed_queue_heap to use stdc++ heap functions instead of linear processing.
+		// This slows down processing by about 25% on a Kaby Lake.
+		// template <class T, bool TS>
+		// using timed_queue = plib::timed_queue_heap<T, TS>;
+
+		template <class T, bool TS>
+		using timed_queue = plib::timed_queue_linear<T, TS>;
+
+		// -----------------------------------------------------------------------------
+		// queue_t
+		// -----------------------------------------------------------------------------
+
+		// We don't need a thread-safe queue currently. Parallel processing of
+		// solvers will update inputs after parallel processing.
+
+		template <typename O, bool TS>
+		class queue_base :
+				public timed_queue<plib::pqentry_t<netlist_time_ext, O *>, false>,
+				public plib::state_manager_t::callback_t
+		{
+		public:
+			using entry_t = plib::pqentry_t<netlist_time_ext, O *>;
+			using base_queue = timed_queue<entry_t, false>;
+			using id_delegate = plib::pmfp<std::size_t, const O *>;
+			using obj_delegate = plib::pmfp<O *, std::size_t>;
+
+			explicit queue_base(std::size_t size, id_delegate get_id, obj_delegate get_obj)
+			: timed_queue<plib::pqentry_t<netlist_time_ext, O *>, false>(size)
+			, m_qsize(0)
+			, m_times(size)
+			, m_net_ids(size)
+			, m_get_id(get_id)
+			, m_obj_by_id(get_obj)
+			{
+			}
+
+			~queue_base() noexcept override = default;
+
+			queue_base(const queue_base &) = delete;
+			queue_base(queue_base &&) = delete;
+			queue_base &operator=(const queue_base &) = delete;
+			queue_base &operator=(queue_base &&) = delete;
+
+		protected:
+
+			void register_state(plib::state_manager_t &manager, const pstring &module) override
+			{
+				manager.save_item(this, m_qsize, module + "." + "qsize");
+				manager.save_item(this, &m_times[0], module + "." + "times", m_times.size());
+				manager.save_item(this, &m_net_ids[0], module + "." + "names", m_net_ids.size());
+			}
+			void on_pre_save(plib::state_manager_t &manager) override
+			{
+				plib::unused_var(manager);
+				m_qsize = this->size();
+				for (std::size_t i = 0; i < m_qsize; i++ )
+				{
+					m_times[i] =  this->listptr()[i].exec_time().as_raw();
+					m_net_ids[i] = m_get_id(this->listptr()[i].object());
+				}
+			}
+			void on_post_load(plib::state_manager_t &manager) override
+			{
+				plib::unused_var(manager);
+				this->clear();
+				for (std::size_t i = 0; i < m_qsize; i++ )
+				{
+					O *n = m_obj_by_id(m_net_ids[i]);
+					this->template push<false>(entry_t(netlist_time_ext::from_raw(m_times[i]),n));
+				}
+			}
+
+		private:
+			std::size_t m_qsize;
+			std::vector<netlist_time_ext::internal_type> m_times;
+			std::vector<std::size_t> m_net_ids;
+			id_delegate m_get_id;
+			obj_delegate m_obj_by_id;
+		};
+
+		using queue_t = queue_base<net_t, false>;
+
+	} // namespace detail
+} // namespace netlist
+
+
+#endif // NL_CORE_QUEUE_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/setup.h mame-0.224+dfsg.1/src/lib/netlist/core/setup.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/setup.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/setup.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,358 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file setup.h
+///
+
+#ifndef NL_CORE_SETUP_H_
+#define NL_CORE_SETUP_H_
+
+#include "../nl_config.h"
+#include "../nl_factory.h"
+#include "../nl_setup.h"
+#include "../nltypes.h"
+
+#include "../plib/ppreprocessor.h"
+#include "../plib/pstream.h"
+#include "../plib/pstring.h"
+
+#include <initializer_list>
+#include <memory>
+#include <stack>
+#include <unordered_map>
+#include <vector>
+
+
+namespace netlist
+{
+
+	// ----------------------------------------------------------------------------------------
+	// Collection of models
+	// ----------------------------------------------------------------------------------------
+
+	class models_t
+	{
+	public:
+		using raw_map_t = std::unordered_map<pstring, pstring>;
+		using map_t = std::unordered_map<pstring, pstring>;
+		class model_t
+		{
+		public:
+			model_t(const pstring &model, const map_t &map)
+			: m_model(model), m_map(map) { }
+
+			pstring value_str(const pstring &entity) const;
+
+			nl_fptype value(const pstring &entity) const;
+
+			pstring type() const { return value_str("COREMODEL"); }
+
+		private:
+			static pstring model_string(const map_t &map);
+
+			const pstring m_model; // only for error messages
+			const map_t &m_map;
+		};
+
+		models_t(const raw_map_t &models)
+		: m_models(models)
+		{}
+
+		model_t get_model(const pstring &model);
+
+	private:
+
+		void model_parse(const pstring &model, map_t &map);
+
+		const raw_map_t &m_models;
+		std::unordered_map<pstring, map_t> m_cache;
+	};
+
+	namespace detail
+	{
+		// -----------------------------------------------------------------------------
+		// abstract_t
+		// -----------------------------------------------------------------------------
+
+		struct abstract_t
+		{
+			using link_t = std::pair<pstring, pstring>;
+
+			abstract_t(log_type &log) : m_factory(log) { }
+			std::unordered_map<pstring, pstring>        m_alias;
+			std::vector<link_t>                         m_links;
+			std::unordered_map<pstring, pstring>        m_param_values;
+			models_t::raw_map_t                         m_models;
+
+			// need to preserve order of device creation ...
+			std::vector<std::pair<pstring, factory::element_t *>> m_device_factory;
+			// lifetime control only - can be cleared before run
+			std::vector<std::pair<pstring, pstring>>    m_defparams;
+			std::unordered_map<pstring, bool>           m_hints;
+			factory::list_t                             m_factory;
+		};
+	} // namespace detail
+
+	// -----------------------------------------------------------------------------
+	// param_ref_t
+	// -----------------------------------------------------------------------------
+
+	struct param_ref_t
+	{
+		param_ref_t() noexcept : m_device(nullptr), m_param(nullptr) {}
+		param_ref_t(core_device_t &device, param_t &param) noexcept
+		: m_device(&device)
+		, m_param(&param)
+		{ }
+
+		~param_ref_t() = default;
+		PCOPYASSIGNMOVE(param_ref_t, default)
+
+		const core_device_t &device() const noexcept { return *m_device; }
+		param_t &param() const noexcept { return *m_param; }
+
+		bool is_valid() const noexcept { return (m_device != nullptr) && (m_param != nullptr); }
+	private:
+		core_device_t *m_device;
+		param_t *m_param;
+	};
+
+	// ----------------------------------------------------------------------------------------
+	// setup_t
+	// ----------------------------------------------------------------------------------------
+
+	class setup_t
+	{
+	public:
+
+		explicit setup_t(netlist_state_t &nlstate);
+		~setup_t() noexcept = default;
+
+		PCOPYASSIGNMOVE(setup_t, delete)
+
+		// called from param_t creation
+		void register_param_t(param_t &param);
+		pstring get_initial_param_val(const pstring &name, const pstring &def) const;
+
+		void register_term(detail::core_terminal_t &term);
+		void register_term(terminal_t &term, terminal_t &other_term);
+
+		// called from net_splitter
+		terminal_t *get_connected_terminal(const terminal_t &term) const noexcept
+		{
+			auto ret(m_connected_terminals.find(&term));
+			return (ret != m_connected_terminals.end()) ? ret->second : nullptr;
+		}
+
+		// get family -> truthtable
+		const logic_family_desc_t *family_from_model(const pstring &model);
+
+		// FIXME: return param_ref_t
+		param_ref_t find_param(const pstring &param_in) const;
+		// needed by nltool
+		std::vector<pstring> get_terminals_for_device_name(const pstring &devname) const;
+
+		// needed by proxy device to check power terminals
+		detail::core_terminal_t *find_terminal(const pstring &terminal_in, detail::terminal_type atype, bool required = true) const;
+		detail::core_terminal_t *find_terminal(const pstring &terminal_in, bool required = true) const;
+		pstring de_alias(const pstring &alias) const;
+		// FIXME: only needed by solver code outside of setup_t
+		bool connect(detail::core_terminal_t &t1, detail::core_terminal_t &t2);
+
+		// run preparation
+
+		void prepare_to_run();
+
+		models_t &models() noexcept { return m_models; }
+		const models_t &models() const noexcept { return m_models; }
+
+		netlist_state_t &nlstate() { return m_nlstate; }
+		const netlist_state_t &nlstate() const { return m_nlstate; }
+
+		nlparse_t &parser() { return m_parser; }
+		const nlparse_t &parser() const { return m_parser; }
+
+		log_type &log() noexcept;
+		const log_type &log() const noexcept;
+
+		// FIXME: needed from matrix_solver_t
+		void add_terminal(detail::net_t &net, detail::core_terminal_t &terminal) noexcept(false);
+
+	private:
+
+		void resolve_inputs();
+		pstring resolve_alias(const pstring &name) const;
+
+		void merge_nets(detail::net_t &thisnet, detail::net_t &othernet);
+
+		void connect_terminals(detail::core_terminal_t &t1, detail::core_terminal_t &t2);
+		void connect_input_output(detail::core_terminal_t &in, detail::core_terminal_t &out);
+		void connect_terminal_output(terminal_t &in, detail::core_terminal_t &out);
+		void connect_terminal_input(terminal_t &term, detail::core_terminal_t &inp);
+		bool connect_input_input(detail::core_terminal_t &t1, detail::core_terminal_t &t2);
+
+		// helpers
+		static pstring termtype_as_str(detail::core_terminal_t &in);
+
+		devices::nld_base_proxy *get_d_a_proxy(const detail::core_terminal_t &out);
+		devices::nld_base_proxy *get_a_d_proxy(detail::core_terminal_t &inp);
+		detail::core_terminal_t &resolve_proxy(detail::core_terminal_t &term);
+
+		// net manipulations
+
+		void remove_terminal(detail::net_t &net, detail::core_terminal_t &terminal) noexcept(false);
+		void move_connections(detail::net_t &net, detail::net_t &dest_net);
+		void delete_empty_nets();
+
+		detail::abstract_t                          m_abstract;
+		nlparse_t                                   m_parser;
+		netlist_state_t                             &m_nlstate;
+
+		models_t                                    m_models;
+
+		// FIXME: currently only used during setup
+		devices::nld_netlistparams *                           m_netlist_params;
+
+		// FIXME: can be cleared before run
+		std::unordered_map<pstring, detail::core_terminal_t *> m_terminals;
+		std::unordered_map<const terminal_t *, terminal_t *>   m_connected_terminals;
+		std::unordered_map<pstring, param_ref_t>               m_params;
+		std::unordered_map<const detail::core_terminal_t *,
+			devices::nld_base_proxy *>                         m_proxies;
+		std::vector<host_arena::unique_ptr<param_t>>           m_defparam_lifetime;
+
+		unsigned m_proxy_cnt;
+	};
+
+	// ----------------------------------------------------------------------------------------
+	// Specific netlist psource_t implementations
+	// ----------------------------------------------------------------------------------------
+
+	class source_netlist_t : public plib::psource_t
+	{
+	public:
+
+		source_netlist_t() = default;
+
+		PCOPYASSIGNMOVE(source_netlist_t, delete)
+		~source_netlist_t() noexcept override = default;
+
+		virtual bool parse(nlparse_t &setup, const pstring &name);
+	};
+
+	class source_data_t : public plib::psource_t
+	{
+	public:
+
+		source_data_t() = default;
+
+		PCOPYASSIGNMOVE(source_data_t, delete)
+		~source_data_t() noexcept override = default;
+	};
+
+	class source_string_t : public source_netlist_t
+	{
+	public:
+
+		explicit source_string_t(const pstring &source)
+		: m_str(source)
+		{
+		}
+
+	protected:
+		stream_ptr stream(const pstring &name) override;
+
+	private:
+		pstring m_str;
+	};
+
+	class source_file_t : public source_netlist_t
+	{
+	public:
+
+		explicit source_file_t(const pstring &filename)
+		: m_filename(filename)
+		{
+		}
+
+	protected:
+		stream_ptr stream(const pstring &name) override;
+
+	private:
+		pstring m_filename;
+	};
+
+	class source_pattern_t : public source_netlist_t
+	{
+	public:
+
+		explicit source_pattern_t(const pstring &pat)
+		: m_pattern(pat)
+		{
+		}
+
+	protected:
+		stream_ptr stream(const pstring &name) override;
+
+	private:
+		pstring m_pattern;
+	};
+
+	class source_mem_t : public source_netlist_t
+	{
+	public:
+		explicit source_mem_t(const char *mem)
+		: m_str(mem)
+		{
+		}
+
+	protected:
+		stream_ptr stream(const pstring &name) override;
+
+	private:
+		pstring m_str;
+	};
+
+	class source_proc_t : public source_netlist_t
+	{
+	public:
+		source_proc_t(const pstring &name, nlsetup_func setup_func)
+		: m_setup_func(setup_func)
+		, m_setup_func_name(name)
+		{
+		}
+
+		bool parse(nlparse_t &setup, const pstring &name) override;
+
+	protected:
+		stream_ptr stream(const pstring &name) override;
+
+	private:
+		nlsetup_func m_setup_func;
+		pstring m_setup_func_name;
+	};
+
+	class source_token_t : public source_netlist_t
+	{
+	public:
+		source_token_t(const pstring &name, const parser_t::token_store &store)
+		: m_store(store)
+		, m_name(name)
+		{
+		}
+
+		bool parse(nlparse_t &setup, const pstring &name) override;
+
+	protected:
+		stream_ptr stream(const pstring &name) override;
+
+	private:
+		parser_t::token_store m_store;
+		pstring m_name;
+	};
+
+} // namespace netlist
+
+
+#endif // NL_CORE_SETUP_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/core/state_var.h mame-0.224+dfsg.1/src/lib/netlist/core/state_var.h
--- mame-0.222+dfsg.1/src/lib/netlist/core/state_var.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/core/state_var.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,180 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file state_var.h
+///
+
+#ifndef NL_CORE_STATE_VAR_H_
+#define NL_CORE_STATE_VAR_H_
+
+#include "../nltypes.h"
+#include "../plib/pstring.h"
+
+namespace netlist
+{
+	/// \brief A persistent variable template.
+	///  Use the state_var template to define a variable whose value is saved.
+	///  Within a device definition use
+	///
+	///      NETLIB_OBJECT(abc)
+	///      {
+	///          NETLIB_CONSTRUCTOR(abc)
+	///          , m_var(*this, "myvar", 0)
+	///          ...
+	///          state_var<unsigned> m_var;
+	///      }
+	template <typename T>
+	struct state_var
+	{
+	public:
+
+		using value_type = T;
+
+		template <typename O>
+		//! Constructor.
+		state_var(O &owner,             //!< owner must have a netlist() method.
+				const pstring &name,    //!< identifier/name for this state variable
+				const T &value          //!< Initial value after construction
+				);
+
+		template <typename O>
+		//! Constructor.
+		state_var(O &owner,             //!< owner must have a netlist() method.
+				const pstring &name     //!< identifier/name for this state variable
+		);
+
+		PMOVEASSIGN(state_var, delete)
+
+		//! Destructor.
+		~state_var() noexcept = default;
+
+		//! Copy Constructor removed.
+		constexpr state_var(const state_var &rhs) = delete;
+		//! Assignment operator to assign value of a state var.
+		constexpr state_var &operator=(const state_var &rhs) noexcept
+		{
+			if (this != &rhs)
+				m_value = rhs.m_value;
+			return *this;
+		} // OSX doesn't like noexcept
+		//! Assignment operator to assign value of type T.
+		constexpr state_var &operator=(const T &rhs) noexcept { m_value = rhs; return *this; }
+		//! Assignment move operator to assign value of type T.
+		constexpr state_var &operator=(T &&rhs) noexcept { std::swap(m_value, rhs); return *this; }
+		//! Return non-const value of state variable.
+		constexpr operator T & () noexcept { return m_value; }
+		//! Return const value of state variable.
+		constexpr operator const T & () const noexcept { return m_value; }
+		//! Return non-const value of state variable.
+		constexpr T & var() noexcept { return m_value; }
+		//! Return const value of state variable.
+		constexpr const T & var() const noexcept { return m_value; }
+		//! Return non-const value of state variable.
+		constexpr T & operator ()() noexcept { return m_value; }
+		//! Return const value of state variable.
+		constexpr const T & operator ()() const noexcept { return m_value; }
+		//! Access state variable by ->.
+		constexpr T * operator->() noexcept { return &m_value; }
+		//! Access state variable by const ->.
+		constexpr const T * operator->() const noexcept{ return &m_value; }
+
+	private:
+		T m_value;
+	};
+
+	/// \brief A persistent array template.
+	///  Use this state_var template to define an array whose contents are saved.
+	///  Please refer to \ref state_var.
+	///
+	///  \tparam C container class to use.
+
+	template <typename C>
+	struct state_container : public C
+	{
+	public:
+		using value_type = typename C::value_type;
+		//! Constructor.
+		template <typename O>
+		state_container(O &owner,           //!< owner must have a netlist() method.
+				const pstring &name,        //!< identifier/name for this state variable
+				const value_type &value     //!< Initial value after construction
+				);
+		//! Constructor.
+		template <typename O>
+		state_container(O &owner,           //!< owner must have a netlist() method.
+				const pstring &name,        //!< identifier/name for this state variable
+				std::size_t n,              //!< number of elements to allocate
+				const value_type &value     //!< Initial value after construction
+				);
+		//! Copy Constructor.
+		state_container(const state_container &rhs) noexcept = default;
+		//! Destructor.
+		~state_container() noexcept = default;
+		//! Move Constructor.
+		state_container(state_container &&rhs) noexcept = default;
+		state_container &operator=(const state_container &rhs) noexcept = default;
+		state_container &operator=(state_container &&rhs) noexcept = default;
+	};
+
+	// -----------------------------------------------------------------------------
+	// State variables - predefined and c++11 non-optional
+	// -----------------------------------------------------------------------------
+
+	/// \brief predefined state variable type for uint8_t
+	using state_var_u8 = state_var<std::uint8_t>;
+	/// \brief predefined state variable type for int8_t
+	using state_var_s8 = state_var<std::int8_t>;
+
+	/// \brief predefined state variable type for uint32_t
+	using state_var_u32 = state_var<std::uint32_t>;
+	/// \brief predefined state variable type for int32_t
+	using state_var_s32 = state_var<std::int32_t>;
+	/// \brief predefined state variable type for sig_t
+	using state_var_sig = state_var<netlist_sig_t>;
+
+	template <typename T>
+	template <typename O>
+	state_var<T>::state_var(O &owner, const pstring &name, const T &value)
+	: m_value(value)
+	{
+		owner.state().save(owner, m_value, owner.name(), name);
+	}
+
+	template <typename T>
+	template <typename O>
+	state_var<T>::state_var(O &owner, const pstring &name)
+	{
+		owner.state().save(owner, m_value, owner.name(), name);
+	}
+
+	template <typename C>
+	template <typename O>
+	state_container<C>::state_container(O &owner, const pstring &name,
+		const state_container<C>::value_type & value)
+	{
+		owner.state().save(owner, static_cast<C &>(*this), owner.name(), name);
+		for (std::size_t i=0; i < this->size(); i++)
+			(*this)[i] = value;
+	}
+
+	template <typename C>
+	template <typename O>
+	state_container<C>::state_container(O &owner, const pstring &name,
+		std::size_t n, const state_container<C>::value_type & value)
+	: C(n, value)
+	{
+		owner.state().save(owner, static_cast<C &>(*this), owner.name(), name);
+	}
+
+} // namespace netlist
+
+namespace plib
+{
+	template<typename X>
+	struct ptype_traits<netlist::state_var<X>> : ptype_traits<X>
+	{
+	};
+} // namespace plib
+
+#endif // NL_CORE_STATE_VAR_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/net_lib.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/net_lib.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/net_lib.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/net_lib.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,9 +3,7 @@
 
 // ***************************************************************************
 //
-//    netlib.c
-//
-//    Discrete netlist implementation.
+//    net_lib.cpp
 //
 // ***************************************************************************
 
@@ -25,6 +23,138 @@
 
 	void initialize_factory(factory::list_t &factory)
 	{
+		// The following is from a script which automatically creates
+		// the entries.
+		// FIXME: the list should be either include or the whole
+		// initialize factory code should be created programmatically.
+#if 0
+		LIB_ENTRY(2102A)
+		LIB_ENTRY(2716)
+		LIB_ENTRY(4538)
+		LIB_ENTRY(74107)
+		LIB_ENTRY(74107A)
+		LIB_ENTRY(74113)
+		LIB_ENTRY(74113A)
+		LIB_ENTRY(74121)
+		LIB_ENTRY(74123)
+		LIB_ENTRY(74125)
+		LIB_ENTRY(74126)
+		LIB_ENTRY(74153)
+		LIB_ENTRY(74161)
+		LIB_ENTRY(74161_fixme)
+		LIB_ENTRY(74163)
+		LIB_ENTRY(74164)
+		LIB_ENTRY(74165)
+		LIB_ENTRY(74166)
+		LIB_ENTRY(74174)
+		LIB_ENTRY(74174_GATE)
+		LIB_ENTRY(74175)
+		LIB_ENTRY(74175_dip)
+		LIB_ENTRY(74192)
+		LIB_ENTRY(74192_dip)
+		LIB_ENTRY(74193)
+		LIB_ENTRY(74193_dip)
+		LIB_ENTRY(74194)
+		LIB_ENTRY(74194_dip)
+		LIB_ENTRY(74365)
+		LIB_ENTRY(74365_dip)
+		LIB_ENTRY(74377_GATE)
+		LIB_ENTRY(74393)
+		LIB_ENTRY(7448)
+		LIB_ENTRY(7450)
+		LIB_ENTRY(7473)
+		LIB_ENTRY(7473A)
+		LIB_ENTRY(7474)
+		LIB_ENTRY(7475_GATE)
+		LIB_ENTRY(7477_GATE)
+		LIB_ENTRY(7483)
+		LIB_ENTRY(7485)
+		LIB_ENTRY(7490)
+		LIB_ENTRY(7492)
+		LIB_ENTRY(7493)
+		LIB_ENTRY(7497)
+		LIB_ENTRY(74S287)
+		LIB_ENTRY(82S115)
+		LIB_ENTRY(82S123)
+		LIB_ENTRY(82S126)
+		LIB_ENTRY(82S16)
+		LIB_ENTRY(9310)
+		LIB_ENTRY(9314)
+		LIB_ENTRY(9314_dip)
+		LIB_ENTRY(9316)
+		LIB_ENTRY(9322)
+		LIB_ENTRY(9322_GATE)
+		LIB_ENTRY(9334)
+		LIB_ENTRY(9334_dip)
+		LIB_ENTRY(9602)
+		LIB_ENTRY(AM2847)
+		LIB_ENTRY(AM2847_dip)
+		LIB_ENTRY(analog_input)
+		LIB_ENTRY(C)
+		LIB_ENTRY(CCCS)
+		LIB_ENTRY(CCVS)
+		LIB_ENTRY(CD4006)
+		LIB_ENTRY(CD4013)
+		LIB_ENTRY(CD4017)
+		LIB_ENTRY(CD4020)
+		LIB_ENTRY(CD4020_WI)
+		LIB_ENTRY(CD4022)
+		LIB_ENTRY(CD4024)
+		LIB_ENTRY(CD4053_GATE)
+		LIB_ENTRY(CD4066_GATE)
+		LIB_ENTRY(CD4316_GATE)
+		LIB_ENTRY(clock)
+		LIB_ENTRY(CS)
+		LIB_ENTRY(D)
+		LIB_ENTRY(extclock)
+		LIB_ENTRY(frontier)
+		LIB_ENTRY(function)
+		LIB_ENTRY(gnd)
+		LIB_ENTRY(L)
+		LIB_ENTRY(log)
+		LIB_ENTRY(logD)
+		LIB_ENTRY(logic_input)
+		LIB_ENTRY(logic_input8)
+		LIB_ENTRY(logic_input_ttl)
+		LIB_ENTRY(LVCCS)
+		LIB_ENTRY(mainclock)
+		LIB_ENTRY(MC1455P)
+		LIB_ENTRY(MC1455P_dip)
+		LIB_ENTRY(MM5837_dip)
+		LIB_ENTRY(MOSFET)
+		LIB_ENTRY(nc_pin)
+		LIB_ENTRY(NE555)
+		LIB_ENTRY(NE555_dip)
+		LIB_ENTRY(netlistparams)
+		LIB_ENTRY(nicDelay)
+		LIB_ENTRY(nicRSFF)
+		LIB_ENTRY(opamp)
+		LIB_ENTRY(POT)
+		LIB_ENTRY(POT2)
+		LIB_ENTRY(QBJT_EB)
+		LIB_ENTRY(QBJT_switch)
+		LIB_ENTRY(R)
+		LIB_ENTRY(r2r_dac)
+		LIB_ENTRY(schmitt_trigger)
+		LIB_ENTRY(SN74LS629)
+		LIB_ENTRY(solver)
+		LIB_ENTRY(switch1)
+		LIB_ENTRY(switch2)
+		LIB_ENTRY(sys_compd)
+		LIB_ENTRY(sys_dsw1)
+		LIB_ENTRY(sys_dsw2)
+		LIB_ENTRY(sys_noise_mt_n)
+		LIB_ENTRY(sys_noise_mt_u)
+		LIB_ENTRY(TMS4800)
+		LIB_ENTRY(TMS4800_dip)
+		LIB_ENTRY(tristate)
+		LIB_ENTRY(tristate3)
+		LIB_ENTRY(varclock)
+		LIB_ENTRY(VCCS)
+		LIB_ENTRY(VCVS)
+		LIB_ENTRY(VS)
+		LIB_ENTRY(Z)
+#else
 		LIB_ENTRY(R)
 		LIB_ENTRY(POT)
 		LIB_ENTRY(POT2)
@@ -69,60 +199,36 @@
 		LIB_ENTRY(nicRSFF)
 		LIB_ENTRY(nicDelay)
 		LIB_ENTRY(2102A)
-		LIB_ENTRY(2102A_dip)
 		LIB_ENTRY(2716)
-#if !(NL_USE_TRUTHTABLE_7448)
 		LIB_ENTRY(7448)
-		LIB_ENTRY(7448_dip)
-#endif
-		LIB_ENTRY(7442)
-		LIB_ENTRY(7442_dip)
+		LIB_ENTRY(MK28000)
 		LIB_ENTRY(7450)
-		LIB_ENTRY(7450_dip)
 		LIB_ENTRY(7473)
-		LIB_ENTRY(7473_dip)
 		LIB_ENTRY(7473A)
-		LIB_ENTRY(7473A_dip)
 		LIB_ENTRY(7474)
-		LIB_ENTRY(7474_dip)
-		LIB_ENTRY(7475)
-		LIB_ENTRY(7475_dip)
-		LIB_ENTRY(7477)
-		LIB_ENTRY(7477_dip)
+		LIB_ENTRY(7475_GATE)
+		LIB_ENTRY(7477_GATE)
 		LIB_ENTRY(7483)
-		LIB_ENTRY(7483_dip)
 		LIB_ENTRY(7485)
-		LIB_ENTRY(7485_dip)
 		LIB_ENTRY(7490)
-		LIB_ENTRY(7490_dip)
 		LIB_ENTRY(7492)
-		LIB_ENTRY(7492_dip)
 		LIB_ENTRY(7493)
-		LIB_ENTRY(7493_dip)
 		LIB_ENTRY(7497)
-		LIB_ENTRY(7497_dip)
-#if (!NL_USE_TRUTHTABLE_74107)
 		LIB_ENTRY(74107)
-		LIB_ENTRY(74107_dip)
-#endif
-		LIB_ENTRY(74107A)    // FIXME: implement missing DIP
+		LIB_ENTRY(74107A)
+		LIB_ENTRY(74113)
+		LIB_ENTRY(74113A)
+		LIB_ENTRY(74121)
 		LIB_ENTRY(74123)
-		LIB_ENTRY(74123_dip)
 		LIB_ENTRY(74125)
 		LIB_ENTRY(74126)
 		LIB_ENTRY(74153)
-		LIB_ENTRY(74153_dip)
 		LIB_ENTRY(74161)
 		LIB_ENTRY(74161_fixme)
-		LIB_ENTRY(74161_dip)
 		LIB_ENTRY(74163)
-		LIB_ENTRY(74163_dip)
 		LIB_ENTRY(74164)
-		LIB_ENTRY(74164_dip)
 		LIB_ENTRY(74165)
-		LIB_ENTRY(74165_dip)
 		LIB_ENTRY(74166)
-		LIB_ENTRY(74166_dip)
 		LIB_ENTRY(74174)
 		LIB_ENTRY(74175)
 		LIB_ENTRY(74192)
@@ -131,7 +237,6 @@
 		LIB_ENTRY(74365)
 		LIB_ENTRY(74377_GATE)
 		LIB_ENTRY(74393)
-		LIB_ENTRY(74393_dip)
 		//ENTRY(74279,              TTL_74279,              "") // only dip available
 		LIB_ENTRY(SN74LS629)
 		LIB_ENTRY(82S16)
@@ -139,23 +244,26 @@
 		LIB_ENTRY(82S123)
 		LIB_ENTRY(82S126)
 		LIB_ENTRY(74S287)
+		LIB_ENTRY(8277)
 		LIB_ENTRY(9310)
 		LIB_ENTRY(9314)
 		LIB_ENTRY(9316)
+		LIB_ENTRY(9321)
 		LIB_ENTRY(9322)
 		LIB_ENTRY(9334)
 		LIB_ENTRY(AM2847)
 		// FIXME: duplicate?
 		LIB_ENTRY(CD4006)
-		LIB_ENTRY(CD4006_dip)
-		LIB_ENTRY(CD4020_WI)
+		LIB_ENTRY(CD4013)
+		LIB_ENTRY(CD4017)
+		LIB_ENTRY(CD4022)
 		LIB_ENTRY(CD4020)
+		LIB_ENTRY(CD4024)
+		LIB_ENTRY(CD4053_GATE)
 		LIB_ENTRY(CD4066_GATE)
 		LIB_ENTRY(CD4316_GATE)
-		LIB_ENTRY(4538_dip)
+		LIB_ENTRY(4538)
 		LIB_ENTRY(schmitt_trigger)
-		// entries with suffix WI are legacy only
-		//ENTRY(4066,                 CD_4066,              "+A,B")
 		LIB_ENTRY(NE555)
 		LIB_ENTRY(NE555_dip)
 		LIB_ENTRY(MC1455P)
@@ -165,23 +273,13 @@
 		LIB_ENTRY(r2r_dac)
 		LIB_ENTRY(tristate)
 		LIB_ENTRY(tristate3)
-		LIB_ENTRY(74174_dip)
-		LIB_ENTRY(74175_dip)
-		LIB_ENTRY(74192_dip)
-		LIB_ENTRY(74193_dip)
-		LIB_ENTRY(74194_dip)
-		LIB_ENTRY(74365_dip)
-		LIB_ENTRY(82S16_dip)
-		LIB_ENTRY(82S115_dip)
-		LIB_ENTRY(9602_dip)
-		LIB_ENTRY(9310_dip)
+		LIB_ENTRY(8277_dip)
+		LIB_ENTRY(9602)
 		LIB_ENTRY(9314_dip)
-		LIB_ENTRY(9316_dip)
-		LIB_ENTRY(9322_dip)
 		LIB_ENTRY(9334_dip)
 		LIB_ENTRY(AM2847_dip)
-		LIB_ENTRY(SN74LS629_dip)
 		LIB_ENTRY(MM5837_dip)
+#endif
 	}
 
 } //namespace devices
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/net_lib.h mame-0.224+dfsg.1/src/lib/netlist/devices/net_lib.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/net_lib.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/net_lib.h	2020-08-26 08:57:19.000000000 +0000
@@ -28,17 +28,11 @@
 #define IND_P(ind) ((ind) * 1e-12)
 #endif
 
+NETLIST_EXTERNAL(base_lib)
+
 #if NL_AUTO_DEVICES
 #include "nld_devinc.h"
 
-#include "netlist/macro/nlm_cd4xxx.h"
-#include "netlist/macro/nlm_opamp.h"
-#include "netlist/macro/nlm_other.h"
-#include "netlist/macro/nlm_ttl74xx.h"
-#include "netlist/macro/nlm_roms.h"
-
-#include "nld_7448.h"
-
 #else
 
 #define SOLVER(name, freq)                                                  \
@@ -49,10 +43,13 @@
 #include "nld_2102A.h"
 #include "nld_4006.h"
 #include "nld_4013.h"
+#include "nld_4017.h"
 #include "nld_4020.h"
+#include "nld_4053.h"
 #include "nld_4066.h"
 #include "nld_4316.h"
 #include "nld_74107.h"
+#include "nld_74113.h"
 #include "nld_74123.h"
 #include "nld_74125.h"
 #include "nld_74153.h"
@@ -75,16 +72,19 @@
 #include "nld_7483.h"
 #include "nld_7485.h"
 #include "nld_7490.h"
+#include "nld_7492.h"
 #include "nld_7493.h"
 #include "nld_7497.h"
 #include "nld_74ls629.h"
 #include "nld_82S115.h"
 #include "nld_82S16.h"
 #include "nld_9316.h"
+#include "nld_9321.h"
 #include "nld_9322.h"
 #include "nld_tms4800.h"
 
 #include "nld_am2847.h"
+#include "nld_8277.h"
 #include "nld_dm9314.h"
 #include "nld_dm9334.h"
 
@@ -101,11 +101,11 @@
 
 #include "nld_log.h"
 
-#include "netlist/macro/nlm_cd4xxx.h"
-#include "netlist/macro/nlm_opamp.h"
-#include "netlist/macro/nlm_other.h"
-#include "netlist/macro/nlm_roms.h"
-#include "netlist/macro/nlm_ttl74xx.h"
+#include "../macro/nlm_cd4xxx_lib.h"
+#include "../macro/nlm_opamp_lib.h"
+#include "../macro/nlm_otheric_lib.h"
+#include "../macro/nlm_roms_lib.h"
+#include "../macro/nlm_ttl74xx_lib.h"
 
 #include "netlist/analog/nld_bjt.h"
 #include "netlist/analog/nld_fourterm.h"
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_2102A.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_2102A.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_2102A.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_2102A.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,22 @@
 /*
  * nld_2102A.cpp
  *
+ *  2102: 1024 x 1-bit Static RAM
+ *
+ *          +--------------+
+ *       A6 |1     ++    16| A7
+ *       A5 |2           15| A8
+ *      RWQ |3           14| A9
+ *       A1 |4   82S16   13| CEQ
+ *       A2 |5           12| DO
+ *       A3 |6           11| DI
+ *       A4 |7           10| VCC
+ *       A0 |8            9| GND
+ *          +--------------+
+ *
+ *
+ *  Naming conventions follow Intel datasheet
+ *
  */
 
 #include "nld_2102A.h"
@@ -18,10 +34,10 @@
 	NETLIB_OBJECT(2102A)
 	{
 		NETLIB_CONSTRUCTOR(2102A)
-		, m_A(*this, {"A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9" })
-		, m_CEQ(*this, "CEQ")
-		, m_RWQ(*this, "RWQ")
-		, m_DI(*this, "DI")
+		, m_A(*this, {"A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9" }, NETLIB_DELEGATE(inputs))
+		, m_CEQ(*this, "CEQ", NETLIB_DELEGATE(inputs))
+		, m_RWQ(*this, "RWQ", NETLIB_DELEGATE(inputs))
+		, m_DI(*this, "DI", NETLIB_DELEGATE(inputs))
 		, m_DO(*this, "DO")
 		, m_ram(*this, "m_ram", 0)
 		, m_RAM(*this, "m_RAM", &m_ram[0])
@@ -29,10 +45,37 @@
 		{
 		}
 
-		NETLIB_RESETI();
-		NETLIB_UPDATEI();
+		NETLIB_RESETI()
+		{
+			m_RAM.set(&m_ram[0]);
+			for (std::size_t i=0; i<128; i++)
+				m_ram[i] = 0;
+		}
+
+		NETLIB_HANDLERI(inputs)
+		{
+			netlist_time max_delay = NLTIME_FROM_NS(350);
+
+			if (!m_CEQ())
+			{
+				unsigned a = 0;
+				for (std::size_t i=0; i<10; i++)
+				{
+					a |= (m_A[i]() << i);
+				}
+				const unsigned byte = ADDR2BYTE(a);
+				const unsigned bit = ADDR2BIT(a);
+
+				if (!m_RWQ())
+				{
+					m_ram[byte] &= ~(static_cast<uint8_t>(1)      << bit);
+					m_ram[byte] |=  (static_cast<uint8_t>(m_DI()) << bit);
+				}
+
+				m_DO.push((m_ram[byte] >> bit) & 1, max_delay);
+			}
+		}
 
-		friend class NETLIB_NAME(2102A_dip);
 	private:
 		object_array_t<logic_input_t, 10> m_A;
 		logic_input_t m_CEQ;
@@ -46,71 +89,7 @@
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(2102A_dip)
-	{
-		NETLIB_CONSTRUCTOR(2102A_dip)
-		, A(*this, "A")
-		{
-			register_subalias("8",     A.m_A[0]);
-			register_subalias("4",     A.m_A[1]);
-			register_subalias("5",     A.m_A[2]);
-			register_subalias("6",     A.m_A[3]);
-			register_subalias("7",     A.m_A[4]);
-			register_subalias("2",     A.m_A[5]);
-			register_subalias("1",     A.m_A[6]);
-			register_subalias("16",    A.m_A[7]);
-			register_subalias("15",    A.m_A[8]);
-			register_subalias("14",    A.m_A[9]);
-
-			register_subalias("13",    A.m_CEQ);
-			register_subalias("3",     A.m_RWQ);
-
-			register_subalias("11",    A.m_DI);
-			register_subalias("12",    A.m_DO);
-
-			register_subalias("10",    "A.VCC");
-			register_subalias("9",     "A.GND");
-
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(2102A) A;
-	};
-
-	NETLIB_UPDATE(2102A)
-	{
-		netlist_time max_delay = NLTIME_FROM_NS(350);
-
-		if (!m_CEQ())
-		{
-			unsigned a = 0;
-			for (std::size_t i=0; i<10; i++)
-			{
-				a |= (m_A[i]() << i);
-			}
-			const unsigned byte = ADDR2BYTE(a);
-			const unsigned bit = ADDR2BIT(a);
-
-			if (!m_RWQ())
-			{
-				m_ram[byte] &= ~(static_cast<uint8_t>(1)      << bit);
-				m_ram[byte] |=  (static_cast<uint8_t>(m_DI()) << bit);
-			}
-
-			m_DO.push((m_ram[byte] >> bit) & 1, max_delay);
-		}
-	}
-
-	NETLIB_RESET(2102A)
-	{
-		m_RAM.set(&m_ram[0]);
-		for (std::size_t i=0; i<128; i++)
-			m_ram[i] = 0;
-	}
-
 	NETLIB_DEVICE_IMPL(2102A,    "RAM_2102A",   "+CEQ,+A0,+A1,+A2,+A3,+A4,+A5,+A6,+A7,+A8,+A9,+RWQ,+DI,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(2102A_dip,"RAM_2102A_DIP","")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_2102A.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_2102A.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_2102A.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_2102A.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,50 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-/*
- * nld_2102A.h
- *
- *  2102: 1024 x 1-bit Static RAM
- *
- *          +--------------+
- *       A6 |1     ++    16| A7
- *       A5 |2           15| A8
- *      RWQ |3           14| A9
- *       A1 |4   82S16   13| CEQ
- *       A2 |5           12| DO
- *       A3 |6           11| DI
- *       A4 |7           10| VCC
- *       A0 |8            9| GND
- *          +--------------+
- *
- *
- *  Naming conventions follow Intel datasheet
- *
- */
 
 #ifndef NLD_2102A_H_
 #define NLD_2102A_H_
 
 #include "netlist/nl_setup.h"
 
-#define RAM_2102A(name, cCEQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cRWQ, cDI)  \
-		NET_REGISTER_DEV(RAM_2102A, name)                                      \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CEQ, cCEQ)                                           \
-		NET_CONNECT(name, A0,  cA0)                                            \
-		NET_CONNECT(name, A1,  cA1)                                            \
-		NET_CONNECT(name, A2,  cA2)                                            \
-		NET_CONNECT(name, A3,  cA3)                                            \
-		NET_CONNECT(name, A4,  cA4)                                            \
-		NET_CONNECT(name, A5,  cA5)                                            \
-		NET_CONNECT(name, A6,  cA6)                                            \
-		NET_CONNECT(name, A7,  cA7)                                            \
-		NET_CONNECT(name, A8,  cA8)                                            \
-		NET_CONNECT(name, A9,  cA9)                                            \
-		NET_CONNECT(name, RWQ, cRWQ)                                           \
-		NET_CONNECT(name, DI, cDI)
-
-#define RAM_2102A_DIP(name)                                                    \
-		NET_REGISTER_DEV(RAM_2102A_DIP, name)
+// expects: RAM_2102A(name, cCEQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cRWQ, cDI)
+#define RAM_2102A(...)                                           \
+	NET_REGISTER_DEVEXT(RAM_2102A, __VA_ARGS__)
 
 #endif /* NLD_2102A_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4006.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4006.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4006.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4006.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,41 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_4006.c
+ * nld_4006.cpp
+ *
+ *  CD4006: CMOS 18-Stage Static Register
+ *
+ * Description
+ *
+ * CD4006BMS types are composed of 4 separate shift register sections: two
+ * sections of four stages and two sections of five stages with an output tap
+ * at the fourth stage. Each section has an independent single-rail data path.
+ *
+ * A common clock signal is used for all stages. Data are shifted to the next
+ * stages on negative-going transitions of the clock. Through appropriate
+ * connections of inputs and outputs, multiple register sections of 4, 5, 8,
+ * and 9 stages or single register sections of 10, 12, 13, 14, 16, 17 and 18
+ * stages can be implemented using one CD4006BMS package. Longer shift register
+ * sections can be assembled by using more than one CD4006BMS.
+ *
+ * To facilitate cascading stages when clock rise and fall times are slow,
+ * an optional output (D1 + 4’) that is delayed one-half clockcycle, is
+ * provided.
+ *
+ *            +--------------+
+ *       D1   |1     ++    14| VDD
+ *      D1+4' |2           13| D1+4
+ *      CLOCK |3           12| D2+5
+ *         D2 |4    4006   11| D2+4
+ *         D3 |5           10| D3+4
+ *         D4 |6            9| D4+5
+ *        VSS |7            8| D4+4
+ *            +--------------+
+ *
+ *
+ *  Naming conventions follow SYC datasheet
+ *
+ *  FIXME: Timing depends on VDD-VSS
  *
  */
 
@@ -12,19 +46,22 @@
 {
 	namespace devices
 	{
+
+	// FIXME: optimize clock input
+
 	NETLIB_OBJECT(CD4006)
 	{
 		NETLIB_CONSTRUCTOR_MODEL(CD4006, "CD4XXX")
-		, m_CLOCK(*this, "CLOCK")
-		, m_I(*this, {"D1", "D2", "D3", "D4"})
-		, m_Q(*this, {"D1P4", "D1P4S", "D2P4", "D2P5", "D3P4", "D4P4", "D3P5"})
+		, m_CLOCK(*this, "CLOCK", NETLIB_DELEGATE(inputs))
+		, m_I(*this, {"D1", "D2", "D3", "D4"}, NETLIB_DELEGATE(inputs))
+		, m_Q(*this, {"D1P4", "D1P4S", "D2P4", "D2P5", "D3P4", "D4P4", "D4P5"})
 		, m_d(*this, "m_d", 0)
 		, m_last_clock(*this, "m_last_clock", 0)
-		, m_supply(*this, "VDD", "VSS")
+		, m_supply(*this)
 		{
 		}
 
-		NETLIB_UPDATEI()
+		NETLIB_HANDLERI(inputs)
 		{
 			if (m_last_clock && !m_CLOCK())
 			{
@@ -66,35 +103,7 @@
 		nld_power_pins m_supply;
 	};
 
-	NETLIB_OBJECT(CD4006_dip)
-	{
-		NETLIB_CONSTRUCTOR(CD4006_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_I[0]);
-			register_subalias("2", A.m_Q[1]);
-			register_subalias("3", A.m_CLOCK);
-			register_subalias("4", A.m_I[1]);
-			register_subalias("5", A.m_I[2]);
-			register_subalias("6", A.m_I[3]);
-			register_subalias("7", "A.VSS");
-
-			register_subalias("8", A.m_Q[5]);
-			register_subalias("9", A.m_Q[6]);
-			register_subalias("10", A.m_Q[4]);
-			register_subalias("11", A.m_Q[2]);
-			register_subalias("12", A.m_Q[3]);
-			register_subalias("13", A.m_Q[0]);
-			register_subalias("14", "A.VDD");
-
-		}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(CD4006) A;
-	};
-
-	NETLIB_DEVICE_IMPL(CD4006, "CD4006", "+CLOCK,+D1,+D2,+D3,+D4,+D1P4,+D1P4S,+D2P4,+D2P5,+D3P4,+D4P4,+D3P5,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(CD4006_dip, "CD4006_DIP", "")
+	NETLIB_DEVICE_IMPL(CD4006, "CD4006", "+CLOCK,+D1,+D2,+D3,+D4,+D1P4,+D1P4S,+D2P4,+D2P5,+D3P4,+D4P4,+D4P5,@VCC,@GND")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4006.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4006.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4006.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4006.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,43 +1,5 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_4006.h
- *
- *  CD4006: CMOS 18-Stage Static Register
- *
- * Description
- *
- * CD4006BMS types are composed of 4 separate shift register sections: two
- * sections of four stages and two sections of five stages with an output tap
- * at the fourth stage. Each section has an independent single-rail data path.
- *
- * A common clock signal is used for all stages. Data are shifted to the next
- * stages on negative-going transitions of the clock. Through appropriate
- * connections of inputs and outputs, multiple register sections of 4, 5, 8,
- * and 9 stages or single register sections of 10, 12, 13, 14, 16, 17 and 18
- * stages can be implemented using one CD4006BMS package. Longer shift register
- * sections can be assembled by using more than one CD4006BMS.
- *
- * To facilitate cascading stages when clock rise and fall times are slow,
- * an optional output (D1 + 4’) that is delayed one-half clockcycle, is
- * provided.
- *
- *            +--------------+
- *       D1   |1     ++    14| VDD
- *      D1+4' |2           13| D1+4
- *      CLOCK |3           12| D2+5
- *         D2 |4    4006   11| D2+4
- *         D3 |5           10| D3+4
- *         D4 |6            9| D4+5
- *        VSS |7            8| D4+4
- *            +--------------+
- *
- *
- *  Naming conventions follow SYC datasheet
- *
- *  FIXME: Timing depends on VDD-VSS
- *
- */
 
 #ifndef NLD_4006_H_
 #define NLD_4006_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4013.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4013.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4013.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4013.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,40 @@
 /*
  * nld_4013.cpp
  *
+ *  CD4013: Dual Positive-Edge-Triggered D Flip-Flops
+ *          with Set, Reset and Complementary Outputs
+ *
+ *          +--------------+
+ *       Q1 |1     ++    14| VDD
+ *      Q1Q |2           13| Q2
+ *   CLOCK1 |3           12| Q2Q
+ *   RESET1 |4    4013   11| CLOCK2
+ *    DATA1 |5           10| RESET2
+ *     SET1 |6            9| DATA2
+ *      VSS |7            8| SET2
+ *          +--------------+
+ *
+ *          +-----+-----+-----+---++---+-----+
+ *          | SET | RES | CLK | D || Q | QQ  |
+ *          +=====+=====+=====+===++===+=====+
+ *          |  1  |  0  |  X  | X || 1 |  0  |
+ *          |  0  |  1  |  X  | X || 0 |  1  |
+ *          |  1  |  1  |  X  | X || 1 |  1  | (*)
+ *          |  0  |  0  |  R  | 1 || 1 |  0  |
+ *          |  0  |  0  |  R  | 0 || 0 |  1  |
+ *          |  0  |  0  |  0  | X || Q0| Q0Q |
+ *          +-----+-----+-----+---++---+-----+
+ *
+ *  (*) This configuration is not stable, i.e. it will not persist
+ *  when either the preset and or clear inputs return to their inactive (high) level
+ *
+ *  Q0 The output logic level of Q before the indicated input conditions were established
+ *
+ *  R:  0 -. 1
+ *
+ *  Naming conventions follow National Semiconductor datasheet
+ *
+ *  FIXME: Check that (*) is emulated properly
  */
 
 #include "netlist/nl_base.h"
@@ -16,9 +50,9 @@
 	NETLIB_OBJECT(CD4013)
 	{
 		NETLIB_CONSTRUCTOR_MODEL(CD4013, "CD4XXX")
-		, m_D(*this, "DATA")
-		, m_RESET(*this, "RESET")
-		, m_SET(*this, "SET")
+		, m_D(*this, "DATA", NETLIB_DELEGATE(inputs))
+		, m_RESET(*this, "RESET", NETLIB_DELEGATE(inputs))
+		, m_SET(*this, "SET", NETLIB_DELEGATE(inputs))
 		, m_CLK(*this, "CLOCK", NETLIB_DELEGATE(clk))
 		, m_Q(*this, "Q")
 		, m_QQ(*this, "QQ")
@@ -28,9 +62,36 @@
 		}
 
 	private:
-		NETLIB_RESETI();
-		NETLIB_UPDATEI();
-		NETLIB_HANDLERI(clk);
+		NETLIB_RESETI()
+		{
+			m_CLK.set_state(logic_t::STATE_INP_LH);
+			m_D.set_state(logic_t::STATE_INP_ACTIVE);
+			m_nextD = 0;
+		}
+
+		NETLIB_HANDLERI(inputs)
+		{
+			const auto set(m_SET());
+			const auto reset(m_RESET());
+			if ((set ^ 1) & (reset ^ 1))
+			{
+				m_D.activate();
+				m_nextD = m_D();
+				m_CLK.activate_lh();
+			}
+			else
+			{
+				newstate_setreset(set, reset);
+				m_CLK.inactivate();
+				m_D.inactivate();
+			}
+		}
+
+		NETLIB_HANDLERI(clk)
+		{
+			newstate_clk(m_nextD);
+			m_CLK.inactivate();
+		}
 
 		logic_input_t m_D;
 		logic_input_t m_RESET;
@@ -59,80 +120,7 @@
 		}
 	};
 
-	NETLIB_OBJECT(CD4013_dip)
-	{
-		NETLIB_CONSTRUCTOR(CD4013_dip)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		{
-			register_subalias("1", "A.Q");
-			register_subalias("2", "A.QQ");
-			register_subalias("3", "A.CLOCK");
-			register_subalias("4", "A.RESET");
-			register_subalias("5", "A.DATA");
-			register_subalias("6", "A.SET");
-			register_subalias("7", "A.VSS");
-
-			register_subalias("8", "B.SET");
-			register_subalias("9", "B.DATA");
-			register_subalias("10", "B.RESET");
-			register_subalias("11", "B.CLOCK");
-			register_subalias("12", "B.QQ");
-			register_subalias("13", "B.Q");
-			register_subalias("14", "A.VDD");
-
-			connect("A.VSS", "B.VSS");
-			connect("A.VDD", "B.VDD");
-		}
-		NETLIB_UPDATEI();
-		NETLIB_RESETI();
-
-	private:
-		NETLIB_SUB(CD4013) m_A;
-		NETLIB_SUB(CD4013) m_B;
-	};
-
-	NETLIB_HANDLER(CD4013, clk)
-	{
-		newstate_clk(m_nextD);
-		m_CLK.inactivate();
-	}
-
-	NETLIB_UPDATE(CD4013)
-	{
-		const auto set(m_SET());
-		const auto reset(m_RESET());
-		if ((set ^ 1) & (reset ^ 1))
-		{
-			m_D.activate();
-			m_nextD = m_D();
-			m_CLK.activate_lh();
-		}
-		else
-		{
-			newstate_setreset(set, reset);
-			m_CLK.inactivate();
-			m_D.inactivate();
-		}
-	}
-
-	NETLIB_RESET(CD4013)
-	{
-		m_CLK.set_state(logic_t::STATE_INP_LH);
-		m_D.set_state(logic_t::STATE_INP_ACTIVE);
-		m_nextD = 0;
-	}
-
-	NETLIB_RESET(CD4013_dip)
-	{
-	}
-
-	NETLIB_UPDATE(CD4013_dip)
-	{
-	}
-
 	NETLIB_DEVICE_IMPL(CD4013, "CD4013", "+CLOCK,+DATA,+RESET,+SET,@VDD,@VSS")
-	NETLIB_DEVICE_IMPL(CD4013_dip, "CD4013_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4013.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4013.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4013.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4013.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,43 +1,5 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_4013.h
- *
- *  CD4013: Dual Positive-Edge-Triggered D Flip-Flops
- *          with Set, Reset and Complementary Outputs
- *
- *          +--------------+
- *       Q1 |1     ++    14| VDD
- *      Q1Q |2           13| Q2
- *   CLOCK1 |3           12| Q2Q
- *   RESET1 |4    4013   11| CLOCK2
- *    DATA1 |5           10| RESET2
- *     SET1 |6            9| DATA2
- *      VSS |7            8| SET2
- *          +--------------+
- *
- *          +-----+-----+-----+---++---+-----+
- *          | SET | RES | CLK | D || Q | QQ  |
- *          +=====+=====+=====+===++===+=====+
- *          |  1  |  0  |  X  | X || 1 |  0  |
- *          |  0  |  1  |  X  | X || 0 |  1  |
- *          |  1  |  1  |  X  | X || 1 |  1  | (*)
- *          |  0  |  0  |  R  | 1 || 1 |  0  |
- *          |  0  |  0  |  R  | 0 || 0 |  1  |
- *          |  0  |  0  |  0  | X || Q0| Q0Q |
- *          +-----+-----+-----+---++---+-----+
- *
- *  (*) This configuration is not stable, i.e. it will not persist
- *  when either the preset and or clear inputs return to their inactive (high) level
- *
- *  Q0 The output logic level of Q before the indicated input conditions were established
- *
- *  R:  0 -. 1
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- *  FIXME: Check that (*) is emulated properly
- */
 
 #ifndef NLD_4013_H_
 #define NLD_4013_H_
@@ -48,7 +10,4 @@
 #define CD4013(...)                                                            \
 		NET_REGISTER_DEVEXT(CD4013, __VA_ARGS__)
 
-#define CD4013_DIP(name)                                                       \
-		NET_REGISTER_DEV(CD4013_DIP, name)
-
 #endif /* NLD_4013_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4017.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4017.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4017.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4017.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,118 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * nld_4017.cpp
+ *
+ *  CD4017: Decade Counter/Divider with 10 Decoded Outputs
+ *
+ *          +--------------+
+ *       Q5 |1     ++    16| VDD
+ *       Q1 |2           15| RESET
+ *       Q0 |3           14| CLOCK
+ *       Q2 |4    4017   13| CLOCK ENABLE
+ *       Q6 |5           12| CARRY OUT
+ *       Q7 |6           11| Q9
+ *       Q3 |7           10| Q4
+ *      VSS |8            9| Q8
+ *          +--------------+
+ *
+ *
+ *  CD4022: Divide-by-8 Counter/Divider with 8 Decoded Outputs
+ *
+ *          +--------------+
+ *       Q1 |1     ++    16| VDD
+ *       Q0 |2           15| RESET
+ *       Q2 |3           14| CLOCK
+ *       Q5 |4    4022   13| CLOCK ENABLE
+ *       Q6 |5           12| CARRY OUT
+ *       NC |6           11| Q4
+ *       Q3 |7           10| Q7
+ *      VSS |8            9| NC
+ *          +--------------+
+ *
+ *  Naming conventions follow Fairchild datasheet
+ *
+ *  FIXME: Timing depends on VDD-VSS
+ *         This needs a cmos d-a/a-d proxy implementation.
+ *
+ */
+
+#include "nld_4017.h"
+#include "nl_base.h"
+#include "nl_factory.h"
+
+namespace netlist
+{
+	namespace devices
+	{
+
+	template <std::size_t _MaxCount>
+	NETLIB_OBJECT(CD4017_base)
+	{
+		NETLIB_CONSTRUCTOR_MODEL(CD4017_base, "CD4XXX")
+		, m_CLK(*this, "CLK", NETLIB_DELEGATE(clk))
+		, m_CLKEN(*this, "CLKEN", NETLIB_DELEGATE(inputs))
+		, m_RESET(*this, "RESET", NETLIB_DELEGATE(inputs))
+		, m_CO(*this, "CO")
+		, m_Q(*this, 0, "Q{}")
+		, m_cnt(*this, "m_cnt", 0)
+		, m_supply(*this)
+		{
+		}
+
+		NETLIB_RESETI()
+		{
+			m_CLK.set_state(logic_t::STATE_INP_LH);
+			m_cnt = 0;
+		}
+
+		NETLIB_HANDLERI(clk)
+		{
+			++m_cnt;
+			update_outputs(m_cnt);
+		}
+
+		NETLIB_HANDLERI(inputs)
+		{
+			if (m_RESET())
+			{
+				m_CLK.inactivate();
+				m_cnt = 0;
+				update_outputs(m_cnt);
+			}
+			else if (m_CLKEN())
+			{
+				m_CLK.inactivate();
+			}
+			else
+			{
+				m_CLK.activate_lh();
+			}
+		}
+
+	public:
+		void update_outputs(const unsigned cnt) noexcept
+		{
+			for (std::size_t i = 0; i < _MaxCount; i++)
+				m_Q[i].push(i == cnt, NLTIME_FROM_NS(200));
+			m_CO.push(cnt < _MaxCount / 2, NLTIME_FROM_NS(160));
+		}
+		logic_input_t m_CLK;
+		logic_input_t m_CLKEN;
+		logic_input_t m_RESET;
+		logic_output_t m_CO;
+		object_array_t<logic_output_t, _MaxCount> m_Q;
+
+		state_var<unsigned> m_cnt;
+		nld_power_pins m_supply;
+	};
+
+	using NETLIB_NAME(CD4017) = NETLIB_NAME(CD4017_base)<10>;
+	using NETLIB_NAME(CD4022) = NETLIB_NAME(CD4017_base)<8>;
+
+
+	NETLIB_DEVICE_IMPL(CD4017, "CD4017", "")
+	NETLIB_DEVICE_IMPL(CD4022, "CD4022", "")
+
+	} //namespace devices
+} // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4017.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4017.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4017.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4017.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,15 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#ifndef NLD_4017_H_
+#define NLD_4017_H_
+
+#include "netlist/nl_setup.h"
+
+#define CD4017(name)                                                            \
+		NET_REGISTER_DEV(CD4017, name)
+
+#define CD4022(name)                                                            \
+		NET_REGISTER_DEV(CD4022, name)
+
+#endif /* NLD_4017_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4020.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4020.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4020.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4020.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,39 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_4020.c
+ * nld_4020.cpp
+ *
+ *  CD4020: 14-Stage Ripple Carry Binary Counters
+ *
+ *          +--------------+
+ *      Q12 |1     ++    16| VDD
+ *      Q13 |2           15| Q11
+ *      Q14 |3           14| Q10
+ *       Q6 |4    4020   13| Q8
+ *       Q5 |5           12| Q9
+ *       Q7 |6           11| RESET
+ *       Q4 |7           10| IP (Input pulses)
+ *      VSS |8            9| Q1
+ *          +--------------+
+ *
+ *
+ *  CD4024: 7-Stage Ripple Carry Binary Counters
+ *
+ *          +--------------+
+ *       IP |1     ++    14| VDD
+ *    RESET |2           13| NC
+ *       Q7 |3           12| Q1
+ *       Q6 |4    4024   11| Q2
+ *       Q5 |5           10| NC
+ *       Q4 |6            9| Q3
+ *      VSS |7            8| NC
+ *          +--------------+
+ *
+ *
+ *  Naming conventions follow Texas Instruments datasheet
+ *
+ *  FIXME: Timing depends on VDD-VSS
+ *         This needs a cmos d-a/a-d proxy implementation.
  *
  */
 
@@ -13,14 +45,18 @@
 {
 	namespace devices
 	{
+
+	template <unsigned _TotalBits, unsigned _LiveBitmask>
 	NETLIB_OBJECT(CD4020_sub)
 	{
+		static_assert((_LiveBitmask >> _TotalBits) == 0, "Live bitmask too large");
+
 		NETLIB_CONSTRUCTOR_MODEL(CD4020_sub, "CD4XXX")
-		, m_IP(*this, "IP")
-		, m_Q(*this, {"Q1", "_Q2", "_Q3", "Q4", "Q5", "Q6", "Q7", "Q8", "Q9",
-				"Q10", "Q11", "Q12", "Q13", "Q14"})
+		, m_IP(*this, "IP", NETLIB_DELEGATE(ip))
+		, m_RESET(*this, "RESET", NETLIB_DELEGATE(reseti))
+		, m_Q(*this, 1, "Q{}")
 		, m_cnt(*this, "m_cnt", 0)
-		, m_supply(*this, "VDD", "VSS")
+		, m_supply(*this)
 		{
 		}
 
@@ -30,7 +66,26 @@
 			m_cnt = 0;
 		}
 
-		NETLIB_UPDATEI();
+		NETLIB_HANDLERI(ip)
+		{
+			++m_cnt;
+			update_outputs(m_cnt);
+		}
+
+		NETLIB_HANDLERI(reseti)
+		{
+			if (m_RESET())
+			{
+				m_cnt = 0;
+				m_IP.inactivate();
+				/* static */ const netlist_time reset_time = netlist_time::from_nsec(140);
+				for (unsigned i = 0; i < _TotalBits; i++)
+					if (((_LiveBitmask >> i) & 1) != 0)
+						m_Q[i].push(0, reset_time);
+			}
+			else
+				m_IP.activate_hl();
+		}
 
 	public:
 		void update_outputs(const unsigned cnt) noexcept
@@ -45,12 +100,13 @@
 					NLTIME_FROM_NS(1380), NLTIME_FROM_NS(1480),
 			};
 
-			m_Q[0].push(cnt & 1, out_delayQn[0]);
-			for (std::size_t i=3; i<14; i++)
-				m_Q[i].push((cnt >> i) & 1, out_delayQn[i]);
+			for (unsigned i = 0; i < _TotalBits; i++)
+				if (((_LiveBitmask >> i) & 1) != 0)
+					m_Q[i].push((cnt >> i) & 1, out_delayQn[i]);
 		}
 		logic_input_t m_IP;
-		object_array_t<logic_output_t, 14> m_Q;
+		logic_input_t m_RESET;
+		object_array_t<logic_output_t, _TotalBits> m_Q;
 
 		state_var<unsigned> m_cnt;
 		nld_power_pins m_supply;
@@ -60,9 +116,9 @@
 	{
 		NETLIB_CONSTRUCTOR_MODEL(CD4020, "CD4XXX")
 		, m_sub(*this, "sub")
-		, m_RESET(*this, "RESET")
 		{
 			register_subalias("IP", m_sub.m_IP);
+			register_subalias("RESET", m_sub.m_RESET);
 			register_subalias("Q1", m_sub.m_Q[0]);
 			register_subalias("Q4", m_sub.m_Q[3]);
 			register_subalias("Q5", m_sub.m_Q[4]);
@@ -78,38 +134,42 @@
 			register_subalias("VDD", "sub.VDD");
 			register_subalias("VSS", "sub.VSS");
 		}
-		NETLIB_RESETI() { }
-		NETLIB_UPDATEI();
+
+		//NETLIB_RESETI() {}
 
 	private:
-		NETLIB_SUB(CD4020_sub) m_sub;
-		logic_input_t m_RESET;
+		NETLIB_SUB(CD4020_sub)<14, 0x3ff9> m_sub;
 	};
 
-	NETLIB_UPDATE(CD4020_sub)
+	NETLIB_OBJECT(CD4024)
 	{
-		++m_cnt;
-		m_cnt &= 0x3fff;
-		update_outputs(m_cnt);
-	}
-
-	NETLIB_UPDATE(CD4020)
-	{
-		if (m_RESET())
+		NETLIB_CONSTRUCTOR_MODEL(CD4024, "CD4XXX")
+		, m_sub(*this, "sub")
 		{
-			m_sub.m_cnt = 0;
-			m_sub.m_IP.inactivate();
-			/* static */ const netlist_time reset_time = netlist_time::from_nsec(140);
-			m_sub.m_Q[0].push(0, reset_time);
-			for (std::size_t i=3; i<14; i++)
-				m_sub.m_Q[i].push(0, reset_time);
-		}
-		else
-			m_sub.m_IP.activate_hl();
-	}
+			register_subalias("IP", m_sub.m_IP);
+			register_subalias("RESET", m_sub.m_RESET);
+			register_subalias("Q1", m_sub.m_Q[0]);
+			register_subalias("Q2", m_sub.m_Q[1]);
+			register_subalias("Q3", m_sub.m_Q[2]);
+			register_subalias("Q4", m_sub.m_Q[3]);
+			register_subalias("Q5", m_sub.m_Q[4]);
+			register_subalias("Q6", m_sub.m_Q[5]);
+			register_subalias("Q7", m_sub.m_Q[6]);
+			register_subalias("VDD", "sub.VDD");
+			register_subalias("VSS", "sub.VSS");
+		}
+
+		//NETLIB_RESETI() {}
+
+	private:
+		NETLIB_SUB(CD4020_sub)<7, 0x7f> m_sub;
+	};
+
+
+
+	NETLIB_DEVICE_IMPL(CD4020,         "CD4020", "+IP,+RESET,+VDD,+VSS")
 
-	NETLIB_DEVICE_IMPL(CD4020,         "CD4020", "")
-	NETLIB_DEVICE_IMPL_ALIAS(CD4020_WI, CD4020, "CD4020_WI", "+IP,+RESET,+VDD,+VSS")
+	NETLIB_DEVICE_IMPL(CD4024,         "CD4024", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4020.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4020.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4020.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4020.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,43 +1,17 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_4020.h
- *
- *  CD4020: 14-Stage Ripple Carry Binary Counters
- *
- *          +--------------+
- *      Q12 |1     ++    16| VDD
- *      Q13 |2           15| Q11
- *      Q14 |3           14| Q10
- *       Q6 |4    4020   13| Q8
- *       Q5 |5           12| Q9
- *       Q7 |6           11| RESET
- *       Q4 |7           10| IP (Input pulses)
- *      VSS |8            9| Q1
- *          +--------------+
- *
- *
- *  Naming conventions follow Texas Instruments datasheet
- *
- *  FIXME: Timing depends on VDD-VSS
- *         This needs a cmos d-a/a-d proxy implementation.
- *
- */
 
 #ifndef NLD_4020_H_
 #define NLD_4020_H_
 
 #include "netlist/nl_setup.h"
 
-/* FIXME: only used in mario.c */
-#define CD4020_WI(name, cIP, cRESET, cVDD, cVSS)                                \
-		NET_REGISTER_DEV(CD4020_WI, name)                                       \
-		NET_CONNECT(name, IP, cIP)                                              \
-		NET_CONNECT(name, RESET,  cRESET)                                       \
-		NET_CONNECT(name, VDD,  cVDD)                                           \
-		NET_CONNECT(name, VSS,  cVSS)
+// usage       : CD4020(name)
+#define CD4020(...)                                                    \
+	NET_REGISTER_DEVEXT(CD4020, __VA_ARGS__)
 
-#define CD4020(name)                                                            \
-		NET_REGISTER_DEV(CD4020, name)
+// usage       : CD4024(name)
+#define CD4024(...)                                                    \
+	NET_REGISTER_DEVEXT(CD4024, __VA_ARGS__)
 
 #endif /* NLD_4020_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4053.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4053.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4053.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4053.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,145 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * nld_4053.cpp
+ *
+ *  CD4053: Triple 2-Channel Analog Multiplexer/Demultiplexer
+ *
+ *          +--------------+
+ *  INOUTBY |1     ++    16| VDD
+ *  INOUTBX |2           15| OUTINB
+ *  INOUTCY |3           14| OUTINA
+ *   OUTINC |4    4053   13| INOUTAY
+ *  INOUTCX |5           12| INOUTAX
+ *      INH |6           11| A
+ *      VEE |7           10| B
+ *      VSS |8            9| C
+ *          +--------------+
+ *
+ *  FIXME: These devices are slow (~125 ns). This is currently not reflected
+ *
+ *  Naming conventions follow National semiconductor datasheet
+ *
+ */
+
+
+#include "nld_4053.h"
+
+#include "netlist/analog/nlid_twoterm.h"
+#include "netlist/solver/nld_solver.h"
+
+namespace netlist
+{
+	namespace devices
+	{
+	NETLIB_OBJECT(CD4053_GATE)
+	{
+		NETLIB_CONSTRUCTOR_MODEL(CD4053_GATE, "CD4XXX")
+		, m_RX(*this, "RX")
+		, m_RY(*this, "RY")
+		, m_select(*this, "S", NETLIB_DELEGATE(controls))
+		, m_inhibit(*this, "INH", NETLIB_DELEGATE(controls))
+		, m_VEE(*this, "VEE", NETLIB_DELEGATE(controls))
+		, m_base_r(*this, "BASER", nlconst::magic(270.0))
+		, m_lastx(*this, "m_lastx", false)
+		, m_lasty(*this, "m_lasty", false)
+		, m_select_state(*this, "m_select_state", false)
+		, m_inhibit_state(*this, "m_inhibit_state", false)
+		, m_supply(*this)
+		{
+			connect(m_RX.N(), m_RY.N());
+			register_subalias("X", m_RX.P());
+			register_subalias("Y", m_RY.P());
+			register_subalias("XY", m_RX.N());
+		}
+
+		NETLIB_RESETI()
+		{
+			update_state(true, false);
+		}
+
+	private:
+		NETLIB_HANDLERI(controls)
+		{
+			bool newx = false, newy = false;
+			if (!on(m_inhibit, m_inhibit_state))
+			{
+				if (!on(m_select, m_select_state))
+				{
+					newx = true;
+				}
+				else
+				{
+					newy = true;
+				}
+			}
+
+			if (newx != m_lastx || newy != m_lasty)
+				update_state(newx, newy);
+		}
+
+		bool on(analog_input_t &input, bool &state)
+		{
+			// digital inputs are based on VDD
+			nl_fptype sup = (m_supply.VCC().Q_Analog() - m_supply.GND().Q_Analog());
+			nl_fptype in = input() - m_supply.GND().Q_Analog();
+			nl_fptype low = nlconst::magic(0.3) * sup;
+			nl_fptype high = nlconst::magic(0.7) * sup;
+			if (in < low)
+			{
+				state = false;
+			}
+			else if (in > high)
+			{
+				state = true;
+			}
+			return state;
+		}
+
+		void update_state(bool newx, bool newy)
+		{
+			// analog output is based on VEE
+			const nl_fptype sup = (m_VEE() - m_supply.GND().Q_Analog());
+			const nl_fptype Ron = m_base_r() * nlconst::magic(5.0) / sup;
+			const nl_fptype Roff = plib::reciprocal(exec().gmin());
+			const nl_fptype RX = newx ? Ron : Roff;
+			const nl_fptype RY = newy ? Ron : Roff;
+			if (m_RX.solver() == m_RY.solver())
+			{
+				m_RX.change_state([this, &RX, &RY]()
+				{
+					m_RX.set_R(RX);
+					m_RY.set_R(RY);
+				});
+			}
+			else
+			{
+				m_RX.change_state([this, &RX]()
+				{
+					m_RX.set_R(RX);
+				});
+				m_RY.change_state([this, &RY]()
+				{
+					m_RY.set_R(RY);
+				});
+			}
+			m_lastx = newx;
+			m_lasty = newy;
+		}
+
+		analog::NETLIB_SUB(R_base) m_RX;
+		analog::NETLIB_SUB(R_base) m_RY;
+		analog_input_t             m_select;
+		analog_input_t             m_inhibit;
+		analog_input_t             m_VEE;
+		param_fp_t                 m_base_r;
+		state_var<bool>            m_lastx;
+		state_var<bool>            m_lasty;
+		state_var<bool>            m_select_state;
+		state_var<bool>            m_inhibit_state;
+		nld_power_pins             m_supply;
+	};
+
+	NETLIB_DEVICE_IMPL(CD4053_GATE,         "CD4053_GATE",            "")
+	} //namespace devices
+} // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4053.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4053.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4053.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4053.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,13 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+#ifndef NLD_4053_H_
+#define NLD_4053_H_
+
+#include "netlist/nl_setup.h"
+
+// FIXME: Implement pure CMOS version
+
+#define CD4053_GATE(name)                                                       \
+		NET_REGISTER_DEV(CD4053_GATE, name)
+
+#endif /* NLD_4053_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4066.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4066.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4066.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4066.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,23 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_4066.c
+ * nld_4066.cpp
+ *
+ *  CD4066: Quad Bilateral Switch
+ *
+ *          +--------------+
+ *   INOUTA |1     ++    14| VDD
+ *   OUTINA |2           13| CONTROLA
+ *   OUTINB |3           12| CONTROLD
+ *   INOUTB |4    4066   11| INOUTD
+ * CONTROLB |5           10| OUTIND
+ * CONTROLC |6            9| OUTINC
+ *      VSS |7            8| INOUTC
+ *          +--------------+
+ *
+ *  FIXME: These devices are slow (~125 ns). This is currently not reflected
+ *
+ *  Naming conventions follow National semiconductor datasheet
  *
  */
 
@@ -10,19 +26,6 @@
 #include "netlist/analog/nlid_twoterm.h"
 #include "netlist/solver/nld_solver.h"
 
-// This is an experimental approach to implement the analog switch.
-// This will make the switch a 3 terminal element which is completely
-// being dealt with as part as the linear system.
-//
-// The intention was to improve convergence when the switch is in a feedback
-// loop. One example are two-opamp tridiagonal wave generators.
-// Unfortunately the approach did not work out and in addition was performing
-// far worse than the net-separating original code.
-//
-// FIXME: The transfer function needs review
-//
-
-#define USE_DYNAMIC_APPROACH (0)
 
 namespace netlist
 {
@@ -31,11 +34,11 @@
 	NETLIB_OBJECT(CD4066_GATE)
 	{
 		NETLIB_CONSTRUCTOR_MODEL(CD4066_GATE, "CD4XXX")
-		, m_supply(*this, "VDD", "VSS")
 		, m_R(*this, "R")
-		, m_control(*this, "CTL")
+		, m_control(*this, "CTL", NETLIB_DELEGATE(control))
 		, m_base_r(*this, "BASER", nlconst::magic(270.0))
 		, m_last(*this, "m_last", false)
+		, m_supply(*this)
 		{
 		}
 
@@ -46,7 +49,8 @@
 			m_R.set_R(plib::reciprocal(exec().gmin()));
 		}
 
-		NETLIB_UPDATEI()
+	private:
+		NETLIB_HANDLERI(control)
 		{
 			nl_fptype sup = (m_supply.VCC().Q_Analog() - m_supply.GND().Q_Analog());
 			nl_fptype in = m_control() - m_supply.GND().Q_Analog();
@@ -71,76 +75,15 @@
 			}
 		}
 
-	private:
-		nld_power_pins             m_supply;
 		analog::NETLIB_SUB(R_base) m_R;
 		analog_input_t             m_control;
 		param_fp_t                 m_base_r;
 		state_var<bool>            m_last;
+		nld_power_pins             m_supply;
 	};
 
 
-	NETLIB_OBJECT(CD4066_GATE_DYNAMIC)
-	{
-		NETLIB_CONSTRUCTOR_MODEL(CD4066_GATE_DYNAMIC, "CD4XXX")
-		, m_supply(*this, "VDD", "VSS")
-		, m_R(*this, "R", true)
-		, m_DUM1(*this, "_DUM1", true)
-		, m_DUM2(*this, "_DUM2", true)
-		, m_base_r(*this, "BASER", nlconst::magic(270.0))
-		, m_last(*this, "m_last", false)
-		{
-			register_subalias("CTL", m_DUM1.P());   // Cathode
-
-			connect(m_DUM1.P(), m_DUM2.P());
-			connect(m_DUM1.N(), m_R.P());
-			connect(m_DUM2.N(), m_R.N());
-		}
-
-		NETLIB_RESETI()
-		{
-			// Start in off condition
-			// FIXME: is ROFF correct?
-		}
-
-		NETLIB_UPDATEI()
-		{
-		}
-
-		NETLIB_UPDATE_TERMINALSI()
-		{
-			nl_fptype sup = (m_supply.VCC().Q_Analog() - m_supply.GND().Q_Analog());
-			nl_fptype in = m_DUM1.P().net().Q_Analog() - m_supply.GND().Q_Analog();
-			nl_fptype rON = m_base_r() * nlconst::magic(5.0) / sup;
-			nl_fptype R = std::exp(-(in / sup - nlconst::magic(0.55)) * nlconst::magic(25.0)) + rON;
-			nl_fptype G = plib::reciprocal(R);
-			// dI/dVin = (VR1-VR2)*(1.0/sup*b) * exp((Vin/sup-a) * b)
-			const auto dfdz = nlconst::magic(25.0)/(R*sup) * m_R.deltaV();
-			const auto Ieq = dfdz * in;
-			const auto zero(nlconst::zero());
-			m_R.set_mat( G, -G, zero,
-						-G,  G, zero);
-						 //VIN  VR1
-			m_DUM1.set_mat( zero,  zero,  zero,   // IIN
-							dfdz,  zero,  Ieq);  // IR1
-			m_DUM2.set_mat( zero,  zero,  zero,   // IIN
-						   -dfdz,  zero, -Ieq);  // IR2
-		}
-		NETLIB_IS_DYNAMIC(true)
-
-	private:
-		nld_power_pins             m_supply;
-		analog::nld_twoterm        m_R;
-		analog::nld_twoterm        m_DUM1;
-		analog::nld_twoterm        m_DUM2;
-		param_fp_t                 m_base_r;
-		state_var<bool>            m_last;
-	};
 
-#if !USE_DYNAMIC_APPROACH
 	NETLIB_DEVICE_IMPL(CD4066_GATE,         "CD4066_GATE",            "")
-#else
-	NETLIB_DEVICE_IMPL_ALIAS(CD4066_GATE, CD4066_GATE_DYNAMIC,         "CD4066_GATE",            "")
-#endif
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4066.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4066.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4066.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4066.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,25 +1,5 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_4066.h
- *
- *  CD4066: Quad Bilateral Switch
- *
- *          +--------------+
- *   INOUTA |1     ++    14| VDD
- *   OUTINA |2           13| CONTROLA
- *   OUTINB |3           12| CONTROLD
- *   INOUTB |4    4066   11| INOUTD
- * CONTROLB |5           10| OUTIND
- * CONTROLC |6            9| OUTINC
- *      VSS |7            8| INOUTC
- *          +--------------+
- *
- *  FIXME: These devices are slow (~125 ns). This is currently not reflected
- *
- *  Naming conventions follow National semiconductor datasheet
- *
- */
 
 #ifndef NLD_4066_H_
 #define NLD_4066_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4316.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4316.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4316.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4316.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,24 @@
 // license:BSD-3-Clause
 // copyright-holders:Vas Crabb
 /*
- * nld_4316.c
+ * nld_4316.cpp
+ *
+ *  CD74HC4316: Quad Analog Switch with Level Translation
+ *
+ *          +--------------+
+ *       1Z |1     ++    16| VCC
+ *       1Y |2           15| 1S
+ *       2Y |3           14| 4S
+ *       2Z |4    4316   13| 4Z
+ *       2S |5           12| 4Y
+ *       3S |6           11| 3Y
+ *       /E |7           10| 3Z
+ *      GND |8            9| VEE
+ *          +--------------+
+ *
+ *  FIXME: These devices are slow (can be over 200 ns in HC types). This is currently not reflected
+ *
+ *  Naming conventions follow Texas Instruments datasheet
  *
  */
 
@@ -11,14 +28,16 @@
 
 namespace netlist { namespace devices {
 
+	// FIXME: tristate outputs?
+
 	NETLIB_OBJECT(CD4316_GATE)
 	{
 		NETLIB_CONSTRUCTOR_MODEL(CD4316_GATE, "CD4XXX")
-		, m_supply(*this, "VDD", "VSS")
 		, m_R(*this, "_R")
-		, m_S(*this, "S")
-		, m_E(*this, "E")
+		, m_S(*this, "S", NETLIB_DELEGATE(inputs))
+		, m_E(*this, "E", NETLIB_DELEGATE(inputs))
 		, m_base_r(*this, "BASER", nlconst::magic(45.0))
+		, m_supply(*this)
 		{
 		}
 
@@ -27,25 +46,24 @@
 			m_R.set_R(plib::reciprocal(exec().gmin()));
 		}
 
-		NETLIB_UPDATEI()
+		NETLIB_HANDLERI(inputs)
 		{
 			m_R.change_state([this]()
 				{
-				if (m_S() && !m_E())
-					m_R.set_R(m_base_r());
-				else
-					m_R.set_R(plib::reciprocal(exec().gmin()));
-				}
-				, NLTIME_FROM_NS(1));
+					if (m_S() && !m_E())
+						m_R.set_R(m_base_r());
+					else
+						m_R.set_R(plib::reciprocal(exec().gmin()));
+				});
 		}
 
 	private:
-		nld_power_pins             m_supply;
 		analog::NETLIB_SUB(R_base) m_R;
 
 		logic_input_t              m_S;
 		logic_input_t              m_E;
 		param_fp_t             m_base_r;
+		nld_power_pins             m_supply;
 	};
 
 	NETLIB_DEVICE_IMPL(CD4316_GATE, "CD4316_GATE", "")
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4316.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4316.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_4316.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_4316.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,26 +1,5 @@
 // license:BSD-3-Clause
 // copyright-holders:Vas Crabb
-/*
- * nld_4316.h
- *
- *  CD4066: Quad Analog Switch with Level Translation
- *
- *          +--------------+
- *       1Z |1     ++    16| VCC
- *       1Y |2           15| 1S
- *       2Y |3           14| 4S
- *       2Z |4    4066   13| 4Z
- *       2S |5           12| 4Y
- *       3S |6           11| 3Y
- *       /E |7           10| 3Z
- *      GND |8            9| VEE
- *          +--------------+
- *
- *  FIXME: These devices are slow (can be over 200 ns in HC types). This is currently not reflected
- *
- *  Naming conventions follow Texas Instruments datasheet
- *
- */
 
 #ifndef NLD_4316_H_
 #define NLD_4316_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74107.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74107.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74107.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74107.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,63 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_74107.c
+ * nld_74107.cpp
+ *
+ *  DM74107: DUAL J-K FLIP-FLOPS WITH CLEAR
+ *
+ *          +--------------+
+ *       1J |1     ++    14| VCC
+ *      1QQ |2           13| 1CLRQ
+ *       1Q |3           12| 1CLK
+ *       1K |4    74107  11| 2K
+ *       2Q |5           10| 2CLRQ
+ *      2QQ |6            9| 2CLK
+ *      GND |7            8| 2J
+ *          +--------------+
+ *
+ *
+ *          Function table 107
+ *
+ *          +-----+-----+-----+---++---+-----+
+ *          | CLRQ| CLK |  J  | K || Q | QQ  |
+ *          +=====+=====+=====+===++===+=====+
+ *          |  0  |  X  |  X  | X || 0 |  1  |
+ *          |  1  |  *  |  0  | 0 || Q0| Q0Q |
+ *          |  1  |  *  |  1  | 0 || 1 |  0  |
+ *          |  1  |  *  |  0  | 1 || 0 |  1  |
+ *          |  1  |  *  |  1  | 1 || TOGGLE  |
+ *          +-----+-----+-----+---++---+-----+
+ *                _
+ *          * = _| |_
+ *
+ *          This is positive triggered, J and K
+ *          are latched during clock high and
+ *          transferred when CLK falls. The
+ *          datasheet requires J and K to be
+ *          stable during clock high.
+ *
+ *          Function table 107A
+ *
+ *          +-----+-----+-----+---++---+-----+
+ *          | CLRQ| CLK |  J  | K || Q | QQ  |
+ *          +=====+=====+=====+===++===+=====+
+ *          |  0  |  X  |  X  | X || 0 |  1  |
+ *          |  1  |  F  |  0  | 0 || Q0| Q0Q |
+ *          |  1  |  F  |  1  | 0 || 1 |  0  |
+ *          |  1  |  F  |  0  | 1 || 0 |  1  |
+ *          |  1  |  F  |  1  | 1 || TOGGLE  |
+ *          |  1  |  1  |  X  | X || Q0| Q0Q |
+ *          +-----+-----+-----+---++---+-----+
+ *
+ *          THe 107A is negative triggered.
+ *
+ *  Naming conventions follow Texas instruments datasheet
+ *
+ *  TODO:  Currently, only the 107A is implemented.
+ *         The 107 uses the same model, but different timings.
+ *         The requirement that J and K must be stable during
+ *         clock high indicates that the chip may exhibit undefined
+ *         behaviour.
  *
  */
 
@@ -22,9 +78,9 @@
 		, m_clk(*this, "CLK", NETLIB_DELEGATE(clk))
 		, m_Q(*this, "Q")
 		, m_QQ(*this, "QQ")
-		, m_J(*this, "J")
-		, m_K(*this, "K")
-		, m_clrQ(*this, "CLRQ")
+		, m_J(*this, "J", NETLIB_DELEGATE(other))
+		, m_K(*this, "K", NETLIB_DELEGATE(other))
+		, m_clrQ(*this, "CLRQ", NETLIB_DELEGATE(other))
 		, m_power_pins(*this)
 		{
 			m_delay[0] = delay_107A[0];
@@ -34,9 +90,42 @@
 		friend class NETLIB_NAME(74107_dip);
 		friend class NETLIB_NAME(74107);
 
-		NETLIB_RESETI();
-		NETLIB_UPDATEI();
-		NETLIB_HANDLERI(clk);
+		NETLIB_RESETI()
+		{
+			m_clk.set_state(logic_t::STATE_INP_HL);
+			//m_Q.initial(0);
+			//m_QQ.initial(1);
+		}
+
+		NETLIB_HANDLERI(other)
+		{
+			if (!m_clrQ())
+			{
+				m_clk.inactivate();
+				newstate(0);
+			}
+			else if (m_J() | m_K())
+				m_clk.activate_hl();
+		}
+
+		NETLIB_HANDLERI(clk)
+		{
+			const netlist_sig_t t(m_Q.net().Q());
+			/*
+			 *  J K  Q1 Q2 F t   Q
+			 *  0 0   0  1 0 0   0
+			 *  0 1   0  0 0 0   0
+			 *  1 0   0  0 1 0   1
+			 *  1 1   1  0 0 0   1
+			 *  0 0   0  1 0 1   1
+			 *  0 1   0  0 0 1   0
+			 *  1 0   0  0 1 1   1
+			 *  1 1   1  0 0 1   0
+			 */
+			if ((m_J() & m_K()) ^ 1)
+				m_clk.inactivate();
+			newstate(((t ^ 1) & m_J()) | (t & (m_K() ^ 1)));
+		}
 
 	private:
 		logic_input_t m_clk;
@@ -68,85 +157,7 @@
 		}
 	};
 
-	NETLIB_OBJECT(74107_dip)
-	{
-		NETLIB_CONSTRUCTOR(74107_dip)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		{
-			register_subalias("1", m_A.m_J);
-			register_subalias("2", m_A.m_QQ);
-			register_subalias("3", m_A.m_Q);
-
-			register_subalias("4", m_A.m_K);
-			register_subalias("5", m_B.m_Q);
-			register_subalias("6", m_B.m_QQ);
-
-			register_subalias("7", "A.GND");
-
-			register_subalias("8", m_B.m_J);
-			register_subalias("9", m_B.m_clk);
-			register_subalias("10", m_B.m_clrQ);
-
-			register_subalias("11", m_B.m_K);
-			register_subalias("12", m_A.m_clk);
-			register_subalias("13", m_A.m_clrQ);
-
-			 register_subalias("14", "A.VCC" );
-
-			 connect("A.GND", "B.GND");
-			 connect("A.VCC", "B.VCC");
-
-		}
-		//NETLIB_RESETI();
-		//NETLIB_UPDATEI();
-
-	private:
-		NETLIB_SUB(74107) m_A;
-		NETLIB_SUB(74107) m_B;
-	};
-
-	NETLIB_RESET(74107A)
-	{
-		m_clk.set_state(logic_t::STATE_INP_HL);
-		//m_Q.initial(0);
-		//m_QQ.initial(1);
-	}
-
-	NETLIB_HANDLER(74107A, clk)
-	{
-		const netlist_sig_t t(m_Q.net().Q());
-		/*
-		 *  J K  Q1 Q2 F t   Q
-		 *  0 0   0  1 0 0   0
-		 *  0 1   0  0 0 0   0
-		 *  1 0   0  0 1 0   1
-		 *  1 1   1  0 0 0   1
-		 *  0 0   0  1 0 1   1
-		 *  0 1   0  0 0 1   0
-		 *  1 0   0  0 1 1   1
-		 *  1 1   1  0 0 1   0
-		 */
-		if ((m_J() & m_K()) ^ 1)
-			m_clk.inactivate();
-		newstate(((t ^ 1) & m_J()) | (t & (m_K() ^ 1)));
-	}
-
-	NETLIB_UPDATE(74107A)
-	{
-		if (!m_clrQ())
-		{
-			m_clk.inactivate();
-			newstate(0);
-		}
-		else if (m_J() | m_K())
-			m_clk.activate_hl();
-	}
-
-#if (!NL_USE_TRUTHTABLE_74107)
 	NETLIB_DEVICE_IMPL(74107,       "TTL_74107",    "+CLK,+J,+K,+CLRQ,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(74107_dip,   "TTL_74107_DIP", "")
-#endif
 	NETLIB_DEVICE_IMPL(74107A,      "TTL_74107A",   "+CLK,+J,+K,+CLRQ,@VCC,@GND")
 
 	} //namespace devices
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74107.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74107.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74107.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74107.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,87 +1,16 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_74107.h
- *
- *  DM74107: DUAL J-K FLIP-FLOPS WITH CLEAR
- *
- *          +--------------+
- *       1J |1     ++    14| VCC
- *      1QQ |2           13| 1CLRQ
- *       1Q |3           12| 1CLK
- *       1K |4    74107  11| 2K
- *       2Q |5           10| 2CLRQ
- *      2QQ |6            9| 2CLK
- *      GND |7            8| 2J
- *          +--------------+
- *
- *
- *          Function table 107
- *
- *          +-----+-----+-----+---++---+-----+
- *          | CLRQ| CLK |  J  | K || Q | QQ  |
- *          +=====+=====+=====+===++===+=====+
- *          |  0  |  X  |  X  | X || 0 |  1  |
- *          |  1  |  *  |  0  | 0 || Q0| Q0Q |
- *          |  1  |  *  |  1  | 0 || 1 |  0  |
- *          |  1  |  *  |  0  | 1 || 0 |  1  |
- *          |  1  |  *  |  1  | 1 || TOGGLE  |
- *          +-----+-----+-----+---++---+-----+
- *                _
- *          * = _| |_
- *
- *          This is positive triggered, J and K
- *          are latched during clock high and
- *          transferred when CLK falls. The
- *          datasheet requires J and K to be
- *          stable during clock high.
- *
- *          Function table 107A
- *
- *          +-----+-----+-----+---++---+-----+
- *          | CLRQ| CLK |  J  | K || Q | QQ  |
- *          +=====+=====+=====+===++===+=====+
- *          |  0  |  X  |  X  | X || 0 |  1  |
- *          |  1  |  F  |  0  | 0 || Q0| Q0Q |
- *          |  1  |  F  |  1  | 0 || 1 |  0  |
- *          |  1  |  F  |  0  | 1 || 0 |  1  |
- *          |  1  |  F  |  1  | 1 || TOGGLE  |
- *          |  1  |  1  |  X  | X || Q0| Q0Q |
- *          +-----+-----+-----+---++---+-----+
- *
- *          THe 107A is negative triggered.
- *
- *  Naming conventions follow Texas instruments datasheet
- *
- *  TODO:  Currently, only the 107A is implemented.
- *         The 107 uses the same model, but different timings.
- *         The requirement that J and K must be stable during
- *         clock high indicates that the chip may exhibit undefined
- *         behaviour.
- *
- */
 
 #ifndef NLD_74107_H_
 #define NLD_74107_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_74107A(name, cCLK, cJ, cK, cCLRQ)                                  \
-		NET_REGISTER_DEV(TTL_74107A, name)                                     \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CLK, cCLK)                                           \
-		NET_CONNECT(name, J, cJ)                                               \
-		NET_CONNECT(name, K, cK)                                               \
-		NET_CONNECT(name, CLRQ, cCLRQ)
+#define TTL_74107(...)                                                         \
+		NET_REGISTER_DEVEXT(TTL_74107, __VA_ARGS__)
 
-#if (!NL_USE_TRUTHTABLE_74107)
-#define TTL_74107(name, cCLK, cJ, cK, cCLRQ)                                   \
-		TTL_74107A(name, cCLK, cJ, cK, cCLRQ)
-
-#define TTL_74107_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74107_DIP, name)
-
-#endif
+// usage: TTL_74107A(name, cCLK, cJ, cK, cCLRQ)
+#define TTL_74107A(...)                                                        \
+		NET_REGISTER_DEVEXT(TTL_74107A, __VA_ARGS__)
 
 #endif /* NLD_74107_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74113.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74113.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74113.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74113.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,150 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+/*
+ * nld_74113.cpp
+ *
+ *  74113: Dual Master-Slave J-K Flip-Flops with Set and Complementary Outputs
+ *  74113A: Dual Negative-Edge-Triggered Master-Slave J-K Flip-Flops with Set and Complementary Outputs
+ *
+ *          +----------+
+ *     1CLK |1   ++  14| VCC
+ *       1K |2       13| 2CLK
+ *       1J |3       12| 2K
+ *    1SETQ |4 74113 11| 2J
+ *       1Q |5       10| 2SETQ
+ *      1QQ |6        9| 2Q
+ *      GND |7        8| 2QQ
+ *          +----------+
+ *
+ *
+ *          Function table 113
+ *
+ *          +-----+-----+-----+---++---+-----+
+ *          | SETQ| CLK |  J  | K || Q | QQ  |
+ *          +=====+=====+=====+===++===+=====+
+ *          |  0  |  X  |  X  | X || 1 |  0  |
+ *          |  1  |  *  |  0  | 0 || Q0| Q0Q |
+ *          |  1  |  *  |  1  | 0 || 1 |  0  |
+ *          |  1  |  *  |  0  | 1 || 0 |  1  |
+ *          |  1  |  *  |  1  | 1 || TOGGLE  |
+ *          +-----+-----+-----+---++---+-----+
+ *                _
+ *          * = _| |_
+ *
+ *          This is positive triggered, J and K
+ *          are latched during clock high and
+ *          transferred when CLK falls.
+ *
+ *          Function table 113A
+ *
+ *          +-----+-----+-----+---++---+-----+
+ *          | CLRQ| CLK |  J  | K || Q | QQ  |
+ *          +=====+=====+=====+===++===+=====+
+ *          |  0  |  X  |  X  | X || 0 |  1  |
+ *          |  1  |  F  |  0  | 0 || Q0| Q0Q |
+ *          |  1  |  F  |  1  | 0 || 1 |  0  |
+ *          |  1  |  F  |  0  | 1 || 0 |  1  |
+ *          |  1  |  F  |  1  | 1 || TOGGLE  |
+ *          |  1  |  1  |  X  | X || Q0| Q0Q |
+ *          +-----+-----+-----+---++---+-----+
+ *
+ *          THe 113A is negative triggered.
+ *
+ *  Naming conventions follow Texas instruments datasheet
+ *
+ *  FIXME: Currently, only the 113 is implemented.
+ *         The 113A uses the same model.
+ *
+ */
+
+#include "nld_74113.h"
+#include "netlist/nl_base.h"
+
+// Note: this can probably be merged with nld_7473.cpp
+
+namespace netlist
+{
+	namespace devices
+	{
+	NETLIB_OBJECT(74113)
+	{
+		NETLIB_CONSTRUCTOR(74113)
+		, m_CLK(*this, "CLK", NETLIB_DELEGATE(inputs))
+		, m_J(*this, "J", NETLIB_DELEGATE(inputs))
+		, m_K(*this, "K", NETLIB_DELEGATE(inputs))
+		, m_SETQ(*this, "SETQ", NETLIB_DELEGATE(inputs))
+		, m_last_CLK(*this, "m_last_CLK", 0)
+		, m_q(*this, "m_q", 0)
+		, m_Q(*this, "Q")
+		, m_QQ(*this, "QQ")
+		, m_power_pins(*this)
+		{
+		}
+
+		NETLIB_RESETI()
+		{
+			m_last_CLK = 0;
+		}
+
+		NETLIB_HANDLERI(inputs)
+		{
+			const auto JK = (m_J() << 1) | m_K();
+
+			if (m_SETQ())
+			{
+				if (!m_CLK() && m_last_CLK)
+				{
+					switch (JK)
+					{
+						case 1:             // (!m_J) & m_K))
+							m_q = 0;
+							break;
+						case 2:             // (m_J) & !m_K))
+							m_q = 1;
+							break;
+						case 3:             // (m_J) & m_K))
+							m_q ^= 1;
+							break;
+						default:
+						case 0:
+							break;
+					}
+				}
+			}
+			else
+			{
+				m_q = 1;
+			}
+
+			m_last_CLK = m_CLK();
+
+			m_Q.push(m_q, NLTIME_FROM_NS(20)); // FIXME: timing
+			m_QQ.push(m_q ^ 1, NLTIME_FROM_NS(20)); // FIXME: timing
+		}
+
+	public:
+		logic_input_t m_CLK;
+		logic_input_t m_J;
+		logic_input_t m_K;
+		logic_input_t m_SETQ;
+
+		state_var<unsigned> m_last_CLK;
+		state_var<unsigned> m_q;
+
+		logic_output_t m_Q;
+		logic_output_t m_QQ;
+		nld_power_pins m_power_pins;
+	};
+
+	NETLIB_OBJECT_DERIVED(74113A, 74113)
+	{
+	public:
+		NETLIB_CONSTRUCTOR(74113A) { }
+
+	};
+
+	NETLIB_DEVICE_IMPL(74113, "TTL_74113", "+CLK,+J,+K,+CLRQ,@VCC,@GND")
+	NETLIB_DEVICE_IMPL(74113A, "TTL_74113A", "+CLK,+J,+K,+CLRQ,@VCC,@GND")
+
+	} //namespace devices
+} // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74113.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74113.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74113.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74113.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,17 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#ifndef NLD_74113_H_
+#define NLD_74113_H_
+
+#include "netlist/nl_setup.h"
+
+// usage: TTL_74113(name, cCLK, cJ, cK, cCLRQ)
+#define TTL_74113(...)                                                        \
+		NET_REGISTER_DEVEXT(TTL_74113, __VA_ARGS__)
+
+// usage: TTL_74113A(name, cCLK, cJ, cK, cCLRQ)
+#define TTL_74113A(...)                                                       \
+		NET_REGISTER_DEVEXT(TTL_74113, __VA_ARGS__)
+
+#endif /* NLD_74113_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74123.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74123.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74123.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74123.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,48 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_74123.c
+ * nld_74123.cpp
+ *
+ *  74123: Dual Retriggerable One-Shot with Clear and Complementary Outputs
+ *
+ *           +--------------+
+ *        A1 |1     ++    16| VCC
+ *        B1 |2           15| RC1
+ *      CLR1 |3           14| C1
+ *       Q1Q |4   74123   13| Q1
+ *        Q2 |5           12| Q2Q
+ *        C2 |6           11| CLR2
+ *       RC2 |7           10| B2
+ *       GND |8            9| A2
+ *           +--------------+
+ *
+ *  Naming conventions follow Fairchild Semiconductor datasheet
+ *
+ *  DM9602: Dual Retriggerable, Resettable One Shots
+ *
+ *           +--------------+
+ *        C1 |1     ++    16| VCC
+ *       RC1 |2           15| C2
+ *      CLR1 |3           14| RC2
+ *        B1 |4    9602   13| CLR2
+ *        A1 |5           12| B2
+ *        Q1 |6           11| A2
+ *       Q1Q |7           10| Q2
+ *       GND |8            9| Q2Q
+ *           +--------------+
+ *
+ *  CD4538: Dual Retriggerable, Resettable One Shots
+ *
+ *           +--------------+
+ *        C1 |1     ++    16| VCC
+ *       RC1 |2           15| C2
+ *      CLR1 |3           14| RC2
+ *        A1 |4    4538   13| CLR2
+ *        B1 |5           12| A2
+ *        Q1 |6           11| B2
+ *       Q1Q |7           10| Q2
+ *       GND |8            9| Q2Q
+ *           +--------------+
  *
  */
 
@@ -12,31 +53,75 @@
 {
 	namespace devices
 	{
-	template <int DEVTYPE = 74123>
+
+	/// \brief Base monostable device
+	///
+	/// The basic operation is the following:
+	///
+	/// After a trigger signal has been detected, the output changes to high.
+	/// The capacitor is quickly discharged until it reaches Vlow.
+	/// The device toggles into charging mode until Vhigh is reached. At this
+	/// point, the output is set to low. Charging continues until VCC - or
+	/// more specific VRC is reached.
+	///
+	/// Using
+	///
+	/// - Vlow = alpha * VCC
+	/// - Vhigh = (1-alpha) * VCC
+	/// - Ignoring Rext during discharge
+	///
+	/// we have calculate the following time constants:
+	///
+	/// - tD = - X*C * ln(alpha)
+	/// - tC = - R*C * ln(alhpa)
+	/// - tL = - R*C * ln(1.0 - alpha)
+	///
+	/// where tD denotes the time to discharge from VCC to Vlow, tC denotes
+	/// the time to charge from 0.0 to Vhigh and tL denotes the time to charge
+	/// from 0 to Vlow. X denotes the internal resistance used to discharge the
+	/// capacitor. The total impulse duration is thus
+	///
+	/// tP = tD + tC - tL
+	///
+	/// Using K = ln(1 - alpha) - ln (alpha) = ln(1/alpha - 1)
+	///
+	/// we get
+	///
+	/// tP = R*C*K * (1 + X/R * ln(alpha) / K)
+	///
+	/// and alpha = 1 / (1 + exp(K))
+	///
+	/// Datasheets express the right term usually as
+	///
+	/// (1 + f * 1000 / R) = (1 + X/R * ln(alpha) / K)
+	///
+	/// and thus
+	///
+	/// X = f * 1000 * K / ln(alpha)
+	///
+	/// FIXME: Currently X is given directly (as RI). It would be better to use
+	/// f (usually 0.7) and K to calculate X.
+	///
+	template <typename D>
 	NETLIB_OBJECT(74123_base)
 	{
-		static_assert((DEVTYPE == 9602) || (DEVTYPE == 4538) || (DEVTYPE == 74123), "wrong device type");
-
 		NETLIB_CONSTRUCTOR(74123_base)
 		, m_RP(*this, "RP")
 		, m_RN(*this, "RN")
 		, m_RP_Q(*this, "_RP_Q")
 		, m_RN_Q(*this, "_RN_Q")
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		, m_CLRQ(*this, "CLRQ")
+		, m_I(*this, D::names(), NETLIB_DELEGATE(ab_clear))
 		, m_Q(*this, "Q")
 		, m_QQ(*this, "QQ")
-		, m_CV(*this, "_CV") // internal
+		, m_CV(*this, "_CV", NETLIB_DELEGATE(cv)) // internal
 		, m_last_trig(*this, "m_last_trig", 0)
 		, m_state(*this, "m_state", 0)
-		, m_KP(*this, "m_KP", 0)
-		, m_K(*this, "K", (DEVTYPE == 4538) ? nlconst::one() : nlconst::magic(0.4)) // CD4538 datasheet states PW=RC
-		, m_RI(*this, "RI", nlconst::magic(400.0)) // around 250 for HC series, 400 on LS/TTL, estimated from datasheets
+		, m_KP(plib::reciprocal(nlconst::one() + plib::exp(D::K())))
+		//, m_power_pins(*this)
 		{
 
-			register_subalias("GND", m_RN.N());
-			register_subalias("VCC", m_RP.P());
+			register_subalias(pstring(D::gnd()), m_RN.N());
+			register_subalias(pstring(D::vcc()), m_RP.P());
 			register_subalias("C",   m_RN.N());
 			register_subalias("RC",  m_RN.P());
 
@@ -46,60 +131,45 @@
 			connect(m_RN.P(), m_RP.N());
 			connect(m_CV, m_RN.P());
 
-			m_RP.m_RON.set(m_RI());
-			m_RN.m_RON.set(m_RI());
+			m_RP.m_RON.set(D::RI());
+			m_RN.m_RON.set(D::RI());
 		}
 
-		NETLIB_UPDATEI()
+		NETLIB_HANDLERI(ab_clear)
 		{
 			netlist_sig_t m_trig(0);
-			netlist_sig_t res = !m_CLRQ();
-			netlist_time t_AB_to_Q = NLTIME_FROM_NS(10);
-			netlist_time t_C_to_Q = NLTIME_FROM_NS(10);
 
-			if (DEVTYPE == 74123)
-			{
-				m_trig = (m_A() ^ 1) & m_B() & m_CLRQ();
-			}
-			else if (DEVTYPE == 9602)
-			{
-				m_trig = (m_A() ^ 1) | m_B();
-			}
-			else // 4538
-			{
-				m_trig = (m_B() ^ 1) | m_A();
-				// The line below is from the datasheet truthtable ... doesn't make sense at all
-				//res = res | m_A) | (m_B) ^ 1);
-				t_AB_to_Q = NLTIME_FROM_NS(300);
-				t_C_to_Q = NLTIME_FROM_NS(250);
-			}
+			m_trig = D::trigfunc(m_I);
 
-			if (res)
+			if (!D::clear(m_I))
 			{
-				m_Q.push(0, t_C_to_Q);
-				m_QQ.push(1, t_C_to_Q);
+				m_Q.push(0, D::t_C_to_Q::value());
+				m_QQ.push(1, D::t_C_to_Q::value());
 				/* quick charge until trigger */
 				/* FIXME: SGS datasheet shows quick charge to 5V,
 				 * though schematics indicate quick charge to Vhigh only.
 				 */
-				m_RP_Q.push(1, t_C_to_Q); // R_ON
-				m_RN_Q.push(0, t_C_to_Q); // R_OFF
+				m_RP_Q.push(1, D::t_C_to_Q::value()); // R_ON
+				m_RN_Q.push(0, D::t_C_to_Q::value()); // R_OFF
 				m_state = 2; //charging (quick)
 			}
 			else if (!m_last_trig && m_trig)
 			{
 				// FIXME: Timing!
-				m_Q.push(1, t_AB_to_Q);
-				m_QQ.push(0,t_AB_to_Q);
+				m_Q.push(1, D::t_AB_to_Q::value());
+				m_QQ.push(0, D::t_AB_to_Q::value());
 
-				m_RN_Q.push(1, t_AB_to_Q); // R_ON
-				m_RP_Q.push(0, t_AB_to_Q); // R_OFF
+				m_RN_Q.push(1, D::t_AB_to_Q::value()); // R_ON
+				m_RP_Q.push(0, D::t_AB_to_Q::value()); // R_OFF
 
 				m_state = 1; // discharging
 			}
 
 			m_last_trig = m_trig;
+		}
 
+		NETLIB_HANDLERI(cv)
+		{
 			if (m_state == 1)
 			{
 				const nl_fptype vLow = m_KP * m_RP.P()();
@@ -111,7 +181,7 @@
 			}
 			if (m_state == 2)
 			{
-				const nl_fptype vHigh = m_RP.P()() * (nlconst::one() - m_KP);
+				const nl_fptype vHigh = (nlconst::one() - m_KP) * m_RP.P()();
 				if (m_CV() > vHigh)
 				{
 					m_RP_Q.push(0, NLTIME_FROM_NS(10)); // R_OFF
@@ -125,8 +195,6 @@
 
 		NETLIB_RESETI()
 		{
-			m_KP = plib::reciprocal(nlconst::one() + plib::exp(m_K()));
-
 			m_RP.reset();
 			m_RN.reset();
 
@@ -138,16 +206,13 @@
 		}
 
 	private:
-	public:
 		NETLIB_SUB(sys_dsw1) m_RP;
 		NETLIB_SUB(sys_dsw1) m_RN;
 
 		logic_output_t m_RP_Q;
 		logic_output_t m_RN_Q;
 
-		logic_input_t m_A;
-		logic_input_t m_B;
-		logic_input_t m_CLRQ;
+		object_array_t<logic_input_t, 3> m_I;
 		logic_output_t m_Q;
 		logic_output_t m_QQ;
 
@@ -155,130 +220,75 @@
 
 		state_var<netlist_sig_t> m_last_trig;
 		state_var<unsigned>      m_state;
-		state_var<nl_fptype>        m_KP;
-
-		param_fp_t m_K;
-		param_fp_t m_RI;
+		nl_fptype                m_KP;
+		//nld_power_pins           m_power_pins; // not needed, device exposes VCC and GND
 	};
 
-	NETLIB_OBJECT(74123_dip)
+	struct desc_74123 : public desc_base
 	{
-		NETLIB_CONSTRUCTOR(74123_dip)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
+		using t_AB_to_Q = time_ns<10>;
+		using t_C_to_Q = time_ns<10>;
+		static constexpr nl_fptype K()  { return nlconst::magic(0.4); }
+		static constexpr nl_fptype RI() { return nlconst::magic(400.0); }
+
+		static constexpr std::array<const char *, 3> names() { return {"CLRQ", "A", "B"};}
+		template<typename T>
+		static netlist_sig_t trigfunc(const T &in)
 		{
-			register_subalias("1", m_A.m_A);
-			register_subalias("2", m_A.m_B);
-			register_subalias("3", m_A.m_CLRQ);
-			register_subalias("4", m_A.m_QQ);
-			register_subalias("5", m_B.m_Q);
-			register_subalias("6", m_B.m_RN.N());
-			register_subalias("7", m_B.m_RN.P());
-			register_subalias("8", m_A.m_RN.N());
-			connect(m_A.m_RN.N(), m_B.m_RN.N());
-
-			register_subalias("9", m_B.m_A);
-			register_subalias("10", m_B.m_B);
-			register_subalias("11", m_B.m_CLRQ);
-			register_subalias("12", m_B.m_QQ);
-			register_subalias("13", m_A.m_Q);
-			register_subalias("14", m_A.m_RN.N());
-			register_subalias("15", m_A.m_RN.P());
-			register_subalias("16", m_A.m_RP.P());
-			connect(m_A.m_RP.P(), m_B.m_RP.P());
+			return ((in[1]() | (in[2]() ^ 1)) ^ 1) & in[0](); // ((m_A() | (m_B() ^ 1)) ^ 1) & m_CLRQ()
 		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(74123_base)<74123> m_A;
-		NETLIB_SUB(74123_base)<74123> m_B;
+		template<typename T> static constexpr netlist_sig_t clear(const T &in) { return in[0]();}
+
+		static constexpr const char *vcc() { return "VCC"; }
+		static constexpr const char *gnd() { return "GND"; }
 	};
 
-	NETLIB_OBJECT(9602_dip)
+	struct desc_74121 : public desc_74123
 	{
-		NETLIB_CONSTRUCTOR(9602_dip)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
+		static constexpr nl_fptype K()  { return nlconst::magic(0.7); }
+
+		static constexpr std::array<const char *, 3> names() { return {"A1", "A2", "B"};}
+		template<typename T>
+		static netlist_sig_t trigfunc(const T &in)
 		{
-			register_subalias("1", m_A.m_RN.N()); // C1
-			register_subalias("2", m_A.m_RN.P()); // RC1
-			register_subalias("3", m_A.m_CLRQ);
-			register_subalias("4", m_A.m_B);
-			register_subalias("5", m_A.m_A);
-			register_subalias("6", m_A.m_Q);
-			register_subalias("7", m_A.m_QQ);
-			register_subalias("8", m_A.m_RN.N());
-			connect(m_A.m_RN.N(), m_B.m_RN.N());
-
-			register_subalias("9", m_B.m_QQ);
-			register_subalias("10", m_B.m_Q);
-			register_subalias("11", m_B.m_A);
-			register_subalias("12", m_B.m_B);
-			register_subalias("13", m_B.m_CLRQ);
-			register_subalias("14", m_B.m_RN.P()); // RC2
-			register_subalias("15", m_B.m_RN.N()); // C2
-			register_subalias("16", m_A.m_RP.P());
-			connect(m_A.m_RP.P(), m_B.m_RP.P());
+			return ((in[0]() ^ 1) | (in[1]() ^ 1)) & in[2](); // (~A1 | ~A2) & B
 		}
-		NETLIB_RESETI() { }
-		NETLIB_UPDATEI() { }
-	private:
-		NETLIB_SUB(74123_base)<9602> m_A;
-		NETLIB_SUB(74123_base)<9602> m_B;
+		template<typename T> static constexpr netlist_sig_t clear(const T &in) { plib::unused_var(in); return 1;}
 	};
 
-	NETLIB_OBJECT(4538_dip)
+	struct desc_9602 : public desc_74123
 	{
-		NETLIB_CONSTRUCTOR_MODEL(4538_dip, "CD4XXX")
-		, m_A(*this, "A")
-		, m_B(*this, "B")
+		template<typename T>
+		static netlist_sig_t trigfunc(const T &in)
 		{
-			register_subalias("1", m_A.m_RN.N()); // C1
-			register_subalias("2", m_A.m_RN.P()); // RC1
-			register_subalias("3", m_A.m_CLRQ);
-			register_subalias("4", m_A.m_A);
-			register_subalias("5", m_A.m_B);
-			register_subalias("6", m_A.m_Q);
-			register_subalias("7", m_A.m_QQ);
-			register_subalias("8", m_A.m_RN.N());
-			connect(m_A.m_RN.N(), m_B.m_RN.N());
-
-			register_subalias("9", m_B.m_QQ);
-			register_subalias("10", m_B.m_Q);
-			register_subalias("11", m_B.m_B);
-			register_subalias("12", m_B.m_A);
-			register_subalias("13", m_B.m_CLRQ);
-			register_subalias("14", m_B.m_RN.P()); // RC2
-			register_subalias("15", m_B.m_RN.N()); // C2
-			register_subalias("16", m_A.m_RP.P());
-			connect(m_A.m_RP.P(), m_B.m_RP.P());
+			return ((in[1]() ^ 1) | in[2]()); // (m_A() ^ 1) | m_B()
 		}
-		NETLIB_RESETI();
-		NETLIB_UPDATEI();
-	private:
-		NETLIB_SUB(74123_base)<4538> m_A;
-		NETLIB_SUB(74123_base)<4538> m_B;
 	};
 
-	NETLIB_UPDATE(4538_dip)
+	struct desc_4538 : public desc_74123
 	{
-		/* only called during startup */
-		//m_1.update_dev();
-		//m_2.update_dev();
-	}
+		using t_AB_to_Q = time_ns<300>;
+		using t_C_to_Q = time_ns<250>;
+		static constexpr nl_fptype K() { return nlconst::one(); } // CD4538 datasheet states PW=RC
 
-	NETLIB_RESET(4538_dip)
-	{
-		m_A.reset();
-		m_B.reset();
-	}
+		template<typename T>
+		static netlist_sig_t trigfunc(const T &in)
+		{
+			return (in[1]() | (in[2]() ^ 1)); // m_A() | (m_B() ^ 1)
+		}
+		static constexpr const char *vcc() { return "VDD"; }
+		static constexpr const char *gnd() { return "VSS"; }
+	};
 
-	using NETLIB_NAME(74123) = NETLIB_NAME(74123_base)<74123>;
+	using NETLIB_NAME(74123) = NETLIB_NAME(74123_base)<desc_74123>;
+	using NETLIB_NAME(74121) = NETLIB_NAME(74123_base)<desc_74121>;
+	using NETLIB_NAME(4538) = NETLIB_NAME(74123_base)<desc_4538>;
+	using NETLIB_NAME(9602) = NETLIB_NAME(74123_base)<desc_9602>;
 
 	NETLIB_DEVICE_IMPL(74123, "TTL_74123", "")
-	NETLIB_DEVICE_IMPL(74123_dip, "TTL_74123_DIP", "")
-	NETLIB_DEVICE_IMPL(4538_dip, "CD4538_DIP", "")
-	NETLIB_DEVICE_IMPL(9602_dip, "TTL_9602_DIP",           "")
+	NETLIB_DEVICE_IMPL(74121, "TTL_74121", "")
+	NETLIB_DEVICE_IMPL(4538,  "CD4538",    "")
+	NETLIB_DEVICE_IMPL(9602,  "TTL_9602",  "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74123.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74123.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74123.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74123.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,50 +1,5 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_74123.h
- *
- *  74123: Dual Retriggerable One-Shot with Clear and Complementary Outputs
- *
- *           +--------------+
- *        A1 |1     ++    16| VCC
- *        B1 |2           15| RC1
- *      CLR1 |3           14| C1
- *       Q1Q |4   74123   13| Q1
- *        Q2 |5           12| Q2Q
- *        C2 |6           11| CLR2
- *       RC2 |7           10| B2
- *       GND |8            9| A2
- *           +--------------+
- *
- *  Naming conventions follow Fairchild Semiconductor datasheet
- *
- *  DM9602: Dual Retriggerable, Resettable One Shots
- *
- *           +--------------+
- *        C1 |1     ++    16| VCC
- *       RC1 |2           15| C2
- *      CLR1 |3           14| RC2
- *        B1 |4    9602   13| CLR2
- *        A1 |5           12| B2
- *        Q1 |6           11| A2
- *       Q1Q |7           10| Q2
- *       GND |8            9| Q2Q
- *           +--------------+
- *
- *  CD4538: Dual Retriggerable, Resettable One Shots
- *
- *           +--------------+
- *        C1 |1     ++    16| VCC
- *       RC1 |2           15| C2
- *      CLR1 |3           14| RC2
- *        A1 |4    4538   13| CLR2
- *        B1 |5           12| A2
- *        Q1 |6           11| B2
- *       Q1Q |7           10| Q2
- *       GND |8            9| Q2Q
- *           +--------------+
- *
- */
 
 #ifndef NLD_74123_H_
 #define NLD_74123_H_
@@ -54,21 +9,13 @@
 #define TTL_74123(name)                                                         \
 		NET_REGISTER_DEV(TTL_74123, name)
 
-#define TTL_74123_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_74123_DIP, name)
+#define TTL_74121(name)                                                         \
+		NET_REGISTER_DEV(TTL_74121, name)
 
-/* The 9602 is very similar to the 123. Input triggering is slightly different
- * The 9602 uses an OR gate instead of an AND gate.
- */
-
-#define TTL_9602_DIP(name)                                                      \
-		NET_REGISTER_DEV(TTL_9602_DIP, name)
-
-/*
- * The CD4538 is pretty similar to the 9602
- */
+#define TTL_9602(name)                                                         \
+		NET_REGISTER_DEV(TTL_9602, name)
 
-#define CD4538_DIP(name)                                                        \
-		NET_REGISTER_DEV(CD4538_DIP, name)
+#define CD4538(name)                                                         \
+		NET_REGISTER_DEV(CD4538, name)
 
 #endif /* NLD_74123_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74125.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74125.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74125.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74125.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,22 +12,6 @@
 
 namespace netlist
 {
-	template <typename T>
-	struct uptr : public device_arena::unique_ptr<T>
-	{
-		uptr() = default;
-
-		using base_type = device_arena::unique_ptr<T>;
-
-		template<typename O, typename... Args>
-		uptr(O &owner, const pstring &name, Args&&... args)
-		: device_arena::unique_ptr<T>(owner.template make_pool_object<T>(owner, name, std::forward<Args>(args)...))
-		{ }
-
-		constexpr auto operator ()() noexcept -> decltype((*device_arena::unique_ptr<T>::get())()) { return (*this->get())(); }
-		constexpr auto operator ()() const noexcept -> const decltype((*device_arena::unique_ptr<T>::get())()) { return (*this->get())(); }
-	};
-
 	namespace devices
 	{
 
@@ -37,7 +21,7 @@
 		NETLIB_CONSTRUCTOR(74125_base)
 		, m_TE(*this, "FORCE_TRISTATE_LOGIC", 0)
 		, m_A(*this, "A", NETLIB_DELEGATE(A))
-		, m_G(*this, pstring(D::invert_g::value ? "GQ" : "G"), NETLIB_DELEGATE(G))
+		, m_G(*this, pstring(D::invert_g::value ? "G" : "GQ"), NETLIB_DELEGATE(G))
 		, m_Y(*this, "Y", m_TE())
 		//, m_Y(*this, "Y")
 		, m_power_pins(*this)
@@ -45,11 +29,9 @@
 		}
 
 	private:
-		NETLIB_RESETI()
-		{
-		}
+		//NETLIB_RESETI() {}
 
-		NETLIB_UPDATEI()
+		NETLIB_UPDATE_PARAMI()
 		{
 			// this one is only called during startup. Ensure all outputs
 			// are in a consistent state.
@@ -71,14 +53,14 @@
 
 		param_logic_t      m_TE;
 		logic_input_t      m_A;
-		uptr<logic_input_t>      m_G;
+		logic_input_t      m_G;
 		tristate_output_t  m_Y;
 		nld_power_pins     m_power_pins;
 	};
 
 	struct desc_74125 : public desc_base
 	{
-		using invert_g = desc_const<1>;
+		using invert_g = desc_const<0>;
 		using ts_off_on = time_ns<11>;
 		using ts_on_off = time_ns<13>;
 		using sig_off_on = time_ns<8>;
@@ -87,7 +69,7 @@
 
 	struct desc_74126 : public desc_74125
 	{
-		using invert_g = desc_const<0>;
+		using invert_g = desc_const<1>;
 	};
 
 	using NETLIB_NAME(74125) = NETLIB_NAME(74125_base)<desc_74125>;
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74153.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74153.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74153.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74153.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,44 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_74153.c
+ * nld_74153.cpp
+ *
+ *  DM74153: Dual 4-Line to 1-Line Data Selectors Multiplexers
+ *
+ *          +--------------+
+ *       G1 |1     ++    16| VCC
+ *        B |2           15| G2
+ *      1C3 |3           14| A
+ *      1C2 |4   74153   13| 2C3
+ *      1C1 |5           12| 2C2
+ *      1C0 |6           11| 2C1
+ *       Y1 |7           10| 2C0
+ *      GND |8            9| Y2
+ *          +--------------+
+ *
+ *
+ *          Function table
+ *
+ *          +-----+-----++----+----+----+----++----+----+
+ *          |  B  |  A  || C0 | C1 | C2 | C3 ||  G |  Y |
+ *          +=====+=====++====+====+====+====++====+====+
+ *          |  X  |  X  ||  X |  X |  X |  X ||  H |  L |
+ *          |  L  |  L  ||  L |  X |  X |  X ||  L |  L |
+ *          |  L  |  L  ||  H |  X |  X |  X ||  L |  H |
+ *          |  L  |  H  ||  X |  L |  X |  X ||  L |  L |
+ *          |  L  |  H  ||  X |  H |  X |  X ||  L |  H |
+ *          |  H  |  L  ||  X |  X |  L |  X ||  L |  L |
+ *          |  H  |  L  ||  X |  X |  H |  X ||  L |  H |
+ *          |  H  |  H  ||  X |  X |  X |  L ||  L |  L |
+ *          |  H  |  H  ||  X |  X |  X |  H ||  L |  H |
+ *          +-----+-----++----+----+----+----++----+----+
+ *
+ *  A, B : Select Inputs
+ *  C*   : Data inputs
+ *  G    : Strobe
+ *  Y    : Output
+ *
+ *  Naming conventions follow National Semiconductor datasheet
  *
  */
 
@@ -13,10 +50,9 @@
 namespace devices
 {
 
-	/* FIXME: timing is not 100% accurate, Strobe and Select inputs have a
-	 *        slightly longer timing.
-	 *        Convert this to sub-devices at some time.
-	 */
+	// FIXME: timing is not 100% accurate, Strobe and Select inputs have a
+	//        slightly longer timing .
+	// FIXME: Truthtable candidate
 
 	NETLIB_OBJECT(74153)
 	{
@@ -25,8 +61,8 @@
 		, m_G(*this, "G", NETLIB_DELEGATE(sub))
 		, m_Y(*this, "AY") //FIXME: Change netlists
 		, m_chan(*this, "m_chan", 0)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
+		, m_A(*this, "A", NETLIB_DELEGATE(other))
+		, m_B(*this, "B", NETLIB_DELEGATE(other))
 		, m_power_pins(*this)
 		{
 		}
@@ -36,7 +72,7 @@
 			m_chan = 0;
 		}
 
-		NETLIB_UPDATEI()
+		NETLIB_HANDLERI(other)
 		{
 			m_chan = (m_A() | (m_B()<<1));
 			sub();
@@ -70,46 +106,7 @@
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(74153_dip)
-	{
-		NETLIB_CONSTRUCTOR(74153_dip)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		{
-			register_subalias("1", m_A.m_G);
-			register_subalias("2", m_A.m_B);
-			register_subalias("3", m_A.m_C[3]);
-			register_subalias("4", m_A.m_C[2]);
-			register_subalias("5", m_A.m_C[1]);
-			register_subalias("6", m_A.m_C[0]);
-			register_subalias("7", m_A.m_Y);
-			register_subalias("8", "A.GND");
-
-			register_subalias("9", m_B.m_Y);
-			register_subalias("10", m_B.m_C[0]);
-			register_subalias("11", m_B.m_C[1]);
-			register_subalias("12", m_B.m_C[2]);
-			register_subalias("13", m_B.m_C[3]);
-			register_subalias("14", m_A.m_A);
-
-			register_subalias("15", m_B.m_G);
-			register_subalias("16", "A.VCC");
-
-			connect("A.GND", "B.GND");
-			connect("A.VCC", "B.VCC");
-			connect(m_A.m_A, m_B.m_A);
-			connect(m_A.m_B, m_B.m_B);
-		}
-		//NETLIB_RESETI();
-		//NETLIB_UPDATEI();
-
-	protected:
-		NETLIB_SUB(74153) m_A;
-		NETLIB_SUB(74153) m_B;
-	};
-
 	NETLIB_DEVICE_IMPL(74153, "TTL_74153", "+C0,+C1,+C2,+C3,+A,+B,+G,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(74153_dip, "TTL_74153_DIP", "")
 
 } //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74153.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74153.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74153.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74153.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,65 +1,13 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_74153.h
- *
- *  DM74153: Dual 4-Line to 1-Line Data Selectors Multiplexers
- *
- *          +--------------+
- *       G1 |1     ++    16| VCC
- *        B |2           15| G2
- *      1C3 |3           14| A
- *      1C2 |4   74153   13| 2C3
- *      1C1 |5           12| 2C2
- *      1C0 |6           11| 2C1
- *       Y1 |7           10| 2C0
- *      GND |8            9| Y2
- *          +--------------+
- *
- *
- *          Function table
- *
- *          +-----+-----++----+----+----+----++----+----+
- *          |  B  |  A  || C0 | C1 | C2 | C3 ||  G |  Y |
- *          +=====+=====++====+====+====+====++====+====+
- *          |  X  |  X  ||  X |  X |  X |  X ||  H |  L |
- *          |  L  |  L  ||  L |  X |  X |  X ||  L |  L |
- *          |  L  |  L  ||  H |  X |  X |  X ||  L |  H |
- *          |  L  |  H  ||  X |  L |  X |  X ||  L |  L |
- *          |  L  |  H  ||  X |  H |  X |  X ||  L |  H |
- *          |  H  |  L  ||  X |  X |  L |  X ||  L |  L |
- *          |  H  |  L  ||  X |  X |  H |  X ||  L |  H |
- *          |  H  |  H  ||  X |  X |  X |  L ||  L |  L |
- *          |  H  |  H  ||  X |  X |  X |  H ||  L |  H |
- *          +-----+-----++----+----+----+----++----+----+
- *
- *  A, B : Select Inputs
- *  C*   : Data inputs
- *  G    : Strobe
- *  Y    : Output
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
 
 #ifndef NLD_74153_H_
 #define NLD_74153_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_74153(name, cC0, cC1, cC2, cC3, cA, cB, cG)                        \
-		NET_REGISTER_DEV(TTL_74153, name)                                      \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, C0, cC0)                                             \
-		NET_CONNECT(name, C1, cC1)                                             \
-		NET_CONNECT(name, C2, cC2)                                             \
-		NET_CONNECT(name, C3, cC3)                                             \
-		NET_CONNECT(name, A, cA)                                               \
-		NET_CONNECT(name, B, cB)                                               \
-		NET_CONNECT(name, G, cG)
-
-#define TTL_74153_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74153_DIP, name)
+// usage: TTL_74153(name, cC0, cC1, cC2, cC3, cA, cB, cG)
+#define TTL_74153(...)                                                        \
+		NET_REGISTER_DEVEXT(TTL_74153, __VA_ARGS__)
 
 #endif /* NLD_74153_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74161.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74161.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74161.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74161.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -23,7 +23,6 @@
 	{
 
 		NETLIB_DEVICE_IMPL(74161,     "TTL_74161",     "+CLK,+ENP,+ENT,+CLRQ,+LOADQ,+A,+B,+C,+D,@VCC,@GND")
-		NETLIB_DEVICE_IMPL(74161_dip, "TTL_74161_DIP", "")
 		// FIXME: This happens on copy/paste
 		NETLIB_DEVICE_IMPL(74161_fixme, "TTL_74161_FIXME", "+A,+B,+C,+D,+CLRQ,+LOADQ,+CLK,+ENP,+ENT,@VCC,@GND")
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74163.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74163.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74163.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74163.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -23,7 +23,6 @@
 	{
 
 		NETLIB_DEVICE_IMPL(74163,     "TTL_74163",     "+CLK,+ENP,+ENT,+CLRQ,+LOADQ,+A,+B,+C,+D,@VCC,@GND")
-		NETLIB_DEVICE_IMPL(74163_dip, "TTL_74163_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74164.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74164.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74164.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74164.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,10 +7,50 @@
  * implementing this was simple.
  *
  */
+/*****************************************************************************
+
+    5/74164 8-bit parallel-out serial shift registers
+
+***********************************************************************
+
+    Connection Diagram:
+              ___ ___
+        A  1 |*  u   | 14  Vcc
+        B  2 |       | 13  QH
+       QA  3 |       | 12  QG
+       QB  4 |       | 11  QF
+       QC  5 |       | 10  QE
+       QD  6 |       |  9  *Clear
+      GND  7 |_______|  8  Clock
+
+***********************************************************************
+    Function Table:
+    +-------------------------+----------------+
+    |       Inputs            |  Qutputs*      |
+    +-------+-------+---------+----------------+
+    | Clear | Clock |  A   B  | QA  QB ... QH  |
+    +-------+-------+---------+----------------+
+    |   L   |   X   |  X   X  |  L   L      L  |
+    |   H   |   L   |  X   X  | QA0 QB0    QH0 |
+    |   H   |   ^   |  H   H  |  H  QAn    QGn |
+    |   H   |   ^   |  L   X  |  L  QAn    QGn |
+    |   H   |   ^   |  X   L  |  L  QAn    QGn |
+    +-------+-------+---------+----------------+
+
+    H = High Level (steady state)
+    L = Low Level (steady state)
+    X = Don't Care
+    ^ = Transition from low to high level
+    QA0, QB0 ... QH0 = The level of QA, QB ... QH before the indicated steady-state input conditions were established.
+    QAn, QGn = The level of QA or QG before the most recent ^ transition of the clock; indicates a 1 bit shift.
+
+**********************************************************************/
 
 #include "nld_74164.h"
 #include "netlist/nl_base.h"
 
+// FIXME: clk input to be separated - only falling edge relevant
+
 namespace netlist
 {
 	namespace devices
@@ -18,94 +58,65 @@
 	NETLIB_OBJECT(74164)
 	{
 		NETLIB_CONSTRUCTOR(74164)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		, m_CLRQ(*this, "CLRQ")
-		, m_CLK(*this, "CLK")
+		, m_AB(*this, {"A", "B"}, NETLIB_DELEGATE(ab))
+		, m_CLRQ(*this, "CLRQ", NETLIB_DELEGATE(clrq))
+		, m_CLK(*this, "CLK", NETLIB_DELEGATE(clk))
 		, m_cnt(*this, "m_cnt", 0)
-		, m_last_CLK(*this, "m_last_CLK", 0)
+		, m_ab(*this, "m_ab", 0)
 		, m_Q(*this, {"QA", "QB", "QC", "QD", "QE", "QF", "QG", "QH"})
 		, m_power_pins(*this)
 		{
 		}
 
+	private:
 		NETLIB_RESETI()
 		{
+			m_CLK.set_state(logic_t::STATE_INP_LH);
 			m_cnt = 0;
-			m_last_CLK = 0;
-		}
-
-		NETLIB_UPDATEI();
-
-		friend class NETLIB_NAME(74164_dip);
-	private:
-		logic_input_t m_A;
-		logic_input_t m_B;
-		logic_input_t m_CLRQ;
-		logic_input_t m_CLK;
-
-		state_var<unsigned> m_cnt;
-		state_var<unsigned> m_last_CLK;
-
-		object_array_t<logic_output_t, 8> m_Q;
-		nld_power_pins m_power_pins;
-	};
-
-	NETLIB_OBJECT(74164_dip)
-	{
-		NETLIB_CONSTRUCTOR(74164_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_A);
-			register_subalias("2", A.m_B);
-			register_subalias("3", A.m_Q[0]);
-			register_subalias("4", A.m_Q[1]);
-			register_subalias("5", A.m_Q[2]);
-			register_subalias("6", A.m_Q[3]);
-			register_subalias("7", "A.GND");
-
-			register_subalias("8", A.m_CLK);
-			register_subalias("9", A.m_CLRQ);
-			register_subalias("10", A.m_Q[4]);
-			register_subalias("11", A.m_Q[5]);
-			register_subalias("12", A.m_Q[6]);
-			register_subalias("13", A.m_Q[7]);
-			register_subalias("14", "A.VCC");
 		}
-	private:
-		NETLIB_SUB(74164) A;
-	};
 
-
-	NETLIB_UPDATE(74164)
-	{
-		if (!m_CLRQ())
+		NETLIB_HANDLERI(clrq)
 		{
-			m_cnt = 0;
-		}
-		else if (m_CLK() && !m_last_CLK)
-		{
-			m_cnt = (m_cnt << 1) & 0xfe;
-			if (m_A() && m_B())
+			if (m_CLRQ())
 			{
-				m_cnt |= 0x01;
+				m_CLK.activate_lh();
 			}
 			else
 			{
-				m_cnt &= 0xfe;
+				m_CLK.inactivate();
+				if (m_cnt != 0)
+				{
+					m_cnt = 0;
+					m_Q.push(0, NLTIME_FROM_NS(30));
+				}
 			}
 		}
 
-		m_last_CLK = m_CLK();
+		NETLIB_HANDLERI(clk)
+		{
+			m_cnt = (m_cnt << 1) | m_ab;
+			m_Q.push(m_cnt, NLTIME_FROM_NS(30));
+		}
 
-		for (std::size_t i=0; i<8; i++)
+		NETLIB_HANDLERI(ab)
 		{
-			m_Q[i].push((m_cnt >> i) & 1, NLTIME_FROM_NS(30));
+			m_ab = static_cast<unsigned>((m_AB() == 3) ? 1 : 0);
 		}
-	}
+
+		friend class NETLIB_NAME(74164_dip);
+	private:
+		object_array_t<logic_input_t, 2> m_AB;
+		logic_input_t m_CLRQ;
+		logic_input_t m_CLK;
+
+		state_var<unsigned> m_cnt;
+		state_var<unsigned> m_ab;
+
+		object_array_t<logic_output_t, 8> m_Q;
+		nld_power_pins m_power_pins;
+	};
 
 	NETLIB_DEVICE_IMPL(74164, "TTL_74164", "+A,+B,+CLRQ,+CLK,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(74164_dip, "TTL_74164_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74164.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74164.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74164.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74164.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,59 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:Joakim Larsson Edstrom
-/*****************************************************************************
-
-    5/74164 8-bit parallel-out serial shift registers
-
-***********************************************************************
-
-    Connection Diagram:
-              ___ ___
-        A  1 |*  u   | 14  Vcc
-        B  2 |       | 13  QH
-       QA  3 |       | 12  QG
-       QB  4 |       | 11  QF
-       QC  5 |       | 10  QE
-       QD  6 |       |  9  *Clear
-      GND  7 |_______|  8  Clock
-
-***********************************************************************
-    Function Table:
-    +-------------------------+----------------+
-    |       Inputs            |  Qutputs*      |
-    +-------+-------+---------+----------------+
-    | Clear | Clock |  A   B  | QA  QB ... QH  |
-    +-------+-------+---------+----------------+
-    |   L   |   X   |  X   X  |  L   L      L  |
-    |   H   |   L   |  X   X  | QA0 QB0    QH0 |
-    |   H   |   ^   |  H   H  |  H  QAn    QGn |
-    |   H   |   ^   |  L   X  |  L  QAn    QGn |
-    |   H   |   ^   |  X   L  |  L  QAn    QGn |
-    +-------+-------+---------+----------------+
-
-    H = High Level (steady state)
-    L = Low Level (steady state)
-    X = Don't Care
-    ^ = Transition from low to high level
-    QA0, QB0 ... QH0 = The level of QA, QB ... QH before the indicated steady-state input conditions were established.
-    QAn, QGn = The level of QA or QG before the most recent ^ transition of the clock; indicates a 1 bit shift.
-
-**********************************************************************/
 
 #ifndef NLD_74164_H_
 #define NLD_74164_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_74164(name, cA, cB, cCLRQ, cCLK)                                   \
-		NET_REGISTER_DEV(TTL_74164, name)                                      \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, A,       cA)                                         \
-		NET_CONNECT(name, B,       cB)                                         \
-		NET_CONNECT(name, CLRQ,   cCLRQ)                                       \
-		NET_CONNECT(name, CLK,     cCLK)
-
-#define TTL_74164_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74164_DIP, name)
+// usage: TTL_74164(name, cA, cB, cCLRQ, cCLK)
+#define TTL_74164(...)                                                        \
+		NET_REGISTER_DEVEXT(TTL_74164, __VA_ARGS__)
 
 #endif /* NLD_74164_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74165.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74165.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74165.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74165.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,25 @@
 /*
  * nld_74165.cpp
  *
+ *  74165: Parallel-Load 8-Bit Shift Register
+ *
+ *          +--------------+
+ *   SH/LDQ |1     ++    16| VCC
+ *      CLK |2           15| CLKINH
+ *        E |3           14| D
+ *        F |4    74165  13| C
+ *        G |5           12| B
+ *        H |6           11| A
+ *      QHQ |7           10| SER
+ *      GND |8            9| QH
+ *          +--------------+
+ *
+ * SH/LDQ: Shift / !Load
+ * CLKINH: Clock Inhibit
+ * SER: Serial In
+ *
+ *  Naming convention attempts to follow NTE Electronics datasheet
+ *
  */
 
 #include "nld_74165.h"
@@ -12,30 +31,57 @@
 {
 	namespace devices
 	{
+
 	NETLIB_OBJECT(74165)
 	{
 		NETLIB_CONSTRUCTOR(74165)
-		, m_DATA(*this, { "H", "G", "F", "E", "D", "C", "B", "A" })
-		, m_SER(*this, "SER")
-		, m_SH_LDQ(*this, "SH_LDQ")
-		, m_CLK(*this, "CLK")
-		, m_CLKINH(*this, "CLKINH")
+		, m_DATA(*this, { "H", "G", "F", "E", "D", "C", "B", "A" }, NETLIB_DELEGATE(inputs))
+		, m_SER(*this, "SER", NETLIB_DELEGATE_NOOP())
+		, m_SH_LDQ(*this, "SH_LDQ", NETLIB_DELEGATE(inputs))
+		, m_CLK(*this, "CLK", NETLIB_DELEGATE(clk))
+		, m_CLKINH(*this, "CLKINH", NETLIB_DELEGATE(inputs))
 		, m_QH(*this, "QH")
 		, m_QHQ(*this, "QHQ")
 		, m_shifter(*this, "m_shifter", 0)
-		, m_last_CLK(*this, "m_last_CLK", 0)
 		, m_power_pins(*this)
 		{
 		}
 
 		NETLIB_RESETI()
 		{
+			m_CLK.set_state(logic_t::STATE_INP_LH);
 			m_shifter = 0;
-			m_last_CLK = 0;
 		}
-		NETLIB_UPDATEI();
 
-		friend class NETLIB_NAME(74165_dip);
+		NETLIB_HANDLERI(clk)
+		{
+			unsigned high_bit = m_SER() ? 0x80 : 0;
+			m_shifter = high_bit | (m_shifter >> 1);
+
+			const auto qh = m_shifter & 1;
+
+			m_QH.push(qh, NLTIME_FROM_NS(20)); // FIXME: Timing
+			m_QHQ.push(qh ^ 1, NLTIME_FROM_NS(20)); // FIXME: Timing
+		}
+
+		NETLIB_HANDLERI(inputs)
+		{
+			if (!m_SH_LDQ())
+			{
+				m_shifter = 0;
+				for (std::size_t i=0; i<8; i++)
+					m_shifter |= (m_DATA[i]() << i);
+				const auto qh = m_shifter & 1;
+
+				m_QH.push(qh, NLTIME_FROM_NS(20)); // FIXME: Timing
+				m_QHQ.push(qh ^ 1, NLTIME_FROM_NS(20)); // FIXME: Timing
+			}
+			if (!m_SH_LDQ() || m_CLKINH())
+				m_CLK.inactivate();
+			else
+				m_CLK.activate_lh();
+		}
+
 	private:
 		object_array_t<logic_input_t, 8> m_DATA;
 		logic_input_t m_SER;
@@ -46,71 +92,11 @@
 		logic_output_t m_QHQ;
 
 		state_var<unsigned> m_shifter;
-		state_var<unsigned> m_last_CLK;
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(74165_dip)
-	{
-		NETLIB_CONSTRUCTOR(74165_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_SH_LDQ);
-			register_subalias("2", A.m_CLK);
-			register_subalias("3", A.m_DATA[4]);
-			register_subalias("4", A.m_DATA[5]);
-			register_subalias("5", A.m_DATA[6]);
-			register_subalias("6", A.m_DATA[7]);
-			register_subalias("7", A.m_QHQ);
-			register_subalias("8", "A.GND");
-
-			register_subalias("9",  A.m_QH);
-			register_subalias("10", A.m_SER);
-			register_subalias("11", A.m_DATA[0]);
-			register_subalias("12", A.m_DATA[1]);
-			register_subalias("13", A.m_DATA[2]);
-			register_subalias("14", A.m_DATA[3]);
-			register_subalias("15", A.m_CLKINH);
-			register_subalias("16", "A.VCC");
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(74165) A;
-	};
-
 	// FIXME: Timing
-	NETLIB_UPDATE(74165)
-	{
-		netlist_sig_t old_qh = m_QH.net().Q();
-		netlist_sig_t qh = 0;
-
-		if (!m_SH_LDQ())
-		{
-			m_shifter = 0;
-			for (std::size_t i=0; i<8; i++)
-				m_shifter |= (m_DATA[i]() << i);
-		}
-		else if (!m_CLK() || m_CLKINH())
-		{
-			// FIXME: qh is overwritten below?
-			qh = old_qh;
-		}
-		else if (!m_last_CLK)
-		{
-			unsigned high_bit = m_SER() ? 0x80 : 0;
-			m_shifter = high_bit | (m_shifter >> 1);
-		}
-
-		qh = m_shifter & 1;
-
-		m_last_CLK = m_CLK();
-
-		m_QH.push(qh, NLTIME_FROM_NS(20)); // FIXME: Timing
-	}
-
 	NETLIB_DEVICE_IMPL(74165, "TTL_74165", "+CLK,+CLKINH,+SH_LDQ,+SER,+A,+B,+C,+D,+E,+F,+G,+H,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(74165_dip, "TTL_74165_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74165.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74165.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74165.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74165.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,52 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-/*
- * nld_74165.h
- *
- *  74165: Parallel-Load 8-Bit Shift Register
- *
- *          +--------------+
- *   SH/LDQ |1     ++    16| VCC
- *      CLK |2           15| CLKINH
- *        E |3           14| D
- *        F |4    74165  13| C
- *        G |5           12| B
- *        H |6           11| A
- *      QHQ |7           10| SER
- *      GND |8            9| QH
- *          +--------------+
- *
- * SH/LDQ: Shift / !Load
- * CLKINH: Clock Inhibit
- * SER: Serial In
- *
- *  Naming convention attempts to follow NTE Electronics datasheet
- *
- */
 
 #ifndef NLD_74165_H_
 #define NLD_74165_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_74165(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH)   \
-		NET_REGISTER_DEV(TTL_74165, name)                                      \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CLK,    cCLK)                                        \
-		NET_CONNECT(name, CLKINH, cCLKINH)                                     \
-		NET_CONNECT(name, SH_LDQ, cSH_LDQ)                                     \
-		NET_CONNECT(name, SER,    cSER)                                        \
-		NET_CONNECT(name, A,      cA)                                          \
-		NET_CONNECT(name, B,      cB)                                          \
-		NET_CONNECT(name, C,      cC)                                          \
-		NET_CONNECT(name, D,      cD)                                          \
-		NET_CONNECT(name, E,      cE)                                          \
-		NET_CONNECT(name, F,      cF)                                          \
-		NET_CONNECT(name, G,      cG)                                          \
-		NET_CONNECT(name, H,      cH)
-
-#define TTL_74165_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74165_DIP, name)
+// usage: TTL_74165(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH)
+#define TTL_74165(...)                                                        \
+		NET_REGISTER_DEVEXT(TTL_74165, __VA_ARGS__)
 
 #endif /* NLD_74165_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74166.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74166.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74166.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74166.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,11 +3,32 @@
 /*
  * nld_74166.cpp
  *
+ *  74166: Parallel-Load 8-Bit Shift Register
+ *
+ *          +--------------+
+ *      SER |1     ++    16| VCC
+ *        A |2           15| SH/LDQ
+ *        B |3           14| H
+ *        C |4    74166  13| QH
+ *        D |5           12| G
+ *   CLKINH |6           11| F
+ *      CLK |7           10| E
+ *      GND |8            9| CLRQ
+ *          +--------------+
+ *
+ * SH/LDQ: Shift / !Load
+ * CLKINH: Clock Inhibit
+ * SER: Serial In
+ *
+ *  Naming convention attempts to follow Texas Instruments datasheet
+ *
  */
 
 #include "nld_74166.h"
 #include "netlist/nl_base.h"
 
+// FIXME: separate handlers for inputs
+
 namespace netlist
 {
 	namespace devices
@@ -15,12 +36,12 @@
 	NETLIB_OBJECT(74166)
 	{
 		NETLIB_CONSTRUCTOR(74166)
-		, m_DATA(*this, { "H", "G", "F", "E", "D", "C", "B", "A" })
-		, m_SER(*this, "SER")
-		, m_CLRQ(*this, "CLRQ")
-		, m_SH_LDQ(*this, "SH_LDQ")
-		, m_CLK(*this, "CLK")
-		, m_CLKINH(*this, "CLKINH")
+		, m_DATA(*this, { "H", "G", "F", "E", "D", "C", "B", "A" }, NETLIB_DELEGATE(inputs))
+		, m_SER(*this, "SER", NETLIB_DELEGATE(inputs))
+		, m_CLRQ(*this, "CLRQ", NETLIB_DELEGATE(inputs))
+		, m_SH_LDQ(*this, "SH_LDQ", NETLIB_DELEGATE(inputs))
+		, m_CLK(*this, "CLK", NETLIB_DELEGATE(inputs))
+		, m_CLKINH(*this, "CLKINH", NETLIB_DELEGATE(inputs))
 		, m_QH(*this, "QH")
 		, m_shifter(*this, "m_shifter", 0)
 		, m_last_CLRQ(*this, "m_last_CLRQ", 0)
@@ -35,7 +56,52 @@
 			m_last_CLRQ = 0;
 			m_last_CLK = 0;
 		}
-		NETLIB_UPDATEI();
+
+		NETLIB_HANDLERI(inputs)
+		{
+			netlist_sig_t old_qh = m_QH.net().Q();
+			netlist_sig_t qh = 0;
+
+			netlist_time delay = NLTIME_FROM_NS(26);
+			if (m_CLRQ())
+			{
+				bool clear_unset = !m_last_CLRQ;
+				if (clear_unset)
+				{
+					delay = NLTIME_FROM_NS(35);
+				}
+
+				if (!m_CLK() || m_CLKINH())
+				{
+					qh = old_qh;
+				}
+				else if (!m_last_CLK)
+				{
+					if (!m_SH_LDQ())
+					{
+						m_shifter = 0;
+						for (std::size_t i=0; i<8; i++)
+							m_shifter |= (m_DATA[i]() << i);
+					}
+					else
+					{
+						unsigned high_bit = m_SER() ? 0x80 : 0;
+						m_shifter = high_bit | (m_shifter >> 1);
+					}
+
+					qh = m_shifter & 1;
+					if (!qh && !clear_unset)
+					{
+						delay = NLTIME_FROM_NS(30);
+					}
+				}
+			}
+
+			m_last_CLRQ = m_CLRQ();
+			m_last_CLK = m_CLK();
+
+			m_QH.push(qh, delay); //FIXME
+		}
 
 		friend class NETLIB_NAME(74166_dip);
 	private:
@@ -53,83 +119,7 @@
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(74166_dip)
-	{
-		NETLIB_CONSTRUCTOR(74166_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_SER);
-			register_subalias("2", A.m_DATA[7]);
-			register_subalias("3", A.m_DATA[6]);
-			register_subalias("4", A.m_DATA[5]);
-			register_subalias("5", A.m_DATA[4]);
-			register_subalias("6", A.m_CLKINH);
-			register_subalias("7", A.m_CLK);
-			register_subalias("8", "A.GND");
-
-			register_subalias("9", A.m_CLRQ);
-			register_subalias("10", A.m_DATA[3]);
-			register_subalias("11", A.m_DATA[2]);
-			register_subalias("12", A.m_DATA[1]);
-			register_subalias("13", A.m_QH);
-			register_subalias("14", A.m_DATA[0]);
-			register_subalias("15", A.m_SH_LDQ);
-			register_subalias("16", "A.VCC");
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(74166) A;
-	};
-
-	NETLIB_UPDATE(74166)
-	{
-		netlist_sig_t old_qh = m_QH.net().Q();
-		netlist_sig_t qh = 0;
-
-		netlist_time delay = NLTIME_FROM_NS(26);
-		if (m_CLRQ())
-		{
-			bool clear_unset = !m_last_CLRQ;
-			if (clear_unset)
-			{
-				delay = NLTIME_FROM_NS(35);
-			}
-
-			if (!m_CLK() || m_CLKINH())
-			{
-				qh = old_qh;
-			}
-			else if (!m_last_CLK)
-			{
-				if (!m_SH_LDQ())
-				{
-					m_shifter = 0;
-					for (std::size_t i=0; i<8; i++)
-						m_shifter |= (m_DATA[i]() << i);
-				}
-				else
-				{
-					unsigned high_bit = m_SER() ? 0x80 : 0;
-					m_shifter = high_bit | (m_shifter >> 1);
-				}
-
-				qh = m_shifter & 1;
-				if (!qh && !clear_unset)
-				{
-					delay = NLTIME_FROM_NS(30);
-				}
-			}
-		}
-
-		m_last_CLRQ = m_CLRQ();
-		m_last_CLK = m_CLK();
-
-		m_QH.push(qh, delay); //FIXME
-	}
-
 	NETLIB_DEVICE_IMPL(74166,    "TTL_74166", "+CLK,+CLKINH,+SH_LDQ,+SER,+A,+B,+C,+D,+E,+F,+G,+H,+CLRQ,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(74166_dip,"TTL_74166_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74166.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74166.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74166.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74166.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,53 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-/*
- * nld_74166.h
- *
- *  74166: Parallel-Load 8-Bit Shift Register
- *
- *          +--------------+
- *      SER |1     ++    16| VCC
- *        A |2           15| SH/LDQ
- *        B |3           14| H
- *        C |4    74166  13| QH
- *        D |5           12| G
- *   CLKINH |6           11| F
- *      CLK |7           10| E
- *      GND |8            9| CLRQ
- *          +--------------+
- *
- * SH/LDQ: Shift / !Load
- * CLKINH: Clock Inhibit
- * SER: Serial In
- *
- *  Naming convention attempts to follow Texas Instruments datasheet
- *
- */
 
 #ifndef NLD_74166_H_
 #define NLD_74166_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_74166(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH, cCLRQ)    \
-		NET_REGISTER_DEV(TTL_74166, name)                                      \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CLK,    cCLK)                                        \
-		NET_CONNECT(name, CLKINH, cCLKINH)                                     \
-		NET_CONNECT(name, SH_LDQ, cSH_LDQ)                                     \
-		NET_CONNECT(name, SER,    cSER)                                        \
-		NET_CONNECT(name, A,      cA)                                          \
-		NET_CONNECT(name, B,      cB)                                          \
-		NET_CONNECT(name, C,      cC)                                          \
-		NET_CONNECT(name, D,      cD)                                          \
-		NET_CONNECT(name, E,      cE)                                          \
-		NET_CONNECT(name, F,      cF)                                          \
-		NET_CONNECT(name, G,      cG)                                          \
-		NET_CONNECT(name, H,      cH)                                          \
-		NET_CONNECT(name, CLRQ,   cCLRQ)
-
-#define TTL_74166_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74166_DIP, name)
+// usage: TTL_74166(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH, cCLRQ)
+#define TTL_74166(...)                                                        \
+		NET_REGISTER_DEVEXT(TTL_74166, __VA_ARGS__)
 
 #endif /* NLD_74166_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74174.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74174.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74174.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74174.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,34 @@
 /*
  * nld_74174.cpp
  *
+ *  DM74174: Hex D Flip-Flops with Clear
+ *
+ *          +--------------+
+ *      CLR |1     ++    16| VCC
+ *       Q1 |2           15| Q6
+ *       D1 |3           14| D6
+ *       D2 |4   74174   13| D5
+ *       Q2 |5           12| Q5
+ *       D3 |6           11| D4
+ *       Q3 |7           10| Q4
+ *      GND |8            9| CLK
+ *          +--------------+
+ *
+ *          +-----+-----+---++---+-----+
+ *          | CLR | CLK | D || Q | QQ  |
+ *          +=====+=====+===++===+=====+
+ *          |  0  |  X  | X || 0 |  1  |
+ *          |  1  |  R  | 1 || 1 |  0  |
+ *          |  1  |  R  | 0 || 0 |  1  |
+ *          |  1  |  0  | X || Q0| Q0Q |
+ *          +-----+-----+---++---+-----+
+ *
+ *   Q0 The output logic level of Q before the indicated input conditions were established
+ *
+ *  R:  0 -> 1
+ *
+ *  Naming conventions follow National Semiconductor datasheet
+ *
  */
 
 #include "nld_74174.h"
@@ -12,15 +40,15 @@
 {
 namespace devices
 {
-	NETLIB_OBJECT(74174)
+	NETLIB_OBJECT(74174_GATE)
 	{
-		NETLIB_CONSTRUCTOR(74174)
-		, m_CLK(*this, "CLK", NETLIB_DELEGATE(sub))
-		, m_Q(*this, {"Q1", "Q2", "Q3", "Q4", "Q5", "Q6"})
+		NETLIB_CONSTRUCTOR(74174_GATE)
+		, m_CLK(*this, "CLK", NETLIB_DELEGATE(clk))
+		, m_Q(*this, "Q")
 		, m_clrq(*this, "m_clr", 0)
 		, m_data(*this, "m_data", 0)
-		, m_D(*this, {"D1", "D2", "D3", "D4", "D5", "D6"})
-		, m_CLRQ(*this, "CLRQ")
+		, m_D(*this, "D", NETLIB_DELEGATE(other))
+		, m_CLRQ(*this, "CLRQ", NETLIB_DELEGATE(other))
 		, m_power_pins(*this)
 		{
 		}
@@ -31,93 +59,110 @@
 			m_clrq = 0;
 			m_data = 0xFF;
 		}
-		NETLIB_UPDATEI();
 
-		NETLIB_HANDLERI(sub)
+		NETLIB_HANDLERI(other)
+		{
+			netlist_sig_t d = m_D();
+			m_clrq = m_CLRQ();
+			if (!m_clrq)
+			{
+				m_Q.push(0, NLTIME_FROM_NS(40));
+				m_data = 0;
+			} else if (d != m_data)
+			{
+				m_data = d;
+				m_CLK.activate_lh();
+			}
+		}
+
+	private:
+		NETLIB_HANDLERI(clk)
 		{
 			if (m_clrq)
 			{
-				for (std::size_t i=0; i<6; i++)
-				{
-					netlist_sig_t d = (m_data >> i) & 1;
-					m_Q[i].push(d, NLTIME_FROM_NS(25));
-				}
+				m_Q.push(m_data, NLTIME_FROM_NS(25));
 				m_CLK.inactivate();
 			}
 		}
 
-		friend class NETLIB_NAME(74174_dip);
-	private:
 		logic_input_t m_CLK;
-		object_array_t<logic_output_t, 6> m_Q;
+		logic_output_t m_Q;
 
 		state_var<netlist_sig_t> m_clrq;
-		state_var<unsigned>      m_data;
+		state_var<netlist_sig_t> m_data;
 
-		object_array_t<logic_input_t, 6> m_D;
+		logic_input_t m_D;
 		logic_input_t m_CLRQ;
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(74174_dip)
+	NETLIB_OBJECT(74174)
 	{
-		NETLIB_CONSTRUCTOR(74174_dip)
+		NETLIB_CONSTRUCTOR(74174)
 		, A(*this, "A")
-		{
-			register_subalias("1",  A.m_CLRQ);
-			register_subalias("9",  A.m_CLK);
-
-			register_subalias("3",  A.m_D[0]);
-			register_subalias("2",  A.m_Q[0]);
-
-			register_subalias("4",  A.m_D[1]);
-			register_subalias("5",  A.m_Q[1]);
-
-			register_subalias("6",  A.m_D[2]);
-			register_subalias("7",  A.m_Q[2]);
-
-			register_subalias("11", A.m_D[3]);
-			register_subalias("10", A.m_Q[3]);
-
-			register_subalias("13", A.m_D[4]);
-			register_subalias("12", A.m_Q[4]);
-
-			register_subalias("14", A.m_D[5]);
-			register_subalias("15", A.m_Q[5]);
-
-			register_subalias("8", "A.GND");
-			register_subalias("16", "A.VCC");
+		, B(*this, "B")
+		, C(*this, "C")
+		, D(*this, "D")
+		, E(*this, "E")
+		, F(*this, "F")
+		{
+			register_subalias("CLRQ", "A.CLRQ");
+			connect("A.CLRQ", "B.CLRQ");
+			connect("A.CLRQ", "C.CLRQ");
+			connect("A.CLRQ", "D.CLRQ");
+			connect("A.CLRQ", "E.CLRQ");
+			connect("A.CLRQ", "F.CLRQ");
+
+			register_subalias("CLK", "A.CLK");
+			connect("A.CLK", "B.CLK");
+			connect("A.CLK", "C.CLK");
+			connect("A.CLK", "D.CLK");
+			connect("A.CLK", "E.CLK");
+			connect("A.CLK", "F.CLK");
+
+			register_subalias("D1", "A.D");
+			register_subalias("Q1", "A.Q");
+
+			register_subalias("D2", "B.D");
+			register_subalias("Q2", "B.Q");
+
+			register_subalias("D3", "C.D");
+			register_subalias("Q3", "C.Q");
+
+			register_subalias("D4", "D.D");
+			register_subalias("Q4", "D.Q");
+
+			register_subalias("D5", "E.D");
+			register_subalias("Q5", "E.Q");
+
+			register_subalias("D6", "F.D");
+			register_subalias("Q6", "F.Q");
+
+			register_subalias("GND", "A.GND");
+			connect("A.GND", "B.GND");
+			connect("A.GND", "C.GND");
+			connect("A.GND", "D.GND");
+			connect("A.GND", "E.GND");
+			connect("A.GND", "F.GND");
+
+			register_subalias("VCC", "A.VCC");
+			connect("A.VCC", "B.VCC");
+			connect("A.VCC", "C.VCC");
+			connect("A.VCC", "D.VCC");
+			connect("A.VCC", "E.VCC");
+			connect("A.VCC", "F.VCC");
 		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
+		//NETLIB_RESETI() {}
 	private:
-		NETLIB_SUB(74174) A;
+		NETLIB_SUB(74174_GATE) A;
+		NETLIB_SUB(74174_GATE) B;
+		NETLIB_SUB(74174_GATE) C;
+		NETLIB_SUB(74174_GATE) D;
+		NETLIB_SUB(74174_GATE) E;
+		NETLIB_SUB(74174_GATE) F;
 	};
 
-	NETLIB_UPDATE(74174)
-	{
-		uint_fast8_t d = 0;
-		for (std::size_t i=0; i<6; i++)
-		{
-			d |= (m_D[i]() << i);
-		}
-		m_clrq = m_CLRQ();
-		if (!m_clrq)
-		{
-			for (std::size_t i=0; i<6; i++)
-			{
-				m_Q[i].push(0, NLTIME_FROM_NS(40));
-			}
-			m_data = 0;
-		} else if (d != m_data)
-		{
-			m_data = d;
-			m_CLK.activate_lh();
-		}
-	}
-
-	NETLIB_DEVICE_IMPL(74174,   "TTL_74174", "+CLK,+D1,+D2,+D3,+D4,+D5,+D6,+CLRQ,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(74174_dip,"TTL_74174_DIP",          "")
+	NETLIB_DEVICE_IMPL(74174,      "TTL_74174", "+CLK,+D1,+D2,+D3,+D4,+D5,+D6,+CLRQ,@VCC,@GND")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74174.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74174.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74174.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74174.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,58 +1,13 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_74174.h
- *
- *  DM74174: Hex D Flip-Flops with Clear
- *
- *          +--------------+
- *      CLR |1     ++    16| VCC
- *       Q1 |2           15| Q6
- *       D1 |3           14| D6
- *       D2 |4   74174   13| D5
- *       Q2 |5           12| Q5
- *       D3 |6           11| D4
- *       Q3 |7           10| Q4
- *      GND |8            9| CLK
- *          +--------------+
- *
- *          +-----+-----+---++---+-----+
- *          | CLR | CLK | D || Q | QQ  |
- *          +=====+=====+===++===+=====+
- *          |  0  |  X  | X || 0 |  1  |
- *          |  1  |  R  | 1 || 1 |  0  |
- *          |  1  |  R  | 0 || 0 |  1  |
- *          |  1  |  0  | X || Q0| Q0Q |
- *          +-----+-----+---++---+-----+
- *
- *   Q0 The output logic level of Q before the indicated input conditions were established
- *
- *  R:  0 -> 1
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
 
 #ifndef NLD_74174_H_
 #define NLD_74174_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_74174(name, cCLK, cD1, cD2, cD3, cD4, cD5, cD6, cCLRQ)             \
-		NET_REGISTER_DEV(TTL_74174, name)                                      \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CLK,  cCLK)                                          \
-		NET_CONNECT(name, D1,   cD1)                                           \
-		NET_CONNECT(name, D2,   cD2)                                           \
-		NET_CONNECT(name, D3,   cD3)                                           \
-		NET_CONNECT(name, D4,   cD4)                                           \
-		NET_CONNECT(name, D5,   cD5)                                           \
-		NET_CONNECT(name, D6,   cD6)                                           \
-		NET_CONNECT(name, CLRQ, cCLRQ)
-
-#define TTL_74174_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74174_DIP, name)
-
+// usage: TTL_74174(name, cCLK, cD1, cD2, cD3, cD4, cD5, cD6, cCLRQ)
+#define TTL_74174(...)                                                        \
+		NET_REGISTER_DEVEXT(TTL_74174, __VA_ARGS__)
 
 #endif /* NLD_74174_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74175.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74175.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74175.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74175.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,23 +1,57 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_74175.c
+ * nld_74175.cpp
+ *
+ *  DM74175: Quad D Flip-Flops with Clear
+ *
+ *          +--------------+
+ *      CLR |1     ++    16| VCC
+ *       Q1 |2           15| Q4
+ *      Q1Q |3           14| Q4Q
+ *       D1 |4   74175   13| D4
+ *       D2 |5           12| D3
+ *      Q2Q |6           11| Q3Q
+ *       Q2 |7           10| Q3
+ *      GND |8            9| CLK
+ *          +--------------+
+ *
+ *          +-----+-----+---++---+-----+
+ *          | CLR | CLK | D || Q | QQ  |
+ *          +=====+=====+===++===+=====+
+ *          |  0  |  X  | X || 0 |  1  |
+ *          |  1  |  R  | 1 || 1 |  0  |
+ *          |  1  |  R  | 0 || 0 |  1  |
+ *          |  1  |  0  | X || Q0| Q0Q |
+ *          +-----+-----+---++---+-----+
+ *
+ *   Q0 The output logic level of Q before the indicated input conditions were established
+ *
+ *  R:  0 -> 1
+ *
+ *  Naming conventions follow National Semiconductor datasheet
  *
  */
 
 #include "nld_74175.h"
 #include "netlist/nl_base.h"
 
+// FIXME: optimize
+
 namespace netlist
 {
 	namespace devices
 	{
 
+	static constexpr const std::array<netlist_time, 2> delay = { NLTIME_FROM_NS(25), NLTIME_FROM_NS(25) };
+	static constexpr const std::array<netlist_time, 2> delay_clear = { NLTIME_FROM_NS(40), NLTIME_FROM_NS(25) };
+
+
 	NETLIB_OBJECT(74175)
 	{
 		NETLIB_CONSTRUCTOR(74175)
-		, m_D(*this, {"D1", "D2", "D3", "D4"})
-		, m_CLRQ(*this, "CLRQ")
+		, m_D(*this, {"D1", "D2", "D3", "D4"}, NETLIB_DELEGATE(other))
+		, m_CLRQ(*this, "CLRQ", NETLIB_DELEGATE(other))
 		, m_CLK(*this, "CLK", NETLIB_DELEGATE(clk))
 		, m_Q(*this, {"Q1", "Q2", "Q3", "Q4"})
 		, m_QQ(*this, {"Q1Q", "Q2Q", "Q3Q", "Q4Q"})
@@ -26,102 +60,61 @@
 		{
 		}
 
+	private:
 		NETLIB_RESETI()
 		{
 			m_CLK.set_state(logic_t::STATE_INP_LH);
 			m_data = 0xFF;
 		}
-		NETLIB_UPDATEI();
-		NETLIB_HANDLERI(clk);
-
-		friend class NETLIB_NAME(74175_dip);
-	private:
-		object_array_t<logic_input_t, 4> m_D;
-		logic_input_t m_CLRQ;
-
-		logic_input_t m_CLK;
-		object_array_t<logic_output_t, 4> m_Q;
-		object_array_t<logic_output_t, 4> m_QQ;
-
-		state_var<unsigned>      m_data;
-		nld_power_pins m_power_pins;
-	};
-
-	NETLIB_OBJECT(74175_dip)
-	{
-		NETLIB_CONSTRUCTOR(74175_dip)
-		, A(*this, "A")
-		{
-			register_subalias("9", A.m_CLK);
-			register_subalias("1", A.m_CLRQ);
-
-			register_subalias("4", A.m_D[0]);
-			register_subalias("2", A.m_Q[0]);
-			register_subalias("3", A.m_QQ[0]);
-
-			register_subalias("5", A.m_D[1]);
-			register_subalias("7", A.m_Q[1]);
-			register_subalias("6", A.m_QQ[1]);
-
-			register_subalias("12", A.m_D[2]);
-			register_subalias("10", A.m_Q[2]);
-			register_subalias("11", A.m_QQ[2]);
-
-			register_subalias("13", A.m_D[3]);
-			register_subalias("15", A.m_Q[3]);
-			register_subalias("14", A.m_QQ[3]);
-
-			register_subalias("8",  "A.GND");
-			register_subalias("16", "A.VCC");
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(74175) A;
-	};
-
-	constexpr const std::array<netlist_time, 2> delay = { NLTIME_FROM_NS(25), NLTIME_FROM_NS(25) };
-	constexpr const std::array<netlist_time, 2> delay_clear = { NLTIME_FROM_NS(40), NLTIME_FROM_NS(25) };
 
-	NETLIB_HANDLER(74175, clk)
-	{
-		if (m_CLRQ())
+		NETLIB_HANDLERI(other)
 		{
+			uint_fast8_t d = 0;
 			for (std::size_t i=0; i<4; i++)
 			{
-				netlist_sig_t d = (m_data >> i) & 1;
-				m_Q[i].push(d, delay[d]);
-				m_QQ[i].push(d ^ 1, delay[d ^ 1]);
+				d |= (m_D[i]() << i);
+			}
+			if (!m_CLRQ())
+			{
+				for (std::size_t i=0; i<4; i++)
+				{
+					m_Q[i].push(0, delay_clear[0]);
+					m_QQ[i].push(1, delay_clear[1]);
+				}
+				m_data = 0;
+			} else if (d != m_data)
+			{
+				m_data = d;
+				m_CLK.activate_lh();
 			}
-			m_CLK.inactivate();
 		}
-	}
 
-	NETLIB_UPDATE(74175)
-	{
-		uint_fast8_t d = 0;
-		for (std::size_t i=0; i<4; i++)
-		{
-			d |= (m_D[i]() << i);
-		}
-		if (!m_CLRQ())
+		NETLIB_HANDLERI(clk)
 		{
-			for (std::size_t i=0; i<4; i++)
+			if (m_CLRQ())
 			{
-				m_Q[i].push(0, delay_clear[0]);
-				m_QQ[i].push(1, delay_clear[1]);
+				for (std::size_t i=0; i<4; i++)
+				{
+					netlist_sig_t d = (m_data >> i) & 1;
+					m_Q[i].push(d, delay[d]);
+					m_QQ[i].push(d ^ 1, delay[d ^ 1]);
+				}
+				m_CLK.inactivate();
 			}
-			m_data = 0;
-		} else if (d != m_data)
-		{
-			m_data = d;
-			m_CLK.activate_lh();
 		}
-	}
 
+		object_array_t<logic_input_t, 4> m_D;
+		logic_input_t m_CLRQ;
+
+		logic_input_t m_CLK;
+		object_array_t<logic_output_t, 4> m_Q;
+		object_array_t<logic_output_t, 4> m_QQ;
+
+		state_var<unsigned>      m_data;
+		nld_power_pins m_power_pins;
+	};
 
 	NETLIB_DEVICE_IMPL(74175,   "TTL_74175", "+CLK,+D1,+D2,+D3,+D4,+CLRQ,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(74175_dip,"TTL_74175_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74175.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74175.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74175.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74175.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,56 +1,14 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_74175.h
- *
- *  DM74175: Quad D Flip-Flops with Clear
- *
- *          +--------------+
- *      CLR |1     ++    16| VCC
- *       Q1 |2           15| Q4
- *      Q1Q |3           14| Q4Q
- *       D1 |4   74175   13| D4
- *       D2 |5           12| D3
- *      Q2Q |6           11| Q3Q
- *       Q2 |7           10| Q3
- *      GND |8            9| CLK
- *          +--------------+
- *
- *          +-----+-----+---++---+-----+
- *          | CLR | CLK | D || Q | QQ  |
- *          +=====+=====+===++===+=====+
- *          |  0  |  X  | X || 0 |  1  |
- *          |  1  |  R  | 1 || 1 |  0  |
- *          |  1  |  R  | 0 || 0 |  1  |
- *          |  1  |  0  | X || Q0| Q0Q |
- *          +-----+-----+---++---+-----+
- *
- *   Q0 The output logic level of Q before the indicated input conditions were established
- *
- *  R:  0 -> 1
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
 
 #ifndef NLD_74175_H_
 #define NLD_74175_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_74175(name, cCLK, cD1, cD2, cD3, cD4, cCLRQ)                       \
-		NET_REGISTER_DEV(TTL_74175, name)                                      \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CLK,  cCLK)                                          \
-		NET_CONNECT(name, D1,   cD1)                                           \
-		NET_CONNECT(name, D2,   cD2)                                           \
-		NET_CONNECT(name, D3,   cD3)                                           \
-		NET_CONNECT(name, D4,   cD4)                                           \
-		NET_CONNECT(name, CLRQ, cCLRQ)
-
-#define TTL_74175_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74175_DIP, name)
-
+// usage       : TTL_74175(name, pCLK, pD1, pD2, pD3, pD4, pCLRQ)
+// auto connect: VCC, GND
+#define TTL_74175(...)                                                 \
+	NET_REGISTER_DEVEXT(TTL_74175, __VA_ARGS__)
 
 #endif /* NLD_74175_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74192.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74192.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74192.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74192.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,28 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_74192.c
+ * nld_74192.cpp
+ *
+ *  DM74192: Synchronous 4-Bit Binary Counter with Dual Clock
+ *           Decade counter
+ *
+ *  FIXME: This should be merged with the 74193 which counts to 16
+ *
+ *          +--------------+
+ *        B |1     ++    16| VCC
+ *       QB |2           15| A
+ *       QA |3           14| CLEAR
+ *       CD |4    74192  13| BORROWQ
+ *       CU |5           12| CARRYQ
+ *       QC |6           11| LOADQ
+ *       QD |7           10| C
+ *      GND |8            9| D
+ *          +--------------+
+ *
+ * CD: Count up
+ * CU: Count down
+ *
+ *  Naming conventions follow National Semiconductor datasheet
  *
  */
 
@@ -15,13 +36,24 @@
 
 	static constexpr const unsigned MAXCNT = 9;
 
+	// FIXME: Optimize
+
+	// FIXME: Timing
+	static constexpr const std::array<netlist_time, 4> delay =
+	{
+			NLTIME_FROM_NS(40),
+			NLTIME_FROM_NS(40),
+			NLTIME_FROM_NS(40),
+			NLTIME_FROM_NS(40)
+	};
+
 	NETLIB_OBJECT(74192)
 	{
 		NETLIB_CONSTRUCTOR(74192)
-		, m_CLEAR(*this, "CLEAR")
-		, m_LOADQ(*this, "LOADQ")
-		, m_CU(*this, "CU")
-		, m_CD(*this, "CD")
+		, m_CLEAR(*this, "CLEAR", NETLIB_DELEGATE(inputs))
+		, m_LOADQ(*this, "LOADQ", NETLIB_DELEGATE(inputs))
+		, m_CU(*this, "CU", NETLIB_DELEGATE(inputs))
+		, m_CD(*this, "CD", NETLIB_DELEGATE(inputs))
 		, m_cnt(*this, "m_cnt", 0)
 		, m_last_CU(*this, "m_last_CU", 0)
 		, m_last_CD(*this, "m_last_CD", 0)
@@ -43,9 +75,6 @@
 			m_last_CD = 0;
 		}
 
-		NETLIB_UPDATEI();
-
-		friend class NETLIB_NAME(74192_dip);
 	private:
 		logic_input_t m_CLEAR;
 		logic_input_t m_LOADQ;
@@ -66,102 +95,63 @@
 		logic_input_t m_D;
 		nld_power_pins m_power_pins;
 
-		NETLIB_HANDLERI(sub)
+		NETLIB_HANDLERI(inputs)
 		{
-			// FIXME: can use more optimization
-		}
+			netlist_sig_t tCarry = 1;
+			netlist_sig_t tBorrow = 1;
+			if (m_CLEAR())
+			{
+				m_cnt = 0;
+			}
+			else if (!m_LOADQ())
+			{
+				m_cnt = read_ABCD();
+			}
+			else
+			{
+				if (m_CD() && !m_last_CU && m_CU())
+				{
+					if (++m_cnt > MAXCNT)
+						m_cnt = 0;
+				}
+				if (m_CU() && !m_last_CD && m_CD())
+				{
+					if (m_cnt > 0)
+						--m_cnt;
+					else
+						m_cnt = MAXCNT;
+				}
+			}
 
-		unsigned read_ABCD() const
-		{
-			return (m_D() << 3) | (m_C() << 2) | (m_B() << 1) | (m_A() << 0);
-		}
+			if (!m_CU() && (m_cnt == MAXCNT))
+				tCarry = 0;
 
-	};
+			if (!m_CD() && (m_cnt == 0))
+				tBorrow = 0;
 
-	NETLIB_OBJECT(74192_dip)
-	{
-		NETLIB_CONSTRUCTOR(74192_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_B);
-			register_subalias("2", A.m_Q[1]);
-			register_subalias("3", A.m_Q[0]);
-			register_subalias("4", A.m_CD);
-			register_subalias("5", A.m_CU);
-			register_subalias("6", A.m_Q[2]);
-			register_subalias("7", A.m_Q[3]);
-			register_subalias("8", "A.GND");
-
-			register_subalias("9", A.m_D);
-			register_subalias("10", A.m_C);
-			register_subalias("11", A.m_LOADQ);
-			register_subalias("12", A.m_CARRYQ);
-			register_subalias("13", A.m_BORROWQ);
-			register_subalias("14", A.m_CLEAR);
-			register_subalias("15", A.m_A);
-			register_subalias("16", "A.VCC");
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(74192) A;
-	};
+			m_last_CD = m_CD();
+			m_last_CU = m_CU();
 
-	// FIXME: Timing
-	static constexpr const std::array<netlist_time, 4> delay =
-	{
-			NLTIME_FROM_NS(40),
-			NLTIME_FROM_NS(40),
-			NLTIME_FROM_NS(40),
-			NLTIME_FROM_NS(40)
-	};
+			for (std::size_t i=0; i<4; i++)
+				m_Q[i].push((m_cnt >> i) & 1, delay[i]);
 
-	NETLIB_UPDATE(74192)
-	{
-		netlist_sig_t tCarry = 1;
-		netlist_sig_t tBorrow = 1;
-		if (m_CLEAR())
-		{
-			m_cnt = 0;
+			m_BORROWQ.push(tBorrow, NLTIME_FROM_NS(20)); //FIXME
+			m_CARRYQ.push(tCarry, NLTIME_FROM_NS(20)); //FIXME
 		}
-		else if (!m_LOADQ())
+
+		NETLIB_HANDLERI(sub)
 		{
-			m_cnt = read_ABCD();
+			// FIXME: can use more optimization
 		}
-		else
+
+		unsigned read_ABCD() const
 		{
-			if (m_CD() && !m_last_CU && m_CU())
-			{
-				if (++m_cnt > MAXCNT)
-					m_cnt = 0;
-			}
-			if (m_CU() && !m_last_CD && m_CD())
-			{
-				if (m_cnt > 0)
-					--m_cnt;
-				else
-					m_cnt = MAXCNT;
-			}
+			return (m_D() << 3) | (m_C() << 2) | (m_B() << 1) | (m_A() << 0);
 		}
 
-		if (!m_CU() && (m_cnt == MAXCNT))
-			tCarry = 0;
-
-		if (!m_CD() && (m_cnt == 0))
-			tBorrow = 0;
-
-		m_last_CD = m_CD();
-		m_last_CU = m_CU();
-
-		for (std::size_t i=0; i<4; i++)
-			m_Q[i].push((m_cnt >> i) & 1, delay[i]);
-
-		m_BORROWQ.push(tBorrow, NLTIME_FROM_NS(20)); //FIXME
-		m_CARRYQ.push(tCarry, NLTIME_FROM_NS(20)); //FIXME
-	}
+	};
 
 	NETLIB_DEVICE_IMPL(74192,    "TTL_74192", "+A,+B,+C,+D,+CLEAR,+LOADQ,+CU,+CD,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(74192_dip,"TTL_74192_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74192.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74192.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74192.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74192.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,50 +1,14 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_74192.h
- *
- *  DM74192: Synchronous 4-Bit Binary Counter with Dual Clock
- *           Decade counter
- *
- *  FIXME: This should be merged with the 74193 which counts to 16
- *
- *          +--------------+
- *        B |1     ++    16| VCC
- *       QB |2           15| A
- *       QA |3           14| CLEAR
- *       CD |4    74192  13| BORROWQ
- *       CU |5           12| CARRYQ
- *       QC |6           11| LOADQ
- *       QD |7           10| C
- *      GND |8            9| D
- *          +--------------+
- *
- * CD: Count up
- * CU: Count down
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
 
 #ifndef NLD_74192_H_
 #define NLD_74192_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_74192(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD)              \
-		NET_REGISTER_DEV(TTL_74192, name)                                      \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, A,     cA)                                           \
-		NET_CONNECT(name, B,     cB)                                           \
-		NET_CONNECT(name, C,     cC)                                           \
-		NET_CONNECT(name, D,     cD)                                           \
-		NET_CONNECT(name, CLEAR, cCLEAR)                                       \
-		NET_CONNECT(name, LOADQ, cLOADQ)                                       \
-		NET_CONNECT(name, CU,    cCU)                                          \
-		NET_CONNECT(name, CD,    cCD)
-
-#define TTL_74192_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74192_DIP, name)
+// usage       : TTL_74192(name, pA, pB, pC, pD, pCLEAR, pLOADQ, pCU, pCD)
+// auto connect: VCC, GND
+#define TTL_74192(...)                                                 \
+	NET_REGISTER_DEVEXT(TTL_74192, __VA_ARGS__)
 
 #endif /* NLD_74192_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74193.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74193.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74193.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74193.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,25 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_74193.c
+ * nld_74193.cpp
+ *
+ *  DM74193: Synchronous 4-Bit Binary Counter with Dual Clock
+ *
+ *          +--------------+
+ *        B |1     ++    16| VCC
+ *       QB |2           15| A
+ *       QA |3           14| CLEAR
+ *       CD |4    74193  13| BORROWQ
+ *       CU |5           12| CARRYQ
+ *       QC |6           11| LOADQ
+ *       QD |7           10| C
+ *      GND |8            9| D
+ *          +--------------+
+ *
+ * CD: Count up
+ * CU: Count down
+ *
+ *  Naming conventions follow National Semiconductor datasheet
  *
  */
 
@@ -12,19 +30,31 @@
 {
 	namespace devices
 	{
+
 	static constexpr const unsigned MAXCNT = 15;
 
+	// FIXME: Timing, combine with 74192!
+	static constexpr const std::array<netlist_time, 4> delay =
+	{
+			NLTIME_FROM_NS(40),
+			NLTIME_FROM_NS(40),
+			NLTIME_FROM_NS(40),
+			NLTIME_FROM_NS(40)
+	};
+
+	// FIXME: Optimize!
+
 	NETLIB_OBJECT(74193)
 	{
 		NETLIB_CONSTRUCTOR(74193)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		, m_C(*this, "C")
-		, m_D(*this, "D")
-		, m_CLEAR(*this, "CLEAR")
-		, m_LOADQ(*this, "LOADQ")
-		, m_CU(*this, "CU")
-		, m_CD(*this, "CD")
+		, m_A(*this, "A", NETLIB_DELEGATE(inputs))
+		, m_B(*this, "B", NETLIB_DELEGATE(inputs))
+		, m_C(*this, "C", NETLIB_DELEGATE(inputs))
+		, m_D(*this, "D", NETLIB_DELEGATE(inputs))
+		, m_CLEAR(*this, "CLEAR", NETLIB_DELEGATE(inputs))
+		, m_LOADQ(*this, "LOADQ", NETLIB_DELEGATE(inputs))
+		, m_CU(*this, "CU", NETLIB_DELEGATE(inputs))
+		, m_CD(*this, "CD", NETLIB_DELEGATE(inputs))
 		, m_cnt(*this, "m_cnt", 0)
 		, m_last_CU(*this, "m_last_CU", 0)
 		, m_last_CD(*this, "m_last_CD", 0)
@@ -35,16 +65,58 @@
 		{
 		}
 
+	private:
 		NETLIB_RESETI()
 		{
 			m_cnt = 0;
 			m_last_CU = 0;
 			m_last_CD = 0;
 		}
-		NETLIB_UPDATEI();
 
-		friend class NETLIB_NAME(74193_dip);
-	private:
+		NETLIB_HANDLERI(inputs)
+		{
+			netlist_sig_t tCarry = 1;
+			netlist_sig_t tBorrow = 1;
+			if (m_CLEAR())
+			{
+				m_cnt = 0;
+			}
+			else if (!m_LOADQ())
+			{
+				m_cnt = (m_D() << 3) | (m_C() << 2)
+						| (m_B() << 1) | (m_A() << 0);
+			}
+			else
+			{
+				if (m_CD() && !m_last_CU && m_CU())
+				{
+					++m_cnt &= MAXCNT;
+				}
+				if (m_CU() && !m_last_CD && m_CD())
+				{
+					if (m_cnt > 0)
+						--m_cnt;
+					else
+						m_cnt = MAXCNT;
+				}
+			}
+
+			if (!m_CU() && (m_cnt == MAXCNT))
+				tCarry = 0;
+
+			if (!m_CD() && (m_cnt == 0))
+						tBorrow = 0;
+
+			m_last_CD = m_CD();
+			m_last_CU = m_CU();
+
+			for (std::size_t i=0; i<4; i++)
+				m_Q[i].push((m_cnt >> i) & 1, delay[i]);
+
+			m_BORROWQ.push(tBorrow, NLTIME_FROM_NS(20)); //FIXME timing
+			m_CARRYQ.push(tCarry, NLTIME_FROM_NS(20)); //FIXME timing
+		}
+
 		logic_input_t m_A;
 		logic_input_t m_B;
 		logic_input_t m_C;
@@ -64,91 +136,7 @@
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(74193_dip)
-	{
-		NETLIB_CONSTRUCTOR(74193_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_B);
-			register_subalias("2", A.m_Q[1]);
-			register_subalias("3", A.m_Q[0]);
-			register_subalias("4", A.m_CD);
-			register_subalias("5", A.m_CU);
-			register_subalias("6", A.m_Q[2]);
-			register_subalias("7", A.m_Q[3]);
-			register_subalias("8", "A.GND");
-
-			register_subalias("9", A.m_D);
-			register_subalias("10", A.m_C);
-			register_subalias("11", A.m_LOADQ);
-			register_subalias("12", A.m_CARRYQ);
-			register_subalias("13", A.m_BORROWQ);
-			register_subalias("14", A.m_CLEAR);
-			register_subalias("15", A.m_A);
-			register_subalias("16", "A.VCC");
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(74193) A;
-	};
-
-
-	// FIXME: Timing
-	static constexpr const std::array<netlist_time, 4> delay =
-	{
-			NLTIME_FROM_NS(40),
-			NLTIME_FROM_NS(40),
-			NLTIME_FROM_NS(40),
-			NLTIME_FROM_NS(40)
-	};
-
-	NETLIB_UPDATE(74193)
-	{
-		netlist_sig_t tCarry = 1;
-		netlist_sig_t tBorrow = 1;
-		if (m_CLEAR())
-		{
-			m_cnt = 0;
-		}
-		else if (!m_LOADQ())
-		{
-			m_cnt = (m_D() << 3) | (m_C() << 2)
-					| (m_B() << 1) | (m_A() << 0);
-		}
-		else
-		{
-			if (m_CD() && !m_last_CU && m_CU())
-			{
-				++m_cnt &= MAXCNT;
-			}
-			if (m_CU() && !m_last_CD && m_CD())
-			{
-				if (m_cnt > 0)
-					--m_cnt;
-				else
-					m_cnt = MAXCNT;
-			}
-		}
-
-		if (!m_CU() && (m_cnt == MAXCNT))
-			tCarry = 0;
-
-		if (!m_CD() && (m_cnt == 0))
-					tBorrow = 0;
-
-		m_last_CD = m_CD();
-		m_last_CU = m_CU();
-
-		for (std::size_t i=0; i<4; i++)
-			m_Q[i].push((m_cnt >> i) & 1, delay[i]);
-
-		m_BORROWQ.push(tBorrow, NLTIME_FROM_NS(20)); //FIXME timing
-		m_CARRYQ.push(tCarry, NLTIME_FROM_NS(20)); //FIXME timing
-	}
-
-	NETLIB_DEVICE_IMPL(74193,    "TTL_74193", "+A,+B,+C,+D,+CLEAR,+LOADQ,+CU,+CD,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(74193_dip, "TTL_74193_DIP", "")
+	NETLIB_DEVICE_IMPL(74193,     "TTL_74193", "+A,+B,+C,+D,+CLEAR,+LOADQ,+CU,+CD,@VCC,@GND")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74193.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74193.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74193.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74193.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,47 +1,14 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_74193.h
- *
- *  DM74193: Synchronous 4-Bit Binary Counter with Dual Clock
- *
- *          +--------------+
- *        B |1     ++    16| VCC
- *       QB |2           15| A
- *       QA |3           14| CLEAR
- *       CD |4    74193  13| BORROWQ
- *       CU |5           12| CARRYQ
- *       QC |6           11| LOADQ
- *       QD |7           10| C
- *      GND |8            9| D
- *          +--------------+
- *
- * CD: Count up
- * CU: Count down
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
 
 #ifndef NLD_74193_H_
 #define NLD_74193_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_74193(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD)              \
-		NET_REGISTER_DEV(TTL_74193, name)                                      \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, A,     cA)                                           \
-		NET_CONNECT(name, B,     cB)                                           \
-		NET_CONNECT(name, C,     cC)                                           \
-		NET_CONNECT(name, D,     cD)                                           \
-		NET_CONNECT(name, CLEAR, cCLEAR)                                       \
-		NET_CONNECT(name, LOADQ, cLOADQ)                                       \
-		NET_CONNECT(name, CU,    cCU)                                          \
-		NET_CONNECT(name, CD,    cCD)
-
-#define TTL_74193_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74193_DIP, name)
+// usage       : TTL_74193(name, pA, pB, pC, pD, pCLEAR, pLOADQ, pCU, pCD)
+// auto connect: VCC, GND
+#define TTL_74193(...)                                                 \
+	NET_REGISTER_DEVEXT(TTL_74193, __VA_ARGS__)
 
 #endif /* NLD_74193_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74194.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74194.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74194.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74194.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,8 +3,27 @@
 /*
  * nld_74194.cpp
  *
+ *  74194: Parallel-Load 8-Bit Shift Register
+ *
+ *          +--------------+
+ *     CLRQ |1     ++    16| VCC
+ *     SRIN |2           15| QA
+ *        A |3           14| QB
+ *        B |4    74194  13| QC
+ *        C |5           12| QD
+ *        D |6           11| CLK
+ *     SLIN |7           10| S1
+ *      GND |8            9| S0
+ *          +--------------+
+ *
+ * CLR: Clear
+ * SRIN: Shift Right Serial Input
+ * SLIN: Shift Left Serial Input
+ * CLK: Clock
+ *
  */
 
+
 #include "nld_74194.h"
 #include "netlist/nl_base.h"
 
@@ -12,16 +31,18 @@
 {
 	namespace devices
 	{
+
+	// FIXME: Optimize
 	NETLIB_OBJECT(74194)
 	{
 		NETLIB_CONSTRUCTOR(74194)
-		, m_DATA(*this, {"D", "C", "B", "A"})
-		, m_SLIN(*this, "SLIN")
-		, m_SRIN(*this, "SRIN")
-		, m_CLK(*this, "CLK")
-		, m_S0(*this, "S0")
-		, m_S1(*this, "S1")
-		, m_CLRQ(*this, "CLRQ")
+		, m_DATA(*this, {"D", "C", "B", "A"}, NETLIB_DELEGATE(inputs))
+		, m_SLIN(*this, "SLIN", NETLIB_DELEGATE(inputs))
+		, m_SRIN(*this, "SRIN", NETLIB_DELEGATE(inputs))
+		, m_CLK(*this, "CLK", NETLIB_DELEGATE(inputs))
+		, m_S0(*this, "S0", NETLIB_DELEGATE(inputs))
+		, m_S1(*this, "S1", NETLIB_DELEGATE(inputs))
+		, m_CLRQ(*this, "CLRQ", NETLIB_DELEGATE(inputs))
 		, m_Q(*this, {"QD", "QC", "QB", "QA"})
 		, m_last_CLK(*this, "m_last_CLK", 0)
 		, m_last_Q(*this, "m_last_Q", 0)
@@ -34,10 +55,51 @@
 			m_last_CLK = 0;
 			m_last_Q = 0;
 		}
-		NETLIB_UPDATEI();
 
 		friend class NETLIB_NAME(74194_dip);
 	private:
+		// FIXME: Timing
+		NETLIB_HANDLERI(inputs)
+		{
+			unsigned q = m_last_Q;
+
+			if (!m_CLRQ())
+			{
+				q = 0;
+			}
+			else
+			{
+				if (!m_last_CLK && m_CLK())
+				{
+					unsigned s = (m_S1() << 1) | m_S0();
+					switch (s)
+					{
+						case 0: // LL: Keep old value
+							break;
+						case 1: // LH: Shift right
+							q >>= 1;
+							q |= m_SRIN() ? 8 : 0;
+							break;
+						case 2:
+							q <<= 1;
+							q |= m_SLIN() ? 1 : 0;
+							break;
+						case 3:
+							q = 0;
+							for (std::size_t i=0; i<4; i++)
+								q |= m_DATA[i]() << i;
+							break;
+					}
+				}
+			}
+
+			m_last_Q = q;
+			m_last_CLK = m_CLK();
+
+			for (std::size_t i=0; i<4; i++)
+				m_Q[i].push((q >> i) & 1, NLTIME_FROM_NS(26)); // FIXME: Timing
+		}
+
 		object_array_t<logic_input_t, 4> m_DATA;
 		logic_input_t m_SLIN;
 		logic_input_t m_SRIN;
@@ -52,81 +114,7 @@
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(74194_dip)
-	{
-		NETLIB_CONSTRUCTOR(74194_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_CLRQ);
-			register_subalias("2", A.m_SRIN);
-			register_subalias("3", A.m_DATA[3]);
-			register_subalias("4", A.m_DATA[2]);
-			register_subalias("5", A.m_DATA[1]);
-			register_subalias("6", A.m_DATA[0]);
-			register_subalias("7", A.m_SLIN);
-			register_subalias("8", "A.GND");
-
-			register_subalias("9",  A.m_S0);
-			register_subalias("10", A.m_S1);
-			register_subalias("11", A.m_CLK);
-			register_subalias("12", A.m_Q[0]);
-			register_subalias("13", A.m_Q[1]);
-			register_subalias("14", A.m_Q[2]);
-			register_subalias("15", A.m_Q[3]);
-			register_subalias("16", "VCC");
-
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(74194) A;
-	};
-
-
-	// FIXME: Timing
-	NETLIB_UPDATE(74194)
-	{
-		unsigned q = m_last_Q;
-
-		if (!m_CLRQ())
-		{
-			q = 0;
-		}
-		else
-		{
-			if (!m_last_CLK && m_CLK())
-			{
-				unsigned s = (m_S1() << 1) | m_S0();
-				switch (s)
-				{
-					case 0: // LL: Keep old value
-						break;
-					case 1: // LH: Shift right
-						q >>= 1;
-						q |= m_SRIN() ? 8 : 0;
-						break;
-					case 2:
-						q <<= 1;
-						q |= m_SLIN() ? 1 : 0;
-						break;
-					case 3:
-						q = 0;
-						for (std::size_t i=0; i<4; i++)
-							q |= m_DATA[i]() << i;
-						break;
-				}
-			}
-		}
-
-		m_last_Q = q;
-		m_last_CLK = m_CLK();
-
-		for (std::size_t i=0; i<4; i++)
-			m_Q[i].push((q >> i) & 1, NLTIME_FROM_NS(26)); // FIXME: Timing
-	}
-
 	NETLIB_DEVICE_IMPL(74194,    "TTL_74194",     "+CLK,+S0,+S1,+SRIN,+A,+B,+C,+D,+SLIN,+CLRQ,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(74194_dip, "TTL_74194_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74194.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74194.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74194.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74194.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,49 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-/*
- * nld_74194.h
- *
- *  74194: Parallel-Load 8-Bit Shift Register
- *
- *          +--------------+
- *     CLRQ |1     ++    16| VCC
- *     SRIN |2           15| QA
- *        A |3           14| QB
- *        B |4    74194  13| QC
- *        C |5           12| QD
- *        D |6           11| CLK
- *     SLIN |7           10| S1
- *      GND |8            9| S0
- *          +--------------+
- *
- * CLR: Clear
- * SRIN: Shift Right Serial Input
- * SLIN: Shift Left Serial Input
- * CLK: Clock
- *
- */
-
 #ifndef NLD_74194_H_
 #define NLD_74194_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_74194(name, cCLK, cS0, cS1, cSRIN, cA, cB, cC, cD, cSLIN, cCLRQ)   \
-		NET_REGISTER_DEV(TTL_74194, name)                                      \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CLK,  cCLK)                                          \
-		NET_CONNECT(name, S0,   cS0)                                           \
-		NET_CONNECT(name, S1,   cS1)                                           \
-		NET_CONNECT(name, SRIN, cSRIN)                                         \
-		NET_CONNECT(name, A,    cA)                                            \
-		NET_CONNECT(name, B,    cB)                                            \
-		NET_CONNECT(name, C,    cC)                                            \
-		NET_CONNECT(name, D,    cD)                                            \
-		NET_CONNECT(name, SLIN, cSLIN)                                         \
-		NET_CONNECT(name, CLRQ, cCLRQ)
-
-#define TTL_74194_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74194_DIP, name)
+// usage       : TTL_74194(name, pCLK, pS0, pS1, pSRIN, pA, pB, pC, pD, pSLIN, pCLRQ)
+// auto connect: VCC, GND
+#define TTL_74194(...)                                                 \
+	NET_REGISTER_DEVEXT(TTL_74194, __VA_ARGS__)
 
 #endif /* NLD_74194_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74365.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74365.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74365.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74365.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,23 @@
 /*
  * nld_74365.cpp
  *
+ *  SN74365: Hex Bus Driver with 3-State Outputs
+ *
+ *          +--------------+
+ *      G1Q |1     ++    16| VCC
+ *       A1 |2           15| G2Q
+ *       Y1 |3           14| A6
+ *       A2 |4    74365  13| Y6
+ *       Y2 |5           12| A5
+ *       A3 |6           11| Y5
+ *       Y3 |7           10| A4
+ *      GND |8            9| Y4
+ *          +--------------+
+ *
+ *  Naming conventions follow Texas Instruments datasheet
+ *
+ *  Note: Currently the netlist system does not support proper tristate output, so this
+ *        is not a "real" bus driver, it simply outputs 0 if the chip is not enabled.
  */
 
 #include "nld_74365.h"
@@ -23,18 +40,29 @@
 	NETLIB_OBJECT(74365)
 	{
 		NETLIB_CONSTRUCTOR(74365)
-		, m_G1Q(*this, "G1Q")
-		, m_G2Q(*this, "G2Q")
-		, m_A(*this, { "A1", "A2", "A3", "A4", "A5", "A6" })
+		, m_G1Q(*this, "G1Q", NETLIB_DELEGATE(inputs))
+		, m_G2Q(*this, "G2Q", NETLIB_DELEGATE(inputs))
+		, m_A(*this, { "A1", "A2", "A3", "A4", "A5", "A6" }, NETLIB_DELEGATE(inputs))
 		, m_Y(*this, { "Y1", "Y2", "Y3", "Y4", "Y5", "Y6" })
 		, m_power_pins(*this)
 		{
 		}
 
-		NETLIB_UPDATEI();
-
-		friend class NETLIB_NAME(74365_dip);
 	private:
+		NETLIB_HANDLERI(inputs)
+		{
+			if (!m_G1Q() && !m_G2Q())
+			{
+				for (std::size_t i=0; i<6; i++)
+					m_Y[i].push(m_A[i](), NLTIME_FROM_NS(20)); // FIXME: Correct timing
+			}
+			else
+			{
+				for (std::size_t i=0; i<6; i++)
+					m_Y[i].push(0, NLTIME_FROM_NS(20)); // FIXME: Correct timing
+			}
+		}
+
 		logic_input_t m_G1Q;
 		logic_input_t m_G2Q;
 		object_array_t<logic_input_t, 6> m_A;
@@ -42,51 +70,7 @@
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(74365_dip)
-	{
-		NETLIB_CONSTRUCTOR(74365_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_G1Q);
-			register_subalias("2", A.m_A[0]);
-			register_subalias("3", A.m_Y[0]);
-			register_subalias("4", A.m_A[1]);
-			register_subalias("5", A.m_Y[1]);
-			register_subalias("6", A.m_A[2]);
-			register_subalias("7", A.m_Y[2]);
-			register_subalias("8", "A.GND");
-
-			register_subalias("9",  A.m_A[3]);
-			register_subalias("10", A.m_Y[3]);
-			register_subalias("11", A.m_A[4]);
-			register_subalias("12", A.m_Y[4]);
-			register_subalias("13", A.m_A[5]);
-			register_subalias("14", A.m_Y[5]);
-			register_subalias("15", A.m_G2Q);
-			register_subalias("16", "A.VCC");
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(74365) A;
-	};
-
-	NETLIB_UPDATE(74365)
-	{
-		if (!m_G1Q() && !m_G2Q())
-		{
-			for (std::size_t i=0; i<6; i++)
-				m_Y[i].push(m_A[i](), NLTIME_FROM_NS(20)); // FIXME: Correct timing
-		}
-		else
-		{
-			for (std::size_t i=0; i<6; i++)
-				m_Y[i].push(0, NLTIME_FROM_NS(20)); // FIXME: Correct timing
-		}
-	}
-
 	NETLIB_DEVICE_IMPL(74365, "TTL_74365", "+G1Q,+G2Q,+A1,+A2,+A3,+A4,+A5,+A6,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(74365_dip, "TTL_74365_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74365.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74365.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74365.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74365.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,46 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-/*
- * nld_74365.h
- *
- *  SN74365: Hex Bus Driver with 3-State Outputs
- *
- *          +--------------+
- *      G1Q |1     ++    16| VCC
- *       A1 |2           15| G2Q
- *       Y1 |3           14| A6
- *       A2 |4    74365  13| Y6
- *       Y2 |5           12| A5
- *       A3 |6           11| Y5
- *       Y3 |7           10| A4
- *      GND |8            9| Y4
- *          +--------------+
- *
- *  Naming conventions follow Texas Instruments datasheet
- *
- *  Note: Currently the netlist system does not support proper tristate output, so this
- *        is not a "real" bus driver, it simply outputs 0 if the chip is not enabled.
- */
-
 #ifndef NLD_74365_H_
 #define NLD_74365_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_74365(name, cG1Q, cG2Q, cA1, cA2, cA3, cA4, cA5, cA6)              \
-		NET_REGISTER_DEV(TTL_74365, name)                                      \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, G1Q,   cG1Q)                                         \
-		NET_CONNECT(name, G2Q,   cG2Q)                                         \
-		NET_CONNECT(name, A1,    cA1)                                          \
-		NET_CONNECT(name, A2,    cA2)                                          \
-		NET_CONNECT(name, A3,    cA3)                                          \
-		NET_CONNECT(name, A4,    cA4)                                          \
-		NET_CONNECT(name, A5,    cA5)                                          \
-		NET_CONNECT(name, A6,    cA6)
-
-#define TTL_74365_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74365_DIP, name)
+// usage       : TTL_74365(name, pG1Q, pG2Q, pA1, pA2, pA3, pA4, pA5, pA6)
+// auto connect: VCC, GND
+#define TTL_74365(...)                                                 \
+	NET_REGISTER_DEVEXT(TTL_74365, __VA_ARGS__)
 
 #endif /* NLD_74365_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74377.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74377.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74377.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74377.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,50 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_74377.c
+ * nld_74377.cpp
+ *
+ *  DM74377: Octal D Flip-Flop With Enable
+ *
+ *          +--------------+
+ *       /E |1     ++    20| VCC
+ *       Q0 |2           19| Q7
+ *       D0 |3           18| D7
+ *       D1 |4   74377   17| D6
+ *       Q1 |5           16| Q6
+ *       Q2 |6           15| Q5
+ *       D2 |7           14| D5
+ *       D3 |8           13| D4
+ *       Q3 |9           12| Q4
+ *      GND |10          11| CP
+ *          +--------------+
+ *
+ *  DM74378: Hex D Flip-Flop With Enable
+ *
+ *          +--------------+
+ *       /E |1     ++    16| VCC
+ *       Q0 |2           15| Q5
+ *       D0 |3           14| D5
+ *       D1 |4   74378   13| D4
+ *       Q1 |5           12| Q4
+ *       D2 |6           11| D3
+ *       Q2 |7           10| Q3
+ *      GND |8            9| CP
+ *          +--------------+
+ *
+ *  DM74379: 4-bit D Flip-Flop With Enable
+ *
+ *          +--------------+
+ *       /E |1     ++    16| VCC
+ *       Q0 |2           15| Q3
+ *      /Q0 |3           14| /Q3
+ *       D0 |4   74379   13| D3
+ *       D1 |5           12| D2
+ *      /Q1 |6           11| /Q2
+ *       Q1 |7           10| Q2
+ *      GND |8            9| CP
+ *          +--------------+
+ *
+ *  Naming conventions follow Motorola datasheet
  *
  */
 
@@ -18,9 +61,9 @@
 	NETLIB_OBJECT(74377_GATE)
 	{
 		NETLIB_CONSTRUCTOR(74377_GATE)
-		, m_E(*this, "E")
-		, m_D(*this, "D")
-		, m_CP(*this, "CP")
+		, m_E(*this, "E", NETLIB_DELEGATE(inputs))
+		, m_D(*this, "D", NETLIB_DELEGATE(inputs))
+		, m_CP(*this, "CP", NETLIB_DELEGATE(inputs))
 		, m_Q(*this, "Q")
 		, m_QQ(*this, "QQ")
 		, m_cp(*this, "m_cp", 0)
@@ -31,7 +74,9 @@
 		NETLIB_RESETI()
 		{
 		}
-		NETLIB_UPDATEI()
+
+	private:
+		NETLIB_HANDLERI(inputs)
 		{
 			netlist_sig_t last_cp = m_cp;
 
@@ -45,7 +90,6 @@
 			}
 		}
 
-	private:
 		logic_input_t m_E;
 		logic_input_t m_D;
 		logic_input_t m_CP;
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74377.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74377.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74377.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74377.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,52 +1,5 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud,Aaron Giles
-/*
- * nld_74377.h
- *
- *  DM74377: Octal D Flip-Flop With Enable
- *
- *          +--------------+
- *       /E |1     ++    20| VCC
- *       Q0 |2           19| Q7
- *       D0 |3           18| D7
- *       D1 |4   74377   17| D6
- *       Q1 |5           16| Q6
- *       Q2 |6           15| Q5
- *       D2 |7           14| D5
- *       D3 |8           13| D4
- *       Q3 |9           12| Q4
- *      GND |10          11| CP
- *          +--------------+
- *
- *  DM74378: Hex D Flip-Flop With Enable
- *
- *          +--------------+
- *       /E |1     ++    16| VCC
- *       Q0 |2           15| Q5
- *       D0 |3           14| D5
- *       D1 |4   74378   13| D4
- *       Q1 |5           12| Q4
- *       D2 |6           11| D3
- *       Q2 |7           10| Q3
- *      GND |8            9| CP
- *          +--------------+
- *
- *  DM74379: 4-bit D Flip-Flop With Enable
- *
- *          +--------------+
- *       /E |1     ++    16| VCC
- *       Q0 |2           15| Q3
- *      /Q0 |3           14| /Q3
- *       D0 |4   74379   13| D3
- *       D1 |5           12| D2
- *      /Q1 |6           11| /Q2
- *       Q1 |7           10| Q2
- *      GND |8            9| CP
- *          +--------------+
- *
- *  Naming conventions follow Motorola datasheet
- *
- */
 
 #ifndef NLD_74377_H_
 #define NLD_74377_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74393.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74393.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74393.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74393.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,21 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_74393.c
+ * nld_74393.cpp
+ *
+ *  DM74393: Dual 4-Stage Binary Counter
+ *
+ *          +--------------+
+ *      /CP |1     ++    14| VCC
+ *       MR |2           13| /CP
+ *       Q0 |3           12| MR
+ *       Q1 |4    74393  11| Q0
+ *       Q2 |5           10| Q1
+ *       Q3 |6            9| Q2
+ *      GND |7            8| Q3
+ *          +--------------+
+ *
+ *  Naming conventions follow Motorola datasheet
  *
  */
 
@@ -17,8 +31,8 @@
 	NETLIB_OBJECT(74393)
 	{
 		NETLIB_CONSTRUCTOR(74393)
-		, m_CP(*this, "CP")
-		, m_MR(*this, "MR")
+		, m_CP(*this, "CP", NETLIB_DELEGATE(cp))
+		, m_MR(*this, "MR", NETLIB_DELEGATE(mr))
 		, m_Q(*this, {"Q0", "Q1", "Q2", "Q3"})
 		, m_cnt(*this, "m_cnt", 0)
 		, m_cp(*this, "m_cp", 0)
@@ -30,30 +44,37 @@
 	private:
 		NETLIB_RESETI()
 		{
+			m_CP.set_state(logic_t::STATE_INP_HL);
 			m_cnt = 0;
 		}
 
-		NETLIB_UPDATEI()
+		NETLIB_HANDLERI(mr)
 		{
-			netlist_sig_t last_cp = m_cp;
-			netlist_sig_t last_mr = m_mr;
-
-			m_cp = m_CP();
-			m_mr = m_MR();
-
-			if (!last_mr && m_mr)
+			if (!m_MR())
 			{
-				m_cnt = 0;
-				update_outputs_all(0, NLTIME_FROM_NS(24), NLTIME_FROM_NS(24), NLTIME_FROM_NS(24), NLTIME_FROM_NS(24));
+				m_CP.activate_hl();
 			}
-			else if (!m_mr && last_cp && !m_cp)
+			else
 			{
-				auto cnt = (m_cnt + 1) & MAXCNT;
-				update_outputs_all(cnt, NLTIME_FROM_NS(13), NLTIME_FROM_NS(22), NLTIME_FROM_NS(31), NLTIME_FROM_NS(40));
-				m_cnt = cnt;
+				m_CP.inactivate();
+				if (m_cnt != 0)
+				{
+					m_cnt = 0;
+					m_Q.push(0, NLTIME_FROM_NS(24));
+				}
 			}
 		}
 
+		NETLIB_HANDLERI(cp)
+		{
+			auto cnt = (m_cnt + 1) & MAXCNT;
+			m_cnt = cnt;
+			m_Q[0].push((cnt >> 0) & 1, NLTIME_FROM_NS(13));
+			m_Q[1].push((cnt >> 1) & 1, NLTIME_FROM_NS(22));
+			m_Q[2].push((cnt >> 2) & 1, NLTIME_FROM_NS(31));
+			m_Q[3].push((cnt >> 3) & 1, NLTIME_FROM_NS(40));
+		}
+
 		logic_input_t m_CP;
 		logic_input_t m_MR;
 		object_array_t<logic_output_t, 4> m_Q;
@@ -63,51 +84,9 @@
 		state_var_sig m_mr;
 
 		nld_power_pins m_power_pins;
-
-		void update_outputs_all(unsigned cnt, netlist_time q0_delay, netlist_time q1_delay, netlist_time q2_delay, netlist_time q3_delay) noexcept
-		{
-			m_Q[0].push((cnt >> 0) & 1, q0_delay);
-			m_Q[1].push((cnt >> 1) & 1, q1_delay);
-			m_Q[2].push((cnt >> 2) & 1, q2_delay);
-			m_Q[3].push((cnt >> 3) & 1, q3_delay);
-		}
-	};
-
-	NETLIB_OBJECT(74393_dip)
-	{
-		NETLIB_CONSTRUCTOR(74393_dip)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		{
-			register_subalias("1", "A.CP");
-			register_subalias("2", "A.MR");
-			register_subalias("3", "A.Q0");
-			register_subalias("4", "A.Q1");
-			register_subalias("5", "A.Q2");
-			register_subalias("6", "A.Q3");
-			register_subalias("7", "A.GND");
-
-			register_subalias("8", "B.Q3");
-			register_subalias("9", "B.Q2");
-			register_subalias("10", "B.Q1");
-			register_subalias("11", "B.Q0");
-			register_subalias("12", "B.MR");
-			register_subalias("13", "B.CP");
-			register_subalias("14", "A.VCC");
-
-			connect("A.GND", "B.GND");
-			connect("A.VCC", "B.VCC");
-		}
-		NETLIB_UPDATEI() { }
-		NETLIB_RESETI() { }
-
-	private:
-		NETLIB_SUB(74393) m_A;
-		NETLIB_SUB(74393) m_B;
 	};
 
 	NETLIB_DEVICE_IMPL(74393,     "TTL_74393", "+CP,+MR,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(74393_dip, "TTL_74393_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74393.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74393.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74393.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74393.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,37 +1,13 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_74393.h
- *
- *  DM74393: Dual 4-Stage Binary Counter
- *
- *          +--------------+
- *      /CP |1     ++    14| VCC
- *       MR |2           13| /CP
- *       Q0 |3           12| MR
- *       Q1 |4    74393  11| Q0
- *       Q2 |5           10| Q1
- *       Q3 |6            9| Q2
- *      GND |7            8| Q3
- *          +--------------+
- *
- *  Naming conventions follow Motorola datasheet
- *
- */
 
 #ifndef NLD_74393_H_
 #define NLD_74393_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_74393(name, cCP, cMR)                                \
-		NET_REGISTER_DEV(TTL_74393, name)                        \
-		NET_CONNECT(name, GND, GND)                              \
-		NET_CONNECT(name, VCC, VCC)                              \
-		NET_CONNECT(name, CP, cCP)                               \
-		NET_CONNECT(name, MR, cMR)
-
-#define TTL_74393_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74393_DIP, name)
+// usage: TTL_74393(name, cCP, cMR)
+#define TTL_74393(...)                                                        \
+		NET_REGISTER_DEVEXT(TTL_74393, __VA_ARGS__)
 
 #endif /* NLD_74193_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7442.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7442.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7442.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7442.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,106 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Ryan Holtz
-/*
- * nld_7442.cpp
- *
- */
-
-#include "nld_7442.h"
-#include "netlist/nl_base.h"
-
-namespace netlist
-{
-namespace devices
-{
-	static constexpr const netlist_time delay = NLTIME_FROM_NS(30); // Worst-case through 3 levels of logic
-
-	NETLIB_OBJECT(7442)
-	{
-		NETLIB_CONSTRUCTOR(7442)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		, m_C(*this, "C")
-		, m_D(*this, "D")
-		, m_val(*this, "m_val", 0)
-		, m_last_val(*this, "m_last_val", 0)
-		, m_Q(*this, {"Q0", "Q1", "Q2", "Q3", "Q4", "Q5", "Q6", "Q7", "Q8", "Q9"})
-		, m_power_pins(*this)
-		{
-		}
-
-	private:
-		NETLIB_UPDATEI();
-		NETLIB_RESETI()
-		{
-			m_val = 0;
-			m_last_val = 0;
-		}
-
-		void update_outputs() noexcept
-		{
-			for (std::size_t i=0; i<10; i++)
-				m_Q[i].push(i == m_val ? 0 : 1, delay);
-		}
-
-		logic_input_t m_A;
-		logic_input_t m_B;
-		logic_input_t m_C;
-		logic_input_t m_D;
-
-		state_var_u8 m_val;
-		state_var_u8 m_last_val;
-
-		object_array_t<logic_output_t, 10> m_Q;
-		nld_power_pins m_power_pins;
-	};
-
-	NETLIB_OBJECT(7442_dip)
-	{
-		NETLIB_CONSTRUCTOR(7442_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", "A.Q0");
-			register_subalias("2", "A.Q1");
-			register_subalias("3", "A.Q2");
-			register_subalias("4", "A.Q3");
-			register_subalias("5", "A.Q4");
-			register_subalias("6", "A.Q5");
-			register_subalias("7", "A.Q6");
-			register_subalias("8", "A.GND");
-
-			register_subalias("9", "A.Q7");
-			register_subalias("10", "A.Q8");
-			register_subalias("11", "A.Q9");
-			register_subalias("12", "A.D");
-			register_subalias("13", "A.C");
-			register_subalias("14", "A.B");
-			register_subalias("15", "A.A");
-			register_subalias("16", "A.VCC");
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(7442) A;
-	};
-
-	NETLIB_UPDATE(7442)
-	{
-		const netlist_sig_t new_A = m_A();
-		const netlist_sig_t new_B = m_B();
-		const netlist_sig_t new_C = m_C();
-		const netlist_sig_t new_D = m_D();
-
-		m_last_val = m_val;
-		m_val = static_cast<uint8_t>((new_D << 3) | (new_C << 2) | (new_B << 1) | new_A);
-
-		if (m_last_val != m_val)
-		{
-			update_outputs();
-		}
-	}
-
-	NETLIB_DEVICE_IMPL(7442,     "TTL_7442",        "+A,+B,+C,+D,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(7442_dip, "TTL_7442_DIP",    "")
-
-} // namespace devices
-} // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7442.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7442.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7442.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7442.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Ryan Holtz
-/*
- * nld_7442.h
- *
- *  SN7442: 4-Line BCD to 10-Line Decimal Decoder
- *
- *          +--------------+
- *        0 |1     ++    16| VCC
- *        1 |2           15| A
- *        2 |3           14| B
- *        3 |4           13| C
- *        4 |5    7442   12| D
- *        5 |6           11| 9
- *        6 |7           10| 8
- *      GND |8            9| 7
- *          +--------------+
- *
- *          Truth Table
- *
- *          +------++---+---+---+---++---+---+---+---+---+---+---+---+---+---+
- *          | Num. || D | C | B | A || 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |
- *          +======++===+===+===+===++===+===+===+===+===+===+===+===+===+===+
- *          |   0  || 0 | 0 | 0 | 0 || 0 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
- *          |   1  || 0 | 0 | 0 | 1 || 1 | 0 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
- *          |   2  || 0 | 0 | 1 | 0 || 1 | 1 | 0 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
- *          |   3  || 0 | 0 | 1 | 1 || 1 | 1 | 1 | 0 | 1 | 1 | 1 | 1 | 1 | 1 |
- *          |   4  || 0 | 1 | 0 | 0 || 1 | 1 | 1 | 1 | 0 | 1 | 1 | 1 | 1 | 1 |
- *          |   5  || 0 | 1 | 0 | 1 || 1 | 1 | 1 | 1 | 1 | 0 | 1 | 1 | 1 | 1 |
- *          |   6  || 0 | 1 | 1 | 0 || 1 | 1 | 1 | 1 | 1 | 1 | 0 | 1 | 1 | 1 |
- *          |   7  || 0 | 1 | 1 | 1 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 0 | 1 | 1 |
- *          |   8  || 1 | 0 | 0 | 0 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 0 | 1 |
- *          |   9  || 1 | 0 | 0 | 1 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 0 |
- *          |   -  || 1 | 0 | 1 | 0 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
- *          |   -  || 1 | 0 | 1 | 1 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
- *          |   -  || 1 | 1 | 0 | 0 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
- *          |   -  || 1 | 1 | 0 | 1 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
- *          |   -  || 1 | 1 | 1 | 0 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
- *          |   -  || 1 | 1 | 1 | 1 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
- *          +------++---+---+---+---++---+---+---+---+---+---+---+---+---+---+
- *
- *  Naming conventions follow Texas Instruments datasheet
- *
- */
-
-#ifndef NLD_7442_H_
-#define NLD_7442_H_
-
-#include "netlist/nl_setup.h"
-
-#define TTL_7442(name, cA, cB, cC, cD)                          \
-		NET_REGISTER_DEV(TTL_7442, name)                        \
-		NET_CONNECT(name, GND, GND)                             \
-		NET_CONNECT(name, VCC, VCC)                             \
-		NET_CONNECT(name, A, cA)                                \
-		NET_CONNECT(name, B, cB)                                \
-		NET_CONNECT(name, C, cC)                                \
-		NET_CONNECT(name, D, cD)
-
-#define TTL_7442_DIP(name)                                      \
-		NET_REGISTER_DEV(TTL_7442_DIP, name)
-
-#endif /* NLD_7442_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7448.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7448.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7448.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7448.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,23 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_7448.c
+ * nld_7448.cpp
+ *
+ *  DM7448: BCD to 7-Segment decoders/drivers
+ *
+ *           +--------------+
+ *         B |1     ++    16| VCC
+ *         C |2           15| f
+ * LAMP TEST |3           14| g
+ *    BI/RBQ |4    7448   13| a
+ *       RBI |5           12| b
+ *         D |6           11| c
+ *         A |7           10| d
+ *       GND |8            9| e
+ *           +--------------+
+ *
+ *
+ *  Naming conventions follow National Semiconductor datasheet
  *
  */
 
@@ -14,17 +30,16 @@
 {
 	namespace devices
 	{
-	#if !(NL_USE_TRUTHTABLE_7448)
 	NETLIB_OBJECT(7448)
 	{
 		NETLIB_CONSTRUCTOR(7448)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		, m_C(*this, "C")
-		, m_D(*this, "D")
-		, m_LTQ(*this, "LTQ")
-		, m_BIQ(*this, "BIQ")
-		, m_RBIQ(*this, "RBIQ")
+		, m_A(*this, "A", NETLIB_DELEGATE(inputs))
+		, m_B(*this, "B", NETLIB_DELEGATE(inputs))
+		, m_C(*this, "C", NETLIB_DELEGATE(inputs))
+		, m_D(*this, "D", NETLIB_DELEGATE(inputs))
+		, m_LTQ(*this, "LTQ", NETLIB_DELEGATE(inputs))
+		, m_BIQ(*this, "BIQ", NETLIB_DELEGATE(inputs))
+		, m_RBIQ(*this, "RBIQ", NETLIB_DELEGATE(inputs))
 		, m_state(*this, "m_state", 0)
 		, m_Q(*this, {"a", "b", "c", "d", "e", "f", "g"})
 		, m_power_pins(*this)
@@ -35,9 +50,7 @@
 		{
 			m_state = 0;
 		}
-		NETLIB_UPDATEI();
 
-		friend class NETLIB_NAME(7448_dip);
 	private:
 		void update_outputs(unsigned v) noexcept
 		{
@@ -53,6 +66,36 @@
 			}
 		}
 
+		NETLIB_HANDLERI(inputs)
+		{
+			if (!m_BIQ() || (m_BIQ() && !m_LTQ()))
+			{
+				m_A.inactivate();
+				m_B.inactivate();
+				m_C.inactivate();
+				m_D.inactivate();
+				m_RBIQ.inactivate();
+				if (m_BIQ() && !m_LTQ())
+				{
+					update_outputs(8);
+				}
+				else if (!m_BIQ())
+				{
+					update_outputs(15);
+				}
+			} else {
+				m_RBIQ.activate();
+				m_D.activate();
+				m_C.activate();
+				m_B.activate();
+				m_A.activate();
+				unsigned v = (m_A() << 0) | (m_B() << 1) | (m_C() << 2) | (m_D() << 3);
+				if ((!m_RBIQ() && (v==0)))
+						v = 15;
+				update_outputs(v);
+			}
+		}
+
 		logic_input_t m_A;
 		logic_input_t m_B;
 		logic_input_t m_C;
@@ -69,37 +112,6 @@
 		static const std::array<uint8_t, 16> tab7448;
 	};
 
-	NETLIB_OBJECT(7448_dip)
-	{
-		NETLIB_CONSTRUCTOR(7448_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_B);
-			register_subalias("2", A.m_C);
-			register_subalias("3", A.m_LTQ);
-			register_subalias("4", A.m_BIQ);
-			register_subalias("5", A.m_RBIQ);
-			register_subalias("6", A.m_D);
-			register_subalias("7", A.m_A);
-			register_subalias("8", "A.GND");
-
-			register_subalias("9",  A.m_Q[4]); // e
-			register_subalias("10", A.m_Q[3]); // d
-			register_subalias("11", A.m_Q[2]); // c
-			register_subalias("12", A.m_Q[1]); // b
-			register_subalias("13", A.m_Q[0]); // a
-			register_subalias("14", A.m_Q[6]); // g
-			register_subalias("15", A.m_Q[5]); // f
-			register_subalias("16", "A.VCC");
-		}
-	private:
-		NETLIB_SUB(7448) A;
-	};
-	#endif
-
-
-	#if !(NL_USE_TRUTHTABLE_7448)
-
 #define BITS7(b6,b5,b4,b3,b2,b1,b0) ((b6)<<6) | ((b5)<<5) | ((b4)<<4) | ((b3)<<3) | ((b2)<<2) | ((b1)<<1) | ((b0)<<0)
 
 	const std::array<uint8_t, 16> NETLIB_NAME(7448)::tab7448 =
@@ -122,41 +134,7 @@
 			BITS7(   0, 0, 0, 0, 0, 0, 0 ),  /* 15 */
 	};
 
-	NETLIB_UPDATE(7448)
-	{
-		if (!m_BIQ() || (m_BIQ() && !m_LTQ()))
-		{
-			m_A.inactivate();
-			m_B.inactivate();
-			m_C.inactivate();
-			m_D.inactivate();
-			m_RBIQ.inactivate();
-			if (m_BIQ() && !m_LTQ())
-			{
-				update_outputs(8);
-			}
-			else if (!m_BIQ())
-			{
-				update_outputs(15);
-			}
-		} else {
-			m_RBIQ.activate();
-			m_D.activate();
-			m_C.activate();
-			m_B.activate();
-			m_A.activate();
-			unsigned v = (m_A() << 0) | (m_B() << 1) | (m_C() << 2) | (m_D() << 3);
-			if ((!m_RBIQ() && (v==0)))
-					v = 15;
-			update_outputs(v);
-		}
-	}
-
 	NETLIB_DEVICE_IMPL(7448, "TTL_7448", "+A,+B,+C,+D,+LTQ,+BIQ,+RBIQ,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(7448_dip, "TTL_7448_DIP", "")
-
-	#endif
-
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7448.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7448.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7448.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7448.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,49 +1,14 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_7448.h
- *
- *  DM7448: BCD to 7-Segment decoders/drivers
- *
- *           +--------------+
- *         B |1     ++    16| VCC
- *         C |2           15| f
- * LAMP TEST |3           14| g
- *    BI/RBQ |4    7448   13| a
- *       RBI |5           12| b
- *         D |6           11| c
- *         A |7           10| d
- *       GND |8            9| e
- *           +--------------+
- *
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
 
 #ifndef NLD_7448_H_
 #define NLD_7448_H_
 
 #include "netlist/nl_setup.h"
 
-#if !NL_AUTO_DEVICES
-#if !(NL_USE_TRUTHTABLE_7448)
-#define TTL_7448(name, cA0, cA1, cA2, cA3, cLTQ, cBIQ, cRBIQ)                  \
-		NET_REGISTER_DEV(TTL_7448, name)                                       \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cA0)                                              \
-		NET_CONNECT(name, B, cA1)                                              \
-		NET_CONNECT(name, C, cA2)                                              \
-		NET_CONNECT(name, D, cA3)                                              \
-		NET_CONNECT(name, LTQ, cLTQ)                                           \
-		NET_CONNECT(name, BIQ, cBIQ)                                           \
-		NET_CONNECT(name, RBIQ, cRBIQ)
-
-#define TTL_7448_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7448_DIP, name)
-
-#endif
-#endif
+// usage       : TTL_7448(name, pA, pB, pC, pD, pLTQ, pBIQ, pRBIQ)
+// auto connect: VCC, GND
+#define TTL_7448(...)                                                  \
+	NET_REGISTER_DEVEXT(TTL_7448, __VA_ARGS__)
 
 #endif /* NLD_7448_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7450.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7450.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7450.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7450.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,23 @@
-	// license:GPL-2.0+
+// license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_7450.c
+ * nld_7450.cpp
+ *
+ *  DM7450: DUAL 2-WIDE 2-INPUT AND-OR-INVERT GATES (ONE GATE EXPANDABLE)
+ *
+ *          +--------------+
+ *       1A |1     ++    14| VCC
+ *       2A |2           13| 1B
+ *       2B |3           12| 1XQ
+ *       2C |4    7450   11| 1X
+ *       2D |5           10| 1D
+ *       2Y |6            9| 1C
+ *      GND |7            8| 1Y
+ *          +--------------+
+ *                  _________________
+ *              Y = (A & B) | (C & D)
+ *
+ *  Naming conventions follow Texas Instruments datasheet
  *
  */
 
@@ -18,94 +34,60 @@
 	NETLIB_OBJECT(7450)
 	{
 		NETLIB_CONSTRUCTOR(7450)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		, m_C(*this, "C")
-		, m_D(*this, "D")
+		, m_A(*this, "A", NETLIB_DELEGATE(inputs))
+		, m_B(*this, "B", NETLIB_DELEGATE(inputs))
+		, m_C(*this, "C", NETLIB_DELEGATE(inputs))
+		, m_D(*this, "D", NETLIB_DELEGATE(inputs))
 		, m_Q(*this, "Q")
 		, m_power_pins(*this)
 		{
 		}
+
 		//NETLIB_RESETI();
-		NETLIB_UPDATEI();
 
 	public:
-		logic_input_t m_A;
-		logic_input_t m_B;
-		logic_input_t m_C;
-		logic_input_t m_D;
-		logic_output_t m_Q;
-		nld_power_pins m_power_pins;
-	};
-
-	NETLIB_OBJECT(7450_dip)
-	{
-		NETLIB_CONSTRUCTOR(7450_dip)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
+		NETLIB_HANDLERI(inputs)
 		{
-			register_subalias("1", m_A.m_A);
-			register_subalias("2", m_B.m_A);
-			register_subalias("3", m_B.m_B);
-			register_subalias("4", m_B.m_C);
-			register_subalias("5", m_B.m_D);
-			register_subalias("6", m_B.m_Q);
-			register_subalias("7", "A.GND");
-
-			register_subalias("8", m_A.m_Q);
-			register_subalias("9", m_A.m_C);
-			register_subalias("10", m_A.m_D);
-			//register_subalias("11", m_1.m_X1);
-			//register_subalias("12", m_1.m_X1Q);
-			register_subalias("13", m_A.m_B);
-			register_subalias("14", "A.VCC");
-
-			connect("A.GND", "B.GND");
-			connect("A.VCC", "B.VCC");
-
-		}
-		//NETLIB_RESETI();
-		//NETLIB_UPDATEI();
+			m_A.activate();
+			m_B.activate();
+			m_C.activate();
+			m_D.activate();
+			auto t1 = m_A() & m_B();
+			auto t2 = m_C() & m_D();
 
-		NETLIB_SUB(7450) m_A;
-		NETLIB_SUB(7450) m_B;
-	};
-
-	NETLIB_UPDATE(7450)
-	{
-		m_A.activate();
-		m_B.activate();
-		m_C.activate();
-		m_D.activate();
-		auto t1 = m_A() & m_B();
-		auto t2 = m_C() & m_D();
-
-		uint_fast8_t res = 0;
-		if (t1 ^ 1)
-		{
-			if (t2 ^ 1)
+			uint_fast8_t res = 0;
+			if (t1 ^ 1)
 			{
-				res = 1;
+				if (t2 ^ 1)
+				{
+					res = 1;
+				}
+				else
+				{
+					m_A.inactivate();
+					m_B.inactivate();
+				}
 			}
 			else
 			{
-				m_A.inactivate();
-				m_B.inactivate();
-			}
-		}
-		else
-		{
-			if (t2 ^ 1)
-			{
-				m_C.inactivate();
-				m_D.inactivate();
+				if (t2 ^ 1)
+				{
+					m_C.inactivate();
+					m_D.inactivate();
+				}
 			}
+			m_Q.push(res, times[res]);// ? 22000 : 15000);
 		}
-		m_Q.push(res, times[res]);// ? 22000 : 15000);
-	}
+
+		logic_input_t m_A;
+		logic_input_t m_B;
+		logic_input_t m_C;
+		logic_input_t m_D;
+		logic_output_t m_Q;
+		nld_power_pins m_power_pins;
+	};
 
 	NETLIB_DEVICE_IMPL(7450,        "TTL_7450_ANDORINVERT", "+A,+B,+C,+D,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(7450_dip,    "TTL_7450_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7450.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7450.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7450.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7450.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,41 +1,13 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_7450.h
- *
- *  DM7450: DUAL 2-WIDE 2-INPUT AND-OR-INVERT GATES (ONE GATE EXPANDABLE)
- *
- *          +--------------+
- *       1A |1     ++    14| VCC
- *       2A |2           13| 1B
- *       2B |3           12| 1XQ
- *       2C |4    7450   11| 1X
- *       2D |5           10| 1D
- *       2Y |6            9| 1C
- *      GND |7            8| 1Y
- *          +--------------+
- *                  _________________
- *              Y = (A & B) | (C & D)
- *
- *  Naming conventions follow Texas Instruments datasheet
- *
- */
 
 #ifndef NLD_7450_H_
 #define NLD_7450_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_7450_ANDORINVERT(name, cI1, cI2, cI3, cI4)                         \
-		NET_REGISTER_DEV(TTL_7450_ANDORINVERT, name)                           \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, A, cI1)                                              \
-		NET_CONNECT(name, B, cI2)                                              \
-		NET_CONNECT(name, C, cI3)                                              \
-		NET_CONNECT(name, D, cI4)
-
-#define TTL_7450_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7450_DIP, name)
+// usage: TTL_7450_ANDORINVERT(name, cI1, cI2, cI3, cI4)
+#define TTL_7450_ANDORINVERT(...)                                              \
+		NET_REGISTER_DEVEXT(TTL_7450_ANDORINVERT, __VA_ARGS__)
 
 #endif /* NLD_7450_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7473.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7473.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7473.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7473.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,59 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_7473.c
+ * nld_7473.cpp
+ *
+ *  7473: Dual Master-Slave J-K Flip-Flops with Clear and Complementary Outputs
+ *  7473A: Dual Negative-Edge-Triggered Master-Slave J-K Flip-Flops with Clear and Complementary Outputs
+ *
+ *          +----------+
+ *     1CLK |1   ++  14| 1J
+ *    1CLRQ |2       13| 1QQ
+ *       1K |3       12| 1Q
+ *      VCC |4  7473 11| GND
+ *     2CLK |5       10| 2K
+ *    2CLRQ |6        9| 2Q
+ *       2J |7        8| 2QQ
+ *          +----------+
+ *
+ *
+ *          Function table 73
+ *
+ *          +-----+-----+-----+---++---+-----+
+ *          | CLRQ| CLK |  J  | K || Q | QQ  |
+ *          +=====+=====+=====+===++===+=====+
+ *          |  0  |  X  |  X  | X || 0 |  1  |
+ *          |  1  |  *  |  0  | 0 || Q0| Q0Q |
+ *          |  1  |  *  |  1  | 0 || 1 |  0  |
+ *          |  1  |  *  |  0  | 1 || 0 |  1  |
+ *          |  1  |  *  |  1  | 1 || TOGGLE  |
+ *          +-----+-----+-----+---++---+-----+
+ *                _
+ *          * = _| |_
+ *
+ *          This is positive triggered, J and K
+ *          are latched during clock high and
+ *          transferred when CLK falls.
+ *
+ *          Function table 73A
+ *
+ *          +-----+-----+-----+---++---+-----+
+ *          | CLRQ| CLK |  J  | K || Q | QQ  |
+ *          +=====+=====+=====+===++===+=====+
+ *          |  0  |  X  |  X  | X || 0 |  1  |
+ *          |  1  |  F  |  0  | 0 || Q0| Q0Q |
+ *          |  1  |  F  |  1  | 0 || 1 |  0  |
+ *          |  1  |  F  |  0  | 1 || 0 |  1  |
+ *          |  1  |  F  |  1  | 1 || TOGGLE  |
+ *          |  1  |  1  |  X  | X || Q0| Q0Q |
+ *          +-----+-----+-----+---++---+-----+
+ *
+ *          THe 73A is negative triggered.
+ *
+ *  Naming conventions follow Texas instruments datasheet
+ *
+ *  FIXME: Currently, only the 73 is implemented.
+ *         The 73A uses the same model.
  *
  */
 
@@ -15,10 +67,10 @@
 	NETLIB_OBJECT(7473)
 	{
 		NETLIB_CONSTRUCTOR(7473)
-		, m_CLK(*this, "CLK")
-		, m_J(*this, "J")
-		, m_K(*this, "K")
-		, m_CLRQ(*this, "CLRQ")
+		, m_CLK(*this, "CLK", NETLIB_DELEGATE(inputs))
+		, m_J(*this, "J", NETLIB_DELEGATE(inputs))
+		, m_K(*this, "K", NETLIB_DELEGATE(inputs))
+		, m_CLRQ(*this, "CLRQ", NETLIB_DELEGATE(inputs))
 		, m_last_CLK(*this, "m_last_CLK", 0)
 		, m_q(*this, "m_q", 0)
 		, m_Q(*this, "Q")
@@ -27,10 +79,44 @@
 		{
 		}
 
-		NETLIB_RESETI();
-		NETLIB_UPDATEI();
+		NETLIB_RESETI()
+		{
+			m_last_CLK = 0;
+		}
 
 	public:
+		NETLIB_HANDLERI(inputs)
+		{
+			const auto JK = (m_J() << 1) | m_K();
+
+			if (m_CLRQ())
+			{
+				if (!m_CLK() && m_last_CLK)
+				{
+					switch (JK)
+					{
+						case 1:             // (!m_J) & m_K))
+							m_q = 0;
+							break;
+						case 2:             // (m_J) & !m_K))
+							m_q = 1;
+							break;
+						case 3:             // (m_J) & m_K))
+							m_q ^= 1;
+							break;
+						default:
+						case 0:
+							break;
+					}
+				}
+			}
+
+			m_last_CLK = m_CLK();
+
+			m_Q.push(m_q, NLTIME_FROM_NS(20)); // FIXME: timing
+			m_QQ.push(m_q ^ 1, NLTIME_FROM_NS(20)); // FIXME: timing
+		}
+
 		logic_input_t m_CLK;
 		logic_input_t m_J;
 		logic_input_t m_K;
@@ -51,109 +137,8 @@
 
 	};
 
-	NETLIB_OBJECT(7473_dip)
-	{
-		NETLIB_CONSTRUCTOR(7473_dip)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		{
-			register_subalias("1", m_A.m_CLK);
-			register_subalias("2", m_A.m_CLRQ);
-			register_subalias("3", m_A.m_K);
-			register_subalias("4", "A.VCC");
-			register_subalias("5", m_B.m_CLK);
-			register_subalias("6", m_B.m_CLRQ);
-			register_subalias("7", m_B.m_J);
-
-			register_subalias("8", m_B.m_QQ);
-			register_subalias("9", m_B.m_Q);
-			register_subalias("10", m_B.m_K);
-			register_subalias("11", "A.GND");
-			register_subalias("12", m_B.m_Q);
-			register_subalias("13", m_A.m_QQ);
-			register_subalias("14", m_A.m_J);
-
-			connect("A.GND", "B.GND");
-			connect("A.VCC", "B.VCC");
-		}
-
-	private:
-		NETLIB_SUB(7473) m_A;
-		NETLIB_SUB(7473) m_B;
-	};
-
-	NETLIB_OBJECT(7473A_dip)
-	{
-		NETLIB_CONSTRUCTOR(7473A_dip)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		{
-			register_subalias("1", m_A.m_CLK);
-			register_subalias("2", m_A.m_CLRQ);
-			register_subalias("3", m_A.m_K);
-			register_subalias("4", "A.VCC");
-			register_subalias("5", m_B.m_CLK);
-			register_subalias("6", m_B.m_CLRQ);
-			register_subalias("7", m_B.m_J);
-
-			register_subalias("8", m_B.m_QQ);
-			register_subalias("9", m_B.m_Q);
-			register_subalias("10", m_B.m_K);
-			register_subalias("11", "A.GND");
-			register_subalias("12", m_B.m_Q);
-			register_subalias("13", m_A.m_QQ);
-			register_subalias("14", m_A.m_J);
-
-			connect("A.GND", "B.GND");
-			connect("A.VCC", "B.VCC");
-		}
-
-	private:
-		NETLIB_SUB(7473A) m_A;
-		NETLIB_SUB(7473A) m_B;
-	};
-
-	NETLIB_RESET(7473)
-	{
-		m_last_CLK = 0;
-	}
-
-	NETLIB_UPDATE(7473)
-	{
-		const auto JK = (m_J() << 1) | m_K();
-
-		if (m_CLRQ())
-		{
-			if (!m_CLK() && m_last_CLK)
-			{
-				switch (JK)
-				{
-					case 1:             // (!m_J) & m_K))
-						m_q = 0;
-						break;
-					case 2:             // (m_J) & !m_K))
-						m_q = 1;
-						break;
-					case 3:             // (m_J) & m_K))
-						m_q ^= 1;
-						break;
-					default:
-					case 0:
-						break;
-				}
-			}
-		}
-
-		m_last_CLK = m_CLK();
-
-		m_Q.push(m_q, NLTIME_FROM_NS(20)); // FIXME: timing
-		m_QQ.push(m_q ^ 1, NLTIME_FROM_NS(20)); // FIXME: timing
-	}
-
 	NETLIB_DEVICE_IMPL(7473, "TTL_7473", "+CLK,+J,+K,+CLRQ,@VCC,@GND")
 	NETLIB_DEVICE_IMPL(7473A, "TTL_7473A", "+CLK,+J,+K,+CLRQ,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(7473_dip, "TTL_7473_DIP", "")
-	NETLIB_DEVICE_IMPL(7473A_dip, "TTL_7473A_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7473.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7473.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7473.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7473.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,84 +1,16 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_7473.h
- *
- *  7473: Dual Master-Slave J-K Flip-Flops with Clear and Complementary Outputs
- *  7473A: Dual Negative-Edge-Triggered Master-Slave J-K Flip-Flops with Clear and Complementary Outputs
- *
- *          +----------+
- *     1CLK |1   ++  14| 1J
- *    1CLRQ |2       13| 1QQ
- *       1K |3       12| 1Q
- *      VCC |4  7473 11| GND
- *     2CLK |5       10| 2K
- *    2CLRQ |6        9| 2Q
- *       2J |7        8| 2QQ
- *          +----------+
- *
- *
- *          Function table 73
- *
- *          +-----+-----+-----+---++---+-----+
- *          | CLRQ| CLK |  J  | K || Q | QQ  |
- *          +=====+=====+=====+===++===+=====+
- *          |  0  |  X  |  X  | X || 0 |  1  |
- *          |  1  |  *  |  0  | 0 || Q0| Q0Q |
- *          |  1  |  *  |  1  | 0 || 1 |  0  |
- *          |  1  |  *  |  0  | 1 || 0 |  1  |
- *          |  1  |  *  |  1  | 1 || TOGGLE  |
- *          +-----+-----+-----+---++---+-----+
- *                _
- *          * = _| |_
- *
- *          This is positive triggered, J and K
- *          are latched during clock high and
- *          transferred when CLK falls.
- *
- *          Function table 73A
- *
- *          +-----+-----+-----+---++---+-----+
- *          | CLRQ| CLK |  J  | K || Q | QQ  |
- *          +=====+=====+=====+===++===+=====+
- *          |  0  |  X  |  X  | X || 0 |  1  |
- *          |  1  |  F  |  0  | 0 || Q0| Q0Q |
- *          |  1  |  F  |  1  | 0 || 1 |  0  |
- *          |  1  |  F  |  0  | 1 || 0 |  1  |
- *          |  1  |  F  |  1  | 1 || TOGGLE  |
- *          |  1  |  1  |  X  | X || Q0| Q0Q |
- *          +-----+-----+-----+---++---+-----+
- *
- *          THe 73A is negative triggered.
- *
- *  Naming conventions follow Texas instruments datasheet
- *
- *  FIXME: Currently, only the 73 is implemented.
- *         The 73A uses the same model.
- *
- */
 
 #ifndef NLD_7473_H_
 #define NLD_7473_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_7473(name, cCLK, cJ, cK, cCLRQ)                                    \
-		NET_REGISTER_DEV(TTL_7473, name)                                       \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CLK, cCLK)                                           \
-		NET_CONNECT(name, J, cJ)                                               \
-		NET_CONNECT(name, K, cK)                                               \
-		NET_CONNECT(name, CLRQ, cCLRQ)
+// usage: TTL_7473(name, cCLK, cJ, cK, cCLRQ)
+#define TTL_7473(...)                                                          \
+		NET_REGISTER_DEVEXT(TTL_7473, __VA_ARGS__)
 
-#define TTL_7473A(name, cCLK, cJ, cK, cCLRQ)                                   \
-		TTL_7473(name, cCLK, cJ, cK, cCLRQ)
-
-#define TTL_7473_DIP(name)                      \
-		NET_REGISTER_DEV(TTL_7473_DIP, name)
-
-
-#define TTL_7473A_DIP(name)                     \
-		NET_REGISTER_DEV(TTL_7473A_DIP, name)
+#define TTL_7473A(...)                                                         \
+		TTL_7473(__VA_ARGS__)
 
 #endif /* NLD_7473_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7474.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7474.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7474.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7474.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,8 +2,42 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_7474.c
+ * nld_7474.cpp
  *
+ *  DM7474: Dual Positive-Edge-Triggered D Flip-Flops
+ *          with Preset, Clear and Complementary Outputs
+ *
+ *          +--------------+
+ *     CLR1 |1     ++    14| VCC
+ *       D1 |2           13| CLR2
+ *     CLK1 |3           12| D2
+ *      PR1 |4    7474   11| CLK2
+ *       Q1 |5           10| PR2
+ *      Q1Q |6            9| Q2
+ *      GND |7            8| Q2Q
+ *          +--------------+
+ *
+ *          +-----+-----+-----+---++---+-----+
+ *          | PR  | CLR | CLK | D || Q | QQ  |
+ *          +=====+=====+=====+===++===+=====+
+ *          |  0  |  1  |  X  | X || 1 |  0  |
+ *          |  1  |  0  |  X  | X || 0 |  1  |
+ *          |  0  |  0  |  X  | X || 1 |  1  | (*)
+ *          |  1  |  1  |  R  | 1 || 1 |  0  |
+ *          |  1  |  1  |  R  | 0 || 0 |  1  |
+ *          |  1  |  1  |  0  | X || Q0| Q0Q |
+ *          +-----+-----+-----+---++---+-----+
+ *
+ *  (*) This configuration is not stable, i.e. it will not persist
+ *  when either the preset and or clear inputs return to their inactive (high) level
+ *
+ *  Q0 The output logic level of Q before the indicated input conditions were established
+ *
+ *  R:  0 -. 1
+ *
+ *  Naming conventions follow National Semiconductor datasheet
+ *
+ *  FIXME: Check that (*) is emulated properly
  */
 
 #include "nld_7474.h"
@@ -19,9 +53,9 @@
 	NETLIB_OBJECT(7474)
 	{
 		NETLIB_CONSTRUCTOR(7474)
-		, m_D(*this, "D")
-		, m_CLRQ(*this, "CLRQ")
-		, m_PREQ(*this, "PREQ")
+		, m_D(*this, "D", NETLIB_DELEGATE(inputs))
+		, m_CLRQ(*this, "CLRQ", NETLIB_DELEGATE(inputs))
+		, m_PREQ(*this, "PREQ", NETLIB_DELEGATE(inputs))
 		, m_CLK(*this, "CLK", NETLIB_DELEGATE(clk))
 		, m_Q(*this, "Q")
 		, m_QQ(*this, "QQ")
@@ -31,9 +65,36 @@
 		}
 
 	private:
-		NETLIB_RESETI();
-		NETLIB_UPDATEI();
-		NETLIB_HANDLERI(clk);
+		NETLIB_RESETI()
+		{
+			m_CLK.set_state(logic_t::STATE_INP_LH);
+			m_D.set_state(logic_t::STATE_INP_ACTIVE);
+			m_nextD = 0;
+		}
+
+		NETLIB_HANDLERI(clk)
+		{
+			newstate(m_nextD, !m_nextD);
+			m_CLK.inactivate();
+		}
+
+		NETLIB_HANDLERI(inputs)
+		{
+			const auto preq(m_PREQ());
+			const auto clrq(m_CLRQ());
+			if (preq & clrq)
+			{
+				m_D.activate();
+				m_nextD = m_D();
+				m_CLK.activate_lh();
+			}
+			else
+			{
+				newstate(preq ^ 1, clrq ^ 1);
+				m_CLK.inactivate();
+				m_D.inactivate();
+			}
+		}
 
 		logic_input_t m_D;
 		logic_input_t m_CLRQ;
@@ -55,80 +116,7 @@
 		}
 	};
 
-	NETLIB_OBJECT(7474_dip)
-	{
-		NETLIB_CONSTRUCTOR(7474_dip)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		{
-			register_subalias("1", "A.CLRQ");
-			register_subalias("2", "A.D");
-			register_subalias("3", "A.CLK");
-			register_subalias("4", "A.PREQ");
-			register_subalias("5", "A.Q");
-			register_subalias("6", "A.QQ");
-			register_subalias("7", "A.GND");
-
-			register_subalias("8", "B.QQ");
-			register_subalias("9", "B.Q");
-			register_subalias("10", "B.PREQ");
-			register_subalias("11", "B.CLK");
-			register_subalias("12", "B.D");
-			register_subalias("13", "B.CLRQ");
-			register_subalias("14", "A.VCC");
-
-			connect("A.GND", "B.GND");
-			connect("A.VCC", "B.VCC");
-		}
-		NETLIB_UPDATEI();
-		NETLIB_RESETI();
-
-	private:
-		NETLIB_SUB(7474) m_A;
-		NETLIB_SUB(7474) m_B;
-	};
-
-	NETLIB_HANDLER(7474, clk)
-	{
-		newstate(m_nextD, !m_nextD);
-		m_CLK.inactivate();
-	}
-
-	NETLIB_UPDATE(7474)
-	{
-		const auto preq(m_PREQ());
-		const auto clrq(m_CLRQ());
-		if (preq & clrq)
-		{
-			m_D.activate();
-			m_nextD = m_D();
-			m_CLK.activate_lh();
-		}
-		else
-		{
-			newstate(preq ^ 1, clrq ^ 1);
-			m_CLK.inactivate();
-			m_D.inactivate();
-		}
-	}
-
-	NETLIB_RESET(7474)
-	{
-		m_CLK.set_state(logic_t::STATE_INP_LH);
-		m_D.set_state(logic_t::STATE_INP_ACTIVE);
-		m_nextD = 0;
-	}
-
-	NETLIB_RESET(7474_dip)
-	{
-	}
-
-	NETLIB_UPDATE(7474_dip)
-	{
-	}
-
 	NETLIB_DEVICE_IMPL(7474, "TTL_7474", "+CLK,+D,+CLRQ,+PREQ,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(7474_dip, "TTL_7474_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7474.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7474.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7474.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7474.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,59 +1,13 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_7474.h
- *
- *  DM7474: Dual Positive-Edge-Triggered D Flip-Flops
- *          with Preset, Clear and Complementary Outputs
- *
- *          +--------------+
- *     CLR1 |1     ++    14| VCC
- *       D1 |2           13| CLR2
- *     CLK1 |3           12| D2
- *      PR1 |4    7474   11| CLK2
- *       Q1 |5           10| PR2
- *      Q1Q |6            9| Q2
- *      GND |7            8| Q2Q
- *          +--------------+
- *
- *          +-----+-----+-----+---++---+-----+
- *          | PR  | CLR | CLK | D || Q | QQ  |
- *          +=====+=====+=====+===++===+=====+
- *          |  0  |  1  |  X  | X || 1 |  0  |
- *          |  1  |  0  |  X  | X || 0 |  1  |
- *          |  0  |  0  |  X  | X || 1 |  1  | (*)
- *          |  1  |  1  |  R  | 1 || 1 |  0  |
- *          |  1  |  1  |  R  | 0 || 0 |  1  |
- *          |  1  |  1  |  0  | X || Q0| Q0Q |
- *          +-----+-----+-----+---++---+-----+
- *
- *  (*) This configuration is not stable, i.e. it will not persist
- *  when either the preset and or clear inputs return to their inactive (high) level
- *
- *  Q0 The output logic level of Q before the indicated input conditions were established
- *
- *  R:  0 -. 1
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- *  FIXME: Check that (*) is emulated properly
- */
 
 #ifndef NLD_7474_H_
 #define NLD_7474_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_7474(name, cCLK, cD, cCLRQ, cPREQ)                                 \
-		NET_REGISTER_DEV(TTL_7474, name)                                       \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CLK, cCLK)                                           \
-		NET_CONNECT(name, D,  cD)                                              \
-		NET_CONNECT(name, CLRQ,  cCLRQ)                                        \
-		NET_CONNECT(name, PREQ,  cPREQ)
-
-#define TTL_7474_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7474_DIP, name)
+// usage: TTL_7474(name, cCLK, cD, cCLRQ, cPREQ)
+#define TTL_7474(...)                                             \
+		NET_REGISTER_DEVEXT(TTL_7474, __VA_ARGS__)
 
 #endif /* NLD_7474_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7475.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7475.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7475.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7475.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4,6 +4,34 @@
  * nld_7475.cpp
  *
  * TODO: Correct timing for clock-induced state changes, rather than assuming timing is always due to data-induced state changes
+ *
+ *  7475: 4-Bit Bistable Latches with Complementary Outputs
+ *  7477: 4-Bit Bistable Latches
+ *
+ *          +----------+               +----------+
+ *      1QQ |1   ++  16| 1Q         1D |1   ++  14| 1Q
+ *       1D |2       15| 2Q         2D |2       13| 2Q
+ *       2D |3       14| 2QQ      3C4C |3       12| 1C2C
+ *     3C4C |4  7475 13| 1C2C      VCC |4  7477 11| GND
+ *      VCC |5       12| GND        3D |5       10| NC
+ *       3D |6       11| 3QQ        4D |6        9| 3Q
+ *       4D |7       10| 3Q         NC |7        8| 4Q
+ *      4QQ |8        9| 4Q            +----------+
+ *          +----------+
+ *
+ *
+ *          Function table
+ *
+ *          +---+---++---+-----+
+ *          | D | C || Q | QQ  |
+ *          +===+===++===+=====+
+ *          | 0 | 1 || 0 |  1  |
+ *          | 1 | 1 || 1 |  0  |
+ *          | X | 0 || Q0| Q0Q |
+ *          +---+---++---+-----+
+ *
+ *  Naming conventions follow Texas instruments datasheet
+ *
  */
 
 #include "nld_7475.h"
@@ -13,161 +41,62 @@
 {
 	namespace devices
 	{
-	NETLIB_OBJECT(7477)
+	template<bool _HasQQ>
+	NETLIB_OBJECT(7475_GATE_BASE)
 	{
-		NETLIB_CONSTRUCTOR(7477)
-		, m_C1C2(*this, "C1C2")
-		, m_C3C4(*this, "C3C4")
-		, m_last_Q(*this, "m_last_Q", 0)
-		, m_D(*this, {"D1", "D2", "D3", "D4"})
-		, m_Q(*this, {"Q1", "Q2", "Q3", "Q4"})
+		NETLIB_CONSTRUCTOR(7475_GATE_BASE)
+		, m_D(*this, "D", NETLIB_DELEGATE(inputs))
+		, m_CLK(*this, "CLK", NETLIB_DELEGATE(clk))
+		, m_Q(*this, "Q")
+		, m_QQ(*this, "QQ")
+		, m_nextD(*this, "m_nextD", 0)
 		, m_power_pins(*this)
 		{
-			register_subalias("Q1", m_Q[0]);
 		}
 
 		NETLIB_RESETI()
 		{
-			m_last_Q = 0;
+			m_CLK.set_state(logic_t::STATE_INP_LH);
+			m_nextD = 0;
 		}
-		NETLIB_UPDATEI();
-
-		void update_outputs(std::size_t start, std::size_t end);
-
-		friend class NETLIB_NAME(7477_dip);
-		friend class NETLIB_NAME(7475_dip);
-		// FIXME: needs cleanup
-		friend class NETLIB_NAME(7475);
-	private:
-		logic_input_t m_C1C2;
-		logic_input_t m_C3C4;
-		state_var<unsigned> m_last_Q;
-		object_array_t<logic_input_t, 4> m_D;
-		object_array_t<logic_output_t, 4> m_Q;
-		nld_power_pins m_power_pins;
-	};
 
-	NETLIB_OBJECT_DERIVED(7475, 7477)
-	{
-		NETLIB_CONSTRUCTOR(7475)
-		, m_QQ(*this, {"QQ1", "QQ2", "QQ3", "QQ4"})
+		NETLIB_HANDLERI(clk)
 		{
+			newstate(m_nextD, !m_nextD);
+			m_CLK.inactivate();
 		}
 
-		NETLIB_UPDATEI();
-
-		friend class NETLIB_NAME(7477_dip);
-		friend class NETLIB_NAME(7475_dip);
-	private:
-		object_array_t<logic_output_t, 4> m_QQ;
-	};
-
-	NETLIB_OBJECT(7475_dip)
-	{
-		NETLIB_CONSTRUCTOR(7475_dip)
-		, A(*this, "A")
+		NETLIB_HANDLERI(inputs)
 		{
-			register_subalias("1", A.m_QQ[0]);
-			register_subalias("2", A.m_D[0]);
-			register_subalias("3", A.m_D[1]);
-			register_subalias("4", A.m_C3C4);
-			register_subalias("5", "A.VCC");
-			register_subalias("6", A.m_D[2]);
-			register_subalias("7", A.m_D[3]);
-			register_subalias("8", A.m_QQ[3]);
-
-			register_subalias("9",  A.m_Q[3]);
-			register_subalias("10", A.m_Q[2]);
-			register_subalias("11", A.m_QQ[2]);
-			register_subalias("12", "A.GND");
-			register_subalias("13", A.m_C1C2);
-			register_subalias("14", A.m_QQ[1]);
-			register_subalias("15", A.m_Q[1]);
-			register_subalias("16", A.m_Q[0]);
+			m_nextD = m_D();
+			m_CLK.activate_lh();
 		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(7475) A;
-	};
 
-	NETLIB_OBJECT(7477_dip)
-	{
-		NETLIB_CONSTRUCTOR(7477_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_D[0]);
-			register_subalias("2", A.m_D[1]);
-			register_subalias("3", A.m_C3C4);
-			register_subalias("4", "A.VCC");
-			register_subalias("5", A.m_D[2]);
-			register_subalias("6", A.m_D[3]);
-			//register_subalias("7", ); ==> NC
-
-			register_subalias("8",  A.m_Q[3]);
-			register_subalias("9",  A.m_Q[2]);
-			//register_subalias("10", ); ==> NC
-			register_subalias("11", "A.GND");
-			register_subalias("12", A.m_C1C2);
-			register_subalias("13", A.m_Q[1]);
-			register_subalias("14", A.m_Q[0]);
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
 	private:
-		NETLIB_SUB(7477) A;
-	};
-
-	NETLIB_UPDATE(7475)
-	{
-		unsigned start_q = m_last_Q;
+		logic_input_t m_D;
+		logic_input_t m_CLK;
+		logic_output_t m_Q;
+		logic_output_t m_QQ;
 
-		NETLIB_NAME(7477)::update();
+		state_var<netlist_sig_t> m_nextD;
 
-		for (std::size_t i=0; i<4; i++)
-		{
-			unsigned last_bit = (m_last_Q >> i) & 1;
-			unsigned start_bit = (start_q >> i) & 1;
-			if (last_bit != start_bit)
-				m_QQ[i].push(last_bit ^ 1, last_bit != 0 ? NLTIME_FROM_NS(15) : NLTIME_FROM_NS(40));
-		}
-	}
-
-	void NETLIB_NAME(7477)::update_outputs(std::size_t start, std::size_t end)
-	{
-		for (std::size_t i=start; i<end; i++)
-		{
-			netlist_sig_t d = m_D[i]();
-			if (d != ((m_last_Q >> i) & 1))
-				m_Q[i].push(d, d != 0 ? NLTIME_FROM_NS(30) : NLTIME_FROM_NS(25));
-			m_last_Q &= ~(1 << i);
-			m_last_Q |= d << i;
-		}
-	}
+		nld_power_pins m_power_pins;
 
-	NETLIB_UPDATE(7477)
-	{
-		netlist_sig_t c1c2 = m_C1C2();
-		netlist_sig_t c3c4 = m_C3C4();
-		if (c1c2 && c3c4)
+		void newstate(const netlist_sig_t stateQ, const netlist_sig_t stateQQ)
 		{
-			update_outputs(0, 4);
-		}
-		else if (c1c2)
-		{
-			update_outputs(0, 2);
-		}
-		else if (c3c4)
-		{
-			update_outputs(2, 4);
+			// 0: High-to-low 40 ns, 1: Low-to-high 25 ns
+			static constexpr const std::array<netlist_time, 2> delay = { NLTIME_FROM_NS(40), NLTIME_FROM_NS(25) };
+			m_Q.push(stateQ, delay[stateQ]);
+			if (_HasQQ)
+				m_QQ.push(stateQQ, delay[stateQQ]);
 		}
+	};
 
-	}
+	using NETLIB_NAME(7475_GATE) = NETLIB_NAME(7475_GATE_BASE)<true>;
+	using NETLIB_NAME(7477_GATE) = NETLIB_NAME(7475_GATE_BASE)<false>;
 
-	NETLIB_DEVICE_IMPL(7475,     "TTL_7475",     "")
-	NETLIB_DEVICE_IMPL(7475_dip, "TTL_7475_DIP", "")
-	NETLIB_DEVICE_IMPL(7477,     "TTL_7477",     "")
-	NETLIB_DEVICE_IMPL(7477_dip, "TTL_7477_DIP", "")
+	NETLIB_DEVICE_IMPL(7475_GATE, "TTL_7475_GATE", "")
+	NETLIB_DEVICE_IMPL(7477_GATE, "TTL_7477_GATE", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7475.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7475.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7475.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7475.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,64 +1,15 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-/*
- * nld_7475.h
- *
- *  7475: 4-Bit Bistable Latches with Complementary Outputs
- *  7477: 4-Bit Bistable Latches
- *
- *          +----------+               +----------+
- *      1QQ |1   ++  16| 1Q         1D |1   ++  14| 1Q
- *       1D |2       15| 2Q         2D |2       13| 2Q
- *       2D |3       14| 2QQ      3C4C |3       12| 1C2C
- *     3C4C |4  7475 13| 1C2C      VCC |4  7477 11| GND
- *      VCC |5       12| GND        3D |5       10| NC
- *       3D |6       11| 3QQ        4D |6        9| 3Q
- *       4D |7       10| 3Q         NC |7        8| 4Q
- *      4QQ |8        9| 4Q            +----------+
- *          +----------+
- *
- *
- *          Function table
- *
- *          +---+---++---+-----+
- *          | D | C || Q | QQ  |
- *          +===+===++===+=====+
- *          | 0 | 1 || 0 |  1  |
- *          | 1 | 1 || 1 |  0  |
- *          | X | 0 || Q0| Q0Q |
- *          +---+---++---+-----+
- *
- *  Naming conventions follow Texas instruments datasheet
- *
- */
 
 #ifndef NLD_7475_H_
 #define NLD_7475_H_
 
 #include "netlist/nl_setup.h"
 
-#define PARAMS_7475_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4)               \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, C1C2, cC1C2)                                         \
-		NET_CONNECT(name, C3C4, cC3C4)                                         \
-		NET_CONNECT(name, D1,   cD1)                                           \
-		NET_CONNECT(name, D2,   cD2)                                           \
-		NET_CONNECT(name, D3,   cD3)                                           \
-		NET_CONNECT(name, D4,   cD4)
+#define TTL_7475_GATE(...)                                                     \
+		NET_REGISTER_DEVEXT(TTL_7475_GATE, __VA_ARGS__)
 
-#define TTL_7475(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4)                       \
-		NET_REGISTER_DEV(TTL_7475, name)                                       \
-		PARAMS_7475_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4)
-
-#define TTL_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4)                       \
-		NET_REGISTER_DEV(TTL_7477, name)                                       \
-		PARAMS_7475_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4)
-
-#define TTL_7475_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7475_DIP, name)
-
-#define TTL_7477_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7477_DIP, name)
+#define TTL_7477_GATE(...)                                                     \
+		NET_REGISTER_DEVEXT(TTL_7477_GATE, __VA_ARGS__)
 
 #endif /* NLD_7475_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7483.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7483.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7483.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7483.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,26 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_7483.c
+ * nld_7483.cpp
+ *
+ *  DM7483: 4-Bit Binary Adder with Fast Carry
+ *
+ *          +--------------+
+ *       A4 |1     ++    16| B4
+ *       S3 |2           15| S4
+ *       A3 |3           14| C4
+ *       B3 |4    7483   13| C0
+ *      VCC |5           12| GND
+ *       S2 |6           11| B1
+ *       B2 |7           10| A1
+ *       A2 |8            9| S1
+ *          +--------------+
+ *
+ *          S = (A + B + C0) & 0x0f
+ *
+ *          C4 = (A + B + C) > 15 ? 1 : 0
+ *
+ *  Naming conventions follow Fairchild Semiconductor datasheet
  *
  */
 
@@ -15,7 +34,7 @@
 	NETLIB_OBJECT(7483)
 	{
 		NETLIB_CONSTRUCTOR(7483)
-		, m_C0(*this, "C0")
+		, m_C0(*this, "C0", NETLIB_DELEGATE(c0))
 		, m_A1(*this, "A1", NETLIB_DELEGATE(upd_a))
 		, m_A2(*this, "A2", NETLIB_DELEGATE(upd_a))
 		, m_A3(*this, "A3", NETLIB_DELEGATE(upd_a))
@@ -39,12 +58,36 @@
 		{
 			m_lastr = 0;
 		}
-		NETLIB_UPDATEI();
-		NETLIB_HANDLERI(upd_a);
-		NETLIB_HANDLERI(upd_b);
 
-		friend class NETLIB_NAME(7483_dip);
 	private:
+		NETLIB_HANDLERI(c0)
+		{
+			auto r = static_cast<uint8_t>(m_a + m_b + m_C0());
+
+			if (r != m_lastr)
+			{
+				m_lastr = r;
+				m_S1.push((r >> 0) & 1, NLTIME_FROM_NS(23));
+				m_S2.push((r >> 1) & 1, NLTIME_FROM_NS(23));
+				m_S3.push((r >> 2) & 1, NLTIME_FROM_NS(23));
+				m_S4.push((r >> 3) & 1, NLTIME_FROM_NS(23));
+				m_C4.push((r >> 4) & 1, NLTIME_FROM_NS(23));
+			}
+		}
+
+		NETLIB_HANDLERI(upd_a)
+		{
+			m_a = static_cast<uint8_t>((m_A1() << 0) | (m_A2() << 1) | (m_A3() << 2) | (m_A4() << 3));
+			c0();
+		}
+
+		NETLIB_HANDLERI(upd_b)
+		{
+			m_b = static_cast<uint8_t>((m_B1() << 0) | (m_B2() << 1) | (m_B3() << 2) | (m_B4() << 3));
+			c0();
+		}
+
+
 		logic_input_t m_C0;
 		logic_input_t m_A1;
 		logic_input_t m_A2;
@@ -67,64 +110,7 @@
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(7483_dip)
-	{
-		NETLIB_CONSTRUCTOR(7483_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_A4);
-			register_subalias("2", A.m_S3);
-			register_subalias("3", A.m_A3);
-			register_subalias("4", A.m_B3);
-			register_subalias("5", "A.VCC");
-			register_subalias("6", A.m_S2);
-			register_subalias("7", A.m_B2);
-			register_subalias("8", A.m_A2);
-
-			register_subalias("9", A.m_S1);
-			register_subalias("10", A.m_A1);
-			register_subalias("11", A.m_B1);
-			register_subalias("12", "A.GND");
-			register_subalias("13", A.m_C0);
-			register_subalias("14", A.m_C4);
-			register_subalias("15", A.m_S4);
-			register_subalias("16", A.m_B4);
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(7483) A;
-	};
-
-	NETLIB_HANDLER(7483, upd_a)
-	{
-		m_a = static_cast<uint8_t>((m_A1() << 0) | (m_A2() << 1) | (m_A3() << 2) | (m_A4() << 3));
-		NETLIB_NAME(7483)::update();
-	}
-
-	NETLIB_HANDLER(7483, upd_b)
-	{
-		m_b = static_cast<uint8_t>((m_B1() << 0) | (m_B2() << 1) | (m_B3() << 2) | (m_B4() << 3));
-		NETLIB_NAME(7483)::update();
-	}
-
-	NETLIB_UPDATE(7483)
-	{
-		auto r = static_cast<uint8_t>(m_a + m_b + m_C0());
-
-		if (r != m_lastr)
-		{
-			m_lastr = r;
-			m_S1.push((r >> 0) & 1, NLTIME_FROM_NS(23));
-			m_S2.push((r >> 1) & 1, NLTIME_FROM_NS(23));
-			m_S3.push((r >> 2) & 1, NLTIME_FROM_NS(23));
-			m_S4.push((r >> 3) & 1, NLTIME_FROM_NS(23));
-			m_C4.push((r >> 4) & 1, NLTIME_FROM_NS(23));
-		}
-	}
-
 	NETLIB_DEVICE_IMPL(7483, "TTL_7483", "+A1,+A2,+A3,+A4,+B1,+B2,+B3,+B4,+C0,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(7483_dip, "TTL_7483_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7483.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7483.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7483.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7483.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,49 +1,13 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_7483.h
- *
- *  DM7483: 4-Bit Binary Adder with Fast Carry
- *
- *          +--------------+
- *       A4 |1     ++    16| B4
- *       S3 |2           15| S4
- *       A3 |3           14| C4
- *       B3 |4    7483   13| C0
- *      VCC |5           12| GND
- *       S2 |6           11| B1
- *       B2 |7           10| A1
- *       A2 |8            9| S1
- *          +--------------+
- *
- *          S = (A + B + C0) & 0x0f
- *
- *          C4 = (A + B + C) > 15 ? 1 : 0
- *
- *  Naming conventions follow Fairchild Semiconductor datasheet
- *
- */
 
 #ifndef NLD_7483_H_
 #define NLD_7483_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_7483(name, cA1, cA2, cA3, cA4, cB1, cB2, cB3, cB4, cCI)            \
-		NET_REGISTER_DEV(TTL_7483, name)                                       \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, A1, cA1)                                             \
-		NET_CONNECT(name, A2, cA2)                                             \
-		NET_CONNECT(name, A3, cA3)                                             \
-		NET_CONNECT(name, A4, cA4)                                             \
-		NET_CONNECT(name, B1, cB1)                                             \
-		NET_CONNECT(name, B2, cB2)                                             \
-		NET_CONNECT(name, B3, cB3)                                             \
-		NET_CONNECT(name, B4, cB4)                                             \
-		NET_CONNECT(name, C0, cCI)
-
-#define TTL_7483_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7483_DIP, name)
+// usage: TTL_7483(name, cA1, cA2, cA3, cA4, cB1, cB2, cB3, cB4, cCI)
+#define TTL_7483(...)                                                     \
+		NET_REGISTER_DEVEXT(TTL_7483, __VA_ARGS__)
 
 #endif /* NLD_7483_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7485.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7485.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7485.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7485.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,23 @@
 /*
  * nld_7485.cpp
  *
+ * FIXME: Truthtable candidate
+ *
+ *  DM7485: 4-bit Magnitude Comparators
+ *
+ *          +------------+
+ *       B3 |1    ++   16| VCC
+ *     LTIN |2         15| A3
+ *     EQIN |3         14| B2
+ *     GTIN |4   7485  13| A2
+ *    GTOUT |5         12| A1
+ *    EQOUT |6         11| B1
+ *    LTOUT |7         10| A0
+ *      GND |8          9| B0
+ *          +------------+
+ *
+ *  Naming convention attempts to follow Texas Instruments datasheet
+ *
  */
 
 #include "nld_7485.h"
@@ -15,11 +32,11 @@
 	NETLIB_OBJECT(7485)
 	{
 		NETLIB_CONSTRUCTOR(7485)
-		, m_A(*this, {"A0", "A1", "A2", "A3"})
-		, m_B(*this, {"B0", "B1", "B2", "B3"})
-		, m_LTIN(*this, "LTIN")
-		, m_EQIN(*this, "EQIN")
-		, m_GTIN(*this, "GTIN")
+		, m_A(*this, {"A0", "A1", "A2", "A3"}, NETLIB_DELEGATE(inputs))
+		, m_B(*this, {"B0", "B1", "B2", "B3"}, NETLIB_DELEGATE(inputs))
+		, m_LTIN(*this, "LTIN", NETLIB_DELEGATE(inputs))
+		, m_EQIN(*this, "EQIN", NETLIB_DELEGATE(inputs))
+		, m_GTIN(*this, "GTIN", NETLIB_DELEGATE(inputs))
 		, m_LTOUT(*this, "LTOUT")
 		, m_EQOUT(*this, "EQOUT")
 		, m_GTOUT(*this, "GTOUT")
@@ -27,12 +44,45 @@
 		{
 		}
 
-		NETLIB_UPDATEI();
+	private:
+		// FIXME: Timing
+		NETLIB_HANDLERI(inputs)
+		{
+			for (std::size_t i = 4; i-- > 0; )
+			{
+				if (m_A[i]() > m_B[i]())
+				{
+					update_outputs(1, 0, 0);
+					return;
+				}
+
+				if (m_A[i]() < m_B[i]())
+				{
+					update_outputs(0, 1, 0);
+					return;
+				}
+			}
+
+			// must be == if we got here
+			if (m_EQIN())
+				update_outputs(0, 0, 1);
+			else if (m_GTIN() && m_LTIN())
+				update_outputs(0, 0, 0);
+			else if (m_GTIN())
+				update_outputs(1, 0, 0);
+			else if (m_LTIN())
+				update_outputs(0, 1, 0);
+			else
+				update_outputs(1, 1, 0);
+		}
 
-		void update_outputs(unsigned gt, unsigned lt, unsigned eq);
+		void update_outputs(unsigned gt, unsigned lt, unsigned eq)
+		{
+			m_GTOUT.push(gt, NLTIME_FROM_NS(23));
+			m_LTOUT.push(lt, NLTIME_FROM_NS(23));
+			m_EQOUT.push(eq, NLTIME_FROM_NS(23));
+		}
 
-		friend class NETLIB_NAME(7485_dip);
-	private:
 		object_array_t<logic_input_t, 4> m_A;
 		object_array_t<logic_input_t, 4> m_B;
 		logic_input_t m_LTIN;
@@ -44,76 +94,7 @@
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(7485_dip)
-	{
-		NETLIB_CONSTRUCTOR(7485_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_B[3]);
-			register_subalias("2", A.m_LTIN);
-			register_subalias("3", A.m_EQIN);
-			register_subalias("4", A.m_GTIN);
-			register_subalias("5", A.m_GTOUT);
-			register_subalias("6", A.m_EQOUT);
-			register_subalias("7", A.m_LTOUT);
-			register_subalias("8", "A.GND");
-
-			register_subalias("9",  A.m_B[0]);
-			register_subalias("10", A.m_A[0]);
-			register_subalias("11", A.m_B[1]);
-			register_subalias("12", A.m_A[1]);
-			register_subalias("13", A.m_A[2]);
-			register_subalias("14", A.m_B[2]);
-			register_subalias("15", A.m_A[3]);
-			register_subalias("16", "A.VCC");
-
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(7485) A;
-	};
-
-	void NETLIB_NAME(7485)::update_outputs(unsigned gt, unsigned lt, unsigned eq)
-	{
-		m_GTOUT.push(gt, NLTIME_FROM_NS(23));
-		m_LTOUT.push(lt, NLTIME_FROM_NS(23));
-		m_EQOUT.push(eq, NLTIME_FROM_NS(23));
-	}
-
-	// FIXME: Timing
-	NETLIB_UPDATE(7485)
-	{
-		for (std::size_t i = 4; i-- > 0; )
-		{
-			if (m_A[i]() > m_B[i]())
-			{
-				update_outputs(1, 0, 0);
-				return;
-			}
-
-			if (m_A[i]() < m_B[i]())
-			{
-				update_outputs(0, 1, 0);
-				return;
-			}
-		}
-
-		// must be == if we got here
-		if (m_EQIN())
-			update_outputs(0, 0, 1);
-		else if (m_GTIN() && m_LTIN())
-			update_outputs(0, 0, 0);
-		else if (m_GTIN())
-			update_outputs(1, 0, 0);
-		else if (m_LTIN())
-			update_outputs(0, 1, 0);
-		else
-			update_outputs(1, 1, 0);
-	}
-
 	NETLIB_DEVICE_IMPL(7485, "TTL_7485", "+A0,+A1,+A2,+A3,+B0,+B1,+B2,+B3,+LTIN,+EQIN,+GTIN,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(7485_dip, "TTL_7485_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7485.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7485.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7485.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7485.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,47 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-/*
- * nld_7485.h
- *
- *  DM7485: 4-bit Magnitude Comparators
- *
- *          +------------+
- *       B3 |1    ++   16| VCC
- *     LTIN |2         15| A3
- *     EQIN |3         14| B2
- *     GTIN |4   7485  13| A2
- *    GTOUT |5         12| A1
- *    EQOUT |6         11| B1
- *    LTOUT |7         10| A0
- *      GND |8          9| B0
- *          +------------+
- *
- *  Naming convention attempts to follow Texas Instruments datasheet
- *
- */
 
 #ifndef NLD_7485_H_
 #define NLD_7485_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_7485(name, cA0, cA1, cA2, cA3, cB0, cB1, cB2, cB3, cLTIN, cEQIN, cGTIN)    \
-		NET_REGISTER_DEV(TTL_7485, name)                                       \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, A0,   cA0)                                           \
-		NET_CONNECT(name, A1,   cA1)                                           \
-		NET_CONNECT(name, A2,   cA2)                                           \
-		NET_CONNECT(name, A3,   cA3)                                           \
-		NET_CONNECT(name, B0,   cB0)                                           \
-		NET_CONNECT(name, B1,   cB1)                                           \
-		NET_CONNECT(name, B2,   cB2)                                           \
-		NET_CONNECT(name, B3,   cB3)                                           \
-		NET_CONNECT(name, LTIN, cLTIN)                                         \
-		NET_CONNECT(name, EQIN, cEQIN)                                         \
-		NET_CONNECT(name, GTIN, cGTIN)
-
-#define TTL_7485_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7485_DIP, name)
+// usage: TTL_7485(name, cA0, cA1, cA2, cA3, cB0, cB1, cB2, cB3, cLTIN, cEQIN, cGTIN)
+#define TTL_7485(...)                                                     \
+		NET_REGISTER_DEVEXT(TTL_7485, __VA_ARGS__)
 
 #endif /* NLD_7485_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7490.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7490.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7490.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7490.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,54 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_7490.c
+ * nld_7490.cpp
+ *
+ *  DM7490: Decade Counters
+ *
+ *          +--------------+
+ *        B |1     ++    14| A
+ *      R01 |2           13| NC
+ *      R02 |3           12| QA
+ *       NC |4    7490   11| QD
+ *      VCC |5           10| GND
+ *      R91 |6            9| QB
+ *      R92 |7            8| QC
+ *          +--------------+
+ *
+ *          Counter Sequence
+ *
+ *          +-------++----+----+----+----+
+ *          | COUNT || QD | QC | QB | QA |
+ *          +=======++====+====+====+====+
+ *          |    0  ||  0 |  0 |  0 |  0 |
+ *          |    1  ||  0 |  0 |  0 |  1 |
+ *          |    2  ||  0 |  0 |  1 |  0 |
+ *          |    3  ||  0 |  0 |  1 |  1 |
+ *          |    4  ||  0 |  1 |  0 |  0 |
+ *          |    5  ||  0 |  1 |  0 |  1 |
+ *          |    6  ||  0 |  1 |  1 |  0 |
+ *          |    7  ||  0 |  1 |  1 |  1 |
+ *          |    8  ||  1 |  0 |  0 |  0 |
+ *          |    9  ||  1 |  0 |  0 |  1 |
+ *          +-------++----+----+----+----+
+ *
+ *          Note A Output QA is connected to input B for BCD count
+ *
+ *          Reset Count Function table
+ *
+ *          +-----+-----+-----+-----++----+----+----+----+
+ *          | R01 | R02 | R91 | R92 || QD | QC | QB | QA |
+ *          +=====+=====+=====+=====++====+====+====+====+
+ *          |  1  |  1  |  0  |  X  ||  0 |  0 |  0 |  0 |
+ *          |  1  |  1  |  X  |  0  ||  0 |  0 |  0 |  0 |
+ *          |  X  |  X  |  1  |  1  ||  1 |  0 |  0 |  1 |
+ *          |  X  |  0  |  X  |  0  ||       COUNT       |
+ *          |  0  |  X  |  0  |  X  ||       COUNT       |
+ *          |  0  |  X  |  X  |  0  ||       COUNT       |
+ *          |  X  |  0  |  0  |  X  ||       COUNT       |
+ *          +-----+-----+-----+-----++----+----+----+----+
+ *
+ *  Naming conventions follow National Semiconductor datasheet
  *
  */
 
@@ -24,12 +71,12 @@
 	NETLIB_OBJECT(7490)
 	{
 		NETLIB_CONSTRUCTOR(7490)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		, m_R1(*this, "R1")
-		, m_R2(*this, "R2")
-		, m_R91(*this, "R91")
-		, m_R92(*this, "R92")
+		, m_A(*this, "A", NETLIB_DELEGATE(inputs))
+		, m_B(*this, "B", NETLIB_DELEGATE(inputs))
+		, m_R1(*this, "R1", NETLIB_DELEGATE(inputs))
+		, m_R2(*this, "R2", NETLIB_DELEGATE(inputs))
+		, m_R91(*this, "R91", NETLIB_DELEGATE(inputs))
+		, m_R92(*this, "R92", NETLIB_DELEGATE(inputs))
 		, m_cnt(*this, "m_cnt", 0)
 		, m_last_A(*this, "m_last_A", 0)
 		, m_last_B(*this, "m_last_B", 0)
@@ -39,7 +86,7 @@
 		}
 
 	private:
-		NETLIB_UPDATEI()
+		NETLIB_HANDLERI(inputs)
 		{
 			const netlist_sig_t new_A = m_A();
 			const netlist_sig_t new_B = m_B();
@@ -95,36 +142,7 @@
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(7490_dip)
-	{
-		NETLIB_CONSTRUCTOR(7490_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", "A.B");
-			register_subalias("2", "A.R1");
-			register_subalias("3", "A.R2");
-
-			// register_subalias("4", ); --> NC
-			register_subalias("5", "A.VCC");
-			register_subalias("6", "A.R91");
-			register_subalias("7", "A.R92");
-
-			register_subalias("8", "A.QC");
-			register_subalias("9", "A.QB");
-			register_subalias("10", "A.GND");
-			register_subalias("11", "A.QD");
-			register_subalias("12", "A.QA");
-			// register_subalias("13", ); --> NC
-			register_subalias("14", "A.A");
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(7490) A;
-	};
-
 	NETLIB_DEVICE_IMPL(7490,     "TTL_7490",        "+A,+B,+R1,+R2,+R91,+R92,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(7490_dip, "TTL_7490_DIP",    "")
 
 } // namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7490.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7490.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7490.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7490.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,74 +1,13 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_7490.h
- *
- *  DM7490: Decade Counters
- *
- *          +--------------+
- *        B |1     ++    14| A
- *      R01 |2           13| NC
- *      R02 |3           12| QA
- *       NC |4    7490   11| QD
- *      VCC |5           10| GND
- *      R91 |6            9| QB
- *      R92 |7            8| QC
- *          +--------------+
- *
- *          Counter Sequence
- *
- *          +-------++----+----+----+----+
- *          | COUNT || QD | QC | QB | QA |
- *          +=======++====+====+====+====+
- *          |    0  ||  0 |  0 |  0 |  0 |
- *          |    1  ||  0 |  0 |  0 |  1 |
- *          |    2  ||  0 |  0 |  1 |  0 |
- *          |    3  ||  0 |  0 |  1 |  1 |
- *          |    4  ||  0 |  1 |  0 |  0 |
- *          |    5  ||  0 |  1 |  0 |  1 |
- *          |    6  ||  0 |  1 |  1 |  0 |
- *          |    7  ||  0 |  1 |  1 |  1 |
- *          |    8  ||  1 |  0 |  0 |  0 |
- *          |    9  ||  1 |  0 |  0 |  1 |
- *          +-------++----+----+----+----+
- *
- *          Note A Output QA is connected to input B for BCD count
- *
- *          Reset Count Function table
- *
- *          +-----+-----+-----+-----++----+----+----+----+
- *          | R01 | R02 | R91 | R92 || QD | QC | QB | QA |
- *          +=====+=====+=====+=====++====+====+====+====+
- *          |  1  |  1  |  0  |  X  ||  0 |  0 |  0 |  0 |
- *          |  1  |  1  |  X  |  0  ||  0 |  0 |  0 |  0 |
- *          |  X  |  X  |  1  |  1  ||  1 |  0 |  0 |  1 |
- *          |  X  |  0  |  X  |  0  ||       COUNT       |
- *          |  0  |  X  |  0  |  X  ||       COUNT       |
- *          |  0  |  X  |  X  |  0  ||       COUNT       |
- *          |  X  |  0  |  0  |  X  ||       COUNT       |
- *          +-----+-----+-----+-----++----+----+----+----+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
 
 #ifndef NLD_7490_H_
 #define NLD_7490_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_7490(name, cA, cB, cR1, cR2, cR91, cR92)                           \
-		NET_REGISTER_DEV(TTL_7490, name)                                       \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, A, cA)                                               \
-		NET_CONNECT(name, B, cB)                                               \
-		NET_CONNECT(name, R1,  cR1)                                            \
-		NET_CONNECT(name, R2,  cR2)                                            \
-		NET_CONNECT(name, R91, cR91)                                           \
-		NET_CONNECT(name, R92, cR92)
-
-#define TTL_7490_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7490_DIP, name)
+// usage: TTL_7490(name, cA, cB, cR1, cR2, cR91, cR92)
+#define TTL_7490(...)                                                     \
+		NET_REGISTER_DEVEXT(TTL_7490, __VA_ARGS__)
 
 #endif /* NLD_7490_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7492.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7492.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7492.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7492.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,9 +3,53 @@
 /*
  * nld_7492.cpp
  *
+ *  SN7492: Divide-by-12 Counter
+ *
+ *          +--------------+
+ *        B |1     ++    14| A
+ *       NC |2           13| NC
+ *       NC |3           12| QA
+ *       NC |4    7492   11| QD
+ *      VCC |5           10| GND
+ *      R01 |6            9| QB
+ *      R02 |7            8| QC
+ *          +--------------+
+ *
+ *          Counter Sequence
+ *
+ *          +-------++----+----+----+----+
+ *          | COUNT || QD | QC | QB | QA |
+ *          +=======++====+====+====+====+
+ *          |    0  ||  0 |  0 |  0 |  0 |
+ *          |    1  ||  0 |  0 |  0 |  1 |
+ *          |    2  ||  0 |  0 |  1 |  0 |
+ *          |    3  ||  0 |  0 |  1 |  1 |
+ *          |    4  ||  0 |  1 |  0 |  0 |
+ *          |    5  ||  0 |  1 |  0 |  1 |
+ *          |    6  ||  1 |  0 |  0 |  0 |
+ *          |    7  ||  1 |  0 |  0 |  1 |
+ *          |    8  ||  1 |  0 |  1 |  0 |
+ *          |    9  ||  1 |  0 |  1 |  1 |
+ *          |   10  ||  1 |  1 |  0 |  0 |
+ *          |   11  ||  1 |  1 |  0 |  1 |
+ *          +-------++----+----+----+----+
+ *
+ *          Note A Output QA is connected to input B
+ *
+ *          Reset Count Function table
+ *
+ *          +-----+-----++----+----+----+----+
+ *          | R01 | R02 || QD | QC | QB | QA |
+ *          +=====+=====++====+====+====+====+
+ *          |  1  |  1  ||  0 |  0 |  0 |  0 |
+ *          |  0  |  X  ||       COUNT       |
+ *          |  X  |  0  ||       COUNT       |
+ *          +-----+-----++----+----+----+----+
+ *
+ *  Naming conventions follow Texas Instruments datasheet
+ *
  */
 
-#include "nld_7492.h"
 #include "netlist/nl_base.h"
 
 namespace netlist
@@ -24,10 +68,10 @@
 	NETLIB_OBJECT(7492)
 	{
 		NETLIB_CONSTRUCTOR(7492)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		, m_R1(*this, "R1")
-		, m_R2(*this, "R2")
+		, m_A(*this, "A", NETLIB_DELEGATE(inputs))
+		, m_B(*this, "B", NETLIB_DELEGATE(inputs))
+		, m_R1(*this, "R1", NETLIB_DELEGATE(inputs))
+		, m_R2(*this, "R2", NETLIB_DELEGATE(inputs))
 		, m_cnt(*this, "m_cnt", 0)
 		, m_last_A(*this, "m_last_A", 0)
 		, m_last_B(*this, "m_last_B", 0)
@@ -37,7 +81,8 @@
 		}
 
 	private:
-		NETLIB_UPDATEI()
+
+		NETLIB_HANDLERI(inputs)
 		{
 			const netlist_sig_t new_A = m_A();
 			const netlist_sig_t new_B = m_B();
@@ -88,36 +133,7 @@
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(7492_dip)
-	{
-		NETLIB_CONSTRUCTOR(7492_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", "A.B");
-			// register_subalias("2", ); --> NC
-			// register_subalias("3", ); --> NC
-
-			// register_subalias("4", ); --> NC
-			register_subalias("5", "A.VCC");
-			register_subalias("6", "A.R1");
-			register_subalias("7", "A.R2");
-
-			register_subalias("8", "A.QC");
-			register_subalias("9", "A.QB");
-			register_subalias("10", "A.GND");
-			register_subalias("11", "A.QD");
-			register_subalias("12", "A.QA");
-			// register_subalias("13", ); --> NC
-			register_subalias("14", "A.A");
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(7492) A;
-	};
-
 	NETLIB_DEVICE_IMPL(7492,     "TTL_7492",        "+A,+B,+R1,+R2,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(7492_dip, "TTL_7492_DIP",    "")
 
 } // namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7492.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7492.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7492.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7492.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,70 +1,13 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_7492.h
- *
- *  SN7492: Divide-by-12 Counter
- *
- *          +--------------+
- *        B |1     ++    14| A
- *       NC |2           13| NC
- *       NC |3           12| QA
- *       NC |4    7492   11| QD
- *      VCC |5           10| GND
- *      R01 |6            9| QB
- *      R02 |7            8| QC
- *          +--------------+
- *
- *          Counter Sequence
- *
- *          +-------++----+----+----+----+
- *          | COUNT || QD | QC | QB | QA |
- *          +=======++====+====+====+====+
- *          |    0  ||  0 |  0 |  0 |  0 |
- *          |    1  ||  0 |  0 |  0 |  1 |
- *          |    2  ||  0 |  0 |  1 |  0 |
- *          |    3  ||  0 |  0 |  1 |  1 |
- *          |    4  ||  0 |  1 |  0 |  0 |
- *          |    5  ||  0 |  1 |  0 |  1 |
- *          |    6  ||  1 |  0 |  0 |  0 |
- *          |    7  ||  1 |  0 |  0 |  1 |
- *          |    8  ||  1 |  0 |  1 |  0 |
- *          |    9  ||  1 |  0 |  1 |  1 |
- *          |   10  ||  1 |  1 |  0 |  0 |
- *          |   11  ||  1 |  1 |  0 |  1 |
- *          +-------++----+----+----+----+
- *
- *          Note A Output QA is connected to input B
- *
- *          Reset Count Function table
- *
- *          +-----+-----++----+----+----+----+
- *          | R01 | R02 || QD | QC | QB | QA |
- *          +=====+=====++====+====+====+====+
- *          |  1  |  1  ||  0 |  0 |  0 |  0 |
- *          |  0  |  X  ||       COUNT       |
- *          |  X  |  0  ||       COUNT       |
- *          +-----+-----++----+----+----+----+
- *
- *  Naming conventions follow Texas Instruments datasheet
- *
- */
 
 #ifndef NLD_7492_H_
 #define NLD_7492_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_7492(name, cA, cB, cR1, cR2)                           \
-		NET_REGISTER_DEV(TTL_7492, name)                           \
-		NET_CONNECT(name, GND, GND)                                \
-		NET_CONNECT(name, VCC, VCC)                                \
-		NET_CONNECT(name, A, cA)                                   \
-		NET_CONNECT(name, B, cB)                                   \
-		NET_CONNECT(name, R1,  cR1)                                \
-		NET_CONNECT(name, R2,  cR2)
-
-#define TTL_7492_DIP(name)                                         \
-		NET_REGISTER_DEV(TTL_7492_DIP, name)
+// usage: TTL_7492(name, cA, cB, cR1, cR2)
+#define TTL_7492(...)                                                     \
+		NET_REGISTER_DEVEXT(TTL_7492, __VA_ARGS__)
 
 #endif /* NLD_7492_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7493.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7493.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7493.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7493.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,55 @@
 /*
  * nld_7493.cpp
  *
+ *  DM7493: Binary Counters
+ *
+ *          +--------------+
+ *        B |1     ++    14| A
+ *      R01 |2           13| NC
+ *      R02 |3           12| QA
+ *       NC |4    7493   11| QD
+ *      VCC |5           10| GND
+ *       NC |6            9| QB
+ *       NC |7            8| QC
+ *          +--------------+
+ *
+ *          Counter Sequence
+ *
+ *          +-------++----+----+----+----+
+ *          | COUNT || QD | QC | QB | QA |
+ *          +=======++====+====+====+====+
+ *          |    0  ||  0 |  0 |  0 |  0 |
+ *          |    1  ||  0 |  0 |  0 |  1 |
+ *          |    2  ||  0 |  0 |  1 |  0 |
+ *          |    3  ||  0 |  0 |  1 |  1 |
+ *          |    4  ||  0 |  1 |  0 |  0 |
+ *          |    5  ||  0 |  1 |  0 |  1 |
+ *          |    6  ||  0 |  1 |  1 |  0 |
+ *          |    7  ||  0 |  1 |  1 |  1 |
+ *          |    8  ||  1 |  0 |  0 |  0 |
+ *          |    9  ||  1 |  0 |  0 |  1 |
+ *          |   10  ||  1 |  0 |  1 |  0 |
+ *          |   11  ||  1 |  0 |  1 |  1 |
+ *          |   12  ||  1 |  1 |  0 |  0 |
+ *          |   13  ||  1 |  1 |  0 |  1 |
+ *          |   14  ||  1 |  1 |  1 |  0 |
+ *          |   15  ||  1 |  1 |  1 |  1 |
+ *          +-------++----+----+----+----+
+ *
+ *          Note C Output QA is connected to input B
+ *
+ *          Reset Count Function table
+ *
+ *          +-----+-----++----+----+----+----+
+ *          | R01 | R02 || QD | QC | QB | QA |
+ *          +=====+=====++====+====+====+====+
+ *          |  1  |  1  ||  0 |  0 |  0 |  0 |
+ *          |  0  |  X  ||       COUNT       |
+ *          |  X  |  0  ||       COUNT       |
+ *          +-----+-----++----+----+----+----+
+ *
+ *  Naming conventions follow National Semiconductor datasheet
+ *
  */
 
 #include "nld_7493.h"
@@ -81,8 +130,8 @@
 	NETLIB_OBJECT(7493)
 	{
 		NETLIB_CONSTRUCTOR(7493)
-		, m_R1(*this, "R1")
-		, m_R2(*this, "R2")
+		, m_R1(*this, "R1", NETLIB_DELEGATE(inputs))
+		, m_R2(*this, "R2", NETLIB_DELEGATE(inputs))
 		, m_a(*this, "_m_a", 0)
 		, m_bcd(*this, "_m_b", 0)
 		, m_r(*this, "_m_r", 0)
@@ -102,7 +151,7 @@
 			m_CLKB.set_state(logic_t::STATE_INP_HL);
 		}
 
-		NETLIB_UPDATEI()
+		NETLIB_HANDLERI(inputs)
 		{
 			if (!(m_R1() && m_R2()))
 			{
@@ -149,36 +198,7 @@
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(7493_dip)
-	{
-		NETLIB_CONSTRUCTOR(7493_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", "A.CLKB");
-			register_subalias("2", "A.R1");
-			register_subalias("3", "A.R2");
-
-			// register_subalias("4", ); --> NC
-			register_subalias("5", "A.VCC");
-			// register_subalias("6", ); --> NC
-			// register_subalias("7", ); --> NC
-
-			register_subalias("8", "A.QC");
-			register_subalias("9", "A.QB");
-			register_subalias("10", "A.GND");
-			register_subalias("11", "A.QD");
-			register_subalias("12", "A.QA");
-			// register_subalias("13", ); -. NC
-			register_subalias("14", "A.CLKA");
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(7493) A;
-	};
-
 	NETLIB_DEVICE_IMPL(7493,        "TTL_7493", "+CLKA,+CLKB,+R1,+R2,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(7493_dip,    "TTL_7493_DIP", "")
 
 	} // namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7493.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7493.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7493.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7493.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,74 +1,13 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_7493.h
- *
- *  DM7493: Binary Counters
- *
- *          +--------------+
- *        B |1     ++    14| A
- *      R01 |2           13| NC
- *      R02 |3           12| QA
- *       NC |4    7493   11| QD
- *      VCC |5           10| GND
- *       NC |6            9| QB
- *       NC |7            8| QC
- *          +--------------+
- *
- *          Counter Sequence
- *
- *          +-------++----+----+----+----+
- *          | COUNT || QD | QC | QB | QA |
- *          +=======++====+====+====+====+
- *          |    0  ||  0 |  0 |  0 |  0 |
- *          |    1  ||  0 |  0 |  0 |  1 |
- *          |    2  ||  0 |  0 |  1 |  0 |
- *          |    3  ||  0 |  0 |  1 |  1 |
- *          |    4  ||  0 |  1 |  0 |  0 |
- *          |    5  ||  0 |  1 |  0 |  1 |
- *          |    6  ||  0 |  1 |  1 |  0 |
- *          |    7  ||  0 |  1 |  1 |  1 |
- *          |    8  ||  1 |  0 |  0 |  0 |
- *          |    9  ||  1 |  0 |  0 |  1 |
- *          |   10  ||  1 |  0 |  1 |  0 |
- *          |   11  ||  1 |  0 |  1 |  1 |
- *          |   12  ||  1 |  1 |  0 |  0 |
- *          |   13  ||  1 |  1 |  0 |  1 |
- *          |   14  ||  1 |  1 |  1 |  0 |
- *          |   15  ||  1 |  1 |  1 |  1 |
- *          +-------++----+----+----+----+
- *
- *          Note C Output QA is connected to input B
- *
- *          Reset Count Function table
- *
- *          +-----+-----++----+----+----+----+
- *          | R01 | R02 || QD | QC | QB | QA |
- *          +=====+=====++====+====+====+====+
- *          |  1  |  1  ||  0 |  0 |  0 |  0 |
- *          |  0  |  X  ||       COUNT       |
- *          |  X  |  0  ||       COUNT       |
- *          +-----+-----++----+----+----+----+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
 
 #ifndef NLD_7493_H_
 #define NLD_7493_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_7493(name, cCLKA, cCLKB, cR1, cR2)                                 \
-		NET_REGISTER_DEV(TTL_7493, name)                                       \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CLKA, cCLKA)                                         \
-		NET_CONNECT(name, CLKB, cCLKB)                                         \
-		NET_CONNECT(name, R1,  cR1)                                            \
-		NET_CONNECT(name, R2,  cR2)
-
-#define TTL_7493_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7493_DIP, name)
+// usage: TTL_7493(name, cCLKA, cCLKB, cR1, cR2)
+#define TTL_7493(...)                                                     \
+		NET_REGISTER_DEVEXT(TTL_7493, __VA_ARGS__)
 
 #endif /* NLD_7493_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7497.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7497.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7497.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7497.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,6 +7,34 @@
  *
  * - STRB and EN
  * - Timing
+ *
+ *  SN7497: Synchronous 6-Bit Binary Rate Multiplier
+ *
+ *          +--------------+
+ *       B1 |1           16| VCC
+ *       B4 |2           15| B3
+ *       B5 |3           14| B2
+ *       B0 |4    7497   13| CLR
+ *        Z |5           12| UNITY/CAS
+ *        Y |6           11| ENin (EN)
+ *    ENout |7           10| STRB
+ *      GND |8            9| CLK
+ *          +--------------+
+ *
+ *  Naming conventions follow TI datasheet
+ *
+ *  The counter is enabled when the clear, strobe, and enable inputs are low.
+ *
+ *  When the rate input is binary 0 (all rate inputs low), Z remains high [and Y low].
+ *
+ *  The unity/cascade input, when connected to the clock input, passes
+ *    clock frequency (inverted) to the Y output when the rate input/decoding
+ *    gates are inhibited by the strobe.
+ *
+ *  When CLR is H, states of CLK and STRB can affect Y and Z.  Default are
+ *    Y L, Z H, ENout H.
+ *
+ *  Unity/cascade is used to inhibit output Y (UNITY L -> Y H)
  */
 
 #include "nld_7497.h"
@@ -20,13 +48,15 @@
 	static constexpr const std::array<netlist_time, 2> out_delay_CLK_Y = { NLTIME_FROM_NS(20), NLTIME_FROM_NS(26) }; // tPHL, tPLH
 	static constexpr const std::array<netlist_time, 2> out_delay_CLK_Z = { NLTIME_FROM_NS(17), NLTIME_FROM_NS(12) };
 
+	// FIXME: room for improvement -> clock handling
+
 	NETLIB_OBJECT(7497)
 	{
 		NETLIB_CONSTRUCTOR(7497)
-		, m_B(*this, {"B5", "B4", "B3", "B2", "B1", "B0"})
+		, m_B(*this, {"B5", "B4", "B3", "B2", "B1", "B0"}, NETLIB_DELEGATE(inputs))
 		, m_CLK(*this, "CLK", NETLIB_DELEGATE(clk_strb))
 		, m_STRBQ(*this, "STRBQ", NETLIB_DELEGATE(clk_strb))
-		, m_ENQ(*this, "ENQ")
+		, m_ENQ(*this, "ENQ", NETLIB_DELEGATE(inputs))
 		, m_UNITYQ(*this, "UNITYQ", NETLIB_DELEGATE(unity))
 		, m_CLR(*this, "CLR", NETLIB_DELEGATE(clr))
 		, m_Y(*this, "Y")
@@ -48,14 +78,57 @@
 			m_lastclock = 0;
 		}
 
-		NETLIB_UPDATEI();
+		NETLIB_HANDLERI(unity)
+		{
+			newstate (m_state);
+		}
+
+		NETLIB_HANDLERI(clr)
+		{
+			m_cnt = 0;
+			clk_strb();
+		}
+
+		NETLIB_HANDLERI(clk_strb)
+		{
+			netlist_sig_t clk = m_CLK();
+
+			if (!m_lastclock && clk && !m_ENQ() && !m_CLR())
+			{
+				m_cnt++;
+				m_cnt &= 63;
+			}
+			m_lastclock = clk;
+
+			const netlist_sig_t clk_strb = (clk ^ 1) & (m_STRBQ() ^ 1);
+
+			const netlist_sig_t cntQ = m_cnt;
 
-		NETLIB_HANDLERI(noop) { }
-		NETLIB_HANDLERI(unity);
-		NETLIB_HANDLERI(clr);
-		NETLIB_HANDLERI(clk_strb);
+			// NOR GATE
+			netlist_sig_t p1 = ((cntQ & 63)  == 31  && (m_rate & 32)) ||
+				((cntQ & 31)  == 15  && (m_rate & 16)) ||
+				((cntQ & 15)  == 7  && (m_rate & 8))  ||
+				((cntQ & 7) == 3  && (m_rate & 4))  ||
+				((cntQ & 3) == 1 && (m_rate & 2))  ||
+				((cntQ & 1) == 0 && (m_rate & 1));
 
-		friend class NETLIB_NAME(7497_dip);
+			p1 = (p1 & clk_strb) ^ 1;
+
+			newstate(p1);
+
+			// NAND gate
+			if ((m_cnt == 63) && !m_ENQ())
+				m_ENOUTQ.push(0, out_delay_CLK_Y[0]); // XXX timing
+			else
+				m_ENOUTQ.push(1, out_delay_CLK_Y[1]);
+
+		}
+
+		NETLIB_HANDLERI(inputs)
+		{
+			m_rate = rate();
+			clk_strb();
+		}
 
 		object_array_t<logic_input_t, 6> m_B;
 		logic_input_t m_CLK;
@@ -94,90 +167,7 @@
 		}
 	};
 
-	NETLIB_UPDATE(7497)
-	{
-		m_rate = rate();
-		clk_strb();
-	}
-
-	NETLIB_HANDLER(7497, unity)
-	{
-		newstate (m_state);
-	}
-
-	NETLIB_HANDLER(7497, clr)
-	{
-		m_cnt = 0;
-		clk_strb();
-	}
-
-	NETLIB_HANDLER(7497, clk_strb)
-	{
-		netlist_sig_t clk = m_CLK();
-
-		if (!m_lastclock && clk && !m_ENQ() && !m_CLR())
-		{
-			m_cnt++;
-			m_cnt &= 63;
-		}
-		m_lastclock = clk;
-
-		const netlist_sig_t clk_strb = (clk ^ 1) & (m_STRBQ() ^ 1);
-
-		const netlist_sig_t cntQ = m_cnt;
-
-		// NOR GATE
-		netlist_sig_t p1 = ((cntQ & 63)  == 31  && (m_rate & 32)) ||
-			((cntQ & 31)  == 15  && (m_rate & 16)) ||
-			((cntQ & 15)  == 7  && (m_rate & 8))  ||
-			((cntQ & 7) == 3  && (m_rate & 4))  ||
-			((cntQ & 3) == 1 && (m_rate & 2))  ||
-			((cntQ & 1) == 0 && (m_rate & 1));
-
-		p1 = (p1 & clk_strb) ^ 1;
-
-		newstate(p1);
-
-		// NAND gate
-		if ((m_cnt == 63) && !m_ENQ())
-			m_ENOUTQ.push(0, out_delay_CLK_Y[0]); // XXX timing
-		else
-			m_ENOUTQ.push(1, out_delay_CLK_Y[1]);
-
-	}
-
-	NETLIB_OBJECT(7497_dip)
-	{
-		NETLIB_CONSTRUCTOR(7497_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_B[4]);  // B0
-			register_subalias("2", A.m_B[1]);  // B4
-			register_subalias("3", A.m_B[0]);  // B5
-			register_subalias("4", A.m_B[5]);  // B0
-			register_subalias("5", A.m_ZQ);
-			register_subalias("6", A.m_Y);
-			register_subalias("7", A.m_ENOUTQ);
-			register_subalias("8", "A.GND");
-
-			register_subalias("9", A.m_CLK);
-			register_subalias("10", A.m_STRBQ);
-			register_subalias("11", A.m_UNITYQ);
-			register_subalias("12", A.m_ENQ);
-			register_subalias("13", A.m_CLR);
-			register_subalias("14", A.m_B[3]); // B2
-			register_subalias("15", A.m_B[2]); // B3
-			register_subalias("16", "A.VCC");
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(7497) A;
-	};
-
-
 	NETLIB_DEVICE_IMPL(7497,      "TTL_7497", "+CLK,+STRBQ,+ENQ,+UNITYQ,+CLR,+B0,+B1,+B2,+B3,+B4,+B5,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(7497_dip,  "TTL_7497_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7497.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7497.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_7497.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_7497.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,59 +1,13 @@
 // license:GPL-2.0+
 // copyright-holders:Sergey Svishchev
-/*
- * nld_7497.h
- *
- *  SN7497: Synchronous 6-Bit Binary Rate Multiplier
- *
- *          +--------------+
- *       B1 |1           16| VCC
- *       B4 |2           15| B3
- *       B5 |3           14| B2
- *       B0 |4    7497   13| CLR
- *        Z |5           12| UNITY/CAS
- *        Y |6           11| ENin (EN)
- *    ENout |7           10| STRB
- *      GND |8            9| CLK
- *          +--------------+
- *
- *  Naming conventions follow TI datasheet
- *
- *  The counter is enabled when the clear, strobe, and enable inputs are low.
- *
- *  When the rate input is binary 0 (all rate inputs low), Z remains high [and Y low].
- *
- *  The unity/cascade input, when connected to the clock input, passes
- *    clock frequency (inverted) to the Y output when the rate input/decoding
- *    gates are inhibited by the strobe.
- *
- *  When CLR is H, states of CLK and STRB can affect Y and Z.  Default are
- *    Y L, Z H, ENout H.
- *
- *  Unity/cascade is used to inhibit output Y (UNITY L -> Y H)
- */
 
 #ifndef NLD_7497_H_
 #define NLD_7497_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_7497(name, cCLK, cSTRB, cEN, cUNITY, cCLR, cB0, cB1, cB2, cB3, cB4, cB5) \
-		NET_REGISTER_DEV(TTL_7497, name)                                       \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CLK,   cCLK)                                         \
-		NET_CONNECT(name, STRBQ, cSTRB)                                        \
-		NET_CONNECT(name, ENQ,   cEN)                                          \
-		NET_CONNECT(name, UNITYQ,cUNITY)                                       \
-		NET_CONNECT(name, CLR,   cCLR)                                         \
-		NET_CONNECT(name, B0,    cB0)                                          \
-		NET_CONNECT(name, B1,    cB1)                                          \
-		NET_CONNECT(name, B2,    cB2)                                          \
-		NET_CONNECT(name, B3,    cB3)                                          \
-		NET_CONNECT(name, B4,    cB4)                                          \
-		NET_CONNECT(name, B5,    cB5)
-
-#define TTL_7497_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7497_DIP, name)
+// usage: TTL_7497(name, cCLK, cSTRB, cEN, cUNITY, cCLR, cB0, cB1, cB2, cB3, cB4, cB5)
+#define TTL_7497(...)                                                     \
+		NET_REGISTER_DEVEXT(TTL_7497, __VA_ARGS__)
 
 #endif /* NLD_7497_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74ls629.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74ls629.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74ls629.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74ls629.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,27 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_SN74LS629.c
+ * nld_SN74LS629.cpp
+ *
+ *  SN74LS629: VOLTAGE-CONTROLLED OSCILLATORS
+ *
+ *          +--------------+
+ *      2FC |1     ++    16| VCC
+ *      1FC |2           15| QSC VCC
+ *     1RNG |3           14| 2RNG
+ *     1CX1 |4  74LS629  13| 2CX1
+ *     1CX2 |5           12| 2CX2
+ *     1ENQ |6           11| 2ENQ
+ *       1Y |7           10| 2Y
+ *  OSC GND |8            9| GND
+ *          +--------------+
+ *
+ *  Naming conventions follow Texas Instruments datasheet
+ *
+ *  NOTE: The CX1 and CX2 pins are not connected!
+ *        The capacitor value has to be specified as a parameter.
+ *        There are more comments on the challenges of emulating this
+ *        chip in the *.c file
  *
  */
 
@@ -46,27 +66,19 @@
 {
 	namespace devices
 	{
-	NETLIB_OBJECT(SN74LS629clk)
-	{
-		NETLIB_CONSTRUCTOR(SN74LS629clk)
-		, m_FB(*this, "FB")
-		, m_Y(*this, "Y")
-		, m_enableq(*this, "m_enableq", 1)
-		, m_out(*this, "m_out", 0)
-		, m_inc(*this, "m_inc", netlist_time::zero())
-		{
-			connect(m_FB, m_Y);
-		}
 
-		NETLIB_RESETI()
+	struct SN74LS629clk
+	{
+		SN74LS629clk(device_t &owner)
+		: m_FB(owner, "FB", nldelegate(&SN74LS629clk::fb, this))
+		, m_Y(owner, "Y")
+		, m_enableq(owner, "m_enableq", 0)
+		, m_out(owner, "m_out", 0)
+		, m_inc(owner, "m_inc", netlist_time::zero())
 		{
-			m_enableq = 0;
-			m_out = 0;
-			m_inc = netlist_time::zero();
+			owner.connect(m_FB, m_Y);
 		}
 
-		NETLIB_UPDATEI();
-
 	public:
 		logic_input_t m_FB;
 		logic_output_t m_Y;
@@ -74,20 +86,37 @@
 		state_var<netlist_sig_t> m_enableq;
 		state_var<netlist_sig_t> m_out;
 		state_var<netlist_time> m_inc;
+
+	private:
+		NETLIB_HANDLERI(fb)
+		{
+			if (!m_enableq)
+			{
+				m_out = m_out ^ 1;
+				m_Y.push(m_out, m_inc);
+			}
+			else
+			{
+				m_Y.push(1, m_inc);
+			}
+		}
+
 	};
 
 	NETLIB_OBJECT(SN74LS629)
 	{
 		NETLIB_CONSTRUCTOR(SN74LS629)
-		, m_clock(*this, "OSC")
+		, m_clock(*this)
 		, m_R_FC(*this, "R_FC")
 		, m_R_RNG(*this, "R_RNG")
-		, m_ENQ(*this, "ENQ")
-		, m_RNG(*this, "RNG")
-		, m_FC(*this, "FC")
+		, m_ENQ(*this, "ENQ", NETLIB_DELEGATE(inputs))
+		, m_RNG(*this, "RNG", NETLIB_DELEGATE(inputs))
+		, m_FC(*this, "FC", NETLIB_DELEGATE(inputs))
 		, m_CAP(*this, "CAP", nlconst::magic(1e-6))
+		, m_power_pins(*this)
+		, m_power_pins_osc(*this, "OSCVCC", "OSCGND")
 		{
-			register_subalias("GND",    m_R_FC.N());
+			connect(m_power_pins_osc.GND(), m_R_FC.N());
 
 			connect(m_FC, m_R_FC.P());
 			connect(m_RNG, m_R_RNG.P());
@@ -100,9 +129,7 @@
 		{
 			m_R_FC.set_R( nlconst::magic(90000.0));
 			m_R_RNG.set_R(nlconst::magic(90000.0));
-			m_clock.reset();
 		}
-		NETLIB_UPDATEI();
 
 		NETLIB_UPDATE_PARAMI()
 		{
@@ -110,7 +137,7 @@
 		}
 
 	public:
-		NETLIB_SUB(SN74LS629clk) m_clock;
+		SN74LS629clk m_clock;
 		analog::NETLIB_SUB(R_base) m_R_FC;
 		analog::NETLIB_SUB(R_base) m_R_RNG;
 
@@ -119,121 +146,71 @@
 		analog_input_t m_FC;
 
 		param_fp_t m_CAP;
-	};
-
-	NETLIB_OBJECT(SN74LS629_dip)
-	{
-		NETLIB_CONSTRUCTOR(SN74LS629_dip)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
-		{
-			register_subalias("1",  m_B.m_FC);
-			register_subalias("2",  m_A.m_FC);
-			register_subalias("3",  m_A.m_RNG);
-
-			register_subalias("6",  m_A.m_ENQ);
-			register_subalias("7",  m_A.m_clock.m_Y);
-
-			register_subalias("8",  m_A.m_R_FC.N());
-			register_subalias("9",  m_A.m_R_FC.N());
-			connect(m_A.m_R_FC.N(), m_B.m_R_FC.N());
-
-			register_subalias("10",  m_B.m_clock.m_Y);
-
-			register_subalias("11",  m_B.m_ENQ);
-			register_subalias("14",  m_B.m_RNG);
-		}
-
-		NETLIB_UPDATEI() { }
-
-		NETLIB_RESETI()
-		{
-			m_A.reset();
-			m_B.reset();
-		}
+		nld_power_pins m_power_pins;
+		nld_power_pins m_power_pins_osc;
 
 	private:
-		NETLIB_SUB(SN74LS629) m_A;
-		NETLIB_SUB(SN74LS629) m_B;
-	};
-
-
-	NETLIB_UPDATE(SN74LS629clk)
-	{
-		if (!m_enableq)
-		{
-			m_out = m_out ^ 1;
-			m_Y.push(m_out, m_inc);
-		}
-		else
+		NETLIB_HANDLERI(inputs)
 		{
-			m_Y.push(1, m_inc);
+			{
+				// recompute
+				nl_fptype  v_freq = m_FC();
+				nl_fptype  v_rng = m_RNG();
+
+				/* coefficients */
+				const nl_fptype k1 =  nlconst::magic( 1.9904769024796283E+03);
+				const nl_fptype k2 =  nlconst::magic( 1.2070059213983407E+03);
+				const nl_fptype k3 =  nlconst::magic( 1.3266985579561108E+03);
+				const nl_fptype k4 =  nlconst::magic(-1.5500979825922698E+02);
+				const nl_fptype k5 =  nlconst::magic( 2.8184536266938172E+00);
+				const nl_fptype k6 =  nlconst::magic(-2.3503421582744556E+02);
+				const nl_fptype k7 =  nlconst::magic(-3.3836786704527788E+02);
+				const nl_fptype k8 =  nlconst::magic(-1.3569136703258670E+02);
+				const nl_fptype k9 =  nlconst::magic( 2.9914575453819188E+00);
+				const nl_fptype k10 = nlconst::magic( 1.6855569086173170E+00);
+
+				/* scale due to input resistance */
+
+				/* Polyfunctional3D_model created by zunzun.com using sum of squared absolute error */
+
+				nl_fptype v_freq_2 = v_freq * v_freq;
+				nl_fptype v_freq_3 = v_freq_2 * v_freq;
+				nl_fptype v_freq_4 = v_freq_3 * v_freq;
+				nl_fptype freq = k1;
+				freq += k2 * v_freq;
+				freq += k3 * v_freq_2;
+				freq += k4 * v_freq_3;
+				freq += k5 * v_freq_4;
+				freq += k6 * v_rng;
+				freq += k7 * v_rng * v_freq;
+				freq += k8 * v_rng * v_freq_2;
+				freq += k9 * v_rng * v_freq_3;
+				freq += k10 * v_rng * v_freq_4;
+
+				freq *= nlconst::magic(0.1e-6) / m_CAP();
+
+				// FIXME: we need a possibility to remove entries from queue ...
+				//        or an exact model ...
+				m_clock.m_inc = netlist_time::from_fp(nlconst::half() / freq);
+			}
+
+			if (!m_clock.m_enableq && m_ENQ())
+			{
+				m_clock.m_enableq = 1;
+				m_clock.m_out = m_clock.m_out ^ 1;
+				m_clock.m_Y.push(m_clock.m_out, netlist_time::from_nsec(1));
+			}
+			else if (m_clock.m_enableq && !m_ENQ())
+			{
+				m_clock.m_enableq = 0;
+				m_clock.m_out = m_clock.m_out ^ 1;
+				m_clock.m_Y.push(m_clock.m_out, netlist_time::from_nsec(1));
+			}
 		}
-	}
 
-	NETLIB_UPDATE(SN74LS629)
-	{
-		{
-			// recompute
-			nl_fptype  v_freq = m_FC();
-			nl_fptype  v_rng = m_RNG();
-
-			/* coefficients */
-			const nl_fptype k1 =  nlconst::magic( 1.9904769024796283E+03);
-			const nl_fptype k2 =  nlconst::magic( 1.2070059213983407E+03);
-			const nl_fptype k3 =  nlconst::magic( 1.3266985579561108E+03);
-			const nl_fptype k4 =  nlconst::magic(-1.5500979825922698E+02);
-			const nl_fptype k5 =  nlconst::magic( 2.8184536266938172E+00);
-			const nl_fptype k6 =  nlconst::magic(-2.3503421582744556E+02);
-			const nl_fptype k7 =  nlconst::magic(-3.3836786704527788E+02);
-			const nl_fptype k8 =  nlconst::magic(-1.3569136703258670E+02);
-			const nl_fptype k9 =  nlconst::magic( 2.9914575453819188E+00);
-			const nl_fptype k10 = nlconst::magic( 1.6855569086173170E+00);
-
-			/* scale due to input resistance */
-
-			/* Polyfunctional3D_model created by zunzun.com using sum of squared absolute error */
-
-			nl_fptype v_freq_2 = v_freq * v_freq;
-			nl_fptype v_freq_3 = v_freq_2 * v_freq;
-			nl_fptype v_freq_4 = v_freq_3 * v_freq;
-			nl_fptype freq = k1;
-			freq += k2 * v_freq;
-			freq += k3 * v_freq_2;
-			freq += k4 * v_freq_3;
-			freq += k5 * v_freq_4;
-			freq += k6 * v_rng;
-			freq += k7 * v_rng * v_freq;
-			freq += k8 * v_rng * v_freq_2;
-			freq += k9 * v_rng * v_freq_3;
-			freq += k10 * v_rng * v_freq_4;
-
-			freq *= nlconst::magic(0.1e-6) / m_CAP();
-
-			// FIXME: we need a possibility to remove entries from queue ...
-			//        or an exact model ...
-			m_clock.m_inc = netlist_time::from_fp(nlconst::half() / freq);
-			//m_clock.update();
-
-			//NL_VERBOSE_OUT(("{1} {2} {3} {4}\n", name(), v_freq, v_rng, freq));
-		}
-
-		if (!m_clock.m_enableq && m_ENQ())
-		{
-			m_clock.m_enableq = 1;
-			m_clock.m_out = m_clock.m_out ^ 1;
-			m_clock.m_Y.push(m_clock.m_out, netlist_time::from_nsec(1));
-		}
-		else if (m_clock.m_enableq && !m_ENQ())
-		{
-			m_clock.m_enableq = 0;
-			m_clock.m_out = m_clock.m_out ^ 1;
-			m_clock.m_Y.push(m_clock.m_out, netlist_time::from_nsec(1));
-		}
-	}
+	};
 
-	NETLIB_DEVICE_IMPL(SN74LS629,     "SN74LS629",     "CAP")
-	NETLIB_DEVICE_IMPL(SN74LS629_dip, "SN74LS629_DIP", "1.CAP1,2.CAP2")
+	NETLIB_DEVICE_IMPL(SN74LS629,     "SN74LS629",     "CAP,@VCC,@GND")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74ls629.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74ls629.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_74ls629.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_74ls629.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,39 +1,12 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_74LS629.h
- *
- *  SN74LS629: VOLTAGE-CONTROLLED OSCILLATORS
- *
- *          +--------------+
- *      2FC |1     ++    16| VCC
- *      1FC |2           15| QSC VCC
- *     1RNG |3           14| 2RNG
- *     1CX1 |4  74LS629  13| 2CX1
- *     1CX2 |5           12| 2CX2
- *     1ENQ |6           11| 2ENQ
- *       1Y |7           10| 2Y
- *  OSC GND |8            9| GND
- *          +--------------+
- *
- *  Naming conventions follow Texas Instruments datasheet
- *
- *  NOTE: The CX1 and CX2 pins are not connected!
- *        The capacitor value has to be specified as a parameter.
- *        There are more comments on the challenges of emulating this
- *        chip in the *.c file
- *
- */
 
 #ifndef NLD_74LS629_H_
 #define NLD_74LS629_H_
 
 #include "netlist/nl_setup.h"
 
-#define SN74LS629(name, p_cap)                                                  \
-		NET_REGISTER_DEVEXT(SN74LS629, name, p_cap)
-
-#define SN74LS629_DIP(name, p_cap1, p_cap2)                                     \
-		NET_REGISTER_DEVEXT(SN74LS629_DIP, name, p_cap1, p_cap2)
+#define SN74LS629(name, ...)                                                  \
+		NET_REGISTER_DEVEXT(SN74LS629, name,__VA_ARGS__)
 
 #endif /* NLD_74LS629_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_8277.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_8277.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_8277.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_8277.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,204 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+/*
+ * nld_8277.cpp
+ *
+ *  8277: Dual 8-Bit Shift Register
+ *
+ *          +--------------+
+ *    RESET |1     ++    16| VCC
+ *     /Q7A |2           15| /Q7B
+ *      Q7A |3           14| Q7B
+ *      DSA |4    8277   13| DSB
+ *      D1A |5           12| D1B
+ *      D0A |6           11| D0B
+ *     CLKA |7           10| CLKB
+ *      GND |8            9| CLK
+ *          +--------------+
+ *
+ */
+
+#include "nld_8277.h"
+#include "netlist/nl_base.h"
+
+namespace netlist
+{
+	namespace devices
+	{
+	NETLIB_OBJECT(8277_shifter)
+	{
+		NETLIB_CONSTRUCTOR(8277_shifter)
+		, m_D0(*this, "D0", NETLIB_DELEGATE(inputs))
+		, m_D1(*this, "D1", NETLIB_DELEGATE(inputs))
+		, m_DS(*this, "DS", NETLIB_DELEGATE(inputs))
+		, m_buffer(*this, "m_buffer", 0)
+		, m_Q7(*this, "Q7")
+		, m_Q7Q(*this, "Q7Q")
+		, m_power_pins(*this)
+		{
+		}
+
+	public:
+		void reset_shifter() noexcept
+		{
+			m_buffer = 0;
+			m_Q7.push(0, NLTIME_FROM_NS(40));
+			m_Q7Q.push(1, NLTIME_FROM_NS(40));
+		}
+
+		void shift() noexcept
+		{
+			uint32_t in = (m_DS() ? m_D1() : m_D0());
+			m_buffer <<= 1;
+			m_buffer |= in;
+			uint32_t out = (m_buffer >> 7) & 1;
+			uint32_t outq = (~m_buffer >> 7) & 1;
+			m_Q7.push(out, NLTIME_FROM_NS(40));
+			m_Q7Q.push(outq, NLTIME_FROM_NS(40));
+		}
+
+		logic_input_t m_D0;
+		logic_input_t m_D1;
+		logic_input_t m_DS;
+
+		state_var<uint8_t> m_buffer;
+
+		logic_output_t m_Q7;
+		logic_output_t m_Q7Q;
+		nld_power_pins m_power_pins;
+	private:
+		NETLIB_HANDLERI(inputs)
+		{
+			/* do nothing */
+		}
+	};
+
+	NETLIB_OBJECT(8277)
+	{
+		NETLIB_CONSTRUCTOR(8277)
+		, m_A(*this, "A")
+		, m_B(*this, "B")
+		, m_RESET(*this, "RESET", NETLIB_DELEGATE(shifter_reset))
+		, m_CLK(*this, "CLK", NETLIB_DELEGATE(clk))
+		, m_CLKA(*this, "CLKA", NETLIB_DELEGATE(clka))
+		, m_CLKB(*this, "CLKB", NETLIB_DELEGATE(clkb))
+		, m_last_CLK(*this, "m_last_CLK", 0)
+		, m_last_CLKA(*this, "m_last_CLKA", 0)
+		, m_last_CLKB(*this, "m_last_CLKB", 0)
+		// FIXME: needs family!
+		{
+			register_subalias("RESET", m_RESET);
+			register_subalias("CLK", m_CLK);
+			register_subalias("CLKA", m_CLKA);
+			register_subalias("CLKB", m_CLKB);
+			register_subalias("D0A", m_A.m_D0);
+			register_subalias("D1A", m_A.m_D1);
+			register_subalias("DSA", m_A.m_DS);
+			register_subalias("Q7A", m_A.m_Q7);
+			register_subalias("Q7QA", m_A.m_Q7Q);
+			register_subalias("D0B", m_B.m_D0);
+			register_subalias("D1B", m_B.m_D1);
+			register_subalias("DSB", m_B.m_DS);
+			register_subalias("Q7B", m_B.m_Q7);
+			register_subalias("Q7QB", m_B.m_Q7Q);
+
+			connect("A.VCC", "B.VCC");
+			connect("A.GND", "B.GND");
+
+			register_subalias("VCC", "A.VCC");
+			register_subalias("GND", "A.GND");
+		}
+
+		NETLIB_RESETI()
+		{
+			m_last_CLK = 0;
+			m_last_CLKA = 0;
+			m_last_CLKB = 0;
+		}
+
+		friend class NETLIB_NAME(8277_dip);
+	private:
+		NETLIB_HANDLERI(shifter_reset)
+		{
+			if (!m_RESET())
+			{
+				m_A.reset_shifter();
+				m_B.reset_shifter();
+			}
+		}
+
+		NETLIB_HANDLERI(clk)
+		{
+			if (!m_last_CLK && m_CLK())
+			{
+				m_A.shift();
+				m_B.shift();
+			}
+			m_last_CLK = m_CLK();
+			m_last_CLKA = m_CLKA();
+			m_last_CLKB = m_CLKB();
+		}
+
+		NETLIB_HANDLERI(clka)
+		{
+			if (!m_last_CLKA && m_CLKA())
+			{
+				m_A.shift();
+			}
+			m_last_CLKA = m_CLKA();
+		}
+
+		NETLIB_HANDLERI(clkb)
+		{
+			if (!m_last_CLKB && m_CLKB())
+			{
+				m_B.shift();
+			}
+			m_last_CLKB = m_CLKB();
+		}
+
+		NETLIB_SUB(8277_shifter) m_A;
+		NETLIB_SUB(8277_shifter) m_B;
+		logic_input_t m_RESET;
+		logic_input_t m_CLK;
+		logic_input_t m_CLKA;
+		logic_input_t m_CLKB;
+
+		state_var<uint32_t> m_last_CLK;
+		state_var<uint32_t> m_last_CLKA;
+		state_var<uint32_t> m_last_CLKB;
+	};
+
+	NETLIB_OBJECT(8277_dip)
+	{
+		NETLIB_CONSTRUCTOR(8277_dip)
+		, A(*this, "A")
+		{
+			register_subalias("1", A.m_RESET);
+			register_subalias("2", A.m_A.m_Q7Q);
+			register_subalias("3", A.m_A.m_Q7);
+			register_subalias("4", A.m_A.m_DS);
+			register_subalias("5", A.m_A.m_D1);
+			register_subalias("6", A.m_A.m_D0);
+			register_subalias("7", A.m_CLKA);
+			register_subalias("8", "A.GND");
+
+			register_subalias("9",  A.m_CLK);
+			register_subalias("10", A.m_CLKB);
+			register_subalias("11", A.m_B.m_D0);
+			register_subalias("12", A.m_B.m_D1);
+			register_subalias("13", A.m_B.m_DS);
+			register_subalias("14", A.m_B.m_Q7);
+			register_subalias("15", A.m_B.m_Q7Q);
+			register_subalias("16", "A.VCC");
+		}
+		//NETLIB_RESETI() {}
+	private:
+		NETLIB_SUB(8277) A;
+	};
+
+	NETLIB_DEVICE_IMPL(8277,     "TTL_8277",     "+RESET,+CLK,+CLKA,+D0A,+D1A,+DSA,+CLKB,+D0B,+D1B,+DSB,@VCC,@GND")
+	NETLIB_DEVICE_IMPL(8277_dip, "TTL_8277_DIP", "")
+
+	} //namespace devices
+} // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_8277.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_8277.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_8277.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_8277.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,27 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+
+#ifndef NLD_8277_H_
+#define NLD_8277_H_
+
+#include "netlist/nl_setup.h"
+
+#define TTL_8277(name, cRESET, cCLK, cCLKA, cD0A, cD1A, cDSA, cCLKB, cD0B, cD1B, cDSB)  \
+		NET_REGISTER_DEV(TTL_8277, name)    \
+		NET_CONNECT(name, VCC, VCC)         \
+		NET_CONNECT(name, GND, GND)         \
+		NET_CONNECT(name, RESET, cRESET)    \
+		NET_CONNECT(name, CLK, cCLK)        \
+		NET_CONNECT(name, CLKA, cCLKA)      \
+		NET_CONNECT(name, CLKB, cCLKB)      \
+		NET_CONNECT(name, D0A, cD0A)        \
+		NET_CONNECT(name, D0B, cD0B)        \
+		NET_CONNECT(name, D1A, cD1A)        \
+		NET_CONNECT(name, D1B, cD1B)        \
+		NET_CONNECT(name, DSA, cDSA)        \
+		NET_CONNECT(name, DSB, cDSB)
+
+#define TTL_8277_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_8277_DIP, name)
+
+#endif /* NLD_2877_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_82S115.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_82S115.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_82S115.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_82S115.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,26 @@
 /*
  * nld_82S115.cpp
  *
+ *  82S115: 4K-bit TTL bipolar PROM (512 x 8)
+ *
+ *          +--------------+
+ *       A3 |1     ++    24| VCC
+ *       A4 |2           23| A2
+ *       A5 |3           22| A1
+ *       A6 |4   82S115  21| A0
+ *       A7 |5           20| CE1Q
+ *       A8 |6           19| CE2
+ *       O1 |7           18| STROBE
+ *       O2 |8           17| O8
+ *       O3 |9           16| O7
+ *       O4 |10          15| O6
+ *      FE2 |11          14| O5
+ *      GND |12          13| FE1
+ *          +--------------+
+ *
+ *
+ *  Naming conventions follow Signetics datasheet
+ *
  */
 
 #include "nld_82S115.h"
@@ -15,10 +35,10 @@
 	NETLIB_OBJECT(82S115)
 	{
 		NETLIB_CONSTRUCTOR(82S115)
-		, m_A(*this, {"A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8"})
-		, m_CE1Q(*this, "CE1Q")
-		, m_CE2(*this, "CE2")
-		, m_STROBE(*this, "STROBE")
+		, m_A(*this, {"A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8"}, NETLIB_DELEGATE(inputs))
+		, m_CE1Q(*this, "CE1Q", NETLIB_DELEGATE(inputs))
+		, m_CE2(*this, "CE2", NETLIB_DELEGATE(inputs))
+		, m_STROBE(*this, "STROBE", NETLIB_DELEGATE(inputs))
 		, m_O(*this, {"O1", "O2", "O3", "O4", "O5", "O6", "O7", "O8"})
 		, m_last_O(*this, "m_last_O", 0)
 		, m_ROM(*this, "ROM")
@@ -30,10 +50,36 @@
 		{
 			m_last_O = 0;
 		}
-		NETLIB_UPDATEI();
 
-		friend class NETLIB_NAME(82S115_dip);
 	private:
+		// FIXME: timing!
+		NETLIB_HANDLERI(inputs)
+		{
+			unsigned o = 0;
+
+			if (!m_CE1Q() && m_CE2())
+			{
+				if (m_STROBE())
+				{
+					unsigned a = 0;
+					for (std::size_t i=0; i<9; i++)
+						a |= (m_A[i]() << i);
+
+					o = m_ROM[a];
+				}
+				else
+				{
+					o = m_last_O;
+				}
+			}
+
+			m_last_O = o;
+
+			// FIXME: Outputs are tristate. This needs to be properly implemented
+			for (std::size_t i=0; i<8; i++)
+				m_O[i].push((o >> i) & 1, NLTIME_FROM_NS(40)); // FIXME: Timing
+		}
+
 		object_array_t<logic_input_t, 9> m_A;
 		logic_input_t m_CE1Q;
 		logic_input_t m_CE2;
@@ -46,78 +92,7 @@
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(82S115_dip)
-	{
-		NETLIB_CONSTRUCTOR(82S115_dip)
-		, A(*this, "A")
-		{
-			register_subalias("21",    A.m_A[0]);
-			register_subalias("22",    A.m_A[1]);
-			register_subalias("23",    A.m_A[2]);
-			register_subalias("1",     A.m_A[3]);
-			register_subalias("2",     A.m_A[4]);
-			register_subalias("3",     A.m_A[5]);
-			register_subalias("4",     A.m_A[6]);
-			register_subalias("5",     A.m_A[7]);
-			register_subalias("6",     A.m_A[8]);
-
-			register_subalias("20",    A.m_CE1Q);
-			register_subalias("19",    A.m_CE2);
-
-			// FIXME: implement FE1, FE2
-			// register_subalias("13",    m_FE1);
-			// register_subalias("11",    m_FE2);
-
-			register_subalias("18",    A.m_STROBE);
-
-			register_subalias("7",     A.m_O[0]);
-			register_subalias("8",     A.m_O[1]);
-			register_subalias("9",     A.m_O[2]);
-			register_subalias("10",    A.m_O[3]);
-			register_subalias("14",    A.m_O[4]);
-			register_subalias("15",    A.m_O[5]);
-			register_subalias("16",    A.m_O[6]);
-			register_subalias("17",    A.m_O[7]);
-
-			register_subalias("12", "A.GND");
-			register_subalias("24", "A.VCC");
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(82S115) A;
-	};
-
-	// FIXME: timing!
-	NETLIB_UPDATE(82S115)
-	{
-		unsigned o = 0;
-
-		if (!m_CE1Q() && m_CE2())
-		{
-			if (m_STROBE())
-			{
-				unsigned a = 0;
-				for (std::size_t i=0; i<9; i++)
-					a |= (m_A[i]() << i);
-
-				o = m_ROM[a];
-			}
-			else
-			{
-				o = m_last_O;
-			}
-		}
-
-		m_last_O = o;
-
-		// FIXME: Outputs are tristate. This needs to be properly implemented
-		for (std::size_t i=0; i<8; i++)
-			m_O[i].push((o >> i) & 1, NLTIME_FROM_NS(40)); // FIXME: Timing
-	}
-
 	NETLIB_DEVICE_IMPL(82S115,     "PROM_82S115",     "+CE1Q,+CE2,+A0,+A1,+A2,+A3,+A4,+A5,+A6,+A7,+A8,+STROBE,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(82S115_dip, "PROM_82S115_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_82S115.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_82S115.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_82S115.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_82S115.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,53 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-/*
- * nld_82S115.h
- *
- *  82S115: 4K-bit TTL bipolar PROM (512 x 8)
- *
- *          +--------------+
- *       A3 |1     ++    24| VCC
- *       A4 |2           23| A2
- *       A5 |3           22| A1
- *       A6 |4   82S115  21| A0
- *       A7 |5           20| CE1Q
- *       A8 |6           19| CE2
- *       O1 |7           18| STROBE
- *       O2 |8           17| O8
- *       O3 |9           16| O7
- *       O4 |10          15| O6
- *      FE2 |11          14| O5
- *      GND |12          13| FE1
- *          +--------------+
- *
- *
- *  Naming conventions follow Signetics datasheet
- *
- */
 
 #ifndef NLD_82S115_H_
 #define NLD_82S115_H_
 
 #include "netlist/nl_setup.h"
 
-#define PROM_82S115(name, cCE1Q, cCE2, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE)    \
-		NET_REGISTER_DEV(PROM_82S115, name)                                    \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CE1Q,   cCE1Q)                                       \
-		NET_CONNECT(name, CE2,    cCE2)                                        \
-		NET_CONNECT(name, A0,     cA0)                                         \
-		NET_CONNECT(name, A1,     cA1)                                         \
-		NET_CONNECT(name, A2,     cA2)                                         \
-		NET_CONNECT(name, A3,     cA3)                                         \
-		NET_CONNECT(name, A4,     cA4)                                         \
-		NET_CONNECT(name, A5,     cA5)                                         \
-		NET_CONNECT(name, A6,     cA6)                                         \
-		NET_CONNECT(name, A7,     cA7)                                         \
-		NET_CONNECT(name, A8,     cA8)                                         \
-		NET_CONNECT(name, STROBE, cSTROBE)
-
-#define PROM_82S115_DIP(name)                                                  \
-		NET_REGISTER_DEV(PROM_82S115_DIP, name)
+// expects: PROM_82S115(name, cCE1Q, cCE2, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE)
+#define PROM_82S115(...)                                           \
+	NET_REGISTER_DEVEXT(PROM_82S115, __VA_ARGS__)
 
 #endif /* NLD_82S115_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_82S16.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_82S16.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_82S16.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_82S16.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,24 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_82S16.c
+ * nld_82S16.cpp
+ *
+ *
+ *  DM82S16: 256 Bit bipolar ram
+ *
+ *          +--------------+
+ *       A1 |1     ++    16| VCC
+ *       A0 |2           15| A2
+ *     CE1Q |3           14| A3
+ *     CE2Q |4   82S16   13| DIN
+ *     CE3Q |5           12| WEQ
+ *    DOUTQ |6           11| A7
+ *       A4 |7           10| A6
+ *      GND |8            9| A5
+ *          +--------------+
+ *
+ *
+ *  Naming conventions follow Signetics datasheet
  *
  */
 
@@ -19,8 +36,8 @@
 		, m_CE1Q(*this, "CE1Q", NETLIB_DELEGATE(enq))
 		, m_CE2Q(*this, "CE2Q", NETLIB_DELEGATE(enq))
 		, m_CE3Q(*this, "CE3Q", NETLIB_DELEGATE(enq))
-		, m_WEQ(*this, "WEQ")
-		, m_DIN(*this, "DIN")
+		, m_WEQ(*this, "WEQ", NETLIB_DELEGATE(inputs))
+		, m_DIN(*this, "DIN", NETLIB_DELEGATE(inputs))
 		, m_DOUTQ(*this, "DOUTQ")
 		, m_ram(*this, "m_ram", 0)
 		, m_addr(*this, "m_addr", 0)
@@ -38,7 +55,25 @@
 			m_addr = 0;
 			m_enq = 0;
 		}
-		NETLIB_UPDATEI();
+
+	private:
+		// FIXME: timing!
+		// FIXME: optimize device (separate address decoder!)
+		NETLIB_HANDLERI(inputs)
+		{
+			if (!m_enq)
+			{
+				const decltype(m_addr)::value_type adr(m_addr);
+				if (!m_WEQ())
+				{
+					m_ram[adr >> 6] = (m_ram[adr >> 6]
+							& ~(static_cast<uint64_t>(1) << (adr & 0x3f)))
+							| (static_cast<uint64_t>(m_DIN()) << (adr & 0x3f));
+				}
+				m_DOUTQ.push(((m_ram[adr >> 6] >> (adr & 0x3f)) & 1) ^ 1, NLTIME_FROM_NS(20));
+			}
+		}
+
 		NETLIB_HANDLERI(addr)
 		{
 			uint8_t adr = 0;
@@ -48,7 +83,7 @@
 				adr |= (m_A[i]() << i);
 			}
 			m_addr = adr;
-			NETLIB_NAME(82S16)::update();
+			inputs();
 		}
 		NETLIB_HANDLERI(enq)
 		{
@@ -69,12 +104,10 @@
 					m_A[i].activate();
 				m_WEQ.activate();
 				m_DIN.activate();
-				NETLIB_NAME(82S16)::update();
+				inputs();
 			}
 		}
 
-		friend class NETLIB_NAME(82S16_dip);
-	private:
 		object_array_t<logic_input_t, 8> m_A;
 		logic_input_t m_CE1Q;
 		logic_input_t m_CE2Q;
@@ -89,57 +122,7 @@
 		nld_power_pins m_power_pins;
 	};
 
-	NETLIB_OBJECT(82S16_dip)
-	{
-		NETLIB_CONSTRUCTOR(82S16_dip)
-		, A(*this, "A")
-		{
-			register_subalias("2",     A.m_A[0]);
-			register_subalias("1",     A.m_A[1]);
-			register_subalias("15",    A.m_A[2]);
-			register_subalias("14",    A.m_A[3]);
-			register_subalias("7",     A.m_A[4]);
-			register_subalias("9",     A.m_A[5]);
-			register_subalias("10",    A.m_A[6]);
-			register_subalias("11",    A.m_A[7]);
-
-			register_subalias("3",     A.m_CE1Q);
-			register_subalias("4",     A.m_CE2Q);
-			register_subalias("5",     A.m_CE3Q);
-
-			register_subalias("12",    A.m_WEQ);
-			register_subalias("13",    A.m_DIN);
-
-			register_subalias("6",     A.m_DOUTQ);
-
-			register_subalias("8",     "A.GND");
-			register_subalias("16",    "A.VCC");
-		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(82S16) A;
-	};
-
-	// FIXME: timing!
-	// FIXME: optimize device (separate address decoder!)
-	NETLIB_UPDATE(82S16)
-	{
-		if (!m_enq)
-		{
-			const decltype(m_addr)::value_type adr(m_addr);
-			if (!m_WEQ())
-			{
-				m_ram[adr >> 6] = (m_ram[adr >> 6]
-						& ~(static_cast<uint64_t>(1) << (adr & 0x3f)))
-						| (static_cast<uint64_t>(m_DIN()) << (adr & 0x3f));
-			}
-			m_DOUTQ.push(((m_ram[adr >> 6] >> (adr & 0x3f)) & 1) ^ 1, NLTIME_FROM_NS(20));
-		}
-	}
-
 	NETLIB_DEVICE_IMPL(82S16,     "TTL_82S16",     "")
-	NETLIB_DEVICE_IMPL(82S16_dip, "TTL_82S16_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_82S16.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_82S16.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_82S16.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_82S16.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,25 +1,5 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_82S16.h
- *
- *  DM82S16: 256 Bit bipolar ram
- *
- *          +--------------+
- *       A1 |1     ++    16| VCC
- *       A0 |2           15| A2
- *     CE1Q |3           14| A3
- *     CE2Q |4   82S16   13| DIN
- *     CE3Q |5           12| WEQ
- *    DOUTQ |6           11| A7
- *       A4 |7           10| A6
- *      GND |8            9| A5
- *          +--------------+
- *
- *
- *  Naming conventions follow Signetics datasheet
- *
- */
 
 #ifndef NLD_82S16_H_
 #define NLD_82S16_H_
@@ -28,7 +8,5 @@
 
 #define TTL_82S16(name)                                     \
 		NET_REGISTER_DEV(TTL_82S16, name)
-#define TTL_82S16_DIP(name)                                 \
-		NET_REGISTER_DEV(TTL_82S16_DIP, name)
 
 #endif /* NLD_82S16_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9310.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9310.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9310.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9310.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -23,7 +23,6 @@
 	{
 
 		NETLIB_DEVICE_IMPL(9310,     "TTL_9310",     "+CLK,+ENP,+ENT,+CLRQ,+LOADQ,+A,+B,+C,+D,@VCC,@GND")
-		NETLIB_DEVICE_IMPL(9310_dip, "TTL_9310_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9316_base.hxx mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9316_base.hxx
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9316_base.hxx	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9316_base.hxx	2020-08-26 08:57:19.000000000 +0000
@@ -24,11 +24,11 @@
 		{
 			NETLIB_CONSTRUCTOR(9316_base)
 			, m_CLK(*this, "CLK", NETLIB_DELEGATE(clk))
-			, m_ENT(*this, "ENT")
+			, m_ENT(*this, "ENT", NETLIB_DELEGATE(other))
 			, m_RC(*this, "RC")
-			, m_LOADQ(*this, "LOADQ")
-			, m_ENP(*this, "ENP")
-			, m_CLRQ(*this, "CLRQ")
+			, m_LOADQ(*this, "LOADQ", NETLIB_DELEGATE(other))
+			, m_ENP(*this, "ENP", NETLIB_DELEGATE(other))
+			, m_CLRQ(*this, "CLRQ", NETLIB_DELEGATE(other))
 			, m_ABCD(*this, {"A", "B", "C", "D"}, NETLIB_DELEGATE(abcd))
 			, m_Q(*this, { "QA", "QB", "QC", "QD" })
 			, m_cnt(*this, "m_cnt", 0)
@@ -47,7 +47,7 @@
 				m_abcd = 0;
 			}
 
-			NETLIB_UPDATEI()
+			NETLIB_HANDLERI(other)
 			{
 				const auto CLRQ(m_CLRQ());
 				m_ent = m_ENT();
@@ -112,35 +112,6 @@
 			nld_power_pins m_power_pins;
 
 		};
-
-		template <typename D>
-		NETLIB_OBJECT(9316_dip_base)
-		{
-			NETLIB_CONSTRUCTOR(9316_dip_base)
-			, A(*this, "A")
-			{
-				this->register_subalias("1", "A.CLRQ");
-				this->register_subalias("2", "A.CLK");
-				this->register_subalias("3", "A.A");
-				this->register_subalias("4", "A.B");
-				this->register_subalias("5", "A.C");
-				this->register_subalias("6", "A.D");
-				this->register_subalias("7", "A.ENP");
-				this->register_subalias("8", "A.GND");
-
-				this->register_subalias("9", "A.LOADQ");
-				this->register_subalias("10", "A.ENT");
-				this->register_subalias("11", "A.QD");
-				this->register_subalias("12", "A.QC");
-				this->register_subalias("13", "A.QB");
-				this->register_subalias("14", "A.QA");
-				this->register_subalias("15", "A.RC");
-				this->register_subalias("16", "A.VCC");
-			}
-		private:
-			NETLIB_SUB(9316_base)<D> A;
-		};
-
 		struct desc_9316 : public desc_base
 		{
 			using ASYNC  = desc_const_t<bool, true>;
@@ -183,10 +154,5 @@
 		using NETLIB_NAME(74161_fixme) = NETLIB_NAME(9316_base)<desc_74161>;
 		using NETLIB_NAME(74163) = NETLIB_NAME(9316_base)<desc_74163>;
 
-		using NETLIB_NAME(9310_dip) = NETLIB_NAME(9316_dip_base)<desc_9310>;
-		using NETLIB_NAME(9316_dip) = NETLIB_NAME(9316_dip_base)<desc_9316>;
-		using NETLIB_NAME(74161_dip) = NETLIB_NAME(9316_dip_base)<desc_74161>;
-		using NETLIB_NAME(74163_dip) = NETLIB_NAME(9316_dip_base)<desc_74163>;
-
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9316.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9316.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9316.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9316.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,82 @@
 /*
  * nld_9316.cpp
  *
+ *  DM9316: Synchronous 4-Bit Counters
+ *
+ *          +--------------+
+ *   /CLEAR |1     ++    16| VCC
+ *    CLOCK |2           15| RC (Ripple Carry)
+ *        A |3           14| QA
+ *        B |4    9316   13| QB
+ *        C |5           12| QC
+ *        D |6           11| QD
+ * Enable P |7           10| Enable T
+ *      GND |8            9| /LOAD
+ *          +--------------+
+ *
+ *          Counter Sequence
+ *
+ *          +-------++----+----+----+----+----+
+ *          | COUNT || QD | QC | QB | QA | RC |
+ *          +=======++====+====+====+====+====+
+ *          |    0  ||  0 |  0 |  0 |  0 |  0 |
+ *          |    1  ||  0 |  0 |  0 |  1 |  0 |
+ *          |    2  ||  0 |  0 |  1 |  0 |  0 |
+ *          |    3  ||  0 |  0 |  1 |  1 |  0 |
+ *          |    4  ||  0 |  1 |  0 |  0 |  0 |
+ *          |    5  ||  0 |  1 |  0 |  1 |  0 |
+ *          |    6  ||  0 |  1 |  1 |  0 |  0 |
+ *          |    7  ||  0 |  1 |  1 |  1 |  0 |
+ *          |    8  ||  1 |  0 |  0 |  0 |  0 |
+ *          |    9  ||  1 |  0 |  0 |  1 |  0 |
+ *          |   10  ||  1 |  0 |  1 |  0 |  0 |
+ *          |   11  ||  1 |  0 |  1 |  1 |  0 |
+ *          |   12  ||  1 |  1 |  0 |  0 |  0 |
+ *          |   13  ||  1 |  1 |  0 |  1 |  0 |
+ *          |   14  ||  1 |  1 |  1 |  0 |  0 |
+ *          |   15  ||  1 |  1 |  1 |  1 |  1 |
+ *          +-------++----+----+----+----+----+
+ *
+ *          Reset count function: Please refer to
+ *          National Semiconductor datasheet (timing diagram)
+ *
+ *  Naming conventions follow National Semiconductor datasheet
+ *
+ *  DM9310: Synchronous 4-Bit Counters
+ *
+ *          +--------------+
+ *    CLEAR |1     ++    16| VCC
+ *    CLOCK |2           15| RC (Ripple Carry)
+ *        A |3           14| QA
+ *        B |4    9310   13| QB
+ *        C |5           12| QC
+ *        D |6           11| QD
+ * Enable P |7           10| Enable T
+ *      GND |8            9| LOAD
+ *          +--------------+
+ *
+ *          Counter Sequence
+ *
+ *          +-------++----+----+----+----+----+
+ *          | COUNT || QD | QC | QB | QA | RC |
+ *          +=======++====+====+====+====+====+
+ *          |    0  ||  0 |  0 |  0 |  0 |  0 |
+ *          |    1  ||  0 |  0 |  0 |  1 |  0 |
+ *          |    2  ||  0 |  0 |  1 |  0 |  0 |
+ *          |    3  ||  0 |  0 |  1 |  1 |  0 |
+ *          |    4  ||  0 |  1 |  0 |  0 |  0 |
+ *          |    5  ||  0 |  1 |  0 |  1 |  0 |
+ *          |    6  ||  0 |  1 |  1 |  0 |  0 |
+ *          |    7  ||  0 |  1 |  1 |  1 |  0 |
+ *          |    8  ||  1 |  0 |  0 |  0 |  0 |
+ *          |    9  ||  1 |  0 |  0 |  1 |  0 |
+ *          +-------++----+----+----+----+----+
+ *
+ *          Reset count function: Please refer to
+ *          National Semiconductor datasheet (timing diagram)
+ *
+ *  Naming conventions follow National Semiconductor datasheet
+ *
  */
 
 #include "nl_base.h"
@@ -23,7 +99,6 @@
 	{
 
 		NETLIB_DEVICE_IMPL(9316,     "TTL_9316",     "+CLK,+ENP,+ENT,+CLRQ,+LOADQ,+A,+B,+C,+D,@VCC,@GND")
-		NETLIB_DEVICE_IMPL(9316_dip, "TTL_9316_DIP", "")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9316.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9316.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9316.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9316.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,104 +1,14 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_9316.h
- *
- *  DM9316: Synchronous 4-Bit Counters
- *
- *          +--------------+
- *   /CLEAR |1     ++    16| VCC
- *    CLOCK |2           15| RC (Ripple Carry)
- *        A |3           14| QA
- *        B |4    9316   13| QB
- *        C |5           12| QC
- *        D |6           11| QD
- * Enable P |7           10| Enable T
- *      GND |8            9| /LOAD
- *          +--------------+
- *
- *          Counter Sequence
- *
- *          +-------++----+----+----+----+----+
- *          | COUNT || QD | QC | QB | QA | RC |
- *          +=======++====+====+====+====+====+
- *          |    0  ||  0 |  0 |  0 |  0 |  0 |
- *          |    1  ||  0 |  0 |  0 |  1 |  0 |
- *          |    2  ||  0 |  0 |  1 |  0 |  0 |
- *          |    3  ||  0 |  0 |  1 |  1 |  0 |
- *          |    4  ||  0 |  1 |  0 |  0 |  0 |
- *          |    5  ||  0 |  1 |  0 |  1 |  0 |
- *          |    6  ||  0 |  1 |  1 |  0 |  0 |
- *          |    7  ||  0 |  1 |  1 |  1 |  0 |
- *          |    8  ||  1 |  0 |  0 |  0 |  0 |
- *          |    9  ||  1 |  0 |  0 |  1 |  0 |
- *          |   10  ||  1 |  0 |  1 |  0 |  0 |
- *          |   11  ||  1 |  0 |  1 |  1 |  0 |
- *          |   12  ||  1 |  1 |  0 |  0 |  0 |
- *          |   13  ||  1 |  1 |  0 |  1 |  0 |
- *          |   14  ||  1 |  1 |  1 |  0 |  0 |
- *          |   15  ||  1 |  1 |  1 |  1 |  1 |
- *          +-------++----+----+----+----+----+
- *
- *          Reset count function: Please refer to
- *          National Semiconductor datasheet (timing diagram)
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- *  DM9310: Synchronous 4-Bit Counters
- *
- *          +--------------+
- *    CLEAR |1     ++    16| VCC
- *    CLOCK |2           15| RC (Ripple Carry)
- *        A |3           14| QA
- *        B |4    9310   13| QB
- *        C |5           12| QC
- *        D |6           11| QD
- * Enable P |7           10| Enable T
- *      GND |8            9| LOAD
- *          +--------------+
- *
- *          Counter Sequence
- *
- *          +-------++----+----+----+----+----+
- *          | COUNT || QD | QC | QB | QA | RC |
- *          +=======++====+====+====+====+====+
- *          |    0  ||  0 |  0 |  0 |  0 |  0 |
- *          |    1  ||  0 |  0 |  0 |  1 |  0 |
- *          |    2  ||  0 |  0 |  1 |  0 |  0 |
- *          |    3  ||  0 |  0 |  1 |  1 |  0 |
- *          |    4  ||  0 |  1 |  0 |  0 |  0 |
- *          |    5  ||  0 |  1 |  0 |  1 |  0 |
- *          |    6  ||  0 |  1 |  1 |  0 |  0 |
- *          |    7  ||  0 |  1 |  1 |  1 |  0 |
- *          |    8  ||  1 |  0 |  0 |  0 |  0 |
- *          |    9  ||  1 |  0 |  0 |  1 |  0 |
- *          +-------++----+----+----+----+----+
- *
- *          Reset count function: Please refer to
- *          National Semiconductor datasheet (timing diagram)
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
 
 #ifndef NLD_9316_H_
 #define NLD_9316_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_9316(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD)        \
-		NET_REGISTER_DEV(TTL_9316, name)                                       \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CLK, cCLK)                                           \
-		NET_CONNECT(name, ENP,  cENP)                                          \
-		NET_CONNECT(name, ENT,  cENT)                                          \
-		NET_CONNECT(name, CLRQ, cCLRQ)                                         \
-		NET_CONNECT(name, LOADQ, cLOADQ)                                       \
-		NET_CONNECT(name, A,    cA)                                            \
-		NET_CONNECT(name, B,    cB)                                            \
-		NET_CONNECT(name, C,    cC)                                            \
-		NET_CONNECT(name, D,    cD)
+// usage: TTL_9316(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD)
+#define TTL_9316(...)                                                          \
+		NET_REGISTER_DEVEXT(TTL_74161, __VA_ARGS__)
 
 #define TTL_74161(...)                                                         \
 		NET_REGISTER_DEVEXT(TTL_74161, __VA_ARGS__)
@@ -112,16 +22,4 @@
 #define TTL_9310(...)                                                          \
 		NET_REGISTER_DEVEXT(TTL_9310, __VA_ARGS__)
 
-#define TTL_9310_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_9310_DIP, name)
-
-#define TTL_9316_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_9316_DIP, name)
-
-#define TTL_74161_DIP(name)                                                  \
-		NET_REGISTER_DEV(TTL_74161_DIP, name)
-
-#define TTL_74163_DIP(name)                                                  \
-		NET_REGISTER_DEV(TTL_74163_DIP, name)
-
 #endif /* NLD_9316_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9321.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9321.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9321.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9321.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,71 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+/*
+ * nld_9321.cpp
+ *
+ *  9321: Dual One-of-Four Decoder
+ *
+ *          +------------+
+ *       /E |1    ++   16| VCC
+ *       A0 |2         15| /E
+ *       A1 |3         14| A0
+ *      /D0 |4   9321  13| A1
+ *      /D1 |5         12| /D0
+ *      /D2 |6         11| /D1
+ *      /D3 |7         10| /D2
+ *      GND |8          9| /D3
+ *          +------------+
+ *
+ */
+
+#include "nld_9321.h"
+#include "netlist/nl_base.h"
+
+namespace netlist
+{
+	namespace devices
+	{
+
+	// FIXME: m_E should activate deactivate m_A
+
+	NETLIB_OBJECT(9321)
+	{
+		NETLIB_CONSTRUCTOR(9321)
+		, m_enable(*this, "m_enable", true)
+		, m_o(*this, "m_o", 0)
+		, m_A(*this, 0, "A{}", NETLIB_DELEGATE(in))
+		, m_D(*this, 0, "D{}")
+		, m_E(*this, "E", NETLIB_DELEGATE(e))
+		, m_power_pins(*this)
+		{
+		}
+
+		NETLIB_HANDLERI(in)
+		{
+			m_enable = m_E() ? 0 : 1;
+			m_o = (m_A[1]() << 1) | m_A[0]();
+			for (std::size_t i=0; i<4; i++)
+				m_D[i].push((i == m_o && m_enable) ? 0 : 1, NLTIME_FROM_NS(21));
+		}
+
+		NETLIB_HANDLERI(e)
+		{
+			m_enable = m_E() ? 0 : 1;
+			m_o = (m_A[1]() << 1) | m_A[0]();
+			for (std::size_t i=0; i<4; i++)
+				m_D[i].push((i == m_o && m_enable) ? 0 : 1, NLTIME_FROM_NS(18));
+		}
+
+	public:
+		state_var<bool> m_enable;
+		state_var<uint32_t> m_o;
+		object_array_t<logic_input_t, 2> m_A;
+		object_array_t<logic_output_t, 4> m_D;
+		logic_input_t m_E;
+		nld_power_pins m_power_pins;
+	};
+
+	NETLIB_DEVICE_IMPL(9321, "TTL_9321", "+E,+A0,+A1")
+
+	} //namespace devices
+} // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9321.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9321.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9321.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9321.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,13 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+
+#ifndef NLD_9321_H_
+#define NLD_9321_H_
+
+#include "netlist/nl_setup.h"
+
+// usage: TTL_9321(name, cAE, cA0, cA1, cBE, cB0, cB1)
+#define TTL_9321(...)                                                     \
+		NET_REGISTER_DEVEXT(TTL_9321, __VA_ARGS__)
+
+#endif /* NLD_9321_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9322.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9322.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9322.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9322.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,19 @@
 /*
  * nld_9322.cpp
  *
+ *  9322: Quad 2-Line to 1-Line Data Selectors/Multiplexers
+ *
+ *          +------------+
+ *   SELECT |1    ++   16| VCC
+ *       A1 |2         15| STROBE
+ *       B1 |3         14| A4
+ *       Y1 |4   9322  13| B4
+ *       A2 |5         12| Y4
+ *       B2 |6         11| A3
+ *       Y2 |7         10| B3
+ *      GND |8          9| Y3
+ *          +------------+
+ *
  */
 
 #include "nld_9322.h"
@@ -14,23 +27,34 @@
 	{
 	class NETLIB_NAME(9322);
 
-	NETLIB_OBJECT(9322_selector)
+	NETLIB_OBJECT(9322_GATE)
 	{
-		NETLIB_CONSTRUCTOR(9322_selector)
-		, m_parent(owner)
-		, m_A(*this, "A")
-		, m_B(*this, "B")
+		NETLIB_CONSTRUCTOR(9322_GATE)
+		, m_A(*this, "A", NETLIB_DELEGATE(inputs))
+		, m_B(*this, "B", NETLIB_DELEGATE(inputs))
+		, m_SELECT(*this, "SELECT", NETLIB_DELEGATE(inputs))
+		, m_STROBE(*this, "STROBE", NETLIB_DELEGATE(inputs))
 		, m_Y(*this, "Y")
 		, m_power_pins(*this)
 		{
 		}
 
-		NETLIB_UPDATEI();
+		// FIXME: Timing
+		NETLIB_HANDLERI(inputs)
+		{
+			if (m_STROBE())
+				m_Y.push(0, NLTIME_FROM_NS(21));
+			else if (m_SELECT())
+				m_Y.push(m_B(), NLTIME_FROM_NS(14));
+			else
+				m_Y.push(m_A(), NLTIME_FROM_NS(14));
+		}
 
 	public:
-		NETLIB_NAME(9322) &m_parent;
 		logic_input_t m_A;
 		logic_input_t m_B;
+		logic_input_t m_SELECT;
+		logic_input_t m_STROBE;
 		logic_output_t m_Y;
 		nld_power_pins m_power_pins;
 	};
@@ -38,8 +62,6 @@
 	NETLIB_OBJECT(9322)
 	{
 		NETLIB_CONSTRUCTOR(9322)
-		, m_SELECT(*this, "SELECT")
-		, m_STROBE(*this, "STROBE")
 		, m_1(*this, "A")
 		, m_2(*this, "B")
 		, m_3(*this, "C")
@@ -64,77 +86,28 @@
 			connect("A.GND", "B.GND");
 			connect("A.GND", "C.GND");
 			connect("A.GND", "D.GND");
+			connect("A.SELECT", "B.SELECT");
+			connect("A.SELECT", "C.SELECT");
+			connect("A.SELECT", "D.SELECT");
+			connect("A.STROBE", "B.STROBE");
+			connect("A.STROBE", "C.STROBE");
+			connect("A.STROBE", "D.STROBE");
 
+			register_subalias("SELECT", "A.SELECT");
+			register_subalias("STROBE", "A.STROBE");
 			register_subalias("GND", "A.GND");
 			register_subalias("VCC", "B.VCC");
-
 		}
 
-		NETLIB_UPDATEI();
-
-		friend class NETLIB_NAME(9322_dip);
-	public:
-		logic_input_t m_SELECT;
-		logic_input_t m_STROBE;
 	private:
-		NETLIB_SUB(9322_selector) m_1;
-		NETLIB_SUB(9322_selector) m_2;
-		NETLIB_SUB(9322_selector) m_3;
-		NETLIB_SUB(9322_selector) m_4;
+		NETLIB_SUB(9322_GATE) m_1;
+		NETLIB_SUB(9322_GATE) m_2;
+		NETLIB_SUB(9322_GATE) m_3;
+		NETLIB_SUB(9322_GATE) m_4;
 
 	};
 
-	NETLIB_OBJECT(9322_dip)
-	{
-		NETLIB_CONSTRUCTOR(9322_dip)
-		, A(*this, "A")
-		{
-			register_subalias("1", A.m_SELECT);
-			register_subalias("2", A.m_1.m_A);
-			register_subalias("3", A.m_1.m_B);
-			register_subalias("4", A.m_1.m_Y);
-			register_subalias("5", A.m_2.m_A);
-			register_subalias("6", A.m_2.m_B);
-			register_subalias("7", A.m_2.m_Y);
-			register_subalias("8", "A.GND");
-
-			register_subalias("9",  A.m_3.m_Y);
-			register_subalias("10", A.m_3.m_B);
-			register_subalias("11", A.m_3.m_A);
-			register_subalias("12", A.m_4.m_Y);
-			register_subalias("13", A.m_4.m_B);
-			register_subalias("14", A.m_4.m_A);
-			register_subalias("15", A.m_STROBE);
-			register_subalias("16", "A.VCC");
-		}
-
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
-	private:
-		NETLIB_SUB(9322) A;
-	};
-
-	// FIXME: Timing
-	NETLIB_UPDATE(9322_selector)
-	{
-		if (m_parent.m_STROBE())
-			m_Y.push(0, NLTIME_FROM_NS(21));
-		else if (m_parent.m_SELECT())
-			m_Y.push(m_B(), NLTIME_FROM_NS(14));
-		else
-			m_Y.push(m_A(), NLTIME_FROM_NS(14));
-	}
-
-	NETLIB_UPDATE(9322)
-	{
-		m_1.update();
-		m_2.update();
-		m_3.update();
-		m_4.update();
-	}
-
-	NETLIB_DEVICE_IMPL(9322,     "TTL_9322",     "+SELECT,+A1,+B1,+A2,+B2,+A3,+B3,+A4,+B4,+STROBE,@VCC,@GND")
-	NETLIB_DEVICE_IMPL(9322_dip, "TTL_9322_DIP", "")
+	NETLIB_DEVICE_IMPL(9322,      "TTL_9322",      "+SELECT,+A1,+B1,+A2,+B2,+A3,+B3,+A4,+B4,+STROBE,@VCC,@GND")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9322.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9322.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_9322.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_9322.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,44 +1,13 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-/*
- * nld_9322.h
- *
- *  9322: Quad 2-Line to 1-Line Data Selectors/Multiplexers
- *
- *          +------------+
- *   SELECT |1    ++   16| VCC
- *       A1 |2         15| STROBE
- *       B1 |3         14| A4
- *       Y1 |4   9322  13| B4
- *       A2 |5         12| Y4
- *       B2 |6         11| A3
- *       Y2 |7         10| B3
- *      GND |8          9| Y3
- *          +------------+
- *
- */
 
 #ifndef NLD_9322_H_
 #define NLD_9322_H_
 
 #include "netlist/nl_setup.h"
 
-#define TTL_9322(name, cSELECT, cA1, cB1, cA2, cB2, cA3, cB3, cA4, cB4, cSTROBE)    \
-		NET_REGISTER_DEV(TTL_9322, name)                                       \
-		NET_CONNECT(name, SELECT, cSELECT)                                     \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, A1,     cA1)                                         \
-		NET_CONNECT(name, B1,     cB1)                                         \
-		NET_CONNECT(name, A2,     cA2)                                         \
-		NET_CONNECT(name, B2,     cB2)                                         \
-		NET_CONNECT(name, A3,     cA3)                                         \
-		NET_CONNECT(name, B3,     cB3)                                         \
-		NET_CONNECT(name, A4,     cA4)                                         \
-		NET_CONNECT(name, B4,     cB4)                                         \
-		NET_CONNECT(name, STROBE, cSTROBE)
-
-#define TTL_9322_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_9322_DIP, name)
+// usage: TTL_9322(name, cSELECT, cA1, cB1, cA2, cB2, cA3, cB3, cA4, cB4, cSTROBE)
+#define TTL_9322(...)                                                     \
+		NET_REGISTER_DEVEXT(TTL_9322, __VA_ARGS__)
 
 #endif /* NLD_9322_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_am2847.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_am2847.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_am2847.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_am2847.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,19 @@
 /*
  * nld_am2847.cpp
  *
+ *  Am2847: Quad 80-Bit Static Shift Register
+ *
+ *          +--------------+
+ *     OUTA |1     ++    16| VSS
+ *      RCA |2           15| IND
+ *      INA |3           14| RCD
+ *     OUTB |4   Am2847  13| OUTD
+ *      RCB |5           12| VGG
+ *      INB |6           11| CP
+ *     OUTC |7           10| INC
+ *      VDD |8            9| RCC
+ *          +--------------+
+ *
  */
 
 #include "nld_am2847.h"
@@ -14,17 +27,15 @@
 	{
 	NETLIB_OBJECT(Am2847_shifter)
 	{
-		NETLIB_CONSTRUCTOR(Am2847_shifter)
-		, m_RC(*this, "RC")
-		, m_IN(*this, "IN")
+		NETLIB_CONSTRUCTOR_MODEL(Am2847_shifter, "CD4XXX")
+		, m_RC(*this, "RC", NETLIB_DELEGATE(inputs))
+		, m_IN(*this, "IN", NETLIB_DELEGATE(inputs))
 		, m_buffer(*this, "m_buffer", 0)
 		, m_OUT(*this, "OUT")
-		, m_power_pins(*this, "VSS", "VDD")
+		, m_power_pins(*this)
 		{
 		}
 
-		NETLIB_UPDATEI();
-
 	public:
 		void shift() noexcept
 		{
@@ -47,6 +58,11 @@
 
 		logic_output_t m_OUT;
 		nld_power_pins m_power_pins;
+	private:
+		NETLIB_HANDLERI(inputs)
+		{
+			/* do nothing */
+		}
 	};
 
 	NETLIB_OBJECT(AM2847)
@@ -56,7 +72,7 @@
 		, m_B(*this, "B")
 		, m_C(*this, "C")
 		, m_D(*this, "D")
-		, m_CP(*this, "CP")
+		, m_CP(*this, "CP", NETLIB_DELEGATE(cp))
 		, m_last_CP(*this, "m_last_CP", 0)
 		// FIXME: needs family!
 		{
@@ -89,10 +105,20 @@
 			m_last_CP = 0;
 		}
 
-		NETLIB_UPDATEI();
-
 		friend class NETLIB_NAME(AM2847_dip);
 	private:
+		NETLIB_HANDLERI(cp)
+		{
+			if (m_last_CP && !m_CP())
+			{
+				m_A.shift();
+				m_B.shift();
+				m_C.shift();
+				m_D.shift();
+			}
+			m_last_CP = m_CP();
+		}
+
 		NETLIB_SUB(Am2847_shifter) m_A;
 		NETLIB_SUB(Am2847_shifter) m_B;
 		NETLIB_SUB(Am2847_shifter) m_C;
@@ -124,29 +150,11 @@
 			register_subalias("15", A.m_D.m_IN);
 			register_subalias("16", "A.VSS");
 		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
+		//NETLIB_RESETI() {}
 	private:
 		NETLIB_SUB(AM2847) A;
 	};
 
-	NETLIB_UPDATE(AM2847)
-	{
-		if (m_last_CP && !m_CP())
-		{
-			m_A.shift();
-			m_B.shift();
-			m_C.shift();
-			m_D.shift();
-		}
-		m_last_CP = m_CP();
-	}
-
-	NETLIB_UPDATE(Am2847_shifter)
-	{
-		/* do nothing */
-	}
-
 	NETLIB_DEVICE_IMPL(AM2847,     "TTL_AM2847",     "+CP,+INA,+INB,+INC,+IND,+RCA,+RCB,+RCC,+RCD,@VSS,@VDD")
 	NETLIB_DEVICE_IMPL(AM2847_dip, "TTL_AM2847_DIP", "")
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_am2847.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_am2847.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_am2847.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_am2847.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,22 +1,5 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-/*
- * nld_am2847.h
- *
- *  Am2847: Quad 80-Bit Static Shift Register
- *
- *          +--------------+
- *     OUTA |1     ++    16| VSS
- *      RCA |2           15| IND
- *      INA |3           14| RCD
- *     OUTB |4   Am2847  13| OUTD
- *      RCB |5           12| VGG
- *      INB |6           11| CP
- *     OUTC |7           10| INC
- *      VDD |8            9| RCC
- *          +--------------+
- *
- */
 
 #ifndef NLD_AM2847_H_
 #define NLD_AM2847_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_devinc.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_devinc.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_devinc.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_devinc.h	2020-08-26 08:57:19.000000000 +0000
@@ -148,7 +148,7 @@
 #define CLOCK(...)                                                     \
 	NET_REGISTER_DEVEXT(CLOCK, __VA_ARGS__)
 
-// usage       : VARCLOCK(name, pFUNC)
+// usage       : VARCLOCK(name, pN, pFUNC)
 #define VARCLOCK(...)                                                  \
 	NET_REGISTER_DEVEXT(VARCLOCK, __VA_ARGS__)
 
@@ -228,10 +228,6 @@
 #define RAM_2102A(...)                                                 \
 	NET_REGISTER_DEVEXT(RAM_2102A, __VA_ARGS__)
 
-// usage       : RAM_2102A_DIP(name)
-#define RAM_2102A_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(RAM_2102A_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_roms.cpp
 // ---------------------------------------------------------------------
@@ -241,28 +237,20 @@
 	NET_REGISTER_DEVEXT(EPROM_2716, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
-// Source: src/lib/netlist/devices/nld_7448.cpp
+// Source: src/lib/netlist/devices/nld_roms.cpp
 // ---------------------------------------------------------------------
-// usage       : TTL_7448(name, pA, pB, pC, pD, pLTQ, pBIQ, pRBIQ)
+// usage       : PROM_MK28000(name, pOE1, pOE2, pAR, pA0, pA1, pA2, pA3, pA4, pA5, pA6, pA7, pA8, pA9, pA10, pA11)
 // auto connect: VCC, GND
-#define TTL_7448(...)                                                  \
-	NET_REGISTER_DEVEXT(TTL_7448, __VA_ARGS__)
-
-// usage       : TTL_7448_DIP(name)
-#define TTL_7448_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_7448_DIP, __VA_ARGS__)
+#define PROM_MK28000(...)                                                \
+	NET_REGISTER_DEVEXT(PROM_MK28000, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
-// Source: src/lib/netlist/devices/nld_7442.cpp
+// Source: src/lib/netlist/devices/nld_7448.cpp
 // ---------------------------------------------------------------------
-// usage       : TTL_7442(name, pA, pB, pC, pD)
+// usage       : TTL_7448(name, pA, pB, pC, pD, pLTQ, pBIQ, pRBIQ)
 // auto connect: VCC, GND
-#define TTL_7442(...)                                                  \
-	NET_REGISTER_DEVEXT(TTL_7442, __VA_ARGS__)
-
-// usage       : TTL_7442_DIP(name)
-#define TTL_7442_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_7442_DIP, __VA_ARGS__)
+#define TTL_7448(...)                                                  \
+	NET_REGISTER_DEVEXT(TTL_7448, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_7450.cpp
@@ -272,10 +260,6 @@
 #define TTL_7450_ANDORINVERT(...)                                      \
 	NET_REGISTER_DEVEXT(TTL_7450_ANDORINVERT, __VA_ARGS__)
 
-// usage       : TTL_7450_DIP(name)
-#define TTL_7450_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_7450_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_7473.cpp
 // ---------------------------------------------------------------------
@@ -284,19 +268,11 @@
 #define TTL_7473(...)                                                  \
 	NET_REGISTER_DEVEXT(TTL_7473, __VA_ARGS__)
 
-// usage       : TTL_7473_DIP(name)
-#define TTL_7473_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_7473_DIP, __VA_ARGS__)
-
 // usage       : TTL_7473A(name, pCLK, pJ, pK, pCLRQ)
 // auto connect: VCC, GND
 #define TTL_7473A(...)                                                 \
 	NET_REGISTER_DEVEXT(TTL_7473A, __VA_ARGS__)
 
-// usage       : TTL_7473A_DIP(name)
-#define TTL_7473A_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(TTL_7473A_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_7474.cpp
 // ---------------------------------------------------------------------
@@ -316,18 +292,10 @@
 #define TTL_7475(...)                                                  \
 	NET_REGISTER_DEVEXT(TTL_7475, __VA_ARGS__)
 
-// usage       : TTL_7475_DIP(name)
-#define TTL_7475_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_7475_DIP, __VA_ARGS__)
-
 // usage       : TTL_7477(name)
 #define TTL_7477(...)                                                  \
 	NET_REGISTER_DEVEXT(TTL_7477, __VA_ARGS__)
 
-// usage       : TTL_7477_DIP(name)
-#define TTL_7477_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_7477_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_7483.cpp
 // ---------------------------------------------------------------------
@@ -336,10 +304,6 @@
 #define TTL_7483(...)                                                  \
 	NET_REGISTER_DEVEXT(TTL_7483, __VA_ARGS__)
 
-// usage       : TTL_7483_DIP(name)
-#define TTL_7483_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_7483_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_7485.cpp
 // ---------------------------------------------------------------------
@@ -348,10 +312,6 @@
 #define TTL_7485(...)                                                  \
 	NET_REGISTER_DEVEXT(TTL_7485, __VA_ARGS__)
 
-// usage       : TTL_7485_DIP(name)
-#define TTL_7485_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_7485_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_7490.cpp
 // ---------------------------------------------------------------------
@@ -360,10 +320,6 @@
 #define TTL_7490(...)                                                  \
 	NET_REGISTER_DEVEXT(TTL_7490, __VA_ARGS__)
 
-// usage       : TTL_7490_DIP(name)
-#define TTL_7490_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_7490_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_7492.cpp
 // ---------------------------------------------------------------------
@@ -372,10 +328,6 @@
 #define TTL_7492(...)                                                  \
 	NET_REGISTER_DEVEXT(TTL_7492, __VA_ARGS__)
 
-// usage       : TTL_7492_DIP(name)
-#define TTL_7492_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_7492_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_7493.cpp
 // ---------------------------------------------------------------------
@@ -384,10 +336,6 @@
 #define TTL_7493(...)                                                  \
 	NET_REGISTER_DEVEXT(TTL_7493, __VA_ARGS__)
 
-// usage       : TTL_7493_DIP(name)
-#define TTL_7493_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_7493_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_7497.cpp
 // ---------------------------------------------------------------------
@@ -396,10 +344,6 @@
 #define TTL_7497(...)                                                  \
 	NET_REGISTER_DEVEXT(TTL_7497, __VA_ARGS__)
 
-// usage       : TTL_7497_DIP(name)
-#define TTL_7497_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_7497_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_74107.cpp
 // ---------------------------------------------------------------------
@@ -408,26 +352,35 @@
 #define TTL_74107(...)                                                 \
 	NET_REGISTER_DEVEXT(TTL_74107, __VA_ARGS__)
 
-// usage       : TTL_74107_DIP(name)
-#define TTL_74107_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(TTL_74107_DIP, __VA_ARGS__)
-
 // usage       : TTL_74107A(name, pCLK, pJ, pK, pCLRQ)
 // auto connect: VCC, GND
 #define TTL_74107A(...)                                                \
 	NET_REGISTER_DEVEXT(TTL_74107A, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
+// Source: src/lib/netlist/devices/nld_74113.cpp
+// ---------------------------------------------------------------------
+// usage       : TTL_74113(name, pCLK, pJ, pK, pCLRQ)
+// auto connect: VCC, GND
+#define TTL_74113(...)                                                 \
+	NET_REGISTER_DEVEXT(TTL_74113, __VA_ARGS__)
+
+// usage       : TTL_74113A(name, pCLK, pJ, pK, pCLRQ)
+// auto connect: VCC, GND
+#define TTL_74113A(...)                                                \
+	NET_REGISTER_DEVEXT(TTL_74113A, __VA_ARGS__)
+
+// ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_74123.cpp
 // ---------------------------------------------------------------------
+// usage       : TTL_74121(name)
+#define TTL_74121(...)                                                 \
+	NET_REGISTER_DEVEXT(TTL_74121, __VA_ARGS__)
+
 // usage       : TTL_74123(name)
 #define TTL_74123(...)                                                 \
 	NET_REGISTER_DEVEXT(TTL_74123, __VA_ARGS__)
 
-// usage       : TTL_74123_DIP(name)
-#define TTL_74123_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(TTL_74123_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_74125.cpp
 // ---------------------------------------------------------------------
@@ -447,34 +400,27 @@
 #define TTL_74153(...)                                                 \
 	NET_REGISTER_DEVEXT(TTL_74153, __VA_ARGS__)
 
-// usage       : TTL_74153_DIP(name)
-#define TTL_74153_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(TTL_74153_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_74161.cpp
 // ---------------------------------------------------------------------
-// usage       : TTL_74161(name, pA, pB, pC, pD, pCLRQ, pLOADQ, pCLK, pENABLEP, pENABLET)
+// usage       : TTL_74161(name, pCLK, pENP, pENT, pCLRQ, pLOADQ, pA, pB, pC, pD)
 // auto connect: VCC, GND
 #define TTL_74161(...)                                                 \
 	NET_REGISTER_DEVEXT(TTL_74161, __VA_ARGS__)
 
-// usage       : TTL_74161_DIP(name)
-#define TTL_74161_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(TTL_74161_DIP, __VA_ARGS__)
+// usage       : TTL_74161_FIXME(name, pA, pB, pC, pD, pCLRQ, pLOADQ, pCLK, pENP, pENT)
+// auto connect: VCC, GND
+#define TTL_74161_FIXME(...)                                           \
+	NET_REGISTER_DEVEXT(TTL_74161_FIXME, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
-// Source: src/lib/netlist/devices/nld_9316.cpp
+// Source: src/lib/netlist/devices/nld_74163.cpp
 // ---------------------------------------------------------------------
 // usage       : TTL_74163(name, pCLK, pENP, pENT, pCLRQ, pLOADQ, pA, pB, pC, pD)
 // auto connect: VCC, GND
 #define TTL_74163(...)                                                 \
 	NET_REGISTER_DEVEXT(TTL_74163, __VA_ARGS__)
 
-// usage       : TTL_74163_DIP(name)
-#define TTL_74163_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(TTL_74163_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_74164.cpp
 // ---------------------------------------------------------------------
@@ -483,10 +429,6 @@
 #define TTL_74164(...)                                                 \
 	NET_REGISTER_DEVEXT(TTL_74164, __VA_ARGS__)
 
-// usage       : TTL_74164_DIP(name)
-#define TTL_74164_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(TTL_74164_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_74165.cpp
 // ---------------------------------------------------------------------
@@ -495,10 +437,6 @@
 #define TTL_74165(...)                                                 \
 	NET_REGISTER_DEVEXT(TTL_74165, __VA_ARGS__)
 
-// usage       : TTL_74165_DIP(name)
-#define TTL_74165_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(TTL_74165_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_74166.cpp
 // ---------------------------------------------------------------------
@@ -507,13 +445,13 @@
 #define TTL_74166(...)                                                 \
 	NET_REGISTER_DEVEXT(TTL_74166, __VA_ARGS__)
 
-// usage       : TTL_74166_DIP(name)
-#define TTL_74166_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(TTL_74166_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_74174.cpp
 // ---------------------------------------------------------------------
+// usage       : TTL_74174_GATE(name)
+#define TTL_74174_GATE(...)                                                 \
+	NET_REGISTER_DEVEXT(TTL_74174, __VA_ARGS__)
+
 // usage       : TTL_74174(name, pCLK, pD1, pD2, pD3, pD4, pD5, pD6, pCLRQ)
 // auto connect: VCC, GND
 #define TTL_74174(...)                                                 \
@@ -574,10 +512,6 @@
 #define TTL_74393(...)                                                 \
 	NET_REGISTER_DEVEXT(TTL_74393, __VA_ARGS__)
 
-// usage       : TTL_74393_DIP(name)
-#define TTL_74393_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(TTL_74393_DIP, __VA_ARGS__)
-
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_74ls629.cpp
 // ---------------------------------------------------------------------
@@ -643,6 +577,13 @@
 	NET_REGISTER_DEVEXT(TTL_9316, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
+// Source: src/lib/netlist/devices/nld_9321.cpp
+// ---------------------------------------------------------------------
+// usage: TTL_9321(name, cAE, cA0, cA1, cBE, cB0, cB1)
+#define TTL_9321(...)                                                     \
+	NET_REGISTER_DEVEXT(TTL_9321, __VA_ARGS__)
+
+// ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_9322.cpp
 // ---------------------------------------------------------------------
 // usage       : TTL_9322(name, pSELECT, pA1, pB1, pA2, pB2, pA3, pB3, pA4, pB4, pSTROBE)
@@ -669,14 +610,28 @@
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_4006.cpp
 // ---------------------------------------------------------------------
-// usage       : CD4006(name, pCLOCK, pD1, pD2, pD3, pD4, pD1P4, pD1P4S, pD2P4, pD2P5, pD3P4, pD4P4, pD3P5)
+// usage       : CD4006(name, pCLOCK, pD1, pD2, pD3, pD4, pD1P4, pD1P4S, pD2P4, pD2P5, pD3P4, pD4P4, pD4P5)
 // auto connect: VCC, GND
 #define CD4006(...)                                                    \
 	NET_REGISTER_DEVEXT(CD4006, __VA_ARGS__)
 
-// usage       : CD4006_DIP(name)
-#define CD4006_DIP(...)                                                \
-	NET_REGISTER_DEVEXT(CD4006_DIP, __VA_ARGS__)
+// ---------------------------------------------------------------------
+// Source: src/lib/netlist/devices/nld_4013.cpp
+// ---------------------------------------------------------------------
+// usage       : CD4013(name)
+#define CD4013(...)                                                    \
+	NET_REGISTER_DEVEXT(CD4013, __VA_ARGS__)
+
+// ---------------------------------------------------------------------
+// Source: src/lib/netlist/devices/nld_4017.cpp
+// ---------------------------------------------------------------------
+// usage       : CD4017(name)
+#define CD4017(...)                                                    \
+	NET_REGISTER_DEVEXT(CD4017, __VA_ARGS__)
+
+// usage       : CD4022(name)
+#define CD4022(...)                                                    \
+	NET_REGISTER_DEVEXT(CD4022, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_4020.cpp
@@ -689,6 +644,17 @@
 #define CD4020(...)                                                    \
 	NET_REGISTER_DEVEXT(CD4020, __VA_ARGS__)
 
+// usage       : CD4024(name)
+#define CD4024(...)                                                    \
+	NET_REGISTER_DEVEXT(CD4024, __VA_ARGS__)
+
+// ---------------------------------------------------------------------
+// Source: src/lib/netlist/devices/nld_4053.cpp
+// ---------------------------------------------------------------------
+// usage       : CD4053_GATE(name)
+#define CD4053_GATE(...)                                               \
+	NET_REGISTER_DEVEXT(CD4053_GATE, __VA_ARGS__)
+
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_4066.cpp
 // ---------------------------------------------------------------------
@@ -706,9 +672,17 @@
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_74123.cpp
 // ---------------------------------------------------------------------
-// usage       : CD4538_DIP(name)
-#define CD4538_DIP(...)                                                \
-	NET_REGISTER_DEVEXT(CD4538_DIP, __VA_ARGS__)
+// usage       : CD4538(name)
+#define CD4538(...)                                                    \
+	NET_REGISTER_DEVEXT(CD4538, __VA_ARGS__)
+
+// ---------------------------------------------------------------------
+// Source: src/lib/netlist/devices/nld_8277.cpp
+// ---------------------------------------------------------------------
+// usage       : TTL_8277(name, pRESET, pCLK, pCLKA, pD0A, pD1A, pDSA, pCLKB, pD0B, pD1B, pDSB)
+// auto connect: VCC, GND
+#define TTL_8277(...)                                                \
+	NET_REGISTER_DEVEXT(TTL_8277, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_schmitt.cpp
@@ -767,13 +741,6 @@
 	NET_REGISTER_DEVEXT(TTL_TRISTATE3, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
-// Source: src/lib/netlist/devices/nld_74174.cpp
-// ---------------------------------------------------------------------
-// usage       : TTL_74174_DIP(name)
-#define TTL_74174_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(TTL_74174_DIP, __VA_ARGS__)
-
-// ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_74175.cpp
 // ---------------------------------------------------------------------
 // usage       : TTL_74175_DIP(name)
@@ -809,32 +776,11 @@
 	NET_REGISTER_DEVEXT(TTL_74365_DIP, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
-// Source: src/lib/netlist/devices/nld_82S16.cpp
-// ---------------------------------------------------------------------
-// usage       : TTL_82S16_DIP(name)
-#define TTL_82S16_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(TTL_82S16_DIP, __VA_ARGS__)
-
-// ---------------------------------------------------------------------
-// Source: src/lib/netlist/devices/nld_82S115.cpp
-// ---------------------------------------------------------------------
-// usage       : PROM_82S115_DIP(name)
-#define PROM_82S115_DIP(...)                                           \
-	NET_REGISTER_DEVEXT(PROM_82S115_DIP, __VA_ARGS__)
-
-// ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_74123.cpp
 // ---------------------------------------------------------------------
-// usage       : TTL_9602_DIP(name)
-#define TTL_9602_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_9602_DIP, __VA_ARGS__)
-
-// ---------------------------------------------------------------------
-// Source: src/lib/netlist/devices/nld_9310.cpp
-// ---------------------------------------------------------------------
-// usage       : TTL_9310_DIP(name)
-#define TTL_9310_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_9310_DIP, __VA_ARGS__)
+// usage       : TTL_9602(name)
+#define TTL_9602(...)                                                  \
+	NET_REGISTER_DEVEXT(TTL_9602, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_dm9314.cpp
@@ -844,20 +790,6 @@
 	NET_REGISTER_DEVEXT(TTL_9314_DIP, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
-// Source: src/lib/netlist/devices/nld_9316.cpp
-// ---------------------------------------------------------------------
-// usage       : TTL_9316_DIP(name)
-#define TTL_9316_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_9316_DIP, __VA_ARGS__)
-
-// ---------------------------------------------------------------------
-// Source: src/lib/netlist/devices/nld_9322.cpp
-// ---------------------------------------------------------------------
-// usage       : TTL_9322_DIP(name)
-#define TTL_9322_DIP(...)                                              \
-	NET_REGISTER_DEVEXT(TTL_9322_DIP, __VA_ARGS__)
-
-// ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_dm9334.cpp
 // ---------------------------------------------------------------------
 // usage       : TTL_9334_DIP(name)
@@ -872,11 +804,11 @@
 	NET_REGISTER_DEVEXT(TTL_AM2847_DIP, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
-// Source: src/lib/netlist/devices/nld_74ls629.cpp
+// Source: src/lib/netlist/devices/nld_8277.cpp
 // ---------------------------------------------------------------------
-// usage       : SN74LS629_DIP(name, p1_CAP1, p2_CAP2)
-#define SN74LS629_DIP(...)                                             \
-	NET_REGISTER_DEVEXT(SN74LS629_DIP, __VA_ARGS__)
+// usage       : TTL_8277_DIP(name)
+#define TTL_8277_DIP(...)                                            \
+	NET_REGISTER_DEVEXT(TTL_8277_DIP, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
 // Source: src/lib/netlist/devices/nld_mm5837.cpp
@@ -886,7 +818,7 @@
 	NET_REGISTER_DEVEXT(MM5837_DIP, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
-// Source: src/lib/netlist/macro/nlm_ttl74xx.cpp
+// Source: TTL74XX_lib
 // ---------------------------------------------------------------------
 // usage       : TTL_7400_GATE(name)
 #define TTL_7400_GATE(...)                                             \
@@ -919,6 +851,10 @@
 #define TTL_7406_GATE(...)                                             \
 	NET_REGISTER_DEVEXT(TTL_7406_GATE, __VA_ARGS__)
 
+// usage       : TTL_7407_GATE(name)
+#define TTL_7407_GATE(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_7407_GATE, __VA_ARGS__)
+
 // usage       : TTL_7408_GATE(name)
 #define TTL_7408_GATE(...)                                             \
 	NET_REGISTER_DEVEXT(TTL_7408_GATE, __VA_ARGS__)
@@ -965,7 +901,7 @@
 
 // usage       : TTL_7421_AND(name, pA, pB, pC, pD)
 // auto connect: VCC, GND
-#define TTL_7421_AND(...)                                             \
+#define TTL_7421_AND(...)                                              \
 	NET_REGISTER_DEVEXT(TTL_7421_AND, __VA_ARGS__)
 
 // usage       : TTL_7425_GATE(name)
@@ -1012,6 +948,38 @@
 #define TTL_7437_NAND(...)                                             \
 	NET_REGISTER_DEVEXT(TTL_7437_NAND, __VA_ARGS__)
 
+// usage       : TTL_7448_DIP(name)
+#define TTL_7448_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_7448_DIP, __VA_ARGS__)
+
+// usage       : TTL_7450_DIP(name)
+#define TTL_7450_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_7450_DIP, __VA_ARGS__)
+
+// usage       : TTL_7473_DIP(name)
+#define TTL_7473_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_7473_DIP, __VA_ARGS__)
+
+// usage       : TTL_7473A_DIP(name)
+#define TTL_7473A_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_7473A_DIP, __VA_ARGS__)
+
+// usage       : TTL_7475_DIP(name)
+#define TTL_7475_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_7475_DIP, __VA_ARGS__)
+
+// usage       : TTL_7477_DIP(name)
+#define TTL_7477_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_7477_DIP, __VA_ARGS__)
+
+// usage       : TTL_7483_DIP(name)
+#define TTL_7483_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_7483_DIP, __VA_ARGS__)
+
+// usage       : TTL_7485_DIP(name)
+#define TTL_7485_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_7485_DIP, __VA_ARGS__)
+
 // usage       : TTL_7486_GATE(name)
 #define TTL_7486_GATE(...)                                             \
 	NET_REGISTER_DEVEXT(TTL_7486_GATE, __VA_ARGS__)
@@ -1021,6 +989,42 @@
 #define TTL_7486_XOR(...)                                              \
 	NET_REGISTER_DEVEXT(TTL_7486_XOR, __VA_ARGS__)
 
+// usage       : TTL_7490_DIP(name)
+#define TTL_7490_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_7490_DIP, __VA_ARGS__)
+
+// usage       : TTL_7492_DIP(name)
+#define TTL_7492_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_7492_DIP, __VA_ARGS__)
+
+// usage       : TTL_7493_DIP(name)
+#define TTL_7493_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_7493_DIP, __VA_ARGS__)
+
+// usage       : TTL_7497_DIP(name)
+#define TTL_7497_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_7497_DIP, __VA_ARGS__)
+
+// usage       : TTL_74107_DIP(name)
+#define TTL_74107_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74107_DIP, __VA_ARGS__)
+
+// usage       : TTL_74107_DIP(name)
+#define TTL_74107A_DIP(...)                                            \
+	NET_REGISTER_DEVEXT(TTL_74107A_DIP, __VA_ARGS__)
+
+// usage       : TTL_74113_DIP(name)
+#define TTL_74113_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74113_DIP, __VA_ARGS__)
+
+// usage       : TTL_74113A_DIP(name)
+#define TTL_74113A_DIP(...)                                            \
+	NET_REGISTER_DEVEXT(TTL_74113A_DIP, __VA_ARGS__)
+
+// usage       : TTL_74139_GATE(name)
+#define TTL_74139_GATE(...)                                            \
+	NET_REGISTER_DEVEXT(TTL_74139_GATE, __VA_ARGS__)
+
 // usage       : TTL_74155A_GATE(name)
 #define TTL_74155A_GATE(...)                                           \
 	NET_REGISTER_DEVEXT(TTL_74155A_GATE, __VA_ARGS__)
@@ -1037,6 +1041,34 @@
 #define TTL_74156B_GATE(...)                                           \
 	NET_REGISTER_DEVEXT(TTL_74156B_GATE, __VA_ARGS__)
 
+// usage       : TTL_74157_GATE(name)
+#define TTL_74157_GATE(...)                                            \
+	NET_REGISTER_DEVEXT(TTL_74157_GATE, __VA_ARGS__)
+
+// usage       : TTL_74161_DIP(name)
+#define TTL_74161_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74161_DIP, __VA_ARGS__)
+
+// usage       : TTL_74163_DIP(name)
+#define TTL_74163_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74163_DIP, __VA_ARGS__)
+
+// usage       : TTL_74164_DIP(name)
+#define TTL_74164_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74164_DIP, __VA_ARGS__)
+
+// usage       : TTL_74165_DIP(name)
+#define TTL_74165_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74165_DIP, __VA_ARGS__)
+
+// usage       : TTL_74165_DIP(name)
+#define TTL_74166_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74166_DIP, __VA_ARGS__)
+
+// usage       : TTL_74174_DIP(name)
+#define TTL_74174_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74174_DIP, __VA_ARGS__)
+
 // usage       : TTL_74260_GATE(name)
 #define TTL_74260_GATE(...)                                            \
 	NET_REGISTER_DEVEXT(TTL_74260_GATE, __VA_ARGS__)
@@ -1054,11 +1086,14 @@
 #define TTL_74279B(...)                                                \
 	NET_REGISTER_DEVEXT(TTL_74279B, __VA_ARGS__)
 
-// usage       : DM9312(name, pA, pB, pC, pG, pD0, pD1, pD2, pD3, pD4, pD5, pD6, pD7)
+// usage       : TTL_9312(name, pA, pB, pC, pG, pD0, pD1, pD2, pD3, pD4, pD5, pD6, pD7)
 // auto connect: VCC, GND
-#define DM9312(...)                                                    \
-	NET_REGISTER_DEVEXT(DM9312, __VA_ARGS__)
+#define TTL_9312(...)                                                  \
+	NET_REGISTER_DEVEXT(TTL_9312, __VA_ARGS__)
 
+// ---------------------------------------------------------------------
+// Source: parser: TTL74XX_lib
+// ---------------------------------------------------------------------
 // usage       : TTL_7400_DIP(name)
 #define TTL_7400_DIP(...)                                              \
 	NET_REGISTER_DEVEXT(TTL_7400_DIP, __VA_ARGS__)
@@ -1075,6 +1110,10 @@
 #define TTL_7406_DIP(...)                                              \
 	NET_REGISTER_DEVEXT(TTL_7406_DIP, __VA_ARGS__)
 
+// usage       : TTL_7407_DIP(name)
+#define TTL_7407_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_7407_DIP, __VA_ARGS__)
+
 // usage       : TTL_7408_DIP(name)
 #define TTL_7408_DIP(...)                                              \
 	NET_REGISTER_DEVEXT(TTL_7408_DIP, __VA_ARGS__)
@@ -1135,10 +1174,30 @@
 #define TTL_7437_DIP(...)                                              \
 	NET_REGISTER_DEVEXT(TTL_7437_DIP, __VA_ARGS__)
 
+// usage       : TTL_7442(name, cA, cB, cC, cD)
+#define TTL_7442(...)                                                  \
+	NET_REGISTER_DEVEXT(TTL_7442, __VA_ARGS__)
+
+// usage       : TTL_7442_DIP(name)
+#define TTL_7442_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_7442_DIP, __VA_ARGS__)
+
 // usage       : TTL_7486_DIP(name)
 #define TTL_7486_DIP(...)                                              \
 	NET_REGISTER_DEVEXT(TTL_7486_DIP, __VA_ARGS__)
 
+// usage       : TTL_74121_DIP(name)
+#define TTL_74121_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74121_DIP, __VA_ARGS__)
+
+// usage       : TTL_74123_DIP(name)
+#define TTL_74123_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74123_DIP, __VA_ARGS__)
+
+// usage       : TTL_9602_DIP(name)
+#define TTL_9602_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_9602_DIP, __VA_ARGS__)
+
 // usage       : TTL_74125_DIP(name)
 #define TTL_74125_DIP(...)                                             \
 	NET_REGISTER_DEVEXT(TTL_74125_DIP, __VA_ARGS__)
@@ -1147,6 +1206,14 @@
 #define TTL_74126_DIP(...)                                             \
 	NET_REGISTER_DEVEXT(TTL_74126_DIP, __VA_ARGS__)
 
+// usage       : TTL_74139_DIP(name)
+#define TTL_74139_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74139_DIP, __VA_ARGS__)
+
+// usage       : TTL_74153_DIP(name)
+#define TTL_74153_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74153_DIP, __VA_ARGS__)
+
 // usage       : TTL_74155_DIP(name)
 #define TTL_74155_DIP(...)                                             \
 	NET_REGISTER_DEVEXT(TTL_74155_DIP, __VA_ARGS__)
@@ -1155,6 +1222,10 @@
 #define TTL_74156_DIP(...)                                             \
 	NET_REGISTER_DEVEXT(TTL_74156_DIP, __VA_ARGS__)
 
+// usage       : TTL_74157_DIP(name)
+#define TTL_74157_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74157_DIP, __VA_ARGS__)
+
 // usage       : TTL_74260_DIP(name)
 #define TTL_74260_DIP(...)                                             \
 	NET_REGISTER_DEVEXT(TTL_74260_DIP, __VA_ARGS__)
@@ -1175,17 +1246,45 @@
 #define TTL_74379_DIP(...)                                             \
 	NET_REGISTER_DEVEXT(TTL_74379_DIP, __VA_ARGS__)
 
-// usage       : DM9312_DIP(name)
-#define DM9312_DIP(...)                                                \
-	NET_REGISTER_DEVEXT(DM9312_DIP, __VA_ARGS__)
+// usage       : TTL_74393_DIP(name)
+#define TTL_74393_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_74393_DIP, __VA_ARGS__)
+
+// usage       : SN74LS629_DIP(name, p1_CAP1, p2_CAP2)
+#define SN74LS629_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(SN74LS629_DIP, __VA_ARGS__)
+
+// usage       : TTL_9312_DIP(name)
+#define TTL_9312_DIP(...)                                                \
+	NET_REGISTER_DEVEXT(TTL_9312_DIP, __VA_ARGS__)
+
+// usage       : TTL_9310_DIP(name)
+#define TTL_9310_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_9310_DIP, __VA_ARGS__)
+
+// usage       : TTL_9316_DIP(name)
+#define TTL_9316_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_9316_DIP, __VA_ARGS__)
+
+// usage       : TTL_9321_DIP(name)
+#define TTL_9321_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_9321_DIP, __VA_ARGS__)
+
+// usage       : TTL_9322_DIP(name)
+#define TTL_9322_DIP(...)                                              \
+	NET_REGISTER_DEVEXT(TTL_9322_DIP, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
-// Source: src/lib/netlist/macro/nlm_cd4xxx.cpp
+// Source: CD4XXX_lib
 // ---------------------------------------------------------------------
 // usage       : CD4001_GATE(name)
 #define CD4001_GATE(...)                                               \
 	NET_REGISTER_DEVEXT(CD4001_GATE, __VA_ARGS__)
 
+// usage       : CD4011_GATE(name)
+#define CD4011_GATE(...)                                               \
+	NET_REGISTER_DEVEXT(CD4011_GATE, __VA_ARGS__)
+
 // usage       : CD4069_GATE(name)
 #define CD4069_GATE(...)                                               \
 	NET_REGISTER_DEVEXT(CD4069_GATE, __VA_ARGS__)
@@ -1194,10 +1293,21 @@
 #define CD4070_GATE(...)                                               \
 	NET_REGISTER_DEVEXT(CD4070_GATE, __VA_ARGS__)
 
+// ---------------------------------------------------------------------
+// Source: parser: CD4XXX_lib
+// ---------------------------------------------------------------------
 // usage       : CD4001_DIP(name)
 #define CD4001_DIP(...)                                                \
 	NET_REGISTER_DEVEXT(CD4001_DIP, __VA_ARGS__)
 
+// usage       : CD4006_DIP(name)
+#define CD4006_DIP(...)                                                \
+	NET_REGISTER_DEVEXT(CD4006_DIP, __VA_ARGS__)
+
+// usage       : CD4011_DIP(name)
+#define CD4011_DIP(...)                                                \
+	NET_REGISTER_DEVEXT(CD4011_DIP, __VA_ARGS__)
+
 // usage       : CD4069_DIP(name)
 #define CD4069_DIP(...)                                                \
 	NET_REGISTER_DEVEXT(CD4069_DIP, __VA_ARGS__)
@@ -1206,24 +1316,48 @@
 #define CD4070_DIP(...)                                                \
 	NET_REGISTER_DEVEXT(CD4070_DIP, __VA_ARGS__)
 
+// usage       : CD4013_DIP(name)
+#define CD4013_DIP(...)                                                \
+	NET_REGISTER_DEVEXT(CD4013_DIP, __VA_ARGS__)
+
+// usage       : CD4017_DIP(name)
+#define CD4017_DIP(...)                                                \
+	NET_REGISTER_DEVEXT(CD4017_DIP, __VA_ARGS__)
+
+// usage       : CD4022_DIP(name)
+#define CD4022_DIP(...)                                                \
+	NET_REGISTER_DEVEXT(CD4022_DIP, __VA_ARGS__)
+
 // usage       : CD4020_DIP(name)
 #define CD4020_DIP(...)                                                \
 	NET_REGISTER_DEVEXT(CD4020_DIP, __VA_ARGS__)
 
-// usage       : CD4016_DIP(name)
-#define CD4016_DIP(...)                                                \
-	NET_REGISTER_DEVEXT(CD4016_DIP, __VA_ARGS__)
+// usage       : CD4024_DIP(name)
+#define CD4024_DIP(...)                                                \
+	NET_REGISTER_DEVEXT(CD4024_DIP, __VA_ARGS__)
+
+// usage       : CD4053_DIP(name)
+#define CD4053_DIP(...)                                                \
+	NET_REGISTER_DEVEXT(CD4053_DIP, __VA_ARGS__)
 
 // usage       : CD4066_DIP(name)
 #define CD4066_DIP(...)                                                \
 	NET_REGISTER_DEVEXT(CD4066_DIP, __VA_ARGS__)
 
+// usage       : CD4016_DIP(name)
+#define CD4016_DIP(...)                                                \
+	NET_REGISTER_DEVEXT(CD4016_DIP, __VA_ARGS__)
+
 // usage       : CD4316_DIP(name)
 #define CD4316_DIP(...)                                                \
 	NET_REGISTER_DEVEXT(CD4316_DIP, __VA_ARGS__)
 
+// usage       : CD4538_DIP(name)
+#define CD4538_DIP(...)                                                \
+	NET_REGISTER_DEVEXT(CD4538_DIP, __VA_ARGS__)
+
 // ---------------------------------------------------------------------
-// Source: src/lib/netlist/macro/nlm_opamp.cpp
+// Source: parser: OPAMP_lib
 // ---------------------------------------------------------------------
 // usage       : opamp_layout_4_4_11(name)
 #define opamp_layout_4_4_11(...)                                       \
@@ -1253,10 +1387,18 @@
 #define MB3614_DIP(...)                                                \
 	NET_REGISTER_DEVEXT(MB3614_DIP, __VA_ARGS__)
 
+// usage       : MC3340_DIP(name)
+#define MC3340_DIP(...)                                                \
+	NET_REGISTER_DEVEXT(MC3340_DIP, __VA_ARGS__)
+
 // usage       : TL081_DIP(name)
 #define TL081_DIP(...)                                                 \
 	NET_REGISTER_DEVEXT(TL081_DIP, __VA_ARGS__)
 
+// usage       : TL082_DIP(name)
+#define TL082_DIP(...)                                                 \
+	NET_REGISTER_DEVEXT(TL082_DIP, __VA_ARGS__)
+
 // usage       : TL084_DIP(name)
 #define TL084_DIP(...)                                                 \
 	NET_REGISTER_DEVEXT(TL084_DIP, __VA_ARGS__)
@@ -1285,6 +1427,10 @@
 #define UA741_DIP14(...)                                               \
 	NET_REGISTER_DEVEXT(UA741_DIP14, __VA_ARGS__)
 
+// usage       : MC1558_DIP(name)
+#define MC1558_DIP(...)                                                 \
+	NET_REGISTER_DEVEXT(MC1558_DIP, __VA_ARGS__)
+
 // usage       : LM747_DIP(name)
 #define LM747_DIP(...)                                                 \
 	NET_REGISTER_DEVEXT(LM747_DIP, __VA_ARGS__)
@@ -1298,12 +1444,15 @@
 	NET_REGISTER_DEVEXT(LM3900, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
-// Source: src/lib/netlist/macro/nlm_other.cpp
+// Source: otheric_lib
 // ---------------------------------------------------------------------
 // usage       : MC14584B_GATE(name)
 #define MC14584B_GATE(...)                                             \
 	NET_REGISTER_DEVEXT(MC14584B_GATE, __VA_ARGS__)
 
+// ---------------------------------------------------------------------
+// Source: parser: otheric_lib
+// ---------------------------------------------------------------------
 // usage       : MC14584B_DIP(name)
 #define MC14584B_DIP(...)                                              \
 	NET_REGISTER_DEVEXT(MC14584B_DIP, __VA_ARGS__)
@@ -1313,7 +1462,7 @@
 	NET_REGISTER_DEVEXT(NE566_DIP, __VA_ARGS__)
 
 // ---------------------------------------------------------------------
-// Source: src/lib/netlist/macro/nlm_roms.cpp
+// Source: parser: ROMS_lib
 // ---------------------------------------------------------------------
 // usage       : PROM_82S123_DIP(name)
 #define PROM_82S123_DIP(...)                                           \
@@ -1331,5 +1480,22 @@
 #define EPROM_2716_DIP(...)                                            \
 	NET_REGISTER_DEVEXT(EPROM_2716_DIP, __VA_ARGS__)
 
+// usage       : PROM_MK28000_DIP(name)
+#define PROM_MK28000_DIP(...)                                            \
+	NET_REGISTER_DEVEXT(PROM_MK28000_DIP, __VA_ARGS__)
+
+// usage       : TTL_82S16_DIP(name)
+#define TTL_82S16_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(TTL_82S16_DIP, __VA_ARGS__)
+
+// usage       : PROM_82S115_DIP(name)
+#define PROM_82S115_DIP(...)                                           \
+	NET_REGISTER_DEVEXT(PROM_82S115_DIP, __VA_ARGS__)
+
+// usage       : RAM_2102A_DIP(name)
+#define RAM_2102A_DIP(...)                                             \
+	NET_REGISTER_DEVEXT(RAM_2102A_DIP, __VA_ARGS__)
+
+
 #endif // __PLIB_PREPROCESSOR__
 #endif
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_dm9314.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_dm9314.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_dm9314.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_dm9314.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,19 @@
 /*
  * nld_dm9314.cpp
  *
+ *  DM9314: 4-Bit Latches
+ *
+ *          +--------------+
+ *       /E |1     ++    16| VCC
+ *      /S0 |2           15| Q0
+ *       D0 |3           14| /S1
+ *       D1 |4   DM9314  13| Q1
+ *      /S2 |5           12| Q2
+ *       D2 |6           11| /S3
+ *       D3 |7           10| Q3
+ *      GND |8            9| /MR
+ *          +--------------+
+ *
  */
 
 #include "nld_dm9314.h"
@@ -15,10 +28,10 @@
 	NETLIB_OBJECT(9314)
 	{
 		NETLIB_CONSTRUCTOR(9314)
-		, m_EQ(*this, "EQ")
-		, m_MRQ(*this, "MRQ")
-		, m_SQ(*this, {"S0Q", "S1Q", "S2Q", "S3Q"})
-		, m_D(*this, {"D0", "D1", "D2", "D3"})
+		, m_EQ(*this, "EQ", NETLIB_DELEGATE(inputs))
+		, m_MRQ(*this, "MRQ", NETLIB_DELEGATE(inputs))
+		, m_SQ(*this, {"S0Q", "S1Q", "S2Q", "S3Q"}, NETLIB_DELEGATE(inputs))
+		, m_D(*this, {"D0", "D1", "D2", "D3"}, NETLIB_DELEGATE(inputs))
 		, m_Q(*this, {"Q0", "Q1", "Q2", "Q3"})
 		, m_last_EQ(*this, "m_last_EQ", 0)
 		, m_last_MRQ(*this, "m_last_MRQ", 0)
@@ -38,10 +51,38 @@
 			m_last_Q = 0;
 		}
 
-		NETLIB_UPDATEI();
-
 		friend class NETLIB_NAME(9314_dip);
 	private:
+		NETLIB_HANDLERI(inputs)
+		{
+			netlist_time delay = NLTIME_FROM_NS(24); //FIXME!
+			if (!m_MRQ())
+			{
+				/* Reset! */
+				for (std::size_t i=0; i<4; i++)
+					m_Q[i].push(0, delay);
+			} else {
+				for (std::size_t i=0; i<4; i++)
+				{
+					if (m_SQ[i]())
+					{
+						/* R-S Mode */
+						// FIXME: R-S mode is not yet implemented!
+					}
+					else
+					{
+						/* D Mode */
+						if (!m_EQ())
+						{
+							m_Q[i].push(m_D[i](), delay);
+							m_last_Q &= ~(1 << i);
+							m_last_Q |= (m_D[i]() << i);
+						}
+					}
+				}
+			}
+		}
+
 		logic_input_t m_EQ;
 		logic_input_t m_MRQ;
 		object_array_t<logic_input_t, 4> m_SQ;
@@ -83,36 +124,6 @@
 			NETLIB_SUB(9314) A;
 	};
 
-	NETLIB_UPDATE(9314)
-	{
-		netlist_time delay = NLTIME_FROM_NS(24); //FIXME!
-		if (!m_MRQ())
-		{
-			/* Reset! */
-			for (std::size_t i=0; i<4; i++)
-				m_Q[i].push(0, delay);
-		} else {
-			for (std::size_t i=0; i<4; i++)
-			{
-				if (m_SQ[i]())
-				{
-					/* R-S Mode */
-					// FIXME: R-S mode is not yet implemented!
-				}
-				else
-				{
-					/* D Mode */
-					if (!m_EQ())
-					{
-						m_Q[i].push(m_D[i](), delay);
-						m_last_Q &= ~(1 << i);
-						m_last_Q |= (m_D[i]() << i);
-					}
-				}
-			}
-		}
-	}
-
 	NETLIB_DEVICE_IMPL(9314,     "TTL_9314",     "+EQ,+MRQ,+S0Q,+S1Q,+S2Q,+S3Q,+D0,+D1,+D2,+D3,@VCC,@GND")
 	NETLIB_DEVICE_IMPL(9314_dip, "TTL_9314_DIP", "")
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_dm9314.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_dm9314.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_dm9314.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_dm9314.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,22 +1,5 @@
 // license:BSD-3-Clause
 // copyright-holders:Felipe Sanches
-/*
- * nld_DM9314.h
- *
- *  DM9314: 4-Bit Latches
- *
- *          +--------------+
- *       /E |1     ++    16| VCC
- *      /S0 |2           15| Q0
- *       D0 |3           14| /S1
- *       D1 |4   DM9314  13| Q1
- *      /S2 |5           12| Q2
- *       D2 |6           11| /S3
- *       D3 |7           10| Q3
- *      GND |8            9| /MR
- *          +--------------+
- *
- */
 
 #ifndef NLD_DM9314_H_
 #define NLD_DM9314_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_dm9334.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_dm9334.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_dm9334.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_dm9334.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,63 @@
 /*
  * nld_dm9334.cpp
  *
+ *  DM9334: 8-Bit Addressable Latch
+ *
+ *          +--------------+
+ *       A0 |1     ++    16| VCC
+ *       A1 |2           15| /C
+ *       A2 |3           14| /E
+ *       Q0 |4   DM9334  13| D
+ *       Q1 |5           12| Q7
+ *       Q2 |6           11| Q6
+ *       Q3 |7           10| Q5
+ *      GND |8            9| Q4
+ *          +--------------+
+ *
+ *          +---+---++---++---+---+---++---+---+---+---+---+---+---+---+
+ *          | C | E || D || A0| A1| A2|| Q0| Q1| Q2| Q3| Q4| Q5| Q6| Q7|
+ *          +===+===++===++===+===+===++===+===+===+===+===+===+===+===+
+ *          | 1 | 0 || X || X | X | X || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+ *          +---+---++---++---+---+---++---+---+---+---+---+---+---+---+
+ *          | 1 | 1 || 0 || 0 | 0 | 0 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+ *          | 1 | 1 || 1 || 0 | 0 | 0 || 1 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+ *          | 1 | 1 || 0 || 0 | 0 | 1 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+ *          | 1 | 1 || 1 || 0 | 0 | 1 || 0 | 1 | 0 | 0 | 0 | 0 | 0 | 0 |
+ *          | 1 | 1 || 0 || 0 | 1 | 0 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+ *          | 1 | 1 || 1 || 0 | 1 | 0 || 0 | 0 | 1 | 0 | 0 | 0 | 0 | 0 |
+ *          | 1 | 1 || 0 || 0 | 1 | 1 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+ *          | 1 | 1 || 1 || 0 | 1 | 1 || 0 | 0 | 0 | 1 | 0 | 0 | 0 | 0 |
+ *          | 1 | 1 || 0 || 1 | 0 | 0 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+ *          | 1 | 1 || 1 || 1 | 0 | 0 || 0 | 0 | 0 | 0 | 1 | 0 | 0 | 0 |
+ *          | 1 | 1 || 0 || 1 | 0 | 1 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+ *          | 1 | 1 || 1 || 1 | 0 | 1 || 0 | 0 | 0 | 0 | 0 | 1 | 0 | 0 |
+ *          | 1 | 1 || 0 || 1 | 1 | 0 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+ *          | 1 | 1 || 1 || 1 | 1 | 0 || 0 | 0 | 0 | 0 | 0 | 0 | 1 | 0 |
+ *          | 1 | 1 || 0 || 1 | 1 | 1 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+ *          | 1 | 1 || 1 || 1 | 1 | 1 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 |
+ *          +---+---++---++---+---+---++---+---+---+---+---+---+---+---+
+ *          | 0 | 0 || X || X | X | X || P | P | P | P | P | P | P | P |
+ *          +---+---++---++---+---+---++---+---+---+---+---+---+---+---+
+ *          | 0 | 1 || 0 || 0 | 0 | 0 || 0 | P | P | P | P | P | P | P |
+ *          | 0 | 1 || 1 || 0 | 0 | 0 || 1 | P | P | P | P | P | P | P |
+ *          | 0 | 1 || 0 || 0 | 0 | 1 || P | 0 | P | P | P | P | P | P |
+ *          | 0 | 1 || 1 || 0 | 0 | 1 || P | 1 | P | P | P | P | P | P |
+ *          | 0 | 1 || 0 || 0 | 1 | 0 || P | P | 0 | P | P | P | P | P |
+ *          | 0 | 1 || 1 || 0 | 1 | 0 || P | P | 1 | P | P | P | P | P |
+ *          | 0 | 1 || 0 || 0 | 1 | 1 || P | P | P | 0 | P | P | P | P |
+ *          | 0 | 1 || 1 || 0 | 1 | 1 || P | P | P | 1 | P | P | P | P |
+ *          | 0 | 1 || 0 || 1 | 0 | 0 || P | P | P | P | 0 | P | P | P |
+ *          | 0 | 1 || 1 || 1 | 0 | 0 || P | P | P | P | 1 | P | P | P |
+ *          | 0 | 1 || 0 || 1 | 0 | 1 || P | P | P | P | P | 0 | P | P |
+ *          | 0 | 1 || 1 || 1 | 0 | 1 || P | P | P | P | P | 1 | P | P |
+ *          | 0 | 1 || 0 || 1 | 1 | 0 || P | P | P | P | P | P | 0 | P |
+ *          | 0 | 1 || 1 || 1 | 1 | 0 || P | P | P | P | P | P | 1 | P |
+ *          | 0 | 1 || 0 || 1 | 1 | 1 || P | P | P | P | P | P | P | 0 |
+ *          | 0 | 1 || 1 || 1 | 1 | 1 || P | P | P | P | P | P | P | 1 |
+ *          +---+---++---++---+---+---++---+---+---+---+---+---+---+---+
+ *
+ *  Naming convention attempts to follow Texas Instruments / National Semiconductor datasheet Literature Number SNOS382A
+ *
  */
 
 #include "nld_dm9334.h"
@@ -15,10 +72,10 @@
 	NETLIB_OBJECT(9334)
 	{
 		NETLIB_CONSTRUCTOR(9334)
-		, m_CQ(*this, "CQ")
-		, m_EQ(*this, "EQ")
-		, m_D(*this, "D")
-		, m_A(*this, {"A0", "A1", "A2"})
+		, m_CQ(*this, "CQ", NETLIB_DELEGATE(inputs))
+		, m_EQ(*this, "EQ", NETLIB_DELEGATE(inputs))
+		, m_D(*this, "D", NETLIB_DELEGATE(inputs))
+		, m_A(*this, {"A0", "A1", "A2"}, NETLIB_DELEGATE(inputs))
 		, m_Q(*this, {"Q0", "Q1", "Q2", "Q3", "Q4", "Q5", "Q6", "Q7"})
 		, m_last_CQ(*this, "m_last_CQ", 0)
 		, m_last_EQ(*this, "m_last_EQ", 0)
@@ -38,10 +95,74 @@
 			m_last_Q = 0;
 		}
 
-		NETLIB_UPDATEI();
-
 		friend class NETLIB_NAME(9334_dip);
 	private:
+		NETLIB_HANDLERI(inputs)
+		{
+			uint_fast8_t a = 0;
+			for (std::size_t i=0; i<3; i++)
+			{
+				a |= (m_A[i]() << i);
+			}
+
+			netlist_time delay = NLTIME_FROM_NS(27); // Clear Low to High Level Output (not documented, making reasonable guess)
+
+			if (a != m_last_A)
+			{
+				delay = NLTIME_FROM_NS(35);
+			}
+			else if (m_D() != m_last_D)
+			{
+				if (m_last_D)
+				{
+					delay = NLTIME_FROM_NS(28);
+				}
+				else
+				{
+					delay = NLTIME_FROM_NS(35);
+				}
+			}
+			else if (m_EQ() != m_last_EQ)
+			{
+				if (m_last_EQ)
+				{
+					delay = NLTIME_FROM_NS(27);
+				}
+				else
+				{
+					delay = NLTIME_FROM_NS(28);
+				}
+			}
+
+			unsigned q = m_last_Q;
+
+			if (!m_CQ())
+			{
+				if (m_EQ())
+				{
+					q = 0;
+				}
+				else
+				{
+					q = m_D() << a;
+				}
+			}
+			else if(!m_EQ())
+			{
+				q &= ~(1 << a);
+				q |= (m_D() << a);
+			}
+
+			m_last_CQ = m_CQ();
+			m_last_EQ = m_EQ();
+			m_last_D = m_D();
+			m_last_A = a;
+			m_last_Q = q;
+
+			for (std::size_t i=0; i<8; i++)
+				m_Q[i].push((q >> i) & 1, delay);
+		}
+
 		logic_input_t m_CQ;
 		logic_input_t m_EQ;
 		logic_input_t m_D;
@@ -80,78 +201,11 @@
 			register_subalias("16", "A.VCC");
 
 		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
+		//NETLIB_RESETI() {}
 	private:
 		NETLIB_SUB(9334) A;
 	};
 
-	NETLIB_UPDATE(9334)
-	{
-		uint_fast8_t a = 0;
-		for (std::size_t i=0; i<3; i++)
-		{
-			a |= (m_A[i]() << i);
-		}
-
-		netlist_time delay = NLTIME_FROM_NS(27); // Clear Low to High Level Output (not documented, making reasonable guess)
-
-		if (a != m_last_A)
-		{
-			delay = NLTIME_FROM_NS(35);
-		}
-		else if (m_D() != m_last_D)
-		{
-			if (m_last_D)
-			{
-				delay = NLTIME_FROM_NS(28);
-			}
-			else
-			{
-				delay = NLTIME_FROM_NS(35);
-			}
-		}
-		else if (m_EQ() != m_last_EQ)
-		{
-			if (m_last_EQ)
-			{
-				delay = NLTIME_FROM_NS(27);
-			}
-			else
-			{
-				delay = NLTIME_FROM_NS(28);
-			}
-		}
-
-		unsigned q = m_last_Q;
-
-		if (!m_CQ())
-		{
-			if (m_EQ())
-			{
-				q = 0;
-			}
-			else
-			{
-				q = m_D() << a;
-			}
-		}
-		else if(!m_EQ())
-		{
-			q &= ~(1 << a);
-			q |= (m_D() << a);
-		}
-
-		m_last_CQ = m_CQ();
-		m_last_EQ = m_EQ();
-		m_last_D = m_D();
-		m_last_A = a;
-		m_last_Q = q;
-
-		for (std::size_t i=0; i<8; i++)
-			m_Q[i].push((q >> i) & 1, delay);
-	}
-
 	NETLIB_DEVICE_IMPL(9334,     "TTL_9334",     "+CQ,+EQ,+D,+A0,+A1,+A2,@VCC,@GND")
 	NETLIB_DEVICE_IMPL(9334_dip, "TTL_9334_DIP", "")
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_dm9334.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_dm9334.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_dm9334.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_dm9334.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,66 +1,5 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-/*
- * nld_DM9334.h
- *
- *  DM9334: 8-Bit Addressable Latch
- *
- *          +--------------+
- *       A0 |1     ++    16| VCC
- *       A1 |2           15| /C
- *       A2 |3           14| /E
- *       Q0 |4   DM9334  13| D
- *       Q1 |5           12| Q7
- *       Q2 |6           11| Q6
- *       Q3 |7           10| Q5
- *      GND |8            9| Q4
- *          +--------------+
- *
- *          +---+---++---++---+---+---++---+---+---+---+---+---+---+---+
- *          | C | E || D || A0| A1| A2|| Q0| Q1| Q2| Q3| Q4| Q5| Q6| Q7|
- *          +===+===++===++===+===+===++===+===+===+===+===+===+===+===+
- *          | 1 | 0 || X || X | X | X || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
- *          +---+---++---++---+---+---++---+---+---+---+---+---+---+---+
- *          | 1 | 1 || 0 || 0 | 0 | 0 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
- *          | 1 | 1 || 1 || 0 | 0 | 0 || 1 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
- *          | 1 | 1 || 0 || 0 | 0 | 1 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
- *          | 1 | 1 || 1 || 0 | 0 | 1 || 0 | 1 | 0 | 0 | 0 | 0 | 0 | 0 |
- *          | 1 | 1 || 0 || 0 | 1 | 0 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
- *          | 1 | 1 || 1 || 0 | 1 | 0 || 0 | 0 | 1 | 0 | 0 | 0 | 0 | 0 |
- *          | 1 | 1 || 0 || 0 | 1 | 1 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
- *          | 1 | 1 || 1 || 0 | 1 | 1 || 0 | 0 | 0 | 1 | 0 | 0 | 0 | 0 |
- *          | 1 | 1 || 0 || 1 | 0 | 0 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
- *          | 1 | 1 || 1 || 1 | 0 | 0 || 0 | 0 | 0 | 0 | 1 | 0 | 0 | 0 |
- *          | 1 | 1 || 0 || 1 | 0 | 1 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
- *          | 1 | 1 || 1 || 1 | 0 | 1 || 0 | 0 | 0 | 0 | 0 | 1 | 0 | 0 |
- *          | 1 | 1 || 0 || 1 | 1 | 0 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
- *          | 1 | 1 || 1 || 1 | 1 | 0 || 0 | 0 | 0 | 0 | 0 | 0 | 1 | 0 |
- *          | 1 | 1 || 0 || 1 | 1 | 1 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
- *          | 1 | 1 || 1 || 1 | 1 | 1 || 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 |
- *          +---+---++---++---+---+---++---+---+---+---+---+---+---+---+
- *          | 0 | 0 || X || X | X | X || P | P | P | P | P | P | P | P |
- *          +---+---++---++---+---+---++---+---+---+---+---+---+---+---+
- *          | 0 | 1 || 0 || 0 | 0 | 0 || 0 | P | P | P | P | P | P | P |
- *          | 0 | 1 || 1 || 0 | 0 | 0 || 1 | P | P | P | P | P | P | P |
- *          | 0 | 1 || 0 || 0 | 0 | 1 || P | 0 | P | P | P | P | P | P |
- *          | 0 | 1 || 1 || 0 | 0 | 1 || P | 1 | P | P | P | P | P | P |
- *          | 0 | 1 || 0 || 0 | 1 | 0 || P | P | 0 | P | P | P | P | P |
- *          | 0 | 1 || 1 || 0 | 1 | 0 || P | P | 1 | P | P | P | P | P |
- *          | 0 | 1 || 0 || 0 | 1 | 1 || P | P | P | 0 | P | P | P | P |
- *          | 0 | 1 || 1 || 0 | 1 | 1 || P | P | P | 1 | P | P | P | P |
- *          | 0 | 1 || 0 || 1 | 0 | 0 || P | P | P | P | 0 | P | P | P |
- *          | 0 | 1 || 1 || 1 | 0 | 0 || P | P | P | P | 1 | P | P | P |
- *          | 0 | 1 || 0 || 1 | 0 | 1 || P | P | P | P | P | 0 | P | P |
- *          | 0 | 1 || 1 || 1 | 0 | 1 || P | P | P | P | P | 1 | P | P |
- *          | 0 | 1 || 0 || 1 | 1 | 0 || P | P | P | P | P | P | 0 | P |
- *          | 0 | 1 || 1 || 1 | 1 | 0 || P | P | P | P | P | P | 1 | P |
- *          | 0 | 1 || 0 || 1 | 1 | 1 || P | P | P | P | P | P | P | 0 |
- *          | 0 | 1 || 1 || 1 | 1 | 1 || P | P | P | P | P | P | P | 1 |
- *          +---+---++---++---+---+---++---+---+---+---+---+---+---+---+
- *
- *  Naming convention attempts to follow Texas Instruments / National Semiconductor datasheet Literature Number SNOS382A
- *
- */
 
 #ifndef NLD_DM9334_H_
 #define NLD_DM9334_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_legacy.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_legacy.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_legacy.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_legacy.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -15,17 +15,34 @@
 	NETLIB_OBJECT(nicRSFF)
 	{
 		NETLIB_CONSTRUCTOR(nicRSFF)
-		, m_S(*this, "S")
-		, m_R(*this, "R")
+		, m_S(*this, "S", NETLIB_DELEGATE(inputs))
+		, m_R(*this, "R", NETLIB_DELEGATE(inputs))
 		, m_Q(*this, "Q")
 		, m_QQ(*this, "QQ")
 		{
 		}
 
-		NETLIB_RESETI();
-		NETLIB_UPDATEI();
+		NETLIB_RESETI()
+		{
+			m_Q.initial(0);
+			m_QQ.initial(1);
+		}
 
 	private:
+		NETLIB_HANDLERI(inputs)
+		{
+			if (!m_S())
+			{
+				m_Q.push(1, NLTIME_FROM_NS(20));
+				m_QQ.push(0, NLTIME_FROM_NS(20));
+			}
+			else if (!m_R())
+			{
+				m_Q.push(0, NLTIME_FROM_NS(20));
+				m_QQ.push(1, NLTIME_FROM_NS(20));
+			}
+		}
+
 		logic_input_t m_S;
 		logic_input_t m_R;
 
@@ -37,7 +54,7 @@
 	NETLIB_OBJECT(nicDelay)
 	{
 		NETLIB_CONSTRUCTOR(nicDelay)
-		, m_I(*this, "1")
+		, m_I(*this, "1", NETLIB_DELEGATE(input))
 		, m_Q(*this, "2")
 		, m_L_to_H(*this, "L_TO_H", 10)
 		, m_H_to_L(*this, "H_TO_L", 10)
@@ -46,10 +63,28 @@
 		}
 
 		//NETLIB_UPDATE_PARAMI();
-		NETLIB_RESETI();
-		NETLIB_UPDATEI();
+		NETLIB_RESETI()
+		{
+			//m_Q.initial(0);
+		}
 
 	private:
+		NETLIB_HANDLERI(input)
+		{
+			netlist_sig_t nval = m_I();
+			if (nval && !m_last)
+			{
+				// L_to_H
+				m_Q.push(1, NLTIME_FROM_NS(static_cast<unsigned>(m_L_to_H())));
+			}
+			else if (!nval && m_last)
+			{
+				// H_to_L
+				m_Q.push(0, NLTIME_FROM_NS(static_cast<unsigned>(m_H_to_L())));
+			}
+			m_last = nval;
+		}
+
 		logic_input_t m_I;
 		logic_output_t m_Q;
 
@@ -59,47 +94,6 @@
 		state_var<netlist_sig_t> m_last;
 	};
 
-	NETLIB_RESET(nicRSFF)
-	{
-		m_Q.initial(0);
-		m_QQ.initial(1);
-	}
-
-	NETLIB_UPDATE(nicRSFF)
-	{
-		if (!m_S())
-		{
-			m_Q.push(1, NLTIME_FROM_NS(20));
-			m_QQ.push(0, NLTIME_FROM_NS(20));
-		}
-		else if (!m_R())
-		{
-			m_Q.push(0, NLTIME_FROM_NS(20));
-			m_QQ.push(1, NLTIME_FROM_NS(20));
-		}
-	}
-
-	NETLIB_RESET(nicDelay)
-	{
-		//m_Q.initial(0);
-	}
-
-	NETLIB_UPDATE(nicDelay)
-	{
-		netlist_sig_t nval = m_I();
-		if (nval && !m_last)
-		{
-			// L_to_H
-			m_Q.push(1, NLTIME_FROM_NS(static_cast<unsigned>(m_L_to_H())));
-		}
-		else if (!nval && m_last)
-		{
-			// H_to_L
-			m_Q.push(0, NLTIME_FROM_NS(static_cast<unsigned>(m_H_to_L())));
-		}
-		m_last = nval;
-	}
-
 	NETLIB_DEVICE_IMPL(nicRSFF,  "NETDEV_RSFF",  "")
 	NETLIB_DEVICE_IMPL(nicDelay, "NETDEV_DELAY", "")
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_log.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_log.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_log.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_log.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,16 +1,34 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_log.c
+ * nld_log.cpp
+ *
+ *  Devices supporting analysis and logging
+ *
+ *  nld_log:
+ *
+ *          +---------+
+ *          |    ++   |
+ *        I |         | ==> Log to file "netlist_" + name() + ".log"
+ *          |         |
+ *          +---------+
  *
  */
 
 #include "netlist/nl_base.h"
 #include "nld_log.h"
 #include "plib/pfmtlog.h"
+#include "plib/pmulti_threading.h"
 #include "plib/pstream.h"
 //#include "sound/wavwrite.h"
 
+#include <array>
+#include <atomic>
+#include <functional>
+#include <mutex>
+#include <thread>
+#include <vector>
+
 namespace netlist
 {
 	namespace devices
@@ -18,50 +36,116 @@
 	NETLIB_OBJECT(log)
 	{
 		NETLIB_CONSTRUCTOR(log)
-		, m_I(*this, "I")
+		, m_I(*this, "I", NETLIB_DELEGATE(input))
 		, m_strm(plib::filesystem::u8path(plib::pfmt("{1}.log")(this->name())))
 		, m_writer(&m_strm)
 		, m_reset(false)
+		, m_done(false)
+		, m_sem_w(0)
+		, m_sem_r(0)
+		, m_w(0)
+		, m_r(0)
 		{
 			if (m_strm.fail())
 				throw plib::file_open_e(plib::pfmt("{1}.log")(this->name()));
 
 			m_strm.imbue(std::locale::classic());
+
+			//m_write_thread = std::thread(std::bind(&nld_log::thread_writer, this));
+			m_write_thread = std::thread([this]{this->thread_writer(); });
+			m_sem_r.acquire();
 		}
 
+		PCOPYASSIGNMOVE(NETLIB_NAME(log), delete)
+
 		NETLIB_DESTRUCTOR(log)
 		{
 			if (m_reset)
-				m_writer.writeline(plib::pfmt("{1:.9} {2}").e(exec().time().as_fp<nl_fptype>()).e(static_cast<nl_fptype>(m_I())));
+				log_value(m_I());
+			m_sem_w.release();
+			m_done = true;
+			m_write_thread.join();
+		}
+
+		NETLIB_HANDLERI(input)
+		{
+			log_value(static_cast<nl_fptype>(m_I()));
 		}
 
-		NETLIB_UPDATEI()
+		void log_value(nl_fptype val)
 		{
-			/* use pstring::sprintf, it is a LOT faster */
-			m_writer.writeline(plib::pfmt("{1:.9} {2}").e(exec().time().as_fp<nl_fptype>()).e(static_cast<nl_fptype>(m_I())));
+			if (m_buffers[m_w].size() == BUF_SIZE)
+			{
+				m_sem_w.release();
+				m_sem_r.acquire();
+				m_w++;
+				if (m_w >= BUFFERS)
+					m_w = 0;
+			}
+			m_buffers[m_w].push_back({exec().time(), val});
 		}
 
 		NETLIB_RESETI() { m_reset = true; }
 	protected:
+
+		void thread_writer()
+		{
+			m_sem_r.release(BUFFERS);
+			while (true)
+			{
+				if (!m_sem_w.try_acquire())
+				{
+					if (m_done)
+						break;
+					m_sem_w.acquire();
+				}
+				auto &b = m_buffers[m_r];
+
+				for (auto &e : b)
+					/* use pstring::sprintf, it is a LOT faster */
+					m_writer.writeline(plib::pfmt("{1:.9} {2}").e(e.t.as_fp<nl_fptype>()).e(e.v));
+				b.clear();
+				m_sem_r.release();
+				m_r++;
+				if (m_r >= BUFFERS)
+					m_r = 0;
+			}
+		}
+
+		struct entry
+		{
+			netlist_time_ext t;
+			nl_fptype v;
+		};
+		static const std::size_t BUF_SIZE=16384;
+		static const std::size_t BUFFERS=4;
 		analog_input_t m_I;
 		plib::ofstream m_strm;
 		plib::putf8_writer m_writer;
 		bool m_reset;
+		std::array<std::vector<entry>, BUFFERS> m_buffers;
+		std::atomic<bool> m_done;
+		plib::psemaphore m_sem_w;
+		plib::psemaphore m_sem_r;
+		std::size_t m_w;
+		std::size_t m_r;
+		std::thread m_write_thread;
 	};
 
 	NETLIB_OBJECT_DERIVED(logD, log)
 	{
 		NETLIB_CONSTRUCTOR(logD)
-		, m_I2(*this, "I2")
+		, m_I2(*this, "I2", nldelegate(&NETLIB_NAME(logD)::input, this))
 		{
+			m_I.set_delegate(nldelegate(&NETLIB_NAME(logD)::input, this));
 		}
 
-		NETLIB_UPDATEI()
+		NETLIB_HANDLERI(input)
 		{
-			m_writer.writeline(plib::pfmt("{1:.9} {2}").e(exec().time().as_fp<nl_fptype>()).e(static_cast<nl_fptype>(m_I() - m_I2())));
+			log_value(static_cast<nl_fptype>(m_I() - m_I2()));
 		}
 
-		NETLIB_RESETI() { }
+		//NETLIB_RESETI() {}
 		analog_input_t m_I2;
 	};
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_log.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_log.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_log.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_log.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,19 +1,5 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_log.h
- *
- *  Devices supporting analysis and logging
- *
- *  nld_log:
- *
- *          +---------+
- *          |    ++   |
- *        I |         | ==> Log to file "netlist_" + name() + ".log"
- *          |         |
- *          +---------+
- *
- */
 
 #ifndef NLD_LOG_H_
 #define NLD_LOG_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_mm5837.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_mm5837.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_mm5837.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_mm5837.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,18 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_MM5837.c
+ * nld_MM5837.cpp
+ *
+ *  MM5837: Digital noise source
+ *
+ *          +--------+
+ *      VDD |1  ++  8| NC
+ *      VGG |2      7| NC
+ *      OUT |3      6| NC
+ *      VSS |4      5| NC
+ *          +--------+
+ *
+ *  Naming conventions follow National Semiconductor datasheet
  *
  */
 
@@ -17,14 +28,14 @@
 	{
 		NETLIB_CONSTRUCTOR(MM5837_dip)
 		, m_RV(*this, "_RV")
-		, m_VDD(*this, "1")
-		, m_VGG(*this, "2")
-		, m_VSS(*this, "4")
+		, m_VDD(*this, "1", NETLIB_DELEGATE(inputs))
+		, m_VGG(*this, "2", NETLIB_DELEGATE(inputs))
+		, m_VSS(*this, "4", NETLIB_DELEGATE(inputs))
 		, m_FREQ(*this, "FREQ", 24000 * 2)
 		, m_R_LOW(*this, "R_LOW", 1000)
 		, m_R_HIGH(*this, "R_HIGH", 1000)
 		/* clock */
-		, m_feedback(*this, "_FB")
+		, m_feedback(*this, "_FB", NETLIB_DELEGATE(inputs))
 		, m_Q(*this, "_Q")
 		, m_inc(netlist_time::from_hz(24000 * 2))
 		, m_shift(*this, "m_shift", 0)
@@ -36,11 +47,56 @@
 			register_subalias("3", m_RV.P());
 		}
 
-		NETLIB_RESETI();
-		NETLIB_UPDATEI();
-		NETLIB_UPDATE_PARAMI();
+		NETLIB_RESETI()
+		{
+			//m_V0.initial(0.0);
+			//m_RV.do_reset();
+			m_RV.set_G_V_I(plib::reciprocal(m_R_LOW()),
+				nlconst::zero(),
+				nlconst::zero());
+			m_inc = netlist_time::from_fp(plib::reciprocal(m_FREQ()));
+			if (m_FREQ() < nlconst::magic(24000*2) || m_FREQ() > nlconst::magic(56000*2))
+				log().warning(MW_FREQUENCY_OUTSIDE_OF_SPECS_1(m_FREQ()));
+
+			m_shift = 0x1ffff;
+		}
+
+		NETLIB_UPDATE_PARAMI()
+		{
+			m_inc = netlist_time::from_fp(plib::reciprocal(m_FREQ()));
+			if (m_FREQ() < nlconst::magic(24000*2) || m_FREQ() > nlconst::magic(56000*2))
+				log().warning(MW_FREQUENCY_OUTSIDE_OF_SPECS_1(m_FREQ()));
+		}
+
+	private:
+		NETLIB_HANDLERI(inputs)
+		{
+			m_Q.push(!m_feedback(), m_inc);
+
+			/* shift register
+			 *
+			 * 17 bits, bits 17 & 14 feed back to input
+			 *
+			 */
+
+			const auto last_state = m_shift & 0x01;
+			/* shift */
+			m_shift = (m_shift >> 1) | (((m_shift & 0x01) ^ ((m_shift >> 3) & 0x01)) << 16);
+			const auto state = m_shift & 0x01;
+
+			if (state != last_state)
+			{
+				const nl_fptype R = state ? m_R_HIGH : m_R_LOW;
+				const nl_fptype V = state ? m_VDD() : m_VSS();
+
+				m_RV.change_state([this, &R, &V]()
+				{
+					m_RV.set_G_V_I(plib::reciprocal(R), V, nlconst::zero());
+				});
+			}
+
+		}
 
-	protected:
 		analog::NETLIB_SUB(twoterm) m_RV;
 		analog_input_t m_VDD;
 		analog_input_t m_VGG;
@@ -58,55 +114,6 @@
 		state_var_u32 m_shift;
 	};
 
-	NETLIB_RESET(MM5837_dip)
-	{
-		//m_V0.initial(0.0);
-		//m_RV.do_reset();
-		m_RV.set_G_V_I(plib::reciprocal(m_R_LOW()),
-			nlconst::zero(),
-			nlconst::zero());
-		m_inc = netlist_time::from_fp(plib::reciprocal(m_FREQ()));
-		if (m_FREQ() < nlconst::magic(24000*2) || m_FREQ() > nlconst::magic(56000*2))
-			log().warning(MW_FREQUENCY_OUTSIDE_OF_SPECS_1(m_FREQ()));
-
-		m_shift = 0x1ffff;
-	}
-
-	NETLIB_UPDATE_PARAM(MM5837_dip)
-	{
-		m_inc = netlist_time::from_fp(plib::reciprocal(m_FREQ()));
-		if (m_FREQ() < nlconst::magic(24000*2) || m_FREQ() > nlconst::magic(56000*2))
-			log().warning(MW_FREQUENCY_OUTSIDE_OF_SPECS_1(m_FREQ()));
-	}
-
-	NETLIB_UPDATE(MM5837_dip)
-	{
-		m_Q.push(!m_feedback(), m_inc);
-
-		/* shift register
-		 *
-		 * 17 bits, bits 17 & 14 feed back to input
-		 *
-		 */
-
-		const auto last_state = m_shift & 0x01;
-		/* shift */
-		m_shift = (m_shift >> 1) | (((m_shift & 0x01) ^ ((m_shift >> 3) & 0x01)) << 16);
-		const auto state = m_shift & 0x01;
-
-		if (state != last_state)
-		{
-			const nl_fptype R = state ? m_R_HIGH : m_R_LOW;
-			const nl_fptype V = state ? m_VDD() : m_VSS();
-
-			m_RV.change_state([this, &R, &V]()
-			{
-				m_RV.set_G_V_I(plib::reciprocal(R), V, nlconst::zero());
-			});
-		}
-
-	}
-
 	NETLIB_DEVICE_IMPL(MM5837_dip, "MM5837_DIP", "")
 
 	} //namespace devices
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_mm5837.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_mm5837.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_mm5837.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_mm5837.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,20 +1,5 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_MM5837.h
- *
- *  MM5837: Digital noise source
- *
- *          +--------+
- *      VDD |1  ++  8| NC
- *      VGG |2      7| NC
- *      OUT |3      6| NC
- *      VSS |4      5| NC
- *          +--------+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
 
 #ifndef NLD_MM5837_H_
 #define NLD_MM5837_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_ne555.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_ne555.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_ne555.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_ne555.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -34,6 +34,15 @@
 //- Package: DIP
 //- NamingConvention: Naming conventions follow Texas instrument datasheet
 //- Limitations: Internal resistor network currently fixed to 5k
+//-   If TRIG and TRESH are connected overshoot compensation will be enabled.
+//-   The approach is raw but delivers results (at 5 to 10 steps per discharge/charge)
+//-   within a couple of percent. Please take into account that any datasheet
+//-   formulas are idealistic. Neither capacitor, resistor, internal resistor
+//-   tolerances are taken into account. Nor are ambient temperature and chip
+//-   temperature. Thus the result is considered acceptable.
+//-   The datasheet states a maximum discharge of 200mA, this is not modelled
+//-   Instead an impedance of 1 Ohm is used.
+//-
 //- Example: ne555_astable.c,ne555_example
 //- FunctionTable:
 //-
@@ -49,8 +58,10 @@
 #include "netlist/analog/nlid_twoterm.h"
 #include "netlist/solver/nld_solver.h"
 
+#include "plib/pmath.h"
+
 #define R_OFF (1E20)
-#define R_ON (25)   // Datasheet states a maximum discharge of 200mA, R = 5V / 0.2
+#define R_ON  (1)
 
 namespace netlist
 {
@@ -64,13 +75,16 @@
 		, m_R3(*this, "R3")
 		, m_ROUT(*this, "ROUT")
 		, m_RDIS(*this, "RDIS")
-		, m_RESET(*this, "RESET")     // Pin 4
-		, m_THRES(*this, "THRESH")    // Pin 6
-		, m_TRIG(*this, "TRIG")       // Pin 2
+		, m_RESET(*this, "RESET", NETLIB_DELEGATE(inputs))     // Pin 4
+		, m_THRES(*this, "THRESH", NETLIB_DELEGATE(inputs))    // Pin 6
+		, m_TRIG(*this, "TRIG", NETLIB_DELEGATE(inputs))       // Pin 2
 		, m_OUT(*this, "_OUT")        // to Pin 3 via ROUT
 		, m_last_out(*this, "m_last_out", false)
 		, m_ff(*this, "m_ff", false)
 		, m_last_reset(*this, "m_last_reset", false)
+		, m_overshoot(*this, "m_overshoot", 0.0)
+		, m_undershoot(*this, "m_undershoot", 0.0)
+		, m_ovlimit(0.0)
 		{
 			register_subalias("GND",  m_R3.N());    // Pin 1
 			register_subalias("CONT", m_R1.N());    // Pin 5
@@ -84,10 +98,94 @@
 			connect(m_OUT, m_ROUT.N());
 		}
 
-		NETLIB_UPDATEI();
-		NETLIB_RESETI();
+		NETLIB_RESETI()
+		{
+			/* FIXME make resistances a parameter, properly model other variants */
+			m_R1.set_R(nlconst::magic(5000));
+			m_R2.set_R(nlconst::magic(5000));
+			m_R3.set_R(nlconst::magic(5000));
+			m_ROUT.set_R(nlconst::magic(20));
+			m_RDIS.set_R(nlconst::magic(R_OFF));
+
+			m_last_out = true;
+			// Check for astable setup, usually TRIG AND THRES connected. Enable
+			// overshoot compensation in this case.
+			if (m_TRIG.net() == m_THRES.net())
+				m_ovlimit = nlconst::magic(0.5);
+		}
 
 	private:
+		NETLIB_HANDLERI(inputs)
+		{
+			// FIXME: assumes GND is connected to 0V.
+
+			const auto reset = m_RESET();
+
+			const nl_fptype vthresh = clamp_hl(m_R2.P()(), nlconst::magic(0.7), nlconst::magic(1.4));
+			const nl_fptype vtrig = clamp_hl(m_R2.N()(), nlconst::magic(0.7), nlconst::magic(1.4));
+
+			// avoid artificial oscillation due to overshoot compensation when
+			// the control input is used.
+			const auto ovlimit = std::min(m_ovlimit, std::max(0.0, (vthresh - vtrig) / 3.0));
+
+			if (!reset && m_last_reset)
+			{
+				m_ff = false;
+			}
+			else
+			{
+#if (NL_USE_BACKWARD_EULER)
+				const bool bthresh = (m_THRES() + m_overshoot > vthresh);
+				const bool btrig = (m_TRIG() - m_overshoot > vtrig);
+#else
+				const bool bthresh = (m_THRES() + m_overshoot > vthresh);
+				const bool btrig = (m_TRIG() - m_undershoot > vtrig);
+#endif
+				if (!btrig)
+					m_ff = true;
+				else if (bthresh)
+				{
+					m_ff = false;
+				}
+			}
+
+			const bool out = (!reset ? false : m_ff);
+
+			if (m_last_out && !out)
+			{
+#if (NL_USE_BACKWARD_EULER)
+				m_overshoot += ((m_THRES() - vthresh)) * 2.0;
+#else
+				m_overshoot += ((m_THRES() - vthresh));
+#endif
+				m_overshoot = plib::clamp(m_overshoot(), nlconst::zero(), ovlimit);
+				//if (this->name() == "IC6_2")
+				//  printf("%f %s %f %f %f\n", exec().time().as_double(), this->name().c_str(), m_overshoot(), m_R2.P()(), m_THRES());
+				m_RDIS.change_state([this]()
+					{
+						m_RDIS.set_R(nlconst::magic(R_ON));
+					});
+				m_OUT.push(m_R3.N()());
+			}
+			else if (!m_last_out && out)
+			{
+#if (NL_USE_BACKWARD_EULER)
+				m_overshoot += (vtrig - m_TRIG()) * 2.0;
+				m_overshoot = plib::clamp(m_overshoot(), nlconst::zero(), ovlimit);
+#else
+				m_undershoot += (vtrig - m_TRIG());
+				m_undershoot = plib::clamp(m_undershoot(), nlconst::zero(), ovlimit);
+#endif
+				m_RDIS.change_state([this]()
+					{
+						m_RDIS.set_R(nlconst::magic(R_OFF));
+					});
+				// FIXME: Should be delayed by 100ns
+				m_OUT.push(m_R1.P()());
+			}
+			m_last_reset = reset;
+			m_last_out = out;
+		}
 		analog::NETLIB_SUB(R_base) m_R1;
 		analog::NETLIB_SUB(R_base) m_R2;
 		analog::NETLIB_SUB(R_base) m_R3;
@@ -102,17 +200,14 @@
 		state_var<bool> m_last_out;
 		state_var<bool> m_ff;
 		state_var<bool> m_last_reset;
+		state_var<nl_fptype> m_overshoot;
+		state_var<nl_fptype> m_undershoot;
+		nl_fptype m_ovlimit;
 
-		nl_fptype clamp(const nl_fptype v, const nl_fptype a, const nl_fptype b)
+		nl_fptype clamp_hl(const nl_fptype v, const nl_fptype a, const nl_fptype b) noexcept
 		{
-			nl_fptype ret = v;
-			nl_fptype vcc = m_R1.P()();
-
-			if (ret >  vcc - a)
-				ret = vcc - a;
-			if (ret < b)
-				ret = b;
-			return ret;
+			const nl_fptype vcc = m_R1.P()();
+			return plib::clamp(v, b, vcc - a);
 		}
 	};
 
@@ -134,64 +229,10 @@
 		// The reset on R_Base executed after NE555 reset will
 		// overwrite values.
 		NETLIB_RESETI() { A.reset(); }
-		NETLIB_UPDATEI() {  }
 	private:
 		NETLIB_SUB(NE555) A;
 	};
 
-	NETLIB_RESET(NE555)
-	{
-		/* FIXME make resistances a parameter, properly model other variants */
-		m_R1.set_R(nlconst::magic(5000));
-		m_R2.set_R(nlconst::magic(5000));
-		m_R3.set_R(nlconst::magic(5000));
-		m_ROUT.set_R(nlconst::magic(20));
-		m_RDIS.set_R(nlconst::magic(R_OFF));
-
-		m_last_out = true;
-	}
-
-	NETLIB_UPDATE(NE555)
-	{
-		// FIXME: assumes GND is connected to 0V.
-
-		const auto reset = m_RESET();
-
-		if (!reset && m_last_reset)
-		{
-			m_ff = false;
-		}
-		else
-		{
-			const nl_fptype vt = clamp(m_R2.P()(), nlconst::magic(0.7), nlconst::magic(1.4));
-			const bool bthresh = (m_THRES() > vt);
-			const bool btrig = (m_TRIG() > clamp(m_R2.N()(), nlconst::magic(0.7), nlconst::magic(1.4)));
-
-			if (!btrig)
-				m_ff = true;
-			else if (bthresh)
-				m_ff = false;
-		}
-
-		const bool out = (!reset ? false : m_ff);
-
-		if (m_last_out && !out)
-		{
-			m_RDIS.solve_now();
-			m_OUT.push(m_R3.N()());
-			m_RDIS.set_R(nlconst::magic(R_ON));
-		}
-		else if (!m_last_out && out)
-		{
-			m_RDIS.solve_now();
-			// FIXME: Should be delayed by 100ns
-			m_OUT.push(m_R1.P()());
-			m_RDIS.set_R(nlconst::magic(R_OFF));
-		}
-		m_last_reset = reset;
-		m_last_out = out;
-	}
-
 	NETLIB_DEVICE_IMPL(NE555,     "NE555", "")
 	NETLIB_DEVICE_IMPL(NE555_dip, "NE555_DIP", "")
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_r2r_dac.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_r2r_dac.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_r2r_dac.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_r2r_dac.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,45 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 /*
- * nld_R2R_dac.c
+ * nld_r2r_dac.cpp
+ *
+ *  DMR2R_DAC: R-2R DAC
+ *
+ *  Generic R-2R DAC ... This is fast.
+ *                 2R
+ *  Bit n    >----RRR----+---------> Vout
+ *                       |
+ *                       R
+ *                       R R
+ *                       R
+ *                       |
+ *                       .
+ *                       .
+ *                 2R    |
+ *  Bit 2    >----RRR----+
+ *                       |
+ *                       R
+ *                       R R
+ *                       R
+ *                       |
+ *                 2R    |
+ *  Bit 1    >----RRR----+
+ *                       |
+ *                       R
+ *                       R 2R
+ *                       R
+ *                       |
+ *                      V0
+ *
+ * Using Thevenin's Theorem, this can be written as
+ *
+ *          +---RRR-----------> Vout
+ *          |
+ *          V
+ *          V  V = VAL / 2^n * Vin
+ *          V
+ *          |
+ *          V0
  *
  */
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_r2r_dac.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_r2r_dac.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_r2r_dac.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_r2r_dac.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,47 +1,5 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
-/*
- * nld_R2R_DAC.h
- *
- *  DMR2R_DAC: R-2R DAC
- *
- *  Generic R-2R DAC ... This is fast.
- *                 2R
- *  Bit n    >----RRR----+---------> Vout
- *                       |
- *                       R
- *                       R R
- *                       R
- *                       |
- *                       .
- *                       .
- *                 2R    |
- *  Bit 2    >----RRR----+
- *                       |
- *                       R
- *                       R R
- *                       R
- *                       |
- *                 2R    |
- *  Bit 1    >----RRR----+
- *                       |
- *                       R
- *                       R 2R
- *                       R
- *                       |
- *                      V0
- *
- * Using Thevenin's Theorem, this can be written as
- *
- *          +---RRR-----------> Vout
- *          |
- *          V
- *          V  V = VAL / 2^n * Vin
- *          V
- *          |
- *          V0
- *
- */
 
 #ifndef NLD_R2R_DAC_H_
 #define NLD_R2R_DAC_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_roms.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_roms.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_roms.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_roms.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -24,6 +24,77 @@
 {
 	namespace devices
 	{
+		NETLIB_OBJECT(mk28000_prom)
+		{
+			NETLIB_CONSTRUCTOR(mk28000_prom)
+			, m_enable_lo(*this, "m_enable_lo", false)
+			, m_enable_hi(*this, "m_enable_hi", false)
+			, m_latched_rom(*this, "m_latched_rom", 0)
+			, m_A(*this, 1, "A{}", NETLIB_DELEGATE(addr))
+			, m_ARQ(*this, "ARQ", NETLIB_DELEGATE(addr))
+			, m_OE1(*this, "OE1", NETLIB_DELEGATE(oe1))
+			, m_OE2(*this, "OE2", NETLIB_DELEGATE(oe2))
+			, m_O(*this, 1, "O{}", 0)
+			, m_ROM(*this, "ROM")
+			, m_power_pins(*this)
+			{
+			}
+
+		private:
+			inline NETLIB_HANDLERI(oe1)
+			{
+				m_enable_lo = m_OE1();
+				uint8_t o = m_enable_lo ? m_latched_rom : 0;
+				for (std::size_t i=0; i<4; i++)
+				{
+					m_O.set_tristate(!m_enable_lo, NLTIME_FROM_NS(600), NLTIME_FROM_NS(600));
+					m_O[i].push((o >> i) & 1, NLTIME_FROM_NS(600));
+				}
+			}
+
+			inline NETLIB_HANDLERI(oe2)
+			{
+				m_enable_hi = m_OE2();
+				uint8_t o = m_enable_hi ? m_latched_rom : 0;
+				for (std::size_t i=4; i<8; i++)
+				{
+					m_O.set_tristate(!m_enable_hi, NLTIME_FROM_NS(600), NLTIME_FROM_NS(600));
+					m_O[i].push((o >> i) & 1, NLTIME_FROM_NS(600));
+				}
+			}
+
+			inline NETLIB_HANDLERI(addr)
+			{
+				if (!m_ARQ())
+				{
+					const auto addr = m_A();
+					m_latched_rom = m_ROM[addr];
+				}
+				uint8_t o = (m_enable_hi || m_enable_lo) ? m_latched_rom : 0;
+				for (std::size_t i=0; i<4; i++)
+				{
+					m_O.set_tristate(!m_enable_lo, NLTIME_FROM_NS(600), NLTIME_FROM_NS(600));
+					m_O[i].push((o >> i) & 1, NLTIME_FROM_NS(600));
+				}
+				for (std::size_t i=4; i<8; i++)
+				{
+					m_O.set_tristate(!m_enable_hi, NLTIME_FROM_NS(600), NLTIME_FROM_NS(600));
+					m_O[i].push((o >> i) & 1, NLTIME_FROM_NS(600));
+				}
+			}
+
+			state_var<bool> m_enable_lo;
+			state_var<bool> m_enable_hi;
+			state_var<uint8_t> m_latched_rom;
+			object_array_t<logic_input_t, 11> m_A;
+			logic_input_t m_ARQ;
+			logic_input_t m_OE1;
+			logic_input_t m_OE2;
+			object_array_t<tristate_output_t, 8> m_O;
+
+			param_rom_t<uint8_t, 11, 8> m_ROM;
+			nld_power_pins m_power_pins;
+		};
 
 		template <typename D>
 		NETLIB_OBJECT(generic_prom)
@@ -86,11 +157,6 @@
 				}
 			}
 
-			NETLIB_UPDATEI()
-			{
-				ce<0>(); // only called during setup
-			}
-
 			state_var<bool> m_enabled;
 			param_logic_t m_TE;
 			object_array_t<logic_input_t, D::address_width::value> m_A;
@@ -159,16 +225,17 @@
 			using output_id   =        desc_const<1>; // 0: logic, 1: tristate, 2: open collector
 		};
 
-
-	using NETLIB_NAME(82S123) = NETLIB_NAME(generic_prom)<desc_82S123>; // 256 bits, 32x8, used as 256x4
-	using NETLIB_NAME(82S126) = NETLIB_NAME(generic_prom)<desc_82S126>; // 1024 bits, 32x32, used as 256x4
-	using NETLIB_NAME(74S287) = NETLIB_NAME(generic_prom)<desc_74S287>; // 1024 bits, 32x32, used as 256x4
-	using NETLIB_NAME(2716)   = NETLIB_NAME(generic_prom)<desc_2716>;   // CE2Q = OE, CE1Q = CE
+	using NETLIB_NAME(82S123)  = NETLIB_NAME(generic_prom)<desc_82S123>; // 256 bits, 32x8, used as 256x4
+	using NETLIB_NAME(82S126)  = NETLIB_NAME(generic_prom)<desc_82S126>; // 1024 bits, 32x32, used as 256x4
+	using NETLIB_NAME(74S287)  = NETLIB_NAME(generic_prom)<desc_74S287>; // 1024 bits, 32x32, used as 256x4
+	using NETLIB_NAME(2716)    = NETLIB_NAME(generic_prom)<desc_2716>;   // CE2Q = OE, CE1Q = CE
+	using NETLIB_NAME(MK28000) = NETLIB_NAME(mk28000_prom);              // 16384 bits, either 2048x8 or 4096x4, determined by OE1/OE2 use
 
 	NETLIB_DEVICE_IMPL(82S126,     "PROM_82S126",     "+CE1Q,+CE2Q,+A0,+A1,+A2,+A3,+A4,+A5,+A6,+A7,@VCC,@GND")
 	NETLIB_DEVICE_IMPL(74S287,     "PROM_74S287",     "+CE1Q,+CE2Q,+A0,+A1,+A2,+A3,+A4,+A5,+A6,+A7,@VCC,@GND")
 	NETLIB_DEVICE_IMPL(82S123,     "PROM_82S123",     "+CEQ,+A0,+A1,+A2,+A3,+A4,@VCC,@GND")
 	NETLIB_DEVICE_IMPL(2716,       "EPROM_2716",      "+CE2Q,+CE1Q,+A0,+A1,+A2,+A3,+A4,+A5,+A6,+A7,+A8,+A9,+A10,@VCC,@GND")
+	NETLIB_DEVICE_IMPL(MK28000,    "PROM_MK28000",    "+OE1,+OE2,+ARQ,+A1,+A2,+A3,+A4,+A5,+A6,+A7,+A8,+A9,+A10,+A11,@VCC,@GND")
 
 	} //namespace devices
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_roms.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_roms.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_roms.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_roms.h	2020-08-26 08:57:19.000000000 +0000
@@ -26,4 +26,8 @@
 #define EPROM_2716(...) \
 		NET_REGISTER_DEVEXT(EPROM_2716, __VA_ARGS__)
 
+// PROM_MK28000(name, cOE1, cOE2, cAR, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cA10, cA11)
+#define PROM_MK28000(...) \
+		NET_REGISTER_DEVEXT(PROM_MK28000, __VA_ARGS__)
+
 #endif /* NLD_ROMS_H_ */
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_schmitt.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_schmitt.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_schmitt.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_schmitt.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -8,7 +8,6 @@
 #include "nld_schmitt.h"
 
 #include "netlist/analog/nlid_twoterm.h"
-#include "netlist/devices/nlid_system.h"
 #include "netlist/nl_base.h"
 #include "netlist/nl_errstr.h"
 #include "netlist/solver/nld_solver.h"
@@ -60,7 +59,7 @@
 		NETLIB_OBJECT(schmitt_trigger)
 		{
 			NETLIB_CONSTRUCTOR(schmitt_trigger)
-				, m_A(*this, "A")
+				, m_A(*this, "A", NETLIB_DELEGATE(input))
 				, m_supply(*this)
 				, m_RVI(*this, "RVI")
 				, m_RVO(*this, "RVO")
@@ -85,7 +84,8 @@
 				m_RVO.set_G_V_I(plib::reciprocal(m_modacc.m_ROL()), m_modacc.m_VOL, nlconst::zero());
 			}
 
-			NETLIB_UPDATEI()
+		private:
+			NETLIB_HANDLERI(input)
 			{
 				const auto va(m_A.Q_Analog() - m_supply.GND().Q_Analog());
 				if (m_last_state)
@@ -112,7 +112,6 @@
 				}
 			}
 
-		private:
 			analog_input_t m_A;
 			NETLIB_NAME(power_pins) m_supply;
 			analog::NETLIB_SUB(twoterm) m_RVI;
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_system.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_system.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_system.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_system.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -13,57 +13,15 @@
 {
 namespace devices
 {
-	// ----------------------------------------------------------------------------------------
-	// netlistparams
-	// ----------------------------------------------------------------------------------------
-
-
-	// ----------------------------------------------------------------------------------------
-	// extclock
-	// ----------------------------------------------------------------------------------------
-
-	NETLIB_RESET(extclock)
-	{
-		m_cnt = 0;
-		m_off = netlist_time::from_fp<decltype(m_offset())>(m_offset());
-		m_feedback.set_delegate(NETLIB_DELEGATE(update));
-	}
-
-	NETLIB_HANDLER(extclock, clk2)
-	{
-		m_Q.push((m_cnt & 1) ^ 1, m_inc[m_cnt]);
-		if (++m_cnt >= m_size)
-			m_cnt = 0;
-	}
-
-	NETLIB_HANDLER(extclock, clk2_pow2)
-	{
-		m_Q.push((m_cnt & 1) ^ 1, m_inc[m_cnt]);
-		m_cnt = (++m_cnt) & (m_size-1);
-	}
-
-	NETLIB_UPDATE(extclock)
-	{
-		m_Q.push((m_cnt & 1) ^ 1, m_inc[m_cnt] + m_off());
-		m_off = netlist_time::zero();
-		if (++m_cnt >= m_size)
-			m_cnt = 0;
-
-		// continue with optimized clock handlers ....
-
-		if ((m_size & (m_size-1)) == 0) // power of 2?
-			m_feedback.set_delegate(nldelegate(&NETLIB_NAME(extclock)::clk2_pow2, this));
-		else
-			m_feedback.set_delegate(nldelegate(&NETLIB_NAME(extclock)::clk2, this));
-	}
-
 
+	NETLIB_DEVICE_IMPL(netlistparams,       "PARAMETER",              "")
 	NETLIB_DEVICE_IMPL(nc_pin,              "NC_PIN",                 "")
+
 	NETLIB_DEVICE_IMPL(frontier,            "FRONTIER_DEV",           "+I,+G,+Q")
 	NETLIB_DEVICE_IMPL(function,            "AFUNC",                  "N,FUNC")
 	NETLIB_DEVICE_IMPL(analog_input,        "ANALOG_INPUT",           "IN")
 	NETLIB_DEVICE_IMPL(clock,               "CLOCK",                  "FREQ")
-	NETLIB_DEVICE_IMPL(varclock,            "VARCLOCK",               "FUNC")
+	NETLIB_DEVICE_IMPL(varclock,            "VARCLOCK",               "N,FUNC")
 	NETLIB_DEVICE_IMPL(extclock,            "EXTCLOCK",               "FREQ,PATTERN")
 	NETLIB_DEVICE_IMPL(sys_dsw1,            "SYS_DSW",                "+I,+1,+2")
 	NETLIB_DEVICE_IMPL(sys_dsw2,            "SYS_DSW2",               "")
@@ -79,7 +37,6 @@
 
 	NETLIB_DEVICE_IMPL(mainclock,           "MAINCLOCK",              "FREQ")
 	NETLIB_DEVICE_IMPL(gnd,                 "GNDA",                   "")
-	NETLIB_DEVICE_IMPL(netlistparams,       "PARAMETER",              "")
 
 	using NETLIB_NAME(logic_input8) = NETLIB_NAME(logic_inputN)<8>;
 	NETLIB_DEVICE_IMPL(logic_input8,         "LOGIC_INPUT8",            "IN,MODEL")
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_system.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_system.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_system.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_system.h	2020-08-26 08:57:19.000000000 +0000
@@ -40,8 +40,9 @@
 		NET_REGISTER_DEV(CLOCK, name)                                           \
 		PARAM(name.FREQ, freq)
 
-#define VARCLOCK(name, func)                                                    \
+#define VARCLOCK(name, n, func)                                                 \
 		NET_REGISTER_DEV(VARCLOCK, name)                                        \
+		PARAM(name.N, n)                                                        \
 		PARAM(name.FUNC, func)
 
 #define EXTCLOCK(name, freq, pattern)                                           \
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_tms4800.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_tms4800.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_tms4800.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_tms4800.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,10 +3,29 @@
 /*
  * nld_tms4800.cpp
  *
+ *  TMS-4800: 16 Kbit (2Kb x 8) READ ONLY MEMORY
+ *
+ *          +----------------+
+ *      VSS |1      ++     24| OE1
+ *       A1 |2             23| O1
+ *       A2 |3             22| O2
+ *       A3 |4   TMS-4800  21| O3
+ *       A4 |5             20| O4
+ *       A5 |6             19| O5
+ *       A6 |7             18| O6
+ *      A10 |8             17| O7
+ *      VGG |9             16| O8
+ *       A9 |10            15| A11
+ *       A8 |11            14| OE2
+ *       A7 |12            13| AR
+ *          +----------------+
+ *
+ *
+ *  Naming conventions follow Texas Instruments datasheet:
+ *  http://bitsavers.trailing-edge.com/components/ti/_dataBooks/1975_TI_The_Semiconductor_Memory_Data_Book.pdf
  */
 
 #include "nld_tms4800.h"
-#include "netlist/devices/nlid_system.h"
 #include "netlist/nl_base.h"
 
 namespace netlist
@@ -16,10 +35,10 @@
 	NETLIB_OBJECT(TMS4800)
 	{
 		NETLIB_CONSTRUCTOR(TMS4800)
-		, m_A(*this, { "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10" })
-		, m_AR(*this, "AR")
-		, m_OE1(*this, "OE1")
-		, m_OE2(*this, "OE2")
+		, m_A(*this, { "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8", "A9", "A10" }, NETLIB_DELEGATE(inputs))
+		, m_AR(*this, "AR", NETLIB_DELEGATE(inputs))
+		, m_OE1(*this, "OE1", NETLIB_DELEGATE(inputs))
+		, m_OE2(*this, "OE2", NETLIB_DELEGATE(inputs))
 		, m_D(*this, { "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7" })
 		, m_last_data(*this, "m_last_data", 1)
 		, m_ROM(*this, "ROM")
@@ -27,10 +46,35 @@
 		{
 		}
 
-		NETLIB_UPDATEI();
-
 		friend class NETLIB_NAME(TMS4800_dip);
 	private:
+		// FIXME: timing!
+		// FIXME: CS: The code looks odd, looks like m_last_data should be pushed out.
+		NETLIB_HANDLERI(inputs)
+		{
+			netlist_time delay = NLTIME_FROM_NS(450);
+			if (m_AR())
+			{
+				unsigned a = 0;
+				for (std::size_t i=0; i<11; i++)
+					a |= (m_A[i]() << i);
+
+				m_last_data = m_ROM[a];
+			}
+			else
+			{
+				unsigned d = 0x00;
+				for (std::size_t i=0; i<4; i++)
+				{
+					if (m_OE1())
+						m_D[i].push((d >> i) & 1, delay);
+
+					if (m_OE2())
+						m_D[i+4].push((d >> (i+4)) & 1, delay);
+				}
+			}
+		}
+
 		object_array_t<logic_input_t, 11> m_A;
 		logic_input_t m_AR;
 		logic_input_t m_OE1;
@@ -74,40 +118,12 @@
 			register_subalias("17",     A.m_D[6]);
 			register_subalias("16",     A.m_D[7]);
 		}
-		NETLIB_RESETI() {}
-		NETLIB_UPDATEI() {}
+		//NETLIB_RESETI() {}
 	private:
 		NETLIB_SUB(TMS4800) A;
 
 	};
 
-	// FIXME: timing!
-	// FIXME: CS: The code looks odd, looks like m_last_data should be pushed out.
-	NETLIB_UPDATE(TMS4800)
-	{
-		netlist_time delay = NLTIME_FROM_NS(450);
-		if (m_AR())
-		{
-			unsigned a = 0;
-			for (std::size_t i=0; i<11; i++)
-				a |= (m_A[i]() << i);
-
-			m_last_data = m_ROM[a];
-		}
-		else
-		{
-			unsigned d = 0x00;
-			for (std::size_t i=0; i<4; i++)
-			{
-				if (m_OE1())
-					m_D[i].push((d >> i) & 1, delay);
-
-				if (m_OE2())
-					m_D[i+4].push((d >> (i+4)) & 1, delay);
-			}
-		}
-	}
-
 	NETLIB_DEVICE_IMPL(TMS4800,     "ROM_TMS4800",     "+AR,+OE1,+OE2,+A0,+A1,+A2,+A3,+A4,+A5,+A6,+A7,+A8,+A9,+A10,@VCC,@GND")
 	NETLIB_DEVICE_IMPL(TMS4800_dip, "ROM_TMS4800_DIP", "")
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_tms4800.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_tms4800.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_tms4800.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_tms4800.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,29 +1,5 @@
 // license:BSD-3-Clause
 // copyright-holders:Felipe Sanches
-/*
- * nld_tms4800.h
- *
- *  TMS-4800: 16 Kbit (2Kb x 8) READ ONLY MEMORY
- *
- *          +----------------+
- *      VSS |1      ++     24| OE1
- *       A1 |2             23| O1
- *       A2 |3             22| O2
- *       A3 |4   TMS-4800  21| O3
- *       A4 |5             20| O4
- *       A5 |6             19| O5
- *       A6 |7             18| O6
- *      A10 |8             17| O7
- *      VGG |9             16| O8
- *       A9 |10            15| A11
- *       A8 |11            14| OE2
- *       A7 |12            13| AR
- *          +----------------+
- *
- *
- *  Naming conventions follow Texas Instruments datasheet:
- *  http://bitsavers.trailing-edge.com/components/ti/_dataBooks/1975_TI_The_Semiconductor_Memory_Data_Book.pdf
- */
 
 #ifndef NLD_TMS4800_H_
 #define NLD_TMS4800_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_tristate.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nld_tristate.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_tristate.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_tristate.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,11 +3,16 @@
 /*
  * nld_tristate.cpp
  *
+ *  tristate: Hack to merge two tri-stated outputs together
+ *
  */
 
 #include "nld_tristate.h"
 #include "netlist/nl_base.h"
 
+// FIXME: netlist now supports proper tristate outputs. All of this is legacy
+//        now and needs to be removed at some time.
+
 namespace netlist
 {
 	namespace devices
@@ -15,60 +20,56 @@
 	NETLIB_OBJECT(tristate)
 	{
 		NETLIB_CONSTRUCTOR(tristate)
-		, m_CEQ(*this, { "CEQ1", "CEQ2" })
-		, m_D(*this, { "D1", "D2" })
+		, m_CEQ(*this, { "CEQ1", "CEQ2" }, NETLIB_DELEGATE(inputs))
+		, m_D(*this, { "D1", "D2" }, NETLIB_DELEGATE(inputs))
 		, m_Q(*this, "Q")
 		{
 		}
 
-		NETLIB_UPDATEI();
-
 	protected:
 		object_array_t<logic_input_t, 2> m_CEQ;
 		object_array_t<logic_input_t, 2> m_D;
 		logic_output_t m_Q;
+	private:
+		NETLIB_HANDLERI(inputs)
+		{
+			unsigned q = 0;
+			if (!m_CEQ[0]())
+				q |= m_D[0]();
+			if (!m_CEQ[1]())
+				q |= m_D[1]();
+
+			m_Q.push(q, NLTIME_FROM_NS(1));
+		}
 	};
 
 	NETLIB_OBJECT(tristate3)
 	{
 		NETLIB_CONSTRUCTOR(tristate3)
-		, m_CEQ(*this, { "CEQ1", "CEQ2", "CEQ3" } )
-		, m_D(*this, { "D1", "D2", "D3" } )
+		, m_CEQ(*this, { "CEQ1", "CEQ2", "CEQ3" }, NETLIB_DELEGATE(inputs) )
+		, m_D(*this, { "D1", "D2", "D3" }, NETLIB_DELEGATE(inputs) )
 		, m_Q(*this, "Q")
 		{
 		}
 
-		NETLIB_UPDATEI();
-
 	protected:
 		object_array_t<logic_input_t, 3> m_CEQ;
 		object_array_t<logic_input_t, 3> m_D;
 		logic_output_t m_Q;
-	};
-
-	NETLIB_UPDATE(tristate)
-	{
-		unsigned q = 0;
-		if (!m_CEQ[0]())
-			q |= m_D[0]();
-		if (!m_CEQ[1]())
-			q |= m_D[1]();
-
-		m_Q.push(q, NLTIME_FROM_NS(1));
-	}
-
-	NETLIB_UPDATE(tristate3)
-	{
-		unsigned q = 0;
-		if (!m_CEQ[0]())
-			q |= m_D[0]();
-		if (!m_CEQ[1]())
-			q |= m_D[1]();
-		if (!m_CEQ[2]())
-			q |= m_D[2]();
+	private:
+		NETLIB_HANDLERI(inputs)
+		{
+			unsigned q = 0;
+			if (!m_CEQ[0]())
+				q |= m_D[0]();
+			if (!m_CEQ[1]())
+				q |= m_D[1]();
+			if (!m_CEQ[2]())
+				q |= m_D[2]();
 
-		m_Q.push(q, NLTIME_FROM_NS(1));
-	}
+			m_Q.push(q, NLTIME_FROM_NS(1));
+		}
+	};
 
 	NETLIB_DEVICE_IMPL(tristate,  "TTL_TRISTATE",  "+CEQ1,+D1,+CEQ2,+D2")
 	NETLIB_DEVICE_IMPL(tristate3, "TTL_TRISTATE3", "")
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nld_tristate.h mame-0.224+dfsg.1/src/lib/netlist/devices/nld_tristate.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nld_tristate.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nld_tristate.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,11 +1,5 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-/*
- * nld_tristate.h
- *
- *  tristate: Hack to merge two tri-stated outputs together
- *
- */
 
 #ifndef NLD_TRISTATE_H_
 #define NLD_TRISTATE_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nlid_proxy.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nlid_proxy.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nlid_proxy.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nlid_proxy.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -6,6 +6,7 @@
  */
 
 #include "nlid_proxy.h"
+#include "core/setup.h"
 #include "nl_errstr.h"
 #include "solver/nld_solver.h"
 
@@ -84,15 +85,11 @@
 	nld_a_to_d_proxy::nld_a_to_d_proxy(netlist_state_t &anetlist, const pstring &name, const logic_input_t *in_proxied)
 	: nld_base_a_to_d_proxy(anetlist, name, in_proxied)
 	, m_Q(*this, "Q")
-	, m_I(*this, "I")
+	, m_I(*this, "I", nldelegate(&nld_a_to_d_proxy::input, this))
 	{
 	}
 
-	NETLIB_RESET(a_to_d_proxy)
-	{
-	}
-
-	NETLIB_UPDATE(a_to_d_proxy)
+	NETLIB_HANDLER(a_to_d_proxy, input)
 	{
 		const auto v(m_I.Q_Analog());
 		const auto vn(m_tn->net().Q_Analog());
@@ -120,7 +117,7 @@
 
 	nld_d_to_a_proxy::nld_d_to_a_proxy(netlist_state_t &anetlist, const pstring &name, const logic_output_t *out_proxied)
 	: nld_base_d_to_a_proxy(anetlist, name, out_proxied)
-	, m_I(*this, "I")
+	, m_I(*this, "I", nldelegate(&nld_d_to_a_proxy :: input, this))
 	, m_RP(*this, "RP")
 	, m_RN(*this, "RN")
 	, m_last_state(*this, "m_last_var", terminal_t::OUT_TRISTATE())
@@ -157,7 +154,7 @@
 			nlconst::zero());
 	}
 
-	NETLIB_UPDATE(d_to_a_proxy)
+	NETLIB_HANDLER(d_to_a_proxy ,input)
 	{
 		const auto state = m_I();
 		if (state != m_last_state)
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nlid_proxy.h mame-0.224+dfsg.1/src/lib/netlist/devices/nlid_proxy.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nlid_proxy.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nlid_proxy.h	2020-08-26 08:57:19.000000000 +0000
@@ -69,10 +69,10 @@
 		}
 
 	protected:
-		NETLIB_RESETI();
-		NETLIB_UPDATEI();
-
+		//NETLIB_RESETI();
 	private:
+		NETLIB_HANDLERI(input);
+
 		logic_output_t m_Q;
 		analog_input_t m_I;
 	};
@@ -109,9 +109,9 @@
 	protected:
 
 		NETLIB_RESETI();
-		NETLIB_UPDATEI();
 
 	private:
+		NETLIB_HANDLERI(input);
 
 		static constexpr const nl_fptype G_OFF = nlconst::cgmin();
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nlid_system.h mame-0.224+dfsg.1/src/lib/netlist/devices/nlid_system.h
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nlid_system.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nlid_system.h	2020-08-26 08:57:19.000000000 +0000
@@ -11,6 +11,7 @@
 #include "netlist/nl_base.h"
 #include "netlist/nl_factory.h"
 #include "netlist/plib/prandom.h"
+#include "netlist/plib/pstonum.h"
 #include "netlist/plib/putil.h"
 
 #include <random>
@@ -20,37 +21,13 @@
 namespace devices
 {
 	// -----------------------------------------------------------------------------
-	// netlistparams
-	// -----------------------------------------------------------------------------
-
-	NETLIB_OBJECT(netlistparams)
-	{
-		NETLIB_CONSTRUCTOR(netlistparams)
-		, m_use_deactivate(*this, "USE_DEACTIVATE", false)
-		, m_startup_strategy(*this, "STARTUP_STRATEGY", 1)
-		, m_mos_capmodel(*this, "DEFAULT_MOS_CAPMODEL", 2)
-		, m_max_link_loops(*this, "MAX_LINK_RESOLVE_LOOPS", 100)
-		{
-		}
-		NETLIB_UPDATEI() { }
-		//NETLIB_RESETI() { }
-		//NETLIB_UPDATE_PARAMI() { }
-	public:
-		param_logic_t m_use_deactivate;
-		param_num_t<unsigned>   m_startup_strategy;
-		param_num_t<unsigned>   m_mos_capmodel;
-		//! How many times do we try to resolve links (connections)
-		param_num_t<unsigned>   m_max_link_loops;
-	};
-
-	// -----------------------------------------------------------------------------
 	// clock
 	// -----------------------------------------------------------------------------
 
 	NETLIB_OBJECT(clock)
 	{
 		NETLIB_CONSTRUCTOR(clock)
-		, m_feedback(*this, "FB")
+		, m_feedback(*this, "FB", NETLIB_DELEGATE(fb))
 		, m_Q(*this, "Q")
 		, m_freq(*this, "FREQ", nlconst::magic(7159000.0 * 5.0))
 		, m_supply(*this)
@@ -65,7 +42,7 @@
 			m_inc = netlist_time::from_fp(plib::reciprocal(m_freq()*nlconst::two()));
 		}
 
-		NETLIB_UPDATEI()
+		NETLIB_HANDLERI(fb)
 		{
 			m_Q.push(m_feedback() ^ 1, m_inc);
 		}
@@ -87,33 +64,55 @@
 	NETLIB_OBJECT(varclock)
 	{
 		NETLIB_CONSTRUCTOR(varclock)
-		, m_feedback(*this, "FB")
+		, m_N(*this, "N", 1)
+		, m_func(*this,"FUNC", "T")
+		, m_feedback(*this, "FB", NETLIB_DELEGATE(fb))
 		, m_Q(*this, "Q")
-		, m_func(*this,"FUNC", "")
 		, m_compiled(*this, "m_compiled")
-		, m_funcparam({nlconst::zero()})
+		, m_supply(*this)
 		{
 			if (!m_func().empty())
-				m_compiled->compile(m_func(), std::vector<pstring>({{pstring("T")}}));
+			{
+				std::vector<pstring> inps;
+				inps.push_back(pstring("T"));
+				m_vals.push_back(nlconst::zero());
+				for (int i=0; i < m_N(); i++)
+				{
+					pstring inpname = plib::pfmt("A{1}")(i);
+					m_I.push_back(owner.template make_pool_object<analog_input_t>(*this, inpname, NETLIB_DELEGATE(fb)));
+					inps.push_back(inpname);
+					m_vals.push_back(nlconst::zero());
+				}
+				m_compiled->compile(m_func(), inps);
+			}
 			connect(m_feedback, m_Q);
 		}
 		//NETLIB_RESETI();
 		//NETLIB_UPDATE_PARAMI()
 
-		NETLIB_UPDATEI()
+	private:
+		NETLIB_HANDLERI(fb)
 		{
-			m_funcparam[0] = exec().time().as_fp<nl_fptype>();
-			const netlist_time m_inc = netlist_time::from_fp(m_compiled->evaluate(m_funcparam));
+			m_vals[0] = exec().time().as_fp<nl_fptype>();
+			for (std::size_t i = 0; i < static_cast<unsigned>(m_N()); i++)
+			{
+				m_vals[i+1] = (*m_I[i])();
+			}
+			const netlist_time m_inc = netlist_time::from_fp(m_compiled->evaluate(m_vals));
 			m_Q.push(m_feedback() ^ 1, m_inc);
 		}
 
-	private:
+		using pf_type = plib::pfunction<nl_fptype>;
+		param_int_t m_N;
+		param_str_t m_func;
 		logic_input_t m_feedback;
 		logic_output_t m_Q;
+		std::vector<device_arena::unique_ptr<analog_input_t>> m_I;
 
-		param_str_t m_func;
-		state_var<plib::pfunction<nl_fptype>> m_compiled;
-		std::vector<nl_fptype> m_funcparam;
+		pf_type::values_container m_vals;
+		state_var<pf_type> m_compiled;
+
+		NETLIB_NAME(power_pins) m_supply;
 	};
 
 	// -----------------------------------------------------------------------------
@@ -126,7 +125,7 @@
 		, m_freq(*this, "FREQ", nlconst::magic(7159000.0 * 5.0))
 		, m_pattern(*this, "PATTERN", "1,1")
 		, m_offset(*this, "OFFSET", nlconst::zero())
-		, m_feedback(*this, "FB")
+		, m_feedback(*this, "FB", NETLIB_DELEGATE(first))
 		, m_Q(*this, "Q")
 		, m_cnt(*this, "m_cnt", 0)
 		, m_off(*this, "m_off", netlist_time::zero())
@@ -159,15 +158,45 @@
 
 		}
 
-		NETLIB_UPDATEI();
-		NETLIB_RESETI();
+		NETLIB_RESETI()
+		{
+			m_cnt = 0;
+			m_off = netlist_time::from_fp<decltype(m_offset())>(m_offset());
+			m_feedback.set_delegate(NETLIB_DELEGATE(first));
+		}
 		//NETLIB_UPDATE_PARAMI();
 
-		NETLIB_HANDLERI(clk2);
-		NETLIB_HANDLERI(clk2_pow2);
-
 	private:
 
+		NETLIB_HANDLERI(clk2)
+		{
+			m_Q.push((m_cnt & 1) ^ 1, m_inc[m_cnt]);
+			if (++m_cnt >= m_size)
+				m_cnt = 0;
+		}
+
+		NETLIB_HANDLERI(clk2_pow2)
+		{
+			m_Q.push((m_cnt & 1) ^ 1, m_inc[m_cnt]);
+			m_cnt = (++m_cnt) & (m_size-1);
+		}
+
+		NETLIB_HANDLERI(first)
+		{
+			m_Q.push((m_cnt & 1) ^ 1, m_inc[m_cnt] + m_off());
+			m_off = netlist_time::zero();
+			if (++m_cnt >= m_size)
+				m_cnt = 0;
+
+			// continue with optimized clock handlers ....
+
+			if ((m_size & (m_size-1)) == 0) // power of 2?
+				m_feedback.set_delegate(nldelegate(&NETLIB_NAME(extclock)::clk2_pow2, this));
+			else
+				m_feedback.set_delegate(nldelegate(&NETLIB_NAME(extclock)::clk2, this));
+		}
+
+
 		param_fp_t m_freq;
 		param_str_t m_pattern;
 		param_fp_t m_offset;
@@ -193,7 +222,6 @@
 		{
 		}
 
-		NETLIB_UPDATEI() { }
 		NETLIB_RESETI() { m_Q.initial(0); }
 		NETLIB_UPDATE_PARAMI()
 		{
@@ -218,7 +246,6 @@
 		{
 		}
 
-		NETLIB_UPDATEI() { }
 		NETLIB_RESETI() { for (auto &q : m_Q) q.initial(0); }
 		NETLIB_UPDATE_PARAMI()
 		{
@@ -242,7 +269,6 @@
 		{
 		}
 
-		NETLIB_UPDATEI() {  }
 		NETLIB_RESETI() { m_Q.initial(nlconst::zero()); }
 		NETLIB_UPDATE_PARAMI() { m_Q.push(m_IN()); }
 
@@ -251,57 +277,71 @@
 		param_fp_t m_IN;
 	};
 
-	// -----------------------------------------------------------------------------
-	// nld_gnd
-	// -----------------------------------------------------------------------------
-
-	NETLIB_OBJECT(gnd)
-	{
-		NETLIB_CONSTRUCTOR(gnd)
-		, m_Q(*this, "Q")
-		{
-		}
-		NETLIB_UPDATEI()
-		{
-			m_Q.push(nlconst::zero());
-		}
-		NETLIB_RESETI() { }
-	protected:
-		analog_output_t m_Q;
-	};
 
 	// -----------------------------------------------------------------------------
-	// nld_nc_pin
+	// nld_frontier
 	// -----------------------------------------------------------------------------
 
-	NETLIB_OBJECT(nc_pin)
-	{
-	public:
-		NETLIB_CONSTRUCTOR(nc_pin)
-		, m_I(*this, "I")
-		{
-		}
-
-	protected:
-		NETLIB_RESETI() { }
-		NETLIB_UPDATEI() { }
 
-	private:
-		analog_input_t m_I;
-
-	};
-
-	// -----------------------------------------------------------------------------
-	// nld_frontier
-	// -----------------------------------------------------------------------------
+	/// \brief Frontiers divides a netlist into sub netlist
+	///
+	/// Example:
+	///
+	/// Consider the following mixing stage
+	///
+	///                 R1
+	///      S1 >-----1RRRR2---------+
+	///                              |
+	///                 R2           |
+	///      S2 >-----1RRRR2---------+----------> Out
+	///                              |
+	///                              R
+	///                           R3 R
+	///                              R
+	///                              |
+	///                             GND
+	///
+	/// With OPTIMIZE_FRONTIER(R2.2, R3, R2) this becomes:
+	///
+	///                 R1
+	///      S1 >-----1RRRR2--------------------------------+
+	///                                                     |
+	///                       ##########################    |
+	///                 R2    #                    R2  #    |
+	///      S2 >-----1RRRR2-----+-->AnIn AnOut>--RRRR------+----------> Out
+	///                       #  |                     #    |
+	///                       #  R                     #    R
+	///                       #  R R3                  # R3 R
+	///                       #  R                     #    R
+	///                       #  |                     #    |
+	///                       # GND          Frontier  #   GND
+	///                       #                        #
+	///                       ##########################
+	///
+	/// As a result, provided there are no other connections between the parts
+	/// generating S1 and S2 the "S2 part" will now have a separate solver.
+	///
+	/// The size (aka number of nets) of the solver for S1 will be smaller.
+	/// The size of the solver for S2 and the rest of the circuit will be smaller
+	/// as well.
+	///
+	///
+	///
+	///
+	///
+	///
+	///
+	///
+	///
+	///
 
 	NETLIB_OBJECT(frontier)
 	{
 	public:
 		NETLIB_CONSTRUCTOR(frontier)
-		, m_RIN(*this, "m_RIN", true)
-		, m_ROUT(*this, "m_ROUT", true)
-		, m_I(*this, "_I")
+		, m_RIN(*this, "m_RIN", NETLIB_DELEGATE(input))
+		, m_ROUT(*this, "m_ROUT", NETLIB_DELEGATE(input))
+		, m_I(*this, "_I", NETLIB_DELEGATE(input))
 		, m_Q(*this, "_Q")
 		, m_p_RIN(*this, "RIN", nlconst::magic(1.0e6))
 		, m_p_ROUT(*this, "ROUT", nlconst::magic(50.0))
@@ -322,12 +362,12 @@
 			m_ROUT.set_G_V_I(plib::reciprocal(m_p_ROUT()),0,0);
 		}
 
-		NETLIB_UPDATEI()
+	private:
+		NETLIB_HANDLERI(input)
 		{
 			m_Q.push(m_I());
 		}
 
-	private:
 		analog::NETLIB_NAME(twoterm) m_RIN;
 		analog::NETLIB_NAME(twoterm) m_ROUT;
 		analog_input_t m_I;
@@ -346,14 +386,16 @@
 		NETLIB_CONSTRUCTOR(function)
 		, m_N(*this, "N", 1)
 		, m_func(*this, "FUNC", "A0")
+		, m_thresh(*this, "THRESH", nlconst::zero())
 		, m_Q(*this, "Q")
 		, m_compiled(*this, "m_compiled")
+		, m_last(*this, "m_last")
 		{
 			std::vector<pstring> inps;
 			for (int i=0; i < m_N(); i++)
 			{
 				pstring inpname = plib::pfmt("A{1}")(i);
-				m_I.push_back(state().make_pool_object<analog_input_t>(*this, inpname));
+				m_I.push_back(owner.template make_pool_object<analog_input_t>(*this, inpname, NETLIB_DELEGATE(inputs)));
 				inps.push_back(inpname);
 				m_vals.push_back(nlconst::zero());
 			}
@@ -366,24 +408,31 @@
 			//m_Q.initial(0.0);
 		}
 
-		NETLIB_UPDATEI()
+		NETLIB_HANDLERI(inputs)
 		{
 			for (std::size_t i = 0; i < static_cast<unsigned>(m_N()); i++)
 			{
 				m_vals[i] = (*m_I[i])();
 			}
-			m_Q.push(m_compiled->evaluate(m_vals));
+			auto result = m_compiled->evaluate(m_vals);
+			if (plib::abs(m_last - result) >= m_thresh)
+			{
+				m_Q.push(result);
+				m_last = result;
+			}
 		}
 
 	private:
 		using pf_type = plib::pfunction<nl_fptype>;
 		param_int_t m_N;
 		param_str_t m_func;
+		param_fp_t m_thresh;
 		analog_output_t m_Q;
 		std::vector<device_arena::unique_ptr<analog_input_t>> m_I;
 
 		pf_type::values_container m_vals;
 		state_var<pf_type> m_compiled;
+		state_var<nl_fptype> m_last;
 
 	};
 
@@ -398,7 +447,7 @@
 		, m_RON(*this, "RON", nlconst::one())
 		, m_ROFF(*this, "ROFF", nlconst::magic(1.0E20))
 		, m_R(*this, "_R")
-		, m_I(*this, "I")
+		, m_I(*this, "I", NETLIB_DELEGATE(input))
 		, m_last_state(*this, "m_last_state", 0)
 		{
 			register_subalias("1", m_R.P());
@@ -411,7 +460,19 @@
 			m_R.set_R(m_ROFF());
 		}
 
-		NETLIB_UPDATEI()
+		//NETLIB_UPDATE_PARAMI();
+
+		//FIXME: used by 74123
+
+		const terminal_t &P() const noexcept { return m_R.P(); }
+		const terminal_t &N() const noexcept { return m_R.N(); }
+		const logic_input_t &I() const noexcept { return m_I; }
+
+		param_fp_t m_RON;
+		param_fp_t m_ROFF;
+
+	private:
+		NETLIB_HANDLERI(input)
 		{
 			const netlist_sig_t state = m_I();
 			if (state != m_last_state)
@@ -426,18 +487,6 @@
 			}
 		}
 
-		//NETLIB_UPDATE_PARAMI();
-
-		//FIXME: used by 74123
-
-		const terminal_t &P() const noexcept { return m_R.P(); }
-		const terminal_t &N() const noexcept { return m_R.N(); }
-		const logic_input_t &I() const noexcept { return m_I; }
-
-		param_fp_t m_RON;
-		param_fp_t m_ROFF;
-
-	private:
 		analog::NETLIB_SUB(R_base) m_R;
 		logic_input_t m_I;
 
@@ -454,7 +503,7 @@
 		NETLIB_CONSTRUCTOR(sys_dsw2)
 		, m_R1(*this, "_R1")
 		, m_R2(*this, "_R2")
-		, m_I(*this, "I")
+		, m_I(*this, "I", NETLIB_DELEGATE(input))
 		, m_GON(*this, "GON", nlconst::magic(1e9)) // FIXME: all switches should have some on value
 		, m_GOFF(*this, "GOFF", nlconst::cgmin())
 		, m_power_pins(*this)
@@ -472,7 +521,10 @@
 			m_R2.set_G(m_GON());
 		}
 
-		NETLIB_UPDATEI()
+		//NETLIB_UPDATE_PARAMI();
+
+	private:
+		NETLIB_HANDLERI(input)
 		{
 			const netlist_sig_t state = m_I();
 
@@ -500,9 +552,6 @@
 			}
 		}
 
-		//NETLIB_UPDATE_PARAMI();
-
-	private:
 		analog::NETLIB_SUB(R_base) m_R1;
 		analog::NETLIB_SUB(R_base) m_R2;
 		logic_input_t m_I;
@@ -521,8 +570,8 @@
 	{
 	public:
 		NETLIB_CONSTRUCTOR(sys_compd)
-		, m_IP(*this, "IP")
-		, m_IN(*this, "IN")
+		, m_IP(*this, "IP", NETLIB_DELEGATE(inputs))
+		, m_IN(*this, "IN", NETLIB_DELEGATE(inputs))
 		, m_Q(*this, "Q")
 		, m_QQ(*this, "QQ")
 		, m_power_pins(*this)
@@ -535,7 +584,10 @@
 			m_last_state = 0;
 		}
 
-		NETLIB_UPDATEI()
+		//NETLIB_UPDATE_PARAMI();
+
+	private:
+		NETLIB_HANDLERI(inputs)
 		{
 			const netlist_sig_t state = (m_IP() > m_IN());
 			if (state != m_last_state)
@@ -547,9 +599,6 @@
 			}
 		}
 
-		//NETLIB_UPDATE_PARAMI();
-
-	private:
 		analog_input_t m_IP;
 		analog_input_t m_IN;
 		logic_output_t m_Q;
@@ -559,12 +608,38 @@
 		state_var<netlist_sig_t> m_last_state;
 	};
 
+	///
+	/// \brief  noise source
+	///
+	/// An externally clocked noise source. The noise acts as a voltage source
+	/// with internal resistance RI.
+	///
+	/// Since a new random value is used on each state change on I the effective
+	/// frequency is clock source frequency times two!
+	///
+	/// Typical application:
+	///
+	///             VCC
+	///              |
+	///              R
+	///              R
+	///              R
+	///              |
+	///              +-----> Output
+	///              |
+	///         +-------+
+	///         |    1  |
+	///     --->| I     |
+	///         |    2  |
+	///         +-------+
+	///              |
+	///              R
+	///              R
+	///              R
+	///              |
+	///             GND
+	///
 	// -----------------------------------------------------------------------------
-	// nld_sys_noise - noise source
-	//
-	// An externally clocked noise source.
-	// -----------------------------------------------------------------------------
-
 	template <typename E, template<class> class D>
 	NETLIB_OBJECT(sys_noise)
 	{
@@ -575,7 +650,7 @@
 
 		NETLIB_CONSTRUCTOR(sys_noise)
 		, m_T(*this, "m_T")
-		, m_I(*this, "I")
+		, m_I(*this, "I", NETLIB_DELEGATE(input))
 		, m_RI(*this, "RI", nlconst::magic(0.1))
 		, m_sigma(*this, "SIGMA", nlconst::zero())
 		, m_mt(*this, "m_mt")
@@ -586,9 +661,8 @@
 			register_subalias("2", m_T.N());
 		}
 
-	protected:
-
-		NETLIB_UPDATEI()
+	private:
+		NETLIB_HANDLERI(input)
 		{
 			nl_fptype val = m_dis.var()(m_mt.var());
 			m_T.change_state([this, val]()
@@ -602,7 +676,6 @@
 			m_T.set_G_V_I(plib::reciprocal(m_RI()), nlconst::zero(), nlconst::zero());
 		}
 
-	private:
 		analog::NETLIB_SUB(twoterm) m_T;
 		logic_input_t m_I;
 		param_fp_t m_RI;
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/devices/nlid_truthtable.cpp mame-0.224+dfsg.1/src/lib/netlist/devices/nlid_truthtable.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/devices/nlid_truthtable.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/devices/nlid_truthtable.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,6 +1,9 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 
+#include "plib/pstonum.h"
+#include "plib/pstrutil.h"
+
 #include "nl_base.h"
 #include "nl_factory.h"
 #include "nlid_truthtable.h"
@@ -75,8 +78,7 @@
 			set_active_outputs(active_outputs);
 		}
 
-		// update is only called during startup here ...
-		NETLIB_UPDATEI()
+		NETLIB_HANDLERI(inputs)
 		{
 #if USE_TT_ALTERNATIVE
 			m_state = 0;
@@ -191,8 +193,8 @@
 		}
 
 
-		plib::uninitialised_array_t<logic_input_t, m_NI> m_I;
-		plib::uninitialised_array_t<logic_output_t, m_NO> m_Q;
+		plib::static_vector<logic_input_t, m_NI> m_I;
+		plib::static_vector<logic_output_t, m_NO> m_Q;
 
 #if USE_TT_ALTERNATIVE
 		state_var<type_t>   m_state;
@@ -387,7 +389,7 @@
 		for (std::size_t i=0; i < m_NI; i++)
 		{
 			inout[i] = plib::trim(inout[i]);
-			m_I.emplace(i, *this, inout[i]);
+			m_I.emplace_back(*this, inout[i], nldelegate(&NETLIB_NAME(truthtable_t)<m_NI, m_NO> :: inputs, this));
 		}
 #else
 		for (std::size_t i=0; i < m_NI; i++)
@@ -410,7 +412,7 @@
 		for (std::size_t i=0; i < m_NO; i++)
 		{
 			outputs[i] = plib::trim(outputs[i]);
-			m_Q.emplace(i, *this, outputs[i]);
+			m_Q.emplace_back(*this, outputs[i]);
 			// Connect output "Q" to input "_Q" if this exists
 			// This enables timed state without having explicit state ....
 			pstring tmp = "_" + outputs[i];
@@ -675,7 +677,8 @@
 
 	#define ENTRY(n, s) ENTRYY(n, 1, s); ENTRYY(n, 2, s); ENTRYY(n, 3, s); \
 						ENTRYY(n, 4, s); ENTRYY(n, 5, s); ENTRYY(n, 6, s); \
-						ENTRYY(n, 7, s); ENTRYY(n, 8, s)
+						ENTRYY(n, 7, s); ENTRYY(n, 8, s); ENTRYY(n, 9, s); \
+						ENTRYY(n, 10, s)
 
 	host_arena::unique_ptr<truthtable_base_element_t> truthtable_create(tt_desc &desc, properties &&props)
 	{
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/examples/2N6027.cpp mame-0.224+dfsg.1/src/lib/netlist/examples/2N6027.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/examples/2N6027.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/examples/2N6027.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -28,14 +28,9 @@
 
 NETLIST_START(ex2N6027)
 
-	/* This is a circuit pushing the solvers to the limits
-	 * 50,000 maximum NR loops.
-	 */
 	SOLVER(Solver, 48000)
-	PARAM(Solver.ACCURACY, 1e-5)
 	PARAM(Solver.DYNAMIC_TS, 1)
 	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 1e-9)
-	PARAM(Solver.NR_LOOPS, 50000)
 	PARAM(Solver.METHOD, "MAT_CR")
 
 	LOCAL_SOURCE(loc_lib)
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/examples/congo_bongo.cpp mame-0.224+dfsg.1/src/lib/netlist/examples/congo_bongo.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/examples/congo_bongo.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/examples/congo_bongo.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -84,6 +84,7 @@
 
 	NET_C(R94.1, SJ1)
 	NET_C(SOU1, amp.AMPIN1)
+	NET_C(GND, amp.GND)
 
 #if USE_OPTIMIZATIONS
 	/* The opamp has an UGF of about 1000k. This doesn't work here and causes oscillations.
@@ -366,7 +367,8 @@
 	ALIAS(AMPIN1, R83.1)
 	ALIAS(AMPOUT1, R77.1)
 	ANALOG_INPUT(I_V12, 12)
-	ANALOG_INPUT(GND, 0)
+	//ANALOG_INPUT(GND, 0)
+	ALIAS(GND, C66.2)
 	CAP(C124, CAP_U(470))
 	CAP(C51, CAP_U(10))
 	CAP(C53, CAP_U(200))
@@ -404,7 +406,8 @@
 	NET_C(R77.2, C53.1)
 	NET_C(C66.1, U2.4, C124.1, R89.1, I_V12.Q)
 	NET_C(R83.1, R91.1)
-	NET_C(GND, C66.2, U2.11, C124.2, C56.2, C55.2, C57.2, C59.2, R90.2, C53.2, XVR1.3)
+	//NET_C(GND, C66.2, U2.11, C124.2, C56.2, C55.2, C57.2, C59.2, R90.2, C53.2, XVR1.3)
+	NET_C(GND, U2.11, C124.2, C56.2, C55.2, C57.2, C59.2, R90.2, C53.2, XVR1.3)
 	NET_C(R83.2, U2.13, U2.14, R86.1)
 	NET_C(U2.1, R88.1, C51.1)
 	NET_C(U2.7, R85.1, R87.2)
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/examples/lostfound.cpp mame-0.224+dfsg.1/src/lib/netlist/examples/lostfound.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/examples/lostfound.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/examples/lostfound.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,215 @@
+///
+/// \file lostfound.cpp
+///
+/// This file contains various code removed from the core which may be
+/// useful again in the future or serve educational purposes.
+///
+/// Don't expect this file to compile
+
+
+/// \brief  Use the truthtable implementation of 74107 instead of the coded device
+///
+/// FIXME: The truthtable implementation of 74107 (JK-Flipflop)
+///        is included for educational purposes to demonstrate how
+///        to implement state holding devices as truthtables.
+///        It will completely nuke performance for pong.
+
+#ifndef NL_USE_TRUTHTABLE_74107
+#define NL_USE_TRUTHTABLE_74107 (0)
+#endif
+
+#if (NL_USE_TRUTHTABLE_74107)
+	/*
+	 *          +-----+-----+-----+---++---+-----+
+	 *          | CLRQ| CLK |  J  | K || Q | QQ  |
+	 *          +=====+=====+=====+===++===+=====+
+	 *          |  0  |  X  |  X  | X || 0 |  1  |
+	 *          |  1  |  *  |  0  | 0 || Q0| Q0Q |
+	 *          |  1  |  *  |  1  | 0 || 1 |  0  |
+	 *          |  1  |  *  |  0  | 1 || 0 |  1  |
+	 *          |  1  |  *  |  1  | 1 || TOGGLE  |
+	 *          +-----+-----+-----+---++---+-----+
+	 */
+	TRUTHTABLE_START(TTL_74107, 6, 4, "+CLK,+J,+K,+CLRQ,@VCC,@GND")
+		TT_HEAD("CLRQ, CLK, _CO,  J, K,_QX | Q, QQ, CO, QX")
+		TT_LINE("  0,   0,    X,  X, X,  X | 0,  1,  0,  0 | 16, 25, 1, 1")
+		TT_LINE("  0,   1,    X,  X, X,  X | 0,  1,  1,  0 | 16, 25, 1, 1")
+
+		TT_LINE("  1,   0,    X,  0, 0,  0 | 0,  1,  0,  0 | 16, 25, 1, 1")
+		TT_LINE("  1,   1,    X,  0, 0,  0 | 0,  1,  1,  0 | 16, 25, 1, 1")
+		TT_LINE("  1,   0,    X,  0, 0,  1 | 1,  0,  0,  1 | 25, 16, 1, 1")
+		TT_LINE("  1,   1,    X,  0, 0,  1 | 1,  0,  1,  1 | 25, 16, 1, 1")
+
+		TT_LINE("  1,   0,    1,  1, 0,  X | 1,  0,  0,  1 | 25, 16, 1, 1")
+		TT_LINE("  1,   0,    0,  1, 0,  0 | 0,  1,  0,  0 | 16, 25, 1, 1")
+		TT_LINE("  1,   0,    0,  1, 0,  1 | 1,  0,  0,  1 | 25, 16, 1, 1")
+		TT_LINE("  1,   1,    X,  1, 0,  0 | 0,  1,  1,  0 | 16, 25, 1, 1")
+		TT_LINE("  1,   1,    X,  1, 0,  1 | 1,  0,  1,  1 | 25, 16, 1, 1")
+
+		TT_LINE("  1,   0,    1,  0, 1,  X | 0,  1,  0,  0 | 16, 25, 1, 1")
+		TT_LINE("  1,   0,    0,  0, 1,  0 | 0,  1,  0,  0 | 16, 25, 1, 1")
+		TT_LINE("  1,   0,    0,  0, 1,  1 | 1,  0,  0,  1 | 25, 16, 1, 1")
+		TT_LINE("  1,   1,    X,  0, 1,  0 | 0,  1,  1,  0 | 16, 25, 1, 1")
+		TT_LINE("  1,   1,    X,  0, 1,  1 | 1,  0,  1,  1 | 25, 16, 1, 1")
+
+		// Toggle
+		TT_LINE("  1,   0,    0,  1, 1,  0 | 0,  1,  0,  0 | 16, 25, 1, 1")
+		TT_LINE("  1,   0,    0,  1, 1,  1 | 1,  0,  0,  1 | 25, 16, 1, 1")
+		TT_LINE("  1,   1,    0,  1, 1,  0 | 0,  1,  1,  0 | 16, 25, 1, 1")
+		TT_LINE("  1,   1,    0,  1, 1,  1 | 1,  0,  1,  1 | 25, 16, 1, 1")
+		TT_LINE("  1,   1,    1,  1, 1,  0 | 0,  1,  1,  0 | 16, 25, 1, 1")
+		TT_LINE("  1,   1,    1,  1, 1,  1 | 1,  0,  1,  1 | 25, 16, 1, 1")
+
+		TT_LINE("  1,   0,    1,  1, 1,  1 | 0,  1,  0,  0 | 16, 25, 1, 1")
+		TT_LINE("  1,   0,    1,  1, 1,  0 | 1,  0,  0,  1 | 25, 16, 1, 1")
+	TRUTHTABLE_END()
+#endif
+
+/// \brief  Use the truthtable implementation of 7448 instead of the coded device
+///
+/// FIXME: Using truthtable is a lot slower than the explicit device
+///        in breakout. Performance drops by 20%. This can be fixed by
+///        setting param USE_DEACTIVATE for the device.
+
+#ifndef NL_USE_TRUTHTABLE_7448
+#define NL_USE_TRUTHTABLE_7448 (0)
+#endif
+
+#if (NL_USE_TRUTHTABLE_7448)
+	TRUTHTABLE_START(TTL_7448, 7, 7, "+A,+B,+C,+D,+LTQ,+BIQ,+RBIQ,@VCC,@GND")
+		TT_HEAD(" LTQ,BIQ,RBIQ, A , B , C , D | a, b, c, d, e, f, g")
+
+		TT_LINE("  1,  1,  1,   0,  0,  0,  0 | 1, 1, 1, 1, 1, 1, 0|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  0,  0,  0 | 0, 1, 1, 0, 0, 0, 0|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  1,  0,  0 | 1, 1, 0, 1, 1, 0, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  1,  0,  0 | 1, 1, 1, 1, 0, 0, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  0,  1,  0 | 0, 1, 1, 0, 0, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  0,  1,  0 | 1, 0, 1, 1, 0, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  1,  1,  0 | 0, 0, 1, 1, 1, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  1,  1,  0 | 1, 1, 1, 0, 0, 0, 0|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  0,  0,  1 | 1, 1, 1, 1, 1, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  0,  0,  1 | 1, 1, 1, 0, 0, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  1,  0,  1 | 0, 0, 0, 1, 1, 0, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  1,  0,  1 | 0, 0, 1, 1, 0, 0, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  0,  1,  1 | 0, 1, 0, 0, 0, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  0,  1,  1 | 1, 0, 0, 1, 0, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  1,  1,  1 | 0, 0, 0, 1, 1, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  1,  1,  1 | 0, 0, 0, 0, 0, 0, 0|100,100,100,100,100,100,100")
+
+		// BI/RBO is input output. In the next case it is used as an input will go low.
+		TT_LINE("  1,  1,  0,   0,  0,  0,  0 | 0, 0, 0, 0, 0, 0, 0|100,100,100,100,100,100,100") // RBI
+
+		TT_LINE("  0,  1,  X,   X,  X,  X,  X | 1, 1, 1, 1, 1, 1, 1|100,100,100,100,100,100,100") // LT
+
+		// This condition has precedence
+		TT_LINE("  X,  0,  X,   X,  X,  X,  X | 0, 0, 0, 0, 0, 0, 0|100,100,100,100,100,100,100") // BI
+		TT_FAMILY("74XX")
+
+	TRUTHTABLE_END()
+
+	// FIXME: We need a more elegant solution than defining twice
+	TRUTHTABLE_START(TTL_7448_TT, 7, 7, "")
+		TT_HEAD(" LTQ,BIQ,RBIQ, A , B , C , D | a, b, c, d, e, f, g")
+
+		TT_LINE("  1,  1,  1,   0,  0,  0,  0 | 1, 1, 1, 1, 1, 1, 0|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  0,  0,  0 | 0, 1, 1, 0, 0, 0, 0|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  1,  0,  0 | 1, 1, 0, 1, 1, 0, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  1,  0,  0 | 1, 1, 1, 1, 0, 0, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  0,  1,  0 | 0, 1, 1, 0, 0, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  0,  1,  0 | 1, 0, 1, 1, 0, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  1,  1,  0 | 0, 0, 1, 1, 1, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  1,  1,  0 | 1, 1, 1, 0, 0, 0, 0|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  0,  0,  1 | 1, 1, 1, 1, 1, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  0,  0,  1 | 1, 1, 1, 0, 0, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  1,  0,  1 | 0, 0, 0, 1, 1, 0, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  1,  0,  1 | 0, 0, 1, 1, 0, 0, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  0,  1,  1 | 0, 1, 0, 0, 0, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  0,  1,  1 | 1, 0, 0, 1, 0, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   0,  1,  1,  1 | 0, 0, 0, 1, 1, 1, 1|100,100,100,100,100,100,100")
+		TT_LINE("  1,  1,  X,   1,  1,  1,  1 | 0, 0, 0, 0, 0, 0, 0|100,100,100,100,100,100,100")
+
+		// BI/RBO is input output. In the next case it is used as an input will go low.
+		TT_LINE("  1,  1,  0,   0,  0,  0,  0 | 0, 0, 0, 0, 0, 0, 0|100,100,100,100,100,100,100") // RBI
+
+		TT_LINE("  0,  1,  X,   X,  X,  X,  X | 1, 1, 1, 1, 1, 1, 1|100,100,100,100,100,100,100") // LT
+
+		// This condition has precedence
+		TT_LINE("  X,  0,  X,   X,  X,  X,  X | 0, 0, 0, 0, 0, 0, 0|100,100,100,100,100,100,100") // BI
+		TT_FAMILY("74XX")
+
+	TRUTHTABLE_END()
+
+#endif
+
+// This is an experimental approach to implement the analog switch.
+// This will make the switch a 3 terminal element which is completely
+// being dealt with as part as the linear system.
+//
+// The intention was to improve convergence when the switch is in a feedback
+// loop. One example are two-opamp tridiagonal wave generators.
+// Unfortunately the approach did not work out and in addition was performing
+// far worse than the net-separating original code.
+//
+// FIXME: The transfer function needs review
+//
+NETLIB_OBJECT(CD4066_GATE_DYNAMIC)
+{
+	NETLIB_CONSTRUCTOR_MODEL(CD4066_GATE_DYNAMIC, "CD4XXX")
+	, m_R(*this, "R", NETLIB_DELEGATE(analog_input_changed))
+	, m_DUM1(*this, "_DUM1", NETLIB_DELEGATE(analog_input_changed))
+	, m_DUM2(*this, "_DUM2", NETLIB_DELEGATE(analog_input_changed))
+	, m_base_r(*this, "BASER", nlconst::magic(270.0))
+	, m_last(*this, "m_last", false)
+	, m_supply(*this)
+	{
+		register_subalias("CTL", m_DUM1.P());
+
+		connect(m_DUM1.P(), m_DUM2.P());
+		connect(m_DUM1.N(), m_R.P());
+		connect(m_DUM2.N(), m_R.N());
+	}
+
+	NETLIB_RESETI()
+	{
+		// Start in off condition
+		// FIXME: is ROFF correct?
+	}
+
+	NETLIB_UPDATE_TERMINALSI()
+	{
+		nl_fptype sup = (m_supply.VCC().Q_Analog() - m_supply.GND().Q_Analog());
+		nl_fptype in = m_DUM1.P().net().Q_Analog() - m_supply.GND().Q_Analog();
+		nl_fptype rON = m_base_r() * nlconst::magic(5.0) / sup;
+		nl_fptype R = std::exp(-(in / sup - nlconst::magic(0.55)) * nlconst::magic(25.0)) + rON;
+		nl_fptype G = plib::reciprocal(R);
+		// dI/dVin = (VR1-VR2)*(1.0/sup*b) * exp((Vin/sup-a) * b)
+		const auto dfdz = nlconst::magic(25.0)/(R*sup) * m_R.deltaV();
+		const auto Ieq = dfdz * in;
+		const auto zero(nlconst::zero());
+		m_R.set_mat( G, -G, zero,
+					-G,  G, zero);
+					 //VIN  VR1
+		m_DUM1.set_mat( zero,  zero,  zero,   // IIN
+						dfdz,  zero,  Ieq);  // IR1
+		m_DUM2.set_mat( zero,  zero,  zero,   // IIN
+					   -dfdz,  zero, -Ieq);  // IR2
+	}
+	NETLIB_IS_DYNAMIC(true)
+
+private:
+
+	NETLIB_HANDLERI(analog_input_changed)
+	{
+		m_R.solve_now();
+	}
+
+	analog::nld_twoterm        m_R;
+	analog::nld_twoterm        m_DUM1;
+	analog::nld_twoterm        m_DUM2;
+	param_fp_t                 m_base_r;
+	state_var<bool>            m_last;
+	nld_power_pins             m_supply;
+};
+
+	NETLIB_DEVICE_IMPL(CD4066_GATE_DYNAMIC, "CD4066_GATE_DYNAMIC",            "")
+
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/examples/noise.cpp mame-0.224+dfsg.1/src/lib/netlist/examples/noise.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/examples/noise.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/examples/noise.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -9,7 +9,7 @@
 //! [noise_example]
 #include "netlist/devices/net_lib.h"
 
-// ./nltool -t 1 -l X.3 -l X.4 -n oscillator src/lib/netlist/examples/noise.cpp
+// ./nltool -t 1 -l R1.2 -n noise src/lib/netlist/examples/noise.cpp
 //  X.3 : Square out
 //  X.4 : Triangle out
 
@@ -19,7 +19,7 @@
 
 	CLOCK(nclk, 2000)
 
-	SYS_NOISE_MT_N(noise, 0.5)
+	SYS_NOISE_MT_U(noise, 2.5)
 
 	RES(R1,1000)
 	RES(R2,1000)
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/examples/sn74ls629_osc.c mame-0.224+dfsg.1/src/lib/netlist/examples/sn74ls629_osc.c
--- mame-0.222+dfsg.1/src/lib/netlist/examples/sn74ls629_osc.c	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/examples/sn74ls629_osc.c	2020-08-26 08:57:19.000000000 +0000
@@ -25,6 +25,7 @@
 	SN74LS629(OSC, 0.022e-6)
 
 	NET_C(GND, OSC.GND)
+	NET_C(V5, OSC.VCC)
 	NET_C(VR, OSC.RNG)
 	NET_C(VF, OSC.FC)
 	NET_C(GND, OSC.ENQ)
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/generated/static_solvers.cpp mame-0.224+dfsg.1/src/lib/netlist/generated/static_solvers.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/generated/static_solvers.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/generated/static_solvers.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,10 +1,226 @@
 #include "plib/pdynlib.h"
 
-// konami1x
-static void nl_gcr_105d3ecb773843b6_49_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// elim
+static void nl_gcr_11c2ae166b240b6e_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A5 += gt[5];
+	m_A5 += gt[6];
+	m_A5 += gt[7];
+	m_A5 += gt[8];
+	m_A6 += go[5];
+	m_A4 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A9 += gt[9];
+	m_A9 += gt[10];
+	m_A9 += gt[11];
+	m_A9 += gt[12];
+	m_A9 += gt[13];
+	m_A8 += go[9];
+	m_A7 += go[10];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 -= go[11] * *cnV[11];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A5 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A7;
+	m_A9 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_3 = -f2 * m_A8;
+	m_A9 += m_A6 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// tankbatt
+static void nl_gcr_124f7aa10f044582_16_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A3 += go[3];
+	m_A4 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A5 += gt[13];
+	m_A7 += go[10];
+	m_A6 += go[11];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	m_A10 += gt[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A11 += go[14];
+	m_A9 += go[15];
+	m_A8 += go[16];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 -= go[17] * *cnV[17];
+	m_A15 += gt[18];
+	m_A15 += gt[19];
+	m_A15 += gt[20];
+	m_A15 += gt[21];
+	m_A15 += gt[22];
+	m_A15 += gt[23];
+	m_A12 += go[18];
+	m_A13 += go[19];
+	m_A14 += go[20];
+	double RHS4 = Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 -= go[21] * *cnV[21];
+	RHS4 -= go[22] * *cnV[22];
+	RHS4 -= go[23] * *cnV[23];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A10 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_4 = -f1 * m_A12;
+	m_A13 += m_A3 * f1_4;
+	m_A14 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_3 = -f2 * m_A9;
+	m_A10 += m_A6 * f2_3;
+	m_A11 += m_A7 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	const double f2_4 = -f2 * m_A13;
+	m_A14 += m_A6 * f2_4;
+	m_A15 += m_A7 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_4 = -f3 * m_A14;
+	m_A15 += m_A11 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	V[4] = RHS4 / m_A15;
+	double tmp3 = 0.0;
+	tmp3 += m_A11 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A10;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[3];
+	tmp2 += m_A7 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// armora
+static void nl_gcr_1250f340dea396ae_22_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -27,309 +243,160 @@
 	double m_A19(0.0);
 	double m_A20(0.0);
 	double m_A21(0.0);
-	double m_A22(0.0);
-	double m_A23(0.0);
-	double m_A24(0.0);
-	double m_A25(0.0);
-	double m_A26(0.0);
-	double m_A27(0.0);
-	double m_A28(0.0);
-	double m_A29(0.0);
-	double m_A30(0.0);
-	double m_A31(0.0);
-	double m_A32(0.0);
-	double m_A33(0.0);
-	double m_A34(0.0);
-	double m_A35(0.0);
-	double m_A36(0.0);
-	double m_A37(0.0);
-	double m_A38(0.0);
-	double m_A39(0.0);
-	double m_A40(0.0);
-	double m_A41(0.0);
-	double m_A42(0.0);
-	double m_A43(0.0);
-	double m_A44(0.0);
-	double m_A45(0.0);
-	double m_A46(0.0);
-	double m_A47(0.0);
-	double m_A48(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
 	RHS0 -= go[1] * *cnV[1];
-	m_A2 += gt[2];
-	m_A2 += gt[3];
-	m_A3 += go[2];
-	double RHS1 = Idr[2];
-	RHS1 += Idr[3];
-	RHS1 -= go[3] * *cnV[3];
-	m_A4 += gt[4];
-	m_A4 += gt[5];
-	m_A5 += go[4];
-	double RHS2 = Idr[4];
-	RHS2 += Idr[5];
-	RHS2 -= go[5] * *cnV[5];
-	m_A6 += gt[6];
-	m_A6 += gt[7];
-	m_A7 += go[6];
-	double RHS3 = Idr[6];
-	RHS3 += Idr[7];
-	RHS3 -= go[7] * *cnV[7];
-	m_A8 += gt[8];
-	m_A8 += gt[9];
-	m_A9 += go[8];
-	double RHS4 = Idr[8];
-	RHS4 += Idr[9];
-	RHS4 -= go[9] * *cnV[9];
-	m_A10 += gt[10];
-	m_A10 += gt[11];
-	m_A11 += go[10];
-	double RHS5 = Idr[10];
-	RHS5 += Idr[11];
-	RHS5 -= go[11] * *cnV[11];
-	m_A12 += gt[12];
-	m_A12 += gt[13];
-	m_A13 += go[12];
-	double RHS6 = Idr[12];
-	RHS6 += Idr[13];
-	RHS6 -= go[13] * *cnV[13];
-	m_A14 += gt[14];
-	m_A14 += gt[15];
-	m_A15 += go[14];
-	double RHS7 = Idr[14];
-	RHS7 += Idr[15];
-	RHS7 -= go[15] * *cnV[15];
-	m_A16 += gt[16];
-	m_A16 += gt[17];
-	m_A16 += gt[18];
-	m_A16 += gt[19];
-	m_A16 += gt[20];
-	m_A16 += gt[21];
-	m_A16 += gt[22];
-	m_A17 += go[16];
-	double RHS8 = Idr[16];
-	RHS8 += Idr[17];
-	RHS8 += Idr[18];
-	RHS8 += Idr[19];
-	RHS8 += Idr[20];
-	RHS8 += Idr[21];
-	RHS8 += Idr[22];
-	RHS8 -= go[17] * *cnV[17];
-	RHS8 -= go[18] * *cnV[18];
-	RHS8 -= go[19] * *cnV[19];
-	RHS8 -= go[20] * *cnV[20];
-	RHS8 -= go[21] * *cnV[21];
-	RHS8 -= go[22] * *cnV[22];
-	m_A18 += gt[23];
-	m_A18 += gt[24];
-	m_A19 += go[23];
-	double RHS9 = Idr[23];
-	RHS9 += Idr[24];
-	RHS9 -= go[24] * *cnV[24];
-	m_A20 += gt[25];
-	m_A20 += gt[26];
-	m_A21 += go[25];
-	double RHS10 = Idr[25];
-	RHS10 += Idr[26];
-	RHS10 -= go[26] * *cnV[26];
-	m_A25 += gt[27];
-	m_A25 += gt[28];
-	m_A25 += gt[29];
-	m_A25 += gt[30];
-	m_A26 += go[27];
-	m_A24 += go[28];
-	m_A23 += go[29];
-	m_A22 += go[30];
-	double RHS11 = Idr[27];
-	RHS11 += Idr[28];
-	RHS11 += Idr[29];
-	RHS11 += Idr[30];
-	m_A30 += gt[31];
-	m_A30 += gt[32];
-	m_A30 += gt[33];
-	m_A30 += gt[34];
-	m_A31 += go[31];
-	m_A29 += go[32];
-	m_A28 += go[33];
-	m_A27 += go[34];
-	double RHS12 = Idr[31];
-	RHS12 += Idr[32];
-	RHS12 += Idr[33];
-	RHS12 += Idr[34];
-	m_A35 += gt[35];
-	m_A35 += gt[36];
-	m_A35 += gt[37];
-	m_A35 += gt[38];
-	m_A36 += go[35];
-	m_A34 += go[36];
-	m_A33 += go[37];
-	m_A32 += go[38];
-	double RHS13 = Idr[35];
-	RHS13 += Idr[36];
-	RHS13 += Idr[37];
-	RHS13 += Idr[38];
-	m_A38 += gt[39];
-	m_A38 += gt[40];
-	m_A38 += gt[41];
-	m_A37 += go[39];
-	m_A39 += go[40];
-	double RHS14 = Idr[39];
-	RHS14 += Idr[40];
-	RHS14 += Idr[41];
-	RHS14 -= go[41] * *cnV[41];
-	m_A43 += gt[42];
-	m_A43 += gt[43];
-	m_A43 += gt[44];
-	m_A43 += gt[45];
-	m_A43 += gt[46];
-	m_A44 += go[42];
-	m_A42 += go[43];
-	m_A41 += go[44];
-	m_A40 += go[45];
-	double RHS15 = Idr[42];
-	RHS15 += Idr[43];
-	RHS15 += Idr[44];
-	RHS15 += Idr[45];
-	RHS15 += Idr[46];
-	RHS15 -= go[46] * *cnV[46];
-	m_A48 += gt[47];
-	m_A48 += gt[48];
-	m_A48 += gt[49];
-	m_A48 += gt[50];
-	m_A48 += gt[51];
-	m_A45 += go[47];
-	m_A46 += go[48];
-	m_A47 += go[49];
-	double RHS16 = Idr[47];
-	RHS16 += Idr[48];
-	RHS16 += Idr[49];
-	RHS16 += Idr[50];
-	RHS16 += Idr[51];
-	RHS16 -= go[50] * *cnV[50];
-	RHS16 -= go[51] * *cnV[51];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[4];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A4 += gt[12];
+	m_A4 += gt[13];
+	m_A7 += go[6];
+	m_A6 += go[7];
+	m_A6 += go[8];
+	m_A5 += go[9];
+	m_A5 += go[10];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	m_A10 += gt[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A9 += go[14];
+	m_A9 += go[15];
+	m_A8 += go[16];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 -= go[17] * *cnV[17];
+	RHS3 -= go[18] * *cnV[18];
+	RHS3 -= go[19] * *cnV[19];
+	m_A15 += gt[20];
+	m_A15 += gt[21];
+	m_A15 += gt[22];
+	m_A15 += gt[23];
+	m_A15 += gt[24];
+	m_A16 += go[20];
+	m_A16 += go[21];
+	m_A13 += go[22];
+	m_A13 += go[23];
+	double RHS4 = Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 -= go[24] * *cnV[24];
+	m_A21 += gt[25];
+	m_A21 += gt[26];
+	m_A21 += gt[27];
+	m_A21 += gt[28];
+	m_A21 += gt[29];
+	m_A20 += go[25];
+	m_A20 += go[26];
+	m_A18 += go[27];
+	m_A17 += go[28];
+	double RHS5 = Idr[25];
+	RHS5 += Idr[26];
+	RHS5 += Idr[27];
+	RHS5 += Idr[28];
+	RHS5 += Idr[29];
+	RHS5 -= go[29] * *cnV[29];
 	const double f0 = 1.0 / m_A0;
-	const double f0_11 = -f0 * m_A22;
-	m_A25 += m_A1 * f0_11;
-	RHS11 += f0_11 * RHS0;
+	const double f0_3 = -f0 * m_A8;
+	m_A10 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_11 = -f1 * m_A23;
-	m_A25 += m_A3 * f1_11;
-	RHS11 += f1_11 * RHS1;
+	const double f1_5 = -f1 * m_A17;
+	m_A21 += m_A3 * f1_5;
+	RHS5 += f1_5 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_11 = -f2 * m_A24;
-	m_A25 += m_A5 * f2_11;
-	RHS11 += f2_11 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_12 = -f3 * m_A27;
-	m_A30 += m_A7 * f3_12;
-	RHS12 += f3_12 * RHS3;
-	const double f4 = 1.0 / m_A8;
-	const double f4_12 = -f4 * m_A28;
-	m_A30 += m_A9 * f4_12;
-	RHS12 += f4_12 * RHS4;
-	const double f5 = 1.0 / m_A10;
-	const double f5_12 = -f5 * m_A29;
-	m_A30 += m_A11 * f5_12;
-	RHS12 += f5_12 * RHS5;
-	const double f6 = 1.0 / m_A12;
-	const double f6_13 = -f6 * m_A32;
-	m_A35 += m_A13 * f6_13;
-	RHS13 += f6_13 * RHS6;
-	const double f7 = 1.0 / m_A14;
-	const double f7_13 = -f7 * m_A33;
-	m_A35 += m_A15 * f7_13;
-	RHS13 += f7_13 * RHS7;
-	const double f8 = 1.0 / m_A16;
-	const double f8_16 = -f8 * m_A45;
-	m_A47 += m_A17 * f8_16;
-	RHS16 += f8_16 * RHS8;
-	const double f9 = 1.0 / m_A18;
-	const double f9_13 = -f9 * m_A34;
-	m_A35 += m_A19 * f9_13;
-	RHS13 += f9_13 * RHS9;
-	const double f10 = 1.0 / m_A20;
-	const double f10_14 = -f10 * m_A37;
-	m_A38 += m_A21 * f10_14;
-	RHS14 += f10_14 * RHS10;
-	const double f11 = 1.0 / m_A25;
-	const double f11_15 = -f11 * m_A40;
-	m_A43 += m_A26 * f11_15;
-	RHS15 += f11_15 * RHS11;
-	const double f12 = 1.0 / m_A30;
-	const double f12_15 = -f12 * m_A41;
-	m_A43 += m_A31 * f12_15;
-	RHS15 += f12_15 * RHS12;
-	const double f13 = 1.0 / m_A35;
-	const double f13_15 = -f13 * m_A42;
-	m_A43 += m_A36 * f13_15;
-	RHS15 += f13_15 * RHS13;
-	const double f14 = 1.0 / m_A38;
-	const double f14_16 = -f14 * m_A46;
-	m_A48 += m_A39 * f14_16;
-	RHS16 += f14_16 * RHS14;
-	const double f15 = 1.0 / m_A43;
-	const double f15_16 = -f15 * m_A47;
-	m_A48 += m_A44 * f15_16;
-	RHS16 += f15_16 * RHS15;
-	V[16] = RHS16 / m_A48;
-	double tmp15 = 0.0;
-	tmp15 += m_A44 * V[16];
-	V[15] = (RHS15 - tmp15) / m_A43;
-	double tmp14 = 0.0;
-	tmp14 += m_A39 * V[16];
-	V[14] = (RHS14 - tmp14) / m_A38;
-	double tmp13 = 0.0;
-	tmp13 += m_A36 * V[15];
-	V[13] = (RHS13 - tmp13) / m_A35;
-	double tmp12 = 0.0;
-	tmp12 += m_A31 * V[15];
-	V[12] = (RHS12 - tmp12) / m_A30;
-	double tmp11 = 0.0;
-	tmp11 += m_A26 * V[15];
-	V[11] = (RHS11 - tmp11) / m_A25;
-	double tmp10 = 0.0;
-	tmp10 += m_A21 * V[14];
-	V[10] = (RHS10 - tmp10) / m_A20;
-	double tmp9 = 0.0;
-	tmp9 += m_A19 * V[13];
-	V[9] = (RHS9 - tmp9) / m_A18;
-	double tmp8 = 0.0;
-	tmp8 += m_A17 * V[15];
-	V[8] = (RHS8 - tmp8) / m_A16;
-	double tmp7 = 0.0;
-	tmp7 += m_A15 * V[13];
-	V[7] = (RHS7 - tmp7) / m_A14;
-	double tmp6 = 0.0;
-	tmp6 += m_A13 * V[13];
-	V[6] = (RHS6 - tmp6) / m_A12;
-	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[12];
-	V[5] = (RHS5 - tmp5) / m_A10;
+	const double f2_3 = -f2 * m_A9;
+	m_A10 += m_A5 * f2_3;
+	m_A11 += m_A6 * f2_3;
+	m_A12 += m_A7 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	const double f2_4 = -f2 * m_A13;
+	m_A14 += m_A5 * f2_4;
+	m_A15 += m_A6 * f2_4;
+	m_A16 += m_A7 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_5 = -f2 * m_A18;
+	m_A19 += m_A5 * f2_5;
+	m_A20 += m_A6 * f2_5;
+	m_A21 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_4 = -f3 * m_A14;
+	m_A15 += m_A11 * f3_4;
+	m_A16 += m_A12 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f3_5 = -f3 * m_A19;
+	m_A20 += m_A11 * f3_5;
+	m_A21 += m_A12 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A15;
+	const double f4_5 = -f4 * m_A20;
+	m_A21 += m_A16 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A21;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[12];
-	V[4] = (RHS4 - tmp4) / m_A8;
+	tmp4 += m_A16 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A15;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[12];
-	V[3] = (RHS3 - tmp3) / m_A6;
+	tmp3 += m_A11 * V[4];
+	tmp3 += m_A12 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A10;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[11];
+	tmp2 += m_A5 * V[3];
+	tmp2 += m_A6 * V[4];
+	tmp2 += m_A7 * V[5];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[11];
+	tmp1 += m_A3 * V[5];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[11];
+	tmp0 += m_A1 * V[3];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// breakout
-static void nl_gcr_15a4e7fbe5facb3a_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// pongf
+static void nl_gcr_13e7b5ac1a260dbf_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -337,6 +404,9 @@
 	double m_A4(0.0);
 	double m_A5(0.0);
 	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
@@ -355,77 +425,24 @@
 	RHS1 += Idr[5];
 	RHS1 -= go[4] * *cnV[4];
 	RHS1 -= go[5] * *cnV[5];
-	m_A6 += gt[6];
-	m_A6 += gt[7];
-	m_A5 += go[6];
-	m_A4 += go[7];
-	double RHS2 = Idr[6];
-	RHS2 += Idr[7];
-	const double f0 = 1.0 / m_A0;
-	const double f0_2 = -f0 * m_A4;
-	m_A6 += m_A1 * f0_2;
-	RHS2 += f0_2 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_2 = -f1 * m_A5;
-	m_A6 += m_A3 * f1_2;
-	RHS2 += f1_2 * RHS1;
-	V[2] = RHS2 / m_A6;
-	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[2];
-	V[1] = (RHS1 - tmp1) / m_A2;
-	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[2];
-	V[0] = (RHS0 - tmp0) / m_A0;
-}
-
-// breakout
-static void nl_gcr_1993cb957e80c097_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
-
-{
-
-	double m_A0(0.0);
-	double m_A1(0.0);
-	double m_A2(0.0);
-	double m_A3(0.0);
-	double m_A4(0.0);
-	double m_A5(0.0);
-	double m_A6(0.0);
-	double m_A7(0.0);
-	double m_A8(0.0);
-	double m_A9(0.0);
-	m_A0 += gt[0];
-	m_A0 += gt[1];
-	m_A0 += gt[2];
-	m_A0 += gt[3];
-	m_A1 += go[0];
-	double RHS0 = Idr[0];
-	RHS0 += Idr[1];
-	RHS0 += Idr[2];
-	RHS0 += Idr[3];
-	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
-	RHS0 -= go[3] * *cnV[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A3 += go[4];
-	double RHS1 = Idr[4];
-	RHS1 += Idr[5];
-	RHS1 -= go[5] * *cnV[5];
 	m_A4 += gt[6];
 	m_A4 += gt[7];
+	m_A4 += gt[8];
 	m_A5 += go[6];
 	double RHS2 = Idr[6];
 	RHS2 += Idr[7];
+	RHS2 += Idr[8];
 	RHS2 -= go[7] * *cnV[7];
-	m_A9 += gt[8];
+	RHS2 -= go[8] * *cnV[8];
 	m_A9 += gt[9];
 	m_A9 += gt[10];
-	m_A8 += go[8];
-	m_A7 += go[9];
-	m_A6 += go[10];
-	double RHS3 = Idr[8];
-	RHS3 += Idr[9];
+	m_A9 += gt[11];
+	m_A8 += go[9];
+	m_A7 += go[10];
+	m_A6 += go[11];
+	double RHS3 = Idr[9];
 	RHS3 += Idr[10];
+	RHS3 += Idr[11];
 	const double f0 = 1.0 / m_A0;
 	const double f0_3 = -f0 * m_A6;
 	m_A9 += m_A1 * f0_3;
@@ -450,11 +467,12 @@
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// kidniki
-static void nl_gcr_1cbd5d704f6e93c1_67_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// tailg
+static void nl_gcr_144ed14e6bafdb_119_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -522,6 +540,58 @@
 	double m_A64(0.0);
 	double m_A65(0.0);
 	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A1 += go[0];
@@ -542,340 +612,574 @@
 	RHS2 -= go[5] * *cnV[5];
 	m_A6 += gt[6];
 	m_A6 += gt[7];
-	m_A7 += go[6];
+	m_A8 += go[6];
+	m_A7 += go[7];
 	double RHS3 = Idr[6];
 	RHS3 += Idr[7];
-	RHS3 -= go[7] * *cnV[7];
-	m_A8 += gt[8];
-	m_A8 += gt[9];
-	m_A9 += go[8];
+	m_A9 += gt[8];
+	m_A9 += gt[9];
+	m_A10 += go[8];
+	m_A11 += go[9];
 	double RHS4 = Idr[8];
 	RHS4 += Idr[9];
-	RHS4 -= go[9] * *cnV[9];
-	m_A10 += gt[10];
-	m_A10 += gt[11];
-	m_A11 += go[10];
-	double RHS5 = Idr[10];
-	RHS5 += Idr[11];
-	RHS5 -= go[11] * *cnV[11];
+	m_A12 += gt[10];
+	m_A12 += gt[11];
 	m_A12 += gt[12];
 	m_A12 += gt[13];
 	m_A12 += gt[14];
 	m_A12 += gt[15];
 	m_A12 += gt[16];
-	m_A12 += gt[17];
-	m_A12 += gt[18];
-	m_A12 += gt[19];
-	m_A14 += go[12];
-	m_A15 += go[13];
-	m_A17 += go[14];
-	m_A18 += go[15];
-	m_A16 += go[16];
-	m_A13 += go[17];
-	double RHS6 = Idr[12];
-	RHS6 += Idr[13];
-	RHS6 += Idr[14];
-	RHS6 += Idr[15];
-	RHS6 += Idr[16];
-	RHS6 += Idr[17];
+	m_A13 += go[10];
+	double RHS5 = Idr[10];
+	RHS5 += Idr[11];
+	RHS5 += Idr[12];
+	RHS5 += Idr[13];
+	RHS5 += Idr[14];
+	RHS5 += Idr[15];
+	RHS5 += Idr[16];
+	RHS5 -= go[11] * *cnV[11];
+	RHS5 -= go[12] * *cnV[12];
+	RHS5 -= go[13] * *cnV[13];
+	RHS5 -= go[14] * *cnV[14];
+	RHS5 -= go[15] * *cnV[15];
+	RHS5 -= go[16] * *cnV[16];
+	m_A14 += gt[17];
+	m_A14 += gt[18];
+	m_A16 += go[17];
+	m_A15 += go[18];
+	double RHS6 = Idr[17];
 	RHS6 += Idr[18];
-	RHS6 += Idr[19];
-	RHS6 -= go[18] * *cnV[18];
-	RHS6 -= go[19] * *cnV[19];
-	m_A21 += gt[20];
-	m_A21 += gt[21];
-	m_A21 += gt[22];
-	m_A21 += gt[23];
-	m_A20 += go[20];
-	m_A19 += go[21];
-	double RHS7 = Idr[20];
-	RHS7 += Idr[21];
-	RHS7 += Idr[22];
-	RHS7 += Idr[23];
-	RHS7 -= go[22] * *cnV[22];
-	RHS7 -= go[23] * *cnV[23];
-	m_A30 += gt[24];
-	m_A30 += gt[25];
-	m_A30 += gt[26];
-	m_A30 += gt[27];
-	m_A28 += go[24];
-	m_A27 += go[25];
-	double RHS8 = Idr[24];
-	RHS8 += Idr[25];
-	RHS8 += Idr[26];
-	RHS8 += Idr[27];
-	RHS8 -= go[26] * *cnV[26];
-	RHS8 -= go[27] * *cnV[27];
-	m_A39 += gt[28];
-	m_A39 += gt[29];
-	m_A39 += gt[30];
-	m_A39 += gt[31];
-	m_A36 += go[28];
-	m_A35 += go[29];
-	double RHS9 = Idr[28];
-	RHS9 += Idr[29];
-	RHS9 += Idr[30];
-	RHS9 += Idr[31];
-	RHS9 -= go[30] * *cnV[30];
-	RHS9 -= go[31] * *cnV[31];
-	m_A48 += gt[32];
-	m_A48 += gt[33];
-	m_A48 += gt[34];
-	m_A48 += gt[35];
-	m_A44 += go[32];
-	m_A43 += go[33];
-	double RHS10 = Idr[32];
-	RHS10 += Idr[33];
-	RHS10 += Idr[34];
-	RHS10 += Idr[35];
-	RHS10 -= go[34] * *cnV[34];
-	RHS10 -= go[35] * *cnV[35];
-	m_A57 += gt[36];
-	m_A57 += gt[37];
-	m_A57 += gt[38];
-	m_A57 += gt[39];
-	m_A52 += go[36];
-	m_A51 += go[37];
-	double RHS11 = Idr[36];
-	RHS11 += Idr[37];
-	RHS11 += Idr[38];
-	RHS11 += Idr[39];
-	RHS11 -= go[38] * *cnV[38];
-	RHS11 -= go[39] * *cnV[39];
-	m_A66 += gt[40];
-	m_A66 += gt[41];
-	m_A66 += gt[42];
-	m_A66 += gt[43];
-	m_A60 += go[40];
-	m_A59 += go[41];
-	double RHS12 = Idr[40];
-	RHS12 += Idr[41];
-	RHS12 += Idr[42];
-	RHS12 += Idr[43];
-	RHS12 -= go[42] * *cnV[42];
-	RHS12 -= go[43] * *cnV[43];
+	m_A17 += gt[19];
+	m_A17 += gt[20];
+	m_A18 += go[19];
+	double RHS7 = Idr[19];
+	RHS7 += Idr[20];
+	RHS7 -= go[20] * *cnV[20];
+	m_A19 += gt[21];
+	m_A19 += gt[22];
+	m_A19 += gt[23];
+	m_A20 += go[21];
+	m_A21 += go[22];
+	double RHS8 = Idr[21];
+	RHS8 += Idr[22];
+	RHS8 += Idr[23];
+	RHS8 -= go[23] * *cnV[23];
+	m_A22 += gt[24];
+	m_A22 += gt[25];
+	m_A24 += go[24];
+	m_A23 += go[25];
+	double RHS9 = Idr[24];
+	RHS9 += Idr[25];
+	m_A25 += gt[26];
+	m_A25 += gt[27];
+	m_A25 += gt[28];
+	m_A27 += go[26];
+	m_A26 += go[27];
+	double RHS10 = Idr[26];
+	RHS10 += Idr[27];
+	RHS10 += Idr[28];
+	RHS10 -= go[28] * *cnV[28];
+	m_A28 += gt[29];
+	m_A28 += gt[30];
+	m_A28 += gt[31];
+	m_A29 += go[29];
+	double RHS11 = Idr[29];
+	RHS11 += Idr[30];
+	RHS11 += Idr[31];
+	RHS11 -= go[30] * *cnV[30];
+	RHS11 -= go[31] * *cnV[31];
+	m_A30 += gt[32];
+	m_A30 += gt[33];
+	m_A30 += gt[34];
+	m_A31 += go[32];
+	double RHS12 = Idr[32];
+	RHS12 += Idr[33];
+	RHS12 += Idr[34];
+	RHS12 -= go[33] * *cnV[33];
+	RHS12 -= go[34] * *cnV[34];
+	m_A32 += gt[35];
+	m_A32 += gt[36];
+	m_A33 += go[35];
+	m_A34 += go[36];
+	double RHS13 = Idr[35];
+	RHS13 += Idr[36];
+	m_A35 += gt[37];
+	m_A35 += gt[38];
+	m_A35 += gt[39];
+	m_A36 += go[37];
+	double RHS14 = Idr[37];
+	RHS14 += Idr[38];
+	RHS14 += Idr[39];
+	RHS14 -= go[38] * *cnV[38];
+	RHS14 -= go[39] * *cnV[39];
+	m_A37 += gt[40];
+	m_A37 += gt[41];
+	m_A37 += gt[42];
+	m_A38 += go[40];
+	double RHS15 = Idr[40];
+	RHS15 += Idr[41];
+	RHS15 += Idr[42];
+	RHS15 -= go[41] * *cnV[41];
+	RHS15 -= go[42] * *cnV[42];
+	m_A39 += gt[43];
+	m_A39 += gt[44];
+	m_A40 += go[43];
+	m_A41 += go[44];
+	double RHS16 = Idr[43];
+	RHS16 += Idr[44];
+	m_A42 += gt[45];
+	m_A42 += gt[46];
+	m_A42 += gt[47];
+	m_A44 += go[45];
+	m_A43 += go[46];
+	double RHS17 = Idr[45];
+	RHS17 += Idr[46];
+	RHS17 += Idr[47];
+	RHS17 -= go[47] * *cnV[47];
+	m_A47 += gt[48];
+	m_A47 += gt[49];
+	m_A47 += gt[50];
+	m_A46 += go[48];
+	m_A45 += go[49];
+	double RHS18 = Idr[48];
+	RHS18 += Idr[49];
+	RHS18 += Idr[50];
+	RHS18 -= go[50] * *cnV[50];
+	m_A51 += gt[51];
+	m_A51 += gt[52];
+	m_A51 += gt[53];
+	m_A50 += go[51];
+	m_A49 += go[52];
+	double RHS19 = Idr[51];
+	RHS19 += Idr[52];
+	RHS19 += Idr[53];
+	RHS19 -= go[53] * *cnV[53];
+	m_A58 += gt[54];
+	m_A58 += gt[55];
+	m_A58 += gt[56];
+	m_A58 += gt[57];
+	m_A58 += gt[58];
+	m_A54 += go[54];
+	m_A56 += go[55];
+	m_A55 += go[56];
+	m_A53 += go[57];
+	double RHS20 = Idr[54];
+	RHS20 += Idr[55];
+	RHS20 += Idr[56];
+	RHS20 += Idr[57];
+	RHS20 += Idr[58];
+	RHS20 -= go[58] * *cnV[58];
+	m_A64 += gt[59];
+	m_A64 += gt[60];
+	m_A64 += gt[61];
+	m_A62 += go[59];
+	m_A61 += go[60];
+	double RHS21 = Idr[59];
+	RHS21 += Idr[60];
+	RHS21 += Idr[61];
+	RHS21 -= go[61] * *cnV[61];
+	m_A69 += gt[62];
+	m_A69 += gt[63];
+	m_A67 += go[62];
+	double RHS22 = Idr[62];
+	RHS22 += Idr[63];
+	RHS22 -= go[63] * *cnV[63];
+	m_A75 += gt[64];
+	m_A75 += gt[65];
+	m_A75 += gt[66];
+	m_A75 += gt[67];
+	m_A75 += gt[68];
+	m_A77 += go[64];
+	m_A71 += go[65];
+	m_A76 += go[66];
+	double RHS23 = Idr[64];
+	RHS23 += Idr[65];
+	RHS23 += Idr[66];
+	RHS23 += Idr[67];
+	RHS23 += Idr[68];
+	RHS23 -= go[67] * *cnV[67];
+	RHS23 -= go[68] * *cnV[68];
+	m_A81 += gt[69];
+	m_A81 += gt[70];
+	m_A81 += gt[71];
+	m_A80 += go[69];
+	m_A79 += go[70];
+	m_A78 += go[71];
+	double RHS24 = Idr[69];
+	RHS24 += Idr[70];
+	RHS24 += Idr[71];
+	m_A84 += gt[72];
+	m_A84 += gt[73];
+	m_A84 += gt[74];
+	m_A84 += gt[75];
+	m_A86 += go[72];
+	m_A86 += go[73];
+	m_A83 += go[74];
+	double RHS25 = Idr[72];
+	RHS25 += Idr[73];
+	RHS25 += Idr[74];
+	RHS25 += Idr[75];
+	RHS25 -= go[75] * *cnV[75];
+	m_A90 += gt[76];
+	m_A90 += gt[77];
+	m_A90 += gt[78];
+	m_A89 += go[76];
+	m_A88 += go[77];
+	m_A87 += go[78];
+	double RHS26 = Idr[76];
+	RHS26 += Idr[77];
+	RHS26 += Idr[78];
+	m_A98 += gt[79];
+	m_A98 += gt[80];
+	m_A98 += gt[81];
+	m_A98 += gt[82];
+	m_A98 += gt[83];
+	m_A95 += go[79];
+	m_A94 += go[80];
+	m_A93 += go[81];
+	m_A92 += go[82];
+	double RHS27 = Idr[79];
+	RHS27 += Idr[80];
+	RHS27 += Idr[81];
+	RHS27 += Idr[82];
+	RHS27 += Idr[83];
+	RHS27 -= go[83] * *cnV[83];
+	m_A103 += gt[84];
+	m_A103 += gt[85];
+	m_A103 += gt[86];
+	m_A100 += go[84];
+	m_A101 += go[85];
+	double RHS28 = Idr[84];
+	RHS28 += Idr[85];
+	RHS28 += Idr[86];
+	RHS28 -= go[86] * *cnV[86];
+	m_A110 += gt[87];
+	m_A110 += gt[88];
+	m_A106 += go[87];
+	m_A107 += go[88];
+	double RHS29 = Idr[87];
+	RHS29 += Idr[88];
+	m_A118 += gt[89];
+	m_A118 += gt[90];
+	m_A118 += gt[91];
+	m_A118 += gt[92];
+	m_A118 += gt[93];
+	m_A118 += gt[94];
+	m_A112 += go[89];
+	m_A113 += go[90];
+	m_A115 += go[91];
+	m_A115 += go[92];
+	double RHS30 = Idr[89];
+	RHS30 += Idr[90];
+	RHS30 += Idr[91];
+	RHS30 += Idr[92];
+	RHS30 += Idr[93];
+	RHS30 += Idr[94];
+	RHS30 -= go[93] * *cnV[93];
+	RHS30 -= go[94] * *cnV[94];
 	const double f0 = 1.0 / m_A0;
-	const double f0_7 = -f0 * m_A19;
-	m_A21 += m_A1 * f0_7;
-	RHS7 += f0_7 * RHS0;
+	const double f0_18 = -f0 * m_A45;
+	m_A47 += m_A1 * f0_18;
+	RHS18 += f0_18 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_10 = -f1 * m_A43;
-	m_A48 += m_A3 * f1_10;
-	RHS10 += f1_10 * RHS1;
+	const double f1_20 = -f1 * m_A53;
+	m_A58 += m_A3 * f1_20;
+	RHS20 += f1_20 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_12 = -f2 * m_A59;
-	m_A66 += m_A5 * f2_12;
-	RHS12 += f2_12 * RHS2;
+	const double f2_27 = -f2 * m_A92;
+	m_A98 += m_A5 * f2_27;
+	RHS27 += f2_27 * RHS2;
 	const double f3 = 1.0 / m_A6;
-	const double f3_11 = -f3 * m_A51;
-	m_A57 += m_A7 * f3_11;
-	RHS11 += f3_11 * RHS3;
-	const double f4 = 1.0 / m_A8;
-	const double f4_9 = -f4 * m_A35;
-	m_A39 += m_A9 * f4_9;
-	RHS9 += f4_9 * RHS4;
-	const double f5 = 1.0 / m_A10;
-	const double f5_8 = -f5 * m_A27;
-	m_A30 += m_A11 * f5_8;
-	RHS8 += f5_8 * RHS5;
-	const double f6 = 1.0 / m_A12;
-	const double f6_7 = -f6 * m_A20;
-	m_A21 += m_A13 * f6_7;
-	m_A22 += m_A14 * f6_7;
-	m_A23 += m_A15 * f6_7;
-	m_A24 += m_A16 * f6_7;
-	m_A25 += m_A17 * f6_7;
-	m_A26 += m_A18 * f6_7;
-	RHS7 += f6_7 * RHS6;
-	const double f6_8 = -f6 * m_A28;
-	m_A29 += m_A13 * f6_8;
-	m_A30 += m_A14 * f6_8;
-	m_A31 += m_A15 * f6_8;
-	m_A32 += m_A16 * f6_8;
-	m_A33 += m_A17 * f6_8;
-	m_A34 += m_A18 * f6_8;
-	RHS8 += f6_8 * RHS6;
-	const double f6_9 = -f6 * m_A36;
-	m_A37 += m_A13 * f6_9;
-	m_A38 += m_A14 * f6_9;
-	m_A39 += m_A15 * f6_9;
-	m_A40 += m_A16 * f6_9;
-	m_A41 += m_A17 * f6_9;
-	m_A42 += m_A18 * f6_9;
-	RHS9 += f6_9 * RHS6;
-	const double f6_10 = -f6 * m_A44;
-	m_A45 += m_A13 * f6_10;
-	m_A46 += m_A14 * f6_10;
-	m_A47 += m_A15 * f6_10;
-	m_A48 += m_A16 * f6_10;
-	m_A49 += m_A17 * f6_10;
-	m_A50 += m_A18 * f6_10;
-	RHS10 += f6_10 * RHS6;
-	const double f6_11 = -f6 * m_A52;
-	m_A53 += m_A13 * f6_11;
-	m_A54 += m_A14 * f6_11;
-	m_A55 += m_A15 * f6_11;
-	m_A56 += m_A16 * f6_11;
-	m_A57 += m_A17 * f6_11;
-	m_A58 += m_A18 * f6_11;
-	RHS11 += f6_11 * RHS6;
-	const double f6_12 = -f6 * m_A60;
-	m_A61 += m_A13 * f6_12;
-	m_A62 += m_A14 * f6_12;
-	m_A63 += m_A15 * f6_12;
-	m_A64 += m_A16 * f6_12;
-	m_A65 += m_A17 * f6_12;
-	m_A66 += m_A18 * f6_12;
-	RHS12 += f6_12 * RHS6;
-	const double f7 = 1.0 / m_A21;
-	const double f7_8 = -f7 * m_A29;
-	m_A30 += m_A22 * f7_8;
-	m_A31 += m_A23 * f7_8;
-	m_A32 += m_A24 * f7_8;
-	m_A33 += m_A25 * f7_8;
-	m_A34 += m_A26 * f7_8;
-	RHS8 += f7_8 * RHS7;
-	const double f7_9 = -f7 * m_A37;
-	m_A38 += m_A22 * f7_9;
-	m_A39 += m_A23 * f7_9;
-	m_A40 += m_A24 * f7_9;
-	m_A41 += m_A25 * f7_9;
-	m_A42 += m_A26 * f7_9;
-	RHS9 += f7_9 * RHS7;
-	const double f7_10 = -f7 * m_A45;
-	m_A46 += m_A22 * f7_10;
-	m_A47 += m_A23 * f7_10;
-	m_A48 += m_A24 * f7_10;
-	m_A49 += m_A25 * f7_10;
-	m_A50 += m_A26 * f7_10;
-	RHS10 += f7_10 * RHS7;
-	const double f7_11 = -f7 * m_A53;
-	m_A54 += m_A22 * f7_11;
-	m_A55 += m_A23 * f7_11;
-	m_A56 += m_A24 * f7_11;
-	m_A57 += m_A25 * f7_11;
-	m_A58 += m_A26 * f7_11;
-	RHS11 += f7_11 * RHS7;
-	const double f7_12 = -f7 * m_A61;
-	m_A62 += m_A22 * f7_12;
-	m_A63 += m_A23 * f7_12;
-	m_A64 += m_A24 * f7_12;
-	m_A65 += m_A25 * f7_12;
-	m_A66 += m_A26 * f7_12;
-	RHS12 += f7_12 * RHS7;
-	const double f8 = 1.0 / m_A30;
-	const double f8_9 = -f8 * m_A38;
-	m_A39 += m_A31 * f8_9;
-	m_A40 += m_A32 * f8_9;
-	m_A41 += m_A33 * f8_9;
-	m_A42 += m_A34 * f8_9;
-	RHS9 += f8_9 * RHS8;
-	const double f8_10 = -f8 * m_A46;
-	m_A47 += m_A31 * f8_10;
-	m_A48 += m_A32 * f8_10;
-	m_A49 += m_A33 * f8_10;
-	m_A50 += m_A34 * f8_10;
-	RHS10 += f8_10 * RHS8;
-	const double f8_11 = -f8 * m_A54;
-	m_A55 += m_A31 * f8_11;
-	m_A56 += m_A32 * f8_11;
-	m_A57 += m_A33 * f8_11;
-	m_A58 += m_A34 * f8_11;
-	RHS11 += f8_11 * RHS8;
-	const double f8_12 = -f8 * m_A62;
-	m_A63 += m_A31 * f8_12;
-	m_A64 += m_A32 * f8_12;
-	m_A65 += m_A33 * f8_12;
-	m_A66 += m_A34 * f8_12;
-	RHS12 += f8_12 * RHS8;
-	const double f9 = 1.0 / m_A39;
-	const double f9_10 = -f9 * m_A47;
-	m_A48 += m_A40 * f9_10;
-	m_A49 += m_A41 * f9_10;
-	m_A50 += m_A42 * f9_10;
-	RHS10 += f9_10 * RHS9;
-	const double f9_11 = -f9 * m_A55;
-	m_A56 += m_A40 * f9_11;
-	m_A57 += m_A41 * f9_11;
-	m_A58 += m_A42 * f9_11;
-	RHS11 += f9_11 * RHS9;
-	const double f9_12 = -f9 * m_A63;
-	m_A64 += m_A40 * f9_12;
-	m_A65 += m_A41 * f9_12;
-	m_A66 += m_A42 * f9_12;
-	RHS12 += f9_12 * RHS9;
-	const double f10 = 1.0 / m_A48;
-	const double f10_11 = -f10 * m_A56;
-	m_A57 += m_A49 * f10_11;
-	m_A58 += m_A50 * f10_11;
-	RHS11 += f10_11 * RHS10;
-	const double f10_12 = -f10 * m_A64;
-	m_A65 += m_A49 * f10_12;
-	m_A66 += m_A50 * f10_12;
-	RHS12 += f10_12 * RHS10;
-	const double f11 = 1.0 / m_A57;
-	const double f11_12 = -f11 * m_A65;
-	m_A66 += m_A58 * f11_12;
-	RHS12 += f11_12 * RHS11;
-	V[12] = RHS12 / m_A66;
+	const double f3_20 = -f3 * m_A54;
+	m_A58 += m_A7 * f3_20;
+	m_A60 += m_A8 * f3_20;
+	RHS20 += f3_20 * RHS3;
+	const double f3_23 = -f3 * m_A71;
+	m_A72 += m_A7 * f3_23;
+	m_A75 += m_A8 * f3_23;
+	RHS23 += f3_23 * RHS3;
+	const double f4 = 1.0 / m_A9;
+	const double f4_25 = -f4 * m_A83;
+	m_A84 += m_A10 * f4_25;
+	m_A85 += m_A11 * f4_25;
+	RHS25 += f4_25 * RHS4;
+	const double f4_28 = -f4 * m_A100;
+	m_A102 += m_A10 * f4_28;
+	m_A103 += m_A11 * f4_28;
+	RHS28 += f4_28 * RHS4;
+	const double f5 = 1.0 / m_A12;
+	const double f5_30 = -f5 * m_A112;
+	m_A115 += m_A13 * f5_30;
+	RHS30 += f5_30 * RHS5;
+	const double f6 = 1.0 / m_A14;
+	const double f6_18 = -f6 * m_A46;
+	m_A47 += m_A15 * f6_18;
+	m_A48 += m_A16 * f6_18;
+	RHS18 += f6_18 * RHS6;
+	const double f6_30 = -f6 * m_A113;
+	m_A114 += m_A15 * f6_30;
+	m_A118 += m_A16 * f6_30;
+	RHS30 += f6_30 * RHS6;
+	const double f7 = 1.0 / m_A17;
+	const double f7_19 = -f7 * m_A49;
+	m_A51 += m_A18 * f7_19;
+	RHS19 += f7_19 * RHS7;
+	const double f8 = 1.0 / m_A19;
+	const double f8_19 = -f8 * m_A50;
+	m_A51 += m_A20 * f8_19;
+	m_A52 += m_A21 * f8_19;
+	RHS19 += f8_19 * RHS8;
+	const double f8_20 = -f8 * m_A55;
+	m_A57 += m_A20 * f8_20;
+	m_A58 += m_A21 * f8_20;
+	RHS20 += f8_20 * RHS8;
+	const double f9 = 1.0 / m_A22;
+	const double f9_20 = -f9 * m_A56;
+	m_A58 += m_A23 * f9_20;
+	m_A59 += m_A24 * f9_20;
+	RHS20 += f9_20 * RHS9;
+	const double f9_21 = -f9 * m_A61;
+	m_A63 += m_A23 * f9_21;
+	m_A64 += m_A24 * f9_21;
+	RHS21 += f9_21 * RHS9;
+	const double f10 = 1.0 / m_A25;
+	const double f10_21 = -f10 * m_A62;
+	m_A64 += m_A26 * f10_21;
+	m_A65 += m_A27 * f10_21;
+	RHS21 += f10_21 * RHS10;
+	const double f10_22 = -f10 * m_A67;
+	m_A68 += m_A26 * f10_22;
+	m_A69 += m_A27 * f10_22;
+	RHS22 += f10_22 * RHS10;
+	const double f11 = 1.0 / m_A28;
+	const double f11_24 = -f11 * m_A78;
+	m_A81 += m_A29 * f11_24;
+	RHS24 += f11_24 * RHS11;
+	const double f12 = 1.0 / m_A30;
+	const double f12_24 = -f12 * m_A79;
+	m_A81 += m_A31 * f12_24;
+	RHS24 += f12_24 * RHS12;
+	const double f13 = 1.0 / m_A32;
+	const double f13_24 = -f13 * m_A80;
+	m_A81 += m_A33 * f13_24;
+	m_A82 += m_A34 * f13_24;
+	RHS24 += f13_24 * RHS13;
+	const double f13_27 = -f13 * m_A93;
+	m_A96 += m_A33 * f13_27;
+	m_A98 += m_A34 * f13_27;
+	RHS27 += f13_27 * RHS13;
+	const double f14 = 1.0 / m_A35;
+	const double f14_26 = -f14 * m_A87;
+	m_A90 += m_A36 * f14_26;
+	RHS26 += f14_26 * RHS14;
+	const double f15 = 1.0 / m_A37;
+	const double f15_26 = -f15 * m_A88;
+	m_A90 += m_A38 * f15_26;
+	RHS26 += f15_26 * RHS15;
+	const double f16 = 1.0 / m_A39;
+	const double f16_26 = -f16 * m_A89;
+	m_A90 += m_A40 * f16_26;
+	m_A91 += m_A41 * f16_26;
+	RHS26 += f16_26 * RHS16;
+	const double f16_27 = -f16 * m_A94;
+	m_A97 += m_A40 * f16_27;
+	m_A98 += m_A41 * f16_27;
+	RHS27 += f16_27 * RHS16;
+	const double f17 = 1.0 / m_A42;
+	const double f17_27 = -f17 * m_A95;
+	m_A98 += m_A43 * f17_27;
+	m_A99 += m_A44 * f17_27;
+	RHS27 += f17_27 * RHS17;
+	const double f17_29 = -f17 * m_A106;
+	m_A108 += m_A43 * f17_29;
+	m_A110 += m_A44 * f17_29;
+	RHS29 += f17_29 * RHS17;
+	const double f18 = 1.0 / m_A47;
+	const double f18_30 = -f18 * m_A114;
+	m_A118 += m_A48 * f18_30;
+	RHS30 += f18_30 * RHS18;
+	const double f19 = 1.0 / m_A51;
+	const double f19_20 = -f19 * m_A57;
+	m_A58 += m_A52 * f19_20;
+	RHS20 += f19_20 * RHS19;
+	const double f20 = 1.0 / m_A58;
+	const double f20_21 = -f20 * m_A63;
+	m_A64 += m_A59 * f20_21;
+	m_A66 += m_A60 * f20_21;
+	RHS21 += f20_21 * RHS20;
+	const double f20_23 = -f20 * m_A72;
+	m_A73 += m_A59 * f20_23;
+	m_A75 += m_A60 * f20_23;
+	RHS23 += f20_23 * RHS20;
+	const double f21 = 1.0 / m_A64;
+	const double f21_22 = -f21 * m_A68;
+	m_A69 += m_A65 * f21_22;
+	m_A70 += m_A66 * f21_22;
+	RHS22 += f21_22 * RHS21;
+	const double f21_23 = -f21 * m_A73;
+	m_A74 += m_A65 * f21_23;
+	m_A75 += m_A66 * f21_23;
+	RHS23 += f21_23 * RHS21;
+	const double f22 = 1.0 / m_A69;
+	const double f22_23 = -f22 * m_A74;
+	m_A75 += m_A70 * f22_23;
+	RHS23 += f22_23 * RHS22;
+	const double f23 = 1.0 / m_A75;
+	const double f23_28 = -f23 * m_A101;
+	m_A103 += m_A76 * f23_28;
+	m_A104 += m_A77 * f23_28;
+	RHS28 += f23_28 * RHS23;
+	const double f23_29 = -f23 * m_A107;
+	m_A109 += m_A76 * f23_29;
+	m_A110 += m_A77 * f23_29;
+	RHS29 += f23_29 * RHS23;
+	const double f24 = 1.0 / m_A81;
+	const double f24_27 = -f24 * m_A96;
+	m_A98 += m_A82 * f24_27;
+	RHS27 += f24_27 * RHS24;
+	const double f25 = 1.0 / m_A84;
+	const double f25_28 = -f25 * m_A102;
+	m_A103 += m_A85 * f25_28;
+	m_A105 += m_A86 * f25_28;
+	RHS28 += f25_28 * RHS25;
+	const double f25_30 = -f25 * m_A115;
+	m_A116 += m_A85 * f25_30;
+	m_A118 += m_A86 * f25_30;
+	RHS30 += f25_30 * RHS25;
+	const double f26 = 1.0 / m_A90;
+	const double f26_27 = -f26 * m_A97;
+	m_A98 += m_A91 * f26_27;
+	RHS27 += f26_27 * RHS26;
+	const double f27 = 1.0 / m_A98;
+	const double f27_29 = -f27 * m_A108;
+	m_A110 += m_A99 * f27_29;
+	RHS29 += f27_29 * RHS27;
+	const double f28 = 1.0 / m_A103;
+	const double f28_29 = -f28 * m_A109;
+	m_A110 += m_A104 * f28_29;
+	m_A111 += m_A105 * f28_29;
+	RHS29 += f28_29 * RHS28;
+	const double f28_30 = -f28 * m_A116;
+	m_A117 += m_A104 * f28_30;
+	m_A118 += m_A105 * f28_30;
+	RHS30 += f28_30 * RHS28;
+	const double f29 = 1.0 / m_A110;
+	const double f29_30 = -f29 * m_A117;
+	m_A118 += m_A111 * f29_30;
+	RHS30 += f29_30 * RHS29;
+	V[30] = RHS30 / m_A118;
+	double tmp29 = 0.0;
+	tmp29 += m_A111 * V[30];
+	V[29] = (RHS29 - tmp29) / m_A110;
+	double tmp28 = 0.0;
+	tmp28 += m_A104 * V[29];
+	tmp28 += m_A105 * V[30];
+	V[28] = (RHS28 - tmp28) / m_A103;
+	double tmp27 = 0.0;
+	tmp27 += m_A99 * V[29];
+	V[27] = (RHS27 - tmp27) / m_A98;
+	double tmp26 = 0.0;
+	tmp26 += m_A91 * V[27];
+	V[26] = (RHS26 - tmp26) / m_A90;
+	double tmp25 = 0.0;
+	tmp25 += m_A85 * V[28];
+	tmp25 += m_A86 * V[30];
+	V[25] = (RHS25 - tmp25) / m_A84;
+	double tmp24 = 0.0;
+	tmp24 += m_A82 * V[27];
+	V[24] = (RHS24 - tmp24) / m_A81;
+	double tmp23 = 0.0;
+	tmp23 += m_A76 * V[28];
+	tmp23 += m_A77 * V[29];
+	V[23] = (RHS23 - tmp23) / m_A75;
+	double tmp22 = 0.0;
+	tmp22 += m_A70 * V[23];
+	V[22] = (RHS22 - tmp22) / m_A69;
+	double tmp21 = 0.0;
+	tmp21 += m_A65 * V[22];
+	tmp21 += m_A66 * V[23];
+	V[21] = (RHS21 - tmp21) / m_A64;
+	double tmp20 = 0.0;
+	tmp20 += m_A59 * V[21];
+	tmp20 += m_A60 * V[23];
+	V[20] = (RHS20 - tmp20) / m_A58;
+	double tmp19 = 0.0;
+	tmp19 += m_A52 * V[20];
+	V[19] = (RHS19 - tmp19) / m_A51;
+	double tmp18 = 0.0;
+	tmp18 += m_A48 * V[30];
+	V[18] = (RHS18 - tmp18) / m_A47;
+	double tmp17 = 0.0;
+	tmp17 += m_A43 * V[27];
+	tmp17 += m_A44 * V[29];
+	V[17] = (RHS17 - tmp17) / m_A42;
+	double tmp16 = 0.0;
+	tmp16 += m_A40 * V[26];
+	tmp16 += m_A41 * V[27];
+	V[16] = (RHS16 - tmp16) / m_A39;
+	double tmp15 = 0.0;
+	tmp15 += m_A38 * V[26];
+	V[15] = (RHS15 - tmp15) / m_A37;
+	double tmp14 = 0.0;
+	tmp14 += m_A36 * V[26];
+	V[14] = (RHS14 - tmp14) / m_A35;
+	double tmp13 = 0.0;
+	tmp13 += m_A33 * V[24];
+	tmp13 += m_A34 * V[27];
+	V[13] = (RHS13 - tmp13) / m_A32;
+	double tmp12 = 0.0;
+	tmp12 += m_A31 * V[24];
+	V[12] = (RHS12 - tmp12) / m_A30;
 	double tmp11 = 0.0;
-	tmp11 += m_A58 * V[12];
-	V[11] = (RHS11 - tmp11) / m_A57;
+	tmp11 += m_A29 * V[24];
+	V[11] = (RHS11 - tmp11) / m_A28;
 	double tmp10 = 0.0;
-	tmp10 += m_A49 * V[11];
-	tmp10 += m_A50 * V[12];
-	V[10] = (RHS10 - tmp10) / m_A48;
+	tmp10 += m_A26 * V[21];
+	tmp10 += m_A27 * V[22];
+	V[10] = (RHS10 - tmp10) / m_A25;
 	double tmp9 = 0.0;
-	tmp9 += m_A40 * V[10];
-	tmp9 += m_A41 * V[11];
-	tmp9 += m_A42 * V[12];
-	V[9] = (RHS9 - tmp9) / m_A39;
+	tmp9 += m_A23 * V[20];
+	tmp9 += m_A24 * V[21];
+	V[9] = (RHS9 - tmp9) / m_A22;
 	double tmp8 = 0.0;
-	tmp8 += m_A31 * V[9];
-	tmp8 += m_A32 * V[10];
-	tmp8 += m_A33 * V[11];
-	tmp8 += m_A34 * V[12];
-	V[8] = (RHS8 - tmp8) / m_A30;
+	tmp8 += m_A20 * V[19];
+	tmp8 += m_A21 * V[20];
+	V[8] = (RHS8 - tmp8) / m_A19;
 	double tmp7 = 0.0;
-	tmp7 += m_A22 * V[8];
-	tmp7 += m_A23 * V[9];
-	tmp7 += m_A24 * V[10];
-	tmp7 += m_A25 * V[11];
-	tmp7 += m_A26 * V[12];
-	V[7] = (RHS7 - tmp7) / m_A21;
+	tmp7 += m_A18 * V[19];
+	V[7] = (RHS7 - tmp7) / m_A17;
 	double tmp6 = 0.0;
-	tmp6 += m_A13 * V[7];
-	tmp6 += m_A14 * V[8];
-	tmp6 += m_A15 * V[9];
-	tmp6 += m_A16 * V[10];
-	tmp6 += m_A17 * V[11];
-	tmp6 += m_A18 * V[12];
-	V[6] = (RHS6 - tmp6) / m_A12;
+	tmp6 += m_A15 * V[18];
+	tmp6 += m_A16 * V[30];
+	V[6] = (RHS6 - tmp6) / m_A14;
 	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[8];
-	V[5] = (RHS5 - tmp5) / m_A10;
+	tmp5 += m_A13 * V[25];
+	V[5] = (RHS5 - tmp5) / m_A12;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[9];
-	V[4] = (RHS4 - tmp4) / m_A8;
+	tmp4 += m_A10 * V[25];
+	tmp4 += m_A11 * V[28];
+	V[4] = (RHS4 - tmp4) / m_A9;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[11];
+	tmp3 += m_A7 * V[20];
+	tmp3 += m_A8 * V[23];
 	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[12];
+	tmp2 += m_A5 * V[27];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[10];
+	tmp1 += m_A3 * V[20];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[7];
+	tmp0 += m_A1 * V[18];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// 280zzzap
-static void nl_gcr_20d478ed5597161_123_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// spacewar
+static void nl_gcr_15e8f6fb021de0f9_28_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -904,799 +1208,171 @@
 	double m_A25(0.0);
 	double m_A26(0.0);
 	double m_A27(0.0);
-	double m_A28(0.0);
-	double m_A29(0.0);
-	double m_A30(0.0);
-	double m_A31(0.0);
-	double m_A32(0.0);
-	double m_A33(0.0);
-	double m_A34(0.0);
-	double m_A35(0.0);
-	double m_A36(0.0);
-	double m_A37(0.0);
-	double m_A38(0.0);
-	double m_A39(0.0);
-	double m_A40(0.0);
-	double m_A41(0.0);
-	double m_A42(0.0);
-	double m_A43(0.0);
-	double m_A44(0.0);
-	double m_A45(0.0);
-	double m_A46(0.0);
-	double m_A47(0.0);
-	double m_A48(0.0);
-	double m_A49(0.0);
-	double m_A50(0.0);
-	double m_A51(0.0);
-	double m_A52(0.0);
-	double m_A53(0.0);
-	double m_A54(0.0);
-	double m_A55(0.0);
-	double m_A56(0.0);
-	double m_A57(0.0);
-	double m_A58(0.0);
-	double m_A59(0.0);
-	double m_A60(0.0);
-	double m_A61(0.0);
-	double m_A62(0.0);
-	double m_A63(0.0);
-	double m_A64(0.0);
-	double m_A65(0.0);
-	double m_A66(0.0);
-	double m_A67(0.0);
-	double m_A68(0.0);
-	double m_A69(0.0);
-	double m_A70(0.0);
-	double m_A71(0.0);
-	double m_A72(0.0);
-	double m_A73(0.0);
-	double m_A74(0.0);
-	double m_A75(0.0);
-	double m_A76(0.0);
-	double m_A77(0.0);
-	double m_A78(0.0);
-	double m_A79(0.0);
-	double m_A80(0.0);
-	double m_A81(0.0);
-	double m_A82(0.0);
-	double m_A83(0.0);
-	double m_A84(0.0);
-	double m_A85(0.0);
-	double m_A86(0.0);
-	double m_A87(0.0);
-	double m_A88(0.0);
-	double m_A89(0.0);
-	double m_A90(0.0);
-	double m_A91(0.0);
-	double m_A92(0.0);
-	double m_A93(0.0);
-	double m_A94(0.0);
-	double m_A95(0.0);
-	double m_A96(0.0);
-	double m_A97(0.0);
-	double m_A98(0.0);
-	double m_A99(0.0);
-	double m_A100(0.0);
-	double m_A101(0.0);
-	double m_A102(0.0);
-	double m_A103(0.0);
-	double m_A104(0.0);
-	double m_A105(0.0);
-	double m_A106(0.0);
-	double m_A107(0.0);
-	double m_A108(0.0);
-	double m_A109(0.0);
-	double m_A110(0.0);
-	double m_A111(0.0);
-	double m_A112(0.0);
-	double m_A113(0.0);
-	double m_A114(0.0);
-	double m_A115(0.0);
-	double m_A116(0.0);
-	double m_A117(0.0);
-	double m_A118(0.0);
-	double m_A119(0.0);
-	double m_A120(0.0);
-	double m_A121(0.0);
-	double m_A122(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
-	m_A0 += gt[2];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
-	RHS0 += Idr[2];
 	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[2];
 	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 -= go[4] * *cnV[4];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
 	m_A4 += gt[5];
 	m_A4 += gt[6];
 	m_A4 += gt[7];
 	m_A4 += gt[8];
 	m_A4 += gt[9];
 	m_A4 += gt[10];
-	m_A4 += gt[11];
-	m_A5 += go[5];
-	double RHS2 = Idr[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
 	RHS2 += Idr[6];
 	RHS2 += Idr[7];
 	RHS2 += Idr[8];
 	RHS2 += Idr[9];
 	RHS2 += Idr[10];
-	RHS2 += Idr[11];
+	RHS2 -= go[5] * *cnV[5];
 	RHS2 -= go[6] * *cnV[6];
 	RHS2 -= go[7] * *cnV[7];
 	RHS2 -= go[8] * *cnV[8];
 	RHS2 -= go[9] * *cnV[9];
 	RHS2 -= go[10] * *cnV[10];
-	RHS2 -= go[11] * *cnV[11];
+	m_A6 += gt[11];
 	m_A6 += gt[12];
 	m_A6 += gt[13];
 	m_A6 += gt[14];
-	m_A7 += go[12];
-	double RHS3 = Idr[12];
+	m_A6 += gt[15];
+	m_A8 += go[11];
+	m_A9 += go[12];
+	m_A7 += go[13];
+	double RHS3 = Idr[11];
+	RHS3 += Idr[12];
 	RHS3 += Idr[13];
 	RHS3 += Idr[14];
-	RHS3 -= go[13] * *cnV[13];
+	RHS3 += Idr[15];
 	RHS3 -= go[14] * *cnV[14];
-	m_A8 += gt[15];
-	m_A8 += gt[16];
-	m_A8 += gt[17];
-	m_A8 += gt[18];
-	m_A8 += gt[19];
-	m_A8 += gt[20];
-	m_A8 += gt[21];
-	m_A9 += go[15];
-	double RHS4 = Idr[15];
-	RHS4 += Idr[16];
+	RHS3 -= go[15] * *cnV[15];
+	m_A12 += gt[16];
+	m_A12 += gt[17];
+	m_A10 += go[16];
+	m_A11 += go[17];
+	double RHS4 = Idr[16];
 	RHS4 += Idr[17];
-	RHS4 += Idr[18];
-	RHS4 += Idr[19];
-	RHS4 += Idr[20];
-	RHS4 += Idr[21];
-	RHS4 -= go[16] * *cnV[16];
-	RHS4 -= go[17] * *cnV[17];
-	RHS4 -= go[18] * *cnV[18];
-	RHS4 -= go[19] * *cnV[19];
-	RHS4 -= go[20] * *cnV[20];
-	RHS4 -= go[21] * *cnV[21];
-	m_A10 += gt[22];
-	m_A10 += gt[23];
-	m_A11 += go[22];
-	double RHS5 = Idr[22];
-	RHS5 += Idr[23];
-	RHS5 -= go[23] * *cnV[23];
-	m_A12 += gt[24];
-	m_A12 += gt[25];
-	m_A14 += go[24];
-	m_A13 += go[25];
-	double RHS6 = Idr[24];
-	RHS6 += Idr[25];
-	m_A15 += gt[26];
-	m_A15 += gt[27];
-	m_A16 += go[26];
-	double RHS7 = Idr[26];
+	m_A16 += gt[18];
+	m_A16 += gt[19];
+	m_A16 += gt[20];
+	m_A15 += go[18];
+	m_A17 += go[19];
+	double RHS5 = Idr[18];
+	RHS5 += Idr[19];
+	RHS5 += Idr[20];
+	RHS5 -= go[20] * *cnV[20];
+	m_A20 += gt[21];
+	m_A20 += gt[22];
+	m_A20 += gt[23];
+	m_A18 += go[21];
+	double RHS6 = Idr[21];
+	RHS6 += Idr[22];
+	RHS6 += Idr[23];
+	RHS6 -= go[22] * *cnV[22];
+	RHS6 -= go[23] * *cnV[23];
+	m_A27 += gt[24];
+	m_A27 += gt[25];
+	m_A27 += gt[26];
+	m_A27 += gt[27];
+	m_A27 += gt[28];
+	m_A22 += go[24];
+	m_A23 += go[25];
+	m_A25 += go[26];
+	double RHS7 = Idr[24];
+	RHS7 += Idr[25];
+	RHS7 += Idr[26];
 	RHS7 += Idr[27];
+	RHS7 += Idr[28];
 	RHS7 -= go[27] * *cnV[27];
-	m_A17 += gt[28];
-	m_A17 += gt[29];
-	m_A18 += go[28];
-	double RHS8 = Idr[28];
-	RHS8 += Idr[29];
-	RHS8 -= go[29] * *cnV[29];
-	m_A19 += gt[30];
-	m_A19 += gt[31];
-	m_A19 += gt[32];
-	m_A19 += gt[33];
-	m_A19 += gt[34];
-	m_A19 += gt[35];
-	m_A19 += gt[36];
-	m_A20 += go[30];
-	double RHS9 = Idr[30];
-	RHS9 += Idr[31];
-	RHS9 += Idr[32];
-	RHS9 += Idr[33];
-	RHS9 += Idr[34];
-	RHS9 += Idr[35];
-	RHS9 += Idr[36];
-	RHS9 -= go[31] * *cnV[31];
-	RHS9 -= go[32] * *cnV[32];
-	RHS9 -= go[33] * *cnV[33];
-	RHS9 -= go[34] * *cnV[34];
-	RHS9 -= go[35] * *cnV[35];
-	RHS9 -= go[36] * *cnV[36];
-	m_A21 += gt[37];
-	m_A21 += gt[38];
-	m_A21 += gt[39];
-	m_A22 += go[37];
-	double RHS10 = Idr[37];
-	RHS10 += Idr[38];
-	RHS10 += Idr[39];
-	RHS10 -= go[38] * *cnV[38];
-	RHS10 -= go[39] * *cnV[39];
-	m_A23 += gt[40];
-	m_A23 += gt[41];
-	m_A23 += gt[42];
-	m_A23 += gt[43];
-	m_A24 += go[40];
-	double RHS11 = Idr[40];
-	RHS11 += Idr[41];
-	RHS11 += Idr[42];
-	RHS11 += Idr[43];
-	RHS11 -= go[41] * *cnV[41];
-	RHS11 -= go[42] * *cnV[42];
-	RHS11 -= go[43] * *cnV[43];
-	m_A25 += gt[44];
-	m_A25 += gt[45];
-	m_A25 += gt[46];
-	m_A25 += gt[47];
-	m_A25 += gt[48];
-	m_A25 += gt[49];
-	m_A25 += gt[50];
-	m_A26 += go[44];
-	double RHS12 = Idr[44];
-	RHS12 += Idr[45];
-	RHS12 += Idr[46];
-	RHS12 += Idr[47];
-	RHS12 += Idr[48];
-	RHS12 += Idr[49];
-	RHS12 += Idr[50];
-	RHS12 -= go[45] * *cnV[45];
-	RHS12 -= go[46] * *cnV[46];
-	RHS12 -= go[47] * *cnV[47];
-	RHS12 -= go[48] * *cnV[48];
-	RHS12 -= go[49] * *cnV[49];
-	RHS12 -= go[50] * *cnV[50];
-	m_A27 += gt[51];
-	m_A27 += gt[52];
-	m_A28 += go[51];
-	double RHS13 = Idr[51];
-	RHS13 += Idr[52];
-	RHS13 -= go[52] * *cnV[52];
-	m_A29 += gt[53];
-	m_A29 += gt[54];
-	m_A30 += go[53];
-	double RHS14 = Idr[53];
-	RHS14 += Idr[54];
-	RHS14 -= go[54] * *cnV[54];
-	m_A31 += gt[55];
-	m_A31 += gt[56];
-	m_A32 += go[55];
-	double RHS15 = Idr[55];
-	RHS15 += Idr[56];
-	RHS15 -= go[56] * *cnV[56];
-	m_A33 += gt[57];
-	m_A33 += gt[58];
-	m_A33 += gt[59];
-	m_A33 += gt[60];
-	m_A35 += go[57];
-	m_A34 += go[58];
-	double RHS16 = Idr[57];
-	RHS16 += Idr[58];
-	RHS16 += Idr[59];
-	RHS16 += Idr[60];
-	RHS16 -= go[59] * *cnV[59];
-	RHS16 -= go[60] * *cnV[60];
-	m_A36 += gt[61];
-	m_A36 += gt[62];
-	m_A36 += gt[63];
-	m_A37 += go[61];
-	double RHS17 = Idr[61];
-	RHS17 += Idr[62];
-	RHS17 += Idr[63];
-	RHS17 -= go[62] * *cnV[62];
-	RHS17 -= go[63] * *cnV[63];
-	m_A38 += gt[64];
-	m_A38 += gt[65];
-	m_A39 += go[64];
-	double RHS18 = Idr[64];
-	RHS18 += Idr[65];
-	RHS18 -= go[65] * *cnV[65];
-	m_A40 += gt[66];
-	m_A40 += gt[67];
-	m_A41 += go[66];
-	double RHS19 = Idr[66];
-	RHS19 += Idr[67];
-	RHS19 -= go[67] * *cnV[67];
-	m_A43 += gt[68];
-	m_A43 += gt[69];
-	m_A43 += gt[70];
-	m_A43 += gt[71];
-	m_A42 += go[68];
-	double RHS20 = Idr[68];
-	RHS20 += Idr[69];
-	RHS20 += Idr[70];
-	RHS20 += Idr[71];
-	RHS20 -= go[69] * *cnV[69];
-	RHS20 -= go[70] * *cnV[70];
-	RHS20 -= go[71] * *cnV[71];
-	m_A47 += gt[72];
-	m_A47 += gt[73];
-	m_A46 += go[72];
-	m_A45 += go[73];
-	double RHS21 = Idr[72];
-	RHS21 += Idr[73];
-	m_A51 += gt[74];
-	m_A51 += gt[75];
-	m_A49 += go[74];
-	double RHS22 = Idr[74];
-	RHS22 += Idr[75];
-	RHS22 -= go[75] * *cnV[75];
-	m_A54 += gt[76];
-	m_A54 += gt[77];
-	m_A54 += gt[78];
-	m_A53 += go[76];
-	m_A52 += go[77];
-	double RHS23 = Idr[76];
-	RHS23 += Idr[77];
-	RHS23 += Idr[78];
-	RHS23 -= go[78] * *cnV[78];
-	m_A56 += gt[79];
-	m_A56 += gt[80];
-	m_A56 += gt[81];
-	m_A56 += gt[82];
-	m_A55 += go[79];
-	m_A57 += go[80];
-	double RHS24 = Idr[79];
-	RHS24 += Idr[80];
-	RHS24 += Idr[81];
-	RHS24 += Idr[82];
-	RHS24 -= go[81] * *cnV[81];
-	RHS24 -= go[82] * *cnV[82];
-	m_A59 += gt[83];
-	m_A59 += gt[84];
-	m_A59 += gt[85];
-	m_A59 += gt[86];
-	m_A58 += go[83];
-	m_A60 += go[84];
-	double RHS25 = Idr[83];
-	RHS25 += Idr[84];
-	RHS25 += Idr[85];
-	RHS25 += Idr[86];
-	RHS25 -= go[85] * *cnV[85];
-	RHS25 -= go[86] * *cnV[86];
-	m_A62 += gt[87];
-	m_A62 += gt[88];
-	m_A63 += go[87];
-	m_A61 += go[88];
-	double RHS26 = Idr[87];
-	RHS26 += Idr[88];
-	m_A67 += gt[89];
-	m_A67 += gt[90];
-	m_A67 += gt[91];
-	m_A67 += gt[92];
-	m_A67 += gt[93];
-	m_A67 += gt[94];
-	m_A64 += go[89];
-	m_A65 += go[90];
-	m_A69 += go[91];
-	m_A68 += go[92];
-	double RHS27 = Idr[89];
-	RHS27 += Idr[90];
-	RHS27 += Idr[91];
-	RHS27 += Idr[92];
-	RHS27 += Idr[93];
-	RHS27 += Idr[94];
-	RHS27 -= go[93] * *cnV[93];
-	RHS27 -= go[94] * *cnV[94];
-	m_A72 += gt[95];
-	m_A72 += gt[96];
-	m_A72 += gt[97];
-	m_A72 += gt[98];
-	m_A71 += go[95];
-	m_A73 += go[96];
-	double RHS28 = Idr[95];
-	RHS28 += Idr[96];
-	RHS28 += Idr[97];
-	RHS28 += Idr[98];
-	RHS28 -= go[97] * *cnV[97];
-	RHS28 -= go[98] * *cnV[98];
-	m_A76 += gt[99];
-	m_A76 += gt[100];
-	m_A76 += gt[101];
-	m_A76 += gt[102];
-	m_A77 += go[99];
-	m_A78 += go[100];
-	m_A74 += go[101];
-	m_A75 += go[102];
-	double RHS29 = Idr[99];
-	RHS29 += Idr[100];
-	RHS29 += Idr[101];
-	RHS29 += Idr[102];
-	m_A81 += gt[103];
-	m_A81 += gt[104];
-	m_A81 += gt[105];
-	m_A80 += go[103];
-	m_A79 += go[104];
-	double RHS30 = Idr[103];
-	RHS30 += Idr[104];
-	RHS30 += Idr[105];
-	RHS30 -= go[105] * *cnV[105];
-	m_A84 += gt[106];
-	m_A84 += gt[107];
-	m_A82 += go[106];
-	m_A83 += go[107];
-	double RHS31 = Idr[106];
-	RHS31 += Idr[107];
-	m_A91 += gt[108];
-	m_A91 += gt[109];
-	m_A91 += gt[110];
-	m_A91 += gt[111];
-	m_A91 += gt[112];
-	m_A86 += go[108];
-	m_A90 += go[109];
-	m_A88 += go[110];
-	m_A85 += go[111];
-	m_A87 += go[112];
-	double RHS32 = Idr[108];
-	RHS32 += Idr[109];
-	RHS32 += Idr[110];
-	RHS32 += Idr[111];
-	RHS32 += Idr[112];
-	m_A99 += gt[113];
-	m_A99 += gt[114];
-	m_A99 += gt[115];
-	m_A99 += gt[116];
-	m_A99 += gt[117];
-	m_A96 += go[113];
-	m_A100 += go[114];
-	m_A97 += go[115];
-	m_A94 += go[116];
-	m_A95 += go[117];
-	double RHS33 = Idr[113];
-	RHS33 += Idr[114];
-	RHS33 += Idr[115];
-	RHS33 += Idr[116];
-	RHS33 += Idr[117];
-	m_A106 += gt[118];
-	m_A106 += gt[119];
-	m_A106 += gt[120];
-	m_A106 += gt[121];
-	m_A103 += go[118];
-	m_A104 += go[119];
-	m_A101 += go[120];
-	m_A102 += go[121];
-	double RHS34 = Idr[118];
-	RHS34 += Idr[119];
-	RHS34 += Idr[120];
-	RHS34 += Idr[121];
-	m_A111 += gt[122];
-	m_A111 += gt[123];
-	m_A111 += gt[124];
-	m_A111 += gt[125];
-	m_A108 += go[122];
-	m_A109 += go[123];
-	double RHS35 = Idr[122];
-	RHS35 += Idr[123];
-	RHS35 += Idr[124];
-	RHS35 += Idr[125];
-	RHS35 -= go[124] * *cnV[124];
-	RHS35 -= go[125] * *cnV[125];
-	m_A122 += gt[126];
-	m_A122 += gt[127];
-	m_A122 += gt[128];
-	m_A122 += gt[129];
-	m_A122 += gt[130];
-	m_A122 += gt[131];
-	m_A113 += go[126];
-	m_A117 += go[127];
-	m_A120 += go[128];
-	m_A114 += go[129];
-	double RHS36 = Idr[126];
-	RHS36 += Idr[127];
-	RHS36 += Idr[128];
-	RHS36 += Idr[129];
-	RHS36 += Idr[130];
-	RHS36 += Idr[131];
-	RHS36 -= go[130] * *cnV[130];
-	RHS36 -= go[131] * *cnV[131];
+	RHS7 -= go[28] * *cnV[28];
 	const double f0 = 1.0 / m_A0;
-	const double f0_24 = -f0 * m_A55;
-	m_A57 += m_A1 * f0_24;
-	RHS24 += f0_24 * RHS0;
-	const double f0_32 = -f0 * m_A85;
-	m_A91 += m_A1 * f0_32;
-	RHS32 += f0_32 * RHS0;
+	const double f0_4 = -f0 * m_A10;
+	m_A12 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_32 = -f1 * m_A86;
-	m_A91 += m_A3 * f1_32;
-	RHS32 += f1_32 * RHS1;
+	const double f1_5 = -f1 * m_A15;
+	m_A16 += m_A3 * f1_5;
+	RHS5 += f1_5 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_27 = -f2 * m_A64;
-	m_A66 += m_A5 * f2_27;
-	RHS27 += f2_27 * RHS2;
+	const double f2_7 = -f2 * m_A22;
+	m_A25 += m_A5 * f2_7;
+	RHS7 += f2_7 * RHS2;
 	const double f3 = 1.0 / m_A6;
-	const double f3_25 = -f3 * m_A58;
-	m_A60 += m_A7 * f3_25;
-	RHS25 += f3_25 * RHS3;
-	const double f3_34 = -f3 * m_A101;
-	m_A106 += m_A7 * f3_34;
-	RHS34 += f3_34 * RHS3;
-	const double f4 = 1.0 / m_A8;
-	const double f4_20 = -f4 * m_A42;
-	m_A44 += m_A9 * f4_20;
-	RHS20 += f4_20 * RHS4;
-	const double f5 = 1.0 / m_A10;
-	const double f5_21 = -f5 * m_A45;
-	m_A47 += m_A11 * f5_21;
-	RHS21 += f5_21 * RHS5;
-	const double f5_32 = -f5 * m_A87;
-	m_A88 += m_A11 * f5_32;
-	RHS32 += f5_32 * RHS5;
-	const double f6 = 1.0 / m_A12;
-	const double f6_21 = -f6 * m_A46;
-	m_A47 += m_A13 * f6_21;
-	m_A48 += m_A14 * f6_21;
-	RHS21 += f6_21 * RHS6;
-	const double f6_22 = -f6 * m_A49;
-	m_A50 += m_A13 * f6_22;
-	m_A51 += m_A14 * f6_22;
-	RHS22 += f6_22 * RHS6;
-	const double f7 = 1.0 / m_A15;
-	const double f7_23 = -f7 * m_A52;
-	m_A54 += m_A16 * f7_23;
-	RHS23 += f7_23 * RHS7;
-	const double f7_34 = -f7 * m_A102;
-	m_A103 += m_A16 * f7_34;
-	RHS34 += f7_34 * RHS7;
-	const double f8 = 1.0 / m_A17;
-	const double f8_23 = -f8 * m_A53;
-	m_A54 += m_A18 * f8_23;
-	RHS23 += f8_23 * RHS8;
-	const double f9 = 1.0 / m_A19;
-	const double f9_36 = -f9 * m_A113;
-	m_A116 += m_A20 * f9_36;
-	RHS36 += f9_36 * RHS9;
-	const double f10 = 1.0 / m_A21;
-	const double f10_28 = -f10 * m_A71;
-	m_A73 += m_A22 * f10_28;
-	RHS28 += f10_28 * RHS10;
-	const double f10_33 = -f10 * m_A94;
-	m_A99 += m_A22 * f10_33;
-	RHS33 += f10_33 * RHS10;
-	const double f13 = 1.0 / m_A27;
-	const double f13_26 = -f13 * m_A61;
-	m_A62 += m_A28 * f13_26;
-	RHS26 += f13_26 * RHS13;
-	const double f13_33 = -f13 * m_A95;
-	m_A97 += m_A28 * f13_33;
-	RHS33 += f13_33 * RHS13;
-	const double f14 = 1.0 / m_A29;
-	const double f14_33 = -f14 * m_A96;
-	m_A99 += m_A30 * f14_33;
-	RHS33 += f14_33 * RHS14;
-	const double f15 = 1.0 / m_A31;
-	const double f15_31 = -f15 * m_A82;
-	m_A84 += m_A32 * f15_31;
-	RHS31 += f15_31 * RHS15;
-	const double f16 = 1.0 / m_A33;
-	const double f16_27 = -f16 * m_A65;
-	m_A67 += m_A34 * f16_27;
-	m_A70 += m_A35 * f16_27;
-	RHS27 += f16_27 * RHS16;
-	const double f16_36 = -f16 * m_A114;
-	m_A115 += m_A34 * f16_36;
-	m_A122 += m_A35 * f16_36;
-	RHS36 += f16_36 * RHS16;
-	const double f17 = 1.0 / m_A36;
-	const double f17_29 = -f17 * m_A74;
-	m_A76 += m_A37 * f17_29;
-	RHS29 += f17_29 * RHS17;
-	const double f17_35 = -f17 * m_A108;
-	m_A109 += m_A37 * f17_35;
-	RHS35 += f17_35 * RHS17;
-	const double f18 = 1.0 / m_A38;
-	const double f18_29 = -f18 * m_A75;
-	m_A77 += m_A39 * f18_29;
-	RHS29 += f18_29 * RHS18;
-	const double f18_30 = -f18 * m_A79;
-	m_A81 += m_A39 * f18_30;
-	RHS30 += f18_30 * RHS18;
-	const double f19 = 1.0 / m_A40;
-	const double f19_30 = -f19 * m_A80;
-	m_A81 += m_A41 * f19_30;
-	RHS30 += f19_30 * RHS19;
-	const double f21 = 1.0 / m_A47;
-	const double f21_22 = -f21 * m_A50;
-	m_A51 += m_A48 * f21_22;
-	RHS22 += f21_22 * RHS21;
-	const double f21_32 = -f21 * m_A88;
-	m_A89 += m_A48 * f21_32;
-	RHS32 += f21_32 * RHS21;
-	const double f22 = 1.0 / m_A51;
-	const double f22_32 = -f22 * m_A89;
-	RHS32 += f22_32 * RHS22;
-	const double f23 = 1.0 / m_A54;
-	const double f23_34 = -f23 * m_A103;
-	RHS34 += f23_34 * RHS23;
-	const double f24 = 1.0 / m_A56;
-	const double f24_27 = -f24 * m_A66;
-	m_A68 += m_A57 * f24_27;
-	RHS27 += f24_27 * RHS24;
-	const double f26 = 1.0 / m_A62;
-	const double f26_31 = -f26 * m_A83;
-	m_A84 += m_A63 * f26_31;
-	RHS31 += f26_31 * RHS26;
-	const double f26_33 = -f26 * m_A97;
-	m_A98 += m_A63 * f26_33;
-	RHS33 += f26_33 * RHS26;
-	const double f27 = 1.0 / m_A67;
-	const double f27_32 = -f27 * m_A90;
-	m_A91 += m_A68 * f27_32;
-	m_A92 += m_A69 * f27_32;
-	m_A93 += m_A70 * f27_32;
-	RHS32 += f27_32 * RHS27;
-	const double f27_34 = -f27 * m_A104;
-	m_A105 += m_A68 * f27_34;
-	m_A106 += m_A69 * f27_34;
-	m_A107 += m_A70 * f27_34;
-	RHS34 += f27_34 * RHS27;
-	const double f27_36 = -f27 * m_A115;
-	m_A119 += m_A68 * f27_36;
-	m_A121 += m_A69 * f27_36;
-	m_A122 += m_A70 * f27_36;
-	RHS36 += f27_36 * RHS27;
-	const double f28 = 1.0 / m_A72;
-	const double f28_36 = -f28 * m_A116;
-	m_A120 += m_A73 * f28_36;
-	RHS36 += f28_36 * RHS28;
-	const double f29 = 1.0 / m_A76;
-	const double f29_35 = -f29 * m_A109;
-	m_A110 += m_A77 * f29_35;
-	m_A112 += m_A78 * f29_35;
-	RHS35 += f29_35 * RHS29;
-	const double f29_36 = -f29 * m_A117;
-	m_A118 += m_A77 * f29_36;
-	m_A122 += m_A78 * f29_36;
-	RHS36 += f29_36 * RHS29;
-	const double f30 = 1.0 / m_A81;
-	const double f30_35 = -f30 * m_A110;
-	RHS35 += f30_35 * RHS30;
-	const double f30_36 = -f30 * m_A118;
-	RHS36 += f30_36 * RHS30;
-	const double f31 = 1.0 / m_A84;
-	const double f31_33 = -f31 * m_A98;
-	RHS33 += f31_33 * RHS31;
-	const double f32 = 1.0 / m_A91;
-	const double f32_34 = -f32 * m_A105;
-	m_A106 += m_A92 * f32_34;
-	m_A107 += m_A93 * f32_34;
-	RHS34 += f32_34 * RHS32;
-	const double f32_36 = -f32 * m_A119;
-	m_A121 += m_A92 * f32_36;
-	m_A122 += m_A93 * f32_36;
-	RHS36 += f32_36 * RHS32;
-	const double f33 = 1.0 / m_A99;
-	const double f33_36 = -f33 * m_A120;
-	m_A122 += m_A100 * f33_36;
-	RHS36 += f33_36 * RHS33;
-	const double f34 = 1.0 / m_A106;
-	const double f34_36 = -f34 * m_A121;
-	m_A122 += m_A107 * f34_36;
-	RHS36 += f34_36 * RHS34;
-	V[36] = RHS36 / m_A122;
-	double tmp35 = 0.0;
-	tmp35 += m_A112 * V[36];
-	V[35] = (RHS35 - tmp35) / m_A111;
-	double tmp34 = 0.0;
-	tmp34 += m_A107 * V[36];
-	V[34] = (RHS34 - tmp34) / m_A106;
-	double tmp33 = 0.0;
-	tmp33 += m_A100 * V[36];
-	V[33] = (RHS33 - tmp33) / m_A99;
-	double tmp32 = 0.0;
-	tmp32 += m_A92 * V[34];
-	tmp32 += m_A93 * V[36];
-	V[32] = (RHS32 - tmp32) / m_A91;
-	double tmp31 = 0.0;
-	V[31] = (RHS31 - tmp31) / m_A84;
-	double tmp30 = 0.0;
-	V[30] = (RHS30 - tmp30) / m_A81;
-	double tmp29 = 0.0;
-	tmp29 += m_A77 * V[30];
-	tmp29 += m_A78 * V[36];
-	V[29] = (RHS29 - tmp29) / m_A76;
-	double tmp28 = 0.0;
-	tmp28 += m_A73 * V[33];
-	V[28] = (RHS28 - tmp28) / m_A72;
-	double tmp27 = 0.0;
-	tmp27 += m_A68 * V[32];
-	tmp27 += m_A69 * V[34];
-	tmp27 += m_A70 * V[36];
-	V[27] = (RHS27 - tmp27) / m_A67;
-	double tmp26 = 0.0;
-	tmp26 += m_A63 * V[31];
-	V[26] = (RHS26 - tmp26) / m_A62;
-	double tmp25 = 0.0;
-	tmp25 += m_A60 * V[34];
-	V[25] = (RHS25 - tmp25) / m_A59;
-	double tmp24 = 0.0;
-	tmp24 += m_A57 * V[32];
-	V[24] = (RHS24 - tmp24) / m_A56;
-	double tmp23 = 0.0;
-	V[23] = (RHS23 - tmp23) / m_A54;
-	double tmp22 = 0.0;
-	V[22] = (RHS22 - tmp22) / m_A51;
-	double tmp21 = 0.0;
-	tmp21 += m_A48 * V[22];
-	V[21] = (RHS21 - tmp21) / m_A47;
-	double tmp20 = 0.0;
-	tmp20 += m_A44 * V[25];
-	V[20] = (RHS20 - tmp20) / m_A43;
-	double tmp19 = 0.0;
-	tmp19 += m_A41 * V[30];
-	V[19] = (RHS19 - tmp19) / m_A40;
-	double tmp18 = 0.0;
-	tmp18 += m_A39 * V[30];
-	V[18] = (RHS18 - tmp18) / m_A38;
-	double tmp17 = 0.0;
-	tmp17 += m_A37 * V[29];
-	V[17] = (RHS17 - tmp17) / m_A36;
-	double tmp16 = 0.0;
-	tmp16 += m_A34 * V[27];
-	tmp16 += m_A35 * V[36];
-	V[16] = (RHS16 - tmp16) / m_A33;
-	double tmp15 = 0.0;
-	tmp15 += m_A32 * V[31];
-	V[15] = (RHS15 - tmp15) / m_A31;
-	double tmp14 = 0.0;
-	tmp14 += m_A30 * V[33];
-	V[14] = (RHS14 - tmp14) / m_A29;
-	double tmp13 = 0.0;
-	tmp13 += m_A28 * V[26];
-	V[13] = (RHS13 - tmp13) / m_A27;
-	double tmp12 = 0.0;
-	tmp12 += m_A26 * V[35];
-	V[12] = (RHS12 - tmp12) / m_A25;
-	double tmp11 = 0.0;
-	tmp11 += m_A24 * V[12];
-	V[11] = (RHS11 - tmp11) / m_A23;
-	double tmp10 = 0.0;
-	tmp10 += m_A22 * V[33];
-	V[10] = (RHS10 - tmp10) / m_A21;
-	double tmp9 = 0.0;
-	tmp9 += m_A20 * V[28];
-	V[9] = (RHS9 - tmp9) / m_A19;
-	double tmp8 = 0.0;
-	tmp8 += m_A18 * V[23];
-	V[8] = (RHS8 - tmp8) / m_A17;
-	double tmp7 = 0.0;
-	tmp7 += m_A16 * V[23];
-	V[7] = (RHS7 - tmp7) / m_A15;
+	const double f3_4 = -f3 * m_A11;
+	m_A12 += m_A7 * f3_4;
+	m_A13 += m_A8 * f3_4;
+	m_A14 += m_A9 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f3_6 = -f3 * m_A18;
+	m_A19 += m_A7 * f3_6;
+	m_A20 += m_A8 * f3_6;
+	m_A21 += m_A9 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f3_7 = -f3 * m_A23;
+	m_A24 += m_A7 * f3_7;
+	m_A26 += m_A8 * f3_7;
+	m_A27 += m_A9 * f3_7;
+	RHS7 += f3_7 * RHS3;
+	const double f4 = 1.0 / m_A12;
+	const double f4_6 = -f4 * m_A19;
+	m_A20 += m_A13 * f4_6;
+	m_A21 += m_A14 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f4_7 = -f4 * m_A24;
+	m_A26 += m_A13 * f4_7;
+	m_A27 += m_A14 * f4_7;
+	RHS7 += f4_7 * RHS4;
+	const double f5 = 1.0 / m_A16;
+	const double f5_7 = -f5 * m_A25;
+	m_A27 += m_A17 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f6 = 1.0 / m_A20;
+	const double f6_7 = -f6 * m_A26;
+	m_A27 += m_A21 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	V[7] = RHS7 / m_A27;
 	double tmp6 = 0.0;
-	tmp6 += m_A13 * V[21];
-	tmp6 += m_A14 * V[22];
-	V[6] = (RHS6 - tmp6) / m_A12;
+	tmp6 += m_A21 * V[7];
+	V[6] = (RHS6 - tmp6) / m_A20;
 	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[21];
-	V[5] = (RHS5 - tmp5) / m_A10;
+	tmp5 += m_A17 * V[7];
+	V[5] = (RHS5 - tmp5) / m_A16;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[25];
-	V[4] = (RHS4 - tmp4) / m_A8;
+	tmp4 += m_A13 * V[6];
+	tmp4 += m_A14 * V[7];
+	V[4] = (RHS4 - tmp4) / m_A12;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[34];
+	tmp3 += m_A7 * V[4];
+	tmp3 += m_A8 * V[6];
+	tmp3 += m_A9 * V[7];
 	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[24];
+	tmp2 += m_A5 * V[5];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[32];
+	tmp1 += m_A3 * V[5];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[32];
+	tmp0 += m_A1 * V[4];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// stuntcyc
-static void nl_gcr_251e2a2e2c8d5b33_20_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// armora
+static void nl_gcr_1692de755a535408_9_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -1706,98 +1382,157 @@
 	double m_A6(0.0);
 	double m_A7(0.0);
 	double m_A8(0.0);
-	double m_A9(0.0);
-	double m_A10(0.0);
-	double m_A11(0.0);
-	double m_A12(0.0);
-	double m_A13(0.0);
-	double m_A14(0.0);
-	double m_A15(0.0);
-	double m_A16(0.0);
-	double m_A17(0.0);
-	double m_A18(0.0);
-	double m_A19(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
-	m_A0 += gt[3];
-	m_A0 += gt[4];
-	m_A1 += go[0];
+	m_A2 += go[0];
+	m_A1 += go[1];
+	m_A1 += go[2];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
-	RHS0 += Idr[3];
-	RHS0 += Idr[4];
-	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
-	RHS0 -= go[3] * *cnV[3];
-	RHS0 -= go[4] * *cnV[4];
-	m_A2 += gt[5];
-	m_A2 += gt[6];
-	m_A2 += gt[7];
+	m_A4 += gt[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A5 += go[3];
+	m_A5 += go[4];
 	m_A3 += go[5];
-	double RHS1 = Idr[5];
+	m_A3 += go[6];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
 	RHS1 += Idr[6];
-	RHS1 += Idr[7];
-	RHS1 -= go[6] * *cnV[6];
-	RHS1 -= go[7] * *cnV[7];
-	m_A4 += gt[8];
-	m_A4 += gt[9];
-	m_A4 += gt[10];
-	m_A4 += gt[11];
-	m_A4 += gt[12];
-	m_A6 += go[8];
-	m_A5 += go[9];
-	double RHS2 = Idr[8];
+	m_A8 += gt[7];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A7 += go[7];
+	m_A7 += go[8];
+	m_A6 += go[9];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
 	RHS2 += Idr[9];
-	RHS2 += Idr[10];
-	RHS2 += Idr[11];
-	RHS2 += Idr[12];
-	RHS2 -= go[10] * *cnV[10];
-	RHS2 -= go[11] * *cnV[11];
-	RHS2 -= go[12] * *cnV[12];
+	const double f0 = 1.0 / m_A0;
+	const double f0_1 = -f0 * m_A3;
+	m_A4 += m_A1 * f0_1;
+	m_A5 += m_A2 * f0_1;
+	RHS1 += f0_1 * RHS0;
+	const double f0_2 = -f0 * m_A6;
+	m_A7 += m_A1 * f0_2;
+	m_A8 += m_A2 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A4;
+	const double f1_2 = -f1 * m_A7;
+	m_A8 += m_A5 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A8;
+	double tmp1 = 0.0;
+	tmp1 += m_A5 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A4;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[1];
+	tmp0 += m_A2 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// dpatrol
+static void nl_gcr_18f4d9160b51d613_20_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A3 += go[4];
+	double RHS1 = Idr[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A6 += go[5];
+	m_A5 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	m_A8 += gt[10];
+	m_A8 += gt[11];
+	m_A8 += gt[12];
 	m_A8 += gt[13];
 	m_A8 += gt[14];
 	m_A8 += gt[15];
 	m_A8 += gt[16];
-	m_A8 += gt[17];
-	m_A8 += gt[18];
-	m_A8 += gt[19];
-	m_A10 += go[13];
-	m_A9 += go[14];
-	m_A7 += go[15];
-	double RHS3 = Idr[13];
+	m_A10 += go[10];
+	m_A9 += go[11];
+	m_A7 += go[12];
+	double RHS3 = Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
 	RHS3 += Idr[14];
 	RHS3 += Idr[15];
 	RHS3 += Idr[16];
-	RHS3 += Idr[17];
-	RHS3 += Idr[18];
-	RHS3 += Idr[19];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
 	RHS3 -= go[16] * *cnV[16];
-	RHS3 -= go[17] * *cnV[17];
-	RHS3 -= go[18] * *cnV[18];
-	RHS3 -= go[19] * *cnV[19];
+	m_A14 += gt[17];
+	m_A14 += gt[18];
+	m_A14 += gt[19];
 	m_A14 += gt[20];
-	m_A14 += gt[21];
-	m_A14 += gt[22];
-	m_A14 += gt[23];
-	m_A12 += go[20];
-	m_A11 += go[21];
-	m_A13 += go[22];
-	double RHS4 = Idr[20];
-	RHS4 += Idr[21];
-	RHS4 += Idr[22];
-	RHS4 += Idr[23];
-	RHS4 -= go[23] * *cnV[23];
-	m_A19 += gt[24];
-	m_A19 += gt[25];
-	m_A19 += gt[26];
-	m_A16 += go[24];
-	m_A17 += go[25];
-	double RHS5 = Idr[24];
-	RHS5 += Idr[25];
-	RHS5 += Idr[26];
-	RHS5 -= go[26] * *cnV[26];
+	m_A11 += go[17];
+	m_A12 += go[18];
+	m_A13 += go[19];
+	double RHS4 = Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 -= go[20] * *cnV[20];
+	m_A19 += gt[21];
+	m_A19 += gt[22];
+	m_A19 += gt[23];
+	m_A16 += go[21];
+	m_A17 += go[22];
+	double RHS5 = Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	RHS5 -= go[23] * *cnV[23];
 	const double f0 = 1.0 / m_A0;
 	const double f0_3 = -f0 * m_A7;
 	m_A8 += m_A1 * f0_3;
@@ -1848,11 +1583,12 @@
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// cheekyms
-static void nl_gcr_278f0b40e27b21fc_150_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// starhawk
+static void nl_gcr_1f1086787c94f97c_40_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -1893,921 +1629,29283 @@
 	double m_A37(0.0);
 	double m_A38(0.0);
 	double m_A39(0.0);
-	double m_A40(0.0);
-	double m_A41(0.0);
-	double m_A42(0.0);
-	double m_A43(0.0);
-	double m_A44(0.0);
-	double m_A45(0.0);
-	double m_A46(0.0);
-	double m_A47(0.0);
-	double m_A48(0.0);
-	double m_A49(0.0);
-	double m_A50(0.0);
-	double m_A51(0.0);
-	double m_A52(0.0);
-	double m_A53(0.0);
-	double m_A54(0.0);
-	double m_A55(0.0);
-	double m_A56(0.0);
-	double m_A57(0.0);
-	double m_A58(0.0);
-	double m_A59(0.0);
-	double m_A60(0.0);
-	double m_A61(0.0);
-	double m_A62(0.0);
-	double m_A63(0.0);
-	double m_A64(0.0);
-	double m_A65(0.0);
-	double m_A66(0.0);
-	double m_A67(0.0);
-	double m_A68(0.0);
-	double m_A69(0.0);
-	double m_A70(0.0);
-	double m_A71(0.0);
-	double m_A72(0.0);
-	double m_A73(0.0);
-	double m_A74(0.0);
-	double m_A75(0.0);
-	double m_A76(0.0);
-	double m_A77(0.0);
-	double m_A78(0.0);
-	double m_A79(0.0);
-	double m_A80(0.0);
-	double m_A81(0.0);
-	double m_A82(0.0);
-	double m_A83(0.0);
-	double m_A84(0.0);
-	double m_A85(0.0);
-	double m_A86(0.0);
-	double m_A87(0.0);
-	double m_A88(0.0);
-	double m_A89(0.0);
-	double m_A90(0.0);
-	double m_A91(0.0);
-	double m_A92(0.0);
-	double m_A93(0.0);
-	double m_A94(0.0);
-	double m_A95(0.0);
-	double m_A96(0.0);
-	double m_A97(0.0);
-	double m_A98(0.0);
-	double m_A99(0.0);
-	double m_A100(0.0);
-	double m_A101(0.0);
-	double m_A102(0.0);
-	double m_A103(0.0);
-	double m_A104(0.0);
-	double m_A105(0.0);
-	double m_A106(0.0);
-	double m_A107(0.0);
-	double m_A108(0.0);
-	double m_A109(0.0);
-	double m_A110(0.0);
-	double m_A111(0.0);
-	double m_A112(0.0);
-	double m_A113(0.0);
-	double m_A114(0.0);
-	double m_A115(0.0);
-	double m_A116(0.0);
-	double m_A117(0.0);
-	double m_A118(0.0);
-	double m_A119(0.0);
-	double m_A120(0.0);
-	double m_A121(0.0);
-	double m_A122(0.0);
-	double m_A123(0.0);
-	double m_A124(0.0);
-	double m_A125(0.0);
-	double m_A126(0.0);
-	double m_A127(0.0);
-	double m_A128(0.0);
-	double m_A129(0.0);
-	double m_A130(0.0);
-	double m_A131(0.0);
-	double m_A132(0.0);
-	double m_A133(0.0);
-	double m_A134(0.0);
-	double m_A135(0.0);
-	double m_A136(0.0);
-	double m_A137(0.0);
-	double m_A138(0.0);
-	double m_A139(0.0);
-	double m_A140(0.0);
-	double m_A141(0.0);
-	double m_A142(0.0);
-	double m_A143(0.0);
-	double m_A144(0.0);
-	double m_A145(0.0);
-	double m_A146(0.0);
-	double m_A147(0.0);
-	double m_A148(0.0);
-	double m_A149(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
-	m_A0 += gt[2];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
-	RHS0 += Idr[2];
 	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[2];
 	m_A2 += gt[3];
 	m_A2 += gt[4];
 	m_A2 += gt[5];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
 	RHS1 += Idr[4];
 	RHS1 += Idr[5];
+	RHS1 -= go[3] * *cnV[3];
 	RHS1 -= go[4] * *cnV[4];
 	RHS1 -= go[5] * *cnV[5];
 	m_A4 += gt[6];
 	m_A4 += gt[7];
 	m_A4 += gt[8];
-	m_A6 += go[6];
-	m_A5 += go[7];
+	m_A4 += gt[9];
+	m_A5 += go[6];
 	double RHS2 = Idr[6];
 	RHS2 += Idr[7];
 	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[7] * *cnV[7];
 	RHS2 -= go[8] * *cnV[8];
-	m_A7 += gt[9];
-	m_A7 += gt[10];
-	m_A7 += gt[11];
-	m_A7 += gt[12];
-	m_A7 += gt[13];
-	m_A10 += go[9];
-	m_A9 += go[10];
-	m_A8 += go[11];
-	double RHS3 = Idr[9];
-	RHS3 += Idr[10];
+	RHS2 -= go[9] * *cnV[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A7 += go[10];
+	m_A9 += go[11];
+	m_A8 += go[12];
+	double RHS3 = Idr[10];
 	RHS3 += Idr[11];
 	RHS3 += Idr[12];
 	RHS3 += Idr[13];
-	RHS3 -= go[12] * *cnV[12];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
 	RHS3 -= go[13] * *cnV[13];
-	m_A11 += gt[14];
-	m_A11 += gt[15];
-	m_A11 += gt[16];
-	m_A12 += go[14];
-	double RHS4 = Idr[14];
-	RHS4 += Idr[15];
-	RHS4 += Idr[16];
-	RHS4 -= go[15] * *cnV[15];
-	RHS4 -= go[16] * *cnV[16];
-	m_A13 += gt[17];
-	m_A13 += gt[18];
-	m_A13 += gt[19];
-	m_A13 += gt[20];
-	m_A13 += gt[21];
-	m_A13 += gt[22];
-	m_A13 += gt[23];
-	m_A15 += go[17];
-	m_A14 += go[18];
-	double RHS5 = Idr[17];
-	RHS5 += Idr[18];
-	RHS5 += Idr[19];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A11 += go[16];
+	double RHS4 = Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 -= go[17] * *cnV[17];
+	RHS4 -= go[18] * *cnV[18];
+	m_A12 += gt[19];
+	m_A12 += gt[20];
+	m_A12 += gt[21];
+	m_A12 += gt[22];
+	m_A12 += gt[23];
+	m_A12 += gt[24];
+	m_A12 += gt[25];
+	m_A13 += go[19];
+	double RHS5 = Idr[19];
 	RHS5 += Idr[20];
 	RHS5 += Idr[21];
 	RHS5 += Idr[22];
 	RHS5 += Idr[23];
-	RHS5 -= go[19] * *cnV[19];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
 	RHS5 -= go[20] * *cnV[20];
 	RHS5 -= go[21] * *cnV[21];
 	RHS5 -= go[22] * *cnV[22];
 	RHS5 -= go[23] * *cnV[23];
-	m_A16 += gt[24];
-	m_A16 += gt[25];
-	m_A16 += gt[26];
-	m_A17 += go[24];
-	double RHS6 = Idr[24];
-	RHS6 += Idr[25];
-	RHS6 += Idr[26];
-	RHS6 -= go[25] * *cnV[25];
-	RHS6 -= go[26] * *cnV[26];
-	m_A18 += gt[27];
-	m_A18 += gt[28];
-	m_A19 += go[27];
-	double RHS7 = Idr[27];
-	RHS7 += Idr[28];
-	RHS7 -= go[28] * *cnV[28];
+	RHS5 -= go[24] * *cnV[24];
+	RHS5 -= go[25] * *cnV[25];
+	m_A15 += gt[26];
+	m_A15 += gt[27];
+	m_A16 += go[26];
+	m_A14 += go[27];
+	double RHS6 = Idr[26];
+	RHS6 += Idr[27];
+	m_A20 += gt[28];
 	m_A20 += gt[29];
-	m_A20 += gt[30];
-	m_A20 += gt[31];
-	m_A21 += go[29];
+	m_A18 += go[28];
+	m_A17 += go[29];
+	double RHS7 = Idr[28];
+	RHS7 += Idr[29];
+	m_A22 += gt[30];
+	m_A22 += gt[31];
 	m_A23 += go[30];
-	m_A22 += go[31];
-	double RHS8 = Idr[29];
-	RHS8 += Idr[30];
+	m_A24 += go[31];
+	double RHS8 = Idr[30];
 	RHS8 += Idr[31];
-	m_A24 += gt[32];
-	m_A24 += gt[33];
-	m_A24 += gt[34];
-	m_A25 += go[32];
+	m_A27 += gt[32];
+	m_A27 += gt[33];
+	m_A27 += gt[34];
+	m_A27 += gt[35];
+	m_A28 += go[32];
+	m_A26 += go[33];
+	m_A25 += go[34];
 	double RHS9 = Idr[32];
 	RHS9 += Idr[33];
 	RHS9 += Idr[34];
-	RHS9 -= go[33] * *cnV[33];
-	RHS9 -= go[34] * *cnV[34];
-	m_A26 += gt[35];
-	m_A26 += gt[36];
-	m_A26 += gt[37];
-	m_A26 += gt[38];
-	m_A27 += go[35];
-	m_A28 += go[36];
-	double RHS10 = Idr[35];
-	RHS10 += Idr[36];
+	RHS9 += Idr[35];
+	RHS9 -= go[35] * *cnV[35];
+	m_A31 += gt[36];
+	m_A31 += gt[37];
+	m_A31 += gt[38];
+	m_A30 += go[36];
+	m_A29 += go[37];
+	double RHS10 = Idr[36];
 	RHS10 += Idr[37];
 	RHS10 += Idr[38];
-	RHS10 -= go[37] * *cnV[37];
 	RHS10 -= go[38] * *cnV[38];
-	m_A29 += gt[39];
-	m_A29 += gt[40];
-	m_A30 += go[39];
+	m_A39 += gt[39];
+	m_A39 += gt[40];
+	m_A39 += gt[41];
+	m_A39 += gt[42];
+	m_A36 += go[39];
+	m_A37 += go[40];
+	m_A33 += go[41];
 	double RHS11 = Idr[39];
 	RHS11 += Idr[40];
-	RHS11 -= go[40] * *cnV[40];
-	m_A31 += gt[41];
-	m_A31 += gt[42];
-	m_A31 += gt[43];
-	m_A31 += gt[44];
-	m_A32 += go[41];
-	m_A33 += go[42];
-	double RHS12 = Idr[41];
-	RHS12 += Idr[42];
-	RHS12 += Idr[43];
-	RHS12 += Idr[44];
-	RHS12 -= go[43] * *cnV[43];
-	RHS12 -= go[44] * *cnV[44];
-	m_A34 += gt[45];
-	m_A34 += gt[46];
-	m_A34 += gt[47];
-	m_A36 += go[45];
-	m_A35 += go[46];
-	double RHS13 = Idr[45];
-	RHS13 += Idr[46];
-	RHS13 += Idr[47];
-	RHS13 -= go[47] * *cnV[47];
-	m_A37 += gt[48];
-	m_A37 += gt[49];
-	m_A38 += go[48];
-	double RHS14 = Idr[48];
-	RHS14 += Idr[49];
-	RHS14 -= go[49] * *cnV[49];
-	m_A39 += gt[50];
-	m_A39 += gt[51];
-	m_A40 += go[50];
-	double RHS15 = Idr[50];
-	RHS15 += Idr[51];
-	RHS15 -= go[51] * *cnV[51];
-	m_A41 += gt[52];
-	m_A41 += gt[53];
-	m_A42 += go[52];
-	double RHS16 = Idr[52];
-	RHS16 += Idr[53];
-	RHS16 -= go[53] * *cnV[53];
-	m_A43 += gt[54];
-	m_A43 += gt[55];
-	m_A43 += gt[56];
-	m_A43 += gt[57];
-	m_A43 += gt[58];
-	m_A44 += go[54];
-	m_A46 += go[55];
-	m_A45 += go[56];
-	double RHS17 = Idr[54];
-	RHS17 += Idr[55];
-	RHS17 += Idr[56];
-	RHS17 += Idr[57];
-	RHS17 += Idr[58];
-	RHS17 -= go[57] * *cnV[57];
-	RHS17 -= go[58] * *cnV[58];
-	m_A47 += gt[59];
-	m_A47 += gt[60];
-	m_A47 += gt[61];
-	m_A47 += gt[62];
-	m_A47 += gt[63];
-	m_A48 += go[59];
-	m_A50 += go[60];
-	m_A49 += go[61];
-	double RHS18 = Idr[59];
-	RHS18 += Idr[60];
-	RHS18 += Idr[61];
-	RHS18 += Idr[62];
-	RHS18 += Idr[63];
-	RHS18 -= go[62] * *cnV[62];
-	RHS18 -= go[63] * *cnV[63];
-	m_A51 += gt[64];
-	m_A51 += gt[65];
-	m_A52 += go[64];
-	double RHS19 = Idr[64];
-	RHS19 += Idr[65];
-	RHS19 -= go[65] * *cnV[65];
-	m_A55 += gt[66];
-	m_A55 += gt[67];
-	m_A54 += go[66];
-	m_A53 += go[67];
-	double RHS20 = Idr[66];
-	RHS20 += Idr[67];
-	m_A60 += gt[68];
-	m_A60 += gt[69];
-	m_A60 += gt[70];
-	m_A58 += go[68];
-	m_A57 += go[69];
-	double RHS21 = Idr[68];
-	RHS21 += Idr[69];
-	RHS21 += Idr[70];
-	RHS21 -= go[70] * *cnV[70];
-	m_A63 += gt[71];
-	m_A63 += gt[72];
-	m_A64 += go[71];
-	double RHS22 = Idr[71];
-	RHS22 += Idr[72];
-	RHS22 -= go[72] * *cnV[72];
-	m_A65 += gt[73];
-	m_A65 += gt[74];
-	m_A65 += gt[75];
-	m_A66 += go[73];
-	double RHS23 = Idr[73];
-	RHS23 += Idr[74];
-	RHS23 += Idr[75];
-	RHS23 -= go[74] * *cnV[74];
-	RHS23 -= go[75] * *cnV[75];
-	m_A69 += gt[76];
-	m_A69 += gt[77];
-	m_A69 += gt[78];
-	m_A67 += go[76];
-	m_A68 += go[77];
-	double RHS24 = Idr[76];
-	RHS24 += Idr[77];
-	RHS24 += Idr[78];
-	RHS24 -= go[78] * *cnV[78];
-	m_A76 += gt[79];
-	m_A76 += gt[80];
-	m_A73 += go[79];
-	m_A72 += go[80];
-	double RHS25 = Idr[79];
-	RHS25 += Idr[80];
-	m_A81 += gt[81];
-	m_A81 += gt[82];
-	m_A80 += go[81];
-	m_A79 += go[82];
-	double RHS26 = Idr[81];
-	RHS26 += Idr[82];
-	m_A84 += gt[83];
-	m_A84 += gt[84];
-	m_A84 += gt[85];
-	m_A85 += go[83];
-	m_A83 += go[84];
-	double RHS27 = Idr[83];
-	RHS27 += Idr[84];
-	RHS27 += Idr[85];
-	RHS27 -= go[85] * *cnV[85];
-	m_A88 += gt[86];
-	m_A88 += gt[87];
-	m_A87 += go[86];
-	m_A86 += go[87];
-	double RHS28 = Idr[86];
-	RHS28 += Idr[87];
-	m_A95 += gt[88];
-	m_A95 += gt[89];
-	m_A95 += gt[90];
-	m_A95 += gt[91];
-	m_A95 += gt[92];
-	m_A90 += go[88];
-	m_A92 += go[89];
-	m_A91 += go[90];
-	double RHS29 = Idr[88];
-	RHS29 += Idr[89];
-	RHS29 += Idr[90];
-	RHS29 += Idr[91];
-	RHS29 += Idr[92];
-	RHS29 -= go[91] * *cnV[91];
-	RHS29 -= go[92] * *cnV[92];
-	m_A100 += gt[93];
-	m_A100 += gt[94];
-	m_A100 += gt[95];
-	m_A100 += gt[96];
-	m_A100 += gt[97];
-	m_A100 += gt[98];
-	m_A100 += gt[99];
-	m_A98 += go[93];
-	m_A101 += go[94];
-	double RHS30 = Idr[93];
-	RHS30 += Idr[94];
-	RHS30 += Idr[95];
-	RHS30 += Idr[96];
-	RHS30 += Idr[97];
-	RHS30 += Idr[98];
-	RHS30 += Idr[99];
-	RHS30 -= go[95] * *cnV[95];
-	RHS30 -= go[96] * *cnV[96];
-	RHS30 -= go[97] * *cnV[97];
-	RHS30 -= go[98] * *cnV[98];
-	RHS30 -= go[99] * *cnV[99];
-	m_A103 += gt[100];
-	m_A103 += gt[101];
-	m_A103 += gt[102];
-	m_A103 += gt[103];
-	m_A103 += gt[104];
-	m_A103 += gt[105];
-	m_A104 += go[100];
-	m_A104 += go[101];
-	m_A102 += go[102];
-	double RHS31 = Idr[100];
-	RHS31 += Idr[101];
-	RHS31 += Idr[102];
-	RHS31 += Idr[103];
-	RHS31 += Idr[104];
-	RHS31 += Idr[105];
-	RHS31 -= go[103] * *cnV[103];
-	RHS31 -= go[104] * *cnV[104];
-	RHS31 -= go[105] * *cnV[105];
-	m_A110 += gt[106];
-	m_A110 += gt[107];
-	m_A110 += gt[108];
-	m_A106 += go[106];
-	m_A107 += go[107];
-	m_A105 += go[108];
-	double RHS32 = Idr[106];
-	RHS32 += Idr[107];
-	RHS32 += Idr[108];
-	m_A114 += gt[109];
-	m_A114 += gt[110];
-	m_A114 += gt[111];
-	m_A114 += gt[112];
-	m_A114 += gt[113];
-	m_A114 += gt[114];
-	m_A114 += gt[115];
-	m_A112 += go[109];
-	m_A115 += go[110];
-	double RHS33 = Idr[109];
-	RHS33 += Idr[110];
-	RHS33 += Idr[111];
-	RHS33 += Idr[112];
-	RHS33 += Idr[113];
-	RHS33 += Idr[114];
-	RHS33 += Idr[115];
-	RHS33 -= go[111] * *cnV[111];
-	RHS33 -= go[112] * *cnV[112];
-	RHS33 -= go[113] * *cnV[113];
-	RHS33 -= go[114] * *cnV[114];
-	RHS33 -= go[115] * *cnV[115];
-	m_A121 += gt[116];
-	m_A121 += gt[117];
-	m_A121 += gt[118];
-	m_A121 += gt[119];
-	m_A121 += gt[120];
-	m_A121 += gt[121];
-	m_A121 += gt[122];
-	m_A118 += go[116];
-	m_A116 += go[117];
-	double RHS34 = Idr[116];
-	RHS34 += Idr[117];
-	RHS34 += Idr[118];
-	RHS34 += Idr[119];
-	RHS34 += Idr[120];
-	RHS34 += Idr[121];
-	RHS34 += Idr[122];
-	RHS34 -= go[118] * *cnV[118];
-	RHS34 -= go[119] * *cnV[119];
-	RHS34 -= go[120] * *cnV[120];
-	RHS34 -= go[121] * *cnV[121];
-	RHS34 -= go[122] * *cnV[122];
-	m_A125 += gt[123];
-	m_A125 += gt[124];
-	m_A125 += gt[125];
-	m_A124 += go[123];
-	m_A126 += go[124];
-	m_A123 += go[125];
-	double RHS35 = Idr[123];
-	RHS35 += Idr[124];
-	RHS35 += Idr[125];
-	m_A132 += gt[126];
-	m_A132 += gt[127];
-	m_A132 += gt[128];
-	m_A127 += go[126];
-	m_A128 += go[127];
-	m_A130 += go[128];
-	double RHS36 = Idr[126];
-	RHS36 += Idr[127];
-	RHS36 += Idr[128];
-	m_A149 += gt[129];
-	m_A149 += gt[130];
-	m_A149 += gt[131];
-	m_A149 += gt[132];
-	m_A149 += gt[133];
-	m_A149 += gt[134];
-	m_A149 += gt[135];
-	m_A149 += gt[136];
-	m_A149 += gt[137];
-	m_A149 += gt[138];
-	m_A149 += gt[139];
-	m_A140 += go[129];
-	m_A147 += go[130];
-	m_A139 += go[131];
-	m_A138 += go[132];
-	m_A137 += go[133];
-	m_A136 += go[134];
-	m_A135 += go[135];
-	m_A134 += go[136];
-	m_A143 += go[137];
-	m_A143 += go[138];
-	double RHS37 = Idr[129];
-	RHS37 += Idr[130];
-	RHS37 += Idr[131];
-	RHS37 += Idr[132];
-	RHS37 += Idr[133];
-	RHS37 += Idr[134];
-	RHS37 += Idr[135];
-	RHS37 += Idr[136];
-	RHS37 += Idr[137];
-	RHS37 += Idr[138];
-	RHS37 += Idr[139];
-	RHS37 -= go[139] * *cnV[139];
+	RHS11 += Idr[41];
+	RHS11 += Idr[42];
+	RHS11 -= go[42] * *cnV[42];
 	const double f0 = 1.0 / m_A0;
-	const double f0_31 = -f0 * m_A102;
-	m_A103 += m_A1 * f0_31;
-	RHS31 += f0_31 * RHS0;
+	const double f0_7 = -f0 * m_A17;
+	m_A20 += m_A1 * f0_7;
+	RHS7 += f0_7 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_20 = -f1 * m_A53;
-	m_A55 += m_A3 * f1_20;
-	RHS20 += f1_20 * RHS1;
+	const double f1_6 = -f1 * m_A14;
+	m_A15 += m_A3 * f1_6;
+	RHS6 += f1_6 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_20 = -f2 * m_A54;
-	m_A55 += m_A5 * f2_20;
-	m_A56 += m_A6 * f2_20;
-	RHS20 += f2_20 * RHS2;
-	const double f2_21 = -f2 * m_A57;
-	m_A59 += m_A5 * f2_21;
-	m_A60 += m_A6 * f2_21;
-	RHS21 += f2_21 * RHS2;
-	const double f2_34 = -f2 * m_A116;
-	m_A117 += m_A5 * f2_34;
-	m_A118 += m_A6 * f2_34;
-	RHS34 += f2_34 * RHS2;
-	const double f3 = 1.0 / m_A7;
-	const double f3_21 = -f3 * m_A58;
-	m_A60 += m_A8 * f3_21;
-	m_A61 += m_A9 * f3_21;
-	m_A62 += m_A10 * f3_21;
-	RHS21 += f3_21 * RHS3;
-	const double f3_25 = -f3 * m_A72;
-	m_A74 += m_A8 * f3_25;
-	m_A76 += m_A9 * f3_25;
-	m_A78 += m_A10 * f3_25;
-	RHS25 += f3_25 * RHS3;
-	const double f4 = 1.0 / m_A11;
-	const double f4_24 = -f4 * m_A67;
-	m_A69 += m_A12 * f4_24;
-	RHS24 += f4_24 * RHS4;
-	const double f5 = 1.0 / m_A13;
-	const double f5_29 = -f5 * m_A90;
-	m_A91 += m_A14 * f5_29;
-	m_A93 += m_A15 * f5_29;
-	RHS29 += f5_29 * RHS5;
-	const double f6 = 1.0 / m_A16;
-	const double f6_26 = -f6 * m_A79;
-	m_A81 += m_A17 * f6_26;
-	RHS26 += f6_26 * RHS6;
-	const double f7 = 1.0 / m_A18;
-	const double f7_27 = -f7 * m_A83;
-	m_A84 += m_A19 * f7_27;
-	RHS27 += f7_27 * RHS7;
-	const double f8 = 1.0 / m_A20;
-	const double f8_24 = -f8 * m_A68;
-	m_A69 += m_A21 * f8_24;
-	m_A70 += m_A22 * f8_24;
-	m_A71 += m_A23 * f8_24;
-	RHS24 += f8_24 * RHS8;
-	const double f8_25 = -f8 * m_A73;
-	m_A75 += m_A21 * f8_25;
-	m_A76 += m_A22 * f8_25;
-	m_A77 += m_A23 * f8_25;
-	RHS25 += f8_25 * RHS8;
-	const double f8_29 = -f8 * m_A91;
-	m_A93 += m_A21 * f8_29;
-	m_A94 += m_A22 * f8_29;
-	m_A95 += m_A23 * f8_29;
-	RHS29 += f8_29 * RHS8;
-	const double f9 = 1.0 / m_A24;
-	const double f9_28 = -f9 * m_A86;
-	m_A88 += m_A25 * f9_28;
-	RHS28 += f9_28 * RHS9;
+	const double f2_9 = -f2 * m_A25;
+	m_A27 += m_A5 * f2_9;
+	RHS9 += f2_9 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_7 = -f3 * m_A18;
+	m_A19 += m_A7 * f3_7;
+	m_A20 += m_A8 * f3_7;
+	m_A21 += m_A9 * f3_7;
+	RHS7 += f3_7 * RHS3;
+	const double f3_11 = -f3 * m_A33;
+	m_A34 += m_A7 * f3_11;
+	m_A35 += m_A8 * f3_11;
+	m_A39 += m_A9 * f3_11;
+	RHS11 += f3_11 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_10 = -f4 * m_A29;
+	m_A31 += m_A11 * f4_10;
+	RHS10 += f4_10 * RHS4;
+	const double f5 = 1.0 / m_A12;
+	const double f5_7 = -f5 * m_A19;
+	m_A21 += m_A13 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f5_11 = -f5 * m_A34;
+	m_A39 += m_A13 * f5_11;
+	RHS11 += f5_11 * RHS5;
+	const double f6 = 1.0 / m_A15;
+	const double f6_9 = -f6 * m_A26;
+	m_A27 += m_A16 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f7 = 1.0 / m_A20;
+	const double f7_11 = -f7 * m_A35;
+	m_A39 += m_A21 * f7_11;
+	RHS11 += f7_11 * RHS7;
+	const double f8 = 1.0 / m_A22;
+	const double f8_10 = -f8 * m_A30;
+	m_A31 += m_A23 * f8_10;
+	m_A32 += m_A24 * f8_10;
+	RHS10 += f8_10 * RHS8;
+	const double f8_11 = -f8 * m_A36;
+	m_A38 += m_A23 * f8_11;
+	m_A39 += m_A24 * f8_11;
+	RHS11 += f8_11 * RHS8;
+	const double f9 = 1.0 / m_A27;
+	const double f9_11 = -f9 * m_A37;
+	m_A39 += m_A28 * f9_11;
+	RHS11 += f9_11 * RHS9;
+	const double f10 = 1.0 / m_A31;
+	const double f10_11 = -f10 * m_A38;
+	m_A39 += m_A32 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	V[11] = RHS11 / m_A39;
+	double tmp10 = 0.0;
+	tmp10 += m_A32 * V[11];
+	V[10] = (RHS10 - tmp10) / m_A31;
+	double tmp9 = 0.0;
+	tmp9 += m_A28 * V[11];
+	V[9] = (RHS9 - tmp9) / m_A27;
+	double tmp8 = 0.0;
+	tmp8 += m_A23 * V[10];
+	tmp8 += m_A24 * V[11];
+	V[8] = (RHS8 - tmp8) / m_A22;
+	double tmp7 = 0.0;
+	tmp7 += m_A21 * V[11];
+	V[7] = (RHS7 - tmp7) / m_A20;
+	double tmp6 = 0.0;
+	tmp6 += m_A16 * V[9];
+	V[6] = (RHS6 - tmp6) / m_A15;
+	double tmp5 = 0.0;
+	tmp5 += m_A13 * V[11];
+	V[5] = (RHS5 - tmp5) / m_A12;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[10];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[5];
+	tmp3 += m_A8 * V[7];
+	tmp3 += m_A9 * V[11];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[9];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[6];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[7];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// zac1b11142
+static void nl_gcr_1fad5cda2646cf42_30_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A3 += go[7];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A5 += go[10];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A7 += go[12];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	m_A8 += gt[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A9 += go[15];
+	double RHS4 = Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 -= go[16] * *cnV[16];
+	RHS4 -= go[17] * *cnV[17];
+	m_A11 += gt[18];
+	m_A11 += gt[19];
+	m_A11 += gt[20];
+	m_A11 += gt[21];
+	m_A12 += go[18];
+	m_A10 += go[19];
+	double RHS5 = Idr[18];
+	RHS5 += Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 -= go[20] * *cnV[20];
+	RHS5 -= go[21] * *cnV[21];
+	m_A14 += gt[22];
+	m_A14 += gt[23];
+	m_A14 += gt[24];
+	m_A14 += gt[25];
+	m_A14 += gt[26];
+	m_A14 += gt[27];
+	m_A14 += gt[28];
+	m_A13 += go[22];
+	m_A16 += go[23];
+	m_A16 += go[24];
+	m_A16 += go[25];
+	double RHS6 = Idr[22];
+	RHS6 += Idr[23];
+	RHS6 += Idr[24];
+	RHS6 += Idr[25];
+	RHS6 += Idr[26];
+	RHS6 += Idr[27];
+	RHS6 += Idr[28];
+	RHS6 -= go[26] * *cnV[26];
+	RHS6 -= go[27] * *cnV[27];
+	RHS6 -= go[28] * *cnV[28];
+	m_A19 += gt[29];
+	m_A19 += gt[30];
+	m_A18 += go[29];
+	m_A17 += go[30];
+	double RHS7 = Idr[29];
+	RHS7 += Idr[30];
+	m_A21 += gt[31];
+	m_A21 += gt[32];
+	m_A21 += gt[33];
+	m_A21 += gt[34];
+	m_A22 += go[31];
+	m_A20 += go[32];
+	double RHS8 = Idr[31];
+	RHS8 += Idr[32];
+	RHS8 += Idr[33];
+	RHS8 += Idr[34];
+	RHS8 -= go[33] * *cnV[33];
+	RHS8 -= go[34] * *cnV[34];
+	m_A29 += gt[35];
+	m_A29 += gt[36];
+	m_A29 += gt[37];
+	m_A29 += gt[38];
+	m_A29 += gt[39];
+	m_A29 += gt[40];
+	m_A29 += gt[41];
+	m_A26 += go[35];
+	m_A26 += go[36];
+	m_A26 += go[37];
+	m_A27 += go[38];
+	m_A25 += go[39];
+	m_A24 += go[40];
+	m_A23 += go[41];
+	double RHS9 = Idr[35];
+	RHS9 += Idr[36];
+	RHS9 += Idr[37];
+	RHS9 += Idr[38];
+	RHS9 += Idr[39];
+	RHS9 += Idr[40];
+	RHS9 += Idr[41];
+	const double f0 = 1.0 / m_A0;
+	const double f0_6 = -f0 * m_A13;
+	m_A15 += m_A1 * f0_6;
+	RHS6 += f0_6 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A10;
+	m_A11 += m_A3 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_7 = -f2 * m_A17;
+	m_A19 += m_A5 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f2_9 = -f2 * m_A23;
+	m_A27 += m_A5 * f2_9;
+	RHS9 += f2_9 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_8 = -f3 * m_A20;
+	m_A22 += m_A7 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f3_9 = -f3 * m_A24;
+	m_A29 += m_A7 * f3_9;
+	RHS9 += f3_9 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_9 = -f4 * m_A25;
+	m_A29 += m_A9 * f4_9;
+	RHS9 += f4_9 * RHS4;
+	const double f5 = 1.0 / m_A11;
+	const double f5_7 = -f5 * m_A18;
+	m_A19 += m_A12 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f6 = 1.0 / m_A14;
+	const double f6_9 = -f6 * m_A26;
+	m_A28 += m_A15 * f6_9;
+	m_A29 += m_A16 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f7 = 1.0 / m_A19;
+	const double f7_9 = -f7 * m_A27;
+	RHS9 += f7_9 * RHS7;
+	const double f8 = 1.0 / m_A21;
+	const double f8_9 = -f8 * m_A28;
+	m_A29 += m_A22 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	V[9] = RHS9 / m_A29;
+	double tmp8 = 0.0;
+	tmp8 += m_A22 * V[9];
+	V[8] = (RHS8 - tmp8) / m_A21;
+	double tmp7 = 0.0;
+	V[7] = (RHS7 - tmp7) / m_A19;
+	double tmp6 = 0.0;
+	tmp6 += m_A15 * V[8];
+	tmp6 += m_A16 * V[9];
+	V[6] = (RHS6 - tmp6) / m_A14;
+	double tmp5 = 0.0;
+	tmp5 += m_A12 * V[7];
+	V[5] = (RHS5 - tmp5) / m_A11;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[9];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[9];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[7];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[8];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// sspeedr
+static void nl_gcr_2294220d3c91e762_176_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
+	double m_A153(0.0);
+	double m_A154(0.0);
+	double m_A155(0.0);
+	double m_A156(0.0);
+	double m_A157(0.0);
+	double m_A158(0.0);
+	double m_A159(0.0);
+	double m_A160(0.0);
+	double m_A161(0.0);
+	double m_A162(0.0);
+	double m_A163(0.0);
+	double m_A164(0.0);
+	double m_A165(0.0);
+	double m_A166(0.0);
+	double m_A167(0.0);
+	double m_A168(0.0);
+	double m_A169(0.0);
+	double m_A170(0.0);
+	double m_A171(0.0);
+	double m_A172(0.0);
+	double m_A173(0.0);
+	double m_A174(0.0);
+	double m_A175(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[3] * *cnV[3];
+	RHS1 -= go[4] * *cnV[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A5 += go[5];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[6] * *cnV[6];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A7 += go[12];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 -= go[13] * *cnV[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A9 += go[14];
+	double RHS4 = Idr[14];
+	RHS4 += Idr[15];
+	RHS4 -= go[15] * *cnV[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A11 += go[16];
+	m_A12 += go[17];
+	double RHS5 = Idr[16];
+	RHS5 += Idr[17];
+	m_A13 += gt[18];
+	m_A13 += gt[19];
+	m_A13 += gt[20];
+	m_A13 += gt[21];
+	m_A13 += gt[22];
+	m_A13 += gt[23];
+	m_A13 += gt[24];
+	m_A14 += go[18];
+	double RHS6 = Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
+	RHS6 += Idr[21];
+	RHS6 += Idr[22];
+	RHS6 += Idr[23];
+	RHS6 += Idr[24];
+	RHS6 -= go[19] * *cnV[19];
+	RHS6 -= go[20] * *cnV[20];
+	RHS6 -= go[21] * *cnV[21];
+	RHS6 -= go[22] * *cnV[22];
+	RHS6 -= go[23] * *cnV[23];
+	RHS6 -= go[24] * *cnV[24];
+	m_A15 += gt[25];
+	m_A15 += gt[26];
+	m_A15 += gt[27];
+	m_A16 += go[25];
+	double RHS7 = Idr[25];
+	RHS7 += Idr[26];
+	RHS7 += Idr[27];
+	RHS7 -= go[26] * *cnV[26];
+	RHS7 -= go[27] * *cnV[27];
+	m_A17 += gt[28];
+	m_A17 += gt[29];
+	m_A18 += go[28];
+	m_A19 += go[29];
+	double RHS8 = Idr[28];
+	RHS8 += Idr[29];
+	m_A20 += gt[30];
+	m_A20 += gt[31];
+	m_A21 += go[30];
+	double RHS9 = Idr[30];
+	RHS9 += Idr[31];
+	RHS9 -= go[31] * *cnV[31];
+	m_A22 += gt[32];
+	m_A22 += gt[33];
+	m_A23 += go[32];
+	double RHS10 = Idr[32];
+	RHS10 += Idr[33];
+	RHS10 -= go[33] * *cnV[33];
+	m_A24 += gt[34];
+	m_A24 += gt[35];
+	m_A25 += go[34];
+	double RHS11 = Idr[34];
+	RHS11 += Idr[35];
+	RHS11 -= go[35] * *cnV[35];
+	m_A26 += gt[36];
+	m_A26 += gt[37];
+	m_A26 += gt[38];
+	m_A26 += gt[39];
+	m_A26 += gt[40];
+	m_A26 += gt[41];
+	m_A26 += gt[42];
+	m_A27 += go[36];
+	double RHS12 = Idr[36];
+	RHS12 += Idr[37];
+	RHS12 += Idr[38];
+	RHS12 += Idr[39];
+	RHS12 += Idr[40];
+	RHS12 += Idr[41];
+	RHS12 += Idr[42];
+	RHS12 -= go[37] * *cnV[37];
+	RHS12 -= go[38] * *cnV[38];
+	RHS12 -= go[39] * *cnV[39];
+	RHS12 -= go[40] * *cnV[40];
+	RHS12 -= go[41] * *cnV[41];
+	RHS12 -= go[42] * *cnV[42];
+	m_A28 += gt[43];
+	m_A28 += gt[44];
+	m_A29 += go[43];
+	double RHS13 = Idr[43];
+	RHS13 += Idr[44];
+	RHS13 -= go[44] * *cnV[44];
+	m_A30 += gt[45];
+	m_A30 += gt[46];
+	m_A30 += gt[47];
+	m_A30 += gt[48];
+	m_A30 += gt[49];
+	m_A30 += gt[50];
+	m_A30 += gt[51];
+	m_A31 += go[45];
+	double RHS14 = Idr[45];
+	RHS14 += Idr[46];
+	RHS14 += Idr[47];
+	RHS14 += Idr[48];
+	RHS14 += Idr[49];
+	RHS14 += Idr[50];
+	RHS14 += Idr[51];
+	RHS14 -= go[46] * *cnV[46];
+	RHS14 -= go[47] * *cnV[47];
+	RHS14 -= go[48] * *cnV[48];
+	RHS14 -= go[49] * *cnV[49];
+	RHS14 -= go[50] * *cnV[50];
+	RHS14 -= go[51] * *cnV[51];
+	m_A32 += gt[52];
+	m_A32 += gt[53];
+	m_A33 += go[52];
+	double RHS15 = Idr[52];
+	RHS15 += Idr[53];
+	RHS15 -= go[53] * *cnV[53];
+	m_A34 += gt[54];
+	m_A34 += gt[55];
+	m_A34 += gt[56];
+	m_A34 += gt[57];
+	m_A36 += go[54];
+	m_A35 += go[55];
+	double RHS16 = Idr[54];
+	RHS16 += Idr[55];
+	RHS16 += Idr[56];
+	RHS16 += Idr[57];
+	RHS16 -= go[56] * *cnV[56];
+	RHS16 -= go[57] * *cnV[57];
+	m_A37 += gt[58];
+	m_A37 += gt[59];
+	m_A37 += gt[60];
+	m_A38 += go[58];
+	double RHS17 = Idr[58];
+	RHS17 += Idr[59];
+	RHS17 += Idr[60];
+	RHS17 -= go[59] * *cnV[59];
+	RHS17 -= go[60] * *cnV[60];
+	m_A39 += gt[61];
+	m_A39 += gt[62];
+	m_A39 += gt[63];
+	m_A39 += gt[64];
+	m_A40 += go[61];
+	m_A41 += go[62];
+	double RHS18 = Idr[61];
+	RHS18 += Idr[62];
+	RHS18 += Idr[63];
+	RHS18 += Idr[64];
+	RHS18 -= go[63] * *cnV[63];
+	RHS18 -= go[64] * *cnV[64];
+	m_A42 += gt[65];
+	m_A42 += gt[66];
+	m_A43 += go[65];
+	m_A44 += go[66];
+	double RHS19 = Idr[65];
+	RHS19 += Idr[66];
+	m_A45 += gt[67];
+	m_A45 += gt[68];
+	m_A45 += gt[69];
+	m_A46 += go[67];
+	double RHS20 = Idr[67];
+	RHS20 += Idr[68];
+	RHS20 += Idr[69];
+	RHS20 -= go[68] * *cnV[68];
+	RHS20 -= go[69] * *cnV[69];
+	m_A48 += gt[70];
+	m_A48 += gt[71];
+	m_A47 += go[70];
+	double RHS21 = Idr[70];
+	RHS21 += Idr[71];
+	RHS21 -= go[71] * *cnV[71];
+	m_A49 += gt[72];
+	m_A49 += gt[73];
+	m_A50 += go[72];
+	m_A51 += go[73];
+	double RHS22 = Idr[72];
+	RHS22 += Idr[73];
+	m_A53 += gt[74];
+	m_A53 += gt[75];
+	m_A52 += go[74];
+	double RHS23 = Idr[74];
+	RHS23 += Idr[75];
+	RHS23 -= go[75] * *cnV[75];
+	m_A55 += gt[76];
+	m_A55 += gt[77];
+	m_A55 += gt[78];
+	m_A55 += gt[79];
+	m_A54 += go[76];
+	m_A56 += go[77];
+	double RHS24 = Idr[76];
+	RHS24 += Idr[77];
+	RHS24 += Idr[78];
+	RHS24 += Idr[79];
+	RHS24 -= go[78] * *cnV[78];
+	RHS24 -= go[79] * *cnV[79];
+	m_A58 += gt[80];
+	m_A58 += gt[81];
+	m_A58 += gt[82];
+	m_A58 += gt[83];
+	m_A58 += gt[84];
+	m_A57 += go[80];
+	m_A60 += go[81];
+	m_A61 += go[82];
+	m_A59 += go[83];
+	double RHS25 = Idr[80];
+	RHS25 += Idr[81];
+	RHS25 += Idr[82];
+	RHS25 += Idr[83];
+	RHS25 += Idr[84];
+	RHS25 -= go[84] * *cnV[84];
+	m_A63 += gt[85];
+	m_A63 += gt[86];
+	m_A65 += go[85];
+	m_A62 += go[86];
+	double RHS26 = Idr[85];
+	RHS26 += Idr[86];
+	m_A67 += gt[87];
+	m_A67 += gt[88];
+	m_A67 += gt[89];
+	m_A67 += gt[90];
+	m_A66 += go[87];
+	m_A68 += go[88];
+	double RHS27 = Idr[87];
+	RHS27 += Idr[88];
+	RHS27 += Idr[89];
+	RHS27 += Idr[90];
+	RHS27 -= go[89] * *cnV[89];
+	RHS27 -= go[90] * *cnV[90];
+	m_A70 += gt[91];
+	m_A70 += gt[92];
+	m_A70 += gt[93];
+	m_A70 += gt[94];
+	m_A69 += go[91];
+	m_A71 += go[92];
+	double RHS28 = Idr[91];
+	RHS28 += Idr[92];
+	RHS28 += Idr[93];
+	RHS28 += Idr[94];
+	RHS28 -= go[93] * *cnV[93];
+	RHS28 -= go[94] * *cnV[94];
+	m_A74 += gt[95];
+	m_A74 += gt[96];
+	m_A73 += go[95];
+	m_A75 += go[96];
+	double RHS29 = Idr[95];
+	RHS29 += Idr[96];
+	m_A79 += gt[97];
+	m_A79 += gt[98];
+	m_A79 += gt[99];
+	m_A79 += gt[100];
+	m_A78 += go[97];
+	m_A77 += go[98];
+	m_A80 += go[99];
+	m_A76 += go[100];
+	double RHS30 = Idr[97];
+	RHS30 += Idr[98];
+	RHS30 += Idr[99];
+	RHS30 += Idr[100];
+	m_A84 += gt[101];
+	m_A84 += gt[102];
+	m_A83 += go[101];
+	m_A82 += go[102];
+	double RHS31 = Idr[101];
+	RHS31 += Idr[102];
+	m_A89 += gt[103];
+	m_A89 += gt[104];
+	m_A87 += go[103];
+	m_A86 += go[104];
+	double RHS32 = Idr[103];
+	RHS32 += Idr[104];
+	m_A91 += gt[105];
+	m_A91 += gt[106];
+	m_A90 += go[105];
+	m_A93 += go[106];
+	double RHS33 = Idr[105];
+	RHS33 += Idr[106];
+	m_A95 += gt[107];
+	m_A95 += gt[108];
+	m_A95 += gt[109];
+	m_A95 += gt[110];
+	m_A94 += go[107];
+	m_A96 += go[108];
+	double RHS34 = Idr[107];
+	RHS34 += Idr[108];
+	RHS34 += Idr[109];
+	RHS34 += Idr[110];
+	RHS34 -= go[109] * *cnV[109];
+	RHS34 -= go[110] * *cnV[110];
+	m_A99 += gt[111];
+	m_A99 += gt[112];
+	m_A97 += go[111];
+	m_A101 += go[112];
+	double RHS35 = Idr[111];
+	RHS35 += Idr[112];
+	m_A106 += gt[113];
+	m_A106 += gt[114];
+	m_A106 += gt[115];
+	m_A106 += gt[116];
+	m_A106 += gt[117];
+	m_A106 += gt[118];
+	m_A102 += go[113];
+	m_A104 += go[114];
+	m_A103 += go[115];
+	m_A108 += go[116];
+	double RHS36 = Idr[113];
+	RHS36 += Idr[114];
+	RHS36 += Idr[115];
+	RHS36 += Idr[116];
+	RHS36 += Idr[117];
+	RHS36 += Idr[118];
+	RHS36 -= go[117] * *cnV[117];
+	RHS36 -= go[118] * *cnV[118];
+	m_A113 += gt[119];
+	m_A113 += gt[120];
+	m_A113 += gt[121];
+	m_A113 += gt[122];
+	m_A113 += gt[123];
+	m_A115 += go[119];
+	m_A111 += go[120];
+	m_A112 += go[121];
+	m_A110 += go[122];
+	m_A109 += go[123];
+	double RHS37 = Idr[119];
+	RHS37 += Idr[120];
+	RHS37 += Idr[121];
+	RHS37 += Idr[122];
+	RHS37 += Idr[123];
+	m_A124 += gt[124];
+	m_A124 += gt[125];
+	m_A124 += gt[126];
+	m_A124 += gt[127];
+	m_A124 += gt[128];
+	m_A124 += gt[129];
+	m_A119 += go[124];
+	m_A118 += go[125];
+	m_A121 += go[126];
+	m_A120 += go[127];
+	m_A117 += go[128];
+	m_A116 += go[129];
+	double RHS38 = Idr[124];
+	RHS38 += Idr[125];
+	RHS38 += Idr[126];
+	RHS38 += Idr[127];
+	RHS38 += Idr[128];
+	RHS38 += Idr[129];
+	m_A137 += gt[130];
+	m_A137 += gt[131];
+	m_A137 += gt[132];
+	m_A137 += gt[133];
+	m_A137 += gt[134];
+	m_A137 += gt[135];
+	m_A137 += gt[136];
+	m_A137 += gt[137];
+	m_A135 += go[130];
+	m_A129 += go[131];
+	m_A134 += go[132];
+	m_A132 += go[133];
+	m_A128 += go[134];
+	m_A127 += go[135];
+	m_A130 += go[136];
+	m_A131 += go[137];
+	double RHS39 = Idr[130];
+	RHS39 += Idr[131];
+	RHS39 += Idr[132];
+	RHS39 += Idr[133];
+	RHS39 += Idr[134];
+	RHS39 += Idr[135];
+	RHS39 += Idr[136];
+	RHS39 += Idr[137];
+	m_A147 += gt[138];
+	m_A147 += gt[139];
+	m_A147 += gt[140];
+	m_A147 += gt[141];
+	m_A147 += gt[142];
+	m_A147 += gt[143];
+	m_A140 += go[138];
+	m_A141 += go[139];
+	m_A150 += go[140];
+	m_A142 += go[141];
+	double RHS40 = Idr[138];
+	RHS40 += Idr[139];
+	RHS40 += Idr[140];
+	RHS40 += Idr[141];
+	RHS40 += Idr[142];
+	RHS40 += Idr[143];
+	RHS40 -= go[142] * *cnV[142];
+	RHS40 -= go[143] * *cnV[143];
+	m_A158 += gt[144];
+	m_A158 += gt[145];
+	m_A158 += gt[146];
+	m_A158 += gt[147];
+	m_A158 += gt[148];
+	m_A158 += gt[149];
+	m_A151 += go[144];
+	m_A152 += go[145];
+	m_A154 += go[146];
+	m_A156 += go[147];
+	double RHS41 = Idr[144];
+	RHS41 += Idr[145];
+	RHS41 += Idr[146];
+	RHS41 += Idr[147];
+	RHS41 += Idr[148];
+	RHS41 += Idr[149];
+	RHS41 -= go[148] * *cnV[148];
+	RHS41 -= go[149] * *cnV[149];
+	m_A166 += gt[150];
+	m_A166 += gt[151];
+	m_A166 += gt[152];
+	m_A166 += gt[153];
+	m_A161 += go[150];
+	m_A162 += go[151];
+	double RHS42 = Idr[150];
+	RHS42 += Idr[151];
+	RHS42 += Idr[152];
+	RHS42 += Idr[153];
+	RHS42 -= go[152] * *cnV[152];
+	RHS42 -= go[153] * *cnV[153];
+	m_A175 += gt[154];
+	m_A175 += gt[155];
+	m_A175 += gt[156];
+	m_A175 += gt[157];
+	m_A175 += gt[158];
+	m_A172 += go[154];
+	m_A170 += go[155];
+	m_A169 += go[156];
+	m_A168 += go[157];
+	m_A171 += go[158];
+	double RHS43 = Idr[154];
+	RHS43 += Idr[155];
+	RHS43 += Idr[156];
+	RHS43 += Idr[157];
+	RHS43 += Idr[158];
+	const double f0 = 1.0 / m_A0;
+	const double f0_21 = -f0 * m_A47;
+	m_A48 += m_A1 * f0_21;
+	RHS21 += f0_21 * RHS0;
+	const double f0_37 = -f0 * m_A109;
+	m_A111 += m_A1 * f0_37;
+	RHS37 += f0_37 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_24 = -f1 * m_A54;
+	m_A56 += m_A3 * f1_24;
+	RHS24 += f1_24 * RHS1;
+	const double f1_37 = -f1 * m_A110;
+	m_A113 += m_A3 * f1_37;
+	RHS37 += f1_37 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_41 = -f2 * m_A151;
+	m_A153 += m_A5 * f2_41;
+	RHS41 += f2_41 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_25 = -f3 * m_A57;
+	m_A58 += m_A7 * f3_25;
+	RHS25 += f3_25 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_23 = -f4 * m_A52;
+	m_A53 += m_A9 * f4_23;
+	RHS23 += f4_23 * RHS4;
+	const double f4_43 = -f4 * m_A168;
+	m_A170 += m_A9 * f4_43;
+	RHS43 += f4_43 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_26 = -f5 * m_A62;
+	m_A63 += m_A11 * f5_26;
+	m_A64 += m_A12 * f5_26;
+	RHS26 += f5_26 * RHS5;
+	const double f5_41 = -f5 * m_A152;
+	m_A155 += m_A11 * f5_41;
+	m_A158 += m_A12 * f5_41;
+	RHS41 += f5_41 * RHS5;
+	const double f6 = 1.0 / m_A13;
+	const double f6_40 = -f6 * m_A140;
+	m_A143 += m_A14 * f6_40;
+	RHS40 += f6_40 * RHS6;
+	const double f7 = 1.0 / m_A15;
+	const double f7_27 = -f7 * m_A66;
+	m_A68 += m_A16 * f7_27;
+	RHS27 += f7_27 * RHS7;
+	const double f7_43 = -f7 * m_A169;
+	m_A175 += m_A16 * f7_43;
+	RHS43 += f7_43 * RHS7;
+	const double f8 = 1.0 / m_A17;
+	const double f8_30 = -f8 * m_A76;
+	m_A79 += m_A18 * f8_30;
+	m_A81 += m_A19 * f8_30;
+	RHS30 += f8_30 * RHS8;
+	const double f8_40 = -f8 * m_A141;
+	m_A144 += m_A18 * f8_40;
+	m_A147 += m_A19 * f8_40;
+	RHS40 += f8_40 * RHS8;
+	const double f9 = 1.0 / m_A20;
+	const double f9_29 = -f9 * m_A73;
+	m_A74 += m_A21 * f9_29;
+	RHS29 += f9_29 * RHS9;
+	const double f10 = 1.0 / m_A22;
+	const double f10_30 = -f10 * m_A77;
+	m_A79 += m_A23 * f10_30;
+	RHS30 += f10_30 * RHS10;
+	const double f11 = 1.0 / m_A24;
+	const double f11_30 = -f11 * m_A78;
+	m_A79 += m_A25 * f11_30;
+	RHS30 += f11_30 * RHS11;
+	const double f12 = 1.0 / m_A26;
+	const double f12_36 = -f12 * m_A102;
+	m_A105 += m_A27 * f12_36;
+	RHS36 += f12_36 * RHS12;
+	const double f13 = 1.0 / m_A28;
+	const double f13_31 = -f13 * m_A82;
+	m_A84 += m_A29 * f13_31;
+	RHS31 += f13_31 * RHS13;
+	const double f13_39 = -f13 * m_A127;
+	m_A132 += m_A29 * f13_39;
+	RHS39 += f13_39 * RHS13;
+	const double f14 = 1.0 / m_A30;
+	const double f14_28 = -f14 * m_A69;
+	m_A72 += m_A31 * f14_28;
+	RHS28 += f14_28 * RHS14;
+	const double f15 = 1.0 / m_A32;
+	const double f15_32 = -f15 * m_A86;
+	m_A89 += m_A33 * f15_32;
+	RHS32 += f15_32 * RHS15;
+	const double f15_38 = -f15 * m_A116;
+	m_A120 += m_A33 * f15_38;
+	RHS38 += f15_38 * RHS15;
+	const double f16 = 1.0 / m_A34;
+	const double f16_31 = -f16 * m_A83;
+	m_A84 += m_A35 * f16_31;
+	m_A85 += m_A36 * f16_31;
+	RHS31 += f16_31 * RHS16;
+	const double f16_32 = -f16 * m_A87;
+	m_A88 += m_A35 * f16_32;
+	m_A89 += m_A36 * f16_32;
+	RHS32 += f16_32 * RHS16;
+	const double f17 = 1.0 / m_A37;
+	const double f17_34 = -f17 * m_A94;
+	m_A96 += m_A38 * f17_34;
+	RHS34 += f17_34 * RHS17;
+	const double f17_39 = -f17 * m_A128;
+	m_A137 += m_A38 * f17_39;
+	RHS39 += f17_39 * RHS17;
+	const double f18 = 1.0 / m_A39;
+	const double f18_33 = -f18 * m_A90;
+	m_A91 += m_A40 * f18_33;
+	m_A92 += m_A41 * f18_33;
+	RHS33 += f18_33 * RHS18;
+	const double f18_35 = -f18 * m_A97;
+	m_A98 += m_A40 * f18_35;
+	m_A99 += m_A41 * f18_35;
+	RHS35 += f18_35 * RHS18;
+	const double f19 = 1.0 / m_A42;
+	const double f19_36 = -f19 * m_A103;
+	m_A106 += m_A43 * f19_36;
+	m_A108 += m_A44 * f19_36;
+	RHS36 += f19_36 * RHS19;
+	const double f19_39 = -f19 * m_A129;
+	m_A135 += m_A43 * f19_39;
+	m_A137 += m_A44 * f19_39;
+	RHS39 += f19_39 * RHS19;
+	const double f20 = 1.0 / m_A45;
+	const double f20_38 = -f20 * m_A117;
+	m_A124 += m_A46 * f20_38;
+	RHS38 += f20_38 * RHS20;
+	const double f20_42 = -f20 * m_A161;
+	m_A162 += m_A46 * f20_42;
+	RHS42 += f20_42 * RHS20;
+	const double f21 = 1.0 / m_A48;
+	const double f21_37 = -f21 * m_A111;
+	RHS37 += f21_37 * RHS21;
+	const double f22 = 1.0 / m_A49;
+	const double f22_36 = -f22 * m_A104;
+	m_A106 += m_A50 * f22_36;
+	m_A107 += m_A51 * f22_36;
+	RHS36 += f22_36 * RHS22;
+	const double f22_38 = -f22 * m_A118;
+	m_A123 += m_A50 * f22_38;
+	m_A124 += m_A51 * f22_38;
+	RHS38 += f22_38 * RHS22;
+	const double f23 = 1.0 / m_A53;
+	const double f23_43 = -f23 * m_A170;
+	RHS43 += f23_43 * RHS23;
+	const double f24 = 1.0 / m_A55;
+	const double f24_41 = -f24 * m_A153;
+	m_A156 += m_A56 * f24_41;
+	RHS41 += f24_41 * RHS24;
+	const double f25 = 1.0 / m_A58;
+	const double f25_37 = -f25 * m_A112;
+	m_A113 += m_A59 * f25_37;
+	m_A114 += m_A60 * f25_37;
+	m_A115 += m_A61 * f25_37;
+	RHS37 += f25_37 * RHS25;
+	const double f25_40 = -f25 * m_A142;
+	m_A145 += m_A59 * f25_40;
+	m_A147 += m_A60 * f25_40;
+	m_A148 += m_A61 * f25_40;
+	RHS40 += f25_40 * RHS25;
+	const double f25_41 = -f25 * m_A154;
+	m_A156 += m_A59 * f25_41;
+	m_A157 += m_A60 * f25_41;
+	m_A158 += m_A61 * f25_41;
+	RHS41 += f25_41 * RHS25;
+	const double f26 = 1.0 / m_A63;
+	const double f26_41 = -f26 * m_A155;
+	m_A158 += m_A64 * f26_41;
+	m_A160 += m_A65 * f26_41;
+	RHS41 += f26_41 * RHS26;
+	const double f26_43 = -f26 * m_A171;
+	m_A173 += m_A64 * f26_43;
+	m_A175 += m_A65 * f26_43;
+	RHS43 += f26_43 * RHS26;
+	const double f27 = 1.0 / m_A67;
+	const double f27_40 = -f27 * m_A143;
+	m_A150 += m_A68 * f27_40;
+	RHS40 += f27_40 * RHS27;
+	const double f28 = 1.0 / m_A70;
+	const double f28_38 = -f28 * m_A119;
+	m_A124 += m_A71 * f28_38;
+	m_A126 += m_A72 * f28_38;
+	RHS38 += f28_38 * RHS28;
+	const double f29 = 1.0 / m_A74;
+	const double f29_39 = -f29 * m_A130;
+	m_A137 += m_A75 * f29_39;
+	RHS39 += f29_39 * RHS29;
+	const double f30 = 1.0 / m_A79;
+	const double f30_39 = -f30 * m_A131;
+	m_A137 += m_A80 * f30_39;
+	m_A138 += m_A81 * f30_39;
+	RHS39 += f30_39 * RHS30;
+	const double f30_40 = -f30 * m_A144;
+	m_A146 += m_A80 * f30_40;
+	m_A147 += m_A81 * f30_40;
+	RHS40 += f30_40 * RHS30;
+	const double f31 = 1.0 / m_A84;
+	const double f31_32 = -f31 * m_A88;
+	m_A89 += m_A85 * f31_32;
+	RHS32 += f31_32 * RHS31;
+	const double f31_39 = -f31 * m_A132;
+	m_A133 += m_A85 * f31_39;
+	RHS39 += f31_39 * RHS31;
+	const double f32 = 1.0 / m_A89;
+	const double f32_38 = -f32 * m_A120;
+	RHS38 += f32_38 * RHS32;
+	const double f32_39 = -f32 * m_A133;
+	RHS39 += f32_39 * RHS32;
+	const double f33 = 1.0 / m_A91;
+	const double f33_35 = -f33 * m_A98;
+	m_A99 += m_A92 * f33_35;
+	m_A100 += m_A93 * f33_35;
+	RHS35 += f33_35 * RHS33;
+	const double f33_38 = -f33 * m_A121;
+	m_A122 += m_A92 * f33_38;
+	m_A124 += m_A93 * f33_38;
+	RHS38 += f33_38 * RHS33;
+	const double f34 = 1.0 / m_A95;
+	const double f34_36 = -f34 * m_A105;
+	m_A108 += m_A96 * f34_36;
+	RHS36 += f34_36 * RHS34;
+	const double f35 = 1.0 / m_A99;
+	const double f35_38 = -f35 * m_A122;
+	m_A124 += m_A100 * f35_38;
+	m_A125 += m_A101 * f35_38;
+	RHS38 += f35_38 * RHS35;
+	const double f35_39 = -f35 * m_A134;
+	m_A136 += m_A100 * f35_39;
+	m_A137 += m_A101 * f35_39;
+	RHS39 += f35_39 * RHS35;
+	const double f36 = 1.0 / m_A106;
+	const double f36_38 = -f36 * m_A123;
+	m_A124 += m_A107 * f36_38;
+	m_A125 += m_A108 * f36_38;
+	RHS38 += f36_38 * RHS36;
+	const double f36_39 = -f36 * m_A135;
+	m_A136 += m_A107 * f36_39;
+	m_A137 += m_A108 * f36_39;
+	RHS39 += f36_39 * RHS36;
+	const double f37 = 1.0 / m_A113;
+	const double f37_40 = -f37 * m_A145;
+	m_A147 += m_A114 * f37_40;
+	m_A148 += m_A115 * f37_40;
+	RHS40 += f37_40 * RHS37;
+	const double f37_41 = -f37 * m_A156;
+	m_A157 += m_A114 * f37_41;
+	m_A158 += m_A115 * f37_41;
+	RHS41 += f37_41 * RHS37;
+	const double f38 = 1.0 / m_A124;
+	const double f38_39 = -f38 * m_A136;
+	m_A137 += m_A125 * f38_39;
+	m_A139 += m_A126 * f38_39;
+	RHS39 += f38_39 * RHS38;
+	const double f38_42 = -f38 * m_A162;
+	m_A163 += m_A125 * f38_42;
+	m_A166 += m_A126 * f38_42;
+	RHS42 += f38_42 * RHS38;
+	const double f39 = 1.0 / m_A137;
+	const double f39_40 = -f39 * m_A146;
+	m_A147 += m_A138 * f39_40;
+	m_A149 += m_A139 * f39_40;
+	RHS40 += f39_40 * RHS39;
+	const double f39_42 = -f39 * m_A163;
+	m_A164 += m_A138 * f39_42;
+	m_A166 += m_A139 * f39_42;
+	RHS42 += f39_42 * RHS39;
+	const double f40 = 1.0 / m_A147;
+	const double f40_41 = -f40 * m_A157;
+	m_A158 += m_A148 * f40_41;
+	m_A159 += m_A149 * f40_41;
+	m_A160 += m_A150 * f40_41;
+	RHS41 += f40_41 * RHS40;
+	const double f40_42 = -f40 * m_A164;
+	m_A165 += m_A148 * f40_42;
+	m_A166 += m_A149 * f40_42;
+	m_A167 += m_A150 * f40_42;
+	RHS42 += f40_42 * RHS40;
+	const double f40_43 = -f40 * m_A172;
+	m_A173 += m_A148 * f40_43;
+	m_A174 += m_A149 * f40_43;
+	m_A175 += m_A150 * f40_43;
+	RHS43 += f40_43 * RHS40;
+	const double f41 = 1.0 / m_A158;
+	const double f41_42 = -f41 * m_A165;
+	m_A166 += m_A159 * f41_42;
+	m_A167 += m_A160 * f41_42;
+	RHS42 += f41_42 * RHS41;
+	const double f41_43 = -f41 * m_A173;
+	m_A174 += m_A159 * f41_43;
+	m_A175 += m_A160 * f41_43;
+	RHS43 += f41_43 * RHS41;
+	const double f42 = 1.0 / m_A166;
+	const double f42_43 = -f42 * m_A174;
+	m_A175 += m_A167 * f42_43;
+	RHS43 += f42_43 * RHS42;
+	V[43] = RHS43 / m_A175;
+	double tmp42 = 0.0;
+	tmp42 += m_A167 * V[43];
+	V[42] = (RHS42 - tmp42) / m_A166;
+	double tmp41 = 0.0;
+	tmp41 += m_A159 * V[42];
+	tmp41 += m_A160 * V[43];
+	V[41] = (RHS41 - tmp41) / m_A158;
+	double tmp40 = 0.0;
+	tmp40 += m_A148 * V[41];
+	tmp40 += m_A149 * V[42];
+	tmp40 += m_A150 * V[43];
+	V[40] = (RHS40 - tmp40) / m_A147;
+	double tmp39 = 0.0;
+	tmp39 += m_A138 * V[40];
+	tmp39 += m_A139 * V[42];
+	V[39] = (RHS39 - tmp39) / m_A137;
+	double tmp38 = 0.0;
+	tmp38 += m_A125 * V[39];
+	tmp38 += m_A126 * V[42];
+	V[38] = (RHS38 - tmp38) / m_A124;
+	double tmp37 = 0.0;
+	tmp37 += m_A114 * V[40];
+	tmp37 += m_A115 * V[41];
+	V[37] = (RHS37 - tmp37) / m_A113;
+	double tmp36 = 0.0;
+	tmp36 += m_A107 * V[38];
+	tmp36 += m_A108 * V[39];
+	V[36] = (RHS36 - tmp36) / m_A106;
+	double tmp35 = 0.0;
+	tmp35 += m_A100 * V[38];
+	tmp35 += m_A101 * V[39];
+	V[35] = (RHS35 - tmp35) / m_A99;
+	double tmp34 = 0.0;
+	tmp34 += m_A96 * V[39];
+	V[34] = (RHS34 - tmp34) / m_A95;
+	double tmp33 = 0.0;
+	tmp33 += m_A92 * V[35];
+	tmp33 += m_A93 * V[38];
+	V[33] = (RHS33 - tmp33) / m_A91;
+	double tmp32 = 0.0;
+	V[32] = (RHS32 - tmp32) / m_A89;
+	double tmp31 = 0.0;
+	tmp31 += m_A85 * V[32];
+	V[31] = (RHS31 - tmp31) / m_A84;
+	double tmp30 = 0.0;
+	tmp30 += m_A80 * V[39];
+	tmp30 += m_A81 * V[40];
+	V[30] = (RHS30 - tmp30) / m_A79;
+	double tmp29 = 0.0;
+	tmp29 += m_A75 * V[39];
+	V[29] = (RHS29 - tmp29) / m_A74;
+	double tmp28 = 0.0;
+	tmp28 += m_A71 * V[38];
+	tmp28 += m_A72 * V[42];
+	V[28] = (RHS28 - tmp28) / m_A70;
+	double tmp27 = 0.0;
+	tmp27 += m_A68 * V[43];
+	V[27] = (RHS27 - tmp27) / m_A67;
+	double tmp26 = 0.0;
+	tmp26 += m_A64 * V[41];
+	tmp26 += m_A65 * V[43];
+	V[26] = (RHS26 - tmp26) / m_A63;
+	double tmp25 = 0.0;
+	tmp25 += m_A59 * V[37];
+	tmp25 += m_A60 * V[40];
+	tmp25 += m_A61 * V[41];
+	V[25] = (RHS25 - tmp25) / m_A58;
+	double tmp24 = 0.0;
+	tmp24 += m_A56 * V[37];
+	V[24] = (RHS24 - tmp24) / m_A55;
+	double tmp23 = 0.0;
+	V[23] = (RHS23 - tmp23) / m_A53;
+	double tmp22 = 0.0;
+	tmp22 += m_A50 * V[36];
+	tmp22 += m_A51 * V[38];
+	V[22] = (RHS22 - tmp22) / m_A49;
+	double tmp21 = 0.0;
+	V[21] = (RHS21 - tmp21) / m_A48;
+	double tmp20 = 0.0;
+	tmp20 += m_A46 * V[38];
+	V[20] = (RHS20 - tmp20) / m_A45;
+	double tmp19 = 0.0;
+	tmp19 += m_A43 * V[36];
+	tmp19 += m_A44 * V[39];
+	V[19] = (RHS19 - tmp19) / m_A42;
+	double tmp18 = 0.0;
+	tmp18 += m_A40 * V[33];
+	tmp18 += m_A41 * V[35];
+	V[18] = (RHS18 - tmp18) / m_A39;
+	double tmp17 = 0.0;
+	tmp17 += m_A38 * V[39];
+	V[17] = (RHS17 - tmp17) / m_A37;
+	double tmp16 = 0.0;
+	tmp16 += m_A35 * V[31];
+	tmp16 += m_A36 * V[32];
+	V[16] = (RHS16 - tmp16) / m_A34;
+	double tmp15 = 0.0;
+	tmp15 += m_A33 * V[32];
+	V[15] = (RHS15 - tmp15) / m_A32;
+	double tmp14 = 0.0;
+	tmp14 += m_A31 * V[42];
+	V[14] = (RHS14 - tmp14) / m_A30;
+	double tmp13 = 0.0;
+	tmp13 += m_A29 * V[31];
+	V[13] = (RHS13 - tmp13) / m_A28;
+	double tmp12 = 0.0;
+	tmp12 += m_A27 * V[34];
+	V[12] = (RHS12 - tmp12) / m_A26;
+	double tmp11 = 0.0;
+	tmp11 += m_A25 * V[30];
+	V[11] = (RHS11 - tmp11) / m_A24;
+	double tmp10 = 0.0;
+	tmp10 += m_A23 * V[30];
+	V[10] = (RHS10 - tmp10) / m_A22;
+	double tmp9 = 0.0;
+	tmp9 += m_A21 * V[29];
+	V[9] = (RHS9 - tmp9) / m_A20;
+	double tmp8 = 0.0;
+	tmp8 += m_A18 * V[30];
+	tmp8 += m_A19 * V[40];
+	V[8] = (RHS8 - tmp8) / m_A17;
+	double tmp7 = 0.0;
+	tmp7 += m_A16 * V[43];
+	V[7] = (RHS7 - tmp7) / m_A15;
+	double tmp6 = 0.0;
+	tmp6 += m_A14 * V[27];
+	V[6] = (RHS6 - tmp6) / m_A13;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[26];
+	tmp5 += m_A12 * V[41];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[23];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[25];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[24];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[37];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[21];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// 280zzzap
+static void nl_gcr_24643c159711f292_95_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A4 += gt[12];
+	m_A5 += go[10];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A6 += gt[16];
+	m_A6 += gt[17];
+	m_A6 += gt[18];
+	m_A6 += gt[19];
+	m_A7 += go[13];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
+	RHS3 -= go[16] * *cnV[16];
+	RHS3 -= go[17] * *cnV[17];
+	RHS3 -= go[18] * *cnV[18];
+	RHS3 -= go[19] * *cnV[19];
+	m_A8 += gt[20];
+	m_A8 += gt[21];
+	m_A9 += go[20];
+	double RHS4 = Idr[20];
+	RHS4 += Idr[21];
+	RHS4 -= go[21] * *cnV[21];
+	m_A10 += gt[22];
+	m_A10 += gt[23];
+	m_A11 += go[22];
+	double RHS5 = Idr[22];
+	RHS5 += Idr[23];
+	RHS5 -= go[23] * *cnV[23];
+	m_A12 += gt[24];
+	m_A12 += gt[25];
+	m_A12 += gt[26];
+	m_A12 += gt[27];
+	m_A13 += go[24];
+	double RHS6 = Idr[24];
+	RHS6 += Idr[25];
+	RHS6 += Idr[26];
+	RHS6 += Idr[27];
+	RHS6 -= go[25] * *cnV[25];
+	RHS6 -= go[26] * *cnV[26];
+	RHS6 -= go[27] * *cnV[27];
+	m_A14 += gt[28];
+	m_A14 += gt[29];
+	m_A14 += gt[30];
+	m_A14 += gt[31];
+	m_A15 += go[28];
+	double RHS7 = Idr[28];
+	RHS7 += Idr[29];
+	RHS7 += Idr[30];
+	RHS7 += Idr[31];
+	RHS7 -= go[29] * *cnV[29];
+	RHS7 -= go[30] * *cnV[30];
+	RHS7 -= go[31] * *cnV[31];
+	m_A16 += gt[32];
+	m_A16 += gt[33];
+	m_A17 += go[32];
+	double RHS8 = Idr[32];
+	RHS8 += Idr[33];
+	RHS8 -= go[33] * *cnV[33];
+	m_A18 += gt[34];
+	m_A18 += gt[35];
+	m_A18 += gt[36];
+	m_A18 += gt[37];
+	m_A19 += go[34];
+	double RHS9 = Idr[34];
+	RHS9 += Idr[35];
+	RHS9 += Idr[36];
+	RHS9 += Idr[37];
+	RHS9 -= go[35] * *cnV[35];
+	RHS9 -= go[36] * *cnV[36];
+	RHS9 -= go[37] * *cnV[37];
+	m_A20 += gt[38];
+	m_A20 += gt[39];
+	m_A22 += go[38];
+	m_A21 += go[39];
+	double RHS10 = Idr[38];
+	RHS10 += Idr[39];
+	m_A23 += gt[40];
+	m_A23 += gt[41];
+	m_A23 += gt[42];
+	m_A23 += gt[43];
+	m_A24 += go[40];
+	double RHS11 = Idr[40];
+	RHS11 += Idr[41];
+	RHS11 += Idr[42];
+	RHS11 += Idr[43];
+	RHS11 -= go[41] * *cnV[41];
+	RHS11 -= go[42] * *cnV[42];
+	RHS11 -= go[43] * *cnV[43];
+	m_A25 += gt[44];
+	m_A25 += gt[45];
+	m_A25 += gt[46];
+	m_A27 += go[44];
+	m_A28 += go[45];
+	m_A26 += go[46];
+	double RHS12 = Idr[44];
+	RHS12 += Idr[45];
+	RHS12 += Idr[46];
+	m_A29 += gt[47];
+	m_A29 += gt[48];
+	m_A31 += go[47];
+	m_A30 += go[48];
+	double RHS13 = Idr[47];
+	RHS13 += Idr[48];
+	m_A37 += gt[49];
+	m_A37 += gt[50];
+	m_A37 += gt[51];
+	m_A37 += gt[52];
+	m_A37 += gt[53];
+	m_A37 += gt[54];
+	m_A36 += go[49];
+	m_A35 += go[50];
+	m_A34 += go[51];
+	m_A33 += go[52];
+	m_A32 += go[53];
+	double RHS14 = Idr[49];
+	RHS14 += Idr[50];
+	RHS14 += Idr[51];
+	RHS14 += Idr[52];
+	RHS14 += Idr[53];
+	RHS14 += Idr[54];
+	RHS14 -= go[54] * *cnV[54];
+	m_A39 += gt[55];
+	m_A39 += gt[56];
+	m_A39 += gt[57];
+	m_A39 += gt[58];
+	m_A38 += go[55];
+	m_A40 += go[56];
+	double RHS15 = Idr[55];
+	RHS15 += Idr[56];
+	RHS15 += Idr[57];
+	RHS15 += Idr[58];
+	RHS15 -= go[57] * *cnV[57];
+	RHS15 -= go[58] * *cnV[58];
+	m_A42 += gt[59];
+	m_A42 += gt[60];
+	m_A42 += gt[61];
+	m_A42 += gt[62];
+	m_A41 += go[59];
+	m_A43 += go[60];
+	double RHS16 = Idr[59];
+	RHS16 += Idr[60];
+	RHS16 += Idr[61];
+	RHS16 += Idr[62];
+	RHS16 -= go[61] * *cnV[61];
+	RHS16 -= go[62] * *cnV[62];
+	m_A45 += gt[63];
+	m_A45 += gt[64];
+	m_A45 += gt[65];
+	m_A46 += go[63];
+	m_A44 += go[64];
+	double RHS17 = Idr[63];
+	RHS17 += Idr[64];
+	RHS17 += Idr[65];
+	RHS17 -= go[65] * *cnV[65];
+	m_A52 += gt[66];
+	m_A52 += gt[67];
+	m_A52 += gt[68];
+	m_A52 += gt[69];
+	m_A52 += gt[70];
+	m_A52 += gt[71];
+	m_A49 += go[66];
+	m_A50 += go[67];
+	m_A51 += go[68];
+	m_A47 += go[69];
+	m_A48 += go[70];
+	double RHS18 = Idr[66];
+	RHS18 += Idr[67];
+	RHS18 += Idr[68];
+	RHS18 += Idr[69];
+	RHS18 += Idr[70];
+	RHS18 += Idr[71];
+	RHS18 -= go[71] * *cnV[71];
+	m_A59 += gt[72];
+	m_A59 += gt[73];
+	m_A57 += go[72];
+	m_A62 += go[73];
+	double RHS19 = Idr[72];
+	RHS19 += Idr[73];
+	m_A66 += gt[74];
+	m_A66 += gt[75];
+	m_A66 += gt[76];
+	m_A66 += gt[77];
+	m_A66 += gt[78];
+	m_A66 += gt[79];
+	m_A63 += go[74];
+	m_A64 += go[75];
+	m_A68 += go[76];
+	m_A67 += go[77];
+	double RHS20 = Idr[74];
+	RHS20 += Idr[75];
+	RHS20 += Idr[76];
+	RHS20 += Idr[77];
+	RHS20 += Idr[78];
+	RHS20 += Idr[79];
+	RHS20 -= go[78] * *cnV[78];
+	RHS20 -= go[79] * *cnV[79];
+	m_A73 += gt[80];
+	m_A73 += gt[81];
+	m_A73 += gt[82];
+	m_A73 += gt[83];
+	m_A72 += go[80];
+	m_A71 += go[81];
+	m_A69 += go[82];
+	m_A70 += go[83];
+	double RHS21 = Idr[80];
+	RHS21 += Idr[81];
+	RHS21 += Idr[82];
+	RHS21 += Idr[83];
+	m_A80 += gt[84];
+	m_A80 += gt[85];
+	m_A80 += gt[86];
+	m_A80 += gt[87];
+	m_A80 += gt[88];
+	m_A80 += gt[89];
+	m_A80 += gt[90];
+	m_A80 += gt[91];
+	m_A80 += gt[92];
+	m_A80 += gt[93];
+	m_A80 += gt[94];
+	m_A75 += go[84];
+	m_A82 += go[85];
+	m_A76 += go[86];
+	double RHS22 = Idr[84];
+	RHS22 += Idr[85];
+	RHS22 += Idr[86];
+	RHS22 += Idr[87];
+	RHS22 += Idr[88];
+	RHS22 += Idr[89];
+	RHS22 += Idr[90];
+	RHS22 += Idr[91];
+	RHS22 += Idr[92];
+	RHS22 += Idr[93];
+	RHS22 += Idr[94];
+	RHS22 -= go[87] * *cnV[87];
+	RHS22 -= go[88] * *cnV[88];
+	RHS22 -= go[89] * *cnV[89];
+	RHS22 -= go[90] * *cnV[90];
+	RHS22 -= go[91] * *cnV[91];
+	RHS22 -= go[92] * *cnV[92];
+	RHS22 -= go[93] * *cnV[93];
+	RHS22 -= go[94] * *cnV[94];
+	m_A88 += gt[95];
+	m_A88 += gt[96];
+	m_A88 += gt[97];
+	m_A88 += gt[98];
+	m_A88 += gt[99];
+	m_A83 += go[95];
+	m_A85 += go[96];
+	m_A84 += go[97];
+	m_A86 += go[98];
+	double RHS23 = Idr[95];
+	RHS23 += Idr[96];
+	RHS23 += Idr[97];
+	RHS23 += Idr[98];
+	RHS23 += Idr[99];
+	RHS23 -= go[99] * *cnV[99];
+	m_A94 += gt[100];
+	m_A94 += gt[101];
+	m_A94 += gt[102];
+	m_A91 += go[100];
+	m_A89 += go[101];
+	m_A92 += go[102];
+	double RHS24 = Idr[100];
+	RHS24 += Idr[101];
+	RHS24 += Idr[102];
+	const double f0 = 1.0 / m_A0;
+	const double f0_15 = -f0 * m_A38;
+	m_A40 += m_A1 * f0_15;
+	RHS15 += f0_15 * RHS0;
+	const double f0_21 = -f0 * m_A69;
+	m_A73 += m_A1 * f0_21;
+	RHS21 += f0_21 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_20 = -f1 * m_A63;
+	m_A65 += m_A3 * f1_20;
+	RHS20 += f1_20 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_16 = -f2 * m_A41;
+	m_A43 += m_A5 * f2_16;
+	RHS16 += f2_16 * RHS2;
+	const double f2_18 = -f2 * m_A47;
+	m_A52 += m_A5 * f2_18;
+	RHS18 += f2_18 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_22 = -f3 * m_A75;
+	m_A77 += m_A7 * f3_22;
+	RHS22 += f3_22 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_14 = -f4 * m_A32;
+	m_A37 += m_A9 * f4_14;
+	RHS14 += f4_14 * RHS4;
+	const double f4_21 = -f4 * m_A70;
+	m_A71 += m_A9 * f4_21;
+	RHS21 += f4_21 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_17 = -f5 * m_A44;
+	m_A45 += m_A11 * f5_17;
+	RHS17 += f5_17 * RHS5;
+	const double f5_18 = -f5 * m_A48;
+	m_A51 += m_A11 * f5_18;
+	RHS18 += f5_18 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_14 = -f6 * m_A33;
+	m_A37 += m_A13 * f6_14;
+	RHS14 += f6_14 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_14 = -f7 * m_A34;
+	m_A37 += m_A15 * f7_14;
+	RHS14 += f7_14 * RHS7;
+	const double f8 = 1.0 / m_A16;
+	const double f8_23 = -f8 * m_A83;
+	m_A88 += m_A17 * f8_23;
+	RHS23 += f8_23 * RHS8;
+	const double f9 = 1.0 / m_A18;
+	const double f9_14 = -f9 * m_A35;
+	m_A37 += m_A19 * f9_14;
+	RHS14 += f9_14 * RHS9;
+	const double f10 = 1.0 / m_A20;
+	const double f10_20 = -f10 * m_A64;
+	m_A66 += m_A21 * f10_20;
+	m_A68 += m_A22 * f10_20;
+	RHS20 += f10_20 * RHS10;
+	const double f10_23 = -f10 * m_A84;
+	m_A86 += m_A21 * f10_23;
+	m_A88 += m_A22 * f10_23;
+	RHS23 += f10_23 * RHS10;
+	const double f11 = 1.0 / m_A23;
+	const double f11_14 = -f11 * m_A36;
+	m_A37 += m_A24 * f11_14;
+	RHS14 += f11_14 * RHS11;
+	const double f12 = 1.0 / m_A25;
+	const double f12_18 = -f12 * m_A49;
+	m_A52 += m_A26 * f12_18;
+	m_A53 += m_A27 * f12_18;
+	m_A56 += m_A28 * f12_18;
+	RHS18 += f12_18 * RHS12;
+	const double f12_19 = -f12 * m_A57;
+	m_A58 += m_A26 * f12_19;
+	m_A59 += m_A27 * f12_19;
+	m_A62 += m_A28 * f12_19;
+	RHS19 += f12_19 * RHS12;
+	const double f12_24 = -f12 * m_A89;
+	m_A90 += m_A26 * f12_24;
+	m_A91 += m_A27 * f12_24;
+	m_A94 += m_A28 * f12_24;
+	RHS24 += f12_24 * RHS12;
+	const double f13 = 1.0 / m_A29;
+	const double f13_18 = -f13 * m_A50;
+	m_A52 += m_A30 * f13_18;
+	m_A54 += m_A31 * f13_18;
+	RHS18 += f13_18 * RHS13;
+	const double f13_22 = -f13 * m_A76;
+	m_A78 += m_A30 * f13_22;
+	m_A80 += m_A31 * f13_22;
+	RHS22 += f13_22 * RHS13;
+	const double f14 = 1.0 / m_A37;
+	const double f14_21 = -f14 * m_A71;
+	RHS21 += f14_21 * RHS14;
+	const double f15 = 1.0 / m_A39;
+	const double f15_20 = -f15 * m_A65;
+	m_A67 += m_A40 * f15_20;
+	RHS20 += f15_20 * RHS15;
+	const double f16 = 1.0 / m_A42;
+	const double f16_22 = -f16 * m_A77;
+	m_A78 += m_A43 * f16_22;
+	RHS22 += f16_22 * RHS16;
+	const double f17 = 1.0 / m_A45;
+	const double f17_18 = -f17 * m_A51;
+	m_A55 += m_A46 * f17_18;
+	RHS18 += f17_18 * RHS17;
+	const double f17_23 = -f17 * m_A85;
+	m_A88 += m_A46 * f17_23;
+	RHS23 += f17_23 * RHS17;
+	const double f18 = 1.0 / m_A52;
+	const double f18_19 = -f18 * m_A58;
+	m_A59 += m_A53 * f18_19;
+	m_A60 += m_A54 * f18_19;
+	m_A61 += m_A55 * f18_19;
+	m_A62 += m_A56 * f18_19;
+	RHS19 += f18_19 * RHS18;
+	const double f18_22 = -f18 * m_A78;
+	m_A79 += m_A53 * f18_22;
+	m_A80 += m_A54 * f18_22;
+	m_A81 += m_A55 * f18_22;
+	m_A82 += m_A56 * f18_22;
+	RHS22 += f18_22 * RHS18;
+	const double f18_24 = -f18 * m_A90;
+	m_A91 += m_A53 * f18_24;
+	m_A92 += m_A54 * f18_24;
+	m_A93 += m_A55 * f18_24;
+	m_A94 += m_A56 * f18_24;
+	RHS24 += f18_24 * RHS18;
+	const double f19 = 1.0 / m_A59;
+	const double f19_22 = -f19 * m_A79;
+	m_A80 += m_A60 * f19_22;
+	m_A81 += m_A61 * f19_22;
+	m_A82 += m_A62 * f19_22;
+	RHS22 += f19_22 * RHS19;
+	const double f19_24 = -f19 * m_A91;
+	m_A92 += m_A60 * f19_24;
+	m_A93 += m_A61 * f19_24;
+	m_A94 += m_A62 * f19_24;
+	RHS24 += f19_24 * RHS19;
+	const double f20 = 1.0 / m_A66;
+	const double f20_21 = -f20 * m_A72;
+	m_A73 += m_A67 * f20_21;
+	m_A74 += m_A68 * f20_21;
+	RHS21 += f20_21 * RHS20;
+	const double f20_23 = -f20 * m_A86;
+	m_A87 += m_A67 * f20_23;
+	m_A88 += m_A68 * f20_23;
+	RHS23 += f20_23 * RHS20;
+	const double f21 = 1.0 / m_A73;
+	const double f21_23 = -f21 * m_A87;
+	m_A88 += m_A74 * f21_23;
+	RHS23 += f21_23 * RHS21;
+	const double f22 = 1.0 / m_A80;
+	const double f22_24 = -f22 * m_A92;
+	m_A93 += m_A81 * f22_24;
+	m_A94 += m_A82 * f22_24;
+	RHS24 += f22_24 * RHS22;
+	const double f23 = 1.0 / m_A88;
+	const double f23_24 = -f23 * m_A93;
+	RHS24 += f23_24 * RHS23;
+	V[24] = RHS24 / m_A94;
+	double tmp23 = 0.0;
+	V[23] = (RHS23 - tmp23) / m_A88;
+	double tmp22 = 0.0;
+	tmp22 += m_A81 * V[23];
+	tmp22 += m_A82 * V[24];
+	V[22] = (RHS22 - tmp22) / m_A80;
+	double tmp21 = 0.0;
+	tmp21 += m_A74 * V[23];
+	V[21] = (RHS21 - tmp21) / m_A73;
+	double tmp20 = 0.0;
+	tmp20 += m_A67 * V[21];
+	tmp20 += m_A68 * V[23];
+	V[20] = (RHS20 - tmp20) / m_A66;
+	double tmp19 = 0.0;
+	tmp19 += m_A60 * V[22];
+	tmp19 += m_A61 * V[23];
+	tmp19 += m_A62 * V[24];
+	V[19] = (RHS19 - tmp19) / m_A59;
+	double tmp18 = 0.0;
+	tmp18 += m_A53 * V[19];
+	tmp18 += m_A54 * V[22];
+	tmp18 += m_A55 * V[23];
+	tmp18 += m_A56 * V[24];
+	V[18] = (RHS18 - tmp18) / m_A52;
+	double tmp17 = 0.0;
+	tmp17 += m_A46 * V[23];
+	V[17] = (RHS17 - tmp17) / m_A45;
+	double tmp16 = 0.0;
+	tmp16 += m_A43 * V[18];
+	V[16] = (RHS16 - tmp16) / m_A42;
+	double tmp15 = 0.0;
+	tmp15 += m_A40 * V[21];
+	V[15] = (RHS15 - tmp15) / m_A39;
+	double tmp14 = 0.0;
+	V[14] = (RHS14 - tmp14) / m_A37;
+	double tmp13 = 0.0;
+	tmp13 += m_A30 * V[18];
+	tmp13 += m_A31 * V[22];
+	V[13] = (RHS13 - tmp13) / m_A29;
+	double tmp12 = 0.0;
+	tmp12 += m_A26 * V[18];
+	tmp12 += m_A27 * V[19];
+	tmp12 += m_A28 * V[24];
+	V[12] = (RHS12 - tmp12) / m_A25;
+	double tmp11 = 0.0;
+	tmp11 += m_A24 * V[14];
+	V[11] = (RHS11 - tmp11) / m_A23;
+	double tmp10 = 0.0;
+	tmp10 += m_A21 * V[20];
+	tmp10 += m_A22 * V[23];
+	V[10] = (RHS10 - tmp10) / m_A20;
+	double tmp9 = 0.0;
+	tmp9 += m_A19 * V[14];
+	V[9] = (RHS9 - tmp9) / m_A18;
+	double tmp8 = 0.0;
+	tmp8 += m_A17 * V[23];
+	V[8] = (RHS8 - tmp8) / m_A16;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[14];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[14];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[17];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[14];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[16];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[18];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[15];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[21];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// zac1b11142
+static void nl_gcr_287a160e7c36b5b0_96_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 -= go[3] * *cnV[3];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A5 += go[9];
+	double RHS2 = Idr[9];
+	RHS2 += Idr[10];
+	RHS2 -= go[10] * *cnV[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A6 += gt[16];
+	m_A6 += gt[17];
+	m_A7 += go[11];
+	double RHS3 = Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
+	RHS3 -= go[16] * *cnV[16];
+	RHS3 -= go[17] * *cnV[17];
+	m_A8 += gt[18];
+	m_A8 += gt[19];
+	m_A8 += gt[20];
+	m_A8 += gt[21];
+	m_A8 += gt[22];
+	m_A8 += gt[23];
+	m_A8 += gt[24];
+	m_A9 += go[18];
+	double RHS4 = Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	RHS4 -= go[22] * *cnV[22];
+	RHS4 -= go[23] * *cnV[23];
+	RHS4 -= go[24] * *cnV[24];
+	m_A10 += gt[25];
+	m_A10 += gt[26];
+	m_A10 += gt[27];
+	m_A10 += gt[28];
+	m_A10 += gt[29];
+	m_A11 += go[25];
+	m_A12 += go[26];
+	double RHS5 = Idr[25];
+	RHS5 += Idr[26];
+	RHS5 += Idr[27];
+	RHS5 += Idr[28];
+	RHS5 += Idr[29];
+	RHS5 -= go[27] * *cnV[27];
+	RHS5 -= go[28] * *cnV[28];
+	RHS5 -= go[29] * *cnV[29];
+	m_A13 += gt[30];
+	m_A13 += gt[31];
+	m_A13 += gt[32];
+	m_A14 += go[30];
+	double RHS6 = Idr[30];
+	RHS6 += Idr[31];
+	RHS6 += Idr[32];
+	RHS6 -= go[31] * *cnV[31];
+	RHS6 -= go[32] * *cnV[32];
+	m_A15 += gt[33];
+	m_A15 += gt[34];
+	m_A16 += go[33];
+	double RHS7 = Idr[33];
+	RHS7 += Idr[34];
+	RHS7 -= go[34] * *cnV[34];
+	m_A17 += gt[35];
+	m_A17 += gt[36];
+	m_A17 += gt[37];
+	m_A18 += go[35];
+	double RHS8 = Idr[35];
+	RHS8 += Idr[36];
+	RHS8 += Idr[37];
+	RHS8 -= go[36] * *cnV[36];
+	RHS8 -= go[37] * *cnV[37];
+	m_A20 += gt[38];
+	m_A20 += gt[39];
+	m_A19 += go[38];
+	double RHS9 = Idr[38];
+	RHS9 += Idr[39];
+	RHS9 -= go[39] * *cnV[39];
+	m_A21 += gt[40];
+	m_A21 += gt[41];
+	m_A21 += gt[42];
+	m_A22 += go[40];
+	double RHS10 = Idr[40];
+	RHS10 += Idr[41];
+	RHS10 += Idr[42];
+	RHS10 -= go[41] * *cnV[41];
+	RHS10 -= go[42] * *cnV[42];
+	m_A23 += gt[43];
+	m_A23 += gt[44];
+	m_A23 += gt[45];
+	m_A24 += go[43];
+	m_A25 += go[44];
+	double RHS11 = Idr[43];
+	RHS11 += Idr[44];
+	RHS11 += Idr[45];
+	RHS11 -= go[45] * *cnV[45];
+	m_A26 += gt[46];
+	m_A26 += gt[47];
+	m_A26 += gt[48];
+	m_A27 += go[46];
+	double RHS12 = Idr[46];
+	RHS12 += Idr[47];
+	RHS12 += Idr[48];
+	RHS12 -= go[47] * *cnV[47];
+	RHS12 -= go[48] * *cnV[48];
+	m_A29 += gt[49];
+	m_A29 += gt[50];
+	m_A28 += go[49];
+	double RHS13 = Idr[49];
+	RHS13 += Idr[50];
+	RHS13 -= go[50] * *cnV[50];
+	m_A31 += gt[51];
+	m_A31 += gt[52];
+	m_A31 += gt[53];
+	m_A31 += gt[54];
+	m_A31 += gt[55];
+	m_A30 += go[51];
+	m_A33 += go[52];
+	double RHS14 = Idr[51];
+	RHS14 += Idr[52];
+	RHS14 += Idr[53];
+	RHS14 += Idr[54];
+	RHS14 += Idr[55];
+	RHS14 -= go[53] * *cnV[53];
+	RHS14 -= go[54] * *cnV[54];
+	RHS14 -= go[55] * *cnV[55];
+	m_A35 += gt[56];
+	m_A35 += gt[57];
+	m_A35 += gt[58];
+	m_A37 += go[56];
+	m_A34 += go[57];
+	double RHS15 = Idr[56];
+	RHS15 += Idr[57];
+	RHS15 += Idr[58];
+	RHS15 -= go[58] * *cnV[58];
+	m_A39 += gt[59];
+	m_A39 += gt[60];
+	m_A39 += gt[61];
+	m_A39 += gt[62];
+	m_A39 += gt[63];
+	m_A38 += go[59];
+	m_A41 += go[60];
+	double RHS16 = Idr[59];
+	RHS16 += Idr[60];
+	RHS16 += Idr[61];
+	RHS16 += Idr[62];
+	RHS16 += Idr[63];
+	RHS16 -= go[61] * *cnV[61];
+	RHS16 -= go[62] * *cnV[62];
+	RHS16 -= go[63] * *cnV[63];
+	m_A44 += gt[64];
+	m_A44 += gt[65];
+	m_A43 += go[64];
+	m_A42 += go[65];
+	double RHS17 = Idr[64];
+	RHS17 += Idr[65];
+	m_A47 += gt[66];
+	m_A47 += gt[67];
+	m_A47 += gt[68];
+	m_A48 += go[66];
+	m_A45 += go[67];
+	double RHS18 = Idr[66];
+	RHS18 += Idr[67];
+	RHS18 += Idr[68];
+	RHS18 -= go[68] * *cnV[68];
+	m_A51 += gt[69];
+	m_A51 += gt[70];
+	m_A51 += gt[71];
+	m_A51 += gt[72];
+	m_A52 += go[69];
+	m_A50 += go[70];
+	double RHS19 = Idr[69];
+	RHS19 += Idr[70];
+	RHS19 += Idr[71];
+	RHS19 += Idr[72];
+	RHS19 -= go[71] * *cnV[71];
+	RHS19 -= go[72] * *cnV[72];
+	m_A54 += gt[73];
+	m_A54 += gt[74];
+	m_A56 += go[73];
+	m_A53 += go[74];
+	double RHS20 = Idr[73];
+	RHS20 += Idr[74];
+	m_A58 += gt[75];
+	m_A58 += gt[76];
+	m_A58 += gt[77];
+	m_A58 += gt[78];
+	m_A59 += go[75];
+	m_A57 += go[76];
+	double RHS21 = Idr[75];
+	RHS21 += Idr[76];
+	RHS21 += Idr[77];
+	RHS21 += Idr[78];
+	RHS21 -= go[77] * *cnV[77];
+	RHS21 -= go[78] * *cnV[78];
+	m_A64 += gt[79];
+	m_A64 += gt[80];
+	m_A64 += gt[81];
+	m_A64 += gt[82];
+	m_A64 += gt[83];
+	m_A64 += gt[84];
+	m_A60 += go[79];
+	m_A61 += go[80];
+	m_A66 += go[81];
+	m_A66 += go[82];
+	double RHS22 = Idr[79];
+	RHS22 += Idr[80];
+	RHS22 += Idr[81];
+	RHS22 += Idr[82];
+	RHS22 += Idr[83];
+	RHS22 += Idr[84];
+	RHS22 -= go[83] * *cnV[83];
+	RHS22 -= go[84] * *cnV[84];
+	m_A73 += gt[85];
+	m_A73 += gt[86];
+	m_A73 += gt[87];
+	m_A73 += gt[88];
+	m_A73 += gt[89];
+	m_A69 += go[85];
+	m_A70 += go[86];
+	m_A71 += go[87];
+	m_A68 += go[88];
+	m_A67 += go[89];
+	double RHS23 = Idr[85];
+	RHS23 += Idr[86];
+	RHS23 += Idr[87];
+	RHS23 += Idr[88];
+	RHS23 += Idr[89];
+	m_A76 += gt[90];
+	m_A76 += gt[91];
+	m_A76 += gt[92];
+	m_A76 += gt[93];
+	m_A77 += go[90];
+	m_A75 += go[91];
+	double RHS24 = Idr[90];
+	RHS24 += Idr[91];
+	RHS24 += Idr[92];
+	RHS24 += Idr[93];
+	RHS24 -= go[92] * *cnV[92];
+	RHS24 -= go[93] * *cnV[93];
+	m_A85 += gt[94];
+	m_A85 += gt[95];
+	m_A85 += gt[96];
+	m_A85 += gt[97];
+	m_A85 += gt[98];
+	m_A81 += go[94];
+	m_A80 += go[95];
+	m_A82 += go[96];
+	m_A79 += go[97];
+	m_A78 += go[98];
+	double RHS25 = Idr[94];
+	RHS25 += Idr[95];
+	RHS25 += Idr[96];
+	RHS25 += Idr[97];
+	RHS25 += Idr[98];
+	m_A95 += gt[99];
+	m_A95 += gt[100];
+	m_A95 += gt[101];
+	m_A95 += gt[102];
+	m_A95 += gt[103];
+	m_A95 += gt[104];
+	m_A95 += gt[105];
+	m_A95 += gt[106];
+	m_A89 += go[99];
+	m_A92 += go[100];
+	m_A92 += go[101];
+	m_A90 += go[102];
+	m_A88 += go[103];
+	m_A87 += go[104];
+	double RHS26 = Idr[99];
+	RHS26 += Idr[100];
+	RHS26 += Idr[101];
+	RHS26 += Idr[102];
+	RHS26 += Idr[103];
+	RHS26 += Idr[104];
+	RHS26 += Idr[105];
+	RHS26 += Idr[106];
+	RHS26 -= go[105] * *cnV[105];
+	RHS26 -= go[106] * *cnV[106];
+	const double f0 = 1.0 / m_A0;
+	const double f0_9 = -f0 * m_A19;
+	m_A20 += m_A1 * f0_9;
+	RHS9 += f0_9 * RHS0;
+	const double f0_23 = -f0 * m_A67;
+	m_A69 += m_A1 * f0_23;
+	RHS23 += f0_23 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_16 = -f1 * m_A38;
+	m_A40 += m_A3 * f1_16;
+	RHS16 += f1_16 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_13 = -f2 * m_A28;
+	m_A29 += m_A5 * f2_13;
+	RHS13 += f2_13 * RHS2;
+	const double f2_26 = -f2 * m_A87;
+	m_A89 += m_A5 * f2_26;
+	RHS26 += f2_26 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_22 = -f3 * m_A60;
+	m_A63 += m_A7 * f3_22;
+	RHS22 += f3_22 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_14 = -f4 * m_A30;
+	m_A32 += m_A9 * f4_14;
+	RHS14 += f4_14 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_15 = -f5 * m_A34;
+	m_A35 += m_A11 * f5_15;
+	m_A36 += m_A12 * f5_15;
+	RHS15 += f5_15 * RHS5;
+	const double f5_18 = -f5 * m_A45;
+	m_A46 += m_A11 * f5_18;
+	m_A47 += m_A12 * f5_18;
+	RHS18 += f5_18 * RHS5;
+	const double f6 = 1.0 / m_A13;
+	const double f6_19 = -f6 * m_A50;
+	m_A52 += m_A14 * f6_19;
+	RHS19 += f6_19 * RHS6;
+	const double f6_23 = -f6 * m_A68;
+	m_A73 += m_A14 * f6_23;
+	RHS23 += f6_23 * RHS6;
+	const double f7 = 1.0 / m_A15;
+	const double f7_17 = -f7 * m_A42;
+	m_A44 += m_A16 * f7_17;
+	RHS17 += f7_17 * RHS7;
+	const double f7_25 = -f7 * m_A78;
+	m_A81 += m_A16 * f7_25;
+	RHS25 += f7_25 * RHS7;
+	const double f8 = 1.0 / m_A17;
+	const double f8_17 = -f8 * m_A43;
+	m_A44 += m_A18 * f8_17;
+	RHS17 += f8_17 * RHS8;
+	const double f9 = 1.0 / m_A20;
+	const double f9_23 = -f9 * m_A69;
+	RHS23 += f9_23 * RHS9;
+	const double f10 = 1.0 / m_A21;
+	const double f10_21 = -f10 * m_A57;
+	m_A59 += m_A22 * f10_21;
+	RHS21 += f10_21 * RHS10;
+	const double f10_26 = -f10 * m_A88;
+	m_A95 += m_A22 * f10_26;
+	RHS26 += f10_26 * RHS10;
+	const double f11 = 1.0 / m_A23;
+	const double f11_20 = -f11 * m_A53;
+	m_A54 += m_A24 * f11_20;
+	m_A55 += m_A25 * f11_20;
+	RHS20 += f11_20 * RHS11;
+	const double f11_22 = -f11 * m_A61;
+	m_A62 += m_A24 * f11_22;
+	m_A64 += m_A25 * f11_22;
+	RHS22 += f11_22 * RHS11;
+	const double f12 = 1.0 / m_A26;
+	const double f12_24 = -f12 * m_A75;
+	m_A77 += m_A27 * f12_24;
+	RHS24 += f12_24 * RHS12;
+	const double f12_25 = -f12 * m_A79;
+	m_A85 += m_A27 * f12_25;
+	RHS25 += f12_25 * RHS12;
+	const double f13 = 1.0 / m_A29;
+	const double f13_26 = -f13 * m_A89;
+	RHS26 += f13_26 * RHS13;
+	const double f14 = 1.0 / m_A31;
+	const double f14_25 = -f14 * m_A80;
+	m_A84 += m_A32 * f14_25;
+	m_A85 += m_A33 * f14_25;
+	RHS25 += f14_25 * RHS14;
+	const double f15 = 1.0 / m_A35;
+	const double f15_18 = -f15 * m_A46;
+	m_A47 += m_A36 * f15_18;
+	m_A49 += m_A37 * f15_18;
+	RHS18 += f15_18 * RHS15;
+	const double f15_26 = -f15 * m_A90;
+	m_A91 += m_A36 * f15_26;
+	m_A95 += m_A37 * f15_26;
+	RHS26 += f15_26 * RHS15;
+	const double f16 = 1.0 / m_A39;
+	const double f16_23 = -f16 * m_A70;
+	m_A72 += m_A40 * f16_23;
+	m_A73 += m_A41 * f16_23;
+	RHS23 += f16_23 * RHS16;
+	const double f17 = 1.0 / m_A44;
+	const double f17_25 = -f17 * m_A81;
+	RHS25 += f17_25 * RHS17;
+	const double f18 = 1.0 / m_A47;
+	const double f18_23 = -f18 * m_A71;
+	m_A73 += m_A48 * f18_23;
+	m_A74 += m_A49 * f18_23;
+	RHS23 += f18_23 * RHS18;
+	const double f18_26 = -f18 * m_A91;
+	m_A93 += m_A48 * f18_26;
+	m_A95 += m_A49 * f18_26;
+	RHS26 += f18_26 * RHS18;
+	const double f19 = 1.0 / m_A51;
+	const double f19_23 = -f19 * m_A72;
+	m_A73 += m_A52 * f19_23;
+	RHS23 += f19_23 * RHS19;
+	const double f20 = 1.0 / m_A54;
+	const double f20_22 = -f20 * m_A62;
+	m_A64 += m_A55 * f20_22;
+	m_A65 += m_A56 * f20_22;
+	RHS22 += f20_22 * RHS20;
+	const double f20_25 = -f20 * m_A82;
+	m_A83 += m_A55 * f20_25;
+	m_A85 += m_A56 * f20_25;
+	RHS25 += f20_25 * RHS20;
+	const double f21 = 1.0 / m_A58;
+	const double f21_22 = -f21 * m_A63;
+	m_A66 += m_A59 * f21_22;
+	RHS22 += f21_22 * RHS21;
+	const double f22 = 1.0 / m_A64;
+	const double f22_25 = -f22 * m_A83;
+	m_A85 += m_A65 * f22_25;
+	m_A86 += m_A66 * f22_25;
+	RHS25 += f22_25 * RHS22;
+	const double f22_26 = -f22 * m_A92;
+	m_A94 += m_A65 * f22_26;
+	m_A95 += m_A66 * f22_26;
+	RHS26 += f22_26 * RHS22;
+	const double f23 = 1.0 / m_A73;
+	const double f23_26 = -f23 * m_A93;
+	m_A95 += m_A74 * f23_26;
+	RHS26 += f23_26 * RHS23;
+	const double f24 = 1.0 / m_A76;
+	const double f24_25 = -f24 * m_A84;
+	m_A85 += m_A77 * f24_25;
+	RHS25 += f24_25 * RHS24;
+	const double f25 = 1.0 / m_A85;
+	const double f25_26 = -f25 * m_A94;
+	m_A95 += m_A86 * f25_26;
+	RHS26 += f25_26 * RHS25;
+	V[26] = RHS26 / m_A95;
+	double tmp25 = 0.0;
+	tmp25 += m_A86 * V[26];
+	V[25] = (RHS25 - tmp25) / m_A85;
+	double tmp24 = 0.0;
+	tmp24 += m_A77 * V[25];
+	V[24] = (RHS24 - tmp24) / m_A76;
+	double tmp23 = 0.0;
+	tmp23 += m_A74 * V[26];
+	V[23] = (RHS23 - tmp23) / m_A73;
+	double tmp22 = 0.0;
+	tmp22 += m_A65 * V[25];
+	tmp22 += m_A66 * V[26];
+	V[22] = (RHS22 - tmp22) / m_A64;
+	double tmp21 = 0.0;
+	tmp21 += m_A59 * V[26];
+	V[21] = (RHS21 - tmp21) / m_A58;
+	double tmp20 = 0.0;
+	tmp20 += m_A55 * V[22];
+	tmp20 += m_A56 * V[25];
+	V[20] = (RHS20 - tmp20) / m_A54;
+	double tmp19 = 0.0;
+	tmp19 += m_A52 * V[23];
+	V[19] = (RHS19 - tmp19) / m_A51;
+	double tmp18 = 0.0;
+	tmp18 += m_A48 * V[23];
+	tmp18 += m_A49 * V[26];
+	V[18] = (RHS18 - tmp18) / m_A47;
+	double tmp17 = 0.0;
+	V[17] = (RHS17 - tmp17) / m_A44;
+	double tmp16 = 0.0;
+	tmp16 += m_A40 * V[19];
+	tmp16 += m_A41 * V[23];
+	V[16] = (RHS16 - tmp16) / m_A39;
+	double tmp15 = 0.0;
+	tmp15 += m_A36 * V[18];
+	tmp15 += m_A37 * V[26];
+	V[15] = (RHS15 - tmp15) / m_A35;
+	double tmp14 = 0.0;
+	tmp14 += m_A32 * V[24];
+	tmp14 += m_A33 * V[25];
+	V[14] = (RHS14 - tmp14) / m_A31;
+	double tmp13 = 0.0;
+	V[13] = (RHS13 - tmp13) / m_A29;
+	double tmp12 = 0.0;
+	tmp12 += m_A27 * V[25];
+	V[12] = (RHS12 - tmp12) / m_A26;
+	double tmp11 = 0.0;
+	tmp11 += m_A24 * V[20];
+	tmp11 += m_A25 * V[22];
+	V[11] = (RHS11 - tmp11) / m_A23;
+	double tmp10 = 0.0;
+	tmp10 += m_A22 * V[26];
+	V[10] = (RHS10 - tmp10) / m_A21;
+	double tmp9 = 0.0;
+	V[9] = (RHS9 - tmp9) / m_A20;
+	double tmp8 = 0.0;
+	tmp8 += m_A18 * V[17];
+	V[8] = (RHS8 - tmp8) / m_A17;
+	double tmp7 = 0.0;
+	tmp7 += m_A16 * V[17];
+	V[7] = (RHS7 - tmp7) / m_A15;
+	double tmp6 = 0.0;
+	tmp6 += m_A14 * V[23];
+	V[6] = (RHS6 - tmp6) / m_A13;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[15];
+	tmp5 += m_A12 * V[18];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[24];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[21];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[13];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[19];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[9];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// elim
+static void nl_gcr_28b736fe552777a9_45_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[9];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A9 += go[12];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 -= go[13] * *cnV[13];
+	RHS4 -= go[14] * *cnV[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A11 += go[15];
+	double RHS5 = Idr[15];
+	RHS5 += Idr[16];
+	RHS5 -= go[16] * *cnV[16];
+	m_A12 += gt[17];
+	m_A12 += gt[18];
+	m_A13 += go[17];
+	double RHS6 = Idr[17];
+	RHS6 += Idr[18];
+	RHS6 -= go[18] * *cnV[18];
+	m_A14 += gt[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A15 += go[19];
+	double RHS7 = Idr[19];
+	RHS7 += Idr[20];
+	RHS7 += Idr[21];
+	RHS7 -= go[20] * *cnV[20];
+	RHS7 -= go[21] * *cnV[21];
+	m_A16 += gt[22];
+	m_A16 += gt[23];
+	m_A16 += gt[24];
+	m_A17 += go[22];
+	double RHS8 = Idr[22];
+	RHS8 += Idr[23];
+	RHS8 += Idr[24];
+	RHS8 -= go[23] * *cnV[23];
+	RHS8 -= go[24] * *cnV[24];
+	m_A18 += gt[25];
+	m_A18 += gt[26];
+	m_A18 += gt[27];
+	m_A19 += go[25];
+	double RHS9 = Idr[25];
+	RHS9 += Idr[26];
+	RHS9 += Idr[27];
+	RHS9 -= go[26] * *cnV[26];
+	RHS9 -= go[27] * *cnV[27];
+	m_A20 += gt[28];
+	m_A20 += gt[29];
+	m_A22 += go[28];
+	m_A21 += go[29];
+	double RHS10 = Idr[28];
+	RHS10 += Idr[29];
+	m_A32 += gt[30];
+	m_A32 += gt[31];
+	m_A32 += gt[32];
+	m_A32 += gt[33];
+	m_A32 += gt[34];
+	m_A32 += gt[35];
+	m_A32 += gt[36];
+	m_A32 += gt[37];
+	m_A32 += gt[38];
+	m_A31 += go[30];
+	m_A30 += go[31];
+	m_A29 += go[32];
+	m_A28 += go[33];
+	m_A27 += go[34];
+	m_A26 += go[35];
+	m_A25 += go[36];
+	m_A24 += go[37];
+	m_A23 += go[38];
+	double RHS11 = Idr[30];
+	RHS11 += Idr[31];
+	RHS11 += Idr[32];
+	RHS11 += Idr[33];
+	RHS11 += Idr[34];
+	RHS11 += Idr[35];
+	RHS11 += Idr[36];
+	RHS11 += Idr[37];
+	RHS11 += Idr[38];
+	m_A34 += gt[39];
+	m_A34 += gt[40];
+	m_A35 += go[39];
+	double RHS12 = Idr[39];
+	RHS12 += Idr[40];
+	RHS12 -= go[40] * *cnV[40];
+	m_A36 += gt[41];
+	m_A36 += gt[42];
+	m_A37 += go[41];
+	double RHS13 = Idr[41];
+	RHS13 += Idr[42];
+	RHS13 -= go[42] * *cnV[42];
+	m_A44 += gt[43];
+	m_A44 += gt[44];
+	m_A44 += gt[45];
+	m_A44 += gt[46];
+	m_A44 += gt[47];
+	m_A43 += go[43];
+	m_A42 += go[44];
+	m_A39 += go[45];
+	m_A38 += go[46];
+	m_A40 += go[47];
+	double RHS14 = Idr[43];
+	RHS14 += Idr[44];
+	RHS14 += Idr[45];
+	RHS14 += Idr[46];
+	RHS14 += Idr[47];
+	const double f0 = 1.0 / m_A0;
+	const double f0_11 = -f0 * m_A23;
+	m_A32 += m_A1 * f0_11;
+	RHS11 += f0_11 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_11 = -f1 * m_A24;
+	m_A32 += m_A3 * f1_11;
+	RHS11 += f1_11 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_11 = -f2 * m_A25;
+	m_A32 += m_A5 * f2_11;
+	RHS11 += f2_11 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_11 = -f3 * m_A26;
+	m_A32 += m_A7 * f3_11;
+	RHS11 += f3_11 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_11 = -f4 * m_A27;
+	m_A32 += m_A9 * f4_11;
+	RHS11 += f4_11 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_14 = -f5 * m_A38;
+	m_A44 += m_A11 * f5_14;
+	RHS14 += f5_14 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_14 = -f6 * m_A39;
+	m_A44 += m_A13 * f6_14;
+	RHS14 += f6_14 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_11 = -f7 * m_A28;
+	m_A32 += m_A15 * f7_11;
+	RHS11 += f7_11 * RHS7;
+	const double f8 = 1.0 / m_A16;
+	const double f8_11 = -f8 * m_A29;
+	m_A32 += m_A17 * f8_11;
+	RHS11 += f8_11 * RHS8;
+	const double f9 = 1.0 / m_A18;
+	const double f9_11 = -f9 * m_A30;
+	m_A32 += m_A19 * f9_11;
+	RHS11 += f9_11 * RHS9;
+	const double f10 = 1.0 / m_A20;
+	const double f10_11 = -f10 * m_A31;
+	m_A32 += m_A21 * f10_11;
+	m_A33 += m_A22 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	const double f10_14 = -f10 * m_A40;
+	m_A41 += m_A21 * f10_14;
+	m_A44 += m_A22 * f10_14;
+	RHS14 += f10_14 * RHS10;
+	const double f11 = 1.0 / m_A32;
+	const double f11_14 = -f11 * m_A41;
+	m_A44 += m_A33 * f11_14;
+	RHS14 += f11_14 * RHS11;
+	const double f12 = 1.0 / m_A34;
+	const double f12_14 = -f12 * m_A42;
+	m_A44 += m_A35 * f12_14;
+	RHS14 += f12_14 * RHS12;
+	const double f13 = 1.0 / m_A36;
+	const double f13_14 = -f13 * m_A43;
+	m_A44 += m_A37 * f13_14;
+	RHS14 += f13_14 * RHS13;
+	V[14] = RHS14 / m_A44;
+	double tmp13 = 0.0;
+	tmp13 += m_A37 * V[14];
+	V[13] = (RHS13 - tmp13) / m_A36;
+	double tmp12 = 0.0;
+	tmp12 += m_A35 * V[14];
+	V[12] = (RHS12 - tmp12) / m_A34;
+	double tmp11 = 0.0;
+	tmp11 += m_A33 * V[14];
+	V[11] = (RHS11 - tmp11) / m_A32;
+	double tmp10 = 0.0;
+	tmp10 += m_A21 * V[11];
+	tmp10 += m_A22 * V[14];
+	V[10] = (RHS10 - tmp10) / m_A20;
+	double tmp9 = 0.0;
+	tmp9 += m_A19 * V[11];
+	V[9] = (RHS9 - tmp9) / m_A18;
+	double tmp8 = 0.0;
+	tmp8 += m_A17 * V[11];
+	V[8] = (RHS8 - tmp8) / m_A16;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[11];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[14];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[14];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[11];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[11];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[11];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[11];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[11];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// kidniki
+static void nl_gcr_294dde1e0ecca6d0_37_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A2 += go[0];
+	m_A2 += go[1];
+	m_A1 += go[2];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[3] * *cnV[3];
+	m_A3 += gt[4];
+	m_A3 += gt[5];
+	m_A3 += gt[6];
+	m_A5 += go[4];
+	m_A4 += go[5];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A7 += go[7];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
+	m_A8 += gt[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A11 += go[11];
+	m_A9 += go[12];
+	m_A10 += go[13];
+	double RHS3 = Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[14] * *cnV[14];
+	m_A14 += gt[15];
+	m_A14 += gt[16];
+	m_A14 += gt[17];
+	m_A14 += gt[18];
+	m_A14 += gt[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A13 += go[15];
+	m_A16 += go[16];
+	m_A16 += go[17];
+	m_A16 += go[18];
+	m_A12 += go[19];
+	double RHS4 = Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	m_A20 += gt[22];
+	m_A20 += gt[23];
+	m_A20 += gt[24];
+	m_A17 += go[22];
+	m_A18 += go[23];
+	double RHS5 = Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 -= go[24] * *cnV[24];
+	m_A24 += gt[25];
+	m_A24 += gt[26];
+	m_A24 += gt[27];
+	m_A25 += go[25];
+	m_A23 += go[26];
+	double RHS6 = Idr[25];
+	RHS6 += Idr[26];
+	RHS6 += Idr[27];
+	RHS6 -= go[27] * *cnV[27];
+	m_A30 += gt[28];
+	m_A30 += gt[29];
+	m_A30 += gt[30];
+	m_A30 += gt[31];
+	m_A30 += gt[32];
+	m_A30 += gt[33];
+	m_A27 += go[28];
+	m_A28 += go[29];
+	m_A28 += go[30];
+	m_A28 += go[31];
+	m_A26 += go[32];
+	m_A26 += go[33];
+	double RHS7 = Idr[28];
+	RHS7 += Idr[29];
+	RHS7 += Idr[30];
+	RHS7 += Idr[31];
+	RHS7 += Idr[32];
+	RHS7 += Idr[33];
+	m_A36 += gt[34];
+	m_A36 += gt[35];
+	m_A34 += go[34];
+	m_A32 += go[35];
+	double RHS8 = Idr[34];
+	RHS8 += Idr[35];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A12;
+	m_A14 += m_A1 * f0_4;
+	m_A16 += m_A2 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f0_7 = -f0 * m_A26;
+	m_A28 += m_A1 * f0_7;
+	m_A30 += m_A2 * f0_7;
+	RHS7 += f0_7 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_4 = -f1 * m_A13;
+	m_A14 += m_A4 * f1_4;
+	m_A15 += m_A5 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f1_5 = -f1 * m_A17;
+	m_A19 += m_A4 * f1_5;
+	m_A20 += m_A5 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_6 = -f2 * m_A23;
+	m_A24 += m_A7 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_5 = -f3 * m_A18;
+	m_A20 += m_A9 * f3_5;
+	m_A21 += m_A10 * f3_5;
+	m_A22 += m_A11 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f3_7 = -f3 * m_A27;
+	m_A29 += m_A9 * f3_7;
+	m_A30 += m_A10 * f3_7;
+	m_A31 += m_A11 * f3_7;
+	RHS7 += f3_7 * RHS3;
+	const double f3_8 = -f3 * m_A32;
+	m_A33 += m_A9 * f3_8;
+	m_A35 += m_A10 * f3_8;
+	m_A36 += m_A11 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f4 = 1.0 / m_A14;
+	const double f4_5 = -f4 * m_A19;
+	m_A20 += m_A15 * f4_5;
+	m_A21 += m_A16 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	const double f4_7 = -f4 * m_A28;
+	m_A29 += m_A15 * f4_7;
+	m_A30 += m_A16 * f4_7;
+	RHS7 += f4_7 * RHS4;
+	const double f5 = 1.0 / m_A20;
+	const double f5_7 = -f5 * m_A29;
+	m_A30 += m_A21 * f5_7;
+	m_A31 += m_A22 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f5_8 = -f5 * m_A33;
+	m_A35 += m_A21 * f5_8;
+	m_A36 += m_A22 * f5_8;
+	RHS8 += f5_8 * RHS5;
+	const double f6 = 1.0 / m_A24;
+	const double f6_8 = -f6 * m_A34;
+	m_A36 += m_A25 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f7 = 1.0 / m_A30;
+	const double f7_8 = -f7 * m_A35;
+	m_A36 += m_A31 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	V[8] = RHS8 / m_A36;
+	double tmp7 = 0.0;
+	tmp7 += m_A31 * V[8];
+	V[7] = (RHS7 - tmp7) / m_A30;
+	double tmp6 = 0.0;
+	tmp6 += m_A25 * V[8];
+	V[6] = (RHS6 - tmp6) / m_A24;
+	double tmp5 = 0.0;
+	tmp5 += m_A21 * V[7];
+	tmp5 += m_A22 * V[8];
+	V[5] = (RHS5 - tmp5) / m_A20;
+	double tmp4 = 0.0;
+	tmp4 += m_A15 * V[5];
+	tmp4 += m_A16 * V[7];
+	V[4] = (RHS4 - tmp4) / m_A14;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[5];
+	tmp3 += m_A10 * V[7];
+	tmp3 += m_A11 * V[8];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A4 * V[4];
+	tmp1 += m_A5 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A3;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	tmp0 += m_A2 * V[7];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// ripoff
+static void nl_gcr_295cf2e2f3d489bf_12_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A4 += go[2];
+	m_A3 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A7 += go[6];
+	m_A7 += go[7];
+	m_A5 += go[8];
+	m_A5 += go[9];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 -= go[10] * *cnV[10];
+	m_A11 += gt[11];
+	m_A11 += gt[12];
+	m_A11 += gt[13];
+	m_A11 += gt[14];
+	m_A11 += gt[15];
+	m_A10 += go[11];
+	m_A10 += go[12];
+	m_A9 += go[13];
+	m_A8 += go[14];
+	double RHS3 = Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 -= go[15] * *cnV[15];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A11 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	m_A7 += m_A4 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_3 = -f2 * m_A10;
+	m_A11 += m_A7 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A11;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// spacfury
+static void nl_gcr_2a153513d3e8e2cc_53_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A4 += go[3];
+	m_A5 += go[4];
+	m_A3 += go[5];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A7 += go[7];
+	m_A8 += go[8];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	m_A9 += gt[14];
+	m_A9 += gt[15];
+	m_A9 += gt[16];
+	m_A11 += go[14];
+	m_A10 += go[15];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 -= go[16] * *cnV[16];
+	m_A12 += gt[17];
+	m_A12 += gt[18];
+	m_A12 += gt[19];
+	m_A14 += go[17];
+	m_A13 += go[18];
+	double RHS4 = Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 -= go[19] * *cnV[19];
+	m_A17 += gt[20];
+	m_A17 += gt[21];
+	m_A16 += go[20];
+	m_A15 += go[21];
+	double RHS5 = Idr[20];
+	RHS5 += Idr[21];
+	m_A22 += gt[22];
+	m_A22 += gt[23];
+	m_A22 += gt[24];
+	m_A22 += gt[25];
+	m_A22 += gt[26];
+	m_A23 += go[22];
+	m_A20 += go[23];
+	double RHS6 = Idr[22];
+	RHS6 += Idr[23];
+	RHS6 += Idr[24];
+	RHS6 += Idr[25];
+	RHS6 += Idr[26];
+	RHS6 -= go[24] * *cnV[24];
+	RHS6 -= go[25] * *cnV[25];
+	RHS6 -= go[26] * *cnV[26];
+	m_A27 += gt[27];
+	m_A27 += gt[28];
+	m_A27 += gt[29];
+	m_A27 += gt[30];
+	m_A27 += gt[31];
+	m_A24 += go[27];
+	m_A25 += go[28];
+	m_A29 += go[29];
+	double RHS7 = Idr[27];
+	RHS7 += Idr[28];
+	RHS7 += Idr[29];
+	RHS7 += Idr[30];
+	RHS7 += Idr[31];
+	RHS7 -= go[30] * *cnV[30];
+	RHS7 -= go[31] * *cnV[31];
+	m_A33 += gt[32];
+	m_A33 += gt[33];
+	m_A33 += gt[34];
+	m_A31 += go[32];
+	m_A35 += go[33];
+	m_A30 += go[34];
+	double RHS8 = Idr[32];
+	RHS8 += Idr[33];
+	RHS8 += Idr[34];
+	m_A38 += gt[35];
+	m_A38 += gt[36];
+	m_A38 += gt[37];
+	m_A38 += gt[38];
+	m_A38 += gt[39];
+	m_A38 += gt[40];
+	m_A38 += gt[41];
+	m_A36 += go[35];
+	m_A40 += go[36];
+	double RHS9 = Idr[35];
+	RHS9 += Idr[36];
+	RHS9 += Idr[37];
+	RHS9 += Idr[38];
+	RHS9 += Idr[39];
+	RHS9 += Idr[40];
+	RHS9 += Idr[41];
+	RHS9 -= go[37] * *cnV[37];
+	RHS9 -= go[38] * *cnV[38];
+	RHS9 -= go[39] * *cnV[39];
+	RHS9 -= go[40] * *cnV[40];
+	RHS9 -= go[41] * *cnV[41];
+	m_A46 += gt[42];
+	m_A46 += gt[43];
+	m_A46 += gt[44];
+	m_A44 += go[42];
+	m_A43 += go[43];
+	m_A41 += go[44];
+	double RHS10 = Idr[42];
+	RHS10 += Idr[43];
+	RHS10 += Idr[44];
+	m_A52 += gt[45];
+	m_A52 += gt[46];
+	m_A52 += gt[47];
+	m_A52 += gt[48];
+	m_A52 += gt[49];
+	m_A52 += gt[50];
+	m_A50 += go[45];
+	m_A48 += go[46];
+	m_A49 += go[47];
+	double RHS11 = Idr[45];
+	RHS11 += Idr[46];
+	RHS11 += Idr[47];
+	RHS11 += Idr[48];
+	RHS11 += Idr[49];
+	RHS11 += Idr[50];
+	RHS11 -= go[48] * *cnV[48];
+	RHS11 -= go[49] * *cnV[49];
+	RHS11 -= go[50] * *cnV[50];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A15;
+	m_A17 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A16;
+	m_A17 += m_A3 * f1_5;
+	m_A18 += m_A4 * f1_5;
+	m_A19 += m_A5 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f1_6 = -f1 * m_A20;
+	m_A21 += m_A3 * f1_6;
+	m_A22 += m_A4 * f1_6;
+	m_A23 += m_A5 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f1_10 = -f1 * m_A41;
+	m_A42 += m_A3 * f1_10;
+	m_A43 += m_A4 * f1_10;
+	m_A46 += m_A5 * f1_10;
+	RHS10 += f1_10 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_7 = -f2 * m_A24;
+	m_A26 += m_A7 * f2_7;
+	m_A29 += m_A8 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_7 = -f3 * m_A25;
+	m_A27 += m_A10 * f3_7;
+	m_A28 += m_A11 * f3_7;
+	RHS7 += f3_7 * RHS3;
+	const double f3_8 = -f3 * m_A30;
+	m_A32 += m_A10 * f3_8;
+	m_A33 += m_A11 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f4 = 1.0 / m_A12;
+	const double f4_8 = -f4 * m_A31;
+	m_A33 += m_A13 * f4_8;
+	m_A35 += m_A14 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f4_9 = -f4 * m_A36;
+	m_A37 += m_A13 * f4_9;
+	m_A40 += m_A14 * f4_9;
+	RHS9 += f4_9 * RHS4;
+	const double f4_11 = -f4 * m_A48;
+	m_A49 += m_A13 * f4_11;
+	m_A52 += m_A14 * f4_11;
+	RHS11 += f4_11 * RHS4;
+	const double f5 = 1.0 / m_A17;
+	const double f5_6 = -f5 * m_A21;
+	m_A22 += m_A18 * f5_6;
+	m_A23 += m_A19 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	const double f5_10 = -f5 * m_A42;
+	m_A43 += m_A18 * f5_10;
+	m_A46 += m_A19 * f5_10;
+	RHS10 += f5_10 * RHS5;
+	const double f6 = 1.0 / m_A22;
+	const double f6_7 = -f6 * m_A26;
+	m_A29 += m_A23 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	const double f6_10 = -f6 * m_A43;
+	m_A46 += m_A23 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f7 = 1.0 / m_A27;
+	const double f7_8 = -f7 * m_A32;
+	m_A33 += m_A28 * f7_8;
+	m_A34 += m_A29 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	const double f7_10 = -f7 * m_A44;
+	m_A45 += m_A28 * f7_10;
+	m_A46 += m_A29 * f7_10;
+	RHS10 += f7_10 * RHS7;
+	const double f8 = 1.0 / m_A33;
+	const double f8_9 = -f8 * m_A37;
+	m_A39 += m_A34 * f8_9;
+	m_A40 += m_A35 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	const double f8_10 = -f8 * m_A45;
+	m_A46 += m_A34 * f8_10;
+	m_A47 += m_A35 * f8_10;
+	RHS10 += f8_10 * RHS8;
+	const double f8_11 = -f8 * m_A49;
+	m_A51 += m_A34 * f8_11;
+	m_A52 += m_A35 * f8_11;
+	RHS11 += f8_11 * RHS8;
+	const double f9 = 1.0 / m_A38;
+	const double f9_11 = -f9 * m_A50;
+	m_A51 += m_A39 * f9_11;
+	m_A52 += m_A40 * f9_11;
+	RHS11 += f9_11 * RHS9;
+	const double f10 = 1.0 / m_A46;
+	const double f10_11 = -f10 * m_A51;
+	m_A52 += m_A47 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	V[11] = RHS11 / m_A52;
+	double tmp10 = 0.0;
+	tmp10 += m_A47 * V[11];
+	V[10] = (RHS10 - tmp10) / m_A46;
+	double tmp9 = 0.0;
+	tmp9 += m_A39 * V[10];
+	tmp9 += m_A40 * V[11];
+	V[9] = (RHS9 - tmp9) / m_A38;
+	double tmp8 = 0.0;
+	tmp8 += m_A34 * V[10];
+	tmp8 += m_A35 * V[11];
+	V[8] = (RHS8 - tmp8) / m_A33;
+	double tmp7 = 0.0;
+	tmp7 += m_A28 * V[8];
+	tmp7 += m_A29 * V[10];
+	V[7] = (RHS7 - tmp7) / m_A27;
+	double tmp6 = 0.0;
+	tmp6 += m_A23 * V[10];
+	V[6] = (RHS6 - tmp6) / m_A22;
+	double tmp5 = 0.0;
+	tmp5 += m_A18 * V[6];
+	tmp5 += m_A19 * V[10];
+	V[5] = (RHS5 - tmp5) / m_A17;
+	double tmp4 = 0.0;
+	tmp4 += m_A13 * V[8];
+	tmp4 += m_A14 * V[11];
+	V[4] = (RHS4 - tmp4) / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A10 * V[7];
+	tmp3 += m_A11 * V[8];
+	V[3] = (RHS3 - tmp3) / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[6];
+	tmp2 += m_A8 * V[10];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[5];
+	tmp1 += m_A4 * V[6];
+	tmp1 += m_A5 * V[10];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[5];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// boxingb
+static void nl_gcr_2f84bc98d737730b_22_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A3 += go[6];
+	double RHS1 = Idr[6];
+	RHS1 += Idr[7];
+	RHS1 -= go[7] * *cnV[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A4 += gt[12];
+	m_A4 += gt[13];
+	m_A4 += gt[14];
+	m_A4 += gt[15];
+	m_A7 += go[8];
+	m_A6 += go[9];
+	m_A6 += go[10];
+	m_A5 += go[11];
+	m_A5 += go[12];
+	double RHS2 = Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 += Idr[15];
+	RHS2 -= go[13] * *cnV[13];
+	RHS2 -= go[14] * *cnV[14];
+	RHS2 -= go[15] * *cnV[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A10 += gt[20];
+	m_A8 += go[16];
+	m_A9 += go[17];
+	m_A9 += go[18];
+	double RHS3 = Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 += Idr[20];
+	RHS3 -= go[19] * *cnV[19];
+	RHS3 -= go[20] * *cnV[20];
+	m_A15 += gt[21];
+	m_A15 += gt[22];
+	m_A15 += gt[23];
+	m_A15 += gt[24];
+	m_A15 += gt[25];
+	m_A16 += go[21];
+	m_A16 += go[22];
+	m_A13 += go[23];
+	m_A13 += go[24];
+	double RHS4 = Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 += Idr[25];
+	RHS4 -= go[25] * *cnV[25];
+	m_A21 += gt[26];
+	m_A21 += gt[27];
+	m_A21 += gt[28];
+	m_A21 += gt[29];
+	m_A21 += gt[30];
+	m_A20 += go[26];
+	m_A20 += go[27];
+	m_A18 += go[28];
+	m_A17 += go[29];
+	double RHS5 = Idr[26];
+	RHS5 += Idr[27];
+	RHS5 += Idr[28];
+	RHS5 += Idr[29];
+	RHS5 += Idr[30];
+	RHS5 -= go[30] * *cnV[30];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A10 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A17;
+	m_A21 += m_A3 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_3 = -f2 * m_A9;
+	m_A10 += m_A5 * f2_3;
+	m_A11 += m_A6 * f2_3;
+	m_A12 += m_A7 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	const double f2_4 = -f2 * m_A13;
+	m_A14 += m_A5 * f2_4;
+	m_A15 += m_A6 * f2_4;
+	m_A16 += m_A7 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_5 = -f2 * m_A18;
+	m_A19 += m_A5 * f2_5;
+	m_A20 += m_A6 * f2_5;
+	m_A21 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_4 = -f3 * m_A14;
+	m_A15 += m_A11 * f3_4;
+	m_A16 += m_A12 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f3_5 = -f3 * m_A19;
+	m_A20 += m_A11 * f3_5;
+	m_A21 += m_A12 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A15;
+	const double f4_5 = -f4 * m_A20;
+	m_A21 += m_A16 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A21;
+	double tmp4 = 0.0;
+	tmp4 += m_A16 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A15;
+	double tmp3 = 0.0;
+	tmp3 += m_A11 * V[4];
+	tmp3 += m_A12 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A10;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[3];
+	tmp2 += m_A6 * V[4];
+	tmp2 += m_A7 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// astrob
+static void nl_gcr_30fc51fe03b164cb_178_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
+	double m_A153(0.0);
+	double m_A154(0.0);
+	double m_A155(0.0);
+	double m_A156(0.0);
+	double m_A157(0.0);
+	double m_A158(0.0);
+	double m_A159(0.0);
+	double m_A160(0.0);
+	double m_A161(0.0);
+	double m_A162(0.0);
+	double m_A163(0.0);
+	double m_A164(0.0);
+	double m_A165(0.0);
+	double m_A166(0.0);
+	double m_A167(0.0);
+	double m_A168(0.0);
+	double m_A169(0.0);
+	double m_A170(0.0);
+	double m_A171(0.0);
+	double m_A172(0.0);
+	double m_A173(0.0);
+	double m_A174(0.0);
+	double m_A175(0.0);
+	double m_A176(0.0);
+	double m_A177(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A4 += go[7];
+	m_A3 += go[8];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[9] * *cnV[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A5 += gt[13];
+	m_A5 += gt[14];
+	m_A5 += gt[15];
+	m_A5 += gt[16];
+	m_A6 += go[10];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 += Idr[15];
+	RHS2 += Idr[16];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	RHS2 -= go[14] * *cnV[14];
+	RHS2 -= go[15] * *cnV[15];
+	RHS2 -= go[16] * *cnV[16];
+	m_A7 += gt[17];
+	m_A7 += gt[18];
+	m_A7 += gt[19];
+	m_A7 += gt[20];
+	m_A9 += go[17];
+	m_A10 += go[18];
+	m_A8 += go[19];
+	double RHS3 = Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 += Idr[20];
+	RHS3 -= go[20] * *cnV[20];
+	m_A11 += gt[21];
+	m_A11 += gt[22];
+	m_A11 += gt[23];
+	m_A11 += gt[24];
+	m_A12 += go[21];
+	m_A12 += go[22];
+	m_A13 += go[23];
+	double RHS4 = Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 -= go[24] * *cnV[24];
+	m_A14 += gt[25];
+	m_A14 += gt[26];
+	m_A15 += go[25];
+	m_A16 += go[26];
+	double RHS5 = Idr[25];
+	RHS5 += Idr[26];
+	m_A17 += gt[27];
+	m_A17 += gt[28];
+	m_A17 += gt[29];
+	m_A18 += go[27];
+	double RHS6 = Idr[27];
+	RHS6 += Idr[28];
+	RHS6 += Idr[29];
+	RHS6 -= go[28] * *cnV[28];
+	RHS6 -= go[29] * *cnV[29];
+	m_A19 += gt[30];
+	m_A19 += gt[31];
+	m_A19 += gt[32];
+	m_A19 += gt[33];
+	m_A19 += gt[34];
+	m_A19 += gt[35];
+	m_A20 += go[30];
+	m_A20 += go[31];
+	m_A22 += go[32];
+	m_A22 += go[33];
+	m_A21 += go[34];
+	double RHS7 = Idr[30];
+	RHS7 += Idr[31];
+	RHS7 += Idr[32];
+	RHS7 += Idr[33];
+	RHS7 += Idr[34];
+	RHS7 += Idr[35];
+	RHS7 -= go[35] * *cnV[35];
+	m_A23 += gt[36];
+	m_A23 += gt[37];
+	m_A23 += gt[38];
+	m_A23 += gt[39];
+	m_A23 += gt[40];
+	m_A23 += gt[41];
+	m_A24 += go[36];
+	m_A25 += go[37];
+	double RHS8 = Idr[36];
+	RHS8 += Idr[37];
+	RHS8 += Idr[38];
+	RHS8 += Idr[39];
+	RHS8 += Idr[40];
+	RHS8 += Idr[41];
+	RHS8 -= go[38] * *cnV[38];
+	RHS8 -= go[39] * *cnV[39];
+	RHS8 -= go[40] * *cnV[40];
+	RHS8 -= go[41] * *cnV[41];
+	m_A26 += gt[42];
+	m_A26 += gt[43];
+	m_A26 += gt[44];
+	m_A27 += go[42];
+	double RHS9 = Idr[42];
+	RHS9 += Idr[43];
+	RHS9 += Idr[44];
+	RHS9 -= go[43] * *cnV[43];
+	RHS9 -= go[44] * *cnV[44];
+	m_A28 += gt[45];
+	m_A28 += gt[46];
+	m_A28 += gt[47];
+	m_A29 += go[45];
+	double RHS10 = Idr[45];
+	RHS10 += Idr[46];
+	RHS10 += Idr[47];
+	RHS10 -= go[46] * *cnV[46];
+	RHS10 -= go[47] * *cnV[47];
+	m_A30 += gt[48];
+	m_A30 += gt[49];
+	m_A30 += gt[50];
+	m_A31 += go[48];
+	double RHS11 = Idr[48];
+	RHS11 += Idr[49];
+	RHS11 += Idr[50];
+	RHS11 -= go[49] * *cnV[49];
+	RHS11 -= go[50] * *cnV[50];
+	m_A32 += gt[51];
+	m_A32 += gt[52];
+	m_A32 += gt[53];
+	m_A33 += go[51];
+	double RHS12 = Idr[51];
+	RHS12 += Idr[52];
+	RHS12 += Idr[53];
+	RHS12 -= go[52] * *cnV[52];
+	RHS12 -= go[53] * *cnV[53];
+	m_A34 += gt[54];
+	m_A34 += gt[55];
+	m_A34 += gt[56];
+	m_A35 += go[54];
+	double RHS13 = Idr[54];
+	RHS13 += Idr[55];
+	RHS13 += Idr[56];
+	RHS13 -= go[55] * *cnV[55];
+	RHS13 -= go[56] * *cnV[56];
+	m_A36 += gt[57];
+	m_A36 += gt[58];
+	m_A37 += go[57];
+	double RHS14 = Idr[57];
+	RHS14 += Idr[58];
+	RHS14 -= go[58] * *cnV[58];
+	m_A38 += gt[59];
+	m_A38 += gt[60];
+	m_A38 += gt[61];
+	m_A39 += go[59];
+	double RHS15 = Idr[59];
+	RHS15 += Idr[60];
+	RHS15 += Idr[61];
+	RHS15 -= go[60] * *cnV[60];
+	RHS15 -= go[61] * *cnV[61];
+	m_A40 += gt[62];
+	m_A40 += gt[63];
+	m_A41 += go[62];
+	double RHS16 = Idr[62];
+	RHS16 += Idr[63];
+	RHS16 -= go[63] * *cnV[63];
+	m_A42 += gt[64];
+	m_A42 += gt[65];
+	m_A43 += go[64];
+	double RHS17 = Idr[64];
+	RHS17 += Idr[65];
+	RHS17 -= go[65] * *cnV[65];
+	m_A44 += gt[66];
+	m_A44 += gt[67];
+	m_A45 += go[66];
+	double RHS18 = Idr[66];
+	RHS18 += Idr[67];
+	RHS18 -= go[67] * *cnV[67];
+	m_A46 += gt[68];
+	m_A46 += gt[69];
+	m_A47 += go[68];
+	double RHS19 = Idr[68];
+	RHS19 += Idr[69];
+	RHS19 -= go[69] * *cnV[69];
+	m_A48 += gt[70];
+	m_A48 += gt[71];
+	m_A49 += go[70];
+	double RHS20 = Idr[70];
+	RHS20 += Idr[71];
+	RHS20 -= go[71] * *cnV[71];
+	m_A50 += gt[72];
+	m_A50 += gt[73];
+	m_A51 += go[72];
+	double RHS21 = Idr[72];
+	RHS21 += Idr[73];
+	RHS21 -= go[73] * *cnV[73];
+	m_A52 += gt[74];
+	m_A52 += gt[75];
+	m_A52 += gt[76];
+	m_A52 += gt[77];
+	m_A52 += gt[78];
+	m_A53 += go[74];
+	m_A55 += go[75];
+	m_A54 += go[76];
+	double RHS22 = Idr[74];
+	RHS22 += Idr[75];
+	RHS22 += Idr[76];
+	RHS22 += Idr[77];
+	RHS22 += Idr[78];
+	RHS22 -= go[77] * *cnV[77];
+	RHS22 -= go[78] * *cnV[78];
+	m_A56 += gt[79];
+	m_A56 += gt[80];
+	m_A58 += go[79];
+	m_A57 += go[80];
+	double RHS23 = Idr[79];
+	RHS23 += Idr[80];
+	m_A59 += gt[81];
+	m_A59 += gt[82];
+	m_A60 += go[81];
+	double RHS24 = Idr[81];
+	RHS24 += Idr[82];
+	RHS24 -= go[82] * *cnV[82];
+	m_A61 += gt[83];
+	m_A61 += gt[84];
+	m_A62 += go[83];
+	double RHS25 = Idr[83];
+	RHS25 += Idr[84];
+	RHS25 -= go[84] * *cnV[84];
+	m_A63 += gt[85];
+	m_A63 += gt[86];
+	m_A63 += gt[87];
+	m_A64 += go[85];
+	double RHS26 = Idr[85];
+	RHS26 += Idr[86];
+	RHS26 += Idr[87];
+	RHS26 -= go[86] * *cnV[86];
+	RHS26 -= go[87] * *cnV[87];
+	m_A68 += gt[88];
+	m_A68 += gt[89];
+	m_A68 += gt[90];
+	m_A68 += gt[91];
+	m_A68 += gt[92];
+	m_A65 += go[88];
+	m_A67 += go[89];
+	m_A66 += go[90];
+	double RHS27 = Idr[88];
+	RHS27 += Idr[89];
+	RHS27 += Idr[90];
+	RHS27 += Idr[91];
+	RHS27 += Idr[92];
+	RHS27 -= go[91] * *cnV[91];
+	RHS27 -= go[92] * *cnV[92];
+	m_A71 += gt[93];
+	m_A71 += gt[94];
+	m_A71 += gt[95];
+	m_A72 += go[93];
+	double RHS28 = Idr[93];
+	RHS28 += Idr[94];
+	RHS28 += Idr[95];
+	RHS28 -= go[94] * *cnV[94];
+	RHS28 -= go[95] * *cnV[95];
+	m_A73 += gt[96];
+	m_A73 += gt[97];
+	m_A73 += gt[98];
+	m_A74 += go[96];
+	double RHS29 = Idr[96];
+	RHS29 += Idr[97];
+	RHS29 += Idr[98];
+	RHS29 -= go[97] * *cnV[97];
+	RHS29 -= go[98] * *cnV[98];
+	m_A75 += gt[99];
+	m_A75 += gt[100];
+	m_A75 += gt[101];
+	m_A76 += go[99];
+	double RHS30 = Idr[99];
+	RHS30 += Idr[100];
+	RHS30 += Idr[101];
+	RHS30 -= go[100] * *cnV[100];
+	RHS30 -= go[101] * *cnV[101];
+	m_A77 += gt[102];
+	m_A77 += gt[103];
+	m_A79 += go[102];
+	m_A78 += go[103];
+	double RHS31 = Idr[102];
+	RHS31 += Idr[103];
+	m_A80 += gt[104];
+	m_A80 += gt[105];
+	m_A82 += go[104];
+	m_A81 += go[105];
+	double RHS32 = Idr[104];
+	RHS32 += Idr[105];
+	m_A85 += gt[106];
+	m_A85 += gt[107];
+	m_A85 += gt[108];
+	m_A85 += gt[109];
+	m_A84 += go[106];
+	m_A83 += go[107];
+	double RHS33 = Idr[106];
+	RHS33 += Idr[107];
+	RHS33 += Idr[108];
+	RHS33 += Idr[109];
+	RHS33 -= go[108] * *cnV[108];
+	RHS33 -= go[109] * *cnV[109];
+	m_A93 += gt[110];
+	m_A93 += gt[111];
+	m_A93 += gt[112];
+	m_A93 += gt[113];
+	m_A93 += gt[114];
+	m_A93 += gt[115];
+	m_A92 += go[110];
+	m_A91 += go[111];
+	m_A90 += go[112];
+	m_A89 += go[113];
+	m_A88 += go[114];
+	m_A87 += go[115];
+	double RHS34 = Idr[110];
+	RHS34 += Idr[111];
+	RHS34 += Idr[112];
+	RHS34 += Idr[113];
+	RHS34 += Idr[114];
+	RHS34 += Idr[115];
+	m_A97 += gt[116];
+	m_A97 += gt[117];
+	m_A97 += gt[118];
+	m_A98 += go[116];
+	m_A95 += go[117];
+	double RHS35 = Idr[116];
+	RHS35 += Idr[117];
+	RHS35 += Idr[118];
+	RHS35 -= go[118] * *cnV[118];
+	m_A102 += gt[119];
+	m_A102 += gt[120];
+	m_A102 += gt[121];
+	m_A102 += gt[122];
+	m_A102 += gt[123];
+	m_A102 += gt[124];
+	m_A102 += gt[125];
+	m_A100 += go[119];
+	m_A99 += go[120];
+	m_A99 += go[121];
+	m_A103 += go[122];
+	m_A103 += go[123];
+	double RHS36 = Idr[119];
+	RHS36 += Idr[120];
+	RHS36 += Idr[121];
+	RHS36 += Idr[122];
+	RHS36 += Idr[123];
+	RHS36 += Idr[124];
+	RHS36 += Idr[125];
+	RHS36 -= go[124] * *cnV[124];
+	RHS36 -= go[125] * *cnV[125];
+	m_A105 += gt[126];
+	m_A105 += gt[127];
+	m_A105 += gt[128];
+	m_A105 += gt[129];
+	m_A105 += gt[130];
+	m_A105 += gt[131];
+	m_A105 += gt[132];
+	m_A106 += go[126];
+	m_A104 += go[127];
+	double RHS37 = Idr[126];
+	RHS37 += Idr[127];
+	RHS37 += Idr[128];
+	RHS37 += Idr[129];
+	RHS37 += Idr[130];
+	RHS37 += Idr[131];
+	RHS37 += Idr[132];
+	RHS37 -= go[128] * *cnV[128];
+	RHS37 -= go[129] * *cnV[129];
+	RHS37 -= go[130] * *cnV[130];
+	RHS37 -= go[131] * *cnV[131];
+	RHS37 -= go[132] * *cnV[132];
+	m_A109 += gt[133];
+	m_A109 += gt[134];
+	m_A108 += go[133];
+	m_A110 += go[134];
+	double RHS38 = Idr[133];
+	RHS38 += Idr[134];
+	m_A117 += gt[135];
+	m_A117 += gt[136];
+	m_A117 += gt[137];
+	m_A117 += gt[138];
+	m_A117 += gt[139];
+	m_A117 += gt[140];
+	m_A116 += go[135];
+	m_A115 += go[136];
+	m_A114 += go[137];
+	m_A113 += go[138];
+	m_A112 += go[139];
+	m_A111 += go[140];
+	double RHS39 = Idr[135];
+	RHS39 += Idr[136];
+	RHS39 += Idr[137];
+	RHS39 += Idr[138];
+	RHS39 += Idr[139];
+	RHS39 += Idr[140];
+	m_A120 += gt[141];
+	m_A120 += gt[142];
+	m_A119 += go[141];
+	m_A121 += go[142];
+	double RHS40 = Idr[141];
+	RHS40 += Idr[142];
+	m_A126 += gt[143];
+	m_A126 += gt[144];
+	m_A126 += gt[145];
+	m_A126 += gt[146];
+	m_A126 += gt[147];
+	m_A125 += go[143];
+	m_A124 += go[144];
+	m_A123 += go[145];
+	m_A122 += go[146];
+	m_A127 += go[147];
+	double RHS41 = Idr[143];
+	RHS41 += Idr[144];
+	RHS41 += Idr[145];
+	RHS41 += Idr[146];
+	RHS41 += Idr[147];
+	m_A131 += gt[148];
+	m_A131 += gt[149];
+	m_A131 += gt[150];
+	m_A131 += gt[151];
+	m_A131 += gt[152];
+	m_A130 += go[148];
+	m_A129 += go[149];
+	m_A128 += go[150];
+	double RHS42 = Idr[148];
+	RHS42 += Idr[149];
+	RHS42 += Idr[150];
+	RHS42 += Idr[151];
+	RHS42 += Idr[152];
+	RHS42 -= go[151] * *cnV[151];
+	RHS42 -= go[152] * *cnV[152];
+	m_A137 += gt[153];
+	m_A137 += gt[154];
+	m_A137 += gt[155];
+	m_A137 += gt[156];
+	m_A137 += gt[157];
+	m_A137 += gt[158];
+	m_A135 += go[153];
+	m_A134 += go[154];
+	m_A139 += go[155];
+	m_A133 += go[156];
+	m_A133 += go[157];
+	double RHS43 = Idr[153];
+	RHS43 += Idr[154];
+	RHS43 += Idr[155];
+	RHS43 += Idr[156];
+	RHS43 += Idr[157];
+	RHS43 += Idr[158];
+	RHS43 -= go[158] * *cnV[158];
+	m_A148 += gt[159];
+	m_A148 += gt[160];
+	m_A148 += gt[161];
+	m_A148 += gt[162];
+	m_A148 += gt[163];
+	m_A148 += gt[164];
+	m_A148 += gt[165];
+	m_A142 += go[159];
+	m_A144 += go[160];
+	m_A146 += go[161];
+	m_A143 += go[162];
+	m_A141 += go[163];
+	double RHS44 = Idr[159];
+	RHS44 += Idr[160];
+	RHS44 += Idr[161];
+	RHS44 += Idr[162];
+	RHS44 += Idr[163];
+	RHS44 += Idr[164];
+	RHS44 += Idr[165];
+	RHS44 -= go[164] * *cnV[164];
+	RHS44 -= go[165] * *cnV[165];
+	m_A157 += gt[166];
+	m_A157 += gt[167];
+	m_A157 += gt[168];
+	m_A157 += gt[169];
+	m_A157 += gt[170];
+	m_A157 += gt[171];
+	m_A157 += gt[172];
+	m_A157 += gt[173];
+	m_A157 += gt[174];
+	m_A155 += go[166];
+	m_A153 += go[167];
+	m_A151 += go[168];
+	m_A154 += go[169];
+	m_A154 += go[170];
+	m_A152 += go[171];
+	m_A152 += go[172];
+	double RHS45 = Idr[166];
+	RHS45 += Idr[167];
+	RHS45 += Idr[168];
+	RHS45 += Idr[169];
+	RHS45 += Idr[170];
+	RHS45 += Idr[171];
+	RHS45 += Idr[172];
+	RHS45 += Idr[173];
+	RHS45 += Idr[174];
+	RHS45 -= go[173] * *cnV[173];
+	RHS45 -= go[174] * *cnV[174];
+	m_A160 += gt[175];
+	m_A160 += gt[176];
+	m_A159 += go[175];
+	m_A161 += go[176];
+	double RHS46 = Idr[175];
+	RHS46 += Idr[176];
+	m_A177 += gt[177];
+	m_A177 += gt[178];
+	m_A177 += gt[179];
+	m_A177 += gt[180];
+	m_A177 += gt[181];
+	m_A177 += gt[182];
+	m_A177 += gt[183];
+	m_A177 += gt[184];
+	m_A176 += go[177];
+	m_A164 += go[178];
+	m_A163 += go[179];
+	m_A165 += go[180];
+	m_A170 += go[181];
+	m_A168 += go[182];
+	m_A171 += go[183];
+	m_A162 += go[184];
+	double RHS47 = Idr[177];
+	RHS47 += Idr[178];
+	RHS47 += Idr[179];
+	RHS47 += Idr[180];
+	RHS47 += Idr[181];
+	RHS47 += Idr[182];
+	RHS47 += Idr[183];
+	RHS47 += Idr[184];
+	const double f0 = 1.0 / m_A0;
+	const double f0_27 = -f0 * m_A65;
+	m_A66 += m_A1 * f0_27;
+	RHS27 += f0_27 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_27 = -f1 * m_A66;
+	m_A68 += m_A3 * f1_27;
+	m_A70 += m_A4 * f1_27;
+	RHS27 += f1_27 * RHS1;
+	const double f1_44 = -f1 * m_A141;
+	m_A145 += m_A3 * f1_44;
+	m_A148 += m_A4 * f1_44;
+	RHS44 += f1_44 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_44 = -f2 * m_A142;
+	m_A146 += m_A6 * f2_44;
+	RHS44 += f2_44 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_27 = -f3 * m_A67;
+	m_A68 += m_A8 * f3_27;
+	m_A69 += m_A9 * f3_27;
+	m_A70 += m_A10 * f3_27;
+	RHS27 += f3_27 * RHS3;
+	const double f3_35 = -f3 * m_A95;
+	m_A96 += m_A8 * f3_35;
+	m_A97 += m_A9 * f3_35;
+	m_A98 += m_A10 * f3_35;
+	RHS35 += f3_35 * RHS3;
+	const double f3_44 = -f3 * m_A143;
+	m_A145 += m_A8 * f3_44;
+	m_A146 += m_A9 * f3_44;
+	m_A148 += m_A10 * f3_44;
+	RHS44 += f3_44 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_36 = -f4 * m_A99;
+	m_A102 += m_A12 * f4_36;
+	m_A103 += m_A13 * f4_36;
+	RHS36 += f4_36 * RHS4;
+	const double f4_45 = -f4 * m_A151;
+	m_A154 += m_A12 * f4_45;
+	m_A157 += m_A13 * f4_45;
+	RHS45 += f4_45 * RHS4;
+	const double f5 = 1.0 / m_A14;
+	const double f5_33 = -f5 * m_A83;
+	m_A85 += m_A15 * f5_33;
+	m_A86 += m_A16 * f5_33;
+	RHS33 += f5_33 * RHS5;
+	const double f5_36 = -f5 * m_A100;
+	m_A101 += m_A15 * f5_36;
+	m_A102 += m_A16 * f5_36;
+	RHS36 += f5_36 * RHS5;
+	const double f6 = 1.0 / m_A17;
+	const double f6_33 = -f6 * m_A84;
+	m_A85 += m_A18 * f6_33;
+	RHS33 += f6_33 * RHS6;
+	const double f7 = 1.0 / m_A19;
+	const double f7_43 = -f7 * m_A133;
+	m_A137 += m_A20 * f7_43;
+	m_A138 += m_A21 * f7_43;
+	m_A139 += m_A22 * f7_43;
+	RHS43 += f7_43 * RHS7;
+	const double f7_44 = -f7 * m_A144;
+	m_A147 += m_A20 * f7_44;
+	m_A148 += m_A21 * f7_44;
+	m_A149 += m_A22 * f7_44;
+	RHS44 += f7_44 * RHS7;
+	const double f7_45 = -f7 * m_A152;
+	m_A155 += m_A20 * f7_45;
+	m_A156 += m_A21 * f7_45;
+	m_A157 += m_A22 * f7_45;
+	RHS45 += f7_45 * RHS7;
+	const double f8 = 1.0 / m_A23;
+	const double f8_37 = -f8 * m_A104;
+	m_A106 += m_A24 * f8_37;
+	m_A107 += m_A25 * f8_37;
+	RHS37 += f8_37 * RHS8;
+	const double f8_43 = -f8 * m_A134;
+	m_A137 += m_A24 * f8_43;
+	m_A139 += m_A25 * f8_43;
+	RHS43 += f8_43 * RHS8;
+	const double f8_45 = -f8 * m_A153;
+	m_A155 += m_A24 * f8_45;
+	m_A157 += m_A25 * f8_45;
+	RHS45 += f8_45 * RHS8;
+	const double f9 = 1.0 / m_A26;
+	const double f9_34 = -f9 * m_A87;
+	m_A93 += m_A27 * f9_34;
+	RHS34 += f9_34 * RHS9;
+	const double f10 = 1.0 / m_A28;
+	const double f10_34 = -f10 * m_A88;
+	m_A93 += m_A29 * f10_34;
+	RHS34 += f10_34 * RHS10;
+	const double f11 = 1.0 / m_A30;
+	const double f11_34 = -f11 * m_A89;
+	m_A93 += m_A31 * f11_34;
+	RHS34 += f11_34 * RHS11;
+	const double f12 = 1.0 / m_A32;
+	const double f12_34 = -f12 * m_A90;
+	m_A93 += m_A33 * f12_34;
+	RHS34 += f12_34 * RHS12;
+	const double f13 = 1.0 / m_A34;
+	const double f13_34 = -f13 * m_A91;
+	m_A93 += m_A35 * f13_34;
+	RHS34 += f13_34 * RHS13;
+	const double f14 = 1.0 / m_A36;
+	const double f14_42 = -f14 * m_A128;
+	m_A131 += m_A37 * f14_42;
+	RHS42 += f14_42 * RHS14;
+	const double f15 = 1.0 / m_A38;
+	const double f15_39 = -f15 * m_A111;
+	m_A117 += m_A39 * f15_39;
+	RHS39 += f15_39 * RHS15;
+	const double f16 = 1.0 / m_A40;
+	const double f16_41 = -f16 * m_A122;
+	m_A126 += m_A41 * f16_41;
+	RHS41 += f16_41 * RHS16;
+	const double f17 = 1.0 / m_A42;
+	const double f17_38 = -f17 * m_A108;
+	m_A109 += m_A43 * f17_38;
+	RHS38 += f17_38 * RHS17;
+	const double f18 = 1.0 / m_A44;
+	const double f18_40 = -f18 * m_A119;
+	m_A120 += m_A45 * f18_40;
+	RHS40 += f18_40 * RHS18;
+	const double f19 = 1.0 / m_A46;
+	const double f19_41 = -f19 * m_A123;
+	m_A126 += m_A47 * f19_41;
+	RHS41 += f19_41 * RHS19;
+	const double f20 = 1.0 / m_A48;
+	const double f20_41 = -f20 * m_A124;
+	m_A126 += m_A49 * f20_41;
+	RHS41 += f20_41 * RHS20;
+	const double f21 = 1.0 / m_A50;
+	const double f21_41 = -f21 * m_A125;
+	m_A126 += m_A51 * f21_41;
+	RHS41 += f21_41 * RHS21;
+	const double f22 = 1.0 / m_A52;
+	const double f22_43 = -f22 * m_A135;
+	m_A136 += m_A53 * f22_43;
+	m_A137 += m_A54 * f22_43;
+	m_A140 += m_A55 * f22_43;
+	RHS43 += f22_43 * RHS22;
+	const double f22_47 = -f22 * m_A162;
+	m_A167 += m_A53 * f22_47;
+	m_A173 += m_A54 * f22_47;
+	m_A177 += m_A55 * f22_47;
+	RHS47 += f22_47 * RHS22;
+	const double f23 = 1.0 / m_A56;
+	const double f23_34 = -f23 * m_A92;
+	m_A93 += m_A57 * f23_34;
+	m_A94 += m_A58 * f23_34;
+	RHS34 += f23_34 * RHS23;
+	const double f23_47 = -f23 * m_A163;
+	m_A166 += m_A57 * f23_47;
+	m_A177 += m_A58 * f23_47;
+	RHS47 += f23_47 * RHS23;
+	const double f24 = 1.0 / m_A59;
+	const double f24_46 = -f24 * m_A159;
+	m_A160 += m_A60 * f24_46;
+	RHS46 += f24_46 * RHS24;
+	const double f25 = 1.0 / m_A61;
+	const double f25_42 = -f25 * m_A129;
+	m_A131 += m_A62 * f25_42;
+	RHS42 += f25_42 * RHS25;
+	const double f26 = 1.0 / m_A63;
+	const double f26_39 = -f26 * m_A112;
+	m_A117 += m_A64 * f26_39;
+	RHS39 += f26_39 * RHS26;
+	const double f27 = 1.0 / m_A68;
+	const double f27_35 = -f27 * m_A96;
+	m_A97 += m_A69 * f27_35;
+	m_A98 += m_A70 * f27_35;
+	RHS35 += f27_35 * RHS27;
+	const double f27_44 = -f27 * m_A145;
+	m_A146 += m_A69 * f27_44;
+	m_A148 += m_A70 * f27_44;
+	RHS44 += f27_44 * RHS27;
+	const double f28 = 1.0 / m_A71;
+	const double f28_39 = -f28 * m_A113;
+	m_A117 += m_A72 * f28_39;
+	RHS39 += f28_39 * RHS28;
+	const double f29 = 1.0 / m_A73;
+	const double f29_39 = -f29 * m_A114;
+	m_A117 += m_A74 * f29_39;
+	RHS39 += f29_39 * RHS29;
+	const double f30 = 1.0 / m_A75;
+	const double f30_39 = -f30 * m_A115;
+	m_A117 += m_A76 * f30_39;
+	RHS39 += f30_39 * RHS30;
+	const double f31 = 1.0 / m_A77;
+	const double f31_39 = -f31 * m_A116;
+	m_A117 += m_A78 * f31_39;
+	m_A118 += m_A79 * f31_39;
+	RHS39 += f31_39 * RHS31;
+	const double f31_47 = -f31 * m_A164;
+	m_A169 += m_A78 * f31_47;
+	m_A177 += m_A79 * f31_47;
+	RHS47 += f31_47 * RHS31;
+	const double f32 = 1.0 / m_A80;
+	const double f32_42 = -f32 * m_A130;
+	m_A131 += m_A81 * f32_42;
+	m_A132 += m_A82 * f32_42;
+	RHS42 += f32_42 * RHS32;
+	const double f32_47 = -f32 * m_A165;
+	m_A172 += m_A81 * f32_47;
+	m_A177 += m_A82 * f32_47;
+	RHS47 += f32_47 * RHS32;
+	const double f33 = 1.0 / m_A85;
+	const double f33_36 = -f33 * m_A101;
+	m_A102 += m_A86 * f33_36;
+	RHS36 += f33_36 * RHS33;
+	const double f34 = 1.0 / m_A93;
+	const double f34_47 = -f34 * m_A166;
+	m_A177 += m_A94 * f34_47;
+	RHS47 += f34_47 * RHS34;
+	const double f35 = 1.0 / m_A97;
+	const double f35_44 = -f35 * m_A146;
+	m_A148 += m_A98 * f35_44;
+	RHS44 += f35_44 * RHS35;
+	const double f36 = 1.0 / m_A102;
+	const double f36_45 = -f36 * m_A154;
+	m_A157 += m_A103 * f36_45;
+	RHS45 += f36_45 * RHS36;
+	const double f37 = 1.0 / m_A105;
+	const double f37_43 = -f37 * m_A136;
+	m_A137 += m_A106 * f37_43;
+	m_A139 += m_A107 * f37_43;
+	RHS43 += f37_43 * RHS37;
+	const double f37_47 = -f37 * m_A167;
+	m_A173 += m_A106 * f37_47;
+	m_A175 += m_A107 * f37_47;
+	RHS47 += f37_47 * RHS37;
+	const double f38 = 1.0 / m_A109;
+	const double f38_47 = -f38 * m_A168;
+	m_A177 += m_A110 * f38_47;
+	RHS47 += f38_47 * RHS38;
+	const double f39 = 1.0 / m_A117;
+	const double f39_47 = -f39 * m_A169;
+	m_A177 += m_A118 * f39_47;
+	RHS47 += f39_47 * RHS39;
+	const double f40 = 1.0 / m_A120;
+	const double f40_47 = -f40 * m_A170;
+	m_A177 += m_A121 * f40_47;
+	RHS47 += f40_47 * RHS40;
+	const double f41 = 1.0 / m_A126;
+	const double f41_47 = -f41 * m_A171;
+	m_A177 += m_A127 * f41_47;
+	RHS47 += f41_47 * RHS41;
+	const double f42 = 1.0 / m_A131;
+	const double f42_47 = -f42 * m_A172;
+	m_A177 += m_A132 * f42_47;
+	RHS47 += f42_47 * RHS42;
+	const double f43 = 1.0 / m_A137;
+	const double f43_44 = -f43 * m_A147;
+	m_A148 += m_A138 * f43_44;
+	m_A149 += m_A139 * f43_44;
+	m_A150 += m_A140 * f43_44;
+	RHS44 += f43_44 * RHS43;
+	const double f43_45 = -f43 * m_A155;
+	m_A156 += m_A138 * f43_45;
+	m_A157 += m_A139 * f43_45;
+	m_A158 += m_A140 * f43_45;
+	RHS45 += f43_45 * RHS43;
+	const double f43_47 = -f43 * m_A173;
+	m_A174 += m_A138 * f43_47;
+	m_A175 += m_A139 * f43_47;
+	m_A177 += m_A140 * f43_47;
+	RHS47 += f43_47 * RHS43;
+	const double f44 = 1.0 / m_A148;
+	const double f44_45 = -f44 * m_A156;
+	m_A157 += m_A149 * f44_45;
+	m_A158 += m_A150 * f44_45;
+	RHS45 += f44_45 * RHS44;
+	const double f44_47 = -f44 * m_A174;
+	m_A175 += m_A149 * f44_47;
+	m_A177 += m_A150 * f44_47;
+	RHS47 += f44_47 * RHS44;
+	const double f45 = 1.0 / m_A157;
+	const double f45_47 = -f45 * m_A175;
+	m_A177 += m_A158 * f45_47;
+	RHS47 += f45_47 * RHS45;
+	const double f46 = 1.0 / m_A160;
+	const double f46_47 = -f46 * m_A176;
+	m_A177 += m_A161 * f46_47;
+	RHS47 += f46_47 * RHS46;
+	V[47] = RHS47 / m_A177;
+	double tmp46 = 0.0;
+	tmp46 += m_A161 * V[47];
+	V[46] = (RHS46 - tmp46) / m_A160;
+	double tmp45 = 0.0;
+	tmp45 += m_A158 * V[47];
+	V[45] = (RHS45 - tmp45) / m_A157;
+	double tmp44 = 0.0;
+	tmp44 += m_A149 * V[45];
+	tmp44 += m_A150 * V[47];
+	V[44] = (RHS44 - tmp44) / m_A148;
+	double tmp43 = 0.0;
+	tmp43 += m_A138 * V[44];
+	tmp43 += m_A139 * V[45];
+	tmp43 += m_A140 * V[47];
+	V[43] = (RHS43 - tmp43) / m_A137;
+	double tmp42 = 0.0;
+	tmp42 += m_A132 * V[47];
+	V[42] = (RHS42 - tmp42) / m_A131;
+	double tmp41 = 0.0;
+	tmp41 += m_A127 * V[47];
+	V[41] = (RHS41 - tmp41) / m_A126;
+	double tmp40 = 0.0;
+	tmp40 += m_A121 * V[47];
+	V[40] = (RHS40 - tmp40) / m_A120;
+	double tmp39 = 0.0;
+	tmp39 += m_A118 * V[47];
+	V[39] = (RHS39 - tmp39) / m_A117;
+	double tmp38 = 0.0;
+	tmp38 += m_A110 * V[47];
+	V[38] = (RHS38 - tmp38) / m_A109;
+	double tmp37 = 0.0;
+	tmp37 += m_A106 * V[43];
+	tmp37 += m_A107 * V[45];
+	V[37] = (RHS37 - tmp37) / m_A105;
+	double tmp36 = 0.0;
+	tmp36 += m_A103 * V[45];
+	V[36] = (RHS36 - tmp36) / m_A102;
+	double tmp35 = 0.0;
+	tmp35 += m_A98 * V[44];
+	V[35] = (RHS35 - tmp35) / m_A97;
+	double tmp34 = 0.0;
+	tmp34 += m_A94 * V[47];
+	V[34] = (RHS34 - tmp34) / m_A93;
+	double tmp33 = 0.0;
+	tmp33 += m_A86 * V[36];
+	V[33] = (RHS33 - tmp33) / m_A85;
+	double tmp32 = 0.0;
+	tmp32 += m_A81 * V[42];
+	tmp32 += m_A82 * V[47];
+	V[32] = (RHS32 - tmp32) / m_A80;
+	double tmp31 = 0.0;
+	tmp31 += m_A78 * V[39];
+	tmp31 += m_A79 * V[47];
+	V[31] = (RHS31 - tmp31) / m_A77;
+	double tmp30 = 0.0;
+	tmp30 += m_A76 * V[39];
+	V[30] = (RHS30 - tmp30) / m_A75;
+	double tmp29 = 0.0;
+	tmp29 += m_A74 * V[39];
+	V[29] = (RHS29 - tmp29) / m_A73;
+	double tmp28 = 0.0;
+	tmp28 += m_A72 * V[39];
+	V[28] = (RHS28 - tmp28) / m_A71;
+	double tmp27 = 0.0;
+	tmp27 += m_A69 * V[35];
+	tmp27 += m_A70 * V[44];
+	V[27] = (RHS27 - tmp27) / m_A68;
+	double tmp26 = 0.0;
+	tmp26 += m_A64 * V[39];
+	V[26] = (RHS26 - tmp26) / m_A63;
+	double tmp25 = 0.0;
+	tmp25 += m_A62 * V[42];
+	V[25] = (RHS25 - tmp25) / m_A61;
+	double tmp24 = 0.0;
+	tmp24 += m_A60 * V[46];
+	V[24] = (RHS24 - tmp24) / m_A59;
+	double tmp23 = 0.0;
+	tmp23 += m_A57 * V[34];
+	tmp23 += m_A58 * V[47];
+	V[23] = (RHS23 - tmp23) / m_A56;
+	double tmp22 = 0.0;
+	tmp22 += m_A53 * V[37];
+	tmp22 += m_A54 * V[43];
+	tmp22 += m_A55 * V[47];
+	V[22] = (RHS22 - tmp22) / m_A52;
+	double tmp21 = 0.0;
+	tmp21 += m_A51 * V[41];
+	V[21] = (RHS21 - tmp21) / m_A50;
+	double tmp20 = 0.0;
+	tmp20 += m_A49 * V[41];
+	V[20] = (RHS20 - tmp20) / m_A48;
+	double tmp19 = 0.0;
+	tmp19 += m_A47 * V[41];
+	V[19] = (RHS19 - tmp19) / m_A46;
+	double tmp18 = 0.0;
+	tmp18 += m_A45 * V[40];
+	V[18] = (RHS18 - tmp18) / m_A44;
+	double tmp17 = 0.0;
+	tmp17 += m_A43 * V[38];
+	V[17] = (RHS17 - tmp17) / m_A42;
+	double tmp16 = 0.0;
+	tmp16 += m_A41 * V[41];
+	V[16] = (RHS16 - tmp16) / m_A40;
+	double tmp15 = 0.0;
+	tmp15 += m_A39 * V[39];
+	V[15] = (RHS15 - tmp15) / m_A38;
+	double tmp14 = 0.0;
+	tmp14 += m_A37 * V[42];
+	V[14] = (RHS14 - tmp14) / m_A36;
+	double tmp13 = 0.0;
+	tmp13 += m_A35 * V[34];
+	V[13] = (RHS13 - tmp13) / m_A34;
+	double tmp12 = 0.0;
+	tmp12 += m_A33 * V[34];
+	V[12] = (RHS12 - tmp12) / m_A32;
+	double tmp11 = 0.0;
+	tmp11 += m_A31 * V[34];
+	V[11] = (RHS11 - tmp11) / m_A30;
+	double tmp10 = 0.0;
+	tmp10 += m_A29 * V[34];
+	V[10] = (RHS10 - tmp10) / m_A28;
+	double tmp9 = 0.0;
+	tmp9 += m_A27 * V[34];
+	V[9] = (RHS9 - tmp9) / m_A26;
+	double tmp8 = 0.0;
+	tmp8 += m_A24 * V[43];
+	tmp8 += m_A25 * V[45];
+	V[8] = (RHS8 - tmp8) / m_A23;
+	double tmp7 = 0.0;
+	tmp7 += m_A20 * V[43];
+	tmp7 += m_A21 * V[44];
+	tmp7 += m_A22 * V[45];
+	V[7] = (RHS7 - tmp7) / m_A19;
+	double tmp6 = 0.0;
+	tmp6 += m_A18 * V[33];
+	V[6] = (RHS6 - tmp6) / m_A17;
+	double tmp5 = 0.0;
+	tmp5 += m_A15 * V[33];
+	tmp5 += m_A16 * V[36];
+	V[5] = (RHS5 - tmp5) / m_A14;
+	double tmp4 = 0.0;
+	tmp4 += m_A12 * V[36];
+	tmp4 += m_A13 * V[45];
+	V[4] = (RHS4 - tmp4) / m_A11;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[27];
+	tmp3 += m_A9 * V[35];
+	tmp3 += m_A10 * V[44];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[35];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[27];
+	tmp1 += m_A4 * V[44];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[1];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// tankbatt
+static void nl_gcr_328d886b444b586b_137_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A3 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A5 += go[7];
+	m_A7 += go[8];
+	m_A6 += go[9];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A9 += go[12];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A10 += gt[20];
+	m_A10 += gt[21];
+	m_A11 += go[15];
+	m_A12 += go[16];
+	double RHS4 = Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 -= go[17] * *cnV[17];
+	RHS4 -= go[18] * *cnV[18];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	m_A13 += gt[22];
+	m_A13 += gt[23];
+	m_A13 += gt[24];
+	m_A14 += go[22];
+	double RHS5 = Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 -= go[23] * *cnV[23];
+	RHS5 -= go[24] * *cnV[24];
+	m_A15 += gt[25];
+	m_A15 += gt[26];
+	m_A15 += gt[27];
+	m_A16 += go[25];
+	double RHS6 = Idr[25];
+	RHS6 += Idr[26];
+	RHS6 += Idr[27];
+	RHS6 -= go[26] * *cnV[26];
+	RHS6 -= go[27] * *cnV[27];
+	m_A17 += gt[28];
+	m_A17 += gt[29];
+	m_A17 += gt[30];
+	m_A19 += go[28];
+	m_A18 += go[29];
+	double RHS7 = Idr[28];
+	RHS7 += Idr[29];
+	RHS7 += Idr[30];
+	RHS7 -= go[30] * *cnV[30];
+	m_A20 += gt[31];
+	m_A20 += gt[32];
+	m_A20 += gt[33];
+	m_A21 += go[31];
+	double RHS8 = Idr[31];
+	RHS8 += Idr[32];
+	RHS8 += Idr[33];
+	RHS8 -= go[32] * *cnV[32];
+	RHS8 -= go[33] * *cnV[33];
+	m_A22 += gt[34];
+	m_A22 += gt[35];
+	m_A22 += gt[36];
+	m_A24 += go[34];
+	m_A23 += go[35];
+	double RHS9 = Idr[34];
+	RHS9 += Idr[35];
+	RHS9 += Idr[36];
+	RHS9 -= go[36] * *cnV[36];
+	m_A25 += gt[37];
+	m_A25 += gt[38];
+	m_A25 += gt[39];
+	m_A25 += gt[40];
+	m_A25 += gt[41];
+	m_A25 += gt[42];
+	m_A25 += gt[43];
+	m_A27 += go[37];
+	m_A26 += go[38];
+	double RHS10 = Idr[37];
+	RHS10 += Idr[38];
+	RHS10 += Idr[39];
+	RHS10 += Idr[40];
+	RHS10 += Idr[41];
+	RHS10 += Idr[42];
+	RHS10 += Idr[43];
+	RHS10 -= go[39] * *cnV[39];
+	RHS10 -= go[40] * *cnV[40];
+	RHS10 -= go[41] * *cnV[41];
+	RHS10 -= go[42] * *cnV[42];
+	RHS10 -= go[43] * *cnV[43];
+	m_A28 += gt[44];
+	m_A28 += gt[45];
+	m_A28 += gt[46];
+	m_A28 += gt[47];
+	m_A28 += gt[48];
+	m_A28 += gt[49];
+	m_A30 += go[44];
+	m_A31 += go[45];
+	m_A29 += go[46];
+	double RHS11 = Idr[44];
+	RHS11 += Idr[45];
+	RHS11 += Idr[46];
+	RHS11 += Idr[47];
+	RHS11 += Idr[48];
+	RHS11 += Idr[49];
+	RHS11 -= go[47] * *cnV[47];
+	RHS11 -= go[48] * *cnV[48];
+	RHS11 -= go[49] * *cnV[49];
+	m_A32 += gt[50];
+	m_A32 += gt[51];
+	m_A32 += gt[52];
+	m_A32 += gt[53];
+	m_A35 += go[50];
+	m_A34 += go[51];
+	m_A33 += go[52];
+	double RHS12 = Idr[50];
+	RHS12 += Idr[51];
+	RHS12 += Idr[52];
+	RHS12 += Idr[53];
+	RHS12 -= go[53] * *cnV[53];
+	m_A36 += gt[54];
+	m_A36 += gt[55];
+	m_A36 += gt[56];
+	m_A37 += go[54];
+	double RHS13 = Idr[54];
+	RHS13 += Idr[55];
+	RHS13 += Idr[56];
+	RHS13 -= go[55] * *cnV[55];
+	RHS13 -= go[56] * *cnV[56];
+	m_A38 += gt[57];
+	m_A38 += gt[58];
+	m_A38 += gt[59];
+	m_A39 += go[57];
+	double RHS14 = Idr[57];
+	RHS14 += Idr[58];
+	RHS14 += Idr[59];
+	RHS14 -= go[58] * *cnV[58];
+	RHS14 -= go[59] * *cnV[59];
+	m_A44 += gt[60];
+	m_A44 += gt[61];
+	m_A41 += go[60];
+	m_A40 += go[61];
+	double RHS15 = Idr[60];
+	RHS15 += Idr[61];
+	m_A50 += gt[62];
+	m_A50 += gt[63];
+	m_A49 += go[62];
+	m_A48 += go[63];
+	double RHS16 = Idr[62];
+	RHS16 += Idr[63];
+	m_A52 += gt[64];
+	m_A52 += gt[65];
+	m_A52 += gt[66];
+	m_A52 += gt[67];
+	m_A55 += go[64];
+	m_A54 += go[65];
+	m_A53 += go[66];
+	double RHS17 = Idr[64];
+	RHS17 += Idr[65];
+	RHS17 += Idr[66];
+	RHS17 += Idr[67];
+	RHS17 -= go[67] * *cnV[67];
+	m_A58 += gt[68];
+	m_A58 += gt[69];
+	m_A57 += go[68];
+	m_A56 += go[69];
+	double RHS18 = Idr[68];
+	RHS18 += Idr[69];
+	m_A60 += gt[70];
+	m_A60 += gt[71];
+	m_A60 += gt[72];
+	m_A61 += go[70];
+	double RHS19 = Idr[70];
+	RHS19 += Idr[71];
+	RHS19 += Idr[72];
+	RHS19 -= go[71] * *cnV[71];
+	RHS19 -= go[72] * *cnV[72];
+	m_A63 += gt[73];
+	m_A63 += gt[74];
+	m_A64 += go[73];
+	m_A62 += go[74];
+	double RHS20 = Idr[73];
+	RHS20 += Idr[74];
+	m_A66 += gt[75];
+	m_A66 += gt[76];
+	m_A67 += go[75];
+	m_A65 += go[76];
+	double RHS21 = Idr[75];
+	RHS21 += Idr[76];
+	m_A73 += gt[77];
+	m_A73 += gt[78];
+	m_A73 += gt[79];
+	m_A73 += gt[80];
+	m_A71 += go[77];
+	m_A69 += go[78];
+	m_A68 += go[79];
+	m_A68 += go[80];
+	double RHS22 = Idr[77];
+	RHS22 += Idr[78];
+	RHS22 += Idr[79];
+	RHS22 += Idr[80];
+	m_A79 += gt[81];
+	m_A79 += gt[82];
+	m_A77 += go[81];
+	m_A76 += go[82];
+	double RHS23 = Idr[81];
+	RHS23 += Idr[82];
+	m_A84 += gt[83];
+	m_A84 += gt[84];
+	m_A84 += gt[85];
+	m_A84 += gt[86];
+	m_A84 += gt[87];
+	m_A84 += gt[88];
+	m_A84 += gt[89];
+	m_A85 += go[83];
+	m_A82 += go[84];
+	double RHS24 = Idr[83];
+	RHS24 += Idr[84];
+	RHS24 += Idr[85];
+	RHS24 += Idr[86];
+	RHS24 += Idr[87];
+	RHS24 += Idr[88];
+	RHS24 += Idr[89];
+	RHS24 -= go[85] * *cnV[85];
+	RHS24 -= go[86] * *cnV[86];
+	RHS24 -= go[87] * *cnV[87];
+	RHS24 -= go[88] * *cnV[88];
+	RHS24 -= go[89] * *cnV[89];
+	m_A91 += gt[90];
+	m_A91 += gt[91];
+	m_A91 += gt[92];
+	m_A93 += go[90];
+	m_A88 += go[91];
+	m_A87 += go[92];
+	double RHS25 = Idr[90];
+	RHS25 += Idr[91];
+	RHS25 += Idr[92];
+	m_A97 += gt[93];
+	m_A97 += gt[94];
+	m_A96 += go[93];
+	m_A94 += go[94];
+	double RHS26 = Idr[93];
+	RHS26 += Idr[94];
+	m_A105 += gt[95];
+	m_A105 += gt[96];
+	m_A105 += gt[97];
+	m_A107 += go[95];
+	m_A101 += go[96];
+	m_A100 += go[97];
+	double RHS27 = Idr[95];
+	RHS27 += Idr[96];
+	RHS27 += Idr[97];
+	m_A111 += gt[98];
+	m_A111 += gt[99];
+	m_A111 += gt[100];
+	m_A111 += gt[101];
+	m_A111 += gt[102];
+	m_A112 += go[98];
+	m_A110 += go[99];
+	m_A109 += go[100];
+	m_A108 += go[101];
+	double RHS28 = Idr[98];
+	RHS28 += Idr[99];
+	RHS28 += Idr[100];
+	RHS28 += Idr[101];
+	RHS28 += Idr[102];
+	RHS28 -= go[102] * *cnV[102];
+	m_A118 += gt[103];
+	m_A118 += gt[104];
+	m_A118 += gt[105];
+	m_A118 += gt[106];
+	m_A118 += gt[107];
+	m_A118 += gt[108];
+	m_A115 += go[103];
+	m_A120 += go[104];
+	m_A116 += go[105];
+	m_A113 += go[106];
+	double RHS29 = Idr[103];
+	RHS29 += Idr[104];
+	RHS29 += Idr[105];
+	RHS29 += Idr[106];
+	RHS29 += Idr[107];
+	RHS29 += Idr[108];
+	RHS29 -= go[107] * *cnV[107];
+	RHS29 -= go[108] * *cnV[108];
+	m_A129 += gt[109];
+	m_A129 += gt[110];
+	m_A129 += gt[111];
+	m_A129 += gt[112];
+	m_A129 += gt[113];
+	m_A129 += gt[114];
+	m_A121 += go[109];
+	m_A130 += go[110];
+	m_A127 += go[111];
+	m_A123 += go[112];
+	double RHS30 = Idr[109];
+	RHS30 += Idr[110];
+	RHS30 += Idr[111];
+	RHS30 += Idr[112];
+	RHS30 += Idr[113];
+	RHS30 += Idr[114];
+	RHS30 -= go[113] * *cnV[113];
+	RHS30 -= go[114] * *cnV[114];
+	m_A136 += gt[115];
+	m_A136 += gt[116];
+	m_A136 += gt[117];
+	m_A136 += gt[118];
+	m_A136 += gt[119];
+	m_A133 += go[115];
+	m_A134 += go[116];
+	m_A135 += go[117];
+	m_A132 += go[118];
+	m_A131 += go[119];
+	double RHS31 = Idr[115];
+	RHS31 += Idr[116];
+	RHS31 += Idr[117];
+	RHS31 += Idr[118];
+	RHS31 += Idr[119];
+	const double f0 = 1.0 / m_A0;
+	const double f0_15 = -f0 * m_A40;
+	m_A44 += m_A1 * f0_15;
+	RHS15 += f0_15 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_22 = -f1 * m_A68;
+	m_A73 += m_A3 * f1_22;
+	RHS22 += f1_22 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_15 = -f2 * m_A41;
+	m_A42 += m_A5 * f2_15;
+	m_A44 += m_A6 * f2_15;
+	m_A45 += m_A7 * f2_15;
+	RHS15 += f2_15 * RHS2;
+	const double f2_22 = -f2 * m_A69;
+	m_A70 += m_A5 * f2_22;
+	m_A72 += m_A6 * f2_22;
+	m_A73 += m_A7 * f2_22;
+	RHS22 += f2_22 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_16 = -f3 * m_A48;
+	m_A50 += m_A9 * f3_16;
+	RHS16 += f3_16 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_15 = -f4 * m_A42;
+	m_A43 += m_A11 * f4_15;
+	m_A45 += m_A12 * f4_15;
+	RHS15 += f4_15 * RHS4;
+	const double f4_22 = -f4 * m_A70;
+	m_A71 += m_A11 * f4_22;
+	m_A73 += m_A12 * f4_22;
+	RHS22 += f4_22 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_20 = -f5 * m_A62;
+	m_A63 += m_A14 * f5_20;
+	RHS20 += f5_20 * RHS5;
+	const double f6 = 1.0 / m_A15;
+	const double f6_18 = -f6 * m_A56;
+	m_A58 += m_A16 * f6_18;
+	RHS18 += f6_18 * RHS6;
+	const double f7 = 1.0 / m_A17;
+	const double f7_16 = -f7 * m_A49;
+	m_A50 += m_A18 * f7_16;
+	m_A51 += m_A19 * f7_16;
+	RHS16 += f7_16 * RHS7;
+	const double f7_26 = -f7 * m_A94;
+	m_A95 += m_A18 * f7_26;
+	m_A97 += m_A19 * f7_26;
+	RHS26 += f7_26 * RHS7;
+	const double f8 = 1.0 / m_A20;
+	const double f8_21 = -f8 * m_A65;
+	m_A66 += m_A21 * f8_21;
+	RHS21 += f8_21 * RHS8;
+	const double f9 = 1.0 / m_A22;
+	const double f9_18 = -f9 * m_A57;
+	m_A58 += m_A23 * f9_18;
+	m_A59 += m_A24 * f9_18;
+	RHS18 += f9_18 * RHS9;
+	const double f9_23 = -f9 * m_A76;
+	m_A78 += m_A23 * f9_23;
+	m_A79 += m_A24 * f9_23;
+	RHS23 += f9_23 * RHS9;
+	const double f10 = 1.0 / m_A25;
+	const double f10_30 = -f10 * m_A121;
+	m_A122 += m_A26 * f10_30;
+	m_A127 += m_A27 * f10_30;
+	RHS30 += f10_30 * RHS10;
+	const double f11 = 1.0 / m_A28;
+	const double f11_15 = -f11 * m_A43;
+	m_A45 += m_A29 * f11_15;
+	m_A46 += m_A30 * f11_15;
+	m_A47 += m_A31 * f11_15;
+	RHS15 += f11_15 * RHS11;
+	const double f11_22 = -f11 * m_A71;
+	m_A73 += m_A29 * f11_22;
+	m_A74 += m_A30 * f11_22;
+	m_A75 += m_A31 * f11_22;
+	RHS22 += f11_22 * RHS11;
+	const double f11_24 = -f11 * m_A82;
+	m_A83 += m_A29 * f11_24;
+	m_A85 += m_A30 * f11_24;
+	m_A86 += m_A31 * f11_24;
+	RHS24 += f11_24 * RHS11;
+	const double f11_25 = -f11 * m_A87;
+	m_A89 += m_A29 * f11_25;
+	m_A91 += m_A30 * f11_25;
+	m_A92 += m_A31 * f11_25;
+	RHS25 += f11_25 * RHS11;
+	const double f11_27 = -f11 * m_A100;
+	m_A102 += m_A29 * f11_27;
+	m_A103 += m_A30 * f11_27;
+	m_A105 += m_A31 * f11_27;
+	RHS27 += f11_27 * RHS11;
+	const double f11_30 = -f11 * m_A122;
+	m_A124 += m_A29 * f11_30;
+	m_A125 += m_A30 * f11_30;
+	m_A127 += m_A31 * f11_30;
+	RHS30 += f11_30 * RHS11;
+	const double f12 = 1.0 / m_A32;
+	const double f12_23 = -f12 * m_A77;
+	m_A79 += m_A33 * f12_23;
+	m_A80 += m_A34 * f12_23;
+	m_A81 += m_A35 * f12_23;
+	RHS23 += f12_23 * RHS12;
+	const double f12_25 = -f12 * m_A88;
+	m_A90 += m_A33 * f12_25;
+	m_A91 += m_A34 * f12_25;
+	m_A93 += m_A35 * f12_25;
+	RHS25 += f12_25 * RHS12;
+	const double f12_29 = -f12 * m_A113;
+	m_A114 += m_A33 * f12_29;
+	m_A116 += m_A34 * f12_29;
+	m_A118 += m_A35 * f12_29;
+	RHS29 += f12_29 * RHS12;
+	const double f13 = 1.0 / m_A36;
+	const double f13_28 = -f13 * m_A108;
+	m_A111 += m_A37 * f13_28;
+	RHS28 += f13_28 * RHS13;
+	const double f14 = 1.0 / m_A38;
+	const double f14_28 = -f14 * m_A109;
+	m_A111 += m_A39 * f14_28;
+	RHS28 += f14_28 * RHS14;
+	const double f15 = 1.0 / m_A44;
+	const double f15_22 = -f15 * m_A72;
+	m_A73 += m_A45 * f15_22;
+	m_A74 += m_A46 * f15_22;
+	m_A75 += m_A47 * f15_22;
+	RHS22 += f15_22 * RHS15;
+	const double f16 = 1.0 / m_A50;
+	const double f16_26 = -f16 * m_A95;
+	m_A97 += m_A51 * f16_26;
+	RHS26 += f16_26 * RHS16;
+	const double f17 = 1.0 / m_A52;
+	const double f17_26 = -f17 * m_A96;
+	m_A97 += m_A53 * f17_26;
+	m_A98 += m_A54 * f17_26;
+	m_A99 += m_A55 * f17_26;
+	RHS26 += f17_26 * RHS17;
+	const double f17_27 = -f17 * m_A101;
+	m_A104 += m_A53 * f17_27;
+	m_A105 += m_A54 * f17_27;
+	m_A107 += m_A55 * f17_27;
+	RHS27 += f17_27 * RHS17;
+	const double f17_30 = -f17 * m_A123;
+	m_A126 += m_A53 * f17_30;
+	m_A127 += m_A54 * f17_30;
+	m_A129 += m_A55 * f17_30;
+	RHS30 += f17_30 * RHS17;
+	const double f18 = 1.0 / m_A58;
+	const double f18_23 = -f18 * m_A78;
+	m_A79 += m_A59 * f18_23;
+	RHS23 += f18_23 * RHS18;
+	const double f19 = 1.0 / m_A60;
+	const double f19_28 = -f19 * m_A110;
+	m_A111 += m_A61 * f19_28;
+	RHS28 += f19_28 * RHS19;
+	const double f20 = 1.0 / m_A63;
+	const double f20_31 = -f20 * m_A131;
+	m_A136 += m_A64 * f20_31;
+	RHS31 += f20_31 * RHS20;
+	const double f21 = 1.0 / m_A66;
+	const double f21_31 = -f21 * m_A132;
+	m_A136 += m_A67 * f21_31;
+	RHS31 += f21_31 * RHS21;
+	const double f22 = 1.0 / m_A73;
+	const double f22_24 = -f22 * m_A83;
+	m_A85 += m_A74 * f22_24;
+	m_A86 += m_A75 * f22_24;
+	RHS24 += f22_24 * RHS22;
+	const double f22_25 = -f22 * m_A89;
+	m_A91 += m_A74 * f22_25;
+	m_A92 += m_A75 * f22_25;
+	RHS25 += f22_25 * RHS22;
+	const double f22_27 = -f22 * m_A102;
+	m_A103 += m_A74 * f22_27;
+	m_A105 += m_A75 * f22_27;
+	RHS27 += f22_27 * RHS22;
+	const double f22_30 = -f22 * m_A124;
+	m_A125 += m_A74 * f22_30;
+	m_A127 += m_A75 * f22_30;
+	RHS30 += f22_30 * RHS22;
+	const double f23 = 1.0 / m_A79;
+	const double f23_25 = -f23 * m_A90;
+	m_A91 += m_A80 * f23_25;
+	m_A93 += m_A81 * f23_25;
+	RHS25 += f23_25 * RHS23;
+	const double f23_29 = -f23 * m_A114;
+	m_A116 += m_A80 * f23_29;
+	m_A118 += m_A81 * f23_29;
+	RHS29 += f23_29 * RHS23;
+	const double f24 = 1.0 / m_A84;
+	const double f24_29 = -f24 * m_A115;
+	m_A116 += m_A85 * f24_29;
+	m_A117 += m_A86 * f24_29;
+	RHS29 += f24_29 * RHS24;
+	const double f25 = 1.0 / m_A91;
+	const double f25_27 = -f25 * m_A103;
+	m_A105 += m_A92 * f25_27;
+	m_A106 += m_A93 * f25_27;
+	RHS27 += f25_27 * RHS25;
+	const double f25_29 = -f25 * m_A116;
+	m_A117 += m_A92 * f25_29;
+	m_A118 += m_A93 * f25_29;
+	RHS29 += f25_29 * RHS25;
+	const double f25_30 = -f25 * m_A125;
+	m_A127 += m_A92 * f25_30;
+	m_A128 += m_A93 * f25_30;
+	RHS30 += f25_30 * RHS25;
+	const double f26 = 1.0 / m_A97;
+	const double f26_27 = -f26 * m_A104;
+	m_A105 += m_A98 * f26_27;
+	m_A107 += m_A99 * f26_27;
+	RHS27 += f26_27 * RHS26;
+	const double f26_30 = -f26 * m_A126;
+	m_A127 += m_A98 * f26_30;
+	m_A129 += m_A99 * f26_30;
+	RHS30 += f26_30 * RHS26;
+	const double f27 = 1.0 / m_A105;
+	const double f27_29 = -f27 * m_A117;
+	m_A118 += m_A106 * f27_29;
+	m_A119 += m_A107 * f27_29;
+	RHS29 += f27_29 * RHS27;
+	const double f27_30 = -f27 * m_A127;
+	m_A128 += m_A106 * f27_30;
+	m_A129 += m_A107 * f27_30;
+	RHS30 += f27_30 * RHS27;
+	const double f28 = 1.0 / m_A111;
+	const double f28_31 = -f28 * m_A133;
+	m_A136 += m_A112 * f28_31;
+	RHS31 += f28_31 * RHS28;
+	const double f29 = 1.0 / m_A118;
+	const double f29_30 = -f29 * m_A128;
+	m_A129 += m_A119 * f29_30;
+	m_A130 += m_A120 * f29_30;
+	RHS30 += f29_30 * RHS29;
+	const double f29_31 = -f29 * m_A134;
+	m_A135 += m_A119 * f29_31;
+	m_A136 += m_A120 * f29_31;
+	RHS31 += f29_31 * RHS29;
+	const double f30 = 1.0 / m_A129;
+	const double f30_31 = -f30 * m_A135;
+	m_A136 += m_A130 * f30_31;
+	RHS31 += f30_31 * RHS30;
+	V[31] = RHS31 / m_A136;
+	double tmp30 = 0.0;
+	tmp30 += m_A130 * V[31];
+	V[30] = (RHS30 - tmp30) / m_A129;
+	double tmp29 = 0.0;
+	tmp29 += m_A119 * V[30];
+	tmp29 += m_A120 * V[31];
+	V[29] = (RHS29 - tmp29) / m_A118;
+	double tmp28 = 0.0;
+	tmp28 += m_A112 * V[31];
+	V[28] = (RHS28 - tmp28) / m_A111;
+	double tmp27 = 0.0;
+	tmp27 += m_A106 * V[29];
+	tmp27 += m_A107 * V[30];
+	V[27] = (RHS27 - tmp27) / m_A105;
+	double tmp26 = 0.0;
+	tmp26 += m_A98 * V[27];
+	tmp26 += m_A99 * V[30];
+	V[26] = (RHS26 - tmp26) / m_A97;
+	double tmp25 = 0.0;
+	tmp25 += m_A92 * V[27];
+	tmp25 += m_A93 * V[29];
+	V[25] = (RHS25 - tmp25) / m_A91;
+	double tmp24 = 0.0;
+	tmp24 += m_A85 * V[25];
+	tmp24 += m_A86 * V[27];
+	V[24] = (RHS24 - tmp24) / m_A84;
+	double tmp23 = 0.0;
+	tmp23 += m_A80 * V[25];
+	tmp23 += m_A81 * V[29];
+	V[23] = (RHS23 - tmp23) / m_A79;
+	double tmp22 = 0.0;
+	tmp22 += m_A74 * V[25];
+	tmp22 += m_A75 * V[27];
+	V[22] = (RHS22 - tmp22) / m_A73;
+	double tmp21 = 0.0;
+	tmp21 += m_A67 * V[31];
+	V[21] = (RHS21 - tmp21) / m_A66;
+	double tmp20 = 0.0;
+	tmp20 += m_A64 * V[31];
+	V[20] = (RHS20 - tmp20) / m_A63;
+	double tmp19 = 0.0;
+	tmp19 += m_A61 * V[28];
+	V[19] = (RHS19 - tmp19) / m_A60;
+	double tmp18 = 0.0;
+	tmp18 += m_A59 * V[23];
+	V[18] = (RHS18 - tmp18) / m_A58;
+	double tmp17 = 0.0;
+	tmp17 += m_A53 * V[26];
+	tmp17 += m_A54 * V[27];
+	tmp17 += m_A55 * V[30];
+	V[17] = (RHS17 - tmp17) / m_A52;
+	double tmp16 = 0.0;
+	tmp16 += m_A51 * V[26];
+	V[16] = (RHS16 - tmp16) / m_A50;
+	double tmp15 = 0.0;
+	tmp15 += m_A45 * V[22];
+	tmp15 += m_A46 * V[25];
+	tmp15 += m_A47 * V[27];
+	V[15] = (RHS15 - tmp15) / m_A44;
+	double tmp14 = 0.0;
+	tmp14 += m_A39 * V[28];
+	V[14] = (RHS14 - tmp14) / m_A38;
+	double tmp13 = 0.0;
+	tmp13 += m_A37 * V[28];
+	V[13] = (RHS13 - tmp13) / m_A36;
+	double tmp12 = 0.0;
+	tmp12 += m_A33 * V[23];
+	tmp12 += m_A34 * V[25];
+	tmp12 += m_A35 * V[29];
+	V[12] = (RHS12 - tmp12) / m_A32;
+	double tmp11 = 0.0;
+	tmp11 += m_A29 * V[22];
+	tmp11 += m_A30 * V[25];
+	tmp11 += m_A31 * V[27];
+	V[11] = (RHS11 - tmp11) / m_A28;
+	double tmp10 = 0.0;
+	tmp10 += m_A26 * V[11];
+	tmp10 += m_A27 * V[27];
+	V[10] = (RHS10 - tmp10) / m_A25;
+	double tmp9 = 0.0;
+	tmp9 += m_A23 * V[18];
+	tmp9 += m_A24 * V[23];
+	V[9] = (RHS9 - tmp9) / m_A22;
+	double tmp8 = 0.0;
+	tmp8 += m_A21 * V[21];
+	V[8] = (RHS8 - tmp8) / m_A20;
+	double tmp7 = 0.0;
+	tmp7 += m_A18 * V[16];
+	tmp7 += m_A19 * V[26];
+	V[7] = (RHS7 - tmp7) / m_A17;
+	double tmp6 = 0.0;
+	tmp6 += m_A16 * V[18];
+	V[6] = (RHS6 - tmp6) / m_A15;
+	double tmp5 = 0.0;
+	tmp5 += m_A14 * V[20];
+	V[5] = (RHS5 - tmp5) / m_A13;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[11];
+	tmp4 += m_A12 * V[22];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[16];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[4];
+	tmp2 += m_A6 * V[15];
+	tmp2 += m_A7 * V[22];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[22];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[15];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// astrob
+static void nl_gcr_339c6b457f339538_159_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
+	double m_A153(0.0);
+	double m_A154(0.0);
+	double m_A155(0.0);
+	double m_A156(0.0);
+	double m_A157(0.0);
+	double m_A158(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A4 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A6 += go[10];
+	m_A7 += go[11];
+	m_A8 += go[12];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	m_A9 += gt[13];
+	m_A9 += gt[14];
+	m_A10 += go[13];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[14] * *cnV[14];
+	m_A11 += gt[15];
+	m_A11 += gt[16];
+	m_A11 += gt[17];
+	m_A12 += go[15];
+	double RHS4 = Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 -= go[16] * *cnV[16];
+	RHS4 -= go[17] * *cnV[17];
+	m_A13 += gt[18];
+	m_A13 += gt[19];
+	m_A14 += go[18];
+	double RHS5 = Idr[18];
+	RHS5 += Idr[19];
+	RHS5 -= go[19] * *cnV[19];
+	m_A15 += gt[20];
+	m_A15 += gt[21];
+	m_A15 += gt[22];
+	m_A17 += go[20];
+	m_A16 += go[21];
+	double RHS6 = Idr[20];
+	RHS6 += Idr[21];
+	RHS6 += Idr[22];
+	RHS6 -= go[22] * *cnV[22];
+	m_A18 += gt[23];
+	m_A18 += gt[24];
+	m_A18 += gt[25];
+	m_A18 += gt[26];
+	m_A20 += go[23];
+	m_A21 += go[24];
+	m_A19 += go[25];
+	double RHS7 = Idr[23];
+	RHS7 += Idr[24];
+	RHS7 += Idr[25];
+	RHS7 += Idr[26];
+	RHS7 -= go[26] * *cnV[26];
+	m_A22 += gt[27];
+	m_A22 += gt[28];
+	m_A23 += go[27];
+	m_A24 += go[28];
+	double RHS8 = Idr[27];
+	RHS8 += Idr[28];
+	m_A25 += gt[29];
+	m_A25 += gt[30];
+	m_A25 += gt[31];
+	m_A27 += go[29];
+	m_A26 += go[30];
+	double RHS9 = Idr[29];
+	RHS9 += Idr[30];
+	RHS9 += Idr[31];
+	RHS9 -= go[31] * *cnV[31];
+	m_A28 += gt[32];
+	m_A28 += gt[33];
+	m_A28 += gt[34];
+	m_A30 += go[32];
+	m_A31 += go[33];
+	m_A29 += go[34];
+	double RHS10 = Idr[32];
+	RHS10 += Idr[33];
+	RHS10 += Idr[34];
+	m_A32 += gt[35];
+	m_A32 += gt[36];
+	m_A32 += gt[37];
+	m_A32 += gt[38];
+	m_A32 += gt[39];
+	m_A32 += gt[40];
+	m_A32 += gt[41];
+	m_A33 += go[35];
+	m_A34 += go[36];
+	double RHS11 = Idr[35];
+	RHS11 += Idr[36];
+	RHS11 += Idr[37];
+	RHS11 += Idr[38];
+	RHS11 += Idr[39];
+	RHS11 += Idr[40];
+	RHS11 += Idr[41];
+	RHS11 -= go[37] * *cnV[37];
+	RHS11 -= go[38] * *cnV[38];
+	RHS11 -= go[39] * *cnV[39];
+	RHS11 -= go[40] * *cnV[40];
+	RHS11 -= go[41] * *cnV[41];
+	m_A35 += gt[42];
+	m_A35 += gt[43];
+	m_A35 += gt[44];
+	m_A35 += gt[45];
+	m_A35 += gt[46];
+	m_A37 += go[42];
+	m_A36 += go[43];
+	double RHS12 = Idr[42];
+	RHS12 += Idr[43];
+	RHS12 += Idr[44];
+	RHS12 += Idr[45];
+	RHS12 += Idr[46];
+	RHS12 -= go[44] * *cnV[44];
+	RHS12 -= go[45] * *cnV[45];
+	RHS12 -= go[46] * *cnV[46];
+	m_A38 += gt[47];
+	m_A38 += gt[48];
+	m_A38 += gt[49];
+	m_A38 += gt[50];
+	m_A38 += gt[51];
+	m_A38 += gt[52];
+	m_A38 += gt[53];
+	m_A40 += go[47];
+	m_A39 += go[48];
+	double RHS13 = Idr[47];
+	RHS13 += Idr[48];
+	RHS13 += Idr[49];
+	RHS13 += Idr[50];
+	RHS13 += Idr[51];
+	RHS13 += Idr[52];
+	RHS13 += Idr[53];
+	RHS13 -= go[49] * *cnV[49];
+	RHS13 -= go[50] * *cnV[50];
+	RHS13 -= go[51] * *cnV[51];
+	RHS13 -= go[52] * *cnV[52];
+	RHS13 -= go[53] * *cnV[53];
+	m_A41 += gt[54];
+	m_A41 += gt[55];
+	m_A41 += gt[56];
+	m_A42 += go[54];
+	m_A44 += go[55];
+	m_A43 += go[56];
+	double RHS14 = Idr[54];
+	RHS14 += Idr[55];
+	RHS14 += Idr[56];
+	m_A45 += gt[57];
+	m_A45 += gt[58];
+	m_A45 += gt[59];
+	m_A46 += go[57];
+	double RHS15 = Idr[57];
+	RHS15 += Idr[58];
+	RHS15 += Idr[59];
+	RHS15 -= go[58] * *cnV[58];
+	RHS15 -= go[59] * *cnV[59];
+	m_A47 += gt[60];
+	m_A47 += gt[61];
+	m_A47 += gt[62];
+	m_A47 += gt[63];
+	m_A47 += gt[64];
+	m_A47 += gt[65];
+	m_A47 += gt[66];
+	m_A48 += go[60];
+	m_A49 += go[61];
+	double RHS16 = Idr[60];
+	RHS16 += Idr[61];
+	RHS16 += Idr[62];
+	RHS16 += Idr[63];
+	RHS16 += Idr[64];
+	RHS16 += Idr[65];
+	RHS16 += Idr[66];
+	RHS16 -= go[62] * *cnV[62];
+	RHS16 -= go[63] * *cnV[63];
+	RHS16 -= go[64] * *cnV[64];
+	RHS16 -= go[65] * *cnV[65];
+	RHS16 -= go[66] * *cnV[66];
+	m_A52 += gt[67];
+	m_A52 += gt[68];
+	m_A51 += go[67];
+	m_A50 += go[68];
+	double RHS17 = Idr[67];
+	RHS17 += Idr[68];
+	m_A56 += gt[69];
+	m_A56 += gt[70];
+	m_A56 += gt[71];
+	m_A56 += gt[72];
+	m_A56 += gt[73];
+	m_A59 += go[69];
+	m_A55 += go[70];
+	m_A58 += go[71];
+	double RHS18 = Idr[69];
+	RHS18 += Idr[70];
+	RHS18 += Idr[71];
+	RHS18 += Idr[72];
+	RHS18 += Idr[73];
+	RHS18 -= go[72] * *cnV[72];
+	RHS18 -= go[73] * *cnV[73];
+	m_A61 += gt[74];
+	m_A61 += gt[75];
+	m_A61 += gt[76];
+	m_A61 += gt[77];
+	m_A62 += go[74];
+	m_A60 += go[75];
+	double RHS19 = Idr[74];
+	RHS19 += Idr[75];
+	RHS19 += Idr[76];
+	RHS19 += Idr[77];
+	RHS19 -= go[76] * *cnV[76];
+	RHS19 -= go[77] * *cnV[77];
+	m_A65 += gt[78];
+	m_A65 += gt[79];
+	m_A63 += go[78];
+	m_A64 += go[79];
+	double RHS20 = Idr[78];
+	RHS20 += Idr[79];
+	m_A72 += gt[80];
+	m_A72 += gt[81];
+	m_A72 += gt[82];
+	m_A72 += gt[83];
+	m_A72 += gt[84];
+	m_A69 += go[80];
+	m_A68 += go[81];
+	m_A67 += go[82];
+	double RHS21 = Idr[80];
+	RHS21 += Idr[81];
+	RHS21 += Idr[82];
+	RHS21 += Idr[83];
+	RHS21 += Idr[84];
+	RHS21 -= go[83] * *cnV[83];
+	RHS21 -= go[84] * *cnV[84];
+	m_A79 += gt[85];
+	m_A79 += gt[86];
+	m_A79 += gt[87];
+	m_A79 += gt[88];
+	m_A79 += gt[89];
+	m_A75 += go[85];
+	m_A77 += go[86];
+	m_A76 += go[87];
+	double RHS22 = Idr[85];
+	RHS22 += Idr[86];
+	RHS22 += Idr[87];
+	RHS22 += Idr[88];
+	RHS22 += Idr[89];
+	RHS22 -= go[88] * *cnV[88];
+	RHS22 -= go[89] * *cnV[89];
+	m_A88 += gt[90];
+	m_A88 += gt[91];
+	m_A88 += gt[92];
+	m_A88 += gt[93];
+	m_A84 += go[90];
+	m_A91 += go[91];
+	m_A85 += go[92];
+	double RHS23 = Idr[90];
+	RHS23 += Idr[91];
+	RHS23 += Idr[92];
+	RHS23 += Idr[93];
+	RHS23 -= go[93] * *cnV[93];
+	m_A93 += gt[94];
+	m_A93 += gt[95];
+	m_A93 += gt[96];
+	m_A94 += go[94];
+	m_A95 += go[95];
+	m_A92 += go[96];
+	double RHS24 = Idr[94];
+	RHS24 += Idr[95];
+	RHS24 += Idr[96];
+	m_A97 += gt[97];
+	m_A97 += gt[98];
+	m_A97 += gt[99];
+	m_A99 += go[97];
+	m_A96 += go[98];
+	double RHS25 = Idr[97];
+	RHS25 += Idr[98];
+	RHS25 += Idr[99];
+	RHS25 -= go[99] * *cnV[99];
+	m_A108 += gt[100];
+	m_A108 += gt[101];
+	m_A108 += gt[102];
+	m_A108 += gt[103];
+	m_A108 += gt[104];
+	m_A101 += go[100];
+	m_A104 += go[101];
+	m_A100 += go[102];
+	m_A102 += go[103];
+	double RHS26 = Idr[100];
+	RHS26 += Idr[101];
+	RHS26 += Idr[102];
+	RHS26 += Idr[103];
+	RHS26 += Idr[104];
+	RHS26 -= go[104] * *cnV[104];
+	m_A117 += gt[105];
+	m_A117 += gt[106];
+	m_A117 += gt[107];
+	m_A117 += gt[108];
+	m_A117 += gt[109];
+	m_A117 += gt[110];
+	m_A120 += go[105];
+	m_A112 += go[106];
+	m_A113 += go[107];
+	double RHS27 = Idr[105];
+	RHS27 += Idr[106];
+	RHS27 += Idr[107];
+	RHS27 += Idr[108];
+	RHS27 += Idr[109];
+	RHS27 += Idr[110];
+	RHS27 -= go[108] * *cnV[108];
+	RHS27 -= go[109] * *cnV[109];
+	RHS27 -= go[110] * *cnV[110];
+	m_A125 += gt[111];
+	m_A125 += gt[112];
+	m_A122 += go[111];
+	m_A121 += go[112];
+	double RHS28 = Idr[111];
+	RHS28 += Idr[112];
+	m_A135 += gt[113];
+	m_A135 += gt[114];
+	m_A135 += gt[115];
+	m_A135 += gt[116];
+	m_A135 += gt[117];
+	m_A135 += gt[118];
+	m_A129 += go[113];
+	m_A131 += go[114];
+	m_A128 += go[115];
+	double RHS29 = Idr[113];
+	RHS29 += Idr[114];
+	RHS29 += Idr[115];
+	RHS29 += Idr[116];
+	RHS29 += Idr[117];
+	RHS29 += Idr[118];
+	RHS29 -= go[116] * *cnV[116];
+	RHS29 -= go[117] * *cnV[117];
+	RHS29 -= go[118] * *cnV[118];
+	m_A141 += gt[119];
+	m_A141 += gt[120];
+	m_A141 += gt[121];
+	m_A141 += gt[122];
+	m_A141 += gt[123];
+	m_A137 += go[119];
+	m_A138 += go[120];
+	m_A139 += go[121];
+	double RHS30 = Idr[119];
+	RHS30 += Idr[120];
+	RHS30 += Idr[121];
+	RHS30 += Idr[122];
+	RHS30 += Idr[123];
+	RHS30 -= go[122] * *cnV[122];
+	RHS30 -= go[123] * *cnV[123];
+	m_A149 += gt[124];
+	m_A149 += gt[125];
+	m_A149 += gt[126];
+	m_A149 += gt[127];
+	m_A149 += gt[128];
+	m_A149 += gt[129];
+	m_A146 += go[124];
+	m_A145 += go[125];
+	m_A147 += go[126];
+	m_A144 += go[127];
+	double RHS31 = Idr[124];
+	RHS31 += Idr[125];
+	RHS31 += Idr[126];
+	RHS31 += Idr[127];
+	RHS31 += Idr[128];
+	RHS31 += Idr[129];
+	RHS31 -= go[128] * *cnV[128];
+	RHS31 -= go[129] * *cnV[129];
+	m_A158 += gt[130];
+	m_A158 += gt[131];
+	m_A158 += gt[132];
+	m_A158 += gt[133];
+	m_A158 += gt[134];
+	m_A152 += go[130];
+	m_A151 += go[131];
+	m_A153 += go[132];
+	double RHS32 = Idr[130];
+	RHS32 += Idr[131];
+	RHS32 += Idr[132];
+	RHS32 += Idr[133];
+	RHS32 += Idr[134];
+	RHS32 -= go[133] * *cnV[133];
+	RHS32 -= go[134] * *cnV[134];
+	const double f0 = 1.0 / m_A0;
+	const double f0_17 = -f0 * m_A50;
+	m_A52 += m_A1 * f0_17;
+	RHS17 += f0_17 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_22 = -f1 * m_A75;
+	m_A76 += m_A3 * f1_22;
+	m_A78 += m_A4 * f1_22;
+	RHS22 += f1_22 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_18 = -f2 * m_A55;
+	m_A56 += m_A6 * f2_18;
+	m_A57 += m_A7 * f2_18;
+	m_A58 += m_A8 * f2_18;
+	RHS18 += f2_18 * RHS2;
+	const double f2_22 = -f2 * m_A76;
+	m_A78 += m_A6 * f2_22;
+	m_A79 += m_A7 * f2_22;
+	m_A81 += m_A8 * f2_22;
+	RHS22 += f2_22 * RHS2;
+	const double f2_26 = -f2 * m_A100;
+	m_A104 += m_A6 * f2_26;
+	m_A106 += m_A7 * f2_26;
+	m_A108 += m_A8 * f2_26;
+	RHS26 += f2_26 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_27 = -f3 * m_A112;
+	m_A117 += m_A10 * f3_27;
+	RHS27 += f3_27 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_20 = -f4 * m_A63;
+	m_A65 += m_A12 * f4_20;
+	RHS20 += f4_20 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_19 = -f5 * m_A60;
+	m_A61 += m_A14 * f5_19;
+	RHS19 += f5_19 * RHS5;
+	const double f6 = 1.0 / m_A15;
+	const double f6_26 = -f6 * m_A101;
+	m_A108 += m_A16 * f6_26;
+	m_A110 += m_A17 * f6_26;
+	RHS26 += f6_26 * RHS6;
+	const double f6_28 = -f6 * m_A121;
+	m_A123 += m_A16 * f6_28;
+	m_A125 += m_A17 * f6_28;
+	RHS28 += f6_28 * RHS6;
+	const double f7 = 1.0 / m_A18;
+	const double f7_17 = -f7 * m_A51;
+	m_A52 += m_A19 * f7_17;
+	m_A53 += m_A20 * f7_17;
+	m_A54 += m_A21 * f7_17;
+	RHS17 += f7_17 * RHS7;
+	const double f7_21 = -f7 * m_A67;
+	m_A70 += m_A19 * f7_21;
+	m_A72 += m_A20 * f7_21;
+	m_A74 += m_A21 * f7_21;
+	RHS21 += f7_21 * RHS7;
+	const double f7_26 = -f7 * m_A102;
+	m_A103 += m_A19 * f7_26;
+	m_A105 += m_A20 * f7_26;
+	m_A108 += m_A21 * f7_26;
+	RHS26 += f7_26 * RHS7;
+	const double f8 = 1.0 / m_A22;
+	const double f8_20 = -f8 * m_A64;
+	m_A65 += m_A23 * f8_20;
+	m_A66 += m_A24 * f8_20;
+	RHS20 += f8_20 * RHS8;
+	const double f8_21 = -f8 * m_A68;
+	m_A71 += m_A23 * f8_21;
+	m_A72 += m_A24 * f8_21;
+	RHS21 += f8_21 * RHS8;
+	const double f9 = 1.0 / m_A25;
+	const double f9_21 = -f9 * m_A69;
+	m_A72 += m_A26 * f9_21;
+	m_A73 += m_A27 * f9_21;
+	RHS21 += f9_21 * RHS9;
+	const double f9_23 = -f9 * m_A84;
+	m_A86 += m_A26 * f9_23;
+	m_A88 += m_A27 * f9_23;
+	RHS23 += f9_23 * RHS9;
+	const double f10 = 1.0 / m_A28;
+	const double f10_22 = -f10 * m_A77;
+	m_A79 += m_A29 * f10_22;
+	m_A80 += m_A30 * f10_22;
+	m_A83 += m_A31 * f10_22;
+	RHS22 += f10_22 * RHS10;
+	const double f10_23 = -f10 * m_A85;
+	m_A87 += m_A29 * f10_23;
+	m_A88 += m_A30 * f10_23;
+	m_A91 += m_A31 * f10_23;
+	RHS23 += f10_23 * RHS10;
+	const double f10_29 = -f10 * m_A128;
+	m_A130 += m_A29 * f10_29;
+	m_A131 += m_A30 * f10_29;
+	m_A135 += m_A31 * f10_29;
+	RHS29 += f10_29 * RHS10;
+	const double f11 = 1.0 / m_A32;
+	const double f11_29 = -f11 * m_A129;
+	m_A131 += m_A33 * f11_29;
+	m_A135 += m_A34 * f11_29;
+	RHS29 += f11_29 * RHS11;
+	const double f12 = 1.0 / m_A35;
+	const double f12_24 = -f12 * m_A92;
+	m_A93 += m_A36 * f12_24;
+	m_A95 += m_A37 * f12_24;
+	RHS24 += f12_24 * RHS12;
+	const double f12_32 = -f12 * m_A151;
+	m_A152 += m_A36 * f12_32;
+	m_A158 += m_A37 * f12_32;
+	RHS32 += f12_32 * RHS12;
+	const double f13 = 1.0 / m_A38;
+	const double f13_30 = -f13 * m_A137;
+	m_A139 += m_A39 * f13_30;
+	m_A143 += m_A40 * f13_30;
+	RHS30 += f13_30 * RHS13;
+	const double f14 = 1.0 / m_A41;
+	const double f14_25 = -f14 * m_A96;
+	m_A97 += m_A42 * f14_25;
+	m_A98 += m_A43 * f14_25;
+	m_A99 += m_A44 * f14_25;
+	RHS25 += f14_25 * RHS14;
+	const double f14_30 = -f14 * m_A138;
+	m_A140 += m_A42 * f14_30;
+	m_A141 += m_A43 * f14_30;
+	m_A142 += m_A44 * f14_30;
+	RHS30 += f14_30 * RHS14;
+	const double f14_31 = -f14 * m_A144;
+	m_A147 += m_A42 * f14_31;
+	m_A148 += m_A43 * f14_31;
+	m_A149 += m_A44 * f14_31;
+	RHS31 += f14_31 * RHS14;
+	const double f15 = 1.0 / m_A45;
+	const double f15_31 = -f15 * m_A145;
+	m_A149 += m_A46 * f15_31;
+	RHS31 += f15_31 * RHS15;
+	const double f16 = 1.0 / m_A47;
+	const double f16_31 = -f16 * m_A146;
+	m_A147 += m_A48 * f16_31;
+	m_A149 += m_A49 * f16_31;
+	RHS31 += f16_31 * RHS16;
+	const double f17 = 1.0 / m_A52;
+	const double f17_21 = -f17 * m_A70;
+	m_A72 += m_A53 * f17_21;
+	m_A74 += m_A54 * f17_21;
+	RHS21 += f17_21 * RHS17;
+	const double f17_26 = -f17 * m_A103;
+	m_A105 += m_A53 * f17_26;
+	m_A108 += m_A54 * f17_26;
+	RHS26 += f17_26 * RHS17;
+	const double f18 = 1.0 / m_A56;
+	const double f18_22 = -f18 * m_A78;
+	m_A79 += m_A57 * f18_22;
+	m_A81 += m_A58 * f18_22;
+	m_A82 += m_A59 * f18_22;
+	RHS22 += f18_22 * RHS18;
+	const double f18_26 = -f18 * m_A104;
+	m_A106 += m_A57 * f18_26;
+	m_A108 += m_A58 * f18_26;
+	m_A109 += m_A59 * f18_26;
+	RHS26 += f18_26 * RHS18;
+	const double f18_27 = -f18 * m_A113;
+	m_A114 += m_A57 * f18_27;
+	m_A116 += m_A58 * f18_27;
+	m_A117 += m_A59 * f18_27;
+	RHS27 += f18_27 * RHS18;
+	const double f19 = 1.0 / m_A61;
+	const double f19_28 = -f19 * m_A122;
+	m_A125 += m_A62 * f19_28;
+	RHS28 += f19_28 * RHS19;
+	const double f20 = 1.0 / m_A65;
+	const double f20_21 = -f20 * m_A71;
+	m_A72 += m_A66 * f20_21;
+	RHS21 += f20_21 * RHS20;
+	const double f21 = 1.0 / m_A72;
+	const double f21_23 = -f21 * m_A86;
+	m_A88 += m_A73 * f21_23;
+	m_A89 += m_A74 * f21_23;
+	RHS23 += f21_23 * RHS21;
+	const double f21_26 = -f21 * m_A105;
+	m_A107 += m_A73 * f21_26;
+	m_A108 += m_A74 * f21_26;
+	RHS26 += f21_26 * RHS21;
+	const double f22 = 1.0 / m_A79;
+	const double f22_23 = -f22 * m_A87;
+	m_A88 += m_A80 * f22_23;
+	m_A89 += m_A81 * f22_23;
+	m_A90 += m_A82 * f22_23;
+	m_A91 += m_A83 * f22_23;
+	RHS23 += f22_23 * RHS22;
+	const double f22_26 = -f22 * m_A106;
+	m_A107 += m_A80 * f22_26;
+	m_A108 += m_A81 * f22_26;
+	m_A109 += m_A82 * f22_26;
+	m_A111 += m_A83 * f22_26;
+	RHS26 += f22_26 * RHS22;
+	const double f22_27 = -f22 * m_A114;
+	m_A115 += m_A80 * f22_27;
+	m_A116 += m_A81 * f22_27;
+	m_A117 += m_A82 * f22_27;
+	m_A119 += m_A83 * f22_27;
+	RHS27 += f22_27 * RHS22;
+	const double f22_29 = -f22 * m_A130;
+	m_A131 += m_A80 * f22_29;
+	m_A132 += m_A81 * f22_29;
+	m_A133 += m_A82 * f22_29;
+	m_A135 += m_A83 * f22_29;
+	RHS29 += f22_29 * RHS22;
+	const double f23 = 1.0 / m_A88;
+	const double f23_26 = -f23 * m_A107;
+	m_A108 += m_A89 * f23_26;
+	m_A109 += m_A90 * f23_26;
+	m_A111 += m_A91 * f23_26;
+	RHS26 += f23_26 * RHS23;
+	const double f23_27 = -f23 * m_A115;
+	m_A116 += m_A89 * f23_27;
+	m_A117 += m_A90 * f23_27;
+	m_A119 += m_A91 * f23_27;
+	RHS27 += f23_27 * RHS23;
+	const double f23_29 = -f23 * m_A131;
+	m_A132 += m_A89 * f23_29;
+	m_A133 += m_A90 * f23_29;
+	m_A135 += m_A91 * f23_29;
+	RHS29 += f23_29 * RHS23;
+	const double f24 = 1.0 / m_A93;
+	const double f24_30 = -f24 * m_A139;
+	m_A141 += m_A94 * f24_30;
+	m_A143 += m_A95 * f24_30;
+	RHS30 += f24_30 * RHS24;
+	const double f24_32 = -f24 * m_A152;
+	m_A156 += m_A94 * f24_32;
+	m_A158 += m_A95 * f24_32;
+	RHS32 += f24_32 * RHS24;
+	const double f25 = 1.0 / m_A97;
+	const double f25_30 = -f25 * m_A140;
+	m_A141 += m_A98 * f25_30;
+	m_A142 += m_A99 * f25_30;
+	RHS30 += f25_30 * RHS25;
+	const double f25_31 = -f25 * m_A147;
+	m_A148 += m_A98 * f25_31;
+	m_A149 += m_A99 * f25_31;
+	RHS31 += f25_31 * RHS25;
+	const double f26 = 1.0 / m_A108;
+	const double f26_27 = -f26 * m_A116;
+	m_A117 += m_A109 * f26_27;
+	m_A118 += m_A110 * f26_27;
+	m_A119 += m_A111 * f26_27;
+	RHS27 += f26_27 * RHS26;
+	const double f26_28 = -f26 * m_A123;
+	m_A124 += m_A109 * f26_28;
+	m_A125 += m_A110 * f26_28;
+	m_A126 += m_A111 * f26_28;
+	RHS28 += f26_28 * RHS26;
+	const double f26_29 = -f26 * m_A132;
+	m_A133 += m_A109 * f26_29;
+	m_A134 += m_A110 * f26_29;
+	m_A135 += m_A111 * f26_29;
+	RHS29 += f26_29 * RHS26;
+	const double f27 = 1.0 / m_A117;
+	const double f27_28 = -f27 * m_A124;
+	m_A125 += m_A118 * f27_28;
+	m_A126 += m_A119 * f27_28;
+	m_A127 += m_A120 * f27_28;
+	RHS28 += f27_28 * RHS27;
+	const double f27_29 = -f27 * m_A133;
+	m_A134 += m_A118 * f27_29;
+	m_A135 += m_A119 * f27_29;
+	m_A136 += m_A120 * f27_29;
+	RHS29 += f27_29 * RHS27;
+	const double f27_32 = -f27 * m_A153;
+	m_A154 += m_A118 * f27_32;
+	m_A155 += m_A119 * f27_32;
+	m_A158 += m_A120 * f27_32;
+	RHS32 += f27_32 * RHS27;
+	const double f28 = 1.0 / m_A125;
+	const double f28_29 = -f28 * m_A134;
+	m_A135 += m_A126 * f28_29;
+	m_A136 += m_A127 * f28_29;
+	RHS29 += f28_29 * RHS28;
+	const double f28_32 = -f28 * m_A154;
+	m_A155 += m_A126 * f28_32;
+	m_A158 += m_A127 * f28_32;
+	RHS32 += f28_32 * RHS28;
+	const double f29 = 1.0 / m_A135;
+	const double f29_32 = -f29 * m_A155;
+	m_A158 += m_A136 * f29_32;
+	RHS32 += f29_32 * RHS29;
+	const double f30 = 1.0 / m_A141;
+	const double f30_31 = -f30 * m_A148;
+	m_A149 += m_A142 * f30_31;
+	m_A150 += m_A143 * f30_31;
+	RHS31 += f30_31 * RHS30;
+	const double f30_32 = -f30 * m_A156;
+	m_A157 += m_A142 * f30_32;
+	m_A158 += m_A143 * f30_32;
+	RHS32 += f30_32 * RHS30;
+	const double f31 = 1.0 / m_A149;
+	const double f31_32 = -f31 * m_A157;
+	m_A158 += m_A150 * f31_32;
+	RHS32 += f31_32 * RHS31;
+	V[32] = RHS32 / m_A158;
+	double tmp31 = 0.0;
+	tmp31 += m_A150 * V[32];
+	V[31] = (RHS31 - tmp31) / m_A149;
+	double tmp30 = 0.0;
+	tmp30 += m_A142 * V[31];
+	tmp30 += m_A143 * V[32];
+	V[30] = (RHS30 - tmp30) / m_A141;
+	double tmp29 = 0.0;
+	tmp29 += m_A136 * V[32];
+	V[29] = (RHS29 - tmp29) / m_A135;
+	double tmp28 = 0.0;
+	tmp28 += m_A126 * V[29];
+	tmp28 += m_A127 * V[32];
+	V[28] = (RHS28 - tmp28) / m_A125;
+	double tmp27 = 0.0;
+	tmp27 += m_A118 * V[28];
+	tmp27 += m_A119 * V[29];
+	tmp27 += m_A120 * V[32];
+	V[27] = (RHS27 - tmp27) / m_A117;
+	double tmp26 = 0.0;
+	tmp26 += m_A109 * V[27];
+	tmp26 += m_A110 * V[28];
+	tmp26 += m_A111 * V[29];
+	V[26] = (RHS26 - tmp26) / m_A108;
+	double tmp25 = 0.0;
+	tmp25 += m_A98 * V[30];
+	tmp25 += m_A99 * V[31];
+	V[25] = (RHS25 - tmp25) / m_A97;
+	double tmp24 = 0.0;
+	tmp24 += m_A94 * V[30];
+	tmp24 += m_A95 * V[32];
+	V[24] = (RHS24 - tmp24) / m_A93;
+	double tmp23 = 0.0;
+	tmp23 += m_A89 * V[26];
+	tmp23 += m_A90 * V[27];
+	tmp23 += m_A91 * V[29];
+	V[23] = (RHS23 - tmp23) / m_A88;
+	double tmp22 = 0.0;
+	tmp22 += m_A80 * V[23];
+	tmp22 += m_A81 * V[26];
+	tmp22 += m_A82 * V[27];
+	tmp22 += m_A83 * V[29];
+	V[22] = (RHS22 - tmp22) / m_A79;
+	double tmp21 = 0.0;
+	tmp21 += m_A73 * V[23];
+	tmp21 += m_A74 * V[26];
+	V[21] = (RHS21 - tmp21) / m_A72;
+	double tmp20 = 0.0;
+	tmp20 += m_A66 * V[21];
+	V[20] = (RHS20 - tmp20) / m_A65;
+	double tmp19 = 0.0;
+	tmp19 += m_A62 * V[28];
+	V[19] = (RHS19 - tmp19) / m_A61;
+	double tmp18 = 0.0;
+	tmp18 += m_A57 * V[22];
+	tmp18 += m_A58 * V[26];
+	tmp18 += m_A59 * V[27];
+	V[18] = (RHS18 - tmp18) / m_A56;
+	double tmp17 = 0.0;
+	tmp17 += m_A53 * V[21];
+	tmp17 += m_A54 * V[26];
+	V[17] = (RHS17 - tmp17) / m_A52;
+	double tmp16 = 0.0;
+	tmp16 += m_A48 * V[25];
+	tmp16 += m_A49 * V[31];
+	V[16] = (RHS16 - tmp16) / m_A47;
+	double tmp15 = 0.0;
+	tmp15 += m_A46 * V[31];
+	V[15] = (RHS15 - tmp15) / m_A45;
+	double tmp14 = 0.0;
+	tmp14 += m_A42 * V[25];
+	tmp14 += m_A43 * V[30];
+	tmp14 += m_A44 * V[31];
+	V[14] = (RHS14 - tmp14) / m_A41;
+	double tmp13 = 0.0;
+	tmp13 += m_A39 * V[24];
+	tmp13 += m_A40 * V[32];
+	V[13] = (RHS13 - tmp13) / m_A38;
+	double tmp12 = 0.0;
+	tmp12 += m_A36 * V[24];
+	tmp12 += m_A37 * V[32];
+	V[12] = (RHS12 - tmp12) / m_A35;
+	double tmp11 = 0.0;
+	tmp11 += m_A33 * V[23];
+	tmp11 += m_A34 * V[29];
+	V[11] = (RHS11 - tmp11) / m_A32;
+	double tmp10 = 0.0;
+	tmp10 += m_A29 * V[22];
+	tmp10 += m_A30 * V[23];
+	tmp10 += m_A31 * V[29];
+	V[10] = (RHS10 - tmp10) / m_A28;
+	double tmp9 = 0.0;
+	tmp9 += m_A26 * V[21];
+	tmp9 += m_A27 * V[23];
+	V[9] = (RHS9 - tmp9) / m_A25;
+	double tmp8 = 0.0;
+	tmp8 += m_A23 * V[20];
+	tmp8 += m_A24 * V[21];
+	V[8] = (RHS8 - tmp8) / m_A22;
+	double tmp7 = 0.0;
+	tmp7 += m_A19 * V[17];
+	tmp7 += m_A20 * V[21];
+	tmp7 += m_A21 * V[26];
+	V[7] = (RHS7 - tmp7) / m_A18;
+	double tmp6 = 0.0;
+	tmp6 += m_A16 * V[26];
+	tmp6 += m_A17 * V[28];
+	V[6] = (RHS6 - tmp6) / m_A15;
+	double tmp5 = 0.0;
+	tmp5 += m_A14 * V[19];
+	V[5] = (RHS5 - tmp5) / m_A13;
+	double tmp4 = 0.0;
+	tmp4 += m_A12 * V[20];
+	V[4] = (RHS4 - tmp4) / m_A11;
+	double tmp3 = 0.0;
+	tmp3 += m_A10 * V[27];
+	V[3] = (RHS3 - tmp3) / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[18];
+	tmp2 += m_A7 * V[22];
+	tmp2 += m_A8 * V[26];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[18];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[17];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// solarq
+static void nl_gcr_34e910fc1896999f_76_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A2 += gt[11];
+	m_A5 += go[4];
+	m_A4 += go[5];
+	m_A4 += go[6];
+	m_A3 += go[7];
+	m_A3 += go[8];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A7 += go[12];
+	double RHS2 = Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 += Idr[15];
+	RHS2 -= go[13] * *cnV[13];
+	RHS2 -= go[14] * *cnV[14];
+	RHS2 -= go[15] * *cnV[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A8 += gt[18];
+	m_A8 += gt[19];
+	m_A8 += gt[20];
+	m_A8 += gt[21];
+	m_A8 += gt[22];
+	m_A8 += gt[23];
+	m_A11 += go[16];
+	m_A10 += go[17];
+	m_A10 += go[18];
+	m_A9 += go[19];
+	m_A9 += go[20];
+	double RHS3 = Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 += Idr[20];
+	RHS3 += Idr[21];
+	RHS3 += Idr[22];
+	RHS3 += Idr[23];
+	RHS3 -= go[21] * *cnV[21];
+	RHS3 -= go[22] * *cnV[22];
+	RHS3 -= go[23] * *cnV[23];
+	m_A12 += gt[24];
+	m_A12 += gt[25];
+	m_A12 += gt[26];
+	m_A13 += go[24];
+	m_A14 += go[25];
+	double RHS4 = Idr[24];
+	RHS4 += Idr[25];
+	RHS4 += Idr[26];
+	RHS4 -= go[26] * *cnV[26];
+	m_A15 += gt[27];
+	m_A15 += gt[28];
+	m_A15 += gt[29];
+	m_A15 += gt[30];
+	m_A16 += go[27];
+	double RHS5 = Idr[27];
+	RHS5 += Idr[28];
+	RHS5 += Idr[29];
+	RHS5 += Idr[30];
+	RHS5 -= go[28] * *cnV[28];
+	RHS5 -= go[29] * *cnV[29];
+	RHS5 -= go[30] * *cnV[30];
+	m_A17 += gt[31];
+	m_A17 += gt[32];
+	m_A17 += gt[33];
+	m_A17 += gt[34];
+	m_A17 += gt[35];
+	m_A17 += gt[36];
+	m_A17 += gt[37];
+	m_A17 += gt[38];
+	m_A20 += go[31];
+	m_A19 += go[32];
+	m_A19 += go[33];
+	m_A18 += go[34];
+	m_A18 += go[35];
+	double RHS6 = Idr[31];
+	RHS6 += Idr[32];
+	RHS6 += Idr[33];
+	RHS6 += Idr[34];
+	RHS6 += Idr[35];
+	RHS6 += Idr[36];
+	RHS6 += Idr[37];
+	RHS6 += Idr[38];
+	RHS6 -= go[36] * *cnV[36];
+	RHS6 -= go[37] * *cnV[37];
+	RHS6 -= go[38] * *cnV[38];
+	m_A21 += gt[39];
+	m_A21 += gt[40];
+	m_A21 += gt[41];
+	m_A23 += go[39];
+	m_A22 += go[40];
+	double RHS7 = Idr[39];
+	RHS7 += Idr[40];
+	RHS7 += Idr[41];
+	RHS7 -= go[41] * *cnV[41];
+	m_A26 += gt[42];
+	m_A26 += gt[43];
+	m_A26 += gt[44];
+	m_A26 += gt[45];
+	m_A26 += gt[46];
+	m_A26 += gt[47];
+	m_A25 += go[42];
+	m_A25 += go[43];
+	m_A24 += go[44];
+	double RHS8 = Idr[42];
+	RHS8 += Idr[43];
+	RHS8 += Idr[44];
+	RHS8 += Idr[45];
+	RHS8 += Idr[46];
+	RHS8 += Idr[47];
+	RHS8 -= go[45] * *cnV[45];
+	RHS8 -= go[46] * *cnV[46];
+	RHS8 -= go[47] * *cnV[47];
+	m_A31 += gt[48];
+	m_A31 += gt[49];
+	m_A31 += gt[50];
+	m_A31 += gt[51];
+	m_A31 += gt[52];
+	m_A32 += go[48];
+	m_A32 += go[49];
+	m_A29 += go[50];
+	m_A29 += go[51];
+	double RHS9 = Idr[48];
+	RHS9 += Idr[49];
+	RHS9 += Idr[50];
+	RHS9 += Idr[51];
+	RHS9 += Idr[52];
+	RHS9 -= go[52] * *cnV[52];
+	m_A35 += gt[53];
+	m_A35 += gt[54];
+	m_A35 += gt[55];
+	m_A35 += gt[56];
+	m_A35 += gt[57];
+	m_A35 += gt[58];
+	m_A34 += go[53];
+	m_A34 += go[54];
+	m_A33 += go[55];
+	double RHS10 = Idr[53];
+	RHS10 += Idr[54];
+	RHS10 += Idr[55];
+	RHS10 += Idr[56];
+	RHS10 += Idr[57];
+	RHS10 += Idr[58];
+	RHS10 -= go[56] * *cnV[56];
+	RHS10 -= go[57] * *cnV[57];
+	RHS10 -= go[58] * *cnV[58];
+	m_A40 += gt[59];
+	m_A40 += gt[60];
+	m_A40 += gt[61];
+	m_A40 += gt[62];
+	m_A40 += gt[63];
+	m_A40 += gt[64];
+	m_A39 += go[59];
+	m_A39 += go[60];
+	m_A38 += go[61];
+	double RHS11 = Idr[59];
+	RHS11 += Idr[60];
+	RHS11 += Idr[61];
+	RHS11 += Idr[62];
+	RHS11 += Idr[63];
+	RHS11 += Idr[64];
+	RHS11 -= go[62] * *cnV[62];
+	RHS11 -= go[63] * *cnV[63];
+	RHS11 -= go[64] * *cnV[64];
+	m_A45 += gt[65];
+	m_A45 += gt[66];
+	m_A45 += gt[67];
+	m_A45 += gt[68];
+	m_A45 += gt[69];
+	m_A46 += go[65];
+	m_A46 += go[66];
+	m_A43 += go[67];
+	m_A43 += go[68];
+	double RHS12 = Idr[65];
+	RHS12 += Idr[66];
+	RHS12 += Idr[67];
+	RHS12 += Idr[68];
+	RHS12 += Idr[69];
+	RHS12 -= go[69] * *cnV[69];
+	m_A49 += gt[70];
+	m_A49 += gt[71];
+	m_A49 += gt[72];
+	m_A49 += gt[73];
+	m_A49 += gt[74];
+	m_A50 += go[70];
+	m_A50 += go[71];
+	m_A47 += go[72];
+	m_A47 += go[73];
+	double RHS13 = Idr[70];
+	RHS13 += Idr[71];
+	RHS13 += Idr[72];
+	RHS13 += Idr[73];
+	RHS13 += Idr[74];
+	RHS13 -= go[74] * *cnV[74];
+	m_A55 += gt[75];
+	m_A55 += gt[76];
+	m_A55 += gt[77];
+	m_A55 += gt[78];
+	m_A52 += go[75];
+	m_A54 += go[76];
+	m_A54 += go[77];
+	m_A51 += go[78];
+	double RHS14 = Idr[75];
+	RHS14 += Idr[76];
+	RHS14 += Idr[77];
+	RHS14 += Idr[78];
+	m_A60 += gt[79];
+	m_A60 += gt[80];
+	m_A60 += gt[81];
+	m_A60 += gt[82];
+	m_A58 += go[79];
+	m_A57 += go[80];
+	m_A62 += go[81];
+	double RHS15 = Idr[79];
+	RHS15 += Idr[80];
+	RHS15 += Idr[81];
+	RHS15 += Idr[82];
+	RHS15 -= go[82] * *cnV[82];
+	m_A68 += gt[83];
+	m_A68 += gt[84];
+	m_A68 += gt[85];
+	m_A68 += gt[86];
+	m_A64 += go[83];
+	m_A66 += go[84];
+	m_A66 += go[85];
+	m_A63 += go[86];
+	double RHS16 = Idr[83];
+	RHS16 += Idr[84];
+	RHS16 += Idr[85];
+	RHS16 += Idr[86];
+	m_A75 += gt[87];
+	m_A75 += gt[88];
+	m_A75 += gt[89];
+	m_A75 += gt[90];
+	m_A75 += gt[91];
+	m_A72 += go[87];
+	m_A72 += go[88];
+	m_A70 += go[89];
+	m_A73 += go[90];
+	double RHS17 = Idr[87];
+	RHS17 += Idr[88];
+	RHS17 += Idr[89];
+	RHS17 += Idr[90];
+	RHS17 += Idr[91];
+	RHS17 -= go[91] * *cnV[91];
+	const double f0 = 1.0 / m_A0;
+	const double f0_8 = -f0 * m_A24;
+	m_A26 += m_A1 * f0_8;
+	RHS8 += f0_8 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_8 = -f1 * m_A25;
+	m_A26 += m_A3 * f1_8;
+	m_A27 += m_A4 * f1_8;
+	m_A28 += m_A5 * f1_8;
+	RHS8 += f1_8 * RHS1;
+	const double f1_9 = -f1 * m_A29;
+	m_A30 += m_A3 * f1_9;
+	m_A31 += m_A4 * f1_9;
+	m_A32 += m_A5 * f1_9;
+	RHS9 += f1_9 * RHS1;
+	const double f1_17 = -f1 * m_A70;
+	m_A71 += m_A3 * f1_17;
+	m_A72 += m_A4 * f1_17;
+	m_A75 += m_A5 * f1_17;
+	RHS17 += f1_17 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_10 = -f2 * m_A33;
+	m_A35 += m_A7 * f2_10;
+	RHS10 += f2_10 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_10 = -f3 * m_A34;
+	m_A35 += m_A9 * f3_10;
+	m_A36 += m_A10 * f3_10;
+	m_A37 += m_A11 * f3_10;
+	RHS10 += f3_10 * RHS3;
+	const double f3_12 = -f3 * m_A43;
+	m_A44 += m_A9 * f3_12;
+	m_A45 += m_A10 * f3_12;
+	m_A46 += m_A11 * f3_12;
+	RHS12 += f3_12 * RHS3;
+	const double f3_14 = -f3 * m_A51;
+	m_A53 += m_A9 * f3_14;
+	m_A54 += m_A10 * f3_14;
+	m_A55 += m_A11 * f3_14;
+	RHS14 += f3_14 * RHS3;
+	const double f4 = 1.0 / m_A12;
+	const double f4_14 = -f4 * m_A52;
+	m_A55 += m_A13 * f4_14;
+	m_A56 += m_A14 * f4_14;
+	RHS14 += f4_14 * RHS4;
+	const double f4_15 = -f4 * m_A57;
+	m_A59 += m_A13 * f4_15;
+	m_A60 += m_A14 * f4_15;
+	RHS15 += f4_15 * RHS4;
+	const double f5 = 1.0 / m_A15;
+	const double f5_11 = -f5 * m_A38;
+	m_A40 += m_A16 * f5_11;
+	RHS11 += f5_11 * RHS5;
+	const double f6 = 1.0 / m_A17;
+	const double f6_11 = -f6 * m_A39;
+	m_A40 += m_A18 * f6_11;
+	m_A41 += m_A19 * f6_11;
+	m_A42 += m_A20 * f6_11;
+	RHS11 += f6_11 * RHS6;
+	const double f6_13 = -f6 * m_A47;
+	m_A48 += m_A18 * f6_13;
+	m_A49 += m_A19 * f6_13;
+	m_A50 += m_A20 * f6_13;
+	RHS13 += f6_13 * RHS6;
+	const double f6_16 = -f6 * m_A63;
+	m_A65 += m_A18 * f6_16;
+	m_A66 += m_A19 * f6_16;
+	m_A68 += m_A20 * f6_16;
+	RHS16 += f6_16 * RHS6;
+	const double f7 = 1.0 / m_A21;
+	const double f7_15 = -f7 * m_A58;
+	m_A60 += m_A22 * f7_15;
+	m_A61 += m_A23 * f7_15;
+	RHS15 += f7_15 * RHS7;
+	const double f7_16 = -f7 * m_A64;
+	m_A67 += m_A22 * f7_16;
+	m_A68 += m_A23 * f7_16;
+	RHS16 += f7_16 * RHS7;
+	const double f8 = 1.0 / m_A26;
+	const double f8_9 = -f8 * m_A30;
+	m_A31 += m_A27 * f8_9;
+	m_A32 += m_A28 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	const double f8_17 = -f8 * m_A71;
+	m_A72 += m_A27 * f8_17;
+	m_A75 += m_A28 * f8_17;
+	RHS17 += f8_17 * RHS8;
+	const double f9 = 1.0 / m_A31;
+	const double f9_17 = -f9 * m_A72;
+	m_A75 += m_A32 * f9_17;
+	RHS17 += f9_17 * RHS9;
+	const double f10 = 1.0 / m_A35;
+	const double f10_12 = -f10 * m_A44;
+	m_A45 += m_A36 * f10_12;
+	m_A46 += m_A37 * f10_12;
+	RHS12 += f10_12 * RHS10;
+	const double f10_14 = -f10 * m_A53;
+	m_A54 += m_A36 * f10_14;
+	m_A55 += m_A37 * f10_14;
+	RHS14 += f10_14 * RHS10;
+	const double f11 = 1.0 / m_A40;
+	const double f11_13 = -f11 * m_A48;
+	m_A49 += m_A41 * f11_13;
+	m_A50 += m_A42 * f11_13;
+	RHS13 += f11_13 * RHS11;
+	const double f11_16 = -f11 * m_A65;
+	m_A66 += m_A41 * f11_16;
+	m_A68 += m_A42 * f11_16;
+	RHS16 += f11_16 * RHS11;
+	const double f12 = 1.0 / m_A45;
+	const double f12_14 = -f12 * m_A54;
+	m_A55 += m_A46 * f12_14;
+	RHS14 += f12_14 * RHS12;
+	const double f13 = 1.0 / m_A49;
+	const double f13_16 = -f13 * m_A66;
+	m_A68 += m_A50 * f13_16;
+	RHS16 += f13_16 * RHS13;
+	const double f14 = 1.0 / m_A55;
+	const double f14_15 = -f14 * m_A59;
+	m_A60 += m_A56 * f14_15;
+	RHS15 += f14_15 * RHS14;
+	const double f15 = 1.0 / m_A60;
+	const double f15_16 = -f15 * m_A67;
+	m_A68 += m_A61 * f15_16;
+	m_A69 += m_A62 * f15_16;
+	RHS16 += f15_16 * RHS15;
+	const double f15_17 = -f15 * m_A73;
+	m_A74 += m_A61 * f15_17;
+	m_A75 += m_A62 * f15_17;
+	RHS17 += f15_17 * RHS15;
+	const double f16 = 1.0 / m_A68;
+	const double f16_17 = -f16 * m_A74;
+	m_A75 += m_A69 * f16_17;
+	RHS17 += f16_17 * RHS16;
+	V[17] = RHS17 / m_A75;
+	double tmp16 = 0.0;
+	tmp16 += m_A69 * V[17];
+	V[16] = (RHS16 - tmp16) / m_A68;
+	double tmp15 = 0.0;
+	tmp15 += m_A61 * V[16];
+	tmp15 += m_A62 * V[17];
+	V[15] = (RHS15 - tmp15) / m_A60;
+	double tmp14 = 0.0;
+	tmp14 += m_A56 * V[15];
+	V[14] = (RHS14 - tmp14) / m_A55;
+	double tmp13 = 0.0;
+	tmp13 += m_A50 * V[16];
+	V[13] = (RHS13 - tmp13) / m_A49;
+	double tmp12 = 0.0;
+	tmp12 += m_A46 * V[14];
+	V[12] = (RHS12 - tmp12) / m_A45;
+	double tmp11 = 0.0;
+	tmp11 += m_A41 * V[13];
+	tmp11 += m_A42 * V[16];
+	V[11] = (RHS11 - tmp11) / m_A40;
+	double tmp10 = 0.0;
+	tmp10 += m_A36 * V[12];
+	tmp10 += m_A37 * V[14];
+	V[10] = (RHS10 - tmp10) / m_A35;
+	double tmp9 = 0.0;
+	tmp9 += m_A32 * V[17];
+	V[9] = (RHS9 - tmp9) / m_A31;
+	double tmp8 = 0.0;
+	tmp8 += m_A27 * V[9];
+	tmp8 += m_A28 * V[17];
+	V[8] = (RHS8 - tmp8) / m_A26;
+	double tmp7 = 0.0;
+	tmp7 += m_A22 * V[15];
+	tmp7 += m_A23 * V[16];
+	V[7] = (RHS7 - tmp7) / m_A21;
+	double tmp6 = 0.0;
+	tmp6 += m_A18 * V[11];
+	tmp6 += m_A19 * V[13];
+	tmp6 += m_A20 * V[16];
+	V[6] = (RHS6 - tmp6) / m_A17;
+	double tmp5 = 0.0;
+	tmp5 += m_A16 * V[11];
+	V[5] = (RHS5 - tmp5) / m_A15;
+	double tmp4 = 0.0;
+	tmp4 += m_A13 * V[14];
+	tmp4 += m_A14 * V[15];
+	V[4] = (RHS4 - tmp4) / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[10];
+	tmp3 += m_A10 * V[12];
+	tmp3 += m_A11 * V[14];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[10];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[8];
+	tmp1 += m_A4 * V[9];
+	tmp1 += m_A5 * V[17];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[8];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// sspeedr
+static void nl_gcr_3e833834e5ce5aee_13_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	m_A0 += gt[0];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	m_A2 += gt[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[1];
+	double RHS1 = Idr[1];
+	RHS1 += Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[2] * *cnV[2];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 -= go[5] * *cnV[5];
+	m_A8 += gt[6];
+	m_A8 += gt[7];
+	m_A8 += gt[8];
+	m_A9 += go[6];
+	m_A7 += go[7];
+	m_A6 += go[8];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	RHS3 += Idr[8];
+	m_A12 += gt[9];
+	m_A12 += gt[10];
+	m_A12 += gt[11];
+	m_A10 += go[9];
+	m_A11 += go[10];
+	double RHS4 = Idr[9];
+	RHS4 += Idr[10];
+	RHS4 += Idr[11];
+	RHS4 -= go[11] * *cnV[11];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A6;
+	m_A8 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A7;
+	m_A8 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_4 = -f2 * m_A10;
+	m_A12 += m_A5 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_4 = -f3 * m_A11;
+	m_A12 += m_A9 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	V[4] = RHS4 / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// astrob
+static void nl_gcr_41c6441d98369158_20_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A4 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	m_A5 += gt[5];
+	m_A5 += gt[6];
+	m_A5 += gt[7];
+	m_A7 += go[5];
+	m_A6 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[7] * *cnV[7];
+	m_A10 += gt[8];
+	m_A10 += gt[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A9 += go[8];
+	m_A8 += go[9];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	m_A15 += gt[12];
+	m_A15 += gt[13];
+	m_A15 += gt[14];
+	m_A15 += gt[15];
+	m_A13 += go[12];
+	m_A12 += go[13];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 += Idr[15];
+	RHS4 -= go[14] * *cnV[14];
+	RHS4 -= go[15] * *cnV[15];
+	m_A19 += gt[16];
+	m_A19 += gt[17];
+	m_A17 += go[16];
+	double RHS5 = Idr[16];
+	RHS5 += Idr[17];
+	RHS5 -= go[17] * *cnV[17];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A10 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f1_4 = -f1 * m_A12;
+	m_A14 += m_A3 * f1_4;
+	m_A15 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_4 = -f2 * m_A13;
+	m_A15 += m_A6 * f2_4;
+	m_A16 += m_A7 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_5 = -f2 * m_A17;
+	m_A18 += m_A6 * f2_5;
+	m_A19 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_4 = -f3 * m_A14;
+	m_A15 += m_A11 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f4 = 1.0 / m_A15;
+	const double f4_5 = -f4 * m_A18;
+	m_A19 += m_A16 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A19;
+	double tmp4 = 0.0;
+	tmp4 += m_A16 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A15;
+	double tmp3 = 0.0;
+	tmp3 += m_A11 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A10;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[4];
+	tmp2 += m_A7 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	tmp1 += m_A4 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// warrior
+static void nl_gcr_42a31ce5c187b308_12_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A4 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	m_A7 += gt[5];
+	m_A7 += gt[6];
+	m_A7 += gt[7];
+	m_A6 += go[5];
+	m_A5 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[7] * *cnV[7];
+	m_A11 += gt[8];
+	m_A9 += go[8];
+	double RHS3 = Idr[8];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A5;
+	m_A7 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A6;
+	m_A7 += m_A3 * f1_2;
+	m_A8 += m_A4 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A7;
+	const double f2_3 = -f2 * m_A10;
+	m_A11 += m_A8 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A11;
+	double tmp2 = 0.0;
+	tmp2 += m_A8 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A7;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// 280zzzap
+static void nl_gcr_42c57d523cac30d0_122_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 -= go[5] * *cnV[5];
+	RHS2 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A7 += go[7];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 += Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 -= go[8] * *cnV[8];
+	RHS3 -= go[9] * *cnV[9];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A9 += go[14];
+	double RHS4 = Idr[14];
+	RHS4 += Idr[15];
+	RHS4 -= go[15] * *cnV[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A12 += go[16];
+	m_A13 += go[17];
+	m_A11 += go[18];
+	double RHS5 = Idr[16];
+	RHS5 += Idr[17];
+	RHS5 += Idr[18];
+	RHS5 += Idr[19];
+	RHS5 -= go[19] * *cnV[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A14 += gt[22];
+	m_A14 += gt[23];
+	m_A14 += gt[24];
+	m_A14 += gt[25];
+	m_A14 += gt[26];
+	m_A15 += go[20];
+	double RHS6 = Idr[20];
+	RHS6 += Idr[21];
+	RHS6 += Idr[22];
+	RHS6 += Idr[23];
+	RHS6 += Idr[24];
+	RHS6 += Idr[25];
+	RHS6 += Idr[26];
+	RHS6 -= go[21] * *cnV[21];
+	RHS6 -= go[22] * *cnV[22];
+	RHS6 -= go[23] * *cnV[23];
+	RHS6 -= go[24] * *cnV[24];
+	RHS6 -= go[25] * *cnV[25];
+	RHS6 -= go[26] * *cnV[26];
+	m_A16 += gt[27];
+	m_A16 += gt[28];
+	m_A18 += go[27];
+	m_A17 += go[28];
+	double RHS7 = Idr[27];
+	RHS7 += Idr[28];
+	m_A19 += gt[29];
+	m_A19 += gt[30];
+	m_A19 += gt[31];
+	m_A20 += go[29];
+	double RHS8 = Idr[29];
+	RHS8 += Idr[30];
+	RHS8 += Idr[31];
+	RHS8 -= go[30] * *cnV[30];
+	RHS8 -= go[31] * *cnV[31];
+	m_A21 += gt[32];
+	m_A21 += gt[33];
+	m_A22 += go[32];
+	double RHS9 = Idr[32];
+	RHS9 += Idr[33];
+	RHS9 -= go[33] * *cnV[33];
+	m_A23 += gt[34];
+	m_A23 += gt[35];
+	m_A23 += gt[36];
+	m_A24 += go[34];
+	m_A25 += go[35];
+	m_A25 += go[36];
+	double RHS10 = Idr[34];
+	RHS10 += Idr[35];
+	RHS10 += Idr[36];
+	m_A26 += gt[37];
+	m_A26 += gt[38];
+	m_A26 += gt[39];
+	m_A26 += gt[40];
+	m_A26 += gt[41];
+	m_A26 += gt[42];
+	m_A26 += gt[43];
+	m_A27 += go[37];
+	double RHS11 = Idr[37];
+	RHS11 += Idr[38];
+	RHS11 += Idr[39];
+	RHS11 += Idr[40];
+	RHS11 += Idr[41];
+	RHS11 += Idr[42];
+	RHS11 += Idr[43];
+	RHS11 -= go[38] * *cnV[38];
+	RHS11 -= go[39] * *cnV[39];
+	RHS11 -= go[40] * *cnV[40];
+	RHS11 -= go[41] * *cnV[41];
+	RHS11 -= go[42] * *cnV[42];
+	RHS11 -= go[43] * *cnV[43];
+	m_A28 += gt[44];
+	m_A28 += gt[45];
+	m_A28 += gt[46];
+	m_A29 += go[44];
+	double RHS12 = Idr[44];
+	RHS12 += Idr[45];
+	RHS12 += Idr[46];
+	RHS12 -= go[45] * *cnV[45];
+	RHS12 -= go[46] * *cnV[46];
+	m_A30 += gt[47];
+	m_A30 += gt[48];
+	m_A30 += gt[49];
+	m_A30 += gt[50];
+	m_A32 += go[47];
+	m_A31 += go[48];
+	m_A33 += go[49];
+	double RHS13 = Idr[47];
+	RHS13 += Idr[48];
+	RHS13 += Idr[49];
+	RHS13 += Idr[50];
+	RHS13 -= go[50] * *cnV[50];
+	m_A35 += gt[51];
+	m_A35 += gt[52];
+	m_A34 += go[51];
+	double RHS14 = Idr[51];
+	RHS14 += Idr[52];
+	RHS14 -= go[52] * *cnV[52];
+	m_A37 += gt[53];
+	m_A37 += gt[54];
+	m_A37 += gt[55];
+	m_A37 += gt[56];
+	m_A36 += go[53];
+	m_A38 += go[54];
+	double RHS15 = Idr[53];
+	RHS15 += Idr[54];
+	RHS15 += Idr[55];
+	RHS15 += Idr[56];
+	RHS15 -= go[55] * *cnV[55];
+	RHS15 -= go[56] * *cnV[56];
+	m_A40 += gt[57];
+	m_A40 += gt[58];
+	m_A39 += go[57];
+	double RHS16 = Idr[57];
+	RHS16 += Idr[58];
+	RHS16 -= go[58] * *cnV[58];
+	m_A43 += gt[59];
+	m_A43 += gt[60];
+	m_A41 += go[59];
+	m_A42 += go[60];
+	double RHS17 = Idr[59];
+	RHS17 += Idr[60];
+	m_A47 += gt[61];
+	m_A47 += gt[62];
+	m_A47 += gt[63];
+	m_A47 += gt[64];
+	m_A47 += gt[65];
+	m_A46 += go[61];
+	m_A49 += go[62];
+	m_A50 += go[63];
+	double RHS18 = Idr[61];
+	RHS18 += Idr[62];
+	RHS18 += Idr[63];
+	RHS18 += Idr[64];
+	RHS18 += Idr[65];
+	RHS18 -= go[64] * *cnV[64];
+	RHS18 -= go[65] * *cnV[65];
+	m_A52 += gt[66];
+	m_A52 += gt[67];
+	m_A51 += go[66];
+	double RHS19 = Idr[66];
+	RHS19 += Idr[67];
+	RHS19 -= go[67] * *cnV[67];
+	m_A55 += gt[68];
+	m_A55 += gt[69];
+	m_A54 += go[68];
+	m_A53 += go[69];
+	double RHS20 = Idr[68];
+	RHS20 += Idr[69];
+	m_A60 += gt[70];
+	m_A60 += gt[71];
+	m_A60 += gt[72];
+	m_A60 += gt[73];
+	m_A59 += go[70];
+	m_A61 += go[71];
+	double RHS21 = Idr[70];
+	RHS21 += Idr[71];
+	RHS21 += Idr[72];
+	RHS21 += Idr[73];
+	RHS21 -= go[72] * *cnV[72];
+	RHS21 -= go[73] * *cnV[73];
+	m_A69 += gt[74];
+	m_A69 += gt[75];
+	m_A69 += gt[76];
+	m_A69 += gt[77];
+	m_A69 += gt[78];
+	m_A69 += gt[79];
+	m_A69 += gt[80];
+	m_A69 += gt[81];
+	m_A69 += gt[82];
+	m_A62 += go[74];
+	m_A65 += go[75];
+	m_A65 += go[76];
+	m_A64 += go[77];
+	m_A63 += go[78];
+	m_A71 += go[79];
+	double RHS22 = Idr[74];
+	RHS22 += Idr[75];
+	RHS22 += Idr[76];
+	RHS22 += Idr[77];
+	RHS22 += Idr[78];
+	RHS22 += Idr[79];
+	RHS22 += Idr[80];
+	RHS22 += Idr[81];
+	RHS22 += Idr[82];
+	RHS22 -= go[80] * *cnV[80];
+	RHS22 -= go[81] * *cnV[81];
+	RHS22 -= go[82] * *cnV[82];
+	m_A75 += gt[83];
+	m_A75 += gt[84];
+	m_A75 += gt[85];
+	m_A75 += gt[86];
+	m_A74 += go[83];
+	m_A76 += go[84];
+	double RHS23 = Idr[83];
+	RHS23 += Idr[84];
+	RHS23 += Idr[85];
+	RHS23 += Idr[86];
+	RHS23 -= go[85] * *cnV[85];
+	RHS23 -= go[86] * *cnV[86];
+	m_A82 += gt[87];
+	m_A82 += gt[88];
+	m_A82 += gt[89];
+	m_A82 += gt[90];
+	m_A82 += gt[91];
+	m_A82 += gt[92];
+	m_A77 += go[87];
+	m_A78 += go[88];
+	m_A84 += go[89];
+	double RHS24 = Idr[87];
+	RHS24 += Idr[88];
+	RHS24 += Idr[89];
+	RHS24 += Idr[90];
+	RHS24 += Idr[91];
+	RHS24 += Idr[92];
+	RHS24 -= go[90] * *cnV[90];
+	RHS24 -= go[91] * *cnV[91];
+	RHS24 -= go[92] * *cnV[92];
+	m_A93 += gt[93];
+	m_A93 += gt[94];
+	m_A93 += gt[95];
+	m_A93 += gt[96];
+	m_A93 += gt[97];
+	m_A91 += go[93];
+	m_A89 += go[94];
+	m_A88 += go[95];
+	m_A87 += go[96];
+	m_A86 += go[97];
+	double RHS25 = Idr[93];
+	RHS25 += Idr[94];
+	RHS25 += Idr[95];
+	RHS25 += Idr[96];
+	RHS25 += Idr[97];
+	m_A104 += gt[98];
+	m_A104 += gt[99];
+	m_A104 += gt[100];
+	m_A104 += gt[101];
+	m_A104 += gt[102];
+	m_A102 += go[98];
+	m_A99 += go[99];
+	m_A98 += go[100];
+	m_A97 += go[101];
+	m_A96 += go[102];
+	double RHS26 = Idr[98];
+	RHS26 += Idr[99];
+	RHS26 += Idr[100];
+	RHS26 += Idr[101];
+	RHS26 += Idr[102];
+	m_A113 += gt[103];
+	m_A113 += gt[104];
+	m_A113 += gt[105];
+	m_A113 += gt[106];
+	m_A107 += go[103];
+	m_A106 += go[104];
+	m_A114 += go[105];
+	double RHS27 = Idr[103];
+	RHS27 += Idr[104];
+	RHS27 += Idr[105];
+	RHS27 += Idr[106];
+	RHS27 -= go[106] * *cnV[106];
+	m_A121 += gt[107];
+	m_A121 += gt[108];
+	m_A121 += gt[109];
+	m_A121 += gt[110];
+	m_A121 += gt[111];
+	m_A118 += go[107];
+	m_A117 += go[108];
+	m_A120 += go[109];
+	m_A116 += go[110];
+	m_A115 += go[111];
+	double RHS28 = Idr[107];
+	RHS28 += Idr[108];
+	RHS28 += Idr[109];
+	RHS28 += Idr[110];
+	RHS28 += Idr[111];
+	const double f0 = 1.0 / m_A0;
+	const double f0_17 = -f0 * m_A41;
+	m_A43 += m_A1 * f0_17;
+	RHS17 += f0_17 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_14 = -f1 * m_A34;
+	m_A35 += m_A3 * f1_14;
+	RHS14 += f1_14 * RHS1;
+	const double f1_25 = -f1 * m_A86;
+	m_A89 += m_A3 * f1_25;
+	RHS25 += f1_25 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_15 = -f2 * m_A36;
+	m_A38 += m_A5 * f2_15;
+	RHS15 += f2_15 * RHS2;
+	const double f2_25 = -f2 * m_A87;
+	m_A93 += m_A5 * f2_25;
+	RHS25 += f2_25 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_22 = -f3 * m_A62;
+	m_A66 += m_A7 * f3_22;
+	RHS22 += f3_22 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_16 = -f4 * m_A39;
+	m_A40 += m_A9 * f4_16;
+	RHS16 += f4_16 * RHS4;
+	const double f4_28 = -f4 * m_A115;
+	m_A117 += m_A9 * f4_28;
+	RHS28 += f4_28 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_17 = -f5 * m_A42;
+	m_A43 += m_A11 * f5_17;
+	m_A44 += m_A12 * f5_17;
+	m_A45 += m_A13 * f5_17;
+	RHS17 += f5_17 * RHS5;
+	const double f5_22 = -f5 * m_A63;
+	m_A67 += m_A11 * f5_22;
+	m_A69 += m_A12 * f5_22;
+	m_A71 += m_A13 * f5_22;
+	RHS22 += f5_22 * RHS5;
+	const double f5_25 = -f5 * m_A88;
+	m_A90 += m_A11 * f5_25;
+	m_A91 += m_A12 * f5_25;
+	m_A93 += m_A13 * f5_25;
+	RHS25 += f5_25 * RHS5;
+	const double f6 = 1.0 / m_A14;
+	const double f6_18 = -f6 * m_A46;
+	m_A48 += m_A15 * f6_18;
+	RHS18 += f6_18 * RHS6;
+	const double f7 = 1.0 / m_A16;
+	const double f7_22 = -f7 * m_A64;
+	m_A69 += m_A17 * f7_22;
+	m_A73 += m_A18 * f7_22;
+	RHS22 += f7_22 * RHS7;
+	const double f7_27 = -f7 * m_A106;
+	m_A109 += m_A17 * f7_27;
+	m_A113 += m_A18 * f7_27;
+	RHS27 += f7_27 * RHS7;
+	const double f8 = 1.0 / m_A19;
+	const double f8_21 = -f8 * m_A59;
+	m_A61 += m_A20 * f8_21;
+	RHS21 += f8_21 * RHS8;
+	const double f8_28 = -f8 * m_A116;
+	m_A121 += m_A20 * f8_28;
+	RHS28 += f8_28 * RHS8;
+	const double f9 = 1.0 / m_A21;
+	const double f9_19 = -f9 * m_A51;
+	m_A52 += m_A22 * f9_19;
+	RHS19 += f9_19 * RHS9;
+	const double f9_26 = -f9 * m_A96;
+	m_A99 += m_A22 * f9_26;
+	RHS26 += f9_26 * RHS9;
+	const double f10 = 1.0 / m_A23;
+	const double f10_20 = -f10 * m_A53;
+	m_A55 += m_A24 * f10_20;
+	m_A56 += m_A25 * f10_20;
+	RHS20 += f10_20 * RHS10;
+	const double f10_22 = -f10 * m_A65;
+	m_A68 += m_A24 * f10_22;
+	m_A69 += m_A25 * f10_22;
+	RHS22 += f10_22 * RHS10;
+	const double f11 = 1.0 / m_A26;
+	const double f11_24 = -f11 * m_A77;
+	m_A81 += m_A27 * f11_24;
+	RHS24 += f11_24 * RHS11;
+	const double f12 = 1.0 / m_A28;
+	const double f12_23 = -f12 * m_A74;
+	m_A76 += m_A29 * f12_23;
+	RHS23 += f12_23 * RHS12;
+	const double f12_26 = -f12 * m_A97;
+	m_A104 += m_A29 * f12_26;
+	RHS26 += f12_26 * RHS12;
+	const double f13 = 1.0 / m_A30;
+	const double f13_20 = -f13 * m_A54;
+	m_A55 += m_A31 * f13_20;
+	m_A57 += m_A32 * f13_20;
+	m_A58 += m_A33 * f13_20;
+	RHS20 += f13_20 * RHS13;
+	const double f13_24 = -f13 * m_A78;
+	m_A79 += m_A31 * f13_24;
+	m_A82 += m_A32 * f13_24;
+	m_A84 += m_A33 * f13_24;
+	RHS24 += f13_24 * RHS13;
+	const double f13_26 = -f13 * m_A98;
+	m_A100 += m_A31 * f13_26;
+	m_A102 += m_A32 * f13_26;
+	m_A104 += m_A33 * f13_26;
+	RHS26 += f13_26 * RHS13;
+	const double f14 = 1.0 / m_A35;
+	const double f14_25 = -f14 * m_A89;
+	RHS25 += f14_25 * RHS14;
+	const double f15 = 1.0 / m_A37;
+	const double f15_22 = -f15 * m_A66;
+	m_A71 += m_A38 * f15_22;
+	RHS22 += f15_22 * RHS15;
+	const double f16 = 1.0 / m_A40;
+	const double f16_28 = -f16 * m_A117;
+	RHS28 += f16_28 * RHS16;
+	const double f17 = 1.0 / m_A43;
+	const double f17_22 = -f17 * m_A67;
+	m_A69 += m_A44 * f17_22;
+	m_A71 += m_A45 * f17_22;
+	RHS22 += f17_22 * RHS17;
+	const double f17_25 = -f17 * m_A90;
+	m_A91 += m_A44 * f17_25;
+	m_A93 += m_A45 * f17_25;
+	RHS25 += f17_25 * RHS17;
+	const double f18 = 1.0 / m_A47;
+	const double f18_27 = -f18 * m_A107;
+	m_A108 += m_A48 * f18_27;
+	m_A113 += m_A49 * f18_27;
+	m_A114 += m_A50 * f18_27;
+	RHS27 += f18_27 * RHS18;
+	const double f18_28 = -f18 * m_A118;
+	m_A119 += m_A48 * f18_28;
+	m_A120 += m_A49 * f18_28;
+	m_A121 += m_A50 * f18_28;
+	RHS28 += f18_28 * RHS18;
+	const double f19 = 1.0 / m_A52;
+	const double f19_26 = -f19 * m_A99;
+	RHS26 += f19_26 * RHS19;
+	const double f20 = 1.0 / m_A55;
+	const double f20_22 = -f20 * m_A68;
+	m_A69 += m_A56 * f20_22;
+	m_A70 += m_A57 * f20_22;
+	m_A72 += m_A58 * f20_22;
+	RHS22 += f20_22 * RHS20;
+	const double f20_24 = -f20 * m_A79;
+	m_A80 += m_A56 * f20_24;
+	m_A82 += m_A57 * f20_24;
+	m_A84 += m_A58 * f20_24;
+	RHS24 += f20_24 * RHS20;
+	const double f20_26 = -f20 * m_A100;
+	m_A101 += m_A56 * f20_26;
+	m_A102 += m_A57 * f20_26;
+	m_A104 += m_A58 * f20_26;
+	RHS26 += f20_26 * RHS20;
+	const double f21 = 1.0 / m_A60;
+	const double f21_27 = -f21 * m_A108;
+	m_A114 += m_A61 * f21_27;
+	RHS27 += f21_27 * RHS21;
+	const double f21_28 = -f21 * m_A119;
+	m_A121 += m_A61 * f21_28;
+	RHS28 += f21_28 * RHS21;
+	const double f22 = 1.0 / m_A69;
+	const double f22_24 = -f22 * m_A80;
+	m_A82 += m_A70 * f22_24;
+	m_A83 += m_A71 * f22_24;
+	m_A84 += m_A72 * f22_24;
+	m_A85 += m_A73 * f22_24;
+	RHS24 += f22_24 * RHS22;
+	const double f22_25 = -f22 * m_A91;
+	m_A92 += m_A70 * f22_25;
+	m_A93 += m_A71 * f22_25;
+	m_A94 += m_A72 * f22_25;
+	m_A95 += m_A73 * f22_25;
+	RHS25 += f22_25 * RHS22;
+	const double f22_26 = -f22 * m_A101;
+	m_A102 += m_A70 * f22_26;
+	m_A103 += m_A71 * f22_26;
+	m_A104 += m_A72 * f22_26;
+	m_A105 += m_A73 * f22_26;
+	RHS26 += f22_26 * RHS22;
+	const double f22_27 = -f22 * m_A109;
+	m_A110 += m_A70 * f22_27;
+	m_A111 += m_A71 * f22_27;
+	m_A112 += m_A72 * f22_27;
+	m_A113 += m_A73 * f22_27;
+	RHS27 += f22_27 * RHS22;
+	const double f23 = 1.0 / m_A75;
+	const double f23_24 = -f23 * m_A81;
+	m_A84 += m_A76 * f23_24;
+	RHS24 += f23_24 * RHS23;
+	const double f24 = 1.0 / m_A82;
+	const double f24_25 = -f24 * m_A92;
+	m_A93 += m_A83 * f24_25;
+	m_A94 += m_A84 * f24_25;
+	m_A95 += m_A85 * f24_25;
+	RHS25 += f24_25 * RHS24;
+	const double f24_26 = -f24 * m_A102;
+	m_A103 += m_A83 * f24_26;
+	m_A104 += m_A84 * f24_26;
+	m_A105 += m_A85 * f24_26;
+	RHS26 += f24_26 * RHS24;
+	const double f24_27 = -f24 * m_A110;
+	m_A111 += m_A83 * f24_27;
+	m_A112 += m_A84 * f24_27;
+	m_A113 += m_A85 * f24_27;
+	RHS27 += f24_27 * RHS24;
+	const double f25 = 1.0 / m_A93;
+	const double f25_26 = -f25 * m_A103;
+	m_A104 += m_A94 * f25_26;
+	m_A105 += m_A95 * f25_26;
+	RHS26 += f25_26 * RHS25;
+	const double f25_27 = -f25 * m_A111;
+	m_A112 += m_A94 * f25_27;
+	m_A113 += m_A95 * f25_27;
+	RHS27 += f25_27 * RHS25;
+	const double f26 = 1.0 / m_A104;
+	const double f26_27 = -f26 * m_A112;
+	m_A113 += m_A105 * f26_27;
+	RHS27 += f26_27 * RHS26;
+	const double f27 = 1.0 / m_A113;
+	const double f27_28 = -f27 * m_A120;
+	m_A121 += m_A114 * f27_28;
+	RHS28 += f27_28 * RHS27;
+	V[28] = RHS28 / m_A121;
+	double tmp27 = 0.0;
+	tmp27 += m_A114 * V[28];
+	V[27] = (RHS27 - tmp27) / m_A113;
+	double tmp26 = 0.0;
+	tmp26 += m_A105 * V[27];
+	V[26] = (RHS26 - tmp26) / m_A104;
+	double tmp25 = 0.0;
+	tmp25 += m_A94 * V[26];
+	tmp25 += m_A95 * V[27];
+	V[25] = (RHS25 - tmp25) / m_A93;
+	double tmp24 = 0.0;
+	tmp24 += m_A83 * V[25];
+	tmp24 += m_A84 * V[26];
+	tmp24 += m_A85 * V[27];
+	V[24] = (RHS24 - tmp24) / m_A82;
+	double tmp23 = 0.0;
+	tmp23 += m_A76 * V[26];
+	V[23] = (RHS23 - tmp23) / m_A75;
+	double tmp22 = 0.0;
+	tmp22 += m_A70 * V[24];
+	tmp22 += m_A71 * V[25];
+	tmp22 += m_A72 * V[26];
+	tmp22 += m_A73 * V[27];
+	V[22] = (RHS22 - tmp22) / m_A69;
+	double tmp21 = 0.0;
+	tmp21 += m_A61 * V[28];
+	V[21] = (RHS21 - tmp21) / m_A60;
+	double tmp20 = 0.0;
+	tmp20 += m_A56 * V[22];
+	tmp20 += m_A57 * V[24];
+	tmp20 += m_A58 * V[26];
+	V[20] = (RHS20 - tmp20) / m_A55;
+	double tmp19 = 0.0;
+	V[19] = (RHS19 - tmp19) / m_A52;
+	double tmp18 = 0.0;
+	tmp18 += m_A48 * V[21];
+	tmp18 += m_A49 * V[27];
+	tmp18 += m_A50 * V[28];
+	V[18] = (RHS18 - tmp18) / m_A47;
+	double tmp17 = 0.0;
+	tmp17 += m_A44 * V[22];
+	tmp17 += m_A45 * V[25];
+	V[17] = (RHS17 - tmp17) / m_A43;
+	double tmp16 = 0.0;
+	V[16] = (RHS16 - tmp16) / m_A40;
+	double tmp15 = 0.0;
+	tmp15 += m_A38 * V[25];
+	V[15] = (RHS15 - tmp15) / m_A37;
+	double tmp14 = 0.0;
+	V[14] = (RHS14 - tmp14) / m_A35;
+	double tmp13 = 0.0;
+	tmp13 += m_A31 * V[20];
+	tmp13 += m_A32 * V[24];
+	tmp13 += m_A33 * V[26];
+	V[13] = (RHS13 - tmp13) / m_A30;
+	double tmp12 = 0.0;
+	tmp12 += m_A29 * V[26];
+	V[12] = (RHS12 - tmp12) / m_A28;
+	double tmp11 = 0.0;
+	tmp11 += m_A27 * V[23];
+	V[11] = (RHS11 - tmp11) / m_A26;
+	double tmp10 = 0.0;
+	tmp10 += m_A24 * V[20];
+	tmp10 += m_A25 * V[22];
+	V[10] = (RHS10 - tmp10) / m_A23;
+	double tmp9 = 0.0;
+	tmp9 += m_A22 * V[19];
+	V[9] = (RHS9 - tmp9) / m_A21;
+	double tmp8 = 0.0;
+	tmp8 += m_A20 * V[28];
+	V[8] = (RHS8 - tmp8) / m_A19;
+	double tmp7 = 0.0;
+	tmp7 += m_A17 * V[22];
+	tmp7 += m_A18 * V[27];
+	V[7] = (RHS7 - tmp7) / m_A16;
+	double tmp6 = 0.0;
+	tmp6 += m_A15 * V[21];
+	V[6] = (RHS6 - tmp6) / m_A14;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[17];
+	tmp5 += m_A12 * V[22];
+	tmp5 += m_A13 * V[25];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[16];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[15];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[25];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[14];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[17];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// ripoff
+static void nl_gcr_43188bf576854ae0_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A5 += gt[4];
+	m_A5 += gt[5];
+	m_A5 += gt[6];
+	m_A6 += go[4];
+	m_A4 += go[5];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 -= go[6] * *cnV[6];
+	m_A9 += gt[7];
+	m_A9 += gt[8];
+	m_A7 += go[7];
+	m_A8 += go[8];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A5 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A7;
+	m_A9 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_3 = -f2 * m_A8;
+	m_A9 += m_A6 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// destroyr
+static void nl_gcr_4334c95878d1be92_399_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
+	double m_A153(0.0);
+	double m_A154(0.0);
+	double m_A155(0.0);
+	double m_A156(0.0);
+	double m_A157(0.0);
+	double m_A158(0.0);
+	double m_A159(0.0);
+	double m_A160(0.0);
+	double m_A161(0.0);
+	double m_A162(0.0);
+	double m_A163(0.0);
+	double m_A164(0.0);
+	double m_A165(0.0);
+	double m_A166(0.0);
+	double m_A167(0.0);
+	double m_A168(0.0);
+	double m_A169(0.0);
+	double m_A170(0.0);
+	double m_A171(0.0);
+	double m_A172(0.0);
+	double m_A173(0.0);
+	double m_A174(0.0);
+	double m_A175(0.0);
+	double m_A176(0.0);
+	double m_A177(0.0);
+	double m_A178(0.0);
+	double m_A179(0.0);
+	double m_A180(0.0);
+	double m_A181(0.0);
+	double m_A182(0.0);
+	double m_A183(0.0);
+	double m_A184(0.0);
+	double m_A185(0.0);
+	double m_A186(0.0);
+	double m_A187(0.0);
+	double m_A188(0.0);
+	double m_A189(0.0);
+	double m_A190(0.0);
+	double m_A191(0.0);
+	double m_A192(0.0);
+	double m_A193(0.0);
+	double m_A194(0.0);
+	double m_A195(0.0);
+	double m_A196(0.0);
+	double m_A197(0.0);
+	double m_A198(0.0);
+	double m_A199(0.0);
+	double m_A200(0.0);
+	double m_A201(0.0);
+	double m_A202(0.0);
+	double m_A203(0.0);
+	double m_A204(0.0);
+	double m_A205(0.0);
+	double m_A206(0.0);
+	double m_A207(0.0);
+	double m_A208(0.0);
+	double m_A209(0.0);
+	double m_A210(0.0);
+	double m_A211(0.0);
+	double m_A212(0.0);
+	double m_A213(0.0);
+	double m_A214(0.0);
+	double m_A215(0.0);
+	double m_A216(0.0);
+	double m_A217(0.0);
+	double m_A218(0.0);
+	double m_A219(0.0);
+	double m_A220(0.0);
+	double m_A221(0.0);
+	double m_A222(0.0);
+	double m_A223(0.0);
+	double m_A224(0.0);
+	double m_A225(0.0);
+	double m_A226(0.0);
+	double m_A227(0.0);
+	double m_A228(0.0);
+	double m_A229(0.0);
+	double m_A230(0.0);
+	double m_A231(0.0);
+	double m_A232(0.0);
+	double m_A233(0.0);
+	double m_A234(0.0);
+	double m_A235(0.0);
+	double m_A236(0.0);
+	double m_A237(0.0);
+	double m_A238(0.0);
+	double m_A239(0.0);
+	double m_A240(0.0);
+	double m_A241(0.0);
+	double m_A242(0.0);
+	double m_A243(0.0);
+	double m_A244(0.0);
+	double m_A245(0.0);
+	double m_A246(0.0);
+	double m_A247(0.0);
+	double m_A248(0.0);
+	double m_A249(0.0);
+	double m_A250(0.0);
+	double m_A251(0.0);
+	double m_A252(0.0);
+	double m_A253(0.0);
+	double m_A254(0.0);
+	double m_A255(0.0);
+	double m_A256(0.0);
+	double m_A257(0.0);
+	double m_A258(0.0);
+	double m_A259(0.0);
+	double m_A260(0.0);
+	double m_A261(0.0);
+	double m_A262(0.0);
+	double m_A263(0.0);
+	double m_A264(0.0);
+	double m_A265(0.0);
+	double m_A266(0.0);
+	double m_A267(0.0);
+	double m_A268(0.0);
+	double m_A269(0.0);
+	double m_A270(0.0);
+	double m_A271(0.0);
+	double m_A272(0.0);
+	double m_A273(0.0);
+	double m_A274(0.0);
+	double m_A275(0.0);
+	double m_A276(0.0);
+	double m_A277(0.0);
+	double m_A278(0.0);
+	double m_A279(0.0);
+	double m_A280(0.0);
+	double m_A281(0.0);
+	double m_A282(0.0);
+	double m_A283(0.0);
+	double m_A284(0.0);
+	double m_A285(0.0);
+	double m_A286(0.0);
+	double m_A287(0.0);
+	double m_A288(0.0);
+	double m_A289(0.0);
+	double m_A290(0.0);
+	double m_A291(0.0);
+	double m_A292(0.0);
+	double m_A293(0.0);
+	double m_A294(0.0);
+	double m_A295(0.0);
+	double m_A296(0.0);
+	double m_A297(0.0);
+	double m_A298(0.0);
+	double m_A299(0.0);
+	double m_A300(0.0);
+	double m_A301(0.0);
+	double m_A302(0.0);
+	double m_A303(0.0);
+	double m_A304(0.0);
+	double m_A305(0.0);
+	double m_A306(0.0);
+	double m_A307(0.0);
+	double m_A308(0.0);
+	double m_A309(0.0);
+	double m_A310(0.0);
+	double m_A311(0.0);
+	double m_A312(0.0);
+	double m_A313(0.0);
+	double m_A314(0.0);
+	double m_A315(0.0);
+	double m_A316(0.0);
+	double m_A317(0.0);
+	double m_A318(0.0);
+	double m_A319(0.0);
+	double m_A320(0.0);
+	double m_A321(0.0);
+	double m_A322(0.0);
+	double m_A323(0.0);
+	double m_A324(0.0);
+	double m_A325(0.0);
+	double m_A326(0.0);
+	double m_A327(0.0);
+	double m_A328(0.0);
+	double m_A329(0.0);
+	double m_A330(0.0);
+	double m_A331(0.0);
+	double m_A332(0.0);
+	double m_A333(0.0);
+	double m_A334(0.0);
+	double m_A335(0.0);
+	double m_A336(0.0);
+	double m_A337(0.0);
+	double m_A338(0.0);
+	double m_A339(0.0);
+	double m_A340(0.0);
+	double m_A341(0.0);
+	double m_A342(0.0);
+	double m_A343(0.0);
+	double m_A344(0.0);
+	double m_A345(0.0);
+	double m_A346(0.0);
+	double m_A347(0.0);
+	double m_A348(0.0);
+	double m_A349(0.0);
+	double m_A350(0.0);
+	double m_A351(0.0);
+	double m_A352(0.0);
+	double m_A353(0.0);
+	double m_A354(0.0);
+	double m_A355(0.0);
+	double m_A356(0.0);
+	double m_A357(0.0);
+	double m_A358(0.0);
+	double m_A359(0.0);
+	double m_A360(0.0);
+	double m_A361(0.0);
+	double m_A362(0.0);
+	double m_A363(0.0);
+	double m_A364(0.0);
+	double m_A365(0.0);
+	double m_A366(0.0);
+	double m_A367(0.0);
+	double m_A368(0.0);
+	double m_A369(0.0);
+	double m_A370(0.0);
+	double m_A371(0.0);
+	double m_A372(0.0);
+	double m_A373(0.0);
+	double m_A374(0.0);
+	double m_A375(0.0);
+	double m_A376(0.0);
+	double m_A377(0.0);
+	double m_A378(0.0);
+	double m_A379(0.0);
+	double m_A380(0.0);
+	double m_A381(0.0);
+	double m_A382(0.0);
+	double m_A383(0.0);
+	double m_A384(0.0);
+	double m_A385(0.0);
+	double m_A386(0.0);
+	double m_A387(0.0);
+	double m_A388(0.0);
+	double m_A389(0.0);
+	double m_A390(0.0);
+	double m_A391(0.0);
+	double m_A392(0.0);
+	double m_A393(0.0);
+	double m_A394(0.0);
+	double m_A395(0.0);
+	double m_A396(0.0);
+	double m_A397(0.0);
+	double m_A398(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A7 += go[4];
+	m_A6 += go[5];
+	m_A5 += go[6];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[7] * *cnV[7];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A9 += go[8];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	RHS3 -= go[9] * *cnV[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A10 += gt[12];
+	m_A11 += go[10];
+	m_A12 += go[11];
+	double RHS4 = Idr[10];
+	RHS4 += Idr[11];
+	RHS4 += Idr[12];
+	RHS4 -= go[12] * *cnV[12];
+	m_A13 += gt[13];
+	m_A13 += gt[14];
+	m_A13 += gt[15];
+	m_A14 += go[13];
+	m_A15 += go[14];
+	double RHS5 = Idr[13];
+	RHS5 += Idr[14];
+	RHS5 += Idr[15];
+	RHS5 -= go[15] * *cnV[15];
+	m_A16 += gt[16];
+	m_A16 += gt[17];
+	m_A16 += gt[18];
+	m_A16 += gt[19];
+	m_A17 += go[16];
+	double RHS6 = Idr[16];
+	RHS6 += Idr[17];
+	RHS6 += Idr[18];
+	RHS6 += Idr[19];
+	RHS6 -= go[17] * *cnV[17];
+	RHS6 -= go[18] * *cnV[18];
+	RHS6 -= go[19] * *cnV[19];
+	m_A18 += gt[20];
+	m_A18 += gt[21];
+	m_A18 += gt[22];
+	m_A18 += gt[23];
+	m_A18 += gt[24];
+	m_A18 += gt[25];
+	m_A18 += gt[26];
+	m_A22 += go[20];
+	m_A21 += go[21];
+	m_A20 += go[22];
+	m_A19 += go[23];
+	double RHS7 = Idr[20];
+	RHS7 += Idr[21];
+	RHS7 += Idr[22];
+	RHS7 += Idr[23];
+	RHS7 += Idr[24];
+	RHS7 += Idr[25];
+	RHS7 += Idr[26];
+	RHS7 -= go[24] * *cnV[24];
+	RHS7 -= go[25] * *cnV[25];
+	RHS7 -= go[26] * *cnV[26];
+	m_A23 += gt[27];
+	m_A23 += gt[28];
+	m_A23 += gt[29];
+	m_A23 += gt[30];
+	m_A23 += gt[31];
+	m_A23 += gt[32];
+	m_A23 += gt[33];
+	m_A27 += go[27];
+	m_A26 += go[28];
+	m_A25 += go[29];
+	m_A24 += go[30];
+	double RHS8 = Idr[27];
+	RHS8 += Idr[28];
+	RHS8 += Idr[29];
+	RHS8 += Idr[30];
+	RHS8 += Idr[31];
+	RHS8 += Idr[32];
+	RHS8 += Idr[33];
+	RHS8 -= go[31] * *cnV[31];
+	RHS8 -= go[32] * *cnV[32];
+	RHS8 -= go[33] * *cnV[33];
+	m_A28 += gt[34];
+	m_A28 += gt[35];
+	m_A28 += gt[36];
+	m_A29 += go[34];
+	m_A30 += go[35];
+	double RHS9 = Idr[34];
+	RHS9 += Idr[35];
+	RHS9 += Idr[36];
+	RHS9 -= go[36] * *cnV[36];
+	m_A31 += gt[37];
+	m_A31 += gt[38];
+	m_A31 += gt[39];
+	m_A31 += gt[40];
+	m_A31 += gt[41];
+	m_A31 += gt[42];
+	m_A31 += gt[43];
+	m_A32 += go[37];
+	m_A33 += go[38];
+	double RHS10 = Idr[37];
+	RHS10 += Idr[38];
+	RHS10 += Idr[39];
+	RHS10 += Idr[40];
+	RHS10 += Idr[41];
+	RHS10 += Idr[42];
+	RHS10 += Idr[43];
+	RHS10 -= go[39] * *cnV[39];
+	RHS10 -= go[40] * *cnV[40];
+	RHS10 -= go[41] * *cnV[41];
+	RHS10 -= go[42] * *cnV[42];
+	RHS10 -= go[43] * *cnV[43];
+	m_A34 += gt[44];
+	m_A34 += gt[45];
+	m_A34 += gt[46];
+	m_A36 += go[44];
+	m_A35 += go[45];
+	m_A37 += go[46];
+	double RHS11 = Idr[44];
+	RHS11 += Idr[45];
+	RHS11 += Idr[46];
+	m_A38 += gt[47];
+	m_A38 += gt[48];
+	m_A38 += gt[49];
+	m_A38 += gt[50];
+	m_A38 += gt[51];
+	m_A38 += gt[52];
+	m_A38 += gt[53];
+	m_A39 += go[47];
+	m_A40 += go[48];
+	double RHS12 = Idr[47];
+	RHS12 += Idr[48];
+	RHS12 += Idr[49];
+	RHS12 += Idr[50];
+	RHS12 += Idr[51];
+	RHS12 += Idr[52];
+	RHS12 += Idr[53];
+	RHS12 -= go[49] * *cnV[49];
+	RHS12 -= go[50] * *cnV[50];
+	RHS12 -= go[51] * *cnV[51];
+	RHS12 -= go[52] * *cnV[52];
+	RHS12 -= go[53] * *cnV[53];
+	m_A41 += gt[54];
+	m_A41 += gt[55];
+	m_A41 += gt[56];
+	m_A41 += gt[57];
+	m_A44 += go[54];
+	m_A42 += go[55];
+	m_A43 += go[56];
+	double RHS13 = Idr[54];
+	RHS13 += Idr[55];
+	RHS13 += Idr[56];
+	RHS13 += Idr[57];
+	RHS13 -= go[57] * *cnV[57];
+	m_A45 += gt[58];
+	m_A45 += gt[59];
+	m_A45 += gt[60];
+	m_A45 += gt[61];
+	m_A45 += gt[62];
+	m_A46 += go[58];
+	m_A47 += go[59];
+	double RHS14 = Idr[58];
+	RHS14 += Idr[59];
+	RHS14 += Idr[60];
+	RHS14 += Idr[61];
+	RHS14 += Idr[62];
+	RHS14 -= go[60] * *cnV[60];
+	RHS14 -= go[61] * *cnV[61];
+	RHS14 -= go[62] * *cnV[62];
+	m_A48 += gt[63];
+	m_A48 += gt[64];
+	m_A48 += gt[65];
+	m_A48 += gt[66];
+	m_A48 += gt[67];
+	m_A48 += gt[68];
+	m_A48 += gt[69];
+	m_A50 += go[63];
+	m_A49 += go[64];
+	double RHS15 = Idr[63];
+	RHS15 += Idr[64];
+	RHS15 += Idr[65];
+	RHS15 += Idr[66];
+	RHS15 += Idr[67];
+	RHS15 += Idr[68];
+	RHS15 += Idr[69];
+	RHS15 -= go[65] * *cnV[65];
+	RHS15 -= go[66] * *cnV[66];
+	RHS15 -= go[67] * *cnV[67];
+	RHS15 -= go[68] * *cnV[68];
+	RHS15 -= go[69] * *cnV[69];
+	m_A51 += gt[70];
+	m_A51 += gt[71];
+	m_A51 += gt[72];
+	m_A51 += gt[73];
+	m_A51 += gt[74];
+	m_A52 += go[70];
+	m_A53 += go[71];
+	double RHS16 = Idr[70];
+	RHS16 += Idr[71];
+	RHS16 += Idr[72];
+	RHS16 += Idr[73];
+	RHS16 += Idr[74];
+	RHS16 -= go[72] * *cnV[72];
+	RHS16 -= go[73] * *cnV[73];
+	RHS16 -= go[74] * *cnV[74];
+	m_A54 += gt[75];
+	m_A54 += gt[76];
+	m_A54 += gt[77];
+	m_A55 += go[75];
+	double RHS17 = Idr[75];
+	RHS17 += Idr[76];
+	RHS17 += Idr[77];
+	RHS17 -= go[76] * *cnV[76];
+	RHS17 -= go[77] * *cnV[77];
+	m_A56 += gt[78];
+	m_A56 += gt[79];
+	m_A57 += go[78];
+	m_A58 += go[79];
+	double RHS18 = Idr[78];
+	RHS18 += Idr[79];
+	m_A59 += gt[80];
+	m_A59 += gt[81];
+	m_A59 += gt[82];
+	m_A60 += go[80];
+	double RHS19 = Idr[80];
+	RHS19 += Idr[81];
+	RHS19 += Idr[82];
+	RHS19 -= go[81] * *cnV[81];
+	RHS19 -= go[82] * *cnV[82];
+	m_A61 += gt[83];
+	m_A61 += gt[84];
+	m_A61 += gt[85];
+	m_A62 += go[83];
+	double RHS20 = Idr[83];
+	RHS20 += Idr[84];
+	RHS20 += Idr[85];
+	RHS20 -= go[84] * *cnV[84];
+	RHS20 -= go[85] * *cnV[85];
+	m_A63 += gt[86];
+	m_A63 += gt[87];
+	m_A64 += go[86];
+	double RHS21 = Idr[86];
+	RHS21 += Idr[87];
+	RHS21 -= go[87] * *cnV[87];
+	m_A65 += gt[88];
+	m_A65 += gt[89];
+	m_A65 += gt[90];
+	m_A65 += gt[91];
+	m_A67 += go[88];
+	m_A66 += go[89];
+	double RHS22 = Idr[88];
+	RHS22 += Idr[89];
+	RHS22 += Idr[90];
+	RHS22 += Idr[91];
+	RHS22 -= go[90] * *cnV[90];
+	RHS22 -= go[91] * *cnV[91];
+	m_A68 += gt[92];
+	m_A68 += gt[93];
+	m_A68 += gt[94];
+	m_A68 += gt[95];
+	m_A68 += gt[96];
+	m_A68 += gt[97];
+	m_A68 += gt[98];
+	m_A70 += go[92];
+	m_A69 += go[93];
+	double RHS23 = Idr[92];
+	RHS23 += Idr[93];
+	RHS23 += Idr[94];
+	RHS23 += Idr[95];
+	RHS23 += Idr[96];
+	RHS23 += Idr[97];
+	RHS23 += Idr[98];
+	RHS23 -= go[94] * *cnV[94];
+	RHS23 -= go[95] * *cnV[95];
+	RHS23 -= go[96] * *cnV[96];
+	RHS23 -= go[97] * *cnV[97];
+	RHS23 -= go[98] * *cnV[98];
+	m_A71 += gt[99];
+	m_A71 += gt[100];
+	m_A72 += go[99];
+	double RHS24 = Idr[99];
+	RHS24 += Idr[100];
+	RHS24 -= go[100] * *cnV[100];
+	m_A73 += gt[101];
+	m_A73 += gt[102];
+	m_A73 += gt[103];
+	m_A74 += go[101];
+	double RHS25 = Idr[101];
+	RHS25 += Idr[102];
+	RHS25 += Idr[103];
+	RHS25 -= go[102] * *cnV[102];
+	RHS25 -= go[103] * *cnV[103];
+	m_A75 += gt[104];
+	m_A75 += gt[105];
+	m_A75 += gt[106];
+	m_A75 += gt[107];
+	m_A75 += gt[108];
+	m_A75 += gt[109];
+	m_A75 += gt[110];
+	m_A76 += go[104];
+	double RHS26 = Idr[104];
+	RHS26 += Idr[105];
+	RHS26 += Idr[106];
+	RHS26 += Idr[107];
+	RHS26 += Idr[108];
+	RHS26 += Idr[109];
+	RHS26 += Idr[110];
+	RHS26 -= go[105] * *cnV[105];
+	RHS26 -= go[106] * *cnV[106];
+	RHS26 -= go[107] * *cnV[107];
+	RHS26 -= go[108] * *cnV[108];
+	RHS26 -= go[109] * *cnV[109];
+	RHS26 -= go[110] * *cnV[110];
+	m_A77 += gt[111];
+	m_A77 += gt[112];
+	m_A77 += gt[113];
+	m_A77 += gt[114];
+	m_A77 += gt[115];
+	m_A79 += go[111];
+	m_A78 += go[112];
+	m_A80 += go[113];
+	double RHS27 = Idr[111];
+	RHS27 += Idr[112];
+	RHS27 += Idr[113];
+	RHS27 += Idr[114];
+	RHS27 += Idr[115];
+	RHS27 -= go[114] * *cnV[114];
+	RHS27 -= go[115] * *cnV[115];
+	m_A81 += gt[116];
+	m_A81 += gt[117];
+	m_A81 += gt[118];
+	m_A81 += gt[119];
+	m_A81 += gt[120];
+	m_A81 += gt[121];
+	m_A82 += go[116];
+	m_A83 += go[117];
+	m_A83 += go[118];
+	double RHS28 = Idr[116];
+	RHS28 += Idr[117];
+	RHS28 += Idr[118];
+	RHS28 += Idr[119];
+	RHS28 += Idr[120];
+	RHS28 += Idr[121];
+	RHS28 -= go[119] * *cnV[119];
+	RHS28 -= go[120] * *cnV[120];
+	RHS28 -= go[121] * *cnV[121];
+	m_A84 += gt[122];
+	m_A84 += gt[123];
+	m_A84 += gt[124];
+	m_A84 += gt[125];
+	m_A85 += go[122];
+	m_A87 += go[123];
+	m_A86 += go[124];
+	double RHS29 = Idr[122];
+	RHS29 += Idr[123];
+	RHS29 += Idr[124];
+	RHS29 += Idr[125];
+	RHS29 -= go[125] * *cnV[125];
+	m_A88 += gt[126];
+	m_A88 += gt[127];
+	m_A88 += gt[128];
+	m_A88 += gt[129];
+	m_A89 += go[126];
+	m_A90 += go[127];
+	double RHS30 = Idr[126];
+	RHS30 += Idr[127];
+	RHS30 += Idr[128];
+	RHS30 += Idr[129];
+	RHS30 -= go[128] * *cnV[128];
+	RHS30 -= go[129] * *cnV[129];
+	m_A91 += gt[130];
+	m_A91 += gt[131];
+	m_A91 += gt[132];
+	m_A91 += gt[133];
+	m_A91 += gt[134];
+	m_A92 += go[130];
+	m_A94 += go[131];
+	m_A93 += go[132];
+	double RHS31 = Idr[130];
+	RHS31 += Idr[131];
+	RHS31 += Idr[132];
+	RHS31 += Idr[133];
+	RHS31 += Idr[134];
+	RHS31 -= go[133] * *cnV[133];
+	RHS31 -= go[134] * *cnV[134];
+	m_A95 += gt[135];
+	m_A95 += gt[136];
+	m_A96 += go[135];
+	m_A97 += go[136];
+	double RHS32 = Idr[135];
+	RHS32 += Idr[136];
+	m_A98 += gt[137];
+	m_A98 += gt[138];
+	m_A98 += gt[139];
+	m_A98 += gt[140];
+	m_A98 += gt[141];
+	m_A100 += go[137];
+	m_A100 += go[138];
+	m_A99 += go[139];
+	double RHS33 = Idr[137];
+	RHS33 += Idr[138];
+	RHS33 += Idr[139];
+	RHS33 += Idr[140];
+	RHS33 += Idr[141];
+	RHS33 -= go[140] * *cnV[140];
+	RHS33 -= go[141] * *cnV[141];
+	m_A101 += gt[142];
+	m_A101 += gt[143];
+	m_A103 += go[142];
+	m_A102 += go[143];
+	double RHS34 = Idr[142];
+	RHS34 += Idr[143];
+	m_A104 += gt[144];
+	m_A104 += gt[145];
+	m_A106 += go[144];
+	m_A105 += go[145];
+	double RHS35 = Idr[144];
+	RHS35 += Idr[145];
+	m_A107 += gt[146];
+	m_A107 += gt[147];
+	m_A108 += go[146];
+	double RHS36 = Idr[146];
+	RHS36 += Idr[147];
+	RHS36 -= go[147] * *cnV[147];
+	m_A110 += gt[148];
+	m_A110 += gt[149];
+	m_A110 += gt[150];
+	m_A109 += go[148];
+	m_A111 += go[149];
+	double RHS37 = Idr[148];
+	RHS37 += Idr[149];
+	RHS37 += Idr[150];
+	RHS37 -= go[150] * *cnV[150];
+	m_A114 += gt[151];
+	m_A114 += gt[152];
+	m_A114 += gt[153];
+	m_A114 += gt[154];
+	m_A113 += go[151];
+	m_A112 += go[152];
+	double RHS38 = Idr[151];
+	RHS38 += Idr[152];
+	RHS38 += Idr[153];
+	RHS38 += Idr[154];
+	RHS38 -= go[153] * *cnV[153];
+	RHS38 -= go[154] * *cnV[154];
+	m_A120 += gt[155];
+	m_A120 += gt[156];
+	m_A120 += gt[157];
+	m_A120 += gt[158];
+	m_A118 += go[155];
+	m_A117 += go[156];
+	double RHS39 = Idr[155];
+	RHS39 += Idr[156];
+	RHS39 += Idr[157];
+	RHS39 += Idr[158];
+	RHS39 -= go[157] * *cnV[157];
+	RHS39 -= go[158] * *cnV[158];
+	m_A130 += gt[159];
+	m_A130 += gt[160];
+	m_A130 += gt[161];
+	m_A130 += gt[162];
+	m_A127 += go[159];
+	m_A126 += go[160];
+	m_A125 += go[161];
+	double RHS40 = Idr[159];
+	RHS40 += Idr[160];
+	RHS40 += Idr[161];
+	RHS40 += Idr[162];
+	RHS40 -= go[162] * *cnV[162];
+	m_A137 += gt[163];
+	m_A137 += gt[164];
+	m_A137 += gt[165];
+	m_A136 += go[163];
+	m_A135 += go[164];
+	double RHS41 = Idr[163];
+	RHS41 += Idr[164];
+	RHS41 += Idr[165];
+	RHS41 -= go[165] * *cnV[165];
+	m_A140 += gt[166];
+	m_A140 += gt[167];
+	m_A140 += gt[168];
+	m_A140 += gt[169];
+	m_A142 += go[166];
+	m_A142 += go[167];
+	m_A141 += go[168];
+	double RHS42 = Idr[166];
+	RHS42 += Idr[167];
+	RHS42 += Idr[168];
+	RHS42 += Idr[169];
+	RHS42 -= go[169] * *cnV[169];
+	m_A144 += gt[170];
+	m_A144 += gt[171];
+	m_A144 += gt[172];
+	m_A144 += gt[173];
+	m_A144 += gt[174];
+	m_A144 += gt[175];
+	m_A144 += gt[176];
+	m_A145 += go[170];
+	m_A143 += go[171];
+	double RHS43 = Idr[170];
+	RHS43 += Idr[171];
+	RHS43 += Idr[172];
+	RHS43 += Idr[173];
+	RHS43 += Idr[174];
+	RHS43 += Idr[175];
+	RHS43 += Idr[176];
+	RHS43 -= go[172] * *cnV[172];
+	RHS43 -= go[173] * *cnV[173];
+	RHS43 -= go[174] * *cnV[174];
+	RHS43 -= go[175] * *cnV[175];
+	RHS43 -= go[176] * *cnV[176];
+	m_A149 += gt[177];
+	m_A149 += gt[178];
+	m_A149 += gt[179];
+	m_A149 += gt[180];
+	m_A147 += go[177];
+	m_A148 += go[178];
+	m_A150 += go[179];
+	double RHS44 = Idr[177];
+	RHS44 += Idr[178];
+	RHS44 += Idr[179];
+	RHS44 += Idr[180];
+	RHS44 -= go[180] * *cnV[180];
+	m_A153 += gt[181];
+	m_A153 += gt[182];
+	m_A153 += gt[183];
+	m_A153 += gt[184];
+	m_A153 += gt[185];
+	m_A151 += go[181];
+	m_A156 += go[182];
+	m_A152 += go[183];
+	double RHS45 = Idr[181];
+	RHS45 += Idr[182];
+	RHS45 += Idr[183];
+	RHS45 += Idr[184];
+	RHS45 += Idr[185];
+	RHS45 -= go[184] * *cnV[184];
+	RHS45 -= go[185] * *cnV[185];
+	m_A161 += gt[186];
+	m_A161 += gt[187];
+	m_A161 += gt[188];
+	m_A159 += go[186];
+	m_A158 += go[187];
+	m_A157 += go[188];
+	double RHS46 = Idr[186];
+	RHS46 += Idr[187];
+	RHS46 += Idr[188];
+	m_A166 += gt[189];
+	m_A166 += gt[190];
+	m_A166 += gt[191];
+	m_A167 += go[189];
+	m_A165 += go[190];
+	double RHS47 = Idr[189];
+	RHS47 += Idr[190];
+	RHS47 += Idr[191];
+	RHS47 -= go[191] * *cnV[191];
+	m_A171 += gt[192];
+	m_A171 += gt[193];
+	m_A171 += gt[194];
+	m_A174 += go[192];
+	m_A169 += go[193];
+	m_A168 += go[194];
+	double RHS48 = Idr[192];
+	RHS48 += Idr[193];
+	RHS48 += Idr[194];
+	m_A177 += gt[195];
+	m_A177 += gt[196];
+	m_A177 += gt[197];
+	m_A177 += gt[198];
+	m_A176 += go[195];
+	m_A175 += go[196];
+	double RHS49 = Idr[195];
+	RHS49 += Idr[196];
+	RHS49 += Idr[197];
+	RHS49 += Idr[198];
+	RHS49 -= go[197] * *cnV[197];
+	RHS49 -= go[198] * *cnV[198];
+	m_A185 += gt[199];
+	m_A185 += gt[200];
+	m_A185 += gt[201];
+	m_A185 += gt[202];
+	m_A185 += gt[203];
+	m_A185 += gt[204];
+	m_A189 += go[199];
+	m_A182 += go[200];
+	m_A181 += go[201];
+	m_A180 += go[202];
+	m_A187 += go[203];
+	double RHS50 = Idr[199];
+	RHS50 += Idr[200];
+	RHS50 += Idr[201];
+	RHS50 += Idr[202];
+	RHS50 += Idr[203];
+	RHS50 += Idr[204];
+	RHS50 -= go[204] * *cnV[204];
+	m_A191 += gt[205];
+	m_A191 += gt[206];
+	m_A193 += go[205];
+	m_A190 += go[206];
+	double RHS51 = Idr[205];
+	RHS51 += Idr[206];
+	m_A196 += gt[207];
+	m_A196 += gt[208];
+	m_A196 += gt[209];
+	m_A196 += gt[210];
+	m_A196 += gt[211];
+	m_A197 += go[207];
+	m_A198 += go[208];
+	m_A194 += go[209];
+	double RHS52 = Idr[207];
+	RHS52 += Idr[208];
+	RHS52 += Idr[209];
+	RHS52 += Idr[210];
+	RHS52 += Idr[211];
+	RHS52 -= go[210] * *cnV[210];
+	RHS52 -= go[211] * *cnV[211];
+	m_A202 += gt[212];
+	m_A202 += gt[213];
+	m_A202 += gt[214];
+	m_A202 += gt[215];
+	m_A202 += gt[216];
+	m_A202 += gt[217];
+	m_A202 += gt[218];
+	m_A203 += go[212];
+	m_A201 += go[213];
+	double RHS53 = Idr[212];
+	RHS53 += Idr[213];
+	RHS53 += Idr[214];
+	RHS53 += Idr[215];
+	RHS53 += Idr[216];
+	RHS53 += Idr[217];
+	RHS53 += Idr[218];
+	RHS53 -= go[214] * *cnV[214];
+	RHS53 -= go[215] * *cnV[215];
+	RHS53 -= go[216] * *cnV[216];
+	RHS53 -= go[217] * *cnV[217];
+	RHS53 -= go[218] * *cnV[218];
+	m_A206 += gt[219];
+	m_A206 += gt[220];
+	m_A206 += gt[221];
+	m_A207 += go[219];
+	m_A205 += go[220];
+	double RHS54 = Idr[219];
+	RHS54 += Idr[220];
+	RHS54 += Idr[221];
+	RHS54 -= go[221] * *cnV[221];
+	m_A211 += gt[222];
+	m_A211 += gt[223];
+	m_A211 += gt[224];
+	m_A211 += gt[225];
+	m_A209 += go[222];
+	m_A209 += go[223];
+	m_A208 += go[224];
+	double RHS55 = Idr[222];
+	RHS55 += Idr[223];
+	RHS55 += Idr[224];
+	RHS55 += Idr[225];
+	RHS55 -= go[225] * *cnV[225];
+	m_A218 += gt[226];
+	m_A218 += gt[227];
+	m_A218 += gt[228];
+	m_A218 += gt[229];
+	m_A218 += gt[230];
+	m_A218 += gt[231];
+	m_A218 += gt[232];
+	m_A217 += go[226];
+	m_A216 += go[227];
+	m_A219 += go[228];
+	m_A215 += go[229];
+	double RHS56 = Idr[226];
+	RHS56 += Idr[227];
+	RHS56 += Idr[228];
+	RHS56 += Idr[229];
+	RHS56 += Idr[230];
+	RHS56 += Idr[231];
+	RHS56 += Idr[232];
+	RHS56 -= go[230] * *cnV[230];
+	RHS56 -= go[231] * *cnV[231];
+	RHS56 -= go[232] * *cnV[232];
+	m_A220 += gt[233];
+	m_A220 += gt[234];
+	m_A222 += go[233];
+	m_A221 += go[234];
+	double RHS57 = Idr[233];
+	RHS57 += Idr[234];
+	m_A227 += gt[235];
+	m_A227 += gt[236];
+	m_A227 += gt[237];
+	m_A227 += gt[238];
+	m_A227 += gt[239];
+	m_A227 += gt[240];
+	m_A227 += gt[241];
+	m_A223 += go[235];
+	m_A225 += go[236];
+	m_A229 += go[237];
+	m_A231 += go[238];
+	m_A230 += go[239];
+	double RHS58 = Idr[235];
+	RHS58 += Idr[236];
+	RHS58 += Idr[237];
+	RHS58 += Idr[238];
+	RHS58 += Idr[239];
+	RHS58 += Idr[240];
+	RHS58 += Idr[241];
+	RHS58 -= go[240] * *cnV[240];
+	RHS58 -= go[241] * *cnV[241];
+	m_A237 += gt[242];
+	m_A237 += gt[243];
+	m_A240 += go[242];
+	m_A233 += go[243];
+	double RHS59 = Idr[242];
+	RHS59 += Idr[243];
+	m_A245 += gt[244];
+	m_A245 += gt[245];
+	m_A242 += go[244];
+	m_A241 += go[245];
+	double RHS60 = Idr[244];
+	RHS60 += Idr[245];
+	m_A253 += gt[246];
+	m_A253 += gt[247];
+	m_A252 += go[246];
+	m_A251 += go[247];
+	double RHS61 = Idr[246];
+	RHS61 += Idr[247];
+	m_A258 += gt[248];
+	m_A258 += gt[249];
+	m_A258 += gt[250];
+	m_A258 += gt[251];
+	m_A258 += gt[252];
+	m_A258 += gt[253];
+	m_A258 += gt[254];
+	m_A256 += go[248];
+	m_A257 += go[249];
+	double RHS62 = Idr[248];
+	RHS62 += Idr[249];
+	RHS62 += Idr[250];
+	RHS62 += Idr[251];
+	RHS62 += Idr[252];
+	RHS62 += Idr[253];
+	RHS62 += Idr[254];
+	RHS62 -= go[250] * *cnV[250];
+	RHS62 -= go[251] * *cnV[251];
+	RHS62 -= go[252] * *cnV[252];
+	RHS62 -= go[253] * *cnV[253];
+	RHS62 -= go[254] * *cnV[254];
+	m_A262 += gt[255];
+	m_A262 += gt[256];
+	m_A261 += go[255];
+	m_A260 += go[256];
+	double RHS63 = Idr[255];
+	RHS63 += Idr[256];
+	m_A265 += gt[257];
+	m_A265 += gt[258];
+	m_A267 += go[257];
+	m_A264 += go[258];
+	double RHS64 = Idr[257];
+	RHS64 += Idr[258];
+	m_A276 += gt[259];
+	m_A276 += gt[260];
+	m_A276 += gt[261];
+	m_A276 += gt[262];
+	m_A270 += go[259];
+	m_A269 += go[260];
+	m_A268 += go[261];
+	m_A271 += go[262];
+	double RHS65 = Idr[259];
+	RHS65 += Idr[260];
+	RHS65 += Idr[261];
+	RHS65 += Idr[262];
+	m_A288 += gt[263];
+	m_A288 += gt[264];
+	m_A288 += gt[265];
+	m_A288 += gt[266];
+	m_A288 += gt[267];
+	m_A288 += gt[268];
+	m_A281 += go[263];
+	m_A283 += go[264];
+	m_A285 += go[265];
+	m_A280 += go[266];
+	double RHS66 = Idr[263];
+	RHS66 += Idr[264];
+	RHS66 += Idr[265];
+	RHS66 += Idr[266];
+	RHS66 += Idr[267];
+	RHS66 += Idr[268];
+	RHS66 -= go[267] * *cnV[267];
+	RHS66 -= go[268] * *cnV[268];
+	m_A298 += gt[269];
+	m_A298 += gt[270];
+	m_A298 += gt[271];
+	m_A298 += gt[272];
+	m_A298 += gt[273];
+	m_A298 += gt[274];
+	m_A296 += go[269];
+	m_A301 += go[270];
+	m_A293 += go[271];
+	m_A291 += go[272];
+	m_A292 += go[273];
+	double RHS67 = Idr[269];
+	RHS67 += Idr[270];
+	RHS67 += Idr[271];
+	RHS67 += Idr[272];
+	RHS67 += Idr[273];
+	RHS67 += Idr[274];
+	RHS67 -= go[274] * *cnV[274];
+	m_A309 += gt[275];
+	m_A309 += gt[276];
+	m_A309 += gt[277];
+	m_A309 += gt[278];
+	m_A303 += go[275];
+	m_A302 += go[276];
+	m_A306 += go[277];
+	m_A304 += go[278];
+	double RHS68 = Idr[275];
+	RHS68 += Idr[276];
+	RHS68 += Idr[277];
+	RHS68 += Idr[278];
+	m_A320 += gt[279];
+	m_A320 += gt[280];
+	m_A320 += gt[281];
+	m_A320 += gt[282];
+	m_A320 += gt[283];
+	m_A320 += gt[284];
+	m_A313 += go[279];
+	m_A312 += go[280];
+	m_A316 += go[281];
+	m_A317 += go[282];
+	double RHS69 = Idr[279];
+	RHS69 += Idr[280];
+	RHS69 += Idr[281];
+	RHS69 += Idr[282];
+	RHS69 += Idr[283];
+	RHS69 += Idr[284];
+	RHS69 -= go[283] * *cnV[283];
+	RHS69 -= go[284] * *cnV[284];
+	m_A326 += gt[285];
+	m_A326 += gt[286];
+	m_A326 += gt[287];
+	m_A326 += gt[288];
+	m_A326 += gt[289];
+	m_A326 += gt[290];
+	m_A322 += go[285];
+	m_A324 += go[286];
+	m_A323 += go[287];
+	m_A323 += go[288];
+	double RHS70 = Idr[285];
+	RHS70 += Idr[286];
+	RHS70 += Idr[287];
+	RHS70 += Idr[288];
+	RHS70 += Idr[289];
+	RHS70 += Idr[290];
+	RHS70 -= go[289] * *cnV[289];
+	RHS70 -= go[290] * *cnV[290];
+	m_A333 += gt[291];
+	m_A333 += gt[292];
+	m_A333 += gt[293];
+	m_A329 += go[291];
+	m_A328 += go[292];
+	m_A331 += go[293];
+	double RHS71 = Idr[291];
+	RHS71 += Idr[292];
+	RHS71 += Idr[293];
+	m_A348 += gt[294];
+	m_A348 += gt[295];
+	m_A348 += gt[296];
+	m_A343 += go[294];
+	m_A338 += go[295];
+	m_A340 += go[296];
+	double RHS72 = Idr[294];
+	RHS72 += Idr[295];
+	RHS72 += Idr[296];
+	m_A360 += gt[297];
+	m_A360 += gt[298];
+	m_A360 += gt[299];
+	m_A352 += go[297];
+	m_A356 += go[298];
+	m_A353 += go[299];
+	double RHS73 = Idr[297];
+	RHS73 += Idr[298];
+	RHS73 += Idr[299];
+	m_A377 += gt[300];
+	m_A377 += gt[301];
+	m_A377 += gt[302];
+	m_A377 += gt[303];
+	m_A377 += gt[304];
+	m_A377 += gt[305];
+	m_A365 += go[300];
+	m_A364 += go[301];
+	m_A366 += go[302];
+	m_A363 += go[303];
+	m_A370 += go[304];
+	m_A367 += go[305];
+	double RHS74 = Idr[300];
+	RHS74 += Idr[301];
+	RHS74 += Idr[302];
+	RHS74 += Idr[303];
+	RHS74 += Idr[304];
+	RHS74 += Idr[305];
+	m_A398 += gt[306];
+	m_A398 += gt[307];
+	m_A398 += gt[308];
+	m_A398 += gt[309];
+	m_A398 += gt[310];
+	m_A398 += gt[311];
+	m_A398 += gt[312];
+	m_A398 += gt[313];
+	m_A398 += gt[314];
+	m_A398 += gt[315];
+	m_A381 += go[306];
+	m_A381 += go[307];
+	m_A382 += go[308];
+	m_A380 += go[309];
+	m_A391 += go[310];
+	m_A379 += go[311];
+	m_A386 += go[312];
+	double RHS75 = Idr[306];
+	RHS75 += Idr[307];
+	RHS75 += Idr[308];
+	RHS75 += Idr[309];
+	RHS75 += Idr[310];
+	RHS75 += Idr[311];
+	RHS75 += Idr[312];
+	RHS75 += Idr[313];
+	RHS75 += Idr[314];
+	RHS75 += Idr[315];
+	RHS75 -= go[313] * *cnV[313];
+	RHS75 -= go[314] * *cnV[314];
+	RHS75 -= go[315] * *cnV[315];
+	const double f0 = 1.0 / m_A0;
+	const double f0_38 = -f0 * m_A112;
+	m_A114 += m_A1 * f0_38;
+	RHS38 += f0_38 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_37 = -f1 * m_A109;
+	m_A110 += m_A3 * f1_37;
+	RHS37 += f1_37 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_38 = -f2 * m_A113;
+	m_A114 += m_A5 * f2_38;
+	m_A115 += m_A6 * f2_38;
+	m_A116 += m_A7 * f2_38;
+	RHS38 += f2_38 * RHS2;
+	const double f2_39 = -f2 * m_A117;
+	m_A119 += m_A5 * f2_39;
+	m_A120 += m_A6 * f2_39;
+	m_A121 += m_A7 * f2_39;
+	RHS39 += f2_39 * RHS2;
+	const double f2_40 = -f2 * m_A125;
+	m_A128 += m_A5 * f2_40;
+	m_A129 += m_A6 * f2_40;
+	m_A130 += m_A7 * f2_40;
+	RHS40 += f2_40 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_44 = -f3 * m_A147;
+	m_A149 += m_A9 * f3_44;
+	RHS44 += f3_44 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_50 = -f4 * m_A180;
+	m_A185 += m_A11 * f4_50;
+	m_A187 += m_A12 * f4_50;
+	RHS50 += f4_50 * RHS4;
+	const double f4_68 = -f4 * m_A302;
+	m_A306 += m_A11 * f4_68;
+	m_A309 += m_A12 * f4_68;
+	RHS68 += f4_68 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_44 = -f5 * m_A148;
+	m_A149 += m_A14 * f5_44;
+	m_A150 += m_A15 * f5_44;
+	RHS44 += f5_44 * RHS5;
+	const double f5_67 = -f5 * m_A291;
+	m_A296 += m_A14 * f5_67;
+	m_A298 += m_A15 * f5_67;
+	RHS67 += f5_67 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_47 = -f6 * m_A165;
+	m_A166 += m_A17 * f6_47;
+	RHS47 += f6_47 * RHS6;
+	const double f7 = 1.0 / m_A18;
+	const double f7_39 = -f7 * m_A118;
+	m_A120 += m_A19 * f7_39;
+	m_A122 += m_A20 * f7_39;
+	m_A123 += m_A21 * f7_39;
+	m_A124 += m_A22 * f7_39;
+	RHS39 += f7_39 * RHS7;
+	const double f7_50 = -f7 * m_A181;
+	m_A183 += m_A19 * f7_50;
+	m_A185 += m_A20 * f7_50;
+	m_A186 += m_A21 * f7_50;
+	m_A189 += m_A22 * f7_50;
+	RHS50 += f7_50 * RHS7;
+	const double f7_67 = -f7 * m_A292;
+	m_A294 += m_A19 * f7_67;
+	m_A297 += m_A20 * f7_67;
+	m_A298 += m_A21 * f7_67;
+	m_A301 += m_A22 * f7_67;
+	RHS67 += f7_67 * RHS7;
+	const double f7_75 = -f7 * m_A379;
+	m_A383 += m_A19 * f7_75;
+	m_A386 += m_A20 * f7_75;
+	m_A391 += m_A21 * f7_75;
+	m_A398 += m_A22 * f7_75;
+	RHS75 += f7_75 * RHS7;
+	const double f8 = 1.0 / m_A23;
+	const double f8_40 = -f8 * m_A126;
+	m_A130 += m_A24 * f8_40;
+	m_A131 += m_A25 * f8_40;
+	m_A132 += m_A26 * f8_40;
+	m_A134 += m_A27 * f8_40;
+	RHS40 += f8_40 * RHS8;
+	const double f8_50 = -f8 * m_A182;
+	m_A184 += m_A24 * f8_50;
+	m_A185 += m_A25 * f8_50;
+	m_A186 += m_A26 * f8_50;
+	m_A189 += m_A27 * f8_50;
+	RHS50 += f8_50 * RHS8;
+	const double f8_67 = -f8 * m_A293;
+	m_A295 += m_A24 * f8_67;
+	m_A297 += m_A25 * f8_67;
+	m_A298 += m_A26 * f8_67;
+	m_A301 += m_A27 * f8_67;
+	RHS67 += f8_67 * RHS8;
+	const double f8_75 = -f8 * m_A380;
+	m_A384 += m_A24 * f8_75;
+	m_A386 += m_A25 * f8_75;
+	m_A391 += m_A26 * f8_75;
+	m_A398 += m_A27 * f8_75;
+	RHS75 += f8_75 * RHS8;
+	const double f9 = 1.0 / m_A28;
+	const double f9_51 = -f9 * m_A190;
+	m_A191 += m_A29 * f9_51;
+	m_A192 += m_A30 * f9_51;
+	RHS51 += f9_51 * RHS9;
+	const double f9_65 = -f9 * m_A268;
+	m_A273 += m_A29 * f9_65;
+	m_A276 += m_A30 * f9_65;
+	RHS65 += f9_65 * RHS9;
+	const double f10 = 1.0 / m_A31;
+	const double f10_45 = -f10 * m_A151;
+	m_A152 += m_A32 * f10_45;
+	m_A155 += m_A33 * f10_45;
+	RHS45 += f10_45 * RHS10;
+	const double f11 = 1.0 / m_A34;
+	const double f11_45 = -f11 * m_A152;
+	m_A153 += m_A35 * f11_45;
+	m_A154 += m_A36 * f11_45;
+	m_A155 += m_A37 * f11_45;
+	RHS45 += f11_45 * RHS11;
+	const double f11_52 = -f11 * m_A194;
+	m_A195 += m_A35 * f11_52;
+	m_A196 += m_A36 * f11_52;
+	m_A199 += m_A37 * f11_52;
+	RHS52 += f11_52 * RHS11;
+	const double f11_72 = -f11 * m_A338;
+	m_A339 += m_A35 * f11_72;
+	m_A341 += m_A36 * f11_72;
+	m_A348 += m_A37 * f11_72;
+	RHS72 += f11_72 * RHS11;
+	const double f12 = 1.0 / m_A38;
+	const double f12_58 = -f12 * m_A223;
+	m_A224 += m_A39 * f12_58;
+	m_A231 += m_A40 * f12_58;
+	RHS58 += f12_58 * RHS12;
+	const double f13 = 1.0 / m_A41;
+	const double f13_48 = -f13 * m_A168;
+	m_A171 += m_A42 * f13_48;
+	m_A173 += m_A43 * f13_48;
+	m_A174 += m_A44 * f13_48;
+	RHS48 += f13_48 * RHS13;
+	const double f13_65 = -f13 * m_A269;
+	m_A272 += m_A42 * f13_65;
+	m_A276 += m_A43 * f13_65;
+	m_A277 += m_A44 * f13_65;
+	RHS65 += f13_65 * RHS13;
+	const double f13_66 = -f13 * m_A280;
+	m_A285 += m_A42 * f13_66;
+	m_A287 += m_A43 * f13_66;
+	m_A288 += m_A44 * f13_66;
+	RHS66 += f13_66 * RHS13;
+	const double f14 = 1.0 / m_A45;
+	const double f14_53 = -f14 * m_A201;
+	m_A203 += m_A46 * f14_53;
+	m_A204 += m_A47 * f14_53;
+	RHS53 += f14_53 * RHS14;
+	const double f14_58 = -f14 * m_A224;
+	m_A229 += m_A46 * f14_58;
+	m_A231 += m_A47 * f14_58;
+	RHS58 += f14_58 * RHS14;
+	const double f14_71 = -f14 * m_A328;
+	m_A333 += m_A46 * f14_71;
+	m_A335 += m_A47 * f14_71;
+	RHS71 += f14_71 * RHS14;
+	const double f14_73 = -f14 * m_A352;
+	m_A358 += m_A46 * f14_73;
+	m_A360 += m_A47 * f14_73;
+	RHS73 += f14_73 * RHS14;
+	const double f15 = 1.0 / m_A48;
+	const double f15_66 = -f15 * m_A281;
+	m_A282 += m_A49 * f15_66;
+	m_A285 += m_A50 * f15_66;
+	RHS66 += f15_66 * RHS15;
+	const double f16 = 1.0 / m_A51;
+	const double f16_43 = -f16 * m_A143;
+	m_A145 += m_A52 * f16_43;
+	m_A146 += m_A53 * f16_43;
+	RHS43 += f16_43 * RHS16;
+	const double f16_46 = -f16 * m_A157;
+	m_A161 += m_A52 * f16_46;
+	m_A162 += m_A53 * f16_46;
+	RHS46 += f16_46 * RHS16;
+	const double f16_48 = -f16 * m_A169;
+	m_A170 += m_A52 * f16_48;
+	m_A171 += m_A53 * f16_48;
+	RHS48 += f16_48 * RHS16;
+	const double f16_66 = -f16 * m_A282;
+	m_A284 += m_A52 * f16_66;
+	m_A285 += m_A53 * f16_66;
+	RHS66 += f16_66 * RHS16;
+	const double f17 = 1.0 / m_A54;
+	const double f17_63 = -f17 * m_A260;
+	m_A262 += m_A55 * f17_63;
+	RHS63 += f17_63 * RHS17;
+	const double f18 = 1.0 / m_A56;
+	const double f18_46 = -f18 * m_A158;
+	m_A161 += m_A57 * f18_46;
+	m_A164 += m_A58 * f18_46;
+	RHS46 += f18_46 * RHS18;
+	const double f18_66 = -f18 * m_A283;
+	m_A284 += m_A57 * f18_66;
+	m_A288 += m_A58 * f18_66;
+	RHS66 += f18_66 * RHS18;
+	const double f19 = 1.0 / m_A59;
+	const double f19_56 = -f19 * m_A215;
+	m_A218 += m_A60 * f19_56;
+	RHS56 += f19_56 * RHS19;
+	const double f20 = 1.0 / m_A61;
+	const double f20_54 = -f20 * m_A205;
+	m_A206 += m_A62 * f20_54;
+	RHS54 += f20_54 * RHS20;
+	const double f21 = 1.0 / m_A63;
+	const double f21_56 = -f21 * m_A216;
+	m_A218 += m_A64 * f21_56;
+	RHS56 += f21_56 * RHS21;
+	const double f22 = 1.0 / m_A65;
+	const double f22_40 = -f22 * m_A127;
+	m_A130 += m_A66 * f22_40;
+	m_A133 += m_A67 * f22_40;
+	RHS40 += f22_40 * RHS22;
+	const double f22_69 = -f22 * m_A312;
+	m_A314 += m_A66 * f22_69;
+	m_A320 += m_A67 * f22_69;
+	RHS69 += f22_69 * RHS22;
+	const double f23 = 1.0 / m_A68;
+	const double f23_69 = -f23 * m_A313;
+	m_A316 += m_A69 * f23_69;
+	m_A320 += m_A70 * f23_69;
+	RHS69 += f23_69 * RHS23;
+	const double f24 = 1.0 / m_A71;
+	const double f24_56 = -f24 * m_A217;
+	m_A218 += m_A72 * f24_56;
+	RHS56 += f24_56 * RHS24;
+	const double f25 = 1.0 / m_A73;
+	const double f25_41 = -f25 * m_A135;
+	m_A137 += m_A74 * f25_41;
+	RHS41 += f25_41 * RHS25;
+	const double f26 = 1.0 / m_A75;
+	const double f26_70 = -f26 * m_A322;
+	m_A323 += m_A76 * f26_70;
+	RHS70 += f26_70 * RHS26;
+	const double f27 = 1.0 / m_A77;
+	const double f27_41 = -f27 * m_A136;
+	m_A137 += m_A78 * f27_41;
+	m_A138 += m_A79 * f27_41;
+	m_A139 += m_A80 * f27_41;
+	RHS41 += f27_41 * RHS27;
+	const double f27_62 = -f27 * m_A256;
+	m_A257 += m_A78 * f27_62;
+	m_A258 += m_A79 * f27_62;
+	m_A259 += m_A80 * f27_62;
+	RHS62 += f27_62 * RHS27;
+	const double f27_68 = -f27 * m_A303;
+	m_A305 += m_A78 * f27_68;
+	m_A307 += m_A79 * f27_68;
+	m_A309 += m_A80 * f27_68;
+	RHS68 += f27_68 * RHS27;
+	const double f28 = 1.0 / m_A81;
+	const double f28_49 = -f28 * m_A175;
+	m_A177 += m_A82 * f28_49;
+	m_A179 += m_A83 * f28_49;
+	RHS49 += f28_49 * RHS28;
+	const double f28_75 = -f28 * m_A381;
+	m_A385 += m_A82 * f28_75;
+	m_A398 += m_A83 * f28_75;
+	RHS75 += f28_75 * RHS28;
+	const double f29 = 1.0 / m_A84;
+	const double f29_55 = -f29 * m_A208;
+	m_A211 += m_A85 * f29_55;
+	m_A212 += m_A86 * f29_55;
+	m_A213 += m_A87 * f29_55;
+	RHS55 += f29_55 * RHS29;
+	const double f29_58 = -f29 * m_A225;
+	m_A226 += m_A85 * f29_58;
+	m_A227 += m_A86 * f29_58;
+	m_A228 += m_A87 * f29_58;
+	RHS58 += f29_58 * RHS29;
+	const double f29_60 = -f29 * m_A241;
+	m_A243 += m_A85 * f29_60;
+	m_A244 += m_A86 * f29_60;
+	m_A245 += m_A87 * f29_60;
+	RHS60 += f29_60 * RHS29;
+	const double f30 = 1.0 / m_A88;
+	const double f30_61 = -f30 * m_A251;
+	m_A253 += m_A89 * f30_61;
+	m_A255 += m_A90 * f30_61;
+	RHS61 += f30_61 * RHS30;
+	const double f30_75 = -f30 * m_A382;
+	m_A390 += m_A89 * f30_75;
+	m_A398 += m_A90 * f30_75;
+	RHS75 += f30_75 * RHS30;
+	const double f31 = 1.0 / m_A91;
+	const double f31_46 = -f31 * m_A159;
+	m_A160 += m_A92 * f31_46;
+	m_A161 += m_A93 * f31_46;
+	m_A163 += m_A94 * f31_46;
+	RHS46 += f31_46 * RHS31;
+	const double f31_59 = -f31 * m_A233;
+	m_A234 += m_A92 * f31_59;
+	m_A235 += m_A93 * f31_59;
+	m_A237 += m_A94 * f31_59;
+	RHS59 += f31_59 * RHS31;
+	const double f32 = 1.0 / m_A95;
+	const double f32_64 = -f32 * m_A264;
+	m_A265 += m_A96 * f32_64;
+	m_A266 += m_A97 * f32_64;
+	RHS64 += f32_64 * RHS32;
+	const double f32_65 = -f32 * m_A270;
+	m_A275 += m_A96 * f32_65;
+	m_A276 += m_A97 * f32_65;
+	RHS65 += f32_65 * RHS32;
+	const double f33 = 1.0 / m_A98;
+	const double f33_49 = -f33 * m_A176;
+	m_A177 += m_A99 * f33_49;
+	m_A178 += m_A100 * f33_49;
+	RHS49 += f33_49 * RHS33;
+	const double f33_55 = -f33 * m_A209;
+	m_A210 += m_A99 * f33_55;
+	m_A211 += m_A100 * f33_55;
+	RHS55 += f33_55 * RHS33;
+	const double f34 = 1.0 / m_A101;
+	const double f34_60 = -f34 * m_A242;
+	m_A245 += m_A102 * f34_60;
+	m_A249 += m_A103 * f34_60;
+	RHS60 += f34_60 * RHS34;
+	const double f34_74 = -f34 * m_A363;
+	m_A368 += m_A102 * f34_74;
+	m_A377 += m_A103 * f34_74;
+	RHS74 += f34_74 * RHS34;
+	const double f35 = 1.0 / m_A104;
+	const double f35_61 = -f35 * m_A252;
+	m_A253 += m_A105 * f35_61;
+	m_A254 += m_A106 * f35_61;
+	RHS61 += f35_61 * RHS35;
+	const double f35_74 = -f35 * m_A364;
+	m_A369 += m_A105 * f35_74;
+	m_A377 += m_A106 * f35_74;
+	RHS74 += f35_74 * RHS35;
+	const double f36 = 1.0 / m_A107;
+	const double f36_74 = -f36 * m_A365;
+	m_A377 += m_A108 * f36_74;
+	RHS74 += f36_74 * RHS36;
+	const double f37 = 1.0 / m_A110;
+	const double f37_68 = -f37 * m_A304;
+	m_A309 += m_A111 * f37_68;
+	RHS68 += f37_68 * RHS37;
+	const double f38 = 1.0 / m_A114;
+	const double f38_39 = -f38 * m_A119;
+	m_A120 += m_A115 * f38_39;
+	m_A121 += m_A116 * f38_39;
+	RHS39 += f38_39 * RHS38;
+	const double f38_40 = -f38 * m_A128;
+	m_A129 += m_A115 * f38_40;
+	m_A130 += m_A116 * f38_40;
+	RHS40 += f38_40 * RHS38;
+	const double f39 = 1.0 / m_A120;
+	const double f39_40 = -f39 * m_A129;
+	m_A130 += m_A121 * f39_40;
+	m_A131 += m_A122 * f39_40;
+	m_A132 += m_A123 * f39_40;
+	m_A134 += m_A124 * f39_40;
+	RHS40 += f39_40 * RHS39;
+	const double f39_50 = -f39 * m_A183;
+	m_A184 += m_A121 * f39_50;
+	m_A185 += m_A122 * f39_50;
+	m_A186 += m_A123 * f39_50;
+	m_A189 += m_A124 * f39_50;
+	RHS50 += f39_50 * RHS39;
+	const double f39_67 = -f39 * m_A294;
+	m_A295 += m_A121 * f39_67;
+	m_A297 += m_A122 * f39_67;
+	m_A298 += m_A123 * f39_67;
+	m_A301 += m_A124 * f39_67;
+	RHS67 += f39_67 * RHS39;
+	const double f39_75 = -f39 * m_A383;
+	m_A384 += m_A121 * f39_75;
+	m_A386 += m_A122 * f39_75;
+	m_A391 += m_A123 * f39_75;
+	m_A398 += m_A124 * f39_75;
+	RHS75 += f39_75 * RHS39;
+	const double f40 = 1.0 / m_A130;
+	const double f40_50 = -f40 * m_A184;
+	m_A185 += m_A131 * f40_50;
+	m_A186 += m_A132 * f40_50;
+	m_A188 += m_A133 * f40_50;
+	m_A189 += m_A134 * f40_50;
+	RHS50 += f40_50 * RHS40;
+	const double f40_67 = -f40 * m_A295;
+	m_A297 += m_A131 * f40_67;
+	m_A298 += m_A132 * f40_67;
+	m_A300 += m_A133 * f40_67;
+	m_A301 += m_A134 * f40_67;
+	RHS67 += f40_67 * RHS40;
+	const double f40_69 = -f40 * m_A314;
+	m_A315 += m_A131 * f40_69;
+	m_A318 += m_A132 * f40_69;
+	m_A320 += m_A133 * f40_69;
+	m_A321 += m_A134 * f40_69;
+	RHS69 += f40_69 * RHS40;
+	const double f40_75 = -f40 * m_A384;
+	m_A386 += m_A131 * f40_75;
+	m_A391 += m_A132 * f40_75;
+	m_A393 += m_A133 * f40_75;
+	m_A398 += m_A134 * f40_75;
+	RHS75 += f40_75 * RHS40;
+	const double f41 = 1.0 / m_A137;
+	const double f41_62 = -f41 * m_A257;
+	m_A258 += m_A138 * f41_62;
+	m_A259 += m_A139 * f41_62;
+	RHS62 += f41_62 * RHS41;
+	const double f41_68 = -f41 * m_A305;
+	m_A307 += m_A138 * f41_68;
+	m_A309 += m_A139 * f41_68;
+	RHS68 += f41_68 * RHS41;
+	const double f42 = 1.0 / m_A140;
+	const double f42_63 = -f42 * m_A261;
+	m_A262 += m_A141 * f42_63;
+	m_A263 += m_A142 * f42_63;
+	RHS63 += f42_63 * RHS42;
+	const double f42_70 = -f42 * m_A323;
+	m_A325 += m_A141 * f42_70;
+	m_A326 += m_A142 * f42_70;
+	RHS70 += f42_70 * RHS42;
+	const double f43 = 1.0 / m_A144;
+	const double f43_46 = -f43 * m_A160;
+	m_A161 += m_A145 * f43_46;
+	m_A162 += m_A146 * f43_46;
+	RHS46 += f43_46 * RHS43;
+	const double f43_59 = -f43 * m_A234;
+	m_A235 += m_A145 * f43_59;
+	m_A236 += m_A146 * f43_59;
+	RHS59 += f43_59 * RHS43;
+	const double f44 = 1.0 / m_A149;
+	const double f44_67 = -f44 * m_A296;
+	m_A298 += m_A150 * f44_67;
+	RHS67 += f44_67 * RHS44;
+	const double f45 = 1.0 / m_A153;
+	const double f45_52 = -f45 * m_A195;
+	m_A196 += m_A154 * f45_52;
+	m_A199 += m_A155 * f45_52;
+	m_A200 += m_A156 * f45_52;
+	RHS52 += f45_52 * RHS45;
+	const double f45_72 = -f45 * m_A339;
+	m_A341 += m_A154 * f45_72;
+	m_A348 += m_A155 * f45_72;
+	m_A349 += m_A156 * f45_72;
+	RHS72 += f45_72 * RHS45;
+	const double f45_73 = -f45 * m_A353;
+	m_A354 += m_A154 * f45_73;
+	m_A359 += m_A155 * f45_73;
+	m_A360 += m_A156 * f45_73;
+	RHS73 += f45_73 * RHS45;
+	const double f46 = 1.0 / m_A161;
+	const double f46_48 = -f46 * m_A170;
+	m_A171 += m_A162 * f46_48;
+	m_A172 += m_A163 * f46_48;
+	m_A174 += m_A164 * f46_48;
+	RHS48 += f46_48 * RHS46;
+	const double f46_59 = -f46 * m_A235;
+	m_A236 += m_A162 * f46_59;
+	m_A237 += m_A163 * f46_59;
+	m_A239 += m_A164 * f46_59;
+	RHS59 += f46_59 * RHS46;
+	const double f46_66 = -f46 * m_A284;
+	m_A285 += m_A162 * f46_66;
+	m_A286 += m_A163 * f46_66;
+	m_A288 += m_A164 * f46_66;
+	RHS66 += f46_66 * RHS46;
+	const double f47 = 1.0 / m_A166;
+	const double f47_65 = -f47 * m_A271;
+	m_A276 += m_A167 * f47_65;
+	RHS65 += f47_65 * RHS47;
+	const double f48 = 1.0 / m_A171;
+	const double f48_59 = -f48 * m_A236;
+	m_A237 += m_A172 * f48_59;
+	m_A238 += m_A173 * f48_59;
+	m_A239 += m_A174 * f48_59;
+	RHS59 += f48_59 * RHS48;
+	const double f48_65 = -f48 * m_A272;
+	m_A274 += m_A172 * f48_65;
+	m_A276 += m_A173 * f48_65;
+	m_A277 += m_A174 * f48_65;
+	RHS65 += f48_65 * RHS48;
+	const double f48_66 = -f48 * m_A285;
+	m_A286 += m_A172 * f48_66;
+	m_A287 += m_A173 * f48_66;
+	m_A288 += m_A174 * f48_66;
+	RHS66 += f48_66 * RHS48;
+	const double f49 = 1.0 / m_A177;
+	const double f49_55 = -f49 * m_A210;
+	m_A211 += m_A178 * f49_55;
+	m_A214 += m_A179 * f49_55;
+	RHS55 += f49_55 * RHS49;
+	const double f49_75 = -f49 * m_A385;
+	m_A387 += m_A178 * f49_75;
+	m_A398 += m_A179 * f49_75;
+	RHS75 += f49_75 * RHS49;
+	const double f50 = 1.0 / m_A185;
+	const double f50_67 = -f50 * m_A297;
+	m_A298 += m_A186 * f50_67;
+	m_A299 += m_A187 * f50_67;
+	m_A300 += m_A188 * f50_67;
+	m_A301 += m_A189 * f50_67;
+	RHS67 += f50_67 * RHS50;
+	const double f50_68 = -f50 * m_A306;
+	m_A308 += m_A186 * f50_68;
+	m_A309 += m_A187 * f50_68;
+	m_A310 += m_A188 * f50_68;
+	m_A311 += m_A189 * f50_68;
+	RHS68 += f50_68 * RHS50;
+	const double f50_69 = -f50 * m_A315;
+	m_A318 += m_A186 * f50_69;
+	m_A319 += m_A187 * f50_69;
+	m_A320 += m_A188 * f50_69;
+	m_A321 += m_A189 * f50_69;
+	RHS69 += f50_69 * RHS50;
+	const double f50_75 = -f50 * m_A386;
+	m_A391 += m_A186 * f50_75;
+	m_A392 += m_A187 * f50_75;
+	m_A393 += m_A188 * f50_75;
+	m_A398 += m_A189 * f50_75;
+	RHS75 += f50_75 * RHS50;
+	const double f51 = 1.0 / m_A191;
+	const double f51_65 = -f51 * m_A273;
+	m_A276 += m_A192 * f51_65;
+	m_A278 += m_A193 * f51_65;
+	RHS65 += f51_65 * RHS51;
+	const double f51_72 = -f51 * m_A340;
+	m_A345 += m_A192 * f51_72;
+	m_A348 += m_A193 * f51_72;
+	RHS72 += f51_72 * RHS51;
+	const double f52 = 1.0 / m_A196;
+	const double f52_71 = -f52 * m_A329;
+	m_A330 += m_A197 * f52_71;
+	m_A333 += m_A198 * f52_71;
+	m_A334 += m_A199 * f52_71;
+	m_A335 += m_A200 * f52_71;
+	RHS71 += f52_71 * RHS52;
+	const double f52_72 = -f52 * m_A341;
+	m_A342 += m_A197 * f52_72;
+	m_A347 += m_A198 * f52_72;
+	m_A348 += m_A199 * f52_72;
+	m_A349 += m_A200 * f52_72;
+	RHS72 += f52_72 * RHS52;
+	const double f52_73 = -f52 * m_A354;
+	m_A355 += m_A197 * f52_73;
+	m_A358 += m_A198 * f52_73;
+	m_A359 += m_A199 * f52_73;
+	m_A360 += m_A200 * f52_73;
+	RHS73 += f52_73 * RHS52;
+	const double f53 = 1.0 / m_A202;
+	const double f53_71 = -f53 * m_A330;
+	m_A333 += m_A203 * f53_71;
+	m_A335 += m_A204 * f53_71;
+	RHS71 += f53_71 * RHS53;
+	const double f53_72 = -f53 * m_A342;
+	m_A347 += m_A203 * f53_72;
+	m_A349 += m_A204 * f53_72;
+	RHS72 += f53_72 * RHS53;
+	const double f53_73 = -f53 * m_A355;
+	m_A358 += m_A203 * f53_73;
+	m_A360 += m_A204 * f53_73;
+	RHS73 += f53_73 * RHS53;
+	const double f54 = 1.0 / m_A206;
+	const double f54_69 = -f54 * m_A316;
+	m_A320 += m_A207 * f54_69;
+	RHS69 += f54_69 * RHS54;
+	const double f55 = 1.0 / m_A211;
+	const double f55_58 = -f55 * m_A226;
+	m_A227 += m_A212 * f55_58;
+	m_A228 += m_A213 * f55_58;
+	m_A232 += m_A214 * f55_58;
+	RHS58 += f55_58 * RHS55;
+	const double f55_60 = -f55 * m_A243;
+	m_A244 += m_A212 * f55_60;
+	m_A245 += m_A213 * f55_60;
+	m_A250 += m_A214 * f55_60;
+	RHS60 += f55_60 * RHS55;
+	const double f55_75 = -f55 * m_A387;
+	m_A388 += m_A212 * f55_75;
+	m_A389 += m_A213 * f55_75;
+	m_A398 += m_A214 * f55_75;
+	RHS75 += f55_75 * RHS55;
+	const double f56 = 1.0 / m_A218;
+	const double f56_69 = -f56 * m_A317;
+	m_A320 += m_A219 * f56_69;
+	RHS69 += f56_69 * RHS56;
+	const double f57 = 1.0 / m_A220;
+	const double f57_70 = -f57 * m_A324;
+	m_A326 += m_A221 * f57_70;
+	m_A327 += m_A222 * f57_70;
+	RHS70 += f57_70 * RHS57;
+	const double f57_74 = -f57 * m_A366;
+	m_A373 += m_A221 * f57_74;
+	m_A377 += m_A222 * f57_74;
+	RHS74 += f57_74 * RHS57;
+	const double f58 = 1.0 / m_A227;
+	const double f58_60 = -f58 * m_A244;
+	m_A245 += m_A228 * f58_60;
+	m_A246 += m_A229 * f58_60;
+	m_A247 += m_A230 * f58_60;
+	m_A248 += m_A231 * f58_60;
+	m_A250 += m_A232 * f58_60;
+	RHS60 += f58_60 * RHS58;
+	const double f58_71 = -f58 * m_A331;
+	m_A332 += m_A228 * f58_71;
+	m_A333 += m_A229 * f58_71;
+	m_A334 += m_A230 * f58_71;
+	m_A335 += m_A231 * f58_71;
+	m_A337 += m_A232 * f58_71;
+	RHS71 += f58_71 * RHS58;
+	const double f58_72 = -f58 * m_A343;
+	m_A344 += m_A228 * f58_72;
+	m_A347 += m_A229 * f58_72;
+	m_A348 += m_A230 * f58_72;
+	m_A349 += m_A231 * f58_72;
+	m_A351 += m_A232 * f58_72;
+	RHS72 += f58_72 * RHS58;
+	const double f58_73 = -f58 * m_A356;
+	m_A357 += m_A228 * f58_73;
+	m_A358 += m_A229 * f58_73;
+	m_A359 += m_A230 * f58_73;
+	m_A360 += m_A231 * f58_73;
+	m_A362 += m_A232 * f58_73;
+	RHS73 += f58_73 * RHS58;
+	const double f58_75 = -f58 * m_A388;
+	m_A389 += m_A228 * f58_75;
+	m_A394 += m_A229 * f58_75;
+	m_A395 += m_A230 * f58_75;
+	m_A396 += m_A231 * f58_75;
+	m_A398 += m_A232 * f58_75;
+	RHS75 += f58_75 * RHS58;
+	const double f59 = 1.0 / m_A237;
+	const double f59_65 = -f59 * m_A274;
+	m_A276 += m_A238 * f59_65;
+	m_A277 += m_A239 * f59_65;
+	m_A279 += m_A240 * f59_65;
+	RHS65 += f59_65 * RHS59;
+	const double f59_66 = -f59 * m_A286;
+	m_A287 += m_A238 * f59_66;
+	m_A288 += m_A239 * f59_66;
+	m_A290 += m_A240 * f59_66;
+	RHS66 += f59_66 * RHS59;
+	const double f59_74 = -f59 * m_A367;
+	m_A371 += m_A238 * f59_74;
+	m_A372 += m_A239 * f59_74;
+	m_A377 += m_A240 * f59_74;
+	RHS74 += f59_74 * RHS59;
+	const double f60 = 1.0 / m_A245;
+	const double f60_71 = -f60 * m_A332;
+	m_A333 += m_A246 * f60_71;
+	m_A334 += m_A247 * f60_71;
+	m_A335 += m_A248 * f60_71;
+	m_A336 += m_A249 * f60_71;
+	m_A337 += m_A250 * f60_71;
+	RHS71 += f60_71 * RHS60;
+	const double f60_72 = -f60 * m_A344;
+	m_A347 += m_A246 * f60_72;
+	m_A348 += m_A247 * f60_72;
+	m_A349 += m_A248 * f60_72;
+	m_A350 += m_A249 * f60_72;
+	m_A351 += m_A250 * f60_72;
+	RHS72 += f60_72 * RHS60;
+	const double f60_73 = -f60 * m_A357;
+	m_A358 += m_A246 * f60_73;
+	m_A359 += m_A247 * f60_73;
+	m_A360 += m_A248 * f60_73;
+	m_A361 += m_A249 * f60_73;
+	m_A362 += m_A250 * f60_73;
+	RHS73 += f60_73 * RHS60;
+	const double f60_74 = -f60 * m_A368;
+	m_A374 += m_A246 * f60_74;
+	m_A375 += m_A247 * f60_74;
+	m_A376 += m_A248 * f60_74;
+	m_A377 += m_A249 * f60_74;
+	m_A378 += m_A250 * f60_74;
+	RHS74 += f60_74 * RHS60;
+	const double f60_75 = -f60 * m_A389;
+	m_A394 += m_A246 * f60_75;
+	m_A395 += m_A247 * f60_75;
+	m_A396 += m_A248 * f60_75;
+	m_A397 += m_A249 * f60_75;
+	m_A398 += m_A250 * f60_75;
+	RHS75 += f60_75 * RHS60;
+	const double f61 = 1.0 / m_A253;
+	const double f61_74 = -f61 * m_A369;
+	m_A377 += m_A254 * f61_74;
+	m_A378 += m_A255 * f61_74;
+	RHS74 += f61_74 * RHS61;
+	const double f61_75 = -f61 * m_A390;
+	m_A397 += m_A254 * f61_75;
+	m_A398 += m_A255 * f61_75;
+	RHS75 += f61_75 * RHS61;
+	const double f62 = 1.0 / m_A258;
+	const double f62_68 = -f62 * m_A307;
+	m_A309 += m_A259 * f62_68;
+	RHS68 += f62_68 * RHS62;
+	const double f63 = 1.0 / m_A262;
+	const double f63_70 = -f63 * m_A325;
+	m_A326 += m_A263 * f63_70;
+	RHS70 += f63_70 * RHS63;
+	const double f64 = 1.0 / m_A265;
+	const double f64_65 = -f64 * m_A275;
+	m_A276 += m_A266 * f64_65;
+	m_A279 += m_A267 * f64_65;
+	RHS65 += f64_65 * RHS64;
+	const double f64_74 = -f64 * m_A370;
+	m_A371 += m_A266 * f64_74;
+	m_A377 += m_A267 * f64_74;
+	RHS74 += f64_74 * RHS64;
+	const double f65 = 1.0 / m_A276;
+	const double f65_66 = -f65 * m_A287;
+	m_A288 += m_A277 * f65_66;
+	m_A289 += m_A278 * f65_66;
+	m_A290 += m_A279 * f65_66;
+	RHS66 += f65_66 * RHS65;
+	const double f65_72 = -f65 * m_A345;
+	m_A346 += m_A277 * f65_72;
+	m_A348 += m_A278 * f65_72;
+	m_A350 += m_A279 * f65_72;
+	RHS72 += f65_72 * RHS65;
+	const double f65_74 = -f65 * m_A371;
+	m_A372 += m_A277 * f65_74;
+	m_A375 += m_A278 * f65_74;
+	m_A377 += m_A279 * f65_74;
+	RHS74 += f65_74 * RHS65;
+	const double f66 = 1.0 / m_A288;
+	const double f66_72 = -f66 * m_A346;
+	m_A348 += m_A289 * f66_72;
+	m_A350 += m_A290 * f66_72;
+	RHS72 += f66_72 * RHS66;
+	const double f66_74 = -f66 * m_A372;
+	m_A375 += m_A289 * f66_74;
+	m_A377 += m_A290 * f66_74;
+	RHS74 += f66_74 * RHS66;
+	const double f67 = 1.0 / m_A298;
+	const double f67_68 = -f67 * m_A308;
+	m_A309 += m_A299 * f67_68;
+	m_A310 += m_A300 * f67_68;
+	m_A311 += m_A301 * f67_68;
+	RHS68 += f67_68 * RHS67;
+	const double f67_69 = -f67 * m_A318;
+	m_A319 += m_A299 * f67_69;
+	m_A320 += m_A300 * f67_69;
+	m_A321 += m_A301 * f67_69;
+	RHS69 += f67_69 * RHS67;
+	const double f67_75 = -f67 * m_A391;
+	m_A392 += m_A299 * f67_75;
+	m_A393 += m_A300 * f67_75;
+	m_A398 += m_A301 * f67_75;
+	RHS75 += f67_75 * RHS67;
+	const double f68 = 1.0 / m_A309;
+	const double f68_69 = -f68 * m_A319;
+	m_A320 += m_A310 * f68_69;
+	m_A321 += m_A311 * f68_69;
+	RHS69 += f68_69 * RHS68;
+	const double f68_75 = -f68 * m_A392;
+	m_A393 += m_A310 * f68_75;
+	m_A398 += m_A311 * f68_75;
+	RHS75 += f68_75 * RHS68;
+	const double f69 = 1.0 / m_A320;
+	const double f69_75 = -f69 * m_A393;
+	m_A398 += m_A321 * f69_75;
+	RHS75 += f69_75 * RHS69;
+	const double f70 = 1.0 / m_A326;
+	const double f70_74 = -f70 * m_A373;
+	m_A377 += m_A327 * f70_74;
+	RHS74 += f70_74 * RHS70;
+	const double f71 = 1.0 / m_A333;
+	const double f71_72 = -f71 * m_A347;
+	m_A348 += m_A334 * f71_72;
+	m_A349 += m_A335 * f71_72;
+	m_A350 += m_A336 * f71_72;
+	m_A351 += m_A337 * f71_72;
+	RHS72 += f71_72 * RHS71;
+	const double f71_73 = -f71 * m_A358;
+	m_A359 += m_A334 * f71_73;
+	m_A360 += m_A335 * f71_73;
+	m_A361 += m_A336 * f71_73;
+	m_A362 += m_A337 * f71_73;
+	RHS73 += f71_73 * RHS71;
+	const double f71_74 = -f71 * m_A374;
+	m_A375 += m_A334 * f71_74;
+	m_A376 += m_A335 * f71_74;
+	m_A377 += m_A336 * f71_74;
+	m_A378 += m_A337 * f71_74;
+	RHS74 += f71_74 * RHS71;
+	const double f71_75 = -f71 * m_A394;
+	m_A395 += m_A334 * f71_75;
+	m_A396 += m_A335 * f71_75;
+	m_A397 += m_A336 * f71_75;
+	m_A398 += m_A337 * f71_75;
+	RHS75 += f71_75 * RHS71;
+	const double f72 = 1.0 / m_A348;
+	const double f72_73 = -f72 * m_A359;
+	m_A360 += m_A349 * f72_73;
+	m_A361 += m_A350 * f72_73;
+	m_A362 += m_A351 * f72_73;
+	RHS73 += f72_73 * RHS72;
+	const double f72_74 = -f72 * m_A375;
+	m_A376 += m_A349 * f72_74;
+	m_A377 += m_A350 * f72_74;
+	m_A378 += m_A351 * f72_74;
+	RHS74 += f72_74 * RHS72;
+	const double f72_75 = -f72 * m_A395;
+	m_A396 += m_A349 * f72_75;
+	m_A397 += m_A350 * f72_75;
+	m_A398 += m_A351 * f72_75;
+	RHS75 += f72_75 * RHS72;
+	const double f73 = 1.0 / m_A360;
+	const double f73_74 = -f73 * m_A376;
+	m_A377 += m_A361 * f73_74;
+	m_A378 += m_A362 * f73_74;
+	RHS74 += f73_74 * RHS73;
+	const double f73_75 = -f73 * m_A396;
+	m_A397 += m_A361 * f73_75;
+	m_A398 += m_A362 * f73_75;
+	RHS75 += f73_75 * RHS73;
+	const double f74 = 1.0 / m_A377;
+	const double f74_75 = -f74 * m_A397;
+	m_A398 += m_A378 * f74_75;
+	RHS75 += f74_75 * RHS74;
+	V[75] = RHS75 / m_A398;
+	double tmp74 = 0.0;
+	tmp74 += m_A378 * V[75];
+	V[74] = (RHS74 - tmp74) / m_A377;
+	double tmp73 = 0.0;
+	tmp73 += m_A361 * V[74];
+	tmp73 += m_A362 * V[75];
+	V[73] = (RHS73 - tmp73) / m_A360;
+	double tmp72 = 0.0;
+	tmp72 += m_A349 * V[73];
+	tmp72 += m_A350 * V[74];
+	tmp72 += m_A351 * V[75];
+	V[72] = (RHS72 - tmp72) / m_A348;
+	double tmp71 = 0.0;
+	tmp71 += m_A334 * V[72];
+	tmp71 += m_A335 * V[73];
+	tmp71 += m_A336 * V[74];
+	tmp71 += m_A337 * V[75];
+	V[71] = (RHS71 - tmp71) / m_A333;
+	double tmp70 = 0.0;
+	tmp70 += m_A327 * V[74];
+	V[70] = (RHS70 - tmp70) / m_A326;
+	double tmp69 = 0.0;
+	tmp69 += m_A321 * V[75];
+	V[69] = (RHS69 - tmp69) / m_A320;
+	double tmp68 = 0.0;
+	tmp68 += m_A310 * V[69];
+	tmp68 += m_A311 * V[75];
+	V[68] = (RHS68 - tmp68) / m_A309;
+	double tmp67 = 0.0;
+	tmp67 += m_A299 * V[68];
+	tmp67 += m_A300 * V[69];
+	tmp67 += m_A301 * V[75];
+	V[67] = (RHS67 - tmp67) / m_A298;
+	double tmp66 = 0.0;
+	tmp66 += m_A289 * V[72];
+	tmp66 += m_A290 * V[74];
+	V[66] = (RHS66 - tmp66) / m_A288;
+	double tmp65 = 0.0;
+	tmp65 += m_A277 * V[66];
+	tmp65 += m_A278 * V[72];
+	tmp65 += m_A279 * V[74];
+	V[65] = (RHS65 - tmp65) / m_A276;
+	double tmp64 = 0.0;
+	tmp64 += m_A266 * V[65];
+	tmp64 += m_A267 * V[74];
+	V[64] = (RHS64 - tmp64) / m_A265;
+	double tmp63 = 0.0;
+	tmp63 += m_A263 * V[70];
+	V[63] = (RHS63 - tmp63) / m_A262;
+	double tmp62 = 0.0;
+	tmp62 += m_A259 * V[68];
+	V[62] = (RHS62 - tmp62) / m_A258;
+	double tmp61 = 0.0;
+	tmp61 += m_A254 * V[74];
+	tmp61 += m_A255 * V[75];
+	V[61] = (RHS61 - tmp61) / m_A253;
+	double tmp60 = 0.0;
+	tmp60 += m_A246 * V[71];
+	tmp60 += m_A247 * V[72];
+	tmp60 += m_A248 * V[73];
+	tmp60 += m_A249 * V[74];
+	tmp60 += m_A250 * V[75];
+	V[60] = (RHS60 - tmp60) / m_A245;
+	double tmp59 = 0.0;
+	tmp59 += m_A238 * V[65];
+	tmp59 += m_A239 * V[66];
+	tmp59 += m_A240 * V[74];
+	V[59] = (RHS59 - tmp59) / m_A237;
+	double tmp58 = 0.0;
+	tmp58 += m_A228 * V[60];
+	tmp58 += m_A229 * V[71];
+	tmp58 += m_A230 * V[72];
+	tmp58 += m_A231 * V[73];
+	tmp58 += m_A232 * V[75];
+	V[58] = (RHS58 - tmp58) / m_A227;
+	double tmp57 = 0.0;
+	tmp57 += m_A221 * V[70];
+	tmp57 += m_A222 * V[74];
+	V[57] = (RHS57 - tmp57) / m_A220;
+	double tmp56 = 0.0;
+	tmp56 += m_A219 * V[69];
+	V[56] = (RHS56 - tmp56) / m_A218;
+	double tmp55 = 0.0;
+	tmp55 += m_A212 * V[58];
+	tmp55 += m_A213 * V[60];
+	tmp55 += m_A214 * V[75];
+	V[55] = (RHS55 - tmp55) / m_A211;
+	double tmp54 = 0.0;
+	tmp54 += m_A207 * V[69];
+	V[54] = (RHS54 - tmp54) / m_A206;
+	double tmp53 = 0.0;
+	tmp53 += m_A203 * V[71];
+	tmp53 += m_A204 * V[73];
+	V[53] = (RHS53 - tmp53) / m_A202;
+	double tmp52 = 0.0;
+	tmp52 += m_A197 * V[53];
+	tmp52 += m_A198 * V[71];
+	tmp52 += m_A199 * V[72];
+	tmp52 += m_A200 * V[73];
+	V[52] = (RHS52 - tmp52) / m_A196;
+	double tmp51 = 0.0;
+	tmp51 += m_A192 * V[65];
+	tmp51 += m_A193 * V[72];
+	V[51] = (RHS51 - tmp51) / m_A191;
+	double tmp50 = 0.0;
+	tmp50 += m_A186 * V[67];
+	tmp50 += m_A187 * V[68];
+	tmp50 += m_A188 * V[69];
+	tmp50 += m_A189 * V[75];
+	V[50] = (RHS50 - tmp50) / m_A185;
+	double tmp49 = 0.0;
+	tmp49 += m_A178 * V[55];
+	tmp49 += m_A179 * V[75];
+	V[49] = (RHS49 - tmp49) / m_A177;
+	double tmp48 = 0.0;
+	tmp48 += m_A172 * V[59];
+	tmp48 += m_A173 * V[65];
+	tmp48 += m_A174 * V[66];
+	V[48] = (RHS48 - tmp48) / m_A171;
+	double tmp47 = 0.0;
+	tmp47 += m_A167 * V[65];
+	V[47] = (RHS47 - tmp47) / m_A166;
+	double tmp46 = 0.0;
+	tmp46 += m_A162 * V[48];
+	tmp46 += m_A163 * V[59];
+	tmp46 += m_A164 * V[66];
+	V[46] = (RHS46 - tmp46) / m_A161;
+	double tmp45 = 0.0;
+	tmp45 += m_A154 * V[52];
+	tmp45 += m_A155 * V[72];
+	tmp45 += m_A156 * V[73];
+	V[45] = (RHS45 - tmp45) / m_A153;
+	double tmp44 = 0.0;
+	tmp44 += m_A150 * V[67];
+	V[44] = (RHS44 - tmp44) / m_A149;
+	double tmp43 = 0.0;
+	tmp43 += m_A145 * V[46];
+	tmp43 += m_A146 * V[48];
+	V[43] = (RHS43 - tmp43) / m_A144;
+	double tmp42 = 0.0;
+	tmp42 += m_A141 * V[63];
+	tmp42 += m_A142 * V[70];
+	V[42] = (RHS42 - tmp42) / m_A140;
+	double tmp41 = 0.0;
+	tmp41 += m_A138 * V[62];
+	tmp41 += m_A139 * V[68];
+	V[41] = (RHS41 - tmp41) / m_A137;
+	double tmp40 = 0.0;
+	tmp40 += m_A131 * V[50];
+	tmp40 += m_A132 * V[67];
+	tmp40 += m_A133 * V[69];
+	tmp40 += m_A134 * V[75];
+	V[40] = (RHS40 - tmp40) / m_A130;
+	double tmp39 = 0.0;
+	tmp39 += m_A121 * V[40];
+	tmp39 += m_A122 * V[50];
+	tmp39 += m_A123 * V[67];
+	tmp39 += m_A124 * V[75];
+	V[39] = (RHS39 - tmp39) / m_A120;
+	double tmp38 = 0.0;
+	tmp38 += m_A115 * V[39];
+	tmp38 += m_A116 * V[40];
+	V[38] = (RHS38 - tmp38) / m_A114;
+	double tmp37 = 0.0;
+	tmp37 += m_A111 * V[68];
+	V[37] = (RHS37 - tmp37) / m_A110;
+	double tmp36 = 0.0;
+	tmp36 += m_A108 * V[74];
+	V[36] = (RHS36 - tmp36) / m_A107;
+	double tmp35 = 0.0;
+	tmp35 += m_A105 * V[61];
+	tmp35 += m_A106 * V[74];
+	V[35] = (RHS35 - tmp35) / m_A104;
+	double tmp34 = 0.0;
+	tmp34 += m_A102 * V[60];
+	tmp34 += m_A103 * V[74];
+	V[34] = (RHS34 - tmp34) / m_A101;
+	double tmp33 = 0.0;
+	tmp33 += m_A99 * V[49];
+	tmp33 += m_A100 * V[55];
+	V[33] = (RHS33 - tmp33) / m_A98;
+	double tmp32 = 0.0;
+	tmp32 += m_A96 * V[64];
+	tmp32 += m_A97 * V[65];
+	V[32] = (RHS32 - tmp32) / m_A95;
+	double tmp31 = 0.0;
+	tmp31 += m_A92 * V[43];
+	tmp31 += m_A93 * V[46];
+	tmp31 += m_A94 * V[59];
+	V[31] = (RHS31 - tmp31) / m_A91;
+	double tmp30 = 0.0;
+	tmp30 += m_A89 * V[61];
+	tmp30 += m_A90 * V[75];
+	V[30] = (RHS30 - tmp30) / m_A88;
+	double tmp29 = 0.0;
+	tmp29 += m_A85 * V[55];
+	tmp29 += m_A86 * V[58];
+	tmp29 += m_A87 * V[60];
+	V[29] = (RHS29 - tmp29) / m_A84;
+	double tmp28 = 0.0;
+	tmp28 += m_A82 * V[49];
+	tmp28 += m_A83 * V[75];
+	V[28] = (RHS28 - tmp28) / m_A81;
+	double tmp27 = 0.0;
+	tmp27 += m_A78 * V[41];
+	tmp27 += m_A79 * V[62];
+	tmp27 += m_A80 * V[68];
+	V[27] = (RHS27 - tmp27) / m_A77;
+	double tmp26 = 0.0;
+	tmp26 += m_A76 * V[42];
+	V[26] = (RHS26 - tmp26) / m_A75;
+	double tmp25 = 0.0;
+	tmp25 += m_A74 * V[41];
+	V[25] = (RHS25 - tmp25) / m_A73;
+	double tmp24 = 0.0;
+	tmp24 += m_A72 * V[56];
+	V[24] = (RHS24 - tmp24) / m_A71;
+	double tmp23 = 0.0;
+	tmp23 += m_A69 * V[54];
+	tmp23 += m_A70 * V[69];
+	V[23] = (RHS23 - tmp23) / m_A68;
+	double tmp22 = 0.0;
+	tmp22 += m_A66 * V[40];
+	tmp22 += m_A67 * V[69];
+	V[22] = (RHS22 - tmp22) / m_A65;
+	double tmp21 = 0.0;
+	tmp21 += m_A64 * V[56];
+	V[21] = (RHS21 - tmp21) / m_A63;
+	double tmp20 = 0.0;
+	tmp20 += m_A62 * V[54];
+	V[20] = (RHS20 - tmp20) / m_A61;
+	double tmp19 = 0.0;
+	tmp19 += m_A60 * V[56];
+	V[19] = (RHS19 - tmp19) / m_A59;
+	double tmp18 = 0.0;
+	tmp18 += m_A57 * V[46];
+	tmp18 += m_A58 * V[66];
+	V[18] = (RHS18 - tmp18) / m_A56;
+	double tmp17 = 0.0;
+	tmp17 += m_A55 * V[63];
+	V[17] = (RHS17 - tmp17) / m_A54;
+	double tmp16 = 0.0;
+	tmp16 += m_A52 * V[46];
+	tmp16 += m_A53 * V[48];
+	V[16] = (RHS16 - tmp16) / m_A51;
+	double tmp15 = 0.0;
+	tmp15 += m_A49 * V[16];
+	tmp15 += m_A50 * V[48];
+	V[15] = (RHS15 - tmp15) / m_A48;
+	double tmp14 = 0.0;
+	tmp14 += m_A46 * V[71];
+	tmp14 += m_A47 * V[73];
+	V[14] = (RHS14 - tmp14) / m_A45;
+	double tmp13 = 0.0;
+	tmp13 += m_A42 * V[48];
+	tmp13 += m_A43 * V[65];
+	tmp13 += m_A44 * V[66];
+	V[13] = (RHS13 - tmp13) / m_A41;
+	double tmp12 = 0.0;
+	tmp12 += m_A39 * V[14];
+	tmp12 += m_A40 * V[73];
+	V[12] = (RHS12 - tmp12) / m_A38;
+	double tmp11 = 0.0;
+	tmp11 += m_A35 * V[45];
+	tmp11 += m_A36 * V[52];
+	tmp11 += m_A37 * V[72];
+	V[11] = (RHS11 - tmp11) / m_A34;
+	double tmp10 = 0.0;
+	tmp10 += m_A32 * V[11];
+	tmp10 += m_A33 * V[72];
+	V[10] = (RHS10 - tmp10) / m_A31;
+	double tmp9 = 0.0;
+	tmp9 += m_A29 * V[51];
+	tmp9 += m_A30 * V[65];
+	V[9] = (RHS9 - tmp9) / m_A28;
+	double tmp8 = 0.0;
+	tmp8 += m_A24 * V[40];
+	tmp8 += m_A25 * V[50];
+	tmp8 += m_A26 * V[67];
+	tmp8 += m_A27 * V[75];
+	V[8] = (RHS8 - tmp8) / m_A23;
+	double tmp7 = 0.0;
+	tmp7 += m_A19 * V[39];
+	tmp7 += m_A20 * V[50];
+	tmp7 += m_A21 * V[67];
+	tmp7 += m_A22 * V[75];
+	V[7] = (RHS7 - tmp7) / m_A18;
+	double tmp6 = 0.0;
+	tmp6 += m_A17 * V[47];
+	V[6] = (RHS6 - tmp6) / m_A16;
+	double tmp5 = 0.0;
+	tmp5 += m_A14 * V[44];
+	tmp5 += m_A15 * V[67];
+	V[5] = (RHS5 - tmp5) / m_A13;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[50];
+	tmp4 += m_A12 * V[68];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[44];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[38];
+	tmp2 += m_A6 * V[39];
+	tmp2 += m_A7 * V[40];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[37];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[38];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// kidniki
+static void nl_gcr_43f7ff9bc651cc7a_198_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
+	double m_A153(0.0);
+	double m_A154(0.0);
+	double m_A155(0.0);
+	double m_A156(0.0);
+	double m_A157(0.0);
+	double m_A158(0.0);
+	double m_A159(0.0);
+	double m_A160(0.0);
+	double m_A161(0.0);
+	double m_A162(0.0);
+	double m_A163(0.0);
+	double m_A164(0.0);
+	double m_A165(0.0);
+	double m_A166(0.0);
+	double m_A167(0.0);
+	double m_A168(0.0);
+	double m_A169(0.0);
+	double m_A170(0.0);
+	double m_A171(0.0);
+	double m_A172(0.0);
+	double m_A173(0.0);
+	double m_A174(0.0);
+	double m_A175(0.0);
+	double m_A176(0.0);
+	double m_A177(0.0);
+	double m_A178(0.0);
+	double m_A179(0.0);
+	double m_A180(0.0);
+	double m_A181(0.0);
+	double m_A182(0.0);
+	double m_A183(0.0);
+	double m_A184(0.0);
+	double m_A185(0.0);
+	double m_A186(0.0);
+	double m_A187(0.0);
+	double m_A188(0.0);
+	double m_A189(0.0);
+	double m_A190(0.0);
+	double m_A191(0.0);
+	double m_A192(0.0);
+	double m_A193(0.0);
+	double m_A194(0.0);
+	double m_A195(0.0);
+	double m_A196(0.0);
+	double m_A197(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A6 += go[4];
+	m_A5 += go[5];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 -= go[6] * *cnV[6];
+	m_A7 += gt[7];
+	m_A7 += gt[8];
+	m_A7 += gt[9];
+	m_A7 += gt[10];
+	m_A7 += gt[11];
+	m_A7 += gt[12];
+	m_A7 += gt[13];
+	m_A8 += go[7];
+	m_A9 += go[8];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 += Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 -= go[9] * *cnV[9];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	m_A10 += gt[14];
+	m_A10 += gt[15];
+	m_A12 += go[14];
+	m_A11 += go[15];
+	double RHS4 = Idr[14];
+	RHS4 += Idr[15];
+	m_A13 += gt[16];
+	m_A13 += gt[17];
+	m_A14 += go[16];
+	double RHS5 = Idr[16];
+	RHS5 += Idr[17];
+	RHS5 -= go[17] * *cnV[17];
+	m_A15 += gt[18];
+	m_A15 += gt[19];
+	m_A15 += gt[20];
+	m_A16 += go[18];
+	double RHS6 = Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
+	RHS6 -= go[19] * *cnV[19];
+	RHS6 -= go[20] * *cnV[20];
+	m_A17 += gt[21];
+	m_A17 += gt[22];
+	m_A17 += gt[23];
+	m_A17 += gt[24];
+	m_A17 += gt[25];
+	m_A17 += gt[26];
+	m_A17 += gt[27];
+	m_A19 += go[21];
+	m_A18 += go[22];
+	double RHS7 = Idr[21];
+	RHS7 += Idr[22];
+	RHS7 += Idr[23];
+	RHS7 += Idr[24];
+	RHS7 += Idr[25];
+	RHS7 += Idr[26];
+	RHS7 += Idr[27];
+	RHS7 -= go[23] * *cnV[23];
+	RHS7 -= go[24] * *cnV[24];
+	RHS7 -= go[25] * *cnV[25];
+	RHS7 -= go[26] * *cnV[26];
+	RHS7 -= go[27] * *cnV[27];
+	m_A20 += gt[28];
+	m_A20 += gt[29];
+	m_A21 += go[28];
+	m_A22 += go[29];
+	double RHS8 = Idr[28];
+	RHS8 += Idr[29];
+	m_A23 += gt[30];
+	m_A23 += gt[31];
+	m_A23 += gt[32];
+	m_A24 += go[30];
+	m_A25 += go[31];
+	double RHS9 = Idr[30];
+	RHS9 += Idr[31];
+	RHS9 += Idr[32];
+	RHS9 -= go[32] * *cnV[32];
+	m_A26 += gt[33];
+	m_A26 += gt[34];
+	m_A27 += go[33];
+	double RHS10 = Idr[33];
+	RHS10 += Idr[34];
+	RHS10 -= go[34] * *cnV[34];
+	m_A28 += gt[35];
+	m_A28 += gt[36];
+	m_A28 += gt[37];
+	m_A28 += gt[38];
+	m_A30 += go[35];
+	m_A29 += go[36];
+	m_A29 += go[37];
+	double RHS11 = Idr[35];
+	RHS11 += Idr[36];
+	RHS11 += Idr[37];
+	RHS11 += Idr[38];
+	RHS11 -= go[38] * *cnV[38];
+	m_A31 += gt[39];
+	m_A31 += gt[40];
+	m_A33 += go[39];
+	m_A32 += go[40];
+	double RHS12 = Idr[39];
+	RHS12 += Idr[40];
+	m_A34 += gt[41];
+	m_A34 += gt[42];
+	m_A34 += gt[43];
+	m_A36 += go[41];
+	m_A35 += go[42];
+	double RHS13 = Idr[41];
+	RHS13 += Idr[42];
+	RHS13 += Idr[43];
+	RHS13 -= go[43] * *cnV[43];
+	m_A37 += gt[44];
+	m_A37 += gt[45];
+	m_A37 += gt[46];
+	m_A38 += go[44];
+	m_A39 += go[45];
+	double RHS14 = Idr[44];
+	RHS14 += Idr[45];
+	RHS14 += Idr[46];
+	RHS14 -= go[46] * *cnV[46];
+	m_A40 += gt[47];
+	m_A40 += gt[48];
+	m_A40 += gt[49];
+	m_A40 += gt[50];
+	m_A40 += gt[51];
+	m_A42 += go[47];
+	m_A41 += go[48];
+	m_A41 += go[49];
+	double RHS15 = Idr[47];
+	RHS15 += Idr[48];
+	RHS15 += Idr[49];
+	RHS15 += Idr[50];
+	RHS15 += Idr[51];
+	RHS15 -= go[50] * *cnV[50];
+	RHS15 -= go[51] * *cnV[51];
+	m_A43 += gt[52];
+	m_A43 += gt[53];
+	m_A43 += gt[54];
+	m_A43 += gt[55];
+	m_A44 += go[52];
+	double RHS16 = Idr[52];
+	RHS16 += Idr[53];
+	RHS16 += Idr[54];
+	RHS16 += Idr[55];
+	RHS16 -= go[53] * *cnV[53];
+	RHS16 -= go[54] * *cnV[54];
+	RHS16 -= go[55] * *cnV[55];
+	m_A45 += gt[56];
+	m_A45 += gt[57];
+	m_A45 += gt[58];
+	m_A45 += gt[59];
+	m_A46 += go[56];
+	double RHS17 = Idr[56];
+	RHS17 += Idr[57];
+	RHS17 += Idr[58];
+	RHS17 += Idr[59];
+	RHS17 -= go[57] * *cnV[57];
+	RHS17 -= go[58] * *cnV[58];
+	RHS17 -= go[59] * *cnV[59];
+	m_A47 += gt[60];
+	m_A47 += gt[61];
+	m_A47 += gt[62];
+	m_A47 += gt[63];
+	m_A47 += gt[64];
+	m_A49 += go[60];
+	m_A49 += go[61];
+	m_A48 += go[62];
+	double RHS18 = Idr[60];
+	RHS18 += Idr[61];
+	RHS18 += Idr[62];
+	RHS18 += Idr[63];
+	RHS18 += Idr[64];
+	RHS18 -= go[63] * *cnV[63];
+	RHS18 -= go[64] * *cnV[64];
+	m_A50 += gt[65];
+	m_A50 += gt[66];
+	m_A50 += gt[67];
+	m_A50 += gt[68];
+	m_A50 += gt[69];
+	m_A53 += go[65];
+	m_A52 += go[66];
+	m_A51 += go[67];
+	m_A51 += go[68];
+	double RHS19 = Idr[65];
+	RHS19 += Idr[66];
+	RHS19 += Idr[67];
+	RHS19 += Idr[68];
+	RHS19 += Idr[69];
+	RHS19 -= go[69] * *cnV[69];
+	m_A54 += gt[70];
+	m_A54 += gt[71];
+	m_A54 += gt[72];
+	m_A54 += gt[73];
+	m_A57 += go[70];
+	m_A56 += go[71];
+	m_A55 += go[72];
+	double RHS20 = Idr[70];
+	RHS20 += Idr[71];
+	RHS20 += Idr[72];
+	RHS20 += Idr[73];
+	RHS20 -= go[73] * *cnV[73];
+	m_A58 += gt[74];
+	m_A58 += gt[75];
+	m_A58 += gt[76];
+	m_A59 += go[74];
+	m_A60 += go[75];
+	double RHS21 = Idr[74];
+	RHS21 += Idr[75];
+	RHS21 += Idr[76];
+	RHS21 -= go[76] * *cnV[76];
+	m_A61 += gt[77];
+	m_A61 += gt[78];
+	m_A62 += go[77];
+	m_A63 += go[78];
+	double RHS22 = Idr[77];
+	RHS22 += Idr[78];
+	m_A64 += gt[79];
+	m_A64 += gt[80];
+	m_A65 += go[79];
+	m_A66 += go[80];
+	double RHS23 = Idr[79];
+	RHS23 += Idr[80];
+	m_A69 += gt[81];
+	m_A69 += gt[82];
+	m_A69 += gt[83];
+	m_A69 += gt[84];
+	m_A68 += go[81];
+	m_A68 += go[82];
+	m_A67 += go[83];
+	double RHS24 = Idr[81];
+	RHS24 += Idr[82];
+	RHS24 += Idr[83];
+	RHS24 += Idr[84];
+	RHS24 -= go[84] * *cnV[84];
+	m_A75 += gt[85];
+	m_A75 += gt[86];
+	m_A75 += gt[87];
+	m_A73 += go[85];
+	m_A72 += go[86];
+	double RHS25 = Idr[85];
+	RHS25 += Idr[86];
+	RHS25 += Idr[87];
+	RHS25 -= go[87] * *cnV[87];
+	m_A79 += gt[88];
+	m_A79 += gt[89];
+	m_A79 += gt[90];
+	m_A78 += go[88];
+	m_A77 += go[89];
+	double RHS26 = Idr[88];
+	RHS26 += Idr[89];
+	RHS26 += Idr[90];
+	RHS26 -= go[90] * *cnV[90];
+	m_A83 += gt[91];
+	m_A83 += gt[92];
+	m_A83 += gt[93];
+	m_A83 += gt[94];
+	m_A83 += gt[95];
+	m_A83 += gt[96];
+	m_A82 += go[91];
+	m_A82 += go[92];
+	m_A81 += go[93];
+	double RHS27 = Idr[91];
+	RHS27 += Idr[92];
+	RHS27 += Idr[93];
+	RHS27 += Idr[94];
+	RHS27 += Idr[95];
+	RHS27 += Idr[96];
+	RHS27 -= go[94] * *cnV[94];
+	RHS27 -= go[95] * *cnV[95];
+	RHS27 -= go[96] * *cnV[96];
+	m_A93 += gt[97];
+	m_A93 += gt[98];
+	m_A93 += gt[99];
+	m_A87 += go[97];
+	m_A89 += go[98];
+	m_A88 += go[99];
+	double RHS28 = Idr[97];
+	RHS28 += Idr[98];
+	RHS28 += Idr[99];
+	m_A102 += gt[100];
+	m_A102 += gt[101];
+	m_A102 += gt[102];
+	m_A99 += go[100];
+	m_A98 += go[101];
+	m_A97 += go[102];
+	double RHS29 = Idr[100];
+	RHS29 += Idr[101];
+	RHS29 += Idr[102];
+	m_A110 += gt[103];
+	m_A110 += gt[104];
+	m_A110 += gt[105];
+	m_A110 += gt[106];
+	m_A107 += go[103];
+	m_A106 += go[104];
+	m_A106 += go[105];
+	double RHS30 = Idr[103];
+	RHS30 += Idr[104];
+	RHS30 += Idr[105];
+	RHS30 += Idr[106];
+	RHS30 -= go[106] * *cnV[106];
+	m_A116 += gt[107];
+	m_A116 += gt[108];
+	m_A116 += gt[109];
+	m_A116 += gt[110];
+	m_A116 += gt[111];
+	m_A116 += gt[112];
+	m_A114 += go[107];
+	m_A115 += go[108];
+	m_A115 += go[109];
+	m_A117 += go[110];
+	m_A117 += go[111];
+	m_A113 += go[112];
+	double RHS31 = Idr[107];
+	RHS31 += Idr[108];
+	RHS31 += Idr[109];
+	RHS31 += Idr[110];
+	RHS31 += Idr[111];
+	RHS31 += Idr[112];
+	m_A120 += gt[113];
+	m_A120 += gt[114];
+	m_A119 += go[113];
+	double RHS32 = Idr[113];
+	RHS32 += Idr[114];
+	RHS32 -= go[114] * *cnV[114];
+	m_A123 += gt[115];
+	m_A123 += gt[116];
+	m_A122 += go[115];
+	m_A124 += go[116];
+	double RHS33 = Idr[115];
+	RHS33 += Idr[116];
+	m_A126 += gt[117];
+	m_A126 += gt[118];
+	m_A126 += gt[119];
+	m_A126 += gt[120];
+	m_A126 += gt[121];
+	m_A126 += gt[122];
+	m_A126 += gt[123];
+	m_A125 += go[117];
+	m_A127 += go[118];
+	double RHS34 = Idr[117];
+	RHS34 += Idr[118];
+	RHS34 += Idr[119];
+	RHS34 += Idr[120];
+	RHS34 += Idr[121];
+	RHS34 += Idr[122];
+	RHS34 += Idr[123];
+	RHS34 -= go[119] * *cnV[119];
+	RHS34 -= go[120] * *cnV[120];
+	RHS34 -= go[121] * *cnV[121];
+	RHS34 -= go[122] * *cnV[122];
+	RHS34 -= go[123] * *cnV[123];
+	m_A129 += gt[124];
+	m_A129 += gt[125];
+	m_A128 += go[124];
+	double RHS35 = Idr[124];
+	RHS35 += Idr[125];
+	RHS35 -= go[125] * *cnV[125];
+	m_A133 += gt[126];
+	m_A133 += gt[127];
+	m_A133 += gt[128];
+	m_A133 += gt[129];
+	m_A133 += gt[130];
+	m_A133 += gt[131];
+	m_A132 += go[126];
+	m_A135 += go[127];
+	m_A131 += go[128];
+	double RHS36 = Idr[126];
+	RHS36 += Idr[127];
+	RHS36 += Idr[128];
+	RHS36 += Idr[129];
+	RHS36 += Idr[130];
+	RHS36 += Idr[131];
+	RHS36 -= go[129] * *cnV[129];
+	RHS36 -= go[130] * *cnV[130];
+	RHS36 -= go[131] * *cnV[131];
+	m_A139 += gt[132];
+	m_A139 += gt[133];
+	m_A139 += gt[134];
+	m_A139 += gt[135];
+	m_A139 += gt[136];
+	m_A139 += gt[137];
+	m_A136 += go[132];
+	m_A137 += go[133];
+	m_A141 += go[134];
+	m_A138 += go[135];
+	double RHS37 = Idr[132];
+	RHS37 += Idr[133];
+	RHS37 += Idr[134];
+	RHS37 += Idr[135];
+	RHS37 += Idr[136];
+	RHS37 += Idr[137];
+	RHS37 -= go[136] * *cnV[136];
+	RHS37 -= go[137] * *cnV[137];
+	m_A149 += gt[138];
+	m_A149 += gt[139];
+	m_A149 += gt[140];
+	m_A149 += gt[141];
+	m_A149 += gt[142];
+	m_A149 += gt[143];
+	m_A145 += go[138];
+	m_A144 += go[139];
+	m_A142 += go[140];
+	m_A143 += go[141];
+	m_A152 += go[142];
+	double RHS38 = Idr[138];
+	RHS38 += Idr[139];
+	RHS38 += Idr[140];
+	RHS38 += Idr[141];
+	RHS38 += Idr[142];
+	RHS38 += Idr[143];
+	RHS38 -= go[143] * *cnV[143];
+	m_A157 += gt[144];
+	m_A157 += gt[145];
+	m_A157 += gt[146];
+	m_A157 += gt[147];
+	m_A157 += gt[148];
+	m_A154 += go[144];
+	m_A153 += go[145];
+	m_A155 += go[146];
+	m_A155 += go[147];
+	double RHS39 = Idr[144];
+	RHS39 += Idr[145];
+	RHS39 += Idr[146];
+	RHS39 += Idr[147];
+	RHS39 += Idr[148];
+	RHS39 -= go[148] * *cnV[148];
+	m_A164 += gt[149];
+	m_A164 += gt[150];
+	m_A164 += gt[151];
+	m_A164 += gt[152];
+	m_A164 += gt[153];
+	m_A162 += go[149];
+	m_A165 += go[150];
+	m_A165 += go[151];
+	m_A161 += go[152];
+	m_A163 += go[153];
+	double RHS40 = Idr[149];
+	RHS40 += Idr[150];
+	RHS40 += Idr[151];
+	RHS40 += Idr[152];
+	RHS40 += Idr[153];
+	m_A174 += gt[154];
+	m_A174 += gt[155];
+	m_A174 += gt[156];
+	m_A167 += go[154];
+	m_A166 += go[155];
+	m_A171 += go[156];
+	double RHS41 = Idr[154];
+	RHS41 += Idr[155];
+	RHS41 += Idr[156];
+	m_A182 += gt[157];
+	m_A182 += gt[158];
+	m_A182 += gt[159];
+	m_A177 += go[157];
+	m_A178 += go[158];
+	m_A179 += go[159];
+	double RHS42 = Idr[157];
+	RHS42 += Idr[158];
+	RHS42 += Idr[159];
+	m_A197 += gt[160];
+	m_A197 += gt[161];
+	m_A197 += gt[162];
+	m_A197 += gt[163];
+	m_A197 += gt[164];
+	m_A197 += gt[165];
+	m_A197 += gt[166];
+	m_A197 += gt[167];
+	m_A192 += go[160];
+	m_A185 += go[161];
+	m_A186 += go[162];
+	m_A184 += go[163];
+	m_A194 += go[164];
+	m_A194 += go[165];
+	double RHS43 = Idr[160];
+	RHS43 += Idr[161];
+	RHS43 += Idr[162];
+	RHS43 += Idr[163];
+	RHS43 += Idr[164];
+	RHS43 += Idr[165];
+	RHS43 += Idr[166];
+	RHS43 += Idr[167];
+	RHS43 -= go[166] * *cnV[166];
+	RHS43 -= go[167] * *cnV[167];
+	const double f0 = 1.0 / m_A0;
+	const double f0_33 = -f0 * m_A122;
+	m_A123 += m_A1 * f0_33;
+	RHS33 += f0_33 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_34 = -f1 * m_A125;
+	m_A127 += m_A3 * f1_34;
+	RHS34 += f1_34 * RHS1;
+	const double f1_40 = -f1 * m_A161;
+	m_A164 += m_A3 * f1_40;
+	RHS40 += f1_40 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_40 = -f2 * m_A162;
+	m_A164 += m_A5 * f2_40;
+	m_A165 += m_A6 * f2_40;
+	RHS40 += f2_40 * RHS2;
+	const double f2_43 = -f2 * m_A184;
+	m_A194 += m_A5 * f2_43;
+	m_A197 += m_A6 * f2_43;
+	RHS43 += f2_43 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_37 = -f3 * m_A136;
+	m_A138 += m_A8 * f3_37;
+	m_A139 += m_A9 * f3_37;
+	RHS37 += f3_37 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_37 = -f4 * m_A137;
+	m_A139 += m_A11 * f4_37;
+	m_A140 += m_A12 * f4_37;
+	RHS37 += f4_37 * RHS4;
+	const double f4_38 = -f4 * m_A142;
+	m_A148 += m_A11 * f4_38;
+	m_A149 += m_A12 * f4_38;
+	RHS38 += f4_38 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_42 = -f5 * m_A177;
+	m_A182 += m_A14 * f5_42;
+	RHS42 += f5_42 * RHS5;
+	const double f6 = 1.0 / m_A15;
+	const double f6_36 = -f6 * m_A131;
+	m_A133 += m_A16 * f6_36;
+	RHS36 += f6_36 * RHS6;
+	const double f7 = 1.0 / m_A17;
+	const double f7_36 = -f7 * m_A132;
+	m_A134 += m_A18 * f7_36;
+	m_A135 += m_A19 * f7_36;
+	RHS36 += f7_36 * RHS7;
+	const double f8 = 1.0 / m_A20;
+	const double f8_27 = -f8 * m_A81;
+	m_A83 += m_A21 * f8_27;
+	m_A86 += m_A22 * f8_27;
+	RHS27 += f8_27 * RHS8;
+	const double f8_43 = -f8 * m_A185;
+	m_A187 += m_A21 * f8_43;
+	m_A197 += m_A22 * f8_43;
+	RHS43 += f8_43 * RHS8;
+	const double f9 = 1.0 / m_A23;
+	const double f9_31 = -f9 * m_A113;
+	m_A116 += m_A24 * f9_31;
+	m_A118 += m_A25 * f9_31;
+	RHS31 += f9_31 * RHS9;
+	const double f9_43 = -f9 * m_A186;
+	m_A191 += m_A24 * f9_43;
+	m_A197 += m_A25 * f9_43;
+	RHS43 += f9_43 * RHS9;
 	const double f10 = 1.0 / m_A26;
-	const double f10_26 = -f10 * m_A80;
-	m_A81 += m_A27 * f10_26;
-	m_A82 += m_A28 * f10_26;
-	RHS26 += f10_26 * RHS10;
-	const double f10_33 = -f10 * m_A112;
-	m_A113 += m_A27 * f10_33;
-	m_A115 += m_A28 * f10_33;
-	RHS33 += f10_33 * RHS10;
-	const double f10_36 = -f10 * m_A127;
-	m_A129 += m_A27 * f10_36;
-	m_A132 += m_A28 * f10_36;
+	const double f10_31 = -f10 * m_A114;
+	m_A116 += m_A27 * f10_31;
+	RHS31 += f10_31 * RHS10;
+	const double f11 = 1.0 / m_A28;
+	const double f11_31 = -f11 * m_A115;
+	m_A116 += m_A29 * f11_31;
+	m_A117 += m_A30 * f11_31;
+	RHS31 += f11_31 * RHS11;
+	const double f11_39 = -f11 * m_A153;
+	m_A155 += m_A29 * f11_39;
+	m_A157 += m_A30 * f11_39;
+	RHS39 += f11_39 * RHS11;
+	const double f12 = 1.0 / m_A31;
+	const double f12_38 = -f12 * m_A143;
+	m_A149 += m_A32 * f12_38;
+	m_A150 += m_A33 * f12_38;
+	RHS38 += f12_38 * RHS12;
+	const double f12_39 = -f12 * m_A154;
+	m_A156 += m_A32 * f12_39;
+	m_A157 += m_A33 * f12_39;
+	RHS39 += f12_39 * RHS12;
+	const double f13 = 1.0 / m_A34;
+	const double f13_37 = -f13 * m_A138;
+	m_A139 += m_A35 * f13_37;
+	m_A141 += m_A36 * f13_37;
+	RHS37 += f13_37 * RHS13;
+	const double f13_41 = -f13 * m_A166;
+	m_A171 += m_A35 * f13_41;
+	m_A174 += m_A36 * f13_41;
+	RHS41 += f13_41 * RHS13;
+	const double f14 = 1.0 / m_A37;
+	const double f14_24 = -f14 * m_A67;
+	m_A69 += m_A38 * f14_24;
+	m_A71 += m_A39 * f14_24;
+	RHS24 += f14_24 * RHS14;
+	const double f14_28 = -f14 * m_A87;
+	m_A90 += m_A38 * f14_28;
+	m_A93 += m_A39 * f14_28;
+	RHS28 += f14_28 * RHS14;
+	const double f15 = 1.0 / m_A40;
+	const double f15_24 = -f15 * m_A68;
+	m_A69 += m_A41 * f15_24;
+	m_A70 += m_A42 * f15_24;
+	RHS24 += f15_24 * RHS15;
+	const double f15_25 = -f15 * m_A72;
+	m_A74 += m_A41 * f15_25;
+	m_A75 += m_A42 * f15_25;
+	RHS25 += f15_25 * RHS15;
+	const double f16 = 1.0 / m_A43;
+	const double f16_25 = -f16 * m_A73;
+	m_A75 += m_A44 * f16_25;
+	RHS25 += f16_25 * RHS16;
+	const double f17 = 1.0 / m_A45;
+	const double f17_26 = -f17 * m_A77;
+	m_A79 += m_A46 * f17_26;
+	RHS26 += f17_26 * RHS17;
+	const double f18 = 1.0 / m_A47;
+	const double f18_26 = -f18 * m_A78;
+	m_A79 += m_A48 * f18_26;
+	m_A80 += m_A49 * f18_26;
+	RHS26 += f18_26 * RHS18;
+	const double f18_30 = -f18 * m_A106;
+	m_A108 += m_A48 * f18_30;
+	m_A110 += m_A49 * f18_30;
+	RHS30 += f18_30 * RHS18;
+	const double f19 = 1.0 / m_A50;
+	const double f19_27 = -f19 * m_A82;
+	m_A83 += m_A51 * f19_27;
+	m_A84 += m_A52 * f19_27;
+	m_A85 += m_A53 * f19_27;
+	RHS27 += f19_27 * RHS19;
+	const double f19_28 = -f19 * m_A88;
+	m_A92 += m_A51 * f19_28;
+	m_A93 += m_A52 * f19_28;
+	m_A94 += m_A53 * f19_28;
+	RHS28 += f19_28 * RHS19;
+	const double f19_29 = -f19 * m_A97;
+	m_A100 += m_A51 * f19_29;
+	m_A101 += m_A52 * f19_29;
+	m_A102 += m_A53 * f19_29;
+	RHS29 += f19_29 * RHS19;
+	const double f20 = 1.0 / m_A54;
+	const double f20_28 = -f20 * m_A89;
+	m_A93 += m_A55 * f20_28;
+	m_A94 += m_A56 * f20_28;
+	m_A95 += m_A57 * f20_28;
+	RHS28 += f20_28 * RHS20;
+	const double f20_29 = -f20 * m_A98;
+	m_A101 += m_A55 * f20_29;
+	m_A102 += m_A56 * f20_29;
+	m_A104 += m_A57 * f20_29;
+	RHS29 += f20_29 * RHS20;
+	const double f20_41 = -f20 * m_A167;
+	m_A168 += m_A55 * f20_41;
+	m_A169 += m_A56 * f20_41;
+	m_A174 += m_A57 * f20_41;
+	RHS41 += f20_41 * RHS20;
+	const double f21 = 1.0 / m_A58;
+	const double f21_29 = -f21 * m_A99;
+	m_A102 += m_A59 * f21_29;
+	m_A103 += m_A60 * f21_29;
+	RHS29 += f21_29 * RHS21;
+	const double f21_30 = -f21 * m_A107;
+	m_A109 += m_A59 * f21_30;
+	m_A110 += m_A60 * f21_30;
+	RHS30 += f21_30 * RHS21;
+	const double f22 = 1.0 / m_A61;
+	const double f22_32 = -f22 * m_A119;
+	m_A120 += m_A62 * f22_32;
+	m_A121 += m_A63 * f22_32;
+	RHS32 += f22_32 * RHS22;
+	const double f22_38 = -f22 * m_A144;
+	m_A146 += m_A62 * f22_38;
+	m_A149 += m_A63 * f22_38;
+	RHS38 += f22_38 * RHS22;
+	const double f23 = 1.0 / m_A64;
+	const double f23_35 = -f23 * m_A128;
+	m_A129 += m_A65 * f23_35;
+	m_A130 += m_A66 * f23_35;
+	RHS35 += f23_35 * RHS23;
+	const double f23_38 = -f23 * m_A145;
+	m_A147 += m_A65 * f23_38;
+	m_A149 += m_A66 * f23_38;
+	RHS38 += f23_38 * RHS23;
+	const double f24 = 1.0 / m_A69;
+	const double f24_25 = -f24 * m_A74;
+	m_A75 += m_A70 * f24_25;
+	m_A76 += m_A71 * f24_25;
+	RHS25 += f24_25 * RHS24;
+	const double f24_28 = -f24 * m_A90;
+	m_A91 += m_A70 * f24_28;
+	m_A93 += m_A71 * f24_28;
+	RHS28 += f24_28 * RHS24;
+	const double f25 = 1.0 / m_A75;
+	const double f25_28 = -f25 * m_A91;
+	m_A93 += m_A76 * f25_28;
+	RHS28 += f25_28 * RHS25;
+	const double f26 = 1.0 / m_A79;
+	const double f26_30 = -f26 * m_A108;
+	m_A110 += m_A80 * f26_30;
+	RHS30 += f26_30 * RHS26;
+	const double f27 = 1.0 / m_A83;
+	const double f27_28 = -f27 * m_A92;
+	m_A93 += m_A84 * f27_28;
+	m_A94 += m_A85 * f27_28;
+	m_A96 += m_A86 * f27_28;
+	RHS28 += f27_28 * RHS27;
+	const double f27_29 = -f27 * m_A100;
+	m_A101 += m_A84 * f27_29;
+	m_A102 += m_A85 * f27_29;
+	m_A105 += m_A86 * f27_29;
+	RHS29 += f27_29 * RHS27;
+	const double f27_43 = -f27 * m_A187;
+	m_A188 += m_A84 * f27_43;
+	m_A189 += m_A85 * f27_43;
+	m_A197 += m_A86 * f27_43;
+	RHS43 += f27_43 * RHS27;
+	const double f28 = 1.0 / m_A93;
+	const double f28_29 = -f28 * m_A101;
+	m_A102 += m_A94 * f28_29;
+	m_A104 += m_A95 * f28_29;
+	m_A105 += m_A96 * f28_29;
+	RHS29 += f28_29 * RHS28;
+	const double f28_41 = -f28 * m_A168;
+	m_A169 += m_A94 * f28_41;
+	m_A174 += m_A95 * f28_41;
+	m_A176 += m_A96 * f28_41;
+	RHS41 += f28_41 * RHS28;
+	const double f28_43 = -f28 * m_A188;
+	m_A189 += m_A94 * f28_43;
+	m_A195 += m_A95 * f28_43;
+	m_A197 += m_A96 * f28_43;
+	RHS43 += f28_43 * RHS28;
+	const double f29 = 1.0 / m_A102;
+	const double f29_30 = -f29 * m_A109;
+	m_A110 += m_A103 * f29_30;
+	m_A111 += m_A104 * f29_30;
+	m_A112 += m_A105 * f29_30;
+	RHS30 += f29_30 * RHS29;
+	const double f29_41 = -f29 * m_A169;
+	m_A170 += m_A103 * f29_41;
+	m_A174 += m_A104 * f29_41;
+	m_A176 += m_A105 * f29_41;
+	RHS41 += f29_41 * RHS29;
+	const double f29_43 = -f29 * m_A189;
+	m_A190 += m_A103 * f29_43;
+	m_A195 += m_A104 * f29_43;
+	m_A197 += m_A105 * f29_43;
+	RHS43 += f29_43 * RHS29;
+	const double f30 = 1.0 / m_A110;
+	const double f30_41 = -f30 * m_A170;
+	m_A174 += m_A111 * f30_41;
+	m_A176 += m_A112 * f30_41;
+	RHS41 += f30_41 * RHS30;
+	const double f30_43 = -f30 * m_A190;
+	m_A195 += m_A111 * f30_43;
+	m_A197 += m_A112 * f30_43;
+	RHS43 += f30_43 * RHS30;
+	const double f31 = 1.0 / m_A116;
+	const double f31_39 = -f31 * m_A155;
+	m_A157 += m_A117 * f31_39;
+	m_A160 += m_A118 * f31_39;
+	RHS39 += f31_39 * RHS31;
+	const double f31_43 = -f31 * m_A191;
+	m_A193 += m_A117 * f31_43;
+	m_A197 += m_A118 * f31_43;
+	RHS43 += f31_43 * RHS31;
+	const double f32 = 1.0 / m_A120;
+	const double f32_38 = -f32 * m_A146;
+	m_A149 += m_A121 * f32_38;
+	RHS38 += f32_38 * RHS32;
+	const double f33 = 1.0 / m_A123;
+	const double f33_40 = -f33 * m_A163;
+	m_A164 += m_A124 * f33_40;
+	RHS40 += f33_40 * RHS33;
+	const double f34 = 1.0 / m_A126;
+	const double f34_43 = -f34 * m_A192;
+	m_A194 += m_A127 * f34_43;
+	RHS43 += f34_43 * RHS34;
+	const double f35 = 1.0 / m_A129;
+	const double f35_38 = -f35 * m_A147;
+	m_A149 += m_A130 * f35_38;
+	RHS38 += f35_38 * RHS35;
+	const double f36 = 1.0 / m_A133;
+	const double f36_42 = -f36 * m_A178;
+	m_A179 += m_A134 * f36_42;
+	m_A182 += m_A135 * f36_42;
+	RHS42 += f36_42 * RHS36;
+	const double f37 = 1.0 / m_A139;
+	const double f37_38 = -f37 * m_A148;
+	m_A149 += m_A140 * f37_38;
+	m_A151 += m_A141 * f37_38;
+	RHS38 += f37_38 * RHS37;
+	const double f37_41 = -f37 * m_A171;
+	m_A172 += m_A140 * f37_41;
+	m_A174 += m_A141 * f37_41;
+	RHS41 += f37_41 * RHS37;
+	const double f38 = 1.0 / m_A149;
+	const double f38_39 = -f38 * m_A156;
+	m_A157 += m_A150 * f38_39;
+	m_A158 += m_A151 * f38_39;
+	m_A159 += m_A152 * f38_39;
+	RHS39 += f38_39 * RHS38;
+	const double f38_41 = -f38 * m_A172;
+	m_A173 += m_A150 * f38_41;
+	m_A174 += m_A151 * f38_41;
+	m_A175 += m_A152 * f38_41;
+	RHS41 += f38_41 * RHS38;
+	const double f38_42 = -f38 * m_A179;
+	m_A180 += m_A150 * f38_42;
+	m_A181 += m_A151 * f38_42;
+	m_A182 += m_A152 * f38_42;
+	RHS42 += f38_42 * RHS38;
+	const double f39 = 1.0 / m_A157;
+	const double f39_41 = -f39 * m_A173;
+	m_A174 += m_A158 * f39_41;
+	m_A175 += m_A159 * f39_41;
+	m_A176 += m_A160 * f39_41;
+	RHS41 += f39_41 * RHS39;
+	const double f39_42 = -f39 * m_A180;
+	m_A181 += m_A158 * f39_42;
+	m_A182 += m_A159 * f39_42;
+	m_A183 += m_A160 * f39_42;
+	RHS42 += f39_42 * RHS39;
+	const double f39_43 = -f39 * m_A193;
+	m_A195 += m_A158 * f39_43;
+	m_A196 += m_A159 * f39_43;
+	m_A197 += m_A160 * f39_43;
+	RHS43 += f39_43 * RHS39;
+	const double f40 = 1.0 / m_A164;
+	const double f40_43 = -f40 * m_A194;
+	m_A197 += m_A165 * f40_43;
+	RHS43 += f40_43 * RHS40;
+	const double f41 = 1.0 / m_A174;
+	const double f41_42 = -f41 * m_A181;
+	m_A182 += m_A175 * f41_42;
+	m_A183 += m_A176 * f41_42;
+	RHS42 += f41_42 * RHS41;
+	const double f41_43 = -f41 * m_A195;
+	m_A196 += m_A175 * f41_43;
+	m_A197 += m_A176 * f41_43;
+	RHS43 += f41_43 * RHS41;
+	const double f42 = 1.0 / m_A182;
+	const double f42_43 = -f42 * m_A196;
+	m_A197 += m_A183 * f42_43;
+	RHS43 += f42_43 * RHS42;
+	V[43] = RHS43 / m_A197;
+	double tmp42 = 0.0;
+	tmp42 += m_A183 * V[43];
+	V[42] = (RHS42 - tmp42) / m_A182;
+	double tmp41 = 0.0;
+	tmp41 += m_A175 * V[42];
+	tmp41 += m_A176 * V[43];
+	V[41] = (RHS41 - tmp41) / m_A174;
+	double tmp40 = 0.0;
+	tmp40 += m_A165 * V[43];
+	V[40] = (RHS40 - tmp40) / m_A164;
+	double tmp39 = 0.0;
+	tmp39 += m_A158 * V[41];
+	tmp39 += m_A159 * V[42];
+	tmp39 += m_A160 * V[43];
+	V[39] = (RHS39 - tmp39) / m_A157;
+	double tmp38 = 0.0;
+	tmp38 += m_A150 * V[39];
+	tmp38 += m_A151 * V[41];
+	tmp38 += m_A152 * V[42];
+	V[38] = (RHS38 - tmp38) / m_A149;
+	double tmp37 = 0.0;
+	tmp37 += m_A140 * V[38];
+	tmp37 += m_A141 * V[41];
+	V[37] = (RHS37 - tmp37) / m_A139;
+	double tmp36 = 0.0;
+	tmp36 += m_A134 * V[38];
+	tmp36 += m_A135 * V[42];
+	V[36] = (RHS36 - tmp36) / m_A133;
+	double tmp35 = 0.0;
+	tmp35 += m_A130 * V[38];
+	V[35] = (RHS35 - tmp35) / m_A129;
+	double tmp34 = 0.0;
+	tmp34 += m_A127 * V[40];
+	V[34] = (RHS34 - tmp34) / m_A126;
+	double tmp33 = 0.0;
+	tmp33 += m_A124 * V[40];
+	V[33] = (RHS33 - tmp33) / m_A123;
+	double tmp32 = 0.0;
+	tmp32 += m_A121 * V[38];
+	V[32] = (RHS32 - tmp32) / m_A120;
+	double tmp31 = 0.0;
+	tmp31 += m_A117 * V[39];
+	tmp31 += m_A118 * V[43];
+	V[31] = (RHS31 - tmp31) / m_A116;
+	double tmp30 = 0.0;
+	tmp30 += m_A111 * V[41];
+	tmp30 += m_A112 * V[43];
+	V[30] = (RHS30 - tmp30) / m_A110;
+	double tmp29 = 0.0;
+	tmp29 += m_A103 * V[30];
+	tmp29 += m_A104 * V[41];
+	tmp29 += m_A105 * V[43];
+	V[29] = (RHS29 - tmp29) / m_A102;
+	double tmp28 = 0.0;
+	tmp28 += m_A94 * V[29];
+	tmp28 += m_A95 * V[41];
+	tmp28 += m_A96 * V[43];
+	V[28] = (RHS28 - tmp28) / m_A93;
+	double tmp27 = 0.0;
+	tmp27 += m_A84 * V[28];
+	tmp27 += m_A85 * V[29];
+	tmp27 += m_A86 * V[43];
+	V[27] = (RHS27 - tmp27) / m_A83;
+	double tmp26 = 0.0;
+	tmp26 += m_A80 * V[30];
+	V[26] = (RHS26 - tmp26) / m_A79;
+	double tmp25 = 0.0;
+	tmp25 += m_A76 * V[28];
+	V[25] = (RHS25 - tmp25) / m_A75;
+	double tmp24 = 0.0;
+	tmp24 += m_A70 * V[25];
+	tmp24 += m_A71 * V[28];
+	V[24] = (RHS24 - tmp24) / m_A69;
+	double tmp23 = 0.0;
+	tmp23 += m_A65 * V[35];
+	tmp23 += m_A66 * V[38];
+	V[23] = (RHS23 - tmp23) / m_A64;
+	double tmp22 = 0.0;
+	tmp22 += m_A62 * V[32];
+	tmp22 += m_A63 * V[38];
+	V[22] = (RHS22 - tmp22) / m_A61;
+	double tmp21 = 0.0;
+	tmp21 += m_A59 * V[29];
+	tmp21 += m_A60 * V[30];
+	V[21] = (RHS21 - tmp21) / m_A58;
+	double tmp20 = 0.0;
+	tmp20 += m_A55 * V[28];
+	tmp20 += m_A56 * V[29];
+	tmp20 += m_A57 * V[41];
+	V[20] = (RHS20 - tmp20) / m_A54;
+	double tmp19 = 0.0;
+	tmp19 += m_A51 * V[27];
+	tmp19 += m_A52 * V[28];
+	tmp19 += m_A53 * V[29];
+	V[19] = (RHS19 - tmp19) / m_A50;
+	double tmp18 = 0.0;
+	tmp18 += m_A48 * V[26];
+	tmp18 += m_A49 * V[30];
+	V[18] = (RHS18 - tmp18) / m_A47;
+	double tmp17 = 0.0;
+	tmp17 += m_A46 * V[26];
+	V[17] = (RHS17 - tmp17) / m_A45;
+	double tmp16 = 0.0;
+	tmp16 += m_A44 * V[25];
+	V[16] = (RHS16 - tmp16) / m_A43;
+	double tmp15 = 0.0;
+	tmp15 += m_A41 * V[24];
+	tmp15 += m_A42 * V[25];
+	V[15] = (RHS15 - tmp15) / m_A40;
+	double tmp14 = 0.0;
+	tmp14 += m_A38 * V[24];
+	tmp14 += m_A39 * V[28];
+	V[14] = (RHS14 - tmp14) / m_A37;
+	double tmp13 = 0.0;
+	tmp13 += m_A35 * V[37];
+	tmp13 += m_A36 * V[41];
+	V[13] = (RHS13 - tmp13) / m_A34;
+	double tmp12 = 0.0;
+	tmp12 += m_A32 * V[38];
+	tmp12 += m_A33 * V[39];
+	V[12] = (RHS12 - tmp12) / m_A31;
+	double tmp11 = 0.0;
+	tmp11 += m_A29 * V[31];
+	tmp11 += m_A30 * V[39];
+	V[11] = (RHS11 - tmp11) / m_A28;
+	double tmp10 = 0.0;
+	tmp10 += m_A27 * V[31];
+	V[10] = (RHS10 - tmp10) / m_A26;
+	double tmp9 = 0.0;
+	tmp9 += m_A24 * V[31];
+	tmp9 += m_A25 * V[43];
+	V[9] = (RHS9 - tmp9) / m_A23;
+	double tmp8 = 0.0;
+	tmp8 += m_A21 * V[27];
+	tmp8 += m_A22 * V[43];
+	V[8] = (RHS8 - tmp8) / m_A20;
+	double tmp7 = 0.0;
+	tmp7 += m_A18 * V[38];
+	tmp7 += m_A19 * V[42];
+	V[7] = (RHS7 - tmp7) / m_A17;
+	double tmp6 = 0.0;
+	tmp6 += m_A16 * V[36];
+	V[6] = (RHS6 - tmp6) / m_A15;
+	double tmp5 = 0.0;
+	tmp5 += m_A14 * V[42];
+	V[5] = (RHS5 - tmp5) / m_A13;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[37];
+	tmp4 += m_A12 * V[38];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[13];
+	tmp3 += m_A9 * V[37];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[40];
+	tmp2 += m_A6 * V[43];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[40];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[33];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// gamemachine
+static void nl_gcr_491f95430bfdfd05_19_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[9];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A9 += go[12];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 -= go[13] * *cnV[13];
+	RHS4 -= go[14] * *cnV[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A11 += go[15];
+	double RHS5 = Idr[15];
+	RHS5 += Idr[16];
+	RHS5 += Idr[17];
+	RHS5 -= go[16] * *cnV[16];
+	RHS5 -= go[17] * *cnV[17];
+	m_A18 += gt[18];
+	m_A18 += gt[19];
+	m_A18 += gt[20];
+	m_A18 += gt[21];
+	m_A18 += gt[22];
+	m_A18 += gt[23];
+	m_A18 += gt[24];
+	m_A17 += go[18];
+	m_A16 += go[19];
+	m_A15 += go[20];
+	m_A14 += go[21];
+	m_A13 += go[22];
+	m_A12 += go[23];
+	double RHS6 = Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
+	RHS6 += Idr[21];
+	RHS6 += Idr[22];
+	RHS6 += Idr[23];
+	RHS6 += Idr[24];
+	RHS6 -= go[24] * *cnV[24];
+	const double f0 = 1.0 / m_A0;
+	const double f0_6 = -f0 * m_A12;
+	m_A18 += m_A1 * f0_6;
+	RHS6 += f0_6 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_6 = -f1 * m_A13;
+	m_A18 += m_A3 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_6 = -f2 * m_A14;
+	m_A18 += m_A5 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_6 = -f3 * m_A15;
+	m_A18 += m_A7 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_6 = -f4 * m_A16;
+	m_A18 += m_A9 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_6 = -f5 * m_A17;
+	m_A18 += m_A11 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	V[6] = RHS6 / m_A18;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[6];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[6];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[6];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[6];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// sspeedr
+static void nl_gcr_4a8e2b707bbac8a6_95_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A4 += gt[12];
+	m_A5 += go[10];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A6 += gt[16];
+	m_A6 += gt[17];
+	m_A6 += gt[18];
+	m_A6 += gt[19];
+	m_A7 += go[13];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
+	RHS3 -= go[16] * *cnV[16];
+	RHS3 -= go[17] * *cnV[17];
+	RHS3 -= go[18] * *cnV[18];
+	RHS3 -= go[19] * *cnV[19];
+	m_A8 += gt[20];
+	m_A8 += gt[21];
+	m_A9 += go[20];
+	double RHS4 = Idr[20];
+	RHS4 += Idr[21];
+	RHS4 -= go[21] * *cnV[21];
+	m_A10 += gt[22];
+	m_A10 += gt[23];
+	m_A11 += go[22];
+	double RHS5 = Idr[22];
+	RHS5 += Idr[23];
+	RHS5 -= go[23] * *cnV[23];
+	m_A12 += gt[24];
+	m_A12 += gt[25];
+	m_A12 += gt[26];
+	m_A12 += gt[27];
+	m_A13 += go[24];
+	double RHS6 = Idr[24];
+	RHS6 += Idr[25];
+	RHS6 += Idr[26];
+	RHS6 += Idr[27];
+	RHS6 -= go[25] * *cnV[25];
+	RHS6 -= go[26] * *cnV[26];
+	RHS6 -= go[27] * *cnV[27];
+	m_A14 += gt[28];
+	m_A14 += gt[29];
+	m_A14 += gt[30];
+	m_A14 += gt[31];
+	m_A15 += go[28];
+	double RHS7 = Idr[28];
+	RHS7 += Idr[29];
+	RHS7 += Idr[30];
+	RHS7 += Idr[31];
+	RHS7 -= go[29] * *cnV[29];
+	RHS7 -= go[30] * *cnV[30];
+	RHS7 -= go[31] * *cnV[31];
+	m_A16 += gt[32];
+	m_A16 += gt[33];
+	m_A17 += go[32];
+	double RHS8 = Idr[32];
+	RHS8 += Idr[33];
+	RHS8 -= go[33] * *cnV[33];
+	m_A18 += gt[34];
+	m_A18 += gt[35];
+	m_A18 += gt[36];
+	m_A18 += gt[37];
+	m_A19 += go[34];
+	double RHS9 = Idr[34];
+	RHS9 += Idr[35];
+	RHS9 += Idr[36];
+	RHS9 += Idr[37];
+	RHS9 -= go[35] * *cnV[35];
+	RHS9 -= go[36] * *cnV[36];
+	RHS9 -= go[37] * *cnV[37];
+	m_A20 += gt[38];
+	m_A20 += gt[39];
+	m_A22 += go[38];
+	m_A21 += go[39];
+	double RHS10 = Idr[38];
+	RHS10 += Idr[39];
+	m_A23 += gt[40];
+	m_A23 += gt[41];
+	m_A23 += gt[42];
+	m_A23 += gt[43];
+	m_A24 += go[40];
+	double RHS11 = Idr[40];
+	RHS11 += Idr[41];
+	RHS11 += Idr[42];
+	RHS11 += Idr[43];
+	RHS11 -= go[41] * *cnV[41];
+	RHS11 -= go[42] * *cnV[42];
+	RHS11 -= go[43] * *cnV[43];
+	m_A25 += gt[44];
+	m_A25 += gt[45];
+	m_A25 += gt[46];
+	m_A27 += go[44];
+	m_A28 += go[45];
+	m_A26 += go[46];
+	double RHS12 = Idr[44];
+	RHS12 += Idr[45];
+	RHS12 += Idr[46];
+	m_A29 += gt[47];
+	m_A29 += gt[48];
+	m_A31 += go[47];
+	m_A30 += go[48];
+	double RHS13 = Idr[47];
+	RHS13 += Idr[48];
+	m_A37 += gt[49];
+	m_A37 += gt[50];
+	m_A37 += gt[51];
+	m_A37 += gt[52];
+	m_A37 += gt[53];
+	m_A37 += gt[54];
+	m_A36 += go[49];
+	m_A35 += go[50];
+	m_A34 += go[51];
+	m_A33 += go[52];
+	m_A32 += go[53];
+	double RHS14 = Idr[49];
+	RHS14 += Idr[50];
+	RHS14 += Idr[51];
+	RHS14 += Idr[52];
+	RHS14 += Idr[53];
+	RHS14 += Idr[54];
+	RHS14 -= go[54] * *cnV[54];
+	m_A39 += gt[55];
+	m_A39 += gt[56];
+	m_A39 += gt[57];
+	m_A39 += gt[58];
+	m_A38 += go[55];
+	m_A40 += go[56];
+	double RHS15 = Idr[55];
+	RHS15 += Idr[56];
+	RHS15 += Idr[57];
+	RHS15 += Idr[58];
+	RHS15 -= go[57] * *cnV[57];
+	RHS15 -= go[58] * *cnV[58];
+	m_A42 += gt[59];
+	m_A42 += gt[60];
+	m_A42 += gt[61];
+	m_A42 += gt[62];
+	m_A41 += go[59];
+	m_A43 += go[60];
+	double RHS16 = Idr[59];
+	RHS16 += Idr[60];
+	RHS16 += Idr[61];
+	RHS16 += Idr[62];
+	RHS16 -= go[61] * *cnV[61];
+	RHS16 -= go[62] * *cnV[62];
+	m_A45 += gt[63];
+	m_A45 += gt[64];
+	m_A45 += gt[65];
+	m_A46 += go[63];
+	m_A44 += go[64];
+	double RHS17 = Idr[63];
+	RHS17 += Idr[64];
+	RHS17 += Idr[65];
+	RHS17 -= go[65] * *cnV[65];
+	m_A52 += gt[66];
+	m_A52 += gt[67];
+	m_A52 += gt[68];
+	m_A52 += gt[69];
+	m_A52 += gt[70];
+	m_A52 += gt[71];
+	m_A49 += go[66];
+	m_A50 += go[67];
+	m_A51 += go[68];
+	m_A47 += go[69];
+	m_A48 += go[70];
+	double RHS18 = Idr[66];
+	RHS18 += Idr[67];
+	RHS18 += Idr[68];
+	RHS18 += Idr[69];
+	RHS18 += Idr[70];
+	RHS18 += Idr[71];
+	RHS18 -= go[71] * *cnV[71];
+	m_A59 += gt[72];
+	m_A59 += gt[73];
+	m_A57 += go[72];
+	m_A62 += go[73];
+	double RHS19 = Idr[72];
+	RHS19 += Idr[73];
+	m_A66 += gt[74];
+	m_A66 += gt[75];
+	m_A66 += gt[76];
+	m_A66 += gt[77];
+	m_A66 += gt[78];
+	m_A66 += gt[79];
+	m_A66 += gt[80];
+	m_A63 += go[74];
+	m_A64 += go[75];
+	m_A68 += go[76];
+	m_A67 += go[77];
+	m_A67 += go[78];
+	double RHS20 = Idr[74];
+	RHS20 += Idr[75];
+	RHS20 += Idr[76];
+	RHS20 += Idr[77];
+	RHS20 += Idr[78];
+	RHS20 += Idr[79];
+	RHS20 += Idr[80];
+	RHS20 -= go[79] * *cnV[79];
+	RHS20 -= go[80] * *cnV[80];
+	m_A73 += gt[81];
+	m_A73 += gt[82];
+	m_A73 += gt[83];
+	m_A73 += gt[84];
+	m_A73 += gt[85];
+	m_A72 += go[81];
+	m_A72 += go[82];
+	m_A71 += go[83];
+	m_A69 += go[84];
+	m_A70 += go[85];
+	double RHS21 = Idr[81];
+	RHS21 += Idr[82];
+	RHS21 += Idr[83];
+	RHS21 += Idr[84];
+	RHS21 += Idr[85];
+	m_A80 += gt[86];
+	m_A80 += gt[87];
+	m_A80 += gt[88];
+	m_A80 += gt[89];
+	m_A80 += gt[90];
+	m_A80 += gt[91];
+	m_A80 += gt[92];
+	m_A80 += gt[93];
+	m_A80 += gt[94];
+	m_A80 += gt[95];
+	m_A80 += gt[96];
+	m_A75 += go[86];
+	m_A82 += go[87];
+	m_A76 += go[88];
+	double RHS22 = Idr[86];
+	RHS22 += Idr[87];
+	RHS22 += Idr[88];
+	RHS22 += Idr[89];
+	RHS22 += Idr[90];
+	RHS22 += Idr[91];
+	RHS22 += Idr[92];
+	RHS22 += Idr[93];
+	RHS22 += Idr[94];
+	RHS22 += Idr[95];
+	RHS22 += Idr[96];
+	RHS22 -= go[89] * *cnV[89];
+	RHS22 -= go[90] * *cnV[90];
+	RHS22 -= go[91] * *cnV[91];
+	RHS22 -= go[92] * *cnV[92];
+	RHS22 -= go[93] * *cnV[93];
+	RHS22 -= go[94] * *cnV[94];
+	RHS22 -= go[95] * *cnV[95];
+	RHS22 -= go[96] * *cnV[96];
+	m_A88 += gt[97];
+	m_A88 += gt[98];
+	m_A88 += gt[99];
+	m_A88 += gt[100];
+	m_A88 += gt[101];
+	m_A83 += go[97];
+	m_A85 += go[98];
+	m_A84 += go[99];
+	m_A86 += go[100];
+	double RHS23 = Idr[97];
+	RHS23 += Idr[98];
+	RHS23 += Idr[99];
+	RHS23 += Idr[100];
+	RHS23 += Idr[101];
+	RHS23 -= go[101] * *cnV[101];
+	m_A94 += gt[102];
+	m_A94 += gt[103];
+	m_A94 += gt[104];
+	m_A91 += go[102];
+	m_A89 += go[103];
+	m_A92 += go[104];
+	double RHS24 = Idr[102];
+	RHS24 += Idr[103];
+	RHS24 += Idr[104];
+	const double f0 = 1.0 / m_A0;
+	const double f0_15 = -f0 * m_A38;
+	m_A40 += m_A1 * f0_15;
+	RHS15 += f0_15 * RHS0;
+	const double f0_21 = -f0 * m_A69;
+	m_A73 += m_A1 * f0_21;
+	RHS21 += f0_21 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_20 = -f1 * m_A63;
+	m_A65 += m_A3 * f1_20;
+	RHS20 += f1_20 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_16 = -f2 * m_A41;
+	m_A43 += m_A5 * f2_16;
+	RHS16 += f2_16 * RHS2;
+	const double f2_18 = -f2 * m_A47;
+	m_A52 += m_A5 * f2_18;
+	RHS18 += f2_18 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_22 = -f3 * m_A75;
+	m_A77 += m_A7 * f3_22;
+	RHS22 += f3_22 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_14 = -f4 * m_A32;
+	m_A37 += m_A9 * f4_14;
+	RHS14 += f4_14 * RHS4;
+	const double f4_21 = -f4 * m_A70;
+	m_A71 += m_A9 * f4_21;
+	RHS21 += f4_21 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_17 = -f5 * m_A44;
+	m_A45 += m_A11 * f5_17;
+	RHS17 += f5_17 * RHS5;
+	const double f5_18 = -f5 * m_A48;
+	m_A51 += m_A11 * f5_18;
+	RHS18 += f5_18 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_14 = -f6 * m_A33;
+	m_A37 += m_A13 * f6_14;
+	RHS14 += f6_14 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_14 = -f7 * m_A34;
+	m_A37 += m_A15 * f7_14;
+	RHS14 += f7_14 * RHS7;
+	const double f8 = 1.0 / m_A16;
+	const double f8_23 = -f8 * m_A83;
+	m_A88 += m_A17 * f8_23;
+	RHS23 += f8_23 * RHS8;
+	const double f9 = 1.0 / m_A18;
+	const double f9_14 = -f9 * m_A35;
+	m_A37 += m_A19 * f9_14;
+	RHS14 += f9_14 * RHS9;
+	const double f10 = 1.0 / m_A20;
+	const double f10_20 = -f10 * m_A64;
+	m_A66 += m_A21 * f10_20;
+	m_A68 += m_A22 * f10_20;
+	RHS20 += f10_20 * RHS10;
+	const double f10_23 = -f10 * m_A84;
+	m_A86 += m_A21 * f10_23;
+	m_A88 += m_A22 * f10_23;
+	RHS23 += f10_23 * RHS10;
+	const double f11 = 1.0 / m_A23;
+	const double f11_14 = -f11 * m_A36;
+	m_A37 += m_A24 * f11_14;
+	RHS14 += f11_14 * RHS11;
+	const double f12 = 1.0 / m_A25;
+	const double f12_18 = -f12 * m_A49;
+	m_A52 += m_A26 * f12_18;
+	m_A53 += m_A27 * f12_18;
+	m_A56 += m_A28 * f12_18;
+	RHS18 += f12_18 * RHS12;
+	const double f12_19 = -f12 * m_A57;
+	m_A58 += m_A26 * f12_19;
+	m_A59 += m_A27 * f12_19;
+	m_A62 += m_A28 * f12_19;
+	RHS19 += f12_19 * RHS12;
+	const double f12_24 = -f12 * m_A89;
+	m_A90 += m_A26 * f12_24;
+	m_A91 += m_A27 * f12_24;
+	m_A94 += m_A28 * f12_24;
+	RHS24 += f12_24 * RHS12;
+	const double f13 = 1.0 / m_A29;
+	const double f13_18 = -f13 * m_A50;
+	m_A52 += m_A30 * f13_18;
+	m_A54 += m_A31 * f13_18;
+	RHS18 += f13_18 * RHS13;
+	const double f13_22 = -f13 * m_A76;
+	m_A78 += m_A30 * f13_22;
+	m_A80 += m_A31 * f13_22;
+	RHS22 += f13_22 * RHS13;
+	const double f14 = 1.0 / m_A37;
+	const double f14_21 = -f14 * m_A71;
+	RHS21 += f14_21 * RHS14;
+	const double f15 = 1.0 / m_A39;
+	const double f15_20 = -f15 * m_A65;
+	m_A67 += m_A40 * f15_20;
+	RHS20 += f15_20 * RHS15;
+	const double f16 = 1.0 / m_A42;
+	const double f16_22 = -f16 * m_A77;
+	m_A78 += m_A43 * f16_22;
+	RHS22 += f16_22 * RHS16;
+	const double f17 = 1.0 / m_A45;
+	const double f17_18 = -f17 * m_A51;
+	m_A55 += m_A46 * f17_18;
+	RHS18 += f17_18 * RHS17;
+	const double f17_23 = -f17 * m_A85;
+	m_A88 += m_A46 * f17_23;
+	RHS23 += f17_23 * RHS17;
+	const double f18 = 1.0 / m_A52;
+	const double f18_19 = -f18 * m_A58;
+	m_A59 += m_A53 * f18_19;
+	m_A60 += m_A54 * f18_19;
+	m_A61 += m_A55 * f18_19;
+	m_A62 += m_A56 * f18_19;
+	RHS19 += f18_19 * RHS18;
+	const double f18_22 = -f18 * m_A78;
+	m_A79 += m_A53 * f18_22;
+	m_A80 += m_A54 * f18_22;
+	m_A81 += m_A55 * f18_22;
+	m_A82 += m_A56 * f18_22;
+	RHS22 += f18_22 * RHS18;
+	const double f18_24 = -f18 * m_A90;
+	m_A91 += m_A53 * f18_24;
+	m_A92 += m_A54 * f18_24;
+	m_A93 += m_A55 * f18_24;
+	m_A94 += m_A56 * f18_24;
+	RHS24 += f18_24 * RHS18;
+	const double f19 = 1.0 / m_A59;
+	const double f19_22 = -f19 * m_A79;
+	m_A80 += m_A60 * f19_22;
+	m_A81 += m_A61 * f19_22;
+	m_A82 += m_A62 * f19_22;
+	RHS22 += f19_22 * RHS19;
+	const double f19_24 = -f19 * m_A91;
+	m_A92 += m_A60 * f19_24;
+	m_A93 += m_A61 * f19_24;
+	m_A94 += m_A62 * f19_24;
+	RHS24 += f19_24 * RHS19;
+	const double f20 = 1.0 / m_A66;
+	const double f20_21 = -f20 * m_A72;
+	m_A73 += m_A67 * f20_21;
+	m_A74 += m_A68 * f20_21;
+	RHS21 += f20_21 * RHS20;
+	const double f20_23 = -f20 * m_A86;
+	m_A87 += m_A67 * f20_23;
+	m_A88 += m_A68 * f20_23;
+	RHS23 += f20_23 * RHS20;
+	const double f21 = 1.0 / m_A73;
+	const double f21_23 = -f21 * m_A87;
+	m_A88 += m_A74 * f21_23;
+	RHS23 += f21_23 * RHS21;
+	const double f22 = 1.0 / m_A80;
+	const double f22_24 = -f22 * m_A92;
+	m_A93 += m_A81 * f22_24;
+	m_A94 += m_A82 * f22_24;
+	RHS24 += f22_24 * RHS22;
+	const double f23 = 1.0 / m_A88;
+	const double f23_24 = -f23 * m_A93;
+	RHS24 += f23_24 * RHS23;
+	V[24] = RHS24 / m_A94;
+	double tmp23 = 0.0;
+	V[23] = (RHS23 - tmp23) / m_A88;
+	double tmp22 = 0.0;
+	tmp22 += m_A81 * V[23];
+	tmp22 += m_A82 * V[24];
+	V[22] = (RHS22 - tmp22) / m_A80;
+	double tmp21 = 0.0;
+	tmp21 += m_A74 * V[23];
+	V[21] = (RHS21 - tmp21) / m_A73;
+	double tmp20 = 0.0;
+	tmp20 += m_A67 * V[21];
+	tmp20 += m_A68 * V[23];
+	V[20] = (RHS20 - tmp20) / m_A66;
+	double tmp19 = 0.0;
+	tmp19 += m_A60 * V[22];
+	tmp19 += m_A61 * V[23];
+	tmp19 += m_A62 * V[24];
+	V[19] = (RHS19 - tmp19) / m_A59;
+	double tmp18 = 0.0;
+	tmp18 += m_A53 * V[19];
+	tmp18 += m_A54 * V[22];
+	tmp18 += m_A55 * V[23];
+	tmp18 += m_A56 * V[24];
+	V[18] = (RHS18 - tmp18) / m_A52;
+	double tmp17 = 0.0;
+	tmp17 += m_A46 * V[23];
+	V[17] = (RHS17 - tmp17) / m_A45;
+	double tmp16 = 0.0;
+	tmp16 += m_A43 * V[18];
+	V[16] = (RHS16 - tmp16) / m_A42;
+	double tmp15 = 0.0;
+	tmp15 += m_A40 * V[21];
+	V[15] = (RHS15 - tmp15) / m_A39;
+	double tmp14 = 0.0;
+	V[14] = (RHS14 - tmp14) / m_A37;
+	double tmp13 = 0.0;
+	tmp13 += m_A30 * V[18];
+	tmp13 += m_A31 * V[22];
+	V[13] = (RHS13 - tmp13) / m_A29;
+	double tmp12 = 0.0;
+	tmp12 += m_A26 * V[18];
+	tmp12 += m_A27 * V[19];
+	tmp12 += m_A28 * V[24];
+	V[12] = (RHS12 - tmp12) / m_A25;
+	double tmp11 = 0.0;
+	tmp11 += m_A24 * V[14];
+	V[11] = (RHS11 - tmp11) / m_A23;
+	double tmp10 = 0.0;
+	tmp10 += m_A21 * V[20];
+	tmp10 += m_A22 * V[23];
+	V[10] = (RHS10 - tmp10) / m_A20;
+	double tmp9 = 0.0;
+	tmp9 += m_A19 * V[14];
+	V[9] = (RHS9 - tmp9) / m_A18;
+	double tmp8 = 0.0;
+	tmp8 += m_A17 * V[23];
+	V[8] = (RHS8 - tmp8) / m_A16;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[14];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[14];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[17];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[14];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[16];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[18];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[15];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[21];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// ripoff
+static void nl_gcr_4b5ecfbb8f9fa97b_29_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A6 += go[4];
+	m_A5 += go[5];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	m_A7 += gt[6];
+	m_A7 += gt[7];
+	m_A7 += gt[8];
+	m_A7 += gt[9];
+	m_A7 += gt[10];
+	m_A7 += gt[11];
+	m_A7 += gt[12];
+	m_A8 += go[6];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	RHS3 += Idr[8];
+	RHS3 += Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 -= go[7] * *cnV[7];
+	RHS3 -= go[8] * *cnV[8];
+	RHS3 -= go[9] * *cnV[9];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	RHS3 -= go[12] * *cnV[12];
+	m_A9 += gt[13];
+	m_A9 += gt[14];
+	m_A11 += go[13];
+	m_A10 += go[14];
+	double RHS4 = Idr[13];
+	RHS4 += Idr[14];
+	m_A14 += gt[15];
+	m_A14 += gt[16];
+	m_A14 += gt[17];
+	m_A12 += go[15];
+	m_A13 += go[16];
+	double RHS5 = Idr[15];
+	RHS5 += Idr[16];
+	RHS5 += Idr[17];
+	RHS5 -= go[17] * *cnV[17];
+	m_A18 += gt[18];
+	m_A18 += gt[19];
+	m_A18 += gt[20];
+	m_A18 += gt[21];
+	m_A19 += go[18];
+	m_A19 += go[19];
+	m_A16 += go[20];
+	double RHS6 = Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
+	RHS6 += Idr[21];
+	RHS6 -= go[21] * *cnV[21];
+	m_A22 += gt[22];
+	m_A22 += gt[23];
+	m_A22 += gt[24];
+	m_A21 += go[22];
+	m_A20 += go[23];
+	double RHS7 = Idr[22];
+	RHS7 += Idr[23];
+	RHS7 += Idr[24];
+	RHS7 -= go[24] * *cnV[24];
+	m_A28 += gt[25];
+	m_A28 += gt[26];
+	m_A28 += gt[27];
+	m_A28 += gt[28];
+	m_A28 += gt[29];
+	m_A28 += gt[30];
+	m_A24 += go[25];
+	m_A25 += go[26];
+	m_A26 += go[27];
+	m_A26 += go[28];
+	double RHS8 = Idr[25];
+	RHS8 += Idr[26];
+	RHS8 += Idr[27];
+	RHS8 += Idr[28];
+	RHS8 += Idr[29];
+	RHS8 += Idr[30];
+	RHS8 -= go[29] * *cnV[29];
+	RHS8 -= go[30] * *cnV[30];
+	const double f0 = 1.0 / m_A0;
+	const double f0_7 = -f0 * m_A20;
+	m_A22 += m_A1 * f0_7;
+	RHS7 += f0_7 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A12;
+	m_A14 += m_A3 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_5 = -f2 * m_A13;
+	m_A14 += m_A5 * f2_5;
+	m_A15 += m_A6 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f2_6 = -f2 * m_A16;
+	m_A17 += m_A5 * f2_6;
+	m_A18 += m_A6 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_8 = -f3 * m_A24;
+	m_A26 += m_A8 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f4 = 1.0 / m_A9;
+	const double f4_7 = -f4 * m_A21;
+	m_A22 += m_A10 * f4_7;
+	m_A23 += m_A11 * f4_7;
+	RHS7 += f4_7 * RHS4;
+	const double f4_8 = -f4 * m_A25;
+	m_A27 += m_A10 * f4_8;
+	m_A28 += m_A11 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f5 = 1.0 / m_A14;
+	const double f5_6 = -f5 * m_A17;
+	m_A18 += m_A15 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	const double f6 = 1.0 / m_A18;
+	const double f6_8 = -f6 * m_A26;
+	m_A28 += m_A19 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f7 = 1.0 / m_A22;
+	const double f7_8 = -f7 * m_A27;
+	m_A28 += m_A23 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	V[8] = RHS8 / m_A28;
+	double tmp7 = 0.0;
+	tmp7 += m_A23 * V[8];
+	V[7] = (RHS7 - tmp7) / m_A22;
+	double tmp6 = 0.0;
+	tmp6 += m_A19 * V[8];
+	V[6] = (RHS6 - tmp6) / m_A18;
+	double tmp5 = 0.0;
+	tmp5 += m_A15 * V[6];
+	V[5] = (RHS5 - tmp5) / m_A14;
+	double tmp4 = 0.0;
+	tmp4 += m_A10 * V[7];
+	tmp4 += m_A11 * V[8];
+	V[4] = (RHS4 - tmp4) / m_A9;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[5];
+	tmp2 += m_A6 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[7];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// gtrak10
+static void nl_gcr_4c46fdf7c0037727_43_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[9];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A9 += go[12];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 -= go[13] * *cnV[13];
+	RHS4 -= go[14] * *cnV[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A11 += go[15];
+	double RHS5 = Idr[15];
+	RHS5 += Idr[16];
+	RHS5 += Idr[17];
+	RHS5 -= go[16] * *cnV[16];
+	RHS5 -= go[17] * *cnV[17];
+	m_A12 += gt[18];
+	m_A12 += gt[19];
+	m_A12 += gt[20];
+	m_A13 += go[18];
+	double RHS6 = Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
+	RHS6 -= go[19] * *cnV[19];
+	RHS6 -= go[20] * *cnV[20];
+	m_A14 += gt[21];
+	m_A14 += gt[22];
+	m_A14 += gt[23];
+	m_A15 += go[21];
+	double RHS7 = Idr[21];
+	RHS7 += Idr[22];
+	RHS7 += Idr[23];
+	RHS7 -= go[22] * *cnV[22];
+	RHS7 -= go[23] * *cnV[23];
+	m_A16 += gt[24];
+	m_A16 += gt[25];
+	m_A16 += gt[26];
+	m_A17 += go[24];
+	double RHS8 = Idr[24];
+	RHS8 += Idr[25];
+	RHS8 += Idr[26];
+	RHS8 -= go[25] * *cnV[25];
+	RHS8 -= go[26] * *cnV[26];
+	m_A18 += gt[27];
+	m_A18 += gt[28];
+	m_A18 += gt[29];
+	m_A19 += go[27];
+	double RHS9 = Idr[27];
+	RHS9 += Idr[28];
+	RHS9 += Idr[29];
+	RHS9 -= go[28] * *cnV[28];
+	RHS9 -= go[29] * *cnV[29];
+	m_A20 += gt[30];
+	m_A20 += gt[31];
+	m_A20 += gt[32];
+	m_A21 += go[30];
+	double RHS10 = Idr[30];
+	RHS10 += Idr[31];
+	RHS10 += Idr[32];
+	RHS10 -= go[31] * *cnV[31];
+	RHS10 -= go[32] * *cnV[32];
+	m_A22 += gt[33];
+	m_A22 += gt[34];
+	m_A22 += gt[35];
+	m_A23 += go[33];
+	double RHS11 = Idr[33];
+	RHS11 += Idr[34];
+	RHS11 += Idr[35];
+	RHS11 -= go[34] * *cnV[34];
+	RHS11 -= go[35] * *cnV[35];
+	m_A25 += gt[36];
+	m_A25 += gt[37];
+	m_A25 += gt[38];
+	m_A26 += go[36];
+	m_A24 += go[37];
+	double RHS12 = Idr[36];
+	RHS12 += Idr[37];
+	RHS12 += Idr[38];
+	RHS12 -= go[38] * *cnV[38];
+	m_A30 += gt[39];
+	m_A30 += gt[40];
+	m_A30 += gt[41];
+	m_A30 += gt[42];
+	m_A30 += gt[43];
+	m_A30 += gt[44];
+	m_A30 += gt[45];
+	m_A29 += go[39];
+	m_A28 += go[40];
+	m_A27 += go[41];
+	m_A31 += go[42];
+	m_A31 += go[43];
+	double RHS13 = Idr[39];
+	RHS13 += Idr[40];
+	RHS13 += Idr[41];
+	RHS13 += Idr[42];
+	RHS13 += Idr[43];
+	RHS13 += Idr[44];
+	RHS13 += Idr[45];
+	RHS13 -= go[44] * *cnV[44];
+	RHS13 -= go[45] * *cnV[45];
+	m_A42 += gt[46];
+	m_A42 += gt[47];
+	m_A42 += gt[48];
+	m_A42 += gt[49];
+	m_A42 += gt[50];
+	m_A42 += gt[51];
+	m_A42 += gt[52];
+	m_A42 += gt[53];
+	m_A42 += gt[54];
+	m_A42 += gt[55];
+	m_A42 += gt[56];
+	m_A42 += gt[57];
+	m_A42 += gt[58];
+	m_A41 += go[46];
+	m_A41 += go[47];
+	m_A39 += go[48];
+	m_A38 += go[49];
+	m_A37 += go[50];
+	m_A36 += go[51];
+	m_A35 += go[52];
+	m_A34 += go[53];
+	m_A33 += go[54];
+	m_A32 += go[55];
+	m_A40 += go[56];
+	double RHS14 = Idr[46];
+	RHS14 += Idr[47];
+	RHS14 += Idr[48];
+	RHS14 += Idr[49];
+	RHS14 += Idr[50];
+	RHS14 += Idr[51];
+	RHS14 += Idr[52];
+	RHS14 += Idr[53];
+	RHS14 += Idr[54];
+	RHS14 += Idr[55];
+	RHS14 += Idr[56];
+	RHS14 += Idr[57];
+	RHS14 += Idr[58];
+	RHS14 -= go[57] * *cnV[57];
+	RHS14 -= go[58] * *cnV[58];
+	const double f0 = 1.0 / m_A0;
+	const double f0_12 = -f0 * m_A24;
+	m_A25 += m_A1 * f0_12;
+	RHS12 += f0_12 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_14 = -f1 * m_A32;
+	m_A42 += m_A3 * f1_14;
+	RHS14 += f1_14 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_14 = -f2 * m_A33;
+	m_A42 += m_A5 * f2_14;
+	RHS14 += f2_14 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_14 = -f3 * m_A34;
+	m_A42 += m_A7 * f3_14;
+	RHS14 += f3_14 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_14 = -f4 * m_A35;
+	m_A42 += m_A9 * f4_14;
+	RHS14 += f4_14 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_14 = -f5 * m_A36;
+	m_A42 += m_A11 * f5_14;
+	RHS14 += f5_14 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_14 = -f6 * m_A37;
+	m_A42 += m_A13 * f6_14;
+	RHS14 += f6_14 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_14 = -f7 * m_A38;
+	m_A42 += m_A15 * f7_14;
+	RHS14 += f7_14 * RHS7;
+	const double f8 = 1.0 / m_A16;
+	const double f8_14 = -f8 * m_A39;
+	m_A42 += m_A17 * f8_14;
+	RHS14 += f8_14 * RHS8;
+	const double f9 = 1.0 / m_A18;
+	const double f9_13 = -f9 * m_A27;
+	m_A30 += m_A19 * f9_13;
+	RHS13 += f9_13 * RHS9;
+	const double f10 = 1.0 / m_A20;
+	const double f10_13 = -f10 * m_A28;
+	m_A30 += m_A21 * f10_13;
+	RHS13 += f10_13 * RHS10;
+	const double f11 = 1.0 / m_A22;
+	const double f11_13 = -f11 * m_A29;
+	m_A30 += m_A23 * f11_13;
+	RHS13 += f11_13 * RHS11;
+	const double f12 = 1.0 / m_A25;
+	const double f12_14 = -f12 * m_A40;
+	m_A42 += m_A26 * f12_14;
+	RHS14 += f12_14 * RHS12;
+	const double f13 = 1.0 / m_A30;
+	const double f13_14 = -f13 * m_A41;
+	m_A42 += m_A31 * f13_14;
+	RHS14 += f13_14 * RHS13;
+	V[14] = RHS14 / m_A42;
+	double tmp13 = 0.0;
+	tmp13 += m_A31 * V[14];
+	V[13] = (RHS13 - tmp13) / m_A30;
+	double tmp12 = 0.0;
+	tmp12 += m_A26 * V[14];
+	V[12] = (RHS12 - tmp12) / m_A25;
+	double tmp11 = 0.0;
+	tmp11 += m_A23 * V[13];
+	V[11] = (RHS11 - tmp11) / m_A22;
+	double tmp10 = 0.0;
+	tmp10 += m_A21 * V[13];
+	V[10] = (RHS10 - tmp10) / m_A20;
+	double tmp9 = 0.0;
+	tmp9 += m_A19 * V[13];
+	V[9] = (RHS9 - tmp9) / m_A18;
+	double tmp8 = 0.0;
+	tmp8 += m_A17 * V[14];
+	V[8] = (RHS8 - tmp8) / m_A16;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[14];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[14];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[14];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[14];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[14];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[14];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[14];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[12];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// solarq
+static void nl_gcr_4cb524006206eb1a_25_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A2 += gt[11];
+	m_A5 += go[4];
+	m_A4 += go[5];
+	m_A4 += go[6];
+	m_A3 += go[7];
+	m_A3 += go[8];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A7 += go[12];
+	double RHS2 = Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[13] * *cnV[13];
+	m_A10 += gt[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A9 += go[14];
+	m_A9 += go[15];
+	m_A8 += go[16];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 -= go[17] * *cnV[17];
+	RHS3 -= go[18] * *cnV[18];
+	RHS3 -= go[19] * *cnV[19];
+	m_A15 += gt[20];
+	m_A15 += gt[21];
+	m_A15 += gt[22];
+	m_A15 += gt[23];
+	m_A15 += gt[24];
+	m_A16 += go[20];
+	m_A16 += go[21];
+	m_A13 += go[22];
+	m_A13 += go[23];
+	double RHS4 = Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 -= go[24] * *cnV[24];
+	m_A18 += gt[25];
+	m_A18 += gt[26];
+	m_A18 += gt[27];
+	m_A19 += go[25];
+	m_A17 += go[26];
+	double RHS5 = Idr[25];
+	RHS5 += Idr[26];
+	RHS5 += Idr[27];
+	RHS5 -= go[27] * *cnV[27];
+	m_A24 += gt[28];
+	m_A24 += gt[29];
+	m_A24 += gt[30];
+	m_A24 += gt[31];
+	m_A23 += go[28];
+	m_A22 += go[29];
+	m_A22 += go[30];
+	m_A20 += go[31];
+	double RHS6 = Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 += Idr[31];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A10 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	m_A12 += m_A5 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f1_4 = -f1 * m_A13;
+	m_A14 += m_A3 * f1_4;
+	m_A15 += m_A4 * f1_4;
+	m_A16 += m_A5 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f1_6 = -f1 * m_A20;
+	m_A21 += m_A3 * f1_6;
+	m_A22 += m_A4 * f1_6;
+	m_A24 += m_A5 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_5 = -f2 * m_A17;
+	m_A18 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_4 = -f3 * m_A14;
+	m_A15 += m_A11 * f3_4;
+	m_A16 += m_A12 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f3_6 = -f3 * m_A21;
+	m_A22 += m_A11 * f3_6;
+	m_A24 += m_A12 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f4 = 1.0 / m_A15;
+	const double f4_6 = -f4 * m_A22;
+	m_A24 += m_A16 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f5 = 1.0 / m_A18;
+	const double f5_6 = -f5 * m_A23;
+	m_A24 += m_A19 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	V[6] = RHS6 / m_A24;
+	double tmp5 = 0.0;
+	tmp5 += m_A19 * V[6];
+	V[5] = (RHS5 - tmp5) / m_A18;
+	double tmp4 = 0.0;
+	tmp4 += m_A16 * V[6];
+	V[4] = (RHS4 - tmp4) / m_A15;
+	double tmp3 = 0.0;
+	tmp3 += m_A11 * V[4];
+	tmp3 += m_A12 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A10;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	tmp1 += m_A4 * V[4];
+	tmp1 += m_A5 * V[6];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// spacfury
+static void nl_gcr_4dbd0f2aec7ef707_110_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A4 += go[3];
+	m_A5 += go[4];
+	m_A3 += go[5];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A7 += go[7];
+	m_A8 += go[8];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	m_A9 += gt[14];
+	m_A9 += gt[15];
+	m_A9 += gt[16];
+	m_A11 += go[14];
+	m_A12 += go[15];
+	m_A10 += go[16];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	m_A13 += gt[17];
+	m_A13 += gt[18];
+	m_A13 += gt[19];
+	m_A13 += gt[20];
+	m_A13 += gt[21];
+	m_A13 += gt[22];
+	m_A13 += gt[23];
+	m_A14 += go[17];
+	m_A15 += go[18];
+	double RHS4 = Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	RHS4 -= go[22] * *cnV[22];
+	RHS4 -= go[23] * *cnV[23];
+	m_A16 += gt[24];
+	m_A16 += gt[25];
+	m_A16 += gt[26];
+	m_A17 += go[24];
+	double RHS5 = Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 -= go[25] * *cnV[25];
+	RHS5 -= go[26] * *cnV[26];
+	m_A18 += gt[27];
+	m_A18 += gt[28];
+	m_A19 += go[27];
+	double RHS6 = Idr[27];
+	RHS6 += Idr[28];
+	RHS6 -= go[28] * *cnV[28];
+	m_A20 += gt[29];
+	m_A20 += gt[30];
+	m_A20 += gt[31];
+	m_A20 += gt[32];
+	m_A22 += go[29];
+	m_A23 += go[30];
+	m_A21 += go[31];
+	double RHS7 = Idr[29];
+	RHS7 += Idr[30];
+	RHS7 += Idr[31];
+	RHS7 += Idr[32];
+	RHS7 -= go[32] * *cnV[32];
+	m_A24 += gt[33];
+	m_A24 += gt[34];
+	m_A24 += gt[35];
+	m_A24 += gt[36];
+	m_A24 += gt[37];
+	m_A24 += gt[38];
+	m_A24 += gt[39];
+	m_A25 += go[33];
+	m_A26 += go[34];
+	double RHS8 = Idr[33];
+	RHS8 += Idr[34];
+	RHS8 += Idr[35];
+	RHS8 += Idr[36];
+	RHS8 += Idr[37];
+	RHS8 += Idr[38];
+	RHS8 += Idr[39];
+	RHS8 -= go[35] * *cnV[35];
+	RHS8 -= go[36] * *cnV[36];
+	RHS8 -= go[37] * *cnV[37];
+	RHS8 -= go[38] * *cnV[38];
+	RHS8 -= go[39] * *cnV[39];
+	m_A27 += gt[40];
+	m_A27 += gt[41];
+	m_A27 += gt[42];
+	m_A30 += go[40];
+	m_A29 += go[41];
+	m_A28 += go[42];
+	double RHS9 = Idr[40];
+	RHS9 += Idr[41];
+	RHS9 += Idr[42];
+	m_A31 += gt[43];
+	m_A31 += gt[44];
+	m_A31 += gt[45];
+	m_A31 += gt[46];
+	m_A31 += gt[47];
+	m_A31 += gt[48];
+	m_A31 += gt[49];
+	m_A33 += go[43];
+	m_A32 += go[44];
+	double RHS10 = Idr[43];
+	RHS10 += Idr[44];
+	RHS10 += Idr[45];
+	RHS10 += Idr[46];
+	RHS10 += Idr[47];
+	RHS10 += Idr[48];
+	RHS10 += Idr[49];
+	RHS10 -= go[45] * *cnV[45];
+	RHS10 -= go[46] * *cnV[46];
+	RHS10 -= go[47] * *cnV[47];
+	RHS10 -= go[48] * *cnV[48];
+	RHS10 -= go[49] * *cnV[49];
+	m_A36 += gt[50];
+	m_A36 += gt[51];
+	m_A35 += go[50];
+	m_A34 += go[51];
+	double RHS11 = Idr[50];
+	RHS11 += Idr[51];
+	m_A41 += gt[52];
+	m_A41 += gt[53];
+	m_A41 += gt[54];
+	m_A41 += gt[55];
+	m_A41 += gt[56];
+	m_A42 += go[52];
+	m_A39 += go[53];
+	double RHS12 = Idr[52];
+	RHS12 += Idr[53];
+	RHS12 += Idr[54];
+	RHS12 += Idr[55];
+	RHS12 += Idr[56];
+	RHS12 -= go[54] * *cnV[54];
+	RHS12 -= go[55] * *cnV[55];
+	RHS12 -= go[56] * *cnV[56];
+	m_A46 += gt[57];
+	m_A46 += gt[58];
+	m_A46 += gt[59];
+	m_A46 += gt[60];
+	m_A46 += gt[61];
+	m_A43 += go[57];
+	m_A44 += go[58];
+	m_A48 += go[59];
+	double RHS13 = Idr[57];
+	RHS13 += Idr[58];
+	RHS13 += Idr[59];
+	RHS13 += Idr[60];
+	RHS13 += Idr[61];
+	RHS13 -= go[60] * *cnV[60];
+	RHS13 -= go[61] * *cnV[61];
+	m_A52 += gt[62];
+	m_A52 += gt[63];
+	m_A51 += go[62];
+	m_A50 += go[63];
+	double RHS14 = Idr[62];
+	RHS14 += Idr[63];
+	m_A57 += gt[64];
+	m_A57 += gt[65];
+	m_A57 += gt[66];
+	m_A59 += go[64];
+	m_A55 += go[65];
+	double RHS15 = Idr[64];
+	RHS15 += Idr[65];
+	RHS15 += Idr[66];
+	RHS15 -= go[66] * *cnV[66];
+	m_A62 += gt[67];
+	m_A62 += gt[68];
+	m_A62 += gt[69];
+	m_A62 += gt[70];
+	m_A62 += gt[71];
+	m_A63 += go[67];
+	m_A60 += go[68];
+	double RHS16 = Idr[67];
+	RHS16 += Idr[68];
+	RHS16 += Idr[69];
+	RHS16 += Idr[70];
+	RHS16 += Idr[71];
+	RHS16 -= go[69] * *cnV[69];
+	RHS16 -= go[70] * *cnV[70];
+	RHS16 -= go[71] * *cnV[71];
+	m_A65 += gt[72];
+	m_A65 += gt[73];
+	m_A65 += gt[74];
+	m_A64 += go[72];
+	m_A67 += go[73];
+	m_A66 += go[74];
+	double RHS17 = Idr[72];
+	RHS17 += Idr[73];
+	RHS17 += Idr[74];
+	m_A71 += gt[75];
+	m_A71 += gt[76];
+	m_A71 += gt[77];
+	m_A71 += gt[78];
+	m_A71 += gt[79];
+	m_A68 += go[75];
+	m_A69 += go[76];
+	m_A73 += go[77];
+	double RHS18 = Idr[75];
+	RHS18 += Idr[76];
+	RHS18 += Idr[77];
+	RHS18 += Idr[78];
+	RHS18 += Idr[79];
+	RHS18 -= go[78] * *cnV[78];
+	RHS18 -= go[79] * *cnV[79];
+	m_A77 += gt[80];
+	m_A77 += gt[81];
+	m_A77 += gt[82];
+	m_A79 += go[80];
+	m_A75 += go[81];
+	double RHS19 = Idr[80];
+	RHS19 += Idr[81];
+	RHS19 += Idr[82];
+	RHS19 -= go[82] * *cnV[82];
+	m_A85 += gt[83];
+	m_A85 += gt[84];
+	m_A85 += gt[85];
+	m_A82 += go[83];
+	m_A83 += go[84];
+	m_A80 += go[85];
+	double RHS20 = Idr[83];
+	RHS20 += Idr[84];
+	RHS20 += Idr[85];
+	m_A93 += gt[86];
+	m_A93 += gt[87];
+	m_A93 += gt[88];
+	m_A93 += gt[89];
+	m_A93 += gt[90];
+	m_A93 += gt[91];
+	m_A88 += go[86];
+	m_A91 += go[87];
+	m_A90 += go[88];
+	m_A87 += go[89];
+	double RHS21 = Idr[86];
+	RHS21 += Idr[87];
+	RHS21 += Idr[88];
+	RHS21 += Idr[89];
+	RHS21 += Idr[90];
+	RHS21 += Idr[91];
+	RHS21 -= go[90] * *cnV[90];
+	RHS21 -= go[91] * *cnV[91];
+	m_A100 += gt[92];
+	m_A100 += gt[93];
+	m_A100 += gt[94];
+	m_A97 += go[92];
+	m_A98 += go[93];
+	m_A95 += go[94];
+	double RHS22 = Idr[92];
+	RHS22 += Idr[93];
+	RHS22 += Idr[94];
+	m_A109 += gt[95];
+	m_A109 += gt[96];
+	m_A109 += gt[97];
+	m_A109 += gt[98];
+	m_A109 += gt[99];
+	m_A109 += gt[100];
+	m_A103 += go[95];
+	m_A106 += go[96];
+	m_A102 += go[97];
+	m_A104 += go[98];
+	double RHS23 = Idr[95];
+	RHS23 += Idr[96];
+	RHS23 += Idr[97];
+	RHS23 += Idr[98];
+	RHS23 += Idr[99];
+	RHS23 += Idr[100];
+	RHS23 -= go[99] * *cnV[99];
+	RHS23 -= go[100] * *cnV[100];
+	const double f0 = 1.0 / m_A0;
+	const double f0_11 = -f0 * m_A34;
+	m_A36 += m_A1 * f0_11;
+	RHS11 += f0_11 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_11 = -f1 * m_A35;
+	m_A36 += m_A3 * f1_11;
+	m_A37 += m_A4 * f1_11;
+	m_A38 += m_A5 * f1_11;
+	RHS11 += f1_11 * RHS1;
+	const double f1_12 = -f1 * m_A39;
+	m_A40 += m_A3 * f1_12;
+	m_A41 += m_A4 * f1_12;
+	m_A42 += m_A5 * f1_12;
+	RHS12 += f1_12 * RHS1;
+	const double f1_20 = -f1 * m_A80;
+	m_A81 += m_A3 * f1_20;
+	m_A82 += m_A4 * f1_20;
+	m_A85 += m_A5 * f1_20;
+	RHS20 += f1_20 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_13 = -f2 * m_A43;
+	m_A45 += m_A7 * f2_13;
+	m_A48 += m_A8 * f2_13;
+	RHS13 += f2_13 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_13 = -f3 * m_A44;
+	m_A46 += m_A10 * f3_13;
+	m_A47 += m_A11 * f3_13;
+	m_A49 += m_A12 * f3_13;
+	RHS13 += f3_13 * RHS3;
+	const double f3_15 = -f3 * m_A55;
+	m_A56 += m_A10 * f3_15;
+	m_A57 += m_A11 * f3_15;
+	m_A59 += m_A12 * f3_15;
+	RHS15 += f3_15 * RHS3;
+	const double f3_21 = -f3 * m_A87;
+	m_A89 += m_A10 * f3_21;
+	m_A90 += m_A11 * f3_21;
+	m_A93 += m_A12 * f3_21;
+	RHS21 += f3_21 * RHS3;
+	const double f4 = 1.0 / m_A13;
+	const double f4_21 = -f4 * m_A88;
+	m_A90 += m_A14 * f4_21;
+	m_A93 += m_A15 * f4_21;
+	RHS21 += f4_21 * RHS4;
+	const double f5 = 1.0 / m_A16;
+	const double f5_14 = -f5 * m_A50;
+	m_A52 += m_A17 * f5_14;
+	RHS14 += f5_14 * RHS5;
+	const double f6 = 1.0 / m_A18;
+	const double f6_17 = -f6 * m_A64;
+	m_A65 += m_A19 * f6_17;
+	RHS17 += f6_17 * RHS6;
+	const double f7 = 1.0 / m_A20;
+	const double f7_14 = -f7 * m_A51;
+	m_A52 += m_A21 * f7_14;
+	m_A53 += m_A22 * f7_14;
+	m_A54 += m_A23 * f7_14;
+	RHS14 += f7_14 * RHS7;
+	const double f7_16 = -f7 * m_A60;
+	m_A61 += m_A21 * f7_16;
+	m_A62 += m_A22 * f7_16;
+	m_A63 += m_A23 * f7_16;
+	RHS16 += f7_16 * RHS7;
+	const double f7_22 = -f7 * m_A95;
+	m_A96 += m_A21 * f7_22;
+	m_A97 += m_A22 * f7_22;
+	m_A100 += m_A23 * f7_22;
+	RHS22 += f7_22 * RHS7;
+	const double f8 = 1.0 / m_A24;
+	const double f8_18 = -f8 * m_A68;
+	m_A70 += m_A25 * f8_18;
+	m_A73 += m_A26 * f8_18;
+	RHS18 += f8_18 * RHS8;
+	const double f9 = 1.0 / m_A27;
+	const double f9_18 = -f9 * m_A69;
+	m_A71 += m_A28 * f9_18;
+	m_A72 += m_A29 * f9_18;
+	m_A74 += m_A30 * f9_18;
+	RHS18 += f9_18 * RHS9;
+	const double f9_19 = -f9 * m_A75;
+	m_A76 += m_A28 * f9_19;
+	m_A77 += m_A29 * f9_19;
+	m_A79 += m_A30 * f9_19;
+	RHS19 += f9_19 * RHS9;
+	const double f9_23 = -f9 * m_A102;
+	m_A105 += m_A28 * f9_23;
+	m_A106 += m_A29 * f9_23;
+	m_A109 += m_A30 * f9_23;
+	RHS23 += f9_23 * RHS9;
+	const double f10 = 1.0 / m_A31;
+	const double f10_23 = -f10 * m_A103;
+	m_A106 += m_A32 * f10_23;
+	m_A109 += m_A33 * f10_23;
+	RHS23 += f10_23 * RHS10;
+	const double f11 = 1.0 / m_A36;
+	const double f11_12 = -f11 * m_A40;
+	m_A41 += m_A37 * f11_12;
+	m_A42 += m_A38 * f11_12;
+	RHS12 += f11_12 * RHS11;
+	const double f11_20 = -f11 * m_A81;
+	m_A82 += m_A37 * f11_20;
+	m_A85 += m_A38 * f11_20;
+	RHS20 += f11_20 * RHS11;
+	const double f12 = 1.0 / m_A41;
+	const double f12_13 = -f12 * m_A45;
+	m_A48 += m_A42 * f12_13;
+	RHS13 += f12_13 * RHS12;
+	const double f12_20 = -f12 * m_A82;
+	m_A85 += m_A42 * f12_20;
+	RHS20 += f12_20 * RHS12;
+	const double f13 = 1.0 / m_A46;
+	const double f13_15 = -f13 * m_A56;
+	m_A57 += m_A47 * f13_15;
+	m_A58 += m_A48 * f13_15;
+	m_A59 += m_A49 * f13_15;
+	RHS15 += f13_15 * RHS13;
+	const double f13_20 = -f13 * m_A83;
+	m_A84 += m_A47 * f13_20;
+	m_A85 += m_A48 * f13_20;
+	m_A86 += m_A49 * f13_20;
+	RHS20 += f13_20 * RHS13;
+	const double f13_21 = -f13 * m_A89;
+	m_A90 += m_A47 * f13_21;
+	m_A92 += m_A48 * f13_21;
+	m_A93 += m_A49 * f13_21;
+	RHS21 += f13_21 * RHS13;
+	const double f14 = 1.0 / m_A52;
+	const double f14_16 = -f14 * m_A61;
+	m_A62 += m_A53 * f14_16;
+	m_A63 += m_A54 * f14_16;
+	RHS16 += f14_16 * RHS14;
+	const double f14_22 = -f14 * m_A96;
+	m_A97 += m_A53 * f14_22;
+	m_A100 += m_A54 * f14_22;
+	RHS22 += f14_22 * RHS14;
+	const double f15 = 1.0 / m_A57;
+	const double f15_20 = -f15 * m_A84;
+	m_A85 += m_A58 * f15_20;
+	m_A86 += m_A59 * f15_20;
+	RHS20 += f15_20 * RHS15;
+	const double f15_21 = -f15 * m_A90;
+	m_A92 += m_A58 * f15_21;
+	m_A93 += m_A59 * f15_21;
+	RHS21 += f15_21 * RHS15;
+	const double f16 = 1.0 / m_A62;
+	const double f16_18 = -f16 * m_A70;
+	m_A73 += m_A63 * f16_18;
+	RHS18 += f16_18 * RHS16;
+	const double f16_22 = -f16 * m_A97;
+	m_A100 += m_A63 * f16_22;
+	RHS22 += f16_22 * RHS16;
+	const double f17 = 1.0 / m_A65;
+	const double f17_21 = -f17 * m_A91;
+	m_A93 += m_A66 * f17_21;
+	m_A94 += m_A67 * f17_21;
+	RHS21 += f17_21 * RHS17;
+	const double f17_23 = -f17 * m_A104;
+	m_A107 += m_A66 * f17_23;
+	m_A109 += m_A67 * f17_23;
+	RHS23 += f17_23 * RHS17;
+	const double f18 = 1.0 / m_A71;
+	const double f18_19 = -f18 * m_A76;
+	m_A77 += m_A72 * f18_19;
+	m_A78 += m_A73 * f18_19;
+	m_A79 += m_A74 * f18_19;
+	RHS19 += f18_19 * RHS18;
+	const double f18_22 = -f18 * m_A98;
+	m_A99 += m_A72 * f18_22;
+	m_A100 += m_A73 * f18_22;
+	m_A101 += m_A74 * f18_22;
+	RHS22 += f18_22 * RHS18;
+	const double f18_23 = -f18 * m_A105;
+	m_A106 += m_A72 * f18_23;
+	m_A108 += m_A73 * f18_23;
+	m_A109 += m_A74 * f18_23;
+	RHS23 += f18_23 * RHS18;
+	const double f19 = 1.0 / m_A77;
+	const double f19_22 = -f19 * m_A99;
+	m_A100 += m_A78 * f19_22;
+	m_A101 += m_A79 * f19_22;
+	RHS22 += f19_22 * RHS19;
+	const double f19_23 = -f19 * m_A106;
+	m_A108 += m_A78 * f19_23;
+	m_A109 += m_A79 * f19_23;
+	RHS23 += f19_23 * RHS19;
+	const double f20 = 1.0 / m_A85;
+	const double f20_21 = -f20 * m_A92;
+	m_A93 += m_A86 * f20_21;
+	RHS21 += f20_21 * RHS20;
+	const double f21 = 1.0 / m_A93;
+	const double f21_23 = -f21 * m_A107;
+	m_A109 += m_A94 * f21_23;
+	RHS23 += f21_23 * RHS21;
+	const double f22 = 1.0 / m_A100;
+	const double f22_23 = -f22 * m_A108;
+	m_A109 += m_A101 * f22_23;
+	RHS23 += f22_23 * RHS22;
+	V[23] = RHS23 / m_A109;
+	double tmp22 = 0.0;
+	tmp22 += m_A101 * V[23];
+	V[22] = (RHS22 - tmp22) / m_A100;
+	double tmp21 = 0.0;
+	tmp21 += m_A94 * V[23];
+	V[21] = (RHS21 - tmp21) / m_A93;
+	double tmp20 = 0.0;
+	tmp20 += m_A86 * V[21];
+	V[20] = (RHS20 - tmp20) / m_A85;
+	double tmp19 = 0.0;
+	tmp19 += m_A78 * V[22];
+	tmp19 += m_A79 * V[23];
+	V[19] = (RHS19 - tmp19) / m_A77;
+	double tmp18 = 0.0;
+	tmp18 += m_A72 * V[19];
+	tmp18 += m_A73 * V[22];
+	tmp18 += m_A74 * V[23];
+	V[18] = (RHS18 - tmp18) / m_A71;
+	double tmp17 = 0.0;
+	tmp17 += m_A66 * V[21];
+	tmp17 += m_A67 * V[23];
+	V[17] = (RHS17 - tmp17) / m_A65;
+	double tmp16 = 0.0;
+	tmp16 += m_A63 * V[22];
+	V[16] = (RHS16 - tmp16) / m_A62;
+	double tmp15 = 0.0;
+	tmp15 += m_A58 * V[20];
+	tmp15 += m_A59 * V[21];
+	V[15] = (RHS15 - tmp15) / m_A57;
+	double tmp14 = 0.0;
+	tmp14 += m_A53 * V[16];
+	tmp14 += m_A54 * V[22];
+	V[14] = (RHS14 - tmp14) / m_A52;
+	double tmp13 = 0.0;
+	tmp13 += m_A47 * V[15];
+	tmp13 += m_A48 * V[20];
+	tmp13 += m_A49 * V[21];
+	V[13] = (RHS13 - tmp13) / m_A46;
+	double tmp12 = 0.0;
+	tmp12 += m_A42 * V[20];
+	V[12] = (RHS12 - tmp12) / m_A41;
+	double tmp11 = 0.0;
+	tmp11 += m_A37 * V[12];
+	tmp11 += m_A38 * V[20];
+	V[11] = (RHS11 - tmp11) / m_A36;
+	double tmp10 = 0.0;
+	tmp10 += m_A32 * V[19];
+	tmp10 += m_A33 * V[23];
+	V[10] = (RHS10 - tmp10) / m_A31;
+	double tmp9 = 0.0;
+	tmp9 += m_A28 * V[18];
+	tmp9 += m_A29 * V[19];
+	tmp9 += m_A30 * V[23];
+	V[9] = (RHS9 - tmp9) / m_A27;
+	double tmp8 = 0.0;
+	tmp8 += m_A25 * V[16];
+	tmp8 += m_A26 * V[22];
+	V[8] = (RHS8 - tmp8) / m_A24;
+	double tmp7 = 0.0;
+	tmp7 += m_A21 * V[14];
+	tmp7 += m_A22 * V[16];
+	tmp7 += m_A23 * V[22];
+	V[7] = (RHS7 - tmp7) / m_A20;
+	double tmp6 = 0.0;
+	tmp6 += m_A19 * V[17];
+	V[6] = (RHS6 - tmp6) / m_A18;
+	double tmp5 = 0.0;
+	tmp5 += m_A17 * V[14];
+	V[5] = (RHS5 - tmp5) / m_A16;
+	double tmp4 = 0.0;
+	tmp4 += m_A14 * V[15];
+	tmp4 += m_A15 * V[21];
+	V[4] = (RHS4 - tmp4) / m_A13;
+	double tmp3 = 0.0;
+	tmp3 += m_A10 * V[13];
+	tmp3 += m_A11 * V[15];
+	tmp3 += m_A12 * V[21];
+	V[3] = (RHS3 - tmp3) / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[12];
+	tmp2 += m_A8 * V[20];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[11];
+	tmp1 += m_A4 * V[12];
+	tmp1 += m_A5 * V[20];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[11];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// solarq
+static void nl_gcr_4e4931ccbfb7a3c_70_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A4 += go[3];
+	m_A3 += go[4];
+	m_A3 += go[5];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	m_A5 += gt[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A7 += go[9];
+	m_A6 += go[10];
+	m_A6 += go[11];
+	double RHS2 = Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[12] * *cnV[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A8 += gt[18];
+	m_A8 += gt[19];
+	m_A10 += go[13];
+	m_A9 += go[14];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 -= go[15] * *cnV[15];
+	RHS3 -= go[16] * *cnV[16];
+	RHS3 -= go[17] * *cnV[17];
+	RHS3 -= go[18] * *cnV[18];
+	RHS3 -= go[19] * *cnV[19];
+	m_A11 += gt[20];
+	m_A11 += gt[21];
+	m_A11 += gt[22];
+	m_A11 += gt[23];
+	m_A11 += gt[24];
+	m_A11 += gt[25];
+	m_A11 += gt[26];
+	m_A12 += go[20];
+	double RHS4 = Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 += Idr[25];
+	RHS4 += Idr[26];
+	RHS4 -= go[21] * *cnV[21];
+	RHS4 -= go[22] * *cnV[22];
+	RHS4 -= go[23] * *cnV[23];
+	RHS4 -= go[24] * *cnV[24];
+	RHS4 -= go[25] * *cnV[25];
+	RHS4 -= go[26] * *cnV[26];
+	m_A13 += gt[27];
+	m_A13 += gt[28];
+	m_A13 += gt[29];
+	m_A13 += gt[30];
+	m_A13 += gt[31];
+	m_A14 += go[27];
+	m_A15 += go[28];
+	double RHS5 = Idr[27];
+	RHS5 += Idr[28];
+	RHS5 += Idr[29];
+	RHS5 += Idr[30];
+	RHS5 += Idr[31];
+	RHS5 -= go[29] * *cnV[29];
+	RHS5 -= go[30] * *cnV[30];
+	RHS5 -= go[31] * *cnV[31];
+	m_A16 += gt[32];
+	m_A16 += gt[33];
+	m_A16 += gt[34];
+	m_A16 += gt[35];
+	m_A16 += gt[36];
+	m_A16 += gt[37];
+	m_A16 += gt[38];
+	m_A17 += go[32];
+	m_A18 += go[33];
+	double RHS6 = Idr[32];
+	RHS6 += Idr[33];
+	RHS6 += Idr[34];
+	RHS6 += Idr[35];
+	RHS6 += Idr[36];
+	RHS6 += Idr[37];
+	RHS6 += Idr[38];
+	RHS6 -= go[34] * *cnV[34];
+	RHS6 -= go[35] * *cnV[35];
+	RHS6 -= go[36] * *cnV[36];
+	RHS6 -= go[37] * *cnV[37];
+	RHS6 -= go[38] * *cnV[38];
+	m_A19 += gt[39];
+	m_A19 += gt[40];
+	m_A19 += gt[41];
+	m_A19 += gt[42];
+	m_A20 += go[39];
+	m_A21 += go[40];
+	double RHS7 = Idr[39];
+	RHS7 += Idr[40];
+	RHS7 += Idr[41];
+	RHS7 += Idr[42];
+	RHS7 -= go[41] * *cnV[41];
+	RHS7 -= go[42] * *cnV[42];
+	m_A22 += gt[43];
+	m_A22 += gt[44];
+	m_A22 += gt[45];
+	m_A22 += gt[46];
+	m_A22 += gt[47];
+	m_A23 += go[43];
+	m_A24 += go[44];
+	double RHS8 = Idr[43];
+	RHS8 += Idr[44];
+	RHS8 += Idr[45];
+	RHS8 += Idr[46];
+	RHS8 += Idr[47];
+	RHS8 -= go[45] * *cnV[45];
+	RHS8 -= go[46] * *cnV[46];
+	RHS8 -= go[47] * *cnV[47];
+	m_A25 += gt[48];
+	m_A25 += gt[49];
+	m_A25 += gt[50];
+	m_A26 += go[48];
+	m_A27 += go[49];
+	double RHS9 = Idr[48];
+	RHS9 += Idr[49];
+	RHS9 += Idr[50];
+	RHS9 -= go[50] * *cnV[50];
+	m_A30 += gt[51];
+	m_A30 += gt[52];
+	m_A30 += gt[53];
+	m_A30 += gt[54];
+	m_A30 += gt[55];
+	m_A30 += gt[56];
+	m_A29 += go[51];
+	m_A29 += go[52];
+	m_A28 += go[53];
+	double RHS10 = Idr[51];
+	RHS10 += Idr[52];
+	RHS10 += Idr[53];
+	RHS10 += Idr[54];
+	RHS10 += Idr[55];
+	RHS10 += Idr[56];
+	RHS10 -= go[54] * *cnV[54];
+	RHS10 -= go[55] * *cnV[55];
+	RHS10 -= go[56] * *cnV[56];
+	m_A35 += gt[57];
+	m_A35 += gt[58];
+	m_A35 += gt[59];
+	m_A35 += gt[60];
+	m_A35 += gt[61];
+	m_A33 += go[57];
+	m_A33 += go[58];
+	m_A32 += go[59];
+	double RHS11 = Idr[57];
+	RHS11 += Idr[58];
+	RHS11 += Idr[59];
+	RHS11 += Idr[60];
+	RHS11 += Idr[61];
+	RHS11 -= go[60] * *cnV[60];
+	RHS11 -= go[61] * *cnV[61];
+	m_A39 += gt[62];
+	m_A39 += gt[63];
+	m_A39 += gt[64];
+	m_A39 += gt[65];
+	m_A39 += gt[66];
+	m_A40 += go[62];
+	m_A37 += go[63];
+	double RHS12 = Idr[62];
+	RHS12 += Idr[63];
+	RHS12 += Idr[64];
+	RHS12 += Idr[65];
+	RHS12 += Idr[66];
+	RHS12 -= go[64] * *cnV[64];
+	RHS12 -= go[65] * *cnV[65];
+	RHS12 -= go[66] * *cnV[66];
+	m_A42 += gt[67];
+	m_A42 += gt[68];
+	m_A42 += gt[69];
+	m_A42 += gt[70];
+	m_A42 += gt[71];
+	m_A42 += gt[72];
+	m_A42 += gt[73];
+	m_A43 += go[67];
+	m_A41 += go[68];
+	double RHS13 = Idr[67];
+	RHS13 += Idr[68];
+	RHS13 += Idr[69];
+	RHS13 += Idr[70];
+	RHS13 += Idr[71];
+	RHS13 += Idr[72];
+	RHS13 += Idr[73];
+	RHS13 -= go[69] * *cnV[69];
+	RHS13 -= go[70] * *cnV[70];
+	RHS13 -= go[71] * *cnV[71];
+	RHS13 -= go[72] * *cnV[72];
+	RHS13 -= go[73] * *cnV[73];
+	m_A48 += gt[74];
+	m_A48 += gt[75];
+	m_A48 += gt[76];
+	m_A46 += go[74];
+	m_A45 += go[75];
+	m_A50 += go[76];
+	double RHS14 = Idr[74];
+	RHS14 += Idr[75];
+	RHS14 += Idr[76];
+	m_A55 += gt[77];
+	m_A55 += gt[78];
+	m_A55 += gt[79];
+	m_A53 += go[77];
+	m_A51 += go[78];
+	m_A57 += go[79];
+	double RHS15 = Idr[77];
+	RHS15 += Idr[78];
+	RHS15 += Idr[79];
+	m_A62 += gt[80];
+	m_A62 += gt[81];
+	m_A62 += gt[82];
+	m_A62 += gt[83];
+	m_A62 += gt[84];
+	m_A58 += go[80];
+	m_A60 += go[81];
+	m_A59 += go[82];
+	double RHS16 = Idr[80];
+	RHS16 += Idr[81];
+	RHS16 += Idr[82];
+	RHS16 += Idr[83];
+	RHS16 += Idr[84];
+	RHS16 -= go[83] * *cnV[83];
+	RHS16 -= go[84] * *cnV[84];
+	m_A69 += gt[85];
+	m_A69 += gt[86];
+	m_A69 += gt[87];
+	m_A69 += gt[88];
+	m_A69 += gt[89];
+	m_A69 += gt[90];
+	m_A64 += go[85];
+	m_A67 += go[86];
+	m_A65 += go[87];
+	m_A66 += go[88];
+	double RHS17 = Idr[85];
+	RHS17 += Idr[86];
+	RHS17 += Idr[87];
+	RHS17 += Idr[88];
+	RHS17 += Idr[89];
+	RHS17 += Idr[90];
+	RHS17 -= go[89] * *cnV[89];
+	RHS17 -= go[90] * *cnV[90];
+	const double f0 = 1.0 / m_A0;
+	const double f0_10 = -f0 * m_A28;
+	m_A30 += m_A1 * f0_10;
+	RHS10 += f0_10 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_10 = -f1 * m_A29;
+	m_A30 += m_A3 * f1_10;
+	m_A31 += m_A4 * f1_10;
+	RHS10 += f1_10 * RHS1;
+	const double f1_11 = -f1 * m_A32;
+	m_A34 += m_A3 * f1_11;
+	m_A35 += m_A4 * f1_11;
+	RHS11 += f1_11 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_11 = -f2 * m_A33;
+	m_A35 += m_A6 * f2_11;
+	m_A36 += m_A7 * f2_11;
+	RHS11 += f2_11 * RHS2;
+	const double f2_12 = -f2 * m_A37;
+	m_A38 += m_A6 * f2_12;
+	m_A39 += m_A7 * f2_12;
+	RHS12 += f2_12 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_17 = -f3 * m_A64;
+	m_A66 += m_A9 * f3_17;
+	m_A69 += m_A10 * f3_17;
+	RHS17 += f3_17 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_16 = -f4 * m_A58;
+	m_A59 += m_A12 * f4_16;
+	RHS16 += f4_16 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_15 = -f5 * m_A51;
+	m_A52 += m_A14 * f5_15;
+	m_A55 += m_A15 * f5_15;
+	RHS15 += f5_15 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_15 = -f6 * m_A52;
+	m_A53 += m_A17 * f6_15;
+	m_A55 += m_A18 * f6_15;
+	RHS15 += f6_15 * RHS6;
+	const double f7 = 1.0 / m_A19;
+	const double f7_13 = -f7 * m_A41;
+	m_A43 += m_A20 * f7_13;
+	m_A44 += m_A21 * f7_13;
+	RHS13 += f7_13 * RHS7;
+	const double f7_14 = -f7 * m_A45;
+	m_A48 += m_A20 * f7_14;
+	m_A49 += m_A21 * f7_14;
+	RHS14 += f7_14 * RHS7;
+	const double f7_15 = -f7 * m_A53;
+	m_A54 += m_A20 * f7_15;
+	m_A55 += m_A21 * f7_15;
+	RHS15 += f7_15 * RHS7;
+	const double f8 = 1.0 / m_A22;
+	const double f8_14 = -f8 * m_A46;
+	m_A47 += m_A23 * f8_14;
+	m_A48 += m_A24 * f8_14;
+	RHS14 += f8_14 * RHS8;
+	const double f9 = 1.0 / m_A25;
+	const double f9_16 = -f9 * m_A59;
+	m_A62 += m_A26 * f9_16;
+	m_A63 += m_A27 * f9_16;
+	RHS16 += f9_16 * RHS9;
+	const double f9_17 = -f9 * m_A65;
+	m_A68 += m_A26 * f9_17;
+	m_A69 += m_A27 * f9_17;
+	RHS17 += f9_17 * RHS9;
+	const double f10 = 1.0 / m_A30;
+	const double f10_11 = -f10 * m_A34;
+	m_A35 += m_A31 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	const double f11 = 1.0 / m_A35;
+	const double f11_12 = -f11 * m_A38;
+	m_A39 += m_A36 * f11_12;
+	RHS12 += f11_12 * RHS11;
+	const double f12 = 1.0 / m_A39;
+	const double f12_17 = -f12 * m_A66;
+	m_A69 += m_A40 * f12_17;
+	RHS17 += f12_17 * RHS12;
+	const double f13 = 1.0 / m_A42;
+	const double f13_14 = -f13 * m_A47;
+	m_A48 += m_A43 * f13_14;
+	m_A49 += m_A44 * f13_14;
+	RHS14 += f13_14 * RHS13;
+	const double f14 = 1.0 / m_A48;
+	const double f14_15 = -f14 * m_A54;
+	m_A55 += m_A49 * f14_15;
+	m_A56 += m_A50 * f14_15;
+	RHS15 += f14_15 * RHS14;
+	const double f14_16 = -f14 * m_A60;
+	m_A61 += m_A49 * f14_16;
+	m_A62 += m_A50 * f14_16;
+	RHS16 += f14_16 * RHS14;
+	const double f15 = 1.0 / m_A55;
+	const double f15_16 = -f15 * m_A61;
+	m_A62 += m_A56 * f15_16;
+	m_A63 += m_A57 * f15_16;
+	RHS16 += f15_16 * RHS15;
+	const double f15_17 = -f15 * m_A67;
+	m_A68 += m_A56 * f15_17;
+	m_A69 += m_A57 * f15_17;
+	RHS17 += f15_17 * RHS15;
+	const double f16 = 1.0 / m_A62;
+	const double f16_17 = -f16 * m_A68;
+	m_A69 += m_A63 * f16_17;
+	RHS17 += f16_17 * RHS16;
+	V[17] = RHS17 / m_A69;
+	double tmp16 = 0.0;
+	tmp16 += m_A63 * V[17];
+	V[16] = (RHS16 - tmp16) / m_A62;
+	double tmp15 = 0.0;
+	tmp15 += m_A56 * V[16];
+	tmp15 += m_A57 * V[17];
+	V[15] = (RHS15 - tmp15) / m_A55;
+	double tmp14 = 0.0;
+	tmp14 += m_A49 * V[15];
+	tmp14 += m_A50 * V[16];
+	V[14] = (RHS14 - tmp14) / m_A48;
+	double tmp13 = 0.0;
+	tmp13 += m_A43 * V[14];
+	tmp13 += m_A44 * V[15];
+	V[13] = (RHS13 - tmp13) / m_A42;
+	double tmp12 = 0.0;
+	tmp12 += m_A40 * V[17];
+	V[12] = (RHS12 - tmp12) / m_A39;
+	double tmp11 = 0.0;
+	tmp11 += m_A36 * V[12];
+	V[11] = (RHS11 - tmp11) / m_A35;
+	double tmp10 = 0.0;
+	tmp10 += m_A31 * V[11];
+	V[10] = (RHS10 - tmp10) / m_A30;
+	double tmp9 = 0.0;
+	tmp9 += m_A26 * V[16];
+	tmp9 += m_A27 * V[17];
+	V[9] = (RHS9 - tmp9) / m_A25;
+	double tmp8 = 0.0;
+	tmp8 += m_A23 * V[13];
+	tmp8 += m_A24 * V[14];
+	V[8] = (RHS8 - tmp8) / m_A22;
+	double tmp7 = 0.0;
+	tmp7 += m_A20 * V[14];
+	tmp7 += m_A21 * V[15];
+	V[7] = (RHS7 - tmp7) / m_A19;
+	double tmp6 = 0.0;
+	tmp6 += m_A17 * V[7];
+	tmp6 += m_A18 * V[15];
+	V[6] = (RHS6 - tmp6) / m_A16;
+	double tmp5 = 0.0;
+	tmp5 += m_A14 * V[6];
+	tmp5 += m_A15 * V[15];
+	V[5] = (RHS5 - tmp5) / m_A13;
+	double tmp4 = 0.0;
+	tmp4 += m_A12 * V[9];
+	V[4] = (RHS4 - tmp4) / m_A11;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[12];
+	tmp3 += m_A10 * V[17];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[11];
+	tmp2 += m_A7 * V[12];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[10];
+	tmp1 += m_A4 * V[11];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[10];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// fireone
+static void nl_gcr_4f2b2f3cdc384f75_41_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A4 += go[7];
+	m_A3 += go[8];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	m_A5 += gt[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A5 += gt[13];
+	m_A5 += gt[14];
+	m_A5 += gt[15];
+	m_A6 += go[9];
+	double RHS2 = Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 += Idr[15];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	RHS2 -= go[14] * *cnV[14];
+	RHS2 -= go[15] * *cnV[15];
+	m_A7 += gt[16];
+	m_A7 += gt[17];
+	m_A7 += gt[18];
+	m_A8 += go[16];
+	m_A9 += go[17];
+	double RHS3 = Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 -= go[18] * *cnV[18];
+	m_A10 += gt[19];
+	m_A10 += gt[20];
+	m_A10 += gt[21];
+	m_A10 += gt[22];
+	m_A10 += gt[23];
+	m_A10 += gt[24];
+	m_A10 += gt[25];
+	m_A11 += go[19];
+	m_A12 += go[20];
+	m_A13 += go[21];
+	double RHS4 = Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 += Idr[25];
+	RHS4 -= go[22] * *cnV[22];
+	RHS4 -= go[23] * *cnV[23];
+	RHS4 -= go[24] * *cnV[24];
+	RHS4 -= go[25] * *cnV[25];
+	m_A16 += gt[26];
+	m_A16 += gt[27];
+	m_A16 += gt[28];
+	m_A16 += gt[29];
+	m_A16 += gt[30];
+	m_A15 += go[26];
+	m_A14 += go[27];
+	double RHS5 = Idr[26];
+	RHS5 += Idr[27];
+	RHS5 += Idr[28];
+	RHS5 += Idr[29];
+	RHS5 += Idr[30];
+	RHS5 -= go[28] * *cnV[28];
+	RHS5 -= go[29] * *cnV[29];
+	RHS5 -= go[30] * *cnV[30];
+	m_A19 += gt[31];
+	m_A19 += gt[32];
+	m_A19 += gt[33];
+	m_A19 += gt[34];
+	m_A19 += gt[35];
+	m_A19 += gt[36];
+	m_A19 += gt[37];
+	m_A20 += go[31];
+	m_A18 += go[32];
+	double RHS6 = Idr[31];
+	RHS6 += Idr[32];
+	RHS6 += Idr[33];
+	RHS6 += Idr[34];
+	RHS6 += Idr[35];
+	RHS6 += Idr[36];
+	RHS6 += Idr[37];
+	RHS6 -= go[33] * *cnV[33];
+	RHS6 -= go[34] * *cnV[34];
+	RHS6 -= go[35] * *cnV[35];
+	RHS6 -= go[36] * *cnV[36];
+	RHS6 -= go[37] * *cnV[37];
+	m_A24 += gt[38];
+	m_A24 += gt[39];
+	m_A24 += gt[40];
+	m_A25 += go[38];
+	m_A22 += go[39];
+	double RHS7 = Idr[38];
+	RHS7 += Idr[39];
+	RHS7 += Idr[40];
+	RHS7 -= go[40] * *cnV[40];
+	m_A29 += gt[41];
+	m_A29 += gt[42];
+	m_A29 += gt[43];
+	m_A27 += go[41];
+	m_A26 += go[42];
+	double RHS8 = Idr[41];
+	RHS8 += Idr[42];
+	RHS8 += Idr[43];
+	RHS8 -= go[43] * *cnV[43];
+	m_A35 += gt[44];
+	m_A35 += gt[45];
+	m_A35 += gt[46];
+	m_A32 += go[44];
+	m_A31 += go[45];
+	m_A36 += go[46];
+	double RHS9 = Idr[44];
+	RHS9 += Idr[45];
+	RHS9 += Idr[46];
+	m_A40 += gt[47];
+	m_A40 += gt[48];
+	m_A40 += gt[49];
+	m_A40 += gt[50];
+	m_A40 += gt[51];
+	m_A37 += go[47];
+	m_A39 += go[48];
+	m_A38 += go[49];
+	double RHS10 = Idr[47];
+	RHS10 += Idr[48];
+	RHS10 += Idr[49];
+	RHS10 += Idr[50];
+	RHS10 += Idr[51];
+	RHS10 -= go[50] * *cnV[50];
+	RHS10 -= go[51] * *cnV[51];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A14;
+	m_A16 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A15;
+	m_A16 += m_A3 * f1_5;
+	m_A17 += m_A4 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f1_7 = -f1 * m_A22;
+	m_A23 += m_A3 * f1_7;
+	m_A24 += m_A4 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_10 = -f2 * m_A37;
+	m_A38 += m_A6 * f2_10;
+	RHS10 += f2_10 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_6 = -f3 * m_A18;
+	m_A20 += m_A8 * f3_6;
+	m_A21 += m_A9 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f3_8 = -f3 * m_A26;
+	m_A29 += m_A8 * f3_8;
+	m_A30 += m_A9 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f3_9 = -f3 * m_A31;
+	m_A34 += m_A8 * f3_9;
+	m_A35 += m_A9 * f3_9;
+	RHS9 += f3_9 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_8 = -f4 * m_A27;
+	m_A28 += m_A11 * f4_8;
+	m_A29 += m_A12 * f4_8;
+	m_A30 += m_A13 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f4_9 = -f4 * m_A32;
+	m_A33 += m_A11 * f4_9;
+	m_A34 += m_A12 * f4_9;
+	m_A35 += m_A13 * f4_9;
+	RHS9 += f4_9 * RHS4;
+	const double f5 = 1.0 / m_A16;
+	const double f5_7 = -f5 * m_A23;
+	m_A24 += m_A17 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f6 = 1.0 / m_A19;
+	const double f6_8 = -f6 * m_A28;
+	m_A29 += m_A20 * f6_8;
+	m_A30 += m_A21 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f6_9 = -f6 * m_A33;
+	m_A34 += m_A20 * f6_9;
+	m_A35 += m_A21 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f7 = 1.0 / m_A24;
+	const double f7_10 = -f7 * m_A38;
+	m_A40 += m_A25 * f7_10;
+	RHS10 += f7_10 * RHS7;
+	const double f8 = 1.0 / m_A29;
+	const double f8_9 = -f8 * m_A34;
+	m_A35 += m_A30 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	const double f9 = 1.0 / m_A35;
+	const double f9_10 = -f9 * m_A39;
+	m_A40 += m_A36 * f9_10;
+	RHS10 += f9_10 * RHS9;
+	V[10] = RHS10 / m_A40;
+	double tmp9 = 0.0;
+	tmp9 += m_A36 * V[10];
+	V[9] = (RHS9 - tmp9) / m_A35;
+	double tmp8 = 0.0;
+	tmp8 += m_A30 * V[9];
+	V[8] = (RHS8 - tmp8) / m_A29;
+	double tmp7 = 0.0;
+	tmp7 += m_A25 * V[10];
+	V[7] = (RHS7 - tmp7) / m_A24;
+	double tmp6 = 0.0;
+	tmp6 += m_A20 * V[8];
+	tmp6 += m_A21 * V[9];
+	V[6] = (RHS6 - tmp6) / m_A19;
+	double tmp5 = 0.0;
+	tmp5 += m_A17 * V[7];
+	V[5] = (RHS5 - tmp5) / m_A16;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[6];
+	tmp4 += m_A12 * V[8];
+	tmp4 += m_A13 * V[9];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[8];
+	tmp3 += m_A9 * V[9];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[7];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[5];
+	tmp1 += m_A4 * V[7];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[5];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// boxingb
+static void nl_gcr_50f5194a994d56ec_16_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[3] * *cnV[3];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	m_A7 += gt[10];
+	m_A7 += gt[11];
+	m_A6 += go[10];
+	m_A8 += go[11];
+	double RHS3 = Idr[10];
+	RHS3 += Idr[11];
+	m_A10 += gt[12];
+	m_A10 += gt[13];
+	m_A9 += go[12];
+	m_A11 += go[13];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	m_A15 += gt[14];
+	m_A15 += gt[15];
+	m_A15 += gt[16];
+	m_A15 += gt[17];
+	m_A13 += go[14];
+	m_A14 += go[15];
+	m_A12 += go[16];
+	double RHS5 = Idr[14];
+	RHS5 += Idr[15];
+	RHS5 += Idr[16];
+	RHS5 += Idr[17];
+	RHS5 -= go[17] * *cnV[17];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A12;
+	m_A15 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A6;
+	m_A7 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_4 = -f2 * m_A9;
+	m_A10 += m_A5 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_5 = -f3 * m_A13;
+	m_A15 += m_A8 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_5 = -f4 * m_A14;
+	m_A15 += m_A11 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A15;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[5];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starhawk
+static void nl_gcr_528a27fe9ed07d67_45_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A3 += go[7];
+	m_A3 += go[8];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	m_A4 += gt[11];
+	m_A4 += gt[12];
+	m_A5 += go[11];
+	double RHS2 = Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[12] * *cnV[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A7 += go[13];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A8 += gt[18];
+	m_A9 += go[16];
+	double RHS4 = Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 -= go[17] * *cnV[17];
+	RHS4 -= go[18] * *cnV[18];
+	m_A10 += gt[19];
+	m_A10 += gt[20];
+	m_A10 += gt[21];
+	m_A11 += go[19];
+	double RHS5 = Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 -= go[20] * *cnV[20];
+	RHS5 -= go[21] * *cnV[21];
+	m_A12 += gt[22];
+	m_A12 += gt[23];
+	m_A12 += gt[24];
+	m_A13 += go[22];
+	double RHS6 = Idr[22];
+	RHS6 += Idr[23];
+	RHS6 += Idr[24];
+	RHS6 -= go[23] * *cnV[23];
+	RHS6 -= go[24] * *cnV[24];
+	m_A14 += gt[25];
+	m_A14 += gt[26];
+	m_A15 += go[25];
+	m_A16 += go[26];
+	double RHS7 = Idr[25];
+	RHS7 += Idr[26];
+	m_A17 += gt[27];
+	m_A17 += gt[28];
+	m_A17 += gt[29];
+	m_A18 += go[27];
+	double RHS8 = Idr[27];
+	RHS8 += Idr[28];
+	RHS8 += Idr[29];
+	RHS8 -= go[28] * *cnV[28];
+	RHS8 -= go[29] * *cnV[29];
+	m_A19 += gt[30];
+	m_A19 += gt[31];
+	m_A19 += gt[32];
+	m_A20 += go[30];
+	double RHS9 = Idr[30];
+	RHS9 += Idr[31];
+	RHS9 += Idr[32];
+	RHS9 -= go[31] * *cnV[31];
+	RHS9 -= go[32] * *cnV[32];
+	m_A21 += gt[33];
+	m_A21 += gt[34];
+	m_A21 += gt[35];
+	m_A22 += go[33];
+	double RHS10 = Idr[33];
+	RHS10 += Idr[34];
+	RHS10 += Idr[35];
+	RHS10 -= go[34] * *cnV[34];
+	RHS10 -= go[35] * *cnV[35];
+	m_A23 += gt[36];
+	m_A23 += gt[37];
+	m_A23 += gt[38];
+	m_A24 += go[36];
+	double RHS11 = Idr[36];
+	RHS11 += Idr[37];
+	RHS11 += Idr[38];
+	RHS11 -= go[37] * *cnV[37];
+	RHS11 -= go[38] * *cnV[38];
+	m_A34 += gt[39];
+	m_A34 += gt[40];
+	m_A34 += gt[41];
+	m_A34 += gt[42];
+	m_A34 += gt[43];
+	m_A34 += gt[44];
+	m_A34 += gt[45];
+	m_A34 += gt[46];
+	m_A34 += gt[47];
+	m_A34 += gt[48];
+	m_A33 += go[39];
+	m_A32 += go[40];
+	m_A31 += go[41];
+	m_A30 += go[42];
+	m_A29 += go[43];
+	m_A28 += go[44];
+	m_A27 += go[45];
+	m_A26 += go[46];
+	m_A25 += go[47];
+	double RHS12 = Idr[39];
+	RHS12 += Idr[40];
+	RHS12 += Idr[41];
+	RHS12 += Idr[42];
+	RHS12 += Idr[43];
+	RHS12 += Idr[44];
+	RHS12 += Idr[45];
+	RHS12 += Idr[46];
+	RHS12 += Idr[47];
+	RHS12 += Idr[48];
+	RHS12 -= go[48] * *cnV[48];
+	m_A38 += gt[49];
+	m_A38 += gt[50];
+	m_A38 += gt[51];
+	m_A38 += gt[52];
+	m_A38 += gt[53];
+	m_A38 += gt[54];
+	m_A36 += go[49];
+	m_A39 += go[50];
+	m_A37 += go[51];
+	m_A37 += go[52];
+	double RHS13 = Idr[49];
+	RHS13 += Idr[50];
+	RHS13 += Idr[51];
+	RHS13 += Idr[52];
+	RHS13 += Idr[53];
+	RHS13 += Idr[54];
+	RHS13 -= go[53] * *cnV[53];
+	RHS13 -= go[54] * *cnV[54];
+	m_A44 += gt[55];
+	m_A44 += gt[56];
+	m_A44 += gt[57];
+	m_A44 += gt[58];
+	m_A44 += gt[59];
+	m_A41 += go[55];
+	m_A40 += go[56];
+	m_A43 += go[57];
+	double RHS14 = Idr[55];
+	RHS14 += Idr[56];
+	RHS14 += Idr[57];
+	RHS14 += Idr[58];
+	RHS14 += Idr[59];
+	RHS14 -= go[58] * *cnV[58];
+	RHS14 -= go[59] * *cnV[59];
+	const double f0 = 1.0 / m_A0;
+	const double f0_13 = -f0 * m_A36;
+	m_A37 += m_A1 * f0_13;
+	RHS13 += f0_13 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_13 = -f1 * m_A37;
+	m_A38 += m_A3 * f1_13;
+	RHS13 += f1_13 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_14 = -f2 * m_A40;
+	m_A44 += m_A5 * f2_14;
+	RHS14 += f2_14 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_12 = -f3 * m_A25;
+	m_A34 += m_A7 * f3_12;
+	RHS12 += f3_12 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_12 = -f4 * m_A26;
+	m_A34 += m_A9 * f4_12;
+	RHS12 += f4_12 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_12 = -f5 * m_A27;
+	m_A34 += m_A11 * f5_12;
+	RHS12 += f5_12 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_12 = -f6 * m_A28;
+	m_A34 += m_A13 * f6_12;
+	RHS12 += f6_12 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_12 = -f7 * m_A29;
+	m_A34 += m_A15 * f7_12;
+	m_A35 += m_A16 * f7_12;
+	RHS12 += f7_12 * RHS7;
+	const double f7_14 = -f7 * m_A41;
+	m_A42 += m_A15 * f7_14;
+	m_A44 += m_A16 * f7_14;
+	RHS14 += f7_14 * RHS7;
+	const double f8 = 1.0 / m_A17;
+	const double f8_12 = -f8 * m_A30;
+	m_A34 += m_A18 * f8_12;
+	RHS12 += f8_12 * RHS8;
+	const double f9 = 1.0 / m_A19;
+	const double f9_12 = -f9 * m_A31;
+	m_A34 += m_A20 * f9_12;
+	RHS12 += f9_12 * RHS9;
+	const double f10 = 1.0 / m_A21;
+	const double f10_12 = -f10 * m_A32;
+	m_A34 += m_A22 * f10_12;
+	RHS12 += f10_12 * RHS10;
+	const double f11 = 1.0 / m_A23;
+	const double f11_12 = -f11 * m_A33;
+	m_A34 += m_A24 * f11_12;
+	RHS12 += f11_12 * RHS11;
+	const double f12 = 1.0 / m_A34;
+	const double f12_14 = -f12 * m_A42;
+	m_A44 += m_A35 * f12_14;
+	RHS14 += f12_14 * RHS12;
+	const double f13 = 1.0 / m_A38;
+	const double f13_14 = -f13 * m_A43;
+	m_A44 += m_A39 * f13_14;
+	RHS14 += f13_14 * RHS13;
+	V[14] = RHS14 / m_A44;
+	double tmp13 = 0.0;
+	tmp13 += m_A39 * V[14];
+	V[13] = (RHS13 - tmp13) / m_A38;
+	double tmp12 = 0.0;
+	tmp12 += m_A35 * V[14];
+	V[12] = (RHS12 - tmp12) / m_A34;
+	double tmp11 = 0.0;
+	tmp11 += m_A24 * V[12];
+	V[11] = (RHS11 - tmp11) / m_A23;
+	double tmp10 = 0.0;
+	tmp10 += m_A22 * V[12];
+	V[10] = (RHS10 - tmp10) / m_A21;
+	double tmp9 = 0.0;
+	tmp9 += m_A20 * V[12];
+	V[9] = (RHS9 - tmp9) / m_A19;
+	double tmp8 = 0.0;
+	tmp8 += m_A18 * V[12];
+	V[8] = (RHS8 - tmp8) / m_A17;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[12];
+	tmp7 += m_A16 * V[14];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[12];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[12];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[12];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[12];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[14];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[13];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[1];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// astrob
+static void nl_gcr_536c3652eb3bc075_46_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A3 += go[7];
+	m_A4 += go[8];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[9] * *cnV[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A6 += go[10];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	m_A7 += gt[13];
+	m_A7 += gt[14];
+	m_A7 += gt[15];
+	m_A8 += go[13];
+	m_A9 += go[14];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 -= go[15] * *cnV[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A11 += go[16];
+	double RHS4 = Idr[16];
+	RHS4 += Idr[17];
+	RHS4 -= go[17] * *cnV[17];
+	m_A12 += gt[18];
+	m_A12 += gt[19];
+	m_A12 += gt[20];
+	m_A12 += gt[21];
+	m_A14 += go[18];
+	m_A13 += go[19];
+	m_A13 += go[20];
+	double RHS5 = Idr[18];
+	RHS5 += Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 -= go[21] * *cnV[21];
+	m_A16 += gt[22];
+	m_A16 += gt[23];
+	m_A16 += gt[24];
+	m_A16 += gt[25];
+	m_A16 += gt[26];
+	m_A16 += gt[27];
+	m_A16 += gt[28];
+	m_A15 += go[22];
+	double RHS6 = Idr[22];
+	RHS6 += Idr[23];
+	RHS6 += Idr[24];
+	RHS6 += Idr[25];
+	RHS6 += Idr[26];
+	RHS6 += Idr[27];
+	RHS6 += Idr[28];
+	RHS6 -= go[23] * *cnV[23];
+	RHS6 -= go[24] * *cnV[24];
+	RHS6 -= go[25] * *cnV[25];
+	RHS6 -= go[26] * *cnV[26];
+	RHS6 -= go[27] * *cnV[27];
+	RHS6 -= go[28] * *cnV[28];
+	m_A21 += gt[29];
+	m_A21 += gt[30];
+	m_A21 += gt[31];
+	m_A21 += gt[32];
+	m_A21 += gt[33];
+	m_A19 += go[29];
+	m_A22 += go[30];
+	m_A20 += go[31];
+	double RHS7 = Idr[29];
+	RHS7 += Idr[30];
+	RHS7 += Idr[31];
+	RHS7 += Idr[32];
+	RHS7 += Idr[33];
+	RHS7 -= go[32] * *cnV[32];
+	RHS7 -= go[33] * *cnV[33];
+	m_A26 += gt[34];
+	m_A26 += gt[35];
+	m_A26 += gt[36];
+	m_A26 += gt[37];
+	m_A26 += gt[38];
+	m_A26 += gt[39];
+	m_A27 += go[34];
+	m_A27 += go[35];
+	m_A25 += go[36];
+	m_A25 += go[37];
+	m_A24 += go[38];
+	m_A28 += go[39];
+	double RHS8 = Idr[34];
+	RHS8 += Idr[35];
+	RHS8 += Idr[36];
+	RHS8 += Idr[37];
+	RHS8 += Idr[38];
+	RHS8 += Idr[39];
+	m_A31 += gt[40];
+	m_A31 += gt[41];
+	m_A31 += gt[42];
+	m_A31 += gt[43];
+	m_A31 += gt[44];
+	m_A29 += go[40];
+	m_A30 += go[41];
+	m_A30 += go[42];
+	double RHS9 = Idr[40];
+	RHS9 += Idr[41];
+	RHS9 += Idr[42];
+	RHS9 += Idr[43];
+	RHS9 += Idr[44];
+	RHS9 -= go[43] * *cnV[43];
+	RHS9 -= go[44] * *cnV[44];
+	m_A36 += gt[45];
+	m_A36 += gt[46];
+	m_A36 += gt[47];
+	m_A36 += gt[48];
+	m_A36 += gt[49];
+	m_A34 += go[45];
+	m_A33 += go[46];
+	m_A35 += go[47];
+	m_A37 += go[48];
+	double RHS10 = Idr[45];
+	RHS10 += Idr[46];
+	RHS10 += Idr[47];
+	RHS10 += Idr[48];
+	RHS10 += Idr[49];
+	RHS10 -= go[49] * *cnV[49];
+	m_A45 += gt[50];
+	m_A45 += gt[51];
+	m_A45 += gt[52];
+	m_A45 += gt[53];
+	m_A45 += gt[54];
+	m_A45 += gt[55];
+	m_A45 += gt[56];
+	m_A40 += go[50];
+	m_A42 += go[51];
+	m_A39 += go[52];
+	m_A44 += go[53];
+	m_A38 += go[54];
+	double RHS11 = Idr[50];
+	RHS11 += Idr[51];
+	RHS11 += Idr[52];
+	RHS11 += Idr[53];
+	RHS11 += Idr[54];
+	RHS11 += Idr[55];
+	RHS11 += Idr[56];
+	RHS11 -= go[55] * *cnV[55];
+	RHS11 -= go[56] * *cnV[56];
+	const double f0 = 1.0 / m_A0;
+	const double f0_7 = -f0 * m_A19;
+	m_A20 += m_A1 * f0_7;
+	RHS7 += f0_7 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_7 = -f1 * m_A20;
+	m_A21 += m_A3 * f1_7;
+	m_A23 += m_A4 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f1_11 = -f1 * m_A38;
+	m_A41 += m_A3 * f1_11;
+	m_A45 += m_A4 * f1_11;
+	RHS11 += f1_11 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_10 = -f2 * m_A33;
+	m_A36 += m_A6 * f2_10;
+	RHS10 += f2_10 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_6 = -f3 * m_A15;
+	m_A17 += m_A8 * f3_6;
+	m_A18 += m_A9 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f3_10 = -f3 * m_A34;
+	m_A36 += m_A8 * f3_10;
+	m_A37 += m_A9 * f3_10;
+	RHS10 += f3_10 * RHS3;
+	const double f3_11 = -f3 * m_A39;
+	m_A44 += m_A8 * f3_11;
+	m_A45 += m_A9 * f3_11;
+	RHS11 += f3_11 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_8 = -f4 * m_A24;
+	m_A26 += m_A11 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f5 = 1.0 / m_A12;
+	const double f5_8 = -f5 * m_A25;
+	m_A26 += m_A13 * f5_8;
+	m_A27 += m_A14 * f5_8;
+	RHS8 += f5_8 * RHS5;
+	const double f5_9 = -f5 * m_A29;
+	m_A30 += m_A13 * f5_9;
+	m_A31 += m_A14 * f5_9;
+	RHS9 += f5_9 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_11 = -f6 * m_A40;
+	m_A44 += m_A17 * f6_11;
+	m_A45 += m_A18 * f6_11;
+	RHS11 += f6_11 * RHS6;
+	const double f7 = 1.0 / m_A21;
+	const double f7_10 = -f7 * m_A35;
+	m_A36 += m_A22 * f7_10;
+	m_A37 += m_A23 * f7_10;
+	RHS10 += f7_10 * RHS7;
+	const double f7_11 = -f7 * m_A41;
+	m_A44 += m_A22 * f7_11;
+	m_A45 += m_A23 * f7_11;
+	RHS11 += f7_11 * RHS7;
+	const double f8 = 1.0 / m_A26;
+	const double f8_9 = -f8 * m_A30;
+	m_A31 += m_A27 * f8_9;
+	m_A32 += m_A28 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	const double f8_11 = -f8 * m_A42;
+	m_A43 += m_A27 * f8_11;
+	m_A45 += m_A28 * f8_11;
+	RHS11 += f8_11 * RHS8;
+	const double f9 = 1.0 / m_A31;
+	const double f9_11 = -f9 * m_A43;
+	m_A45 += m_A32 * f9_11;
+	RHS11 += f9_11 * RHS9;
+	const double f10 = 1.0 / m_A36;
+	const double f10_11 = -f10 * m_A44;
+	m_A45 += m_A37 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	V[11] = RHS11 / m_A45;
+	double tmp10 = 0.0;
+	tmp10 += m_A37 * V[11];
+	V[10] = (RHS10 - tmp10) / m_A36;
+	double tmp9 = 0.0;
+	tmp9 += m_A32 * V[11];
+	V[9] = (RHS9 - tmp9) / m_A31;
+	double tmp8 = 0.0;
+	tmp8 += m_A27 * V[9];
+	tmp8 += m_A28 * V[11];
+	V[8] = (RHS8 - tmp8) / m_A26;
+	double tmp7 = 0.0;
+	tmp7 += m_A22 * V[10];
+	tmp7 += m_A23 * V[11];
+	V[7] = (RHS7 - tmp7) / m_A21;
+	double tmp6 = 0.0;
+	tmp6 += m_A17 * V[10];
+	tmp6 += m_A18 * V[11];
+	V[6] = (RHS6 - tmp6) / m_A16;
+	double tmp5 = 0.0;
+	tmp5 += m_A13 * V[8];
+	tmp5 += m_A14 * V[9];
+	V[5] = (RHS5 - tmp5) / m_A12;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[8];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[10];
+	tmp3 += m_A9 * V[11];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[10];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[7];
+	tmp1 += m_A4 * V[11];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[1];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// boxingb
+static void nl_gcr_53e1117fdb16f546_23_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A4 += go[4];
+	m_A3 += go[5];
+	m_A3 += go[6];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A5 += gt[13];
+	m_A7 += go[10];
+	m_A6 += go[11];
+	m_A6 += go[12];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[13] * *cnV[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A9 += go[14];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 -= go[15] * *cnV[15];
+	m_A12 += gt[16];
+	m_A12 += gt[17];
+	m_A12 += gt[18];
+	m_A12 += gt[19];
+	m_A12 += gt[20];
+	m_A11 += go[16];
+	m_A11 += go[17];
+	m_A10 += go[18];
+	double RHS4 = Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	m_A17 += gt[21];
+	m_A17 += gt[22];
+	m_A17 += gt[23];
+	m_A17 += gt[24];
+	m_A17 += gt[25];
+	m_A15 += go[21];
+	m_A15 += go[22];
+	m_A14 += go[23];
+	double RHS5 = Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 -= go[24] * *cnV[24];
+	RHS5 -= go[25] * *cnV[25];
+	m_A22 += gt[26];
+	m_A22 += gt[27];
+	m_A22 += gt[28];
+	m_A22 += gt[29];
+	m_A22 += gt[30];
+	m_A20 += go[26];
+	m_A19 += go[27];
+	double RHS6 = Idr[26];
+	RHS6 += Idr[27];
+	RHS6 += Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 -= go[28] * *cnV[28];
+	RHS6 -= go[29] * *cnV[29];
+	RHS6 -= go[30] * *cnV[30];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A10;
+	m_A12 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_4 = -f1 * m_A11;
+	m_A12 += m_A3 * f1_4;
+	m_A13 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f1_5 = -f1 * m_A14;
+	m_A16 += m_A3 * f1_5;
+	m_A17 += m_A4 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_5 = -f2 * m_A15;
+	m_A17 += m_A6 * f2_5;
+	m_A18 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f2_6 = -f2 * m_A19;
+	m_A21 += m_A6 * f2_6;
+	m_A22 += m_A7 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_6 = -f3 * m_A20;
+	m_A22 += m_A9 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f4 = 1.0 / m_A12;
+	const double f4_5 = -f4 * m_A16;
+	m_A17 += m_A13 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	const double f5 = 1.0 / m_A17;
+	const double f5_6 = -f5 * m_A21;
+	m_A22 += m_A18 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	V[6] = RHS6 / m_A22;
+	double tmp5 = 0.0;
+	tmp5 += m_A18 * V[6];
+	V[5] = (RHS5 - tmp5) / m_A17;
+	double tmp4 = 0.0;
+	tmp4 += m_A13 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[5];
+	tmp2 += m_A7 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[4];
+	tmp1 += m_A4 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// cheekyms
+static void nl_gcr_546396f65ce48700_12_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A2 += go[0];
+	m_A1 += go[1];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[2] * *cnV[2];
+	m_A3 += gt[3];
+	m_A3 += gt[4];
+	m_A4 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A6 += gt[5];
+	m_A6 += gt[6];
+	m_A7 += go[5];
+	m_A5 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	m_A11 += gt[7];
+	m_A11 += gt[8];
+	m_A11 += gt[9];
+	m_A11 += gt[10];
+	m_A11 += gt[11];
+	m_A11 += gt[12];
+	m_A9 += go[7];
+	m_A10 += go[8];
+	m_A8 += go[9];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 += Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	RHS3 -= go[12] * *cnV[12];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A5;
+	m_A6 += m_A1 * f0_2;
+	m_A7 += m_A2 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f0_3 = -f0 * m_A8;
+	m_A10 += m_A1 * f0_3;
+	m_A11 += m_A2 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_3 = -f1 * m_A9;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_3 = -f2 * m_A10;
+	m_A11 += m_A7 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A11;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A4 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A3;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	tmp0 += m_A2 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// dpatrol
+static void nl_gcr_59cb6bf7cb9d17dc_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A6 += gt[4];
+	m_A6 += gt[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A5 += go[4];
+	m_A4 += go[5];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[6] * *cnV[6];
+	RHS2 -= go[7] * *cnV[7];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// breakout
+static void nl_gcr_5a3419e2809520de_13_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[9];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	m_A12 += gt[12];
+	m_A12 += gt[13];
+	m_A12 += gt[14];
+	m_A12 += gt[15];
+	m_A12 += gt[16];
+	m_A12 += gt[17];
+	m_A11 += go[12];
+	m_A10 += go[13];
+	m_A9 += go[14];
+	m_A8 += go[15];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 += Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 -= go[16] * *cnV[16];
+	RHS4 -= go[17] * *cnV[17];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A8;
+	m_A12 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_4 = -f1 * m_A9;
+	m_A12 += m_A3 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_4 = -f2 * m_A10;
+	m_A12 += m_A5 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_4 = -f3 * m_A11;
+	m_A12 += m_A7 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	V[4] = RHS4 / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// segausb
+static void nl_gcr_5b73834d5f313d38_12_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A4 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	m_A7 += gt[7];
+	m_A7 += gt[8];
+	m_A7 += gt[9];
+	m_A6 += go[7];
+	m_A5 += go[8];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[9] * *cnV[9];
+	m_A11 += gt[10];
+	m_A11 += gt[11];
+	m_A11 += gt[12];
+	m_A11 += gt[13];
+	m_A11 += gt[14];
+	m_A11 += gt[15];
+	m_A11 += gt[16];
+	m_A9 += go[10];
+	m_A10 += go[11];
+	double RHS3 = Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
+	RHS3 -= go[16] * *cnV[16];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A5;
+	m_A7 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A6;
+	m_A7 += m_A3 * f1_2;
+	m_A8 += m_A4 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A7;
+	const double f2_3 = -f2 * m_A10;
+	m_A11 += m_A8 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A11;
+	double tmp2 = 0.0;
+	tmp2 += m_A8 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A7;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// tailg
+static void nl_gcr_5ccf7da1202da2e5_31_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A0 += gt[7];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 += Idr[7];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	RHS0 -= go[7] * *cnV[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A3 += go[8];
+	double RHS1 = Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	m_A4 += gt[11];
+	m_A4 += gt[12];
+	m_A4 += gt[13];
+	m_A5 += go[11];
+	double RHS2 = Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A6 += gt[16];
+	m_A7 += go[14];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 -= go[15] * *cnV[15];
+	RHS3 -= go[16] * *cnV[16];
+	m_A8 += gt[17];
+	m_A8 += gt[18];
+	m_A8 += gt[19];
+	m_A9 += go[17];
+	double RHS4 = Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 -= go[18] * *cnV[18];
+	RHS4 -= go[19] * *cnV[19];
+	m_A10 += gt[20];
+	m_A10 += gt[21];
+	m_A10 += gt[22];
+	m_A11 += go[20];
+	double RHS5 = Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 -= go[21] * *cnV[21];
+	RHS5 -= go[22] * *cnV[22];
+	m_A12 += gt[23];
+	m_A12 += gt[24];
+	m_A12 += gt[25];
+	m_A13 += go[23];
+	double RHS6 = Idr[23];
+	RHS6 += Idr[24];
+	RHS6 += Idr[25];
+	RHS6 -= go[24] * *cnV[24];
+	RHS6 -= go[25] * *cnV[25];
+	m_A14 += gt[26];
+	m_A14 += gt[27];
+	m_A14 += gt[28];
+	m_A15 += go[26];
+	double RHS7 = Idr[26];
+	RHS7 += Idr[27];
+	RHS7 += Idr[28];
+	RHS7 -= go[27] * *cnV[27];
+	RHS7 -= go[28] * *cnV[28];
+	m_A16 += gt[29];
+	m_A16 += gt[30];
+	m_A16 += gt[31];
+	m_A17 += go[29];
+	double RHS8 = Idr[29];
+	RHS8 += Idr[30];
+	RHS8 += Idr[31];
+	RHS8 -= go[30] * *cnV[30];
+	RHS8 -= go[31] * *cnV[31];
+	m_A19 += gt[32];
+	m_A19 += gt[33];
+	m_A20 += go[32];
+	m_A18 += go[33];
+	double RHS9 = Idr[32];
+	RHS9 += Idr[33];
+	m_A30 += gt[34];
+	m_A30 += gt[35];
+	m_A30 += gt[36];
+	m_A30 += gt[37];
+	m_A30 += gt[38];
+	m_A30 += gt[39];
+	m_A30 += gt[40];
+	m_A30 += gt[41];
+	m_A30 += gt[42];
+	m_A30 += gt[43];
+	m_A28 += go[34];
+	m_A27 += go[35];
+	m_A26 += go[36];
+	m_A25 += go[37];
+	m_A29 += go[38];
+	m_A24 += go[39];
+	m_A23 += go[40];
+	m_A22 += go[41];
+	m_A21 += go[42];
+	double RHS10 = Idr[34];
+	RHS10 += Idr[35];
+	RHS10 += Idr[36];
+	RHS10 += Idr[37];
+	RHS10 += Idr[38];
+	RHS10 += Idr[39];
+	RHS10 += Idr[40];
+	RHS10 += Idr[41];
+	RHS10 += Idr[42];
+	RHS10 += Idr[43];
+	RHS10 -= go[43] * *cnV[43];
+	const double f0 = 1.0 / m_A0;
+	const double f0_9 = -f0 * m_A18;
+	m_A19 += m_A1 * f0_9;
+	RHS9 += f0_9 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_10 = -f1 * m_A21;
+	m_A30 += m_A3 * f1_10;
+	RHS10 += f1_10 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_10 = -f2 * m_A22;
+	m_A30 += m_A5 * f2_10;
+	RHS10 += f2_10 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_10 = -f3 * m_A23;
+	m_A30 += m_A7 * f3_10;
+	RHS10 += f3_10 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_10 = -f4 * m_A24;
+	m_A30 += m_A9 * f4_10;
+	RHS10 += f4_10 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_10 = -f5 * m_A25;
+	m_A30 += m_A11 * f5_10;
+	RHS10 += f5_10 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_10 = -f6 * m_A26;
+	m_A30 += m_A13 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_10 = -f7 * m_A27;
+	m_A30 += m_A15 * f7_10;
+	RHS10 += f7_10 * RHS7;
+	const double f8 = 1.0 / m_A16;
+	const double f8_10 = -f8 * m_A28;
+	m_A30 += m_A17 * f8_10;
+	RHS10 += f8_10 * RHS8;
+	const double f9 = 1.0 / m_A19;
+	const double f9_10 = -f9 * m_A29;
+	m_A30 += m_A20 * f9_10;
+	RHS10 += f9_10 * RHS9;
+	V[10] = RHS10 / m_A30;
+	double tmp9 = 0.0;
+	tmp9 += m_A20 * V[10];
+	V[9] = (RHS9 - tmp9) / m_A19;
+	double tmp8 = 0.0;
+	tmp8 += m_A17 * V[10];
+	V[8] = (RHS8 - tmp8) / m_A16;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[10];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[10];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[10];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[10];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[10];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[10];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[10];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[9];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starcas
+static void nl_gcr_5d550fc7441617a2_109_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A7 += go[6];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	RHS3 -= go[7] * *cnV[7];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A8 += gt[10];
+	m_A10 += go[8];
+	m_A9 += go[9];
+	double RHS4 = Idr[8];
+	RHS4 += Idr[9];
+	RHS4 += Idr[10];
+	RHS4 -= go[10] * *cnV[10];
+	m_A11 += gt[11];
+	m_A11 += gt[12];
+	m_A12 += go[11];
+	double RHS5 = Idr[11];
+	RHS5 += Idr[12];
+	RHS5 -= go[12] * *cnV[12];
+	m_A13 += gt[13];
+	m_A13 += gt[14];
+	m_A13 += gt[15];
+	m_A15 += go[13];
+	m_A14 += go[14];
+	double RHS6 = Idr[13];
+	RHS6 += Idr[14];
+	RHS6 += Idr[15];
+	RHS6 -= go[15] * *cnV[15];
+	m_A16 += gt[16];
+	m_A16 += gt[17];
+	m_A16 += gt[18];
+	m_A16 += gt[19];
+	m_A17 += go[16];
+	double RHS7 = Idr[16];
+	RHS7 += Idr[17];
+	RHS7 += Idr[18];
+	RHS7 += Idr[19];
+	RHS7 -= go[17] * *cnV[17];
+	RHS7 -= go[18] * *cnV[18];
+	RHS7 -= go[19] * *cnV[19];
+	m_A18 += gt[20];
+	m_A18 += gt[21];
+	m_A19 += go[20];
+	double RHS8 = Idr[20];
+	RHS8 += Idr[21];
+	RHS8 -= go[21] * *cnV[21];
+	m_A20 += gt[22];
+	m_A20 += gt[23];
+	m_A20 += gt[24];
+	m_A20 += gt[25];
+	m_A20 += gt[26];
+	m_A21 += go[22];
+	m_A23 += go[23];
+	m_A22 += go[24];
+	double RHS9 = Idr[22];
+	RHS9 += Idr[23];
+	RHS9 += Idr[24];
+	RHS9 += Idr[25];
+	RHS9 += Idr[26];
+	RHS9 -= go[25] * *cnV[25];
+	RHS9 -= go[26] * *cnV[26];
+	m_A24 += gt[27];
+	m_A24 += gt[28];
+	m_A24 += gt[29];
+	m_A24 += gt[30];
+	m_A24 += gt[31];
+	m_A24 += gt[32];
+	m_A24 += gt[33];
+	m_A27 += go[27];
+	m_A26 += go[28];
+	m_A26 += go[29];
+	m_A26 += go[30];
+	m_A25 += go[31];
+	m_A25 += go[32];
+	double RHS10 = Idr[27];
+	RHS10 += Idr[28];
+	RHS10 += Idr[29];
+	RHS10 += Idr[30];
+	RHS10 += Idr[31];
+	RHS10 += Idr[32];
+	RHS10 += Idr[33];
+	RHS10 -= go[33] * *cnV[33];
+	m_A28 += gt[34];
+	m_A28 += gt[35];
+	m_A29 += go[34];
+	double RHS11 = Idr[34];
+	RHS11 += Idr[35];
+	RHS11 -= go[35] * *cnV[35];
+	m_A30 += gt[36];
+	m_A30 += gt[37];
+	m_A30 += gt[38];
+	m_A30 += gt[39];
+	m_A30 += gt[40];
+	m_A31 += go[36];
+	m_A31 += go[37];
+	m_A32 += go[38];
+	m_A32 += go[39];
+	double RHS12 = Idr[36];
+	RHS12 += Idr[37];
+	RHS12 += Idr[38];
+	RHS12 += Idr[39];
+	RHS12 += Idr[40];
+	RHS12 -= go[40] * *cnV[40];
+	m_A33 += gt[41];
+	m_A33 += gt[42];
+	m_A33 += gt[43];
+	m_A35 += go[41];
+	m_A34 += go[42];
+	double RHS13 = Idr[41];
+	RHS13 += Idr[42];
+	RHS13 += Idr[43];
+	RHS13 -= go[43] * *cnV[43];
+	m_A38 += gt[44];
+	m_A38 += gt[45];
+	m_A38 += gt[46];
+	m_A37 += go[44];
+	m_A36 += go[45];
+	double RHS14 = Idr[44];
+	RHS14 += Idr[45];
+	RHS14 += Idr[46];
+	RHS14 -= go[46] * *cnV[46];
+	m_A42 += gt[47];
+	m_A42 += gt[48];
+	m_A42 += gt[49];
+	m_A41 += go[47];
+	m_A40 += go[48];
+	double RHS15 = Idr[47];
+	RHS15 += Idr[48];
+	RHS15 += Idr[49];
+	RHS15 -= go[49] * *cnV[49];
+	m_A46 += gt[50];
+	m_A46 += gt[51];
+	m_A46 += gt[52];
+	m_A44 += go[50];
+	m_A47 += go[51];
+	double RHS16 = Idr[50];
+	RHS16 += Idr[51];
+	RHS16 += Idr[52];
+	RHS16 -= go[52] * *cnV[52];
+	m_A50 += gt[53];
+	m_A50 += gt[54];
+	m_A50 += gt[55];
+	m_A48 += go[53];
+	m_A51 += go[54];
+	double RHS17 = Idr[53];
+	RHS17 += Idr[54];
+	RHS17 += Idr[55];
+	RHS17 -= go[55] * *cnV[55];
+	m_A54 += gt[56];
+	m_A54 += gt[57];
+	m_A54 += gt[58];
+	m_A54 += gt[59];
+	m_A54 += gt[60];
+	m_A54 += gt[61];
+	m_A53 += go[56];
+	m_A53 += go[57];
+	m_A52 += go[58];
+	double RHS18 = Idr[56];
+	RHS18 += Idr[57];
+	RHS18 += Idr[58];
+	RHS18 += Idr[59];
+	RHS18 += Idr[60];
+	RHS18 += Idr[61];
+	RHS18 -= go[59] * *cnV[59];
+	RHS18 -= go[60] * *cnV[60];
+	RHS18 -= go[61] * *cnV[61];
+	m_A58 += gt[62];
+	m_A58 += gt[63];
+	m_A58 += gt[64];
+	m_A58 += gt[65];
+	m_A58 += gt[66];
+	m_A58 += gt[67];
+	m_A58 += gt[68];
+	m_A57 += go[62];
+	m_A59 += go[63];
+	double RHS19 = Idr[62];
+	RHS19 += Idr[63];
+	RHS19 += Idr[64];
+	RHS19 += Idr[65];
+	RHS19 += Idr[66];
+	RHS19 += Idr[67];
+	RHS19 += Idr[68];
+	RHS19 -= go[64] * *cnV[64];
+	RHS19 -= go[65] * *cnV[65];
+	RHS19 -= go[66] * *cnV[66];
+	RHS19 -= go[67] * *cnV[67];
+	RHS19 -= go[68] * *cnV[68];
+	m_A63 += gt[69];
+	m_A63 += gt[70];
+	m_A63 += gt[71];
+	m_A63 += gt[72];
+	m_A63 += gt[73];
+	m_A63 += gt[74];
+	m_A64 += go[69];
+	m_A64 += go[70];
+	m_A61 += go[71];
+	m_A61 += go[72];
+	m_A61 += go[73];
+	m_A60 += go[74];
+	double RHS20 = Idr[69];
+	RHS20 += Idr[70];
+	RHS20 += Idr[71];
+	RHS20 += Idr[72];
+	RHS20 += Idr[73];
+	RHS20 += Idr[74];
+	m_A69 += gt[75];
+	m_A69 += gt[76];
+	m_A69 += gt[77];
+	m_A69 += gt[78];
+	m_A68 += go[75];
+	m_A68 += go[76];
+	m_A70 += go[77];
+	m_A67 += go[78];
+	double RHS21 = Idr[75];
+	RHS21 += Idr[76];
+	RHS21 += Idr[77];
+	RHS21 += Idr[78];
+	m_A73 += gt[79];
+	m_A73 += gt[80];
+	m_A73 += gt[81];
+	m_A72 += go[79];
+	m_A71 += go[80];
+	double RHS22 = Idr[79];
+	RHS22 += Idr[80];
+	RHS22 += Idr[81];
+	RHS22 -= go[81] * *cnV[81];
+	m_A80 += gt[82];
+	m_A80 += gt[83];
+	m_A80 += gt[84];
+	m_A80 += gt[85];
+	m_A80 += gt[86];
+	m_A80 += gt[87];
+	m_A80 += gt[88];
+	m_A80 += gt[89];
+	m_A79 += go[82];
+	m_A76 += go[83];
+	m_A76 += go[84];
+	m_A78 += go[85];
+	m_A78 += go[86];
+	m_A75 += go[87];
+	double RHS23 = Idr[82];
+	RHS23 += Idr[83];
+	RHS23 += Idr[84];
+	RHS23 += Idr[85];
+	RHS23 += Idr[86];
+	RHS23 += Idr[87];
+	RHS23 += Idr[88];
+	RHS23 += Idr[89];
+	RHS23 -= go[88] * *cnV[88];
+	RHS23 -= go[89] * *cnV[89];
+	m_A87 += gt[90];
+	m_A87 += gt[91];
+	m_A87 += gt[92];
+	m_A87 += gt[93];
+	m_A84 += go[90];
+	m_A89 += go[91];
+	m_A83 += go[92];
+	double RHS24 = Idr[90];
+	RHS24 += Idr[91];
+	RHS24 += Idr[92];
+	RHS24 += Idr[93];
+	RHS24 -= go[93] * *cnV[93];
+	m_A95 += gt[94];
+	m_A95 += gt[95];
+	m_A95 += gt[96];
+	m_A95 += gt[97];
+	m_A91 += go[94];
+	m_A96 += go[95];
+	m_A90 += go[96];
+	double RHS25 = Idr[94];
+	RHS25 += Idr[95];
+	RHS25 += Idr[96];
+	RHS25 += Idr[97];
+	RHS25 -= go[97] * *cnV[97];
+	m_A99 += gt[98];
+	m_A99 += gt[99];
+	m_A99 += gt[100];
+	m_A97 += go[98];
+	m_A100 += go[99];
+	double RHS26 = Idr[98];
+	RHS26 += Idr[99];
+	RHS26 += Idr[100];
+	RHS26 -= go[100] * *cnV[100];
+	m_A108 += gt[101];
+	m_A108 += gt[102];
+	m_A108 += gt[103];
+	m_A108 += gt[104];
+	m_A108 += gt[105];
+	m_A108 += gt[106];
+	m_A108 += gt[107];
+	m_A108 += gt[108];
+	m_A108 += gt[109];
+	m_A104 += go[101];
+	m_A101 += go[102];
+	m_A107 += go[103];
+	m_A103 += go[104];
+	m_A102 += go[105];
+	m_A106 += go[106];
+	m_A105 += go[107];
+	double RHS27 = Idr[101];
+	RHS27 += Idr[102];
+	RHS27 += Idr[103];
+	RHS27 += Idr[104];
+	RHS27 += Idr[105];
+	RHS27 += Idr[106];
+	RHS27 += Idr[107];
+	RHS27 += Idr[108];
+	RHS27 += Idr[109];
+	RHS27 -= go[108] * *cnV[108];
+	RHS27 -= go[109] * *cnV[109];
+	const double f0 = 1.0 / m_A0;
+	const double f0_14 = -f0 * m_A36;
+	m_A38 += m_A1 * f0_14;
+	RHS14 += f0_14 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_15 = -f1 * m_A40;
+	m_A42 += m_A3 * f1_15;
+	RHS15 += f1_15 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_24 = -f2 * m_A83;
+	m_A87 += m_A5 * f2_24;
+	RHS24 += f2_24 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_25 = -f3 * m_A90;
+	m_A95 += m_A7 * f3_25;
+	RHS25 += f3_25 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_14 = -f4 * m_A37;
+	m_A38 += m_A9 * f4_14;
+	m_A39 += m_A10 * f4_14;
+	RHS14 += f4_14 * RHS4;
+	const double f4_16 = -f4 * m_A44;
+	m_A45 += m_A9 * f4_16;
+	m_A46 += m_A10 * f4_16;
+	RHS16 += f4_16 * RHS4;
+	const double f5 = 1.0 / m_A11;
+	const double f5_22 = -f5 * m_A71;
+	m_A73 += m_A12 * f5_22;
+	RHS22 += f5_22 * RHS5;
+	const double f6 = 1.0 / m_A13;
+	const double f6_15 = -f6 * m_A41;
+	m_A42 += m_A14 * f6_15;
+	m_A43 += m_A15 * f6_15;
+	RHS15 += f6_15 * RHS6;
+	const double f6_17 = -f6 * m_A48;
+	m_A49 += m_A14 * f6_17;
+	m_A50 += m_A15 * f6_17;
+	RHS17 += f6_17 * RHS6;
+	const double f7 = 1.0 / m_A16;
+	const double f7_18 = -f7 * m_A52;
+	m_A54 += m_A17 * f7_18;
+	RHS18 += f7_18 * RHS7;
+	const double f8 = 1.0 / m_A18;
+	const double f8_19 = -f8 * m_A57;
+	m_A59 += m_A19 * f8_19;
+	RHS19 += f8_19 * RHS8;
+	const double f8_27 = -f8 * m_A101;
+	m_A108 += m_A19 * f8_27;
+	RHS27 += f8_27 * RHS8;
+	const double f9 = 1.0 / m_A20;
+	const double f9_20 = -f9 * m_A60;
+	m_A63 += m_A21 * f9_20;
+	m_A65 += m_A22 * f9_20;
+	m_A66 += m_A23 * f9_20;
+	RHS20 += f9_20 * RHS9;
+	const double f9_24 = -f9 * m_A84;
+	m_A85 += m_A21 * f9_24;
+	m_A87 += m_A22 * f9_24;
+	m_A88 += m_A23 * f9_24;
+	RHS24 += f9_24 * RHS9;
+	const double f9_25 = -f9 * m_A91;
+	m_A92 += m_A21 * f9_25;
+	m_A94 += m_A22 * f9_25;
+	m_A95 += m_A23 * f9_25;
+	RHS25 += f9_25 * RHS9;
+	const double f10 = 1.0 / m_A24;
+	const double f10_18 = -f10 * m_A53;
+	m_A54 += m_A25 * f10_18;
+	m_A55 += m_A26 * f10_18;
+	m_A56 += m_A27 * f10_18;
+	RHS18 += f10_18 * RHS10;
+	const double f10_20 = -f10 * m_A61;
+	m_A62 += m_A25 * f10_20;
+	m_A63 += m_A26 * f10_20;
+	m_A64 += m_A27 * f10_20;
+	RHS20 += f10_20 * RHS10;
+	const double f10_23 = -f10 * m_A75;
+	m_A77 += m_A25 * f10_23;
+	m_A78 += m_A26 * f10_23;
+	m_A80 += m_A27 * f10_23;
+	RHS23 += f10_23 * RHS10;
+	const double f11 = 1.0 / m_A28;
+	const double f11_21 = -f11 * m_A67;
+	m_A69 += m_A29 * f11_21;
+	RHS21 += f11_21 * RHS11;
+	const double f12 = 1.0 / m_A30;
+	const double f12_21 = -f12 * m_A68;
+	m_A69 += m_A31 * f12_21;
+	m_A70 += m_A32 * f12_21;
+	RHS21 += f12_21 * RHS12;
+	const double f12_23 = -f12 * m_A76;
+	m_A79 += m_A31 * f12_23;
+	m_A80 += m_A32 * f12_23;
+	RHS23 += f12_23 * RHS12;
+	const double f13 = 1.0 / m_A33;
+	const double f13_22 = -f13 * m_A72;
+	m_A73 += m_A34 * f13_22;
+	m_A74 += m_A35 * f13_22;
+	RHS22 += f13_22 * RHS13;
+	const double f13_26 = -f13 * m_A97;
+	m_A98 += m_A34 * f13_26;
+	m_A99 += m_A35 * f13_26;
+	RHS26 += f13_26 * RHS13;
+	const double f14 = 1.0 / m_A38;
+	const double f14_16 = -f14 * m_A45;
+	m_A46 += m_A39 * f14_16;
+	RHS16 += f14_16 * RHS14;
+	const double f15 = 1.0 / m_A42;
+	const double f15_17 = -f15 * m_A49;
+	m_A50 += m_A43 * f15_17;
+	RHS17 += f15_17 * RHS15;
+	const double f16 = 1.0 / m_A46;
+	const double f16_27 = -f16 * m_A102;
+	m_A108 += m_A47 * f16_27;
+	RHS27 += f16_27 * RHS16;
+	const double f17 = 1.0 / m_A50;
+	const double f17_27 = -f17 * m_A103;
+	m_A108 += m_A51 * f17_27;
+	RHS27 += f17_27 * RHS17;
+	const double f18 = 1.0 / m_A54;
+	const double f18_20 = -f18 * m_A62;
+	m_A63 += m_A55 * f18_20;
+	m_A64 += m_A56 * f18_20;
+	RHS20 += f18_20 * RHS18;
+	const double f18_23 = -f18 * m_A77;
+	m_A78 += m_A55 * f18_23;
+	m_A80 += m_A56 * f18_23;
+	RHS23 += f18_23 * RHS18;
+	const double f19 = 1.0 / m_A58;
+	const double f19_27 = -f19 * m_A104;
+	m_A108 += m_A59 * f19_27;
+	RHS27 += f19_27 * RHS19;
+	const double f20 = 1.0 / m_A63;
+	const double f20_23 = -f20 * m_A78;
+	m_A80 += m_A64 * f20_23;
+	m_A81 += m_A65 * f20_23;
+	m_A82 += m_A66 * f20_23;
+	RHS23 += f20_23 * RHS20;
+	const double f20_24 = -f20 * m_A85;
+	m_A86 += m_A64 * f20_24;
+	m_A87 += m_A65 * f20_24;
+	m_A88 += m_A66 * f20_24;
+	RHS24 += f20_24 * RHS20;
+	const double f20_25 = -f20 * m_A92;
+	m_A93 += m_A64 * f20_25;
+	m_A94 += m_A65 * f20_25;
+	m_A95 += m_A66 * f20_25;
+	RHS25 += f20_25 * RHS20;
+	const double f21 = 1.0 / m_A69;
+	const double f21_23 = -f21 * m_A79;
+	m_A80 += m_A70 * f21_23;
+	RHS23 += f21_23 * RHS21;
+	const double f22 = 1.0 / m_A73;
+	const double f22_26 = -f22 * m_A98;
+	m_A99 += m_A74 * f22_26;
+	RHS26 += f22_26 * RHS22;
+	const double f23 = 1.0 / m_A80;
+	const double f23_24 = -f23 * m_A86;
+	m_A87 += m_A81 * f23_24;
+	m_A88 += m_A82 * f23_24;
+	RHS24 += f23_24 * RHS23;
+	const double f23_25 = -f23 * m_A93;
+	m_A94 += m_A81 * f23_25;
+	m_A95 += m_A82 * f23_25;
+	RHS25 += f23_25 * RHS23;
+	const double f24 = 1.0 / m_A87;
+	const double f24_25 = -f24 * m_A94;
+	m_A95 += m_A88 * f24_25;
+	m_A96 += m_A89 * f24_25;
+	RHS25 += f24_25 * RHS24;
+	const double f24_27 = -f24 * m_A105;
+	m_A106 += m_A88 * f24_27;
+	m_A108 += m_A89 * f24_27;
+	RHS27 += f24_27 * RHS24;
+	const double f25 = 1.0 / m_A95;
+	const double f25_27 = -f25 * m_A106;
+	m_A108 += m_A96 * f25_27;
+	RHS27 += f25_27 * RHS25;
+	const double f26 = 1.0 / m_A99;
+	const double f26_27 = -f26 * m_A107;
+	m_A108 += m_A100 * f26_27;
+	RHS27 += f26_27 * RHS26;
+	V[27] = RHS27 / m_A108;
+	double tmp26 = 0.0;
+	tmp26 += m_A100 * V[27];
+	V[26] = (RHS26 - tmp26) / m_A99;
+	double tmp25 = 0.0;
+	tmp25 += m_A96 * V[27];
+	V[25] = (RHS25 - tmp25) / m_A95;
+	double tmp24 = 0.0;
+	tmp24 += m_A88 * V[25];
+	tmp24 += m_A89 * V[27];
+	V[24] = (RHS24 - tmp24) / m_A87;
+	double tmp23 = 0.0;
+	tmp23 += m_A81 * V[24];
+	tmp23 += m_A82 * V[25];
+	V[23] = (RHS23 - tmp23) / m_A80;
+	double tmp22 = 0.0;
+	tmp22 += m_A74 * V[26];
+	V[22] = (RHS22 - tmp22) / m_A73;
+	double tmp21 = 0.0;
+	tmp21 += m_A70 * V[23];
+	V[21] = (RHS21 - tmp21) / m_A69;
+	double tmp20 = 0.0;
+	tmp20 += m_A64 * V[23];
+	tmp20 += m_A65 * V[24];
+	tmp20 += m_A66 * V[25];
+	V[20] = (RHS20 - tmp20) / m_A63;
+	double tmp19 = 0.0;
+	tmp19 += m_A59 * V[27];
+	V[19] = (RHS19 - tmp19) / m_A58;
+	double tmp18 = 0.0;
+	tmp18 += m_A55 * V[20];
+	tmp18 += m_A56 * V[23];
+	V[18] = (RHS18 - tmp18) / m_A54;
+	double tmp17 = 0.0;
+	tmp17 += m_A51 * V[27];
+	V[17] = (RHS17 - tmp17) / m_A50;
+	double tmp16 = 0.0;
+	tmp16 += m_A47 * V[27];
+	V[16] = (RHS16 - tmp16) / m_A46;
+	double tmp15 = 0.0;
+	tmp15 += m_A43 * V[17];
+	V[15] = (RHS15 - tmp15) / m_A42;
+	double tmp14 = 0.0;
+	tmp14 += m_A39 * V[16];
+	V[14] = (RHS14 - tmp14) / m_A38;
+	double tmp13 = 0.0;
+	tmp13 += m_A34 * V[22];
+	tmp13 += m_A35 * V[26];
+	V[13] = (RHS13 - tmp13) / m_A33;
+	double tmp12 = 0.0;
+	tmp12 += m_A31 * V[21];
+	tmp12 += m_A32 * V[23];
+	V[12] = (RHS12 - tmp12) / m_A30;
+	double tmp11 = 0.0;
+	tmp11 += m_A29 * V[21];
+	V[11] = (RHS11 - tmp11) / m_A28;
+	double tmp10 = 0.0;
+	tmp10 += m_A25 * V[18];
+	tmp10 += m_A26 * V[20];
+	tmp10 += m_A27 * V[23];
+	V[10] = (RHS10 - tmp10) / m_A24;
+	double tmp9 = 0.0;
+	tmp9 += m_A21 * V[20];
+	tmp9 += m_A22 * V[24];
+	tmp9 += m_A23 * V[25];
+	V[9] = (RHS9 - tmp9) / m_A20;
+	double tmp8 = 0.0;
+	tmp8 += m_A19 * V[27];
+	V[8] = (RHS8 - tmp8) / m_A18;
+	double tmp7 = 0.0;
+	tmp7 += m_A17 * V[18];
+	V[7] = (RHS7 - tmp7) / m_A16;
+	double tmp6 = 0.0;
+	tmp6 += m_A14 * V[15];
+	tmp6 += m_A15 * V[17];
+	V[6] = (RHS6 - tmp6) / m_A13;
+	double tmp5 = 0.0;
+	tmp5 += m_A12 * V[22];
+	V[5] = (RHS5 - tmp5) / m_A11;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[14];
+	tmp4 += m_A10 * V[16];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[25];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[24];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[15];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[14];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// zac1b11142
+static void nl_gcr_6041272373b8603c_178_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
+	double m_A153(0.0);
+	double m_A154(0.0);
+	double m_A155(0.0);
+	double m_A156(0.0);
+	double m_A157(0.0);
+	double m_A158(0.0);
+	double m_A159(0.0);
+	double m_A160(0.0);
+	double m_A161(0.0);
+	double m_A162(0.0);
+	double m_A163(0.0);
+	double m_A164(0.0);
+	double m_A165(0.0);
+	double m_A166(0.0);
+	double m_A167(0.0);
+	double m_A168(0.0);
+	double m_A169(0.0);
+	double m_A170(0.0);
+	double m_A171(0.0);
+	double m_A172(0.0);
+	double m_A173(0.0);
+	double m_A174(0.0);
+	double m_A175(0.0);
+	double m_A176(0.0);
+	double m_A177(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A6 += go[5];
+	m_A5 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	m_A7 += gt[7];
+	m_A7 += gt[8];
+	m_A8 += go[7];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 -= go[8] * *cnV[8];
+	m_A9 += gt[9];
+	m_A9 += gt[10];
+	m_A9 += gt[11];
+	m_A9 += gt[12];
+	m_A9 += gt[13];
+	m_A9 += gt[14];
+	m_A9 += gt[15];
+	m_A10 += go[9];
+	double RHS4 = Idr[9];
+	RHS4 += Idr[10];
+	RHS4 += Idr[11];
+	RHS4 += Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 += Idr[15];
+	RHS4 -= go[10] * *cnV[10];
+	RHS4 -= go[11] * *cnV[11];
+	RHS4 -= go[12] * *cnV[12];
+	RHS4 -= go[13] * *cnV[13];
+	RHS4 -= go[14] * *cnV[14];
+	RHS4 -= go[15] * *cnV[15];
+	m_A11 += gt[16];
+	m_A11 += gt[17];
+	m_A12 += go[16];
+	double RHS5 = Idr[16];
+	RHS5 += Idr[17];
+	RHS5 -= go[17] * *cnV[17];
+	m_A13 += gt[18];
+	m_A13 += gt[19];
+	m_A14 += go[18];
+	double RHS6 = Idr[18];
+	RHS6 += Idr[19];
+	RHS6 -= go[19] * *cnV[19];
+	m_A15 += gt[20];
+	m_A15 += gt[21];
+	m_A16 += go[20];
+	double RHS7 = Idr[20];
+	RHS7 += Idr[21];
+	RHS7 -= go[21] * *cnV[21];
+	m_A17 += gt[22];
+	m_A17 += gt[23];
+	m_A18 += go[22];
+	double RHS8 = Idr[22];
+	RHS8 += Idr[23];
+	RHS8 -= go[23] * *cnV[23];
+	m_A19 += gt[24];
+	m_A19 += gt[25];
+	m_A20 += go[24];
+	m_A21 += go[25];
+	double RHS9 = Idr[24];
+	RHS9 += Idr[25];
+	m_A22 += gt[26];
+	m_A22 += gt[27];
+	m_A22 += gt[28];
+	m_A22 += gt[29];
+	m_A23 += go[26];
+	m_A23 += go[27];
+	double RHS10 = Idr[26];
+	RHS10 += Idr[27];
+	RHS10 += Idr[28];
+	RHS10 += Idr[29];
+	RHS10 -= go[28] * *cnV[28];
+	RHS10 -= go[29] * *cnV[29];
+	m_A24 += gt[30];
+	m_A24 += gt[31];
+	m_A24 += gt[32];
+	m_A24 += gt[33];
+	m_A25 += go[30];
+	m_A25 += go[31];
+	double RHS11 = Idr[30];
+	RHS11 += Idr[31];
+	RHS11 += Idr[32];
+	RHS11 += Idr[33];
+	RHS11 -= go[32] * *cnV[32];
+	RHS11 -= go[33] * *cnV[33];
+	m_A26 += gt[34];
+	m_A26 += gt[35];
+	m_A26 += gt[36];
+	m_A26 += gt[37];
+	m_A27 += go[34];
+	m_A27 += go[35];
+	double RHS12 = Idr[34];
+	RHS12 += Idr[35];
+	RHS12 += Idr[36];
+	RHS12 += Idr[37];
+	RHS12 -= go[36] * *cnV[36];
+	RHS12 -= go[37] * *cnV[37];
+	m_A28 += gt[38];
+	m_A28 += gt[39];
+	m_A29 += go[38];
+	double RHS13 = Idr[38];
+	RHS13 += Idr[39];
+	RHS13 -= go[39] * *cnV[39];
+	m_A30 += gt[40];
+	m_A30 += gt[41];
+	m_A30 += gt[42];
+	m_A31 += go[40];
+	double RHS14 = Idr[40];
+	RHS14 += Idr[41];
+	RHS14 += Idr[42];
+	RHS14 -= go[41] * *cnV[41];
+	RHS14 -= go[42] * *cnV[42];
+	m_A32 += gt[43];
+	m_A32 += gt[44];
+	m_A32 += gt[45];
+	m_A33 += go[43];
+	double RHS15 = Idr[43];
+	RHS15 += Idr[44];
+	RHS15 += Idr[45];
+	RHS15 -= go[44] * *cnV[44];
+	RHS15 -= go[45] * *cnV[45];
+	m_A34 += gt[46];
+	m_A34 += gt[47];
+	m_A34 += gt[48];
+	m_A35 += go[46];
+	double RHS16 = Idr[46];
+	RHS16 += Idr[47];
+	RHS16 += Idr[48];
+	RHS16 -= go[47] * *cnV[47];
+	RHS16 -= go[48] * *cnV[48];
+	m_A36 += gt[49];
+	m_A36 += gt[50];
+	m_A37 += go[49];
+	double RHS17 = Idr[49];
+	RHS17 += Idr[50];
+	RHS17 -= go[50] * *cnV[50];
+	m_A38 += gt[51];
+	m_A38 += gt[52];
+	m_A38 += gt[53];
+	m_A38 += gt[54];
+	m_A39 += go[51];
+	double RHS18 = Idr[51];
+	RHS18 += Idr[52];
+	RHS18 += Idr[53];
+	RHS18 += Idr[54];
+	RHS18 -= go[52] * *cnV[52];
+	RHS18 -= go[53] * *cnV[53];
+	RHS18 -= go[54] * *cnV[54];
+	m_A40 += gt[55];
+	m_A40 += gt[56];
+	m_A40 += gt[57];
+	m_A40 += gt[58];
+	m_A40 += gt[59];
+	m_A41 += go[55];
+	double RHS19 = Idr[55];
+	RHS19 += Idr[56];
+	RHS19 += Idr[57];
+	RHS19 += Idr[58];
+	RHS19 += Idr[59];
+	RHS19 -= go[56] * *cnV[56];
+	RHS19 -= go[57] * *cnV[57];
+	RHS19 -= go[58] * *cnV[58];
+	RHS19 -= go[59] * *cnV[59];
+	m_A42 += gt[60];
+	m_A42 += gt[61];
+	m_A42 += gt[62];
+	m_A42 += gt[63];
+	m_A42 += gt[64];
+	m_A42 += gt[65];
+	m_A42 += gt[66];
+	m_A43 += go[60];
+	double RHS20 = Idr[60];
+	RHS20 += Idr[61];
+	RHS20 += Idr[62];
+	RHS20 += Idr[63];
+	RHS20 += Idr[64];
+	RHS20 += Idr[65];
+	RHS20 += Idr[66];
+	RHS20 -= go[61] * *cnV[61];
+	RHS20 -= go[62] * *cnV[62];
+	RHS20 -= go[63] * *cnV[63];
+	RHS20 -= go[64] * *cnV[64];
+	RHS20 -= go[65] * *cnV[65];
+	RHS20 -= go[66] * *cnV[66];
+	m_A44 += gt[67];
+	m_A44 += gt[68];
+	m_A44 += gt[69];
+	m_A45 += go[67];
+	double RHS21 = Idr[67];
+	RHS21 += Idr[68];
+	RHS21 += Idr[69];
+	RHS21 -= go[68] * *cnV[68];
+	RHS21 -= go[69] * *cnV[69];
+	m_A46 += gt[70];
+	m_A46 += gt[71];
+	m_A48 += go[70];
+	m_A47 += go[71];
+	double RHS22 = Idr[70];
+	RHS22 += Idr[71];
+	m_A49 += gt[72];
+	m_A49 += gt[73];
+	m_A49 += gt[74];
+	m_A51 += go[72];
+	m_A50 += go[73];
+	double RHS23 = Idr[72];
+	RHS23 += Idr[73];
+	RHS23 += Idr[74];
+	RHS23 -= go[74] * *cnV[74];
+	m_A52 += gt[75];
+	m_A52 += gt[76];
+	m_A52 += gt[77];
+	m_A53 += go[75];
+	double RHS24 = Idr[75];
+	RHS24 += Idr[76];
+	RHS24 += Idr[77];
+	RHS24 -= go[76] * *cnV[76];
+	RHS24 -= go[77] * *cnV[77];
+	m_A54 += gt[78];
+	m_A54 += gt[79];
+	m_A54 += gt[80];
+	m_A54 += gt[81];
+	m_A55 += go[78];
+	m_A55 += go[79];
+	m_A56 += go[80];
+	double RHS25 = Idr[78];
+	RHS25 += Idr[79];
+	RHS25 += Idr[80];
+	RHS25 += Idr[81];
+	RHS25 -= go[81] * *cnV[81];
+	m_A60 += gt[82];
+	m_A60 += gt[83];
+	m_A60 += gt[84];
+	m_A59 += go[82];
+	m_A58 += go[83];
+	m_A57 += go[84];
+	double RHS26 = Idr[82];
+	RHS26 += Idr[83];
+	RHS26 += Idr[84];
+	m_A62 += gt[85];
+	m_A62 += gt[86];
+	m_A63 += go[85];
+	m_A64 += go[86];
+	double RHS27 = Idr[85];
+	RHS27 += Idr[86];
+	m_A65 += gt[87];
+	m_A65 += gt[88];
+	m_A65 += gt[89];
+	m_A66 += go[87];
+	double RHS28 = Idr[87];
+	RHS28 += Idr[88];
+	RHS28 += Idr[89];
+	RHS28 -= go[88] * *cnV[88];
+	RHS28 -= go[89] * *cnV[89];
+	m_A67 += gt[90];
+	m_A67 += gt[91];
+	m_A67 += gt[92];
+	m_A69 += go[90];
+	m_A68 += go[91];
+	double RHS29 = Idr[90];
+	RHS29 += Idr[91];
+	RHS29 += Idr[92];
+	RHS29 -= go[92] * *cnV[92];
+	m_A70 += gt[93];
+	m_A70 += gt[94];
+	m_A72 += go[93];
+	m_A71 += go[94];
+	double RHS30 = Idr[93];
+	RHS30 += Idr[94];
+	m_A74 += gt[95];
+	m_A74 += gt[96];
+	m_A73 += go[95];
+	double RHS31 = Idr[95];
+	RHS31 += Idr[96];
+	RHS31 -= go[96] * *cnV[96];
+	m_A82 += gt[97];
+	m_A82 += gt[98];
+	m_A82 += gt[99];
+	m_A82 += gt[100];
+	m_A82 += gt[101];
+	m_A82 += gt[102];
+	m_A82 += gt[103];
+	m_A82 += gt[104];
+	m_A82 += gt[105];
+	m_A82 += gt[106];
+	m_A81 += go[97];
+	m_A80 += go[98];
+	m_A79 += go[99];
+	m_A78 += go[100];
+	m_A78 += go[101];
+	m_A77 += go[102];
+	m_A77 += go[103];
+	m_A76 += go[104];
+	m_A76 += go[105];
+	m_A75 += go[106];
+	double RHS32 = Idr[97];
+	RHS32 += Idr[98];
+	RHS32 += Idr[99];
+	RHS32 += Idr[100];
+	RHS32 += Idr[101];
+	RHS32 += Idr[102];
+	RHS32 += Idr[103];
+	RHS32 += Idr[104];
+	RHS32 += Idr[105];
+	RHS32 += Idr[106];
+	m_A86 += gt[107];
+	m_A86 += gt[108];
+	m_A86 += gt[109];
+	m_A86 += gt[110];
+	m_A86 += gt[111];
+	m_A86 += gt[112];
+	m_A86 += gt[113];
+	m_A85 += go[107];
+	m_A84 += go[108];
+	double RHS33 = Idr[107];
+	RHS33 += Idr[108];
+	RHS33 += Idr[109];
+	RHS33 += Idr[110];
+	RHS33 += Idr[111];
+	RHS33 += Idr[112];
+	RHS33 += Idr[113];
+	RHS33 -= go[109] * *cnV[109];
+	RHS33 -= go[110] * *cnV[110];
+	RHS33 -= go[111] * *cnV[111];
+	RHS33 -= go[112] * *cnV[112];
+	RHS33 -= go[113] * *cnV[113];
+	m_A90 += gt[114];
+	m_A90 += gt[115];
+	m_A91 += go[114];
+	m_A88 += go[115];
+	double RHS34 = Idr[114];
+	RHS34 += Idr[115];
+	m_A94 += gt[116];
+	m_A94 += gt[117];
+	m_A94 += gt[118];
+	m_A94 += gt[119];
+	m_A94 += gt[120];
+	m_A92 += go[116];
+	m_A93 += go[117];
+	m_A93 += go[118];
+	double RHS35 = Idr[116];
+	RHS35 += Idr[117];
+	RHS35 += Idr[118];
+	RHS35 += Idr[119];
+	RHS35 += Idr[120];
+	RHS35 -= go[119] * *cnV[119];
+	RHS35 -= go[120] * *cnV[120];
+	m_A97 += gt[121];
+	m_A97 += gt[122];
+	m_A98 += go[121];
+	m_A96 += go[122];
+	double RHS36 = Idr[121];
+	RHS36 += Idr[122];
+	m_A100 += gt[123];
+	m_A100 += gt[124];
+	m_A99 += go[123];
+	m_A102 += go[124];
+	double RHS37 = Idr[123];
+	RHS37 += Idr[124];
+	m_A105 += gt[125];
+	m_A105 += gt[126];
+	m_A107 += go[125];
+	m_A103 += go[126];
+	double RHS38 = Idr[125];
+	RHS38 += Idr[126];
+	m_A111 += gt[127];
+	m_A111 += gt[128];
+	m_A111 += gt[129];
+	m_A109 += go[127];
+	m_A108 += go[128];
+	double RHS39 = Idr[127];
+	RHS39 += Idr[128];
+	RHS39 += Idr[129];
+	RHS39 -= go[129] * *cnV[129];
+	m_A116 += gt[130];
+	m_A116 += gt[131];
+	m_A116 += gt[132];
+	m_A114 += go[130];
+	m_A113 += go[131];
+	m_A118 += go[132];
+	double RHS40 = Idr[130];
+	RHS40 += Idr[131];
+	RHS40 += Idr[132];
+	m_A120 += gt[133];
+	m_A120 += gt[134];
+	m_A120 += gt[135];
+	m_A120 += gt[136];
+	m_A121 += go[133];
+	m_A119 += go[134];
+	double RHS41 = Idr[133];
+	RHS41 += Idr[134];
+	RHS41 += Idr[135];
+	RHS41 += Idr[136];
+	RHS41 -= go[135] * *cnV[135];
+	RHS41 -= go[136] * *cnV[136];
+	m_A124 += gt[137];
+	m_A124 += gt[138];
+	m_A123 += go[137];
+	m_A122 += go[138];
+	double RHS42 = Idr[137];
+	RHS42 += Idr[138];
+	m_A131 += gt[139];
+	m_A131 += gt[140];
+	m_A131 += gt[141];
+	m_A131 += gt[142];
+	m_A131 += gt[143];
+	m_A131 += gt[144];
+	m_A132 += go[139];
+	m_A132 += go[140];
+	m_A129 += go[141];
+	m_A128 += go[142];
+	m_A127 += go[143];
+	m_A126 += go[144];
+	double RHS43 = Idr[139];
+	RHS43 += Idr[140];
+	RHS43 += Idr[141];
+	RHS43 += Idr[142];
+	RHS43 += Idr[143];
+	RHS43 += Idr[144];
+	m_A141 += gt[145];
+	m_A141 += gt[146];
+	m_A141 += gt[147];
+	m_A141 += gt[148];
+	m_A141 += gt[149];
+	m_A141 += gt[150];
+	m_A141 += gt[151];
+	m_A136 += go[145];
+	m_A135 += go[146];
+	m_A134 += go[147];
+	m_A133 += go[148];
+	m_A140 += go[149];
+	m_A137 += go[150];
+	m_A139 += go[151];
+	double RHS44 = Idr[145];
+	RHS44 += Idr[146];
+	RHS44 += Idr[147];
+	RHS44 += Idr[148];
+	RHS44 += Idr[149];
+	RHS44 += Idr[150];
+	RHS44 += Idr[151];
+	m_A143 += gt[152];
+	m_A143 += gt[153];
+	m_A143 += gt[154];
+	m_A143 += gt[155];
+	m_A144 += go[152];
+	m_A142 += go[153];
+	double RHS45 = Idr[152];
+	RHS45 += Idr[153];
+	RHS45 += Idr[154];
+	RHS45 += Idr[155];
+	RHS45 -= go[154] * *cnV[154];
+	RHS45 -= go[155] * *cnV[155];
+	m_A147 += gt[156];
+	m_A147 += gt[157];
+	m_A145 += go[156];
+	m_A148 += go[157];
+	double RHS46 = Idr[156];
+	RHS46 += Idr[157];
+	m_A155 += gt[158];
+	m_A155 += gt[159];
+	m_A155 += gt[160];
+	m_A155 += gt[161];
+	m_A155 += gt[162];
+	m_A155 += gt[163];
+	m_A150 += go[158];
+	m_A151 += go[159];
+	m_A154 += go[160];
+	m_A154 += go[161];
+	double RHS47 = Idr[158];
+	RHS47 += Idr[159];
+	RHS47 += Idr[160];
+	RHS47 += Idr[161];
+	RHS47 += Idr[162];
+	RHS47 += Idr[163];
+	RHS47 -= go[162] * *cnV[162];
+	RHS47 -= go[163] * *cnV[163];
+	m_A162 += gt[164];
+	m_A162 += gt[165];
+	m_A162 += gt[166];
+	m_A162 += gt[167];
+	m_A162 += gt[168];
+	m_A163 += go[164];
+	m_A159 += go[165];
+	m_A160 += go[166];
+	m_A158 += go[167];
+	m_A157 += go[168];
+	double RHS48 = Idr[164];
+	RHS48 += Idr[165];
+	RHS48 += Idr[166];
+	RHS48 += Idr[167];
+	RHS48 += Idr[168];
+	m_A169 += gt[169];
+	m_A169 += gt[170];
+	m_A169 += gt[171];
+	m_A169 += gt[172];
+	m_A167 += go[169];
+	m_A164 += go[170];
+	m_A165 += go[171];
+	double RHS49 = Idr[169];
+	RHS49 += Idr[170];
+	RHS49 += Idr[171];
+	RHS49 += Idr[172];
+	RHS49 -= go[172] * *cnV[172];
+	m_A177 += gt[173];
+	m_A177 += gt[174];
+	m_A177 += gt[175];
+	m_A177 += gt[176];
+	m_A177 += gt[177];
+	m_A171 += go[173];
+	m_A172 += go[174];
+	m_A175 += go[175];
+	double RHS50 = Idr[173];
+	RHS50 += Idr[174];
+	RHS50 += Idr[175];
+	RHS50 += Idr[176];
+	RHS50 += Idr[177];
+	RHS50 -= go[176] * *cnV[176];
+	RHS50 -= go[177] * *cnV[177];
+	const double f0 = 1.0 / m_A0;
+	const double f0_26 = -f0 * m_A57;
+	m_A60 += m_A1 * f0_26;
+	RHS26 += f0_26 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_26 = -f1 * m_A58;
+	m_A60 += m_A3 * f1_26;
+	RHS26 += f1_26 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_26 = -f2 * m_A59;
+	m_A60 += m_A5 * f2_26;
+	m_A61 += m_A6 * f2_26;
+	RHS26 += f2_26 * RHS2;
+	const double f2_34 = -f2 * m_A88;
+	m_A89 += m_A5 * f2_34;
+	m_A90 += m_A6 * f2_34;
+	RHS34 += f2_34 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_36 = -f3 * m_A96;
+	m_A97 += m_A8 * f3_36;
+	RHS36 += f3_36 * RHS3;
+	const double f3_48 = -f3 * m_A157;
+	m_A160 += m_A8 * f3_48;
+	RHS48 += f3_48 * RHS3;
+	const double f4 = 1.0 / m_A9;
+	const double f4_50 = -f4 * m_A171;
+	m_A173 += m_A10 * f4_50;
+	RHS50 += f4_50 * RHS4;
+	const double f5 = 1.0 / m_A11;
+	const double f5_44 = -f5 * m_A133;
+	m_A141 += m_A12 * f5_44;
+	RHS44 += f5_44 * RHS5;
+	const double f6 = 1.0 / m_A13;
+	const double f6_44 = -f6 * m_A134;
+	m_A141 += m_A14 * f6_44;
+	RHS44 += f6_44 * RHS6;
+	const double f7 = 1.0 / m_A15;
+	const double f7_44 = -f7 * m_A135;
+	m_A141 += m_A16 * f7_44;
+	RHS44 += f7_44 * RHS7;
+	const double f8 = 1.0 / m_A17;
+	const double f8_44 = -f8 * m_A136;
+	m_A141 += m_A18 * f8_44;
+	RHS44 += f8_44 * RHS8;
+	const double f9 = 1.0 / m_A19;
+	const double f9_32 = -f9 * m_A75;
+	m_A82 += m_A20 * f9_32;
+	m_A83 += m_A21 * f9_32;
+	RHS32 += f9_32 * RHS9;
+	const double f9_44 = -f9 * m_A137;
+	m_A138 += m_A20 * f9_44;
+	m_A141 += m_A21 * f9_44;
+	RHS44 += f9_44 * RHS9;
+	const double f10 = 1.0 / m_A22;
+	const double f10_32 = -f10 * m_A76;
+	m_A82 += m_A23 * f10_32;
+	RHS32 += f10_32 * RHS10;
+	const double f11 = 1.0 / m_A24;
+	const double f11_32 = -f11 * m_A77;
+	m_A82 += m_A25 * f11_32;
+	RHS32 += f11_32 * RHS11;
+	const double f12 = 1.0 / m_A26;
+	const double f12_32 = -f12 * m_A78;
+	m_A82 += m_A27 * f12_32;
+	RHS32 += f12_32 * RHS12;
+	const double f13 = 1.0 / m_A28;
+	const double f13_31 = -f13 * m_A73;
+	m_A74 += m_A29 * f13_31;
+	RHS31 += f13_31 * RHS13;
+	const double f13_43 = -f13 * m_A126;
+	m_A129 += m_A29 * f13_43;
+	RHS43 += f13_43 * RHS13;
+	const double f14 = 1.0 / m_A30;
+	const double f14_32 = -f14 * m_A79;
+	m_A82 += m_A31 * f14_32;
+	RHS32 += f14_32 * RHS14;
+	const double f15 = 1.0 / m_A32;
+	const double f15_35 = -f15 * m_A92;
+	m_A94 += m_A33 * f15_35;
+	RHS35 += f15_35 * RHS15;
+	const double f16 = 1.0 / m_A34;
+	const double f16_32 = -f16 * m_A80;
+	m_A82 += m_A35 * f16_32;
+	RHS32 += f16_32 * RHS16;
+	const double f17 = 1.0 / m_A36;
+	const double f17_32 = -f17 * m_A81;
+	m_A82 += m_A37 * f17_32;
+	RHS32 += f17_32 * RHS17;
+	const double f18 = 1.0 / m_A38;
+	const double f18_42 = -f18 * m_A122;
+	m_A124 += m_A39 * f18_42;
+	RHS42 += f18_42 * RHS18;
+	const double f19 = 1.0 / m_A40;
+	const double f19_33 = -f19 * m_A84;
+	m_A86 += m_A41 * f19_33;
+	RHS33 += f19_33 * RHS19;
+	const double f20 = 1.0 / m_A42;
+	const double f20_47 = -f20 * m_A150;
+	m_A153 += m_A43 * f20_47;
+	RHS47 += f20_47 * RHS20;
+	const double f21 = 1.0 / m_A44;
+	const double f21_45 = -f21 * m_A142;
+	m_A144 += m_A45 * f21_45;
+	RHS45 += f21_45 * RHS21;
+	const double f21_48 = -f21 * m_A158;
+	m_A162 += m_A45 * f21_48;
+	RHS48 += f21_48 * RHS21;
+	const double f22 = 1.0 / m_A46;
+	const double f22_33 = -f22 * m_A85;
+	m_A86 += m_A47 * f22_33;
+	m_A87 += m_A48 * f22_33;
+	RHS33 += f22_33 * RHS22;
+	const double f22_39 = -f22 * m_A108;
+	m_A110 += m_A47 * f22_39;
+	m_A111 += m_A48 * f22_39;
+	RHS39 += f22_39 * RHS22;
+	const double f23 = 1.0 / m_A49;
+	const double f23_37 = -f23 * m_A99;
+	m_A100 += m_A50 * f23_37;
+	m_A101 += m_A51 * f23_37;
+	RHS37 += f23_37 * RHS23;
+	const double f23_38 = -f23 * m_A103;
+	m_A104 += m_A50 * f23_38;
+	m_A105 += m_A51 * f23_38;
+	RHS38 += f23_38 * RHS23;
+	const double f24 = 1.0 / m_A52;
+	const double f24_48 = -f24 * m_A159;
+	m_A162 += m_A53 * f24_48;
+	RHS48 += f24_48 * RHS24;
+	const double f25 = 1.0 / m_A54;
+	const double f25_35 = -f25 * m_A93;
+	m_A94 += m_A55 * f25_35;
+	m_A95 += m_A56 * f25_35;
+	RHS35 += f25_35 * RHS25;
+	const double f25_40 = -f25 * m_A113;
+	m_A115 += m_A55 * f25_40;
+	m_A116 += m_A56 * f25_40;
+	RHS40 += f25_40 * RHS25;
+	const double f26 = 1.0 / m_A60;
+	const double f26_34 = -f26 * m_A89;
+	m_A90 += m_A61 * f26_34;
+	RHS34 += f26_34 * RHS26;
+	const double f27 = 1.0 / m_A62;
+	const double f27_39 = -f27 * m_A109;
+	m_A111 += m_A63 * f27_39;
+	m_A112 += m_A64 * f27_39;
+	RHS39 += f27_39 * RHS27;
+	const double f27_49 = -f27 * m_A164;
+	m_A166 += m_A63 * f27_49;
+	m_A169 += m_A64 * f27_49;
+	RHS49 += f27_49 * RHS27;
+	const double f28 = 1.0 / m_A65;
+	const double f28_41 = -f28 * m_A119;
+	m_A121 += m_A66 * f28_41;
+	RHS41 += f28_41 * RHS28;
+	const double f28_43 = -f28 * m_A127;
+	m_A131 += m_A66 * f28_43;
+	RHS43 += f28_43 * RHS28;
+	const double f29 = 1.0 / m_A67;
+	const double f29_40 = -f29 * m_A114;
+	m_A116 += m_A68 * f29_40;
+	m_A117 += m_A69 * f29_40;
+	RHS40 += f29_40 * RHS29;
+	const double f29_46 = -f29 * m_A145;
+	m_A146 += m_A68 * f29_46;
+	m_A147 += m_A69 * f29_46;
+	RHS46 += f29_46 * RHS29;
+	const double f30 = 1.0 / m_A70;
+	const double f30_42 = -f30 * m_A123;
+	m_A124 += m_A71 * f30_42;
+	m_A125 += m_A72 * f30_42;
+	RHS42 += f30_42 * RHS30;
+	const double f30_43 = -f30 * m_A128;
+	m_A130 += m_A71 * f30_43;
+	m_A131 += m_A72 * f30_43;
+	RHS43 += f30_43 * RHS30;
+	const double f31 = 1.0 / m_A74;
+	const double f31_43 = -f31 * m_A129;
+	RHS43 += f31_43 * RHS31;
+	const double f32 = 1.0 / m_A82;
+	const double f32_44 = -f32 * m_A138;
+	m_A141 += m_A83 * f32_44;
+	RHS44 += f32_44 * RHS32;
+	const double f33 = 1.0 / m_A86;
+	const double f33_39 = -f33 * m_A110;
+	m_A111 += m_A87 * f33_39;
+	RHS39 += f33_39 * RHS33;
+	const double f34 = 1.0 / m_A90;
+	const double f34_44 = -f34 * m_A139;
+	m_A141 += m_A91 * f34_44;
+	RHS44 += f34_44 * RHS34;
+	const double f35 = 1.0 / m_A94;
+	const double f35_40 = -f35 * m_A115;
+	m_A116 += m_A95 * f35_40;
+	RHS40 += f35_40 * RHS35;
+	const double f36 = 1.0 / m_A97;
+	const double f36_44 = -f36 * m_A140;
+	m_A141 += m_A98 * f36_44;
+	RHS44 += f36_44 * RHS36;
+	const double f36_48 = -f36 * m_A160;
+	m_A161 += m_A98 * f36_48;
+	RHS48 += f36_48 * RHS36;
+	const double f37 = 1.0 / m_A100;
+	const double f37_38 = -f37 * m_A104;
+	m_A105 += m_A101 * f37_38;
+	m_A106 += m_A102 * f37_38;
+	RHS38 += f37_38 * RHS37;
+	const double f37_47 = -f37 * m_A151;
+	m_A152 += m_A101 * f37_47;
+	m_A155 += m_A102 * f37_47;
+	RHS47 += f37_47 * RHS37;
+	const double f38 = 1.0 / m_A105;
+	const double f38_47 = -f38 * m_A152;
+	m_A155 += m_A106 * f38_47;
+	m_A156 += m_A107 * f38_47;
+	RHS47 += f38_47 * RHS38;
+	const double f38_49 = -f38 * m_A165;
+	m_A168 += m_A106 * f38_49;
+	m_A169 += m_A107 * f38_49;
+	RHS49 += f38_49 * RHS38;
+	const double f39 = 1.0 / m_A111;
+	const double f39_49 = -f39 * m_A166;
+	m_A169 += m_A112 * f39_49;
+	RHS49 += f39_49 * RHS39;
+	const double f40 = 1.0 / m_A116;
+	const double f40_46 = -f40 * m_A146;
+	m_A147 += m_A117 * f40_46;
+	m_A149 += m_A118 * f40_46;
+	RHS46 += f40_46 * RHS40;
+	const double f40_50 = -f40 * m_A172;
+	m_A174 += m_A117 * f40_50;
+	m_A177 += m_A118 * f40_50;
+	RHS50 += f40_50 * RHS40;
+	const double f41 = 1.0 / m_A120;
+	const double f41_47 = -f41 * m_A153;
+	m_A154 += m_A121 * f41_47;
+	RHS47 += f41_47 * RHS41;
+	const double f42 = 1.0 / m_A124;
+	const double f42_43 = -f42 * m_A130;
+	m_A131 += m_A125 * f42_43;
+	RHS43 += f42_43 * RHS42;
+	const double f43 = 1.0 / m_A131;
+	const double f43_47 = -f43 * m_A154;
+	m_A155 += m_A132 * f43_47;
+	RHS47 += f43_47 * RHS43;
+	const double f44 = 1.0 / m_A141;
+	const double f44_48 = -f44 * m_A161;
+	RHS48 += f44_48 * RHS44;
+	const double f45 = 1.0 / m_A143;
+	const double f45_50 = -f45 * m_A173;
+	m_A175 += m_A144 * f45_50;
+	RHS50 += f45_50 * RHS45;
+	const double f46 = 1.0 / m_A147;
+	const double f46_49 = -f46 * m_A167;
+	m_A169 += m_A148 * f46_49;
+	m_A170 += m_A149 * f46_49;
+	RHS49 += f46_49 * RHS46;
+	const double f46_50 = -f46 * m_A174;
+	m_A176 += m_A148 * f46_50;
+	m_A177 += m_A149 * f46_50;
+	RHS50 += f46_50 * RHS46;
+	const double f47 = 1.0 / m_A155;
+	const double f47_49 = -f47 * m_A168;
+	m_A169 += m_A156 * f47_49;
+	RHS49 += f47_49 * RHS47;
+	const double f48 = 1.0 / m_A162;
+	const double f48_50 = -f48 * m_A175;
+	m_A177 += m_A163 * f48_50;
+	RHS50 += f48_50 * RHS48;
+	const double f49 = 1.0 / m_A169;
+	const double f49_50 = -f49 * m_A176;
+	m_A177 += m_A170 * f49_50;
+	RHS50 += f49_50 * RHS49;
+	V[50] = RHS50 / m_A177;
+	double tmp49 = 0.0;
+	tmp49 += m_A170 * V[50];
+	V[49] = (RHS49 - tmp49) / m_A169;
+	double tmp48 = 0.0;
+	tmp48 += m_A163 * V[50];
+	V[48] = (RHS48 - tmp48) / m_A162;
+	double tmp47 = 0.0;
+	tmp47 += m_A156 * V[49];
+	V[47] = (RHS47 - tmp47) / m_A155;
+	double tmp46 = 0.0;
+	tmp46 += m_A148 * V[49];
+	tmp46 += m_A149 * V[50];
+	V[46] = (RHS46 - tmp46) / m_A147;
+	double tmp45 = 0.0;
+	tmp45 += m_A144 * V[48];
+	V[45] = (RHS45 - tmp45) / m_A143;
+	double tmp44 = 0.0;
+	V[44] = (RHS44 - tmp44) / m_A141;
+	double tmp43 = 0.0;
+	tmp43 += m_A132 * V[47];
+	V[43] = (RHS43 - tmp43) / m_A131;
+	double tmp42 = 0.0;
+	tmp42 += m_A125 * V[43];
+	V[42] = (RHS42 - tmp42) / m_A124;
+	double tmp41 = 0.0;
+	tmp41 += m_A121 * V[43];
+	V[41] = (RHS41 - tmp41) / m_A120;
+	double tmp40 = 0.0;
+	tmp40 += m_A117 * V[46];
+	tmp40 += m_A118 * V[50];
+	V[40] = (RHS40 - tmp40) / m_A116;
+	double tmp39 = 0.0;
+	tmp39 += m_A112 * V[49];
+	V[39] = (RHS39 - tmp39) / m_A111;
+	double tmp38 = 0.0;
+	tmp38 += m_A106 * V[47];
+	tmp38 += m_A107 * V[49];
+	V[38] = (RHS38 - tmp38) / m_A105;
+	double tmp37 = 0.0;
+	tmp37 += m_A101 * V[38];
+	tmp37 += m_A102 * V[47];
+	V[37] = (RHS37 - tmp37) / m_A100;
+	double tmp36 = 0.0;
+	tmp36 += m_A98 * V[44];
+	V[36] = (RHS36 - tmp36) / m_A97;
+	double tmp35 = 0.0;
+	tmp35 += m_A95 * V[40];
+	V[35] = (RHS35 - tmp35) / m_A94;
+	double tmp34 = 0.0;
+	tmp34 += m_A91 * V[44];
+	V[34] = (RHS34 - tmp34) / m_A90;
+	double tmp33 = 0.0;
+	tmp33 += m_A87 * V[39];
+	V[33] = (RHS33 - tmp33) / m_A86;
+	double tmp32 = 0.0;
+	tmp32 += m_A83 * V[44];
+	V[32] = (RHS32 - tmp32) / m_A82;
+	double tmp31 = 0.0;
+	V[31] = (RHS31 - tmp31) / m_A74;
+	double tmp30 = 0.0;
+	tmp30 += m_A71 * V[42];
+	tmp30 += m_A72 * V[43];
+	V[30] = (RHS30 - tmp30) / m_A70;
+	double tmp29 = 0.0;
+	tmp29 += m_A68 * V[40];
+	tmp29 += m_A69 * V[46];
+	V[29] = (RHS29 - tmp29) / m_A67;
+	double tmp28 = 0.0;
+	tmp28 += m_A66 * V[43];
+	V[28] = (RHS28 - tmp28) / m_A65;
+	double tmp27 = 0.0;
+	tmp27 += m_A63 * V[39];
+	tmp27 += m_A64 * V[49];
+	V[27] = (RHS27 - tmp27) / m_A62;
+	double tmp26 = 0.0;
+	tmp26 += m_A61 * V[34];
+	V[26] = (RHS26 - tmp26) / m_A60;
+	double tmp25 = 0.0;
+	tmp25 += m_A55 * V[35];
+	tmp25 += m_A56 * V[40];
+	V[25] = (RHS25 - tmp25) / m_A54;
+	double tmp24 = 0.0;
+	tmp24 += m_A53 * V[48];
+	V[24] = (RHS24 - tmp24) / m_A52;
+	double tmp23 = 0.0;
+	tmp23 += m_A50 * V[37];
+	tmp23 += m_A51 * V[38];
+	V[23] = (RHS23 - tmp23) / m_A49;
+	double tmp22 = 0.0;
+	tmp22 += m_A47 * V[33];
+	tmp22 += m_A48 * V[39];
+	V[22] = (RHS22 - tmp22) / m_A46;
+	double tmp21 = 0.0;
+	tmp21 += m_A45 * V[48];
+	V[21] = (RHS21 - tmp21) / m_A44;
+	double tmp20 = 0.0;
+	tmp20 += m_A43 * V[41];
+	V[20] = (RHS20 - tmp20) / m_A42;
+	double tmp19 = 0.0;
+	tmp19 += m_A41 * V[33];
+	V[19] = (RHS19 - tmp19) / m_A40;
+	double tmp18 = 0.0;
+	tmp18 += m_A39 * V[42];
+	V[18] = (RHS18 - tmp18) / m_A38;
+	double tmp17 = 0.0;
+	tmp17 += m_A37 * V[32];
+	V[17] = (RHS17 - tmp17) / m_A36;
+	double tmp16 = 0.0;
+	tmp16 += m_A35 * V[32];
+	V[16] = (RHS16 - tmp16) / m_A34;
+	double tmp15 = 0.0;
+	tmp15 += m_A33 * V[35];
+	V[15] = (RHS15 - tmp15) / m_A32;
+	double tmp14 = 0.0;
+	tmp14 += m_A31 * V[32];
+	V[14] = (RHS14 - tmp14) / m_A30;
+	double tmp13 = 0.0;
+	tmp13 += m_A29 * V[31];
+	V[13] = (RHS13 - tmp13) / m_A28;
+	double tmp12 = 0.0;
+	tmp12 += m_A27 * V[32];
+	V[12] = (RHS12 - tmp12) / m_A26;
+	double tmp11 = 0.0;
+	tmp11 += m_A25 * V[32];
+	V[11] = (RHS11 - tmp11) / m_A24;
+	double tmp10 = 0.0;
+	tmp10 += m_A23 * V[32];
+	V[10] = (RHS10 - tmp10) / m_A22;
+	double tmp9 = 0.0;
+	tmp9 += m_A20 * V[32];
+	tmp9 += m_A21 * V[44];
+	V[9] = (RHS9 - tmp9) / m_A19;
+	double tmp8 = 0.0;
+	tmp8 += m_A18 * V[44];
+	V[8] = (RHS8 - tmp8) / m_A17;
+	double tmp7 = 0.0;
+	tmp7 += m_A16 * V[44];
+	V[7] = (RHS7 - tmp7) / m_A15;
+	double tmp6 = 0.0;
+	tmp6 += m_A14 * V[44];
+	V[6] = (RHS6 - tmp6) / m_A13;
+	double tmp5 = 0.0;
+	tmp5 += m_A12 * V[44];
+	V[5] = (RHS5 - tmp5) / m_A11;
+	double tmp4 = 0.0;
+	tmp4 += m_A10 * V[45];
+	V[4] = (RHS4 - tmp4) / m_A9;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[36];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[26];
+	tmp2 += m_A6 * V[34];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[26];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[26];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// solarq
+static void nl_gcr_62612f71055b8fd4_303_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
+	double m_A153(0.0);
+	double m_A154(0.0);
+	double m_A155(0.0);
+	double m_A156(0.0);
+	double m_A157(0.0);
+	double m_A158(0.0);
+	double m_A159(0.0);
+	double m_A160(0.0);
+	double m_A161(0.0);
+	double m_A162(0.0);
+	double m_A163(0.0);
+	double m_A164(0.0);
+	double m_A165(0.0);
+	double m_A166(0.0);
+	double m_A167(0.0);
+	double m_A168(0.0);
+	double m_A169(0.0);
+	double m_A170(0.0);
+	double m_A171(0.0);
+	double m_A172(0.0);
+	double m_A173(0.0);
+	double m_A174(0.0);
+	double m_A175(0.0);
+	double m_A176(0.0);
+	double m_A177(0.0);
+	double m_A178(0.0);
+	double m_A179(0.0);
+	double m_A180(0.0);
+	double m_A181(0.0);
+	double m_A182(0.0);
+	double m_A183(0.0);
+	double m_A184(0.0);
+	double m_A185(0.0);
+	double m_A186(0.0);
+	double m_A187(0.0);
+	double m_A188(0.0);
+	double m_A189(0.0);
+	double m_A190(0.0);
+	double m_A191(0.0);
+	double m_A192(0.0);
+	double m_A193(0.0);
+	double m_A194(0.0);
+	double m_A195(0.0);
+	double m_A196(0.0);
+	double m_A197(0.0);
+	double m_A198(0.0);
+	double m_A199(0.0);
+	double m_A200(0.0);
+	double m_A201(0.0);
+	double m_A202(0.0);
+	double m_A203(0.0);
+	double m_A204(0.0);
+	double m_A205(0.0);
+	double m_A206(0.0);
+	double m_A207(0.0);
+	double m_A208(0.0);
+	double m_A209(0.0);
+	double m_A210(0.0);
+	double m_A211(0.0);
+	double m_A212(0.0);
+	double m_A213(0.0);
+	double m_A214(0.0);
+	double m_A215(0.0);
+	double m_A216(0.0);
+	double m_A217(0.0);
+	double m_A218(0.0);
+	double m_A219(0.0);
+	double m_A220(0.0);
+	double m_A221(0.0);
+	double m_A222(0.0);
+	double m_A223(0.0);
+	double m_A224(0.0);
+	double m_A225(0.0);
+	double m_A226(0.0);
+	double m_A227(0.0);
+	double m_A228(0.0);
+	double m_A229(0.0);
+	double m_A230(0.0);
+	double m_A231(0.0);
+	double m_A232(0.0);
+	double m_A233(0.0);
+	double m_A234(0.0);
+	double m_A235(0.0);
+	double m_A236(0.0);
+	double m_A237(0.0);
+	double m_A238(0.0);
+	double m_A239(0.0);
+	double m_A240(0.0);
+	double m_A241(0.0);
+	double m_A242(0.0);
+	double m_A243(0.0);
+	double m_A244(0.0);
+	double m_A245(0.0);
+	double m_A246(0.0);
+	double m_A247(0.0);
+	double m_A248(0.0);
+	double m_A249(0.0);
+	double m_A250(0.0);
+	double m_A251(0.0);
+	double m_A252(0.0);
+	double m_A253(0.0);
+	double m_A254(0.0);
+	double m_A255(0.0);
+	double m_A256(0.0);
+	double m_A257(0.0);
+	double m_A258(0.0);
+	double m_A259(0.0);
+	double m_A260(0.0);
+	double m_A261(0.0);
+	double m_A262(0.0);
+	double m_A263(0.0);
+	double m_A264(0.0);
+	double m_A265(0.0);
+	double m_A266(0.0);
+	double m_A267(0.0);
+	double m_A268(0.0);
+	double m_A269(0.0);
+	double m_A270(0.0);
+	double m_A271(0.0);
+	double m_A272(0.0);
+	double m_A273(0.0);
+	double m_A274(0.0);
+	double m_A275(0.0);
+	double m_A276(0.0);
+	double m_A277(0.0);
+	double m_A278(0.0);
+	double m_A279(0.0);
+	double m_A280(0.0);
+	double m_A281(0.0);
+	double m_A282(0.0);
+	double m_A283(0.0);
+	double m_A284(0.0);
+	double m_A285(0.0);
+	double m_A286(0.0);
+	double m_A287(0.0);
+	double m_A288(0.0);
+	double m_A289(0.0);
+	double m_A290(0.0);
+	double m_A291(0.0);
+	double m_A292(0.0);
+	double m_A293(0.0);
+	double m_A294(0.0);
+	double m_A295(0.0);
+	double m_A296(0.0);
+	double m_A297(0.0);
+	double m_A298(0.0);
+	double m_A299(0.0);
+	double m_A300(0.0);
+	double m_A301(0.0);
+	double m_A302(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A0 += gt[7];
+	m_A0 += gt[8];
+	m_A0 += gt[9];
+	m_A0 += gt[10];
+	m_A0 += gt[11];
+	m_A0 += gt[12];
+	m_A0 += gt[13];
+	m_A2 += go[0];
+	m_A1 += go[1];
+	m_A1 += go[2];
+	m_A0 += go[3];
+	m_A0 += go[4];
+	m_A0 += go[5];
+	m_A0 += go[6];
+	m_A3 += go[7];
+	m_A3 += go[8];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 += Idr[7];
+	RHS0 += Idr[8];
+	RHS0 += Idr[9];
+	RHS0 += Idr[10];
+	RHS0 += Idr[11];
+	RHS0 += Idr[12];
+	RHS0 += Idr[13];
+	RHS0 -= go[9] * *cnV[9];
+	RHS0 -= go[10] * *cnV[10];
+	RHS0 -= go[11] * *cnV[11];
+	RHS0 -= go[12] * *cnV[12];
+	RHS0 -= go[13] * *cnV[13];
+	m_A4 += gt[14];
+	m_A4 += gt[15];
+	m_A4 += gt[16];
+	m_A4 += gt[17];
+	m_A4 += gt[18];
+	m_A4 += gt[19];
+	m_A4 += gt[20];
+	m_A4 += gt[21];
+	m_A4 += gt[22];
+	m_A4 += gt[23];
+	m_A4 += gt[24];
+	m_A4 += gt[25];
+	m_A4 += gt[26];
+	m_A4 += gt[27];
+	m_A4 += go[14];
+	m_A4 += go[15];
+	m_A4 += go[16];
+	m_A4 += go[17];
+	m_A5 += go[18];
+	m_A5 += go[19];
+	m_A5 += go[20];
+	m_A5 += go[21];
+	m_A6 += go[22];
+	double RHS1 = Idr[14];
+	RHS1 += Idr[15];
+	RHS1 += Idr[16];
+	RHS1 += Idr[17];
+	RHS1 += Idr[18];
+	RHS1 += Idr[19];
+	RHS1 += Idr[20];
+	RHS1 += Idr[21];
+	RHS1 += Idr[22];
+	RHS1 += Idr[23];
+	RHS1 += Idr[24];
+	RHS1 += Idr[25];
+	RHS1 += Idr[26];
+	RHS1 += Idr[27];
+	RHS1 -= go[23] * *cnV[23];
+	RHS1 -= go[24] * *cnV[24];
+	RHS1 -= go[25] * *cnV[25];
+	RHS1 -= go[26] * *cnV[26];
+	RHS1 -= go[27] * *cnV[27];
+	m_A7 += gt[28];
+	m_A7 += gt[29];
+	m_A7 += gt[30];
+	m_A7 += gt[31];
+	m_A7 += gt[32];
+	m_A7 += gt[33];
+	m_A7 += gt[34];
+	m_A7 += gt[35];
+	m_A8 += go[28];
+	m_A8 += go[29];
+	m_A9 += go[30];
+	m_A9 += go[31];
+	m_A9 += go[32];
+	m_A10 += go[33];
+	m_A10 += go[34];
+	m_A10 += go[35];
+	double RHS2 = Idr[28];
+	RHS2 += Idr[29];
+	RHS2 += Idr[30];
+	RHS2 += Idr[31];
+	RHS2 += Idr[32];
+	RHS2 += Idr[33];
+	RHS2 += Idr[34];
+	RHS2 += Idr[35];
+	m_A11 += gt[36];
+	m_A11 += gt[37];
+	m_A11 += gt[38];
+	m_A11 += gt[39];
+	m_A11 += gt[40];
+	m_A12 += go[36];
+	m_A12 += go[37];
+	m_A13 += go[38];
+	m_A13 += go[39];
+	double RHS3 = Idr[36];
+	RHS3 += Idr[37];
+	RHS3 += Idr[38];
+	RHS3 += Idr[39];
+	RHS3 += Idr[40];
+	RHS3 -= go[40] * *cnV[40];
+	m_A14 += gt[41];
+	m_A14 += gt[42];
+	m_A14 += gt[43];
+	m_A14 += gt[44];
+	m_A14 += gt[45];
+	m_A14 += gt[46];
+	m_A14 += gt[47];
+	m_A14 += gt[48];
+	m_A14 += gt[49];
+	m_A14 += gt[50];
+	m_A14 += gt[51];
+	m_A14 += gt[52];
+	m_A14 += gt[53];
+	m_A14 += gt[54];
+	m_A14 += go[41];
+	m_A14 += go[42];
+	m_A14 += go[43];
+	m_A14 += go[44];
+	m_A15 += go[45];
+	m_A15 += go[46];
+	m_A15 += go[47];
+	m_A15 += go[48];
+	m_A16 += go[49];
+	double RHS4 = Idr[41];
+	RHS4 += Idr[42];
+	RHS4 += Idr[43];
+	RHS4 += Idr[44];
+	RHS4 += Idr[45];
+	RHS4 += Idr[46];
+	RHS4 += Idr[47];
+	RHS4 += Idr[48];
+	RHS4 += Idr[49];
+	RHS4 += Idr[50];
+	RHS4 += Idr[51];
+	RHS4 += Idr[52];
+	RHS4 += Idr[53];
+	RHS4 += Idr[54];
+	RHS4 -= go[50] * *cnV[50];
+	RHS4 -= go[51] * *cnV[51];
+	RHS4 -= go[52] * *cnV[52];
+	RHS4 -= go[53] * *cnV[53];
+	RHS4 -= go[54] * *cnV[54];
+	m_A17 += gt[55];
+	m_A17 += gt[56];
+	m_A17 += gt[57];
+	m_A17 += gt[58];
+	m_A17 += gt[59];
+	m_A17 += gt[60];
+	m_A17 += gt[61];
+	m_A17 += gt[62];
+	m_A17 += gt[63];
+	m_A17 += gt[64];
+	m_A17 += gt[65];
+	m_A17 += gt[66];
+	m_A17 += gt[67];
+	m_A17 += gt[68];
+	m_A19 += go[55];
+	m_A18 += go[56];
+	m_A18 += go[57];
+	m_A17 += go[58];
+	m_A17 += go[59];
+	m_A17 += go[60];
+	m_A17 += go[61];
+	m_A20 += go[62];
+	m_A20 += go[63];
+	double RHS5 = Idr[55];
+	RHS5 += Idr[56];
+	RHS5 += Idr[57];
+	RHS5 += Idr[58];
+	RHS5 += Idr[59];
+	RHS5 += Idr[60];
+	RHS5 += Idr[61];
+	RHS5 += Idr[62];
+	RHS5 += Idr[63];
+	RHS5 += Idr[64];
+	RHS5 += Idr[65];
+	RHS5 += Idr[66];
+	RHS5 += Idr[67];
+	RHS5 += Idr[68];
+	RHS5 -= go[64] * *cnV[64];
+	RHS5 -= go[65] * *cnV[65];
+	RHS5 -= go[66] * *cnV[66];
+	RHS5 -= go[67] * *cnV[67];
+	RHS5 -= go[68] * *cnV[68];
+	m_A21 += gt[69];
+	m_A21 += gt[70];
+	m_A21 += gt[71];
+	m_A21 += gt[72];
+	m_A22 += go[69];
+	double RHS6 = Idr[69];
+	RHS6 += Idr[70];
+	RHS6 += Idr[71];
+	RHS6 += Idr[72];
+	RHS6 -= go[70] * *cnV[70];
+	RHS6 -= go[71] * *cnV[71];
+	RHS6 -= go[72] * *cnV[72];
+	m_A23 += gt[73];
+	m_A23 += gt[74];
+	m_A23 += gt[75];
+	m_A23 += gt[76];
+	m_A23 += gt[77];
+	m_A23 += gt[78];
+	m_A23 += gt[79];
+	m_A23 += gt[80];
+	m_A24 += go[73];
+	m_A24 += go[74];
+	m_A25 += go[75];
+	m_A25 += go[76];
+	m_A25 += go[77];
+	m_A26 += go[78];
+	m_A26 += go[79];
+	m_A26 += go[80];
+	double RHS7 = Idr[73];
+	RHS7 += Idr[74];
+	RHS7 += Idr[75];
+	RHS7 += Idr[76];
+	RHS7 += Idr[77];
+	RHS7 += Idr[78];
+	RHS7 += Idr[79];
+	RHS7 += Idr[80];
+	m_A27 += gt[81];
+	m_A27 += gt[82];
+	m_A27 += gt[83];
+	m_A27 += gt[84];
+	m_A27 += gt[85];
+	m_A27 += gt[86];
+	m_A27 += gt[87];
+	m_A27 += gt[88];
+	m_A27 += gt[89];
+	m_A27 += gt[90];
+	m_A27 += gt[91];
+	m_A27 += gt[92];
+	m_A29 += go[81];
+	m_A28 += go[82];
+	m_A28 += go[83];
+	m_A27 += go[84];
+	m_A27 += go[85];
+	m_A27 += go[86];
+	m_A27 += go[87];
+	double RHS8 = Idr[81];
+	RHS8 += Idr[82];
+	RHS8 += Idr[83];
+	RHS8 += Idr[84];
+	RHS8 += Idr[85];
+	RHS8 += Idr[86];
+	RHS8 += Idr[87];
+	RHS8 += Idr[88];
+	RHS8 += Idr[89];
+	RHS8 += Idr[90];
+	RHS8 += Idr[91];
+	RHS8 += Idr[92];
+	RHS8 -= go[88] * *cnV[88];
+	RHS8 -= go[89] * *cnV[89];
+	RHS8 -= go[90] * *cnV[90];
+	RHS8 -= go[91] * *cnV[91];
+	RHS8 -= go[92] * *cnV[92];
+	m_A30 += gt[93];
+	m_A30 += gt[94];
+	m_A30 += gt[95];
+	m_A30 += gt[96];
+	m_A30 += gt[97];
+	m_A30 += gt[98];
+	m_A30 += gt[99];
+	m_A30 += gt[100];
+	m_A33 += go[93];
+	m_A32 += go[94];
+	m_A32 += go[95];
+	m_A31 += go[96];
+	m_A31 += go[97];
+	double RHS9 = Idr[93];
+	RHS9 += Idr[94];
+	RHS9 += Idr[95];
+	RHS9 += Idr[96];
+	RHS9 += Idr[97];
+	RHS9 += Idr[98];
+	RHS9 += Idr[99];
+	RHS9 += Idr[100];
+	RHS9 -= go[98] * *cnV[98];
+	RHS9 -= go[99] * *cnV[99];
+	RHS9 -= go[100] * *cnV[100];
+	m_A34 += gt[101];
+	m_A34 += gt[102];
+	m_A34 += gt[103];
+	m_A34 += gt[104];
+	m_A34 += gt[105];
+	m_A34 += gt[106];
+	m_A34 += gt[107];
+	m_A34 += gt[108];
+	m_A34 += gt[109];
+	m_A34 += gt[110];
+	m_A34 += gt[111];
+	m_A34 += gt[112];
+	m_A36 += go[101];
+	m_A35 += go[102];
+	m_A35 += go[103];
+	m_A34 += go[104];
+	m_A34 += go[105];
+	m_A34 += go[106];
+	m_A34 += go[107];
+	double RHS10 = Idr[101];
+	RHS10 += Idr[102];
+	RHS10 += Idr[103];
+	RHS10 += Idr[104];
+	RHS10 += Idr[105];
+	RHS10 += Idr[106];
+	RHS10 += Idr[107];
+	RHS10 += Idr[108];
+	RHS10 += Idr[109];
+	RHS10 += Idr[110];
+	RHS10 += Idr[111];
+	RHS10 += Idr[112];
+	RHS10 -= go[108] * *cnV[108];
+	RHS10 -= go[109] * *cnV[109];
+	RHS10 -= go[110] * *cnV[110];
+	RHS10 -= go[111] * *cnV[111];
+	RHS10 -= go[112] * *cnV[112];
+	m_A37 += gt[113];
+	m_A37 += gt[114];
+	m_A37 += gt[115];
+	m_A37 += gt[116];
+	m_A37 += gt[117];
+	m_A38 += go[113];
+	m_A38 += go[114];
+	m_A39 += go[115];
+	m_A39 += go[116];
+	double RHS11 = Idr[113];
+	RHS11 += Idr[114];
+	RHS11 += Idr[115];
+	RHS11 += Idr[116];
+	RHS11 += Idr[117];
+	RHS11 -= go[117] * *cnV[117];
+	m_A40 += gt[118];
+	m_A40 += gt[119];
+	m_A40 += gt[120];
+	m_A40 += gt[121];
+	m_A40 += gt[122];
+	m_A40 += gt[123];
+	m_A42 += go[118];
+	m_A41 += go[119];
+	m_A41 += go[120];
+	m_A43 += go[121];
+	m_A43 += go[122];
+	double RHS12 = Idr[118];
+	RHS12 += Idr[119];
+	RHS12 += Idr[120];
+	RHS12 += Idr[121];
+	RHS12 += Idr[122];
+	RHS12 += Idr[123];
+	RHS12 -= go[123] * *cnV[123];
+	m_A44 += gt[124];
+	m_A44 += gt[125];
+	m_A44 += gt[126];
+	m_A44 += gt[127];
+	m_A44 += gt[128];
+	m_A44 += gt[129];
+	m_A44 += gt[130];
+	m_A45 += go[124];
+	m_A46 += go[125];
+	double RHS13 = Idr[124];
+	RHS13 += Idr[125];
+	RHS13 += Idr[126];
+	RHS13 += Idr[127];
+	RHS13 += Idr[128];
+	RHS13 += Idr[129];
+	RHS13 += Idr[130];
+	RHS13 -= go[126] * *cnV[126];
+	RHS13 -= go[127] * *cnV[127];
+	RHS13 -= go[128] * *cnV[128];
+	RHS13 -= go[129] * *cnV[129];
+	RHS13 -= go[130] * *cnV[130];
+	m_A47 += gt[131];
+	m_A47 += gt[132];
+	m_A47 += gt[133];
+	m_A47 += gt[134];
+	m_A48 += go[131];
+	double RHS14 = Idr[131];
+	RHS14 += Idr[132];
+	RHS14 += Idr[133];
+	RHS14 += Idr[134];
+	RHS14 -= go[132] * *cnV[132];
+	RHS14 -= go[133] * *cnV[133];
+	RHS14 -= go[134] * *cnV[134];
+	m_A49 += gt[135];
+	m_A49 += gt[136];
+	m_A50 += go[135];
+	double RHS15 = Idr[135];
+	RHS15 += Idr[136];
+	RHS15 -= go[136] * *cnV[136];
+	m_A51 += gt[137];
+	m_A51 += gt[138];
+	m_A51 += gt[139];
+	m_A51 += gt[140];
+	m_A51 += gt[141];
+	m_A51 += gt[142];
+	m_A51 += gt[143];
+	m_A52 += go[137];
+	double RHS16 = Idr[137];
+	RHS16 += Idr[138];
+	RHS16 += Idr[139];
+	RHS16 += Idr[140];
+	RHS16 += Idr[141];
+	RHS16 += Idr[142];
+	RHS16 += Idr[143];
+	RHS16 -= go[138] * *cnV[138];
+	RHS16 -= go[139] * *cnV[139];
+	RHS16 -= go[140] * *cnV[140];
+	RHS16 -= go[141] * *cnV[141];
+	RHS16 -= go[142] * *cnV[142];
+	RHS16 -= go[143] * *cnV[143];
+	m_A53 += gt[144];
+	m_A53 += gt[145];
+	m_A53 += gt[146];
+	m_A53 += gt[147];
+	m_A53 += gt[148];
+	m_A53 += gt[149];
+	m_A53 += gt[150];
+	m_A54 += go[144];
+	m_A55 += go[145];
+	double RHS17 = Idr[144];
+	RHS17 += Idr[145];
+	RHS17 += Idr[146];
+	RHS17 += Idr[147];
+	RHS17 += Idr[148];
+	RHS17 += Idr[149];
+	RHS17 += Idr[150];
+	RHS17 -= go[146] * *cnV[146];
+	RHS17 -= go[147] * *cnV[147];
+	RHS17 -= go[148] * *cnV[148];
+	RHS17 -= go[149] * *cnV[149];
+	RHS17 -= go[150] * *cnV[150];
+	m_A56 += gt[151];
+	m_A56 += gt[152];
+	m_A56 += gt[153];
+	m_A57 += go[151];
+	double RHS18 = Idr[151];
+	RHS18 += Idr[152];
+	RHS18 += Idr[153];
+	RHS18 -= go[152] * *cnV[152];
+	RHS18 -= go[153] * *cnV[153];
+	m_A58 += gt[154];
+	m_A58 += gt[155];
+	m_A58 += gt[156];
+	m_A58 += gt[157];
+	m_A58 += gt[158];
+	m_A58 += gt[159];
+	m_A59 += go[154];
+	m_A60 += go[155];
+	m_A60 += go[156];
+	m_A61 += go[157];
+	m_A61 += go[158];
+	double RHS19 = Idr[154];
+	RHS19 += Idr[155];
+	RHS19 += Idr[156];
+	RHS19 += Idr[157];
+	RHS19 += Idr[158];
+	RHS19 += Idr[159];
+	RHS19 -= go[159] * *cnV[159];
+	m_A62 += gt[160];
+	m_A62 += gt[161];
+	m_A64 += go[160];
+	m_A63 += go[161];
+	double RHS20 = Idr[160];
+	RHS20 += Idr[161];
+	m_A65 += gt[162];
+	m_A65 += gt[163];
+	m_A65 += gt[164];
+	m_A65 += gt[165];
+	m_A65 += gt[166];
+	m_A65 += gt[167];
+	m_A65 += gt[168];
+	m_A66 += go[162];
+	double RHS21 = Idr[162];
+	RHS21 += Idr[163];
+	RHS21 += Idr[164];
+	RHS21 += Idr[165];
+	RHS21 += Idr[166];
+	RHS21 += Idr[167];
+	RHS21 += Idr[168];
+	RHS21 -= go[163] * *cnV[163];
+	RHS21 -= go[164] * *cnV[164];
+	RHS21 -= go[165] * *cnV[165];
+	RHS21 -= go[166] * *cnV[166];
+	RHS21 -= go[167] * *cnV[167];
+	RHS21 -= go[168] * *cnV[168];
+	m_A67 += gt[169];
+	m_A67 += gt[170];
+	m_A68 += go[169];
+	m_A69 += go[170];
+	double RHS22 = Idr[169];
+	RHS22 += Idr[170];
+	m_A70 += gt[171];
+	m_A70 += gt[172];
+	m_A71 += go[171];
+	double RHS23 = Idr[171];
+	RHS23 += Idr[172];
+	RHS23 -= go[172] * *cnV[172];
+	m_A74 += gt[173];
+	m_A74 += gt[174];
+	m_A74 += gt[175];
+	m_A74 += gt[176];
+	m_A74 += gt[177];
+	m_A74 += gt[178];
+	m_A73 += go[173];
+	m_A73 += go[174];
+	m_A72 += go[175];
+	double RHS24 = Idr[173];
+	RHS24 += Idr[174];
+	RHS24 += Idr[175];
+	RHS24 += Idr[176];
+	RHS24 += Idr[177];
+	RHS24 += Idr[178];
+	RHS24 -= go[176] * *cnV[176];
+	RHS24 -= go[177] * *cnV[177];
+	RHS24 -= go[178] * *cnV[178];
+	m_A77 += gt[179];
+	m_A77 += gt[180];
+	m_A78 += go[179];
+	m_A79 += go[180];
+	double RHS25 = Idr[179];
+	RHS25 += Idr[180];
+	m_A82 += gt[181];
+	m_A82 += gt[182];
+	m_A82 += gt[183];
+	m_A82 += gt[184];
+	m_A82 += gt[185];
+	m_A83 += go[181];
+	m_A83 += go[182];
+	m_A80 += go[183];
+	m_A80 += go[184];
+	double RHS26 = Idr[181];
+	RHS26 += Idr[182];
+	RHS26 += Idr[183];
+	RHS26 += Idr[184];
+	RHS26 += Idr[185];
+	RHS26 -= go[185] * *cnV[185];
+	m_A85 += gt[186];
+	m_A85 += gt[187];
+	m_A85 += gt[188];
+	m_A85 += gt[189];
+	m_A85 += gt[190];
+	m_A85 += gt[191];
+	m_A85 += gt[192];
+	m_A85 += gt[193];
+	m_A86 += go[186];
+	m_A86 += go[187];
+	m_A86 += go[188];
+	m_A84 += go[189];
+	m_A84 += go[190];
+	m_A87 += go[191];
+	m_A87 += go[192];
+	m_A87 += go[193];
+	double RHS27 = Idr[186];
+	RHS27 += Idr[187];
+	RHS27 += Idr[188];
+	RHS27 += Idr[189];
+	RHS27 += Idr[190];
+	RHS27 += Idr[191];
+	RHS27 += Idr[192];
+	RHS27 += Idr[193];
+	m_A89 += gt[194];
+	m_A89 += gt[195];
+	m_A89 += gt[196];
+	m_A89 += gt[197];
+	m_A89 += gt[198];
+	m_A89 += gt[199];
+	m_A89 += gt[200];
+	m_A89 += gt[201];
+	m_A89 += gt[202];
+	m_A89 += gt[203];
+	m_A89 += gt[204];
+	m_A89 += gt[205];
+	m_A89 += gt[206];
+	m_A89 += gt[207];
+	m_A89 += go[194];
+	m_A89 += go[195];
+	m_A89 += go[196];
+	m_A89 += go[197];
+	m_A88 += go[198];
+	m_A88 += go[199];
+	m_A90 += go[200];
+	m_A90 += go[201];
+	m_A91 += go[202];
+	double RHS28 = Idr[194];
+	RHS28 += Idr[195];
+	RHS28 += Idr[196];
+	RHS28 += Idr[197];
+	RHS28 += Idr[198];
+	RHS28 += Idr[199];
+	RHS28 += Idr[200];
+	RHS28 += Idr[201];
+	RHS28 += Idr[202];
+	RHS28 += Idr[203];
+	RHS28 += Idr[204];
+	RHS28 += Idr[205];
+	RHS28 += Idr[206];
+	RHS28 += Idr[207];
+	RHS28 -= go[203] * *cnV[203];
+	RHS28 -= go[204] * *cnV[204];
+	RHS28 -= go[205] * *cnV[205];
+	RHS28 -= go[206] * *cnV[206];
+	RHS28 -= go[207] * *cnV[207];
+	m_A94 += gt[208];
+	m_A94 += gt[209];
+	m_A94 += gt[210];
+	m_A93 += go[208];
+	m_A92 += go[209];
+	double RHS29 = Idr[208];
+	RHS29 += Idr[209];
+	RHS29 += Idr[210];
+	RHS29 -= go[210] * *cnV[210];
+	m_A99 += gt[211];
+	m_A99 += gt[212];
+	m_A99 += gt[213];
+	m_A99 += gt[214];
+	m_A99 += gt[215];
+	m_A99 += gt[216];
+	m_A99 += gt[217];
+	m_A99 += gt[218];
+	m_A99 += gt[219];
+	m_A96 += go[211];
+	m_A96 += go[212];
+	m_A98 += go[213];
+	m_A98 += go[214];
+	m_A102 += go[215];
+	m_A103 += go[216];
+	m_A97 += go[217];
+	m_A97 += go[218];
+	double RHS30 = Idr[211];
+	RHS30 += Idr[212];
+	RHS30 += Idr[213];
+	RHS30 += Idr[214];
+	RHS30 += Idr[215];
+	RHS30 += Idr[216];
+	RHS30 += Idr[217];
+	RHS30 += Idr[218];
+	RHS30 += Idr[219];
+	RHS30 -= go[219] * *cnV[219];
+	m_A105 += gt[220];
+	m_A105 += gt[221];
+	m_A105 += gt[222];
+	m_A105 += gt[223];
+	m_A105 += gt[224];
+	m_A104 += go[220];
+	m_A106 += go[221];
+	m_A107 += go[222];
+	double RHS31 = Idr[220];
+	RHS31 += Idr[221];
+	RHS31 += Idr[222];
+	RHS31 += Idr[223];
+	RHS31 += Idr[224];
+	RHS31 -= go[223] * *cnV[223];
+	RHS31 -= go[224] * *cnV[224];
+	m_A111 += gt[225];
+	m_A111 += gt[226];
+	m_A111 += gt[227];
+	m_A111 += gt[228];
+	m_A111 += gt[229];
+	m_A109 += go[225];
+	m_A108 += go[226];
+	m_A113 += go[227];
+	double RHS32 = Idr[225];
+	RHS32 += Idr[226];
+	RHS32 += Idr[227];
+	RHS32 += Idr[228];
+	RHS32 += Idr[229];
+	RHS32 -= go[228] * *cnV[228];
+	RHS32 -= go[229] * *cnV[229];
+	m_A119 += gt[230];
+	m_A119 += gt[231];
+	m_A119 += gt[232];
+	m_A119 += gt[233];
+	m_A119 += gt[234];
+	m_A119 += gt[235];
+	m_A119 += gt[236];
+	m_A116 += go[230];
+	m_A117 += go[231];
+	m_A118 += go[232];
+	m_A121 += go[233];
+	m_A124 += go[234];
+	double RHS33 = Idr[230];
+	RHS33 += Idr[231];
+	RHS33 += Idr[232];
+	RHS33 += Idr[233];
+	RHS33 += Idr[234];
+	RHS33 += Idr[235];
+	RHS33 += Idr[236];
+	RHS33 -= go[235] * *cnV[235];
+	RHS33 -= go[236] * *cnV[236];
+	m_A126 += gt[237];
+	m_A126 += gt[238];
+	m_A126 += gt[239];
+	m_A126 += gt[240];
+	m_A126 += gt[241];
+	m_A126 += gt[242];
+	m_A126 += gt[243];
+	m_A126 += gt[244];
+	m_A127 += go[237];
+	m_A127 += go[238];
+	m_A127 += go[239];
+	m_A125 += go[240];
+	m_A125 += go[241];
+	m_A128 += go[242];
+	m_A128 += go[243];
+	m_A128 += go[244];
+	double RHS34 = Idr[237];
+	RHS34 += Idr[238];
+	RHS34 += Idr[239];
+	RHS34 += Idr[240];
+	RHS34 += Idr[241];
+	RHS34 += Idr[242];
+	RHS34 += Idr[243];
+	RHS34 += Idr[244];
+	m_A130 += gt[245];
+	m_A130 += gt[246];
+	m_A130 += gt[247];
+	m_A130 += gt[248];
+	m_A130 += gt[249];
+	m_A130 += gt[250];
+	m_A130 += gt[251];
+	m_A130 += gt[252];
+	m_A130 += gt[253];
+	m_A130 += gt[254];
+	m_A130 += gt[255];
+	m_A130 += gt[256];
+	m_A130 += gt[257];
+	m_A130 += gt[258];
+	m_A130 += go[245];
+	m_A130 += go[246];
+	m_A130 += go[247];
+	m_A130 += go[248];
+	m_A129 += go[249];
+	m_A129 += go[250];
+	m_A131 += go[251];
+	m_A131 += go[252];
+	m_A132 += go[253];
+	double RHS35 = Idr[245];
+	RHS35 += Idr[246];
+	RHS35 += Idr[247];
+	RHS35 += Idr[248];
+	RHS35 += Idr[249];
+	RHS35 += Idr[250];
+	RHS35 += Idr[251];
+	RHS35 += Idr[252];
+	RHS35 += Idr[253];
+	RHS35 += Idr[254];
+	RHS35 += Idr[255];
+	RHS35 += Idr[256];
+	RHS35 += Idr[257];
+	RHS35 += Idr[258];
+	RHS35 -= go[254] * *cnV[254];
+	RHS35 -= go[255] * *cnV[255];
+	RHS35 -= go[256] * *cnV[256];
+	RHS35 -= go[257] * *cnV[257];
+	RHS35 -= go[258] * *cnV[258];
+	m_A137 += gt[259];
+	m_A137 += gt[260];
+	m_A137 += gt[261];
+	m_A137 += gt[262];
+	m_A137 += gt[263];
+	m_A137 += gt[264];
+	m_A137 += gt[265];
+	m_A137 += gt[266];
+	m_A137 += gt[267];
+	m_A134 += go[259];
+	m_A134 += go[260];
+	m_A135 += go[261];
+	m_A135 += go[262];
+	m_A140 += go[263];
+	m_A143 += go[264];
+	m_A133 += go[265];
+	m_A133 += go[266];
+	double RHS36 = Idr[259];
+	RHS36 += Idr[260];
+	RHS36 += Idr[261];
+	RHS36 += Idr[262];
+	RHS36 += Idr[263];
+	RHS36 += Idr[264];
+	RHS36 += Idr[265];
+	RHS36 += Idr[266];
+	RHS36 += Idr[267];
+	RHS36 -= go[267] * *cnV[267];
+	m_A145 += gt[268];
+	m_A145 += gt[269];
+	m_A146 += go[268];
+	m_A144 += go[269];
+	double RHS37 = Idr[268];
+	RHS37 += Idr[269];
+	m_A148 += gt[270];
+	m_A148 += gt[271];
+	m_A148 += gt[272];
+	m_A148 += gt[273];
+	m_A148 += gt[274];
+	m_A148 += gt[275];
+	m_A148 += gt[276];
+	m_A147 += go[270];
+	m_A149 += go[271];
+	double RHS38 = Idr[270];
+	RHS38 += Idr[271];
+	RHS38 += Idr[272];
+	RHS38 += Idr[273];
+	RHS38 += Idr[274];
+	RHS38 += Idr[275];
+	RHS38 += Idr[276];
+	RHS38 -= go[272] * *cnV[272];
+	RHS38 -= go[273] * *cnV[273];
+	RHS38 -= go[274] * *cnV[274];
+	RHS38 -= go[275] * *cnV[275];
+	RHS38 -= go[276] * *cnV[276];
+	m_A158 += gt[277];
+	m_A158 += gt[278];
+	m_A158 += gt[279];
+	m_A158 += gt[280];
+	m_A158 += gt[281];
+	m_A158 += gt[282];
+	m_A154 += go[277];
+	m_A154 += go[278];
+	m_A151 += go[279];
+	m_A152 += go[280];
+	m_A150 += go[281];
+	double RHS39 = Idr[277];
+	RHS39 += Idr[278];
+	RHS39 += Idr[279];
+	RHS39 += Idr[280];
+	RHS39 += Idr[281];
+	RHS39 += Idr[282];
+	RHS39 -= go[282] * *cnV[282];
+	m_A172 += gt[283];
+	m_A172 += gt[284];
+	m_A172 += gt[285];
+	m_A172 += gt[286];
+	m_A172 += gt[287];
+	m_A166 += go[283];
+	m_A167 += go[284];
+	m_A169 += go[285];
+	m_A168 += go[286];
+	double RHS40 = Idr[283];
+	RHS40 += Idr[284];
+	RHS40 += Idr[285];
+	RHS40 += Idr[286];
+	RHS40 += Idr[287];
+	RHS40 -= go[287] * *cnV[287];
+	m_A181 += gt[288];
+	m_A181 += gt[289];
+	m_A181 += gt[290];
+	m_A181 += gt[291];
+	m_A180 += go[288];
+	m_A182 += go[289];
+	double RHS41 = Idr[288];
+	RHS41 += Idr[289];
+	RHS41 += Idr[290];
+	RHS41 += Idr[291];
+	RHS41 -= go[290] * *cnV[290];
+	RHS41 -= go[291] * *cnV[291];
+	m_A186 += gt[292];
+	m_A186 += gt[293];
+	m_A186 += gt[294];
+	m_A186 += gt[295];
+	m_A186 += gt[296];
+	m_A185 += go[292];
+	m_A183 += go[293];
+	m_A184 += go[294];
+	double RHS42 = Idr[292];
+	RHS42 += Idr[293];
+	RHS42 += Idr[294];
+	RHS42 += Idr[295];
+	RHS42 += Idr[296];
+	RHS42 -= go[295] * *cnV[295];
+	RHS42 -= go[296] * *cnV[296];
+	m_A195 += gt[297];
+	m_A195 += gt[298];
+	m_A195 += gt[299];
+	m_A195 += gt[300];
+	m_A195 += gt[301];
+	m_A195 += gt[302];
+	m_A195 += gt[303];
+	m_A195 += gt[304];
+	m_A195 += gt[305];
+	m_A195 += gt[306];
+	m_A195 += gt[307];
+	m_A189 += go[297];
+	m_A189 += go[298];
+	m_A191 += go[299];
+	m_A190 += go[300];
+	m_A190 += go[301];
+	m_A188 += go[302];
+	m_A188 += go[303];
+	m_A188 += go[304];
+	m_A198 += go[305];
+	m_A198 += go[306];
+	double RHS43 = Idr[297];
+	RHS43 += Idr[298];
+	RHS43 += Idr[299];
+	RHS43 += Idr[300];
+	RHS43 += Idr[301];
+	RHS43 += Idr[302];
+	RHS43 += Idr[303];
+	RHS43 += Idr[304];
+	RHS43 += Idr[305];
+	RHS43 += Idr[306];
+	RHS43 += Idr[307];
+	RHS43 -= go[307] * *cnV[307];
+	m_A205 += gt[308];
+	m_A205 += gt[309];
+	m_A205 += gt[310];
+	m_A205 += gt[311];
+	m_A205 += gt[312];
+	m_A205 += gt[313];
+	m_A205 += gt[314];
+	m_A205 += gt[315];
+	m_A205 += gt[316];
+	m_A205 += gt[317];
+	m_A205 += gt[318];
+	m_A205 += gt[319];
+	m_A205 += gt[320];
+	m_A203 += go[308];
+	m_A203 += go[309];
+	m_A203 += go[310];
+	m_A203 += go[311];
+	m_A204 += go[312];
+	m_A204 += go[313];
+	m_A204 += go[314];
+	m_A202 += go[315];
+	m_A207 += go[316];
+	m_A207 += go[317];
+	m_A206 += go[318];
+	m_A206 += go[319];
+	double RHS44 = Idr[308];
+	RHS44 += Idr[309];
+	RHS44 += Idr[310];
+	RHS44 += Idr[311];
+	RHS44 += Idr[312];
+	RHS44 += Idr[313];
+	RHS44 += Idr[314];
+	RHS44 += Idr[315];
+	RHS44 += Idr[316];
+	RHS44 += Idr[317];
+	RHS44 += Idr[318];
+	RHS44 += Idr[319];
+	RHS44 += Idr[320];
+	RHS44 -= go[320] * *cnV[320];
+	m_A211 += gt[321];
+	m_A211 += gt[322];
+	m_A211 += gt[323];
+	m_A211 += gt[324];
+	m_A211 += gt[325];
+	m_A211 += gt[326];
+	m_A211 += gt[327];
+	m_A211 += gt[328];
+	m_A211 += gt[329];
+	m_A211 += gt[330];
+	m_A211 += gt[331];
+	m_A211 += gt[332];
+	m_A211 += gt[333];
+	m_A208 += go[321];
+	m_A208 += go[322];
+	m_A208 += go[323];
+	m_A208 += go[324];
+	m_A210 += go[325];
+	m_A210 += go[326];
+	m_A210 += go[327];
+	m_A209 += go[328];
+	m_A212 += go[329];
+	m_A212 += go[330];
+	m_A213 += go[331];
+	m_A213 += go[332];
+	double RHS45 = Idr[321];
+	RHS45 += Idr[322];
+	RHS45 += Idr[323];
+	RHS45 += Idr[324];
+	RHS45 += Idr[325];
+	RHS45 += Idr[326];
+	RHS45 += Idr[327];
+	RHS45 += Idr[328];
+	RHS45 += Idr[329];
+	RHS45 += Idr[330];
+	RHS45 += Idr[331];
+	RHS45 += Idr[332];
+	RHS45 += Idr[333];
+	RHS45 -= go[333] * *cnV[333];
+	m_A222 += gt[334];
+	m_A222 += gt[335];
+	m_A222 += gt[336];
+	m_A222 += gt[337];
+	m_A222 += gt[338];
+	m_A222 += gt[339];
+	m_A222 += gt[340];
+	m_A222 += gt[341];
+	m_A222 += gt[342];
+	m_A222 += gt[343];
+	m_A222 += gt[344];
+	m_A215 += go[334];
+	m_A215 += go[335];
+	m_A218 += go[336];
+	m_A217 += go[337];
+	m_A217 += go[338];
+	m_A214 += go[339];
+	m_A214 += go[340];
+	m_A214 += go[341];
+	m_A227 += go[342];
+	m_A227 += go[343];
+	double RHS46 = Idr[334];
+	RHS46 += Idr[335];
+	RHS46 += Idr[336];
+	RHS46 += Idr[337];
+	RHS46 += Idr[338];
+	RHS46 += Idr[339];
+	RHS46 += Idr[340];
+	RHS46 += Idr[341];
+	RHS46 += Idr[342];
+	RHS46 += Idr[343];
+	RHS46 += Idr[344];
+	RHS46 -= go[344] * *cnV[344];
+	m_A241 += gt[345];
+	m_A241 += gt[346];
+	m_A241 += gt[347];
+	m_A241 += gt[348];
+	m_A241 += gt[349];
+	m_A241 += gt[350];
+	m_A237 += go[345];
+	m_A230 += go[346];
+	m_A229 += go[347];
+	m_A228 += go[348];
+	m_A234 += go[349];
+	double RHS47 = Idr[345];
+	RHS47 += Idr[346];
+	RHS47 += Idr[347];
+	RHS47 += Idr[348];
+	RHS47 += Idr[349];
+	RHS47 += Idr[350];
+	RHS47 -= go[350] * *cnV[350];
+	m_A257 += gt[351];
+	m_A257 += gt[352];
+	m_A257 += gt[353];
+	m_A257 += gt[354];
+	m_A257 += gt[355];
+	m_A257 += gt[356];
+	m_A257 += gt[357];
+	m_A257 += gt[358];
+	m_A257 += gt[359];
+	m_A257 += gt[360];
+	m_A257 += gt[361];
+	m_A257 += gt[362];
+	m_A249 += go[351];
+	m_A246 += go[352];
+	m_A248 += go[353];
+	m_A247 += go[354];
+	m_A247 += go[355];
+	m_A247 += go[356];
+	m_A253 += go[357];
+	m_A253 += go[358];
+	m_A254 += go[359];
+	m_A254 += go[360];
+	double RHS48 = Idr[351];
+	RHS48 += Idr[352];
+	RHS48 += Idr[353];
+	RHS48 += Idr[354];
+	RHS48 += Idr[355];
+	RHS48 += Idr[356];
+	RHS48 += Idr[357];
+	RHS48 += Idr[358];
+	RHS48 += Idr[359];
+	RHS48 += Idr[360];
+	RHS48 += Idr[361];
+	RHS48 += Idr[362];
+	RHS48 -= go[361] * *cnV[361];
+	RHS48 -= go[362] * *cnV[362];
+	m_A273 += gt[363];
+	m_A273 += gt[364];
+	m_A273 += gt[365];
+	m_A273 += gt[366];
+	m_A273 += gt[367];
+	m_A273 += gt[368];
+	m_A273 += gt[369];
+	m_A273 += gt[370];
+	m_A273 += gt[371];
+	m_A273 += gt[372];
+	m_A273 += gt[373];
+	m_A262 += go[363];
+	m_A262 += go[364];
+	m_A264 += go[365];
+	m_A269 += go[366];
+	m_A269 += go[367];
+	m_A263 += go[368];
+	m_A263 += go[369];
+	m_A263 += go[370];
+	m_A261 += go[371];
+	m_A261 += go[372];
+	double RHS49 = Idr[363];
+	RHS49 += Idr[364];
+	RHS49 += Idr[365];
+	RHS49 += Idr[366];
+	RHS49 += Idr[367];
+	RHS49 += Idr[368];
+	RHS49 += Idr[369];
+	RHS49 += Idr[370];
+	RHS49 += Idr[371];
+	RHS49 += Idr[372];
+	RHS49 += Idr[373];
+	RHS49 -= go[373] * *cnV[373];
+	m_A288 += gt[374];
+	m_A288 += gt[375];
+	m_A288 += gt[376];
+	m_A288 += gt[377];
+	m_A288 += gt[378];
+	m_A288 += gt[379];
+	m_A288 += gt[380];
+	m_A288 += gt[381];
+	m_A288 += gt[382];
+	m_A288 += gt[383];
+	m_A288 += gt[384];
+	m_A277 += go[374];
+	m_A277 += go[375];
+	m_A279 += go[376];
+	m_A283 += go[377];
+	m_A283 += go[378];
+	m_A278 += go[379];
+	m_A278 += go[380];
+	m_A278 += go[381];
+	m_A276 += go[382];
+	m_A276 += go[383];
+	double RHS50 = Idr[374];
+	RHS50 += Idr[375];
+	RHS50 += Idr[376];
+	RHS50 += Idr[377];
+	RHS50 += Idr[378];
+	RHS50 += Idr[379];
+	RHS50 += Idr[380];
+	RHS50 += Idr[381];
+	RHS50 += Idr[382];
+	RHS50 += Idr[383];
+	RHS50 += Idr[384];
+	RHS50 -= go[384] * *cnV[384];
+	m_A302 += gt[385];
+	m_A302 += gt[386];
+	m_A302 += gt[387];
+	m_A302 += gt[388];
+	m_A302 += gt[389];
+	m_A302 += gt[390];
+	m_A302 += gt[391];
+	m_A302 += gt[392];
+	m_A302 += gt[393];
+	m_A302 += gt[394];
+	m_A302 += gt[395];
+	m_A302 += gt[396];
+	m_A292 += go[385];
+	m_A290 += go[386];
+	m_A293 += go[387];
+	m_A291 += go[388];
+	m_A291 += go[389];
+	m_A291 += go[390];
+	m_A297 += go[391];
+	m_A297 += go[392];
+	m_A296 += go[393];
+	m_A296 += go[394];
+	double RHS51 = Idr[385];
+	RHS51 += Idr[386];
+	RHS51 += Idr[387];
+	RHS51 += Idr[388];
+	RHS51 += Idr[389];
+	RHS51 += Idr[390];
+	RHS51 += Idr[391];
+	RHS51 += Idr[392];
+	RHS51 += Idr[393];
+	RHS51 += Idr[394];
+	RHS51 += Idr[395];
+	RHS51 += Idr[396];
+	RHS51 -= go[395] * *cnV[395];
+	RHS51 -= go[396] * *cnV[396];
+	const double f0 = 1.0 / m_A0;
+	const double f0_27 = -f0 * m_A84;
+	m_A85 += m_A1 * f0_27;
+	m_A86 += m_A2 * f0_27;
+	m_A87 += m_A3 * f0_27;
+	RHS27 += f0_27 * RHS0;
+	const double f0_44 = -f0 * m_A202;
+	m_A204 += m_A1 * f0_44;
+	m_A205 += m_A2 * f0_44;
+	m_A207 += m_A3 * f0_44;
+	RHS44 += f0_44 * RHS0;
+	const double f0_49 = -f0 * m_A261;
+	m_A263 += m_A1 * f0_49;
+	m_A269 += m_A2 * f0_49;
+	m_A273 += m_A3 * f0_49;
+	RHS49 += f0_49 * RHS0;
+	const double f1 = 1.0 / m_A4;
+	const double f1_44 = -f1 * m_A203;
+	m_A205 += m_A5 * f1_44;
+	m_A206 += m_A6 * f1_44;
+	RHS44 += f1_44 * RHS1;
+	const double f1_48 = -f1 * m_A246;
+	m_A254 += m_A5 * f1_48;
+	m_A257 += m_A6 * f1_48;
+	RHS48 += f1_48 * RHS1;
+	const double f2 = 1.0 / m_A7;
+	const double f2_28 = -f2 * m_A88;
+	m_A89 += m_A8 * f2_28;
+	m_A90 += m_A9 * f2_28;
+	m_A91 += m_A10 * f2_28;
+	RHS28 += f2_28 * RHS2;
+	const double f2_43 = -f2 * m_A188;
+	m_A190 += m_A8 * f2_43;
+	m_A195 += m_A9 * f2_43;
+	m_A198 += m_A10 * f2_43;
+	RHS43 += f2_43 * RHS2;
+	const double f2_48 = -f2 * m_A247;
+	m_A248 += m_A8 * f2_48;
+	m_A253 += m_A9 * f2_48;
+	m_A257 += m_A10 * f2_48;
+	RHS48 += f2_48 * RHS2;
+	const double f3 = 1.0 / m_A11;
+	const double f3_30 = -f3 * m_A96;
+	m_A99 += m_A12 * f3_30;
+	m_A103 += m_A13 * f3_30;
+	RHS30 += f3_30 * RHS3;
+	const double f3_49 = -f3 * m_A262;
+	m_A264 += m_A12 * f3_49;
+	m_A273 += m_A13 * f3_49;
+	RHS49 += f3_49 * RHS3;
+	const double f4 = 1.0 / m_A14;
+	const double f4_45 = -f4 * m_A208;
+	m_A211 += m_A15 * f4_45;
+	m_A213 += m_A16 * f4_45;
+	RHS45 += f4_45 * RHS4;
+	const double f4_51 = -f4 * m_A290;
+	m_A296 += m_A15 * f4_51;
+	m_A302 += m_A16 * f4_51;
+	RHS51 += f4_51 * RHS4;
+	const double f5 = 1.0 / m_A17;
+	const double f5_34 = -f5 * m_A125;
+	m_A126 += m_A18 * f5_34;
+	m_A127 += m_A19 * f5_34;
+	m_A128 += m_A20 * f5_34;
+	RHS34 += f5_34 * RHS5;
+	const double f5_45 = -f5 * m_A209;
+	m_A210 += m_A18 * f5_45;
+	m_A211 += m_A19 * f5_45;
+	m_A212 += m_A20 * f5_45;
+	RHS45 += f5_45 * RHS5;
+	const double f5_50 = -f5 * m_A276;
+	m_A278 += m_A18 * f5_50;
+	m_A283 += m_A19 * f5_50;
+	m_A288 += m_A20 * f5_50;
+	RHS50 += f5_50 * RHS5;
+	const double f6 = 1.0 / m_A21;
+	const double f6_24 = -f6 * m_A72;
+	m_A74 += m_A22 * f6_24;
+	RHS24 += f6_24 * RHS6;
+	const double f7 = 1.0 / m_A23;
+	const double f7_35 = -f7 * m_A129;
+	m_A130 += m_A24 * f7_35;
+	m_A131 += m_A25 * f7_35;
+	m_A132 += m_A26 * f7_35;
+	RHS35 += f7_35 * RHS7;
+	const double f7_46 = -f7 * m_A214;
+	m_A217 += m_A24 * f7_46;
+	m_A222 += m_A25 * f7_46;
+	m_A227 += m_A26 * f7_46;
+	RHS46 += f7_46 * RHS7;
+	const double f7_51 = -f7 * m_A291;
+	m_A293 += m_A24 * f7_51;
+	m_A297 += m_A25 * f7_51;
+	m_A302 += m_A26 * f7_51;
+	RHS51 += f7_51 * RHS7;
+	const double f8 = 1.0 / m_A27;
+	const double f8_30 = -f8 * m_A97;
+	m_A99 += m_A28 * f8_30;
+	m_A101 += m_A29 * f8_30;
+	RHS30 += f8_30 * RHS8;
+	const double f8_39 = -f8 * m_A150;
+	m_A155 += m_A28 * f8_39;
+	m_A158 += m_A29 * f8_39;
+	RHS39 += f8_39 * RHS8;
+	const double f9 = 1.0 / m_A30;
+	const double f9_24 = -f9 * m_A73;
+	m_A74 += m_A31 * f9_24;
+	m_A75 += m_A32 * f9_24;
+	m_A76 += m_A33 * f9_24;
+	RHS24 += f9_24 * RHS9;
+	const double f9_26 = -f9 * m_A80;
+	m_A81 += m_A31 * f9_26;
+	m_A82 += m_A32 * f9_26;
+	m_A83 += m_A33 * f9_26;
+	RHS26 += f9_26 * RHS9;
+	const double f9_39 = -f9 * m_A151;
+	m_A153 += m_A31 * f9_39;
+	m_A154 += m_A32 * f9_39;
+	m_A158 += m_A33 * f9_39;
+	RHS39 += f9_39 * RHS9;
+	const double f10 = 1.0 / m_A34;
+	const double f10_36 = -f10 * m_A133;
+	m_A137 += m_A35 * f10_36;
+	m_A138 += m_A36 * f10_36;
 	RHS36 += f10_36 * RHS10;
-	const double f11 = 1.0 / m_A29;
-	const double f11_32 = -f11 * m_A105;
-	m_A110 += m_A30 * f11_32;
-	RHS32 += f11_32 * RHS11;
-	const double f12 = 1.0 / m_A31;
-	const double f12_28 = -f12 * m_A87;
-	m_A88 += m_A32 * f12_28;
-	m_A89 += m_A33 * f12_28;
-	RHS28 += f12_28 * RHS12;
+	const double f10_39 = -f10 * m_A152;
+	m_A157 += m_A35 * f10_39;
+	m_A158 += m_A36 * f10_39;
+	RHS39 += f10_39 * RHS10;
+	const double f11 = 1.0 / m_A37;
+	const double f11_36 = -f11 * m_A134;
+	m_A137 += m_A38 * f11_36;
+	m_A143 += m_A39 * f11_36;
+	RHS36 += f11_36 * RHS11;
+	const double f11_50 = -f11 * m_A277;
+	m_A279 += m_A38 * f11_50;
+	m_A288 += m_A39 * f11_50;
+	RHS50 += f11_50 * RHS11;
+	const double f12 = 1.0 / m_A40;
 	const double f12_30 = -f12 * m_A98;
-	m_A99 += m_A32 * f12_30;
-	m_A101 += m_A33 * f12_30;
+	m_A99 += m_A41 * f12_30;
+	m_A100 += m_A42 * f12_30;
+	m_A102 += m_A43 * f12_30;
 	RHS30 += f12_30 * RHS12;
-	const double f12_32 = -f12 * m_A106;
-	m_A108 += m_A32 * f12_32;
-	m_A110 += m_A33 * f12_32;
+	const double f12_32 = -f12 * m_A108;
+	m_A110 += m_A41 * f12_32;
+	m_A111 += m_A42 * f12_32;
+	m_A114 += m_A43 * f12_32;
 	RHS32 += f12_32 * RHS12;
-	const double f13 = 1.0 / m_A34;
-	const double f13_29 = -f13 * m_A92;
-	m_A95 += m_A35 * f13_29;
-	m_A97 += m_A36 * f13_29;
-	RHS29 += f13_29 * RHS13;
-	const double f13_37 = -f13 * m_A134;
-	m_A141 += m_A35 * f13_37;
-	m_A149 += m_A36 * f13_37;
-	RHS37 += f13_37 * RHS13;
-	const double f14 = 1.0 / m_A37;
-	const double f14_35 = -f14 * m_A123;
-	m_A125 += m_A38 * f14_35;
-	RHS35 += f14_35 * RHS14;
-	const double f15 = 1.0 / m_A39;
-	const double f15_35 = -f15 * m_A124;
-	m_A125 += m_A40 * f15_35;
-	RHS35 += f15_35 * RHS15;
-	const double f16 = 1.0 / m_A41;
-	const double f16_37 = -f16 * m_A135;
-	m_A149 += m_A42 * f16_37;
-	RHS37 += f16_37 * RHS16;
-	const double f17 = 1.0 / m_A43;
-	const double f17_36 = -f17 * m_A128;
-	m_A131 += m_A44 * f17_36;
-	m_A132 += m_A45 * f17_36;
-	m_A133 += m_A46 * f17_36;
-	RHS36 += f17_36 * RHS17;
-	const double f17_37 = -f17 * m_A136;
-	m_A145 += m_A44 * f17_37;
-	m_A148 += m_A45 * f17_37;
-	m_A149 += m_A46 * f17_37;
-	RHS37 += f17_37 * RHS17;
-	const double f18 = 1.0 / m_A47;
-	const double f18_32 = -f18 * m_A107;
-	m_A109 += m_A48 * f18_32;
-	m_A110 += m_A49 * f18_32;
-	m_A111 += m_A50 * f18_32;
-	RHS32 += f18_32 * RHS18;
-	const double f18_37 = -f18 * m_A137;
-	m_A142 += m_A48 * f18_37;
-	m_A144 += m_A49 * f18_37;
-	m_A149 += m_A50 * f18_37;
-	RHS37 += f18_37 * RHS18;
-	const double f19 = 1.0 / m_A51;
-	const double f19_37 = -f19 * m_A138;
-	m_A149 += m_A52 * f19_37;
-	RHS37 += f19_37 * RHS19;
-	const double f20 = 1.0 / m_A55;
-	const double f20_21 = -f20 * m_A59;
-	m_A60 += m_A56 * f20_21;
-	RHS21 += f20_21 * RHS20;
-	const double f20_34 = -f20 * m_A117;
-	m_A118 += m_A56 * f20_34;
-	RHS34 += f20_34 * RHS20;
-	const double f21 = 1.0 / m_A60;
-	const double f21_25 = -f21 * m_A74;
-	m_A76 += m_A61 * f21_25;
-	m_A78 += m_A62 * f21_25;
+	const double f12_43 = -f12 * m_A189;
+	m_A191 += m_A41 * f12_43;
+	m_A192 += m_A42 * f12_43;
+	m_A195 += m_A43 * f12_43;
+	RHS43 += f12_43 * RHS12;
+	const double f13 = 1.0 / m_A44;
+	const double f13_31 = -f13 * m_A104;
+	m_A105 += m_A45 * f13_31;
+	m_A107 += m_A46 * f13_31;
+	RHS31 += f13_31 * RHS13;
+	const double f14 = 1.0 / m_A47;
+	const double f14_37 = -f14 * m_A144;
+	m_A145 += m_A48 * f14_37;
+	RHS37 += f14_37 * RHS14;
+	const double f15 = 1.0 / m_A49;
+	const double f15_40 = -f15 * m_A166;
+	m_A172 += m_A50 * f15_40;
+	RHS40 += f15_40 * RHS15;
+	const double f16 = 1.0 / m_A51;
+	const double f16_32 = -f16 * m_A109;
+	m_A113 += m_A52 * f16_32;
+	RHS32 += f16_32 * RHS16;
+	const double f17 = 1.0 / m_A53;
+	const double f17_33 = -f17 * m_A116;
+	m_A119 += m_A54 * f17_33;
+	m_A124 += m_A55 * f17_33;
+	RHS33 += f17_33 * RHS17;
+	const double f18 = 1.0 / m_A56;
+	const double f18_29 = -f18 * m_A92;
+	m_A94 += m_A57 * f18_29;
+	RHS29 += f18_29 * RHS18;
+	const double f19 = 1.0 / m_A58;
+	const double f19_33 = -f19 * m_A117;
+	m_A119 += m_A59 * f19_33;
+	m_A120 += m_A60 * f19_33;
+	m_A122 += m_A61 * f19_33;
+	RHS33 += f19_33 * RHS19;
+	const double f19_36 = -f19 * m_A135;
+	m_A136 += m_A59 * f19_36;
+	m_A137 += m_A60 * f19_36;
+	m_A140 += m_A61 * f19_36;
+	RHS36 += f19_36 * RHS19;
+	const double f19_46 = -f19 * m_A215;
+	m_A216 += m_A59 * f19_46;
+	m_A218 += m_A60 * f19_46;
+	m_A222 += m_A61 * f19_46;
+	RHS46 += f19_46 * RHS19;
+	const double f20 = 1.0 / m_A62;
+	const double f20_33 = -f20 * m_A118;
+	m_A119 += m_A63 * f20_33;
+	m_A123 += m_A64 * f20_33;
+	RHS33 += f20_33 * RHS20;
+	const double f20_47 = -f20 * m_A228;
+	m_A232 += m_A63 * f20_47;
+	m_A241 += m_A64 * f20_47;
+	RHS47 += f20_47 * RHS20;
+	const double f21 = 1.0 / m_A65;
+	const double f21_41 = -f21 * m_A180;
+	m_A182 += m_A66 * f21_41;
+	RHS41 += f21_41 * RHS21;
+	const double f22 = 1.0 / m_A67;
+	const double f22_29 = -f22 * m_A93;
+	m_A94 += m_A68 * f22_29;
+	m_A95 += m_A69 * f22_29;
+	RHS29 += f22_29 * RHS22;
+	const double f22_47 = -f22 * m_A229;
+	m_A231 += m_A68 * f22_47;
+	m_A241 += m_A69 * f22_47;
+	RHS47 += f22_47 * RHS22;
+	const double f23 = 1.0 / m_A70;
+	const double f23_38 = -f23 * m_A147;
+	m_A149 += m_A71 * f23_38;
+	RHS38 += f23_38 * RHS23;
+	const double f23_42 = -f23 * m_A183;
+	m_A186 += m_A71 * f23_42;
+	RHS42 += f23_42 * RHS23;
+	const double f24 = 1.0 / m_A74;
+	const double f24_26 = -f24 * m_A81;
+	m_A82 += m_A75 * f24_26;
+	m_A83 += m_A76 * f24_26;
+	RHS26 += f24_26 * RHS24;
+	const double f24_39 = -f24 * m_A153;
+	m_A154 += m_A75 * f24_39;
+	m_A158 += m_A76 * f24_39;
+	RHS39 += f24_39 * RHS24;
+	const double f25 = 1.0 / m_A77;
+	const double f25_42 = -f25 * m_A184;
+	m_A186 += m_A78 * f25_42;
+	m_A187 += m_A79 * f25_42;
+	RHS42 += f25_42 * RHS25;
+	const double f25_47 = -f25 * m_A230;
+	m_A238 += m_A78 * f25_47;
+	m_A241 += m_A79 * f25_47;
+	RHS47 += f25_47 * RHS25;
+	const double f26 = 1.0 / m_A82;
+	const double f26_39 = -f26 * m_A154;
+	m_A158 += m_A83 * f26_39;
+	RHS39 += f26_39 * RHS26;
+	const double f27 = 1.0 / m_A85;
+	const double f27_44 = -f27 * m_A204;
+	m_A205 += m_A86 * f27_44;
+	m_A207 += m_A87 * f27_44;
+	RHS44 += f27_44 * RHS27;
+	const double f27_49 = -f27 * m_A263;
+	m_A269 += m_A86 * f27_49;
+	m_A273 += m_A87 * f27_49;
+	RHS49 += f27_49 * RHS27;
+	const double f28 = 1.0 / m_A89;
+	const double f28_43 = -f28 * m_A190;
+	m_A195 += m_A90 * f28_43;
+	m_A198 += m_A91 * f28_43;
+	RHS43 += f28_43 * RHS28;
+	const double f28_48 = -f28 * m_A248;
+	m_A253 += m_A90 * f28_48;
+	m_A257 += m_A91 * f28_48;
+	RHS48 += f28_48 * RHS28;
+	const double f29 = 1.0 / m_A94;
+	const double f29_47 = -f29 * m_A231;
+	m_A241 += m_A95 * f29_47;
+	RHS47 += f29_47 * RHS29;
+	const double f30 = 1.0 / m_A99;
+	const double f30_32 = -f30 * m_A110;
+	m_A111 += m_A100 * f30_32;
+	m_A112 += m_A101 * f30_32;
+	m_A114 += m_A102 * f30_32;
+	m_A115 += m_A103 * f30_32;
+	RHS32 += f30_32 * RHS30;
+	const double f30_39 = -f30 * m_A155;
+	m_A156 += m_A100 * f30_39;
+	m_A158 += m_A101 * f30_39;
+	m_A160 += m_A102 * f30_39;
+	m_A164 += m_A103 * f30_39;
+	RHS39 += f30_39 * RHS30;
+	const double f30_43 = -f30 * m_A191;
+	m_A192 += m_A100 * f30_43;
+	m_A193 += m_A101 * f30_43;
+	m_A195 += m_A102 * f30_43;
+	m_A199 += m_A103 * f30_43;
+	RHS43 += f30_43 * RHS30;
+	const double f30_49 = -f30 * m_A264;
+	m_A265 += m_A100 * f30_49;
+	m_A266 += m_A101 * f30_49;
+	m_A268 += m_A102 * f30_49;
+	m_A273 += m_A103 * f30_49;
+	RHS49 += f30_49 * RHS30;
+	const double f31 = 1.0 / m_A105;
+	const double f31_40 = -f31 * m_A167;
+	m_A172 += m_A106 * f31_40;
+	m_A179 += m_A107 * f31_40;
+	RHS40 += f31_40 * RHS31;
+	const double f31_51 = -f31 * m_A292;
+	m_A294 += m_A106 * f31_51;
+	m_A302 += m_A107 * f31_51;
+	RHS51 += f31_51 * RHS31;
+	const double f32 = 1.0 / m_A111;
+	const double f32_39 = -f32 * m_A156;
+	m_A158 += m_A112 * f32_39;
+	m_A159 += m_A113 * f32_39;
+	m_A160 += m_A114 * f32_39;
+	m_A164 += m_A115 * f32_39;
+	RHS39 += f32_39 * RHS32;
+	const double f32_40 = -f32 * m_A168;
+	m_A171 += m_A112 * f32_40;
+	m_A172 += m_A113 * f32_40;
+	m_A173 += m_A114 * f32_40;
+	m_A177 += m_A115 * f32_40;
+	RHS40 += f32_40 * RHS32;
+	const double f32_43 = -f32 * m_A192;
+	m_A193 += m_A112 * f32_43;
+	m_A194 += m_A113 * f32_43;
+	m_A195 += m_A114 * f32_43;
+	m_A199 += m_A115 * f32_43;
+	RHS43 += f32_43 * RHS32;
+	const double f32_49 = -f32 * m_A265;
+	m_A266 += m_A112 * f32_49;
+	m_A267 += m_A113 * f32_49;
+	m_A268 += m_A114 * f32_49;
+	m_A273 += m_A115 * f32_49;
+	RHS49 += f32_49 * RHS32;
+	const double f33 = 1.0 / m_A119;
+	const double f33_36 = -f33 * m_A136;
+	m_A137 += m_A120 * f33_36;
+	m_A139 += m_A121 * f33_36;
+	m_A140 += m_A122 * f33_36;
+	m_A141 += m_A123 * f33_36;
+	m_A142 += m_A124 * f33_36;
+	RHS36 += f33_36 * RHS33;
+	const double f33_40 = -f33 * m_A169;
+	m_A170 += m_A120 * f33_40;
+	m_A172 += m_A121 * f33_40;
+	m_A174 += m_A122 * f33_40;
+	m_A175 += m_A123 * f33_40;
+	m_A176 += m_A124 * f33_40;
+	RHS40 += f33_40 * RHS33;
+	const double f33_46 = -f33 * m_A216;
+	m_A218 += m_A120 * f33_46;
+	m_A220 += m_A121 * f33_46;
+	m_A222 += m_A122 * f33_46;
+	m_A223 += m_A123 * f33_46;
+	m_A224 += m_A124 * f33_46;
+	RHS46 += f33_46 * RHS33;
+	const double f33_47 = -f33 * m_A232;
+	m_A233 += m_A120 * f33_47;
+	m_A236 += m_A121 * f33_47;
+	m_A240 += m_A122 * f33_47;
+	m_A241 += m_A123 * f33_47;
+	m_A242 += m_A124 * f33_47;
+	RHS47 += f33_47 * RHS33;
+	const double f33_48 = -f33 * m_A249;
+	m_A250 += m_A120 * f33_48;
+	m_A252 += m_A121 * f33_48;
+	m_A255 += m_A122 * f33_48;
+	m_A256 += m_A123 * f33_48;
+	m_A257 += m_A124 * f33_48;
+	RHS48 += f33_48 * RHS33;
+	const double f34 = 1.0 / m_A126;
+	const double f34_45 = -f34 * m_A210;
+	m_A211 += m_A127 * f34_45;
+	m_A212 += m_A128 * f34_45;
+	RHS45 += f34_45 * RHS34;
+	const double f34_50 = -f34 * m_A278;
+	m_A283 += m_A127 * f34_50;
+	m_A288 += m_A128 * f34_50;
+	RHS50 += f34_50 * RHS34;
+	const double f35 = 1.0 / m_A130;
+	const double f35_46 = -f35 * m_A217;
+	m_A222 += m_A131 * f35_46;
+	m_A227 += m_A132 * f35_46;
+	RHS46 += f35_46 * RHS35;
+	const double f35_51 = -f35 * m_A293;
+	m_A297 += m_A131 * f35_51;
+	m_A302 += m_A132 * f35_51;
+	RHS51 += f35_51 * RHS35;
+	const double f36 = 1.0 / m_A137;
+	const double f36_39 = -f36 * m_A157;
+	m_A158 += m_A138 * f36_39;
+	m_A159 += m_A139 * f36_39;
+	m_A161 += m_A140 * f36_39;
+	m_A162 += m_A141 * f36_39;
+	m_A163 += m_A142 * f36_39;
+	m_A165 += m_A143 * f36_39;
+	RHS39 += f36_39 * RHS36;
+	const double f36_40 = -f36 * m_A170;
+	m_A171 += m_A138 * f36_40;
+	m_A172 += m_A139 * f36_40;
+	m_A174 += m_A140 * f36_40;
+	m_A175 += m_A141 * f36_40;
+	m_A176 += m_A142 * f36_40;
+	m_A178 += m_A143 * f36_40;
+	RHS40 += f36_40 * RHS36;
+	const double f36_46 = -f36 * m_A218;
+	m_A219 += m_A138 * f36_46;
+	m_A220 += m_A139 * f36_46;
+	m_A222 += m_A140 * f36_46;
+	m_A223 += m_A141 * f36_46;
+	m_A224 += m_A142 * f36_46;
+	m_A226 += m_A143 * f36_46;
+	RHS46 += f36_46 * RHS36;
+	const double f36_47 = -f36 * m_A233;
+	m_A235 += m_A138 * f36_47;
+	m_A236 += m_A139 * f36_47;
+	m_A240 += m_A140 * f36_47;
+	m_A241 += m_A141 * f36_47;
+	m_A242 += m_A142 * f36_47;
+	m_A244 += m_A143 * f36_47;
+	RHS47 += f36_47 * RHS36;
+	const double f36_48 = -f36 * m_A250;
+	m_A251 += m_A138 * f36_48;
+	m_A252 += m_A139 * f36_48;
+	m_A255 += m_A140 * f36_48;
+	m_A256 += m_A141 * f36_48;
+	m_A257 += m_A142 * f36_48;
+	m_A259 += m_A143 * f36_48;
+	RHS48 += f36_48 * RHS36;
+	const double f36_50 = -f36 * m_A279;
+	m_A280 += m_A138 * f36_50;
+	m_A281 += m_A139 * f36_50;
+	m_A284 += m_A140 * f36_50;
+	m_A285 += m_A141 * f36_50;
+	m_A286 += m_A142 * f36_50;
+	m_A288 += m_A143 * f36_50;
+	RHS50 += f36_50 * RHS36;
+	const double f37 = 1.0 / m_A145;
+	const double f37_47 = -f37 * m_A234;
+	m_A241 += m_A146 * f37_47;
+	RHS47 += f37_47 * RHS37;
+	const double f38 = 1.0 / m_A148;
+	const double f38_42 = -f38 * m_A185;
+	m_A186 += m_A149 * f38_42;
+	RHS42 += f38_42 * RHS38;
+	const double f39 = 1.0 / m_A158;
+	const double f39_40 = -f39 * m_A171;
+	m_A172 += m_A159 * f39_40;
+	m_A173 += m_A160 * f39_40;
+	m_A174 += m_A161 * f39_40;
+	m_A175 += m_A162 * f39_40;
+	m_A176 += m_A163 * f39_40;
+	m_A177 += m_A164 * f39_40;
+	m_A178 += m_A165 * f39_40;
+	RHS40 += f39_40 * RHS39;
+	const double f39_43 = -f39 * m_A193;
+	m_A194 += m_A159 * f39_43;
+	m_A195 += m_A160 * f39_43;
+	m_A196 += m_A161 * f39_43;
+	m_A197 += m_A162 * f39_43;
+	m_A198 += m_A163 * f39_43;
+	m_A199 += m_A164 * f39_43;
+	m_A200 += m_A165 * f39_43;
+	RHS43 += f39_43 * RHS39;
+	const double f39_46 = -f39 * m_A219;
+	m_A220 += m_A159 * f39_46;
+	m_A221 += m_A160 * f39_46;
+	m_A222 += m_A161 * f39_46;
+	m_A223 += m_A162 * f39_46;
+	m_A224 += m_A163 * f39_46;
+	m_A225 += m_A164 * f39_46;
+	m_A226 += m_A165 * f39_46;
+	RHS46 += f39_46 * RHS39;
+	const double f39_47 = -f39 * m_A235;
+	m_A236 += m_A159 * f39_47;
+	m_A239 += m_A160 * f39_47;
+	m_A240 += m_A161 * f39_47;
+	m_A241 += m_A162 * f39_47;
+	m_A242 += m_A163 * f39_47;
+	m_A243 += m_A164 * f39_47;
+	m_A244 += m_A165 * f39_47;
+	RHS47 += f39_47 * RHS39;
+	const double f39_48 = -f39 * m_A251;
+	m_A252 += m_A159 * f39_48;
+	m_A253 += m_A160 * f39_48;
+	m_A255 += m_A161 * f39_48;
+	m_A256 += m_A162 * f39_48;
+	m_A257 += m_A163 * f39_48;
+	m_A258 += m_A164 * f39_48;
+	m_A259 += m_A165 * f39_48;
+	RHS48 += f39_48 * RHS39;
+	const double f39_49 = -f39 * m_A266;
+	m_A267 += m_A159 * f39_49;
+	m_A268 += m_A160 * f39_49;
+	m_A270 += m_A161 * f39_49;
+	m_A271 += m_A162 * f39_49;
+	m_A272 += m_A163 * f39_49;
+	m_A273 += m_A164 * f39_49;
+	m_A274 += m_A165 * f39_49;
+	RHS49 += f39_49 * RHS39;
+	const double f39_50 = -f39 * m_A280;
+	m_A281 += m_A159 * f39_50;
+	m_A282 += m_A160 * f39_50;
+	m_A284 += m_A161 * f39_50;
+	m_A285 += m_A162 * f39_50;
+	m_A286 += m_A163 * f39_50;
+	m_A287 += m_A164 * f39_50;
+	m_A288 += m_A165 * f39_50;
+	RHS50 += f39_50 * RHS39;
+	const double f40 = 1.0 / m_A172;
+	const double f40_43 = -f40 * m_A194;
+	m_A195 += m_A173 * f40_43;
+	m_A196 += m_A174 * f40_43;
+	m_A197 += m_A175 * f40_43;
+	m_A198 += m_A176 * f40_43;
+	m_A199 += m_A177 * f40_43;
+	m_A200 += m_A178 * f40_43;
+	m_A201 += m_A179 * f40_43;
+	RHS43 += f40_43 * RHS40;
+	const double f40_46 = -f40 * m_A220;
+	m_A221 += m_A173 * f40_46;
+	m_A222 += m_A174 * f40_46;
+	m_A223 += m_A175 * f40_46;
+	m_A224 += m_A176 * f40_46;
+	m_A225 += m_A177 * f40_46;
+	m_A226 += m_A178 * f40_46;
+	m_A227 += m_A179 * f40_46;
+	RHS46 += f40_46 * RHS40;
+	const double f40_47 = -f40 * m_A236;
+	m_A239 += m_A173 * f40_47;
+	m_A240 += m_A174 * f40_47;
+	m_A241 += m_A175 * f40_47;
+	m_A242 += m_A176 * f40_47;
+	m_A243 += m_A177 * f40_47;
+	m_A244 += m_A178 * f40_47;
+	m_A245 += m_A179 * f40_47;
+	RHS47 += f40_47 * RHS40;
+	const double f40_48 = -f40 * m_A252;
+	m_A253 += m_A173 * f40_48;
+	m_A255 += m_A174 * f40_48;
+	m_A256 += m_A175 * f40_48;
+	m_A257 += m_A176 * f40_48;
+	m_A258 += m_A177 * f40_48;
+	m_A259 += m_A178 * f40_48;
+	m_A260 += m_A179 * f40_48;
+	RHS48 += f40_48 * RHS40;
+	const double f40_49 = -f40 * m_A267;
+	m_A268 += m_A173 * f40_49;
+	m_A270 += m_A174 * f40_49;
+	m_A271 += m_A175 * f40_49;
+	m_A272 += m_A176 * f40_49;
+	m_A273 += m_A177 * f40_49;
+	m_A274 += m_A178 * f40_49;
+	m_A275 += m_A179 * f40_49;
+	RHS49 += f40_49 * RHS40;
+	const double f40_50 = -f40 * m_A281;
+	m_A282 += m_A173 * f40_50;
+	m_A284 += m_A174 * f40_50;
+	m_A285 += m_A175 * f40_50;
+	m_A286 += m_A176 * f40_50;
+	m_A287 += m_A177 * f40_50;
+	m_A288 += m_A178 * f40_50;
+	m_A289 += m_A179 * f40_50;
+	RHS50 += f40_50 * RHS40;
+	const double f40_51 = -f40 * m_A294;
+	m_A295 += m_A173 * f40_51;
+	m_A297 += m_A174 * f40_51;
+	m_A298 += m_A175 * f40_51;
+	m_A299 += m_A176 * f40_51;
+	m_A300 += m_A177 * f40_51;
+	m_A301 += m_A178 * f40_51;
+	m_A302 += m_A179 * f40_51;
+	RHS51 += f40_51 * RHS40;
+	const double f41 = 1.0 / m_A181;
+	const double f41_47 = -f41 * m_A237;
+	m_A241 += m_A182 * f41_47;
+	RHS47 += f41_47 * RHS41;
+	const double f42 = 1.0 / m_A186;
+	const double f42_47 = -f42 * m_A238;
+	m_A241 += m_A187 * f42_47;
+	RHS47 += f42_47 * RHS42;
+	const double f43 = 1.0 / m_A195;
+	const double f43_46 = -f43 * m_A221;
+	m_A222 += m_A196 * f43_46;
+	m_A223 += m_A197 * f43_46;
+	m_A224 += m_A198 * f43_46;
+	m_A225 += m_A199 * f43_46;
+	m_A226 += m_A200 * f43_46;
+	m_A227 += m_A201 * f43_46;
+	RHS46 += f43_46 * RHS43;
+	const double f43_47 = -f43 * m_A239;
+	m_A240 += m_A196 * f43_47;
+	m_A241 += m_A197 * f43_47;
+	m_A242 += m_A198 * f43_47;
+	m_A243 += m_A199 * f43_47;
+	m_A244 += m_A200 * f43_47;
+	m_A245 += m_A201 * f43_47;
+	RHS47 += f43_47 * RHS43;
+	const double f43_48 = -f43 * m_A253;
+	m_A255 += m_A196 * f43_48;
+	m_A256 += m_A197 * f43_48;
+	m_A257 += m_A198 * f43_48;
+	m_A258 += m_A199 * f43_48;
+	m_A259 += m_A200 * f43_48;
+	m_A260 += m_A201 * f43_48;
+	RHS48 += f43_48 * RHS43;
+	const double f43_49 = -f43 * m_A268;
+	m_A270 += m_A196 * f43_49;
+	m_A271 += m_A197 * f43_49;
+	m_A272 += m_A198 * f43_49;
+	m_A273 += m_A199 * f43_49;
+	m_A274 += m_A200 * f43_49;
+	m_A275 += m_A201 * f43_49;
+	RHS49 += f43_49 * RHS43;
+	const double f43_50 = -f43 * m_A282;
+	m_A284 += m_A196 * f43_50;
+	m_A285 += m_A197 * f43_50;
+	m_A286 += m_A198 * f43_50;
+	m_A287 += m_A199 * f43_50;
+	m_A288 += m_A200 * f43_50;
+	m_A289 += m_A201 * f43_50;
+	RHS50 += f43_50 * RHS43;
+	const double f43_51 = -f43 * m_A295;
+	m_A297 += m_A196 * f43_51;
+	m_A298 += m_A197 * f43_51;
+	m_A299 += m_A198 * f43_51;
+	m_A300 += m_A199 * f43_51;
+	m_A301 += m_A200 * f43_51;
+	m_A302 += m_A201 * f43_51;
+	RHS51 += f43_51 * RHS43;
+	const double f44 = 1.0 / m_A205;
+	const double f44_48 = -f44 * m_A254;
+	m_A257 += m_A206 * f44_48;
+	m_A258 += m_A207 * f44_48;
+	RHS48 += f44_48 * RHS44;
+	const double f44_49 = -f44 * m_A269;
+	m_A272 += m_A206 * f44_49;
+	m_A273 += m_A207 * f44_49;
+	RHS49 += f44_49 * RHS44;
+	const double f45 = 1.0 / m_A211;
+	const double f45_50 = -f45 * m_A283;
+	m_A288 += m_A212 * f45_50;
+	m_A289 += m_A213 * f45_50;
+	RHS50 += f45_50 * RHS45;
+	const double f45_51 = -f45 * m_A296;
+	m_A301 += m_A212 * f45_51;
+	m_A302 += m_A213 * f45_51;
+	RHS51 += f45_51 * RHS45;
+	const double f46 = 1.0 / m_A222;
+	const double f46_47 = -f46 * m_A240;
+	m_A241 += m_A223 * f46_47;
+	m_A242 += m_A224 * f46_47;
+	m_A243 += m_A225 * f46_47;
+	m_A244 += m_A226 * f46_47;
+	m_A245 += m_A227 * f46_47;
+	RHS47 += f46_47 * RHS46;
+	const double f46_48 = -f46 * m_A255;
+	m_A256 += m_A223 * f46_48;
+	m_A257 += m_A224 * f46_48;
+	m_A258 += m_A225 * f46_48;
+	m_A259 += m_A226 * f46_48;
+	m_A260 += m_A227 * f46_48;
+	RHS48 += f46_48 * RHS46;
+	const double f46_49 = -f46 * m_A270;
+	m_A271 += m_A223 * f46_49;
+	m_A272 += m_A224 * f46_49;
+	m_A273 += m_A225 * f46_49;
+	m_A274 += m_A226 * f46_49;
+	m_A275 += m_A227 * f46_49;
+	RHS49 += f46_49 * RHS46;
+	const double f46_50 = -f46 * m_A284;
+	m_A285 += m_A223 * f46_50;
+	m_A286 += m_A224 * f46_50;
+	m_A287 += m_A225 * f46_50;
+	m_A288 += m_A226 * f46_50;
+	m_A289 += m_A227 * f46_50;
+	RHS50 += f46_50 * RHS46;
+	const double f46_51 = -f46 * m_A297;
+	m_A298 += m_A223 * f46_51;
+	m_A299 += m_A224 * f46_51;
+	m_A300 += m_A225 * f46_51;
+	m_A301 += m_A226 * f46_51;
+	m_A302 += m_A227 * f46_51;
+	RHS51 += f46_51 * RHS46;
+	const double f47 = 1.0 / m_A241;
+	const double f47_48 = -f47 * m_A256;
+	m_A257 += m_A242 * f47_48;
+	m_A258 += m_A243 * f47_48;
+	m_A259 += m_A244 * f47_48;
+	m_A260 += m_A245 * f47_48;
+	RHS48 += f47_48 * RHS47;
+	const double f47_49 = -f47 * m_A271;
+	m_A272 += m_A242 * f47_49;
+	m_A273 += m_A243 * f47_49;
+	m_A274 += m_A244 * f47_49;
+	m_A275 += m_A245 * f47_49;
+	RHS49 += f47_49 * RHS47;
+	const double f47_50 = -f47 * m_A285;
+	m_A286 += m_A242 * f47_50;
+	m_A287 += m_A243 * f47_50;
+	m_A288 += m_A244 * f47_50;
+	m_A289 += m_A245 * f47_50;
+	RHS50 += f47_50 * RHS47;
+	const double f47_51 = -f47 * m_A298;
+	m_A299 += m_A242 * f47_51;
+	m_A300 += m_A243 * f47_51;
+	m_A301 += m_A244 * f47_51;
+	m_A302 += m_A245 * f47_51;
+	RHS51 += f47_51 * RHS47;
+	const double f48 = 1.0 / m_A257;
+	const double f48_49 = -f48 * m_A272;
+	m_A273 += m_A258 * f48_49;
+	m_A274 += m_A259 * f48_49;
+	m_A275 += m_A260 * f48_49;
+	RHS49 += f48_49 * RHS48;
+	const double f48_50 = -f48 * m_A286;
+	m_A287 += m_A258 * f48_50;
+	m_A288 += m_A259 * f48_50;
+	m_A289 += m_A260 * f48_50;
+	RHS50 += f48_50 * RHS48;
+	const double f48_51 = -f48 * m_A299;
+	m_A300 += m_A258 * f48_51;
+	m_A301 += m_A259 * f48_51;
+	m_A302 += m_A260 * f48_51;
+	RHS51 += f48_51 * RHS48;
+	const double f49 = 1.0 / m_A273;
+	const double f49_50 = -f49 * m_A287;
+	m_A288 += m_A274 * f49_50;
+	m_A289 += m_A275 * f49_50;
+	RHS50 += f49_50 * RHS49;
+	const double f49_51 = -f49 * m_A300;
+	m_A301 += m_A274 * f49_51;
+	m_A302 += m_A275 * f49_51;
+	RHS51 += f49_51 * RHS49;
+	const double f50 = 1.0 / m_A288;
+	const double f50_51 = -f50 * m_A301;
+	m_A302 += m_A289 * f50_51;
+	RHS51 += f50_51 * RHS50;
+	V[51] = RHS51 / m_A302;
+	double tmp50 = 0.0;
+	tmp50 += m_A289 * V[51];
+	V[50] = (RHS50 - tmp50) / m_A288;
+	double tmp49 = 0.0;
+	tmp49 += m_A274 * V[50];
+	tmp49 += m_A275 * V[51];
+	V[49] = (RHS49 - tmp49) / m_A273;
+	double tmp48 = 0.0;
+	tmp48 += m_A258 * V[49];
+	tmp48 += m_A259 * V[50];
+	tmp48 += m_A260 * V[51];
+	V[48] = (RHS48 - tmp48) / m_A257;
+	double tmp47 = 0.0;
+	tmp47 += m_A242 * V[48];
+	tmp47 += m_A243 * V[49];
+	tmp47 += m_A244 * V[50];
+	tmp47 += m_A245 * V[51];
+	V[47] = (RHS47 - tmp47) / m_A241;
+	double tmp46 = 0.0;
+	tmp46 += m_A223 * V[47];
+	tmp46 += m_A224 * V[48];
+	tmp46 += m_A225 * V[49];
+	tmp46 += m_A226 * V[50];
+	tmp46 += m_A227 * V[51];
+	V[46] = (RHS46 - tmp46) / m_A222;
+	double tmp45 = 0.0;
+	tmp45 += m_A212 * V[50];
+	tmp45 += m_A213 * V[51];
+	V[45] = (RHS45 - tmp45) / m_A211;
+	double tmp44 = 0.0;
+	tmp44 += m_A206 * V[48];
+	tmp44 += m_A207 * V[49];
+	V[44] = (RHS44 - tmp44) / m_A205;
+	double tmp43 = 0.0;
+	tmp43 += m_A196 * V[46];
+	tmp43 += m_A197 * V[47];
+	tmp43 += m_A198 * V[48];
+	tmp43 += m_A199 * V[49];
+	tmp43 += m_A200 * V[50];
+	tmp43 += m_A201 * V[51];
+	V[43] = (RHS43 - tmp43) / m_A195;
+	double tmp42 = 0.0;
+	tmp42 += m_A187 * V[47];
+	V[42] = (RHS42 - tmp42) / m_A186;
+	double tmp41 = 0.0;
+	tmp41 += m_A182 * V[47];
+	V[41] = (RHS41 - tmp41) / m_A181;
+	double tmp40 = 0.0;
+	tmp40 += m_A173 * V[43];
+	tmp40 += m_A174 * V[46];
+	tmp40 += m_A175 * V[47];
+	tmp40 += m_A176 * V[48];
+	tmp40 += m_A177 * V[49];
+	tmp40 += m_A178 * V[50];
+	tmp40 += m_A179 * V[51];
+	V[40] = (RHS40 - tmp40) / m_A172;
+	double tmp39 = 0.0;
+	tmp39 += m_A159 * V[40];
+	tmp39 += m_A160 * V[43];
+	tmp39 += m_A161 * V[46];
+	tmp39 += m_A162 * V[47];
+	tmp39 += m_A163 * V[48];
+	tmp39 += m_A164 * V[49];
+	tmp39 += m_A165 * V[50];
+	V[39] = (RHS39 - tmp39) / m_A158;
+	double tmp38 = 0.0;
+	tmp38 += m_A149 * V[42];
+	V[38] = (RHS38 - tmp38) / m_A148;
+	double tmp37 = 0.0;
+	tmp37 += m_A146 * V[47];
+	V[37] = (RHS37 - tmp37) / m_A145;
+	double tmp36 = 0.0;
+	tmp36 += m_A138 * V[39];
+	tmp36 += m_A139 * V[40];
+	tmp36 += m_A140 * V[46];
+	tmp36 += m_A141 * V[47];
+	tmp36 += m_A142 * V[48];
+	tmp36 += m_A143 * V[50];
+	V[36] = (RHS36 - tmp36) / m_A137;
+	double tmp35 = 0.0;
+	tmp35 += m_A131 * V[46];
+	tmp35 += m_A132 * V[51];
+	V[35] = (RHS35 - tmp35) / m_A130;
+	double tmp34 = 0.0;
+	tmp34 += m_A127 * V[45];
+	tmp34 += m_A128 * V[50];
+	V[34] = (RHS34 - tmp34) / m_A126;
+	double tmp33 = 0.0;
+	tmp33 += m_A120 * V[36];
+	tmp33 += m_A121 * V[40];
+	tmp33 += m_A122 * V[46];
+	tmp33 += m_A123 * V[47];
+	tmp33 += m_A124 * V[48];
+	V[33] = (RHS33 - tmp33) / m_A119;
+	double tmp32 = 0.0;
+	tmp32 += m_A112 * V[39];
+	tmp32 += m_A113 * V[40];
+	tmp32 += m_A114 * V[43];
+	tmp32 += m_A115 * V[49];
+	V[32] = (RHS32 - tmp32) / m_A111;
+	double tmp31 = 0.0;
+	tmp31 += m_A106 * V[40];
+	tmp31 += m_A107 * V[51];
+	V[31] = (RHS31 - tmp31) / m_A105;
+	double tmp30 = 0.0;
+	tmp30 += m_A100 * V[32];
+	tmp30 += m_A101 * V[39];
+	tmp30 += m_A102 * V[43];
+	tmp30 += m_A103 * V[49];
+	V[30] = (RHS30 - tmp30) / m_A99;
+	double tmp29 = 0.0;
+	tmp29 += m_A95 * V[47];
+	V[29] = (RHS29 - tmp29) / m_A94;
+	double tmp28 = 0.0;
+	tmp28 += m_A90 * V[43];
+	tmp28 += m_A91 * V[48];
+	V[28] = (RHS28 - tmp28) / m_A89;
+	double tmp27 = 0.0;
+	tmp27 += m_A86 * V[44];
+	tmp27 += m_A87 * V[49];
+	V[27] = (RHS27 - tmp27) / m_A85;
+	double tmp26 = 0.0;
+	tmp26 += m_A83 * V[39];
+	V[26] = (RHS26 - tmp26) / m_A82;
+	double tmp25 = 0.0;
+	tmp25 += m_A78 * V[42];
+	tmp25 += m_A79 * V[47];
+	V[25] = (RHS25 - tmp25) / m_A77;
+	double tmp24 = 0.0;
+	tmp24 += m_A75 * V[26];
+	tmp24 += m_A76 * V[39];
+	V[24] = (RHS24 - tmp24) / m_A74;
+	double tmp23 = 0.0;
+	tmp23 += m_A71 * V[42];
+	V[23] = (RHS23 - tmp23) / m_A70;
+	double tmp22 = 0.0;
+	tmp22 += m_A68 * V[29];
+	tmp22 += m_A69 * V[47];
+	V[22] = (RHS22 - tmp22) / m_A67;
+	double tmp21 = 0.0;
+	tmp21 += m_A66 * V[47];
+	V[21] = (RHS21 - tmp21) / m_A65;
+	double tmp20 = 0.0;
+	tmp20 += m_A63 * V[33];
+	tmp20 += m_A64 * V[47];
+	V[20] = (RHS20 - tmp20) / m_A62;
+	double tmp19 = 0.0;
+	tmp19 += m_A59 * V[33];
+	tmp19 += m_A60 * V[36];
+	tmp19 += m_A61 * V[46];
+	V[19] = (RHS19 - tmp19) / m_A58;
+	double tmp18 = 0.0;
+	tmp18 += m_A57 * V[29];
+	V[18] = (RHS18 - tmp18) / m_A56;
+	double tmp17 = 0.0;
+	tmp17 += m_A54 * V[33];
+	tmp17 += m_A55 * V[48];
+	V[17] = (RHS17 - tmp17) / m_A53;
+	double tmp16 = 0.0;
+	tmp16 += m_A52 * V[40];
+	V[16] = (RHS16 - tmp16) / m_A51;
+	double tmp15 = 0.0;
+	tmp15 += m_A50 * V[40];
+	V[15] = (RHS15 - tmp15) / m_A49;
+	double tmp14 = 0.0;
+	tmp14 += m_A48 * V[37];
+	V[14] = (RHS14 - tmp14) / m_A47;
+	double tmp13 = 0.0;
+	tmp13 += m_A45 * V[31];
+	tmp13 += m_A46 * V[51];
+	V[13] = (RHS13 - tmp13) / m_A44;
+	double tmp12 = 0.0;
+	tmp12 += m_A41 * V[30];
+	tmp12 += m_A42 * V[32];
+	tmp12 += m_A43 * V[43];
+	V[12] = (RHS12 - tmp12) / m_A40;
+	double tmp11 = 0.0;
+	tmp11 += m_A38 * V[36];
+	tmp11 += m_A39 * V[50];
+	V[11] = (RHS11 - tmp11) / m_A37;
+	double tmp10 = 0.0;
+	tmp10 += m_A35 * V[36];
+	tmp10 += m_A36 * V[39];
+	V[10] = (RHS10 - tmp10) / m_A34;
+	double tmp9 = 0.0;
+	tmp9 += m_A31 * V[24];
+	tmp9 += m_A32 * V[26];
+	tmp9 += m_A33 * V[39];
+	V[9] = (RHS9 - tmp9) / m_A30;
+	double tmp8 = 0.0;
+	tmp8 += m_A28 * V[30];
+	tmp8 += m_A29 * V[39];
+	V[8] = (RHS8 - tmp8) / m_A27;
+	double tmp7 = 0.0;
+	tmp7 += m_A24 * V[35];
+	tmp7 += m_A25 * V[46];
+	tmp7 += m_A26 * V[51];
+	V[7] = (RHS7 - tmp7) / m_A23;
+	double tmp6 = 0.0;
+	tmp6 += m_A22 * V[24];
+	V[6] = (RHS6 - tmp6) / m_A21;
+	double tmp5 = 0.0;
+	tmp5 += m_A18 * V[34];
+	tmp5 += m_A19 * V[45];
+	tmp5 += m_A20 * V[50];
+	V[5] = (RHS5 - tmp5) / m_A17;
+	double tmp4 = 0.0;
+	tmp4 += m_A15 * V[45];
+	tmp4 += m_A16 * V[51];
+	V[4] = (RHS4 - tmp4) / m_A14;
+	double tmp3 = 0.0;
+	tmp3 += m_A12 * V[30];
+	tmp3 += m_A13 * V[49];
+	V[3] = (RHS3 - tmp3) / m_A11;
+	double tmp2 = 0.0;
+	tmp2 += m_A8 * V[28];
+	tmp2 += m_A9 * V[43];
+	tmp2 += m_A10 * V[48];
+	V[2] = (RHS2 - tmp2) / m_A7;
+	double tmp1 = 0.0;
+	tmp1 += m_A5 * V[44];
+	tmp1 += m_A6 * V[48];
+	V[1] = (RHS1 - tmp1) / m_A4;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[27];
+	tmp0 += m_A2 * V[44];
+	tmp0 += m_A3 * V[49];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// konami1x
+static void nl_gcr_62b99b9904a8c804_49_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A7 += go[6];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	RHS3 -= go[7] * *cnV[7];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A9 += go[8];
+	double RHS4 = Idr[8];
+	RHS4 += Idr[9];
+	RHS4 -= go[9] * *cnV[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A11 += go[10];
+	double RHS5 = Idr[10];
+	RHS5 += Idr[11];
+	RHS5 -= go[11] * *cnV[11];
+	m_A12 += gt[12];
+	m_A12 += gt[13];
+	m_A13 += go[12];
+	double RHS6 = Idr[12];
+	RHS6 += Idr[13];
+	RHS6 -= go[13] * *cnV[13];
+	m_A14 += gt[14];
+	m_A14 += gt[15];
+	m_A15 += go[14];
+	double RHS7 = Idr[14];
+	RHS7 += Idr[15];
+	RHS7 -= go[15] * *cnV[15];
+	m_A16 += gt[16];
+	m_A16 += gt[17];
+	m_A16 += gt[18];
+	m_A16 += gt[19];
+	m_A16 += gt[20];
+	m_A16 += gt[21];
+	m_A16 += gt[22];
+	m_A17 += go[16];
+	double RHS8 = Idr[16];
+	RHS8 += Idr[17];
+	RHS8 += Idr[18];
+	RHS8 += Idr[19];
+	RHS8 += Idr[20];
+	RHS8 += Idr[21];
+	RHS8 += Idr[22];
+	RHS8 -= go[17] * *cnV[17];
+	RHS8 -= go[18] * *cnV[18];
+	RHS8 -= go[19] * *cnV[19];
+	RHS8 -= go[20] * *cnV[20];
+	RHS8 -= go[21] * *cnV[21];
+	RHS8 -= go[22] * *cnV[22];
+	m_A18 += gt[23];
+	m_A18 += gt[24];
+	m_A19 += go[23];
+	double RHS9 = Idr[23];
+	RHS9 += Idr[24];
+	RHS9 -= go[24] * *cnV[24];
+	m_A20 += gt[25];
+	m_A20 += gt[26];
+	m_A21 += go[25];
+	double RHS10 = Idr[25];
+	RHS10 += Idr[26];
+	RHS10 -= go[26] * *cnV[26];
+	m_A25 += gt[27];
+	m_A25 += gt[28];
+	m_A25 += gt[29];
+	m_A25 += gt[30];
+	m_A26 += go[27];
+	m_A24 += go[28];
+	m_A23 += go[29];
+	m_A22 += go[30];
+	double RHS11 = Idr[27];
+	RHS11 += Idr[28];
+	RHS11 += Idr[29];
+	RHS11 += Idr[30];
+	m_A30 += gt[31];
+	m_A30 += gt[32];
+	m_A30 += gt[33];
+	m_A30 += gt[34];
+	m_A31 += go[31];
+	m_A29 += go[32];
+	m_A28 += go[33];
+	m_A27 += go[34];
+	double RHS12 = Idr[31];
+	RHS12 += Idr[32];
+	RHS12 += Idr[33];
+	RHS12 += Idr[34];
+	m_A35 += gt[35];
+	m_A35 += gt[36];
+	m_A35 += gt[37];
+	m_A35 += gt[38];
+	m_A36 += go[35];
+	m_A34 += go[36];
+	m_A33 += go[37];
+	m_A32 += go[38];
+	double RHS13 = Idr[35];
+	RHS13 += Idr[36];
+	RHS13 += Idr[37];
+	RHS13 += Idr[38];
+	m_A38 += gt[39];
+	m_A38 += gt[40];
+	m_A38 += gt[41];
+	m_A37 += go[39];
+	m_A39 += go[40];
+	double RHS14 = Idr[39];
+	RHS14 += Idr[40];
+	RHS14 += Idr[41];
+	RHS14 -= go[41] * *cnV[41];
+	m_A43 += gt[42];
+	m_A43 += gt[43];
+	m_A43 += gt[44];
+	m_A43 += gt[45];
+	m_A43 += gt[46];
+	m_A44 += go[42];
+	m_A42 += go[43];
+	m_A41 += go[44];
+	m_A40 += go[45];
+	double RHS15 = Idr[42];
+	RHS15 += Idr[43];
+	RHS15 += Idr[44];
+	RHS15 += Idr[45];
+	RHS15 += Idr[46];
+	RHS15 -= go[46] * *cnV[46];
+	m_A48 += gt[47];
+	m_A48 += gt[48];
+	m_A48 += gt[49];
+	m_A48 += gt[50];
+	m_A48 += gt[51];
+	m_A45 += go[47];
+	m_A46 += go[48];
+	m_A47 += go[49];
+	double RHS16 = Idr[47];
+	RHS16 += Idr[48];
+	RHS16 += Idr[49];
+	RHS16 += Idr[50];
+	RHS16 += Idr[51];
+	RHS16 -= go[50] * *cnV[50];
+	RHS16 -= go[51] * *cnV[51];
+	const double f0 = 1.0 / m_A0;
+	const double f0_11 = -f0 * m_A22;
+	m_A25 += m_A1 * f0_11;
+	RHS11 += f0_11 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_11 = -f1 * m_A23;
+	m_A25 += m_A3 * f1_11;
+	RHS11 += f1_11 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_11 = -f2 * m_A24;
+	m_A25 += m_A5 * f2_11;
+	RHS11 += f2_11 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_12 = -f3 * m_A27;
+	m_A30 += m_A7 * f3_12;
+	RHS12 += f3_12 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_12 = -f4 * m_A28;
+	m_A30 += m_A9 * f4_12;
+	RHS12 += f4_12 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_12 = -f5 * m_A29;
+	m_A30 += m_A11 * f5_12;
+	RHS12 += f5_12 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_13 = -f6 * m_A32;
+	m_A35 += m_A13 * f6_13;
+	RHS13 += f6_13 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_13 = -f7 * m_A33;
+	m_A35 += m_A15 * f7_13;
+	RHS13 += f7_13 * RHS7;
+	const double f8 = 1.0 / m_A16;
+	const double f8_16 = -f8 * m_A45;
+	m_A47 += m_A17 * f8_16;
+	RHS16 += f8_16 * RHS8;
+	const double f9 = 1.0 / m_A18;
+	const double f9_13 = -f9 * m_A34;
+	m_A35 += m_A19 * f9_13;
+	RHS13 += f9_13 * RHS9;
+	const double f10 = 1.0 / m_A20;
+	const double f10_14 = -f10 * m_A37;
+	m_A38 += m_A21 * f10_14;
+	RHS14 += f10_14 * RHS10;
+	const double f11 = 1.0 / m_A25;
+	const double f11_15 = -f11 * m_A40;
+	m_A43 += m_A26 * f11_15;
+	RHS15 += f11_15 * RHS11;
+	const double f12 = 1.0 / m_A30;
+	const double f12_15 = -f12 * m_A41;
+	m_A43 += m_A31 * f12_15;
+	RHS15 += f12_15 * RHS12;
+	const double f13 = 1.0 / m_A35;
+	const double f13_15 = -f13 * m_A42;
+	m_A43 += m_A36 * f13_15;
+	RHS15 += f13_15 * RHS13;
+	const double f14 = 1.0 / m_A38;
+	const double f14_16 = -f14 * m_A46;
+	m_A48 += m_A39 * f14_16;
+	RHS16 += f14_16 * RHS14;
+	const double f15 = 1.0 / m_A43;
+	const double f15_16 = -f15 * m_A47;
+	m_A48 += m_A44 * f15_16;
+	RHS16 += f15_16 * RHS15;
+	V[16] = RHS16 / m_A48;
+	double tmp15 = 0.0;
+	tmp15 += m_A44 * V[16];
+	V[15] = (RHS15 - tmp15) / m_A43;
+	double tmp14 = 0.0;
+	tmp14 += m_A39 * V[16];
+	V[14] = (RHS14 - tmp14) / m_A38;
+	double tmp13 = 0.0;
+	tmp13 += m_A36 * V[15];
+	V[13] = (RHS13 - tmp13) / m_A35;
+	double tmp12 = 0.0;
+	tmp12 += m_A31 * V[15];
+	V[12] = (RHS12 - tmp12) / m_A30;
+	double tmp11 = 0.0;
+	tmp11 += m_A26 * V[15];
+	V[11] = (RHS11 - tmp11) / m_A25;
+	double tmp10 = 0.0;
+	tmp10 += m_A21 * V[14];
+	V[10] = (RHS10 - tmp10) / m_A20;
+	double tmp9 = 0.0;
+	tmp9 += m_A19 * V[13];
+	V[9] = (RHS9 - tmp9) / m_A18;
+	double tmp8 = 0.0;
+	tmp8 += m_A17 * V[15];
+	V[8] = (RHS8 - tmp8) / m_A16;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[13];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[13];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[12];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[12];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[12];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[11];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[11];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[11];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// fireone
+static void nl_gcr_643133e86b2b1628_73_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A2 += gt[11];
+	m_A2 += gt[12];
+	m_A2 += gt[13];
+	m_A3 += go[7];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 += Idr[12];
+	RHS1 += Idr[13];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	RHS1 -= go[12] * *cnV[12];
+	RHS1 -= go[13] * *cnV[13];
+	m_A4 += gt[14];
+	m_A4 += gt[15];
+	m_A4 += gt[16];
+	m_A4 += gt[17];
+	m_A4 += gt[18];
+	m_A5 += go[14];
+	m_A6 += go[15];
+	double RHS2 = Idr[14];
+	RHS2 += Idr[15];
+	RHS2 += Idr[16];
+	RHS2 += Idr[17];
+	RHS2 += Idr[18];
+	RHS2 -= go[16] * *cnV[16];
+	RHS2 -= go[17] * *cnV[17];
+	RHS2 -= go[18] * *cnV[18];
+	m_A7 += gt[19];
+	m_A7 += gt[20];
+	m_A8 += go[19];
+	double RHS3 = Idr[19];
+	RHS3 += Idr[20];
+	RHS3 -= go[20] * *cnV[20];
+	m_A9 += gt[21];
+	m_A9 += gt[22];
+	m_A10 += go[21];
+	double RHS4 = Idr[21];
+	RHS4 += Idr[22];
+	RHS4 -= go[22] * *cnV[22];
+	m_A11 += gt[23];
+	m_A11 += gt[24];
+	m_A11 += gt[25];
+	m_A12 += go[23];
+	double RHS5 = Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 -= go[24] * *cnV[24];
+	RHS5 -= go[25] * *cnV[25];
+	m_A13 += gt[26];
+	m_A13 += gt[27];
+	m_A13 += gt[28];
+	m_A14 += go[26];
+	double RHS6 = Idr[26];
+	RHS6 += Idr[27];
+	RHS6 += Idr[28];
+	RHS6 -= go[27] * *cnV[27];
+	RHS6 -= go[28] * *cnV[28];
+	m_A16 += gt[29];
+	m_A16 += gt[30];
+	m_A16 += gt[31];
+	m_A16 += gt[32];
+	m_A16 += gt[33];
+	m_A16 += gt[34];
+	m_A15 += go[29];
+	m_A18 += go[30];
+	m_A19 += go[31];
+	m_A19 += go[32];
+	double RHS7 = Idr[29];
+	RHS7 += Idr[30];
+	RHS7 += Idr[31];
+	RHS7 += Idr[32];
+	RHS7 += Idr[33];
+	RHS7 += Idr[34];
+	RHS7 -= go[33] * *cnV[33];
+	RHS7 -= go[34] * *cnV[34];
+	m_A20 += gt[35];
+	m_A20 += gt[36];
+	m_A20 += gt[37];
+	m_A21 += go[35];
+	double RHS8 = Idr[35];
+	RHS8 += Idr[36];
+	RHS8 += Idr[37];
+	RHS8 -= go[36] * *cnV[36];
+	RHS8 -= go[37] * *cnV[37];
+	m_A22 += gt[38];
+	m_A22 += gt[39];
+	m_A23 += go[38];
+	double RHS9 = Idr[38];
+	RHS9 += Idr[39];
+	RHS9 -= go[39] * *cnV[39];
+	m_A25 += gt[40];
+	m_A25 += gt[41];
+	m_A25 += gt[42];
+	m_A27 += go[40];
+	m_A24 += go[41];
+	double RHS10 = Idr[40];
+	RHS10 += Idr[41];
+	RHS10 += Idr[42];
+	RHS10 -= go[42] * *cnV[42];
+	m_A30 += gt[43];
+	m_A30 += gt[44];
+	m_A30 += gt[45];
+	m_A32 += go[43];
+	m_A28 += go[44];
+	double RHS11 = Idr[43];
+	RHS11 += Idr[44];
+	RHS11 += Idr[45];
+	RHS11 -= go[45] * *cnV[45];
+	m_A34 += gt[46];
+	m_A34 += gt[47];
+	m_A34 += gt[48];
+	m_A33 += go[46];
+	m_A35 += go[47];
+	double RHS12 = Idr[46];
+	RHS12 += Idr[47];
+	RHS12 += Idr[48];
+	RHS12 -= go[48] * *cnV[48];
+	m_A37 += gt[49];
+	m_A37 += gt[50];
+	m_A37 += gt[51];
+	m_A37 += gt[52];
+	m_A38 += go[49];
+	m_A36 += go[50];
+	double RHS13 = Idr[49];
+	RHS13 += Idr[50];
+	RHS13 += Idr[51];
+	RHS13 += Idr[52];
+	RHS13 -= go[51] * *cnV[51];
+	RHS13 -= go[52] * *cnV[52];
+	m_A42 += gt[53];
+	m_A42 += gt[54];
+	m_A40 += go[53];
+	m_A39 += go[54];
+	double RHS14 = Idr[53];
+	RHS14 += Idr[54];
+	m_A45 += gt[55];
+	m_A45 += gt[56];
+	m_A45 += gt[57];
+	m_A45 += gt[58];
+	m_A46 += go[55];
+	m_A44 += go[56];
+	double RHS15 = Idr[55];
+	RHS15 += Idr[56];
+	RHS15 += Idr[57];
+	RHS15 += Idr[58];
+	RHS15 -= go[57] * *cnV[57];
+	RHS15 -= go[58] * *cnV[58];
+	m_A52 += gt[59];
+	m_A52 += gt[60];
+	m_A52 += gt[61];
+	m_A48 += go[59];
+	m_A49 += go[60];
+	m_A47 += go[61];
+	double RHS16 = Idr[59];
+	RHS16 += Idr[60];
+	RHS16 += Idr[61];
+	m_A57 += gt[62];
+	m_A57 += gt[63];
+	m_A57 += gt[64];
+	m_A57 += gt[65];
+	m_A57 += gt[66];
+	m_A54 += go[62];
+	m_A55 += go[63];
+	m_A58 += go[64];
+	double RHS17 = Idr[62];
+	RHS17 += Idr[63];
+	RHS17 += Idr[64];
+	RHS17 += Idr[65];
+	RHS17 += Idr[66];
+	RHS17 -= go[65] * *cnV[65];
+	RHS17 -= go[66] * *cnV[66];
+	m_A65 += gt[67];
+	m_A65 += gt[68];
+	m_A65 += gt[69];
+	m_A65 += gt[70];
+	m_A65 += gt[71];
+	m_A65 += gt[72];
+	m_A61 += go[67];
+	m_A61 += go[68];
+	m_A63 += go[69];
+	m_A60 += go[70];
+	m_A59 += go[71];
+	double RHS18 = Idr[67];
+	RHS18 += Idr[68];
+	RHS18 += Idr[69];
+	RHS18 += Idr[70];
+	RHS18 += Idr[71];
+	RHS18 += Idr[72];
+	RHS18 -= go[72] * *cnV[72];
+	m_A72 += gt[73];
+	m_A72 += gt[74];
+	m_A72 += gt[75];
+	m_A72 += gt[76];
+	m_A72 += gt[77];
+	m_A68 += go[73];
+	m_A70 += go[74];
+	m_A69 += go[75];
+	m_A67 += go[76];
+	m_A66 += go[77];
+	double RHS19 = Idr[73];
+	RHS19 += Idr[74];
+	RHS19 += Idr[75];
+	RHS19 += Idr[76];
+	RHS19 += Idr[77];
+	const double f0 = 1.0 / m_A0;
+	const double f0_17 = -f0 * m_A54;
+	m_A56 += m_A1 * f0_17;
+	RHS17 += f0_17 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_7 = -f1 * m_A15;
+	m_A17 += m_A3 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_10 = -f2 * m_A24;
+	m_A25 += m_A5 * f2_10;
+	m_A26 += m_A6 * f2_10;
+	RHS10 += f2_10 * RHS2;
+	const double f2_11 = -f2 * m_A28;
+	m_A29 += m_A5 * f2_11;
+	m_A30 += m_A6 * f2_11;
+	RHS11 += f2_11 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_14 = -f3 * m_A39;
+	m_A42 += m_A8 * f3_14;
+	RHS14 += f3_14 * RHS3;
+	const double f3_18 = -f3 * m_A59;
+	m_A63 += m_A8 * f3_18;
+	RHS18 += f3_18 * RHS3;
+	const double f4 = 1.0 / m_A9;
+	const double f4_16 = -f4 * m_A47;
+	m_A52 += m_A10 * f4_16;
+	RHS16 += f4_16 * RHS4;
+	const double f4_19 = -f4 * m_A66;
+	m_A69 += m_A10 * f4_19;
+	RHS19 += f4_19 * RHS4;
+	const double f5 = 1.0 / m_A11;
+	const double f5_13 = -f5 * m_A36;
+	m_A38 += m_A12 * f5_13;
+	RHS13 += f5_13 * RHS5;
+	const double f5_18 = -f5 * m_A60;
+	m_A65 += m_A12 * f5_18;
+	RHS18 += f5_18 * RHS5;
+	const double f6 = 1.0 / m_A13;
+	const double f6_12 = -f6 * m_A33;
+	m_A34 += m_A14 * f6_12;
+	RHS12 += f6_12 * RHS6;
+	const double f7 = 1.0 / m_A16;
+	const double f7_16 = -f7 * m_A48;
+	m_A50 += m_A17 * f7_16;
+	m_A52 += m_A18 * f7_16;
+	m_A53 += m_A19 * f7_16;
+	RHS16 += f7_16 * RHS7;
+	const double f7_18 = -f7 * m_A61;
+	m_A62 += m_A17 * f7_18;
+	m_A64 += m_A18 * f7_18;
+	m_A65 += m_A19 * f7_18;
+	RHS18 += f7_18 * RHS7;
+	const double f8 = 1.0 / m_A20;
+	const double f8_15 = -f8 * m_A44;
+	m_A46 += m_A21 * f8_15;
+	RHS15 += f8_15 * RHS8;
+	const double f8_19 = -f8 * m_A67;
+	m_A72 += m_A21 * f8_19;
+	RHS19 += f8_19 * RHS8;
+	const double f9 = 1.0 / m_A22;
+	const double f9_19 = -f9 * m_A68;
+	m_A72 += m_A23 * f9_19;
+	RHS19 += f9_19 * RHS9;
+	const double f10 = 1.0 / m_A25;
+	const double f10_11 = -f10 * m_A29;
+	m_A30 += m_A26 * f10_11;
+	m_A31 += m_A27 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	const double f10_14 = -f10 * m_A40;
+	m_A41 += m_A26 * f10_14;
+	m_A42 += m_A27 * f10_14;
+	RHS14 += f10_14 * RHS10;
+	const double f11 = 1.0 / m_A30;
+	const double f11_14 = -f11 * m_A41;
+	m_A42 += m_A31 * f11_14;
+	m_A43 += m_A32 * f11_14;
+	RHS14 += f11_14 * RHS11;
+	const double f11_16 = -f11 * m_A49;
+	m_A51 += m_A31 * f11_16;
+	m_A52 += m_A32 * f11_16;
+	RHS16 += f11_16 * RHS11;
+	const double f12 = 1.0 / m_A34;
+	const double f12_17 = -f12 * m_A55;
+	m_A57 += m_A35 * f12_17;
+	RHS17 += f12_17 * RHS12;
+	const double f13 = 1.0 / m_A37;
+	const double f13_16 = -f13 * m_A50;
+	m_A53 += m_A38 * f13_16;
+	RHS16 += f13_16 * RHS13;
+	const double f13_18 = -f13 * m_A62;
+	m_A65 += m_A38 * f13_18;
+	RHS18 += f13_18 * RHS13;
+	const double f14 = 1.0 / m_A42;
+	const double f14_16 = -f14 * m_A51;
+	m_A52 += m_A43 * f14_16;
+	RHS16 += f14_16 * RHS14;
+	const double f14_18 = -f14 * m_A63;
+	m_A64 += m_A43 * f14_18;
+	RHS18 += f14_18 * RHS14;
+	const double f15 = 1.0 / m_A45;
+	const double f15_17 = -f15 * m_A56;
+	m_A58 += m_A46 * f15_17;
+	RHS17 += f15_17 * RHS15;
+	const double f16 = 1.0 / m_A52;
+	const double f16_18 = -f16 * m_A64;
+	m_A65 += m_A53 * f16_18;
+	RHS18 += f16_18 * RHS16;
+	const double f16_19 = -f16 * m_A69;
+	m_A71 += m_A53 * f16_19;
+	RHS19 += f16_19 * RHS16;
+	const double f17 = 1.0 / m_A57;
+	const double f17_19 = -f17 * m_A70;
+	m_A72 += m_A58 * f17_19;
+	RHS19 += f17_19 * RHS17;
+	const double f18 = 1.0 / m_A65;
+	const double f18_19 = -f18 * m_A71;
+	RHS19 += f18_19 * RHS18;
+	V[19] = RHS19 / m_A72;
+	double tmp18 = 0.0;
+	V[18] = (RHS18 - tmp18) / m_A65;
+	double tmp17 = 0.0;
+	tmp17 += m_A58 * V[19];
+	V[17] = (RHS17 - tmp17) / m_A57;
+	double tmp16 = 0.0;
+	tmp16 += m_A53 * V[18];
+	V[16] = (RHS16 - tmp16) / m_A52;
+	double tmp15 = 0.0;
+	tmp15 += m_A46 * V[19];
+	V[15] = (RHS15 - tmp15) / m_A45;
+	double tmp14 = 0.0;
+	tmp14 += m_A43 * V[16];
+	V[14] = (RHS14 - tmp14) / m_A42;
+	double tmp13 = 0.0;
+	tmp13 += m_A38 * V[18];
+	V[13] = (RHS13 - tmp13) / m_A37;
+	double tmp12 = 0.0;
+	tmp12 += m_A35 * V[17];
+	V[12] = (RHS12 - tmp12) / m_A34;
+	double tmp11 = 0.0;
+	tmp11 += m_A31 * V[14];
+	tmp11 += m_A32 * V[16];
+	V[11] = (RHS11 - tmp11) / m_A30;
+	double tmp10 = 0.0;
+	tmp10 += m_A26 * V[11];
+	tmp10 += m_A27 * V[14];
+	V[10] = (RHS10 - tmp10) / m_A25;
+	double tmp9 = 0.0;
+	tmp9 += m_A23 * V[19];
+	V[9] = (RHS9 - tmp9) / m_A22;
+	double tmp8 = 0.0;
+	tmp8 += m_A21 * V[19];
+	V[8] = (RHS8 - tmp8) / m_A20;
+	double tmp7 = 0.0;
+	tmp7 += m_A17 * V[13];
+	tmp7 += m_A18 * V[16];
+	tmp7 += m_A19 * V[18];
+	V[7] = (RHS7 - tmp7) / m_A16;
+	double tmp6 = 0.0;
+	tmp6 += m_A14 * V[12];
+	V[6] = (RHS6 - tmp6) / m_A13;
+	double tmp5 = 0.0;
+	tmp5 += m_A12 * V[18];
+	V[5] = (RHS5 - tmp5) / m_A11;
+	double tmp4 = 0.0;
+	tmp4 += m_A10 * V[16];
+	V[4] = (RHS4 - tmp4) / m_A9;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[14];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[10];
+	tmp2 += m_A6 * V[11];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[13];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[15];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starfire
+static void nl_gcr_649ebca7fa6793ed_27_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A1 += go[0];
+	m_A1 += go[1];
+	m_A2 += go[2];
+	m_A2 += go[3];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	m_A3 += gt[6];
+	m_A3 += gt[7];
+	m_A3 += gt[8];
+	m_A3 += gt[9];
+	m_A3 += gt[10];
+	m_A3 += gt[11];
+	m_A3 += gt[12];
+	m_A4 += go[6];
+	m_A5 += go[7];
+	double RHS1 = Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 += Idr[12];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	RHS1 -= go[12] * *cnV[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A6 += gt[16];
+	m_A7 += go[13];
+	m_A8 += go[14];
+	double RHS2 = Idr[13];
+	RHS2 += Idr[14];
+	RHS2 += Idr[15];
+	RHS2 += Idr[16];
+	RHS2 -= go[15] * *cnV[15];
+	RHS2 -= go[16] * *cnV[16];
+	m_A9 += gt[17];
+	m_A9 += gt[18];
+	m_A10 += go[17];
+	double RHS3 = Idr[17];
+	RHS3 += Idr[18];
+	RHS3 -= go[18] * *cnV[18];
+	m_A11 += gt[19];
+	m_A11 += gt[20];
+	m_A12 += go[19];
+	double RHS4 = Idr[19];
+	RHS4 += Idr[20];
+	RHS4 -= go[20] * *cnV[20];
+	m_A17 += gt[21];
+	m_A17 += gt[22];
+	m_A17 += gt[23];
+	m_A17 += gt[24];
+	m_A17 += gt[25];
+	m_A17 += gt[26];
+	m_A17 += gt[27];
+	m_A13 += go[21];
+	m_A16 += go[22];
+	m_A15 += go[23];
+	m_A14 += go[24];
+	double RHS5 = Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 += Idr[27];
+	RHS5 -= go[25] * *cnV[25];
+	RHS5 -= go[26] * *cnV[26];
+	RHS5 -= go[27] * *cnV[27];
+	m_A20 += gt[28];
+	m_A20 += gt[29];
+	m_A20 += gt[30];
+	m_A20 += gt[31];
+	m_A19 += go[28];
+	m_A19 += go[29];
+	m_A21 += go[30];
+	double RHS6 = Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 += Idr[31];
+	RHS6 -= go[31] * *cnV[31];
+	m_A26 += gt[32];
+	m_A26 += gt[33];
+	m_A26 += gt[34];
+	m_A26 += gt[35];
+	m_A26 += gt[36];
+	m_A26 += gt[37];
+	m_A23 += go[32];
+	m_A25 += go[33];
+	m_A22 += go[34];
+	m_A22 += go[35];
+	double RHS7 = Idr[32];
+	RHS7 += Idr[33];
+	RHS7 += Idr[34];
+	RHS7 += Idr[35];
+	RHS7 += Idr[36];
+	RHS7 += Idr[37];
+	RHS7 -= go[36] * *cnV[36];
+	RHS7 -= go[37] * *cnV[37];
+	const double f0 = 1.0 / m_A0;
+	const double f0_6 = -f0 * m_A19;
+	m_A20 += m_A1 * f0_6;
+	m_A21 += m_A2 * f0_6;
+	RHS6 += f0_6 * RHS0;
+	const double f0_7 = -f0 * m_A22;
+	m_A25 += m_A1 * f0_7;
+	m_A26 += m_A2 * f0_7;
+	RHS7 += f0_7 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_5 = -f1 * m_A13;
+	m_A14 += m_A4 * f1_5;
+	m_A18 += m_A5 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_5 = -f2 * m_A14;
+	m_A17 += m_A7 * f2_5;
+	m_A18 += m_A8 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f2_7 = -f2 * m_A23;
+	m_A24 += m_A7 * f2_7;
+	m_A26 += m_A8 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_5 = -f3 * m_A15;
+	m_A17 += m_A10 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_5 = -f4 * m_A16;
+	m_A17 += m_A12 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	const double f5 = 1.0 / m_A17;
+	const double f5_7 = -f5 * m_A24;
+	m_A26 += m_A18 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f6 = 1.0 / m_A20;
+	const double f6_7 = -f6 * m_A25;
+	m_A26 += m_A21 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	V[7] = RHS7 / m_A26;
+	double tmp6 = 0.0;
+	tmp6 += m_A21 * V[7];
+	V[6] = (RHS6 - tmp6) / m_A20;
+	double tmp5 = 0.0;
+	tmp5 += m_A18 * V[7];
+	V[5] = (RHS5 - tmp5) / m_A17;
+	double tmp4 = 0.0;
+	tmp4 += m_A12 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A11;
+	double tmp3 = 0.0;
+	tmp3 += m_A10 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[5];
+	tmp2 += m_A8 * V[7];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A4 * V[2];
+	tmp1 += m_A5 * V[7];
+	V[1] = (RHS1 - tmp1) / m_A3;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[6];
+	tmp0 += m_A2 * V[7];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// armora
+static void nl_gcr_64e460d8f716cd89_58_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A4 += go[4];
+	m_A3 += go[5];
+	m_A3 += go[6];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A5 += gt[13];
+	m_A6 += go[10];
+	m_A6 += go[11];
+	m_A7 += go[12];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[13] * *cnV[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A9 += go[14];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 -= go[15] * *cnV[15];
+	RHS3 -= go[16] * *cnV[16];
+	RHS3 -= go[17] * *cnV[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A10 += gt[20];
+	m_A10 += gt[21];
+	m_A10 += gt[22];
+	m_A10 += gt[23];
+	m_A12 += go[18];
+	m_A11 += go[19];
+	m_A11 += go[20];
+	double RHS4 = Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 -= go[21] * *cnV[21];
+	RHS4 -= go[22] * *cnV[22];
+	RHS4 -= go[23] * *cnV[23];
+	m_A13 += gt[24];
+	m_A13 += gt[25];
+	m_A13 += gt[26];
+	m_A13 += gt[27];
+	m_A14 += go[24];
+	m_A14 += go[25];
+	m_A15 += go[26];
+	double RHS5 = Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 += Idr[27];
+	RHS5 -= go[27] * *cnV[27];
+	m_A16 += gt[28];
+	m_A16 += gt[29];
+	m_A16 += gt[30];
+	m_A16 += gt[31];
+	m_A16 += gt[32];
+	m_A16 += gt[33];
+	m_A17 += go[28];
+	double RHS6 = Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 += Idr[31];
+	RHS6 += Idr[32];
+	RHS6 += Idr[33];
+	RHS6 -= go[29] * *cnV[29];
+	RHS6 -= go[30] * *cnV[30];
+	RHS6 -= go[31] * *cnV[31];
+	RHS6 -= go[32] * *cnV[32];
+	RHS6 -= go[33] * *cnV[33];
+	m_A18 += gt[34];
+	m_A18 += gt[35];
+	m_A18 += gt[36];
+	m_A18 += gt[37];
+	m_A18 += gt[38];
+	m_A18 += gt[39];
+	m_A20 += go[34];
+	m_A19 += go[35];
+	m_A19 += go[36];
+	double RHS7 = Idr[34];
+	RHS7 += Idr[35];
+	RHS7 += Idr[36];
+	RHS7 += Idr[37];
+	RHS7 += Idr[38];
+	RHS7 += Idr[39];
+	RHS7 -= go[37] * *cnV[37];
+	RHS7 -= go[38] * *cnV[38];
+	RHS7 -= go[39] * *cnV[39];
+	m_A21 += gt[40];
+	m_A21 += gt[41];
+	m_A21 += gt[42];
+	m_A21 += gt[43];
+	m_A23 += go[40];
+	m_A23 += go[41];
+	m_A22 += go[42];
+	double RHS8 = Idr[40];
+	RHS8 += Idr[41];
+	RHS8 += Idr[42];
+	RHS8 += Idr[43];
+	RHS8 -= go[43] * *cnV[43];
+	m_A26 += gt[44];
+	m_A26 += gt[45];
+	m_A26 += gt[46];
+	m_A26 += gt[47];
+	m_A26 += gt[48];
+	m_A26 += gt[49];
+	m_A25 += go[44];
+	m_A25 += go[45];
+	m_A24 += go[46];
+	double RHS9 = Idr[44];
+	RHS9 += Idr[45];
+	RHS9 += Idr[46];
+	RHS9 += Idr[47];
+	RHS9 += Idr[48];
+	RHS9 += Idr[49];
+	RHS9 -= go[47] * *cnV[47];
+	RHS9 -= go[48] * *cnV[48];
+	RHS9 -= go[49] * *cnV[49];
+	m_A31 += gt[50];
+	m_A31 += gt[51];
+	m_A31 += gt[52];
+	m_A31 += gt[53];
+	m_A31 += gt[54];
+	m_A29 += go[50];
+	m_A29 += go[51];
+	m_A28 += go[52];
+	double RHS10 = Idr[50];
+	RHS10 += Idr[51];
+	RHS10 += Idr[52];
+	RHS10 += Idr[53];
+	RHS10 += Idr[54];
+	RHS10 -= go[53] * *cnV[53];
+	RHS10 -= go[54] * *cnV[54];
+	m_A35 += gt[55];
+	m_A35 += gt[56];
+	m_A35 += gt[57];
+	m_A35 += gt[58];
+	m_A35 += gt[59];
+	m_A35 += gt[60];
+	m_A34 += go[55];
+	m_A34 += go[56];
+	m_A33 += go[57];
+	double RHS11 = Idr[55];
+	RHS11 += Idr[56];
+	RHS11 += Idr[57];
+	RHS11 += Idr[58];
+	RHS11 += Idr[59];
+	RHS11 += Idr[60];
+	RHS11 -= go[58] * *cnV[58];
+	RHS11 -= go[59] * *cnV[59];
+	RHS11 -= go[60] * *cnV[60];
+	m_A40 += gt[61];
+	m_A40 += gt[62];
+	m_A40 += gt[63];
+	m_A40 += gt[64];
+	m_A40 += gt[65];
+	m_A38 += go[61];
+	m_A38 += go[62];
+	m_A37 += go[63];
+	double RHS12 = Idr[61];
+	RHS12 += Idr[62];
+	RHS12 += Idr[63];
+	RHS12 += Idr[64];
+	RHS12 += Idr[65];
+	RHS12 -= go[64] * *cnV[64];
+	RHS12 -= go[65] * *cnV[65];
+	m_A44 += gt[66];
+	m_A44 += gt[67];
+	m_A44 += gt[68];
+	m_A44 += gt[69];
+	m_A44 += gt[70];
+	m_A44 += gt[71];
+	m_A43 += go[66];
+	m_A43 += go[67];
+	m_A42 += go[68];
+	double RHS13 = Idr[66];
+	RHS13 += Idr[67];
+	RHS13 += Idr[68];
+	RHS13 += Idr[69];
+	RHS13 += Idr[70];
+	RHS13 += Idr[71];
+	RHS13 -= go[69] * *cnV[69];
+	RHS13 -= go[70] * *cnV[70];
+	RHS13 -= go[71] * *cnV[71];
+	m_A51 += gt[72];
+	m_A51 += gt[73];
+	m_A51 += gt[74];
+	m_A51 += gt[75];
+	m_A51 += gt[76];
+	m_A51 += gt[77];
+	m_A48 += go[72];
+	m_A47 += go[73];
+	m_A46 += go[74];
+	double RHS14 = Idr[72];
+	RHS14 += Idr[73];
+	RHS14 += Idr[74];
+	RHS14 += Idr[75];
+	RHS14 += Idr[76];
+	RHS14 += Idr[77];
+	RHS14 -= go[75] * *cnV[75];
+	RHS14 -= go[76] * *cnV[76];
+	RHS14 -= go[77] * *cnV[77];
+	m_A57 += gt[78];
+	m_A57 += gt[79];
+	m_A57 += gt[80];
+	m_A57 += gt[81];
+	m_A57 += gt[82];
+	m_A54 += go[78];
+	m_A54 += go[79];
+	m_A53 += go[80];
+	double RHS15 = Idr[78];
+	RHS15 += Idr[79];
+	RHS15 += Idr[80];
+	RHS15 += Idr[81];
+	RHS15 += Idr[82];
+	RHS15 -= go[81] * *cnV[81];
+	RHS15 -= go[82] * *cnV[82];
+	const double f0 = 1.0 / m_A0;
+	const double f0_9 = -f0 * m_A24;
+	m_A26 += m_A1 * f0_9;
+	RHS9 += f0_9 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_9 = -f1 * m_A25;
+	m_A26 += m_A3 * f1_9;
+	m_A27 += m_A4 * f1_9;
+	RHS9 += f1_9 * RHS1;
+	const double f1_10 = -f1 * m_A28;
+	m_A30 += m_A3 * f1_10;
+	m_A31 += m_A4 * f1_10;
+	RHS10 += f1_10 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_10 = -f2 * m_A29;
+	m_A31 += m_A6 * f2_10;
+	m_A32 += m_A7 * f2_10;
+	RHS10 += f2_10 * RHS2;
+	const double f2_14 = -f2 * m_A46;
+	m_A49 += m_A6 * f2_14;
+	m_A51 += m_A7 * f2_14;
+	RHS14 += f2_14 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_11 = -f3 * m_A33;
+	m_A35 += m_A9 * f3_11;
+	RHS11 += f3_11 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_11 = -f4 * m_A34;
+	m_A35 += m_A11 * f4_11;
+	m_A36 += m_A12 * f4_11;
+	RHS11 += f4_11 * RHS4;
+	const double f4_12 = -f4 * m_A37;
+	m_A39 += m_A11 * f4_12;
+	m_A40 += m_A12 * f4_12;
+	RHS12 += f4_12 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_12 = -f5 * m_A38;
+	m_A40 += m_A14 * f5_12;
+	m_A41 += m_A15 * f5_12;
+	RHS12 += f5_12 * RHS5;
+	const double f5_14 = -f5 * m_A47;
+	m_A50 += m_A14 * f5_14;
+	m_A51 += m_A15 * f5_14;
+	RHS14 += f5_14 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_13 = -f6 * m_A42;
+	m_A44 += m_A17 * f6_13;
+	RHS13 += f6_13 * RHS6;
+	const double f7 = 1.0 / m_A18;
+	const double f7_13 = -f7 * m_A43;
+	m_A44 += m_A19 * f7_13;
+	m_A45 += m_A20 * f7_13;
+	RHS13 += f7_13 * RHS7;
+	const double f7_15 = -f7 * m_A53;
+	m_A55 += m_A19 * f7_15;
+	m_A57 += m_A20 * f7_15;
+	RHS15 += f7_15 * RHS7;
+	const double f8 = 1.0 / m_A21;
+	const double f8_14 = -f8 * m_A48;
+	m_A51 += m_A22 * f8_14;
+	m_A52 += m_A23 * f8_14;
+	RHS14 += f8_14 * RHS8;
+	const double f8_15 = -f8 * m_A54;
+	m_A56 += m_A22 * f8_15;
+	m_A57 += m_A23 * f8_15;
+	RHS15 += f8_15 * RHS8;
+	const double f9 = 1.0 / m_A26;
+	const double f9_10 = -f9 * m_A30;
+	m_A31 += m_A27 * f9_10;
+	RHS10 += f9_10 * RHS9;
+	const double f10 = 1.0 / m_A31;
+	const double f10_14 = -f10 * m_A49;
+	m_A51 += m_A32 * f10_14;
+	RHS14 += f10_14 * RHS10;
+	const double f11 = 1.0 / m_A35;
+	const double f11_12 = -f11 * m_A39;
+	m_A40 += m_A36 * f11_12;
+	RHS12 += f11_12 * RHS11;
+	const double f12 = 1.0 / m_A40;
+	const double f12_14 = -f12 * m_A50;
+	m_A51 += m_A41 * f12_14;
+	RHS14 += f12_14 * RHS12;
+	const double f13 = 1.0 / m_A44;
+	const double f13_15 = -f13 * m_A55;
+	m_A57 += m_A45 * f13_15;
+	RHS15 += f13_15 * RHS13;
+	const double f14 = 1.0 / m_A51;
+	const double f14_15 = -f14 * m_A56;
+	m_A57 += m_A52 * f14_15;
+	RHS15 += f14_15 * RHS14;
+	V[15] = RHS15 / m_A57;
+	double tmp14 = 0.0;
+	tmp14 += m_A52 * V[15];
+	V[14] = (RHS14 - tmp14) / m_A51;
+	double tmp13 = 0.0;
+	tmp13 += m_A45 * V[15];
+	V[13] = (RHS13 - tmp13) / m_A44;
+	double tmp12 = 0.0;
+	tmp12 += m_A41 * V[14];
+	V[12] = (RHS12 - tmp12) / m_A40;
+	double tmp11 = 0.0;
+	tmp11 += m_A36 * V[12];
+	V[11] = (RHS11 - tmp11) / m_A35;
+	double tmp10 = 0.0;
+	tmp10 += m_A32 * V[14];
+	V[10] = (RHS10 - tmp10) / m_A31;
+	double tmp9 = 0.0;
+	tmp9 += m_A27 * V[10];
+	V[9] = (RHS9 - tmp9) / m_A26;
+	double tmp8 = 0.0;
+	tmp8 += m_A22 * V[14];
+	tmp8 += m_A23 * V[15];
+	V[8] = (RHS8 - tmp8) / m_A21;
+	double tmp7 = 0.0;
+	tmp7 += m_A19 * V[13];
+	tmp7 += m_A20 * V[15];
+	V[7] = (RHS7 - tmp7) / m_A18;
+	double tmp6 = 0.0;
+	tmp6 += m_A17 * V[13];
+	V[6] = (RHS6 - tmp6) / m_A16;
+	double tmp5 = 0.0;
+	tmp5 += m_A14 * V[12];
+	tmp5 += m_A15 * V[14];
+	V[5] = (RHS5 - tmp5) / m_A13;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[11];
+	tmp4 += m_A12 * V[12];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[11];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[10];
+	tmp2 += m_A7 * V[14];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[9];
+	tmp1 += m_A4 * V[10];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[9];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// flyball
+static void nl_gcr_6622b53554e3776_291_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
+	double m_A153(0.0);
+	double m_A154(0.0);
+	double m_A155(0.0);
+	double m_A156(0.0);
+	double m_A157(0.0);
+	double m_A158(0.0);
+	double m_A159(0.0);
+	double m_A160(0.0);
+	double m_A161(0.0);
+	double m_A162(0.0);
+	double m_A163(0.0);
+	double m_A164(0.0);
+	double m_A165(0.0);
+	double m_A166(0.0);
+	double m_A167(0.0);
+	double m_A168(0.0);
+	double m_A169(0.0);
+	double m_A170(0.0);
+	double m_A171(0.0);
+	double m_A172(0.0);
+	double m_A173(0.0);
+	double m_A174(0.0);
+	double m_A175(0.0);
+	double m_A176(0.0);
+	double m_A177(0.0);
+	double m_A178(0.0);
+	double m_A179(0.0);
+	double m_A180(0.0);
+	double m_A181(0.0);
+	double m_A182(0.0);
+	double m_A183(0.0);
+	double m_A184(0.0);
+	double m_A185(0.0);
+	double m_A186(0.0);
+	double m_A187(0.0);
+	double m_A188(0.0);
+	double m_A189(0.0);
+	double m_A190(0.0);
+	double m_A191(0.0);
+	double m_A192(0.0);
+	double m_A193(0.0);
+	double m_A194(0.0);
+	double m_A195(0.0);
+	double m_A196(0.0);
+	double m_A197(0.0);
+	double m_A198(0.0);
+	double m_A199(0.0);
+	double m_A200(0.0);
+	double m_A201(0.0);
+	double m_A202(0.0);
+	double m_A203(0.0);
+	double m_A204(0.0);
+	double m_A205(0.0);
+	double m_A206(0.0);
+	double m_A207(0.0);
+	double m_A208(0.0);
+	double m_A209(0.0);
+	double m_A210(0.0);
+	double m_A211(0.0);
+	double m_A212(0.0);
+	double m_A213(0.0);
+	double m_A214(0.0);
+	double m_A215(0.0);
+	double m_A216(0.0);
+	double m_A217(0.0);
+	double m_A218(0.0);
+	double m_A219(0.0);
+	double m_A220(0.0);
+	double m_A221(0.0);
+	double m_A222(0.0);
+	double m_A223(0.0);
+	double m_A224(0.0);
+	double m_A225(0.0);
+	double m_A226(0.0);
+	double m_A227(0.0);
+	double m_A228(0.0);
+	double m_A229(0.0);
+	double m_A230(0.0);
+	double m_A231(0.0);
+	double m_A232(0.0);
+	double m_A233(0.0);
+	double m_A234(0.0);
+	double m_A235(0.0);
+	double m_A236(0.0);
+	double m_A237(0.0);
+	double m_A238(0.0);
+	double m_A239(0.0);
+	double m_A240(0.0);
+	double m_A241(0.0);
+	double m_A242(0.0);
+	double m_A243(0.0);
+	double m_A244(0.0);
+	double m_A245(0.0);
+	double m_A246(0.0);
+	double m_A247(0.0);
+	double m_A248(0.0);
+	double m_A249(0.0);
+	double m_A250(0.0);
+	double m_A251(0.0);
+	double m_A252(0.0);
+	double m_A253(0.0);
+	double m_A254(0.0);
+	double m_A255(0.0);
+	double m_A256(0.0);
+	double m_A257(0.0);
+	double m_A258(0.0);
+	double m_A259(0.0);
+	double m_A260(0.0);
+	double m_A261(0.0);
+	double m_A262(0.0);
+	double m_A263(0.0);
+	double m_A264(0.0);
+	double m_A265(0.0);
+	double m_A266(0.0);
+	double m_A267(0.0);
+	double m_A268(0.0);
+	double m_A269(0.0);
+	double m_A270(0.0);
+	double m_A271(0.0);
+	double m_A272(0.0);
+	double m_A273(0.0);
+	double m_A274(0.0);
+	double m_A275(0.0);
+	double m_A276(0.0);
+	double m_A277(0.0);
+	double m_A278(0.0);
+	double m_A279(0.0);
+	double m_A280(0.0);
+	double m_A281(0.0);
+	double m_A282(0.0);
+	double m_A283(0.0);
+	double m_A284(0.0);
+	double m_A285(0.0);
+	double m_A286(0.0);
+	double m_A287(0.0);
+	double m_A288(0.0);
+	double m_A289(0.0);
+	double m_A290(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A7 += go[4];
+	m_A6 += go[5];
+	m_A5 += go[6];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[7] * *cnV[7];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A9 += go[8];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	RHS3 -= go[9] * *cnV[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A10 += gt[12];
+	m_A11 += go[10];
+	m_A12 += go[11];
+	double RHS4 = Idr[10];
+	RHS4 += Idr[11];
+	RHS4 += Idr[12];
+	RHS4 -= go[12] * *cnV[12];
+	m_A13 += gt[13];
+	m_A13 += gt[14];
+	m_A13 += gt[15];
+	m_A14 += go[13];
+	m_A15 += go[14];
+	double RHS5 = Idr[13];
+	RHS5 += Idr[14];
+	RHS5 += Idr[15];
+	RHS5 -= go[15] * *cnV[15];
+	m_A16 += gt[16];
+	m_A16 += gt[17];
+	m_A16 += gt[18];
+	m_A16 += gt[19];
+	m_A16 += gt[20];
+	m_A16 += gt[21];
+	m_A16 += gt[22];
+	m_A20 += go[16];
+	m_A19 += go[17];
+	m_A18 += go[18];
+	m_A17 += go[19];
+	double RHS6 = Idr[16];
+	RHS6 += Idr[17];
+	RHS6 += Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
+	RHS6 += Idr[21];
+	RHS6 += Idr[22];
+	RHS6 -= go[20] * *cnV[20];
+	RHS6 -= go[21] * *cnV[21];
+	RHS6 -= go[22] * *cnV[22];
+	m_A21 += gt[23];
+	m_A21 += gt[24];
+	m_A22 += go[23];
+	double RHS7 = Idr[23];
+	RHS7 += Idr[24];
+	RHS7 -= go[24] * *cnV[24];
+	m_A23 += gt[25];
+	m_A23 += gt[26];
+	m_A24 += go[25];
+	double RHS8 = Idr[25];
+	RHS8 += Idr[26];
+	RHS8 -= go[26] * *cnV[26];
+	m_A25 += gt[27];
+	m_A25 += gt[28];
+	m_A25 += gt[29];
+	m_A25 += gt[30];
+	m_A25 += gt[31];
+	m_A25 += gt[32];
+	m_A25 += gt[33];
+	m_A29 += go[27];
+	m_A28 += go[28];
+	m_A27 += go[29];
+	m_A26 += go[30];
+	double RHS9 = Idr[27];
+	RHS9 += Idr[28];
+	RHS9 += Idr[29];
+	RHS9 += Idr[30];
+	RHS9 += Idr[31];
+	RHS9 += Idr[32];
+	RHS9 += Idr[33];
+	RHS9 -= go[31] * *cnV[31];
+	RHS9 -= go[32] * *cnV[32];
+	RHS9 -= go[33] * *cnV[33];
+	m_A30 += gt[34];
+	m_A30 += gt[35];
+	m_A31 += go[34];
+	m_A32 += go[35];
+	double RHS10 = Idr[34];
+	RHS10 += Idr[35];
+	m_A33 += gt[36];
+	m_A33 += gt[37];
+	m_A34 += go[36];
+	double RHS11 = Idr[36];
+	RHS11 += Idr[37];
+	RHS11 -= go[37] * *cnV[37];
+	m_A35 += gt[38];
+	m_A35 += gt[39];
+	m_A35 += gt[40];
+	m_A35 += gt[41];
+	m_A35 += gt[42];
+	m_A35 += gt[43];
+	m_A35 += gt[44];
+	m_A36 += go[38];
+	double RHS12 = Idr[38];
+	RHS12 += Idr[39];
+	RHS12 += Idr[40];
+	RHS12 += Idr[41];
+	RHS12 += Idr[42];
+	RHS12 += Idr[43];
+	RHS12 += Idr[44];
+	RHS12 -= go[39] * *cnV[39];
+	RHS12 -= go[40] * *cnV[40];
+	RHS12 -= go[41] * *cnV[41];
+	RHS12 -= go[42] * *cnV[42];
+	RHS12 -= go[43] * *cnV[43];
+	RHS12 -= go[44] * *cnV[44];
+	m_A37 += gt[45];
+	m_A37 += gt[46];
+	m_A37 += gt[47];
+	m_A37 += gt[48];
+	m_A39 += go[45];
+	m_A40 += go[46];
+	m_A38 += go[47];
+	double RHS13 = Idr[45];
+	RHS13 += Idr[46];
+	RHS13 += Idr[47];
+	RHS13 += Idr[48];
+	RHS13 -= go[48] * *cnV[48];
+	m_A41 += gt[49];
+	m_A41 += gt[50];
+	m_A42 += go[49];
+	m_A43 += go[50];
+	double RHS14 = Idr[49];
+	RHS14 += Idr[50];
+	m_A44 += gt[51];
+	m_A44 += gt[52];
+	m_A44 += gt[53];
+	m_A45 += go[51];
+	double RHS15 = Idr[51];
+	RHS15 += Idr[52];
+	RHS15 += Idr[53];
+	RHS15 -= go[52] * *cnV[52];
+	RHS15 -= go[53] * *cnV[53];
+	m_A46 += gt[54];
+	m_A46 += gt[55];
+	m_A46 += gt[56];
+	m_A46 += gt[57];
+	m_A49 += go[54];
+	m_A48 += go[55];
+	m_A47 += go[56];
+	double RHS16 = Idr[54];
+	RHS16 += Idr[55];
+	RHS16 += Idr[56];
+	RHS16 += Idr[57];
+	RHS16 -= go[57] * *cnV[57];
+	m_A50 += gt[58];
+	m_A50 += gt[59];
+	m_A50 += gt[60];
+	m_A52 += go[58];
+	m_A51 += go[59];
+	double RHS17 = Idr[58];
+	RHS17 += Idr[59];
+	RHS17 += Idr[60];
+	RHS17 -= go[60] * *cnV[60];
+	m_A53 += gt[61];
+	m_A53 += gt[62];
+	m_A53 += gt[63];
+	m_A54 += go[61];
+	m_A55 += go[62];
+	double RHS18 = Idr[61];
+	RHS18 += Idr[62];
+	RHS18 += Idr[63];
+	RHS18 -= go[63] * *cnV[63];
+	m_A56 += gt[64];
+	m_A56 += gt[65];
+	m_A56 += gt[66];
+	m_A56 += gt[67];
+	m_A57 += go[64];
+	m_A57 += go[65];
+	double RHS19 = Idr[64];
+	RHS19 += Idr[65];
+	RHS19 += Idr[66];
+	RHS19 += Idr[67];
+	RHS19 -= go[66] * *cnV[66];
+	RHS19 -= go[67] * *cnV[67];
+	m_A58 += gt[68];
+	m_A58 += gt[69];
+	m_A58 += gt[70];
+	m_A58 += gt[71];
+	m_A58 += gt[72];
+	m_A58 += gt[73];
+	m_A58 += gt[74];
+	m_A60 += go[68];
+	m_A61 += go[69];
+	m_A62 += go[70];
+	m_A59 += go[71];
+	double RHS20 = Idr[68];
+	RHS20 += Idr[69];
+	RHS20 += Idr[70];
+	RHS20 += Idr[71];
+	RHS20 += Idr[72];
+	RHS20 += Idr[73];
+	RHS20 += Idr[74];
+	RHS20 -= go[72] * *cnV[72];
+	RHS20 -= go[73] * *cnV[73];
+	RHS20 -= go[74] * *cnV[74];
+	m_A63 += gt[75];
+	m_A63 += gt[76];
+	m_A63 += gt[77];
+	m_A63 += gt[78];
+	m_A63 += gt[79];
+	m_A63 += gt[80];
+	m_A63 += gt[81];
+	m_A64 += go[75];
+	m_A66 += go[76];
+	m_A67 += go[77];
+	m_A65 += go[78];
+	double RHS21 = Idr[75];
+	RHS21 += Idr[76];
+	RHS21 += Idr[77];
+	RHS21 += Idr[78];
+	RHS21 += Idr[79];
+	RHS21 += Idr[80];
+	RHS21 += Idr[81];
+	RHS21 -= go[79] * *cnV[79];
+	RHS21 -= go[80] * *cnV[80];
+	RHS21 -= go[81] * *cnV[81];
+	m_A68 += gt[82];
+	m_A68 += gt[83];
+	m_A68 += gt[84];
+	m_A69 += go[82];
+	double RHS22 = Idr[82];
+	RHS22 += Idr[83];
+	RHS22 += Idr[84];
+	RHS22 -= go[83] * *cnV[83];
+	RHS22 -= go[84] * *cnV[84];
+	m_A70 += gt[85];
+	m_A70 += gt[86];
+	m_A70 += gt[87];
+	m_A71 += go[85];
+	double RHS23 = Idr[85];
+	RHS23 += Idr[86];
+	RHS23 += Idr[87];
+	RHS23 -= go[86] * *cnV[86];
+	RHS23 -= go[87] * *cnV[87];
+	m_A72 += gt[88];
+	m_A72 += gt[89];
+	m_A72 += gt[90];
+	m_A72 += gt[91];
+	m_A74 += go[88];
+	m_A73 += go[89];
+	double RHS24 = Idr[88];
+	RHS24 += Idr[89];
+	RHS24 += Idr[90];
+	RHS24 += Idr[91];
+	RHS24 -= go[90] * *cnV[90];
+	RHS24 -= go[91] * *cnV[91];
+	m_A75 += gt[92];
+	m_A75 += gt[93];
+	m_A75 += gt[94];
+	m_A75 += gt[95];
+	m_A76 += go[92];
+	m_A77 += go[93];
+	double RHS25 = Idr[92];
+	RHS25 += Idr[93];
+	RHS25 += Idr[94];
+	RHS25 += Idr[95];
+	RHS25 -= go[94] * *cnV[94];
+	RHS25 -= go[95] * *cnV[95];
+	m_A78 += gt[96];
+	m_A78 += gt[97];
+	m_A79 += go[96];
+	double RHS26 = Idr[96];
+	RHS26 += Idr[97];
+	RHS26 -= go[97] * *cnV[97];
+	m_A80 += gt[98];
+	m_A80 += gt[99];
+	m_A81 += go[98];
+	double RHS27 = Idr[98];
+	RHS27 += Idr[99];
+	RHS27 -= go[99] * *cnV[99];
+	m_A82 += gt[100];
+	m_A82 += gt[101];
+	m_A83 += go[100];
+	double RHS28 = Idr[100];
+	RHS28 += Idr[101];
+	RHS28 -= go[101] * *cnV[101];
+	m_A86 += gt[102];
+	m_A86 += gt[103];
+	m_A86 += gt[104];
+	m_A86 += gt[105];
+	m_A85 += go[102];
+	m_A84 += go[103];
+	double RHS29 = Idr[102];
+	RHS29 += Idr[103];
+	RHS29 += Idr[104];
+	RHS29 += Idr[105];
+	RHS29 -= go[104] * *cnV[104];
+	RHS29 -= go[105] * *cnV[105];
+	m_A92 += gt[106];
+	m_A92 += gt[107];
+	m_A92 += gt[108];
+	m_A92 += gt[109];
+	m_A90 += go[106];
+	m_A89 += go[107];
+	double RHS30 = Idr[106];
+	RHS30 += Idr[107];
+	RHS30 += Idr[108];
+	RHS30 += Idr[109];
+	RHS30 -= go[108] * *cnV[108];
+	RHS30 -= go[109] * *cnV[109];
+	m_A99 += gt[110];
+	m_A99 += gt[111];
+	m_A99 += gt[112];
+	m_A99 += gt[113];
+	m_A97 += go[110];
+	m_A98 += go[111];
+	double RHS31 = Idr[110];
+	RHS31 += Idr[111];
+	RHS31 += Idr[112];
+	RHS31 += Idr[113];
+	RHS31 -= go[112] * *cnV[112];
+	RHS31 -= go[113] * *cnV[113];
+	m_A104 += gt[114];
+	m_A104 += gt[115];
+	m_A104 += gt[116];
+	m_A103 += go[114];
+	m_A105 += go[115];
+	double RHS32 = Idr[114];
+	RHS32 += Idr[115];
+	RHS32 += Idr[116];
+	RHS32 -= go[116] * *cnV[116];
+	m_A108 += gt[117];
+	m_A108 += gt[118];
+	m_A108 += gt[119];
+	m_A108 += gt[120];
+	m_A107 += go[117];
+	m_A106 += go[118];
+	double RHS33 = Idr[117];
+	RHS33 += Idr[118];
+	RHS33 += Idr[119];
+	RHS33 += Idr[120];
+	RHS33 -= go[119] * *cnV[119];
+	RHS33 -= go[120] * *cnV[120];
+	m_A113 += gt[121];
+	m_A113 += gt[122];
+	m_A113 += gt[123];
+	m_A113 += gt[124];
+	m_A111 += go[121];
+	m_A112 += go[122];
+	m_A114 += go[123];
+	double RHS34 = Idr[121];
+	RHS34 += Idr[122];
+	RHS34 += Idr[123];
+	RHS34 += Idr[124];
+	RHS34 -= go[124] * *cnV[124];
+	m_A116 += gt[125];
+	m_A116 += gt[126];
+	m_A116 += gt[127];
+	m_A115 += go[125];
+	m_A117 += go[126];
+	double RHS35 = Idr[125];
+	RHS35 += Idr[126];
+	RHS35 += Idr[127];
+	RHS35 -= go[127] * *cnV[127];
+	m_A120 += gt[128];
+	m_A120 += gt[129];
+	m_A120 += gt[130];
+	m_A121 += go[128];
+	m_A118 += go[129];
+	double RHS36 = Idr[128];
+	RHS36 += Idr[129];
+	RHS36 += Idr[130];
+	RHS36 -= go[130] * *cnV[130];
+	m_A127 += gt[131];
+	m_A127 += gt[132];
+	m_A127 += gt[133];
+	m_A127 += gt[134];
+	m_A129 += go[131];
+	m_A124 += go[132];
+	m_A123 += go[133];
+	double RHS37 = Idr[131];
+	RHS37 += Idr[132];
+	RHS37 += Idr[133];
+	RHS37 += Idr[134];
+	RHS37 -= go[134] * *cnV[134];
+	m_A135 += gt[135];
+	m_A135 += gt[136];
+	m_A135 += gt[137];
+	m_A135 += gt[138];
+	m_A133 += go[135];
+	m_A132 += go[136];
+	double RHS38 = Idr[135];
+	RHS38 += Idr[136];
+	RHS38 += Idr[137];
+	RHS38 += Idr[138];
+	RHS38 -= go[137] * *cnV[137];
+	RHS38 -= go[138] * *cnV[138];
+	m_A140 += gt[139];
+	m_A140 += gt[140];
+	m_A140 += gt[141];
+	m_A141 += go[139];
+	double RHS39 = Idr[139];
+	RHS39 += Idr[140];
+	RHS39 += Idr[141];
+	RHS39 -= go[140] * *cnV[140];
+	RHS39 -= go[141] * *cnV[141];
+	m_A143 += gt[142];
+	m_A143 += gt[143];
+	m_A143 += gt[144];
+	m_A142 += go[142];
+	m_A144 += go[143];
+	double RHS40 = Idr[142];
+	RHS40 += Idr[143];
+	RHS40 += Idr[144];
+	RHS40 -= go[144] * *cnV[144];
+	m_A147 += gt[145];
+	m_A147 += gt[146];
+	m_A147 += gt[147];
+	m_A147 += gt[148];
+	m_A145 += go[145];
+	m_A146 += go[146];
+	m_A148 += go[147];
+	double RHS41 = Idr[145];
+	RHS41 += Idr[146];
+	RHS41 += Idr[147];
+	RHS41 += Idr[148];
+	RHS41 -= go[148] * *cnV[148];
+	m_A153 += gt[149];
+	m_A153 += gt[150];
+	m_A153 += gt[151];
+	m_A153 += gt[152];
+	m_A153 += gt[153];
+	m_A153 += gt[154];
+	m_A153 += gt[155];
+	m_A151 += go[149];
+	m_A150 += go[150];
+	m_A156 += go[151];
+	m_A149 += go[152];
+	m_A157 += go[153];
+	double RHS42 = Idr[149];
+	RHS42 += Idr[150];
+	RHS42 += Idr[151];
+	RHS42 += Idr[152];
+	RHS42 += Idr[153];
+	RHS42 += Idr[154];
+	RHS42 += Idr[155];
+	RHS42 -= go[154] * *cnV[154];
+	RHS42 -= go[155] * *cnV[155];
+	m_A163 += gt[156];
+	m_A163 += gt[157];
+	m_A163 += gt[158];
+	m_A163 += gt[159];
+	m_A163 += gt[160];
+	m_A163 += gt[161];
+	m_A167 += go[156];
+	m_A160 += go[157];
+	m_A159 += go[158];
+	m_A158 += go[159];
+	m_A165 += go[160];
+	double RHS43 = Idr[156];
+	RHS43 += Idr[157];
+	RHS43 += Idr[158];
+	RHS43 += Idr[159];
+	RHS43 += Idr[160];
+	RHS43 += Idr[161];
+	RHS43 -= go[161] * *cnV[161];
+	m_A170 += gt[162];
+	m_A170 += gt[163];
+	m_A174 += go[162];
+	m_A168 += go[163];
+	double RHS44 = Idr[162];
+	RHS44 += Idr[163];
+	m_A180 += gt[164];
+	m_A180 += gt[165];
+	m_A180 += gt[166];
+	m_A180 += gt[167];
+	m_A180 += gt[168];
+	m_A180 += gt[169];
+	m_A175 += go[164];
+	m_A177 += go[165];
+	m_A179 += go[166];
+	m_A176 += go[167];
+	double RHS45 = Idr[164];
+	RHS45 += Idr[165];
+	RHS45 += Idr[166];
+	RHS45 += Idr[167];
+	RHS45 += Idr[168];
+	RHS45 += Idr[169];
+	RHS45 -= go[168] * *cnV[168];
+	RHS45 -= go[169] * *cnV[169];
+	m_A184 += gt[170];
+	m_A184 += gt[171];
+	m_A185 += go[170];
+	m_A183 += go[171];
+	double RHS46 = Idr[170];
+	RHS46 += Idr[171];
+	m_A192 += gt[172];
+	m_A192 += gt[173];
+	m_A192 += gt[174];
+	m_A192 += gt[175];
+	m_A192 += gt[176];
+	m_A192 += gt[177];
+	m_A189 += go[172];
+	m_A188 += go[173];
+	m_A187 += go[174];
+	m_A187 += go[175];
+	m_A190 += go[176];
+	double RHS47 = Idr[172];
+	RHS47 += Idr[173];
+	RHS47 += Idr[174];
+	RHS47 += Idr[175];
+	RHS47 += Idr[176];
+	RHS47 += Idr[177];
+	RHS47 -= go[177] * *cnV[177];
+	m_A202 += gt[178];
+	m_A202 += gt[179];
+	m_A202 += gt[180];
+	m_A202 += gt[181];
+	m_A196 += go[178];
+	m_A197 += go[179];
+	m_A204 += go[180];
+	m_A199 += go[181];
+	double RHS48 = Idr[178];
+	RHS48 += Idr[179];
+	RHS48 += Idr[180];
+	RHS48 += Idr[181];
+	m_A206 += gt[182];
+	m_A206 += gt[183];
+	m_A206 += gt[184];
+	m_A205 += go[182];
+	m_A207 += go[183];
+	double RHS49 = Idr[182];
+	RHS49 += Idr[183];
+	RHS49 += Idr[184];
+	RHS49 -= go[184] * *cnV[184];
+	m_A215 += gt[185];
+	m_A215 += gt[186];
+	m_A215 += gt[187];
+	m_A215 += gt[188];
+	m_A212 += go[185];
+	m_A209 += go[186];
+	m_A208 += go[187];
+	double RHS50 = Idr[185];
+	RHS50 += Idr[186];
+	RHS50 += Idr[187];
+	RHS50 += Idr[188];
+	RHS50 -= go[188] * *cnV[188];
+	m_A227 += gt[189];
+	m_A227 += gt[190];
+	m_A227 += gt[191];
+	m_A227 += gt[192];
+	m_A227 += gt[193];
+	m_A227 += gt[194];
+	m_A223 += go[189];
+	m_A224 += go[190];
+	m_A221 += go[191];
+	m_A219 += go[192];
+	m_A220 += go[193];
+	double RHS51 = Idr[189];
+	RHS51 += Idr[190];
+	RHS51 += Idr[191];
+	RHS51 += Idr[192];
+	RHS51 += Idr[193];
+	RHS51 += Idr[194];
+	RHS51 -= go[194] * *cnV[194];
+	m_A237 += gt[195];
+	m_A237 += gt[196];
+	m_A237 += gt[197];
+	m_A237 += gt[198];
+	m_A231 += go[195];
+	m_A230 += go[196];
+	m_A233 += go[197];
+	m_A232 += go[198];
+	double RHS52 = Idr[195];
+	RHS52 += Idr[196];
+	RHS52 += Idr[197];
+	RHS52 += Idr[198];
+	m_A250 += gt[199];
+	m_A250 += gt[200];
+	m_A250 += gt[201];
+	m_A250 += gt[202];
+	m_A250 += gt[203];
+	m_A250 += gt[204];
+	m_A245 += go[199];
+	m_A252 += go[200];
+	m_A243 += go[201];
+	m_A241 += go[202];
+	m_A242 += go[203];
+	double RHS53 = Idr[199];
+	RHS53 += Idr[200];
+	RHS53 += Idr[201];
+	RHS53 += Idr[202];
+	RHS53 += Idr[203];
+	RHS53 += Idr[204];
+	RHS53 -= go[204] * *cnV[204];
+	m_A264 += gt[205];
+	m_A264 += gt[206];
+	m_A264 += gt[207];
+	m_A264 += gt[208];
+	m_A264 += gt[209];
+	m_A264 += gt[210];
+	m_A257 += go[205];
+	m_A255 += go[206];
+	m_A254 += go[207];
+	m_A253 += go[208];
+	m_A259 += go[209];
+	double RHS54 = Idr[205];
+	RHS54 += Idr[206];
+	RHS54 += Idr[207];
+	RHS54 += Idr[208];
+	RHS54 += Idr[209];
+	RHS54 += Idr[210];
+	RHS54 -= go[210] * *cnV[210];
+	m_A276 += gt[211];
+	m_A276 += gt[212];
+	m_A276 += gt[213];
+	m_A276 += gt[214];
+	m_A276 += gt[215];
+	m_A276 += gt[216];
+	m_A276 += gt[217];
+	m_A272 += go[211];
+	m_A271 += go[212];
+	m_A270 += go[213];
+	m_A269 += go[214];
+	m_A268 += go[215];
+	m_A267 += go[216];
+	double RHS55 = Idr[211];
+	RHS55 += Idr[212];
+	RHS55 += Idr[213];
+	RHS55 += Idr[214];
+	RHS55 += Idr[215];
+	RHS55 += Idr[216];
+	RHS55 += Idr[217];
+	RHS55 -= go[217] * *cnV[217];
+	m_A290 += gt[218];
+	m_A290 += gt[219];
+	m_A290 += gt[220];
+	m_A290 += gt[221];
+	m_A290 += gt[222];
+	m_A290 += gt[223];
+	m_A290 += gt[224];
+	m_A280 += go[218];
+	m_A279 += go[219];
+	m_A287 += go[220];
+	m_A278 += go[221];
+	m_A283 += go[222];
+	double RHS56 = Idr[218];
+	RHS56 += Idr[219];
+	RHS56 += Idr[220];
+	RHS56 += Idr[221];
+	RHS56 += Idr[222];
+	RHS56 += Idr[223];
+	RHS56 += Idr[224];
+	RHS56 -= go[223] * *cnV[223];
+	RHS56 -= go[224] * *cnV[224];
+	const double f0 = 1.0 / m_A0;
+	const double f0_29 = -f0 * m_A84;
+	m_A86 += m_A1 * f0_29;
+	RHS29 += f0_29 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_32 = -f1 * m_A103;
+	m_A104 += m_A3 * f1_32;
+	RHS32 += f1_32 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_29 = -f2 * m_A85;
+	m_A86 += m_A5 * f2_29;
+	m_A87 += m_A6 * f2_29;
+	m_A88 += m_A7 * f2_29;
+	RHS29 += f2_29 * RHS2;
+	const double f2_30 = -f2 * m_A89;
+	m_A91 += m_A5 * f2_30;
+	m_A92 += m_A6 * f2_30;
+	m_A93 += m_A7 * f2_30;
+	RHS30 += f2_30 * RHS2;
+	const double f2_37 = -f2 * m_A123;
+	m_A125 += m_A5 * f2_37;
+	m_A126 += m_A6 * f2_37;
+	m_A127 += m_A7 * f2_37;
+	RHS37 += f2_37 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_34 = -f3 * m_A111;
+	m_A113 += m_A9 * f3_34;
+	RHS34 += f3_34 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_43 = -f4 * m_A158;
+	m_A163 += m_A11 * f4_43;
+	m_A165 += m_A12 * f4_43;
+	RHS43 += f4_43 * RHS4;
+	const double f4_52 = -f4 * m_A230;
+	m_A233 += m_A11 * f4_52;
+	m_A237 += m_A12 * f4_52;
+	RHS52 += f4_52 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_34 = -f5 * m_A112;
+	m_A113 += m_A14 * f5_34;
+	m_A114 += m_A15 * f5_34;
+	RHS34 += f5_34 * RHS5;
+	const double f5_53 = -f5 * m_A241;
+	m_A245 += m_A14 * f5_53;
+	m_A250 += m_A15 * f5_53;
+	RHS53 += f5_53 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_30 = -f6 * m_A90;
+	m_A92 += m_A17 * f6_30;
+	m_A94 += m_A18 * f6_30;
+	m_A95 += m_A19 * f6_30;
+	m_A96 += m_A20 * f6_30;
+	RHS30 += f6_30 * RHS6;
+	const double f6_43 = -f6 * m_A159;
+	m_A161 += m_A17 * f6_43;
+	m_A163 += m_A18 * f6_43;
+	m_A166 += m_A19 * f6_43;
+	m_A167 += m_A20 * f6_43;
+	RHS43 += f6_43 * RHS6;
+	const double f6_53 = -f6 * m_A242;
+	m_A244 += m_A17 * f6_53;
+	m_A247 += m_A18 * f6_53;
+	m_A250 += m_A19 * f6_53;
+	m_A252 += m_A20 * f6_53;
+	RHS53 += f6_53 * RHS6;
+	const double f6_56 = -f6 * m_A278;
+	m_A281 += m_A17 * f6_56;
+	m_A283 += m_A18 * f6_56;
+	m_A287 += m_A19 * f6_56;
+	m_A290 += m_A20 * f6_56;
+	RHS56 += f6_56 * RHS6;
+	const double f7 = 1.0 / m_A21;
+	const double f7_33 = -f7 * m_A106;
+	m_A108 += m_A22 * f7_33;
+	RHS33 += f7_33 * RHS7;
+	const double f8 = 1.0 / m_A23;
+	const double f8_35 = -f8 * m_A115;
+	m_A116 += m_A24 * f8_35;
+	RHS35 += f8_35 * RHS8;
+	const double f9 = 1.0 / m_A25;
+	const double f9_37 = -f9 * m_A124;
+	m_A127 += m_A26 * f9_37;
+	m_A128 += m_A27 * f9_37;
+	m_A130 += m_A28 * f9_37;
+	m_A131 += m_A29 * f9_37;
+	RHS37 += f9_37 * RHS9;
+	const double f9_43 = -f9 * m_A160;
+	m_A162 += m_A26 * f9_43;
+	m_A163 += m_A27 * f9_43;
+	m_A166 += m_A28 * f9_43;
+	m_A167 += m_A29 * f9_43;
+	RHS43 += f9_43 * RHS9;
+	const double f9_53 = -f9 * m_A243;
+	m_A246 += m_A26 * f9_53;
+	m_A247 += m_A27 * f9_53;
+	m_A250 += m_A28 * f9_53;
+	m_A252 += m_A29 * f9_53;
+	RHS53 += f9_53 * RHS9;
+	const double f9_56 = -f9 * m_A279;
+	m_A282 += m_A26 * f9_56;
+	m_A283 += m_A27 * f9_56;
+	m_A287 += m_A28 * f9_56;
+	m_A290 += m_A29 * f9_56;
+	RHS56 += f9_56 * RHS9;
+	const double f10 = 1.0 / m_A30;
+	const double f10_31 = -f10 * m_A97;
+	m_A99 += m_A31 * f10_31;
+	m_A102 += m_A32 * f10_31;
+	RHS31 += f10_31 * RHS10;
+	const double f10_48 = -f10 * m_A196;
+	m_A198 += m_A31 * f10_48;
+	m_A202 += m_A32 * f10_48;
+	RHS48 += f10_48 * RHS10;
+	const double f11 = 1.0 / m_A33;
+	const double f11_41 = -f11 * m_A145;
+	m_A147 += m_A34 * f11_41;
+	RHS41 += f11_41 * RHS11;
+	const double f12 = 1.0 / m_A35;
+	const double f12_45 = -f12 * m_A175;
+	m_A179 += m_A36 * f12_45;
+	RHS45 += f12_45 * RHS12;
+	const double f13 = 1.0 / m_A37;
+	const double f13_31 = -f13 * m_A98;
+	m_A99 += m_A38 * f13_31;
+	m_A100 += m_A39 * f13_31;
+	m_A101 += m_A40 * f13_31;
+	RHS31 += f13_31 * RHS13;
+	const double f13_36 = -f13 * m_A118;
+	m_A119 += m_A38 * f13_36;
+	m_A120 += m_A39 * f13_36;
+	m_A121 += m_A40 * f13_36;
+	RHS36 += f13_36 * RHS13;
+	const double f13_45 = -f13 * m_A176;
+	m_A178 += m_A38 * f13_45;
+	m_A179 += m_A39 * f13_45;
+	m_A180 += m_A40 * f13_45;
+	RHS45 += f13_45 * RHS13;
+	const double f14 = 1.0 / m_A41;
+	const double f14_45 = -f14 * m_A177;
+	m_A180 += m_A42 * f14_45;
+	m_A182 += m_A43 * f14_45;
+	RHS45 += f14_45 * RHS14;
+	const double f14_52 = -f14 * m_A231;
+	m_A234 += m_A42 * f14_52;
+	m_A237 += m_A43 * f14_52;
+	RHS52 += f14_52 * RHS14;
+	const double f15 = 1.0 / m_A44;
+	const double f15_40 = -f15 * m_A142;
+	m_A143 += m_A45 * f15_40;
+	RHS40 += f15_40 * RHS15;
+	const double f16 = 1.0 / m_A46;
+	const double f16_33 = -f16 * m_A107;
+	m_A108 += m_A47 * f16_33;
+	m_A109 += m_A48 * f16_33;
+	m_A110 += m_A49 * f16_33;
+	RHS33 += f16_33 * RHS16;
+	const double f16_38 = -f16 * m_A132;
+	m_A134 += m_A47 * f16_38;
+	m_A135 += m_A48 * f16_38;
+	m_A137 += m_A49 * f16_38;
+	RHS38 += f16_38 * RHS16;
+	const double f16_50 = -f16 * m_A208;
+	m_A210 += m_A47 * f16_50;
+	m_A211 += m_A48 * f16_50;
+	m_A215 += m_A49 * f16_50;
+	RHS50 += f16_50 * RHS16;
+	const double f17 = 1.0 / m_A50;
+	const double f17_48 = -f17 * m_A197;
+	m_A202 += m_A51 * f17_48;
+	m_A204 += m_A52 * f17_48;
+	RHS48 += f17_48 * RHS17;
+	const double f17_54 = -f17 * m_A253;
+	m_A259 += m_A51 * f17_54;
+	m_A264 += m_A52 * f17_54;
+	RHS54 += f17_54 * RHS17;
+	const double f18 = 1.0 / m_A53;
+	const double f18_41 = -f18 * m_A146;
+	m_A147 += m_A54 * f18_41;
+	m_A148 += m_A55 * f18_41;
+	RHS41 += f18_41 * RHS18;
+	const double f18_51 = -f18 * m_A219;
+	m_A223 += m_A54 * f18_51;
+	m_A227 += m_A55 * f18_51;
+	RHS51 += f18_51 * RHS18;
+	const double f19 = 1.0 / m_A56;
+	const double f19_47 = -f19 * m_A187;
+	m_A192 += m_A57 * f19_47;
+	RHS47 += f19_47 * RHS19;
+	const double f20 = 1.0 / m_A58;
+	const double f20_38 = -f20 * m_A133;
+	m_A135 += m_A59 * f20_38;
+	m_A136 += m_A60 * f20_38;
+	m_A138 += m_A61 * f20_38;
+	m_A139 += m_A62 * f20_38;
+	RHS38 += f20_38 * RHS20;
+	const double f20_42 = -f20 * m_A149;
+	m_A152 += m_A59 * f20_42;
+	m_A153 += m_A60 * f20_42;
+	m_A156 += m_A61 * f20_42;
+	m_A157 += m_A62 * f20_42;
+	RHS42 += f20_42 * RHS20;
+	const double f20_51 = -f20 * m_A220;
+	m_A222 += m_A59 * f20_51;
+	m_A224 += m_A60 * f20_51;
+	m_A227 += m_A61 * f20_51;
+	m_A228 += m_A62 * f20_51;
+	RHS51 += f20_51 * RHS20;
+	const double f20_54 = -f20 * m_A254;
+	m_A256 += m_A59 * f20_54;
+	m_A257 += m_A60 * f20_54;
+	m_A261 += m_A61 * f20_54;
+	m_A264 += m_A62 * f20_54;
+	RHS54 += f20_54 * RHS20;
+	const double f21 = 1.0 / m_A63;
+	const double f21_42 = -f21 * m_A150;
+	m_A153 += m_A64 * f21_42;
+	m_A155 += m_A65 * f21_42;
+	m_A156 += m_A66 * f21_42;
+	m_A157 += m_A67 * f21_42;
+	RHS42 += f21_42 * RHS21;
+	const double f21_50 = -f21 * m_A209;
+	m_A213 += m_A64 * f21_50;
+	m_A215 += m_A65 * f21_50;
+	m_A216 += m_A66 * f21_50;
+	m_A217 += m_A67 * f21_50;
+	RHS50 += f21_50 * RHS21;
+	const double f21_51 = -f21 * m_A221;
+	m_A224 += m_A64 * f21_51;
+	m_A226 += m_A65 * f21_51;
+	m_A227 += m_A66 * f21_51;
+	m_A228 += m_A67 * f21_51;
+	RHS51 += f21_51 * RHS21;
+	const double f21_54 = -f21 * m_A255;
+	m_A257 += m_A64 * f21_54;
+	m_A260 += m_A65 * f21_54;
+	m_A261 += m_A66 * f21_54;
+	m_A264 += m_A67 * f21_54;
+	RHS54 += f21_54 * RHS21;
+	const double f22 = 1.0 / m_A68;
+	const double f22_47 = -f22 * m_A188;
+	m_A192 += m_A69 * f22_47;
+	RHS47 += f22_47 * RHS22;
+	const double f23 = 1.0 / m_A70;
+	const double f23_47 = -f23 * m_A189;
+	m_A192 += m_A71 * f23_47;
+	RHS47 += f23_47 * RHS23;
+	const double f24 = 1.0 / m_A72;
+	const double f24_42 = -f24 * m_A151;
+	m_A153 += m_A73 * f24_42;
+	m_A154 += m_A74 * f24_42;
+	RHS42 += f24_42 * RHS24;
+	const double f24_44 = -f24 * m_A168;
+	m_A169 += m_A73 * f24_44;
+	m_A170 += m_A74 * f24_44;
+	RHS44 += f24_44 * RHS24;
+	const double f25 = 1.0 / m_A75;
+	const double f25_46 = -f25 * m_A183;
+	m_A184 += m_A76 * f25_46;
+	m_A186 += m_A77 * f25_46;
+	RHS46 += f25_46 * RHS25;
+	const double f25_56 = -f25 * m_A280;
+	m_A284 += m_A76 * f25_56;
+	m_A290 += m_A77 * f25_56;
+	RHS56 += f25_56 * RHS25;
+	const double f26 = 1.0 / m_A78;
+	const double f26_55 = -f26 * m_A267;
+	m_A276 += m_A79 * f26_55;
+	RHS55 += f26_55 * RHS26;
+	const double f27 = 1.0 / m_A80;
+	const double f27_55 = -f27 * m_A268;
+	m_A276 += m_A81 * f27_55;
+	RHS55 += f27_55 * RHS27;
+	const double f28 = 1.0 / m_A82;
+	const double f28_49 = -f28 * m_A205;
+	m_A206 += m_A83 * f28_49;
+	RHS49 += f28_49 * RHS28;
+	const double f29 = 1.0 / m_A86;
+	const double f29_30 = -f29 * m_A91;
+	m_A92 += m_A87 * f29_30;
+	m_A93 += m_A88 * f29_30;
+	RHS30 += f29_30 * RHS29;
+	const double f29_37 = -f29 * m_A125;
+	m_A126 += m_A87 * f29_37;
+	m_A127 += m_A88 * f29_37;
+	RHS37 += f29_37 * RHS29;
+	const double f30 = 1.0 / m_A92;
+	const double f30_37 = -f30 * m_A126;
+	m_A127 += m_A93 * f30_37;
+	m_A128 += m_A94 * f30_37;
+	m_A130 += m_A95 * f30_37;
+	m_A131 += m_A96 * f30_37;
+	RHS37 += f30_37 * RHS30;
+	const double f30_43 = -f30 * m_A161;
+	m_A162 += m_A93 * f30_43;
+	m_A163 += m_A94 * f30_43;
+	m_A166 += m_A95 * f30_43;
+	m_A167 += m_A96 * f30_43;
+	RHS43 += f30_43 * RHS30;
+	const double f30_53 = -f30 * m_A244;
+	m_A246 += m_A93 * f30_53;
+	m_A247 += m_A94 * f30_53;
+	m_A250 += m_A95 * f30_53;
+	m_A252 += m_A96 * f30_53;
+	RHS53 += f30_53 * RHS30;
+	const double f30_56 = -f30 * m_A281;
+	m_A282 += m_A93 * f30_56;
+	m_A283 += m_A94 * f30_56;
+	m_A287 += m_A95 * f30_56;
+	m_A290 += m_A96 * f30_56;
+	RHS56 += f30_56 * RHS30;
+	const double f31 = 1.0 / m_A99;
+	const double f31_36 = -f31 * m_A119;
+	m_A120 += m_A100 * f31_36;
+	m_A121 += m_A101 * f31_36;
+	m_A122 += m_A102 * f31_36;
+	RHS36 += f31_36 * RHS31;
+	const double f31_45 = -f31 * m_A178;
+	m_A179 += m_A100 * f31_45;
+	m_A180 += m_A101 * f31_45;
+	m_A181 += m_A102 * f31_45;
+	RHS45 += f31_45 * RHS31;
+	const double f31_48 = -f31 * m_A198;
+	m_A200 += m_A100 * f31_48;
+	m_A201 += m_A101 * f31_48;
+	m_A202 += m_A102 * f31_48;
+	RHS48 += f31_48 * RHS31;
+	const double f32 = 1.0 / m_A104;
+	const double f32_52 = -f32 * m_A232;
+	m_A237 += m_A105 * f32_52;
+	RHS52 += f32_52 * RHS32;
+	const double f33 = 1.0 / m_A108;
+	const double f33_38 = -f33 * m_A134;
+	m_A135 += m_A109 * f33_38;
+	m_A137 += m_A110 * f33_38;
+	RHS38 += f33_38 * RHS33;
+	const double f33_50 = -f33 * m_A210;
+	m_A211 += m_A109 * f33_50;
+	m_A215 += m_A110 * f33_50;
+	RHS50 += f33_50 * RHS33;
+	const double f34 = 1.0 / m_A113;
+	const double f34_53 = -f34 * m_A245;
+	m_A250 += m_A114 * f34_53;
+	RHS53 += f34_53 * RHS34;
+	const double f35 = 1.0 / m_A116;
+	const double f35_48 = -f35 * m_A199;
+	m_A202 += m_A117 * f35_48;
+	RHS48 += f35_48 * RHS35;
+	const double f36 = 1.0 / m_A120;
+	const double f36_45 = -f36 * m_A179;
+	m_A180 += m_A121 * f36_45;
+	m_A181 += m_A122 * f36_45;
+	RHS45 += f36_45 * RHS36;
+	const double f36_48 = -f36 * m_A200;
+	m_A201 += m_A121 * f36_48;
+	m_A202 += m_A122 * f36_48;
+	RHS48 += f36_48 * RHS36;
+	const double f37 = 1.0 / m_A127;
+	const double f37_43 = -f37 * m_A162;
+	m_A163 += m_A128 * f37_43;
+	m_A164 += m_A129 * f37_43;
+	m_A166 += m_A130 * f37_43;
+	m_A167 += m_A131 * f37_43;
+	RHS43 += f37_43 * RHS37;
+	const double f37_47 = -f37 * m_A190;
+	m_A191 += m_A128 * f37_47;
+	m_A192 += m_A129 * f37_47;
+	m_A194 += m_A130 * f37_47;
+	m_A195 += m_A131 * f37_47;
+	RHS47 += f37_47 * RHS37;
+	const double f37_53 = -f37 * m_A246;
+	m_A247 += m_A128 * f37_53;
+	m_A248 += m_A129 * f37_53;
+	m_A250 += m_A130 * f37_53;
+	m_A252 += m_A131 * f37_53;
+	RHS53 += f37_53 * RHS37;
+	const double f37_56 = -f37 * m_A282;
+	m_A283 += m_A128 * f37_56;
+	m_A285 += m_A129 * f37_56;
+	m_A287 += m_A130 * f37_56;
+	m_A290 += m_A131 * f37_56;
+	RHS56 += f37_56 * RHS37;
+	const double f38 = 1.0 / m_A135;
+	const double f38_42 = -f38 * m_A152;
+	m_A153 += m_A136 * f38_42;
+	m_A155 += m_A137 * f38_42;
+	m_A156 += m_A138 * f38_42;
+	m_A157 += m_A139 * f38_42;
+	RHS42 += f38_42 * RHS38;
+	const double f38_50 = -f38 * m_A211;
+	m_A213 += m_A136 * f38_50;
+	m_A215 += m_A137 * f38_50;
+	m_A216 += m_A138 * f38_50;
+	m_A217 += m_A139 * f38_50;
+	RHS50 += f38_50 * RHS38;
+	const double f38_51 = -f38 * m_A222;
+	m_A224 += m_A136 * f38_51;
+	m_A226 += m_A137 * f38_51;
+	m_A227 += m_A138 * f38_51;
+	m_A228 += m_A139 * f38_51;
+	RHS51 += f38_51 * RHS38;
+	const double f38_54 = -f38 * m_A256;
+	m_A257 += m_A136 * f38_54;
+	m_A260 += m_A137 * f38_54;
+	m_A261 += m_A138 * f38_54;
+	m_A264 += m_A139 * f38_54;
+	RHS54 += f38_54 * RHS38;
+	const double f39 = 1.0 / m_A140;
+	const double f39_55 = -f39 * m_A269;
+	m_A276 += m_A141 * f39_55;
+	RHS55 += f39_55 * RHS39;
+	const double f40 = 1.0 / m_A143;
+	const double f40_50 = -f40 * m_A212;
+	m_A215 += m_A144 * f40_50;
+	RHS50 += f40_50 * RHS40;
+	const double f41 = 1.0 / m_A147;
+	const double f41_51 = -f41 * m_A223;
+	m_A227 += m_A148 * f41_51;
+	RHS51 += f41_51 * RHS41;
+	const double f42 = 1.0 / m_A153;
+	const double f42_44 = -f42 * m_A169;
+	m_A170 += m_A154 * f42_44;
+	m_A171 += m_A155 * f42_44;
+	m_A172 += m_A156 * f42_44;
+	m_A173 += m_A157 * f42_44;
+	RHS44 += f42_44 * RHS42;
+	const double f42_50 = -f42 * m_A213;
+	m_A214 += m_A154 * f42_50;
+	m_A215 += m_A155 * f42_50;
+	m_A216 += m_A156 * f42_50;
+	m_A217 += m_A157 * f42_50;
+	RHS50 += f42_50 * RHS42;
+	const double f42_51 = -f42 * m_A224;
+	m_A225 += m_A154 * f42_51;
+	m_A226 += m_A155 * f42_51;
+	m_A227 += m_A156 * f42_51;
+	m_A228 += m_A157 * f42_51;
+	RHS51 += f42_51 * RHS42;
+	const double f42_54 = -f42 * m_A257;
+	m_A258 += m_A154 * f42_54;
+	m_A260 += m_A155 * f42_54;
+	m_A261 += m_A156 * f42_54;
+	m_A264 += m_A157 * f42_54;
+	RHS54 += f42_54 * RHS42;
+	const double f43 = 1.0 / m_A163;
+	const double f43_47 = -f43 * m_A191;
+	m_A192 += m_A164 * f43_47;
+	m_A193 += m_A165 * f43_47;
+	m_A194 += m_A166 * f43_47;
+	m_A195 += m_A167 * f43_47;
+	RHS47 += f43_47 * RHS43;
+	const double f43_52 = -f43 * m_A233;
+	m_A235 += m_A164 * f43_52;
+	m_A237 += m_A165 * f43_52;
+	m_A238 += m_A166 * f43_52;
+	m_A240 += m_A167 * f43_52;
+	RHS52 += f43_52 * RHS43;
+	const double f43_53 = -f43 * m_A247;
+	m_A248 += m_A164 * f43_53;
+	m_A249 += m_A165 * f43_53;
+	m_A250 += m_A166 * f43_53;
+	m_A252 += m_A167 * f43_53;
+	RHS53 += f43_53 * RHS43;
+	const double f43_56 = -f43 * m_A283;
+	m_A285 += m_A164 * f43_56;
+	m_A286 += m_A165 * f43_56;
+	m_A287 += m_A166 * f43_56;
+	m_A290 += m_A167 * f43_56;
+	RHS56 += f43_56 * RHS43;
+	const double f44 = 1.0 / m_A170;
+	const double f44_50 = -f44 * m_A214;
+	m_A215 += m_A171 * f44_50;
+	m_A216 += m_A172 * f44_50;
+	m_A217 += m_A173 * f44_50;
+	m_A218 += m_A174 * f44_50;
+	RHS50 += f44_50 * RHS44;
+	const double f44_51 = -f44 * m_A225;
+	m_A226 += m_A171 * f44_51;
+	m_A227 += m_A172 * f44_51;
+	m_A228 += m_A173 * f44_51;
+	m_A229 += m_A174 * f44_51;
+	RHS51 += f44_51 * RHS44;
+	const double f44_54 = -f44 * m_A258;
+	m_A260 += m_A171 * f44_54;
+	m_A261 += m_A172 * f44_54;
+	m_A264 += m_A173 * f44_54;
+	m_A265 += m_A174 * f44_54;
+	RHS54 += f44_54 * RHS44;
+	const double f44_55 = -f44 * m_A270;
+	m_A273 += m_A171 * f44_55;
+	m_A274 += m_A172 * f44_55;
+	m_A275 += m_A173 * f44_55;
+	m_A276 += m_A174 * f44_55;
+	RHS55 += f44_55 * RHS44;
+	const double f45 = 1.0 / m_A180;
+	const double f45_48 = -f45 * m_A201;
+	m_A202 += m_A181 * f45_48;
+	m_A203 += m_A182 * f45_48;
+	RHS48 += f45_48 * RHS45;
+	const double f45_52 = -f45 * m_A234;
+	m_A236 += m_A181 * f45_52;
+	m_A237 += m_A182 * f45_52;
+	RHS52 += f45_52 * RHS45;
+	const double f46 = 1.0 / m_A184;
+	const double f46_55 = -f46 * m_A271;
+	m_A276 += m_A185 * f46_55;
+	m_A277 += m_A186 * f46_55;
+	RHS55 += f46_55 * RHS46;
+	const double f46_56 = -f46 * m_A284;
+	m_A289 += m_A185 * f46_56;
+	m_A290 += m_A186 * f46_56;
+	RHS56 += f46_56 * RHS46;
+	const double f47 = 1.0 / m_A192;
+	const double f47_52 = -f47 * m_A235;
+	m_A237 += m_A193 * f47_52;
+	m_A238 += m_A194 * f47_52;
+	m_A240 += m_A195 * f47_52;
+	RHS52 += f47_52 * RHS47;
+	const double f47_53 = -f47 * m_A248;
+	m_A249 += m_A193 * f47_53;
+	m_A250 += m_A194 * f47_53;
+	m_A252 += m_A195 * f47_53;
+	RHS53 += f47_53 * RHS47;
+	const double f47_56 = -f47 * m_A285;
+	m_A286 += m_A193 * f47_56;
+	m_A287 += m_A194 * f47_56;
+	m_A290 += m_A195 * f47_56;
+	RHS56 += f47_56 * RHS47;
+	const double f48 = 1.0 / m_A202;
+	const double f48_52 = -f48 * m_A236;
+	m_A237 += m_A203 * f48_52;
+	m_A239 += m_A204 * f48_52;
+	RHS52 += f48_52 * RHS48;
+	const double f48_54 = -f48 * m_A259;
+	m_A262 += m_A203 * f48_54;
+	m_A264 += m_A204 * f48_54;
+	RHS54 += f48_54 * RHS48;
+	const double f49 = 1.0 / m_A206;
+	const double f49_55 = -f49 * m_A272;
+	m_A276 += m_A207 * f49_55;
+	RHS55 += f49_55 * RHS49;
+	const double f50 = 1.0 / m_A215;
+	const double f50_51 = -f50 * m_A226;
+	m_A227 += m_A216 * f50_51;
+	m_A228 += m_A217 * f50_51;
+	m_A229 += m_A218 * f50_51;
+	RHS51 += f50_51 * RHS50;
+	const double f50_54 = -f50 * m_A260;
+	m_A261 += m_A216 * f50_54;
+	m_A264 += m_A217 * f50_54;
+	m_A265 += m_A218 * f50_54;
+	RHS54 += f50_54 * RHS50;
+	const double f50_55 = -f50 * m_A273;
+	m_A274 += m_A216 * f50_55;
+	m_A275 += m_A217 * f50_55;
+	m_A276 += m_A218 * f50_55;
+	RHS55 += f50_55 * RHS50;
+	const double f51 = 1.0 / m_A227;
+	const double f51_54 = -f51 * m_A261;
+	m_A264 += m_A228 * f51_54;
+	m_A265 += m_A229 * f51_54;
+	RHS54 += f51_54 * RHS51;
+	const double f51_55 = -f51 * m_A274;
+	m_A275 += m_A228 * f51_55;
+	m_A276 += m_A229 * f51_55;
+	RHS55 += f51_55 * RHS51;
+	const double f52 = 1.0 / m_A237;
+	const double f52_53 = -f52 * m_A249;
+	m_A250 += m_A238 * f52_53;
+	m_A251 += m_A239 * f52_53;
+	m_A252 += m_A240 * f52_53;
+	RHS53 += f52_53 * RHS52;
+	const double f52_54 = -f52 * m_A262;
+	m_A263 += m_A238 * f52_54;
+	m_A264 += m_A239 * f52_54;
+	m_A266 += m_A240 * f52_54;
+	RHS54 += f52_54 * RHS52;
+	const double f52_56 = -f52 * m_A286;
+	m_A287 += m_A238 * f52_56;
+	m_A288 += m_A239 * f52_56;
+	m_A290 += m_A240 * f52_56;
+	RHS56 += f52_56 * RHS52;
+	const double f53 = 1.0 / m_A250;
+	const double f53_54 = -f53 * m_A263;
+	m_A264 += m_A251 * f53_54;
+	m_A266 += m_A252 * f53_54;
+	RHS54 += f53_54 * RHS53;
+	const double f53_56 = -f53 * m_A287;
+	m_A288 += m_A251 * f53_56;
+	m_A290 += m_A252 * f53_56;
+	RHS56 += f53_56 * RHS53;
+	const double f54 = 1.0 / m_A264;
+	const double f54_55 = -f54 * m_A275;
+	m_A276 += m_A265 * f54_55;
+	m_A277 += m_A266 * f54_55;
+	RHS55 += f54_55 * RHS54;
+	const double f54_56 = -f54 * m_A288;
+	m_A289 += m_A265 * f54_56;
+	m_A290 += m_A266 * f54_56;
+	RHS56 += f54_56 * RHS54;
+	const double f55 = 1.0 / m_A276;
+	const double f55_56 = -f55 * m_A289;
+	m_A290 += m_A277 * f55_56;
+	RHS56 += f55_56 * RHS55;
+	V[56] = RHS56 / m_A290;
+	double tmp55 = 0.0;
+	tmp55 += m_A277 * V[56];
+	V[55] = (RHS55 - tmp55) / m_A276;
+	double tmp54 = 0.0;
+	tmp54 += m_A265 * V[55];
+	tmp54 += m_A266 * V[56];
+	V[54] = (RHS54 - tmp54) / m_A264;
+	double tmp53 = 0.0;
+	tmp53 += m_A251 * V[54];
+	tmp53 += m_A252 * V[56];
+	V[53] = (RHS53 - tmp53) / m_A250;
+	double tmp52 = 0.0;
+	tmp52 += m_A238 * V[53];
+	tmp52 += m_A239 * V[54];
+	tmp52 += m_A240 * V[56];
+	V[52] = (RHS52 - tmp52) / m_A237;
+	double tmp51 = 0.0;
+	tmp51 += m_A228 * V[54];
+	tmp51 += m_A229 * V[55];
+	V[51] = (RHS51 - tmp51) / m_A227;
+	double tmp50 = 0.0;
+	tmp50 += m_A216 * V[51];
+	tmp50 += m_A217 * V[54];
+	tmp50 += m_A218 * V[55];
+	V[50] = (RHS50 - tmp50) / m_A215;
+	double tmp49 = 0.0;
+	tmp49 += m_A207 * V[55];
+	V[49] = (RHS49 - tmp49) / m_A206;
+	double tmp48 = 0.0;
+	tmp48 += m_A203 * V[52];
+	tmp48 += m_A204 * V[54];
+	V[48] = (RHS48 - tmp48) / m_A202;
+	double tmp47 = 0.0;
+	tmp47 += m_A193 * V[52];
+	tmp47 += m_A194 * V[53];
+	tmp47 += m_A195 * V[56];
+	V[47] = (RHS47 - tmp47) / m_A192;
+	double tmp46 = 0.0;
+	tmp46 += m_A185 * V[55];
+	tmp46 += m_A186 * V[56];
+	V[46] = (RHS46 - tmp46) / m_A184;
+	double tmp45 = 0.0;
+	tmp45 += m_A181 * V[48];
+	tmp45 += m_A182 * V[52];
+	V[45] = (RHS45 - tmp45) / m_A180;
+	double tmp44 = 0.0;
+	tmp44 += m_A171 * V[50];
+	tmp44 += m_A172 * V[51];
+	tmp44 += m_A173 * V[54];
+	tmp44 += m_A174 * V[55];
+	V[44] = (RHS44 - tmp44) / m_A170;
+	double tmp43 = 0.0;
+	tmp43 += m_A164 * V[47];
+	tmp43 += m_A165 * V[52];
+	tmp43 += m_A166 * V[53];
+	tmp43 += m_A167 * V[56];
+	V[43] = (RHS43 - tmp43) / m_A163;
+	double tmp42 = 0.0;
+	tmp42 += m_A154 * V[44];
+	tmp42 += m_A155 * V[50];
+	tmp42 += m_A156 * V[51];
+	tmp42 += m_A157 * V[54];
+	V[42] = (RHS42 - tmp42) / m_A153;
+	double tmp41 = 0.0;
+	tmp41 += m_A148 * V[51];
+	V[41] = (RHS41 - tmp41) / m_A147;
+	double tmp40 = 0.0;
+	tmp40 += m_A144 * V[50];
+	V[40] = (RHS40 - tmp40) / m_A143;
+	double tmp39 = 0.0;
+	tmp39 += m_A141 * V[55];
+	V[39] = (RHS39 - tmp39) / m_A140;
+	double tmp38 = 0.0;
+	tmp38 += m_A136 * V[42];
+	tmp38 += m_A137 * V[50];
+	tmp38 += m_A138 * V[51];
+	tmp38 += m_A139 * V[54];
+	V[38] = (RHS38 - tmp38) / m_A135;
+	double tmp37 = 0.0;
+	tmp37 += m_A128 * V[43];
+	tmp37 += m_A129 * V[47];
+	tmp37 += m_A130 * V[53];
+	tmp37 += m_A131 * V[56];
+	V[37] = (RHS37 - tmp37) / m_A127;
+	double tmp36 = 0.0;
+	tmp36 += m_A121 * V[45];
+	tmp36 += m_A122 * V[48];
+	V[36] = (RHS36 - tmp36) / m_A120;
+	double tmp35 = 0.0;
+	tmp35 += m_A117 * V[48];
+	V[35] = (RHS35 - tmp35) / m_A116;
+	double tmp34 = 0.0;
+	tmp34 += m_A114 * V[53];
+	V[34] = (RHS34 - tmp34) / m_A113;
+	double tmp33 = 0.0;
+	tmp33 += m_A109 * V[38];
+	tmp33 += m_A110 * V[50];
+	V[33] = (RHS33 - tmp33) / m_A108;
+	double tmp32 = 0.0;
+	tmp32 += m_A105 * V[52];
+	V[32] = (RHS32 - tmp32) / m_A104;
+	double tmp31 = 0.0;
+	tmp31 += m_A100 * V[36];
+	tmp31 += m_A101 * V[45];
+	tmp31 += m_A102 * V[48];
+	V[31] = (RHS31 - tmp31) / m_A99;
+	double tmp30 = 0.0;
+	tmp30 += m_A93 * V[37];
+	tmp30 += m_A94 * V[43];
+	tmp30 += m_A95 * V[53];
+	tmp30 += m_A96 * V[56];
+	V[30] = (RHS30 - tmp30) / m_A92;
+	double tmp29 = 0.0;
+	tmp29 += m_A87 * V[30];
+	tmp29 += m_A88 * V[37];
+	V[29] = (RHS29 - tmp29) / m_A86;
+	double tmp28 = 0.0;
+	tmp28 += m_A83 * V[49];
+	V[28] = (RHS28 - tmp28) / m_A82;
+	double tmp27 = 0.0;
+	tmp27 += m_A81 * V[55];
+	V[27] = (RHS27 - tmp27) / m_A80;
+	double tmp26 = 0.0;
+	tmp26 += m_A79 * V[55];
+	V[26] = (RHS26 - tmp26) / m_A78;
+	double tmp25 = 0.0;
+	tmp25 += m_A76 * V[46];
+	tmp25 += m_A77 * V[56];
+	V[25] = (RHS25 - tmp25) / m_A75;
+	double tmp24 = 0.0;
+	tmp24 += m_A73 * V[42];
+	tmp24 += m_A74 * V[44];
+	V[24] = (RHS24 - tmp24) / m_A72;
+	double tmp23 = 0.0;
+	tmp23 += m_A71 * V[47];
+	V[23] = (RHS23 - tmp23) / m_A70;
+	double tmp22 = 0.0;
+	tmp22 += m_A69 * V[47];
+	V[22] = (RHS22 - tmp22) / m_A68;
+	double tmp21 = 0.0;
+	tmp21 += m_A64 * V[42];
+	tmp21 += m_A65 * V[50];
+	tmp21 += m_A66 * V[51];
+	tmp21 += m_A67 * V[54];
+	V[21] = (RHS21 - tmp21) / m_A63;
+	double tmp20 = 0.0;
+	tmp20 += m_A59 * V[38];
+	tmp20 += m_A60 * V[42];
+	tmp20 += m_A61 * V[51];
+	tmp20 += m_A62 * V[54];
+	V[20] = (RHS20 - tmp20) / m_A58;
+	double tmp19 = 0.0;
+	tmp19 += m_A57 * V[47];
+	V[19] = (RHS19 - tmp19) / m_A56;
+	double tmp18 = 0.0;
+	tmp18 += m_A54 * V[41];
+	tmp18 += m_A55 * V[51];
+	V[18] = (RHS18 - tmp18) / m_A53;
+	double tmp17 = 0.0;
+	tmp17 += m_A51 * V[48];
+	tmp17 += m_A52 * V[54];
+	V[17] = (RHS17 - tmp17) / m_A50;
+	double tmp16 = 0.0;
+	tmp16 += m_A47 * V[33];
+	tmp16 += m_A48 * V[38];
+	tmp16 += m_A49 * V[50];
+	V[16] = (RHS16 - tmp16) / m_A46;
+	double tmp15 = 0.0;
+	tmp15 += m_A45 * V[40];
+	V[15] = (RHS15 - tmp15) / m_A44;
+	double tmp14 = 0.0;
+	tmp14 += m_A42 * V[45];
+	tmp14 += m_A43 * V[52];
+	V[14] = (RHS14 - tmp14) / m_A41;
+	double tmp13 = 0.0;
+	tmp13 += m_A38 * V[31];
+	tmp13 += m_A39 * V[36];
+	tmp13 += m_A40 * V[45];
+	V[13] = (RHS13 - tmp13) / m_A37;
+	double tmp12 = 0.0;
+	tmp12 += m_A36 * V[36];
+	V[12] = (RHS12 - tmp12) / m_A35;
+	double tmp11 = 0.0;
+	tmp11 += m_A34 * V[41];
+	V[11] = (RHS11 - tmp11) / m_A33;
+	double tmp10 = 0.0;
+	tmp10 += m_A31 * V[31];
+	tmp10 += m_A32 * V[48];
+	V[10] = (RHS10 - tmp10) / m_A30;
+	double tmp9 = 0.0;
+	tmp9 += m_A26 * V[37];
+	tmp9 += m_A27 * V[43];
+	tmp9 += m_A28 * V[53];
+	tmp9 += m_A29 * V[56];
+	V[9] = (RHS9 - tmp9) / m_A25;
+	double tmp8 = 0.0;
+	tmp8 += m_A24 * V[35];
+	V[8] = (RHS8 - tmp8) / m_A23;
+	double tmp7 = 0.0;
+	tmp7 += m_A22 * V[33];
+	V[7] = (RHS7 - tmp7) / m_A21;
+	double tmp6 = 0.0;
+	tmp6 += m_A17 * V[30];
+	tmp6 += m_A18 * V[43];
+	tmp6 += m_A19 * V[53];
+	tmp6 += m_A20 * V[56];
+	V[6] = (RHS6 - tmp6) / m_A16;
+	double tmp5 = 0.0;
+	tmp5 += m_A14 * V[34];
+	tmp5 += m_A15 * V[53];
+	V[5] = (RHS5 - tmp5) / m_A13;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[43];
+	tmp4 += m_A12 * V[52];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[34];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[29];
+	tmp2 += m_A6 * V[30];
+	tmp2 += m_A7 * V[37];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[32];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[29];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// solarq
+static void nl_gcr_66496d6073aca98e_20_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A4 += go[4];
+	m_A3 += go[5];
+	m_A3 += go[6];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A5 += gt[13];
+	m_A7 += go[10];
+	m_A6 += go[11];
+	m_A6 += go[12];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[13] * *cnV[13];
+	m_A10 += gt[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A9 += go[14];
+	m_A9 += go[15];
+	m_A8 += go[16];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 -= go[17] * *cnV[17];
+	RHS3 -= go[18] * *cnV[18];
+	RHS3 -= go[19] * *cnV[19];
+	m_A15 += gt[20];
+	m_A15 += gt[21];
+	m_A15 += gt[22];
+	m_A15 += gt[23];
+	m_A15 += gt[24];
+	m_A13 += go[20];
+	m_A13 += go[21];
+	m_A12 += go[22];
+	double RHS4 = Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 -= go[23] * *cnV[23];
+	RHS4 -= go[24] * *cnV[24];
+	m_A19 += gt[25];
+	m_A19 += gt[26];
+	m_A19 += gt[27];
+	m_A19 += gt[28];
+	m_A19 += gt[29];
+	m_A17 += go[25];
+	double RHS5 = Idr[25];
+	RHS5 += Idr[26];
+	RHS5 += Idr[27];
+	RHS5 += Idr[28];
+	RHS5 += Idr[29];
+	RHS5 -= go[26] * *cnV[26];
+	RHS5 -= go[27] * *cnV[27];
+	RHS5 -= go[28] * *cnV[28];
+	RHS5 -= go[29] * *cnV[29];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A10 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f1_4 = -f1 * m_A12;
+	m_A14 += m_A3 * f1_4;
+	m_A15 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_4 = -f2 * m_A13;
+	m_A15 += m_A6 * f2_4;
+	m_A16 += m_A7 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_5 = -f2 * m_A17;
+	m_A18 += m_A6 * f2_5;
+	m_A19 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_4 = -f3 * m_A14;
+	m_A15 += m_A11 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f4 = 1.0 / m_A15;
+	const double f4_5 = -f4 * m_A18;
+	m_A19 += m_A16 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A19;
+	double tmp4 = 0.0;
+	tmp4 += m_A16 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A15;
+	double tmp3 = 0.0;
+	tmp3 += m_A11 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A10;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[4];
+	tmp2 += m_A7 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	tmp1 += m_A4 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starhawk
+static void nl_gcr_67838e11f714c455_12_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A4 += go[2];
+	m_A3 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A7 += go[6];
+	m_A7 += go[7];
+	m_A5 += go[8];
+	m_A5 += go[9];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 -= go[10] * *cnV[10];
+	m_A11 += gt[11];
+	m_A11 += gt[12];
+	m_A11 += gt[13];
+	m_A11 += gt[14];
+	m_A11 += gt[15];
+	m_A11 += gt[16];
+	m_A10 += go[11];
+	m_A10 += go[12];
+	m_A9 += go[13];
+	m_A8 += go[14];
+	double RHS3 = Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 -= go[15] * *cnV[15];
+	RHS3 -= go[16] * *cnV[16];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A11 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	m_A7 += m_A4 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_3 = -f2 * m_A10;
+	m_A11 += m_A7 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A11;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// ripoff
+static void nl_gcr_698d5dd47fb16d5_16_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 -= go[5] * *cnV[5];
+	m_A7 += gt[6];
+	m_A7 += gt[7];
+	m_A6 += go[6];
+	m_A8 += go[7];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	m_A10 += gt[8];
+	m_A10 += gt[9];
+	m_A9 += go[8];
+	m_A11 += go[9];
+	double RHS4 = Idr[8];
+	RHS4 += Idr[9];
+	m_A15 += gt[10];
+	m_A15 += gt[11];
+	m_A15 += gt[12];
+	m_A15 += gt[13];
+	m_A14 += go[10];
+	m_A13 += go[11];
+	m_A12 += go[12];
+	double RHS5 = Idr[10];
+	RHS5 += Idr[11];
+	RHS5 += Idr[12];
+	RHS5 += Idr[13];
+	RHS5 -= go[13] * *cnV[13];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A12;
+	m_A15 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A6;
+	m_A7 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_4 = -f2 * m_A9;
+	m_A10 += m_A5 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_5 = -f3 * m_A13;
+	m_A15 += m_A8 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_5 = -f4 * m_A14;
+	m_A15 += m_A11 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A15;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[5];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// astrob
+static void nl_gcr_6c24726f30e8dc34_15_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A4 += go[3];
+	m_A4 += go[4];
+	m_A3 += go[5];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	m_A5 += gt[9];
+	m_A5 += gt[10];
+	m_A6 += go[9];
+	double RHS2 = Idr[9];
+	RHS2 += Idr[10];
+	RHS2 -= go[10] * *cnV[10];
+	m_A9 += gt[11];
+	m_A9 += gt[12];
+	m_A9 += gt[13];
+	m_A8 += go[11];
+	m_A7 += go[12];
+	double RHS3 = Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 -= go[13] * *cnV[13];
+	m_A14 += gt[14];
+	m_A14 += gt[15];
+	m_A14 += gt[16];
+	m_A14 += gt[17];
+	m_A14 += gt[18];
+	m_A12 += go[14];
+	m_A11 += go[15];
+	m_A11 += go[16];
+	double RHS4 = Idr[14];
+	RHS4 += Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 -= go[17] * *cnV[17];
+	RHS4 -= go[18] * *cnV[18];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A7;
+	m_A9 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A8;
+	m_A9 += m_A3 * f1_3;
+	m_A10 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f1_4 = -f1 * m_A11;
+	m_A13 += m_A3 * f1_4;
+	m_A14 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_4 = -f2 * m_A12;
+	m_A14 += m_A6 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_4 = -f3 * m_A13;
+	m_A14 += m_A10 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	V[4] = RHS4 / m_A14;
+	double tmp3 = 0.0;
+	tmp3 += m_A10 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	tmp1 += m_A4 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// spacfury
+static void nl_gcr_6eae7b15cd376318_43_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A1 += go[0];
+	m_A2 += go[1];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	m_A3 += gt[5];
+	m_A3 += gt[6];
+	m_A3 += gt[7];
+	m_A3 += gt[8];
+	m_A3 += gt[9];
+	m_A3 += gt[10];
+	m_A3 += gt[11];
+	m_A4 += go[5];
+	m_A5 += go[6];
+	double RHS1 = Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A8 += go[12];
+	m_A7 += go[13];
+	double RHS2 = Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 -= go[14] * *cnV[14];
+	m_A9 += gt[15];
+	m_A9 += gt[16];
+	m_A9 += gt[17];
+	m_A11 += go[15];
+	m_A10 += go[16];
+	double RHS3 = Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 -= go[17] * *cnV[17];
+	m_A13 += gt[18];
+	m_A13 += gt[19];
+	m_A13 += gt[20];
+	m_A13 += gt[21];
+	m_A13 += gt[22];
+	m_A14 += go[18];
+	m_A12 += go[19];
+	double RHS4 = Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	RHS4 -= go[22] * *cnV[22];
+	m_A18 += gt[23];
+	m_A18 += gt[24];
+	m_A18 += gt[25];
+	m_A18 += gt[26];
+	m_A18 += gt[27];
+	m_A15 += go[23];
+	m_A16 += go[24];
+	m_A20 += go[25];
+	double RHS5 = Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 += Idr[27];
+	RHS5 -= go[26] * *cnV[26];
+	RHS5 -= go[27] * *cnV[27];
+	m_A24 += gt[28];
+	m_A24 += gt[29];
+	m_A24 += gt[30];
+	m_A26 += go[28];
+	m_A22 += go[29];
+	m_A21 += go[30];
+	double RHS6 = Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	m_A29 += gt[31];
+	m_A29 += gt[32];
+	m_A29 += gt[33];
+	m_A29 += gt[34];
+	m_A29 += gt[35];
+	m_A29 += gt[36];
+	m_A29 += gt[37];
+	m_A31 += go[31];
+	m_A27 += go[32];
+	double RHS7 = Idr[31];
+	RHS7 += Idr[32];
+	RHS7 += Idr[33];
+	RHS7 += Idr[34];
+	RHS7 += Idr[35];
+	RHS7 += Idr[36];
+	RHS7 += Idr[37];
+	RHS7 -= go[33] * *cnV[33];
+	RHS7 -= go[34] * *cnV[34];
+	RHS7 -= go[35] * *cnV[35];
+	RHS7 -= go[36] * *cnV[36];
+	RHS7 -= go[37] * *cnV[37];
+	m_A36 += gt[38];
+	m_A36 += gt[39];
+	m_A36 += gt[40];
+	m_A34 += go[38];
+	m_A33 += go[39];
+	m_A32 += go[40];
+	double RHS8 = Idr[38];
+	RHS8 += Idr[39];
+	RHS8 += Idr[40];
+	m_A42 += gt[41];
+	m_A42 += gt[42];
+	m_A42 += gt[43];
+	m_A42 += gt[44];
+	m_A42 += gt[45];
+	m_A42 += gt[46];
+	m_A40 += go[41];
+	m_A38 += go[42];
+	m_A39 += go[43];
+	double RHS9 = Idr[41];
+	RHS9 += Idr[42];
+	RHS9 += Idr[43];
+	RHS9 += Idr[44];
+	RHS9 += Idr[45];
+	RHS9 += Idr[46];
+	RHS9 -= go[44] * *cnV[44];
+	RHS9 -= go[45] * *cnV[45];
+	RHS9 -= go[46] * *cnV[46];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A12;
+	m_A13 += m_A1 * f0_4;
+	m_A14 += m_A2 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f0_8 = -f0 * m_A32;
+	m_A33 += m_A1 * f0_8;
+	m_A36 += m_A2 * f0_8;
+	RHS8 += f0_8 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_5 = -f1 * m_A15;
+	m_A17 += m_A4 * f1_5;
+	m_A20 += m_A5 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_5 = -f2 * m_A16;
+	m_A18 += m_A7 * f2_5;
+	m_A19 += m_A8 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f2_6 = -f2 * m_A21;
+	m_A23 += m_A7 * f2_6;
+	m_A24 += m_A8 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_6 = -f3 * m_A22;
+	m_A24 += m_A10 * f3_6;
+	m_A26 += m_A11 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f3_7 = -f3 * m_A27;
+	m_A28 += m_A10 * f3_7;
+	m_A31 += m_A11 * f3_7;
+	RHS7 += f3_7 * RHS3;
+	const double f3_9 = -f3 * m_A38;
+	m_A39 += m_A10 * f3_9;
+	m_A42 += m_A11 * f3_9;
+	RHS9 += f3_9 * RHS3;
+	const double f4 = 1.0 / m_A13;
+	const double f4_5 = -f4 * m_A17;
+	m_A20 += m_A14 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	const double f4_8 = -f4 * m_A33;
+	m_A36 += m_A14 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f5 = 1.0 / m_A18;
+	const double f5_6 = -f5 * m_A23;
+	m_A24 += m_A19 * f5_6;
+	m_A25 += m_A20 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	const double f5_8 = -f5 * m_A34;
+	m_A35 += m_A19 * f5_8;
+	m_A36 += m_A20 * f5_8;
+	RHS8 += f5_8 * RHS5;
+	const double f6 = 1.0 / m_A24;
+	const double f6_7 = -f6 * m_A28;
+	m_A30 += m_A25 * f6_7;
+	m_A31 += m_A26 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	const double f6_8 = -f6 * m_A35;
+	m_A36 += m_A25 * f6_8;
+	m_A37 += m_A26 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f6_9 = -f6 * m_A39;
+	m_A41 += m_A25 * f6_9;
+	m_A42 += m_A26 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f7 = 1.0 / m_A29;
+	const double f7_9 = -f7 * m_A40;
+	m_A41 += m_A30 * f7_9;
+	m_A42 += m_A31 * f7_9;
+	RHS9 += f7_9 * RHS7;
+	const double f8 = 1.0 / m_A36;
+	const double f8_9 = -f8 * m_A41;
+	m_A42 += m_A37 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	V[9] = RHS9 / m_A42;
+	double tmp8 = 0.0;
+	tmp8 += m_A37 * V[9];
+	V[8] = (RHS8 - tmp8) / m_A36;
+	double tmp7 = 0.0;
+	tmp7 += m_A30 * V[8];
+	tmp7 += m_A31 * V[9];
+	V[7] = (RHS7 - tmp7) / m_A29;
+	double tmp6 = 0.0;
+	tmp6 += m_A25 * V[8];
+	tmp6 += m_A26 * V[9];
+	V[6] = (RHS6 - tmp6) / m_A24;
+	double tmp5 = 0.0;
+	tmp5 += m_A19 * V[6];
+	tmp5 += m_A20 * V[8];
+	V[5] = (RHS5 - tmp5) / m_A18;
+	double tmp4 = 0.0;
+	tmp4 += m_A14 * V[8];
+	V[4] = (RHS4 - tmp4) / m_A13;
+	double tmp3 = 0.0;
+	tmp3 += m_A10 * V[6];
+	tmp3 += m_A11 * V[9];
+	V[3] = (RHS3 - tmp3) / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[5];
+	tmp2 += m_A8 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A4 * V[4];
+	tmp1 += m_A5 * V[8];
+	V[1] = (RHS1 - tmp1) / m_A3;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	tmp0 += m_A2 * V[8];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// barrier
+static void nl_gcr_6ef39a62161d596c_47_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 -= go[3] * *cnV[3];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A5 += go[9];
+	double RHS2 = Idr[9];
+	RHS2 += Idr[10];
+	RHS2 -= go[10] * *cnV[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A6 += gt[16];
+	m_A7 += go[11];
+	m_A7 += go[12];
+	m_A7 += go[13];
+	m_A9 += go[14];
+	m_A8 += go[15];
+	double RHS3 = Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 -= go[16] * *cnV[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A11 += go[17];
+	m_A12 += go[18];
+	double RHS4 = Idr[17];
+	RHS4 += Idr[18];
+	m_A13 += gt[19];
+	m_A13 += gt[20];
+	m_A13 += gt[21];
+	m_A13 += gt[22];
+	m_A13 += gt[23];
+	m_A13 += gt[24];
+	m_A13 += gt[25];
+	m_A14 += go[19];
+	double RHS5 = Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 -= go[20] * *cnV[20];
+	RHS5 -= go[21] * *cnV[21];
+	RHS5 -= go[22] * *cnV[22];
+	RHS5 -= go[23] * *cnV[23];
+	RHS5 -= go[24] * *cnV[24];
+	RHS5 -= go[25] * *cnV[25];
+	m_A16 += gt[26];
+	m_A16 += gt[27];
+	m_A16 += gt[28];
+	m_A16 += gt[29];
+	m_A16 += gt[30];
+	m_A15 += go[26];
+	m_A15 += go[27];
+	m_A15 += go[28];
+	double RHS6 = Idr[26];
+	RHS6 += Idr[27];
+	RHS6 += Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 -= go[29] * *cnV[29];
+	RHS6 -= go[30] * *cnV[30];
+	m_A20 += gt[31];
+	m_A20 += gt[32];
+	m_A20 += gt[33];
+	m_A20 += gt[34];
+	m_A19 += go[31];
+	m_A21 += go[32];
+	m_A21 += go[33];
+	double RHS7 = Idr[31];
+	RHS7 += Idr[32];
+	RHS7 += Idr[33];
+	RHS7 += Idr[34];
+	RHS7 -= go[34] * *cnV[34];
+	m_A23 += gt[35];
+	m_A23 += gt[36];
+	m_A22 += go[35];
+	m_A24 += go[36];
+	double RHS8 = Idr[35];
+	RHS8 += Idr[36];
+	m_A26 += gt[37];
+	m_A26 += gt[38];
+	m_A26 += gt[39];
+	m_A28 += go[37];
+	m_A25 += go[38];
+	double RHS9 = Idr[37];
+	RHS9 += Idr[38];
+	RHS9 += Idr[39];
+	RHS9 -= go[39] * *cnV[39];
+	m_A33 += gt[40];
+	m_A33 += gt[41];
+	m_A33 += gt[42];
+	m_A33 += gt[43];
+	m_A33 += gt[44];
+	m_A33 += gt[45];
+	m_A33 += gt[46];
+	m_A29 += go[40];
+	m_A30 += go[41];
+	m_A32 += go[42];
+	m_A32 += go[43];
+	double RHS10 = Idr[40];
+	RHS10 += Idr[41];
+	RHS10 += Idr[42];
+	RHS10 += Idr[43];
+	RHS10 += Idr[44];
+	RHS10 += Idr[45];
+	RHS10 += Idr[46];
+	RHS10 -= go[44] * *cnV[44];
+	RHS10 -= go[45] * *cnV[45];
+	RHS10 -= go[46] * *cnV[46];
+	m_A41 += gt[47];
+	m_A41 += gt[48];
+	m_A41 += gt[49];
+	m_A41 += gt[50];
+	m_A41 += gt[51];
+	m_A41 += gt[52];
+	m_A36 += go[47];
+	m_A35 += go[48];
+	m_A38 += go[49];
+	double RHS11 = Idr[47];
+	RHS11 += Idr[48];
+	RHS11 += Idr[49];
+	RHS11 += Idr[50];
+	RHS11 += Idr[51];
+	RHS11 += Idr[52];
+	RHS11 -= go[50] * *cnV[50];
+	RHS11 -= go[51] * *cnV[51];
+	RHS11 -= go[52] * *cnV[52];
+	m_A46 += gt[53];
+	m_A46 += gt[54];
+	m_A46 += gt[55];
+	m_A46 += gt[56];
+	m_A46 += gt[57];
+	m_A43 += go[53];
+	m_A44 += go[54];
+	double RHS12 = Idr[53];
+	RHS12 += Idr[54];
+	RHS12 += Idr[55];
+	RHS12 += Idr[56];
+	RHS12 += Idr[57];
+	RHS12 -= go[55] * *cnV[55];
+	RHS12 -= go[56] * *cnV[56];
+	RHS12 -= go[57] * *cnV[57];
+	const double f0 = 1.0 / m_A0;
+	const double f0_7 = -f0 * m_A19;
+	m_A20 += m_A1 * f0_7;
+	RHS7 += f0_7 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_10 = -f1 * m_A29;
+	m_A32 += m_A3 * f1_10;
+	RHS10 += f1_10 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_8 = -f2 * m_A22;
+	m_A23 += m_A5 * f2_8;
+	RHS8 += f2_8 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_6 = -f3 * m_A15;
+	m_A16 += m_A7 * f3_6;
+	m_A17 += m_A8 * f3_6;
+	m_A18 += m_A9 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f3_10 = -f3 * m_A30;
+	m_A31 += m_A7 * f3_10;
+	m_A33 += m_A8 * f3_10;
+	m_A34 += m_A9 * f3_10;
+	RHS10 += f3_10 * RHS3;
+	const double f3_11 = -f3 * m_A35;
+	m_A37 += m_A7 * f3_11;
+	m_A40 += m_A8 * f3_11;
+	m_A41 += m_A9 * f3_11;
+	RHS11 += f3_11 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_9 = -f4 * m_A25;
+	m_A26 += m_A11 * f4_9;
+	m_A27 += m_A12 * f4_9;
+	RHS9 += f4_9 * RHS4;
+	const double f4_11 = -f4 * m_A36;
+	m_A39 += m_A11 * f4_11;
+	m_A41 += m_A12 * f4_11;
+	RHS11 += f4_11 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_12 = -f5 * m_A43;
+	m_A44 += m_A14 * f5_12;
+	RHS12 += f5_12 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_10 = -f6 * m_A31;
+	m_A33 += m_A17 * f6_10;
+	m_A34 += m_A18 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f6_11 = -f6 * m_A37;
+	m_A40 += m_A17 * f6_11;
+	m_A41 += m_A18 * f6_11;
+	RHS11 += f6_11 * RHS6;
+	const double f7 = 1.0 / m_A20;
+	const double f7_10 = -f7 * m_A32;
+	m_A33 += m_A21 * f7_10;
+	RHS10 += f7_10 * RHS7;
+	const double f8 = 1.0 / m_A23;
+	const double f8_11 = -f8 * m_A38;
+	m_A41 += m_A24 * f8_11;
+	RHS11 += f8_11 * RHS8;
+	const double f9 = 1.0 / m_A26;
+	const double f9_11 = -f9 * m_A39;
+	m_A41 += m_A27 * f9_11;
+	m_A42 += m_A28 * f9_11;
+	RHS11 += f9_11 * RHS9;
+	const double f9_12 = -f9 * m_A44;
+	m_A45 += m_A27 * f9_12;
+	m_A46 += m_A28 * f9_12;
+	RHS12 += f9_12 * RHS9;
+	const double f10 = 1.0 / m_A33;
+	const double f10_11 = -f10 * m_A40;
+	m_A41 += m_A34 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	const double f11 = 1.0 / m_A41;
+	const double f11_12 = -f11 * m_A45;
+	m_A46 += m_A42 * f11_12;
+	RHS12 += f11_12 * RHS11;
+	V[12] = RHS12 / m_A46;
+	double tmp11 = 0.0;
+	tmp11 += m_A42 * V[12];
+	V[11] = (RHS11 - tmp11) / m_A41;
+	double tmp10 = 0.0;
+	tmp10 += m_A34 * V[11];
+	V[10] = (RHS10 - tmp10) / m_A33;
+	double tmp9 = 0.0;
+	tmp9 += m_A27 * V[11];
+	tmp9 += m_A28 * V[12];
+	V[9] = (RHS9 - tmp9) / m_A26;
+	double tmp8 = 0.0;
+	tmp8 += m_A24 * V[11];
+	V[8] = (RHS8 - tmp8) / m_A23;
+	double tmp7 = 0.0;
+	tmp7 += m_A21 * V[10];
+	V[7] = (RHS7 - tmp7) / m_A20;
+	double tmp6 = 0.0;
+	tmp6 += m_A17 * V[10];
+	tmp6 += m_A18 * V[11];
+	V[6] = (RHS6 - tmp6) / m_A16;
+	double tmp5 = 0.0;
+	tmp5 += m_A14 * V[9];
+	V[5] = (RHS5 - tmp5) / m_A13;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[9];
+	tmp4 += m_A12 * V[11];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[6];
+	tmp3 += m_A8 * V[10];
+	tmp3 += m_A9 * V[11];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[8];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[7];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[7];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starhawk
+static void nl_gcr_723fa454468a93d_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A6 += gt[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A5 += go[5];
+	m_A4 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// cheekyms
+static void nl_gcr_733c72a820fdbd1f_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	m_A1 += go[1];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[4];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A5 += go[6];
+	m_A4 += go[7];
+	m_A4 += go[8];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// tailg
+static void nl_gcr_7388106355fb27c3_12_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A4 += go[2];
+	m_A3 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[7];
+	m_A7 += go[8];
+	m_A5 += go[9];
+	m_A5 += go[10];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[11] * *cnV[11];
+	m_A11 += gt[12];
+	m_A11 += gt[13];
+	m_A11 += gt[14];
+	m_A11 += gt[15];
+	m_A10 += go[12];
+	m_A10 += go[13];
+	m_A9 += go[14];
+	m_A8 += go[15];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A11 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	m_A7 += m_A4 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_3 = -f2 * m_A10;
+	m_A11 += m_A7 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A11;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// tp1985
+static void nl_gcr_73f2ba8ad4a45b26_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A5 += gt[6];
+	m_A5 += gt[7];
+	m_A6 += go[6];
+	m_A4 += go[7];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	m_A9 += gt[8];
+	m_A9 += gt[9];
+	m_A7 += go[8];
+	m_A8 += go[9];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A5 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A7;
+	m_A9 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_3 = -f2 * m_A8;
+	m_A9 += m_A6 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// zac1b11142
+static void nl_gcr_7425594cec8024ad_30_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A3 += go[7];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A5 += go[10];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A7 += go[12];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	m_A8 += gt[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A9 += go[15];
+	double RHS4 = Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 -= go[16] * *cnV[16];
+	RHS4 -= go[17] * *cnV[17];
+	m_A11 += gt[18];
+	m_A11 += gt[19];
+	m_A11 += gt[20];
+	m_A11 += gt[21];
+	m_A11 += gt[22];
+	m_A11 += gt[23];
+	m_A10 += go[18];
+	m_A12 += go[19];
+	m_A12 += go[20];
+	double RHS5 = Idr[18];
+	RHS5 += Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	RHS5 -= go[21] * *cnV[21];
+	RHS5 -= go[22] * *cnV[22];
+	RHS5 -= go[23] * *cnV[23];
+	m_A16 += gt[24];
+	m_A16 += gt[25];
+	m_A15 += go[24];
+	m_A14 += go[25];
+	double RHS6 = Idr[24];
+	RHS6 += Idr[25];
+	m_A18 += gt[26];
+	m_A18 += gt[27];
+	m_A19 += go[26];
+	m_A17 += go[27];
+	double RHS7 = Idr[26];
+	RHS7 += Idr[27];
+	m_A25 += gt[28];
+	m_A25 += gt[29];
+	m_A25 += gt[30];
+	m_A25 += gt[31];
+	m_A25 += gt[32];
+	m_A25 += gt[33];
+	m_A23 += go[28];
+	m_A22 += go[29];
+	m_A22 += go[30];
+	m_A24 += go[31];
+	m_A21 += go[32];
+	m_A20 += go[33];
+	double RHS8 = Idr[28];
+	RHS8 += Idr[29];
+	RHS8 += Idr[30];
+	RHS8 += Idr[31];
+	RHS8 += Idr[32];
+	RHS8 += Idr[33];
+	m_A29 += gt[34];
+	m_A29 += gt[35];
+	m_A29 += gt[36];
+	m_A29 += gt[37];
+	m_A28 += go[34];
+	m_A27 += go[35];
+	double RHS9 = Idr[34];
+	RHS9 += Idr[35];
+	RHS9 += Idr[36];
+	RHS9 += Idr[37];
+	RHS9 -= go[36] * *cnV[36];
+	RHS9 -= go[37] * *cnV[37];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A10;
+	m_A13 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_7 = -f1 * m_A17;
+	m_A18 += m_A3 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_6 = -f2 * m_A14;
+	m_A16 += m_A5 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f2_8 = -f2 * m_A20;
+	m_A23 += m_A5 * f2_8;
+	RHS8 += f2_8 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_6 = -f3 * m_A15;
+	m_A16 += m_A7 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_8 = -f4 * m_A21;
+	m_A25 += m_A9 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f4_9 = -f4 * m_A27;
+	m_A28 += m_A9 * f4_9;
+	RHS9 += f4_9 * RHS4;
+	const double f5 = 1.0 / m_A11;
+	const double f5_8 = -f5 * m_A22;
+	m_A25 += m_A12 * f5_8;
+	m_A26 += m_A13 * f5_8;
+	RHS8 += f5_8 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_8 = -f6 * m_A23;
+	RHS8 += f6_8 * RHS6;
+	const double f7 = 1.0 / m_A18;
+	const double f7_8 = -f7 * m_A24;
+	m_A25 += m_A19 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	const double f8 = 1.0 / m_A25;
+	const double f8_9 = -f8 * m_A28;
+	m_A29 += m_A26 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	V[9] = RHS9 / m_A29;
+	double tmp8 = 0.0;
+	tmp8 += m_A26 * V[9];
+	V[8] = (RHS8 - tmp8) / m_A25;
+	double tmp7 = 0.0;
+	tmp7 += m_A19 * V[8];
+	V[7] = (RHS7 - tmp7) / m_A18;
+	double tmp6 = 0.0;
+	V[6] = (RHS6 - tmp6) / m_A16;
+	double tmp5 = 0.0;
+	tmp5 += m_A12 * V[8];
+	tmp5 += m_A13 * V[9];
+	V[5] = (RHS5 - tmp5) / m_A11;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[8];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[7];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[9];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// tp1985
+static void nl_gcr_74349e9889a2630b_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A5 += go[6];
+	m_A4 += go[7];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[8] * *cnV[8];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// gunfight
+static void nl_gcr_743595e64cee0a5e_112_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A7 += go[6];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	RHS3 -= go[7] * *cnV[7];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A9 += go[8];
+	double RHS4 = Idr[8];
+	RHS4 += Idr[9];
+	RHS4 -= go[9] * *cnV[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A12 += go[10];
+	m_A11 += go[11];
+	double RHS5 = Idr[10];
+	RHS5 += Idr[11];
+	m_A13 += gt[12];
+	m_A13 += gt[13];
+	m_A15 += go[12];
+	m_A14 += go[13];
+	double RHS6 = Idr[12];
+	RHS6 += Idr[13];
+	m_A17 += gt[14];
+	m_A17 += gt[15];
+	m_A17 += gt[16];
+	m_A16 += go[14];
+	m_A18 += go[15];
+	double RHS7 = Idr[14];
+	RHS7 += Idr[15];
+	RHS7 += Idr[16];
+	RHS7 -= go[16] * *cnV[16];
+	m_A21 += gt[17];
+	m_A21 += gt[18];
+	m_A21 += gt[19];
+	m_A20 += go[17];
+	m_A22 += go[18];
+	double RHS8 = Idr[17];
+	RHS8 += Idr[18];
+	RHS8 += Idr[19];
+	RHS8 -= go[19] * *cnV[19];
+	m_A25 += gt[20];
+	m_A25 += gt[21];
+	m_A25 += gt[22];
+	m_A24 += go[20];
+	m_A26 += go[21];
+	double RHS9 = Idr[20];
+	RHS9 += Idr[21];
+	RHS9 += Idr[22];
+	RHS9 -= go[22] * *cnV[22];
+	m_A29 += gt[23];
+	m_A29 += gt[24];
+	m_A29 += gt[25];
+	m_A28 += go[23];
+	m_A30 += go[24];
+	double RHS10 = Idr[23];
+	RHS10 += Idr[24];
+	RHS10 += Idr[25];
+	RHS10 -= go[25] * *cnV[25];
+	m_A32 += gt[26];
+	m_A32 += gt[27];
+	m_A32 += gt[28];
+	m_A34 += go[26];
+	m_A33 += go[27];
+	double RHS11 = Idr[26];
+	RHS11 += Idr[27];
+	RHS11 += Idr[28];
+	RHS11 -= go[28] * *cnV[28];
+	m_A35 += gt[29];
+	m_A35 += gt[30];
+	m_A35 += gt[31];
+	m_A37 += go[29];
+	m_A36 += go[30];
+	double RHS12 = Idr[29];
+	RHS12 += Idr[30];
+	RHS12 += Idr[31];
+	RHS12 -= go[31] * *cnV[31];
+	m_A40 += gt[32];
+	m_A40 += gt[33];
+	m_A38 += go[32];
+	m_A39 += go[33];
+	double RHS13 = Idr[32];
+	RHS13 += Idr[33];
+	m_A44 += gt[34];
+	m_A44 += gt[35];
+	m_A42 += go[34];
+	m_A43 += go[35];
+	double RHS14 = Idr[34];
+	RHS14 += Idr[35];
+	m_A47 += gt[36];
+	m_A47 += gt[37];
+	m_A47 += gt[38];
+	m_A46 += go[36];
+	m_A48 += go[37];
+	double RHS15 = Idr[36];
+	RHS15 += Idr[37];
+	RHS15 += Idr[38];
+	RHS15 -= go[38] * *cnV[38];
+	m_A50 += gt[39];
+	m_A50 += gt[40];
+	m_A49 += go[39];
+	m_A51 += go[40];
+	double RHS16 = Idr[39];
+	RHS16 += Idr[40];
+	m_A52 += gt[41];
+	m_A52 += gt[42];
+	m_A52 += gt[43];
+	m_A52 += gt[44];
+	m_A52 += gt[45];
+	m_A53 += go[41];
+	m_A54 += go[42];
+	m_A54 += go[43];
+	double RHS17 = Idr[41];
+	RHS17 += Idr[42];
+	RHS17 += Idr[43];
+	RHS17 += Idr[44];
+	RHS17 += Idr[45];
+	RHS17 -= go[44] * *cnV[44];
+	RHS17 -= go[45] * *cnV[45];
+	m_A56 += gt[46];
+	m_A56 += gt[47];
+	m_A56 += gt[48];
+	m_A56 += gt[49];
+	m_A57 += go[46];
+	m_A58 += go[47];
+	m_A55 += go[48];
+	double RHS18 = Idr[46];
+	RHS18 += Idr[47];
+	RHS18 += Idr[48];
+	RHS18 += Idr[49];
+	RHS18 -= go[49] * *cnV[49];
+	m_A60 += gt[50];
+	m_A60 += gt[51];
+	m_A60 += gt[52];
+	m_A60 += gt[53];
+	m_A61 += go[50];
+	m_A62 += go[51];
+	m_A59 += go[52];
+	double RHS19 = Idr[50];
+	RHS19 += Idr[51];
+	RHS19 += Idr[52];
+	RHS19 += Idr[53];
+	RHS19 -= go[53] * *cnV[53];
+	m_A63 += gt[54];
+	m_A63 += gt[55];
+	m_A63 += gt[56];
+	m_A63 += gt[57];
+	m_A63 += gt[58];
+	m_A64 += go[54];
+	m_A65 += go[55];
+	m_A65 += go[56];
+	double RHS20 = Idr[54];
+	RHS20 += Idr[55];
+	RHS20 += Idr[56];
+	RHS20 += Idr[57];
+	RHS20 += Idr[58];
+	RHS20 -= go[57] * *cnV[57];
+	RHS20 -= go[58] * *cnV[58];
+	m_A66 += gt[59];
+	m_A66 += gt[60];
+	m_A66 += gt[61];
+	m_A66 += gt[62];
+	m_A67 += go[59];
+	m_A68 += go[60];
+	m_A68 += go[61];
+	double RHS21 = Idr[59];
+	RHS21 += Idr[60];
+	RHS21 += Idr[61];
+	RHS21 += Idr[62];
+	RHS21 -= go[62] * *cnV[62];
+	m_A71 += gt[63];
+	m_A71 += gt[64];
+	m_A71 += gt[65];
+	m_A71 += gt[66];
+	m_A71 += gt[67];
+	m_A69 += go[63];
+	m_A70 += go[64];
+	m_A72 += go[65];
+	m_A72 += go[66];
+	double RHS22 = Idr[63];
+	RHS22 += Idr[64];
+	RHS22 += Idr[65];
+	RHS22 += Idr[66];
+	RHS22 += Idr[67];
+	RHS22 -= go[67] * *cnV[67];
+	m_A76 += gt[68];
+	m_A76 += gt[69];
+	m_A76 += gt[70];
+	m_A76 += gt[71];
+	m_A76 += gt[72];
+	m_A73 += go[68];
+	m_A75 += go[69];
+	m_A78 += go[70];
+	m_A78 += go[71];
+	m_A74 += go[72];
+	double RHS23 = Idr[68];
+	RHS23 += Idr[69];
+	RHS23 += Idr[70];
+	RHS23 += Idr[71];
+	RHS23 += Idr[72];
+	m_A82 += gt[73];
+	m_A82 += gt[74];
+	m_A82 += gt[75];
+	m_A82 += gt[76];
+	m_A82 += gt[77];
+	m_A79 += go[73];
+	m_A81 += go[74];
+	m_A83 += go[75];
+	m_A83 += go[76];
+	m_A80 += go[77];
+	double RHS24 = Idr[73];
+	RHS24 += Idr[74];
+	RHS24 += Idr[75];
+	RHS24 += Idr[76];
+	RHS24 += Idr[77];
+	m_A90 += gt[78];
+	m_A90 += gt[79];
+	m_A90 += gt[80];
+	m_A90 += gt[81];
+	m_A90 += gt[82];
+	m_A90 += gt[83];
+	m_A90 += gt[84];
+	m_A90 += gt[85];
+	m_A89 += go[78];
+	m_A89 += go[79];
+	m_A88 += go[80];
+	m_A88 += go[81];
+	m_A85 += go[82];
+	m_A87 += go[83];
+	double RHS25 = Idr[78];
+	RHS25 += Idr[79];
+	RHS25 += Idr[80];
+	RHS25 += Idr[81];
+	RHS25 += Idr[82];
+	RHS25 += Idr[83];
+	RHS25 += Idr[84];
+	RHS25 += Idr[85];
+	RHS25 -= go[84] * *cnV[84];
+	RHS25 -= go[85] * *cnV[85];
+	m_A103 += gt[86];
+	m_A103 += gt[87];
+	m_A103 += gt[88];
+	m_A103 += gt[89];
+	m_A103 += gt[90];
+	m_A103 += gt[91];
+	m_A103 += gt[92];
+	m_A103 += gt[93];
+	m_A99 += go[86];
+	m_A99 += go[87];
+	m_A98 += go[88];
+	m_A98 += go[89];
+	m_A92 += go[90];
+	m_A93 += go[91];
+	double RHS26 = Idr[86];
+	RHS26 += Idr[87];
+	RHS26 += Idr[88];
+	RHS26 += Idr[89];
+	RHS26 += Idr[90];
+	RHS26 += Idr[91];
+	RHS26 += Idr[92];
+	RHS26 += Idr[93];
+	RHS26 -= go[92] * *cnV[92];
+	RHS26 -= go[93] * *cnV[93];
+	m_A111 += gt[94];
+	m_A111 += gt[95];
+	m_A111 += gt[96];
+	m_A111 += gt[97];
+	m_A111 += gt[98];
+	m_A111 += gt[99];
+	m_A111 += gt[100];
+	m_A111 += gt[101];
+	m_A109 += go[94];
+	m_A109 += go[95];
+	m_A108 += go[96];
+	m_A108 += go[97];
+	m_A105 += go[98];
+	m_A107 += go[99];
+	double RHS27 = Idr[94];
+	RHS27 += Idr[95];
+	RHS27 += Idr[96];
+	RHS27 += Idr[97];
+	RHS27 += Idr[98];
+	RHS27 += Idr[99];
+	RHS27 += Idr[100];
+	RHS27 += Idr[101];
+	RHS27 -= go[100] * *cnV[100];
+	RHS27 -= go[101] * *cnV[101];
+	const double f0 = 1.0 / m_A0;
+	const double f0_15 = -f0 * m_A46;
+	m_A47 += m_A1 * f0_15;
+	RHS15 += f0_15 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_13 = -f1 * m_A38;
+	m_A40 += m_A3 * f1_13;
+	RHS13 += f1_13 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_14 = -f2 * m_A42;
+	m_A44 += m_A5 * f2_14;
+	RHS14 += f2_14 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_18 = -f3 * m_A55;
+	m_A56 += m_A7 * f3_18;
+	RHS18 += f3_18 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_19 = -f4 * m_A59;
+	m_A60 += m_A9 * f4_19;
+	RHS19 += f4_19 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_7 = -f5 * m_A16;
+	m_A17 += m_A11 * f5_7;
+	m_A19 += m_A12 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f5_26 = -f5 * m_A92;
+	m_A94 += m_A11 * f5_26;
+	m_A103 += m_A12 * f5_26;
+	RHS26 += f5_26 * RHS5;
+	const double f6 = 1.0 / m_A13;
+	const double f6_8 = -f6 * m_A20;
+	m_A21 += m_A14 * f6_8;
+	m_A23 += m_A15 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f6_26 = -f6 * m_A93;
+	m_A95 += m_A14 * f6_26;
+	m_A103 += m_A15 * f6_26;
+	RHS26 += f6_26 * RHS6;
+	const double f7 = 1.0 / m_A17;
+	const double f7_9 = -f7 * m_A24;
+	m_A25 += m_A18 * f7_9;
+	m_A27 += m_A19 * f7_9;
+	RHS9 += f7_9 * RHS7;
+	const double f7_26 = -f7 * m_A94;
+	m_A96 += m_A18 * f7_26;
+	m_A103 += m_A19 * f7_26;
+	RHS26 += f7_26 * RHS7;
+	const double f8 = 1.0 / m_A21;
+	const double f8_10 = -f8 * m_A28;
+	m_A29 += m_A22 * f8_10;
+	m_A31 += m_A23 * f8_10;
+	RHS10 += f8_10 * RHS8;
+	const double f8_26 = -f8 * m_A95;
+	m_A97 += m_A22 * f8_26;
+	m_A103 += m_A23 * f8_26;
+	RHS26 += f8_26 * RHS8;
+	const double f9 = 1.0 / m_A25;
+	const double f9_23 = -f9 * m_A73;
+	m_A76 += m_A26 * f9_23;
+	m_A77 += m_A27 * f9_23;
+	RHS23 += f9_23 * RHS9;
+	const double f9_26 = -f9 * m_A96;
+	m_A100 += m_A26 * f9_26;
+	m_A103 += m_A27 * f9_26;
+	RHS26 += f9_26 * RHS9;
+	const double f10 = 1.0 / m_A29;
+	const double f10_24 = -f10 * m_A79;
+	m_A82 += m_A30 * f10_24;
+	m_A84 += m_A31 * f10_24;
+	RHS24 += f10_24 * RHS10;
+	const double f10_26 = -f10 * m_A97;
+	m_A101 += m_A30 * f10_26;
+	m_A103 += m_A31 * f10_26;
+	RHS26 += f10_26 * RHS10;
+	const double f11 = 1.0 / m_A32;
+	const double f11_13 = -f11 * m_A39;
+	m_A40 += m_A33 * f11_13;
+	m_A41 += m_A34 * f11_13;
+	RHS13 += f11_13 * RHS11;
+	const double f11_27 = -f11 * m_A105;
+	m_A106 += m_A33 * f11_27;
+	m_A111 += m_A34 * f11_27;
+	RHS27 += f11_27 * RHS11;
+	const double f12 = 1.0 / m_A35;
+	const double f12_14 = -f12 * m_A43;
+	m_A44 += m_A36 * f12_14;
+	m_A45 += m_A37 * f12_14;
+	RHS14 += f12_14 * RHS12;
+	const double f12_25 = -f12 * m_A85;
+	m_A86 += m_A36 * f12_25;
+	m_A90 += m_A37 * f12_25;
+	RHS25 += f12_25 * RHS12;
+	const double f13 = 1.0 / m_A40;
+	const double f13_27 = -f13 * m_A106;
+	m_A111 += m_A41 * f13_27;
+	RHS27 += f13_27 * RHS13;
+	const double f14 = 1.0 / m_A44;
+	const double f14_25 = -f14 * m_A86;
+	m_A90 += m_A45 * f14_25;
+	RHS25 += f14_25 * RHS14;
+	const double f15 = 1.0 / m_A47;
+	const double f15_16 = -f15 * m_A49;
+	m_A50 += m_A48 * f15_16;
+	RHS16 += f15_16 * RHS15;
+	const double f16 = 1.0 / m_A50;
+	const double f16_22 = -f16 * m_A69;
+	m_A71 += m_A51 * f16_22;
+	RHS22 += f16_22 * RHS16;
+	const double f17 = 1.0 / m_A52;
+	const double f17_22 = -f17 * m_A70;
+	m_A71 += m_A53 * f17_22;
+	m_A72 += m_A54 * f17_22;
+	RHS22 += f17_22 * RHS17;
+	const double f17_26 = -f17 * m_A98;
+	m_A99 += m_A53 * f17_26;
+	m_A103 += m_A54 * f17_26;
+	RHS26 += f17_26 * RHS17;
+	const double f18 = 1.0 / m_A56;
+	const double f18_23 = -f18 * m_A74;
+	m_A76 += m_A57 * f18_23;
+	m_A78 += m_A58 * f18_23;
+	RHS23 += f18_23 * RHS18;
+	const double f18_27 = -f18 * m_A107;
+	m_A109 += m_A57 * f18_27;
+	m_A111 += m_A58 * f18_27;
+	RHS27 += f18_27 * RHS18;
+	const double f19 = 1.0 / m_A60;
+	const double f19_24 = -f19 * m_A80;
+	m_A82 += m_A61 * f19_24;
+	m_A83 += m_A62 * f19_24;
+	RHS24 += f19_24 * RHS19;
+	const double f19_25 = -f19 * m_A87;
+	m_A89 += m_A61 * f19_25;
+	m_A90 += m_A62 * f19_25;
+	RHS25 += f19_25 * RHS19;
+	const double f20 = 1.0 / m_A63;
+	const double f20_23 = -f20 * m_A75;
+	m_A76 += m_A64 * f20_23;
+	m_A78 += m_A65 * f20_23;
+	RHS23 += f20_23 * RHS20;
+	const double f20_27 = -f20 * m_A108;
+	m_A109 += m_A64 * f20_27;
+	m_A111 += m_A65 * f20_27;
+	RHS27 += f20_27 * RHS20;
+	const double f21 = 1.0 / m_A66;
+	const double f21_24 = -f21 * m_A81;
+	m_A82 += m_A67 * f21_24;
+	m_A83 += m_A68 * f21_24;
+	RHS24 += f21_24 * RHS21;
+	const double f21_25 = -f21 * m_A88;
+	m_A89 += m_A67 * f21_25;
+	m_A90 += m_A68 * f21_25;
 	RHS25 += f21_25 * RHS21;
-	const double f21_34 = -f21 * m_A118;
-	m_A119 += m_A61 * f21_34;
-	m_A121 += m_A62 * f21_34;
-	RHS34 += f21_34 * RHS21;
-	const double f22 = 1.0 / m_A63;
-	const double f22_37 = -f22 * m_A139;
-	m_A149 += m_A64 * f22_37;
-	RHS37 += f22_37 * RHS22;
-	const double f23 = 1.0 / m_A65;
-	const double f23_37 = -f23 * m_A140;
-	m_A149 += m_A66 * f23_37;
-	RHS37 += f23_37 * RHS23;
-	const double f24 = 1.0 / m_A69;
-	const double f24_25 = -f24 * m_A75;
-	m_A76 += m_A70 * f24_25;
-	m_A77 += m_A71 * f24_25;
+	const double f22 = 1.0 / m_A71;
+	const double f22_26 = -f22 * m_A99;
+	m_A103 += m_A72 * f22_26;
+	RHS26 += f22_26 * RHS22;
+	const double f23 = 1.0 / m_A76;
+	const double f23_26 = -f23 * m_A100;
+	m_A103 += m_A77 * f23_26;
+	m_A104 += m_A78 * f23_26;
+	RHS26 += f23_26 * RHS23;
+	const double f23_27 = -f23 * m_A109;
+	m_A110 += m_A77 * f23_27;
+	m_A111 += m_A78 * f23_27;
+	RHS27 += f23_27 * RHS23;
+	const double f24 = 1.0 / m_A82;
+	const double f24_25 = -f24 * m_A89;
+	m_A90 += m_A83 * f24_25;
+	m_A91 += m_A84 * f24_25;
 	RHS25 += f24_25 * RHS24;
-	const double f24_29 = -f24 * m_A93;
-	m_A94 += m_A70 * f24_29;
-	m_A95 += m_A71 * f24_29;
-	RHS29 += f24_29 * RHS24;
-	const double f25 = 1.0 / m_A76;
-	const double f25_29 = -f25 * m_A94;
-	m_A95 += m_A77 * f25_29;
-	m_A96 += m_A78 * f25_29;
-	RHS29 += f25_29 * RHS25;
-	const double f25_34 = -f25 * m_A119;
-	m_A120 += m_A77 * f25_34;
-	m_A121 += m_A78 * f25_34;
-	RHS34 += f25_34 * RHS25;
-	const double f26 = 1.0 / m_A81;
-	const double f26_33 = -f26 * m_A113;
-	m_A115 += m_A82 * f26_33;
-	RHS33 += f26_33 * RHS26;
-	const double f26_36 = -f26 * m_A129;
-	m_A132 += m_A82 * f26_36;
-	RHS36 += f26_36 * RHS26;
-	const double f27 = 1.0 / m_A84;
-	const double f27_36 = -f27 * m_A130;
-	m_A132 += m_A85 * f27_36;
-	RHS36 += f27_36 * RHS27;
-	const double f28 = 1.0 / m_A88;
-	const double f28_30 = -f28 * m_A99;
-	m_A101 += m_A89 * f28_30;
-	RHS30 += f28_30 * RHS28;
-	const double f28_32 = -f28 * m_A108;
-	m_A110 += m_A89 * f28_32;
-	RHS32 += f28_32 * RHS28;
-	const double f29 = 1.0 / m_A95;
-	const double f29_34 = -f29 * m_A120;
-	m_A121 += m_A96 * f29_34;
-	m_A122 += m_A97 * f29_34;
-	RHS34 += f29_34 * RHS29;
-	const double f29_37 = -f29 * m_A141;
-	m_A146 += m_A96 * f29_37;
-	m_A149 += m_A97 * f29_37;
-	RHS37 += f29_37 * RHS29;
-	const double f30 = 1.0 / m_A100;
-	const double f30_32 = -f30 * m_A109;
-	m_A110 += m_A101 * f30_32;
-	RHS32 += f30_32 * RHS30;
-	const double f30_37 = -f30 * m_A142;
-	m_A144 += m_A101 * f30_37;
-	RHS37 += f30_37 * RHS30;
-	const double f31 = 1.0 / m_A103;
-	const double f31_37 = -f31 * m_A143;
-	m_A149 += m_A104 * f31_37;
-	RHS37 += f31_37 * RHS31;
-	const double f32 = 1.0 / m_A110;
-	const double f32_37 = -f32 * m_A144;
-	m_A149 += m_A111 * f32_37;
-	RHS37 += f32_37 * RHS32;
-	const double f33 = 1.0 / m_A114;
-	const double f33_36 = -f33 * m_A131;
-	m_A132 += m_A115 * f33_36;
-	RHS36 += f33_36 * RHS33;
-	const double f33_37 = -f33 * m_A145;
-	m_A148 += m_A115 * f33_37;
-	RHS37 += f33_37 * RHS33;
-	const double f34 = 1.0 / m_A121;
-	const double f34_37 = -f34 * m_A146;
-	m_A149 += m_A122 * f34_37;
-	RHS37 += f34_37 * RHS34;
-	const double f35 = 1.0 / m_A125;
-	const double f35_37 = -f35 * m_A147;
-	m_A149 += m_A126 * f35_37;
-	RHS37 += f35_37 * RHS35;
-	const double f36 = 1.0 / m_A132;
-	const double f36_37 = -f36 * m_A148;
-	m_A149 += m_A133 * f36_37;
-	RHS37 += f36_37 * RHS36;
-	V[37] = RHS37 / m_A149;
-	double tmp36 = 0.0;
-	tmp36 += m_A133 * V[37];
-	V[36] = (RHS36 - tmp36) / m_A132;
-	double tmp35 = 0.0;
-	tmp35 += m_A126 * V[37];
-	V[35] = (RHS35 - tmp35) / m_A125;
-	double tmp34 = 0.0;
-	tmp34 += m_A122 * V[37];
-	V[34] = (RHS34 - tmp34) / m_A121;
-	double tmp33 = 0.0;
-	tmp33 += m_A115 * V[36];
-	V[33] = (RHS33 - tmp33) / m_A114;
-	double tmp32 = 0.0;
-	tmp32 += m_A111 * V[37];
-	V[32] = (RHS32 - tmp32) / m_A110;
-	double tmp31 = 0.0;
-	tmp31 += m_A104 * V[37];
-	V[31] = (RHS31 - tmp31) / m_A103;
-	double tmp30 = 0.0;
-	tmp30 += m_A101 * V[32];
-	V[30] = (RHS30 - tmp30) / m_A100;
-	double tmp29 = 0.0;
-	tmp29 += m_A96 * V[34];
-	tmp29 += m_A97 * V[37];
-	V[29] = (RHS29 - tmp29) / m_A95;
-	double tmp28 = 0.0;
-	tmp28 += m_A89 * V[32];
-	V[28] = (RHS28 - tmp28) / m_A88;
-	double tmp27 = 0.0;
-	tmp27 += m_A85 * V[36];
-	V[27] = (RHS27 - tmp27) / m_A84;
+	const double f24_26 = -f24 * m_A101;
+	m_A102 += m_A83 * f24_26;
+	m_A103 += m_A84 * f24_26;
+	RHS26 += f24_26 * RHS24;
+	const double f25 = 1.0 / m_A90;
+	const double f25_26 = -f25 * m_A102;
+	m_A103 += m_A91 * f25_26;
+	RHS26 += f25_26 * RHS25;
+	const double f26 = 1.0 / m_A103;
+	const double f26_27 = -f26 * m_A110;
+	m_A111 += m_A104 * f26_27;
+	RHS27 += f26_27 * RHS26;
+	V[27] = RHS27 / m_A111;
 	double tmp26 = 0.0;
-	tmp26 += m_A82 * V[36];
-	V[26] = (RHS26 - tmp26) / m_A81;
+	tmp26 += m_A104 * V[27];
+	V[26] = (RHS26 - tmp26) / m_A103;
 	double tmp25 = 0.0;
-	tmp25 += m_A77 * V[29];
-	tmp25 += m_A78 * V[34];
-	V[25] = (RHS25 - tmp25) / m_A76;
+	tmp25 += m_A91 * V[26];
+	V[25] = (RHS25 - tmp25) / m_A90;
+	double tmp24 = 0.0;
+	tmp24 += m_A83 * V[25];
+	tmp24 += m_A84 * V[26];
+	V[24] = (RHS24 - tmp24) / m_A82;
+	double tmp23 = 0.0;
+	tmp23 += m_A77 * V[26];
+	tmp23 += m_A78 * V[27];
+	V[23] = (RHS23 - tmp23) / m_A76;
+	double tmp22 = 0.0;
+	tmp22 += m_A72 * V[26];
+	V[22] = (RHS22 - tmp22) / m_A71;
+	double tmp21 = 0.0;
+	tmp21 += m_A67 * V[24];
+	tmp21 += m_A68 * V[25];
+	V[21] = (RHS21 - tmp21) / m_A66;
+	double tmp20 = 0.0;
+	tmp20 += m_A64 * V[23];
+	tmp20 += m_A65 * V[27];
+	V[20] = (RHS20 - tmp20) / m_A63;
+	double tmp19 = 0.0;
+	tmp19 += m_A61 * V[24];
+	tmp19 += m_A62 * V[25];
+	V[19] = (RHS19 - tmp19) / m_A60;
+	double tmp18 = 0.0;
+	tmp18 += m_A57 * V[23];
+	tmp18 += m_A58 * V[27];
+	V[18] = (RHS18 - tmp18) / m_A56;
+	double tmp17 = 0.0;
+	tmp17 += m_A53 * V[22];
+	tmp17 += m_A54 * V[26];
+	V[17] = (RHS17 - tmp17) / m_A52;
+	double tmp16 = 0.0;
+	tmp16 += m_A51 * V[22];
+	V[16] = (RHS16 - tmp16) / m_A50;
+	double tmp15 = 0.0;
+	tmp15 += m_A48 * V[16];
+	V[15] = (RHS15 - tmp15) / m_A47;
+	double tmp14 = 0.0;
+	tmp14 += m_A45 * V[25];
+	V[14] = (RHS14 - tmp14) / m_A44;
+	double tmp13 = 0.0;
+	tmp13 += m_A41 * V[27];
+	V[13] = (RHS13 - tmp13) / m_A40;
+	double tmp12 = 0.0;
+	tmp12 += m_A36 * V[14];
+	tmp12 += m_A37 * V[25];
+	V[12] = (RHS12 - tmp12) / m_A35;
+	double tmp11 = 0.0;
+	tmp11 += m_A33 * V[13];
+	tmp11 += m_A34 * V[27];
+	V[11] = (RHS11 - tmp11) / m_A32;
+	double tmp10 = 0.0;
+	tmp10 += m_A30 * V[24];
+	tmp10 += m_A31 * V[26];
+	V[10] = (RHS10 - tmp10) / m_A29;
+	double tmp9 = 0.0;
+	tmp9 += m_A26 * V[23];
+	tmp9 += m_A27 * V[26];
+	V[9] = (RHS9 - tmp9) / m_A25;
+	double tmp8 = 0.0;
+	tmp8 += m_A22 * V[10];
+	tmp8 += m_A23 * V[26];
+	V[8] = (RHS8 - tmp8) / m_A21;
+	double tmp7 = 0.0;
+	tmp7 += m_A18 * V[9];
+	tmp7 += m_A19 * V[26];
+	V[7] = (RHS7 - tmp7) / m_A17;
+	double tmp6 = 0.0;
+	tmp6 += m_A14 * V[8];
+	tmp6 += m_A15 * V[26];
+	V[6] = (RHS6 - tmp6) / m_A13;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[7];
+	tmp5 += m_A12 * V[26];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[19];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[18];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[14];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[13];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[15];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// ripoff
+static void nl_gcr_76c9e236353caed1_35_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A3 += go[0];
+	m_A2 += go[1];
+	m_A1 += go[2];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A5 += go[5];
+	double RHS1 = Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A6 += gt[16];
+	m_A10 += go[12];
+	m_A9 += go[13];
+	m_A8 += go[14];
+	m_A7 += go[15];
+	double RHS2 = Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 += Idr[15];
+	RHS2 += Idr[16];
+	RHS2 -= go[16] * *cnV[16];
+	m_A13 += gt[17];
+	m_A13 += gt[18];
+	m_A13 += gt[19];
+	m_A13 += gt[20];
+	m_A12 += go[17];
+	m_A11 += go[18];
+	double RHS3 = Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 += Idr[20];
+	RHS3 -= go[19] * *cnV[19];
+	RHS3 -= go[20] * *cnV[20];
+	m_A20 += gt[21];
+	m_A20 += gt[22];
+	m_A20 += gt[23];
+	m_A20 += gt[24];
+	m_A18 += go[21];
+	m_A17 += go[22];
+	double RHS4 = Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 -= go[23] * *cnV[23];
+	RHS4 -= go[24] * *cnV[24];
+	m_A27 += gt[25];
+	m_A27 += gt[26];
+	m_A27 += gt[27];
+	m_A27 += gt[28];
+	m_A24 += go[25];
+	m_A23 += go[26];
+	double RHS5 = Idr[25];
+	RHS5 += Idr[26];
+	RHS5 += Idr[27];
+	RHS5 += Idr[28];
+	RHS5 -= go[27] * *cnV[27];
+	RHS5 -= go[28] * *cnV[28];
+	m_A34 += gt[29];
+	m_A34 += gt[30];
+	m_A34 += gt[31];
+	m_A34 += gt[32];
+	m_A34 += gt[33];
+	m_A34 += gt[34];
+	m_A29 += go[29];
+	m_A30 += go[30];
+	double RHS6 = Idr[29];
+	RHS6 += Idr[30];
+	RHS6 += Idr[31];
+	RHS6 += Idr[32];
+	RHS6 += Idr[33];
+	RHS6 += Idr[34];
+	RHS6 -= go[31] * *cnV[31];
+	RHS6 -= go[32] * *cnV[32];
+	RHS6 -= go[33] * *cnV[33];
+	RHS6 -= go[34] * *cnV[34];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A11;
+	m_A13 += m_A1 * f0_3;
+	m_A14 += m_A2 * f0_3;
+	m_A15 += m_A3 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f0_4 = -f0 * m_A17;
+	m_A19 += m_A1 * f0_4;
+	m_A20 += m_A2 * f0_4;
+	m_A21 += m_A3 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f0_5 = -f0 * m_A23;
+	m_A25 += m_A1 * f0_5;
+	m_A26 += m_A2 * f0_5;
+	m_A27 += m_A3 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A4;
+	const double f1_6 = -f1 * m_A29;
+	m_A30 += m_A5 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_3 = -f2 * m_A12;
+	m_A13 += m_A7 * f2_3;
+	m_A14 += m_A8 * f2_3;
+	m_A15 += m_A9 * f2_3;
+	m_A16 += m_A10 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	const double f2_4 = -f2 * m_A18;
+	m_A19 += m_A7 * f2_4;
+	m_A20 += m_A8 * f2_4;
+	m_A21 += m_A9 * f2_4;
+	m_A22 += m_A10 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_5 = -f2 * m_A24;
+	m_A25 += m_A7 * f2_5;
+	m_A26 += m_A8 * f2_5;
+	m_A27 += m_A9 * f2_5;
+	m_A28 += m_A10 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f2_6 = -f2 * m_A30;
+	m_A31 += m_A7 * f2_6;
+	m_A32 += m_A8 * f2_6;
+	m_A33 += m_A9 * f2_6;
+	m_A34 += m_A10 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f3 = 1.0 / m_A13;
+	const double f3_4 = -f3 * m_A19;
+	m_A20 += m_A14 * f3_4;
+	m_A21 += m_A15 * f3_4;
+	m_A22 += m_A16 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f3_5 = -f3 * m_A25;
+	m_A26 += m_A14 * f3_5;
+	m_A27 += m_A15 * f3_5;
+	m_A28 += m_A16 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f3_6 = -f3 * m_A31;
+	m_A32 += m_A14 * f3_6;
+	m_A33 += m_A15 * f3_6;
+	m_A34 += m_A16 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f4 = 1.0 / m_A20;
+	const double f4_5 = -f4 * m_A26;
+	m_A27 += m_A21 * f4_5;
+	m_A28 += m_A22 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	const double f4_6 = -f4 * m_A32;
+	m_A33 += m_A21 * f4_6;
+	m_A34 += m_A22 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f5 = 1.0 / m_A27;
+	const double f5_6 = -f5 * m_A33;
+	m_A34 += m_A28 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	V[6] = RHS6 / m_A34;
+	double tmp5 = 0.0;
+	tmp5 += m_A28 * V[6];
+	V[5] = (RHS5 - tmp5) / m_A27;
+	double tmp4 = 0.0;
+	tmp4 += m_A21 * V[5];
+	tmp4 += m_A22 * V[6];
+	V[4] = (RHS4 - tmp4) / m_A20;
+	double tmp3 = 0.0;
+	tmp3 += m_A14 * V[4];
+	tmp3 += m_A15 * V[5];
+	tmp3 += m_A16 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A13;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[3];
+	tmp2 += m_A8 * V[4];
+	tmp2 += m_A9 * V[5];
+	tmp2 += m_A10 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A5 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A4;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	tmp0 += m_A2 * V[4];
+	tmp0 += m_A3 * V[5];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// gamemachine
+static void nl_gcr_782d79b5cbe953b1_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	m_A1 += go[1];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A3 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A5 += go[7];
+	m_A5 += go[8];
+	m_A4 += go[9];
+	m_A4 += go[10];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// barrier
+static void nl_gcr_79e756c5892cf87d_31_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 -= go[5] * *cnV[5];
+	RHS2 -= go[6] * *cnV[6];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A8 += go[11];
+	m_A9 += go[12];
+	m_A7 += go[13];
+	double RHS3 = Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A11 += go[16];
+	double RHS4 = Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 -= go[17] * *cnV[17];
+	RHS4 -= go[18] * *cnV[18];
+	m_A14 += gt[19];
+	m_A14 += gt[20];
+	m_A12 += go[19];
+	m_A13 += go[20];
+	double RHS5 = Idr[19];
+	RHS5 += Idr[20];
+	m_A18 += gt[21];
+	m_A18 += gt[22];
+	m_A18 += gt[23];
+	m_A17 += go[21];
+	m_A19 += go[22];
+	double RHS6 = Idr[21];
+	RHS6 += Idr[22];
+	RHS6 += Idr[23];
+	RHS6 -= go[23] * *cnV[23];
+	m_A23 += gt[24];
+	m_A23 += gt[25];
+	m_A21 += go[24];
+	m_A20 += go[25];
+	double RHS7 = Idr[24];
+	RHS7 += Idr[25];
+	m_A30 += gt[26];
+	m_A30 += gt[27];
+	m_A30 += gt[28];
+	m_A30 += gt[29];
+	m_A30 += gt[30];
+	m_A25 += go[26];
+	m_A26 += go[27];
+	m_A28 += go[28];
+	double RHS8 = Idr[26];
+	RHS8 += Idr[27];
+	RHS8 += Idr[28];
+	RHS8 += Idr[29];
+	RHS8 += Idr[30];
+	RHS8 -= go[29] * *cnV[29];
+	RHS8 -= go[30] * *cnV[30];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A12;
+	m_A14 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_6 = -f1 * m_A17;
+	m_A18 += m_A3 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_8 = -f2 * m_A25;
+	m_A28 += m_A5 * f2_8;
+	RHS8 += f2_8 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_5 = -f3 * m_A13;
+	m_A14 += m_A7 * f3_5;
+	m_A15 += m_A8 * f3_5;
+	m_A16 += m_A9 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f3_7 = -f3 * m_A20;
+	m_A22 += m_A7 * f3_7;
+	m_A23 += m_A8 * f3_7;
+	m_A24 += m_A9 * f3_7;
+	RHS7 += f3_7 * RHS3;
+	const double f3_8 = -f3 * m_A26;
+	m_A27 += m_A7 * f3_8;
+	m_A29 += m_A8 * f3_8;
+	m_A30 += m_A9 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_7 = -f4 * m_A21;
+	m_A23 += m_A11 * f4_7;
+	RHS7 += f4_7 * RHS4;
+	const double f5 = 1.0 / m_A14;
+	const double f5_7 = -f5 * m_A22;
+	m_A23 += m_A15 * f5_7;
+	m_A24 += m_A16 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f5_8 = -f5 * m_A27;
+	m_A29 += m_A15 * f5_8;
+	m_A30 += m_A16 * f5_8;
+	RHS8 += f5_8 * RHS5;
+	const double f6 = 1.0 / m_A18;
+	const double f6_8 = -f6 * m_A28;
+	m_A30 += m_A19 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f7 = 1.0 / m_A23;
+	const double f7_8 = -f7 * m_A29;
+	m_A30 += m_A24 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	V[8] = RHS8 / m_A30;
+	double tmp7 = 0.0;
+	tmp7 += m_A24 * V[8];
+	V[7] = (RHS7 - tmp7) / m_A23;
+	double tmp6 = 0.0;
+	tmp6 += m_A19 * V[8];
+	V[6] = (RHS6 - tmp6) / m_A18;
+	double tmp5 = 0.0;
+	tmp5 += m_A15 * V[7];
+	tmp5 += m_A16 * V[8];
+	V[5] = (RHS5 - tmp5) / m_A14;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[7];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[5];
+	tmp3 += m_A8 * V[7];
+	tmp3 += m_A9 * V[8];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[6];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[5];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// breakout
+static void nl_gcr_7a42b97d838ca073_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A5 += go[7];
+	m_A4 += go[8];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[9] * *cnV[9];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// fireone
+static void nl_gcr_7aee4423e3fdbfda_128_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A7 += go[4];
+	m_A6 += go[5];
+	m_A5 += go[6];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[7] * *cnV[7];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A8 += gt[10];
+	m_A9 += go[8];
+	m_A10 += go[9];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	RHS3 += Idr[10];
+	RHS3 -= go[10] * *cnV[10];
+	m_A11 += gt[11];
+	m_A11 += gt[12];
+	m_A12 += go[11];
+	double RHS4 = Idr[11];
+	RHS4 += Idr[12];
+	RHS4 -= go[12] * *cnV[12];
+	m_A13 += gt[13];
+	m_A13 += gt[14];
+	m_A13 += gt[15];
+	m_A13 += gt[16];
+	m_A13 += gt[17];
+	m_A13 += gt[18];
+	m_A13 += gt[19];
+	m_A16 += go[13];
+	m_A17 += go[14];
+	m_A15 += go[15];
+	m_A14 += go[16];
+	double RHS5 = Idr[13];
+	RHS5 += Idr[14];
+	RHS5 += Idr[15];
+	RHS5 += Idr[16];
+	RHS5 += Idr[17];
+	RHS5 += Idr[18];
+	RHS5 += Idr[19];
+	RHS5 -= go[17] * *cnV[17];
+	RHS5 -= go[18] * *cnV[18];
+	RHS5 -= go[19] * *cnV[19];
+	m_A18 += gt[20];
+	m_A18 += gt[21];
+	m_A18 += gt[22];
+	m_A18 += gt[23];
+	m_A18 += gt[24];
+	m_A18 += gt[25];
+	m_A18 += gt[26];
+	m_A21 += go[20];
+	m_A22 += go[21];
+	m_A19 += go[22];
+	m_A20 += go[23];
+	double RHS6 = Idr[20];
+	RHS6 += Idr[21];
+	RHS6 += Idr[22];
+	RHS6 += Idr[23];
+	RHS6 += Idr[24];
+	RHS6 += Idr[25];
+	RHS6 += Idr[26];
+	RHS6 -= go[24] * *cnV[24];
+	RHS6 -= go[25] * *cnV[25];
+	RHS6 -= go[26] * *cnV[26];
+	m_A23 += gt[27];
+	m_A23 += gt[28];
+	m_A23 += gt[29];
+	m_A24 += go[27];
+	m_A25 += go[28];
+	double RHS7 = Idr[27];
+	RHS7 += Idr[28];
+	RHS7 += Idr[29];
+	RHS7 -= go[29] * *cnV[29];
+	m_A26 += gt[30];
+	m_A26 += gt[31];
+	m_A27 += go[30];
+	double RHS8 = Idr[30];
+	RHS8 += Idr[31];
+	RHS8 -= go[31] * *cnV[31];
+	m_A28 += gt[32];
+	m_A28 += gt[33];
+	m_A28 += gt[34];
+	m_A29 += go[32];
+	m_A30 += go[33];
+	double RHS9 = Idr[32];
+	RHS9 += Idr[33];
+	RHS9 += Idr[34];
+	RHS9 -= go[34] * *cnV[34];
+	m_A31 += gt[35];
+	m_A31 += gt[36];
+	m_A31 += gt[37];
+	m_A32 += go[35];
+	double RHS10 = Idr[35];
+	RHS10 += Idr[36];
+	RHS10 += Idr[37];
+	RHS10 -= go[36] * *cnV[36];
+	RHS10 -= go[37] * *cnV[37];
+	m_A33 += gt[38];
+	m_A33 += gt[39];
+	m_A33 += gt[40];
+	m_A35 += go[38];
+	m_A34 += go[39];
+	double RHS11 = Idr[38];
+	RHS11 += Idr[39];
+	RHS11 += Idr[40];
+	RHS11 -= go[40] * *cnV[40];
+	m_A38 += gt[41];
+	m_A38 += gt[42];
+	m_A38 += gt[43];
+	m_A38 += gt[44];
+	m_A37 += go[41];
+	m_A36 += go[42];
+	double RHS12 = Idr[41];
+	RHS12 += Idr[42];
+	RHS12 += Idr[43];
+	RHS12 += Idr[44];
+	RHS12 -= go[43] * *cnV[43];
+	RHS12 -= go[44] * *cnV[44];
+	m_A44 += gt[45];
+	m_A44 += gt[46];
+	m_A44 += gt[47];
+	m_A44 += gt[48];
+	m_A42 += go[45];
+	m_A41 += go[46];
+	double RHS13 = Idr[45];
+	RHS13 += Idr[46];
+	RHS13 += Idr[47];
+	RHS13 += Idr[48];
+	RHS13 -= go[47] * *cnV[47];
+	RHS13 -= go[48] * *cnV[48];
+	m_A50 += gt[49];
+	m_A50 += gt[50];
+	m_A50 += gt[51];
+	m_A49 += go[49];
+	m_A51 += go[50];
+	double RHS14 = Idr[49];
+	RHS14 += Idr[50];
+	RHS14 += Idr[51];
+	RHS14 -= go[51] * *cnV[51];
+	m_A53 += gt[52];
+	m_A53 += gt[53];
+	m_A53 += gt[54];
+	m_A53 += gt[55];
+	m_A52 += go[52];
+	m_A54 += go[53];
+	double RHS15 = Idr[52];
+	RHS15 += Idr[53];
+	RHS15 += Idr[54];
+	RHS15 += Idr[55];
+	RHS15 -= go[54] * *cnV[54];
+	RHS15 -= go[55] * *cnV[55];
+	m_A59 += gt[56];
+	m_A59 += gt[57];
+	m_A59 += gt[58];
+	m_A59 += gt[59];
+	m_A59 += gt[60];
+	m_A59 += gt[61];
+	m_A62 += go[56];
+	m_A57 += go[57];
+	m_A56 += go[58];
+	m_A55 += go[59];
+	m_A61 += go[60];
+	double RHS16 = Idr[56];
+	RHS16 += Idr[57];
+	RHS16 += Idr[58];
+	RHS16 += Idr[59];
+	RHS16 += Idr[60];
+	RHS16 += Idr[61];
+	RHS16 -= go[61] * *cnV[61];
+	m_A66 += gt[62];
+	m_A66 += gt[63];
+	m_A66 += gt[64];
+	m_A66 += gt[65];
+	m_A65 += go[62];
+	m_A64 += go[63];
+	m_A67 += go[64];
+	double RHS17 = Idr[62];
+	RHS17 += Idr[63];
+	RHS17 += Idr[64];
+	RHS17 += Idr[65];
+	RHS17 -= go[65] * *cnV[65];
+	m_A73 += gt[66];
+	m_A73 += gt[67];
+	m_A73 += gt[68];
+	m_A73 += gt[69];
+	m_A76 += go[66];
+	m_A69 += go[67];
+	m_A68 += go[68];
+	double RHS18 = Idr[66];
+	RHS18 += Idr[67];
+	RHS18 += Idr[68];
+	RHS18 += Idr[69];
+	RHS18 -= go[69] * *cnV[69];
+	m_A79 += gt[70];
+	m_A79 += gt[71];
+	m_A78 += go[70];
+	double RHS19 = Idr[70];
+	RHS19 += Idr[71];
+	RHS19 -= go[71] * *cnV[71];
+	m_A83 += gt[72];
+	m_A83 += gt[73];
+	m_A83 += gt[74];
+	m_A82 += go[72];
+	m_A81 += go[73];
+	double RHS20 = Idr[72];
+	RHS20 += Idr[73];
+	RHS20 += Idr[74];
+	RHS20 -= go[74] * *cnV[74];
+	m_A87 += gt[75];
+	m_A87 += gt[76];
+	m_A87 += gt[77];
+	m_A87 += gt[78];
+	m_A87 += gt[79];
+	m_A87 += gt[80];
+	m_A87 += gt[81];
+	m_A88 += go[75];
+	m_A85 += go[76];
+	double RHS21 = Idr[75];
+	RHS21 += Idr[76];
+	RHS21 += Idr[77];
+	RHS21 += Idr[78];
+	RHS21 += Idr[79];
+	RHS21 += Idr[80];
+	RHS21 += Idr[81];
+	RHS21 -= go[77] * *cnV[77];
+	RHS21 -= go[78] * *cnV[78];
+	RHS21 -= go[79] * *cnV[79];
+	RHS21 -= go[80] * *cnV[80];
+	RHS21 -= go[81] * *cnV[81];
+	m_A95 += gt[82];
+	m_A95 += gt[83];
+	m_A95 += gt[84];
+	m_A95 += gt[85];
+	m_A90 += go[82];
+	m_A89 += go[83];
+	m_A92 += go[84];
+	m_A91 += go[85];
+	double RHS22 = Idr[82];
+	RHS22 += Idr[83];
+	RHS22 += Idr[84];
+	RHS22 += Idr[85];
+	m_A106 += gt[86];
+	m_A106 += gt[87];
+	m_A106 += gt[88];
+	m_A106 += gt[89];
+	m_A106 += gt[90];
+	m_A106 += gt[91];
+	m_A106 += gt[92];
+	m_A106 += gt[93];
+	m_A102 += go[86];
+	m_A100 += go[87];
+	m_A108 += go[88];
+	m_A99 += go[89];
+	m_A103 += go[90];
+	double RHS23 = Idr[86];
+	RHS23 += Idr[87];
+	RHS23 += Idr[88];
+	RHS23 += Idr[89];
+	RHS23 += Idr[90];
+	RHS23 += Idr[91];
+	RHS23 += Idr[92];
+	RHS23 += Idr[93];
+	RHS23 -= go[91] * *cnV[91];
+	RHS23 -= go[92] * *cnV[92];
+	RHS23 -= go[93] * *cnV[93];
+	m_A115 += gt[94];
+	m_A115 += gt[95];
+	m_A115 += gt[96];
+	m_A115 += gt[97];
+	m_A115 += gt[98];
+	m_A112 += go[94];
+	m_A109 += go[95];
+	m_A110 += go[96];
+	double RHS24 = Idr[94];
+	RHS24 += Idr[95];
+	RHS24 += Idr[96];
+	RHS24 += Idr[97];
+	RHS24 += Idr[98];
+	RHS24 -= go[97] * *cnV[97];
+	RHS24 -= go[98] * *cnV[98];
+	m_A127 += gt[99];
+	m_A127 += gt[100];
+	m_A127 += gt[101];
+	m_A127 += gt[102];
+	m_A127 += gt[103];
+	m_A127 += gt[104];
+	m_A122 += go[99];
+	m_A125 += go[100];
+	m_A118 += go[101];
+	m_A119 += go[102];
+	m_A117 += go[103];
+	double RHS25 = Idr[99];
+	RHS25 += Idr[100];
+	RHS25 += Idr[101];
+	RHS25 += Idr[102];
+	RHS25 += Idr[103];
+	RHS25 += Idr[104];
+	RHS25 -= go[104] * *cnV[104];
+	const double f0 = 1.0 / m_A0;
+	const double f0_12 = -f0 * m_A36;
+	m_A38 += m_A1 * f0_12;
+	RHS12 += f0_12 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_14 = -f1 * m_A49;
+	m_A50 += m_A3 * f1_14;
+	RHS14 += f1_14 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_12 = -f2 * m_A37;
+	m_A38 += m_A5 * f2_12;
+	m_A39 += m_A6 * f2_12;
+	m_A40 += m_A7 * f2_12;
+	RHS12 += f2_12 * RHS2;
+	const double f2_13 = -f2 * m_A41;
+	m_A43 += m_A5 * f2_13;
+	m_A44 += m_A6 * f2_13;
+	m_A46 += m_A7 * f2_13;
+	RHS13 += f2_13 * RHS2;
+	const double f2_18 = -f2 * m_A68;
+	m_A70 += m_A5 * f2_18;
+	m_A71 += m_A6 * f2_18;
+	m_A73 += m_A7 * f2_18;
+	RHS18 += f2_18 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_16 = -f3 * m_A55;
+	m_A59 += m_A9 * f3_16;
+	m_A61 += m_A10 * f3_16;
+	RHS16 += f3_16 * RHS3;
+	const double f3_22 = -f3 * m_A89;
+	m_A92 += m_A9 * f3_22;
+	m_A95 += m_A10 * f3_22;
+	RHS22 += f3_22 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_15 = -f4 * m_A52;
+	m_A53 += m_A12 * f4_15;
+	RHS15 += f4_15 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_13 = -f5 * m_A42;
+	m_A44 += m_A14 * f5_13;
+	m_A45 += m_A15 * f5_13;
+	m_A47 += m_A16 * f5_13;
+	m_A48 += m_A17 * f5_13;
+	RHS13 += f5_13 * RHS5;
+	const double f5_16 = -f5 * m_A56;
+	m_A58 += m_A14 * f5_16;
+	m_A59 += m_A15 * f5_16;
+	m_A62 += m_A16 * f5_16;
+	m_A63 += m_A17 * f5_16;
+	RHS16 += f5_16 * RHS5;
+	const double f5_23 = -f5 * m_A99;
+	m_A101 += m_A14 * f5_23;
+	m_A103 += m_A15 * f5_23;
+	m_A106 += m_A16 * f5_23;
+	m_A108 += m_A17 * f5_23;
+	RHS23 += f5_23 * RHS5;
+	const double f5_25 = -f5 * m_A117;
+	m_A120 += m_A14 * f5_25;
+	m_A121 += m_A15 * f5_25;
+	m_A125 += m_A16 * f5_25;
+	m_A127 += m_A17 * f5_25;
+	RHS25 += f5_25 * RHS5;
+	const double f6 = 1.0 / m_A18;
+	const double f6_16 = -f6 * m_A57;
+	m_A59 += m_A19 * f6_16;
+	m_A60 += m_A20 * f6_16;
+	m_A62 += m_A21 * f6_16;
+	m_A63 += m_A22 * f6_16;
+	RHS16 += f6_16 * RHS6;
+	const double f6_18 = -f6 * m_A69;
+	m_A72 += m_A19 * f6_18;
+	m_A73 += m_A20 * f6_18;
+	m_A75 += m_A21 * f6_18;
+	m_A77 += m_A22 * f6_18;
+	RHS18 += f6_18 * RHS6;
+	const double f6_23 = -f6 * m_A100;
+	m_A103 += m_A19 * f6_23;
+	m_A104 += m_A20 * f6_23;
+	m_A106 += m_A21 * f6_23;
+	m_A108 += m_A22 * f6_23;
+	RHS23 += f6_23 * RHS6;
+	const double f6_25 = -f6 * m_A118;
+	m_A121 += m_A19 * f6_25;
+	m_A123 += m_A20 * f6_25;
+	m_A125 += m_A21 * f6_25;
+	m_A127 += m_A22 * f6_25;
+	RHS25 += f6_25 * RHS6;
+	const double f7 = 1.0 / m_A23;
+	const double f7_17 = -f7 * m_A64;
+	m_A66 += m_A24 * f7_17;
+	m_A67 += m_A25 * f7_17;
+	RHS17 += f7_17 * RHS7;
+	const double f7_25 = -f7 * m_A119;
+	m_A122 += m_A24 * f7_25;
+	m_A127 += m_A25 * f7_25;
+	RHS25 += f7_25 * RHS7;
+	const double f8 = 1.0 / m_A26;
+	const double f8_17 = -f8 * m_A65;
+	m_A66 += m_A27 * f8_17;
+	RHS17 += f8_17 * RHS8;
+	const double f9 = 1.0 / m_A28;
+	const double f9_19 = -f9 * m_A78;
+	m_A79 += m_A29 * f9_19;
+	m_A80 += m_A30 * f9_19;
+	RHS19 += f9_19 * RHS9;
+	const double f9_22 = -f9 * m_A90;
+	m_A94 += m_A29 * f9_22;
+	m_A95 += m_A30 * f9_22;
+	RHS22 += f9_22 * RHS9;
+	const double f10 = 1.0 / m_A31;
+	const double f10_20 = -f10 * m_A81;
+	m_A83 += m_A32 * f10_20;
+	RHS20 += f10_20 * RHS10;
+	const double f11 = 1.0 / m_A33;
+	const double f11_20 = -f11 * m_A82;
+	m_A83 += m_A34 * f11_20;
+	m_A84 += m_A35 * f11_20;
+	RHS20 += f11_20 * RHS11;
+	const double f11_21 = -f11 * m_A85;
+	m_A86 += m_A34 * f11_21;
+	m_A88 += m_A35 * f11_21;
+	RHS21 += f11_21 * RHS11;
+	const double f11_24 = -f11 * m_A109;
+	m_A111 += m_A34 * f11_24;
+	m_A115 += m_A35 * f11_24;
+	RHS24 += f11_24 * RHS11;
+	const double f12 = 1.0 / m_A38;
+	const double f12_13 = -f12 * m_A43;
+	m_A44 += m_A39 * f12_13;
+	m_A46 += m_A40 * f12_13;
+	RHS13 += f12_13 * RHS12;
+	const double f12_18 = -f12 * m_A70;
+	m_A71 += m_A39 * f12_18;
+	m_A73 += m_A40 * f12_18;
+	RHS18 += f12_18 * RHS12;
+	const double f13 = 1.0 / m_A44;
+	const double f13_16 = -f13 * m_A58;
+	m_A59 += m_A45 * f13_16;
+	m_A60 += m_A46 * f13_16;
+	m_A62 += m_A47 * f13_16;
+	m_A63 += m_A48 * f13_16;
+	RHS16 += f13_16 * RHS13;
+	const double f13_18 = -f13 * m_A71;
+	m_A72 += m_A45 * f13_18;
+	m_A73 += m_A46 * f13_18;
+	m_A75 += m_A47 * f13_18;
+	m_A77 += m_A48 * f13_18;
+	RHS18 += f13_18 * RHS13;
+	const double f13_23 = -f13 * m_A101;
+	m_A103 += m_A45 * f13_23;
+	m_A104 += m_A46 * f13_23;
+	m_A106 += m_A47 * f13_23;
+	m_A108 += m_A48 * f13_23;
+	RHS23 += f13_23 * RHS13;
+	const double f13_25 = -f13 * m_A120;
+	m_A121 += m_A45 * f13_25;
+	m_A123 += m_A46 * f13_25;
+	m_A125 += m_A47 * f13_25;
+	m_A127 += m_A48 * f13_25;
+	RHS25 += f13_25 * RHS13;
+	const double f14 = 1.0 / m_A50;
+	const double f14_22 = -f14 * m_A91;
+	m_A95 += m_A51 * f14_22;
+	RHS22 += f14_22 * RHS14;
+	const double f15 = 1.0 / m_A53;
+	const double f15_23 = -f15 * m_A102;
+	m_A106 += m_A54 * f15_23;
+	RHS23 += f15_23 * RHS15;
+	const double f16 = 1.0 / m_A59;
+	const double f16_18 = -f16 * m_A72;
+	m_A73 += m_A60 * f16_18;
+	m_A74 += m_A61 * f16_18;
+	m_A75 += m_A62 * f16_18;
+	m_A77 += m_A63 * f16_18;
+	RHS18 += f16_18 * RHS16;
+	const double f16_22 = -f16 * m_A92;
+	m_A93 += m_A60 * f16_22;
+	m_A95 += m_A61 * f16_22;
+	m_A96 += m_A62 * f16_22;
+	m_A98 += m_A63 * f16_22;
+	RHS22 += f16_22 * RHS16;
+	const double f16_23 = -f16 * m_A103;
+	m_A104 += m_A60 * f16_23;
+	m_A105 += m_A61 * f16_23;
+	m_A106 += m_A62 * f16_23;
+	m_A108 += m_A63 * f16_23;
+	RHS23 += f16_23 * RHS16;
+	const double f16_25 = -f16 * m_A121;
+	m_A123 += m_A60 * f16_25;
+	m_A124 += m_A61 * f16_25;
+	m_A125 += m_A62 * f16_25;
+	m_A127 += m_A63 * f16_25;
+	RHS25 += f16_25 * RHS16;
+	const double f17 = 1.0 / m_A66;
+	const double f17_25 = -f17 * m_A122;
+	m_A127 += m_A67 * f17_25;
+	RHS25 += f17_25 * RHS17;
+	const double f18 = 1.0 / m_A73;
+	const double f18_22 = -f18 * m_A93;
+	m_A95 += m_A74 * f18_22;
+	m_A96 += m_A75 * f18_22;
+	m_A97 += m_A76 * f18_22;
+	m_A98 += m_A77 * f18_22;
+	RHS22 += f18_22 * RHS18;
+	const double f18_23 = -f18 * m_A104;
+	m_A105 += m_A74 * f18_23;
+	m_A106 += m_A75 * f18_23;
+	m_A107 += m_A76 * f18_23;
+	m_A108 += m_A77 * f18_23;
+	RHS23 += f18_23 * RHS18;
+	const double f18_24 = -f18 * m_A110;
+	m_A113 += m_A74 * f18_24;
+	m_A114 += m_A75 * f18_24;
+	m_A115 += m_A76 * f18_24;
+	m_A116 += m_A77 * f18_24;
+	RHS24 += f18_24 * RHS18;
+	const double f18_25 = -f18 * m_A123;
+	m_A124 += m_A74 * f18_25;
+	m_A125 += m_A75 * f18_25;
+	m_A126 += m_A76 * f18_25;
+	m_A127 += m_A77 * f18_25;
+	RHS25 += f18_25 * RHS18;
+	const double f19 = 1.0 / m_A79;
+	const double f19_22 = -f19 * m_A94;
+	m_A95 += m_A80 * f19_22;
+	RHS22 += f19_22 * RHS19;
+	const double f20 = 1.0 / m_A83;
+	const double f20_21 = -f20 * m_A86;
+	m_A88 += m_A84 * f20_21;
+	RHS21 += f20_21 * RHS20;
+	const double f20_24 = -f20 * m_A111;
+	m_A115 += m_A84 * f20_24;
+	RHS24 += f20_24 * RHS20;
+	const double f21 = 1.0 / m_A87;
+	const double f21_24 = -f21 * m_A112;
+	m_A115 += m_A88 * f21_24;
+	RHS24 += f21_24 * RHS21;
+	const double f22 = 1.0 / m_A95;
+	const double f22_23 = -f22 * m_A105;
+	m_A106 += m_A96 * f22_23;
+	m_A107 += m_A97 * f22_23;
+	m_A108 += m_A98 * f22_23;
+	RHS23 += f22_23 * RHS22;
+	const double f22_24 = -f22 * m_A113;
+	m_A114 += m_A96 * f22_24;
+	m_A115 += m_A97 * f22_24;
+	m_A116 += m_A98 * f22_24;
+	RHS24 += f22_24 * RHS22;
+	const double f22_25 = -f22 * m_A124;
+	m_A125 += m_A96 * f22_25;
+	m_A126 += m_A97 * f22_25;
+	m_A127 += m_A98 * f22_25;
+	RHS25 += f22_25 * RHS22;
+	const double f23 = 1.0 / m_A106;
+	const double f23_24 = -f23 * m_A114;
+	m_A115 += m_A107 * f23_24;
+	m_A116 += m_A108 * f23_24;
+	RHS24 += f23_24 * RHS23;
+	const double f23_25 = -f23 * m_A125;
+	m_A126 += m_A107 * f23_25;
+	m_A127 += m_A108 * f23_25;
+	RHS25 += f23_25 * RHS23;
+	const double f24 = 1.0 / m_A115;
+	const double f24_25 = -f24 * m_A126;
+	m_A127 += m_A116 * f24_25;
+	RHS25 += f24_25 * RHS24;
+	V[25] = RHS25 / m_A127;
 	double tmp24 = 0.0;
-	tmp24 += m_A70 * V[25];
-	tmp24 += m_A71 * V[29];
-	V[24] = (RHS24 - tmp24) / m_A69;
+	tmp24 += m_A116 * V[25];
+	V[24] = (RHS24 - tmp24) / m_A115;
 	double tmp23 = 0.0;
-	tmp23 += m_A66 * V[37];
-	V[23] = (RHS23 - tmp23) / m_A65;
+	tmp23 += m_A107 * V[24];
+	tmp23 += m_A108 * V[25];
+	V[23] = (RHS23 - tmp23) / m_A106;
 	double tmp22 = 0.0;
-	tmp22 += m_A64 * V[37];
-	V[22] = (RHS22 - tmp22) / m_A63;
+	tmp22 += m_A96 * V[23];
+	tmp22 += m_A97 * V[24];
+	tmp22 += m_A98 * V[25];
+	V[22] = (RHS22 - tmp22) / m_A95;
 	double tmp21 = 0.0;
-	tmp21 += m_A61 * V[25];
-	tmp21 += m_A62 * V[34];
-	V[21] = (RHS21 - tmp21) / m_A60;
+	tmp21 += m_A88 * V[24];
+	V[21] = (RHS21 - tmp21) / m_A87;
 	double tmp20 = 0.0;
-	tmp20 += m_A56 * V[21];
-	V[20] = (RHS20 - tmp20) / m_A55;
+	tmp20 += m_A84 * V[24];
+	V[20] = (RHS20 - tmp20) / m_A83;
 	double tmp19 = 0.0;
-	tmp19 += m_A52 * V[37];
-	V[19] = (RHS19 - tmp19) / m_A51;
+	tmp19 += m_A80 * V[22];
+	V[19] = (RHS19 - tmp19) / m_A79;
 	double tmp18 = 0.0;
-	tmp18 += m_A48 * V[30];
-	tmp18 += m_A49 * V[32];
-	tmp18 += m_A50 * V[37];
-	V[18] = (RHS18 - tmp18) / m_A47;
+	tmp18 += m_A74 * V[22];
+	tmp18 += m_A75 * V[23];
+	tmp18 += m_A76 * V[24];
+	tmp18 += m_A77 * V[25];
+	V[18] = (RHS18 - tmp18) / m_A73;
 	double tmp17 = 0.0;
-	tmp17 += m_A44 * V[33];
-	tmp17 += m_A45 * V[36];
-	tmp17 += m_A46 * V[37];
-	V[17] = (RHS17 - tmp17) / m_A43;
+	tmp17 += m_A67 * V[25];
+	V[17] = (RHS17 - tmp17) / m_A66;
 	double tmp16 = 0.0;
-	tmp16 += m_A42 * V[37];
-	V[16] = (RHS16 - tmp16) / m_A41;
+	tmp16 += m_A60 * V[18];
+	tmp16 += m_A61 * V[22];
+	tmp16 += m_A62 * V[23];
+	tmp16 += m_A63 * V[25];
+	V[16] = (RHS16 - tmp16) / m_A59;
 	double tmp15 = 0.0;
-	tmp15 += m_A40 * V[35];
-	V[15] = (RHS15 - tmp15) / m_A39;
+	tmp15 += m_A54 * V[23];
+	V[15] = (RHS15 - tmp15) / m_A53;
 	double tmp14 = 0.0;
-	tmp14 += m_A38 * V[35];
-	V[14] = (RHS14 - tmp14) / m_A37;
+	tmp14 += m_A51 * V[22];
+	V[14] = (RHS14 - tmp14) / m_A50;
 	double tmp13 = 0.0;
-	tmp13 += m_A35 * V[29];
-	tmp13 += m_A36 * V[37];
-	V[13] = (RHS13 - tmp13) / m_A34;
+	tmp13 += m_A45 * V[16];
+	tmp13 += m_A46 * V[18];
+	tmp13 += m_A47 * V[23];
+	tmp13 += m_A48 * V[25];
+	V[13] = (RHS13 - tmp13) / m_A44;
 	double tmp12 = 0.0;
-	tmp12 += m_A32 * V[28];
-	tmp12 += m_A33 * V[32];
-	V[12] = (RHS12 - tmp12) / m_A31;
+	tmp12 += m_A39 * V[13];
+	tmp12 += m_A40 * V[18];
+	V[12] = (RHS12 - tmp12) / m_A38;
 	double tmp11 = 0.0;
-	tmp11 += m_A30 * V[32];
-	V[11] = (RHS11 - tmp11) / m_A29;
+	tmp11 += m_A34 * V[20];
+	tmp11 += m_A35 * V[24];
+	V[11] = (RHS11 - tmp11) / m_A33;
 	double tmp10 = 0.0;
-	tmp10 += m_A27 * V[26];
-	tmp10 += m_A28 * V[36];
-	V[10] = (RHS10 - tmp10) / m_A26;
+	tmp10 += m_A32 * V[20];
+	V[10] = (RHS10 - tmp10) / m_A31;
 	double tmp9 = 0.0;
-	tmp9 += m_A25 * V[28];
-	V[9] = (RHS9 - tmp9) / m_A24;
+	tmp9 += m_A29 * V[19];
+	tmp9 += m_A30 * V[22];
+	V[9] = (RHS9 - tmp9) / m_A28;
 	double tmp8 = 0.0;
-	tmp8 += m_A21 * V[24];
-	tmp8 += m_A22 * V[25];
-	tmp8 += m_A23 * V[29];
-	V[8] = (RHS8 - tmp8) / m_A20;
+	tmp8 += m_A27 * V[17];
+	V[8] = (RHS8 - tmp8) / m_A26;
+	double tmp7 = 0.0;
+	tmp7 += m_A24 * V[17];
+	tmp7 += m_A25 * V[25];
+	V[7] = (RHS7 - tmp7) / m_A23;
+	double tmp6 = 0.0;
+	tmp6 += m_A19 * V[16];
+	tmp6 += m_A20 * V[18];
+	tmp6 += m_A21 * V[23];
+	tmp6 += m_A22 * V[25];
+	V[6] = (RHS6 - tmp6) / m_A18;
+	double tmp5 = 0.0;
+	tmp5 += m_A14 * V[13];
+	tmp5 += m_A15 * V[16];
+	tmp5 += m_A16 * V[23];
+	tmp5 += m_A17 * V[25];
+	V[5] = (RHS5 - tmp5) / m_A13;
+	double tmp4 = 0.0;
+	tmp4 += m_A12 * V[15];
+	V[4] = (RHS4 - tmp4) / m_A11;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[16];
+	tmp3 += m_A10 * V[22];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[12];
+	tmp2 += m_A6 * V[13];
+	tmp2 += m_A7 * V[18];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[14];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[12];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// astrob
+static void nl_gcr_7c86a9bc1c6aef4c_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A6 += gt[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A5 += go[5];
+	m_A4 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// solarq
+static void nl_gcr_7caaa135bff3d9f3_15_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A4 += go[2];
+	m_A3 += go[3];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A5 += gt[5];
+	m_A5 += gt[6];
+	m_A6 += go[5];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 -= go[6] * *cnV[6];
+	m_A9 += gt[7];
+	m_A9 += gt[8];
+	m_A9 += gt[9];
+	m_A8 += go[7];
+	m_A7 += go[8];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 += Idr[9];
+	RHS3 -= go[9] * *cnV[9];
+	m_A14 += gt[10];
+	m_A14 += gt[11];
+	m_A14 += gt[12];
+	m_A12 += go[10];
+	m_A11 += go[11];
+	double RHS4 = Idr[10];
+	RHS4 += Idr[11];
+	RHS4 += Idr[12];
+	RHS4 -= go[12] * *cnV[12];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A7;
+	m_A9 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A8;
+	m_A9 += m_A3 * f1_3;
+	m_A10 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f1_4 = -f1 * m_A11;
+	m_A13 += m_A3 * f1_4;
+	m_A14 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_4 = -f2 * m_A12;
+	m_A14 += m_A6 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_4 = -f3 * m_A13;
+	m_A14 += m_A10 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	V[4] = RHS4 / m_A14;
+	double tmp3 = 0.0;
+	tmp3 += m_A10 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	tmp1 += m_A4 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// warrior
+static void nl_gcr_8003d4625273fa4d_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[3] * *cnV[3];
+	RHS1 -= go[4] * *cnV[4];
+	m_A5 += gt[5];
+	m_A5 += gt[6];
+	m_A5 += gt[7];
+	m_A6 += go[5];
+	m_A4 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[7] * *cnV[7];
+	m_A9 += gt[8];
+	m_A9 += gt[9];
+	m_A7 += go[8];
+	m_A8 += go[9];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A5 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A7;
+	m_A9 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_3 = -f2 * m_A8;
+	m_A9 += m_A6 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// kidniki
+static void nl_gcr_8046625a0fe0959_21_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A1 += go[0];
+	m_A2 += go[1];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A3 += gt[7];
+	m_A3 += gt[8];
+	m_A3 += gt[9];
+	m_A5 += go[7];
+	m_A4 += go[8];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[9] * *cnV[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[10];
+	m_A8 += go[11];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	m_A10 += gt[12];
+	m_A10 += gt[13];
+	m_A10 += gt[14];
+	m_A9 += go[12];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	m_A14 += gt[15];
+	m_A14 += gt[16];
+	m_A14 += gt[17];
+	m_A14 += gt[18];
+	m_A14 += gt[19];
+	m_A14 += gt[20];
+	m_A12 += go[15];
+	m_A15 += go[16];
+	m_A13 += go[17];
+	double RHS4 = Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 -= go[18] * *cnV[18];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	m_A20 += gt[21];
+	m_A20 += gt[22];
+	m_A20 += gt[23];
+	m_A17 += go[21];
+	m_A16 += go[22];
+	m_A19 += go[23];
+	double RHS5 = Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A12;
+	m_A13 += m_A1 * f0_4;
+	m_A14 += m_A2 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_4 = -f1 * m_A13;
+	m_A14 += m_A4 * f1_4;
+	m_A15 += m_A5 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f1_5 = -f1 * m_A16;
+	m_A19 += m_A4 * f1_5;
+	m_A20 += m_A5 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_3 = -f2 * m_A9;
+	m_A10 += m_A7 * f2_3;
+	m_A11 += m_A8 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	const double f2_5 = -f2 * m_A17;
+	m_A18 += m_A7 * f2_5;
+	m_A20 += m_A8 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_5 = -f3 * m_A18;
+	m_A20 += m_A11 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A14;
+	const double f4_5 = -f4 * m_A19;
+	m_A20 += m_A15 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A20;
+	double tmp4 = 0.0;
+	tmp4 += m_A15 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A14;
+	double tmp3 = 0.0;
+	tmp3 += m_A11 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A10;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[3];
+	tmp2 += m_A8 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A4 * V[4];
+	tmp1 += m_A5 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A3;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[1];
+	tmp0 += m_A2 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// mario
+static void nl_gcr_80b4b1e5cc58d303_29_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A8 += go[9];
+	m_A7 += go[10];
+	m_A7 += go[11];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 -= go[12] * *cnV[12];
+	m_A9 += gt[13];
+	m_A9 += gt[14];
+	m_A9 += gt[15];
+	m_A10 += go[13];
+	double RHS4 = Idr[13];
+	RHS4 += Idr[14];
+	RHS4 += Idr[15];
+	RHS4 -= go[14] * *cnV[14];
+	RHS4 -= go[15] * *cnV[15];
+	m_A11 += gt[16];
+	m_A11 += gt[17];
+	m_A12 += go[16];
+	double RHS5 = Idr[16];
+	RHS5 += Idr[17];
+	RHS5 -= go[17] * *cnV[17];
+	m_A14 += gt[18];
+	m_A14 += gt[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A14 += gt[22];
+	m_A14 += gt[23];
+	m_A14 += gt[24];
+	m_A16 += go[18];
+	m_A16 += go[19];
+	m_A13 += go[20];
+	m_A13 += go[21];
+	m_A15 += go[22];
+	double RHS6 = Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
+	RHS6 += Idr[21];
+	RHS6 += Idr[22];
+	RHS6 += Idr[23];
+	RHS6 += Idr[24];
+	RHS6 -= go[23] * *cnV[23];
+	RHS6 -= go[24] * *cnV[24];
+	m_A22 += gt[25];
+	m_A22 += gt[26];
+	m_A22 += gt[27];
+	m_A22 += gt[28];
+	m_A22 += gt[29];
+	m_A22 += gt[30];
+	m_A20 += go[25];
+	m_A21 += go[26];
+	m_A19 += go[27];
+	m_A18 += go[28];
+	m_A17 += go[29];
+	double RHS7 = Idr[25];
+	RHS7 += Idr[26];
+	RHS7 += Idr[27];
+	RHS7 += Idr[28];
+	RHS7 += Idr[29];
+	RHS7 += Idr[30];
+	RHS7 -= go[30] * *cnV[30];
+	m_A28 += gt[31];
+	m_A28 += gt[32];
+	m_A28 += gt[33];
+	m_A28 += gt[34];
+	m_A28 += gt[35];
+	m_A28 += gt[36];
+	m_A25 += go[31];
+	m_A24 += go[32];
+	m_A26 += go[33];
+	m_A26 += go[34];
+	double RHS8 = Idr[31];
+	RHS8 += Idr[32];
+	RHS8 += Idr[33];
+	RHS8 += Idr[34];
+	RHS8 += Idr[35];
+	RHS8 += Idr[36];
+	RHS8 -= go[35] * *cnV[35];
+	RHS8 -= go[36] * *cnV[36];
+	const double f0 = 1.0 / m_A0;
+	const double f0_7 = -f0 * m_A17;
+	m_A22 += m_A1 * f0_7;
+	RHS7 += f0_7 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_7 = -f1 * m_A18;
+	m_A22 += m_A3 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_7 = -f2 * m_A19;
+	m_A22 += m_A5 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_6 = -f3 * m_A13;
+	m_A14 += m_A7 * f3_6;
+	m_A16 += m_A8 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f3_8 = -f3 * m_A24;
+	m_A26 += m_A7 * f3_8;
+	m_A28 += m_A8 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f4 = 1.0 / m_A9;
+	const double f4_8 = -f4 * m_A25;
+	m_A28 += m_A10 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f5 = 1.0 / m_A11;
+	const double f5_7 = -f5 * m_A20;
+	m_A22 += m_A12 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f6 = 1.0 / m_A14;
+	const double f6_7 = -f6 * m_A21;
+	m_A22 += m_A15 * f6_7;
+	m_A23 += m_A16 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	const double f6_8 = -f6 * m_A26;
+	m_A27 += m_A15 * f6_8;
+	m_A28 += m_A16 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f7 = 1.0 / m_A22;
+	const double f7_8 = -f7 * m_A27;
+	m_A28 += m_A23 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	V[8] = RHS8 / m_A28;
 	double tmp7 = 0.0;
-	tmp7 += m_A19 * V[27];
-	V[7] = (RHS7 - tmp7) / m_A18;
+	tmp7 += m_A23 * V[8];
+	V[7] = (RHS7 - tmp7) / m_A22;
 	double tmp6 = 0.0;
-	tmp6 += m_A17 * V[26];
-	V[6] = (RHS6 - tmp6) / m_A16;
+	tmp6 += m_A15 * V[7];
+	tmp6 += m_A16 * V[8];
+	V[6] = (RHS6 - tmp6) / m_A14;
 	double tmp5 = 0.0;
-	tmp5 += m_A14 * V[8];
-	tmp5 += m_A15 * V[24];
-	V[5] = (RHS5 - tmp5) / m_A13;
+	tmp5 += m_A12 * V[7];
+	V[5] = (RHS5 - tmp5) / m_A11;
 	double tmp4 = 0.0;
-	tmp4 += m_A12 * V[24];
-	V[4] = (RHS4 - tmp4) / m_A11;
+	tmp4 += m_A10 * V[8];
+	V[4] = (RHS4 - tmp4) / m_A9;
 	double tmp3 = 0.0;
-	tmp3 += m_A8 * V[21];
-	tmp3 += m_A9 * V[25];
-	tmp3 += m_A10 * V[34];
-	V[3] = (RHS3 - tmp3) / m_A7;
+	tmp3 += m_A7 * V[6];
+	tmp3 += m_A8 * V[8];
+	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[20];
-	tmp2 += m_A6 * V[21];
+	tmp2 += m_A5 * V[7];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[20];
+	tmp1 += m_A3 * V[7];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[7];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// elim
+static void nl_gcr_81f40a54af2ca202_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A5 += gt[5];
+	m_A5 += gt[6];
+	m_A5 += gt[7];
+	m_A5 += gt[8];
+	m_A6 += go[5];
+	m_A4 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A9 += gt[9];
+	m_A9 += gt[10];
+	m_A9 += gt[11];
+	m_A9 += gt[12];
+	m_A9 += gt[13];
+	m_A9 += gt[14];
+	m_A8 += go[9];
+	m_A7 += go[10];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[11] * *cnV[11];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A5 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A7;
+	m_A9 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_3 = -f2 * m_A8;
+	m_A9 += m_A6 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[31];
+	tmp0 += m_A1 * V[2];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// zac1b11142
-static void nl_gcr_2b5c86f8653bcde7_12_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// sundance
+static void nl_gcr_8446e63d7842f6a6_70_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -2820,68 +30918,419 @@
 	double m_A9(0.0);
 	double m_A10(0.0);
 	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
-	m_A0 += gt[2];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
-	RHS0 += Idr[2];
 	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[2];
 	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A4 += go[3];
-	m_A3 += go[4];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	m_A7 += gt[5];
-	m_A7 += gt[6];
-	m_A6 += go[5];
-	m_A5 += go[6];
-	double RHS2 = Idr[5];
-	RHS2 += Idr[6];
-	m_A11 += gt[7];
-	m_A11 += gt[8];
-	m_A9 += go[7];
-	double RHS3 = Idr[7];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A7 += go[6];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
 	RHS3 += Idr[8];
+	RHS3 -= go[7] * *cnV[7];
 	RHS3 -= go[8] * *cnV[8];
+	m_A8 += gt[9];
+	m_A8 += gt[10];
+	m_A10 += go[9];
+	m_A9 += go[10];
+	double RHS4 = Idr[9];
+	RHS4 += Idr[10];
+	m_A11 += gt[11];
+	m_A11 += gt[12];
+	m_A11 += gt[13];
+	m_A12 += go[11];
+	m_A13 += go[12];
+	double RHS5 = Idr[11];
+	RHS5 += Idr[12];
+	RHS5 += Idr[13];
+	RHS5 -= go[13] * *cnV[13];
+	m_A14 += gt[14];
+	m_A14 += gt[15];
+	m_A14 += gt[16];
+	m_A14 += gt[17];
+	m_A14 += gt[18];
+	m_A14 += gt[19];
+	m_A14 += gt[20];
+	m_A15 += go[14];
+	double RHS6 = Idr[14];
+	RHS6 += Idr[15];
+	RHS6 += Idr[16];
+	RHS6 += Idr[17];
+	RHS6 += Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
+	RHS6 -= go[15] * *cnV[15];
+	RHS6 -= go[16] * *cnV[16];
+	RHS6 -= go[17] * *cnV[17];
+	RHS6 -= go[18] * *cnV[18];
+	RHS6 -= go[19] * *cnV[19];
+	RHS6 -= go[20] * *cnV[20];
+	m_A16 += gt[21];
+	m_A16 += gt[22];
+	m_A16 += gt[23];
+	m_A16 += gt[24];
+	m_A18 += go[21];
+	m_A18 += go[22];
+	m_A17 += go[23];
+	double RHS7 = Idr[21];
+	RHS7 += Idr[22];
+	RHS7 += Idr[23];
+	RHS7 += Idr[24];
+	RHS7 -= go[24] * *cnV[24];
+	m_A19 += gt[25];
+	m_A19 += gt[26];
+	m_A21 += go[25];
+	m_A20 += go[26];
+	double RHS8 = Idr[25];
+	RHS8 += Idr[26];
+	m_A22 += gt[27];
+	m_A22 += gt[28];
+	m_A22 += gt[29];
+	m_A24 += go[27];
+	m_A23 += go[28];
+	double RHS9 = Idr[27];
+	RHS9 += Idr[28];
+	RHS9 += Idr[29];
+	RHS9 -= go[29] * *cnV[29];
+	m_A27 += gt[30];
+	m_A27 += gt[31];
+	m_A26 += go[30];
+	m_A25 += go[31];
+	double RHS10 = Idr[30];
+	RHS10 += Idr[31];
+	m_A31 += gt[32];
+	m_A31 += gt[33];
+	m_A31 += gt[34];
+	m_A32 += go[32];
+	m_A30 += go[33];
+	double RHS11 = Idr[32];
+	RHS11 += Idr[33];
+	RHS11 += Idr[34];
+	RHS11 -= go[34] * *cnV[34];
+	m_A35 += gt[35];
+	m_A35 += gt[36];
+	m_A35 += gt[37];
+	m_A34 += go[35];
+	m_A33 += go[36];
+	double RHS12 = Idr[35];
+	RHS12 += Idr[36];
+	RHS12 += Idr[37];
+	RHS12 -= go[37] * *cnV[37];
+	m_A40 += gt[38];
+	m_A40 += gt[39];
+	m_A40 += gt[40];
+	m_A40 += gt[41];
+	m_A43 += go[38];
+	m_A38 += go[39];
+	m_A37 += go[40];
+	double RHS13 = Idr[38];
+	RHS13 += Idr[39];
+	RHS13 += Idr[40];
+	RHS13 += Idr[41];
+	RHS13 -= go[41] * *cnV[41];
+	m_A50 += gt[42];
+	m_A50 += gt[43];
+	m_A50 += gt[44];
+	m_A50 += gt[45];
+	m_A50 += gt[46];
+	m_A50 += gt[47];
+	m_A44 += go[42];
+	m_A46 += go[43];
+	m_A45 += go[44];
+	m_A45 += go[45];
+	double RHS14 = Idr[42];
+	RHS14 += Idr[43];
+	RHS14 += Idr[44];
+	RHS14 += Idr[45];
+	RHS14 += Idr[46];
+	RHS14 += Idr[47];
+	RHS14 -= go[46] * *cnV[46];
+	RHS14 -= go[47] * *cnV[47];
+	m_A55 += gt[48];
+	m_A55 += gt[49];
+	m_A55 += gt[50];
+	m_A54 += go[48];
+	m_A53 += go[49];
+	double RHS15 = Idr[48];
+	RHS15 += Idr[49];
+	RHS15 += Idr[50];
+	RHS15 -= go[50] * *cnV[50];
+	m_A62 += gt[51];
+	m_A62 += gt[52];
+	m_A62 += gt[53];
+	m_A62 += gt[54];
+	m_A57 += go[51];
+	m_A58 += go[52];
+	m_A59 += go[53];
+	double RHS16 = Idr[51];
+	RHS16 += Idr[52];
+	RHS16 += Idr[53];
+	RHS16 += Idr[54];
+	RHS16 -= go[54] * *cnV[54];
+	m_A69 += gt[55];
+	m_A69 += gt[56];
+	m_A64 += go[55];
+	m_A65 += go[56];
+	double RHS17 = Idr[55];
+	RHS17 += Idr[56];
 	const double f0 = 1.0 / m_A0;
-	const double f0_2 = -f0 * m_A5;
-	m_A7 += m_A1 * f0_2;
-	RHS2 += f0_2 * RHS0;
+	const double f0_15 = -f0 * m_A53;
+	m_A55 += m_A1 * f0_15;
+	RHS15 += f0_15 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_2 = -f1 * m_A6;
-	m_A7 += m_A3 * f1_2;
-	m_A8 += m_A4 * f1_2;
-	RHS2 += f1_2 * RHS1;
-	const double f1_3 = -f1 * m_A9;
-	m_A10 += m_A3 * f1_3;
-	m_A11 += m_A4 * f1_3;
-	RHS3 += f1_3 * RHS1;
-	const double f2 = 1.0 / m_A7;
-	const double f2_3 = -f2 * m_A10;
-	m_A11 += m_A8 * f2_3;
-	RHS3 += f2_3 * RHS2;
-	V[3] = RHS3 / m_A11;
+	const double f1_12 = -f1 * m_A33;
+	m_A35 += m_A3 * f1_12;
+	RHS12 += f1_12 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_11 = -f2 * m_A30;
+	m_A31 += m_A5 * f2_11;
+	RHS11 += f2_11 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_16 = -f3 * m_A57;
+	m_A62 += m_A7 * f3_16;
+	RHS16 += f3_16 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_13 = -f4 * m_A37;
+	m_A40 += m_A9 * f4_13;
+	m_A42 += m_A10 * f4_13;
+	RHS13 += f4_13 * RHS4;
+	const double f4_16 = -f4 * m_A58;
+	m_A60 += m_A9 * f4_16;
+	m_A62 += m_A10 * f4_16;
+	RHS16 += f4_16 * RHS4;
+	const double f5 = 1.0 / m_A11;
+	const double f5_10 = -f5 * m_A25;
+	m_A27 += m_A12 * f5_10;
+	m_A28 += m_A13 * f5_10;
+	RHS10 += f5_10 * RHS5;
+	const double f5_13 = -f5 * m_A38;
+	m_A39 += m_A12 * f5_13;
+	m_A40 += m_A13 * f5_13;
+	RHS13 += f5_13 * RHS5;
+	const double f6 = 1.0 / m_A14;
+	const double f6_14 = -f6 * m_A44;
+	m_A45 += m_A15 * f6_14;
+	RHS14 += f6_14 * RHS6;
+	const double f7 = 1.0 / m_A16;
+	const double f7_10 = -f7 * m_A26;
+	m_A27 += m_A17 * f7_10;
+	m_A29 += m_A18 * f7_10;
+	RHS10 += f7_10 * RHS7;
+	const double f7_14 = -f7 * m_A45;
+	m_A47 += m_A17 * f7_14;
+	m_A50 += m_A18 * f7_14;
+	RHS14 += f7_14 * RHS7;
+	const double f8 = 1.0 / m_A19;
+	const double f8_12 = -f8 * m_A34;
+	m_A35 += m_A20 * f8_12;
+	m_A36 += m_A21 * f8_12;
+	RHS12 += f8_12 * RHS8;
+	const double f8_14 = -f8 * m_A46;
+	m_A48 += m_A20 * f8_14;
+	m_A50 += m_A21 * f8_14;
+	RHS14 += f8_14 * RHS8;
+	const double f9 = 1.0 / m_A22;
+	const double f9_15 = -f9 * m_A54;
+	m_A55 += m_A23 * f9_15;
+	m_A56 += m_A24 * f9_15;
+	RHS15 += f9_15 * RHS9;
+	const double f9_17 = -f9 * m_A64;
+	m_A67 += m_A23 * f9_17;
+	m_A69 += m_A24 * f9_17;
+	RHS17 += f9_17 * RHS9;
+	const double f10 = 1.0 / m_A27;
+	const double f10_13 = -f10 * m_A39;
+	m_A40 += m_A28 * f10_13;
+	m_A41 += m_A29 * f10_13;
+	RHS13 += f10_13 * RHS10;
+	const double f10_14 = -f10 * m_A47;
+	m_A49 += m_A28 * f10_14;
+	m_A50 += m_A29 * f10_14;
+	RHS14 += f10_14 * RHS10;
+	const double f11 = 1.0 / m_A31;
+	const double f11_16 = -f11 * m_A59;
+	m_A62 += m_A32 * f11_16;
+	RHS16 += f11_16 * RHS11;
+	const double f12 = 1.0 / m_A35;
+	const double f12_14 = -f12 * m_A48;
+	m_A50 += m_A36 * f12_14;
+	RHS14 += f12_14 * RHS12;
+	const double f13 = 1.0 / m_A40;
+	const double f13_14 = -f13 * m_A49;
+	m_A50 += m_A41 * f13_14;
+	m_A51 += m_A42 * f13_14;
+	m_A52 += m_A43 * f13_14;
+	RHS14 += f13_14 * RHS13;
+	const double f13_16 = -f13 * m_A60;
+	m_A61 += m_A41 * f13_16;
+	m_A62 += m_A42 * f13_16;
+	m_A63 += m_A43 * f13_16;
+	RHS16 += f13_16 * RHS13;
+	const double f13_17 = -f13 * m_A65;
+	m_A66 += m_A41 * f13_17;
+	m_A68 += m_A42 * f13_17;
+	m_A69 += m_A43 * f13_17;
+	RHS17 += f13_17 * RHS13;
+	const double f14 = 1.0 / m_A50;
+	const double f14_16 = -f14 * m_A61;
+	m_A62 += m_A51 * f14_16;
+	m_A63 += m_A52 * f14_16;
+	RHS16 += f14_16 * RHS14;
+	const double f14_17 = -f14 * m_A66;
+	m_A68 += m_A51 * f14_17;
+	m_A69 += m_A52 * f14_17;
+	RHS17 += f14_17 * RHS14;
+	const double f15 = 1.0 / m_A55;
+	const double f15_17 = -f15 * m_A67;
+	m_A69 += m_A56 * f15_17;
+	RHS17 += f15_17 * RHS15;
+	const double f16 = 1.0 / m_A62;
+	const double f16_17 = -f16 * m_A68;
+	m_A69 += m_A63 * f16_17;
+	RHS17 += f16_17 * RHS16;
+	V[17] = RHS17 / m_A69;
+	double tmp16 = 0.0;
+	tmp16 += m_A63 * V[17];
+	V[16] = (RHS16 - tmp16) / m_A62;
+	double tmp15 = 0.0;
+	tmp15 += m_A56 * V[17];
+	V[15] = (RHS15 - tmp15) / m_A55;
+	double tmp14 = 0.0;
+	tmp14 += m_A51 * V[16];
+	tmp14 += m_A52 * V[17];
+	V[14] = (RHS14 - tmp14) / m_A50;
+	double tmp13 = 0.0;
+	tmp13 += m_A41 * V[14];
+	tmp13 += m_A42 * V[16];
+	tmp13 += m_A43 * V[17];
+	V[13] = (RHS13 - tmp13) / m_A40;
+	double tmp12 = 0.0;
+	tmp12 += m_A36 * V[14];
+	V[12] = (RHS12 - tmp12) / m_A35;
+	double tmp11 = 0.0;
+	tmp11 += m_A32 * V[16];
+	V[11] = (RHS11 - tmp11) / m_A31;
+	double tmp10 = 0.0;
+	tmp10 += m_A28 * V[13];
+	tmp10 += m_A29 * V[14];
+	V[10] = (RHS10 - tmp10) / m_A27;
+	double tmp9 = 0.0;
+	tmp9 += m_A23 * V[15];
+	tmp9 += m_A24 * V[17];
+	V[9] = (RHS9 - tmp9) / m_A22;
+	double tmp8 = 0.0;
+	tmp8 += m_A20 * V[12];
+	tmp8 += m_A21 * V[14];
+	V[8] = (RHS8 - tmp8) / m_A19;
+	double tmp7 = 0.0;
+	tmp7 += m_A17 * V[10];
+	tmp7 += m_A18 * V[14];
+	V[7] = (RHS7 - tmp7) / m_A16;
+	double tmp6 = 0.0;
+	tmp6 += m_A15 * V[7];
+	V[6] = (RHS6 - tmp6) / m_A14;
+	double tmp5 = 0.0;
+	tmp5 += m_A12 * V[10];
+	tmp5 += m_A13 * V[13];
+	V[5] = (RHS5 - tmp5) / m_A11;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[13];
+	tmp4 += m_A10 * V[16];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[16];
+	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A8 * V[3];
-	V[2] = (RHS2 - tmp2) / m_A7;
+	tmp2 += m_A5 * V[11];
+	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[2];
-	tmp1 += m_A4 * V[3];
+	tmp1 += m_A3 * V[12];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[2];
+	tmp0 += m_A1 * V[15];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// rebound
-static void nl_gcr_33a561080717d469_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// dpatrol
+static void nl_gcr_85652d3e3ada285a_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -2889,111 +31338,78 @@
 	double m_A4(0.0);
 	double m_A5(0.0);
 	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
-	m_A0 += gt[3];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
-	RHS0 += Idr[3];
 	RHS0 -= go[1] * *cnV[1];
 	RHS0 -= go[2] * *cnV[2];
-	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[3];
 	m_A2 += gt[4];
 	m_A2 += gt[5];
-	m_A3 += go[4];
-	double RHS1 = Idr[4];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
 	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
 	RHS1 -= go[5] * *cnV[5];
-	m_A6 += gt[6];
-	m_A6 += gt[7];
-	m_A6 += gt[8];
-	m_A6 += gt[9];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
 	m_A5 += go[6];
-	m_A4 += go[7];
 	double RHS2 = Idr[6];
 	RHS2 += Idr[7];
 	RHS2 += Idr[8];
-	RHS2 += Idr[9];
-	RHS2 -= go[8] * *cnV[8];
-	RHS2 -= go[9] * *cnV[9];
-	const double f0 = 1.0 / m_A0;
-	const double f0_2 = -f0 * m_A4;
-	m_A6 += m_A1 * f0_2;
-	RHS2 += f0_2 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_2 = -f1 * m_A5;
-	m_A6 += m_A3 * f1_2;
-	RHS2 += f1_2 * RHS1;
-	V[2] = RHS2 / m_A6;
-	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[2];
-	V[1] = (RHS1 - tmp1) / m_A2;
-	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[2];
-	V[0] = (RHS0 - tmp0) / m_A0;
-}
-
-// dpatrol
-static void nl_gcr_390fe6bd5468155d_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
-
-{
-
-	double m_A0(0.0);
-	double m_A1(0.0);
-	double m_A2(0.0);
-	double m_A3(0.0);
-	double m_A4(0.0);
-	double m_A5(0.0);
-	double m_A6(0.0);
-	m_A0 += gt[0];
-	m_A0 += gt[1];
-	m_A1 += go[0];
-	double RHS0 = Idr[0];
-	RHS0 += Idr[1];
-	RHS0 -= go[1] * *cnV[1];
-	m_A2 += gt[2];
-	m_A2 += gt[3];
-	m_A3 += go[2];
-	double RHS1 = Idr[2];
-	RHS1 += Idr[3];
-	RHS1 -= go[3] * *cnV[3];
-	m_A6 += gt[4];
-	m_A6 += gt[5];
-	m_A6 += gt[6];
-	m_A6 += gt[7];
-	m_A5 += go[4];
-	m_A4 += go[5];
-	double RHS2 = Idr[4];
-	RHS2 += Idr[5];
-	RHS2 += Idr[6];
-	RHS2 += Idr[7];
-	RHS2 -= go[6] * *cnV[6];
 	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A9 += gt[9];
+	m_A9 += gt[10];
+	m_A9 += gt[11];
+	m_A9 += gt[12];
+	m_A8 += go[9];
+	m_A7 += go[10];
+	m_A6 += go[11];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 -= go[12] * *cnV[12];
 	const double f0 = 1.0 / m_A0;
-	const double f0_2 = -f0 * m_A4;
-	m_A6 += m_A1 * f0_2;
-	RHS2 += f0_2 * RHS0;
+	const double f0_3 = -f0 * m_A6;
+	m_A9 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_2 = -f1 * m_A5;
-	m_A6 += m_A3 * f1_2;
-	RHS2 += f1_2 * RHS1;
-	V[2] = RHS2 / m_A6;
+	const double f1_3 = -f1 * m_A7;
+	m_A9 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_3 = -f2 * m_A8;
+	m_A9 += m_A5 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[2];
+	tmp1 += m_A3 * V[3];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[2];
+	tmp0 += m_A1 * V[3];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// kidniki
-static void nl_gcr_445192d0ef3f62c6_21_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// zac1b11142
+static void nl_gcr_861d39f81d29d51_12_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -3006,144 +31422,69 @@
 	double m_A9(0.0);
 	double m_A10(0.0);
 	double m_A11(0.0);
-	double m_A12(0.0);
-	double m_A13(0.0);
-	double m_A14(0.0);
-	double m_A15(0.0);
-	double m_A16(0.0);
-	double m_A17(0.0);
-	double m_A18(0.0);
-	double m_A19(0.0);
-	double m_A20(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
-	m_A0 += gt[3];
-	m_A0 += gt[4];
-	m_A0 += gt[5];
-	m_A0 += gt[6];
 	m_A1 += go[0];
-	m_A2 += go[1];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
-	RHS0 += Idr[3];
-	RHS0 += Idr[4];
-	RHS0 += Idr[5];
-	RHS0 += Idr[6];
+	RHS0 -= go[1] * *cnV[1];
 	RHS0 -= go[2] * *cnV[2];
-	RHS0 -= go[3] * *cnV[3];
-	RHS0 -= go[4] * *cnV[4];
-	RHS0 -= go[5] * *cnV[5];
-	RHS0 -= go[6] * *cnV[6];
-	m_A3 += gt[7];
-	m_A3 += gt[8];
-	m_A3 += gt[9];
-	m_A5 += go[7];
-	m_A4 += go[8];
-	double RHS1 = Idr[7];
-	RHS1 += Idr[8];
-	RHS1 += Idr[9];
-	RHS1 -= go[9] * *cnV[9];
-	m_A6 += gt[10];
-	m_A6 += gt[11];
-	m_A7 += go[10];
-	m_A8 += go[11];
-	double RHS2 = Idr[10];
-	RHS2 += Idr[11];
-	m_A10 += gt[12];
-	m_A10 += gt[13];
-	m_A10 += gt[14];
-	m_A9 += go[12];
-	double RHS3 = Idr[12];
-	RHS3 += Idr[13];
-	RHS3 += Idr[14];
-	RHS3 -= go[13] * *cnV[13];
-	RHS3 -= go[14] * *cnV[14];
-	m_A14 += gt[15];
-	m_A14 += gt[16];
-	m_A14 += gt[17];
-	m_A14 += gt[18];
-	m_A14 += gt[19];
-	m_A14 += gt[20];
-	m_A12 += go[15];
-	m_A15 += go[16];
-	m_A13 += go[17];
-	double RHS4 = Idr[15];
-	RHS4 += Idr[16];
-	RHS4 += Idr[17];
-	RHS4 += Idr[18];
-	RHS4 += Idr[19];
-	RHS4 += Idr[20];
-	RHS4 -= go[18] * *cnV[18];
-	RHS4 -= go[19] * *cnV[19];
-	RHS4 -= go[20] * *cnV[20];
-	m_A20 += gt[21];
-	m_A20 += gt[22];
-	m_A20 += gt[23];
-	m_A17 += go[21];
-	m_A16 += go[22];
-	m_A19 += go[23];
-	double RHS5 = Idr[21];
-	RHS5 += Idr[22];
-	RHS5 += Idr[23];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A4 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	m_A7 += gt[5];
+	m_A7 += gt[6];
+	m_A6 += go[5];
+	m_A5 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	m_A11 += gt[7];
+	m_A11 += gt[8];
+	m_A9 += go[7];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 -= go[8] * *cnV[8];
 	const double f0 = 1.0 / m_A0;
-	const double f0_4 = -f0 * m_A12;
-	m_A13 += m_A1 * f0_4;
-	m_A14 += m_A2 * f0_4;
-	RHS4 += f0_4 * RHS0;
-	const double f1 = 1.0 / m_A3;
-	const double f1_4 = -f1 * m_A13;
-	m_A14 += m_A4 * f1_4;
-	m_A15 += m_A5 * f1_4;
-	RHS4 += f1_4 * RHS1;
-	const double f1_5 = -f1 * m_A16;
-	m_A19 += m_A4 * f1_5;
-	m_A20 += m_A5 * f1_5;
-	RHS5 += f1_5 * RHS1;
-	const double f2 = 1.0 / m_A6;
-	const double f2_3 = -f2 * m_A9;
-	m_A10 += m_A7 * f2_3;
+	const double f0_2 = -f0 * m_A5;
+	m_A7 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A6;
+	m_A7 += m_A3 * f1_2;
+	m_A8 += m_A4 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A7;
+	const double f2_3 = -f2 * m_A10;
 	m_A11 += m_A8 * f2_3;
 	RHS3 += f2_3 * RHS2;
-	const double f2_5 = -f2 * m_A17;
-	m_A18 += m_A7 * f2_5;
-	m_A20 += m_A8 * f2_5;
-	RHS5 += f2_5 * RHS2;
-	const double f3 = 1.0 / m_A10;
-	const double f3_5 = -f3 * m_A18;
-	m_A20 += m_A11 * f3_5;
-	RHS5 += f3_5 * RHS3;
-	const double f4 = 1.0 / m_A14;
-	const double f4_5 = -f4 * m_A19;
-	m_A20 += m_A15 * f4_5;
-	RHS5 += f4_5 * RHS4;
-	V[5] = RHS5 / m_A20;
-	double tmp4 = 0.0;
-	tmp4 += m_A15 * V[5];
-	V[4] = (RHS4 - tmp4) / m_A14;
-	double tmp3 = 0.0;
-	tmp3 += m_A11 * V[5];
-	V[3] = (RHS3 - tmp3) / m_A10;
+	V[3] = RHS3 / m_A11;
 	double tmp2 = 0.0;
-	tmp2 += m_A7 * V[3];
-	tmp2 += m_A8 * V[5];
-	V[2] = (RHS2 - tmp2) / m_A6;
+	tmp2 += m_A8 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A7;
 	double tmp1 = 0.0;
-	tmp1 += m_A4 * V[4];
-	tmp1 += m_A5 * V[5];
-	V[1] = (RHS1 - tmp1) / m_A3;
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[1];
-	tmp0 += m_A2 * V[4];
+	tmp0 += m_A1 * V[2];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// kidniki
-static void nl_gcr_4a06f16ac700a832_198_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// 280zzzap
+static void nl_gcr_864a61c57bac9c38_123_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -3267,1109 +31608,9956 @@
 	double m_A120(0.0);
 	double m_A121(0.0);
 	double m_A122(0.0);
-	double m_A123(0.0);
-	double m_A124(0.0);
-	double m_A125(0.0);
-	double m_A126(0.0);
-	double m_A127(0.0);
-	double m_A128(0.0);
-	double m_A129(0.0);
-	double m_A130(0.0);
-	double m_A131(0.0);
-	double m_A132(0.0);
-	double m_A133(0.0);
-	double m_A134(0.0);
-	double m_A135(0.0);
-	double m_A136(0.0);
-	double m_A137(0.0);
-	double m_A138(0.0);
-	double m_A139(0.0);
-	double m_A140(0.0);
-	double m_A141(0.0);
-	double m_A142(0.0);
-	double m_A143(0.0);
-	double m_A144(0.0);
-	double m_A145(0.0);
-	double m_A146(0.0);
-	double m_A147(0.0);
-	double m_A148(0.0);
-	double m_A149(0.0);
-	double m_A150(0.0);
-	double m_A151(0.0);
-	double m_A152(0.0);
-	double m_A153(0.0);
-	double m_A154(0.0);
-	double m_A155(0.0);
-	double m_A156(0.0);
-	double m_A157(0.0);
-	double m_A158(0.0);
-	double m_A159(0.0);
-	double m_A160(0.0);
-	double m_A161(0.0);
-	double m_A162(0.0);
-	double m_A163(0.0);
-	double m_A164(0.0);
-	double m_A165(0.0);
-	double m_A166(0.0);
-	double m_A167(0.0);
-	double m_A168(0.0);
-	double m_A169(0.0);
-	double m_A170(0.0);
-	double m_A171(0.0);
-	double m_A172(0.0);
-	double m_A173(0.0);
-	double m_A174(0.0);
-	double m_A175(0.0);
-	double m_A176(0.0);
-	double m_A177(0.0);
-	double m_A178(0.0);
-	double m_A179(0.0);
-	double m_A180(0.0);
-	double m_A181(0.0);
-	double m_A182(0.0);
-	double m_A183(0.0);
-	double m_A184(0.0);
-	double m_A185(0.0);
-	double m_A186(0.0);
-	double m_A187(0.0);
-	double m_A188(0.0);
-	double m_A189(0.0);
-	double m_A190(0.0);
-	double m_A191(0.0);
-	double m_A192(0.0);
-	double m_A193(0.0);
-	double m_A194(0.0);
-	double m_A195(0.0);
-	double m_A196(0.0);
-	double m_A197(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
+	m_A0 += gt[2];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
+	RHS0 += Idr[2];
 	RHS0 -= go[1] * *cnV[1];
-	m_A2 += gt[2];
+	RHS0 -= go[2] * *cnV[2];
 	m_A2 += gt[3];
-	m_A3 += go[2];
-	double RHS1 = Idr[2];
-	RHS1 += Idr[3];
-	RHS1 -= go[3] * *cnV[3];
-	m_A4 += gt[4];
+	m_A2 += gt[4];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
 	m_A4 += gt[5];
 	m_A4 += gt[6];
-	m_A6 += go[4];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
 	m_A5 += go[5];
-	double RHS2 = Idr[4];
-	RHS2 += Idr[5];
+	double RHS2 = Idr[5];
 	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
 	RHS2 -= go[6] * *cnV[6];
-	m_A7 += gt[7];
-	m_A7 += gt[8];
-	m_A7 += gt[9];
-	m_A7 += gt[10];
-	m_A7 += gt[11];
-	m_A7 += gt[12];
-	m_A7 += gt[13];
-	m_A8 += go[7];
-	m_A9 += go[8];
-	double RHS3 = Idr[7];
-	RHS3 += Idr[8];
-	RHS3 += Idr[9];
-	RHS3 += Idr[10];
-	RHS3 += Idr[11];
-	RHS3 += Idr[12];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A7 += go[12];
+	double RHS3 = Idr[12];
 	RHS3 += Idr[13];
-	RHS3 -= go[9] * *cnV[9];
-	RHS3 -= go[10] * *cnV[10];
-	RHS3 -= go[11] * *cnV[11];
-	RHS3 -= go[12] * *cnV[12];
+	RHS3 += Idr[14];
 	RHS3 -= go[13] * *cnV[13];
-	m_A10 += gt[14];
-	m_A10 += gt[15];
-	m_A12 += go[14];
-	m_A11 += go[15];
-	double RHS4 = Idr[14];
-	RHS4 += Idr[15];
-	m_A13 += gt[16];
-	m_A13 += gt[17];
-	m_A14 += go[16];
-	double RHS5 = Idr[16];
-	RHS5 += Idr[17];
-	RHS5 -= go[17] * *cnV[17];
-	m_A15 += gt[18];
-	m_A15 += gt[19];
-	m_A15 += gt[20];
-	m_A16 += go[18];
-	double RHS6 = Idr[18];
-	RHS6 += Idr[19];
-	RHS6 += Idr[20];
-	RHS6 -= go[19] * *cnV[19];
-	RHS6 -= go[20] * *cnV[20];
-	m_A17 += gt[21];
-	m_A17 += gt[22];
-	m_A17 += gt[23];
-	m_A17 += gt[24];
-	m_A17 += gt[25];
-	m_A17 += gt[26];
-	m_A17 += gt[27];
-	m_A19 += go[21];
-	m_A18 += go[22];
-	double RHS7 = Idr[21];
-	RHS7 += Idr[22];
-	RHS7 += Idr[23];
-	RHS7 += Idr[24];
-	RHS7 += Idr[25];
-	RHS7 += Idr[26];
+	RHS3 -= go[14] * *cnV[14];
+	m_A8 += gt[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A8 += gt[18];
+	m_A8 += gt[19];
+	m_A8 += gt[20];
+	m_A8 += gt[21];
+	m_A9 += go[15];
+	double RHS4 = Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 -= go[16] * *cnV[16];
+	RHS4 -= go[17] * *cnV[17];
+	RHS4 -= go[18] * *cnV[18];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	m_A10 += gt[22];
+	m_A10 += gt[23];
+	m_A11 += go[22];
+	double RHS5 = Idr[22];
+	RHS5 += Idr[23];
+	RHS5 -= go[23] * *cnV[23];
+	m_A12 += gt[24];
+	m_A12 += gt[25];
+	m_A14 += go[24];
+	m_A13 += go[25];
+	double RHS6 = Idr[24];
+	RHS6 += Idr[25];
+	m_A15 += gt[26];
+	m_A15 += gt[27];
+	m_A16 += go[26];
+	double RHS7 = Idr[26];
 	RHS7 += Idr[27];
-	RHS7 -= go[23] * *cnV[23];
-	RHS7 -= go[24] * *cnV[24];
-	RHS7 -= go[25] * *cnV[25];
-	RHS7 -= go[26] * *cnV[26];
 	RHS7 -= go[27] * *cnV[27];
-	m_A20 += gt[28];
-	m_A20 += gt[29];
-	m_A21 += go[28];
-	m_A22 += go[29];
+	m_A17 += gt[28];
+	m_A17 += gt[29];
+	m_A18 += go[28];
 	double RHS8 = Idr[28];
 	RHS8 += Idr[29];
-	m_A23 += gt[30];
-	m_A23 += gt[31];
-	m_A23 += gt[32];
-	m_A24 += go[30];
-	m_A25 += go[31];
+	RHS8 -= go[29] * *cnV[29];
+	m_A19 += gt[30];
+	m_A19 += gt[31];
+	m_A19 += gt[32];
+	m_A19 += gt[33];
+	m_A19 += gt[34];
+	m_A19 += gt[35];
+	m_A19 += gt[36];
+	m_A20 += go[30];
 	double RHS9 = Idr[30];
 	RHS9 += Idr[31];
 	RHS9 += Idr[32];
+	RHS9 += Idr[33];
+	RHS9 += Idr[34];
+	RHS9 += Idr[35];
+	RHS9 += Idr[36];
+	RHS9 -= go[31] * *cnV[31];
 	RHS9 -= go[32] * *cnV[32];
-	m_A26 += gt[33];
-	m_A26 += gt[34];
-	m_A27 += go[33];
-	double RHS10 = Idr[33];
-	RHS10 += Idr[34];
-	RHS10 -= go[34] * *cnV[34];
-	m_A28 += gt[35];
-	m_A28 += gt[36];
-	m_A28 += gt[37];
-	m_A28 += gt[38];
-	m_A30 += go[35];
-	m_A29 += go[36];
-	m_A29 += go[37];
-	double RHS11 = Idr[35];
-	RHS11 += Idr[36];
-	RHS11 += Idr[37];
-	RHS11 += Idr[38];
-	RHS11 -= go[38] * *cnV[38];
-	m_A31 += gt[39];
-	m_A31 += gt[40];
-	m_A33 += go[39];
-	m_A32 += go[40];
-	double RHS12 = Idr[39];
-	RHS12 += Idr[40];
-	m_A34 += gt[41];
-	m_A34 += gt[42];
-	m_A34 += gt[43];
-	m_A36 += go[41];
-	m_A35 += go[42];
-	double RHS13 = Idr[41];
-	RHS13 += Idr[42];
-	RHS13 += Idr[43];
-	RHS13 -= go[43] * *cnV[43];
-	m_A37 += gt[44];
-	m_A37 += gt[45];
-	m_A37 += gt[46];
-	m_A38 += go[44];
-	m_A39 += go[45];
-	double RHS14 = Idr[44];
-	RHS14 += Idr[45];
-	RHS14 += Idr[46];
-	RHS14 -= go[46] * *cnV[46];
-	m_A40 += gt[47];
-	m_A40 += gt[48];
-	m_A40 += gt[49];
-	m_A40 += gt[50];
-	m_A40 += gt[51];
-	m_A42 += go[47];
-	m_A41 += go[48];
-	m_A41 += go[49];
-	double RHS15 = Idr[47];
-	RHS15 += Idr[48];
-	RHS15 += Idr[49];
-	RHS15 += Idr[50];
-	RHS15 += Idr[51];
-	RHS15 -= go[50] * *cnV[50];
-	RHS15 -= go[51] * *cnV[51];
-	m_A43 += gt[52];
-	m_A43 += gt[53];
-	m_A43 += gt[54];
-	m_A43 += gt[55];
-	m_A44 += go[52];
-	double RHS16 = Idr[52];
-	RHS16 += Idr[53];
-	RHS16 += Idr[54];
-	RHS16 += Idr[55];
-	RHS16 -= go[53] * *cnV[53];
-	RHS16 -= go[54] * *cnV[54];
-	RHS16 -= go[55] * *cnV[55];
-	m_A45 += gt[56];
-	m_A45 += gt[57];
-	m_A45 += gt[58];
-	m_A45 += gt[59];
-	m_A46 += go[56];
-	double RHS17 = Idr[56];
-	RHS17 += Idr[57];
-	RHS17 += Idr[58];
-	RHS17 += Idr[59];
-	RHS17 -= go[57] * *cnV[57];
-	RHS17 -= go[58] * *cnV[58];
-	RHS17 -= go[59] * *cnV[59];
-	m_A47 += gt[60];
-	m_A47 += gt[61];
-	m_A47 += gt[62];
-	m_A47 += gt[63];
-	m_A47 += gt[64];
-	m_A49 += go[60];
-	m_A49 += go[61];
-	m_A48 += go[62];
-	double RHS18 = Idr[60];
-	RHS18 += Idr[61];
-	RHS18 += Idr[62];
-	RHS18 += Idr[63];
-	RHS18 += Idr[64];
-	RHS18 -= go[63] * *cnV[63];
-	RHS18 -= go[64] * *cnV[64];
-	m_A50 += gt[65];
-	m_A50 += gt[66];
-	m_A50 += gt[67];
-	m_A50 += gt[68];
-	m_A50 += gt[69];
-	m_A53 += go[65];
-	m_A52 += go[66];
-	m_A51 += go[67];
-	m_A51 += go[68];
-	double RHS19 = Idr[65];
-	RHS19 += Idr[66];
-	RHS19 += Idr[67];
-	RHS19 += Idr[68];
-	RHS19 += Idr[69];
-	RHS19 -= go[69] * *cnV[69];
-	m_A54 += gt[70];
-	m_A54 += gt[71];
-	m_A54 += gt[72];
-	m_A54 += gt[73];
-	m_A57 += go[70];
-	m_A56 += go[71];
-	m_A55 += go[72];
-	double RHS20 = Idr[70];
-	RHS20 += Idr[71];
-	RHS20 += Idr[72];
-	RHS20 += Idr[73];
-	RHS20 -= go[73] * *cnV[73];
-	m_A58 += gt[74];
-	m_A58 += gt[75];
-	m_A58 += gt[76];
-	m_A59 += go[74];
-	m_A60 += go[75];
-	double RHS21 = Idr[74];
-	RHS21 += Idr[75];
-	RHS21 += Idr[76];
-	RHS21 -= go[76] * *cnV[76];
-	m_A61 += gt[77];
-	m_A61 += gt[78];
-	m_A62 += go[77];
-	m_A63 += go[78];
-	double RHS22 = Idr[77];
-	RHS22 += Idr[78];
-	m_A64 += gt[79];
-	m_A64 += gt[80];
-	m_A65 += go[79];
-	m_A66 += go[80];
-	double RHS23 = Idr[79];
-	RHS23 += Idr[80];
-	m_A69 += gt[81];
-	m_A69 += gt[82];
-	m_A69 += gt[83];
-	m_A69 += gt[84];
-	m_A68 += go[81];
-	m_A68 += go[82];
-	m_A67 += go[83];
-	double RHS24 = Idr[81];
+	RHS9 -= go[33] * *cnV[33];
+	RHS9 -= go[34] * *cnV[34];
+	RHS9 -= go[35] * *cnV[35];
+	RHS9 -= go[36] * *cnV[36];
+	m_A21 += gt[37];
+	m_A21 += gt[38];
+	m_A21 += gt[39];
+	m_A22 += go[37];
+	double RHS10 = Idr[37];
+	RHS10 += Idr[38];
+	RHS10 += Idr[39];
+	RHS10 -= go[38] * *cnV[38];
+	RHS10 -= go[39] * *cnV[39];
+	m_A23 += gt[40];
+	m_A23 += gt[41];
+	m_A23 += gt[42];
+	m_A23 += gt[43];
+	m_A24 += go[40];
+	double RHS11 = Idr[40];
+	RHS11 += Idr[41];
+	RHS11 += Idr[42];
+	RHS11 += Idr[43];
+	RHS11 -= go[41] * *cnV[41];
+	RHS11 -= go[42] * *cnV[42];
+	RHS11 -= go[43] * *cnV[43];
+	m_A25 += gt[44];
+	m_A25 += gt[45];
+	m_A25 += gt[46];
+	m_A25 += gt[47];
+	m_A25 += gt[48];
+	m_A25 += gt[49];
+	m_A25 += gt[50];
+	m_A26 += go[44];
+	double RHS12 = Idr[44];
+	RHS12 += Idr[45];
+	RHS12 += Idr[46];
+	RHS12 += Idr[47];
+	RHS12 += Idr[48];
+	RHS12 += Idr[49];
+	RHS12 += Idr[50];
+	RHS12 -= go[45] * *cnV[45];
+	RHS12 -= go[46] * *cnV[46];
+	RHS12 -= go[47] * *cnV[47];
+	RHS12 -= go[48] * *cnV[48];
+	RHS12 -= go[49] * *cnV[49];
+	RHS12 -= go[50] * *cnV[50];
+	m_A27 += gt[51];
+	m_A27 += gt[52];
+	m_A28 += go[51];
+	double RHS13 = Idr[51];
+	RHS13 += Idr[52];
+	RHS13 -= go[52] * *cnV[52];
+	m_A29 += gt[53];
+	m_A29 += gt[54];
+	m_A30 += go[53];
+	double RHS14 = Idr[53];
+	RHS14 += Idr[54];
+	RHS14 -= go[54] * *cnV[54];
+	m_A31 += gt[55];
+	m_A31 += gt[56];
+	m_A32 += go[55];
+	double RHS15 = Idr[55];
+	RHS15 += Idr[56];
+	RHS15 -= go[56] * *cnV[56];
+	m_A33 += gt[57];
+	m_A33 += gt[58];
+	m_A33 += gt[59];
+	m_A33 += gt[60];
+	m_A35 += go[57];
+	m_A34 += go[58];
+	double RHS16 = Idr[57];
+	RHS16 += Idr[58];
+	RHS16 += Idr[59];
+	RHS16 += Idr[60];
+	RHS16 -= go[59] * *cnV[59];
+	RHS16 -= go[60] * *cnV[60];
+	m_A36 += gt[61];
+	m_A36 += gt[62];
+	m_A36 += gt[63];
+	m_A37 += go[61];
+	double RHS17 = Idr[61];
+	RHS17 += Idr[62];
+	RHS17 += Idr[63];
+	RHS17 -= go[62] * *cnV[62];
+	RHS17 -= go[63] * *cnV[63];
+	m_A38 += gt[64];
+	m_A38 += gt[65];
+	m_A39 += go[64];
+	double RHS18 = Idr[64];
+	RHS18 += Idr[65];
+	RHS18 -= go[65] * *cnV[65];
+	m_A40 += gt[66];
+	m_A40 += gt[67];
+	m_A41 += go[66];
+	double RHS19 = Idr[66];
+	RHS19 += Idr[67];
+	RHS19 -= go[67] * *cnV[67];
+	m_A43 += gt[68];
+	m_A43 += gt[69];
+	m_A43 += gt[70];
+	m_A43 += gt[71];
+	m_A42 += go[68];
+	double RHS20 = Idr[68];
+	RHS20 += Idr[69];
+	RHS20 += Idr[70];
+	RHS20 += Idr[71];
+	RHS20 -= go[69] * *cnV[69];
+	RHS20 -= go[70] * *cnV[70];
+	RHS20 -= go[71] * *cnV[71];
+	m_A47 += gt[72];
+	m_A47 += gt[73];
+	m_A46 += go[72];
+	m_A45 += go[73];
+	double RHS21 = Idr[72];
+	RHS21 += Idr[73];
+	m_A51 += gt[74];
+	m_A51 += gt[75];
+	m_A49 += go[74];
+	double RHS22 = Idr[74];
+	RHS22 += Idr[75];
+	RHS22 -= go[75] * *cnV[75];
+	m_A54 += gt[76];
+	m_A54 += gt[77];
+	m_A54 += gt[78];
+	m_A53 += go[76];
+	m_A52 += go[77];
+	double RHS23 = Idr[76];
+	RHS23 += Idr[77];
+	RHS23 += Idr[78];
+	RHS23 -= go[78] * *cnV[78];
+	m_A56 += gt[79];
+	m_A56 += gt[80];
+	m_A56 += gt[81];
+	m_A56 += gt[82];
+	m_A55 += go[79];
+	m_A57 += go[80];
+	double RHS24 = Idr[79];
+	RHS24 += Idr[80];
+	RHS24 += Idr[81];
 	RHS24 += Idr[82];
-	RHS24 += Idr[83];
-	RHS24 += Idr[84];
-	RHS24 -= go[84] * *cnV[84];
-	m_A75 += gt[85];
-	m_A75 += gt[86];
-	m_A75 += gt[87];
-	m_A73 += go[85];
-	m_A72 += go[86];
-	double RHS25 = Idr[85];
+	RHS24 -= go[81] * *cnV[81];
+	RHS24 -= go[82] * *cnV[82];
+	m_A59 += gt[83];
+	m_A59 += gt[84];
+	m_A59 += gt[85];
+	m_A59 += gt[86];
+	m_A58 += go[83];
+	m_A60 += go[84];
+	double RHS25 = Idr[83];
+	RHS25 += Idr[84];
+	RHS25 += Idr[85];
 	RHS25 += Idr[86];
-	RHS25 += Idr[87];
-	RHS25 -= go[87] * *cnV[87];
-	m_A79 += gt[88];
-	m_A79 += gt[89];
-	m_A79 += gt[90];
-	m_A78 += go[88];
-	m_A77 += go[89];
-	double RHS26 = Idr[88];
-	RHS26 += Idr[89];
-	RHS26 += Idr[90];
-	RHS26 -= go[90] * *cnV[90];
-	m_A83 += gt[91];
-	m_A83 += gt[92];
-	m_A83 += gt[93];
-	m_A83 += gt[94];
-	m_A83 += gt[95];
-	m_A83 += gt[96];
-	m_A82 += go[91];
-	m_A82 += go[92];
-	m_A81 += go[93];
-	double RHS27 = Idr[91];
+	RHS25 -= go[85] * *cnV[85];
+	RHS25 -= go[86] * *cnV[86];
+	m_A62 += gt[87];
+	m_A62 += gt[88];
+	m_A63 += go[87];
+	m_A61 += go[88];
+	double RHS26 = Idr[87];
+	RHS26 += Idr[88];
+	m_A67 += gt[89];
+	m_A67 += gt[90];
+	m_A67 += gt[91];
+	m_A67 += gt[92];
+	m_A67 += gt[93];
+	m_A67 += gt[94];
+	m_A64 += go[89];
+	m_A65 += go[90];
+	m_A69 += go[91];
+	m_A68 += go[92];
+	double RHS27 = Idr[89];
+	RHS27 += Idr[90];
+	RHS27 += Idr[91];
 	RHS27 += Idr[92];
 	RHS27 += Idr[93];
 	RHS27 += Idr[94];
-	RHS27 += Idr[95];
-	RHS27 += Idr[96];
+	RHS27 -= go[93] * *cnV[93];
 	RHS27 -= go[94] * *cnV[94];
-	RHS27 -= go[95] * *cnV[95];
-	RHS27 -= go[96] * *cnV[96];
-	m_A93 += gt[97];
-	m_A93 += gt[98];
-	m_A93 += gt[99];
-	m_A87 += go[97];
-	m_A89 += go[98];
-	m_A88 += go[99];
-	double RHS28 = Idr[97];
+	m_A72 += gt[95];
+	m_A72 += gt[96];
+	m_A72 += gt[97];
+	m_A72 += gt[98];
+	m_A71 += go[95];
+	m_A73 += go[96];
+	double RHS28 = Idr[95];
+	RHS28 += Idr[96];
+	RHS28 += Idr[97];
 	RHS28 += Idr[98];
-	RHS28 += Idr[99];
-	m_A102 += gt[100];
-	m_A102 += gt[101];
-	m_A102 += gt[102];
-	m_A99 += go[100];
-	m_A98 += go[101];
-	m_A97 += go[102];
-	double RHS29 = Idr[100];
+	RHS28 -= go[97] * *cnV[97];
+	RHS28 -= go[98] * *cnV[98];
+	m_A76 += gt[99];
+	m_A76 += gt[100];
+	m_A76 += gt[101];
+	m_A76 += gt[102];
+	m_A77 += go[99];
+	m_A78 += go[100];
+	m_A74 += go[101];
+	m_A75 += go[102];
+	double RHS29 = Idr[99];
+	RHS29 += Idr[100];
 	RHS29 += Idr[101];
 	RHS29 += Idr[102];
-	m_A110 += gt[103];
-	m_A110 += gt[104];
-	m_A110 += gt[105];
-	m_A110 += gt[106];
-	m_A107 += go[103];
-	m_A106 += go[104];
-	m_A106 += go[105];
+	m_A81 += gt[103];
+	m_A81 += gt[104];
+	m_A81 += gt[105];
+	m_A80 += go[103];
+	m_A79 += go[104];
 	double RHS30 = Idr[103];
 	RHS30 += Idr[104];
 	RHS30 += Idr[105];
-	RHS30 += Idr[106];
-	RHS30 -= go[106] * *cnV[106];
-	m_A116 += gt[107];
-	m_A116 += gt[108];
-	m_A116 += gt[109];
-	m_A116 += gt[110];
-	m_A116 += gt[111];
-	m_A116 += gt[112];
-	m_A114 += go[107];
-	m_A115 += go[108];
-	m_A115 += go[109];
-	m_A117 += go[110];
-	m_A117 += go[111];
-	m_A113 += go[112];
-	double RHS31 = Idr[107];
-	RHS31 += Idr[108];
-	RHS31 += Idr[109];
-	RHS31 += Idr[110];
-	RHS31 += Idr[111];
-	RHS31 += Idr[112];
-	m_A120 += gt[113];
-	m_A120 += gt[114];
-	m_A119 += go[113];
-	double RHS32 = Idr[113];
-	RHS32 += Idr[114];
-	RHS32 -= go[114] * *cnV[114];
-	m_A123 += gt[115];
-	m_A123 += gt[116];
-	m_A122 += go[115];
-	m_A124 += go[116];
-	double RHS33 = Idr[115];
+	RHS30 -= go[105] * *cnV[105];
+	m_A84 += gt[106];
+	m_A84 += gt[107];
+	m_A82 += go[106];
+	m_A83 += go[107];
+	double RHS31 = Idr[106];
+	RHS31 += Idr[107];
+	m_A91 += gt[108];
+	m_A91 += gt[109];
+	m_A91 += gt[110];
+	m_A91 += gt[111];
+	m_A91 += gt[112];
+	m_A86 += go[108];
+	m_A90 += go[109];
+	m_A88 += go[110];
+	m_A85 += go[111];
+	m_A87 += go[112];
+	double RHS32 = Idr[108];
+	RHS32 += Idr[109];
+	RHS32 += Idr[110];
+	RHS32 += Idr[111];
+	RHS32 += Idr[112];
+	m_A99 += gt[113];
+	m_A99 += gt[114];
+	m_A99 += gt[115];
+	m_A99 += gt[116];
+	m_A99 += gt[117];
+	m_A96 += go[113];
+	m_A100 += go[114];
+	m_A97 += go[115];
+	m_A94 += go[116];
+	m_A95 += go[117];
+	double RHS33 = Idr[113];
+	RHS33 += Idr[114];
+	RHS33 += Idr[115];
 	RHS33 += Idr[116];
-	m_A126 += gt[117];
-	m_A126 += gt[118];
-	m_A126 += gt[119];
-	m_A126 += gt[120];
-	m_A126 += gt[121];
-	m_A126 += gt[122];
-	m_A126 += gt[123];
-	m_A125 += go[117];
-	m_A127 += go[118];
-	double RHS34 = Idr[117];
-	RHS34 += Idr[118];
+	RHS33 += Idr[117];
+	m_A106 += gt[118];
+	m_A106 += gt[119];
+	m_A106 += gt[120];
+	m_A106 += gt[121];
+	m_A103 += go[118];
+	m_A104 += go[119];
+	m_A101 += go[120];
+	m_A102 += go[121];
+	double RHS34 = Idr[118];
 	RHS34 += Idr[119];
 	RHS34 += Idr[120];
 	RHS34 += Idr[121];
-	RHS34 += Idr[122];
-	RHS34 += Idr[123];
-	RHS34 -= go[119] * *cnV[119];
-	RHS34 -= go[120] * *cnV[120];
-	RHS34 -= go[121] * *cnV[121];
-	RHS34 -= go[122] * *cnV[122];
-	RHS34 -= go[123] * *cnV[123];
-	m_A129 += gt[124];
-	m_A129 += gt[125];
-	m_A128 += go[124];
-	double RHS35 = Idr[124];
+	m_A111 += gt[122];
+	m_A111 += gt[123];
+	m_A111 += gt[124];
+	m_A111 += gt[125];
+	m_A108 += go[122];
+	m_A109 += go[123];
+	double RHS35 = Idr[122];
+	RHS35 += Idr[123];
+	RHS35 += Idr[124];
 	RHS35 += Idr[125];
+	RHS35 -= go[124] * *cnV[124];
 	RHS35 -= go[125] * *cnV[125];
-	m_A133 += gt[126];
-	m_A133 += gt[127];
-	m_A133 += gt[128];
-	m_A133 += gt[129];
-	m_A133 += gt[130];
-	m_A133 += gt[131];
-	m_A132 += go[126];
-	m_A135 += go[127];
-	m_A131 += go[128];
+	m_A122 += gt[126];
+	m_A122 += gt[127];
+	m_A122 += gt[128];
+	m_A122 += gt[129];
+	m_A122 += gt[130];
+	m_A122 += gt[131];
+	m_A113 += go[126];
+	m_A117 += go[127];
+	m_A120 += go[128];
+	m_A114 += go[129];
 	double RHS36 = Idr[126];
 	RHS36 += Idr[127];
 	RHS36 += Idr[128];
 	RHS36 += Idr[129];
 	RHS36 += Idr[130];
 	RHS36 += Idr[131];
-	RHS36 -= go[129] * *cnV[129];
 	RHS36 -= go[130] * *cnV[130];
 	RHS36 -= go[131] * *cnV[131];
-	m_A139 += gt[132];
-	m_A139 += gt[133];
-	m_A139 += gt[134];
-	m_A139 += gt[135];
-	m_A139 += gt[136];
-	m_A139 += gt[137];
-	m_A136 += go[132];
-	m_A137 += go[133];
-	m_A141 += go[134];
-	m_A138 += go[135];
-	double RHS37 = Idr[132];
-	RHS37 += Idr[133];
-	RHS37 += Idr[134];
-	RHS37 += Idr[135];
-	RHS37 += Idr[136];
-	RHS37 += Idr[137];
-	RHS37 -= go[136] * *cnV[136];
-	RHS37 -= go[137] * *cnV[137];
-	m_A149 += gt[138];
-	m_A149 += gt[139];
-	m_A149 += gt[140];
-	m_A149 += gt[141];
-	m_A149 += gt[142];
-	m_A149 += gt[143];
-	m_A145 += go[138];
-	m_A144 += go[139];
-	m_A142 += go[140];
-	m_A143 += go[141];
-	m_A152 += go[142];
-	double RHS38 = Idr[138];
-	RHS38 += Idr[139];
-	RHS38 += Idr[140];
-	RHS38 += Idr[141];
-	RHS38 += Idr[142];
-	RHS38 += Idr[143];
-	RHS38 -= go[143] * *cnV[143];
-	m_A157 += gt[144];
-	m_A157 += gt[145];
-	m_A157 += gt[146];
-	m_A157 += gt[147];
-	m_A157 += gt[148];
-	m_A154 += go[144];
-	m_A153 += go[145];
-	m_A155 += go[146];
-	m_A155 += go[147];
-	double RHS39 = Idr[144];
-	RHS39 += Idr[145];
-	RHS39 += Idr[146];
-	RHS39 += Idr[147];
-	RHS39 += Idr[148];
-	RHS39 -= go[148] * *cnV[148];
-	m_A164 += gt[149];
-	m_A164 += gt[150];
-	m_A164 += gt[151];
-	m_A164 += gt[152];
-	m_A164 += gt[153];
-	m_A162 += go[149];
-	m_A165 += go[150];
-	m_A165 += go[151];
-	m_A161 += go[152];
-	m_A163 += go[153];
-	double RHS40 = Idr[149];
-	RHS40 += Idr[150];
-	RHS40 += Idr[151];
-	RHS40 += Idr[152];
-	RHS40 += Idr[153];
-	m_A174 += gt[154];
-	m_A174 += gt[155];
-	m_A174 += gt[156];
-	m_A167 += go[154];
-	m_A166 += go[155];
-	m_A171 += go[156];
-	double RHS41 = Idr[154];
-	RHS41 += Idr[155];
-	RHS41 += Idr[156];
-	m_A182 += gt[157];
-	m_A182 += gt[158];
-	m_A182 += gt[159];
-	m_A177 += go[157];
-	m_A178 += go[158];
-	m_A179 += go[159];
-	double RHS42 = Idr[157];
-	RHS42 += Idr[158];
-	RHS42 += Idr[159];
-	m_A197 += gt[160];
-	m_A197 += gt[161];
-	m_A197 += gt[162];
-	m_A197 += gt[163];
-	m_A197 += gt[164];
-	m_A197 += gt[165];
-	m_A197 += gt[166];
-	m_A197 += gt[167];
-	m_A192 += go[160];
-	m_A185 += go[161];
-	m_A186 += go[162];
-	m_A184 += go[163];
-	m_A194 += go[164];
-	m_A194 += go[165];
-	double RHS43 = Idr[160];
-	RHS43 += Idr[161];
-	RHS43 += Idr[162];
-	RHS43 += Idr[163];
-	RHS43 += Idr[164];
-	RHS43 += Idr[165];
-	RHS43 += Idr[166];
-	RHS43 += Idr[167];
-	RHS43 -= go[166] * *cnV[166];
-	RHS43 -= go[167] * *cnV[167];
 	const double f0 = 1.0 / m_A0;
-	const double f0_33 = -f0 * m_A122;
-	m_A123 += m_A1 * f0_33;
-	RHS33 += f0_33 * RHS0;
+	const double f0_24 = -f0 * m_A55;
+	m_A57 += m_A1 * f0_24;
+	RHS24 += f0_24 * RHS0;
+	const double f0_32 = -f0 * m_A85;
+	m_A91 += m_A1 * f0_32;
+	RHS32 += f0_32 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_32 = -f1 * m_A86;
+	m_A91 += m_A3 * f1_32;
+	RHS32 += f1_32 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_27 = -f2 * m_A64;
+	m_A66 += m_A5 * f2_27;
+	RHS27 += f2_27 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_25 = -f3 * m_A58;
+	m_A60 += m_A7 * f3_25;
+	RHS25 += f3_25 * RHS3;
+	const double f3_34 = -f3 * m_A101;
+	m_A106 += m_A7 * f3_34;
+	RHS34 += f3_34 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_20 = -f4 * m_A42;
+	m_A44 += m_A9 * f4_20;
+	RHS20 += f4_20 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_21 = -f5 * m_A45;
+	m_A47 += m_A11 * f5_21;
+	RHS21 += f5_21 * RHS5;
+	const double f5_32 = -f5 * m_A87;
+	m_A88 += m_A11 * f5_32;
+	RHS32 += f5_32 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_21 = -f6 * m_A46;
+	m_A47 += m_A13 * f6_21;
+	m_A48 += m_A14 * f6_21;
+	RHS21 += f6_21 * RHS6;
+	const double f6_22 = -f6 * m_A49;
+	m_A50 += m_A13 * f6_22;
+	m_A51 += m_A14 * f6_22;
+	RHS22 += f6_22 * RHS6;
+	const double f7 = 1.0 / m_A15;
+	const double f7_23 = -f7 * m_A52;
+	m_A54 += m_A16 * f7_23;
+	RHS23 += f7_23 * RHS7;
+	const double f7_34 = -f7 * m_A102;
+	m_A103 += m_A16 * f7_34;
+	RHS34 += f7_34 * RHS7;
+	const double f8 = 1.0 / m_A17;
+	const double f8_23 = -f8 * m_A53;
+	m_A54 += m_A18 * f8_23;
+	RHS23 += f8_23 * RHS8;
+	const double f9 = 1.0 / m_A19;
+	const double f9_36 = -f9 * m_A113;
+	m_A116 += m_A20 * f9_36;
+	RHS36 += f9_36 * RHS9;
+	const double f10 = 1.0 / m_A21;
+	const double f10_28 = -f10 * m_A71;
+	m_A73 += m_A22 * f10_28;
+	RHS28 += f10_28 * RHS10;
+	const double f10_33 = -f10 * m_A94;
+	m_A99 += m_A22 * f10_33;
+	RHS33 += f10_33 * RHS10;
+	const double f13 = 1.0 / m_A27;
+	const double f13_26 = -f13 * m_A61;
+	m_A62 += m_A28 * f13_26;
+	RHS26 += f13_26 * RHS13;
+	const double f13_33 = -f13 * m_A95;
+	m_A97 += m_A28 * f13_33;
+	RHS33 += f13_33 * RHS13;
+	const double f14 = 1.0 / m_A29;
+	const double f14_33 = -f14 * m_A96;
+	m_A99 += m_A30 * f14_33;
+	RHS33 += f14_33 * RHS14;
+	const double f15 = 1.0 / m_A31;
+	const double f15_31 = -f15 * m_A82;
+	m_A84 += m_A32 * f15_31;
+	RHS31 += f15_31 * RHS15;
+	const double f16 = 1.0 / m_A33;
+	const double f16_27 = -f16 * m_A65;
+	m_A67 += m_A34 * f16_27;
+	m_A70 += m_A35 * f16_27;
+	RHS27 += f16_27 * RHS16;
+	const double f16_36 = -f16 * m_A114;
+	m_A115 += m_A34 * f16_36;
+	m_A122 += m_A35 * f16_36;
+	RHS36 += f16_36 * RHS16;
+	const double f17 = 1.0 / m_A36;
+	const double f17_29 = -f17 * m_A74;
+	m_A76 += m_A37 * f17_29;
+	RHS29 += f17_29 * RHS17;
+	const double f17_35 = -f17 * m_A108;
+	m_A109 += m_A37 * f17_35;
+	RHS35 += f17_35 * RHS17;
+	const double f18 = 1.0 / m_A38;
+	const double f18_29 = -f18 * m_A75;
+	m_A77 += m_A39 * f18_29;
+	RHS29 += f18_29 * RHS18;
+	const double f18_30 = -f18 * m_A79;
+	m_A81 += m_A39 * f18_30;
+	RHS30 += f18_30 * RHS18;
+	const double f19 = 1.0 / m_A40;
+	const double f19_30 = -f19 * m_A80;
+	m_A81 += m_A41 * f19_30;
+	RHS30 += f19_30 * RHS19;
+	const double f21 = 1.0 / m_A47;
+	const double f21_22 = -f21 * m_A50;
+	m_A51 += m_A48 * f21_22;
+	RHS22 += f21_22 * RHS21;
+	const double f21_32 = -f21 * m_A88;
+	m_A89 += m_A48 * f21_32;
+	RHS32 += f21_32 * RHS21;
+	const double f22 = 1.0 / m_A51;
+	const double f22_32 = -f22 * m_A89;
+	RHS32 += f22_32 * RHS22;
+	const double f23 = 1.0 / m_A54;
+	const double f23_34 = -f23 * m_A103;
+	RHS34 += f23_34 * RHS23;
+	const double f24 = 1.0 / m_A56;
+	const double f24_27 = -f24 * m_A66;
+	m_A68 += m_A57 * f24_27;
+	RHS27 += f24_27 * RHS24;
+	const double f26 = 1.0 / m_A62;
+	const double f26_31 = -f26 * m_A83;
+	m_A84 += m_A63 * f26_31;
+	RHS31 += f26_31 * RHS26;
+	const double f26_33 = -f26 * m_A97;
+	m_A98 += m_A63 * f26_33;
+	RHS33 += f26_33 * RHS26;
+	const double f27 = 1.0 / m_A67;
+	const double f27_32 = -f27 * m_A90;
+	m_A91 += m_A68 * f27_32;
+	m_A92 += m_A69 * f27_32;
+	m_A93 += m_A70 * f27_32;
+	RHS32 += f27_32 * RHS27;
+	const double f27_34 = -f27 * m_A104;
+	m_A105 += m_A68 * f27_34;
+	m_A106 += m_A69 * f27_34;
+	m_A107 += m_A70 * f27_34;
+	RHS34 += f27_34 * RHS27;
+	const double f27_36 = -f27 * m_A115;
+	m_A119 += m_A68 * f27_36;
+	m_A121 += m_A69 * f27_36;
+	m_A122 += m_A70 * f27_36;
+	RHS36 += f27_36 * RHS27;
+	const double f28 = 1.0 / m_A72;
+	const double f28_36 = -f28 * m_A116;
+	m_A120 += m_A73 * f28_36;
+	RHS36 += f28_36 * RHS28;
+	const double f29 = 1.0 / m_A76;
+	const double f29_35 = -f29 * m_A109;
+	m_A110 += m_A77 * f29_35;
+	m_A112 += m_A78 * f29_35;
+	RHS35 += f29_35 * RHS29;
+	const double f29_36 = -f29 * m_A117;
+	m_A118 += m_A77 * f29_36;
+	m_A122 += m_A78 * f29_36;
+	RHS36 += f29_36 * RHS29;
+	const double f30 = 1.0 / m_A81;
+	const double f30_35 = -f30 * m_A110;
+	RHS35 += f30_35 * RHS30;
+	const double f30_36 = -f30 * m_A118;
+	RHS36 += f30_36 * RHS30;
+	const double f31 = 1.0 / m_A84;
+	const double f31_33 = -f31 * m_A98;
+	RHS33 += f31_33 * RHS31;
+	const double f32 = 1.0 / m_A91;
+	const double f32_34 = -f32 * m_A105;
+	m_A106 += m_A92 * f32_34;
+	m_A107 += m_A93 * f32_34;
+	RHS34 += f32_34 * RHS32;
+	const double f32_36 = -f32 * m_A119;
+	m_A121 += m_A92 * f32_36;
+	m_A122 += m_A93 * f32_36;
+	RHS36 += f32_36 * RHS32;
+	const double f33 = 1.0 / m_A99;
+	const double f33_36 = -f33 * m_A120;
+	m_A122 += m_A100 * f33_36;
+	RHS36 += f33_36 * RHS33;
+	const double f34 = 1.0 / m_A106;
+	const double f34_36 = -f34 * m_A121;
+	m_A122 += m_A107 * f34_36;
+	RHS36 += f34_36 * RHS34;
+	V[36] = RHS36 / m_A122;
+	double tmp35 = 0.0;
+	tmp35 += m_A112 * V[36];
+	V[35] = (RHS35 - tmp35) / m_A111;
+	double tmp34 = 0.0;
+	tmp34 += m_A107 * V[36];
+	V[34] = (RHS34 - tmp34) / m_A106;
+	double tmp33 = 0.0;
+	tmp33 += m_A100 * V[36];
+	V[33] = (RHS33 - tmp33) / m_A99;
+	double tmp32 = 0.0;
+	tmp32 += m_A92 * V[34];
+	tmp32 += m_A93 * V[36];
+	V[32] = (RHS32 - tmp32) / m_A91;
+	double tmp31 = 0.0;
+	V[31] = (RHS31 - tmp31) / m_A84;
+	double tmp30 = 0.0;
+	V[30] = (RHS30 - tmp30) / m_A81;
+	double tmp29 = 0.0;
+	tmp29 += m_A77 * V[30];
+	tmp29 += m_A78 * V[36];
+	V[29] = (RHS29 - tmp29) / m_A76;
+	double tmp28 = 0.0;
+	tmp28 += m_A73 * V[33];
+	V[28] = (RHS28 - tmp28) / m_A72;
+	double tmp27 = 0.0;
+	tmp27 += m_A68 * V[32];
+	tmp27 += m_A69 * V[34];
+	tmp27 += m_A70 * V[36];
+	V[27] = (RHS27 - tmp27) / m_A67;
+	double tmp26 = 0.0;
+	tmp26 += m_A63 * V[31];
+	V[26] = (RHS26 - tmp26) / m_A62;
+	double tmp25 = 0.0;
+	tmp25 += m_A60 * V[34];
+	V[25] = (RHS25 - tmp25) / m_A59;
+	double tmp24 = 0.0;
+	tmp24 += m_A57 * V[32];
+	V[24] = (RHS24 - tmp24) / m_A56;
+	double tmp23 = 0.0;
+	V[23] = (RHS23 - tmp23) / m_A54;
+	double tmp22 = 0.0;
+	V[22] = (RHS22 - tmp22) / m_A51;
+	double tmp21 = 0.0;
+	tmp21 += m_A48 * V[22];
+	V[21] = (RHS21 - tmp21) / m_A47;
+	double tmp20 = 0.0;
+	tmp20 += m_A44 * V[25];
+	V[20] = (RHS20 - tmp20) / m_A43;
+	double tmp19 = 0.0;
+	tmp19 += m_A41 * V[30];
+	V[19] = (RHS19 - tmp19) / m_A40;
+	double tmp18 = 0.0;
+	tmp18 += m_A39 * V[30];
+	V[18] = (RHS18 - tmp18) / m_A38;
+	double tmp17 = 0.0;
+	tmp17 += m_A37 * V[29];
+	V[17] = (RHS17 - tmp17) / m_A36;
+	double tmp16 = 0.0;
+	tmp16 += m_A34 * V[27];
+	tmp16 += m_A35 * V[36];
+	V[16] = (RHS16 - tmp16) / m_A33;
+	double tmp15 = 0.0;
+	tmp15 += m_A32 * V[31];
+	V[15] = (RHS15 - tmp15) / m_A31;
+	double tmp14 = 0.0;
+	tmp14 += m_A30 * V[33];
+	V[14] = (RHS14 - tmp14) / m_A29;
+	double tmp13 = 0.0;
+	tmp13 += m_A28 * V[26];
+	V[13] = (RHS13 - tmp13) / m_A27;
+	double tmp12 = 0.0;
+	tmp12 += m_A26 * V[35];
+	V[12] = (RHS12 - tmp12) / m_A25;
+	double tmp11 = 0.0;
+	tmp11 += m_A24 * V[12];
+	V[11] = (RHS11 - tmp11) / m_A23;
+	double tmp10 = 0.0;
+	tmp10 += m_A22 * V[33];
+	V[10] = (RHS10 - tmp10) / m_A21;
+	double tmp9 = 0.0;
+	tmp9 += m_A20 * V[28];
+	V[9] = (RHS9 - tmp9) / m_A19;
+	double tmp8 = 0.0;
+	tmp8 += m_A18 * V[23];
+	V[8] = (RHS8 - tmp8) / m_A17;
+	double tmp7 = 0.0;
+	tmp7 += m_A16 * V[23];
+	V[7] = (RHS7 - tmp7) / m_A15;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[21];
+	tmp6 += m_A14 * V[22];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[21];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[25];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[34];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[24];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[32];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[32];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// zac1b11142
+static void nl_gcr_87cb2c78a2628efd_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A3 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A5 += go[7];
+	m_A5 += go[8];
+	m_A4 += go[9];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starcas
+static void nl_gcr_88a8ef5f6bd43d48_12_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A4 += go[2];
+	m_A3 += go[3];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A7 += gt[5];
+	m_A7 += gt[6];
+	m_A7 += gt[7];
+	m_A6 += go[5];
+	m_A5 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[7] * *cnV[7];
+	m_A11 += gt[8];
+	m_A11 += gt[9];
+	m_A11 += gt[10];
+	m_A9 += go[8];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	RHS3 += Idr[10];
+	RHS3 -= go[9] * *cnV[9];
+	RHS3 -= go[10] * *cnV[10];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A5;
+	m_A7 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A6;
+	m_A7 += m_A3 * f1_2;
+	m_A8 += m_A4 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A7;
+	const double f2_3 = -f2 * m_A10;
+	m_A11 += m_A8 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A11;
+	double tmp2 = 0.0;
+	tmp2 += m_A8 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A7;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// breakout
+static void nl_gcr_8a1565d1413f42f7_31_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A3 += go[5];
+	double RHS1 = Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A5 += go[8];
+	m_A6 += go[9];
+	double RHS2 = Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 -= go[10] * *cnV[10];
+	m_A7 += gt[11];
+	m_A7 += gt[12];
+	m_A7 += gt[13];
+	m_A8 += go[11];
+	double RHS3 = Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	m_A9 += gt[14];
+	m_A9 += gt[15];
+	m_A9 += gt[16];
+	m_A10 += go[14];
+	double RHS4 = Idr[14];
+	RHS4 += Idr[15];
+	RHS4 += Idr[16];
+	RHS4 -= go[15] * *cnV[15];
+	RHS4 -= go[16] * *cnV[16];
+	m_A12 += gt[17];
+	m_A12 += gt[18];
+	m_A12 += gt[19];
+	m_A12 += gt[20];
+	m_A12 += gt[21];
+	m_A12 += gt[22];
+	m_A12 += gt[23];
+	m_A14 += go[17];
+	m_A13 += go[18];
+	m_A11 += go[19];
+	double RHS5 = Idr[17];
+	RHS5 += Idr[18];
+	RHS5 += Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	RHS5 -= go[20] * *cnV[20];
+	RHS5 -= go[21] * *cnV[21];
+	RHS5 -= go[22] * *cnV[22];
+	RHS5 -= go[23] * *cnV[23];
+	m_A16 += gt[24];
+	m_A16 += gt[25];
+	m_A16 += gt[26];
+	m_A16 += gt[27];
+	m_A16 += gt[28];
+	m_A18 += go[24];
+	m_A15 += go[25];
+	double RHS6 = Idr[24];
+	RHS6 += Idr[25];
+	RHS6 += Idr[26];
+	RHS6 += Idr[27];
+	RHS6 += Idr[28];
+	RHS6 -= go[26] * *cnV[26];
+	RHS6 -= go[27] * *cnV[27];
+	RHS6 -= go[28] * *cnV[28];
+	m_A23 += gt[29];
+	m_A23 += gt[30];
+	m_A23 += gt[31];
+	m_A19 += go[29];
+	m_A20 += go[30];
+	m_A21 += go[31];
+	double RHS7 = Idr[29];
+	RHS7 += Idr[30];
+	RHS7 += Idr[31];
+	m_A30 += gt[32];
+	m_A30 += gt[33];
+	m_A30 += gt[34];
+	m_A30 += gt[35];
+	m_A30 += gt[36];
+	m_A26 += go[32];
+	m_A25 += go[33];
+	m_A28 += go[34];
+	m_A27 += go[35];
+	double RHS8 = Idr[32];
+	RHS8 += Idr[33];
+	RHS8 += Idr[34];
+	RHS8 += Idr[35];
+	RHS8 += Idr[36];
+	RHS8 -= go[36] * *cnV[36];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A11;
+	m_A12 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_7 = -f1 * m_A19;
+	m_A23 += m_A3 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_6 = -f2 * m_A15;
+	m_A16 += m_A5 * f2_6;
+	m_A17 += m_A6 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f2_7 = -f2 * m_A20;
+	m_A22 += m_A5 * f2_7;
+	m_A23 += m_A6 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_8 = -f3 * m_A25;
+	m_A30 += m_A8 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f4 = 1.0 / m_A9;
+	const double f4_8 = -f4 * m_A26;
+	m_A30 += m_A10 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f5 = 1.0 / m_A12;
+	const double f5_7 = -f5 * m_A21;
+	m_A23 += m_A13 * f5_7;
+	m_A24 += m_A14 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f5_8 = -f5 * m_A27;
+	m_A29 += m_A13 * f5_8;
+	m_A30 += m_A14 * f5_8;
+	RHS8 += f5_8 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_7 = -f6 * m_A22;
+	m_A23 += m_A17 * f6_7;
+	m_A24 += m_A18 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	const double f6_8 = -f6 * m_A28;
+	m_A29 += m_A17 * f6_8;
+	m_A30 += m_A18 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f7 = 1.0 / m_A23;
+	const double f7_8 = -f7 * m_A29;
+	m_A30 += m_A24 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	V[8] = RHS8 / m_A30;
+	double tmp7 = 0.0;
+	tmp7 += m_A24 * V[8];
+	V[7] = (RHS7 - tmp7) / m_A23;
+	double tmp6 = 0.0;
+	tmp6 += m_A17 * V[7];
+	tmp6 += m_A18 * V[8];
+	V[6] = (RHS6 - tmp6) / m_A16;
+	double tmp5 = 0.0;
+	tmp5 += m_A13 * V[7];
+	tmp5 += m_A14 * V[8];
+	V[5] = (RHS5 - tmp5) / m_A12;
+	double tmp4 = 0.0;
+	tmp4 += m_A10 * V[8];
+	V[4] = (RHS4 - tmp4) / m_A9;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[8];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[6];
+	tmp2 += m_A6 * V[7];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[7];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[5];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starhawk
+static void nl_gcr_8b1ac1e181eec3fc_40_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[3] * *cnV[3];
+	RHS1 -= go[4] * *cnV[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A5 += go[5];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[6] * *cnV[6];
+	RHS2 -= go[7] * *cnV[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A8 += go[8];
+	m_A8 += go[9];
+	m_A7 += go[10];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	RHS3 += Idr[10];
+	m_A9 += gt[11];
+	m_A9 += gt[12];
+	m_A9 += gt[13];
+	m_A9 += gt[14];
+	m_A9 += gt[15];
+	m_A9 += gt[16];
+	m_A9 += gt[17];
+	m_A10 += go[11];
+	double RHS4 = Idr[11];
+	RHS4 += Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 += Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 -= go[12] * *cnV[12];
+	RHS4 -= go[13] * *cnV[13];
+	RHS4 -= go[14] * *cnV[14];
+	RHS4 -= go[15] * *cnV[15];
+	RHS4 -= go[16] * *cnV[16];
+	RHS4 -= go[17] * *cnV[17];
+	m_A11 += gt[18];
+	m_A11 += gt[19];
+	m_A11 += gt[20];
+	m_A11 += gt[21];
+	m_A12 += go[18];
+	m_A12 += go[19];
+	m_A13 += go[20];
+	double RHS5 = Idr[18];
+	RHS5 += Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 -= go[21] * *cnV[21];
+	m_A14 += gt[22];
+	m_A14 += gt[23];
+	m_A16 += go[22];
+	m_A15 += go[23];
+	double RHS6 = Idr[22];
+	RHS6 += Idr[23];
+	m_A19 += gt[24];
+	m_A19 += gt[25];
+	m_A19 += gt[26];
+	m_A18 += go[24];
+	m_A17 += go[25];
+	double RHS7 = Idr[24];
+	RHS7 += Idr[25];
+	RHS7 += Idr[26];
+	RHS7 -= go[26] * *cnV[26];
+	m_A22 += gt[27];
+	m_A22 += gt[28];
+	m_A22 += gt[29];
+	m_A23 += go[27];
+	m_A21 += go[28];
+	double RHS8 = Idr[27];
+	RHS8 += Idr[28];
+	RHS8 += Idr[29];
+	RHS8 -= go[29] * *cnV[29];
+	m_A26 += gt[30];
+	m_A26 += gt[31];
+	m_A26 += gt[32];
+	m_A25 += go[30];
+	m_A24 += go[31];
+	double RHS9 = Idr[30];
+	RHS9 += Idr[31];
+	RHS9 += Idr[32];
+	RHS9 -= go[32] * *cnV[32];
+	m_A32 += gt[33];
+	m_A32 += gt[34];
+	m_A32 += gt[35];
+	m_A32 += gt[36];
+	m_A32 += gt[37];
+	m_A32 += gt[38];
+	m_A28 += go[33];
+	m_A30 += go[34];
+	m_A29 += go[35];
+	m_A29 += go[36];
+	double RHS10 = Idr[33];
+	RHS10 += Idr[34];
+	RHS10 += Idr[35];
+	RHS10 += Idr[36];
+	RHS10 += Idr[37];
+	RHS10 += Idr[38];
+	RHS10 -= go[37] * *cnV[37];
+	RHS10 -= go[38] * *cnV[38];
+	m_A39 += gt[39];
+	m_A39 += gt[40];
+	m_A39 += gt[41];
+	m_A39 += gt[42];
+	m_A35 += go[39];
+	m_A37 += go[40];
+	m_A34 += go[41];
+	m_A34 += go[42];
+	double RHS11 = Idr[39];
+	RHS11 += Idr[40];
+	RHS11 += Idr[41];
+	RHS11 += Idr[42];
+	const double f0 = 1.0 / m_A0;
+	const double f0_9 = -f0 * m_A24;
+	m_A26 += m_A1 * f0_9;
+	RHS9 += f0_9 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_7 = -f1 * m_A17;
+	m_A19 += m_A3 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_8 = -f2 * m_A21;
+	m_A22 += m_A5 * f2_8;
+	RHS8 += f2_8 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_7 = -f3 * m_A18;
+	m_A19 += m_A7 * f3_7;
+	m_A20 += m_A8 * f3_7;
+	RHS7 += f3_7 * RHS3;
+	const double f3_11 = -f3 * m_A34;
+	m_A36 += m_A7 * f3_11;
+	m_A39 += m_A8 * f3_11;
+	RHS11 += f3_11 * RHS3;
+	const double f4 = 1.0 / m_A9;
+	const double f4_10 = -f4 * m_A28;
+	m_A29 += m_A10 * f4_10;
+	RHS10 += f4_10 * RHS4;
+	const double f5 = 1.0 / m_A11;
+	const double f5_10 = -f5 * m_A29;
+	m_A32 += m_A12 * f5_10;
+	m_A33 += m_A13 * f5_10;
+	RHS10 += f5_10 * RHS5;
+	const double f5_11 = -f5 * m_A35;
+	m_A38 += m_A12 * f5_11;
+	m_A39 += m_A13 * f5_11;
+	RHS11 += f5_11 * RHS5;
+	const double f6 = 1.0 / m_A14;
+	const double f6_9 = -f6 * m_A25;
+	m_A26 += m_A15 * f6_9;
+	m_A27 += m_A16 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f6_10 = -f6 * m_A30;
+	m_A31 += m_A15 * f6_10;
+	m_A32 += m_A16 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f7 = 1.0 / m_A19;
+	const double f7_11 = -f7 * m_A36;
+	m_A39 += m_A20 * f7_11;
+	RHS11 += f7_11 * RHS7;
+	const double f8 = 1.0 / m_A22;
+	const double f8_11 = -f8 * m_A37;
+	m_A39 += m_A23 * f8_11;
+	RHS11 += f8_11 * RHS8;
+	const double f9 = 1.0 / m_A26;
+	const double f9_10 = -f9 * m_A31;
+	m_A32 += m_A27 * f9_10;
+	RHS10 += f9_10 * RHS9;
+	const double f10 = 1.0 / m_A32;
+	const double f10_11 = -f10 * m_A38;
+	m_A39 += m_A33 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	V[11] = RHS11 / m_A39;
+	double tmp10 = 0.0;
+	tmp10 += m_A33 * V[11];
+	V[10] = (RHS10 - tmp10) / m_A32;
+	double tmp9 = 0.0;
+	tmp9 += m_A27 * V[10];
+	V[9] = (RHS9 - tmp9) / m_A26;
+	double tmp8 = 0.0;
+	tmp8 += m_A23 * V[11];
+	V[8] = (RHS8 - tmp8) / m_A22;
+	double tmp7 = 0.0;
+	tmp7 += m_A20 * V[11];
+	V[7] = (RHS7 - tmp7) / m_A19;
+	double tmp6 = 0.0;
+	tmp6 += m_A15 * V[9];
+	tmp6 += m_A16 * V[10];
+	V[6] = (RHS6 - tmp6) / m_A14;
+	double tmp5 = 0.0;
+	tmp5 += m_A12 * V[10];
+	tmp5 += m_A13 * V[11];
+	V[5] = (RHS5 - tmp5) / m_A11;
+	double tmp4 = 0.0;
+	tmp4 += m_A10 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A9;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[7];
+	tmp3 += m_A8 * V[11];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[8];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[7];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[9];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// rebound
+static void nl_gcr_8bec817b324dcc3_28_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A4 += go[3];
+	m_A4 += go[4];
+	m_A3 += go[5];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[6] * *cnV[6];
+	m_A5 += gt[7];
+	m_A5 += gt[8];
+	m_A5 += gt[9];
+	m_A6 += go[7];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	m_A7 += gt[10];
+	m_A7 += gt[11];
+	m_A7 += gt[12];
+	m_A7 += gt[13];
+	m_A7 += gt[14];
+	m_A7 += gt[15];
+	m_A7 += gt[16];
+	m_A8 += go[10];
+	m_A8 += go[11];
+	double RHS3 = Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
+	RHS3 -= go[16] * *cnV[16];
+	m_A11 += gt[17];
+	m_A11 += gt[18];
+	m_A11 += gt[19];
+	m_A13 += go[17];
+	m_A10 += go[18];
+	m_A9 += go[19];
+	double RHS4 = Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	m_A16 += gt[20];
+	m_A16 += gt[21];
+	m_A16 += gt[22];
+	m_A16 += gt[23];
+	m_A16 += gt[24];
+	m_A16 += gt[25];
+	m_A16 += gt[26];
+	m_A18 += go[20];
+	m_A14 += go[21];
+	m_A14 += go[22];
+	double RHS5 = Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 -= go[23] * *cnV[23];
+	RHS5 -= go[24] * *cnV[24];
+	RHS5 -= go[25] * *cnV[25];
+	RHS5 -= go[26] * *cnV[26];
+	m_A22 += gt[27];
+	m_A22 += gt[28];
+	m_A22 += gt[29];
+	m_A22 += gt[30];
+	m_A22 += gt[31];
+	m_A22 += gt[32];
+	m_A22 += gt[33];
+	m_A22 += gt[34];
+	m_A22 += gt[35];
+	m_A22 += gt[36];
+	m_A23 += go[27];
+	m_A23 += go[28];
+	m_A20 += go[29];
+	m_A19 += go[30];
+	m_A19 += go[31];
+	double RHS6 = Idr[27];
+	RHS6 += Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 += Idr[31];
+	RHS6 += Idr[32];
+	RHS6 += Idr[33];
+	RHS6 += Idr[34];
+	RHS6 += Idr[35];
+	RHS6 += Idr[36];
+	RHS6 -= go[32] * *cnV[32];
+	RHS6 -= go[33] * *cnV[33];
+	RHS6 -= go[34] * *cnV[34];
+	RHS6 -= go[35] * *cnV[35];
+	RHS6 -= go[36] * *cnV[36];
+	m_A27 += gt[37];
+	m_A27 += gt[38];
+	m_A27 += gt[39];
+	m_A27 += gt[40];
+	m_A27 += gt[41];
+	m_A26 += go[37];
+	m_A26 += go[38];
+	m_A25 += go[39];
+	m_A24 += go[40];
+	double RHS7 = Idr[37];
+	RHS7 += Idr[38];
+	RHS7 += Idr[39];
+	RHS7 += Idr[40];
+	RHS7 += Idr[41];
+	RHS7 -= go[41] * *cnV[41];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A9;
+	m_A11 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_4 = -f1 * m_A10;
+	m_A11 += m_A3 * f1_4;
+	m_A12 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f1_5 = -f1 * m_A14;
+	m_A15 += m_A3 * f1_5;
+	m_A16 += m_A4 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_7 = -f2 * m_A24;
+	m_A27 += m_A6 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_6 = -f3 * m_A19;
+	m_A22 += m_A8 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_5 = -f4 * m_A15;
+	m_A16 += m_A12 * f4_5;
+	m_A17 += m_A13 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	const double f4_6 = -f4 * m_A20;
+	m_A21 += m_A12 * f4_6;
+	m_A22 += m_A13 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f5 = 1.0 / m_A16;
+	const double f5_6 = -f5 * m_A21;
+	m_A22 += m_A17 * f5_6;
+	m_A23 += m_A18 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	const double f5_7 = -f5 * m_A25;
+	m_A26 += m_A17 * f5_7;
+	m_A27 += m_A18 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f6 = 1.0 / m_A22;
+	const double f6_7 = -f6 * m_A26;
+	m_A27 += m_A23 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	V[7] = RHS7 / m_A27;
+	double tmp6 = 0.0;
+	tmp6 += m_A23 * V[7];
+	V[6] = (RHS6 - tmp6) / m_A22;
+	double tmp5 = 0.0;
+	tmp5 += m_A17 * V[6];
+	tmp5 += m_A18 * V[7];
+	V[5] = (RHS5 - tmp5) / m_A16;
+	double tmp4 = 0.0;
+	tmp4 += m_A12 * V[5];
+	tmp4 += m_A13 * V[6];
+	V[4] = (RHS4 - tmp4) / m_A11;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[7];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[4];
+	tmp1 += m_A4 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// cocoloco
+static void nl_gcr_8c0f7f2284333de5_16_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A7 += go[6];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	RHS3 -= go[7] * *cnV[7];
+	m_A9 += gt[8];
+	m_A9 += gt[9];
+	m_A9 += gt[10];
+	m_A8 += go[8];
+	m_A10 += go[9];
+	double RHS4 = Idr[8];
+	RHS4 += Idr[9];
+	RHS4 += Idr[10];
+	RHS4 -= go[10] * *cnV[10];
+	m_A15 += gt[11];
+	m_A15 += gt[12];
+	m_A15 += gt[13];
+	m_A15 += gt[14];
+	m_A14 += go[11];
+	m_A13 += go[12];
+	m_A12 += go[13];
+	m_A11 += go[14];
+	double RHS5 = Idr[11];
+	RHS5 += Idr[12];
+	RHS5 += Idr[13];
+	RHS5 += Idr[14];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A11;
+	m_A15 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A12;
+	m_A15 += m_A3 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_4 = -f2 * m_A8;
+	m_A9 += m_A5 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_5 = -f3 * m_A13;
+	m_A15 += m_A7 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A9;
+	const double f4_5 = -f4 * m_A14;
+	m_A15 += m_A10 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A15;
+	double tmp4 = 0.0;
+	tmp4 += m_A10 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A9;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[5];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// spacfury
+static void nl_gcr_8c1dd4afcf0f8ea2_15_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A4 += go[4];
+	m_A4 += go[5];
+	m_A3 += go[6];
+	m_A3 += go[7];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A6 += go[10];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[11] * *cnV[11];
+	m_A9 += gt[12];
+	m_A9 += gt[13];
+	m_A9 += gt[14];
+	m_A9 += gt[15];
+	m_A9 += gt[16];
+	m_A9 += gt[17];
+	m_A8 += go[12];
+	m_A8 += go[13];
+	m_A7 += go[14];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 -= go[15] * *cnV[15];
+	RHS3 -= go[16] * *cnV[16];
+	RHS3 -= go[17] * *cnV[17];
+	m_A14 += gt[18];
+	m_A14 += gt[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A14 += gt[22];
+	m_A14 += gt[23];
+	m_A12 += go[18];
+	m_A11 += go[19];
+	m_A11 += go[20];
+	double RHS4 = Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 -= go[21] * *cnV[21];
+	RHS4 -= go[22] * *cnV[22];
+	RHS4 -= go[23] * *cnV[23];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A7;
+	m_A9 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A8;
+	m_A9 += m_A3 * f1_3;
+	m_A10 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f1_4 = -f1 * m_A11;
+	m_A13 += m_A3 * f1_4;
+	m_A14 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_4 = -f2 * m_A12;
+	m_A14 += m_A6 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_4 = -f3 * m_A13;
+	m_A14 += m_A10 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	V[4] = RHS4 / m_A14;
+	double tmp3 = 0.0;
+	tmp3 += m_A10 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	tmp1 += m_A4 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// fireone
+static void nl_gcr_8c512fd6a6dabc50_35_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 -= go[5] * *cnV[5];
+	RHS2 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A7 += go[7];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 += Idr[9];
+	RHS3 -= go[8] * *cnV[8];
+	RHS3 -= go[9] * *cnV[9];
+	m_A8 += gt[10];
+	m_A8 += gt[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A9 += go[10];
+	double RHS4 = Idr[10];
+	RHS4 += Idr[11];
+	RHS4 += Idr[12];
+	RHS4 += Idr[13];
+	RHS4 -= go[11] * *cnV[11];
+	RHS4 -= go[12] * *cnV[12];
+	RHS4 -= go[13] * *cnV[13];
+	m_A10 += gt[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A12 += go[14];
+	m_A12 += go[15];
+	m_A11 += go[16];
+	m_A11 += go[17];
+	double RHS5 = Idr[14];
+	RHS5 += Idr[15];
+	RHS5 += Idr[16];
+	RHS5 += Idr[17];
+	RHS5 += Idr[18];
+	RHS5 += Idr[19];
+	RHS5 -= go[18] * *cnV[18];
+	RHS5 -= go[19] * *cnV[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A14 += gt[22];
+	m_A14 += gt[23];
+	m_A14 += gt[24];
+	m_A14 += gt[25];
+	m_A13 += go[20];
+	m_A16 += go[21];
+	m_A15 += go[22];
+	double RHS6 = Idr[20];
+	RHS6 += Idr[21];
+	RHS6 += Idr[22];
+	RHS6 += Idr[23];
+	RHS6 += Idr[24];
+	RHS6 += Idr[25];
+	RHS6 -= go[23] * *cnV[23];
+	RHS6 -= go[24] * *cnV[24];
+	RHS6 -= go[25] * *cnV[25];
+	m_A19 += gt[26];
+	m_A19 += gt[27];
+	m_A19 += gt[28];
+	m_A19 += gt[29];
+	m_A19 += gt[30];
+	m_A18 += go[26];
+	m_A17 += go[27];
+	m_A20 += go[28];
+	double RHS7 = Idr[26];
+	RHS7 += Idr[27];
+	RHS7 += Idr[28];
+	RHS7 += Idr[29];
+	RHS7 += Idr[30];
+	RHS7 -= go[29] * *cnV[29];
+	RHS7 -= go[30] * *cnV[30];
+	m_A23 += gt[31];
+	m_A23 += gt[32];
+	m_A23 += gt[33];
+	m_A23 += gt[34];
+	m_A23 += gt[35];
+	m_A23 += gt[36];
+	m_A24 += go[31];
+	m_A22 += go[32];
+	m_A22 += go[33];
+	m_A21 += go[34];
+	double RHS8 = Idr[31];
+	RHS8 += Idr[32];
+	RHS8 += Idr[33];
+	RHS8 += Idr[34];
+	RHS8 += Idr[35];
+	RHS8 += Idr[36];
+	RHS8 -= go[35] * *cnV[35];
+	RHS8 -= go[36] * *cnV[36];
+	m_A30 += gt[37];
+	m_A30 += gt[38];
+	m_A30 += gt[39];
+	m_A30 += gt[40];
+	m_A25 += go[37];
+	m_A26 += go[38];
+	m_A27 += go[39];
+	m_A28 += go[40];
+	double RHS9 = Idr[37];
+	RHS9 += Idr[38];
+	RHS9 += Idr[39];
+	RHS9 += Idr[40];
+	m_A34 += gt[41];
+	m_A34 += gt[42];
+	m_A34 += gt[43];
+	m_A34 += gt[44];
+	m_A32 += go[41];
+	m_A32 += go[42];
+	m_A33 += go[43];
+	double RHS10 = Idr[41];
+	RHS10 += Idr[42];
+	RHS10 += Idr[43];
+	RHS10 += Idr[44];
+	RHS10 -= go[44] * *cnV[44];
+	const double f0 = 1.0 / m_A0;
+	const double f0_6 = -f0 * m_A13;
+	m_A15 += m_A1 * f0_6;
+	RHS6 += f0_6 * RHS0;
+	const double f0_7 = -f0 * m_A17;
+	m_A19 += m_A1 * f0_7;
+	RHS7 += f0_7 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_7 = -f1 * m_A18;
+	m_A19 += m_A3 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f1_9 = -f1 * m_A25;
+	m_A28 += m_A3 * f1_9;
+	RHS9 += f1_9 * RHS1;
+	const double f3 = 1.0 / m_A6;
+	const double f3_9 = -f3 * m_A26;
+	m_A30 += m_A7 * f3_9;
+	RHS9 += f3_9 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_8 = -f4 * m_A21;
+	m_A23 += m_A9 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_8 = -f5 * m_A22;
+	m_A23 += m_A11 * f5_8;
+	m_A24 += m_A12 * f5_8;
+	RHS8 += f5_8 * RHS5;
+	const double f5_10 = -f5 * m_A32;
+	m_A33 += m_A11 * f5_10;
+	m_A34 += m_A12 * f5_10;
+	RHS10 += f5_10 * RHS5;
+	const double f6 = 1.0 / m_A14;
+	const double f6_9 = -f6 * m_A27;
+	m_A28 += m_A15 * f6_9;
+	m_A30 += m_A16 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f7 = 1.0 / m_A19;
+	const double f7_9 = -f7 * m_A28;
+	m_A29 += m_A20 * f7_9;
+	RHS9 += f7_9 * RHS7;
+	const double f8 = 1.0 / m_A23;
+	const double f8_9 = -f8 * m_A29;
+	m_A31 += m_A24 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	const double f8_10 = -f8 * m_A33;
+	m_A34 += m_A24 * f8_10;
+	RHS10 += f8_10 * RHS8;
+	V[10] = RHS10 / m_A34;
+	double tmp9 = 0.0;
+	tmp9 += m_A31 * V[10];
+	V[9] = (RHS9 - tmp9) / m_A30;
+	double tmp8 = 0.0;
+	tmp8 += m_A24 * V[10];
+	V[8] = (RHS8 - tmp8) / m_A23;
+	double tmp7 = 0.0;
+	tmp7 += m_A20 * V[8];
+	V[7] = (RHS7 - tmp7) / m_A19;
+	double tmp6 = 0.0;
+	tmp6 += m_A15 * V[7];
+	tmp6 += m_A16 * V[9];
+	V[6] = (RHS6 - tmp6) / m_A14;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[8];
+	tmp5 += m_A12 * V[10];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[8];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[9];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[7];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[7];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// segausb
+static void nl_gcr_8cc4eb213eaeef9b_30_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 -= go[5] * *cnV[5];
+	RHS2 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A7 += go[7];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 -= go[8] * *cnV[8];
+	m_A8 += gt[9];
+	m_A8 += gt[10];
+	m_A8 += gt[11];
+	m_A10 += go[9];
+	m_A9 += go[10];
+	double RHS4 = Idr[9];
+	RHS4 += Idr[10];
+	RHS4 += Idr[11];
+	RHS4 -= go[11] * *cnV[11];
+	m_A11 += gt[12];
+	m_A11 += gt[13];
+	m_A11 += gt[14];
+	m_A11 += gt[15];
+	m_A13 += go[12];
+	m_A12 += go[13];
+	double RHS5 = Idr[12];
+	RHS5 += Idr[13];
+	RHS5 += Idr[14];
+	RHS5 += Idr[15];
+	RHS5 -= go[14] * *cnV[14];
+	RHS5 -= go[15] * *cnV[15];
+	m_A19 += gt[16];
+	m_A19 += gt[17];
+	m_A19 += gt[18];
+	m_A19 += gt[19];
+	m_A19 += gt[20];
+	m_A19 += gt[21];
+	m_A18 += go[16];
+	m_A17 += go[17];
+	m_A16 += go[18];
+	m_A15 += go[19];
+	m_A14 += go[20];
+	double RHS6 = Idr[16];
+	RHS6 += Idr[17];
+	RHS6 += Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
+	RHS6 += Idr[21];
+	RHS6 -= go[21] * *cnV[21];
+	m_A24 += gt[22];
+	m_A24 += gt[23];
+	m_A24 += gt[24];
+	m_A22 += go[22];
+	m_A21 += go[23];
+	double RHS7 = Idr[22];
+	RHS7 += Idr[23];
+	RHS7 += Idr[24];
+	RHS7 -= go[24] * *cnV[24];
+	m_A29 += gt[25];
+	m_A29 += gt[26];
+	m_A29 += gt[27];
+	m_A29 += gt[28];
+	m_A29 += gt[29];
+	m_A29 += gt[30];
+	m_A29 += gt[31];
+	m_A28 += go[25];
+	m_A26 += go[26];
+	double RHS8 = Idr[25];
+	RHS8 += Idr[26];
+	RHS8 += Idr[27];
+	RHS8 += Idr[28];
+	RHS8 += Idr[29];
+	RHS8 += Idr[30];
+	RHS8 += Idr[31];
+	RHS8 -= go[27] * *cnV[27];
+	RHS8 -= go[28] * *cnV[28];
+	RHS8 -= go[29] * *cnV[29];
+	RHS8 -= go[30] * *cnV[30];
+	RHS8 -= go[31] * *cnV[31];
+	const double f0 = 1.0 / m_A0;
+	const double f0_6 = -f0 * m_A14;
+	m_A19 += m_A1 * f0_6;
+	RHS6 += f0_6 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_6 = -f1 * m_A15;
+	m_A19 += m_A3 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_6 = -f2 * m_A16;
+	m_A19 += m_A5 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_6 = -f3 * m_A17;
+	m_A19 += m_A7 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_6 = -f4 * m_A18;
+	m_A19 += m_A9 * f4_6;
+	m_A20 += m_A10 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f4_7 = -f4 * m_A21;
+	m_A23 += m_A9 * f4_7;
+	m_A24 += m_A10 * f4_7;
+	RHS7 += f4_7 * RHS4;
+	const double f4_8 = -f4 * m_A26;
+	m_A27 += m_A9 * f4_8;
+	m_A28 += m_A10 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f5 = 1.0 / m_A11;
+	const double f5_7 = -f5 * m_A22;
+	m_A24 += m_A12 * f5_7;
+	m_A25 += m_A13 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f6 = 1.0 / m_A19;
+	const double f6_7 = -f6 * m_A23;
+	m_A24 += m_A20 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	const double f6_8 = -f6 * m_A27;
+	m_A28 += m_A20 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f7 = 1.0 / m_A24;
+	const double f7_8 = -f7 * m_A28;
+	m_A29 += m_A25 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	V[8] = RHS8 / m_A29;
+	double tmp7 = 0.0;
+	tmp7 += m_A25 * V[8];
+	V[7] = (RHS7 - tmp7) / m_A24;
+	double tmp6 = 0.0;
+	tmp6 += m_A20 * V[7];
+	V[6] = (RHS6 - tmp6) / m_A19;
+	double tmp5 = 0.0;
+	tmp5 += m_A12 * V[7];
+	tmp5 += m_A13 * V[8];
+	V[5] = (RHS5 - tmp5) / m_A11;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[6];
+	tmp4 += m_A10 * V[7];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[6];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[6];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starcrus
+static void nl_gcr_8d7bddf33d942482_129_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A4 += go[3];
+	m_A3 += go[4];
+	m_A3 += go[5];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	m_A5 += gt[8];
+	m_A5 += gt[9];
+	m_A7 += go[8];
+	m_A6 += go[9];
+	double RHS2 = Idr[8];
+	RHS2 += Idr[9];
+	m_A8 += gt[10];
+	m_A8 += gt[11];
+	m_A9 += go[10];
+	double RHS3 = Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[11] * *cnV[11];
+	m_A10 += gt[12];
+	m_A10 += gt[13];
+	m_A10 += gt[14];
+	m_A11 += go[12];
+	m_A12 += go[13];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 -= go[14] * *cnV[14];
+	m_A13 += gt[15];
+	m_A13 += gt[16];
+	m_A13 += gt[17];
+	m_A15 += go[15];
+	m_A14 += go[16];
+	double RHS5 = Idr[15];
+	RHS5 += Idr[16];
+	RHS5 += Idr[17];
+	RHS5 -= go[17] * *cnV[17];
+	m_A16 += gt[18];
+	m_A16 += gt[19];
+	m_A16 += gt[20];
+	m_A16 += gt[21];
+	m_A16 += gt[22];
+	m_A17 += go[18];
+	m_A18 += go[19];
+	double RHS6 = Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
+	RHS6 += Idr[21];
+	RHS6 += Idr[22];
+	RHS6 -= go[20] * *cnV[20];
+	RHS6 -= go[21] * *cnV[21];
+	RHS6 -= go[22] * *cnV[22];
+	m_A19 += gt[23];
+	m_A19 += gt[24];
+	m_A19 += gt[25];
+	m_A19 += gt[26];
+	m_A19 += gt[27];
+	m_A19 += gt[28];
+	m_A19 += gt[29];
+	m_A21 += go[23];
+	m_A20 += go[24];
+	double RHS7 = Idr[23];
+	RHS7 += Idr[24];
+	RHS7 += Idr[25];
+	RHS7 += Idr[26];
+	RHS7 += Idr[27];
+	RHS7 += Idr[28];
+	RHS7 += Idr[29];
+	RHS7 -= go[25] * *cnV[25];
+	RHS7 -= go[26] * *cnV[26];
+	RHS7 -= go[27] * *cnV[27];
+	RHS7 -= go[28] * *cnV[28];
+	RHS7 -= go[29] * *cnV[29];
+	m_A22 += gt[30];
+	m_A22 += gt[31];
+	m_A24 += go[30];
+	m_A23 += go[31];
+	double RHS8 = Idr[30];
+	RHS8 += Idr[31];
+	m_A25 += gt[32];
+	m_A25 += gt[33];
+	m_A25 += gt[34];
+	m_A25 += gt[35];
+	m_A25 += gt[36];
+	m_A25 += gt[37];
+	m_A25 += gt[38];
+	m_A27 += go[32];
+	m_A27 += go[33];
+	m_A26 += go[34];
+	m_A28 += go[35];
+	double RHS9 = Idr[32];
+	RHS9 += Idr[33];
+	RHS9 += Idr[34];
+	RHS9 += Idr[35];
+	RHS9 += Idr[36];
+	RHS9 += Idr[37];
+	RHS9 += Idr[38];
+	RHS9 -= go[36] * *cnV[36];
+	RHS9 -= go[37] * *cnV[37];
+	RHS9 -= go[38] * *cnV[38];
+	m_A29 += gt[39];
+	m_A29 += gt[40];
+	m_A29 += gt[41];
+	m_A29 += gt[42];
+	m_A29 += gt[43];
+	m_A29 += gt[44];
+	m_A31 += go[39];
+	m_A30 += go[40];
+	m_A30 += go[41];
+	double RHS10 = Idr[39];
+	RHS10 += Idr[40];
+	RHS10 += Idr[41];
+	RHS10 += Idr[42];
+	RHS10 += Idr[43];
+	RHS10 += Idr[44];
+	RHS10 -= go[42] * *cnV[42];
+	RHS10 -= go[43] * *cnV[43];
+	RHS10 -= go[44] * *cnV[44];
+	m_A32 += gt[45];
+	m_A32 += gt[46];
+	m_A32 += gt[47];
+	m_A32 += gt[48];
+	m_A32 += gt[49];
+	m_A33 += go[45];
+	m_A33 += go[46];
+	m_A34 += go[47];
+	double RHS11 = Idr[45];
+	RHS11 += Idr[46];
+	RHS11 += Idr[47];
+	RHS11 += Idr[48];
+	RHS11 += Idr[49];
+	RHS11 -= go[48] * *cnV[48];
+	RHS11 -= go[49] * *cnV[49];
+	m_A35 += gt[50];
+	m_A35 += gt[51];
+	m_A35 += gt[52];
+	m_A35 += gt[53];
+	m_A37 += go[50];
+	m_A37 += go[51];
+	m_A36 += go[52];
+	double RHS12 = Idr[50];
+	RHS12 += Idr[51];
+	RHS12 += Idr[52];
+	RHS12 += Idr[53];
+	RHS12 -= go[53] * *cnV[53];
+	m_A38 += gt[54];
+	m_A38 += gt[55];
+	m_A38 += gt[56];
+	m_A38 += gt[57];
+	m_A40 += go[54];
+	m_A40 += go[55];
+	m_A39 += go[56];
+	double RHS13 = Idr[54];
+	RHS13 += Idr[55];
+	RHS13 += Idr[56];
+	RHS13 += Idr[57];
+	RHS13 -= go[57] * *cnV[57];
+	m_A41 += gt[58];
+	m_A41 += gt[59];
+	m_A41 += gt[60];
+	m_A41 += gt[61];
+	m_A42 += go[58];
+	double RHS14 = Idr[58];
+	RHS14 += Idr[59];
+	RHS14 += Idr[60];
+	RHS14 += Idr[61];
+	RHS14 -= go[59] * *cnV[59];
+	RHS14 -= go[60] * *cnV[60];
+	RHS14 -= go[61] * *cnV[61];
+	m_A45 += gt[62];
+	m_A45 += gt[63];
+	m_A45 += gt[64];
+	m_A45 += gt[65];
+	m_A45 += gt[66];
+	m_A44 += go[62];
+	m_A44 += go[63];
+	m_A43 += go[64];
+	double RHS15 = Idr[62];
+	RHS15 += Idr[63];
+	RHS15 += Idr[64];
+	RHS15 += Idr[65];
+	RHS15 += Idr[66];
+	RHS15 -= go[65] * *cnV[65];
+	RHS15 -= go[66] * *cnV[66];
+	m_A49 += gt[67];
+	m_A49 += gt[68];
+	m_A48 += go[67];
+	m_A47 += go[68];
+	double RHS16 = Idr[67];
+	RHS16 += Idr[68];
+	m_A56 += gt[69];
+	m_A56 += gt[70];
+	m_A56 += gt[71];
+	m_A54 += go[69];
+	m_A52 += go[70];
+	m_A55 += go[71];
+	double RHS17 = Idr[69];
+	RHS17 += Idr[70];
+	RHS17 += Idr[71];
+	m_A63 += gt[72];
+	m_A63 += gt[73];
+	m_A63 += gt[74];
+	m_A63 += gt[75];
+	m_A61 += go[72];
+	m_A61 += go[73];
+	m_A60 += go[74];
+	double RHS18 = Idr[72];
+	RHS18 += Idr[73];
+	RHS18 += Idr[74];
+	RHS18 += Idr[75];
+	RHS18 -= go[75] * *cnV[75];
+	m_A71 += gt[76];
+	m_A71 += gt[77];
+	m_A71 += gt[78];
+	m_A71 += gt[79];
+	m_A71 += gt[80];
+	m_A71 += gt[81];
+	m_A71 += gt[82];
+	m_A71 += gt[83];
+	m_A68 += go[76];
+	m_A68 += go[77];
+	m_A67 += go[78];
+	m_A67 += go[79];
+	double RHS19 = Idr[76];
+	RHS19 += Idr[77];
+	RHS19 += Idr[78];
+	RHS19 += Idr[79];
+	RHS19 += Idr[80];
+	RHS19 += Idr[81];
+	RHS19 += Idr[82];
+	RHS19 += Idr[83];
+	RHS19 -= go[80] * *cnV[80];
+	RHS19 -= go[81] * *cnV[81];
+	RHS19 -= go[82] * *cnV[82];
+	RHS19 -= go[83] * *cnV[83];
+	m_A76 += gt[84];
+	m_A76 += gt[85];
+	m_A77 += go[84];
+	m_A74 += go[85];
+	double RHS20 = Idr[84];
+	RHS20 += Idr[85];
+	m_A83 += gt[86];
+	m_A83 += gt[87];
+	m_A83 += gt[88];
+	m_A83 += gt[89];
+	m_A80 += go[86];
+	m_A79 += go[87];
+	m_A78 += go[88];
+	double RHS21 = Idr[86];
+	RHS21 += Idr[87];
+	RHS21 += Idr[88];
+	RHS21 += Idr[89];
+	RHS21 -= go[89] * *cnV[89];
+	m_A89 += gt[90];
+	m_A89 += gt[91];
+	m_A89 += gt[92];
+	m_A89 += gt[93];
+	m_A89 += gt[94];
+	m_A89 += gt[95];
+	m_A87 += go[90];
+	m_A86 += go[91];
+	m_A86 += go[92];
+	double RHS22 = Idr[90];
+	RHS22 += Idr[91];
+	RHS22 += Idr[92];
+	RHS22 += Idr[93];
+	RHS22 += Idr[94];
+	RHS22 += Idr[95];
+	RHS22 -= go[93] * *cnV[93];
+	RHS22 -= go[94] * *cnV[94];
+	RHS22 -= go[95] * *cnV[95];
+	m_A95 += gt[96];
+	m_A95 += gt[97];
+	m_A95 += gt[98];
+	m_A95 += gt[99];
+	m_A95 += gt[100];
+	m_A93 += go[96];
+	m_A92 += go[97];
+	m_A92 += go[98];
+	double RHS23 = Idr[96];
+	RHS23 += Idr[97];
+	RHS23 += Idr[98];
+	RHS23 += Idr[99];
+	RHS23 += Idr[100];
+	RHS23 -= go[99] * *cnV[99];
+	RHS23 -= go[100] * *cnV[100];
+	m_A98 += gt[101];
+	m_A98 += gt[102];
+	m_A98 += gt[103];
+	m_A98 += gt[104];
+	m_A98 += gt[105];
+	m_A99 += go[101];
+	m_A99 += go[102];
+	m_A97 += go[103];
+	double RHS24 = Idr[101];
+	RHS24 += Idr[102];
+	RHS24 += Idr[103];
+	RHS24 += Idr[104];
+	RHS24 += Idr[105];
+	RHS24 -= go[104] * *cnV[104];
+	RHS24 -= go[105] * *cnV[105];
+	m_A109 += gt[106];
+	m_A109 += gt[107];
+	m_A109 += gt[108];
+	m_A109 += gt[109];
+	m_A109 += gt[110];
+	m_A110 += go[106];
+	m_A101 += go[107];
+	m_A100 += go[108];
+	double RHS25 = Idr[106];
+	RHS25 += Idr[107];
+	RHS25 += Idr[108];
+	RHS25 += Idr[109];
+	RHS25 += Idr[110];
+	RHS25 -= go[109] * *cnV[109];
+	RHS25 -= go[110] * *cnV[110];
+	m_A115 += gt[111];
+	m_A115 += gt[112];
+	m_A115 += gt[113];
+	m_A115 += gt[114];
+	m_A115 += gt[115];
+	m_A115 += gt[116];
+	m_A115 += gt[117];
+	m_A113 += go[111];
+	m_A112 += go[112];
+	double RHS26 = Idr[111];
+	RHS26 += Idr[112];
+	RHS26 += Idr[113];
+	RHS26 += Idr[114];
+	RHS26 += Idr[115];
+	RHS26 += Idr[116];
+	RHS26 += Idr[117];
+	RHS26 -= go[113] * *cnV[113];
+	RHS26 -= go[114] * *cnV[114];
+	RHS26 -= go[115] * *cnV[115];
+	RHS26 -= go[116] * *cnV[116];
+	RHS26 -= go[117] * *cnV[117];
+	m_A123 += gt[118];
+	m_A123 += gt[119];
+	m_A123 += gt[120];
+	m_A123 += gt[121];
+	m_A118 += go[118];
+	m_A124 += go[119];
+	m_A117 += go[120];
+	m_A120 += go[121];
+	double RHS27 = Idr[118];
+	RHS27 += Idr[119];
+	RHS27 += Idr[120];
+	RHS27 += Idr[121];
+	m_A128 += gt[122];
+	m_A128 += gt[123];
+	m_A128 += gt[124];
+	m_A128 += gt[125];
+	m_A128 += gt[126];
+	m_A127 += go[122];
+	m_A126 += go[123];
+	m_A126 += go[124];
+	m_A125 += go[125];
+	double RHS28 = Idr[122];
+	RHS28 += Idr[123];
+	RHS28 += Idr[124];
+	RHS28 += Idr[125];
+	RHS28 += Idr[126];
+	RHS28 -= go[126] * *cnV[126];
+	const double f0 = 1.0 / m_A0;
+	const double f0_15 = -f0 * m_A43;
+	m_A45 += m_A1 * f0_15;
+	RHS15 += f0_15 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_34 = -f1 * m_A125;
-	m_A127 += m_A3 * f1_34;
-	RHS34 += f1_34 * RHS1;
-	const double f1_40 = -f1 * m_A161;
-	m_A164 += m_A3 * f1_40;
-	RHS40 += f1_40 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_40 = -f2 * m_A162;
-	m_A164 += m_A5 * f2_40;
-	m_A165 += m_A6 * f2_40;
-	RHS40 += f2_40 * RHS2;
-	const double f2_43 = -f2 * m_A184;
-	m_A194 += m_A5 * f2_43;
-	m_A197 += m_A6 * f2_43;
-	RHS43 += f2_43 * RHS2;
-	const double f3 = 1.0 / m_A7;
-	const double f3_37 = -f3 * m_A136;
-	m_A138 += m_A8 * f3_37;
-	m_A139 += m_A9 * f3_37;
-	RHS37 += f3_37 * RHS3;
+	const double f1_15 = -f1 * m_A44;
+	m_A45 += m_A3 * f1_15;
+	m_A46 += m_A4 * f1_15;
+	RHS15 += f1_15 * RHS1;
+	const double f1_20 = -f1 * m_A74;
+	m_A75 += m_A3 * f1_20;
+	m_A76 += m_A4 * f1_20;
+	RHS20 += f1_20 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_24 = -f2 * m_A97;
+	m_A98 += m_A6 * f2_24;
+	m_A99 += m_A7 * f2_24;
+	RHS24 += f2_24 * RHS2;
+	const double f2_28 = -f2 * m_A125;
+	m_A126 += m_A6 * f2_28;
+	m_A128 += m_A7 * f2_28;
+	RHS28 += f2_28 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_27 = -f3 * m_A117;
+	m_A123 += m_A9 * f3_27;
+	RHS27 += f3_27 * RHS3;
 	const double f4 = 1.0 / m_A10;
-	const double f4_37 = -f4 * m_A137;
-	m_A139 += m_A11 * f4_37;
-	m_A140 += m_A12 * f4_37;
-	RHS37 += f4_37 * RHS4;
-	const double f4_38 = -f4 * m_A142;
-	m_A148 += m_A11 * f4_38;
-	m_A149 += m_A12 * f4_38;
-	RHS38 += f4_38 * RHS4;
+	const double f4_16 = -f4 * m_A47;
+	m_A49 += m_A11 * f4_16;
+	m_A51 += m_A12 * f4_16;
+	RHS16 += f4_16 * RHS4;
+	const double f4_26 = -f4 * m_A112;
+	m_A113 += m_A11 * f4_26;
+	m_A116 += m_A12 * f4_26;
+	RHS26 += f4_26 * RHS4;
+	const double f4_27 = -f4 * m_A118;
+	m_A119 += m_A11 * f4_27;
+	m_A123 += m_A12 * f4_27;
+	RHS27 += f4_27 * RHS4;
 	const double f5 = 1.0 / m_A13;
-	const double f5_42 = -f5 * m_A177;
-	m_A182 += m_A14 * f5_42;
-	RHS42 += f5_42 * RHS5;
-	const double f6 = 1.0 / m_A15;
-	const double f6_36 = -f6 * m_A131;
-	m_A133 += m_A16 * f6_36;
-	RHS36 += f6_36 * RHS6;
-	const double f7 = 1.0 / m_A17;
-	const double f7_36 = -f7 * m_A132;
-	m_A134 += m_A18 * f7_36;
-	m_A135 += m_A19 * f7_36;
-	RHS36 += f7_36 * RHS7;
-	const double f8 = 1.0 / m_A20;
-	const double f8_27 = -f8 * m_A81;
-	m_A83 += m_A21 * f8_27;
-	m_A86 += m_A22 * f8_27;
-	RHS27 += f8_27 * RHS8;
-	const double f8_43 = -f8 * m_A185;
-	m_A187 += m_A21 * f8_43;
-	m_A197 += m_A22 * f8_43;
-	RHS43 += f8_43 * RHS8;
-	const double f9 = 1.0 / m_A23;
-	const double f9_31 = -f9 * m_A113;
-	m_A116 += m_A24 * f9_31;
-	m_A118 += m_A25 * f9_31;
-	RHS31 += f9_31 * RHS9;
-	const double f9_43 = -f9 * m_A186;
-	m_A191 += m_A24 * f9_43;
-	m_A197 += m_A25 * f9_43;
-	RHS43 += f9_43 * RHS9;
-	const double f10 = 1.0 / m_A26;
-	const double f10_31 = -f10 * m_A114;
-	m_A116 += m_A27 * f10_31;
-	RHS31 += f10_31 * RHS10;
-	const double f11 = 1.0 / m_A28;
-	const double f11_31 = -f11 * m_A115;
-	m_A116 += m_A29 * f11_31;
-	m_A117 += m_A30 * f11_31;
-	RHS31 += f11_31 * RHS11;
-	const double f11_39 = -f11 * m_A153;
-	m_A155 += m_A29 * f11_39;
-	m_A157 += m_A30 * f11_39;
-	RHS39 += f11_39 * RHS11;
-	const double f12 = 1.0 / m_A31;
-	const double f12_38 = -f12 * m_A143;
-	m_A149 += m_A32 * f12_38;
-	m_A150 += m_A33 * f12_38;
-	RHS38 += f12_38 * RHS12;
-	const double f12_39 = -f12 * m_A154;
-	m_A156 += m_A32 * f12_39;
-	m_A157 += m_A33 * f12_39;
-	RHS39 += f12_39 * RHS12;
-	const double f13 = 1.0 / m_A34;
-	const double f13_37 = -f13 * m_A138;
-	m_A139 += m_A35 * f13_37;
-	m_A141 += m_A36 * f13_37;
-	RHS37 += f13_37 * RHS13;
-	const double f13_41 = -f13 * m_A166;
-	m_A171 += m_A35 * f13_41;
-	m_A174 += m_A36 * f13_41;
-	RHS41 += f13_41 * RHS13;
-	const double f14 = 1.0 / m_A37;
-	const double f14_24 = -f14 * m_A67;
-	m_A69 += m_A38 * f14_24;
-	m_A71 += m_A39 * f14_24;
-	RHS24 += f14_24 * RHS14;
-	const double f14_28 = -f14 * m_A87;
-	m_A90 += m_A38 * f14_28;
-	m_A93 += m_A39 * f14_28;
-	RHS28 += f14_28 * RHS14;
-	const double f15 = 1.0 / m_A40;
-	const double f15_24 = -f15 * m_A68;
-	m_A69 += m_A41 * f15_24;
-	m_A70 += m_A42 * f15_24;
-	RHS24 += f15_24 * RHS15;
-	const double f15_25 = -f15 * m_A72;
-	m_A74 += m_A41 * f15_25;
-	m_A75 += m_A42 * f15_25;
-	RHS25 += f15_25 * RHS15;
-	const double f16 = 1.0 / m_A43;
-	const double f16_25 = -f16 * m_A73;
-	m_A75 += m_A44 * f16_25;
+	const double f5_16 = -f5 * m_A48;
+	m_A49 += m_A14 * f5_16;
+	m_A50 += m_A15 * f5_16;
+	RHS16 += f5_16 * RHS5;
+	const double f5_25 = -f5 * m_A100;
+	m_A102 += m_A14 * f5_25;
+	m_A109 += m_A15 * f5_25;
+	RHS25 += f5_25 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_17 = -f6 * m_A52;
+	m_A53 += m_A17 * f6_17;
+	m_A56 += m_A18 * f6_17;
+	RHS17 += f6_17 * RHS6;
+	const double f7 = 1.0 / m_A19;
+	const double f7_17 = -f7 * m_A53;
+	m_A55 += m_A20 * f7_17;
+	m_A56 += m_A21 * f7_17;
+	RHS17 += f7_17 * RHS7;
+	const double f8 = 1.0 / m_A22;
+	const double f8_17 = -f8 * m_A54;
+	m_A56 += m_A23 * f8_17;
+	m_A57 += m_A24 * f8_17;
+	RHS17 += f8_17 * RHS8;
+	const double f8_18 = -f8 * m_A60;
+	m_A62 += m_A23 * f8_18;
+	m_A63 += m_A24 * f8_18;
+	RHS18 += f8_18 * RHS8;
+	const double f9 = 1.0 / m_A25;
+	const double f9_17 = -f9 * m_A55;
+	m_A56 += m_A26 * f9_17;
+	m_A58 += m_A27 * f9_17;
+	m_A59 += m_A28 * f9_17;
+	RHS17 += f9_17 * RHS9;
+	const double f9_19 = -f9 * m_A67;
+	m_A69 += m_A26 * f9_19;
+	m_A71 += m_A27 * f9_19;
+	m_A73 += m_A28 * f9_19;
+	RHS19 += f9_19 * RHS9;
+	const double f9_25 = -f9 * m_A101;
+	m_A103 += m_A26 * f9_25;
+	m_A105 += m_A27 * f9_25;
+	m_A109 += m_A28 * f9_25;
+	RHS25 += f9_25 * RHS9;
+	const double f10 = 1.0 / m_A29;
+	const double f10_18 = -f10 * m_A61;
+	m_A63 += m_A30 * f10_18;
+	m_A65 += m_A31 * f10_18;
+	RHS18 += f10_18 * RHS10;
+	const double f10_21 = -f10 * m_A78;
+	m_A81 += m_A30 * f10_21;
+	m_A83 += m_A31 * f10_21;
+	RHS21 += f10_21 * RHS10;
+	const double f11 = 1.0 / m_A32;
+	const double f11_19 = -f11 * m_A68;
+	m_A71 += m_A33 * f11_19;
+	m_A72 += m_A34 * f11_19;
+	RHS19 += f11_19 * RHS11;
+	const double f11_21 = -f11 * m_A79;
+	m_A82 += m_A33 * f11_21;
+	m_A83 += m_A34 * f11_21;
+	RHS21 += f11_21 * RHS11;
+	const double f12 = 1.0 / m_A35;
+	const double f12_21 = -f12 * m_A80;
+	m_A83 += m_A36 * f12_21;
+	m_A84 += m_A37 * f12_21;
+	RHS21 += f12_21 * RHS12;
+	const double f12_22 = -f12 * m_A86;
+	m_A88 += m_A36 * f12_22;
+	m_A89 += m_A37 * f12_22;
+	RHS22 += f12_22 * RHS12;
+	const double f13 = 1.0 / m_A38;
+	const double f13_22 = -f13 * m_A87;
+	m_A89 += m_A39 * f13_22;
+	m_A90 += m_A40 * f13_22;
+	RHS22 += f13_22 * RHS13;
+	const double f13_23 = -f13 * m_A92;
+	m_A94 += m_A39 * f13_23;
+	m_A95 += m_A40 * f13_23;
+	RHS23 += f13_23 * RHS13;
+	const double f14 = 1.0 / m_A41;
+	const double f14_23 = -f14 * m_A93;
+	m_A95 += m_A42 * f14_23;
+	RHS23 += f14_23 * RHS14;
+	const double f15 = 1.0 / m_A45;
+	const double f15_20 = -f15 * m_A75;
+	m_A76 += m_A46 * f15_20;
+	RHS20 += f15_20 * RHS15;
+	const double f16 = 1.0 / m_A49;
+	const double f16_25 = -f16 * m_A102;
+	m_A109 += m_A50 * f16_25;
+	m_A111 += m_A51 * f16_25;
 	RHS25 += f16_25 * RHS16;
-	const double f17 = 1.0 / m_A45;
-	const double f17_26 = -f17 * m_A77;
-	m_A79 += m_A46 * f17_26;
-	RHS26 += f17_26 * RHS17;
-	const double f18 = 1.0 / m_A47;
-	const double f18_26 = -f18 * m_A78;
-	m_A79 += m_A48 * f18_26;
-	m_A80 += m_A49 * f18_26;
-	RHS26 += f18_26 * RHS18;
-	const double f18_30 = -f18 * m_A106;
-	m_A108 += m_A48 * f18_30;
-	m_A110 += m_A49 * f18_30;
-	RHS30 += f18_30 * RHS18;
-	const double f19 = 1.0 / m_A50;
-	const double f19_27 = -f19 * m_A82;
-	m_A83 += m_A51 * f19_27;
-	m_A84 += m_A52 * f19_27;
-	m_A85 += m_A53 * f19_27;
-	RHS27 += f19_27 * RHS19;
-	const double f19_28 = -f19 * m_A88;
-	m_A92 += m_A51 * f19_28;
-	m_A93 += m_A52 * f19_28;
-	m_A94 += m_A53 * f19_28;
-	RHS28 += f19_28 * RHS19;
-	const double f19_29 = -f19 * m_A97;
-	m_A100 += m_A51 * f19_29;
-	m_A101 += m_A52 * f19_29;
-	m_A102 += m_A53 * f19_29;
-	RHS29 += f19_29 * RHS19;
-	const double f20 = 1.0 / m_A54;
-	const double f20_28 = -f20 * m_A89;
-	m_A93 += m_A55 * f20_28;
-	m_A94 += m_A56 * f20_28;
-	m_A95 += m_A57 * f20_28;
-	RHS28 += f20_28 * RHS20;
-	const double f20_29 = -f20 * m_A98;
-	m_A101 += m_A55 * f20_29;
-	m_A102 += m_A56 * f20_29;
-	m_A104 += m_A57 * f20_29;
-	RHS29 += f20_29 * RHS20;
-	const double f20_41 = -f20 * m_A167;
-	m_A168 += m_A55 * f20_41;
-	m_A169 += m_A56 * f20_41;
-	m_A174 += m_A57 * f20_41;
-	RHS41 += f20_41 * RHS20;
-	const double f21 = 1.0 / m_A58;
-	const double f21_29 = -f21 * m_A99;
-	m_A102 += m_A59 * f21_29;
-	m_A103 += m_A60 * f21_29;
-	RHS29 += f21_29 * RHS21;
-	const double f21_30 = -f21 * m_A107;
-	m_A109 += m_A59 * f21_30;
-	m_A110 += m_A60 * f21_30;
-	RHS30 += f21_30 * RHS21;
-	const double f22 = 1.0 / m_A61;
-	const double f22_32 = -f22 * m_A119;
-	m_A120 += m_A62 * f22_32;
-	m_A121 += m_A63 * f22_32;
-	RHS32 += f22_32 * RHS22;
-	const double f22_38 = -f22 * m_A144;
-	m_A146 += m_A62 * f22_38;
-	m_A149 += m_A63 * f22_38;
-	RHS38 += f22_38 * RHS22;
-	const double f23 = 1.0 / m_A64;
-	const double f23_35 = -f23 * m_A128;
-	m_A129 += m_A65 * f23_35;
-	m_A130 += m_A66 * f23_35;
-	RHS35 += f23_35 * RHS23;
-	const double f23_38 = -f23 * m_A145;
-	m_A147 += m_A65 * f23_38;
-	m_A149 += m_A66 * f23_38;
-	RHS38 += f23_38 * RHS23;
-	const double f24 = 1.0 / m_A69;
-	const double f24_25 = -f24 * m_A74;
-	m_A75 += m_A70 * f24_25;
-	m_A76 += m_A71 * f24_25;
-	RHS25 += f24_25 * RHS24;
-	const double f24_28 = -f24 * m_A90;
-	m_A91 += m_A70 * f24_28;
-	m_A93 += m_A71 * f24_28;
+	const double f16_26 = -f16 * m_A113;
+	m_A114 += m_A50 * f16_26;
+	m_A116 += m_A51 * f16_26;
+	RHS26 += f16_26 * RHS16;
+	const double f16_27 = -f16 * m_A119;
+	m_A121 += m_A50 * f16_27;
+	m_A123 += m_A51 * f16_27;
+	RHS27 += f16_27 * RHS16;
+	const double f17 = 1.0 / m_A56;
+	const double f17_18 = -f17 * m_A62;
+	m_A63 += m_A57 * f17_18;
+	m_A64 += m_A58 * f17_18;
+	m_A66 += m_A59 * f17_18;
+	RHS18 += f17_18 * RHS17;
+	const double f17_19 = -f17 * m_A69;
+	m_A70 += m_A57 * f17_19;
+	m_A71 += m_A58 * f17_19;
+	m_A73 += m_A59 * f17_19;
+	RHS19 += f17_19 * RHS17;
+	const double f17_25 = -f17 * m_A103;
+	m_A104 += m_A57 * f17_25;
+	m_A105 += m_A58 * f17_25;
+	m_A109 += m_A59 * f17_25;
+	RHS25 += f17_25 * RHS17;
+	const double f18 = 1.0 / m_A63;
+	const double f18_19 = -f18 * m_A70;
+	m_A71 += m_A64 * f18_19;
+	m_A72 += m_A65 * f18_19;
+	m_A73 += m_A66 * f18_19;
+	RHS19 += f18_19 * RHS18;
+	const double f18_21 = -f18 * m_A81;
+	m_A82 += m_A64 * f18_21;
+	m_A83 += m_A65 * f18_21;
+	m_A85 += m_A66 * f18_21;
+	RHS21 += f18_21 * RHS18;
+	const double f18_25 = -f18 * m_A104;
+	m_A105 += m_A64 * f18_25;
+	m_A106 += m_A65 * f18_25;
+	m_A109 += m_A66 * f18_25;
+	RHS25 += f18_25 * RHS18;
+	const double f19 = 1.0 / m_A71;
+	const double f19_21 = -f19 * m_A82;
+	m_A83 += m_A72 * f19_21;
+	m_A85 += m_A73 * f19_21;
+	RHS21 += f19_21 * RHS19;
+	const double f19_25 = -f19 * m_A105;
+	m_A106 += m_A72 * f19_25;
+	m_A109 += m_A73 * f19_25;
+	RHS25 += f19_25 * RHS19;
+	const double f20 = 1.0 / m_A76;
+	const double f20_27 = -f20 * m_A120;
+	m_A123 += m_A77 * f20_27;
+	RHS27 += f20_27 * RHS20;
+	const double f21 = 1.0 / m_A83;
+	const double f21_22 = -f21 * m_A88;
+	m_A89 += m_A84 * f21_22;
+	m_A91 += m_A85 * f21_22;
+	RHS22 += f21_22 * RHS21;
+	const double f21_25 = -f21 * m_A106;
+	m_A107 += m_A84 * f21_25;
+	m_A109 += m_A85 * f21_25;
+	RHS25 += f21_25 * RHS21;
+	const double f22 = 1.0 / m_A89;
+	const double f22_23 = -f22 * m_A94;
+	m_A95 += m_A90 * f22_23;
+	m_A96 += m_A91 * f22_23;
+	RHS23 += f22_23 * RHS22;
+	const double f22_25 = -f22 * m_A107;
+	m_A108 += m_A90 * f22_25;
+	m_A109 += m_A91 * f22_25;
+	RHS25 += f22_25 * RHS22;
+	const double f23 = 1.0 / m_A95;
+	const double f23_25 = -f23 * m_A108;
+	m_A109 += m_A96 * f23_25;
+	RHS25 += f23_25 * RHS23;
+	const double f24 = 1.0 / m_A98;
+	const double f24_28 = -f24 * m_A126;
+	m_A128 += m_A99 * f24_28;
 	RHS28 += f24_28 * RHS24;
-	const double f25 = 1.0 / m_A75;
-	const double f25_28 = -f25 * m_A91;
-	m_A93 += m_A76 * f25_28;
-	RHS28 += f25_28 * RHS25;
-	const double f26 = 1.0 / m_A79;
-	const double f26_30 = -f26 * m_A108;
-	m_A110 += m_A80 * f26_30;
-	RHS30 += f26_30 * RHS26;
-	const double f27 = 1.0 / m_A83;
-	const double f27_28 = -f27 * m_A92;
-	m_A93 += m_A84 * f27_28;
-	m_A94 += m_A85 * f27_28;
-	m_A96 += m_A86 * f27_28;
+	const double f25 = 1.0 / m_A109;
+	const double f25_26 = -f25 * m_A114;
+	m_A115 += m_A110 * f25_26;
+	m_A116 += m_A111 * f25_26;
+	RHS26 += f25_26 * RHS25;
+	const double f25_27 = -f25 * m_A121;
+	m_A122 += m_A110 * f25_27;
+	m_A123 += m_A111 * f25_27;
+	RHS27 += f25_27 * RHS25;
+	const double f26 = 1.0 / m_A115;
+	const double f26_27 = -f26 * m_A122;
+	m_A123 += m_A116 * f26_27;
+	RHS27 += f26_27 * RHS26;
+	const double f27 = 1.0 / m_A123;
+	const double f27_28 = -f27 * m_A127;
+	m_A128 += m_A124 * f27_28;
 	RHS28 += f27_28 * RHS27;
-	const double f27_29 = -f27 * m_A100;
-	m_A101 += m_A84 * f27_29;
-	m_A102 += m_A85 * f27_29;
-	m_A105 += m_A86 * f27_29;
-	RHS29 += f27_29 * RHS27;
-	const double f27_43 = -f27 * m_A187;
-	m_A188 += m_A84 * f27_43;
-	m_A189 += m_A85 * f27_43;
-	m_A197 += m_A86 * f27_43;
-	RHS43 += f27_43 * RHS27;
-	const double f28 = 1.0 / m_A93;
-	const double f28_29 = -f28 * m_A101;
-	m_A102 += m_A94 * f28_29;
-	m_A104 += m_A95 * f28_29;
-	m_A105 += m_A96 * f28_29;
-	RHS29 += f28_29 * RHS28;
-	const double f28_41 = -f28 * m_A168;
-	m_A169 += m_A94 * f28_41;
-	m_A174 += m_A95 * f28_41;
-	m_A176 += m_A96 * f28_41;
-	RHS41 += f28_41 * RHS28;
-	const double f28_43 = -f28 * m_A188;
-	m_A189 += m_A94 * f28_43;
-	m_A195 += m_A95 * f28_43;
-	m_A197 += m_A96 * f28_43;
-	RHS43 += f28_43 * RHS28;
-	const double f29 = 1.0 / m_A102;
-	const double f29_30 = -f29 * m_A109;
-	m_A110 += m_A103 * f29_30;
-	m_A111 += m_A104 * f29_30;
-	m_A112 += m_A105 * f29_30;
-	RHS30 += f29_30 * RHS29;
-	const double f29_41 = -f29 * m_A169;
-	m_A170 += m_A103 * f29_41;
-	m_A174 += m_A104 * f29_41;
-	m_A176 += m_A105 * f29_41;
-	RHS41 += f29_41 * RHS29;
-	const double f29_43 = -f29 * m_A189;
-	m_A190 += m_A103 * f29_43;
-	m_A195 += m_A104 * f29_43;
-	m_A197 += m_A105 * f29_43;
-	RHS43 += f29_43 * RHS29;
-	const double f30 = 1.0 / m_A110;
-	const double f30_41 = -f30 * m_A170;
-	m_A174 += m_A111 * f30_41;
-	m_A176 += m_A112 * f30_41;
-	RHS41 += f30_41 * RHS30;
-	const double f30_43 = -f30 * m_A190;
-	m_A195 += m_A111 * f30_43;
-	m_A197 += m_A112 * f30_43;
-	RHS43 += f30_43 * RHS30;
-	const double f31 = 1.0 / m_A116;
-	const double f31_39 = -f31 * m_A155;
-	m_A157 += m_A117 * f31_39;
-	m_A160 += m_A118 * f31_39;
-	RHS39 += f31_39 * RHS31;
-	const double f31_43 = -f31 * m_A191;
-	m_A193 += m_A117 * f31_43;
-	m_A197 += m_A118 * f31_43;
-	RHS43 += f31_43 * RHS31;
-	const double f32 = 1.0 / m_A120;
-	const double f32_38 = -f32 * m_A146;
-	m_A149 += m_A121 * f32_38;
+	V[28] = RHS28 / m_A128;
+	double tmp27 = 0.0;
+	tmp27 += m_A124 * V[28];
+	V[27] = (RHS27 - tmp27) / m_A123;
+	double tmp26 = 0.0;
+	tmp26 += m_A116 * V[27];
+	V[26] = (RHS26 - tmp26) / m_A115;
+	double tmp25 = 0.0;
+	tmp25 += m_A110 * V[26];
+	tmp25 += m_A111 * V[27];
+	V[25] = (RHS25 - tmp25) / m_A109;
+	double tmp24 = 0.0;
+	tmp24 += m_A99 * V[28];
+	V[24] = (RHS24 - tmp24) / m_A98;
+	double tmp23 = 0.0;
+	tmp23 += m_A96 * V[25];
+	V[23] = (RHS23 - tmp23) / m_A95;
+	double tmp22 = 0.0;
+	tmp22 += m_A90 * V[23];
+	tmp22 += m_A91 * V[25];
+	V[22] = (RHS22 - tmp22) / m_A89;
+	double tmp21 = 0.0;
+	tmp21 += m_A84 * V[22];
+	tmp21 += m_A85 * V[25];
+	V[21] = (RHS21 - tmp21) / m_A83;
+	double tmp20 = 0.0;
+	tmp20 += m_A77 * V[27];
+	V[20] = (RHS20 - tmp20) / m_A76;
+	double tmp19 = 0.0;
+	tmp19 += m_A72 * V[21];
+	tmp19 += m_A73 * V[25];
+	V[19] = (RHS19 - tmp19) / m_A71;
+	double tmp18 = 0.0;
+	tmp18 += m_A64 * V[19];
+	tmp18 += m_A65 * V[21];
+	tmp18 += m_A66 * V[25];
+	V[18] = (RHS18 - tmp18) / m_A63;
+	double tmp17 = 0.0;
+	tmp17 += m_A57 * V[18];
+	tmp17 += m_A58 * V[19];
+	tmp17 += m_A59 * V[25];
+	V[17] = (RHS17 - tmp17) / m_A56;
+	double tmp16 = 0.0;
+	tmp16 += m_A50 * V[25];
+	tmp16 += m_A51 * V[27];
+	V[16] = (RHS16 - tmp16) / m_A49;
+	double tmp15 = 0.0;
+	tmp15 += m_A46 * V[20];
+	V[15] = (RHS15 - tmp15) / m_A45;
+	double tmp14 = 0.0;
+	tmp14 += m_A42 * V[23];
+	V[14] = (RHS14 - tmp14) / m_A41;
+	double tmp13 = 0.0;
+	tmp13 += m_A39 * V[22];
+	tmp13 += m_A40 * V[23];
+	V[13] = (RHS13 - tmp13) / m_A38;
+	double tmp12 = 0.0;
+	tmp12 += m_A36 * V[21];
+	tmp12 += m_A37 * V[22];
+	V[12] = (RHS12 - tmp12) / m_A35;
+	double tmp11 = 0.0;
+	tmp11 += m_A33 * V[19];
+	tmp11 += m_A34 * V[21];
+	V[11] = (RHS11 - tmp11) / m_A32;
+	double tmp10 = 0.0;
+	tmp10 += m_A30 * V[18];
+	tmp10 += m_A31 * V[21];
+	V[10] = (RHS10 - tmp10) / m_A29;
+	double tmp9 = 0.0;
+	tmp9 += m_A26 * V[17];
+	tmp9 += m_A27 * V[19];
+	tmp9 += m_A28 * V[25];
+	V[9] = (RHS9 - tmp9) / m_A25;
+	double tmp8 = 0.0;
+	tmp8 += m_A23 * V[17];
+	tmp8 += m_A24 * V[18];
+	V[8] = (RHS8 - tmp8) / m_A22;
+	double tmp7 = 0.0;
+	tmp7 += m_A20 * V[9];
+	tmp7 += m_A21 * V[17];
+	V[7] = (RHS7 - tmp7) / m_A19;
+	double tmp6 = 0.0;
+	tmp6 += m_A17 * V[7];
+	tmp6 += m_A18 * V[17];
+	V[6] = (RHS6 - tmp6) / m_A16;
+	double tmp5 = 0.0;
+	tmp5 += m_A14 * V[16];
+	tmp5 += m_A15 * V[25];
+	V[5] = (RHS5 - tmp5) / m_A13;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[16];
+	tmp4 += m_A12 * V[27];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[27];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[24];
+	tmp2 += m_A7 * V[28];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[15];
+	tmp1 += m_A4 * V[20];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[15];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// tank
+static void nl_gcr_930b64361c2cdba8_328_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
+	double m_A153(0.0);
+	double m_A154(0.0);
+	double m_A155(0.0);
+	double m_A156(0.0);
+	double m_A157(0.0);
+	double m_A158(0.0);
+	double m_A159(0.0);
+	double m_A160(0.0);
+	double m_A161(0.0);
+	double m_A162(0.0);
+	double m_A163(0.0);
+	double m_A164(0.0);
+	double m_A165(0.0);
+	double m_A166(0.0);
+	double m_A167(0.0);
+	double m_A168(0.0);
+	double m_A169(0.0);
+	double m_A170(0.0);
+	double m_A171(0.0);
+	double m_A172(0.0);
+	double m_A173(0.0);
+	double m_A174(0.0);
+	double m_A175(0.0);
+	double m_A176(0.0);
+	double m_A177(0.0);
+	double m_A178(0.0);
+	double m_A179(0.0);
+	double m_A180(0.0);
+	double m_A181(0.0);
+	double m_A182(0.0);
+	double m_A183(0.0);
+	double m_A184(0.0);
+	double m_A185(0.0);
+	double m_A186(0.0);
+	double m_A187(0.0);
+	double m_A188(0.0);
+	double m_A189(0.0);
+	double m_A190(0.0);
+	double m_A191(0.0);
+	double m_A192(0.0);
+	double m_A193(0.0);
+	double m_A194(0.0);
+	double m_A195(0.0);
+	double m_A196(0.0);
+	double m_A197(0.0);
+	double m_A198(0.0);
+	double m_A199(0.0);
+	double m_A200(0.0);
+	double m_A201(0.0);
+	double m_A202(0.0);
+	double m_A203(0.0);
+	double m_A204(0.0);
+	double m_A205(0.0);
+	double m_A206(0.0);
+	double m_A207(0.0);
+	double m_A208(0.0);
+	double m_A209(0.0);
+	double m_A210(0.0);
+	double m_A211(0.0);
+	double m_A212(0.0);
+	double m_A213(0.0);
+	double m_A214(0.0);
+	double m_A215(0.0);
+	double m_A216(0.0);
+	double m_A217(0.0);
+	double m_A218(0.0);
+	double m_A219(0.0);
+	double m_A220(0.0);
+	double m_A221(0.0);
+	double m_A222(0.0);
+	double m_A223(0.0);
+	double m_A224(0.0);
+	double m_A225(0.0);
+	double m_A226(0.0);
+	double m_A227(0.0);
+	double m_A228(0.0);
+	double m_A229(0.0);
+	double m_A230(0.0);
+	double m_A231(0.0);
+	double m_A232(0.0);
+	double m_A233(0.0);
+	double m_A234(0.0);
+	double m_A235(0.0);
+	double m_A236(0.0);
+	double m_A237(0.0);
+	double m_A238(0.0);
+	double m_A239(0.0);
+	double m_A240(0.0);
+	double m_A241(0.0);
+	double m_A242(0.0);
+	double m_A243(0.0);
+	double m_A244(0.0);
+	double m_A245(0.0);
+	double m_A246(0.0);
+	double m_A247(0.0);
+	double m_A248(0.0);
+	double m_A249(0.0);
+	double m_A250(0.0);
+	double m_A251(0.0);
+	double m_A252(0.0);
+	double m_A253(0.0);
+	double m_A254(0.0);
+	double m_A255(0.0);
+	double m_A256(0.0);
+	double m_A257(0.0);
+	double m_A258(0.0);
+	double m_A259(0.0);
+	double m_A260(0.0);
+	double m_A261(0.0);
+	double m_A262(0.0);
+	double m_A263(0.0);
+	double m_A264(0.0);
+	double m_A265(0.0);
+	double m_A266(0.0);
+	double m_A267(0.0);
+	double m_A268(0.0);
+	double m_A269(0.0);
+	double m_A270(0.0);
+	double m_A271(0.0);
+	double m_A272(0.0);
+	double m_A273(0.0);
+	double m_A274(0.0);
+	double m_A275(0.0);
+	double m_A276(0.0);
+	double m_A277(0.0);
+	double m_A278(0.0);
+	double m_A279(0.0);
+	double m_A280(0.0);
+	double m_A281(0.0);
+	double m_A282(0.0);
+	double m_A283(0.0);
+	double m_A284(0.0);
+	double m_A285(0.0);
+	double m_A286(0.0);
+	double m_A287(0.0);
+	double m_A288(0.0);
+	double m_A289(0.0);
+	double m_A290(0.0);
+	double m_A291(0.0);
+	double m_A292(0.0);
+	double m_A293(0.0);
+	double m_A294(0.0);
+	double m_A295(0.0);
+	double m_A296(0.0);
+	double m_A297(0.0);
+	double m_A298(0.0);
+	double m_A299(0.0);
+	double m_A300(0.0);
+	double m_A301(0.0);
+	double m_A302(0.0);
+	double m_A303(0.0);
+	double m_A304(0.0);
+	double m_A305(0.0);
+	double m_A306(0.0);
+	double m_A307(0.0);
+	double m_A308(0.0);
+	double m_A309(0.0);
+	double m_A310(0.0);
+	double m_A311(0.0);
+	double m_A312(0.0);
+	double m_A313(0.0);
+	double m_A314(0.0);
+	double m_A315(0.0);
+	double m_A316(0.0);
+	double m_A317(0.0);
+	double m_A318(0.0);
+	double m_A319(0.0);
+	double m_A320(0.0);
+	double m_A321(0.0);
+	double m_A322(0.0);
+	double m_A323(0.0);
+	double m_A324(0.0);
+	double m_A325(0.0);
+	double m_A326(0.0);
+	double m_A327(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	m_A1 += go[1];
+	m_A1 += go[2];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[4];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[7] * *cnV[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A9 += go[8];
+	m_A8 += go[9];
+	m_A7 += go[10];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[11] * *cnV[11];
+	m_A10 += gt[12];
+	m_A10 += gt[13];
+	m_A11 += go[12];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 -= go[13] * *cnV[13];
+	m_A12 += gt[14];
+	m_A12 += gt[15];
+	m_A12 += gt[16];
+	m_A14 += go[14];
+	m_A15 += go[15];
+	m_A13 += go[16];
+	double RHS5 = Idr[14];
+	RHS5 += Idr[15];
+	RHS5 += Idr[16];
+	m_A16 += gt[17];
+	m_A16 += gt[18];
+	m_A16 += gt[19];
+	m_A17 += go[17];
+	m_A18 += go[18];
+	double RHS6 = Idr[17];
+	RHS6 += Idr[18];
+	RHS6 += Idr[19];
+	RHS6 -= go[19] * *cnV[19];
+	m_A19 += gt[20];
+	m_A19 += gt[21];
+	m_A19 += gt[22];
+	m_A20 += go[20];
+	double RHS7 = Idr[20];
+	RHS7 += Idr[21];
+	RHS7 += Idr[22];
+	RHS7 -= go[21] * *cnV[21];
+	RHS7 -= go[22] * *cnV[22];
+	m_A21 += gt[23];
+	m_A21 += gt[24];
+	m_A21 += gt[25];
+	m_A21 += gt[26];
+	m_A21 += gt[27];
+	m_A21 += gt[28];
+	m_A21 += gt[29];
+	m_A23 += go[23];
+	m_A24 += go[24];
+	m_A25 += go[25];
+	m_A22 += go[26];
+	double RHS8 = Idr[23];
+	RHS8 += Idr[24];
+	RHS8 += Idr[25];
+	RHS8 += Idr[26];
+	RHS8 += Idr[27];
+	RHS8 += Idr[28];
+	RHS8 += Idr[29];
+	RHS8 -= go[27] * *cnV[27];
+	RHS8 -= go[28] * *cnV[28];
+	RHS8 -= go[29] * *cnV[29];
+	m_A26 += gt[30];
+	m_A26 += gt[31];
+	m_A26 += gt[32];
+	m_A26 += gt[33];
+	m_A26 += gt[34];
+	m_A27 += go[30];
+	m_A27 += go[31];
+	m_A29 += go[32];
+	m_A28 += go[33];
+	double RHS9 = Idr[30];
+	RHS9 += Idr[31];
+	RHS9 += Idr[32];
+	RHS9 += Idr[33];
+	RHS9 += Idr[34];
+	RHS9 -= go[34] * *cnV[34];
+	m_A30 += gt[35];
+	m_A30 += gt[36];
+	m_A30 += gt[37];
+	m_A30 += gt[38];
+	m_A30 += gt[39];
+	m_A30 += gt[40];
+	m_A30 += gt[41];
+	m_A32 += go[35];
+	m_A33 += go[36];
+	m_A34 += go[37];
+	m_A31 += go[38];
+	double RHS10 = Idr[35];
+	RHS10 += Idr[36];
+	RHS10 += Idr[37];
+	RHS10 += Idr[38];
+	RHS10 += Idr[39];
+	RHS10 += Idr[40];
+	RHS10 += Idr[41];
+	RHS10 -= go[39] * *cnV[39];
+	RHS10 -= go[40] * *cnV[40];
+	RHS10 -= go[41] * *cnV[41];
+	m_A35 += gt[42];
+	m_A35 += gt[43];
+	m_A35 += gt[44];
+	m_A36 += go[42];
+	double RHS11 = Idr[42];
+	RHS11 += Idr[43];
+	RHS11 += Idr[44];
+	RHS11 -= go[43] * *cnV[43];
+	RHS11 -= go[44] * *cnV[44];
+	m_A37 += gt[45];
+	m_A37 += gt[46];
+	m_A37 += gt[47];
+	m_A37 += gt[48];
+	m_A37 += gt[49];
+	m_A40 += go[45];
+	m_A39 += go[46];
+	m_A38 += go[47];
+	double RHS12 = Idr[45];
+	RHS12 += Idr[46];
+	RHS12 += Idr[47];
+	RHS12 += Idr[48];
+	RHS12 += Idr[49];
+	RHS12 -= go[48] * *cnV[48];
+	RHS12 -= go[49] * *cnV[49];
+	m_A41 += gt[50];
+	m_A41 += gt[51];
+	m_A41 += gt[52];
+	m_A41 += gt[53];
+	m_A43 += go[50];
+	m_A42 += go[51];
+	double RHS13 = Idr[50];
+	RHS13 += Idr[51];
+	RHS13 += Idr[52];
+	RHS13 += Idr[53];
+	RHS13 -= go[52] * *cnV[52];
+	RHS13 -= go[53] * *cnV[53];
+	m_A44 += gt[54];
+	m_A44 += gt[55];
+	m_A44 += gt[56];
+	m_A45 += go[54];
+	m_A46 += go[55];
+	double RHS14 = Idr[54];
+	RHS14 += Idr[55];
+	RHS14 += Idr[56];
+	RHS14 -= go[56] * *cnV[56];
+	m_A47 += gt[57];
+	m_A47 += gt[58];
+	m_A47 += gt[59];
+	m_A47 += gt[60];
+	m_A48 += go[57];
+	m_A48 += go[58];
+	m_A49 += go[59];
+	double RHS15 = Idr[57];
+	RHS15 += Idr[58];
+	RHS15 += Idr[59];
+	RHS15 += Idr[60];
+	RHS15 -= go[60] * *cnV[60];
+	m_A50 += gt[61];
+	m_A50 += gt[62];
+	m_A51 += go[61];
+	m_A52 += go[62];
+	double RHS16 = Idr[61];
+	RHS16 += Idr[62];
+	m_A53 += gt[63];
+	m_A53 += gt[64];
+	m_A53 += gt[65];
+	m_A54 += go[63];
+	m_A55 += go[64];
+	m_A56 += go[65];
+	double RHS17 = Idr[63];
+	RHS17 += Idr[64];
+	RHS17 += Idr[65];
+	m_A57 += gt[66];
+	m_A57 += gt[67];
+	m_A57 += gt[68];
+	m_A57 += gt[69];
+	m_A59 += go[66];
+	m_A58 += go[67];
+	m_A60 += go[68];
+	double RHS18 = Idr[66];
+	RHS18 += Idr[67];
+	RHS18 += Idr[68];
+	RHS18 += Idr[69];
+	RHS18 -= go[69] * *cnV[69];
+	m_A61 += gt[70];
+	m_A61 += gt[71];
+	m_A61 += gt[72];
+	m_A61 += gt[73];
+	m_A61 += gt[74];
+	m_A61 += gt[75];
+	m_A62 += go[70];
+	m_A66 += go[71];
+	m_A65 += go[72];
+	m_A63 += go[73];
+	m_A64 += go[74];
+	double RHS19 = Idr[70];
+	RHS19 += Idr[71];
+	RHS19 += Idr[72];
+	RHS19 += Idr[73];
+	RHS19 += Idr[74];
+	RHS19 += Idr[75];
+	RHS19 -= go[75] * *cnV[75];
+	m_A67 += gt[76];
+	m_A67 += gt[77];
+	m_A67 += gt[78];
+	m_A67 += gt[79];
+	m_A68 += go[76];
+	m_A70 += go[77];
+	m_A69 += go[78];
+	double RHS20 = Idr[76];
+	RHS20 += Idr[77];
+	RHS20 += Idr[78];
+	RHS20 += Idr[79];
+	RHS20 -= go[79] * *cnV[79];
+	m_A71 += gt[80];
+	m_A71 += gt[81];
+	m_A71 += gt[82];
+	m_A71 += gt[83];
+	m_A73 += go[80];
+	m_A72 += go[81];
+	double RHS21 = Idr[80];
+	RHS21 += Idr[81];
+	RHS21 += Idr[82];
+	RHS21 += Idr[83];
+	RHS21 -= go[82] * *cnV[82];
+	RHS21 -= go[83] * *cnV[83];
+	m_A74 += gt[84];
+	m_A74 += gt[85];
+	m_A74 += gt[86];
+	m_A74 += gt[87];
+	m_A75 += go[84];
+	m_A76 += go[85];
+	double RHS22 = Idr[84];
+	RHS22 += Idr[85];
+	RHS22 += Idr[86];
+	RHS22 += Idr[87];
+	RHS22 -= go[86] * *cnV[86];
+	RHS22 -= go[87] * *cnV[87];
+	m_A78 += gt[88];
+	m_A78 += gt[89];
+	m_A78 += gt[90];
+	m_A77 += go[88];
+	m_A77 += go[89];
+	m_A77 += go[90];
+	double RHS23 = Idr[88];
+	RHS23 += Idr[89];
+	RHS23 += Idr[90];
+	m_A81 += gt[91];
+	m_A81 += gt[92];
+	m_A81 += gt[93];
+	m_A81 += gt[94];
+	m_A80 += go[91];
+	m_A79 += go[92];
+	double RHS24 = Idr[91];
+	RHS24 += Idr[92];
+	RHS24 += Idr[93];
+	RHS24 += Idr[94];
+	RHS24 -= go[93] * *cnV[93];
+	RHS24 -= go[94] * *cnV[94];
+	m_A84 += gt[95];
+	m_A84 += gt[96];
+	m_A84 += gt[97];
+	m_A84 += gt[98];
+	m_A85 += go[95];
+	m_A86 += go[96];
+	double RHS25 = Idr[95];
+	RHS25 += Idr[96];
+	RHS25 += Idr[97];
+	RHS25 += Idr[98];
+	RHS25 -= go[97] * *cnV[97];
+	RHS25 -= go[98] * *cnV[98];
+	m_A89 += gt[99];
+	m_A89 += gt[100];
+	m_A89 += gt[101];
+	m_A87 += go[99];
+	m_A88 += go[100];
+	double RHS26 = Idr[99];
+	RHS26 += Idr[100];
+	RHS26 += Idr[101];
+	RHS26 -= go[101] * *cnV[101];
+	m_A95 += gt[102];
+	m_A95 += gt[103];
+	m_A95 += gt[104];
+	m_A95 += gt[105];
+	m_A93 += go[102];
+	m_A92 += go[103];
+	double RHS27 = Idr[102];
+	RHS27 += Idr[103];
+	RHS27 += Idr[104];
+	RHS27 += Idr[105];
+	RHS27 -= go[104] * *cnV[104];
+	RHS27 -= go[105] * *cnV[105];
+	m_A102 += gt[106];
+	m_A102 += gt[107];
+	m_A102 += gt[108];
+	m_A102 += gt[109];
+	m_A102 += gt[110];
+	m_A102 += gt[111];
+	m_A102 += gt[112];
+	m_A100 += go[106];
+	m_A101 += go[107];
+	m_A101 += go[108];
+	double RHS28 = Idr[106];
+	RHS28 += Idr[107];
+	RHS28 += Idr[108];
+	RHS28 += Idr[109];
+	RHS28 += Idr[110];
+	RHS28 += Idr[111];
+	RHS28 += Idr[112];
+	RHS28 -= go[109] * *cnV[109];
+	RHS28 -= go[110] * *cnV[110];
+	RHS28 -= go[111] * *cnV[111];
+	RHS28 -= go[112] * *cnV[112];
+	m_A107 += gt[113];
+	m_A107 += gt[114];
+	m_A107 += gt[115];
+	m_A108 += go[113];
+	m_A105 += go[114];
+	double RHS29 = Idr[113];
+	RHS29 += Idr[114];
+	RHS29 += Idr[115];
+	RHS29 -= go[115] * *cnV[115];
+	m_A115 += gt[116];
+	m_A115 += gt[117];
+	m_A115 += gt[118];
+	m_A115 += gt[119];
+	m_A110 += go[116];
+	m_A111 += go[117];
+	m_A109 += go[118];
+	double RHS30 = Idr[116];
+	RHS30 += Idr[117];
+	RHS30 += Idr[118];
+	RHS30 += Idr[119];
+	RHS30 -= go[119] * *cnV[119];
+	m_A122 += gt[120];
+	m_A122 += gt[121];
+	m_A122 += gt[122];
+	m_A122 += gt[123];
+	m_A120 += go[120];
+	m_A121 += go[121];
+	m_A123 += go[122];
+	double RHS31 = Idr[120];
+	RHS31 += Idr[121];
+	RHS31 += Idr[122];
+	RHS31 += Idr[123];
+	RHS31 -= go[123] * *cnV[123];
+	m_A128 += gt[124];
+	m_A128 += gt[125];
+	m_A128 += gt[126];
+	m_A128 += gt[127];
+	m_A124 += go[124];
+	m_A125 += go[125];
+	double RHS32 = Idr[124];
+	RHS32 += Idr[125];
+	RHS32 += Idr[126];
+	RHS32 += Idr[127];
+	RHS32 -= go[126] * *cnV[126];
+	RHS32 -= go[127] * *cnV[127];
+	m_A136 += gt[128];
+	m_A136 += gt[129];
+	m_A136 += gt[130];
+	m_A136 += gt[131];
+	m_A141 += go[128];
+	m_A134 += go[129];
+	double RHS33 = Idr[128];
+	RHS33 += Idr[129];
+	RHS33 += Idr[130];
+	RHS33 += Idr[131];
+	RHS33 -= go[130] * *cnV[130];
+	RHS33 -= go[131] * *cnV[131];
+	m_A144 += gt[132];
+	m_A144 += gt[133];
+	m_A144 += gt[134];
+	m_A144 += gt[135];
+	m_A144 += gt[136];
+	m_A144 += gt[137];
+	m_A144 += gt[138];
+	m_A143 += go[132];
+	m_A143 += go[133];
+	m_A142 += go[134];
+	double RHS34 = Idr[132];
+	RHS34 += Idr[133];
+	RHS34 += Idr[134];
+	RHS34 += Idr[135];
+	RHS34 += Idr[136];
+	RHS34 += Idr[137];
+	RHS34 += Idr[138];
+	RHS34 -= go[135] * *cnV[135];
+	RHS34 -= go[136] * *cnV[136];
+	RHS34 -= go[137] * *cnV[137];
+	RHS34 -= go[138] * *cnV[138];
+	m_A148 += gt[139];
+	m_A148 += gt[140];
+	m_A148 += gt[141];
+	m_A148 += gt[142];
+	m_A146 += go[139];
+	m_A150 += go[140];
+	m_A149 += go[141];
+	double RHS35 = Idr[139];
+	RHS35 += Idr[140];
+	RHS35 += Idr[141];
+	RHS35 += Idr[142];
+	RHS35 -= go[142] * *cnV[142];
+	m_A152 += gt[143];
+	m_A152 += gt[144];
+	m_A154 += go[143];
+	m_A151 += go[144];
+	double RHS36 = Idr[143];
+	RHS36 += Idr[144];
+	m_A157 += gt[145];
+	m_A157 += gt[146];
+	m_A157 += gt[147];
+	m_A157 += gt[148];
+	m_A157 += gt[149];
+	m_A157 += gt[150];
+	m_A157 += gt[151];
+	m_A156 += go[145];
+	m_A155 += go[146];
+	double RHS37 = Idr[145];
+	RHS37 += Idr[146];
+	RHS37 += Idr[147];
+	RHS37 += Idr[148];
+	RHS37 += Idr[149];
+	RHS37 += Idr[150];
+	RHS37 += Idr[151];
+	RHS37 -= go[147] * *cnV[147];
+	RHS37 -= go[148] * *cnV[148];
+	RHS37 -= go[149] * *cnV[149];
+	RHS37 -= go[150] * *cnV[150];
+	RHS37 -= go[151] * *cnV[151];
+	m_A166 += gt[152];
+	m_A166 += gt[153];
+	m_A166 += gt[154];
+	m_A166 += gt[155];
+	m_A166 += gt[156];
+	m_A166 += gt[157];
+	m_A166 += gt[158];
+	m_A166 += gt[159];
+	m_A160 += go[152];
+	m_A159 += go[153];
+	m_A168 += go[154];
+	m_A158 += go[155];
+	m_A169 += go[156];
+	double RHS38 = Idr[152];
+	RHS38 += Idr[153];
+	RHS38 += Idr[154];
+	RHS38 += Idr[155];
+	RHS38 += Idr[156];
+	RHS38 += Idr[157];
+	RHS38 += Idr[158];
+	RHS38 += Idr[159];
+	RHS38 -= go[157] * *cnV[157];
+	RHS38 -= go[158] * *cnV[158];
+	RHS38 -= go[159] * *cnV[159];
+	m_A173 += gt[160];
+	m_A173 += gt[161];
+	m_A173 += gt[162];
+	m_A173 += gt[163];
+	m_A171 += go[160];
+	m_A174 += go[161];
+	m_A172 += go[162];
+	double RHS39 = Idr[160];
+	RHS39 += Idr[161];
+	RHS39 += Idr[162];
+	RHS39 += Idr[163];
+	RHS39 -= go[163] * *cnV[163];
+	m_A183 += gt[164];
+	m_A183 += gt[165];
+	m_A183 += gt[166];
+	m_A181 += go[164];
+	m_A180 += go[165];
+	m_A179 += go[166];
+	double RHS40 = Idr[164];
+	RHS40 += Idr[165];
+	RHS40 += Idr[166];
+	m_A189 += gt[167];
+	m_A189 += gt[168];
+	m_A188 += go[167];
+	m_A191 += go[168];
+	double RHS41 = Idr[167];
+	RHS41 += Idr[168];
+	m_A196 += gt[169];
+	m_A196 += gt[170];
+	m_A196 += gt[171];
+	m_A194 += go[169];
+	m_A193 += go[170];
+	m_A192 += go[171];
+	double RHS42 = Idr[169];
+	RHS42 += Idr[170];
+	RHS42 += Idr[171];
+	m_A203 += gt[172];
+	m_A203 += gt[173];
+	m_A203 += gt[174];
+	m_A203 += gt[175];
+	m_A203 += gt[176];
+	m_A203 += gt[177];
+	m_A208 += go[172];
+	m_A206 += go[173];
+	m_A205 += go[174];
+	m_A202 += go[175];
+	m_A204 += go[176];
+	double RHS43 = Idr[172];
+	RHS43 += Idr[173];
+	RHS43 += Idr[174];
+	RHS43 += Idr[175];
+	RHS43 += Idr[176];
+	RHS43 += Idr[177];
+	RHS43 -= go[177] * *cnV[177];
+	m_A213 += gt[178];
+	m_A213 += gt[179];
+	m_A213 += gt[180];
+	m_A213 += gt[181];
+	m_A211 += go[178];
+	m_A210 += go[179];
+	m_A209 += go[180];
+	double RHS44 = Idr[178];
+	RHS44 += Idr[179];
+	RHS44 += Idr[180];
+	RHS44 += Idr[181];
+	RHS44 -= go[181] * *cnV[181];
+	m_A229 += gt[182];
+	m_A229 += gt[183];
+	m_A229 += gt[184];
+	m_A229 += gt[185];
+	m_A229 += gt[186];
+	m_A229 += gt[187];
+	m_A222 += go[182];
+	m_A226 += go[183];
+	m_A219 += go[184];
+	m_A217 += go[185];
+	m_A218 += go[186];
+	double RHS45 = Idr[182];
+	RHS45 += Idr[183];
+	RHS45 += Idr[184];
+	RHS45 += Idr[185];
+	RHS45 += Idr[186];
+	RHS45 += Idr[187];
+	RHS45 -= go[187] * *cnV[187];
+	m_A248 += gt[188];
+	m_A248 += gt[189];
+	m_A248 += gt[190];
+	m_A248 += gt[191];
+	m_A248 += gt[192];
+	m_A248 += gt[193];
+	m_A244 += go[188];
+	m_A236 += go[189];
+	m_A235 += go[190];
+	m_A239 += go[191];
+	m_A234 += go[192];
+	double RHS46 = Idr[188];
+	RHS46 += Idr[189];
+	RHS46 += Idr[190];
+	RHS46 += Idr[191];
+	RHS46 += Idr[192];
+	RHS46 += Idr[193];
+	RHS46 -= go[193] * *cnV[193];
+	m_A254 += gt[194];
+	m_A254 += gt[195];
+	m_A254 += gt[196];
+	m_A253 += go[194];
+	m_A252 += go[195];
+	m_A257 += go[196];
+	double RHS47 = Idr[194];
+	RHS47 += Idr[195];
+	RHS47 += Idr[196];
+	m_A270 += gt[197];
+	m_A270 += gt[198];
+	m_A270 += gt[199];
+	m_A270 += gt[200];
+	m_A261 += go[197];
+	m_A260 += go[198];
+	m_A267 += go[199];
+	m_A259 += go[200];
+	double RHS48 = Idr[197];
+	RHS48 += Idr[198];
+	RHS48 += Idr[199];
+	RHS48 += Idr[200];
+	m_A282 += gt[201];
+	m_A282 += gt[202];
+	m_A282 += gt[203];
+	m_A282 += gt[204];
+	m_A282 += gt[205];
+	m_A282 += gt[206];
+	m_A282 += gt[207];
+	m_A285 += go[201];
+	m_A276 += go[202];
+	m_A278 += go[203];
+	m_A275 += go[204];
+	m_A284 += go[205];
+	double RHS49 = Idr[201];
+	RHS49 += Idr[202];
+	RHS49 += Idr[203];
+	RHS49 += Idr[204];
+	RHS49 += Idr[205];
+	RHS49 += Idr[206];
+	RHS49 += Idr[207];
+	RHS49 -= go[206] * *cnV[206];
+	RHS49 -= go[207] * *cnV[207];
+	m_A294 += gt[208];
+	m_A294 += gt[209];
+	m_A294 += gt[210];
+	m_A294 += gt[211];
+	m_A294 += gt[212];
+	m_A294 += gt[213];
+	m_A294 += gt[214];
+	m_A296 += go[208];
+	m_A286 += go[209];
+	m_A289 += go[210];
+	m_A287 += go[211];
+	m_A295 += go[212];
+	double RHS50 = Idr[208];
+	RHS50 += Idr[209];
+	RHS50 += Idr[210];
+	RHS50 += Idr[211];
+	RHS50 += Idr[212];
+	RHS50 += Idr[213];
+	RHS50 += Idr[214];
+	RHS50 -= go[213] * *cnV[213];
+	RHS50 -= go[214] * *cnV[214];
+	m_A313 += gt[215];
+	m_A313 += gt[216];
+	m_A313 += gt[217];
+	m_A313 += gt[218];
+	m_A313 += gt[219];
+	m_A313 += gt[220];
+	m_A313 += gt[221];
+	m_A313 += gt[222];
+	m_A313 += gt[223];
+	m_A297 += go[215];
+	m_A300 += go[216];
+	m_A312 += go[217];
+	m_A309 += go[218];
+	m_A311 += go[219];
+	m_A298 += go[220];
+	m_A303 += go[221];
+	m_A299 += go[222];
+	m_A301 += go[223];
+	double RHS51 = Idr[215];
+	RHS51 += Idr[216];
+	RHS51 += Idr[217];
+	RHS51 += Idr[218];
+	RHS51 += Idr[219];
+	RHS51 += Idr[220];
+	RHS51 += Idr[221];
+	RHS51 += Idr[222];
+	RHS51 += Idr[223];
+	m_A327 += gt[224];
+	m_A327 += gt[225];
+	m_A327 += gt[226];
+	m_A327 += gt[227];
+	m_A327 += gt[228];
+	m_A327 += gt[229];
+	m_A327 += gt[230];
+	m_A327 += gt[231];
+	m_A316 += go[224];
+	m_A325 += go[225];
+	m_A315 += go[226];
+	m_A324 += go[227];
+	m_A319 += go[228];
+	double RHS52 = Idr[224];
+	RHS52 += Idr[225];
+	RHS52 += Idr[226];
+	RHS52 += Idr[227];
+	RHS52 += Idr[228];
+	RHS52 += Idr[229];
+	RHS52 += Idr[230];
+	RHS52 += Idr[231];
+	RHS52 -= go[229] * *cnV[229];
+	RHS52 -= go[230] * *cnV[230];
+	RHS52 -= go[231] * *cnV[231];
+	const double f0 = 1.0 / m_A0;
+	const double f0_23 = -f0 * m_A77;
+	m_A78 += m_A1 * f0_23;
+	RHS23 += f0_23 * RHS0;
+	const double f0_37 = -f0 * m_A155;
+	m_A156 += m_A1 * f0_37;
+	RHS37 += f0_37 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_24 = -f1 * m_A79;
+	m_A81 += m_A3 * f1_24;
+	RHS24 += f1_24 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_26 = -f2 * m_A87;
+	m_A89 += m_A5 * f2_26;
+	RHS26 += f2_26 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_24 = -f3 * m_A80;
+	m_A81 += m_A7 * f3_24;
+	m_A82 += m_A8 * f3_24;
+	m_A83 += m_A9 * f3_24;
+	RHS24 += f3_24 * RHS3;
+	const double f3_27 = -f3 * m_A92;
+	m_A94 += m_A7 * f3_27;
+	m_A95 += m_A8 * f3_27;
+	m_A96 += m_A9 * f3_27;
+	RHS27 += f3_27 * RHS3;
+	const double f3_30 = -f3 * m_A109;
+	m_A112 += m_A7 * f3_30;
+	m_A113 += m_A8 * f3_30;
+	m_A115 += m_A9 * f3_30;
+	RHS30 += f3_30 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_31 = -f4 * m_A120;
+	m_A122 += m_A11 * f4_31;
+	RHS31 += f4_31 * RHS4;
+	const double f5 = 1.0 / m_A12;
+	const double f5_26 = -f5 * m_A88;
+	m_A89 += m_A13 * f5_26;
+	m_A90 += m_A14 * f5_26;
+	m_A91 += m_A15 * f5_26;
+	RHS26 += f5_26 * RHS5;
+	const double f5_29 = -f5 * m_A105;
+	m_A106 += m_A13 * f5_29;
+	m_A107 += m_A14 * f5_29;
+	m_A108 += m_A15 * f5_29;
+	RHS29 += f5_29 * RHS5;
+	const double f5_46 = -f5 * m_A234;
+	m_A237 += m_A13 * f5_46;
+	m_A239 += m_A14 * f5_46;
+	m_A248 += m_A15 * f5_46;
+	RHS46 += f5_46 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_31 = -f6 * m_A121;
+	m_A122 += m_A17 * f6_31;
+	m_A123 += m_A18 * f6_31;
+	RHS31 += f6_31 * RHS6;
+	const double f6_45 = -f6 * m_A217;
+	m_A222 += m_A17 * f6_45;
+	m_A229 += m_A18 * f6_45;
+	RHS45 += f6_45 * RHS6;
+	const double f7 = 1.0 / m_A19;
+	const double f7_28 = -f7 * m_A100;
+	m_A102 += m_A20 * f7_28;
+	RHS28 += f7_28 * RHS7;
+	const double f8 = 1.0 / m_A21;
+	const double f8_27 = -f8 * m_A93;
+	m_A95 += m_A22 * f8_27;
+	m_A97 += m_A23 * f8_27;
+	m_A98 += m_A24 * f8_27;
+	m_A99 += m_A25 * f8_27;
+	RHS27 += f8_27 * RHS8;
+	const double f8_38 = -f8 * m_A158;
+	m_A161 += m_A22 * f8_38;
+	m_A166 += m_A23 * f8_38;
+	m_A168 += m_A24 * f8_38;
+	m_A169 += m_A25 * f8_38;
+	RHS38 += f8_38 * RHS8;
+	const double f8_45 = -f8 * m_A218;
+	m_A220 += m_A22 * f8_45;
+	m_A226 += m_A23 * f8_45;
+	m_A229 += m_A24 * f8_45;
+	m_A230 += m_A25 * f8_45;
+	RHS45 += f8_45 * RHS8;
+	const double f8_46 = -f8 * m_A235;
+	m_A238 += m_A22 * f8_46;
+	m_A244 += m_A23 * f8_46;
+	m_A247 += m_A24 * f8_46;
+	m_A248 += m_A25 * f8_46;
+	RHS46 += f8_46 * RHS8;
+	const double f9 = 1.0 / m_A26;
+	const double f9_28 = -f9 * m_A101;
+	m_A102 += m_A27 * f9_28;
+	m_A103 += m_A28 * f9_28;
+	m_A104 += m_A29 * f9_28;
+	RHS28 += f9_28 * RHS9;
+	const double f9_30 = -f9 * m_A110;
+	m_A114 += m_A27 * f9_30;
+	m_A115 += m_A28 * f9_30;
+	m_A116 += m_A29 * f9_30;
+	RHS30 += f9_30 * RHS9;
+	const double f9_32 = -f9 * m_A124;
+	m_A126 += m_A27 * f9_32;
+	m_A127 += m_A28 * f9_32;
+	m_A128 += m_A29 * f9_32;
+	RHS32 += f9_32 * RHS9;
+	const double f10 = 1.0 / m_A30;
+	const double f10_30 = -f10 * m_A111;
+	m_A115 += m_A31 * f10_30;
+	m_A117 += m_A32 * f10_30;
+	m_A118 += m_A33 * f10_30;
+	m_A119 += m_A34 * f10_30;
+	RHS30 += f10_30 * RHS10;
+	const double f10_38 = -f10 * m_A159;
+	m_A162 += m_A31 * f10_38;
+	m_A166 += m_A32 * f10_38;
+	m_A168 += m_A33 * f10_38;
+	m_A169 += m_A34 * f10_38;
+	RHS38 += f10_38 * RHS10;
+	const double f10_45 = -f10 * m_A219;
+	m_A221 += m_A31 * f10_45;
+	m_A226 += m_A32 * f10_45;
+	m_A229 += m_A33 * f10_45;
+	m_A230 += m_A34 * f10_45;
+	RHS45 += f10_45 * RHS10;
+	const double f10_46 = -f10 * m_A236;
+	m_A240 += m_A31 * f10_46;
+	m_A244 += m_A32 * f10_46;
+	m_A247 += m_A33 * f10_46;
+	m_A248 += m_A34 * f10_46;
+	RHS46 += f10_46 * RHS10;
+	const double f11 = 1.0 / m_A35;
+	const double f11_34 = -f11 * m_A142;
+	m_A144 += m_A36 * f11_34;
+	RHS34 += f11_34 * RHS11;
+	const double f12 = 1.0 / m_A37;
+	const double f12_32 = -f12 * m_A125;
+	m_A128 += m_A38 * f12_32;
+	m_A129 += m_A39 * f12_32;
+	m_A130 += m_A40 * f12_32;
+	RHS32 += f12_32 * RHS12;
+	const double f12_33 = -f12 * m_A134;
+	m_A135 += m_A38 * f12_33;
+	m_A136 += m_A39 * f12_33;
+	m_A137 += m_A40 * f12_33;
+	RHS33 += f12_33 * RHS12;
+	const double f13 = 1.0 / m_A41;
+	const double f13_36 = -f13 * m_A151;
+	m_A152 += m_A42 * f13_36;
+	m_A153 += m_A43 * f13_36;
+	RHS36 += f13_36 * RHS13;
+	const double f13_44 = -f13 * m_A209;
+	m_A212 += m_A42 * f13_44;
+	m_A213 += m_A43 * f13_44;
+	RHS44 += f13_44 * RHS13;
+	const double f14 = 1.0 / m_A44;
+	const double f14_41 = -f14 * m_A188;
+	m_A189 += m_A45 * f14_41;
+	m_A190 += m_A46 * f14_41;
+	RHS41 += f14_41 * RHS14;
+	const double f14_48 = -f14 * m_A259;
+	m_A265 += m_A45 * f14_48;
+	m_A270 += m_A46 * f14_48;
+	RHS48 += f14_48 * RHS14;
+	const double f15 = 1.0 / m_A47;
+	const double f15_34 = -f15 * m_A143;
+	m_A144 += m_A48 * f15_34;
+	m_A145 += m_A49 * f15_34;
+	RHS34 += f15_34 * RHS15;
+	const double f15_35 = -f15 * m_A146;
+	m_A147 += m_A48 * f15_35;
+	m_A148 += m_A49 * f15_35;
+	RHS35 += f15_35 * RHS15;
+	const double f16 = 1.0 / m_A50;
+	const double f16_39 = -f16 * m_A171;
+	m_A173 += m_A51 * f16_39;
+	m_A177 += m_A52 * f16_39;
+	RHS39 += f16_39 * RHS16;
+	const double f16_51 = -f16 * m_A297;
+	m_A302 += m_A51 * f16_51;
+	m_A313 += m_A52 * f16_51;
+	RHS51 += f16_51 * RHS16;
+	const double f17 = 1.0 / m_A53;
+	const double f17_43 = -f17 * m_A202;
+	m_A203 += m_A54 * f17_43;
+	m_A204 += m_A55 * f17_43;
+	m_A207 += m_A56 * f17_43;
+	RHS43 += f17_43 * RHS17;
+	const double f17_48 = -f17 * m_A260;
+	m_A267 += m_A54 * f17_48;
+	m_A270 += m_A55 * f17_48;
+	m_A273 += m_A56 * f17_48;
+	RHS48 += f17_48 * RHS17;
+	const double f17_51 = -f17 * m_A298;
+	m_A305 += m_A54 * f17_51;
+	m_A310 += m_A55 * f17_51;
+	m_A313 += m_A56 * f17_51;
+	RHS51 += f17_51 * RHS17;
+	const double f18 = 1.0 / m_A57;
+	const double f18_44 = -f18 * m_A210;
+	m_A213 += m_A58 * f18_44;
+	m_A214 += m_A59 * f18_44;
+	m_A216 += m_A60 * f18_44;
+	RHS44 += f18_44 * RHS18;
+	const double f18_49 = -f18 * m_A275;
+	m_A279 += m_A58 * f18_49;
+	m_A282 += m_A59 * f18_49;
+	m_A284 += m_A60 * f18_49;
+	RHS49 += f18_49 * RHS18;
+	const double f18_51 = -f18 * m_A299;
+	m_A306 += m_A58 * f18_51;
+	m_A311 += m_A59 * f18_51;
+	m_A313 += m_A60 * f18_51;
+	RHS51 += f18_51 * RHS18;
+	const double f19 = 1.0 / m_A61;
+	const double f19_39 = -f19 * m_A172;
+	m_A173 += m_A62 * f19_39;
+	m_A174 += m_A63 * f19_39;
+	m_A175 += m_A64 * f19_39;
+	m_A176 += m_A65 * f19_39;
+	m_A178 += m_A66 * f19_39;
+	RHS39 += f19_39 * RHS19;
+	const double f19_47 = -f19 * m_A252;
+	m_A253 += m_A62 * f19_47;
+	m_A254 += m_A63 * f19_47;
+	m_A255 += m_A64 * f19_47;
+	m_A256 += m_A65 * f19_47;
+	m_A258 += m_A66 * f19_47;
+	RHS47 += f19_47 * RHS19;
+	const double f19_49 = -f19 * m_A276;
+	m_A277 += m_A62 * f19_49;
+	m_A280 += m_A63 * f19_49;
+	m_A282 += m_A64 * f19_49;
+	m_A283 += m_A65 * f19_49;
+	m_A285 += m_A66 * f19_49;
+	RHS49 += f19_49 * RHS19;
+	const double f19_50 = -f19 * m_A286;
+	m_A288 += m_A62 * f19_50;
+	m_A291 += m_A63 * f19_50;
+	m_A293 += m_A64 * f19_50;
+	m_A294 += m_A65 * f19_50;
+	m_A296 += m_A66 * f19_50;
+	RHS50 += f19_50 * RHS19;
+	const double f19_52 = -f19 * m_A315;
+	m_A317 += m_A62 * f19_52;
+	m_A322 += m_A63 * f19_52;
+	m_A324 += m_A64 * f19_52;
+	m_A325 += m_A65 * f19_52;
+	m_A327 += m_A66 * f19_52;
+	RHS52 += f19_52 * RHS19;
+	const double f20 = 1.0 / m_A67;
+	const double f20_42 = -f20 * m_A192;
+	m_A196 += m_A68 * f20_42;
+	m_A200 += m_A69 * f20_42;
+	m_A201 += m_A70 * f20_42;
+	RHS42 += f20_42 * RHS20;
+	const double f20_51 = -f20 * m_A300;
+	m_A304 += m_A68 * f20_51;
+	m_A313 += m_A69 * f20_51;
+	m_A314 += m_A70 * f20_51;
+	RHS51 += f20_51 * RHS20;
+	const double f20_52 = -f20 * m_A316;
+	m_A318 += m_A68 * f20_52;
+	m_A326 += m_A69 * f20_52;
+	m_A327 += m_A70 * f20_52;
+	RHS52 += f20_52 * RHS20;
+	const double f21 = 1.0 / m_A71;
+	const double f21_38 = -f21 * m_A160;
+	m_A166 += m_A72 * f21_38;
+	m_A167 += m_A73 * f21_38;
+	RHS38 += f21_38 * RHS21;
+	const double f21_40 = -f21 * m_A179;
+	m_A182 += m_A72 * f21_40;
+	m_A183 += m_A73 * f21_40;
+	RHS40 += f21_40 * RHS21;
+	const double f22 = 1.0 / m_A74;
+	const double f22_40 = -f22 * m_A180;
+	m_A183 += m_A75 * f22_40;
+	m_A184 += m_A76 * f22_40;
+	RHS40 += f22_40 * RHS22;
+	const double f22_42 = -f22 * m_A193;
+	m_A195 += m_A75 * f22_42;
+	m_A196 += m_A76 * f22_42;
+	RHS42 += f22_42 * RHS22;
+	const double f23 = 1.0 / m_A78;
+	const double f23_37 = -f23 * m_A156;
+	RHS37 += f23_37 * RHS23;
+	const double f24 = 1.0 / m_A81;
+	const double f24_27 = -f24 * m_A94;
+	m_A95 += m_A82 * f24_27;
+	m_A96 += m_A83 * f24_27;
+	RHS27 += f24_27 * RHS24;
+	const double f24_30 = -f24 * m_A112;
+	m_A113 += m_A82 * f24_30;
+	m_A115 += m_A83 * f24_30;
+	RHS30 += f24_30 * RHS24;
+	const double f25 = 1.0 / m_A84;
+	const double f25_40 = -f25 * m_A181;
+	m_A183 += m_A85 * f25_40;
+	m_A184 += m_A86 * f25_40;
+	RHS40 += f25_40 * RHS25;
+	const double f25_42 = -f25 * m_A194;
+	m_A195 += m_A85 * f25_42;
+	m_A196 += m_A86 * f25_42;
+	RHS42 += f25_42 * RHS25;
+	const double f26 = 1.0 / m_A89;
+	const double f26_29 = -f26 * m_A106;
+	m_A107 += m_A90 * f26_29;
+	m_A108 += m_A91 * f26_29;
+	RHS29 += f26_29 * RHS26;
+	const double f26_46 = -f26 * m_A237;
+	m_A239 += m_A90 * f26_46;
+	m_A248 += m_A91 * f26_46;
+	RHS46 += f26_46 * RHS26;
+	const double f27 = 1.0 / m_A95;
+	const double f27_30 = -f27 * m_A113;
+	m_A115 += m_A96 * f27_30;
+	m_A117 += m_A97 * f27_30;
+	m_A118 += m_A98 * f27_30;
+	m_A119 += m_A99 * f27_30;
+	RHS30 += f27_30 * RHS27;
+	const double f27_38 = -f27 * m_A161;
+	m_A162 += m_A96 * f27_38;
+	m_A166 += m_A97 * f27_38;
+	m_A168 += m_A98 * f27_38;
+	m_A169 += m_A99 * f27_38;
+	RHS38 += f27_38 * RHS27;
+	const double f27_45 = -f27 * m_A220;
+	m_A221 += m_A96 * f27_45;
+	m_A226 += m_A97 * f27_45;
+	m_A229 += m_A98 * f27_45;
+	m_A230 += m_A99 * f27_45;
+	RHS45 += f27_45 * RHS27;
+	const double f27_46 = -f27 * m_A238;
+	m_A240 += m_A96 * f27_46;
+	m_A244 += m_A97 * f27_46;
+	m_A247 += m_A98 * f27_46;
+	m_A248 += m_A99 * f27_46;
+	RHS46 += f27_46 * RHS27;
+	const double f28 = 1.0 / m_A102;
+	const double f28_30 = -f28 * m_A114;
+	m_A115 += m_A103 * f28_30;
+	m_A116 += m_A104 * f28_30;
+	RHS30 += f28_30 * RHS28;
+	const double f28_32 = -f28 * m_A126;
+	m_A127 += m_A103 * f28_32;
+	m_A128 += m_A104 * f28_32;
+	RHS32 += f28_32 * RHS28;
+	const double f29 = 1.0 / m_A107;
+	const double f29_46 = -f29 * m_A239;
+	m_A248 += m_A108 * f29_46;
+	RHS46 += f29_46 * RHS29;
+	const double f30 = 1.0 / m_A115;
+	const double f30_32 = -f30 * m_A127;
+	m_A128 += m_A116 * f30_32;
+	m_A131 += m_A117 * f30_32;
+	m_A132 += m_A118 * f30_32;
+	m_A133 += m_A119 * f30_32;
+	RHS32 += f30_32 * RHS30;
+	const double f30_38 = -f30 * m_A162;
+	m_A163 += m_A116 * f30_38;
+	m_A166 += m_A117 * f30_38;
+	m_A168 += m_A118 * f30_38;
+	m_A169 += m_A119 * f30_38;
+	RHS38 += f30_38 * RHS30;
+	const double f30_45 = -f30 * m_A221;
+	m_A223 += m_A116 * f30_45;
+	m_A226 += m_A117 * f30_45;
+	m_A229 += m_A118 * f30_45;
+	m_A230 += m_A119 * f30_45;
+	RHS45 += f30_45 * RHS30;
+	const double f30_46 = -f30 * m_A240;
+	m_A241 += m_A116 * f30_46;
+	m_A244 += m_A117 * f30_46;
+	m_A247 += m_A118 * f30_46;
+	m_A248 += m_A119 * f30_46;
+	RHS46 += f30_46 * RHS30;
+	const double f31 = 1.0 / m_A122;
+	const double f31_45 = -f31 * m_A222;
+	m_A229 += m_A123 * f31_45;
+	RHS45 += f31_45 * RHS31;
+	const double f32 = 1.0 / m_A128;
+	const double f32_33 = -f32 * m_A135;
+	m_A136 += m_A129 * f32_33;
+	m_A137 += m_A130 * f32_33;
+	m_A138 += m_A131 * f32_33;
+	m_A139 += m_A132 * f32_33;
+	m_A140 += m_A133 * f32_33;
+	RHS33 += f32_33 * RHS32;
+	const double f32_38 = -f32 * m_A163;
+	m_A164 += m_A129 * f32_38;
+	m_A165 += m_A130 * f32_38;
+	m_A166 += m_A131 * f32_38;
+	m_A168 += m_A132 * f32_38;
+	m_A169 += m_A133 * f32_38;
 	RHS38 += f32_38 * RHS32;
-	const double f33 = 1.0 / m_A123;
-	const double f33_40 = -f33 * m_A163;
-	m_A164 += m_A124 * f33_40;
-	RHS40 += f33_40 * RHS33;
-	const double f34 = 1.0 / m_A126;
-	const double f34_43 = -f34 * m_A192;
-	m_A194 += m_A127 * f34_43;
-	RHS43 += f34_43 * RHS34;
-	const double f35 = 1.0 / m_A129;
-	const double f35_38 = -f35 * m_A147;
-	m_A149 += m_A130 * f35_38;
-	RHS38 += f35_38 * RHS35;
-	const double f36 = 1.0 / m_A133;
-	const double f36_42 = -f36 * m_A178;
-	m_A179 += m_A134 * f36_42;
-	m_A182 += m_A135 * f36_42;
-	RHS42 += f36_42 * RHS36;
-	const double f37 = 1.0 / m_A139;
-	const double f37_38 = -f37 * m_A148;
-	m_A149 += m_A140 * f37_38;
-	m_A151 += m_A141 * f37_38;
+	const double f32_45 = -f32 * m_A223;
+	m_A224 += m_A129 * f32_45;
+	m_A225 += m_A130 * f32_45;
+	m_A226 += m_A131 * f32_45;
+	m_A229 += m_A132 * f32_45;
+	m_A230 += m_A133 * f32_45;
+	RHS45 += f32_45 * RHS32;
+	const double f32_46 = -f32 * m_A241;
+	m_A242 += m_A129 * f32_46;
+	m_A243 += m_A130 * f32_46;
+	m_A244 += m_A131 * f32_46;
+	m_A247 += m_A132 * f32_46;
+	m_A248 += m_A133 * f32_46;
+	RHS46 += f32_46 * RHS32;
+	const double f33 = 1.0 / m_A136;
+	const double f33_38 = -f33 * m_A164;
+	m_A165 += m_A137 * f33_38;
+	m_A166 += m_A138 * f33_38;
+	m_A168 += m_A139 * f33_38;
+	m_A169 += m_A140 * f33_38;
+	m_A170 += m_A141 * f33_38;
+	RHS38 += f33_38 * RHS33;
+	const double f33_45 = -f33 * m_A224;
+	m_A225 += m_A137 * f33_45;
+	m_A226 += m_A138 * f33_45;
+	m_A229 += m_A139 * f33_45;
+	m_A230 += m_A140 * f33_45;
+	m_A231 += m_A141 * f33_45;
+	RHS45 += f33_45 * RHS33;
+	const double f33_46 = -f33 * m_A242;
+	m_A243 += m_A137 * f33_46;
+	m_A244 += m_A138 * f33_46;
+	m_A247 += m_A139 * f33_46;
+	m_A248 += m_A140 * f33_46;
+	m_A249 += m_A141 * f33_46;
+	RHS46 += f33_46 * RHS33;
+	const double f33_48 = -f33 * m_A261;
+	m_A262 += m_A137 * f33_48;
+	m_A263 += m_A138 * f33_48;
+	m_A268 += m_A139 * f33_48;
+	m_A269 += m_A140 * f33_48;
+	m_A270 += m_A141 * f33_48;
+	RHS48 += f33_48 * RHS33;
+	const double f34 = 1.0 / m_A144;
+	const double f34_35 = -f34 * m_A147;
+	m_A148 += m_A145 * f34_35;
+	RHS35 += f34_35 * RHS34;
+	const double f35 = 1.0 / m_A148;
+	const double f35_44 = -f35 * m_A211;
+	m_A213 += m_A149 * f35_44;
+	m_A215 += m_A150 * f35_44;
+	RHS44 += f35_44 * RHS35;
+	const double f35_50 = -f35 * m_A287;
+	m_A290 += m_A149 * f35_50;
+	m_A294 += m_A150 * f35_50;
+	RHS50 += f35_50 * RHS35;
+	const double f36 = 1.0 / m_A152;
+	const double f36_44 = -f36 * m_A212;
+	m_A213 += m_A153 * f36_44;
+	m_A216 += m_A154 * f36_44;
+	RHS44 += f36_44 * RHS36;
+	const double f36_51 = -f36 * m_A301;
+	m_A306 += m_A153 * f36_51;
+	m_A313 += m_A154 * f36_51;
+	RHS51 += f36_51 * RHS36;
+	const double f37 = 1.0 / m_A157;
+	const double f37_38 = -f37 * m_A165;
 	RHS38 += f37_38 * RHS37;
-	const double f37_41 = -f37 * m_A171;
-	m_A172 += m_A140 * f37_41;
-	m_A174 += m_A141 * f37_41;
-	RHS41 += f37_41 * RHS37;
-	const double f38 = 1.0 / m_A149;
-	const double f38_39 = -f38 * m_A156;
-	m_A157 += m_A150 * f38_39;
-	m_A158 += m_A151 * f38_39;
-	m_A159 += m_A152 * f38_39;
-	RHS39 += f38_39 * RHS38;
-	const double f38_41 = -f38 * m_A172;
-	m_A173 += m_A150 * f38_41;
-	m_A174 += m_A151 * f38_41;
-	m_A175 += m_A152 * f38_41;
-	RHS41 += f38_41 * RHS38;
-	const double f38_42 = -f38 * m_A179;
-	m_A180 += m_A150 * f38_42;
-	m_A181 += m_A151 * f38_42;
-	m_A182 += m_A152 * f38_42;
-	RHS42 += f38_42 * RHS38;
-	const double f39 = 1.0 / m_A157;
-	const double f39_41 = -f39 * m_A173;
-	m_A174 += m_A158 * f39_41;
-	m_A175 += m_A159 * f39_41;
-	m_A176 += m_A160 * f39_41;
-	RHS41 += f39_41 * RHS39;
-	const double f39_42 = -f39 * m_A180;
-	m_A181 += m_A158 * f39_42;
-	m_A182 += m_A159 * f39_42;
-	m_A183 += m_A160 * f39_42;
-	RHS42 += f39_42 * RHS39;
-	const double f39_43 = -f39 * m_A193;
-	m_A195 += m_A158 * f39_43;
-	m_A196 += m_A159 * f39_43;
-	m_A197 += m_A160 * f39_43;
-	RHS43 += f39_43 * RHS39;
-	const double f40 = 1.0 / m_A164;
-	const double f40_43 = -f40 * m_A194;
-	m_A197 += m_A165 * f40_43;
-	RHS43 += f40_43 * RHS40;
-	const double f41 = 1.0 / m_A174;
-	const double f41_42 = -f41 * m_A181;
-	m_A182 += m_A175 * f41_42;
-	m_A183 += m_A176 * f41_42;
-	RHS42 += f41_42 * RHS41;
-	const double f41_43 = -f41 * m_A195;
-	m_A196 += m_A175 * f41_43;
-	m_A197 += m_A176 * f41_43;
-	RHS43 += f41_43 * RHS41;
-	const double f42 = 1.0 / m_A182;
-	const double f42_43 = -f42 * m_A196;
-	m_A197 += m_A183 * f42_43;
-	RHS43 += f42_43 * RHS42;
-	V[43] = RHS43 / m_A197;
+	const double f37_45 = -f37 * m_A225;
+	RHS45 += f37_45 * RHS37;
+	const double f37_46 = -f37 * m_A243;
+	RHS46 += f37_46 * RHS37;
+	const double f37_48 = -f37 * m_A262;
+	RHS48 += f37_48 * RHS37;
+	const double f38 = 1.0 / m_A166;
+	const double f38_40 = -f38 * m_A182;
+	m_A183 += m_A167 * f38_40;
+	m_A185 += m_A168 * f38_40;
+	m_A186 += m_A169 * f38_40;
+	m_A187 += m_A170 * f38_40;
+	RHS40 += f38_40 * RHS38;
+	const double f38_45 = -f38 * m_A226;
+	m_A227 += m_A167 * f38_45;
+	m_A229 += m_A168 * f38_45;
+	m_A230 += m_A169 * f38_45;
+	m_A231 += m_A170 * f38_45;
+	RHS45 += f38_45 * RHS38;
+	const double f38_46 = -f38 * m_A244;
+	m_A245 += m_A167 * f38_46;
+	m_A247 += m_A168 * f38_46;
+	m_A248 += m_A169 * f38_46;
+	m_A249 += m_A170 * f38_46;
+	RHS46 += f38_46 * RHS38;
+	const double f38_48 = -f38 * m_A263;
+	m_A264 += m_A167 * f38_48;
+	m_A268 += m_A168 * f38_48;
+	m_A269 += m_A169 * f38_48;
+	m_A270 += m_A170 * f38_48;
+	RHS48 += f38_48 * RHS38;
+	const double f39 = 1.0 / m_A173;
+	const double f39_47 = -f39 * m_A253;
+	m_A254 += m_A174 * f39_47;
+	m_A255 += m_A175 * f39_47;
+	m_A256 += m_A176 * f39_47;
+	m_A257 += m_A177 * f39_47;
+	m_A258 += m_A178 * f39_47;
+	RHS47 += f39_47 * RHS39;
+	const double f39_49 = -f39 * m_A277;
+	m_A280 += m_A174 * f39_49;
+	m_A282 += m_A175 * f39_49;
+	m_A283 += m_A176 * f39_49;
+	m_A284 += m_A177 * f39_49;
+	m_A285 += m_A178 * f39_49;
+	RHS49 += f39_49 * RHS39;
+	const double f39_50 = -f39 * m_A288;
+	m_A291 += m_A174 * f39_50;
+	m_A293 += m_A175 * f39_50;
+	m_A294 += m_A176 * f39_50;
+	m_A295 += m_A177 * f39_50;
+	m_A296 += m_A178 * f39_50;
+	RHS50 += f39_50 * RHS39;
+	const double f39_51 = -f39 * m_A302;
+	m_A309 += m_A174 * f39_51;
+	m_A311 += m_A175 * f39_51;
+	m_A312 += m_A176 * f39_51;
+	m_A313 += m_A177 * f39_51;
+	m_A314 += m_A178 * f39_51;
+	RHS51 += f39_51 * RHS39;
+	const double f39_52 = -f39 * m_A317;
+	m_A322 += m_A174 * f39_52;
+	m_A324 += m_A175 * f39_52;
+	m_A325 += m_A176 * f39_52;
+	m_A326 += m_A177 * f39_52;
+	m_A327 += m_A178 * f39_52;
+	RHS52 += f39_52 * RHS39;
+	const double f40 = 1.0 / m_A183;
+	const double f40_42 = -f40 * m_A195;
+	m_A196 += m_A184 * f40_42;
+	m_A197 += m_A185 * f40_42;
+	m_A198 += m_A186 * f40_42;
+	m_A199 += m_A187 * f40_42;
+	RHS42 += f40_42 * RHS40;
+	const double f40_45 = -f40 * m_A227;
+	m_A228 += m_A184 * f40_45;
+	m_A229 += m_A185 * f40_45;
+	m_A230 += m_A186 * f40_45;
+	m_A231 += m_A187 * f40_45;
+	RHS45 += f40_45 * RHS40;
+	const double f40_46 = -f40 * m_A245;
+	m_A246 += m_A184 * f40_46;
+	m_A247 += m_A185 * f40_46;
+	m_A248 += m_A186 * f40_46;
+	m_A249 += m_A187 * f40_46;
+	RHS46 += f40_46 * RHS40;
+	const double f40_48 = -f40 * m_A264;
+	m_A266 += m_A184 * f40_48;
+	m_A268 += m_A185 * f40_48;
+	m_A269 += m_A186 * f40_48;
+	m_A270 += m_A187 * f40_48;
+	RHS48 += f40_48 * RHS40;
+	const double f41 = 1.0 / m_A189;
+	const double f41_48 = -f41 * m_A265;
+	m_A270 += m_A190 * f41_48;
+	m_A273 += m_A191 * f41_48;
+	RHS48 += f41_48 * RHS41;
+	const double f41_51 = -f41 * m_A303;
+	m_A310 += m_A190 * f41_51;
+	m_A313 += m_A191 * f41_51;
+	RHS51 += f41_51 * RHS41;
+	const double f42 = 1.0 / m_A196;
+	const double f42_45 = -f42 * m_A228;
+	m_A229 += m_A197 * f42_45;
+	m_A230 += m_A198 * f42_45;
+	m_A231 += m_A199 * f42_45;
+	m_A232 += m_A200 * f42_45;
+	m_A233 += m_A201 * f42_45;
+	RHS45 += f42_45 * RHS42;
+	const double f42_46 = -f42 * m_A246;
+	m_A247 += m_A197 * f42_46;
+	m_A248 += m_A198 * f42_46;
+	m_A249 += m_A199 * f42_46;
+	m_A250 += m_A200 * f42_46;
+	m_A251 += m_A201 * f42_46;
+	RHS46 += f42_46 * RHS42;
+	const double f42_48 = -f42 * m_A266;
+	m_A268 += m_A197 * f42_48;
+	m_A269 += m_A198 * f42_48;
+	m_A270 += m_A199 * f42_48;
+	m_A273 += m_A200 * f42_48;
+	m_A274 += m_A201 * f42_48;
+	RHS48 += f42_48 * RHS42;
+	const double f42_51 = -f42 * m_A304;
+	m_A307 += m_A197 * f42_51;
+	m_A308 += m_A198 * f42_51;
+	m_A310 += m_A199 * f42_51;
+	m_A313 += m_A200 * f42_51;
+	m_A314 += m_A201 * f42_51;
+	RHS51 += f42_51 * RHS42;
+	const double f42_52 = -f42 * m_A318;
+	m_A320 += m_A197 * f42_52;
+	m_A321 += m_A198 * f42_52;
+	m_A323 += m_A199 * f42_52;
+	m_A326 += m_A200 * f42_52;
+	m_A327 += m_A201 * f42_52;
+	RHS52 += f42_52 * RHS42;
+	const double f43 = 1.0 / m_A203;
+	const double f43_48 = -f43 * m_A267;
+	m_A270 += m_A204 * f43_48;
+	m_A271 += m_A205 * f43_48;
+	m_A272 += m_A206 * f43_48;
+	m_A273 += m_A207 * f43_48;
+	m_A274 += m_A208 * f43_48;
+	RHS48 += f43_48 * RHS43;
+	const double f43_49 = -f43 * m_A278;
+	m_A281 += m_A204 * f43_49;
+	m_A282 += m_A205 * f43_49;
+	m_A283 += m_A206 * f43_49;
+	m_A284 += m_A207 * f43_49;
+	m_A285 += m_A208 * f43_49;
+	RHS49 += f43_49 * RHS43;
+	const double f43_50 = -f43 * m_A289;
+	m_A292 += m_A204 * f43_50;
+	m_A293 += m_A205 * f43_50;
+	m_A294 += m_A206 * f43_50;
+	m_A295 += m_A207 * f43_50;
+	m_A296 += m_A208 * f43_50;
+	RHS50 += f43_50 * RHS43;
+	const double f43_51 = -f43 * m_A305;
+	m_A310 += m_A204 * f43_51;
+	m_A311 += m_A205 * f43_51;
+	m_A312 += m_A206 * f43_51;
+	m_A313 += m_A207 * f43_51;
+	m_A314 += m_A208 * f43_51;
+	RHS51 += f43_51 * RHS43;
+	const double f43_52 = -f43 * m_A319;
+	m_A323 += m_A204 * f43_52;
+	m_A324 += m_A205 * f43_52;
+	m_A325 += m_A206 * f43_52;
+	m_A326 += m_A207 * f43_52;
+	m_A327 += m_A208 * f43_52;
+	RHS52 += f43_52 * RHS43;
+	const double f44 = 1.0 / m_A213;
+	const double f44_49 = -f44 * m_A279;
+	m_A282 += m_A214 * f44_49;
+	m_A283 += m_A215 * f44_49;
+	m_A284 += m_A216 * f44_49;
+	RHS49 += f44_49 * RHS44;
+	const double f44_50 = -f44 * m_A290;
+	m_A293 += m_A214 * f44_50;
+	m_A294 += m_A215 * f44_50;
+	m_A295 += m_A216 * f44_50;
+	RHS50 += f44_50 * RHS44;
+	const double f44_51 = -f44 * m_A306;
+	m_A311 += m_A214 * f44_51;
+	m_A312 += m_A215 * f44_51;
+	m_A313 += m_A216 * f44_51;
+	RHS51 += f44_51 * RHS44;
+	const double f45 = 1.0 / m_A229;
+	const double f45_46 = -f45 * m_A247;
+	m_A248 += m_A230 * f45_46;
+	m_A249 += m_A231 * f45_46;
+	m_A250 += m_A232 * f45_46;
+	m_A251 += m_A233 * f45_46;
+	RHS46 += f45_46 * RHS45;
+	const double f45_48 = -f45 * m_A268;
+	m_A269 += m_A230 * f45_48;
+	m_A270 += m_A231 * f45_48;
+	m_A273 += m_A232 * f45_48;
+	m_A274 += m_A233 * f45_48;
+	RHS48 += f45_48 * RHS45;
+	const double f45_51 = -f45 * m_A307;
+	m_A308 += m_A230 * f45_51;
+	m_A310 += m_A231 * f45_51;
+	m_A313 += m_A232 * f45_51;
+	m_A314 += m_A233 * f45_51;
+	RHS51 += f45_51 * RHS45;
+	const double f45_52 = -f45 * m_A320;
+	m_A321 += m_A230 * f45_52;
+	m_A323 += m_A231 * f45_52;
+	m_A326 += m_A232 * f45_52;
+	m_A327 += m_A233 * f45_52;
+	RHS52 += f45_52 * RHS45;
+	const double f46 = 1.0 / m_A248;
+	const double f46_48 = -f46 * m_A269;
+	m_A270 += m_A249 * f46_48;
+	m_A273 += m_A250 * f46_48;
+	m_A274 += m_A251 * f46_48;
+	RHS48 += f46_48 * RHS46;
+	const double f46_51 = -f46 * m_A308;
+	m_A310 += m_A249 * f46_51;
+	m_A313 += m_A250 * f46_51;
+	m_A314 += m_A251 * f46_51;
+	RHS51 += f46_51 * RHS46;
+	const double f46_52 = -f46 * m_A321;
+	m_A323 += m_A249 * f46_52;
+	m_A326 += m_A250 * f46_52;
+	m_A327 += m_A251 * f46_52;
+	RHS52 += f46_52 * RHS46;
+	const double f47 = 1.0 / m_A254;
+	const double f47_49 = -f47 * m_A280;
+	m_A282 += m_A255 * f47_49;
+	m_A283 += m_A256 * f47_49;
+	m_A284 += m_A257 * f47_49;
+	m_A285 += m_A258 * f47_49;
+	RHS49 += f47_49 * RHS47;
+	const double f47_50 = -f47 * m_A291;
+	m_A293 += m_A255 * f47_50;
+	m_A294 += m_A256 * f47_50;
+	m_A295 += m_A257 * f47_50;
+	m_A296 += m_A258 * f47_50;
+	RHS50 += f47_50 * RHS47;
+	const double f47_51 = -f47 * m_A309;
+	m_A311 += m_A255 * f47_51;
+	m_A312 += m_A256 * f47_51;
+	m_A313 += m_A257 * f47_51;
+	m_A314 += m_A258 * f47_51;
+	RHS51 += f47_51 * RHS47;
+	const double f47_52 = -f47 * m_A322;
+	m_A324 += m_A255 * f47_52;
+	m_A325 += m_A256 * f47_52;
+	m_A326 += m_A257 * f47_52;
+	m_A327 += m_A258 * f47_52;
+	RHS52 += f47_52 * RHS47;
+	const double f48 = 1.0 / m_A270;
+	const double f48_49 = -f48 * m_A281;
+	m_A282 += m_A271 * f48_49;
+	m_A283 += m_A272 * f48_49;
+	m_A284 += m_A273 * f48_49;
+	m_A285 += m_A274 * f48_49;
+	RHS49 += f48_49 * RHS48;
+	const double f48_50 = -f48 * m_A292;
+	m_A293 += m_A271 * f48_50;
+	m_A294 += m_A272 * f48_50;
+	m_A295 += m_A273 * f48_50;
+	m_A296 += m_A274 * f48_50;
+	RHS50 += f48_50 * RHS48;
+	const double f48_51 = -f48 * m_A310;
+	m_A311 += m_A271 * f48_51;
+	m_A312 += m_A272 * f48_51;
+	m_A313 += m_A273 * f48_51;
+	m_A314 += m_A274 * f48_51;
+	RHS51 += f48_51 * RHS48;
+	const double f48_52 = -f48 * m_A323;
+	m_A324 += m_A271 * f48_52;
+	m_A325 += m_A272 * f48_52;
+	m_A326 += m_A273 * f48_52;
+	m_A327 += m_A274 * f48_52;
+	RHS52 += f48_52 * RHS48;
+	const double f49 = 1.0 / m_A282;
+	const double f49_50 = -f49 * m_A293;
+	m_A294 += m_A283 * f49_50;
+	m_A295 += m_A284 * f49_50;
+	m_A296 += m_A285 * f49_50;
+	RHS50 += f49_50 * RHS49;
+	const double f49_51 = -f49 * m_A311;
+	m_A312 += m_A283 * f49_51;
+	m_A313 += m_A284 * f49_51;
+	m_A314 += m_A285 * f49_51;
+	RHS51 += f49_51 * RHS49;
+	const double f49_52 = -f49 * m_A324;
+	m_A325 += m_A283 * f49_52;
+	m_A326 += m_A284 * f49_52;
+	m_A327 += m_A285 * f49_52;
+	RHS52 += f49_52 * RHS49;
+	const double f50 = 1.0 / m_A294;
+	const double f50_51 = -f50 * m_A312;
+	m_A313 += m_A295 * f50_51;
+	m_A314 += m_A296 * f50_51;
+	RHS51 += f50_51 * RHS50;
+	const double f50_52 = -f50 * m_A325;
+	m_A326 += m_A295 * f50_52;
+	m_A327 += m_A296 * f50_52;
+	RHS52 += f50_52 * RHS50;
+	const double f51 = 1.0 / m_A313;
+	const double f51_52 = -f51 * m_A326;
+	m_A327 += m_A314 * f51_52;
+	RHS52 += f51_52 * RHS51;
+	V[52] = RHS52 / m_A327;
+	double tmp51 = 0.0;
+	tmp51 += m_A314 * V[52];
+	V[51] = (RHS51 - tmp51) / m_A313;
+	double tmp50 = 0.0;
+	tmp50 += m_A295 * V[51];
+	tmp50 += m_A296 * V[52];
+	V[50] = (RHS50 - tmp50) / m_A294;
+	double tmp49 = 0.0;
+	tmp49 += m_A283 * V[50];
+	tmp49 += m_A284 * V[51];
+	tmp49 += m_A285 * V[52];
+	V[49] = (RHS49 - tmp49) / m_A282;
+	double tmp48 = 0.0;
+	tmp48 += m_A271 * V[49];
+	tmp48 += m_A272 * V[50];
+	tmp48 += m_A273 * V[51];
+	tmp48 += m_A274 * V[52];
+	V[48] = (RHS48 - tmp48) / m_A270;
+	double tmp47 = 0.0;
+	tmp47 += m_A255 * V[49];
+	tmp47 += m_A256 * V[50];
+	tmp47 += m_A257 * V[51];
+	tmp47 += m_A258 * V[52];
+	V[47] = (RHS47 - tmp47) / m_A254;
+	double tmp46 = 0.0;
+	tmp46 += m_A249 * V[48];
+	tmp46 += m_A250 * V[51];
+	tmp46 += m_A251 * V[52];
+	V[46] = (RHS46 - tmp46) / m_A248;
+	double tmp45 = 0.0;
+	tmp45 += m_A230 * V[46];
+	tmp45 += m_A231 * V[48];
+	tmp45 += m_A232 * V[51];
+	tmp45 += m_A233 * V[52];
+	V[45] = (RHS45 - tmp45) / m_A229;
+	double tmp44 = 0.0;
+	tmp44 += m_A214 * V[49];
+	tmp44 += m_A215 * V[50];
+	tmp44 += m_A216 * V[51];
+	V[44] = (RHS44 - tmp44) / m_A213;
+	double tmp43 = 0.0;
+	tmp43 += m_A204 * V[48];
+	tmp43 += m_A205 * V[49];
+	tmp43 += m_A206 * V[50];
+	tmp43 += m_A207 * V[51];
+	tmp43 += m_A208 * V[52];
+	V[43] = (RHS43 - tmp43) / m_A203;
 	double tmp42 = 0.0;
-	tmp42 += m_A183 * V[43];
-	V[42] = (RHS42 - tmp42) / m_A182;
+	tmp42 += m_A197 * V[45];
+	tmp42 += m_A198 * V[46];
+	tmp42 += m_A199 * V[48];
+	tmp42 += m_A200 * V[51];
+	tmp42 += m_A201 * V[52];
+	V[42] = (RHS42 - tmp42) / m_A196;
 	double tmp41 = 0.0;
-	tmp41 += m_A175 * V[42];
-	tmp41 += m_A176 * V[43];
-	V[41] = (RHS41 - tmp41) / m_A174;
+	tmp41 += m_A190 * V[48];
+	tmp41 += m_A191 * V[51];
+	V[41] = (RHS41 - tmp41) / m_A189;
 	double tmp40 = 0.0;
-	tmp40 += m_A165 * V[43];
-	V[40] = (RHS40 - tmp40) / m_A164;
-	double tmp39 = 0.0;
-	tmp39 += m_A158 * V[41];
-	tmp39 += m_A159 * V[42];
-	tmp39 += m_A160 * V[43];
-	V[39] = (RHS39 - tmp39) / m_A157;
-	double tmp38 = 0.0;
-	tmp38 += m_A150 * V[39];
-	tmp38 += m_A151 * V[41];
-	tmp38 += m_A152 * V[42];
-	V[38] = (RHS38 - tmp38) / m_A149;
+	tmp40 += m_A184 * V[42];
+	tmp40 += m_A185 * V[45];
+	tmp40 += m_A186 * V[46];
+	tmp40 += m_A187 * V[48];
+	V[40] = (RHS40 - tmp40) / m_A183;
+	double tmp39 = 0.0;
+	tmp39 += m_A174 * V[47];
+	tmp39 += m_A175 * V[49];
+	tmp39 += m_A176 * V[50];
+	tmp39 += m_A177 * V[51];
+	tmp39 += m_A178 * V[52];
+	V[39] = (RHS39 - tmp39) / m_A173;
+	double tmp38 = 0.0;
+	tmp38 += m_A167 * V[40];
+	tmp38 += m_A168 * V[45];
+	tmp38 += m_A169 * V[46];
+	tmp38 += m_A170 * V[48];
+	V[38] = (RHS38 - tmp38) / m_A166;
 	double tmp37 = 0.0;
-	tmp37 += m_A140 * V[38];
-	tmp37 += m_A141 * V[41];
-	V[37] = (RHS37 - tmp37) / m_A139;
+	V[37] = (RHS37 - tmp37) / m_A157;
 	double tmp36 = 0.0;
-	tmp36 += m_A134 * V[38];
-	tmp36 += m_A135 * V[42];
-	V[36] = (RHS36 - tmp36) / m_A133;
+	tmp36 += m_A153 * V[44];
+	tmp36 += m_A154 * V[51];
+	V[36] = (RHS36 - tmp36) / m_A152;
 	double tmp35 = 0.0;
-	tmp35 += m_A130 * V[38];
-	V[35] = (RHS35 - tmp35) / m_A129;
+	tmp35 += m_A149 * V[44];
+	tmp35 += m_A150 * V[50];
+	V[35] = (RHS35 - tmp35) / m_A148;
 	double tmp34 = 0.0;
-	tmp34 += m_A127 * V[40];
-	V[34] = (RHS34 - tmp34) / m_A126;
+	tmp34 += m_A145 * V[35];
+	V[34] = (RHS34 - tmp34) / m_A144;
 	double tmp33 = 0.0;
-	tmp33 += m_A124 * V[40];
-	V[33] = (RHS33 - tmp33) / m_A123;
+	tmp33 += m_A137 * V[37];
+	tmp33 += m_A138 * V[38];
+	tmp33 += m_A139 * V[45];
+	tmp33 += m_A140 * V[46];
+	tmp33 += m_A141 * V[48];
+	V[33] = (RHS33 - tmp33) / m_A136;
 	double tmp32 = 0.0;
-	tmp32 += m_A121 * V[38];
-	V[32] = (RHS32 - tmp32) / m_A120;
+	tmp32 += m_A129 * V[33];
+	tmp32 += m_A130 * V[37];
+	tmp32 += m_A131 * V[38];
+	tmp32 += m_A132 * V[45];
+	tmp32 += m_A133 * V[46];
+	V[32] = (RHS32 - tmp32) / m_A128;
 	double tmp31 = 0.0;
-	tmp31 += m_A117 * V[39];
-	tmp31 += m_A118 * V[43];
-	V[31] = (RHS31 - tmp31) / m_A116;
+	tmp31 += m_A123 * V[45];
+	V[31] = (RHS31 - tmp31) / m_A122;
 	double tmp30 = 0.0;
-	tmp30 += m_A111 * V[41];
-	tmp30 += m_A112 * V[43];
-	V[30] = (RHS30 - tmp30) / m_A110;
+	tmp30 += m_A116 * V[32];
+	tmp30 += m_A117 * V[38];
+	tmp30 += m_A118 * V[45];
+	tmp30 += m_A119 * V[46];
+	V[30] = (RHS30 - tmp30) / m_A115;
 	double tmp29 = 0.0;
-	tmp29 += m_A103 * V[30];
-	tmp29 += m_A104 * V[41];
-	tmp29 += m_A105 * V[43];
-	V[29] = (RHS29 - tmp29) / m_A102;
+	tmp29 += m_A108 * V[46];
+	V[29] = (RHS29 - tmp29) / m_A107;
 	double tmp28 = 0.0;
-	tmp28 += m_A94 * V[29];
-	tmp28 += m_A95 * V[41];
-	tmp28 += m_A96 * V[43];
-	V[28] = (RHS28 - tmp28) / m_A93;
+	tmp28 += m_A103 * V[30];
+	tmp28 += m_A104 * V[32];
+	V[28] = (RHS28 - tmp28) / m_A102;
+	double tmp27 = 0.0;
+	tmp27 += m_A96 * V[30];
+	tmp27 += m_A97 * V[38];
+	tmp27 += m_A98 * V[45];
+	tmp27 += m_A99 * V[46];
+	V[27] = (RHS27 - tmp27) / m_A95;
+	double tmp26 = 0.0;
+	tmp26 += m_A90 * V[29];
+	tmp26 += m_A91 * V[46];
+	V[26] = (RHS26 - tmp26) / m_A89;
+	double tmp25 = 0.0;
+	tmp25 += m_A85 * V[40];
+	tmp25 += m_A86 * V[42];
+	V[25] = (RHS25 - tmp25) / m_A84;
+	double tmp24 = 0.0;
+	tmp24 += m_A82 * V[27];
+	tmp24 += m_A83 * V[30];
+	V[24] = (RHS24 - tmp24) / m_A81;
+	double tmp23 = 0.0;
+	V[23] = (RHS23 - tmp23) / m_A78;
+	double tmp22 = 0.0;
+	tmp22 += m_A75 * V[40];
+	tmp22 += m_A76 * V[42];
+	V[22] = (RHS22 - tmp22) / m_A74;
+	double tmp21 = 0.0;
+	tmp21 += m_A72 * V[38];
+	tmp21 += m_A73 * V[40];
+	V[21] = (RHS21 - tmp21) / m_A71;
+	double tmp20 = 0.0;
+	tmp20 += m_A68 * V[42];
+	tmp20 += m_A69 * V[51];
+	tmp20 += m_A70 * V[52];
+	V[20] = (RHS20 - tmp20) / m_A67;
+	double tmp19 = 0.0;
+	tmp19 += m_A62 * V[39];
+	tmp19 += m_A63 * V[47];
+	tmp19 += m_A64 * V[49];
+	tmp19 += m_A65 * V[50];
+	tmp19 += m_A66 * V[52];
+	V[19] = (RHS19 - tmp19) / m_A61;
+	double tmp18 = 0.0;
+	tmp18 += m_A58 * V[44];
+	tmp18 += m_A59 * V[49];
+	tmp18 += m_A60 * V[51];
+	V[18] = (RHS18 - tmp18) / m_A57;
+	double tmp17 = 0.0;
+	tmp17 += m_A54 * V[43];
+	tmp17 += m_A55 * V[48];
+	tmp17 += m_A56 * V[51];
+	V[17] = (RHS17 - tmp17) / m_A53;
+	double tmp16 = 0.0;
+	tmp16 += m_A51 * V[39];
+	tmp16 += m_A52 * V[51];
+	V[16] = (RHS16 - tmp16) / m_A50;
+	double tmp15 = 0.0;
+	tmp15 += m_A48 * V[34];
+	tmp15 += m_A49 * V[35];
+	V[15] = (RHS15 - tmp15) / m_A47;
+	double tmp14 = 0.0;
+	tmp14 += m_A45 * V[41];
+	tmp14 += m_A46 * V[48];
+	V[14] = (RHS14 - tmp14) / m_A44;
+	double tmp13 = 0.0;
+	tmp13 += m_A42 * V[36];
+	tmp13 += m_A43 * V[44];
+	V[13] = (RHS13 - tmp13) / m_A41;
+	double tmp12 = 0.0;
+	tmp12 += m_A38 * V[32];
+	tmp12 += m_A39 * V[33];
+	tmp12 += m_A40 * V[37];
+	V[12] = (RHS12 - tmp12) / m_A37;
+	double tmp11 = 0.0;
+	tmp11 += m_A36 * V[34];
+	V[11] = (RHS11 - tmp11) / m_A35;
+	double tmp10 = 0.0;
+	tmp10 += m_A31 * V[30];
+	tmp10 += m_A32 * V[38];
+	tmp10 += m_A33 * V[45];
+	tmp10 += m_A34 * V[46];
+	V[10] = (RHS10 - tmp10) / m_A30;
+	double tmp9 = 0.0;
+	tmp9 += m_A27 * V[28];
+	tmp9 += m_A28 * V[30];
+	tmp9 += m_A29 * V[32];
+	V[9] = (RHS9 - tmp9) / m_A26;
+	double tmp8 = 0.0;
+	tmp8 += m_A22 * V[27];
+	tmp8 += m_A23 * V[38];
+	tmp8 += m_A24 * V[45];
+	tmp8 += m_A25 * V[46];
+	V[8] = (RHS8 - tmp8) / m_A21;
+	double tmp7 = 0.0;
+	tmp7 += m_A20 * V[28];
+	V[7] = (RHS7 - tmp7) / m_A19;
+	double tmp6 = 0.0;
+	tmp6 += m_A17 * V[31];
+	tmp6 += m_A18 * V[45];
+	V[6] = (RHS6 - tmp6) / m_A16;
+	double tmp5 = 0.0;
+	tmp5 += m_A13 * V[26];
+	tmp5 += m_A14 * V[29];
+	tmp5 += m_A15 * V[46];
+	V[5] = (RHS5 - tmp5) / m_A12;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[31];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[24];
+	tmp3 += m_A8 * V[27];
+	tmp3 += m_A9 * V[30];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[26];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[24];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[23];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// gamemachine
+static void nl_gcr_934712b55bb3b2b2_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[7] * *cnV[7];
+	m_A9 += gt[8];
+	m_A9 += gt[9];
+	m_A9 += gt[10];
+	m_A9 += gt[11];
+	m_A9 += gt[12];
+	m_A8 += go[8];
+	m_A7 += go[9];
+	m_A6 += go[10];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 -= go[11] * *cnV[11];
+	RHS3 -= go[12] * *cnV[12];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A6;
+	m_A9 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A7;
+	m_A9 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_3 = -f2 * m_A8;
+	m_A9 += m_A5 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// kidniki
+static void nl_gcr_9a5874c8e2da79d2_37_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A2 += go[0];
+	m_A2 += go[1];
+	m_A1 += go[2];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[3] * *cnV[3];
+	m_A3 += gt[4];
+	m_A3 += gt[5];
+	m_A3 += gt[6];
+	m_A5 += go[4];
+	m_A4 += go[5];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A7 += go[7];
+	m_A7 += go[8];
+	m_A8 += go[9];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	m_A9 += gt[14];
+	m_A9 += gt[15];
+	m_A9 += gt[16];
+	m_A11 += go[14];
+	m_A10 += go[15];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 -= go[16] * *cnV[16];
+	m_A14 += gt[17];
+	m_A14 += gt[18];
+	m_A14 += gt[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A13 += go[17];
+	m_A12 += go[18];
+	m_A12 += go[19];
+	double RHS4 = Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	m_A18 += gt[22];
+	m_A18 += gt[23];
+	m_A18 += gt[24];
+	m_A18 += gt[25];
+	m_A18 += gt[26];
+	m_A18 += gt[27];
+	m_A18 += gt[28];
+	m_A20 += go[22];
+	m_A19 += go[23];
+	m_A19 += go[24];
+	m_A19 += go[25];
+	m_A17 += go[26];
+	double RHS5 = Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 += Idr[27];
+	RHS5 += Idr[28];
+	RHS5 -= go[27] * *cnV[27];
+	RHS5 -= go[28] * *cnV[28];
+	m_A23 += gt[29];
+	m_A23 += gt[30];
+	m_A23 += gt[31];
+	m_A23 += gt[32];
+	m_A21 += go[29];
+	double RHS6 = Idr[29];
+	RHS6 += Idr[30];
+	RHS6 += Idr[31];
+	RHS6 += Idr[32];
+	RHS6 -= go[30] * *cnV[30];
+	RHS6 -= go[31] * *cnV[31];
+	RHS6 -= go[32] * *cnV[32];
+	m_A28 += gt[33];
+	m_A28 += gt[34];
+	m_A28 += gt[35];
+	m_A28 += gt[36];
+	m_A28 += gt[37];
+	m_A28 += gt[38];
+	m_A26 += go[33];
+	m_A27 += go[34];
+	m_A27 += go[35];
+	m_A27 += go[36];
+	m_A25 += go[37];
+	m_A25 += go[38];
+	double RHS7 = Idr[33];
+	RHS7 += Idr[34];
+	RHS7 += Idr[35];
+	RHS7 += Idr[36];
+	RHS7 += Idr[37];
+	RHS7 += Idr[38];
+	m_A36 += gt[39];
+	m_A36 += gt[40];
+	m_A36 += gt[41];
+	m_A36 += gt[42];
+	m_A30 += go[39];
+	m_A33 += go[40];
+	m_A31 += go[41];
+	double RHS8 = Idr[39];
+	RHS8 += Idr[40];
+	RHS8 += Idr[41];
+	RHS8 += Idr[42];
+	RHS8 -= go[42] * *cnV[42];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A17;
+	m_A18 += m_A1 * f0_5;
+	m_A19 += m_A2 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f0_7 = -f0 * m_A25;
+	m_A27 += m_A1 * f0_7;
+	m_A28 += m_A2 * f0_7;
+	RHS7 += f0_7 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_7 = -f1 * m_A26;
+	m_A28 += m_A4 * f1_7;
+	m_A29 += m_A5 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f1_8 = -f1 * m_A30;
+	m_A35 += m_A4 * f1_8;
+	m_A36 += m_A5 * f1_8;
+	RHS8 += f1_8 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_4 = -f2 * m_A12;
+	m_A14 += m_A7 * f2_4;
+	m_A16 += m_A8 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_8 = -f2 * m_A31;
+	m_A32 += m_A7 * f2_8;
+	m_A36 += m_A8 * f2_8;
+	RHS8 += f2_8 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_4 = -f3 * m_A13;
+	m_A14 += m_A10 * f3_4;
+	m_A15 += m_A11 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f3_6 = -f3 * m_A21;
+	m_A22 += m_A10 * f3_6;
+	m_A23 += m_A11 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f4 = 1.0 / m_A14;
+	const double f4_6 = -f4 * m_A22;
+	m_A23 += m_A15 * f4_6;
+	m_A24 += m_A16 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f4_8 = -f4 * m_A32;
+	m_A34 += m_A15 * f4_8;
+	m_A36 += m_A16 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f5 = 1.0 / m_A18;
+	const double f5_7 = -f5 * m_A27;
+	m_A28 += m_A19 * f5_7;
+	m_A29 += m_A20 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f5_8 = -f5 * m_A33;
+	m_A35 += m_A19 * f5_8;
+	m_A36 += m_A20 * f5_8;
+	RHS8 += f5_8 * RHS5;
+	const double f6 = 1.0 / m_A23;
+	const double f6_8 = -f6 * m_A34;
+	m_A36 += m_A24 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f7 = 1.0 / m_A28;
+	const double f7_8 = -f7 * m_A35;
+	m_A36 += m_A29 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	V[8] = RHS8 / m_A36;
+	double tmp7 = 0.0;
+	tmp7 += m_A29 * V[8];
+	V[7] = (RHS7 - tmp7) / m_A28;
+	double tmp6 = 0.0;
+	tmp6 += m_A24 * V[8];
+	V[6] = (RHS6 - tmp6) / m_A23;
+	double tmp5 = 0.0;
+	tmp5 += m_A19 * V[7];
+	tmp5 += m_A20 * V[8];
+	V[5] = (RHS5 - tmp5) / m_A18;
+	double tmp4 = 0.0;
+	tmp4 += m_A15 * V[6];
+	tmp4 += m_A16 * V[8];
+	V[4] = (RHS4 - tmp4) / m_A14;
+	double tmp3 = 0.0;
+	tmp3 += m_A10 * V[4];
+	tmp3 += m_A11 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[4];
+	tmp2 += m_A8 * V[8];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A4 * V[7];
+	tmp1 += m_A5 * V[8];
+	V[1] = (RHS1 - tmp1) / m_A3;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[5];
+	tmp0 += m_A2 * V[7];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// fireone
+static void nl_gcr_9aa159329f86ca8b_70_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 -= go[5] * *cnV[5];
+	RHS2 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A7 += go[7];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 += Idr[9];
+	RHS3 -= go[8] * *cnV[8];
+	RHS3 -= go[9] * *cnV[9];
+	m_A8 += gt[10];
+	m_A8 += gt[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A8 += gt[16];
+	m_A9 += go[10];
+	double RHS4 = Idr[10];
+	RHS4 += Idr[11];
+	RHS4 += Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 += Idr[15];
+	RHS4 += Idr[16];
+	RHS4 -= go[11] * *cnV[11];
+	RHS4 -= go[12] * *cnV[12];
+	RHS4 -= go[13] * *cnV[13];
+	RHS4 -= go[14] * *cnV[14];
+	RHS4 -= go[15] * *cnV[15];
+	RHS4 -= go[16] * *cnV[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A11 += go[17];
+	double RHS5 = Idr[17];
+	RHS5 += Idr[18];
+	RHS5 += Idr[19];
+	RHS5 -= go[18] * *cnV[18];
+	RHS5 -= go[19] * *cnV[19];
+	m_A12 += gt[20];
+	m_A12 += gt[21];
+	m_A12 += gt[22];
+	m_A13 += go[20];
+	double RHS6 = Idr[20];
+	RHS6 += Idr[21];
+	RHS6 += Idr[22];
+	RHS6 -= go[21] * *cnV[21];
+	RHS6 -= go[22] * *cnV[22];
+	m_A14 += gt[23];
+	m_A14 += gt[24];
+	m_A14 += gt[25];
+	m_A15 += go[23];
+	double RHS7 = Idr[23];
+	RHS7 += Idr[24];
+	RHS7 += Idr[25];
+	RHS7 -= go[24] * *cnV[24];
+	RHS7 -= go[25] * *cnV[25];
+	m_A16 += gt[26];
+	m_A16 += gt[27];
+	m_A17 += go[26];
+	double RHS8 = Idr[26];
+	RHS8 += Idr[27];
+	RHS8 -= go[27] * *cnV[27];
+	m_A18 += gt[28];
+	m_A18 += gt[29];
+	m_A18 += gt[30];
+	m_A18 += gt[31];
+	m_A18 += gt[32];
+	m_A18 += gt[33];
+	m_A18 += gt[34];
+	m_A20 += go[28];
+	m_A19 += go[29];
+	double RHS9 = Idr[28];
+	RHS9 += Idr[29];
+	RHS9 += Idr[30];
+	RHS9 += Idr[31];
+	RHS9 += Idr[32];
+	RHS9 += Idr[33];
+	RHS9 += Idr[34];
+	RHS9 -= go[30] * *cnV[30];
+	RHS9 -= go[31] * *cnV[31];
+	RHS9 -= go[32] * *cnV[32];
+	RHS9 -= go[33] * *cnV[33];
+	RHS9 -= go[34] * *cnV[34];
+	m_A21 += gt[35];
+	m_A21 += gt[36];
+	m_A21 += gt[37];
+	m_A21 += gt[38];
+	m_A21 += gt[39];
+	m_A21 += gt[40];
+	m_A23 += go[35];
+	m_A22 += go[36];
+	m_A22 += go[37];
+	double RHS10 = Idr[35];
+	RHS10 += Idr[36];
+	RHS10 += Idr[37];
+	RHS10 += Idr[38];
+	RHS10 += Idr[39];
+	RHS10 += Idr[40];
+	RHS10 -= go[38] * *cnV[38];
+	RHS10 -= go[39] * *cnV[39];
+	RHS10 -= go[40] * *cnV[40];
+	m_A25 += gt[41];
+	m_A25 += gt[42];
+	m_A25 += gt[43];
+	m_A24 += go[41];
+	m_A26 += go[42];
+	double RHS11 = Idr[41];
+	RHS11 += Idr[42];
+	RHS11 += Idr[43];
+	RHS11 -= go[43] * *cnV[43];
+	m_A34 += gt[44];
+	m_A34 += gt[45];
+	m_A34 += gt[46];
+	m_A34 += gt[47];
+	m_A34 += gt[48];
+	m_A34 += gt[49];
+	m_A34 += gt[50];
+	m_A34 += gt[51];
+	m_A34 += gt[52];
+	m_A34 += gt[53];
+	m_A33 += go[44];
+	m_A33 += go[45];
+	m_A36 += go[46];
+	m_A32 += go[47];
+	m_A31 += go[48];
+	m_A30 += go[49];
+	m_A29 += go[50];
+	m_A28 += go[51];
+	m_A27 += go[52];
+	double RHS12 = Idr[44];
+	RHS12 += Idr[45];
+	RHS12 += Idr[46];
+	RHS12 += Idr[47];
+	RHS12 += Idr[48];
+	RHS12 += Idr[49];
+	RHS12 += Idr[50];
+	RHS12 += Idr[51];
+	RHS12 += Idr[52];
+	RHS12 += Idr[53];
+	RHS12 -= go[53] * *cnV[53];
+	m_A37 += gt[54];
+	m_A37 += gt[55];
+	m_A37 += gt[56];
+	m_A39 += go[54];
+	m_A38 += go[55];
+	double RHS13 = Idr[54];
+	RHS13 += Idr[55];
+	RHS13 += Idr[56];
+	RHS13 -= go[56] * *cnV[56];
+	m_A40 += gt[57];
+	m_A40 += gt[58];
+	m_A40 += gt[59];
+	m_A40 += gt[60];
+	m_A41 += go[57];
+	m_A42 += go[58];
+	double RHS14 = Idr[57];
+	RHS14 += Idr[58];
+	RHS14 += Idr[59];
+	RHS14 += Idr[60];
+	RHS14 -= go[59] * *cnV[59];
+	RHS14 -= go[60] * *cnV[60];
+	m_A47 += gt[61];
+	m_A47 += gt[62];
+	m_A47 += gt[63];
+	m_A47 += gt[64];
+	m_A47 += gt[65];
+	m_A43 += go[61];
+	m_A44 += go[62];
+	m_A48 += go[63];
+	double RHS15 = Idr[61];
+	RHS15 += Idr[62];
+	RHS15 += Idr[63];
+	RHS15 += Idr[64];
+	RHS15 += Idr[65];
+	RHS15 -= go[64] * *cnV[64];
+	RHS15 -= go[65] * *cnV[65];
+	m_A54 += gt[66];
+	m_A54 += gt[67];
+	m_A54 += gt[68];
+	m_A53 += go[66];
+	m_A51 += go[67];
+	m_A52 += go[68];
+	double RHS16 = Idr[66];
+	RHS16 += Idr[67];
+	RHS16 += Idr[68];
+	m_A62 += gt[69];
+	m_A62 += gt[70];
+	m_A62 += gt[71];
+	m_A62 += gt[72];
+	m_A62 += gt[73];
+	m_A63 += go[69];
+	m_A59 += go[70];
+	m_A57 += go[71];
+	m_A58 += go[72];
+	double RHS17 = Idr[69];
+	RHS17 += Idr[70];
+	RHS17 += Idr[71];
+	RHS17 += Idr[72];
+	RHS17 += Idr[73];
+	RHS17 -= go[73] * *cnV[73];
+	m_A69 += gt[74];
+	m_A69 += gt[75];
+	m_A69 += gt[76];
+	m_A69 += gt[77];
+	m_A69 += gt[78];
+	m_A69 += gt[79];
+	m_A69 += gt[80];
+	m_A69 += gt[81];
+	m_A64 += go[74];
+	m_A66 += go[75];
+	m_A65 += go[76];
+	m_A68 += go[77];
+	double RHS18 = Idr[74];
+	RHS18 += Idr[75];
+	RHS18 += Idr[76];
+	RHS18 += Idr[77];
+	RHS18 += Idr[78];
+	RHS18 += Idr[79];
+	RHS18 += Idr[80];
+	RHS18 += Idr[81];
+	RHS18 -= go[78] * *cnV[78];
+	RHS18 -= go[79] * *cnV[79];
+	RHS18 -= go[80] * *cnV[80];
+	RHS18 -= go[81] * *cnV[81];
+	const double f0 = 1.0 / m_A0;
+	const double f0_12 = -f0 * m_A27;
+	m_A34 += m_A1 * f0_12;
+	RHS12 += f0_12 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_11 = -f1 * m_A24;
+	m_A25 += m_A3 * f1_11;
+	RHS11 += f1_11 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_12 = -f2 * m_A28;
+	m_A34 += m_A5 * f2_12;
+	RHS12 += f2_12 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_12 = -f3 * m_A29;
+	m_A34 += m_A7 * f3_12;
+	RHS12 += f3_12 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_18 = -f4 * m_A64;
+	m_A65 += m_A9 * f4_18;
+	RHS18 += f4_18 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_12 = -f5 * m_A30;
+	m_A34 += m_A11 * f5_12;
+	RHS12 += f5_12 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_12 = -f6 * m_A31;
+	m_A34 += m_A13 * f6_12;
+	RHS12 += f6_12 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_12 = -f7 * m_A32;
+	m_A34 += m_A15 * f7_12;
+	RHS12 += f7_12 * RHS7;
+	const double f8 = 1.0 / m_A16;
+	const double f8_16 = -f8 * m_A51;
+	m_A54 += m_A17 * f8_16;
+	RHS16 += f8_16 * RHS8;
+	const double f9 = 1.0 / m_A18;
+	const double f9_15 = -f9 * m_A43;
+	m_A46 += m_A19 * f9_15;
+	m_A48 += m_A20 * f9_15;
+	RHS15 += f9_15 * RHS9;
+	const double f10 = 1.0 / m_A21;
+	const double f10_12 = -f10 * m_A33;
+	m_A34 += m_A22 * f10_12;
+	m_A35 += m_A23 * f10_12;
+	RHS12 += f10_12 * RHS10;
+	const double f10_15 = -f10 * m_A44;
+	m_A45 += m_A22 * f10_15;
+	m_A47 += m_A23 * f10_15;
+	RHS15 += f10_15 * RHS10;
+	const double f11 = 1.0 / m_A25;
+	const double f11_17 = -f11 * m_A57;
+	m_A62 += m_A26 * f11_17;
+	RHS17 += f11_17 * RHS11;
+	const double f12 = 1.0 / m_A34;
+	const double f12_15 = -f12 * m_A45;
+	m_A47 += m_A35 * f12_15;
+	m_A49 += m_A36 * f12_15;
+	RHS15 += f12_15 * RHS12;
+	const double f12_17 = -f12 * m_A58;
+	m_A60 += m_A35 * f12_17;
+	m_A62 += m_A36 * f12_17;
+	RHS17 += f12_17 * RHS12;
+	const double f13 = 1.0 / m_A37;
+	const double f13_17 = -f13 * m_A59;
+	m_A62 += m_A38 * f13_17;
+	m_A63 += m_A39 * f13_17;
+	RHS17 += f13_17 * RHS13;
+	const double f13_18 = -f13 * m_A65;
+	m_A68 += m_A38 * f13_18;
+	m_A69 += m_A39 * f13_18;
+	RHS18 += f13_18 * RHS13;
+	const double f14 = 1.0 / m_A40;
+	const double f14_15 = -f14 * m_A46;
+	m_A48 += m_A41 * f14_15;
+	m_A50 += m_A42 * f14_15;
+	RHS15 += f14_15 * RHS14;
+	const double f14_16 = -f14 * m_A52;
+	m_A54 += m_A41 * f14_16;
+	m_A56 += m_A42 * f14_16;
+	RHS16 += f14_16 * RHS14;
+	const double f14_18 = -f14 * m_A66;
+	m_A67 += m_A41 * f14_18;
+	m_A69 += m_A42 * f14_18;
+	RHS18 += f14_18 * RHS14;
+	const double f15 = 1.0 / m_A47;
+	const double f15_16 = -f15 * m_A53;
+	m_A54 += m_A48 * f15_16;
+	m_A55 += m_A49 * f15_16;
+	m_A56 += m_A50 * f15_16;
+	RHS16 += f15_16 * RHS15;
+	const double f15_17 = -f15 * m_A60;
+	m_A61 += m_A48 * f15_17;
+	m_A62 += m_A49 * f15_17;
+	m_A63 += m_A50 * f15_17;
+	RHS17 += f15_17 * RHS15;
+	const double f16 = 1.0 / m_A54;
+	const double f16_17 = -f16 * m_A61;
+	m_A62 += m_A55 * f16_17;
+	m_A63 += m_A56 * f16_17;
+	RHS17 += f16_17 * RHS16;
+	const double f16_18 = -f16 * m_A67;
+	m_A68 += m_A55 * f16_18;
+	m_A69 += m_A56 * f16_18;
+	RHS18 += f16_18 * RHS16;
+	const double f17 = 1.0 / m_A62;
+	const double f17_18 = -f17 * m_A68;
+	m_A69 += m_A63 * f17_18;
+	RHS18 += f17_18 * RHS17;
+	V[18] = RHS18 / m_A69;
+	double tmp17 = 0.0;
+	tmp17 += m_A63 * V[18];
+	V[17] = (RHS17 - tmp17) / m_A62;
+	double tmp16 = 0.0;
+	tmp16 += m_A55 * V[17];
+	tmp16 += m_A56 * V[18];
+	V[16] = (RHS16 - tmp16) / m_A54;
+	double tmp15 = 0.0;
+	tmp15 += m_A48 * V[16];
+	tmp15 += m_A49 * V[17];
+	tmp15 += m_A50 * V[18];
+	V[15] = (RHS15 - tmp15) / m_A47;
+	double tmp14 = 0.0;
+	tmp14 += m_A41 * V[16];
+	tmp14 += m_A42 * V[18];
+	V[14] = (RHS14 - tmp14) / m_A40;
+	double tmp13 = 0.0;
+	tmp13 += m_A38 * V[17];
+	tmp13 += m_A39 * V[18];
+	V[13] = (RHS13 - tmp13) / m_A37;
+	double tmp12 = 0.0;
+	tmp12 += m_A35 * V[15];
+	tmp12 += m_A36 * V[17];
+	V[12] = (RHS12 - tmp12) / m_A34;
+	double tmp11 = 0.0;
+	tmp11 += m_A26 * V[17];
+	V[11] = (RHS11 - tmp11) / m_A25;
+	double tmp10 = 0.0;
+	tmp10 += m_A22 * V[12];
+	tmp10 += m_A23 * V[15];
+	V[10] = (RHS10 - tmp10) / m_A21;
+	double tmp9 = 0.0;
+	tmp9 += m_A19 * V[14];
+	tmp9 += m_A20 * V[16];
+	V[9] = (RHS9 - tmp9) / m_A18;
+	double tmp8 = 0.0;
+	tmp8 += m_A17 * V[16];
+	V[8] = (RHS8 - tmp8) / m_A16;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[12];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[12];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[12];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[13];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[12];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[12];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[11];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[12];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// warrior
+static void nl_gcr_9c975530a1a529d6_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	m_A6 += gt[3];
+	m_A6 += gt[4];
+	m_A5 += go[3];
+	m_A4 += go[4];
+	double RHS2 = Idr[3];
+	RHS2 += Idr[4];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// kidniki
+static void nl_gcr_9f141889c2091efc_24_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A3 += go[7];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 -= go[8] * *cnV[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A5 += go[9];
+	double RHS2 = Idr[9];
+	RHS2 += Idr[10];
+	RHS2 -= go[10] * *cnV[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A7 += go[11];
+	double RHS3 = Idr[11];
+	RHS3 += Idr[12];
+	RHS3 -= go[12] * *cnV[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A10 += go[13];
+	m_A9 += go[14];
+	double RHS4 = Idr[13];
+	RHS4 += Idr[14];
+	RHS4 += Idr[15];
+	RHS4 -= go[15] * *cnV[15];
+	m_A11 += gt[16];
+	m_A11 += gt[17];
+	m_A11 += gt[18];
+	m_A12 += go[16];
+	double RHS5 = Idr[16];
+	RHS5 += Idr[17];
+	RHS5 += Idr[18];
+	RHS5 -= go[17] * *cnV[17];
+	RHS5 -= go[18] * *cnV[18];
+	m_A18 += gt[19];
+	m_A18 += gt[20];
+	m_A18 += gt[21];
+	m_A18 += gt[22];
+	m_A18 += gt[23];
+	m_A16 += go[19];
+	m_A15 += go[20];
+	m_A14 += go[21];
+	m_A17 += go[22];
+	m_A13 += go[23];
+	double RHS6 = Idr[19];
+	RHS6 += Idr[20];
+	RHS6 += Idr[21];
+	RHS6 += Idr[22];
+	RHS6 += Idr[23];
+	m_A23 += gt[24];
+	m_A23 += gt[25];
+	m_A21 += go[24];
+	m_A20 += go[25];
+	double RHS7 = Idr[24];
+	RHS7 += Idr[25];
+	const double f0 = 1.0 / m_A0;
+	const double f0_6 = -f0 * m_A13;
+	m_A18 += m_A1 * f0_6;
+	RHS6 += f0_6 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_6 = -f1 * m_A14;
+	m_A18 += m_A3 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_6 = -f2 * m_A15;
+	m_A18 += m_A5 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_6 = -f3 * m_A16;
+	m_A18 += m_A7 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_6 = -f4 * m_A17;
+	m_A18 += m_A9 * f4_6;
+	m_A19 += m_A10 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f4_7 = -f4 * m_A20;
+	m_A22 += m_A9 * f4_7;
+	m_A23 += m_A10 * f4_7;
+	RHS7 += f4_7 * RHS4;
+	const double f5 = 1.0 / m_A11;
+	const double f5_7 = -f5 * m_A21;
+	m_A23 += m_A12 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f6 = 1.0 / m_A18;
+	const double f6_7 = -f6 * m_A22;
+	m_A23 += m_A19 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	V[7] = RHS7 / m_A23;
+	double tmp6 = 0.0;
+	tmp6 += m_A19 * V[7];
+	V[6] = (RHS6 - tmp6) / m_A18;
+	double tmp5 = 0.0;
+	tmp5 += m_A12 * V[7];
+	V[5] = (RHS5 - tmp5) / m_A11;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[6];
+	tmp4 += m_A10 * V[7];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[6];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[6];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// segas16b_audio
+static void nl_gcr_9f7104c5e25c87dd_111_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A8 += go[9];
+	m_A7 += go[10];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[11] * *cnV[11];
+	m_A9 += gt[12];
+	m_A9 += gt[13];
+	m_A9 += gt[14];
+	m_A12 += go[12];
+	m_A10 += go[13];
+	m_A11 += go[14];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	m_A13 += gt[15];
+	m_A13 += gt[16];
+	m_A13 += gt[17];
+	m_A13 += gt[18];
+	m_A13 += gt[19];
+	m_A13 += gt[20];
+	m_A13 += gt[21];
+	m_A15 += go[15];
+	m_A14 += go[16];
+	double RHS5 = Idr[15];
+	RHS5 += Idr[16];
+	RHS5 += Idr[17];
+	RHS5 += Idr[18];
+	RHS5 += Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 -= go[17] * *cnV[17];
+	RHS5 -= go[18] * *cnV[18];
+	RHS5 -= go[19] * *cnV[19];
+	RHS5 -= go[20] * *cnV[20];
+	RHS5 -= go[21] * *cnV[21];
+	m_A16 += gt[22];
+	m_A16 += gt[23];
+	m_A17 += go[22];
+	m_A18 += go[23];
+	double RHS6 = Idr[22];
+	RHS6 += Idr[23];
+	m_A19 += gt[24];
+	m_A19 += gt[25];
+	m_A20 += go[24];
+	m_A21 += go[25];
+	double RHS7 = Idr[24];
+	RHS7 += Idr[25];
+	m_A22 += gt[26];
+	m_A22 += gt[27];
+	m_A23 += go[26];
+	m_A24 += go[27];
+	double RHS8 = Idr[26];
+	RHS8 += Idr[27];
+	m_A25 += gt[28];
+	m_A25 += gt[29];
+	m_A26 += go[28];
+	m_A27 += go[29];
+	double RHS9 = Idr[28];
+	RHS9 += Idr[29];
+	m_A28 += gt[30];
+	m_A28 += gt[31];
+	m_A29 += go[30];
+	double RHS10 = Idr[30];
+	RHS10 += Idr[31];
+	RHS10 -= go[31] * *cnV[31];
+	m_A30 += gt[32];
+	m_A30 += gt[33];
+	m_A30 += gt[34];
+	m_A30 += gt[35];
+	m_A31 += go[32];
+	double RHS11 = Idr[32];
+	RHS11 += Idr[33];
+	RHS11 += Idr[34];
+	RHS11 += Idr[35];
+	RHS11 -= go[33] * *cnV[33];
+	RHS11 -= go[34] * *cnV[34];
+	RHS11 -= go[35] * *cnV[35];
+	m_A34 += gt[36];
+	m_A34 += gt[37];
+	m_A34 += gt[38];
+	m_A33 += go[36];
+	m_A32 += go[37];
+	double RHS12 = Idr[36];
+	RHS12 += Idr[37];
+	RHS12 += Idr[38];
+	RHS12 -= go[38] * *cnV[38];
+	m_A37 += gt[39];
+	m_A37 += gt[40];
+	m_A37 += gt[41];
+	m_A37 += gt[42];
+	m_A37 += gt[43];
+	m_A37 += gt[44];
+	m_A37 += gt[45];
+	m_A38 += go[39];
+	m_A36 += go[40];
+	double RHS13 = Idr[39];
+	RHS13 += Idr[40];
+	RHS13 += Idr[41];
+	RHS13 += Idr[42];
+	RHS13 += Idr[43];
+	RHS13 += Idr[44];
+	RHS13 += Idr[45];
+	RHS13 -= go[41] * *cnV[41];
+	RHS13 -= go[42] * *cnV[42];
+	RHS13 -= go[43] * *cnV[43];
+	RHS13 -= go[44] * *cnV[44];
+	RHS13 -= go[45] * *cnV[45];
+	m_A40 += gt[46];
+	m_A40 += gt[47];
+	m_A40 += gt[48];
+	m_A40 += gt[49];
+	m_A40 += gt[50];
+	m_A40 += gt[51];
+	m_A40 += gt[52];
+	m_A41 += go[46];
+	m_A39 += go[47];
+	double RHS14 = Idr[46];
+	RHS14 += Idr[47];
+	RHS14 += Idr[48];
+	RHS14 += Idr[49];
+	RHS14 += Idr[50];
+	RHS14 += Idr[51];
+	RHS14 += Idr[52];
+	RHS14 -= go[48] * *cnV[48];
+	RHS14 -= go[49] * *cnV[49];
+	RHS14 -= go[50] * *cnV[50];
+	RHS14 -= go[51] * *cnV[51];
+	RHS14 -= go[52] * *cnV[52];
+	m_A44 += gt[53];
+	m_A44 += gt[54];
+	m_A44 += gt[55];
+	m_A44 += gt[56];
+	m_A45 += go[53];
+	m_A43 += go[54];
+	m_A42 += go[55];
+	double RHS15 = Idr[53];
+	RHS15 += Idr[54];
+	RHS15 += Idr[55];
+	RHS15 += Idr[56];
+	RHS15 -= go[56] * *cnV[56];
+	m_A48 += gt[57];
+	m_A48 += gt[58];
+	m_A48 += gt[59];
+	m_A48 += gt[60];
+	m_A48 += gt[61];
+	m_A48 += gt[62];
+	m_A48 += gt[63];
+	m_A49 += go[57];
+	m_A46 += go[58];
+	double RHS16 = Idr[57];
+	RHS16 += Idr[58];
+	RHS16 += Idr[59];
+	RHS16 += Idr[60];
+	RHS16 += Idr[61];
+	RHS16 += Idr[62];
+	RHS16 += Idr[63];
+	RHS16 -= go[59] * *cnV[59];
+	RHS16 -= go[60] * *cnV[60];
+	RHS16 -= go[61] * *cnV[61];
+	RHS16 -= go[62] * *cnV[62];
+	RHS16 -= go[63] * *cnV[63];
+	m_A51 += gt[64];
+	m_A51 += gt[65];
+	m_A51 += gt[66];
+	m_A53 += go[64];
+	m_A50 += go[65];
+	double RHS17 = Idr[64];
+	RHS17 += Idr[65];
+	RHS17 += Idr[66];
+	RHS17 -= go[66] * *cnV[66];
+	m_A58 += gt[67];
+	m_A58 += gt[68];
+	m_A58 += gt[69];
+	m_A58 += gt[70];
+	m_A58 += gt[71];
+	m_A58 += gt[72];
+	m_A57 += go[67];
+	m_A62 += go[68];
+	m_A62 += go[69];
+	m_A56 += go[70];
+	m_A55 += go[71];
+	m_A54 += go[72];
+	double RHS18 = Idr[67];
+	RHS18 += Idr[68];
+	RHS18 += Idr[69];
+	RHS18 += Idr[70];
+	RHS18 += Idr[71];
+	RHS18 += Idr[72];
+	m_A67 += gt[73];
+	m_A67 += gt[74];
+	m_A67 += gt[75];
+	m_A67 += gt[76];
+	m_A67 += gt[77];
+	m_A65 += go[73];
+	m_A64 += go[74];
+	m_A63 += go[75];
+	double RHS19 = Idr[73];
+	RHS19 += Idr[74];
+	RHS19 += Idr[75];
+	RHS19 += Idr[76];
+	RHS19 += Idr[77];
+	RHS19 -= go[76] * *cnV[76];
+	RHS19 -= go[77] * *cnV[77];
+	m_A76 += gt[78];
+	m_A76 += gt[79];
+	m_A76 += gt[80];
+	m_A76 += gt[81];
+	m_A76 += gt[82];
+	m_A73 += go[78];
+	m_A72 += go[79];
+	m_A71 += go[80];
+	double RHS20 = Idr[78];
+	RHS20 += Idr[79];
+	RHS20 += Idr[80];
+	RHS20 += Idr[81];
+	RHS20 += Idr[82];
+	RHS20 -= go[81] * *cnV[81];
+	RHS20 -= go[82] * *cnV[82];
+	m_A84 += gt[83];
+	m_A84 += gt[84];
+	m_A84 += gt[85];
+	m_A84 += gt[86];
+	m_A84 += gt[87];
+	m_A84 += gt[88];
+	m_A82 += go[83];
+	m_A80 += go[84];
+	m_A79 += go[85];
+	m_A81 += go[86];
+	double RHS21 = Idr[83];
+	RHS21 += Idr[84];
+	RHS21 += Idr[85];
+	RHS21 += Idr[86];
+	RHS21 += Idr[87];
+	RHS21 += Idr[88];
+	RHS21 -= go[87] * *cnV[87];
+	RHS21 -= go[88] * *cnV[88];
+	m_A94 += gt[89];
+	m_A94 += gt[90];
+	m_A94 += gt[91];
+	m_A94 += gt[92];
+	m_A94 += gt[93];
+	m_A94 += gt[94];
+	m_A87 += go[89];
+	m_A88 += go[90];
+	m_A89 += go[91];
+	m_A86 += go[92];
+	double RHS22 = Idr[89];
+	RHS22 += Idr[90];
+	RHS22 += Idr[91];
+	RHS22 += Idr[92];
+	RHS22 += Idr[93];
+	RHS22 += Idr[94];
+	RHS22 -= go[93] * *cnV[93];
+	RHS22 -= go[94] * *cnV[94];
+	m_A101 += gt[95];
+	m_A101 += gt[96];
+	m_A101 += gt[97];
+	m_A101 += gt[98];
+	m_A101 += gt[99];
+	m_A101 += gt[100];
+	m_A101 += gt[101];
+	m_A96 += go[95];
+	m_A97 += go[96];
+	double RHS23 = Idr[95];
+	RHS23 += Idr[96];
+	RHS23 += Idr[97];
+	RHS23 += Idr[98];
+	RHS23 += Idr[99];
+	RHS23 += Idr[100];
+	RHS23 += Idr[101];
+	RHS23 -= go[97] * *cnV[97];
+	RHS23 -= go[98] * *cnV[98];
+	RHS23 -= go[99] * *cnV[99];
+	RHS23 -= go[100] * *cnV[100];
+	RHS23 -= go[101] * *cnV[101];
+	m_A110 += gt[102];
+	m_A110 += gt[103];
+	m_A110 += gt[104];
+	m_A110 += gt[105];
+	m_A110 += gt[106];
+	m_A110 += gt[107];
+	m_A109 += go[102];
+	m_A103 += go[103];
+	m_A105 += go[104];
+	m_A105 += go[105];
+	double RHS24 = Idr[102];
+	RHS24 += Idr[103];
+	RHS24 += Idr[104];
+	RHS24 += Idr[105];
+	RHS24 += Idr[106];
+	RHS24 += Idr[107];
+	RHS24 -= go[106] * *cnV[106];
+	RHS24 -= go[107] * *cnV[107];
+	const double f0 = 1.0 / m_A0;
+	const double f0_13 = -f0 * m_A36;
+	m_A38 += m_A1 * f0_13;
+	RHS13 += f0_13 * RHS0;
+	const double f0_19 = -f0 * m_A63;
+	m_A67 += m_A1 * f0_19;
+	RHS19 += f0_19 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_14 = -f1 * m_A39;
+	m_A41 += m_A3 * f1_14;
+	RHS14 += f1_14 * RHS1;
+	const double f1_20 = -f1 * m_A71;
+	m_A76 += m_A3 * f1_20;
+	RHS20 += f1_20 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_15 = -f2 * m_A42;
+	m_A44 += m_A5 * f2_15;
+	RHS15 += f2_15 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_15 = -f3 * m_A43;
+	m_A44 += m_A7 * f3_15;
+	m_A45 += m_A8 * f3_15;
+	RHS15 += f3_15 * RHS3;
+	const double f3_16 = -f3 * m_A46;
+	m_A47 += m_A7 * f3_16;
+	m_A49 += m_A8 * f3_16;
+	RHS16 += f3_16 * RHS3;
+	const double f3_21 = -f3 * m_A79;
+	m_A81 += m_A7 * f3_21;
+	m_A84 += m_A8 * f3_21;
+	RHS21 += f3_21 * RHS3;
+	const double f4 = 1.0 / m_A9;
+	const double f4_17 = -f4 * m_A50;
+	m_A51 += m_A10 * f4_17;
+	m_A52 += m_A11 * f4_17;
+	m_A53 += m_A12 * f4_17;
+	RHS17 += f4_17 * RHS4;
+	const double f4_21 = -f4 * m_A80;
+	m_A83 += m_A10 * f4_21;
+	m_A84 += m_A11 * f4_21;
+	m_A85 += m_A12 * f4_21;
+	RHS21 += f4_21 * RHS4;
+	const double f4_22 = -f4 * m_A86;
+	m_A89 += m_A10 * f4_22;
+	m_A93 += m_A11 * f4_22;
+	m_A94 += m_A12 * f4_22;
+	RHS22 += f4_22 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_22 = -f5 * m_A87;
+	m_A89 += m_A14 * f5_22;
+	m_A94 += m_A15 * f5_22;
+	RHS22 += f5_22 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_18 = -f6 * m_A54;
+	m_A58 += m_A17 * f6_18;
+	m_A61 += m_A18 * f6_18;
+	RHS18 += f6_18 * RHS6;
+	const double f6_22 = -f6 * m_A88;
+	m_A90 += m_A17 * f6_22;
+	m_A94 += m_A18 * f6_22;
+	RHS22 += f6_22 * RHS6;
+	const double f7 = 1.0 / m_A19;
+	const double f7_18 = -f7 * m_A55;
+	m_A58 += m_A20 * f7_18;
+	m_A59 += m_A21 * f7_18;
+	RHS18 += f7_18 * RHS7;
+	const double f7_19 = -f7 * m_A64;
+	m_A66 += m_A20 * f7_19;
+	m_A67 += m_A21 * f7_19;
+	RHS19 += f7_19 * RHS7;
+	const double f8 = 1.0 / m_A22;
+	const double f8_18 = -f8 * m_A56;
+	m_A58 += m_A23 * f8_18;
+	m_A60 += m_A24 * f8_18;
+	RHS18 += f8_18 * RHS8;
+	const double f8_20 = -f8 * m_A72;
+	m_A74 += m_A23 * f8_20;
+	m_A76 += m_A24 * f8_20;
+	RHS20 += f8_20 * RHS8;
+	const double f9 = 1.0 / m_A25;
+	const double f9_12 = -f9 * m_A32;
+	m_A34 += m_A26 * f9_12;
+	m_A35 += m_A27 * f9_12;
+	RHS12 += f9_12 * RHS9;
+	const double f9_24 = -f9 * m_A103;
+	m_A104 += m_A26 * f9_24;
+	m_A110 += m_A27 * f9_24;
+	RHS24 += f9_24 * RHS9;
+	const double f10 = 1.0 / m_A28;
+	const double f10_12 = -f10 * m_A33;
+	m_A34 += m_A29 * f10_12;
+	RHS12 += f10_12 * RHS10;
+	const double f11 = 1.0 / m_A30;
+	const double f11_18 = -f11 * m_A57;
+	m_A58 += m_A31 * f11_18;
+	RHS18 += f11_18 * RHS11;
+	const double f11_23 = -f11 * m_A96;
+	m_A97 += m_A31 * f11_23;
+	RHS23 += f11_23 * RHS11;
+	const double f12 = 1.0 / m_A34;
+	const double f12_24 = -f12 * m_A104;
+	m_A110 += m_A35 * f12_24;
+	RHS24 += f12_24 * RHS12;
+	const double f13 = 1.0 / m_A37;
+	const double f13_19 = -f13 * m_A65;
+	m_A67 += m_A38 * f13_19;
+	RHS19 += f13_19 * RHS13;
+	const double f14 = 1.0 / m_A40;
+	const double f14_20 = -f14 * m_A73;
+	m_A76 += m_A41 * f14_20;
+	RHS20 += f14_20 * RHS14;
+	const double f15 = 1.0 / m_A44;
+	const double f15_16 = -f15 * m_A47;
+	m_A49 += m_A45 * f15_16;
+	RHS16 += f15_16 * RHS15;
+	const double f15_21 = -f15 * m_A81;
+	m_A84 += m_A45 * f15_21;
+	RHS21 += f15_21 * RHS15;
+	const double f16 = 1.0 / m_A48;
+	const double f16_21 = -f16 * m_A82;
+	m_A84 += m_A49 * f16_21;
+	RHS21 += f16_21 * RHS16;
+	const double f17 = 1.0 / m_A51;
+	const double f17_21 = -f17 * m_A83;
+	m_A84 += m_A52 * f17_21;
+	m_A85 += m_A53 * f17_21;
+	RHS21 += f17_21 * RHS17;
+	const double f17_22 = -f17 * m_A89;
+	m_A93 += m_A52 * f17_22;
+	m_A94 += m_A53 * f17_22;
+	RHS22 += f17_22 * RHS17;
+	const double f18 = 1.0 / m_A58;
+	const double f18_19 = -f18 * m_A66;
+	m_A67 += m_A59 * f18_19;
+	m_A68 += m_A60 * f18_19;
+	m_A69 += m_A61 * f18_19;
+	m_A70 += m_A62 * f18_19;
+	RHS19 += f18_19 * RHS18;
+	const double f18_20 = -f18 * m_A74;
+	m_A75 += m_A59 * f18_20;
+	m_A76 += m_A60 * f18_20;
+	m_A77 += m_A61 * f18_20;
+	m_A78 += m_A62 * f18_20;
+	RHS20 += f18_20 * RHS18;
+	const double f18_22 = -f18 * m_A90;
+	m_A91 += m_A59 * f18_22;
+	m_A92 += m_A60 * f18_22;
+	m_A94 += m_A61 * f18_22;
+	m_A95 += m_A62 * f18_22;
+	RHS22 += f18_22 * RHS18;
+	const double f18_23 = -f18 * m_A97;
+	m_A98 += m_A59 * f18_23;
+	m_A99 += m_A60 * f18_23;
+	m_A100 += m_A61 * f18_23;
+	m_A102 += m_A62 * f18_23;
+	RHS23 += f18_23 * RHS18;
+	const double f18_24 = -f18 * m_A105;
+	m_A106 += m_A59 * f18_24;
+	m_A107 += m_A60 * f18_24;
+	m_A108 += m_A61 * f18_24;
+	m_A110 += m_A62 * f18_24;
+	RHS24 += f18_24 * RHS18;
+	const double f19 = 1.0 / m_A67;
+	const double f19_20 = -f19 * m_A75;
+	m_A76 += m_A68 * f19_20;
+	m_A77 += m_A69 * f19_20;
+	m_A78 += m_A70 * f19_20;
+	RHS20 += f19_20 * RHS19;
+	const double f19_22 = -f19 * m_A91;
+	m_A92 += m_A68 * f19_22;
+	m_A94 += m_A69 * f19_22;
+	m_A95 += m_A70 * f19_22;
+	RHS22 += f19_22 * RHS19;
+	const double f19_23 = -f19 * m_A98;
+	m_A99 += m_A68 * f19_23;
+	m_A100 += m_A69 * f19_23;
+	m_A102 += m_A70 * f19_23;
+	RHS23 += f19_23 * RHS19;
+	const double f19_24 = -f19 * m_A106;
+	m_A107 += m_A68 * f19_24;
+	m_A108 += m_A69 * f19_24;
+	m_A110 += m_A70 * f19_24;
+	RHS24 += f19_24 * RHS19;
+	const double f20 = 1.0 / m_A76;
+	const double f20_22 = -f20 * m_A92;
+	m_A94 += m_A77 * f20_22;
+	m_A95 += m_A78 * f20_22;
+	RHS22 += f20_22 * RHS20;
+	const double f20_23 = -f20 * m_A99;
+	m_A100 += m_A77 * f20_23;
+	m_A102 += m_A78 * f20_23;
+	RHS23 += f20_23 * RHS20;
+	const double f20_24 = -f20 * m_A107;
+	m_A108 += m_A77 * f20_24;
+	m_A110 += m_A78 * f20_24;
+	RHS24 += f20_24 * RHS20;
+	const double f21 = 1.0 / m_A84;
+	const double f21_22 = -f21 * m_A93;
+	m_A94 += m_A85 * f21_22;
+	RHS22 += f21_22 * RHS21;
+	const double f22 = 1.0 / m_A94;
+	const double f22_23 = -f22 * m_A100;
+	m_A102 += m_A95 * f22_23;
+	RHS23 += f22_23 * RHS22;
+	const double f22_24 = -f22 * m_A108;
+	m_A110 += m_A95 * f22_24;
+	RHS24 += f22_24 * RHS22;
+	const double f23 = 1.0 / m_A101;
+	const double f23_24 = -f23 * m_A109;
+	m_A110 += m_A102 * f23_24;
+	RHS24 += f23_24 * RHS23;
+	V[24] = RHS24 / m_A110;
+	double tmp23 = 0.0;
+	tmp23 += m_A102 * V[24];
+	V[23] = (RHS23 - tmp23) / m_A101;
+	double tmp22 = 0.0;
+	tmp22 += m_A95 * V[24];
+	V[22] = (RHS22 - tmp22) / m_A94;
+	double tmp21 = 0.0;
+	tmp21 += m_A85 * V[22];
+	V[21] = (RHS21 - tmp21) / m_A84;
+	double tmp20 = 0.0;
+	tmp20 += m_A77 * V[22];
+	tmp20 += m_A78 * V[24];
+	V[20] = (RHS20 - tmp20) / m_A76;
+	double tmp19 = 0.0;
+	tmp19 += m_A68 * V[20];
+	tmp19 += m_A69 * V[22];
+	tmp19 += m_A70 * V[24];
+	V[19] = (RHS19 - tmp19) / m_A67;
+	double tmp18 = 0.0;
+	tmp18 += m_A59 * V[19];
+	tmp18 += m_A60 * V[20];
+	tmp18 += m_A61 * V[22];
+	tmp18 += m_A62 * V[24];
+	V[18] = (RHS18 - tmp18) / m_A58;
+	double tmp17 = 0.0;
+	tmp17 += m_A52 * V[21];
+	tmp17 += m_A53 * V[22];
+	V[17] = (RHS17 - tmp17) / m_A51;
+	double tmp16 = 0.0;
+	tmp16 += m_A49 * V[21];
+	V[16] = (RHS16 - tmp16) / m_A48;
+	double tmp15 = 0.0;
+	tmp15 += m_A45 * V[21];
+	V[15] = (RHS15 - tmp15) / m_A44;
+	double tmp14 = 0.0;
+	tmp14 += m_A41 * V[20];
+	V[14] = (RHS14 - tmp14) / m_A40;
+	double tmp13 = 0.0;
+	tmp13 += m_A38 * V[19];
+	V[13] = (RHS13 - tmp13) / m_A37;
+	double tmp12 = 0.0;
+	tmp12 += m_A35 * V[24];
+	V[12] = (RHS12 - tmp12) / m_A34;
+	double tmp11 = 0.0;
+	tmp11 += m_A31 * V[18];
+	V[11] = (RHS11 - tmp11) / m_A30;
+	double tmp10 = 0.0;
+	tmp10 += m_A29 * V[12];
+	V[10] = (RHS10 - tmp10) / m_A28;
+	double tmp9 = 0.0;
+	tmp9 += m_A26 * V[12];
+	tmp9 += m_A27 * V[24];
+	V[9] = (RHS9 - tmp9) / m_A25;
+	double tmp8 = 0.0;
+	tmp8 += m_A23 * V[18];
+	tmp8 += m_A24 * V[20];
+	V[8] = (RHS8 - tmp8) / m_A22;
+	double tmp7 = 0.0;
+	tmp7 += m_A20 * V[18];
+	tmp7 += m_A21 * V[19];
+	V[7] = (RHS7 - tmp7) / m_A19;
+	double tmp6 = 0.0;
+	tmp6 += m_A17 * V[18];
+	tmp6 += m_A18 * V[22];
+	V[6] = (RHS6 - tmp6) / m_A16;
+	double tmp5 = 0.0;
+	tmp5 += m_A14 * V[17];
+	tmp5 += m_A15 * V[22];
+	V[5] = (RHS5 - tmp5) / m_A13;
+	double tmp4 = 0.0;
+	tmp4 += m_A10 * V[17];
+	tmp4 += m_A11 * V[21];
+	tmp4 += m_A12 * V[22];
+	V[4] = (RHS4 - tmp4) / m_A9;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[15];
+	tmp3 += m_A8 * V[21];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[15];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[20];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[19];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// boxingb
+static void nl_gcr_a0bf548977306172_25_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A6 += go[4];
+	m_A5 += go[5];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 -= go[6] * *cnV[6];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
+	m_A7 += gt[11];
+	m_A7 += gt[12];
+	m_A7 += gt[13];
+	m_A8 += go[11];
+	m_A9 += go[12];
+	double RHS3 = Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 -= go[13] * *cnV[13];
+	m_A11 += gt[14];
+	m_A11 += gt[15];
+	m_A11 += gt[16];
+	m_A12 += go[14];
+	m_A10 += go[15];
+	double RHS4 = Idr[14];
+	RHS4 += Idr[15];
+	RHS4 += Idr[16];
+	RHS4 -= go[16] * *cnV[16];
+	m_A14 += gt[17];
+	m_A14 += gt[18];
+	m_A14 += gt[19];
+	m_A15 += go[17];
+	m_A13 += go[18];
+	double RHS5 = Idr[17];
+	RHS5 += Idr[18];
+	RHS5 += Idr[19];
+	RHS5 -= go[19] * *cnV[19];
+	m_A18 += gt[20];
+	m_A18 += gt[21];
+	m_A18 += gt[22];
+	m_A16 += go[20];
+	m_A17 += go[21];
+	double RHS6 = Idr[20];
+	RHS6 += Idr[21];
+	RHS6 += Idr[22];
+	RHS6 -= go[22] * *cnV[22];
+	m_A24 += gt[23];
+	m_A24 += gt[24];
+	m_A24 += gt[25];
+	m_A24 += gt[26];
+	m_A24 += gt[27];
+	m_A20 += go[23];
+	m_A21 += go[24];
+	m_A22 += go[25];
+	double RHS7 = Idr[23];
+	RHS7 += Idr[24];
+	RHS7 += Idr[25];
+	RHS7 += Idr[26];
+	RHS7 += Idr[27];
+	RHS7 -= go[26] * *cnV[26];
+	RHS7 -= go[27] * *cnV[27];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A10;
+	m_A11 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A13;
+	m_A14 += m_A3 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_7 = -f2 * m_A20;
+	m_A22 += m_A5 * f2_7;
+	m_A24 += m_A6 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_6 = -f3 * m_A16;
+	m_A18 += m_A8 * f3_6;
+	m_A19 += m_A9 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f3_7 = -f3 * m_A21;
+	m_A23 += m_A8 * f3_7;
+	m_A24 += m_A9 * f3_7;
+	RHS7 += f3_7 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_6 = -f4 * m_A17;
+	m_A18 += m_A12 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f5 = 1.0 / m_A14;
+	const double f5_7 = -f5 * m_A22;
+	m_A24 += m_A15 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f6 = 1.0 / m_A18;
+	const double f6_7 = -f6 * m_A23;
+	m_A24 += m_A19 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	V[7] = RHS7 / m_A24;
+	double tmp6 = 0.0;
+	tmp6 += m_A19 * V[7];
+	V[6] = (RHS6 - tmp6) / m_A18;
+	double tmp5 = 0.0;
+	tmp5 += m_A15 * V[7];
+	V[5] = (RHS5 - tmp5) / m_A14;
+	double tmp4 = 0.0;
+	tmp4 += m_A12 * V[6];
+	V[4] = (RHS4 - tmp4) / m_A11;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[6];
+	tmp3 += m_A9 * V[7];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[5];
+	tmp2 += m_A6 * V[7];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// boxingb
+static void nl_gcr_a1132c8737d5d463_96_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A3 += go[4];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A5 += go[7];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A7 += go[10];
+	double RHS3 = Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 -= go[11] * *cnV[11];
+	RHS3 -= go[12] * *cnV[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A9 += go[13];
+	double RHS4 = Idr[13];
+	RHS4 += Idr[14];
+	RHS4 += Idr[15];
+	RHS4 -= go[14] * *cnV[14];
+	RHS4 -= go[15] * *cnV[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A11 += go[16];
+	double RHS5 = Idr[16];
+	RHS5 += Idr[17];
+	RHS5 += Idr[18];
+	RHS5 -= go[17] * *cnV[17];
+	RHS5 -= go[18] * *cnV[18];
+	m_A12 += gt[19];
+	m_A12 += gt[20];
+	m_A12 += gt[21];
+	m_A13 += go[19];
+	double RHS6 = Idr[19];
+	RHS6 += Idr[20];
+	RHS6 += Idr[21];
+	RHS6 -= go[20] * *cnV[20];
+	RHS6 -= go[21] * *cnV[21];
+	m_A14 += gt[22];
+	m_A14 += gt[23];
+	m_A14 += gt[24];
+	m_A15 += go[22];
+	double RHS7 = Idr[22];
+	RHS7 += Idr[23];
+	RHS7 += Idr[24];
+	RHS7 -= go[23] * *cnV[23];
+	RHS7 -= go[24] * *cnV[24];
+	m_A16 += gt[25];
+	m_A16 += gt[26];
+	m_A16 += gt[27];
+	m_A17 += go[25];
+	double RHS8 = Idr[25];
+	RHS8 += Idr[26];
+	RHS8 += Idr[27];
+	RHS8 -= go[26] * *cnV[26];
+	RHS8 -= go[27] * *cnV[27];
+	m_A18 += gt[28];
+	m_A18 += gt[29];
+	m_A18 += gt[30];
+	m_A19 += go[28];
+	double RHS9 = Idr[28];
+	RHS9 += Idr[29];
+	RHS9 += Idr[30];
+	RHS9 -= go[29] * *cnV[29];
+	RHS9 -= go[30] * *cnV[30];
+	m_A20 += gt[31];
+	m_A20 += gt[32];
+	m_A20 += gt[33];
+	m_A21 += go[31];
+	double RHS10 = Idr[31];
+	RHS10 += Idr[32];
+	RHS10 += Idr[33];
+	RHS10 -= go[32] * *cnV[32];
+	RHS10 -= go[33] * *cnV[33];
+	m_A22 += gt[34];
+	m_A22 += gt[35];
+	m_A24 += go[34];
+	m_A23 += go[35];
+	double RHS11 = Idr[34];
+	RHS11 += Idr[35];
+	m_A25 += gt[36];
+	m_A25 += gt[37];
+	m_A27 += go[36];
+	m_A26 += go[37];
+	double RHS12 = Idr[36];
+	RHS12 += Idr[37];
+	m_A28 += gt[38];
+	m_A28 += gt[39];
+	m_A30 += go[38];
+	m_A29 += go[39];
+	double RHS13 = Idr[38];
+	RHS13 += Idr[39];
+	m_A31 += gt[40];
+	m_A31 += gt[41];
+	m_A32 += go[40];
+	double RHS14 = Idr[40];
+	RHS14 += Idr[41];
+	RHS14 -= go[41] * *cnV[41];
+	m_A33 += gt[42];
+	m_A33 += gt[43];
+	m_A35 += go[42];
+	m_A34 += go[43];
+	double RHS15 = Idr[42];
+	RHS15 += Idr[43];
+	m_A36 += gt[44];
+	m_A36 += gt[45];
+	m_A36 += gt[46];
+	m_A36 += gt[47];
+	m_A36 += gt[48];
+	m_A36 += gt[49];
+	m_A36 += gt[50];
+	m_A37 += go[44];
+	double RHS16 = Idr[44];
+	RHS16 += Idr[45];
+	RHS16 += Idr[46];
+	RHS16 += Idr[47];
+	RHS16 += Idr[48];
+	RHS16 += Idr[49];
+	RHS16 += Idr[50];
+	RHS16 -= go[45] * *cnV[45];
+	RHS16 -= go[46] * *cnV[46];
+	RHS16 -= go[47] * *cnV[47];
+	RHS16 -= go[48] * *cnV[48];
+	RHS16 -= go[49] * *cnV[49];
+	RHS16 -= go[50] * *cnV[50];
+	m_A42 += gt[51];
+	m_A42 += gt[52];
+	m_A42 += gt[53];
+	m_A42 += gt[54];
+	m_A42 += gt[55];
+	m_A41 += go[51];
+	m_A40 += go[52];
+	m_A39 += go[53];
+	m_A38 += go[54];
+	double RHS17 = Idr[51];
+	RHS17 += Idr[52];
+	RHS17 += Idr[53];
+	RHS17 += Idr[54];
+	RHS17 += Idr[55];
+	RHS17 -= go[55] * *cnV[55];
+	m_A48 += gt[56];
+	m_A48 += gt[57];
+	m_A48 += gt[58];
+	m_A48 += gt[59];
+	m_A48 += gt[60];
+	m_A47 += go[56];
+	m_A46 += go[57];
+	m_A45 += go[58];
+	m_A44 += go[59];
+	double RHS18 = Idr[56];
+	RHS18 += Idr[57];
+	RHS18 += Idr[58];
+	RHS18 += Idr[59];
+	RHS18 += Idr[60];
+	RHS18 -= go[60] * *cnV[60];
+	m_A50 += gt[61];
+	m_A50 += gt[62];
+	m_A51 += go[61];
+	m_A52 += go[62];
+	double RHS19 = Idr[61];
+	RHS19 += Idr[62];
+	m_A55 += gt[63];
+	m_A55 += gt[64];
+	m_A55 += gt[65];
+	m_A54 += go[63];
+	m_A53 += go[64];
+	double RHS20 = Idr[63];
+	RHS20 += Idr[64];
+	RHS20 += Idr[65];
+	RHS20 -= go[65] * *cnV[65];
+	m_A58 += gt[66];
+	m_A58 += gt[67];
+	m_A58 += gt[68];
+	m_A59 += go[66];
+	m_A57 += go[67];
+	double RHS21 = Idr[66];
+	RHS21 += Idr[67];
+	RHS21 += Idr[68];
+	RHS21 -= go[68] * *cnV[68];
+	m_A62 += gt[69];
+	m_A62 += gt[70];
+	m_A62 += gt[71];
+	m_A61 += go[69];
+	m_A60 += go[70];
+	double RHS22 = Idr[69];
+	RHS22 += Idr[70];
+	RHS22 += Idr[71];
+	RHS22 -= go[71] * *cnV[71];
+	m_A65 += gt[72];
+	m_A65 += gt[73];
+	m_A65 += gt[74];
+	m_A65 += gt[75];
+	m_A65 += gt[76];
+	m_A65 += gt[77];
+	m_A65 += gt[78];
+	m_A64 += go[72];
+	m_A66 += go[73];
+	double RHS23 = Idr[72];
+	RHS23 += Idr[73];
+	RHS23 += Idr[74];
+	RHS23 += Idr[75];
+	RHS23 += Idr[76];
+	RHS23 += Idr[77];
+	RHS23 += Idr[78];
+	RHS23 -= go[74] * *cnV[74];
+	RHS23 -= go[75] * *cnV[75];
+	RHS23 -= go[76] * *cnV[76];
+	RHS23 -= go[77] * *cnV[77];
+	RHS23 -= go[78] * *cnV[78];
+	m_A68 += gt[79];
+	m_A68 += gt[80];
+	m_A69 += go[79];
+	m_A67 += go[80];
+	double RHS24 = Idr[79];
+	RHS24 += Idr[80];
+	m_A73 += gt[81];
+	m_A73 += gt[82];
+	m_A73 += gt[83];
+	m_A73 += gt[84];
+	m_A73 += gt[85];
+	m_A72 += go[81];
+	m_A70 += go[82];
+	m_A71 += go[83];
+	double RHS25 = Idr[81];
+	RHS25 += Idr[82];
+	RHS25 += Idr[83];
+	RHS25 += Idr[84];
+	RHS25 += Idr[85];
+	RHS25 -= go[84] * *cnV[84];
+	RHS25 -= go[85] * *cnV[85];
+	m_A76 += gt[86];
+	m_A76 += gt[87];
+	m_A77 += go[86];
+	m_A75 += go[87];
+	double RHS26 = Idr[86];
+	RHS26 += Idr[87];
+	m_A79 += gt[88];
+	m_A79 += gt[89];
+	m_A79 += gt[90];
+	m_A79 += gt[91];
+	m_A79 += gt[92];
+	m_A78 += go[88];
+	m_A80 += go[89];
+	m_A80 += go[90];
+	double RHS27 = Idr[88];
+	RHS27 += Idr[89];
+	RHS27 += Idr[90];
+	RHS27 += Idr[91];
+	RHS27 += Idr[92];
+	RHS27 -= go[91] * *cnV[91];
+	RHS27 -= go[92] * *cnV[92];
+	m_A95 += gt[93];
+	m_A95 += gt[94];
+	m_A95 += gt[95];
+	m_A95 += gt[96];
+	m_A95 += gt[97];
+	m_A95 += gt[98];
+	m_A95 += gt[99];
+	m_A95 += gt[100];
+	m_A95 += gt[101];
+	m_A95 += gt[102];
+	m_A95 += gt[103];
+	m_A87 += go[93];
+	m_A94 += go[94];
+	m_A94 += go[95];
+	m_A93 += go[96];
+	m_A91 += go[97];
+	m_A84 += go[98];
+	m_A83 += go[99];
+	m_A82 += go[100];
+	m_A81 += go[101];
+	m_A89 += go[102];
+	double RHS28 = Idr[93];
+	RHS28 += Idr[94];
+	RHS28 += Idr[95];
+	RHS28 += Idr[96];
+	RHS28 += Idr[97];
+	RHS28 += Idr[98];
+	RHS28 += Idr[99];
+	RHS28 += Idr[100];
+	RHS28 += Idr[101];
+	RHS28 += Idr[102];
+	RHS28 += Idr[103];
+	RHS28 -= go[103] * *cnV[103];
+	const double f0 = 1.0 / m_A0;
+	const double f0_21 = -f0 * m_A57;
+	m_A58 += m_A1 * f0_21;
+	RHS21 += f0_21 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_17 = -f1 * m_A38;
+	m_A42 += m_A3 * f1_17;
+	RHS17 += f1_17 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_17 = -f2 * m_A39;
+	m_A42 += m_A5 * f2_17;
+	RHS17 += f2_17 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_17 = -f3 * m_A40;
+	m_A42 += m_A7 * f3_17;
+	RHS17 += f3_17 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_18 = -f4 * m_A44;
+	m_A48 += m_A9 * f4_18;
+	RHS18 += f4_18 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_20 = -f5 * m_A53;
+	m_A55 += m_A11 * f5_20;
+	RHS20 += f5_20 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_22 = -f6 * m_A60;
+	m_A62 += m_A13 * f6_22;
+	RHS22 += f6_22 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_18 = -f7 * m_A45;
+	m_A48 += m_A15 * f7_18;
+	RHS18 += f7_18 * RHS7;
+	const double f8 = 1.0 / m_A16;
+	const double f8_18 = -f8 * m_A46;
+	m_A48 += m_A17 * f8_18;
+	RHS18 += f8_18 * RHS8;
+	const double f9 = 1.0 / m_A18;
+	const double f9_24 = -f9 * m_A67;
+	m_A68 += m_A19 * f9_24;
+	RHS24 += f9_24 * RHS9;
+	const double f10 = 1.0 / m_A20;
+	const double f10_26 = -f10 * m_A75;
+	m_A76 += m_A21 * f10_26;
+	RHS26 += f10_26 * RHS10;
+	const double f11 = 1.0 / m_A22;
+	const double f11_17 = -f11 * m_A41;
+	m_A42 += m_A23 * f11_17;
+	m_A43 += m_A24 * f11_17;
+	RHS17 += f11_17 * RHS11;
+	const double f11_28 = -f11 * m_A81;
+	m_A85 += m_A23 * f11_28;
+	m_A95 += m_A24 * f11_28;
+	RHS28 += f11_28 * RHS11;
+	const double f12 = 1.0 / m_A25;
+	const double f12_18 = -f12 * m_A47;
+	m_A48 += m_A26 * f12_18;
+	m_A49 += m_A27 * f12_18;
+	RHS18 += f12_18 * RHS12;
+	const double f12_28 = -f12 * m_A82;
+	m_A86 += m_A26 * f12_28;
+	m_A95 += m_A27 * f12_28;
+	RHS28 += f12_28 * RHS12;
+	const double f13 = 1.0 / m_A28;
+	const double f13_20 = -f13 * m_A54;
+	m_A55 += m_A29 * f13_20;
+	m_A56 += m_A30 * f13_20;
+	RHS20 += f13_20 * RHS13;
+	const double f13_28 = -f13 * m_A83;
+	m_A88 += m_A29 * f13_28;
+	m_A95 += m_A30 * f13_28;
+	RHS28 += f13_28 * RHS13;
+	const double f14 = 1.0 / m_A31;
+	const double f14_23 = -f14 * m_A64;
+	m_A66 += m_A32 * f14_23;
+	RHS23 += f14_23 * RHS14;
+	const double f14_25 = -f14 * m_A70;
+	m_A73 += m_A32 * f14_25;
+	RHS25 += f14_25 * RHS14;
+	const double f15 = 1.0 / m_A33;
+	const double f15_22 = -f15 * m_A61;
+	m_A62 += m_A34 * f15_22;
+	m_A63 += m_A35 * f15_22;
+	RHS22 += f15_22 * RHS15;
+	const double f15_28 = -f15 * m_A84;
+	m_A90 += m_A34 * f15_28;
+	m_A95 += m_A35 * f15_28;
+	RHS28 += f15_28 * RHS15;
+	const double f16 = 1.0 / m_A36;
+	const double f16_27 = -f16 * m_A78;
+	m_A80 += m_A37 * f16_27;
+	RHS27 += f16_27 * RHS16;
+	const double f17 = 1.0 / m_A42;
+	const double f17_28 = -f17 * m_A85;
+	m_A95 += m_A43 * f17_28;
+	RHS28 += f17_28 * RHS17;
+	const double f18 = 1.0 / m_A48;
+	const double f18_28 = -f18 * m_A86;
+	m_A95 += m_A49 * f18_28;
+	RHS28 += f18_28 * RHS18;
+	const double f19 = 1.0 / m_A50;
+	const double f19_25 = -f19 * m_A71;
+	m_A73 += m_A51 * f19_25;
+	m_A74 += m_A52 * f19_25;
+	RHS25 += f19_25 * RHS19;
+	const double f19_28 = -f19 * m_A87;
+	m_A92 += m_A51 * f19_28;
+	m_A95 += m_A52 * f19_28;
+	RHS28 += f19_28 * RHS19;
+	const double f20 = 1.0 / m_A55;
+	const double f20_28 = -f20 * m_A88;
+	m_A95 += m_A56 * f20_28;
+	RHS28 += f20_28 * RHS20;
+	const double f21 = 1.0 / m_A58;
+	const double f21_28 = -f21 * m_A89;
+	m_A95 += m_A59 * f21_28;
+	RHS28 += f21_28 * RHS21;
+	const double f22 = 1.0 / m_A62;
+	const double f22_28 = -f22 * m_A90;
+	m_A95 += m_A63 * f22_28;
+	RHS28 += f22_28 * RHS22;
+	const double f23 = 1.0 / m_A65;
+	const double f23_25 = -f23 * m_A72;
+	m_A73 += m_A66 * f23_25;
+	RHS25 += f23_25 * RHS23;
+	const double f24 = 1.0 / m_A68;
+	const double f24_28 = -f24 * m_A91;
+	m_A95 += m_A69 * f24_28;
+	RHS28 += f24_28 * RHS24;
+	const double f25 = 1.0 / m_A73;
+	const double f25_28 = -f25 * m_A92;
+	m_A95 += m_A74 * f25_28;
+	RHS28 += f25_28 * RHS25;
+	const double f26 = 1.0 / m_A76;
+	const double f26_28 = -f26 * m_A93;
+	m_A95 += m_A77 * f26_28;
+	RHS28 += f26_28 * RHS26;
+	const double f27 = 1.0 / m_A79;
+	const double f27_28 = -f27 * m_A94;
+	m_A95 += m_A80 * f27_28;
+	RHS28 += f27_28 * RHS27;
+	V[28] = RHS28 / m_A95;
 	double tmp27 = 0.0;
-	tmp27 += m_A84 * V[28];
-	tmp27 += m_A85 * V[29];
-	tmp27 += m_A86 * V[43];
-	V[27] = (RHS27 - tmp27) / m_A83;
+	tmp27 += m_A80 * V[28];
+	V[27] = (RHS27 - tmp27) / m_A79;
 	double tmp26 = 0.0;
-	tmp26 += m_A80 * V[30];
-	V[26] = (RHS26 - tmp26) / m_A79;
+	tmp26 += m_A77 * V[28];
+	V[26] = (RHS26 - tmp26) / m_A76;
 	double tmp25 = 0.0;
-	tmp25 += m_A76 * V[28];
-	V[25] = (RHS25 - tmp25) / m_A75;
+	tmp25 += m_A74 * V[28];
+	V[25] = (RHS25 - tmp25) / m_A73;
 	double tmp24 = 0.0;
-	tmp24 += m_A70 * V[25];
-	tmp24 += m_A71 * V[28];
-	V[24] = (RHS24 - tmp24) / m_A69;
+	tmp24 += m_A69 * V[28];
+	V[24] = (RHS24 - tmp24) / m_A68;
 	double tmp23 = 0.0;
-	tmp23 += m_A65 * V[35];
-	tmp23 += m_A66 * V[38];
-	V[23] = (RHS23 - tmp23) / m_A64;
+	tmp23 += m_A66 * V[25];
+	V[23] = (RHS23 - tmp23) / m_A65;
 	double tmp22 = 0.0;
-	tmp22 += m_A62 * V[32];
-	tmp22 += m_A63 * V[38];
-	V[22] = (RHS22 - tmp22) / m_A61;
+	tmp22 += m_A63 * V[28];
+	V[22] = (RHS22 - tmp22) / m_A62;
 	double tmp21 = 0.0;
-	tmp21 += m_A59 * V[29];
-	tmp21 += m_A60 * V[30];
+	tmp21 += m_A59 * V[28];
 	V[21] = (RHS21 - tmp21) / m_A58;
 	double tmp20 = 0.0;
-	tmp20 += m_A55 * V[28];
-	tmp20 += m_A56 * V[29];
-	tmp20 += m_A57 * V[41];
-	V[20] = (RHS20 - tmp20) / m_A54;
+	tmp20 += m_A56 * V[28];
+	V[20] = (RHS20 - tmp20) / m_A55;
 	double tmp19 = 0.0;
-	tmp19 += m_A51 * V[27];
+	tmp19 += m_A51 * V[25];
 	tmp19 += m_A52 * V[28];
-	tmp19 += m_A53 * V[29];
 	V[19] = (RHS19 - tmp19) / m_A50;
 	double tmp18 = 0.0;
-	tmp18 += m_A48 * V[26];
-	tmp18 += m_A49 * V[30];
-	V[18] = (RHS18 - tmp18) / m_A47;
+	tmp18 += m_A49 * V[28];
+	V[18] = (RHS18 - tmp18) / m_A48;
+	double tmp17 = 0.0;
+	tmp17 += m_A43 * V[28];
+	V[17] = (RHS17 - tmp17) / m_A42;
+	double tmp16 = 0.0;
+	tmp16 += m_A37 * V[28];
+	V[16] = (RHS16 - tmp16) / m_A36;
+	double tmp15 = 0.0;
+	tmp15 += m_A34 * V[22];
+	tmp15 += m_A35 * V[28];
+	V[15] = (RHS15 - tmp15) / m_A33;
+	double tmp14 = 0.0;
+	tmp14 += m_A32 * V[25];
+	V[14] = (RHS14 - tmp14) / m_A31;
+	double tmp13 = 0.0;
+	tmp13 += m_A29 * V[20];
+	tmp13 += m_A30 * V[28];
+	V[13] = (RHS13 - tmp13) / m_A28;
+	double tmp12 = 0.0;
+	tmp12 += m_A26 * V[18];
+	tmp12 += m_A27 * V[28];
+	V[12] = (RHS12 - tmp12) / m_A25;
+	double tmp11 = 0.0;
+	tmp11 += m_A23 * V[17];
+	tmp11 += m_A24 * V[28];
+	V[11] = (RHS11 - tmp11) / m_A22;
+	double tmp10 = 0.0;
+	tmp10 += m_A21 * V[26];
+	V[10] = (RHS10 - tmp10) / m_A20;
+	double tmp9 = 0.0;
+	tmp9 += m_A19 * V[24];
+	V[9] = (RHS9 - tmp9) / m_A18;
+	double tmp8 = 0.0;
+	tmp8 += m_A17 * V[18];
+	V[8] = (RHS8 - tmp8) / m_A16;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[18];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[22];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[20];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[18];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[17];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[17];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[17];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[21];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// astrob
+static void nl_gcr_a41a44bd5c424f88_13_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[9];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	m_A12 += gt[12];
+	m_A12 += gt[13];
+	m_A12 += gt[14];
+	m_A12 += gt[15];
+	m_A12 += gt[16];
+	m_A11 += go[12];
+	m_A10 += go[13];
+	m_A9 += go[14];
+	m_A8 += go[15];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 += Idr[15];
+	RHS4 += Idr[16];
+	RHS4 -= go[16] * *cnV[16];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A8;
+	m_A12 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_4 = -f1 * m_A9;
+	m_A12 += m_A3 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_4 = -f2 * m_A10;
+	m_A12 += m_A5 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_4 = -f3 * m_A11;
+	m_A12 += m_A7 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	V[4] = RHS4 / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// tp1985
+static void nl_gcr_a4540ffea06b4346_26_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	m_A2 += go[1];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	m_A3 += gt[2];
+	m_A3 += gt[3];
+	m_A3 += gt[4];
+	m_A4 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[3] * *cnV[3];
+	RHS1 -= go[4] * *cnV[4];
+	m_A5 += gt[5];
+	m_A5 += gt[6];
+	m_A5 += gt[7];
+	m_A6 += go[5];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[6] * *cnV[6];
+	RHS2 -= go[7] * *cnV[7];
+	m_A7 += gt[8];
+	m_A7 += gt[9];
+	m_A8 += go[8];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	RHS3 -= go[9] * *cnV[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A10 += gt[12];
+	m_A10 += gt[13];
+	m_A11 += go[10];
+	m_A9 += go[11];
+	double RHS4 = Idr[10];
+	RHS4 += Idr[11];
+	RHS4 += Idr[12];
+	RHS4 += Idr[13];
+	RHS4 -= go[12] * *cnV[12];
+	RHS4 -= go[13] * *cnV[13];
+	m_A14 += gt[14];
+	m_A14 += gt[15];
+	m_A13 += go[14];
+	m_A15 += go[15];
+	double RHS5 = Idr[14];
+	RHS5 += Idr[15];
+	m_A19 += gt[16];
+	m_A19 += gt[17];
+	m_A19 += gt[18];
+	m_A19 += gt[19];
+	m_A17 += go[16];
+	m_A16 += go[17];
+	m_A18 += go[18];
+	m_A20 += go[19];
+	double RHS6 = Idr[16];
+	RHS6 += Idr[17];
+	RHS6 += Idr[18];
+	RHS6 += Idr[19];
+	m_A25 += gt[20];
+	m_A25 += gt[21];
+	m_A25 += gt[22];
+	m_A25 += gt[23];
+	m_A25 += gt[24];
+	m_A23 += go[20];
+	m_A24 += go[21];
+	m_A21 += go[22];
+	double RHS7 = Idr[20];
+	RHS7 += Idr[21];
+	RHS7 += Idr[22];
+	RHS7 += Idr[23];
+	RHS7 += Idr[24];
+	RHS7 -= go[23] * *cnV[23];
+	RHS7 -= go[24] * *cnV[24];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A9;
+	m_A10 += m_A1 * f0_4;
+	m_A12 += m_A2 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f0_7 = -f0 * m_A21;
+	m_A22 += m_A1 * f0_7;
+	m_A25 += m_A2 * f0_7;
+	RHS7 += f0_7 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_6 = -f1 * m_A16;
+	m_A19 += m_A4 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_6 = -f2 * m_A17;
+	m_A19 += m_A6 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_5 = -f3 * m_A13;
+	m_A14 += m_A8 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_6 = -f4 * m_A18;
+	m_A19 += m_A11 * f4_6;
+	m_A20 += m_A12 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f4_7 = -f4 * m_A22;
+	m_A24 += m_A11 * f4_7;
+	m_A25 += m_A12 * f4_7;
+	RHS7 += f4_7 * RHS4;
+	const double f5 = 1.0 / m_A14;
+	const double f5_7 = -f5 * m_A23;
+	m_A25 += m_A15 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f6 = 1.0 / m_A19;
+	const double f6_7 = -f6 * m_A24;
+	m_A25 += m_A20 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	V[7] = RHS7 / m_A25;
+	double tmp6 = 0.0;
+	tmp6 += m_A20 * V[7];
+	V[6] = (RHS6 - tmp6) / m_A19;
+	double tmp5 = 0.0;
+	tmp5 += m_A15 * V[7];
+	V[5] = (RHS5 - tmp5) / m_A14;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[6];
+	tmp4 += m_A12 * V[7];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A4 * V[6];
+	V[1] = (RHS1 - tmp1) / m_A3;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	tmp0 += m_A2 * V[7];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// tailg
+static void nl_gcr_a46301cd3479b8db_15_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A2 += go[0];
+	m_A1 += go[1];
+	m_A1 += go[2];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	m_A3 += gt[5];
+	m_A3 += gt[6];
+	m_A4 += go[5];
+	double RHS1 = Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[7];
+	m_A7 += go[8];
+	m_A5 += go[9];
+	m_A5 += go[10];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[11] * *cnV[11];
+	m_A9 += gt[12];
+	m_A9 += gt[13];
+	m_A9 += gt[14];
+	m_A10 += go[12];
+	m_A8 += go[13];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[14] * *cnV[14];
+	m_A14 += gt[15];
+	m_A14 += gt[16];
+	m_A14 += gt[17];
+	m_A14 += gt[18];
+	m_A13 += go[15];
+	m_A12 += go[16];
+	m_A12 += go[17];
+	m_A11 += go[18];
+	double RHS4 = Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A5;
+	m_A6 += m_A1 * f0_2;
+	m_A7 += m_A2 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f0_4 = -f0 * m_A11;
+	m_A12 += m_A1 * f0_4;
+	m_A14 += m_A2 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_3 = -f1 * m_A8;
+	m_A9 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_4 = -f2 * m_A12;
+	m_A14 += m_A7 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_4 = -f3 * m_A13;
+	m_A14 += m_A10 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	V[4] = RHS4 / m_A14;
+	double tmp3 = 0.0;
+	tmp3 += m_A10 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A4 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A3;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	tmp0 += m_A2 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// barrier
+static void nl_gcr_a50a4b733e95414a_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A5 += gt[6];
+	m_A5 += gt[7];
+	m_A5 += gt[8];
+	m_A5 += gt[9];
+	m_A4 += go[6];
+	m_A6 += go[7];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	m_A9 += gt[10];
+	m_A9 += gt[11];
+	m_A9 += gt[12];
+	m_A9 += gt[13];
+	m_A9 += gt[14];
+	m_A9 += gt[15];
+	m_A7 += go[10];
+	m_A8 += go[11];
+	double RHS3 = Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A5 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A7;
+	m_A9 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_3 = -f2 * m_A8;
+	m_A9 += m_A6 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starcas
+static void nl_gcr_a582a424cb61c678_62_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[9];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A9 += go[12];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 -= go[13] * *cnV[13];
+	RHS4 -= go[14] * *cnV[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A11 += go[15];
+	double RHS5 = Idr[15];
+	RHS5 += Idr[16];
+	RHS5 += Idr[17];
+	RHS5 -= go[16] * *cnV[16];
+	RHS5 -= go[17] * *cnV[17];
+	m_A12 += gt[18];
+	m_A12 += gt[19];
+	m_A13 += go[18];
+	double RHS6 = Idr[18];
+	RHS6 += Idr[19];
+	RHS6 -= go[19] * *cnV[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A16 += go[20];
+	m_A15 += go[21];
+	double RHS7 = Idr[20];
+	RHS7 += Idr[21];
+	m_A17 += gt[22];
+	m_A17 += gt[23];
+	m_A19 += go[22];
+	m_A18 += go[23];
+	double RHS8 = Idr[22];
+	RHS8 += Idr[23];
+	m_A20 += gt[24];
+	m_A20 += gt[25];
+	m_A21 += go[24];
+	double RHS9 = Idr[24];
+	RHS9 += Idr[25];
+	RHS9 -= go[25] * *cnV[25];
+	m_A23 += gt[26];
+	m_A23 += gt[27];
+	m_A23 += gt[28];
+	m_A23 += gt[29];
+	m_A23 += gt[30];
+	m_A23 += gt[31];
+	m_A23 += gt[32];
+	m_A22 += go[26];
+	m_A24 += go[27];
+	double RHS10 = Idr[26];
+	RHS10 += Idr[27];
+	RHS10 += Idr[28];
+	RHS10 += Idr[29];
+	RHS10 += Idr[30];
+	RHS10 += Idr[31];
+	RHS10 += Idr[32];
+	RHS10 -= go[28] * *cnV[28];
+	RHS10 -= go[29] * *cnV[29];
+	RHS10 -= go[30] * *cnV[30];
+	RHS10 -= go[31] * *cnV[31];
+	RHS10 -= go[32] * *cnV[32];
+	m_A25 += gt[33];
+	m_A25 += gt[34];
+	m_A25 += gt[35];
+	m_A25 += gt[36];
+	m_A25 += gt[37];
+	m_A25 += gt[38];
+	m_A25 += gt[39];
+	m_A26 += go[33];
+	double RHS11 = Idr[33];
+	RHS11 += Idr[34];
+	RHS11 += Idr[35];
+	RHS11 += Idr[36];
+	RHS11 += Idr[37];
+	RHS11 += Idr[38];
+	RHS11 += Idr[39];
+	RHS11 -= go[34] * *cnV[34];
+	RHS11 -= go[35] * *cnV[35];
+	RHS11 -= go[36] * *cnV[36];
+	RHS11 -= go[37] * *cnV[37];
+	RHS11 -= go[38] * *cnV[38];
+	RHS11 -= go[39] * *cnV[39];
+	m_A30 += gt[40];
+	m_A30 += gt[41];
+	m_A30 += gt[42];
+	m_A30 += gt[43];
+	m_A29 += go[40];
+	m_A28 += go[41];
+	m_A27 += go[42];
+	double RHS12 = Idr[40];
+	RHS12 += Idr[41];
+	RHS12 += Idr[42];
+	RHS12 += Idr[43];
+	RHS12 -= go[43] * *cnV[43];
+	m_A32 += gt[44];
+	m_A32 += gt[45];
+	m_A33 += go[44];
+	m_A34 += go[45];
+	double RHS13 = Idr[44];
+	RHS13 += Idr[45];
+	m_A36 += gt[46];
+	m_A36 += gt[47];
+	m_A35 += go[46];
+	m_A37 += go[47];
+	double RHS14 = Idr[46];
+	RHS14 += Idr[47];
+	m_A42 += gt[48];
+	m_A42 += gt[49];
+	m_A42 += gt[50];
+	m_A42 += gt[51];
+	m_A42 += gt[52];
+	m_A41 += go[48];
+	m_A40 += go[49];
+	m_A39 += go[50];
+	m_A38 += go[51];
+	double RHS15 = Idr[48];
+	RHS15 += Idr[49];
+	RHS15 += Idr[50];
+	RHS15 += Idr[51];
+	RHS15 += Idr[52];
+	RHS15 -= go[52] * *cnV[52];
+	m_A46 += gt[53];
+	m_A46 += gt[54];
+	m_A46 += gt[55];
+	m_A46 += gt[56];
+	m_A46 += gt[57];
+	m_A45 += go[53];
+	m_A44 += go[54];
+	m_A47 += go[55];
+	double RHS16 = Idr[53];
+	RHS16 += Idr[54];
+	RHS16 += Idr[55];
+	RHS16 += Idr[56];
+	RHS16 += Idr[57];
+	RHS16 -= go[56] * *cnV[56];
+	RHS16 -= go[57] * *cnV[57];
+	m_A51 += gt[58];
+	m_A51 += gt[59];
+	m_A51 += gt[60];
+	m_A51 += gt[61];
+	m_A51 += gt[62];
+	m_A49 += go[58];
+	m_A48 += go[59];
+	m_A50 += go[60];
+	double RHS17 = Idr[58];
+	RHS17 += Idr[59];
+	RHS17 += Idr[60];
+	RHS17 += Idr[61];
+	RHS17 += Idr[62];
+	RHS17 -= go[61] * *cnV[61];
+	RHS17 -= go[62] * *cnV[62];
+	m_A61 += gt[63];
+	m_A61 += gt[64];
+	m_A61 += gt[65];
+	m_A61 += gt[66];
+	m_A61 += gt[67];
+	m_A61 += gt[68];
+	m_A59 += go[63];
+	m_A56 += go[64];
+	m_A57 += go[65];
+	m_A54 += go[66];
+	m_A53 += go[67];
+	double RHS18 = Idr[63];
+	RHS18 += Idr[64];
+	RHS18 += Idr[65];
+	RHS18 += Idr[66];
+	RHS18 += Idr[67];
+	RHS18 += Idr[68];
+	RHS18 -= go[68] * *cnV[68];
+	const double f0 = 1.0 / m_A0;
+	const double f0_12 = -f0 * m_A27;
+	m_A30 += m_A1 * f0_12;
+	RHS12 += f0_12 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_12 = -f1 * m_A28;
+	m_A30 += m_A3 * f1_12;
+	RHS12 += f1_12 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_15 = -f2 * m_A38;
+	m_A42 += m_A5 * f2_15;
+	RHS15 += f2_15 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_15 = -f3 * m_A39;
+	m_A42 += m_A7 * f3_15;
+	RHS15 += f3_15 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_15 = -f4 * m_A40;
+	m_A42 += m_A9 * f4_15;
+	RHS15 += f4_15 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_14 = -f5 * m_A35;
+	m_A36 += m_A11 * f5_14;
+	RHS14 += f5_14 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_10 = -f6 * m_A22;
+	m_A24 += m_A13 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f6_17 = -f6 * m_A48;
+	m_A51 += m_A13 * f6_17;
+	RHS17 += f6_17 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_12 = -f7 * m_A29;
+	m_A30 += m_A15 * f7_12;
+	m_A31 += m_A16 * f7_12;
+	RHS12 += f7_12 * RHS7;
+	const double f7_18 = -f7 * m_A53;
+	m_A55 += m_A15 * f7_18;
+	m_A61 += m_A16 * f7_18;
+	RHS18 += f7_18 * RHS7;
+	const double f8 = 1.0 / m_A17;
+	const double f8_15 = -f8 * m_A41;
+	m_A42 += m_A18 * f8_15;
+	m_A43 += m_A19 * f8_15;
+	RHS15 += f8_15 * RHS8;
+	const double f8_18 = -f8 * m_A54;
+	m_A58 += m_A18 * f8_18;
+	m_A61 += m_A19 * f8_18;
+	RHS18 += f8_18 * RHS8;
+	const double f9 = 1.0 / m_A20;
+	const double f9_16 = -f9 * m_A44;
+	m_A46 += m_A21 * f9_16;
+	RHS16 += f9_16 * RHS9;
+	const double f10 = 1.0 / m_A23;
+	const double f10_17 = -f10 * m_A49;
+	m_A51 += m_A24 * f10_17;
+	RHS17 += f10_17 * RHS10;
+	const double f11 = 1.0 / m_A25;
+	const double f11_16 = -f11 * m_A45;
+	m_A47 += m_A26 * f11_16;
+	RHS16 += f11_16 * RHS11;
+	const double f12 = 1.0 / m_A30;
+	const double f12_18 = -f12 * m_A55;
+	m_A61 += m_A31 * f12_18;
+	RHS18 += f12_18 * RHS12;
+	const double f13 = 1.0 / m_A32;
+	const double f13_17 = -f13 * m_A50;
+	m_A51 += m_A33 * f13_17;
+	m_A52 += m_A34 * f13_17;
+	RHS17 += f13_17 * RHS13;
+	const double f13_18 = -f13 * m_A56;
+	m_A60 += m_A33 * f13_18;
+	m_A61 += m_A34 * f13_18;
+	RHS18 += f13_18 * RHS13;
+	const double f14 = 1.0 / m_A36;
+	const double f14_18 = -f14 * m_A57;
+	m_A61 += m_A37 * f14_18;
+	RHS18 += f14_18 * RHS14;
+	const double f15 = 1.0 / m_A42;
+	const double f15_18 = -f15 * m_A58;
+	m_A61 += m_A43 * f15_18;
+	RHS18 += f15_18 * RHS15;
+	const double f16 = 1.0 / m_A46;
+	const double f16_18 = -f16 * m_A59;
+	m_A61 += m_A47 * f16_18;
+	RHS18 += f16_18 * RHS16;
+	const double f17 = 1.0 / m_A51;
+	const double f17_18 = -f17 * m_A60;
+	m_A61 += m_A52 * f17_18;
+	RHS18 += f17_18 * RHS17;
+	V[18] = RHS18 / m_A61;
 	double tmp17 = 0.0;
-	tmp17 += m_A46 * V[26];
-	V[17] = (RHS17 - tmp17) / m_A45;
+	tmp17 += m_A52 * V[18];
+	V[17] = (RHS17 - tmp17) / m_A51;
 	double tmp16 = 0.0;
-	tmp16 += m_A44 * V[25];
-	V[16] = (RHS16 - tmp16) / m_A43;
+	tmp16 += m_A47 * V[18];
+	V[16] = (RHS16 - tmp16) / m_A46;
 	double tmp15 = 0.0;
-	tmp15 += m_A41 * V[24];
-	tmp15 += m_A42 * V[25];
-	V[15] = (RHS15 - tmp15) / m_A40;
+	tmp15 += m_A43 * V[18];
+	V[15] = (RHS15 - tmp15) / m_A42;
 	double tmp14 = 0.0;
-	tmp14 += m_A38 * V[24];
-	tmp14 += m_A39 * V[28];
-	V[14] = (RHS14 - tmp14) / m_A37;
+	tmp14 += m_A37 * V[18];
+	V[14] = (RHS14 - tmp14) / m_A36;
 	double tmp13 = 0.0;
-	tmp13 += m_A35 * V[37];
-	tmp13 += m_A36 * V[41];
-	V[13] = (RHS13 - tmp13) / m_A34;
+	tmp13 += m_A33 * V[17];
+	tmp13 += m_A34 * V[18];
+	V[13] = (RHS13 - tmp13) / m_A32;
 	double tmp12 = 0.0;
-	tmp12 += m_A32 * V[38];
-	tmp12 += m_A33 * V[39];
-	V[12] = (RHS12 - tmp12) / m_A31;
+	tmp12 += m_A31 * V[18];
+	V[12] = (RHS12 - tmp12) / m_A30;
 	double tmp11 = 0.0;
-	tmp11 += m_A29 * V[31];
-	tmp11 += m_A30 * V[39];
-	V[11] = (RHS11 - tmp11) / m_A28;
+	tmp11 += m_A26 * V[18];
+	V[11] = (RHS11 - tmp11) / m_A25;
 	double tmp10 = 0.0;
-	tmp10 += m_A27 * V[31];
-	V[10] = (RHS10 - tmp10) / m_A26;
+	tmp10 += m_A24 * V[17];
+	V[10] = (RHS10 - tmp10) / m_A23;
 	double tmp9 = 0.0;
-	tmp9 += m_A24 * V[31];
-	tmp9 += m_A25 * V[43];
-	V[9] = (RHS9 - tmp9) / m_A23;
+	tmp9 += m_A21 * V[16];
+	V[9] = (RHS9 - tmp9) / m_A20;
+	double tmp8 = 0.0;
+	tmp8 += m_A18 * V[15];
+	tmp8 += m_A19 * V[18];
+	V[8] = (RHS8 - tmp8) / m_A17;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[12];
+	tmp7 += m_A16 * V[18];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[17];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[14];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[15];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[15];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[15];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[12];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[12];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// tank
+static void nl_gcr_a63d1344e34bef4b_36_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	m_A1 += go[1];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A6 += go[5];
+	m_A6 += go[6];
+	m_A7 += go[7];
+	m_A7 += go[8];
+	m_A5 += go[9];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	m_A8 += gt[10];
+	m_A8 += gt[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A9 += go[10];
+	m_A9 += go[11];
+	m_A10 += go[12];
+	double RHS3 = Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	m_A11 += gt[15];
+	m_A11 += gt[16];
+	m_A11 += gt[17];
+	m_A11 += gt[18];
+	m_A12 += go[15];
+	m_A12 += go[16];
+	double RHS4 = Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 -= go[17] * *cnV[17];
+	RHS4 -= go[18] * *cnV[18];
+	m_A15 += gt[19];
+	m_A15 += gt[20];
+	m_A15 += gt[21];
+	m_A15 += gt[22];
+	m_A15 += gt[23];
+	m_A14 += go[19];
+	m_A13 += go[20];
+	m_A13 += go[21];
+	double RHS5 = Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	RHS5 -= go[22] * *cnV[22];
+	RHS5 -= go[23] * *cnV[23];
+	m_A19 += gt[24];
+	m_A19 += gt[25];
+	m_A19 += gt[26];
+	m_A19 += gt[27];
+	m_A18 += go[24];
+	m_A20 += go[25];
+	double RHS6 = Idr[24];
+	RHS6 += Idr[25];
+	RHS6 += Idr[26];
+	RHS6 += Idr[27];
+	RHS6 -= go[26] * *cnV[26];
+	RHS6 -= go[27] * *cnV[27];
+	m_A23 += gt[28];
+	m_A23 += gt[29];
+	m_A23 += gt[30];
+	m_A24 += go[28];
+	m_A21 += go[29];
+	m_A21 += go[30];
+	double RHS7 = Idr[28];
+	RHS7 += Idr[29];
+	RHS7 += Idr[30];
+	m_A27 += gt[31];
+	m_A27 += gt[32];
+	m_A27 += gt[33];
+	m_A27 += gt[34];
+	m_A27 += gt[35];
+	m_A27 += gt[36];
+	m_A27 += gt[37];
+	m_A27 += gt[38];
+	m_A26 += go[31];
+	m_A26 += go[32];
+	m_A25 += go[33];
+	m_A25 += go[34];
+	double RHS8 = Idr[31];
+	RHS8 += Idr[32];
+	RHS8 += Idr[33];
+	RHS8 += Idr[34];
+	RHS8 += Idr[35];
+	RHS8 += Idr[36];
+	RHS8 += Idr[37];
+	RHS8 += Idr[38];
+	RHS8 -= go[35] * *cnV[35];
+	RHS8 -= go[36] * *cnV[36];
+	RHS8 -= go[37] * *cnV[37];
+	RHS8 -= go[38] * *cnV[38];
+	m_A35 += gt[39];
+	m_A35 += gt[40];
+	m_A35 += gt[41];
+	m_A35 += gt[42];
+	m_A35 += gt[43];
+	m_A33 += go[39];
+	m_A30 += go[40];
+	m_A32 += go[41];
+	m_A29 += go[42];
+	m_A29 += go[43];
+	double RHS9 = Idr[39];
+	RHS9 += Idr[40];
+	RHS9 += Idr[41];
+	RHS9 += Idr[42];
+	RHS9 += Idr[43];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A13;
+	m_A15 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_6 = -f1 * m_A18;
+	m_A19 += m_A3 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_5 = -f2 * m_A14;
+	m_A15 += m_A5 * f2_5;
+	m_A16 += m_A6 * f2_5;
+	m_A17 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f2_7 = -f2 * m_A21;
+	m_A22 += m_A5 * f2_7;
+	m_A23 += m_A6 * f2_7;
+	m_A24 += m_A7 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f2_9 = -f2 * m_A29;
+	m_A31 += m_A5 * f2_9;
+	m_A33 += m_A6 * f2_9;
+	m_A35 += m_A7 * f2_9;
+	RHS9 += f2_9 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_8 = -f3 * m_A25;
+	m_A27 += m_A9 * f3_8;
+	m_A28 += m_A10 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f3_9 = -f3 * m_A30;
+	m_A34 += m_A9 * f3_9;
+	m_A35 += m_A10 * f3_9;
+	RHS9 += f3_9 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_8 = -f4 * m_A26;
+	m_A27 += m_A12 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f5 = 1.0 / m_A15;
+	const double f5_7 = -f5 * m_A22;
+	m_A23 += m_A16 * f5_7;
+	m_A24 += m_A17 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f5_9 = -f5 * m_A31;
+	m_A33 += m_A16 * f5_9;
+	m_A35 += m_A17 * f5_9;
+	RHS9 += f5_9 * RHS5;
+	const double f6 = 1.0 / m_A19;
+	const double f6_9 = -f6 * m_A32;
+	m_A35 += m_A20 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f7 = 1.0 / m_A23;
+	const double f7_9 = -f7 * m_A33;
+	m_A35 += m_A24 * f7_9;
+	RHS9 += f7_9 * RHS7;
+	const double f8 = 1.0 / m_A27;
+	const double f8_9 = -f8 * m_A34;
+	m_A35 += m_A28 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	V[9] = RHS9 / m_A35;
+	double tmp8 = 0.0;
+	tmp8 += m_A28 * V[9];
+	V[8] = (RHS8 - tmp8) / m_A27;
+	double tmp7 = 0.0;
+	tmp7 += m_A24 * V[9];
+	V[7] = (RHS7 - tmp7) / m_A23;
+	double tmp6 = 0.0;
+	tmp6 += m_A20 * V[9];
+	V[6] = (RHS6 - tmp6) / m_A19;
+	double tmp5 = 0.0;
+	tmp5 += m_A16 * V[7];
+	tmp5 += m_A17 * V[9];
+	V[5] = (RHS5 - tmp5) / m_A15;
+	double tmp4 = 0.0;
+	tmp4 += m_A12 * V[8];
+	V[4] = (RHS4 - tmp4) / m_A11;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[8];
+	tmp3 += m_A10 * V[9];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[5];
+	tmp2 += m_A6 * V[7];
+	tmp2 += m_A7 * V[9];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[6];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[5];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// boxingb
+static void nl_gcr_a6b734322b3ea924_22_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A3 += go[5];
+	double RHS1 = Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[6] * *cnV[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A4 += gt[12];
+	m_A4 += gt[13];
+	m_A4 += gt[14];
+	m_A7 += go[7];
+	m_A6 += go[8];
+	m_A6 += go[9];
+	m_A5 += go[10];
+	m_A5 += go[11];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	RHS2 -= go[14] * *cnV[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A8 += go[15];
+	m_A9 += go[16];
+	m_A9 += go[17];
+	double RHS3 = Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 -= go[18] * *cnV[18];
+	RHS3 -= go[19] * *cnV[19];
+	m_A15 += gt[20];
+	m_A15 += gt[21];
+	m_A15 += gt[22];
+	m_A15 += gt[23];
+	m_A15 += gt[24];
+	m_A16 += go[20];
+	m_A16 += go[21];
+	m_A13 += go[22];
+	m_A13 += go[23];
+	double RHS4 = Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 -= go[24] * *cnV[24];
+	m_A21 += gt[25];
+	m_A21 += gt[26];
+	m_A21 += gt[27];
+	m_A21 += gt[28];
+	m_A21 += gt[29];
+	m_A20 += go[25];
+	m_A20 += go[26];
+	m_A18 += go[27];
+	m_A17 += go[28];
+	double RHS5 = Idr[25];
+	RHS5 += Idr[26];
+	RHS5 += Idr[27];
+	RHS5 += Idr[28];
+	RHS5 += Idr[29];
+	RHS5 -= go[29] * *cnV[29];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A10 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A17;
+	m_A21 += m_A3 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_3 = -f2 * m_A9;
+	m_A10 += m_A5 * f2_3;
+	m_A11 += m_A6 * f2_3;
+	m_A12 += m_A7 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	const double f2_4 = -f2 * m_A13;
+	m_A14 += m_A5 * f2_4;
+	m_A15 += m_A6 * f2_4;
+	m_A16 += m_A7 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_5 = -f2 * m_A18;
+	m_A19 += m_A5 * f2_5;
+	m_A20 += m_A6 * f2_5;
+	m_A21 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_4 = -f3 * m_A14;
+	m_A15 += m_A11 * f3_4;
+	m_A16 += m_A12 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f3_5 = -f3 * m_A19;
+	m_A20 += m_A11 * f3_5;
+	m_A21 += m_A12 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A15;
+	const double f4_5 = -f4 * m_A20;
+	m_A21 += m_A16 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A21;
+	double tmp4 = 0.0;
+	tmp4 += m_A16 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A15;
+	double tmp3 = 0.0;
+	tmp3 += m_A11 * V[4];
+	tmp3 += m_A12 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A10;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[3];
+	tmp2 += m_A6 * V[4];
+	tmp2 += m_A7 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// armora
+static void nl_gcr_a6cfda6668b153c2_22_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[4];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A4 += gt[12];
+	m_A4 += gt[13];
+	m_A7 += go[6];
+	m_A6 += go[7];
+	m_A6 += go[8];
+	m_A5 += go[9];
+	m_A5 += go[10];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	m_A10 += gt[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A9 += go[14];
+	m_A9 += go[15];
+	m_A8 += go[16];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 -= go[17] * *cnV[17];
+	RHS3 -= go[18] * *cnV[18];
+	RHS3 -= go[19] * *cnV[19];
+	m_A15 += gt[20];
+	m_A15 += gt[21];
+	m_A15 += gt[22];
+	m_A15 += gt[23];
+	m_A15 += gt[24];
+	m_A16 += go[20];
+	m_A16 += go[21];
+	m_A13 += go[22];
+	m_A13 += go[23];
+	double RHS4 = Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 -= go[24] * *cnV[24];
+	m_A21 += gt[25];
+	m_A21 += gt[26];
+	m_A21 += gt[27];
+	m_A21 += gt[28];
+	m_A20 += go[25];
+	m_A20 += go[26];
+	m_A18 += go[27];
+	m_A17 += go[28];
+	double RHS5 = Idr[25];
+	RHS5 += Idr[26];
+	RHS5 += Idr[27];
+	RHS5 += Idr[28];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A10 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A17;
+	m_A21 += m_A3 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_3 = -f2 * m_A9;
+	m_A10 += m_A5 * f2_3;
+	m_A11 += m_A6 * f2_3;
+	m_A12 += m_A7 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	const double f2_4 = -f2 * m_A13;
+	m_A14 += m_A5 * f2_4;
+	m_A15 += m_A6 * f2_4;
+	m_A16 += m_A7 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_5 = -f2 * m_A18;
+	m_A19 += m_A5 * f2_5;
+	m_A20 += m_A6 * f2_5;
+	m_A21 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_4 = -f3 * m_A14;
+	m_A15 += m_A11 * f3_4;
+	m_A16 += m_A12 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f3_5 = -f3 * m_A19;
+	m_A20 += m_A11 * f3_5;
+	m_A21 += m_A12 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A15;
+	const double f4_5 = -f4 * m_A20;
+	m_A21 += m_A16 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A21;
+	double tmp4 = 0.0;
+	tmp4 += m_A16 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A15;
+	double tmp3 = 0.0;
+	tmp3 += m_A11 * V[4];
+	tmp3 += m_A12 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A10;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[3];
+	tmp2 += m_A6 * V[4];
+	tmp2 += m_A7 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// boxingb
+static void nl_gcr_a6f74be7f61e6db2_29_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A4 += go[3];
+	m_A3 += go[4];
+	m_A3 += go[5];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	m_A5 += gt[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A7 += go[9];
+	m_A6 += go[10];
+	m_A6 += go[11];
+	double RHS2 = Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[12] * *cnV[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A9 += go[13];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[14] * *cnV[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A11 += go[15];
+	double RHS4 = Idr[15];
+	RHS4 += Idr[16];
+	RHS4 -= go[16] * *cnV[16];
+	m_A14 += gt[17];
+	m_A14 += gt[18];
+	m_A14 += gt[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A14 += gt[22];
+	m_A13 += go[17];
+	m_A13 += go[18];
+	m_A12 += go[19];
+	double RHS5 = Idr[17];
+	RHS5 += Idr[18];
+	RHS5 += Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 -= go[20] * *cnV[20];
+	RHS5 -= go[21] * *cnV[21];
+	RHS5 -= go[22] * *cnV[22];
+	m_A19 += gt[23];
+	m_A19 += gt[24];
+	m_A19 += gt[25];
+	m_A19 += gt[26];
+	m_A19 += gt[27];
+	m_A17 += go[23];
+	m_A17 += go[24];
+	m_A16 += go[25];
+	double RHS6 = Idr[23];
+	RHS6 += Idr[24];
+	RHS6 += Idr[25];
+	RHS6 += Idr[26];
+	RHS6 += Idr[27];
+	RHS6 -= go[26] * *cnV[26];
+	RHS6 -= go[27] * *cnV[27];
+	m_A24 += gt[28];
+	m_A24 += gt[29];
+	m_A24 += gt[30];
+	m_A24 += gt[31];
+	m_A24 += gt[32];
+	m_A24 += gt[33];
+	m_A22 += go[28];
+	m_A25 += go[29];
+	m_A21 += go[30];
+	double RHS7 = Idr[28];
+	RHS7 += Idr[29];
+	RHS7 += Idr[30];
+	RHS7 += Idr[31];
+	RHS7 += Idr[32];
+	RHS7 += Idr[33];
+	RHS7 -= go[31] * *cnV[31];
+	RHS7 -= go[32] * *cnV[32];
+	RHS7 -= go[33] * *cnV[33];
+	m_A28 += gt[34];
+	m_A28 += gt[35];
+	m_A26 += go[34];
+	m_A27 += go[35];
+	double RHS8 = Idr[34];
+	RHS8 += Idr[35];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A12;
+	m_A14 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A13;
+	m_A14 += m_A3 * f1_5;
+	m_A15 += m_A4 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f1_6 = -f1 * m_A16;
+	m_A18 += m_A3 * f1_6;
+	m_A19 += m_A4 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_6 = -f2 * m_A17;
+	m_A19 += m_A6 * f2_6;
+	m_A20 += m_A7 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f2_7 = -f2 * m_A21;
+	m_A23 += m_A6 * f2_7;
+	m_A24 += m_A7 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_7 = -f3 * m_A22;
+	m_A24 += m_A9 * f3_7;
+	RHS7 += f3_7 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_8 = -f4 * m_A26;
+	m_A28 += m_A11 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f5 = 1.0 / m_A14;
+	const double f5_6 = -f5 * m_A18;
+	m_A19 += m_A15 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	const double f6 = 1.0 / m_A19;
+	const double f6_7 = -f6 * m_A23;
+	m_A24 += m_A20 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	const double f7 = 1.0 / m_A24;
+	const double f7_8 = -f7 * m_A27;
+	m_A28 += m_A25 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	V[8] = RHS8 / m_A28;
+	double tmp7 = 0.0;
+	tmp7 += m_A25 * V[8];
+	V[7] = (RHS7 - tmp7) / m_A24;
+	double tmp6 = 0.0;
+	tmp6 += m_A20 * V[7];
+	V[6] = (RHS6 - tmp6) / m_A19;
+	double tmp5 = 0.0;
+	tmp5 += m_A15 * V[6];
+	V[5] = (RHS5 - tmp5) / m_A14;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[8];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[7];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[6];
+	tmp2 += m_A7 * V[7];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[5];
+	tmp1 += m_A4 * V[6];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[5];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// carpolo
+static void nl_gcr_a8f1d076330f06b7_34_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[4];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A5 += go[6];
+	m_A6 += go[7];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	m_A7 += gt[8];
+	m_A7 += gt[9];
+	m_A7 += gt[10];
+	m_A9 += go[8];
+	m_A8 += go[9];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	RHS3 += Idr[10];
+	RHS3 -= go[10] * *cnV[10];
+	m_A10 += gt[11];
+	m_A10 += gt[12];
+	m_A10 += gt[13];
+	m_A11 += go[11];
+	double RHS4 = Idr[11];
+	RHS4 += Idr[12];
+	RHS4 += Idr[13];
+	RHS4 -= go[12] * *cnV[12];
+	RHS4 -= go[13] * *cnV[13];
+	m_A12 += gt[14];
+	m_A12 += gt[15];
+	m_A12 += gt[16];
+	m_A13 += go[14];
+	double RHS5 = Idr[14];
+	RHS5 += Idr[15];
+	RHS5 += Idr[16];
+	RHS5 -= go[15] * *cnV[15];
+	RHS5 -= go[16] * *cnV[16];
+	m_A15 += gt[17];
+	m_A15 += gt[18];
+	m_A15 += gt[19];
+	m_A15 += gt[20];
+	m_A16 += go[17];
+	m_A14 += go[18];
+	double RHS6 = Idr[17];
+	RHS6 += Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
+	RHS6 -= go[19] * *cnV[19];
+	RHS6 -= go[20] * *cnV[20];
+	m_A19 += gt[21];
+	m_A19 += gt[22];
+	m_A19 += gt[23];
+	m_A19 += gt[24];
+	m_A19 += gt[25];
+	m_A19 += gt[26];
+	m_A19 += gt[27];
+	m_A21 += go[21];
+	m_A21 += go[22];
+	m_A18 += go[23];
+	m_A17 += go[24];
+	m_A20 += go[25];
+	double RHS7 = Idr[21];
+	RHS7 += Idr[22];
+	RHS7 += Idr[23];
+	RHS7 += Idr[24];
+	RHS7 += Idr[25];
+	RHS7 += Idr[26];
+	RHS7 += Idr[27];
+	RHS7 -= go[26] * *cnV[26];
+	RHS7 -= go[27] * *cnV[27];
+	m_A26 += gt[28];
+	m_A26 += gt[29];
+	m_A26 += gt[30];
+	m_A26 += gt[31];
+	m_A22 += go[28];
+	m_A25 += go[29];
+	m_A23 += go[30];
+	m_A24 += go[31];
+	double RHS8 = Idr[28];
+	RHS8 += Idr[29];
+	RHS8 += Idr[30];
+	RHS8 += Idr[31];
+	m_A33 += gt[32];
+	m_A33 += gt[33];
+	m_A33 += gt[34];
+	m_A33 += gt[35];
+	m_A33 += gt[36];
+	m_A33 += gt[37];
+	m_A30 += go[32];
+	m_A29 += go[33];
+	m_A28 += go[34];
+	m_A31 += go[35];
+	m_A31 += go[36];
+	double RHS9 = Idr[32];
+	RHS9 += Idr[33];
+	RHS9 += Idr[34];
+	RHS9 += Idr[35];
+	RHS9 += Idr[36];
+	RHS9 += Idr[37];
+	RHS9 -= go[37] * *cnV[37];
+	const double f0 = 1.0 / m_A0;
+	const double f0_6 = -f0 * m_A14;
+	m_A15 += m_A1 * f0_6;
+	RHS6 += f0_6 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_8 = -f1 * m_A22;
+	m_A26 += m_A3 * f1_8;
+	RHS8 += f1_8 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_7 = -f2 * m_A17;
+	m_A19 += m_A5 * f2_7;
+	m_A20 += m_A6 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f2_8 = -f2 * m_A23;
+	m_A25 += m_A5 * f2_8;
+	m_A26 += m_A6 * f2_8;
+	RHS8 += f2_8 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_7 = -f3 * m_A18;
+	m_A19 += m_A8 * f3_7;
+	m_A21 += m_A9 * f3_7;
+	RHS7 += f3_7 * RHS3;
+	const double f3_9 = -f3 * m_A28;
+	m_A31 += m_A8 * f3_9;
+	m_A33 += m_A9 * f3_9;
+	RHS9 += f3_9 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_9 = -f4 * m_A29;
+	m_A33 += m_A11 * f4_9;
+	RHS9 += f4_9 * RHS4;
+	const double f5 = 1.0 / m_A12;
+	const double f5_9 = -f5 * m_A30;
+	m_A33 += m_A13 * f5_9;
+	RHS9 += f5_9 * RHS5;
+	const double f6 = 1.0 / m_A15;
+	const double f6_8 = -f6 * m_A24;
+	m_A26 += m_A16 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f7 = 1.0 / m_A19;
+	const double f7_8 = -f7 * m_A25;
+	m_A26 += m_A20 * f7_8;
+	m_A27 += m_A21 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	const double f7_9 = -f7 * m_A31;
+	m_A32 += m_A20 * f7_9;
+	m_A33 += m_A21 * f7_9;
+	RHS9 += f7_9 * RHS7;
+	const double f8 = 1.0 / m_A26;
+	const double f8_9 = -f8 * m_A32;
+	m_A33 += m_A27 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	V[9] = RHS9 / m_A33;
 	double tmp8 = 0.0;
-	tmp8 += m_A21 * V[27];
-	tmp8 += m_A22 * V[43];
-	V[8] = (RHS8 - tmp8) / m_A20;
+	tmp8 += m_A27 * V[9];
+	V[8] = (RHS8 - tmp8) / m_A26;
 	double tmp7 = 0.0;
-	tmp7 += m_A18 * V[38];
-	tmp7 += m_A19 * V[42];
-	V[7] = (RHS7 - tmp7) / m_A17;
+	tmp7 += m_A20 * V[8];
+	tmp7 += m_A21 * V[9];
+	V[7] = (RHS7 - tmp7) / m_A19;
 	double tmp6 = 0.0;
-	tmp6 += m_A16 * V[36];
+	tmp6 += m_A16 * V[8];
 	V[6] = (RHS6 - tmp6) / m_A15;
 	double tmp5 = 0.0;
-	tmp5 += m_A14 * V[42];
-	V[5] = (RHS5 - tmp5) / m_A13;
+	tmp5 += m_A13 * V[9];
+	V[5] = (RHS5 - tmp5) / m_A12;
 	double tmp4 = 0.0;
-	tmp4 += m_A11 * V[37];
-	tmp4 += m_A12 * V[38];
+	tmp4 += m_A11 * V[9];
 	V[4] = (RHS4 - tmp4) / m_A10;
 	double tmp3 = 0.0;
-	tmp3 += m_A8 * V[13];
-	tmp3 += m_A9 * V[37];
+	tmp3 += m_A8 * V[7];
+	tmp3 += m_A9 * V[9];
 	V[3] = (RHS3 - tmp3) / m_A7;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[40];
-	tmp2 += m_A6 * V[43];
+	tmp2 += m_A5 * V[7];
+	tmp2 += m_A6 * V[8];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[8];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[6];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// breakout
+static void nl_gcr_a971eeb2ef76f75f_13_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[9];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	m_A12 += gt[12];
+	m_A12 += gt[13];
+	m_A12 += gt[14];
+	m_A12 += gt[15];
+	m_A11 += go[12];
+	m_A10 += go[13];
+	m_A9 += go[14];
+	m_A8 += go[15];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 += Idr[15];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A8;
+	m_A12 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_4 = -f1 * m_A9;
+	m_A12 += m_A3 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_4 = -f2 * m_A10;
+	m_A12 += m_A5 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_4 = -f3 * m_A11;
+	m_A12 += m_A7 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	V[4] = RHS4 / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[4];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[40];
+	tmp1 += m_A3 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// ripoff
+static void nl_gcr_aa07266ef5d420d1_11_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A6 += gt[4];
+	m_A6 += gt[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A7 += go[4];
+	m_A5 += go[5];
+	m_A4 += go[6];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A10 += gt[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A10 += gt[12];
+	m_A10 += gt[13];
+	m_A10 += gt[14];
+	m_A10 += gt[15];
+	m_A8 += go[9];
+	m_A9 += go[10];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 -= go[11] * *cnV[11];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	const double f1_3 = -f1 * m_A8;
+	m_A9 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_3 = -f2 * m_A9;
+	m_A10 += m_A7 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A10;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[33];
+	tmp0 += m_A1 * V[2];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// gtrak10
-static void nl_gcr_4e48e9f6ef4bfdc4_43_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// 280zzzap
+static void nl_gcr_ab9144d965a37e4_113_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -4413,289 +41601,997 @@
 	double m_A40(0.0);
 	double m_A41(0.0);
 	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
-	m_A0 += gt[2];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
-	RHS0 += Idr[2];
 	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[2];
 	m_A2 += gt[3];
 	m_A2 += gt[4];
 	m_A2 += gt[5];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
+	m_A5 += go[2];
+	m_A4 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
 	RHS1 += Idr[4];
 	RHS1 += Idr[5];
-	RHS1 -= go[4] * *cnV[4];
 	RHS1 -= go[5] * *cnV[5];
-	m_A4 += gt[6];
-	m_A4 += gt[7];
-	m_A4 += gt[8];
-	m_A5 += go[6];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A7 += go[6];
 	double RHS2 = Idr[6];
 	RHS2 += Idr[7];
-	RHS2 += Idr[8];
 	RHS2 -= go[7] * *cnV[7];
-	RHS2 -= go[8] * *cnV[8];
-	m_A6 += gt[9];
-	m_A6 += gt[10];
-	m_A6 += gt[11];
-	m_A7 += go[9];
-	double RHS3 = Idr[9];
-	RHS3 += Idr[10];
-	RHS3 += Idr[11];
-	RHS3 -= go[10] * *cnV[10];
-	RHS3 -= go[11] * *cnV[11];
-	m_A8 += gt[12];
-	m_A8 += gt[13];
-	m_A8 += gt[14];
-	m_A9 += go[12];
-	double RHS4 = Idr[12];
-	RHS4 += Idr[13];
-	RHS4 += Idr[14];
-	RHS4 -= go[13] * *cnV[13];
-	RHS4 -= go[14] * *cnV[14];
-	m_A10 += gt[15];
-	m_A10 += gt[16];
-	m_A10 += gt[17];
-	m_A11 += go[15];
-	double RHS5 = Idr[15];
-	RHS5 += Idr[16];
-	RHS5 += Idr[17];
-	RHS5 -= go[16] * *cnV[16];
-	RHS5 -= go[17] * *cnV[17];
-	m_A12 += gt[18];
-	m_A12 += gt[19];
-	m_A12 += gt[20];
-	m_A13 += go[18];
-	double RHS6 = Idr[18];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A9 += go[8];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	RHS3 -= go[9] * *cnV[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A10 += gt[12];
+	m_A11 += go[10];
+	m_A12 += go[11];
+	double RHS4 = Idr[10];
+	RHS4 += Idr[11];
+	RHS4 += Idr[12];
+	RHS4 -= go[12] * *cnV[12];
+	m_A13 += gt[13];
+	m_A13 += gt[14];
+	m_A14 += go[13];
+	double RHS5 = Idr[13];
+	RHS5 += Idr[14];
+	RHS5 -= go[14] * *cnV[14];
+	m_A15 += gt[15];
+	m_A15 += gt[16];
+	m_A15 += gt[17];
+	m_A15 += gt[18];
+	m_A15 += gt[19];
+	m_A15 += gt[20];
+	m_A15 += gt[21];
+	m_A18 += go[15];
+	m_A19 += go[16];
+	m_A17 += go[17];
+	m_A16 += go[18];
+	double RHS6 = Idr[15];
+	RHS6 += Idr[16];
+	RHS6 += Idr[17];
+	RHS6 += Idr[18];
 	RHS6 += Idr[19];
 	RHS6 += Idr[20];
+	RHS6 += Idr[21];
 	RHS6 -= go[19] * *cnV[19];
 	RHS6 -= go[20] * *cnV[20];
-	m_A14 += gt[21];
-	m_A14 += gt[22];
-	m_A14 += gt[23];
-	m_A15 += go[21];
-	double RHS7 = Idr[21];
-	RHS7 += Idr[22];
+	RHS6 -= go[21] * *cnV[21];
+	m_A20 += gt[22];
+	m_A20 += gt[23];
+	m_A20 += gt[24];
+	m_A20 += gt[25];
+	m_A20 += gt[26];
+	m_A20 += gt[27];
+	m_A20 += gt[28];
+	m_A23 += go[22];
+	m_A24 += go[23];
+	m_A22 += go[24];
+	m_A21 += go[25];
+	double RHS7 = Idr[22];
 	RHS7 += Idr[23];
-	RHS7 -= go[22] * *cnV[22];
-	RHS7 -= go[23] * *cnV[23];
-	m_A16 += gt[24];
-	m_A16 += gt[25];
-	m_A16 += gt[26];
-	m_A17 += go[24];
-	double RHS8 = Idr[24];
-	RHS8 += Idr[25];
-	RHS8 += Idr[26];
-	RHS8 -= go[25] * *cnV[25];
-	RHS8 -= go[26] * *cnV[26];
-	m_A18 += gt[27];
-	m_A18 += gt[28];
-	m_A18 += gt[29];
-	m_A19 += go[27];
-	double RHS9 = Idr[27];
-	RHS9 += Idr[28];
-	RHS9 += Idr[29];
-	RHS9 -= go[28] * *cnV[28];
-	RHS9 -= go[29] * *cnV[29];
-	m_A20 += gt[30];
-	m_A20 += gt[31];
-	m_A20 += gt[32];
-	m_A21 += go[30];
-	double RHS10 = Idr[30];
-	RHS10 += Idr[31];
-	RHS10 += Idr[32];
-	RHS10 -= go[31] * *cnV[31];
-	RHS10 -= go[32] * *cnV[32];
-	m_A22 += gt[33];
-	m_A22 += gt[34];
-	m_A22 += gt[35];
-	m_A23 += go[33];
-	double RHS11 = Idr[33];
-	RHS11 += Idr[34];
-	RHS11 += Idr[35];
-	RHS11 -= go[34] * *cnV[34];
-	RHS11 -= go[35] * *cnV[35];
-	m_A25 += gt[36];
-	m_A25 += gt[37];
-	m_A25 += gt[38];
-	m_A26 += go[36];
-	m_A24 += go[37];
-	double RHS12 = Idr[36];
-	RHS12 += Idr[37];
-	RHS12 += Idr[38];
-	RHS12 -= go[38] * *cnV[38];
-	m_A30 += gt[39];
-	m_A30 += gt[40];
-	m_A30 += gt[41];
-	m_A30 += gt[42];
-	m_A30 += gt[43];
-	m_A30 += gt[44];
-	m_A30 += gt[45];
-	m_A29 += go[39];
-	m_A28 += go[40];
-	m_A27 += go[41];
-	m_A31 += go[42];
-	m_A31 += go[43];
-	double RHS13 = Idr[39];
-	RHS13 += Idr[40];
-	RHS13 += Idr[41];
-	RHS13 += Idr[42];
-	RHS13 += Idr[43];
-	RHS13 += Idr[44];
-	RHS13 += Idr[45];
-	RHS13 -= go[44] * *cnV[44];
-	RHS13 -= go[45] * *cnV[45];
+	RHS7 += Idr[24];
+	RHS7 += Idr[25];
+	RHS7 += Idr[26];
+	RHS7 += Idr[27];
+	RHS7 += Idr[28];
+	RHS7 -= go[26] * *cnV[26];
+	RHS7 -= go[27] * *cnV[27];
+	RHS7 -= go[28] * *cnV[28];
+	m_A25 += gt[29];
+	m_A25 += gt[30];
+	m_A25 += gt[31];
+	m_A26 += go[29];
+	m_A27 += go[30];
+	double RHS8 = Idr[29];
+	RHS8 += Idr[30];
+	RHS8 += Idr[31];
+	RHS8 -= go[31] * *cnV[31];
+	m_A28 += gt[32];
+	m_A28 += gt[33];
+	m_A29 += go[32];
+	double RHS9 = Idr[32];
+	RHS9 += Idr[33];
+	RHS9 -= go[33] * *cnV[33];
+	m_A30 += gt[34];
+	m_A30 += gt[35];
+	m_A30 += gt[36];
+	m_A30 += gt[37];
+	m_A31 += go[34];
+	double RHS10 = Idr[34];
+	RHS10 += Idr[35];
+	RHS10 += Idr[36];
+	RHS10 += Idr[37];
+	RHS10 -= go[35] * *cnV[35];
+	RHS10 -= go[36] * *cnV[36];
+	RHS10 -= go[37] * *cnV[37];
+	m_A32 += gt[38];
+	m_A32 += gt[39];
+	m_A33 += go[38];
+	double RHS11 = Idr[38];
+	RHS11 += Idr[39];
+	RHS11 -= go[39] * *cnV[39];
+	m_A36 += gt[40];
+	m_A36 += gt[41];
+	m_A36 += gt[42];
+	m_A36 += gt[43];
+	m_A35 += go[40];
+	m_A34 += go[41];
+	double RHS12 = Idr[40];
+	RHS12 += Idr[41];
+	RHS12 += Idr[42];
+	RHS12 += Idr[43];
+	RHS12 -= go[42] * *cnV[42];
+	RHS12 -= go[43] * *cnV[43];
+	m_A42 += gt[44];
+	m_A42 += gt[45];
 	m_A42 += gt[46];
 	m_A42 += gt[47];
-	m_A42 += gt[48];
-	m_A42 += gt[49];
-	m_A42 += gt[50];
-	m_A42 += gt[51];
-	m_A42 += gt[52];
-	m_A42 += gt[53];
-	m_A42 += gt[54];
-	m_A42 += gt[55];
-	m_A42 += gt[56];
-	m_A42 += gt[57];
-	m_A42 += gt[58];
-	m_A41 += go[46];
-	m_A41 += go[47];
-	m_A39 += go[48];
-	m_A38 += go[49];
-	m_A37 += go[50];
-	m_A36 += go[51];
-	m_A35 += go[52];
-	m_A34 += go[53];
-	m_A33 += go[54];
-	m_A32 += go[55];
-	m_A40 += go[56];
-	double RHS14 = Idr[46];
-	RHS14 += Idr[47];
-	RHS14 += Idr[48];
+	m_A40 += go[44];
+	m_A39 += go[45];
+	double RHS13 = Idr[44];
+	RHS13 += Idr[45];
+	RHS13 += Idr[46];
+	RHS13 += Idr[47];
+	RHS13 -= go[46] * *cnV[46];
+	RHS13 -= go[47] * *cnV[47];
+	m_A51 += gt[48];
+	m_A51 += gt[49];
+	m_A51 += gt[50];
+	m_A51 += gt[51];
+	m_A53 += go[48];
+	m_A48 += go[49];
+	m_A47 += go[50];
+	double RHS14 = Idr[48];
 	RHS14 += Idr[49];
 	RHS14 += Idr[50];
 	RHS14 += Idr[51];
-	RHS14 += Idr[52];
-	RHS14 += Idr[53];
-	RHS14 += Idr[54];
-	RHS14 += Idr[55];
-	RHS14 += Idr[56];
-	RHS14 += Idr[57];
-	RHS14 += Idr[58];
-	RHS14 -= go[57] * *cnV[57];
-	RHS14 -= go[58] * *cnV[58];
+	RHS14 -= go[51] * *cnV[51];
+	m_A57 += gt[52];
+	m_A57 += gt[53];
+	m_A57 += gt[54];
+	m_A56 += go[52];
+	m_A58 += go[53];
+	double RHS15 = Idr[52];
+	RHS15 += Idr[53];
+	RHS15 += Idr[54];
+	RHS15 -= go[54] * *cnV[54];
+	m_A60 += gt[55];
+	m_A60 += gt[56];
+	m_A60 += gt[57];
+	m_A60 += gt[58];
+	m_A59 += go[55];
+	m_A61 += go[56];
+	double RHS16 = Idr[55];
+	RHS16 += Idr[56];
+	RHS16 += Idr[57];
+	RHS16 += Idr[58];
+	RHS16 -= go[57] * *cnV[57];
+	RHS16 -= go[58] * *cnV[58];
+	m_A67 += gt[59];
+	m_A67 += gt[60];
+	m_A67 += gt[61];
+	m_A67 += gt[62];
+	m_A67 += gt[63];
+	m_A67 += gt[64];
+	m_A70 += go[59];
+	m_A64 += go[60];
+	m_A63 += go[61];
+	m_A62 += go[62];
+	m_A69 += go[63];
+	double RHS17 = Idr[59];
+	RHS17 += Idr[60];
+	RHS17 += Idr[61];
+	RHS17 += Idr[62];
+	RHS17 += Idr[63];
+	RHS17 += Idr[64];
+	RHS17 -= go[64] * *cnV[64];
+	m_A74 += gt[65];
+	m_A74 += gt[66];
+	m_A74 += gt[67];
+	m_A74 += gt[68];
+	m_A73 += go[65];
+	m_A72 += go[66];
+	m_A75 += go[67];
+	double RHS18 = Idr[65];
+	RHS18 += Idr[66];
+	RHS18 += Idr[67];
+	RHS18 += Idr[68];
+	RHS18 -= go[68] * *cnV[68];
+	m_A80 += gt[69];
+	m_A80 += gt[70];
+	m_A80 += gt[71];
+	m_A80 += gt[72];
+	m_A80 += gt[73];
+	m_A77 += go[69];
+	m_A78 += go[70];
+	m_A76 += go[71];
+	double RHS19 = Idr[69];
+	RHS19 += Idr[70];
+	RHS19 += Idr[71];
+	RHS19 += Idr[72];
+	RHS19 += Idr[73];
+	RHS19 -= go[72] * *cnV[72];
+	RHS19 -= go[73] * *cnV[73];
+	m_A89 += gt[74];
+	m_A89 += gt[75];
+	m_A89 += gt[76];
+	m_A89 += gt[77];
+	m_A84 += go[74];
+	m_A85 += go[75];
+	m_A87 += go[76];
+	m_A86 += go[77];
+	double RHS20 = Idr[74];
+	RHS20 += Idr[75];
+	RHS20 += Idr[76];
+	RHS20 += Idr[77];
+	m_A100 += gt[78];
+	m_A100 += gt[79];
+	m_A100 += gt[80];
+	m_A100 += gt[81];
+	m_A100 += gt[82];
+	m_A100 += gt[83];
+	m_A100 += gt[84];
+	m_A96 += go[78];
+	m_A93 += go[79];
+	m_A101 += go[80];
+	m_A92 += go[81];
+	m_A97 += go[82];
+	double RHS21 = Idr[78];
+	RHS21 += Idr[79];
+	RHS21 += Idr[80];
+	RHS21 += Idr[81];
+	RHS21 += Idr[82];
+	RHS21 += Idr[83];
+	RHS21 += Idr[84];
+	RHS21 -= go[83] * *cnV[83];
+	RHS21 -= go[84] * *cnV[84];
+	m_A112 += gt[85];
+	m_A112 += gt[86];
+	m_A112 += gt[87];
+	m_A112 += gt[88];
+	m_A112 += gt[89];
+	m_A112 += gt[90];
+	m_A108 += go[85];
+	m_A111 += go[86];
+	m_A103 += go[87];
+	m_A104 += go[88];
+	m_A102 += go[89];
+	double RHS22 = Idr[85];
+	RHS22 += Idr[86];
+	RHS22 += Idr[87];
+	RHS22 += Idr[88];
+	RHS22 += Idr[89];
+	RHS22 += Idr[90];
+	RHS22 -= go[90] * *cnV[90];
 	const double f0 = 1.0 / m_A0;
-	const double f0_12 = -f0 * m_A24;
-	m_A25 += m_A1 * f0_12;
+	const double f0_12 = -f0 * m_A34;
+	m_A36 += m_A1 * f0_12;
 	RHS12 += f0_12 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_14 = -f1 * m_A32;
-	m_A42 += m_A3 * f1_14;
+	const double f1_12 = -f1 * m_A35;
+	m_A36 += m_A3 * f1_12;
+	m_A37 += m_A4 * f1_12;
+	m_A38 += m_A5 * f1_12;
+	RHS12 += f1_12 * RHS1;
+	const double f1_13 = -f1 * m_A39;
+	m_A41 += m_A3 * f1_13;
+	m_A42 += m_A4 * f1_13;
+	m_A43 += m_A5 * f1_13;
+	RHS13 += f1_13 * RHS1;
+	const double f1_14 = -f1 * m_A47;
+	m_A49 += m_A3 * f1_14;
+	m_A50 += m_A4 * f1_14;
+	m_A51 += m_A5 * f1_14;
 	RHS14 += f1_14 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_14 = -f2 * m_A33;
-	m_A42 += m_A5 * f2_14;
-	RHS14 += f2_14 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_14 = -f3 * m_A34;
-	m_A42 += m_A7 * f3_14;
-	RHS14 += f3_14 * RHS3;
-	const double f4 = 1.0 / m_A8;
-	const double f4_14 = -f4 * m_A35;
-	m_A42 += m_A9 * f4_14;
-	RHS14 += f4_14 * RHS4;
-	const double f5 = 1.0 / m_A10;
-	const double f5_14 = -f5 * m_A36;
-	m_A42 += m_A11 * f5_14;
-	RHS14 += f5_14 * RHS5;
-	const double f6 = 1.0 / m_A12;
-	const double f6_14 = -f6 * m_A37;
-	m_A42 += m_A13 * f6_14;
-	RHS14 += f6_14 * RHS6;
-	const double f7 = 1.0 / m_A14;
-	const double f7_14 = -f7 * m_A38;
-	m_A42 += m_A15 * f7_14;
+	const double f2 = 1.0 / m_A6;
+	const double f2_15 = -f2 * m_A56;
+	m_A57 += m_A7 * f2_15;
+	RHS15 += f2_15 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_20 = -f3 * m_A84;
+	m_A89 += m_A9 * f3_20;
+	RHS20 += f3_20 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_17 = -f4 * m_A62;
+	m_A67 += m_A11 * f4_17;
+	m_A69 += m_A12 * f4_17;
+	RHS17 += f4_17 * RHS4;
+	const double f4_20 = -f4 * m_A85;
+	m_A87 += m_A11 * f4_20;
+	m_A89 += m_A12 * f4_20;
+	RHS20 += f4_20 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_16 = -f5 * m_A59;
+	m_A60 += m_A14 * f5_16;
+	RHS16 += f5_16 * RHS5;
+	const double f6 = 1.0 / m_A15;
+	const double f6_13 = -f6 * m_A40;
+	m_A42 += m_A16 * f6_13;
+	m_A44 += m_A17 * f6_13;
+	m_A45 += m_A18 * f6_13;
+	m_A46 += m_A19 * f6_13;
+	RHS13 += f6_13 * RHS6;
+	const double f6_17 = -f6 * m_A63;
+	m_A65 += m_A16 * f6_17;
+	m_A67 += m_A17 * f6_17;
+	m_A70 += m_A18 * f6_17;
+	m_A71 += m_A19 * f6_17;
+	RHS17 += f6_17 * RHS6;
+	const double f6_21 = -f6 * m_A92;
+	m_A94 += m_A16 * f6_21;
+	m_A97 += m_A17 * f6_21;
+	m_A100 += m_A18 * f6_21;
+	m_A101 += m_A19 * f6_21;
+	RHS21 += f6_21 * RHS6;
+	const double f6_22 = -f6 * m_A102;
+	m_A105 += m_A16 * f6_22;
+	m_A107 += m_A17 * f6_22;
+	m_A111 += m_A18 * f6_22;
+	m_A112 += m_A19 * f6_22;
+	RHS22 += f6_22 * RHS6;
+	const double f7 = 1.0 / m_A20;
+	const double f7_14 = -f7 * m_A48;
+	m_A51 += m_A21 * f7_14;
+	m_A52 += m_A22 * f7_14;
+	m_A54 += m_A23 * f7_14;
+	m_A55 += m_A24 * f7_14;
 	RHS14 += f7_14 * RHS7;
-	const double f8 = 1.0 / m_A16;
-	const double f8_14 = -f8 * m_A39;
-	m_A42 += m_A17 * f8_14;
-	RHS14 += f8_14 * RHS8;
-	const double f9 = 1.0 / m_A18;
-	const double f9_13 = -f9 * m_A27;
-	m_A30 += m_A19 * f9_13;
-	RHS13 += f9_13 * RHS9;
-	const double f10 = 1.0 / m_A20;
-	const double f10_13 = -f10 * m_A28;
-	m_A30 += m_A21 * f10_13;
-	RHS13 += f10_13 * RHS10;
-	const double f11 = 1.0 / m_A22;
-	const double f11_13 = -f11 * m_A29;
-	m_A30 += m_A23 * f11_13;
-	RHS13 += f11_13 * RHS11;
-	const double f12 = 1.0 / m_A25;
-	const double f12_14 = -f12 * m_A40;
-	m_A42 += m_A26 * f12_14;
+	const double f7_17 = -f7 * m_A64;
+	m_A66 += m_A21 * f7_17;
+	m_A67 += m_A22 * f7_17;
+	m_A70 += m_A23 * f7_17;
+	m_A71 += m_A24 * f7_17;
+	RHS17 += f7_17 * RHS7;
+	const double f7_21 = -f7 * m_A93;
+	m_A95 += m_A21 * f7_21;
+	m_A97 += m_A22 * f7_21;
+	m_A100 += m_A23 * f7_21;
+	m_A101 += m_A24 * f7_21;
+	RHS21 += f7_21 * RHS7;
+	const double f7_22 = -f7 * m_A103;
+	m_A106 += m_A21 * f7_22;
+	m_A107 += m_A22 * f7_22;
+	m_A111 += m_A23 * f7_22;
+	m_A112 += m_A24 * f7_22;
+	RHS22 += f7_22 * RHS7;
+	const double f8 = 1.0 / m_A25;
+	const double f8_18 = -f8 * m_A72;
+	m_A74 += m_A26 * f8_18;
+	m_A75 += m_A27 * f8_18;
+	RHS18 += f8_18 * RHS8;
+	const double f8_22 = -f8 * m_A104;
+	m_A108 += m_A26 * f8_22;
+	m_A112 += m_A27 * f8_22;
+	RHS22 += f8_22 * RHS8;
+	const double f9 = 1.0 / m_A28;
+	const double f9_18 = -f9 * m_A73;
+	m_A74 += m_A29 * f9_18;
+	RHS18 += f9_18 * RHS9;
+	const double f10 = 1.0 / m_A30;
+	const double f10_19 = -f10 * m_A76;
+	m_A80 += m_A31 * f10_19;
+	RHS19 += f10_19 * RHS10;
+	const double f11 = 1.0 / m_A32;
+	const double f11_19 = -f11 * m_A77;
+	m_A80 += m_A33 * f11_19;
+	RHS19 += f11_19 * RHS11;
+	const double f12 = 1.0 / m_A36;
+	const double f12_13 = -f12 * m_A41;
+	m_A42 += m_A37 * f12_13;
+	m_A43 += m_A38 * f12_13;
+	RHS13 += f12_13 * RHS12;
+	const double f12_14 = -f12 * m_A49;
+	m_A50 += m_A37 * f12_14;
+	m_A51 += m_A38 * f12_14;
 	RHS14 += f12_14 * RHS12;
-	const double f13 = 1.0 / m_A30;
-	const double f13_14 = -f13 * m_A41;
-	m_A42 += m_A31 * f13_14;
+	const double f13 = 1.0 / m_A42;
+	const double f13_14 = -f13 * m_A50;
+	m_A51 += m_A43 * f13_14;
+	m_A52 += m_A44 * f13_14;
+	m_A54 += m_A45 * f13_14;
+	m_A55 += m_A46 * f13_14;
 	RHS14 += f13_14 * RHS13;
-	V[14] = RHS14 / m_A42;
+	const double f13_17 = -f13 * m_A65;
+	m_A66 += m_A43 * f13_17;
+	m_A67 += m_A44 * f13_17;
+	m_A70 += m_A45 * f13_17;
+	m_A71 += m_A46 * f13_17;
+	RHS17 += f13_17 * RHS13;
+	const double f13_21 = -f13 * m_A94;
+	m_A95 += m_A43 * f13_21;
+	m_A97 += m_A44 * f13_21;
+	m_A100 += m_A45 * f13_21;
+	m_A101 += m_A46 * f13_21;
+	RHS21 += f13_21 * RHS13;
+	const double f13_22 = -f13 * m_A105;
+	m_A106 += m_A43 * f13_22;
+	m_A107 += m_A44 * f13_22;
+	m_A111 += m_A45 * f13_22;
+	m_A112 += m_A46 * f13_22;
+	RHS22 += f13_22 * RHS13;
+	const double f14 = 1.0 / m_A51;
+	const double f14_17 = -f14 * m_A66;
+	m_A67 += m_A52 * f14_17;
+	m_A68 += m_A53 * f14_17;
+	m_A70 += m_A54 * f14_17;
+	m_A71 += m_A55 * f14_17;
+	RHS17 += f14_17 * RHS14;
+	const double f14_19 = -f14 * m_A78;
+	m_A79 += m_A52 * f14_19;
+	m_A80 += m_A53 * f14_19;
+	m_A82 += m_A54 * f14_19;
+	m_A83 += m_A55 * f14_19;
+	RHS19 += f14_19 * RHS14;
+	const double f14_21 = -f14 * m_A95;
+	m_A97 += m_A52 * f14_21;
+	m_A98 += m_A53 * f14_21;
+	m_A100 += m_A54 * f14_21;
+	m_A101 += m_A55 * f14_21;
+	RHS21 += f14_21 * RHS14;
+	const double f14_22 = -f14 * m_A106;
+	m_A107 += m_A52 * f14_22;
+	m_A109 += m_A53 * f14_22;
+	m_A111 += m_A54 * f14_22;
+	m_A112 += m_A55 * f14_22;
+	RHS22 += f14_22 * RHS14;
+	const double f15 = 1.0 / m_A57;
+	const double f15_20 = -f15 * m_A86;
+	m_A89 += m_A58 * f15_20;
+	RHS20 += f15_20 * RHS15;
+	const double f16 = 1.0 / m_A60;
+	const double f16_21 = -f16 * m_A96;
+	m_A100 += m_A61 * f16_21;
+	RHS21 += f16_21 * RHS16;
+	const double f17 = 1.0 / m_A67;
+	const double f17_19 = -f17 * m_A79;
+	m_A80 += m_A68 * f17_19;
+	m_A81 += m_A69 * f17_19;
+	m_A82 += m_A70 * f17_19;
+	m_A83 += m_A71 * f17_19;
+	RHS19 += f17_19 * RHS17;
+	const double f17_20 = -f17 * m_A87;
+	m_A88 += m_A68 * f17_20;
+	m_A89 += m_A69 * f17_20;
+	m_A90 += m_A70 * f17_20;
+	m_A91 += m_A71 * f17_20;
+	RHS20 += f17_20 * RHS17;
+	const double f17_21 = -f17 * m_A97;
+	m_A98 += m_A68 * f17_21;
+	m_A99 += m_A69 * f17_21;
+	m_A100 += m_A70 * f17_21;
+	m_A101 += m_A71 * f17_21;
+	RHS21 += f17_21 * RHS17;
+	const double f17_22 = -f17 * m_A107;
+	m_A109 += m_A68 * f17_22;
+	m_A110 += m_A69 * f17_22;
+	m_A111 += m_A70 * f17_22;
+	m_A112 += m_A71 * f17_22;
+	RHS22 += f17_22 * RHS17;
+	const double f18 = 1.0 / m_A74;
+	const double f18_22 = -f18 * m_A108;
+	m_A112 += m_A75 * f18_22;
+	RHS22 += f18_22 * RHS18;
+	const double f19 = 1.0 / m_A80;
+	const double f19_20 = -f19 * m_A88;
+	m_A89 += m_A81 * f19_20;
+	m_A90 += m_A82 * f19_20;
+	m_A91 += m_A83 * f19_20;
+	RHS20 += f19_20 * RHS19;
+	const double f19_21 = -f19 * m_A98;
+	m_A99 += m_A81 * f19_21;
+	m_A100 += m_A82 * f19_21;
+	m_A101 += m_A83 * f19_21;
+	RHS21 += f19_21 * RHS19;
+	const double f19_22 = -f19 * m_A109;
+	m_A110 += m_A81 * f19_22;
+	m_A111 += m_A82 * f19_22;
+	m_A112 += m_A83 * f19_22;
+	RHS22 += f19_22 * RHS19;
+	const double f20 = 1.0 / m_A89;
+	const double f20_21 = -f20 * m_A99;
+	m_A100 += m_A90 * f20_21;
+	m_A101 += m_A91 * f20_21;
+	RHS21 += f20_21 * RHS20;
+	const double f20_22 = -f20 * m_A110;
+	m_A111 += m_A90 * f20_22;
+	m_A112 += m_A91 * f20_22;
+	RHS22 += f20_22 * RHS20;
+	const double f21 = 1.0 / m_A100;
+	const double f21_22 = -f21 * m_A111;
+	m_A112 += m_A101 * f21_22;
+	RHS22 += f21_22 * RHS21;
+	V[22] = RHS22 / m_A112;
+	double tmp21 = 0.0;
+	tmp21 += m_A101 * V[22];
+	V[21] = (RHS21 - tmp21) / m_A100;
+	double tmp20 = 0.0;
+	tmp20 += m_A90 * V[21];
+	tmp20 += m_A91 * V[22];
+	V[20] = (RHS20 - tmp20) / m_A89;
+	double tmp19 = 0.0;
+	tmp19 += m_A81 * V[20];
+	tmp19 += m_A82 * V[21];
+	tmp19 += m_A83 * V[22];
+	V[19] = (RHS19 - tmp19) / m_A80;
+	double tmp18 = 0.0;
+	tmp18 += m_A75 * V[22];
+	V[18] = (RHS18 - tmp18) / m_A74;
+	double tmp17 = 0.0;
+	tmp17 += m_A68 * V[19];
+	tmp17 += m_A69 * V[20];
+	tmp17 += m_A70 * V[21];
+	tmp17 += m_A71 * V[22];
+	V[17] = (RHS17 - tmp17) / m_A67;
+	double tmp16 = 0.0;
+	tmp16 += m_A61 * V[21];
+	V[16] = (RHS16 - tmp16) / m_A60;
+	double tmp15 = 0.0;
+	tmp15 += m_A58 * V[20];
+	V[15] = (RHS15 - tmp15) / m_A57;
+	double tmp14 = 0.0;
+	tmp14 += m_A52 * V[17];
+	tmp14 += m_A53 * V[19];
+	tmp14 += m_A54 * V[21];
+	tmp14 += m_A55 * V[22];
+	V[14] = (RHS14 - tmp14) / m_A51;
 	double tmp13 = 0.0;
-	tmp13 += m_A31 * V[14];
-	V[13] = (RHS13 - tmp13) / m_A30;
+	tmp13 += m_A43 * V[14];
+	tmp13 += m_A44 * V[17];
+	tmp13 += m_A45 * V[21];
+	tmp13 += m_A46 * V[22];
+	V[13] = (RHS13 - tmp13) / m_A42;
 	double tmp12 = 0.0;
-	tmp12 += m_A26 * V[14];
-	V[12] = (RHS12 - tmp12) / m_A25;
+	tmp12 += m_A37 * V[13];
+	tmp12 += m_A38 * V[14];
+	V[12] = (RHS12 - tmp12) / m_A36;
 	double tmp11 = 0.0;
-	tmp11 += m_A23 * V[13];
-	V[11] = (RHS11 - tmp11) / m_A22;
+	tmp11 += m_A33 * V[19];
+	V[11] = (RHS11 - tmp11) / m_A32;
 	double tmp10 = 0.0;
-	tmp10 += m_A21 * V[13];
-	V[10] = (RHS10 - tmp10) / m_A20;
+	tmp10 += m_A31 * V[19];
+	V[10] = (RHS10 - tmp10) / m_A30;
 	double tmp9 = 0.0;
-	tmp9 += m_A19 * V[13];
-	V[9] = (RHS9 - tmp9) / m_A18;
+	tmp9 += m_A29 * V[18];
+	V[9] = (RHS9 - tmp9) / m_A28;
 	double tmp8 = 0.0;
-	tmp8 += m_A17 * V[14];
-	V[8] = (RHS8 - tmp8) / m_A16;
+	tmp8 += m_A26 * V[18];
+	tmp8 += m_A27 * V[22];
+	V[8] = (RHS8 - tmp8) / m_A25;
 	double tmp7 = 0.0;
-	tmp7 += m_A15 * V[14];
-	V[7] = (RHS7 - tmp7) / m_A14;
+	tmp7 += m_A21 * V[14];
+	tmp7 += m_A22 * V[17];
+	tmp7 += m_A23 * V[21];
+	tmp7 += m_A24 * V[22];
+	V[7] = (RHS7 - tmp7) / m_A20;
 	double tmp6 = 0.0;
-	tmp6 += m_A13 * V[14];
-	V[6] = (RHS6 - tmp6) / m_A12;
+	tmp6 += m_A16 * V[13];
+	tmp6 += m_A17 * V[17];
+	tmp6 += m_A18 * V[21];
+	tmp6 += m_A19 * V[22];
+	V[6] = (RHS6 - tmp6) / m_A15;
 	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[14];
-	V[5] = (RHS5 - tmp5) / m_A10;
+	tmp5 += m_A14 * V[16];
+	V[5] = (RHS5 - tmp5) / m_A13;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[14];
-	V[4] = (RHS4 - tmp4) / m_A8;
+	tmp4 += m_A11 * V[17];
+	tmp4 += m_A12 * V[20];
+	V[4] = (RHS4 - tmp4) / m_A10;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[14];
-	V[3] = (RHS3 - tmp3) / m_A6;
+	tmp3 += m_A9 * V[20];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[15];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[12];
+	tmp1 += m_A4 * V[13];
+	tmp1 += m_A5 * V[14];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[12];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// sspeedr
+static void nl_gcr_ac1e401ddf971e15_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	m_A9 += gt[7];
+	m_A9 += gt[8];
+	m_A9 += gt[9];
+	m_A8 += go[7];
+	m_A7 += go[8];
+	m_A6 += go[9];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 += Idr[9];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A6;
+	m_A9 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A7;
+	m_A9 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_3 = -f2 * m_A8;
+	m_A9 += m_A5 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starfire
+static void nl_gcr_aceb6035dfb557c9_12_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A4 += go[2];
+	m_A3 += go[3];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A7 += gt[5];
+	m_A7 += gt[6];
+	m_A7 += gt[7];
+	m_A7 += gt[8];
+	m_A7 += gt[9];
+	m_A6 += go[5];
+	m_A5 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	m_A11 += gt[10];
+	m_A11 += gt[11];
+	m_A9 += go[10];
+	double RHS3 = Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[11] * *cnV[11];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A5;
+	m_A7 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A6;
+	m_A7 += m_A3 * f1_2;
+	m_A8 += m_A4 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A7;
+	const double f2_3 = -f2 * m_A10;
+	m_A11 += m_A8 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A11;
+	double tmp2 = 0.0;
+	tmp2 += m_A8 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A7;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// sundance
+static void nl_gcr_ad6dba01ff2425c3_12_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A4 += go[2];
+	m_A3 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[7];
+	m_A7 += go[8];
+	m_A5 += go[9];
+	m_A5 += go[10];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[11] * *cnV[11];
+	m_A11 += gt[12];
+	m_A11 += gt[13];
+	m_A11 += gt[14];
+	m_A11 += gt[15];
+	m_A11 += gt[16];
+	m_A10 += go[12];
+	m_A10 += go[13];
+	m_A9 += go[14];
+	m_A8 += go[15];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 -= go[16] * *cnV[16];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A11 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	m_A7 += m_A4 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_3 = -f2 * m_A10;
+	m_A11 += m_A7 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A11;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[14];
-	V[2] = (RHS2 - tmp2) / m_A4;
+	tmp2 += m_A7 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A6;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[14];
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[3];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[12];
+	tmp0 += m_A1 * V[3];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// kidniki
-static void nl_gcr_580e08d22698f60a_37_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// rebound
+static void nl_gcr_ae15f7f8a55fc96_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[4];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A5 += go[6];
+	m_A4 += go[7];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// armora
+static void nl_gcr_afcde432efdafb81_56_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -4733,235 +42629,374 @@
 	double m_A34(0.0);
 	double m_A35(0.0);
 	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
-	m_A0 += gt[3];
-	m_A2 += go[0];
-	m_A2 += go[1];
-	m_A1 += go[2];
+	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
-	RHS0 += Idr[3];
-	RHS0 -= go[3] * *cnV[3];
-	m_A3 += gt[4];
-	m_A3 += gt[5];
-	m_A3 += gt[6];
-	m_A5 += go[4];
-	m_A4 += go[5];
-	double RHS1 = Idr[4];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
 	RHS1 += Idr[5];
-	RHS1 += Idr[6];
-	RHS1 -= go[6] * *cnV[6];
-	m_A6 += gt[7];
-	m_A6 += gt[8];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
 	m_A6 += gt[9];
 	m_A6 += gt[10];
 	m_A6 += gt[11];
-	m_A6 += gt[12];
-	m_A6 += gt[13];
-	m_A7 += go[7];
-	m_A7 += go[8];
-	m_A8 += go[9];
-	double RHS2 = Idr[7];
-	RHS2 += Idr[8];
-	RHS2 += Idr[9];
-	RHS2 += Idr[10];
-	RHS2 += Idr[11];
-	RHS2 += Idr[12];
-	RHS2 += Idr[13];
-	RHS2 -= go[10] * *cnV[10];
-	RHS2 -= go[11] * *cnV[11];
-	RHS2 -= go[12] * *cnV[12];
-	RHS2 -= go[13] * *cnV[13];
-	m_A9 += gt[14];
-	m_A9 += gt[15];
-	m_A9 += gt[16];
-	m_A11 += go[14];
-	m_A10 += go[15];
-	double RHS3 = Idr[14];
-	RHS3 += Idr[15];
-	RHS3 += Idr[16];
-	RHS3 -= go[16] * *cnV[16];
-	m_A14 += gt[17];
-	m_A14 += gt[18];
-	m_A14 += gt[19];
-	m_A14 += gt[20];
-	m_A14 += gt[21];
-	m_A13 += go[17];
-	m_A12 += go[18];
-	m_A12 += go[19];
-	double RHS4 = Idr[17];
-	RHS4 += Idr[18];
-	RHS4 += Idr[19];
-	RHS4 += Idr[20];
-	RHS4 += Idr[21];
-	RHS4 -= go[20] * *cnV[20];
-	RHS4 -= go[21] * *cnV[21];
-	m_A18 += gt[22];
-	m_A18 += gt[23];
-	m_A18 += gt[24];
-	m_A18 += gt[25];
-	m_A18 += gt[26];
-	m_A18 += gt[27];
-	m_A18 += gt[28];
-	m_A20 += go[22];
-	m_A19 += go[23];
-	m_A19 += go[24];
-	m_A19 += go[25];
-	m_A17 += go[26];
-	double RHS5 = Idr[22];
-	RHS5 += Idr[23];
-	RHS5 += Idr[24];
-	RHS5 += Idr[25];
-	RHS5 += Idr[26];
-	RHS5 += Idr[27];
-	RHS5 += Idr[28];
-	RHS5 -= go[27] * *cnV[27];
-	RHS5 -= go[28] * *cnV[28];
-	m_A23 += gt[29];
-	m_A23 += gt[30];
-	m_A23 += gt[31];
-	m_A23 += gt[32];
-	m_A21 += go[29];
-	double RHS6 = Idr[29];
-	RHS6 += Idr[30];
-	RHS6 += Idr[31];
-	RHS6 += Idr[32];
-	RHS6 -= go[30] * *cnV[30];
-	RHS6 -= go[31] * *cnV[31];
-	RHS6 -= go[32] * *cnV[32];
-	m_A28 += gt[33];
-	m_A28 += gt[34];
-	m_A28 += gt[35];
-	m_A28 += gt[36];
-	m_A28 += gt[37];
-	m_A28 += gt[38];
-	m_A26 += go[33];
-	m_A27 += go[34];
-	m_A27 += go[35];
-	m_A27 += go[36];
-	m_A25 += go[37];
-	m_A25 += go[38];
-	double RHS7 = Idr[33];
-	RHS7 += Idr[34];
-	RHS7 += Idr[35];
-	RHS7 += Idr[36];
-	RHS7 += Idr[37];
-	RHS7 += Idr[38];
-	m_A36 += gt[39];
-	m_A36 += gt[40];
-	m_A36 += gt[41];
-	m_A36 += gt[42];
-	m_A30 += go[39];
-	m_A33 += go[40];
-	m_A31 += go[41];
-	double RHS8 = Idr[39];
-	RHS8 += Idr[40];
-	RHS8 += Idr[41];
-	RHS8 += Idr[42];
-	RHS8 -= go[42] * *cnV[42];
+	m_A7 += go[9];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A8 += gt[18];
+	m_A8 += gt[19];
+	m_A8 += gt[20];
+	m_A8 += gt[21];
+	m_A9 += go[12];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 += Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 -= go[13] * *cnV[13];
+	RHS4 -= go[14] * *cnV[14];
+	RHS4 -= go[15] * *cnV[15];
+	RHS4 -= go[16] * *cnV[16];
+	RHS4 -= go[17] * *cnV[17];
+	RHS4 -= go[18] * *cnV[18];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	m_A10 += gt[22];
+	m_A10 += gt[23];
+	m_A11 += go[22];
+	double RHS5 = Idr[22];
+	RHS5 += Idr[23];
+	RHS5 -= go[23] * *cnV[23];
+	m_A12 += gt[24];
+	m_A12 += gt[25];
+	m_A14 += go[24];
+	m_A13 += go[25];
+	double RHS6 = Idr[24];
+	RHS6 += Idr[25];
+	m_A15 += gt[26];
+	m_A15 += gt[27];
+	m_A17 += go[26];
+	m_A16 += go[27];
+	double RHS7 = Idr[26];
+	RHS7 += Idr[27];
+	m_A18 += gt[28];
+	m_A18 += gt[29];
+	m_A20 += go[28];
+	m_A19 += go[29];
+	double RHS8 = Idr[28];
+	RHS8 += Idr[29];
+	m_A21 += gt[30];
+	m_A21 += gt[31];
+	m_A21 += gt[32];
+	m_A21 += gt[33];
+	m_A21 += gt[34];
+	m_A21 += gt[35];
+	m_A21 += gt[36];
+	m_A22 += go[30];
+	double RHS9 = Idr[30];
+	RHS9 += Idr[31];
+	RHS9 += Idr[32];
+	RHS9 += Idr[33];
+	RHS9 += Idr[34];
+	RHS9 += Idr[35];
+	RHS9 += Idr[36];
+	RHS9 -= go[31] * *cnV[31];
+	RHS9 -= go[32] * *cnV[32];
+	RHS9 -= go[33] * *cnV[33];
+	RHS9 -= go[34] * *cnV[34];
+	RHS9 -= go[35] * *cnV[35];
+	RHS9 -= go[36] * *cnV[36];
+	m_A25 += gt[37];
+	m_A25 += gt[38];
+	m_A25 += gt[39];
+	m_A24 += go[37];
+	m_A23 += go[38];
+	double RHS10 = Idr[37];
+	RHS10 += Idr[38];
+	RHS10 += Idr[39];
+	RHS10 -= go[39] * *cnV[39];
+	m_A28 += gt[40];
+	m_A28 += gt[41];
+	m_A28 += gt[42];
+	m_A28 += gt[43];
+	m_A28 += gt[44];
+	m_A28 += gt[45];
+	m_A28 += gt[46];
+	m_A29 += go[40];
+	m_A27 += go[41];
+	double RHS11 = Idr[40];
+	RHS11 += Idr[41];
+	RHS11 += Idr[42];
+	RHS11 += Idr[43];
+	RHS11 += Idr[44];
+	RHS11 += Idr[45];
+	RHS11 += Idr[46];
+	RHS11 -= go[42] * *cnV[42];
+	RHS11 -= go[43] * *cnV[43];
+	RHS11 -= go[44] * *cnV[44];
+	RHS11 -= go[45] * *cnV[45];
+	RHS11 -= go[46] * *cnV[46];
+	m_A31 += gt[47];
+	m_A31 += gt[48];
+	m_A32 += go[47];
+	m_A30 += go[48];
+	double RHS12 = Idr[47];
+	RHS12 += Idr[48];
+	m_A37 += gt[49];
+	m_A37 += gt[50];
+	m_A37 += gt[51];
+	m_A37 += gt[52];
+	m_A37 += gt[53];
+	m_A36 += go[49];
+	m_A35 += go[50];
+	m_A34 += go[51];
+	m_A33 += go[52];
+	double RHS13 = Idr[49];
+	RHS13 += Idr[50];
+	RHS13 += Idr[51];
+	RHS13 += Idr[52];
+	RHS13 += Idr[53];
+	RHS13 -= go[53] * *cnV[53];
+	m_A42 += gt[54];
+	m_A42 += gt[55];
+	m_A42 += gt[56];
+	m_A42 += gt[57];
+	m_A42 += gt[58];
+	m_A41 += go[54];
+	m_A40 += go[55];
+	m_A39 += go[56];
+	double RHS14 = Idr[54];
+	RHS14 += Idr[55];
+	RHS14 += Idr[56];
+	RHS14 += Idr[57];
+	RHS14 += Idr[58];
+	RHS14 -= go[57] * *cnV[57];
+	RHS14 -= go[58] * *cnV[58];
+	m_A45 += gt[59];
+	m_A45 += gt[60];
+	m_A45 += gt[61];
+	m_A45 += gt[62];
+	m_A44 += go[59];
+	m_A46 += go[60];
+	double RHS15 = Idr[59];
+	RHS15 += Idr[60];
+	RHS15 += Idr[61];
+	RHS15 += Idr[62];
+	RHS15 -= go[61] * *cnV[61];
+	RHS15 -= go[62] * *cnV[62];
+	m_A55 += gt[63];
+	m_A55 += gt[64];
+	m_A55 += gt[65];
+	m_A55 += gt[66];
+	m_A55 += gt[67];
+	m_A55 += gt[68];
+	m_A54 += go[63];
+	m_A49 += go[64];
+	m_A51 += go[65];
+	m_A48 += go[66];
+	m_A47 += go[67];
+	double RHS16 = Idr[63];
+	RHS16 += Idr[64];
+	RHS16 += Idr[65];
+	RHS16 += Idr[66];
+	RHS16 += Idr[67];
+	RHS16 += Idr[68];
+	RHS16 -= go[68] * *cnV[68];
 	const double f0 = 1.0 / m_A0;
-	const double f0_5 = -f0 * m_A17;
-	m_A18 += m_A1 * f0_5;
-	m_A19 += m_A2 * f0_5;
-	RHS5 += f0_5 * RHS0;
-	const double f0_7 = -f0 * m_A25;
-	m_A27 += m_A1 * f0_7;
-	m_A28 += m_A2 * f0_7;
-	RHS7 += f0_7 * RHS0;
-	const double f1 = 1.0 / m_A3;
-	const double f1_7 = -f1 * m_A26;
-	m_A28 += m_A4 * f1_7;
-	m_A29 += m_A5 * f1_7;
-	RHS7 += f1_7 * RHS1;
-	const double f1_8 = -f1 * m_A30;
-	m_A35 += m_A4 * f1_8;
-	m_A36 += m_A5 * f1_8;
-	RHS8 += f1_8 * RHS1;
-	const double f2 = 1.0 / m_A6;
-	const double f2_4 = -f2 * m_A12;
-	m_A14 += m_A7 * f2_4;
-	m_A16 += m_A8 * f2_4;
-	RHS4 += f2_4 * RHS2;
-	const double f2_8 = -f2 * m_A31;
-	m_A32 += m_A7 * f2_8;
-	m_A36 += m_A8 * f2_8;
-	RHS8 += f2_8 * RHS2;
-	const double f3 = 1.0 / m_A9;
-	const double f3_4 = -f3 * m_A13;
-	m_A14 += m_A10 * f3_4;
-	m_A15 += m_A11 * f3_4;
-	RHS4 += f3_4 * RHS3;
-	const double f3_6 = -f3 * m_A21;
-	m_A22 += m_A10 * f3_6;
-	m_A23 += m_A11 * f3_6;
-	RHS6 += f3_6 * RHS3;
-	const double f4 = 1.0 / m_A14;
-	const double f4_6 = -f4 * m_A22;
-	m_A23 += m_A15 * f4_6;
-	m_A24 += m_A16 * f4_6;
-	RHS6 += f4_6 * RHS4;
-	const double f4_8 = -f4 * m_A32;
-	m_A34 += m_A15 * f4_8;
-	m_A36 += m_A16 * f4_8;
-	RHS8 += f4_8 * RHS4;
-	const double f5 = 1.0 / m_A18;
-	const double f5_7 = -f5 * m_A27;
-	m_A28 += m_A19 * f5_7;
-	m_A29 += m_A20 * f5_7;
-	RHS7 += f5_7 * RHS5;
-	const double f5_8 = -f5 * m_A33;
-	m_A35 += m_A19 * f5_8;
-	m_A36 += m_A20 * f5_8;
-	RHS8 += f5_8 * RHS5;
-	const double f6 = 1.0 / m_A23;
-	const double f6_8 = -f6 * m_A34;
-	m_A36 += m_A24 * f6_8;
-	RHS8 += f6_8 * RHS6;
-	const double f7 = 1.0 / m_A28;
-	const double f7_8 = -f7 * m_A35;
-	m_A36 += m_A29 * f7_8;
-	RHS8 += f7_8 * RHS7;
-	V[8] = RHS8 / m_A36;
+	const double f0_10 = -f0 * m_A23;
+	m_A25 += m_A1 * f0_10;
+	RHS10 += f0_10 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_13 = -f1 * m_A33;
+	m_A37 += m_A3 * f1_13;
+	RHS13 += f1_13 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_13 = -f2 * m_A34;
+	m_A37 += m_A5 * f2_13;
+	RHS13 += f2_13 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_13 = -f3 * m_A35;
+	m_A37 += m_A7 * f3_13;
+	RHS13 += f3_13 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_11 = -f4 * m_A27;
+	m_A29 += m_A9 * f4_11;
+	RHS11 += f4_11 * RHS4;
+	const double f4_14 = -f4 * m_A39;
+	m_A42 += m_A9 * f4_14;
+	RHS14 += f4_14 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_12 = -f5 * m_A30;
+	m_A31 += m_A11 * f5_12;
+	RHS12 += f5_12 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_10 = -f6 * m_A24;
+	m_A25 += m_A13 * f6_10;
+	m_A26 += m_A14 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f6_16 = -f6 * m_A47;
+	m_A50 += m_A13 * f6_16;
+	m_A55 += m_A14 * f6_16;
+	RHS16 += f6_16 * RHS6;
+	const double f7 = 1.0 / m_A15;
+	const double f7_13 = -f7 * m_A36;
+	m_A37 += m_A16 * f7_13;
+	m_A38 += m_A17 * f7_13;
+	RHS13 += f7_13 * RHS7;
+	const double f7_16 = -f7 * m_A48;
+	m_A52 += m_A16 * f7_16;
+	m_A55 += m_A17 * f7_16;
+	RHS16 += f7_16 * RHS7;
+	const double f8 = 1.0 / m_A18;
+	const double f8_14 = -f8 * m_A40;
+	m_A42 += m_A19 * f8_14;
+	m_A43 += m_A20 * f8_14;
+	RHS14 += f8_14 * RHS8;
+	const double f8_16 = -f8 * m_A49;
+	m_A53 += m_A19 * f8_16;
+	m_A55 += m_A20 * f8_16;
+	RHS16 += f8_16 * RHS8;
+	const double f9 = 1.0 / m_A21;
+	const double f9_15 = -f9 * m_A44;
+	m_A46 += m_A22 * f9_15;
+	RHS15 += f9_15 * RHS9;
+	const double f10 = 1.0 / m_A25;
+	const double f10_16 = -f10 * m_A50;
+	m_A55 += m_A26 * f10_16;
+	RHS16 += f10_16 * RHS10;
+	const double f11 = 1.0 / m_A28;
+	const double f11_14 = -f11 * m_A41;
+	m_A42 += m_A29 * f11_14;
+	RHS14 += f11_14 * RHS11;
+	const double f12 = 1.0 / m_A31;
+	const double f12_16 = -f12 * m_A51;
+	m_A55 += m_A32 * f12_16;
+	RHS16 += f12_16 * RHS12;
+	const double f13 = 1.0 / m_A37;
+	const double f13_16 = -f13 * m_A52;
+	m_A55 += m_A38 * f13_16;
+	RHS16 += f13_16 * RHS13;
+	const double f14 = 1.0 / m_A42;
+	const double f14_16 = -f14 * m_A53;
+	m_A55 += m_A43 * f14_16;
+	RHS16 += f14_16 * RHS14;
+	const double f15 = 1.0 / m_A45;
+	const double f15_16 = -f15 * m_A54;
+	m_A55 += m_A46 * f15_16;
+	RHS16 += f15_16 * RHS15;
+	V[16] = RHS16 / m_A55;
+	double tmp15 = 0.0;
+	tmp15 += m_A46 * V[16];
+	V[15] = (RHS15 - tmp15) / m_A45;
+	double tmp14 = 0.0;
+	tmp14 += m_A43 * V[16];
+	V[14] = (RHS14 - tmp14) / m_A42;
+	double tmp13 = 0.0;
+	tmp13 += m_A38 * V[16];
+	V[13] = (RHS13 - tmp13) / m_A37;
+	double tmp12 = 0.0;
+	tmp12 += m_A32 * V[16];
+	V[12] = (RHS12 - tmp12) / m_A31;
+	double tmp11 = 0.0;
+	tmp11 += m_A29 * V[14];
+	V[11] = (RHS11 - tmp11) / m_A28;
+	double tmp10 = 0.0;
+	tmp10 += m_A26 * V[16];
+	V[10] = (RHS10 - tmp10) / m_A25;
+	double tmp9 = 0.0;
+	tmp9 += m_A22 * V[16];
+	V[9] = (RHS9 - tmp9) / m_A21;
+	double tmp8 = 0.0;
+	tmp8 += m_A19 * V[14];
+	tmp8 += m_A20 * V[16];
+	V[8] = (RHS8 - tmp8) / m_A18;
 	double tmp7 = 0.0;
-	tmp7 += m_A29 * V[8];
-	V[7] = (RHS7 - tmp7) / m_A28;
+	tmp7 += m_A16 * V[13];
+	tmp7 += m_A17 * V[16];
+	V[7] = (RHS7 - tmp7) / m_A15;
 	double tmp6 = 0.0;
-	tmp6 += m_A24 * V[8];
-	V[6] = (RHS6 - tmp6) / m_A23;
+	tmp6 += m_A13 * V[10];
+	tmp6 += m_A14 * V[16];
+	V[6] = (RHS6 - tmp6) / m_A12;
 	double tmp5 = 0.0;
-	tmp5 += m_A19 * V[7];
-	tmp5 += m_A20 * V[8];
-	V[5] = (RHS5 - tmp5) / m_A18;
+	tmp5 += m_A11 * V[12];
+	V[5] = (RHS5 - tmp5) / m_A10;
 	double tmp4 = 0.0;
-	tmp4 += m_A15 * V[6];
-	tmp4 += m_A16 * V[8];
-	V[4] = (RHS4 - tmp4) / m_A14;
+	tmp4 += m_A9 * V[14];
+	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A10 * V[4];
-	tmp3 += m_A11 * V[6];
-	V[3] = (RHS3 - tmp3) / m_A9;
+	tmp3 += m_A7 * V[13];
+	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A7 * V[4];
-	tmp2 += m_A8 * V[8];
-	V[2] = (RHS2 - tmp2) / m_A6;
+	tmp2 += m_A5 * V[13];
+	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A4 * V[7];
-	tmp1 += m_A5 * V[8];
-	V[1] = (RHS1 - tmp1) / m_A3;
+	tmp1 += m_A3 * V[13];
+	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[5];
-	tmp0 += m_A2 * V[7];
+	tmp0 += m_A1 * V[10];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// kidniki
-static void nl_gcr_58f8065842de37d4_34_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// mario
+static void nl_gcr_afce66fb47d3c5f3_62_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -4996,544 +43031,555 @@
 	double m_A31(0.0);
 	double m_A32(0.0);
 	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
-	m_A0 += gt[2];
-	m_A1 += go[0];
-	m_A2 += go[1];
-	double RHS0 = Idr[0];
-	RHS0 += Idr[1];
-	RHS0 += Idr[2];
-	RHS0 -= go[2] * *cnV[2];
-	m_A3 += gt[3];
-	m_A3 += gt[4];
-	m_A3 += gt[5];
-	m_A3 += gt[6];
-	m_A3 += gt[7];
-	m_A3 += gt[8];
-	m_A3 += gt[9];
-	m_A5 += go[3];
-	m_A4 += go[4];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 += Idr[6];
-	RHS1 += Idr[7];
-	RHS1 += Idr[8];
-	RHS1 += Idr[9];
-	RHS1 -= go[5] * *cnV[5];
-	RHS1 -= go[6] * *cnV[6];
-	RHS1 -= go[7] * *cnV[7];
-	RHS1 -= go[8] * *cnV[8];
-	RHS1 -= go[9] * *cnV[9];
-	m_A7 += gt[10];
-	m_A7 += gt[11];
-	m_A7 += gt[12];
-	m_A6 += go[10];
-	double RHS2 = Idr[10];
-	RHS2 += Idr[11];
-	RHS2 += Idr[12];
-	RHS2 -= go[11] * *cnV[11];
-	RHS2 -= go[12] * *cnV[12];
-	m_A9 += gt[13];
-	m_A9 += gt[14];
-	m_A9 += gt[15];
-	m_A11 += go[13];
-	m_A10 += go[14];
-	double RHS3 = Idr[13];
-	RHS3 += Idr[14];
-	RHS3 += Idr[15];
-	RHS3 -= go[15] * *cnV[15];
-	m_A12 += gt[16];
-	m_A12 += gt[17];
-	m_A12 += gt[18];
-	m_A14 += go[16];
-	m_A13 += go[17];
-	double RHS4 = Idr[16];
-	RHS4 += Idr[17];
-	RHS4 += Idr[18];
-	RHS4 -= go[18] * *cnV[18];
-	m_A17 += gt[19];
-	m_A17 += gt[20];
-	m_A17 += gt[21];
-	m_A17 += gt[22];
-	m_A17 += gt[23];
-	m_A17 += gt[24];
-	m_A17 += gt[25];
-	m_A15 += go[19];
-	m_A18 += go[20];
-	double RHS5 = Idr[19];
-	RHS5 += Idr[20];
-	RHS5 += Idr[21];
-	RHS5 += Idr[22];
-	RHS5 += Idr[23];
-	RHS5 += Idr[24];
-	RHS5 += Idr[25];
-	RHS5 -= go[21] * *cnV[21];
-	RHS5 -= go[22] * *cnV[22];
-	RHS5 -= go[23] * *cnV[23];
-	RHS5 -= go[24] * *cnV[24];
-	RHS5 -= go[25] * *cnV[25];
-	m_A21 += gt[26];
-	m_A21 += gt[27];
-	m_A21 += gt[28];
-	m_A21 += gt[29];
-	m_A21 += gt[30];
-	m_A21 += gt[31];
-	m_A19 += go[26];
-	m_A22 += go[27];
-	m_A20 += go[28];
-	double RHS6 = Idr[26];
-	RHS6 += Idr[27];
-	RHS6 += Idr[28];
-	RHS6 += Idr[29];
-	RHS6 += Idr[30];
-	RHS6 += Idr[31];
-	RHS6 -= go[29] * *cnV[29];
-	RHS6 -= go[30] * *cnV[30];
-	RHS6 -= go[31] * *cnV[31];
-	m_A27 += gt[32];
-	m_A27 += gt[33];
-	m_A27 += gt[34];
-	m_A27 += gt[35];
-	m_A27 += gt[36];
-	m_A26 += go[32];
-	m_A25 += go[33];
-	m_A23 += go[34];
-	double RHS7 = Idr[32];
-	RHS7 += Idr[33];
-	RHS7 += Idr[34];
-	RHS7 += Idr[35];
-	RHS7 += Idr[36];
-	RHS7 -= go[35] * *cnV[35];
-	RHS7 -= go[36] * *cnV[36];
-	m_A33 += gt[37];
-	m_A33 += gt[38];
-	m_A33 += gt[39];
-	m_A30 += go[37];
-	m_A31 += go[38];
-	m_A29 += go[39];
-	double RHS8 = Idr[37];
-	RHS8 += Idr[38];
-	RHS8 += Idr[39];
-	const double f0 = 1.0 / m_A0;
-	const double f0_2 = -f0 * m_A6;
-	m_A7 += m_A1 * f0_2;
-	m_A8 += m_A2 * f0_2;
-	RHS2 += f0_2 * RHS0;
-	const double f0_5 = -f0 * m_A15;
-	m_A16 += m_A1 * f0_5;
-	m_A18 += m_A2 * f0_5;
-	RHS5 += f0_5 * RHS0;
-	const double f0_7 = -f0 * m_A23;
-	m_A24 += m_A1 * f0_7;
-	m_A27 += m_A2 * f0_7;
-	RHS7 += f0_7 * RHS0;
-	const double f1 = 1.0 / m_A3;
-	const double f1_6 = -f1 * m_A19;
-	m_A20 += m_A4 * f1_6;
-	m_A21 += m_A5 * f1_6;
-	RHS6 += f1_6 * RHS1;
-	const double f2 = 1.0 / m_A7;
-	const double f2_5 = -f2 * m_A16;
-	m_A18 += m_A8 * f2_5;
-	RHS5 += f2_5 * RHS2;
-	const double f2_7 = -f2 * m_A24;
-	m_A27 += m_A8 * f2_7;
-	RHS7 += f2_7 * RHS2;
-	const double f3 = 1.0 / m_A9;
-	const double f3_6 = -f3 * m_A20;
-	m_A21 += m_A10 * f3_6;
-	m_A22 += m_A11 * f3_6;
-	RHS6 += f3_6 * RHS3;
-	const double f3_8 = -f3 * m_A29;
-	m_A31 += m_A10 * f3_8;
-	m_A33 += m_A11 * f3_8;
-	RHS8 += f3_8 * RHS3;
-	const double f4 = 1.0 / m_A12;
-	const double f4_7 = -f4 * m_A25;
-	m_A27 += m_A13 * f4_7;
-	m_A28 += m_A14 * f4_7;
-	RHS7 += f4_7 * RHS4;
-	const double f4_8 = -f4 * m_A30;
-	m_A32 += m_A13 * f4_8;
-	m_A33 += m_A14 * f4_8;
-	RHS8 += f4_8 * RHS4;
-	const double f5 = 1.0 / m_A17;
-	const double f5_7 = -f5 * m_A26;
-	m_A27 += m_A18 * f5_7;
-	RHS7 += f5_7 * RHS5;
-	const double f6 = 1.0 / m_A21;
-	const double f6_8 = -f6 * m_A31;
-	m_A33 += m_A22 * f6_8;
-	RHS8 += f6_8 * RHS6;
-	const double f7 = 1.0 / m_A27;
-	const double f7_8 = -f7 * m_A32;
-	m_A33 += m_A28 * f7_8;
-	RHS8 += f7_8 * RHS7;
-	V[8] = RHS8 / m_A33;
-	double tmp7 = 0.0;
-	tmp7 += m_A28 * V[8];
-	V[7] = (RHS7 - tmp7) / m_A27;
-	double tmp6 = 0.0;
-	tmp6 += m_A22 * V[8];
-	V[6] = (RHS6 - tmp6) / m_A21;
-	double tmp5 = 0.0;
-	tmp5 += m_A18 * V[7];
-	V[5] = (RHS5 - tmp5) / m_A17;
-	double tmp4 = 0.0;
-	tmp4 += m_A13 * V[7];
-	tmp4 += m_A14 * V[8];
-	V[4] = (RHS4 - tmp4) / m_A12;
-	double tmp3 = 0.0;
-	tmp3 += m_A10 * V[6];
-	tmp3 += m_A11 * V[8];
-	V[3] = (RHS3 - tmp3) / m_A9;
-	double tmp2 = 0.0;
-	tmp2 += m_A8 * V[7];
-	V[2] = (RHS2 - tmp2) / m_A7;
-	double tmp1 = 0.0;
-	tmp1 += m_A4 * V[3];
-	tmp1 += m_A5 * V[6];
-	V[1] = (RHS1 - tmp1) / m_A3;
-	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[2];
-	tmp0 += m_A2 * V[7];
-	V[0] = (RHS0 - tmp0) / m_A0;
-}
-
-// breakout
-static void nl_gcr_59095cbc65117534_13_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
-
-{
-
-	double m_A0(0.0);
-	double m_A1(0.0);
-	double m_A2(0.0);
-	double m_A3(0.0);
-	double m_A4(0.0);
-	double m_A5(0.0);
-	double m_A6(0.0);
-	double m_A7(0.0);
-	double m_A8(0.0);
-	double m_A9(0.0);
-	double m_A10(0.0);
-	double m_A11(0.0);
-	double m_A12(0.0);
-	m_A0 += gt[0];
-	m_A0 += gt[1];
-	m_A0 += gt[2];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
-	RHS0 += Idr[2];
 	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[2];
 	m_A2 += gt[3];
 	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
 	RHS1 += Idr[4];
-	RHS1 += Idr[5];
+	RHS1 -= go[3] * *cnV[3];
 	RHS1 -= go[4] * *cnV[4];
-	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[5];
 	m_A4 += gt[6];
-	m_A4 += gt[7];
-	m_A4 += gt[8];
-	m_A5 += go[6];
-	double RHS2 = Idr[6];
-	RHS2 += Idr[7];
-	RHS2 += Idr[8];
-	RHS2 -= go[7] * *cnV[7];
-	RHS2 -= go[8] * *cnV[8];
+	m_A5 += go[5];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
 	m_A6 += gt[9];
 	m_A6 += gt[10];
 	m_A6 += gt[11];
-	m_A7 += go[9];
-	double RHS3 = Idr[9];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A7 += go[7];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 += Idr[9];
 	RHS3 += Idr[10];
 	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 -= go[8] * *cnV[8];
+	RHS3 -= go[9] * *cnV[9];
 	RHS3 -= go[10] * *cnV[10];
 	RHS3 -= go[11] * *cnV[11];
-	m_A12 += gt[12];
-	m_A12 += gt[13];
-	m_A12 += gt[14];
-	m_A12 += gt[15];
-	m_A12 += gt[16];
-	m_A12 += gt[17];
-	m_A11 += go[12];
-	m_A10 += go[13];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A8 += gt[18];
+	m_A8 += gt[19];
+	m_A8 += gt[20];
 	m_A9 += go[14];
-	m_A8 += go[15];
-	double RHS4 = Idr[12];
-	RHS4 += Idr[13];
-	RHS4 += Idr[14];
+	double RHS4 = Idr[14];
 	RHS4 += Idr[15];
 	RHS4 += Idr[16];
 	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 -= go[15] * *cnV[15];
 	RHS4 -= go[16] * *cnV[16];
 	RHS4 -= go[17] * *cnV[17];
+	RHS4 -= go[18] * *cnV[18];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	m_A10 += gt[21];
+	m_A10 += gt[22];
+	m_A12 += go[21];
+	m_A11 += go[22];
+	double RHS5 = Idr[21];
+	RHS5 += Idr[22];
+	m_A13 += gt[23];
+	m_A13 += gt[24];
+	m_A13 += gt[25];
+	m_A14 += go[23];
+	double RHS6 = Idr[23];
+	RHS6 += Idr[24];
+	RHS6 += Idr[25];
+	RHS6 -= go[24] * *cnV[24];
+	RHS6 -= go[25] * *cnV[25];
+	m_A15 += gt[26];
+	m_A15 += gt[27];
+	m_A16 += go[26];
+	double RHS7 = Idr[26];
+	RHS7 += Idr[27];
+	RHS7 -= go[27] * *cnV[27];
+	m_A17 += gt[28];
+	m_A17 += gt[29];
+	m_A17 += gt[30];
+	m_A17 += gt[31];
+	m_A18 += go[28];
+	double RHS8 = Idr[28];
+	RHS8 += Idr[29];
+	RHS8 += Idr[30];
+	RHS8 += Idr[31];
+	RHS8 -= go[29] * *cnV[29];
+	RHS8 -= go[30] * *cnV[30];
+	RHS8 -= go[31] * *cnV[31];
+	m_A20 += gt[32];
+	m_A20 += gt[33];
+	m_A19 += go[32];
+	double RHS9 = Idr[32];
+	RHS9 += Idr[33];
+	RHS9 -= go[33] * *cnV[33];
+	m_A22 += gt[34];
+	m_A22 += gt[35];
+	m_A22 += gt[36];
+	m_A22 += gt[37];
+	m_A21 += go[34];
+	m_A23 += go[35];
+	double RHS10 = Idr[34];
+	RHS10 += Idr[35];
+	RHS10 += Idr[36];
+	RHS10 += Idr[37];
+	RHS10 -= go[36] * *cnV[36];
+	RHS10 -= go[37] * *cnV[37];
+	m_A27 += gt[38];
+	m_A27 += gt[39];
+	m_A27 += gt[40];
+	m_A27 += gt[41];
+	m_A27 += gt[42];
+	m_A24 += go[38];
+	m_A25 += go[39];
+	m_A28 += go[40];
+	double RHS11 = Idr[38];
+	RHS11 += Idr[39];
+	RHS11 += Idr[40];
+	RHS11 += Idr[41];
+	RHS11 += Idr[42];
+	RHS11 -= go[41] * *cnV[41];
+	RHS11 -= go[42] * *cnV[42];
+	m_A32 += gt[43];
+	m_A32 += gt[44];
+	m_A31 += go[43];
+	m_A30 += go[44];
+	double RHS12 = Idr[43];
+	RHS12 += Idr[44];
+	m_A34 += gt[45];
+	m_A34 += gt[46];
+	m_A34 += gt[47];
+	m_A34 += gt[48];
+	m_A34 += gt[49];
+	m_A34 += gt[50];
+	m_A33 += go[45];
+	m_A37 += go[46];
+	m_A36 += go[47];
+	double RHS13 = Idr[45];
+	RHS13 += Idr[46];
+	RHS13 += Idr[47];
+	RHS13 += Idr[48];
+	RHS13 += Idr[49];
+	RHS13 += Idr[50];
+	RHS13 -= go[48] * *cnV[48];
+	RHS13 -= go[49] * *cnV[49];
+	RHS13 -= go[50] * *cnV[50];
+	m_A39 += gt[51];
+	m_A39 += gt[52];
+	m_A39 += gt[53];
+	m_A39 += gt[54];
+	m_A40 += go[51];
+	m_A38 += go[52];
+	double RHS14 = Idr[51];
+	RHS14 += Idr[52];
+	RHS14 += Idr[53];
+	RHS14 += Idr[54];
+	RHS14 -= go[53] * *cnV[53];
+	RHS14 -= go[54] * *cnV[54];
+	m_A46 += gt[55];
+	m_A46 += gt[56];
+	m_A46 += gt[57];
+	m_A46 += gt[58];
+	m_A46 += gt[59];
+	m_A44 += go[55];
+	m_A45 += go[56];
+	m_A43 += go[57];
+	m_A42 += go[58];
+	m_A41 += go[59];
+	double RHS15 = Idr[55];
+	RHS15 += Idr[56];
+	RHS15 += Idr[57];
+	RHS15 += Idr[58];
+	RHS15 += Idr[59];
+	m_A53 += gt[60];
+	m_A53 += gt[61];
+	m_A53 += gt[62];
+	m_A53 += gt[63];
+	m_A50 += go[60];
+	m_A54 += go[61];
+	m_A48 += go[62];
+	double RHS16 = Idr[60];
+	RHS16 += Idr[61];
+	RHS16 += Idr[62];
+	RHS16 += Idr[63];
+	RHS16 -= go[63] * *cnV[63];
+	m_A61 += gt[64];
+	m_A61 += gt[65];
+	m_A61 += gt[66];
+	m_A61 += gt[67];
+	m_A61 += gt[68];
+	m_A57 += go[64];
+	m_A58 += go[65];
+	m_A60 += go[66];
+	m_A55 += go[67];
+	m_A56 += go[68];
+	double RHS17 = Idr[64];
+	RHS17 += Idr[65];
+	RHS17 += Idr[66];
+	RHS17 += Idr[67];
+	RHS17 += Idr[68];
 	const double f0 = 1.0 / m_A0;
-	const double f0_4 = -f0 * m_A8;
-	m_A12 += m_A1 * f0_4;
-	RHS4 += f0_4 * RHS0;
+	const double f0_9 = -f0 * m_A19;
+	m_A20 += m_A1 * f0_9;
+	RHS9 += f0_9 * RHS0;
+	const double f0_15 = -f0 * m_A41;
+	m_A44 += m_A1 * f0_15;
+	RHS15 += f0_15 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_4 = -f1 * m_A9;
-	m_A12 += m_A3 * f1_4;
-	RHS4 += f1_4 * RHS1;
+	const double f1_10 = -f1 * m_A21;
+	m_A23 += m_A3 * f1_10;
+	RHS10 += f1_10 * RHS1;
+	const double f1_15 = -f1 * m_A42;
+	m_A46 += m_A3 * f1_15;
+	RHS15 += f1_15 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_4 = -f2 * m_A10;
-	m_A12 += m_A5 * f2_4;
-	RHS4 += f2_4 * RHS2;
+	const double f2_15 = -f2 * m_A43;
+	m_A46 += m_A5 * f2_15;
+	RHS15 += f2_15 * RHS2;
 	const double f3 = 1.0 / m_A6;
-	const double f3_4 = -f3 * m_A11;
-	m_A12 += m_A7 * f3_4;
-	RHS4 += f3_4 * RHS3;
-	V[4] = RHS4 / m_A12;
+	const double f3_11 = -f3 * m_A24;
+	m_A26 += m_A7 * f3_11;
+	RHS11 += f3_11 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_13 = -f4 * m_A33;
+	m_A35 += m_A9 * f4_13;
+	RHS13 += f4_13 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_11 = -f5 * m_A25;
+	m_A27 += m_A11 * f5_11;
+	m_A29 += m_A12 * f5_11;
+	RHS11 += f5_11 * RHS5;
+	const double f5_16 = -f5 * m_A48;
+	m_A49 += m_A11 * f5_16;
+	m_A53 += m_A12 * f5_16;
+	RHS16 += f5_16 * RHS5;
+	const double f6 = 1.0 / m_A13;
+	const double f6_14 = -f6 * m_A38;
+	m_A40 += m_A14 * f6_14;
+	RHS14 += f6_14 * RHS6;
+	const double f6_17 = -f6 * m_A55;
+	m_A61 += m_A14 * f6_17;
+	RHS17 += f6_17 * RHS6;
+	const double f7 = 1.0 / m_A15;
+	const double f7_12 = -f7 * m_A30;
+	m_A32 += m_A16 * f7_12;
+	RHS12 += f7_12 * RHS7;
+	const double f7_17 = -f7 * m_A56;
+	m_A57 += m_A16 * f7_17;
+	RHS17 += f7_17 * RHS7;
+	const double f8 = 1.0 / m_A17;
+	const double f8_12 = -f8 * m_A31;
+	m_A32 += m_A18 * f8_12;
+	RHS12 += f8_12 * RHS8;
+	const double f9 = 1.0 / m_A20;
+	const double f9_15 = -f9 * m_A44;
+	RHS15 += f9_15 * RHS9;
+	const double f10 = 1.0 / m_A22;
+	const double f10_11 = -f10 * m_A26;
+	m_A28 += m_A23 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	const double f11 = 1.0 / m_A27;
+	const double f11_15 = -f11 * m_A45;
+	m_A46 += m_A28 * f11_15;
+	m_A47 += m_A29 * f11_15;
+	RHS15 += f11_15 * RHS11;
+	const double f11_16 = -f11 * m_A49;
+	m_A52 += m_A28 * f11_16;
+	m_A53 += m_A29 * f11_16;
+	RHS16 += f11_16 * RHS11;
+	const double f12 = 1.0 / m_A32;
+	const double f12_17 = -f12 * m_A57;
+	RHS17 += f12_17 * RHS12;
+	const double f13 = 1.0 / m_A34;
+	const double f13_16 = -f13 * m_A50;
+	m_A51 += m_A35 * f13_16;
+	m_A53 += m_A36 * f13_16;
+	m_A54 += m_A37 * f13_16;
+	RHS16 += f13_16 * RHS13;
+	const double f13_17 = -f13 * m_A58;
+	m_A59 += m_A35 * f13_17;
+	m_A60 += m_A36 * f13_17;
+	m_A61 += m_A37 * f13_17;
+	RHS17 += f13_17 * RHS13;
+	const double f14 = 1.0 / m_A39;
+	const double f14_16 = -f14 * m_A51;
+	m_A54 += m_A40 * f14_16;
+	RHS16 += f14_16 * RHS14;
+	const double f14_17 = -f14 * m_A59;
+	m_A61 += m_A40 * f14_17;
+	RHS17 += f14_17 * RHS14;
+	const double f15 = 1.0 / m_A46;
+	const double f15_16 = -f15 * m_A52;
+	m_A53 += m_A47 * f15_16;
+	RHS16 += f15_16 * RHS15;
+	const double f16 = 1.0 / m_A53;
+	const double f16_17 = -f16 * m_A60;
+	m_A61 += m_A54 * f16_17;
+	RHS17 += f16_17 * RHS16;
+	V[17] = RHS17 / m_A61;
+	double tmp16 = 0.0;
+	tmp16 += m_A54 * V[17];
+	V[16] = (RHS16 - tmp16) / m_A53;
+	double tmp15 = 0.0;
+	tmp15 += m_A47 * V[16];
+	V[15] = (RHS15 - tmp15) / m_A46;
+	double tmp14 = 0.0;
+	tmp14 += m_A40 * V[17];
+	V[14] = (RHS14 - tmp14) / m_A39;
+	double tmp13 = 0.0;
+	tmp13 += m_A35 * V[14];
+	tmp13 += m_A36 * V[16];
+	tmp13 += m_A37 * V[17];
+	V[13] = (RHS13 - tmp13) / m_A34;
+	double tmp12 = 0.0;
+	V[12] = (RHS12 - tmp12) / m_A32;
+	double tmp11 = 0.0;
+	tmp11 += m_A28 * V[15];
+	tmp11 += m_A29 * V[16];
+	V[11] = (RHS11 - tmp11) / m_A27;
+	double tmp10 = 0.0;
+	tmp10 += m_A23 * V[15];
+	V[10] = (RHS10 - tmp10) / m_A22;
+	double tmp9 = 0.0;
+	V[9] = (RHS9 - tmp9) / m_A20;
+	double tmp8 = 0.0;
+	tmp8 += m_A18 * V[12];
+	V[8] = (RHS8 - tmp8) / m_A17;
+	double tmp7 = 0.0;
+	tmp7 += m_A16 * V[12];
+	V[7] = (RHS7 - tmp7) / m_A15;
+	double tmp6 = 0.0;
+	tmp6 += m_A14 * V[17];
+	V[6] = (RHS6 - tmp6) / m_A13;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[11];
+	tmp5 += m_A12 * V[16];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[14];
+	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[4];
+	tmp3 += m_A7 * V[10];
 	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[4];
+	tmp2 += m_A5 * V[15];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[4];
+	tmp1 += m_A3 * V[15];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[4];
+	tmp0 += m_A1 * V[9];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// breakout
-static void nl_gcr_593686d4c01bf991_31_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
-
-{
-
-	double m_A0(0.0);
-	double m_A1(0.0);
-	double m_A2(0.0);
-	double m_A3(0.0);
-	double m_A4(0.0);
-	double m_A5(0.0);
-	double m_A6(0.0);
-	double m_A7(0.0);
-	double m_A8(0.0);
-	double m_A9(0.0);
-	double m_A10(0.0);
-	double m_A11(0.0);
-	double m_A12(0.0);
-	double m_A13(0.0);
-	double m_A14(0.0);
-	double m_A15(0.0);
-	double m_A16(0.0);
-	double m_A17(0.0);
-	double m_A18(0.0);
-	double m_A19(0.0);
-	double m_A20(0.0);
-	double m_A21(0.0);
-	double m_A22(0.0);
-	double m_A23(0.0);
-	double m_A24(0.0);
-	double m_A25(0.0);
-	double m_A26(0.0);
-	double m_A27(0.0);
-	double m_A28(0.0);
-	double m_A29(0.0);
-	double m_A30(0.0);
-	m_A0 += gt[0];
-	m_A0 += gt[1];
-	m_A0 += gt[2];
-	m_A0 += gt[3];
-	m_A0 += gt[4];
-	m_A1 += go[0];
-	double RHS0 = Idr[0];
-	RHS0 += Idr[1];
-	RHS0 += Idr[2];
-	RHS0 += Idr[3];
-	RHS0 += Idr[4];
-	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
-	RHS0 -= go[3] * *cnV[3];
-	RHS0 -= go[4] * *cnV[4];
-	m_A2 += gt[5];
-	m_A2 += gt[6];
-	m_A2 += gt[7];
-	m_A3 += go[5];
-	double RHS1 = Idr[5];
-	RHS1 += Idr[6];
-	RHS1 += Idr[7];
-	RHS1 -= go[6] * *cnV[6];
-	RHS1 -= go[7] * *cnV[7];
-	m_A4 += gt[8];
-	m_A4 += gt[9];
-	m_A4 += gt[10];
-	m_A5 += go[8];
-	m_A6 += go[9];
-	double RHS2 = Idr[8];
-	RHS2 += Idr[9];
-	RHS2 += Idr[10];
-	RHS2 -= go[10] * *cnV[10];
-	m_A7 += gt[11];
-	m_A7 += gt[12];
-	m_A7 += gt[13];
-	m_A8 += go[11];
-	double RHS3 = Idr[11];
-	RHS3 += Idr[12];
-	RHS3 += Idr[13];
-	RHS3 -= go[12] * *cnV[12];
-	RHS3 -= go[13] * *cnV[13];
-	m_A9 += gt[14];
-	m_A9 += gt[15];
-	m_A9 += gt[16];
-	m_A10 += go[14];
-	double RHS4 = Idr[14];
-	RHS4 += Idr[15];
-	RHS4 += Idr[16];
-	RHS4 -= go[15] * *cnV[15];
-	RHS4 -= go[16] * *cnV[16];
-	m_A12 += gt[17];
-	m_A12 += gt[18];
-	m_A12 += gt[19];
-	m_A12 += gt[20];
-	m_A12 += gt[21];
-	m_A12 += gt[22];
-	m_A12 += gt[23];
-	m_A14 += go[17];
-	m_A13 += go[18];
-	m_A11 += go[19];
-	double RHS5 = Idr[17];
-	RHS5 += Idr[18];
-	RHS5 += Idr[19];
-	RHS5 += Idr[20];
-	RHS5 += Idr[21];
-	RHS5 += Idr[22];
-	RHS5 += Idr[23];
-	RHS5 -= go[20] * *cnV[20];
-	RHS5 -= go[21] * *cnV[21];
-	RHS5 -= go[22] * *cnV[22];
-	RHS5 -= go[23] * *cnV[23];
-	m_A16 += gt[24];
-	m_A16 += gt[25];
-	m_A16 += gt[26];
-	m_A16 += gt[27];
-	m_A16 += gt[28];
-	m_A18 += go[24];
-	m_A15 += go[25];
-	double RHS6 = Idr[24];
-	RHS6 += Idr[25];
-	RHS6 += Idr[26];
-	RHS6 += Idr[27];
-	RHS6 += Idr[28];
-	RHS6 -= go[26] * *cnV[26];
-	RHS6 -= go[27] * *cnV[27];
-	RHS6 -= go[28] * *cnV[28];
-	m_A23 += gt[29];
-	m_A23 += gt[30];
-	m_A23 += gt[31];
-	m_A19 += go[29];
-	m_A20 += go[30];
-	m_A21 += go[31];
-	double RHS7 = Idr[29];
-	RHS7 += Idr[30];
-	RHS7 += Idr[31];
-	m_A30 += gt[32];
-	m_A30 += gt[33];
-	m_A30 += gt[34];
-	m_A30 += gt[35];
-	m_A30 += gt[36];
-	m_A26 += go[32];
-	m_A25 += go[33];
-	m_A28 += go[34];
-	m_A27 += go[35];
-	double RHS8 = Idr[32];
-	RHS8 += Idr[33];
-	RHS8 += Idr[34];
-	RHS8 += Idr[35];
-	RHS8 += Idr[36];
-	RHS8 -= go[36] * *cnV[36];
+// spacewar
+static void nl_gcr_b09deef9a25aecaf_24_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A7 += go[6];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	RHS3 -= go[7] * *cnV[7];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A9 += go[8];
+	double RHS4 = Idr[8];
+	RHS4 += Idr[9];
+	RHS4 -= go[9] * *cnV[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A10 += gt[12];
+	m_A12 += go[10];
+	m_A11 += go[11];
+	double RHS5 = Idr[10];
+	RHS5 += Idr[11];
+	RHS5 += Idr[12];
+	RHS5 -= go[12] * *cnV[12];
+	m_A19 += gt[13];
+	m_A19 += gt[14];
+	m_A19 += gt[15];
+	m_A19 += gt[16];
+	m_A19 += gt[17];
+	m_A19 += gt[18];
+	m_A17 += go[13];
+	m_A16 += go[14];
+	m_A15 += go[15];
+	m_A14 += go[16];
+	m_A13 += go[17];
+	m_A18 += go[18];
+	double RHS6 = Idr[13];
+	RHS6 += Idr[14];
+	RHS6 += Idr[15];
+	RHS6 += Idr[16];
+	RHS6 += Idr[17];
+	RHS6 += Idr[18];
+	m_A23 += gt[19];
+	m_A23 += gt[20];
+	m_A23 += gt[21];
+	m_A21 += go[19];
+	double RHS7 = Idr[19];
+	RHS7 += Idr[20];
+	RHS7 += Idr[21];
+	RHS7 -= go[20] * *cnV[20];
+	RHS7 -= go[21] * *cnV[21];
 	const double f0 = 1.0 / m_A0;
-	const double f0_5 = -f0 * m_A11;
-	m_A12 += m_A1 * f0_5;
-	RHS5 += f0_5 * RHS0;
+	const double f0_6 = -f0 * m_A13;
+	m_A19 += m_A1 * f0_6;
+	RHS6 += f0_6 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_7 = -f1 * m_A19;
-	m_A23 += m_A3 * f1_7;
-	RHS7 += f1_7 * RHS1;
+	const double f1_6 = -f1 * m_A14;
+	m_A19 += m_A3 * f1_6;
+	RHS6 += f1_6 * RHS1;
 	const double f2 = 1.0 / m_A4;
 	const double f2_6 = -f2 * m_A15;
-	m_A16 += m_A5 * f2_6;
-	m_A17 += m_A6 * f2_6;
+	m_A19 += m_A5 * f2_6;
 	RHS6 += f2_6 * RHS2;
-	const double f2_7 = -f2 * m_A20;
-	m_A22 += m_A5 * f2_7;
-	m_A23 += m_A6 * f2_7;
-	RHS7 += f2_7 * RHS2;
-	const double f3 = 1.0 / m_A7;
-	const double f3_8 = -f3 * m_A25;
-	m_A30 += m_A8 * f3_8;
-	RHS8 += f3_8 * RHS3;
-	const double f4 = 1.0 / m_A9;
-	const double f4_8 = -f4 * m_A26;
-	m_A30 += m_A10 * f4_8;
-	RHS8 += f4_8 * RHS4;
-	const double f5 = 1.0 / m_A12;
+	const double f3 = 1.0 / m_A6;
+	const double f3_6 = -f3 * m_A16;
+	m_A19 += m_A7 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_6 = -f4 * m_A17;
+	m_A19 += m_A9 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_6 = -f5 * m_A18;
+	m_A19 += m_A11 * f5_6;
+	m_A20 += m_A12 * f5_6;
+	RHS6 += f5_6 * RHS5;
 	const double f5_7 = -f5 * m_A21;
-	m_A23 += m_A13 * f5_7;
-	m_A24 += m_A14 * f5_7;
+	m_A22 += m_A11 * f5_7;
+	m_A23 += m_A12 * f5_7;
 	RHS7 += f5_7 * RHS5;
-	const double f5_8 = -f5 * m_A27;
-	m_A29 += m_A13 * f5_8;
-	m_A30 += m_A14 * f5_8;
-	RHS8 += f5_8 * RHS5;
-	const double f6 = 1.0 / m_A16;
+	const double f6 = 1.0 / m_A19;
 	const double f6_7 = -f6 * m_A22;
-	m_A23 += m_A17 * f6_7;
-	m_A24 += m_A18 * f6_7;
+	m_A23 += m_A20 * f6_7;
 	RHS7 += f6_7 * RHS6;
-	const double f6_8 = -f6 * m_A28;
-	m_A29 += m_A17 * f6_8;
-	m_A30 += m_A18 * f6_8;
-	RHS8 += f6_8 * RHS6;
-	const double f7 = 1.0 / m_A23;
-	const double f7_8 = -f7 * m_A29;
-	m_A30 += m_A24 * f7_8;
-	RHS8 += f7_8 * RHS7;
-	V[8] = RHS8 / m_A30;
-	double tmp7 = 0.0;
-	tmp7 += m_A24 * V[8];
-	V[7] = (RHS7 - tmp7) / m_A23;
+	V[7] = RHS7 / m_A23;
 	double tmp6 = 0.0;
-	tmp6 += m_A17 * V[7];
-	tmp6 += m_A18 * V[8];
-	V[6] = (RHS6 - tmp6) / m_A16;
+	tmp6 += m_A20 * V[7];
+	V[6] = (RHS6 - tmp6) / m_A19;
 	double tmp5 = 0.0;
-	tmp5 += m_A13 * V[7];
-	tmp5 += m_A14 * V[8];
-	V[5] = (RHS5 - tmp5) / m_A12;
+	tmp5 += m_A11 * V[6];
+	tmp5 += m_A12 * V[7];
+	V[5] = (RHS5 - tmp5) / m_A10;
 	double tmp4 = 0.0;
-	tmp4 += m_A10 * V[8];
-	V[4] = (RHS4 - tmp4) / m_A9;
+	tmp4 += m_A9 * V[6];
+	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A8 * V[8];
-	V[3] = (RHS3 - tmp3) / m_A7;
+	tmp3 += m_A7 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
 	tmp2 += m_A5 * V[6];
-	tmp2 += m_A6 * V[7];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[7];
+	tmp1 += m_A3 * V[6];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[5];
+	tmp0 += m_A1 * V[6];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// zac1b11142
-static void nl_gcr_5a632d4741241573_96_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// spacfury
+static void nl_gcr_b1db23287df1da54_175_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -5630,569 +43676,1800 @@
 	double m_A93(0.0);
 	double m_A94(0.0);
 	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
+	double m_A153(0.0);
+	double m_A154(0.0);
+	double m_A155(0.0);
+	double m_A156(0.0);
+	double m_A157(0.0);
+	double m_A158(0.0);
+	double m_A159(0.0);
+	double m_A160(0.0);
+	double m_A161(0.0);
+	double m_A162(0.0);
+	double m_A163(0.0);
+	double m_A164(0.0);
+	double m_A165(0.0);
+	double m_A166(0.0);
+	double m_A167(0.0);
+	double m_A168(0.0);
+	double m_A169(0.0);
+	double m_A170(0.0);
+	double m_A171(0.0);
+	double m_A172(0.0);
+	double m_A173(0.0);
+	double m_A174(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
+	m_A0 += gt[2];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
-	RHS0 += Idr[1];
-	RHS0 -= go[1] * *cnV[1];
-	m_A2 += gt[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A2 += gt[6];
-	m_A2 += gt[7];
-	m_A2 += gt[8];
-	m_A3 += go[2];
-	double RHS1 = Idr[2];
-	RHS1 += Idr[3];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A4 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[3];
 	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 += Idr[6];
-	RHS1 += Idr[7];
-	RHS1 += Idr[8];
-	RHS1 -= go[3] * *cnV[3];
-	RHS1 -= go[4] * *cnV[4];
-	RHS1 -= go[5] * *cnV[5];
-	RHS1 -= go[6] * *cnV[6];
-	RHS1 -= go[7] * *cnV[7];
-	RHS1 -= go[8] * *cnV[8];
-	m_A4 += gt[9];
-	m_A4 += gt[10];
-	m_A5 += go[9];
-	double RHS2 = Idr[9];
+	m_A5 += gt[5];
+	m_A5 += gt[6];
+	m_A5 += gt[7];
+	m_A5 += gt[8];
+	m_A5 += gt[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A6 += go[5];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
 	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[6] * *cnV[6];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
 	RHS2 -= go[10] * *cnV[10];
-	m_A6 += gt[11];
-	m_A6 += gt[12];
-	m_A6 += gt[13];
-	m_A6 += gt[14];
-	m_A6 += gt[15];
-	m_A6 += gt[16];
-	m_A6 += gt[17];
-	m_A7 += go[11];
-	double RHS3 = Idr[11];
-	RHS3 += Idr[12];
+	RHS2 -= go[11] * *cnV[11];
+	m_A7 += gt[12];
+	m_A7 += gt[13];
+	m_A7 += gt[14];
+	m_A7 += gt[15];
+	m_A9 += go[12];
+	m_A8 += go[13];
+	m_A8 += go[14];
+	double RHS3 = Idr[12];
 	RHS3 += Idr[13];
 	RHS3 += Idr[14];
 	RHS3 += Idr[15];
-	RHS3 += Idr[16];
-	RHS3 += Idr[17];
-	RHS3 -= go[12] * *cnV[12];
-	RHS3 -= go[13] * *cnV[13];
-	RHS3 -= go[14] * *cnV[14];
 	RHS3 -= go[15] * *cnV[15];
-	RHS3 -= go[16] * *cnV[16];
-	RHS3 -= go[17] * *cnV[17];
-	m_A8 += gt[18];
-	m_A8 += gt[19];
-	m_A8 += gt[20];
-	m_A8 += gt[21];
-	m_A8 += gt[22];
-	m_A8 += gt[23];
-	m_A8 += gt[24];
-	m_A9 += go[18];
-	double RHS4 = Idr[18];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A10 += gt[20];
+	m_A10 += gt[21];
+	m_A15 += go[16];
+	m_A11 += go[17];
+	m_A14 += go[18];
+	m_A13 += go[19];
+	m_A12 += go[20];
+	double RHS4 = Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
 	RHS4 += Idr[19];
 	RHS4 += Idr[20];
 	RHS4 += Idr[21];
-	RHS4 += Idr[22];
-	RHS4 += Idr[23];
-	RHS4 += Idr[24];
-	RHS4 -= go[19] * *cnV[19];
-	RHS4 -= go[20] * *cnV[20];
 	RHS4 -= go[21] * *cnV[21];
-	RHS4 -= go[22] * *cnV[22];
-	RHS4 -= go[23] * *cnV[23];
-	RHS4 -= go[24] * *cnV[24];
-	m_A10 += gt[25];
-	m_A10 += gt[26];
-	m_A10 += gt[27];
-	m_A10 += gt[28];
-	m_A10 += gt[29];
-	m_A11 += go[25];
-	m_A12 += go[26];
-	double RHS5 = Idr[25];
+	m_A16 += gt[22];
+	m_A16 += gt[23];
+	m_A16 += gt[24];
+	m_A16 += gt[25];
+	m_A16 += gt[26];
+	m_A16 += gt[27];
+	m_A17 += go[22];
+	m_A17 += go[23];
+	m_A18 += go[24];
+	m_A19 += go[25];
+	m_A19 += go[26];
+	double RHS5 = Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
 	RHS5 += Idr[26];
 	RHS5 += Idr[27];
-	RHS5 += Idr[28];
-	RHS5 += Idr[29];
 	RHS5 -= go[27] * *cnV[27];
-	RHS5 -= go[28] * *cnV[28];
-	RHS5 -= go[29] * *cnV[29];
-	m_A13 += gt[30];
-	m_A13 += gt[31];
-	m_A13 += gt[32];
-	m_A14 += go[30];
-	double RHS6 = Idr[30];
+	m_A20 += gt[28];
+	m_A20 += gt[29];
+	m_A20 += gt[30];
+	m_A20 += gt[31];
+	m_A20 += gt[32];
+	m_A20 += gt[33];
+	m_A20 += gt[34];
+	m_A21 += go[28];
+	m_A22 += go[29];
+	double RHS6 = Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
 	RHS6 += Idr[31];
 	RHS6 += Idr[32];
+	RHS6 += Idr[33];
+	RHS6 += Idr[34];
+	RHS6 -= go[30] * *cnV[30];
 	RHS6 -= go[31] * *cnV[31];
 	RHS6 -= go[32] * *cnV[32];
-	m_A15 += gt[33];
-	m_A15 += gt[34];
-	m_A16 += go[33];
-	double RHS7 = Idr[33];
-	RHS7 += Idr[34];
-	RHS7 -= go[34] * *cnV[34];
-	m_A17 += gt[35];
-	m_A17 += gt[36];
-	m_A17 += gt[37];
-	m_A18 += go[35];
-	double RHS8 = Idr[35];
-	RHS8 += Idr[36];
-	RHS8 += Idr[37];
-	RHS8 -= go[36] * *cnV[36];
-	RHS8 -= go[37] * *cnV[37];
-	m_A20 += gt[38];
-	m_A20 += gt[39];
-	m_A19 += go[38];
-	double RHS9 = Idr[38];
-	RHS9 += Idr[39];
-	RHS9 -= go[39] * *cnV[39];
-	m_A21 += gt[40];
-	m_A21 += gt[41];
-	m_A21 += gt[42];
-	m_A22 += go[40];
-	double RHS10 = Idr[40];
-	RHS10 += Idr[41];
-	RHS10 += Idr[42];
-	RHS10 -= go[41] * *cnV[41];
-	RHS10 -= go[42] * *cnV[42];
-	m_A23 += gt[43];
-	m_A23 += gt[44];
-	m_A23 += gt[45];
-	m_A24 += go[43];
-	m_A25 += go[44];
-	double RHS11 = Idr[43];
-	RHS11 += Idr[44];
-	RHS11 += Idr[45];
-	RHS11 -= go[45] * *cnV[45];
-	m_A26 += gt[46];
-	m_A26 += gt[47];
-	m_A26 += gt[48];
-	m_A27 += go[46];
-	double RHS12 = Idr[46];
-	RHS12 += Idr[47];
-	RHS12 += Idr[48];
-	RHS12 -= go[47] * *cnV[47];
-	RHS12 -= go[48] * *cnV[48];
-	m_A29 += gt[49];
-	m_A29 += gt[50];
-	m_A28 += go[49];
-	double RHS13 = Idr[49];
-	RHS13 += Idr[50];
-	RHS13 -= go[50] * *cnV[50];
-	m_A31 += gt[51];
-	m_A31 += gt[52];
-	m_A31 += gt[53];
-	m_A31 += gt[54];
-	m_A31 += gt[55];
-	m_A30 += go[51];
-	m_A33 += go[52];
-	double RHS14 = Idr[51];
-	RHS14 += Idr[52];
-	RHS14 += Idr[53];
-	RHS14 += Idr[54];
-	RHS14 += Idr[55];
-	RHS14 -= go[53] * *cnV[53];
-	RHS14 -= go[54] * *cnV[54];
-	RHS14 -= go[55] * *cnV[55];
-	m_A35 += gt[56];
-	m_A35 += gt[57];
-	m_A35 += gt[58];
-	m_A37 += go[56];
-	m_A34 += go[57];
-	double RHS15 = Idr[56];
-	RHS15 += Idr[57];
-	RHS15 += Idr[58];
-	RHS15 -= go[58] * *cnV[58];
-	m_A39 += gt[59];
-	m_A39 += gt[60];
-	m_A39 += gt[61];
-	m_A39 += gt[62];
-	m_A39 += gt[63];
-	m_A38 += go[59];
-	m_A41 += go[60];
-	double RHS16 = Idr[59];
-	RHS16 += Idr[60];
-	RHS16 += Idr[61];
-	RHS16 += Idr[62];
-	RHS16 += Idr[63];
-	RHS16 -= go[61] * *cnV[61];
-	RHS16 -= go[62] * *cnV[62];
-	RHS16 -= go[63] * *cnV[63];
-	m_A44 += gt[64];
-	m_A44 += gt[65];
+	RHS6 -= go[33] * *cnV[33];
+	RHS6 -= go[34] * *cnV[34];
+	m_A23 += gt[35];
+	m_A23 += gt[36];
+	m_A23 += gt[37];
+	m_A23 += gt[38];
+	m_A23 += gt[39];
+	m_A23 += gt[40];
+	m_A24 += go[35];
+	m_A25 += go[36];
+	m_A26 += go[37];
+	double RHS7 = Idr[35];
+	RHS7 += Idr[36];
+	RHS7 += Idr[37];
+	RHS7 += Idr[38];
+	RHS7 += Idr[39];
+	RHS7 += Idr[40];
+	RHS7 -= go[38] * *cnV[38];
+	RHS7 -= go[39] * *cnV[39];
+	RHS7 -= go[40] * *cnV[40];
+	m_A27 += gt[41];
+	m_A27 += gt[42];
+	m_A27 += gt[43];
+	m_A27 += gt[44];
+	m_A27 += gt[45];
+	m_A27 += gt[46];
+	m_A27 += gt[47];
+	m_A28 += go[41];
+	double RHS8 = Idr[41];
+	RHS8 += Idr[42];
+	RHS8 += Idr[43];
+	RHS8 += Idr[44];
+	RHS8 += Idr[45];
+	RHS8 += Idr[46];
+	RHS8 += Idr[47];
+	RHS8 -= go[42] * *cnV[42];
+	RHS8 -= go[43] * *cnV[43];
+	RHS8 -= go[44] * *cnV[44];
+	RHS8 -= go[45] * *cnV[45];
+	RHS8 -= go[46] * *cnV[46];
+	RHS8 -= go[47] * *cnV[47];
+	m_A29 += gt[48];
+	m_A29 += gt[49];
+	m_A29 += gt[50];
+	m_A29 += gt[51];
+	m_A29 += gt[52];
+	m_A29 += gt[53];
+	m_A34 += go[48];
+	m_A33 += go[49];
+	m_A32 += go[50];
+	m_A31 += go[51];
+	m_A30 += go[52];
+	double RHS9 = Idr[48];
+	RHS9 += Idr[49];
+	RHS9 += Idr[50];
+	RHS9 += Idr[51];
+	RHS9 += Idr[52];
+	RHS9 += Idr[53];
+	RHS9 -= go[53] * *cnV[53];
+	m_A35 += gt[54];
+	m_A35 += gt[55];
+	m_A35 += gt[56];
+	m_A36 += go[54];
+	double RHS10 = Idr[54];
+	RHS10 += Idr[55];
+	RHS10 += Idr[56];
+	RHS10 -= go[55] * *cnV[55];
+	RHS10 -= go[56] * *cnV[56];
+	m_A37 += gt[57];
+	m_A37 += gt[58];
+	m_A37 += gt[59];
+	m_A37 += gt[60];
+	m_A37 += gt[61];
+	m_A37 += gt[62];
+	m_A37 += gt[63];
+	m_A38 += go[57];
+	m_A39 += go[58];
+	double RHS11 = Idr[57];
+	RHS11 += Idr[58];
+	RHS11 += Idr[59];
+	RHS11 += Idr[60];
+	RHS11 += Idr[61];
+	RHS11 += Idr[62];
+	RHS11 += Idr[63];
+	RHS11 -= go[59] * *cnV[59];
+	RHS11 -= go[60] * *cnV[60];
+	RHS11 -= go[61] * *cnV[61];
+	RHS11 -= go[62] * *cnV[62];
+	RHS11 -= go[63] * *cnV[63];
+	m_A40 += gt[64];
+	m_A40 += gt[65];
+	m_A40 += gt[66];
+	m_A40 += gt[67];
+	m_A40 += gt[68];
+	m_A40 += gt[69];
 	m_A43 += go[64];
-	m_A42 += go[65];
-	double RHS17 = Idr[64];
-	RHS17 += Idr[65];
-	m_A47 += gt[66];
-	m_A47 += gt[67];
-	m_A47 += gt[68];
-	m_A48 += go[66];
-	m_A45 += go[67];
-	double RHS18 = Idr[66];
-	RHS18 += Idr[67];
-	RHS18 += Idr[68];
-	RHS18 -= go[68] * *cnV[68];
-	m_A51 += gt[69];
-	m_A51 += gt[70];
-	m_A51 += gt[71];
-	m_A51 += gt[72];
-	m_A52 += go[69];
-	m_A50 += go[70];
-	double RHS19 = Idr[69];
-	RHS19 += Idr[70];
-	RHS19 += Idr[71];
-	RHS19 += Idr[72];
-	RHS19 -= go[71] * *cnV[71];
-	RHS19 -= go[72] * *cnV[72];
-	m_A54 += gt[73];
-	m_A54 += gt[74];
-	m_A56 += go[73];
-	m_A53 += go[74];
-	double RHS20 = Idr[73];
-	RHS20 += Idr[74];
-	m_A58 += gt[75];
-	m_A58 += gt[76];
-	m_A58 += gt[77];
-	m_A58 += gt[78];
-	m_A59 += go[75];
-	m_A57 += go[76];
-	double RHS21 = Idr[75];
-	RHS21 += Idr[76];
-	RHS21 += Idr[77];
-	RHS21 += Idr[78];
-	RHS21 -= go[77] * *cnV[77];
-	RHS21 -= go[78] * *cnV[78];
-	m_A64 += gt[79];
-	m_A64 += gt[80];
-	m_A64 += gt[81];
-	m_A64 += gt[82];
-	m_A64 += gt[83];
-	m_A64 += gt[84];
-	m_A60 += go[79];
-	m_A61 += go[80];
-	m_A66 += go[81];
-	m_A66 += go[82];
-	double RHS22 = Idr[79];
-	RHS22 += Idr[80];
-	RHS22 += Idr[81];
-	RHS22 += Idr[82];
-	RHS22 += Idr[83];
-	RHS22 += Idr[84];
-	RHS22 -= go[83] * *cnV[83];
-	RHS22 -= go[84] * *cnV[84];
-	m_A73 += gt[85];
-	m_A73 += gt[86];
-	m_A73 += gt[87];
-	m_A73 += gt[88];
-	m_A73 += gt[89];
-	m_A69 += go[85];
-	m_A70 += go[86];
-	m_A71 += go[87];
-	m_A68 += go[88];
-	m_A67 += go[89];
-	double RHS23 = Idr[85];
-	RHS23 += Idr[86];
-	RHS23 += Idr[87];
-	RHS23 += Idr[88];
-	RHS23 += Idr[89];
-	m_A76 += gt[90];
-	m_A76 += gt[91];
-	m_A76 += gt[92];
-	m_A76 += gt[93];
-	m_A77 += go[90];
-	m_A75 += go[91];
-	double RHS24 = Idr[90];
-	RHS24 += Idr[91];
-	RHS24 += Idr[92];
-	RHS24 += Idr[93];
-	RHS24 -= go[92] * *cnV[92];
-	RHS24 -= go[93] * *cnV[93];
-	m_A85 += gt[94];
-	m_A85 += gt[95];
-	m_A85 += gt[96];
-	m_A85 += gt[97];
-	m_A85 += gt[98];
-	m_A81 += go[94];
-	m_A80 += go[95];
-	m_A82 += go[96];
-	m_A79 += go[97];
-	m_A78 += go[98];
-	double RHS25 = Idr[94];
-	RHS25 += Idr[95];
-	RHS25 += Idr[96];
-	RHS25 += Idr[97];
-	RHS25 += Idr[98];
-	m_A95 += gt[99];
-	m_A95 += gt[100];
-	m_A95 += gt[101];
-	m_A95 += gt[102];
-	m_A95 += gt[103];
-	m_A95 += gt[104];
-	m_A95 += gt[105];
-	m_A95 += gt[106];
-	m_A89 += go[99];
-	m_A92 += go[100];
-	m_A92 += go[101];
-	m_A90 += go[102];
-	m_A88 += go[103];
-	m_A87 += go[104];
-	double RHS26 = Idr[99];
-	RHS26 += Idr[100];
-	RHS26 += Idr[101];
-	RHS26 += Idr[102];
-	RHS26 += Idr[103];
-	RHS26 += Idr[104];
-	RHS26 += Idr[105];
-	RHS26 += Idr[106];
-	RHS26 -= go[105] * *cnV[105];
-	RHS26 -= go[106] * *cnV[106];
+	m_A43 += go[65];
+	m_A41 += go[66];
+	m_A41 += go[67];
+	m_A42 += go[68];
+	double RHS12 = Idr[64];
+	RHS12 += Idr[65];
+	RHS12 += Idr[66];
+	RHS12 += Idr[67];
+	RHS12 += Idr[68];
+	RHS12 += Idr[69];
+	RHS12 -= go[69] * *cnV[69];
+	m_A44 += gt[70];
+	m_A44 += gt[71];
+	m_A46 += go[70];
+	m_A45 += go[71];
+	double RHS13 = Idr[70];
+	RHS13 += Idr[71];
+	m_A47 += gt[72];
+	m_A47 += gt[73];
+	m_A47 += gt[74];
+	m_A47 += gt[75];
+	m_A47 += gt[76];
+	m_A47 += gt[77];
+	m_A48 += go[72];
+	m_A50 += go[73];
+	m_A49 += go[74];
+	double RHS14 = Idr[72];
+	RHS14 += Idr[73];
+	RHS14 += Idr[74];
+	RHS14 += Idr[75];
+	RHS14 += Idr[76];
+	RHS14 += Idr[77];
+	RHS14 -= go[75] * *cnV[75];
+	RHS14 -= go[76] * *cnV[76];
+	RHS14 -= go[77] * *cnV[77];
+	m_A51 += gt[78];
+	m_A51 += gt[79];
+	m_A51 += gt[80];
+	m_A51 += gt[81];
+	m_A52 += go[78];
+	m_A52 += go[79];
+	m_A53 += go[80];
+	double RHS15 = Idr[78];
+	RHS15 += Idr[79];
+	RHS15 += Idr[80];
+	RHS15 += Idr[81];
+	RHS15 -= go[81] * *cnV[81];
+	m_A56 += gt[82];
+	m_A56 += gt[83];
+	m_A56 += gt[84];
+	m_A56 += gt[85];
+	m_A55 += go[82];
+	m_A54 += go[83];
+	double RHS16 = Idr[82];
+	RHS16 += Idr[83];
+	RHS16 += Idr[84];
+	RHS16 += Idr[85];
+	RHS16 -= go[84] * *cnV[84];
+	RHS16 -= go[85] * *cnV[85];
+	m_A59 += gt[86];
+	m_A59 += gt[87];
+	m_A59 += gt[88];
+	m_A63 += go[86];
+	m_A58 += go[87];
+	double RHS17 = Idr[86];
+	RHS17 += Idr[87];
+	RHS17 += Idr[88];
+	RHS17 -= go[88] * *cnV[88];
+	m_A66 += gt[89];
+	m_A66 += gt[90];
+	m_A66 += gt[91];
+	m_A66 += gt[92];
+	m_A66 += gt[93];
+	m_A64 += go[89];
+	m_A65 += go[90];
+	double RHS18 = Idr[89];
+	RHS18 += Idr[90];
+	RHS18 += Idr[91];
+	RHS18 += Idr[92];
+	RHS18 += Idr[93];
+	RHS18 -= go[91] * *cnV[91];
+	RHS18 -= go[92] * *cnV[92];
+	RHS18 -= go[93] * *cnV[93];
+	m_A72 += gt[94];
+	m_A72 += gt[95];
+	m_A72 += gt[96];
+	m_A72 += gt[97];
+	m_A70 += go[94];
+	m_A69 += go[95];
+	double RHS19 = Idr[94];
+	RHS19 += Idr[95];
+	RHS19 += Idr[96];
+	RHS19 += Idr[97];
+	RHS19 -= go[96] * *cnV[96];
+	RHS19 -= go[97] * *cnV[97];
+	m_A82 += gt[98];
+	m_A82 += gt[99];
+	m_A82 += gt[100];
+	m_A82 += gt[101];
+	m_A79 += go[98];
+	m_A78 += go[99];
+	double RHS20 = Idr[98];
+	RHS20 += Idr[99];
+	RHS20 += Idr[100];
+	RHS20 += Idr[101];
+	RHS20 -= go[100] * *cnV[100];
+	RHS20 -= go[101] * *cnV[101];
+	m_A92 += gt[102];
+	m_A92 += gt[103];
+	m_A92 += gt[104];
+	m_A92 += gt[105];
+	m_A88 += go[102];
+	m_A87 += go[103];
+	double RHS21 = Idr[102];
+	RHS21 += Idr[103];
+	RHS21 += Idr[104];
+	RHS21 += Idr[105];
+	RHS21 -= go[104] * *cnV[104];
+	RHS21 -= go[105] * *cnV[105];
+	m_A98 += gt[106];
+	m_A98 += gt[107];
+	m_A98 += gt[108];
+	m_A98 += gt[109];
+	m_A97 += go[106];
+	m_A96 += go[107];
+	double RHS22 = Idr[106];
+	RHS22 += Idr[107];
+	RHS22 += Idr[108];
+	RHS22 += Idr[109];
+	RHS22 -= go[108] * *cnV[108];
+	RHS22 -= go[109] * *cnV[109];
+	m_A103 += gt[110];
+	m_A103 += gt[111];
+	m_A103 += gt[112];
+	m_A103 += gt[113];
+	m_A103 += gt[114];
+	m_A103 += gt[115];
+	m_A103 += gt[116];
+	m_A104 += go[110];
+	m_A104 += go[111];
+	m_A101 += go[112];
+	m_A101 += go[113];
+	m_A100 += go[114];
+	double RHS23 = Idr[110];
+	RHS23 += Idr[111];
+	RHS23 += Idr[112];
+	RHS23 += Idr[113];
+	RHS23 += Idr[114];
+	RHS23 += Idr[115];
+	RHS23 += Idr[116];
+	RHS23 -= go[115] * *cnV[115];
+	RHS23 -= go[116] * *cnV[116];
+	m_A108 += gt[117];
+	m_A108 += gt[118];
+	m_A108 += gt[119];
+	m_A108 += gt[120];
+	m_A108 += gt[121];
+	m_A108 += gt[122];
+	m_A106 += go[117];
+	m_A105 += go[118];
+	m_A105 += go[119];
+	m_A110 += go[120];
+	double RHS24 = Idr[117];
+	RHS24 += Idr[118];
+	RHS24 += Idr[119];
+	RHS24 += Idr[120];
+	RHS24 += Idr[121];
+	RHS24 += Idr[122];
+	RHS24 -= go[121] * *cnV[121];
+	RHS24 -= go[122] * *cnV[122];
+	m_A115 += gt[123];
+	m_A115 += gt[124];
+	m_A115 += gt[125];
+	m_A117 += go[123];
+	m_A111 += go[124];
+	double RHS25 = Idr[123];
+	RHS25 += Idr[124];
+	RHS25 += Idr[125];
+	RHS25 -= go[125] * *cnV[125];
+	m_A120 += gt[126];
+	m_A120 += gt[127];
+	m_A120 += gt[128];
+	m_A120 += gt[129];
+	m_A120 += gt[130];
+	m_A118 += go[126];
+	m_A119 += go[127];
+	double RHS26 = Idr[126];
+	RHS26 += Idr[127];
+	RHS26 += Idr[128];
+	RHS26 += Idr[129];
+	RHS26 += Idr[130];
+	RHS26 -= go[128] * *cnV[128];
+	RHS26 -= go[129] * *cnV[129];
+	RHS26 -= go[130] * *cnV[130];
+	m_A126 += gt[131];
+	m_A126 += gt[132];
+	m_A126 += gt[133];
+	m_A126 += gt[134];
+	m_A126 += gt[135];
+	m_A126 += gt[136];
+	m_A124 += go[131];
+	m_A128 += go[132];
+	m_A123 += go[133];
+	m_A123 += go[134];
+	double RHS27 = Idr[131];
+	RHS27 += Idr[132];
+	RHS27 += Idr[133];
+	RHS27 += Idr[134];
+	RHS27 += Idr[135];
+	RHS27 += Idr[136];
+	RHS27 -= go[135] * *cnV[135];
+	RHS27 -= go[136] * *cnV[136];
+	m_A138 += gt[137];
+	m_A138 += gt[138];
+	m_A138 += gt[139];
+	m_A138 += gt[140];
+	m_A138 += gt[141];
+	m_A138 += gt[142];
+	m_A129 += go[137];
+	m_A131 += go[138];
+	m_A132 += go[139];
+	m_A130 += go[140];
+	double RHS28 = Idr[137];
+	RHS28 += Idr[138];
+	RHS28 += Idr[139];
+	RHS28 += Idr[140];
+	RHS28 += Idr[141];
+	RHS28 += Idr[142];
+	RHS28 -= go[141] * *cnV[141];
+	RHS28 -= go[142] * *cnV[142];
+	m_A148 += gt[143];
+	m_A148 += gt[144];
+	m_A148 += gt[145];
+	m_A148 += gt[146];
+	m_A148 += gt[147];
+	m_A148 += gt[148];
+	m_A148 += gt[149];
+	m_A148 += gt[150];
+	m_A148 += gt[151];
+	m_A143 += go[143];
+	m_A146 += go[144];
+	m_A142 += go[145];
+	m_A142 += go[146];
+	m_A141 += go[147];
+	m_A145 += go[148];
+	m_A145 += go[149];
+	double RHS29 = Idr[143];
+	RHS29 += Idr[144];
+	RHS29 += Idr[145];
+	RHS29 += Idr[146];
+	RHS29 += Idr[147];
+	RHS29 += Idr[148];
+	RHS29 += Idr[149];
+	RHS29 += Idr[150];
+	RHS29 += Idr[151];
+	RHS29 -= go[150] * *cnV[150];
+	RHS29 -= go[151] * *cnV[151];
+	m_A160 += gt[152];
+	m_A160 += gt[153];
+	m_A160 += gt[154];
+	m_A160 += gt[155];
+	m_A160 += gt[156];
+	m_A160 += gt[157];
+	m_A150 += go[152];
+	m_A152 += go[153];
+	m_A156 += go[154];
+	m_A151 += go[155];
+	double RHS30 = Idr[152];
+	RHS30 += Idr[153];
+	RHS30 += Idr[154];
+	RHS30 += Idr[155];
+	RHS30 += Idr[156];
+	RHS30 += Idr[157];
+	RHS30 -= go[156] * *cnV[156];
+	RHS30 -= go[157] * *cnV[157];
+	m_A165 += gt[158];
+	m_A165 += gt[159];
+	m_A165 += gt[160];
+	m_A165 += gt[161];
+	m_A165 += gt[162];
+	m_A165 += gt[163];
+	m_A165 += gt[164];
+	m_A163 += go[158];
+	m_A163 += go[159];
+	m_A162 += go[160];
+	m_A166 += go[161];
+	m_A166 += go[162];
+	double RHS31 = Idr[158];
+	RHS31 += Idr[159];
+	RHS31 += Idr[160];
+	RHS31 += Idr[161];
+	RHS31 += Idr[162];
+	RHS31 += Idr[163];
+	RHS31 += Idr[164];
+	RHS31 -= go[163] * *cnV[163];
+	RHS31 -= go[164] * *cnV[164];
+	m_A174 += gt[165];
+	m_A174 += gt[166];
+	m_A174 += gt[167];
+	m_A174 += gt[168];
+	m_A174 += gt[169];
+	m_A174 += gt[170];
+	m_A174 += gt[171];
+	m_A174 += gt[172];
+	m_A174 += gt[173];
+	m_A169 += go[165];
+	m_A173 += go[166];
+	m_A173 += go[167];
+	m_A168 += go[168];
+	m_A171 += go[169];
+	m_A167 += go[170];
+	m_A167 += go[171];
+	double RHS32 = Idr[165];
+	RHS32 += Idr[166];
+	RHS32 += Idr[167];
+	RHS32 += Idr[168];
+	RHS32 += Idr[169];
+	RHS32 += Idr[170];
+	RHS32 += Idr[171];
+	RHS32 += Idr[172];
+	RHS32 += Idr[173];
+	RHS32 -= go[172] * *cnV[172];
+	RHS32 -= go[173] * *cnV[173];
 	const double f0 = 1.0 / m_A0;
-	const double f0_9 = -f0 * m_A19;
-	m_A20 += m_A1 * f0_9;
-	RHS9 += f0_9 * RHS0;
-	const double f0_23 = -f0 * m_A67;
-	m_A69 += m_A1 * f0_23;
-	RHS23 += f0_23 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_16 = -f1 * m_A38;
-	m_A40 += m_A3 * f1_16;
-	RHS16 += f1_16 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_13 = -f2 * m_A28;
-	m_A29 += m_A5 * f2_13;
-	RHS13 += f2_13 * RHS2;
-	const double f2_26 = -f2 * m_A87;
-	m_A89 += m_A5 * f2_26;
-	RHS26 += f2_26 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_22 = -f3 * m_A60;
-	m_A63 += m_A7 * f3_22;
-	RHS22 += f3_22 * RHS3;
-	const double f4 = 1.0 / m_A8;
-	const double f4_14 = -f4 * m_A30;
-	m_A32 += m_A9 * f4_14;
-	RHS14 += f4_14 * RHS4;
-	const double f5 = 1.0 / m_A10;
-	const double f5_15 = -f5 * m_A34;
-	m_A35 += m_A11 * f5_15;
-	m_A36 += m_A12 * f5_15;
-	RHS15 += f5_15 * RHS5;
-	const double f5_18 = -f5 * m_A45;
-	m_A46 += m_A11 * f5_18;
-	m_A47 += m_A12 * f5_18;
-	RHS18 += f5_18 * RHS5;
-	const double f6 = 1.0 / m_A13;
-	const double f6_19 = -f6 * m_A50;
-	m_A52 += m_A14 * f6_19;
-	RHS19 += f6_19 * RHS6;
-	const double f6_23 = -f6 * m_A68;
-	m_A73 += m_A14 * f6_23;
-	RHS23 += f6_23 * RHS6;
-	const double f7 = 1.0 / m_A15;
-	const double f7_17 = -f7 * m_A42;
-	m_A44 += m_A16 * f7_17;
-	RHS17 += f7_17 * RHS7;
-	const double f7_25 = -f7 * m_A78;
-	m_A81 += m_A16 * f7_25;
-	RHS25 += f7_25 * RHS7;
-	const double f8 = 1.0 / m_A17;
-	const double f8_17 = -f8 * m_A43;
-	m_A44 += m_A18 * f8_17;
-	RHS17 += f8_17 * RHS8;
-	const double f9 = 1.0 / m_A20;
-	const double f9_23 = -f9 * m_A69;
-	RHS23 += f9_23 * RHS9;
-	const double f10 = 1.0 / m_A21;
-	const double f10_21 = -f10 * m_A57;
-	m_A59 += m_A22 * f10_21;
-	RHS21 += f10_21 * RHS10;
-	const double f10_26 = -f10 * m_A88;
-	m_A95 += m_A22 * f10_26;
-	RHS26 += f10_26 * RHS10;
-	const double f11 = 1.0 / m_A23;
-	const double f11_20 = -f11 * m_A53;
-	m_A54 += m_A24 * f11_20;
-	m_A55 += m_A25 * f11_20;
-	RHS20 += f11_20 * RHS11;
-	const double f11_22 = -f11 * m_A61;
-	m_A62 += m_A24 * f11_22;
-	m_A64 += m_A25 * f11_22;
-	RHS22 += f11_22 * RHS11;
-	const double f12 = 1.0 / m_A26;
-	const double f12_24 = -f12 * m_A75;
-	m_A77 += m_A27 * f12_24;
-	RHS24 += f12_24 * RHS12;
-	const double f12_25 = -f12 * m_A79;
-	m_A85 += m_A27 * f12_25;
-	RHS25 += f12_25 * RHS12;
-	const double f13 = 1.0 / m_A29;
-	const double f13_26 = -f13 * m_A89;
-	RHS26 += f13_26 * RHS13;
-	const double f14 = 1.0 / m_A31;
-	const double f14_25 = -f14 * m_A80;
-	m_A84 += m_A32 * f14_25;
-	m_A85 += m_A33 * f14_25;
-	RHS25 += f14_25 * RHS14;
-	const double f15 = 1.0 / m_A35;
-	const double f15_18 = -f15 * m_A46;
-	m_A47 += m_A36 * f15_18;
-	m_A49 += m_A37 * f15_18;
-	RHS18 += f15_18 * RHS15;
-	const double f15_26 = -f15 * m_A90;
-	m_A91 += m_A36 * f15_26;
-	m_A95 += m_A37 * f15_26;
-	RHS26 += f15_26 * RHS15;
-	const double f16 = 1.0 / m_A39;
-	const double f16_23 = -f16 * m_A70;
-	m_A72 += m_A40 * f16_23;
-	m_A73 += m_A41 * f16_23;
+	const double f0_16 = -f0 * m_A54;
+	m_A56 += m_A1 * f0_16;
+	RHS16 += f0_16 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_16 = -f1 * m_A55;
+	m_A56 += m_A3 * f1_16;
+	m_A57 += m_A4 * f1_16;
+	RHS16 += f1_16 * RHS1;
+	const double f1_23 = -f1 * m_A100;
+	m_A102 += m_A3 * f1_23;
+	m_A103 += m_A4 * f1_23;
+	RHS23 += f1_23 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_28 = -f2 * m_A129;
+	m_A132 += m_A6 * f2_28;
+	RHS28 += f2_28 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_23 = -f3 * m_A101;
+	m_A103 += m_A8 * f3_23;
+	m_A104 += m_A9 * f3_23;
+	RHS23 += f3_23 * RHS3;
+	const double f3_29 = -f3 * m_A141;
+	m_A145 += m_A8 * f3_29;
+	m_A148 += m_A9 * f3_29;
+	RHS29 += f3_29 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_17 = -f4 * m_A58;
+	m_A59 += m_A11 * f4_17;
+	m_A60 += m_A12 * f4_17;
+	m_A61 += m_A13 * f4_17;
+	m_A62 += m_A14 * f4_17;
+	m_A63 += m_A15 * f4_17;
+	RHS17 += f4_17 * RHS4;
+	const double f4_19 = -f4 * m_A69;
+	m_A71 += m_A11 * f4_19;
+	m_A72 += m_A12 * f4_19;
+	m_A73 += m_A13 * f4_19;
+	m_A74 += m_A14 * f4_19;
+	m_A76 += m_A15 * f4_19;
+	RHS19 += f4_19 * RHS4;
+	const double f4_20 = -f4 * m_A78;
+	m_A80 += m_A11 * f4_20;
+	m_A81 += m_A12 * f4_20;
+	m_A82 += m_A13 * f4_20;
+	m_A83 += m_A14 * f4_20;
+	m_A85 += m_A15 * f4_20;
+	RHS20 += f4_20 * RHS4;
+	const double f4_21 = -f4 * m_A87;
+	m_A89 += m_A11 * f4_21;
+	m_A90 += m_A12 * f4_21;
+	m_A91 += m_A13 * f4_21;
+	m_A92 += m_A14 * f4_21;
+	m_A94 += m_A15 * f4_21;
+	RHS21 += f4_21 * RHS4;
+	const double f4_28 = -f4 * m_A130;
+	m_A132 += m_A11 * f4_28;
+	m_A133 += m_A12 * f4_28;
+	m_A134 += m_A13 * f4_28;
+	m_A135 += m_A14 * f4_28;
+	m_A138 += m_A15 * f4_28;
+	RHS28 += f4_28 * RHS4;
+	const double f5 = 1.0 / m_A16;
+	const double f5_24 = -f5 * m_A105;
+	m_A108 += m_A17 * f5_24;
+	m_A109 += m_A18 * f5_24;
+	m_A110 += m_A19 * f5_24;
+	RHS24 += f5_24 * RHS5;
+	const double f5_28 = -f5 * m_A131;
+	m_A136 += m_A17 * f5_28;
+	m_A138 += m_A18 * f5_28;
+	m_A139 += m_A19 * f5_28;
+	RHS28 += f5_28 * RHS5;
+	const double f5_29 = -f5 * m_A142;
+	m_A146 += m_A17 * f5_29;
+	m_A147 += m_A18 * f5_29;
+	m_A148 += m_A19 * f5_29;
+	RHS29 += f5_29 * RHS5;
+	const double f6 = 1.0 / m_A20;
+	const double f6_18 = -f6 * m_A64;
+	m_A65 += m_A21 * f6_18;
+	m_A67 += m_A22 * f6_18;
+	RHS18 += f6_18 * RHS6;
+	const double f7 = 1.0 / m_A23;
+	const double f7_18 = -f7 * m_A65;
+	m_A66 += m_A24 * f7_18;
+	m_A67 += m_A25 * f7_18;
+	m_A68 += m_A26 * f7_18;
+	RHS18 += f7_18 * RHS7;
+	const double f7_24 = -f7 * m_A106;
+	m_A107 += m_A24 * f7_24;
+	m_A108 += m_A25 * f7_24;
+	m_A110 += m_A26 * f7_24;
+	RHS24 += f7_24 * RHS7;
+	const double f7_29 = -f7 * m_A143;
+	m_A144 += m_A24 * f7_29;
+	m_A146 += m_A25 * f7_29;
+	m_A148 += m_A26 * f7_29;
+	RHS29 += f7_29 * RHS7;
+	const double f8 = 1.0 / m_A27;
+	const double f8_30 = -f8 * m_A150;
+	m_A156 += m_A28 * f8_30;
+	RHS30 += f8_30 * RHS8;
+	const double f9 = 1.0 / m_A29;
+	const double f9_19 = -f9 * m_A70;
+	m_A72 += m_A30 * f9_19;
+	m_A73 += m_A31 * f9_19;
+	m_A74 += m_A32 * f9_19;
+	m_A75 += m_A33 * f9_19;
+	m_A77 += m_A34 * f9_19;
+	RHS19 += f9_19 * RHS9;
+	const double f9_20 = -f9 * m_A79;
+	m_A81 += m_A30 * f9_20;
+	m_A82 += m_A31 * f9_20;
+	m_A83 += m_A32 * f9_20;
+	m_A84 += m_A33 * f9_20;
+	m_A86 += m_A34 * f9_20;
+	RHS20 += f9_20 * RHS9;
+	const double f9_21 = -f9 * m_A88;
+	m_A90 += m_A30 * f9_21;
+	m_A91 += m_A31 * f9_21;
+	m_A92 += m_A32 * f9_21;
+	m_A93 += m_A33 * f9_21;
+	m_A95 += m_A34 * f9_21;
+	RHS21 += f9_21 * RHS9;
+	const double f9_25 = -f9 * m_A111;
+	m_A112 += m_A30 * f9_25;
+	m_A113 += m_A31 * f9_25;
+	m_A114 += m_A32 * f9_25;
+	m_A115 += m_A33 * f9_25;
+	m_A117 += m_A34 * f9_25;
+	RHS25 += f9_25 * RHS9;
+	const double f9_30 = -f9 * m_A151;
+	m_A153 += m_A30 * f9_30;
+	m_A154 += m_A31 * f9_30;
+	m_A155 += m_A32 * f9_30;
+	m_A156 += m_A33 * f9_30;
+	m_A160 += m_A34 * f9_30;
+	RHS30 += f9_30 * RHS9;
+	const double f10 = 1.0 / m_A35;
+	const double f10_22 = -f10 * m_A96;
+	m_A98 += m_A36 * f10_22;
+	RHS22 += f10_22 * RHS10;
+	const double f11 = 1.0 / m_A37;
+	const double f11_26 = -f11 * m_A118;
+	m_A119 += m_A38 * f11_26;
+	m_A121 += m_A39 * f11_26;
+	RHS26 += f11_26 * RHS11;
+	const double f12 = 1.0 / m_A40;
+	const double f12_27 = -f12 * m_A123;
+	m_A126 += m_A41 * f12_27;
+	m_A127 += m_A42 * f12_27;
+	m_A128 += m_A43 * f12_27;
+	RHS27 += f12_27 * RHS12;
+	const double f12_30 = -f12 * m_A152;
+	m_A157 += m_A41 * f12_30;
+	m_A160 += m_A42 * f12_30;
+	m_A161 += m_A43 * f12_30;
+	RHS30 += f12_30 * RHS12;
+	const double f12_32 = -f12 * m_A167;
+	m_A171 += m_A41 * f12_32;
+	m_A172 += m_A42 * f12_32;
+	m_A174 += m_A43 * f12_32;
+	RHS32 += f12_32 * RHS12;
+	const double f13 = 1.0 / m_A44;
+	const double f13_22 = -f13 * m_A97;
+	m_A98 += m_A45 * f13_22;
+	m_A99 += m_A46 * f13_22;
+	RHS22 += f13_22 * RHS13;
+	const double f13_31 = -f13 * m_A162;
+	m_A164 += m_A45 * f13_31;
+	m_A165 += m_A46 * f13_31;
+	RHS31 += f13_31 * RHS13;
+	const double f14 = 1.0 / m_A47;
+	const double f14_26 = -f14 * m_A119;
+	m_A120 += m_A48 * f14_26;
+	m_A121 += m_A49 * f14_26;
+	m_A122 += m_A50 * f14_26;
+	RHS26 += f14_26 * RHS14;
+	const double f14_27 = -f14 * m_A124;
+	m_A125 += m_A48 * f14_27;
+	m_A126 += m_A49 * f14_27;
+	m_A128 += m_A50 * f14_27;
+	RHS27 += f14_27 * RHS14;
+	const double f14_32 = -f14 * m_A168;
+	m_A170 += m_A48 * f14_32;
+	m_A171 += m_A49 * f14_32;
+	m_A174 += m_A50 * f14_32;
+	RHS32 += f14_32 * RHS14;
+	const double f15 = 1.0 / m_A51;
+	const double f15_31 = -f15 * m_A163;
+	m_A165 += m_A52 * f15_31;
+	m_A166 += m_A53 * f15_31;
+	RHS31 += f15_31 * RHS15;
+	const double f15_32 = -f15 * m_A169;
+	m_A173 += m_A52 * f15_32;
+	m_A174 += m_A53 * f15_32;
+	RHS32 += f15_32 * RHS15;
+	const double f16 = 1.0 / m_A56;
+	const double f16_23 = -f16 * m_A102;
+	m_A103 += m_A57 * f16_23;
 	RHS23 += f16_23 * RHS16;
-	const double f17 = 1.0 / m_A44;
-	const double f17_25 = -f17 * m_A81;
-	RHS25 += f17_25 * RHS17;
-	const double f18 = 1.0 / m_A47;
-	const double f18_23 = -f18 * m_A71;
-	m_A73 += m_A48 * f18_23;
-	m_A74 += m_A49 * f18_23;
-	RHS23 += f18_23 * RHS18;
-	const double f18_26 = -f18 * m_A91;
-	m_A93 += m_A48 * f18_26;
-	m_A95 += m_A49 * f18_26;
-	RHS26 += f18_26 * RHS18;
-	const double f19 = 1.0 / m_A51;
-	const double f19_23 = -f19 * m_A72;
-	m_A73 += m_A52 * f19_23;
-	RHS23 += f19_23 * RHS19;
-	const double f20 = 1.0 / m_A54;
-	const double f20_22 = -f20 * m_A62;
-	m_A64 += m_A55 * f20_22;
-	m_A65 += m_A56 * f20_22;
-	RHS22 += f20_22 * RHS20;
-	const double f20_25 = -f20 * m_A82;
-	m_A83 += m_A55 * f20_25;
-	m_A85 += m_A56 * f20_25;
+	const double f17 = 1.0 / m_A59;
+	const double f17_19 = -f17 * m_A71;
+	m_A72 += m_A60 * f17_19;
+	m_A73 += m_A61 * f17_19;
+	m_A74 += m_A62 * f17_19;
+	m_A76 += m_A63 * f17_19;
+	RHS19 += f17_19 * RHS17;
+	const double f17_20 = -f17 * m_A80;
+	m_A81 += m_A60 * f17_20;
+	m_A82 += m_A61 * f17_20;
+	m_A83 += m_A62 * f17_20;
+	m_A85 += m_A63 * f17_20;
+	RHS20 += f17_20 * RHS17;
+	const double f17_21 = -f17 * m_A89;
+	m_A90 += m_A60 * f17_21;
+	m_A91 += m_A61 * f17_21;
+	m_A92 += m_A62 * f17_21;
+	m_A94 += m_A63 * f17_21;
+	RHS21 += f17_21 * RHS17;
+	const double f17_28 = -f17 * m_A132;
+	m_A133 += m_A60 * f17_28;
+	m_A134 += m_A61 * f17_28;
+	m_A135 += m_A62 * f17_28;
+	m_A138 += m_A63 * f17_28;
+	RHS28 += f17_28 * RHS17;
+	const double f18 = 1.0 / m_A66;
+	const double f18_24 = -f18 * m_A107;
+	m_A108 += m_A67 * f18_24;
+	m_A110 += m_A68 * f18_24;
+	RHS24 += f18_24 * RHS18;
+	const double f18_29 = -f18 * m_A144;
+	m_A146 += m_A67 * f18_29;
+	m_A148 += m_A68 * f18_29;
+	RHS29 += f18_29 * RHS18;
+	const double f19 = 1.0 / m_A72;
+	const double f19_20 = -f19 * m_A81;
+	m_A82 += m_A73 * f19_20;
+	m_A83 += m_A74 * f19_20;
+	m_A84 += m_A75 * f19_20;
+	m_A85 += m_A76 * f19_20;
+	m_A86 += m_A77 * f19_20;
+	RHS20 += f19_20 * RHS19;
+	const double f19_21 = -f19 * m_A90;
+	m_A91 += m_A73 * f19_21;
+	m_A92 += m_A74 * f19_21;
+	m_A93 += m_A75 * f19_21;
+	m_A94 += m_A76 * f19_21;
+	m_A95 += m_A77 * f19_21;
+	RHS21 += f19_21 * RHS19;
+	const double f19_25 = -f19 * m_A112;
+	m_A113 += m_A73 * f19_25;
+	m_A114 += m_A74 * f19_25;
+	m_A115 += m_A75 * f19_25;
+	m_A116 += m_A76 * f19_25;
+	m_A117 += m_A77 * f19_25;
+	RHS25 += f19_25 * RHS19;
+	const double f19_28 = -f19 * m_A133;
+	m_A134 += m_A73 * f19_28;
+	m_A135 += m_A74 * f19_28;
+	m_A137 += m_A75 * f19_28;
+	m_A138 += m_A76 * f19_28;
+	m_A140 += m_A77 * f19_28;
+	RHS28 += f19_28 * RHS19;
+	const double f19_30 = -f19 * m_A153;
+	m_A154 += m_A73 * f19_30;
+	m_A155 += m_A74 * f19_30;
+	m_A156 += m_A75 * f19_30;
+	m_A158 += m_A76 * f19_30;
+	m_A160 += m_A77 * f19_30;
+	RHS30 += f19_30 * RHS19;
+	const double f20 = 1.0 / m_A82;
+	const double f20_21 = -f20 * m_A91;
+	m_A92 += m_A83 * f20_21;
+	m_A93 += m_A84 * f20_21;
+	m_A94 += m_A85 * f20_21;
+	m_A95 += m_A86 * f20_21;
+	RHS21 += f20_21 * RHS20;
+	const double f20_25 = -f20 * m_A113;
+	m_A114 += m_A83 * f20_25;
+	m_A115 += m_A84 * f20_25;
+	m_A116 += m_A85 * f20_25;
+	m_A117 += m_A86 * f20_25;
 	RHS25 += f20_25 * RHS20;
-	const double f21 = 1.0 / m_A58;
-	const double f21_22 = -f21 * m_A63;
-	m_A66 += m_A59 * f21_22;
-	RHS22 += f21_22 * RHS21;
-	const double f22 = 1.0 / m_A64;
-	const double f22_25 = -f22 * m_A83;
-	m_A85 += m_A65 * f22_25;
-	m_A86 += m_A66 * f22_25;
-	RHS25 += f22_25 * RHS22;
-	const double f22_26 = -f22 * m_A92;
-	m_A94 += m_A65 * f22_26;
-	m_A95 += m_A66 * f22_26;
-	RHS26 += f22_26 * RHS22;
-	const double f23 = 1.0 / m_A73;
-	const double f23_26 = -f23 * m_A93;
-	m_A95 += m_A74 * f23_26;
-	RHS26 += f23_26 * RHS23;
-	const double f24 = 1.0 / m_A76;
-	const double f24_25 = -f24 * m_A84;
-	m_A85 += m_A77 * f24_25;
-	RHS25 += f24_25 * RHS24;
-	const double f25 = 1.0 / m_A85;
-	const double f25_26 = -f25 * m_A94;
-	m_A95 += m_A86 * f25_26;
-	RHS26 += f25_26 * RHS25;
-	V[26] = RHS26 / m_A95;
+	const double f20_28 = -f20 * m_A134;
+	m_A135 += m_A83 * f20_28;
+	m_A137 += m_A84 * f20_28;
+	m_A138 += m_A85 * f20_28;
+	m_A140 += m_A86 * f20_28;
+	RHS28 += f20_28 * RHS20;
+	const double f20_30 = -f20 * m_A154;
+	m_A155 += m_A83 * f20_30;
+	m_A156 += m_A84 * f20_30;
+	m_A158 += m_A85 * f20_30;
+	m_A160 += m_A86 * f20_30;
+	RHS30 += f20_30 * RHS20;
+	const double f21 = 1.0 / m_A92;
+	const double f21_25 = -f21 * m_A114;
+	m_A115 += m_A93 * f21_25;
+	m_A116 += m_A94 * f21_25;
+	m_A117 += m_A95 * f21_25;
+	RHS25 += f21_25 * RHS21;
+	const double f21_28 = -f21 * m_A135;
+	m_A137 += m_A93 * f21_28;
+	m_A138 += m_A94 * f21_28;
+	m_A140 += m_A95 * f21_28;
+	RHS28 += f21_28 * RHS21;
+	const double f21_30 = -f21 * m_A155;
+	m_A156 += m_A93 * f21_30;
+	m_A158 += m_A94 * f21_30;
+	m_A160 += m_A95 * f21_30;
+	RHS30 += f21_30 * RHS21;
+	const double f22 = 1.0 / m_A98;
+	const double f22_31 = -f22 * m_A164;
+	m_A165 += m_A99 * f22_31;
+	RHS31 += f22_31 * RHS22;
+	const double f23 = 1.0 / m_A103;
+	const double f23_29 = -f23 * m_A145;
+	m_A148 += m_A104 * f23_29;
+	RHS29 += f23_29 * RHS23;
+	const double f24 = 1.0 / m_A108;
+	const double f24_28 = -f24 * m_A136;
+	m_A138 += m_A109 * f24_28;
+	m_A139 += m_A110 * f24_28;
+	RHS28 += f24_28 * RHS24;
+	const double f24_29 = -f24 * m_A146;
+	m_A147 += m_A109 * f24_29;
+	m_A148 += m_A110 * f24_29;
+	RHS29 += f24_29 * RHS24;
+	const double f25 = 1.0 / m_A115;
+	const double f25_28 = -f25 * m_A137;
+	m_A138 += m_A116 * f25_28;
+	m_A140 += m_A117 * f25_28;
+	RHS28 += f25_28 * RHS25;
+	const double f25_30 = -f25 * m_A156;
+	m_A158 += m_A116 * f25_30;
+	m_A160 += m_A117 * f25_30;
+	RHS30 += f25_30 * RHS25;
+	const double f26 = 1.0 / m_A120;
+	const double f26_27 = -f26 * m_A125;
+	m_A126 += m_A121 * f26_27;
+	m_A128 += m_A122 * f26_27;
+	RHS27 += f26_27 * RHS26;
+	const double f26_32 = -f26 * m_A170;
+	m_A171 += m_A121 * f26_32;
+	m_A174 += m_A122 * f26_32;
+	RHS32 += f26_32 * RHS26;
+	const double f27 = 1.0 / m_A126;
+	const double f27_30 = -f27 * m_A157;
+	m_A160 += m_A127 * f27_30;
+	m_A161 += m_A128 * f27_30;
+	RHS30 += f27_30 * RHS27;
+	const double f27_32 = -f27 * m_A171;
+	m_A172 += m_A127 * f27_32;
+	m_A174 += m_A128 * f27_32;
+	RHS32 += f27_32 * RHS27;
+	const double f28 = 1.0 / m_A138;
+	const double f28_29 = -f28 * m_A147;
+	m_A148 += m_A139 * f28_29;
+	m_A149 += m_A140 * f28_29;
+	RHS29 += f28_29 * RHS28;
+	const double f28_30 = -f28 * m_A158;
+	m_A159 += m_A139 * f28_30;
+	m_A160 += m_A140 * f28_30;
+	RHS30 += f28_30 * RHS28;
+	const double f29 = 1.0 / m_A148;
+	const double f29_30 = -f29 * m_A159;
+	m_A160 += m_A149 * f29_30;
+	RHS30 += f29_30 * RHS29;
+	const double f30 = 1.0 / m_A160;
+	const double f30_32 = -f30 * m_A172;
+	m_A174 += m_A161 * f30_32;
+	RHS32 += f30_32 * RHS30;
+	const double f31 = 1.0 / m_A165;
+	const double f31_32 = -f31 * m_A173;
+	m_A174 += m_A166 * f31_32;
+	RHS32 += f31_32 * RHS31;
+	V[32] = RHS32 / m_A174;
+	double tmp31 = 0.0;
+	tmp31 += m_A166 * V[32];
+	V[31] = (RHS31 - tmp31) / m_A165;
+	double tmp30 = 0.0;
+	tmp30 += m_A161 * V[32];
+	V[30] = (RHS30 - tmp30) / m_A160;
+	double tmp29 = 0.0;
+	tmp29 += m_A149 * V[30];
+	V[29] = (RHS29 - tmp29) / m_A148;
+	double tmp28 = 0.0;
+	tmp28 += m_A139 * V[29];
+	tmp28 += m_A140 * V[30];
+	V[28] = (RHS28 - tmp28) / m_A138;
+	double tmp27 = 0.0;
+	tmp27 += m_A127 * V[30];
+	tmp27 += m_A128 * V[32];
+	V[27] = (RHS27 - tmp27) / m_A126;
+	double tmp26 = 0.0;
+	tmp26 += m_A121 * V[27];
+	tmp26 += m_A122 * V[32];
+	V[26] = (RHS26 - tmp26) / m_A120;
 	double tmp25 = 0.0;
-	tmp25 += m_A86 * V[26];
-	V[25] = (RHS25 - tmp25) / m_A85;
+	tmp25 += m_A116 * V[28];
+	tmp25 += m_A117 * V[30];
+	V[25] = (RHS25 - tmp25) / m_A115;
 	double tmp24 = 0.0;
-	tmp24 += m_A77 * V[25];
-	V[24] = (RHS24 - tmp24) / m_A76;
+	tmp24 += m_A109 * V[28];
+	tmp24 += m_A110 * V[29];
+	V[24] = (RHS24 - tmp24) / m_A108;
 	double tmp23 = 0.0;
-	tmp23 += m_A74 * V[26];
-	V[23] = (RHS23 - tmp23) / m_A73;
+	tmp23 += m_A104 * V[29];
+	V[23] = (RHS23 - tmp23) / m_A103;
 	double tmp22 = 0.0;
-	tmp22 += m_A65 * V[25];
-	tmp22 += m_A66 * V[26];
-	V[22] = (RHS22 - tmp22) / m_A64;
+	tmp22 += m_A99 * V[31];
+	V[22] = (RHS22 - tmp22) / m_A98;
 	double tmp21 = 0.0;
-	tmp21 += m_A59 * V[26];
-	V[21] = (RHS21 - tmp21) / m_A58;
+	tmp21 += m_A93 * V[25];
+	tmp21 += m_A94 * V[28];
+	tmp21 += m_A95 * V[30];
+	V[21] = (RHS21 - tmp21) / m_A92;
 	double tmp20 = 0.0;
-	tmp20 += m_A55 * V[22];
-	tmp20 += m_A56 * V[25];
-	V[20] = (RHS20 - tmp20) / m_A54;
+	tmp20 += m_A83 * V[21];
+	tmp20 += m_A84 * V[25];
+	tmp20 += m_A85 * V[28];
+	tmp20 += m_A86 * V[30];
+	V[20] = (RHS20 - tmp20) / m_A82;
 	double tmp19 = 0.0;
-	tmp19 += m_A52 * V[23];
-	V[19] = (RHS19 - tmp19) / m_A51;
+	tmp19 += m_A73 * V[20];
+	tmp19 += m_A74 * V[21];
+	tmp19 += m_A75 * V[25];
+	tmp19 += m_A76 * V[28];
+	tmp19 += m_A77 * V[30];
+	V[19] = (RHS19 - tmp19) / m_A72;
 	double tmp18 = 0.0;
-	tmp18 += m_A48 * V[23];
-	tmp18 += m_A49 * V[26];
-	V[18] = (RHS18 - tmp18) / m_A47;
+	tmp18 += m_A67 * V[24];
+	tmp18 += m_A68 * V[29];
+	V[18] = (RHS18 - tmp18) / m_A66;
 	double tmp17 = 0.0;
-	V[17] = (RHS17 - tmp17) / m_A44;
+	tmp17 += m_A60 * V[19];
+	tmp17 += m_A61 * V[20];
+	tmp17 += m_A62 * V[21];
+	tmp17 += m_A63 * V[28];
+	V[17] = (RHS17 - tmp17) / m_A59;
 	double tmp16 = 0.0;
-	tmp16 += m_A40 * V[19];
-	tmp16 += m_A41 * V[23];
-	V[16] = (RHS16 - tmp16) / m_A39;
+	tmp16 += m_A57 * V[23];
+	V[16] = (RHS16 - tmp16) / m_A56;
 	double tmp15 = 0.0;
-	tmp15 += m_A36 * V[18];
-	tmp15 += m_A37 * V[26];
-	V[15] = (RHS15 - tmp15) / m_A35;
+	tmp15 += m_A52 * V[31];
+	tmp15 += m_A53 * V[32];
+	V[15] = (RHS15 - tmp15) / m_A51;
 	double tmp14 = 0.0;
-	tmp14 += m_A32 * V[24];
-	tmp14 += m_A33 * V[25];
-	V[14] = (RHS14 - tmp14) / m_A31;
+	tmp14 += m_A48 * V[26];
+	tmp14 += m_A49 * V[27];
+	tmp14 += m_A50 * V[32];
+	V[14] = (RHS14 - tmp14) / m_A47;
 	double tmp13 = 0.0;
-	V[13] = (RHS13 - tmp13) / m_A29;
+	tmp13 += m_A45 * V[22];
+	tmp13 += m_A46 * V[31];
+	V[13] = (RHS13 - tmp13) / m_A44;
+	double tmp12 = 0.0;
+	tmp12 += m_A41 * V[27];
+	tmp12 += m_A42 * V[30];
+	tmp12 += m_A43 * V[32];
+	V[12] = (RHS12 - tmp12) / m_A40;
+	double tmp11 = 0.0;
+	tmp11 += m_A38 * V[14];
+	tmp11 += m_A39 * V[27];
+	V[11] = (RHS11 - tmp11) / m_A37;
+	double tmp10 = 0.0;
+	tmp10 += m_A36 * V[22];
+	V[10] = (RHS10 - tmp10) / m_A35;
+	double tmp9 = 0.0;
+	tmp9 += m_A30 * V[19];
+	tmp9 += m_A31 * V[20];
+	tmp9 += m_A32 * V[21];
+	tmp9 += m_A33 * V[25];
+	tmp9 += m_A34 * V[30];
+	V[9] = (RHS9 - tmp9) / m_A29;
+	double tmp8 = 0.0;
+	tmp8 += m_A28 * V[25];
+	V[8] = (RHS8 - tmp8) / m_A27;
+	double tmp7 = 0.0;
+	tmp7 += m_A24 * V[18];
+	tmp7 += m_A25 * V[24];
+	tmp7 += m_A26 * V[29];
+	V[7] = (RHS7 - tmp7) / m_A23;
+	double tmp6 = 0.0;
+	tmp6 += m_A21 * V[7];
+	tmp6 += m_A22 * V[24];
+	V[6] = (RHS6 - tmp6) / m_A20;
+	double tmp5 = 0.0;
+	tmp5 += m_A17 * V[24];
+	tmp5 += m_A18 * V[28];
+	tmp5 += m_A19 * V[29];
+	V[5] = (RHS5 - tmp5) / m_A16;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[17];
+	tmp4 += m_A12 * V[19];
+	tmp4 += m_A13 * V[20];
+	tmp4 += m_A14 * V[21];
+	tmp4 += m_A15 * V[28];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[23];
+	tmp3 += m_A9 * V[29];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[17];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[16];
+	tmp1 += m_A4 * V[23];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[16];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// segaspeech
+static void nl_gcr_b22769fbf3159a8d_21_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A4 += go[4];
+	m_A3 += go[5];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	m_A5 += gt[8];
+	m_A5 += gt[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A6 += go[8];
+	m_A7 += go[9];
+	m_A7 += go[10];
+	double RHS2 = Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	m_A10 += gt[13];
+	m_A10 += gt[14];
+	m_A9 += go[13];
+	m_A8 += go[14];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	m_A14 += gt[15];
+	m_A14 += gt[16];
+	m_A14 += gt[17];
+	m_A14 += gt[18];
+	m_A14 += gt[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A15 += go[15];
+	m_A12 += go[16];
+	double RHS4 = Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 -= go[17] * *cnV[17];
+	RHS4 -= go[18] * *cnV[18];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	m_A20 += gt[22];
+	m_A20 += gt[23];
+	m_A20 += gt[24];
+	m_A20 += gt[25];
+	m_A17 += go[22];
+	m_A17 += go[23];
+	m_A16 += go[24];
+	double RHS5 = Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 -= go[25] * *cnV[25];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A10 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f1_4 = -f1 * m_A12;
+	m_A13 += m_A3 * f1_4;
+	m_A15 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f1_5 = -f1 * m_A16;
+	m_A18 += m_A3 * f1_5;
+	m_A20 += m_A4 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_5 = -f2 * m_A17;
+	m_A19 += m_A6 * f2_5;
+	m_A20 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_4 = -f3 * m_A13;
+	m_A15 += m_A11 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f3_5 = -f3 * m_A18;
+	m_A20 += m_A11 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A14;
+	const double f4_5 = -f4 * m_A19;
+	m_A20 += m_A15 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A20;
+	double tmp4 = 0.0;
+	tmp4 += m_A15 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A14;
+	double tmp3 = 0.0;
+	tmp3 += m_A11 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A10;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[4];
+	tmp2 += m_A7 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	tmp1 += m_A4 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// breakout
+static void nl_gcr_b66ff415b228d5f8_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[4];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[7] * *cnV[7];
+	m_A9 += gt[8];
+	m_A9 += gt[9];
+	m_A9 += gt[10];
+	m_A8 += go[8];
+	m_A7 += go[9];
+	m_A6 += go[10];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	RHS3 += Idr[10];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A6;
+	m_A9 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A7;
+	m_A9 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_3 = -f2 * m_A8;
+	m_A9 += m_A5 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starcas
+static void nl_gcr_b7344e05aac90017_65_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A3 += go[0];
+	m_A2 += go[1];
+	m_A1 += go[2];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A5 += go[5];
+	double RHS1 = Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A6 += gt[16];
+	m_A10 += go[12];
+	m_A9 += go[13];
+	m_A8 += go[14];
+	m_A7 += go[15];
+	double RHS2 = Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 += Idr[15];
+	RHS2 += Idr[16];
+	RHS2 -= go[16] * *cnV[16];
+	m_A11 += gt[17];
+	m_A11 += gt[18];
+	m_A11 += gt[19];
+	m_A12 += go[17];
+	double RHS3 = Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 -= go[18] * *cnV[18];
+	RHS3 -= go[19] * *cnV[19];
+	m_A13 += gt[20];
+	m_A13 += gt[21];
+	m_A13 += gt[22];
+	m_A13 += gt[23];
+	m_A13 += gt[24];
+	m_A13 += gt[25];
+	m_A14 += go[20];
+	m_A15 += go[21];
+	m_A16 += go[22];
+	m_A16 += go[23];
+	double RHS4 = Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 += Idr[25];
+	RHS4 -= go[24] * *cnV[24];
+	RHS4 -= go[25] * *cnV[25];
+	m_A17 += gt[26];
+	m_A17 += gt[27];
+	m_A17 += gt[28];
+	m_A17 += gt[29];
+	m_A19 += go[26];
+	m_A18 += go[27];
+	double RHS5 = Idr[26];
+	RHS5 += Idr[27];
+	RHS5 += Idr[28];
+	RHS5 += Idr[29];
+	RHS5 -= go[28] * *cnV[28];
+	RHS5 -= go[29] * *cnV[29];
+	m_A22 += gt[30];
+	m_A22 += gt[31];
+	m_A22 += gt[32];
+	m_A22 += gt[33];
+	m_A21 += go[30];
+	m_A20 += go[31];
+	double RHS6 = Idr[30];
+	RHS6 += Idr[31];
+	RHS6 += Idr[32];
+	RHS6 += Idr[33];
+	RHS6 -= go[32] * *cnV[32];
+	RHS6 -= go[33] * *cnV[33];
+	m_A29 += gt[34];
+	m_A29 += gt[35];
+	m_A29 += gt[36];
+	m_A29 += gt[37];
+	m_A27 += go[34];
+	m_A26 += go[35];
+	double RHS7 = Idr[34];
+	RHS7 += Idr[35];
+	RHS7 += Idr[36];
+	RHS7 += Idr[37];
+	RHS7 -= go[36] * *cnV[36];
+	RHS7 -= go[37] * *cnV[37];
+	m_A36 += gt[38];
+	m_A36 += gt[39];
+	m_A36 += gt[40];
+	m_A36 += gt[41];
+	m_A33 += go[38];
+	m_A32 += go[39];
+	double RHS8 = Idr[38];
+	RHS8 += Idr[39];
+	RHS8 += Idr[40];
+	RHS8 += Idr[41];
+	RHS8 -= go[40] * *cnV[40];
+	RHS8 -= go[41] * *cnV[41];
+	m_A43 += gt[42];
+	m_A43 += gt[43];
+	m_A43 += gt[44];
+	m_A43 += gt[45];
+	m_A43 += gt[46];
+	m_A38 += go[42];
+	m_A44 += go[43];
+	m_A39 += go[44];
+	double RHS9 = Idr[42];
+	RHS9 += Idr[43];
+	RHS9 += Idr[44];
+	RHS9 += Idr[45];
+	RHS9 += Idr[46];
+	RHS9 -= go[45] * *cnV[45];
+	RHS9 -= go[46] * *cnV[46];
+	m_A46 += gt[47];
+	m_A46 += gt[48];
+	m_A46 += gt[49];
+	m_A46 += gt[50];
+	m_A46 += gt[51];
+	m_A46 += gt[52];
+	m_A46 += gt[53];
+	m_A45 += go[47];
+	m_A47 += go[48];
+	double RHS10 = Idr[47];
+	RHS10 += Idr[48];
+	RHS10 += Idr[49];
+	RHS10 += Idr[50];
+	RHS10 += Idr[51];
+	RHS10 += Idr[52];
+	RHS10 += Idr[53];
+	RHS10 -= go[49] * *cnV[49];
+	RHS10 -= go[50] * *cnV[50];
+	RHS10 -= go[51] * *cnV[51];
+	RHS10 -= go[52] * *cnV[52];
+	RHS10 -= go[53] * *cnV[53];
+	m_A51 += gt[54];
+	m_A51 += gt[55];
+	m_A51 += gt[56];
+	m_A49 += go[54];
+	m_A48 += go[55];
+	double RHS11 = Idr[54];
+	RHS11 += Idr[55];
+	RHS11 += Idr[56];
+	RHS11 -= go[56] * *cnV[56];
+	m_A56 += gt[57];
+	m_A56 += gt[58];
+	m_A54 += go[57];
+	double RHS12 = Idr[57];
+	RHS12 += Idr[58];
+	RHS12 -= go[58] * *cnV[58];
+	m_A64 += gt[59];
+	m_A64 += gt[60];
+	m_A64 += gt[61];
+	m_A64 += gt[62];
+	m_A59 += go[59];
+	m_A59 += go[60];
+	m_A58 += go[61];
+	m_A60 += go[62];
+	double RHS13 = Idr[59];
+	RHS13 += Idr[60];
+	RHS13 += Idr[61];
+	RHS13 += Idr[62];
+	const double f0 = 1.0 / m_A0;
+	const double f0_6 = -f0 * m_A20;
+	m_A22 += m_A1 * f0_6;
+	m_A23 += m_A2 * f0_6;
+	m_A24 += m_A3 * f0_6;
+	RHS6 += f0_6 * RHS0;
+	const double f0_7 = -f0 * m_A26;
+	m_A28 += m_A1 * f0_7;
+	m_A29 += m_A2 * f0_7;
+	m_A30 += m_A3 * f0_7;
+	RHS7 += f0_7 * RHS0;
+	const double f0_8 = -f0 * m_A32;
+	m_A34 += m_A1 * f0_8;
+	m_A35 += m_A2 * f0_8;
+	m_A36 += m_A3 * f0_8;
+	RHS8 += f0_8 * RHS0;
+	const double f1 = 1.0 / m_A4;
+	const double f1_9 = -f1 * m_A38;
+	m_A39 += m_A5 * f1_9;
+	RHS9 += f1_9 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_6 = -f2 * m_A21;
+	m_A22 += m_A7 * f2_6;
+	m_A23 += m_A8 * f2_6;
+	m_A24 += m_A9 * f2_6;
+	m_A25 += m_A10 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f2_7 = -f2 * m_A27;
+	m_A28 += m_A7 * f2_7;
+	m_A29 += m_A8 * f2_7;
+	m_A30 += m_A9 * f2_7;
+	m_A31 += m_A10 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f2_8 = -f2 * m_A33;
+	m_A34 += m_A7 * f2_8;
+	m_A35 += m_A8 * f2_8;
+	m_A36 += m_A9 * f2_8;
+	m_A37 += m_A10 * f2_8;
+	RHS8 += f2_8 * RHS2;
+	const double f2_9 = -f2 * m_A39;
+	m_A40 += m_A7 * f2_9;
+	m_A41 += m_A8 * f2_9;
+	m_A42 += m_A9 * f2_9;
+	m_A43 += m_A10 * f2_9;
+	RHS9 += f2_9 * RHS2;
+	const double f3 = 1.0 / m_A11;
+	const double f3_10 = -f3 * m_A45;
+	m_A47 += m_A12 * f3_10;
+	RHS10 += f3_10 * RHS3;
+	const double f3_13 = -f3 * m_A58;
+	m_A64 += m_A12 * f3_13;
+	RHS13 += f3_13 * RHS3;
+	const double f4 = 1.0 / m_A13;
+	const double f4_11 = -f4 * m_A48;
+	m_A50 += m_A14 * f4_11;
+	m_A51 += m_A15 * f4_11;
+	m_A53 += m_A16 * f4_11;
+	RHS11 += f4_11 * RHS4;
+	const double f4_13 = -f4 * m_A59;
+	m_A61 += m_A14 * f4_13;
+	m_A62 += m_A15 * f4_13;
+	m_A64 += m_A16 * f4_13;
+	RHS13 += f4_13 * RHS4;
+	const double f5 = 1.0 / m_A17;
+	const double f5_11 = -f5 * m_A49;
+	m_A51 += m_A18 * f5_11;
+	m_A52 += m_A19 * f5_11;
+	RHS11 += f5_11 * RHS5;
+	const double f5_12 = -f5 * m_A54;
+	m_A55 += m_A18 * f5_12;
+	m_A56 += m_A19 * f5_12;
+	RHS12 += f5_12 * RHS5;
+	const double f6 = 1.0 / m_A22;
+	const double f6_7 = -f6 * m_A28;
+	m_A29 += m_A23 * f6_7;
+	m_A30 += m_A24 * f6_7;
+	m_A31 += m_A25 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	const double f6_8 = -f6 * m_A34;
+	m_A35 += m_A23 * f6_8;
+	m_A36 += m_A24 * f6_8;
+	m_A37 += m_A25 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f6_9 = -f6 * m_A40;
+	m_A41 += m_A23 * f6_9;
+	m_A42 += m_A24 * f6_9;
+	m_A43 += m_A25 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f7 = 1.0 / m_A29;
+	const double f7_8 = -f7 * m_A35;
+	m_A36 += m_A30 * f7_8;
+	m_A37 += m_A31 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	const double f7_9 = -f7 * m_A41;
+	m_A42 += m_A30 * f7_9;
+	m_A43 += m_A31 * f7_9;
+	RHS9 += f7_9 * RHS7;
+	const double f8 = 1.0 / m_A36;
+	const double f8_9 = -f8 * m_A42;
+	m_A43 += m_A37 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	const double f9 = 1.0 / m_A43;
+	const double f9_13 = -f9 * m_A60;
+	m_A64 += m_A44 * f9_13;
+	RHS13 += f9_13 * RHS9;
+	const double f10 = 1.0 / m_A46;
+	const double f10_11 = -f10 * m_A50;
+	m_A53 += m_A47 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	const double f10_13 = -f10 * m_A61;
+	m_A64 += m_A47 * f10_13;
+	RHS13 += f10_13 * RHS10;
+	const double f11 = 1.0 / m_A51;
+	const double f11_12 = -f11 * m_A55;
+	m_A56 += m_A52 * f11_12;
+	m_A57 += m_A53 * f11_12;
+	RHS12 += f11_12 * RHS11;
+	const double f11_13 = -f11 * m_A62;
+	m_A63 += m_A52 * f11_13;
+	m_A64 += m_A53 * f11_13;
+	RHS13 += f11_13 * RHS11;
+	const double f12 = 1.0 / m_A56;
+	const double f12_13 = -f12 * m_A63;
+	m_A64 += m_A57 * f12_13;
+	RHS13 += f12_13 * RHS12;
+	V[13] = RHS13 / m_A64;
 	double tmp12 = 0.0;
-	tmp12 += m_A27 * V[25];
-	V[12] = (RHS12 - tmp12) / m_A26;
+	tmp12 += m_A57 * V[13];
+	V[12] = (RHS12 - tmp12) / m_A56;
 	double tmp11 = 0.0;
-	tmp11 += m_A24 * V[20];
-	tmp11 += m_A25 * V[22];
-	V[11] = (RHS11 - tmp11) / m_A23;
+	tmp11 += m_A52 * V[12];
+	tmp11 += m_A53 * V[13];
+	V[11] = (RHS11 - tmp11) / m_A51;
 	double tmp10 = 0.0;
-	tmp10 += m_A22 * V[26];
-	V[10] = (RHS10 - tmp10) / m_A21;
+	tmp10 += m_A47 * V[13];
+	V[10] = (RHS10 - tmp10) / m_A46;
 	double tmp9 = 0.0;
-	V[9] = (RHS9 - tmp9) / m_A20;
+	tmp9 += m_A44 * V[13];
+	V[9] = (RHS9 - tmp9) / m_A43;
 	double tmp8 = 0.0;
-	tmp8 += m_A18 * V[17];
-	V[8] = (RHS8 - tmp8) / m_A17;
+	tmp8 += m_A37 * V[9];
+	V[8] = (RHS8 - tmp8) / m_A36;
 	double tmp7 = 0.0;
-	tmp7 += m_A16 * V[17];
-	V[7] = (RHS7 - tmp7) / m_A15;
+	tmp7 += m_A30 * V[8];
+	tmp7 += m_A31 * V[9];
+	V[7] = (RHS7 - tmp7) / m_A29;
 	double tmp6 = 0.0;
-	tmp6 += m_A14 * V[23];
-	V[6] = (RHS6 - tmp6) / m_A13;
+	tmp6 += m_A23 * V[7];
+	tmp6 += m_A24 * V[8];
+	tmp6 += m_A25 * V[9];
+	V[6] = (RHS6 - tmp6) / m_A22;
 	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[15];
-	tmp5 += m_A12 * V[18];
-	V[5] = (RHS5 - tmp5) / m_A10;
+	tmp5 += m_A18 * V[11];
+	tmp5 += m_A19 * V[12];
+	V[5] = (RHS5 - tmp5) / m_A17;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[24];
-	V[4] = (RHS4 - tmp4) / m_A8;
+	tmp4 += m_A14 * V[10];
+	tmp4 += m_A15 * V[11];
+	tmp4 += m_A16 * V[13];
+	V[4] = (RHS4 - tmp4) / m_A13;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[21];
-	V[3] = (RHS3 - tmp3) / m_A6;
+	tmp3 += m_A12 * V[13];
+	V[3] = (RHS3 - tmp3) / m_A11;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[13];
-	V[2] = (RHS2 - tmp2) / m_A4;
+	tmp2 += m_A7 * V[6];
+	tmp2 += m_A8 * V[7];
+	tmp2 += m_A9 * V[8];
+	tmp2 += m_A10 * V[9];
+	V[2] = (RHS2 - tmp2) / m_A6;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[19];
-	V[1] = (RHS1 - tmp1) / m_A2;
+	tmp1 += m_A5 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A4;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[9];
+	tmp0 += m_A1 * V[6];
+	tmp0 += m_A2 * V[7];
+	tmp0 += m_A3 * V[8];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// 280zzzap
-static void nl_gcr_5af09c93b5cf0788_95_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// starfire
+static void nl_gcr_b75e0baeb501e907_23_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -6216,78 +45493,6 @@
 	double m_A20(0.0);
 	double m_A21(0.0);
 	double m_A22(0.0);
-	double m_A23(0.0);
-	double m_A24(0.0);
-	double m_A25(0.0);
-	double m_A26(0.0);
-	double m_A27(0.0);
-	double m_A28(0.0);
-	double m_A29(0.0);
-	double m_A30(0.0);
-	double m_A31(0.0);
-	double m_A32(0.0);
-	double m_A33(0.0);
-	double m_A34(0.0);
-	double m_A35(0.0);
-	double m_A36(0.0);
-	double m_A37(0.0);
-	double m_A38(0.0);
-	double m_A39(0.0);
-	double m_A40(0.0);
-	double m_A41(0.0);
-	double m_A42(0.0);
-	double m_A43(0.0);
-	double m_A44(0.0);
-	double m_A45(0.0);
-	double m_A46(0.0);
-	double m_A47(0.0);
-	double m_A48(0.0);
-	double m_A49(0.0);
-	double m_A50(0.0);
-	double m_A51(0.0);
-	double m_A52(0.0);
-	double m_A53(0.0);
-	double m_A54(0.0);
-	double m_A55(0.0);
-	double m_A56(0.0);
-	double m_A57(0.0);
-	double m_A58(0.0);
-	double m_A59(0.0);
-	double m_A60(0.0);
-	double m_A61(0.0);
-	double m_A62(0.0);
-	double m_A63(0.0);
-	double m_A64(0.0);
-	double m_A65(0.0);
-	double m_A66(0.0);
-	double m_A67(0.0);
-	double m_A68(0.0);
-	double m_A69(0.0);
-	double m_A70(0.0);
-	double m_A71(0.0);
-	double m_A72(0.0);
-	double m_A73(0.0);
-	double m_A74(0.0);
-	double m_A75(0.0);
-	double m_A76(0.0);
-	double m_A77(0.0);
-	double m_A78(0.0);
-	double m_A79(0.0);
-	double m_A80(0.0);
-	double m_A81(0.0);
-	double m_A82(0.0);
-	double m_A83(0.0);
-	double m_A84(0.0);
-	double m_A85(0.0);
-	double m_A86(0.0);
-	double m_A87(0.0);
-	double m_A88(0.0);
-	double m_A89(0.0);
-	double m_A90(0.0);
-	double m_A91(0.0);
-	double m_A92(0.0);
-	double m_A93(0.0);
-	double m_A94(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
@@ -6297,14 +45502,15 @@
 	RHS0 += Idr[2];
 	RHS0 -= go[1] * *cnV[1];
 	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A2 += gt[6];
-	m_A2 += gt[7];
-	m_A2 += gt[8];
-	m_A2 += gt[9];
-	m_A3 += go[3];
+	m_A3 += gt[3];
+	m_A3 += gt[4];
+	m_A3 += gt[5];
+	m_A3 += gt[6];
+	m_A3 += gt[7];
+	m_A3 += gt[8];
+	m_A3 += gt[9];
+	m_A2 += go[3];
+	m_A4 += go[4];
 	double RHS1 = Idr[3];
 	RHS1 += Idr[4];
 	RHS1 += Idr[5];
@@ -6312,539 +45518,1133 @@
 	RHS1 += Idr[7];
 	RHS1 += Idr[8];
 	RHS1 += Idr[9];
-	RHS1 -= go[4] * *cnV[4];
 	RHS1 -= go[5] * *cnV[5];
 	RHS1 -= go[6] * *cnV[6];
 	RHS1 -= go[7] * *cnV[7];
 	RHS1 -= go[8] * *cnV[8];
 	RHS1 -= go[9] * *cnV[9];
-	m_A4 += gt[10];
-	m_A4 += gt[11];
-	m_A4 += gt[12];
-	m_A5 += go[10];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A5 += gt[13];
+	m_A6 += go[10];
 	double RHS2 = Idr[10];
 	RHS2 += Idr[11];
 	RHS2 += Idr[12];
+	RHS2 += Idr[13];
 	RHS2 -= go[11] * *cnV[11];
 	RHS2 -= go[12] * *cnV[12];
-	m_A6 += gt[13];
-	m_A6 += gt[14];
-	m_A6 += gt[15];
-	m_A6 += gt[16];
-	m_A6 += gt[17];
-	m_A6 += gt[18];
-	m_A6 += gt[19];
-	m_A7 += go[13];
-	double RHS3 = Idr[13];
-	RHS3 += Idr[14];
+	RHS2 -= go[13] * *cnV[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A8 += gt[16];
+	m_A7 += go[14];
+	double RHS3 = Idr[14];
 	RHS3 += Idr[15];
 	RHS3 += Idr[16];
-	RHS3 += Idr[17];
-	RHS3 += Idr[18];
-	RHS3 += Idr[19];
-	RHS3 -= go[14] * *cnV[14];
 	RHS3 -= go[15] * *cnV[15];
 	RHS3 -= go[16] * *cnV[16];
-	RHS3 -= go[17] * *cnV[17];
-	RHS3 -= go[18] * *cnV[18];
-	RHS3 -= go[19] * *cnV[19];
-	m_A8 += gt[20];
-	m_A8 += gt[21];
-	m_A9 += go[20];
-	double RHS4 = Idr[20];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A10 += gt[20];
+	m_A10 += gt[21];
+	m_A10 += gt[22];
+	m_A10 += gt[23];
+	m_A12 += go[17];
+	m_A11 += go[18];
+	double RHS4 = Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
 	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
 	RHS4 -= go[21] * *cnV[21];
-	m_A10 += gt[22];
-	m_A10 += gt[23];
-	m_A11 += go[22];
-	double RHS5 = Idr[22];
-	RHS5 += Idr[23];
-	RHS5 -= go[23] * *cnV[23];
-	m_A12 += gt[24];
-	m_A12 += gt[25];
-	m_A12 += gt[26];
-	m_A12 += gt[27];
+	RHS4 -= go[22] * *cnV[22];
+	RHS4 -= go[23] * *cnV[23];
+	m_A14 += gt[24];
+	m_A14 += gt[25];
+	m_A14 += gt[26];
 	m_A13 += go[24];
-	double RHS6 = Idr[24];
-	RHS6 += Idr[25];
-	RHS6 += Idr[26];
-	RHS6 += Idr[27];
-	RHS6 -= go[25] * *cnV[25];
-	RHS6 -= go[26] * *cnV[26];
-	RHS6 -= go[27] * *cnV[27];
-	m_A14 += gt[28];
-	m_A14 += gt[29];
-	m_A14 += gt[30];
-	m_A14 += gt[31];
-	m_A15 += go[28];
-	double RHS7 = Idr[28];
-	RHS7 += Idr[29];
-	RHS7 += Idr[30];
-	RHS7 += Idr[31];
-	RHS7 -= go[29] * *cnV[29];
-	RHS7 -= go[30] * *cnV[30];
-	RHS7 -= go[31] * *cnV[31];
-	m_A16 += gt[32];
-	m_A16 += gt[33];
-	m_A17 += go[32];
-	double RHS8 = Idr[32];
-	RHS8 += Idr[33];
-	RHS8 -= go[33] * *cnV[33];
-	m_A18 += gt[34];
-	m_A18 += gt[35];
-	m_A18 += gt[36];
-	m_A18 += gt[37];
-	m_A19 += go[34];
-	double RHS9 = Idr[34];
-	RHS9 += Idr[35];
-	RHS9 += Idr[36];
-	RHS9 += Idr[37];
-	RHS9 -= go[35] * *cnV[35];
-	RHS9 -= go[36] * *cnV[36];
-	RHS9 -= go[37] * *cnV[37];
-	m_A20 += gt[38];
-	m_A20 += gt[39];
-	m_A22 += go[38];
-	m_A21 += go[39];
-	double RHS10 = Idr[38];
-	RHS10 += Idr[39];
-	m_A23 += gt[40];
-	m_A23 += gt[41];
-	m_A23 += gt[42];
-	m_A23 += gt[43];
-	m_A24 += go[40];
-	double RHS11 = Idr[40];
-	RHS11 += Idr[41];
-	RHS11 += Idr[42];
-	RHS11 += Idr[43];
-	RHS11 -= go[41] * *cnV[41];
-	RHS11 -= go[42] * *cnV[42];
-	RHS11 -= go[43] * *cnV[43];
-	m_A25 += gt[44];
-	m_A25 += gt[45];
-	m_A25 += gt[46];
-	m_A27 += go[44];
-	m_A28 += go[45];
-	m_A26 += go[46];
-	double RHS12 = Idr[44];
-	RHS12 += Idr[45];
-	RHS12 += Idr[46];
-	m_A29 += gt[47];
-	m_A29 += gt[48];
-	m_A31 += go[47];
-	m_A30 += go[48];
-	double RHS13 = Idr[47];
-	RHS13 += Idr[48];
-	m_A37 += gt[49];
-	m_A37 += gt[50];
-	m_A37 += gt[51];
-	m_A37 += gt[52];
-	m_A37 += gt[53];
-	m_A37 += gt[54];
-	m_A36 += go[49];
-	m_A35 += go[50];
-	m_A34 += go[51];
-	m_A33 += go[52];
-	m_A32 += go[53];
-	double RHS14 = Idr[49];
-	RHS14 += Idr[50];
-	RHS14 += Idr[51];
-	RHS14 += Idr[52];
-	RHS14 += Idr[53];
-	RHS14 += Idr[54];
-	RHS14 -= go[54] * *cnV[54];
-	m_A39 += gt[55];
-	m_A39 += gt[56];
-	m_A39 += gt[57];
-	m_A39 += gt[58];
-	m_A38 += go[55];
-	m_A40 += go[56];
-	double RHS15 = Idr[55];
-	RHS15 += Idr[56];
-	RHS15 += Idr[57];
-	RHS15 += Idr[58];
-	RHS15 -= go[57] * *cnV[57];
-	RHS15 -= go[58] * *cnV[58];
-	m_A42 += gt[59];
-	m_A42 += gt[60];
-	m_A42 += gt[61];
-	m_A42 += gt[62];
-	m_A41 += go[59];
-	m_A43 += go[60];
-	double RHS16 = Idr[59];
-	RHS16 += Idr[60];
-	RHS16 += Idr[61];
-	RHS16 += Idr[62];
-	RHS16 -= go[61] * *cnV[61];
-	RHS16 -= go[62] * *cnV[62];
-	m_A45 += gt[63];
-	m_A45 += gt[64];
-	m_A45 += gt[65];
-	m_A46 += go[63];
-	m_A44 += go[64];
-	double RHS17 = Idr[63];
-	RHS17 += Idr[64];
-	RHS17 += Idr[65];
-	RHS17 -= go[65] * *cnV[65];
-	m_A52 += gt[66];
-	m_A52 += gt[67];
-	m_A52 += gt[68];
-	m_A52 += gt[69];
-	m_A52 += gt[70];
-	m_A52 += gt[71];
-	m_A49 += go[66];
-	m_A50 += go[67];
-	m_A51 += go[68];
-	m_A47 += go[69];
-	m_A48 += go[70];
-	double RHS18 = Idr[66];
-	RHS18 += Idr[67];
-	RHS18 += Idr[68];
-	RHS18 += Idr[69];
-	RHS18 += Idr[70];
-	RHS18 += Idr[71];
-	RHS18 -= go[71] * *cnV[71];
-	m_A59 += gt[72];
-	m_A59 += gt[73];
-	m_A57 += go[72];
-	m_A62 += go[73];
-	double RHS19 = Idr[72];
-	RHS19 += Idr[73];
-	m_A66 += gt[74];
-	m_A66 += gt[75];
-	m_A66 += gt[76];
-	m_A66 += gt[77];
-	m_A66 += gt[78];
-	m_A66 += gt[79];
-	m_A63 += go[74];
-	m_A64 += go[75];
-	m_A68 += go[76];
-	m_A67 += go[77];
-	double RHS20 = Idr[74];
-	RHS20 += Idr[75];
-	RHS20 += Idr[76];
-	RHS20 += Idr[77];
-	RHS20 += Idr[78];
-	RHS20 += Idr[79];
-	RHS20 -= go[78] * *cnV[78];
-	RHS20 -= go[79] * *cnV[79];
-	m_A73 += gt[80];
-	m_A73 += gt[81];
-	m_A73 += gt[82];
-	m_A73 += gt[83];
-	m_A72 += go[80];
-	m_A71 += go[81];
-	m_A69 += go[82];
-	m_A70 += go[83];
-	double RHS21 = Idr[80];
-	RHS21 += Idr[81];
-	RHS21 += Idr[82];
-	RHS21 += Idr[83];
-	m_A80 += gt[84];
-	m_A80 += gt[85];
-	m_A80 += gt[86];
-	m_A80 += gt[87];
-	m_A80 += gt[88];
-	m_A80 += gt[89];
-	m_A80 += gt[90];
-	m_A80 += gt[91];
-	m_A80 += gt[92];
-	m_A80 += gt[93];
-	m_A80 += gt[94];
-	m_A75 += go[84];
-	m_A82 += go[85];
-	m_A76 += go[86];
-	double RHS22 = Idr[84];
-	RHS22 += Idr[85];
-	RHS22 += Idr[86];
-	RHS22 += Idr[87];
-	RHS22 += Idr[88];
-	RHS22 += Idr[89];
-	RHS22 += Idr[90];
-	RHS22 += Idr[91];
-	RHS22 += Idr[92];
-	RHS22 += Idr[93];
-	RHS22 += Idr[94];
-	RHS22 -= go[87] * *cnV[87];
-	RHS22 -= go[88] * *cnV[88];
-	RHS22 -= go[89] * *cnV[89];
-	RHS22 -= go[90] * *cnV[90];
-	RHS22 -= go[91] * *cnV[91];
-	RHS22 -= go[92] * *cnV[92];
-	RHS22 -= go[93] * *cnV[93];
-	RHS22 -= go[94] * *cnV[94];
-	m_A88 += gt[95];
-	m_A88 += gt[96];
-	m_A88 += gt[97];
-	m_A88 += gt[98];
-	m_A88 += gt[99];
-	m_A83 += go[95];
-	m_A85 += go[96];
-	m_A84 += go[97];
-	m_A86 += go[98];
-	double RHS23 = Idr[95];
-	RHS23 += Idr[96];
-	RHS23 += Idr[97];
-	RHS23 += Idr[98];
-	RHS23 += Idr[99];
-	RHS23 -= go[99] * *cnV[99];
-	m_A94 += gt[100];
-	m_A94 += gt[101];
-	m_A94 += gt[102];
-	m_A91 += go[100];
-	m_A89 += go[101];
-	m_A92 += go[102];
-	double RHS24 = Idr[100];
-	RHS24 += Idr[101];
-	RHS24 += Idr[102];
+	double RHS5 = Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 -= go[25] * *cnV[25];
+	RHS5 -= go[26] * *cnV[26];
+	m_A18 += gt[27];
+	m_A18 += gt[28];
+	m_A18 += gt[29];
+	m_A18 += gt[30];
+	m_A17 += go[27];
+	m_A19 += go[28];
+	double RHS6 = Idr[27];
+	RHS6 += Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 -= go[29] * *cnV[29];
+	RHS6 -= go[30] * *cnV[30];
+	m_A22 += gt[31];
+	m_A22 += gt[32];
+	m_A22 += gt[33];
+	m_A22 += gt[34];
+	m_A20 += go[31];
+	m_A21 += go[32];
+	double RHS7 = Idr[31];
+	RHS7 += Idr[32];
+	RHS7 += Idr[33];
+	RHS7 += Idr[34];
+	RHS7 -= go[33] * *cnV[33];
+	RHS7 -= go[34] * *cnV[34];
 	const double f0 = 1.0 / m_A0;
-	const double f0_15 = -f0 * m_A38;
-	m_A40 += m_A1 * f0_15;
-	RHS15 += f0_15 * RHS0;
-	const double f0_21 = -f0 * m_A69;
-	m_A73 += m_A1 * f0_21;
-	RHS21 += f0_21 * RHS0;
+	const double f0_1 = -f0 * m_A2;
+	m_A4 += m_A1 * f0_1;
+	RHS1 += f0_1 * RHS0;
+	const double f0_6 = -f0 * m_A17;
+	m_A18 += m_A1 * f0_6;
+	RHS6 += f0_6 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_3 = -f1 * m_A7;
+	m_A9 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_7 = -f2 * m_A20;
+	m_A22 += m_A6 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f4 = 1.0 / m_A10;
+	const double f4_5 = -f4 * m_A13;
+	m_A15 += m_A11 * f4_5;
+	m_A16 += m_A12 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	const double f6 = 1.0 / m_A18;
+	const double f6_7 = -f6 * m_A21;
+	m_A22 += m_A19 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	V[7] = RHS7 / m_A22;
+	double tmp6 = 0.0;
+	tmp6 += m_A19 * V[7];
+	V[6] = (RHS6 - tmp6) / m_A18;
+	double tmp5 = 0.0;
+	tmp5 += m_A15 * V[6];
+	tmp5 += m_A16 * V[7];
+	V[5] = (RHS5 - tmp5) / m_A14;
+	double tmp4 = 0.0;
+	tmp4 += m_A11 * V[6];
+	tmp4 += m_A12 * V[7];
+	V[4] = (RHS4 - tmp4) / m_A10;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[7];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A4 * V[6];
+	V[1] = (RHS1 - tmp1) / m_A3;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[6];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// spacfury
+static void nl_gcr_b7b209d222c0a9a6_91_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A4 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A5 += gt[13];
+	m_A9 += go[10];
+	m_A7 += go[11];
+	m_A8 += go[12];
+	m_A6 += go[13];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	m_A10 += gt[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A10 += gt[20];
+	m_A12 += go[14];
+	m_A11 += go[15];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 += Idr[20];
+	RHS3 -= go[16] * *cnV[16];
+	RHS3 -= go[17] * *cnV[17];
+	RHS3 -= go[18] * *cnV[18];
+	RHS3 -= go[19] * *cnV[19];
+	RHS3 -= go[20] * *cnV[20];
+	m_A13 += gt[21];
+	m_A13 += gt[22];
+	m_A13 += gt[23];
+	m_A13 += gt[24];
+	m_A13 += gt[25];
+	m_A13 += gt[26];
+	m_A13 += gt[27];
+	m_A14 += go[21];
+	m_A15 += go[22];
+	double RHS4 = Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 += Idr[25];
+	RHS4 += Idr[26];
+	RHS4 += Idr[27];
+	RHS4 -= go[23] * *cnV[23];
+	RHS4 -= go[24] * *cnV[24];
+	RHS4 -= go[25] * *cnV[25];
+	RHS4 -= go[26] * *cnV[26];
+	RHS4 -= go[27] * *cnV[27];
+	m_A16 += gt[28];
+	m_A16 += gt[29];
+	m_A16 += gt[30];
+	m_A18 += go[28];
+	m_A19 += go[29];
+	m_A17 += go[30];
+	double RHS5 = Idr[28];
+	RHS5 += Idr[29];
+	RHS5 += Idr[30];
+	m_A20 += gt[31];
+	m_A20 += gt[32];
+	m_A22 += go[31];
+	m_A21 += go[32];
+	double RHS6 = Idr[31];
+	RHS6 += Idr[32];
+	m_A23 += gt[33];
+	m_A23 += gt[34];
+	m_A23 += gt[35];
+	m_A23 += gt[36];
+	m_A24 += go[33];
+	m_A24 += go[34];
+	m_A25 += go[35];
+	double RHS7 = Idr[33];
+	RHS7 += Idr[34];
+	RHS7 += Idr[35];
+	RHS7 += Idr[36];
+	RHS7 -= go[36] * *cnV[36];
+	m_A28 += gt[37];
+	m_A28 += gt[38];
+	m_A28 += gt[39];
+	m_A28 += gt[40];
+	m_A27 += go[37];
+	m_A26 += go[38];
+	double RHS8 = Idr[37];
+	RHS8 += Idr[38];
+	RHS8 += Idr[39];
+	RHS8 += Idr[40];
+	RHS8 -= go[39] * *cnV[39];
+	RHS8 -= go[40] * *cnV[40];
+	m_A38 += gt[41];
+	m_A38 += gt[42];
+	m_A38 += gt[43];
+	m_A38 += gt[44];
+	m_A38 += gt[45];
+	m_A34 += go[41];
+	m_A36 += go[42];
+	m_A35 += go[43];
+	double RHS9 = Idr[41];
+	RHS9 += Idr[42];
+	RHS9 += Idr[43];
+	RHS9 += Idr[44];
+	RHS9 += Idr[45];
+	RHS9 -= go[44] * *cnV[44];
+	RHS9 -= go[45] * *cnV[45];
+	m_A45 += gt[46];
+	m_A45 += gt[47];
+	m_A45 += gt[48];
+	m_A45 += gt[49];
+	m_A46 += go[46];
+	m_A44 += go[47];
+	double RHS10 = Idr[46];
+	RHS10 += Idr[47];
+	RHS10 += Idr[48];
+	RHS10 += Idr[49];
+	RHS10 -= go[48] * *cnV[48];
+	RHS10 -= go[49] * *cnV[49];
+	m_A50 += gt[50];
+	m_A50 += gt[51];
+	m_A50 += gt[52];
+	m_A54 += go[50];
+	m_A47 += go[51];
+	double RHS11 = Idr[50];
+	RHS11 += Idr[51];
+	RHS11 += Idr[52];
+	RHS11 -= go[52] * *cnV[52];
+	m_A59 += gt[53];
+	m_A59 += gt[54];
+	m_A59 += gt[55];
+	m_A59 += gt[56];
+	m_A59 += gt[57];
+	m_A59 += gt[58];
+	m_A56 += go[53];
+	m_A56 += go[54];
+	m_A55 += go[55];
+	double RHS12 = Idr[53];
+	RHS12 += Idr[54];
+	RHS12 += Idr[55];
+	RHS12 += Idr[56];
+	RHS12 += Idr[57];
+	RHS12 += Idr[58];
+	RHS12 -= go[56] * *cnV[56];
+	RHS12 -= go[57] * *cnV[57];
+	RHS12 -= go[58] * *cnV[58];
+	m_A69 += gt[59];
+	m_A69 += gt[60];
+	m_A69 += gt[61];
+	m_A69 += gt[62];
+	m_A69 += gt[63];
+	m_A63 += go[59];
+	m_A64 += go[60];
+	m_A71 += go[61];
+	double RHS13 = Idr[59];
+	RHS13 += Idr[60];
+	RHS13 += Idr[61];
+	RHS13 += Idr[62];
+	RHS13 += Idr[63];
+	RHS13 -= go[62] * *cnV[62];
+	RHS13 -= go[63] * *cnV[63];
+	m_A80 += gt[64];
+	m_A80 += gt[65];
+	m_A80 += gt[66];
+	m_A80 += gt[67];
+	m_A80 += gt[68];
+	m_A72 += go[64];
+	m_A73 += go[65];
+	m_A76 += go[66];
+	double RHS14 = Idr[64];
+	RHS14 += Idr[65];
+	RHS14 += Idr[66];
+	RHS14 += Idr[67];
+	RHS14 += Idr[68];
+	RHS14 -= go[67] * *cnV[67];
+	RHS14 -= go[68] * *cnV[68];
+	m_A90 += gt[69];
+	m_A90 += gt[70];
+	m_A90 += gt[71];
+	m_A90 += gt[72];
+	m_A83 += go[69];
+	m_A88 += go[70];
+	m_A86 += go[71];
+	m_A82 += go[72];
+	double RHS15 = Idr[69];
+	RHS15 += Idr[70];
+	RHS15 += Idr[71];
+	RHS15 += Idr[72];
+	const double f0 = 1.0 / m_A0;
+	const double f0_10 = -f0 * m_A44;
+	m_A45 += m_A1 * f0_10;
+	RHS10 += f0_10 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_20 = -f1 * m_A63;
-	m_A65 += m_A3 * f1_20;
-	RHS20 += f1_20 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_16 = -f2 * m_A41;
-	m_A43 += m_A5 * f2_16;
-	RHS16 += f2_16 * RHS2;
-	const double f2_18 = -f2 * m_A47;
-	m_A52 += m_A5 * f2_18;
-	RHS18 += f2_18 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_22 = -f3 * m_A75;
-	m_A77 += m_A7 * f3_22;
-	RHS22 += f3_22 * RHS3;
-	const double f4 = 1.0 / m_A8;
-	const double f4_14 = -f4 * m_A32;
-	m_A37 += m_A9 * f4_14;
-	RHS14 += f4_14 * RHS4;
-	const double f4_21 = -f4 * m_A70;
-	m_A71 += m_A9 * f4_21;
-	RHS21 += f4_21 * RHS4;
-	const double f5 = 1.0 / m_A10;
-	const double f5_17 = -f5 * m_A44;
-	m_A45 += m_A11 * f5_17;
-	RHS17 += f5_17 * RHS5;
-	const double f5_18 = -f5 * m_A48;
-	m_A51 += m_A11 * f5_18;
-	RHS18 += f5_18 * RHS5;
-	const double f6 = 1.0 / m_A12;
-	const double f6_14 = -f6 * m_A33;
-	m_A37 += m_A13 * f6_14;
-	RHS14 += f6_14 * RHS6;
-	const double f7 = 1.0 / m_A14;
-	const double f7_14 = -f7 * m_A34;
-	m_A37 += m_A15 * f7_14;
-	RHS14 += f7_14 * RHS7;
-	const double f8 = 1.0 / m_A16;
-	const double f8_23 = -f8 * m_A83;
-	m_A88 += m_A17 * f8_23;
-	RHS23 += f8_23 * RHS8;
-	const double f9 = 1.0 / m_A18;
-	const double f9_14 = -f9 * m_A35;
-	m_A37 += m_A19 * f9_14;
+	const double f1_14 = -f1 * m_A72;
+	m_A76 += m_A3 * f1_14;
+	m_A80 += m_A4 * f1_14;
+	RHS14 += f1_14 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_8 = -f2 * m_A26;
+	m_A28 += m_A6 * f2_8;
+	m_A30 += m_A7 * f2_8;
+	m_A32 += m_A8 * f2_8;
+	m_A33 += m_A9 * f2_8;
+	RHS8 += f2_8 * RHS2;
+	const double f2_11 = -f2 * m_A47;
+	m_A48 += m_A6 * f2_11;
+	m_A50 += m_A7 * f2_11;
+	m_A53 += m_A8 * f2_11;
+	m_A54 += m_A9 * f2_11;
+	RHS11 += f2_11 * RHS2;
+	const double f2_14 = -f2 * m_A73;
+	m_A74 += m_A6 * f2_14;
+	m_A77 += m_A7 * f2_14;
+	m_A80 += m_A8 * f2_14;
+	m_A81 += m_A9 * f2_14;
+	RHS14 += f2_14 * RHS2;
+	const double f2_15 = -f2 * m_A82;
+	m_A84 += m_A6 * f2_15;
+	m_A86 += m_A7 * f2_15;
+	m_A89 += m_A8 * f2_15;
+	m_A90 += m_A9 * f2_15;
+	RHS15 += f2_15 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_13 = -f3 * m_A63;
+	m_A67 += m_A11 * f3_13;
+	m_A71 += m_A12 * f3_13;
+	RHS13 += f3_13 * RHS3;
+	const double f4 = 1.0 / m_A13;
+	const double f4_9 = -f4 * m_A34;
+	m_A35 += m_A14 * f4_9;
+	m_A41 += m_A15 * f4_9;
+	RHS9 += f4_9 * RHS4;
+	const double f5 = 1.0 / m_A16;
+	const double f5_8 = -f5 * m_A27;
+	m_A28 += m_A17 * f5_8;
+	m_A29 += m_A18 * f5_8;
+	m_A31 += m_A19 * f5_8;
+	RHS8 += f5_8 * RHS5;
+	const double f5_9 = -f5 * m_A35;
+	m_A37 += m_A17 * f5_9;
+	m_A38 += m_A18 * f5_9;
+	m_A41 += m_A19 * f5_9;
+	RHS9 += f5_9 * RHS5;
+	const double f5_13 = -f5 * m_A64;
+	m_A65 += m_A17 * f5_13;
+	m_A66 += m_A18 * f5_13;
+	m_A69 += m_A19 * f5_13;
+	RHS13 += f5_13 * RHS5;
+	const double f6 = 1.0 / m_A20;
+	const double f6_9 = -f6 * m_A36;
+	m_A38 += m_A21 * f6_9;
+	m_A40 += m_A22 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f6_12 = -f6 * m_A55;
+	m_A57 += m_A21 * f6_12;
+	m_A59 += m_A22 * f6_12;
+	RHS12 += f6_12 * RHS6;
+	const double f7 = 1.0 / m_A23;
+	const double f7_12 = -f7 * m_A56;
+	m_A59 += m_A24 * f7_12;
+	m_A62 += m_A25 * f7_12;
+	RHS12 += f7_12 * RHS7;
+	const double f7_15 = -f7 * m_A83;
+	m_A87 += m_A24 * f7_15;
+	m_A90 += m_A25 * f7_15;
+	RHS15 += f7_15 * RHS7;
+	const double f8 = 1.0 / m_A28;
+	const double f8_9 = -f8 * m_A37;
+	m_A38 += m_A29 * f8_9;
+	m_A39 += m_A30 * f8_9;
+	m_A41 += m_A31 * f8_9;
+	m_A42 += m_A32 * f8_9;
+	m_A43 += m_A33 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	const double f8_11 = -f8 * m_A48;
+	m_A49 += m_A29 * f8_11;
+	m_A50 += m_A30 * f8_11;
+	m_A52 += m_A31 * f8_11;
+	m_A53 += m_A32 * f8_11;
+	m_A54 += m_A33 * f8_11;
+	RHS11 += f8_11 * RHS8;
+	const double f8_13 = -f8 * m_A65;
+	m_A66 += m_A29 * f8_13;
+	m_A67 += m_A30 * f8_13;
+	m_A69 += m_A31 * f8_13;
+	m_A70 += m_A32 * f8_13;
+	m_A71 += m_A33 * f8_13;
+	RHS13 += f8_13 * RHS8;
+	const double f8_14 = -f8 * m_A74;
+	m_A75 += m_A29 * f8_14;
+	m_A77 += m_A30 * f8_14;
+	m_A79 += m_A31 * f8_14;
+	m_A80 += m_A32 * f8_14;
+	m_A81 += m_A33 * f8_14;
+	RHS14 += f8_14 * RHS8;
+	const double f8_15 = -f8 * m_A84;
+	m_A85 += m_A29 * f8_15;
+	m_A86 += m_A30 * f8_15;
+	m_A88 += m_A31 * f8_15;
+	m_A89 += m_A32 * f8_15;
+	m_A90 += m_A33 * f8_15;
+	RHS15 += f8_15 * RHS8;
+	const double f9 = 1.0 / m_A38;
+	const double f9_11 = -f9 * m_A49;
+	m_A50 += m_A39 * f9_11;
+	m_A51 += m_A40 * f9_11;
+	m_A52 += m_A41 * f9_11;
+	m_A53 += m_A42 * f9_11;
+	m_A54 += m_A43 * f9_11;
+	RHS11 += f9_11 * RHS9;
+	const double f9_12 = -f9 * m_A57;
+	m_A58 += m_A39 * f9_12;
+	m_A59 += m_A40 * f9_12;
+	m_A60 += m_A41 * f9_12;
+	m_A61 += m_A42 * f9_12;
+	m_A62 += m_A43 * f9_12;
+	RHS12 += f9_12 * RHS9;
+	const double f9_13 = -f9 * m_A66;
+	m_A67 += m_A39 * f9_13;
+	m_A68 += m_A40 * f9_13;
+	m_A69 += m_A41 * f9_13;
+	m_A70 += m_A42 * f9_13;
+	m_A71 += m_A43 * f9_13;
+	RHS13 += f9_13 * RHS9;
+	const double f9_14 = -f9 * m_A75;
+	m_A77 += m_A39 * f9_14;
+	m_A78 += m_A40 * f9_14;
+	m_A79 += m_A41 * f9_14;
+	m_A80 += m_A42 * f9_14;
+	m_A81 += m_A43 * f9_14;
 	RHS14 += f9_14 * RHS9;
-	const double f10 = 1.0 / m_A20;
-	const double f10_20 = -f10 * m_A64;
-	m_A66 += m_A21 * f10_20;
-	m_A68 += m_A22 * f10_20;
-	RHS20 += f10_20 * RHS10;
-	const double f10_23 = -f10 * m_A84;
-	m_A86 += m_A21 * f10_23;
-	m_A88 += m_A22 * f10_23;
-	RHS23 += f10_23 * RHS10;
-	const double f11 = 1.0 / m_A23;
-	const double f11_14 = -f11 * m_A36;
-	m_A37 += m_A24 * f11_14;
+	const double f9_15 = -f9 * m_A85;
+	m_A86 += m_A39 * f9_15;
+	m_A87 += m_A40 * f9_15;
+	m_A88 += m_A41 * f9_15;
+	m_A89 += m_A42 * f9_15;
+	m_A90 += m_A43 * f9_15;
+	RHS15 += f9_15 * RHS9;
+	const double f10 = 1.0 / m_A45;
+	const double f10_14 = -f10 * m_A76;
+	m_A80 += m_A46 * f10_14;
+	RHS14 += f10_14 * RHS10;
+	const double f11 = 1.0 / m_A50;
+	const double f11_12 = -f11 * m_A58;
+	m_A59 += m_A51 * f11_12;
+	m_A60 += m_A52 * f11_12;
+	m_A61 += m_A53 * f11_12;
+	m_A62 += m_A54 * f11_12;
+	RHS12 += f11_12 * RHS11;
+	const double f11_13 = -f11 * m_A67;
+	m_A68 += m_A51 * f11_13;
+	m_A69 += m_A52 * f11_13;
+	m_A70 += m_A53 * f11_13;
+	m_A71 += m_A54 * f11_13;
+	RHS13 += f11_13 * RHS11;
+	const double f11_14 = -f11 * m_A77;
+	m_A78 += m_A51 * f11_14;
+	m_A79 += m_A52 * f11_14;
+	m_A80 += m_A53 * f11_14;
+	m_A81 += m_A54 * f11_14;
 	RHS14 += f11_14 * RHS11;
-	const double f12 = 1.0 / m_A25;
-	const double f12_18 = -f12 * m_A49;
-	m_A52 += m_A26 * f12_18;
-	m_A53 += m_A27 * f12_18;
-	m_A56 += m_A28 * f12_18;
-	RHS18 += f12_18 * RHS12;
-	const double f12_19 = -f12 * m_A57;
-	m_A58 += m_A26 * f12_19;
-	m_A59 += m_A27 * f12_19;
-	m_A62 += m_A28 * f12_19;
-	RHS19 += f12_19 * RHS12;
-	const double f12_24 = -f12 * m_A89;
-	m_A90 += m_A26 * f12_24;
-	m_A91 += m_A27 * f12_24;
-	m_A94 += m_A28 * f12_24;
-	RHS24 += f12_24 * RHS12;
-	const double f13 = 1.0 / m_A29;
-	const double f13_18 = -f13 * m_A50;
-	m_A52 += m_A30 * f13_18;
-	m_A54 += m_A31 * f13_18;
-	RHS18 += f13_18 * RHS13;
-	const double f13_22 = -f13 * m_A76;
-	m_A78 += m_A30 * f13_22;
-	m_A80 += m_A31 * f13_22;
-	RHS22 += f13_22 * RHS13;
-	const double f14 = 1.0 / m_A37;
-	const double f14_21 = -f14 * m_A71;
-	RHS21 += f14_21 * RHS14;
-	const double f15 = 1.0 / m_A39;
-	const double f15_20 = -f15 * m_A65;
-	m_A67 += m_A40 * f15_20;
-	RHS20 += f15_20 * RHS15;
-	const double f16 = 1.0 / m_A42;
-	const double f16_22 = -f16 * m_A77;
-	m_A78 += m_A43 * f16_22;
-	RHS22 += f16_22 * RHS16;
-	const double f17 = 1.0 / m_A45;
-	const double f17_18 = -f17 * m_A51;
-	m_A55 += m_A46 * f17_18;
-	RHS18 += f17_18 * RHS17;
-	const double f17_23 = -f17 * m_A85;
-	m_A88 += m_A46 * f17_23;
-	RHS23 += f17_23 * RHS17;
-	const double f18 = 1.0 / m_A52;
-	const double f18_19 = -f18 * m_A58;
-	m_A59 += m_A53 * f18_19;
-	m_A60 += m_A54 * f18_19;
-	m_A61 += m_A55 * f18_19;
-	m_A62 += m_A56 * f18_19;
-	RHS19 += f18_19 * RHS18;
-	const double f18_22 = -f18 * m_A78;
-	m_A79 += m_A53 * f18_22;
-	m_A80 += m_A54 * f18_22;
-	m_A81 += m_A55 * f18_22;
-	m_A82 += m_A56 * f18_22;
-	RHS22 += f18_22 * RHS18;
-	const double f18_24 = -f18 * m_A90;
-	m_A91 += m_A53 * f18_24;
-	m_A92 += m_A54 * f18_24;
-	m_A93 += m_A55 * f18_24;
-	m_A94 += m_A56 * f18_24;
-	RHS24 += f18_24 * RHS18;
-	const double f19 = 1.0 / m_A59;
-	const double f19_22 = -f19 * m_A79;
-	m_A80 += m_A60 * f19_22;
-	m_A81 += m_A61 * f19_22;
-	m_A82 += m_A62 * f19_22;
-	RHS22 += f19_22 * RHS19;
-	const double f19_24 = -f19 * m_A91;
-	m_A92 += m_A60 * f19_24;
-	m_A93 += m_A61 * f19_24;
-	m_A94 += m_A62 * f19_24;
-	RHS24 += f19_24 * RHS19;
-	const double f20 = 1.0 / m_A66;
-	const double f20_21 = -f20 * m_A72;
-	m_A73 += m_A67 * f20_21;
-	m_A74 += m_A68 * f20_21;
-	RHS21 += f20_21 * RHS20;
-	const double f20_23 = -f20 * m_A86;
-	m_A87 += m_A67 * f20_23;
-	m_A88 += m_A68 * f20_23;
-	RHS23 += f20_23 * RHS20;
-	const double f21 = 1.0 / m_A73;
-	const double f21_23 = -f21 * m_A87;
-	m_A88 += m_A74 * f21_23;
-	RHS23 += f21_23 * RHS21;
-	const double f22 = 1.0 / m_A80;
-	const double f22_24 = -f22 * m_A92;
-	m_A93 += m_A81 * f22_24;
-	m_A94 += m_A82 * f22_24;
-	RHS24 += f22_24 * RHS22;
-	const double f23 = 1.0 / m_A88;
-	const double f23_24 = -f23 * m_A93;
-	RHS24 += f23_24 * RHS23;
-	V[24] = RHS24 / m_A94;
-	double tmp23 = 0.0;
-	V[23] = (RHS23 - tmp23) / m_A88;
-	double tmp22 = 0.0;
-	tmp22 += m_A81 * V[23];
-	tmp22 += m_A82 * V[24];
-	V[22] = (RHS22 - tmp22) / m_A80;
-	double tmp21 = 0.0;
-	tmp21 += m_A74 * V[23];
-	V[21] = (RHS21 - tmp21) / m_A73;
-	double tmp20 = 0.0;
-	tmp20 += m_A67 * V[21];
-	tmp20 += m_A68 * V[23];
-	V[20] = (RHS20 - tmp20) / m_A66;
-	double tmp19 = 0.0;
-	tmp19 += m_A60 * V[22];
-	tmp19 += m_A61 * V[23];
-	tmp19 += m_A62 * V[24];
-	V[19] = (RHS19 - tmp19) / m_A59;
-	double tmp18 = 0.0;
-	tmp18 += m_A53 * V[19];
-	tmp18 += m_A54 * V[22];
-	tmp18 += m_A55 * V[23];
-	tmp18 += m_A56 * V[24];
-	V[18] = (RHS18 - tmp18) / m_A52;
-	double tmp17 = 0.0;
-	tmp17 += m_A46 * V[23];
-	V[17] = (RHS17 - tmp17) / m_A45;
-	double tmp16 = 0.0;
-	tmp16 += m_A43 * V[18];
-	V[16] = (RHS16 - tmp16) / m_A42;
-	double tmp15 = 0.0;
-	tmp15 += m_A40 * V[21];
-	V[15] = (RHS15 - tmp15) / m_A39;
+	const double f11_15 = -f11 * m_A86;
+	m_A87 += m_A51 * f11_15;
+	m_A88 += m_A52 * f11_15;
+	m_A89 += m_A53 * f11_15;
+	m_A90 += m_A54 * f11_15;
+	RHS15 += f11_15 * RHS11;
+	const double f12 = 1.0 / m_A59;
+	const double f12_13 = -f12 * m_A68;
+	m_A69 += m_A60 * f12_13;
+	m_A70 += m_A61 * f12_13;
+	m_A71 += m_A62 * f12_13;
+	RHS13 += f12_13 * RHS12;
+	const double f12_14 = -f12 * m_A78;
+	m_A79 += m_A60 * f12_14;
+	m_A80 += m_A61 * f12_14;
+	m_A81 += m_A62 * f12_14;
+	RHS14 += f12_14 * RHS12;
+	const double f12_15 = -f12 * m_A87;
+	m_A88 += m_A60 * f12_15;
+	m_A89 += m_A61 * f12_15;
+	m_A90 += m_A62 * f12_15;
+	RHS15 += f12_15 * RHS12;
+	const double f13 = 1.0 / m_A69;
+	const double f13_14 = -f13 * m_A79;
+	m_A80 += m_A70 * f13_14;
+	m_A81 += m_A71 * f13_14;
+	RHS14 += f13_14 * RHS13;
+	const double f13_15 = -f13 * m_A88;
+	m_A89 += m_A70 * f13_15;
+	m_A90 += m_A71 * f13_15;
+	RHS15 += f13_15 * RHS13;
+	const double f14 = 1.0 / m_A80;
+	const double f14_15 = -f14 * m_A89;
+	m_A90 += m_A81 * f14_15;
+	RHS15 += f14_15 * RHS14;
+	V[15] = RHS15 / m_A90;
 	double tmp14 = 0.0;
-	V[14] = (RHS14 - tmp14) / m_A37;
+	tmp14 += m_A81 * V[15];
+	V[14] = (RHS14 - tmp14) / m_A80;
 	double tmp13 = 0.0;
-	tmp13 += m_A30 * V[18];
-	tmp13 += m_A31 * V[22];
-	V[13] = (RHS13 - tmp13) / m_A29;
+	tmp13 += m_A70 * V[14];
+	tmp13 += m_A71 * V[15];
+	V[13] = (RHS13 - tmp13) / m_A69;
 	double tmp12 = 0.0;
-	tmp12 += m_A26 * V[18];
-	tmp12 += m_A27 * V[19];
-	tmp12 += m_A28 * V[24];
-	V[12] = (RHS12 - tmp12) / m_A25;
+	tmp12 += m_A60 * V[13];
+	tmp12 += m_A61 * V[14];
+	tmp12 += m_A62 * V[15];
+	V[12] = (RHS12 - tmp12) / m_A59;
+	double tmp11 = 0.0;
+	tmp11 += m_A51 * V[12];
+	tmp11 += m_A52 * V[13];
+	tmp11 += m_A53 * V[14];
+	tmp11 += m_A54 * V[15];
+	V[11] = (RHS11 - tmp11) / m_A50;
+	double tmp10 = 0.0;
+	tmp10 += m_A46 * V[14];
+	V[10] = (RHS10 - tmp10) / m_A45;
+	double tmp9 = 0.0;
+	tmp9 += m_A39 * V[11];
+	tmp9 += m_A40 * V[12];
+	tmp9 += m_A41 * V[13];
+	tmp9 += m_A42 * V[14];
+	tmp9 += m_A43 * V[15];
+	V[9] = (RHS9 - tmp9) / m_A38;
+	double tmp8 = 0.0;
+	tmp8 += m_A29 * V[9];
+	tmp8 += m_A30 * V[11];
+	tmp8 += m_A31 * V[13];
+	tmp8 += m_A32 * V[14];
+	tmp8 += m_A33 * V[15];
+	V[8] = (RHS8 - tmp8) / m_A28;
+	double tmp7 = 0.0;
+	tmp7 += m_A24 * V[12];
+	tmp7 += m_A25 * V[15];
+	V[7] = (RHS7 - tmp7) / m_A23;
+	double tmp6 = 0.0;
+	tmp6 += m_A21 * V[9];
+	tmp6 += m_A22 * V[12];
+	V[6] = (RHS6 - tmp6) / m_A20;
+	double tmp5 = 0.0;
+	tmp5 += m_A17 * V[8];
+	tmp5 += m_A18 * V[9];
+	tmp5 += m_A19 * V[13];
+	V[5] = (RHS5 - tmp5) / m_A16;
+	double tmp4 = 0.0;
+	tmp4 += m_A14 * V[5];
+	tmp4 += m_A15 * V[13];
+	V[4] = (RHS4 - tmp4) / m_A13;
+	double tmp3 = 0.0;
+	tmp3 += m_A11 * V[11];
+	tmp3 += m_A12 * V[15];
+	V[3] = (RHS3 - tmp3) / m_A10;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[8];
+	tmp2 += m_A7 * V[11];
+	tmp2 += m_A8 * V[14];
+	tmp2 += m_A9 * V[15];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[10];
+	tmp1 += m_A4 * V[14];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[10];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// boxingb
+static void nl_gcr_b8d6d148a50bdb8f_55_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A2 += gt[11];
+	m_A5 += go[4];
+	m_A4 += go[5];
+	m_A4 += go[6];
+	m_A3 += go[7];
+	m_A3 += go[8];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A8 += go[12];
+	m_A7 += go[13];
+	double RHS2 = Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 -= go[14] * *cnV[14];
+	m_A9 += gt[15];
+	m_A9 += gt[16];
+	m_A9 += gt[17];
+	m_A9 += gt[18];
+	m_A10 += go[15];
+	double RHS3 = Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 -= go[16] * *cnV[16];
+	RHS3 -= go[17] * *cnV[17];
+	RHS3 -= go[18] * *cnV[18];
+	m_A11 += gt[19];
+	m_A11 += gt[20];
+	m_A11 += gt[21];
+	m_A11 += gt[22];
+	m_A11 += gt[23];
+	m_A11 += gt[24];
+	m_A11 += gt[25];
+	m_A11 += gt[26];
+	m_A14 += go[19];
+	m_A13 += go[20];
+	m_A13 += go[21];
+	m_A12 += go[22];
+	m_A12 += go[23];
+	double RHS4 = Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 += Idr[25];
+	RHS4 += Idr[26];
+	RHS4 -= go[24] * *cnV[24];
+	RHS4 -= go[25] * *cnV[25];
+	RHS4 -= go[26] * *cnV[26];
+	m_A15 += gt[27];
+	m_A15 += gt[28];
+	m_A15 += gt[29];
+	m_A17 += go[27];
+	m_A16 += go[28];
+	double RHS5 = Idr[27];
+	RHS5 += Idr[28];
+	RHS5 += Idr[29];
+	RHS5 -= go[29] * *cnV[29];
+	m_A20 += gt[30];
+	m_A20 += gt[31];
+	m_A20 += gt[32];
+	m_A20 += gt[33];
+	m_A20 += gt[34];
+	m_A20 += gt[35];
+	m_A19 += go[30];
+	m_A19 += go[31];
+	m_A18 += go[32];
+	double RHS6 = Idr[30];
+	RHS6 += Idr[31];
+	RHS6 += Idr[32];
+	RHS6 += Idr[33];
+	RHS6 += Idr[34];
+	RHS6 += Idr[35];
+	RHS6 -= go[33] * *cnV[33];
+	RHS6 -= go[34] * *cnV[34];
+	RHS6 -= go[35] * *cnV[35];
+	m_A25 += gt[36];
+	m_A25 += gt[37];
+	m_A25 += gt[38];
+	m_A25 += gt[39];
+	m_A25 += gt[40];
+	m_A26 += go[36];
+	m_A26 += go[37];
+	m_A23 += go[38];
+	m_A23 += go[39];
+	double RHS7 = Idr[36];
+	RHS7 += Idr[37];
+	RHS7 += Idr[38];
+	RHS7 += Idr[39];
+	RHS7 += Idr[40];
+	RHS7 -= go[40] * *cnV[40];
+	m_A29 += gt[41];
+	m_A29 += gt[42];
+	m_A29 += gt[43];
+	m_A29 += gt[44];
+	m_A29 += gt[45];
+	m_A29 += gt[46];
+	m_A28 += go[41];
+	m_A28 += go[42];
+	m_A27 += go[43];
+	double RHS8 = Idr[41];
+	RHS8 += Idr[42];
+	RHS8 += Idr[43];
+	RHS8 += Idr[44];
+	RHS8 += Idr[45];
+	RHS8 += Idr[46];
+	RHS8 -= go[44] * *cnV[44];
+	RHS8 -= go[45] * *cnV[45];
+	RHS8 -= go[46] * *cnV[46];
+	m_A34 += gt[47];
+	m_A34 += gt[48];
+	m_A34 += gt[49];
+	m_A34 += gt[50];
+	m_A34 += gt[51];
+	m_A35 += go[47];
+	m_A35 += go[48];
+	m_A32 += go[49];
+	m_A32 += go[50];
+	double RHS9 = Idr[47];
+	RHS9 += Idr[48];
+	RHS9 += Idr[49];
+	RHS9 += Idr[50];
+	RHS9 += Idr[51];
+	RHS9 -= go[51] * *cnV[51];
+	m_A38 += gt[52];
+	m_A38 += gt[53];
+	m_A38 += gt[54];
+	m_A37 += go[52];
+	m_A36 += go[53];
+	double RHS10 = Idr[52];
+	RHS10 += Idr[53];
+	RHS10 += Idr[54];
+	RHS10 -= go[54] * *cnV[54];
+	m_A46 += gt[55];
+	m_A46 += gt[56];
+	m_A46 += gt[57];
+	m_A46 += gt[58];
+	m_A42 += go[55];
+	m_A44 += go[56];
+	m_A44 += go[57];
+	m_A41 += go[58];
+	double RHS11 = Idr[55];
+	RHS11 += Idr[56];
+	RHS11 += Idr[57];
+	RHS11 += Idr[58];
+	m_A54 += gt[59];
+	m_A54 += gt[60];
+	m_A54 += gt[61];
+	m_A54 += gt[62];
+	m_A49 += go[59];
+	m_A51 += go[60];
+	m_A51 += go[61];
+	m_A48 += go[62];
+	double RHS12 = Idr[59];
+	RHS12 += Idr[60];
+	RHS12 += Idr[61];
+	RHS12 += Idr[62];
+	const double f0 = 1.0 / m_A0;
+	const double f0_6 = -f0 * m_A18;
+	m_A20 += m_A1 * f0_6;
+	RHS6 += f0_6 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_6 = -f1 * m_A19;
+	m_A20 += m_A3 * f1_6;
+	m_A21 += m_A4 * f1_6;
+	m_A22 += m_A5 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f1_7 = -f1 * m_A23;
+	m_A24 += m_A3 * f1_7;
+	m_A25 += m_A4 * f1_7;
+	m_A26 += m_A5 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f1_11 = -f1 * m_A41;
+	m_A43 += m_A3 * f1_11;
+	m_A44 += m_A4 * f1_11;
+	m_A46 += m_A5 * f1_11;
+	RHS11 += f1_11 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_10 = -f2 * m_A36;
+	m_A38 += m_A7 * f2_10;
+	m_A39 += m_A8 * f2_10;
+	RHS10 += f2_10 * RHS2;
+	const double f2_11 = -f2 * m_A42;
+	m_A45 += m_A7 * f2_11;
+	m_A46 += m_A8 * f2_11;
+	RHS11 += f2_11 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_8 = -f3 * m_A27;
+	m_A29 += m_A10 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_8 = -f4 * m_A28;
+	m_A29 += m_A12 * f4_8;
+	m_A30 += m_A13 * f4_8;
+	m_A31 += m_A14 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f4_9 = -f4 * m_A32;
+	m_A33 += m_A12 * f4_9;
+	m_A34 += m_A13 * f4_9;
+	m_A35 += m_A14 * f4_9;
+	RHS9 += f4_9 * RHS4;
+	const double f4_12 = -f4 * m_A48;
+	m_A50 += m_A12 * f4_12;
+	m_A51 += m_A13 * f4_12;
+	m_A54 += m_A14 * f4_12;
+	RHS12 += f4_12 * RHS4;
+	const double f5 = 1.0 / m_A15;
+	const double f5_10 = -f5 * m_A37;
+	m_A38 += m_A16 * f5_10;
+	m_A40 += m_A17 * f5_10;
+	RHS10 += f5_10 * RHS5;
+	const double f5_12 = -f5 * m_A49;
+	m_A52 += m_A16 * f5_12;
+	m_A54 += m_A17 * f5_12;
+	RHS12 += f5_12 * RHS5;
+	const double f6 = 1.0 / m_A20;
+	const double f6_7 = -f6 * m_A24;
+	m_A25 += m_A21 * f6_7;
+	m_A26 += m_A22 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	const double f6_11 = -f6 * m_A43;
+	m_A44 += m_A21 * f6_11;
+	m_A46 += m_A22 * f6_11;
+	RHS11 += f6_11 * RHS6;
+	const double f7 = 1.0 / m_A25;
+	const double f7_11 = -f7 * m_A44;
+	m_A46 += m_A26 * f7_11;
+	RHS11 += f7_11 * RHS7;
+	const double f8 = 1.0 / m_A29;
+	const double f8_9 = -f8 * m_A33;
+	m_A34 += m_A30 * f8_9;
+	m_A35 += m_A31 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	const double f8_12 = -f8 * m_A50;
+	m_A51 += m_A30 * f8_12;
+	m_A54 += m_A31 * f8_12;
+	RHS12 += f8_12 * RHS8;
+	const double f9 = 1.0 / m_A34;
+	const double f9_12 = -f9 * m_A51;
+	m_A54 += m_A35 * f9_12;
+	RHS12 += f9_12 * RHS9;
+	const double f10 = 1.0 / m_A38;
+	const double f10_11 = -f10 * m_A45;
+	m_A46 += m_A39 * f10_11;
+	m_A47 += m_A40 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	const double f10_12 = -f10 * m_A52;
+	m_A53 += m_A39 * f10_12;
+	m_A54 += m_A40 * f10_12;
+	RHS12 += f10_12 * RHS10;
+	const double f11 = 1.0 / m_A46;
+	const double f11_12 = -f11 * m_A53;
+	m_A54 += m_A47 * f11_12;
+	RHS12 += f11_12 * RHS11;
+	V[12] = RHS12 / m_A54;
 	double tmp11 = 0.0;
-	tmp11 += m_A24 * V[14];
-	V[11] = (RHS11 - tmp11) / m_A23;
+	tmp11 += m_A47 * V[12];
+	V[11] = (RHS11 - tmp11) / m_A46;
 	double tmp10 = 0.0;
-	tmp10 += m_A21 * V[20];
-	tmp10 += m_A22 * V[23];
-	V[10] = (RHS10 - tmp10) / m_A20;
+	tmp10 += m_A39 * V[11];
+	tmp10 += m_A40 * V[12];
+	V[10] = (RHS10 - tmp10) / m_A38;
 	double tmp9 = 0.0;
-	tmp9 += m_A19 * V[14];
-	V[9] = (RHS9 - tmp9) / m_A18;
+	tmp9 += m_A35 * V[12];
+	V[9] = (RHS9 - tmp9) / m_A34;
 	double tmp8 = 0.0;
-	tmp8 += m_A17 * V[23];
-	V[8] = (RHS8 - tmp8) / m_A16;
+	tmp8 += m_A30 * V[9];
+	tmp8 += m_A31 * V[12];
+	V[8] = (RHS8 - tmp8) / m_A29;
 	double tmp7 = 0.0;
-	tmp7 += m_A15 * V[14];
-	V[7] = (RHS7 - tmp7) / m_A14;
+	tmp7 += m_A26 * V[11];
+	V[7] = (RHS7 - tmp7) / m_A25;
 	double tmp6 = 0.0;
-	tmp6 += m_A13 * V[14];
-	V[6] = (RHS6 - tmp6) / m_A12;
+	tmp6 += m_A21 * V[7];
+	tmp6 += m_A22 * V[11];
+	V[6] = (RHS6 - tmp6) / m_A20;
 	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[17];
-	V[5] = (RHS5 - tmp5) / m_A10;
+	tmp5 += m_A16 * V[10];
+	tmp5 += m_A17 * V[12];
+	V[5] = (RHS5 - tmp5) / m_A15;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[14];
-	V[4] = (RHS4 - tmp4) / m_A8;
+	tmp4 += m_A12 * V[8];
+	tmp4 += m_A13 * V[9];
+	tmp4 += m_A14 * V[12];
+	V[4] = (RHS4 - tmp4) / m_A11;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[16];
-	V[3] = (RHS3 - tmp3) / m_A6;
+	tmp3 += m_A10 * V[8];
+	V[3] = (RHS3 - tmp3) / m_A9;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[18];
-	V[2] = (RHS2 - tmp2) / m_A4;
+	tmp2 += m_A7 * V[10];
+	tmp2 += m_A8 * V[11];
+	V[2] = (RHS2 - tmp2) / m_A6;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[15];
+	tmp1 += m_A3 * V[6];
+	tmp1 += m_A4 * V[7];
+	tmp1 += m_A5 * V[11];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[21];
+	tmp0 += m_A1 * V[6];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// zac1b11142
-static void nl_gcr_60352d234249ea57_30_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// 280zzzap
+static void nl_gcr_bb501e6a23177009_57_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -6875,41 +46675,68 @@
 	double m_A27(0.0);
 	double m_A28(0.0);
 	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
-	m_A0 += gt[3];
-	m_A0 += gt[4];
-	m_A0 += gt[5];
-	m_A0 += gt[6];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
-	RHS0 += Idr[3];
-	RHS0 += Idr[4];
-	RHS0 += Idr[5];
-	RHS0 += Idr[6];
 	RHS0 -= go[1] * *cnV[1];
 	RHS0 -= go[2] * *cnV[2];
-	RHS0 -= go[3] * *cnV[3];
-	RHS0 -= go[4] * *cnV[4];
-	RHS0 -= go[5] * *cnV[5];
-	RHS0 -= go[6] * *cnV[6];
-	m_A2 += gt[7];
-	m_A2 += gt[8];
-	m_A2 += gt[9];
-	m_A3 += go[7];
-	double RHS1 = Idr[7];
-	RHS1 += Idr[8];
-	RHS1 += Idr[9];
-	RHS1 -= go[8] * *cnV[8];
-	RHS1 -= go[9] * *cnV[9];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
 	m_A4 += gt[10];
 	m_A4 += gt[11];
-	m_A5 += go[10];
-	double RHS2 = Idr[10];
+	m_A5 += go[5];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
 	RHS2 += Idr[11];
+	RHS2 -= go[6] * *cnV[6];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
 	RHS2 -= go[11] * *cnV[11];
 	m_A6 += gt[12];
 	m_A6 += gt[13];
@@ -6923,161 +46750,293 @@
 	m_A8 += gt[15];
 	m_A8 += gt[16];
 	m_A8 += gt[17];
+	m_A8 += gt[18];
+	m_A8 += gt[19];
+	m_A8 += gt[20];
+	m_A8 += gt[21];
 	m_A9 += go[15];
 	double RHS4 = Idr[15];
 	RHS4 += Idr[16];
 	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
 	RHS4 -= go[16] * *cnV[16];
 	RHS4 -= go[17] * *cnV[17];
-	m_A11 += gt[18];
-	m_A11 += gt[19];
-	m_A11 += gt[20];
-	m_A11 += gt[21];
-	m_A12 += go[18];
-	m_A10 += go[19];
-	double RHS5 = Idr[18];
-	RHS5 += Idr[19];
-	RHS5 += Idr[20];
-	RHS5 += Idr[21];
-	RHS5 -= go[20] * *cnV[20];
-	RHS5 -= go[21] * *cnV[21];
-	m_A14 += gt[22];
-	m_A14 += gt[23];
-	m_A14 += gt[24];
-	m_A14 += gt[25];
-	m_A14 += gt[26];
-	m_A14 += gt[27];
-	m_A14 += gt[28];
-	m_A13 += go[22];
-	m_A16 += go[23];
-	m_A16 += go[24];
-	m_A16 += go[25];
-	double RHS6 = Idr[22];
-	RHS6 += Idr[23];
-	RHS6 += Idr[24];
+	RHS4 -= go[18] * *cnV[18];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	m_A10 += gt[22];
+	m_A10 += gt[23];
+	m_A11 += go[22];
+	double RHS5 = Idr[22];
+	RHS5 += Idr[23];
+	RHS5 -= go[23] * *cnV[23];
+	m_A12 += gt[24];
+	m_A12 += gt[25];
+	m_A14 += go[24];
+	m_A13 += go[25];
+	double RHS6 = Idr[24];
 	RHS6 += Idr[25];
-	RHS6 += Idr[26];
-	RHS6 += Idr[27];
-	RHS6 += Idr[28];
-	RHS6 -= go[26] * *cnV[26];
-	RHS6 -= go[27] * *cnV[27];
-	RHS6 -= go[28] * *cnV[28];
-	m_A19 += gt[29];
-	m_A19 += gt[30];
-	m_A18 += go[29];
-	m_A17 += go[30];
-	double RHS7 = Idr[29];
-	RHS7 += Idr[30];
-	m_A21 += gt[31];
-	m_A21 += gt[32];
-	m_A21 += gt[33];
-	m_A21 += gt[34];
-	m_A22 += go[31];
-	m_A20 += go[32];
-	double RHS8 = Idr[31];
-	RHS8 += Idr[32];
-	RHS8 += Idr[33];
-	RHS8 += Idr[34];
-	RHS8 -= go[33] * *cnV[33];
-	RHS8 -= go[34] * *cnV[34];
-	m_A29 += gt[35];
-	m_A29 += gt[36];
-	m_A29 += gt[37];
-	m_A29 += gt[38];
-	m_A29 += gt[39];
-	m_A29 += gt[40];
-	m_A29 += gt[41];
-	m_A26 += go[35];
+	m_A15 += gt[26];
+	m_A15 += gt[27];
+	m_A16 += go[26];
+	double RHS7 = Idr[26];
+	RHS7 += Idr[27];
+	RHS7 -= go[27] * *cnV[27];
+	m_A17 += gt[28];
+	m_A17 += gt[29];
+	m_A18 += go[28];
+	double RHS8 = Idr[28];
+	RHS8 += Idr[29];
+	RHS8 -= go[29] * *cnV[29];
+	m_A20 += gt[30];
+	m_A20 += gt[31];
+	m_A20 += gt[32];
+	m_A20 += gt[33];
+	m_A19 += go[30];
+	double RHS9 = Idr[30];
+	RHS9 += Idr[31];
+	RHS9 += Idr[32];
+	RHS9 += Idr[33];
+	RHS9 -= go[31] * *cnV[31];
+	RHS9 -= go[32] * *cnV[32];
+	RHS9 -= go[33] * *cnV[33];
+	m_A24 += gt[34];
+	m_A24 += gt[35];
+	m_A23 += go[34];
+	m_A22 += go[35];
+	double RHS10 = Idr[34];
+	RHS10 += Idr[35];
+	m_A27 += gt[36];
+	m_A27 += gt[37];
+	m_A27 += gt[38];
+	m_A27 += gt[39];
 	m_A26 += go[36];
-	m_A26 += go[37];
-	m_A27 += go[38];
-	m_A25 += go[39];
-	m_A24 += go[40];
-	m_A23 += go[41];
-	double RHS9 = Idr[35];
-	RHS9 += Idr[36];
-	RHS9 += Idr[37];
-	RHS9 += Idr[38];
-	RHS9 += Idr[39];
-	RHS9 += Idr[40];
-	RHS9 += Idr[41];
+	m_A28 += go[37];
+	double RHS11 = Idr[36];
+	RHS11 += Idr[37];
+	RHS11 += Idr[38];
+	RHS11 += Idr[39];
+	RHS11 -= go[38] * *cnV[38];
+	RHS11 -= go[39] * *cnV[39];
+	m_A31 += gt[40];
+	m_A31 += gt[41];
+	m_A31 += gt[42];
+	m_A31 += gt[43];
+	m_A31 += gt[44];
+	m_A31 += gt[45];
+	m_A29 += go[40];
+	m_A33 += go[41];
+	m_A32 += go[42];
+	double RHS12 = Idr[40];
+	RHS12 += Idr[41];
+	RHS12 += Idr[42];
+	RHS12 += Idr[43];
+	RHS12 += Idr[44];
+	RHS12 += Idr[45];
+	RHS12 -= go[43] * *cnV[43];
+	RHS12 -= go[44] * *cnV[44];
+	RHS12 -= go[45] * *cnV[45];
+	m_A36 += gt[46];
+	m_A36 += gt[47];
+	m_A34 += go[46];
+	double RHS13 = Idr[46];
+	RHS13 += Idr[47];
+	RHS13 -= go[47] * *cnV[47];
+	m_A39 += gt[48];
+	m_A39 += gt[49];
+	m_A39 += gt[50];
+	m_A38 += go[48];
+	m_A37 += go[49];
+	double RHS14 = Idr[48];
+	RHS14 += Idr[49];
+	RHS14 += Idr[50];
+	RHS14 -= go[50] * *cnV[50];
+	m_A41 += gt[51];
+	m_A41 += gt[52];
+	m_A41 += gt[53];
+	m_A41 += gt[54];
+	m_A40 += go[51];
+	m_A42 += go[52];
+	double RHS15 = Idr[51];
+	RHS15 += Idr[52];
+	RHS15 += Idr[53];
+	RHS15 += Idr[54];
+	RHS15 -= go[53] * *cnV[53];
+	RHS15 -= go[54] * *cnV[54];
+	m_A49 += gt[55];
+	m_A49 += gt[56];
+	m_A49 += gt[57];
+	m_A49 += gt[58];
+	m_A49 += gt[59];
+	m_A44 += go[55];
+	m_A47 += go[56];
+	m_A46 += go[57];
+	m_A43 += go[58];
+	m_A45 += go[59];
+	double RHS16 = Idr[55];
+	RHS16 += Idr[56];
+	RHS16 += Idr[57];
+	RHS16 += Idr[58];
+	RHS16 += Idr[59];
+	m_A56 += gt[60];
+	m_A56 += gt[61];
+	m_A56 += gt[62];
+	m_A56 += gt[63];
+	m_A54 += go[60];
+	m_A53 += go[61];
+	m_A51 += go[62];
+	m_A52 += go[63];
+	double RHS17 = Idr[60];
+	RHS17 += Idr[61];
+	RHS17 += Idr[62];
+	RHS17 += Idr[63];
 	const double f0 = 1.0 / m_A0;
-	const double f0_6 = -f0 * m_A13;
-	m_A15 += m_A1 * f0_6;
-	RHS6 += f0_6 * RHS0;
+	const double f0_11 = -f0 * m_A26;
+	m_A28 += m_A1 * f0_11;
+	RHS11 += f0_11 * RHS0;
+	const double f0_16 = -f0 * m_A43;
+	m_A49 += m_A1 * f0_16;
+	RHS16 += f0_16 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_5 = -f1 * m_A10;
-	m_A11 += m_A3 * f1_5;
-	RHS5 += f1_5 * RHS1;
+	const double f1_16 = -f1 * m_A44;
+	m_A49 += m_A3 * f1_16;
+	RHS16 += f1_16 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_7 = -f2 * m_A17;
-	m_A19 += m_A5 * f2_7;
-	RHS7 += f2_7 * RHS2;
-	const double f2_9 = -f2 * m_A23;
-	m_A27 += m_A5 * f2_9;
-	RHS9 += f2_9 * RHS2;
+	const double f2_12 = -f2 * m_A29;
+	m_A30 += m_A5 * f2_12;
+	RHS12 += f2_12 * RHS2;
 	const double f3 = 1.0 / m_A6;
-	const double f3_8 = -f3 * m_A20;
-	m_A22 += m_A7 * f3_8;
-	RHS8 += f3_8 * RHS3;
-	const double f3_9 = -f3 * m_A24;
-	m_A29 += m_A7 * f3_9;
-	RHS9 += f3_9 * RHS3;
+	const double f3_15 = -f3 * m_A40;
+	m_A42 += m_A7 * f3_15;
+	RHS15 += f3_15 * RHS3;
+	const double f3_17 = -f3 * m_A51;
+	m_A56 += m_A7 * f3_17;
+	RHS17 += f3_17 * RHS3;
 	const double f4 = 1.0 / m_A8;
-	const double f4_9 = -f4 * m_A25;
-	m_A29 += m_A9 * f4_9;
+	const double f4_9 = -f4 * m_A19;
+	m_A21 += m_A9 * f4_9;
 	RHS9 += f4_9 * RHS4;
-	const double f5 = 1.0 / m_A11;
-	const double f5_7 = -f5 * m_A18;
-	m_A19 += m_A12 * f5_7;
-	RHS7 += f5_7 * RHS5;
-	const double f6 = 1.0 / m_A14;
-	const double f6_9 = -f6 * m_A26;
-	m_A28 += m_A15 * f6_9;
-	m_A29 += m_A16 * f6_9;
-	RHS9 += f6_9 * RHS6;
-	const double f7 = 1.0 / m_A19;
-	const double f7_9 = -f7 * m_A27;
-	RHS9 += f7_9 * RHS7;
-	const double f8 = 1.0 / m_A21;
-	const double f8_9 = -f8 * m_A28;
-	m_A29 += m_A22 * f8_9;
-	RHS9 += f8_9 * RHS8;
-	V[9] = RHS9 / m_A29;
+	const double f5 = 1.0 / m_A10;
+	const double f5_10 = -f5 * m_A22;
+	m_A24 += m_A11 * f5_10;
+	RHS10 += f5_10 * RHS5;
+	const double f5_16 = -f5 * m_A45;
+	m_A46 += m_A11 * f5_16;
+	RHS16 += f5_16 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_10 = -f6 * m_A23;
+	m_A24 += m_A13 * f6_10;
+	m_A25 += m_A14 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f6_13 = -f6 * m_A34;
+	m_A35 += m_A13 * f6_13;
+	m_A36 += m_A14 * f6_13;
+	RHS13 += f6_13 * RHS6;
+	const double f7 = 1.0 / m_A15;
+	const double f7_14 = -f7 * m_A37;
+	m_A39 += m_A16 * f7_14;
+	RHS14 += f7_14 * RHS7;
+	const double f7_17 = -f7 * m_A52;
+	m_A54 += m_A16 * f7_17;
+	RHS17 += f7_17 * RHS7;
+	const double f8 = 1.0 / m_A17;
+	const double f8_14 = -f8 * m_A38;
+	m_A39 += m_A18 * f8_14;
+	RHS14 += f8_14 * RHS8;
+	const double f10 = 1.0 / m_A24;
+	const double f10_13 = -f10 * m_A35;
+	m_A36 += m_A25 * f10_13;
+	RHS13 += f10_13 * RHS10;
+	const double f10_16 = -f10 * m_A46;
+	m_A48 += m_A25 * f10_16;
+	RHS16 += f10_16 * RHS10;
+	const double f11 = 1.0 / m_A27;
+	const double f11_12 = -f11 * m_A30;
+	m_A32 += m_A28 * f11_12;
+	RHS12 += f11_12 * RHS11;
+	const double f12 = 1.0 / m_A31;
+	const double f12_16 = -f12 * m_A47;
+	m_A49 += m_A32 * f12_16;
+	m_A50 += m_A33 * f12_16;
+	RHS16 += f12_16 * RHS12;
+	const double f12_17 = -f12 * m_A53;
+	m_A55 += m_A32 * f12_17;
+	m_A56 += m_A33 * f12_17;
+	RHS17 += f12_17 * RHS12;
+	const double f13 = 1.0 / m_A36;
+	const double f13_16 = -f13 * m_A48;
+	RHS16 += f13_16 * RHS13;
+	const double f14 = 1.0 / m_A39;
+	const double f14_17 = -f14 * m_A54;
+	RHS17 += f14_17 * RHS14;
+	const double f16 = 1.0 / m_A49;
+	const double f16_17 = -f16 * m_A55;
+	m_A56 += m_A50 * f16_17;
+	RHS17 += f16_17 * RHS16;
+	V[17] = RHS17 / m_A56;
+	double tmp16 = 0.0;
+	tmp16 += m_A50 * V[17];
+	V[16] = (RHS16 - tmp16) / m_A49;
+	double tmp15 = 0.0;
+	tmp15 += m_A42 * V[17];
+	V[15] = (RHS15 - tmp15) / m_A41;
+	double tmp14 = 0.0;
+	V[14] = (RHS14 - tmp14) / m_A39;
+	double tmp13 = 0.0;
+	V[13] = (RHS13 - tmp13) / m_A36;
+	double tmp12 = 0.0;
+	tmp12 += m_A32 * V[16];
+	tmp12 += m_A33 * V[17];
+	V[12] = (RHS12 - tmp12) / m_A31;
+	double tmp11 = 0.0;
+	tmp11 += m_A28 * V[16];
+	V[11] = (RHS11 - tmp11) / m_A27;
+	double tmp10 = 0.0;
+	tmp10 += m_A25 * V[13];
+	V[10] = (RHS10 - tmp10) / m_A24;
+	double tmp9 = 0.0;
+	tmp9 += m_A21 * V[15];
+	V[9] = (RHS9 - tmp9) / m_A20;
 	double tmp8 = 0.0;
-	tmp8 += m_A22 * V[9];
-	V[8] = (RHS8 - tmp8) / m_A21;
+	tmp8 += m_A18 * V[14];
+	V[8] = (RHS8 - tmp8) / m_A17;
 	double tmp7 = 0.0;
-	V[7] = (RHS7 - tmp7) / m_A19;
+	tmp7 += m_A16 * V[14];
+	V[7] = (RHS7 - tmp7) / m_A15;
 	double tmp6 = 0.0;
-	tmp6 += m_A15 * V[8];
-	tmp6 += m_A16 * V[9];
-	V[6] = (RHS6 - tmp6) / m_A14;
+	tmp6 += m_A13 * V[10];
+	tmp6 += m_A14 * V[13];
+	V[6] = (RHS6 - tmp6) / m_A12;
 	double tmp5 = 0.0;
-	tmp5 += m_A12 * V[7];
-	V[5] = (RHS5 - tmp5) / m_A11;
+	tmp5 += m_A11 * V[10];
+	V[5] = (RHS5 - tmp5) / m_A10;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[9];
+	tmp4 += m_A9 * V[15];
 	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[9];
+	tmp3 += m_A7 * V[17];
 	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[7];
+	tmp2 += m_A5 * V[11];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[5];
+	tmp1 += m_A3 * V[16];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[8];
+	tmp0 += m_A1 * V[16];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// breakout
-static void nl_gcr_655da76624809228_13_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// elim
+static void nl_gcr_bb56fa5325163fc3_15_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -7091,90 +47050,123 @@
 	double m_A10(0.0);
 	double m_A11(0.0);
 	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
 	RHS0 -= go[1] * *cnV[1];
 	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
 	m_A2 += gt[5];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 -= go[4] * *cnV[4];
-	RHS1 -= go[5] * *cnV[5];
-	m_A4 += gt[6];
-	m_A4 += gt[7];
-	m_A4 += gt[8];
-	m_A5 += go[6];
-	double RHS2 = Idr[6];
-	RHS2 += Idr[7];
-	RHS2 += Idr[8];
-	RHS2 -= go[7] * *cnV[7];
-	RHS2 -= go[8] * *cnV[8];
-	m_A6 += gt[9];
-	m_A6 += gt[10];
-	m_A6 += gt[11];
-	m_A7 += go[9];
-	double RHS3 = Idr[9];
-	RHS3 += Idr[10];
-	RHS3 += Idr[11];
-	RHS3 -= go[10] * *cnV[10];
-	RHS3 -= go[11] * *cnV[11];
-	m_A12 += gt[12];
-	m_A12 += gt[13];
-	m_A12 += gt[14];
-	m_A12 += gt[15];
-	m_A11 += go[12];
-	m_A10 += go[13];
-	m_A9 += go[14];
-	m_A8 += go[15];
-	double RHS4 = Idr[12];
-	RHS4 += Idr[13];
-	RHS4 += Idr[14];
-	RHS4 += Idr[15];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A2 += gt[11];
+	m_A3 += go[5];
+	double RHS1 = Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	m_A4 += gt[12];
+	m_A4 += gt[13];
+	m_A4 += gt[14];
+	m_A4 += gt[15];
+	m_A6 += go[12];
+	m_A6 += go[13];
+	m_A5 += go[14];
+	double RHS2 = Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 += Idr[15];
+	RHS2 -= go[15] * *cnV[15];
+	m_A9 += gt[16];
+	m_A9 += gt[17];
+	m_A8 += go[16];
+	m_A7 += go[17];
+	double RHS3 = Idr[16];
+	RHS3 += Idr[17];
+	m_A14 += gt[18];
+	m_A14 += gt[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A14 += gt[22];
+	m_A14 += gt[23];
+	m_A11 += go[18];
+	m_A12 += go[19];
+	m_A12 += go[20];
+	double RHS4 = Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 -= go[21] * *cnV[21];
+	RHS4 -= go[22] * *cnV[22];
+	RHS4 -= go[23] * *cnV[23];
 	const double f0 = 1.0 / m_A0;
-	const double f0_4 = -f0 * m_A8;
-	m_A12 += m_A1 * f0_4;
-	RHS4 += f0_4 * RHS0;
+	const double f0_3 = -f0 * m_A7;
+	m_A9 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_4 = -f1 * m_A9;
+	const double f1_4 = -f1 * m_A11;
 	m_A12 += m_A3 * f1_4;
 	RHS4 += f1_4 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_4 = -f2 * m_A10;
-	m_A12 += m_A5 * f2_4;
+	const double f2_3 = -f2 * m_A8;
+	m_A9 += m_A5 * f2_3;
+	m_A10 += m_A6 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	const double f2_4 = -f2 * m_A12;
+	m_A13 += m_A5 * f2_4;
+	m_A14 += m_A6 * f2_4;
 	RHS4 += f2_4 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_4 = -f3 * m_A11;
-	m_A12 += m_A7 * f3_4;
+	const double f3 = 1.0 / m_A9;
+	const double f3_4 = -f3 * m_A13;
+	m_A14 += m_A10 * f3_4;
 	RHS4 += f3_4 * RHS3;
-	V[4] = RHS4 / m_A12;
+	V[4] = RHS4 / m_A14;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[4];
-	V[3] = (RHS3 - tmp3) / m_A6;
+	tmp3 += m_A10 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A9;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[4];
+	tmp2 += m_A5 * V[3];
+	tmp2 += m_A6 * V[4];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[4];
+	tmp1 += m_A3 * V[2];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[4];
+	tmp0 += m_A1 * V[3];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// cheekyms
-static void nl_gcr_6d03e64d09c956c3_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// starfire
+static void nl_gcr_bd1514d7defd4062_9_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -7182,48 +47174,67 @@
 	double m_A4(0.0);
 	double m_A5(0.0);
 	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
-	m_A0 += gt[2];
-	m_A0 += gt[3];
 	m_A1 += go[0];
-	m_A1 += go[1];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
-	RHS0 += Idr[2];
-	RHS0 += Idr[3];
-	RHS0 -= go[2] * *cnV[2];
-	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
 	m_A2 += gt[4];
 	m_A2 += gt[5];
-	m_A3 += go[4];
-	double RHS1 = Idr[4];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
 	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 -= go[3] * *cnV[3];
+	RHS1 -= go[4] * *cnV[4];
 	RHS1 -= go[5] * *cnV[5];
-	m_A6 += gt[6];
-	m_A6 += gt[7];
-	m_A6 += gt[8];
-	m_A6 += gt[9];
-	m_A6 += gt[10];
-	m_A5 += go[6];
-	m_A4 += go[7];
-	m_A4 += go[8];
-	double RHS2 = Idr[6];
-	RHS2 += Idr[7];
-	RHS2 += Idr[8];
-	RHS2 += Idr[9];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	m_A5 += gt[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A4 += go[9];
+	double RHS2 = Idr[9];
 	RHS2 += Idr[10];
-	RHS2 -= go[9] * *cnV[9];
+	RHS2 += Idr[11];
 	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A6 += go[12];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
 	const double f0 = 1.0 / m_A0;
 	const double f0_2 = -f0 * m_A4;
-	m_A6 += m_A1 * f0_2;
+	m_A5 += m_A1 * f0_2;
 	RHS2 += f0_2 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_2 = -f1 * m_A5;
-	m_A6 += m_A3 * f1_2;
-	RHS2 += f1_2 * RHS1;
-	V[2] = RHS2 / m_A6;
+	const double f1_3 = -f1 * m_A6;
+	m_A7 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_3 = -f2 * m_A7;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A8;
+	double tmp2 = 0.0;
+	V[2] = (RHS2 - tmp2) / m_A5;
 	double tmp1 = 0.0;
 	tmp1 += m_A3 * V[2];
 	V[1] = (RHS1 - tmp1) / m_A2;
@@ -7232,11 +47243,12 @@
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// rebound
-static void nl_gcr_6e17dfd7d26d8933_13_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// ripoff
+static void nl_gcr_be7c805100c522fd_59_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -7250,6 +47262,52 @@
 	double m_A10(0.0);
 	double m_A11(0.0);
 	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
@@ -7279,64 +47337,313 @@
 	RHS2 -= go[8] * *cnV[8];
 	m_A6 += gt[9];
 	m_A6 += gt[10];
-	m_A6 += gt[11];
 	m_A7 += go[9];
 	double RHS3 = Idr[9];
 	RHS3 += Idr[10];
-	RHS3 += Idr[11];
 	RHS3 -= go[10] * *cnV[10];
-	RHS3 -= go[11] * *cnV[11];
-	m_A12 += gt[12];
-	m_A12 += gt[13];
-	m_A12 += gt[14];
-	m_A12 += gt[15];
-	m_A12 += gt[16];
-	m_A11 += go[12];
-	m_A10 += go[13];
-	m_A9 += go[14];
-	m_A8 += go[15];
-	double RHS4 = Idr[12];
+	m_A8 += gt[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A9 += go[11];
+	double RHS4 = Idr[11];
+	RHS4 += Idr[12];
 	RHS4 += Idr[13];
-	RHS4 += Idr[14];
-	RHS4 += Idr[15];
-	RHS4 += Idr[16];
-	RHS4 -= go[16] * *cnV[16];
+	RHS4 -= go[12] * *cnV[12];
+	RHS4 -= go[13] * *cnV[13];
+	m_A10 += gt[14];
+	m_A10 += gt[15];
+	m_A12 += go[14];
+	m_A11 += go[15];
+	double RHS5 = Idr[14];
+	RHS5 += Idr[15];
+	m_A13 += gt[16];
+	m_A13 += gt[17];
+	m_A13 += gt[18];
+	m_A14 += go[16];
+	double RHS6 = Idr[16];
+	RHS6 += Idr[17];
+	RHS6 += Idr[18];
+	RHS6 -= go[17] * *cnV[17];
+	RHS6 -= go[18] * *cnV[18];
+	m_A15 += gt[19];
+	m_A15 += gt[20];
+	m_A15 += gt[21];
+	m_A16 += go[19];
+	double RHS7 = Idr[19];
+	RHS7 += Idr[20];
+	RHS7 += Idr[21];
+	RHS7 -= go[20] * *cnV[20];
+	RHS7 -= go[21] * *cnV[21];
+	m_A17 += gt[22];
+	m_A17 += gt[23];
+	m_A17 += gt[24];
+	m_A18 += go[22];
+	double RHS8 = Idr[22];
+	RHS8 += Idr[23];
+	RHS8 += Idr[24];
+	RHS8 -= go[23] * *cnV[23];
+	RHS8 -= go[24] * *cnV[24];
+	m_A19 += gt[25];
+	m_A19 += gt[26];
+	m_A19 += gt[27];
+	m_A20 += go[25];
+	double RHS9 = Idr[25];
+	RHS9 += Idr[26];
+	RHS9 += Idr[27];
+	RHS9 -= go[26] * *cnV[26];
+	RHS9 -= go[27] * *cnV[27];
+	m_A21 += gt[28];
+	m_A21 += gt[29];
+	m_A23 += go[28];
+	m_A22 += go[29];
+	double RHS10 = Idr[28];
+	RHS10 += Idr[29];
+	m_A24 += gt[30];
+	m_A24 += gt[31];
+	m_A24 += gt[32];
+	m_A25 += go[30];
+	double RHS11 = Idr[30];
+	RHS11 += Idr[31];
+	RHS11 += Idr[32];
+	RHS11 -= go[31] * *cnV[31];
+	RHS11 -= go[32] * *cnV[32];
+	m_A26 += gt[33];
+	m_A26 += gt[34];
+	m_A26 += gt[35];
+	m_A27 += go[33];
+	double RHS12 = Idr[33];
+	RHS12 += Idr[34];
+	RHS12 += Idr[35];
+	RHS12 -= go[34] * *cnV[34];
+	RHS12 -= go[35] * *cnV[35];
+	m_A28 += gt[36];
+	m_A28 += gt[37];
+	m_A28 += gt[38];
+	m_A29 += go[36];
+	double RHS13 = Idr[36];
+	RHS13 += Idr[37];
+	RHS13 += Idr[38];
+	RHS13 -= go[37] * *cnV[37];
+	RHS13 -= go[38] * *cnV[38];
+	m_A35 += gt[39];
+	m_A35 += gt[40];
+	m_A35 += gt[41];
+	m_A35 += gt[42];
+	m_A35 += gt[43];
+	m_A35 += gt[44];
+	m_A34 += go[39];
+	m_A33 += go[40];
+	m_A32 += go[41];
+	m_A31 += go[42];
+	m_A30 += go[43];
+	double RHS14 = Idr[39];
+	RHS14 += Idr[40];
+	RHS14 += Idr[41];
+	RHS14 += Idr[42];
+	RHS14 += Idr[43];
+	RHS14 += Idr[44];
+	RHS14 -= go[44] * *cnV[44];
+	m_A38 += gt[45];
+	m_A38 += gt[46];
+	m_A37 += go[45];
+	m_A39 += go[46];
+	double RHS15 = Idr[45];
+	RHS15 += Idr[46];
+	m_A40 += gt[47];
+	m_A40 += gt[48];
+	m_A40 += gt[49];
+	m_A41 += go[47];
+	double RHS16 = Idr[47];
+	RHS16 += Idr[48];
+	RHS16 += Idr[49];
+	RHS16 -= go[48] * *cnV[48];
+	RHS16 -= go[49] * *cnV[49];
+	m_A46 += gt[50];
+	m_A46 += gt[51];
+	m_A46 += gt[52];
+	m_A43 += go[50];
+	m_A45 += go[51];
+	m_A42 += go[52];
+	double RHS17 = Idr[50];
+	RHS17 += Idr[51];
+	RHS17 += Idr[52];
+	m_A58 += gt[53];
+	m_A58 += gt[54];
+	m_A58 += gt[55];
+	m_A58 += gt[56];
+	m_A58 += gt[57];
+	m_A58 += gt[58];
+	m_A58 += gt[59];
+	m_A58 += gt[60];
+	m_A58 += gt[61];
+	m_A58 += gt[62];
+	m_A56 += go[53];
+	m_A55 += go[54];
+	m_A54 += go[55];
+	m_A53 += go[56];
+	m_A52 += go[57];
+	m_A51 += go[58];
+	m_A50 += go[59];
+	m_A49 += go[60];
+	m_A48 += go[61];
+	double RHS18 = Idr[53];
+	RHS18 += Idr[54];
+	RHS18 += Idr[55];
+	RHS18 += Idr[56];
+	RHS18 += Idr[57];
+	RHS18 += Idr[58];
+	RHS18 += Idr[59];
+	RHS18 += Idr[60];
+	RHS18 += Idr[61];
+	RHS18 += Idr[62];
+	RHS18 -= go[62] * *cnV[62];
 	const double f0 = 1.0 / m_A0;
-	const double f0_4 = -f0 * m_A8;
-	m_A12 += m_A1 * f0_4;
-	RHS4 += f0_4 * RHS0;
+	const double f0_14 = -f0 * m_A30;
+	m_A35 += m_A1 * f0_14;
+	RHS14 += f0_14 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_4 = -f1 * m_A9;
-	m_A12 += m_A3 * f1_4;
-	RHS4 += f1_4 * RHS1;
+	const double f1_14 = -f1 * m_A31;
+	m_A35 += m_A3 * f1_14;
+	RHS14 += f1_14 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_4 = -f2 * m_A10;
-	m_A12 += m_A5 * f2_4;
-	RHS4 += f2_4 * RHS2;
+	const double f2_14 = -f2 * m_A32;
+	m_A35 += m_A5 * f2_14;
+	RHS14 += f2_14 * RHS2;
 	const double f3 = 1.0 / m_A6;
-	const double f3_4 = -f3 * m_A11;
-	m_A12 += m_A7 * f3_4;
-	RHS4 += f3_4 * RHS3;
-	V[4] = RHS4 / m_A12;
+	const double f3_15 = -f3 * m_A37;
+	m_A38 += m_A7 * f3_15;
+	RHS15 += f3_15 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_14 = -f4 * m_A33;
+	m_A35 += m_A9 * f4_14;
+	RHS14 += f4_14 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_14 = -f5 * m_A34;
+	m_A35 += m_A11 * f5_14;
+	m_A36 += m_A12 * f5_14;
+	RHS14 += f5_14 * RHS5;
+	const double f5_17 = -f5 * m_A42;
+	m_A44 += m_A11 * f5_17;
+	m_A46 += m_A12 * f5_17;
+	RHS17 += f5_17 * RHS5;
+	const double f6 = 1.0 / m_A13;
+	const double f6_18 = -f6 * m_A48;
+	m_A58 += m_A14 * f6_18;
+	RHS18 += f6_18 * RHS6;
+	const double f7 = 1.0 / m_A15;
+	const double f7_18 = -f7 * m_A49;
+	m_A58 += m_A16 * f7_18;
+	RHS18 += f7_18 * RHS7;
+	const double f8 = 1.0 / m_A17;
+	const double f8_18 = -f8 * m_A50;
+	m_A58 += m_A18 * f8_18;
+	RHS18 += f8_18 * RHS8;
+	const double f9 = 1.0 / m_A19;
+	const double f9_18 = -f9 * m_A51;
+	m_A58 += m_A20 * f9_18;
+	RHS18 += f9_18 * RHS9;
+	const double f10 = 1.0 / m_A21;
+	const double f10_17 = -f10 * m_A43;
+	m_A46 += m_A22 * f10_17;
+	m_A47 += m_A23 * f10_17;
+	RHS17 += f10_17 * RHS10;
+	const double f10_18 = -f10 * m_A52;
+	m_A57 += m_A22 * f10_18;
+	m_A58 += m_A23 * f10_18;
+	RHS18 += f10_18 * RHS10;
+	const double f11 = 1.0 / m_A24;
+	const double f11_18 = -f11 * m_A53;
+	m_A58 += m_A25 * f11_18;
+	RHS18 += f11_18 * RHS11;
+	const double f12 = 1.0 / m_A26;
+	const double f12_18 = -f12 * m_A54;
+	m_A58 += m_A27 * f12_18;
+	RHS18 += f12_18 * RHS12;
+	const double f13 = 1.0 / m_A28;
+	const double f13_18 = -f13 * m_A55;
+	m_A58 += m_A29 * f13_18;
+	RHS18 += f13_18 * RHS13;
+	const double f14 = 1.0 / m_A35;
+	const double f14_17 = -f14 * m_A44;
+	m_A46 += m_A36 * f14_17;
+	RHS17 += f14_17 * RHS14;
+	const double f15 = 1.0 / m_A38;
+	const double f15_17 = -f15 * m_A45;
+	m_A46 += m_A39 * f15_17;
+	RHS17 += f15_17 * RHS15;
+	const double f16 = 1.0 / m_A40;
+	const double f16_18 = -f16 * m_A56;
+	m_A58 += m_A41 * f16_18;
+	RHS18 += f16_18 * RHS16;
+	const double f17 = 1.0 / m_A46;
+	const double f17_18 = -f17 * m_A57;
+	m_A58 += m_A47 * f17_18;
+	RHS18 += f17_18 * RHS17;
+	V[18] = RHS18 / m_A58;
+	double tmp17 = 0.0;
+	tmp17 += m_A47 * V[18];
+	V[17] = (RHS17 - tmp17) / m_A46;
+	double tmp16 = 0.0;
+	tmp16 += m_A41 * V[18];
+	V[16] = (RHS16 - tmp16) / m_A40;
+	double tmp15 = 0.0;
+	tmp15 += m_A39 * V[17];
+	V[15] = (RHS15 - tmp15) / m_A38;
+	double tmp14 = 0.0;
+	tmp14 += m_A36 * V[17];
+	V[14] = (RHS14 - tmp14) / m_A35;
+	double tmp13 = 0.0;
+	tmp13 += m_A29 * V[18];
+	V[13] = (RHS13 - tmp13) / m_A28;
+	double tmp12 = 0.0;
+	tmp12 += m_A27 * V[18];
+	V[12] = (RHS12 - tmp12) / m_A26;
+	double tmp11 = 0.0;
+	tmp11 += m_A25 * V[18];
+	V[11] = (RHS11 - tmp11) / m_A24;
+	double tmp10 = 0.0;
+	tmp10 += m_A22 * V[17];
+	tmp10 += m_A23 * V[18];
+	V[10] = (RHS10 - tmp10) / m_A21;
+	double tmp9 = 0.0;
+	tmp9 += m_A20 * V[18];
+	V[9] = (RHS9 - tmp9) / m_A19;
+	double tmp8 = 0.0;
+	tmp8 += m_A18 * V[18];
+	V[8] = (RHS8 - tmp8) / m_A17;
+	double tmp7 = 0.0;
+	tmp7 += m_A16 * V[18];
+	V[7] = (RHS7 - tmp7) / m_A15;
+	double tmp6 = 0.0;
+	tmp6 += m_A14 * V[18];
+	V[6] = (RHS6 - tmp6) / m_A13;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[14];
+	tmp5 += m_A12 * V[17];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[14];
+	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[4];
+	tmp3 += m_A7 * V[15];
 	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[4];
+	tmp2 += m_A5 * V[14];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[4];
+	tmp1 += m_A3 * V[14];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[4];
+	tmp0 += m_A1 * V[14];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// gamemachine
-static void nl_gcr_70c1124c705dd998_19_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// elim
+static void nl_gcr_be831e5faa508573_150_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -7356,131 +47663,927 @@
 	double m_A16(0.0);
 	double m_A17(0.0);
 	double m_A18(0.0);
-	m_A0 += gt[0];
-	m_A0 += gt[1];
-	m_A0 += gt[2];
-	m_A1 += go[0];
-	double RHS0 = Idr[0];
-	RHS0 += Idr[1];
-	RHS0 += Idr[2];
-	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 -= go[4] * *cnV[4];
-	RHS1 -= go[5] * *cnV[5];
-	m_A4 += gt[6];
-	m_A4 += gt[7];
-	m_A4 += gt[8];
-	m_A5 += go[6];
-	double RHS2 = Idr[6];
-	RHS2 += Idr[7];
-	RHS2 += Idr[8];
-	RHS2 -= go[7] * *cnV[7];
-	RHS2 -= go[8] * *cnV[8];
-	m_A6 += gt[9];
-	m_A6 += gt[10];
-	m_A6 += gt[11];
-	m_A7 += go[9];
-	double RHS3 = Idr[9];
-	RHS3 += Idr[10];
-	RHS3 += Idr[11];
-	RHS3 -= go[10] * *cnV[10];
-	RHS3 -= go[11] * *cnV[11];
-	m_A8 += gt[12];
-	m_A8 += gt[13];
-	m_A8 += gt[14];
-	m_A9 += go[12];
-	double RHS4 = Idr[12];
-	RHS4 += Idr[13];
-	RHS4 += Idr[14];
-	RHS4 -= go[13] * *cnV[13];
-	RHS4 -= go[14] * *cnV[14];
-	m_A10 += gt[15];
-	m_A10 += gt[16];
-	m_A10 += gt[17];
-	m_A11 += go[15];
-	double RHS5 = Idr[15];
-	RHS5 += Idr[16];
-	RHS5 += Idr[17];
-	RHS5 -= go[16] * *cnV[16];
-	RHS5 -= go[17] * *cnV[17];
-	m_A18 += gt[18];
-	m_A18 += gt[19];
-	m_A18 += gt[20];
-	m_A18 += gt[21];
-	m_A18 += gt[22];
-	m_A18 += gt[23];
-	m_A18 += gt[24];
-	m_A17 += go[18];
-	m_A16 += go[19];
-	m_A15 += go[20];
-	m_A14 += go[21];
-	m_A13 += go[22];
-	m_A12 += go[23];
-	double RHS6 = Idr[18];
-	RHS6 += Idr[19];
-	RHS6 += Idr[20];
-	RHS6 += Idr[21];
-	RHS6 += Idr[22];
-	RHS6 += Idr[23];
-	RHS6 += Idr[24];
-	RHS6 -= go[24] * *cnV[24];
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A7 += go[6];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	RHS3 -= go[7] * *cnV[7];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A9 += go[8];
+	double RHS4 = Idr[8];
+	RHS4 += Idr[9];
+	RHS4 -= go[9] * *cnV[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A11 += go[10];
+	double RHS5 = Idr[10];
+	RHS5 += Idr[11];
+	RHS5 -= go[11] * *cnV[11];
+	m_A12 += gt[12];
+	m_A12 += gt[13];
+	m_A13 += go[12];
+	double RHS6 = Idr[12];
+	RHS6 += Idr[13];
+	RHS6 -= go[13] * *cnV[13];
+	m_A14 += gt[14];
+	m_A14 += gt[15];
+	m_A14 += gt[16];
+	m_A16 += go[14];
+	m_A15 += go[15];
+	double RHS7 = Idr[14];
+	RHS7 += Idr[15];
+	RHS7 += Idr[16];
+	RHS7 -= go[16] * *cnV[16];
+	m_A17 += gt[17];
+	m_A17 += gt[18];
+	m_A18 += go[17];
+	double RHS8 = Idr[17];
+	RHS8 += Idr[18];
+	RHS8 -= go[18] * *cnV[18];
+	m_A19 += gt[19];
+	m_A19 += gt[20];
+	m_A19 += gt[21];
+	m_A21 += go[19];
+	m_A20 += go[20];
+	double RHS9 = Idr[19];
+	RHS9 += Idr[20];
+	RHS9 += Idr[21];
+	RHS9 -= go[21] * *cnV[21];
+	m_A22 += gt[22];
+	m_A22 += gt[23];
+	m_A22 += gt[24];
+	m_A23 += go[22];
+	double RHS10 = Idr[22];
+	RHS10 += Idr[23];
+	RHS10 += Idr[24];
+	RHS10 -= go[23] * *cnV[23];
+	RHS10 -= go[24] * *cnV[24];
+	m_A24 += gt[25];
+	m_A24 += gt[26];
+	m_A25 += go[25];
+	double RHS11 = Idr[25];
+	RHS11 += Idr[26];
+	RHS11 -= go[26] * *cnV[26];
+	m_A26 += gt[27];
+	m_A26 += gt[28];
+	m_A27 += go[27];
+	double RHS12 = Idr[27];
+	RHS12 += Idr[28];
+	RHS12 -= go[28] * *cnV[28];
+	m_A28 += gt[29];
+	m_A28 += gt[30];
+	m_A28 += gt[31];
+	m_A28 += gt[32];
+	m_A30 += go[29];
+	m_A29 += go[30];
+	double RHS13 = Idr[29];
+	RHS13 += Idr[30];
+	RHS13 += Idr[31];
+	RHS13 += Idr[32];
+	RHS13 -= go[31] * *cnV[31];
+	RHS13 -= go[32] * *cnV[32];
+	m_A31 += gt[33];
+	m_A31 += gt[34];
+	m_A31 += gt[35];
+	m_A32 += go[33];
+	double RHS14 = Idr[33];
+	RHS14 += Idr[34];
+	RHS14 += Idr[35];
+	RHS14 -= go[34] * *cnV[34];
+	RHS14 -= go[35] * *cnV[35];
+	m_A33 += gt[36];
+	m_A33 += gt[37];
+	m_A34 += go[36];
+	m_A35 += go[37];
+	double RHS15 = Idr[36];
+	RHS15 += Idr[37];
+	m_A36 += gt[38];
+	m_A36 += gt[39];
+	m_A37 += go[38];
+	m_A38 += go[39];
+	double RHS16 = Idr[38];
+	RHS16 += Idr[39];
+	m_A39 += gt[40];
+	m_A39 += gt[41];
+	m_A39 += gt[42];
+	m_A40 += go[40];
+	double RHS17 = Idr[40];
+	RHS17 += Idr[41];
+	RHS17 += Idr[42];
+	RHS17 -= go[41] * *cnV[41];
+	RHS17 -= go[42] * *cnV[42];
+	m_A41 += gt[43];
+	m_A41 += gt[44];
+	m_A41 += gt[45];
+	m_A43 += go[43];
+	m_A42 += go[44];
+	double RHS18 = Idr[43];
+	RHS18 += Idr[44];
+	RHS18 += Idr[45];
+	RHS18 -= go[45] * *cnV[45];
+	m_A44 += gt[46];
+	m_A44 += gt[47];
+	m_A44 += gt[48];
+	m_A44 += gt[49];
+	m_A44 += gt[50];
+	m_A44 += gt[51];
+	m_A45 += go[46];
+	m_A46 += go[47];
+	double RHS19 = Idr[46];
+	RHS19 += Idr[47];
+	RHS19 += Idr[48];
+	RHS19 += Idr[49];
+	RHS19 += Idr[50];
+	RHS19 += Idr[51];
+	RHS19 -= go[48] * *cnV[48];
+	RHS19 -= go[49] * *cnV[49];
+	RHS19 -= go[50] * *cnV[50];
+	RHS19 -= go[51] * *cnV[51];
+	m_A47 += gt[52];
+	m_A47 += gt[53];
+	m_A47 += gt[54];
+	m_A49 += go[52];
+	m_A48 += go[53];
+	double RHS20 = Idr[52];
+	RHS20 += Idr[53];
+	RHS20 += Idr[54];
+	RHS20 -= go[54] * *cnV[54];
+	m_A50 += gt[55];
+	m_A50 += gt[56];
+	m_A50 += gt[57];
+	m_A50 += gt[58];
+	m_A50 += gt[59];
+	m_A50 += gt[60];
+	m_A50 += gt[61];
+	m_A52 += go[55];
+	m_A51 += go[56];
+	double RHS21 = Idr[55];
+	RHS21 += Idr[56];
+	RHS21 += Idr[57];
+	RHS21 += Idr[58];
+	RHS21 += Idr[59];
+	RHS21 += Idr[60];
+	RHS21 += Idr[61];
+	RHS21 -= go[57] * *cnV[57];
+	RHS21 -= go[58] * *cnV[58];
+	RHS21 -= go[59] * *cnV[59];
+	RHS21 -= go[60] * *cnV[60];
+	RHS21 -= go[61] * *cnV[61];
+	m_A53 += gt[62];
+	m_A53 += gt[63];
+	m_A53 += gt[64];
+	m_A54 += go[62];
+	m_A55 += go[63];
+	double RHS22 = Idr[62];
+	RHS22 += Idr[63];
+	RHS22 += Idr[64];
+	RHS22 -= go[64] * *cnV[64];
+	m_A58 += gt[65];
+	m_A58 += gt[66];
+	m_A58 += gt[67];
+	m_A57 += go[65];
+	m_A56 += go[66];
+	double RHS23 = Idr[65];
+	RHS23 += Idr[66];
+	RHS23 += Idr[67];
+	RHS23 -= go[67] * *cnV[67];
+	m_A61 += gt[68];
+	m_A61 += gt[69];
+	m_A61 += gt[70];
+	m_A62 += go[68];
+	m_A60 += go[69];
+	double RHS24 = Idr[68];
+	RHS24 += Idr[69];
+	RHS24 += Idr[70];
+	RHS24 -= go[70] * *cnV[70];
+	m_A65 += gt[71];
+	m_A65 += gt[72];
+	m_A65 += gt[73];
+	m_A63 += go[71];
+	m_A66 += go[72];
+	double RHS25 = Idr[71];
+	RHS25 += Idr[72];
+	RHS25 += Idr[73];
+	RHS25 -= go[73] * *cnV[73];
+	m_A69 += gt[74];
+	m_A69 += gt[75];
+	m_A69 += gt[76];
+	m_A68 += go[74];
+	m_A67 += go[75];
+	double RHS26 = Idr[74];
+	RHS26 += Idr[75];
+	RHS26 += Idr[76];
+	RHS26 -= go[76] * *cnV[76];
+	m_A74 += gt[77];
+	m_A74 += gt[78];
+	m_A74 += gt[79];
+	m_A74 += gt[80];
+	m_A72 += go[77];
+	m_A71 += go[78];
+	m_A73 += go[79];
+	double RHS27 = Idr[77];
+	RHS27 += Idr[78];
+	RHS27 += Idr[79];
+	RHS27 += Idr[80];
+	RHS27 -= go[80] * *cnV[80];
+	m_A78 += gt[81];
+	m_A78 += gt[82];
+	m_A78 += gt[83];
+	m_A76 += go[81];
+	m_A79 += go[82];
+	double RHS28 = Idr[81];
+	RHS28 += Idr[82];
+	RHS28 += Idr[83];
+	RHS28 -= go[83] * *cnV[83];
+	m_A82 += gt[84];
+	m_A82 += gt[85];
+	m_A82 += gt[86];
+	m_A82 += gt[87];
+	m_A82 += gt[88];
+	m_A81 += go[84];
+	m_A80 += go[85];
+	m_A84 += go[86];
+	double RHS29 = Idr[84];
+	RHS29 += Idr[85];
+	RHS29 += Idr[86];
+	RHS29 += Idr[87];
+	RHS29 += Idr[88];
+	RHS29 -= go[87] * *cnV[87];
+	RHS29 -= go[88] * *cnV[88];
+	m_A88 += gt[89];
+	m_A88 += gt[90];
+	m_A88 += gt[91];
+	m_A87 += go[89];
+	m_A86 += go[90];
+	double RHS30 = Idr[89];
+	RHS30 += Idr[90];
+	RHS30 += Idr[91];
+	RHS30 -= go[91] * *cnV[91];
+	m_A92 += gt[92];
+	m_A92 += gt[93];
+	m_A92 += gt[94];
+	m_A92 += gt[95];
+	m_A91 += go[92];
+	m_A90 += go[93];
+	double RHS31 = Idr[92];
+	RHS31 += Idr[93];
+	RHS31 += Idr[94];
+	RHS31 += Idr[95];
+	RHS31 -= go[94] * *cnV[94];
+	RHS31 -= go[95] * *cnV[95];
+	m_A96 += gt[96];
+	m_A96 += gt[97];
+	m_A96 += gt[98];
+	m_A95 += go[96];
+	m_A94 += go[97];
+	double RHS32 = Idr[96];
+	RHS32 += Idr[97];
+	RHS32 += Idr[98];
+	RHS32 -= go[98] * *cnV[98];
+	m_A99 += gt[99];
+	m_A99 += gt[100];
+	m_A99 += gt[101];
+	m_A100 += go[99];
+	m_A98 += go[100];
+	double RHS33 = Idr[99];
+	RHS33 += Idr[100];
+	RHS33 += Idr[101];
+	RHS33 -= go[101] * *cnV[101];
+	m_A104 += gt[102];
+	m_A104 += gt[103];
+	m_A104 += gt[104];
+	m_A104 += gt[105];
+	m_A102 += go[102];
+	m_A107 += go[103];
+	m_A101 += go[104];
+	double RHS34 = Idr[102];
+	RHS34 += Idr[103];
+	RHS34 += Idr[104];
+	RHS34 += Idr[105];
+	RHS34 -= go[105] * *cnV[105];
+	m_A116 += gt[106];
+	m_A116 += gt[107];
+	m_A116 += gt[108];
+	m_A116 += gt[109];
+	m_A116 += gt[110];
+	m_A116 += gt[111];
+	m_A113 += go[106];
+	m_A110 += go[107];
+	m_A109 += go[108];
+	m_A111 += go[109];
+	m_A108 += go[110];
+	double RHS35 = Idr[106];
+	RHS35 += Idr[107];
+	RHS35 += Idr[108];
+	RHS35 += Idr[109];
+	RHS35 += Idr[110];
+	RHS35 += Idr[111];
+	RHS35 -= go[111] * *cnV[111];
+	m_A124 += gt[112];
+	m_A124 += gt[113];
+	m_A124 += gt[114];
+	m_A124 += gt[115];
+	m_A120 += go[112];
+	m_A125 += go[113];
+	m_A119 += go[114];
+	double RHS36 = Idr[112];
+	RHS36 += Idr[113];
+	RHS36 += Idr[114];
+	RHS36 += Idr[115];
+	RHS36 -= go[115] * *cnV[115];
+	m_A128 += gt[116];
+	m_A128 += gt[117];
+	m_A128 += gt[118];
+	m_A126 += go[116];
+	m_A129 += go[117];
+	double RHS37 = Idr[116];
+	RHS37 += Idr[117];
+	RHS37 += Idr[118];
+	RHS37 -= go[118] * *cnV[118];
+	m_A132 += gt[119];
+	m_A132 += gt[120];
+	m_A132 += gt[121];
+	m_A130 += go[119];
+	m_A131 += go[120];
+	double RHS38 = Idr[119];
+	RHS38 += Idr[120];
+	RHS38 += Idr[121];
+	RHS38 -= go[121] * *cnV[121];
+	m_A136 += gt[122];
+	m_A136 += gt[123];
+	m_A136 += gt[124];
+	m_A134 += go[122];
+	m_A137 += go[123];
+	double RHS39 = Idr[122];
+	RHS39 += Idr[123];
+	RHS39 += Idr[124];
+	RHS39 -= go[124] * *cnV[124];
+	m_A149 += gt[125];
+	m_A149 += gt[126];
+	m_A149 += gt[127];
+	m_A149 += gt[128];
+	m_A149 += gt[129];
+	m_A149 += gt[130];
+	m_A149 += gt[131];
+	m_A149 += gt[132];
+	m_A149 += gt[133];
+	m_A149 += gt[134];
+	m_A149 += gt[135];
+	m_A149 += gt[136];
+	m_A138 += go[125];
+	m_A139 += go[126];
+	m_A148 += go[127];
+	m_A146 += go[128];
+	m_A142 += go[129];
+	m_A141 += go[130];
+	m_A140 += go[131];
+	m_A145 += go[132];
+	m_A143 += go[133];
+	double RHS40 = Idr[125];
+	RHS40 += Idr[126];
+	RHS40 += Idr[127];
+	RHS40 += Idr[128];
+	RHS40 += Idr[129];
+	RHS40 += Idr[130];
+	RHS40 += Idr[131];
+	RHS40 += Idr[132];
+	RHS40 += Idr[133];
+	RHS40 += Idr[134];
+	RHS40 += Idr[135];
+	RHS40 += Idr[136];
+	RHS40 -= go[134] * *cnV[134];
+	RHS40 -= go[135] * *cnV[135];
+	RHS40 -= go[136] * *cnV[136];
 	const double f0 = 1.0 / m_A0;
-	const double f0_6 = -f0 * m_A12;
-	m_A18 += m_A1 * f0_6;
-	RHS6 += f0_6 * RHS0;
+	const double f0_33 = -f0 * m_A98;
+	m_A99 += m_A1 * f0_33;
+	RHS33 += f0_33 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_6 = -f1 * m_A13;
-	m_A18 += m_A3 * f1_6;
-	RHS6 += f1_6 * RHS1;
+	const double f1_34 = -f1 * m_A101;
+	m_A104 += m_A3 * f1_34;
+	RHS34 += f1_34 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_6 = -f2 * m_A14;
-	m_A18 += m_A5 * f2_6;
-	RHS6 += f2_6 * RHS2;
+	const double f2_30 = -f2 * m_A86;
+	m_A88 += m_A5 * f2_30;
+	RHS30 += f2_30 * RHS2;
 	const double f3 = 1.0 / m_A6;
-	const double f3_6 = -f3 * m_A15;
-	m_A18 += m_A7 * f3_6;
-	RHS6 += f3_6 * RHS3;
+	const double f3_23 = -f3 * m_A56;
+	m_A58 += m_A7 * f3_23;
+	RHS23 += f3_23 * RHS3;
 	const double f4 = 1.0 / m_A8;
-	const double f4_6 = -f4 * m_A16;
-	m_A18 += m_A9 * f4_6;
-	RHS6 += f4_6 * RHS4;
+	const double f4_26 = -f4 * m_A67;
+	m_A69 += m_A9 * f4_26;
+	RHS26 += f4_26 * RHS4;
 	const double f5 = 1.0 / m_A10;
-	const double f5_6 = -f5 * m_A17;
-	m_A18 += m_A11 * f5_6;
-	RHS6 += f5_6 * RHS5;
-	V[6] = RHS6 / m_A18;
+	const double f5_32 = -f5 * m_A94;
+	m_A96 += m_A11 * f5_32;
+	RHS32 += f5_32 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_24 = -f6 * m_A60;
+	m_A61 += m_A13 * f6_24;
+	RHS24 += f6_24 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_23 = -f7 * m_A57;
+	m_A58 += m_A15 * f7_23;
+	m_A59 += m_A16 * f7_23;
+	RHS23 += f7_23 * RHS7;
+	const double f7_25 = -f7 * m_A63;
+	m_A64 += m_A15 * f7_25;
+	m_A65 += m_A16 * f7_25;
+	RHS25 += f7_25 * RHS7;
+	const double f8 = 1.0 / m_A17;
+	const double f8_36 = -f8 * m_A119;
+	m_A124 += m_A18 * f8_36;
+	RHS36 += f8_36 * RHS8;
+	const double f9 = 1.0 / m_A19;
+	const double f9_26 = -f9 * m_A68;
+	m_A69 += m_A20 * f9_26;
+	m_A70 += m_A21 * f9_26;
+	RHS26 += f9_26 * RHS9;
+	const double f9_28 = -f9 * m_A76;
+	m_A77 += m_A20 * f9_28;
+	m_A78 += m_A21 * f9_28;
+	RHS28 += f9_28 * RHS9;
+	const double f10 = 1.0 / m_A22;
+	const double f10_27 = -f10 * m_A71;
+	m_A74 += m_A23 * f10_27;
+	RHS27 += f10_27 * RHS10;
+	const double f11 = 1.0 / m_A24;
+	const double f11_27 = -f11 * m_A72;
+	m_A74 += m_A25 * f11_27;
+	RHS27 += f11_27 * RHS11;
+	const double f12 = 1.0 / m_A26;
+	const double f12_31 = -f12 * m_A90;
+	m_A92 += m_A27 * f12_31;
+	RHS31 += f12_31 * RHS12;
+	const double f13 = 1.0 / m_A28;
+	const double f13_27 = -f13 * m_A73;
+	m_A74 += m_A29 * f13_27;
+	m_A75 += m_A30 * f13_27;
+	RHS27 += f13_27 * RHS13;
+	const double f13_35 = -f13 * m_A108;
+	m_A112 += m_A29 * f13_35;
+	m_A116 += m_A30 * f13_35;
+	RHS35 += f13_35 * RHS13;
+	const double f14 = 1.0 / m_A31;
+	const double f14_35 = -f14 * m_A109;
+	m_A116 += m_A32 * f14_35;
+	RHS35 += f14_35 * RHS14;
+	const double f15 = 1.0 / m_A33;
+	const double f15_29 = -f15 * m_A80;
+	m_A82 += m_A34 * f15_29;
+	m_A83 += m_A35 * f15_29;
+	RHS29 += f15_29 * RHS15;
+	const double f15_34 = -f15 * m_A102;
+	m_A103 += m_A34 * f15_34;
+	m_A104 += m_A35 * f15_34;
+	RHS34 += f15_34 * RHS15;
+	const double f16 = 1.0 / m_A36;
+	const double f16_29 = -f16 * m_A81;
+	m_A82 += m_A37 * f16_29;
+	m_A85 += m_A38 * f16_29;
+	RHS29 += f16_29 * RHS16;
+	const double f16_36 = -f16 * m_A120;
+	m_A121 += m_A37 * f16_36;
+	m_A124 += m_A38 * f16_36;
+	RHS36 += f16_36 * RHS16;
+	const double f17 = 1.0 / m_A39;
+	const double f17_35 = -f17 * m_A110;
+	m_A116 += m_A40 * f17_35;
+	RHS35 += f17_35 * RHS17;
+	const double f18 = 1.0 / m_A41;
+	const double f18_30 = -f18 * m_A87;
+	m_A88 += m_A42 * f18_30;
+	m_A89 += m_A43 * f18_30;
+	RHS30 += f18_30 * RHS18;
+	const double f18_37 = -f18 * m_A126;
+	m_A127 += m_A42 * f18_37;
+	m_A128 += m_A43 * f18_37;
+	RHS37 += f18_37 * RHS18;
+	const double f19 = 1.0 / m_A44;
+	const double f19_31 = -f19 * m_A91;
+	m_A92 += m_A45 * f19_31;
+	m_A93 += m_A46 * f19_31;
+	RHS31 += f19_31 * RHS19;
+	const double f19_35 = -f19 * m_A111;
+	m_A114 += m_A45 * f19_35;
+	m_A116 += m_A46 * f19_35;
+	RHS35 += f19_35 * RHS19;
+	const double f20 = 1.0 / m_A47;
+	const double f20_32 = -f20 * m_A95;
+	m_A96 += m_A48 * f20_32;
+	m_A97 += m_A49 * f20_32;
+	RHS32 += f20_32 * RHS20;
+	const double f20_39 = -f20 * m_A134;
+	m_A135 += m_A48 * f20_39;
+	m_A136 += m_A49 * f20_39;
+	RHS39 += f20_39 * RHS20;
+	const double f21 = 1.0 / m_A50;
+	const double f21_40 = -f21 * m_A138;
+	m_A140 += m_A51 * f21_40;
+	m_A149 += m_A52 * f21_40;
+	RHS40 += f21_40 * RHS21;
+	const double f22 = 1.0 / m_A53;
+	const double f22_38 = -f22 * m_A130;
+	m_A132 += m_A54 * f22_38;
+	m_A133 += m_A55 * f22_38;
+	RHS38 += f22_38 * RHS22;
+	const double f22_40 = -f22 * m_A139;
+	m_A147 += m_A54 * f22_40;
+	m_A149 += m_A55 * f22_40;
+	RHS40 += f22_40 * RHS22;
+	const double f23 = 1.0 / m_A58;
+	const double f23_25 = -f23 * m_A64;
+	m_A65 += m_A59 * f23_25;
+	RHS25 += f23_25 * RHS23;
+	const double f24 = 1.0 / m_A61;
+	const double f24_40 = -f24 * m_A140;
+	m_A149 += m_A62 * f24_40;
+	RHS40 += f24_40 * RHS24;
+	const double f25 = 1.0 / m_A65;
+	const double f25_40 = -f25 * m_A141;
+	m_A149 += m_A66 * f25_40;
+	RHS40 += f25_40 * RHS25;
+	const double f26 = 1.0 / m_A69;
+	const double f26_28 = -f26 * m_A77;
+	m_A78 += m_A70 * f26_28;
+	RHS28 += f26_28 * RHS26;
+	const double f27 = 1.0 / m_A74;
+	const double f27_35 = -f27 * m_A112;
+	m_A116 += m_A75 * f27_35;
+	RHS35 += f27_35 * RHS27;
+	const double f28 = 1.0 / m_A78;
+	const double f28_40 = -f28 * m_A142;
+	m_A149 += m_A79 * f28_40;
+	RHS40 += f28_40 * RHS28;
+	const double f29 = 1.0 / m_A82;
+	const double f29_34 = -f29 * m_A103;
+	m_A104 += m_A83 * f29_34;
+	m_A105 += m_A84 * f29_34;
+	m_A106 += m_A85 * f29_34;
+	RHS34 += f29_34 * RHS29;
+	const double f29_35 = -f29 * m_A113;
+	m_A115 += m_A83 * f29_35;
+	m_A116 += m_A84 * f29_35;
+	m_A117 += m_A85 * f29_35;
+	RHS35 += f29_35 * RHS29;
+	const double f29_36 = -f29 * m_A121;
+	m_A122 += m_A83 * f29_36;
+	m_A123 += m_A84 * f29_36;
+	m_A124 += m_A85 * f29_36;
+	RHS36 += f29_36 * RHS29;
+	const double f30 = 1.0 / m_A88;
+	const double f30_37 = -f30 * m_A127;
+	m_A128 += m_A89 * f30_37;
+	RHS37 += f30_37 * RHS30;
+	const double f31 = 1.0 / m_A92;
+	const double f31_35 = -f31 * m_A114;
+	m_A116 += m_A93 * f31_35;
+	RHS35 += f31_35 * RHS31;
+	const double f32 = 1.0 / m_A96;
+	const double f32_39 = -f32 * m_A135;
+	m_A136 += m_A97 * f32_39;
+	RHS39 += f32_39 * RHS32;
+	const double f33 = 1.0 / m_A99;
+	const double f33_38 = -f33 * m_A131;
+	m_A132 += m_A100 * f33_38;
+	RHS38 += f33_38 * RHS33;
+	const double f34 = 1.0 / m_A104;
+	const double f34_35 = -f34 * m_A115;
+	m_A116 += m_A105 * f34_35;
+	m_A117 += m_A106 * f34_35;
+	m_A118 += m_A107 * f34_35;
+	RHS35 += f34_35 * RHS34;
+	const double f34_36 = -f34 * m_A122;
+	m_A123 += m_A105 * f34_36;
+	m_A124 += m_A106 * f34_36;
+	m_A125 += m_A107 * f34_36;
+	RHS36 += f34_36 * RHS34;
+	const double f34_40 = -f34 * m_A143;
+	m_A144 += m_A105 * f34_40;
+	m_A145 += m_A106 * f34_40;
+	m_A149 += m_A107 * f34_40;
+	RHS40 += f34_40 * RHS34;
+	const double f35 = 1.0 / m_A116;
+	const double f35_36 = -f35 * m_A123;
+	m_A124 += m_A117 * f35_36;
+	m_A125 += m_A118 * f35_36;
+	RHS36 += f35_36 * RHS35;
+	const double f35_40 = -f35 * m_A144;
+	m_A145 += m_A117 * f35_40;
+	m_A149 += m_A118 * f35_40;
+	RHS40 += f35_40 * RHS35;
+	const double f36 = 1.0 / m_A124;
+	const double f36_40 = -f36 * m_A145;
+	m_A149 += m_A125 * f36_40;
+	RHS40 += f36_40 * RHS36;
+	const double f37 = 1.0 / m_A128;
+	const double f37_40 = -f37 * m_A146;
+	m_A149 += m_A129 * f37_40;
+	RHS40 += f37_40 * RHS37;
+	const double f38 = 1.0 / m_A132;
+	const double f38_40 = -f38 * m_A147;
+	m_A149 += m_A133 * f38_40;
+	RHS40 += f38_40 * RHS38;
+	const double f39 = 1.0 / m_A136;
+	const double f39_40 = -f39 * m_A148;
+	m_A149 += m_A137 * f39_40;
+	RHS40 += f39_40 * RHS39;
+	V[40] = RHS40 / m_A149;
+	double tmp39 = 0.0;
+	tmp39 += m_A137 * V[40];
+	V[39] = (RHS39 - tmp39) / m_A136;
+	double tmp38 = 0.0;
+	tmp38 += m_A133 * V[40];
+	V[38] = (RHS38 - tmp38) / m_A132;
+	double tmp37 = 0.0;
+	tmp37 += m_A129 * V[40];
+	V[37] = (RHS37 - tmp37) / m_A128;
+	double tmp36 = 0.0;
+	tmp36 += m_A125 * V[40];
+	V[36] = (RHS36 - tmp36) / m_A124;
+	double tmp35 = 0.0;
+	tmp35 += m_A117 * V[36];
+	tmp35 += m_A118 * V[40];
+	V[35] = (RHS35 - tmp35) / m_A116;
+	double tmp34 = 0.0;
+	tmp34 += m_A105 * V[35];
+	tmp34 += m_A106 * V[36];
+	tmp34 += m_A107 * V[40];
+	V[34] = (RHS34 - tmp34) / m_A104;
+	double tmp33 = 0.0;
+	tmp33 += m_A100 * V[38];
+	V[33] = (RHS33 - tmp33) / m_A99;
+	double tmp32 = 0.0;
+	tmp32 += m_A97 * V[39];
+	V[32] = (RHS32 - tmp32) / m_A96;
+	double tmp31 = 0.0;
+	tmp31 += m_A93 * V[35];
+	V[31] = (RHS31 - tmp31) / m_A92;
+	double tmp30 = 0.0;
+	tmp30 += m_A89 * V[37];
+	V[30] = (RHS30 - tmp30) / m_A88;
+	double tmp29 = 0.0;
+	tmp29 += m_A83 * V[34];
+	tmp29 += m_A84 * V[35];
+	tmp29 += m_A85 * V[36];
+	V[29] = (RHS29 - tmp29) / m_A82;
+	double tmp28 = 0.0;
+	tmp28 += m_A79 * V[40];
+	V[28] = (RHS28 - tmp28) / m_A78;
+	double tmp27 = 0.0;
+	tmp27 += m_A75 * V[35];
+	V[27] = (RHS27 - tmp27) / m_A74;
+	double tmp26 = 0.0;
+	tmp26 += m_A70 * V[28];
+	V[26] = (RHS26 - tmp26) / m_A69;
+	double tmp25 = 0.0;
+	tmp25 += m_A66 * V[40];
+	V[25] = (RHS25 - tmp25) / m_A65;
+	double tmp24 = 0.0;
+	tmp24 += m_A62 * V[40];
+	V[24] = (RHS24 - tmp24) / m_A61;
+	double tmp23 = 0.0;
+	tmp23 += m_A59 * V[25];
+	V[23] = (RHS23 - tmp23) / m_A58;
+	double tmp22 = 0.0;
+	tmp22 += m_A54 * V[38];
+	tmp22 += m_A55 * V[40];
+	V[22] = (RHS22 - tmp22) / m_A53;
+	double tmp21 = 0.0;
+	tmp21 += m_A51 * V[24];
+	tmp21 += m_A52 * V[40];
+	V[21] = (RHS21 - tmp21) / m_A50;
+	double tmp20 = 0.0;
+	tmp20 += m_A48 * V[32];
+	tmp20 += m_A49 * V[39];
+	V[20] = (RHS20 - tmp20) / m_A47;
+	double tmp19 = 0.0;
+	tmp19 += m_A45 * V[31];
+	tmp19 += m_A46 * V[35];
+	V[19] = (RHS19 - tmp19) / m_A44;
+	double tmp18 = 0.0;
+	tmp18 += m_A42 * V[30];
+	tmp18 += m_A43 * V[37];
+	V[18] = (RHS18 - tmp18) / m_A41;
+	double tmp17 = 0.0;
+	tmp17 += m_A40 * V[35];
+	V[17] = (RHS17 - tmp17) / m_A39;
+	double tmp16 = 0.0;
+	tmp16 += m_A37 * V[29];
+	tmp16 += m_A38 * V[36];
+	V[16] = (RHS16 - tmp16) / m_A36;
+	double tmp15 = 0.0;
+	tmp15 += m_A34 * V[29];
+	tmp15 += m_A35 * V[34];
+	V[15] = (RHS15 - tmp15) / m_A33;
+	double tmp14 = 0.0;
+	tmp14 += m_A32 * V[35];
+	V[14] = (RHS14 - tmp14) / m_A31;
+	double tmp13 = 0.0;
+	tmp13 += m_A29 * V[27];
+	tmp13 += m_A30 * V[35];
+	V[13] = (RHS13 - tmp13) / m_A28;
+	double tmp12 = 0.0;
+	tmp12 += m_A27 * V[31];
+	V[12] = (RHS12 - tmp12) / m_A26;
+	double tmp11 = 0.0;
+	tmp11 += m_A25 * V[27];
+	V[11] = (RHS11 - tmp11) / m_A24;
+	double tmp10 = 0.0;
+	tmp10 += m_A23 * V[27];
+	V[10] = (RHS10 - tmp10) / m_A22;
+	double tmp9 = 0.0;
+	tmp9 += m_A20 * V[26];
+	tmp9 += m_A21 * V[28];
+	V[9] = (RHS9 - tmp9) / m_A19;
+	double tmp8 = 0.0;
+	tmp8 += m_A18 * V[36];
+	V[8] = (RHS8 - tmp8) / m_A17;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[23];
+	tmp7 += m_A16 * V[25];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[24];
+	V[6] = (RHS6 - tmp6) / m_A12;
 	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[6];
+	tmp5 += m_A11 * V[32];
 	V[5] = (RHS5 - tmp5) / m_A10;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[6];
+	tmp4 += m_A9 * V[26];
 	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[6];
+	tmp3 += m_A7 * V[23];
 	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[6];
+	tmp2 += m_A5 * V[30];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[6];
+	tmp1 += m_A3 * V[34];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[6];
+	tmp0 += m_A1 * V[33];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// cheekyms
-static void nl_gcr_70f289d5486b9767_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// warrior
+static void nl_gcr_bff07f8d339f7cc4_89_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -7488,55 +48591,529 @@
 	double m_A4(0.0);
 	double m_A5(0.0);
 	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
-	m_A0 += gt[2];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
-	RHS0 += Idr[2];
 	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[2];
 	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 -= go[4] * *cnV[4];
-	m_A6 += gt[5];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 -= go[5] * *cnV[5];
 	m_A6 += gt[6];
 	m_A6 += gt[7];
-	m_A6 += gt[8];
-	m_A5 += go[5];
-	m_A4 += go[6];
-	double RHS2 = Idr[5];
-	RHS2 += Idr[6];
-	RHS2 += Idr[7];
-	RHS2 += Idr[8];
-	RHS2 -= go[7] * *cnV[7];
-	RHS2 -= go[8] * *cnV[8];
+	m_A7 += go[6];
+	m_A8 += go[7];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	m_A9 += gt[8];
+	m_A9 += gt[9];
+	m_A11 += go[8];
+	m_A10 += go[9];
+	double RHS4 = Idr[8];
+	RHS4 += Idr[9];
+	m_A12 += gt[10];
+	m_A12 += gt[11];
+	m_A12 += gt[12];
+	m_A12 += gt[13];
+	m_A12 += gt[14];
+	m_A12 += gt[15];
+	m_A12 += gt[16];
+	m_A13 += go[10];
+	double RHS5 = Idr[10];
+	RHS5 += Idr[11];
+	RHS5 += Idr[12];
+	RHS5 += Idr[13];
+	RHS5 += Idr[14];
+	RHS5 += Idr[15];
+	RHS5 += Idr[16];
+	RHS5 -= go[11] * *cnV[11];
+	RHS5 -= go[12] * *cnV[12];
+	RHS5 -= go[13] * *cnV[13];
+	RHS5 -= go[14] * *cnV[14];
+	RHS5 -= go[15] * *cnV[15];
+	RHS5 -= go[16] * *cnV[16];
+	m_A14 += gt[17];
+	m_A14 += gt[18];
+	m_A16 += go[17];
+	m_A15 += go[18];
+	double RHS6 = Idr[17];
+	RHS6 += Idr[18];
+	m_A17 += gt[19];
+	m_A17 += gt[20];
+	m_A19 += go[19];
+	m_A18 += go[20];
+	double RHS7 = Idr[19];
+	RHS7 += Idr[20];
+	m_A20 += gt[21];
+	m_A20 += gt[22];
+	m_A21 += go[21];
+	double RHS8 = Idr[21];
+	RHS8 += Idr[22];
+	RHS8 -= go[22] * *cnV[22];
+	m_A22 += gt[23];
+	m_A22 += gt[24];
+	m_A22 += gt[25];
+	m_A24 += go[23];
+	m_A23 += go[24];
+	double RHS9 = Idr[23];
+	RHS9 += Idr[24];
+	RHS9 += Idr[25];
+	RHS9 -= go[25] * *cnV[25];
+	m_A25 += gt[26];
+	m_A25 += gt[27];
+	m_A26 += go[26];
+	double RHS10 = Idr[26];
+	RHS10 += Idr[27];
+	RHS10 -= go[27] * *cnV[27];
+	m_A27 += gt[28];
+	m_A27 += gt[29];
+	m_A27 += gt[30];
+	m_A28 += go[28];
+	m_A29 += go[29];
+	double RHS11 = Idr[28];
+	RHS11 += Idr[29];
+	RHS11 += Idr[30];
+	RHS11 -= go[30] * *cnV[30];
+	m_A32 += gt[31];
+	m_A32 += gt[32];
+	m_A32 += gt[33];
+	m_A31 += go[31];
+	m_A30 += go[32];
+	double RHS12 = Idr[31];
+	RHS12 += Idr[32];
+	RHS12 += Idr[33];
+	RHS12 -= go[33] * *cnV[33];
+	m_A35 += gt[34];
+	m_A35 += gt[35];
+	m_A35 += gt[36];
+	m_A34 += go[34];
+	m_A37 += go[35];
+	double RHS13 = Idr[34];
+	RHS13 += Idr[35];
+	RHS13 += Idr[36];
+	RHS13 -= go[36] * *cnV[36];
+	m_A40 += gt[37];
+	m_A40 += gt[38];
+	m_A40 += gt[39];
+	m_A39 += go[37];
+	m_A38 += go[38];
+	double RHS14 = Idr[37];
+	RHS14 += Idr[38];
+	RHS14 += Idr[39];
+	RHS14 -= go[39] * *cnV[39];
+	m_A43 += gt[40];
+	m_A43 += gt[41];
+	m_A43 += gt[42];
+	m_A44 += go[40];
+	m_A42 += go[41];
+	double RHS15 = Idr[40];
+	RHS15 += Idr[41];
+	RHS15 += Idr[42];
+	RHS15 -= go[42] * *cnV[42];
+	m_A47 += gt[43];
+	m_A47 += gt[44];
+	m_A47 += gt[45];
+	m_A47 += gt[46];
+	m_A49 += go[43];
+	m_A49 += go[44];
+	m_A45 += go[45];
+	double RHS16 = Idr[43];
+	RHS16 += Idr[44];
+	RHS16 += Idr[45];
+	RHS16 += Idr[46];
+	RHS16 -= go[46] * *cnV[46];
+	m_A52 += gt[47];
+	m_A52 += gt[48];
+	m_A50 += go[47];
+	m_A53 += go[48];
+	double RHS17 = Idr[47];
+	RHS17 += Idr[48];
+	m_A56 += gt[49];
+	m_A56 += gt[50];
+	m_A56 += gt[51];
+	m_A55 += go[49];
+	m_A54 += go[50];
+	double RHS18 = Idr[49];
+	RHS18 += Idr[50];
+	RHS18 += Idr[51];
+	RHS18 -= go[51] * *cnV[51];
+	m_A62 += gt[52];
+	m_A62 += gt[53];
+	m_A62 += gt[54];
+	m_A62 += gt[55];
+	m_A58 += go[52];
+	m_A59 += go[53];
+	m_A60 += go[54];
+	double RHS19 = Idr[52];
+	RHS19 += Idr[53];
+	RHS19 += Idr[54];
+	RHS19 += Idr[55];
+	RHS19 -= go[55] * *cnV[55];
+	m_A69 += gt[56];
+	m_A69 += gt[57];
+	m_A69 += gt[58];
+	m_A66 += go[56];
+	m_A67 += go[57];
+	double RHS20 = Idr[56];
+	RHS20 += Idr[57];
+	RHS20 += Idr[58];
+	RHS20 -= go[58] * *cnV[58];
+	m_A78 += gt[59];
+	m_A78 += gt[60];
+	m_A78 += gt[61];
+	m_A78 += gt[62];
+	m_A78 += gt[63];
+	m_A78 += gt[64];
+	m_A72 += go[59];
+	m_A73 += go[60];
+	m_A75 += go[61];
+	m_A75 += go[62];
+	double RHS21 = Idr[59];
+	RHS21 += Idr[60];
+	RHS21 += Idr[61];
+	RHS21 += Idr[62];
+	RHS21 += Idr[63];
+	RHS21 += Idr[64];
+	RHS21 -= go[63] * *cnV[63];
+	RHS21 -= go[64] * *cnV[64];
+	m_A88 += gt[65];
+	m_A88 += gt[66];
+	m_A88 += gt[67];
+	m_A88 += gt[68];
+	m_A88 += gt[69];
+	m_A83 += go[65];
+	m_A81 += go[66];
+	m_A82 += go[67];
+	m_A80 += go[68];
+	double RHS22 = Idr[65];
+	RHS22 += Idr[66];
+	RHS22 += Idr[67];
+	RHS22 += Idr[68];
+	RHS22 += Idr[69];
+	RHS22 -= go[69] * *cnV[69];
 	const double f0 = 1.0 / m_A0;
-	const double f0_2 = -f0 * m_A4;
-	m_A6 += m_A1 * f0_2;
-	RHS2 += f0_2 * RHS0;
+	const double f0_12 = -f0 * m_A30;
+	m_A32 += m_A1 * f0_12;
+	RHS12 += f0_12 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_2 = -f1 * m_A5;
-	m_A6 += m_A3 * f1_2;
-	RHS2 += f1_2 * RHS1;
-	V[2] = RHS2 / m_A6;
+	const double f1_15 = -f1 * m_A42;
+	m_A43 += m_A3 * f1_15;
+	RHS15 += f1_15 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_22 = -f2 * m_A80;
+	m_A88 += m_A5 * f2_22;
+	RHS22 += f2_22 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_19 = -f3 * m_A58;
+	m_A62 += m_A7 * f3_19;
+	m_A65 += m_A8 * f3_19;
+	RHS19 += f3_19 * RHS3;
+	const double f3_22 = -f3 * m_A81;
+	m_A85 += m_A7 * f3_22;
+	m_A88 += m_A8 * f3_22;
+	RHS22 += f3_22 * RHS3;
+	const double f4 = 1.0 / m_A9;
+	const double f4_13 = -f4 * m_A34;
+	m_A35 += m_A10 * f4_13;
+	m_A36 += m_A11 * f4_13;
+	RHS13 += f4_13 * RHS4;
+	const double f4_16 = -f4 * m_A45;
+	m_A46 += m_A10 * f4_16;
+	m_A47 += m_A11 * f4_16;
+	RHS16 += f4_16 * RHS4;
+	const double f5 = 1.0 / m_A12;
+	const double f5_21 = -f5 * m_A72;
+	m_A75 += m_A13 * f5_21;
+	RHS21 += f5_21 * RHS5;
+	const double f6 = 1.0 / m_A14;
+	const double f6_12 = -f6 * m_A31;
+	m_A32 += m_A15 * f6_12;
+	m_A33 += m_A16 * f6_12;
+	RHS12 += f6_12 * RHS6;
+	const double f6_21 = -f6 * m_A73;
+	m_A74 += m_A15 * f6_21;
+	m_A78 += m_A16 * f6_21;
+	RHS21 += f6_21 * RHS6;
+	const double f7 = 1.0 / m_A17;
+	const double f7_19 = -f7 * m_A59;
+	m_A62 += m_A18 * f7_19;
+	m_A63 += m_A19 * f7_19;
+	RHS19 += f7_19 * RHS7;
+	const double f7_20 = -f7 * m_A66;
+	m_A68 += m_A18 * f7_20;
+	m_A69 += m_A19 * f7_20;
+	RHS20 += f7_20 * RHS7;
+	const double f8 = 1.0 / m_A20;
+	const double f8_14 = -f8 * m_A38;
+	m_A40 += m_A21 * f8_14;
+	RHS14 += f8_14 * RHS8;
+	const double f9 = 1.0 / m_A22;
+	const double f9_14 = -f9 * m_A39;
+	m_A40 += m_A23 * f9_14;
+	m_A41 += m_A24 * f9_14;
+	RHS14 += f9_14 * RHS9;
+	const double f9_17 = -f9 * m_A50;
+	m_A51 += m_A23 * f9_17;
+	m_A52 += m_A24 * f9_17;
+	RHS17 += f9_17 * RHS9;
+	const double f10 = 1.0 / m_A25;
+	const double f10_18 = -f10 * m_A54;
+	m_A56 += m_A26 * f10_18;
+	RHS18 += f10_18 * RHS10;
+	const double f11 = 1.0 / m_A27;
+	const double f11_18 = -f11 * m_A55;
+	m_A56 += m_A28 * f11_18;
+	m_A57 += m_A29 * f11_18;
+	RHS18 += f11_18 * RHS11;
+	const double f11_22 = -f11 * m_A82;
+	m_A84 += m_A28 * f11_22;
+	m_A88 += m_A29 * f11_22;
+	RHS22 += f11_22 * RHS11;
+	const double f12 = 1.0 / m_A32;
+	const double f12_21 = -f12 * m_A74;
+	m_A78 += m_A33 * f12_21;
+	RHS21 += f12_21 * RHS12;
+	const double f13 = 1.0 / m_A35;
+	const double f13_16 = -f13 * m_A46;
+	m_A47 += m_A36 * f13_16;
+	m_A48 += m_A37 * f13_16;
+	RHS16 += f13_16 * RHS13;
+	const double f13_19 = -f13 * m_A60;
+	m_A61 += m_A36 * f13_19;
+	m_A62 += m_A37 * f13_19;
+	RHS19 += f13_19 * RHS13;
+	const double f14 = 1.0 / m_A40;
+	const double f14_17 = -f14 * m_A51;
+	m_A52 += m_A41 * f14_17;
+	RHS17 += f14_17 * RHS14;
+	const double f15 = 1.0 / m_A43;
+	const double f15_20 = -f15 * m_A67;
+	m_A69 += m_A44 * f15_20;
+	RHS20 += f15_20 * RHS15;
+	const double f16 = 1.0 / m_A47;
+	const double f16_19 = -f16 * m_A61;
+	m_A62 += m_A48 * f16_19;
+	m_A64 += m_A49 * f16_19;
+	RHS19 += f16_19 * RHS16;
+	const double f16_21 = -f16 * m_A75;
+	m_A76 += m_A48 * f16_21;
+	m_A78 += m_A49 * f16_21;
+	RHS21 += f16_21 * RHS16;
+	const double f17 = 1.0 / m_A52;
+	const double f17_22 = -f17 * m_A83;
+	m_A88 += m_A53 * f17_22;
+	RHS22 += f17_22 * RHS17;
+	const double f18 = 1.0 / m_A56;
+	const double f18_22 = -f18 * m_A84;
+	m_A88 += m_A57 * f18_22;
+	RHS22 += f18_22 * RHS18;
+	const double f19 = 1.0 / m_A62;
+	const double f19_20 = -f19 * m_A68;
+	m_A69 += m_A63 * f19_20;
+	m_A70 += m_A64 * f19_20;
+	m_A71 += m_A65 * f19_20;
+	RHS20 += f19_20 * RHS19;
+	const double f19_21 = -f19 * m_A76;
+	m_A77 += m_A63 * f19_21;
+	m_A78 += m_A64 * f19_21;
+	m_A79 += m_A65 * f19_21;
+	RHS21 += f19_21 * RHS19;
+	const double f19_22 = -f19 * m_A85;
+	m_A86 += m_A63 * f19_22;
+	m_A87 += m_A64 * f19_22;
+	m_A88 += m_A65 * f19_22;
+	RHS22 += f19_22 * RHS19;
+	const double f20 = 1.0 / m_A69;
+	const double f20_21 = -f20 * m_A77;
+	m_A78 += m_A70 * f20_21;
+	m_A79 += m_A71 * f20_21;
+	RHS21 += f20_21 * RHS20;
+	const double f20_22 = -f20 * m_A86;
+	m_A87 += m_A70 * f20_22;
+	m_A88 += m_A71 * f20_22;
+	RHS22 += f20_22 * RHS20;
+	const double f21 = 1.0 / m_A78;
+	const double f21_22 = -f21 * m_A87;
+	m_A88 += m_A79 * f21_22;
+	RHS22 += f21_22 * RHS21;
+	V[22] = RHS22 / m_A88;
+	double tmp21 = 0.0;
+	tmp21 += m_A79 * V[22];
+	V[21] = (RHS21 - tmp21) / m_A78;
+	double tmp20 = 0.0;
+	tmp20 += m_A70 * V[21];
+	tmp20 += m_A71 * V[22];
+	V[20] = (RHS20 - tmp20) / m_A69;
+	double tmp19 = 0.0;
+	tmp19 += m_A63 * V[20];
+	tmp19 += m_A64 * V[21];
+	tmp19 += m_A65 * V[22];
+	V[19] = (RHS19 - tmp19) / m_A62;
+	double tmp18 = 0.0;
+	tmp18 += m_A57 * V[22];
+	V[18] = (RHS18 - tmp18) / m_A56;
+	double tmp17 = 0.0;
+	tmp17 += m_A53 * V[22];
+	V[17] = (RHS17 - tmp17) / m_A52;
+	double tmp16 = 0.0;
+	tmp16 += m_A48 * V[19];
+	tmp16 += m_A49 * V[21];
+	V[16] = (RHS16 - tmp16) / m_A47;
+	double tmp15 = 0.0;
+	tmp15 += m_A44 * V[20];
+	V[15] = (RHS15 - tmp15) / m_A43;
+	double tmp14 = 0.0;
+	tmp14 += m_A41 * V[17];
+	V[14] = (RHS14 - tmp14) / m_A40;
+	double tmp13 = 0.0;
+	tmp13 += m_A36 * V[16];
+	tmp13 += m_A37 * V[19];
+	V[13] = (RHS13 - tmp13) / m_A35;
+	double tmp12 = 0.0;
+	tmp12 += m_A33 * V[21];
+	V[12] = (RHS12 - tmp12) / m_A32;
+	double tmp11 = 0.0;
+	tmp11 += m_A28 * V[18];
+	tmp11 += m_A29 * V[22];
+	V[11] = (RHS11 - tmp11) / m_A27;
+	double tmp10 = 0.0;
+	tmp10 += m_A26 * V[18];
+	V[10] = (RHS10 - tmp10) / m_A25;
+	double tmp9 = 0.0;
+	tmp9 += m_A23 * V[14];
+	tmp9 += m_A24 * V[17];
+	V[9] = (RHS9 - tmp9) / m_A22;
+	double tmp8 = 0.0;
+	tmp8 += m_A21 * V[14];
+	V[8] = (RHS8 - tmp8) / m_A20;
+	double tmp7 = 0.0;
+	tmp7 += m_A18 * V[19];
+	tmp7 += m_A19 * V[20];
+	V[7] = (RHS7 - tmp7) / m_A17;
+	double tmp6 = 0.0;
+	tmp6 += m_A15 * V[12];
+	tmp6 += m_A16 * V[21];
+	V[6] = (RHS6 - tmp6) / m_A14;
+	double tmp5 = 0.0;
+	tmp5 += m_A13 * V[16];
+	V[5] = (RHS5 - tmp5) / m_A12;
+	double tmp4 = 0.0;
+	tmp4 += m_A10 * V[13];
+	tmp4 += m_A11 * V[16];
+	V[4] = (RHS4 - tmp4) / m_A9;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[19];
+	tmp3 += m_A8 * V[22];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[22];
+	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[2];
+	tmp1 += m_A3 * V[15];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[2];
+	tmp0 += m_A1 * V[12];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// zac1b11142
-static void nl_gcr_752680f8e0bc6a4a_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// fireone
+static void nl_gcr_c1d22fe6e895255d_79_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -7544,70 +49121,518 @@
 	double m_A4(0.0);
 	double m_A5(0.0);
 	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
 	RHS0 -= go[1] * *cnV[1];
 	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A2 += gt[6];
-	m_A3 += go[3];
-	m_A3 += go[4];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 += Idr[6];
-	RHS1 -= go[5] * *cnV[5];
-	RHS1 -= go[6] * *cnV[6];
-	m_A6 += gt[7];
-	m_A6 += gt[8];
-	m_A6 += gt[9];
-	m_A6 += gt[10];
-	m_A6 += gt[11];
-	m_A6 += gt[12];
-	m_A6 += gt[13];
-	m_A5 += go[7];
-	m_A5 += go[8];
-	m_A4 += go[9];
-	double RHS2 = Idr[7];
-	RHS2 += Idr[8];
-	RHS2 += Idr[9];
-	RHS2 += Idr[10];
-	RHS2 += Idr[11];
-	RHS2 += Idr[12];
-	RHS2 += Idr[13];
-	RHS2 -= go[10] * *cnV[10];
-	RHS2 -= go[11] * *cnV[11];
-	RHS2 -= go[12] * *cnV[12];
-	RHS2 -= go[13] * *cnV[13];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A2 += gt[11];
+	m_A2 += gt[12];
+	m_A2 += gt[13];
+	m_A3 += go[7];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 += Idr[12];
+	RHS1 += Idr[13];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	RHS1 -= go[12] * *cnV[12];
+	RHS1 -= go[13] * *cnV[13];
+	m_A4 += gt[14];
+	m_A4 += gt[15];
+	m_A4 += gt[16];
+	m_A4 += gt[17];
+	m_A4 += gt[18];
+	m_A5 += go[14];
+	m_A6 += go[15];
+	double RHS2 = Idr[14];
+	RHS2 += Idr[15];
+	RHS2 += Idr[16];
+	RHS2 += Idr[17];
+	RHS2 += Idr[18];
+	RHS2 -= go[16] * *cnV[16];
+	RHS2 -= go[17] * *cnV[17];
+	RHS2 -= go[18] * *cnV[18];
+	m_A7 += gt[19];
+	m_A7 += gt[20];
+	m_A8 += go[19];
+	double RHS3 = Idr[19];
+	RHS3 += Idr[20];
+	RHS3 -= go[20] * *cnV[20];
+	m_A9 += gt[21];
+	m_A9 += gt[22];
+	m_A10 += go[21];
+	double RHS4 = Idr[21];
+	RHS4 += Idr[22];
+	RHS4 -= go[22] * *cnV[22];
+	m_A11 += gt[23];
+	m_A11 += gt[24];
+	m_A11 += gt[25];
+	m_A12 += go[23];
+	double RHS5 = Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 -= go[24] * *cnV[24];
+	RHS5 -= go[25] * *cnV[25];
+	m_A14 += gt[26];
+	m_A14 += gt[27];
+	m_A14 += gt[28];
+	m_A14 += gt[29];
+	m_A14 += gt[30];
+	m_A14 += gt[31];
+	m_A13 += go[26];
+	m_A16 += go[27];
+	m_A15 += go[28];
+	m_A15 += go[29];
+	double RHS6 = Idr[26];
+	RHS6 += Idr[27];
+	RHS6 += Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 += Idr[31];
+	RHS6 -= go[30] * *cnV[30];
+	RHS6 -= go[31] * *cnV[31];
+	m_A18 += gt[32];
+	m_A18 += gt[33];
+	m_A18 += gt[34];
+	m_A19 += go[32];
+	double RHS7 = Idr[32];
+	RHS7 += Idr[33];
+	RHS7 += Idr[34];
+	RHS7 -= go[33] * *cnV[33];
+	RHS7 -= go[34] * *cnV[34];
+	m_A20 += gt[35];
+	m_A20 += gt[36];
+	m_A20 += gt[37];
+	m_A21 += go[35];
+	double RHS8 = Idr[35];
+	RHS8 += Idr[36];
+	RHS8 += Idr[37];
+	RHS8 -= go[36] * *cnV[36];
+	RHS8 -= go[37] * *cnV[37];
+	m_A22 += gt[38];
+	m_A22 += gt[39];
+	m_A23 += go[38];
+	double RHS9 = Idr[38];
+	RHS9 += Idr[39];
+	RHS9 -= go[39] * *cnV[39];
+	m_A25 += gt[40];
+	m_A25 += gt[41];
+	m_A25 += gt[42];
+	m_A27 += go[40];
+	m_A24 += go[41];
+	double RHS10 = Idr[40];
+	RHS10 += Idr[41];
+	RHS10 += Idr[42];
+	RHS10 -= go[42] * *cnV[42];
+	m_A30 += gt[43];
+	m_A30 += gt[44];
+	m_A30 += gt[45];
+	m_A32 += go[43];
+	m_A28 += go[44];
+	double RHS11 = Idr[43];
+	RHS11 += Idr[44];
+	RHS11 += Idr[45];
+	RHS11 -= go[45] * *cnV[45];
+	m_A36 += gt[46];
+	m_A36 += gt[47];
+	m_A36 += gt[48];
+	m_A36 += gt[49];
+	m_A36 += gt[50];
+	m_A36 += gt[51];
+	m_A35 += go[46];
+	m_A35 += go[47];
+	m_A37 += go[48];
+	m_A34 += go[49];
+	m_A33 += go[50];
+	double RHS12 = Idr[46];
+	RHS12 += Idr[47];
+	RHS12 += Idr[48];
+	RHS12 += Idr[49];
+	RHS12 += Idr[50];
+	RHS12 += Idr[51];
+	RHS12 -= go[51] * *cnV[51];
+	m_A41 += gt[52];
+	m_A41 += gt[53];
+	m_A41 += gt[54];
+	m_A41 += gt[55];
+	m_A41 += gt[56];
+	m_A40 += go[52];
+	m_A43 += go[53];
+	m_A44 += go[54];
+	double RHS13 = Idr[52];
+	RHS13 += Idr[53];
+	RHS13 += Idr[54];
+	RHS13 += Idr[55];
+	RHS13 += Idr[56];
+	RHS13 -= go[55] * *cnV[55];
+	RHS13 -= go[56] * *cnV[56];
+	m_A48 += gt[57];
+	m_A48 += gt[58];
+	m_A46 += go[57];
+	m_A45 += go[58];
+	double RHS14 = Idr[57];
+	RHS14 += Idr[58];
+	m_A51 += gt[59];
+	m_A51 += gt[60];
+	m_A51 += gt[61];
+	m_A51 += gt[62];
+	m_A52 += go[59];
+	m_A50 += go[60];
+	double RHS15 = Idr[59];
+	RHS15 += Idr[60];
+	RHS15 += Idr[61];
+	RHS15 += Idr[62];
+	RHS15 -= go[61] * *cnV[61];
+	RHS15 -= go[62] * *cnV[62];
+	m_A58 += gt[63];
+	m_A58 += gt[64];
+	m_A58 += gt[65];
+	m_A54 += go[63];
+	m_A55 += go[64];
+	m_A53 += go[65];
+	double RHS16 = Idr[63];
+	RHS16 += Idr[64];
+	RHS16 += Idr[65];
+	m_A64 += gt[66];
+	m_A64 += gt[67];
+	m_A64 += gt[68];
+	m_A64 += gt[69];
+	m_A61 += go[66];
+	m_A60 += go[67];
+	double RHS17 = Idr[66];
+	RHS17 += Idr[67];
+	RHS17 += Idr[68];
+	RHS17 += Idr[69];
+	RHS17 -= go[68] * *cnV[68];
+	RHS17 -= go[69] * *cnV[69];
+	m_A68 += gt[70];
+	m_A68 += gt[71];
+	m_A68 += gt[72];
+	m_A65 += go[70];
+	m_A66 += go[71];
+	double RHS18 = Idr[70];
+	RHS18 += Idr[71];
+	RHS18 += Idr[72];
+	RHS18 -= go[72] * *cnV[72];
+	m_A78 += gt[73];
+	m_A78 += gt[74];
+	m_A78 += gt[75];
+	m_A78 += gt[76];
+	m_A78 += gt[77];
+	m_A72 += go[73];
+	m_A73 += go[74];
+	m_A75 += go[75];
+	m_A71 += go[76];
+	m_A70 += go[77];
+	double RHS19 = Idr[73];
+	RHS19 += Idr[74];
+	RHS19 += Idr[75];
+	RHS19 += Idr[76];
+	RHS19 += Idr[77];
 	const double f0 = 1.0 / m_A0;
-	const double f0_2 = -f0 * m_A4;
-	m_A6 += m_A1 * f0_2;
-	RHS2 += f0_2 * RHS0;
+	const double f0_6 = -f0 * m_A13;
+	m_A17 += m_A1 * f0_6;
+	RHS6 += f0_6 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_2 = -f1 * m_A5;
-	m_A6 += m_A3 * f1_2;
-	RHS2 += f1_2 * RHS1;
-	V[2] = RHS2 / m_A6;
+	const double f1_13 = -f1 * m_A40;
+	m_A42 += m_A3 * f1_13;
+	RHS13 += f1_13 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_10 = -f2 * m_A24;
+	m_A25 += m_A5 * f2_10;
+	m_A26 += m_A6 * f2_10;
+	RHS10 += f2_10 * RHS2;
+	const double f2_11 = -f2 * m_A28;
+	m_A29 += m_A5 * f2_11;
+	m_A30 += m_A6 * f2_11;
+	RHS11 += f2_11 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_12 = -f3 * m_A33;
+	m_A37 += m_A8 * f3_12;
+	RHS12 += f3_12 * RHS3;
+	const double f3_14 = -f3 * m_A45;
+	m_A48 += m_A8 * f3_14;
+	RHS14 += f3_14 * RHS3;
+	const double f4 = 1.0 / m_A9;
+	const double f4_16 = -f4 * m_A53;
+	m_A58 += m_A10 * f4_16;
+	RHS16 += f4_16 * RHS4;
+	const double f4_19 = -f4 * m_A70;
+	m_A75 += m_A10 * f4_19;
+	RHS19 += f4_19 * RHS4;
+	const double f5 = 1.0 / m_A11;
+	const double f5_12 = -f5 * m_A34;
+	m_A36 += m_A12 * f5_12;
+	RHS12 += f5_12 * RHS5;
+	const double f5_17 = -f5 * m_A60;
+	m_A61 += m_A12 * f5_17;
+	RHS17 += f5_17 * RHS5;
+	const double f6 = 1.0 / m_A14;
+	const double f6_12 = -f6 * m_A35;
+	m_A36 += m_A15 * f6_12;
+	m_A38 += m_A16 * f6_12;
+	m_A39 += m_A17 * f6_12;
+	RHS12 += f6_12 * RHS6;
+	const double f6_16 = -f6 * m_A54;
+	m_A56 += m_A15 * f6_16;
+	m_A58 += m_A16 * f6_16;
+	m_A59 += m_A17 * f6_16;
+	RHS16 += f6_16 * RHS6;
+	const double f7 = 1.0 / m_A18;
+	const double f7_18 = -f7 * m_A65;
+	m_A68 += m_A19 * f7_18;
+	RHS18 += f7_18 * RHS7;
+	const double f8 = 1.0 / m_A20;
+	const double f8_15 = -f8 * m_A50;
+	m_A52 += m_A21 * f8_15;
+	RHS15 += f8_15 * RHS8;
+	const double f8_19 = -f8 * m_A71;
+	m_A78 += m_A21 * f8_19;
+	RHS19 += f8_19 * RHS8;
+	const double f9 = 1.0 / m_A22;
+	const double f9_19 = -f9 * m_A72;
+	m_A78 += m_A23 * f9_19;
+	RHS19 += f9_19 * RHS9;
+	const double f10 = 1.0 / m_A25;
+	const double f10_11 = -f10 * m_A29;
+	m_A30 += m_A26 * f10_11;
+	m_A31 += m_A27 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	const double f10_14 = -f10 * m_A46;
+	m_A47 += m_A26 * f10_14;
+	m_A48 += m_A27 * f10_14;
+	RHS14 += f10_14 * RHS10;
+	const double f11 = 1.0 / m_A30;
+	const double f11_14 = -f11 * m_A47;
+	m_A48 += m_A31 * f11_14;
+	m_A49 += m_A32 * f11_14;
+	RHS14 += f11_14 * RHS11;
+	const double f11_16 = -f11 * m_A55;
+	m_A57 += m_A31 * f11_16;
+	m_A58 += m_A32 * f11_16;
+	RHS16 += f11_16 * RHS11;
+	const double f12 = 1.0 / m_A36;
+	const double f12_16 = -f12 * m_A56;
+	m_A57 += m_A37 * f12_16;
+	m_A58 += m_A38 * f12_16;
+	m_A59 += m_A39 * f12_16;
+	RHS16 += f12_16 * RHS12;
+	const double f12_17 = -f12 * m_A61;
+	m_A62 += m_A37 * f12_17;
+	m_A63 += m_A38 * f12_17;
+	m_A64 += m_A39 * f12_17;
+	RHS17 += f12_17 * RHS12;
+	const double f13 = 1.0 / m_A41;
+	const double f13_18 = -f13 * m_A66;
+	m_A67 += m_A42 * f13_18;
+	m_A68 += m_A43 * f13_18;
+	m_A69 += m_A44 * f13_18;
+	RHS18 += f13_18 * RHS13;
+	const double f13_19 = -f13 * m_A73;
+	m_A74 += m_A42 * f13_19;
+	m_A77 += m_A43 * f13_19;
+	m_A78 += m_A44 * f13_19;
+	RHS19 += f13_19 * RHS13;
+	const double f14 = 1.0 / m_A48;
+	const double f14_16 = -f14 * m_A57;
+	m_A58 += m_A49 * f14_16;
+	RHS16 += f14_16 * RHS14;
+	const double f14_17 = -f14 * m_A62;
+	m_A63 += m_A49 * f14_17;
+	RHS17 += f14_17 * RHS14;
+	const double f15 = 1.0 / m_A51;
+	const double f15_18 = -f15 * m_A67;
+	m_A69 += m_A52 * f15_18;
+	RHS18 += f15_18 * RHS15;
+	const double f15_19 = -f15 * m_A74;
+	m_A78 += m_A52 * f15_19;
+	RHS19 += f15_19 * RHS15;
+	const double f16 = 1.0 / m_A58;
+	const double f16_17 = -f16 * m_A63;
+	m_A64 += m_A59 * f16_17;
+	RHS17 += f16_17 * RHS16;
+	const double f16_19 = -f16 * m_A75;
+	m_A76 += m_A59 * f16_19;
+	RHS19 += f16_19 * RHS16;
+	const double f17 = 1.0 / m_A64;
+	const double f17_19 = -f17 * m_A76;
+	RHS19 += f17_19 * RHS17;
+	const double f18 = 1.0 / m_A68;
+	const double f18_19 = -f18 * m_A77;
+	m_A78 += m_A69 * f18_19;
+	RHS19 += f18_19 * RHS18;
+	V[19] = RHS19 / m_A78;
+	double tmp18 = 0.0;
+	tmp18 += m_A69 * V[19];
+	V[18] = (RHS18 - tmp18) / m_A68;
+	double tmp17 = 0.0;
+	V[17] = (RHS17 - tmp17) / m_A64;
+	double tmp16 = 0.0;
+	tmp16 += m_A59 * V[17];
+	V[16] = (RHS16 - tmp16) / m_A58;
+	double tmp15 = 0.0;
+	tmp15 += m_A52 * V[19];
+	V[15] = (RHS15 - tmp15) / m_A51;
+	double tmp14 = 0.0;
+	tmp14 += m_A49 * V[16];
+	V[14] = (RHS14 - tmp14) / m_A48;
+	double tmp13 = 0.0;
+	tmp13 += m_A42 * V[15];
+	tmp13 += m_A43 * V[18];
+	tmp13 += m_A44 * V[19];
+	V[13] = (RHS13 - tmp13) / m_A41;
+	double tmp12 = 0.0;
+	tmp12 += m_A37 * V[14];
+	tmp12 += m_A38 * V[16];
+	tmp12 += m_A39 * V[17];
+	V[12] = (RHS12 - tmp12) / m_A36;
+	double tmp11 = 0.0;
+	tmp11 += m_A31 * V[14];
+	tmp11 += m_A32 * V[16];
+	V[11] = (RHS11 - tmp11) / m_A30;
+	double tmp10 = 0.0;
+	tmp10 += m_A26 * V[11];
+	tmp10 += m_A27 * V[14];
+	V[10] = (RHS10 - tmp10) / m_A25;
+	double tmp9 = 0.0;
+	tmp9 += m_A23 * V[19];
+	V[9] = (RHS9 - tmp9) / m_A22;
+	double tmp8 = 0.0;
+	tmp8 += m_A21 * V[19];
+	V[8] = (RHS8 - tmp8) / m_A20;
+	double tmp7 = 0.0;
+	tmp7 += m_A19 * V[18];
+	V[7] = (RHS7 - tmp7) / m_A18;
+	double tmp6 = 0.0;
+	tmp6 += m_A15 * V[12];
+	tmp6 += m_A16 * V[16];
+	tmp6 += m_A17 * V[17];
+	V[6] = (RHS6 - tmp6) / m_A14;
+	double tmp5 = 0.0;
+	tmp5 += m_A12 * V[12];
+	V[5] = (RHS5 - tmp5) / m_A11;
+	double tmp4 = 0.0;
+	tmp4 += m_A10 * V[16];
+	V[4] = (RHS4 - tmp4) / m_A9;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[14];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[10];
+	tmp2 += m_A6 * V[11];
+	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[2];
+	tmp1 += m_A3 * V[15];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[2];
+	tmp0 += m_A1 * V[17];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// mario
-static void nl_gcr_7b9186d9ff77f7a1_29_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// starcrus
+static void nl_gcr_c2e616f3de30f15b_31_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -7637,6 +49662,8 @@
 	double m_A26(0.0);
 	double m_A27(0.0);
 	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
@@ -7648,268 +49675,187 @@
 	RHS0 -= go[2] * *cnV[2];
 	m_A2 += gt[3];
 	m_A2 += gt[4];
-	m_A2 += gt[5];
 	m_A3 += go[3];
 	double RHS1 = Idr[3];
 	RHS1 += Idr[4];
-	RHS1 += Idr[5];
 	RHS1 -= go[4] * *cnV[4];
-	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[5];
 	m_A4 += gt[6];
-	m_A4 += gt[7];
-	m_A4 += gt[8];
-	m_A5 += go[6];
-	double RHS2 = Idr[6];
-	RHS2 += Idr[7];
-	RHS2 += Idr[8];
-	RHS2 -= go[7] * *cnV[7];
-	RHS2 -= go[8] * *cnV[8];
-	m_A6 += gt[9];
-	m_A6 += gt[10];
-	m_A6 += gt[11];
-	m_A6 += gt[12];
-	m_A8 += go[9];
-	m_A7 += go[10];
-	m_A7 += go[11];
-	double RHS3 = Idr[9];
-	RHS3 += Idr[10];
-	RHS3 += Idr[11];
-	RHS3 += Idr[12];
-	RHS3 -= go[12] * *cnV[12];
-	m_A9 += gt[13];
-	m_A9 += gt[14];
-	m_A9 += gt[15];
+	m_A5 += go[5];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A7 += go[7];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 -= go[8] * *cnV[8];
+	m_A8 += gt[9];
+	m_A8 += gt[10];
+	m_A9 += go[9];
+	double RHS4 = Idr[9];
+	RHS4 += Idr[10];
+	RHS4 -= go[10] * *cnV[10];
+	m_A10 += gt[11];
+	m_A10 += gt[12];
+	m_A10 += gt[13];
+	m_A10 += gt[14];
+	m_A12 += go[11];
+	m_A10 += go[12];
 	m_A10 += go[13];
-	double RHS4 = Idr[13];
-	RHS4 += Idr[14];
-	RHS4 += Idr[15];
-	RHS4 -= go[14] * *cnV[14];
-	RHS4 -= go[15] * *cnV[15];
-	m_A11 += gt[16];
-	m_A11 += gt[17];
-	m_A12 += go[16];
-	double RHS5 = Idr[16];
-	RHS5 += Idr[17];
-	RHS5 -= go[17] * *cnV[17];
+	m_A11 += go[14];
+	double RHS5 = Idr[11];
+	RHS5 += Idr[12];
+	RHS5 += Idr[13];
+	RHS5 += Idr[14];
+	m_A14 += gt[15];
+	m_A14 += gt[16];
+	m_A14 += gt[17];
 	m_A14 += gt[18];
 	m_A14 += gt[19];
 	m_A14 += gt[20];
 	m_A14 += gt[21];
-	m_A14 += gt[22];
-	m_A14 += gt[23];
-	m_A14 += gt[24];
-	m_A16 += go[18];
-	m_A16 += go[19];
-	m_A13 += go[20];
-	m_A13 += go[21];
-	m_A15 += go[22];
-	double RHS6 = Idr[18];
+	m_A13 += go[15];
+	m_A15 += go[16];
+	double RHS6 = Idr[15];
+	RHS6 += Idr[16];
+	RHS6 += Idr[17];
+	RHS6 += Idr[18];
 	RHS6 += Idr[19];
 	RHS6 += Idr[20];
 	RHS6 += Idr[21];
-	RHS6 += Idr[22];
-	RHS6 += Idr[23];
-	RHS6 += Idr[24];
-	RHS6 -= go[23] * *cnV[23];
-	RHS6 -= go[24] * *cnV[24];
-	m_A22 += gt[25];
-	m_A22 += gt[26];
-	m_A22 += gt[27];
-	m_A22 += gt[28];
-	m_A22 += gt[29];
-	m_A22 += gt[30];
-	m_A20 += go[25];
-	m_A21 += go[26];
+	RHS6 -= go[17] * *cnV[17];
+	RHS6 -= go[18] * *cnV[18];
+	RHS6 -= go[19] * *cnV[19];
+	RHS6 -= go[20] * *cnV[20];
+	RHS6 -= go[21] * *cnV[21];
+	m_A16 += gt[22];
+	m_A16 += gt[23];
+	m_A17 += go[22];
+	double RHS7 = Idr[22];
+	RHS7 += Idr[23];
+	RHS7 -= go[23] * *cnV[23];
+	m_A24 += gt[24];
+	m_A24 += gt[25];
+	m_A24 += gt[26];
+	m_A24 += gt[27];
+	m_A24 += gt[28];
+	m_A24 += gt[29];
+	m_A24 += gt[30];
+	m_A22 += go[24];
+	m_A21 += go[25];
+	m_A20 += go[26];
 	m_A19 += go[27];
 	m_A18 += go[28];
-	m_A17 += go[29];
-	double RHS7 = Idr[25];
-	RHS7 += Idr[26];
-	RHS7 += Idr[27];
-	RHS7 += Idr[28];
-	RHS7 += Idr[29];
-	RHS7 += Idr[30];
-	RHS7 -= go[30] * *cnV[30];
-	m_A28 += gt[31];
-	m_A28 += gt[32];
-	m_A28 += gt[33];
-	m_A28 += gt[34];
-	m_A28 += gt[35];
-	m_A28 += gt[36];
-	m_A25 += go[31];
-	m_A24 += go[32];
-	m_A26 += go[33];
-	m_A26 += go[34];
-	double RHS8 = Idr[31];
-	RHS8 += Idr[32];
-	RHS8 += Idr[33];
-	RHS8 += Idr[34];
-	RHS8 += Idr[35];
-	RHS8 += Idr[36];
-	RHS8 -= go[35] * *cnV[35];
-	RHS8 -= go[36] * *cnV[36];
+	m_A25 += go[29];
+	m_A23 += go[30];
+	double RHS8 = Idr[24];
+	RHS8 += Idr[25];
+	RHS8 += Idr[26];
+	RHS8 += Idr[27];
+	RHS8 += Idr[28];
+	RHS8 += Idr[29];
+	RHS8 += Idr[30];
+	m_A30 += gt[31];
+	m_A30 += gt[32];
+	m_A30 += gt[33];
+	m_A30 += gt[34];
+	m_A30 += gt[35];
+	m_A30 += gt[36];
+	m_A27 += go[31];
+	m_A28 += go[32];
+	m_A26 += go[33];
+	m_A29 += go[34];
+	double RHS9 = Idr[31];
+	RHS9 += Idr[32];
+	RHS9 += Idr[33];
+	RHS9 += Idr[34];
+	RHS9 += Idr[35];
+	RHS9 += Idr[36];
+	RHS9 -= go[35] * *cnV[35];
+	RHS9 -= go[36] * *cnV[36];
 	const double f0 = 1.0 / m_A0;
-	const double f0_7 = -f0 * m_A17;
-	m_A22 += m_A1 * f0_7;
-	RHS7 += f0_7 * RHS0;
+	const double f0_6 = -f0 * m_A13;
+	m_A15 += m_A1 * f0_6;
+	RHS6 += f0_6 * RHS0;
+	const double f0_8 = -f0 * m_A18;
+	m_A24 += m_A1 * f0_8;
+	RHS8 += f0_8 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_7 = -f1 * m_A18;
-	m_A22 += m_A3 * f1_7;
-	RHS7 += f1_7 * RHS1;
+	const double f1_8 = -f1 * m_A19;
+	m_A24 += m_A3 * f1_8;
+	RHS8 += f1_8 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_7 = -f2 * m_A19;
-	m_A22 += m_A5 * f2_7;
-	RHS7 += f2_7 * RHS2;
+	const double f2_8 = -f2 * m_A20;
+	m_A24 += m_A5 * f2_8;
+	RHS8 += f2_8 * RHS2;
 	const double f3 = 1.0 / m_A6;
-	const double f3_6 = -f3 * m_A13;
-	m_A14 += m_A7 * f3_6;
-	m_A16 += m_A8 * f3_6;
-	RHS6 += f3_6 * RHS3;
-	const double f3_8 = -f3 * m_A24;
-	m_A26 += m_A7 * f3_8;
-	m_A28 += m_A8 * f3_8;
+	const double f3_8 = -f3 * m_A21;
+	m_A24 += m_A7 * f3_8;
 	RHS8 += f3_8 * RHS3;
-	const double f4 = 1.0 / m_A9;
-	const double f4_8 = -f4 * m_A25;
-	m_A28 += m_A10 * f4_8;
+	const double f4 = 1.0 / m_A8;
+	const double f4_8 = -f4 * m_A22;
+	m_A24 += m_A9 * f4_8;
 	RHS8 += f4_8 * RHS4;
-	const double f5 = 1.0 / m_A11;
-	const double f5_7 = -f5 * m_A20;
-	m_A22 += m_A12 * f5_7;
-	RHS7 += f5_7 * RHS5;
+	const double f5 = 1.0 / m_A10;
+	const double f5_8 = -f5 * m_A23;
+	m_A24 += m_A11 * f5_8;
+	m_A25 += m_A12 * f5_8;
+	RHS8 += f5_8 * RHS5;
+	const double f5_9 = -f5 * m_A26;
+	m_A29 += m_A11 * f5_9;
+	m_A30 += m_A12 * f5_9;
+	RHS9 += f5_9 * RHS5;
 	const double f6 = 1.0 / m_A14;
-	const double f6_7 = -f6 * m_A21;
-	m_A22 += m_A15 * f6_7;
-	m_A23 += m_A16 * f6_7;
-	RHS7 += f6_7 * RHS6;
-	const double f6_8 = -f6 * m_A26;
-	m_A27 += m_A15 * f6_8;
-	m_A28 += m_A16 * f6_8;
-	RHS8 += f6_8 * RHS6;
-	const double f7 = 1.0 / m_A22;
-	const double f7_8 = -f7 * m_A27;
-	m_A28 += m_A23 * f7_8;
-	RHS8 += f7_8 * RHS7;
-	V[8] = RHS8 / m_A28;
+	const double f6_9 = -f6 * m_A27;
+	m_A29 += m_A15 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f7 = 1.0 / m_A16;
+	const double f7_9 = -f7 * m_A28;
+	m_A30 += m_A17 * f7_9;
+	RHS9 += f7_9 * RHS7;
+	const double f8 = 1.0 / m_A24;
+	const double f8_9 = -f8 * m_A29;
+	m_A30 += m_A25 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	V[9] = RHS9 / m_A30;
+	double tmp8 = 0.0;
+	tmp8 += m_A25 * V[9];
+	V[8] = (RHS8 - tmp8) / m_A24;
 	double tmp7 = 0.0;
-	tmp7 += m_A23 * V[8];
-	V[7] = (RHS7 - tmp7) / m_A22;
+	tmp7 += m_A17 * V[9];
+	V[7] = (RHS7 - tmp7) / m_A16;
 	double tmp6 = 0.0;
-	tmp6 += m_A15 * V[7];
-	tmp6 += m_A16 * V[8];
+	tmp6 += m_A15 * V[8];
 	V[6] = (RHS6 - tmp6) / m_A14;
 	double tmp5 = 0.0;
-	tmp5 += m_A12 * V[7];
-	V[5] = (RHS5 - tmp5) / m_A11;
+	tmp5 += m_A11 * V[8];
+	tmp5 += m_A12 * V[9];
+	V[5] = (RHS5 - tmp5) / m_A10;
 	double tmp4 = 0.0;
-	tmp4 += m_A10 * V[8];
-	V[4] = (RHS4 - tmp4) / m_A9;
+	tmp4 += m_A9 * V[8];
+	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[6];
-	tmp3 += m_A8 * V[8];
+	tmp3 += m_A7 * V[8];
 	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[7];
+	tmp2 += m_A5 * V[8];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[7];
+	tmp1 += m_A3 * V[8];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[7];
-	V[0] = (RHS0 - tmp0) / m_A0;
-}
-
-// cheekyms
-static void nl_gcr_7e9498276980e5d1_12_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
-
-{
-
-	double m_A0(0.0);
-	double m_A1(0.0);
-	double m_A2(0.0);
-	double m_A3(0.0);
-	double m_A4(0.0);
-	double m_A5(0.0);
-	double m_A6(0.0);
-	double m_A7(0.0);
-	double m_A8(0.0);
-	double m_A9(0.0);
-	double m_A10(0.0);
-	double m_A11(0.0);
-	m_A0 += gt[0];
-	m_A0 += gt[1];
-	m_A0 += gt[2];
-	m_A2 += go[0];
-	m_A1 += go[1];
-	double RHS0 = Idr[0];
-	RHS0 += Idr[1];
-	RHS0 += Idr[2];
-	RHS0 -= go[2] * *cnV[2];
-	m_A3 += gt[3];
-	m_A3 += gt[4];
-	m_A4 += go[3];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 -= go[4] * *cnV[4];
-	m_A6 += gt[5];
-	m_A6 += gt[6];
-	m_A7 += go[5];
-	m_A5 += go[6];
-	double RHS2 = Idr[5];
-	RHS2 += Idr[6];
-	m_A11 += gt[7];
-	m_A11 += gt[8];
-	m_A11 += gt[9];
-	m_A11 += gt[10];
-	m_A11 += gt[11];
-	m_A11 += gt[12];
-	m_A9 += go[7];
-	m_A10 += go[8];
-	m_A8 += go[9];
-	double RHS3 = Idr[7];
-	RHS3 += Idr[8];
-	RHS3 += Idr[9];
-	RHS3 += Idr[10];
-	RHS3 += Idr[11];
-	RHS3 += Idr[12];
-	RHS3 -= go[10] * *cnV[10];
-	RHS3 -= go[11] * *cnV[11];
-	RHS3 -= go[12] * *cnV[12];
-	const double f0 = 1.0 / m_A0;
-	const double f0_2 = -f0 * m_A5;
-	m_A6 += m_A1 * f0_2;
-	m_A7 += m_A2 * f0_2;
-	RHS2 += f0_2 * RHS0;
-	const double f0_3 = -f0 * m_A8;
-	m_A10 += m_A1 * f0_3;
-	m_A11 += m_A2 * f0_3;
-	RHS3 += f0_3 * RHS0;
-	const double f1 = 1.0 / m_A3;
-	const double f1_3 = -f1 * m_A9;
-	m_A11 += m_A4 * f1_3;
-	RHS3 += f1_3 * RHS1;
-	const double f2 = 1.0 / m_A6;
-	const double f2_3 = -f2 * m_A10;
-	m_A11 += m_A7 * f2_3;
-	RHS3 += f2_3 * RHS2;
-	V[3] = RHS3 / m_A11;
-	double tmp2 = 0.0;
-	tmp2 += m_A7 * V[3];
-	V[2] = (RHS2 - tmp2) / m_A6;
-	double tmp1 = 0.0;
-	tmp1 += m_A4 * V[3];
-	V[1] = (RHS1 - tmp1) / m_A3;
-	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[2];
-	tmp0 += m_A2 * V[3];
+	tmp0 += m_A1 * V[8];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// kidniki
-static void nl_gcr_80d7c219807268a_24_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// tailg
+static void nl_gcr_c4cec7aed23b7b94_23_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -7933,148 +49879,168 @@
 	double m_A20(0.0);
 	double m_A21(0.0);
 	double m_A22(0.0);
-	double m_A23(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
-	m_A0 += gt[2];
-	m_A0 += gt[3];
-	m_A0 += gt[4];
-	m_A0 += gt[5];
-	m_A0 += gt[6];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
-	RHS0 += Idr[2];
-	RHS0 += Idr[3];
-	RHS0 += Idr[4];
-	RHS0 += Idr[5];
-	RHS0 += Idr[6];
 	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
-	RHS0 -= go[3] * *cnV[3];
-	RHS0 -= go[4] * *cnV[4];
-	RHS0 -= go[5] * *cnV[5];
-	RHS0 -= go[6] * *cnV[6];
-	m_A2 += gt[7];
-	m_A2 += gt[8];
-	m_A3 += go[7];
-	double RHS1 = Idr[7];
-	RHS1 += Idr[8];
-	RHS1 -= go[8] * *cnV[8];
-	m_A4 += gt[9];
-	m_A4 += gt[10];
-	m_A5 += go[9];
-	double RHS2 = Idr[9];
-	RHS2 += Idr[10];
-	RHS2 -= go[10] * *cnV[10];
-	m_A6 += gt[11];
-	m_A6 += gt[12];
-	m_A7 += go[11];
-	double RHS3 = Idr[11];
-	RHS3 += Idr[12];
-	RHS3 -= go[12] * *cnV[12];
-	m_A8 += gt[13];
-	m_A8 += gt[14];
-	m_A8 += gt[15];
-	m_A10 += go[13];
-	m_A9 += go[14];
-	double RHS4 = Idr[13];
-	RHS4 += Idr[14];
-	RHS4 += Idr[15];
-	RHS4 -= go[15] * *cnV[15];
-	m_A11 += gt[16];
-	m_A11 += gt[17];
-	m_A11 += gt[18];
-	m_A12 += go[16];
-	double RHS5 = Idr[16];
-	RHS5 += Idr[17];
-	RHS5 += Idr[18];
-	RHS5 -= go[17] * *cnV[17];
-	RHS5 -= go[18] * *cnV[18];
-	m_A18 += gt[19];
-	m_A18 += gt[20];
-	m_A18 += gt[21];
-	m_A18 += gt[22];
-	m_A18 += gt[23];
-	m_A16 += go[19];
-	m_A15 += go[20];
-	m_A14 += go[21];
-	m_A17 += go[22];
-	m_A13 += go[23];
-	double RHS6 = Idr[19];
-	RHS6 += Idr[20];
-	RHS6 += Idr[21];
-	RHS6 += Idr[22];
-	RHS6 += Idr[23];
-	m_A23 += gt[24];
-	m_A23 += gt[25];
-	m_A21 += go[24];
-	m_A20 += go[25];
-	double RHS7 = Idr[24];
-	RHS7 += Idr[25];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A4 += go[2];
+	m_A3 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	m_A5 += gt[7];
+	m_A5 += gt[8];
+	m_A5 += gt[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A7 += go[7];
+	m_A6 += go[8];
+	m_A6 += go[9];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	m_A9 += gt[13];
+	m_A9 += gt[14];
+	m_A9 += gt[15];
+	m_A9 += gt[16];
+	m_A9 += gt[17];
+	m_A10 += go[13];
+	m_A10 += go[14];
+	m_A8 += go[15];
+	m_A8 += go[16];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 -= go[17] * *cnV[17];
+	m_A12 += gt[18];
+	m_A12 += gt[19];
+	m_A12 += gt[20];
+	m_A12 += gt[21];
+	m_A12 += gt[22];
+	m_A13 += go[18];
+	m_A13 += go[19];
+	m_A11 += go[20];
+	m_A11 += go[21];
+	double RHS4 = Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 -= go[22] * *cnV[22];
+	m_A17 += gt[23];
+	m_A17 += gt[24];
+	m_A17 += gt[25];
+	m_A17 += gt[26];
+	m_A17 += gt[27];
+	m_A17 += gt[28];
+	m_A18 += go[23];
+	m_A16 += go[24];
+	m_A16 += go[25];
+	m_A15 += go[26];
+	m_A14 += go[27];
+	double RHS5 = Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 += Idr[27];
+	RHS5 += Idr[28];
+	RHS5 -= go[28] * *cnV[28];
+	m_A22 += gt[29];
+	m_A22 += gt[30];
+	m_A22 += gt[31];
+	m_A22 += gt[32];
+	m_A20 += go[29];
+	m_A20 += go[30];
+	m_A19 += go[31];
+	m_A21 += go[32];
+	double RHS6 = Idr[29];
+	RHS6 += Idr[30];
+	RHS6 += Idr[31];
+	RHS6 += Idr[32];
 	const double f0 = 1.0 / m_A0;
-	const double f0_6 = -f0 * m_A13;
-	m_A18 += m_A1 * f0_6;
-	RHS6 += f0_6 * RHS0;
+	const double f0_5 = -f0 * m_A14;
+	m_A17 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_6 = -f1 * m_A14;
-	m_A18 += m_A3 * f1_6;
-	RHS6 += f1_6 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_6 = -f2 * m_A15;
-	m_A18 += m_A5 * f2_6;
+	const double f1_3 = -f1 * m_A8;
+	m_A9 += m_A3 * f1_3;
+	m_A10 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f1_5 = -f1 * m_A15;
+	m_A16 += m_A3 * f1_5;
+	m_A17 += m_A4 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_4 = -f2 * m_A11;
+	m_A12 += m_A6 * f2_4;
+	m_A13 += m_A7 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_6 = -f2 * m_A19;
+	m_A20 += m_A6 * f2_6;
+	m_A22 += m_A7 * f2_6;
 	RHS6 += f2_6 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_6 = -f3 * m_A16;
-	m_A18 += m_A7 * f3_6;
-	RHS6 += f3_6 * RHS3;
-	const double f4 = 1.0 / m_A8;
-	const double f4_6 = -f4 * m_A17;
-	m_A18 += m_A9 * f4_6;
-	m_A19 += m_A10 * f4_6;
+	const double f3 = 1.0 / m_A9;
+	const double f3_5 = -f3 * m_A16;
+	m_A17 += m_A10 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A12;
+	const double f4_6 = -f4 * m_A20;
+	m_A22 += m_A13 * f4_6;
 	RHS6 += f4_6 * RHS4;
-	const double f4_7 = -f4 * m_A20;
-	m_A22 += m_A9 * f4_7;
-	m_A23 += m_A10 * f4_7;
-	RHS7 += f4_7 * RHS4;
-	const double f5 = 1.0 / m_A11;
-	const double f5_7 = -f5 * m_A21;
-	m_A23 += m_A12 * f5_7;
-	RHS7 += f5_7 * RHS5;
-	const double f6 = 1.0 / m_A18;
-	const double f6_7 = -f6 * m_A22;
-	m_A23 += m_A19 * f6_7;
-	RHS7 += f6_7 * RHS6;
-	V[7] = RHS7 / m_A23;
-	double tmp6 = 0.0;
-	tmp6 += m_A19 * V[7];
-	V[6] = (RHS6 - tmp6) / m_A18;
+	const double f5 = 1.0 / m_A17;
+	const double f5_6 = -f5 * m_A21;
+	m_A22 += m_A18 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	V[6] = RHS6 / m_A22;
 	double tmp5 = 0.0;
-	tmp5 += m_A12 * V[7];
-	V[5] = (RHS5 - tmp5) / m_A11;
+	tmp5 += m_A18 * V[6];
+	V[5] = (RHS5 - tmp5) / m_A17;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[6];
-	tmp4 += m_A10 * V[7];
-	V[4] = (RHS4 - tmp4) / m_A8;
+	tmp4 += m_A13 * V[6];
+	V[4] = (RHS4 - tmp4) / m_A12;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[6];
-	V[3] = (RHS3 - tmp3) / m_A6;
+	tmp3 += m_A10 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A9;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[6];
-	V[2] = (RHS2 - tmp2) / m_A4;
+	tmp2 += m_A6 * V[4];
+	tmp2 += m_A7 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A5;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[6];
+	tmp1 += m_A3 * V[3];
+	tmp1 += m_A4 * V[5];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[6];
+	tmp0 += m_A1 * V[5];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// pongf
-static void nl_gcr_81ae080c83dcf6a4_35_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// segausb
+static void nl_gcr_c61e08cf5e35918_84_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -8110,347 +50076,516 @@
 	double m_A32(0.0);
 	double m_A33(0.0);
 	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
-	m_A0 += gt[2];
-	m_A0 += gt[3];
 	m_A1 += go[0];
+	m_A2 += go[1];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
-	RHS0 += Idr[2];
-	RHS0 += Idr[3];
-	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
-	RHS0 -= go[3] * *cnV[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A2 += gt[6];
-	m_A2 += gt[7];
-	m_A3 += go[4];
-	double RHS1 = Idr[4];
-	RHS1 += Idr[5];
-	RHS1 += Idr[6];
-	RHS1 += Idr[7];
-	RHS1 -= go[5] * *cnV[5];
-	RHS1 -= go[6] * *cnV[6];
-	RHS1 -= go[7] * *cnV[7];
-	m_A4 += gt[8];
-	m_A4 += gt[9];
-	m_A4 += gt[10];
-	m_A5 += go[8];
-	double RHS2 = Idr[8];
+	m_A3 += gt[2];
+	m_A3 += gt[3];
+	m_A5 += go[2];
+	m_A4 += go[3];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	m_A6 += gt[4];
+	m_A6 += gt[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A7 += go[4];
+	m_A8 += go[5];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
 	RHS2 += Idr[9];
 	RHS2 += Idr[10];
+	RHS2 -= go[6] * *cnV[6];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
 	RHS2 -= go[9] * *cnV[9];
 	RHS2 -= go[10] * *cnV[10];
-	m_A6 += gt[11];
-	m_A6 += gt[12];
-	m_A6 += gt[13];
-	m_A6 += gt[14];
-	m_A6 += gt[15];
-	m_A9 += go[11];
-	m_A7 += go[12];
-	m_A7 += go[13];
-	m_A7 += go[14];
-	m_A8 += go[15];
+	m_A9 += gt[11];
+	m_A9 += gt[12];
+	m_A9 += gt[13];
+	m_A10 += go[11];
+	m_A11 += go[12];
 	double RHS3 = Idr[11];
 	RHS3 += Idr[12];
 	RHS3 += Idr[13];
-	RHS3 += Idr[14];
-	RHS3 += Idr[15];
-	m_A11 += gt[16];
-	m_A11 += gt[17];
-	m_A11 += gt[18];
-	m_A11 += gt[19];
-	m_A11 += gt[20];
-	m_A11 += gt[21];
-	m_A11 += gt[22];
-	m_A13 += go[16];
-	m_A12 += go[17];
-	m_A10 += go[18];
-	double RHS4 = Idr[16];
-	RHS4 += Idr[17];
-	RHS4 += Idr[18];
-	RHS4 += Idr[19];
-	RHS4 += Idr[20];
-	RHS4 += Idr[21];
-	RHS4 += Idr[22];
-	RHS4 -= go[19] * *cnV[19];
-	RHS4 -= go[20] * *cnV[20];
-	RHS4 -= go[21] * *cnV[21];
-	RHS4 -= go[22] * *cnV[22];
-	m_A15 += gt[23];
-	m_A15 += gt[24];
-	m_A15 += gt[25];
-	m_A15 += gt[26];
-	m_A15 += gt[27];
-	m_A17 += go[23];
-	m_A14 += go[24];
-	m_A14 += go[25];
-	m_A14 += go[26];
-	double RHS5 = Idr[23];
-	RHS5 += Idr[24];
-	RHS5 += Idr[25];
-	RHS5 += Idr[26];
-	RHS5 += Idr[27];
-	RHS5 -= go[27] * *cnV[27];
-	m_A22 += gt[28];
-	m_A22 += gt[29];
-	m_A22 += gt[30];
-	m_A22 += gt[31];
-	m_A19 += go[28];
-	m_A20 += go[29];
-	m_A18 += go[30];
-	double RHS6 = Idr[28];
-	RHS6 += Idr[29];
-	RHS6 += Idr[30];
-	RHS6 += Idr[31];
-	RHS6 -= go[31] * *cnV[31];
-	m_A28 += gt[32];
-	m_A28 += gt[33];
-	m_A28 += gt[34];
-	m_A29 += go[32];
+	RHS3 -= go[13] * *cnV[13];
+	m_A12 += gt[14];
+	m_A13 += go[14];
+	double RHS4 = Idr[14];
+	m_A14 += gt[15];
+	m_A14 += gt[16];
+	m_A16 += go[15];
+	m_A15 += go[16];
+	double RHS5 = Idr[15];
+	RHS5 += Idr[16];
+	m_A17 += gt[17];
+	m_A17 += gt[18];
+	m_A18 += go[17];
+	double RHS6 = Idr[17];
+	RHS6 += Idr[18];
+	RHS6 -= go[18] * *cnV[18];
+	m_A19 += gt[19];
+	m_A19 += gt[20];
+	m_A19 += gt[21];
+	m_A19 += gt[22];
+	m_A19 += gt[23];
+	m_A19 += gt[24];
+	m_A19 += gt[25];
+	m_A20 += go[19];
+	double RHS7 = Idr[19];
+	RHS7 += Idr[20];
+	RHS7 += Idr[21];
+	RHS7 += Idr[22];
+	RHS7 += Idr[23];
+	RHS7 += Idr[24];
+	RHS7 += Idr[25];
+	RHS7 -= go[20] * *cnV[20];
+	RHS7 -= go[21] * *cnV[21];
+	RHS7 -= go[22] * *cnV[22];
+	RHS7 -= go[23] * *cnV[23];
+	RHS7 -= go[24] * *cnV[24];
+	RHS7 -= go[25] * *cnV[25];
+	m_A21 += gt[26];
+	m_A21 += gt[27];
+	m_A21 += gt[28];
+	m_A21 += gt[29];
+	m_A21 += gt[30];
+	m_A21 += gt[31];
+	m_A21 += gt[32];
+	m_A22 += go[26];
+	double RHS8 = Idr[26];
+	RHS8 += Idr[27];
+	RHS8 += Idr[28];
+	RHS8 += Idr[29];
+	RHS8 += Idr[30];
+	RHS8 += Idr[31];
+	RHS8 += Idr[32];
+	RHS8 -= go[27] * *cnV[27];
+	RHS8 -= go[28] * *cnV[28];
+	RHS8 -= go[29] * *cnV[29];
+	RHS8 -= go[30] * *cnV[30];
+	RHS8 -= go[31] * *cnV[31];
+	RHS8 -= go[32] * *cnV[32];
+	m_A23 += gt[33];
+	m_A23 += gt[34];
 	m_A25 += go[33];
-	m_A26 += go[34];
-	double RHS7 = Idr[32];
-	RHS7 += Idr[33];
-	RHS7 += Idr[34];
-	m_A34 += gt[35];
-	m_A34 += gt[36];
-	m_A34 += gt[37];
-	m_A31 += go[35];
-	m_A30 += go[36];
-	m_A33 += go[37];
-	double RHS8 = Idr[35];
-	RHS8 += Idr[36];
-	RHS8 += Idr[37];
+	m_A24 += go[34];
+	double RHS9 = Idr[33];
+	RHS9 += Idr[34];
+	m_A28 += gt[35];
+	m_A28 += gt[36];
+	m_A28 += gt[37];
+	m_A28 += gt[38];
+	m_A28 += gt[39];
+	m_A28 += gt[40];
+	m_A30 += go[35];
+	m_A27 += go[36];
+	m_A26 += go[37];
+	m_A29 += go[38];
+	double RHS10 = Idr[35];
+	RHS10 += Idr[36];
+	RHS10 += Idr[37];
+	RHS10 += Idr[38];
+	RHS10 += Idr[39];
+	RHS10 += Idr[40];
+	RHS10 -= go[39] * *cnV[39];
+	RHS10 -= go[40] * *cnV[40];
+	m_A34 += gt[41];
+	m_A34 += gt[42];
+	m_A34 += gt[43];
+	m_A34 += gt[44];
+	m_A34 += gt[45];
+	m_A34 += gt[46];
+	m_A31 += go[41];
+	m_A33 += go[42];
+	m_A37 += go[43];
+	m_A32 += go[44];
+	double RHS11 = Idr[41];
+	RHS11 += Idr[42];
+	RHS11 += Idr[43];
+	RHS11 += Idr[44];
+	RHS11 += Idr[45];
+	RHS11 += Idr[46];
+	RHS11 -= go[45] * *cnV[45];
+	RHS11 -= go[46] * *cnV[46];
+	m_A41 += gt[47];
+	m_A41 += gt[48];
+	m_A41 += gt[49];
+	m_A41 += gt[50];
+	m_A44 += go[47];
+	m_A39 += go[48];
+	m_A38 += go[49];
+	double RHS12 = Idr[47];
+	RHS12 += Idr[48];
+	RHS12 += Idr[49];
+	RHS12 += Idr[50];
+	RHS12 -= go[50] * *cnV[50];
+	m_A45 += gt[51];
+	m_A45 += gt[52];
+	m_A45 += gt[53];
+	m_A45 += gt[54];
+	m_A45 += gt[55];
+	m_A46 += go[51];
+	double RHS13 = Idr[51];
+	RHS13 += Idr[52];
+	RHS13 += Idr[53];
+	RHS13 += Idr[54];
+	RHS13 += Idr[55];
+	RHS13 -= go[52] * *cnV[52];
+	RHS13 -= go[53] * *cnV[53];
+	RHS13 -= go[54] * *cnV[54];
+	RHS13 -= go[55] * *cnV[55];
+	m_A50 += gt[56];
+	m_A50 += gt[57];
+	m_A50 += gt[58];
+	m_A50 += gt[59];
+	m_A50 += gt[60];
+	m_A49 += go[56];
+	m_A48 += go[57];
+	m_A47 += go[58];
+	double RHS14 = Idr[56];
+	RHS14 += Idr[57];
+	RHS14 += Idr[58];
+	RHS14 += Idr[59];
+	RHS14 += Idr[60];
+	RHS14 -= go[59] * *cnV[59];
+	RHS14 -= go[60] * *cnV[60];
+	m_A59 += gt[61];
+	m_A59 += gt[62];
+	m_A59 += gt[63];
+	m_A59 += gt[64];
+	m_A54 += go[61];
+	m_A53 += go[62];
+	m_A55 += go[63];
+	double RHS15 = Idr[61];
+	RHS15 += Idr[62];
+	RHS15 += Idr[63];
+	RHS15 += Idr[64];
+	RHS15 -= go[64] * *cnV[64];
+	m_A67 += gt[65];
+	m_A67 += gt[66];
+	m_A67 += gt[67];
+	m_A63 += go[65];
+	m_A69 += go[66];
+	m_A64 += go[67];
+	double RHS16 = Idr[65];
+	RHS16 += Idr[66];
+	RHS16 += Idr[67];
+	m_A74 += gt[68];
+	m_A74 += gt[69];
+	m_A74 += gt[70];
+	m_A74 += gt[71];
+	m_A70 += go[68];
+	m_A71 += go[69];
+	double RHS17 = Idr[68];
+	RHS17 += Idr[69];
+	RHS17 += Idr[70];
+	RHS17 += Idr[71];
+	RHS17 -= go[70] * *cnV[70];
+	RHS17 -= go[71] * *cnV[71];
+	m_A83 += gt[72];
+	m_A83 += gt[73];
+	m_A83 += gt[74];
+	m_A83 += gt[75];
+	m_A83 += gt[76];
+	m_A83 += gt[77];
+	m_A76 += go[72];
+	m_A78 += go[73];
+	m_A81 += go[74];
+	m_A77 += go[75];
+	double RHS18 = Idr[72];
+	RHS18 += Idr[73];
+	RHS18 += Idr[74];
+	RHS18 += Idr[75];
+	RHS18 += Idr[76];
+	RHS18 += Idr[77];
+	RHS18 -= go[76] * *cnV[76];
+	RHS18 -= go[77] * *cnV[77];
 	const double f0 = 1.0 / m_A0;
-	const double f0_4 = -f0 * m_A10;
-	m_A11 += m_A1 * f0_4;
-	RHS4 += f0_4 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_6 = -f1 * m_A18;
-	m_A22 += m_A3 * f1_6;
-	RHS6 += f1_6 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_7 = -f2 * m_A25;
-	m_A28 += m_A5 * f2_7;
-	RHS7 += f2_7 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_5 = -f3 * m_A14;
-	m_A15 += m_A7 * f3_5;
-	m_A16 += m_A8 * f3_5;
-	m_A17 += m_A9 * f3_5;
-	RHS5 += f3_5 * RHS3;
-	const double f3_6 = -f3 * m_A19;
-	m_A21 += m_A7 * f3_6;
-	m_A22 += m_A8 * f3_6;
-	m_A24 += m_A9 * f3_6;
-	RHS6 += f3_6 * RHS3;
-	const double f3_8 = -f3 * m_A30;
-	m_A31 += m_A7 * f3_8;
-	m_A32 += m_A8 * f3_8;
-	m_A34 += m_A9 * f3_8;
-	RHS8 += f3_8 * RHS3;
-	const double f4 = 1.0 / m_A11;
-	const double f4_6 = -f4 * m_A20;
-	m_A22 += m_A12 * f4_6;
-	m_A23 += m_A13 * f4_6;
-	RHS6 += f4_6 * RHS4;
-	const double f4_7 = -f4 * m_A26;
-	m_A27 += m_A12 * f4_7;
-	m_A28 += m_A13 * f4_7;
-	RHS7 += f4_7 * RHS4;
-	const double f5 = 1.0 / m_A15;
-	const double f5_6 = -f5 * m_A21;
-	m_A22 += m_A16 * f5_6;
-	m_A24 += m_A17 * f5_6;
-	RHS6 += f5_6 * RHS5;
-	const double f5_8 = -f5 * m_A31;
-	m_A32 += m_A16 * f5_8;
-	m_A34 += m_A17 * f5_8;
-	RHS8 += f5_8 * RHS5;
-	const double f6 = 1.0 / m_A22;
-	const double f6_7 = -f6 * m_A27;
-	m_A28 += m_A23 * f6_7;
-	m_A29 += m_A24 * f6_7;
-	RHS7 += f6_7 * RHS6;
-	const double f6_8 = -f6 * m_A32;
-	m_A33 += m_A23 * f6_8;
-	m_A34 += m_A24 * f6_8;
-	RHS8 += f6_8 * RHS6;
-	const double f7 = 1.0 / m_A28;
-	const double f7_8 = -f7 * m_A33;
-	m_A34 += m_A29 * f7_8;
-	RHS8 += f7_8 * RHS7;
-	V[8] = RHS8 / m_A34;
+	const double f0_10 = -f0 * m_A26;
+	m_A28 += m_A1 * f0_10;
+	m_A29 += m_A2 * f0_10;
+	RHS10 += f0_10 * RHS0;
+	const double f0_14 = -f0 * m_A47;
+	m_A49 += m_A1 * f0_14;
+	m_A50 += m_A2 * f0_14;
+	RHS14 += f0_14 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_10 = -f1 * m_A27;
+	m_A28 += m_A4 * f1_10;
+	m_A30 += m_A5 * f1_10;
+	RHS10 += f1_10 * RHS1;
+	const double f1_15 = -f1 * m_A53;
+	m_A55 += m_A4 * f1_15;
+	m_A59 += m_A5 * f1_15;
+	RHS15 += f1_15 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_11 = -f2 * m_A31;
+	m_A32 += m_A7 * f2_11;
+	m_A36 += m_A8 * f2_11;
+	RHS11 += f2_11 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_11 = -f3 * m_A32;
+	m_A34 += m_A10 * f3_11;
+	m_A36 += m_A11 * f3_11;
+	RHS11 += f3_11 * RHS3;
+	const double f3_15 = -f3 * m_A54;
+	m_A56 += m_A10 * f3_15;
+	m_A59 += m_A11 * f3_15;
+	RHS15 += f3_15 * RHS3;
+	const double f4 = 1.0 / m_A12;
+	const double f4_16 = -f4 * m_A63;
+	m_A67 += m_A13 * f4_16;
+	RHS16 += f4_16 * RHS4;
+	const double f5 = 1.0 / m_A14;
+	const double f5_11 = -f5 * m_A33;
+	m_A34 += m_A15 * f5_11;
+	m_A35 += m_A16 * f5_11;
+	RHS11 += f5_11 * RHS5;
+	const double f5_12 = -f5 * m_A38;
+	m_A40 += m_A15 * f5_12;
+	m_A41 += m_A16 * f5_12;
+	RHS12 += f5_12 * RHS5;
+	const double f6 = 1.0 / m_A17;
+	const double f6_12 = -f6 * m_A39;
+	m_A41 += m_A18 * f6_12;
+	RHS12 += f6_12 * RHS6;
+	const double f7 = 1.0 / m_A19;
+	const double f7_17 = -f7 * m_A70;
+	m_A71 += m_A20 * f7_17;
+	RHS17 += f7_17 * RHS7;
+	const double f8 = 1.0 / m_A21;
+	const double f8_18 = -f8 * m_A76;
+	m_A78 += m_A22 * f8_18;
+	RHS18 += f8_18 * RHS8;
+	const double f9 = 1.0 / m_A23;
+	const double f9_14 = -f9 * m_A48;
+	m_A50 += m_A24 * f9_14;
+	m_A52 += m_A25 * f9_14;
+	RHS14 += f9_14 * RHS9;
+	const double f9_18 = -f9 * m_A77;
+	m_A79 += m_A24 * f9_18;
+	m_A83 += m_A25 * f9_18;
+	RHS18 += f9_18 * RHS9;
+	const double f10 = 1.0 / m_A28;
+	const double f10_14 = -f10 * m_A49;
+	m_A50 += m_A29 * f10_14;
+	m_A51 += m_A30 * f10_14;
+	RHS14 += f10_14 * RHS10;
+	const double f10_15 = -f10 * m_A55;
+	m_A58 += m_A29 * f10_15;
+	m_A59 += m_A30 * f10_15;
+	RHS15 += f10_15 * RHS10;
+	const double f11 = 1.0 / m_A34;
+	const double f11_12 = -f11 * m_A40;
+	m_A41 += m_A35 * f11_12;
+	m_A42 += m_A36 * f11_12;
+	m_A43 += m_A37 * f11_12;
+	RHS12 += f11_12 * RHS11;
+	const double f11_15 = -f11 * m_A56;
+	m_A57 += m_A35 * f11_15;
+	m_A59 += m_A36 * f11_15;
+	m_A60 += m_A37 * f11_15;
+	RHS15 += f11_15 * RHS11;
+	const double f11_16 = -f11 * m_A64;
+	m_A65 += m_A35 * f11_16;
+	m_A66 += m_A36 * f11_16;
+	m_A67 += m_A37 * f11_16;
+	RHS16 += f11_16 * RHS11;
+	const double f12 = 1.0 / m_A41;
+	const double f12_15 = -f12 * m_A57;
+	m_A59 += m_A42 * f12_15;
+	m_A60 += m_A43 * f12_15;
+	m_A61 += m_A44 * f12_15;
+	RHS15 += f12_15 * RHS12;
+	const double f12_16 = -f12 * m_A65;
+	m_A66 += m_A42 * f12_16;
+	m_A67 += m_A43 * f12_16;
+	m_A68 += m_A44 * f12_16;
+	RHS16 += f12_16 * RHS12;
+	const double f12_17 = -f12 * m_A71;
+	m_A72 += m_A42 * f12_17;
+	m_A73 += m_A43 * f12_17;
+	m_A74 += m_A44 * f12_17;
+	RHS17 += f12_17 * RHS12;
+	const double f13 = 1.0 / m_A45;
+	const double f13_18 = -f13 * m_A78;
+	m_A83 += m_A46 * f13_18;
+	RHS18 += f13_18 * RHS13;
+	const double f14 = 1.0 / m_A50;
+	const double f14_15 = -f14 * m_A58;
+	m_A59 += m_A51 * f14_15;
+	m_A62 += m_A52 * f14_15;
+	RHS15 += f14_15 * RHS14;
+	const double f14_18 = -f14 * m_A79;
+	m_A80 += m_A51 * f14_18;
+	m_A83 += m_A52 * f14_18;
+	RHS18 += f14_18 * RHS14;
+	const double f15 = 1.0 / m_A59;
+	const double f15_16 = -f15 * m_A66;
+	m_A67 += m_A60 * f15_16;
+	m_A68 += m_A61 * f15_16;
+	m_A69 += m_A62 * f15_16;
+	RHS16 += f15_16 * RHS15;
+	const double f15_17 = -f15 * m_A72;
+	m_A73 += m_A60 * f15_17;
+	m_A74 += m_A61 * f15_17;
+	m_A75 += m_A62 * f15_17;
+	RHS17 += f15_17 * RHS15;
+	const double f15_18 = -f15 * m_A80;
+	m_A81 += m_A60 * f15_18;
+	m_A82 += m_A61 * f15_18;
+	m_A83 += m_A62 * f15_18;
+	RHS18 += f15_18 * RHS15;
+	const double f16 = 1.0 / m_A67;
+	const double f16_17 = -f16 * m_A73;
+	m_A74 += m_A68 * f16_17;
+	m_A75 += m_A69 * f16_17;
+	RHS17 += f16_17 * RHS16;
+	const double f16_18 = -f16 * m_A81;
+	m_A82 += m_A68 * f16_18;
+	m_A83 += m_A69 * f16_18;
+	RHS18 += f16_18 * RHS16;
+	const double f17 = 1.0 / m_A74;
+	const double f17_18 = -f17 * m_A82;
+	m_A83 += m_A75 * f17_18;
+	RHS18 += f17_18 * RHS17;
+	V[18] = RHS18 / m_A83;
+	double tmp17 = 0.0;
+	tmp17 += m_A75 * V[18];
+	V[17] = (RHS17 - tmp17) / m_A74;
+	double tmp16 = 0.0;
+	tmp16 += m_A68 * V[17];
+	tmp16 += m_A69 * V[18];
+	V[16] = (RHS16 - tmp16) / m_A67;
+	double tmp15 = 0.0;
+	tmp15 += m_A60 * V[16];
+	tmp15 += m_A61 * V[17];
+	tmp15 += m_A62 * V[18];
+	V[15] = (RHS15 - tmp15) / m_A59;
+	double tmp14 = 0.0;
+	tmp14 += m_A51 * V[15];
+	tmp14 += m_A52 * V[18];
+	V[14] = (RHS14 - tmp14) / m_A50;
+	double tmp13 = 0.0;
+	tmp13 += m_A46 * V[18];
+	V[13] = (RHS13 - tmp13) / m_A45;
+	double tmp12 = 0.0;
+	tmp12 += m_A42 * V[15];
+	tmp12 += m_A43 * V[16];
+	tmp12 += m_A44 * V[17];
+	V[12] = (RHS12 - tmp12) / m_A41;
+	double tmp11 = 0.0;
+	tmp11 += m_A35 * V[12];
+	tmp11 += m_A36 * V[15];
+	tmp11 += m_A37 * V[16];
+	V[11] = (RHS11 - tmp11) / m_A34;
+	double tmp10 = 0.0;
+	tmp10 += m_A29 * V[14];
+	tmp10 += m_A30 * V[15];
+	V[10] = (RHS10 - tmp10) / m_A28;
+	double tmp9 = 0.0;
+	tmp9 += m_A24 * V[14];
+	tmp9 += m_A25 * V[18];
+	V[9] = (RHS9 - tmp9) / m_A23;
+	double tmp8 = 0.0;
+	tmp8 += m_A22 * V[13];
+	V[8] = (RHS8 - tmp8) / m_A21;
 	double tmp7 = 0.0;
-	tmp7 += m_A29 * V[8];
-	V[7] = (RHS7 - tmp7) / m_A28;
+	tmp7 += m_A20 * V[12];
+	V[7] = (RHS7 - tmp7) / m_A19;
 	double tmp6 = 0.0;
-	tmp6 += m_A23 * V[7];
-	tmp6 += m_A24 * V[8];
-	V[6] = (RHS6 - tmp6) / m_A22;
+	tmp6 += m_A18 * V[12];
+	V[6] = (RHS6 - tmp6) / m_A17;
 	double tmp5 = 0.0;
-	tmp5 += m_A16 * V[6];
-	tmp5 += m_A17 * V[8];
-	V[5] = (RHS5 - tmp5) / m_A15;
+	tmp5 += m_A15 * V[11];
+	tmp5 += m_A16 * V[12];
+	V[5] = (RHS5 - tmp5) / m_A14;
 	double tmp4 = 0.0;
-	tmp4 += m_A12 * V[6];
-	tmp4 += m_A13 * V[7];
-	V[4] = (RHS4 - tmp4) / m_A11;
+	tmp4 += m_A13 * V[16];
+	V[4] = (RHS4 - tmp4) / m_A12;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[5];
-	tmp3 += m_A8 * V[6];
-	tmp3 += m_A9 * V[8];
-	V[3] = (RHS3 - tmp3) / m_A6;
-	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[7];
-	V[2] = (RHS2 - tmp2) / m_A4;
-	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[6];
-	V[1] = (RHS1 - tmp1) / m_A2;
-	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[4];
-	V[0] = (RHS0 - tmp0) / m_A0;
-}
-
-// tp1985
-static void nl_gcr_83fbe835263b28d3_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
-
-{
-
-	double m_A0(0.0);
-	double m_A1(0.0);
-	double m_A2(0.0);
-	double m_A3(0.0);
-	double m_A4(0.0);
-	double m_A5(0.0);
-	double m_A6(0.0);
-	m_A0 += gt[0];
-	m_A0 += gt[1];
-	m_A0 += gt[2];
-	m_A1 += go[0];
-	double RHS0 = Idr[0];
-	RHS0 += Idr[1];
-	RHS0 += Idr[2];
-	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 -= go[4] * *cnV[4];
-	RHS1 -= go[5] * *cnV[5];
-	m_A6 += gt[6];
-	m_A6 += gt[7];
-	m_A6 += gt[8];
-	m_A5 += go[6];
-	m_A4 += go[7];
-	double RHS2 = Idr[6];
-	RHS2 += Idr[7];
-	RHS2 += Idr[8];
-	RHS2 -= go[8] * *cnV[8];
-	const double f0 = 1.0 / m_A0;
-	const double f0_2 = -f0 * m_A4;
-	m_A6 += m_A1 * f0_2;
-	RHS2 += f0_2 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_2 = -f1 * m_A5;
-	m_A6 += m_A3 * f1_2;
-	RHS2 += f1_2 * RHS1;
-	V[2] = RHS2 / m_A6;
-	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[2];
-	V[1] = (RHS1 - tmp1) / m_A2;
-	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[2];
-	V[0] = (RHS0 - tmp0) / m_A0;
-}
-
-// pongf
-static void nl_gcr_930be1d2f1a52598_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
-
-{
-
-	double m_A0(0.0);
-	double m_A1(0.0);
-	double m_A2(0.0);
-	double m_A3(0.0);
-	double m_A4(0.0);
-	double m_A5(0.0);
-	double m_A6(0.0);
-	double m_A7(0.0);
-	double m_A8(0.0);
-	double m_A9(0.0);
-	m_A0 += gt[0];
-	m_A0 += gt[1];
-	m_A0 += gt[2];
-	m_A1 += go[0];
-	double RHS0 = Idr[0];
-	RHS0 += Idr[1];
-	RHS0 += Idr[2];
-	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 -= go[4] * *cnV[4];
-	RHS1 -= go[5] * *cnV[5];
-	m_A4 += gt[6];
-	m_A4 += gt[7];
-	m_A4 += gt[8];
-	m_A5 += go[6];
-	double RHS2 = Idr[6];
-	RHS2 += Idr[7];
-	RHS2 += Idr[8];
-	RHS2 -= go[7] * *cnV[7];
-	RHS2 -= go[8] * *cnV[8];
-	m_A9 += gt[9];
-	m_A9 += gt[10];
-	m_A9 += gt[11];
-	m_A8 += go[9];
-	m_A7 += go[10];
-	m_A6 += go[11];
-	double RHS3 = Idr[9];
-	RHS3 += Idr[10];
-	RHS3 += Idr[11];
-	const double f0 = 1.0 / m_A0;
-	const double f0_3 = -f0 * m_A6;
-	m_A9 += m_A1 * f0_3;
-	RHS3 += f0_3 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_3 = -f1 * m_A7;
-	m_A9 += m_A3 * f1_3;
-	RHS3 += f1_3 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_3 = -f2 * m_A8;
-	m_A9 += m_A5 * f2_3;
-	RHS3 += f2_3 * RHS2;
-	V[3] = RHS3 / m_A9;
+	tmp3 += m_A10 * V[11];
+	tmp3 += m_A11 * V[15];
+	V[3] = (RHS3 - tmp3) / m_A9;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[3];
-	V[2] = (RHS2 - tmp2) / m_A4;
+	tmp2 += m_A7 * V[3];
+	tmp2 += m_A8 * V[15];
+	V[2] = (RHS2 - tmp2) / m_A6;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[3];
-	V[1] = (RHS1 - tmp1) / m_A2;
+	tmp1 += m_A4 * V[10];
+	tmp1 += m_A5 * V[15];
+	V[1] = (RHS1 - tmp1) / m_A3;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[3];
+	tmp0 += m_A1 * V[10];
+	tmp0 += m_A2 * V[14];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// kidniki
-static void nl_gcr_9701e2657a7f4ca3_37_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// popeye
+static void nl_gcr_c6f25bb06e161d1c_50_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -8488,216 +50623,305 @@
 	double m_A34(0.0);
 	double m_A35(0.0);
 	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
-	m_A0 += gt[3];
-	m_A2 += go[0];
-	m_A2 += go[1];
-	m_A1 += go[2];
+	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
-	RHS0 += Idr[3];
-	RHS0 -= go[3] * *cnV[3];
-	m_A3 += gt[4];
-	m_A3 += gt[5];
-	m_A3 += gt[6];
-	m_A5 += go[4];
-	m_A4 += go[5];
-	double RHS1 = Idr[4];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
 	RHS1 += Idr[5];
-	RHS1 += Idr[6];
-	RHS1 -= go[6] * *cnV[6];
-	m_A6 += gt[7];
-	m_A6 += gt[8];
-	m_A6 += gt[9];
-	m_A6 += gt[10];
-	m_A7 += go[7];
-	double RHS2 = Idr[7];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
 	RHS2 += Idr[8];
-	RHS2 += Idr[9];
-	RHS2 += Idr[10];
+	RHS2 -= go[7] * *cnV[7];
 	RHS2 -= go[8] * *cnV[8];
-	RHS2 -= go[9] * *cnV[9];
-	RHS2 -= go[10] * *cnV[10];
-	m_A8 += gt[11];
-	m_A8 += gt[12];
-	m_A8 += gt[13];
-	m_A8 += gt[14];
-	m_A11 += go[11];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A10 += go[9];
+	m_A7 += go[10];
+	m_A8 += go[11];
 	m_A9 += go[12];
-	m_A10 += go[13];
-	double RHS3 = Idr[11];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
 	RHS3 += Idr[12];
 	RHS3 += Idr[13];
 	RHS3 += Idr[14];
+	RHS3 -= go[13] * *cnV[13];
 	RHS3 -= go[14] * *cnV[14];
-	m_A14 += gt[15];
-	m_A14 += gt[16];
-	m_A14 += gt[17];
-	m_A14 += gt[18];
-	m_A14 += gt[19];
-	m_A14 += gt[20];
-	m_A14 += gt[21];
+	m_A11 += gt[15];
+	m_A11 += gt[16];
+	m_A11 += gt[17];
+	m_A11 += gt[18];
+	m_A11 += gt[19];
 	m_A13 += go[15];
-	m_A16 += go[16];
-	m_A16 += go[17];
-	m_A16 += go[18];
-	m_A12 += go[19];
+	m_A13 += go[16];
+	m_A12 += go[17];
 	double RHS4 = Idr[15];
 	RHS4 += Idr[16];
 	RHS4 += Idr[17];
 	RHS4 += Idr[18];
 	RHS4 += Idr[19];
-	RHS4 += Idr[20];
-	RHS4 += Idr[21];
-	RHS4 -= go[20] * *cnV[20];
-	RHS4 -= go[21] * *cnV[21];
-	m_A20 += gt[22];
-	m_A20 += gt[23];
-	m_A20 += gt[24];
-	m_A17 += go[22];
-	m_A18 += go[23];
-	double RHS5 = Idr[22];
+	RHS4 -= go[18] * *cnV[18];
+	RHS4 -= go[19] * *cnV[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A14 += gt[22];
+	m_A14 += gt[23];
+	m_A14 += gt[24];
+	m_A16 += go[20];
+	m_A15 += go[21];
+	m_A15 += go[22];
+	double RHS5 = Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
 	RHS5 += Idr[23];
 	RHS5 += Idr[24];
+	RHS5 -= go[23] * *cnV[23];
 	RHS5 -= go[24] * *cnV[24];
-	m_A24 += gt[25];
-	m_A24 += gt[26];
-	m_A24 += gt[27];
-	m_A25 += go[25];
-	m_A23 += go[26];
+	m_A19 += gt[25];
+	m_A19 += gt[26];
+	m_A19 += gt[27];
+	m_A18 += go[25];
+	m_A17 += go[26];
 	double RHS6 = Idr[25];
 	RHS6 += Idr[26];
 	RHS6 += Idr[27];
 	RHS6 -= go[27] * *cnV[27];
-	m_A30 += gt[28];
-	m_A30 += gt[29];
-	m_A30 += gt[30];
-	m_A30 += gt[31];
-	m_A30 += gt[32];
-	m_A30 += gt[33];
-	m_A27 += go[28];
-	m_A28 += go[29];
-	m_A28 += go[30];
-	m_A28 += go[31];
-	m_A26 += go[32];
-	m_A26 += go[33];
+	m_A26 += gt[28];
+	m_A26 += gt[29];
+	m_A26 += gt[30];
+	m_A24 += go[28];
+	m_A23 += go[29];
 	double RHS7 = Idr[28];
 	RHS7 += Idr[29];
 	RHS7 += Idr[30];
-	RHS7 += Idr[31];
-	RHS7 += Idr[32];
-	RHS7 += Idr[33];
-	m_A36 += gt[34];
-	m_A36 += gt[35];
-	m_A34 += go[34];
-	m_A32 += go[35];
-	double RHS8 = Idr[34];
-	RHS8 += Idr[35];
+	RHS7 -= go[30] * *cnV[30];
+	m_A33 += gt[31];
+	m_A33 += gt[32];
+	m_A33 += gt[33];
+	m_A30 += go[31];
+	m_A29 += go[32];
+	double RHS8 = Idr[31];
+	RHS8 += Idr[32];
+	RHS8 += Idr[33];
+	RHS8 -= go[33] * *cnV[33];
+	m_A40 += gt[34];
+	m_A40 += gt[35];
+	m_A40 += gt[36];
+	m_A40 += gt[37];
+	m_A36 += go[34];
+	m_A35 += go[35];
+	double RHS9 = Idr[34];
+	RHS9 += Idr[35];
+	RHS9 += Idr[36];
+	RHS9 += Idr[37];
+	RHS9 -= go[36] * *cnV[36];
+	RHS9 -= go[37] * *cnV[37];
+	m_A45 += gt[38];
+	m_A45 += gt[39];
+	m_A45 += gt[40];
+	m_A45 += gt[41];
+	m_A45 += gt[42];
+	m_A45 += gt[43];
+	m_A45 += gt[44];
+	m_A45 += gt[45];
+	m_A43 += go[38];
+	m_A43 += go[39];
+	m_A42 += go[40];
+	m_A42 += go[41];
+	double RHS10 = Idr[38];
+	RHS10 += Idr[39];
+	RHS10 += Idr[40];
+	RHS10 += Idr[41];
+	RHS10 += Idr[42];
+	RHS10 += Idr[43];
+	RHS10 += Idr[44];
+	RHS10 += Idr[45];
+	RHS10 -= go[42] * *cnV[42];
+	RHS10 -= go[43] * *cnV[43];
+	RHS10 -= go[44] * *cnV[44];
+	RHS10 -= go[45] * *cnV[45];
+	m_A49 += gt[46];
+	m_A49 += gt[47];
+	m_A47 += go[46];
+	double RHS11 = Idr[46];
+	RHS11 += Idr[47];
+	RHS11 -= go[47] * *cnV[47];
 	const double f0 = 1.0 / m_A0;
-	const double f0_4 = -f0 * m_A12;
-	m_A14 += m_A1 * f0_4;
-	m_A16 += m_A2 * f0_4;
-	RHS4 += f0_4 * RHS0;
-	const double f0_7 = -f0 * m_A26;
-	m_A28 += m_A1 * f0_7;
-	m_A30 += m_A2 * f0_7;
-	RHS7 += f0_7 * RHS0;
-	const double f1 = 1.0 / m_A3;
-	const double f1_4 = -f1 * m_A13;
-	m_A14 += m_A4 * f1_4;
-	m_A15 += m_A5 * f1_4;
-	RHS4 += f1_4 * RHS1;
-	const double f1_5 = -f1 * m_A17;
-	m_A19 += m_A4 * f1_5;
-	m_A20 += m_A5 * f1_5;
-	RHS5 += f1_5 * RHS1;
-	const double f2 = 1.0 / m_A6;
-	const double f2_6 = -f2 * m_A23;
-	m_A24 += m_A7 * f2_6;
+	const double f0_8 = -f0 * m_A29;
+	m_A33 += m_A1 * f0_8;
+	RHS8 += f0_8 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_7 = -f1 * m_A23;
+	m_A26 += m_A3 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_6 = -f2 * m_A17;
+	m_A19 += m_A5 * f2_6;
 	RHS6 += f2_6 * RHS2;
-	const double f3 = 1.0 / m_A8;
-	const double f3_5 = -f3 * m_A18;
-	m_A20 += m_A9 * f3_5;
-	m_A21 += m_A10 * f3_5;
-	m_A22 += m_A11 * f3_5;
-	RHS5 += f3_5 * RHS3;
-	const double f3_7 = -f3 * m_A27;
-	m_A29 += m_A9 * f3_7;
-	m_A30 += m_A10 * f3_7;
-	m_A31 += m_A11 * f3_7;
+	const double f3 = 1.0 / m_A6;
+	const double f3_6 = -f3 * m_A18;
+	m_A19 += m_A7 * f3_6;
+	m_A20 += m_A8 * f3_6;
+	m_A21 += m_A9 * f3_6;
+	m_A22 += m_A10 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f3_7 = -f3 * m_A24;
+	m_A25 += m_A7 * f3_7;
+	m_A26 += m_A8 * f3_7;
+	m_A27 += m_A9 * f3_7;
+	m_A28 += m_A10 * f3_7;
 	RHS7 += f3_7 * RHS3;
-	const double f3_8 = -f3 * m_A32;
+	const double f3_8 = -f3 * m_A30;
+	m_A31 += m_A7 * f3_8;
+	m_A32 += m_A8 * f3_8;
 	m_A33 += m_A9 * f3_8;
-	m_A35 += m_A10 * f3_8;
-	m_A36 += m_A11 * f3_8;
+	m_A34 += m_A10 * f3_8;
 	RHS8 += f3_8 * RHS3;
-	const double f4 = 1.0 / m_A14;
-	const double f4_5 = -f4 * m_A19;
-	m_A20 += m_A15 * f4_5;
-	m_A21 += m_A16 * f4_5;
-	RHS5 += f4_5 * RHS4;
-	const double f4_7 = -f4 * m_A28;
-	m_A29 += m_A15 * f4_7;
-	m_A30 += m_A16 * f4_7;
-	RHS7 += f4_7 * RHS4;
-	const double f5 = 1.0 / m_A20;
-	const double f5_7 = -f5 * m_A29;
-	m_A30 += m_A21 * f5_7;
-	m_A31 += m_A22 * f5_7;
-	RHS7 += f5_7 * RHS5;
-	const double f5_8 = -f5 * m_A33;
-	m_A35 += m_A21 * f5_8;
-	m_A36 += m_A22 * f5_8;
-	RHS8 += f5_8 * RHS5;
-	const double f6 = 1.0 / m_A24;
-	const double f6_8 = -f6 * m_A34;
-	m_A36 += m_A25 * f6_8;
-	RHS8 += f6_8 * RHS6;
-	const double f7 = 1.0 / m_A30;
-	const double f7_8 = -f7 * m_A35;
-	m_A36 += m_A31 * f7_8;
+	const double f3_9 = -f3 * m_A35;
+	m_A37 += m_A7 * f3_9;
+	m_A38 += m_A8 * f3_9;
+	m_A39 += m_A9 * f3_9;
+	m_A40 += m_A10 * f3_9;
+	RHS9 += f3_9 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_9 = -f4 * m_A36;
+	m_A40 += m_A12 * f4_9;
+	m_A41 += m_A13 * f4_9;
+	RHS9 += f4_9 * RHS4;
+	const double f4_10 = -f4 * m_A42;
+	m_A44 += m_A12 * f4_10;
+	m_A45 += m_A13 * f4_10;
+	RHS10 += f4_10 * RHS4;
+	const double f5 = 1.0 / m_A14;
+	const double f5_10 = -f5 * m_A43;
+	m_A45 += m_A15 * f5_10;
+	m_A46 += m_A16 * f5_10;
+	RHS10 += f5_10 * RHS5;
+	const double f5_11 = -f5 * m_A47;
+	m_A48 += m_A15 * f5_11;
+	m_A49 += m_A16 * f5_11;
+	RHS11 += f5_11 * RHS5;
+	const double f6 = 1.0 / m_A19;
+	const double f6_7 = -f6 * m_A25;
+	m_A26 += m_A20 * f6_7;
+	m_A27 += m_A21 * f6_7;
+	m_A28 += m_A22 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	const double f6_8 = -f6 * m_A31;
+	m_A32 += m_A20 * f6_8;
+	m_A33 += m_A21 * f6_8;
+	m_A34 += m_A22 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f6_9 = -f6 * m_A37;
+	m_A38 += m_A20 * f6_9;
+	m_A39 += m_A21 * f6_9;
+	m_A40 += m_A22 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f7 = 1.0 / m_A26;
+	const double f7_8 = -f7 * m_A32;
+	m_A33 += m_A27 * f7_8;
+	m_A34 += m_A28 * f7_8;
 	RHS8 += f7_8 * RHS7;
-	V[8] = RHS8 / m_A36;
+	const double f7_9 = -f7 * m_A38;
+	m_A39 += m_A27 * f7_9;
+	m_A40 += m_A28 * f7_9;
+	RHS9 += f7_9 * RHS7;
+	const double f8 = 1.0 / m_A33;
+	const double f8_9 = -f8 * m_A39;
+	m_A40 += m_A34 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	const double f9 = 1.0 / m_A40;
+	const double f9_10 = -f9 * m_A44;
+	m_A45 += m_A41 * f9_10;
+	RHS10 += f9_10 * RHS9;
+	const double f10 = 1.0 / m_A45;
+	const double f10_11 = -f10 * m_A48;
+	m_A49 += m_A46 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	V[11] = RHS11 / m_A49;
+	double tmp10 = 0.0;
+	tmp10 += m_A46 * V[11];
+	V[10] = (RHS10 - tmp10) / m_A45;
+	double tmp9 = 0.0;
+	tmp9 += m_A41 * V[10];
+	V[9] = (RHS9 - tmp9) / m_A40;
+	double tmp8 = 0.0;
+	tmp8 += m_A34 * V[9];
+	V[8] = (RHS8 - tmp8) / m_A33;
 	double tmp7 = 0.0;
-	tmp7 += m_A31 * V[8];
-	V[7] = (RHS7 - tmp7) / m_A30;
+	tmp7 += m_A27 * V[8];
+	tmp7 += m_A28 * V[9];
+	V[7] = (RHS7 - tmp7) / m_A26;
 	double tmp6 = 0.0;
-	tmp6 += m_A25 * V[8];
-	V[6] = (RHS6 - tmp6) / m_A24;
+	tmp6 += m_A20 * V[7];
+	tmp6 += m_A21 * V[8];
+	tmp6 += m_A22 * V[9];
+	V[6] = (RHS6 - tmp6) / m_A19;
 	double tmp5 = 0.0;
-	tmp5 += m_A21 * V[7];
-	tmp5 += m_A22 * V[8];
-	V[5] = (RHS5 - tmp5) / m_A20;
+	tmp5 += m_A15 * V[10];
+	tmp5 += m_A16 * V[11];
+	V[5] = (RHS5 - tmp5) / m_A14;
 	double tmp4 = 0.0;
-	tmp4 += m_A15 * V[5];
-	tmp4 += m_A16 * V[7];
-	V[4] = (RHS4 - tmp4) / m_A14;
+	tmp4 += m_A12 * V[9];
+	tmp4 += m_A13 * V[10];
+	V[4] = (RHS4 - tmp4) / m_A11;
 	double tmp3 = 0.0;
-	tmp3 += m_A9 * V[5];
-	tmp3 += m_A10 * V[7];
-	tmp3 += m_A11 * V[8];
-	V[3] = (RHS3 - tmp3) / m_A8;
+	tmp3 += m_A7 * V[6];
+	tmp3 += m_A8 * V[7];
+	tmp3 += m_A9 * V[8];
+	tmp3 += m_A10 * V[9];
+	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A7 * V[6];
-	V[2] = (RHS2 - tmp2) / m_A6;
+	tmp2 += m_A5 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A4 * V[4];
-	tmp1 += m_A5 * V[5];
-	V[1] = (RHS1 - tmp1) / m_A3;
+	tmp1 += m_A3 * V[7];
+	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[4];
-	tmp0 += m_A2 * V[7];
+	tmp0 += m_A1 * V[8];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// cocoloco
-static void nl_gcr_97d556b480d72ab7_16_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// flyball
+static void nl_gcr_c74b1a65978d7121_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -8705,15 +50929,6 @@
 	double m_A4(0.0);
 	double m_A5(0.0);
 	double m_A6(0.0);
-	double m_A7(0.0);
-	double m_A8(0.0);
-	double m_A9(0.0);
-	double m_A10(0.0);
-	double m_A11(0.0);
-	double m_A12(0.0);
-	double m_A13(0.0);
-	double m_A14(0.0);
-	double m_A15(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A1 += go[0];
@@ -8726,82 +50941,201 @@
 	double RHS1 = Idr[2];
 	RHS1 += Idr[3];
 	RHS1 -= go[3] * *cnV[3];
-	m_A4 += gt[4];
-	m_A4 += gt[5];
+	m_A6 += gt[4];
+	m_A6 += gt[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
 	m_A5 += go[4];
+	m_A4 += go[5];
 	double RHS2 = Idr[4];
 	RHS2 += Idr[5];
-	RHS2 -= go[5] * *cnV[5];
-	m_A6 += gt[6];
-	m_A6 += gt[7];
-	m_A7 += go[6];
-	double RHS3 = Idr[6];
-	RHS3 += Idr[7];
-	RHS3 -= go[7] * *cnV[7];
-	m_A9 += gt[8];
-	m_A9 += gt[9];
-	m_A9 += gt[10];
-	m_A8 += go[8];
-	m_A10 += go[9];
-	double RHS4 = Idr[8];
-	RHS4 += Idr[9];
-	RHS4 += Idr[10];
-	RHS4 -= go[10] * *cnV[10];
-	m_A15 += gt[11];
-	m_A15 += gt[12];
-	m_A15 += gt[13];
-	m_A15 += gt[14];
-	m_A14 += go[11];
-	m_A13 += go[12];
-	m_A12 += go[13];
-	m_A11 += go[14];
-	double RHS5 = Idr[11];
-	RHS5 += Idr[12];
-	RHS5 += Idr[13];
-	RHS5 += Idr[14];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[6] * *cnV[6];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
 	const double f0 = 1.0 / m_A0;
-	const double f0_5 = -f0 * m_A11;
-	m_A15 += m_A1 * f0_5;
-	RHS5 += f0_5 * RHS0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// stuntcyc
+static void nl_gcr_c924fe5960b1479e_20_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A3 += go[5];
+	double RHS1 = Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A4 += gt[12];
+	m_A6 += go[8];
+	m_A5 += go[9];
+	double RHS2 = Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A8 += gt[18];
+	m_A8 += gt[19];
+	m_A10 += go[13];
+	m_A9 += go[14];
+	m_A7 += go[15];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 -= go[16] * *cnV[16];
+	RHS3 -= go[17] * *cnV[17];
+	RHS3 -= go[18] * *cnV[18];
+	RHS3 -= go[19] * *cnV[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A14 += gt[22];
+	m_A14 += gt[23];
+	m_A12 += go[20];
+	m_A11 += go[21];
+	m_A13 += go[22];
+	double RHS4 = Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 -= go[23] * *cnV[23];
+	m_A19 += gt[24];
+	m_A19 += gt[25];
+	m_A19 += gt[26];
+	m_A16 += go[24];
+	m_A17 += go[25];
+	double RHS5 = Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 -= go[26] * *cnV[26];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A7;
+	m_A8 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_5 = -f1 * m_A12;
-	m_A15 += m_A3 * f1_5;
-	RHS5 += f1_5 * RHS1;
+	const double f1_4 = -f1 * m_A11;
+	m_A14 += m_A3 * f1_4;
+	RHS4 += f1_4 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_4 = -f2 * m_A8;
-	m_A9 += m_A5 * f2_4;
+	const double f2_4 = -f2 * m_A12;
+	m_A14 += m_A5 * f2_4;
+	m_A15 += m_A6 * f2_4;
 	RHS4 += f2_4 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_5 = -f3 * m_A13;
-	m_A15 += m_A7 * f3_5;
+	const double f2_5 = -f2 * m_A16;
+	m_A18 += m_A5 * f2_5;
+	m_A19 += m_A6 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_4 = -f3 * m_A13;
+	m_A14 += m_A9 * f3_4;
+	m_A15 += m_A10 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f3_5 = -f3 * m_A17;
+	m_A18 += m_A9 * f3_5;
+	m_A19 += m_A10 * f3_5;
 	RHS5 += f3_5 * RHS3;
-	const double f4 = 1.0 / m_A9;
-	const double f4_5 = -f4 * m_A14;
-	m_A15 += m_A10 * f4_5;
+	const double f4 = 1.0 / m_A14;
+	const double f4_5 = -f4 * m_A18;
+	m_A19 += m_A15 * f4_5;
 	RHS5 += f4_5 * RHS4;
-	V[5] = RHS5 / m_A15;
+	V[5] = RHS5 / m_A19;
 	double tmp4 = 0.0;
-	tmp4 += m_A10 * V[5];
-	V[4] = (RHS4 - tmp4) / m_A9;
+	tmp4 += m_A15 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A14;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[5];
-	V[3] = (RHS3 - tmp3) / m_A6;
+	tmp3 += m_A9 * V[4];
+	tmp3 += m_A10 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A8;
 	double tmp2 = 0.0;
 	tmp2 += m_A5 * V[4];
+	tmp2 += m_A6 * V[5];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[5];
+	tmp1 += m_A3 * V[4];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[5];
+	tmp0 += m_A1 * V[3];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// zac1b11142
-static void nl_gcr_988a81edfbe45655_30_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// dpatrol
+static void nl_gcr_ca68d70bd8f2f62e_22_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -8824,205 +51158,134 @@
 	double m_A19(0.0);
 	double m_A20(0.0);
 	double m_A21(0.0);
-	double m_A22(0.0);
-	double m_A23(0.0);
-	double m_A24(0.0);
-	double m_A25(0.0);
-	double m_A26(0.0);
-	double m_A27(0.0);
-	double m_A28(0.0);
-	double m_A29(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
 	m_A0 += gt[3];
-	m_A0 += gt[4];
-	m_A0 += gt[5];
-	m_A0 += gt[6];
-	m_A1 += go[0];
+	m_A2 += go[0];
+	m_A2 += go[1];
+	m_A1 += go[2];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
 	RHS0 += Idr[3];
-	RHS0 += Idr[4];
-	RHS0 += Idr[5];
-	RHS0 += Idr[6];
-	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
 	RHS0 -= go[3] * *cnV[3];
-	RHS0 -= go[4] * *cnV[4];
-	RHS0 -= go[5] * *cnV[5];
-	RHS0 -= go[6] * *cnV[6];
-	m_A2 += gt[7];
-	m_A2 += gt[8];
-	m_A2 += gt[9];
-	m_A3 += go[7];
-	double RHS1 = Idr[7];
-	RHS1 += Idr[8];
-	RHS1 += Idr[9];
-	RHS1 -= go[8] * *cnV[8];
-	RHS1 -= go[9] * *cnV[9];
-	m_A4 += gt[10];
-	m_A4 += gt[11];
-	m_A5 += go[10];
-	double RHS2 = Idr[10];
-	RHS2 += Idr[11];
-	RHS2 -= go[11] * *cnV[11];
-	m_A6 += gt[12];
-	m_A6 += gt[13];
-	m_A6 += gt[14];
-	m_A7 += go[12];
-	double RHS3 = Idr[12];
+	m_A3 += gt[4];
+	m_A3 += gt[5];
+	m_A3 += gt[6];
+	m_A3 += gt[7];
+	m_A5 += go[4];
+	m_A5 += go[5];
+	m_A4 += go[6];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 -= go[7] * *cnV[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A7 += go[8];
+	double RHS2 = Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
+	m_A10 += gt[11];
+	m_A10 += gt[12];
+	m_A10 += gt[13];
+	m_A12 += go[11];
+	m_A9 += go[12];
+	m_A8 += go[13];
+	double RHS3 = Idr[11];
+	RHS3 += Idr[12];
 	RHS3 += Idr[13];
-	RHS3 += Idr[14];
-	RHS3 -= go[13] * *cnV[13];
-	RHS3 -= go[14] * *cnV[14];
-	m_A8 += gt[15];
-	m_A8 += gt[16];
-	m_A8 += gt[17];
-	m_A9 += go[15];
-	double RHS4 = Idr[15];
-	RHS4 += Idr[16];
-	RHS4 += Idr[17];
-	RHS4 -= go[16] * *cnV[16];
-	RHS4 -= go[17] * *cnV[17];
-	m_A11 += gt[18];
-	m_A11 += gt[19];
-	m_A11 += gt[20];
-	m_A11 += gt[21];
-	m_A11 += gt[22];
-	m_A11 += gt[23];
-	m_A10 += go[18];
-	m_A12 += go[19];
-	m_A12 += go[20];
-	double RHS5 = Idr[18];
-	RHS5 += Idr[19];
-	RHS5 += Idr[20];
-	RHS5 += Idr[21];
-	RHS5 += Idr[22];
-	RHS5 += Idr[23];
-	RHS5 -= go[21] * *cnV[21];
-	RHS5 -= go[22] * *cnV[22];
-	RHS5 -= go[23] * *cnV[23];
-	m_A16 += gt[24];
-	m_A16 += gt[25];
-	m_A15 += go[24];
-	m_A14 += go[25];
-	double RHS6 = Idr[24];
-	RHS6 += Idr[25];
-	m_A18 += gt[26];
-	m_A18 += gt[27];
-	m_A19 += go[26];
-	m_A17 += go[27];
-	double RHS7 = Idr[26];
-	RHS7 += Idr[27];
-	m_A25 += gt[28];
-	m_A25 += gt[29];
-	m_A25 += gt[30];
-	m_A25 += gt[31];
-	m_A25 += gt[32];
-	m_A25 += gt[33];
-	m_A23 += go[28];
-	m_A22 += go[29];
-	m_A22 += go[30];
-	m_A24 += go[31];
-	m_A21 += go[32];
-	m_A20 += go[33];
-	double RHS8 = Idr[28];
-	RHS8 += Idr[29];
-	RHS8 += Idr[30];
-	RHS8 += Idr[31];
-	RHS8 += Idr[32];
-	RHS8 += Idr[33];
-	m_A29 += gt[34];
-	m_A29 += gt[35];
-	m_A29 += gt[36];
-	m_A29 += gt[37];
-	m_A28 += go[34];
-	m_A27 += go[35];
-	double RHS9 = Idr[34];
-	RHS9 += Idr[35];
-	RHS9 += Idr[36];
-	RHS9 += Idr[37];
-	RHS9 -= go[36] * *cnV[36];
-	RHS9 -= go[37] * *cnV[37];
-	const double f0 = 1.0 / m_A0;
-	const double f0_5 = -f0 * m_A10;
-	m_A13 += m_A1 * f0_5;
-	RHS5 += f0_5 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_7 = -f1 * m_A17;
-	m_A18 += m_A3 * f1_7;
-	RHS7 += f1_7 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_6 = -f2 * m_A14;
-	m_A16 += m_A5 * f2_6;
-	RHS6 += f2_6 * RHS2;
-	const double f2_8 = -f2 * m_A20;
-	m_A23 += m_A5 * f2_8;
-	RHS8 += f2_8 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_6 = -f3 * m_A15;
-	m_A16 += m_A7 * f3_6;
-	RHS6 += f3_6 * RHS3;
-	const double f4 = 1.0 / m_A8;
-	const double f4_8 = -f4 * m_A21;
-	m_A25 += m_A9 * f4_8;
-	RHS8 += f4_8 * RHS4;
-	const double f4_9 = -f4 * m_A27;
-	m_A28 += m_A9 * f4_9;
-	RHS9 += f4_9 * RHS4;
-	const double f5 = 1.0 / m_A11;
-	const double f5_8 = -f5 * m_A22;
-	m_A25 += m_A12 * f5_8;
-	m_A26 += m_A13 * f5_8;
-	RHS8 += f5_8 * RHS5;
-	const double f6 = 1.0 / m_A16;
-	const double f6_8 = -f6 * m_A23;
-	RHS8 += f6_8 * RHS6;
-	const double f7 = 1.0 / m_A18;
-	const double f7_8 = -f7 * m_A24;
-	m_A25 += m_A19 * f7_8;
-	RHS8 += f7_8 * RHS7;
-	const double f8 = 1.0 / m_A25;
-	const double f8_9 = -f8 * m_A28;
-	m_A29 += m_A26 * f8_9;
-	RHS9 += f8_9 * RHS8;
-	V[9] = RHS9 / m_A29;
-	double tmp8 = 0.0;
-	tmp8 += m_A26 * V[9];
-	V[8] = (RHS8 - tmp8) / m_A25;
-	double tmp7 = 0.0;
-	tmp7 += m_A19 * V[8];
-	V[7] = (RHS7 - tmp7) / m_A18;
-	double tmp6 = 0.0;
-	V[6] = (RHS6 - tmp6) / m_A16;
-	double tmp5 = 0.0;
-	tmp5 += m_A12 * V[8];
-	tmp5 += m_A13 * V[9];
-	V[5] = (RHS5 - tmp5) / m_A11;
+	m_A16 += gt[14];
+	m_A16 += gt[15];
+	m_A16 += gt[16];
+	m_A16 += gt[17];
+	m_A16 += gt[18];
+	m_A17 += go[14];
+	m_A14 += go[15];
+	m_A14 += go[16];
+	m_A13 += go[17];
+	m_A13 += go[18];
+	double RHS4 = Idr[14];
+	RHS4 += Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	m_A21 += gt[19];
+	m_A21 += gt[20];
+	m_A21 += gt[21];
+	m_A18 += go[19];
+	m_A20 += go[20];
+	m_A19 += go[21];
+	double RHS5 = Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A10 += m_A1 * f0_3;
+	m_A11 += m_A2 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f0_4 = -f0 * m_A13;
+	m_A15 += m_A1 * f0_4;
+	m_A16 += m_A2 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A4 * f1_3;
+	m_A11 += m_A5 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f1_4 = -f1 * m_A14;
+	m_A15 += m_A4 * f1_4;
+	m_A16 += m_A5 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_5 = -f2 * m_A18;
+	m_A21 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_4 = -f3 * m_A15;
+	m_A16 += m_A11 * f3_4;
+	m_A17 += m_A12 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f3_5 = -f3 * m_A19;
+	m_A20 += m_A11 * f3_5;
+	m_A21 += m_A12 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A16;
+	const double f4_5 = -f4 * m_A20;
+	m_A21 += m_A17 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A21;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[8];
-	V[4] = (RHS4 - tmp4) / m_A8;
+	tmp4 += m_A17 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A16;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[6];
-	V[3] = (RHS3 - tmp3) / m_A6;
+	tmp3 += m_A11 * V[4];
+	tmp3 += m_A12 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A10;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[6];
-	V[2] = (RHS2 - tmp2) / m_A4;
+	tmp2 += m_A7 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A6;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[7];
-	V[1] = (RHS1 - tmp1) / m_A2;
+	tmp1 += m_A4 * V[3];
+	tmp1 += m_A5 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A3;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[9];
+	tmp0 += m_A1 * V[3];
+	tmp0 += m_A2 * V[4];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// tp1985
-static void nl_gcr_99e69c1880e516a7_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// breakout
+static void nl_gcr_cb2aae3366e0ac1c_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -9030,9 +51293,6 @@
 	double m_A4(0.0);
 	double m_A5(0.0);
 	double m_A6(0.0);
-	double m_A7(0.0);
-	double m_A8(0.0);
-	double m_A9(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
@@ -9051,47 +51311,35 @@
 	RHS1 += Idr[5];
 	RHS1 -= go[4] * *cnV[4];
 	RHS1 -= go[5] * *cnV[5];
-	m_A5 += gt[6];
-	m_A5 += gt[7];
-	m_A6 += go[6];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A5 += go[6];
 	m_A4 += go[7];
 	double RHS2 = Idr[6];
 	RHS2 += Idr[7];
-	m_A9 += gt[8];
-	m_A9 += gt[9];
-	m_A7 += go[8];
-	m_A8 += go[9];
-	double RHS3 = Idr[8];
-	RHS3 += Idr[9];
 	const double f0 = 1.0 / m_A0;
 	const double f0_2 = -f0 * m_A4;
-	m_A5 += m_A1 * f0_2;
+	m_A6 += m_A1 * f0_2;
 	RHS2 += f0_2 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_3 = -f1 * m_A7;
-	m_A9 += m_A3 * f1_3;
-	RHS3 += f1_3 * RHS1;
-	const double f2 = 1.0 / m_A5;
-	const double f2_3 = -f2 * m_A8;
-	m_A9 += m_A6 * f2_3;
-	RHS3 += f2_3 * RHS2;
-	V[3] = RHS3 / m_A9;
-	double tmp2 = 0.0;
-	tmp2 += m_A6 * V[3];
-	V[2] = (RHS2 - tmp2) / m_A5;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[3];
+	tmp1 += m_A3 * V[2];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
 	tmp0 += m_A1 * V[2];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// tp1985
-static void nl_gcr_a1806410e32baeb_26_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// barrier
+static void nl_gcr_cc913f9c3f9293e7_19_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -9111,157 +51359,127 @@
 	double m_A16(0.0);
 	double m_A17(0.0);
 	double m_A18(0.0);
-	double m_A19(0.0);
-	double m_A20(0.0);
-	double m_A21(0.0);
-	double m_A22(0.0);
-	double m_A23(0.0);
-	double m_A24(0.0);
-	double m_A25(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A1 += go[0];
-	m_A2 += go[1];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
-	m_A3 += gt[2];
-	m_A3 += gt[3];
-	m_A3 += gt[4];
-	m_A4 += go[2];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A3 += go[2];
+	m_A4 += go[3];
 	double RHS1 = Idr[2];
 	RHS1 += Idr[3];
 	RHS1 += Idr[4];
-	RHS1 -= go[3] * *cnV[3];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
 	RHS1 -= go[4] * *cnV[4];
-	m_A5 += gt[5];
-	m_A5 += gt[6];
-	m_A5 += gt[7];
-	m_A6 += go[5];
-	double RHS2 = Idr[5];
-	RHS2 += Idr[6];
-	RHS2 += Idr[7];
-	RHS2 -= go[6] * *cnV[6];
-	RHS2 -= go[7] * *cnV[7];
-	m_A7 += gt[8];
-	m_A7 += gt[9];
-	m_A8 += go[8];
-	double RHS3 = Idr[8];
-	RHS3 += Idr[9];
-	RHS3 -= go[9] * *cnV[9];
-	m_A10 += gt[10];
-	m_A10 += gt[11];
-	m_A10 += gt[12];
-	m_A10 += gt[13];
-	m_A11 += go[10];
-	m_A9 += go[11];
-	double RHS4 = Idr[10];
-	RHS4 += Idr[11];
-	RHS4 += Idr[12];
-	RHS4 += Idr[13];
-	RHS4 -= go[12] * *cnV[12];
-	RHS4 -= go[13] * *cnV[13];
-	m_A14 += gt[14];
-	m_A14 += gt[15];
-	m_A13 += go[14];
-	m_A15 += go[15];
-	double RHS5 = Idr[14];
-	RHS5 += Idr[15];
-	m_A19 += gt[16];
-	m_A19 += gt[17];
-	m_A19 += gt[18];
-	m_A19 += gt[19];
-	m_A17 += go[16];
-	m_A16 += go[17];
-	m_A18 += go[18];
-	m_A20 += go[19];
-	double RHS6 = Idr[16];
-	RHS6 += Idr[17];
-	RHS6 += Idr[18];
-	RHS6 += Idr[19];
-	m_A25 += gt[20];
-	m_A25 += gt[21];
-	m_A25 += gt[22];
-	m_A25 += gt[23];
-	m_A25 += gt[24];
-	m_A23 += go[20];
-	m_A24 += go[21];
-	m_A21 += go[22];
-	double RHS7 = Idr[20];
-	RHS7 += Idr[21];
-	RHS7 += Idr[22];
-	RHS7 += Idr[23];
-	RHS7 += Idr[24];
-	RHS7 -= go[23] * *cnV[23];
-	RHS7 -= go[24] * *cnV[24];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	m_A5 += gt[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A7 += go[9];
+	m_A6 += go[10];
+	double RHS2 = Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[11] * *cnV[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A9 += go[12];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 -= go[13] * *cnV[13];
+	m_A12 += gt[14];
+	m_A12 += gt[15];
+	m_A12 += gt[16];
+	m_A11 += go[14];
+	m_A10 += go[15];
+	double RHS4 = Idr[14];
+	RHS4 += Idr[15];
+	RHS4 += Idr[16];
+	RHS4 -= go[16] * *cnV[16];
+	m_A18 += gt[17];
+	m_A18 += gt[18];
+	m_A18 += gt[19];
+	m_A18 += gt[20];
+	m_A18 += gt[21];
+	m_A18 += gt[22];
+	m_A14 += go[17];
+	m_A16 += go[18];
+	m_A15 += go[19];
+	double RHS5 = Idr[17];
+	RHS5 += Idr[18];
+	RHS5 += Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 -= go[20] * *cnV[20];
+	RHS5 -= go[21] * *cnV[21];
+	RHS5 -= go[22] * *cnV[22];
 	const double f0 = 1.0 / m_A0;
-	const double f0_4 = -f0 * m_A9;
-	m_A10 += m_A1 * f0_4;
-	m_A12 += m_A2 * f0_4;
+	const double f0_4 = -f0 * m_A10;
+	m_A12 += m_A1 * f0_4;
 	RHS4 += f0_4 * RHS0;
-	const double f0_7 = -f0 * m_A21;
-	m_A22 += m_A1 * f0_7;
-	m_A25 += m_A2 * f0_7;
-	RHS7 += f0_7 * RHS0;
-	const double f1 = 1.0 / m_A3;
-	const double f1_6 = -f1 * m_A16;
-	m_A19 += m_A4 * f1_6;
-	RHS6 += f1_6 * RHS1;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A14;
+	m_A15 += m_A3 * f1_5;
+	m_A17 += m_A4 * f1_5;
+	RHS5 += f1_5 * RHS1;
 	const double f2 = 1.0 / m_A5;
-	const double f2_6 = -f2 * m_A17;
-	m_A19 += m_A6 * f2_6;
-	RHS6 += f2_6 * RHS2;
-	const double f3 = 1.0 / m_A7;
-	const double f3_5 = -f3 * m_A13;
-	m_A14 += m_A8 * f3_5;
+	const double f2_4 = -f2 * m_A11;
+	m_A12 += m_A6 * f2_4;
+	m_A13 += m_A7 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_5 = -f2 * m_A15;
+	m_A17 += m_A6 * f2_5;
+	m_A18 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_5 = -f3 * m_A16;
+	m_A18 += m_A9 * f3_5;
 	RHS5 += f3_5 * RHS3;
-	const double f4 = 1.0 / m_A10;
-	const double f4_6 = -f4 * m_A18;
-	m_A19 += m_A11 * f4_6;
-	m_A20 += m_A12 * f4_6;
-	RHS6 += f4_6 * RHS4;
-	const double f4_7 = -f4 * m_A22;
-	m_A24 += m_A11 * f4_7;
-	m_A25 += m_A12 * f4_7;
-	RHS7 += f4_7 * RHS4;
-	const double f5 = 1.0 / m_A14;
-	const double f5_7 = -f5 * m_A23;
-	m_A25 += m_A15 * f5_7;
-	RHS7 += f5_7 * RHS5;
-	const double f6 = 1.0 / m_A19;
-	const double f6_7 = -f6 * m_A24;
-	m_A25 += m_A20 * f6_7;
-	RHS7 += f6_7 * RHS6;
-	V[7] = RHS7 / m_A25;
-	double tmp6 = 0.0;
-	tmp6 += m_A20 * V[7];
-	V[6] = (RHS6 - tmp6) / m_A19;
-	double tmp5 = 0.0;
-	tmp5 += m_A15 * V[7];
-	V[5] = (RHS5 - tmp5) / m_A14;
+	const double f4 = 1.0 / m_A12;
+	const double f4_5 = -f4 * m_A17;
+	m_A18 += m_A13 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A18;
 	double tmp4 = 0.0;
-	tmp4 += m_A11 * V[6];
-	tmp4 += m_A12 * V[7];
-	V[4] = (RHS4 - tmp4) / m_A10;
+	tmp4 += m_A13 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A12;
 	double tmp3 = 0.0;
-	tmp3 += m_A8 * V[5];
-	V[3] = (RHS3 - tmp3) / m_A7;
+	tmp3 += m_A9 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A8;
 	double tmp2 = 0.0;
-	tmp2 += m_A6 * V[6];
+	tmp2 += m_A6 * V[4];
+	tmp2 += m_A7 * V[5];
 	V[2] = (RHS2 - tmp2) / m_A5;
 	double tmp1 = 0.0;
-	tmp1 += m_A4 * V[6];
-	V[1] = (RHS1 - tmp1) / m_A3;
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
 	tmp0 += m_A1 * V[4];
-	tmp0 += m_A2 * V[7];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// gunfight
-static void nl_gcr_a479712c277f2ba4_108_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// fireone
+static void nl_gcr_cca3d1a4219e2ec0_153_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -9370,610 +51588,911 @@
 	double m_A105(0.0);
 	double m_A106(0.0);
 	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
 	RHS0 -= go[1] * *cnV[1];
-	m_A2 += gt[2];
-	m_A2 += gt[3];
-	m_A3 += go[2];
-	double RHS1 = Idr[2];
-	RHS1 += Idr[3];
-	RHS1 -= go[3] * *cnV[3];
-	m_A4 += gt[4];
-	m_A4 += gt[5];
-	m_A5 += go[4];
-	double RHS2 = Idr[4];
-	RHS2 += Idr[5];
-	RHS2 -= go[5] * *cnV[5];
-	m_A6 += gt[6];
-	m_A6 += gt[7];
-	m_A7 += go[6];
-	double RHS3 = Idr[6];
-	RHS3 += Idr[7];
-	RHS3 -= go[7] * *cnV[7];
-	m_A8 += gt[8];
-	m_A8 += gt[9];
-	m_A9 += go[8];
-	double RHS4 = Idr[8];
-	RHS4 += Idr[9];
-	RHS4 -= go[9] * *cnV[9];
-	m_A10 += gt[10];
-	m_A10 += gt[11];
-	m_A10 += gt[12];
-	m_A10 += gt[13];
-	m_A11 += go[10];
-	m_A12 += go[11];
-	double RHS5 = Idr[10];
-	RHS5 += Idr[11];
-	RHS5 += Idr[12];
-	RHS5 += Idr[13];
-	RHS5 -= go[12] * *cnV[12];
-	RHS5 -= go[13] * *cnV[13];
-	m_A13 += gt[14];
-	m_A13 += gt[15];
-	m_A15 += go[14];
-	m_A14 += go[15];
-	double RHS6 = Idr[14];
-	RHS6 += Idr[15];
-	m_A16 += gt[16];
-	m_A16 += gt[17];
-	m_A18 += go[16];
-	m_A17 += go[17];
-	double RHS7 = Idr[16];
-	RHS7 += Idr[17];
-	m_A20 += gt[18];
-	m_A20 += gt[19];
-	m_A20 += gt[20];
-	m_A19 += go[18];
-	m_A21 += go[19];
-	double RHS8 = Idr[18];
-	RHS8 += Idr[19];
-	RHS8 += Idr[20];
-	RHS8 -= go[20] * *cnV[20];
-	m_A24 += gt[21];
-	m_A24 += gt[22];
-	m_A24 += gt[23];
-	m_A23 += go[21];
-	m_A25 += go[22];
-	double RHS9 = Idr[21];
-	RHS9 += Idr[22];
-	RHS9 += Idr[23];
-	RHS9 -= go[23] * *cnV[23];
-	m_A28 += gt[24];
-	m_A28 += gt[25];
-	m_A28 += gt[26];
-	m_A27 += go[24];
-	m_A30 += go[25];
-	double RHS10 = Idr[24];
-	RHS10 += Idr[25];
-	RHS10 += Idr[26];
-	RHS10 -= go[26] * *cnV[26];
-	m_A32 += gt[27];
-	m_A32 += gt[28];
-	m_A32 += gt[29];
-	m_A31 += go[27];
-	m_A33 += go[28];
-	double RHS11 = Idr[27];
-	RHS11 += Idr[28];
-	RHS11 += Idr[29];
-	RHS11 -= go[29] * *cnV[29];
-	m_A35 += gt[30];
-	m_A35 += gt[31];
-	m_A35 += gt[32];
-	m_A35 += gt[33];
-	m_A37 += go[30];
-	m_A36 += go[31];
-	double RHS12 = Idr[30];
-	RHS12 += Idr[31];
-	RHS12 += Idr[32];
-	RHS12 += Idr[33];
-	RHS12 -= go[32] * *cnV[32];
-	RHS12 -= go[33] * *cnV[33];
-	m_A38 += gt[34];
-	m_A38 += gt[35];
-	m_A38 += gt[36];
-	m_A40 += go[34];
-	m_A39 += go[35];
-	double RHS13 = Idr[34];
-	RHS13 += Idr[35];
-	RHS13 += Idr[36];
-	RHS13 -= go[36] * *cnV[36];
-	m_A41 += gt[37];
-	m_A41 += gt[38];
-	m_A41 += gt[39];
-	m_A43 += go[37];
-	m_A42 += go[38];
-	double RHS14 = Idr[37];
-	RHS14 += Idr[38];
-	RHS14 += Idr[39];
-	RHS14 -= go[39] * *cnV[39];
-	m_A44 += gt[40];
-	m_A44 += gt[41];
-	m_A44 += gt[42];
-	m_A46 += go[40];
-	m_A45 += go[41];
-	double RHS15 = Idr[40];
-	RHS15 += Idr[41];
-	RHS15 += Idr[42];
-	RHS15 -= go[42] * *cnV[42];
-	m_A49 += gt[43];
-	m_A49 += gt[44];
-	m_A47 += go[43];
-	m_A48 += go[44];
-	double RHS16 = Idr[43];
-	RHS16 += Idr[44];
-	m_A53 += gt[45];
-	m_A53 += gt[46];
-	m_A51 += go[45];
-	m_A52 += go[46];
-	double RHS17 = Idr[45];
-	RHS17 += Idr[46];
-	m_A56 += gt[47];
-	m_A56 += gt[48];
-	m_A56 += gt[49];
-	m_A55 += go[47];
-	m_A57 += go[48];
-	double RHS18 = Idr[47];
-	RHS18 += Idr[48];
-	RHS18 += Idr[49];
-	RHS18 -= go[49] * *cnV[49];
-	m_A59 += gt[50];
-	m_A59 += gt[51];
-	m_A58 += go[50];
-	m_A60 += go[51];
-	double RHS19 = Idr[50];
-	RHS19 += Idr[51];
-	m_A62 += gt[52];
-	m_A62 += gt[53];
-	m_A62 += gt[54];
-	m_A62 += gt[55];
-	m_A64 += go[52];
-	m_A63 += go[53];
-	m_A61 += go[54];
-	double RHS20 = Idr[52];
-	RHS20 += Idr[53];
-	RHS20 += Idr[54];
-	RHS20 += Idr[55];
-	RHS20 -= go[55] * *cnV[55];
-	m_A67 += gt[56];
-	m_A67 += gt[57];
-	m_A67 += gt[58];
-	m_A67 += gt[59];
-	m_A66 += go[56];
-	m_A65 += go[57];
-	m_A68 += go[58];
-	double RHS21 = Idr[56];
-	RHS21 += Idr[57];
-	RHS21 += Idr[58];
-	RHS21 += Idr[59];
-	RHS21 -= go[59] * *cnV[59];
-	m_A70 += gt[60];
-	m_A70 += gt[61];
-	m_A70 += gt[62];
-	m_A70 += gt[63];
-	m_A72 += go[60];
-	m_A71 += go[61];
-	m_A69 += go[62];
-	double RHS22 = Idr[60];
-	RHS22 += Idr[61];
-	RHS22 += Idr[62];
-	RHS22 += Idr[63];
-	RHS22 -= go[63] * *cnV[63];
-	m_A77 += gt[64];
-	m_A77 += gt[65];
-	m_A77 += gt[66];
-	m_A77 += gt[67];
-	m_A77 += gt[68];
-	m_A77 += gt[69];
-	m_A78 += go[64];
-	m_A73 += go[65];
-	m_A74 += go[66];
-	m_A76 += go[67];
-	double RHS23 = Idr[64];
-	RHS23 += Idr[65];
-	RHS23 += Idr[66];
-	RHS23 += Idr[67];
-	RHS23 += Idr[68];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A2 += gt[11];
+	m_A2 += gt[12];
+	m_A2 += gt[13];
+	m_A3 += go[7];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 += Idr[12];
+	RHS1 += Idr[13];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	RHS1 -= go[12] * *cnV[12];
+	RHS1 -= go[13] * *cnV[13];
+	m_A4 += gt[14];
+	m_A4 += gt[15];
+	m_A4 += gt[16];
+	m_A5 += go[14];
+	double RHS2 = Idr[14];
+	RHS2 += Idr[15];
+	RHS2 += Idr[16];
+	RHS2 -= go[15] * *cnV[15];
+	RHS2 -= go[16] * *cnV[16];
+	m_A6 += gt[17];
+	m_A6 += gt[18];
+	m_A7 += go[17];
+	double RHS3 = Idr[17];
+	RHS3 += Idr[18];
+	RHS3 -= go[18] * *cnV[18];
+	m_A8 += gt[19];
+	m_A8 += gt[20];
+	m_A9 += go[19];
+	double RHS4 = Idr[19];
+	RHS4 += Idr[20];
+	RHS4 -= go[20] * *cnV[20];
+	m_A10 += gt[21];
+	m_A10 += gt[22];
+	m_A11 += go[21];
+	double RHS5 = Idr[21];
+	RHS5 += Idr[22];
+	RHS5 -= go[22] * *cnV[22];
+	m_A12 += gt[23];
+	m_A12 += gt[24];
+	m_A13 += go[23];
+	double RHS6 = Idr[23];
+	RHS6 += Idr[24];
+	RHS6 -= go[24] * *cnV[24];
+	m_A14 += gt[25];
+	m_A14 += gt[26];
+	m_A15 += go[25];
+	double RHS7 = Idr[25];
+	RHS7 += Idr[26];
+	RHS7 -= go[26] * *cnV[26];
+	m_A16 += gt[27];
+	m_A16 += gt[28];
+	m_A17 += go[27];
+	double RHS8 = Idr[27];
+	RHS8 += Idr[28];
+	RHS8 -= go[28] * *cnV[28];
+	m_A18 += gt[29];
+	m_A18 += gt[30];
+	m_A19 += go[29];
+	double RHS9 = Idr[29];
+	RHS9 += Idr[30];
+	RHS9 -= go[30] * *cnV[30];
+	m_A20 += gt[31];
+	m_A20 += gt[32];
+	m_A20 += gt[33];
+	m_A20 += gt[34];
+	m_A21 += go[31];
+	m_A22 += go[32];
+	double RHS10 = Idr[31];
+	RHS10 += Idr[32];
+	RHS10 += Idr[33];
+	RHS10 += Idr[34];
+	RHS10 -= go[33] * *cnV[33];
+	RHS10 -= go[34] * *cnV[34];
+	m_A23 += gt[35];
+	m_A23 += gt[36];
+	m_A23 += gt[37];
+	m_A23 += gt[38];
+	m_A24 += go[35];
+	m_A25 += go[36];
+	double RHS11 = Idr[35];
+	RHS11 += Idr[36];
+	RHS11 += Idr[37];
+	RHS11 += Idr[38];
+	RHS11 -= go[37] * *cnV[37];
+	RHS11 -= go[38] * *cnV[38];
+	m_A26 += gt[39];
+	m_A26 += gt[40];
+	m_A26 += gt[41];
+	m_A26 += gt[42];
+	m_A27 += go[39];
+	m_A28 += go[40];
+	double RHS12 = Idr[39];
+	RHS12 += Idr[40];
+	RHS12 += Idr[41];
+	RHS12 += Idr[42];
+	RHS12 -= go[41] * *cnV[41];
+	RHS12 -= go[42] * *cnV[42];
+	m_A29 += gt[43];
+	m_A29 += gt[44];
+	m_A30 += go[43];
+	double RHS13 = Idr[43];
+	RHS13 += Idr[44];
+	RHS13 -= go[44] * *cnV[44];
+	m_A31 += gt[45];
+	m_A31 += gt[46];
+	m_A32 += go[45];
+	double RHS14 = Idr[45];
+	RHS14 += Idr[46];
+	RHS14 -= go[46] * *cnV[46];
+	m_A33 += gt[47];
+	m_A33 += gt[48];
+	m_A34 += go[47];
+	double RHS15 = Idr[47];
+	RHS15 += Idr[48];
+	RHS15 -= go[48] * *cnV[48];
+	m_A35 += gt[49];
+	m_A35 += gt[50];
+	m_A35 += gt[51];
+	m_A36 += go[49];
+	double RHS16 = Idr[49];
+	RHS16 += Idr[50];
+	RHS16 += Idr[51];
+	RHS16 -= go[50] * *cnV[50];
+	RHS16 -= go[51] * *cnV[51];
+	m_A37 += gt[52];
+	m_A37 += gt[53];
+	m_A37 += gt[54];
+	m_A37 += gt[55];
+	m_A38 += go[52];
+	double RHS17 = Idr[52];
+	RHS17 += Idr[53];
+	RHS17 += Idr[54];
+	RHS17 += Idr[55];
+	RHS17 -= go[53] * *cnV[53];
+	RHS17 -= go[54] * *cnV[54];
+	RHS17 -= go[55] * *cnV[55];
+	m_A39 += gt[56];
+	m_A39 += gt[57];
+	m_A40 += go[56];
+	double RHS18 = Idr[56];
+	RHS18 += Idr[57];
+	RHS18 -= go[57] * *cnV[57];
+	m_A41 += gt[58];
+	m_A41 += gt[59];
+	m_A42 += go[58];
+	double RHS19 = Idr[58];
+	RHS19 += Idr[59];
+	RHS19 -= go[59] * *cnV[59];
+	m_A43 += gt[60];
+	m_A43 += gt[61];
+	m_A44 += go[60];
+	double RHS20 = Idr[60];
+	RHS20 += Idr[61];
+	RHS20 -= go[61] * *cnV[61];
+	m_A45 += gt[62];
+	m_A45 += gt[63];
+	m_A45 += gt[64];
+	m_A45 += gt[65];
+	m_A46 += go[62];
+	double RHS21 = Idr[62];
+	RHS21 += Idr[63];
+	RHS21 += Idr[64];
+	RHS21 += Idr[65];
+	RHS21 -= go[63] * *cnV[63];
+	RHS21 -= go[64] * *cnV[64];
+	RHS21 -= go[65] * *cnV[65];
+	m_A47 += gt[66];
+	m_A47 += gt[67];
+	m_A48 += go[66];
+	double RHS22 = Idr[66];
+	RHS22 += Idr[67];
+	RHS22 -= go[67] * *cnV[67];
+	m_A49 += gt[68];
+	m_A49 += gt[69];
+	m_A50 += go[68];
+	double RHS23 = Idr[68];
 	RHS23 += Idr[69];
-	RHS23 -= go[68] * *cnV[68];
 	RHS23 -= go[69] * *cnV[69];
-	m_A83 += gt[70];
-	m_A83 += gt[71];
-	m_A83 += gt[72];
-	m_A83 += gt[73];
-	m_A83 += gt[74];
-	m_A83 += gt[75];
-	m_A84 += go[70];
-	m_A79 += go[71];
-	m_A80 += go[72];
-	m_A82 += go[73];
+	m_A51 += gt[70];
+	m_A51 += gt[71];
+	m_A52 += go[70];
 	double RHS24 = Idr[70];
 	RHS24 += Idr[71];
-	RHS24 += Idr[72];
-	RHS24 += Idr[73];
-	RHS24 += Idr[74];
-	RHS24 += Idr[75];
-	RHS24 -= go[74] * *cnV[74];
-	RHS24 -= go[75] * *cnV[75];
-	m_A89 += gt[76];
-	m_A89 += gt[77];
-	m_A89 += gt[78];
-	m_A89 += gt[79];
-	m_A85 += go[76];
-	m_A86 += go[77];
-	m_A88 += go[78];
-	m_A87 += go[79];
-	double RHS25 = Idr[76];
-	RHS25 += Idr[77];
-	RHS25 += Idr[78];
-	RHS25 += Idr[79];
-	m_A100 += gt[80];
-	m_A100 += gt[81];
-	m_A100 += gt[82];
-	m_A100 += gt[83];
-	m_A100 += gt[84];
-	m_A100 += gt[85];
-	m_A98 += go[80];
-	m_A91 += go[81];
-	m_A92 += go[82];
-	m_A93 += go[83];
-	double RHS26 = Idr[80];
-	RHS26 += Idr[81];
-	RHS26 += Idr[82];
-	RHS26 += Idr[83];
-	RHS26 += Idr[84];
-	RHS26 += Idr[85];
-	RHS26 -= go[84] * *cnV[84];
-	RHS26 -= go[85] * *cnV[85];
-	m_A107 += gt[86];
-	m_A107 += gt[87];
-	m_A107 += gt[88];
-	m_A107 += gt[89];
-	m_A102 += go[86];
-	m_A103 += go[87];
-	m_A105 += go[88];
-	m_A104 += go[89];
-	double RHS27 = Idr[86];
-	RHS27 += Idr[87];
-	RHS27 += Idr[88];
-	RHS27 += Idr[89];
+	RHS24 -= go[71] * *cnV[71];
+	m_A53 += gt[72];
+	m_A53 += gt[73];
+	m_A53 += gt[74];
+	m_A54 += go[72];
+	double RHS25 = Idr[72];
+	RHS25 += Idr[73];
+	RHS25 += Idr[74];
+	RHS25 -= go[73] * *cnV[73];
+	RHS25 -= go[74] * *cnV[74];
+	m_A55 += gt[75];
+	m_A55 += gt[76];
+	m_A56 += go[75];
+	m_A57 += go[76];
+	double RHS26 = Idr[75];
+	RHS26 += Idr[76];
+	m_A58 += gt[77];
+	m_A58 += gt[78];
+	m_A58 += gt[79];
+	m_A59 += go[77];
+	double RHS27 = Idr[77];
+	RHS27 += Idr[78];
+	RHS27 += Idr[79];
+	RHS27 -= go[78] * *cnV[78];
+	RHS27 -= go[79] * *cnV[79];
+	m_A60 += gt[80];
+	m_A60 += gt[81];
+	m_A61 += go[80];
+	m_A62 += go[81];
+	double RHS28 = Idr[80];
+	RHS28 += Idr[81];
+	m_A65 += gt[82];
+	m_A65 += gt[83];
+	m_A64 += go[82];
+	m_A63 += go[83];
+	double RHS29 = Idr[82];
+	RHS29 += Idr[83];
+	m_A66 += gt[84];
+	m_A66 += gt[85];
+	m_A66 += gt[86];
+	m_A67 += go[84];
+	double RHS30 = Idr[84];
+	RHS30 += Idr[85];
+	RHS30 += Idr[86];
+	RHS30 -= go[85] * *cnV[85];
+	RHS30 -= go[86] * *cnV[86];
+	m_A70 += gt[87];
+	m_A70 += gt[88];
+	m_A69 += go[87];
+	m_A68 += go[88];
+	double RHS31 = Idr[87];
+	RHS31 += Idr[88];
+	m_A72 += gt[89];
+	m_A72 += gt[90];
+	m_A72 += gt[91];
+	m_A72 += gt[92];
+	m_A73 += go[89];
+	m_A74 += go[90];
+	m_A71 += go[91];
+	double RHS32 = Idr[89];
+	RHS32 += Idr[90];
+	RHS32 += Idr[91];
+	RHS32 += Idr[92];
+	RHS32 -= go[92] * *cnV[92];
+	m_A77 += gt[93];
+	m_A77 += gt[94];
+	m_A77 += gt[95];
+	m_A75 += go[93];
+	m_A76 += go[94];
+	double RHS33 = Idr[93];
+	RHS33 += Idr[94];
+	RHS33 += Idr[95];
+	RHS33 -= go[95] * *cnV[95];
+	m_A81 += gt[96];
+	m_A81 += gt[97];
+	m_A81 += gt[98];
+	m_A79 += go[96];
+	m_A80 += go[97];
+	double RHS34 = Idr[96];
+	RHS34 += Idr[97];
+	RHS34 += Idr[98];
+	RHS34 -= go[98] * *cnV[98];
+	m_A84 += gt[99];
+	m_A84 += gt[100];
+	m_A84 += gt[101];
+	m_A85 += go[99];
+	m_A83 += go[100];
+	double RHS35 = Idr[99];
+	RHS35 += Idr[100];
+	RHS35 += Idr[101];
+	RHS35 -= go[101] * *cnV[101];
+	m_A87 += gt[102];
+	m_A87 += gt[103];
+	m_A87 += gt[104];
+	m_A88 += go[102];
+	m_A86 += go[103];
+	double RHS36 = Idr[102];
+	RHS36 += Idr[103];
+	RHS36 += Idr[104];
+	RHS36 -= go[104] * *cnV[104];
+	m_A92 += gt[105];
+	m_A92 += gt[106];
+	m_A92 += gt[107];
+	m_A92 += gt[108];
+	m_A92 += gt[109];
+	m_A92 += gt[110];
+	m_A89 += go[105];
+	m_A90 += go[106];
+	m_A94 += go[107];
+	m_A94 += go[108];
+	double RHS37 = Idr[105];
+	RHS37 += Idr[106];
+	RHS37 += Idr[107];
+	RHS37 += Idr[108];
+	RHS37 += Idr[109];
+	RHS37 += Idr[110];
+	RHS37 -= go[109] * *cnV[109];
+	RHS37 -= go[110] * *cnV[110];
+	m_A98 += gt[111];
+	m_A98 += gt[112];
+	m_A98 += gt[113];
+	m_A98 += gt[114];
+	m_A98 += gt[115];
+	m_A98 += gt[116];
+	m_A95 += go[111];
+	m_A96 += go[112];
+	m_A100 += go[113];
+	m_A100 += go[114];
+	double RHS38 = Idr[111];
+	RHS38 += Idr[112];
+	RHS38 += Idr[113];
+	RHS38 += Idr[114];
+	RHS38 += Idr[115];
+	RHS38 += Idr[116];
+	RHS38 -= go[115] * *cnV[115];
+	RHS38 -= go[116] * *cnV[116];
+	m_A102 += gt[117];
+	m_A102 += gt[118];
+	m_A102 += gt[119];
+	m_A102 += gt[120];
+	m_A103 += go[117];
+	m_A101 += go[118];
+	double RHS39 = Idr[117];
+	RHS39 += Idr[118];
+	RHS39 += Idr[119];
+	RHS39 += Idr[120];
+	RHS39 -= go[119] * *cnV[119];
+	RHS39 -= go[120] * *cnV[120];
+	m_A105 += gt[121];
+	m_A105 += gt[122];
+	m_A105 += gt[123];
+	m_A105 += gt[124];
+	m_A106 += go[121];
+	m_A104 += go[122];
+	double RHS40 = Idr[121];
+	RHS40 += Idr[122];
+	RHS40 += Idr[123];
+	RHS40 += Idr[124];
+	RHS40 -= go[123] * *cnV[123];
+	RHS40 -= go[124] * *cnV[124];
+	m_A116 += gt[125];
+	m_A116 += gt[126];
+	m_A116 += gt[127];
+	m_A116 += gt[128];
+	m_A116 += gt[129];
+	m_A116 += gt[130];
+	m_A116 += gt[131];
+	m_A116 += gt[132];
+	m_A116 += gt[133];
+	m_A116 += gt[134];
+	m_A114 += go[125];
+	m_A113 += go[126];
+	m_A112 += go[127];
+	m_A111 += go[128];
+	m_A110 += go[129];
+	m_A118 += go[130];
+	m_A109 += go[131];
+	m_A108 += go[132];
+	m_A107 += go[133];
+	m_A115 += go[134];
+	double RHS41 = Idr[125];
+	RHS41 += Idr[126];
+	RHS41 += Idr[127];
+	RHS41 += Idr[128];
+	RHS41 += Idr[129];
+	RHS41 += Idr[130];
+	RHS41 += Idr[131];
+	RHS41 += Idr[132];
+	RHS41 += Idr[133];
+	RHS41 += Idr[134];
+	m_A131 += gt[135];
+	m_A131 += gt[136];
+	m_A131 += gt[137];
+	m_A131 += gt[138];
+	m_A131 += gt[139];
+	m_A131 += gt[140];
+	m_A131 += gt[141];
+	m_A131 += gt[142];
+	m_A131 += gt[143];
+	m_A131 += gt[144];
+	m_A131 += gt[145];
+	m_A131 += gt[146];
+	m_A125 += go[135];
+	m_A124 += go[136];
+	m_A123 += go[137];
+	m_A122 += go[138];
+	m_A121 += go[139];
+	m_A120 += go[140];
+	m_A119 += go[141];
+	m_A133 += go[142];
+	m_A128 += go[143];
+	m_A127 += go[144];
+	m_A126 += go[145];
+	m_A129 += go[146];
+	double RHS42 = Idr[135];
+	RHS42 += Idr[136];
+	RHS42 += Idr[137];
+	RHS42 += Idr[138];
+	RHS42 += Idr[139];
+	RHS42 += Idr[140];
+	RHS42 += Idr[141];
+	RHS42 += Idr[142];
+	RHS42 += Idr[143];
+	RHS42 += Idr[144];
+	RHS42 += Idr[145];
+	RHS42 += Idr[146];
+	m_A142 += gt[147];
+	m_A142 += gt[148];
+	m_A142 += gt[149];
+	m_A142 += gt[150];
+	m_A142 += gt[151];
+	m_A142 += gt[152];
+	m_A142 += gt[153];
+	m_A138 += go[147];
+	m_A138 += go[148];
+	m_A137 += go[149];
+	m_A136 += go[150];
+	m_A140 += go[151];
+	m_A135 += go[152];
+	m_A134 += go[153];
+	double RHS43 = Idr[147];
+	RHS43 += Idr[148];
+	RHS43 += Idr[149];
+	RHS43 += Idr[150];
+	RHS43 += Idr[151];
+	RHS43 += Idr[152];
+	RHS43 += Idr[153];
+	m_A152 += gt[154];
+	m_A152 += gt[155];
+	m_A152 += gt[156];
+	m_A152 += gt[157];
+	m_A152 += gt[158];
+	m_A152 += gt[159];
+	m_A152 += gt[160];
+	m_A148 += go[154];
+	m_A148 += go[155];
+	m_A147 += go[156];
+	m_A146 += go[157];
+	m_A150 += go[158];
+	m_A145 += go[159];
+	m_A144 += go[160];
+	double RHS44 = Idr[154];
+	RHS44 += Idr[155];
+	RHS44 += Idr[156];
+	RHS44 += Idr[157];
+	RHS44 += Idr[158];
+	RHS44 += Idr[159];
+	RHS44 += Idr[160];
 	const double f0 = 1.0 / m_A0;
-	const double f0_18 = -f0 * m_A55;
-	m_A56 += m_A1 * f0_18;
-	RHS18 += f0_18 * RHS0;
+	const double f0_38 = -f0 * m_A95;
+	m_A99 += m_A1 * f0_38;
+	RHS38 += f0_38 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_16 = -f1 * m_A47;
-	m_A49 += m_A3 * f1_16;
-	RHS16 += f1_16 * RHS1;
+	const double f1_37 = -f1 * m_A89;
+	m_A93 += m_A3 * f1_37;
+	RHS37 += f1_37 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_17 = -f2 * m_A51;
-	m_A53 += m_A5 * f2_17;
-	RHS17 += f2_17 * RHS2;
+	const double f2_32 = -f2 * m_A71;
+	m_A72 += m_A5 * f2_32;
+	RHS32 += f2_32 * RHS2;
 	const double f3 = 1.0 / m_A6;
-	const double f3_22 = -f3 * m_A69;
-	m_A70 += m_A7 * f3_22;
-	RHS22 += f3_22 * RHS3;
+	const double f3_42 = -f3 * m_A119;
+	m_A131 += m_A7 * f3_42;
+	RHS42 += f3_42 * RHS3;
 	const double f4 = 1.0 / m_A8;
-	const double f4_20 = -f4 * m_A61;
-	m_A62 += m_A9 * f4_20;
-	RHS20 += f4_20 * RHS4;
+	const double f4_42 = -f4 * m_A120;
+	m_A131 += m_A9 * f4_42;
+	RHS42 += f4_42 * RHS4;
 	const double f5 = 1.0 / m_A10;
-	const double f5_21 = -f5 * m_A65;
-	m_A67 += m_A11 * f5_21;
-	m_A68 += m_A12 * f5_21;
-	RHS21 += f5_21 * RHS5;
-	const double f5_26 = -f5 * m_A91;
-	m_A98 += m_A11 * f5_26;
-	m_A100 += m_A12 * f5_26;
-	RHS26 += f5_26 * RHS5;
-	const double f6 = 1.0 / m_A13;
-	const double f6_8 = -f6 * m_A19;
-	m_A20 += m_A14 * f6_8;
-	m_A22 += m_A15 * f6_8;
-	RHS8 += f6_8 * RHS6;
-	const double f6_26 = -f6 * m_A92;
-	m_A94 += m_A14 * f6_26;
-	m_A100 += m_A15 * f6_26;
-	RHS26 += f6_26 * RHS6;
-	const double f7 = 1.0 / m_A16;
-	const double f7_9 = -f7 * m_A23;
-	m_A24 += m_A17 * f7_9;
-	m_A26 += m_A18 * f7_9;
-	RHS9 += f7_9 * RHS7;
-	const double f7_26 = -f7 * m_A93;
-	m_A95 += m_A17 * f7_26;
-	m_A100 += m_A18 * f7_26;
-	RHS26 += f7_26 * RHS7;
-	const double f8 = 1.0 / m_A20;
-	const double f8_10 = -f8 * m_A27;
-	m_A28 += m_A21 * f8_10;
-	m_A29 += m_A22 * f8_10;
-	RHS10 += f8_10 * RHS8;
-	const double f8_26 = -f8 * m_A94;
-	m_A96 += m_A21 * f8_26;
-	m_A100 += m_A22 * f8_26;
-	RHS26 += f8_26 * RHS8;
-	const double f9 = 1.0 / m_A24;
-	const double f9_11 = -f9 * m_A31;
-	m_A32 += m_A25 * f9_11;
-	m_A34 += m_A26 * f9_11;
-	RHS11 += f9_11 * RHS9;
-	const double f9_26 = -f9 * m_A95;
-	m_A97 += m_A25 * f9_26;
-	m_A100 += m_A26 * f9_26;
-	RHS26 += f9_26 * RHS9;
-	const double f10 = 1.0 / m_A28;
-	const double f10_26 = -f10 * m_A96;
-	m_A100 += m_A29 * f10_26;
-	m_A101 += m_A30 * f10_26;
-	RHS26 += f10_26 * RHS10;
-	const double f10_27 = -f10 * m_A102;
-	m_A106 += m_A29 * f10_27;
-	m_A107 += m_A30 * f10_27;
-	RHS27 += f10_27 * RHS10;
-	const double f11 = 1.0 / m_A32;
-	const double f11_25 = -f11 * m_A85;
-	m_A89 += m_A33 * f11_25;
-	m_A90 += m_A34 * f11_25;
-	RHS25 += f11_25 * RHS11;
-	const double f11_26 = -f11 * m_A97;
-	m_A99 += m_A33 * f11_26;
-	m_A100 += m_A34 * f11_26;
-	RHS26 += f11_26 * RHS11;
-	const double f12 = 1.0 / m_A35;
-	const double f12_23 = -f12 * m_A73;
-	m_A77 += m_A36 * f12_23;
-	m_A78 += m_A37 * f12_23;
-	RHS23 += f12_23 * RHS12;
-	const double f12_27 = -f12 * m_A103;
-	m_A105 += m_A36 * f12_27;
-	m_A107 += m_A37 * f12_27;
-	RHS27 += f12_27 * RHS12;
-	const double f13 = 1.0 / m_A38;
-	const double f13_24 = -f13 * m_A79;
-	m_A83 += m_A39 * f13_24;
-	m_A84 += m_A40 * f13_24;
-	RHS24 += f13_24 * RHS13;
-	const double f13_25 = -f13 * m_A86;
-	m_A88 += m_A39 * f13_25;
-	m_A89 += m_A40 * f13_25;
-	RHS25 += f13_25 * RHS13;
-	const double f14 = 1.0 / m_A41;
-	const double f14_16 = -f14 * m_A48;
-	m_A49 += m_A42 * f14_16;
-	m_A50 += m_A43 * f14_16;
-	RHS16 += f14_16 * RHS14;
-	const double f14_23 = -f14 * m_A74;
-	m_A75 += m_A42 * f14_23;
-	m_A77 += m_A43 * f14_23;
-	RHS23 += f14_23 * RHS14;
-	const double f15 = 1.0 / m_A44;
-	const double f15_17 = -f15 * m_A52;
-	m_A53 += m_A45 * f15_17;
-	m_A54 += m_A46 * f15_17;
-	RHS17 += f15_17 * RHS15;
-	const double f15_24 = -f15 * m_A80;
-	m_A81 += m_A45 * f15_24;
-	m_A83 += m_A46 * f15_24;
-	RHS24 += f15_24 * RHS15;
-	const double f16 = 1.0 / m_A49;
-	const double f16_23 = -f16 * m_A75;
-	m_A77 += m_A50 * f16_23;
-	RHS23 += f16_23 * RHS16;
-	const double f17 = 1.0 / m_A53;
-	const double f17_24 = -f17 * m_A81;
-	m_A83 += m_A54 * f17_24;
-	RHS24 += f17_24 * RHS17;
-	const double f18 = 1.0 / m_A56;
-	const double f18_19 = -f18 * m_A58;
-	m_A59 += m_A57 * f18_19;
-	RHS19 += f18_19 * RHS18;
-	const double f19 = 1.0 / m_A59;
-	const double f19_21 = -f19 * m_A66;
-	m_A67 += m_A60 * f19_21;
-	RHS21 += f19_21 * RHS19;
-	const double f20 = 1.0 / m_A62;
-	const double f20_24 = -f20 * m_A82;
-	m_A83 += m_A63 * f20_24;
-	m_A84 += m_A64 * f20_24;
-	RHS24 += f20_24 * RHS20;
-	const double f20_25 = -f20 * m_A87;
-	m_A88 += m_A63 * f20_25;
-	m_A89 += m_A64 * f20_25;
-	RHS25 += f20_25 * RHS20;
-	const double f21 = 1.0 / m_A67;
-	const double f21_26 = -f21 * m_A98;
-	m_A100 += m_A68 * f21_26;
-	RHS26 += f21_26 * RHS21;
-	const double f22 = 1.0 / m_A70;
-	const double f22_23 = -f22 * m_A76;
-	m_A77 += m_A71 * f22_23;
-	m_A78 += m_A72 * f22_23;
-	RHS23 += f22_23 * RHS22;
-	const double f22_27 = -f22 * m_A104;
-	m_A105 += m_A71 * f22_27;
-	m_A107 += m_A72 * f22_27;
-	RHS27 += f22_27 * RHS22;
-	const double f23 = 1.0 / m_A77;
-	const double f23_27 = -f23 * m_A105;
-	m_A107 += m_A78 * f23_27;
-	RHS27 += f23_27 * RHS23;
-	const double f24 = 1.0 / m_A83;
-	const double f24_25 = -f24 * m_A88;
-	m_A89 += m_A84 * f24_25;
-	RHS25 += f24_25 * RHS24;
-	const double f25 = 1.0 / m_A89;
-	const double f25_26 = -f25 * m_A99;
-	m_A100 += m_A90 * f25_26;
-	RHS26 += f25_26 * RHS25;
-	const double f26 = 1.0 / m_A100;
-	const double f26_27 = -f26 * m_A106;
-	m_A107 += m_A101 * f26_27;
-	RHS27 += f26_27 * RHS26;
-	V[27] = RHS27 / m_A107;
+	const double f5_42 = -f5 * m_A121;
+	m_A131 += m_A11 * f5_42;
+	RHS42 += f5_42 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_42 = -f6 * m_A122;
+	m_A131 += m_A13 * f6_42;
+	RHS42 += f6_42 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_42 = -f7 * m_A123;
+	m_A131 += m_A15 * f7_42;
+	RHS42 += f7_42 * RHS7;
+	const double f8 = 1.0 / m_A16;
+	const double f8_42 = -f8 * m_A124;
+	m_A131 += m_A17 * f8_42;
+	RHS42 += f8_42 * RHS8;
+	const double f9 = 1.0 / m_A18;
+	const double f9_42 = -f9 * m_A125;
+	m_A131 += m_A19 * f9_42;
+	RHS42 += f9_42 * RHS9;
+	const double f10 = 1.0 / m_A20;
+	const double f10_41 = -f10 * m_A107;
+	m_A116 += m_A21 * f10_41;
+	m_A117 += m_A22 * f10_41;
+	RHS41 += f10_41 * RHS10;
+	const double f10_42 = -f10 * m_A126;
+	m_A130 += m_A21 * f10_42;
+	m_A131 += m_A22 * f10_42;
+	RHS42 += f10_42 * RHS10;
+	const double f11 = 1.0 / m_A23;
+	const double f11_41 = -f11 * m_A108;
+	m_A116 += m_A24 * f11_41;
+	m_A117 += m_A25 * f11_41;
+	RHS41 += f11_41 * RHS11;
+	const double f11_42 = -f11 * m_A127;
+	m_A130 += m_A24 * f11_42;
+	m_A131 += m_A25 * f11_42;
+	RHS42 += f11_42 * RHS11;
+	const double f12 = 1.0 / m_A26;
+	const double f12_41 = -f12 * m_A109;
+	m_A116 += m_A27 * f12_41;
+	m_A117 += m_A28 * f12_41;
+	RHS41 += f12_41 * RHS12;
+	const double f12_42 = -f12 * m_A128;
+	m_A130 += m_A27 * f12_42;
+	m_A131 += m_A28 * f12_42;
+	RHS42 += f12_42 * RHS12;
+	const double f13 = 1.0 / m_A29;
+	const double f13_41 = -f13 * m_A110;
+	m_A116 += m_A30 * f13_41;
+	RHS41 += f13_41 * RHS13;
+	const double f14 = 1.0 / m_A31;
+	const double f14_41 = -f14 * m_A111;
+	m_A116 += m_A32 * f14_41;
+	RHS41 += f14_41 * RHS14;
+	const double f15 = 1.0 / m_A33;
+	const double f15_29 = -f15 * m_A63;
+	m_A65 += m_A34 * f15_29;
+	RHS29 += f15_29 * RHS15;
+	const double f15_44 = -f15 * m_A144;
+	m_A146 += m_A34 * f15_44;
+	RHS44 += f15_44 * RHS15;
+	const double f16 = 1.0 / m_A35;
+	const double f16_35 = -f16 * m_A83;
+	m_A84 += m_A36 * f16_35;
+	RHS35 += f16_35 * RHS16;
+	const double f17 = 1.0 / m_A37;
+	const double f17_29 = -f17 * m_A64;
+	m_A65 += m_A38 * f17_29;
+	RHS29 += f17_29 * RHS17;
+	const double f18 = 1.0 / m_A39;
+	const double f18_33 = -f18 * m_A75;
+	m_A77 += m_A40 * f18_33;
+	RHS33 += f18_33 * RHS18;
+	const double f19 = 1.0 / m_A41;
+	const double f19_41 = -f19 * m_A112;
+	m_A116 += m_A42 * f19_41;
+	RHS41 += f19_41 * RHS19;
+	const double f20 = 1.0 / m_A43;
+	const double f20_31 = -f20 * m_A68;
+	m_A70 += m_A44 * f20_31;
+	RHS31 += f20_31 * RHS20;
+	const double f20_43 = -f20 * m_A134;
+	m_A136 += m_A44 * f20_43;
+	RHS43 += f20_43 * RHS20;
+	const double f21 = 1.0 / m_A45;
+	const double f21_31 = -f21 * m_A69;
+	m_A70 += m_A46 * f21_31;
+	RHS31 += f21_31 * RHS21;
+	const double f22 = 1.0 / m_A47;
+	const double f22_34 = -f22 * m_A79;
+	m_A81 += m_A48 * f22_34;
+	RHS34 += f22_34 * RHS22;
+	const double f23 = 1.0 / m_A49;
+	const double f23_41 = -f23 * m_A113;
+	m_A116 += m_A50 * f23_41;
+	RHS41 += f23_41 * RHS23;
+	const double f24 = 1.0 / m_A51;
+	const double f24_41 = -f24 * m_A114;
+	m_A116 += m_A52 * f24_41;
+	RHS41 += f24_41 * RHS24;
+	const double f25 = 1.0 / m_A53;
+	const double f25_36 = -f25 * m_A86;
+	m_A87 += m_A54 * f25_36;
+	RHS36 += f25_36 * RHS25;
+	const double f26 = 1.0 / m_A55;
+	const double f26_33 = -f26 * m_A76;
+	m_A77 += m_A56 * f26_33;
+	m_A78 += m_A57 * f26_33;
+	RHS33 += f26_33 * RHS26;
+	const double f26_38 = -f26 * m_A96;
+	m_A97 += m_A56 * f26_38;
+	m_A98 += m_A57 * f26_38;
+	RHS38 += f26_38 * RHS26;
+	const double f27 = 1.0 / m_A58;
+	const double f27_39 = -f27 * m_A101;
+	m_A103 += m_A59 * f27_39;
+	RHS39 += f27_39 * RHS27;
+	const double f27_44 = -f27 * m_A145;
+	m_A152 += m_A59 * f27_44;
+	RHS44 += f27_44 * RHS27;
+	const double f28 = 1.0 / m_A60;
+	const double f28_34 = -f28 * m_A80;
+	m_A81 += m_A61 * f28_34;
+	m_A82 += m_A62 * f28_34;
+	RHS34 += f28_34 * RHS28;
+	const double f28_37 = -f28 * m_A90;
+	m_A91 += m_A61 * f28_37;
+	m_A92 += m_A62 * f28_37;
+	RHS37 += f28_37 * RHS28;
+	const double f29 = 1.0 / m_A65;
+	const double f29_44 = -f29 * m_A146;
+	RHS44 += f29_44 * RHS29;
+	const double f30 = 1.0 / m_A66;
+	const double f30_40 = -f30 * m_A104;
+	m_A106 += m_A67 * f30_40;
+	RHS40 += f30_40 * RHS30;
+	const double f30_43 = -f30 * m_A135;
+	m_A142 += m_A67 * f30_43;
+	RHS43 += f30_43 * RHS30;
+	const double f31 = 1.0 / m_A70;
+	const double f31_43 = -f31 * m_A136;
+	RHS43 += f31_43 * RHS31;
+	const double f32 = 1.0 / m_A72;
+	const double f32_41 = -f32 * m_A115;
+	m_A116 += m_A73 * f32_41;
+	m_A117 += m_A74 * f32_41;
+	RHS41 += f32_41 * RHS32;
+	const double f32_42 = -f32 * m_A129;
+	m_A130 += m_A73 * f32_42;
+	m_A131 += m_A74 * f32_42;
+	RHS42 += f32_42 * RHS32;
+	const double f33 = 1.0 / m_A77;
+	const double f33_38 = -f33 * m_A97;
+	m_A98 += m_A78 * f33_38;
+	RHS38 += f33_38 * RHS33;
+	const double f34 = 1.0 / m_A81;
+	const double f34_37 = -f34 * m_A91;
+	m_A92 += m_A82 * f34_37;
+	RHS37 += f34_37 * RHS34;
+	const double f35 = 1.0 / m_A84;
+	const double f35_44 = -f35 * m_A147;
+	m_A152 += m_A85 * f35_44;
+	RHS44 += f35_44 * RHS35;
+	const double f36 = 1.0 / m_A87;
+	const double f36_43 = -f36 * m_A137;
+	m_A142 += m_A88 * f36_43;
+	RHS43 += f36_43 * RHS36;
+	const double f37 = 1.0 / m_A92;
+	const double f37_43 = -f37 * m_A138;
+	m_A139 += m_A93 * f37_43;
+	m_A142 += m_A94 * f37_43;
+	RHS43 += f37_43 * RHS37;
+	const double f38 = 1.0 / m_A98;
+	const double f38_44 = -f38 * m_A148;
+	m_A149 += m_A99 * f38_44;
+	m_A152 += m_A100 * f38_44;
+	RHS44 += f38_44 * RHS38;
+	const double f39 = 1.0 / m_A102;
+	const double f39_44 = -f39 * m_A149;
+	m_A152 += m_A103 * f39_44;
+	RHS44 += f39_44 * RHS39;
+	const double f40 = 1.0 / m_A105;
+	const double f40_43 = -f40 * m_A139;
+	m_A142 += m_A106 * f40_43;
+	RHS43 += f40_43 * RHS40;
+	const double f41 = 1.0 / m_A116;
+	const double f41_42 = -f41 * m_A130;
+	m_A131 += m_A117 * f41_42;
+	m_A132 += m_A118 * f41_42;
+	RHS42 += f41_42 * RHS41;
+	const double f41_43 = -f41 * m_A140;
+	m_A141 += m_A117 * f41_43;
+	m_A142 += m_A118 * f41_43;
+	RHS43 += f41_43 * RHS41;
+	const double f42 = 1.0 / m_A131;
+	const double f42_43 = -f42 * m_A141;
+	m_A142 += m_A132 * f42_43;
+	m_A143 += m_A133 * f42_43;
+	RHS43 += f42_43 * RHS42;
+	const double f42_44 = -f42 * m_A150;
+	m_A151 += m_A132 * f42_44;
+	m_A152 += m_A133 * f42_44;
+	RHS44 += f42_44 * RHS42;
+	const double f43 = 1.0 / m_A142;
+	const double f43_44 = -f43 * m_A151;
+	m_A152 += m_A143 * f43_44;
+	RHS44 += f43_44 * RHS43;
+	V[44] = RHS44 / m_A152;
+	double tmp43 = 0.0;
+	tmp43 += m_A143 * V[44];
+	V[43] = (RHS43 - tmp43) / m_A142;
+	double tmp42 = 0.0;
+	tmp42 += m_A132 * V[43];
+	tmp42 += m_A133 * V[44];
+	V[42] = (RHS42 - tmp42) / m_A131;
+	double tmp41 = 0.0;
+	tmp41 += m_A117 * V[42];
+	tmp41 += m_A118 * V[43];
+	V[41] = (RHS41 - tmp41) / m_A116;
+	double tmp40 = 0.0;
+	tmp40 += m_A106 * V[43];
+	V[40] = (RHS40 - tmp40) / m_A105;
+	double tmp39 = 0.0;
+	tmp39 += m_A103 * V[44];
+	V[39] = (RHS39 - tmp39) / m_A102;
+	double tmp38 = 0.0;
+	tmp38 += m_A99 * V[39];
+	tmp38 += m_A100 * V[44];
+	V[38] = (RHS38 - tmp38) / m_A98;
+	double tmp37 = 0.0;
+	tmp37 += m_A93 * V[40];
+	tmp37 += m_A94 * V[43];
+	V[37] = (RHS37 - tmp37) / m_A92;
+	double tmp36 = 0.0;
+	tmp36 += m_A88 * V[43];
+	V[36] = (RHS36 - tmp36) / m_A87;
+	double tmp35 = 0.0;
+	tmp35 += m_A85 * V[44];
+	V[35] = (RHS35 - tmp35) / m_A84;
+	double tmp34 = 0.0;
+	tmp34 += m_A82 * V[37];
+	V[34] = (RHS34 - tmp34) / m_A81;
+	double tmp33 = 0.0;
+	tmp33 += m_A78 * V[38];
+	V[33] = (RHS33 - tmp33) / m_A77;
+	double tmp32 = 0.0;
+	tmp32 += m_A73 * V[41];
+	tmp32 += m_A74 * V[42];
+	V[32] = (RHS32 - tmp32) / m_A72;
+	double tmp31 = 0.0;
+	V[31] = (RHS31 - tmp31) / m_A70;
+	double tmp30 = 0.0;
+	tmp30 += m_A67 * V[43];
+	V[30] = (RHS30 - tmp30) / m_A66;
+	double tmp29 = 0.0;
+	V[29] = (RHS29 - tmp29) / m_A65;
+	double tmp28 = 0.0;
+	tmp28 += m_A61 * V[34];
+	tmp28 += m_A62 * V[37];
+	V[28] = (RHS28 - tmp28) / m_A60;
+	double tmp27 = 0.0;
+	tmp27 += m_A59 * V[44];
+	V[27] = (RHS27 - tmp27) / m_A58;
 	double tmp26 = 0.0;
-	tmp26 += m_A101 * V[27];
-	V[26] = (RHS26 - tmp26) / m_A100;
+	tmp26 += m_A56 * V[33];
+	tmp26 += m_A57 * V[38];
+	V[26] = (RHS26 - tmp26) / m_A55;
 	double tmp25 = 0.0;
-	tmp25 += m_A90 * V[26];
-	V[25] = (RHS25 - tmp25) / m_A89;
+	tmp25 += m_A54 * V[36];
+	V[25] = (RHS25 - tmp25) / m_A53;
 	double tmp24 = 0.0;
-	tmp24 += m_A84 * V[25];
-	V[24] = (RHS24 - tmp24) / m_A83;
+	tmp24 += m_A52 * V[41];
+	V[24] = (RHS24 - tmp24) / m_A51;
 	double tmp23 = 0.0;
-	tmp23 += m_A78 * V[27];
-	V[23] = (RHS23 - tmp23) / m_A77;
+	tmp23 += m_A50 * V[41];
+	V[23] = (RHS23 - tmp23) / m_A49;
 	double tmp22 = 0.0;
-	tmp22 += m_A71 * V[23];
-	tmp22 += m_A72 * V[27];
-	V[22] = (RHS22 - tmp22) / m_A70;
+	tmp22 += m_A48 * V[34];
+	V[22] = (RHS22 - tmp22) / m_A47;
 	double tmp21 = 0.0;
-	tmp21 += m_A68 * V[26];
-	V[21] = (RHS21 - tmp21) / m_A67;
+	tmp21 += m_A46 * V[31];
+	V[21] = (RHS21 - tmp21) / m_A45;
 	double tmp20 = 0.0;
-	tmp20 += m_A63 * V[24];
-	tmp20 += m_A64 * V[25];
-	V[20] = (RHS20 - tmp20) / m_A62;
+	tmp20 += m_A44 * V[31];
+	V[20] = (RHS20 - tmp20) / m_A43;
 	double tmp19 = 0.0;
-	tmp19 += m_A60 * V[21];
-	V[19] = (RHS19 - tmp19) / m_A59;
+	tmp19 += m_A42 * V[41];
+	V[19] = (RHS19 - tmp19) / m_A41;
 	double tmp18 = 0.0;
-	tmp18 += m_A57 * V[19];
-	V[18] = (RHS18 - tmp18) / m_A56;
+	tmp18 += m_A40 * V[33];
+	V[18] = (RHS18 - tmp18) / m_A39;
 	double tmp17 = 0.0;
-	tmp17 += m_A54 * V[24];
-	V[17] = (RHS17 - tmp17) / m_A53;
+	tmp17 += m_A38 * V[29];
+	V[17] = (RHS17 - tmp17) / m_A37;
 	double tmp16 = 0.0;
-	tmp16 += m_A50 * V[23];
-	V[16] = (RHS16 - tmp16) / m_A49;
+	tmp16 += m_A36 * V[35];
+	V[16] = (RHS16 - tmp16) / m_A35;
 	double tmp15 = 0.0;
-	tmp15 += m_A45 * V[17];
-	tmp15 += m_A46 * V[24];
-	V[15] = (RHS15 - tmp15) / m_A44;
+	tmp15 += m_A34 * V[29];
+	V[15] = (RHS15 - tmp15) / m_A33;
 	double tmp14 = 0.0;
-	tmp14 += m_A42 * V[16];
-	tmp14 += m_A43 * V[23];
-	V[14] = (RHS14 - tmp14) / m_A41;
+	tmp14 += m_A32 * V[41];
+	V[14] = (RHS14 - tmp14) / m_A31;
 	double tmp13 = 0.0;
-	tmp13 += m_A39 * V[24];
-	tmp13 += m_A40 * V[25];
-	V[13] = (RHS13 - tmp13) / m_A38;
+	tmp13 += m_A30 * V[41];
+	V[13] = (RHS13 - tmp13) / m_A29;
 	double tmp12 = 0.0;
-	tmp12 += m_A36 * V[23];
-	tmp12 += m_A37 * V[27];
-	V[12] = (RHS12 - tmp12) / m_A35;
+	tmp12 += m_A27 * V[41];
+	tmp12 += m_A28 * V[42];
+	V[12] = (RHS12 - tmp12) / m_A26;
 	double tmp11 = 0.0;
-	tmp11 += m_A33 * V[25];
-	tmp11 += m_A34 * V[26];
-	V[11] = (RHS11 - tmp11) / m_A32;
+	tmp11 += m_A24 * V[41];
+	tmp11 += m_A25 * V[42];
+	V[11] = (RHS11 - tmp11) / m_A23;
 	double tmp10 = 0.0;
-	tmp10 += m_A29 * V[26];
-	tmp10 += m_A30 * V[27];
-	V[10] = (RHS10 - tmp10) / m_A28;
+	tmp10 += m_A21 * V[41];
+	tmp10 += m_A22 * V[42];
+	V[10] = (RHS10 - tmp10) / m_A20;
 	double tmp9 = 0.0;
-	tmp9 += m_A25 * V[11];
-	tmp9 += m_A26 * V[26];
-	V[9] = (RHS9 - tmp9) / m_A24;
+	tmp9 += m_A19 * V[42];
+	V[9] = (RHS9 - tmp9) / m_A18;
 	double tmp8 = 0.0;
-	tmp8 += m_A21 * V[10];
-	tmp8 += m_A22 * V[26];
-	V[8] = (RHS8 - tmp8) / m_A20;
+	tmp8 += m_A17 * V[42];
+	V[8] = (RHS8 - tmp8) / m_A16;
 	double tmp7 = 0.0;
-	tmp7 += m_A17 * V[9];
-	tmp7 += m_A18 * V[26];
-	V[7] = (RHS7 - tmp7) / m_A16;
+	tmp7 += m_A15 * V[42];
+	V[7] = (RHS7 - tmp7) / m_A14;
 	double tmp6 = 0.0;
-	tmp6 += m_A14 * V[8];
-	tmp6 += m_A15 * V[26];
-	V[6] = (RHS6 - tmp6) / m_A13;
+	tmp6 += m_A13 * V[42];
+	V[6] = (RHS6 - tmp6) / m_A12;
 	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[21];
-	tmp5 += m_A12 * V[26];
+	tmp5 += m_A11 * V[42];
 	V[5] = (RHS5 - tmp5) / m_A10;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[20];
+	tmp4 += m_A9 * V[42];
 	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[22];
+	tmp3 += m_A7 * V[42];
 	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[17];
+	tmp2 += m_A5 * V[32];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[16];
-	V[1] = (RHS1 - tmp1) / m_A2;
-	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[18];
-	V[0] = (RHS0 - tmp0) / m_A0;
-}
-
-// breakout
-static void nl_gcr_a59b19805d7e4461_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
-
-{
-
-	double m_A0(0.0);
-	double m_A1(0.0);
-	double m_A2(0.0);
-	double m_A3(0.0);
-	double m_A4(0.0);
-	double m_A5(0.0);
-	double m_A6(0.0);
-	m_A0 += gt[0];
-	m_A0 += gt[1];
-	m_A0 += gt[2];
-	m_A1 += go[0];
-	double RHS0 = Idr[0];
-	RHS0 += Idr[1];
-	RHS0 += Idr[2];
-	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A2 += gt[6];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 += Idr[6];
-	RHS1 -= go[4] * *cnV[4];
-	RHS1 -= go[5] * *cnV[5];
-	RHS1 -= go[6] * *cnV[6];
-	m_A6 += gt[7];
-	m_A6 += gt[8];
-	m_A6 += gt[9];
-	m_A5 += go[7];
-	m_A4 += go[8];
-	double RHS2 = Idr[7];
-	RHS2 += Idr[8];
-	RHS2 += Idr[9];
-	RHS2 -= go[9] * *cnV[9];
-	const double f0 = 1.0 / m_A0;
-	const double f0_2 = -f0 * m_A4;
-	m_A6 += m_A1 * f0_2;
-	RHS2 += f0_2 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_2 = -f1 * m_A5;
-	m_A6 += m_A3 * f1_2;
-	RHS2 += f1_2 * RHS1;
-	V[2] = RHS2 / m_A6;
-	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[2];
+	tmp1 += m_A3 * V[40];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[2];
+	tmp0 += m_A1 * V[39];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// 280zzzap
-static void nl_gcr_a716c0b150a52aeb_135_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// 1942
+static void nl_gcr_ce766957cb26ff3e_90_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -10064,783 +52583,454 @@
 	double m_A87(0.0);
 	double m_A88(0.0);
 	double m_A89(0.0);
-	double m_A90(0.0);
-	double m_A91(0.0);
-	double m_A92(0.0);
-	double m_A93(0.0);
-	double m_A94(0.0);
-	double m_A95(0.0);
-	double m_A96(0.0);
-	double m_A97(0.0);
-	double m_A98(0.0);
-	double m_A99(0.0);
-	double m_A100(0.0);
-	double m_A101(0.0);
-	double m_A102(0.0);
-	double m_A103(0.0);
-	double m_A104(0.0);
-	double m_A105(0.0);
-	double m_A106(0.0);
-	double m_A107(0.0);
-	double m_A108(0.0);
-	double m_A109(0.0);
-	double m_A110(0.0);
-	double m_A111(0.0);
-	double m_A112(0.0);
-	double m_A113(0.0);
-	double m_A114(0.0);
-	double m_A115(0.0);
-	double m_A116(0.0);
-	double m_A117(0.0);
-	double m_A118(0.0);
-	double m_A119(0.0);
-	double m_A120(0.0);
-	double m_A121(0.0);
-	double m_A122(0.0);
-	double m_A123(0.0);
-	double m_A124(0.0);
-	double m_A125(0.0);
-	double m_A126(0.0);
-	double m_A127(0.0);
-	double m_A128(0.0);
-	double m_A129(0.0);
-	double m_A130(0.0);
-	double m_A131(0.0);
-	double m_A132(0.0);
-	double m_A133(0.0);
-	double m_A134(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
+	m_A0 += gt[2];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
+	RHS0 += Idr[2];
 	RHS0 -= go[1] * *cnV[1];
-	m_A2 += gt[2];
+	RHS0 -= go[2] * *cnV[2];
 	m_A2 += gt[3];
-	m_A3 += go[2];
-	double RHS1 = Idr[2];
-	RHS1 += Idr[3];
-	RHS1 -= go[3] * *cnV[3];
-	m_A4 += gt[4];
-	m_A4 += gt[5];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
 	m_A4 += gt[6];
-	m_A5 += go[4];
-	double RHS2 = Idr[4];
-	RHS2 += Idr[5];
-	RHS2 += Idr[6];
-	RHS2 -= go[5] * *cnV[5];
-	RHS2 -= go[6] * *cnV[6];
-	m_A6 += gt[7];
-	m_A6 += gt[8];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
 	m_A6 += gt[9];
 	m_A6 += gt[10];
 	m_A6 += gt[11];
-	m_A6 += gt[12];
-	m_A6 += gt[13];
-	m_A7 += go[7];
-	double RHS3 = Idr[7];
-	RHS3 += Idr[8];
-	RHS3 += Idr[9];
+	m_A7 += go[9];
+	double RHS3 = Idr[9];
 	RHS3 += Idr[10];
 	RHS3 += Idr[11];
-	RHS3 += Idr[12];
-	RHS3 += Idr[13];
-	RHS3 -= go[8] * *cnV[8];
-	RHS3 -= go[9] * *cnV[9];
 	RHS3 -= go[10] * *cnV[10];
 	RHS3 -= go[11] * *cnV[11];
-	RHS3 -= go[12] * *cnV[12];
-	RHS3 -= go[13] * *cnV[13];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
 	m_A8 += gt[14];
-	m_A8 += gt[15];
-	m_A9 += go[14];
-	double RHS4 = Idr[14];
-	RHS4 += Idr[15];
-	RHS4 -= go[15] * *cnV[15];
+	m_A9 += go[12];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 -= go[13] * *cnV[13];
+	RHS4 -= go[14] * *cnV[14];
+	m_A10 += gt[15];
 	m_A10 += gt[16];
 	m_A10 += gt[17];
-	m_A10 += gt[18];
-	m_A10 += gt[19];
-	m_A12 += go[16];
-	m_A13 += go[17];
-	m_A11 += go[18];
-	double RHS5 = Idr[16];
+	m_A11 += go[15];
+	double RHS5 = Idr[15];
+	RHS5 += Idr[16];
 	RHS5 += Idr[17];
-	RHS5 += Idr[18];
-	RHS5 += Idr[19];
-	RHS5 -= go[19] * *cnV[19];
-	m_A14 += gt[20];
-	m_A14 += gt[21];
-	m_A14 += gt[22];
-	m_A14 += gt[23];
-	m_A14 += gt[24];
-	m_A14 += gt[25];
-	m_A14 += gt[26];
+	RHS5 -= go[16] * *cnV[16];
+	RHS5 -= go[17] * *cnV[17];
+	m_A12 += gt[18];
+	m_A12 += gt[19];
+	m_A12 += gt[20];
+	m_A12 += gt[21];
+	m_A12 += gt[22];
+	m_A12 += gt[23];
+	m_A12 += gt[24];
+	m_A19 += go[18];
+	m_A13 += go[19];
 	m_A15 += go[20];
-	double RHS6 = Idr[20];
+	m_A17 += go[21];
+	m_A18 += go[22];
+	m_A16 += go[23];
+	m_A14 += go[24];
+	double RHS6 = Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
 	RHS6 += Idr[21];
 	RHS6 += Idr[22];
 	RHS6 += Idr[23];
 	RHS6 += Idr[24];
-	RHS6 += Idr[25];
-	RHS6 += Idr[26];
-	RHS6 -= go[21] * *cnV[21];
-	RHS6 -= go[22] * *cnV[22];
-	RHS6 -= go[23] * *cnV[23];
-	RHS6 -= go[24] * *cnV[24];
-	RHS6 -= go[25] * *cnV[25];
-	RHS6 -= go[26] * *cnV[26];
-	m_A16 += gt[27];
-	m_A16 += gt[28];
-	m_A17 += go[27];
-	m_A18 += go[28];
-	double RHS7 = Idr[27];
-	RHS7 += Idr[28];
-	m_A19 += gt[29];
-	m_A19 += gt[30];
-	m_A19 += gt[31];
-	m_A20 += go[29];
-	double RHS8 = Idr[29];
-	RHS8 += Idr[30];
-	RHS8 += Idr[31];
-	RHS8 -= go[30] * *cnV[30];
-	RHS8 -= go[31] * *cnV[31];
-	m_A21 += gt[32];
-	m_A21 += gt[33];
-	m_A22 += go[32];
-	double RHS9 = Idr[32];
-	RHS9 += Idr[33];
-	RHS9 -= go[33] * *cnV[33];
-	m_A23 += gt[34];
-	m_A23 += gt[35];
-	m_A24 += go[34];
-	double RHS10 = Idr[34];
-	RHS10 += Idr[35];
-	RHS10 -= go[35] * *cnV[35];
-	m_A25 += gt[36];
-	m_A25 += gt[37];
-	m_A25 += gt[38];
-	m_A27 += go[36];
-	m_A26 += go[37];
-	m_A26 += go[38];
-	double RHS11 = Idr[36];
-	RHS11 += Idr[37];
-	RHS11 += Idr[38];
-	m_A28 += gt[39];
-	m_A28 += gt[40];
-	m_A28 += gt[41];
-	m_A28 += gt[42];
-	m_A28 += gt[43];
-	m_A28 += gt[44];
-	m_A28 += gt[45];
-	m_A29 += go[39];
-	double RHS12 = Idr[39];
-	RHS12 += Idr[40];
-	RHS12 += Idr[41];
-	RHS12 += Idr[42];
-	RHS12 += Idr[43];
-	RHS12 += Idr[44];
-	RHS12 += Idr[45];
-	RHS12 -= go[40] * *cnV[40];
-	RHS12 -= go[41] * *cnV[41];
-	RHS12 -= go[42] * *cnV[42];
-	RHS12 -= go[43] * *cnV[43];
-	RHS12 -= go[44] * *cnV[44];
-	RHS12 -= go[45] * *cnV[45];
-	m_A30 += gt[46];
-	m_A30 += gt[47];
-	m_A30 += gt[48];
-	m_A31 += go[46];
-	double RHS13 = Idr[46];
-	RHS13 += Idr[47];
-	RHS13 += Idr[48];
-	RHS13 -= go[47] * *cnV[47];
-	RHS13 -= go[48] * *cnV[48];
-	m_A32 += gt[49];
-	m_A32 += gt[50];
-	m_A32 += gt[51];
-	m_A32 += gt[52];
-	m_A34 += go[49];
-	m_A33 += go[50];
-	m_A35 += go[51];
-	double RHS14 = Idr[49];
-	RHS14 += Idr[50];
-	RHS14 += Idr[51];
-	RHS14 += Idr[52];
-	RHS14 -= go[52] * *cnV[52];
-	m_A37 += gt[53];
-	m_A37 += gt[54];
-	m_A36 += go[53];
-	double RHS15 = Idr[53];
-	RHS15 += Idr[54];
-	RHS15 -= go[54] * *cnV[54];
-	m_A39 += gt[55];
-	m_A39 += gt[56];
-	m_A39 += gt[57];
-	m_A39 += gt[58];
-	m_A38 += go[55];
-	m_A40 += go[56];
-	double RHS16 = Idr[55];
-	RHS16 += Idr[56];
-	RHS16 += Idr[57];
-	RHS16 += Idr[58];
-	RHS16 -= go[57] * *cnV[57];
-	RHS16 -= go[58] * *cnV[58];
-	m_A42 += gt[59];
-	m_A42 += gt[60];
-	m_A41 += go[59];
-	double RHS17 = Idr[59];
-	RHS17 += Idr[60];
-	RHS17 -= go[60] * *cnV[60];
-	m_A45 += gt[61];
-	m_A45 += gt[62];
-	m_A43 += go[61];
-	m_A44 += go[62];
-	double RHS18 = Idr[61];
-	RHS18 += Idr[62];
-	m_A49 += gt[63];
-	m_A49 += gt[64];
-	m_A48 += go[63];
-	double RHS19 = Idr[63];
-	RHS19 += Idr[64];
-	RHS19 -= go[64] * *cnV[64];
-	m_A51 += gt[65];
-	m_A51 += gt[66];
-	m_A51 += gt[67];
-	m_A51 += gt[68];
-	m_A53 += go[65];
-	m_A50 += go[66];
-	m_A54 += go[67];
-	double RHS20 = Idr[65];
-	RHS20 += Idr[66];
-	RHS20 += Idr[67];
-	RHS20 += Idr[68];
-	RHS20 -= go[68] * *cnV[68];
-	m_A62 += gt[69];
-	m_A62 += gt[70];
-	m_A62 += gt[71];
-	m_A62 += gt[72];
-	m_A62 += gt[73];
-	m_A62 += gt[74];
-	m_A62 += gt[75];
-	m_A62 += gt[76];
-	m_A62 += gt[77];
-	m_A55 += go[69];
-	m_A58 += go[70];
-	m_A58 += go[71];
-	m_A57 += go[72];
-	m_A56 += go[73];
-	m_A65 += go[74];
-	double RHS21 = Idr[69];
-	RHS21 += Idr[70];
-	RHS21 += Idr[71];
-	RHS21 += Idr[72];
-	RHS21 += Idr[73];
-	RHS21 += Idr[74];
-	RHS21 += Idr[75];
-	RHS21 += Idr[76];
-	RHS21 += Idr[77];
-	RHS21 -= go[75] * *cnV[75];
-	RHS21 -= go[76] * *cnV[76];
-	RHS21 -= go[77] * *cnV[77];
-	m_A70 += gt[78];
-	m_A70 += gt[79];
-	m_A68 += go[78];
-	m_A67 += go[79];
-	double RHS22 = Idr[78];
-	RHS22 += Idr[79];
-	m_A77 += gt[80];
-	m_A77 += gt[81];
-	m_A77 += gt[82];
-	m_A77 += gt[83];
-	m_A76 += go[80];
-	m_A78 += go[81];
-	double RHS23 = Idr[80];
-	RHS23 += Idr[81];
-	RHS23 += Idr[82];
-	RHS23 += Idr[83];
-	RHS23 -= go[82] * *cnV[82];
-	RHS23 -= go[83] * *cnV[83];
-	m_A83 += gt[84];
-	m_A83 += gt[85];
-	m_A83 += gt[86];
-	m_A83 += gt[87];
-	m_A83 += gt[88];
-	m_A83 += gt[89];
-	m_A79 += go[84];
-	m_A80 += go[85];
-	m_A86 += go[86];
-	double RHS24 = Idr[84];
-	RHS24 += Idr[85];
-	RHS24 += Idr[86];
-	RHS24 += Idr[87];
-	RHS24 += Idr[88];
-	RHS24 += Idr[89];
-	RHS24 -= go[87] * *cnV[87];
-	RHS24 -= go[88] * *cnV[88];
-	RHS24 -= go[89] * *cnV[89];
-	m_A89 += gt[90];
-	m_A89 += gt[91];
-	m_A89 += gt[92];
-	m_A89 += gt[93];
-	m_A88 += go[90];
-	m_A90 += go[91];
-	double RHS25 = Idr[90];
-	RHS25 += Idr[91];
-	RHS25 += Idr[92];
-	RHS25 += Idr[93];
-	RHS25 -= go[92] * *cnV[92];
-	RHS25 -= go[93] * *cnV[93];
-	m_A98 += gt[94];
-	m_A98 += gt[95];
-	m_A98 += gt[96];
-	m_A98 += gt[97];
-	m_A98 += gt[98];
-	m_A98 += gt[99];
-	m_A91 += go[94];
-	m_A92 += go[95];
-	m_A93 += go[96];
-	m_A101 += go[97];
-	double RHS26 = Idr[94];
-	RHS26 += Idr[95];
-	RHS26 += Idr[96];
-	RHS26 += Idr[97];
-	RHS26 += Idr[98];
-	RHS26 += Idr[99];
-	RHS26 -= go[98] * *cnV[98];
-	RHS26 -= go[99] * *cnV[99];
-	m_A111 += gt[100];
-	m_A111 += gt[101];
-	m_A111 += gt[102];
-	m_A111 += gt[103];
-	m_A111 += gt[104];
-	m_A107 += go[100];
-	m_A105 += go[101];
-	m_A104 += go[102];
-	m_A103 += go[103];
-	m_A102 += go[104];
-	double RHS27 = Idr[100];
-	RHS27 += Idr[101];
-	RHS27 += Idr[102];
-	RHS27 += Idr[103];
-	RHS27 += Idr[104];
-	m_A122 += gt[105];
-	m_A122 += gt[106];
-	m_A122 += gt[107];
-	m_A122 += gt[108];
-	m_A122 += gt[109];
-	m_A119 += go[105];
-	m_A117 += go[106];
-	m_A116 += go[107];
-	m_A115 += go[108];
-	m_A114 += go[109];
-	double RHS28 = Idr[105];
-	RHS28 += Idr[106];
-	RHS28 += Idr[107];
-	RHS28 += Idr[108];
-	RHS28 += Idr[109];
-	m_A134 += gt[110];
-	m_A134 += gt[111];
-	m_A134 += gt[112];
-	m_A134 += gt[113];
-	m_A134 += gt[114];
-	m_A131 += go[110];
-	m_A126 += go[111];
-	m_A127 += go[112];
-	m_A125 += go[113];
-	m_A124 += go[114];
-	double RHS29 = Idr[110];
-	RHS29 += Idr[111];
-	RHS29 += Idr[112];
-	RHS29 += Idr[113];
-	RHS29 += Idr[114];
+	m_A20 += gt[25];
+	m_A20 += gt[26];
+	m_A22 += go[25];
+	m_A21 += go[26];
+	double RHS7 = Idr[25];
+	RHS7 += Idr[26];
+	m_A25 += gt[27];
+	m_A25 += gt[28];
+	m_A24 += go[27];
+	m_A23 += go[28];
+	double RHS8 = Idr[27];
+	RHS8 += Idr[28];
+	m_A35 += gt[29];
+	m_A35 += gt[30];
+	m_A33 += go[29];
+	m_A32 += go[30];
+	double RHS9 = Idr[29];
+	RHS9 += Idr[30];
+	m_A45 += gt[31];
+	m_A45 += gt[32];
+	m_A42 += go[31];
+	m_A41 += go[32];
+	double RHS10 = Idr[31];
+	RHS10 += Idr[32];
+	m_A55 += gt[33];
+	m_A55 += gt[34];
+	m_A51 += go[33];
+	m_A50 += go[34];
+	double RHS11 = Idr[33];
+	RHS11 += Idr[34];
+	m_A65 += gt[35];
+	m_A65 += gt[36];
+	m_A60 += go[35];
+	m_A59 += go[36];
+	double RHS12 = Idr[35];
+	RHS12 += Idr[36];
+	m_A75 += gt[37];
+	m_A75 += gt[38];
+	m_A69 += go[37];
+	m_A68 += go[38];
+	double RHS13 = Idr[37];
+	RHS13 += Idr[38];
+	m_A85 += gt[39];
+	m_A85 += gt[40];
+	m_A85 += gt[41];
+	m_A78 += go[39];
+	m_A77 += go[40];
+	double RHS14 = Idr[39];
+	RHS14 += Idr[40];
+	RHS14 += Idr[41];
+	RHS14 -= go[41] * *cnV[41];
+	m_A89 += gt[42];
+	m_A89 += gt[43];
+	m_A87 += go[42];
+	double RHS15 = Idr[42];
+	RHS15 += Idr[43];
+	RHS15 -= go[43] * *cnV[43];
 	const double f0 = 1.0 / m_A0;
-	const double f0_18 = -f0 * m_A43;
-	m_A45 += m_A1 * f0_18;
-	RHS18 += f0_18 * RHS0;
+	const double f0_9 = -f0 * m_A32;
+	m_A35 += m_A1 * f0_9;
+	RHS9 += f0_9 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_15 = -f1 * m_A36;
-	m_A37 += m_A3 * f1_15;
-	RHS15 += f1_15 * RHS1;
-	const double f1_27 = -f1 * m_A102;
-	m_A105 += m_A3 * f1_27;
-	RHS27 += f1_27 * RHS1;
+	const double f1_11 = -f1 * m_A50;
+	m_A55 += m_A3 * f1_11;
+	RHS11 += f1_11 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_16 = -f2 * m_A38;
-	m_A40 += m_A5 * f2_16;
-	RHS16 += f2_16 * RHS2;
-	const double f2_27 = -f2 * m_A103;
-	m_A111 += m_A5 * f2_27;
-	RHS27 += f2_27 * RHS2;
+	const double f2_13 = -f2 * m_A68;
+	m_A75 += m_A5 * f2_13;
+	RHS13 += f2_13 * RHS2;
 	const double f3 = 1.0 / m_A6;
-	const double f3_21 = -f3 * m_A55;
-	m_A59 += m_A7 * f3_21;
-	RHS21 += f3_21 * RHS3;
+	const double f3_12 = -f3 * m_A59;
+	m_A65 += m_A7 * f3_12;
+	RHS12 += f3_12 * RHS3;
 	const double f4 = 1.0 / m_A8;
-	const double f4_17 = -f4 * m_A41;
-	m_A42 += m_A9 * f4_17;
-	RHS17 += f4_17 * RHS4;
-	const double f4_29 = -f4 * m_A124;
-	m_A126 += m_A9 * f4_29;
-	RHS29 += f4_29 * RHS4;
+	const double f4_10 = -f4 * m_A41;
+	m_A45 += m_A9 * f4_10;
+	RHS10 += f4_10 * RHS4;
 	const double f5 = 1.0 / m_A10;
-	const double f5_18 = -f5 * m_A44;
-	m_A45 += m_A11 * f5_18;
-	m_A46 += m_A12 * f5_18;
-	m_A47 += m_A13 * f5_18;
-	RHS18 += f5_18 * RHS5;
-	const double f5_21 = -f5 * m_A56;
-	m_A60 += m_A11 * f5_21;
-	m_A62 += m_A12 * f5_21;
-	m_A65 += m_A13 * f5_21;
-	RHS21 += f5_21 * RHS5;
-	const double f5_27 = -f5 * m_A104;
-	m_A106 += m_A11 * f5_27;
-	m_A107 += m_A12 * f5_27;
-	m_A111 += m_A13 * f5_27;
-	RHS27 += f5_27 * RHS5;
-	const double f6 = 1.0 / m_A14;
-	const double f6_26 = -f6 * m_A91;
-	m_A97 += m_A15 * f6_26;
-	RHS26 += f6_26 * RHS6;
-	const double f7 = 1.0 / m_A16;
-	const double f7_20 = -f7 * m_A50;
-	m_A51 += m_A17 * f7_20;
-	m_A52 += m_A18 * f7_20;
-	RHS20 += f7_20 * RHS7;
-	const double f7_21 = -f7 * m_A57;
-	m_A61 += m_A17 * f7_21;
-	m_A62 += m_A18 * f7_21;
-	RHS21 += f7_21 * RHS7;
-	const double f8 = 1.0 / m_A19;
-	const double f8_25 = -f8 * m_A88;
-	m_A90 += m_A20 * f8_25;
-	RHS25 += f8_25 * RHS8;
-	const double f8_29 = -f8 * m_A125;
-	m_A134 += m_A20 * f8_29;
-	RHS29 += f8_29 * RHS8;
-	const double f9 = 1.0 / m_A21;
-	const double f9_19 = -f9 * m_A48;
-	m_A49 += m_A22 * f9_19;
-	RHS19 += f9_19 * RHS9;
-	const double f9_28 = -f9 * m_A114;
-	m_A117 += m_A22 * f9_28;
-	RHS28 += f9_28 * RHS9;
-	const double f10 = 1.0 / m_A23;
-	const double f10_26 = -f10 * m_A92;
-	m_A98 += m_A24 * f10_26;
-	RHS26 += f10_26 * RHS10;
-	const double f11 = 1.0 / m_A25;
-	const double f11_21 = -f11 * m_A58;
-	m_A62 += m_A26 * f11_21;
-	m_A63 += m_A27 * f11_21;
-	RHS21 += f11_21 * RHS11;
-	const double f11_22 = -f11 * m_A67;
-	m_A69 += m_A26 * f11_22;
-	m_A70 += m_A27 * f11_22;
-	RHS22 += f11_22 * RHS11;
-	const double f12 = 1.0 / m_A28;
-	const double f12_24 = -f12 * m_A79;
-	m_A82 += m_A29 * f12_24;
-	RHS24 += f12_24 * RHS12;
-	const double f13 = 1.0 / m_A30;
-	const double f13_23 = -f13 * m_A76;
-	m_A78 += m_A31 * f13_23;
-	RHS23 += f13_23 * RHS13;
-	const double f13_28 = -f13 * m_A115;
-	m_A122 += m_A31 * f13_28;
-	RHS28 += f13_28 * RHS13;
-	const double f14 = 1.0 / m_A32;
-	const double f14_22 = -f14 * m_A68;
-	m_A70 += m_A33 * f14_22;
-	m_A71 += m_A34 * f14_22;
-	m_A74 += m_A35 * f14_22;
-	RHS22 += f14_22 * RHS14;
-	const double f14_24 = -f14 * m_A80;
-	m_A81 += m_A33 * f14_24;
-	m_A83 += m_A34 * f14_24;
-	m_A86 += m_A35 * f14_24;
-	RHS24 += f14_24 * RHS14;
-	const double f14_28 = -f14 * m_A116;
-	m_A118 += m_A33 * f14_28;
-	m_A119 += m_A34 * f14_28;
-	m_A122 += m_A35 * f14_28;
-	RHS28 += f14_28 * RHS14;
-	const double f15 = 1.0 / m_A37;
-	const double f15_27 = -f15 * m_A105;
-	RHS27 += f15_27 * RHS15;
-	const double f16 = 1.0 / m_A39;
-	const double f16_21 = -f16 * m_A59;
-	m_A65 += m_A40 * f16_21;
-	RHS21 += f16_21 * RHS16;
-	const double f17 = 1.0 / m_A42;
-	const double f17_29 = -f17 * m_A126;
-	RHS29 += f17_29 * RHS17;
-	const double f18 = 1.0 / m_A45;
-	const double f18_21 = -f18 * m_A60;
-	m_A62 += m_A46 * f18_21;
-	m_A65 += m_A47 * f18_21;
-	RHS21 += f18_21 * RHS18;
-	const double f18_27 = -f18 * m_A106;
-	m_A107 += m_A46 * f18_27;
-	m_A111 += m_A47 * f18_27;
-	RHS27 += f18_27 * RHS18;
-	const double f19 = 1.0 / m_A49;
-	const double f19_28 = -f19 * m_A117;
-	RHS28 += f19_28 * RHS19;
-	const double f20 = 1.0 / m_A51;
-	const double f20_21 = -f20 * m_A61;
-	m_A62 += m_A52 * f20_21;
-	m_A64 += m_A53 * f20_21;
-	m_A66 += m_A54 * f20_21;
-	RHS21 += f20_21 * RHS20;
-	const double f20_26 = -f20 * m_A93;
-	m_A94 += m_A52 * f20_26;
-	m_A98 += m_A53 * f20_26;
-	m_A101 += m_A54 * f20_26;
-	RHS26 += f20_26 * RHS20;
-	const double f20_29 = -f20 * m_A127;
-	m_A128 += m_A52 * f20_29;
-	m_A131 += m_A53 * f20_29;
-	m_A134 += m_A54 * f20_29;
-	RHS29 += f20_29 * RHS20;
-	const double f21 = 1.0 / m_A62;
-	const double f21_22 = -f21 * m_A69;
-	m_A70 += m_A63 * f21_22;
-	m_A72 += m_A64 * f21_22;
-	m_A73 += m_A65 * f21_22;
-	m_A75 += m_A66 * f21_22;
-	RHS22 += f21_22 * RHS21;
-	const double f21_26 = -f21 * m_A94;
-	m_A95 += m_A63 * f21_26;
-	m_A98 += m_A64 * f21_26;
-	m_A99 += m_A65 * f21_26;
-	m_A101 += m_A66 * f21_26;
-	RHS26 += f21_26 * RHS21;
-	const double f21_27 = -f21 * m_A107;
-	m_A108 += m_A63 * f21_27;
-	m_A110 += m_A64 * f21_27;
-	m_A111 += m_A65 * f21_27;
-	m_A113 += m_A66 * f21_27;
-	RHS27 += f21_27 * RHS21;
-	const double f21_29 = -f21 * m_A128;
-	m_A129 += m_A63 * f21_29;
-	m_A131 += m_A64 * f21_29;
-	m_A132 += m_A65 * f21_29;
-	m_A134 += m_A66 * f21_29;
-	RHS29 += f21_29 * RHS21;
-	const double f22 = 1.0 / m_A70;
-	const double f22_24 = -f22 * m_A81;
-	m_A83 += m_A71 * f22_24;
-	m_A84 += m_A72 * f22_24;
-	m_A85 += m_A73 * f22_24;
-	m_A86 += m_A74 * f22_24;
-	m_A87 += m_A75 * f22_24;
-	RHS24 += f22_24 * RHS22;
-	const double f22_26 = -f22 * m_A95;
-	m_A96 += m_A71 * f22_26;
-	m_A98 += m_A72 * f22_26;
-	m_A99 += m_A73 * f22_26;
-	m_A100 += m_A74 * f22_26;
-	m_A101 += m_A75 * f22_26;
-	RHS26 += f22_26 * RHS22;
-	const double f22_27 = -f22 * m_A108;
-	m_A109 += m_A71 * f22_27;
-	m_A110 += m_A72 * f22_27;
-	m_A111 += m_A73 * f22_27;
-	m_A112 += m_A74 * f22_27;
-	m_A113 += m_A75 * f22_27;
-	RHS27 += f22_27 * RHS22;
-	const double f22_28 = -f22 * m_A118;
-	m_A119 += m_A71 * f22_28;
-	m_A120 += m_A72 * f22_28;
-	m_A121 += m_A73 * f22_28;
-	m_A122 += m_A74 * f22_28;
-	m_A123 += m_A75 * f22_28;
-	RHS28 += f22_28 * RHS22;
-	const double f22_29 = -f22 * m_A129;
-	m_A130 += m_A71 * f22_29;
-	m_A131 += m_A72 * f22_29;
-	m_A132 += m_A73 * f22_29;
-	m_A133 += m_A74 * f22_29;
-	m_A134 += m_A75 * f22_29;
-	RHS29 += f22_29 * RHS22;
-	const double f23 = 1.0 / m_A77;
-	const double f23_24 = -f23 * m_A82;
-	m_A86 += m_A78 * f23_24;
-	RHS24 += f23_24 * RHS23;
-	const double f24 = 1.0 / m_A83;
-	const double f24_26 = -f24 * m_A96;
-	m_A98 += m_A84 * f24_26;
-	m_A99 += m_A85 * f24_26;
-	m_A100 += m_A86 * f24_26;
-	m_A101 += m_A87 * f24_26;
-	RHS26 += f24_26 * RHS24;
-	const double f24_27 = -f24 * m_A109;
-	m_A110 += m_A84 * f24_27;
-	m_A111 += m_A85 * f24_27;
-	m_A112 += m_A86 * f24_27;
-	m_A113 += m_A87 * f24_27;
-	RHS27 += f24_27 * RHS24;
-	const double f24_28 = -f24 * m_A119;
-	m_A120 += m_A84 * f24_28;
-	m_A121 += m_A85 * f24_28;
-	m_A122 += m_A86 * f24_28;
-	m_A123 += m_A87 * f24_28;
-	RHS28 += f24_28 * RHS24;
-	const double f24_29 = -f24 * m_A130;
-	m_A131 += m_A84 * f24_29;
-	m_A132 += m_A85 * f24_29;
-	m_A133 += m_A86 * f24_29;
-	m_A134 += m_A87 * f24_29;
-	RHS29 += f24_29 * RHS24;
-	const double f25 = 1.0 / m_A89;
-	const double f25_26 = -f25 * m_A97;
-	m_A101 += m_A90 * f25_26;
-	RHS26 += f25_26 * RHS25;
-	const double f26 = 1.0 / m_A98;
-	const double f26_27 = -f26 * m_A110;
-	m_A111 += m_A99 * f26_27;
-	m_A112 += m_A100 * f26_27;
-	m_A113 += m_A101 * f26_27;
-	RHS27 += f26_27 * RHS26;
-	const double f26_28 = -f26 * m_A120;
-	m_A121 += m_A99 * f26_28;
-	m_A122 += m_A100 * f26_28;
-	m_A123 += m_A101 * f26_28;
-	RHS28 += f26_28 * RHS26;
-	const double f26_29 = -f26 * m_A131;
-	m_A132 += m_A99 * f26_29;
-	m_A133 += m_A100 * f26_29;
-	m_A134 += m_A101 * f26_29;
-	RHS29 += f26_29 * RHS26;
-	const double f27 = 1.0 / m_A111;
-	const double f27_28 = -f27 * m_A121;
-	m_A122 += m_A112 * f27_28;
-	m_A123 += m_A113 * f27_28;
-	RHS28 += f27_28 * RHS27;
-	const double f27_29 = -f27 * m_A132;
-	m_A133 += m_A112 * f27_29;
-	m_A134 += m_A113 * f27_29;
-	RHS29 += f27_29 * RHS27;
-	const double f28 = 1.0 / m_A122;
-	const double f28_29 = -f28 * m_A133;
-	m_A134 += m_A123 * f28_29;
-	RHS29 += f28_29 * RHS28;
-	V[29] = RHS29 / m_A134;
-	double tmp28 = 0.0;
-	tmp28 += m_A123 * V[29];
-	V[28] = (RHS28 - tmp28) / m_A122;
-	double tmp27 = 0.0;
-	tmp27 += m_A112 * V[28];
-	tmp27 += m_A113 * V[29];
-	V[27] = (RHS27 - tmp27) / m_A111;
-	double tmp26 = 0.0;
-	tmp26 += m_A99 * V[27];
-	tmp26 += m_A100 * V[28];
-	tmp26 += m_A101 * V[29];
-	V[26] = (RHS26 - tmp26) / m_A98;
-	double tmp25 = 0.0;
-	tmp25 += m_A90 * V[29];
-	V[25] = (RHS25 - tmp25) / m_A89;
-	double tmp24 = 0.0;
-	tmp24 += m_A84 * V[26];
-	tmp24 += m_A85 * V[27];
-	tmp24 += m_A86 * V[28];
-	tmp24 += m_A87 * V[29];
-	V[24] = (RHS24 - tmp24) / m_A83;
-	double tmp23 = 0.0;
-	tmp23 += m_A78 * V[28];
-	V[23] = (RHS23 - tmp23) / m_A77;
-	double tmp22 = 0.0;
-	tmp22 += m_A71 * V[24];
-	tmp22 += m_A72 * V[26];
-	tmp22 += m_A73 * V[27];
-	tmp22 += m_A74 * V[28];
-	tmp22 += m_A75 * V[29];
-	V[22] = (RHS22 - tmp22) / m_A70;
-	double tmp21 = 0.0;
-	tmp21 += m_A63 * V[22];
-	tmp21 += m_A64 * V[26];
-	tmp21 += m_A65 * V[27];
-	tmp21 += m_A66 * V[29];
-	V[21] = (RHS21 - tmp21) / m_A62;
-	double tmp20 = 0.0;
-	tmp20 += m_A52 * V[21];
-	tmp20 += m_A53 * V[26];
-	tmp20 += m_A54 * V[29];
-	V[20] = (RHS20 - tmp20) / m_A51;
-	double tmp19 = 0.0;
-	V[19] = (RHS19 - tmp19) / m_A49;
-	double tmp18 = 0.0;
-	tmp18 += m_A46 * V[21];
-	tmp18 += m_A47 * V[27];
-	V[18] = (RHS18 - tmp18) / m_A45;
-	double tmp17 = 0.0;
-	V[17] = (RHS17 - tmp17) / m_A42;
-	double tmp16 = 0.0;
-	tmp16 += m_A40 * V[27];
-	V[16] = (RHS16 - tmp16) / m_A39;
-	double tmp15 = 0.0;
-	V[15] = (RHS15 - tmp15) / m_A37;
+	const double f5_8 = -f5 * m_A23;
+	m_A25 += m_A11 * f5_8;
+	RHS8 += f5_8 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_8 = -f6 * m_A24;
+	m_A25 += m_A13 * f6_8;
+	m_A26 += m_A14 * f6_8;
+	m_A27 += m_A15 * f6_8;
+	m_A28 += m_A16 * f6_8;
+	m_A29 += m_A17 * f6_8;
+	m_A30 += m_A18 * f6_8;
+	m_A31 += m_A19 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f6_9 = -f6 * m_A33;
+	m_A34 += m_A13 * f6_9;
+	m_A35 += m_A14 * f6_9;
+	m_A36 += m_A15 * f6_9;
+	m_A37 += m_A16 * f6_9;
+	m_A38 += m_A17 * f6_9;
+	m_A39 += m_A18 * f6_9;
+	m_A40 += m_A19 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f6_10 = -f6 * m_A42;
+	m_A43 += m_A13 * f6_10;
+	m_A44 += m_A14 * f6_10;
+	m_A45 += m_A15 * f6_10;
+	m_A46 += m_A16 * f6_10;
+	m_A47 += m_A17 * f6_10;
+	m_A48 += m_A18 * f6_10;
+	m_A49 += m_A19 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f6_11 = -f6 * m_A51;
+	m_A52 += m_A13 * f6_11;
+	m_A53 += m_A14 * f6_11;
+	m_A54 += m_A15 * f6_11;
+	m_A55 += m_A16 * f6_11;
+	m_A56 += m_A17 * f6_11;
+	m_A57 += m_A18 * f6_11;
+	m_A58 += m_A19 * f6_11;
+	RHS11 += f6_11 * RHS6;
+	const double f6_12 = -f6 * m_A60;
+	m_A61 += m_A13 * f6_12;
+	m_A62 += m_A14 * f6_12;
+	m_A63 += m_A15 * f6_12;
+	m_A64 += m_A16 * f6_12;
+	m_A65 += m_A17 * f6_12;
+	m_A66 += m_A18 * f6_12;
+	m_A67 += m_A19 * f6_12;
+	RHS12 += f6_12 * RHS6;
+	const double f6_13 = -f6 * m_A69;
+	m_A70 += m_A13 * f6_13;
+	m_A71 += m_A14 * f6_13;
+	m_A72 += m_A15 * f6_13;
+	m_A73 += m_A16 * f6_13;
+	m_A74 += m_A17 * f6_13;
+	m_A75 += m_A18 * f6_13;
+	m_A76 += m_A19 * f6_13;
+	RHS13 += f6_13 * RHS6;
+	const double f6_14 = -f6 * m_A77;
+	m_A79 += m_A13 * f6_14;
+	m_A80 += m_A14 * f6_14;
+	m_A81 += m_A15 * f6_14;
+	m_A82 += m_A16 * f6_14;
+	m_A83 += m_A17 * f6_14;
+	m_A84 += m_A18 * f6_14;
+	m_A85 += m_A19 * f6_14;
+	RHS14 += f6_14 * RHS6;
+	const double f7 = 1.0 / m_A20;
+	const double f7_14 = -f7 * m_A78;
+	m_A85 += m_A21 * f7_14;
+	m_A86 += m_A22 * f7_14;
+	RHS14 += f7_14 * RHS7;
+	const double f7_15 = -f7 * m_A87;
+	m_A88 += m_A21 * f7_15;
+	m_A89 += m_A22 * f7_15;
+	RHS15 += f7_15 * RHS7;
+	const double f8 = 1.0 / m_A25;
+	const double f8_9 = -f8 * m_A34;
+	m_A35 += m_A26 * f8_9;
+	m_A36 += m_A27 * f8_9;
+	m_A37 += m_A28 * f8_9;
+	m_A38 += m_A29 * f8_9;
+	m_A39 += m_A30 * f8_9;
+	m_A40 += m_A31 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	const double f8_10 = -f8 * m_A43;
+	m_A44 += m_A26 * f8_10;
+	m_A45 += m_A27 * f8_10;
+	m_A46 += m_A28 * f8_10;
+	m_A47 += m_A29 * f8_10;
+	m_A48 += m_A30 * f8_10;
+	m_A49 += m_A31 * f8_10;
+	RHS10 += f8_10 * RHS8;
+	const double f8_11 = -f8 * m_A52;
+	m_A53 += m_A26 * f8_11;
+	m_A54 += m_A27 * f8_11;
+	m_A55 += m_A28 * f8_11;
+	m_A56 += m_A29 * f8_11;
+	m_A57 += m_A30 * f8_11;
+	m_A58 += m_A31 * f8_11;
+	RHS11 += f8_11 * RHS8;
+	const double f8_12 = -f8 * m_A61;
+	m_A62 += m_A26 * f8_12;
+	m_A63 += m_A27 * f8_12;
+	m_A64 += m_A28 * f8_12;
+	m_A65 += m_A29 * f8_12;
+	m_A66 += m_A30 * f8_12;
+	m_A67 += m_A31 * f8_12;
+	RHS12 += f8_12 * RHS8;
+	const double f8_13 = -f8 * m_A70;
+	m_A71 += m_A26 * f8_13;
+	m_A72 += m_A27 * f8_13;
+	m_A73 += m_A28 * f8_13;
+	m_A74 += m_A29 * f8_13;
+	m_A75 += m_A30 * f8_13;
+	m_A76 += m_A31 * f8_13;
+	RHS13 += f8_13 * RHS8;
+	const double f8_14 = -f8 * m_A79;
+	m_A80 += m_A26 * f8_14;
+	m_A81 += m_A27 * f8_14;
+	m_A82 += m_A28 * f8_14;
+	m_A83 += m_A29 * f8_14;
+	m_A84 += m_A30 * f8_14;
+	m_A85 += m_A31 * f8_14;
+	RHS14 += f8_14 * RHS8;
+	const double f9 = 1.0 / m_A35;
+	const double f9_10 = -f9 * m_A44;
+	m_A45 += m_A36 * f9_10;
+	m_A46 += m_A37 * f9_10;
+	m_A47 += m_A38 * f9_10;
+	m_A48 += m_A39 * f9_10;
+	m_A49 += m_A40 * f9_10;
+	RHS10 += f9_10 * RHS9;
+	const double f9_11 = -f9 * m_A53;
+	m_A54 += m_A36 * f9_11;
+	m_A55 += m_A37 * f9_11;
+	m_A56 += m_A38 * f9_11;
+	m_A57 += m_A39 * f9_11;
+	m_A58 += m_A40 * f9_11;
+	RHS11 += f9_11 * RHS9;
+	const double f9_12 = -f9 * m_A62;
+	m_A63 += m_A36 * f9_12;
+	m_A64 += m_A37 * f9_12;
+	m_A65 += m_A38 * f9_12;
+	m_A66 += m_A39 * f9_12;
+	m_A67 += m_A40 * f9_12;
+	RHS12 += f9_12 * RHS9;
+	const double f9_13 = -f9 * m_A71;
+	m_A72 += m_A36 * f9_13;
+	m_A73 += m_A37 * f9_13;
+	m_A74 += m_A38 * f9_13;
+	m_A75 += m_A39 * f9_13;
+	m_A76 += m_A40 * f9_13;
+	RHS13 += f9_13 * RHS9;
+	const double f9_14 = -f9 * m_A80;
+	m_A81 += m_A36 * f9_14;
+	m_A82 += m_A37 * f9_14;
+	m_A83 += m_A38 * f9_14;
+	m_A84 += m_A39 * f9_14;
+	m_A85 += m_A40 * f9_14;
+	RHS14 += f9_14 * RHS9;
+	const double f10 = 1.0 / m_A45;
+	const double f10_11 = -f10 * m_A54;
+	m_A55 += m_A46 * f10_11;
+	m_A56 += m_A47 * f10_11;
+	m_A57 += m_A48 * f10_11;
+	m_A58 += m_A49 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	const double f10_12 = -f10 * m_A63;
+	m_A64 += m_A46 * f10_12;
+	m_A65 += m_A47 * f10_12;
+	m_A66 += m_A48 * f10_12;
+	m_A67 += m_A49 * f10_12;
+	RHS12 += f10_12 * RHS10;
+	const double f10_13 = -f10 * m_A72;
+	m_A73 += m_A46 * f10_13;
+	m_A74 += m_A47 * f10_13;
+	m_A75 += m_A48 * f10_13;
+	m_A76 += m_A49 * f10_13;
+	RHS13 += f10_13 * RHS10;
+	const double f10_14 = -f10 * m_A81;
+	m_A82 += m_A46 * f10_14;
+	m_A83 += m_A47 * f10_14;
+	m_A84 += m_A48 * f10_14;
+	m_A85 += m_A49 * f10_14;
+	RHS14 += f10_14 * RHS10;
+	const double f11 = 1.0 / m_A55;
+	const double f11_12 = -f11 * m_A64;
+	m_A65 += m_A56 * f11_12;
+	m_A66 += m_A57 * f11_12;
+	m_A67 += m_A58 * f11_12;
+	RHS12 += f11_12 * RHS11;
+	const double f11_13 = -f11 * m_A73;
+	m_A74 += m_A56 * f11_13;
+	m_A75 += m_A57 * f11_13;
+	m_A76 += m_A58 * f11_13;
+	RHS13 += f11_13 * RHS11;
+	const double f11_14 = -f11 * m_A82;
+	m_A83 += m_A56 * f11_14;
+	m_A84 += m_A57 * f11_14;
+	m_A85 += m_A58 * f11_14;
+	RHS14 += f11_14 * RHS11;
+	const double f12 = 1.0 / m_A65;
+	const double f12_13 = -f12 * m_A74;
+	m_A75 += m_A66 * f12_13;
+	m_A76 += m_A67 * f12_13;
+	RHS13 += f12_13 * RHS12;
+	const double f12_14 = -f12 * m_A83;
+	m_A84 += m_A66 * f12_14;
+	m_A85 += m_A67 * f12_14;
+	RHS14 += f12_14 * RHS12;
+	const double f13 = 1.0 / m_A75;
+	const double f13_14 = -f13 * m_A84;
+	m_A85 += m_A76 * f13_14;
+	RHS14 += f13_14 * RHS13;
+	const double f14 = 1.0 / m_A85;
+	const double f14_15 = -f14 * m_A88;
+	m_A89 += m_A86 * f14_15;
+	RHS15 += f14_15 * RHS14;
+	V[15] = RHS15 / m_A89;
 	double tmp14 = 0.0;
-	tmp14 += m_A33 * V[22];
-	tmp14 += m_A34 * V[24];
-	tmp14 += m_A35 * V[28];
-	V[14] = (RHS14 - tmp14) / m_A32;
+	tmp14 += m_A86 * V[15];
+	V[14] = (RHS14 - tmp14) / m_A85;
 	double tmp13 = 0.0;
-	tmp13 += m_A31 * V[28];
-	V[13] = (RHS13 - tmp13) / m_A30;
+	tmp13 += m_A76 * V[14];
+	V[13] = (RHS13 - tmp13) / m_A75;
 	double tmp12 = 0.0;
-	tmp12 += m_A29 * V[23];
-	V[12] = (RHS12 - tmp12) / m_A28;
+	tmp12 += m_A66 * V[13];
+	tmp12 += m_A67 * V[14];
+	V[12] = (RHS12 - tmp12) / m_A65;
 	double tmp11 = 0.0;
-	tmp11 += m_A26 * V[21];
-	tmp11 += m_A27 * V[22];
-	V[11] = (RHS11 - tmp11) / m_A25;
+	tmp11 += m_A56 * V[12];
+	tmp11 += m_A57 * V[13];
+	tmp11 += m_A58 * V[14];
+	V[11] = (RHS11 - tmp11) / m_A55;
 	double tmp10 = 0.0;
-	tmp10 += m_A24 * V[26];
-	V[10] = (RHS10 - tmp10) / m_A23;
+	tmp10 += m_A46 * V[11];
+	tmp10 += m_A47 * V[12];
+	tmp10 += m_A48 * V[13];
+	tmp10 += m_A49 * V[14];
+	V[10] = (RHS10 - tmp10) / m_A45;
 	double tmp9 = 0.0;
-	tmp9 += m_A22 * V[19];
-	V[9] = (RHS9 - tmp9) / m_A21;
+	tmp9 += m_A36 * V[10];
+	tmp9 += m_A37 * V[11];
+	tmp9 += m_A38 * V[12];
+	tmp9 += m_A39 * V[13];
+	tmp9 += m_A40 * V[14];
+	V[9] = (RHS9 - tmp9) / m_A35;
 	double tmp8 = 0.0;
-	tmp8 += m_A20 * V[29];
-	V[8] = (RHS8 - tmp8) / m_A19;
+	tmp8 += m_A26 * V[9];
+	tmp8 += m_A27 * V[10];
+	tmp8 += m_A28 * V[11];
+	tmp8 += m_A29 * V[12];
+	tmp8 += m_A30 * V[13];
+	tmp8 += m_A31 * V[14];
+	V[8] = (RHS8 - tmp8) / m_A25;
 	double tmp7 = 0.0;
-	tmp7 += m_A17 * V[20];
-	tmp7 += m_A18 * V[21];
-	V[7] = (RHS7 - tmp7) / m_A16;
+	tmp7 += m_A21 * V[14];
+	tmp7 += m_A22 * V[15];
+	V[7] = (RHS7 - tmp7) / m_A20;
 	double tmp6 = 0.0;
-	tmp6 += m_A15 * V[25];
-	V[6] = (RHS6 - tmp6) / m_A14;
+	tmp6 += m_A13 * V[8];
+	tmp6 += m_A14 * V[9];
+	tmp6 += m_A15 * V[10];
+	tmp6 += m_A16 * V[11];
+	tmp6 += m_A17 * V[12];
+	tmp6 += m_A18 * V[13];
+	tmp6 += m_A19 * V[14];
+	V[6] = (RHS6 - tmp6) / m_A12;
 	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[18];
-	tmp5 += m_A12 * V[21];
-	tmp5 += m_A13 * V[27];
+	tmp5 += m_A11 * V[8];
 	V[5] = (RHS5 - tmp5) / m_A10;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[17];
+	tmp4 += m_A9 * V[10];
 	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[16];
+	tmp3 += m_A7 * V[12];
 	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[27];
+	tmp2 += m_A5 * V[13];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[15];
+	tmp1 += m_A3 * V[11];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[18];
+	tmp0 += m_A1 * V[9];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// 1942
-static void nl_gcr_b20cee3516465509_90_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// astrob
+static void nl_gcr_cf1018e7ed626623_43_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -10884,53 +53074,6 @@
 	double m_A40(0.0);
 	double m_A41(0.0);
 	double m_A42(0.0);
-	double m_A43(0.0);
-	double m_A44(0.0);
-	double m_A45(0.0);
-	double m_A46(0.0);
-	double m_A47(0.0);
-	double m_A48(0.0);
-	double m_A49(0.0);
-	double m_A50(0.0);
-	double m_A51(0.0);
-	double m_A52(0.0);
-	double m_A53(0.0);
-	double m_A54(0.0);
-	double m_A55(0.0);
-	double m_A56(0.0);
-	double m_A57(0.0);
-	double m_A58(0.0);
-	double m_A59(0.0);
-	double m_A60(0.0);
-	double m_A61(0.0);
-	double m_A62(0.0);
-	double m_A63(0.0);
-	double m_A64(0.0);
-	double m_A65(0.0);
-	double m_A66(0.0);
-	double m_A67(0.0);
-	double m_A68(0.0);
-	double m_A69(0.0);
-	double m_A70(0.0);
-	double m_A71(0.0);
-	double m_A72(0.0);
-	double m_A73(0.0);
-	double m_A74(0.0);
-	double m_A75(0.0);
-	double m_A76(0.0);
-	double m_A77(0.0);
-	double m_A78(0.0);
-	double m_A79(0.0);
-	double m_A80(0.0);
-	double m_A81(0.0);
-	double m_A82(0.0);
-	double m_A83(0.0);
-	double m_A84(0.0);
-	double m_A85(0.0);
-	double m_A86(0.0);
-	double m_A87(0.0);
-	double m_A88(0.0);
-	double m_A89(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
@@ -10960,424 +53103,258 @@
 	RHS2 -= go[8] * *cnV[8];
 	m_A6 += gt[9];
 	m_A6 += gt[10];
-	m_A6 += gt[11];
 	m_A7 += go[9];
 	double RHS3 = Idr[9];
 	RHS3 += Idr[10];
-	RHS3 += Idr[11];
 	RHS3 -= go[10] * *cnV[10];
-	RHS3 -= go[11] * *cnV[11];
+	m_A8 += gt[11];
 	m_A8 += gt[12];
-	m_A8 += gt[13];
-	m_A8 += gt[14];
-	m_A9 += go[12];
-	double RHS4 = Idr[12];
-	RHS4 += Idr[13];
-	RHS4 += Idr[14];
-	RHS4 -= go[13] * *cnV[13];
-	RHS4 -= go[14] * *cnV[14];
+	m_A9 += go[11];
+	double RHS4 = Idr[11];
+	RHS4 += Idr[12];
+	RHS4 -= go[12] * *cnV[12];
+	m_A10 += gt[13];
+	m_A10 += gt[14];
 	m_A10 += gt[15];
-	m_A10 += gt[16];
-	m_A10 += gt[17];
-	m_A11 += go[15];
-	double RHS5 = Idr[15];
-	RHS5 += Idr[16];
-	RHS5 += Idr[17];
-	RHS5 -= go[16] * *cnV[16];
-	RHS5 -= go[17] * *cnV[17];
+	m_A11 += go[13];
+	double RHS5 = Idr[13];
+	RHS5 += Idr[14];
+	RHS5 += Idr[15];
+	RHS5 -= go[14] * *cnV[14];
+	RHS5 -= go[15] * *cnV[15];
+	m_A12 += gt[16];
+	m_A12 += gt[17];
 	m_A12 += gt[18];
-	m_A12 += gt[19];
-	m_A12 += gt[20];
-	m_A12 += gt[21];
-	m_A12 += gt[22];
-	m_A12 += gt[23];
-	m_A12 += gt[24];
-	m_A19 += go[18];
-	m_A13 += go[19];
-	m_A15 += go[20];
+	m_A13 += go[16];
+	double RHS6 = Idr[16];
+	RHS6 += Idr[17];
+	RHS6 += Idr[18];
+	RHS6 -= go[17] * *cnV[17];
+	RHS6 -= go[18] * *cnV[18];
+	m_A16 += gt[19];
+	m_A16 += gt[20];
+	m_A16 += gt[21];
+	m_A16 += gt[22];
+	m_A16 += gt[23];
+	m_A16 += gt[24];
+	m_A16 += gt[25];
+	m_A15 += go[19];
+	m_A14 += go[20];
 	m_A17 += go[21];
-	m_A18 += go[22];
-	m_A16 += go[23];
-	m_A14 += go[24];
-	double RHS6 = Idr[18];
-	RHS6 += Idr[19];
-	RHS6 += Idr[20];
-	RHS6 += Idr[21];
-	RHS6 += Idr[22];
-	RHS6 += Idr[23];
-	RHS6 += Idr[24];
-	m_A20 += gt[25];
-	m_A20 += gt[26];
-	m_A22 += go[25];
-	m_A21 += go[26];
-	double RHS7 = Idr[25];
-	RHS7 += Idr[26];
-	m_A25 += gt[27];
-	m_A25 += gt[28];
-	m_A24 += go[27];
-	m_A23 += go[28];
-	double RHS8 = Idr[27];
+	m_A17 += go[22];
+	double RHS7 = Idr[19];
+	RHS7 += Idr[20];
+	RHS7 += Idr[21];
+	RHS7 += Idr[22];
+	RHS7 += Idr[23];
+	RHS7 += Idr[24];
+	RHS7 += Idr[25];
+	RHS7 -= go[23] * *cnV[23];
+	RHS7 -= go[24] * *cnV[24];
+	RHS7 -= go[25] * *cnV[25];
+	m_A18 += gt[26];
+	m_A18 += gt[27];
+	m_A18 += gt[28];
+	m_A19 += go[26];
+	double RHS8 = Idr[26];
+	RHS8 += Idr[27];
 	RHS8 += Idr[28];
-	m_A35 += gt[29];
-	m_A35 += gt[30];
-	m_A33 += go[29];
-	m_A32 += go[30];
+	RHS8 -= go[27] * *cnV[27];
+	RHS8 -= go[28] * *cnV[28];
+	m_A20 += gt[29];
+	m_A20 += gt[30];
+	m_A20 += gt[31];
+	m_A21 += go[29];
 	double RHS9 = Idr[29];
 	RHS9 += Idr[30];
-	m_A45 += gt[31];
-	m_A45 += gt[32];
-	m_A42 += go[31];
-	m_A41 += go[32];
-	double RHS10 = Idr[31];
-	RHS10 += Idr[32];
-	m_A55 += gt[33];
-	m_A55 += gt[34];
-	m_A51 += go[33];
-	m_A50 += go[34];
-	double RHS11 = Idr[33];
-	RHS11 += Idr[34];
-	m_A65 += gt[35];
-	m_A65 += gt[36];
-	m_A60 += go[35];
-	m_A59 += go[36];
-	double RHS12 = Idr[35];
-	RHS12 += Idr[36];
-	m_A75 += gt[37];
-	m_A75 += gt[38];
-	m_A69 += go[37];
-	m_A68 += go[38];
-	double RHS13 = Idr[37];
-	RHS13 += Idr[38];
-	m_A85 += gt[39];
-	m_A85 += gt[40];
-	m_A85 += gt[41];
-	m_A78 += go[39];
-	m_A77 += go[40];
-	double RHS14 = Idr[39];
-	RHS14 += Idr[40];
-	RHS14 += Idr[41];
-	RHS14 -= go[41] * *cnV[41];
-	m_A89 += gt[42];
-	m_A89 += gt[43];
-	m_A87 += go[42];
-	double RHS15 = Idr[42];
-	RHS15 += Idr[43];
-	RHS15 -= go[43] * *cnV[43];
-	const double f0 = 1.0 / m_A0;
-	const double f0_9 = -f0 * m_A32;
-	m_A35 += m_A1 * f0_9;
-	RHS9 += f0_9 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_11 = -f1 * m_A50;
-	m_A55 += m_A3 * f1_11;
-	RHS11 += f1_11 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_13 = -f2 * m_A68;
-	m_A75 += m_A5 * f2_13;
-	RHS13 += f2_13 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_12 = -f3 * m_A59;
-	m_A65 += m_A7 * f3_12;
-	RHS12 += f3_12 * RHS3;
-	const double f4 = 1.0 / m_A8;
-	const double f4_10 = -f4 * m_A41;
-	m_A45 += m_A9 * f4_10;
-	RHS10 += f4_10 * RHS4;
-	const double f5 = 1.0 / m_A10;
-	const double f5_8 = -f5 * m_A23;
-	m_A25 += m_A11 * f5_8;
-	RHS8 += f5_8 * RHS5;
-	const double f6 = 1.0 / m_A12;
-	const double f6_8 = -f6 * m_A24;
-	m_A25 += m_A13 * f6_8;
-	m_A26 += m_A14 * f6_8;
-	m_A27 += m_A15 * f6_8;
-	m_A28 += m_A16 * f6_8;
-	m_A29 += m_A17 * f6_8;
-	m_A30 += m_A18 * f6_8;
-	m_A31 += m_A19 * f6_8;
-	RHS8 += f6_8 * RHS6;
-	const double f6_9 = -f6 * m_A33;
-	m_A34 += m_A13 * f6_9;
-	m_A35 += m_A14 * f6_9;
-	m_A36 += m_A15 * f6_9;
-	m_A37 += m_A16 * f6_9;
-	m_A38 += m_A17 * f6_9;
-	m_A39 += m_A18 * f6_9;
-	m_A40 += m_A19 * f6_9;
-	RHS9 += f6_9 * RHS6;
-	const double f6_10 = -f6 * m_A42;
-	m_A43 += m_A13 * f6_10;
-	m_A44 += m_A14 * f6_10;
-	m_A45 += m_A15 * f6_10;
-	m_A46 += m_A16 * f6_10;
-	m_A47 += m_A17 * f6_10;
-	m_A48 += m_A18 * f6_10;
-	m_A49 += m_A19 * f6_10;
-	RHS10 += f6_10 * RHS6;
-	const double f6_11 = -f6 * m_A51;
-	m_A52 += m_A13 * f6_11;
-	m_A53 += m_A14 * f6_11;
-	m_A54 += m_A15 * f6_11;
-	m_A55 += m_A16 * f6_11;
-	m_A56 += m_A17 * f6_11;
-	m_A57 += m_A18 * f6_11;
-	m_A58 += m_A19 * f6_11;
-	RHS11 += f6_11 * RHS6;
-	const double f6_12 = -f6 * m_A60;
-	m_A61 += m_A13 * f6_12;
-	m_A62 += m_A14 * f6_12;
-	m_A63 += m_A15 * f6_12;
-	m_A64 += m_A16 * f6_12;
-	m_A65 += m_A17 * f6_12;
-	m_A66 += m_A18 * f6_12;
-	m_A67 += m_A19 * f6_12;
-	RHS12 += f6_12 * RHS6;
-	const double f6_13 = -f6 * m_A69;
-	m_A70 += m_A13 * f6_13;
-	m_A71 += m_A14 * f6_13;
-	m_A72 += m_A15 * f6_13;
-	m_A73 += m_A16 * f6_13;
-	m_A74 += m_A17 * f6_13;
-	m_A75 += m_A18 * f6_13;
-	m_A76 += m_A19 * f6_13;
-	RHS13 += f6_13 * RHS6;
-	const double f6_14 = -f6 * m_A77;
-	m_A79 += m_A13 * f6_14;
-	m_A80 += m_A14 * f6_14;
-	m_A81 += m_A15 * f6_14;
-	m_A82 += m_A16 * f6_14;
-	m_A83 += m_A17 * f6_14;
-	m_A84 += m_A18 * f6_14;
-	m_A85 += m_A19 * f6_14;
-	RHS14 += f6_14 * RHS6;
-	const double f7 = 1.0 / m_A20;
-	const double f7_14 = -f7 * m_A78;
-	m_A85 += m_A21 * f7_14;
-	m_A86 += m_A22 * f7_14;
-	RHS14 += f7_14 * RHS7;
-	const double f7_15 = -f7 * m_A87;
-	m_A88 += m_A21 * f7_15;
-	m_A89 += m_A22 * f7_15;
-	RHS15 += f7_15 * RHS7;
-	const double f8 = 1.0 / m_A25;
-	const double f8_9 = -f8 * m_A34;
-	m_A35 += m_A26 * f8_9;
-	m_A36 += m_A27 * f8_9;
-	m_A37 += m_A28 * f8_9;
-	m_A38 += m_A29 * f8_9;
-	m_A39 += m_A30 * f8_9;
-	m_A40 += m_A31 * f8_9;
-	RHS9 += f8_9 * RHS8;
-	const double f8_10 = -f8 * m_A43;
-	m_A44 += m_A26 * f8_10;
-	m_A45 += m_A27 * f8_10;
-	m_A46 += m_A28 * f8_10;
-	m_A47 += m_A29 * f8_10;
-	m_A48 += m_A30 * f8_10;
-	m_A49 += m_A31 * f8_10;
-	RHS10 += f8_10 * RHS8;
-	const double f8_11 = -f8 * m_A52;
-	m_A53 += m_A26 * f8_11;
-	m_A54 += m_A27 * f8_11;
-	m_A55 += m_A28 * f8_11;
-	m_A56 += m_A29 * f8_11;
-	m_A57 += m_A30 * f8_11;
-	m_A58 += m_A31 * f8_11;
-	RHS11 += f8_11 * RHS8;
-	const double f8_12 = -f8 * m_A61;
-	m_A62 += m_A26 * f8_12;
-	m_A63 += m_A27 * f8_12;
-	m_A64 += m_A28 * f8_12;
-	m_A65 += m_A29 * f8_12;
-	m_A66 += m_A30 * f8_12;
-	m_A67 += m_A31 * f8_12;
-	RHS12 += f8_12 * RHS8;
-	const double f8_13 = -f8 * m_A70;
-	m_A71 += m_A26 * f8_13;
-	m_A72 += m_A27 * f8_13;
-	m_A73 += m_A28 * f8_13;
-	m_A74 += m_A29 * f8_13;
-	m_A75 += m_A30 * f8_13;
-	m_A76 += m_A31 * f8_13;
-	RHS13 += f8_13 * RHS8;
-	const double f8_14 = -f8 * m_A79;
-	m_A80 += m_A26 * f8_14;
-	m_A81 += m_A27 * f8_14;
-	m_A82 += m_A28 * f8_14;
-	m_A83 += m_A29 * f8_14;
-	m_A84 += m_A30 * f8_14;
-	m_A85 += m_A31 * f8_14;
+	RHS9 += Idr[31];
+	RHS9 -= go[30] * *cnV[30];
+	RHS9 -= go[31] * *cnV[31];
+	m_A22 += gt[32];
+	m_A22 += gt[33];
+	m_A22 += gt[34];
+	m_A23 += go[32];
+	double RHS10 = Idr[32];
+	RHS10 += Idr[33];
+	RHS10 += Idr[34];
+	RHS10 -= go[33] * *cnV[33];
+	RHS10 -= go[34] * *cnV[34];
+	m_A24 += gt[35];
+	m_A24 += gt[36];
+	m_A24 += gt[37];
+	m_A25 += go[35];
+	double RHS11 = Idr[35];
+	RHS11 += Idr[36];
+	RHS11 += Idr[37];
+	RHS11 -= go[36] * *cnV[36];
+	RHS11 -= go[37] * *cnV[37];
+	m_A26 += gt[38];
+	m_A26 += gt[39];
+	m_A26 += gt[40];
+	m_A27 += go[38];
+	double RHS12 = Idr[38];
+	RHS12 += Idr[39];
+	RHS12 += Idr[40];
+	RHS12 -= go[39] * *cnV[39];
+	RHS12 -= go[40] * *cnV[40];
+	m_A29 += gt[41];
+	m_A29 += gt[42];
+	m_A29 += gt[43];
+	m_A29 += gt[44];
+	m_A29 += gt[45];
+	m_A28 += go[41];
+	m_A28 += go[42];
+	m_A30 += go[43];
+	double RHS13 = Idr[41];
+	RHS13 += Idr[42];
+	RHS13 += Idr[43];
+	RHS13 += Idr[44];
+	RHS13 += Idr[45];
+	RHS13 -= go[44] * *cnV[44];
+	RHS13 -= go[45] * *cnV[45];
+	m_A42 += gt[46];
+	m_A42 += gt[47];
+	m_A42 += gt[48];
+	m_A42 += gt[49];
+	m_A42 += gt[50];
+	m_A42 += gt[51];
+	m_A42 += gt[52];
+	m_A42 += gt[53];
+	m_A42 += gt[54];
+	m_A42 += gt[55];
+	m_A42 += gt[56];
+	m_A42 += gt[57];
+	m_A41 += go[46];
+	m_A40 += go[47];
+	m_A39 += go[48];
+	m_A38 += go[49];
+	m_A37 += go[50];
+	m_A36 += go[51];
+	m_A35 += go[52];
+	m_A34 += go[53];
+	m_A33 += go[54];
+	m_A32 += go[55];
+	m_A31 += go[56];
+	double RHS14 = Idr[46];
+	RHS14 += Idr[47];
+	RHS14 += Idr[48];
+	RHS14 += Idr[49];
+	RHS14 += Idr[50];
+	RHS14 += Idr[51];
+	RHS14 += Idr[52];
+	RHS14 += Idr[53];
+	RHS14 += Idr[54];
+	RHS14 += Idr[55];
+	RHS14 += Idr[56];
+	RHS14 += Idr[57];
+	RHS14 -= go[57] * *cnV[57];
+	const double f0 = 1.0 / m_A0;
+	const double f0_14 = -f0 * m_A31;
+	m_A42 += m_A1 * f0_14;
+	RHS14 += f0_14 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_14 = -f1 * m_A32;
+	m_A42 += m_A3 * f1_14;
+	RHS14 += f1_14 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_14 = -f2 * m_A33;
+	m_A42 += m_A5 * f2_14;
+	RHS14 += f2_14 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_7 = -f3 * m_A14;
+	m_A16 += m_A7 * f3_7;
+	RHS7 += f3_7 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_7 = -f4 * m_A15;
+	m_A16 += m_A9 * f4_7;
+	RHS7 += f4_7 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_14 = -f5 * m_A34;
+	m_A42 += m_A11 * f5_14;
+	RHS14 += f5_14 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_14 = -f6 * m_A35;
+	m_A42 += m_A13 * f6_14;
+	RHS14 += f6_14 * RHS6;
+	const double f7 = 1.0 / m_A16;
+	const double f7_13 = -f7 * m_A28;
+	m_A29 += m_A17 * f7_13;
+	RHS13 += f7_13 * RHS7;
+	const double f8 = 1.0 / m_A18;
+	const double f8_14 = -f8 * m_A36;
+	m_A42 += m_A19 * f8_14;
 	RHS14 += f8_14 * RHS8;
-	const double f9 = 1.0 / m_A35;
-	const double f9_10 = -f9 * m_A44;
-	m_A45 += m_A36 * f9_10;
-	m_A46 += m_A37 * f9_10;
-	m_A47 += m_A38 * f9_10;
-	m_A48 += m_A39 * f9_10;
-	m_A49 += m_A40 * f9_10;
-	RHS10 += f9_10 * RHS9;
-	const double f9_11 = -f9 * m_A53;
-	m_A54 += m_A36 * f9_11;
-	m_A55 += m_A37 * f9_11;
-	m_A56 += m_A38 * f9_11;
-	m_A57 += m_A39 * f9_11;
-	m_A58 += m_A40 * f9_11;
-	RHS11 += f9_11 * RHS9;
-	const double f9_12 = -f9 * m_A62;
-	m_A63 += m_A36 * f9_12;
-	m_A64 += m_A37 * f9_12;
-	m_A65 += m_A38 * f9_12;
-	m_A66 += m_A39 * f9_12;
-	m_A67 += m_A40 * f9_12;
-	RHS12 += f9_12 * RHS9;
-	const double f9_13 = -f9 * m_A71;
-	m_A72 += m_A36 * f9_13;
-	m_A73 += m_A37 * f9_13;
-	m_A74 += m_A38 * f9_13;
-	m_A75 += m_A39 * f9_13;
-	m_A76 += m_A40 * f9_13;
-	RHS13 += f9_13 * RHS9;
-	const double f9_14 = -f9 * m_A80;
-	m_A81 += m_A36 * f9_14;
-	m_A82 += m_A37 * f9_14;
-	m_A83 += m_A38 * f9_14;
-	m_A84 += m_A39 * f9_14;
-	m_A85 += m_A40 * f9_14;
+	const double f9 = 1.0 / m_A20;
+	const double f9_14 = -f9 * m_A37;
+	m_A42 += m_A21 * f9_14;
 	RHS14 += f9_14 * RHS9;
-	const double f10 = 1.0 / m_A45;
-	const double f10_11 = -f10 * m_A54;
-	m_A55 += m_A46 * f10_11;
-	m_A56 += m_A47 * f10_11;
-	m_A57 += m_A48 * f10_11;
-	m_A58 += m_A49 * f10_11;
-	RHS11 += f10_11 * RHS10;
-	const double f10_12 = -f10 * m_A63;
-	m_A64 += m_A46 * f10_12;
-	m_A65 += m_A47 * f10_12;
-	m_A66 += m_A48 * f10_12;
-	m_A67 += m_A49 * f10_12;
-	RHS12 += f10_12 * RHS10;
-	const double f10_13 = -f10 * m_A72;
-	m_A73 += m_A46 * f10_13;
-	m_A74 += m_A47 * f10_13;
-	m_A75 += m_A48 * f10_13;
-	m_A76 += m_A49 * f10_13;
-	RHS13 += f10_13 * RHS10;
-	const double f10_14 = -f10 * m_A81;
-	m_A82 += m_A46 * f10_14;
-	m_A83 += m_A47 * f10_14;
-	m_A84 += m_A48 * f10_14;
-	m_A85 += m_A49 * f10_14;
+	const double f10 = 1.0 / m_A22;
+	const double f10_14 = -f10 * m_A38;
+	m_A42 += m_A23 * f10_14;
 	RHS14 += f10_14 * RHS10;
-	const double f11 = 1.0 / m_A55;
-	const double f11_12 = -f11 * m_A64;
-	m_A65 += m_A56 * f11_12;
-	m_A66 += m_A57 * f11_12;
-	m_A67 += m_A58 * f11_12;
-	RHS12 += f11_12 * RHS11;
-	const double f11_13 = -f11 * m_A73;
-	m_A74 += m_A56 * f11_13;
-	m_A75 += m_A57 * f11_13;
-	m_A76 += m_A58 * f11_13;
-	RHS13 += f11_13 * RHS11;
-	const double f11_14 = -f11 * m_A82;
-	m_A83 += m_A56 * f11_14;
-	m_A84 += m_A57 * f11_14;
-	m_A85 += m_A58 * f11_14;
+	const double f11 = 1.0 / m_A24;
+	const double f11_14 = -f11 * m_A39;
+	m_A42 += m_A25 * f11_14;
 	RHS14 += f11_14 * RHS11;
-	const double f12 = 1.0 / m_A65;
-	const double f12_13 = -f12 * m_A74;
-	m_A75 += m_A66 * f12_13;
-	m_A76 += m_A67 * f12_13;
-	RHS13 += f12_13 * RHS12;
-	const double f12_14 = -f12 * m_A83;
-	m_A84 += m_A66 * f12_14;
-	m_A85 += m_A67 * f12_14;
+	const double f12 = 1.0 / m_A26;
+	const double f12_14 = -f12 * m_A40;
+	m_A42 += m_A27 * f12_14;
 	RHS14 += f12_14 * RHS12;
-	const double f13 = 1.0 / m_A75;
-	const double f13_14 = -f13 * m_A84;
-	m_A85 += m_A76 * f13_14;
+	const double f13 = 1.0 / m_A29;
+	const double f13_14 = -f13 * m_A41;
+	m_A42 += m_A30 * f13_14;
 	RHS14 += f13_14 * RHS13;
-	const double f14 = 1.0 / m_A85;
-	const double f14_15 = -f14 * m_A88;
-	m_A89 += m_A86 * f14_15;
-	RHS15 += f14_15 * RHS14;
-	V[15] = RHS15 / m_A89;
-	double tmp14 = 0.0;
-	tmp14 += m_A86 * V[15];
-	V[14] = (RHS14 - tmp14) / m_A85;
+	V[14] = RHS14 / m_A42;
 	double tmp13 = 0.0;
-	tmp13 += m_A76 * V[14];
-	V[13] = (RHS13 - tmp13) / m_A75;
+	tmp13 += m_A30 * V[14];
+	V[13] = (RHS13 - tmp13) / m_A29;
 	double tmp12 = 0.0;
-	tmp12 += m_A66 * V[13];
-	tmp12 += m_A67 * V[14];
-	V[12] = (RHS12 - tmp12) / m_A65;
+	tmp12 += m_A27 * V[14];
+	V[12] = (RHS12 - tmp12) / m_A26;
 	double tmp11 = 0.0;
-	tmp11 += m_A56 * V[12];
-	tmp11 += m_A57 * V[13];
-	tmp11 += m_A58 * V[14];
-	V[11] = (RHS11 - tmp11) / m_A55;
+	tmp11 += m_A25 * V[14];
+	V[11] = (RHS11 - tmp11) / m_A24;
 	double tmp10 = 0.0;
-	tmp10 += m_A46 * V[11];
-	tmp10 += m_A47 * V[12];
-	tmp10 += m_A48 * V[13];
-	tmp10 += m_A49 * V[14];
-	V[10] = (RHS10 - tmp10) / m_A45;
+	tmp10 += m_A23 * V[14];
+	V[10] = (RHS10 - tmp10) / m_A22;
 	double tmp9 = 0.0;
-	tmp9 += m_A36 * V[10];
-	tmp9 += m_A37 * V[11];
-	tmp9 += m_A38 * V[12];
-	tmp9 += m_A39 * V[13];
-	tmp9 += m_A40 * V[14];
-	V[9] = (RHS9 - tmp9) / m_A35;
+	tmp9 += m_A21 * V[14];
+	V[9] = (RHS9 - tmp9) / m_A20;
 	double tmp8 = 0.0;
-	tmp8 += m_A26 * V[9];
-	tmp8 += m_A27 * V[10];
-	tmp8 += m_A28 * V[11];
-	tmp8 += m_A29 * V[12];
-	tmp8 += m_A30 * V[13];
-	tmp8 += m_A31 * V[14];
-	V[8] = (RHS8 - tmp8) / m_A25;
+	tmp8 += m_A19 * V[14];
+	V[8] = (RHS8 - tmp8) / m_A18;
 	double tmp7 = 0.0;
-	tmp7 += m_A21 * V[14];
-	tmp7 += m_A22 * V[15];
-	V[7] = (RHS7 - tmp7) / m_A20;
+	tmp7 += m_A17 * V[13];
+	V[7] = (RHS7 - tmp7) / m_A16;
 	double tmp6 = 0.0;
-	tmp6 += m_A13 * V[8];
-	tmp6 += m_A14 * V[9];
-	tmp6 += m_A15 * V[10];
-	tmp6 += m_A16 * V[11];
-	tmp6 += m_A17 * V[12];
-	tmp6 += m_A18 * V[13];
-	tmp6 += m_A19 * V[14];
+	tmp6 += m_A13 * V[14];
 	V[6] = (RHS6 - tmp6) / m_A12;
 	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[8];
+	tmp5 += m_A11 * V[14];
 	V[5] = (RHS5 - tmp5) / m_A10;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[10];
+	tmp4 += m_A9 * V[7];
 	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[12];
+	tmp3 += m_A7 * V[7];
 	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[13];
+	tmp2 += m_A5 * V[14];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[11];
+	tmp1 += m_A3 * V[14];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[9];
+	tmp0 += m_A1 * V[14];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// segas16b_audio
-static void nl_gcr_b71f53c9e7a6b4a9_111_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// zac1b11142
+static void nl_gcr_cfd3bbf5fbba4765_71_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -11419,706 +53396,1416 @@
 	double m_A38(0.0);
 	double m_A39(0.0);
 	double m_A40(0.0);
-	double m_A41(0.0);
-	double m_A42(0.0);
-	double m_A43(0.0);
-	double m_A44(0.0);
-	double m_A45(0.0);
-	double m_A46(0.0);
-	double m_A47(0.0);
-	double m_A48(0.0);
-	double m_A49(0.0);
-	double m_A50(0.0);
-	double m_A51(0.0);
-	double m_A52(0.0);
-	double m_A53(0.0);
-	double m_A54(0.0);
-	double m_A55(0.0);
-	double m_A56(0.0);
-	double m_A57(0.0);
-	double m_A58(0.0);
-	double m_A59(0.0);
-	double m_A60(0.0);
-	double m_A61(0.0);
-	double m_A62(0.0);
-	double m_A63(0.0);
-	double m_A64(0.0);
-	double m_A65(0.0);
-	double m_A66(0.0);
-	double m_A67(0.0);
-	double m_A68(0.0);
-	double m_A69(0.0);
-	double m_A70(0.0);
-	double m_A71(0.0);
-	double m_A72(0.0);
-	double m_A73(0.0);
-	double m_A74(0.0);
-	double m_A75(0.0);
-	double m_A76(0.0);
-	double m_A77(0.0);
-	double m_A78(0.0);
-	double m_A79(0.0);
-	double m_A80(0.0);
-	double m_A81(0.0);
-	double m_A82(0.0);
-	double m_A83(0.0);
-	double m_A84(0.0);
-	double m_A85(0.0);
-	double m_A86(0.0);
-	double m_A87(0.0);
-	double m_A88(0.0);
-	double m_A89(0.0);
-	double m_A90(0.0);
-	double m_A91(0.0);
-	double m_A92(0.0);
-	double m_A93(0.0);
-	double m_A94(0.0);
-	double m_A95(0.0);
-	double m_A96(0.0);
-	double m_A97(0.0);
-	double m_A98(0.0);
-	double m_A99(0.0);
-	double m_A100(0.0);
-	double m_A101(0.0);
-	double m_A102(0.0);
-	double m_A103(0.0);
-	double m_A104(0.0);
-	double m_A105(0.0);
-	double m_A106(0.0);
-	double m_A107(0.0);
-	double m_A108(0.0);
-	double m_A109(0.0);
-	double m_A110(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
 	RHS0 -= go[1] * *cnV[1];
 	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 -= go[4] * *cnV[4];
-	RHS1 -= go[5] * *cnV[5];
-	m_A4 += gt[6];
-	m_A4 += gt[7];
-	m_A4 += gt[8];
-	m_A5 += go[6];
-	double RHS2 = Idr[6];
-	RHS2 += Idr[7];
-	RHS2 += Idr[8];
-	RHS2 -= go[7] * *cnV[7];
-	RHS2 -= go[8] * *cnV[8];
-	m_A6 += gt[9];
-	m_A6 += gt[10];
-	m_A6 += gt[11];
-	m_A8 += go[9];
-	m_A7 += go[10];
-	double RHS3 = Idr[9];
-	RHS3 += Idr[10];
-	RHS3 += Idr[11];
-	RHS3 -= go[11] * *cnV[11];
-	m_A9 += gt[12];
-	m_A9 += gt[13];
-	m_A9 += gt[14];
-	m_A12 += go[12];
-	m_A10 += go[13];
-	m_A11 += go[14];
-	double RHS4 = Idr[12];
-	RHS4 += Idr[13];
-	RHS4 += Idr[14];
-	m_A13 += gt[15];
-	m_A13 += gt[16];
-	m_A13 += gt[17];
-	m_A13 += gt[18];
-	m_A13 += gt[19];
-	m_A13 += gt[20];
-	m_A13 += gt[21];
-	m_A15 += go[15];
-	m_A14 += go[16];
-	double RHS5 = Idr[15];
-	RHS5 += Idr[16];
-	RHS5 += Idr[17];
-	RHS5 += Idr[18];
-	RHS5 += Idr[19];
-	RHS5 += Idr[20];
-	RHS5 += Idr[21];
-	RHS5 -= go[17] * *cnV[17];
-	RHS5 -= go[18] * *cnV[18];
-	RHS5 -= go[19] * *cnV[19];
-	RHS5 -= go[20] * *cnV[20];
-	RHS5 -= go[21] * *cnV[21];
-	m_A16 += gt[22];
-	m_A16 += gt[23];
-	m_A17 += go[22];
-	m_A18 += go[23];
-	double RHS6 = Idr[22];
-	RHS6 += Idr[23];
-	m_A19 += gt[24];
-	m_A19 += gt[25];
-	m_A20 += go[24];
-	m_A21 += go[25];
-	double RHS7 = Idr[24];
-	RHS7 += Idr[25];
-	m_A22 += gt[26];
-	m_A22 += gt[27];
-	m_A23 += go[26];
-	m_A24 += go[27];
-	double RHS8 = Idr[26];
-	RHS8 += Idr[27];
-	m_A25 += gt[28];
-	m_A25 += gt[29];
-	m_A26 += go[28];
-	m_A27 += go[29];
-	double RHS9 = Idr[28];
-	RHS9 += Idr[29];
-	m_A28 += gt[30];
-	m_A28 += gt[31];
-	m_A29 += go[30];
-	double RHS10 = Idr[30];
-	RHS10 += Idr[31];
-	RHS10 -= go[31] * *cnV[31];
-	m_A30 += gt[32];
-	m_A30 += gt[33];
-	m_A30 += gt[34];
-	m_A30 += gt[35];
-	m_A31 += go[32];
-	double RHS11 = Idr[32];
-	RHS11 += Idr[33];
-	RHS11 += Idr[34];
-	RHS11 += Idr[35];
-	RHS11 -= go[33] * *cnV[33];
-	RHS11 -= go[34] * *cnV[34];
-	RHS11 -= go[35] * *cnV[35];
-	m_A34 += gt[36];
-	m_A34 += gt[37];
-	m_A34 += gt[38];
-	m_A33 += go[36];
-	m_A32 += go[37];
-	double RHS12 = Idr[36];
-	RHS12 += Idr[37];
-	RHS12 += Idr[38];
-	RHS12 -= go[38] * *cnV[38];
-	m_A37 += gt[39];
-	m_A37 += gt[40];
-	m_A37 += gt[41];
-	m_A37 += gt[42];
-	m_A37 += gt[43];
-	m_A37 += gt[44];
-	m_A37 += gt[45];
-	m_A38 += go[39];
-	m_A36 += go[40];
-	double RHS13 = Idr[39];
-	RHS13 += Idr[40];
-	RHS13 += Idr[41];
-	RHS13 += Idr[42];
-	RHS13 += Idr[43];
-	RHS13 += Idr[44];
-	RHS13 += Idr[45];
-	RHS13 -= go[41] * *cnV[41];
-	RHS13 -= go[42] * *cnV[42];
-	RHS13 -= go[43] * *cnV[43];
-	RHS13 -= go[44] * *cnV[44];
-	RHS13 -= go[45] * *cnV[45];
-	m_A40 += gt[46];
-	m_A40 += gt[47];
-	m_A40 += gt[48];
-	m_A40 += gt[49];
-	m_A40 += gt[50];
-	m_A40 += gt[51];
-	m_A40 += gt[52];
-	m_A41 += go[46];
-	m_A39 += go[47];
-	double RHS14 = Idr[46];
-	RHS14 += Idr[47];
-	RHS14 += Idr[48];
-	RHS14 += Idr[49];
-	RHS14 += Idr[50];
-	RHS14 += Idr[51];
-	RHS14 += Idr[52];
-	RHS14 -= go[48] * *cnV[48];
-	RHS14 -= go[49] * *cnV[49];
-	RHS14 -= go[50] * *cnV[50];
-	RHS14 -= go[51] * *cnV[51];
-	RHS14 -= go[52] * *cnV[52];
-	m_A44 += gt[53];
-	m_A44 += gt[54];
-	m_A44 += gt[55];
-	m_A44 += gt[56];
-	m_A45 += go[53];
-	m_A43 += go[54];
-	m_A42 += go[55];
-	double RHS15 = Idr[53];
-	RHS15 += Idr[54];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A2 += gt[11];
+	m_A2 += gt[12];
+	m_A2 += gt[13];
+	m_A3 += go[7];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 += Idr[12];
+	RHS1 += Idr[13];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	RHS1 -= go[12] * *cnV[12];
+	RHS1 -= go[13] * *cnV[13];
+	m_A4 += gt[14];
+	m_A4 += gt[15];
+	m_A4 += gt[16];
+	m_A5 += go[14];
+	double RHS2 = Idr[14];
+	RHS2 += Idr[15];
+	RHS2 += Idr[16];
+	RHS2 -= go[15] * *cnV[15];
+	RHS2 -= go[16] * *cnV[16];
+	m_A6 += gt[17];
+	m_A6 += gt[18];
+	m_A7 += go[17];
+	double RHS3 = Idr[17];
+	RHS3 += Idr[18];
+	RHS3 -= go[18] * *cnV[18];
+	m_A8 += gt[19];
+	m_A8 += gt[20];
+	m_A8 += gt[21];
+	m_A9 += go[19];
+	double RHS4 = Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	m_A10 += gt[22];
+	m_A10 += gt[23];
+	m_A11 += go[22];
+	double RHS5 = Idr[22];
+	RHS5 += Idr[23];
+	RHS5 -= go[23] * *cnV[23];
+	m_A12 += gt[24];
+	m_A12 += gt[25];
+	m_A12 += gt[26];
+	m_A13 += go[24];
+	double RHS6 = Idr[24];
+	RHS6 += Idr[25];
+	RHS6 += Idr[26];
+	RHS6 -= go[25] * *cnV[25];
+	RHS6 -= go[26] * *cnV[26];
+	m_A14 += gt[27];
+	m_A14 += gt[28];
+	m_A14 += gt[29];
+	m_A15 += go[27];
+	double RHS7 = Idr[27];
+	RHS7 += Idr[28];
+	RHS7 += Idr[29];
+	RHS7 -= go[28] * *cnV[28];
+	RHS7 -= go[29] * *cnV[29];
+	m_A17 += gt[30];
+	m_A17 += gt[31];
+	m_A17 += gt[32];
+	m_A17 += gt[33];
+	m_A17 += gt[34];
+	m_A17 += gt[35];
+	m_A16 += go[30];
+	m_A18 += go[31];
+	m_A19 += go[32];
+	m_A19 += go[33];
+	double RHS8 = Idr[30];
+	RHS8 += Idr[31];
+	RHS8 += Idr[32];
+	RHS8 += Idr[33];
+	RHS8 += Idr[34];
+	RHS8 += Idr[35];
+	RHS8 -= go[34] * *cnV[34];
+	RHS8 -= go[35] * *cnV[35];
+	m_A21 += gt[36];
+	m_A21 += gt[37];
+	m_A21 += gt[38];
+	m_A22 += go[36];
+	double RHS9 = Idr[36];
+	RHS9 += Idr[37];
+	RHS9 += Idr[38];
+	RHS9 -= go[37] * *cnV[37];
+	RHS9 -= go[38] * *cnV[38];
+	m_A23 += gt[39];
+	m_A23 += gt[40];
+	m_A23 += gt[41];
+	m_A25 += go[39];
+	m_A24 += go[40];
+	double RHS10 = Idr[39];
+	RHS10 += Idr[40];
+	RHS10 += Idr[41];
+	RHS10 -= go[41] * *cnV[41];
+	m_A27 += gt[42];
+	m_A27 += gt[43];
+	m_A27 += gt[44];
+	m_A27 += gt[45];
+	m_A27 += gt[46];
+	m_A27 += gt[47];
+	m_A26 += go[42];
+	m_A29 += go[43];
+	m_A29 += go[44];
+	double RHS11 = Idr[42];
+	RHS11 += Idr[43];
+	RHS11 += Idr[44];
+	RHS11 += Idr[45];
+	RHS11 += Idr[46];
+	RHS11 += Idr[47];
+	RHS11 -= go[45] * *cnV[45];
+	RHS11 -= go[46] * *cnV[46];
+	RHS11 -= go[47] * *cnV[47];
+	m_A31 += gt[48];
+	m_A31 += gt[49];
+	m_A32 += go[48];
+	m_A30 += go[49];
+	double RHS12 = Idr[48];
+	RHS12 += Idr[49];
+	m_A35 += gt[50];
+	m_A35 += gt[51];
+	m_A34 += go[50];
+	m_A33 += go[51];
+	double RHS13 = Idr[50];
+	RHS13 += Idr[51];
+	m_A38 += gt[52];
+	m_A38 += gt[53];
+	m_A37 += go[52];
+	m_A36 += go[53];
+	double RHS14 = Idr[52];
+	RHS14 += Idr[53];
+	m_A40 += gt[54];
+	m_A40 += gt[55];
+	m_A40 += gt[56];
+	m_A40 += gt[57];
+	m_A41 += go[54];
+	m_A39 += go[55];
+	double RHS15 = Idr[54];
 	RHS15 += Idr[55];
 	RHS15 += Idr[56];
+	RHS15 += Idr[57];
 	RHS15 -= go[56] * *cnV[56];
-	m_A48 += gt[57];
-	m_A48 += gt[58];
-	m_A48 += gt[59];
-	m_A48 += gt[60];
-	m_A48 += gt[61];
-	m_A48 += gt[62];
-	m_A48 += gt[63];
-	m_A49 += go[57];
-	m_A46 += go[58];
-	double RHS16 = Idr[57];
-	RHS16 += Idr[58];
+	RHS15 -= go[57] * *cnV[57];
+	m_A44 += gt[58];
+	m_A44 += gt[59];
+	m_A43 += go[58];
+	m_A42 += go[59];
+	double RHS16 = Idr[58];
 	RHS16 += Idr[59];
-	RHS16 += Idr[60];
-	RHS16 += Idr[61];
-	RHS16 += Idr[62];
-	RHS16 += Idr[63];
-	RHS16 -= go[59] * *cnV[59];
-	RHS16 -= go[60] * *cnV[60];
-	RHS16 -= go[61] * *cnV[61];
-	RHS16 -= go[62] * *cnV[62];
-	RHS16 -= go[63] * *cnV[63];
-	m_A51 += gt[64];
-	m_A51 += gt[65];
-	m_A51 += gt[66];
-	m_A53 += go[64];
-	m_A50 += go[65];
-	double RHS17 = Idr[64];
-	RHS17 += Idr[65];
-	RHS17 += Idr[66];
-	RHS17 -= go[66] * *cnV[66];
-	m_A58 += gt[67];
-	m_A58 += gt[68];
-	m_A58 += gt[69];
-	m_A58 += gt[70];
-	m_A58 += gt[71];
-	m_A58 += gt[72];
-	m_A57 += go[67];
-	m_A62 += go[68];
-	m_A62 += go[69];
-	m_A56 += go[70];
-	m_A55 += go[71];
-	m_A54 += go[72];
-	double RHS18 = Idr[67];
-	RHS18 += Idr[68];
-	RHS18 += Idr[69];
-	RHS18 += Idr[70];
-	RHS18 += Idr[71];
-	RHS18 += Idr[72];
-	m_A67 += gt[73];
-	m_A67 += gt[74];
-	m_A67 += gt[75];
-	m_A67 += gt[76];
-	m_A67 += gt[77];
-	m_A65 += go[73];
-	m_A64 += go[74];
-	m_A63 += go[75];
-	double RHS19 = Idr[73];
-	RHS19 += Idr[74];
-	RHS19 += Idr[75];
-	RHS19 += Idr[76];
-	RHS19 += Idr[77];
-	RHS19 -= go[76] * *cnV[76];
-	RHS19 -= go[77] * *cnV[77];
-	m_A76 += gt[78];
-	m_A76 += gt[79];
-	m_A76 += gt[80];
-	m_A76 += gt[81];
-	m_A76 += gt[82];
-	m_A73 += go[78];
-	m_A72 += go[79];
-	m_A71 += go[80];
-	double RHS20 = Idr[78];
-	RHS20 += Idr[79];
-	RHS20 += Idr[80];
-	RHS20 += Idr[81];
-	RHS20 += Idr[82];
-	RHS20 -= go[81] * *cnV[81];
-	RHS20 -= go[82] * *cnV[82];
-	m_A84 += gt[83];
-	m_A84 += gt[84];
-	m_A84 += gt[85];
-	m_A84 += gt[86];
-	m_A84 += gt[87];
-	m_A84 += gt[88];
-	m_A82 += go[83];
-	m_A80 += go[84];
-	m_A79 += go[85];
-	m_A81 += go[86];
-	double RHS21 = Idr[83];
-	RHS21 += Idr[84];
-	RHS21 += Idr[85];
-	RHS21 += Idr[86];
-	RHS21 += Idr[87];
-	RHS21 += Idr[88];
-	RHS21 -= go[87] * *cnV[87];
-	RHS21 -= go[88] * *cnV[88];
-	m_A94 += gt[89];
-	m_A94 += gt[90];
-	m_A94 += gt[91];
-	m_A94 += gt[92];
-	m_A94 += gt[93];
-	m_A94 += gt[94];
-	m_A87 += go[89];
-	m_A88 += go[90];
-	m_A89 += go[91];
-	m_A86 += go[92];
-	double RHS22 = Idr[89];
-	RHS22 += Idr[90];
-	RHS22 += Idr[91];
-	RHS22 += Idr[92];
-	RHS22 += Idr[93];
-	RHS22 += Idr[94];
-	RHS22 -= go[93] * *cnV[93];
-	RHS22 -= go[94] * *cnV[94];
-	m_A101 += gt[95];
-	m_A101 += gt[96];
-	m_A101 += gt[97];
-	m_A101 += gt[98];
-	m_A101 += gt[99];
-	m_A101 += gt[100];
-	m_A101 += gt[101];
-	m_A96 += go[95];
-	m_A97 += go[96];
-	double RHS23 = Idr[95];
-	RHS23 += Idr[96];
-	RHS23 += Idr[97];
-	RHS23 += Idr[98];
-	RHS23 += Idr[99];
-	RHS23 += Idr[100];
-	RHS23 += Idr[101];
-	RHS23 -= go[97] * *cnV[97];
-	RHS23 -= go[98] * *cnV[98];
-	RHS23 -= go[99] * *cnV[99];
-	RHS23 -= go[100] * *cnV[100];
-	RHS23 -= go[101] * *cnV[101];
-	m_A110 += gt[102];
-	m_A110 += gt[103];
-	m_A110 += gt[104];
-	m_A110 += gt[105];
-	m_A110 += gt[106];
-	m_A110 += gt[107];
-	m_A109 += go[102];
-	m_A103 += go[103];
-	m_A105 += go[104];
-	m_A105 += go[105];
-	double RHS24 = Idr[102];
-	RHS24 += Idr[103];
-	RHS24 += Idr[104];
-	RHS24 += Idr[105];
-	RHS24 += Idr[106];
-	RHS24 += Idr[107];
-	RHS24 -= go[106] * *cnV[106];
-	RHS24 -= go[107] * *cnV[107];
+	m_A54 += gt[60];
+	m_A54 += gt[61];
+	m_A54 += gt[62];
+	m_A54 += gt[63];
+	m_A54 += gt[64];
+	m_A54 += gt[65];
+	m_A52 += go[60];
+	m_A50 += go[61];
+	m_A50 += go[62];
+	m_A51 += go[63];
+	m_A49 += go[64];
+	m_A48 += go[65];
+	double RHS17 = Idr[60];
+	RHS17 += Idr[61];
+	RHS17 += Idr[62];
+	RHS17 += Idr[63];
+	RHS17 += Idr[64];
+	RHS17 += Idr[65];
+	m_A65 += gt[66];
+	m_A65 += gt[67];
+	m_A65 += gt[68];
+	m_A65 += gt[69];
+	m_A65 += gt[70];
+	m_A65 += gt[71];
+	m_A61 += go[66];
+	m_A60 += go[67];
+	m_A60 += go[68];
+	m_A59 += go[69];
+	m_A58 += go[70];
+	m_A57 += go[71];
+	double RHS18 = Idr[66];
+	RHS18 += Idr[67];
+	RHS18 += Idr[68];
+	RHS18 += Idr[69];
+	RHS18 += Idr[70];
+	RHS18 += Idr[71];
+	m_A70 += gt[72];
+	m_A70 += gt[73];
+	m_A70 += gt[74];
+	m_A70 += gt[75];
+	m_A68 += go[72];
+	m_A67 += go[73];
+	double RHS19 = Idr[72];
+	RHS19 += Idr[73];
+	RHS19 += Idr[74];
+	RHS19 += Idr[75];
+	RHS19 -= go[74] * *cnV[74];
+	RHS19 -= go[75] * *cnV[75];
 	const double f0 = 1.0 / m_A0;
-	const double f0_13 = -f0 * m_A36;
-	m_A38 += m_A1 * f0_13;
-	RHS13 += f0_13 * RHS0;
-	const double f0_19 = -f0 * m_A63;
-	m_A67 += m_A1 * f0_19;
-	RHS19 += f0_19 * RHS0;
+	const double f0_8 = -f0 * m_A16;
+	m_A20 += m_A1 * f0_8;
+	RHS8 += f0_8 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_14 = -f1 * m_A39;
-	m_A41 += m_A3 * f1_14;
-	RHS14 += f1_14 * RHS1;
-	const double f1_20 = -f1 * m_A71;
-	m_A76 += m_A3 * f1_20;
-	RHS20 += f1_20 * RHS1;
+	const double f1_11 = -f1 * m_A26;
+	m_A28 += m_A3 * f1_11;
+	RHS11 += f1_11 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_15 = -f2 * m_A42;
-	m_A44 += m_A5 * f2_15;
-	RHS15 += f2_15 * RHS2;
+	const double f2_12 = -f2 * m_A30;
+	m_A31 += m_A5 * f2_12;
+	RHS12 += f2_12 * RHS2;
 	const double f3 = 1.0 / m_A6;
-	const double f3_15 = -f3 * m_A43;
-	m_A44 += m_A7 * f3_15;
-	m_A45 += m_A8 * f3_15;
-	RHS15 += f3_15 * RHS3;
-	const double f3_16 = -f3 * m_A46;
-	m_A47 += m_A7 * f3_16;
-	m_A49 += m_A8 * f3_16;
-	RHS16 += f3_16 * RHS3;
-	const double f3_21 = -f3 * m_A79;
-	m_A81 += m_A7 * f3_21;
-	m_A84 += m_A8 * f3_21;
-	RHS21 += f3_21 * RHS3;
-	const double f4 = 1.0 / m_A9;
-	const double f4_17 = -f4 * m_A50;
-	m_A51 += m_A10 * f4_17;
-	m_A52 += m_A11 * f4_17;
-	m_A53 += m_A12 * f4_17;
-	RHS17 += f4_17 * RHS4;
-	const double f4_21 = -f4 * m_A80;
-	m_A83 += m_A10 * f4_21;
-	m_A84 += m_A11 * f4_21;
-	m_A85 += m_A12 * f4_21;
-	RHS21 += f4_21 * RHS4;
-	const double f4_22 = -f4 * m_A86;
-	m_A89 += m_A10 * f4_22;
-	m_A93 += m_A11 * f4_22;
-	m_A94 += m_A12 * f4_22;
-	RHS22 += f4_22 * RHS4;
-	const double f5 = 1.0 / m_A13;
-	const double f5_22 = -f5 * m_A87;
-	m_A89 += m_A14 * f5_22;
-	m_A94 += m_A15 * f5_22;
-	RHS22 += f5_22 * RHS5;
-	const double f6 = 1.0 / m_A16;
-	const double f6_18 = -f6 * m_A54;
-	m_A58 += m_A17 * f6_18;
-	m_A61 += m_A18 * f6_18;
-	RHS18 += f6_18 * RHS6;
-	const double f6_22 = -f6 * m_A88;
-	m_A90 += m_A17 * f6_22;
-	m_A94 += m_A18 * f6_22;
-	RHS22 += f6_22 * RHS6;
-	const double f7 = 1.0 / m_A19;
-	const double f7_18 = -f7 * m_A55;
-	m_A58 += m_A20 * f7_18;
-	m_A59 += m_A21 * f7_18;
-	RHS18 += f7_18 * RHS7;
-	const double f7_19 = -f7 * m_A64;
-	m_A66 += m_A20 * f7_19;
-	m_A67 += m_A21 * f7_19;
+	const double f3_13 = -f3 * m_A33;
+	m_A35 += m_A7 * f3_13;
+	RHS13 += f3_13 * RHS3;
+	const double f3_17 = -f3 * m_A48;
+	m_A52 += m_A7 * f3_17;
+	RHS17 += f3_17 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_13 = -f4 * m_A34;
+	m_A35 += m_A9 * f4_13;
+	RHS13 += f4_13 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_14 = -f5 * m_A36;
+	m_A38 += m_A11 * f5_14;
+	RHS14 += f5_14 * RHS5;
+	const double f5_18 = -f5 * m_A57;
+	m_A61 += m_A11 * f5_18;
+	RHS18 += f5_18 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_14 = -f6 * m_A37;
+	m_A38 += m_A13 * f6_14;
+	RHS14 += f6_14 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_17 = -f7 * m_A49;
+	m_A54 += m_A15 * f7_17;
+	RHS17 += f7_17 * RHS7;
+	const double f7_19 = -f7 * m_A67;
+	m_A68 += m_A15 * f7_19;
 	RHS19 += f7_19 * RHS7;
-	const double f8 = 1.0 / m_A22;
-	const double f8_18 = -f8 * m_A56;
-	m_A58 += m_A23 * f8_18;
-	m_A60 += m_A24 * f8_18;
-	RHS18 += f8_18 * RHS8;
-	const double f8_20 = -f8 * m_A72;
-	m_A74 += m_A23 * f8_20;
-	m_A76 += m_A24 * f8_20;
-	RHS20 += f8_20 * RHS8;
-	const double f9 = 1.0 / m_A25;
-	const double f9_12 = -f9 * m_A32;
-	m_A34 += m_A26 * f9_12;
-	m_A35 += m_A27 * f9_12;
-	RHS12 += f9_12 * RHS9;
-	const double f9_24 = -f9 * m_A103;
-	m_A104 += m_A26 * f9_24;
-	m_A110 += m_A27 * f9_24;
-	RHS24 += f9_24 * RHS9;
-	const double f10 = 1.0 / m_A28;
-	const double f10_12 = -f10 * m_A33;
-	m_A34 += m_A29 * f10_12;
-	RHS12 += f10_12 * RHS10;
-	const double f11 = 1.0 / m_A30;
-	const double f11_18 = -f11 * m_A57;
-	m_A58 += m_A31 * f11_18;
+	const double f8 = 1.0 / m_A17;
+	const double f8_16 = -f8 * m_A42;
+	m_A44 += m_A18 * f8_16;
+	m_A45 += m_A19 * f8_16;
+	m_A47 += m_A20 * f8_16;
+	RHS16 += f8_16 * RHS8;
+	const double f8_17 = -f8 * m_A50;
+	m_A53 += m_A18 * f8_17;
+	m_A54 += m_A19 * f8_17;
+	m_A56 += m_A20 * f8_17;
+	RHS17 += f8_17 * RHS8;
+	const double f9 = 1.0 / m_A21;
+	const double f9_15 = -f9 * m_A39;
+	m_A41 += m_A22 * f9_15;
+	RHS15 += f9_15 * RHS9;
+	const double f9_18 = -f9 * m_A58;
+	m_A65 += m_A22 * f9_18;
+	RHS18 += f9_18 * RHS9;
+	const double f10 = 1.0 / m_A23;
+	const double f10_16 = -f10 * m_A43;
+	m_A44 += m_A24 * f10_16;
+	m_A46 += m_A25 * f10_16;
+	RHS16 += f10_16 * RHS10;
+	const double f10_18 = -f10 * m_A59;
+	m_A63 += m_A24 * f10_18;
+	m_A65 += m_A25 * f10_18;
+	RHS18 += f10_18 * RHS10;
+	const double f11 = 1.0 / m_A27;
+	const double f11_18 = -f11 * m_A60;
+	m_A62 += m_A28 * f11_18;
+	m_A65 += m_A29 * f11_18;
 	RHS18 += f11_18 * RHS11;
-	const double f11_23 = -f11 * m_A96;
-	m_A97 += m_A31 * f11_23;
-	RHS23 += f11_23 * RHS11;
-	const double f12 = 1.0 / m_A34;
-	const double f12_24 = -f12 * m_A104;
-	m_A110 += m_A35 * f12_24;
-	RHS24 += f12_24 * RHS12;
-	const double f13 = 1.0 / m_A37;
-	const double f13_19 = -f13 * m_A65;
-	m_A67 += m_A38 * f13_19;
-	RHS19 += f13_19 * RHS13;
-	const double f14 = 1.0 / m_A40;
-	const double f14_20 = -f14 * m_A73;
-	m_A76 += m_A41 * f14_20;
-	RHS20 += f14_20 * RHS14;
-	const double f15 = 1.0 / m_A44;
-	const double f15_16 = -f15 * m_A47;
-	m_A49 += m_A45 * f15_16;
-	RHS16 += f15_16 * RHS15;
-	const double f15_21 = -f15 * m_A81;
-	m_A84 += m_A45 * f15_21;
-	RHS21 += f15_21 * RHS15;
-	const double f16 = 1.0 / m_A48;
-	const double f16_21 = -f16 * m_A82;
-	m_A84 += m_A49 * f16_21;
-	RHS21 += f16_21 * RHS16;
-	const double f17 = 1.0 / m_A51;
-	const double f17_21 = -f17 * m_A83;
-	m_A84 += m_A52 * f17_21;
-	m_A85 += m_A53 * f17_21;
-	RHS21 += f17_21 * RHS17;
-	const double f17_22 = -f17 * m_A89;
-	m_A93 += m_A52 * f17_22;
-	m_A94 += m_A53 * f17_22;
-	RHS22 += f17_22 * RHS17;
-	const double f18 = 1.0 / m_A58;
-	const double f18_19 = -f18 * m_A66;
-	m_A67 += m_A59 * f18_19;
-	m_A68 += m_A60 * f18_19;
-	m_A69 += m_A61 * f18_19;
-	m_A70 += m_A62 * f18_19;
+	const double f12 = 1.0 / m_A31;
+	const double f12_17 = -f12 * m_A51;
+	m_A54 += m_A32 * f12_17;
+	RHS17 += f12_17 * RHS12;
+	const double f13 = 1.0 / m_A35;
+	const double f13_17 = -f13 * m_A52;
+	RHS17 += f13_17 * RHS13;
+	const double f14 = 1.0 / m_A38;
+	const double f14_18 = -f14 * m_A61;
+	RHS18 += f14_18 * RHS14;
+	const double f15 = 1.0 / m_A40;
+	const double f15_18 = -f15 * m_A62;
+	m_A65 += m_A41 * f15_18;
+	RHS18 += f15_18 * RHS15;
+	const double f16 = 1.0 / m_A44;
+	const double f16_17 = -f16 * m_A53;
+	m_A54 += m_A45 * f16_17;
+	m_A55 += m_A46 * f16_17;
+	m_A56 += m_A47 * f16_17;
+	RHS17 += f16_17 * RHS16;
+	const double f16_18 = -f16 * m_A63;
+	m_A64 += m_A45 * f16_18;
+	m_A65 += m_A46 * f16_18;
+	m_A66 += m_A47 * f16_18;
+	RHS18 += f16_18 * RHS16;
+	const double f17 = 1.0 / m_A54;
+	const double f17_18 = -f17 * m_A64;
+	m_A65 += m_A55 * f17_18;
+	m_A66 += m_A56 * f17_18;
+	RHS18 += f17_18 * RHS17;
+	const double f17_19 = -f17 * m_A68;
+	m_A69 += m_A55 * f17_19;
+	m_A70 += m_A56 * f17_19;
+	RHS19 += f17_19 * RHS17;
+	const double f18 = 1.0 / m_A65;
+	const double f18_19 = -f18 * m_A69;
+	m_A70 += m_A66 * f18_19;
 	RHS19 += f18_19 * RHS18;
-	const double f18_20 = -f18 * m_A74;
-	m_A75 += m_A59 * f18_20;
-	m_A76 += m_A60 * f18_20;
-	m_A77 += m_A61 * f18_20;
-	m_A78 += m_A62 * f18_20;
-	RHS20 += f18_20 * RHS18;
-	const double f18_22 = -f18 * m_A90;
-	m_A91 += m_A59 * f18_22;
-	m_A92 += m_A60 * f18_22;
-	m_A94 += m_A61 * f18_22;
-	m_A95 += m_A62 * f18_22;
-	RHS22 += f18_22 * RHS18;
-	const double f18_23 = -f18 * m_A97;
-	m_A98 += m_A59 * f18_23;
-	m_A99 += m_A60 * f18_23;
-	m_A100 += m_A61 * f18_23;
-	m_A102 += m_A62 * f18_23;
-	RHS23 += f18_23 * RHS18;
-	const double f18_24 = -f18 * m_A105;
-	m_A106 += m_A59 * f18_24;
-	m_A107 += m_A60 * f18_24;
-	m_A108 += m_A61 * f18_24;
-	m_A110 += m_A62 * f18_24;
-	RHS24 += f18_24 * RHS18;
-	const double f19 = 1.0 / m_A67;
-	const double f19_20 = -f19 * m_A75;
-	m_A76 += m_A68 * f19_20;
-	m_A77 += m_A69 * f19_20;
-	m_A78 += m_A70 * f19_20;
-	RHS20 += f19_20 * RHS19;
-	const double f19_22 = -f19 * m_A91;
-	m_A92 += m_A68 * f19_22;
-	m_A94 += m_A69 * f19_22;
-	m_A95 += m_A70 * f19_22;
-	RHS22 += f19_22 * RHS19;
-	const double f19_23 = -f19 * m_A98;
-	m_A99 += m_A68 * f19_23;
-	m_A100 += m_A69 * f19_23;
-	m_A102 += m_A70 * f19_23;
-	RHS23 += f19_23 * RHS19;
-	const double f19_24 = -f19 * m_A106;
-	m_A107 += m_A68 * f19_24;
-	m_A108 += m_A69 * f19_24;
-	m_A110 += m_A70 * f19_24;
-	RHS24 += f19_24 * RHS19;
-	const double f20 = 1.0 / m_A76;
-	const double f20_22 = -f20 * m_A92;
-	m_A94 += m_A77 * f20_22;
-	m_A95 += m_A78 * f20_22;
-	RHS22 += f20_22 * RHS20;
-	const double f20_23 = -f20 * m_A99;
-	m_A100 += m_A77 * f20_23;
-	m_A102 += m_A78 * f20_23;
-	RHS23 += f20_23 * RHS20;
-	const double f20_24 = -f20 * m_A107;
-	m_A108 += m_A77 * f20_24;
-	m_A110 += m_A78 * f20_24;
-	RHS24 += f20_24 * RHS20;
-	const double f21 = 1.0 / m_A84;
-	const double f21_22 = -f21 * m_A93;
-	m_A94 += m_A85 * f21_22;
-	RHS22 += f21_22 * RHS21;
-	const double f22 = 1.0 / m_A94;
-	const double f22_23 = -f22 * m_A100;
-	m_A102 += m_A95 * f22_23;
-	RHS23 += f22_23 * RHS22;
-	const double f22_24 = -f22 * m_A108;
-	m_A110 += m_A95 * f22_24;
-	RHS24 += f22_24 * RHS22;
-	const double f23 = 1.0 / m_A101;
-	const double f23_24 = -f23 * m_A109;
-	m_A110 += m_A102 * f23_24;
-	RHS24 += f23_24 * RHS23;
-	V[24] = RHS24 / m_A110;
-	double tmp23 = 0.0;
-	tmp23 += m_A102 * V[24];
-	V[23] = (RHS23 - tmp23) / m_A101;
-	double tmp22 = 0.0;
-	tmp22 += m_A95 * V[24];
-	V[22] = (RHS22 - tmp22) / m_A94;
-	double tmp21 = 0.0;
-	tmp21 += m_A85 * V[22];
-	V[21] = (RHS21 - tmp21) / m_A84;
-	double tmp20 = 0.0;
-	tmp20 += m_A77 * V[22];
-	tmp20 += m_A78 * V[24];
-	V[20] = (RHS20 - tmp20) / m_A76;
-	double tmp19 = 0.0;
-	tmp19 += m_A68 * V[20];
-	tmp19 += m_A69 * V[22];
-	tmp19 += m_A70 * V[24];
-	V[19] = (RHS19 - tmp19) / m_A67;
+	V[19] = RHS19 / m_A70;
 	double tmp18 = 0.0;
-	tmp18 += m_A59 * V[19];
-	tmp18 += m_A60 * V[20];
-	tmp18 += m_A61 * V[22];
-	tmp18 += m_A62 * V[24];
-	V[18] = (RHS18 - tmp18) / m_A58;
+	tmp18 += m_A66 * V[19];
+	V[18] = (RHS18 - tmp18) / m_A65;
 	double tmp17 = 0.0;
-	tmp17 += m_A52 * V[21];
-	tmp17 += m_A53 * V[22];
-	V[17] = (RHS17 - tmp17) / m_A51;
+	tmp17 += m_A55 * V[18];
+	tmp17 += m_A56 * V[19];
+	V[17] = (RHS17 - tmp17) / m_A54;
 	double tmp16 = 0.0;
-	tmp16 += m_A49 * V[21];
-	V[16] = (RHS16 - tmp16) / m_A48;
+	tmp16 += m_A45 * V[17];
+	tmp16 += m_A46 * V[18];
+	tmp16 += m_A47 * V[19];
+	V[16] = (RHS16 - tmp16) / m_A44;
 	double tmp15 = 0.0;
-	tmp15 += m_A45 * V[21];
-	V[15] = (RHS15 - tmp15) / m_A44;
+	tmp15 += m_A41 * V[18];
+	V[15] = (RHS15 - tmp15) / m_A40;
 	double tmp14 = 0.0;
-	tmp14 += m_A41 * V[20];
-	V[14] = (RHS14 - tmp14) / m_A40;
+	V[14] = (RHS14 - tmp14) / m_A38;
 	double tmp13 = 0.0;
-	tmp13 += m_A38 * V[19];
-	V[13] = (RHS13 - tmp13) / m_A37;
+	V[13] = (RHS13 - tmp13) / m_A35;
 	double tmp12 = 0.0;
-	tmp12 += m_A35 * V[24];
-	V[12] = (RHS12 - tmp12) / m_A34;
+	tmp12 += m_A32 * V[17];
+	V[12] = (RHS12 - tmp12) / m_A31;
 	double tmp11 = 0.0;
-	tmp11 += m_A31 * V[18];
-	V[11] = (RHS11 - tmp11) / m_A30;
+	tmp11 += m_A28 * V[15];
+	tmp11 += m_A29 * V[18];
+	V[11] = (RHS11 - tmp11) / m_A27;
 	double tmp10 = 0.0;
-	tmp10 += m_A29 * V[12];
-	V[10] = (RHS10 - tmp10) / m_A28;
+	tmp10 += m_A24 * V[16];
+	tmp10 += m_A25 * V[18];
+	V[10] = (RHS10 - tmp10) / m_A23;
+	double tmp9 = 0.0;
+	tmp9 += m_A22 * V[18];
+	V[9] = (RHS9 - tmp9) / m_A21;
+	double tmp8 = 0.0;
+	tmp8 += m_A18 * V[16];
+	tmp8 += m_A19 * V[17];
+	tmp8 += m_A20 * V[19];
+	V[8] = (RHS8 - tmp8) / m_A17;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[17];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[14];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[14];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[13];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[13];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[12];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[15];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[19];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// gunfight
+static void nl_gcr_d05b3dbe370c7904_14_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A2 += go[0];
+	m_A1 += go[1];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[2] * *cnV[2];
+	m_A4 += gt[3];
+	m_A4 += gt[4];
+	m_A3 += go[3];
+	m_A6 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	m_A9 += gt[5];
+	m_A9 += gt[6];
+	m_A9 += gt[7];
+	m_A9 += gt[8];
+	m_A9 += gt[9];
+	m_A9 += gt[10];
+	m_A9 += gt[11];
+	m_A9 += gt[12];
+	m_A9 += gt[13];
+	m_A7 += go[5];
+	m_A10 += go[6];
+	m_A10 += go[7];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	m_A13 += gt[14];
+	m_A13 += gt[15];
+	m_A13 += gt[16];
+	m_A13 += gt[17];
+	m_A13 += gt[18];
+	m_A12 += go[14];
+	m_A12 += go[15];
+	m_A11 += go[16];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 -= go[17] * *cnV[17];
+	RHS3 -= go[18] * *cnV[18];
+	const double f0 = 1.0 / m_A0;
+	const double f0_1 = -f0 * m_A3;
+	m_A4 += m_A1 * f0_1;
+	m_A5 += m_A2 * f0_1;
+	RHS1 += f0_1 * RHS0;
+	const double f0_2 = -f0 * m_A7;
+	m_A8 += m_A1 * f0_2;
+	m_A9 += m_A2 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A4;
+	const double f1_2 = -f1 * m_A8;
+	m_A9 += m_A5 * f1_2;
+	m_A10 += m_A6 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	const double f1_3 = -f1 * m_A11;
+	m_A12 += m_A5 * f1_3;
+	m_A13 += m_A6 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A9;
+	const double f2_3 = -f2 * m_A12;
+	m_A13 += m_A10 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A13;
+	double tmp2 = 0.0;
+	tmp2 += m_A10 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A9;
+	double tmp1 = 0.0;
+	tmp1 += m_A5 * V[2];
+	tmp1 += m_A6 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A4;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[1];
+	tmp0 += m_A2 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// barrier
+static void nl_gcr_d06bd7ddbfd17b5e_15_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A4 += go[2];
+	m_A3 += go[3];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	m_A5 += gt[4];
+	m_A5 += gt[5];
+	m_A5 += gt[6];
+	m_A6 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 -= go[5] * *cnV[5];
+	RHS2 -= go[6] * *cnV[6];
+	m_A9 += gt[7];
+	m_A9 += gt[8];
+	m_A7 += go[7];
+	m_A8 += go[8];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	m_A14 += gt[9];
+	m_A14 += gt[10];
+	m_A12 += go[9];
+	m_A11 += go[10];
+	double RHS4 = Idr[9];
+	RHS4 += Idr[10];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A7;
+	m_A9 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A8;
+	m_A9 += m_A3 * f1_3;
+	m_A10 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f1_4 = -f1 * m_A11;
+	m_A13 += m_A3 * f1_4;
+	m_A14 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_4 = -f2 * m_A12;
+	m_A14 += m_A6 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_4 = -f3 * m_A13;
+	m_A14 += m_A10 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	V[4] = RHS4 / m_A14;
+	double tmp3 = 0.0;
+	tmp3 += m_A10 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	tmp1 += m_A4 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// elim
+static void nl_gcr_d13f9c6838af6aeb_13_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A5 += gt[5];
+	m_A5 += gt[6];
+	m_A5 += gt[7];
+	m_A5 += gt[8];
+	m_A6 += go[5];
+	m_A4 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A8 += gt[9];
+	m_A8 += gt[10];
+	m_A8 += gt[11];
+	m_A9 += go[9];
+	m_A7 += go[10];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[11] * *cnV[11];
+	m_A12 += gt[12];
+	m_A12 += gt[13];
+	m_A12 += gt[14];
+	m_A12 += gt[15];
+	m_A11 += go[12];
+	m_A10 += go[13];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 += Idr[15];
+	RHS4 -= go[14] * *cnV[14];
+	RHS4 -= go[15] * *cnV[15];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A5 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A7;
+	m_A8 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_4 = -f2 * m_A10;
+	m_A12 += m_A6 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_4 = -f3 * m_A11;
+	m_A12 += m_A9 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	V[4] = RHS4 / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// elim
+static void nl_gcr_d190a0e3b8e1f4a7_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A6 += gt[4];
+	m_A6 += gt[5];
+	m_A6 += gt[6];
+	m_A5 += go[4];
+	m_A4 += go[5];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 -= go[6] * *cnV[6];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// elim
+static void nl_gcr_d224211d1af6811d_12_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A0 += gt[7];
+	m_A0 += gt[8];
+	m_A0 += gt[9];
+	m_A0 += gt[10];
+	m_A0 += gt[11];
+	m_A0 += gt[12];
+	m_A0 += gt[13];
+	m_A0 += gt[14];
+	m_A0 += gt[15];
+	m_A0 += gt[16];
+	m_A0 += gt[17];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 += Idr[7];
+	RHS0 += Idr[8];
+	RHS0 += Idr[9];
+	RHS0 += Idr[10];
+	RHS0 += Idr[11];
+	RHS0 += Idr[12];
+	RHS0 += Idr[13];
+	RHS0 += Idr[14];
+	RHS0 += Idr[15];
+	RHS0 += Idr[16];
+	RHS0 += Idr[17];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	RHS0 -= go[7] * *cnV[7];
+	RHS0 -= go[8] * *cnV[8];
+	RHS0 -= go[9] * *cnV[9];
+	RHS0 -= go[10] * *cnV[10];
+	RHS0 -= go[11] * *cnV[11];
+	RHS0 -= go[12] * *cnV[12];
+	RHS0 -= go[13] * *cnV[13];
+	RHS0 -= go[14] * *cnV[14];
+	RHS0 -= go[15] * *cnV[15];
+	RHS0 -= go[16] * *cnV[16];
+	RHS0 -= go[17] * *cnV[17];
+	m_A2 += gt[18];
+	m_A2 += gt[19];
+	m_A2 += gt[20];
+	m_A2 += gt[21];
+	m_A2 += gt[22];
+	m_A4 += go[18];
+	m_A3 += go[19];
+	double RHS1 = Idr[18];
+	RHS1 += Idr[19];
+	RHS1 += Idr[20];
+	RHS1 += Idr[21];
+	RHS1 += Idr[22];
+	RHS1 -= go[20] * *cnV[20];
+	RHS1 -= go[21] * *cnV[21];
+	RHS1 -= go[22] * *cnV[22];
+	m_A7 += gt[23];
+	m_A7 += gt[24];
+	m_A7 += gt[25];
+	m_A6 += go[23];
+	m_A5 += go[24];
+	double RHS2 = Idr[23];
+	RHS2 += Idr[24];
+	RHS2 += Idr[25];
+	RHS2 -= go[25] * *cnV[25];
+	m_A11 += gt[26];
+	m_A11 += gt[27];
+	m_A11 += gt[28];
+	m_A11 += gt[29];
+	m_A11 += gt[30];
+	m_A11 += gt[31];
+	m_A11 += gt[32];
+	m_A10 += go[26];
+	m_A9 += go[27];
+	double RHS3 = Idr[26];
+	RHS3 += Idr[27];
+	RHS3 += Idr[28];
+	RHS3 += Idr[29];
+	RHS3 += Idr[30];
+	RHS3 += Idr[31];
+	RHS3 += Idr[32];
+	RHS3 -= go[28] * *cnV[28];
+	RHS3 -= go[29] * *cnV[29];
+	RHS3 -= go[30] * *cnV[30];
+	RHS3 -= go[31] * *cnV[31];
+	RHS3 -= go[32] * *cnV[32];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A5;
+	m_A7 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f0_3 = -f0 * m_A9;
+	m_A10 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A6;
+	m_A7 += m_A3 * f1_2;
+	m_A8 += m_A4 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	const double f2 = 1.0 / m_A7;
+	const double f2_3 = -f2 * m_A10;
+	m_A11 += m_A8 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A11;
+	double tmp2 = 0.0;
+	tmp2 += m_A8 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A7;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// armora
+static void nl_gcr_d27a39bc93616187_45_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A2 += gt[11];
+	m_A5 += go[4];
+	m_A4 += go[5];
+	m_A4 += go[6];
+	m_A3 += go[7];
+	m_A3 += go[8];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A7 += go[12];
+	double RHS2 = Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 += Idr[15];
+	RHS2 -= go[13] * *cnV[13];
+	RHS2 -= go[14] * *cnV[14];
+	RHS2 -= go[15] * *cnV[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A8 += gt[18];
+	m_A10 += go[16];
+	m_A9 += go[17];
+	double RHS3 = Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 -= go[18] * *cnV[18];
+	m_A11 += gt[19];
+	m_A11 += gt[20];
+	m_A11 += gt[21];
+	m_A11 += gt[22];
+	m_A11 += gt[23];
+	m_A11 += gt[24];
+	m_A11 += gt[25];
+	m_A11 += gt[26];
+	m_A14 += go[19];
+	m_A13 += go[20];
+	m_A13 += go[21];
+	m_A12 += go[22];
+	m_A12 += go[23];
+	double RHS4 = Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 += Idr[25];
+	RHS4 += Idr[26];
+	RHS4 -= go[24] * *cnV[24];
+	RHS4 -= go[25] * *cnV[25];
+	RHS4 -= go[26] * *cnV[26];
+	m_A17 += gt[27];
+	m_A17 += gt[28];
+	m_A17 += gt[29];
+	m_A17 += gt[30];
+	m_A17 += gt[31];
+	m_A17 += gt[32];
+	m_A16 += go[27];
+	m_A16 += go[28];
+	m_A15 += go[29];
+	double RHS5 = Idr[27];
+	RHS5 += Idr[28];
+	RHS5 += Idr[29];
+	RHS5 += Idr[30];
+	RHS5 += Idr[31];
+	RHS5 += Idr[32];
+	RHS5 -= go[30] * *cnV[30];
+	RHS5 -= go[31] * *cnV[31];
+	RHS5 -= go[32] * *cnV[32];
+	m_A22 += gt[33];
+	m_A22 += gt[34];
+	m_A22 += gt[35];
+	m_A22 += gt[36];
+	m_A22 += gt[37];
+	m_A22 += gt[38];
+	m_A21 += go[33];
+	m_A21 += go[34];
+	m_A20 += go[35];
+	double RHS6 = Idr[33];
+	RHS6 += Idr[34];
+	RHS6 += Idr[35];
+	RHS6 += Idr[36];
+	RHS6 += Idr[37];
+	RHS6 += Idr[38];
+	RHS6 -= go[36] * *cnV[36];
+	RHS6 -= go[37] * *cnV[37];
+	RHS6 -= go[38] * *cnV[38];
+	m_A27 += gt[39];
+	m_A27 += gt[40];
+	m_A27 += gt[41];
+	m_A27 += gt[42];
+	m_A27 += gt[43];
+	m_A28 += go[39];
+	m_A28 += go[40];
+	m_A25 += go[41];
+	m_A25 += go[42];
+	double RHS7 = Idr[39];
+	RHS7 += Idr[40];
+	RHS7 += Idr[41];
+	RHS7 += Idr[42];
+	RHS7 += Idr[43];
+	RHS7 -= go[43] * *cnV[43];
+	m_A31 += gt[44];
+	m_A31 += gt[45];
+	m_A31 += gt[46];
+	m_A31 += gt[47];
+	m_A31 += gt[48];
+	m_A32 += go[44];
+	m_A32 += go[45];
+	m_A29 += go[46];
+	m_A29 += go[47];
+	double RHS8 = Idr[44];
+	RHS8 += Idr[45];
+	RHS8 += Idr[46];
+	RHS8 += Idr[47];
+	RHS8 += Idr[48];
+	RHS8 -= go[48] * *cnV[48];
+	m_A37 += gt[49];
+	m_A37 += gt[50];
+	m_A37 += gt[51];
+	m_A37 += gt[52];
+	m_A37 += gt[53];
+	m_A34 += go[49];
+	m_A36 += go[50];
+	m_A36 += go[51];
+	m_A33 += go[52];
+	double RHS9 = Idr[49];
+	RHS9 += Idr[50];
+	RHS9 += Idr[51];
+	RHS9 += Idr[52];
+	RHS9 += Idr[53];
+	RHS9 -= go[53] * *cnV[53];
+	m_A44 += gt[54];
+	m_A44 += gt[55];
+	m_A44 += gt[56];
+	m_A44 += gt[57];
+	m_A44 += gt[58];
+	m_A42 += go[54];
+	m_A42 += go[55];
+	m_A40 += go[56];
+	m_A39 += go[57];
+	double RHS10 = Idr[54];
+	RHS10 += Idr[55];
+	RHS10 += Idr[56];
+	RHS10 += Idr[57];
+	RHS10 += Idr[58];
+	RHS10 -= go[58] * *cnV[58];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A15;
+	m_A17 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A16;
+	m_A17 += m_A3 * f1_5;
+	m_A18 += m_A4 * f1_5;
+	m_A19 += m_A5 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f1_7 = -f1 * m_A25;
+	m_A26 += m_A3 * f1_7;
+	m_A27 += m_A4 * f1_7;
+	m_A28 += m_A5 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f1_9 = -f1 * m_A33;
+	m_A35 += m_A3 * f1_9;
+	m_A36 += m_A4 * f1_9;
+	m_A37 += m_A5 * f1_9;
+	RHS9 += f1_9 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_6 = -f2 * m_A20;
+	m_A22 += m_A7 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_9 = -f3 * m_A34;
+	m_A37 += m_A9 * f3_9;
+	m_A38 += m_A10 * f3_9;
+	RHS9 += f3_9 * RHS3;
+	const double f3_10 = -f3 * m_A39;
+	m_A43 += m_A9 * f3_10;
+	m_A44 += m_A10 * f3_10;
+	RHS10 += f3_10 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_6 = -f4 * m_A21;
+	m_A22 += m_A12 * f4_6;
+	m_A23 += m_A13 * f4_6;
+	m_A24 += m_A14 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f4_8 = -f4 * m_A29;
+	m_A30 += m_A12 * f4_8;
+	m_A31 += m_A13 * f4_8;
+	m_A32 += m_A14 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f4_10 = -f4 * m_A40;
+	m_A41 += m_A12 * f4_10;
+	m_A42 += m_A13 * f4_10;
+	m_A44 += m_A14 * f4_10;
+	RHS10 += f4_10 * RHS4;
+	const double f5 = 1.0 / m_A17;
+	const double f5_7 = -f5 * m_A26;
+	m_A27 += m_A18 * f5_7;
+	m_A28 += m_A19 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f5_9 = -f5 * m_A35;
+	m_A36 += m_A18 * f5_9;
+	m_A37 += m_A19 * f5_9;
+	RHS9 += f5_9 * RHS5;
+	const double f6 = 1.0 / m_A22;
+	const double f6_8 = -f6 * m_A30;
+	m_A31 += m_A23 * f6_8;
+	m_A32 += m_A24 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f6_10 = -f6 * m_A41;
+	m_A42 += m_A23 * f6_10;
+	m_A44 += m_A24 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f7 = 1.0 / m_A27;
+	const double f7_9 = -f7 * m_A36;
+	m_A37 += m_A28 * f7_9;
+	RHS9 += f7_9 * RHS7;
+	const double f8 = 1.0 / m_A31;
+	const double f8_10 = -f8 * m_A42;
+	m_A44 += m_A32 * f8_10;
+	RHS10 += f8_10 * RHS8;
+	const double f9 = 1.0 / m_A37;
+	const double f9_10 = -f9 * m_A43;
+	m_A44 += m_A38 * f9_10;
+	RHS10 += f9_10 * RHS9;
+	V[10] = RHS10 / m_A44;
 	double tmp9 = 0.0;
-	tmp9 += m_A26 * V[12];
-	tmp9 += m_A27 * V[24];
-	V[9] = (RHS9 - tmp9) / m_A25;
+	tmp9 += m_A38 * V[10];
+	V[9] = (RHS9 - tmp9) / m_A37;
 	double tmp8 = 0.0;
-	tmp8 += m_A23 * V[18];
-	tmp8 += m_A24 * V[20];
-	V[8] = (RHS8 - tmp8) / m_A22;
+	tmp8 += m_A32 * V[10];
+	V[8] = (RHS8 - tmp8) / m_A31;
 	double tmp7 = 0.0;
-	tmp7 += m_A20 * V[18];
-	tmp7 += m_A21 * V[19];
-	V[7] = (RHS7 - tmp7) / m_A19;
+	tmp7 += m_A28 * V[9];
+	V[7] = (RHS7 - tmp7) / m_A27;
 	double tmp6 = 0.0;
-	tmp6 += m_A17 * V[18];
-	tmp6 += m_A18 * V[22];
-	V[6] = (RHS6 - tmp6) / m_A16;
+	tmp6 += m_A23 * V[8];
+	tmp6 += m_A24 * V[10];
+	V[6] = (RHS6 - tmp6) / m_A22;
 	double tmp5 = 0.0;
-	tmp5 += m_A14 * V[17];
-	tmp5 += m_A15 * V[22];
-	V[5] = (RHS5 - tmp5) / m_A13;
+	tmp5 += m_A18 * V[7];
+	tmp5 += m_A19 * V[9];
+	V[5] = (RHS5 - tmp5) / m_A17;
 	double tmp4 = 0.0;
-	tmp4 += m_A10 * V[17];
-	tmp4 += m_A11 * V[21];
-	tmp4 += m_A12 * V[22];
-	V[4] = (RHS4 - tmp4) / m_A9;
+	tmp4 += m_A12 * V[6];
+	tmp4 += m_A13 * V[8];
+	tmp4 += m_A14 * V[10];
+	V[4] = (RHS4 - tmp4) / m_A11;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[15];
-	tmp3 += m_A8 * V[21];
-	V[3] = (RHS3 - tmp3) / m_A6;
+	tmp3 += m_A9 * V[9];
+	tmp3 += m_A10 * V[10];
+	V[3] = (RHS3 - tmp3) / m_A8;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[15];
-	V[2] = (RHS2 - tmp2) / m_A4;
+	tmp2 += m_A7 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A6;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[20];
+	tmp1 += m_A3 * V[5];
+	tmp1 += m_A4 * V[7];
+	tmp1 += m_A5 * V[9];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[19];
+	tmp0 += m_A1 * V[5];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// 280zzzap
-static void nl_gcr_bcf0e3af19330ca7_116_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// elim
+static void nl_gcr_d2ea3f267b959e8b_20_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	m_A2 += go[1];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[2] * *cnV[2];
+	m_A3 += gt[3];
+	m_A3 += gt[4];
+	m_A4 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A5 += gt[5];
+	m_A5 += gt[6];
+	m_A7 += go[5];
+	m_A6 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	m_A10 += gt[7];
+	m_A10 += gt[8];
+	m_A10 += gt[9];
+	m_A9 += go[7];
+	m_A8 += go[8];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 += Idr[9];
+	RHS3 -= go[9] * *cnV[9];
+	m_A15 += gt[10];
+	m_A15 += gt[11];
+	m_A15 += gt[12];
+	m_A13 += go[10];
+	m_A12 += go[11];
+	double RHS4 = Idr[10];
+	RHS4 += Idr[11];
+	RHS4 += Idr[12];
+	RHS4 -= go[12] * *cnV[12];
+	m_A19 += gt[13];
+	m_A19 += gt[14];
+	m_A19 += gt[15];
+	m_A17 += go[13];
+	double RHS5 = Idr[13];
+	RHS5 += Idr[14];
+	RHS5 += Idr[15];
+	RHS5 -= go[14] * *cnV[14];
+	RHS5 -= go[15] * *cnV[15];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A8;
+	m_A10 += m_A1 * f0_3;
+	m_A11 += m_A2 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f0_4 = -f0 * m_A12;
+	m_A14 += m_A1 * f0_4;
+	m_A15 += m_A2 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_4 = -f2 * m_A13;
+	m_A15 += m_A6 * f2_4;
+	m_A16 += m_A7 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_5 = -f2 * m_A17;
+	m_A18 += m_A6 * f2_5;
+	m_A19 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_4 = -f3 * m_A14;
+	m_A15 += m_A11 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f4 = 1.0 / m_A15;
+	const double f4_5 = -f4 * m_A18;
+	m_A19 += m_A16 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A19;
+	double tmp4 = 0.0;
+	tmp4 += m_A16 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A15;
+	double tmp3 = 0.0;
+	tmp3 += m_A11 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A10;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[4];
+	tmp2 += m_A7 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A4 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A3;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	tmp0 += m_A2 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starfire
+static void nl_gcr_d32effa2b0ea54a1_438_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -12235,652 +54922,2711 @@
 	double m_A113(0.0);
 	double m_A114(0.0);
 	double m_A115(0.0);
-	m_A0 += gt[0];
-	m_A0 += gt[1];
-	m_A1 += go[0];
-	double RHS0 = Idr[0];
-	RHS0 += Idr[1];
-	RHS0 -= go[1] * *cnV[1];
-	m_A2 += gt[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A3 += go[2];
-	double RHS1 = Idr[2];
-	RHS1 += Idr[3];
-	RHS1 += Idr[4];
-	RHS1 -= go[3] * *cnV[3];
-	RHS1 -= go[4] * *cnV[4];
-	m_A4 += gt[5];
-	m_A4 += gt[6];
-	m_A4 += gt[7];
-	m_A4 += gt[8];
-	m_A4 += gt[9];
-	m_A4 += gt[10];
-	m_A4 += gt[11];
-	m_A5 += go[5];
-	double RHS2 = Idr[5];
-	RHS2 += Idr[6];
-	RHS2 += Idr[7];
-	RHS2 += Idr[8];
-	RHS2 += Idr[9];
-	RHS2 += Idr[10];
-	RHS2 += Idr[11];
-	RHS2 -= go[6] * *cnV[6];
-	RHS2 -= go[7] * *cnV[7];
-	RHS2 -= go[8] * *cnV[8];
-	RHS2 -= go[9] * *cnV[9];
-	RHS2 -= go[10] * *cnV[10];
-	RHS2 -= go[11] * *cnV[11];
-	m_A6 += gt[12];
-	m_A6 += gt[13];
-	m_A7 += go[12];
-	double RHS3 = Idr[12];
-	RHS3 += Idr[13];
-	RHS3 -= go[13] * *cnV[13];
-	m_A8 += gt[14];
-	m_A8 += gt[15];
-	m_A9 += go[14];
-	double RHS4 = Idr[14];
-	RHS4 += Idr[15];
-	RHS4 -= go[15] * *cnV[15];
-	m_A10 += gt[16];
-	m_A10 += gt[17];
-	m_A10 += gt[18];
-	m_A10 += gt[19];
-	m_A10 += gt[20];
-	m_A10 += gt[21];
-	m_A10 += gt[22];
-	m_A11 += go[16];
-	double RHS5 = Idr[16];
-	RHS5 += Idr[17];
-	RHS5 += Idr[18];
-	RHS5 += Idr[19];
-	RHS5 += Idr[20];
-	RHS5 += Idr[21];
-	RHS5 += Idr[22];
-	RHS5 -= go[17] * *cnV[17];
-	RHS5 -= go[18] * *cnV[18];
-	RHS5 -= go[19] * *cnV[19];
-	RHS5 -= go[20] * *cnV[20];
-	RHS5 -= go[21] * *cnV[21];
-	RHS5 -= go[22] * *cnV[22];
-	m_A12 += gt[23];
-	m_A12 += gt[24];
-	m_A12 += gt[25];
-	m_A13 += go[23];
-	double RHS6 = Idr[23];
-	RHS6 += Idr[24];
-	RHS6 += Idr[25];
-	RHS6 -= go[24] * *cnV[24];
-	RHS6 -= go[25] * *cnV[25];
-	m_A14 += gt[26];
-	m_A14 += gt[27];
-	m_A16 += go[26];
-	m_A15 += go[27];
-	double RHS7 = Idr[26];
-	RHS7 += Idr[27];
-	m_A17 += gt[28];
-	m_A17 += gt[29];
-	m_A18 += go[28];
-	double RHS8 = Idr[28];
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
+	double m_A153(0.0);
+	double m_A154(0.0);
+	double m_A155(0.0);
+	double m_A156(0.0);
+	double m_A157(0.0);
+	double m_A158(0.0);
+	double m_A159(0.0);
+	double m_A160(0.0);
+	double m_A161(0.0);
+	double m_A162(0.0);
+	double m_A163(0.0);
+	double m_A164(0.0);
+	double m_A165(0.0);
+	double m_A166(0.0);
+	double m_A167(0.0);
+	double m_A168(0.0);
+	double m_A169(0.0);
+	double m_A170(0.0);
+	double m_A171(0.0);
+	double m_A172(0.0);
+	double m_A173(0.0);
+	double m_A174(0.0);
+	double m_A175(0.0);
+	double m_A176(0.0);
+	double m_A177(0.0);
+	double m_A178(0.0);
+	double m_A179(0.0);
+	double m_A180(0.0);
+	double m_A181(0.0);
+	double m_A182(0.0);
+	double m_A183(0.0);
+	double m_A184(0.0);
+	double m_A185(0.0);
+	double m_A186(0.0);
+	double m_A187(0.0);
+	double m_A188(0.0);
+	double m_A189(0.0);
+	double m_A190(0.0);
+	double m_A191(0.0);
+	double m_A192(0.0);
+	double m_A193(0.0);
+	double m_A194(0.0);
+	double m_A195(0.0);
+	double m_A196(0.0);
+	double m_A197(0.0);
+	double m_A198(0.0);
+	double m_A199(0.0);
+	double m_A200(0.0);
+	double m_A201(0.0);
+	double m_A202(0.0);
+	double m_A203(0.0);
+	double m_A204(0.0);
+	double m_A205(0.0);
+	double m_A206(0.0);
+	double m_A207(0.0);
+	double m_A208(0.0);
+	double m_A209(0.0);
+	double m_A210(0.0);
+	double m_A211(0.0);
+	double m_A212(0.0);
+	double m_A213(0.0);
+	double m_A214(0.0);
+	double m_A215(0.0);
+	double m_A216(0.0);
+	double m_A217(0.0);
+	double m_A218(0.0);
+	double m_A219(0.0);
+	double m_A220(0.0);
+	double m_A221(0.0);
+	double m_A222(0.0);
+	double m_A223(0.0);
+	double m_A224(0.0);
+	double m_A225(0.0);
+	double m_A226(0.0);
+	double m_A227(0.0);
+	double m_A228(0.0);
+	double m_A229(0.0);
+	double m_A230(0.0);
+	double m_A231(0.0);
+	double m_A232(0.0);
+	double m_A233(0.0);
+	double m_A234(0.0);
+	double m_A235(0.0);
+	double m_A236(0.0);
+	double m_A237(0.0);
+	double m_A238(0.0);
+	double m_A239(0.0);
+	double m_A240(0.0);
+	double m_A241(0.0);
+	double m_A242(0.0);
+	double m_A243(0.0);
+	double m_A244(0.0);
+	double m_A245(0.0);
+	double m_A246(0.0);
+	double m_A247(0.0);
+	double m_A248(0.0);
+	double m_A249(0.0);
+	double m_A250(0.0);
+	double m_A251(0.0);
+	double m_A252(0.0);
+	double m_A253(0.0);
+	double m_A254(0.0);
+	double m_A255(0.0);
+	double m_A256(0.0);
+	double m_A257(0.0);
+	double m_A258(0.0);
+	double m_A259(0.0);
+	double m_A260(0.0);
+	double m_A261(0.0);
+	double m_A262(0.0);
+	double m_A263(0.0);
+	double m_A264(0.0);
+	double m_A265(0.0);
+	double m_A266(0.0);
+	double m_A267(0.0);
+	double m_A268(0.0);
+	double m_A269(0.0);
+	double m_A270(0.0);
+	double m_A271(0.0);
+	double m_A272(0.0);
+	double m_A273(0.0);
+	double m_A274(0.0);
+	double m_A275(0.0);
+	double m_A276(0.0);
+	double m_A277(0.0);
+	double m_A278(0.0);
+	double m_A279(0.0);
+	double m_A280(0.0);
+	double m_A281(0.0);
+	double m_A282(0.0);
+	double m_A283(0.0);
+	double m_A284(0.0);
+	double m_A285(0.0);
+	double m_A286(0.0);
+	double m_A287(0.0);
+	double m_A288(0.0);
+	double m_A289(0.0);
+	double m_A290(0.0);
+	double m_A291(0.0);
+	double m_A292(0.0);
+	double m_A293(0.0);
+	double m_A294(0.0);
+	double m_A295(0.0);
+	double m_A296(0.0);
+	double m_A297(0.0);
+	double m_A298(0.0);
+	double m_A299(0.0);
+	double m_A300(0.0);
+	double m_A301(0.0);
+	double m_A302(0.0);
+	double m_A303(0.0);
+	double m_A304(0.0);
+	double m_A305(0.0);
+	double m_A306(0.0);
+	double m_A307(0.0);
+	double m_A308(0.0);
+	double m_A309(0.0);
+	double m_A310(0.0);
+	double m_A311(0.0);
+	double m_A312(0.0);
+	double m_A313(0.0);
+	double m_A314(0.0);
+	double m_A315(0.0);
+	double m_A316(0.0);
+	double m_A317(0.0);
+	double m_A318(0.0);
+	double m_A319(0.0);
+	double m_A320(0.0);
+	double m_A321(0.0);
+	double m_A322(0.0);
+	double m_A323(0.0);
+	double m_A324(0.0);
+	double m_A325(0.0);
+	double m_A326(0.0);
+	double m_A327(0.0);
+	double m_A328(0.0);
+	double m_A329(0.0);
+	double m_A330(0.0);
+	double m_A331(0.0);
+	double m_A332(0.0);
+	double m_A333(0.0);
+	double m_A334(0.0);
+	double m_A335(0.0);
+	double m_A336(0.0);
+	double m_A337(0.0);
+	double m_A338(0.0);
+	double m_A339(0.0);
+	double m_A340(0.0);
+	double m_A341(0.0);
+	double m_A342(0.0);
+	double m_A343(0.0);
+	double m_A344(0.0);
+	double m_A345(0.0);
+	double m_A346(0.0);
+	double m_A347(0.0);
+	double m_A348(0.0);
+	double m_A349(0.0);
+	double m_A350(0.0);
+	double m_A351(0.0);
+	double m_A352(0.0);
+	double m_A353(0.0);
+	double m_A354(0.0);
+	double m_A355(0.0);
+	double m_A356(0.0);
+	double m_A357(0.0);
+	double m_A358(0.0);
+	double m_A359(0.0);
+	double m_A360(0.0);
+	double m_A361(0.0);
+	double m_A362(0.0);
+	double m_A363(0.0);
+	double m_A364(0.0);
+	double m_A365(0.0);
+	double m_A366(0.0);
+	double m_A367(0.0);
+	double m_A368(0.0);
+	double m_A369(0.0);
+	double m_A370(0.0);
+	double m_A371(0.0);
+	double m_A372(0.0);
+	double m_A373(0.0);
+	double m_A374(0.0);
+	double m_A375(0.0);
+	double m_A376(0.0);
+	double m_A377(0.0);
+	double m_A378(0.0);
+	double m_A379(0.0);
+	double m_A380(0.0);
+	double m_A381(0.0);
+	double m_A382(0.0);
+	double m_A383(0.0);
+	double m_A384(0.0);
+	double m_A385(0.0);
+	double m_A386(0.0);
+	double m_A387(0.0);
+	double m_A388(0.0);
+	double m_A389(0.0);
+	double m_A390(0.0);
+	double m_A391(0.0);
+	double m_A392(0.0);
+	double m_A393(0.0);
+	double m_A394(0.0);
+	double m_A395(0.0);
+	double m_A396(0.0);
+	double m_A397(0.0);
+	double m_A398(0.0);
+	double m_A399(0.0);
+	double m_A400(0.0);
+	double m_A401(0.0);
+	double m_A402(0.0);
+	double m_A403(0.0);
+	double m_A404(0.0);
+	double m_A405(0.0);
+	double m_A406(0.0);
+	double m_A407(0.0);
+	double m_A408(0.0);
+	double m_A409(0.0);
+	double m_A410(0.0);
+	double m_A411(0.0);
+	double m_A412(0.0);
+	double m_A413(0.0);
+	double m_A414(0.0);
+	double m_A415(0.0);
+	double m_A416(0.0);
+	double m_A417(0.0);
+	double m_A418(0.0);
+	double m_A419(0.0);
+	double m_A420(0.0);
+	double m_A421(0.0);
+	double m_A422(0.0);
+	double m_A423(0.0);
+	double m_A424(0.0);
+	double m_A425(0.0);
+	double m_A426(0.0);
+	double m_A427(0.0);
+	double m_A428(0.0);
+	double m_A429(0.0);
+	double m_A430(0.0);
+	double m_A431(0.0);
+	double m_A432(0.0);
+	double m_A433(0.0);
+	double m_A434(0.0);
+	double m_A435(0.0);
+	double m_A436(0.0);
+	double m_A437(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A7 += go[4];
+	m_A6 += go[5];
+	m_A5 += go[6];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[7] * *cnV[7];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A9 += go[8];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	RHS3 -= go[9] * *cnV[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A10 += gt[12];
+	m_A11 += go[10];
+	m_A12 += go[11];
+	double RHS4 = Idr[10];
+	RHS4 += Idr[11];
+	RHS4 += Idr[12];
+	RHS4 -= go[12] * *cnV[12];
+	m_A13 += gt[13];
+	m_A13 += gt[14];
+	m_A13 += gt[15];
+	m_A14 += go[13];
+	m_A15 += go[14];
+	double RHS5 = Idr[13];
+	RHS5 += Idr[14];
+	RHS5 += Idr[15];
+	RHS5 -= go[15] * *cnV[15];
+	m_A16 += gt[16];
+	m_A16 += gt[17];
+	m_A17 += go[16];
+	double RHS6 = Idr[16];
+	RHS6 += Idr[17];
+	RHS6 -= go[17] * *cnV[17];
+	m_A18 += gt[18];
+	m_A18 += gt[19];
+	m_A18 += gt[20];
+	m_A18 += gt[21];
+	m_A18 += gt[22];
+	m_A18 += gt[23];
+	m_A18 += gt[24];
+	m_A22 += go[18];
+	m_A21 += go[19];
+	m_A20 += go[20];
+	m_A19 += go[21];
+	double RHS7 = Idr[18];
+	RHS7 += Idr[19];
+	RHS7 += Idr[20];
+	RHS7 += Idr[21];
+	RHS7 += Idr[22];
+	RHS7 += Idr[23];
+	RHS7 += Idr[24];
+	RHS7 -= go[22] * *cnV[22];
+	RHS7 -= go[23] * *cnV[23];
+	RHS7 -= go[24] * *cnV[24];
+	m_A23 += gt[25];
+	m_A23 += gt[26];
+	m_A23 += gt[27];
+	m_A23 += gt[28];
+	m_A23 += gt[29];
+	m_A23 += gt[30];
+	m_A23 += gt[31];
+	m_A27 += go[25];
+	m_A26 += go[26];
+	m_A25 += go[27];
+	m_A24 += go[28];
+	double RHS8 = Idr[25];
+	RHS8 += Idr[26];
+	RHS8 += Idr[27];
+	RHS8 += Idr[28];
 	RHS8 += Idr[29];
+	RHS8 += Idr[30];
+	RHS8 += Idr[31];
 	RHS8 -= go[29] * *cnV[29];
-	m_A19 += gt[30];
-	m_A19 += gt[31];
-	m_A20 += go[30];
-	double RHS9 = Idr[30];
-	RHS9 += Idr[31];
-	RHS9 -= go[31] * *cnV[31];
-	m_A21 += gt[32];
-	m_A21 += gt[33];
-	m_A22 += go[32];
-	double RHS10 = Idr[32];
-	RHS10 += Idr[33];
-	RHS10 -= go[33] * *cnV[33];
-	m_A23 += gt[34];
-	m_A23 += gt[35];
-	m_A23 += gt[36];
-	m_A23 += gt[37];
-	m_A23 += gt[38];
-	m_A23 += gt[39];
-	m_A23 += gt[40];
-	m_A24 += go[34];
-	double RHS11 = Idr[34];
-	RHS11 += Idr[35];
-	RHS11 += Idr[36];
+	RHS8 -= go[30] * *cnV[30];
+	RHS8 -= go[31] * *cnV[31];
+	m_A28 += gt[32];
+	m_A28 += gt[33];
+	m_A29 += go[32];
+	double RHS9 = Idr[32];
+	RHS9 += Idr[33];
+	RHS9 -= go[33] * *cnV[33];
+	m_A30 += gt[34];
+	m_A30 += gt[35];
+	m_A31 += go[34];
+	double RHS10 = Idr[34];
+	RHS10 += Idr[35];
+	RHS10 -= go[35] * *cnV[35];
+	m_A32 += gt[36];
+	m_A32 += gt[37];
+	m_A32 += gt[38];
+	m_A32 += gt[39];
+	m_A33 += go[36];
+	m_A34 += go[37];
+	double RHS11 = Idr[36];
 	RHS11 += Idr[37];
 	RHS11 += Idr[38];
 	RHS11 += Idr[39];
-	RHS11 += Idr[40];
-	RHS11 -= go[35] * *cnV[35];
-	RHS11 -= go[36] * *cnV[36];
-	RHS11 -= go[37] * *cnV[37];
 	RHS11 -= go[38] * *cnV[38];
 	RHS11 -= go[39] * *cnV[39];
-	RHS11 -= go[40] * *cnV[40];
-	m_A25 += gt[41];
-	m_A25 += gt[42];
-	m_A26 += go[41];
-	double RHS12 = Idr[41];
+	m_A35 += gt[40];
+	m_A35 += gt[41];
+	m_A35 += gt[42];
+	m_A36 += go[40];
+	m_A37 += go[41];
+	double RHS12 = Idr[40];
+	RHS12 += Idr[41];
 	RHS12 += Idr[42];
 	RHS12 -= go[42] * *cnV[42];
-	m_A27 += gt[43];
-	m_A27 += gt[44];
-	m_A27 += gt[45];
-	m_A28 += go[43];
+	m_A38 += gt[43];
+	m_A38 += gt[44];
+	m_A38 += gt[45];
+	m_A39 += go[43];
 	double RHS13 = Idr[43];
 	RHS13 += Idr[44];
 	RHS13 += Idr[45];
 	RHS13 -= go[44] * *cnV[44];
 	RHS13 -= go[45] * *cnV[45];
-	m_A29 += gt[46];
-	m_A29 += gt[47];
-	m_A29 += gt[48];
-	m_A30 += go[46];
+	m_A40 += gt[46];
+	m_A40 += gt[47];
+	m_A40 += gt[48];
+	m_A42 += go[46];
+	m_A41 += go[47];
 	double RHS14 = Idr[46];
 	RHS14 += Idr[47];
 	RHS14 += Idr[48];
-	RHS14 -= go[47] * *cnV[47];
 	RHS14 -= go[48] * *cnV[48];
-	m_A31 += gt[49];
-	m_A31 += gt[50];
-	m_A32 += go[49];
-	m_A33 += go[50];
+	m_A43 += gt[49];
+	m_A43 += gt[50];
+	m_A43 += gt[51];
+	m_A44 += go[49];
+	m_A45 += go[50];
 	double RHS15 = Idr[49];
 	RHS15 += Idr[50];
-	m_A35 += gt[51];
-	m_A35 += gt[52];
-	m_A34 += go[51];
-	double RHS16 = Idr[51];
-	RHS16 += Idr[52];
-	RHS16 -= go[52] * *cnV[52];
-	m_A37 += gt[53];
-	m_A37 += gt[54];
-	m_A36 += go[53];
-	double RHS17 = Idr[53];
-	RHS17 += Idr[54];
-	RHS17 -= go[54] * *cnV[54];
-	m_A40 += gt[55];
-	m_A40 += gt[56];
-	m_A39 += go[55];
-	m_A38 += go[56];
-	double RHS18 = Idr[55];
-	RHS18 += Idr[56];
-	m_A42 += gt[57];
-	m_A42 += gt[58];
-	m_A42 += gt[59];
-	m_A42 += gt[60];
-	m_A41 += go[57];
-	m_A43 += go[58];
-	double RHS19 = Idr[57];
-	RHS19 += Idr[58];
-	RHS19 += Idr[59];
-	RHS19 += Idr[60];
-	RHS19 -= go[59] * *cnV[59];
-	RHS19 -= go[60] * *cnV[60];
-	m_A46 += gt[61];
-	m_A46 += gt[62];
-	m_A46 += gt[63];
-	m_A46 += gt[64];
-	m_A46 += gt[65];
-	m_A46 += gt[66];
-	m_A44 += go[61];
-	m_A47 += go[62];
-	m_A49 += go[63];
-	m_A48 += go[64];
-	double RHS20 = Idr[61];
-	RHS20 += Idr[62];
-	RHS20 += Idr[63];
-	RHS20 += Idr[64];
-	RHS20 += Idr[65];
-	RHS20 += Idr[66];
-	RHS20 -= go[65] * *cnV[65];
-	RHS20 -= go[66] * *cnV[66];
-	m_A51 += gt[67];
-	m_A51 += gt[68];
-	m_A51 += gt[69];
-	m_A51 += gt[70];
-	m_A50 += go[67];
-	m_A52 += go[68];
-	double RHS21 = Idr[67];
-	RHS21 += Idr[68];
-	RHS21 += Idr[69];
-	RHS21 += Idr[70];
-	RHS21 -= go[69] * *cnV[69];
-	RHS21 -= go[70] * *cnV[70];
-	m_A56 += gt[71];
-	m_A56 += gt[72];
-	m_A56 += gt[73];
-	m_A56 += gt[74];
-	m_A56 += gt[75];
-	m_A56 += gt[76];
-	m_A53 += go[71];
-	m_A54 += go[72];
-	m_A57 += go[73];
-	m_A59 += go[74];
-	double RHS22 = Idr[71];
-	RHS22 += Idr[72];
-	RHS22 += Idr[73];
+	RHS15 += Idr[51];
+	RHS15 -= go[51] * *cnV[51];
+	m_A46 += gt[52];
+	m_A46 += gt[53];
+	m_A46 += gt[54];
+	m_A46 += gt[55];
+	m_A46 += gt[56];
+	m_A46 += gt[57];
+	m_A46 += gt[58];
+	m_A50 += go[52];
+	m_A49 += go[53];
+	m_A47 += go[54];
+	m_A48 += go[55];
+	double RHS16 = Idr[52];
+	RHS16 += Idr[53];
+	RHS16 += Idr[54];
+	RHS16 += Idr[55];
+	RHS16 += Idr[56];
+	RHS16 += Idr[57];
+	RHS16 += Idr[58];
+	RHS16 -= go[56] * *cnV[56];
+	RHS16 -= go[57] * *cnV[57];
+	RHS16 -= go[58] * *cnV[58];
+	m_A51 += gt[59];
+	m_A51 += gt[60];
+	m_A51 += gt[61];
+	m_A52 += go[59];
+	double RHS17 = Idr[59];
+	RHS17 += Idr[60];
+	RHS17 += Idr[61];
+	RHS17 -= go[60] * *cnV[60];
+	RHS17 -= go[61] * *cnV[61];
+	m_A53 += gt[62];
+	m_A53 += gt[63];
+	m_A53 += gt[64];
+	m_A55 += go[62];
+	m_A54 += go[63];
+	double RHS18 = Idr[62];
+	RHS18 += Idr[63];
+	RHS18 += Idr[64];
+	RHS18 -= go[64] * *cnV[64];
+	m_A56 += gt[65];
+	m_A56 += gt[66];
+	m_A56 += gt[67];
+	m_A57 += go[65];
+	double RHS19 = Idr[65];
+	RHS19 += Idr[66];
+	RHS19 += Idr[67];
+	RHS19 -= go[66] * *cnV[66];
+	RHS19 -= go[67] * *cnV[67];
+	m_A58 += gt[68];
+	m_A58 += gt[69];
+	m_A58 += gt[70];
+	m_A59 += go[68];
+	double RHS20 = Idr[68];
+	RHS20 += Idr[69];
+	RHS20 += Idr[70];
+	RHS20 -= go[69] * *cnV[69];
+	RHS20 -= go[70] * *cnV[70];
+	m_A60 += gt[71];
+	m_A60 += gt[72];
+	m_A61 += go[71];
+	double RHS21 = Idr[71];
+	RHS21 += Idr[72];
+	RHS21 -= go[72] * *cnV[72];
+	m_A62 += gt[73];
+	m_A62 += gt[74];
+	m_A62 += gt[75];
+	m_A63 += go[73];
+	double RHS22 = Idr[73];
 	RHS22 += Idr[74];
 	RHS22 += Idr[75];
-	RHS22 += Idr[76];
+	RHS22 -= go[74] * *cnV[74];
 	RHS22 -= go[75] * *cnV[75];
-	RHS22 -= go[76] * *cnV[76];
-	m_A61 += gt[77];
-	m_A61 += gt[78];
-	m_A60 += go[77];
-	m_A62 += go[78];
-	double RHS23 = Idr[77];
-	RHS23 += Idr[78];
-	m_A68 += gt[79];
-	m_A68 += gt[80];
+	m_A64 += gt[76];
+	m_A64 += gt[77];
+	m_A65 += go[76];
+	double RHS23 = Idr[76];
+	RHS23 += Idr[77];
+	RHS23 -= go[77] * *cnV[77];
+	m_A66 += gt[78];
+	m_A66 += gt[79];
+	m_A66 += gt[80];
+	m_A67 += go[78];
+	double RHS24 = Idr[78];
+	RHS24 += Idr[79];
+	RHS24 += Idr[80];
+	RHS24 -= go[79] * *cnV[79];
+	RHS24 -= go[80] * *cnV[80];
 	m_A68 += gt[81];
 	m_A68 += gt[82];
-	m_A68 += gt[83];
-	m_A67 += go[79];
-	m_A65 += go[80];
-	m_A64 += go[81];
-	m_A63 += go[82];
-	m_A66 += go[83];
-	double RHS24 = Idr[79];
-	RHS24 += Idr[80];
-	RHS24 += Idr[81];
-	RHS24 += Idr[82];
-	RHS24 += Idr[83];
-	m_A77 += gt[84];
-	m_A77 += gt[85];
-	m_A77 += gt[86];
-	m_A77 += gt[87];
-	m_A74 += go[84];
-	m_A73 += go[85];
-	m_A78 += go[86];
-	m_A72 += go[87];
-	double RHS25 = Idr[84];
-	RHS25 += Idr[85];
-	RHS25 += Idr[86];
-	RHS25 += Idr[87];
-	m_A82 += gt[88];
-	m_A82 += gt[89];
-	m_A82 += gt[90];
-	m_A82 += gt[91];
-	m_A81 += go[88];
-	m_A83 += go[89];
-	double RHS26 = Idr[88];
-	RHS26 += Idr[89];
-	RHS26 += Idr[90];
-	RHS26 += Idr[91];
-	RHS26 -= go[90] * *cnV[90];
-	RHS26 -= go[91] * *cnV[91];
-	m_A87 += gt[92];
-	m_A87 += gt[93];
-	m_A87 += gt[94];
-	m_A87 += gt[95];
-	m_A87 += gt[96];
-	m_A84 += go[92];
-	m_A85 += go[93];
-	m_A88 += go[94];
-	double RHS27 = Idr[92];
+	m_A69 += go[81];
+	double RHS25 = Idr[81];
+	RHS25 += Idr[82];
+	RHS25 -= go[82] * *cnV[82];
+	m_A70 += gt[83];
+	m_A70 += gt[84];
+	m_A70 += gt[85];
+	m_A70 += gt[86];
+	m_A72 += go[83];
+	m_A71 += go[84];
+	m_A71 += go[85];
+	double RHS26 = Idr[83];
+	RHS26 += Idr[84];
+	RHS26 += Idr[85];
+	RHS26 += Idr[86];
+	RHS26 -= go[86] * *cnV[86];
+	m_A73 += gt[87];
+	m_A73 += gt[88];
+	m_A73 += gt[89];
+	m_A73 += gt[90];
+	m_A73 += gt[91];
+	m_A73 += gt[92];
+	m_A73 += gt[93];
+	m_A74 += go[87];
+	m_A75 += go[88];
+	double RHS27 = Idr[87];
+	RHS27 += Idr[88];
+	RHS27 += Idr[89];
+	RHS27 += Idr[90];
+	RHS27 += Idr[91];
+	RHS27 += Idr[92];
 	RHS27 += Idr[93];
-	RHS27 += Idr[94];
-	RHS27 += Idr[95];
-	RHS27 += Idr[96];
-	RHS27 -= go[95] * *cnV[95];
-	RHS27 -= go[96] * *cnV[96];
-	m_A96 += gt[97];
-	m_A96 += gt[98];
-	m_A96 += gt[99];
-	m_A96 += gt[100];
-	m_A96 += gt[101];
-	m_A96 += gt[102];
-	m_A96 += gt[103];
-	m_A95 += go[97];
-	m_A91 += go[98];
-	m_A92 += go[99];
-	m_A90 += go[100];
-	m_A89 += go[101];
-	m_A93 += go[102];
-	m_A94 += go[103];
-	double RHS28 = Idr[97];
-	RHS28 += Idr[98];
-	RHS28 += Idr[99];
-	RHS28 += Idr[100];
-	RHS28 += Idr[101];
-	RHS28 += Idr[102];
-	RHS28 += Idr[103];
-	m_A106 += gt[104];
-	m_A106 += gt[105];
-	m_A106 += gt[106];
-	m_A106 += gt[107];
-	m_A106 += gt[108];
-	m_A102 += go[104];
-	m_A101 += go[105];
-	m_A107 += go[106];
-	m_A100 += go[107];
-	m_A99 += go[108];
-	double RHS29 = Idr[104];
-	RHS29 += Idr[105];
-	RHS29 += Idr[106];
-	RHS29 += Idr[107];
-	RHS29 += Idr[108];
-	m_A115 += gt[109];
-	m_A115 += gt[110];
-	m_A115 += gt[111];
-	m_A115 += gt[112];
-	m_A115 += gt[113];
-	m_A108 += go[109];
-	m_A110 += go[110];
-	m_A109 += go[111];
-	m_A114 += go[112];
-	double RHS30 = Idr[109];
-	RHS30 += Idr[110];
-	RHS30 += Idr[111];
-	RHS30 += Idr[112];
-	RHS30 += Idr[113];
-	RHS30 -= go[113] * *cnV[113];
+	RHS27 -= go[89] * *cnV[89];
+	RHS27 -= go[90] * *cnV[90];
+	RHS27 -= go[91] * *cnV[91];
+	RHS27 -= go[92] * *cnV[92];
+	RHS27 -= go[93] * *cnV[93];
+	m_A76 += gt[94];
+	m_A76 += gt[95];
+	m_A78 += go[94];
+	m_A77 += go[95];
+	double RHS28 = Idr[94];
+	RHS28 += Idr[95];
+	m_A79 += gt[96];
+	m_A79 += gt[97];
+	m_A79 += gt[98];
+	m_A79 += gt[99];
+	m_A79 += gt[100];
+	m_A79 += gt[101];
+	m_A79 += gt[102];
+	m_A80 += go[96];
+	double RHS29 = Idr[96];
+	RHS29 += Idr[97];
+	RHS29 += Idr[98];
+	RHS29 += Idr[99];
+	RHS29 += Idr[100];
+	RHS29 += Idr[101];
+	RHS29 += Idr[102];
+	RHS29 -= go[97] * *cnV[97];
+	RHS29 -= go[98] * *cnV[98];
+	RHS29 -= go[99] * *cnV[99];
+	RHS29 -= go[100] * *cnV[100];
+	RHS29 -= go[101] * *cnV[101];
+	RHS29 -= go[102] * *cnV[102];
+	m_A81 += gt[103];
+	m_A81 += gt[104];
+	m_A81 += gt[105];
+	m_A81 += gt[106];
+	m_A82 += go[103];
+	m_A83 += go[104];
+	double RHS30 = Idr[103];
+	RHS30 += Idr[104];
+	RHS30 += Idr[105];
+	RHS30 += Idr[106];
+	RHS30 -= go[105] * *cnV[105];
+	RHS30 -= go[106] * *cnV[106];
+	m_A84 += gt[107];
+	m_A84 += gt[108];
+	m_A85 += go[107];
+	double RHS31 = Idr[107];
+	RHS31 += Idr[108];
+	RHS31 -= go[108] * *cnV[108];
+	m_A86 += gt[109];
+	m_A86 += gt[110];
+	m_A86 += gt[111];
+	m_A86 += gt[112];
+	m_A86 += gt[113];
+	m_A86 += gt[114];
+	m_A86 += gt[115];
+	m_A88 += go[109];
+	m_A87 += go[110];
+	double RHS32 = Idr[109];
+	RHS32 += Idr[110];
+	RHS32 += Idr[111];
+	RHS32 += Idr[112];
+	RHS32 += Idr[113];
+	RHS32 += Idr[114];
+	RHS32 += Idr[115];
+	RHS32 -= go[111] * *cnV[111];
+	RHS32 -= go[112] * *cnV[112];
+	RHS32 -= go[113] * *cnV[113];
+	RHS32 -= go[114] * *cnV[114];
+	RHS32 -= go[115] * *cnV[115];
+	m_A89 += gt[116];
+	m_A89 += gt[117];
+	m_A90 += go[116];
+	double RHS33 = Idr[116];
+	RHS33 += Idr[117];
+	RHS33 -= go[117] * *cnV[117];
+	m_A91 += gt[118];
+	m_A91 += gt[119];
+	m_A91 += gt[120];
+	m_A91 += gt[121];
+	m_A93 += go[118];
+	m_A92 += go[119];
+	double RHS34 = Idr[118];
+	RHS34 += Idr[119];
+	RHS34 += Idr[120];
+	RHS34 += Idr[121];
+	RHS34 -= go[120] * *cnV[120];
+	RHS34 -= go[121] * *cnV[121];
+	m_A94 += gt[122];
+	m_A94 += gt[123];
+	m_A94 += gt[124];
+	m_A94 += gt[125];
+	m_A94 += gt[126];
+	m_A94 += gt[127];
+	m_A94 += gt[128];
+	m_A95 += go[122];
+	double RHS35 = Idr[122];
+	RHS35 += Idr[123];
+	RHS35 += Idr[124];
+	RHS35 += Idr[125];
+	RHS35 += Idr[126];
+	RHS35 += Idr[127];
+	RHS35 += Idr[128];
+	RHS35 -= go[123] * *cnV[123];
+	RHS35 -= go[124] * *cnV[124];
+	RHS35 -= go[125] * *cnV[125];
+	RHS35 -= go[126] * *cnV[126];
+	RHS35 -= go[127] * *cnV[127];
+	RHS35 -= go[128] * *cnV[128];
+	m_A96 += gt[129];
+	m_A96 += gt[130];
+	m_A96 += gt[131];
+	m_A97 += go[129];
+	m_A98 += go[130];
+	double RHS36 = Idr[129];
+	RHS36 += Idr[130];
+	RHS36 += Idr[131];
+	RHS36 -= go[131] * *cnV[131];
+	m_A99 += gt[132];
+	m_A99 += gt[133];
+	m_A99 += gt[134];
+	m_A99 += gt[135];
+	m_A100 += go[132];
+	m_A101 += go[133];
+	double RHS37 = Idr[132];
+	RHS37 += Idr[133];
+	RHS37 += Idr[134];
+	RHS37 += Idr[135];
+	RHS37 -= go[134] * *cnV[134];
+	RHS37 -= go[135] * *cnV[135];
+	m_A102 += gt[136];
+	m_A102 += gt[137];
+	m_A102 += gt[138];
+	m_A102 += gt[139];
+	m_A103 += go[136];
+	m_A104 += go[137];
+	double RHS38 = Idr[136];
+	RHS38 += Idr[137];
+	RHS38 += Idr[138];
+	RHS38 += Idr[139];
+	RHS38 -= go[138] * *cnV[138];
+	RHS38 -= go[139] * *cnV[139];
+	m_A105 += gt[140];
+	m_A105 += gt[141];
+	m_A105 += gt[142];
+	m_A107 += go[140];
+	m_A106 += go[141];
+	double RHS39 = Idr[140];
+	RHS39 += Idr[141];
+	RHS39 += Idr[142];
+	RHS39 -= go[142] * *cnV[142];
+	m_A108 += gt[143];
+	m_A108 += gt[144];
+	m_A108 += gt[145];
+	m_A110 += go[143];
+	m_A109 += go[144];
+	double RHS40 = Idr[143];
+	RHS40 += Idr[144];
+	RHS40 += Idr[145];
+	RHS40 -= go[145] * *cnV[145];
+	m_A111 += gt[146];
+	m_A111 += gt[147];
+	m_A111 += gt[148];
+	m_A112 += go[146];
+	m_A113 += go[147];
+	double RHS41 = Idr[146];
+	RHS41 += Idr[147];
+	RHS41 += Idr[148];
+	RHS41 -= go[148] * *cnV[148];
+	m_A114 += gt[149];
+	m_A114 += gt[150];
+	m_A114 += gt[151];
+	m_A114 += gt[152];
+	m_A116 += go[149];
+	m_A114 += go[150];
+	m_A114 += go[151];
+	m_A115 += go[152];
+	double RHS42 = Idr[149];
+	RHS42 += Idr[150];
+	RHS42 += Idr[151];
+	RHS42 += Idr[152];
+	m_A117 += gt[153];
+	m_A117 += gt[154];
+	m_A117 += gt[155];
+	m_A117 += gt[156];
+	m_A119 += go[153];
+	m_A117 += go[154];
+	m_A117 += go[155];
+	m_A118 += go[156];
+	double RHS43 = Idr[153];
+	RHS43 += Idr[154];
+	RHS43 += Idr[155];
+	RHS43 += Idr[156];
+	m_A120 += gt[157];
+	m_A120 += gt[158];
+	m_A120 += gt[159];
+	m_A120 += gt[160];
+	m_A122 += go[157];
+	m_A120 += go[158];
+	m_A120 += go[159];
+	m_A121 += go[160];
+	double RHS44 = Idr[157];
+	RHS44 += Idr[158];
+	RHS44 += Idr[159];
+	RHS44 += Idr[160];
+	m_A123 += gt[161];
+	m_A123 += gt[162];
+	m_A123 += gt[163];
+	m_A124 += go[161];
+	m_A125 += go[162];
+	double RHS45 = Idr[161];
+	RHS45 += Idr[162];
+	RHS45 += Idr[163];
+	RHS45 -= go[163] * *cnV[163];
+	m_A128 += gt[164];
+	m_A128 += gt[165];
+	m_A128 += gt[166];
+	m_A128 += gt[167];
+	m_A127 += go[164];
+	m_A126 += go[165];
+	double RHS46 = Idr[164];
+	RHS46 += Idr[165];
+	RHS46 += Idr[166];
+	RHS46 += Idr[167];
+	RHS46 -= go[166] * *cnV[166];
+	RHS46 -= go[167] * *cnV[167];
+	m_A134 += gt[168];
+	m_A134 += gt[169];
+	m_A134 += gt[170];
+	m_A134 += gt[171];
+	m_A132 += go[168];
+	m_A131 += go[169];
+	double RHS47 = Idr[168];
+	RHS47 += Idr[169];
+	RHS47 += Idr[170];
+	RHS47 += Idr[171];
+	RHS47 -= go[170] * *cnV[170];
+	RHS47 -= go[171] * *cnV[171];
+	m_A141 += gt[172];
+	m_A141 += gt[173];
+	m_A141 += gt[174];
+	m_A140 += go[172];
+	m_A139 += go[173];
+	double RHS48 = Idr[172];
+	RHS48 += Idr[173];
+	RHS48 += Idr[174];
+	RHS48 -= go[174] * *cnV[174];
+	m_A145 += gt[175];
+	m_A145 += gt[176];
+	m_A145 += gt[177];
+	m_A144 += go[175];
+	m_A143 += go[176];
+	double RHS49 = Idr[175];
+	RHS49 += Idr[176];
+	RHS49 += Idr[177];
+	RHS49 -= go[177] * *cnV[177];
+	m_A148 += gt[178];
+	m_A148 += gt[179];
+	m_A148 += gt[180];
+	m_A147 += go[178];
+	m_A149 += go[179];
+	double RHS50 = Idr[178];
+	RHS50 += Idr[179];
+	RHS50 += Idr[180];
+	RHS50 -= go[180] * *cnV[180];
+	m_A152 += gt[181];
+	m_A152 += gt[182];
+	m_A152 += gt[183];
+	m_A152 += gt[184];
+	m_A150 += go[181];
+	m_A151 += go[182];
+	m_A153 += go[183];
+	double RHS51 = Idr[181];
+	RHS51 += Idr[182];
+	RHS51 += Idr[183];
+	RHS51 += Idr[184];
+	RHS51 -= go[184] * *cnV[184];
+	m_A157 += gt[185];
+	m_A157 += gt[186];
+	m_A157 += gt[187];
+	m_A156 += go[185];
+	m_A155 += go[186];
+	m_A154 += go[187];
+	double RHS52 = Idr[185];
+	RHS52 += Idr[186];
+	RHS52 += Idr[187];
+	m_A160 += gt[188];
+	m_A160 += gt[189];
+	m_A160 += gt[190];
+	m_A160 += gt[191];
+	m_A161 += go[188];
+	m_A159 += go[189];
+	double RHS53 = Idr[188];
+	RHS53 += Idr[189];
+	RHS53 += Idr[190];
+	RHS53 += Idr[191];
+	RHS53 -= go[190] * *cnV[190];
+	RHS53 -= go[191] * *cnV[191];
+	m_A166 += gt[192];
+	m_A166 += gt[193];
+	m_A166 += gt[194];
+	m_A166 += gt[195];
+	m_A168 += go[192];
+	m_A163 += go[193];
+	m_A162 += go[194];
+	double RHS54 = Idr[192];
+	RHS54 += Idr[193];
+	RHS54 += Idr[194];
+	RHS54 += Idr[195];
+	RHS54 -= go[195] * *cnV[195];
+	m_A173 += gt[196];
+	m_A173 += gt[197];
+	m_A173 += gt[198];
+	m_A173 += gt[199];
+	m_A173 += gt[200];
+	m_A173 += gt[201];
+	m_A173 += gt[202];
+	m_A174 += go[196];
+	m_A171 += go[197];
+	double RHS55 = Idr[196];
+	RHS55 += Idr[197];
+	RHS55 += Idr[198];
+	RHS55 += Idr[199];
+	RHS55 += Idr[200];
+	RHS55 += Idr[201];
+	RHS55 += Idr[202];
+	RHS55 -= go[198] * *cnV[198];
+	RHS55 -= go[199] * *cnV[199];
+	RHS55 -= go[200] * *cnV[200];
+	RHS55 -= go[201] * *cnV[201];
+	RHS55 -= go[202] * *cnV[202];
+	m_A180 += gt[203];
+	m_A180 += gt[204];
+	m_A180 += gt[205];
+	m_A180 += gt[206];
+	m_A180 += gt[207];
+	m_A180 += gt[208];
+	m_A184 += go[203];
+	m_A177 += go[204];
+	m_A176 += go[205];
+	m_A175 += go[206];
+	m_A182 += go[207];
+	double RHS56 = Idr[203];
+	RHS56 += Idr[204];
+	RHS56 += Idr[205];
+	RHS56 += Idr[206];
+	RHS56 += Idr[207];
+	RHS56 += Idr[208];
+	RHS56 -= go[208] * *cnV[208];
+	m_A188 += gt[209];
+	m_A188 += gt[210];
+	m_A188 += gt[211];
+	m_A188 += gt[212];
+	m_A188 += gt[213];
+	m_A188 += gt[214];
+	m_A185 += go[209];
+	m_A187 += go[210];
+	m_A186 += go[211];
+	double RHS57 = Idr[209];
+	RHS57 += Idr[210];
+	RHS57 += Idr[211];
+	RHS57 += Idr[212];
+	RHS57 += Idr[213];
+	RHS57 += Idr[214];
+	RHS57 -= go[212] * *cnV[212];
+	RHS57 -= go[213] * *cnV[213];
+	RHS57 -= go[214] * *cnV[214];
+	m_A191 += gt[215];
+	m_A191 += gt[216];
+	m_A191 += gt[217];
+	m_A190 += go[215];
+	m_A192 += go[216];
+	double RHS58 = Idr[215];
+	RHS58 += Idr[216];
+	RHS58 += Idr[217];
+	RHS58 -= go[217] * *cnV[217];
+	m_A193 += gt[218];
+	m_A193 += gt[219];
+	m_A193 += gt[220];
+	m_A193 += gt[221];
+	m_A195 += go[218];
+	m_A193 += go[219];
+	m_A193 += go[220];
+	m_A194 += go[221];
+	double RHS59 = Idr[218];
+	RHS59 += Idr[219];
+	RHS59 += Idr[220];
+	RHS59 += Idr[221];
+	m_A197 += gt[222];
+	m_A197 += gt[223];
+	m_A197 += gt[224];
+	m_A197 += gt[225];
+	m_A197 += gt[226];
+	m_A197 += gt[227];
+	m_A197 += gt[228];
+	m_A201 += go[222];
+	m_A200 += go[223];
+	m_A199 += go[224];
+	m_A196 += go[225];
+	double RHS60 = Idr[222];
+	RHS60 += Idr[223];
+	RHS60 += Idr[224];
+	RHS60 += Idr[225];
+	RHS60 += Idr[226];
+	RHS60 += Idr[227];
+	RHS60 += Idr[228];
+	RHS60 -= go[226] * *cnV[226];
+	RHS60 -= go[227] * *cnV[227];
+	RHS60 -= go[228] * *cnV[228];
+	m_A203 += gt[229];
+	m_A203 += gt[230];
+	m_A203 += gt[231];
+	m_A202 += go[229];
+	m_A204 += go[230];
+	double RHS61 = Idr[229];
+	RHS61 += Idr[230];
+	RHS61 += Idr[231];
+	RHS61 -= go[231] * *cnV[231];
+	m_A207 += gt[232];
+	m_A207 += gt[233];
+	m_A207 += gt[234];
+	m_A207 += gt[235];
+	m_A207 += gt[236];
+	m_A208 += go[232];
+	m_A205 += go[233];
+	m_A209 += go[234];
+	double RHS62 = Idr[232];
+	RHS62 += Idr[233];
+	RHS62 += Idr[234];
+	RHS62 += Idr[235];
+	RHS62 += Idr[236];
+	RHS62 -= go[235] * *cnV[235];
+	RHS62 -= go[236] * *cnV[236];
+	m_A211 += gt[237];
+	m_A211 += gt[238];
+	m_A211 += gt[239];
+	m_A211 += gt[240];
+	m_A211 += gt[241];
+	m_A211 += gt[242];
+	m_A210 += go[237];
+	m_A213 += go[238];
+	m_A212 += go[239];
+	double RHS63 = Idr[237];
+	RHS63 += Idr[238];
+	RHS63 += Idr[239];
+	RHS63 += Idr[240];
+	RHS63 += Idr[241];
+	RHS63 += Idr[242];
+	RHS63 -= go[240] * *cnV[240];
+	RHS63 -= go[241] * *cnV[241];
+	RHS63 -= go[242] * *cnV[242];
+	m_A216 += gt[243];
+	m_A216 += gt[244];
+	m_A216 += gt[245];
+	m_A216 += gt[246];
+	m_A216 += gt[247];
+	m_A216 += gt[248];
+	m_A216 += gt[249];
+	m_A217 += go[243];
+	m_A217 += go[244];
+	m_A215 += go[245];
+	m_A215 += go[246];
+	m_A214 += go[247];
+	double RHS64 = Idr[243];
+	RHS64 += Idr[244];
+	RHS64 += Idr[245];
+	RHS64 += Idr[246];
+	RHS64 += Idr[247];
+	RHS64 += Idr[248];
+	RHS64 += Idr[249];
+	RHS64 -= go[248] * *cnV[248];
+	RHS64 -= go[249] * *cnV[249];
+	m_A220 += gt[250];
+	m_A220 += gt[251];
+	m_A220 += gt[252];
+	m_A220 += gt[253];
+	m_A218 += go[250];
+	m_A219 += go[251];
+	m_A221 += go[252];
+	double RHS65 = Idr[250];
+	RHS65 += Idr[251];
+	RHS65 += Idr[252];
+	RHS65 += Idr[253];
+	RHS65 -= go[253] * *cnV[253];
+	m_A223 += gt[254];
+	m_A223 += gt[255];
+	m_A223 += gt[256];
+	m_A225 += go[254];
+	m_A222 += go[255];
+	double RHS66 = Idr[254];
+	RHS66 += Idr[255];
+	RHS66 += Idr[256];
+	RHS66 -= go[256] * *cnV[256];
+	m_A228 += gt[257];
+	m_A228 += gt[258];
+	m_A228 += gt[259];
+	m_A229 += go[257];
+	m_A226 += go[258];
+	double RHS67 = Idr[257];
+	RHS67 += Idr[258];
+	RHS67 += Idr[259];
+	RHS67 -= go[259] * *cnV[259];
+	m_A232 += gt[260];
+	m_A232 += gt[261];
+	m_A231 += go[260];
+	m_A230 += go[261];
+	double RHS68 = Idr[260];
+	RHS68 += Idr[261];
+	m_A234 += gt[262];
+	m_A234 += gt[263];
+	m_A234 += gt[264];
+	m_A234 += gt[265];
+	m_A234 += gt[266];
+	m_A234 += gt[267];
+	m_A234 += gt[268];
+	m_A235 += go[262];
+	double RHS69 = Idr[262];
+	RHS69 += Idr[263];
+	RHS69 += Idr[264];
+	RHS69 += Idr[265];
+	RHS69 += Idr[266];
+	RHS69 += Idr[267];
+	RHS69 += Idr[268];
+	RHS69 -= go[263] * *cnV[263];
+	RHS69 -= go[264] * *cnV[264];
+	RHS69 -= go[265] * *cnV[265];
+	RHS69 -= go[266] * *cnV[266];
+	RHS69 -= go[267] * *cnV[267];
+	RHS69 -= go[268] * *cnV[268];
+	m_A238 += gt[269];
+	m_A238 += gt[270];
+	m_A238 += gt[271];
+	m_A240 += go[269];
+	m_A236 += go[270];
+	double RHS70 = Idr[269];
+	RHS70 += Idr[270];
+	RHS70 += Idr[271];
+	RHS70 -= go[271] * *cnV[271];
+	m_A244 += gt[272];
+	m_A244 += gt[273];
+	m_A244 += gt[274];
+	m_A245 += go[272];
+	m_A242 += go[273];
+	m_A246 += go[274];
+	double RHS71 = Idr[272];
+	RHS71 += Idr[273];
+	RHS71 += Idr[274];
+	m_A249 += gt[275];
+	m_A249 += gt[276];
+	m_A248 += go[275];
+	m_A247 += go[276];
+	double RHS72 = Idr[275];
+	RHS72 += Idr[276];
+	m_A254 += gt[277];
+	m_A254 += gt[278];
+	m_A254 += gt[279];
+	m_A254 += gt[280];
+	m_A255 += go[277];
+	m_A254 += go[278];
+	m_A254 += go[279];
+	m_A252 += go[280];
+	double RHS73 = Idr[277];
+	RHS73 += Idr[278];
+	RHS73 += Idr[279];
+	RHS73 += Idr[280];
+	m_A257 += gt[281];
+	m_A257 += gt[282];
+	m_A256 += go[281];
+	double RHS74 = Idr[281];
+	RHS74 += Idr[282];
+	RHS74 -= go[282] * *cnV[282];
+	m_A264 += gt[283];
+	m_A264 += gt[284];
+	m_A264 += gt[285];
+	m_A264 += gt[286];
+	m_A264 += gt[287];
+	m_A262 += go[283];
+	m_A259 += go[284];
+	m_A261 += go[285];
+	double RHS75 = Idr[283];
+	RHS75 += Idr[284];
+	RHS75 += Idr[285];
+	RHS75 += Idr[286];
+	RHS75 += Idr[287];
+	RHS75 -= go[286] * *cnV[286];
+	RHS75 -= go[287] * *cnV[287];
+	m_A271 += gt[288];
+	m_A271 += gt[289];
+	m_A271 += gt[290];
+	m_A271 += gt[291];
+	m_A273 += go[288];
+	m_A268 += go[289];
+	m_A269 += go[290];
+	double RHS76 = Idr[288];
+	RHS76 += Idr[289];
+	RHS76 += Idr[290];
+	RHS76 += Idr[291];
+	RHS76 -= go[291] * *cnV[291];
+	m_A281 += gt[292];
+	m_A281 += gt[293];
+	m_A281 += gt[294];
+	m_A281 += gt[295];
+	m_A277 += go[292];
+	m_A276 += go[293];
+	m_A279 += go[294];
+	m_A278 += go[295];
+	double RHS77 = Idr[292];
+	RHS77 += Idr[293];
+	RHS77 += Idr[294];
+	RHS77 += Idr[295];
+	m_A294 += gt[296];
+	m_A294 += gt[297];
+	m_A294 += gt[298];
+	m_A294 += gt[299];
+	m_A294 += gt[300];
+	m_A294 += gt[301];
+	m_A289 += go[296];
+	m_A296 += go[297];
+	m_A287 += go[298];
+	m_A285 += go[299];
+	m_A286 += go[300];
+	double RHS78 = Idr[296];
+	RHS78 += Idr[297];
+	RHS78 += Idr[298];
+	RHS78 += Idr[299];
+	RHS78 += Idr[300];
+	RHS78 += Idr[301];
+	RHS78 -= go[301] * *cnV[301];
+	m_A300 += gt[302];
+	m_A300 += gt[303];
+	m_A300 += gt[304];
+	m_A300 += gt[305];
+	m_A300 += gt[306];
+	m_A298 += go[302];
+	m_A297 += go[303];
+	m_A299 += go[304];
+	double RHS79 = Idr[302];
+	RHS79 += Idr[303];
+	RHS79 += Idr[304];
+	RHS79 += Idr[305];
+	RHS79 += Idr[306];
+	RHS79 -= go[305] * *cnV[305];
+	RHS79 -= go[306] * *cnV[306];
+	m_A304 += gt[307];
+	m_A304 += gt[308];
+	m_A303 += go[307];
+	m_A302 += go[308];
+	double RHS80 = Idr[307];
+	RHS80 += Idr[308];
+	m_A311 += gt[309];
+	m_A311 += gt[310];
+	m_A311 += gt[311];
+	m_A311 += gt[312];
+	m_A311 += gt[313];
+	m_A311 += gt[314];
+	m_A315 += go[309];
+	m_A308 += go[310];
+	m_A309 += go[311];
+	m_A307 += go[312];
+	m_A313 += go[313];
+	double RHS81 = Idr[309];
+	RHS81 += Idr[310];
+	RHS81 += Idr[311];
+	RHS81 += Idr[312];
+	RHS81 += Idr[313];
+	RHS81 += Idr[314];
+	RHS81 -= go[314] * *cnV[314];
+	m_A319 += gt[315];
+	m_A319 += gt[316];
+	m_A319 += gt[317];
+	m_A319 += gt[318];
+	m_A319 += gt[319];
+	m_A319 += gt[320];
+	m_A319 += gt[321];
+	m_A318 += go[315];
+	m_A316 += go[316];
+	double RHS82 = Idr[315];
+	RHS82 += Idr[316];
+	RHS82 += Idr[317];
+	RHS82 += Idr[318];
+	RHS82 += Idr[319];
+	RHS82 += Idr[320];
+	RHS82 += Idr[321];
+	RHS82 -= go[317] * *cnV[317];
+	RHS82 -= go[318] * *cnV[318];
+	RHS82 -= go[319] * *cnV[319];
+	RHS82 -= go[320] * *cnV[320];
+	RHS82 -= go[321] * *cnV[321];
+	m_A322 += gt[322];
+	m_A322 += gt[323];
+	m_A322 += gt[324];
+	m_A322 += gt[325];
+	m_A324 += go[322];
+	m_A322 += go[323];
+	m_A322 += go[324];
+	m_A321 += go[325];
+	double RHS83 = Idr[322];
+	RHS83 += Idr[323];
+	RHS83 += Idr[324];
+	RHS83 += Idr[325];
+	m_A329 += gt[326];
+	m_A329 += gt[327];
+	m_A329 += gt[328];
+	m_A329 += gt[329];
+	m_A329 += gt[330];
+	m_A329 += gt[331];
+	m_A326 += go[326];
+	m_A325 += go[327];
+	m_A328 += go[328];
+	m_A328 += go[329];
+	double RHS84 = Idr[326];
+	RHS84 += Idr[327];
+	RHS84 += Idr[328];
+	RHS84 += Idr[329];
+	RHS84 += Idr[330];
+	RHS84 += Idr[331];
+	RHS84 -= go[330] * *cnV[330];
+	RHS84 -= go[331] * *cnV[331];
+	m_A335 += gt[332];
+	m_A335 += gt[333];
+	m_A335 += gt[334];
+	m_A335 += gt[335];
+	m_A335 += gt[336];
+	m_A330 += go[332];
+	m_A331 += go[333];
+	m_A332 += go[334];
+	double RHS85 = Idr[332];
+	RHS85 += Idr[333];
+	RHS85 += Idr[334];
+	RHS85 += Idr[335];
+	RHS85 += Idr[336];
+	RHS85 -= go[335] * *cnV[335];
+	RHS85 -= go[336] * *cnV[336];
+	m_A347 += gt[337];
+	m_A347 += gt[338];
+	m_A347 += gt[339];
+	m_A347 += gt[340];
+	m_A347 += gt[341];
+	m_A347 += gt[342];
+	m_A347 += gt[343];
+	m_A338 += go[337];
+	m_A340 += go[338];
+	m_A341 += go[339];
+	m_A342 += go[340];
+	m_A343 += go[341];
+	double RHS86 = Idr[337];
+	RHS86 += Idr[338];
+	RHS86 += Idr[339];
+	RHS86 += Idr[340];
+	RHS86 += Idr[341];
+	RHS86 += Idr[342];
+	RHS86 += Idr[343];
+	RHS86 -= go[342] * *cnV[342];
+	RHS86 -= go[343] * *cnV[343];
+	m_A356 += gt[344];
+	m_A356 += gt[345];
+	m_A356 += gt[346];
+	m_A356 += gt[347];
+	m_A356 += gt[348];
+	m_A356 += gt[349];
+	m_A351 += go[344];
+	m_A352 += go[345];
+	m_A354 += go[346];
+	m_A353 += go[347];
+	double RHS87 = Idr[344];
+	RHS87 += Idr[345];
+	RHS87 += Idr[346];
+	RHS87 += Idr[347];
+	RHS87 += Idr[348];
+	RHS87 += Idr[349];
+	RHS87 -= go[348] * *cnV[348];
+	RHS87 -= go[349] * *cnV[349];
+	m_A364 += gt[350];
+	m_A364 += gt[351];
+	m_A364 += gt[352];
+	m_A364 += gt[353];
+	m_A360 += go[350];
+	m_A359 += go[351];
+	m_A361 += go[352];
+	double RHS88 = Idr[350];
+	RHS88 += Idr[351];
+	RHS88 += Idr[352];
+	RHS88 += Idr[353];
+	RHS88 -= go[353] * *cnV[353];
+	m_A380 += gt[354];
+	m_A380 += gt[355];
+	m_A380 += gt[356];
+	m_A380 += gt[357];
+	m_A380 += gt[358];
+	m_A380 += gt[359];
+	m_A380 += gt[360];
+	m_A380 += gt[361];
+	m_A370 += go[354];
+	m_A369 += go[355];
+	m_A377 += go[356];
+	m_A368 += go[357];
+	m_A373 += go[358];
+	double RHS89 = Idr[354];
+	RHS89 += Idr[355];
+	RHS89 += Idr[356];
+	RHS89 += Idr[357];
+	RHS89 += Idr[358];
+	RHS89 += Idr[359];
+	RHS89 += Idr[360];
+	RHS89 += Idr[361];
+	RHS89 -= go[359] * *cnV[359];
+	RHS89 -= go[360] * *cnV[360];
+	RHS89 -= go[361] * *cnV[361];
+	m_A387 += gt[362];
+	m_A387 += gt[363];
+	m_A387 += gt[364];
+	m_A387 += gt[365];
+	m_A383 += go[362];
+	m_A382 += go[363];
+	m_A384 += go[364];
+	m_A385 += go[365];
+	double RHS90 = Idr[362];
+	RHS90 += Idr[363];
+	RHS90 += Idr[364];
+	RHS90 += Idr[365];
+	m_A393 += gt[366];
+	m_A393 += gt[367];
+	m_A393 += gt[368];
+	m_A393 += gt[369];
+	m_A390 += go[366];
+	m_A388 += go[367];
+	m_A391 += go[368];
+	m_A389 += go[369];
+	double RHS91 = Idr[366];
+	RHS91 += Idr[367];
+	RHS91 += Idr[368];
+	RHS91 += Idr[369];
+	m_A404 += gt[370];
+	m_A404 += gt[371];
+	m_A404 += gt[372];
+	m_A404 += gt[373];
+	m_A404 += gt[374];
+	m_A404 += gt[375];
+	m_A399 += go[370];
+	m_A405 += go[371];
+	m_A397 += go[372];
+	m_A396 += go[373];
+	m_A398 += go[374];
+	double RHS92 = Idr[370];
+	RHS92 += Idr[371];
+	RHS92 += Idr[372];
+	RHS92 += Idr[373];
+	RHS92 += Idr[374];
+	RHS92 += Idr[375];
+	RHS92 -= go[375] * *cnV[375];
+	m_A409 += gt[376];
+	m_A409 += gt[377];
+	m_A409 += gt[378];
+	m_A409 += gt[379];
+	m_A409 += gt[380];
+	m_A407 += go[376];
+	m_A406 += go[377];
+	m_A410 += go[378];
+	double RHS93 = Idr[376];
+	RHS93 += Idr[377];
+	RHS93 += Idr[378];
+	RHS93 += Idr[379];
+	RHS93 += Idr[380];
+	RHS93 -= go[379] * *cnV[379];
+	RHS93 -= go[380] * *cnV[380];
+	m_A420 += gt[381];
+	m_A420 += gt[382];
+	m_A420 += gt[383];
+	m_A420 += gt[384];
+	m_A420 += gt[385];
+	m_A420 += gt[386];
+	m_A420 += gt[387];
+	m_A420 += gt[388];
+	m_A412 += go[381];
+	m_A411 += go[382];
+	m_A419 += go[383];
+	m_A413 += go[384];
+	m_A416 += go[385];
+	double RHS94 = Idr[381];
+	RHS94 += Idr[382];
+	RHS94 += Idr[383];
+	RHS94 += Idr[384];
+	RHS94 += Idr[385];
+	RHS94 += Idr[386];
+	RHS94 += Idr[387];
+	RHS94 += Idr[388];
+	RHS94 -= go[386] * *cnV[386];
+	RHS94 -= go[387] * *cnV[387];
+	RHS94 -= go[388] * *cnV[388];
+	m_A437 += gt[389];
+	m_A437 += gt[390];
+	m_A437 += gt[391];
+	m_A437 += gt[392];
+	m_A437 += gt[393];
+	m_A437 += gt[394];
+	m_A437 += gt[395];
+	m_A437 += gt[396];
+	m_A435 += go[389];
+	m_A425 += go[390];
+	m_A424 += go[391];
+	m_A429 += go[392];
+	m_A423 += go[393];
+	m_A422 += go[394];
+	m_A427 += go[395];
+	double RHS95 = Idr[389];
+	RHS95 += Idr[390];
+	RHS95 += Idr[391];
+	RHS95 += Idr[392];
+	RHS95 += Idr[393];
+	RHS95 += Idr[394];
+	RHS95 += Idr[395];
+	RHS95 += Idr[396];
+	RHS95 -= go[396] * *cnV[396];
 	const double f0 = 1.0 / m_A0;
-	const double f0_16 = -f0 * m_A34;
-	m_A35 += m_A1 * f0_16;
-	RHS16 += f0_16 * RHS0;
-	const double f0_29 = -f0 * m_A99;
-	m_A101 += m_A1 * f0_29;
-	RHS29 += f0_29 * RHS0;
+	const double f0_46 = -f0 * m_A126;
+	m_A128 += m_A1 * f0_46;
+	RHS46 += f0_46 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_19 = -f1 * m_A41;
-	m_A43 += m_A3 * f1_19;
-	RHS19 += f1_19 * RHS1;
-	const double f1_29 = -f1 * m_A100;
-	m_A106 += m_A3 * f1_29;
-	RHS29 += f1_29 * RHS1;
+	const double f1_50 = -f1 * m_A147;
+	m_A148 += m_A3 * f1_50;
+	RHS50 += f1_50 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_20 = -f2 * m_A44;
-	m_A45 += m_A5 * f2_20;
-	RHS20 += f2_20 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_30 = -f3 * m_A108;
-	m_A115 += m_A7 * f3_30;
-	RHS30 += f3_30 * RHS3;
-	const double f4 = 1.0 / m_A8;
-	const double f4_17 = -f4 * m_A36;
-	m_A37 += m_A9 * f4_17;
-	RHS17 += f4_17 * RHS4;
-	const double f4_24 = -f4 * m_A63;
-	m_A65 += m_A9 * f4_24;
-	RHS24 += f4_24 * RHS4;
-	const double f5 = 1.0 / m_A10;
-	const double f5_22 = -f5 * m_A53;
-	m_A55 += m_A11 * f5_22;
-	RHS22 += f5_22 * RHS5;
-	const double f6 = 1.0 / m_A12;
-	const double f6_21 = -f6 * m_A50;
-	m_A52 += m_A13 * f6_21;
-	RHS21 += f6_21 * RHS6;
-	const double f6_24 = -f6 * m_A64;
-	m_A68 += m_A13 * f6_24;
-	RHS24 += f6_24 * RHS6;
-	const double f7 = 1.0 / m_A14;
-	const double f7_22 = -f7 * m_A54;
-	m_A56 += m_A15 * f7_22;
-	m_A58 += m_A16 * f7_22;
-	RHS22 += f7_22 * RHS7;
-	const double f7_25 = -f7 * m_A72;
-	m_A75 += m_A15 * f7_25;
-	m_A77 += m_A16 * f7_25;
-	RHS25 += f7_25 * RHS7;
-	const double f8 = 1.0 / m_A17;
-	const double f8_25 = -f8 * m_A73;
-	m_A77 += m_A18 * f8_25;
-	RHS25 += f8_25 * RHS8;
-	const double f9 = 1.0 / m_A19;
-	const double f9_23 = -f9 * m_A60;
-	m_A61 += m_A20 * f9_23;
-	RHS23 += f9_23 * RHS9;
-	const double f10 = 1.0 / m_A21;
-	const double f10_25 = -f10 * m_A74;
-	m_A77 += m_A22 * f10_25;
-	RHS25 += f10_25 * RHS10;
-	const double f11 = 1.0 / m_A23;
-	const double f11_27 = -f11 * m_A84;
-	m_A86 += m_A24 * f11_27;
-	RHS27 += f11_27 * RHS11;
-	const double f12 = 1.0 / m_A25;
-	const double f12_18 = -f12 * m_A38;
-	m_A40 += m_A26 * f12_18;
-	RHS18 += f12_18 * RHS12;
-	const double f12_28 = -f12 * m_A89;
-	m_A92 += m_A26 * f12_28;
-	RHS28 += f12_28 * RHS12;
-	const double f13 = 1.0 / m_A27;
-	const double f13_18 = -f13 * m_A39;
-	m_A40 += m_A28 * f13_18;
-	RHS18 += f13_18 * RHS13;
-	const double f14 = 1.0 / m_A29;
-	const double f14_26 = -f14 * m_A81;
-	m_A83 += m_A30 * f14_26;
-	RHS26 += f14_26 * RHS14;
-	const double f14_28 = -f14 * m_A90;
-	m_A96 += m_A30 * f14_28;
-	RHS28 += f14_28 * RHS14;
-	const double f15 = 1.0 / m_A31;
-	const double f15_27 = -f15 * m_A85;
-	m_A87 += m_A32 * f15_27;
-	m_A88 += m_A33 * f15_27;
-	RHS27 += f15_27 * RHS15;
-	const double f15_28 = -f15 * m_A91;
-	m_A95 += m_A32 * f15_28;
-	m_A96 += m_A33 * f15_28;
-	RHS28 += f15_28 * RHS15;
-	const double f16 = 1.0 / m_A35;
-	const double f16_29 = -f16 * m_A101;
-	RHS29 += f16_29 * RHS16;
-	const double f17 = 1.0 / m_A37;
-	const double f17_24 = -f17 * m_A65;
-	RHS24 += f17_24 * RHS17;
-	const double f18 = 1.0 / m_A40;
-	const double f18_28 = -f18 * m_A92;
-	RHS28 += f18_28 * RHS18;
-	const double f19 = 1.0 / m_A42;
-	const double f19_20 = -f19 * m_A45;
-	m_A48 += m_A43 * f19_20;
-	RHS20 += f19_20 * RHS19;
-	const double f20 = 1.0 / m_A46;
-	const double f20_24 = -f20 * m_A66;
-	m_A68 += m_A47 * f20_24;
-	m_A70 += m_A48 * f20_24;
-	m_A71 += m_A49 * f20_24;
-	RHS24 += f20_24 * RHS20;
-	const double f20_29 = -f20 * m_A102;
-	m_A103 += m_A47 * f20_29;
-	m_A106 += m_A48 * f20_29;
-	m_A107 += m_A49 * f20_29;
-	RHS29 += f20_29 * RHS20;
-	const double f20_30 = -f20 * m_A109;
-	m_A111 += m_A47 * f20_30;
-	m_A114 += m_A48 * f20_30;
-	m_A115 += m_A49 * f20_30;
-	RHS30 += f20_30 * RHS20;
-	const double f21 = 1.0 / m_A51;
-	const double f21_22 = -f21 * m_A55;
-	m_A57 += m_A52 * f21_22;
-	RHS22 += f21_22 * RHS21;
-	const double f22 = 1.0 / m_A56;
-	const double f22_24 = -f22 * m_A67;
-	m_A68 += m_A57 * f22_24;
-	m_A69 += m_A58 * f22_24;
-	m_A71 += m_A59 * f22_24;
-	RHS24 += f22_24 * RHS22;
-	const double f22_25 = -f22 * m_A75;
-	m_A76 += m_A57 * f22_25;
-	m_A77 += m_A58 * f22_25;
-	m_A80 += m_A59 * f22_25;
-	RHS25 += f22_25 * RHS22;
-	const double f22_30 = -f22 * m_A110;
-	m_A111 += m_A57 * f22_30;
-	m_A112 += m_A58 * f22_30;
-	m_A115 += m_A59 * f22_30;
-	RHS30 += f22_30 * RHS22;
-	const double f23 = 1.0 / m_A61;
-	const double f23_28 = -f23 * m_A93;
-	m_A96 += m_A62 * f23_28;
-	RHS28 += f23_28 * RHS23;
-	const double f24 = 1.0 / m_A68;
-	const double f24_25 = -f24 * m_A76;
-	m_A77 += m_A69 * f24_25;
-	m_A79 += m_A70 * f24_25;
-	m_A80 += m_A71 * f24_25;
-	RHS25 += f24_25 * RHS24;
-	const double f24_29 = -f24 * m_A103;
-	m_A104 += m_A69 * f24_29;
-	m_A106 += m_A70 * f24_29;
-	m_A107 += m_A71 * f24_29;
-	RHS29 += f24_29 * RHS24;
-	const double f24_30 = -f24 * m_A111;
-	m_A112 += m_A69 * f24_30;
-	m_A114 += m_A70 * f24_30;
-	m_A115 += m_A71 * f24_30;
-	RHS30 += f24_30 * RHS24;
-	const double f25 = 1.0 / m_A77;
-	const double f25_28 = -f25 * m_A94;
-	m_A96 += m_A78 * f25_28;
-	m_A97 += m_A79 * f25_28;
-	m_A98 += m_A80 * f25_28;
-	RHS28 += f25_28 * RHS25;
-	const double f25_29 = -f25 * m_A104;
-	m_A105 += m_A78 * f25_29;
-	m_A106 += m_A79 * f25_29;
-	m_A107 += m_A80 * f25_29;
-	RHS29 += f25_29 * RHS25;
-	const double f25_30 = -f25 * m_A112;
-	m_A113 += m_A78 * f25_30;
-	m_A114 += m_A79 * f25_30;
-	m_A115 += m_A80 * f25_30;
-	RHS30 += f25_30 * RHS25;
-	const double f26 = 1.0 / m_A82;
-	const double f26_27 = -f26 * m_A86;
-	m_A88 += m_A83 * f26_27;
-	RHS27 += f26_27 * RHS26;
-	const double f27 = 1.0 / m_A87;
-	const double f27_28 = -f27 * m_A95;
-	m_A96 += m_A88 * f27_28;
-	RHS28 += f27_28 * RHS27;
-	const double f28 = 1.0 / m_A96;
-	const double f28_29 = -f28 * m_A105;
-	m_A106 += m_A97 * f28_29;
-	m_A107 += m_A98 * f28_29;
-	RHS29 += f28_29 * RHS28;
-	const double f28_30 = -f28 * m_A113;
-	m_A114 += m_A97 * f28_30;
-	m_A115 += m_A98 * f28_30;
-	RHS30 += f28_30 * RHS28;
-	const double f29 = 1.0 / m_A106;
-	const double f29_30 = -f29 * m_A114;
-	m_A115 += m_A107 * f29_30;
-	RHS30 += f29_30 * RHS29;
-	V[30] = RHS30 / m_A115;
+	const double f2_46 = -f2 * m_A127;
+	m_A128 += m_A5 * f2_46;
+	m_A129 += m_A6 * f2_46;
+	m_A130 += m_A7 * f2_46;
+	RHS46 += f2_46 * RHS2;
+	const double f2_47 = -f2 * m_A131;
+	m_A133 += m_A5 * f2_47;
+	m_A134 += m_A6 * f2_47;
+	m_A135 += m_A7 * f2_47;
+	RHS47 += f2_47 * RHS2;
+	const double f2_54 = -f2 * m_A162;
+	m_A164 += m_A5 * f2_54;
+	m_A165 += m_A6 * f2_54;
+	m_A166 += m_A7 * f2_54;
+	RHS54 += f2_54 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_51 = -f3 * m_A150;
+	m_A152 += m_A9 * f3_51;
+	RHS51 += f3_51 * RHS3;
+	const double f4 = 1.0 / m_A10;
+	const double f4_56 = -f4 * m_A175;
+	m_A180 += m_A11 * f4_56;
+	m_A182 += m_A12 * f4_56;
+	RHS56 += f4_56 * RHS4;
+	const double f4_77 = -f4 * m_A276;
+	m_A279 += m_A11 * f4_77;
+	m_A281 += m_A12 * f4_77;
+	RHS77 += f4_77 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_51 = -f5 * m_A151;
+	m_A152 += m_A14 * f5_51;
+	m_A153 += m_A15 * f5_51;
+	RHS51 += f5_51 * RHS5;
+	const double f5_78 = -f5 * m_A285;
+	m_A289 += m_A14 * f5_78;
+	m_A294 += m_A15 * f5_78;
+	RHS78 += f5_78 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_53 = -f6 * m_A159;
+	m_A160 += m_A17 * f6_53;
+	RHS53 += f6_53 * RHS6;
+	const double f7 = 1.0 / m_A18;
+	const double f7_47 = -f7 * m_A132;
+	m_A134 += m_A19 * f7_47;
+	m_A136 += m_A20 * f7_47;
+	m_A137 += m_A21 * f7_47;
+	m_A138 += m_A22 * f7_47;
+	RHS47 += f7_47 * RHS7;
+	const double f7_56 = -f7 * m_A176;
+	m_A178 += m_A19 * f7_56;
+	m_A180 += m_A20 * f7_56;
+	m_A183 += m_A21 * f7_56;
+	m_A184 += m_A22 * f7_56;
+	RHS56 += f7_56 * RHS7;
+	const double f7_78 = -f7 * m_A286;
+	m_A288 += m_A19 * f7_78;
+	m_A291 += m_A20 * f7_78;
+	m_A294 += m_A21 * f7_78;
+	m_A296 += m_A22 * f7_78;
+	RHS78 += f7_78 * RHS7;
+	const double f7_89 = -f7 * m_A368;
+	m_A371 += m_A19 * f7_89;
+	m_A373 += m_A20 * f7_89;
+	m_A377 += m_A21 * f7_89;
+	m_A380 += m_A22 * f7_89;
+	RHS89 += f7_89 * RHS7;
+	const double f8 = 1.0 / m_A23;
+	const double f8_54 = -f8 * m_A163;
+	m_A166 += m_A24 * f8_54;
+	m_A167 += m_A25 * f8_54;
+	m_A169 += m_A26 * f8_54;
+	m_A170 += m_A27 * f8_54;
+	RHS54 += f8_54 * RHS8;
+	const double f8_56 = -f8 * m_A177;
+	m_A179 += m_A24 * f8_56;
+	m_A180 += m_A25 * f8_56;
+	m_A183 += m_A26 * f8_56;
+	m_A184 += m_A27 * f8_56;
+	RHS56 += f8_56 * RHS8;
+	const double f8_78 = -f8 * m_A287;
+	m_A290 += m_A24 * f8_78;
+	m_A291 += m_A25 * f8_78;
+	m_A294 += m_A26 * f8_78;
+	m_A296 += m_A27 * f8_78;
+	RHS78 += f8_78 * RHS8;
+	const double f8_89 = -f8 * m_A369;
+	m_A372 += m_A24 * f8_89;
+	m_A373 += m_A25 * f8_89;
+	m_A377 += m_A26 * f8_89;
+	m_A380 += m_A27 * f8_89;
+	RHS89 += f8_89 * RHS8;
+	const double f9 = 1.0 / m_A28;
+	const double f9_58 = -f9 * m_A190;
+	m_A191 += m_A29 * f9_58;
+	RHS58 += f9_58 * RHS9;
+	const double f10 = 1.0 / m_A30;
+	const double f10_65 = -f10 * m_A218;
+	m_A220 += m_A31 * f10_65;
+	RHS65 += f10_65 * RHS10;
+	const double f11 = 1.0 / m_A32;
+	const double f11_60 = -f11 * m_A196;
+	m_A197 += m_A33 * f11_60;
+	m_A198 += m_A34 * f11_60;
+	RHS60 += f11_60 * RHS11;
+	const double f11_76 = -f11 * m_A268;
+	m_A270 += m_A33 * f11_76;
+	m_A271 += m_A34 * f11_76;
+	RHS76 += f11_76 * RHS11;
+	const double f12 = 1.0 / m_A35;
+	const double f12_65 = -f12 * m_A219;
+	m_A220 += m_A36 * f12_65;
+	m_A221 += m_A37 * f12_65;
+	RHS65 += f12_65 * RHS12;
+	const double f12_92 = -f12 * m_A396;
+	m_A399 += m_A36 * f12_92;
+	m_A404 += m_A37 * f12_92;
+	RHS92 += f12_92 * RHS12;
+	const double f13 = 1.0 / m_A38;
+	const double f13_48 = -f13 * m_A139;
+	m_A141 += m_A39 * f13_48;
+	RHS48 += f13_48 * RHS13;
+	const double f14 = 1.0 / m_A40;
+	const double f14_48 = -f14 * m_A140;
+	m_A141 += m_A41 * f14_48;
+	m_A142 += m_A42 * f14_48;
+	RHS48 += f14_48 * RHS14;
+	const double f14_55 = -f14 * m_A171;
+	m_A172 += m_A41 * f14_55;
+	m_A174 += m_A42 * f14_55;
+	RHS55 += f14_55 * RHS14;
+	const double f14_75 = -f14 * m_A259;
+	m_A260 += m_A41 * f14_75;
+	m_A264 += m_A42 * f14_75;
+	RHS75 += f14_75 * RHS14;
+	const double f15 = 1.0 / m_A43;
+	const double f15_81 = -f15 * m_A307;
+	m_A311 += m_A44 * f15_81;
+	m_A313 += m_A45 * f15_81;
+	RHS81 += f15_81 * RHS15;
+	const double f15_91 = -f15 * m_A388;
+	m_A391 += m_A44 * f15_91;
+	m_A393 += m_A45 * f15_91;
+	RHS91 += f15_91 * RHS15;
+	const double f16 = 1.0 / m_A46;
+	const double f16_81 = -f16 * m_A308;
+	m_A311 += m_A47 * f16_81;
+	m_A312 += m_A48 * f16_81;
+	m_A314 += m_A49 * f16_81;
+	m_A315 += m_A50 * f16_81;
+	RHS81 += f16_81 * RHS16;
+	const double f16_88 = -f16 * m_A359;
+	m_A362 += m_A47 * f16_88;
+	m_A364 += m_A48 * f16_88;
+	m_A366 += m_A49 * f16_88;
+	m_A367 += m_A50 * f16_88;
+	RHS88 += f16_88 * RHS16;
+	const double f16_92 = -f16 * m_A397;
+	m_A401 += m_A47 * f16_92;
+	m_A402 += m_A48 * f16_92;
+	m_A404 += m_A49 * f16_92;
+	m_A405 += m_A50 * f16_92;
+	RHS92 += f16_92 * RHS16;
+	const double f16_94 = -f16 * m_A411;
+	m_A416 += m_A47 * f16_94;
+	m_A417 += m_A48 * f16_94;
+	m_A419 += m_A49 * f16_94;
+	m_A420 += m_A50 * f16_94;
+	RHS94 += f16_94 * RHS16;
+	const double f17 = 1.0 / m_A51;
+	const double f17_49 = -f17 * m_A143;
+	m_A145 += m_A52 * f17_49;
+	RHS49 += f17_49 * RHS17;
+	const double f18 = 1.0 / m_A53;
+	const double f18_49 = -f18 * m_A144;
+	m_A145 += m_A54 * f18_49;
+	m_A146 += m_A55 * f18_49;
+	RHS49 += f18_49 * RHS18;
+	const double f18_62 = -f18 * m_A205;
+	m_A206 += m_A54 * f18_62;
+	m_A207 += m_A55 * f18_62;
+	RHS62 += f18_62 * RHS18;
+	const double f18_82 = -f18 * m_A316;
+	m_A317 += m_A54 * f18_82;
+	m_A318 += m_A55 * f18_82;
+	RHS82 += f18_82 * RHS18;
+	const double f19 = 1.0 / m_A56;
+	const double f19_52 = -f19 * m_A154;
+	m_A157 += m_A57 * f19_52;
+	RHS52 += f19_52 * RHS19;
+	const double f20 = 1.0 / m_A58;
+	const double f20_52 = -f20 * m_A155;
+	m_A157 += m_A59 * f20_52;
+	RHS52 += f20_52 * RHS20;
+	const double f21 = 1.0 / m_A60;
+	const double f21_61 = -f21 * m_A202;
+	m_A203 += m_A61 * f21_61;
+	RHS61 += f21_61 * RHS21;
+	const double f22 = 1.0 / m_A62;
+	const double f22_90 = -f22 * m_A382;
+	m_A387 += m_A63 * f22_90;
+	RHS90 += f22_90 * RHS22;
+	const double f23 = 1.0 / m_A64;
+	const double f23_63 = -f23 * m_A210;
+	m_A212 += m_A65 * f23_63;
+	RHS63 += f23_63 * RHS23;
+	const double f23_79 = -f23 * m_A297;
+	m_A300 += m_A65 * f23_79;
+	RHS79 += f23_79 * RHS23;
+	const double f24 = 1.0 / m_A66;
+	const double f24_64 = -f24 * m_A214;
+	m_A216 += m_A67 * f24_64;
+	RHS64 += f24_64 * RHS24;
+	const double f25 = 1.0 / m_A68;
+	const double f25_79 = -f25 * m_A298;
+	m_A300 += m_A69 * f25_79;
+	RHS79 += f25_79 * RHS25;
+	const double f25_90 = -f25 * m_A383;
+	m_A385 += m_A69 * f25_90;
+	RHS90 += f25_90 * RHS25;
+	const double f26 = 1.0 / m_A70;
+	const double f26_64 = -f26 * m_A215;
+	m_A216 += m_A71 * f26_64;
+	m_A217 += m_A72 * f26_64;
+	RHS64 += f26_64 * RHS26;
+	const double f26_84 = -f26 * m_A325;
+	m_A328 += m_A71 * f26_84;
+	m_A329 += m_A72 * f26_84;
+	RHS84 += f26_84 * RHS26;
+	const double f27 = 1.0 / m_A73;
+	const double f27_57 = -f27 * m_A185;
+	m_A186 += m_A74 * f27_57;
+	m_A189 += m_A75 * f27_57;
+	RHS57 += f27_57 * RHS27;
+	const double f28 = 1.0 / m_A76;
+	const double f28_52 = -f28 * m_A156;
+	m_A157 += m_A77 * f28_52;
+	m_A158 += m_A78 * f28_52;
+	RHS52 += f28_52 * RHS28;
+	const double f28_67 = -f28 * m_A226;
+	m_A227 += m_A77 * f28_67;
+	m_A228 += m_A78 * f28_67;
+	RHS67 += f28_67 * RHS28;
+	const double f29 = 1.0 / m_A79;
+	const double f29_87 = -f29 * m_A351;
+	m_A353 += m_A80 * f29_87;
+	RHS87 += f29_87 * RHS29;
+	const double f30 = 1.0 / m_A81;
+	const double f30_57 = -f30 * m_A186;
+	m_A188 += m_A82 * f30_57;
+	m_A189 += m_A83 * f30_57;
+	RHS57 += f30_57 * RHS30;
+	const double f30_84 = -f30 * m_A326;
+	m_A327 += m_A82 * f30_84;
+	m_A329 += m_A83 * f30_84;
+	RHS84 += f30_84 * RHS30;
+	const double f31 = 1.0 / m_A84;
+	const double f31_57 = -f31 * m_A187;
+	m_A188 += m_A85 * f31_57;
+	RHS57 += f31_57 * RHS31;
+	const double f32 = 1.0 / m_A86;
+	const double f32_86 = -f32 * m_A338;
+	m_A339 += m_A87 * f32_86;
+	m_A342 += m_A88 * f32_86;
+	RHS86 += f32_86 * RHS32;
+	const double f33 = 1.0 / m_A89;
+	const double f33_68 = -f33 * m_A230;
+	m_A232 += m_A90 * f33_68;
+	RHS68 += f33_68 * RHS33;
+	const double f34 = 1.0 / m_A91;
+	const double f34_70 = -f34 * m_A236;
+	m_A237 += m_A92 * f34_70;
+	m_A238 += m_A93 * f34_70;
+	RHS70 += f34_70 * RHS34;
+	const double f35 = 1.0 / m_A94;
+	const double f35_85 = -f35 * m_A330;
+	m_A332 += m_A95 * f35_85;
+	RHS85 += f35_85 * RHS35;
+	const double f36 = 1.0 / m_A96;
+	const double f36_66 = -f36 * m_A222;
+	m_A223 += m_A97 * f36_66;
+	m_A224 += m_A98 * f36_66;
+	RHS66 += f36_66 * RHS36;
+	const double f36_71 = -f36 * m_A242;
+	m_A243 += m_A97 * f36_71;
+	m_A244 += m_A98 * f36_71;
+	RHS71 += f36_71 * RHS36;
+	const double f36_86 = -f36 * m_A339;
+	m_A342 += m_A97 * f36_86;
+	m_A343 += m_A98 * f36_86;
+	RHS86 += f36_86 * RHS36;
+	const double f37 = 1.0 / m_A99;
+	const double f37_72 = -f37 * m_A247;
+	m_A249 += m_A100 * f37_72;
+	m_A250 += m_A101 * f37_72;
+	RHS72 += f37_72 * RHS37;
+	const double f37_89 = -f37 * m_A370;
+	m_A374 += m_A100 * f37_89;
+	m_A380 += m_A101 * f37_89;
+	RHS89 += f37_89 * RHS37;
+	const double f38 = 1.0 / m_A102;
+	const double f38_80 = -f38 * m_A302;
+	m_A304 += m_A103 * f38_80;
+	m_A305 += m_A104 * f38_80;
+	RHS80 += f38_80 * RHS38;
+	const double f38_94 = -f38 * m_A412;
+	m_A415 += m_A103 * f38_94;
+	m_A420 += m_A104 * f38_94;
+	RHS94 += f38_94 * RHS38;
+	const double f39 = 1.0 / m_A105;
+	const double f39_68 = -f39 * m_A231;
+	m_A232 += m_A106 * f39_68;
+	m_A233 += m_A107 * f39_68;
+	RHS68 += f39_68 * RHS39;
+	const double f39_73 = -f39 * m_A252;
+	m_A253 += m_A106 * f39_73;
+	m_A254 += m_A107 * f39_73;
+	RHS73 += f39_73 * RHS39;
+	const double f40 = 1.0 / m_A108;
+	const double f40_77 = -f40 * m_A277;
+	m_A281 += m_A109 * f40_77;
+	m_A283 += m_A110 * f40_77;
+	RHS77 += f40_77 * RHS40;
+	const double f40_86 = -f40 * m_A340;
+	m_A344 += m_A109 * f40_86;
+	m_A347 += m_A110 * f40_86;
+	RHS86 += f40_86 * RHS40;
+	const double f41 = 1.0 / m_A111;
+	const double f41_83 = -f41 * m_A321;
+	m_A322 += m_A112 * f41_83;
+	m_A323 += m_A113 * f41_83;
+	RHS83 += f41_83 * RHS41;
+	const double f41_86 = -f41 * m_A341;
+	m_A346 += m_A112 * f41_86;
+	m_A347 += m_A113 * f41_86;
+	RHS86 += f41_86 * RHS41;
+	const double f42 = 1.0 / m_A114;
+	const double f42_85 = -f42 * m_A331;
+	m_A335 += m_A115 * f42_85;
+	m_A337 += m_A116 * f42_85;
+	RHS85 += f42_85 * RHS42;
+	const double f42_95 = -f42 * m_A422;
+	m_A430 += m_A115 * f42_95;
+	m_A437 += m_A116 * f42_95;
+	RHS95 += f42_95 * RHS42;
+	const double f43 = 1.0 / m_A117;
+	const double f43_87 = -f43 * m_A352;
+	m_A356 += m_A118 * f43_87;
+	m_A358 += m_A119 * f43_87;
+	RHS87 += f43_87 * RHS43;
+	const double f43_95 = -f43 * m_A423;
+	m_A432 += m_A118 * f43_95;
+	m_A437 += m_A119 * f43_95;
+	RHS95 += f43_95 * RHS43;
+	const double f44 = 1.0 / m_A120;
+	const double f44_72 = -f44 * m_A248;
+	m_A249 += m_A121 * f44_72;
+	m_A251 += m_A122 * f44_72;
+	RHS72 += f44_72 * RHS44;
+	const double f44_95 = -f44 * m_A424;
+	m_A426 += m_A121 * f44_95;
+	m_A437 += m_A122 * f44_95;
+	RHS95 += f44_95 * RHS44;
+	const double f45 = 1.0 / m_A123;
+	const double f45_74 = -f45 * m_A256;
+	m_A257 += m_A124 * f45_74;
+	m_A258 += m_A125 * f45_74;
+	RHS74 += f45_74 * RHS45;
+	const double f45_93 = -f45 * m_A406;
+	m_A408 += m_A124 * f45_93;
+	m_A409 += m_A125 * f45_93;
+	RHS93 += f45_93 * RHS45;
+	const double f46 = 1.0 / m_A128;
+	const double f46_47 = -f46 * m_A133;
+	m_A134 += m_A129 * f46_47;
+	m_A135 += m_A130 * f46_47;
+	RHS47 += f46_47 * RHS46;
+	const double f46_54 = -f46 * m_A164;
+	m_A165 += m_A129 * f46_54;
+	m_A166 += m_A130 * f46_54;
+	RHS54 += f46_54 * RHS46;
+	const double f47 = 1.0 / m_A134;
+	const double f47_54 = -f47 * m_A165;
+	m_A166 += m_A135 * f47_54;
+	m_A167 += m_A136 * f47_54;
+	m_A169 += m_A137 * f47_54;
+	m_A170 += m_A138 * f47_54;
+	RHS54 += f47_54 * RHS47;
+	const double f47_56 = -f47 * m_A178;
+	m_A179 += m_A135 * f47_56;
+	m_A180 += m_A136 * f47_56;
+	m_A183 += m_A137 * f47_56;
+	m_A184 += m_A138 * f47_56;
+	RHS56 += f47_56 * RHS47;
+	const double f47_78 = -f47 * m_A288;
+	m_A290 += m_A135 * f47_78;
+	m_A291 += m_A136 * f47_78;
+	m_A294 += m_A137 * f47_78;
+	m_A296 += m_A138 * f47_78;
+	RHS78 += f47_78 * RHS47;
+	const double f47_89 = -f47 * m_A371;
+	m_A372 += m_A135 * f47_89;
+	m_A373 += m_A136 * f47_89;
+	m_A377 += m_A137 * f47_89;
+	m_A380 += m_A138 * f47_89;
+	RHS89 += f47_89 * RHS47;
+	const double f48 = 1.0 / m_A141;
+	const double f48_55 = -f48 * m_A172;
+	m_A174 += m_A142 * f48_55;
+	RHS55 += f48_55 * RHS48;
+	const double f48_75 = -f48 * m_A260;
+	m_A264 += m_A142 * f48_75;
+	RHS75 += f48_75 * RHS48;
+	const double f49 = 1.0 / m_A145;
+	const double f49_62 = -f49 * m_A206;
+	m_A207 += m_A146 * f49_62;
+	RHS62 += f49_62 * RHS49;
+	const double f49_82 = -f49 * m_A317;
+	m_A318 += m_A146 * f49_82;
+	RHS82 += f49_82 * RHS49;
+	const double f50 = 1.0 / m_A148;
+	const double f50_77 = -f50 * m_A278;
+	m_A281 += m_A149 * f50_77;
+	RHS77 += f50_77 * RHS50;
+	const double f51 = 1.0 / m_A152;
+	const double f51_78 = -f51 * m_A289;
+	m_A294 += m_A153 * f51_78;
+	RHS78 += f51_78 * RHS51;
+	const double f52 = 1.0 / m_A157;
+	const double f52_67 = -f52 * m_A227;
+	m_A228 += m_A158 * f52_67;
+	RHS67 += f52_67 * RHS52;
+	const double f53 = 1.0 / m_A160;
+	const double f53_76 = -f53 * m_A269;
+	m_A271 += m_A161 * f53_76;
+	RHS76 += f53_76 * RHS53;
+	const double f54 = 1.0 / m_A166;
+	const double f54_56 = -f54 * m_A179;
+	m_A180 += m_A167 * f54_56;
+	m_A181 += m_A168 * f54_56;
+	m_A183 += m_A169 * f54_56;
+	m_A184 += m_A170 * f54_56;
+	RHS56 += f54_56 * RHS54;
+	const double f54_75 = -f54 * m_A261;
+	m_A263 += m_A167 * f54_75;
+	m_A264 += m_A168 * f54_75;
+	m_A266 += m_A169 * f54_75;
+	m_A267 += m_A170 * f54_75;
+	RHS75 += f54_75 * RHS54;
+	const double f54_78 = -f54 * m_A290;
+	m_A291 += m_A167 * f54_78;
+	m_A292 += m_A168 * f54_78;
+	m_A294 += m_A169 * f54_78;
+	m_A296 += m_A170 * f54_78;
+	RHS78 += f54_78 * RHS54;
+	const double f54_89 = -f54 * m_A372;
+	m_A373 += m_A167 * f54_89;
+	m_A375 += m_A168 * f54_89;
+	m_A377 += m_A169 * f54_89;
+	m_A380 += m_A170 * f54_89;
+	RHS89 += f54_89 * RHS54;
+	const double f55 = 1.0 / m_A173;
+	const double f55_75 = -f55 * m_A262;
+	m_A264 += m_A174 * f55_75;
+	RHS75 += f55_75 * RHS55;
+	const double f56 = 1.0 / m_A180;
+	const double f56_75 = -f56 * m_A263;
+	m_A264 += m_A181 * f56_75;
+	m_A265 += m_A182 * f56_75;
+	m_A266 += m_A183 * f56_75;
+	m_A267 += m_A184 * f56_75;
+	RHS75 += f56_75 * RHS56;
+	const double f56_77 = -f56 * m_A279;
+	m_A280 += m_A181 * f56_77;
+	m_A281 += m_A182 * f56_77;
+	m_A282 += m_A183 * f56_77;
+	m_A284 += m_A184 * f56_77;
+	RHS77 += f56_77 * RHS56;
+	const double f56_78 = -f56 * m_A291;
+	m_A292 += m_A181 * f56_78;
+	m_A293 += m_A182 * f56_78;
+	m_A294 += m_A183 * f56_78;
+	m_A296 += m_A184 * f56_78;
+	RHS78 += f56_78 * RHS56;
+	const double f56_89 = -f56 * m_A373;
+	m_A375 += m_A181 * f56_89;
+	m_A376 += m_A182 * f56_89;
+	m_A377 += m_A183 * f56_89;
+	m_A380 += m_A184 * f56_89;
+	RHS89 += f56_89 * RHS56;
+	const double f57 = 1.0 / m_A188;
+	const double f57_79 = -f57 * m_A299;
+	m_A301 += m_A189 * f57_79;
+	RHS79 += f57_79 * RHS57;
+	const double f57_84 = -f57 * m_A327;
+	m_A329 += m_A189 * f57_84;
+	RHS84 += f57_84 * RHS57;
+	const double f58 = 1.0 / m_A191;
+	const double f58_91 = -f58 * m_A389;
+	m_A393 += m_A192 * f58_91;
+	RHS91 += f58_91 * RHS58;
+	const double f59 = 1.0 / m_A193;
+	const double f59_80 = -f59 * m_A303;
+	m_A304 += m_A194 * f59_80;
+	m_A306 += m_A195 * f59_80;
+	RHS80 += f59_80 * RHS59;
+	const double f59_95 = -f59 * m_A425;
+	m_A428 += m_A194 * f59_95;
+	m_A437 += m_A195 * f59_95;
+	RHS95 += f59_95 * RHS59;
+	const double f60 = 1.0 / m_A197;
+	const double f60_76 = -f60 * m_A270;
+	m_A271 += m_A198 * f60_76;
+	m_A272 += m_A199 * f60_76;
+	m_A274 += m_A200 * f60_76;
+	m_A275 += m_A201 * f60_76;
+	RHS76 += f60_76 * RHS60;
+	const double f60_81 = -f60 * m_A309;
+	m_A310 += m_A198 * f60_81;
+	m_A311 += m_A199 * f60_81;
+	m_A314 += m_A200 * f60_81;
+	m_A315 += m_A201 * f60_81;
+	RHS81 += f60_81 * RHS60;
+	const double f60_92 = -f60 * m_A398;
+	m_A400 += m_A198 * f60_92;
+	m_A401 += m_A199 * f60_92;
+	m_A404 += m_A200 * f60_92;
+	m_A405 += m_A201 * f60_92;
+	RHS92 += f60_92 * RHS60;
+	const double f60_94 = -f60 * m_A413;
+	m_A414 += m_A198 * f60_94;
+	m_A416 += m_A199 * f60_94;
+	m_A419 += m_A200 * f60_94;
+	m_A420 += m_A201 * f60_94;
+	RHS94 += f60_94 * RHS60;
+	const double f61 = 1.0 / m_A203;
+	const double f61_91 = -f61 * m_A390;
+	m_A393 += m_A204 * f61_91;
+	RHS91 += f61_91 * RHS61;
+	const double f62 = 1.0 / m_A207;
+	const double f62_82 = -f62 * m_A318;
+	m_A319 += m_A208 * f62_82;
+	m_A320 += m_A209 * f62_82;
+	RHS82 += f62_82 * RHS62;
+	const double f62_88 = -f62 * m_A360;
+	m_A363 += m_A208 * f62_88;
+	m_A364 += m_A209 * f62_88;
+	RHS88 += f62_88 * RHS62;
+	const double f63 = 1.0 / m_A211;
+	const double f63_70 = -f63 * m_A237;
+	m_A239 += m_A212 * f63_70;
+	m_A241 += m_A213 * f63_70;
+	RHS70 += f63_70 * RHS63;
+	const double f63_90 = -f63 * m_A384;
+	m_A385 += m_A212 * f63_90;
+	m_A387 += m_A213 * f63_90;
+	RHS90 += f63_90 * RHS63;
+	const double f64 = 1.0 / m_A216;
+	const double f64_84 = -f64 * m_A328;
+	m_A329 += m_A217 * f64_84;
+	RHS84 += f64_84 * RHS64;
+	const double f65 = 1.0 / m_A220;
+	const double f65_92 = -f65 * m_A399;
+	m_A404 += m_A221 * f65_92;
+	RHS92 += f65_92 * RHS65;
+	const double f66 = 1.0 / m_A223;
+	const double f66_71 = -f66 * m_A243;
+	m_A244 += m_A224 * f66_71;
+	m_A245 += m_A225 * f66_71;
+	RHS71 += f66_71 * RHS66;
+	const double f66_86 = -f66 * m_A342;
+	m_A343 += m_A224 * f66_86;
+	m_A347 += m_A225 * f66_86;
+	RHS86 += f66_86 * RHS66;
+	const double f67 = 1.0 / m_A228;
+	const double f67_87 = -f67 * m_A353;
+	m_A356 += m_A229 * f67_87;
+	RHS87 += f67_87 * RHS67;
+	const double f68 = 1.0 / m_A232;
+	const double f68_73 = -f68 * m_A253;
+	m_A254 += m_A233 * f68_73;
+	RHS73 += f68_73 * RHS68;
+	const double f69 = 1.0 / m_A234;
+	const double f69_93 = -f69 * m_A407;
+	m_A410 += m_A235 * f69_93;
+	RHS93 += f69_93 * RHS69;
+	const double f70 = 1.0 / m_A238;
+	const double f70_85 = -f70 * m_A332;
+	m_A333 += m_A239 * f70_85;
+	m_A335 += m_A240 * f70_85;
+	m_A336 += m_A241 * f70_85;
+	RHS85 += f70_85 * RHS70;
+	const double f71 = 1.0 / m_A244;
+	const double f71_86 = -f71 * m_A343;
+	m_A347 += m_A245 * f71_86;
+	m_A348 += m_A246 * f71_86;
+	RHS86 += f71_86 * RHS71;
+	const double f71_87 = -f71 * m_A354;
+	m_A355 += m_A245 * f71_87;
+	m_A356 += m_A246 * f71_87;
+	RHS87 += f71_87 * RHS71;
+	const double f72 = 1.0 / m_A249;
+	const double f72_89 = -f72 * m_A374;
+	m_A380 += m_A250 * f72_89;
+	m_A381 += m_A251 * f72_89;
+	RHS89 += f72_89 * RHS72;
+	const double f72_95 = -f72 * m_A426;
+	m_A433 += m_A250 * f72_95;
+	m_A437 += m_A251 * f72_95;
+	RHS95 += f72_95 * RHS72;
+	const double f73 = 1.0 / m_A254;
+	const double f73_95 = -f73 * m_A427;
+	m_A437 += m_A255 * f73_95;
+	RHS95 += f73_95 * RHS73;
+	const double f74 = 1.0 / m_A257;
+	const double f74_93 = -f74 * m_A408;
+	m_A409 += m_A258 * f74_93;
+	RHS93 += f74_93 * RHS74;
+	const double f75 = 1.0 / m_A264;
+	const double f75_77 = -f75 * m_A280;
+	m_A281 += m_A265 * f75_77;
+	m_A282 += m_A266 * f75_77;
+	m_A284 += m_A267 * f75_77;
+	RHS77 += f75_77 * RHS75;
+	const double f75_78 = -f75 * m_A292;
+	m_A293 += m_A265 * f75_78;
+	m_A294 += m_A266 * f75_78;
+	m_A296 += m_A267 * f75_78;
+	RHS78 += f75_78 * RHS75;
+	const double f75_89 = -f75 * m_A375;
+	m_A376 += m_A265 * f75_89;
+	m_A377 += m_A266 * f75_89;
+	m_A380 += m_A267 * f75_89;
+	RHS89 += f75_89 * RHS75;
+	const double f76 = 1.0 / m_A271;
+	const double f76_81 = -f76 * m_A310;
+	m_A311 += m_A272 * f76_81;
+	m_A312 += m_A273 * f76_81;
+	m_A314 += m_A274 * f76_81;
+	m_A315 += m_A275 * f76_81;
+	RHS81 += f76_81 * RHS76;
+	const double f76_88 = -f76 * m_A361;
+	m_A362 += m_A272 * f76_88;
+	m_A364 += m_A273 * f76_88;
+	m_A366 += m_A274 * f76_88;
+	m_A367 += m_A275 * f76_88;
+	RHS88 += f76_88 * RHS76;
+	const double f76_92 = -f76 * m_A400;
+	m_A401 += m_A272 * f76_92;
+	m_A402 += m_A273 * f76_92;
+	m_A404 += m_A274 * f76_92;
+	m_A405 += m_A275 * f76_92;
+	RHS92 += f76_92 * RHS76;
+	const double f76_94 = -f76 * m_A414;
+	m_A416 += m_A272 * f76_94;
+	m_A417 += m_A273 * f76_94;
+	m_A419 += m_A274 * f76_94;
+	m_A420 += m_A275 * f76_94;
+	RHS94 += f76_94 * RHS76;
+	const double f77 = 1.0 / m_A281;
+	const double f77_78 = -f77 * m_A293;
+	m_A294 += m_A282 * f77_78;
+	m_A295 += m_A283 * f77_78;
+	m_A296 += m_A284 * f77_78;
+	RHS78 += f77_78 * RHS77;
+	const double f77_86 = -f77 * m_A344;
+	m_A345 += m_A282 * f77_86;
+	m_A347 += m_A283 * f77_86;
+	m_A349 += m_A284 * f77_86;
+	RHS86 += f77_86 * RHS77;
+	const double f77_89 = -f77 * m_A376;
+	m_A377 += m_A282 * f77_89;
+	m_A378 += m_A283 * f77_89;
+	m_A380 += m_A284 * f77_89;
+	RHS89 += f77_89 * RHS77;
+	const double f78 = 1.0 / m_A294;
+	const double f78_86 = -f78 * m_A345;
+	m_A347 += m_A295 * f78_86;
+	m_A349 += m_A296 * f78_86;
+	RHS86 += f78_86 * RHS78;
+	const double f78_89 = -f78 * m_A377;
+	m_A378 += m_A295 * f78_89;
+	m_A380 += m_A296 * f78_89;
+	RHS89 += f78_89 * RHS78;
+	const double f79 = 1.0 / m_A300;
+	const double f79_85 = -f79 * m_A333;
+	m_A334 += m_A301 * f79_85;
+	RHS85 += f79_85 * RHS79;
+	const double f79_90 = -f79 * m_A385;
+	m_A386 += m_A301 * f79_90;
+	RHS90 += f79_90 * RHS79;
+	const double f80 = 1.0 / m_A304;
+	const double f80_94 = -f80 * m_A415;
+	m_A420 += m_A305 * f80_94;
+	m_A421 += m_A306 * f80_94;
+	RHS94 += f80_94 * RHS80;
+	const double f80_95 = -f80 * m_A428;
+	m_A436 += m_A305 * f80_95;
+	m_A437 += m_A306 * f80_95;
+	RHS95 += f80_95 * RHS80;
+	const double f81 = 1.0 / m_A311;
+	const double f81_88 = -f81 * m_A362;
+	m_A364 += m_A312 * f81_88;
+	m_A365 += m_A313 * f81_88;
+	m_A366 += m_A314 * f81_88;
+	m_A367 += m_A315 * f81_88;
+	RHS88 += f81_88 * RHS81;
+	const double f81_91 = -f81 * m_A391;
+	m_A392 += m_A312 * f81_91;
+	m_A393 += m_A313 * f81_91;
+	m_A394 += m_A314 * f81_91;
+	m_A395 += m_A315 * f81_91;
+	RHS91 += f81_91 * RHS81;
+	const double f81_92 = -f81 * m_A401;
+	m_A402 += m_A312 * f81_92;
+	m_A403 += m_A313 * f81_92;
+	m_A404 += m_A314 * f81_92;
+	m_A405 += m_A315 * f81_92;
+	RHS92 += f81_92 * RHS81;
+	const double f81_94 = -f81 * m_A416;
+	m_A417 += m_A312 * f81_94;
+	m_A418 += m_A313 * f81_94;
+	m_A419 += m_A314 * f81_94;
+	m_A420 += m_A315 * f81_94;
+	RHS94 += f81_94 * RHS81;
+	const double f82 = 1.0 / m_A319;
+	const double f82_88 = -f82 * m_A363;
+	m_A364 += m_A320 * f82_88;
+	RHS88 += f82_88 * RHS82;
+	const double f83 = 1.0 / m_A322;
+	const double f83_86 = -f83 * m_A346;
+	m_A347 += m_A323 * f83_86;
+	m_A350 += m_A324 * f83_86;
+	RHS86 += f83_86 * RHS83;
+	const double f83_95 = -f83 * m_A429;
+	m_A431 += m_A323 * f83_95;
+	m_A437 += m_A324 * f83_95;
+	RHS95 += f83_95 * RHS83;
+	const double f84 = 1.0 / m_A329;
+	const double f84_85 = -f84 * m_A334;
+	RHS85 += f84_85 * RHS84;
+	const double f84_90 = -f84 * m_A386;
+	RHS90 += f84_90 * RHS84;
+	const double f85 = 1.0 / m_A335;
+	const double f85_95 = -f85 * m_A430;
+	m_A434 += m_A336 * f85_95;
+	m_A437 += m_A337 * f85_95;
+	RHS95 += f85_95 * RHS85;
+	const double f86 = 1.0 / m_A347;
+	const double f86_87 = -f86 * m_A355;
+	m_A356 += m_A348 * f86_87;
+	m_A357 += m_A349 * f86_87;
+	m_A358 += m_A350 * f86_87;
+	RHS87 += f86_87 * RHS86;
+	const double f86_89 = -f86 * m_A378;
+	m_A379 += m_A348 * f86_89;
+	m_A380 += m_A349 * f86_89;
+	m_A381 += m_A350 * f86_89;
+	RHS89 += f86_89 * RHS86;
+	const double f86_95 = -f86 * m_A431;
+	m_A432 += m_A348 * f86_95;
+	m_A433 += m_A349 * f86_95;
+	m_A437 += m_A350 * f86_95;
+	RHS95 += f86_95 * RHS86;
+	const double f87 = 1.0 / m_A356;
+	const double f87_89 = -f87 * m_A379;
+	m_A380 += m_A357 * f87_89;
+	m_A381 += m_A358 * f87_89;
+	RHS89 += f87_89 * RHS87;
+	const double f87_95 = -f87 * m_A432;
+	m_A433 += m_A357 * f87_95;
+	m_A437 += m_A358 * f87_95;
+	RHS95 += f87_95 * RHS87;
+	const double f88 = 1.0 / m_A364;
+	const double f88_91 = -f88 * m_A392;
+	m_A393 += m_A365 * f88_91;
+	m_A394 += m_A366 * f88_91;
+	m_A395 += m_A367 * f88_91;
+	RHS91 += f88_91 * RHS88;
+	const double f88_92 = -f88 * m_A402;
+	m_A403 += m_A365 * f88_92;
+	m_A404 += m_A366 * f88_92;
+	m_A405 += m_A367 * f88_92;
+	RHS92 += f88_92 * RHS88;
+	const double f88_94 = -f88 * m_A417;
+	m_A418 += m_A365 * f88_94;
+	m_A419 += m_A366 * f88_94;
+	m_A420 += m_A367 * f88_94;
+	RHS94 += f88_94 * RHS88;
+	const double f89 = 1.0 / m_A380;
+	const double f89_95 = -f89 * m_A433;
+	m_A437 += m_A381 * f89_95;
+	RHS95 += f89_95 * RHS89;
+	const double f90 = 1.0 / m_A387;
+	const double f90_95 = -f90 * m_A434;
+	RHS95 += f90_95 * RHS90;
+	const double f91 = 1.0 / m_A393;
+	const double f91_92 = -f91 * m_A403;
+	m_A404 += m_A394 * f91_92;
+	m_A405 += m_A395 * f91_92;
+	RHS92 += f91_92 * RHS91;
+	const double f91_94 = -f91 * m_A418;
+	m_A419 += m_A394 * f91_94;
+	m_A420 += m_A395 * f91_94;
+	RHS94 += f91_94 * RHS91;
+	const double f92 = 1.0 / m_A404;
+	const double f92_94 = -f92 * m_A419;
+	m_A420 += m_A405 * f92_94;
+	RHS94 += f92_94 * RHS92;
+	const double f93 = 1.0 / m_A409;
+	const double f93_95 = -f93 * m_A435;
+	m_A437 += m_A410 * f93_95;
+	RHS95 += f93_95 * RHS93;
+	const double f94 = 1.0 / m_A420;
+	const double f94_95 = -f94 * m_A436;
+	m_A437 += m_A421 * f94_95;
+	RHS95 += f94_95 * RHS94;
+	V[95] = RHS95 / m_A437;
+	double tmp94 = 0.0;
+	tmp94 += m_A421 * V[95];
+	V[94] = (RHS94 - tmp94) / m_A420;
+	double tmp93 = 0.0;
+	tmp93 += m_A410 * V[95];
+	V[93] = (RHS93 - tmp93) / m_A409;
+	double tmp92 = 0.0;
+	tmp92 += m_A405 * V[94];
+	V[92] = (RHS92 - tmp92) / m_A404;
+	double tmp91 = 0.0;
+	tmp91 += m_A394 * V[92];
+	tmp91 += m_A395 * V[94];
+	V[91] = (RHS91 - tmp91) / m_A393;
+	double tmp90 = 0.0;
+	V[90] = (RHS90 - tmp90) / m_A387;
+	double tmp89 = 0.0;
+	tmp89 += m_A381 * V[95];
+	V[89] = (RHS89 - tmp89) / m_A380;
+	double tmp88 = 0.0;
+	tmp88 += m_A365 * V[91];
+	tmp88 += m_A366 * V[92];
+	tmp88 += m_A367 * V[94];
+	V[88] = (RHS88 - tmp88) / m_A364;
+	double tmp87 = 0.0;
+	tmp87 += m_A357 * V[89];
+	tmp87 += m_A358 * V[95];
+	V[87] = (RHS87 - tmp87) / m_A356;
+	double tmp86 = 0.0;
+	tmp86 += m_A348 * V[87];
+	tmp86 += m_A349 * V[89];
+	tmp86 += m_A350 * V[95];
+	V[86] = (RHS86 - tmp86) / m_A347;
+	double tmp85 = 0.0;
+	tmp85 += m_A336 * V[90];
+	tmp85 += m_A337 * V[95];
+	V[85] = (RHS85 - tmp85) / m_A335;
+	double tmp84 = 0.0;
+	V[84] = (RHS84 - tmp84) / m_A329;
+	double tmp83 = 0.0;
+	tmp83 += m_A323 * V[86];
+	tmp83 += m_A324 * V[95];
+	V[83] = (RHS83 - tmp83) / m_A322;
+	double tmp82 = 0.0;
+	tmp82 += m_A320 * V[88];
+	V[82] = (RHS82 - tmp82) / m_A319;
+	double tmp81 = 0.0;
+	tmp81 += m_A312 * V[88];
+	tmp81 += m_A313 * V[91];
+	tmp81 += m_A314 * V[92];
+	tmp81 += m_A315 * V[94];
+	V[81] = (RHS81 - tmp81) / m_A311;
+	double tmp80 = 0.0;
+	tmp80 += m_A305 * V[94];
+	tmp80 += m_A306 * V[95];
+	V[80] = (RHS80 - tmp80) / m_A304;
+	double tmp79 = 0.0;
+	tmp79 += m_A301 * V[84];
+	V[79] = (RHS79 - tmp79) / m_A300;
+	double tmp78 = 0.0;
+	tmp78 += m_A295 * V[86];
+	tmp78 += m_A296 * V[89];
+	V[78] = (RHS78 - tmp78) / m_A294;
+	double tmp77 = 0.0;
+	tmp77 += m_A282 * V[78];
+	tmp77 += m_A283 * V[86];
+	tmp77 += m_A284 * V[89];
+	V[77] = (RHS77 - tmp77) / m_A281;
+	double tmp76 = 0.0;
+	tmp76 += m_A272 * V[81];
+	tmp76 += m_A273 * V[88];
+	tmp76 += m_A274 * V[92];
+	tmp76 += m_A275 * V[94];
+	V[76] = (RHS76 - tmp76) / m_A271;
+	double tmp75 = 0.0;
+	tmp75 += m_A265 * V[77];
+	tmp75 += m_A266 * V[78];
+	tmp75 += m_A267 * V[89];
+	V[75] = (RHS75 - tmp75) / m_A264;
+	double tmp74 = 0.0;
+	tmp74 += m_A258 * V[93];
+	V[74] = (RHS74 - tmp74) / m_A257;
+	double tmp73 = 0.0;
+	tmp73 += m_A255 * V[95];
+	V[73] = (RHS73 - tmp73) / m_A254;
+	double tmp72 = 0.0;
+	tmp72 += m_A250 * V[89];
+	tmp72 += m_A251 * V[95];
+	V[72] = (RHS72 - tmp72) / m_A249;
+	double tmp71 = 0.0;
+	tmp71 += m_A245 * V[86];
+	tmp71 += m_A246 * V[87];
+	V[71] = (RHS71 - tmp71) / m_A244;
+	double tmp70 = 0.0;
+	tmp70 += m_A239 * V[79];
+	tmp70 += m_A240 * V[85];
+	tmp70 += m_A241 * V[90];
+	V[70] = (RHS70 - tmp70) / m_A238;
+	double tmp69 = 0.0;
+	tmp69 += m_A235 * V[95];
+	V[69] = (RHS69 - tmp69) / m_A234;
+	double tmp68 = 0.0;
+	tmp68 += m_A233 * V[73];
+	V[68] = (RHS68 - tmp68) / m_A232;
+	double tmp67 = 0.0;
+	tmp67 += m_A229 * V[87];
+	V[67] = (RHS67 - tmp67) / m_A228;
+	double tmp66 = 0.0;
+	tmp66 += m_A224 * V[71];
+	tmp66 += m_A225 * V[86];
+	V[66] = (RHS66 - tmp66) / m_A223;
+	double tmp65 = 0.0;
+	tmp65 += m_A221 * V[92];
+	V[65] = (RHS65 - tmp65) / m_A220;
+	double tmp64 = 0.0;
+	tmp64 += m_A217 * V[84];
+	V[64] = (RHS64 - tmp64) / m_A216;
+	double tmp63 = 0.0;
+	tmp63 += m_A212 * V[79];
+	tmp63 += m_A213 * V[90];
+	V[63] = (RHS63 - tmp63) / m_A211;
+	double tmp62 = 0.0;
+	tmp62 += m_A208 * V[82];
+	tmp62 += m_A209 * V[88];
+	V[62] = (RHS62 - tmp62) / m_A207;
+	double tmp61 = 0.0;
+	tmp61 += m_A204 * V[91];
+	V[61] = (RHS61 - tmp61) / m_A203;
+	double tmp60 = 0.0;
+	tmp60 += m_A198 * V[76];
+	tmp60 += m_A199 * V[81];
+	tmp60 += m_A200 * V[92];
+	tmp60 += m_A201 * V[94];
+	V[60] = (RHS60 - tmp60) / m_A197;
+	double tmp59 = 0.0;
+	tmp59 += m_A194 * V[80];
+	tmp59 += m_A195 * V[95];
+	V[59] = (RHS59 - tmp59) / m_A193;
+	double tmp58 = 0.0;
+	tmp58 += m_A192 * V[91];
+	V[58] = (RHS58 - tmp58) / m_A191;
+	double tmp57 = 0.0;
+	tmp57 += m_A189 * V[84];
+	V[57] = (RHS57 - tmp57) / m_A188;
+	double tmp56 = 0.0;
+	tmp56 += m_A181 * V[75];
+	tmp56 += m_A182 * V[77];
+	tmp56 += m_A183 * V[78];
+	tmp56 += m_A184 * V[89];
+	V[56] = (RHS56 - tmp56) / m_A180;
+	double tmp55 = 0.0;
+	tmp55 += m_A174 * V[75];
+	V[55] = (RHS55 - tmp55) / m_A173;
+	double tmp54 = 0.0;
+	tmp54 += m_A167 * V[56];
+	tmp54 += m_A168 * V[75];
+	tmp54 += m_A169 * V[78];
+	tmp54 += m_A170 * V[89];
+	V[54] = (RHS54 - tmp54) / m_A166;
+	double tmp53 = 0.0;
+	tmp53 += m_A161 * V[76];
+	V[53] = (RHS53 - tmp53) / m_A160;
+	double tmp52 = 0.0;
+	tmp52 += m_A158 * V[67];
+	V[52] = (RHS52 - tmp52) / m_A157;
+	double tmp51 = 0.0;
+	tmp51 += m_A153 * V[78];
+	V[51] = (RHS51 - tmp51) / m_A152;
+	double tmp50 = 0.0;
+	tmp50 += m_A149 * V[77];
+	V[50] = (RHS50 - tmp50) / m_A148;
+	double tmp49 = 0.0;
+	tmp49 += m_A146 * V[62];
+	V[49] = (RHS49 - tmp49) / m_A145;
+	double tmp48 = 0.0;
+	tmp48 += m_A142 * V[75];
+	V[48] = (RHS48 - tmp48) / m_A141;
+	double tmp47 = 0.0;
+	tmp47 += m_A135 * V[54];
+	tmp47 += m_A136 * V[56];
+	tmp47 += m_A137 * V[78];
+	tmp47 += m_A138 * V[89];
+	V[47] = (RHS47 - tmp47) / m_A134;
+	double tmp46 = 0.0;
+	tmp46 += m_A129 * V[47];
+	tmp46 += m_A130 * V[54];
+	V[46] = (RHS46 - tmp46) / m_A128;
+	double tmp45 = 0.0;
+	tmp45 += m_A124 * V[74];
+	tmp45 += m_A125 * V[93];
+	V[45] = (RHS45 - tmp45) / m_A123;
+	double tmp44 = 0.0;
+	tmp44 += m_A121 * V[72];
+	tmp44 += m_A122 * V[95];
+	V[44] = (RHS44 - tmp44) / m_A120;
+	double tmp43 = 0.0;
+	tmp43 += m_A118 * V[87];
+	tmp43 += m_A119 * V[95];
+	V[43] = (RHS43 - tmp43) / m_A117;
+	double tmp42 = 0.0;
+	tmp42 += m_A115 * V[85];
+	tmp42 += m_A116 * V[95];
+	V[42] = (RHS42 - tmp42) / m_A114;
+	double tmp41 = 0.0;
+	tmp41 += m_A112 * V[83];
+	tmp41 += m_A113 * V[86];
+	V[41] = (RHS41 - tmp41) / m_A111;
+	double tmp40 = 0.0;
+	tmp40 += m_A109 * V[77];
+	tmp40 += m_A110 * V[86];
+	V[40] = (RHS40 - tmp40) / m_A108;
+	double tmp39 = 0.0;
+	tmp39 += m_A106 * V[68];
+	tmp39 += m_A107 * V[73];
+	V[39] = (RHS39 - tmp39) / m_A105;
+	double tmp38 = 0.0;
+	tmp38 += m_A103 * V[80];
+	tmp38 += m_A104 * V[94];
+	V[38] = (RHS38 - tmp38) / m_A102;
+	double tmp37 = 0.0;
+	tmp37 += m_A100 * V[72];
+	tmp37 += m_A101 * V[89];
+	V[37] = (RHS37 - tmp37) / m_A99;
+	double tmp36 = 0.0;
+	tmp36 += m_A97 * V[66];
+	tmp36 += m_A98 * V[71];
+	V[36] = (RHS36 - tmp36) / m_A96;
+	double tmp35 = 0.0;
+	tmp35 += m_A95 * V[70];
+	V[35] = (RHS35 - tmp35) / m_A94;
+	double tmp34 = 0.0;
+	tmp34 += m_A92 * V[63];
+	tmp34 += m_A93 * V[70];
+	V[34] = (RHS34 - tmp34) / m_A91;
+	double tmp33 = 0.0;
+	tmp33 += m_A90 * V[68];
+	V[33] = (RHS33 - tmp33) / m_A89;
+	double tmp32 = 0.0;
+	tmp32 += m_A87 * V[36];
+	tmp32 += m_A88 * V[66];
+	V[32] = (RHS32 - tmp32) / m_A86;
+	double tmp31 = 0.0;
+	tmp31 += m_A85 * V[57];
+	V[31] = (RHS31 - tmp31) / m_A84;
+	double tmp30 = 0.0;
+	tmp30 += m_A82 * V[57];
+	tmp30 += m_A83 * V[84];
+	V[30] = (RHS30 - tmp30) / m_A81;
 	double tmp29 = 0.0;
-	tmp29 += m_A107 * V[30];
-	V[29] = (RHS29 - tmp29) / m_A106;
+	tmp29 += m_A80 * V[67];
+	V[29] = (RHS29 - tmp29) / m_A79;
 	double tmp28 = 0.0;
-	tmp28 += m_A97 * V[29];
-	tmp28 += m_A98 * V[30];
-	V[28] = (RHS28 - tmp28) / m_A96;
+	tmp28 += m_A77 * V[52];
+	tmp28 += m_A78 * V[67];
+	V[28] = (RHS28 - tmp28) / m_A76;
 	double tmp27 = 0.0;
-	tmp27 += m_A88 * V[28];
-	V[27] = (RHS27 - tmp27) / m_A87;
+	tmp27 += m_A74 * V[30];
+	tmp27 += m_A75 * V[84];
+	V[27] = (RHS27 - tmp27) / m_A73;
 	double tmp26 = 0.0;
-	tmp26 += m_A83 * V[28];
-	V[26] = (RHS26 - tmp26) / m_A82;
+	tmp26 += m_A71 * V[64];
+	tmp26 += m_A72 * V[84];
+	V[26] = (RHS26 - tmp26) / m_A70;
 	double tmp25 = 0.0;
-	tmp25 += m_A78 * V[28];
-	tmp25 += m_A79 * V[29];
-	tmp25 += m_A80 * V[30];
-	V[25] = (RHS25 - tmp25) / m_A77;
+	tmp25 += m_A69 * V[79];
+	V[25] = (RHS25 - tmp25) / m_A68;
 	double tmp24 = 0.0;
-	tmp24 += m_A69 * V[25];
-	tmp24 += m_A70 * V[29];
-	tmp24 += m_A71 * V[30];
-	V[24] = (RHS24 - tmp24) / m_A68;
+	tmp24 += m_A67 * V[64];
+	V[24] = (RHS24 - tmp24) / m_A66;
 	double tmp23 = 0.0;
-	tmp23 += m_A62 * V[28];
-	V[23] = (RHS23 - tmp23) / m_A61;
+	tmp23 += m_A65 * V[79];
+	V[23] = (RHS23 - tmp23) / m_A64;
 	double tmp22 = 0.0;
-	tmp22 += m_A57 * V[24];
-	tmp22 += m_A58 * V[25];
-	tmp22 += m_A59 * V[30];
-	V[22] = (RHS22 - tmp22) / m_A56;
+	tmp22 += m_A63 * V[90];
+	V[22] = (RHS22 - tmp22) / m_A62;
 	double tmp21 = 0.0;
-	tmp21 += m_A52 * V[24];
-	V[21] = (RHS21 - tmp21) / m_A51;
+	tmp21 += m_A61 * V[61];
+	V[21] = (RHS21 - tmp21) / m_A60;
 	double tmp20 = 0.0;
-	tmp20 += m_A47 * V[24];
-	tmp20 += m_A48 * V[29];
-	tmp20 += m_A49 * V[30];
-	V[20] = (RHS20 - tmp20) / m_A46;
+	tmp20 += m_A59 * V[52];
+	V[20] = (RHS20 - tmp20) / m_A58;
 	double tmp19 = 0.0;
-	tmp19 += m_A43 * V[29];
-	V[19] = (RHS19 - tmp19) / m_A42;
+	tmp19 += m_A57 * V[52];
+	V[19] = (RHS19 - tmp19) / m_A56;
 	double tmp18 = 0.0;
-	V[18] = (RHS18 - tmp18) / m_A40;
+	tmp18 += m_A54 * V[49];
+	tmp18 += m_A55 * V[62];
+	V[18] = (RHS18 - tmp18) / m_A53;
 	double tmp17 = 0.0;
-	V[17] = (RHS17 - tmp17) / m_A37;
+	tmp17 += m_A52 * V[49];
+	V[17] = (RHS17 - tmp17) / m_A51;
 	double tmp16 = 0.0;
-	V[16] = (RHS16 - tmp16) / m_A35;
+	tmp16 += m_A47 * V[81];
+	tmp16 += m_A48 * V[88];
+	tmp16 += m_A49 * V[92];
+	tmp16 += m_A50 * V[94];
+	V[16] = (RHS16 - tmp16) / m_A46;
 	double tmp15 = 0.0;
-	tmp15 += m_A32 * V[27];
-	tmp15 += m_A33 * V[28];
-	V[15] = (RHS15 - tmp15) / m_A31;
+	tmp15 += m_A44 * V[81];
+	tmp15 += m_A45 * V[91];
+	V[15] = (RHS15 - tmp15) / m_A43;
 	double tmp14 = 0.0;
-	tmp14 += m_A30 * V[28];
-	V[14] = (RHS14 - tmp14) / m_A29;
+	tmp14 += m_A41 * V[48];
+	tmp14 += m_A42 * V[75];
+	V[14] = (RHS14 - tmp14) / m_A40;
 	double tmp13 = 0.0;
-	tmp13 += m_A28 * V[18];
-	V[13] = (RHS13 - tmp13) / m_A27;
+	tmp13 += m_A39 * V[48];
+	V[13] = (RHS13 - tmp13) / m_A38;
 	double tmp12 = 0.0;
-	tmp12 += m_A26 * V[18];
-	V[12] = (RHS12 - tmp12) / m_A25;
+	tmp12 += m_A36 * V[65];
+	tmp12 += m_A37 * V[92];
+	V[12] = (RHS12 - tmp12) / m_A35;
 	double tmp11 = 0.0;
-	tmp11 += m_A24 * V[26];
-	V[11] = (RHS11 - tmp11) / m_A23;
+	tmp11 += m_A33 * V[60];
+	tmp11 += m_A34 * V[76];
+	V[11] = (RHS11 - tmp11) / m_A32;
 	double tmp10 = 0.0;
-	tmp10 += m_A22 * V[25];
-	V[10] = (RHS10 - tmp10) / m_A21;
+	tmp10 += m_A31 * V[65];
+	V[10] = (RHS10 - tmp10) / m_A30;
 	double tmp9 = 0.0;
-	tmp9 += m_A20 * V[23];
-	V[9] = (RHS9 - tmp9) / m_A19;
+	tmp9 += m_A29 * V[58];
+	V[9] = (RHS9 - tmp9) / m_A28;
 	double tmp8 = 0.0;
-	tmp8 += m_A18 * V[25];
-	V[8] = (RHS8 - tmp8) / m_A17;
+	tmp8 += m_A24 * V[54];
+	tmp8 += m_A25 * V[56];
+	tmp8 += m_A26 * V[78];
+	tmp8 += m_A27 * V[89];
+	V[8] = (RHS8 - tmp8) / m_A23;
 	double tmp7 = 0.0;
-	tmp7 += m_A15 * V[22];
-	tmp7 += m_A16 * V[25];
-	V[7] = (RHS7 - tmp7) / m_A14;
+	tmp7 += m_A19 * V[47];
+	tmp7 += m_A20 * V[56];
+	tmp7 += m_A21 * V[78];
+	tmp7 += m_A22 * V[89];
+	V[7] = (RHS7 - tmp7) / m_A18;
 	double tmp6 = 0.0;
-	tmp6 += m_A13 * V[24];
-	V[6] = (RHS6 - tmp6) / m_A12;
+	tmp6 += m_A17 * V[53];
+	V[6] = (RHS6 - tmp6) / m_A16;
 	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[21];
-	V[5] = (RHS5 - tmp5) / m_A10;
+	tmp5 += m_A14 * V[51];
+	tmp5 += m_A15 * V[78];
+	V[5] = (RHS5 - tmp5) / m_A13;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[17];
-	V[4] = (RHS4 - tmp4) / m_A8;
+	tmp4 += m_A11 * V[56];
+	tmp4 += m_A12 * V[77];
+	V[4] = (RHS4 - tmp4) / m_A10;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[30];
-	V[3] = (RHS3 - tmp3) / m_A6;
+	tmp3 += m_A9 * V[51];
+	V[3] = (RHS3 - tmp3) / m_A8;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[19];
+	tmp2 += m_A5 * V[46];
+	tmp2 += m_A6 * V[47];
+	tmp2 += m_A7 * V[54];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[29];
+	tmp1 += m_A3 * V[50];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[16];
+	tmp0 += m_A1 * V[46];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// 280zzzap
-static void nl_gcr_caa814c0740131f2_104_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// spacfury
+static void nl_gcr_d4c34516ff6aa139_46_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -12905,656 +57651,835 @@
 	double m_A21(0.0);
 	double m_A22(0.0);
 	double m_A23(0.0);
-	double m_A24(0.0);
-	double m_A25(0.0);
-	double m_A26(0.0);
-	double m_A27(0.0);
-	double m_A28(0.0);
-	double m_A29(0.0);
-	double m_A30(0.0);
-	double m_A31(0.0);
-	double m_A32(0.0);
-	double m_A33(0.0);
-	double m_A34(0.0);
-	double m_A35(0.0);
-	double m_A36(0.0);
-	double m_A37(0.0);
-	double m_A38(0.0);
-	double m_A39(0.0);
-	double m_A40(0.0);
-	double m_A41(0.0);
-	double m_A42(0.0);
-	double m_A43(0.0);
-	double m_A44(0.0);
-	double m_A45(0.0);
-	double m_A46(0.0);
-	double m_A47(0.0);
-	double m_A48(0.0);
-	double m_A49(0.0);
-	double m_A50(0.0);
-	double m_A51(0.0);
-	double m_A52(0.0);
-	double m_A53(0.0);
-	double m_A54(0.0);
-	double m_A55(0.0);
-	double m_A56(0.0);
-	double m_A57(0.0);
-	double m_A58(0.0);
-	double m_A59(0.0);
-	double m_A60(0.0);
-	double m_A61(0.0);
-	double m_A62(0.0);
-	double m_A63(0.0);
-	double m_A64(0.0);
-	double m_A65(0.0);
-	double m_A66(0.0);
-	double m_A67(0.0);
-	double m_A68(0.0);
-	double m_A69(0.0);
-	double m_A70(0.0);
-	double m_A71(0.0);
-	double m_A72(0.0);
-	double m_A73(0.0);
-	double m_A74(0.0);
-	double m_A75(0.0);
-	double m_A76(0.0);
-	double m_A77(0.0);
-	double m_A78(0.0);
-	double m_A79(0.0);
-	double m_A80(0.0);
-	double m_A81(0.0);
-	double m_A82(0.0);
-	double m_A83(0.0);
-	double m_A84(0.0);
-	double m_A85(0.0);
-	double m_A86(0.0);
-	double m_A87(0.0);
-	double m_A88(0.0);
-	double m_A89(0.0);
-	double m_A90(0.0);
-	double m_A91(0.0);
-	double m_A92(0.0);
-	double m_A93(0.0);
-	double m_A94(0.0);
-	double m_A95(0.0);
-	double m_A96(0.0);
-	double m_A97(0.0);
-	double m_A98(0.0);
-	double m_A99(0.0);
-	double m_A100(0.0);
-	double m_A101(0.0);
-	double m_A102(0.0);
-	double m_A103(0.0);
-	m_A0 += gt[0];
-	m_A0 += gt[1];
-	m_A1 += go[0];
-	double RHS0 = Idr[0];
-	RHS0 += Idr[1];
-	RHS0 -= go[1] * *cnV[1];
-	m_A2 += gt[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A5 += go[2];
-	m_A4 += go[3];
-	m_A3 += go[4];
-	double RHS1 = Idr[2];
-	RHS1 += Idr[3];
-	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 -= go[5] * *cnV[5];
-	m_A6 += gt[6];
-	m_A6 += gt[7];
-	m_A6 += gt[8];
-	m_A7 += go[6];
-	double RHS2 = Idr[6];
-	RHS2 += Idr[7];
-	RHS2 += Idr[8];
-	RHS2 -= go[7] * *cnV[7];
-	RHS2 -= go[8] * *cnV[8];
-	m_A8 += gt[9];
-	m_A8 += gt[10];
-	m_A9 += go[9];
-	double RHS3 = Idr[9];
-	RHS3 += Idr[10];
-	RHS3 -= go[10] * *cnV[10];
-	m_A10 += gt[11];
-	m_A10 += gt[12];
-	m_A10 += gt[13];
-	m_A12 += go[11];
-	m_A11 += go[12];
-	double RHS4 = Idr[11];
-	RHS4 += Idr[12];
-	RHS4 += Idr[13];
-	RHS4 -= go[13] * *cnV[13];
-	m_A13 += gt[14];
-	m_A13 += gt[15];
-	m_A14 += go[14];
-	double RHS5 = Idr[14];
-	RHS5 += Idr[15];
-	RHS5 -= go[15] * *cnV[15];
-	m_A15 += gt[16];
-	m_A15 += gt[17];
-	m_A15 += gt[18];
-	m_A15 += gt[19];
-	m_A15 += gt[20];
-	m_A15 += gt[21];
-	m_A15 += gt[22];
-	m_A19 += go[16];
-	m_A18 += go[17];
-	m_A17 += go[18];
-	m_A16 += go[19];
-	double RHS6 = Idr[16];
-	RHS6 += Idr[17];
-	RHS6 += Idr[18];
-	RHS6 += Idr[19];
-	RHS6 += Idr[20];
-	RHS6 += Idr[21];
-	RHS6 += Idr[22];
-	RHS6 -= go[20] * *cnV[20];
-	RHS6 -= go[21] * *cnV[21];
-	RHS6 -= go[22] * *cnV[22];
-	m_A20 += gt[23];
-	m_A20 += gt[24];
-	m_A20 += gt[25];
-	m_A20 += gt[26];
-	m_A20 += gt[27];
-	m_A20 += gt[28];
-	m_A20 += gt[29];
-	m_A24 += go[23];
-	m_A23 += go[24];
-	m_A22 += go[25];
-	m_A21 += go[26];
-	double RHS7 = Idr[23];
-	RHS7 += Idr[24];
-	RHS7 += Idr[25];
-	RHS7 += Idr[26];
-	RHS7 += Idr[27];
-	RHS7 += Idr[28];
-	RHS7 += Idr[29];
-	RHS7 -= go[27] * *cnV[27];
-	RHS7 -= go[28] * *cnV[28];
-	RHS7 -= go[29] * *cnV[29];
-	m_A25 += gt[30];
-	m_A25 += gt[31];
-	m_A25 += gt[32];
-	m_A26 += go[30];
-	m_A27 += go[31];
-	double RHS8 = Idr[30];
-	RHS8 += Idr[31];
-	RHS8 += Idr[32];
-	RHS8 -= go[32] * *cnV[32];
-	m_A28 += gt[33];
-	m_A28 += gt[34];
-	m_A29 += go[33];
-	double RHS9 = Idr[33];
-	RHS9 += Idr[34];
-	RHS9 -= go[34] * *cnV[34];
-	m_A30 += gt[35];
-	m_A30 += gt[36];
-	m_A30 += gt[37];
-	m_A30 += gt[38];
-	m_A31 += go[35];
-	double RHS10 = Idr[35];
-	RHS10 += Idr[36];
-	RHS10 += Idr[37];
-	RHS10 += Idr[38];
-	RHS10 -= go[36] * *cnV[36];
-	RHS10 -= go[37] * *cnV[37];
-	RHS10 -= go[38] * *cnV[38];
-	m_A32 += gt[39];
-	m_A32 += gt[40];
-	m_A33 += go[39];
-	double RHS11 = Idr[39];
-	RHS11 += Idr[40];
-	RHS11 -= go[40] * *cnV[40];
-	m_A36 += gt[41];
-	m_A36 += gt[42];
-	m_A36 += gt[43];
-	m_A36 += gt[44];
-	m_A35 += go[41];
-	m_A34 += go[42];
-	double RHS12 = Idr[41];
-	RHS12 += Idr[42];
-	RHS12 += Idr[43];
-	RHS12 += Idr[44];
-	RHS12 -= go[43] * *cnV[43];
-	RHS12 -= go[44] * *cnV[44];
-	m_A42 += gt[45];
-	m_A42 += gt[46];
-	m_A42 += gt[47];
-	m_A42 += gt[48];
-	m_A40 += go[45];
-	m_A41 += go[46];
-	m_A43 += go[47];
-	m_A39 += go[48];
-	double RHS13 = Idr[45];
-	RHS13 += Idr[46];
-	RHS13 += Idr[47];
-	RHS13 += Idr[48];
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A7 += go[9];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A8 += gt[18];
+	m_A8 += gt[19];
+	m_A11 += go[16];
+	m_A10 += go[17];
+	m_A9 += go[18];
+	double RHS4 = Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 -= go[19] * *cnV[19];
+	m_A12 += gt[20];
+	m_A12 += gt[21];
+	m_A12 += gt[22];
+	m_A12 += gt[23];
+	m_A12 += gt[24];
+	m_A12 += gt[25];
+	m_A12 += gt[26];
+	m_A13 += go[20];
+	double RHS5 = Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 -= go[21] * *cnV[21];
+	RHS5 -= go[22] * *cnV[22];
+	RHS5 -= go[23] * *cnV[23];
+	RHS5 -= go[24] * *cnV[24];
+	RHS5 -= go[25] * *cnV[25];
+	RHS5 -= go[26] * *cnV[26];
+	m_A14 += gt[27];
+	m_A14 += gt[28];
+	m_A14 += gt[29];
+	m_A14 += gt[30];
+	m_A17 += go[27];
+	m_A15 += go[28];
+	m_A16 += go[29];
+	double RHS6 = Idr[27];
+	RHS6 += Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 -= go[30] * *cnV[30];
+	m_A22 += gt[31];
+	m_A22 += gt[32];
+	m_A22 += gt[33];
+	m_A22 += gt[34];
+	m_A22 += gt[35];
+	m_A22 += gt[36];
+	m_A21 += go[31];
+	m_A20 += go[32];
+	m_A19 += go[33];
+	m_A18 += go[34];
+	double RHS7 = Idr[31];
+	RHS7 += Idr[32];
+	RHS7 += Idr[33];
+	RHS7 += Idr[34];
+	RHS7 += Idr[35];
+	RHS7 += Idr[36];
+	RHS7 -= go[35] * *cnV[35];
+	RHS7 -= go[36] * *cnV[36];
+	m_A27 += gt[37];
+	m_A27 += gt[38];
+	m_A27 += gt[39];
+	m_A28 += go[37];
+	m_A25 += go[38];
+	double RHS8 = Idr[37];
+	RHS8 += Idr[38];
+	RHS8 += Idr[39];
+	RHS8 -= go[39] * *cnV[39];
+	m_A30 += gt[40];
+	m_A30 += gt[41];
+	m_A30 += gt[42];
+	m_A32 += go[40];
+	m_A29 += go[41];
+	double RHS9 = Idr[40];
+	RHS9 += Idr[41];
+	RHS9 += Idr[42];
+	RHS9 -= go[42] * *cnV[42];
+	m_A39 += gt[43];
+	m_A39 += gt[44];
+	m_A39 += gt[45];
+	m_A39 += gt[46];
+	m_A39 += gt[47];
+	m_A39 += gt[48];
+	m_A33 += go[43];
+	m_A35 += go[44];
+	m_A37 += go[45];
+	m_A34 += go[46];
+	double RHS10 = Idr[43];
+	RHS10 += Idr[44];
+	RHS10 += Idr[45];
+	RHS10 += Idr[46];
+	RHS10 += Idr[47];
+	RHS10 += Idr[48];
+	RHS10 -= go[47] * *cnV[47];
+	RHS10 -= go[48] * *cnV[48];
 	m_A45 += gt[49];
 	m_A45 += gt[50];
 	m_A45 += gt[51];
 	m_A45 += gt[52];
-	m_A44 += go[49];
-	m_A46 += go[50];
-	double RHS14 = Idr[49];
-	RHS14 += Idr[50];
-	RHS14 += Idr[51];
-	RHS14 += Idr[52];
-	RHS14 -= go[51] * *cnV[51];
-	RHS14 -= go[52] * *cnV[52];
-	m_A50 += gt[53];
-	m_A50 += gt[54];
-	m_A50 += gt[55];
-	m_A50 += gt[56];
-	m_A48 += go[53];
-	m_A47 += go[54];
-	double RHS15 = Idr[53];
-	RHS15 += Idr[54];
-	RHS15 += Idr[55];
-	RHS15 += Idr[56];
-	RHS15 -= go[55] * *cnV[55];
-	RHS15 -= go[56] * *cnV[56];
-	m_A57 += gt[57];
-	m_A57 += gt[58];
-	m_A57 += gt[59];
-	m_A57 += gt[60];
-	m_A56 += go[57];
-	m_A55 += go[58];
-	m_A58 += go[59];
-	double RHS16 = Idr[57];
-	RHS16 += Idr[58];
-	RHS16 += Idr[59];
-	RHS16 += Idr[60];
-	RHS16 -= go[60] * *cnV[60];
-	m_A63 += gt[61];
-	m_A63 += gt[62];
-	m_A63 += gt[63];
-	m_A63 += gt[64];
-	m_A66 += go[61];
-	m_A60 += go[62];
-	m_A59 += go[63];
-	double RHS17 = Idr[61];
-	RHS17 += Idr[62];
-	RHS17 += Idr[63];
-	RHS17 += Idr[64];
-	RHS17 -= go[64] * *cnV[64];
-	m_A74 += gt[65];
-	m_A74 += gt[66];
-	m_A74 += gt[67];
-	m_A74 += gt[68];
-	m_A74 += gt[69];
-	m_A74 += gt[70];
-	m_A77 += go[65];
-	m_A70 += go[66];
-	m_A69 += go[67];
-	m_A68 += go[68];
-	m_A71 += go[69];
-	double RHS18 = Idr[65];
-	RHS18 += Idr[66];
-	RHS18 += Idr[67];
-	RHS18 += Idr[68];
-	RHS18 += Idr[69];
-	RHS18 += Idr[70];
-	RHS18 -= go[70] * *cnV[70];
-	m_A85 += gt[71];
-	m_A85 += gt[72];
-	m_A85 += gt[73];
-	m_A85 += gt[74];
-	m_A85 += gt[75];
-	m_A85 += gt[76];
-	m_A82 += go[71];
-	m_A87 += go[72];
-	m_A79 += go[73];
-	m_A80 += go[74];
-	m_A78 += go[75];
-	double RHS19 = Idr[71];
-	RHS19 += Idr[72];
-	RHS19 += Idr[73];
-	RHS19 += Idr[74];
-	RHS19 += Idr[75];
-	RHS19 += Idr[76];
-	RHS19 -= go[76] * *cnV[76];
-	m_A93 += gt[77];
-	m_A93 += gt[78];
-	m_A93 += gt[79];
-	m_A93 += gt[80];
-	m_A93 += gt[81];
-	m_A89 += go[77];
-	m_A88 += go[78];
-	m_A90 += go[79];
-	double RHS20 = Idr[77];
-	RHS20 += Idr[78];
-	RHS20 += Idr[79];
-	RHS20 += Idr[80];
-	RHS20 += Idr[81];
-	RHS20 -= go[80] * *cnV[80];
-	RHS20 -= go[81] * *cnV[81];
-	m_A103 += gt[82];
-	m_A103 += gt[83];
-	m_A103 += gt[84];
-	m_A103 += gt[85];
-	m_A103 += gt[86];
-	m_A103 += gt[87];
-	m_A103 += gt[88];
-	m_A97 += go[82];
-	m_A96 += go[83];
-	m_A101 += go[84];
-	m_A95 += go[85];
-	m_A100 += go[86];
-	double RHS21 = Idr[82];
-	RHS21 += Idr[83];
-	RHS21 += Idr[84];
-	RHS21 += Idr[85];
-	RHS21 += Idr[86];
-	RHS21 += Idr[87];
-	RHS21 += Idr[88];
-	RHS21 -= go[87] * *cnV[87];
-	RHS21 -= go[88] * *cnV[88];
+	m_A45 += gt[53];
+	m_A45 += gt[54];
+	m_A41 += go[49];
+	m_A43 += go[50];
+	m_A42 += go[51];
+	double RHS11 = Idr[49];
+	RHS11 += Idr[50];
+	RHS11 += Idr[51];
+	RHS11 += Idr[52];
+	RHS11 += Idr[53];
+	RHS11 += Idr[54];
+	RHS11 -= go[52] * *cnV[52];
+	RHS11 -= go[53] * *cnV[53];
+	RHS11 -= go[54] * *cnV[54];
+	const double f0 = 1.0 / m_A0;
+	const double f0_7 = -f0 * m_A18;
+	m_A22 += m_A1 * f0_7;
+	RHS7 += f0_7 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_7 = -f1 * m_A19;
+	m_A22 += m_A3 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_7 = -f2 * m_A20;
+	m_A22 += m_A5 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_10 = -f3 * m_A33;
+	m_A37 += m_A7 * f3_10;
+	RHS10 += f3_10 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_7 = -f4 * m_A21;
+	m_A22 += m_A9 * f4_7;
+	m_A23 += m_A10 * f4_7;
+	m_A24 += m_A11 * f4_7;
+	RHS7 += f4_7 * RHS4;
+	const double f4_8 = -f4 * m_A25;
+	m_A26 += m_A9 * f4_8;
+	m_A27 += m_A10 * f4_8;
+	m_A28 += m_A11 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f4_10 = -f4 * m_A34;
+	m_A36 += m_A9 * f4_10;
+	m_A37 += m_A10 * f4_10;
+	m_A39 += m_A11 * f4_10;
+	RHS10 += f4_10 * RHS4;
+	const double f5 = 1.0 / m_A12;
+	const double f5_11 = -f5 * m_A41;
+	m_A43 += m_A13 * f5_11;
+	RHS11 += f5_11 * RHS5;
+	const double f6 = 1.0 / m_A14;
+	const double f6_9 = -f6 * m_A29;
+	m_A30 += m_A15 * f6_9;
+	m_A31 += m_A16 * f6_9;
+	m_A32 += m_A17 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f6_10 = -f6 * m_A35;
+	m_A38 += m_A15 * f6_10;
+	m_A39 += m_A16 * f6_10;
+	m_A40 += m_A17 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f6_11 = -f6 * m_A42;
+	m_A43 += m_A15 * f6_11;
+	m_A44 += m_A16 * f6_11;
+	m_A45 += m_A17 * f6_11;
+	RHS11 += f6_11 * RHS6;
+	const double f7 = 1.0 / m_A22;
+	const double f7_8 = -f7 * m_A26;
+	m_A27 += m_A23 * f7_8;
+	m_A28 += m_A24 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	const double f7_10 = -f7 * m_A36;
+	m_A37 += m_A23 * f7_10;
+	m_A39 += m_A24 * f7_10;
+	RHS10 += f7_10 * RHS7;
+	const double f8 = 1.0 / m_A27;
+	const double f8_10 = -f8 * m_A37;
+	m_A39 += m_A28 * f8_10;
+	RHS10 += f8_10 * RHS8;
+	const double f9 = 1.0 / m_A30;
+	const double f9_10 = -f9 * m_A38;
+	m_A39 += m_A31 * f9_10;
+	m_A40 += m_A32 * f9_10;
+	RHS10 += f9_10 * RHS9;
+	const double f9_11 = -f9 * m_A43;
+	m_A44 += m_A31 * f9_11;
+	m_A45 += m_A32 * f9_11;
+	RHS11 += f9_11 * RHS9;
+	const double f10 = 1.0 / m_A39;
+	const double f10_11 = -f10 * m_A44;
+	m_A45 += m_A40 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	V[11] = RHS11 / m_A45;
+	double tmp10 = 0.0;
+	tmp10 += m_A40 * V[11];
+	V[10] = (RHS10 - tmp10) / m_A39;
+	double tmp9 = 0.0;
+	tmp9 += m_A31 * V[10];
+	tmp9 += m_A32 * V[11];
+	V[9] = (RHS9 - tmp9) / m_A30;
+	double tmp8 = 0.0;
+	tmp8 += m_A28 * V[10];
+	V[8] = (RHS8 - tmp8) / m_A27;
+	double tmp7 = 0.0;
+	tmp7 += m_A23 * V[8];
+	tmp7 += m_A24 * V[10];
+	V[7] = (RHS7 - tmp7) / m_A22;
+	double tmp6 = 0.0;
+	tmp6 += m_A15 * V[9];
+	tmp6 += m_A16 * V[10];
+	tmp6 += m_A17 * V[11];
+	V[6] = (RHS6 - tmp6) / m_A14;
+	double tmp5 = 0.0;
+	tmp5 += m_A13 * V[9];
+	V[5] = (RHS5 - tmp5) / m_A12;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[7];
+	tmp4 += m_A10 * V[8];
+	tmp4 += m_A11 * V[10];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[8];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[7];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[7];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[7];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// boxingb
+static void nl_gcr_d7d45dc58b08cab9_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[3] * *cnV[3];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A5 += gt[6];
+	m_A5 += gt[7];
+	m_A5 += gt[8];
+	m_A6 += go[6];
+	m_A4 += go[7];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[8] * *cnV[8];
+	m_A9 += gt[9];
+	m_A9 += gt[10];
+	m_A7 += go[9];
+	m_A8 += go[10];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A5 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A7;
+	m_A9 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_3 = -f2 * m_A8;
+	m_A9 += m_A6 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// kidniki
+static void nl_gcr_d8c511d38cef5f6f_34_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	m_A2 += go[1];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[2] * *cnV[2];
+	m_A3 += gt[3];
+	m_A3 += gt[4];
+	m_A3 += gt[5];
+	m_A3 += gt[6];
+	m_A3 += gt[7];
+	m_A3 += gt[8];
+	m_A3 += gt[9];
+	m_A5 += go[3];
+	m_A4 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A7 += gt[10];
+	m_A7 += gt[11];
+	m_A7 += gt[12];
+	m_A6 += go[10];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	m_A9 += gt[13];
+	m_A9 += gt[14];
+	m_A9 += gt[15];
+	m_A11 += go[13];
+	m_A10 += go[14];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 -= go[15] * *cnV[15];
+	m_A12 += gt[16];
+	m_A12 += gt[17];
+	m_A12 += gt[18];
+	m_A14 += go[16];
+	m_A13 += go[17];
+	double RHS4 = Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 -= go[18] * *cnV[18];
+	m_A17 += gt[19];
+	m_A17 += gt[20];
+	m_A17 += gt[21];
+	m_A17 += gt[22];
+	m_A17 += gt[23];
+	m_A17 += gt[24];
+	m_A17 += gt[25];
+	m_A15 += go[19];
+	m_A18 += go[20];
+	double RHS5 = Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 -= go[21] * *cnV[21];
+	RHS5 -= go[22] * *cnV[22];
+	RHS5 -= go[23] * *cnV[23];
+	RHS5 -= go[24] * *cnV[24];
+	RHS5 -= go[25] * *cnV[25];
+	m_A21 += gt[26];
+	m_A21 += gt[27];
+	m_A21 += gt[28];
+	m_A21 += gt[29];
+	m_A21 += gt[30];
+	m_A21 += gt[31];
+	m_A19 += go[26];
+	m_A22 += go[27];
+	m_A20 += go[28];
+	double RHS6 = Idr[26];
+	RHS6 += Idr[27];
+	RHS6 += Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 += Idr[31];
+	RHS6 -= go[29] * *cnV[29];
+	RHS6 -= go[30] * *cnV[30];
+	RHS6 -= go[31] * *cnV[31];
+	m_A27 += gt[32];
+	m_A27 += gt[33];
+	m_A27 += gt[34];
+	m_A27 += gt[35];
+	m_A27 += gt[36];
+	m_A26 += go[32];
+	m_A25 += go[33];
+	m_A23 += go[34];
+	double RHS7 = Idr[32];
+	RHS7 += Idr[33];
+	RHS7 += Idr[34];
+	RHS7 += Idr[35];
+	RHS7 += Idr[36];
+	RHS7 -= go[35] * *cnV[35];
+	RHS7 -= go[36] * *cnV[36];
+	m_A33 += gt[37];
+	m_A33 += gt[38];
+	m_A33 += gt[39];
+	m_A30 += go[37];
+	m_A31 += go[38];
+	m_A29 += go[39];
+	double RHS8 = Idr[37];
+	RHS8 += Idr[38];
+	RHS8 += Idr[39];
 	const double f0 = 1.0 / m_A0;
-	const double f0_12 = -f0 * m_A34;
-	m_A36 += m_A1 * f0_12;
-	RHS12 += f0_12 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_12 = -f1 * m_A35;
-	m_A36 += m_A3 * f1_12;
-	m_A37 += m_A4 * f1_12;
-	m_A38 += m_A5 * f1_12;
-	RHS12 += f1_12 * RHS1;
-	const double f1_15 = -f1 * m_A47;
-	m_A49 += m_A3 * f1_15;
-	m_A50 += m_A4 * f1_15;
-	m_A51 += m_A5 * f1_15;
-	RHS15 += f1_15 * RHS1;
-	const double f1_17 = -f1 * m_A59;
-	m_A61 += m_A3 * f1_17;
-	m_A62 += m_A4 * f1_17;
-	m_A63 += m_A5 * f1_17;
-	RHS17 += f1_17 * RHS1;
-	const double f2 = 1.0 / m_A6;
-	const double f2_13 = -f2 * m_A39;
-	m_A42 += m_A7 * f2_13;
-	RHS13 += f2_13 * RHS2;
-	const double f3 = 1.0 / m_A8;
-	const double f3_13 = -f3 * m_A40;
-	m_A42 += m_A9 * f3_13;
-	RHS13 += f3_13 * RHS3;
-	const double f4 = 1.0 / m_A10;
-	const double f4_13 = -f4 * m_A41;
-	m_A42 += m_A11 * f4_13;
-	m_A43 += m_A12 * f4_13;
-	RHS13 += f4_13 * RHS4;
-	const double f4_18 = -f4 * m_A68;
-	m_A71 += m_A11 * f4_18;
-	m_A74 += m_A12 * f4_18;
-	RHS18 += f4_18 * RHS4;
-	const double f5 = 1.0 / m_A13;
-	const double f5_14 = -f5 * m_A44;
-	m_A45 += m_A14 * f5_14;
-	RHS14 += f5_14 * RHS5;
-	const double f6 = 1.0 / m_A15;
-	const double f6_15 = -f6 * m_A48;
-	m_A50 += m_A16 * f6_15;
-	m_A52 += m_A17 * f6_15;
-	m_A53 += m_A18 * f6_15;
-	m_A54 += m_A19 * f6_15;
-	RHS15 += f6_15 * RHS6;
-	const double f6_18 = -f6 * m_A69;
-	m_A72 += m_A16 * f6_18;
-	m_A74 += m_A17 * f6_18;
-	m_A75 += m_A18 * f6_18;
-	m_A77 += m_A19 * f6_18;
-	RHS18 += f6_18 * RHS6;
-	const double f6_19 = -f6 * m_A78;
-	m_A81 += m_A16 * f6_19;
-	m_A84 += m_A17 * f6_19;
-	m_A85 += m_A18 * f6_19;
-	m_A87 += m_A19 * f6_19;
-	RHS19 += f6_19 * RHS6;
-	const double f6_21 = -f6 * m_A95;
-	m_A98 += m_A16 * f6_21;
-	m_A100 += m_A17 * f6_21;
-	m_A101 += m_A18 * f6_21;
-	m_A103 += m_A19 * f6_21;
-	RHS21 += f6_21 * RHS6;
-	const double f7 = 1.0 / m_A20;
-	const double f7_17 = -f7 * m_A60;
-	m_A63 += m_A21 * f7_17;
-	m_A64 += m_A22 * f7_17;
-	m_A65 += m_A23 * f7_17;
-	m_A67 += m_A24 * f7_17;
-	RHS17 += f7_17 * RHS7;
-	const double f7_18 = -f7 * m_A70;
-	m_A73 += m_A21 * f7_18;
-	m_A74 += m_A22 * f7_18;
-	m_A75 += m_A23 * f7_18;
-	m_A77 += m_A24 * f7_18;
-	RHS18 += f7_18 * RHS7;
-	const double f7_19 = -f7 * m_A79;
-	m_A83 += m_A21 * f7_19;
-	m_A84 += m_A22 * f7_19;
-	m_A85 += m_A23 * f7_19;
-	m_A87 += m_A24 * f7_19;
-	RHS19 += f7_19 * RHS7;
-	const double f7_21 = -f7 * m_A96;
-	m_A99 += m_A21 * f7_21;
-	m_A100 += m_A22 * f7_21;
-	m_A101 += m_A23 * f7_21;
-	m_A103 += m_A24 * f7_21;
-	RHS21 += f7_21 * RHS7;
-	const double f8 = 1.0 / m_A25;
-	const double f8_16 = -f8 * m_A55;
-	m_A57 += m_A26 * f8_16;
-	m_A58 += m_A27 * f8_16;
-	RHS16 += f8_16 * RHS8;
-	const double f8_19 = -f8 * m_A80;
-	m_A82 += m_A26 * f8_19;
-	m_A85 += m_A27 * f8_19;
-	RHS19 += f8_19 * RHS8;
-	const double f9 = 1.0 / m_A28;
-	const double f9_16 = -f9 * m_A56;
-	m_A57 += m_A29 * f9_16;
-	RHS16 += f9_16 * RHS9;
-	const double f10 = 1.0 / m_A30;
-	const double f10_20 = -f10 * m_A88;
-	m_A93 += m_A31 * f10_20;
-	RHS20 += f10_20 * RHS10;
-	const double f11 = 1.0 / m_A32;
-	const double f11_20 = -f11 * m_A89;
-	m_A93 += m_A33 * f11_20;
-	RHS20 += f11_20 * RHS11;
-	const double f12 = 1.0 / m_A36;
-	const double f12_15 = -f12 * m_A49;
-	m_A50 += m_A37 * f12_15;
-	m_A51 += m_A38 * f12_15;
-	RHS15 += f12_15 * RHS12;
-	const double f12_17 = -f12 * m_A61;
-	m_A62 += m_A37 * f12_17;
-	m_A63 += m_A38 * f12_17;
-	RHS17 += f12_17 * RHS12;
-	const double f13 = 1.0 / m_A42;
-	const double f13_18 = -f13 * m_A71;
-	m_A74 += m_A43 * f13_18;
-	RHS18 += f13_18 * RHS13;
-	const double f14 = 1.0 / m_A45;
-	const double f14_21 = -f14 * m_A97;
-	m_A103 += m_A46 * f14_21;
-	RHS21 += f14_21 * RHS14;
-	const double f15 = 1.0 / m_A50;
-	const double f15_17 = -f15 * m_A62;
-	m_A63 += m_A51 * f15_17;
-	m_A64 += m_A52 * f15_17;
-	m_A65 += m_A53 * f15_17;
-	m_A67 += m_A54 * f15_17;
-	RHS17 += f15_17 * RHS15;
-	const double f15_18 = -f15 * m_A72;
-	m_A73 += m_A51 * f15_18;
-	m_A74 += m_A52 * f15_18;
-	m_A75 += m_A53 * f15_18;
-	m_A77 += m_A54 * f15_18;
-	RHS18 += f15_18 * RHS15;
-	const double f15_19 = -f15 * m_A81;
-	m_A83 += m_A51 * f15_19;
-	m_A84 += m_A52 * f15_19;
-	m_A85 += m_A53 * f15_19;
-	m_A87 += m_A54 * f15_19;
-	RHS19 += f15_19 * RHS15;
-	const double f15_21 = -f15 * m_A98;
-	m_A99 += m_A51 * f15_21;
-	m_A100 += m_A52 * f15_21;
-	m_A101 += m_A53 * f15_21;
-	m_A103 += m_A54 * f15_21;
-	RHS21 += f15_21 * RHS15;
-	const double f16 = 1.0 / m_A57;
-	const double f16_19 = -f16 * m_A82;
-	m_A85 += m_A58 * f16_19;
-	RHS19 += f16_19 * RHS16;
-	const double f17 = 1.0 / m_A63;
-	const double f17_18 = -f17 * m_A73;
-	m_A74 += m_A64 * f17_18;
-	m_A75 += m_A65 * f17_18;
-	m_A76 += m_A66 * f17_18;
-	m_A77 += m_A67 * f17_18;
-	RHS18 += f17_18 * RHS17;
-	const double f17_19 = -f17 * m_A83;
-	m_A84 += m_A64 * f17_19;
-	m_A85 += m_A65 * f17_19;
-	m_A86 += m_A66 * f17_19;
-	m_A87 += m_A67 * f17_19;
-	RHS19 += f17_19 * RHS17;
-	const double f17_20 = -f17 * m_A90;
-	m_A91 += m_A64 * f17_20;
-	m_A92 += m_A65 * f17_20;
-	m_A93 += m_A66 * f17_20;
-	m_A94 += m_A67 * f17_20;
-	RHS20 += f17_20 * RHS17;
-	const double f17_21 = -f17 * m_A99;
-	m_A100 += m_A64 * f17_21;
-	m_A101 += m_A65 * f17_21;
-	m_A102 += m_A66 * f17_21;
-	m_A103 += m_A67 * f17_21;
-	RHS21 += f17_21 * RHS17;
-	const double f18 = 1.0 / m_A74;
-	const double f18_19 = -f18 * m_A84;
-	m_A85 += m_A75 * f18_19;
-	m_A86 += m_A76 * f18_19;
-	m_A87 += m_A77 * f18_19;
-	RHS19 += f18_19 * RHS18;
-	const double f18_20 = -f18 * m_A91;
-	m_A92 += m_A75 * f18_20;
-	m_A93 += m_A76 * f18_20;
-	m_A94 += m_A77 * f18_20;
-	RHS20 += f18_20 * RHS18;
-	const double f18_21 = -f18 * m_A100;
-	m_A101 += m_A75 * f18_21;
-	m_A102 += m_A76 * f18_21;
-	m_A103 += m_A77 * f18_21;
-	RHS21 += f18_21 * RHS18;
-	const double f19 = 1.0 / m_A85;
-	const double f19_20 = -f19 * m_A92;
-	m_A93 += m_A86 * f19_20;
-	m_A94 += m_A87 * f19_20;
-	RHS20 += f19_20 * RHS19;
-	const double f19_21 = -f19 * m_A101;
-	m_A102 += m_A86 * f19_21;
-	m_A103 += m_A87 * f19_21;
-	RHS21 += f19_21 * RHS19;
-	const double f20 = 1.0 / m_A93;
-	const double f20_21 = -f20 * m_A102;
-	m_A103 += m_A94 * f20_21;
-	RHS21 += f20_21 * RHS20;
-	V[21] = RHS21 / m_A103;
-	double tmp20 = 0.0;
-	tmp20 += m_A94 * V[21];
-	V[20] = (RHS20 - tmp20) / m_A93;
-	double tmp19 = 0.0;
-	tmp19 += m_A86 * V[20];
-	tmp19 += m_A87 * V[21];
-	V[19] = (RHS19 - tmp19) / m_A85;
-	double tmp18 = 0.0;
-	tmp18 += m_A75 * V[19];
-	tmp18 += m_A76 * V[20];
-	tmp18 += m_A77 * V[21];
-	V[18] = (RHS18 - tmp18) / m_A74;
-	double tmp17 = 0.0;
-	tmp17 += m_A64 * V[18];
-	tmp17 += m_A65 * V[19];
-	tmp17 += m_A66 * V[20];
-	tmp17 += m_A67 * V[21];
-	V[17] = (RHS17 - tmp17) / m_A63;
-	double tmp16 = 0.0;
-	tmp16 += m_A58 * V[19];
-	V[16] = (RHS16 - tmp16) / m_A57;
-	double tmp15 = 0.0;
-	tmp15 += m_A51 * V[17];
-	tmp15 += m_A52 * V[18];
-	tmp15 += m_A53 * V[19];
-	tmp15 += m_A54 * V[21];
-	V[15] = (RHS15 - tmp15) / m_A50;
-	double tmp14 = 0.0;
-	tmp14 += m_A46 * V[21];
-	V[14] = (RHS14 - tmp14) / m_A45;
-	double tmp13 = 0.0;
-	tmp13 += m_A43 * V[18];
-	V[13] = (RHS13 - tmp13) / m_A42;
-	double tmp12 = 0.0;
-	tmp12 += m_A37 * V[15];
-	tmp12 += m_A38 * V[17];
-	V[12] = (RHS12 - tmp12) / m_A36;
-	double tmp11 = 0.0;
-	tmp11 += m_A33 * V[20];
-	V[11] = (RHS11 - tmp11) / m_A32;
-	double tmp10 = 0.0;
-	tmp10 += m_A31 * V[20];
-	V[10] = (RHS10 - tmp10) / m_A30;
-	double tmp9 = 0.0;
-	tmp9 += m_A29 * V[16];
-	V[9] = (RHS9 - tmp9) / m_A28;
-	double tmp8 = 0.0;
-	tmp8 += m_A26 * V[16];
-	tmp8 += m_A27 * V[19];
-	V[8] = (RHS8 - tmp8) / m_A25;
+	const double f0_2 = -f0 * m_A6;
+	m_A7 += m_A1 * f0_2;
+	m_A8 += m_A2 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f0_5 = -f0 * m_A15;
+	m_A16 += m_A1 * f0_5;
+	m_A18 += m_A2 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f0_7 = -f0 * m_A23;
+	m_A24 += m_A1 * f0_7;
+	m_A27 += m_A2 * f0_7;
+	RHS7 += f0_7 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_6 = -f1 * m_A19;
+	m_A20 += m_A4 * f1_6;
+	m_A21 += m_A5 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f2 = 1.0 / m_A7;
+	const double f2_5 = -f2 * m_A16;
+	m_A18 += m_A8 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f2_7 = -f2 * m_A24;
+	m_A27 += m_A8 * f2_7;
+	RHS7 += f2_7 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_6 = -f3 * m_A20;
+	m_A21 += m_A10 * f3_6;
+	m_A22 += m_A11 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f3_8 = -f3 * m_A29;
+	m_A31 += m_A10 * f3_8;
+	m_A33 += m_A11 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f4 = 1.0 / m_A12;
+	const double f4_7 = -f4 * m_A25;
+	m_A27 += m_A13 * f4_7;
+	m_A28 += m_A14 * f4_7;
+	RHS7 += f4_7 * RHS4;
+	const double f4_8 = -f4 * m_A30;
+	m_A32 += m_A13 * f4_8;
+	m_A33 += m_A14 * f4_8;
+	RHS8 += f4_8 * RHS4;
+	const double f5 = 1.0 / m_A17;
+	const double f5_7 = -f5 * m_A26;
+	m_A27 += m_A18 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f6 = 1.0 / m_A21;
+	const double f6_8 = -f6 * m_A31;
+	m_A33 += m_A22 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f7 = 1.0 / m_A27;
+	const double f7_8 = -f7 * m_A32;
+	m_A33 += m_A28 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	V[8] = RHS8 / m_A33;
 	double tmp7 = 0.0;
-	tmp7 += m_A21 * V[17];
-	tmp7 += m_A22 * V[18];
-	tmp7 += m_A23 * V[19];
-	tmp7 += m_A24 * V[21];
-	V[7] = (RHS7 - tmp7) / m_A20;
+	tmp7 += m_A28 * V[8];
+	V[7] = (RHS7 - tmp7) / m_A27;
 	double tmp6 = 0.0;
-	tmp6 += m_A16 * V[15];
-	tmp6 += m_A17 * V[18];
-	tmp6 += m_A18 * V[19];
-	tmp6 += m_A19 * V[21];
-	V[6] = (RHS6 - tmp6) / m_A15;
+	tmp6 += m_A22 * V[8];
+	V[6] = (RHS6 - tmp6) / m_A21;
+	double tmp5 = 0.0;
+	tmp5 += m_A18 * V[7];
+	V[5] = (RHS5 - tmp5) / m_A17;
+	double tmp4 = 0.0;
+	tmp4 += m_A13 * V[7];
+	tmp4 += m_A14 * V[8];
+	V[4] = (RHS4 - tmp4) / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A10 * V[6];
+	tmp3 += m_A11 * V[8];
+	V[3] = (RHS3 - tmp3) / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A8 * V[7];
+	V[2] = (RHS2 - tmp2) / m_A7;
+	double tmp1 = 0.0;
+	tmp1 += m_A4 * V[3];
+	tmp1 += m_A5 * V[6];
+	V[1] = (RHS1 - tmp1) / m_A3;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	tmp0 += m_A2 * V[7];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// warrior
+static void nl_gcr_da598f43329e823_27_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A4 += go[2];
+	m_A3 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	m_A5 += gt[7];
+	m_A5 += gt[8];
+	m_A5 += gt[9];
+	m_A5 += gt[10];
+	m_A8 += go[7];
+	m_A6 += go[8];
+	m_A6 += go[9];
+	m_A7 += go[10];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	m_A10 += gt[11];
+	m_A10 += gt[12];
+	m_A10 += gt[13];
+	m_A10 += gt[14];
+	m_A10 += gt[15];
+	m_A11 += go[11];
+	m_A11 += go[12];
+	m_A9 += go[13];
+	m_A9 += go[14];
+	double RHS3 = Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 -= go[15] * *cnV[15];
+	m_A13 += gt[16];
+	m_A13 += gt[17];
+	m_A13 += gt[18];
+	m_A13 += gt[19];
+	m_A13 += gt[20];
+	m_A15 += go[16];
+	m_A15 += go[17];
+	m_A12 += go[18];
+	m_A12 += go[19];
+	double RHS4 = Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 -= go[20] * *cnV[20];
+	m_A21 += gt[21];
+	m_A21 += gt[22];
+	m_A21 += gt[23];
+	m_A21 += gt[24];
+	m_A21 += gt[25];
+	m_A18 += go[21];
+	m_A19 += go[22];
+	m_A19 += go[23];
+	m_A17 += go[24];
+	m_A16 += go[25];
+	double RHS5 = Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	m_A26 += gt[26];
+	m_A26 += gt[27];
+	m_A26 += gt[28];
+	m_A26 += gt[29];
+	m_A26 += gt[30];
+	m_A24 += go[26];
+	m_A24 += go[27];
+	m_A23 += go[28];
+	double RHS6 = Idr[26];
+	RHS6 += Idr[27];
+	RHS6 += Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 -= go[29] * *cnV[29];
+	RHS6 -= go[30] * *cnV[30];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A16;
+	m_A21 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A9;
+	m_A10 += m_A3 * f1_3;
+	m_A11 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f1_5 = -f1 * m_A17;
+	m_A19 += m_A3 * f1_5;
+	m_A21 += m_A4 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_4 = -f2 * m_A12;
+	m_A13 += m_A6 * f2_4;
+	m_A14 += m_A7 * f2_4;
+	m_A15 += m_A8 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_5 = -f2 * m_A18;
+	m_A20 += m_A6 * f2_5;
+	m_A21 += m_A7 * f2_5;
+	m_A22 += m_A8 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f2_6 = -f2 * m_A23;
+	m_A24 += m_A6 * f2_6;
+	m_A25 += m_A7 * f2_6;
+	m_A26 += m_A8 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_5 = -f3 * m_A19;
+	m_A21 += m_A11 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A13;
+	const double f4_5 = -f4 * m_A20;
+	m_A21 += m_A14 * f4_5;
+	m_A22 += m_A15 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	const double f4_6 = -f4 * m_A24;
+	m_A25 += m_A14 * f4_6;
+	m_A26 += m_A15 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f5 = 1.0 / m_A21;
+	const double f5_6 = -f5 * m_A25;
+	m_A26 += m_A22 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	V[6] = RHS6 / m_A26;
 	double tmp5 = 0.0;
-	tmp5 += m_A14 * V[14];
-	V[5] = (RHS5 - tmp5) / m_A13;
+	tmp5 += m_A22 * V[6];
+	V[5] = (RHS5 - tmp5) / m_A21;
 	double tmp4 = 0.0;
-	tmp4 += m_A11 * V[13];
-	tmp4 += m_A12 * V[18];
-	V[4] = (RHS4 - tmp4) / m_A10;
+	tmp4 += m_A14 * V[5];
+	tmp4 += m_A15 * V[6];
+	V[4] = (RHS4 - tmp4) / m_A13;
 	double tmp3 = 0.0;
-	tmp3 += m_A9 * V[13];
-	V[3] = (RHS3 - tmp3) / m_A8;
+	tmp3 += m_A11 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A10;
 	double tmp2 = 0.0;
-	tmp2 += m_A7 * V[13];
-	V[2] = (RHS2 - tmp2) / m_A6;
+	tmp2 += m_A6 * V[4];
+	tmp2 += m_A7 * V[5];
+	tmp2 += m_A8 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A5;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[12];
-	tmp1 += m_A4 * V[15];
-	tmp1 += m_A5 * V[17];
+	tmp1 += m_A3 * V[3];
+	tmp1 += m_A4 * V[5];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[12];
+	tmp0 += m_A1 * V[5];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// rebound
-static void nl_gcr_cb1d3c28ba315ca6_28_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// pongf
+static void nl_gcr_dbafc5ddaf7a08f8_35_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -13583,207 +58508,224 @@
 	double m_A25(0.0);
 	double m_A26(0.0);
 	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
+	m_A0 += gt[3];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
+	RHS0 += Idr[3];
 	RHS0 -= go[1] * *cnV[1];
 	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
+	RHS0 -= go[3] * *cnV[3];
 	m_A2 += gt[4];
 	m_A2 += gt[5];
 	m_A2 += gt[6];
-	m_A4 += go[3];
-	m_A4 += go[4];
-	m_A3 += go[5];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
+	m_A2 += gt[7];
+	m_A3 += go[4];
+	double RHS1 = Idr[4];
 	RHS1 += Idr[5];
 	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 -= go[5] * *cnV[5];
 	RHS1 -= go[6] * *cnV[6];
-	m_A5 += gt[7];
-	m_A5 += gt[8];
-	m_A5 += gt[9];
-	m_A6 += go[7];
-	double RHS2 = Idr[7];
-	RHS2 += Idr[8];
+	RHS1 -= go[7] * *cnV[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A5 += go[8];
+	double RHS2 = Idr[8];
 	RHS2 += Idr[9];
-	RHS2 -= go[8] * *cnV[8];
+	RHS2 += Idr[10];
 	RHS2 -= go[9] * *cnV[9];
-	m_A7 += gt[10];
-	m_A7 += gt[11];
-	m_A7 += gt[12];
-	m_A7 += gt[13];
-	m_A7 += gt[14];
-	m_A7 += gt[15];
-	m_A7 += gt[16];
-	m_A8 += go[10];
-	m_A8 += go[11];
-	double RHS3 = Idr[10];
-	RHS3 += Idr[11];
+	RHS2 -= go[10] * *cnV[10];
+	m_A6 += gt[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A9 += go[11];
+	m_A7 += go[12];
+	m_A7 += go[13];
+	m_A7 += go[14];
+	m_A8 += go[15];
+	double RHS3 = Idr[11];
 	RHS3 += Idr[12];
 	RHS3 += Idr[13];
 	RHS3 += Idr[14];
 	RHS3 += Idr[15];
-	RHS3 += Idr[16];
-	RHS3 -= go[12] * *cnV[12];
-	RHS3 -= go[13] * *cnV[13];
-	RHS3 -= go[14] * *cnV[14];
-	RHS3 -= go[15] * *cnV[15];
-	RHS3 -= go[16] * *cnV[16];
+	m_A11 += gt[16];
 	m_A11 += gt[17];
 	m_A11 += gt[18];
 	m_A11 += gt[19];
-	m_A13 += go[17];
+	m_A11 += gt[20];
+	m_A11 += gt[21];
+	m_A11 += gt[22];
+	m_A13 += go[16];
+	m_A12 += go[17];
 	m_A10 += go[18];
-	m_A9 += go[19];
-	double RHS4 = Idr[17];
+	double RHS4 = Idr[16];
+	RHS4 += Idr[17];
 	RHS4 += Idr[18];
 	RHS4 += Idr[19];
-	m_A16 += gt[20];
-	m_A16 += gt[21];
-	m_A16 += gt[22];
-	m_A16 += gt[23];
-	m_A16 += gt[24];
-	m_A16 += gt[25];
-	m_A16 += gt[26];
-	m_A18 += go[20];
-	m_A14 += go[21];
-	m_A14 += go[22];
-	double RHS5 = Idr[20];
-	RHS5 += Idr[21];
-	RHS5 += Idr[22];
-	RHS5 += Idr[23];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	RHS4 -= go[22] * *cnV[22];
+	m_A15 += gt[23];
+	m_A15 += gt[24];
+	m_A15 += gt[25];
+	m_A15 += gt[26];
+	m_A15 += gt[27];
+	m_A17 += go[23];
+	m_A14 += go[24];
+	m_A14 += go[25];
+	m_A14 += go[26];
+	double RHS5 = Idr[23];
 	RHS5 += Idr[24];
 	RHS5 += Idr[25];
 	RHS5 += Idr[26];
-	RHS5 -= go[23] * *cnV[23];
-	RHS5 -= go[24] * *cnV[24];
-	RHS5 -= go[25] * *cnV[25];
-	RHS5 -= go[26] * *cnV[26];
-	m_A22 += gt[27];
+	RHS5 += Idr[27];
+	RHS5 -= go[27] * *cnV[27];
 	m_A22 += gt[28];
 	m_A22 += gt[29];
 	m_A22 += gt[30];
 	m_A22 += gt[31];
-	m_A22 += gt[32];
-	m_A22 += gt[33];
-	m_A22 += gt[34];
-	m_A22 += gt[35];
-	m_A22 += gt[36];
-	m_A23 += go[27];
-	m_A23 += go[28];
+	m_A19 += go[28];
 	m_A20 += go[29];
-	m_A19 += go[30];
-	m_A19 += go[31];
-	double RHS6 = Idr[27];
-	RHS6 += Idr[28];
+	m_A18 += go[30];
+	double RHS6 = Idr[28];
 	RHS6 += Idr[29];
 	RHS6 += Idr[30];
 	RHS6 += Idr[31];
-	RHS6 += Idr[32];
-	RHS6 += Idr[33];
-	RHS6 += Idr[34];
-	RHS6 += Idr[35];
-	RHS6 += Idr[36];
-	RHS6 -= go[32] * *cnV[32];
-	RHS6 -= go[33] * *cnV[33];
-	RHS6 -= go[34] * *cnV[34];
-	RHS6 -= go[35] * *cnV[35];
-	RHS6 -= go[36] * *cnV[36];
-	m_A27 += gt[37];
-	m_A27 += gt[38];
-	m_A27 += gt[39];
-	m_A27 += gt[40];
-	m_A27 += gt[41];
-	m_A26 += go[37];
-	m_A26 += go[38];
-	m_A25 += go[39];
-	m_A24 += go[40];
-	double RHS7 = Idr[37];
-	RHS7 += Idr[38];
-	RHS7 += Idr[39];
-	RHS7 += Idr[40];
-	RHS7 += Idr[41];
-	RHS7 -= go[41] * *cnV[41];
+	RHS6 -= go[31] * *cnV[31];
+	m_A28 += gt[32];
+	m_A28 += gt[33];
+	m_A28 += gt[34];
+	m_A29 += go[32];
+	m_A25 += go[33];
+	m_A26 += go[34];
+	double RHS7 = Idr[32];
+	RHS7 += Idr[33];
+	RHS7 += Idr[34];
+	m_A34 += gt[35];
+	m_A34 += gt[36];
+	m_A34 += gt[37];
+	m_A31 += go[35];
+	m_A30 += go[36];
+	m_A33 += go[37];
+	double RHS8 = Idr[35];
+	RHS8 += Idr[36];
+	RHS8 += Idr[37];
 	const double f0 = 1.0 / m_A0;
-	const double f0_4 = -f0 * m_A9;
+	const double f0_4 = -f0 * m_A10;
 	m_A11 += m_A1 * f0_4;
 	RHS4 += f0_4 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_4 = -f1 * m_A10;
-	m_A11 += m_A3 * f1_4;
-	m_A12 += m_A4 * f1_4;
-	RHS4 += f1_4 * RHS1;
-	const double f1_5 = -f1 * m_A14;
-	m_A15 += m_A3 * f1_5;
-	m_A16 += m_A4 * f1_5;
-	RHS5 += f1_5 * RHS1;
-	const double f2 = 1.0 / m_A5;
-	const double f2_7 = -f2 * m_A24;
-	m_A27 += m_A6 * f2_7;
+	const double f1_6 = -f1 * m_A18;
+	m_A22 += m_A3 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_7 = -f2 * m_A25;
+	m_A28 += m_A5 * f2_7;
 	RHS7 += f2_7 * RHS2;
-	const double f3 = 1.0 / m_A7;
+	const double f3 = 1.0 / m_A6;
+	const double f3_5 = -f3 * m_A14;
+	m_A15 += m_A7 * f3_5;
+	m_A16 += m_A8 * f3_5;
+	m_A17 += m_A9 * f3_5;
+	RHS5 += f3_5 * RHS3;
 	const double f3_6 = -f3 * m_A19;
+	m_A21 += m_A7 * f3_6;
 	m_A22 += m_A8 * f3_6;
+	m_A24 += m_A9 * f3_6;
 	RHS6 += f3_6 * RHS3;
+	const double f3_8 = -f3 * m_A30;
+	m_A31 += m_A7 * f3_8;
+	m_A32 += m_A8 * f3_8;
+	m_A34 += m_A9 * f3_8;
+	RHS8 += f3_8 * RHS3;
 	const double f4 = 1.0 / m_A11;
-	const double f4_5 = -f4 * m_A15;
-	m_A16 += m_A12 * f4_5;
-	m_A17 += m_A13 * f4_5;
-	RHS5 += f4_5 * RHS4;
 	const double f4_6 = -f4 * m_A20;
-	m_A21 += m_A12 * f4_6;
-	m_A22 += m_A13 * f4_6;
+	m_A22 += m_A12 * f4_6;
+	m_A23 += m_A13 * f4_6;
 	RHS6 += f4_6 * RHS4;
-	const double f5 = 1.0 / m_A16;
+	const double f4_7 = -f4 * m_A26;
+	m_A27 += m_A12 * f4_7;
+	m_A28 += m_A13 * f4_7;
+	RHS7 += f4_7 * RHS4;
+	const double f5 = 1.0 / m_A15;
 	const double f5_6 = -f5 * m_A21;
-	m_A22 += m_A17 * f5_6;
-	m_A23 += m_A18 * f5_6;
+	m_A22 += m_A16 * f5_6;
+	m_A24 += m_A17 * f5_6;
 	RHS6 += f5_6 * RHS5;
-	const double f5_7 = -f5 * m_A25;
-	m_A26 += m_A17 * f5_7;
-	m_A27 += m_A18 * f5_7;
-	RHS7 += f5_7 * RHS5;
+	const double f5_8 = -f5 * m_A31;
+	m_A32 += m_A16 * f5_8;
+	m_A34 += m_A17 * f5_8;
+	RHS8 += f5_8 * RHS5;
 	const double f6 = 1.0 / m_A22;
-	const double f6_7 = -f6 * m_A26;
-	m_A27 += m_A23 * f6_7;
+	const double f6_7 = -f6 * m_A27;
+	m_A28 += m_A23 * f6_7;
+	m_A29 += m_A24 * f6_7;
 	RHS7 += f6_7 * RHS6;
-	V[7] = RHS7 / m_A27;
+	const double f6_8 = -f6 * m_A32;
+	m_A33 += m_A23 * f6_8;
+	m_A34 += m_A24 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f7 = 1.0 / m_A28;
+	const double f7_8 = -f7 * m_A33;
+	m_A34 += m_A29 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	V[8] = RHS8 / m_A34;
+	double tmp7 = 0.0;
+	tmp7 += m_A29 * V[8];
+	V[7] = (RHS7 - tmp7) / m_A28;
 	double tmp6 = 0.0;
 	tmp6 += m_A23 * V[7];
+	tmp6 += m_A24 * V[8];
 	V[6] = (RHS6 - tmp6) / m_A22;
 	double tmp5 = 0.0;
-	tmp5 += m_A17 * V[6];
-	tmp5 += m_A18 * V[7];
-	V[5] = (RHS5 - tmp5) / m_A16;
+	tmp5 += m_A16 * V[6];
+	tmp5 += m_A17 * V[8];
+	V[5] = (RHS5 - tmp5) / m_A15;
 	double tmp4 = 0.0;
-	tmp4 += m_A12 * V[5];
-	tmp4 += m_A13 * V[6];
+	tmp4 += m_A12 * V[6];
+	tmp4 += m_A13 * V[7];
 	V[4] = (RHS4 - tmp4) / m_A11;
 	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[5];
 	tmp3 += m_A8 * V[6];
-	V[3] = (RHS3 - tmp3) / m_A7;
+	tmp3 += m_A9 * V[8];
+	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A6 * V[7];
-	V[2] = (RHS2 - tmp2) / m_A5;
+	tmp2 += m_A5 * V[7];
+	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[4];
-	tmp1 += m_A4 * V[5];
+	tmp1 += m_A3 * V[6];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
 	tmp0 += m_A1 * V[4];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// mario
-static void nl_gcr_cc367a3c6e2f7ec9_62_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// fireone
+static void nl_gcr_dcbecbc127c5868f_36_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -13820,451 +58762,227 @@
 	double m_A33(0.0);
 	double m_A34(0.0);
 	double m_A35(0.0);
-	double m_A36(0.0);
-	double m_A37(0.0);
-	double m_A38(0.0);
-	double m_A39(0.0);
-	double m_A40(0.0);
-	double m_A41(0.0);
-	double m_A42(0.0);
-	double m_A43(0.0);
-	double m_A44(0.0);
-	double m_A45(0.0);
-	double m_A46(0.0);
-	double m_A47(0.0);
-	double m_A48(0.0);
-	double m_A49(0.0);
-	double m_A50(0.0);
-	double m_A51(0.0);
-	double m_A52(0.0);
-	double m_A53(0.0);
-	double m_A54(0.0);
-	double m_A55(0.0);
-	double m_A56(0.0);
-	double m_A57(0.0);
-	double m_A58(0.0);
-	double m_A59(0.0);
-	double m_A60(0.0);
-	double m_A61(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
 	RHS0 -= go[1] * *cnV[1];
-	m_A2 += gt[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A3 += go[2];
-	double RHS1 = Idr[2];
-	RHS1 += Idr[3];
-	RHS1 += Idr[4];
-	RHS1 -= go[3] * *cnV[3];
-	RHS1 -= go[4] * *cnV[4];
-	m_A4 += gt[5];
-	m_A4 += gt[6];
-	m_A5 += go[5];
-	double RHS2 = Idr[5];
-	RHS2 += Idr[6];
-	RHS2 -= go[6] * *cnV[6];
-	m_A6 += gt[7];
-	m_A6 += gt[8];
-	m_A6 += gt[9];
-	m_A6 += gt[10];
-	m_A6 += gt[11];
-	m_A6 += gt[12];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A3 += go[7];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	m_A4 += gt[11];
+	m_A4 += gt[12];
+	m_A5 += go[11];
+	double RHS2 = Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[12] * *cnV[12];
 	m_A6 += gt[13];
-	m_A7 += go[7];
-	double RHS3 = Idr[7];
-	RHS3 += Idr[8];
-	RHS3 += Idr[9];
-	RHS3 += Idr[10];
-	RHS3 += Idr[11];
-	RHS3 += Idr[12];
-	RHS3 += Idr[13];
-	RHS3 -= go[8] * *cnV[8];
-	RHS3 -= go[9] * *cnV[9];
-	RHS3 -= go[10] * *cnV[10];
-	RHS3 -= go[11] * *cnV[11];
-	RHS3 -= go[12] * *cnV[12];
-	RHS3 -= go[13] * *cnV[13];
-	m_A8 += gt[14];
-	m_A8 += gt[15];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A7 += go[13];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
 	m_A8 += gt[16];
 	m_A8 += gt[17];
 	m_A8 += gt[18];
-	m_A8 += gt[19];
-	m_A8 += gt[20];
-	m_A9 += go[14];
-	double RHS4 = Idr[14];
-	RHS4 += Idr[15];
-	RHS4 += Idr[16];
+	m_A9 += go[16];
+	double RHS4 = Idr[16];
 	RHS4 += Idr[17];
 	RHS4 += Idr[18];
-	RHS4 += Idr[19];
-	RHS4 += Idr[20];
-	RHS4 -= go[15] * *cnV[15];
-	RHS4 -= go[16] * *cnV[16];
 	RHS4 -= go[17] * *cnV[17];
 	RHS4 -= go[18] * *cnV[18];
-	RHS4 -= go[19] * *cnV[19];
-	RHS4 -= go[20] * *cnV[20];
-	m_A10 += gt[21];
-	m_A10 += gt[22];
-	m_A12 += go[21];
-	m_A11 += go[22];
-	double RHS5 = Idr[21];
-	RHS5 += Idr[22];
+	m_A10 += gt[19];
+	m_A10 += gt[20];
+	m_A11 += go[19];
+	double RHS5 = Idr[19];
+	RHS5 += Idr[20];
+	RHS5 -= go[20] * *cnV[20];
+	m_A13 += gt[21];
+	m_A13 += gt[22];
 	m_A13 += gt[23];
-	m_A13 += gt[24];
-	m_A13 += gt[25];
-	m_A14 += go[23];
-	double RHS6 = Idr[23];
-	RHS6 += Idr[24];
-	RHS6 += Idr[25];
-	RHS6 -= go[24] * *cnV[24];
-	RHS6 -= go[25] * *cnV[25];
-	m_A15 += gt[26];
-	m_A15 += gt[27];
-	m_A16 += go[26];
-	double RHS7 = Idr[26];
-	RHS7 += Idr[27];
-	RHS7 -= go[27] * *cnV[27];
-	m_A17 += gt[28];
-	m_A17 += gt[29];
-	m_A17 += gt[30];
-	m_A17 += gt[31];
+	m_A14 += go[21];
+	m_A12 += go[22];
+	double RHS6 = Idr[21];
+	RHS6 += Idr[22];
+	RHS6 += Idr[23];
+	RHS6 -= go[23] * *cnV[23];
+	m_A16 += gt[24];
+	m_A16 += gt[25];
+	m_A16 += gt[26];
+	m_A15 += go[24];
+	m_A17 += go[25];
+	double RHS7 = Idr[24];
+	RHS7 += Idr[25];
+	RHS7 += Idr[26];
+	RHS7 -= go[26] * *cnV[26];
+	m_A19 += gt[27];
+	m_A19 += gt[28];
+	m_A19 += gt[29];
+	m_A19 += gt[30];
+	m_A20 += go[27];
 	m_A18 += go[28];
-	double RHS8 = Idr[28];
+	double RHS8 = Idr[27];
+	RHS8 += Idr[28];
 	RHS8 += Idr[29];
 	RHS8 += Idr[30];
-	RHS8 += Idr[31];
 	RHS8 -= go[29] * *cnV[29];
 	RHS8 -= go[30] * *cnV[30];
-	RHS8 -= go[31] * *cnV[31];
-	m_A20 += gt[32];
-	m_A20 += gt[33];
-	m_A19 += go[32];
-	double RHS9 = Idr[32];
-	RHS9 += Idr[33];
-	RHS9 -= go[33] * *cnV[33];
-	m_A22 += gt[34];
-	m_A22 += gt[35];
-	m_A22 += gt[36];
-	m_A22 += gt[37];
-	m_A21 += go[34];
-	m_A23 += go[35];
-	double RHS10 = Idr[34];
-	RHS10 += Idr[35];
-	RHS10 += Idr[36];
-	RHS10 += Idr[37];
-	RHS10 -= go[36] * *cnV[36];
-	RHS10 -= go[37] * *cnV[37];
-	m_A27 += gt[38];
-	m_A27 += gt[39];
-	m_A27 += gt[40];
-	m_A27 += gt[41];
-	m_A27 += gt[42];
-	m_A24 += go[38];
-	m_A25 += go[39];
-	m_A28 += go[40];
-	double RHS11 = Idr[38];
-	RHS11 += Idr[39];
-	RHS11 += Idr[40];
-	RHS11 += Idr[41];
-	RHS11 += Idr[42];
-	RHS11 -= go[41] * *cnV[41];
-	RHS11 -= go[42] * *cnV[42];
-	m_A32 += gt[43];
-	m_A32 += gt[44];
-	m_A31 += go[43];
-	m_A30 += go[44];
-	double RHS12 = Idr[43];
-	RHS12 += Idr[44];
-	m_A34 += gt[45];
-	m_A34 += gt[46];
-	m_A34 += gt[47];
-	m_A34 += gt[48];
-	m_A34 += gt[49];
-	m_A34 += gt[50];
-	m_A33 += go[45];
-	m_A37 += go[46];
-	m_A36 += go[47];
-	double RHS13 = Idr[45];
-	RHS13 += Idr[46];
-	RHS13 += Idr[47];
-	RHS13 += Idr[48];
-	RHS13 += Idr[49];
-	RHS13 += Idr[50];
-	RHS13 -= go[48] * *cnV[48];
-	RHS13 -= go[49] * *cnV[49];
-	RHS13 -= go[50] * *cnV[50];
-	m_A39 += gt[51];
-	m_A39 += gt[52];
-	m_A39 += gt[53];
-	m_A39 += gt[54];
-	m_A40 += go[51];
-	m_A38 += go[52];
-	double RHS14 = Idr[51];
-	RHS14 += Idr[52];
-	RHS14 += Idr[53];
-	RHS14 += Idr[54];
-	RHS14 -= go[53] * *cnV[53];
-	RHS14 -= go[54] * *cnV[54];
-	m_A46 += gt[55];
-	m_A46 += gt[56];
-	m_A46 += gt[57];
-	m_A46 += gt[58];
-	m_A46 += gt[59];
-	m_A44 += go[55];
-	m_A45 += go[56];
-	m_A43 += go[57];
-	m_A42 += go[58];
-	m_A41 += go[59];
-	double RHS15 = Idr[55];
-	RHS15 += Idr[56];
-	RHS15 += Idr[57];
-	RHS15 += Idr[58];
-	RHS15 += Idr[59];
-	m_A53 += gt[60];
-	m_A53 += gt[61];
-	m_A53 += gt[62];
-	m_A53 += gt[63];
-	m_A50 += go[60];
-	m_A54 += go[61];
-	m_A48 += go[62];
-	double RHS16 = Idr[60];
-	RHS16 += Idr[61];
-	RHS16 += Idr[62];
-	RHS16 += Idr[63];
-	RHS16 -= go[63] * *cnV[63];
-	m_A61 += gt[64];
-	m_A61 += gt[65];
-	m_A61 += gt[66];
-	m_A61 += gt[67];
-	m_A61 += gt[68];
-	m_A57 += go[64];
-	m_A58 += go[65];
-	m_A60 += go[66];
-	m_A55 += go[67];
-	m_A56 += go[68];
-	double RHS17 = Idr[64];
-	RHS17 += Idr[65];
-	RHS17 += Idr[66];
-	RHS17 += Idr[67];
-	RHS17 += Idr[68];
-	const double f0 = 1.0 / m_A0;
-	const double f0_9 = -f0 * m_A19;
-	m_A20 += m_A1 * f0_9;
-	RHS9 += f0_9 * RHS0;
-	const double f0_15 = -f0 * m_A41;
-	m_A44 += m_A1 * f0_15;
-	RHS15 += f0_15 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_10 = -f1 * m_A21;
-	m_A23 += m_A3 * f1_10;
-	RHS10 += f1_10 * RHS1;
-	const double f1_15 = -f1 * m_A42;
-	m_A46 += m_A3 * f1_15;
-	RHS15 += f1_15 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_15 = -f2 * m_A43;
-	m_A46 += m_A5 * f2_15;
-	RHS15 += f2_15 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_11 = -f3 * m_A24;
-	m_A26 += m_A7 * f3_11;
-	RHS11 += f3_11 * RHS3;
-	const double f4 = 1.0 / m_A8;
-	const double f4_13 = -f4 * m_A33;
-	m_A35 += m_A9 * f4_13;
-	RHS13 += f4_13 * RHS4;
-	const double f5 = 1.0 / m_A10;
-	const double f5_11 = -f5 * m_A25;
-	m_A27 += m_A11 * f5_11;
-	m_A29 += m_A12 * f5_11;
-	RHS11 += f5_11 * RHS5;
-	const double f5_16 = -f5 * m_A48;
-	m_A49 += m_A11 * f5_16;
-	m_A53 += m_A12 * f5_16;
-	RHS16 += f5_16 * RHS5;
-	const double f6 = 1.0 / m_A13;
-	const double f6_14 = -f6 * m_A38;
-	m_A40 += m_A14 * f6_14;
-	RHS14 += f6_14 * RHS6;
-	const double f6_17 = -f6 * m_A55;
-	m_A61 += m_A14 * f6_17;
-	RHS17 += f6_17 * RHS6;
-	const double f7 = 1.0 / m_A15;
-	const double f7_12 = -f7 * m_A30;
-	m_A32 += m_A16 * f7_12;
-	RHS12 += f7_12 * RHS7;
-	const double f7_17 = -f7 * m_A56;
-	m_A57 += m_A16 * f7_17;
-	RHS17 += f7_17 * RHS7;
-	const double f8 = 1.0 / m_A17;
-	const double f8_12 = -f8 * m_A31;
-	m_A32 += m_A18 * f8_12;
-	RHS12 += f8_12 * RHS8;
-	const double f9 = 1.0 / m_A20;
-	const double f9_15 = -f9 * m_A44;
-	RHS15 += f9_15 * RHS9;
-	const double f10 = 1.0 / m_A22;
-	const double f10_11 = -f10 * m_A26;
-	m_A28 += m_A23 * f10_11;
-	RHS11 += f10_11 * RHS10;
-	const double f11 = 1.0 / m_A27;
-	const double f11_15 = -f11 * m_A45;
-	m_A46 += m_A28 * f11_15;
-	m_A47 += m_A29 * f11_15;
-	RHS15 += f11_15 * RHS11;
-	const double f11_16 = -f11 * m_A49;
-	m_A52 += m_A28 * f11_16;
-	m_A53 += m_A29 * f11_16;
-	RHS16 += f11_16 * RHS11;
-	const double f12 = 1.0 / m_A32;
-	const double f12_17 = -f12 * m_A57;
-	RHS17 += f12_17 * RHS12;
-	const double f13 = 1.0 / m_A34;
-	const double f13_16 = -f13 * m_A50;
-	m_A51 += m_A35 * f13_16;
-	m_A53 += m_A36 * f13_16;
-	m_A54 += m_A37 * f13_16;
-	RHS16 += f13_16 * RHS13;
-	const double f13_17 = -f13 * m_A58;
-	m_A59 += m_A35 * f13_17;
-	m_A60 += m_A36 * f13_17;
-	m_A61 += m_A37 * f13_17;
-	RHS17 += f13_17 * RHS13;
-	const double f14 = 1.0 / m_A39;
-	const double f14_16 = -f14 * m_A51;
-	m_A54 += m_A40 * f14_16;
-	RHS16 += f14_16 * RHS14;
-	const double f14_17 = -f14 * m_A59;
-	m_A61 += m_A40 * f14_17;
-	RHS17 += f14_17 * RHS14;
-	const double f15 = 1.0 / m_A46;
-	const double f15_16 = -f15 * m_A52;
-	m_A53 += m_A47 * f15_16;
-	RHS16 += f15_16 * RHS15;
-	const double f16 = 1.0 / m_A53;
-	const double f16_17 = -f16 * m_A60;
-	m_A61 += m_A54 * f16_17;
-	RHS17 += f16_17 * RHS16;
-	V[17] = RHS17 / m_A61;
-	double tmp16 = 0.0;
-	tmp16 += m_A54 * V[17];
-	V[16] = (RHS16 - tmp16) / m_A53;
-	double tmp15 = 0.0;
-	tmp15 += m_A47 * V[16];
-	V[15] = (RHS15 - tmp15) / m_A46;
-	double tmp14 = 0.0;
-	tmp14 += m_A40 * V[17];
-	V[14] = (RHS14 - tmp14) / m_A39;
-	double tmp13 = 0.0;
-	tmp13 += m_A35 * V[14];
-	tmp13 += m_A36 * V[16];
-	tmp13 += m_A37 * V[17];
-	V[13] = (RHS13 - tmp13) / m_A34;
-	double tmp12 = 0.0;
-	V[12] = (RHS12 - tmp12) / m_A32;
-	double tmp11 = 0.0;
-	tmp11 += m_A28 * V[15];
-	tmp11 += m_A29 * V[16];
-	V[11] = (RHS11 - tmp11) / m_A27;
+	m_A24 += gt[31];
+	m_A24 += gt[32];
+	m_A24 += gt[33];
+	m_A24 += gt[34];
+	m_A24 += gt[35];
+	m_A23 += go[31];
+	m_A26 += go[32];
+	m_A25 += go[33];
+	m_A22 += go[34];
+	m_A21 += go[35];
+	double RHS9 = Idr[31];
+	RHS9 += Idr[32];
+	RHS9 += Idr[33];
+	RHS9 += Idr[34];
+	RHS9 += Idr[35];
+	m_A29 += gt[36];
+	m_A29 += gt[37];
+	m_A28 += go[36];
+	m_A27 += go[37];
+	double RHS10 = Idr[36];
+	RHS10 += Idr[37];
+	m_A35 += gt[38];
+	m_A35 += gt[39];
+	m_A35 += gt[40];
+	m_A35 += gt[41];
+	m_A35 += gt[42];
+	m_A30 += go[38];
+	m_A31 += go[39];
+	m_A33 += go[40];
+	double RHS11 = Idr[38];
+	RHS11 += Idr[39];
+	RHS11 += Idr[40];
+	RHS11 += Idr[41];
+	RHS11 += Idr[42];
+	RHS11 -= go[41] * *cnV[41];
+	RHS11 -= go[42] * *cnV[42];
+	const double f0 = 1.0 / m_A0;
+	const double f0_11 = -f0 * m_A30;
+	m_A32 += m_A1 * f0_11;
+	RHS11 += f0_11 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_6 = -f1 * m_A12;
+	m_A13 += m_A3 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_9 = -f2 * m_A21;
+	m_A25 += m_A5 * f2_9;
+	RHS9 += f2_9 * RHS2;
+	const double f2_10 = -f2 * m_A27;
+	m_A29 += m_A5 * f2_10;
+	RHS10 += f2_10 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_8 = -f3 * m_A18;
+	m_A20 += m_A7 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f3_9 = -f3 * m_A22;
+	m_A24 += m_A7 * f3_9;
+	RHS9 += f3_9 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_7 = -f4 * m_A15;
+	m_A16 += m_A9 * f4_7;
+	RHS7 += f4_7 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_9 = -f5 * m_A23;
+	m_A24 += m_A11 * f5_9;
+	RHS9 += f5_9 * RHS5;
+	const double f6 = 1.0 / m_A13;
+	const double f6_10 = -f6 * m_A28;
+	m_A29 += m_A14 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f7 = 1.0 / m_A16;
+	const double f7_11 = -f7 * m_A31;
+	m_A35 += m_A17 * f7_11;
+	RHS11 += f7_11 * RHS7;
+	const double f8 = 1.0 / m_A19;
+	const double f8_11 = -f8 * m_A32;
+	m_A33 += m_A20 * f8_11;
+	RHS11 += f8_11 * RHS8;
+	const double f9 = 1.0 / m_A24;
+	const double f9_11 = -f9 * m_A33;
+	m_A34 += m_A25 * f9_11;
+	m_A35 += m_A26 * f9_11;
+	RHS11 += f9_11 * RHS9;
+	const double f10 = 1.0 / m_A29;
+	const double f10_11 = -f10 * m_A34;
+	RHS11 += f10_11 * RHS10;
+	V[11] = RHS11 / m_A35;
 	double tmp10 = 0.0;
-	tmp10 += m_A23 * V[15];
-	V[10] = (RHS10 - tmp10) / m_A22;
+	V[10] = (RHS10 - tmp10) / m_A29;
 	double tmp9 = 0.0;
-	V[9] = (RHS9 - tmp9) / m_A20;
+	tmp9 += m_A25 * V[10];
+	tmp9 += m_A26 * V[11];
+	V[9] = (RHS9 - tmp9) / m_A24;
 	double tmp8 = 0.0;
-	tmp8 += m_A18 * V[12];
-	V[8] = (RHS8 - tmp8) / m_A17;
+	tmp8 += m_A20 * V[9];
+	V[8] = (RHS8 - tmp8) / m_A19;
 	double tmp7 = 0.0;
-	tmp7 += m_A16 * V[12];
-	V[7] = (RHS7 - tmp7) / m_A15;
+	tmp7 += m_A17 * V[11];
+	V[7] = (RHS7 - tmp7) / m_A16;
 	double tmp6 = 0.0;
-	tmp6 += m_A14 * V[17];
+	tmp6 += m_A14 * V[10];
 	V[6] = (RHS6 - tmp6) / m_A13;
 	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[11];
-	tmp5 += m_A12 * V[16];
+	tmp5 += m_A11 * V[9];
 	V[5] = (RHS5 - tmp5) / m_A10;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[14];
+	tmp4 += m_A9 * V[7];
 	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[10];
+	tmp3 += m_A7 * V[9];
 	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[15];
+	tmp2 += m_A5 * V[10];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[15];
-	V[1] = (RHS1 - tmp1) / m_A2;
-	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[9];
-	V[0] = (RHS0 - tmp0) / m_A0;
-}
-
-// pongf
-static void nl_gcr_cd4de579d34fc1d9_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
-
-{
-
-	double m_A0(0.0);
-	double m_A1(0.0);
-	double m_A2(0.0);
-	double m_A3(0.0);
-	double m_A4(0.0);
-	double m_A5(0.0);
-	double m_A6(0.0);
-	m_A0 += gt[0];
-	m_A0 += gt[1];
-	m_A0 += gt[2];
-	m_A1 += go[0];
-	double RHS0 = Idr[0];
-	RHS0 += Idr[1];
-	RHS0 += Idr[2];
-	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 -= go[4] * *cnV[4];
-	m_A6 += gt[5];
-	m_A6 += gt[6];
-	m_A6 += gt[7];
-	m_A5 += go[5];
-	m_A4 += go[6];
-	double RHS2 = Idr[5];
-	RHS2 += Idr[6];
-	RHS2 += Idr[7];
-	RHS2 -= go[7] * *cnV[7];
-	const double f0 = 1.0 / m_A0;
-	const double f0_2 = -f0 * m_A4;
-	m_A6 += m_A1 * f0_2;
-	RHS2 += f0_2 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_2 = -f1 * m_A5;
-	m_A6 += m_A3 * f1_2;
-	RHS2 += f1_2 * RHS1;
-	V[2] = RHS2 / m_A6;
-	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[2];
+	tmp1 += m_A3 * V[6];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[2];
+	tmp0 += m_A1 * V[8];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// dpatrol
-static void nl_gcr_cffc52225ebcec8f_20_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// sundance
+static void nl_gcr_e02a162cb515a958_100_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -14285,133 +59003,767 @@
 	double m_A17(0.0);
 	double m_A18(0.0);
 	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
 	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
 	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
 	RHS0 -= go[1] * *cnV[1];
 	RHS0 -= go[2] * *cnV[2];
 	RHS0 -= go[3] * *cnV[3];
-	m_A2 += gt[4];
-	m_A3 += go[4];
-	double RHS1 = Idr[4];
-	m_A4 += gt[5];
-	m_A4 += gt[6];
-	m_A4 += gt[7];
-	m_A4 += gt[8];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A3 += go[7];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 -= go[8] * *cnV[8];
 	m_A4 += gt[9];
-	m_A6 += go[5];
-	m_A5 += go[6];
-	double RHS2 = Idr[5];
-	RHS2 += Idr[6];
-	RHS2 += Idr[7];
-	RHS2 += Idr[8];
-	RHS2 += Idr[9];
-	RHS2 -= go[7] * *cnV[7];
-	RHS2 -= go[8] * *cnV[8];
-	RHS2 -= go[9] * *cnV[9];
-	m_A8 += gt[10];
-	m_A8 += gt[11];
-	m_A8 += gt[12];
-	m_A8 += gt[13];
-	m_A8 += gt[14];
-	m_A8 += gt[15];
-	m_A8 += gt[16];
-	m_A10 += go[10];
-	m_A9 += go[11];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A5 += go[9];
+	double RHS2 = Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A6 += gt[16];
+	m_A6 += gt[17];
+	m_A6 += gt[18];
 	m_A7 += go[12];
-	double RHS3 = Idr[10];
-	RHS3 += Idr[11];
-	RHS3 += Idr[12];
+	double RHS3 = Idr[12];
 	RHS3 += Idr[13];
 	RHS3 += Idr[14];
 	RHS3 += Idr[15];
 	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
 	RHS3 -= go[13] * *cnV[13];
 	RHS3 -= go[14] * *cnV[14];
 	RHS3 -= go[15] * *cnV[15];
 	RHS3 -= go[16] * *cnV[16];
-	m_A14 += gt[17];
-	m_A14 += gt[18];
-	m_A14 += gt[19];
-	m_A14 += gt[20];
-	m_A11 += go[17];
-	m_A12 += go[18];
-	m_A13 += go[19];
-	double RHS4 = Idr[17];
-	RHS4 += Idr[18];
-	RHS4 += Idr[19];
+	RHS3 -= go[17] * *cnV[17];
+	RHS3 -= go[18] * *cnV[18];
+	m_A8 += gt[19];
+	m_A8 += gt[20];
+	m_A8 += gt[21];
+	m_A8 += gt[22];
+	m_A8 += gt[23];
+	m_A8 += gt[24];
+	m_A8 += gt[25];
+	m_A9 += go[19];
+	double RHS4 = Idr[19];
 	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 += Idr[25];
 	RHS4 -= go[20] * *cnV[20];
-	m_A19 += gt[21];
-	m_A19 += gt[22];
-	m_A19 += gt[23];
-	m_A16 += go[21];
-	m_A17 += go[22];
-	double RHS5 = Idr[21];
-	RHS5 += Idr[22];
-	RHS5 += Idr[23];
-	RHS5 -= go[23] * *cnV[23];
+	RHS4 -= go[21] * *cnV[21];
+	RHS4 -= go[22] * *cnV[22];
+	RHS4 -= go[23] * *cnV[23];
+	RHS4 -= go[24] * *cnV[24];
+	RHS4 -= go[25] * *cnV[25];
+	m_A10 += gt[26];
+	m_A10 += gt[27];
+	m_A11 += go[26];
+	double RHS5 = Idr[26];
+	RHS5 += Idr[27];
+	RHS5 -= go[27] * *cnV[27];
+	m_A12 += gt[28];
+	m_A12 += gt[29];
+	m_A13 += go[28];
+	double RHS6 = Idr[28];
+	RHS6 += Idr[29];
+	RHS6 -= go[29] * *cnV[29];
+	m_A14 += gt[30];
+	m_A14 += gt[31];
+	m_A15 += go[30];
+	double RHS7 = Idr[30];
+	RHS7 += Idr[31];
+	RHS7 -= go[31] * *cnV[31];
+	m_A16 += gt[32];
+	m_A16 += gt[33];
+	m_A16 += gt[34];
+	m_A16 += gt[35];
+	m_A18 += go[32];
+	m_A17 += go[33];
+	m_A17 += go[34];
+	double RHS8 = Idr[32];
+	RHS8 += Idr[33];
+	RHS8 += Idr[34];
+	RHS8 += Idr[35];
+	RHS8 -= go[35] * *cnV[35];
+	m_A19 += gt[36];
+	m_A19 += gt[37];
+	m_A19 += gt[38];
+	m_A20 += go[36];
+	double RHS9 = Idr[36];
+	RHS9 += Idr[37];
+	RHS9 += Idr[38];
+	RHS9 -= go[37] * *cnV[37];
+	RHS9 -= go[38] * *cnV[38];
+	m_A21 += gt[39];
+	m_A21 += gt[40];
+	m_A21 += gt[41];
+	m_A22 += go[39];
+	double RHS10 = Idr[39];
+	RHS10 += Idr[40];
+	RHS10 += Idr[41];
+	RHS10 -= go[40] * *cnV[40];
+	RHS10 -= go[41] * *cnV[41];
+	m_A23 += gt[42];
+	m_A23 += gt[43];
+	m_A23 += gt[44];
+	m_A23 += gt[45];
+	m_A24 += go[42];
+	m_A25 += go[43];
+	m_A25 += go[44];
+	double RHS11 = Idr[42];
+	RHS11 += Idr[43];
+	RHS11 += Idr[44];
+	RHS11 += Idr[45];
+	RHS11 -= go[45] * *cnV[45];
+	m_A27 += gt[46];
+	m_A27 += gt[47];
+	m_A26 += go[46];
+	double RHS12 = Idr[46];
+	RHS12 += Idr[47];
+	RHS12 -= go[47] * *cnV[47];
+	m_A29 += gt[48];
+	m_A29 += gt[49];
+	m_A29 += gt[50];
+	m_A29 += gt[51];
+	m_A28 += go[48];
+	m_A30 += go[49];
+	double RHS13 = Idr[48];
+	RHS13 += Idr[49];
+	RHS13 += Idr[50];
+	RHS13 += Idr[51];
+	RHS13 -= go[50] * *cnV[50];
+	RHS13 -= go[51] * *cnV[51];
+	m_A31 += gt[52];
+	m_A31 += gt[53];
+	m_A31 += gt[54];
+	m_A32 += go[52];
+	double RHS14 = Idr[52];
+	RHS14 += Idr[53];
+	RHS14 += Idr[54];
+	RHS14 -= go[53] * *cnV[53];
+	RHS14 -= go[54] * *cnV[54];
+	m_A34 += gt[55];
+	m_A34 += gt[56];
+	m_A35 += go[55];
+	m_A33 += go[56];
+	double RHS15 = Idr[55];
+	RHS15 += Idr[56];
+	m_A38 += gt[57];
+	m_A38 += gt[58];
+	m_A38 += gt[59];
+	m_A39 += go[57];
+	m_A37 += go[58];
+	m_A36 += go[59];
+	double RHS16 = Idr[57];
+	RHS16 += Idr[58];
+	RHS16 += Idr[59];
+	m_A41 += gt[60];
+	m_A41 += gt[61];
+	m_A41 += gt[62];
+	m_A41 += gt[63];
+	m_A41 += gt[64];
+	m_A41 += gt[65];
+	m_A41 += gt[66];
+	m_A41 += gt[67];
+	m_A42 += go[60];
+	m_A42 += go[61];
+	m_A43 += go[62];
+	m_A43 += go[63];
+	m_A40 += go[64];
+	m_A40 += go[65];
+	double RHS17 = Idr[60];
+	RHS17 += Idr[61];
+	RHS17 += Idr[62];
+	RHS17 += Idr[63];
+	RHS17 += Idr[64];
+	RHS17 += Idr[65];
+	RHS17 += Idr[66];
+	RHS17 += Idr[67];
+	RHS17 -= go[66] * *cnV[66];
+	RHS17 -= go[67] * *cnV[67];
+	m_A46 += gt[68];
+	m_A46 += gt[69];
+	m_A46 += gt[70];
+	m_A46 += gt[71];
+	m_A44 += go[68];
+	m_A48 += go[69];
+	double RHS18 = Idr[68];
+	RHS18 += Idr[69];
+	RHS18 += Idr[70];
+	RHS18 += Idr[71];
+	RHS18 -= go[70] * *cnV[70];
+	RHS18 -= go[71] * *cnV[71];
+	m_A52 += gt[72];
+	m_A52 += gt[73];
+	m_A52 += gt[74];
+	m_A52 += gt[75];
+	m_A50 += go[72];
+	m_A51 += go[73];
+	m_A51 += go[74];
+	m_A49 += go[75];
+	double RHS19 = Idr[72];
+	RHS19 += Idr[73];
+	RHS19 += Idr[74];
+	RHS19 += Idr[75];
+	m_A55 += gt[76];
+	m_A55 += gt[77];
+	m_A55 += gt[78];
+	m_A55 += gt[79];
+	m_A56 += go[76];
+	m_A54 += go[77];
+	double RHS20 = Idr[76];
+	RHS20 += Idr[77];
+	RHS20 += Idr[78];
+	RHS20 += Idr[79];
+	RHS20 -= go[78] * *cnV[78];
+	RHS20 -= go[79] * *cnV[79];
+	m_A60 += gt[80];
+	m_A60 += gt[81];
+	m_A60 += gt[82];
+	m_A60 += gt[83];
+	m_A60 += gt[84];
+	m_A62 += go[80];
+	m_A59 += go[81];
+	m_A58 += go[82];
+	m_A57 += go[83];
+	double RHS21 = Idr[80];
+	RHS21 += Idr[81];
+	RHS21 += Idr[82];
+	RHS21 += Idr[83];
+	RHS21 += Idr[84];
+	RHS21 -= go[84] * *cnV[84];
+	m_A64 += gt[85];
+	m_A64 += gt[86];
+	m_A64 += gt[87];
+	m_A64 += gt[88];
+	m_A65 += go[85];
+	m_A63 += go[86];
+	double RHS22 = Idr[85];
+	RHS22 += Idr[86];
+	RHS22 += Idr[87];
+	RHS22 += Idr[88];
+	RHS22 -= go[87] * *cnV[87];
+	RHS22 -= go[88] * *cnV[88];
+	m_A69 += gt[89];
+	m_A69 += gt[90];
+	m_A69 += gt[91];
+	m_A69 += gt[92];
+	m_A68 += go[89];
+	m_A70 += go[90];
+	m_A67 += go[91];
+	m_A66 += go[92];
+	double RHS23 = Idr[89];
+	RHS23 += Idr[90];
+	RHS23 += Idr[91];
+	RHS23 += Idr[92];
+	m_A77 += gt[93];
+	m_A77 += gt[94];
+	m_A77 += gt[95];
+	m_A77 += gt[96];
+	m_A77 += gt[97];
+	m_A77 += gt[98];
+	m_A71 += go[93];
+	m_A72 += go[94];
+	m_A73 += go[95];
+	m_A76 += go[96];
+	double RHS24 = Idr[93];
+	RHS24 += Idr[94];
+	RHS24 += Idr[95];
+	RHS24 += Idr[96];
+	RHS24 += Idr[97];
+	RHS24 += Idr[98];
+	RHS24 -= go[97] * *cnV[97];
+	RHS24 -= go[98] * *cnV[98];
+	m_A82 += gt[99];
+	m_A82 += gt[100];
+	m_A82 += gt[101];
+	m_A82 += gt[102];
+	m_A82 += gt[103];
+	m_A82 += gt[104];
+	m_A82 += gt[105];
+	m_A82 += gt[106];
+	m_A80 += go[99];
+	m_A80 += go[100];
+	m_A79 += go[101];
+	m_A83 += go[102];
+	m_A83 += go[103];
+	double RHS25 = Idr[99];
+	RHS25 += Idr[100];
+	RHS25 += Idr[101];
+	RHS25 += Idr[102];
+	RHS25 += Idr[103];
+	RHS25 += Idr[104];
+	RHS25 += Idr[105];
+	RHS25 += Idr[106];
+	RHS25 -= go[104] * *cnV[104];
+	RHS25 -= go[105] * *cnV[105];
+	RHS25 -= go[106] * *cnV[106];
+	m_A90 += gt[107];
+	m_A90 += gt[108];
+	m_A90 += gt[109];
+	m_A90 += gt[110];
+	m_A90 += gt[111];
+	m_A91 += go[107];
+	m_A86 += go[108];
+	m_A87 += go[109];
+	m_A85 += go[110];
+	m_A84 += go[111];
+	double RHS26 = Idr[107];
+	RHS26 += Idr[108];
+	RHS26 += Idr[109];
+	RHS26 += Idr[110];
+	RHS26 += Idr[111];
+	m_A99 += gt[112];
+	m_A99 += gt[113];
+	m_A99 += gt[114];
+	m_A99 += gt[115];
+	m_A99 += gt[116];
+	m_A99 += gt[117];
+	m_A99 += gt[118];
+	m_A99 += gt[119];
+	m_A99 += gt[120];
+	m_A92 += go[112];
+	m_A93 += go[113];
+	m_A93 += go[114];
+	m_A97 += go[115];
+	m_A97 += go[116];
+	m_A94 += go[117];
+	m_A98 += go[118];
+	double RHS27 = Idr[112];
+	RHS27 += Idr[113];
+	RHS27 += Idr[114];
+	RHS27 += Idr[115];
+	RHS27 += Idr[116];
+	RHS27 += Idr[117];
+	RHS27 += Idr[118];
+	RHS27 += Idr[119];
+	RHS27 += Idr[120];
+	RHS27 -= go[119] * *cnV[119];
+	RHS27 -= go[120] * *cnV[120];
 	const double f0 = 1.0 / m_A0;
-	const double f0_3 = -f0 * m_A7;
-	m_A8 += m_A1 * f0_3;
-	RHS3 += f0_3 * RHS0;
+	const double f0_27 = -f0 * m_A92;
+	m_A95 += m_A1 * f0_27;
+	RHS27 += f0_27 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_4 = -f1 * m_A11;
-	m_A14 += m_A3 * f1_4;
-	RHS4 += f1_4 * RHS1;
+	const double f1_12 = -f1 * m_A26;
+	m_A27 += m_A3 * f1_12;
+	RHS12 += f1_12 * RHS1;
+	const double f1_23 = -f1 * m_A66;
+	m_A68 += m_A3 * f1_23;
+	RHS23 += f1_23 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_4 = -f2 * m_A12;
-	m_A14 += m_A5 * f2_4;
-	m_A15 += m_A6 * f2_4;
-	RHS4 += f2_4 * RHS2;
-	const double f2_5 = -f2 * m_A16;
-	m_A18 += m_A5 * f2_5;
-	m_A19 += m_A6 * f2_5;
-	RHS5 += f2_5 * RHS2;
-	const double f3 = 1.0 / m_A8;
-	const double f3_4 = -f3 * m_A13;
-	m_A14 += m_A9 * f3_4;
-	m_A15 += m_A10 * f3_4;
-	RHS4 += f3_4 * RHS3;
-	const double f3_5 = -f3 * m_A17;
-	m_A18 += m_A9 * f3_5;
-	m_A19 += m_A10 * f3_5;
-	RHS5 += f3_5 * RHS3;
-	const double f4 = 1.0 / m_A14;
-	const double f4_5 = -f4 * m_A18;
-	m_A19 += m_A15 * f4_5;
-	RHS5 += f4_5 * RHS4;
-	V[5] = RHS5 / m_A19;
+	const double f2_13 = -f2 * m_A28;
+	m_A30 += m_A5 * f2_13;
+	RHS13 += f2_13 * RHS2;
+	const double f2_23 = -f2 * m_A67;
+	m_A69 += m_A5 * f2_23;
+	RHS23 += f2_23 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_18 = -f3 * m_A44;
+	m_A45 += m_A7 * f3_18;
+	RHS18 += f3_18 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_24 = -f4 * m_A71;
+	m_A74 += m_A9 * f4_24;
+	RHS24 += f4_24 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_16 = -f5 * m_A36;
+	m_A38 += m_A11 * f5_16;
+	RHS16 += f5_16 * RHS5;
+	const double f5_21 = -f5 * m_A57;
+	m_A59 += m_A11 * f5_21;
+	RHS21 += f5_21 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_15 = -f6 * m_A33;
+	m_A34 += m_A13 * f6_15;
+	RHS15 += f6_15 * RHS6;
+	const double f6_26 = -f6 * m_A84;
+	m_A86 += m_A13 * f6_26;
+	RHS26 += f6_26 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_16 = -f7 * m_A37;
+	m_A38 += m_A15 * f7_16;
+	RHS16 += f7_16 * RHS7;
+	const double f8 = 1.0 / m_A16;
+	const double f8_17 = -f8 * m_A40;
+	m_A41 += m_A17 * f8_17;
+	m_A42 += m_A18 * f8_17;
+	RHS17 += f8_17 * RHS8;
+	const double f8_19 = -f8 * m_A49;
+	m_A51 += m_A17 * f8_19;
+	m_A52 += m_A18 * f8_19;
+	RHS19 += f8_19 * RHS8;
+	const double f9 = 1.0 / m_A19;
+	const double f9_19 = -f9 * m_A50;
+	m_A52 += m_A20 * f9_19;
+	RHS19 += f9_19 * RHS9;
+	const double f10 = 1.0 / m_A21;
+	const double f10_22 = -f10 * m_A63;
+	m_A65 += m_A22 * f10_22;
+	RHS22 += f10_22 * RHS10;
+	const double f10_26 = -f10 * m_A85;
+	m_A90 += m_A22 * f10_26;
+	RHS26 += f10_26 * RHS10;
+	const double f11 = 1.0 / m_A23;
+	const double f11_25 = -f11 * m_A79;
+	m_A82 += m_A24 * f11_25;
+	m_A83 += m_A25 * f11_25;
+	RHS25 += f11_25 * RHS11;
+	const double f11_27 = -f11 * m_A93;
+	m_A97 += m_A24 * f11_27;
+	m_A99 += m_A25 * f11_27;
+	RHS27 += f11_27 * RHS11;
+	const double f12 = 1.0 / m_A27;
+	const double f12_23 = -f12 * m_A68;
+	RHS23 += f12_23 * RHS12;
+	const double f13 = 1.0 / m_A29;
+	const double f13_18 = -f13 * m_A45;
+	m_A47 += m_A30 * f13_18;
+	RHS18 += f13_18 * RHS13;
+	const double f14 = 1.0 / m_A31;
+	const double f14_20 = -f14 * m_A54;
+	m_A56 += m_A32 * f14_20;
+	RHS20 += f14_20 * RHS14;
+	const double f14_21 = -f14 * m_A58;
+	m_A60 += m_A32 * f14_21;
+	RHS21 += f14_21 * RHS14;
+	const double f15 = 1.0 / m_A34;
+	const double f15_24 = -f15 * m_A72;
+	m_A77 += m_A35 * f15_24;
+	RHS24 += f15_24 * RHS15;
+	const double f15_26 = -f15 * m_A86;
+	m_A89 += m_A35 * f15_26;
+	RHS26 += f15_26 * RHS15;
+	const double f16 = 1.0 / m_A38;
+	const double f16_21 = -f16 * m_A59;
+	m_A61 += m_A39 * f16_21;
+	RHS21 += f16_21 * RHS16;
+	const double f16_24 = -f16 * m_A73;
+	m_A77 += m_A39 * f16_24;
+	RHS24 += f16_24 * RHS16;
+	const double f17 = 1.0 / m_A41;
+	const double f17_19 = -f17 * m_A51;
+	m_A52 += m_A42 * f17_19;
+	m_A53 += m_A43 * f17_19;
+	RHS19 += f17_19 * RHS17;
+	const double f17_25 = -f17 * m_A80;
+	m_A81 += m_A42 * f17_25;
+	m_A82 += m_A43 * f17_25;
+	RHS25 += f17_25 * RHS17;
+	const double f18 = 1.0 / m_A46;
+	const double f18_26 = -f18 * m_A87;
+	m_A88 += m_A47 * f18_26;
+	m_A90 += m_A48 * f18_26;
+	RHS26 += f18_26 * RHS18;
+	const double f19 = 1.0 / m_A52;
+	const double f19_25 = -f19 * m_A81;
+	m_A82 += m_A53 * f19_25;
+	RHS25 += f19_25 * RHS19;
+	const double f20 = 1.0 / m_A55;
+	const double f20_24 = -f20 * m_A74;
+	m_A75 += m_A56 * f20_24;
+	RHS24 += f20_24 * RHS20;
+	const double f21 = 1.0 / m_A60;
+	const double f21_24 = -f21 * m_A75;
+	m_A77 += m_A61 * f21_24;
+	m_A78 += m_A62 * f21_24;
+	RHS24 += f21_24 * RHS21;
+	const double f21_27 = -f21 * m_A94;
+	m_A96 += m_A61 * f21_27;
+	m_A99 += m_A62 * f21_27;
+	RHS27 += f21_27 * RHS21;
+	const double f22 = 1.0 / m_A64;
+	const double f22_27 = -f22 * m_A95;
+	m_A98 += m_A65 * f22_27;
+	RHS27 += f22_27 * RHS22;
+	const double f23 = 1.0 / m_A69;
+	const double f23_24 = -f23 * m_A76;
+	m_A77 += m_A70 * f23_24;
+	RHS24 += f23_24 * RHS23;
+	const double f23_26 = -f23 * m_A88;
+	m_A89 += m_A70 * f23_26;
+	RHS26 += f23_26 * RHS23;
+	const double f24 = 1.0 / m_A77;
+	const double f24_26 = -f24 * m_A89;
+	m_A91 += m_A78 * f24_26;
+	RHS26 += f24_26 * RHS24;
+	const double f24_27 = -f24 * m_A96;
+	m_A99 += m_A78 * f24_27;
+	RHS27 += f24_27 * RHS24;
+	const double f25 = 1.0 / m_A82;
+	const double f25_27 = -f25 * m_A97;
+	m_A99 += m_A83 * f25_27;
+	RHS27 += f25_27 * RHS25;
+	const double f26 = 1.0 / m_A90;
+	const double f26_27 = -f26 * m_A98;
+	m_A99 += m_A91 * f26_27;
+	RHS27 += f26_27 * RHS26;
+	V[27] = RHS27 / m_A99;
+	double tmp26 = 0.0;
+	tmp26 += m_A91 * V[27];
+	V[26] = (RHS26 - tmp26) / m_A90;
+	double tmp25 = 0.0;
+	tmp25 += m_A83 * V[27];
+	V[25] = (RHS25 - tmp25) / m_A82;
+	double tmp24 = 0.0;
+	tmp24 += m_A78 * V[27];
+	V[24] = (RHS24 - tmp24) / m_A77;
+	double tmp23 = 0.0;
+	tmp23 += m_A70 * V[24];
+	V[23] = (RHS23 - tmp23) / m_A69;
+	double tmp22 = 0.0;
+	tmp22 += m_A65 * V[26];
+	V[22] = (RHS22 - tmp22) / m_A64;
+	double tmp21 = 0.0;
+	tmp21 += m_A61 * V[24];
+	tmp21 += m_A62 * V[27];
+	V[21] = (RHS21 - tmp21) / m_A60;
+	double tmp20 = 0.0;
+	tmp20 += m_A56 * V[21];
+	V[20] = (RHS20 - tmp20) / m_A55;
+	double tmp19 = 0.0;
+	tmp19 += m_A53 * V[25];
+	V[19] = (RHS19 - tmp19) / m_A52;
+	double tmp18 = 0.0;
+	tmp18 += m_A47 * V[23];
+	tmp18 += m_A48 * V[26];
+	V[18] = (RHS18 - tmp18) / m_A46;
+	double tmp17 = 0.0;
+	tmp17 += m_A42 * V[19];
+	tmp17 += m_A43 * V[25];
+	V[17] = (RHS17 - tmp17) / m_A41;
+	double tmp16 = 0.0;
+	tmp16 += m_A39 * V[24];
+	V[16] = (RHS16 - tmp16) / m_A38;
+	double tmp15 = 0.0;
+	tmp15 += m_A35 * V[24];
+	V[15] = (RHS15 - tmp15) / m_A34;
+	double tmp14 = 0.0;
+	tmp14 += m_A32 * V[21];
+	V[14] = (RHS14 - tmp14) / m_A31;
+	double tmp13 = 0.0;
+	tmp13 += m_A30 * V[23];
+	V[13] = (RHS13 - tmp13) / m_A29;
+	double tmp12 = 0.0;
+	V[12] = (RHS12 - tmp12) / m_A27;
+	double tmp11 = 0.0;
+	tmp11 += m_A24 * V[25];
+	tmp11 += m_A25 * V[27];
+	V[11] = (RHS11 - tmp11) / m_A23;
+	double tmp10 = 0.0;
+	tmp10 += m_A22 * V[26];
+	V[10] = (RHS10 - tmp10) / m_A21;
+	double tmp9 = 0.0;
+	tmp9 += m_A20 * V[19];
+	V[9] = (RHS9 - tmp9) / m_A19;
+	double tmp8 = 0.0;
+	tmp8 += m_A17 * V[17];
+	tmp8 += m_A18 * V[19];
+	V[8] = (RHS8 - tmp8) / m_A16;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[16];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[15];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[16];
+	V[5] = (RHS5 - tmp5) / m_A10;
 	double tmp4 = 0.0;
-	tmp4 += m_A15 * V[5];
-	V[4] = (RHS4 - tmp4) / m_A14;
+	tmp4 += m_A9 * V[20];
+	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A9 * V[4];
-	tmp3 += m_A10 * V[5];
-	V[3] = (RHS3 - tmp3) / m_A8;
+	tmp3 += m_A7 * V[13];
+	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[4];
-	tmp2 += m_A6 * V[5];
+	tmp2 += m_A5 * V[23];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[4];
+	tmp1 += m_A3 * V[12];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[3];
+	tmp0 += m_A1 * V[22];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// popeye
-static void nl_gcr_d153cd8a3df26761_50_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// speedfrk
+static void nl_gcr_e07b5b086812756c_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A3 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A5 += go[7];
+	m_A5 += go[8];
+	m_A4 += go[9];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// solarq
+static void nl_gcr_e081f90c2e0313f6_45_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -14457,296 +59809,486 @@
 	double m_A42(0.0);
 	double m_A43(0.0);
 	double m_A44(0.0);
-	double m_A45(0.0);
-	double m_A46(0.0);
-	double m_A47(0.0);
-	double m_A48(0.0);
-	double m_A49(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
+	m_A0 += gt[3];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
+	RHS0 += Idr[3];
 	RHS0 -= go[1] * *cnV[1];
 	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
+	RHS0 -= go[3] * *cnV[3];
 	m_A2 += gt[4];
 	m_A2 += gt[5];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A2 += gt[11];
+	m_A5 += go[4];
+	m_A4 += go[5];
+	m_A4 += go[6];
+	m_A3 += go[7];
+	m_A3 += go[8];
+	double RHS1 = Idr[4];
 	RHS1 += Idr[5];
-	RHS1 -= go[4] * *cnV[4];
-	RHS1 -= go[5] * *cnV[5];
-	m_A4 += gt[6];
-	m_A4 += gt[7];
-	m_A4 += gt[8];
-	m_A5 += go[6];
-	double RHS2 = Idr[6];
-	RHS2 += Idr[7];
-	RHS2 += Idr[8];
-	RHS2 -= go[7] * *cnV[7];
-	RHS2 -= go[8] * *cnV[8];
-	m_A6 += gt[9];
-	m_A6 += gt[10];
-	m_A6 += gt[11];
-	m_A6 += gt[12];
-	m_A6 += gt[13];
-	m_A6 += gt[14];
-	m_A10 += go[9];
-	m_A7 += go[10];
-	m_A8 += go[11];
-	m_A9 += go[12];
-	double RHS3 = Idr[9];
-	RHS3 += Idr[10];
-	RHS3 += Idr[11];
-	RHS3 += Idr[12];
-	RHS3 += Idr[13];
-	RHS3 += Idr[14];
-	RHS3 -= go[13] * *cnV[13];
-	RHS3 -= go[14] * *cnV[14];
-	m_A11 += gt[15];
-	m_A11 += gt[16];
-	m_A11 += gt[17];
-	m_A11 += gt[18];
-	m_A11 += gt[19];
-	m_A13 += go[15];
-	m_A13 += go[16];
-	m_A12 += go[17];
-	double RHS4 = Idr[15];
-	RHS4 += Idr[16];
-	RHS4 += Idr[17];
-	RHS4 += Idr[18];
-	RHS4 += Idr[19];
-	RHS4 -= go[18] * *cnV[18];
-	RHS4 -= go[19] * *cnV[19];
-	m_A14 += gt[20];
-	m_A14 += gt[21];
-	m_A14 += gt[22];
-	m_A14 += gt[23];
-	m_A14 += gt[24];
-	m_A16 += go[20];
-	m_A15 += go[21];
-	m_A15 += go[22];
-	double RHS5 = Idr[20];
-	RHS5 += Idr[21];
-	RHS5 += Idr[22];
-	RHS5 += Idr[23];
-	RHS5 += Idr[24];
-	RHS5 -= go[23] * *cnV[23];
-	RHS5 -= go[24] * *cnV[24];
-	m_A19 += gt[25];
-	m_A19 += gt[26];
-	m_A19 += gt[27];
-	m_A18 += go[25];
-	m_A17 += go[26];
-	double RHS6 = Idr[25];
-	RHS6 += Idr[26];
-	RHS6 += Idr[27];
-	RHS6 -= go[27] * *cnV[27];
-	m_A26 += gt[28];
-	m_A26 += gt[29];
-	m_A26 += gt[30];
-	m_A24 += go[28];
-	m_A23 += go[29];
-	double RHS7 = Idr[28];
-	RHS7 += Idr[29];
-	RHS7 += Idr[30];
-	RHS7 -= go[30] * *cnV[30];
-	m_A33 += gt[31];
-	m_A33 += gt[32];
-	m_A33 += gt[33];
-	m_A30 += go[31];
-	m_A29 += go[32];
-	double RHS8 = Idr[31];
-	RHS8 += Idr[32];
-	RHS8 += Idr[33];
-	RHS8 -= go[33] * *cnV[33];
-	m_A40 += gt[34];
-	m_A40 += gt[35];
-	m_A40 += gt[36];
-	m_A40 += gt[37];
-	m_A36 += go[34];
-	m_A35 += go[35];
-	double RHS9 = Idr[34];
-	RHS9 += Idr[35];
-	RHS9 += Idr[36];
-	RHS9 += Idr[37];
-	RHS9 -= go[36] * *cnV[36];
-	RHS9 -= go[37] * *cnV[37];
-	m_A45 += gt[38];
-	m_A45 += gt[39];
-	m_A45 += gt[40];
-	m_A45 += gt[41];
-	m_A45 += gt[42];
-	m_A45 += gt[43];
-	m_A45 += gt[44];
-	m_A45 += gt[45];
-	m_A43 += go[38];
-	m_A43 += go[39];
-	m_A42 += go[40];
-	m_A42 += go[41];
-	double RHS10 = Idr[38];
-	RHS10 += Idr[39];
-	RHS10 += Idr[40];
-	RHS10 += Idr[41];
-	RHS10 += Idr[42];
-	RHS10 += Idr[43];
-	RHS10 += Idr[44];
-	RHS10 += Idr[45];
-	RHS10 -= go[42] * *cnV[42];
-	RHS10 -= go[43] * *cnV[43];
-	RHS10 -= go[44] * *cnV[44];
-	RHS10 -= go[45] * *cnV[45];
-	m_A49 += gt[46];
-	m_A49 += gt[47];
-	m_A47 += go[46];
-	double RHS11 = Idr[46];
-	RHS11 += Idr[47];
-	RHS11 -= go[47] * *cnV[47];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A7 += go[12];
+	double RHS2 = Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 += Idr[15];
+	RHS2 -= go[13] * *cnV[13];
+	RHS2 -= go[14] * *cnV[14];
+	RHS2 -= go[15] * *cnV[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A8 += gt[18];
+	m_A10 += go[16];
+	m_A9 += go[17];
+	double RHS3 = Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 -= go[18] * *cnV[18];
+	m_A11 += gt[19];
+	m_A11 += gt[20];
+	m_A11 += gt[21];
+	m_A11 += gt[22];
+	m_A11 += gt[23];
+	m_A11 += gt[24];
+	m_A11 += gt[25];
+	m_A11 += gt[26];
+	m_A14 += go[19];
+	m_A13 += go[20];
+	m_A13 += go[21];
+	m_A12 += go[22];
+	m_A12 += go[23];
+	double RHS4 = Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 += Idr[24];
+	RHS4 += Idr[25];
+	RHS4 += Idr[26];
+	RHS4 -= go[24] * *cnV[24];
+	RHS4 -= go[25] * *cnV[25];
+	RHS4 -= go[26] * *cnV[26];
+	m_A17 += gt[27];
+	m_A17 += gt[28];
+	m_A17 += gt[29];
+	m_A17 += gt[30];
+	m_A17 += gt[31];
+	m_A17 += gt[32];
+	m_A16 += go[27];
+	m_A16 += go[28];
+	m_A15 += go[29];
+	double RHS5 = Idr[27];
+	RHS5 += Idr[28];
+	RHS5 += Idr[29];
+	RHS5 += Idr[30];
+	RHS5 += Idr[31];
+	RHS5 += Idr[32];
+	RHS5 -= go[30] * *cnV[30];
+	RHS5 -= go[31] * *cnV[31];
+	RHS5 -= go[32] * *cnV[32];
+	m_A22 += gt[33];
+	m_A22 += gt[34];
+	m_A22 += gt[35];
+	m_A22 += gt[36];
+	m_A22 += gt[37];
+	m_A22 += gt[38];
+	m_A21 += go[33];
+	m_A21 += go[34];
+	m_A20 += go[35];
+	double RHS6 = Idr[33];
+	RHS6 += Idr[34];
+	RHS6 += Idr[35];
+	RHS6 += Idr[36];
+	RHS6 += Idr[37];
+	RHS6 += Idr[38];
+	RHS6 -= go[36] * *cnV[36];
+	RHS6 -= go[37] * *cnV[37];
+	RHS6 -= go[38] * *cnV[38];
+	m_A27 += gt[39];
+	m_A27 += gt[40];
+	m_A27 += gt[41];
+	m_A27 += gt[42];
+	m_A27 += gt[43];
+	m_A28 += go[39];
+	m_A28 += go[40];
+	m_A25 += go[41];
+	m_A25 += go[42];
+	double RHS7 = Idr[39];
+	RHS7 += Idr[40];
+	RHS7 += Idr[41];
+	RHS7 += Idr[42];
+	RHS7 += Idr[43];
+	RHS7 -= go[43] * *cnV[43];
+	m_A33 += gt[44];
+	m_A33 += gt[45];
+	m_A33 += gt[46];
+	m_A33 += gt[47];
+	m_A33 += gt[48];
+	m_A32 += go[44];
+	m_A32 += go[45];
+	m_A29 += go[46];
+	m_A30 += go[47];
+	double RHS8 = Idr[44];
+	RHS8 += Idr[45];
+	RHS8 += Idr[46];
+	RHS8 += Idr[47];
+	RHS8 += Idr[48];
+	RHS8 -= go[48] * *cnV[48];
+	m_A37 += gt[49];
+	m_A37 += gt[50];
+	m_A37 += gt[51];
+	m_A37 += gt[52];
+	m_A37 += gt[53];
+	m_A38 += go[49];
+	m_A38 += go[50];
+	m_A35 += go[51];
+	m_A35 += go[52];
+	double RHS9 = Idr[49];
+	RHS9 += Idr[50];
+	RHS9 += Idr[51];
+	RHS9 += Idr[52];
+	RHS9 += Idr[53];
+	RHS9 -= go[53] * *cnV[53];
+	m_A44 += gt[54];
+	m_A44 += gt[55];
+	m_A44 += gt[56];
+	m_A44 += gt[57];
+	m_A44 += gt[58];
+	m_A43 += go[54];
+	m_A43 += go[55];
+	m_A40 += go[56];
+	m_A39 += go[57];
+	double RHS10 = Idr[54];
+	RHS10 += Idr[55];
+	RHS10 += Idr[56];
+	RHS10 += Idr[57];
+	RHS10 += Idr[58];
+	RHS10 -= go[58] * *cnV[58];
 	const double f0 = 1.0 / m_A0;
-	const double f0_8 = -f0 * m_A29;
-	m_A33 += m_A1 * f0_8;
-	RHS8 += f0_8 * RHS0;
+	const double f0_5 = -f0 * m_A15;
+	m_A17 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_7 = -f1 * m_A23;
+	const double f1_5 = -f1 * m_A16;
+	m_A17 += m_A3 * f1_5;
+	m_A18 += m_A4 * f1_5;
+	m_A19 += m_A5 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f1_7 = -f1 * m_A25;
 	m_A26 += m_A3 * f1_7;
+	m_A27 += m_A4 * f1_7;
+	m_A28 += m_A5 * f1_7;
 	RHS7 += f1_7 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_6 = -f2 * m_A17;
-	m_A19 += m_A5 * f2_6;
+	const double f1_8 = -f1 * m_A29;
+	m_A31 += m_A3 * f1_8;
+	m_A32 += m_A4 * f1_8;
+	m_A33 += m_A5 * f1_8;
+	RHS8 += f1_8 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_6 = -f2 * m_A20;
+	m_A22 += m_A7 * f2_6;
 	RHS6 += f2_6 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_6 = -f3 * m_A18;
-	m_A19 += m_A7 * f3_6;
-	m_A20 += m_A8 * f3_6;
-	m_A21 += m_A9 * f3_6;
-	m_A22 += m_A10 * f3_6;
-	RHS6 += f3_6 * RHS3;
-	const double f3_7 = -f3 * m_A24;
-	m_A25 += m_A7 * f3_7;
-	m_A26 += m_A8 * f3_7;
-	m_A27 += m_A9 * f3_7;
-	m_A28 += m_A10 * f3_7;
-	RHS7 += f3_7 * RHS3;
+	const double f3 = 1.0 / m_A8;
 	const double f3_8 = -f3 * m_A30;
-	m_A31 += m_A7 * f3_8;
-	m_A32 += m_A8 * f3_8;
 	m_A33 += m_A9 * f3_8;
 	m_A34 += m_A10 * f3_8;
 	RHS8 += f3_8 * RHS3;
-	const double f3_9 = -f3 * m_A35;
-	m_A37 += m_A7 * f3_9;
-	m_A38 += m_A8 * f3_9;
-	m_A39 += m_A9 * f3_9;
-	m_A40 += m_A10 * f3_9;
-	RHS9 += f3_9 * RHS3;
+	const double f3_10 = -f3 * m_A39;
+	m_A42 += m_A9 * f3_10;
+	m_A44 += m_A10 * f3_10;
+	RHS10 += f3_10 * RHS3;
 	const double f4 = 1.0 / m_A11;
-	const double f4_9 = -f4 * m_A36;
-	m_A40 += m_A12 * f4_9;
-	m_A41 += m_A13 * f4_9;
+	const double f4_6 = -f4 * m_A21;
+	m_A22 += m_A12 * f4_6;
+	m_A23 += m_A13 * f4_6;
+	m_A24 += m_A14 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f4_9 = -f4 * m_A35;
+	m_A36 += m_A12 * f4_9;
+	m_A37 += m_A13 * f4_9;
+	m_A38 += m_A14 * f4_9;
 	RHS9 += f4_9 * RHS4;
-	const double f4_10 = -f4 * m_A42;
-	m_A44 += m_A12 * f4_10;
-	m_A45 += m_A13 * f4_10;
+	const double f4_10 = -f4 * m_A40;
+	m_A41 += m_A12 * f4_10;
+	m_A43 += m_A13 * f4_10;
+	m_A44 += m_A14 * f4_10;
 	RHS10 += f4_10 * RHS4;
-	const double f5 = 1.0 / m_A14;
-	const double f5_10 = -f5 * m_A43;
-	m_A45 += m_A15 * f5_10;
-	m_A46 += m_A16 * f5_10;
-	RHS10 += f5_10 * RHS5;
-	const double f5_11 = -f5 * m_A47;
-	m_A48 += m_A15 * f5_11;
-	m_A49 += m_A16 * f5_11;
-	RHS11 += f5_11 * RHS5;
-	const double f6 = 1.0 / m_A19;
-	const double f6_7 = -f6 * m_A25;
-	m_A26 += m_A20 * f6_7;
-	m_A27 += m_A21 * f6_7;
-	m_A28 += m_A22 * f6_7;
-	RHS7 += f6_7 * RHS6;
-	const double f6_8 = -f6 * m_A31;
-	m_A32 += m_A20 * f6_8;
-	m_A33 += m_A21 * f6_8;
-	m_A34 += m_A22 * f6_8;
-	RHS8 += f6_8 * RHS6;
-	const double f6_9 = -f6 * m_A37;
-	m_A38 += m_A20 * f6_9;
-	m_A39 += m_A21 * f6_9;
-	m_A40 += m_A22 * f6_9;
+	const double f5 = 1.0 / m_A17;
+	const double f5_7 = -f5 * m_A26;
+	m_A27 += m_A18 * f5_7;
+	m_A28 += m_A19 * f5_7;
+	RHS7 += f5_7 * RHS5;
+	const double f5_8 = -f5 * m_A31;
+	m_A32 += m_A18 * f5_8;
+	m_A33 += m_A19 * f5_8;
+	RHS8 += f5_8 * RHS5;
+	const double f6 = 1.0 / m_A22;
+	const double f6_9 = -f6 * m_A36;
+	m_A37 += m_A23 * f6_9;
+	m_A38 += m_A24 * f6_9;
 	RHS9 += f6_9 * RHS6;
-	const double f7 = 1.0 / m_A26;
+	const double f6_10 = -f6 * m_A41;
+	m_A43 += m_A23 * f6_10;
+	m_A44 += m_A24 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f7 = 1.0 / m_A27;
 	const double f7_8 = -f7 * m_A32;
-	m_A33 += m_A27 * f7_8;
-	m_A34 += m_A28 * f7_8;
+	m_A33 += m_A28 * f7_8;
 	RHS8 += f7_8 * RHS7;
-	const double f7_9 = -f7 * m_A38;
-	m_A39 += m_A27 * f7_9;
-	m_A40 += m_A28 * f7_9;
-	RHS9 += f7_9 * RHS7;
 	const double f8 = 1.0 / m_A33;
-	const double f8_9 = -f8 * m_A39;
-	m_A40 += m_A34 * f8_9;
-	RHS9 += f8_9 * RHS8;
-	const double f9 = 1.0 / m_A40;
-	const double f9_10 = -f9 * m_A44;
-	m_A45 += m_A41 * f9_10;
+	const double f8_10 = -f8 * m_A42;
+	m_A44 += m_A34 * f8_10;
+	RHS10 += f8_10 * RHS8;
+	const double f9 = 1.0 / m_A37;
+	const double f9_10 = -f9 * m_A43;
+	m_A44 += m_A38 * f9_10;
 	RHS10 += f9_10 * RHS9;
-	const double f10 = 1.0 / m_A45;
-	const double f10_11 = -f10 * m_A48;
-	m_A49 += m_A46 * f10_11;
-	RHS11 += f10_11 * RHS10;
-	V[11] = RHS11 / m_A49;
-	double tmp10 = 0.0;
-	tmp10 += m_A46 * V[11];
-	V[10] = (RHS10 - tmp10) / m_A45;
+	V[10] = RHS10 / m_A44;
 	double tmp9 = 0.0;
-	tmp9 += m_A41 * V[10];
-	V[9] = (RHS9 - tmp9) / m_A40;
+	tmp9 += m_A38 * V[10];
+	V[9] = (RHS9 - tmp9) / m_A37;
 	double tmp8 = 0.0;
-	tmp8 += m_A34 * V[9];
+	tmp8 += m_A34 * V[10];
 	V[8] = (RHS8 - tmp8) / m_A33;
 	double tmp7 = 0.0;
-	tmp7 += m_A27 * V[8];
-	tmp7 += m_A28 * V[9];
-	V[7] = (RHS7 - tmp7) / m_A26;
+	tmp7 += m_A28 * V[8];
+	V[7] = (RHS7 - tmp7) / m_A27;
 	double tmp6 = 0.0;
-	tmp6 += m_A20 * V[7];
-	tmp6 += m_A21 * V[8];
-	tmp6 += m_A22 * V[9];
-	V[6] = (RHS6 - tmp6) / m_A19;
+	tmp6 += m_A23 * V[9];
+	tmp6 += m_A24 * V[10];
+	V[6] = (RHS6 - tmp6) / m_A22;
 	double tmp5 = 0.0;
-	tmp5 += m_A15 * V[10];
-	tmp5 += m_A16 * V[11];
-	V[5] = (RHS5 - tmp5) / m_A14;
+	tmp5 += m_A18 * V[7];
+	tmp5 += m_A19 * V[8];
+	V[5] = (RHS5 - tmp5) / m_A17;
+	double tmp4 = 0.0;
+	tmp4 += m_A12 * V[6];
+	tmp4 += m_A13 * V[9];
+	tmp4 += m_A14 * V[10];
+	V[4] = (RHS4 - tmp4) / m_A11;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[8];
+	tmp3 += m_A10 * V[10];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[5];
+	tmp1 += m_A4 * V[7];
+	tmp1 += m_A5 * V[8];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[5];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// spacewar
+static void nl_gcr_e0b492db40bba291_20_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	m_A4 += go[3];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	m_A5 += gt[4];
+	m_A5 += gt[5];
+	m_A7 += go[4];
+	m_A6 += go[5];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	m_A9 += gt[6];
+	m_A9 += gt[7];
+	m_A9 += gt[8];
+	m_A8 += go[6];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	RHS3 += Idr[8];
+	RHS3 -= go[7] * *cnV[7];
+	RHS3 -= go[8] * *cnV[8];
+	m_A15 += gt[9];
+	m_A15 += gt[10];
+	m_A15 += gt[11];
+	m_A11 += go[9];
+	m_A13 += go[10];
+	m_A12 += go[11];
+	double RHS4 = Idr[9];
+	RHS4 += Idr[10];
+	RHS4 += Idr[11];
+	m_A19 += gt[12];
+	m_A19 += gt[13];
+	m_A19 += gt[14];
+	m_A17 += go[12];
+	double RHS5 = Idr[12];
+	RHS5 += Idr[13];
+	RHS5 += Idr[14];
+	RHS5 -= go[13] * *cnV[13];
+	RHS5 -= go[14] * *cnV[14];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A11;
+	m_A15 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A8;
+	m_A9 += m_A3 * f1_3;
+	m_A10 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f1_4 = -f1 * m_A12;
+	m_A14 += m_A3 * f1_4;
+	m_A15 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_4 = -f2 * m_A13;
+	m_A15 += m_A6 * f2_4;
+	m_A16 += m_A7 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_5 = -f2 * m_A17;
+	m_A18 += m_A6 * f2_5;
+	m_A19 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_4 = -f3 * m_A14;
+	m_A15 += m_A10 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f4 = 1.0 / m_A15;
+	const double f4_5 = -f4 * m_A18;
+	m_A19 += m_A16 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A19;
 	double tmp4 = 0.0;
-	tmp4 += m_A12 * V[9];
-	tmp4 += m_A13 * V[10];
-	V[4] = (RHS4 - tmp4) / m_A11;
+	tmp4 += m_A16 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A15;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[6];
-	tmp3 += m_A8 * V[7];
-	tmp3 += m_A9 * V[8];
-	tmp3 += m_A10 * V[9];
-	V[3] = (RHS3 - tmp3) / m_A6;
+	tmp3 += m_A10 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A9;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[6];
-	V[2] = (RHS2 - tmp2) / m_A4;
+	tmp2 += m_A6 * V[4];
+	tmp2 += m_A7 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A5;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[7];
+	tmp1 += m_A3 * V[3];
+	tmp1 += m_A4 * V[4];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[8];
+	tmp0 += m_A1 * V[4];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// dpatrol
-static void nl_gcr_d229cf0026955cd3_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// flyball
+static void nl_gcr_e15d9316d59cdad9_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A1 += go[0];
+	m_A0 += go[1];
+	m_A0 += go[2];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A3 += go[5];
+	double RHS1 = Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A5 += go[7];
+	m_A4 += go[8];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// speedfrk
+static void nl_gcr_e4f2ffbf201a3d0c_37_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -14757,6 +60299,33 @@
 	double m_A7(0.0);
 	double m_A8(0.0);
 	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
@@ -14784,47 +60353,207 @@
 	RHS2 += Idr[8];
 	RHS2 -= go[7] * *cnV[7];
 	RHS2 -= go[8] * *cnV[8];
-	m_A9 += gt[9];
-	m_A9 += gt[10];
-	m_A9 += gt[11];
-	m_A9 += gt[12];
-	m_A8 += go[9];
-	m_A7 += go[10];
-	m_A6 += go[11];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[9];
 	double RHS3 = Idr[9];
 	RHS3 += Idr[10];
 	RHS3 += Idr[11];
-	RHS3 += Idr[12];
-	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A9 += go[12];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 -= go[13] * *cnV[13];
+	RHS4 -= go[14] * *cnV[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A11 += go[15];
+	double RHS5 = Idr[15];
+	RHS5 += Idr[16];
+	RHS5 += Idr[17];
+	RHS5 -= go[16] * *cnV[16];
+	RHS5 -= go[17] * *cnV[17];
+	m_A12 += gt[18];
+	m_A12 += gt[19];
+	m_A12 += gt[20];
+	m_A13 += go[18];
+	double RHS6 = Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
+	RHS6 -= go[19] * *cnV[19];
+	RHS6 -= go[20] * *cnV[20];
+	m_A14 += gt[21];
+	m_A14 += gt[22];
+	m_A14 += gt[23];
+	m_A15 += go[21];
+	double RHS7 = Idr[21];
+	RHS7 += Idr[22];
+	RHS7 += Idr[23];
+	RHS7 -= go[22] * *cnV[22];
+	RHS7 -= go[23] * *cnV[23];
+	m_A16 += gt[24];
+	m_A16 += gt[25];
+	m_A16 += gt[26];
+	m_A17 += go[24];
+	double RHS8 = Idr[24];
+	RHS8 += Idr[25];
+	RHS8 += Idr[26];
+	RHS8 -= go[25] * *cnV[25];
+	RHS8 -= go[26] * *cnV[26];
+	m_A18 += gt[27];
+	m_A18 += gt[28];
+	m_A18 += gt[29];
+	m_A19 += go[27];
+	double RHS9 = Idr[27];
+	RHS9 += Idr[28];
+	RHS9 += Idr[29];
+	RHS9 -= go[28] * *cnV[28];
+	RHS9 -= go[29] * *cnV[29];
+	m_A24 += gt[30];
+	m_A24 += gt[31];
+	m_A24 += gt[32];
+	m_A24 += gt[33];
+	m_A24 += gt[34];
+	m_A25 += go[30];
+	m_A23 += go[31];
+	m_A22 += go[32];
+	m_A21 += go[33];
+	m_A20 += go[34];
+	double RHS10 = Idr[30];
+	RHS10 += Idr[31];
+	RHS10 += Idr[32];
+	RHS10 += Idr[33];
+	RHS10 += Idr[34];
+	m_A29 += gt[35];
+	m_A29 += gt[36];
+	m_A29 += gt[37];
+	m_A29 += gt[38];
+	m_A29 += gt[39];
+	m_A30 += go[35];
+	m_A28 += go[36];
+	m_A27 += go[37];
+	m_A26 += go[38];
+	double RHS11 = Idr[35];
+	RHS11 += Idr[36];
+	RHS11 += Idr[37];
+	RHS11 += Idr[38];
+	RHS11 += Idr[39];
+	RHS11 -= go[39] * *cnV[39];
+	m_A36 += gt[40];
+	m_A36 += gt[41];
+	m_A36 += gt[42];
+	m_A36 += gt[43];
+	m_A36 += gt[44];
+	m_A35 += go[40];
+	m_A34 += go[41];
+	m_A33 += go[42];
+	m_A32 += go[43];
+	m_A31 += go[44];
+	double RHS12 = Idr[40];
+	RHS12 += Idr[41];
+	RHS12 += Idr[42];
+	RHS12 += Idr[43];
+	RHS12 += Idr[44];
 	const double f0 = 1.0 / m_A0;
-	const double f0_3 = -f0 * m_A6;
-	m_A9 += m_A1 * f0_3;
-	RHS3 += f0_3 * RHS0;
+	const double f0_10 = -f0 * m_A20;
+	m_A24 += m_A1 * f0_10;
+	RHS10 += f0_10 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_3 = -f1 * m_A7;
-	m_A9 += m_A3 * f1_3;
-	RHS3 += f1_3 * RHS1;
+	const double f1_10 = -f1 * m_A21;
+	m_A24 += m_A3 * f1_10;
+	RHS10 += f1_10 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_3 = -f2 * m_A8;
-	m_A9 += m_A5 * f2_3;
-	RHS3 += f2_3 * RHS2;
-	V[3] = RHS3 / m_A9;
+	const double f2_10 = -f2 * m_A22;
+	m_A24 += m_A5 * f2_10;
+	RHS10 += f2_10 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_11 = -f3 * m_A26;
+	m_A29 += m_A7 * f3_11;
+	RHS11 += f3_11 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_12 = -f4 * m_A31;
+	m_A36 += m_A9 * f4_12;
+	RHS12 += f4_12 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_10 = -f5 * m_A23;
+	m_A24 += m_A11 * f5_10;
+	RHS10 += f5_10 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_11 = -f6 * m_A27;
+	m_A29 += m_A13 * f6_11;
+	RHS11 += f6_11 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_12 = -f7 * m_A32;
+	m_A36 += m_A15 * f7_12;
+	RHS12 += f7_12 * RHS7;
+	const double f8 = 1.0 / m_A16;
+	const double f8_12 = -f8 * m_A33;
+	m_A36 += m_A17 * f8_12;
+	RHS12 += f8_12 * RHS8;
+	const double f9 = 1.0 / m_A18;
+	const double f9_11 = -f9 * m_A28;
+	m_A29 += m_A19 * f9_11;
+	RHS11 += f9_11 * RHS9;
+	const double f10 = 1.0 / m_A24;
+	const double f10_12 = -f10 * m_A34;
+	m_A36 += m_A25 * f10_12;
+	RHS12 += f10_12 * RHS10;
+	const double f11 = 1.0 / m_A29;
+	const double f11_12 = -f11 * m_A35;
+	m_A36 += m_A30 * f11_12;
+	RHS12 += f11_12 * RHS11;
+	V[12] = RHS12 / m_A36;
+	double tmp11 = 0.0;
+	tmp11 += m_A30 * V[12];
+	V[11] = (RHS11 - tmp11) / m_A29;
+	double tmp10 = 0.0;
+	tmp10 += m_A25 * V[12];
+	V[10] = (RHS10 - tmp10) / m_A24;
+	double tmp9 = 0.0;
+	tmp9 += m_A19 * V[11];
+	V[9] = (RHS9 - tmp9) / m_A18;
+	double tmp8 = 0.0;
+	tmp8 += m_A17 * V[12];
+	V[8] = (RHS8 - tmp8) / m_A16;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[12];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[11];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[10];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[12];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[11];
+	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[3];
+	tmp2 += m_A5 * V[10];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[3];
+	tmp1 += m_A3 * V[10];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[3];
+	tmp0 += m_A1 * V[10];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// 280zzzap
-static void nl_gcr_d5f69adb177fea36_31_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// pongf
+static void nl_gcr_e51b463cd890ef6d_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -14832,30 +60561,6 @@
 	double m_A4(0.0);
 	double m_A5(0.0);
 	double m_A6(0.0);
-	double m_A7(0.0);
-	double m_A8(0.0);
-	double m_A9(0.0);
-	double m_A10(0.0);
-	double m_A11(0.0);
-	double m_A12(0.0);
-	double m_A13(0.0);
-	double m_A14(0.0);
-	double m_A15(0.0);
-	double m_A16(0.0);
-	double m_A17(0.0);
-	double m_A18(0.0);
-	double m_A19(0.0);
-	double m_A20(0.0);
-	double m_A21(0.0);
-	double m_A22(0.0);
-	double m_A23(0.0);
-	double m_A24(0.0);
-	double m_A25(0.0);
-	double m_A26(0.0);
-	double m_A27(0.0);
-	double m_A28(0.0);
-	double m_A29(0.0);
-	double m_A30(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
@@ -14867,182 +60572,42 @@
 	RHS0 -= go[2] * *cnV[2];
 	m_A2 += gt[3];
 	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A2 += gt[6];
-	m_A2 += gt[7];
-	m_A2 += gt[8];
-	m_A2 += gt[9];
 	m_A3 += go[3];
 	double RHS1 = Idr[3];
 	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 += Idr[6];
-	RHS1 += Idr[7];
-	RHS1 += Idr[8];
-	RHS1 += Idr[9];
 	RHS1 -= go[4] * *cnV[4];
-	RHS1 -= go[5] * *cnV[5];
-	RHS1 -= go[6] * *cnV[6];
-	RHS1 -= go[7] * *cnV[7];
-	RHS1 -= go[8] * *cnV[8];
-	RHS1 -= go[9] * *cnV[9];
-	m_A4 += gt[10];
-	m_A4 += gt[11];
-	m_A4 += gt[12];
-	m_A5 += go[10];
-	double RHS2 = Idr[10];
-	RHS2 += Idr[11];
-	RHS2 += Idr[12];
-	RHS2 -= go[11] * *cnV[11];
-	RHS2 -= go[12] * *cnV[12];
-	m_A6 += gt[13];
-	m_A6 += gt[14];
-	m_A7 += go[13];
-	double RHS3 = Idr[13];
-	RHS3 += Idr[14];
-	RHS3 -= go[14] * *cnV[14];
-	m_A9 += gt[15];
-	m_A9 += gt[16];
-	m_A9 += gt[17];
-	m_A9 += gt[18];
-	m_A9 += gt[19];
-	m_A9 += gt[20];
-	m_A8 += go[15];
-	m_A11 += go[16];
-	double RHS4 = Idr[15];
-	RHS4 += Idr[16];
-	RHS4 += Idr[17];
-	RHS4 += Idr[18];
-	RHS4 += Idr[19];
-	RHS4 += Idr[20];
-	RHS4 -= go[17] * *cnV[17];
-	RHS4 -= go[18] * *cnV[18];
-	RHS4 -= go[19] * *cnV[19];
-	RHS4 -= go[20] * *cnV[20];
-	m_A13 += gt[21];
-	m_A13 += gt[22];
-	m_A14 += go[21];
-	m_A12 += go[22];
-	double RHS5 = Idr[21];
-	RHS5 += Idr[22];
-	m_A16 += gt[23];
-	m_A16 += gt[24];
-	m_A16 += gt[25];
-	m_A16 += gt[26];
-	m_A15 += go[23];
-	m_A17 += go[24];
-	double RHS6 = Idr[23];
-	RHS6 += Idr[24];
-	RHS6 += Idr[25];
-	RHS6 += Idr[26];
-	RHS6 -= go[25] * *cnV[25];
-	RHS6 -= go[26] * *cnV[26];
-	m_A20 += gt[27];
-	m_A20 += gt[28];
-	m_A20 += gt[29];
-	m_A20 += gt[30];
-	m_A21 += go[27];
-	m_A22 += go[28];
-	m_A18 += go[29];
-	m_A19 += go[30];
-	double RHS7 = Idr[27];
-	RHS7 += Idr[28];
-	RHS7 += Idr[29];
-	RHS7 += Idr[30];
-	m_A25 += gt[31];
-	m_A25 += gt[32];
-	m_A24 += go[31];
-	m_A23 += go[32];
-	double RHS8 = Idr[31];
-	RHS8 += Idr[32];
-	m_A30 += gt[33];
-	m_A30 += gt[34];
-	m_A30 += gt[35];
-	m_A26 += go[33];
-	m_A28 += go[34];
-	double RHS9 = Idr[33];
-	RHS9 += Idr[34];
-	RHS9 += Idr[35];
-	RHS9 -= go[35] * *cnV[35];
+	m_A6 += gt[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A5 += go[5];
+	m_A4 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[7] * *cnV[7];
 	const double f0 = 1.0 / m_A0;
-	const double f0_6 = -f0 * m_A15;
-	m_A17 += m_A1 * f0_6;
-	RHS6 += f0_6 * RHS0;
-	const double f0_7 = -f0 * m_A18;
-	m_A20 += m_A1 * f0_7;
-	RHS7 += f0_7 * RHS0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_4 = -f1 * m_A8;
-	m_A10 += m_A3 * f1_4;
-	RHS4 += f1_4 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_5 = -f2 * m_A12;
-	m_A13 += m_A5 * f2_5;
-	RHS5 += f2_5 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_7 = -f3 * m_A19;
-	m_A21 += m_A7 * f3_7;
-	RHS7 += f3_7 * RHS3;
-	const double f3_8 = -f3 * m_A23;
-	m_A25 += m_A7 * f3_8;
-	RHS8 += f3_8 * RHS3;
-	const double f4 = 1.0 / m_A9;
-	const double f4_9 = -f4 * m_A26;
-	m_A27 += m_A10 * f4_9;
-	m_A30 += m_A11 * f4_9;
-	RHS9 += f4_9 * RHS4;
-	const double f5 = 1.0 / m_A13;
-	const double f5_8 = -f5 * m_A24;
-	m_A25 += m_A14 * f5_8;
-	RHS8 += f5_8 * RHS5;
-	const double f6 = 1.0 / m_A16;
-	const double f6_9 = -f6 * m_A27;
-	m_A28 += m_A17 * f6_9;
-	RHS9 += f6_9 * RHS6;
-	const double f7 = 1.0 / m_A20;
-	const double f7_9 = -f7 * m_A28;
-	m_A29 += m_A21 * f7_9;
-	m_A30 += m_A22 * f7_9;
-	RHS9 += f7_9 * RHS7;
-	const double f8 = 1.0 / m_A25;
-	const double f8_9 = -f8 * m_A29;
-	RHS9 += f8_9 * RHS8;
-	V[9] = RHS9 / m_A30;
-	double tmp8 = 0.0;
-	V[8] = (RHS8 - tmp8) / m_A25;
-	double tmp7 = 0.0;
-	tmp7 += m_A21 * V[8];
-	tmp7 += m_A22 * V[9];
-	V[7] = (RHS7 - tmp7) / m_A20;
-	double tmp6 = 0.0;
-	tmp6 += m_A17 * V[7];
-	V[6] = (RHS6 - tmp6) / m_A16;
-	double tmp5 = 0.0;
-	tmp5 += m_A14 * V[8];
-	V[5] = (RHS5 - tmp5) / m_A13;
-	double tmp4 = 0.0;
-	tmp4 += m_A10 * V[6];
-	tmp4 += m_A11 * V[9];
-	V[4] = (RHS4 - tmp4) / m_A9;
-	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[8];
-	V[3] = (RHS3 - tmp3) / m_A6;
-	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[5];
-	V[2] = (RHS2 - tmp2) / m_A4;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[6];
+	tmp1 += m_A3 * V[2];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[7];
+	tmp0 += m_A1 * V[2];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// gamemachine
-static void nl_gcr_ddffc2781d05acf_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// sundance
+static void nl_gcr_e5b7711fac1ea80c_8_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -15051,76 +60616,83 @@
 	double m_A5(0.0);
 	double m_A6(0.0);
 	double m_A7(0.0);
-	double m_A8(0.0);
-	double m_A9(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
-	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
-	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 -= go[4] * *cnV[4];
-	RHS1 -= go[5] * *cnV[5];
-	m_A4 += gt[6];
-	m_A4 += gt[7];
-	m_A5 += go[6];
-	double RHS2 = Idr[6];
-	RHS2 += Idr[7];
-	RHS2 -= go[7] * *cnV[7];
-	m_A9 += gt[8];
-	m_A9 += gt[9];
-	m_A9 += gt[10];
-	m_A9 += gt[11];
-	m_A9 += gt[12];
-	m_A8 += go[8];
-	m_A7 += go[9];
-	m_A6 += go[10];
-	double RHS3 = Idr[8];
-	RHS3 += Idr[9];
-	RHS3 += Idr[10];
-	RHS3 += Idr[11];
-	RHS3 += Idr[12];
-	RHS3 -= go[11] * *cnV[11];
-	RHS3 -= go[12] * *cnV[12];
+	RHS0 -= go[0] * *cnV[0];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A1 += gt[3];
+	m_A1 += gt[4];
+	m_A1 += gt[5];
+	m_A1 += gt[6];
+	m_A1 += gt[7];
+	m_A1 += gt[8];
+	m_A1 += gt[9];
+	m_A2 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A4 += gt[12];
+	m_A4 += gt[13];
+	m_A3 += go[10];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	m_A7 += gt[14];
+	m_A7 += gt[15];
+	m_A7 += gt[16];
+	m_A5 += go[14];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 -= go[15] * *cnV[15];
+	RHS3 -= go[16] * *cnV[16];
 	const double f0 = 1.0 / m_A0;
-	const double f0_3 = -f0 * m_A6;
-	m_A9 += m_A1 * f0_3;
-	RHS3 += f0_3 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_3 = -f1 * m_A7;
-	m_A9 += m_A3 * f1_3;
+	const double f0_2 = -f0 * m_A3;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A1;
+	const double f1_3 = -f1 * m_A5;
+	m_A6 += m_A2 * f1_3;
 	RHS3 += f1_3 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_3 = -f2 * m_A8;
-	m_A9 += m_A5 * f2_3;
+	const double f2_3 = -f2 * m_A6;
 	RHS3 += f2_3 * RHS2;
-	V[3] = RHS3 / m_A9;
+	V[3] = RHS3 / m_A7;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[3];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[3];
-	V[1] = (RHS1 - tmp1) / m_A2;
+	tmp1 += m_A2 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A1;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[3];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// gamemachine
-static void nl_gcr_df3a545642cc0a22_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// ripoff
+static void nl_gcr_e60314070a75e121_20_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -15128,67 +60700,165 @@
 	double m_A4(0.0);
 	double m_A5(0.0);
 	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
-	m_A1 += go[0];
-	m_A1 += go[1];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A2 += go[0];
+	m_A2 += go[1];
+	m_A1 += go[2];
+	m_A1 += go[3];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
-	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A2 += gt[6];
-	m_A3 += go[3];
-	m_A3 += go[4];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 += Idr[6];
-	RHS1 -= go[5] * *cnV[5];
-	RHS1 -= go[6] * *cnV[6];
-	m_A6 += gt[7];
-	m_A6 += gt[8];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A3 += gt[7];
+	m_A3 += gt[8];
+	m_A4 += go[7];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 -= go[8] * *cnV[8];
 	m_A6 += gt[9];
 	m_A6 += gt[10];
 	m_A6 += gt[11];
 	m_A6 += gt[12];
-	m_A5 += go[7];
-	m_A5 += go[8];
-	m_A4 += go[9];
-	m_A4 += go[10];
-	double RHS2 = Idr[7];
-	RHS2 += Idr[8];
-	RHS2 += Idr[9];
+	m_A7 += go[9];
+	m_A5 += go[10];
+	m_A5 += go[11];
+	double RHS2 = Idr[9];
 	RHS2 += Idr[10];
 	RHS2 += Idr[11];
 	RHS2 += Idr[12];
-	RHS2 -= go[11] * *cnV[11];
 	RHS2 -= go[12] * *cnV[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A9 += go[13];
+	m_A9 += go[14];
+	m_A10 += go[15];
+	m_A10 += go[16];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 -= go[17] * *cnV[17];
+	m_A13 += gt[18];
+	m_A13 += gt[19];
+	m_A13 += gt[20];
+	m_A13 += gt[21];
+	m_A12 += go[18];
+	m_A12 += go[19];
+	m_A14 += go[20];
+	m_A11 += go[21];
+	double RHS4 = Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	m_A19 += gt[22];
+	m_A19 += gt[23];
+	m_A19 += gt[24];
+	m_A19 += gt[25];
+	m_A19 += gt[26];
+	m_A19 += gt[27];
+	m_A19 += gt[28];
+	m_A19 += gt[29];
+	m_A18 += go[22];
+	m_A17 += go[23];
+	m_A17 += go[24];
+	m_A16 += go[25];
+	m_A15 += go[26];
+	m_A15 += go[27];
+	double RHS5 = Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 += Idr[27];
+	RHS5 += Idr[28];
+	RHS5 += Idr[29];
+	RHS5 -= go[28] * *cnV[28];
+	RHS5 -= go[29] * *cnV[29];
 	const double f0 = 1.0 / m_A0;
-	const double f0_2 = -f0 * m_A4;
+	const double f0_2 = -f0 * m_A5;
 	m_A6 += m_A1 * f0_2;
+	m_A7 += m_A2 * f0_2;
 	RHS2 += f0_2 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_2 = -f1 * m_A5;
-	m_A6 += m_A3 * f1_2;
-	RHS2 += f1_2 * RHS1;
-	V[2] = RHS2 / m_A6;
+	const double f0_5 = -f0 * m_A15;
+	m_A16 += m_A1 * f0_5;
+	m_A19 += m_A2 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_4 = -f1 * m_A11;
+	m_A13 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_5 = -f2 * m_A16;
+	m_A19 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_4 = -f3 * m_A12;
+	m_A13 += m_A9 * f3_4;
+	m_A14 += m_A10 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f3_5 = -f3 * m_A17;
+	m_A18 += m_A9 * f3_5;
+	m_A19 += m_A10 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A13;
+	const double f4_5 = -f4 * m_A18;
+	m_A19 += m_A14 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A19;
+	double tmp4 = 0.0;
+	tmp4 += m_A14 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A13;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[4];
+	tmp3 += m_A10 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A6;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[2];
-	V[1] = (RHS1 - tmp1) / m_A2;
+	tmp1 += m_A4 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A3;
 	double tmp0 = 0.0;
 	tmp0 += m_A1 * V[2];
+	tmp0 += m_A2 * V[5];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// zac1b11142
-static void nl_gcr_e3e057bb1961a530_178_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// cheekyms
+static void nl_gcr_e75302e17c866419_150_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -15339,34 +61009,6 @@
 	double m_A147(0.0);
 	double m_A148(0.0);
 	double m_A149(0.0);
-	double m_A150(0.0);
-	double m_A151(0.0);
-	double m_A152(0.0);
-	double m_A153(0.0);
-	double m_A154(0.0);
-	double m_A155(0.0);
-	double m_A156(0.0);
-	double m_A157(0.0);
-	double m_A158(0.0);
-	double m_A159(0.0);
-	double m_A160(0.0);
-	double m_A161(0.0);
-	double m_A162(0.0);
-	double m_A163(0.0);
-	double m_A164(0.0);
-	double m_A165(0.0);
-	double m_A166(0.0);
-	double m_A167(0.0);
-	double m_A168(0.0);
-	double m_A169(0.0);
-	double m_A170(0.0);
-	double m_A171(0.0);
-	double m_A172(0.0);
-	double m_A173(0.0);
-	double m_A174(0.0);
-	double m_A175(0.0);
-	double m_A176(0.0);
-	double m_A177(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
@@ -15378,970 +61020,7984 @@
 	RHS0 -= go[2] * *cnV[2];
 	m_A2 += gt[3];
 	m_A2 += gt[4];
+	m_A2 += gt[5];
 	m_A3 += go[3];
 	double RHS1 = Idr[3];
 	RHS1 += Idr[4];
+	RHS1 += Idr[5];
 	RHS1 -= go[4] * *cnV[4];
-	m_A4 += gt[5];
+	RHS1 -= go[5] * *cnV[5];
 	m_A4 += gt[6];
-	m_A6 += go[5];
-	m_A5 += go[6];
-	double RHS2 = Idr[5];
-	RHS2 += Idr[6];
-	m_A7 += gt[7];
-	m_A7 += gt[8];
-	m_A8 += go[7];
-	double RHS3 = Idr[7];
-	RHS3 += Idr[8];
-	RHS3 -= go[8] * *cnV[8];
-	m_A9 += gt[9];
-	m_A9 += gt[10];
-	m_A9 += gt[11];
-	m_A9 += gt[12];
-	m_A9 += gt[13];
-	m_A9 += gt[14];
-	m_A9 += gt[15];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A6 += go[6];
+	m_A5 += go[7];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[8] * *cnV[8];
+	m_A7 += gt[9];
+	m_A7 += gt[10];
+	m_A7 += gt[11];
+	m_A7 += gt[12];
+	m_A7 += gt[13];
 	m_A10 += go[9];
-	double RHS4 = Idr[9];
-	RHS4 += Idr[10];
-	RHS4 += Idr[11];
-	RHS4 += Idr[12];
-	RHS4 += Idr[13];
-	RHS4 += Idr[14];
+	m_A9 += go[10];
+	m_A8 += go[11];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	m_A11 += gt[14];
+	m_A11 += gt[15];
+	m_A11 += gt[16];
+	m_A12 += go[14];
+	double RHS4 = Idr[14];
 	RHS4 += Idr[15];
-	RHS4 -= go[10] * *cnV[10];
-	RHS4 -= go[11] * *cnV[11];
-	RHS4 -= go[12] * *cnV[12];
-	RHS4 -= go[13] * *cnV[13];
-	RHS4 -= go[14] * *cnV[14];
+	RHS4 += Idr[16];
 	RHS4 -= go[15] * *cnV[15];
-	m_A11 += gt[16];
-	m_A11 += gt[17];
-	m_A12 += go[16];
-	double RHS5 = Idr[16];
-	RHS5 += Idr[17];
-	RHS5 -= go[17] * *cnV[17];
+	RHS4 -= go[16] * *cnV[16];
+	m_A13 += gt[17];
 	m_A13 += gt[18];
 	m_A13 += gt[19];
+	m_A13 += gt[20];
+	m_A13 += gt[21];
+	m_A13 += gt[22];
+	m_A13 += gt[23];
+	m_A15 += go[17];
 	m_A14 += go[18];
-	double RHS6 = Idr[18];
-	RHS6 += Idr[19];
-	RHS6 -= go[19] * *cnV[19];
-	m_A15 += gt[20];
-	m_A15 += gt[21];
-	m_A16 += go[20];
-	double RHS7 = Idr[20];
-	RHS7 += Idr[21];
-	RHS7 -= go[21] * *cnV[21];
-	m_A17 += gt[22];
-	m_A17 += gt[23];
-	m_A18 += go[22];
-	double RHS8 = Idr[22];
-	RHS8 += Idr[23];
-	RHS8 -= go[23] * *cnV[23];
-	m_A19 += gt[24];
-	m_A19 += gt[25];
-	m_A20 += go[24];
-	m_A21 += go[25];
-	double RHS9 = Idr[24];
-	RHS9 += Idr[25];
-	m_A22 += gt[26];
-	m_A22 += gt[27];
-	m_A22 += gt[28];
-	m_A22 += gt[29];
-	m_A23 += go[26];
-	m_A23 += go[27];
-	double RHS10 = Idr[26];
-	RHS10 += Idr[27];
-	RHS10 += Idr[28];
-	RHS10 += Idr[29];
-	RHS10 -= go[28] * *cnV[28];
-	RHS10 -= go[29] * *cnV[29];
-	m_A24 += gt[30];
-	m_A24 += gt[31];
+	double RHS5 = Idr[17];
+	RHS5 += Idr[18];
+	RHS5 += Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	RHS5 -= go[19] * *cnV[19];
+	RHS5 -= go[20] * *cnV[20];
+	RHS5 -= go[21] * *cnV[21];
+	RHS5 -= go[22] * *cnV[22];
+	RHS5 -= go[23] * *cnV[23];
+	m_A16 += gt[24];
+	m_A16 += gt[25];
+	m_A16 += gt[26];
+	m_A17 += go[24];
+	double RHS6 = Idr[24];
+	RHS6 += Idr[25];
+	RHS6 += Idr[26];
+	RHS6 -= go[25] * *cnV[25];
+	RHS6 -= go[26] * *cnV[26];
+	m_A18 += gt[27];
+	m_A18 += gt[28];
+	m_A19 += go[27];
+	double RHS7 = Idr[27];
+	RHS7 += Idr[28];
+	RHS7 -= go[28] * *cnV[28];
+	m_A20 += gt[29];
+	m_A20 += gt[30];
+	m_A20 += gt[31];
+	m_A21 += go[29];
+	m_A23 += go[30];
+	m_A22 += go[31];
+	double RHS8 = Idr[29];
+	RHS8 += Idr[30];
+	RHS8 += Idr[31];
 	m_A24 += gt[32];
 	m_A24 += gt[33];
-	m_A25 += go[30];
-	m_A25 += go[31];
-	double RHS11 = Idr[30];
-	RHS11 += Idr[31];
-	RHS11 += Idr[32];
-	RHS11 += Idr[33];
-	RHS11 -= go[32] * *cnV[32];
-	RHS11 -= go[33] * *cnV[33];
-	m_A26 += gt[34];
+	m_A24 += gt[34];
+	m_A25 += go[32];
+	double RHS9 = Idr[32];
+	RHS9 += Idr[33];
+	RHS9 += Idr[34];
+	RHS9 -= go[33] * *cnV[33];
+	RHS9 -= go[34] * *cnV[34];
 	m_A26 += gt[35];
 	m_A26 += gt[36];
 	m_A26 += gt[37];
-	m_A27 += go[34];
+	m_A26 += gt[38];
 	m_A27 += go[35];
-	double RHS12 = Idr[34];
-	RHS12 += Idr[35];
-	RHS12 += Idr[36];
-	RHS12 += Idr[37];
-	RHS12 -= go[36] * *cnV[36];
-	RHS12 -= go[37] * *cnV[37];
-	m_A28 += gt[38];
-	m_A28 += gt[39];
-	m_A29 += go[38];
-	double RHS13 = Idr[38];
-	RHS13 += Idr[39];
-	RHS13 -= go[39] * *cnV[39];
-	m_A30 += gt[40];
-	m_A30 += gt[41];
-	m_A30 += gt[42];
-	m_A31 += go[40];
-	double RHS14 = Idr[40];
-	RHS14 += Idr[41];
-	RHS14 += Idr[42];
-	RHS14 -= go[41] * *cnV[41];
-	RHS14 -= go[42] * *cnV[42];
-	m_A32 += gt[43];
-	m_A32 += gt[44];
-	m_A32 += gt[45];
-	m_A33 += go[43];
-	double RHS15 = Idr[43];
-	RHS15 += Idr[44];
-	RHS15 += Idr[45];
-	RHS15 -= go[44] * *cnV[44];
-	RHS15 -= go[45] * *cnV[45];
+	m_A28 += go[36];
+	double RHS10 = Idr[35];
+	RHS10 += Idr[36];
+	RHS10 += Idr[37];
+	RHS10 += Idr[38];
+	RHS10 -= go[37] * *cnV[37];
+	RHS10 -= go[38] * *cnV[38];
+	m_A29 += gt[39];
+	m_A29 += gt[40];
+	m_A30 += go[39];
+	double RHS11 = Idr[39];
+	RHS11 += Idr[40];
+	RHS11 -= go[40] * *cnV[40];
+	m_A31 += gt[41];
+	m_A31 += gt[42];
+	m_A31 += gt[43];
+	m_A31 += gt[44];
+	m_A32 += go[41];
+	m_A33 += go[42];
+	double RHS12 = Idr[41];
+	RHS12 += Idr[42];
+	RHS12 += Idr[43];
+	RHS12 += Idr[44];
+	RHS12 -= go[43] * *cnV[43];
+	RHS12 -= go[44] * *cnV[44];
+	m_A34 += gt[45];
 	m_A34 += gt[46];
-	m_A34 += gt[47];
-	m_A34 += gt[48];
-	m_A35 += go[46];
-	double RHS16 = Idr[46];
-	RHS16 += Idr[47];
-	RHS16 += Idr[48];
-	RHS16 -= go[47] * *cnV[47];
-	RHS16 -= go[48] * *cnV[48];
-	m_A36 += gt[49];
-	m_A36 += gt[50];
-	m_A37 += go[49];
-	double RHS17 = Idr[49];
-	RHS17 += Idr[50];
-	RHS17 -= go[50] * *cnV[50];
-	m_A38 += gt[51];
-	m_A38 += gt[52];
-	m_A38 += gt[53];
-	m_A38 += gt[54];
-	m_A39 += go[51];
-	double RHS18 = Idr[51];
-	RHS18 += Idr[52];
-	RHS18 += Idr[53];
-	RHS18 += Idr[54];
-	RHS18 -= go[52] * *cnV[52];
-	RHS18 -= go[53] * *cnV[53];
-	RHS18 -= go[54] * *cnV[54];
-	m_A40 += gt[55];
-	m_A40 += gt[56];
-	m_A40 += gt[57];
-	m_A40 += gt[58];
-	m_A40 += gt[59];
-	m_A41 += go[55];
-	double RHS19 = Idr[55];
-	RHS19 += Idr[56];
-	RHS19 += Idr[57];
-	RHS19 += Idr[58];
-	RHS19 += Idr[59];
-	RHS19 -= go[56] * *cnV[56];
-	RHS19 -= go[57] * *cnV[57];
-	RHS19 -= go[58] * *cnV[58];
-	RHS19 -= go[59] * *cnV[59];
-	m_A42 += gt[60];
-	m_A42 += gt[61];
-	m_A42 += gt[62];
-	m_A42 += gt[63];
-	m_A42 += gt[64];
-	m_A42 += gt[65];
-	m_A42 += gt[66];
-	m_A43 += go[60];
-	double RHS20 = Idr[60];
-	RHS20 += Idr[61];
-	RHS20 += Idr[62];
-	RHS20 += Idr[63];
-	RHS20 += Idr[64];
-	RHS20 += Idr[65];
-	RHS20 += Idr[66];
-	RHS20 -= go[61] * *cnV[61];
-	RHS20 -= go[62] * *cnV[62];
-	RHS20 -= go[63] * *cnV[63];
-	RHS20 -= go[64] * *cnV[64];
-	RHS20 -= go[65] * *cnV[65];
-	RHS20 -= go[66] * *cnV[66];
-	m_A44 += gt[67];
-	m_A44 += gt[68];
-	m_A44 += gt[69];
-	m_A45 += go[67];
-	double RHS21 = Idr[67];
-	RHS21 += Idr[68];
+	m_A34 += gt[47];
+	m_A36 += go[45];
+	m_A35 += go[46];
+	double RHS13 = Idr[45];
+	RHS13 += Idr[46];
+	RHS13 += Idr[47];
+	RHS13 -= go[47] * *cnV[47];
+	m_A37 += gt[48];
+	m_A37 += gt[49];
+	m_A38 += go[48];
+	double RHS14 = Idr[48];
+	RHS14 += Idr[49];
+	RHS14 -= go[49] * *cnV[49];
+	m_A39 += gt[50];
+	m_A39 += gt[51];
+	m_A40 += go[50];
+	double RHS15 = Idr[50];
+	RHS15 += Idr[51];
+	RHS15 -= go[51] * *cnV[51];
+	m_A41 += gt[52];
+	m_A41 += gt[53];
+	m_A42 += go[52];
+	double RHS16 = Idr[52];
+	RHS16 += Idr[53];
+	RHS16 -= go[53] * *cnV[53];
+	m_A43 += gt[54];
+	m_A43 += gt[55];
+	m_A43 += gt[56];
+	m_A43 += gt[57];
+	m_A43 += gt[58];
+	m_A44 += go[54];
+	m_A46 += go[55];
+	m_A45 += go[56];
+	double RHS17 = Idr[54];
+	RHS17 += Idr[55];
+	RHS17 += Idr[56];
+	RHS17 += Idr[57];
+	RHS17 += Idr[58];
+	RHS17 -= go[57] * *cnV[57];
+	RHS17 -= go[58] * *cnV[58];
+	m_A47 += gt[59];
+	m_A47 += gt[60];
+	m_A47 += gt[61];
+	m_A47 += gt[62];
+	m_A47 += gt[63];
+	m_A48 += go[59];
+	m_A50 += go[60];
+	m_A49 += go[61];
+	double RHS18 = Idr[59];
+	RHS18 += Idr[60];
+	RHS18 += Idr[61];
+	RHS18 += Idr[62];
+	RHS18 += Idr[63];
+	RHS18 -= go[62] * *cnV[62];
+	RHS18 -= go[63] * *cnV[63];
+	m_A51 += gt[64];
+	m_A51 += gt[65];
+	m_A52 += go[64];
+	double RHS19 = Idr[64];
+	RHS19 += Idr[65];
+	RHS19 -= go[65] * *cnV[65];
+	m_A55 += gt[66];
+	m_A55 += gt[67];
+	m_A54 += go[66];
+	m_A53 += go[67];
+	double RHS20 = Idr[66];
+	RHS20 += Idr[67];
+	m_A60 += gt[68];
+	m_A60 += gt[69];
+	m_A60 += gt[70];
+	m_A58 += go[68];
+	m_A57 += go[69];
+	double RHS21 = Idr[68];
 	RHS21 += Idr[69];
-	RHS21 -= go[68] * *cnV[68];
-	RHS21 -= go[69] * *cnV[69];
-	m_A46 += gt[70];
-	m_A46 += gt[71];
-	m_A48 += go[70];
-	m_A47 += go[71];
-	double RHS22 = Idr[70];
-	RHS22 += Idr[71];
-	m_A49 += gt[72];
-	m_A49 += gt[73];
-	m_A49 += gt[74];
-	m_A51 += go[72];
-	m_A50 += go[73];
-	double RHS23 = Idr[72];
-	RHS23 += Idr[73];
+	RHS21 += Idr[70];
+	RHS21 -= go[70] * *cnV[70];
+	m_A63 += gt[71];
+	m_A63 += gt[72];
+	m_A64 += go[71];
+	double RHS22 = Idr[71];
+	RHS22 += Idr[72];
+	RHS22 -= go[72] * *cnV[72];
+	m_A65 += gt[73];
+	m_A65 += gt[74];
+	m_A65 += gt[75];
+	m_A66 += go[73];
+	double RHS23 = Idr[73];
 	RHS23 += Idr[74];
+	RHS23 += Idr[75];
 	RHS23 -= go[74] * *cnV[74];
-	m_A52 += gt[75];
-	m_A52 += gt[76];
-	m_A52 += gt[77];
-	m_A53 += go[75];
-	double RHS24 = Idr[75];
-	RHS24 += Idr[76];
+	RHS23 -= go[75] * *cnV[75];
+	m_A69 += gt[76];
+	m_A69 += gt[77];
+	m_A69 += gt[78];
+	m_A67 += go[76];
+	m_A68 += go[77];
+	double RHS24 = Idr[76];
 	RHS24 += Idr[77];
-	RHS24 -= go[76] * *cnV[76];
-	RHS24 -= go[77] * *cnV[77];
-	m_A54 += gt[78];
-	m_A54 += gt[79];
-	m_A54 += gt[80];
-	m_A54 += gt[81];
-	m_A55 += go[78];
-	m_A55 += go[79];
-	m_A56 += go[80];
-	double RHS25 = Idr[78];
-	RHS25 += Idr[79];
+	RHS24 += Idr[78];
+	RHS24 -= go[78] * *cnV[78];
+	m_A76 += gt[79];
+	m_A76 += gt[80];
+	m_A73 += go[79];
+	m_A72 += go[80];
+	double RHS25 = Idr[79];
 	RHS25 += Idr[80];
-	RHS25 += Idr[81];
-	RHS25 -= go[81] * *cnV[81];
-	m_A60 += gt[82];
-	m_A60 += gt[83];
-	m_A60 += gt[84];
-	m_A59 += go[82];
-	m_A58 += go[83];
-	m_A57 += go[84];
-	double RHS26 = Idr[82];
-	RHS26 += Idr[83];
-	RHS26 += Idr[84];
-	m_A62 += gt[85];
-	m_A62 += gt[86];
-	m_A63 += go[85];
-	m_A64 += go[86];
-	double RHS27 = Idr[85];
-	RHS27 += Idr[86];
-	m_A65 += gt[87];
-	m_A65 += gt[88];
-	m_A65 += gt[89];
-	m_A66 += go[87];
-	double RHS28 = Idr[87];
-	RHS28 += Idr[88];
-	RHS28 += Idr[89];
-	RHS28 -= go[88] * *cnV[88];
-	RHS28 -= go[89] * *cnV[89];
-	m_A67 += gt[90];
-	m_A67 += gt[91];
-	m_A67 += gt[92];
-	m_A69 += go[90];
-	m_A68 += go[91];
-	double RHS29 = Idr[90];
+	m_A81 += gt[81];
+	m_A81 += gt[82];
+	m_A80 += go[81];
+	m_A79 += go[82];
+	double RHS26 = Idr[81];
+	RHS26 += Idr[82];
+	m_A84 += gt[83];
+	m_A84 += gt[84];
+	m_A84 += gt[85];
+	m_A85 += go[83];
+	m_A83 += go[84];
+	double RHS27 = Idr[83];
+	RHS27 += Idr[84];
+	RHS27 += Idr[85];
+	RHS27 -= go[85] * *cnV[85];
+	m_A88 += gt[86];
+	m_A88 += gt[87];
+	m_A87 += go[86];
+	m_A86 += go[87];
+	double RHS28 = Idr[86];
+	RHS28 += Idr[87];
+	m_A95 += gt[88];
+	m_A95 += gt[89];
+	m_A95 += gt[90];
+	m_A95 += gt[91];
+	m_A95 += gt[92];
+	m_A90 += go[88];
+	m_A92 += go[89];
+	m_A91 += go[90];
+	double RHS29 = Idr[88];
+	RHS29 += Idr[89];
+	RHS29 += Idr[90];
 	RHS29 += Idr[91];
 	RHS29 += Idr[92];
+	RHS29 -= go[91] * *cnV[91];
 	RHS29 -= go[92] * *cnV[92];
-	m_A70 += gt[93];
-	m_A70 += gt[94];
-	m_A72 += go[93];
-	m_A71 += go[94];
-	double RHS30 = Idr[93];
-	RHS30 += Idr[94];
-	m_A74 += gt[95];
-	m_A74 += gt[96];
-	m_A73 += go[95];
-	double RHS31 = Idr[95];
-	RHS31 += Idr[96];
-	RHS31 -= go[96] * *cnV[96];
-	m_A82 += gt[97];
-	m_A82 += gt[98];
-	m_A82 += gt[99];
-	m_A82 += gt[100];
-	m_A82 += gt[101];
-	m_A82 += gt[102];
-	m_A82 += gt[103];
-	m_A82 += gt[104];
-	m_A82 += gt[105];
-	m_A82 += gt[106];
-	m_A81 += go[97];
-	m_A80 += go[98];
-	m_A79 += go[99];
-	m_A78 += go[100];
-	m_A78 += go[101];
-	m_A77 += go[102];
-	m_A77 += go[103];
-	m_A76 += go[104];
-	m_A76 += go[105];
-	m_A75 += go[106];
-	double RHS32 = Idr[97];
-	RHS32 += Idr[98];
-	RHS32 += Idr[99];
-	RHS32 += Idr[100];
-	RHS32 += Idr[101];
-	RHS32 += Idr[102];
-	RHS32 += Idr[103];
-	RHS32 += Idr[104];
-	RHS32 += Idr[105];
-	RHS32 += Idr[106];
-	m_A86 += gt[107];
-	m_A86 += gt[108];
-	m_A86 += gt[109];
-	m_A86 += gt[110];
-	m_A86 += gt[111];
-	m_A86 += gt[112];
-	m_A86 += gt[113];
-	m_A85 += go[107];
-	m_A84 += go[108];
-	double RHS33 = Idr[107];
-	RHS33 += Idr[108];
-	RHS33 += Idr[109];
+	m_A100 += gt[93];
+	m_A100 += gt[94];
+	m_A100 += gt[95];
+	m_A100 += gt[96];
+	m_A100 += gt[97];
+	m_A100 += gt[98];
+	m_A100 += gt[99];
+	m_A98 += go[93];
+	m_A101 += go[94];
+	double RHS30 = Idr[93];
+	RHS30 += Idr[94];
+	RHS30 += Idr[95];
+	RHS30 += Idr[96];
+	RHS30 += Idr[97];
+	RHS30 += Idr[98];
+	RHS30 += Idr[99];
+	RHS30 -= go[95] * *cnV[95];
+	RHS30 -= go[96] * *cnV[96];
+	RHS30 -= go[97] * *cnV[97];
+	RHS30 -= go[98] * *cnV[98];
+	RHS30 -= go[99] * *cnV[99];
+	m_A103 += gt[100];
+	m_A103 += gt[101];
+	m_A103 += gt[102];
+	m_A103 += gt[103];
+	m_A103 += gt[104];
+	m_A103 += gt[105];
+	m_A104 += go[100];
+	m_A104 += go[101];
+	m_A102 += go[102];
+	double RHS31 = Idr[100];
+	RHS31 += Idr[101];
+	RHS31 += Idr[102];
+	RHS31 += Idr[103];
+	RHS31 += Idr[104];
+	RHS31 += Idr[105];
+	RHS31 -= go[103] * *cnV[103];
+	RHS31 -= go[104] * *cnV[104];
+	RHS31 -= go[105] * *cnV[105];
+	m_A110 += gt[106];
+	m_A110 += gt[107];
+	m_A110 += gt[108];
+	m_A106 += go[106];
+	m_A107 += go[107];
+	m_A105 += go[108];
+	double RHS32 = Idr[106];
+	RHS32 += Idr[107];
+	RHS32 += Idr[108];
+	m_A114 += gt[109];
+	m_A114 += gt[110];
+	m_A114 += gt[111];
+	m_A114 += gt[112];
+	m_A114 += gt[113];
+	m_A114 += gt[114];
+	m_A114 += gt[115];
+	m_A112 += go[109];
+	m_A115 += go[110];
+	double RHS33 = Idr[109];
 	RHS33 += Idr[110];
 	RHS33 += Idr[111];
 	RHS33 += Idr[112];
 	RHS33 += Idr[113];
-	RHS33 -= go[109] * *cnV[109];
-	RHS33 -= go[110] * *cnV[110];
+	RHS33 += Idr[114];
+	RHS33 += Idr[115];
 	RHS33 -= go[111] * *cnV[111];
 	RHS33 -= go[112] * *cnV[112];
 	RHS33 -= go[113] * *cnV[113];
-	m_A90 += gt[114];
-	m_A90 += gt[115];
-	m_A91 += go[114];
-	m_A88 += go[115];
-	double RHS34 = Idr[114];
-	RHS34 += Idr[115];
-	m_A94 += gt[116];
-	m_A94 += gt[117];
-	m_A94 += gt[118];
-	m_A94 += gt[119];
-	m_A94 += gt[120];
-	m_A92 += go[116];
-	m_A93 += go[117];
-	m_A93 += go[118];
-	double RHS35 = Idr[116];
-	RHS35 += Idr[117];
-	RHS35 += Idr[118];
-	RHS35 += Idr[119];
-	RHS35 += Idr[120];
-	RHS35 -= go[119] * *cnV[119];
-	RHS35 -= go[120] * *cnV[120];
-	m_A97 += gt[121];
-	m_A97 += gt[122];
-	m_A98 += go[121];
-	m_A96 += go[122];
-	double RHS36 = Idr[121];
-	RHS36 += Idr[122];
-	m_A100 += gt[123];
-	m_A100 += gt[124];
-	m_A99 += go[123];
-	m_A102 += go[124];
-	double RHS37 = Idr[123];
-	RHS37 += Idr[124];
-	m_A105 += gt[125];
-	m_A105 += gt[126];
-	m_A107 += go[125];
-	m_A103 += go[126];
-	double RHS38 = Idr[125];
-	RHS38 += Idr[126];
-	m_A111 += gt[127];
-	m_A111 += gt[128];
-	m_A111 += gt[129];
-	m_A109 += go[127];
-	m_A108 += go[128];
-	double RHS39 = Idr[127];
-	RHS39 += Idr[128];
-	RHS39 += Idr[129];
-	RHS39 -= go[129] * *cnV[129];
-	m_A116 += gt[130];
-	m_A116 += gt[131];
-	m_A116 += gt[132];
-	m_A114 += go[130];
-	m_A113 += go[131];
-	m_A118 += go[132];
-	double RHS40 = Idr[130];
-	RHS40 += Idr[131];
-	RHS40 += Idr[132];
-	m_A120 += gt[133];
-	m_A120 += gt[134];
-	m_A120 += gt[135];
-	m_A120 += gt[136];
-	m_A121 += go[133];
-	m_A119 += go[134];
-	double RHS41 = Idr[133];
-	RHS41 += Idr[134];
-	RHS41 += Idr[135];
-	RHS41 += Idr[136];
-	RHS41 -= go[135] * *cnV[135];
-	RHS41 -= go[136] * *cnV[136];
-	m_A124 += gt[137];
-	m_A124 += gt[138];
-	m_A123 += go[137];
-	m_A122 += go[138];
-	double RHS42 = Idr[137];
-	RHS42 += Idr[138];
-	m_A131 += gt[139];
-	m_A131 += gt[140];
-	m_A131 += gt[141];
-	m_A131 += gt[142];
-	m_A131 += gt[143];
-	m_A131 += gt[144];
-	m_A132 += go[139];
-	m_A132 += go[140];
-	m_A129 += go[141];
-	m_A128 += go[142];
-	m_A127 += go[143];
-	m_A126 += go[144];
-	double RHS43 = Idr[139];
-	RHS43 += Idr[140];
-	RHS43 += Idr[141];
-	RHS43 += Idr[142];
-	RHS43 += Idr[143];
-	RHS43 += Idr[144];
-	m_A141 += gt[145];
-	m_A141 += gt[146];
-	m_A141 += gt[147];
-	m_A141 += gt[148];
-	m_A141 += gt[149];
-	m_A141 += gt[150];
-	m_A141 += gt[151];
-	m_A136 += go[145];
-	m_A135 += go[146];
-	m_A134 += go[147];
-	m_A133 += go[148];
-	m_A140 += go[149];
-	m_A137 += go[150];
-	m_A139 += go[151];
-	double RHS44 = Idr[145];
-	RHS44 += Idr[146];
-	RHS44 += Idr[147];
-	RHS44 += Idr[148];
-	RHS44 += Idr[149];
-	RHS44 += Idr[150];
-	RHS44 += Idr[151];
-	m_A143 += gt[152];
-	m_A143 += gt[153];
-	m_A143 += gt[154];
-	m_A143 += gt[155];
-	m_A144 += go[152];
-	m_A142 += go[153];
-	double RHS45 = Idr[152];
-	RHS45 += Idr[153];
-	RHS45 += Idr[154];
-	RHS45 += Idr[155];
-	RHS45 -= go[154] * *cnV[154];
-	RHS45 -= go[155] * *cnV[155];
-	m_A147 += gt[156];
-	m_A147 += gt[157];
-	m_A145 += go[156];
-	m_A148 += go[157];
-	double RHS46 = Idr[156];
-	RHS46 += Idr[157];
-	m_A155 += gt[158];
-	m_A155 += gt[159];
-	m_A155 += gt[160];
-	m_A155 += gt[161];
-	m_A155 += gt[162];
-	m_A155 += gt[163];
-	m_A150 += go[158];
-	m_A151 += go[159];
-	m_A154 += go[160];
-	m_A154 += go[161];
-	double RHS47 = Idr[158];
-	RHS47 += Idr[159];
-	RHS47 += Idr[160];
-	RHS47 += Idr[161];
-	RHS47 += Idr[162];
-	RHS47 += Idr[163];
-	RHS47 -= go[162] * *cnV[162];
-	RHS47 -= go[163] * *cnV[163];
-	m_A162 += gt[164];
-	m_A162 += gt[165];
-	m_A162 += gt[166];
-	m_A162 += gt[167];
-	m_A162 += gt[168];
-	m_A163 += go[164];
-	m_A159 += go[165];
-	m_A160 += go[166];
-	m_A158 += go[167];
-	m_A157 += go[168];
-	double RHS48 = Idr[164];
-	RHS48 += Idr[165];
-	RHS48 += Idr[166];
-	RHS48 += Idr[167];
-	RHS48 += Idr[168];
-	m_A169 += gt[169];
-	m_A169 += gt[170];
-	m_A169 += gt[171];
-	m_A169 += gt[172];
-	m_A167 += go[169];
-	m_A164 += go[170];
-	m_A165 += go[171];
-	double RHS49 = Idr[169];
-	RHS49 += Idr[170];
-	RHS49 += Idr[171];
-	RHS49 += Idr[172];
-	RHS49 -= go[172] * *cnV[172];
-	m_A177 += gt[173];
-	m_A177 += gt[174];
-	m_A177 += gt[175];
-	m_A177 += gt[176];
-	m_A177 += gt[177];
-	m_A171 += go[173];
-	m_A172 += go[174];
-	m_A175 += go[175];
-	double RHS50 = Idr[173];
-	RHS50 += Idr[174];
-	RHS50 += Idr[175];
-	RHS50 += Idr[176];
-	RHS50 += Idr[177];
-	RHS50 -= go[176] * *cnV[176];
-	RHS50 -= go[177] * *cnV[177];
+	RHS33 -= go[114] * *cnV[114];
+	RHS33 -= go[115] * *cnV[115];
+	m_A121 += gt[116];
+	m_A121 += gt[117];
+	m_A121 += gt[118];
+	m_A121 += gt[119];
+	m_A121 += gt[120];
+	m_A121 += gt[121];
+	m_A121 += gt[122];
+	m_A118 += go[116];
+	m_A116 += go[117];
+	double RHS34 = Idr[116];
+	RHS34 += Idr[117];
+	RHS34 += Idr[118];
+	RHS34 += Idr[119];
+	RHS34 += Idr[120];
+	RHS34 += Idr[121];
+	RHS34 += Idr[122];
+	RHS34 -= go[118] * *cnV[118];
+	RHS34 -= go[119] * *cnV[119];
+	RHS34 -= go[120] * *cnV[120];
+	RHS34 -= go[121] * *cnV[121];
+	RHS34 -= go[122] * *cnV[122];
+	m_A125 += gt[123];
+	m_A125 += gt[124];
+	m_A125 += gt[125];
+	m_A124 += go[123];
+	m_A126 += go[124];
+	m_A123 += go[125];
+	double RHS35 = Idr[123];
+	RHS35 += Idr[124];
+	RHS35 += Idr[125];
+	m_A132 += gt[126];
+	m_A132 += gt[127];
+	m_A132 += gt[128];
+	m_A127 += go[126];
+	m_A128 += go[127];
+	m_A130 += go[128];
+	double RHS36 = Idr[126];
+	RHS36 += Idr[127];
+	RHS36 += Idr[128];
+	m_A149 += gt[129];
+	m_A149 += gt[130];
+	m_A149 += gt[131];
+	m_A149 += gt[132];
+	m_A149 += gt[133];
+	m_A149 += gt[134];
+	m_A149 += gt[135];
+	m_A149 += gt[136];
+	m_A149 += gt[137];
+	m_A149 += gt[138];
+	m_A149 += gt[139];
+	m_A140 += go[129];
+	m_A147 += go[130];
+	m_A139 += go[131];
+	m_A138 += go[132];
+	m_A137 += go[133];
+	m_A136 += go[134];
+	m_A135 += go[135];
+	m_A134 += go[136];
+	m_A143 += go[137];
+	m_A143 += go[138];
+	double RHS37 = Idr[129];
+	RHS37 += Idr[130];
+	RHS37 += Idr[131];
+	RHS37 += Idr[132];
+	RHS37 += Idr[133];
+	RHS37 += Idr[134];
+	RHS37 += Idr[135];
+	RHS37 += Idr[136];
+	RHS37 += Idr[137];
+	RHS37 += Idr[138];
+	RHS37 += Idr[139];
+	RHS37 -= go[139] * *cnV[139];
+	const double f0 = 1.0 / m_A0;
+	const double f0_31 = -f0 * m_A102;
+	m_A103 += m_A1 * f0_31;
+	RHS31 += f0_31 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_20 = -f1 * m_A53;
+	m_A55 += m_A3 * f1_20;
+	RHS20 += f1_20 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_20 = -f2 * m_A54;
+	m_A55 += m_A5 * f2_20;
+	m_A56 += m_A6 * f2_20;
+	RHS20 += f2_20 * RHS2;
+	const double f2_21 = -f2 * m_A57;
+	m_A59 += m_A5 * f2_21;
+	m_A60 += m_A6 * f2_21;
+	RHS21 += f2_21 * RHS2;
+	const double f2_34 = -f2 * m_A116;
+	m_A117 += m_A5 * f2_34;
+	m_A118 += m_A6 * f2_34;
+	RHS34 += f2_34 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_21 = -f3 * m_A58;
+	m_A60 += m_A8 * f3_21;
+	m_A61 += m_A9 * f3_21;
+	m_A62 += m_A10 * f3_21;
+	RHS21 += f3_21 * RHS3;
+	const double f3_25 = -f3 * m_A72;
+	m_A74 += m_A8 * f3_25;
+	m_A76 += m_A9 * f3_25;
+	m_A78 += m_A10 * f3_25;
+	RHS25 += f3_25 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_24 = -f4 * m_A67;
+	m_A69 += m_A12 * f4_24;
+	RHS24 += f4_24 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_29 = -f5 * m_A90;
+	m_A91 += m_A14 * f5_29;
+	m_A93 += m_A15 * f5_29;
+	RHS29 += f5_29 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_26 = -f6 * m_A79;
+	m_A81 += m_A17 * f6_26;
+	RHS26 += f6_26 * RHS6;
+	const double f7 = 1.0 / m_A18;
+	const double f7_27 = -f7 * m_A83;
+	m_A84 += m_A19 * f7_27;
+	RHS27 += f7_27 * RHS7;
+	const double f8 = 1.0 / m_A20;
+	const double f8_24 = -f8 * m_A68;
+	m_A69 += m_A21 * f8_24;
+	m_A70 += m_A22 * f8_24;
+	m_A71 += m_A23 * f8_24;
+	RHS24 += f8_24 * RHS8;
+	const double f8_25 = -f8 * m_A73;
+	m_A75 += m_A21 * f8_25;
+	m_A76 += m_A22 * f8_25;
+	m_A77 += m_A23 * f8_25;
+	RHS25 += f8_25 * RHS8;
+	const double f8_29 = -f8 * m_A91;
+	m_A93 += m_A21 * f8_29;
+	m_A94 += m_A22 * f8_29;
+	m_A95 += m_A23 * f8_29;
+	RHS29 += f8_29 * RHS8;
+	const double f9 = 1.0 / m_A24;
+	const double f9_28 = -f9 * m_A86;
+	m_A88 += m_A25 * f9_28;
+	RHS28 += f9_28 * RHS9;
+	const double f10 = 1.0 / m_A26;
+	const double f10_26 = -f10 * m_A80;
+	m_A81 += m_A27 * f10_26;
+	m_A82 += m_A28 * f10_26;
+	RHS26 += f10_26 * RHS10;
+	const double f10_33 = -f10 * m_A112;
+	m_A113 += m_A27 * f10_33;
+	m_A115 += m_A28 * f10_33;
+	RHS33 += f10_33 * RHS10;
+	const double f10_36 = -f10 * m_A127;
+	m_A129 += m_A27 * f10_36;
+	m_A132 += m_A28 * f10_36;
+	RHS36 += f10_36 * RHS10;
+	const double f11 = 1.0 / m_A29;
+	const double f11_32 = -f11 * m_A105;
+	m_A110 += m_A30 * f11_32;
+	RHS32 += f11_32 * RHS11;
+	const double f12 = 1.0 / m_A31;
+	const double f12_28 = -f12 * m_A87;
+	m_A88 += m_A32 * f12_28;
+	m_A89 += m_A33 * f12_28;
+	RHS28 += f12_28 * RHS12;
+	const double f12_30 = -f12 * m_A98;
+	m_A99 += m_A32 * f12_30;
+	m_A101 += m_A33 * f12_30;
+	RHS30 += f12_30 * RHS12;
+	const double f12_32 = -f12 * m_A106;
+	m_A108 += m_A32 * f12_32;
+	m_A110 += m_A33 * f12_32;
+	RHS32 += f12_32 * RHS12;
+	const double f13 = 1.0 / m_A34;
+	const double f13_29 = -f13 * m_A92;
+	m_A95 += m_A35 * f13_29;
+	m_A97 += m_A36 * f13_29;
+	RHS29 += f13_29 * RHS13;
+	const double f13_37 = -f13 * m_A134;
+	m_A141 += m_A35 * f13_37;
+	m_A149 += m_A36 * f13_37;
+	RHS37 += f13_37 * RHS13;
+	const double f14 = 1.0 / m_A37;
+	const double f14_35 = -f14 * m_A123;
+	m_A125 += m_A38 * f14_35;
+	RHS35 += f14_35 * RHS14;
+	const double f15 = 1.0 / m_A39;
+	const double f15_35 = -f15 * m_A124;
+	m_A125 += m_A40 * f15_35;
+	RHS35 += f15_35 * RHS15;
+	const double f16 = 1.0 / m_A41;
+	const double f16_37 = -f16 * m_A135;
+	m_A149 += m_A42 * f16_37;
+	RHS37 += f16_37 * RHS16;
+	const double f17 = 1.0 / m_A43;
+	const double f17_36 = -f17 * m_A128;
+	m_A131 += m_A44 * f17_36;
+	m_A132 += m_A45 * f17_36;
+	m_A133 += m_A46 * f17_36;
+	RHS36 += f17_36 * RHS17;
+	const double f17_37 = -f17 * m_A136;
+	m_A145 += m_A44 * f17_37;
+	m_A148 += m_A45 * f17_37;
+	m_A149 += m_A46 * f17_37;
+	RHS37 += f17_37 * RHS17;
+	const double f18 = 1.0 / m_A47;
+	const double f18_32 = -f18 * m_A107;
+	m_A109 += m_A48 * f18_32;
+	m_A110 += m_A49 * f18_32;
+	m_A111 += m_A50 * f18_32;
+	RHS32 += f18_32 * RHS18;
+	const double f18_37 = -f18 * m_A137;
+	m_A142 += m_A48 * f18_37;
+	m_A144 += m_A49 * f18_37;
+	m_A149 += m_A50 * f18_37;
+	RHS37 += f18_37 * RHS18;
+	const double f19 = 1.0 / m_A51;
+	const double f19_37 = -f19 * m_A138;
+	m_A149 += m_A52 * f19_37;
+	RHS37 += f19_37 * RHS19;
+	const double f20 = 1.0 / m_A55;
+	const double f20_21 = -f20 * m_A59;
+	m_A60 += m_A56 * f20_21;
+	RHS21 += f20_21 * RHS20;
+	const double f20_34 = -f20 * m_A117;
+	m_A118 += m_A56 * f20_34;
+	RHS34 += f20_34 * RHS20;
+	const double f21 = 1.0 / m_A60;
+	const double f21_25 = -f21 * m_A74;
+	m_A76 += m_A61 * f21_25;
+	m_A78 += m_A62 * f21_25;
+	RHS25 += f21_25 * RHS21;
+	const double f21_34 = -f21 * m_A118;
+	m_A119 += m_A61 * f21_34;
+	m_A121 += m_A62 * f21_34;
+	RHS34 += f21_34 * RHS21;
+	const double f22 = 1.0 / m_A63;
+	const double f22_37 = -f22 * m_A139;
+	m_A149 += m_A64 * f22_37;
+	RHS37 += f22_37 * RHS22;
+	const double f23 = 1.0 / m_A65;
+	const double f23_37 = -f23 * m_A140;
+	m_A149 += m_A66 * f23_37;
+	RHS37 += f23_37 * RHS23;
+	const double f24 = 1.0 / m_A69;
+	const double f24_25 = -f24 * m_A75;
+	m_A76 += m_A70 * f24_25;
+	m_A77 += m_A71 * f24_25;
+	RHS25 += f24_25 * RHS24;
+	const double f24_29 = -f24 * m_A93;
+	m_A94 += m_A70 * f24_29;
+	m_A95 += m_A71 * f24_29;
+	RHS29 += f24_29 * RHS24;
+	const double f25 = 1.0 / m_A76;
+	const double f25_29 = -f25 * m_A94;
+	m_A95 += m_A77 * f25_29;
+	m_A96 += m_A78 * f25_29;
+	RHS29 += f25_29 * RHS25;
+	const double f25_34 = -f25 * m_A119;
+	m_A120 += m_A77 * f25_34;
+	m_A121 += m_A78 * f25_34;
+	RHS34 += f25_34 * RHS25;
+	const double f26 = 1.0 / m_A81;
+	const double f26_33 = -f26 * m_A113;
+	m_A115 += m_A82 * f26_33;
+	RHS33 += f26_33 * RHS26;
+	const double f26_36 = -f26 * m_A129;
+	m_A132 += m_A82 * f26_36;
+	RHS36 += f26_36 * RHS26;
+	const double f27 = 1.0 / m_A84;
+	const double f27_36 = -f27 * m_A130;
+	m_A132 += m_A85 * f27_36;
+	RHS36 += f27_36 * RHS27;
+	const double f28 = 1.0 / m_A88;
+	const double f28_30 = -f28 * m_A99;
+	m_A101 += m_A89 * f28_30;
+	RHS30 += f28_30 * RHS28;
+	const double f28_32 = -f28 * m_A108;
+	m_A110 += m_A89 * f28_32;
+	RHS32 += f28_32 * RHS28;
+	const double f29 = 1.0 / m_A95;
+	const double f29_34 = -f29 * m_A120;
+	m_A121 += m_A96 * f29_34;
+	m_A122 += m_A97 * f29_34;
+	RHS34 += f29_34 * RHS29;
+	const double f29_37 = -f29 * m_A141;
+	m_A146 += m_A96 * f29_37;
+	m_A149 += m_A97 * f29_37;
+	RHS37 += f29_37 * RHS29;
+	const double f30 = 1.0 / m_A100;
+	const double f30_32 = -f30 * m_A109;
+	m_A110 += m_A101 * f30_32;
+	RHS32 += f30_32 * RHS30;
+	const double f30_37 = -f30 * m_A142;
+	m_A144 += m_A101 * f30_37;
+	RHS37 += f30_37 * RHS30;
+	const double f31 = 1.0 / m_A103;
+	const double f31_37 = -f31 * m_A143;
+	m_A149 += m_A104 * f31_37;
+	RHS37 += f31_37 * RHS31;
+	const double f32 = 1.0 / m_A110;
+	const double f32_37 = -f32 * m_A144;
+	m_A149 += m_A111 * f32_37;
+	RHS37 += f32_37 * RHS32;
+	const double f33 = 1.0 / m_A114;
+	const double f33_36 = -f33 * m_A131;
+	m_A132 += m_A115 * f33_36;
+	RHS36 += f33_36 * RHS33;
+	const double f33_37 = -f33 * m_A145;
+	m_A148 += m_A115 * f33_37;
+	RHS37 += f33_37 * RHS33;
+	const double f34 = 1.0 / m_A121;
+	const double f34_37 = -f34 * m_A146;
+	m_A149 += m_A122 * f34_37;
+	RHS37 += f34_37 * RHS34;
+	const double f35 = 1.0 / m_A125;
+	const double f35_37 = -f35 * m_A147;
+	m_A149 += m_A126 * f35_37;
+	RHS37 += f35_37 * RHS35;
+	const double f36 = 1.0 / m_A132;
+	const double f36_37 = -f36 * m_A148;
+	m_A149 += m_A133 * f36_37;
+	RHS37 += f36_37 * RHS36;
+	V[37] = RHS37 / m_A149;
+	double tmp36 = 0.0;
+	tmp36 += m_A133 * V[37];
+	V[36] = (RHS36 - tmp36) / m_A132;
+	double tmp35 = 0.0;
+	tmp35 += m_A126 * V[37];
+	V[35] = (RHS35 - tmp35) / m_A125;
+	double tmp34 = 0.0;
+	tmp34 += m_A122 * V[37];
+	V[34] = (RHS34 - tmp34) / m_A121;
+	double tmp33 = 0.0;
+	tmp33 += m_A115 * V[36];
+	V[33] = (RHS33 - tmp33) / m_A114;
+	double tmp32 = 0.0;
+	tmp32 += m_A111 * V[37];
+	V[32] = (RHS32 - tmp32) / m_A110;
+	double tmp31 = 0.0;
+	tmp31 += m_A104 * V[37];
+	V[31] = (RHS31 - tmp31) / m_A103;
+	double tmp30 = 0.0;
+	tmp30 += m_A101 * V[32];
+	V[30] = (RHS30 - tmp30) / m_A100;
+	double tmp29 = 0.0;
+	tmp29 += m_A96 * V[34];
+	tmp29 += m_A97 * V[37];
+	V[29] = (RHS29 - tmp29) / m_A95;
+	double tmp28 = 0.0;
+	tmp28 += m_A89 * V[32];
+	V[28] = (RHS28 - tmp28) / m_A88;
+	double tmp27 = 0.0;
+	tmp27 += m_A85 * V[36];
+	V[27] = (RHS27 - tmp27) / m_A84;
+	double tmp26 = 0.0;
+	tmp26 += m_A82 * V[36];
+	V[26] = (RHS26 - tmp26) / m_A81;
+	double tmp25 = 0.0;
+	tmp25 += m_A77 * V[29];
+	tmp25 += m_A78 * V[34];
+	V[25] = (RHS25 - tmp25) / m_A76;
+	double tmp24 = 0.0;
+	tmp24 += m_A70 * V[25];
+	tmp24 += m_A71 * V[29];
+	V[24] = (RHS24 - tmp24) / m_A69;
+	double tmp23 = 0.0;
+	tmp23 += m_A66 * V[37];
+	V[23] = (RHS23 - tmp23) / m_A65;
+	double tmp22 = 0.0;
+	tmp22 += m_A64 * V[37];
+	V[22] = (RHS22 - tmp22) / m_A63;
+	double tmp21 = 0.0;
+	tmp21 += m_A61 * V[25];
+	tmp21 += m_A62 * V[34];
+	V[21] = (RHS21 - tmp21) / m_A60;
+	double tmp20 = 0.0;
+	tmp20 += m_A56 * V[21];
+	V[20] = (RHS20 - tmp20) / m_A55;
+	double tmp19 = 0.0;
+	tmp19 += m_A52 * V[37];
+	V[19] = (RHS19 - tmp19) / m_A51;
+	double tmp18 = 0.0;
+	tmp18 += m_A48 * V[30];
+	tmp18 += m_A49 * V[32];
+	tmp18 += m_A50 * V[37];
+	V[18] = (RHS18 - tmp18) / m_A47;
+	double tmp17 = 0.0;
+	tmp17 += m_A44 * V[33];
+	tmp17 += m_A45 * V[36];
+	tmp17 += m_A46 * V[37];
+	V[17] = (RHS17 - tmp17) / m_A43;
+	double tmp16 = 0.0;
+	tmp16 += m_A42 * V[37];
+	V[16] = (RHS16 - tmp16) / m_A41;
+	double tmp15 = 0.0;
+	tmp15 += m_A40 * V[35];
+	V[15] = (RHS15 - tmp15) / m_A39;
+	double tmp14 = 0.0;
+	tmp14 += m_A38 * V[35];
+	V[14] = (RHS14 - tmp14) / m_A37;
+	double tmp13 = 0.0;
+	tmp13 += m_A35 * V[29];
+	tmp13 += m_A36 * V[37];
+	V[13] = (RHS13 - tmp13) / m_A34;
+	double tmp12 = 0.0;
+	tmp12 += m_A32 * V[28];
+	tmp12 += m_A33 * V[32];
+	V[12] = (RHS12 - tmp12) / m_A31;
+	double tmp11 = 0.0;
+	tmp11 += m_A30 * V[32];
+	V[11] = (RHS11 - tmp11) / m_A29;
+	double tmp10 = 0.0;
+	tmp10 += m_A27 * V[26];
+	tmp10 += m_A28 * V[36];
+	V[10] = (RHS10 - tmp10) / m_A26;
+	double tmp9 = 0.0;
+	tmp9 += m_A25 * V[28];
+	V[9] = (RHS9 - tmp9) / m_A24;
+	double tmp8 = 0.0;
+	tmp8 += m_A21 * V[24];
+	tmp8 += m_A22 * V[25];
+	tmp8 += m_A23 * V[29];
+	V[8] = (RHS8 - tmp8) / m_A20;
+	double tmp7 = 0.0;
+	tmp7 += m_A19 * V[27];
+	V[7] = (RHS7 - tmp7) / m_A18;
+	double tmp6 = 0.0;
+	tmp6 += m_A17 * V[26];
+	V[6] = (RHS6 - tmp6) / m_A16;
+	double tmp5 = 0.0;
+	tmp5 += m_A14 * V[8];
+	tmp5 += m_A15 * V[24];
+	V[5] = (RHS5 - tmp5) / m_A13;
+	double tmp4 = 0.0;
+	tmp4 += m_A12 * V[24];
+	V[4] = (RHS4 - tmp4) / m_A11;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[21];
+	tmp3 += m_A9 * V[25];
+	tmp3 += m_A10 * V[34];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[20];
+	tmp2 += m_A6 * V[21];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[20];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[31];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// elim
+static void nl_gcr_e76692c10e79997e_36_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A3 += go[4];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A4 += gt[12];
+	m_A4 += gt[13];
+	m_A4 += gt[14];
+	m_A5 += go[8];
+	double RHS2 = Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	RHS2 -= go[13] * *cnV[13];
+	RHS2 -= go[14] * *cnV[14];
+	m_A6 += gt[15];
+	m_A6 += gt[16];
+	m_A6 += gt[17];
+	m_A7 += go[15];
+	double RHS3 = Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 -= go[16] * *cnV[16];
+	RHS3 -= go[17] * *cnV[17];
+	m_A8 += gt[18];
+	m_A8 += gt[19];
+	m_A8 += gt[20];
+	m_A8 += gt[21];
+	m_A8 += gt[22];
+	m_A8 += gt[23];
+	m_A10 += go[18];
+	m_A9 += go[19];
+	m_A11 += go[20];
+	m_A11 += go[21];
+	double RHS4 = Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 -= go[22] * *cnV[22];
+	RHS4 -= go[23] * *cnV[23];
+	m_A12 += gt[24];
+	m_A12 += gt[25];
+	m_A12 += gt[26];
+	m_A13 += go[24];
+	double RHS5 = Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 -= go[25] * *cnV[25];
+	RHS5 -= go[26] * *cnV[26];
+	m_A16 += gt[27];
+	m_A16 += gt[28];
+	m_A15 += go[27];
+	m_A14 += go[28];
+	double RHS6 = Idr[27];
+	RHS6 += Idr[28];
+	m_A21 += gt[29];
+	m_A21 += gt[30];
+	m_A21 += gt[31];
+	m_A21 += gt[32];
+	m_A22 += go[29];
+	m_A20 += go[30];
+	m_A19 += go[31];
+	double RHS7 = Idr[29];
+	RHS7 += Idr[30];
+	RHS7 += Idr[31];
+	RHS7 += Idr[32];
+	RHS7 -= go[32] * *cnV[32];
+	m_A24 += gt[33];
+	m_A24 += gt[34];
+	m_A24 += gt[35];
+	m_A24 += gt[36];
+	m_A24 += gt[37];
+	m_A24 += gt[38];
+	m_A24 += gt[39];
+	m_A23 += go[33];
+	m_A25 += go[34];
+	double RHS8 = Idr[33];
+	RHS8 += Idr[34];
+	RHS8 += Idr[35];
+	RHS8 += Idr[36];
+	RHS8 += Idr[37];
+	RHS8 += Idr[38];
+	RHS8 += Idr[39];
+	RHS8 -= go[35] * *cnV[35];
+	RHS8 -= go[36] * *cnV[36];
+	RHS8 -= go[37] * *cnV[37];
+	RHS8 -= go[38] * *cnV[38];
+	RHS8 -= go[39] * *cnV[39];
+	m_A30 += gt[40];
+	m_A30 += gt[41];
+	m_A30 += gt[42];
+	m_A30 += gt[43];
+	m_A27 += go[40];
+	m_A27 += go[41];
+	m_A26 += go[42];
+	m_A31 += go[43];
+	double RHS9 = Idr[40];
+	RHS9 += Idr[41];
+	RHS9 += Idr[42];
+	RHS9 += Idr[43];
+	m_A35 += gt[44];
+	m_A35 += gt[45];
+	m_A35 += gt[46];
+	m_A35 += gt[47];
+	m_A35 += gt[48];
+	m_A32 += go[44];
+	m_A34 += go[45];
+	m_A33 += go[46];
+	double RHS10 = Idr[44];
+	RHS10 += Idr[45];
+	RHS10 += Idr[46];
+	RHS10 += Idr[47];
+	RHS10 += Idr[48];
+	RHS10 -= go[47] * *cnV[47];
+	RHS10 -= go[48] * *cnV[48];
+	const double f0 = 1.0 / m_A0;
+	const double f0_7 = -f0 * m_A19;
+	m_A21 += m_A1 * f0_7;
+	RHS7 += f0_7 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_7 = -f1 * m_A20;
+	m_A21 += m_A3 * f1_7;
+	RHS7 += f1_7 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_10 = -f2 * m_A32;
+	m_A33 += m_A5 * f2_10;
+	RHS10 += f2_10 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_8 = -f3 * m_A23;
+	m_A25 += m_A7 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f3_9 = -f3 * m_A26;
+	m_A30 += m_A7 * f3_9;
+	RHS9 += f3_9 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_6 = -f4 * m_A14;
+	m_A16 += m_A9 * f4_6;
+	m_A17 += m_A10 * f4_6;
+	m_A18 += m_A11 * f4_6;
+	RHS6 += f4_6 * RHS4;
+	const double f4_9 = -f4 * m_A27;
+	m_A28 += m_A9 * f4_9;
+	m_A29 += m_A10 * f4_9;
+	m_A30 += m_A11 * f4_9;
+	RHS9 += f4_9 * RHS4;
+	const double f5 = 1.0 / m_A12;
+	const double f5_6 = -f5 * m_A15;
+	m_A16 += m_A13 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	const double f6 = 1.0 / m_A16;
+	const double f6_9 = -f6 * m_A28;
+	m_A29 += m_A17 * f6_9;
+	m_A30 += m_A18 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f7 = 1.0 / m_A21;
+	const double f7_10 = -f7 * m_A33;
+	m_A35 += m_A22 * f7_10;
+	RHS10 += f7_10 * RHS7;
+	const double f8 = 1.0 / m_A24;
+	const double f8_9 = -f8 * m_A29;
+	m_A30 += m_A25 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	const double f9 = 1.0 / m_A30;
+	const double f9_10 = -f9 * m_A34;
+	m_A35 += m_A31 * f9_10;
+	RHS10 += f9_10 * RHS9;
+	V[10] = RHS10 / m_A35;
+	double tmp9 = 0.0;
+	tmp9 += m_A31 * V[10];
+	V[9] = (RHS9 - tmp9) / m_A30;
+	double tmp8 = 0.0;
+	tmp8 += m_A25 * V[9];
+	V[8] = (RHS8 - tmp8) / m_A24;
+	double tmp7 = 0.0;
+	tmp7 += m_A22 * V[10];
+	V[7] = (RHS7 - tmp7) / m_A21;
+	double tmp6 = 0.0;
+	tmp6 += m_A17 * V[8];
+	tmp6 += m_A18 * V[9];
+	V[6] = (RHS6 - tmp6) / m_A16;
+	double tmp5 = 0.0;
+	tmp5 += m_A13 * V[6];
+	V[5] = (RHS5 - tmp5) / m_A12;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[6];
+	tmp4 += m_A10 * V[8];
+	tmp4 += m_A11 * V[9];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[9];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[7];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[7];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[7];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// fireone
+static void nl_gcr_e7fb484f621b3ab9_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A3 += gt[4];
+	m_A3 += gt[5];
+	m_A3 += gt[6];
+	m_A2 += go[4];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A4 += go[7];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
+	const double f0 = 1.0 / m_A0;
+	const double f0_1 = -f0 * m_A2;
+	m_A3 += m_A1 * f0_1;
+	RHS1 += f0_1 * RHS0;
+	const double f0_2 = -f0 * m_A4;
+	m_A5 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A3;
+	const double f1_2 = -f1 * m_A5;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	V[1] = (RHS1 - tmp1) / m_A3;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[1];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// elim
+static void nl_gcr_e8aeb165b69427ec_18_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A4 += go[3];
+	m_A3 += go[4];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[5] * *cnV[5];
+	m_A5 += gt[6];
+	m_A5 += gt[7];
+	m_A6 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 -= go[7] * *cnV[7];
+	m_A9 += gt[8];
+	m_A9 += gt[9];
+	m_A8 += go[8];
+	m_A7 += go[9];
+	double RHS3 = Idr[8];
+	RHS3 += Idr[9];
+	m_A13 += gt[10];
+	m_A13 += gt[11];
+	m_A13 += gt[12];
+	m_A14 += go[10];
+	m_A11 += go[11];
+	double RHS4 = Idr[10];
+	RHS4 += Idr[11];
+	RHS4 += Idr[12];
+	RHS4 -= go[12] * *cnV[12];
+	m_A17 += gt[13];
+	m_A17 += gt[14];
+	m_A17 += gt[15];
+	m_A15 += go[13];
+	m_A16 += go[14];
+	double RHS5 = Idr[13];
+	RHS5 += Idr[14];
+	RHS5 += Idr[15];
+	RHS5 -= go[15] * *cnV[15];
+	const double f0 = 1.0 / m_A0;
+	const double f0_3 = -f0 * m_A7;
+	m_A9 += m_A1 * f0_3;
+	RHS3 += f0_3 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A8;
+	m_A9 += m_A3 * f1_3;
+	m_A10 += m_A4 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f1_4 = -f1 * m_A11;
+	m_A12 += m_A3 * f1_4;
+	m_A13 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_5 = -f2 * m_A15;
+	m_A17 += m_A6 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A9;
+	const double f3_4 = -f3 * m_A12;
+	m_A13 += m_A10 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	const double f4 = 1.0 / m_A13;
+	const double f4_5 = -f4 * m_A16;
+	m_A17 += m_A14 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A17;
+	double tmp4 = 0.0;
+	tmp4 += m_A14 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A13;
+	double tmp3 = 0.0;
+	tmp3 += m_A10 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	tmp1 += m_A4 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[3];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// spacewar
+static void nl_gcr_e9e8211f43d8f4b3_22_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A3 += go[2];
+	m_A4 += go[3];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	m_A5 += gt[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A7 += go[9];
+	m_A6 += go[10];
+	double RHS2 = Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[11] * *cnV[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A9 += go[12];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 -= go[13] * *cnV[13];
+	m_A12 += gt[14];
+	m_A12 += gt[15];
+	m_A12 += gt[16];
+	m_A11 += go[14];
+	m_A10 += go[15];
+	double RHS4 = Idr[14];
+	RHS4 += Idr[15];
+	RHS4 += Idr[16];
+	RHS4 -= go[16] * *cnV[16];
+	m_A17 += gt[17];
+	m_A17 += gt[18];
+	m_A17 += gt[19];
+	m_A17 += gt[20];
+	m_A17 += gt[21];
+	m_A17 += gt[22];
+	m_A14 += go[17];
+	m_A18 += go[18];
+	m_A15 += go[19];
+	double RHS5 = Idr[17];
+	RHS5 += Idr[18];
+	RHS5 += Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 -= go[20] * *cnV[20];
+	RHS5 -= go[21] * *cnV[21];
+	RHS5 -= go[22] * *cnV[22];
+	m_A21 += gt[23];
+	m_A21 += gt[24];
+	m_A19 += go[23];
+	m_A20 += go[24];
+	double RHS6 = Idr[23];
+	RHS6 += Idr[24];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A10;
+	m_A12 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A14;
+	m_A15 += m_A3 * f1_5;
+	m_A16 += m_A4 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_4 = -f2 * m_A11;
+	m_A12 += m_A6 * f2_4;
+	m_A13 += m_A7 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f2_5 = -f2 * m_A15;
+	m_A16 += m_A6 * f2_5;
+	m_A17 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_6 = -f3 * m_A19;
+	m_A21 += m_A9 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f4 = 1.0 / m_A12;
+	const double f4_5 = -f4 * m_A16;
+	m_A17 += m_A13 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	const double f5 = 1.0 / m_A17;
+	const double f5_6 = -f5 * m_A20;
+	m_A21 += m_A18 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	V[6] = RHS6 / m_A21;
+	double tmp5 = 0.0;
+	tmp5 += m_A18 * V[6];
+	V[5] = (RHS5 - tmp5) / m_A17;
+	double tmp4 = 0.0;
+	tmp4 += m_A13 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[4];
+	tmp2 += m_A7 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	tmp1 += m_A4 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// boxingb
+static void nl_gcr_ea2b6e3a05e6ef0b_23_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A4 += go[4];
+	m_A3 += go[5];
+	m_A3 += go[6];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A5 += gt[13];
+	m_A7 += go[10];
+	m_A6 += go[11];
+	m_A6 += go[12];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 += Idr[13];
+	RHS2 -= go[13] * *cnV[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A9 += go[14];
+	double RHS3 = Idr[14];
+	RHS3 += Idr[15];
+	RHS3 -= go[15] * *cnV[15];
+	m_A12 += gt[16];
+	m_A12 += gt[17];
+	m_A12 += gt[18];
+	m_A12 += gt[19];
+	m_A12 += gt[20];
+	m_A12 += gt[21];
+	m_A11 += go[16];
+	m_A11 += go[17];
+	m_A10 += go[18];
+	double RHS4 = Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	m_A17 += gt[22];
+	m_A17 += gt[23];
+	m_A17 += gt[24];
+	m_A17 += gt[25];
+	m_A17 += gt[26];
+	m_A15 += go[22];
+	m_A15 += go[23];
+	m_A14 += go[24];
+	double RHS5 = Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 -= go[25] * *cnV[25];
+	RHS5 -= go[26] * *cnV[26];
+	m_A22 += gt[27];
+	m_A22 += gt[28];
+	m_A22 += gt[29];
+	m_A22 += gt[30];
+	m_A22 += gt[31];
+	m_A20 += go[27];
+	m_A19 += go[28];
+	double RHS6 = Idr[27];
+	RHS6 += Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 += Idr[31];
+	RHS6 -= go[29] * *cnV[29];
+	RHS6 -= go[30] * *cnV[30];
+	RHS6 -= go[31] * *cnV[31];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A10;
+	m_A12 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_4 = -f1 * m_A11;
+	m_A12 += m_A3 * f1_4;
+	m_A13 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f1_5 = -f1 * m_A14;
+	m_A16 += m_A3 * f1_5;
+	m_A17 += m_A4 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_5 = -f2 * m_A15;
+	m_A17 += m_A6 * f2_5;
+	m_A18 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f2_6 = -f2 * m_A19;
+	m_A21 += m_A6 * f2_6;
+	m_A22 += m_A7 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_6 = -f3 * m_A20;
+	m_A22 += m_A9 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f4 = 1.0 / m_A12;
+	const double f4_5 = -f4 * m_A16;
+	m_A17 += m_A13 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	const double f5 = 1.0 / m_A17;
+	const double f5_6 = -f5 * m_A21;
+	m_A22 += m_A18 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	V[6] = RHS6 / m_A22;
+	double tmp5 = 0.0;
+	tmp5 += m_A18 * V[6];
+	V[5] = (RHS5 - tmp5) / m_A17;
+	double tmp4 = 0.0;
+	tmp4 += m_A13 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[5];
+	tmp2 += m_A7 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[4];
+	tmp1 += m_A4 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starcas
+static void nl_gcr_ec4f6d2dad5961b9_64_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A1 += go[0];
+	m_A1 += go[1];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A3 += go[6];
+	double RHS1 = Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A5 += go[10];
+	double RHS2 = Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A6 += gt[16];
+	m_A6 += gt[17];
+	m_A6 += gt[18];
+	m_A6 += gt[19];
+	m_A9 += go[12];
+	m_A7 += go[13];
+	m_A7 += go[14];
+	m_A8 += go[15];
+	m_A8 += go[16];
+	m_A10 += go[17];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 += Idr[16];
+	RHS3 += Idr[17];
+	RHS3 += Idr[18];
+	RHS3 += Idr[19];
+	RHS3 -= go[18] * *cnV[18];
+	RHS3 -= go[19] * *cnV[19];
+	m_A11 += gt[20];
+	m_A11 += gt[21];
+	m_A11 += gt[22];
+	m_A11 += gt[23];
+	m_A12 += go[20];
+	double RHS4 = Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 += Idr[23];
+	RHS4 -= go[21] * *cnV[21];
+	RHS4 -= go[22] * *cnV[22];
+	RHS4 -= go[23] * *cnV[23];
+	m_A13 += gt[24];
+	m_A13 += gt[25];
+	m_A14 += go[24];
+	double RHS5 = Idr[24];
+	RHS5 += Idr[25];
+	RHS5 -= go[25] * *cnV[25];
+	m_A15 += gt[26];
+	m_A15 += gt[27];
+	m_A15 += gt[28];
+	m_A15 += gt[29];
+	m_A15 += gt[30];
+	m_A15 += gt[31];
+	m_A15 += gt[32];
+	m_A15 += gt[33];
+	m_A18 += go[26];
+	m_A16 += go[27];
+	m_A16 += go[28];
+	m_A17 += go[29];
+	m_A17 += go[30];
+	m_A19 += go[31];
+	double RHS6 = Idr[26];
+	RHS6 += Idr[27];
+	RHS6 += Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 += Idr[31];
+	RHS6 += Idr[32];
+	RHS6 += Idr[33];
+	RHS6 -= go[32] * *cnV[32];
+	RHS6 -= go[33] * *cnV[33];
+	m_A21 += gt[34];
+	m_A21 += gt[35];
+	m_A21 += gt[36];
+	m_A21 += gt[37];
+	m_A21 += gt[38];
+	m_A23 += go[34];
+	m_A23 += go[35];
+	m_A20 += go[36];
+	m_A20 += go[37];
+	double RHS7 = Idr[34];
+	RHS7 += Idr[35];
+	RHS7 += Idr[36];
+	RHS7 += Idr[37];
+	RHS7 += Idr[38];
+	RHS7 -= go[38] * *cnV[38];
+	m_A26 += gt[39];
+	m_A26 += gt[40];
+	m_A26 += gt[41];
+	m_A26 += gt[42];
+	m_A26 += gt[43];
+	m_A28 += go[39];
+	m_A28 += go[40];
+	m_A25 += go[41];
+	m_A25 += go[42];
+	double RHS8 = Idr[39];
+	RHS8 += Idr[40];
+	RHS8 += Idr[41];
+	RHS8 += Idr[42];
+	RHS8 += Idr[43];
+	RHS8 -= go[43] * *cnV[43];
+	m_A33 += gt[44];
+	m_A33 += gt[45];
+	m_A33 += gt[46];
+	m_A33 += gt[47];
+	m_A33 += gt[48];
+	m_A31 += go[44];
+	m_A31 += go[45];
+	m_A30 += go[46];
+	m_A35 += go[47];
+	m_A35 += go[48];
+	double RHS9 = Idr[44];
+	RHS9 += Idr[45];
+	RHS9 += Idr[46];
+	RHS9 += Idr[47];
+	RHS9 += Idr[48];
+	m_A39 += gt[49];
+	m_A39 += gt[50];
+	m_A39 += gt[51];
+	m_A39 += gt[52];
+	m_A39 += gt[53];
+	m_A37 += go[49];
+	m_A37 += go[50];
+	m_A36 += go[51];
+	m_A41 += go[52];
+	m_A41 += go[53];
+	double RHS10 = Idr[49];
+	RHS10 += Idr[50];
+	RHS10 += Idr[51];
+	RHS10 += Idr[52];
+	RHS10 += Idr[53];
+	m_A46 += gt[54];
+	m_A46 += gt[55];
+	m_A46 += gt[56];
+	m_A46 += gt[57];
+	m_A46 += gt[58];
+	m_A44 += go[54];
+	m_A44 += go[55];
+	m_A43 += go[56];
+	m_A42 += go[57];
+	double RHS11 = Idr[54];
+	RHS11 += Idr[55];
+	RHS11 += Idr[56];
+	RHS11 += Idr[57];
+	RHS11 += Idr[58];
+	RHS11 -= go[58] * *cnV[58];
+	m_A52 += gt[59];
+	m_A52 += gt[60];
+	m_A52 += gt[61];
+	m_A52 += gt[62];
+	m_A52 += gt[63];
+	m_A50 += go[59];
+	m_A50 += go[60];
+	m_A49 += go[61];
+	m_A48 += go[62];
+	double RHS12 = Idr[59];
+	RHS12 += Idr[60];
+	RHS12 += Idr[61];
+	RHS12 += Idr[62];
+	RHS12 += Idr[63];
+	RHS12 -= go[63] * *cnV[63];
+	m_A63 += gt[64];
+	m_A63 += gt[65];
+	m_A63 += gt[66];
+	m_A63 += gt[67];
+	m_A63 += gt[68];
+	m_A63 += gt[69];
+	m_A63 += gt[70];
+	m_A63 += gt[71];
+	m_A63 += gt[72];
+	m_A63 += gt[73];
+	m_A63 += gt[74];
+	m_A56 += go[64];
+	m_A60 += go[65];
+	m_A60 += go[66];
+	m_A55 += go[67];
+	m_A59 += go[68];
+	m_A59 += go[69];
+	m_A54 += go[70];
+	m_A54 += go[71];
+	double RHS13 = Idr[64];
+	RHS13 += Idr[65];
+	RHS13 += Idr[66];
+	RHS13 += Idr[67];
+	RHS13 += Idr[68];
+	RHS13 += Idr[69];
+	RHS13 += Idr[70];
+	RHS13 += Idr[71];
+	RHS13 += Idr[72];
+	RHS13 += Idr[73];
+	RHS13 += Idr[74];
+	RHS13 -= go[72] * *cnV[72];
+	RHS13 -= go[73] * *cnV[73];
+	RHS13 -= go[74] * *cnV[74];
+	const double f0 = 1.0 / m_A0;
+	const double f0_13 = -f0 * m_A54;
+	m_A63 += m_A1 * f0_13;
+	RHS13 += f0_13 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_9 = -f1 * m_A30;
+	m_A33 += m_A3 * f1_9;
+	RHS9 += f1_9 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_11 = -f2 * m_A42;
+	m_A46 += m_A5 * f2_11;
+	RHS11 += f2_11 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_7 = -f3 * m_A20;
+	m_A21 += m_A7 * f3_7;
+	m_A22 += m_A8 * f3_7;
+	m_A23 += m_A9 * f3_7;
+	m_A24 += m_A10 * f3_7;
+	RHS7 += f3_7 * RHS3;
+	const double f3_9 = -f3 * m_A31;
+	m_A32 += m_A7 * f3_9;
+	m_A33 += m_A8 * f3_9;
+	m_A34 += m_A9 * f3_9;
+	m_A35 += m_A10 * f3_9;
+	RHS9 += f3_9 * RHS3;
+	const double f3_11 = -f3 * m_A43;
+	m_A44 += m_A7 * f3_11;
+	m_A45 += m_A8 * f3_11;
+	m_A46 += m_A9 * f3_11;
+	m_A47 += m_A10 * f3_11;
+	RHS11 += f3_11 * RHS3;
+	const double f3_13 = -f3 * m_A55;
+	m_A57 += m_A7 * f3_13;
+	m_A59 += m_A8 * f3_13;
+	m_A61 += m_A9 * f3_13;
+	m_A63 += m_A10 * f3_13;
+	RHS13 += f3_13 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_10 = -f4 * m_A36;
+	m_A39 += m_A12 * f4_10;
+	RHS10 += f4_10 * RHS4;
+	const double f5 = 1.0 / m_A13;
+	const double f5_12 = -f5 * m_A48;
+	m_A52 += m_A14 * f5_12;
+	RHS12 += f5_12 * RHS5;
+	const double f6 = 1.0 / m_A15;
+	const double f6_8 = -f6 * m_A25;
+	m_A26 += m_A16 * f6_8;
+	m_A27 += m_A17 * f6_8;
+	m_A28 += m_A18 * f6_8;
+	m_A29 += m_A19 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f6_10 = -f6 * m_A37;
+	m_A38 += m_A16 * f6_10;
+	m_A39 += m_A17 * f6_10;
+	m_A40 += m_A18 * f6_10;
+	m_A41 += m_A19 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f6_12 = -f6 * m_A49;
+	m_A50 += m_A16 * f6_12;
+	m_A51 += m_A17 * f6_12;
+	m_A52 += m_A18 * f6_12;
+	m_A53 += m_A19 * f6_12;
+	RHS12 += f6_12 * RHS6;
+	const double f6_13 = -f6 * m_A56;
+	m_A58 += m_A16 * f6_13;
+	m_A60 += m_A17 * f6_13;
+	m_A62 += m_A18 * f6_13;
+	m_A63 += m_A19 * f6_13;
+	RHS13 += f6_13 * RHS6;
+	const double f7 = 1.0 / m_A21;
+	const double f7_9 = -f7 * m_A32;
+	m_A33 += m_A22 * f7_9;
+	m_A34 += m_A23 * f7_9;
+	m_A35 += m_A24 * f7_9;
+	RHS9 += f7_9 * RHS7;
+	const double f7_11 = -f7 * m_A44;
+	m_A45 += m_A22 * f7_11;
+	m_A46 += m_A23 * f7_11;
+	m_A47 += m_A24 * f7_11;
+	RHS11 += f7_11 * RHS7;
+	const double f7_13 = -f7 * m_A57;
+	m_A59 += m_A22 * f7_13;
+	m_A61 += m_A23 * f7_13;
+	m_A63 += m_A24 * f7_13;
+	RHS13 += f7_13 * RHS7;
+	const double f8 = 1.0 / m_A26;
+	const double f8_10 = -f8 * m_A38;
+	m_A39 += m_A27 * f8_10;
+	m_A40 += m_A28 * f8_10;
+	m_A41 += m_A29 * f8_10;
+	RHS10 += f8_10 * RHS8;
+	const double f8_12 = -f8 * m_A50;
+	m_A51 += m_A27 * f8_12;
+	m_A52 += m_A28 * f8_12;
+	m_A53 += m_A29 * f8_12;
+	RHS12 += f8_12 * RHS8;
+	const double f8_13 = -f8 * m_A58;
+	m_A60 += m_A27 * f8_13;
+	m_A62 += m_A28 * f8_13;
+	m_A63 += m_A29 * f8_13;
+	RHS13 += f8_13 * RHS8;
+	const double f9 = 1.0 / m_A33;
+	const double f9_11 = -f9 * m_A45;
+	m_A46 += m_A34 * f9_11;
+	m_A47 += m_A35 * f9_11;
+	RHS11 += f9_11 * RHS9;
+	const double f9_13 = -f9 * m_A59;
+	m_A61 += m_A34 * f9_13;
+	m_A63 += m_A35 * f9_13;
+	RHS13 += f9_13 * RHS9;
+	const double f10 = 1.0 / m_A39;
+	const double f10_12 = -f10 * m_A51;
+	m_A52 += m_A40 * f10_12;
+	m_A53 += m_A41 * f10_12;
+	RHS12 += f10_12 * RHS10;
+	const double f10_13 = -f10 * m_A60;
+	m_A62 += m_A40 * f10_13;
+	m_A63 += m_A41 * f10_13;
+	RHS13 += f10_13 * RHS10;
+	const double f11 = 1.0 / m_A46;
+	const double f11_13 = -f11 * m_A61;
+	m_A63 += m_A47 * f11_13;
+	RHS13 += f11_13 * RHS11;
+	const double f12 = 1.0 / m_A52;
+	const double f12_13 = -f12 * m_A62;
+	m_A63 += m_A53 * f12_13;
+	RHS13 += f12_13 * RHS12;
+	V[13] = RHS13 / m_A63;
+	double tmp12 = 0.0;
+	tmp12 += m_A53 * V[13];
+	V[12] = (RHS12 - tmp12) / m_A52;
+	double tmp11 = 0.0;
+	tmp11 += m_A47 * V[13];
+	V[11] = (RHS11 - tmp11) / m_A46;
+	double tmp10 = 0.0;
+	tmp10 += m_A40 * V[12];
+	tmp10 += m_A41 * V[13];
+	V[10] = (RHS10 - tmp10) / m_A39;
+	double tmp9 = 0.0;
+	tmp9 += m_A34 * V[11];
+	tmp9 += m_A35 * V[13];
+	V[9] = (RHS9 - tmp9) / m_A33;
+	double tmp8 = 0.0;
+	tmp8 += m_A27 * V[10];
+	tmp8 += m_A28 * V[12];
+	tmp8 += m_A29 * V[13];
+	V[8] = (RHS8 - tmp8) / m_A26;
+	double tmp7 = 0.0;
+	tmp7 += m_A22 * V[9];
+	tmp7 += m_A23 * V[11];
+	tmp7 += m_A24 * V[13];
+	V[7] = (RHS7 - tmp7) / m_A21;
+	double tmp6 = 0.0;
+	tmp6 += m_A16 * V[8];
+	tmp6 += m_A17 * V[10];
+	tmp6 += m_A18 * V[12];
+	tmp6 += m_A19 * V[13];
+	V[6] = (RHS6 - tmp6) / m_A15;
+	double tmp5 = 0.0;
+	tmp5 += m_A14 * V[12];
+	V[5] = (RHS5 - tmp5) / m_A13;
+	double tmp4 = 0.0;
+	tmp4 += m_A12 * V[10];
+	V[4] = (RHS4 - tmp4) / m_A11;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[7];
+	tmp3 += m_A8 * V[9];
+	tmp3 += m_A9 * V[11];
+	tmp3 += m_A10 * V[13];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[11];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[9];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[13];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// barrier
+static void nl_gcr_ecf17036ce1c07cf_10_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A5 += gt[6];
+	m_A5 += gt[7];
+	m_A5 += gt[8];
+	m_A5 += gt[9];
+	m_A4 += go[6];
+	m_A6 += go[7];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	m_A9 += gt[10];
+	m_A9 += gt[11];
+	m_A9 += gt[12];
+	m_A9 += gt[13];
+	m_A9 += gt[14];
+	m_A7 += go[10];
+	m_A8 += go[11];
+	double RHS3 = Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	RHS3 -= go[14] * *cnV[14];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A5 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A7;
+	m_A9 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_3 = -f2 * m_A8;
+	m_A9 += m_A6 * f2_3;
+	RHS3 += f2_3 * RHS2;
+	V[3] = RHS3 / m_A9;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[3];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[3];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// armora
+static void nl_gcr_ee2cacaa15d32491_67_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A7 += go[6];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	RHS3 -= go[7] * *cnV[7];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A9 += go[8];
+	double RHS4 = Idr[8];
+	RHS4 += Idr[9];
+	RHS4 -= go[9] * *cnV[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A10 += gt[12];
+	m_A12 += go[10];
+	m_A11 += go[11];
+	double RHS5 = Idr[10];
+	RHS5 += Idr[11];
+	RHS5 += Idr[12];
+	RHS5 -= go[12] * *cnV[12];
+	m_A13 += gt[13];
+	m_A13 += gt[14];
+	m_A13 += gt[15];
+	m_A15 += go[13];
+	m_A14 += go[14];
+	double RHS6 = Idr[13];
+	RHS6 += Idr[14];
+	RHS6 += Idr[15];
+	RHS6 -= go[15] * *cnV[15];
+	m_A16 += gt[16];
+	m_A16 += gt[17];
+	m_A16 += gt[18];
+	m_A18 += go[16];
+	m_A17 += go[17];
+	double RHS7 = Idr[16];
+	RHS7 += Idr[17];
+	RHS7 += Idr[18];
+	RHS7 -= go[18] * *cnV[18];
+	m_A19 += gt[19];
+	m_A19 += gt[20];
+	m_A19 += gt[21];
+	m_A19 += gt[22];
+	m_A19 += gt[23];
+	m_A19 += gt[24];
+	m_A19 += gt[25];
+	m_A21 += go[19];
+	m_A20 += go[20];
+	double RHS8 = Idr[19];
+	RHS8 += Idr[20];
+	RHS8 += Idr[21];
+	RHS8 += Idr[22];
+	RHS8 += Idr[23];
+	RHS8 += Idr[24];
+	RHS8 += Idr[25];
+	RHS8 -= go[21] * *cnV[21];
+	RHS8 -= go[22] * *cnV[22];
+	RHS8 -= go[23] * *cnV[23];
+	RHS8 -= go[24] * *cnV[24];
+	RHS8 -= go[25] * *cnV[25];
+	m_A22 += gt[26];
+	m_A22 += gt[27];
+	m_A22 += gt[28];
+	m_A23 += go[26];
+	m_A24 += go[27];
+	double RHS9 = Idr[26];
+	RHS9 += Idr[27];
+	RHS9 += Idr[28];
+	RHS9 -= go[28] * *cnV[28];
+	m_A26 += gt[29];
+	m_A26 += gt[30];
+	m_A26 += gt[31];
+	m_A27 += go[29];
+	m_A25 += go[30];
+	double RHS10 = Idr[29];
+	RHS10 += Idr[30];
+	RHS10 += Idr[31];
+	RHS10 -= go[31] * *cnV[31];
+	m_A30 += gt[32];
+	m_A30 += gt[33];
+	m_A30 += gt[34];
+	m_A29 += go[32];
+	m_A28 += go[33];
+	double RHS11 = Idr[32];
+	RHS11 += Idr[33];
+	RHS11 += Idr[34];
+	RHS11 -= go[34] * *cnV[34];
+	m_A33 += gt[35];
+	m_A33 += gt[36];
+	m_A33 += gt[37];
+	m_A34 += go[35];
+	m_A32 += go[36];
+	double RHS12 = Idr[35];
+	RHS12 += Idr[36];
+	RHS12 += Idr[37];
+	RHS12 -= go[37] * *cnV[37];
+	m_A37 += gt[38];
+	m_A37 += gt[39];
+	m_A37 += gt[40];
+	m_A36 += go[38];
+	m_A35 += go[39];
+	double RHS13 = Idr[38];
+	RHS13 += Idr[39];
+	RHS13 += Idr[40];
+	RHS13 -= go[40] * *cnV[40];
+	m_A41 += gt[41];
+	m_A41 += gt[42];
+	m_A41 += gt[43];
+	m_A39 += go[41];
+	m_A42 += go[42];
+	double RHS14 = Idr[41];
+	RHS14 += Idr[42];
+	RHS14 += Idr[43];
+	RHS14 -= go[43] * *cnV[43];
+	m_A45 += gt[44];
+	m_A45 += gt[45];
+	m_A45 += gt[46];
+	m_A44 += go[44];
+	m_A43 += go[45];
+	double RHS15 = Idr[44];
+	RHS15 += Idr[45];
+	RHS15 += Idr[46];
+	RHS15 -= go[46] * *cnV[46];
+	m_A49 += gt[47];
+	m_A49 += gt[48];
+	m_A49 += gt[49];
+	m_A47 += go[47];
+	m_A50 += go[48];
+	double RHS16 = Idr[47];
+	RHS16 += Idr[48];
+	RHS16 += Idr[49];
+	RHS16 -= go[49] * *cnV[49];
+	m_A53 += gt[50];
+	m_A53 += gt[51];
+	m_A53 += gt[52];
+	m_A51 += go[50];
+	m_A52 += go[51];
+	double RHS17 = Idr[50];
+	RHS17 += Idr[51];
+	RHS17 += Idr[52];
+	RHS17 -= go[52] * *cnV[52];
+	m_A57 += gt[53];
+	m_A57 += gt[54];
+	m_A57 += gt[55];
+	m_A55 += go[53];
+	m_A58 += go[54];
+	double RHS18 = Idr[53];
+	RHS18 += Idr[54];
+	RHS18 += Idr[55];
+	RHS18 -= go[55] * *cnV[55];
+	m_A66 += gt[56];
+	m_A66 += gt[57];
+	m_A66 += gt[58];
+	m_A66 += gt[59];
+	m_A66 += gt[60];
+	m_A66 += gt[61];
+	m_A66 += gt[62];
+	m_A66 += gt[63];
+	m_A59 += go[56];
+	m_A60 += go[57];
+	m_A65 += go[58];
+	m_A63 += go[59];
+	m_A62 += go[60];
+	m_A61 += go[61];
+	double RHS19 = Idr[56];
+	RHS19 += Idr[57];
+	RHS19 += Idr[58];
+	RHS19 += Idr[59];
+	RHS19 += Idr[60];
+	RHS19 += Idr[61];
+	RHS19 += Idr[62];
+	RHS19 += Idr[63];
+	RHS19 -= go[62] * *cnV[62];
+	RHS19 -= go[63] * *cnV[63];
+	const double f0 = 1.0 / m_A0;
+	const double f0_11 = -f0 * m_A28;
+	m_A30 += m_A1 * f0_11;
+	RHS11 += f0_11 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_13 = -f1 * m_A35;
+	m_A37 += m_A3 * f1_13;
+	RHS13 += f1_13 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_15 = -f2 * m_A43;
+	m_A45 += m_A5 * f2_15;
+	RHS15 += f2_15 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_10 = -f3 * m_A25;
+	m_A26 += m_A7 * f3_10;
+	RHS10 += f3_10 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_12 = -f4 * m_A32;
+	m_A33 += m_A9 * f4_12;
+	RHS12 += f4_12 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_11 = -f5 * m_A29;
+	m_A30 += m_A11 * f5_11;
+	m_A31 += m_A12 * f5_11;
+	RHS11 += f5_11 * RHS5;
+	const double f5_14 = -f5 * m_A39;
+	m_A40 += m_A11 * f5_14;
+	m_A41 += m_A12 * f5_14;
+	RHS14 += f5_14 * RHS5;
+	const double f6 = 1.0 / m_A13;
+	const double f6_13 = -f6 * m_A36;
+	m_A37 += m_A14 * f6_13;
+	m_A38 += m_A15 * f6_13;
+	RHS13 += f6_13 * RHS6;
+	const double f6_16 = -f6 * m_A47;
+	m_A48 += m_A14 * f6_16;
+	m_A49 += m_A15 * f6_16;
+	RHS16 += f6_16 * RHS6;
+	const double f7 = 1.0 / m_A16;
+	const double f7_15 = -f7 * m_A44;
+	m_A45 += m_A17 * f7_15;
+	m_A46 += m_A18 * f7_15;
+	RHS15 += f7_15 * RHS7;
+	const double f7_18 = -f7 * m_A55;
+	m_A56 += m_A17 * f7_18;
+	m_A57 += m_A18 * f7_18;
+	RHS18 += f7_18 * RHS7;
+	const double f8 = 1.0 / m_A19;
+	const double f8_19 = -f8 * m_A59;
+	m_A61 += m_A20 * f8_19;
+	m_A66 += m_A21 * f8_19;
+	RHS19 += f8_19 * RHS8;
+	const double f9 = 1.0 / m_A22;
+	const double f9_17 = -f9 * m_A51;
+	m_A53 += m_A23 * f9_17;
+	m_A54 += m_A24 * f9_17;
+	RHS17 += f9_17 * RHS9;
+	const double f9_19 = -f9 * m_A60;
+	m_A64 += m_A23 * f9_19;
+	m_A66 += m_A24 * f9_19;
+	RHS19 += f9_19 * RHS9;
+	const double f10 = 1.0 / m_A26;
+	const double f10_19 = -f10 * m_A61;
+	m_A66 += m_A27 * f10_19;
+	RHS19 += f10_19 * RHS10;
+	const double f11 = 1.0 / m_A30;
+	const double f11_14 = -f11 * m_A40;
+	m_A41 += m_A31 * f11_14;
+	RHS14 += f11_14 * RHS11;
+	const double f12 = 1.0 / m_A33;
+	const double f12_17 = -f12 * m_A52;
+	m_A53 += m_A34 * f12_17;
+	RHS17 += f12_17 * RHS12;
+	const double f13 = 1.0 / m_A37;
+	const double f13_16 = -f13 * m_A48;
+	m_A49 += m_A38 * f13_16;
+	RHS16 += f13_16 * RHS13;
+	const double f14 = 1.0 / m_A41;
+	const double f14_19 = -f14 * m_A62;
+	m_A66 += m_A42 * f14_19;
+	RHS19 += f14_19 * RHS14;
+	const double f15 = 1.0 / m_A45;
+	const double f15_18 = -f15 * m_A56;
+	m_A57 += m_A46 * f15_18;
+	RHS18 += f15_18 * RHS15;
+	const double f16 = 1.0 / m_A49;
+	const double f16_19 = -f16 * m_A63;
+	m_A66 += m_A50 * f16_19;
+	RHS19 += f16_19 * RHS16;
+	const double f17 = 1.0 / m_A53;
+	const double f17_19 = -f17 * m_A64;
+	m_A66 += m_A54 * f17_19;
+	RHS19 += f17_19 * RHS17;
+	const double f18 = 1.0 / m_A57;
+	const double f18_19 = -f18 * m_A65;
+	m_A66 += m_A58 * f18_19;
+	RHS19 += f18_19 * RHS18;
+	V[19] = RHS19 / m_A66;
+	double tmp18 = 0.0;
+	tmp18 += m_A58 * V[19];
+	V[18] = (RHS18 - tmp18) / m_A57;
+	double tmp17 = 0.0;
+	tmp17 += m_A54 * V[19];
+	V[17] = (RHS17 - tmp17) / m_A53;
+	double tmp16 = 0.0;
+	tmp16 += m_A50 * V[19];
+	V[16] = (RHS16 - tmp16) / m_A49;
+	double tmp15 = 0.0;
+	tmp15 += m_A46 * V[18];
+	V[15] = (RHS15 - tmp15) / m_A45;
+	double tmp14 = 0.0;
+	tmp14 += m_A42 * V[19];
+	V[14] = (RHS14 - tmp14) / m_A41;
+	double tmp13 = 0.0;
+	tmp13 += m_A38 * V[16];
+	V[13] = (RHS13 - tmp13) / m_A37;
+	double tmp12 = 0.0;
+	tmp12 += m_A34 * V[17];
+	V[12] = (RHS12 - tmp12) / m_A33;
+	double tmp11 = 0.0;
+	tmp11 += m_A31 * V[14];
+	V[11] = (RHS11 - tmp11) / m_A30;
+	double tmp10 = 0.0;
+	tmp10 += m_A27 * V[19];
+	V[10] = (RHS10 - tmp10) / m_A26;
+	double tmp9 = 0.0;
+	tmp9 += m_A23 * V[17];
+	tmp9 += m_A24 * V[19];
+	V[9] = (RHS9 - tmp9) / m_A22;
+	double tmp8 = 0.0;
+	tmp8 += m_A20 * V[10];
+	tmp8 += m_A21 * V[19];
+	V[8] = (RHS8 - tmp8) / m_A19;
+	double tmp7 = 0.0;
+	tmp7 += m_A17 * V[15];
+	tmp7 += m_A18 * V[18];
+	V[7] = (RHS7 - tmp7) / m_A16;
+	double tmp6 = 0.0;
+	tmp6 += m_A14 * V[13];
+	tmp6 += m_A15 * V[16];
+	V[6] = (RHS6 - tmp6) / m_A13;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[11];
+	tmp5 += m_A12 * V[14];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[12];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[10];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[15];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[13];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[11];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// astrob
+static void nl_gcr_ee61dcaa355fc625_285_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
+	double m_A153(0.0);
+	double m_A154(0.0);
+	double m_A155(0.0);
+	double m_A156(0.0);
+	double m_A157(0.0);
+	double m_A158(0.0);
+	double m_A159(0.0);
+	double m_A160(0.0);
+	double m_A161(0.0);
+	double m_A162(0.0);
+	double m_A163(0.0);
+	double m_A164(0.0);
+	double m_A165(0.0);
+	double m_A166(0.0);
+	double m_A167(0.0);
+	double m_A168(0.0);
+	double m_A169(0.0);
+	double m_A170(0.0);
+	double m_A171(0.0);
+	double m_A172(0.0);
+	double m_A173(0.0);
+	double m_A174(0.0);
+	double m_A175(0.0);
+	double m_A176(0.0);
+	double m_A177(0.0);
+	double m_A178(0.0);
+	double m_A179(0.0);
+	double m_A180(0.0);
+	double m_A181(0.0);
+	double m_A182(0.0);
+	double m_A183(0.0);
+	double m_A184(0.0);
+	double m_A185(0.0);
+	double m_A186(0.0);
+	double m_A187(0.0);
+	double m_A188(0.0);
+	double m_A189(0.0);
+	double m_A190(0.0);
+	double m_A191(0.0);
+	double m_A192(0.0);
+	double m_A193(0.0);
+	double m_A194(0.0);
+	double m_A195(0.0);
+	double m_A196(0.0);
+	double m_A197(0.0);
+	double m_A198(0.0);
+	double m_A199(0.0);
+	double m_A200(0.0);
+	double m_A201(0.0);
+	double m_A202(0.0);
+	double m_A203(0.0);
+	double m_A204(0.0);
+	double m_A205(0.0);
+	double m_A206(0.0);
+	double m_A207(0.0);
+	double m_A208(0.0);
+	double m_A209(0.0);
+	double m_A210(0.0);
+	double m_A211(0.0);
+	double m_A212(0.0);
+	double m_A213(0.0);
+	double m_A214(0.0);
+	double m_A215(0.0);
+	double m_A216(0.0);
+	double m_A217(0.0);
+	double m_A218(0.0);
+	double m_A219(0.0);
+	double m_A220(0.0);
+	double m_A221(0.0);
+	double m_A222(0.0);
+	double m_A223(0.0);
+	double m_A224(0.0);
+	double m_A225(0.0);
+	double m_A226(0.0);
+	double m_A227(0.0);
+	double m_A228(0.0);
+	double m_A229(0.0);
+	double m_A230(0.0);
+	double m_A231(0.0);
+	double m_A232(0.0);
+	double m_A233(0.0);
+	double m_A234(0.0);
+	double m_A235(0.0);
+	double m_A236(0.0);
+	double m_A237(0.0);
+	double m_A238(0.0);
+	double m_A239(0.0);
+	double m_A240(0.0);
+	double m_A241(0.0);
+	double m_A242(0.0);
+	double m_A243(0.0);
+	double m_A244(0.0);
+	double m_A245(0.0);
+	double m_A246(0.0);
+	double m_A247(0.0);
+	double m_A248(0.0);
+	double m_A249(0.0);
+	double m_A250(0.0);
+	double m_A251(0.0);
+	double m_A252(0.0);
+	double m_A253(0.0);
+	double m_A254(0.0);
+	double m_A255(0.0);
+	double m_A256(0.0);
+	double m_A257(0.0);
+	double m_A258(0.0);
+	double m_A259(0.0);
+	double m_A260(0.0);
+	double m_A261(0.0);
+	double m_A262(0.0);
+	double m_A263(0.0);
+	double m_A264(0.0);
+	double m_A265(0.0);
+	double m_A266(0.0);
+	double m_A267(0.0);
+	double m_A268(0.0);
+	double m_A269(0.0);
+	double m_A270(0.0);
+	double m_A271(0.0);
+	double m_A272(0.0);
+	double m_A273(0.0);
+	double m_A274(0.0);
+	double m_A275(0.0);
+	double m_A276(0.0);
+	double m_A277(0.0);
+	double m_A278(0.0);
+	double m_A279(0.0);
+	double m_A280(0.0);
+	double m_A281(0.0);
+	double m_A282(0.0);
+	double m_A283(0.0);
+	double m_A284(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[9];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A9 += go[12];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 += Idr[14];
+	RHS4 -= go[13] * *cnV[13];
+	RHS4 -= go[14] * *cnV[14];
+	m_A10 += gt[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A11 += go[15];
+	double RHS5 = Idr[15];
+	RHS5 += Idr[16];
+	RHS5 += Idr[17];
+	RHS5 -= go[16] * *cnV[16];
+	RHS5 -= go[17] * *cnV[17];
+	m_A12 += gt[18];
+	m_A12 += gt[19];
+	m_A12 += gt[20];
+	m_A13 += go[18];
+	double RHS6 = Idr[18];
+	RHS6 += Idr[19];
+	RHS6 += Idr[20];
+	RHS6 -= go[19] * *cnV[19];
+	RHS6 -= go[20] * *cnV[20];
+	m_A14 += gt[21];
+	m_A14 += gt[22];
+	m_A14 += gt[23];
+	m_A15 += go[21];
+	double RHS7 = Idr[21];
+	RHS7 += Idr[22];
+	RHS7 += Idr[23];
+	RHS7 -= go[22] * *cnV[22];
+	RHS7 -= go[23] * *cnV[23];
+	m_A16 += gt[24];
+	m_A16 += gt[25];
+	m_A16 += gt[26];
+	m_A17 += go[24];
+	double RHS8 = Idr[24];
+	RHS8 += Idr[25];
+	RHS8 += Idr[26];
+	RHS8 -= go[25] * *cnV[25];
+	RHS8 -= go[26] * *cnV[26];
+	m_A18 += gt[27];
+	m_A18 += gt[28];
+	m_A18 += gt[29];
+	m_A19 += go[27];
+	double RHS9 = Idr[27];
+	RHS9 += Idr[28];
+	RHS9 += Idr[29];
+	RHS9 -= go[28] * *cnV[28];
+	RHS9 -= go[29] * *cnV[29];
+	m_A20 += gt[30];
+	m_A20 += gt[31];
+	m_A20 += gt[32];
+	m_A21 += go[30];
+	double RHS10 = Idr[30];
+	RHS10 += Idr[31];
+	RHS10 += Idr[32];
+	RHS10 -= go[31] * *cnV[31];
+	RHS10 -= go[32] * *cnV[32];
+	m_A22 += gt[33];
+	m_A22 += gt[34];
+	m_A22 += gt[35];
+	m_A22 += gt[36];
+	m_A22 += gt[37];
+	m_A22 += gt[38];
+	m_A22 += gt[39];
+	m_A24 += go[33];
+	m_A23 += go[34];
+	double RHS11 = Idr[33];
+	RHS11 += Idr[34];
+	RHS11 += Idr[35];
+	RHS11 += Idr[36];
+	RHS11 += Idr[37];
+	RHS11 += Idr[38];
+	RHS11 += Idr[39];
+	RHS11 -= go[35] * *cnV[35];
+	RHS11 -= go[36] * *cnV[36];
+	RHS11 -= go[37] * *cnV[37];
+	RHS11 -= go[38] * *cnV[38];
+	RHS11 -= go[39] * *cnV[39];
+	m_A25 += gt[40];
+	m_A25 += gt[41];
+	m_A26 += go[40];
+	double RHS12 = Idr[40];
+	RHS12 += Idr[41];
+	RHS12 -= go[41] * *cnV[41];
+	m_A27 += gt[42];
+	m_A27 += gt[43];
+	m_A28 += go[42];
+	double RHS13 = Idr[42];
+	RHS13 += Idr[43];
+	RHS13 -= go[43] * *cnV[43];
+	m_A29 += gt[44];
+	m_A29 += gt[45];
+	m_A30 += go[44];
+	double RHS14 = Idr[44];
+	RHS14 += Idr[45];
+	RHS14 -= go[45] * *cnV[45];
+	m_A31 += gt[46];
+	m_A31 += gt[47];
+	m_A31 += gt[48];
+	m_A32 += go[46];
+	double RHS15 = Idr[46];
+	RHS15 += Idr[47];
+	RHS15 += Idr[48];
+	RHS15 -= go[47] * *cnV[47];
+	RHS15 -= go[48] * *cnV[48];
+	m_A33 += gt[49];
+	m_A33 += gt[50];
+	m_A33 += gt[51];
+	m_A34 += go[49];
+	double RHS16 = Idr[49];
+	RHS16 += Idr[50];
+	RHS16 += Idr[51];
+	RHS16 -= go[50] * *cnV[50];
+	RHS16 -= go[51] * *cnV[51];
+	m_A35 += gt[52];
+	m_A35 += gt[53];
+	m_A35 += gt[54];
+	m_A36 += go[52];
+	double RHS17 = Idr[52];
+	RHS17 += Idr[53];
+	RHS17 += Idr[54];
+	RHS17 -= go[53] * *cnV[53];
+	RHS17 -= go[54] * *cnV[54];
+	m_A37 += gt[55];
+	m_A37 += gt[56];
+	m_A37 += gt[57];
+	m_A38 += go[55];
+	double RHS18 = Idr[55];
+	RHS18 += Idr[56];
+	RHS18 += Idr[57];
+	RHS18 -= go[56] * *cnV[56];
+	RHS18 -= go[57] * *cnV[57];
+	m_A39 += gt[58];
+	m_A39 += gt[59];
+	m_A40 += go[58];
+	double RHS19 = Idr[58];
+	RHS19 += Idr[59];
+	RHS19 -= go[59] * *cnV[59];
+	m_A41 += gt[60];
+	m_A41 += gt[61];
+	m_A41 += gt[62];
+	m_A41 += gt[63];
+	m_A41 += gt[64];
+	m_A41 += gt[65];
+	m_A41 += gt[66];
+	m_A42 += go[60];
+	double RHS20 = Idr[60];
+	RHS20 += Idr[61];
+	RHS20 += Idr[62];
+	RHS20 += Idr[63];
+	RHS20 += Idr[64];
+	RHS20 += Idr[65];
+	RHS20 += Idr[66];
+	RHS20 -= go[61] * *cnV[61];
+	RHS20 -= go[62] * *cnV[62];
+	RHS20 -= go[63] * *cnV[63];
+	RHS20 -= go[64] * *cnV[64];
+	RHS20 -= go[65] * *cnV[65];
+	RHS20 -= go[66] * *cnV[66];
+	m_A43 += gt[67];
+	m_A43 += gt[68];
+	m_A43 += gt[69];
+	m_A44 += go[67];
+	double RHS21 = Idr[67];
+	RHS21 += Idr[68];
+	RHS21 += Idr[69];
+	RHS21 -= go[68] * *cnV[68];
+	RHS21 -= go[69] * *cnV[69];
+	m_A45 += gt[70];
+	m_A45 += gt[71];
+	m_A45 += gt[72];
+	m_A45 += gt[73];
+	m_A45 += gt[74];
+	m_A45 += gt[75];
+	m_A45 += gt[76];
+	m_A46 += go[70];
+	double RHS22 = Idr[70];
+	RHS22 += Idr[71];
+	RHS22 += Idr[72];
+	RHS22 += Idr[73];
+	RHS22 += Idr[74];
+	RHS22 += Idr[75];
+	RHS22 += Idr[76];
+	RHS22 -= go[71] * *cnV[71];
+	RHS22 -= go[72] * *cnV[72];
+	RHS22 -= go[73] * *cnV[73];
+	RHS22 -= go[74] * *cnV[74];
+	RHS22 -= go[75] * *cnV[75];
+	RHS22 -= go[76] * *cnV[76];
+	m_A47 += gt[77];
+	m_A47 += gt[78];
+	m_A47 += gt[79];
+	m_A48 += go[77];
+	m_A49 += go[78];
+	double RHS23 = Idr[77];
+	RHS23 += Idr[78];
+	RHS23 += Idr[79];
+	RHS23 -= go[79] * *cnV[79];
+	m_A50 += gt[80];
+	m_A50 += gt[81];
+	m_A50 += gt[82];
+	m_A52 += go[80];
+	m_A51 += go[81];
+	double RHS24 = Idr[80];
+	RHS24 += Idr[81];
+	RHS24 += Idr[82];
+	RHS24 -= go[82] * *cnV[82];
+	m_A53 += gt[83];
+	m_A53 += gt[84];
+	m_A54 += go[83];
+	double RHS25 = Idr[83];
+	RHS25 += Idr[84];
+	RHS25 -= go[84] * *cnV[84];
+	m_A55 += gt[85];
+	m_A55 += gt[86];
+	m_A55 += gt[87];
+	m_A55 += gt[88];
+	m_A55 += gt[89];
+	m_A55 += gt[90];
+	m_A55 += gt[91];
+	m_A55 += gt[92];
+	m_A55 += gt[93];
+	m_A55 += gt[94];
+	m_A55 += gt[95];
+	m_A55 += gt[96];
+	m_A67 += go[85];
+	m_A56 += go[86];
+	m_A58 += go[87];
+	m_A60 += go[88];
+	m_A62 += go[89];
+	m_A64 += go[90];
+	m_A66 += go[91];
+	m_A65 += go[92];
+	m_A63 += go[93];
+	m_A61 += go[94];
+	m_A59 += go[95];
+	m_A57 += go[96];
+	double RHS26 = Idr[85];
+	RHS26 += Idr[86];
+	RHS26 += Idr[87];
+	RHS26 += Idr[88];
+	RHS26 += Idr[89];
+	RHS26 += Idr[90];
+	RHS26 += Idr[91];
+	RHS26 += Idr[92];
+	RHS26 += Idr[93];
+	RHS26 += Idr[94];
+	RHS26 += Idr[95];
+	RHS26 += Idr[96];
+	m_A69 += gt[97];
+	m_A69 += gt[98];
+	m_A69 += gt[99];
+	m_A68 += go[97];
+	m_A70 += go[98];
+	double RHS27 = Idr[97];
+	RHS27 += Idr[98];
+	RHS27 += Idr[99];
+	RHS27 -= go[99] * *cnV[99];
+	m_A72 += gt[100];
+	m_A72 += gt[101];
+	m_A72 += gt[102];
+	m_A71 += go[100];
+	m_A73 += go[101];
+	double RHS28 = Idr[100];
+	RHS28 += Idr[101];
+	RHS28 += Idr[102];
+	RHS28 -= go[102] * *cnV[102];
+	m_A75 += gt[103];
+	m_A75 += gt[104];
+	m_A75 += gt[105];
+	m_A74 += go[103];
+	m_A76 += go[104];
+	double RHS29 = Idr[103];
+	RHS29 += Idr[104];
+	RHS29 += Idr[105];
+	RHS29 -= go[105] * *cnV[105];
+	m_A82 += gt[106];
+	m_A82 += gt[107];
+	m_A82 += gt[108];
+	m_A82 += gt[109];
+	m_A82 += gt[110];
+	m_A82 += gt[111];
+	m_A82 += gt[112];
+	m_A81 += go[106];
+	m_A80 += go[107];
+	m_A79 += go[108];
+	m_A78 += go[109];
+	m_A77 += go[110];
+	m_A83 += go[111];
+	double RHS30 = Idr[106];
+	RHS30 += Idr[107];
+	RHS30 += Idr[108];
+	RHS30 += Idr[109];
+	RHS30 += Idr[110];
+	RHS30 += Idr[111];
+	RHS30 += Idr[112];
+	RHS30 -= go[112] * *cnV[112];
+	m_A84 += gt[113];
+	m_A84 += gt[114];
+	m_A86 += go[113];
+	m_A85 += go[114];
+	double RHS31 = Idr[113];
+	RHS31 += Idr[114];
+	m_A89 += gt[115];
+	m_A89 += gt[116];
+	m_A89 += gt[117];
+	m_A89 += gt[118];
+	m_A89 += gt[119];
+	m_A87 += go[115];
+	m_A91 += go[116];
+	m_A88 += go[117];
+	double RHS32 = Idr[115];
+	RHS32 += Idr[116];
+	RHS32 += Idr[117];
+	RHS32 += Idr[118];
+	RHS32 += Idr[119];
+	RHS32 -= go[118] * *cnV[118];
+	RHS32 -= go[119] * *cnV[119];
+	m_A94 += gt[120];
+	m_A94 += gt[121];
+	m_A94 += gt[122];
+	m_A94 += gt[123];
+	m_A92 += go[120];
+	m_A93 += go[121];
+	double RHS33 = Idr[120];
+	RHS33 += Idr[121];
+	RHS33 += Idr[122];
+	RHS33 += Idr[123];
+	RHS33 -= go[122] * *cnV[122];
+	RHS33 -= go[123] * *cnV[123];
+	m_A109 += gt[124];
+	m_A109 += gt[125];
+	m_A107 += go[124];
+	m_A106 += go[125];
+	double RHS34 = Idr[124];
+	RHS34 += Idr[125];
+	m_A124 += gt[126];
+	m_A124 += gt[127];
+	m_A121 += go[126];
+	m_A120 += go[127];
+	double RHS35 = Idr[126];
+	RHS35 += Idr[127];
+	m_A139 += gt[128];
+	m_A139 += gt[129];
+	m_A135 += go[128];
+	m_A134 += go[129];
+	double RHS36 = Idr[128];
+	RHS36 += Idr[129];
+	m_A154 += gt[130];
+	m_A154 += gt[131];
+	m_A149 += go[130];
+	m_A148 += go[131];
+	double RHS37 = Idr[130];
+	RHS37 += Idr[131];
+	m_A169 += gt[132];
+	m_A169 += gt[133];
+	m_A163 += go[132];
+	m_A162 += go[133];
+	double RHS38 = Idr[132];
+	RHS38 += Idr[133];
+	m_A184 += gt[134];
+	m_A184 += gt[135];
+	m_A177 += go[134];
+	m_A176 += go[135];
+	double RHS39 = Idr[134];
+	RHS39 += Idr[135];
+	m_A199 += gt[136];
+	m_A199 += gt[137];
+	m_A191 += go[136];
+	m_A190 += go[137];
+	double RHS40 = Idr[136];
+	RHS40 += Idr[137];
+	m_A214 += gt[138];
+	m_A214 += gt[139];
+	m_A205 += go[138];
+	m_A204 += go[139];
+	double RHS41 = Idr[138];
+	RHS41 += Idr[139];
+	m_A229 += gt[140];
+	m_A229 += gt[141];
+	m_A219 += go[140];
+	m_A218 += go[141];
+	double RHS42 = Idr[140];
+	RHS42 += Idr[141];
+	m_A244 += gt[142];
+	m_A244 += gt[143];
+	m_A233 += go[142];
+	m_A232 += go[143];
+	double RHS43 = Idr[142];
+	RHS43 += Idr[143];
+	m_A263 += gt[144];
+	m_A263 += gt[145];
+	m_A263 += gt[146];
+	m_A263 += gt[147];
+	m_A263 += gt[148];
+	m_A263 += gt[149];
+	m_A263 += gt[150];
+	m_A263 += gt[151];
+	m_A263 += gt[152];
+	m_A246 += go[144];
+	m_A264 += go[145];
+	m_A251 += go[146];
+	m_A250 += go[147];
+	m_A249 += go[148];
+	m_A248 += go[149];
+	m_A247 += go[150];
+	double RHS44 = Idr[144];
+	RHS44 += Idr[145];
+	RHS44 += Idr[146];
+	RHS44 += Idr[147];
+	RHS44 += Idr[148];
+	RHS44 += Idr[149];
+	RHS44 += Idr[150];
+	RHS44 += Idr[151];
+	RHS44 += Idr[152];
+	RHS44 -= go[151] * *cnV[151];
+	RHS44 -= go[152] * *cnV[152];
+	m_A270 += gt[153];
+	m_A270 += gt[154];
+	m_A270 += gt[155];
+	m_A270 += gt[156];
+	m_A270 += gt[157];
+	m_A270 += gt[158];
+	m_A270 += gt[159];
+	m_A265 += go[153];
+	m_A268 += go[154];
+	m_A267 += go[155];
+	m_A272 += go[156];
+	m_A266 += go[157];
+	double RHS45 = Idr[153];
+	RHS45 += Idr[154];
+	RHS45 += Idr[155];
+	RHS45 += Idr[156];
+	RHS45 += Idr[157];
+	RHS45 += Idr[158];
+	RHS45 += Idr[159];
+	RHS45 -= go[158] * *cnV[158];
+	RHS45 -= go[159] * *cnV[159];
+	m_A277 += gt[160];
+	m_A277 += gt[161];
+	m_A277 += gt[162];
+	m_A277 += gt[163];
+	m_A273 += go[160];
+	m_A274 += go[161];
+	m_A275 += go[162];
+	double RHS46 = Idr[160];
+	RHS46 += Idr[161];
+	RHS46 += Idr[162];
+	RHS46 += Idr[163];
+	RHS46 -= go[163] * *cnV[163];
+	m_A284 += gt[164];
+	m_A284 += gt[165];
+	m_A284 += gt[166];
+	m_A284 += gt[167];
+	m_A284 += gt[168];
+	m_A280 += go[164];
+	m_A279 += go[165];
+	m_A281 += go[166];
+	m_A282 += go[167];
+	double RHS47 = Idr[164];
+	RHS47 += Idr[165];
+	RHS47 += Idr[166];
+	RHS47 += Idr[167];
+	RHS47 += Idr[168];
+	RHS47 -= go[168] * *cnV[168];
+	const double f0 = 1.0 / m_A0;
+	const double f0_34 = -f0 * m_A106;
+	m_A109 += m_A1 * f0_34;
+	RHS34 += f0_34 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_36 = -f1 * m_A134;
+	m_A139 += m_A3 * f1_36;
+	RHS36 += f1_36 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_38 = -f2 * m_A162;
+	m_A169 += m_A5 * f2_38;
+	RHS38 += f2_38 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_40 = -f3 * m_A190;
+	m_A199 += m_A7 * f3_40;
+	RHS40 += f3_40 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_42 = -f4 * m_A218;
+	m_A229 += m_A9 * f4_42;
+	RHS42 += f4_42 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_43 = -f5 * m_A232;
+	m_A244 += m_A11 * f5_43;
+	RHS43 += f5_43 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_41 = -f6 * m_A204;
+	m_A214 += m_A13 * f6_41;
+	RHS41 += f6_41 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_39 = -f7 * m_A176;
+	m_A184 += m_A15 * f7_39;
+	RHS39 += f7_39 * RHS7;
+	const double f8 = 1.0 / m_A16;
+	const double f8_37 = -f8 * m_A148;
+	m_A154 += m_A17 * f8_37;
+	RHS37 += f8_37 * RHS8;
+	const double f9 = 1.0 / m_A18;
+	const double f9_35 = -f9 * m_A120;
+	m_A124 += m_A19 * f9_35;
+	RHS35 += f9_35 * RHS9;
+	const double f10 = 1.0 / m_A20;
+	const double f10_33 = -f10 * m_A92;
+	m_A94 += m_A21 * f10_33;
+	RHS33 += f10_33 * RHS10;
+	const double f11 = 1.0 / m_A22;
+	const double f11_44 = -f11 * m_A246;
+	m_A247 += m_A23 * f11_44;
+	m_A252 += m_A24 * f11_44;
+	RHS44 += f11_44 * RHS11;
+	const double f12 = 1.0 / m_A25;
+	const double f12_27 = -f12 * m_A68;
+	m_A69 += m_A26 * f12_27;
+	RHS27 += f12_27 * RHS12;
+	const double f13 = 1.0 / m_A27;
+	const double f13_28 = -f13 * m_A71;
+	m_A72 += m_A28 * f13_28;
+	RHS28 += f13_28 * RHS13;
+	const double f14 = 1.0 / m_A29;
+	const double f14_29 = -f14 * m_A74;
+	m_A75 += m_A30 * f14_29;
+	RHS29 += f14_29 * RHS14;
+	const double f15 = 1.0 / m_A31;
+	const double f15_30 = -f15 * m_A77;
+	m_A82 += m_A32 * f15_30;
+	RHS30 += f15_30 * RHS15;
+	const double f16 = 1.0 / m_A33;
+	const double f16_30 = -f16 * m_A78;
+	m_A82 += m_A34 * f16_30;
+	RHS30 += f16_30 * RHS16;
+	const double f17 = 1.0 / m_A35;
+	const double f17_30 = -f17 * m_A79;
+	m_A82 += m_A36 * f17_30;
+	RHS30 += f17_30 * RHS17;
+	const double f18 = 1.0 / m_A37;
+	const double f18_30 = -f18 * m_A80;
+	m_A82 += m_A38 * f18_30;
+	RHS30 += f18_30 * RHS18;
+	const double f19 = 1.0 / m_A39;
+	const double f19_30 = -f19 * m_A81;
+	m_A82 += m_A40 * f19_30;
+	RHS30 += f19_30 * RHS19;
+	const double f20 = 1.0 / m_A41;
+	const double f20_32 = -f20 * m_A87;
+	m_A88 += m_A42 * f20_32;
+	RHS32 += f20_32 * RHS20;
+	const double f21 = 1.0 / m_A43;
+	const double f21_47 = -f21 * m_A279;
+	m_A284 += m_A44 * f21_47;
+	RHS47 += f21_47 * RHS21;
+	const double f22 = 1.0 / m_A45;
+	const double f22_45 = -f22 * m_A265;
+	m_A267 += m_A46 * f22_45;
+	RHS45 += f22_45 * RHS22;
+	const double f23 = 1.0 / m_A47;
+	const double f23_32 = -f23 * m_A88;
+	m_A89 += m_A48 * f23_32;
+	m_A90 += m_A49 * f23_32;
+	RHS32 += f23_32 * RHS23;
+	const double f23_45 = -f23 * m_A266;
+	m_A269 += m_A48 * f23_45;
+	m_A270 += m_A49 * f23_45;
+	RHS45 += f23_45 * RHS23;
+	const double f24 = 1.0 / m_A50;
+	const double f24_45 = -f24 * m_A267;
+	m_A270 += m_A51 * f24_45;
+	m_A272 += m_A52 * f24_45;
+	RHS45 += f24_45 * RHS24;
+	const double f24_47 = -f24 * m_A280;
+	m_A282 += m_A51 * f24_47;
+	m_A284 += m_A52 * f24_47;
+	RHS47 += f24_47 * RHS24;
+	const double f25 = 1.0 / m_A53;
+	const double f25_46 = -f25 * m_A273;
+	m_A277 += m_A54 * f25_46;
+	RHS46 += f25_46 * RHS25;
+	const double f26 = 1.0 / m_A55;
+	const double f26_33 = -f26 * m_A93;
+	m_A94 += m_A56 * f26_33;
+	m_A95 += m_A57 * f26_33;
+	m_A96 += m_A58 * f26_33;
+	m_A97 += m_A59 * f26_33;
+	m_A98 += m_A60 * f26_33;
+	m_A99 += m_A61 * f26_33;
+	m_A100 += m_A62 * f26_33;
+	m_A101 += m_A63 * f26_33;
+	m_A102 += m_A64 * f26_33;
+	m_A103 += m_A65 * f26_33;
+	m_A104 += m_A66 * f26_33;
+	m_A105 += m_A67 * f26_33;
+	RHS33 += f26_33 * RHS26;
+	const double f26_34 = -f26 * m_A107;
+	m_A108 += m_A56 * f26_34;
+	m_A109 += m_A57 * f26_34;
+	m_A110 += m_A58 * f26_34;
+	m_A111 += m_A59 * f26_34;
+	m_A112 += m_A60 * f26_34;
+	m_A113 += m_A61 * f26_34;
+	m_A114 += m_A62 * f26_34;
+	m_A115 += m_A63 * f26_34;
+	m_A116 += m_A64 * f26_34;
+	m_A117 += m_A65 * f26_34;
+	m_A118 += m_A66 * f26_34;
+	m_A119 += m_A67 * f26_34;
+	RHS34 += f26_34 * RHS26;
+	const double f26_35 = -f26 * m_A121;
+	m_A122 += m_A56 * f26_35;
+	m_A123 += m_A57 * f26_35;
+	m_A124 += m_A58 * f26_35;
+	m_A125 += m_A59 * f26_35;
+	m_A126 += m_A60 * f26_35;
+	m_A127 += m_A61 * f26_35;
+	m_A128 += m_A62 * f26_35;
+	m_A129 += m_A63 * f26_35;
+	m_A130 += m_A64 * f26_35;
+	m_A131 += m_A65 * f26_35;
+	m_A132 += m_A66 * f26_35;
+	m_A133 += m_A67 * f26_35;
+	RHS35 += f26_35 * RHS26;
+	const double f26_36 = -f26 * m_A135;
+	m_A136 += m_A56 * f26_36;
+	m_A137 += m_A57 * f26_36;
+	m_A138 += m_A58 * f26_36;
+	m_A139 += m_A59 * f26_36;
+	m_A140 += m_A60 * f26_36;
+	m_A141 += m_A61 * f26_36;
+	m_A142 += m_A62 * f26_36;
+	m_A143 += m_A63 * f26_36;
+	m_A144 += m_A64 * f26_36;
+	m_A145 += m_A65 * f26_36;
+	m_A146 += m_A66 * f26_36;
+	m_A147 += m_A67 * f26_36;
+	RHS36 += f26_36 * RHS26;
+	const double f26_37 = -f26 * m_A149;
+	m_A150 += m_A56 * f26_37;
+	m_A151 += m_A57 * f26_37;
+	m_A152 += m_A58 * f26_37;
+	m_A153 += m_A59 * f26_37;
+	m_A154 += m_A60 * f26_37;
+	m_A155 += m_A61 * f26_37;
+	m_A156 += m_A62 * f26_37;
+	m_A157 += m_A63 * f26_37;
+	m_A158 += m_A64 * f26_37;
+	m_A159 += m_A65 * f26_37;
+	m_A160 += m_A66 * f26_37;
+	m_A161 += m_A67 * f26_37;
+	RHS37 += f26_37 * RHS26;
+	const double f26_38 = -f26 * m_A163;
+	m_A164 += m_A56 * f26_38;
+	m_A165 += m_A57 * f26_38;
+	m_A166 += m_A58 * f26_38;
+	m_A167 += m_A59 * f26_38;
+	m_A168 += m_A60 * f26_38;
+	m_A169 += m_A61 * f26_38;
+	m_A170 += m_A62 * f26_38;
+	m_A171 += m_A63 * f26_38;
+	m_A172 += m_A64 * f26_38;
+	m_A173 += m_A65 * f26_38;
+	m_A174 += m_A66 * f26_38;
+	m_A175 += m_A67 * f26_38;
+	RHS38 += f26_38 * RHS26;
+	const double f26_39 = -f26 * m_A177;
+	m_A178 += m_A56 * f26_39;
+	m_A179 += m_A57 * f26_39;
+	m_A180 += m_A58 * f26_39;
+	m_A181 += m_A59 * f26_39;
+	m_A182 += m_A60 * f26_39;
+	m_A183 += m_A61 * f26_39;
+	m_A184 += m_A62 * f26_39;
+	m_A185 += m_A63 * f26_39;
+	m_A186 += m_A64 * f26_39;
+	m_A187 += m_A65 * f26_39;
+	m_A188 += m_A66 * f26_39;
+	m_A189 += m_A67 * f26_39;
+	RHS39 += f26_39 * RHS26;
+	const double f26_40 = -f26 * m_A191;
+	m_A192 += m_A56 * f26_40;
+	m_A193 += m_A57 * f26_40;
+	m_A194 += m_A58 * f26_40;
+	m_A195 += m_A59 * f26_40;
+	m_A196 += m_A60 * f26_40;
+	m_A197 += m_A61 * f26_40;
+	m_A198 += m_A62 * f26_40;
+	m_A199 += m_A63 * f26_40;
+	m_A200 += m_A64 * f26_40;
+	m_A201 += m_A65 * f26_40;
+	m_A202 += m_A66 * f26_40;
+	m_A203 += m_A67 * f26_40;
+	RHS40 += f26_40 * RHS26;
+	const double f26_41 = -f26 * m_A205;
+	m_A206 += m_A56 * f26_41;
+	m_A207 += m_A57 * f26_41;
+	m_A208 += m_A58 * f26_41;
+	m_A209 += m_A59 * f26_41;
+	m_A210 += m_A60 * f26_41;
+	m_A211 += m_A61 * f26_41;
+	m_A212 += m_A62 * f26_41;
+	m_A213 += m_A63 * f26_41;
+	m_A214 += m_A64 * f26_41;
+	m_A215 += m_A65 * f26_41;
+	m_A216 += m_A66 * f26_41;
+	m_A217 += m_A67 * f26_41;
+	RHS41 += f26_41 * RHS26;
+	const double f26_42 = -f26 * m_A219;
+	m_A220 += m_A56 * f26_42;
+	m_A221 += m_A57 * f26_42;
+	m_A222 += m_A58 * f26_42;
+	m_A223 += m_A59 * f26_42;
+	m_A224 += m_A60 * f26_42;
+	m_A225 += m_A61 * f26_42;
+	m_A226 += m_A62 * f26_42;
+	m_A227 += m_A63 * f26_42;
+	m_A228 += m_A64 * f26_42;
+	m_A229 += m_A65 * f26_42;
+	m_A230 += m_A66 * f26_42;
+	m_A231 += m_A67 * f26_42;
+	RHS42 += f26_42 * RHS26;
+	const double f26_43 = -f26 * m_A233;
+	m_A234 += m_A56 * f26_43;
+	m_A235 += m_A57 * f26_43;
+	m_A236 += m_A58 * f26_43;
+	m_A237 += m_A59 * f26_43;
+	m_A238 += m_A60 * f26_43;
+	m_A239 += m_A61 * f26_43;
+	m_A240 += m_A62 * f26_43;
+	m_A241 += m_A63 * f26_43;
+	m_A242 += m_A64 * f26_43;
+	m_A243 += m_A65 * f26_43;
+	m_A244 += m_A66 * f26_43;
+	m_A245 += m_A67 * f26_43;
+	RHS43 += f26_43 * RHS26;
+	const double f26_44 = -f26 * m_A247;
+	m_A252 += m_A56 * f26_44;
+	m_A253 += m_A57 * f26_44;
+	m_A254 += m_A58 * f26_44;
+	m_A255 += m_A59 * f26_44;
+	m_A256 += m_A60 * f26_44;
+	m_A257 += m_A61 * f26_44;
+	m_A258 += m_A62 * f26_44;
+	m_A259 += m_A63 * f26_44;
+	m_A260 += m_A64 * f26_44;
+	m_A261 += m_A65 * f26_44;
+	m_A262 += m_A66 * f26_44;
+	m_A263 += m_A67 * f26_44;
+	RHS44 += f26_44 * RHS26;
+	const double f27 = 1.0 / m_A69;
+	const double f27_44 = -f27 * m_A248;
+	m_A263 += m_A70 * f27_44;
+	RHS44 += f27_44 * RHS27;
+	const double f28 = 1.0 / m_A72;
+	const double f28_44 = -f28 * m_A249;
+	m_A263 += m_A73 * f28_44;
+	RHS44 += f28_44 * RHS28;
+	const double f29 = 1.0 / m_A75;
+	const double f29_44 = -f29 * m_A250;
+	m_A263 += m_A76 * f29_44;
+	RHS44 += f29_44 * RHS29;
+	const double f30 = 1.0 / m_A82;
+	const double f30_44 = -f30 * m_A251;
+	m_A263 += m_A83 * f30_44;
+	RHS44 += f30_44 * RHS30;
+	const double f31 = 1.0 / m_A84;
+	const double f31_45 = -f31 * m_A268;
+	m_A270 += m_A85 * f31_45;
+	m_A271 += m_A86 * f31_45;
+	RHS45 += f31_45 * RHS31;
+	const double f31_46 = -f31 * m_A274;
+	m_A276 += m_A85 * f31_46;
+	m_A277 += m_A86 * f31_46;
+	RHS46 += f31_46 * RHS31;
+	const double f32 = 1.0 / m_A89;
+	const double f32_45 = -f32 * m_A269;
+	m_A270 += m_A90 * f32_45;
+	m_A272 += m_A91 * f32_45;
+	RHS45 += f32_45 * RHS32;
+	const double f32_47 = -f32 * m_A281;
+	m_A282 += m_A90 * f32_47;
+	m_A284 += m_A91 * f32_47;
+	RHS47 += f32_47 * RHS32;
+	const double f33 = 1.0 / m_A94;
+	const double f33_34 = -f33 * m_A108;
+	m_A109 += m_A95 * f33_34;
+	m_A110 += m_A96 * f33_34;
+	m_A111 += m_A97 * f33_34;
+	m_A112 += m_A98 * f33_34;
+	m_A113 += m_A99 * f33_34;
+	m_A114 += m_A100 * f33_34;
+	m_A115 += m_A101 * f33_34;
+	m_A116 += m_A102 * f33_34;
+	m_A117 += m_A103 * f33_34;
+	m_A118 += m_A104 * f33_34;
+	m_A119 += m_A105 * f33_34;
+	RHS34 += f33_34 * RHS33;
+	const double f33_35 = -f33 * m_A122;
+	m_A123 += m_A95 * f33_35;
+	m_A124 += m_A96 * f33_35;
+	m_A125 += m_A97 * f33_35;
+	m_A126 += m_A98 * f33_35;
+	m_A127 += m_A99 * f33_35;
+	m_A128 += m_A100 * f33_35;
+	m_A129 += m_A101 * f33_35;
+	m_A130 += m_A102 * f33_35;
+	m_A131 += m_A103 * f33_35;
+	m_A132 += m_A104 * f33_35;
+	m_A133 += m_A105 * f33_35;
+	RHS35 += f33_35 * RHS33;
+	const double f33_36 = -f33 * m_A136;
+	m_A137 += m_A95 * f33_36;
+	m_A138 += m_A96 * f33_36;
+	m_A139 += m_A97 * f33_36;
+	m_A140 += m_A98 * f33_36;
+	m_A141 += m_A99 * f33_36;
+	m_A142 += m_A100 * f33_36;
+	m_A143 += m_A101 * f33_36;
+	m_A144 += m_A102 * f33_36;
+	m_A145 += m_A103 * f33_36;
+	m_A146 += m_A104 * f33_36;
+	m_A147 += m_A105 * f33_36;
+	RHS36 += f33_36 * RHS33;
+	const double f33_37 = -f33 * m_A150;
+	m_A151 += m_A95 * f33_37;
+	m_A152 += m_A96 * f33_37;
+	m_A153 += m_A97 * f33_37;
+	m_A154 += m_A98 * f33_37;
+	m_A155 += m_A99 * f33_37;
+	m_A156 += m_A100 * f33_37;
+	m_A157 += m_A101 * f33_37;
+	m_A158 += m_A102 * f33_37;
+	m_A159 += m_A103 * f33_37;
+	m_A160 += m_A104 * f33_37;
+	m_A161 += m_A105 * f33_37;
+	RHS37 += f33_37 * RHS33;
+	const double f33_38 = -f33 * m_A164;
+	m_A165 += m_A95 * f33_38;
+	m_A166 += m_A96 * f33_38;
+	m_A167 += m_A97 * f33_38;
+	m_A168 += m_A98 * f33_38;
+	m_A169 += m_A99 * f33_38;
+	m_A170 += m_A100 * f33_38;
+	m_A171 += m_A101 * f33_38;
+	m_A172 += m_A102 * f33_38;
+	m_A173 += m_A103 * f33_38;
+	m_A174 += m_A104 * f33_38;
+	m_A175 += m_A105 * f33_38;
+	RHS38 += f33_38 * RHS33;
+	const double f33_39 = -f33 * m_A178;
+	m_A179 += m_A95 * f33_39;
+	m_A180 += m_A96 * f33_39;
+	m_A181 += m_A97 * f33_39;
+	m_A182 += m_A98 * f33_39;
+	m_A183 += m_A99 * f33_39;
+	m_A184 += m_A100 * f33_39;
+	m_A185 += m_A101 * f33_39;
+	m_A186 += m_A102 * f33_39;
+	m_A187 += m_A103 * f33_39;
+	m_A188 += m_A104 * f33_39;
+	m_A189 += m_A105 * f33_39;
+	RHS39 += f33_39 * RHS33;
+	const double f33_40 = -f33 * m_A192;
+	m_A193 += m_A95 * f33_40;
+	m_A194 += m_A96 * f33_40;
+	m_A195 += m_A97 * f33_40;
+	m_A196 += m_A98 * f33_40;
+	m_A197 += m_A99 * f33_40;
+	m_A198 += m_A100 * f33_40;
+	m_A199 += m_A101 * f33_40;
+	m_A200 += m_A102 * f33_40;
+	m_A201 += m_A103 * f33_40;
+	m_A202 += m_A104 * f33_40;
+	m_A203 += m_A105 * f33_40;
+	RHS40 += f33_40 * RHS33;
+	const double f33_41 = -f33 * m_A206;
+	m_A207 += m_A95 * f33_41;
+	m_A208 += m_A96 * f33_41;
+	m_A209 += m_A97 * f33_41;
+	m_A210 += m_A98 * f33_41;
+	m_A211 += m_A99 * f33_41;
+	m_A212 += m_A100 * f33_41;
+	m_A213 += m_A101 * f33_41;
+	m_A214 += m_A102 * f33_41;
+	m_A215 += m_A103 * f33_41;
+	m_A216 += m_A104 * f33_41;
+	m_A217 += m_A105 * f33_41;
+	RHS41 += f33_41 * RHS33;
+	const double f33_42 = -f33 * m_A220;
+	m_A221 += m_A95 * f33_42;
+	m_A222 += m_A96 * f33_42;
+	m_A223 += m_A97 * f33_42;
+	m_A224 += m_A98 * f33_42;
+	m_A225 += m_A99 * f33_42;
+	m_A226 += m_A100 * f33_42;
+	m_A227 += m_A101 * f33_42;
+	m_A228 += m_A102 * f33_42;
+	m_A229 += m_A103 * f33_42;
+	m_A230 += m_A104 * f33_42;
+	m_A231 += m_A105 * f33_42;
+	RHS42 += f33_42 * RHS33;
+	const double f33_43 = -f33 * m_A234;
+	m_A235 += m_A95 * f33_43;
+	m_A236 += m_A96 * f33_43;
+	m_A237 += m_A97 * f33_43;
+	m_A238 += m_A98 * f33_43;
+	m_A239 += m_A99 * f33_43;
+	m_A240 += m_A100 * f33_43;
+	m_A241 += m_A101 * f33_43;
+	m_A242 += m_A102 * f33_43;
+	m_A243 += m_A103 * f33_43;
+	m_A244 += m_A104 * f33_43;
+	m_A245 += m_A105 * f33_43;
+	RHS43 += f33_43 * RHS33;
+	const double f33_44 = -f33 * m_A252;
+	m_A253 += m_A95 * f33_44;
+	m_A254 += m_A96 * f33_44;
+	m_A255 += m_A97 * f33_44;
+	m_A256 += m_A98 * f33_44;
+	m_A257 += m_A99 * f33_44;
+	m_A258 += m_A100 * f33_44;
+	m_A259 += m_A101 * f33_44;
+	m_A260 += m_A102 * f33_44;
+	m_A261 += m_A103 * f33_44;
+	m_A262 += m_A104 * f33_44;
+	m_A263 += m_A105 * f33_44;
+	RHS44 += f33_44 * RHS33;
+	const double f34 = 1.0 / m_A109;
+	const double f34_35 = -f34 * m_A123;
+	m_A124 += m_A110 * f34_35;
+	m_A125 += m_A111 * f34_35;
+	m_A126 += m_A112 * f34_35;
+	m_A127 += m_A113 * f34_35;
+	m_A128 += m_A114 * f34_35;
+	m_A129 += m_A115 * f34_35;
+	m_A130 += m_A116 * f34_35;
+	m_A131 += m_A117 * f34_35;
+	m_A132 += m_A118 * f34_35;
+	m_A133 += m_A119 * f34_35;
+	RHS35 += f34_35 * RHS34;
+	const double f34_36 = -f34 * m_A137;
+	m_A138 += m_A110 * f34_36;
+	m_A139 += m_A111 * f34_36;
+	m_A140 += m_A112 * f34_36;
+	m_A141 += m_A113 * f34_36;
+	m_A142 += m_A114 * f34_36;
+	m_A143 += m_A115 * f34_36;
+	m_A144 += m_A116 * f34_36;
+	m_A145 += m_A117 * f34_36;
+	m_A146 += m_A118 * f34_36;
+	m_A147 += m_A119 * f34_36;
+	RHS36 += f34_36 * RHS34;
+	const double f34_37 = -f34 * m_A151;
+	m_A152 += m_A110 * f34_37;
+	m_A153 += m_A111 * f34_37;
+	m_A154 += m_A112 * f34_37;
+	m_A155 += m_A113 * f34_37;
+	m_A156 += m_A114 * f34_37;
+	m_A157 += m_A115 * f34_37;
+	m_A158 += m_A116 * f34_37;
+	m_A159 += m_A117 * f34_37;
+	m_A160 += m_A118 * f34_37;
+	m_A161 += m_A119 * f34_37;
+	RHS37 += f34_37 * RHS34;
+	const double f34_38 = -f34 * m_A165;
+	m_A166 += m_A110 * f34_38;
+	m_A167 += m_A111 * f34_38;
+	m_A168 += m_A112 * f34_38;
+	m_A169 += m_A113 * f34_38;
+	m_A170 += m_A114 * f34_38;
+	m_A171 += m_A115 * f34_38;
+	m_A172 += m_A116 * f34_38;
+	m_A173 += m_A117 * f34_38;
+	m_A174 += m_A118 * f34_38;
+	m_A175 += m_A119 * f34_38;
+	RHS38 += f34_38 * RHS34;
+	const double f34_39 = -f34 * m_A179;
+	m_A180 += m_A110 * f34_39;
+	m_A181 += m_A111 * f34_39;
+	m_A182 += m_A112 * f34_39;
+	m_A183 += m_A113 * f34_39;
+	m_A184 += m_A114 * f34_39;
+	m_A185 += m_A115 * f34_39;
+	m_A186 += m_A116 * f34_39;
+	m_A187 += m_A117 * f34_39;
+	m_A188 += m_A118 * f34_39;
+	m_A189 += m_A119 * f34_39;
+	RHS39 += f34_39 * RHS34;
+	const double f34_40 = -f34 * m_A193;
+	m_A194 += m_A110 * f34_40;
+	m_A195 += m_A111 * f34_40;
+	m_A196 += m_A112 * f34_40;
+	m_A197 += m_A113 * f34_40;
+	m_A198 += m_A114 * f34_40;
+	m_A199 += m_A115 * f34_40;
+	m_A200 += m_A116 * f34_40;
+	m_A201 += m_A117 * f34_40;
+	m_A202 += m_A118 * f34_40;
+	m_A203 += m_A119 * f34_40;
+	RHS40 += f34_40 * RHS34;
+	const double f34_41 = -f34 * m_A207;
+	m_A208 += m_A110 * f34_41;
+	m_A209 += m_A111 * f34_41;
+	m_A210 += m_A112 * f34_41;
+	m_A211 += m_A113 * f34_41;
+	m_A212 += m_A114 * f34_41;
+	m_A213 += m_A115 * f34_41;
+	m_A214 += m_A116 * f34_41;
+	m_A215 += m_A117 * f34_41;
+	m_A216 += m_A118 * f34_41;
+	m_A217 += m_A119 * f34_41;
+	RHS41 += f34_41 * RHS34;
+	const double f34_42 = -f34 * m_A221;
+	m_A222 += m_A110 * f34_42;
+	m_A223 += m_A111 * f34_42;
+	m_A224 += m_A112 * f34_42;
+	m_A225 += m_A113 * f34_42;
+	m_A226 += m_A114 * f34_42;
+	m_A227 += m_A115 * f34_42;
+	m_A228 += m_A116 * f34_42;
+	m_A229 += m_A117 * f34_42;
+	m_A230 += m_A118 * f34_42;
+	m_A231 += m_A119 * f34_42;
+	RHS42 += f34_42 * RHS34;
+	const double f34_43 = -f34 * m_A235;
+	m_A236 += m_A110 * f34_43;
+	m_A237 += m_A111 * f34_43;
+	m_A238 += m_A112 * f34_43;
+	m_A239 += m_A113 * f34_43;
+	m_A240 += m_A114 * f34_43;
+	m_A241 += m_A115 * f34_43;
+	m_A242 += m_A116 * f34_43;
+	m_A243 += m_A117 * f34_43;
+	m_A244 += m_A118 * f34_43;
+	m_A245 += m_A119 * f34_43;
+	RHS43 += f34_43 * RHS34;
+	const double f34_44 = -f34 * m_A253;
+	m_A254 += m_A110 * f34_44;
+	m_A255 += m_A111 * f34_44;
+	m_A256 += m_A112 * f34_44;
+	m_A257 += m_A113 * f34_44;
+	m_A258 += m_A114 * f34_44;
+	m_A259 += m_A115 * f34_44;
+	m_A260 += m_A116 * f34_44;
+	m_A261 += m_A117 * f34_44;
+	m_A262 += m_A118 * f34_44;
+	m_A263 += m_A119 * f34_44;
+	RHS44 += f34_44 * RHS34;
+	const double f35 = 1.0 / m_A124;
+	const double f35_36 = -f35 * m_A138;
+	m_A139 += m_A125 * f35_36;
+	m_A140 += m_A126 * f35_36;
+	m_A141 += m_A127 * f35_36;
+	m_A142 += m_A128 * f35_36;
+	m_A143 += m_A129 * f35_36;
+	m_A144 += m_A130 * f35_36;
+	m_A145 += m_A131 * f35_36;
+	m_A146 += m_A132 * f35_36;
+	m_A147 += m_A133 * f35_36;
+	RHS36 += f35_36 * RHS35;
+	const double f35_37 = -f35 * m_A152;
+	m_A153 += m_A125 * f35_37;
+	m_A154 += m_A126 * f35_37;
+	m_A155 += m_A127 * f35_37;
+	m_A156 += m_A128 * f35_37;
+	m_A157 += m_A129 * f35_37;
+	m_A158 += m_A130 * f35_37;
+	m_A159 += m_A131 * f35_37;
+	m_A160 += m_A132 * f35_37;
+	m_A161 += m_A133 * f35_37;
+	RHS37 += f35_37 * RHS35;
+	const double f35_38 = -f35 * m_A166;
+	m_A167 += m_A125 * f35_38;
+	m_A168 += m_A126 * f35_38;
+	m_A169 += m_A127 * f35_38;
+	m_A170 += m_A128 * f35_38;
+	m_A171 += m_A129 * f35_38;
+	m_A172 += m_A130 * f35_38;
+	m_A173 += m_A131 * f35_38;
+	m_A174 += m_A132 * f35_38;
+	m_A175 += m_A133 * f35_38;
+	RHS38 += f35_38 * RHS35;
+	const double f35_39 = -f35 * m_A180;
+	m_A181 += m_A125 * f35_39;
+	m_A182 += m_A126 * f35_39;
+	m_A183 += m_A127 * f35_39;
+	m_A184 += m_A128 * f35_39;
+	m_A185 += m_A129 * f35_39;
+	m_A186 += m_A130 * f35_39;
+	m_A187 += m_A131 * f35_39;
+	m_A188 += m_A132 * f35_39;
+	m_A189 += m_A133 * f35_39;
+	RHS39 += f35_39 * RHS35;
+	const double f35_40 = -f35 * m_A194;
+	m_A195 += m_A125 * f35_40;
+	m_A196 += m_A126 * f35_40;
+	m_A197 += m_A127 * f35_40;
+	m_A198 += m_A128 * f35_40;
+	m_A199 += m_A129 * f35_40;
+	m_A200 += m_A130 * f35_40;
+	m_A201 += m_A131 * f35_40;
+	m_A202 += m_A132 * f35_40;
+	m_A203 += m_A133 * f35_40;
+	RHS40 += f35_40 * RHS35;
+	const double f35_41 = -f35 * m_A208;
+	m_A209 += m_A125 * f35_41;
+	m_A210 += m_A126 * f35_41;
+	m_A211 += m_A127 * f35_41;
+	m_A212 += m_A128 * f35_41;
+	m_A213 += m_A129 * f35_41;
+	m_A214 += m_A130 * f35_41;
+	m_A215 += m_A131 * f35_41;
+	m_A216 += m_A132 * f35_41;
+	m_A217 += m_A133 * f35_41;
+	RHS41 += f35_41 * RHS35;
+	const double f35_42 = -f35 * m_A222;
+	m_A223 += m_A125 * f35_42;
+	m_A224 += m_A126 * f35_42;
+	m_A225 += m_A127 * f35_42;
+	m_A226 += m_A128 * f35_42;
+	m_A227 += m_A129 * f35_42;
+	m_A228 += m_A130 * f35_42;
+	m_A229 += m_A131 * f35_42;
+	m_A230 += m_A132 * f35_42;
+	m_A231 += m_A133 * f35_42;
+	RHS42 += f35_42 * RHS35;
+	const double f35_43 = -f35 * m_A236;
+	m_A237 += m_A125 * f35_43;
+	m_A238 += m_A126 * f35_43;
+	m_A239 += m_A127 * f35_43;
+	m_A240 += m_A128 * f35_43;
+	m_A241 += m_A129 * f35_43;
+	m_A242 += m_A130 * f35_43;
+	m_A243 += m_A131 * f35_43;
+	m_A244 += m_A132 * f35_43;
+	m_A245 += m_A133 * f35_43;
+	RHS43 += f35_43 * RHS35;
+	const double f35_44 = -f35 * m_A254;
+	m_A255 += m_A125 * f35_44;
+	m_A256 += m_A126 * f35_44;
+	m_A257 += m_A127 * f35_44;
+	m_A258 += m_A128 * f35_44;
+	m_A259 += m_A129 * f35_44;
+	m_A260 += m_A130 * f35_44;
+	m_A261 += m_A131 * f35_44;
+	m_A262 += m_A132 * f35_44;
+	m_A263 += m_A133 * f35_44;
+	RHS44 += f35_44 * RHS35;
+	const double f36 = 1.0 / m_A139;
+	const double f36_37 = -f36 * m_A153;
+	m_A154 += m_A140 * f36_37;
+	m_A155 += m_A141 * f36_37;
+	m_A156 += m_A142 * f36_37;
+	m_A157 += m_A143 * f36_37;
+	m_A158 += m_A144 * f36_37;
+	m_A159 += m_A145 * f36_37;
+	m_A160 += m_A146 * f36_37;
+	m_A161 += m_A147 * f36_37;
+	RHS37 += f36_37 * RHS36;
+	const double f36_38 = -f36 * m_A167;
+	m_A168 += m_A140 * f36_38;
+	m_A169 += m_A141 * f36_38;
+	m_A170 += m_A142 * f36_38;
+	m_A171 += m_A143 * f36_38;
+	m_A172 += m_A144 * f36_38;
+	m_A173 += m_A145 * f36_38;
+	m_A174 += m_A146 * f36_38;
+	m_A175 += m_A147 * f36_38;
+	RHS38 += f36_38 * RHS36;
+	const double f36_39 = -f36 * m_A181;
+	m_A182 += m_A140 * f36_39;
+	m_A183 += m_A141 * f36_39;
+	m_A184 += m_A142 * f36_39;
+	m_A185 += m_A143 * f36_39;
+	m_A186 += m_A144 * f36_39;
+	m_A187 += m_A145 * f36_39;
+	m_A188 += m_A146 * f36_39;
+	m_A189 += m_A147 * f36_39;
+	RHS39 += f36_39 * RHS36;
+	const double f36_40 = -f36 * m_A195;
+	m_A196 += m_A140 * f36_40;
+	m_A197 += m_A141 * f36_40;
+	m_A198 += m_A142 * f36_40;
+	m_A199 += m_A143 * f36_40;
+	m_A200 += m_A144 * f36_40;
+	m_A201 += m_A145 * f36_40;
+	m_A202 += m_A146 * f36_40;
+	m_A203 += m_A147 * f36_40;
+	RHS40 += f36_40 * RHS36;
+	const double f36_41 = -f36 * m_A209;
+	m_A210 += m_A140 * f36_41;
+	m_A211 += m_A141 * f36_41;
+	m_A212 += m_A142 * f36_41;
+	m_A213 += m_A143 * f36_41;
+	m_A214 += m_A144 * f36_41;
+	m_A215 += m_A145 * f36_41;
+	m_A216 += m_A146 * f36_41;
+	m_A217 += m_A147 * f36_41;
+	RHS41 += f36_41 * RHS36;
+	const double f36_42 = -f36 * m_A223;
+	m_A224 += m_A140 * f36_42;
+	m_A225 += m_A141 * f36_42;
+	m_A226 += m_A142 * f36_42;
+	m_A227 += m_A143 * f36_42;
+	m_A228 += m_A144 * f36_42;
+	m_A229 += m_A145 * f36_42;
+	m_A230 += m_A146 * f36_42;
+	m_A231 += m_A147 * f36_42;
+	RHS42 += f36_42 * RHS36;
+	const double f36_43 = -f36 * m_A237;
+	m_A238 += m_A140 * f36_43;
+	m_A239 += m_A141 * f36_43;
+	m_A240 += m_A142 * f36_43;
+	m_A241 += m_A143 * f36_43;
+	m_A242 += m_A144 * f36_43;
+	m_A243 += m_A145 * f36_43;
+	m_A244 += m_A146 * f36_43;
+	m_A245 += m_A147 * f36_43;
+	RHS43 += f36_43 * RHS36;
+	const double f36_44 = -f36 * m_A255;
+	m_A256 += m_A140 * f36_44;
+	m_A257 += m_A141 * f36_44;
+	m_A258 += m_A142 * f36_44;
+	m_A259 += m_A143 * f36_44;
+	m_A260 += m_A144 * f36_44;
+	m_A261 += m_A145 * f36_44;
+	m_A262 += m_A146 * f36_44;
+	m_A263 += m_A147 * f36_44;
+	RHS44 += f36_44 * RHS36;
+	const double f37 = 1.0 / m_A154;
+	const double f37_38 = -f37 * m_A168;
+	m_A169 += m_A155 * f37_38;
+	m_A170 += m_A156 * f37_38;
+	m_A171 += m_A157 * f37_38;
+	m_A172 += m_A158 * f37_38;
+	m_A173 += m_A159 * f37_38;
+	m_A174 += m_A160 * f37_38;
+	m_A175 += m_A161 * f37_38;
+	RHS38 += f37_38 * RHS37;
+	const double f37_39 = -f37 * m_A182;
+	m_A183 += m_A155 * f37_39;
+	m_A184 += m_A156 * f37_39;
+	m_A185 += m_A157 * f37_39;
+	m_A186 += m_A158 * f37_39;
+	m_A187 += m_A159 * f37_39;
+	m_A188 += m_A160 * f37_39;
+	m_A189 += m_A161 * f37_39;
+	RHS39 += f37_39 * RHS37;
+	const double f37_40 = -f37 * m_A196;
+	m_A197 += m_A155 * f37_40;
+	m_A198 += m_A156 * f37_40;
+	m_A199 += m_A157 * f37_40;
+	m_A200 += m_A158 * f37_40;
+	m_A201 += m_A159 * f37_40;
+	m_A202 += m_A160 * f37_40;
+	m_A203 += m_A161 * f37_40;
+	RHS40 += f37_40 * RHS37;
+	const double f37_41 = -f37 * m_A210;
+	m_A211 += m_A155 * f37_41;
+	m_A212 += m_A156 * f37_41;
+	m_A213 += m_A157 * f37_41;
+	m_A214 += m_A158 * f37_41;
+	m_A215 += m_A159 * f37_41;
+	m_A216 += m_A160 * f37_41;
+	m_A217 += m_A161 * f37_41;
+	RHS41 += f37_41 * RHS37;
+	const double f37_42 = -f37 * m_A224;
+	m_A225 += m_A155 * f37_42;
+	m_A226 += m_A156 * f37_42;
+	m_A227 += m_A157 * f37_42;
+	m_A228 += m_A158 * f37_42;
+	m_A229 += m_A159 * f37_42;
+	m_A230 += m_A160 * f37_42;
+	m_A231 += m_A161 * f37_42;
+	RHS42 += f37_42 * RHS37;
+	const double f37_43 = -f37 * m_A238;
+	m_A239 += m_A155 * f37_43;
+	m_A240 += m_A156 * f37_43;
+	m_A241 += m_A157 * f37_43;
+	m_A242 += m_A158 * f37_43;
+	m_A243 += m_A159 * f37_43;
+	m_A244 += m_A160 * f37_43;
+	m_A245 += m_A161 * f37_43;
+	RHS43 += f37_43 * RHS37;
+	const double f37_44 = -f37 * m_A256;
+	m_A257 += m_A155 * f37_44;
+	m_A258 += m_A156 * f37_44;
+	m_A259 += m_A157 * f37_44;
+	m_A260 += m_A158 * f37_44;
+	m_A261 += m_A159 * f37_44;
+	m_A262 += m_A160 * f37_44;
+	m_A263 += m_A161 * f37_44;
+	RHS44 += f37_44 * RHS37;
+	const double f38 = 1.0 / m_A169;
+	const double f38_39 = -f38 * m_A183;
+	m_A184 += m_A170 * f38_39;
+	m_A185 += m_A171 * f38_39;
+	m_A186 += m_A172 * f38_39;
+	m_A187 += m_A173 * f38_39;
+	m_A188 += m_A174 * f38_39;
+	m_A189 += m_A175 * f38_39;
+	RHS39 += f38_39 * RHS38;
+	const double f38_40 = -f38 * m_A197;
+	m_A198 += m_A170 * f38_40;
+	m_A199 += m_A171 * f38_40;
+	m_A200 += m_A172 * f38_40;
+	m_A201 += m_A173 * f38_40;
+	m_A202 += m_A174 * f38_40;
+	m_A203 += m_A175 * f38_40;
+	RHS40 += f38_40 * RHS38;
+	const double f38_41 = -f38 * m_A211;
+	m_A212 += m_A170 * f38_41;
+	m_A213 += m_A171 * f38_41;
+	m_A214 += m_A172 * f38_41;
+	m_A215 += m_A173 * f38_41;
+	m_A216 += m_A174 * f38_41;
+	m_A217 += m_A175 * f38_41;
+	RHS41 += f38_41 * RHS38;
+	const double f38_42 = -f38 * m_A225;
+	m_A226 += m_A170 * f38_42;
+	m_A227 += m_A171 * f38_42;
+	m_A228 += m_A172 * f38_42;
+	m_A229 += m_A173 * f38_42;
+	m_A230 += m_A174 * f38_42;
+	m_A231 += m_A175 * f38_42;
+	RHS42 += f38_42 * RHS38;
+	const double f38_43 = -f38 * m_A239;
+	m_A240 += m_A170 * f38_43;
+	m_A241 += m_A171 * f38_43;
+	m_A242 += m_A172 * f38_43;
+	m_A243 += m_A173 * f38_43;
+	m_A244 += m_A174 * f38_43;
+	m_A245 += m_A175 * f38_43;
+	RHS43 += f38_43 * RHS38;
+	const double f38_44 = -f38 * m_A257;
+	m_A258 += m_A170 * f38_44;
+	m_A259 += m_A171 * f38_44;
+	m_A260 += m_A172 * f38_44;
+	m_A261 += m_A173 * f38_44;
+	m_A262 += m_A174 * f38_44;
+	m_A263 += m_A175 * f38_44;
+	RHS44 += f38_44 * RHS38;
+	const double f39 = 1.0 / m_A184;
+	const double f39_40 = -f39 * m_A198;
+	m_A199 += m_A185 * f39_40;
+	m_A200 += m_A186 * f39_40;
+	m_A201 += m_A187 * f39_40;
+	m_A202 += m_A188 * f39_40;
+	m_A203 += m_A189 * f39_40;
+	RHS40 += f39_40 * RHS39;
+	const double f39_41 = -f39 * m_A212;
+	m_A213 += m_A185 * f39_41;
+	m_A214 += m_A186 * f39_41;
+	m_A215 += m_A187 * f39_41;
+	m_A216 += m_A188 * f39_41;
+	m_A217 += m_A189 * f39_41;
+	RHS41 += f39_41 * RHS39;
+	const double f39_42 = -f39 * m_A226;
+	m_A227 += m_A185 * f39_42;
+	m_A228 += m_A186 * f39_42;
+	m_A229 += m_A187 * f39_42;
+	m_A230 += m_A188 * f39_42;
+	m_A231 += m_A189 * f39_42;
+	RHS42 += f39_42 * RHS39;
+	const double f39_43 = -f39 * m_A240;
+	m_A241 += m_A185 * f39_43;
+	m_A242 += m_A186 * f39_43;
+	m_A243 += m_A187 * f39_43;
+	m_A244 += m_A188 * f39_43;
+	m_A245 += m_A189 * f39_43;
+	RHS43 += f39_43 * RHS39;
+	const double f39_44 = -f39 * m_A258;
+	m_A259 += m_A185 * f39_44;
+	m_A260 += m_A186 * f39_44;
+	m_A261 += m_A187 * f39_44;
+	m_A262 += m_A188 * f39_44;
+	m_A263 += m_A189 * f39_44;
+	RHS44 += f39_44 * RHS39;
+	const double f40 = 1.0 / m_A199;
+	const double f40_41 = -f40 * m_A213;
+	m_A214 += m_A200 * f40_41;
+	m_A215 += m_A201 * f40_41;
+	m_A216 += m_A202 * f40_41;
+	m_A217 += m_A203 * f40_41;
+	RHS41 += f40_41 * RHS40;
+	const double f40_42 = -f40 * m_A227;
+	m_A228 += m_A200 * f40_42;
+	m_A229 += m_A201 * f40_42;
+	m_A230 += m_A202 * f40_42;
+	m_A231 += m_A203 * f40_42;
+	RHS42 += f40_42 * RHS40;
+	const double f40_43 = -f40 * m_A241;
+	m_A242 += m_A200 * f40_43;
+	m_A243 += m_A201 * f40_43;
+	m_A244 += m_A202 * f40_43;
+	m_A245 += m_A203 * f40_43;
+	RHS43 += f40_43 * RHS40;
+	const double f40_44 = -f40 * m_A259;
+	m_A260 += m_A200 * f40_44;
+	m_A261 += m_A201 * f40_44;
+	m_A262 += m_A202 * f40_44;
+	m_A263 += m_A203 * f40_44;
+	RHS44 += f40_44 * RHS40;
+	const double f41 = 1.0 / m_A214;
+	const double f41_42 = -f41 * m_A228;
+	m_A229 += m_A215 * f41_42;
+	m_A230 += m_A216 * f41_42;
+	m_A231 += m_A217 * f41_42;
+	RHS42 += f41_42 * RHS41;
+	const double f41_43 = -f41 * m_A242;
+	m_A243 += m_A215 * f41_43;
+	m_A244 += m_A216 * f41_43;
+	m_A245 += m_A217 * f41_43;
+	RHS43 += f41_43 * RHS41;
+	const double f41_44 = -f41 * m_A260;
+	m_A261 += m_A215 * f41_44;
+	m_A262 += m_A216 * f41_44;
+	m_A263 += m_A217 * f41_44;
+	RHS44 += f41_44 * RHS41;
+	const double f42 = 1.0 / m_A229;
+	const double f42_43 = -f42 * m_A243;
+	m_A244 += m_A230 * f42_43;
+	m_A245 += m_A231 * f42_43;
+	RHS43 += f42_43 * RHS42;
+	const double f42_44 = -f42 * m_A261;
+	m_A262 += m_A230 * f42_44;
+	m_A263 += m_A231 * f42_44;
+	RHS44 += f42_44 * RHS42;
+	const double f43 = 1.0 / m_A244;
+	const double f43_44 = -f43 * m_A262;
+	m_A263 += m_A245 * f43_44;
+	RHS44 += f43_44 * RHS43;
+	const double f44 = 1.0 / m_A263;
+	const double f44_46 = -f44 * m_A275;
+	m_A277 += m_A264 * f44_46;
+	RHS46 += f44_46 * RHS44;
+	const double f45 = 1.0 / m_A270;
+	const double f45_46 = -f45 * m_A276;
+	m_A277 += m_A271 * f45_46;
+	m_A278 += m_A272 * f45_46;
+	RHS46 += f45_46 * RHS45;
+	const double f45_47 = -f45 * m_A282;
+	m_A283 += m_A271 * f45_47;
+	m_A284 += m_A272 * f45_47;
+	RHS47 += f45_47 * RHS45;
+	const double f46 = 1.0 / m_A277;
+	const double f46_47 = -f46 * m_A283;
+	m_A284 += m_A278 * f46_47;
+	RHS47 += f46_47 * RHS46;
+	V[47] = RHS47 / m_A284;
+	double tmp46 = 0.0;
+	tmp46 += m_A278 * V[47];
+	V[46] = (RHS46 - tmp46) / m_A277;
+	double tmp45 = 0.0;
+	tmp45 += m_A271 * V[46];
+	tmp45 += m_A272 * V[47];
+	V[45] = (RHS45 - tmp45) / m_A270;
+	double tmp44 = 0.0;
+	tmp44 += m_A264 * V[46];
+	V[44] = (RHS44 - tmp44) / m_A263;
+	double tmp43 = 0.0;
+	tmp43 += m_A245 * V[44];
+	V[43] = (RHS43 - tmp43) / m_A244;
+	double tmp42 = 0.0;
+	tmp42 += m_A230 * V[43];
+	tmp42 += m_A231 * V[44];
+	V[42] = (RHS42 - tmp42) / m_A229;
+	double tmp41 = 0.0;
+	tmp41 += m_A215 * V[42];
+	tmp41 += m_A216 * V[43];
+	tmp41 += m_A217 * V[44];
+	V[41] = (RHS41 - tmp41) / m_A214;
+	double tmp40 = 0.0;
+	tmp40 += m_A200 * V[41];
+	tmp40 += m_A201 * V[42];
+	tmp40 += m_A202 * V[43];
+	tmp40 += m_A203 * V[44];
+	V[40] = (RHS40 - tmp40) / m_A199;
+	double tmp39 = 0.0;
+	tmp39 += m_A185 * V[40];
+	tmp39 += m_A186 * V[41];
+	tmp39 += m_A187 * V[42];
+	tmp39 += m_A188 * V[43];
+	tmp39 += m_A189 * V[44];
+	V[39] = (RHS39 - tmp39) / m_A184;
+	double tmp38 = 0.0;
+	tmp38 += m_A170 * V[39];
+	tmp38 += m_A171 * V[40];
+	tmp38 += m_A172 * V[41];
+	tmp38 += m_A173 * V[42];
+	tmp38 += m_A174 * V[43];
+	tmp38 += m_A175 * V[44];
+	V[38] = (RHS38 - tmp38) / m_A169;
+	double tmp37 = 0.0;
+	tmp37 += m_A155 * V[38];
+	tmp37 += m_A156 * V[39];
+	tmp37 += m_A157 * V[40];
+	tmp37 += m_A158 * V[41];
+	tmp37 += m_A159 * V[42];
+	tmp37 += m_A160 * V[43];
+	tmp37 += m_A161 * V[44];
+	V[37] = (RHS37 - tmp37) / m_A154;
+	double tmp36 = 0.0;
+	tmp36 += m_A140 * V[37];
+	tmp36 += m_A141 * V[38];
+	tmp36 += m_A142 * V[39];
+	tmp36 += m_A143 * V[40];
+	tmp36 += m_A144 * V[41];
+	tmp36 += m_A145 * V[42];
+	tmp36 += m_A146 * V[43];
+	tmp36 += m_A147 * V[44];
+	V[36] = (RHS36 - tmp36) / m_A139;
+	double tmp35 = 0.0;
+	tmp35 += m_A125 * V[36];
+	tmp35 += m_A126 * V[37];
+	tmp35 += m_A127 * V[38];
+	tmp35 += m_A128 * V[39];
+	tmp35 += m_A129 * V[40];
+	tmp35 += m_A130 * V[41];
+	tmp35 += m_A131 * V[42];
+	tmp35 += m_A132 * V[43];
+	tmp35 += m_A133 * V[44];
+	V[35] = (RHS35 - tmp35) / m_A124;
+	double tmp34 = 0.0;
+	tmp34 += m_A110 * V[35];
+	tmp34 += m_A111 * V[36];
+	tmp34 += m_A112 * V[37];
+	tmp34 += m_A113 * V[38];
+	tmp34 += m_A114 * V[39];
+	tmp34 += m_A115 * V[40];
+	tmp34 += m_A116 * V[41];
+	tmp34 += m_A117 * V[42];
+	tmp34 += m_A118 * V[43];
+	tmp34 += m_A119 * V[44];
+	V[34] = (RHS34 - tmp34) / m_A109;
+	double tmp33 = 0.0;
+	tmp33 += m_A95 * V[34];
+	tmp33 += m_A96 * V[35];
+	tmp33 += m_A97 * V[36];
+	tmp33 += m_A98 * V[37];
+	tmp33 += m_A99 * V[38];
+	tmp33 += m_A100 * V[39];
+	tmp33 += m_A101 * V[40];
+	tmp33 += m_A102 * V[41];
+	tmp33 += m_A103 * V[42];
+	tmp33 += m_A104 * V[43];
+	tmp33 += m_A105 * V[44];
+	V[33] = (RHS33 - tmp33) / m_A94;
+	double tmp32 = 0.0;
+	tmp32 += m_A90 * V[45];
+	tmp32 += m_A91 * V[47];
+	V[32] = (RHS32 - tmp32) / m_A89;
+	double tmp31 = 0.0;
+	tmp31 += m_A85 * V[45];
+	tmp31 += m_A86 * V[46];
+	V[31] = (RHS31 - tmp31) / m_A84;
+	double tmp30 = 0.0;
+	tmp30 += m_A83 * V[44];
+	V[30] = (RHS30 - tmp30) / m_A82;
+	double tmp29 = 0.0;
+	tmp29 += m_A76 * V[44];
+	V[29] = (RHS29 - tmp29) / m_A75;
+	double tmp28 = 0.0;
+	tmp28 += m_A73 * V[44];
+	V[28] = (RHS28 - tmp28) / m_A72;
+	double tmp27 = 0.0;
+	tmp27 += m_A70 * V[44];
+	V[27] = (RHS27 - tmp27) / m_A69;
+	double tmp26 = 0.0;
+	tmp26 += m_A56 * V[33];
+	tmp26 += m_A57 * V[34];
+	tmp26 += m_A58 * V[35];
+	tmp26 += m_A59 * V[36];
+	tmp26 += m_A60 * V[37];
+	tmp26 += m_A61 * V[38];
+	tmp26 += m_A62 * V[39];
+	tmp26 += m_A63 * V[40];
+	tmp26 += m_A64 * V[41];
+	tmp26 += m_A65 * V[42];
+	tmp26 += m_A66 * V[43];
+	tmp26 += m_A67 * V[44];
+	V[26] = (RHS26 - tmp26) / m_A55;
+	double tmp25 = 0.0;
+	tmp25 += m_A54 * V[46];
+	V[25] = (RHS25 - tmp25) / m_A53;
+	double tmp24 = 0.0;
+	tmp24 += m_A51 * V[45];
+	tmp24 += m_A52 * V[47];
+	V[24] = (RHS24 - tmp24) / m_A50;
+	double tmp23 = 0.0;
+	tmp23 += m_A48 * V[32];
+	tmp23 += m_A49 * V[45];
+	V[23] = (RHS23 - tmp23) / m_A47;
+	double tmp22 = 0.0;
+	tmp22 += m_A46 * V[24];
+	V[22] = (RHS22 - tmp22) / m_A45;
+	double tmp21 = 0.0;
+	tmp21 += m_A44 * V[47];
+	V[21] = (RHS21 - tmp21) / m_A43;
+	double tmp20 = 0.0;
+	tmp20 += m_A42 * V[23];
+	V[20] = (RHS20 - tmp20) / m_A41;
+	double tmp19 = 0.0;
+	tmp19 += m_A40 * V[30];
+	V[19] = (RHS19 - tmp19) / m_A39;
+	double tmp18 = 0.0;
+	tmp18 += m_A38 * V[30];
+	V[18] = (RHS18 - tmp18) / m_A37;
+	double tmp17 = 0.0;
+	tmp17 += m_A36 * V[30];
+	V[17] = (RHS17 - tmp17) / m_A35;
+	double tmp16 = 0.0;
+	tmp16 += m_A34 * V[30];
+	V[16] = (RHS16 - tmp16) / m_A33;
+	double tmp15 = 0.0;
+	tmp15 += m_A32 * V[30];
+	V[15] = (RHS15 - tmp15) / m_A31;
+	double tmp14 = 0.0;
+	tmp14 += m_A30 * V[29];
+	V[14] = (RHS14 - tmp14) / m_A29;
+	double tmp13 = 0.0;
+	tmp13 += m_A28 * V[28];
+	V[13] = (RHS13 - tmp13) / m_A27;
+	double tmp12 = 0.0;
+	tmp12 += m_A26 * V[27];
+	V[12] = (RHS12 - tmp12) / m_A25;
+	double tmp11 = 0.0;
+	tmp11 += m_A23 * V[26];
+	tmp11 += m_A24 * V[33];
+	V[11] = (RHS11 - tmp11) / m_A22;
+	double tmp10 = 0.0;
+	tmp10 += m_A21 * V[33];
+	V[10] = (RHS10 - tmp10) / m_A20;
+	double tmp9 = 0.0;
+	tmp9 += m_A19 * V[35];
+	V[9] = (RHS9 - tmp9) / m_A18;
+	double tmp8 = 0.0;
+	tmp8 += m_A17 * V[37];
+	V[8] = (RHS8 - tmp8) / m_A16;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[39];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[41];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[43];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[42];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[40];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[38];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[36];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[34];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// starcrus
+static void nl_gcr_ef2f49641f433a74_94_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	m_A4 += go[3];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	m_A5 += gt[4];
+	m_A5 += gt[5];
+	m_A5 += gt[6];
+	m_A5 += gt[7];
+	m_A5 += gt[8];
+	m_A6 += go[4];
+	m_A7 += go[5];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[6] * *cnV[6];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A8 += gt[9];
+	m_A8 += gt[10];
+	m_A8 += gt[11];
+	m_A8 += gt[12];
+	m_A9 += go[9];
+	m_A10 += go[10];
+	m_A10 += go[11];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 -= go[12] * *cnV[12];
+	m_A11 += gt[13];
+	m_A11 += gt[14];
+	m_A11 += gt[15];
+	m_A11 += gt[16];
+	m_A13 += go[13];
+	m_A12 += go[14];
+	m_A12 += go[15];
+	double RHS4 = Idr[13];
+	RHS4 += Idr[14];
+	RHS4 += Idr[15];
+	RHS4 += Idr[16];
+	RHS4 -= go[16] * *cnV[16];
+	m_A14 += gt[17];
+	m_A14 += gt[18];
+	m_A14 += gt[19];
+	m_A14 += gt[20];
+	m_A14 += gt[21];
+	m_A14 += gt[22];
+	m_A15 += go[17];
+	m_A15 += go[18];
+	m_A16 += go[19];
+	m_A16 += go[20];
+	double RHS5 = Idr[17];
+	RHS5 += Idr[18];
+	RHS5 += Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 -= go[21] * *cnV[21];
+	RHS5 -= go[22] * *cnV[22];
+	m_A17 += gt[23];
+	m_A17 += gt[24];
+	m_A17 += gt[25];
+	m_A18 += go[23];
+	double RHS6 = Idr[23];
+	RHS6 += Idr[24];
+	RHS6 += Idr[25];
+	RHS6 -= go[24] * *cnV[24];
+	RHS6 -= go[25] * *cnV[25];
+	m_A19 += gt[26];
+	m_A19 += gt[27];
+	m_A19 += gt[28];
+	m_A19 += gt[29];
+	m_A21 += go[26];
+	m_A20 += go[27];
+	double RHS7 = Idr[26];
+	RHS7 += Idr[27];
+	RHS7 += Idr[28];
+	RHS7 += Idr[29];
+	RHS7 -= go[28] * *cnV[28];
+	RHS7 -= go[29] * *cnV[29];
+	m_A22 += gt[30];
+	m_A22 += gt[31];
+	m_A24 += go[30];
+	m_A23 += go[31];
+	double RHS8 = Idr[30];
+	RHS8 += Idr[31];
+	m_A25 += gt[32];
+	m_A25 += gt[33];
+	m_A25 += gt[34];
+	m_A25 += gt[35];
+	m_A26 += go[32];
+	double RHS9 = Idr[32];
+	RHS9 += Idr[33];
+	RHS9 += Idr[34];
+	RHS9 += Idr[35];
+	RHS9 -= go[33] * *cnV[33];
+	RHS9 -= go[34] * *cnV[34];
+	RHS9 -= go[35] * *cnV[35];
+	m_A28 += gt[36];
+	m_A28 += gt[37];
+	m_A27 += go[36];
+	double RHS10 = Idr[36];
+	RHS10 += Idr[37];
+	RHS10 -= go[37] * *cnV[37];
+	m_A31 += gt[38];
+	m_A31 += gt[39];
+	m_A31 += gt[40];
+	m_A30 += go[38];
+	double RHS11 = Idr[38];
+	RHS11 += Idr[39];
+	RHS11 += Idr[40];
+	RHS11 -= go[39] * *cnV[39];
+	RHS11 -= go[40] * *cnV[40];
+	m_A37 += gt[41];
+	m_A37 += gt[42];
+	m_A37 += gt[43];
+	m_A37 += gt[44];
+	m_A35 += go[41];
+	m_A34 += go[42];
+	m_A38 += go[43];
+	double RHS12 = Idr[41];
+	RHS12 += Idr[42];
+	RHS12 += Idr[43];
+	RHS12 += Idr[44];
+	RHS12 -= go[44] * *cnV[44];
+	m_A42 += gt[45];
+	m_A42 += gt[46];
+	m_A42 += gt[47];
+	m_A42 += gt[48];
+	m_A42 += gt[49];
+	m_A42 += gt[50];
+	m_A41 += go[45];
+	m_A41 += go[46];
+	m_A40 += go[47];
+	double RHS13 = Idr[45];
+	RHS13 += Idr[46];
+	RHS13 += Idr[47];
+	RHS13 += Idr[48];
+	RHS13 += Idr[49];
+	RHS13 += Idr[50];
+	RHS13 -= go[48] * *cnV[48];
+	RHS13 -= go[49] * *cnV[49];
+	RHS13 -= go[50] * *cnV[50];
+	m_A48 += gt[51];
+	m_A48 += gt[52];
+	m_A48 += gt[53];
+	m_A48 += gt[54];
+	m_A48 += gt[55];
+	m_A45 += go[51];
+	m_A45 += go[52];
+	m_A46 += go[53];
+	double RHS14 = Idr[51];
+	RHS14 += Idr[52];
+	RHS14 += Idr[53];
+	RHS14 += Idr[54];
+	RHS14 += Idr[55];
+	RHS14 -= go[54] * *cnV[54];
+	RHS14 -= go[55] * *cnV[55];
+	m_A54 += gt[56];
+	m_A54 += gt[57];
+	m_A54 += gt[58];
+	m_A54 += gt[59];
+	m_A54 += gt[60];
+	m_A55 += go[56];
+	m_A51 += go[57];
+	m_A52 += go[58];
+	double RHS15 = Idr[56];
+	RHS15 += Idr[57];
+	RHS15 += Idr[58];
+	RHS15 += Idr[59];
+	RHS15 += Idr[60];
+	RHS15 -= go[59] * *cnV[59];
+	RHS15 -= go[60] * *cnV[60];
+	m_A58 += gt[61];
+	m_A58 += gt[62];
+	m_A58 += gt[63];
+	m_A57 += go[61];
+	m_A56 += go[62];
+	double RHS16 = Idr[61];
+	RHS16 += Idr[62];
+	RHS16 += Idr[63];
+	RHS16 -= go[63] * *cnV[63];
+	m_A63 += gt[64];
+	m_A63 += gt[65];
+	m_A65 += go[64];
+	m_A60 += go[65];
+	double RHS17 = Idr[64];
+	RHS17 += Idr[65];
+	m_A67 += gt[66];
+	m_A67 += gt[67];
+	m_A67 += gt[68];
+	m_A67 += gt[69];
+	m_A68 += go[66];
+	m_A66 += go[67];
+	m_A66 += go[68];
+	double RHS18 = Idr[66];
+	RHS18 += Idr[67];
+	RHS18 += Idr[68];
+	RHS18 += Idr[69];
+	RHS18 -= go[69] * *cnV[69];
+	m_A72 += gt[70];
+	m_A72 += gt[71];
+	m_A72 += gt[72];
+	m_A72 += gt[73];
+	m_A72 += gt[74];
+	m_A74 += go[70];
+	m_A74 += go[71];
+	m_A69 += go[72];
+	double RHS19 = Idr[70];
+	RHS19 += Idr[71];
+	RHS19 += Idr[72];
+	RHS19 += Idr[73];
+	RHS19 += Idr[74];
+	RHS19 -= go[73] * *cnV[73];
+	RHS19 -= go[74] * *cnV[74];
+	m_A80 += gt[75];
+	m_A80 += gt[76];
+	m_A80 += gt[77];
+	m_A80 += gt[78];
+	m_A77 += go[75];
+	m_A76 += go[76];
+	m_A75 += go[77];
+	double RHS20 = Idr[75];
+	RHS20 += Idr[76];
+	RHS20 += Idr[77];
+	RHS20 += Idr[78];
+	RHS20 -= go[78] * *cnV[78];
+	m_A86 += gt[79];
+	m_A86 += gt[80];
+	m_A86 += gt[81];
+	m_A86 += gt[82];
+	m_A86 += gt[83];
+	m_A86 += gt[84];
+	m_A84 += go[79];
+	m_A83 += go[80];
+	m_A82 += go[81];
+	m_A82 += go[82];
+	double RHS21 = Idr[79];
+	RHS21 += Idr[80];
+	RHS21 += Idr[81];
+	RHS21 += Idr[82];
+	RHS21 += Idr[83];
+	RHS21 += Idr[84];
+	RHS21 -= go[83] * *cnV[83];
+	RHS21 -= go[84] * *cnV[84];
+	m_A93 += gt[85];
+	m_A93 += gt[86];
+	m_A93 += gt[87];
+	m_A93 += gt[88];
+	m_A93 += gt[89];
+	m_A89 += go[85];
+	m_A91 += go[86];
+	m_A91 += go[87];
+	m_A88 += go[88];
+	double RHS22 = Idr[85];
+	RHS22 += Idr[86];
+	RHS22 += Idr[87];
+	RHS22 += Idr[88];
+	RHS22 += Idr[89];
+	RHS22 -= go[89] * *cnV[89];
+	const double f0 = 1.0 / m_A0;
+	const double f0_15 = -f0 * m_A51;
+	m_A54 += m_A1 * f0_15;
+	RHS15 += f0_15 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_10 = -f1 * m_A27;
+	m_A28 += m_A3 * f1_10;
+	m_A29 += m_A4 * f1_10;
+	RHS10 += f1_10 * RHS1;
+	const double f1_12 = -f1 * m_A34;
+	m_A36 += m_A3 * f1_12;
+	m_A38 += m_A4 * f1_12;
+	RHS12 += f1_12 * RHS1;
+	const double f1_15 = -f1 * m_A52;
+	m_A53 += m_A3 * f1_15;
+	m_A54 += m_A4 * f1_15;
+	RHS15 += f1_15 * RHS1;
+	const double f1_20 = -f1 * m_A75;
+	m_A77 += m_A3 * f1_20;
+	m_A79 += m_A4 * f1_20;
+	RHS20 += f1_20 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_11 = -f2 * m_A30;
+	m_A32 += m_A6 * f2_11;
+	m_A33 += m_A7 * f2_11;
+	RHS11 += f2_11 * RHS2;
+	const double f2_12 = -f2 * m_A35;
+	m_A37 += m_A6 * f2_12;
+	m_A39 += m_A7 * f2_12;
+	RHS12 += f2_12 * RHS2;
+	const double f2_20 = -f2 * m_A76;
+	m_A78 += m_A6 * f2_20;
+	m_A80 += m_A7 * f2_20;
+	RHS20 += f2_20 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_13 = -f3 * m_A40;
+	m_A42 += m_A9 * f3_13;
+	m_A43 += m_A10 * f3_13;
+	RHS13 += f3_13 * RHS3;
+	const double f3_14 = -f3 * m_A45;
+	m_A47 += m_A9 * f3_14;
+	m_A48 += m_A10 * f3_14;
+	RHS14 += f3_14 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_13 = -f4 * m_A41;
+	m_A42 += m_A12 * f4_13;
+	m_A44 += m_A13 * f4_13;
+	RHS13 += f4_13 * RHS4;
+	const double f4_17 = -f4 * m_A60;
+	m_A61 += m_A12 * f4_17;
+	m_A63 += m_A13 * f4_17;
+	RHS17 += f4_17 * RHS4;
+	const double f5 = 1.0 / m_A14;
+	const double f5_18 = -f5 * m_A66;
+	m_A67 += m_A15 * f5_18;
+	m_A68 += m_A16 * f5_18;
+	RHS18 += f5_18 * RHS5;
+	const double f5_21 = -f5 * m_A82;
+	m_A84 += m_A15 * f5_21;
+	m_A86 += m_A16 * f5_21;
+	RHS21 += f5_21 * RHS5;
+	const double f6 = 1.0 / m_A17;
+	const double f6_16 = -f6 * m_A56;
+	m_A58 += m_A18 * f6_16;
+	RHS16 += f6_16 * RHS6;
+	const double f7 = 1.0 / m_A19;
+	const double f7_14 = -f7 * m_A46;
+	m_A48 += m_A20 * f7_14;
+	m_A50 += m_A21 * f7_14;
+	RHS14 += f7_14 * RHS7;
+	const double f7_19 = -f7 * m_A69;
+	m_A70 += m_A20 * f7_19;
+	m_A72 += m_A21 * f7_19;
+	RHS19 += f7_19 * RHS7;
+	const double f8 = 1.0 / m_A22;
+	const double f8_16 = -f8 * m_A57;
+	m_A58 += m_A23 * f8_16;
+	m_A59 += m_A24 * f8_16;
+	RHS16 += f8_16 * RHS8;
+	const double f8_22 = -f8 * m_A88;
+	m_A90 += m_A23 * f8_22;
+	m_A93 += m_A24 * f8_22;
+	RHS22 += f8_22 * RHS8;
+	const double f9 = 1.0 / m_A25;
+	const double f9_22 = -f9 * m_A89;
+	m_A93 += m_A26 * f9_22;
+	RHS22 += f9_22 * RHS9;
+	const double f10 = 1.0 / m_A28;
+	const double f10_12 = -f10 * m_A36;
+	m_A38 += m_A29 * f10_12;
+	RHS12 += f10_12 * RHS10;
+	const double f10_15 = -f10 * m_A53;
+	m_A54 += m_A29 * f10_15;
+	RHS15 += f10_15 * RHS10;
+	const double f10_20 = -f10 * m_A77;
+	m_A79 += m_A29 * f10_20;
+	RHS20 += f10_20 * RHS10;
+	const double f12 = 1.0 / m_A37;
+	const double f12_20 = -f12 * m_A78;
+	m_A79 += m_A38 * f12_20;
+	m_A80 += m_A39 * f12_20;
+	RHS20 += f12_20 * RHS12;
+	const double f13 = 1.0 / m_A42;
+	const double f13_14 = -f13 * m_A47;
+	m_A48 += m_A43 * f13_14;
+	m_A49 += m_A44 * f13_14;
+	RHS14 += f13_14 * RHS13;
+	const double f13_17 = -f13 * m_A61;
+	m_A62 += m_A43 * f13_17;
+	m_A63 += m_A44 * f13_17;
+	RHS17 += f13_17 * RHS13;
+	const double f14 = 1.0 / m_A48;
+	const double f14_17 = -f14 * m_A62;
+	m_A63 += m_A49 * f14_17;
+	m_A64 += m_A50 * f14_17;
+	RHS17 += f14_17 * RHS14;
+	const double f14_19 = -f14 * m_A70;
+	m_A71 += m_A49 * f14_19;
+	m_A72 += m_A50 * f14_19;
+	RHS19 += f14_19 * RHS14;
+	const double f15 = 1.0 / m_A54;
+	const double f15_20 = -f15 * m_A79;
+	m_A81 += m_A55 * f15_20;
+	RHS20 += f15_20 * RHS15;
+	const double f16 = 1.0 / m_A58;
+	const double f16_22 = -f16 * m_A90;
+	m_A93 += m_A59 * f16_22;
+	RHS22 += f16_22 * RHS16;
+	const double f17 = 1.0 / m_A63;
+	const double f17_19 = -f17 * m_A71;
+	m_A72 += m_A64 * f17_19;
+	m_A73 += m_A65 * f17_19;
+	RHS19 += f17_19 * RHS17;
+	const double f17_21 = -f17 * m_A83;
+	m_A85 += m_A64 * f17_21;
+	m_A86 += m_A65 * f17_21;
+	RHS21 += f17_21 * RHS17;
+	const double f18 = 1.0 / m_A67;
+	const double f18_21 = -f18 * m_A84;
+	m_A86 += m_A68 * f18_21;
+	RHS21 += f18_21 * RHS18;
+	const double f19 = 1.0 / m_A72;
+	const double f19_21 = -f19 * m_A85;
+	m_A86 += m_A73 * f19_21;
+	m_A87 += m_A74 * f19_21;
+	RHS21 += f19_21 * RHS19;
+	const double f19_22 = -f19 * m_A91;
+	m_A92 += m_A73 * f19_22;
+	m_A93 += m_A74 * f19_22;
+	RHS22 += f19_22 * RHS19;
+	const double f21 = 1.0 / m_A86;
+	const double f21_22 = -f21 * m_A92;
+	m_A93 += m_A87 * f21_22;
+	RHS22 += f21_22 * RHS21;
+	V[22] = RHS22 / m_A93;
+	double tmp21 = 0.0;
+	tmp21 += m_A87 * V[22];
+	V[21] = (RHS21 - tmp21) / m_A86;
+	double tmp20 = 0.0;
+	tmp20 += m_A81 * V[21];
+	V[20] = (RHS20 - tmp20) / m_A80;
+	double tmp19 = 0.0;
+	tmp19 += m_A73 * V[21];
+	tmp19 += m_A74 * V[22];
+	V[19] = (RHS19 - tmp19) / m_A72;
+	double tmp18 = 0.0;
+	tmp18 += m_A68 * V[21];
+	V[18] = (RHS18 - tmp18) / m_A67;
+	double tmp17 = 0.0;
+	tmp17 += m_A64 * V[19];
+	tmp17 += m_A65 * V[21];
+	V[17] = (RHS17 - tmp17) / m_A63;
+	double tmp16 = 0.0;
+	tmp16 += m_A59 * V[22];
+	V[16] = (RHS16 - tmp16) / m_A58;
+	double tmp15 = 0.0;
+	tmp15 += m_A55 * V[21];
+	V[15] = (RHS15 - tmp15) / m_A54;
+	double tmp14 = 0.0;
+	tmp14 += m_A49 * V[17];
+	tmp14 += m_A50 * V[19];
+	V[14] = (RHS14 - tmp14) / m_A48;
+	double tmp13 = 0.0;
+	tmp13 += m_A43 * V[14];
+	tmp13 += m_A44 * V[17];
+	V[13] = (RHS13 - tmp13) / m_A42;
+	double tmp12 = 0.0;
+	tmp12 += m_A38 * V[15];
+	tmp12 += m_A39 * V[20];
+	V[12] = (RHS12 - tmp12) / m_A37;
+	double tmp11 = 0.0;
+	tmp11 += m_A32 * V[12];
+	tmp11 += m_A33 * V[20];
+	V[11] = (RHS11 - tmp11) / m_A31;
+	double tmp10 = 0.0;
+	tmp10 += m_A29 * V[15];
+	V[10] = (RHS10 - tmp10) / m_A28;
+	double tmp9 = 0.0;
+	tmp9 += m_A26 * V[22];
+	V[9] = (RHS9 - tmp9) / m_A25;
+	double tmp8 = 0.0;
+	tmp8 += m_A23 * V[16];
+	tmp8 += m_A24 * V[22];
+	V[8] = (RHS8 - tmp8) / m_A22;
+	double tmp7 = 0.0;
+	tmp7 += m_A20 * V[14];
+	tmp7 += m_A21 * V[19];
+	V[7] = (RHS7 - tmp7) / m_A19;
+	double tmp6 = 0.0;
+	tmp6 += m_A18 * V[16];
+	V[6] = (RHS6 - tmp6) / m_A17;
+	double tmp5 = 0.0;
+	tmp5 += m_A15 * V[18];
+	tmp5 += m_A16 * V[21];
+	V[5] = (RHS5 - tmp5) / m_A14;
+	double tmp4 = 0.0;
+	tmp4 += m_A12 * V[13];
+	tmp4 += m_A13 * V[17];
+	V[4] = (RHS4 - tmp4) / m_A11;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[13];
+	tmp3 += m_A10 * V[14];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[12];
+	tmp2 += m_A7 * V[20];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[10];
+	tmp1 += m_A4 * V[15];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[15];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// astrob
+static void nl_gcr_efd052e6829c33e_9_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A2 += go[0];
+	m_A1 += go[1];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	m_A4 += gt[2];
+	m_A4 += gt[3];
+	m_A5 += go[2];
+	m_A3 += go[3];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	m_A8 += gt[4];
+	m_A8 += gt[5];
+	m_A7 += go[4];
+	m_A6 += go[5];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	const double f0 = 1.0 / m_A0;
+	const double f0_1 = -f0 * m_A3;
+	m_A4 += m_A1 * f0_1;
+	m_A5 += m_A2 * f0_1;
+	RHS1 += f0_1 * RHS0;
+	const double f0_2 = -f0 * m_A6;
+	m_A7 += m_A1 * f0_2;
+	m_A8 += m_A2 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A4;
+	const double f1_2 = -f1 * m_A7;
+	m_A8 += m_A5 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A8;
+	double tmp1 = 0.0;
+	tmp1 += m_A5 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A4;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[1];
+	tmp0 += m_A2 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// spacfury
+static void nl_gcr_f365c3863b050e35_45_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A2 += gt[11];
+	m_A3 += go[5];
+	double RHS1 = Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 += Idr[11];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	RHS1 -= go[11] * *cnV[11];
+	m_A4 += gt[12];
+	m_A4 += gt[13];
+	m_A4 += gt[14];
+	m_A4 += gt[15];
+	m_A6 += go[12];
+	m_A6 += go[13];
+	m_A5 += go[14];
+	double RHS2 = Idr[12];
+	RHS2 += Idr[13];
+	RHS2 += Idr[14];
+	RHS2 += Idr[15];
+	RHS2 -= go[15] * *cnV[15];
+	m_A7 += gt[16];
+	m_A7 += gt[17];
+	m_A8 += go[16];
+	double RHS3 = Idr[16];
+	RHS3 += Idr[17];
+	RHS3 -= go[17] * *cnV[17];
+	m_A9 += gt[18];
+	m_A9 += gt[19];
+	m_A10 += go[18];
+	double RHS4 = Idr[18];
+	RHS4 += Idr[19];
+	RHS4 -= go[19] * *cnV[19];
+	m_A11 += gt[20];
+	m_A11 += gt[21];
+	m_A12 += go[20];
+	double RHS5 = Idr[20];
+	RHS5 += Idr[21];
+	RHS5 -= go[21] * *cnV[21];
+	m_A13 += gt[22];
+	m_A13 += gt[23];
+	m_A14 += go[22];
+	double RHS6 = Idr[22];
+	RHS6 += Idr[23];
+	RHS6 -= go[23] * *cnV[23];
+	m_A15 += gt[24];
+	m_A15 += gt[25];
+	m_A16 += go[24];
+	double RHS7 = Idr[24];
+	RHS7 += Idr[25];
+	RHS7 -= go[25] * *cnV[25];
+	m_A17 += gt[26];
+	m_A17 += gt[27];
+	m_A18 += go[26];
+	double RHS8 = Idr[26];
+	RHS8 += Idr[27];
+	RHS8 -= go[27] * *cnV[27];
+	m_A19 += gt[28];
+	m_A19 += gt[29];
+	m_A20 += go[28];
+	double RHS9 = Idr[28];
+	RHS9 += Idr[29];
+	RHS9 -= go[29] * *cnV[29];
+	m_A21 += gt[30];
+	m_A21 += gt[31];
+	m_A22 += go[30];
+	double RHS10 = Idr[30];
+	RHS10 += Idr[31];
+	RHS10 -= go[31] * *cnV[31];
+	m_A23 += gt[32];
+	m_A23 += gt[33];
+	m_A24 += go[32];
+	double RHS11 = Idr[32];
+	RHS11 += Idr[33];
+	RHS11 -= go[33] * *cnV[33];
+	m_A27 += gt[34];
+	m_A27 += gt[35];
+	m_A26 += go[34];
+	m_A25 += go[35];
+	double RHS12 = Idr[34];
+	RHS12 += Idr[35];
+	m_A32 += gt[36];
+	m_A32 += gt[37];
+	m_A32 += gt[38];
+	m_A32 += gt[39];
+	m_A32 += gt[40];
+	m_A32 += gt[41];
+	m_A29 += go[36];
+	m_A33 += go[37];
+	m_A30 += go[38];
+	m_A30 += go[39];
+	double RHS13 = Idr[36];
+	RHS13 += Idr[37];
+	RHS13 += Idr[38];
+	RHS13 += Idr[39];
+	RHS13 += Idr[40];
+	RHS13 += Idr[41];
+	RHS13 -= go[40] * *cnV[40];
+	RHS13 -= go[41] * *cnV[41];
+	m_A44 += gt[42];
+	m_A44 += gt[43];
+	m_A44 += gt[44];
+	m_A44 += gt[45];
+	m_A44 += gt[46];
+	m_A44 += gt[47];
+	m_A44 += gt[48];
+	m_A44 += gt[49];
+	m_A44 += gt[50];
+	m_A44 += gt[51];
+	m_A42 += go[42];
+	m_A41 += go[43];
+	m_A40 += go[44];
+	m_A39 += go[45];
+	m_A38 += go[46];
+	m_A37 += go[47];
+	m_A36 += go[48];
+	m_A35 += go[49];
+	m_A34 += go[50];
+	m_A43 += go[51];
+	double RHS14 = Idr[42];
+	RHS14 += Idr[43];
+	RHS14 += Idr[44];
+	RHS14 += Idr[45];
+	RHS14 += Idr[46];
+	RHS14 += Idr[47];
+	RHS14 += Idr[48];
+	RHS14 += Idr[49];
+	RHS14 += Idr[50];
+	RHS14 += Idr[51];
+	const double f0 = 1.0 / m_A0;
+	const double f0_12 = -f0 * m_A25;
+	m_A27 += m_A1 * f0_12;
+	RHS12 += f0_12 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_13 = -f1 * m_A29;
+	m_A30 += m_A3 * f1_13;
+	RHS13 += f1_13 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_12 = -f2 * m_A26;
+	m_A27 += m_A5 * f2_12;
+	m_A28 += m_A6 * f2_12;
+	RHS12 += f2_12 * RHS2;
+	const double f2_13 = -f2 * m_A30;
+	m_A31 += m_A5 * f2_13;
+	m_A32 += m_A6 * f2_13;
+	RHS13 += f2_13 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_14 = -f3 * m_A34;
+	m_A44 += m_A8 * f3_14;
+	RHS14 += f3_14 * RHS3;
+	const double f4 = 1.0 / m_A9;
+	const double f4_14 = -f4 * m_A35;
+	m_A44 += m_A10 * f4_14;
+	RHS14 += f4_14 * RHS4;
+	const double f5 = 1.0 / m_A11;
+	const double f5_14 = -f5 * m_A36;
+	m_A44 += m_A12 * f5_14;
+	RHS14 += f5_14 * RHS5;
+	const double f6 = 1.0 / m_A13;
+	const double f6_14 = -f6 * m_A37;
+	m_A44 += m_A14 * f6_14;
+	RHS14 += f6_14 * RHS6;
+	const double f7 = 1.0 / m_A15;
+	const double f7_14 = -f7 * m_A38;
+	m_A44 += m_A16 * f7_14;
+	RHS14 += f7_14 * RHS7;
+	const double f8 = 1.0 / m_A17;
+	const double f8_14 = -f8 * m_A39;
+	m_A44 += m_A18 * f8_14;
+	RHS14 += f8_14 * RHS8;
+	const double f9 = 1.0 / m_A19;
+	const double f9_14 = -f9 * m_A40;
+	m_A44 += m_A20 * f9_14;
+	RHS14 += f9_14 * RHS9;
+	const double f10 = 1.0 / m_A21;
+	const double f10_14 = -f10 * m_A41;
+	m_A44 += m_A22 * f10_14;
+	RHS14 += f10_14 * RHS10;
+	const double f11 = 1.0 / m_A23;
+	const double f11_14 = -f11 * m_A42;
+	m_A44 += m_A24 * f11_14;
+	RHS14 += f11_14 * RHS11;
+	const double f12 = 1.0 / m_A27;
+	const double f12_13 = -f12 * m_A31;
+	m_A32 += m_A28 * f12_13;
+	RHS13 += f12_13 * RHS12;
+	const double f13 = 1.0 / m_A32;
+	const double f13_14 = -f13 * m_A43;
+	m_A44 += m_A33 * f13_14;
+	RHS14 += f13_14 * RHS13;
+	V[14] = RHS14 / m_A44;
+	double tmp13 = 0.0;
+	tmp13 += m_A33 * V[14];
+	V[13] = (RHS13 - tmp13) / m_A32;
+	double tmp12 = 0.0;
+	tmp12 += m_A28 * V[13];
+	V[12] = (RHS12 - tmp12) / m_A27;
+	double tmp11 = 0.0;
+	tmp11 += m_A24 * V[14];
+	V[11] = (RHS11 - tmp11) / m_A23;
+	double tmp10 = 0.0;
+	tmp10 += m_A22 * V[14];
+	V[10] = (RHS10 - tmp10) / m_A21;
+	double tmp9 = 0.0;
+	tmp9 += m_A20 * V[14];
+	V[9] = (RHS9 - tmp9) / m_A19;
+	double tmp8 = 0.0;
+	tmp8 += m_A18 * V[14];
+	V[8] = (RHS8 - tmp8) / m_A17;
+	double tmp7 = 0.0;
+	tmp7 += m_A16 * V[14];
+	V[7] = (RHS7 - tmp7) / m_A15;
+	double tmp6 = 0.0;
+	tmp6 += m_A14 * V[14];
+	V[6] = (RHS6 - tmp6) / m_A13;
+	double tmp5 = 0.0;
+	tmp5 += m_A12 * V[14];
+	V[5] = (RHS5 - tmp5) / m_A11;
+	double tmp4 = 0.0;
+	tmp4 += m_A10 * V[14];
+	V[4] = (RHS4 - tmp4) / m_A9;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[14];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[12];
+	tmp2 += m_A6 * V[13];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[12];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// spacfury
+static void nl_gcr_f3c9a6d53371d709_227_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
+	double m_A149(0.0);
+	double m_A150(0.0);
+	double m_A151(0.0);
+	double m_A152(0.0);
+	double m_A153(0.0);
+	double m_A154(0.0);
+	double m_A155(0.0);
+	double m_A156(0.0);
+	double m_A157(0.0);
+	double m_A158(0.0);
+	double m_A159(0.0);
+	double m_A160(0.0);
+	double m_A161(0.0);
+	double m_A162(0.0);
+	double m_A163(0.0);
+	double m_A164(0.0);
+	double m_A165(0.0);
+	double m_A166(0.0);
+	double m_A167(0.0);
+	double m_A168(0.0);
+	double m_A169(0.0);
+	double m_A170(0.0);
+	double m_A171(0.0);
+	double m_A172(0.0);
+	double m_A173(0.0);
+	double m_A174(0.0);
+	double m_A175(0.0);
+	double m_A176(0.0);
+	double m_A177(0.0);
+	double m_A178(0.0);
+	double m_A179(0.0);
+	double m_A180(0.0);
+	double m_A181(0.0);
+	double m_A182(0.0);
+	double m_A183(0.0);
+	double m_A184(0.0);
+	double m_A185(0.0);
+	double m_A186(0.0);
+	double m_A187(0.0);
+	double m_A188(0.0);
+	double m_A189(0.0);
+	double m_A190(0.0);
+	double m_A191(0.0);
+	double m_A192(0.0);
+	double m_A193(0.0);
+	double m_A194(0.0);
+	double m_A195(0.0);
+	double m_A196(0.0);
+	double m_A197(0.0);
+	double m_A198(0.0);
+	double m_A199(0.0);
+	double m_A200(0.0);
+	double m_A201(0.0);
+	double m_A202(0.0);
+	double m_A203(0.0);
+	double m_A204(0.0);
+	double m_A205(0.0);
+	double m_A206(0.0);
+	double m_A207(0.0);
+	double m_A208(0.0);
+	double m_A209(0.0);
+	double m_A210(0.0);
+	double m_A211(0.0);
+	double m_A212(0.0);
+	double m_A213(0.0);
+	double m_A214(0.0);
+	double m_A215(0.0);
+	double m_A216(0.0);
+	double m_A217(0.0);
+	double m_A218(0.0);
+	double m_A219(0.0);
+	double m_A220(0.0);
+	double m_A221(0.0);
+	double m_A222(0.0);
+	double m_A223(0.0);
+	double m_A224(0.0);
+	double m_A225(0.0);
+	double m_A226(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A0 += gt[7];
+	m_A0 += gt[8];
+	m_A0 += gt[9];
+	m_A0 += gt[10];
+	m_A0 += gt[11];
+	m_A0 += gt[12];
+	m_A0 += gt[13];
+	m_A2 += go[0];
+	m_A1 += go[1];
+	m_A1 += go[2];
+	m_A0 += go[3];
+	m_A0 += go[4];
+	m_A0 += go[5];
+	m_A0 += go[6];
+	m_A3 += go[7];
+	m_A3 += go[8];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 += Idr[7];
+	RHS0 += Idr[8];
+	RHS0 += Idr[9];
+	RHS0 += Idr[10];
+	RHS0 += Idr[11];
+	RHS0 += Idr[12];
+	RHS0 += Idr[13];
+	RHS0 -= go[9] * *cnV[9];
+	RHS0 -= go[10] * *cnV[10];
+	RHS0 -= go[11] * *cnV[11];
+	RHS0 -= go[12] * *cnV[12];
+	RHS0 -= go[13] * *cnV[13];
+	m_A4 += gt[14];
+	m_A4 += gt[15];
+	m_A4 += gt[16];
+	m_A4 += gt[17];
+	m_A4 += gt[18];
+	m_A4 += gt[19];
+	m_A4 += gt[20];
+	m_A4 += gt[21];
+	m_A4 += gt[22];
+	m_A4 += gt[23];
+	m_A4 += gt[24];
+	m_A4 += gt[25];
+	m_A5 += go[14];
+	m_A5 += go[15];
+	m_A4 += go[16];
+	m_A4 += go[17];
+	m_A4 += go[18];
+	m_A4 += go[19];
+	double RHS1 = Idr[14];
+	RHS1 += Idr[15];
+	RHS1 += Idr[16];
+	RHS1 += Idr[17];
+	RHS1 += Idr[18];
+	RHS1 += Idr[19];
+	RHS1 += Idr[20];
+	RHS1 += Idr[21];
+	RHS1 += Idr[22];
+	RHS1 += Idr[23];
+	RHS1 += Idr[24];
+	RHS1 += Idr[25];
+	RHS1 -= go[20] * *cnV[20];
+	RHS1 -= go[21] * *cnV[21];
+	RHS1 -= go[22] * *cnV[22];
+	RHS1 -= go[23] * *cnV[23];
+	RHS1 -= go[24] * *cnV[24];
+	RHS1 -= go[25] * *cnV[25];
+	m_A6 += gt[26];
+	m_A6 += gt[27];
+	m_A6 += gt[28];
+	m_A6 += gt[29];
+	m_A6 += gt[30];
+	m_A6 += gt[31];
+	m_A6 += gt[32];
+	m_A6 += gt[33];
+	m_A6 += gt[34];
+	m_A6 += gt[35];
+	m_A6 += gt[36];
+	m_A6 += gt[37];
+	m_A6 += gt[38];
+	m_A6 += gt[39];
+	m_A9 += go[26];
+	m_A7 += go[27];
+	m_A7 += go[28];
+	m_A6 += go[29];
+	m_A6 += go[30];
+	m_A6 += go[31];
+	m_A6 += go[32];
+	m_A8 += go[33];
+	m_A8 += go[34];
+	double RHS2 = Idr[26];
+	RHS2 += Idr[27];
+	RHS2 += Idr[28];
+	RHS2 += Idr[29];
+	RHS2 += Idr[30];
+	RHS2 += Idr[31];
+	RHS2 += Idr[32];
+	RHS2 += Idr[33];
+	RHS2 += Idr[34];
+	RHS2 += Idr[35];
+	RHS2 += Idr[36];
+	RHS2 += Idr[37];
+	RHS2 += Idr[38];
+	RHS2 += Idr[39];
+	RHS2 -= go[35] * *cnV[35];
+	RHS2 -= go[36] * *cnV[36];
+	RHS2 -= go[37] * *cnV[37];
+	RHS2 -= go[38] * *cnV[38];
+	RHS2 -= go[39] * *cnV[39];
+	m_A10 += gt[40];
+	m_A10 += gt[41];
+	m_A10 += gt[42];
+	m_A10 += gt[43];
+	m_A10 += gt[44];
+	m_A10 += gt[45];
+	m_A10 += gt[46];
+	m_A10 += gt[47];
+	m_A10 += gt[48];
+	m_A10 += gt[49];
+	m_A10 += gt[50];
+	m_A10 += gt[51];
+	m_A11 += go[40];
+	m_A11 += go[41];
+	m_A10 += go[42];
+	m_A10 += go[43];
+	m_A10 += go[44];
+	m_A10 += go[45];
+	double RHS3 = Idr[40];
+	RHS3 += Idr[41];
+	RHS3 += Idr[42];
+	RHS3 += Idr[43];
+	RHS3 += Idr[44];
+	RHS3 += Idr[45];
+	RHS3 += Idr[46];
+	RHS3 += Idr[47];
+	RHS3 += Idr[48];
+	RHS3 += Idr[49];
+	RHS3 += Idr[50];
+	RHS3 += Idr[51];
+	RHS3 -= go[46] * *cnV[46];
+	RHS3 -= go[47] * *cnV[47];
+	RHS3 -= go[48] * *cnV[48];
+	RHS3 -= go[49] * *cnV[49];
+	RHS3 -= go[50] * *cnV[50];
+	RHS3 -= go[51] * *cnV[51];
+	m_A12 += gt[52];
+	m_A12 += gt[53];
+	m_A12 += gt[54];
+	m_A13 += go[52];
+	double RHS4 = Idr[52];
+	RHS4 += Idr[53];
+	RHS4 += Idr[54];
+	RHS4 -= go[53] * *cnV[53];
+	RHS4 -= go[54] * *cnV[54];
+	m_A14 += gt[55];
+	m_A14 += gt[56];
+	m_A14 += gt[57];
+	m_A14 += gt[58];
+	m_A14 += gt[59];
+	m_A14 += gt[60];
+	m_A14 += gt[61];
+	m_A14 += gt[62];
+	m_A16 += go[55];
+	m_A16 += go[56];
+	m_A16 += go[57];
+	m_A15 += go[58];
+	m_A15 += go[59];
+	m_A17 += go[60];
+	m_A17 += go[61];
+	m_A17 += go[62];
+	double RHS5 = Idr[55];
+	RHS5 += Idr[56];
+	RHS5 += Idr[57];
+	RHS5 += Idr[58];
+	RHS5 += Idr[59];
+	RHS5 += Idr[60];
+	RHS5 += Idr[61];
+	RHS5 += Idr[62];
+	m_A18 += gt[63];
+	m_A18 += gt[64];
+	m_A18 += gt[65];
+	m_A18 += gt[66];
+	m_A18 += gt[67];
+	m_A18 += gt[68];
+	m_A18 += gt[69];
+	m_A18 += gt[70];
+	m_A18 += gt[71];
+	m_A18 += gt[72];
+	m_A18 += gt[73];
+	m_A18 += gt[74];
+	m_A18 += gt[75];
+	m_A18 += gt[76];
+	m_A20 += go[63];
+	m_A18 += go[64];
+	m_A18 += go[65];
+	m_A18 += go[66];
+	m_A18 += go[67];
+	m_A19 += go[68];
+	m_A19 += go[69];
+	m_A19 += go[70];
+	m_A19 += go[71];
+	double RHS6 = Idr[63];
+	RHS6 += Idr[64];
+	RHS6 += Idr[65];
+	RHS6 += Idr[66];
+	RHS6 += Idr[67];
+	RHS6 += Idr[68];
+	RHS6 += Idr[69];
+	RHS6 += Idr[70];
+	RHS6 += Idr[71];
+	RHS6 += Idr[72];
+	RHS6 += Idr[73];
+	RHS6 += Idr[74];
+	RHS6 += Idr[75];
+	RHS6 += Idr[76];
+	RHS6 -= go[72] * *cnV[72];
+	RHS6 -= go[73] * *cnV[73];
+	RHS6 -= go[74] * *cnV[74];
+	RHS6 -= go[75] * *cnV[75];
+	RHS6 -= go[76] * *cnV[76];
+	m_A21 += gt[77];
+	m_A21 += gt[78];
+	m_A21 += gt[79];
+	m_A21 += gt[80];
+	m_A21 += gt[81];
+	m_A21 += gt[82];
+	m_A21 += gt[83];
+	m_A22 += go[77];
+	double RHS7 = Idr[77];
+	RHS7 += Idr[78];
+	RHS7 += Idr[79];
+	RHS7 += Idr[80];
+	RHS7 += Idr[81];
+	RHS7 += Idr[82];
+	RHS7 += Idr[83];
+	RHS7 -= go[78] * *cnV[78];
+	RHS7 -= go[79] * *cnV[79];
+	RHS7 -= go[80] * *cnV[80];
+	RHS7 -= go[81] * *cnV[81];
+	RHS7 -= go[82] * *cnV[82];
+	RHS7 -= go[83] * *cnV[83];
+	m_A23 += gt[84];
+	m_A23 += gt[85];
+	m_A23 += gt[86];
+	m_A24 += go[84];
+	double RHS8 = Idr[84];
+	RHS8 += Idr[85];
+	RHS8 += Idr[86];
+	RHS8 -= go[85] * *cnV[85];
+	RHS8 -= go[86] * *cnV[86];
+	m_A25 += gt[87];
+	m_A25 += gt[88];
+	m_A25 += gt[89];
+	m_A25 += gt[90];
+	m_A26 += go[87];
+	double RHS9 = Idr[87];
+	RHS9 += Idr[88];
+	RHS9 += Idr[89];
+	RHS9 += Idr[90];
+	RHS9 -= go[88] * *cnV[88];
+	RHS9 -= go[89] * *cnV[89];
+	RHS9 -= go[90] * *cnV[90];
+	m_A27 += gt[91];
+	m_A27 += gt[92];
+	m_A27 += gt[93];
+	m_A28 += go[91];
+	double RHS10 = Idr[91];
+	RHS10 += Idr[92];
+	RHS10 += Idr[93];
+	RHS10 -= go[92] * *cnV[92];
+	RHS10 -= go[93] * *cnV[93];
+	m_A29 += gt[94];
+	m_A29 += gt[95];
+	m_A31 += go[94];
+	m_A30 += go[95];
+	double RHS11 = Idr[94];
+	RHS11 += Idr[95];
+	m_A32 += gt[96];
+	m_A32 += gt[97];
+	m_A32 += gt[98];
+	m_A32 += gt[99];
+	m_A32 += gt[100];
+	m_A33 += go[96];
+	m_A34 += go[97];
+	m_A35 += go[98];
+	double RHS12 = Idr[96];
+	RHS12 += Idr[97];
+	RHS12 += Idr[98];
+	RHS12 += Idr[99];
+	RHS12 += Idr[100];
+	RHS12 -= go[99] * *cnV[99];
+	RHS12 -= go[100] * *cnV[100];
+	m_A36 += gt[101];
+	m_A36 += gt[102];
+	m_A36 += gt[103];
+	m_A36 += gt[104];
+	m_A36 += gt[105];
+	m_A36 += gt[106];
+	m_A36 += gt[107];
+	m_A37 += go[101];
+	m_A38 += go[102];
+	double RHS13 = Idr[101];
+	RHS13 += Idr[102];
+	RHS13 += Idr[103];
+	RHS13 += Idr[104];
+	RHS13 += Idr[105];
+	RHS13 += Idr[106];
+	RHS13 += Idr[107];
+	RHS13 -= go[103] * *cnV[103];
+	RHS13 -= go[104] * *cnV[104];
+	RHS13 -= go[105] * *cnV[105];
+	RHS13 -= go[106] * *cnV[106];
+	RHS13 -= go[107] * *cnV[107];
+	m_A39 += gt[108];
+	m_A39 += gt[109];
+	m_A39 += gt[110];
+	m_A39 += gt[111];
+	m_A39 += gt[112];
+	m_A39 += gt[113];
+	m_A39 += gt[114];
+	m_A39 += gt[115];
+	m_A39 += gt[116];
+	m_A39 += gt[117];
+	m_A39 += gt[118];
+	m_A44 += go[108];
+	m_A44 += go[109];
+	m_A40 += go[110];
+	m_A40 += go[111];
+	m_A43 += go[112];
+	m_A42 += go[113];
+	m_A42 += go[114];
+	m_A41 += go[115];
+	m_A41 += go[116];
+	m_A41 += go[117];
+	double RHS14 = Idr[108];
+	RHS14 += Idr[109];
+	RHS14 += Idr[110];
+	RHS14 += Idr[111];
+	RHS14 += Idr[112];
+	RHS14 += Idr[113];
+	RHS14 += Idr[114];
+	RHS14 += Idr[115];
+	RHS14 += Idr[116];
+	RHS14 += Idr[117];
+	RHS14 += Idr[118];
+	RHS14 -= go[118] * *cnV[118];
+	m_A45 += gt[119];
+	m_A45 += gt[120];
+	m_A45 += gt[121];
+	m_A47 += go[119];
+	m_A46 += go[120];
+	double RHS15 = Idr[119];
+	RHS15 += Idr[120];
+	RHS15 += Idr[121];
+	RHS15 -= go[121] * *cnV[121];
+	m_A49 += gt[122];
+	m_A49 += gt[123];
+	m_A49 += gt[124];
+	m_A49 += gt[125];
+	m_A49 += gt[126];
+	m_A49 += gt[127];
+	m_A49 += gt[128];
+	m_A49 += gt[129];
+	m_A50 += go[122];
+	m_A50 += go[123];
+	m_A50 += go[124];
+	m_A48 += go[125];
+	m_A48 += go[126];
+	m_A51 += go[127];
+	m_A51 += go[128];
+	m_A51 += go[129];
+	double RHS16 = Idr[122];
+	RHS16 += Idr[123];
+	RHS16 += Idr[124];
+	RHS16 += Idr[125];
+	RHS16 += Idr[126];
+	RHS16 += Idr[127];
+	RHS16 += Idr[128];
+	RHS16 += Idr[129];
+	m_A52 += gt[130];
+	m_A52 += gt[131];
+	m_A52 += gt[132];
+	m_A52 += gt[133];
+	m_A52 += gt[134];
+	m_A52 += gt[135];
+	m_A52 += gt[136];
+	m_A52 += gt[137];
+	m_A52 += gt[138];
+	m_A52 += gt[139];
+	m_A52 += gt[140];
+	m_A52 += gt[141];
+	m_A52 += gt[142];
+	m_A52 += gt[143];
+	m_A54 += go[130];
+	m_A52 += go[131];
+	m_A52 += go[132];
+	m_A52 += go[133];
+	m_A52 += go[134];
+	m_A53 += go[135];
+	m_A53 += go[136];
+	m_A53 += go[137];
+	m_A53 += go[138];
+	double RHS17 = Idr[130];
+	RHS17 += Idr[131];
+	RHS17 += Idr[132];
+	RHS17 += Idr[133];
+	RHS17 += Idr[134];
+	RHS17 += Idr[135];
+	RHS17 += Idr[136];
+	RHS17 += Idr[137];
+	RHS17 += Idr[138];
+	RHS17 += Idr[139];
+	RHS17 += Idr[140];
+	RHS17 += Idr[141];
+	RHS17 += Idr[142];
+	RHS17 += Idr[143];
+	RHS17 -= go[139] * *cnV[139];
+	RHS17 -= go[140] * *cnV[140];
+	RHS17 -= go[141] * *cnV[141];
+	RHS17 -= go[142] * *cnV[142];
+	RHS17 -= go[143] * *cnV[143];
+	m_A59 += gt[144];
+	m_A59 += gt[145];
+	m_A59 += gt[146];
+	m_A59 += gt[147];
+	m_A59 += gt[148];
+	m_A59 += gt[149];
+	m_A58 += go[144];
+	m_A57 += go[145];
+	m_A56 += go[146];
+	m_A55 += go[147];
+	double RHS18 = Idr[144];
+	RHS18 += Idr[145];
+	RHS18 += Idr[146];
+	RHS18 += Idr[147];
+	RHS18 += Idr[148];
+	RHS18 += Idr[149];
+	RHS18 -= go[148] * *cnV[148];
+	RHS18 -= go[149] * *cnV[149];
+	m_A61 += gt[150];
+	m_A61 += gt[151];
+	m_A61 += gt[152];
+	m_A61 += gt[153];
+	m_A61 += gt[154];
+	m_A61 += gt[155];
+	m_A63 += go[150];
+	m_A62 += go[151];
+	m_A62 += go[152];
+	m_A64 += go[153];
+	m_A64 += go[154];
+	double RHS19 = Idr[150];
+	RHS19 += Idr[151];
+	RHS19 += Idr[152];
+	RHS19 += Idr[153];
+	RHS19 += Idr[154];
+	RHS19 += Idr[155];
+	RHS19 -= go[155] * *cnV[155];
+	m_A65 += gt[156];
+	m_A65 += gt[157];
+	m_A65 += gt[158];
+	m_A65 += gt[159];
+	m_A65 += gt[160];
+	m_A65 += gt[161];
+	m_A65 += gt[162];
+	m_A66 += go[156];
+	double RHS20 = Idr[156];
+	RHS20 += Idr[157];
+	RHS20 += Idr[158];
+	RHS20 += Idr[159];
+	RHS20 += Idr[160];
+	RHS20 += Idr[161];
+	RHS20 += Idr[162];
+	RHS20 -= go[157] * *cnV[157];
+	RHS20 -= go[158] * *cnV[158];
+	RHS20 -= go[159] * *cnV[159];
+	RHS20 -= go[160] * *cnV[160];
+	RHS20 -= go[161] * *cnV[161];
+	RHS20 -= go[162] * *cnV[162];
+	m_A68 += gt[163];
+	m_A68 += gt[164];
+	m_A68 += gt[165];
+	m_A68 += gt[166];
+	m_A68 += gt[167];
+	m_A68 += gt[168];
+	m_A68 += gt[169];
+	m_A68 += gt[170];
+	m_A68 += gt[171];
+	m_A68 += gt[172];
+	m_A68 += gt[173];
+	m_A68 += gt[174];
+	m_A68 += gt[175];
+	m_A68 += gt[176];
+	m_A69 += go[163];
+	m_A68 += go[164];
+	m_A68 += go[165];
+	m_A68 += go[166];
+	m_A68 += go[167];
+	m_A67 += go[168];
+	m_A67 += go[169];
+	m_A70 += go[170];
+	m_A70 += go[171];
+	double RHS21 = Idr[163];
+	RHS21 += Idr[164];
+	RHS21 += Idr[165];
+	RHS21 += Idr[166];
+	RHS21 += Idr[167];
+	RHS21 += Idr[168];
+	RHS21 += Idr[169];
+	RHS21 += Idr[170];
+	RHS21 += Idr[171];
+	RHS21 += Idr[172];
+	RHS21 += Idr[173];
+	RHS21 += Idr[174];
+	RHS21 += Idr[175];
+	RHS21 += Idr[176];
+	RHS21 -= go[172] * *cnV[172];
+	RHS21 -= go[173] * *cnV[173];
+	RHS21 -= go[174] * *cnV[174];
+	RHS21 -= go[175] * *cnV[175];
+	RHS21 -= go[176] * *cnV[176];
+	m_A72 += gt[177];
+	m_A72 += gt[178];
+	m_A72 += gt[179];
+	m_A72 += gt[180];
+	m_A72 += gt[181];
+	m_A72 += gt[182];
+	m_A71 += go[177];
+	m_A74 += go[178];
+	m_A73 += go[179];
+	double RHS22 = Idr[177];
+	RHS22 += Idr[178];
+	RHS22 += Idr[179];
+	RHS22 += Idr[180];
+	RHS22 += Idr[181];
+	RHS22 += Idr[182];
+	RHS22 -= go[180] * *cnV[180];
+	RHS22 -= go[181] * *cnV[181];
+	RHS22 -= go[182] * *cnV[182];
+	m_A76 += gt[183];
+	m_A76 += gt[184];
+	m_A75 += go[183];
+	m_A77 += go[184];
+	double RHS23 = Idr[183];
+	RHS23 += Idr[184];
+	m_A79 += gt[185];
+	m_A79 += gt[186];
+	m_A79 += gt[187];
+	m_A79 += gt[188];
+	m_A79 += gt[189];
+	m_A79 += gt[190];
+	m_A79 += gt[191];
+	m_A79 += gt[192];
+	m_A81 += go[185];
+	m_A81 += go[186];
+	m_A81 += go[187];
+	m_A78 += go[188];
+	m_A78 += go[189];
+	m_A80 += go[190];
+	m_A80 += go[191];
+	m_A80 += go[192];
+	double RHS24 = Idr[185];
+	RHS24 += Idr[186];
+	RHS24 += Idr[187];
+	RHS24 += Idr[188];
+	RHS24 += Idr[189];
+	RHS24 += Idr[190];
+	RHS24 += Idr[191];
+	RHS24 += Idr[192];
+	m_A86 += gt[193];
+	m_A86 += gt[194];
+	m_A86 += gt[195];
+	m_A86 += gt[196];
+	m_A86 += gt[197];
+	m_A86 += gt[198];
+	m_A82 += go[193];
+	m_A91 += go[194];
+	m_A91 += go[195];
+	m_A84 += go[196];
+	m_A84 += go[197];
+	double RHS25 = Idr[193];
+	RHS25 += Idr[194];
+	RHS25 += Idr[195];
+	RHS25 += Idr[196];
+	RHS25 += Idr[197];
+	RHS25 += Idr[198];
+	RHS25 -= go[198] * *cnV[198];
+	m_A96 += gt[199];
+	m_A96 += gt[200];
+	m_A96 += gt[201];
+	m_A96 += gt[202];
+	m_A96 += gt[203];
+	m_A96 += gt[204];
+	m_A96 += gt[205];
+	m_A96 += gt[206];
+	m_A96 += gt[207];
+	m_A96 += gt[208];
+	m_A96 += gt[209];
+	m_A96 += gt[210];
+	m_A96 += gt[211];
+	m_A97 += go[199];
+	m_A97 += go[200];
+	m_A94 += go[201];
+	m_A94 += go[202];
+	m_A94 += go[203];
+	m_A94 += go[204];
+	m_A95 += go[205];
+	m_A95 += go[206];
+	m_A95 += go[207];
+	m_A93 += go[208];
+	m_A98 += go[209];
+	m_A98 += go[210];
+	double RHS26 = Idr[199];
+	RHS26 += Idr[200];
+	RHS26 += Idr[201];
+	RHS26 += Idr[202];
+	RHS26 += Idr[203];
+	RHS26 += Idr[204];
+	RHS26 += Idr[205];
+	RHS26 += Idr[206];
+	RHS26 += Idr[207];
+	RHS26 += Idr[208];
+	RHS26 += Idr[209];
+	RHS26 += Idr[210];
+	RHS26 += Idr[211];
+	RHS26 -= go[211] * *cnV[211];
+	m_A101 += gt[212];
+	m_A101 += gt[213];
+	m_A101 += gt[214];
+	m_A101 += gt[215];
+	m_A101 += gt[216];
+	m_A101 += gt[217];
+	m_A101 += gt[218];
+	m_A101 += gt[219];
+	m_A106 += go[212];
+	m_A106 += go[213];
+	m_A106 += go[214];
+	m_A104 += go[215];
+	m_A104 += go[216];
+	m_A99 += go[217];
+	m_A99 += go[218];
+	m_A99 += go[219];
+	double RHS27 = Idr[212];
+	RHS27 += Idr[213];
+	RHS27 += Idr[214];
+	RHS27 += Idr[215];
+	RHS27 += Idr[216];
+	RHS27 += Idr[217];
+	RHS27 += Idr[218];
+	RHS27 += Idr[219];
+	m_A116 += gt[220];
+	m_A116 += gt[221];
+	m_A116 += gt[222];
+	m_A116 += gt[223];
+	m_A116 += gt[224];
+	m_A108 += go[220];
+	m_A110 += go[221];
+	m_A113 += go[222];
+	m_A112 += go[223];
+	m_A107 += go[224];
+	double RHS28 = Idr[220];
+	RHS28 += Idr[221];
+	RHS28 += Idr[222];
+	RHS28 += Idr[223];
+	RHS28 += Idr[224];
+	m_A124 += gt[225];
+	m_A124 += gt[226];
+	m_A124 += gt[227];
+	m_A124 += gt[228];
+	m_A124 += gt[229];
+	m_A124 += gt[230];
+	m_A124 += gt[231];
+	m_A124 += gt[232];
+	m_A124 += gt[233];
+	m_A123 += go[225];
+	m_A123 += go[226];
+	m_A127 += go[227];
+	m_A126 += go[228];
+	m_A122 += go[229];
+	m_A122 += go[230];
+	double RHS29 = Idr[225];
+	RHS29 += Idr[226];
+	RHS29 += Idr[227];
+	RHS29 += Idr[228];
+	RHS29 += Idr[229];
+	RHS29 += Idr[230];
+	RHS29 += Idr[231];
+	RHS29 += Idr[232];
+	RHS29 += Idr[233];
+	RHS29 -= go[231] * *cnV[231];
+	RHS29 -= go[232] * *cnV[232];
+	RHS29 -= go[233] * *cnV[233];
+	m_A133 += gt[234];
+	m_A133 += gt[235];
+	m_A133 += gt[236];
+	m_A133 += gt[237];
+	m_A133 += gt[238];
+	m_A133 += gt[239];
+	m_A130 += go[234];
+	m_A139 += go[235];
+	m_A129 += go[236];
+	m_A128 += go[237];
+	double RHS30 = Idr[234];
+	RHS30 += Idr[235];
+	RHS30 += Idr[236];
+	RHS30 += Idr[237];
+	RHS30 += Idr[238];
+	RHS30 += Idr[239];
+	RHS30 -= go[238] * *cnV[238];
+	RHS30 -= go[239] * *cnV[239];
+	m_A142 += gt[240];
+	m_A142 += gt[241];
+	m_A142 += gt[242];
+	m_A142 += gt[243];
+	m_A142 += gt[244];
+	m_A142 += gt[245];
+	m_A142 += gt[246];
+	m_A142 += gt[247];
+	m_A142 += gt[248];
+	m_A142 += gt[249];
+	m_A142 += gt[250];
+	m_A143 += go[240];
+	m_A144 += go[241];
+	m_A144 += go[242];
+	m_A141 += go[243];
+	m_A141 += go[244];
+	m_A141 += go[245];
+	m_A140 += go[246];
+	m_A140 += go[247];
+	double RHS31 = Idr[240];
+	RHS31 += Idr[241];
+	RHS31 += Idr[242];
+	RHS31 += Idr[243];
+	RHS31 += Idr[244];
+	RHS31 += Idr[245];
+	RHS31 += Idr[246];
+	RHS31 += Idr[247];
+	RHS31 += Idr[248];
+	RHS31 += Idr[249];
+	RHS31 += Idr[250];
+	RHS31 -= go[248] * *cnV[248];
+	RHS31 -= go[249] * *cnV[249];
+	RHS31 -= go[250] * *cnV[250];
+	m_A152 += gt[251];
+	m_A152 += gt[252];
+	m_A152 += gt[253];
+	m_A152 += gt[254];
+	m_A152 += gt[255];
+	m_A152 += gt[256];
+	m_A152 += gt[257];
+	m_A152 += gt[258];
+	m_A152 += gt[259];
+	m_A152 += gt[260];
+	m_A152 += gt[261];
+	m_A148 += go[251];
+	m_A146 += go[252];
+	m_A147 += go[253];
+	m_A145 += go[254];
+	m_A145 += go[255];
+	m_A145 += go[256];
+	m_A156 += go[257];
+	m_A156 += go[258];
+	m_A149 += go[259];
+	m_A149 += go[260];
+	double RHS32 = Idr[251];
+	RHS32 += Idr[252];
+	RHS32 += Idr[253];
+	RHS32 += Idr[254];
+	RHS32 += Idr[255];
+	RHS32 += Idr[256];
+	RHS32 += Idr[257];
+	RHS32 += Idr[258];
+	RHS32 += Idr[259];
+	RHS32 += Idr[260];
+	RHS32 += Idr[261];
+	RHS32 -= go[261] * *cnV[261];
+	m_A164 += gt[262];
+	m_A164 += gt[263];
+	m_A164 += gt[264];
+	m_A164 += gt[265];
+	m_A164 += gt[266];
+	m_A164 += gt[267];
+	m_A164 += gt[268];
+	m_A164 += gt[269];
+	m_A164 += gt[270];
+	m_A164 += gt[271];
+	m_A164 += gt[272];
+	m_A164 += gt[273];
+	m_A164 += gt[274];
+	m_A164 += gt[275];
+	m_A168 += go[262];
+	m_A164 += go[263];
+	m_A164 += go[264];
+	m_A164 += go[265];
+	m_A164 += go[266];
+	m_A160 += go[267];
+	m_A160 += go[268];
+	m_A158 += go[269];
+	m_A158 += go[270];
+	double RHS33 = Idr[262];
+	RHS33 += Idr[263];
+	RHS33 += Idr[264];
+	RHS33 += Idr[265];
+	RHS33 += Idr[266];
+	RHS33 += Idr[267];
+	RHS33 += Idr[268];
+	RHS33 += Idr[269];
+	RHS33 += Idr[270];
+	RHS33 += Idr[271];
+	RHS33 += Idr[272];
+	RHS33 += Idr[273];
+	RHS33 += Idr[274];
+	RHS33 += Idr[275];
+	RHS33 -= go[271] * *cnV[271];
+	RHS33 -= go[272] * *cnV[272];
+	RHS33 -= go[273] * *cnV[273];
+	RHS33 -= go[274] * *cnV[274];
+	RHS33 -= go[275] * *cnV[275];
+	m_A176 += gt[276];
+	m_A176 += gt[277];
+	m_A176 += gt[278];
+	m_A176 += gt[279];
+	m_A176 += gt[280];
+	m_A176 += gt[281];
+	m_A176 += gt[282];
+	m_A176 += gt[283];
+	m_A176 += gt[284];
+	m_A176 += gt[285];
+	m_A176 += gt[286];
+	m_A172 += go[276];
+	m_A171 += go[277];
+	m_A171 += go[278];
+	m_A170 += go[279];
+	m_A170 += go[280];
+	m_A170 += go[281];
+	m_A169 += go[282];
+	m_A169 += go[283];
+	double RHS34 = Idr[276];
+	RHS34 += Idr[277];
+	RHS34 += Idr[278];
+	RHS34 += Idr[279];
+	RHS34 += Idr[280];
+	RHS34 += Idr[281];
+	RHS34 += Idr[282];
+	RHS34 += Idr[283];
+	RHS34 += Idr[284];
+	RHS34 += Idr[285];
+	RHS34 += Idr[286];
+	RHS34 -= go[284] * *cnV[284];
+	RHS34 -= go[285] * *cnV[285];
+	RHS34 -= go[286] * *cnV[286];
+	m_A190 += gt[287];
+	m_A190 += gt[288];
+	m_A190 += gt[289];
+	m_A190 += gt[290];
+	m_A190 += gt[291];
+	m_A190 += gt[292];
+	m_A190 += gt[293];
+	m_A190 += gt[294];
+	m_A190 += gt[295];
+	m_A182 += go[287];
+	m_A182 += go[288];
+	m_A181 += go[289];
+	m_A186 += go[290];
+	m_A180 += go[291];
+	m_A180 += go[292];
+	double RHS35 = Idr[287];
+	RHS35 += Idr[288];
+	RHS35 += Idr[289];
+	RHS35 += Idr[290];
+	RHS35 += Idr[291];
+	RHS35 += Idr[292];
+	RHS35 += Idr[293];
+	RHS35 += Idr[294];
+	RHS35 += Idr[295];
+	RHS35 -= go[293] * *cnV[293];
+	RHS35 -= go[294] * *cnV[294];
+	RHS35 -= go[295] * *cnV[295];
+	m_A203 += gt[296];
+	m_A203 += gt[297];
+	m_A203 += gt[298];
+	m_A203 += gt[299];
+	m_A203 += gt[300];
+	m_A203 += gt[301];
+	m_A203 += gt[302];
+	m_A203 += gt[303];
+	m_A203 += gt[304];
+	m_A203 += gt[305];
+	m_A203 += gt[306];
+	m_A195 += go[296];
+	m_A195 += go[297];
+	m_A199 += go[298];
+	m_A199 += go[299];
+	m_A197 += go[300];
+	m_A196 += go[301];
+	m_A196 += go[302];
+	m_A194 += go[303];
+	m_A194 += go[304];
+	m_A194 += go[305];
+	double RHS36 = Idr[296];
+	RHS36 += Idr[297];
+	RHS36 += Idr[298];
+	RHS36 += Idr[299];
+	RHS36 += Idr[300];
+	RHS36 += Idr[301];
+	RHS36 += Idr[302];
+	RHS36 += Idr[303];
+	RHS36 += Idr[304];
+	RHS36 += Idr[305];
+	RHS36 += Idr[306];
+	RHS36 -= go[306] * *cnV[306];
+	m_A212 += gt[307];
+	m_A212 += gt[308];
+	m_A212 += gt[309];
+	m_A212 += gt[310];
+	m_A212 += gt[311];
+	m_A212 += gt[312];
+	m_A212 += gt[313];
+	m_A212 += gt[314];
+	m_A212 += gt[315];
+	m_A212 += gt[316];
+	m_A212 += gt[317];
+	m_A212 += gt[318];
+	m_A212 += gt[319];
+	m_A213 += go[307];
+	m_A213 += go[308];
+	m_A207 += go[309];
+	m_A207 += go[310];
+	m_A207 += go[311];
+	m_A207 += go[312];
+	m_A208 += go[313];
+	m_A208 += go[314];
+	m_A208 += go[315];
+	m_A206 += go[316];
+	m_A209 += go[317];
+	m_A209 += go[318];
+	double RHS37 = Idr[307];
+	RHS37 += Idr[308];
+	RHS37 += Idr[309];
+	RHS37 += Idr[310];
+	RHS37 += Idr[311];
+	RHS37 += Idr[312];
+	RHS37 += Idr[313];
+	RHS37 += Idr[314];
+	RHS37 += Idr[315];
+	RHS37 += Idr[316];
+	RHS37 += Idr[317];
+	RHS37 += Idr[318];
+	RHS37 += Idr[319];
+	RHS37 -= go[319] * *cnV[319];
+	m_A226 += gt[320];
+	m_A226 += gt[321];
+	m_A226 += gt[322];
+	m_A226 += gt[323];
+	m_A226 += gt[324];
+	m_A226 += gt[325];
+	m_A226 += gt[326];
+	m_A226 += gt[327];
+	m_A226 += gt[328];
+	m_A226 += gt[329];
+	m_A226 += gt[330];
+	m_A219 += go[320];
+	m_A215 += go[321];
+	m_A221 += go[322];
+	m_A217 += go[323];
+	m_A217 += go[324];
+	m_A217 += go[325];
+	m_A214 += go[326];
+	m_A214 += go[327];
+	m_A225 += go[328];
+	m_A225 += go[329];
+	double RHS38 = Idr[320];
+	RHS38 += Idr[321];
+	RHS38 += Idr[322];
+	RHS38 += Idr[323];
+	RHS38 += Idr[324];
+	RHS38 += Idr[325];
+	RHS38 += Idr[326];
+	RHS38 += Idr[327];
+	RHS38 += Idr[328];
+	RHS38 += Idr[329];
+	RHS38 += Idr[330];
+	RHS38 -= go[330] * *cnV[330];
 	const double f0 = 1.0 / m_A0;
-	const double f0_26 = -f0 * m_A57;
-	m_A60 += m_A1 * f0_26;
+	const double f0_16 = -f0 * m_A48;
+	m_A49 += m_A1 * f0_16;
+	m_A50 += m_A2 * f0_16;
+	m_A51 += m_A3 * f0_16;
+	RHS16 += f0_16 * RHS0;
+	const double f0_26 = -f0 * m_A93;
+	m_A95 += m_A1 * f0_26;
+	m_A96 += m_A2 * f0_26;
+	m_A98 += m_A3 * f0_26;
 	RHS26 += f0_26 * RHS0;
-	const double f1 = 1.0 / m_A2;
-	const double f1_26 = -f1 * m_A58;
-	m_A60 += m_A3 * f1_26;
-	RHS26 += f1_26 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_26 = -f2 * m_A59;
-	m_A60 += m_A5 * f2_26;
-	m_A61 += m_A6 * f2_26;
-	RHS26 += f2_26 * RHS2;
-	const double f2_34 = -f2 * m_A88;
-	m_A89 += m_A5 * f2_34;
-	m_A90 += m_A6 * f2_34;
-	RHS34 += f2_34 * RHS2;
-	const double f3 = 1.0 / m_A7;
-	const double f3_36 = -f3 * m_A96;
-	m_A97 += m_A8 * f3_36;
-	RHS36 += f3_36 * RHS3;
-	const double f3_48 = -f3 * m_A157;
-	m_A160 += m_A8 * f3_48;
-	RHS48 += f3_48 * RHS3;
-	const double f4 = 1.0 / m_A9;
-	const double f4_50 = -f4 * m_A171;
-	m_A173 += m_A10 * f4_50;
-	RHS50 += f4_50 * RHS4;
-	const double f5 = 1.0 / m_A11;
-	const double f5_44 = -f5 * m_A133;
-	m_A141 += m_A12 * f5_44;
-	RHS44 += f5_44 * RHS5;
-	const double f6 = 1.0 / m_A13;
-	const double f6_44 = -f6 * m_A134;
-	m_A141 += m_A14 * f6_44;
-	RHS44 += f6_44 * RHS6;
-	const double f7 = 1.0 / m_A15;
-	const double f7_44 = -f7 * m_A135;
-	m_A141 += m_A16 * f7_44;
-	RHS44 += f7_44 * RHS7;
-	const double f8 = 1.0 / m_A17;
-	const double f8_44 = -f8 * m_A136;
-	m_A141 += m_A18 * f8_44;
-	RHS44 += f8_44 * RHS8;
-	const double f9 = 1.0 / m_A19;
-	const double f9_32 = -f9 * m_A75;
-	m_A82 += m_A20 * f9_32;
-	m_A83 += m_A21 * f9_32;
-	RHS32 += f9_32 * RHS9;
-	const double f9_44 = -f9 * m_A137;
-	m_A138 += m_A20 * f9_44;
-	m_A141 += m_A21 * f9_44;
-	RHS44 += f9_44 * RHS9;
-	const double f10 = 1.0 / m_A22;
-	const double f10_32 = -f10 * m_A76;
-	m_A82 += m_A23 * f10_32;
-	RHS32 += f10_32 * RHS10;
-	const double f11 = 1.0 / m_A24;
-	const double f11_32 = -f11 * m_A77;
-	m_A82 += m_A25 * f11_32;
-	RHS32 += f11_32 * RHS11;
-	const double f12 = 1.0 / m_A26;
-	const double f12_32 = -f12 * m_A78;
-	m_A82 += m_A27 * f12_32;
-	RHS32 += f12_32 * RHS12;
-	const double f13 = 1.0 / m_A28;
-	const double f13_31 = -f13 * m_A73;
-	m_A74 += m_A29 * f13_31;
-	RHS31 += f13_31 * RHS13;
-	const double f13_43 = -f13 * m_A126;
-	m_A129 += m_A29 * f13_43;
-	RHS43 += f13_43 * RHS13;
-	const double f14 = 1.0 / m_A30;
-	const double f14_32 = -f14 * m_A79;
-	m_A82 += m_A31 * f14_32;
-	RHS32 += f14_32 * RHS14;
-	const double f15 = 1.0 / m_A32;
-	const double f15_35 = -f15 * m_A92;
-	m_A94 += m_A33 * f15_35;
-	RHS35 += f15_35 * RHS15;
-	const double f16 = 1.0 / m_A34;
-	const double f16_32 = -f16 * m_A80;
-	m_A82 += m_A35 * f16_32;
-	RHS32 += f16_32 * RHS16;
-	const double f17 = 1.0 / m_A36;
-	const double f17_32 = -f17 * m_A81;
-	m_A82 += m_A37 * f17_32;
-	RHS32 += f17_32 * RHS17;
-	const double f18 = 1.0 / m_A38;
-	const double f18_42 = -f18 * m_A122;
-	m_A124 += m_A39 * f18_42;
-	RHS42 += f18_42 * RHS18;
-	const double f19 = 1.0 / m_A40;
-	const double f19_33 = -f19 * m_A84;
-	m_A86 += m_A41 * f19_33;
-	RHS33 += f19_33 * RHS19;
-	const double f20 = 1.0 / m_A42;
-	const double f20_47 = -f20 * m_A150;
-	m_A153 += m_A43 * f20_47;
-	RHS47 += f20_47 * RHS20;
-	const double f21 = 1.0 / m_A44;
-	const double f21_45 = -f21 * m_A142;
-	m_A144 += m_A45 * f21_45;
-	RHS45 += f21_45 * RHS21;
-	const double f21_48 = -f21 * m_A158;
-	m_A162 += m_A45 * f21_48;
-	RHS48 += f21_48 * RHS21;
-	const double f22 = 1.0 / m_A46;
-	const double f22_33 = -f22 * m_A85;
-	m_A86 += m_A47 * f22_33;
-	m_A87 += m_A48 * f22_33;
-	RHS33 += f22_33 * RHS22;
-	const double f22_39 = -f22 * m_A108;
-	m_A110 += m_A47 * f22_39;
-	m_A111 += m_A48 * f22_39;
-	RHS39 += f22_39 * RHS22;
-	const double f23 = 1.0 / m_A49;
-	const double f23_37 = -f23 * m_A99;
-	m_A100 += m_A50 * f23_37;
-	m_A101 += m_A51 * f23_37;
-	RHS37 += f23_37 * RHS23;
-	const double f23_38 = -f23 * m_A103;
-	m_A104 += m_A50 * f23_38;
-	m_A105 += m_A51 * f23_38;
-	RHS38 += f23_38 * RHS23;
-	const double f24 = 1.0 / m_A52;
-	const double f24_48 = -f24 * m_A159;
-	m_A162 += m_A53 * f24_48;
-	RHS48 += f24_48 * RHS24;
-	const double f25 = 1.0 / m_A54;
-	const double f25_35 = -f25 * m_A93;
-	m_A94 += m_A55 * f25_35;
-	m_A95 += m_A56 * f25_35;
-	RHS35 += f25_35 * RHS25;
-	const double f25_40 = -f25 * m_A113;
-	m_A115 += m_A55 * f25_40;
-	m_A116 += m_A56 * f25_40;
-	RHS40 += f25_40 * RHS25;
-	const double f26 = 1.0 / m_A60;
-	const double f26_34 = -f26 * m_A89;
-	m_A90 += m_A61 * f26_34;
-	RHS34 += f26_34 * RHS26;
-	const double f27 = 1.0 / m_A62;
-	const double f27_39 = -f27 * m_A109;
-	m_A111 += m_A63 * f27_39;
-	m_A112 += m_A64 * f27_39;
-	RHS39 += f27_39 * RHS27;
-	const double f27_49 = -f27 * m_A164;
-	m_A166 += m_A63 * f27_49;
-	m_A169 += m_A64 * f27_49;
-	RHS49 += f27_49 * RHS27;
-	const double f28 = 1.0 / m_A65;
-	const double f28_41 = -f28 * m_A119;
-	m_A121 += m_A66 * f28_41;
-	RHS41 += f28_41 * RHS28;
-	const double f28_43 = -f28 * m_A127;
-	m_A131 += m_A66 * f28_43;
-	RHS43 += f28_43 * RHS28;
-	const double f29 = 1.0 / m_A67;
-	const double f29_40 = -f29 * m_A114;
-	m_A116 += m_A68 * f29_40;
-	m_A117 += m_A69 * f29_40;
-	RHS40 += f29_40 * RHS29;
-	const double f29_46 = -f29 * m_A145;
-	m_A146 += m_A68 * f29_46;
-	m_A147 += m_A69 * f29_46;
-	RHS46 += f29_46 * RHS29;
-	const double f30 = 1.0 / m_A70;
-	const double f30_42 = -f30 * m_A123;
-	m_A124 += m_A71 * f30_42;
-	m_A125 += m_A72 * f30_42;
-	RHS42 += f30_42 * RHS30;
-	const double f30_43 = -f30 * m_A128;
-	m_A130 += m_A71 * f30_43;
-	m_A131 += m_A72 * f30_43;
-	RHS43 += f30_43 * RHS30;
-	const double f31 = 1.0 / m_A74;
-	const double f31_43 = -f31 * m_A129;
-	RHS43 += f31_43 * RHS31;
-	const double f32 = 1.0 / m_A82;
-	const double f32_44 = -f32 * m_A138;
-	m_A141 += m_A83 * f32_44;
-	RHS44 += f32_44 * RHS32;
-	const double f33 = 1.0 / m_A86;
-	const double f33_39 = -f33 * m_A110;
-	m_A111 += m_A87 * f33_39;
-	RHS39 += f33_39 * RHS33;
-	const double f34 = 1.0 / m_A90;
-	const double f34_44 = -f34 * m_A139;
-	m_A141 += m_A91 * f34_44;
-	RHS44 += f34_44 * RHS34;
-	const double f35 = 1.0 / m_A94;
-	const double f35_40 = -f35 * m_A115;
-	m_A116 += m_A95 * f35_40;
-	RHS40 += f35_40 * RHS35;
-	const double f36 = 1.0 / m_A97;
-	const double f36_44 = -f36 * m_A140;
-	m_A141 += m_A98 * f36_44;
-	RHS44 += f36_44 * RHS36;
-	const double f36_48 = -f36 * m_A160;
-	m_A161 += m_A98 * f36_48;
-	RHS48 += f36_48 * RHS36;
-	const double f37 = 1.0 / m_A100;
-	const double f37_38 = -f37 * m_A104;
-	m_A105 += m_A101 * f37_38;
-	m_A106 += m_A102 * f37_38;
+	const double f0_34 = -f0 * m_A169;
+	m_A170 += m_A1 * f0_34;
+	m_A171 += m_A2 * f0_34;
+	m_A176 += m_A3 * f0_34;
+	RHS34 += f0_34 * RHS0;
+	const double f1 = 1.0 / m_A4;
+	const double f1_29 = -f1 * m_A122;
+	m_A124 += m_A5 * f1_29;
+	RHS29 += f1_29 * RHS1;
+	const double f2 = 1.0 / m_A6;
+	const double f2_24 = -f2 * m_A78;
+	m_A79 += m_A7 * f2_24;
+	m_A80 += m_A8 * f2_24;
+	m_A81 += m_A9 * f2_24;
+	RHS24 += f2_24 * RHS2;
+	const double f2_31 = -f2 * m_A140;
+	m_A141 += m_A7 * f2_31;
+	m_A142 += m_A8 * f2_31;
+	m_A144 += m_A9 * f2_31;
+	RHS31 += f2_31 * RHS2;
+	const double f2_37 = -f2 * m_A206;
+	m_A208 += m_A7 * f2_37;
+	m_A209 += m_A8 * f2_37;
+	m_A212 += m_A9 * f2_37;
+	RHS37 += f2_37 * RHS2;
+	const double f3 = 1.0 / m_A10;
+	const double f3_35 = -f3 * m_A180;
+	m_A190 += m_A11 * f3_35;
+	RHS35 += f3_35 * RHS3;
+	const double f4 = 1.0 / m_A12;
+	const double f4_18 = -f4 * m_A55;
+	m_A59 += m_A13 * f4_18;
+	RHS18 += f4_18 * RHS4;
+	const double f5 = 1.0 / m_A14;
+	const double f5_21 = -f5 * m_A67;
+	m_A68 += m_A15 * f5_21;
+	m_A69 += m_A16 * f5_21;
+	m_A70 += m_A17 * f5_21;
+	RHS21 += f5_21 * RHS5;
+	const double f5_32 = -f5 * m_A145;
+	m_A147 += m_A15 * f5_32;
+	m_A152 += m_A16 * f5_32;
+	m_A156 += m_A17 * f5_32;
+	RHS32 += f5_32 * RHS5;
+	const double f5_36 = -f5 * m_A194;
+	m_A196 += m_A15 * f5_36;
+	m_A199 += m_A16 * f5_36;
+	m_A203 += m_A17 * f5_36;
+	RHS36 += f5_36 * RHS5;
+	const double f6 = 1.0 / m_A18;
+	const double f6_26 = -f6 * m_A94;
+	m_A96 += m_A19 * f6_26;
+	m_A97 += m_A20 * f6_26;
+	RHS26 += f6_26 * RHS6;
+	const double f6_32 = -f6 * m_A146;
+	m_A149 += m_A19 * f6_32;
+	m_A152 += m_A20 * f6_32;
+	RHS32 += f6_32 * RHS6;
+	const double f7 = 1.0 / m_A21;
+	const double f7_22 = -f7 * m_A71;
+	m_A74 += m_A22 * f7_22;
+	RHS22 += f7_22 * RHS7;
+	const double f8 = 1.0 / m_A23;
+	const double f8_18 = -f8 * m_A56;
+	m_A59 += m_A24 * f8_18;
+	RHS18 += f8_18 * RHS8;
+	const double f9 = 1.0 / m_A25;
+	const double f9_23 = -f9 * m_A75;
+	m_A76 += m_A26 * f9_23;
+	RHS23 += f9_23 * RHS9;
+	const double f10 = 1.0 / m_A27;
+	const double f10_18 = -f10 * m_A57;
+	m_A59 += m_A28 * f10_18;
+	RHS18 += f10_18 * RHS10;
+	const double f11 = 1.0 / m_A29;
+	const double f11_18 = -f11 * m_A58;
+	m_A59 += m_A30 * f11_18;
+	m_A60 += m_A31 * f11_18;
+	RHS18 += f11_18 * RHS11;
+	const double f11_28 = -f11 * m_A107;
+	m_A111 += m_A30 * f11_28;
+	m_A116 += m_A31 * f11_28;
+	RHS28 += f11_28 * RHS11;
+	const double f12 = 1.0 / m_A32;
+	const double f12_25 = -f12 * m_A82;
+	m_A83 += m_A33 * f12_25;
+	m_A86 += m_A34 * f12_25;
+	m_A88 += m_A35 * f12_25;
+	RHS25 += f12_25 * RHS12;
+	const double f12_28 = -f12 * m_A108;
+	m_A109 += m_A33 * f12_28;
+	m_A114 += m_A34 * f12_28;
+	m_A116 += m_A35 * f12_28;
+	RHS28 += f12_28 * RHS12;
+	const double f13 = 1.0 / m_A36;
+	const double f13_25 = -f13 * m_A83;
+	m_A85 += m_A37 * f13_25;
+	m_A88 += m_A38 * f13_25;
+	RHS25 += f13_25 * RHS13;
+	const double f13_28 = -f13 * m_A109;
+	m_A110 += m_A37 * f13_28;
+	m_A116 += m_A38 * f13_28;
+	RHS28 += f13_28 * RHS13;
+	const double f14 = 1.0 / m_A39;
+	const double f14_25 = -f14 * m_A84;
+	m_A86 += m_A40 * f14_25;
+	m_A87 += m_A41 * f14_25;
+	m_A90 += m_A42 * f14_25;
+	m_A91 += m_A43 * f14_25;
+	m_A92 += m_A44 * f14_25;
+	RHS25 += f14_25 * RHS14;
+	const double f14_27 = -f14 * m_A99;
+	m_A100 += m_A40 * f14_27;
+	m_A101 += m_A41 * f14_27;
+	m_A104 += m_A42 * f14_27;
+	m_A105 += m_A43 * f14_27;
+	m_A106 += m_A44 * f14_27;
+	RHS27 += f14_27 * RHS14;
+	const double f14_33 = -f14 * m_A158;
+	m_A159 += m_A40 * f14_33;
+	m_A160 += m_A41 * f14_33;
+	m_A164 += m_A42 * f14_33;
+	m_A166 += m_A43 * f14_33;
+	m_A168 += m_A44 * f14_33;
+	RHS33 += f14_33 * RHS14;
+	const double f14_35 = -f14 * m_A181;
+	m_A182 += m_A40 * f14_35;
+	m_A183 += m_A41 * f14_35;
+	m_A188 += m_A42 * f14_35;
+	m_A190 += m_A43 * f14_35;
+	m_A193 += m_A44 * f14_35;
+	RHS35 += f14_35 * RHS14;
+	const double f14_38 = -f14 * m_A214;
+	m_A216 += m_A40 * f14_38;
+	m_A217 += m_A41 * f14_38;
+	m_A221 += m_A42 * f14_38;
+	m_A223 += m_A43 * f14_38;
+	m_A226 += m_A44 * f14_38;
+	RHS38 += f14_38 * RHS14;
+	const double f15 = 1.0 / m_A45;
+	const double f15_25 = -f15 * m_A85;
+	m_A88 += m_A46 * f15_25;
+	m_A89 += m_A47 * f15_25;
+	RHS25 += f15_25 * RHS15;
+	const double f15_28 = -f15 * m_A110;
+	m_A116 += m_A46 * f15_28;
+	m_A117 += m_A47 * f15_28;
+	RHS28 += f15_28 * RHS15;
+	const double f15_30 = -f15 * m_A128;
+	m_A131 += m_A46 * f15_30;
+	m_A133 += m_A47 * f15_30;
+	RHS30 += f15_30 * RHS15;
+	const double f16 = 1.0 / m_A49;
+	const double f16_26 = -f16 * m_A95;
+	m_A96 += m_A50 * f16_26;
+	m_A98 += m_A51 * f16_26;
+	RHS26 += f16_26 * RHS16;
+	const double f16_34 = -f16 * m_A170;
+	m_A171 += m_A50 * f16_34;
+	m_A176 += m_A51 * f16_34;
+	RHS34 += f16_34 * RHS16;
+	const double f17 = 1.0 / m_A52;
+	const double f17_37 = -f17 * m_A207;
+	m_A212 += m_A53 * f17_37;
+	m_A213 += m_A54 * f17_37;
+	RHS37 += f17_37 * RHS17;
+	const double f17_38 = -f17 * m_A215;
+	m_A225 += m_A53 * f17_38;
+	m_A226 += m_A54 * f17_38;
+	RHS38 += f17_38 * RHS17;
+	const double f18 = 1.0 / m_A59;
+	const double f18_28 = -f18 * m_A111;
+	m_A116 += m_A60 * f18_28;
+	RHS28 += f18_28 * RHS18;
+	const double f19 = 1.0 / m_A61;
+	const double f19_29 = -f19 * m_A123;
+	m_A124 += m_A62 * f19_29;
+	m_A125 += m_A63 * f19_29;
+	m_A127 += m_A64 * f19_29;
+	RHS29 += f19_29 * RHS19;
+	const double f19_30 = -f19 * m_A129;
+	m_A132 += m_A62 * f19_30;
+	m_A133 += m_A63 * f19_30;
+	m_A138 += m_A64 * f19_30;
+	RHS30 += f19_30 * RHS19;
+	const double f19_36 = -f19 * m_A195;
+	m_A197 += m_A62 * f19_36;
+	m_A198 += m_A63 * f19_36;
+	m_A203 += m_A64 * f19_36;
+	RHS36 += f19_36 * RHS19;
+	const double f20 = 1.0 / m_A65;
+	const double f20_30 = -f20 * m_A130;
+	m_A139 += m_A66 * f20_30;
+	RHS30 += f20_30 * RHS20;
+	const double f21 = 1.0 / m_A68;
+	const double f21_32 = -f21 * m_A147;
+	m_A152 += m_A69 * f21_32;
+	m_A156 += m_A70 * f21_32;
+	RHS32 += f21_32 * RHS21;
+	const double f21_36 = -f21 * m_A196;
+	m_A199 += m_A69 * f21_36;
+	m_A203 += m_A70 * f21_36;
+	RHS36 += f21_36 * RHS21;
+	const double f22 = 1.0 / m_A72;
+	const double f22_28 = -f22 * m_A112;
+	m_A116 += m_A73 * f22_28;
+	m_A118 += m_A74 * f22_28;
+	RHS28 += f22_28 * RHS22;
+	const double f22_32 = -f22 * m_A148;
+	m_A150 += m_A73 * f22_32;
+	m_A152 += m_A74 * f22_32;
+	RHS32 += f22_32 * RHS22;
+	const double f23 = 1.0 / m_A76;
+	const double f23_28 = -f23 * m_A113;
+	m_A116 += m_A77 * f23_28;
+	RHS28 += f23_28 * RHS23;
+	const double f24 = 1.0 / m_A79;
+	const double f24_31 = -f24 * m_A141;
+	m_A142 += m_A80 * f24_31;
+	m_A144 += m_A81 * f24_31;
+	RHS31 += f24_31 * RHS24;
+	const double f24_37 = -f24 * m_A208;
+	m_A209 += m_A80 * f24_37;
+	m_A212 += m_A81 * f24_37;
+	RHS37 += f24_37 * RHS24;
+	const double f25 = 1.0 / m_A86;
+	const double f25_27 = -f25 * m_A100;
+	m_A101 += m_A87 * f25_27;
+	m_A102 += m_A88 * f25_27;
+	m_A103 += m_A89 * f25_27;
+	m_A104 += m_A90 * f25_27;
+	m_A105 += m_A91 * f25_27;
+	m_A106 += m_A92 * f25_27;
+	RHS27 += f25_27 * RHS25;
+	const double f25_28 = -f25 * m_A114;
+	m_A115 += m_A87 * f25_28;
+	m_A116 += m_A88 * f25_28;
+	m_A117 += m_A89 * f25_28;
+	m_A119 += m_A90 * f25_28;
+	m_A120 += m_A91 * f25_28;
+	m_A121 += m_A92 * f25_28;
+	RHS28 += f25_28 * RHS25;
+	const double f25_33 = -f25 * m_A159;
+	m_A160 += m_A87 * f25_33;
+	m_A161 += m_A88 * f25_33;
+	m_A162 += m_A89 * f25_33;
+	m_A164 += m_A90 * f25_33;
+	m_A166 += m_A91 * f25_33;
+	m_A168 += m_A92 * f25_33;
+	RHS33 += f25_33 * RHS25;
+	const double f25_35 = -f25 * m_A182;
+	m_A183 += m_A87 * f25_35;
+	m_A184 += m_A88 * f25_35;
+	m_A185 += m_A89 * f25_35;
+	m_A188 += m_A90 * f25_35;
+	m_A190 += m_A91 * f25_35;
+	m_A193 += m_A92 * f25_35;
+	RHS35 += f25_35 * RHS25;
+	const double f25_38 = -f25 * m_A216;
+	m_A217 += m_A87 * f25_38;
+	m_A218 += m_A88 * f25_38;
+	m_A219 += m_A89 * f25_38;
+	m_A221 += m_A90 * f25_38;
+	m_A223 += m_A91 * f25_38;
+	m_A226 += m_A92 * f25_38;
+	RHS38 += f25_38 * RHS25;
+	const double f26 = 1.0 / m_A96;
+	const double f26_32 = -f26 * m_A149;
+	m_A152 += m_A97 * f26_32;
+	m_A154 += m_A98 * f26_32;
+	RHS32 += f26_32 * RHS26;
+	const double f26_34 = -f26 * m_A171;
+	m_A174 += m_A97 * f26_34;
+	m_A176 += m_A98 * f26_34;
+	RHS34 += f26_34 * RHS26;
+	const double f27 = 1.0 / m_A101;
+	const double f27_28 = -f27 * m_A115;
+	m_A116 += m_A102 * f27_28;
+	m_A117 += m_A103 * f27_28;
+	m_A119 += m_A104 * f27_28;
+	m_A120 += m_A105 * f27_28;
+	m_A121 += m_A106 * f27_28;
+	RHS28 += f27_28 * RHS27;
+	const double f27_33 = -f27 * m_A160;
+	m_A161 += m_A102 * f27_33;
+	m_A162 += m_A103 * f27_33;
+	m_A164 += m_A104 * f27_33;
+	m_A166 += m_A105 * f27_33;
+	m_A168 += m_A106 * f27_33;
+	RHS33 += f27_33 * RHS27;
+	const double f27_35 = -f27 * m_A183;
+	m_A184 += m_A102 * f27_35;
+	m_A185 += m_A103 * f27_35;
+	m_A188 += m_A104 * f27_35;
+	m_A190 += m_A105 * f27_35;
+	m_A193 += m_A106 * f27_35;
+	RHS35 += f27_35 * RHS27;
+	const double f27_38 = -f27 * m_A217;
+	m_A218 += m_A102 * f27_38;
+	m_A219 += m_A103 * f27_38;
+	m_A221 += m_A104 * f27_38;
+	m_A223 += m_A105 * f27_38;
+	m_A226 += m_A106 * f27_38;
+	RHS38 += f27_38 * RHS27;
+	const double f28 = 1.0 / m_A116;
+	const double f28_30 = -f28 * m_A131;
+	m_A133 += m_A117 * f28_30;
+	m_A134 += m_A118 * f28_30;
+	m_A135 += m_A119 * f28_30;
+	m_A137 += m_A120 * f28_30;
+	m_A139 += m_A121 * f28_30;
+	RHS30 += f28_30 * RHS28;
+	const double f28_32 = -f28 * m_A150;
+	m_A151 += m_A117 * f28_32;
+	m_A152 += m_A118 * f28_32;
+	m_A153 += m_A119 * f28_32;
+	m_A155 += m_A120 * f28_32;
+	m_A157 += m_A121 * f28_32;
+	RHS32 += f28_32 * RHS28;
+	const double f28_33 = -f28 * m_A161;
+	m_A162 += m_A117 * f28_33;
+	m_A163 += m_A118 * f28_33;
+	m_A164 += m_A119 * f28_33;
+	m_A166 += m_A120 * f28_33;
+	m_A168 += m_A121 * f28_33;
+	RHS33 += f28_33 * RHS28;
+	const double f28_35 = -f28 * m_A184;
+	m_A185 += m_A117 * f28_35;
+	m_A187 += m_A118 * f28_35;
+	m_A188 += m_A119 * f28_35;
+	m_A190 += m_A120 * f28_35;
+	m_A193 += m_A121 * f28_35;
+	RHS35 += f28_35 * RHS28;
+	const double f28_38 = -f28 * m_A218;
+	m_A219 += m_A117 * f28_38;
+	m_A220 += m_A118 * f28_38;
+	m_A221 += m_A119 * f28_38;
+	m_A223 += m_A120 * f28_38;
+	m_A226 += m_A121 * f28_38;
+	RHS38 += f28_38 * RHS28;
+	const double f29 = 1.0 / m_A124;
+	const double f29_30 = -f29 * m_A132;
+	m_A133 += m_A125 * f29_30;
+	m_A136 += m_A126 * f29_30;
+	m_A138 += m_A127 * f29_30;
+	RHS30 += f29_30 * RHS29;
+	const double f29_34 = -f29 * m_A172;
+	m_A173 += m_A125 * f29_34;
+	m_A176 += m_A126 * f29_34;
+	m_A178 += m_A127 * f29_34;
+	RHS34 += f29_34 * RHS29;
+	const double f29_36 = -f29 * m_A197;
+	m_A198 += m_A125 * f29_36;
+	m_A201 += m_A126 * f29_36;
+	m_A203 += m_A127 * f29_36;
+	RHS36 += f29_36 * RHS29;
+	const double f30 = 1.0 / m_A133;
+	const double f30_32 = -f30 * m_A151;
+	m_A152 += m_A134 * f30_32;
+	m_A153 += m_A135 * f30_32;
+	m_A154 += m_A136 * f30_32;
+	m_A155 += m_A137 * f30_32;
+	m_A156 += m_A138 * f30_32;
+	m_A157 += m_A139 * f30_32;
+	RHS32 += f30_32 * RHS30;
+	const double f30_33 = -f30 * m_A162;
+	m_A163 += m_A134 * f30_33;
+	m_A164 += m_A135 * f30_33;
+	m_A165 += m_A136 * f30_33;
+	m_A166 += m_A137 * f30_33;
+	m_A167 += m_A138 * f30_33;
+	m_A168 += m_A139 * f30_33;
+	RHS33 += f30_33 * RHS30;
+	const double f30_34 = -f30 * m_A173;
+	m_A174 += m_A134 * f30_34;
+	m_A175 += m_A135 * f30_34;
+	m_A176 += m_A136 * f30_34;
+	m_A177 += m_A137 * f30_34;
+	m_A178 += m_A138 * f30_34;
+	m_A179 += m_A139 * f30_34;
+	RHS34 += f30_34 * RHS30;
+	const double f30_35 = -f30 * m_A185;
+	m_A187 += m_A134 * f30_35;
+	m_A188 += m_A135 * f30_35;
+	m_A189 += m_A136 * f30_35;
+	m_A190 += m_A137 * f30_35;
+	m_A191 += m_A138 * f30_35;
+	m_A193 += m_A139 * f30_35;
+	RHS35 += f30_35 * RHS30;
+	const double f30_36 = -f30 * m_A198;
+	m_A199 += m_A134 * f30_36;
+	m_A200 += m_A135 * f30_36;
+	m_A201 += m_A136 * f30_36;
+	m_A202 += m_A137 * f30_36;
+	m_A203 += m_A138 * f30_36;
+	m_A205 += m_A139 * f30_36;
+	RHS36 += f30_36 * RHS30;
+	const double f30_38 = -f30 * m_A219;
+	m_A220 += m_A134 * f30_38;
+	m_A221 += m_A135 * f30_38;
+	m_A222 += m_A136 * f30_38;
+	m_A223 += m_A137 * f30_38;
+	m_A224 += m_A138 * f30_38;
+	m_A226 += m_A139 * f30_38;
+	RHS38 += f30_38 * RHS30;
+	const double f31 = 1.0 / m_A142;
+	const double f31_35 = -f31 * m_A186;
+	m_A190 += m_A143 * f31_35;
+	m_A192 += m_A144 * f31_35;
+	RHS35 += f31_35 * RHS31;
+	const double f31_37 = -f31 * m_A209;
+	m_A210 += m_A143 * f31_37;
+	m_A212 += m_A144 * f31_37;
+	RHS37 += f31_37 * RHS31;
+	const double f32 = 1.0 / m_A152;
+	const double f32_33 = -f32 * m_A163;
+	m_A164 += m_A153 * f32_33;
+	m_A165 += m_A154 * f32_33;
+	m_A166 += m_A155 * f32_33;
+	m_A167 += m_A156 * f32_33;
+	m_A168 += m_A157 * f32_33;
+	RHS33 += f32_33 * RHS32;
+	const double f32_34 = -f32 * m_A174;
+	m_A175 += m_A153 * f32_34;
+	m_A176 += m_A154 * f32_34;
+	m_A177 += m_A155 * f32_34;
+	m_A178 += m_A156 * f32_34;
+	m_A179 += m_A157 * f32_34;
+	RHS34 += f32_34 * RHS32;
+	const double f32_35 = -f32 * m_A187;
+	m_A188 += m_A153 * f32_35;
+	m_A189 += m_A154 * f32_35;
+	m_A190 += m_A155 * f32_35;
+	m_A191 += m_A156 * f32_35;
+	m_A193 += m_A157 * f32_35;
+	RHS35 += f32_35 * RHS32;
+	const double f32_36 = -f32 * m_A199;
+	m_A200 += m_A153 * f32_36;
+	m_A201 += m_A154 * f32_36;
+	m_A202 += m_A155 * f32_36;
+	m_A203 += m_A156 * f32_36;
+	m_A205 += m_A157 * f32_36;
+	RHS36 += f32_36 * RHS32;
+	const double f32_38 = -f32 * m_A220;
+	m_A221 += m_A153 * f32_38;
+	m_A222 += m_A154 * f32_38;
+	m_A223 += m_A155 * f32_38;
+	m_A224 += m_A156 * f32_38;
+	m_A226 += m_A157 * f32_38;
+	RHS38 += f32_38 * RHS32;
+	const double f33 = 1.0 / m_A164;
+	const double f33_34 = -f33 * m_A175;
+	m_A176 += m_A165 * f33_34;
+	m_A177 += m_A166 * f33_34;
+	m_A178 += m_A167 * f33_34;
+	m_A179 += m_A168 * f33_34;
+	RHS34 += f33_34 * RHS33;
+	const double f33_35 = -f33 * m_A188;
+	m_A189 += m_A165 * f33_35;
+	m_A190 += m_A166 * f33_35;
+	m_A191 += m_A167 * f33_35;
+	m_A193 += m_A168 * f33_35;
+	RHS35 += f33_35 * RHS33;
+	const double f33_36 = -f33 * m_A200;
+	m_A201 += m_A165 * f33_36;
+	m_A202 += m_A166 * f33_36;
+	m_A203 += m_A167 * f33_36;
+	m_A205 += m_A168 * f33_36;
+	RHS36 += f33_36 * RHS33;
+	const double f33_38 = -f33 * m_A221;
+	m_A222 += m_A165 * f33_38;
+	m_A223 += m_A166 * f33_38;
+	m_A224 += m_A167 * f33_38;
+	m_A226 += m_A168 * f33_38;
+	RHS38 += f33_38 * RHS33;
+	const double f34 = 1.0 / m_A176;
+	const double f34_35 = -f34 * m_A189;
+	m_A190 += m_A177 * f34_35;
+	m_A191 += m_A178 * f34_35;
+	m_A193 += m_A179 * f34_35;
+	RHS35 += f34_35 * RHS34;
+	const double f34_36 = -f34 * m_A201;
+	m_A202 += m_A177 * f34_36;
+	m_A203 += m_A178 * f34_36;
+	m_A205 += m_A179 * f34_36;
+	RHS36 += f34_36 * RHS34;
+	const double f34_38 = -f34 * m_A222;
+	m_A223 += m_A177 * f34_38;
+	m_A224 += m_A178 * f34_38;
+	m_A226 += m_A179 * f34_38;
+	RHS38 += f34_38 * RHS34;
+	const double f35 = 1.0 / m_A190;
+	const double f35_36 = -f35 * m_A202;
+	m_A203 += m_A191 * f35_36;
+	m_A204 += m_A192 * f35_36;
+	m_A205 += m_A193 * f35_36;
+	RHS36 += f35_36 * RHS35;
+	const double f35_37 = -f35 * m_A210;
+	m_A211 += m_A191 * f35_37;
+	m_A212 += m_A192 * f35_37;
+	m_A213 += m_A193 * f35_37;
+	RHS37 += f35_37 * RHS35;
+	const double f35_38 = -f35 * m_A223;
+	m_A224 += m_A191 * f35_38;
+	m_A225 += m_A192 * f35_38;
+	m_A226 += m_A193 * f35_38;
+	RHS38 += f35_38 * RHS35;
+	const double f36 = 1.0 / m_A203;
+	const double f36_37 = -f36 * m_A211;
+	m_A212 += m_A204 * f36_37;
+	m_A213 += m_A205 * f36_37;
+	RHS37 += f36_37 * RHS36;
+	const double f36_38 = -f36 * m_A224;
+	m_A225 += m_A204 * f36_38;
+	m_A226 += m_A205 * f36_38;
+	RHS38 += f36_38 * RHS36;
+	const double f37 = 1.0 / m_A212;
+	const double f37_38 = -f37 * m_A225;
+	m_A226 += m_A213 * f37_38;
 	RHS38 += f37_38 * RHS37;
-	const double f37_47 = -f37 * m_A151;
-	m_A152 += m_A101 * f37_47;
-	m_A155 += m_A102 * f37_47;
-	RHS47 += f37_47 * RHS37;
-	const double f38 = 1.0 / m_A105;
-	const double f38_47 = -f38 * m_A152;
-	m_A155 += m_A106 * f38_47;
-	m_A156 += m_A107 * f38_47;
-	RHS47 += f38_47 * RHS38;
-	const double f38_49 = -f38 * m_A165;
-	m_A168 += m_A106 * f38_49;
-	m_A169 += m_A107 * f38_49;
-	RHS49 += f38_49 * RHS38;
-	const double f39 = 1.0 / m_A111;
-	const double f39_49 = -f39 * m_A166;
-	m_A169 += m_A112 * f39_49;
-	RHS49 += f39_49 * RHS39;
-	const double f40 = 1.0 / m_A116;
-	const double f40_46 = -f40 * m_A146;
-	m_A147 += m_A117 * f40_46;
-	m_A149 += m_A118 * f40_46;
-	RHS46 += f40_46 * RHS40;
-	const double f40_50 = -f40 * m_A172;
-	m_A174 += m_A117 * f40_50;
-	m_A177 += m_A118 * f40_50;
-	RHS50 += f40_50 * RHS40;
-	const double f41 = 1.0 / m_A120;
-	const double f41_47 = -f41 * m_A153;
-	m_A154 += m_A121 * f41_47;
-	RHS47 += f41_47 * RHS41;
-	const double f42 = 1.0 / m_A124;
-	const double f42_43 = -f42 * m_A130;
-	m_A131 += m_A125 * f42_43;
-	RHS43 += f42_43 * RHS42;
-	const double f43 = 1.0 / m_A131;
-	const double f43_47 = -f43 * m_A154;
-	m_A155 += m_A132 * f43_47;
-	RHS47 += f43_47 * RHS43;
-	const double f44 = 1.0 / m_A141;
-	const double f44_48 = -f44 * m_A161;
-	RHS48 += f44_48 * RHS44;
-	const double f45 = 1.0 / m_A143;
-	const double f45_50 = -f45 * m_A173;
-	m_A175 += m_A144 * f45_50;
-	RHS50 += f45_50 * RHS45;
-	const double f46 = 1.0 / m_A147;
-	const double f46_49 = -f46 * m_A167;
-	m_A169 += m_A148 * f46_49;
-	m_A170 += m_A149 * f46_49;
-	RHS49 += f46_49 * RHS46;
-	const double f46_50 = -f46 * m_A174;
-	m_A176 += m_A148 * f46_50;
-	m_A177 += m_A149 * f46_50;
-	RHS50 += f46_50 * RHS46;
-	const double f47 = 1.0 / m_A155;
-	const double f47_49 = -f47 * m_A168;
-	m_A169 += m_A156 * f47_49;
-	RHS49 += f47_49 * RHS47;
-	const double f48 = 1.0 / m_A162;
-	const double f48_50 = -f48 * m_A175;
-	m_A177 += m_A163 * f48_50;
-	RHS50 += f48_50 * RHS48;
-	const double f49 = 1.0 / m_A169;
-	const double f49_50 = -f49 * m_A176;
-	m_A177 += m_A170 * f49_50;
-	RHS50 += f49_50 * RHS49;
-	V[50] = RHS50 / m_A177;
-	double tmp49 = 0.0;
-	tmp49 += m_A170 * V[50];
-	V[49] = (RHS49 - tmp49) / m_A169;
-	double tmp48 = 0.0;
-	tmp48 += m_A163 * V[50];
-	V[48] = (RHS48 - tmp48) / m_A162;
-	double tmp47 = 0.0;
-	tmp47 += m_A156 * V[49];
-	V[47] = (RHS47 - tmp47) / m_A155;
-	double tmp46 = 0.0;
-	tmp46 += m_A148 * V[49];
-	tmp46 += m_A149 * V[50];
-	V[46] = (RHS46 - tmp46) / m_A147;
-	double tmp45 = 0.0;
-	tmp45 += m_A144 * V[48];
-	V[45] = (RHS45 - tmp45) / m_A143;
-	double tmp44 = 0.0;
-	V[44] = (RHS44 - tmp44) / m_A141;
-	double tmp43 = 0.0;
-	tmp43 += m_A132 * V[47];
-	V[43] = (RHS43 - tmp43) / m_A131;
-	double tmp42 = 0.0;
-	tmp42 += m_A125 * V[43];
-	V[42] = (RHS42 - tmp42) / m_A124;
-	double tmp41 = 0.0;
-	tmp41 += m_A121 * V[43];
-	V[41] = (RHS41 - tmp41) / m_A120;
-	double tmp40 = 0.0;
-	tmp40 += m_A117 * V[46];
-	tmp40 += m_A118 * V[50];
-	V[40] = (RHS40 - tmp40) / m_A116;
-	double tmp39 = 0.0;
-	tmp39 += m_A112 * V[49];
-	V[39] = (RHS39 - tmp39) / m_A111;
-	double tmp38 = 0.0;
-	tmp38 += m_A106 * V[47];
-	tmp38 += m_A107 * V[49];
-	V[38] = (RHS38 - tmp38) / m_A105;
+	V[38] = RHS38 / m_A226;
 	double tmp37 = 0.0;
-	tmp37 += m_A101 * V[38];
-	tmp37 += m_A102 * V[47];
-	V[37] = (RHS37 - tmp37) / m_A100;
+	tmp37 += m_A213 * V[38];
+	V[37] = (RHS37 - tmp37) / m_A212;
 	double tmp36 = 0.0;
-	tmp36 += m_A98 * V[44];
-	V[36] = (RHS36 - tmp36) / m_A97;
+	tmp36 += m_A204 * V[37];
+	tmp36 += m_A205 * V[38];
+	V[36] = (RHS36 - tmp36) / m_A203;
 	double tmp35 = 0.0;
-	tmp35 += m_A95 * V[40];
-	V[35] = (RHS35 - tmp35) / m_A94;
+	tmp35 += m_A191 * V[36];
+	tmp35 += m_A192 * V[37];
+	tmp35 += m_A193 * V[38];
+	V[35] = (RHS35 - tmp35) / m_A190;
 	double tmp34 = 0.0;
-	tmp34 += m_A91 * V[44];
-	V[34] = (RHS34 - tmp34) / m_A90;
+	tmp34 += m_A177 * V[35];
+	tmp34 += m_A178 * V[36];
+	tmp34 += m_A179 * V[38];
+	V[34] = (RHS34 - tmp34) / m_A176;
 	double tmp33 = 0.0;
-	tmp33 += m_A87 * V[39];
-	V[33] = (RHS33 - tmp33) / m_A86;
+	tmp33 += m_A165 * V[34];
+	tmp33 += m_A166 * V[35];
+	tmp33 += m_A167 * V[36];
+	tmp33 += m_A168 * V[38];
+	V[33] = (RHS33 - tmp33) / m_A164;
 	double tmp32 = 0.0;
-	tmp32 += m_A83 * V[44];
-	V[32] = (RHS32 - tmp32) / m_A82;
+	tmp32 += m_A153 * V[33];
+	tmp32 += m_A154 * V[34];
+	tmp32 += m_A155 * V[35];
+	tmp32 += m_A156 * V[36];
+	tmp32 += m_A157 * V[38];
+	V[32] = (RHS32 - tmp32) / m_A152;
 	double tmp31 = 0.0;
-	V[31] = (RHS31 - tmp31) / m_A74;
+	tmp31 += m_A143 * V[35];
+	tmp31 += m_A144 * V[37];
+	V[31] = (RHS31 - tmp31) / m_A142;
 	double tmp30 = 0.0;
-	tmp30 += m_A71 * V[42];
-	tmp30 += m_A72 * V[43];
-	V[30] = (RHS30 - tmp30) / m_A70;
+	tmp30 += m_A134 * V[32];
+	tmp30 += m_A135 * V[33];
+	tmp30 += m_A136 * V[34];
+	tmp30 += m_A137 * V[35];
+	tmp30 += m_A138 * V[36];
+	tmp30 += m_A139 * V[38];
+	V[30] = (RHS30 - tmp30) / m_A133;
 	double tmp29 = 0.0;
-	tmp29 += m_A68 * V[40];
-	tmp29 += m_A69 * V[46];
-	V[29] = (RHS29 - tmp29) / m_A67;
+	tmp29 += m_A125 * V[30];
+	tmp29 += m_A126 * V[34];
+	tmp29 += m_A127 * V[36];
+	V[29] = (RHS29 - tmp29) / m_A124;
 	double tmp28 = 0.0;
-	tmp28 += m_A66 * V[43];
-	V[28] = (RHS28 - tmp28) / m_A65;
+	tmp28 += m_A117 * V[30];
+	tmp28 += m_A118 * V[32];
+	tmp28 += m_A119 * V[33];
+	tmp28 += m_A120 * V[35];
+	tmp28 += m_A121 * V[38];
+	V[28] = (RHS28 - tmp28) / m_A116;
 	double tmp27 = 0.0;
-	tmp27 += m_A63 * V[39];
-	tmp27 += m_A64 * V[49];
-	V[27] = (RHS27 - tmp27) / m_A62;
+	tmp27 += m_A102 * V[28];
+	tmp27 += m_A103 * V[30];
+	tmp27 += m_A104 * V[33];
+	tmp27 += m_A105 * V[35];
+	tmp27 += m_A106 * V[38];
+	V[27] = (RHS27 - tmp27) / m_A101;
 	double tmp26 = 0.0;
-	tmp26 += m_A61 * V[34];
-	V[26] = (RHS26 - tmp26) / m_A60;
+	tmp26 += m_A97 * V[32];
+	tmp26 += m_A98 * V[34];
+	V[26] = (RHS26 - tmp26) / m_A96;
 	double tmp25 = 0.0;
-	tmp25 += m_A55 * V[35];
-	tmp25 += m_A56 * V[40];
-	V[25] = (RHS25 - tmp25) / m_A54;
+	tmp25 += m_A87 * V[27];
+	tmp25 += m_A88 * V[28];
+	tmp25 += m_A89 * V[30];
+	tmp25 += m_A90 * V[33];
+	tmp25 += m_A91 * V[35];
+	tmp25 += m_A92 * V[38];
+	V[25] = (RHS25 - tmp25) / m_A86;
 	double tmp24 = 0.0;
-	tmp24 += m_A53 * V[48];
-	V[24] = (RHS24 - tmp24) / m_A52;
+	tmp24 += m_A80 * V[31];
+	tmp24 += m_A81 * V[37];
+	V[24] = (RHS24 - tmp24) / m_A79;
 	double tmp23 = 0.0;
-	tmp23 += m_A50 * V[37];
-	tmp23 += m_A51 * V[38];
-	V[23] = (RHS23 - tmp23) / m_A49;
+	tmp23 += m_A77 * V[28];
+	V[23] = (RHS23 - tmp23) / m_A76;
 	double tmp22 = 0.0;
-	tmp22 += m_A47 * V[33];
-	tmp22 += m_A48 * V[39];
-	V[22] = (RHS22 - tmp22) / m_A46;
+	tmp22 += m_A73 * V[28];
+	tmp22 += m_A74 * V[32];
+	V[22] = (RHS22 - tmp22) / m_A72;
 	double tmp21 = 0.0;
-	tmp21 += m_A45 * V[48];
-	V[21] = (RHS21 - tmp21) / m_A44;
+	tmp21 += m_A69 * V[32];
+	tmp21 += m_A70 * V[36];
+	V[21] = (RHS21 - tmp21) / m_A68;
 	double tmp20 = 0.0;
-	tmp20 += m_A43 * V[41];
-	V[20] = (RHS20 - tmp20) / m_A42;
+	tmp20 += m_A66 * V[38];
+	V[20] = (RHS20 - tmp20) / m_A65;
 	double tmp19 = 0.0;
-	tmp19 += m_A41 * V[33];
-	V[19] = (RHS19 - tmp19) / m_A40;
+	tmp19 += m_A62 * V[29];
+	tmp19 += m_A63 * V[30];
+	tmp19 += m_A64 * V[36];
+	V[19] = (RHS19 - tmp19) / m_A61;
 	double tmp18 = 0.0;
-	tmp18 += m_A39 * V[42];
-	V[18] = (RHS18 - tmp18) / m_A38;
+	tmp18 += m_A60 * V[28];
+	V[18] = (RHS18 - tmp18) / m_A59;
 	double tmp17 = 0.0;
-	tmp17 += m_A37 * V[32];
-	V[17] = (RHS17 - tmp17) / m_A36;
+	tmp17 += m_A53 * V[37];
+	tmp17 += m_A54 * V[38];
+	V[17] = (RHS17 - tmp17) / m_A52;
 	double tmp16 = 0.0;
-	tmp16 += m_A35 * V[32];
-	V[16] = (RHS16 - tmp16) / m_A34;
+	tmp16 += m_A50 * V[26];
+	tmp16 += m_A51 * V[34];
+	V[16] = (RHS16 - tmp16) / m_A49;
 	double tmp15 = 0.0;
-	tmp15 += m_A33 * V[35];
-	V[15] = (RHS15 - tmp15) / m_A32;
+	tmp15 += m_A46 * V[28];
+	tmp15 += m_A47 * V[30];
+	V[15] = (RHS15 - tmp15) / m_A45;
 	double tmp14 = 0.0;
-	tmp14 += m_A31 * V[32];
-	V[14] = (RHS14 - tmp14) / m_A30;
+	tmp14 += m_A40 * V[25];
+	tmp14 += m_A41 * V[27];
+	tmp14 += m_A42 * V[33];
+	tmp14 += m_A43 * V[35];
+	tmp14 += m_A44 * V[38];
+	V[14] = (RHS14 - tmp14) / m_A39;
 	double tmp13 = 0.0;
-	tmp13 += m_A29 * V[31];
-	V[13] = (RHS13 - tmp13) / m_A28;
+	tmp13 += m_A37 * V[15];
+	tmp13 += m_A38 * V[28];
+	V[13] = (RHS13 - tmp13) / m_A36;
 	double tmp12 = 0.0;
-	tmp12 += m_A27 * V[32];
-	V[12] = (RHS12 - tmp12) / m_A26;
+	tmp12 += m_A33 * V[13];
+	tmp12 += m_A34 * V[25];
+	tmp12 += m_A35 * V[28];
+	V[12] = (RHS12 - tmp12) / m_A32;
 	double tmp11 = 0.0;
-	tmp11 += m_A25 * V[32];
-	V[11] = (RHS11 - tmp11) / m_A24;
+	tmp11 += m_A30 * V[18];
+	tmp11 += m_A31 * V[28];
+	V[11] = (RHS11 - tmp11) / m_A29;
 	double tmp10 = 0.0;
-	tmp10 += m_A23 * V[32];
-	V[10] = (RHS10 - tmp10) / m_A22;
+	tmp10 += m_A28 * V[18];
+	V[10] = (RHS10 - tmp10) / m_A27;
 	double tmp9 = 0.0;
-	tmp9 += m_A20 * V[32];
-	tmp9 += m_A21 * V[44];
-	V[9] = (RHS9 - tmp9) / m_A19;
+	tmp9 += m_A26 * V[23];
+	V[9] = (RHS9 - tmp9) / m_A25;
 	double tmp8 = 0.0;
-	tmp8 += m_A18 * V[44];
-	V[8] = (RHS8 - tmp8) / m_A17;
+	tmp8 += m_A24 * V[18];
+	V[8] = (RHS8 - tmp8) / m_A23;
 	double tmp7 = 0.0;
-	tmp7 += m_A16 * V[44];
-	V[7] = (RHS7 - tmp7) / m_A15;
+	tmp7 += m_A22 * V[32];
+	V[7] = (RHS7 - tmp7) / m_A21;
 	double tmp6 = 0.0;
-	tmp6 += m_A14 * V[44];
-	V[6] = (RHS6 - tmp6) / m_A13;
+	tmp6 += m_A19 * V[26];
+	tmp6 += m_A20 * V[32];
+	V[6] = (RHS6 - tmp6) / m_A18;
+	double tmp5 = 0.0;
+	tmp5 += m_A15 * V[21];
+	tmp5 += m_A16 * V[32];
+	tmp5 += m_A17 * V[36];
+	V[5] = (RHS5 - tmp5) / m_A14;
+	double tmp4 = 0.0;
+	tmp4 += m_A13 * V[18];
+	V[4] = (RHS4 - tmp4) / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A11 * V[35];
+	V[3] = (RHS3 - tmp3) / m_A10;
+	double tmp2 = 0.0;
+	tmp2 += m_A7 * V[24];
+	tmp2 += m_A8 * V[31];
+	tmp2 += m_A9 * V[37];
+	V[2] = (RHS2 - tmp2) / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A5 * V[29];
+	V[1] = (RHS1 - tmp1) / m_A4;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[16];
+	tmp0 += m_A2 * V[26];
+	tmp0 += m_A3 * V[34];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// barrier
+static void nl_gcr_f425d4008ae1d2c6_13_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[4] * *cnV[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A5 += go[5];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A7 += go[7];
+	double RHS3 = Idr[7];
+	RHS3 += Idr[8];
+	RHS3 -= go[8] * *cnV[8];
+	m_A12 += gt[9];
+	m_A12 += gt[10];
+	m_A12 += gt[11];
+	m_A12 += gt[12];
+	m_A12 += gt[13];
+	m_A11 += go[9];
+	m_A10 += go[10];
+	m_A9 += go[11];
+	m_A8 += go[12];
+	double RHS4 = Idr[9];
+	RHS4 += Idr[10];
+	RHS4 += Idr[11];
+	RHS4 += Idr[12];
+	RHS4 += Idr[13];
+	RHS4 -= go[13] * *cnV[13];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A8;
+	m_A12 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_4 = -f1 * m_A9;
+	m_A12 += m_A3 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_4 = -f2 * m_A10;
+	m_A12 += m_A5 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_4 = -f3 * m_A11;
+	m_A12 += m_A7 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	V[4] = RHS4 / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[4];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[4];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[4];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// boxingb
+static void nl_gcr_f43cf2a28a5a5561_23_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A4 += go[3];
+	m_A3 += go[4];
+	m_A3 += go[5];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 -= go[6] * *cnV[6];
+	RHS1 -= go[7] * *cnV[7];
+	RHS1 -= go[8] * *cnV[8];
+	m_A5 += gt[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A7 += go[9];
+	m_A6 += go[10];
+	m_A6 += go[11];
+	double RHS2 = Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[12] * *cnV[12];
+	m_A8 += gt[13];
+	m_A8 += gt[14];
+	m_A9 += go[13];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[14] * *cnV[14];
+	m_A12 += gt[15];
+	m_A12 += gt[16];
+	m_A12 += gt[17];
+	m_A12 += gt[18];
+	m_A12 += gt[19];
+	m_A12 += gt[20];
+	m_A11 += go[15];
+	m_A11 += go[16];
+	m_A10 += go[17];
+	double RHS4 = Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 -= go[18] * *cnV[18];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	m_A17 += gt[21];
+	m_A17 += gt[22];
+	m_A17 += gt[23];
+	m_A17 += gt[24];
+	m_A17 += gt[25];
+	m_A15 += go[21];
+	m_A15 += go[22];
+	m_A14 += go[23];
+	double RHS5 = Idr[21];
+	RHS5 += Idr[22];
+	RHS5 += Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 -= go[24] * *cnV[24];
+	RHS5 -= go[25] * *cnV[25];
+	m_A22 += gt[26];
+	m_A22 += gt[27];
+	m_A22 += gt[28];
+	m_A22 += gt[29];
+	m_A22 += gt[30];
+	m_A20 += go[26];
+	m_A19 += go[27];
+	double RHS6 = Idr[26];
+	RHS6 += Idr[27];
+	RHS6 += Idr[28];
+	RHS6 += Idr[29];
+	RHS6 += Idr[30];
+	RHS6 -= go[28] * *cnV[28];
+	RHS6 -= go[29] * *cnV[29];
+	RHS6 -= go[30] * *cnV[30];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A10;
+	m_A12 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_4 = -f1 * m_A11;
+	m_A12 += m_A3 * f1_4;
+	m_A13 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f1_5 = -f1 * m_A14;
+	m_A16 += m_A3 * f1_5;
+	m_A17 += m_A4 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_5 = -f2 * m_A15;
+	m_A17 += m_A6 * f2_5;
+	m_A18 += m_A7 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f2_6 = -f2 * m_A19;
+	m_A21 += m_A6 * f2_6;
+	m_A22 += m_A7 * f2_6;
+	RHS6 += f2_6 * RHS2;
+	const double f3 = 1.0 / m_A8;
+	const double f3_6 = -f3 * m_A20;
+	m_A22 += m_A9 * f3_6;
+	RHS6 += f3_6 * RHS3;
+	const double f4 = 1.0 / m_A12;
+	const double f4_5 = -f4 * m_A16;
+	m_A17 += m_A13 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	const double f5 = 1.0 / m_A17;
+	const double f5_6 = -f5 * m_A21;
+	m_A22 += m_A18 * f5_6;
+	RHS6 += f5_6 * RHS5;
+	V[6] = RHS6 / m_A22;
 	double tmp5 = 0.0;
-	tmp5 += m_A12 * V[44];
-	V[5] = (RHS5 - tmp5) / m_A11;
+	tmp5 += m_A18 * V[6];
+	V[5] = (RHS5 - tmp5) / m_A17;
+	double tmp4 = 0.0;
+	tmp4 += m_A13 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A9 * V[6];
+	V[3] = (RHS3 - tmp3) / m_A8;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[5];
+	tmp2 += m_A7 * V[6];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[4];
+	tmp1 += m_A4 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// spacfury
+static void nl_gcr_f4da1503eabe16cf_16_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[3];
+	double RHS1 = Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	m_A6 += gt[9];
+	m_A6 += gt[10];
+	m_A6 += gt[11];
+	m_A7 += go[9];
+	double RHS3 = Idr[9];
+	RHS3 += Idr[10];
+	RHS3 += Idr[11];
+	RHS3 -= go[10] * *cnV[10];
+	RHS3 -= go[11] * *cnV[11];
+	m_A8 += gt[12];
+	m_A8 += gt[13];
+	m_A9 += go[12];
+	double RHS4 = Idr[12];
+	RHS4 += Idr[13];
+	RHS4 -= go[13] * *cnV[13];
+	m_A15 += gt[14];
+	m_A15 += gt[15];
+	m_A15 += gt[16];
+	m_A15 += gt[17];
+	m_A15 += gt[18];
+	m_A14 += go[14];
+	m_A13 += go[15];
+	m_A12 += go[16];
+	m_A11 += go[17];
+	m_A10 += go[18];
+	double RHS5 = Idr[14];
+	RHS5 += Idr[15];
+	RHS5 += Idr[16];
+	RHS5 += Idr[17];
+	RHS5 += Idr[18];
+	const double f0 = 1.0 / m_A0;
+	const double f0_5 = -f0 * m_A10;
+	m_A15 += m_A1 * f0_5;
+	RHS5 += f0_5 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_5 = -f1 * m_A11;
+	m_A15 += m_A3 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_5 = -f2 * m_A12;
+	m_A15 += m_A5 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_5 = -f3 * m_A13;
+	m_A15 += m_A7 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_5 = -f4 * m_A14;
+	m_A15 += m_A9 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A15;
 	double tmp4 = 0.0;
-	tmp4 += m_A10 * V[45];
-	V[4] = (RHS4 - tmp4) / m_A9;
+	tmp4 += m_A9 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A8 * V[36];
+	tmp3 += m_A7 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[5];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// elim
+static void nl_gcr_f4f4e2ee05cb584e_13_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[4];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[5] * *cnV[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A5 += go[6];
+	double RHS2 = Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	m_A7 += gt[10];
+	m_A7 += gt[11];
+	m_A7 += gt[12];
+	m_A7 += gt[13];
+	m_A8 += go[10];
+	m_A6 += go[11];
+	double RHS3 = Idr[10];
+	RHS3 += Idr[11];
+	RHS3 += Idr[12];
+	RHS3 += Idr[13];
+	RHS3 -= go[12] * *cnV[12];
+	RHS3 -= go[13] * *cnV[13];
+	m_A12 += gt[14];
+	m_A12 += gt[15];
+	m_A12 += gt[16];
+	m_A12 += gt[17];
+	m_A12 += gt[18];
+	m_A11 += go[14];
+	m_A10 += go[15];
+	m_A9 += go[16];
+	double RHS4 = Idr[14];
+	RHS4 += Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 -= go[17] * *cnV[17];
+	RHS4 -= go[18] * *cnV[18];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A9;
+	m_A12 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_3 = -f1 * m_A6;
+	m_A7 += m_A3 * f1_3;
+	RHS3 += f1_3 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_4 = -f2 * m_A10;
+	m_A12 += m_A5 * f2_4;
+	RHS4 += f2_4 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_4 = -f3 * m_A11;
+	m_A12 += m_A8 * f3_4;
+	RHS4 += f3_4 * RHS3;
+	V[4] = RHS4 / m_A12;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[4];
 	V[3] = (RHS3 - tmp3) / m_A7;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[26];
-	tmp2 += m_A6 * V[34];
+	tmp2 += m_A5 * V[4];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[26];
+	tmp1 += m_A3 * V[3];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[26];
+	tmp0 += m_A1 * V[4];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
 // konami2x
-static void nl_gcr_e4c54910436826d1_85_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+static void nl_gcr_f6900d3f36a91049_85_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -16881,11 +69537,12 @@
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// 280zzzap
-static void nl_gcr_eb8f99b7d033585a_57_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// breakout
+static void nl_gcr_f7dc4f87b5a8ba93_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -16893,56 +69550,6 @@
 	double m_A4(0.0);
 	double m_A5(0.0);
 	double m_A6(0.0);
-	double m_A7(0.0);
-	double m_A8(0.0);
-	double m_A9(0.0);
-	double m_A10(0.0);
-	double m_A11(0.0);
-	double m_A12(0.0);
-	double m_A13(0.0);
-	double m_A14(0.0);
-	double m_A15(0.0);
-	double m_A16(0.0);
-	double m_A17(0.0);
-	double m_A18(0.0);
-	double m_A19(0.0);
-	double m_A20(0.0);
-	double m_A21(0.0);
-	double m_A22(0.0);
-	double m_A23(0.0);
-	double m_A24(0.0);
-	double m_A25(0.0);
-	double m_A26(0.0);
-	double m_A27(0.0);
-	double m_A28(0.0);
-	double m_A29(0.0);
-	double m_A30(0.0);
-	double m_A31(0.0);
-	double m_A32(0.0);
-	double m_A33(0.0);
-	double m_A34(0.0);
-	double m_A35(0.0);
-	double m_A36(0.0);
-	double m_A37(0.0);
-	double m_A38(0.0);
-	double m_A39(0.0);
-	double m_A40(0.0);
-	double m_A41(0.0);
-	double m_A42(0.0);
-	double m_A43(0.0);
-	double m_A44(0.0);
-	double m_A45(0.0);
-	double m_A46(0.0);
-	double m_A47(0.0);
-	double m_A48(0.0);
-	double m_A49(0.0);
-	double m_A50(0.0);
-	double m_A51(0.0);
-	double m_A52(0.0);
-	double m_A53(0.0);
-	double m_A54(0.0);
-	double m_A55(0.0);
-	double m_A56(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
@@ -16958,325 +69565,998 @@
 	double RHS1 = Idr[3];
 	RHS1 += Idr[4];
 	RHS1 -= go[4] * *cnV[4];
-	m_A4 += gt[5];
-	m_A4 += gt[6];
-	m_A4 += gt[7];
-	m_A4 += gt[8];
-	m_A4 += gt[9];
-	m_A4 += gt[10];
-	m_A4 += gt[11];
-	m_A5 += go[5];
-	double RHS2 = Idr[5];
-	RHS2 += Idr[6];
+	m_A6 += gt[5];
+	m_A6 += gt[6];
+	m_A5 += go[5];
+	m_A4 += go[6];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	const double f0 = 1.0 / m_A0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// fireone
+static void nl_gcr_f8f6a951fd1af6bc_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A2 += gt[5];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 += Idr[5];
+	RHS1 -= go[3] * *cnV[3];
+	RHS1 -= go[4] * *cnV[4];
+	RHS1 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A5 += go[6];
+	m_A4 += go[7];
+	double RHS2 = Idr[6];
 	RHS2 += Idr[7];
 	RHS2 += Idr[8];
-	RHS2 += Idr[9];
-	RHS2 += Idr[10];
-	RHS2 += Idr[11];
-	RHS2 -= go[6] * *cnV[6];
-	RHS2 -= go[7] * *cnV[7];
 	RHS2 -= go[8] * *cnV[8];
-	RHS2 -= go[9] * *cnV[9];
-	RHS2 -= go[10] * *cnV[10];
-	RHS2 -= go[11] * *cnV[11];
-	m_A6 += gt[12];
-	m_A6 += gt[13];
-	m_A6 += gt[14];
-	m_A7 += go[12];
-	double RHS3 = Idr[12];
-	RHS3 += Idr[13];
-	RHS3 += Idr[14];
-	RHS3 -= go[13] * *cnV[13];
-	RHS3 -= go[14] * *cnV[14];
-	m_A8 += gt[15];
-	m_A8 += gt[16];
-	m_A8 += gt[17];
-	m_A8 += gt[18];
-	m_A8 += gt[19];
-	m_A8 += gt[20];
-	m_A8 += gt[21];
-	m_A9 += go[15];
-	double RHS4 = Idr[15];
-	RHS4 += Idr[16];
-	RHS4 += Idr[17];
-	RHS4 += Idr[18];
-	RHS4 += Idr[19];
-	RHS4 += Idr[20];
-	RHS4 += Idr[21];
-	RHS4 -= go[16] * *cnV[16];
-	RHS4 -= go[17] * *cnV[17];
-	RHS4 -= go[18] * *cnV[18];
-	RHS4 -= go[19] * *cnV[19];
-	RHS4 -= go[20] * *cnV[20];
-	RHS4 -= go[21] * *cnV[21];
-	m_A10 += gt[22];
-	m_A10 += gt[23];
-	m_A11 += go[22];
-	double RHS5 = Idr[22];
-	RHS5 += Idr[23];
-	RHS5 -= go[23] * *cnV[23];
-	m_A12 += gt[24];
-	m_A12 += gt[25];
-	m_A14 += go[24];
-	m_A13 += go[25];
-	double RHS6 = Idr[24];
-	RHS6 += Idr[25];
-	m_A15 += gt[26];
-	m_A15 += gt[27];
-	m_A16 += go[26];
-	double RHS7 = Idr[26];
-	RHS7 += Idr[27];
-	RHS7 -= go[27] * *cnV[27];
-	m_A17 += gt[28];
-	m_A17 += gt[29];
-	m_A18 += go[28];
-	double RHS8 = Idr[28];
-	RHS8 += Idr[29];
-	RHS8 -= go[29] * *cnV[29];
-	m_A20 += gt[30];
-	m_A20 += gt[31];
-	m_A20 += gt[32];
-	m_A20 += gt[33];
-	m_A19 += go[30];
-	double RHS9 = Idr[30];
-	RHS9 += Idr[31];
-	RHS9 += Idr[32];
-	RHS9 += Idr[33];
-	RHS9 -= go[31] * *cnV[31];
-	RHS9 -= go[32] * *cnV[32];
-	RHS9 -= go[33] * *cnV[33];
-	m_A24 += gt[34];
-	m_A24 += gt[35];
-	m_A23 += go[34];
-	m_A22 += go[35];
-	double RHS10 = Idr[34];
-	RHS10 += Idr[35];
-	m_A27 += gt[36];
-	m_A27 += gt[37];
-	m_A27 += gt[38];
-	m_A27 += gt[39];
-	m_A26 += go[36];
-	m_A28 += go[37];
-	double RHS11 = Idr[36];
-	RHS11 += Idr[37];
-	RHS11 += Idr[38];
-	RHS11 += Idr[39];
-	RHS11 -= go[38] * *cnV[38];
-	RHS11 -= go[39] * *cnV[39];
-	m_A31 += gt[40];
-	m_A31 += gt[41];
-	m_A31 += gt[42];
-	m_A31 += gt[43];
-	m_A31 += gt[44];
-	m_A31 += gt[45];
-	m_A29 += go[40];
-	m_A33 += go[41];
-	m_A32 += go[42];
-	double RHS12 = Idr[40];
-	RHS12 += Idr[41];
-	RHS12 += Idr[42];
-	RHS12 += Idr[43];
-	RHS12 += Idr[44];
-	RHS12 += Idr[45];
-	RHS12 -= go[43] * *cnV[43];
-	RHS12 -= go[44] * *cnV[44];
-	RHS12 -= go[45] * *cnV[45];
-	m_A36 += gt[46];
-	m_A36 += gt[47];
-	m_A34 += go[46];
-	double RHS13 = Idr[46];
-	RHS13 += Idr[47];
-	RHS13 -= go[47] * *cnV[47];
-	m_A39 += gt[48];
-	m_A39 += gt[49];
-	m_A39 += gt[50];
-	m_A38 += go[48];
-	m_A37 += go[49];
-	double RHS14 = Idr[48];
-	RHS14 += Idr[49];
-	RHS14 += Idr[50];
-	RHS14 -= go[50] * *cnV[50];
-	m_A41 += gt[51];
-	m_A41 += gt[52];
-	m_A41 += gt[53];
-	m_A41 += gt[54];
-	m_A40 += go[51];
-	m_A42 += go[52];
-	double RHS15 = Idr[51];
-	RHS15 += Idr[52];
-	RHS15 += Idr[53];
-	RHS15 += Idr[54];
-	RHS15 -= go[53] * *cnV[53];
-	RHS15 -= go[54] * *cnV[54];
-	m_A49 += gt[55];
-	m_A49 += gt[56];
-	m_A49 += gt[57];
-	m_A49 += gt[58];
-	m_A49 += gt[59];
-	m_A44 += go[55];
-	m_A47 += go[56];
-	m_A46 += go[57];
-	m_A43 += go[58];
-	m_A45 += go[59];
-	double RHS16 = Idr[55];
-	RHS16 += Idr[56];
-	RHS16 += Idr[57];
-	RHS16 += Idr[58];
-	RHS16 += Idr[59];
-	m_A56 += gt[60];
-	m_A56 += gt[61];
-	m_A56 += gt[62];
-	m_A56 += gt[63];
-	m_A54 += go[60];
-	m_A53 += go[61];
-	m_A51 += go[62];
-	m_A52 += go[63];
-	double RHS17 = Idr[60];
-	RHS17 += Idr[61];
-	RHS17 += Idr[62];
-	RHS17 += Idr[63];
 	const double f0 = 1.0 / m_A0;
-	const double f0_11 = -f0 * m_A26;
-	m_A28 += m_A1 * f0_11;
-	RHS11 += f0_11 * RHS0;
-	const double f0_16 = -f0 * m_A43;
-	m_A49 += m_A1 * f0_16;
-	RHS16 += f0_16 * RHS0;
+	const double f0_2 = -f0 * m_A4;
+	m_A6 += m_A1 * f0_2;
+	RHS2 += f0_2 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_16 = -f1 * m_A44;
-	m_A49 += m_A3 * f1_16;
-	RHS16 += f1_16 * RHS1;
-	const double f2 = 1.0 / m_A4;
-	const double f2_12 = -f2 * m_A29;
-	m_A30 += m_A5 * f2_12;
-	RHS12 += f2_12 * RHS2;
-	const double f3 = 1.0 / m_A6;
-	const double f3_15 = -f3 * m_A40;
-	m_A42 += m_A7 * f3_15;
-	RHS15 += f3_15 * RHS3;
-	const double f3_17 = -f3 * m_A51;
-	m_A56 += m_A7 * f3_17;
-	RHS17 += f3_17 * RHS3;
-	const double f4 = 1.0 / m_A8;
-	const double f4_9 = -f4 * m_A19;
-	m_A21 += m_A9 * f4_9;
-	RHS9 += f4_9 * RHS4;
-	const double f5 = 1.0 / m_A10;
-	const double f5_10 = -f5 * m_A22;
-	m_A24 += m_A11 * f5_10;
-	RHS10 += f5_10 * RHS5;
-	const double f5_16 = -f5 * m_A45;
-	m_A46 += m_A11 * f5_16;
-	RHS16 += f5_16 * RHS5;
-	const double f6 = 1.0 / m_A12;
-	const double f6_10 = -f6 * m_A23;
-	m_A24 += m_A13 * f6_10;
-	m_A25 += m_A14 * f6_10;
-	RHS10 += f6_10 * RHS6;
-	const double f6_13 = -f6 * m_A34;
-	m_A35 += m_A13 * f6_13;
-	m_A36 += m_A14 * f6_13;
-	RHS13 += f6_13 * RHS6;
-	const double f7 = 1.0 / m_A15;
-	const double f7_14 = -f7 * m_A37;
-	m_A39 += m_A16 * f7_14;
-	RHS14 += f7_14 * RHS7;
-	const double f7_17 = -f7 * m_A52;
-	m_A54 += m_A16 * f7_17;
-	RHS17 += f7_17 * RHS7;
+	const double f1_2 = -f1 * m_A5;
+	m_A6 += m_A3 * f1_2;
+	RHS2 += f1_2 * RHS1;
+	V[2] = RHS2 / m_A6;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[2];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[2];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// zektor
+static void nl_gcr_fbff020f5f5d5a5_144_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
+	double m_A67(0.0);
+	double m_A68(0.0);
+	double m_A69(0.0);
+	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 -= go[1] * *cnV[1];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A7 += go[6];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	RHS3 -= go[7] * *cnV[7];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A9 += go[8];
+	double RHS4 = Idr[8];
+	RHS4 += Idr[9];
+	RHS4 -= go[9] * *cnV[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A11 += go[10];
+	double RHS5 = Idr[10];
+	RHS5 += Idr[11];
+	RHS5 -= go[11] * *cnV[11];
+	m_A12 += gt[12];
+	m_A12 += gt[13];
+	m_A13 += go[12];
+	double RHS6 = Idr[12];
+	RHS6 += Idr[13];
+	RHS6 -= go[13] * *cnV[13];
+	m_A14 += gt[14];
+	m_A14 += gt[15];
+	m_A14 += gt[16];
+	m_A16 += go[14];
+	m_A15 += go[15];
+	double RHS7 = Idr[14];
+	RHS7 += Idr[15];
+	RHS7 += Idr[16];
+	RHS7 -= go[16] * *cnV[16];
+	m_A17 += gt[17];
+	m_A17 += gt[18];
+	m_A18 += go[17];
+	double RHS8 = Idr[17];
+	RHS8 += Idr[18];
+	RHS8 -= go[18] * *cnV[18];
+	m_A19 += gt[19];
+	m_A19 += gt[20];
+	m_A19 += gt[21];
+	m_A21 += go[19];
+	m_A20 += go[20];
+	double RHS9 = Idr[19];
+	RHS9 += Idr[20];
+	RHS9 += Idr[21];
+	RHS9 -= go[21] * *cnV[21];
+	m_A22 += gt[22];
+	m_A22 += gt[23];
+	m_A22 += gt[24];
+	m_A23 += go[22];
+	double RHS10 = Idr[22];
+	RHS10 += Idr[23];
+	RHS10 += Idr[24];
+	RHS10 -= go[23] * *cnV[23];
+	RHS10 -= go[24] * *cnV[24];
+	m_A24 += gt[25];
+	m_A24 += gt[26];
+	m_A25 += go[25];
+	double RHS11 = Idr[25];
+	RHS11 += Idr[26];
+	RHS11 -= go[26] * *cnV[26];
+	m_A26 += gt[27];
+	m_A26 += gt[28];
+	m_A27 += go[27];
+	double RHS12 = Idr[27];
+	RHS12 += Idr[28];
+	RHS12 -= go[28] * *cnV[28];
+	m_A28 += gt[29];
+	m_A28 += gt[30];
+	m_A28 += gt[31];
+	m_A28 += gt[32];
+	m_A30 += go[29];
+	m_A29 += go[30];
+	double RHS13 = Idr[29];
+	RHS13 += Idr[30];
+	RHS13 += Idr[31];
+	RHS13 += Idr[32];
+	RHS13 -= go[31] * *cnV[31];
+	RHS13 -= go[32] * *cnV[32];
+	m_A31 += gt[33];
+	m_A31 += gt[34];
+	m_A31 += gt[35];
+	m_A32 += go[33];
+	double RHS14 = Idr[33];
+	RHS14 += Idr[34];
+	RHS14 += Idr[35];
+	RHS14 -= go[34] * *cnV[34];
+	RHS14 -= go[35] * *cnV[35];
+	m_A33 += gt[36];
+	m_A33 += gt[37];
+	m_A34 += go[36];
+	m_A35 += go[37];
+	double RHS15 = Idr[36];
+	RHS15 += Idr[37];
+	m_A36 += gt[38];
+	m_A36 += gt[39];
+	m_A38 += go[38];
+	m_A37 += go[39];
+	double RHS16 = Idr[38];
+	RHS16 += Idr[39];
+	m_A39 += gt[40];
+	m_A39 += gt[41];
+	m_A39 += gt[42];
+	m_A40 += go[40];
+	double RHS17 = Idr[40];
+	RHS17 += Idr[41];
+	RHS17 += Idr[42];
+	RHS17 -= go[41] * *cnV[41];
+	RHS17 -= go[42] * *cnV[42];
+	m_A41 += gt[43];
+	m_A41 += gt[44];
+	m_A41 += gt[45];
+	m_A43 += go[43];
+	m_A42 += go[44];
+	double RHS18 = Idr[43];
+	RHS18 += Idr[44];
+	RHS18 += Idr[45];
+	RHS18 -= go[45] * *cnV[45];
+	m_A44 += gt[46];
+	m_A44 += gt[47];
+	m_A44 += gt[48];
+	m_A44 += gt[49];
+	m_A44 += gt[50];
+	m_A44 += gt[51];
+	m_A45 += go[46];
+	m_A46 += go[47];
+	double RHS19 = Idr[46];
+	RHS19 += Idr[47];
+	RHS19 += Idr[48];
+	RHS19 += Idr[49];
+	RHS19 += Idr[50];
+	RHS19 += Idr[51];
+	RHS19 -= go[48] * *cnV[48];
+	RHS19 -= go[49] * *cnV[49];
+	RHS19 -= go[50] * *cnV[50];
+	RHS19 -= go[51] * *cnV[51];
+	m_A47 += gt[52];
+	m_A47 += gt[53];
+	m_A47 += gt[54];
+	m_A49 += go[52];
+	m_A48 += go[53];
+	double RHS20 = Idr[52];
+	RHS20 += Idr[53];
+	RHS20 += Idr[54];
+	RHS20 -= go[54] * *cnV[54];
+	m_A50 += gt[55];
+	m_A50 += gt[56];
+	m_A50 += gt[57];
+	m_A50 += gt[58];
+	m_A50 += gt[59];
+	m_A50 += gt[60];
+	m_A50 += gt[61];
+	m_A52 += go[55];
+	m_A51 += go[56];
+	double RHS21 = Idr[55];
+	RHS21 += Idr[56];
+	RHS21 += Idr[57];
+	RHS21 += Idr[58];
+	RHS21 += Idr[59];
+	RHS21 += Idr[60];
+	RHS21 += Idr[61];
+	RHS21 -= go[57] * *cnV[57];
+	RHS21 -= go[58] * *cnV[58];
+	RHS21 -= go[59] * *cnV[59];
+	RHS21 -= go[60] * *cnV[60];
+	RHS21 -= go[61] * *cnV[61];
+	m_A53 += gt[62];
+	m_A53 += gt[63];
+	m_A53 += gt[64];
+	m_A54 += go[62];
+	m_A55 += go[63];
+	double RHS22 = Idr[62];
+	RHS22 += Idr[63];
+	RHS22 += Idr[64];
+	RHS22 -= go[64] * *cnV[64];
+	m_A58 += gt[65];
+	m_A58 += gt[66];
+	m_A58 += gt[67];
+	m_A57 += go[65];
+	m_A56 += go[66];
+	double RHS23 = Idr[65];
+	RHS23 += Idr[66];
+	RHS23 += Idr[67];
+	RHS23 -= go[67] * *cnV[67];
+	m_A61 += gt[68];
+	m_A61 += gt[69];
+	m_A61 += gt[70];
+	m_A62 += go[68];
+	m_A60 += go[69];
+	double RHS24 = Idr[68];
+	RHS24 += Idr[69];
+	RHS24 += Idr[70];
+	RHS24 -= go[70] * *cnV[70];
+	m_A65 += gt[71];
+	m_A65 += gt[72];
+	m_A65 += gt[73];
+	m_A63 += go[71];
+	m_A66 += go[72];
+	double RHS25 = Idr[71];
+	RHS25 += Idr[72];
+	RHS25 += Idr[73];
+	RHS25 -= go[73] * *cnV[73];
+	m_A69 += gt[74];
+	m_A69 += gt[75];
+	m_A69 += gt[76];
+	m_A68 += go[74];
+	m_A67 += go[75];
+	double RHS26 = Idr[74];
+	RHS26 += Idr[75];
+	RHS26 += Idr[76];
+	RHS26 -= go[76] * *cnV[76];
+	m_A74 += gt[77];
+	m_A74 += gt[78];
+	m_A74 += gt[79];
+	m_A74 += gt[80];
+	m_A72 += go[77];
+	m_A71 += go[78];
+	m_A73 += go[79];
+	double RHS27 = Idr[77];
+	RHS27 += Idr[78];
+	RHS27 += Idr[79];
+	RHS27 += Idr[80];
+	RHS27 -= go[80] * *cnV[80];
+	m_A78 += gt[81];
+	m_A78 += gt[82];
+	m_A78 += gt[83];
+	m_A77 += go[81];
+	m_A76 += go[82];
+	double RHS28 = Idr[81];
+	RHS28 += Idr[82];
+	RHS28 += Idr[83];
+	RHS28 -= go[83] * *cnV[83];
+	m_A81 += gt[84];
+	m_A81 += gt[85];
+	m_A81 += gt[86];
+	m_A82 += go[84];
+	m_A80 += go[85];
+	double RHS29 = Idr[84];
+	RHS29 += Idr[85];
+	RHS29 += Idr[86];
+	RHS29 -= go[86] * *cnV[86];
+	m_A85 += gt[87];
+	m_A85 += gt[88];
+	m_A85 += gt[89];
+	m_A84 += go[87];
+	m_A83 += go[88];
+	double RHS30 = Idr[87];
+	RHS30 += Idr[88];
+	RHS30 += Idr[89];
+	RHS30 -= go[89] * *cnV[89];
+	m_A90 += gt[90];
+	m_A90 += gt[91];
+	m_A90 += gt[92];
+	m_A90 += gt[93];
+	m_A90 += gt[94];
+	m_A88 += go[90];
+	m_A87 += go[91];
+	m_A92 += go[92];
+	double RHS31 = Idr[90];
+	RHS31 += Idr[91];
+	RHS31 += Idr[92];
+	RHS31 += Idr[93];
+	RHS31 += Idr[94];
+	RHS31 -= go[93] * *cnV[93];
+	RHS31 -= go[94] * *cnV[94];
+	m_A95 += gt[95];
+	m_A95 += gt[96];
+	m_A95 += gt[97];
+	m_A95 += gt[98];
+	m_A94 += go[95];
+	m_A93 += go[96];
+	double RHS32 = Idr[95];
+	RHS32 += Idr[96];
+	RHS32 += Idr[97];
+	RHS32 += Idr[98];
+	RHS32 -= go[97] * *cnV[97];
+	RHS32 -= go[98] * *cnV[98];
+	m_A99 += gt[99];
+	m_A99 += gt[100];
+	m_A99 += gt[101];
+	m_A97 += go[99];
+	m_A100 += go[100];
+	double RHS33 = Idr[99];
+	RHS33 += Idr[100];
+	RHS33 += Idr[101];
+	RHS33 -= go[101] * *cnV[101];
+	m_A103 += gt[102];
+	m_A103 += gt[103];
+	m_A103 += gt[104];
+	m_A102 += go[102];
+	m_A101 += go[103];
+	double RHS34 = Idr[102];
+	RHS34 += Idr[103];
+	RHS34 += Idr[104];
+	RHS34 -= go[104] * *cnV[104];
+	m_A107 += gt[105];
+	m_A107 += gt[106];
+	m_A107 += gt[107];
+	m_A105 += go[105];
+	m_A106 += go[106];
+	double RHS35 = Idr[105];
+	RHS35 += Idr[106];
+	RHS35 += Idr[107];
+	RHS35 -= go[107] * *cnV[107];
+	m_A112 += gt[108];
+	m_A112 += gt[109];
+	m_A112 += gt[110];
+	m_A112 += gt[111];
+	m_A110 += go[108];
+	m_A114 += go[109];
+	m_A109 += go[110];
+	double RHS36 = Idr[108];
+	RHS36 += Idr[109];
+	RHS36 += Idr[110];
+	RHS36 += Idr[111];
+	RHS36 -= go[111] * *cnV[111];
+	m_A117 += gt[112];
+	m_A117 += gt[113];
+	m_A117 += gt[114];
+	m_A115 += go[112];
+	m_A118 += go[113];
+	double RHS37 = Idr[112];
+	RHS37 += Idr[113];
+	RHS37 += Idr[114];
+	RHS37 -= go[114] * *cnV[114];
+	m_A127 += gt[115];
+	m_A127 += gt[116];
+	m_A127 += gt[117];
+	m_A127 += gt[118];
+	m_A127 += gt[119];
+	m_A127 += gt[120];
+	m_A124 += go[115];
+	m_A121 += go[116];
+	m_A120 += go[117];
+	m_A122 += go[118];
+	m_A119 += go[119];
+	double RHS38 = Idr[115];
+	RHS38 += Idr[116];
+	RHS38 += Idr[117];
+	RHS38 += Idr[118];
+	RHS38 += Idr[119];
+	RHS38 += Idr[120];
+	RHS38 -= go[120] * *cnV[120];
+	m_A131 += gt[121];
+	m_A131 += gt[122];
+	m_A131 += gt[123];
+	m_A129 += go[121];
+	m_A132 += go[122];
+	double RHS39 = Idr[121];
+	RHS39 += Idr[122];
+	RHS39 += Idr[123];
+	RHS39 -= go[123] * *cnV[123];
+	m_A143 += gt[124];
+	m_A143 += gt[125];
+	m_A143 += gt[126];
+	m_A143 += gt[127];
+	m_A143 += gt[128];
+	m_A143 += gt[129];
+	m_A143 += gt[130];
+	m_A143 += gt[131];
+	m_A143 += gt[132];
+	m_A143 += gt[133];
+	m_A143 += gt[134];
+	m_A133 += go[124];
+	m_A134 += go[125];
+	m_A142 += go[126];
+	m_A140 += go[127];
+	m_A137 += go[128];
+	m_A136 += go[129];
+	m_A135 += go[130];
+	m_A139 += go[131];
+	double RHS40 = Idr[124];
+	RHS40 += Idr[125];
+	RHS40 += Idr[126];
+	RHS40 += Idr[127];
+	RHS40 += Idr[128];
+	RHS40 += Idr[129];
+	RHS40 += Idr[130];
+	RHS40 += Idr[131];
+	RHS40 += Idr[132];
+	RHS40 += Idr[133];
+	RHS40 += Idr[134];
+	RHS40 -= go[132] * *cnV[132];
+	RHS40 -= go[133] * *cnV[133];
+	RHS40 -= go[134] * *cnV[134];
+	const double f0 = 1.0 / m_A0;
+	const double f0_29 = -f0 * m_A80;
+	m_A81 += m_A1 * f0_29;
+	RHS29 += f0_29 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_36 = -f1 * m_A109;
+	m_A112 += m_A3 * f1_36;
+	RHS36 += f1_36 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_30 = -f2 * m_A83;
+	m_A85 += m_A5 * f2_30;
+	RHS30 += f2_30 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_23 = -f3 * m_A56;
+	m_A58 += m_A7 * f3_23;
+	RHS23 += f3_23 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_26 = -f4 * m_A67;
+	m_A69 += m_A9 * f4_26;
+	RHS26 += f4_26 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_34 = -f5 * m_A101;
+	m_A103 += m_A11 * f5_34;
+	RHS34 += f5_34 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_24 = -f6 * m_A60;
+	m_A61 += m_A13 * f6_24;
+	RHS24 += f6_24 * RHS6;
+	const double f7 = 1.0 / m_A14;
+	const double f7_23 = -f7 * m_A57;
+	m_A58 += m_A15 * f7_23;
+	m_A59 += m_A16 * f7_23;
+	RHS23 += f7_23 * RHS7;
+	const double f7_25 = -f7 * m_A63;
+	m_A64 += m_A15 * f7_25;
+	m_A65 += m_A16 * f7_25;
+	RHS25 += f7_25 * RHS7;
 	const double f8 = 1.0 / m_A17;
-	const double f8_14 = -f8 * m_A38;
-	m_A39 += m_A18 * f8_14;
-	RHS14 += f8_14 * RHS8;
-	const double f10 = 1.0 / m_A24;
-	const double f10_13 = -f10 * m_A35;
-	m_A36 += m_A25 * f10_13;
-	RHS13 += f10_13 * RHS10;
-	const double f10_16 = -f10 * m_A46;
-	m_A48 += m_A25 * f10_16;
-	RHS16 += f10_16 * RHS10;
-	const double f11 = 1.0 / m_A27;
-	const double f11_12 = -f11 * m_A30;
-	m_A32 += m_A28 * f11_12;
-	RHS12 += f11_12 * RHS11;
-	const double f12 = 1.0 / m_A31;
-	const double f12_16 = -f12 * m_A47;
-	m_A49 += m_A32 * f12_16;
-	m_A50 += m_A33 * f12_16;
-	RHS16 += f12_16 * RHS12;
-	const double f12_17 = -f12 * m_A53;
-	m_A55 += m_A32 * f12_17;
-	m_A56 += m_A33 * f12_17;
-	RHS17 += f12_17 * RHS12;
-	const double f13 = 1.0 / m_A36;
-	const double f13_16 = -f13 * m_A48;
-	RHS16 += f13_16 * RHS13;
-	const double f14 = 1.0 / m_A39;
-	const double f14_17 = -f14 * m_A54;
-	RHS17 += f14_17 * RHS14;
-	const double f16 = 1.0 / m_A49;
-	const double f16_17 = -f16 * m_A55;
-	m_A56 += m_A50 * f16_17;
-	RHS17 += f16_17 * RHS16;
-	V[17] = RHS17 / m_A56;
+	const double f8_28 = -f8 * m_A76;
+	m_A78 += m_A18 * f8_28;
+	RHS28 += f8_28 * RHS8;
+	const double f9 = 1.0 / m_A19;
+	const double f9_26 = -f9 * m_A68;
+	m_A69 += m_A20 * f9_26;
+	m_A70 += m_A21 * f9_26;
+	RHS26 += f9_26 * RHS9;
+	const double f9_33 = -f9 * m_A97;
+	m_A98 += m_A20 * f9_33;
+	m_A99 += m_A21 * f9_33;
+	RHS33 += f9_33 * RHS9;
+	const double f10 = 1.0 / m_A22;
+	const double f10_27 = -f10 * m_A71;
+	m_A74 += m_A23 * f10_27;
+	RHS27 += f10_27 * RHS10;
+	const double f11 = 1.0 / m_A24;
+	const double f11_27 = -f11 * m_A72;
+	m_A74 += m_A25 * f11_27;
+	RHS27 += f11_27 * RHS11;
+	const double f12 = 1.0 / m_A26;
+	const double f12_32 = -f12 * m_A93;
+	m_A95 += m_A27 * f12_32;
+	RHS32 += f12_32 * RHS12;
+	const double f13 = 1.0 / m_A28;
+	const double f13_27 = -f13 * m_A73;
+	m_A74 += m_A29 * f13_27;
+	m_A75 += m_A30 * f13_27;
+	RHS27 += f13_27 * RHS13;
+	const double f13_38 = -f13 * m_A119;
+	m_A123 += m_A29 * f13_38;
+	m_A127 += m_A30 * f13_38;
+	RHS38 += f13_38 * RHS13;
+	const double f14 = 1.0 / m_A31;
+	const double f14_38 = -f14 * m_A120;
+	m_A127 += m_A32 * f14_38;
+	RHS38 += f14_38 * RHS14;
+	const double f15 = 1.0 / m_A33;
+	const double f15_31 = -f15 * m_A87;
+	m_A90 += m_A34 * f15_31;
+	m_A91 += m_A35 * f15_31;
+	RHS31 += f15_31 * RHS15;
+	const double f15_36 = -f15 * m_A110;
+	m_A111 += m_A34 * f15_36;
+	m_A112 += m_A35 * f15_36;
+	RHS36 += f15_36 * RHS15;
+	const double f16 = 1.0 / m_A36;
+	const double f16_28 = -f16 * m_A77;
+	m_A78 += m_A37 * f16_28;
+	m_A79 += m_A38 * f16_28;
+	RHS28 += f16_28 * RHS16;
+	const double f16_31 = -f16 * m_A88;
+	m_A89 += m_A37 * f16_31;
+	m_A90 += m_A38 * f16_31;
+	RHS31 += f16_31 * RHS16;
+	const double f17 = 1.0 / m_A39;
+	const double f17_38 = -f17 * m_A121;
+	m_A127 += m_A40 * f17_38;
+	RHS38 += f17_38 * RHS17;
+	const double f18 = 1.0 / m_A41;
+	const double f18_30 = -f18 * m_A84;
+	m_A85 += m_A42 * f18_30;
+	m_A86 += m_A43 * f18_30;
+	RHS30 += f18_30 * RHS18;
+	const double f18_37 = -f18 * m_A115;
+	m_A116 += m_A42 * f18_37;
+	m_A117 += m_A43 * f18_37;
+	RHS37 += f18_37 * RHS18;
+	const double f19 = 1.0 / m_A44;
+	const double f19_32 = -f19 * m_A94;
+	m_A95 += m_A45 * f19_32;
+	m_A96 += m_A46 * f19_32;
+	RHS32 += f19_32 * RHS19;
+	const double f19_38 = -f19 * m_A122;
+	m_A125 += m_A45 * f19_38;
+	m_A127 += m_A46 * f19_38;
+	RHS38 += f19_38 * RHS19;
+	const double f20 = 1.0 / m_A47;
+	const double f20_34 = -f20 * m_A102;
+	m_A103 += m_A48 * f20_34;
+	m_A104 += m_A49 * f20_34;
+	RHS34 += f20_34 * RHS20;
+	const double f20_39 = -f20 * m_A129;
+	m_A130 += m_A48 * f20_39;
+	m_A131 += m_A49 * f20_39;
+	RHS39 += f20_39 * RHS20;
+	const double f21 = 1.0 / m_A50;
+	const double f21_40 = -f21 * m_A133;
+	m_A135 += m_A51 * f21_40;
+	m_A143 += m_A52 * f21_40;
+	RHS40 += f21_40 * RHS21;
+	const double f22 = 1.0 / m_A53;
+	const double f22_35 = -f22 * m_A105;
+	m_A107 += m_A54 * f22_35;
+	m_A108 += m_A55 * f22_35;
+	RHS35 += f22_35 * RHS22;
+	const double f22_40 = -f22 * m_A134;
+	m_A138 += m_A54 * f22_40;
+	m_A143 += m_A55 * f22_40;
+	RHS40 += f22_40 * RHS22;
+	const double f23 = 1.0 / m_A58;
+	const double f23_25 = -f23 * m_A64;
+	m_A65 += m_A59 * f23_25;
+	RHS25 += f23_25 * RHS23;
+	const double f24 = 1.0 / m_A61;
+	const double f24_40 = -f24 * m_A135;
+	m_A143 += m_A62 * f24_40;
+	RHS40 += f24_40 * RHS24;
+	const double f25 = 1.0 / m_A65;
+	const double f25_40 = -f25 * m_A136;
+	m_A143 += m_A66 * f25_40;
+	RHS40 += f25_40 * RHS25;
+	const double f26 = 1.0 / m_A69;
+	const double f26_33 = -f26 * m_A98;
+	m_A99 += m_A70 * f26_33;
+	RHS33 += f26_33 * RHS26;
+	const double f27 = 1.0 / m_A74;
+	const double f27_38 = -f27 * m_A123;
+	m_A127 += m_A75 * f27_38;
+	RHS38 += f27_38 * RHS27;
+	const double f28 = 1.0 / m_A78;
+	const double f28_31 = -f28 * m_A89;
+	m_A90 += m_A79 * f28_31;
+	RHS31 += f28_31 * RHS28;
+	const double f29 = 1.0 / m_A81;
+	const double f29_35 = -f29 * m_A106;
+	m_A107 += m_A82 * f29_35;
+	RHS35 += f29_35 * RHS29;
+	const double f30 = 1.0 / m_A85;
+	const double f30_37 = -f30 * m_A116;
+	m_A117 += m_A86 * f30_37;
+	RHS37 += f30_37 * RHS30;
+	const double f31 = 1.0 / m_A90;
+	const double f31_36 = -f31 * m_A111;
+	m_A112 += m_A91 * f31_36;
+	m_A113 += m_A92 * f31_36;
+	RHS36 += f31_36 * RHS31;
+	const double f31_38 = -f31 * m_A124;
+	m_A126 += m_A91 * f31_38;
+	m_A127 += m_A92 * f31_38;
+	RHS38 += f31_38 * RHS31;
+	const double f32 = 1.0 / m_A95;
+	const double f32_38 = -f32 * m_A125;
+	m_A127 += m_A96 * f32_38;
+	RHS38 += f32_38 * RHS32;
+	const double f33 = 1.0 / m_A99;
+	const double f33_40 = -f33 * m_A137;
+	m_A143 += m_A100 * f33_40;
+	RHS40 += f33_40 * RHS33;
+	const double f34 = 1.0 / m_A103;
+	const double f34_39 = -f34 * m_A130;
+	m_A131 += m_A104 * f34_39;
+	RHS39 += f34_39 * RHS34;
+	const double f35 = 1.0 / m_A107;
+	const double f35_40 = -f35 * m_A138;
+	m_A143 += m_A108 * f35_40;
+	RHS40 += f35_40 * RHS35;
+	const double f36 = 1.0 / m_A112;
+	const double f36_38 = -f36 * m_A126;
+	m_A127 += m_A113 * f36_38;
+	m_A128 += m_A114 * f36_38;
+	RHS38 += f36_38 * RHS36;
+	const double f36_40 = -f36 * m_A139;
+	m_A141 += m_A113 * f36_40;
+	m_A143 += m_A114 * f36_40;
+	RHS40 += f36_40 * RHS36;
+	const double f37 = 1.0 / m_A117;
+	const double f37_40 = -f37 * m_A140;
+	m_A143 += m_A118 * f37_40;
+	RHS40 += f37_40 * RHS37;
+	const double f38 = 1.0 / m_A127;
+	const double f38_40 = -f38 * m_A141;
+	m_A143 += m_A128 * f38_40;
+	RHS40 += f38_40 * RHS38;
+	const double f39 = 1.0 / m_A131;
+	const double f39_40 = -f39 * m_A142;
+	m_A143 += m_A132 * f39_40;
+	RHS40 += f39_40 * RHS39;
+	V[40] = RHS40 / m_A143;
+	double tmp39 = 0.0;
+	tmp39 += m_A132 * V[40];
+	V[39] = (RHS39 - tmp39) / m_A131;
+	double tmp38 = 0.0;
+	tmp38 += m_A128 * V[40];
+	V[38] = (RHS38 - tmp38) / m_A127;
+	double tmp37 = 0.0;
+	tmp37 += m_A118 * V[40];
+	V[37] = (RHS37 - tmp37) / m_A117;
+	double tmp36 = 0.0;
+	tmp36 += m_A113 * V[38];
+	tmp36 += m_A114 * V[40];
+	V[36] = (RHS36 - tmp36) / m_A112;
+	double tmp35 = 0.0;
+	tmp35 += m_A108 * V[40];
+	V[35] = (RHS35 - tmp35) / m_A107;
+	double tmp34 = 0.0;
+	tmp34 += m_A104 * V[39];
+	V[34] = (RHS34 - tmp34) / m_A103;
+	double tmp33 = 0.0;
+	tmp33 += m_A100 * V[40];
+	V[33] = (RHS33 - tmp33) / m_A99;
+	double tmp32 = 0.0;
+	tmp32 += m_A96 * V[38];
+	V[32] = (RHS32 - tmp32) / m_A95;
+	double tmp31 = 0.0;
+	tmp31 += m_A91 * V[36];
+	tmp31 += m_A92 * V[38];
+	V[31] = (RHS31 - tmp31) / m_A90;
+	double tmp30 = 0.0;
+	tmp30 += m_A86 * V[37];
+	V[30] = (RHS30 - tmp30) / m_A85;
+	double tmp29 = 0.0;
+	tmp29 += m_A82 * V[35];
+	V[29] = (RHS29 - tmp29) / m_A81;
+	double tmp28 = 0.0;
+	tmp28 += m_A79 * V[31];
+	V[28] = (RHS28 - tmp28) / m_A78;
+	double tmp27 = 0.0;
+	tmp27 += m_A75 * V[38];
+	V[27] = (RHS27 - tmp27) / m_A74;
+	double tmp26 = 0.0;
+	tmp26 += m_A70 * V[33];
+	V[26] = (RHS26 - tmp26) / m_A69;
+	double tmp25 = 0.0;
+	tmp25 += m_A66 * V[40];
+	V[25] = (RHS25 - tmp25) / m_A65;
+	double tmp24 = 0.0;
+	tmp24 += m_A62 * V[40];
+	V[24] = (RHS24 - tmp24) / m_A61;
+	double tmp23 = 0.0;
+	tmp23 += m_A59 * V[25];
+	V[23] = (RHS23 - tmp23) / m_A58;
+	double tmp22 = 0.0;
+	tmp22 += m_A54 * V[35];
+	tmp22 += m_A55 * V[40];
+	V[22] = (RHS22 - tmp22) / m_A53;
+	double tmp21 = 0.0;
+	tmp21 += m_A51 * V[24];
+	tmp21 += m_A52 * V[40];
+	V[21] = (RHS21 - tmp21) / m_A50;
+	double tmp20 = 0.0;
+	tmp20 += m_A48 * V[34];
+	tmp20 += m_A49 * V[39];
+	V[20] = (RHS20 - tmp20) / m_A47;
+	double tmp19 = 0.0;
+	tmp19 += m_A45 * V[32];
+	tmp19 += m_A46 * V[38];
+	V[19] = (RHS19 - tmp19) / m_A44;
+	double tmp18 = 0.0;
+	tmp18 += m_A42 * V[30];
+	tmp18 += m_A43 * V[37];
+	V[18] = (RHS18 - tmp18) / m_A41;
+	double tmp17 = 0.0;
+	tmp17 += m_A40 * V[38];
+	V[17] = (RHS17 - tmp17) / m_A39;
 	double tmp16 = 0.0;
-	tmp16 += m_A50 * V[17];
-	V[16] = (RHS16 - tmp16) / m_A49;
+	tmp16 += m_A37 * V[28];
+	tmp16 += m_A38 * V[31];
+	V[16] = (RHS16 - tmp16) / m_A36;
 	double tmp15 = 0.0;
-	tmp15 += m_A42 * V[17];
-	V[15] = (RHS15 - tmp15) / m_A41;
+	tmp15 += m_A34 * V[31];
+	tmp15 += m_A35 * V[36];
+	V[15] = (RHS15 - tmp15) / m_A33;
 	double tmp14 = 0.0;
-	V[14] = (RHS14 - tmp14) / m_A39;
+	tmp14 += m_A32 * V[38];
+	V[14] = (RHS14 - tmp14) / m_A31;
 	double tmp13 = 0.0;
-	V[13] = (RHS13 - tmp13) / m_A36;
+	tmp13 += m_A29 * V[27];
+	tmp13 += m_A30 * V[38];
+	V[13] = (RHS13 - tmp13) / m_A28;
 	double tmp12 = 0.0;
-	tmp12 += m_A32 * V[16];
-	tmp12 += m_A33 * V[17];
-	V[12] = (RHS12 - tmp12) / m_A31;
+	tmp12 += m_A27 * V[32];
+	V[12] = (RHS12 - tmp12) / m_A26;
 	double tmp11 = 0.0;
-	tmp11 += m_A28 * V[16];
-	V[11] = (RHS11 - tmp11) / m_A27;
+	tmp11 += m_A25 * V[27];
+	V[11] = (RHS11 - tmp11) / m_A24;
 	double tmp10 = 0.0;
-	tmp10 += m_A25 * V[13];
-	V[10] = (RHS10 - tmp10) / m_A24;
+	tmp10 += m_A23 * V[27];
+	V[10] = (RHS10 - tmp10) / m_A22;
 	double tmp9 = 0.0;
-	tmp9 += m_A21 * V[15];
-	V[9] = (RHS9 - tmp9) / m_A20;
+	tmp9 += m_A20 * V[26];
+	tmp9 += m_A21 * V[33];
+	V[9] = (RHS9 - tmp9) / m_A19;
 	double tmp8 = 0.0;
-	tmp8 += m_A18 * V[14];
+	tmp8 += m_A18 * V[28];
 	V[8] = (RHS8 - tmp8) / m_A17;
 	double tmp7 = 0.0;
-	tmp7 += m_A16 * V[14];
-	V[7] = (RHS7 - tmp7) / m_A15;
+	tmp7 += m_A15 * V[23];
+	tmp7 += m_A16 * V[25];
+	V[7] = (RHS7 - tmp7) / m_A14;
 	double tmp6 = 0.0;
-	tmp6 += m_A13 * V[10];
-	tmp6 += m_A14 * V[13];
+	tmp6 += m_A13 * V[24];
 	V[6] = (RHS6 - tmp6) / m_A12;
 	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[10];
+	tmp5 += m_A11 * V[34];
 	V[5] = (RHS5 - tmp5) / m_A10;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[15];
+	tmp4 += m_A9 * V[26];
 	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[17];
+	tmp3 += m_A7 * V[23];
 	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[11];
+	tmp2 += m_A5 * V[30];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[16];
+	tmp1 += m_A3 * V[36];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[16];
+	tmp0 += m_A1 * V[29];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// dpatrol
-static void nl_gcr_ef9b40abd2bf582c_22_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// kidniki
+static void nl_gcr_fc02559fdbfb0e10_67_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -17299,133 +70579,406 @@
 	double m_A19(0.0);
 	double m_A20(0.0);
 	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	double m_A36(0.0);
+	double m_A37(0.0);
+	double m_A38(0.0);
+	double m_A39(0.0);
+	double m_A40(0.0);
+	double m_A41(0.0);
+	double m_A42(0.0);
+	double m_A43(0.0);
+	double m_A44(0.0);
+	double m_A45(0.0);
+	double m_A46(0.0);
+	double m_A47(0.0);
+	double m_A48(0.0);
+	double m_A49(0.0);
+	double m_A50(0.0);
+	double m_A51(0.0);
+	double m_A52(0.0);
+	double m_A53(0.0);
+	double m_A54(0.0);
+	double m_A55(0.0);
+	double m_A56(0.0);
+	double m_A57(0.0);
+	double m_A58(0.0);
+	double m_A59(0.0);
+	double m_A60(0.0);
+	double m_A61(0.0);
+	double m_A62(0.0);
+	double m_A63(0.0);
+	double m_A64(0.0);
+	double m_A65(0.0);
+	double m_A66(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
-	m_A0 += gt[2];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
-	RHS0 += Idr[2];
 	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
+	m_A2 += gt[2];
 	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A2 += gt[5];
-	m_A2 += gt[6];
-	m_A4 += go[3];
-	m_A3 += go[4];
-	m_A3 += go[5];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 += Idr[5];
-	RHS1 += Idr[6];
-	RHS1 -= go[6] * *cnV[6];
-	m_A5 += gt[7];
-	m_A5 += gt[8];
-	m_A5 += gt[9];
-	m_A5 += gt[10];
-	m_A7 += go[7];
-	m_A6 += go[8];
-	m_A6 += go[9];
-	double RHS2 = Idr[7];
-	RHS2 += Idr[8];
-	RHS2 += Idr[9];
-	RHS2 += Idr[10];
-	RHS2 -= go[10] * *cnV[10];
-	m_A10 += gt[11];
-	m_A10 += gt[12];
-	m_A10 += gt[13];
-	m_A10 += gt[14];
-	m_A10 += gt[15];
-	m_A12 += go[11];
-	m_A9 += go[12];
-	m_A9 += go[13];
-	m_A8 += go[14];
-	m_A8 += go[15];
-	double RHS3 = Idr[11];
-	RHS3 += Idr[12];
-	RHS3 += Idr[13];
-	RHS3 += Idr[14];
-	RHS3 += Idr[15];
-	m_A16 += gt[16];
-	m_A16 += gt[17];
-	m_A16 += gt[18];
-	m_A17 += go[16];
-	m_A14 += go[17];
-	m_A13 += go[18];
-	double RHS4 = Idr[16];
-	RHS4 += Idr[17];
-	RHS4 += Idr[18];
-	m_A21 += gt[19];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 -= go[3] * *cnV[3];
+	m_A4 += gt[4];
+	m_A4 += gt[5];
+	m_A5 += go[4];
+	double RHS2 = Idr[4];
+	RHS2 += Idr[5];
+	RHS2 -= go[5] * *cnV[5];
+	m_A6 += gt[6];
+	m_A6 += gt[7];
+	m_A7 += go[6];
+	double RHS3 = Idr[6];
+	RHS3 += Idr[7];
+	RHS3 -= go[7] * *cnV[7];
+	m_A8 += gt[8];
+	m_A8 += gt[9];
+	m_A9 += go[8];
+	double RHS4 = Idr[8];
+	RHS4 += Idr[9];
+	RHS4 -= go[9] * *cnV[9];
+	m_A10 += gt[10];
+	m_A10 += gt[11];
+	m_A11 += go[10];
+	double RHS5 = Idr[10];
+	RHS5 += Idr[11];
+	RHS5 -= go[11] * *cnV[11];
+	m_A12 += gt[12];
+	m_A12 += gt[13];
+	m_A12 += gt[14];
+	m_A12 += gt[15];
+	m_A12 += gt[16];
+	m_A12 += gt[17];
+	m_A12 += gt[18];
+	m_A12 += gt[19];
+	m_A14 += go[12];
+	m_A15 += go[13];
+	m_A17 += go[14];
+	m_A18 += go[15];
+	m_A16 += go[16];
+	m_A13 += go[17];
+	double RHS6 = Idr[12];
+	RHS6 += Idr[13];
+	RHS6 += Idr[14];
+	RHS6 += Idr[15];
+	RHS6 += Idr[16];
+	RHS6 += Idr[17];
+	RHS6 += Idr[18];
+	RHS6 += Idr[19];
+	RHS6 -= go[18] * *cnV[18];
+	RHS6 -= go[19] * *cnV[19];
 	m_A21 += gt[20];
 	m_A21 += gt[21];
-	m_A20 += go[19];
-	m_A19 += go[20];
-	m_A18 += go[21];
-	double RHS5 = Idr[19];
-	RHS5 += Idr[20];
-	RHS5 += Idr[21];
+	m_A21 += gt[22];
+	m_A21 += gt[23];
+	m_A20 += go[20];
+	m_A19 += go[21];
+	double RHS7 = Idr[20];
+	RHS7 += Idr[21];
+	RHS7 += Idr[22];
+	RHS7 += Idr[23];
+	RHS7 -= go[22] * *cnV[22];
+	RHS7 -= go[23] * *cnV[23];
+	m_A30 += gt[24];
+	m_A30 += gt[25];
+	m_A30 += gt[26];
+	m_A30 += gt[27];
+	m_A28 += go[24];
+	m_A27 += go[25];
+	double RHS8 = Idr[24];
+	RHS8 += Idr[25];
+	RHS8 += Idr[26];
+	RHS8 += Idr[27];
+	RHS8 -= go[26] * *cnV[26];
+	RHS8 -= go[27] * *cnV[27];
+	m_A39 += gt[28];
+	m_A39 += gt[29];
+	m_A39 += gt[30];
+	m_A39 += gt[31];
+	m_A36 += go[28];
+	m_A35 += go[29];
+	double RHS9 = Idr[28];
+	RHS9 += Idr[29];
+	RHS9 += Idr[30];
+	RHS9 += Idr[31];
+	RHS9 -= go[30] * *cnV[30];
+	RHS9 -= go[31] * *cnV[31];
+	m_A48 += gt[32];
+	m_A48 += gt[33];
+	m_A48 += gt[34];
+	m_A48 += gt[35];
+	m_A44 += go[32];
+	m_A43 += go[33];
+	double RHS10 = Idr[32];
+	RHS10 += Idr[33];
+	RHS10 += Idr[34];
+	RHS10 += Idr[35];
+	RHS10 -= go[34] * *cnV[34];
+	RHS10 -= go[35] * *cnV[35];
+	m_A57 += gt[36];
+	m_A57 += gt[37];
+	m_A57 += gt[38];
+	m_A57 += gt[39];
+	m_A52 += go[36];
+	m_A51 += go[37];
+	double RHS11 = Idr[36];
+	RHS11 += Idr[37];
+	RHS11 += Idr[38];
+	RHS11 += Idr[39];
+	RHS11 -= go[38] * *cnV[38];
+	RHS11 -= go[39] * *cnV[39];
+	m_A66 += gt[40];
+	m_A66 += gt[41];
+	m_A66 += gt[42];
+	m_A66 += gt[43];
+	m_A60 += go[40];
+	m_A59 += go[41];
+	double RHS12 = Idr[40];
+	RHS12 += Idr[41];
+	RHS12 += Idr[42];
+	RHS12 += Idr[43];
+	RHS12 -= go[42] * *cnV[42];
+	RHS12 -= go[43] * *cnV[43];
 	const double f0 = 1.0 / m_A0;
-	const double f0_5 = -f0 * m_A18;
-	m_A21 += m_A1 * f0_5;
-	RHS5 += f0_5 * RHS0;
+	const double f0_7 = -f0 * m_A19;
+	m_A21 += m_A1 * f0_7;
+	RHS7 += f0_7 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_3 = -f1 * m_A8;
-	m_A10 += m_A3 * f1_3;
-	m_A11 += m_A4 * f1_3;
-	RHS3 += f1_3 * RHS1;
-	const double f1_4 = -f1 * m_A13;
-	m_A15 += m_A3 * f1_4;
-	m_A16 += m_A4 * f1_4;
-	RHS4 += f1_4 * RHS1;
-	const double f2 = 1.0 / m_A5;
-	const double f2_3 = -f2 * m_A9;
-	m_A10 += m_A6 * f2_3;
-	m_A11 += m_A7 * f2_3;
-	RHS3 += f2_3 * RHS2;
-	const double f2_4 = -f2 * m_A14;
-	m_A15 += m_A6 * f2_4;
-	m_A16 += m_A7 * f2_4;
-	RHS4 += f2_4 * RHS2;
-	const double f3 = 1.0 / m_A10;
-	const double f3_4 = -f3 * m_A15;
-	m_A16 += m_A11 * f3_4;
-	m_A17 += m_A12 * f3_4;
-	RHS4 += f3_4 * RHS3;
-	const double f3_5 = -f3 * m_A19;
-	m_A20 += m_A11 * f3_5;
-	m_A21 += m_A12 * f3_5;
-	RHS5 += f3_5 * RHS3;
-	const double f4 = 1.0 / m_A16;
-	const double f4_5 = -f4 * m_A20;
-	m_A21 += m_A17 * f4_5;
-	RHS5 += f4_5 * RHS4;
-	V[5] = RHS5 / m_A21;
+	const double f1_10 = -f1 * m_A43;
+	m_A48 += m_A3 * f1_10;
+	RHS10 += f1_10 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_12 = -f2 * m_A59;
+	m_A66 += m_A5 * f2_12;
+	RHS12 += f2_12 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_11 = -f3 * m_A51;
+	m_A57 += m_A7 * f3_11;
+	RHS11 += f3_11 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_9 = -f4 * m_A35;
+	m_A39 += m_A9 * f4_9;
+	RHS9 += f4_9 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_8 = -f5 * m_A27;
+	m_A30 += m_A11 * f5_8;
+	RHS8 += f5_8 * RHS5;
+	const double f6 = 1.0 / m_A12;
+	const double f6_7 = -f6 * m_A20;
+	m_A21 += m_A13 * f6_7;
+	m_A22 += m_A14 * f6_7;
+	m_A23 += m_A15 * f6_7;
+	m_A24 += m_A16 * f6_7;
+	m_A25 += m_A17 * f6_7;
+	m_A26 += m_A18 * f6_7;
+	RHS7 += f6_7 * RHS6;
+	const double f6_8 = -f6 * m_A28;
+	m_A29 += m_A13 * f6_8;
+	m_A30 += m_A14 * f6_8;
+	m_A31 += m_A15 * f6_8;
+	m_A32 += m_A16 * f6_8;
+	m_A33 += m_A17 * f6_8;
+	m_A34 += m_A18 * f6_8;
+	RHS8 += f6_8 * RHS6;
+	const double f6_9 = -f6 * m_A36;
+	m_A37 += m_A13 * f6_9;
+	m_A38 += m_A14 * f6_9;
+	m_A39 += m_A15 * f6_9;
+	m_A40 += m_A16 * f6_9;
+	m_A41 += m_A17 * f6_9;
+	m_A42 += m_A18 * f6_9;
+	RHS9 += f6_9 * RHS6;
+	const double f6_10 = -f6 * m_A44;
+	m_A45 += m_A13 * f6_10;
+	m_A46 += m_A14 * f6_10;
+	m_A47 += m_A15 * f6_10;
+	m_A48 += m_A16 * f6_10;
+	m_A49 += m_A17 * f6_10;
+	m_A50 += m_A18 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f6_11 = -f6 * m_A52;
+	m_A53 += m_A13 * f6_11;
+	m_A54 += m_A14 * f6_11;
+	m_A55 += m_A15 * f6_11;
+	m_A56 += m_A16 * f6_11;
+	m_A57 += m_A17 * f6_11;
+	m_A58 += m_A18 * f6_11;
+	RHS11 += f6_11 * RHS6;
+	const double f6_12 = -f6 * m_A60;
+	m_A61 += m_A13 * f6_12;
+	m_A62 += m_A14 * f6_12;
+	m_A63 += m_A15 * f6_12;
+	m_A64 += m_A16 * f6_12;
+	m_A65 += m_A17 * f6_12;
+	m_A66 += m_A18 * f6_12;
+	RHS12 += f6_12 * RHS6;
+	const double f7 = 1.0 / m_A21;
+	const double f7_8 = -f7 * m_A29;
+	m_A30 += m_A22 * f7_8;
+	m_A31 += m_A23 * f7_8;
+	m_A32 += m_A24 * f7_8;
+	m_A33 += m_A25 * f7_8;
+	m_A34 += m_A26 * f7_8;
+	RHS8 += f7_8 * RHS7;
+	const double f7_9 = -f7 * m_A37;
+	m_A38 += m_A22 * f7_9;
+	m_A39 += m_A23 * f7_9;
+	m_A40 += m_A24 * f7_9;
+	m_A41 += m_A25 * f7_9;
+	m_A42 += m_A26 * f7_9;
+	RHS9 += f7_9 * RHS7;
+	const double f7_10 = -f7 * m_A45;
+	m_A46 += m_A22 * f7_10;
+	m_A47 += m_A23 * f7_10;
+	m_A48 += m_A24 * f7_10;
+	m_A49 += m_A25 * f7_10;
+	m_A50 += m_A26 * f7_10;
+	RHS10 += f7_10 * RHS7;
+	const double f7_11 = -f7 * m_A53;
+	m_A54 += m_A22 * f7_11;
+	m_A55 += m_A23 * f7_11;
+	m_A56 += m_A24 * f7_11;
+	m_A57 += m_A25 * f7_11;
+	m_A58 += m_A26 * f7_11;
+	RHS11 += f7_11 * RHS7;
+	const double f7_12 = -f7 * m_A61;
+	m_A62 += m_A22 * f7_12;
+	m_A63 += m_A23 * f7_12;
+	m_A64 += m_A24 * f7_12;
+	m_A65 += m_A25 * f7_12;
+	m_A66 += m_A26 * f7_12;
+	RHS12 += f7_12 * RHS7;
+	const double f8 = 1.0 / m_A30;
+	const double f8_9 = -f8 * m_A38;
+	m_A39 += m_A31 * f8_9;
+	m_A40 += m_A32 * f8_9;
+	m_A41 += m_A33 * f8_9;
+	m_A42 += m_A34 * f8_9;
+	RHS9 += f8_9 * RHS8;
+	const double f8_10 = -f8 * m_A46;
+	m_A47 += m_A31 * f8_10;
+	m_A48 += m_A32 * f8_10;
+	m_A49 += m_A33 * f8_10;
+	m_A50 += m_A34 * f8_10;
+	RHS10 += f8_10 * RHS8;
+	const double f8_11 = -f8 * m_A54;
+	m_A55 += m_A31 * f8_11;
+	m_A56 += m_A32 * f8_11;
+	m_A57 += m_A33 * f8_11;
+	m_A58 += m_A34 * f8_11;
+	RHS11 += f8_11 * RHS8;
+	const double f8_12 = -f8 * m_A62;
+	m_A63 += m_A31 * f8_12;
+	m_A64 += m_A32 * f8_12;
+	m_A65 += m_A33 * f8_12;
+	m_A66 += m_A34 * f8_12;
+	RHS12 += f8_12 * RHS8;
+	const double f9 = 1.0 / m_A39;
+	const double f9_10 = -f9 * m_A47;
+	m_A48 += m_A40 * f9_10;
+	m_A49 += m_A41 * f9_10;
+	m_A50 += m_A42 * f9_10;
+	RHS10 += f9_10 * RHS9;
+	const double f9_11 = -f9 * m_A55;
+	m_A56 += m_A40 * f9_11;
+	m_A57 += m_A41 * f9_11;
+	m_A58 += m_A42 * f9_11;
+	RHS11 += f9_11 * RHS9;
+	const double f9_12 = -f9 * m_A63;
+	m_A64 += m_A40 * f9_12;
+	m_A65 += m_A41 * f9_12;
+	m_A66 += m_A42 * f9_12;
+	RHS12 += f9_12 * RHS9;
+	const double f10 = 1.0 / m_A48;
+	const double f10_11 = -f10 * m_A56;
+	m_A57 += m_A49 * f10_11;
+	m_A58 += m_A50 * f10_11;
+	RHS11 += f10_11 * RHS10;
+	const double f10_12 = -f10 * m_A64;
+	m_A65 += m_A49 * f10_12;
+	m_A66 += m_A50 * f10_12;
+	RHS12 += f10_12 * RHS10;
+	const double f11 = 1.0 / m_A57;
+	const double f11_12 = -f11 * m_A65;
+	m_A66 += m_A58 * f11_12;
+	RHS12 += f11_12 * RHS11;
+	V[12] = RHS12 / m_A66;
+	double tmp11 = 0.0;
+	tmp11 += m_A58 * V[12];
+	V[11] = (RHS11 - tmp11) / m_A57;
+	double tmp10 = 0.0;
+	tmp10 += m_A49 * V[11];
+	tmp10 += m_A50 * V[12];
+	V[10] = (RHS10 - tmp10) / m_A48;
+	double tmp9 = 0.0;
+	tmp9 += m_A40 * V[10];
+	tmp9 += m_A41 * V[11];
+	tmp9 += m_A42 * V[12];
+	V[9] = (RHS9 - tmp9) / m_A39;
+	double tmp8 = 0.0;
+	tmp8 += m_A31 * V[9];
+	tmp8 += m_A32 * V[10];
+	tmp8 += m_A33 * V[11];
+	tmp8 += m_A34 * V[12];
+	V[8] = (RHS8 - tmp8) / m_A30;
+	double tmp7 = 0.0;
+	tmp7 += m_A22 * V[8];
+	tmp7 += m_A23 * V[9];
+	tmp7 += m_A24 * V[10];
+	tmp7 += m_A25 * V[11];
+	tmp7 += m_A26 * V[12];
+	V[7] = (RHS7 - tmp7) / m_A21;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[7];
+	tmp6 += m_A14 * V[8];
+	tmp6 += m_A15 * V[9];
+	tmp6 += m_A16 * V[10];
+	tmp6 += m_A17 * V[11];
+	tmp6 += m_A18 * V[12];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[8];
+	V[5] = (RHS5 - tmp5) / m_A10;
 	double tmp4 = 0.0;
-	tmp4 += m_A17 * V[5];
-	V[4] = (RHS4 - tmp4) / m_A16;
+	tmp4 += m_A9 * V[9];
+	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A11 * V[4];
-	tmp3 += m_A12 * V[5];
-	V[3] = (RHS3 - tmp3) / m_A10;
+	tmp3 += m_A7 * V[11];
+	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A6 * V[3];
-	tmp2 += m_A7 * V[4];
-	V[2] = (RHS2 - tmp2) / m_A5;
+	tmp2 += m_A5 * V[12];
+	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[3];
-	tmp1 += m_A4 * V[4];
+	tmp1 += m_A3 * V[10];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[5];
+	tmp0 += m_A1 * V[7];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// zac1b11142
-static void nl_gcr_f0a19b84f91ff24f_71_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// 280zzzap
+static void nl_gcr_fc9971724787b82b_149_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -17497,415 +71050,1312 @@
 	double m_A68(0.0);
 	double m_A69(0.0);
 	double m_A70(0.0);
+	double m_A71(0.0);
+	double m_A72(0.0);
+	double m_A73(0.0);
+	double m_A74(0.0);
+	double m_A75(0.0);
+	double m_A76(0.0);
+	double m_A77(0.0);
+	double m_A78(0.0);
+	double m_A79(0.0);
+	double m_A80(0.0);
+	double m_A81(0.0);
+	double m_A82(0.0);
+	double m_A83(0.0);
+	double m_A84(0.0);
+	double m_A85(0.0);
+	double m_A86(0.0);
+	double m_A87(0.0);
+	double m_A88(0.0);
+	double m_A89(0.0);
+	double m_A90(0.0);
+	double m_A91(0.0);
+	double m_A92(0.0);
+	double m_A93(0.0);
+	double m_A94(0.0);
+	double m_A95(0.0);
+	double m_A96(0.0);
+	double m_A97(0.0);
+	double m_A98(0.0);
+	double m_A99(0.0);
+	double m_A100(0.0);
+	double m_A101(0.0);
+	double m_A102(0.0);
+	double m_A103(0.0);
+	double m_A104(0.0);
+	double m_A105(0.0);
+	double m_A106(0.0);
+	double m_A107(0.0);
+	double m_A108(0.0);
+	double m_A109(0.0);
+	double m_A110(0.0);
+	double m_A111(0.0);
+	double m_A112(0.0);
+	double m_A113(0.0);
+	double m_A114(0.0);
+	double m_A115(0.0);
+	double m_A116(0.0);
+	double m_A117(0.0);
+	double m_A118(0.0);
+	double m_A119(0.0);
+	double m_A120(0.0);
+	double m_A121(0.0);
+	double m_A122(0.0);
+	double m_A123(0.0);
+	double m_A124(0.0);
+	double m_A125(0.0);
+	double m_A126(0.0);
+	double m_A127(0.0);
+	double m_A128(0.0);
+	double m_A129(0.0);
+	double m_A130(0.0);
+	double m_A131(0.0);
+	double m_A132(0.0);
+	double m_A133(0.0);
+	double m_A134(0.0);
+	double m_A135(0.0);
+	double m_A136(0.0);
+	double m_A137(0.0);
+	double m_A138(0.0);
+	double m_A139(0.0);
+	double m_A140(0.0);
+	double m_A141(0.0);
+	double m_A142(0.0);
+	double m_A143(0.0);
+	double m_A144(0.0);
+	double m_A145(0.0);
+	double m_A146(0.0);
+	double m_A147(0.0);
+	double m_A148(0.0);
 	m_A0 += gt[0];
 	m_A0 += gt[1];
-	m_A0 += gt[2];
-	m_A0 += gt[3];
-	m_A0 += gt[4];
-	m_A0 += gt[5];
-	m_A0 += gt[6];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
-	RHS0 += Idr[2];
-	RHS0 += Idr[3];
-	RHS0 += Idr[4];
-	RHS0 += Idr[5];
-	RHS0 += Idr[6];
 	RHS0 -= go[1] * *cnV[1];
-	RHS0 -= go[2] * *cnV[2];
-	RHS0 -= go[3] * *cnV[3];
-	RHS0 -= go[4] * *cnV[4];
-	RHS0 -= go[5] * *cnV[5];
-	RHS0 -= go[6] * *cnV[6];
-	m_A2 += gt[7];
-	m_A2 += gt[8];
-	m_A2 += gt[9];
-	m_A2 += gt[10];
-	m_A2 += gt[11];
-	m_A2 += gt[12];
-	m_A2 += gt[13];
-	m_A3 += go[7];
-	double RHS1 = Idr[7];
-	RHS1 += Idr[8];
-	RHS1 += Idr[9];
-	RHS1 += Idr[10];
-	RHS1 += Idr[11];
-	RHS1 += Idr[12];
-	RHS1 += Idr[13];
-	RHS1 -= go[8] * *cnV[8];
-	RHS1 -= go[9] * *cnV[9];
-	RHS1 -= go[10] * *cnV[10];
-	RHS1 -= go[11] * *cnV[11];
-	RHS1 -= go[12] * *cnV[12];
-	RHS1 -= go[13] * *cnV[13];
-	m_A4 += gt[14];
-	m_A4 += gt[15];
-	m_A4 += gt[16];
-	m_A5 += go[14];
-	double RHS2 = Idr[14];
-	RHS2 += Idr[15];
-	RHS2 += Idr[16];
-	RHS2 -= go[15] * *cnV[15];
-	RHS2 -= go[16] * *cnV[16];
-	m_A6 += gt[17];
-	m_A6 += gt[18];
-	m_A7 += go[17];
-	double RHS3 = Idr[17];
-	RHS3 += Idr[18];
-	RHS3 -= go[18] * *cnV[18];
-	m_A8 += gt[19];
-	m_A8 += gt[20];
-	m_A8 += gt[21];
-	m_A9 += go[19];
-	double RHS4 = Idr[19];
-	RHS4 += Idr[20];
-	RHS4 += Idr[21];
-	RHS4 -= go[20] * *cnV[20];
-	RHS4 -= go[21] * *cnV[21];
+	m_A2 += gt[2];
+	m_A2 += gt[3];
+	m_A2 += gt[4];
+	m_A3 += go[2];
+	double RHS1 = Idr[2];
+	RHS1 += Idr[3];
+	RHS1 += Idr[4];
+	RHS1 -= go[3] * *cnV[3];
+	RHS1 -= go[4] * *cnV[4];
+	m_A4 += gt[5];
+	m_A4 += gt[6];
+	m_A4 += gt[7];
+	m_A4 += gt[8];
+	m_A4 += gt[9];
+	m_A4 += gt[10];
+	m_A4 += gt[11];
+	m_A5 += go[5];
+	double RHS2 = Idr[5];
+	RHS2 += Idr[6];
+	RHS2 += Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 -= go[6] * *cnV[6];
+	RHS2 -= go[7] * *cnV[7];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	m_A6 += gt[12];
+	m_A6 += gt[13];
+	m_A7 += go[12];
+	double RHS3 = Idr[12];
+	RHS3 += Idr[13];
+	RHS3 -= go[13] * *cnV[13];
+	m_A8 += gt[14];
+	m_A8 += gt[15];
+	m_A9 += go[14];
+	double RHS4 = Idr[14];
+	RHS4 += Idr[15];
+	RHS4 -= go[15] * *cnV[15];
+	m_A10 += gt[16];
+	m_A10 += gt[17];
+	m_A10 += gt[18];
+	m_A10 += gt[19];
+	m_A10 += gt[20];
+	m_A10 += gt[21];
 	m_A10 += gt[22];
-	m_A10 += gt[23];
-	m_A11 += go[22];
-	double RHS5 = Idr[22];
-	RHS5 += Idr[23];
-	RHS5 -= go[23] * *cnV[23];
+	m_A11 += go[16];
+	double RHS5 = Idr[16];
+	RHS5 += Idr[17];
+	RHS5 += Idr[18];
+	RHS5 += Idr[19];
+	RHS5 += Idr[20];
+	RHS5 += Idr[21];
+	RHS5 += Idr[22];
+	RHS5 -= go[17] * *cnV[17];
+	RHS5 -= go[18] * *cnV[18];
+	RHS5 -= go[19] * *cnV[19];
+	RHS5 -= go[20] * *cnV[20];
+	RHS5 -= go[21] * *cnV[21];
+	RHS5 -= go[22] * *cnV[22];
+	m_A12 += gt[23];
 	m_A12 += gt[24];
 	m_A12 += gt[25];
-	m_A12 += gt[26];
-	m_A13 += go[24];
-	double RHS6 = Idr[24];
+	m_A13 += go[23];
+	double RHS6 = Idr[23];
+	RHS6 += Idr[24];
 	RHS6 += Idr[25];
-	RHS6 += Idr[26];
+	RHS6 -= go[24] * *cnV[24];
 	RHS6 -= go[25] * *cnV[25];
-	RHS6 -= go[26] * *cnV[26];
+	m_A14 += gt[26];
 	m_A14 += gt[27];
-	m_A14 += gt[28];
-	m_A14 += gt[29];
+	m_A16 += go[26];
 	m_A15 += go[27];
-	double RHS7 = Idr[27];
-	RHS7 += Idr[28];
-	RHS7 += Idr[29];
-	RHS7 -= go[28] * *cnV[28];
-	RHS7 -= go[29] * *cnV[29];
-	m_A17 += gt[30];
-	m_A17 += gt[31];
-	m_A17 += gt[32];
-	m_A17 += gt[33];
-	m_A17 += gt[34];
-	m_A17 += gt[35];
-	m_A16 += go[30];
-	m_A18 += go[31];
-	m_A19 += go[32];
-	m_A19 += go[33];
-	double RHS8 = Idr[30];
-	RHS8 += Idr[31];
-	RHS8 += Idr[32];
-	RHS8 += Idr[33];
-	RHS8 += Idr[34];
-	RHS8 += Idr[35];
-	RHS8 -= go[34] * *cnV[34];
-	RHS8 -= go[35] * *cnV[35];
-	m_A21 += gt[36];
-	m_A21 += gt[37];
-	m_A21 += gt[38];
-	m_A22 += go[36];
-	double RHS9 = Idr[36];
-	RHS9 += Idr[37];
-	RHS9 += Idr[38];
-	RHS9 -= go[37] * *cnV[37];
-	RHS9 -= go[38] * *cnV[38];
+	double RHS7 = Idr[26];
+	RHS7 += Idr[27];
+	m_A17 += gt[28];
+	m_A17 += gt[29];
+	m_A18 += go[28];
+	double RHS8 = Idr[28];
+	RHS8 += Idr[29];
+	RHS8 -= go[29] * *cnV[29];
+	m_A19 += gt[30];
+	m_A19 += gt[31];
+	m_A20 += go[30];
+	double RHS9 = Idr[30];
+	RHS9 += Idr[31];
+	RHS9 -= go[31] * *cnV[31];
+	m_A21 += gt[32];
+	m_A21 += gt[33];
+	m_A22 += go[32];
+	double RHS10 = Idr[32];
+	RHS10 += Idr[33];
+	RHS10 -= go[33] * *cnV[33];
+	m_A23 += gt[34];
+	m_A23 += gt[35];
+	m_A23 += gt[36];
+	m_A23 += gt[37];
+	m_A23 += gt[38];
 	m_A23 += gt[39];
 	m_A23 += gt[40];
-	m_A23 += gt[41];
-	m_A25 += go[39];
-	m_A24 += go[40];
-	double RHS10 = Idr[39];
-	RHS10 += Idr[40];
-	RHS10 += Idr[41];
-	RHS10 -= go[41] * *cnV[41];
-	m_A27 += gt[42];
+	m_A24 += go[34];
+	double RHS11 = Idr[34];
+	RHS11 += Idr[35];
+	RHS11 += Idr[36];
+	RHS11 += Idr[37];
+	RHS11 += Idr[38];
+	RHS11 += Idr[39];
+	RHS11 += Idr[40];
+	RHS11 -= go[35] * *cnV[35];
+	RHS11 -= go[36] * *cnV[36];
+	RHS11 -= go[37] * *cnV[37];
+	RHS11 -= go[38] * *cnV[38];
+	RHS11 -= go[39] * *cnV[39];
+	RHS11 -= go[40] * *cnV[40];
+	m_A25 += gt[41];
+	m_A25 += gt[42];
+	m_A26 += go[41];
+	double RHS12 = Idr[41];
+	RHS12 += Idr[42];
+	RHS12 -= go[42] * *cnV[42];
 	m_A27 += gt[43];
 	m_A27 += gt[44];
 	m_A27 += gt[45];
 	m_A27 += gt[46];
 	m_A27 += gt[47];
-	m_A26 += go[42];
-	m_A29 += go[43];
-	m_A29 += go[44];
-	double RHS11 = Idr[42];
-	RHS11 += Idr[43];
-	RHS11 += Idr[44];
-	RHS11 += Idr[45];
-	RHS11 += Idr[46];
-	RHS11 += Idr[47];
-	RHS11 -= go[45] * *cnV[45];
-	RHS11 -= go[46] * *cnV[46];
-	RHS11 -= go[47] * *cnV[47];
-	m_A31 += gt[48];
-	m_A31 += gt[49];
-	m_A32 += go[48];
-	m_A30 += go[49];
-	double RHS12 = Idr[48];
-	RHS12 += Idr[49];
-	m_A35 += gt[50];
-	m_A35 += gt[51];
-	m_A34 += go[50];
-	m_A33 += go[51];
-	double RHS13 = Idr[50];
-	RHS13 += Idr[51];
-	m_A38 += gt[52];
-	m_A38 += gt[53];
-	m_A37 += go[52];
-	m_A36 += go[53];
-	double RHS14 = Idr[52];
-	RHS14 += Idr[53];
-	m_A40 += gt[54];
-	m_A40 += gt[55];
-	m_A40 += gt[56];
-	m_A40 += gt[57];
-	m_A41 += go[54];
-	m_A39 += go[55];
-	double RHS15 = Idr[54];
-	RHS15 += Idr[55];
-	RHS15 += Idr[56];
-	RHS15 += Idr[57];
-	RHS15 -= go[56] * *cnV[56];
-	RHS15 -= go[57] * *cnV[57];
-	m_A44 += gt[58];
-	m_A44 += gt[59];
-	m_A43 += go[58];
-	m_A42 += go[59];
-	double RHS16 = Idr[58];
-	RHS16 += Idr[59];
-	m_A54 += gt[60];
-	m_A54 += gt[61];
-	m_A54 += gt[62];
-	m_A54 += gt[63];
-	m_A54 += gt[64];
-	m_A54 += gt[65];
-	m_A52 += go[60];
-	m_A50 += go[61];
-	m_A50 += go[62];
-	m_A51 += go[63];
-	m_A49 += go[64];
-	m_A48 += go[65];
-	double RHS17 = Idr[60];
-	RHS17 += Idr[61];
-	RHS17 += Idr[62];
-	RHS17 += Idr[63];
-	RHS17 += Idr[64];
-	RHS17 += Idr[65];
-	m_A65 += gt[66];
-	m_A65 += gt[67];
-	m_A65 += gt[68];
-	m_A65 += gt[69];
-	m_A65 += gt[70];
-	m_A65 += gt[71];
-	m_A61 += go[66];
-	m_A60 += go[67];
-	m_A60 += go[68];
-	m_A59 += go[69];
-	m_A58 += go[70];
-	m_A57 += go[71];
-	double RHS18 = Idr[66];
-	RHS18 += Idr[67];
-	RHS18 += Idr[68];
-	RHS18 += Idr[69];
-	RHS18 += Idr[70];
-	RHS18 += Idr[71];
-	m_A70 += gt[72];
-	m_A70 += gt[73];
-	m_A70 += gt[74];
-	m_A70 += gt[75];
-	m_A68 += go[72];
-	m_A67 += go[73];
-	double RHS19 = Idr[72];
-	RHS19 += Idr[73];
-	RHS19 += Idr[74];
-	RHS19 += Idr[75];
-	RHS19 -= go[74] * *cnV[74];
-	RHS19 -= go[75] * *cnV[75];
+	m_A27 += gt[48];
+	m_A27 += gt[49];
+	m_A28 += go[43];
+	double RHS13 = Idr[43];
+	RHS13 += Idr[44];
+	RHS13 += Idr[45];
+	RHS13 += Idr[46];
+	RHS13 += Idr[47];
+	RHS13 += Idr[48];
+	RHS13 += Idr[49];
+	RHS13 -= go[44] * *cnV[44];
+	RHS13 -= go[45] * *cnV[45];
+	RHS13 -= go[46] * *cnV[46];
+	RHS13 -= go[47] * *cnV[47];
+	RHS13 -= go[48] * *cnV[48];
+	RHS13 -= go[49] * *cnV[49];
+	m_A29 += gt[50];
+	m_A29 += gt[51];
+	m_A29 += gt[52];
+	m_A30 += go[50];
+	double RHS14 = Idr[50];
+	RHS14 += Idr[51];
+	RHS14 += Idr[52];
+	RHS14 -= go[51] * *cnV[51];
+	RHS14 -= go[52] * *cnV[52];
+	m_A31 += gt[53];
+	m_A31 += gt[54];
+	m_A32 += go[53];
+	double RHS15 = Idr[53];
+	RHS15 += Idr[54];
+	RHS15 -= go[54] * *cnV[54];
+	m_A33 += gt[55];
+	m_A33 += gt[56];
+	m_A33 += gt[57];
+	m_A33 += gt[58];
+	m_A34 += go[55];
+	m_A35 += go[56];
+	double RHS16 = Idr[55];
+	RHS16 += Idr[56];
+	RHS16 += Idr[57];
+	RHS16 += Idr[58];
+	RHS16 -= go[57] * *cnV[57];
+	RHS16 -= go[58] * *cnV[58];
+	m_A36 += gt[59];
+	m_A36 += gt[60];
+	m_A36 += gt[61];
+	m_A37 += go[59];
+	double RHS17 = Idr[59];
+	RHS17 += Idr[60];
+	RHS17 += Idr[61];
+	RHS17 -= go[60] * *cnV[60];
+	RHS17 -= go[61] * *cnV[61];
+	m_A38 += gt[62];
+	m_A38 += gt[63];
+	m_A39 += go[62];
+	m_A40 += go[63];
+	double RHS18 = Idr[62];
+	RHS18 += Idr[63];
+	m_A41 += gt[64];
+	m_A41 += gt[65];
+	m_A42 += go[64];
+	m_A43 += go[65];
+	double RHS19 = Idr[64];
+	RHS19 += Idr[65];
+	m_A45 += gt[66];
+	m_A45 += gt[67];
+	m_A44 += go[66];
+	double RHS20 = Idr[66];
+	RHS20 += Idr[67];
+	RHS20 -= go[67] * *cnV[67];
+	m_A47 += gt[68];
+	m_A47 += gt[69];
+	m_A47 += gt[70];
+	m_A47 += gt[71];
+	m_A46 += go[68];
+	m_A48 += go[69];
+	double RHS21 = Idr[68];
+	RHS21 += Idr[69];
+	RHS21 += Idr[70];
+	RHS21 += Idr[71];
+	RHS21 -= go[70] * *cnV[70];
+	RHS21 -= go[71] * *cnV[71];
+	m_A51 += gt[72];
+	m_A51 += gt[73];
+	m_A51 += gt[74];
+	m_A51 += gt[75];
+	m_A51 += gt[76];
+	m_A51 += gt[77];
+	m_A49 += go[72];
+	m_A53 += go[73];
+	m_A54 += go[74];
+	m_A52 += go[75];
+	double RHS22 = Idr[72];
+	RHS22 += Idr[73];
+	RHS22 += Idr[74];
+	RHS22 += Idr[75];
+	RHS22 += Idr[76];
+	RHS22 += Idr[77];
+	RHS22 -= go[76] * *cnV[76];
+	RHS22 -= go[77] * *cnV[77];
+	m_A56 += gt[78];
+	m_A56 += gt[79];
+	m_A55 += go[78];
+	double RHS23 = Idr[78];
+	RHS23 += Idr[79];
+	RHS23 -= go[79] * *cnV[79];
+	m_A58 += gt[80];
+	m_A58 += gt[81];
+	m_A58 += gt[82];
+	m_A58 += gt[83];
+	m_A57 += go[80];
+	m_A59 += go[81];
+	double RHS24 = Idr[80];
+	RHS24 += Idr[81];
+	RHS24 += Idr[82];
+	RHS24 += Idr[83];
+	RHS24 -= go[82] * *cnV[82];
+	RHS24 -= go[83] * *cnV[83];
+	m_A63 += gt[84];
+	m_A63 += gt[85];
+	m_A63 += gt[86];
+	m_A63 += gt[87];
+	m_A63 += gt[88];
+	m_A63 += gt[89];
+	m_A60 += go[84];
+	m_A61 += go[85];
+	m_A65 += go[86];
+	m_A66 += go[87];
+	double RHS25 = Idr[84];
+	RHS25 += Idr[85];
+	RHS25 += Idr[86];
+	RHS25 += Idr[87];
+	RHS25 += Idr[88];
+	RHS25 += Idr[89];
+	RHS25 -= go[88] * *cnV[88];
+	RHS25 -= go[89] * *cnV[89];
+	m_A69 += gt[90];
+	m_A69 += gt[91];
+	m_A68 += go[90];
+	m_A67 += go[91];
+	double RHS26 = Idr[90];
+	RHS26 += Idr[91];
+	m_A72 += gt[92];
+	m_A72 += gt[93];
+	m_A71 += go[92];
+	m_A73 += go[93];
+	double RHS27 = Idr[92];
+	RHS27 += Idr[93];
+	m_A78 += gt[94];
+	m_A78 += gt[95];
+	m_A78 += gt[96];
+	m_A78 += gt[97];
+	m_A76 += go[94];
+	m_A75 += go[95];
+	m_A81 += go[96];
+	m_A74 += go[97];
+	double RHS28 = Idr[94];
+	RHS28 += Idr[95];
+	RHS28 += Idr[96];
+	RHS28 += Idr[97];
+	m_A85 += gt[98];
+	m_A85 += gt[99];
+	m_A83 += go[98];
+	m_A82 += go[99];
+	double RHS29 = Idr[98];
+	RHS29 += Idr[99];
+	m_A87 += gt[100];
+	m_A87 += gt[101];
+	m_A87 += gt[102];
+	m_A87 += gt[103];
+	m_A86 += go[100];
+	m_A89 += go[101];
+	double RHS30 = Idr[100];
+	RHS30 += Idr[101];
+	RHS30 += Idr[102];
+	RHS30 += Idr[103];
+	RHS30 -= go[102] * *cnV[102];
+	RHS30 -= go[103] * *cnV[103];
+	m_A91 += gt[104];
+	m_A91 += gt[105];
+	m_A91 += gt[106];
+	m_A91 += gt[107];
+	m_A90 += go[104];
+	m_A92 += go[105];
+	double RHS31 = Idr[104];
+	RHS31 += Idr[105];
+	RHS31 += Idr[106];
+	RHS31 += Idr[107];
+	RHS31 -= go[106] * *cnV[106];
+	RHS31 -= go[107] * *cnV[107];
+	m_A97 += gt[108];
+	m_A97 += gt[109];
+	m_A97 += gt[110];
+	m_A97 += gt[111];
+	m_A97 += gt[112];
+	m_A96 += go[108];
+	m_A95 += go[109];
+	m_A99 += go[110];
+	m_A94 += go[111];
+	m_A93 += go[112];
+	double RHS32 = Idr[108];
+	RHS32 += Idr[109];
+	RHS32 += Idr[110];
+	RHS32 += Idr[111];
+	RHS32 += Idr[112];
+	m_A107 += gt[113];
+	m_A107 += gt[114];
+	m_A107 += gt[115];
+	m_A107 += gt[116];
+	m_A107 += gt[117];
+	m_A104 += go[113];
+	m_A103 += go[114];
+	m_A101 += go[115];
+	m_A100 += go[116];
+	m_A102 += go[117];
+	double RHS33 = Idr[113];
+	RHS33 += Idr[114];
+	RHS33 += Idr[115];
+	RHS33 += Idr[116];
+	RHS33 += Idr[117];
+	m_A111 += gt[118];
+	m_A111 += gt[119];
+	m_A111 += gt[120];
+	m_A111 += gt[121];
+	m_A110 += go[118];
+	m_A112 += go[119];
+	double RHS34 = Idr[118];
+	RHS34 += Idr[119];
+	RHS34 += Idr[120];
+	RHS34 += Idr[121];
+	RHS34 -= go[120] * *cnV[120];
+	RHS34 -= go[121] * *cnV[121];
+	m_A117 += gt[122];
+	m_A117 += gt[123];
+	m_A117 += gt[124];
+	m_A117 += gt[125];
+	m_A117 += gt[126];
+	m_A117 += gt[127];
+	m_A113 += go[122];
+	m_A115 += go[123];
+	m_A114 += go[124];
+	m_A119 += go[125];
+	double RHS35 = Idr[122];
+	RHS35 += Idr[123];
+	RHS35 += Idr[124];
+	RHS35 += Idr[125];
+	RHS35 += Idr[126];
+	RHS35 += Idr[127];
+	RHS35 -= go[126] * *cnV[126];
+	RHS35 -= go[127] * *cnV[127];
+	m_A128 += gt[128];
+	m_A128 += gt[129];
+	m_A128 += gt[130];
+	m_A128 += gt[131];
+	m_A128 += gt[132];
+	m_A125 += go[128];
+	m_A122 += go[129];
+	m_A123 += go[130];
+	m_A121 += go[131];
+	m_A120 += go[132];
+	double RHS36 = Idr[128];
+	RHS36 += Idr[129];
+	RHS36 += Idr[130];
+	RHS36 += Idr[131];
+	RHS36 += Idr[132];
+	m_A136 += gt[133];
+	m_A136 += gt[134];
+	m_A136 += gt[135];
+	m_A136 += gt[136];
+	m_A136 += gt[137];
+	m_A130 += go[133];
+	m_A132 += go[134];
+	m_A131 += go[135];
+	m_A134 += go[136];
+	double RHS37 = Idr[133];
+	RHS37 += Idr[134];
+	RHS37 += Idr[135];
+	RHS37 += Idr[136];
+	RHS37 += Idr[137];
+	RHS37 -= go[137] * *cnV[137];
+	m_A148 += gt[138];
+	m_A148 += gt[139];
+	m_A148 += gt[140];
+	m_A148 += gt[141];
+	m_A148 += gt[142];
+	m_A148 += gt[143];
+	m_A148 += gt[144];
+	m_A145 += go[138];
+	m_A140 += go[139];
+	m_A143 += go[140];
+	m_A139 += go[141];
+	m_A138 += go[142];
+	m_A141 += go[143];
+	m_A142 += go[144];
+	double RHS38 = Idr[138];
+	RHS38 += Idr[139];
+	RHS38 += Idr[140];
+	RHS38 += Idr[141];
+	RHS38 += Idr[142];
+	RHS38 += Idr[143];
+	RHS38 += Idr[144];
 	const double f0 = 1.0 / m_A0;
-	const double f0_8 = -f0 * m_A16;
-	m_A20 += m_A1 * f0_8;
-	RHS8 += f0_8 * RHS0;
+	const double f0_20 = -f0 * m_A44;
+	m_A45 += m_A1 * f0_20;
+	RHS20 += f0_20 * RHS0;
+	const double f0_32 = -f0 * m_A93;
+	m_A95 += m_A1 * f0_32;
+	RHS32 += f0_32 * RHS0;
 	const double f1 = 1.0 / m_A2;
-	const double f1_11 = -f1 * m_A26;
-	m_A28 += m_A3 * f1_11;
-	RHS11 += f1_11 * RHS1;
+	const double f1_21 = -f1 * m_A46;
+	m_A48 += m_A3 * f1_21;
+	RHS21 += f1_21 * RHS1;
+	const double f1_32 = -f1 * m_A94;
+	m_A97 += m_A3 * f1_32;
+	RHS32 += f1_32 * RHS1;
 	const double f2 = 1.0 / m_A4;
-	const double f2_12 = -f2 * m_A30;
-	m_A31 += m_A5 * f2_12;
-	RHS12 += f2_12 * RHS2;
+	const double f2_22 = -f2 * m_A49;
+	m_A50 += m_A5 * f2_22;
+	RHS22 += f2_22 * RHS2;
 	const double f3 = 1.0 / m_A6;
-	const double f3_13 = -f3 * m_A33;
-	m_A35 += m_A7 * f3_13;
-	RHS13 += f3_13 * RHS3;
-	const double f3_17 = -f3 * m_A48;
-	m_A52 += m_A7 * f3_17;
-	RHS17 += f3_17 * RHS3;
+	const double f3_37 = -f3 * m_A130;
+	m_A136 += m_A7 * f3_37;
+	RHS37 += f3_37 * RHS3;
 	const double f4 = 1.0 / m_A8;
-	const double f4_13 = -f4 * m_A34;
-	m_A35 += m_A9 * f4_13;
-	RHS13 += f4_13 * RHS4;
+	const double f4_23 = -f4 * m_A55;
+	m_A56 += m_A9 * f4_23;
+	RHS23 += f4_23 * RHS4;
+	const double f4_33 = -f4 * m_A100;
+	m_A103 += m_A9 * f4_33;
+	RHS33 += f4_33 * RHS4;
 	const double f5 = 1.0 / m_A10;
-	const double f5_14 = -f5 * m_A36;
-	m_A38 += m_A11 * f5_14;
-	RHS14 += f5_14 * RHS5;
-	const double f5_18 = -f5 * m_A57;
-	m_A61 += m_A11 * f5_18;
-	RHS18 += f5_18 * RHS5;
+	const double f5_25 = -f5 * m_A60;
+	m_A62 += m_A11 * f5_25;
+	RHS25 += f5_25 * RHS5;
 	const double f6 = 1.0 / m_A12;
-	const double f6_14 = -f6 * m_A37;
-	m_A38 += m_A13 * f6_14;
-	RHS14 += f6_14 * RHS6;
+	const double f6_24 = -f6 * m_A57;
+	m_A59 += m_A13 * f6_24;
+	RHS24 += f6_24 * RHS6;
+	const double f6_33 = -f6 * m_A101;
+	m_A107 += m_A13 * f6_33;
+	RHS33 += f6_33 * RHS6;
 	const double f7 = 1.0 / m_A14;
-	const double f7_17 = -f7 * m_A49;
-	m_A54 += m_A15 * f7_17;
-	RHS17 += f7_17 * RHS7;
-	const double f7_19 = -f7 * m_A67;
-	m_A68 += m_A15 * f7_19;
-	RHS19 += f7_19 * RHS7;
+	const double f7_25 = -f7 * m_A61;
+	m_A63 += m_A15 * f7_25;
+	m_A64 += m_A16 * f7_25;
+	RHS25 += f7_25 * RHS7;
+	const double f7_28 = -f7 * m_A74;
+	m_A77 += m_A15 * f7_28;
+	m_A78 += m_A16 * f7_28;
+	RHS28 += f7_28 * RHS7;
 	const double f8 = 1.0 / m_A17;
-	const double f8_16 = -f8 * m_A42;
-	m_A44 += m_A18 * f8_16;
-	m_A45 += m_A19 * f8_16;
-	m_A47 += m_A20 * f8_16;
-	RHS16 += f8_16 * RHS8;
-	const double f8_17 = -f8 * m_A50;
-	m_A53 += m_A18 * f8_17;
-	m_A54 += m_A19 * f8_17;
-	m_A56 += m_A20 * f8_17;
-	RHS17 += f8_17 * RHS8;
-	const double f9 = 1.0 / m_A21;
-	const double f9_15 = -f9 * m_A39;
-	m_A41 += m_A22 * f9_15;
-	RHS15 += f9_15 * RHS9;
-	const double f9_18 = -f9 * m_A58;
-	m_A65 += m_A22 * f9_18;
-	RHS18 += f9_18 * RHS9;
-	const double f10 = 1.0 / m_A23;
-	const double f10_16 = -f10 * m_A43;
-	m_A44 += m_A24 * f10_16;
-	m_A46 += m_A25 * f10_16;
-	RHS16 += f10_16 * RHS10;
-	const double f10_18 = -f10 * m_A59;
-	m_A63 += m_A24 * f10_18;
-	m_A65 += m_A25 * f10_18;
-	RHS18 += f10_18 * RHS10;
-	const double f11 = 1.0 / m_A27;
-	const double f11_18 = -f11 * m_A60;
-	m_A62 += m_A28 * f11_18;
-	m_A65 += m_A29 * f11_18;
-	RHS18 += f11_18 * RHS11;
-	const double f12 = 1.0 / m_A31;
-	const double f12_17 = -f12 * m_A51;
-	m_A54 += m_A32 * f12_17;
-	RHS17 += f12_17 * RHS12;
-	const double f13 = 1.0 / m_A35;
-	const double f13_17 = -f13 * m_A52;
-	RHS17 += f13_17 * RHS13;
-	const double f14 = 1.0 / m_A38;
-	const double f14_18 = -f14 * m_A61;
-	RHS18 += f14_18 * RHS14;
-	const double f15 = 1.0 / m_A40;
-	const double f15_18 = -f15 * m_A62;
-	m_A65 += m_A41 * f15_18;
-	RHS18 += f15_18 * RHS15;
-	const double f16 = 1.0 / m_A44;
-	const double f16_17 = -f16 * m_A53;
-	m_A54 += m_A45 * f16_17;
-	m_A55 += m_A46 * f16_17;
-	m_A56 += m_A47 * f16_17;
-	RHS17 += f16_17 * RHS16;
-	const double f16_18 = -f16 * m_A63;
-	m_A64 += m_A45 * f16_18;
-	m_A65 += m_A46 * f16_18;
-	m_A66 += m_A47 * f16_18;
-	RHS18 += f16_18 * RHS16;
-	const double f17 = 1.0 / m_A54;
-	const double f17_18 = -f17 * m_A64;
-	m_A65 += m_A55 * f17_18;
-	m_A66 += m_A56 * f17_18;
-	RHS18 += f17_18 * RHS17;
-	const double f17_19 = -f17 * m_A68;
-	m_A69 += m_A55 * f17_19;
-	m_A70 += m_A56 * f17_19;
-	RHS19 += f17_19 * RHS17;
-	const double f18 = 1.0 / m_A65;
-	const double f18_19 = -f18 * m_A69;
-	m_A70 += m_A66 * f18_19;
-	RHS19 += f18_19 * RHS18;
-	V[19] = RHS19 / m_A70;
+	const double f8_28 = -f8 * m_A75;
+	m_A78 += m_A18 * f8_28;
+	RHS28 += f8_28 * RHS8;
+	const double f9 = 1.0 / m_A19;
+	const double f9_27 = -f9 * m_A71;
+	m_A72 += m_A20 * f9_27;
+	RHS27 += f9_27 * RHS9;
+	const double f10 = 1.0 / m_A21;
+	const double f10_28 = -f10 * m_A76;
+	m_A78 += m_A22 * f10_28;
+	RHS28 += f10_28 * RHS10;
+	const double f11 = 1.0 / m_A23;
+	const double f11_35 = -f11 * m_A113;
+	m_A116 += m_A24 * f11_35;
+	RHS35 += f11_35 * RHS11;
+	const double f12 = 1.0 / m_A25;
+	const double f12_29 = -f12 * m_A82;
+	m_A85 += m_A26 * f12_29;
+	RHS29 += f12_29 * RHS12;
+	const double f12_38 = -f12 * m_A138;
+	m_A143 += m_A26 * f12_38;
+	RHS38 += f12_38 * RHS12;
+	const double f13 = 1.0 / m_A27;
+	const double f13_30 = -f13 * m_A86;
+	m_A88 += m_A28 * f13_30;
+	RHS30 += f13_30 * RHS13;
+	const double f14 = 1.0 / m_A29;
+	const double f14_34 = -f14 * m_A110;
+	m_A112 += m_A30 * f14_34;
+	RHS34 += f14_34 * RHS14;
+	const double f14_38 = -f14 * m_A139;
+	m_A148 += m_A30 * f14_38;
+	RHS38 += f14_38 * RHS14;
+	const double f15 = 1.0 / m_A31;
+	const double f15_26 = -f15 * m_A67;
+	m_A69 += m_A32 * f15_26;
+	RHS26 += f15_26 * RHS15;
+	const double f15_36 = -f15 * m_A120;
+	m_A123 += m_A32 * f15_36;
+	RHS36 += f15_36 * RHS15;
+	const double f16 = 1.0 / m_A33;
+	const double f16_26 = -f16 * m_A68;
+	m_A69 += m_A34 * f16_26;
+	m_A70 += m_A35 * f16_26;
+	RHS26 += f16_26 * RHS16;
+	const double f16_29 = -f16 * m_A83;
+	m_A84 += m_A34 * f16_29;
+	m_A85 += m_A35 * f16_29;
+	RHS29 += f16_29 * RHS16;
+	const double f17 = 1.0 / m_A36;
+	const double f17_31 = -f17 * m_A90;
+	m_A92 += m_A37 * f17_31;
+	RHS31 += f17_31 * RHS17;
+	const double f17_36 = -f17 * m_A121;
+	m_A128 += m_A37 * f17_36;
+	RHS36 += f17_36 * RHS17;
+	const double f18 = 1.0 / m_A38;
+	const double f18_35 = -f18 * m_A114;
+	m_A117 += m_A39 * f18_35;
+	m_A119 += m_A40 * f18_35;
+	RHS35 += f18_35 * RHS18;
+	const double f18_38 = -f18 * m_A140;
+	m_A145 += m_A39 * f18_38;
+	m_A148 += m_A40 * f18_38;
+	RHS38 += f18_38 * RHS18;
+	const double f19 = 1.0 / m_A41;
+	const double f19_35 = -f19 * m_A115;
+	m_A117 += m_A42 * f19_35;
+	m_A118 += m_A43 * f19_35;
+	RHS35 += f19_35 * RHS19;
+	const double f19_36 = -f19 * m_A122;
+	m_A127 += m_A42 * f19_36;
+	m_A128 += m_A43 * f19_36;
+	RHS36 += f19_36 * RHS19;
+	const double f20 = 1.0 / m_A45;
+	const double f20_32 = -f20 * m_A95;
+	RHS32 += f20_32 * RHS20;
+	const double f21 = 1.0 / m_A47;
+	const double f21_22 = -f21 * m_A50;
+	m_A52 += m_A48 * f21_22;
+	RHS22 += f21_22 * RHS21;
+	const double f22 = 1.0 / m_A51;
+	const double f22_32 = -f22 * m_A96;
+	m_A97 += m_A52 * f22_32;
+	m_A98 += m_A53 * f22_32;
+	m_A99 += m_A54 * f22_32;
+	RHS32 += f22_32 * RHS22;
+	const double f22_33 = -f22 * m_A102;
+	m_A106 += m_A52 * f22_33;
+	m_A107 += m_A53 * f22_33;
+	m_A108 += m_A54 * f22_33;
+	RHS33 += f22_33 * RHS22;
+	const double f22_37 = -f22 * m_A131;
+	m_A134 += m_A52 * f22_37;
+	m_A135 += m_A53 * f22_37;
+	m_A136 += m_A54 * f22_37;
+	RHS37 += f22_37 * RHS22;
+	const double f23 = 1.0 / m_A56;
+	const double f23_33 = -f23 * m_A103;
+	RHS33 += f23_33 * RHS23;
+	const double f24 = 1.0 / m_A58;
+	const double f24_25 = -f24 * m_A62;
+	m_A65 += m_A59 * f24_25;
+	RHS25 += f24_25 * RHS24;
+	const double f25 = 1.0 / m_A63;
+	const double f25_28 = -f25 * m_A77;
+	m_A78 += m_A64 * f25_28;
+	m_A79 += m_A65 * f25_28;
+	m_A80 += m_A66 * f25_28;
+	RHS28 += f25_28 * RHS25;
+	const double f25_33 = -f25 * m_A104;
+	m_A105 += m_A64 * f25_33;
+	m_A107 += m_A65 * f25_33;
+	m_A108 += m_A66 * f25_33;
+	RHS33 += f25_33 * RHS25;
+	const double f25_37 = -f25 * m_A132;
+	m_A133 += m_A64 * f25_37;
+	m_A135 += m_A65 * f25_37;
+	m_A136 += m_A66 * f25_37;
+	RHS37 += f25_37 * RHS25;
+	const double f26 = 1.0 / m_A69;
+	const double f26_29 = -f26 * m_A84;
+	m_A85 += m_A70 * f26_29;
+	RHS29 += f26_29 * RHS26;
+	const double f26_36 = -f26 * m_A123;
+	m_A124 += m_A70 * f26_36;
+	RHS36 += f26_36 * RHS26;
+	const double f27 = 1.0 / m_A72;
+	const double f27_38 = -f27 * m_A141;
+	m_A148 += m_A73 * f27_38;
+	RHS38 += f27_38 * RHS27;
+	const double f28 = 1.0 / m_A78;
+	const double f28_33 = -f28 * m_A105;
+	m_A107 += m_A79 * f28_33;
+	m_A108 += m_A80 * f28_33;
+	m_A109 += m_A81 * f28_33;
+	RHS33 += f28_33 * RHS28;
+	const double f28_37 = -f28 * m_A133;
+	m_A135 += m_A79 * f28_37;
+	m_A136 += m_A80 * f28_37;
+	m_A137 += m_A81 * f28_37;
+	RHS37 += f28_37 * RHS28;
+	const double f28_38 = -f28 * m_A142;
+	m_A144 += m_A79 * f28_38;
+	m_A147 += m_A80 * f28_38;
+	m_A148 += m_A81 * f28_38;
+	RHS38 += f28_38 * RHS28;
+	const double f29 = 1.0 / m_A85;
+	const double f29_36 = -f29 * m_A124;
+	RHS36 += f29_36 * RHS29;
+	const double f29_38 = -f29 * m_A143;
+	RHS38 += f29_38 * RHS29;
+	const double f30 = 1.0 / m_A87;
+	const double f30_36 = -f30 * m_A125;
+	m_A126 += m_A88 * f30_36;
+	m_A128 += m_A89 * f30_36;
+	RHS36 += f30_36 * RHS30;
+	const double f31 = 1.0 / m_A91;
+	const double f31_36 = -f31 * m_A126;
+	m_A128 += m_A92 * f31_36;
+	RHS36 += f31_36 * RHS31;
+	const double f32 = 1.0 / m_A97;
+	const double f32_33 = -f32 * m_A106;
+	m_A107 += m_A98 * f32_33;
+	m_A108 += m_A99 * f32_33;
+	RHS33 += f32_33 * RHS32;
+	const double f32_37 = -f32 * m_A134;
+	m_A135 += m_A98 * f32_37;
+	m_A136 += m_A99 * f32_37;
+	RHS37 += f32_37 * RHS32;
+	const double f33 = 1.0 / m_A107;
+	const double f33_37 = -f33 * m_A135;
+	m_A136 += m_A108 * f33_37;
+	m_A137 += m_A109 * f33_37;
+	RHS37 += f33_37 * RHS33;
+	const double f33_38 = -f33 * m_A144;
+	m_A147 += m_A108 * f33_38;
+	m_A148 += m_A109 * f33_38;
+	RHS38 += f33_38 * RHS33;
+	const double f34 = 1.0 / m_A111;
+	const double f34_35 = -f34 * m_A116;
+	m_A119 += m_A112 * f34_35;
+	RHS35 += f34_35 * RHS34;
+	const double f35 = 1.0 / m_A117;
+	const double f35_36 = -f35 * m_A127;
+	m_A128 += m_A118 * f35_36;
+	m_A129 += m_A119 * f35_36;
+	RHS36 += f35_36 * RHS35;
+	const double f35_38 = -f35 * m_A145;
+	m_A146 += m_A118 * f35_38;
+	m_A148 += m_A119 * f35_38;
+	RHS38 += f35_38 * RHS35;
+	const double f36 = 1.0 / m_A128;
+	const double f36_38 = -f36 * m_A146;
+	m_A148 += m_A129 * f36_38;
+	RHS38 += f36_38 * RHS36;
+	const double f37 = 1.0 / m_A136;
+	const double f37_38 = -f37 * m_A147;
+	m_A148 += m_A137 * f37_38;
+	RHS38 += f37_38 * RHS37;
+	V[38] = RHS38 / m_A148;
+	double tmp37 = 0.0;
+	tmp37 += m_A137 * V[38];
+	V[37] = (RHS37 - tmp37) / m_A136;
+	double tmp36 = 0.0;
+	tmp36 += m_A129 * V[38];
+	V[36] = (RHS36 - tmp36) / m_A128;
+	double tmp35 = 0.0;
+	tmp35 += m_A118 * V[36];
+	tmp35 += m_A119 * V[38];
+	V[35] = (RHS35 - tmp35) / m_A117;
+	double tmp34 = 0.0;
+	tmp34 += m_A112 * V[38];
+	V[34] = (RHS34 - tmp34) / m_A111;
+	double tmp33 = 0.0;
+	tmp33 += m_A108 * V[37];
+	tmp33 += m_A109 * V[38];
+	V[33] = (RHS33 - tmp33) / m_A107;
+	double tmp32 = 0.0;
+	tmp32 += m_A98 * V[33];
+	tmp32 += m_A99 * V[37];
+	V[32] = (RHS32 - tmp32) / m_A97;
+	double tmp31 = 0.0;
+	tmp31 += m_A92 * V[36];
+	V[31] = (RHS31 - tmp31) / m_A91;
+	double tmp30 = 0.0;
+	tmp30 += m_A88 * V[31];
+	tmp30 += m_A89 * V[36];
+	V[30] = (RHS30 - tmp30) / m_A87;
+	double tmp29 = 0.0;
+	V[29] = (RHS29 - tmp29) / m_A85;
+	double tmp28 = 0.0;
+	tmp28 += m_A79 * V[33];
+	tmp28 += m_A80 * V[37];
+	tmp28 += m_A81 * V[38];
+	V[28] = (RHS28 - tmp28) / m_A78;
+	double tmp27 = 0.0;
+	tmp27 += m_A73 * V[38];
+	V[27] = (RHS27 - tmp27) / m_A72;
+	double tmp26 = 0.0;
+	tmp26 += m_A70 * V[29];
+	V[26] = (RHS26 - tmp26) / m_A69;
+	double tmp25 = 0.0;
+	tmp25 += m_A64 * V[28];
+	tmp25 += m_A65 * V[33];
+	tmp25 += m_A66 * V[37];
+	V[25] = (RHS25 - tmp25) / m_A63;
+	double tmp24 = 0.0;
+	tmp24 += m_A59 * V[33];
+	V[24] = (RHS24 - tmp24) / m_A58;
+	double tmp23 = 0.0;
+	V[23] = (RHS23 - tmp23) / m_A56;
+	double tmp22 = 0.0;
+	tmp22 += m_A52 * V[32];
+	tmp22 += m_A53 * V[33];
+	tmp22 += m_A54 * V[37];
+	V[22] = (RHS22 - tmp22) / m_A51;
+	double tmp21 = 0.0;
+	tmp21 += m_A48 * V[32];
+	V[21] = (RHS21 - tmp21) / m_A47;
+	double tmp20 = 0.0;
+	V[20] = (RHS20 - tmp20) / m_A45;
+	double tmp19 = 0.0;
+	tmp19 += m_A42 * V[35];
+	tmp19 += m_A43 * V[36];
+	V[19] = (RHS19 - tmp19) / m_A41;
 	double tmp18 = 0.0;
-	tmp18 += m_A66 * V[19];
-	V[18] = (RHS18 - tmp18) / m_A65;
+	tmp18 += m_A39 * V[35];
+	tmp18 += m_A40 * V[38];
+	V[18] = (RHS18 - tmp18) / m_A38;
 	double tmp17 = 0.0;
-	tmp17 += m_A55 * V[18];
-	tmp17 += m_A56 * V[19];
-	V[17] = (RHS17 - tmp17) / m_A54;
+	tmp17 += m_A37 * V[36];
+	V[17] = (RHS17 - tmp17) / m_A36;
 	double tmp16 = 0.0;
-	tmp16 += m_A45 * V[17];
-	tmp16 += m_A46 * V[18];
-	tmp16 += m_A47 * V[19];
-	V[16] = (RHS16 - tmp16) / m_A44;
+	tmp16 += m_A34 * V[26];
+	tmp16 += m_A35 * V[29];
+	V[16] = (RHS16 - tmp16) / m_A33;
 	double tmp15 = 0.0;
-	tmp15 += m_A41 * V[18];
-	V[15] = (RHS15 - tmp15) / m_A40;
+	tmp15 += m_A32 * V[26];
+	V[15] = (RHS15 - tmp15) / m_A31;
 	double tmp14 = 0.0;
-	V[14] = (RHS14 - tmp14) / m_A38;
+	tmp14 += m_A30 * V[38];
+	V[14] = (RHS14 - tmp14) / m_A29;
 	double tmp13 = 0.0;
-	V[13] = (RHS13 - tmp13) / m_A35;
+	tmp13 += m_A28 * V[31];
+	V[13] = (RHS13 - tmp13) / m_A27;
 	double tmp12 = 0.0;
-	tmp12 += m_A32 * V[17];
-	V[12] = (RHS12 - tmp12) / m_A31;
+	tmp12 += m_A26 * V[29];
+	V[12] = (RHS12 - tmp12) / m_A25;
 	double tmp11 = 0.0;
-	tmp11 += m_A28 * V[15];
-	tmp11 += m_A29 * V[18];
-	V[11] = (RHS11 - tmp11) / m_A27;
+	tmp11 += m_A24 * V[34];
+	V[11] = (RHS11 - tmp11) / m_A23;
+	double tmp10 = 0.0;
+	tmp10 += m_A22 * V[28];
+	V[10] = (RHS10 - tmp10) / m_A21;
+	double tmp9 = 0.0;
+	tmp9 += m_A20 * V[27];
+	V[9] = (RHS9 - tmp9) / m_A19;
+	double tmp8 = 0.0;
+	tmp8 += m_A18 * V[28];
+	V[8] = (RHS8 - tmp8) / m_A17;
+	double tmp7 = 0.0;
+	tmp7 += m_A15 * V[25];
+	tmp7 += m_A16 * V[28];
+	V[7] = (RHS7 - tmp7) / m_A14;
+	double tmp6 = 0.0;
+	tmp6 += m_A13 * V[33];
+	V[6] = (RHS6 - tmp6) / m_A12;
+	double tmp5 = 0.0;
+	tmp5 += m_A11 * V[24];
+	V[5] = (RHS5 - tmp5) / m_A10;
+	double tmp4 = 0.0;
+	tmp4 += m_A9 * V[23];
+	V[4] = (RHS4 - tmp4) / m_A8;
+	double tmp3 = 0.0;
+	tmp3 += m_A7 * V[37];
+	V[3] = (RHS3 - tmp3) / m_A6;
+	double tmp2 = 0.0;
+	tmp2 += m_A5 * V[21];
+	V[2] = (RHS2 - tmp2) / m_A4;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[32];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[20];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// elim
+static void nl_gcr_fcce97532ad2f49d_18_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A1 += go[0];
+	m_A1 += go[1];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	m_A2 += gt[5];
+	m_A2 += gt[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A4 += go[5];
+	m_A3 += go[6];
+	m_A3 += go[7];
+	double RHS1 = Idr[5];
+	RHS1 += Idr[6];
+	RHS1 += Idr[7];
+	RHS1 += Idr[8];
+	RHS1 -= go[8] * *cnV[8];
+	m_A5 += gt[9];
+	m_A5 += gt[10];
+	m_A5 += gt[11];
+	m_A5 += gt[12];
+	m_A6 += go[9];
+	double RHS2 = Idr[9];
+	RHS2 += Idr[10];
+	RHS2 += Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[10] * *cnV[10];
+	RHS2 -= go[11] * *cnV[11];
+	RHS2 -= go[12] * *cnV[12];
+	m_A7 += gt[13];
+	m_A7 += gt[14];
+	m_A8 += go[13];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 -= go[14] * *cnV[14];
+	m_A11 += gt[15];
+	m_A11 += gt[16];
+	m_A11 += gt[17];
+	m_A11 += gt[18];
+	m_A11 += gt[19];
+	m_A11 += gt[20];
+	m_A11 += gt[21];
+	m_A11 += gt[22];
+	m_A10 += go[15];
+	m_A10 += go[16];
+	m_A9 += go[17];
+	m_A9 += go[18];
+	double RHS4 = Idr[15];
+	RHS4 += Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 += Idr[20];
+	RHS4 += Idr[21];
+	RHS4 += Idr[22];
+	RHS4 -= go[19] * *cnV[19];
+	RHS4 -= go[20] * *cnV[20];
+	RHS4 -= go[21] * *cnV[21];
+	RHS4 -= go[22] * *cnV[22];
+	m_A17 += gt[23];
+	m_A17 += gt[24];
+	m_A17 += gt[25];
+	m_A17 += gt[26];
+	m_A15 += go[23];
+	m_A14 += go[24];
+	m_A13 += go[25];
+	double RHS5 = Idr[23];
+	RHS5 += Idr[24];
+	RHS5 += Idr[25];
+	RHS5 += Idr[26];
+	RHS5 -= go[26] * *cnV[26];
+	const double f0 = 1.0 / m_A0;
+	const double f0_4 = -f0 * m_A9;
+	m_A11 += m_A1 * f0_4;
+	RHS4 += f0_4 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_4 = -f1 * m_A10;
+	m_A11 += m_A3 * f1_4;
+	m_A12 += m_A4 * f1_4;
+	RHS4 += f1_4 * RHS1;
+	const double f1_5 = -f1 * m_A13;
+	m_A16 += m_A3 * f1_5;
+	m_A17 += m_A4 * f1_5;
+	RHS5 += f1_5 * RHS1;
+	const double f2 = 1.0 / m_A5;
+	const double f2_5 = -f2 * m_A14;
+	m_A17 += m_A6 * f2_5;
+	RHS5 += f2_5 * RHS2;
+	const double f3 = 1.0 / m_A7;
+	const double f3_5 = -f3 * m_A15;
+	m_A17 += m_A8 * f3_5;
+	RHS5 += f3_5 * RHS3;
+	const double f4 = 1.0 / m_A11;
+	const double f4_5 = -f4 * m_A16;
+	m_A17 += m_A12 * f4_5;
+	RHS5 += f4_5 * RHS4;
+	V[5] = RHS5 / m_A17;
+	double tmp4 = 0.0;
+	tmp4 += m_A12 * V[5];
+	V[4] = (RHS4 - tmp4) / m_A11;
+	double tmp3 = 0.0;
+	tmp3 += m_A8 * V[5];
+	V[3] = (RHS3 - tmp3) / m_A7;
+	double tmp2 = 0.0;
+	tmp2 += m_A6 * V[5];
+	V[2] = (RHS2 - tmp2) / m_A5;
+	double tmp1 = 0.0;
+	tmp1 += m_A3 * V[4];
+	tmp1 += m_A4 * V[5];
+	V[1] = (RHS1 - tmp1) / m_A2;
+	double tmp0 = 0.0;
+	tmp0 += m_A1 * V[4];
+	V[0] = (RHS0 - tmp0) / m_A0;
+}
+
+// fireone
+static void nl_gcr_fd2796828f1ebd00_36_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+
+{
+
+	plib::unused_var(cnV);
+	double m_A0(0.0);
+	double m_A1(0.0);
+	double m_A2(0.0);
+	double m_A3(0.0);
+	double m_A4(0.0);
+	double m_A5(0.0);
+	double m_A6(0.0);
+	double m_A7(0.0);
+	double m_A8(0.0);
+	double m_A9(0.0);
+	double m_A10(0.0);
+	double m_A11(0.0);
+	double m_A12(0.0);
+	double m_A13(0.0);
+	double m_A14(0.0);
+	double m_A15(0.0);
+	double m_A16(0.0);
+	double m_A17(0.0);
+	double m_A18(0.0);
+	double m_A19(0.0);
+	double m_A20(0.0);
+	double m_A21(0.0);
+	double m_A22(0.0);
+	double m_A23(0.0);
+	double m_A24(0.0);
+	double m_A25(0.0);
+	double m_A26(0.0);
+	double m_A27(0.0);
+	double m_A28(0.0);
+	double m_A29(0.0);
+	double m_A30(0.0);
+	double m_A31(0.0);
+	double m_A32(0.0);
+	double m_A33(0.0);
+	double m_A34(0.0);
+	double m_A35(0.0);
+	m_A0 += gt[0];
+	m_A0 += gt[1];
+	m_A0 += gt[2];
+	m_A0 += gt[3];
+	m_A0 += gt[4];
+	m_A0 += gt[5];
+	m_A0 += gt[6];
+	m_A1 += go[0];
+	double RHS0 = Idr[0];
+	RHS0 += Idr[1];
+	RHS0 += Idr[2];
+	RHS0 += Idr[3];
+	RHS0 += Idr[4];
+	RHS0 += Idr[5];
+	RHS0 += Idr[6];
+	RHS0 -= go[1] * *cnV[1];
+	RHS0 -= go[2] * *cnV[2];
+	RHS0 -= go[3] * *cnV[3];
+	RHS0 -= go[4] * *cnV[4];
+	RHS0 -= go[5] * *cnV[5];
+	RHS0 -= go[6] * *cnV[6];
+	m_A2 += gt[7];
+	m_A2 += gt[8];
+	m_A2 += gt[9];
+	m_A2 += gt[10];
+	m_A3 += go[7];
+	double RHS1 = Idr[7];
+	RHS1 += Idr[8];
+	RHS1 += Idr[9];
+	RHS1 += Idr[10];
+	RHS1 -= go[8] * *cnV[8];
+	RHS1 -= go[9] * *cnV[9];
+	RHS1 -= go[10] * *cnV[10];
+	m_A4 += gt[11];
+	m_A4 += gt[12];
+	m_A5 += go[11];
+	double RHS2 = Idr[11];
+	RHS2 += Idr[12];
+	RHS2 -= go[12] * *cnV[12];
+	m_A6 += gt[13];
+	m_A6 += gt[14];
+	m_A6 += gt[15];
+	m_A7 += go[13];
+	double RHS3 = Idr[13];
+	RHS3 += Idr[14];
+	RHS3 += Idr[15];
+	RHS3 -= go[14] * *cnV[14];
+	RHS3 -= go[15] * *cnV[15];
+	m_A8 += gt[16];
+	m_A8 += gt[17];
+	m_A8 += gt[18];
+	m_A8 += gt[19];
+	m_A9 += go[16];
+	double RHS4 = Idr[16];
+	RHS4 += Idr[17];
+	RHS4 += Idr[18];
+	RHS4 += Idr[19];
+	RHS4 -= go[17] * *cnV[17];
+	RHS4 -= go[18] * *cnV[18];
+	RHS4 -= go[19] * *cnV[19];
+	m_A10 += gt[20];
+	m_A10 += gt[21];
+	m_A11 += go[20];
+	double RHS5 = Idr[20];
+	RHS5 += Idr[21];
+	RHS5 -= go[21] * *cnV[21];
+	m_A13 += gt[22];
+	m_A13 += gt[23];
+	m_A13 += gt[24];
+	m_A14 += go[22];
+	m_A12 += go[23];
+	double RHS6 = Idr[22];
+	RHS6 += Idr[23];
+	RHS6 += Idr[24];
+	RHS6 -= go[24] * *cnV[24];
+	m_A16 += gt[25];
+	m_A16 += gt[26];
+	m_A16 += gt[27];
+	m_A15 += go[25];
+	m_A17 += go[26];
+	double RHS7 = Idr[25];
+	RHS7 += Idr[26];
+	RHS7 += Idr[27];
+	RHS7 -= go[27] * *cnV[27];
+	m_A19 += gt[28];
+	m_A19 += gt[29];
+	m_A19 += gt[30];
+	m_A19 += gt[31];
+	m_A20 += go[28];
+	m_A18 += go[29];
+	double RHS8 = Idr[28];
+	RHS8 += Idr[29];
+	RHS8 += Idr[30];
+	RHS8 += Idr[31];
+	RHS8 -= go[30] * *cnV[30];
+	RHS8 -= go[31] * *cnV[31];
+	m_A24 += gt[32];
+	m_A24 += gt[33];
+	m_A24 += gt[34];
+	m_A24 += gt[35];
+	m_A24 += gt[36];
+	m_A23 += go[32];
+	m_A26 += go[33];
+	m_A25 += go[34];
+	m_A22 += go[35];
+	m_A21 += go[36];
+	double RHS9 = Idr[32];
+	RHS9 += Idr[33];
+	RHS9 += Idr[34];
+	RHS9 += Idr[35];
+	RHS9 += Idr[36];
+	m_A29 += gt[37];
+	m_A29 += gt[38];
+	m_A28 += go[37];
+	m_A27 += go[38];
+	double RHS10 = Idr[37];
+	RHS10 += Idr[38];
+	m_A35 += gt[39];
+	m_A35 += gt[40];
+	m_A35 += gt[41];
+	m_A35 += gt[42];
+	m_A35 += gt[43];
+	m_A30 += go[39];
+	m_A31 += go[40];
+	m_A33 += go[41];
+	double RHS11 = Idr[39];
+	RHS11 += Idr[40];
+	RHS11 += Idr[41];
+	RHS11 += Idr[42];
+	RHS11 += Idr[43];
+	RHS11 -= go[42] * *cnV[42];
+	RHS11 -= go[43] * *cnV[43];
+	const double f0 = 1.0 / m_A0;
+	const double f0_11 = -f0 * m_A30;
+	m_A32 += m_A1 * f0_11;
+	RHS11 += f0_11 * RHS0;
+	const double f1 = 1.0 / m_A2;
+	const double f1_6 = -f1 * m_A12;
+	m_A13 += m_A3 * f1_6;
+	RHS6 += f1_6 * RHS1;
+	const double f2 = 1.0 / m_A4;
+	const double f2_9 = -f2 * m_A21;
+	m_A25 += m_A5 * f2_9;
+	RHS9 += f2_9 * RHS2;
+	const double f2_10 = -f2 * m_A27;
+	m_A29 += m_A5 * f2_10;
+	RHS10 += f2_10 * RHS2;
+	const double f3 = 1.0 / m_A6;
+	const double f3_8 = -f3 * m_A18;
+	m_A20 += m_A7 * f3_8;
+	RHS8 += f3_8 * RHS3;
+	const double f3_9 = -f3 * m_A22;
+	m_A24 += m_A7 * f3_9;
+	RHS9 += f3_9 * RHS3;
+	const double f4 = 1.0 / m_A8;
+	const double f4_7 = -f4 * m_A15;
+	m_A16 += m_A9 * f4_7;
+	RHS7 += f4_7 * RHS4;
+	const double f5 = 1.0 / m_A10;
+	const double f5_9 = -f5 * m_A23;
+	m_A24 += m_A11 * f5_9;
+	RHS9 += f5_9 * RHS5;
+	const double f6 = 1.0 / m_A13;
+	const double f6_10 = -f6 * m_A28;
+	m_A29 += m_A14 * f6_10;
+	RHS10 += f6_10 * RHS6;
+	const double f7 = 1.0 / m_A16;
+	const double f7_11 = -f7 * m_A31;
+	m_A35 += m_A17 * f7_11;
+	RHS11 += f7_11 * RHS7;
+	const double f8 = 1.0 / m_A19;
+	const double f8_11 = -f8 * m_A32;
+	m_A33 += m_A20 * f8_11;
+	RHS11 += f8_11 * RHS8;
+	const double f9 = 1.0 / m_A24;
+	const double f9_11 = -f9 * m_A33;
+	m_A34 += m_A25 * f9_11;
+	m_A35 += m_A26 * f9_11;
+	RHS11 += f9_11 * RHS9;
+	const double f10 = 1.0 / m_A29;
+	const double f10_11 = -f10 * m_A34;
+	RHS11 += f10_11 * RHS10;
+	V[11] = RHS11 / m_A35;
 	double tmp10 = 0.0;
-	tmp10 += m_A24 * V[16];
-	tmp10 += m_A25 * V[18];
-	V[10] = (RHS10 - tmp10) / m_A23;
+	V[10] = (RHS10 - tmp10) / m_A29;
 	double tmp9 = 0.0;
-	tmp9 += m_A22 * V[18];
-	V[9] = (RHS9 - tmp9) / m_A21;
+	tmp9 += m_A25 * V[10];
+	tmp9 += m_A26 * V[11];
+	V[9] = (RHS9 - tmp9) / m_A24;
 	double tmp8 = 0.0;
-	tmp8 += m_A18 * V[16];
-	tmp8 += m_A19 * V[17];
-	tmp8 += m_A20 * V[19];
-	V[8] = (RHS8 - tmp8) / m_A17;
+	tmp8 += m_A20 * V[9];
+	V[8] = (RHS8 - tmp8) / m_A19;
 	double tmp7 = 0.0;
-	tmp7 += m_A15 * V[17];
-	V[7] = (RHS7 - tmp7) / m_A14;
+	tmp7 += m_A17 * V[11];
+	V[7] = (RHS7 - tmp7) / m_A16;
 	double tmp6 = 0.0;
-	tmp6 += m_A13 * V[14];
-	V[6] = (RHS6 - tmp6) / m_A12;
+	tmp6 += m_A14 * V[10];
+	V[6] = (RHS6 - tmp6) / m_A13;
 	double tmp5 = 0.0;
-	tmp5 += m_A11 * V[14];
+	tmp5 += m_A11 * V[9];
 	V[5] = (RHS5 - tmp5) / m_A10;
 	double tmp4 = 0.0;
-	tmp4 += m_A9 * V[13];
+	tmp4 += m_A9 * V[7];
 	V[4] = (RHS4 - tmp4) / m_A8;
 	double tmp3 = 0.0;
-	tmp3 += m_A7 * V[13];
+	tmp3 += m_A7 * V[9];
 	V[3] = (RHS3 - tmp3) / m_A6;
 	double tmp2 = 0.0;
-	tmp2 += m_A5 * V[12];
+	tmp2 += m_A5 * V[10];
 	V[2] = (RHS2 - tmp2) / m_A4;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[15];
+	tmp1 += m_A3 * V[6];
 	V[1] = (RHS1 - tmp1) / m_A2;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[19];
+	tmp0 += m_A1 * V[8];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
-// breakout
-static void nl_gcr_f6a620d52ca4719f_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
+// starfire
+static void nl_gcr_feae15b80dd73620_7_double_double(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV)
 
 {
 
+	plib::unused_var(cnV);
 	double m_A0(0.0);
 	double m_A1(0.0);
 	double m_A2(0.0);
@@ -17916,160 +72366,448 @@
 	m_A0 += gt[0];
 	m_A0 += gt[1];
 	m_A0 += gt[2];
+	m_A0 += gt[3];
 	m_A1 += go[0];
 	double RHS0 = Idr[0];
 	RHS0 += Idr[1];
 	RHS0 += Idr[2];
+	RHS0 += Idr[3];
 	RHS0 -= go[1] * *cnV[1];
 	RHS0 -= go[2] * *cnV[2];
-	m_A2 += gt[3];
-	m_A2 += gt[4];
-	m_A3 += go[3];
-	double RHS1 = Idr[3];
-	RHS1 += Idr[4];
-	RHS1 -= go[4] * *cnV[4];
-	m_A6 += gt[5];
-	m_A6 += gt[6];
-	m_A5 += go[5];
-	m_A4 += go[6];
-	double RHS2 = Idr[5];
-	RHS2 += Idr[6];
+	RHS0 -= go[3] * *cnV[3];
+	m_A3 += gt[4];
+	m_A3 += gt[5];
+	m_A3 += gt[6];
+	m_A2 += go[4];
+	double RHS1 = Idr[4];
+	RHS1 += Idr[5];
+	RHS1 += Idr[6];
+	RHS1 -= go[5] * *cnV[5];
+	RHS1 -= go[6] * *cnV[6];
+	m_A6 += gt[7];
+	m_A6 += gt[8];
+	m_A6 += gt[9];
+	m_A4 += go[7];
+	double RHS2 = Idr[7];
+	RHS2 += Idr[8];
+	RHS2 += Idr[9];
+	RHS2 -= go[8] * *cnV[8];
+	RHS2 -= go[9] * *cnV[9];
 	const double f0 = 1.0 / m_A0;
+	const double f0_1 = -f0 * m_A2;
+	m_A3 += m_A1 * f0_1;
+	RHS1 += f0_1 * RHS0;
 	const double f0_2 = -f0 * m_A4;
-	m_A6 += m_A1 * f0_2;
+	m_A5 += m_A1 * f0_2;
 	RHS2 += f0_2 * RHS0;
-	const double f1 = 1.0 / m_A2;
+	const double f1 = 1.0 / m_A3;
 	const double f1_2 = -f1 * m_A5;
-	m_A6 += m_A3 * f1_2;
 	RHS2 += f1_2 * RHS1;
 	V[2] = RHS2 / m_A6;
 	double tmp1 = 0.0;
-	tmp1 += m_A3 * V[2];
-	V[1] = (RHS1 - tmp1) / m_A2;
+	V[1] = (RHS1 - tmp1) / m_A3;
 	double tmp0 = 0.0;
-	tmp0 += m_A1 * V[2];
+	tmp0 += m_A1 * V[1];
 	V[0] = (RHS0 - tmp0) / m_A0;
 }
 
 extern const plib::dynlib_static_sym nl_static_solver_syms[];
 const plib::dynlib_static_sym nl_static_solver_syms[] = {
-// konami1x
-	{"nl_gcr_105d3ecb773843b6_49_double_double", reinterpret_cast<void *>(&nl_gcr_105d3ecb773843b6_49_double_double)},
-// breakout
-	{"nl_gcr_15a4e7fbe5facb3a_7_double_double", reinterpret_cast<void *>(&nl_gcr_15a4e7fbe5facb3a_7_double_double)},
-// breakout
-	{"nl_gcr_1993cb957e80c097_10_double_double", reinterpret_cast<void *>(&nl_gcr_1993cb957e80c097_10_double_double)},
-// kidniki
-	{"nl_gcr_1cbd5d704f6e93c1_67_double_double", reinterpret_cast<void *>(&nl_gcr_1cbd5d704f6e93c1_67_double_double)},
+// elim
+	{"nl_gcr_11c2ae166b240b6e_10_double_double", reinterpret_cast<void *>(&nl_gcr_11c2ae166b240b6e_10_double_double)},
+// tankbatt
+	{"nl_gcr_124f7aa10f044582_16_double_double", reinterpret_cast<void *>(&nl_gcr_124f7aa10f044582_16_double_double)},
+// armora
+	{"nl_gcr_1250f340dea396ae_22_double_double", reinterpret_cast<void *>(&nl_gcr_1250f340dea396ae_22_double_double)},
+// pongf
+	{"nl_gcr_13e7b5ac1a260dbf_10_double_double", reinterpret_cast<void *>(&nl_gcr_13e7b5ac1a260dbf_10_double_double)},
+// tailg
+	{"nl_gcr_144ed14e6bafdb_119_double_double", reinterpret_cast<void *>(&nl_gcr_144ed14e6bafdb_119_double_double)},
+// spacewar
+	{"nl_gcr_15e8f6fb021de0f9_28_double_double", reinterpret_cast<void *>(&nl_gcr_15e8f6fb021de0f9_28_double_double)},
+// armora
+	{"nl_gcr_1692de755a535408_9_double_double", reinterpret_cast<void *>(&nl_gcr_1692de755a535408_9_double_double)},
+// dpatrol
+	{"nl_gcr_18f4d9160b51d613_20_double_double", reinterpret_cast<void *>(&nl_gcr_18f4d9160b51d613_20_double_double)},
+// starhawk
+	{"nl_gcr_1f1086787c94f97c_40_double_double", reinterpret_cast<void *>(&nl_gcr_1f1086787c94f97c_40_double_double)},
+// zac1b11142
+	{"nl_gcr_1fad5cda2646cf42_30_double_double", reinterpret_cast<void *>(&nl_gcr_1fad5cda2646cf42_30_double_double)},
+// sspeedr
+	{"nl_gcr_2294220d3c91e762_176_double_double", reinterpret_cast<void *>(&nl_gcr_2294220d3c91e762_176_double_double)},
 // 280zzzap
-	{"nl_gcr_20d478ed5597161_123_double_double", reinterpret_cast<void *>(&nl_gcr_20d478ed5597161_123_double_double)},
-// stuntcyc
-	{"nl_gcr_251e2a2e2c8d5b33_20_double_double", reinterpret_cast<void *>(&nl_gcr_251e2a2e2c8d5b33_20_double_double)},
-// cheekyms
-	{"nl_gcr_278f0b40e27b21fc_150_double_double", reinterpret_cast<void *>(&nl_gcr_278f0b40e27b21fc_150_double_double)},
+	{"nl_gcr_24643c159711f292_95_double_double", reinterpret_cast<void *>(&nl_gcr_24643c159711f292_95_double_double)},
 // zac1b11142
-	{"nl_gcr_2b5c86f8653bcde7_12_double_double", reinterpret_cast<void *>(&nl_gcr_2b5c86f8653bcde7_12_double_double)},
-// rebound
-	{"nl_gcr_33a561080717d469_7_double_double", reinterpret_cast<void *>(&nl_gcr_33a561080717d469_7_double_double)},
-// dpatrol
-	{"nl_gcr_390fe6bd5468155d_7_double_double", reinterpret_cast<void *>(&nl_gcr_390fe6bd5468155d_7_double_double)},
+	{"nl_gcr_287a160e7c36b5b0_96_double_double", reinterpret_cast<void *>(&nl_gcr_287a160e7c36b5b0_96_double_double)},
+// elim
+	{"nl_gcr_28b736fe552777a9_45_double_double", reinterpret_cast<void *>(&nl_gcr_28b736fe552777a9_45_double_double)},
 // kidniki
-	{"nl_gcr_445192d0ef3f62c6_21_double_double", reinterpret_cast<void *>(&nl_gcr_445192d0ef3f62c6_21_double_double)},
+	{"nl_gcr_294dde1e0ecca6d0_37_double_double", reinterpret_cast<void *>(&nl_gcr_294dde1e0ecca6d0_37_double_double)},
+// ripoff
+	{"nl_gcr_295cf2e2f3d489bf_12_double_double", reinterpret_cast<void *>(&nl_gcr_295cf2e2f3d489bf_12_double_double)},
+// spacfury
+	{"nl_gcr_2a153513d3e8e2cc_53_double_double", reinterpret_cast<void *>(&nl_gcr_2a153513d3e8e2cc_53_double_double)},
+// boxingb
+	{"nl_gcr_2f84bc98d737730b_22_double_double", reinterpret_cast<void *>(&nl_gcr_2f84bc98d737730b_22_double_double)},
+// astrob
+	{"nl_gcr_30fc51fe03b164cb_178_double_double", reinterpret_cast<void *>(&nl_gcr_30fc51fe03b164cb_178_double_double)},
+// tankbatt
+	{"nl_gcr_328d886b444b586b_137_double_double", reinterpret_cast<void *>(&nl_gcr_328d886b444b586b_137_double_double)},
+// astrob
+	{"nl_gcr_339c6b457f339538_159_double_double", reinterpret_cast<void *>(&nl_gcr_339c6b457f339538_159_double_double)},
+// solarq
+	{"nl_gcr_34e910fc1896999f_76_double_double", reinterpret_cast<void *>(&nl_gcr_34e910fc1896999f_76_double_double)},
+// sspeedr
+	{"nl_gcr_3e833834e5ce5aee_13_double_double", reinterpret_cast<void *>(&nl_gcr_3e833834e5ce5aee_13_double_double)},
+// astrob
+	{"nl_gcr_41c6441d98369158_20_double_double", reinterpret_cast<void *>(&nl_gcr_41c6441d98369158_20_double_double)},
+// warrior
+	{"nl_gcr_42a31ce5c187b308_12_double_double", reinterpret_cast<void *>(&nl_gcr_42a31ce5c187b308_12_double_double)},
+// 280zzzap
+	{"nl_gcr_42c57d523cac30d0_122_double_double", reinterpret_cast<void *>(&nl_gcr_42c57d523cac30d0_122_double_double)},
+// ripoff
+	{"nl_gcr_43188bf576854ae0_10_double_double", reinterpret_cast<void *>(&nl_gcr_43188bf576854ae0_10_double_double)},
+// destroyr
+	{"nl_gcr_4334c95878d1be92_399_double_double", reinterpret_cast<void *>(&nl_gcr_4334c95878d1be92_399_double_double)},
 // kidniki
-	{"nl_gcr_4a06f16ac700a832_198_double_double", reinterpret_cast<void *>(&nl_gcr_4a06f16ac700a832_198_double_double)},
+	{"nl_gcr_43f7ff9bc651cc7a_198_double_double", reinterpret_cast<void *>(&nl_gcr_43f7ff9bc651cc7a_198_double_double)},
+// gamemachine
+	{"nl_gcr_491f95430bfdfd05_19_double_double", reinterpret_cast<void *>(&nl_gcr_491f95430bfdfd05_19_double_double)},
+// sspeedr
+	{"nl_gcr_4a8e2b707bbac8a6_95_double_double", reinterpret_cast<void *>(&nl_gcr_4a8e2b707bbac8a6_95_double_double)},
+// ripoff
+	{"nl_gcr_4b5ecfbb8f9fa97b_29_double_double", reinterpret_cast<void *>(&nl_gcr_4b5ecfbb8f9fa97b_29_double_double)},
 // gtrak10
-	{"nl_gcr_4e48e9f6ef4bfdc4_43_double_double", reinterpret_cast<void *>(&nl_gcr_4e48e9f6ef4bfdc4_43_double_double)},
-// kidniki
-	{"nl_gcr_580e08d22698f60a_37_double_double", reinterpret_cast<void *>(&nl_gcr_580e08d22698f60a_37_double_double)},
-// kidniki
-	{"nl_gcr_58f8065842de37d4_34_double_double", reinterpret_cast<void *>(&nl_gcr_58f8065842de37d4_34_double_double)},
+	{"nl_gcr_4c46fdf7c0037727_43_double_double", reinterpret_cast<void *>(&nl_gcr_4c46fdf7c0037727_43_double_double)},
+// solarq
+	{"nl_gcr_4cb524006206eb1a_25_double_double", reinterpret_cast<void *>(&nl_gcr_4cb524006206eb1a_25_double_double)},
+// spacfury
+	{"nl_gcr_4dbd0f2aec7ef707_110_double_double", reinterpret_cast<void *>(&nl_gcr_4dbd0f2aec7ef707_110_double_double)},
+// solarq
+	{"nl_gcr_4e4931ccbfb7a3c_70_double_double", reinterpret_cast<void *>(&nl_gcr_4e4931ccbfb7a3c_70_double_double)},
+// fireone
+	{"nl_gcr_4f2b2f3cdc384f75_41_double_double", reinterpret_cast<void *>(&nl_gcr_4f2b2f3cdc384f75_41_double_double)},
+// boxingb
+	{"nl_gcr_50f5194a994d56ec_16_double_double", reinterpret_cast<void *>(&nl_gcr_50f5194a994d56ec_16_double_double)},
+// starhawk
+	{"nl_gcr_528a27fe9ed07d67_45_double_double", reinterpret_cast<void *>(&nl_gcr_528a27fe9ed07d67_45_double_double)},
+// astrob
+	{"nl_gcr_536c3652eb3bc075_46_double_double", reinterpret_cast<void *>(&nl_gcr_536c3652eb3bc075_46_double_double)},
+// boxingb
+	{"nl_gcr_53e1117fdb16f546_23_double_double", reinterpret_cast<void *>(&nl_gcr_53e1117fdb16f546_23_double_double)},
+// cheekyms
+	{"nl_gcr_546396f65ce48700_12_double_double", reinterpret_cast<void *>(&nl_gcr_546396f65ce48700_12_double_double)},
+// dpatrol
+	{"nl_gcr_59cb6bf7cb9d17dc_7_double_double", reinterpret_cast<void *>(&nl_gcr_59cb6bf7cb9d17dc_7_double_double)},
 // breakout
-	{"nl_gcr_59095cbc65117534_13_double_double", reinterpret_cast<void *>(&nl_gcr_59095cbc65117534_13_double_double)},
+	{"nl_gcr_5a3419e2809520de_13_double_double", reinterpret_cast<void *>(&nl_gcr_5a3419e2809520de_13_double_double)},
+// segausb
+	{"nl_gcr_5b73834d5f313d38_12_double_double", reinterpret_cast<void *>(&nl_gcr_5b73834d5f313d38_12_double_double)},
+// tailg
+	{"nl_gcr_5ccf7da1202da2e5_31_double_double", reinterpret_cast<void *>(&nl_gcr_5ccf7da1202da2e5_31_double_double)},
+// starcas
+	{"nl_gcr_5d550fc7441617a2_109_double_double", reinterpret_cast<void *>(&nl_gcr_5d550fc7441617a2_109_double_double)},
+// zac1b11142
+	{"nl_gcr_6041272373b8603c_178_double_double", reinterpret_cast<void *>(&nl_gcr_6041272373b8603c_178_double_double)},
+// solarq
+	{"nl_gcr_62612f71055b8fd4_303_double_double", reinterpret_cast<void *>(&nl_gcr_62612f71055b8fd4_303_double_double)},
+// konami1x
+	{"nl_gcr_62b99b9904a8c804_49_double_double", reinterpret_cast<void *>(&nl_gcr_62b99b9904a8c804_49_double_double)},
+// fireone
+	{"nl_gcr_643133e86b2b1628_73_double_double", reinterpret_cast<void *>(&nl_gcr_643133e86b2b1628_73_double_double)},
+// starfire
+	{"nl_gcr_649ebca7fa6793ed_27_double_double", reinterpret_cast<void *>(&nl_gcr_649ebca7fa6793ed_27_double_double)},
+// armora
+	{"nl_gcr_64e460d8f716cd89_58_double_double", reinterpret_cast<void *>(&nl_gcr_64e460d8f716cd89_58_double_double)},
+// flyball
+	{"nl_gcr_6622b53554e3776_291_double_double", reinterpret_cast<void *>(&nl_gcr_6622b53554e3776_291_double_double)},
+// solarq
+	{"nl_gcr_66496d6073aca98e_20_double_double", reinterpret_cast<void *>(&nl_gcr_66496d6073aca98e_20_double_double)},
+// starhawk
+	{"nl_gcr_67838e11f714c455_12_double_double", reinterpret_cast<void *>(&nl_gcr_67838e11f714c455_12_double_double)},
+// ripoff
+	{"nl_gcr_698d5dd47fb16d5_16_double_double", reinterpret_cast<void *>(&nl_gcr_698d5dd47fb16d5_16_double_double)},
+// astrob
+	{"nl_gcr_6c24726f30e8dc34_15_double_double", reinterpret_cast<void *>(&nl_gcr_6c24726f30e8dc34_15_double_double)},
+// spacfury
+	{"nl_gcr_6eae7b15cd376318_43_double_double", reinterpret_cast<void *>(&nl_gcr_6eae7b15cd376318_43_double_double)},
+// barrier
+	{"nl_gcr_6ef39a62161d596c_47_double_double", reinterpret_cast<void *>(&nl_gcr_6ef39a62161d596c_47_double_double)},
+// starhawk
+	{"nl_gcr_723fa454468a93d_7_double_double", reinterpret_cast<void *>(&nl_gcr_723fa454468a93d_7_double_double)},
+// cheekyms
+	{"nl_gcr_733c72a820fdbd1f_7_double_double", reinterpret_cast<void *>(&nl_gcr_733c72a820fdbd1f_7_double_double)},
+// tailg
+	{"nl_gcr_7388106355fb27c3_12_double_double", reinterpret_cast<void *>(&nl_gcr_7388106355fb27c3_12_double_double)},
+// tp1985
+	{"nl_gcr_73f2ba8ad4a45b26_10_double_double", reinterpret_cast<void *>(&nl_gcr_73f2ba8ad4a45b26_10_double_double)},
+// zac1b11142
+	{"nl_gcr_7425594cec8024ad_30_double_double", reinterpret_cast<void *>(&nl_gcr_7425594cec8024ad_30_double_double)},
+// tp1985
+	{"nl_gcr_74349e9889a2630b_7_double_double", reinterpret_cast<void *>(&nl_gcr_74349e9889a2630b_7_double_double)},
+// gunfight
+	{"nl_gcr_743595e64cee0a5e_112_double_double", reinterpret_cast<void *>(&nl_gcr_743595e64cee0a5e_112_double_double)},
+// ripoff
+	{"nl_gcr_76c9e236353caed1_35_double_double", reinterpret_cast<void *>(&nl_gcr_76c9e236353caed1_35_double_double)},
+// gamemachine
+	{"nl_gcr_782d79b5cbe953b1_7_double_double", reinterpret_cast<void *>(&nl_gcr_782d79b5cbe953b1_7_double_double)},
+// barrier
+	{"nl_gcr_79e756c5892cf87d_31_double_double", reinterpret_cast<void *>(&nl_gcr_79e756c5892cf87d_31_double_double)},
 // breakout
-	{"nl_gcr_593686d4c01bf991_31_double_double", reinterpret_cast<void *>(&nl_gcr_593686d4c01bf991_31_double_double)},
+	{"nl_gcr_7a42b97d838ca073_7_double_double", reinterpret_cast<void *>(&nl_gcr_7a42b97d838ca073_7_double_double)},
+// fireone
+	{"nl_gcr_7aee4423e3fdbfda_128_double_double", reinterpret_cast<void *>(&nl_gcr_7aee4423e3fdbfda_128_double_double)},
+// astrob
+	{"nl_gcr_7c86a9bc1c6aef4c_7_double_double", reinterpret_cast<void *>(&nl_gcr_7c86a9bc1c6aef4c_7_double_double)},
+// solarq
+	{"nl_gcr_7caaa135bff3d9f3_15_double_double", reinterpret_cast<void *>(&nl_gcr_7caaa135bff3d9f3_15_double_double)},
+// warrior
+	{"nl_gcr_8003d4625273fa4d_10_double_double", reinterpret_cast<void *>(&nl_gcr_8003d4625273fa4d_10_double_double)},
+// kidniki
+	{"nl_gcr_8046625a0fe0959_21_double_double", reinterpret_cast<void *>(&nl_gcr_8046625a0fe0959_21_double_double)},
+// mario
+	{"nl_gcr_80b4b1e5cc58d303_29_double_double", reinterpret_cast<void *>(&nl_gcr_80b4b1e5cc58d303_29_double_double)},
+// elim
+	{"nl_gcr_81f40a54af2ca202_10_double_double", reinterpret_cast<void *>(&nl_gcr_81f40a54af2ca202_10_double_double)},
+// sundance
+	{"nl_gcr_8446e63d7842f6a6_70_double_double", reinterpret_cast<void *>(&nl_gcr_8446e63d7842f6a6_70_double_double)},
+// dpatrol
+	{"nl_gcr_85652d3e3ada285a_10_double_double", reinterpret_cast<void *>(&nl_gcr_85652d3e3ada285a_10_double_double)},
 // zac1b11142
-	{"nl_gcr_5a632d4741241573_96_double_double", reinterpret_cast<void *>(&nl_gcr_5a632d4741241573_96_double_double)},
+	{"nl_gcr_861d39f81d29d51_12_double_double", reinterpret_cast<void *>(&nl_gcr_861d39f81d29d51_12_double_double)},
 // 280zzzap
-	{"nl_gcr_5af09c93b5cf0788_95_double_double", reinterpret_cast<void *>(&nl_gcr_5af09c93b5cf0788_95_double_double)},
+	{"nl_gcr_864a61c57bac9c38_123_double_double", reinterpret_cast<void *>(&nl_gcr_864a61c57bac9c38_123_double_double)},
 // zac1b11142
-	{"nl_gcr_60352d234249ea57_30_double_double", reinterpret_cast<void *>(&nl_gcr_60352d234249ea57_30_double_double)},
+	{"nl_gcr_87cb2c78a2628efd_7_double_double", reinterpret_cast<void *>(&nl_gcr_87cb2c78a2628efd_7_double_double)},
+// starcas
+	{"nl_gcr_88a8ef5f6bd43d48_12_double_double", reinterpret_cast<void *>(&nl_gcr_88a8ef5f6bd43d48_12_double_double)},
 // breakout
-	{"nl_gcr_655da76624809228_13_double_double", reinterpret_cast<void *>(&nl_gcr_655da76624809228_13_double_double)},
-// cheekyms
-	{"nl_gcr_6d03e64d09c956c3_7_double_double", reinterpret_cast<void *>(&nl_gcr_6d03e64d09c956c3_7_double_double)},
+	{"nl_gcr_8a1565d1413f42f7_31_double_double", reinterpret_cast<void *>(&nl_gcr_8a1565d1413f42f7_31_double_double)},
+// starhawk
+	{"nl_gcr_8b1ac1e181eec3fc_40_double_double", reinterpret_cast<void *>(&nl_gcr_8b1ac1e181eec3fc_40_double_double)},
 // rebound
-	{"nl_gcr_6e17dfd7d26d8933_13_double_double", reinterpret_cast<void *>(&nl_gcr_6e17dfd7d26d8933_13_double_double)},
+	{"nl_gcr_8bec817b324dcc3_28_double_double", reinterpret_cast<void *>(&nl_gcr_8bec817b324dcc3_28_double_double)},
+// cocoloco
+	{"nl_gcr_8c0f7f2284333de5_16_double_double", reinterpret_cast<void *>(&nl_gcr_8c0f7f2284333de5_16_double_double)},
+// spacfury
+	{"nl_gcr_8c1dd4afcf0f8ea2_15_double_double", reinterpret_cast<void *>(&nl_gcr_8c1dd4afcf0f8ea2_15_double_double)},
+// fireone
+	{"nl_gcr_8c512fd6a6dabc50_35_double_double", reinterpret_cast<void *>(&nl_gcr_8c512fd6a6dabc50_35_double_double)},
+// segausb
+	{"nl_gcr_8cc4eb213eaeef9b_30_double_double", reinterpret_cast<void *>(&nl_gcr_8cc4eb213eaeef9b_30_double_double)},
+// starcrus
+	{"nl_gcr_8d7bddf33d942482_129_double_double", reinterpret_cast<void *>(&nl_gcr_8d7bddf33d942482_129_double_double)},
+// tank
+	{"nl_gcr_930b64361c2cdba8_328_double_double", reinterpret_cast<void *>(&nl_gcr_930b64361c2cdba8_328_double_double)},
 // gamemachine
-	{"nl_gcr_70c1124c705dd998_19_double_double", reinterpret_cast<void *>(&nl_gcr_70c1124c705dd998_19_double_double)},
-// cheekyms
-	{"nl_gcr_70f289d5486b9767_7_double_double", reinterpret_cast<void *>(&nl_gcr_70f289d5486b9767_7_double_double)},
-// zac1b11142
-	{"nl_gcr_752680f8e0bc6a4a_7_double_double", reinterpret_cast<void *>(&nl_gcr_752680f8e0bc6a4a_7_double_double)},
-// mario
-	{"nl_gcr_7b9186d9ff77f7a1_29_double_double", reinterpret_cast<void *>(&nl_gcr_7b9186d9ff77f7a1_29_double_double)},
-// cheekyms
-	{"nl_gcr_7e9498276980e5d1_12_double_double", reinterpret_cast<void *>(&nl_gcr_7e9498276980e5d1_12_double_double)},
+	{"nl_gcr_934712b55bb3b2b2_10_double_double", reinterpret_cast<void *>(&nl_gcr_934712b55bb3b2b2_10_double_double)},
 // kidniki
-	{"nl_gcr_80d7c219807268a_24_double_double", reinterpret_cast<void *>(&nl_gcr_80d7c219807268a_24_double_double)},
-// pongf
-	{"nl_gcr_81ae080c83dcf6a4_35_double_double", reinterpret_cast<void *>(&nl_gcr_81ae080c83dcf6a4_35_double_double)},
-// tp1985
-	{"nl_gcr_83fbe835263b28d3_7_double_double", reinterpret_cast<void *>(&nl_gcr_83fbe835263b28d3_7_double_double)},
-// pongf
-	{"nl_gcr_930be1d2f1a52598_10_double_double", reinterpret_cast<void *>(&nl_gcr_930be1d2f1a52598_10_double_double)},
+	{"nl_gcr_9a5874c8e2da79d2_37_double_double", reinterpret_cast<void *>(&nl_gcr_9a5874c8e2da79d2_37_double_double)},
+// fireone
+	{"nl_gcr_9aa159329f86ca8b_70_double_double", reinterpret_cast<void *>(&nl_gcr_9aa159329f86ca8b_70_double_double)},
+// warrior
+	{"nl_gcr_9c975530a1a529d6_7_double_double", reinterpret_cast<void *>(&nl_gcr_9c975530a1a529d6_7_double_double)},
 // kidniki
-	{"nl_gcr_9701e2657a7f4ca3_37_double_double", reinterpret_cast<void *>(&nl_gcr_9701e2657a7f4ca3_37_double_double)},
-// cocoloco
-	{"nl_gcr_97d556b480d72ab7_16_double_double", reinterpret_cast<void *>(&nl_gcr_97d556b480d72ab7_16_double_double)},
-// zac1b11142
-	{"nl_gcr_988a81edfbe45655_30_double_double", reinterpret_cast<void *>(&nl_gcr_988a81edfbe45655_30_double_double)},
-// tp1985
-	{"nl_gcr_99e69c1880e516a7_10_double_double", reinterpret_cast<void *>(&nl_gcr_99e69c1880e516a7_10_double_double)},
+	{"nl_gcr_9f141889c2091efc_24_double_double", reinterpret_cast<void *>(&nl_gcr_9f141889c2091efc_24_double_double)},
+// segas16b_audio
+	{"nl_gcr_9f7104c5e25c87dd_111_double_double", reinterpret_cast<void *>(&nl_gcr_9f7104c5e25c87dd_111_double_double)},
+// boxingb
+	{"nl_gcr_a0bf548977306172_25_double_double", reinterpret_cast<void *>(&nl_gcr_a0bf548977306172_25_double_double)},
+// boxingb
+	{"nl_gcr_a1132c8737d5d463_96_double_double", reinterpret_cast<void *>(&nl_gcr_a1132c8737d5d463_96_double_double)},
+// astrob
+	{"nl_gcr_a41a44bd5c424f88_13_double_double", reinterpret_cast<void *>(&nl_gcr_a41a44bd5c424f88_13_double_double)},
 // tp1985
-	{"nl_gcr_a1806410e32baeb_26_double_double", reinterpret_cast<void *>(&nl_gcr_a1806410e32baeb_26_double_double)},
-// gunfight
-	{"nl_gcr_a479712c277f2ba4_108_double_double", reinterpret_cast<void *>(&nl_gcr_a479712c277f2ba4_108_double_double)},
+	{"nl_gcr_a4540ffea06b4346_26_double_double", reinterpret_cast<void *>(&nl_gcr_a4540ffea06b4346_26_double_double)},
+// tailg
+	{"nl_gcr_a46301cd3479b8db_15_double_double", reinterpret_cast<void *>(&nl_gcr_a46301cd3479b8db_15_double_double)},
+// barrier
+	{"nl_gcr_a50a4b733e95414a_10_double_double", reinterpret_cast<void *>(&nl_gcr_a50a4b733e95414a_10_double_double)},
+// starcas
+	{"nl_gcr_a582a424cb61c678_62_double_double", reinterpret_cast<void *>(&nl_gcr_a582a424cb61c678_62_double_double)},
+// tank
+	{"nl_gcr_a63d1344e34bef4b_36_double_double", reinterpret_cast<void *>(&nl_gcr_a63d1344e34bef4b_36_double_double)},
+// boxingb
+	{"nl_gcr_a6b734322b3ea924_22_double_double", reinterpret_cast<void *>(&nl_gcr_a6b734322b3ea924_22_double_double)},
+// armora
+	{"nl_gcr_a6cfda6668b153c2_22_double_double", reinterpret_cast<void *>(&nl_gcr_a6cfda6668b153c2_22_double_double)},
+// boxingb
+	{"nl_gcr_a6f74be7f61e6db2_29_double_double", reinterpret_cast<void *>(&nl_gcr_a6f74be7f61e6db2_29_double_double)},
+// carpolo
+	{"nl_gcr_a8f1d076330f06b7_34_double_double", reinterpret_cast<void *>(&nl_gcr_a8f1d076330f06b7_34_double_double)},
 // breakout
-	{"nl_gcr_a59b19805d7e4461_7_double_double", reinterpret_cast<void *>(&nl_gcr_a59b19805d7e4461_7_double_double)},
+	{"nl_gcr_a971eeb2ef76f75f_13_double_double", reinterpret_cast<void *>(&nl_gcr_a971eeb2ef76f75f_13_double_double)},
+// ripoff
+	{"nl_gcr_aa07266ef5d420d1_11_double_double", reinterpret_cast<void *>(&nl_gcr_aa07266ef5d420d1_11_double_double)},
 // 280zzzap
-	{"nl_gcr_a716c0b150a52aeb_135_double_double", reinterpret_cast<void *>(&nl_gcr_a716c0b150a52aeb_135_double_double)},
-// 1942
-	{"nl_gcr_b20cee3516465509_90_double_double", reinterpret_cast<void *>(&nl_gcr_b20cee3516465509_90_double_double)},
-// segas16b_audio
-	{"nl_gcr_b71f53c9e7a6b4a9_111_double_double", reinterpret_cast<void *>(&nl_gcr_b71f53c9e7a6b4a9_111_double_double)},
-// 280zzzap
-	{"nl_gcr_bcf0e3af19330ca7_116_double_double", reinterpret_cast<void *>(&nl_gcr_bcf0e3af19330ca7_116_double_double)},
-// 280zzzap
-	{"nl_gcr_caa814c0740131f2_104_double_double", reinterpret_cast<void *>(&nl_gcr_caa814c0740131f2_104_double_double)},
+	{"nl_gcr_ab9144d965a37e4_113_double_double", reinterpret_cast<void *>(&nl_gcr_ab9144d965a37e4_113_double_double)},
+// sspeedr
+	{"nl_gcr_ac1e401ddf971e15_10_double_double", reinterpret_cast<void *>(&nl_gcr_ac1e401ddf971e15_10_double_double)},
+// starfire
+	{"nl_gcr_aceb6035dfb557c9_12_double_double", reinterpret_cast<void *>(&nl_gcr_aceb6035dfb557c9_12_double_double)},
+// sundance
+	{"nl_gcr_ad6dba01ff2425c3_12_double_double", reinterpret_cast<void *>(&nl_gcr_ad6dba01ff2425c3_12_double_double)},
 // rebound
-	{"nl_gcr_cb1d3c28ba315ca6_28_double_double", reinterpret_cast<void *>(&nl_gcr_cb1d3c28ba315ca6_28_double_double)},
+	{"nl_gcr_ae15f7f8a55fc96_7_double_double", reinterpret_cast<void *>(&nl_gcr_ae15f7f8a55fc96_7_double_double)},
+// armora
+	{"nl_gcr_afcde432efdafb81_56_double_double", reinterpret_cast<void *>(&nl_gcr_afcde432efdafb81_56_double_double)},
 // mario
-	{"nl_gcr_cc367a3c6e2f7ec9_62_double_double", reinterpret_cast<void *>(&nl_gcr_cc367a3c6e2f7ec9_62_double_double)},
-// pongf
-	{"nl_gcr_cd4de579d34fc1d9_7_double_double", reinterpret_cast<void *>(&nl_gcr_cd4de579d34fc1d9_7_double_double)},
-// dpatrol
-	{"nl_gcr_cffc52225ebcec8f_20_double_double", reinterpret_cast<void *>(&nl_gcr_cffc52225ebcec8f_20_double_double)},
+	{"nl_gcr_afce66fb47d3c5f3_62_double_double", reinterpret_cast<void *>(&nl_gcr_afce66fb47d3c5f3_62_double_double)},
+// spacewar
+	{"nl_gcr_b09deef9a25aecaf_24_double_double", reinterpret_cast<void *>(&nl_gcr_b09deef9a25aecaf_24_double_double)},
+// spacfury
+	{"nl_gcr_b1db23287df1da54_175_double_double", reinterpret_cast<void *>(&nl_gcr_b1db23287df1da54_175_double_double)},
+// segaspeech
+	{"nl_gcr_b22769fbf3159a8d_21_double_double", reinterpret_cast<void *>(&nl_gcr_b22769fbf3159a8d_21_double_double)},
+// breakout
+	{"nl_gcr_b66ff415b228d5f8_10_double_double", reinterpret_cast<void *>(&nl_gcr_b66ff415b228d5f8_10_double_double)},
+// starcas
+	{"nl_gcr_b7344e05aac90017_65_double_double", reinterpret_cast<void *>(&nl_gcr_b7344e05aac90017_65_double_double)},
+// starfire
+	{"nl_gcr_b75e0baeb501e907_23_double_double", reinterpret_cast<void *>(&nl_gcr_b75e0baeb501e907_23_double_double)},
+// spacfury
+	{"nl_gcr_b7b209d222c0a9a6_91_double_double", reinterpret_cast<void *>(&nl_gcr_b7b209d222c0a9a6_91_double_double)},
+// boxingb
+	{"nl_gcr_b8d6d148a50bdb8f_55_double_double", reinterpret_cast<void *>(&nl_gcr_b8d6d148a50bdb8f_55_double_double)},
+// 280zzzap
+	{"nl_gcr_bb501e6a23177009_57_double_double", reinterpret_cast<void *>(&nl_gcr_bb501e6a23177009_57_double_double)},
+// elim
+	{"nl_gcr_bb56fa5325163fc3_15_double_double", reinterpret_cast<void *>(&nl_gcr_bb56fa5325163fc3_15_double_double)},
+// starfire
+	{"nl_gcr_bd1514d7defd4062_9_double_double", reinterpret_cast<void *>(&nl_gcr_bd1514d7defd4062_9_double_double)},
+// ripoff
+	{"nl_gcr_be7c805100c522fd_59_double_double", reinterpret_cast<void *>(&nl_gcr_be7c805100c522fd_59_double_double)},
+// elim
+	{"nl_gcr_be831e5faa508573_150_double_double", reinterpret_cast<void *>(&nl_gcr_be831e5faa508573_150_double_double)},
+// warrior
+	{"nl_gcr_bff07f8d339f7cc4_89_double_double", reinterpret_cast<void *>(&nl_gcr_bff07f8d339f7cc4_89_double_double)},
+// fireone
+	{"nl_gcr_c1d22fe6e895255d_79_double_double", reinterpret_cast<void *>(&nl_gcr_c1d22fe6e895255d_79_double_double)},
+// starcrus
+	{"nl_gcr_c2e616f3de30f15b_31_double_double", reinterpret_cast<void *>(&nl_gcr_c2e616f3de30f15b_31_double_double)},
+// tailg
+	{"nl_gcr_c4cec7aed23b7b94_23_double_double", reinterpret_cast<void *>(&nl_gcr_c4cec7aed23b7b94_23_double_double)},
+// segausb
+	{"nl_gcr_c61e08cf5e35918_84_double_double", reinterpret_cast<void *>(&nl_gcr_c61e08cf5e35918_84_double_double)},
 // popeye
-	{"nl_gcr_d153cd8a3df26761_50_double_double", reinterpret_cast<void *>(&nl_gcr_d153cd8a3df26761_50_double_double)},
+	{"nl_gcr_c6f25bb06e161d1c_50_double_double", reinterpret_cast<void *>(&nl_gcr_c6f25bb06e161d1c_50_double_double)},
+// flyball
+	{"nl_gcr_c74b1a65978d7121_7_double_double", reinterpret_cast<void *>(&nl_gcr_c74b1a65978d7121_7_double_double)},
+// stuntcyc
+	{"nl_gcr_c924fe5960b1479e_20_double_double", reinterpret_cast<void *>(&nl_gcr_c924fe5960b1479e_20_double_double)},
 // dpatrol
-	{"nl_gcr_d229cf0026955cd3_10_double_double", reinterpret_cast<void *>(&nl_gcr_d229cf0026955cd3_10_double_double)},
-// 280zzzap
-	{"nl_gcr_d5f69adb177fea36_31_double_double", reinterpret_cast<void *>(&nl_gcr_d5f69adb177fea36_31_double_double)},
-// gamemachine
-	{"nl_gcr_ddffc2781d05acf_10_double_double", reinterpret_cast<void *>(&nl_gcr_ddffc2781d05acf_10_double_double)},
-// gamemachine
-	{"nl_gcr_df3a545642cc0a22_7_double_double", reinterpret_cast<void *>(&nl_gcr_df3a545642cc0a22_7_double_double)},
+	{"nl_gcr_ca68d70bd8f2f62e_22_double_double", reinterpret_cast<void *>(&nl_gcr_ca68d70bd8f2f62e_22_double_double)},
+// breakout
+	{"nl_gcr_cb2aae3366e0ac1c_7_double_double", reinterpret_cast<void *>(&nl_gcr_cb2aae3366e0ac1c_7_double_double)},
+// barrier
+	{"nl_gcr_cc913f9c3f9293e7_19_double_double", reinterpret_cast<void *>(&nl_gcr_cc913f9c3f9293e7_19_double_double)},
+// fireone
+	{"nl_gcr_cca3d1a4219e2ec0_153_double_double", reinterpret_cast<void *>(&nl_gcr_cca3d1a4219e2ec0_153_double_double)},
+// 1942
+	{"nl_gcr_ce766957cb26ff3e_90_double_double", reinterpret_cast<void *>(&nl_gcr_ce766957cb26ff3e_90_double_double)},
+// astrob
+	{"nl_gcr_cf1018e7ed626623_43_double_double", reinterpret_cast<void *>(&nl_gcr_cf1018e7ed626623_43_double_double)},
 // zac1b11142
-	{"nl_gcr_e3e057bb1961a530_178_double_double", reinterpret_cast<void *>(&nl_gcr_e3e057bb1961a530_178_double_double)},
+	{"nl_gcr_cfd3bbf5fbba4765_71_double_double", reinterpret_cast<void *>(&nl_gcr_cfd3bbf5fbba4765_71_double_double)},
+// gunfight
+	{"nl_gcr_d05b3dbe370c7904_14_double_double", reinterpret_cast<void *>(&nl_gcr_d05b3dbe370c7904_14_double_double)},
+// barrier
+	{"nl_gcr_d06bd7ddbfd17b5e_15_double_double", reinterpret_cast<void *>(&nl_gcr_d06bd7ddbfd17b5e_15_double_double)},
+// elim
+	{"nl_gcr_d13f9c6838af6aeb_13_double_double", reinterpret_cast<void *>(&nl_gcr_d13f9c6838af6aeb_13_double_double)},
+// elim
+	{"nl_gcr_d190a0e3b8e1f4a7_7_double_double", reinterpret_cast<void *>(&nl_gcr_d190a0e3b8e1f4a7_7_double_double)},
+// elim
+	{"nl_gcr_d224211d1af6811d_12_double_double", reinterpret_cast<void *>(&nl_gcr_d224211d1af6811d_12_double_double)},
+// armora
+	{"nl_gcr_d27a39bc93616187_45_double_double", reinterpret_cast<void *>(&nl_gcr_d27a39bc93616187_45_double_double)},
+// elim
+	{"nl_gcr_d2ea3f267b959e8b_20_double_double", reinterpret_cast<void *>(&nl_gcr_d2ea3f267b959e8b_20_double_double)},
+// starfire
+	{"nl_gcr_d32effa2b0ea54a1_438_double_double", reinterpret_cast<void *>(&nl_gcr_d32effa2b0ea54a1_438_double_double)},
+// spacfury
+	{"nl_gcr_d4c34516ff6aa139_46_double_double", reinterpret_cast<void *>(&nl_gcr_d4c34516ff6aa139_46_double_double)},
+// boxingb
+	{"nl_gcr_d7d45dc58b08cab9_10_double_double", reinterpret_cast<void *>(&nl_gcr_d7d45dc58b08cab9_10_double_double)},
+// kidniki
+	{"nl_gcr_d8c511d38cef5f6f_34_double_double", reinterpret_cast<void *>(&nl_gcr_d8c511d38cef5f6f_34_double_double)},
+// warrior
+	{"nl_gcr_da598f43329e823_27_double_double", reinterpret_cast<void *>(&nl_gcr_da598f43329e823_27_double_double)},
+// pongf
+	{"nl_gcr_dbafc5ddaf7a08f8_35_double_double", reinterpret_cast<void *>(&nl_gcr_dbafc5ddaf7a08f8_35_double_double)},
+// fireone
+	{"nl_gcr_dcbecbc127c5868f_36_double_double", reinterpret_cast<void *>(&nl_gcr_dcbecbc127c5868f_36_double_double)},
+// sundance
+	{"nl_gcr_e02a162cb515a958_100_double_double", reinterpret_cast<void *>(&nl_gcr_e02a162cb515a958_100_double_double)},
+// speedfrk
+	{"nl_gcr_e07b5b086812756c_7_double_double", reinterpret_cast<void *>(&nl_gcr_e07b5b086812756c_7_double_double)},
+// solarq
+	{"nl_gcr_e081f90c2e0313f6_45_double_double", reinterpret_cast<void *>(&nl_gcr_e081f90c2e0313f6_45_double_double)},
+// spacewar
+	{"nl_gcr_e0b492db40bba291_20_double_double", reinterpret_cast<void *>(&nl_gcr_e0b492db40bba291_20_double_double)},
+// flyball
+	{"nl_gcr_e15d9316d59cdad9_7_double_double", reinterpret_cast<void *>(&nl_gcr_e15d9316d59cdad9_7_double_double)},
+// speedfrk
+	{"nl_gcr_e4f2ffbf201a3d0c_37_double_double", reinterpret_cast<void *>(&nl_gcr_e4f2ffbf201a3d0c_37_double_double)},
+// pongf
+	{"nl_gcr_e51b463cd890ef6d_7_double_double", reinterpret_cast<void *>(&nl_gcr_e51b463cd890ef6d_7_double_double)},
+// sundance
+	{"nl_gcr_e5b7711fac1ea80c_8_double_double", reinterpret_cast<void *>(&nl_gcr_e5b7711fac1ea80c_8_double_double)},
+// ripoff
+	{"nl_gcr_e60314070a75e121_20_double_double", reinterpret_cast<void *>(&nl_gcr_e60314070a75e121_20_double_double)},
+// cheekyms
+	{"nl_gcr_e75302e17c866419_150_double_double", reinterpret_cast<void *>(&nl_gcr_e75302e17c866419_150_double_double)},
+// elim
+	{"nl_gcr_e76692c10e79997e_36_double_double", reinterpret_cast<void *>(&nl_gcr_e76692c10e79997e_36_double_double)},
+// fireone
+	{"nl_gcr_e7fb484f621b3ab9_7_double_double", reinterpret_cast<void *>(&nl_gcr_e7fb484f621b3ab9_7_double_double)},
+// elim
+	{"nl_gcr_e8aeb165b69427ec_18_double_double", reinterpret_cast<void *>(&nl_gcr_e8aeb165b69427ec_18_double_double)},
+// spacewar
+	{"nl_gcr_e9e8211f43d8f4b3_22_double_double", reinterpret_cast<void *>(&nl_gcr_e9e8211f43d8f4b3_22_double_double)},
+// boxingb
+	{"nl_gcr_ea2b6e3a05e6ef0b_23_double_double", reinterpret_cast<void *>(&nl_gcr_ea2b6e3a05e6ef0b_23_double_double)},
+// starcas
+	{"nl_gcr_ec4f6d2dad5961b9_64_double_double", reinterpret_cast<void *>(&nl_gcr_ec4f6d2dad5961b9_64_double_double)},
+// barrier
+	{"nl_gcr_ecf17036ce1c07cf_10_double_double", reinterpret_cast<void *>(&nl_gcr_ecf17036ce1c07cf_10_double_double)},
+// armora
+	{"nl_gcr_ee2cacaa15d32491_67_double_double", reinterpret_cast<void *>(&nl_gcr_ee2cacaa15d32491_67_double_double)},
+// astrob
+	{"nl_gcr_ee61dcaa355fc625_285_double_double", reinterpret_cast<void *>(&nl_gcr_ee61dcaa355fc625_285_double_double)},
+// starcrus
+	{"nl_gcr_ef2f49641f433a74_94_double_double", reinterpret_cast<void *>(&nl_gcr_ef2f49641f433a74_94_double_double)},
+// astrob
+	{"nl_gcr_efd052e6829c33e_9_double_double", reinterpret_cast<void *>(&nl_gcr_efd052e6829c33e_9_double_double)},
+// spacfury
+	{"nl_gcr_f365c3863b050e35_45_double_double", reinterpret_cast<void *>(&nl_gcr_f365c3863b050e35_45_double_double)},
+// spacfury
+	{"nl_gcr_f3c9a6d53371d709_227_double_double", reinterpret_cast<void *>(&nl_gcr_f3c9a6d53371d709_227_double_double)},
+// barrier
+	{"nl_gcr_f425d4008ae1d2c6_13_double_double", reinterpret_cast<void *>(&nl_gcr_f425d4008ae1d2c6_13_double_double)},
+// boxingb
+	{"nl_gcr_f43cf2a28a5a5561_23_double_double", reinterpret_cast<void *>(&nl_gcr_f43cf2a28a5a5561_23_double_double)},
+// spacfury
+	{"nl_gcr_f4da1503eabe16cf_16_double_double", reinterpret_cast<void *>(&nl_gcr_f4da1503eabe16cf_16_double_double)},
+// elim
+	{"nl_gcr_f4f4e2ee05cb584e_13_double_double", reinterpret_cast<void *>(&nl_gcr_f4f4e2ee05cb584e_13_double_double)},
 // konami2x
-	{"nl_gcr_e4c54910436826d1_85_double_double", reinterpret_cast<void *>(&nl_gcr_e4c54910436826d1_85_double_double)},
-// 280zzzap
-	{"nl_gcr_eb8f99b7d033585a_57_double_double", reinterpret_cast<void *>(&nl_gcr_eb8f99b7d033585a_57_double_double)},
-// dpatrol
-	{"nl_gcr_ef9b40abd2bf582c_22_double_double", reinterpret_cast<void *>(&nl_gcr_ef9b40abd2bf582c_22_double_double)},
-// zac1b11142
-	{"nl_gcr_f0a19b84f91ff24f_71_double_double", reinterpret_cast<void *>(&nl_gcr_f0a19b84f91ff24f_71_double_double)},
+	{"nl_gcr_f6900d3f36a91049_85_double_double", reinterpret_cast<void *>(&nl_gcr_f6900d3f36a91049_85_double_double)},
 // breakout
-	{"nl_gcr_f6a620d52ca4719f_7_double_double", reinterpret_cast<void *>(&nl_gcr_f6a620d52ca4719f_7_double_double)},
+	{"nl_gcr_f7dc4f87b5a8ba93_7_double_double", reinterpret_cast<void *>(&nl_gcr_f7dc4f87b5a8ba93_7_double_double)},
+// fireone
+	{"nl_gcr_f8f6a951fd1af6bc_7_double_double", reinterpret_cast<void *>(&nl_gcr_f8f6a951fd1af6bc_7_double_double)},
+// zektor
+	{"nl_gcr_fbff020f5f5d5a5_144_double_double", reinterpret_cast<void *>(&nl_gcr_fbff020f5f5d5a5_144_double_double)},
+// kidniki
+	{"nl_gcr_fc02559fdbfb0e10_67_double_double", reinterpret_cast<void *>(&nl_gcr_fc02559fdbfb0e10_67_double_double)},
+// 280zzzap
+	{"nl_gcr_fc9971724787b82b_149_double_double", reinterpret_cast<void *>(&nl_gcr_fc9971724787b82b_149_double_double)},
+// elim
+	{"nl_gcr_fcce97532ad2f49d_18_double_double", reinterpret_cast<void *>(&nl_gcr_fcce97532ad2f49d_18_double_double)},
+// fireone
+	{"nl_gcr_fd2796828f1ebd00_36_double_double", reinterpret_cast<void *>(&nl_gcr_fd2796828f1ebd00_36_double_double)},
+// starfire
+	{"nl_gcr_feae15b80dd73620_7_double_double", reinterpret_cast<void *>(&nl_gcr_feae15b80dd73620_7_double_double)},
 {"", nullptr}
 };
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_base.cpp mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_base.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_base.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_base.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,126 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-#include "netlist/nl_setup.h"
-#include "netlist/devices/net_lib.h"
-#include "nlm_base.h"
-
-/* ----------------------------------------------------------------------------
- *  Diode Models
- * ---------------------------------------------------------------------------*/
-
-static NETLIST_START(diode_models)
-	NET_MODEL("D _(IS=1e-15 N=1 NBV=3 IBV=0.001 BV=1E9)")
-
-	NET_MODEL("1N914 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)")
-	// FIXME: 1N916 currently only a copy of 1N914!
-	NET_MODEL("1N916 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)")
-	NET_MODEL("1N4001 D(Is=14.11n N=1.984 Rs=33.89m Ikf=94.81 Xti=3 Eg=1.11 Cjo=25.89p M=.44 Vj=.3245 Fc=.5 Bv=75 Ibv=10u Tt=5.7u Iave=1 Vpk=50 mfg=GI type=silicon)")
-	NET_MODEL("1N4148 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)")
-	NET_MODEL("1S1588 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75)")
-
-	NET_MODEL("1N34A D( Bv=75 Cjo=0.5e-12 Eg=0.67 Ibv=18e-3 Is=2e-7 Rs=7 N=1.3 Vj=0.1 M=0.27 type=germanium)")
-
-	NET_MODEL("LedRed D(IS=93.2p RS=42M N=3.73 BV=4 IBV=10U CJO=2.97P VJ=.75 M=.333 TT=4.32U Iave=40m Vpk=4 type=LED)")
-	NET_MODEL("LedGreen D(IS=93.2p RS=42M N=4.61 BV=4 IBV=10U CJO=2.97P VJ=.75 M=.333 TT=4.32U Iave=40m Vpk=4 type=LED)")
-	NET_MODEL("LedBlue D(IS=93.2p RS=42M N=7.47 BV=5 IBV=10U CJO=2.97P VJ=.75 M=.333 TT=4.32U Iave=40m Vpk=5 type=LED)")
-	NET_MODEL("LedWhite D(Is=0.27n Rs=5.65 N=6.79 Cjo=42p Iave=30m Vpk=5 type=LED)")
-
-NETLIST_END()
-
-/* ----------------------------------------------------------------------------
- *  Mosfet Models
- * ---------------------------------------------------------------------------*/
-
-static NETLIST_START(mosfet_models)
-	//NET_MODEL("NMOS _(VTO=0.0 N=1.0 IS=1E-14 KP=2E-5 UO=600 PHI=0.6 LD=0.0 L=1.0 TOX=1E-7 W=1.0 NSUB=0.0 GAMMA=0.0 RD=0.0 RS=0.0 LAMBDA=0.0)")
-	//NET_MODEL("PMOS _(VTO=0.0 N=1.0 IS=1E-14 KP=2E-5 UO=600 PHI=0.6 LD=0.0 L=1.0 TOX=1E-7 W=1.0 NSUB=0.0 GAMMA=0.0 RD=0.0 RS=0.0 LAMBDA=0.0)")
-
-	// NMOS_DEFAULT and PMOS_DEFAULT are created in nl_setup.cpp
-	NET_MODEL("NMOS NMOS_DEFAULT(VTO=0.0 N=1.0 IS=1E-14 KP=0.0 UO=600 PHI=0.0 LD=0.0 L=100e-6 TOX=1E-7 W=100e-6 NSUB=0.0 GAMMA=0.0 RD=0.0 RS=0.0 LAMBDA=0.0 CGSO=0 CGDO=0 CGBO=0)")
-	NET_MODEL("PMOS PMOS_DEFAULT(VTO=0.0 N=1.0 IS=1E-14 KP=0.0 UO=600 PHI=0.0 LD=0.0 L=100e-6 TOX=1E-7 W=100e-6 NSUB=0.0 GAMMA=0.0 RD=0.0 RS=0.0 LAMBDA=0.0 CGSO=0 CGDO=0 CGBO=0)")
-NETLIST_END()
-
-/* ----------------------------------------------------------------------------
- *  BJT Models
- * ---------------------------------------------------------------------------*/
-
-static NETLIST_START(bjt_models)
-	NET_MODEL("NPN _(IS=1e-15 BF=100 NF=1 BR=1 NR=1 CJE=0 CJC=0)")
-	NET_MODEL("PNP _(IS=1e-15 BF=100 NF=1 BR=1 NR=1 CJE=0 CJC=0)")
-
-	NET_MODEL("2SA1015 PNP(Is=295.1E-18 Xti=3 Eg=1.11 Vaf=100 Bf=110 Xtb=1.5 Br=10.45 Rc=15 Cjc=66.2p Mjc=1.054 Vjc=.75 Fc=.5 Cje=5p Mje=.3333 Vje=.75 Tr=10n Tf=1.661n VCEO=45V ICrating=150M MFG=Toshiba)")
-	NET_MODEL("2SC1815 NPN(Is=2.04f Xti=3 Eg=1.11 Vaf=6 Bf=400 Ikf=20m Xtb=1.5 Br=3.377 Rc=1 Cjc=1p Mjc=.3333 Vjc=.75 Fc=.5 Cje=25p Mje=.3333 Vje=.75 Tr=450n Tf=20n Itf=0 Vtf=0 Xtf=0 VCEO=45V ICrating=150M MFG=Toshiba)")
-
-	NET_MODEL("2N3565 NPN(IS=5.911E-15 ISE=5.911E-15 ISC=0 XTI=3 BF=697.1 BR=1.297 IKF=0.01393 IKR=0 XTB=1.5 VAF=62.37 VAR=21.5 VJE=0.65 VJC=0.65 RE=0.15 RC=1.61 RB=10 CJE=4.973E-12 CJC=4.017E-12 XCJC=0.75 FC=0.5 NF=1 NR=1 NE=1.342 NC=2 MJE=0.4146 MJC=0.3174 TF=820.4E-12 TR=4.687E-9 ITF=0.35 VTF=4 XTF=7 EG=1.11 KF=1E-9 AF=1 VCEO=25 ICRATING=500m MFG=NSC)")
-	NET_MODEL("2N3643 NPN(IS=14.34E-15 ISE=14.34E-15 ISC=0 XTI=3 BF=255.9 BR=6.092 IKF=0.2847 IKR=0 XTB=1.5 VAF=74.03 VAR=28 VJE=0.65 VJC=0.65 RE=0.1 RC=1 RB=10 CJE=22.01E-12 CJC=7.306E-12 XCJC=0.75 FC=0.5 NF=1 NR=1 NE=1.307 NC=2 MJE=0.377 MJC=0.3416 TF=411.1E-12 TR=46.91E-9 ITF=0.6 VTF=1.7 XTF=3 EG=1.11 KF=0 AF=1 VCEO=30 ICRATING=500m MFG=NSC)")
-	NET_MODEL("2N3645 PNP(IS=650.6E-18 ISE=54.81E-15 ISC=0 XTI=3 BF=231.7 BR=3.563 IKF=1.079 IKR=0 XTB=1.5 VAF=115.7 VAR=35 VJE=0.65 VJC=0.65 RE=0.15 RC=0.715 RB=10 CJE=19.82E-12 CJC=14.76E-12 XCJC=0.75 FC=0.5 NF=1 NR=1 NE=1.829 NC=2 MJE=0.3357 MJC=0.5383 TF=603.7E-12 TR=111.3E-9 ITF=0.65 VTF=5 XTF=1.7 EG=1.11 KF=0 AF=1 VCEO=60 ICRATING=500m MFG=NSC)")
-	// 3644 = 3645 Difference between 3644 and 3645 is voltage rating. 3644: VCBO=45, 3645: VCBO=60
-	NET_MODEL("2N3644 PNP(IS=650.6E-18 ISE=54.81E-15 ISC=0 XTI=3 BF=231.7 BR=3.563 IKF=1.079 IKR=0 XTB=1.5 VAF=115.7 VAR=35 VJE=0.65 VJC=0.65 RE=0.15 RC=0.715 RB=10 CJE=19.82E-12 CJC=14.76E-12 XCJC=0.75 FC=0.5 NF=1 NR=1 NE=1.829 NC=2 MJE=0.3357 MJC=0.5383 TF=603.7E-12 TR=111.3E-9 ITF=0.65 VTF=5 XTF=1.7 EG=1.11 KF=0 AF=1 VCEO=60 ICRATING=500m MFG=NSC)")
-	// 2N5190 = BC817-25
-	NET_MODEL("2N5190 NPN(IS=9.198E-14 NF=1.003 ISE=4.468E-16 NE=1.65 BF=338.8 IKF=0.4913 VAF=107.9 NR=1.002 ISC=5.109E-15 NC=1.071 BR=29.48 IKR=0.193 VAR=25 RB=1 IRB=1000 RBM=1 RE=0.2126 RC=0.143 XTB=0 EG=1.11 XTI=3 CJE=3.825E-11 VJE=0.7004 MJE=0.364 TF=5.229E-10 XTF=219.7 VTF=3.502 ITF=7.257 PTF=0 CJC=1.27E-11 VJC=0.4431 MJC=0.3983 XCJC=0.4555 TR=7E-11 CJS=0 VJS=0.75 MJS=0.333 FC=0.905 Vceo=45 Icrating=500m mfg=Philips)")
-
-	NET_MODEL("2N4401 NPN(IS=26.03f XTI=3 EG=1.11 VAF=90.7 BF=4.292K NE=1.244 ISE=26.03f IKF=0.2061 XTB=1.5 BR=1.01 NC=2 ISC=0 IKR=0 RC=0.5 CJC=11.01p MJC=0.3763 VJC=0.75 FC=0.5 CJE=24.07p MJE=0.3641 VJE=0.75 TR=233.7n TF=466.5p ITF=0 VTF=0 XTF=0 RB=10 VCEO=40)")
-	NET_MODEL("2SC945 NPN(IS=3.577E-14 BF=2.382E+02 NF=1.01 VAF=1.206E+02 IKF=3.332E-01 ISE=3.038E-16 NE=1.205 BR=1.289E+01 NR=1.015 VAR=1.533E+01 IKR=2.037E-01 ISC=3.972E-14 NC=1.115 RB=3.680E+01 IRB=1.004E-04 RBM=1 RE=8.338E-01 RC=1.557E+00 CJE=1.877E-11 VJE=7.211E-01 MJE=3.486E-01 TF=4.149E-10 XTF=1.000E+02 VTF=9.956 ITF=5.118E-01 PTF=0 CJC=6.876p VJC=3.645E-01 MJC=3.074E-01 TR=5.145E-08 XTB=1.5 EG=1.11 XTI=3 FC=0.5 Vceo=50 Icrating=100m MFG=NEC)")
-
-	NET_MODEL("BC237B NPN(IS=1.8E-14 ISE=5.0E-14 ISC=1.72E-13 XTI=3 BF=400 BR=35.5 IKF=0.14 IKR=0.03 XTB=1.5 VAF=80 VAR=12.5 VJE=0.58 VJC=0.54 RE=0.6 RC=0.25 RB=0.56 CJE=13E-12 CJC=4E-12 XCJC=0.75 FC=0.5 NF=0.9955 NR=1.005 NE=1.46 NC=1.27 MJE=0.33 MJC=0.33 TF=0.64E-9 TR=50.72E-9 EG=1.11 KF=0 AF=1 VCEO=45 ICRATING=100M MFG=ZETEX)")
-	NET_MODEL("BC556B PNP(IS=3.83E-14 NF=1.008 ISE=1.22E-14 NE=1.528 BF=344.4 IKF=0.08039 VAF=21.11 NR=1.005 ISC=2.85E-13 NC=1.28 BR=14.84 IKR=0.047 VAR=32.02 RB=1 IRB=1.00E-06 RBM=1 RE=0.6202 RC=0.5713 XTB=0 EG=1.11 XTI=3 CJE=1.23E-11 VJE=0.6106 MJE=0.378 TF=5.60E-10 XTF=3.414 VTF=5.23 ITF=0.1483 PTF=0 CJC=1.08E-11 VJC=0.1022 MJC=0.3563 XCJC=0.6288 TR=1.00E-32 CJS=0 VJS=0.75 MJS=0.333 FC=0.8027 Vceo=65 Icrating=100m mfg=Philips)")
-	NET_MODEL("BC548C NPN(IS=1.95E-14 ISE=1.31E-15 ISC=1.0E-13 XTI=3 BF=466 BR=2.42 IKF=0.18 IKR=1 XTB=1.5 VAF=91.7 VAR=24.7 VJE=0.632 VJC=0.339 RE=1 RC=1.73 RB=26.5 RBM=10 IRB=10 CJE=1.33E-11 CJC=5.17E-12 XCJC=1 FC=0.9 NF=0.993 NR=1.2 NE=1.32 NC=2.00 MJE=0.326 MJC=0.319 TF=6.52E-10 TR=0 PTF=0 ITF=1.03 VTF=1.65 XTF=100 EG=1.11 KF=1E-9 AF=1 VCEO=40 ICrating=800M MFG=Siemens)")
-	NET_MODEL("BC817-25 NPN(IS=9.198E-14 NF=1.003 ISE=4.468E-16 NE=1.65 BF=338.8 IKF=0.4913 VAF=107.9 NR=1.002 ISC=5.109E-15 NC=1.071 BR=29.48 IKR=0.193 VAR=25 RB=1 IRB=1000 RBM=1 RE=0.2126 RC=0.143 XTB=0 EG=1.11 XTI=3 CJE=3.825E-11 VJE=0.7004 MJE=0.364 TF=5.229E-10 XTF=219.7 VTF=3.502 ITF=7.257 PTF=0 CJC=1.27E-11 VJC=0.4431 MJC=0.3983 XCJC=0.4555 TR=7E-11 CJS=0 VJS=0.75 MJS=0.333 FC=0.905 Vceo=45 Icrating=500m mfg=Philips)")
-
-	NET_MODEL("9013 NPN(IS=3.40675E-14 BF=166 VAF=67 IKF=1.164 ISE=12.37e-15 NE=2 BR=15.17 VAR=40.84 IKR=0.261352 ISC=1.905E-15 NC=1.066 RB=63.2 IRB=5.62E-6 RBM=22.1 RE=0.02 RC=0.7426 CJE=3.53E-11 VJE=0.808 MJE=0.372 CJC=1.74E-11 VJC=0.614 MJC=0.388 XCJC=0.349 XTB=1.4025 EG=1.0999 XTI=3 VC=0.5 VCEO=20)")
-NETLIST_END()
-
-/* ----------------------------------------------------------------------------
- *  Family models
- * ---------------------------------------------------------------------------*/
-
-static NETLIST_START(family_models)
-
-	// FAMILIES always need a type. UNKNOWN below will break
-	NET_MODEL("FAMILY _(TYPE=UNKNOWN IVL=0.16 IVH=0.4 OVL=0.1 OVH=1.0 ORL=1.0 ORH=130.0)")
-	NET_MODEL("OPAMP _()")
-	NET_MODEL("SCHMITT_TRIGGER _()")
-
-	NET_MODEL("74XX FAMILY(TYPE=TTL IVL=0.16 IVH=0.4 OVL=0.1 OVH=1.0 ORL=1.0 ORH=130)")
-
-	// CMOS
-	// low input 1.5 , high input trigger 3.5 at 5V supply
-	// output offsets, low for CMOS, thus 0.05
-	// output currents: see https://www.classe.cornell.edu/~ib38/teaching/p360/lectures/wk09/l26/EE2301Exp3F10.pdf
-	// typical CMOS may sink 0.4mA while output stays <= 0.4V
-	NET_MODEL("CD4XXX FAMILY(TYPE=CMOS IVL=0.3 IVH=0.7 OVL=0.05 OVH=0.05 ORL=500 ORH=500)")
-
-	NET_MODEL("74XXOC FAMILY(TYPE=TTL IVL=0.16 IVH=0.4 OVL=0.1 OVH=0.05 ORL=10.0 ORH=1.0e8)")
-NETLIST_END()
-
-/* ----------------------------------------------------------------------------
- *  Always included
- * ---------------------------------------------------------------------------*/
-
-NETLIST_START(base)
-	NET_REGISTER_DEV(GNDA, GND)
-	NET_REGISTER_DEV(PARAMETER, NETLIST)
-
-	LOCAL_SOURCE(diode_models)
-	LOCAL_SOURCE(bjt_models)
-	LOCAL_SOURCE(mosfet_models)
-	LOCAL_SOURCE(family_models)
-
-	LOCAL_SOURCE(TTL74XX_lib)
-	LOCAL_SOURCE(CD4XXX_lib)
-	LOCAL_SOURCE(OPAMP_lib)
-	LOCAL_SOURCE(otheric_lib)
-	LOCAL_SOURCE(ROMS_lib)
-
-	INCLUDE(diode_models)
-	INCLUDE(bjt_models)
-	INCLUDE(mosfet_models)
-	INCLUDE(family_models)
-	INCLUDE(TTL74XX_lib)
-	INCLUDE(CD4XXX_lib)
-	INCLUDE(OPAMP_lib)
-	INCLUDE(otheric_lib)
-	INCLUDE(ROMS_lib)
-
-NETLIST_END()
-
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_base.h mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_base.h
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_base.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_base.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-#ifndef NLM_BASE_H_
-#define NLM_BASE_H_
-
-/// \file nlm_base.h
-///
-
-/*
- * Provide base environment for netlist
- *
- */
-
-#ifndef __PLIB_PREPROCESSOR__
-
-#include "netlist/nl_setup.h"
-
-/* ----------------------------------------------------------------------------
- *  Netlist Macros
- * ---------------------------------------------------------------------------*/
-
-/* ----------------------------------------------------------------------------
- *  DIP only macros
- * ---------------------------------------------------------------------------*/
-
-/* ----------------------------------------------------------------------------
- *  External declarations
- * ---------------------------------------------------------------------------*/
-
-NETLIST_EXTERNAL(base)
-
-#endif
-
-#endif
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_base_lib.cpp mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_base_lib.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_base_lib.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_base_lib.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,138 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+#include "netlist/devices/net_lib.h"
+
+/* ----------------------------------------------------------------------------
+ *  External declarations
+ * ---------------------------------------------------------------------------*/
+
+NETLIST_EXTERNAL(cd4xxx_lib)
+NETLIST_EXTERNAL(opamp_lib)
+NETLIST_EXTERNAL(otheric_lib)
+NETLIST_EXTERNAL(ttl74xx_lib)
+NETLIST_EXTERNAL(roms_lib)
+
+/* ----------------------------------------------------------------------------
+ *  Diode Models
+ * ---------------------------------------------------------------------------*/
+
+static NETLIST_START(diode_models)
+	NET_MODEL("D _(IS=1e-15 N=1 NBV=3 IBV=0.001 BV=1E9)")
+
+	NET_MODEL("1N914 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)")
+	// FIXME: 1N916 currently only a copy of 1N914!
+	NET_MODEL("1N916 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)")
+	NET_MODEL("1N4001 D(Is=14.11n N=1.984 Rs=33.89m Ikf=94.81 Xti=3 Eg=1.11 Cjo=25.89p M=.44 Vj=.3245 Fc=.5 Bv=75 Ibv=10u Tt=5.7u Iave=1 Vpk=50 mfg=GI type=silicon)")
+	NET_MODEL("1N4148 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75 mfg=OnSemi type=silicon)")
+	NET_MODEL("1N4154 D(Is=0.1n Rs=4 N=1.67 Cjo=2p M=.333 tt=3n Iave=150m Vpk=35 Bv=60 Ibv=0.1p mfg=Vishay type=silicon)")
+	NET_MODEL("1S1588 D(Is=2.52n Rs=.568 N=1.752 Cjo=4p M=.4 tt=20n Iave=200m Vpk=75)")
+
+	NET_MODEL("1N34A D( Bv=75 Cjo=0.5e-12 Eg=0.67 Ibv=18e-3 Is=2e-7 Rs=7 N=1.3 Vj=0.1 M=0.27 type=germanium)")
+
+	NET_MODEL("LedRed D(IS=93.2p RS=42M N=3.73 BV=4 IBV=10U CJO=2.97P VJ=.75 M=.333 TT=4.32U Iave=40m Vpk=4 type=LED)")
+	NET_MODEL("LedGreen D(IS=93.2p RS=42M N=4.61 BV=4 IBV=10U CJO=2.97P VJ=.75 M=.333 TT=4.32U Iave=40m Vpk=4 type=LED)")
+	NET_MODEL("LedBlue D(IS=93.2p RS=42M N=7.47 BV=5 IBV=10U CJO=2.97P VJ=.75 M=.333 TT=4.32U Iave=40m Vpk=5 type=LED)")
+	NET_MODEL("LedWhite D(Is=0.27n Rs=5.65 N=6.79 Cjo=42p Iave=30m Vpk=5 type=LED)")
+
+NETLIST_END()
+
+/* ----------------------------------------------------------------------------
+ *  Mosfet Models
+ * ---------------------------------------------------------------------------*/
+
+static NETLIST_START(mosfet_models)
+	//NET_MODEL("NMOS _(VTO=0.0 N=1.0 IS=1E-14 KP=2E-5 UO=600 PHI=0.6 LD=0.0 L=1.0 TOX=1E-7 W=1.0 NSUB=0.0 GAMMA=0.0 RD=0.0 RS=0.0 LAMBDA=0.0)")
+	//NET_MODEL("PMOS _(VTO=0.0 N=1.0 IS=1E-14 KP=2E-5 UO=600 PHI=0.6 LD=0.0 L=1.0 TOX=1E-7 W=1.0 NSUB=0.0 GAMMA=0.0 RD=0.0 RS=0.0 LAMBDA=0.0)")
+
+	// NMOS_DEFAULT and PMOS_DEFAULT are created in nl_setup.cpp
+	NET_MODEL("NMOS NMOS_DEFAULT(VTO=0.0 N=1.0 IS=1E-14 KP=0.0 UO=600 PHI=0.0 LD=0.0 L=100e-6 TOX=1E-7 W=100e-6 NSUB=0.0 GAMMA=0.0 RD=0.0 RS=0.0 LAMBDA=0.0 CGSO=0 CGDO=0 CGBO=0)")
+	NET_MODEL("PMOS PMOS_DEFAULT(VTO=0.0 N=1.0 IS=1E-14 KP=0.0 UO=600 PHI=0.0 LD=0.0 L=100e-6 TOX=1E-7 W=100e-6 NSUB=0.0 GAMMA=0.0 RD=0.0 RS=0.0 LAMBDA=0.0 CGSO=0 CGDO=0 CGBO=0)")
+NETLIST_END()
+
+/* ----------------------------------------------------------------------------
+ *  BJT Models
+ * ---------------------------------------------------------------------------*/
+
+static NETLIST_START(bjt_models)
+	NET_MODEL("NPN _(IS=1e-15 BF=100 NF=1 BR=1 NR=1 CJE=0 CJC=0)")
+	NET_MODEL("PNP _(IS=1e-15 BF=100 NF=1 BR=1 NR=1 CJE=0 CJC=0)")
+
+	NET_MODEL("2SA1015 PNP(Is=295.1E-18 Xti=3 Eg=1.11 Vaf=100 Bf=110 Xtb=1.5 Br=10.45 Rc=15 Cjc=66.2p Mjc=1.054 Vjc=.75 Fc=.5 Cje=5p Mje=.3333 Vje=.75 Tr=10n Tf=1.661n VCEO=45V ICrating=150M MFG=Toshiba)")
+	NET_MODEL("2SC1815 NPN(Is=2.04f Xti=3 Eg=1.11 Vaf=6 Bf=400 Ikf=20m Xtb=1.5 Br=3.377 Rc=1 Cjc=1p Mjc=.3333 Vjc=.75 Fc=.5 Cje=25p Mje=.3333 Vje=.75 Tr=450n Tf=20n Itf=0 Vtf=0 Xtf=0 VCEO=45V ICrating=150M MFG=Toshiba)")
+
+	NET_MODEL("2N3565 NPN(IS=5.911E-15 ISE=5.911E-15 ISC=0 XTI=3 BF=697.1 BR=1.297 IKF=0.01393 IKR=0 XTB=1.5 VAF=62.37 VAR=21.5 VJE=0.65 VJC=0.65 RE=0.15 RC=1.61 RB=10 CJE=4.973E-12 CJC=4.017E-12 XCJC=0.75 FC=0.5 NF=1 NR=1 NE=1.342 NC=2 MJE=0.4146 MJC=0.3174 TF=820.4E-12 TR=4.687E-9 ITF=0.35 VTF=4 XTF=7 EG=1.11 KF=1E-9 AF=1 VCEO=25 ICRATING=500m MFG=NSC)")
+	NET_MODEL("2N3643 NPN(IS=14.34E-15 ISE=14.34E-15 ISC=0 XTI=3 BF=255.9 BR=6.092 IKF=0.2847 IKR=0 XTB=1.5 VAF=74.03 VAR=28 VJE=0.65 VJC=0.65 RE=0.1 RC=1 RB=10 CJE=22.01E-12 CJC=7.306E-12 XCJC=0.75 FC=0.5 NF=1 NR=1 NE=1.307 NC=2 MJE=0.377 MJC=0.3416 TF=411.1E-12 TR=46.91E-9 ITF=0.6 VTF=1.7 XTF=3 EG=1.11 KF=0 AF=1 VCEO=30 ICRATING=500m MFG=NSC)")
+	NET_MODEL("2N3645 PNP(IS=650.6E-18 ISE=54.81E-15 ISC=0 XTI=3 BF=231.7 BR=3.563 IKF=1.079 IKR=0 XTB=1.5 VAF=115.7 VAR=35 VJE=0.65 VJC=0.65 RE=0.15 RC=0.715 RB=10 CJE=19.82E-12 CJC=14.76E-12 XCJC=0.75 FC=0.5 NF=1 NR=1 NE=1.829 NC=2 MJE=0.3357 MJC=0.5383 TF=603.7E-12 TR=111.3E-9 ITF=0.65 VTF=5 XTF=1.7 EG=1.11 KF=0 AF=1 VCEO=60 ICRATING=500m MFG=NSC)")
+	// 3644 = 3645 Difference between 3644 and 3645 is voltage rating. 3644: VCBO=45, 3645: VCBO=60
+	NET_MODEL("2N3644 PNP(IS=650.6E-18 ISE=54.81E-15 ISC=0 XTI=3 BF=231.7 BR=3.563 IKF=1.079 IKR=0 XTB=1.5 VAF=115.7 VAR=35 VJE=0.65 VJC=0.65 RE=0.15 RC=0.715 RB=10 CJE=19.82E-12 CJC=14.76E-12 XCJC=0.75 FC=0.5 NF=1 NR=1 NE=1.829 NC=2 MJE=0.3357 MJC=0.5383 TF=603.7E-12 TR=111.3E-9 ITF=0.65 VTF=5 XTF=1.7 EG=1.11 KF=0 AF=1 VCEO=60 ICRATING=500m MFG=NSC)")
+	// 2N5190 = BC817-25
+	NET_MODEL("2N5190 NPN(IS=9.198E-14 NF=1.003 ISE=4.468E-16 NE=1.65 BF=338.8 IKF=0.4913 VAF=107.9 NR=1.002 ISC=5.109E-15 NC=1.071 BR=29.48 IKR=0.193 VAR=25 RB=1 IRB=1000 RBM=1 RE=0.2126 RC=0.143 XTB=0 EG=1.11 XTI=3 CJE=3.825E-11 VJE=0.7004 MJE=0.364 TF=5.229E-10 XTF=219.7 VTF=3.502 ITF=7.257 PTF=0 CJC=1.27E-11 VJC=0.4431 MJC=0.3983 XCJC=0.4555 TR=7E-11 CJS=0 VJS=0.75 MJS=0.333 FC=0.905 Vceo=45 Icrating=500m mfg=Philips)")
+
+	NET_MODEL("2N4401 NPN(IS=26.03f XTI=3 EG=1.11 VAF=90.7 BF=4.292K NE=1.244 ISE=26.03f IKF=0.2061 XTB=1.5 BR=1.01 NC=2 ISC=0 IKR=0 RC=0.5 CJC=11.01p MJC=0.3763 VJC=0.75 FC=0.5 CJE=24.07p MJE=0.3641 VJE=0.75 TR=233.7n TF=466.5p ITF=0 VTF=0 XTF=0 RB=10 VCEO=40)")
+	NET_MODEL("2N4124 NPN(IS=6.734f XTI=3 EG=1.11 VAF=74.03 BF=495 NE=1.28 ISE=6.734f IKF=69.35m XTB=1.5 BR=0.7214 NC=2 ISC=0 IKR=0 RC=1 CJC=3.638p MJC=0.3085 VJC=0.75 FC=0.5 CJE=4.493p MJE=0.2593 VJE=0.75 TR=238.3n TF=301.3p ITF=.4 VTF=4 XTF=2 RB=10 VCEO=25)")
+	NET_MODEL("2N4126 PNP(IS=1.41f XTI=3 EG=1.11 VAF=18.7 BF=203.7 NE=1.5 ISE=0 IKF=80m XTB=1.5 BR=4.924 NC=2 ISC=0 IKR=0 RC=2.5 CJC=9.728p MJC=0.5776 VJC=0.75 FC=0.5 CJE=8.063p MJE=0.3677 VJE=0.75 TR=33.23n TF=179.3p ITF=.4 VTF=4 XTF=6 RB=10 VCEO=25)")
+	NET_MODEL("2SC945 NPN(IS=3.577E-14 BF=2.382E+02 NF=1.01 VAF=1.206E+02 IKF=3.332E-01 ISE=3.038E-16 NE=1.205 BR=1.289E+01 NR=1.015 VAR=1.533E+01 IKR=2.037E-01 ISC=3.972E-14 NC=1.115 RB=3.680E+01 IRB=1.004E-04 RBM=1 RE=8.338E-01 RC=1.557E+00 CJE=1.877E-11 VJE=7.211E-01 MJE=3.486E-01 TF=4.149E-10 XTF=1.000E+02 VTF=9.956 ITF=5.118E-01 PTF=0 CJC=6.876p VJC=3.645E-01 MJC=3.074E-01 TR=5.145E-08 XTB=1.5 EG=1.11 XTI=3 FC=0.5 Vceo=50 Icrating=100m MFG=NEC)")
+
+	NET_MODEL("BC237B NPN(IS=1.8E-14 ISE=5.0E-14 ISC=1.72E-13 XTI=3 BF=400 BR=35.5 IKF=0.14 IKR=0.03 XTB=1.5 VAF=80 VAR=12.5 VJE=0.58 VJC=0.54 RE=0.6 RC=0.25 RB=0.56 CJE=13E-12 CJC=4E-12 XCJC=0.75 FC=0.5 NF=0.9955 NR=1.005 NE=1.46 NC=1.27 MJE=0.33 MJC=0.33 TF=0.64E-9 TR=50.72E-9 EG=1.11 KF=0 AF=1 VCEO=45 ICRATING=100M MFG=ZETEX)")
+	NET_MODEL("BC556B PNP(IS=3.83E-14 NF=1.008 ISE=1.22E-14 NE=1.528 BF=344.4 IKF=0.08039 VAF=21.11 NR=1.005 ISC=2.85E-13 NC=1.28 BR=14.84 IKR=0.047 VAR=32.02 RB=1 IRB=1.00E-06 RBM=1 RE=0.6202 RC=0.5713 XTB=0 EG=1.11 XTI=3 CJE=1.23E-11 VJE=0.6106 MJE=0.378 TF=5.60E-10 XTF=3.414 VTF=5.23 ITF=0.1483 PTF=0 CJC=1.08E-11 VJC=0.1022 MJC=0.3563 XCJC=0.6288 TR=1.00E-32 CJS=0 VJS=0.75 MJS=0.333 FC=0.8027 Vceo=65 Icrating=100m mfg=Philips)")
+	NET_MODEL("BC548C NPN(IS=1.95E-14 ISE=1.31E-15 ISC=1.0E-13 XTI=3 BF=466 BR=2.42 IKF=0.18 IKR=1 XTB=1.5 VAF=91.7 VAR=24.7 VJE=0.632 VJC=0.339 RE=1 RC=1.73 RB=26.5 RBM=10 IRB=10 CJE=1.33E-11 CJC=5.17E-12 XCJC=1 FC=0.9 NF=0.993 NR=1.2 NE=1.32 NC=2.00 MJE=0.326 MJC=0.319 TF=6.52E-10 TR=0 PTF=0 ITF=1.03 VTF=1.65 XTF=100 EG=1.11 KF=1E-9 AF=1 VCEO=40 ICrating=800M MFG=Siemens)")
+	NET_MODEL("BC817-25 NPN(IS=9.198E-14 NF=1.003 ISE=4.468E-16 NE=1.65 BF=338.8 IKF=0.4913 VAF=107.9 NR=1.002 ISC=5.109E-15 NC=1.071 BR=29.48 IKR=0.193 VAR=25 RB=1 IRB=1000 RBM=1 RE=0.2126 RC=0.143 XTB=0 EG=1.11 XTI=3 CJE=3.825E-11 VJE=0.7004 MJE=0.364 TF=5.229E-10 XTF=219.7 VTF=3.502 ITF=7.257 PTF=0 CJC=1.27E-11 VJC=0.4431 MJC=0.3983 XCJC=0.4555 TR=7E-11 CJS=0 VJS=0.75 MJS=0.333 FC=0.905 Vceo=45 Icrating=500m mfg=Philips)")
+
+	NET_MODEL("9013 NPN(IS=3.40675E-14 BF=166 VAF=67 IKF=1.164 ISE=12.37e-15 NE=2 BR=15.17 VAR=40.84 IKR=0.261352 ISC=1.905E-15 NC=1.066 RB=63.2 IRB=5.62E-6 RBM=22.1 RE=0.02 RC=0.7426 CJE=3.53E-11 VJE=0.808 MJE=0.372 CJC=1.74E-11 VJC=0.614 MJC=0.388 XCJC=0.349 XTB=1.4025 EG=1.0999 XTI=3 VC=0.5 VCEO=20)")
+NETLIST_END()
+
+/* ----------------------------------------------------------------------------
+ *  Family models
+ * ---------------------------------------------------------------------------*/
+
+static NETLIST_START(family_models)
+
+	// FAMILIES always need a type. UNKNOWN below will break
+	NET_MODEL("FAMILY _(TYPE=UNKNOWN IVL=0.16 IVH=0.4 OVL=0.1 OVH=1.0 ORL=1.0 ORH=130.0)")
+	NET_MODEL("OPAMP _()")
+	NET_MODEL("SCHMITT_TRIGGER _()")
+
+	NET_MODEL("74XX FAMILY(TYPE=TTL IVL=0.16 IVH=0.4 OVL=0.1 OVH=1.0 ORL=1.0 ORH=130)")
+
+	// CMOS
+	// low input 1.5 , high input trigger 3.5 at 5V supply
+	// output offsets, low for CMOS, thus 0.05
+	// output currents: see https://www.classe.cornell.edu/~ib38/teaching/p360/lectures/wk09/l26/EE2301Exp3F10.pdf
+	// typical CMOS may sink 0.4mA while output stays <= 0.4V
+	NET_MODEL("CD4XXX FAMILY(TYPE=CMOS IVL=0.3 IVH=0.7 OVL=0.05 OVH=0.05 ORL=500 ORH=500)")
+
+	NET_MODEL("74XXOC FAMILY(TYPE=TTL IVL=0.16 IVH=0.4 OVL=0.1 OVH=0.05 ORL=10.0 ORH=1.0e8)")
+NETLIST_END()
+
+/* ----------------------------------------------------------------------------
+ *  Always included
+ * ---------------------------------------------------------------------------*/
+
+NETLIST_START(base_lib)
+	NET_REGISTER_DEV(GNDA, GND)
+	NET_REGISTER_DEV(PARAMETER, NETLIST)
+
+	LOCAL_SOURCE(diode_models)
+	LOCAL_SOURCE(bjt_models)
+	LOCAL_SOURCE(mosfet_models)
+	LOCAL_SOURCE(family_models)
+
+	EXTERNAL_SOURCE(ttl74xx_lib)
+	EXTERNAL_SOURCE(cd4xxx_lib)
+	EXTERNAL_SOURCE(opamp_lib)
+	EXTERNAL_SOURCE(otheric_lib)
+	EXTERNAL_SOURCE(roms_lib)
+
+	INCLUDE(diode_models)
+	INCLUDE(bjt_models)
+	INCLUDE(mosfet_models)
+	INCLUDE(family_models)
+
+	INCLUDE(ttl74xx_lib)
+	INCLUDE(cd4xxx_lib)
+	INCLUDE(opamp_lib)
+	INCLUDE(otheric_lib)
+	INCLUDE(roms_lib)
+
+NETLIST_END()
+
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_base_lib.h mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_base_lib.h
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_base_lib.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_base_lib.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,34 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+#ifndef NLM_BASE_H_
+#define NLM_BASE_H_
+
+/// \file nlm_base.h
+///
+
+/*
+ * Provide base environment for netlist
+ *
+ */
+
+#ifndef __PLIB_PREPROCESSOR__
+
+#include "netlist/nl_setup.h"
+
+/* ----------------------------------------------------------------------------
+ *  Netlist Macros
+ * ---------------------------------------------------------------------------*/
+
+/* ----------------------------------------------------------------------------
+ *  DIP only macros
+ * ---------------------------------------------------------------------------*/
+
+/* ----------------------------------------------------------------------------
+ *  External declarations
+ * ---------------------------------------------------------------------------*/
+
+NETLIST_EXTERNAL(base_lib)
+
+#endif
+
+#endif
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx.cpp mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,291 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#include "netlist/devices/net_lib.h"
-
-/*
- *   CD4001BC: Quad 2-Input NOR Buffered B Series Gate
- *
- *       +--------------+
- *    A1 |1     ++    14| VDD
- *    B1 |2           13| A6
- *    A2 |3           12| Y6
- *    Y2 |4    4001   11| A5
- *    A3 |5           10| Y5
- *    Y3 |6            9| A4
- *   VSS |7            8| Y4
- *       +--------------+
- *
- */
-
-static NETLIST_START(CD4001_DIP)
-	CD4001_GATE(s1)
-	CD4001_GATE(s2)
-	CD4001_GATE(s3)
-	CD4001_GATE(s4)
-
-	NET_C(s1.VDD, s2.VDD, s3.VDD, s4.VDD)
-	NET_C(s1.VSS, s2.VSS, s3.VSS, s4.VSS)
-	DIPPINS(    /*       +--------------+      */
-		s1.A,   /*    A1 |1     ++    14| VDD  */ s1.VDD,
-		s1.B,   /*    B1 |2           13| A6   */ s4.B,
-		s1.Q,   /*    A2 |3           12| Y6   */ s4.A,
-		s2.Q,   /*    Y2 |4    4001   11| A5   */ s4.Q,
-		s2.A,   /*    A3 |5           10| Y5   */ s3.Q,
-		s2.B,   /*    Y3 |6            9| A4   */ s3.B,
-		s1.VSS, /*   VSS |7            8| Y4   */ s3.A
-				/*       +--------------+      */
-	)
-
-NETLIST_END()
-
-/*  CD4020: 14-Stage Ripple Carry Binary Counters
- *
- *          +--------------+
- *      Q12 |1     ++    16| VDD
- *      Q13 |2           15| Q11
- *      Q14 |3           14| Q10
- *       Q6 |4    4020   13| Q8
- *       Q5 |5           12| Q9
- *       Q7 |6           11| RESET
- *       Q4 |7           10| IP (Input pulses)
- *      VSS |8            9| Q1
- *          +--------------+
- *
- *  Naming conventions follow Texas Instruments datasheet
- *
- *  FIXME: Timing depends on VDD-VSS
- *         This needs a cmos d-a/a-d proxy implementation.
- */
-
-static NETLIST_START(CD4020_DIP)
-
-	CD4020(s1)
-	DIPPINS(     /*       +--------------+       */
-		s1.Q12,  /*   Q12 |1     ++    16| VDD   */ s1.VDD,
-		s1.Q13,  /*   Q13 |2           15| Q11   */ s1.Q11,
-		s1.Q14,  /*   Q14 |3           14| Q10   */ s1.Q10,
-		s1.Q6,   /*    Q6 |4    4020   13| Q8    */ s1.Q8,
-		s1.Q5,   /*    Q5 |5           12| Q9    */ s1.Q9,
-		s1.Q7,   /*    Q7 |6           11| RESET */ s1.RESET,
-		s1.Q4,   /*    Q4 |7           10| IP    */ s1.IP,
-		s1.VSS,  /*   VSS |8            9| Q1    */ s1.Q1
-					/*       +--------------+       */
-	)
-		/*
-		 * IP = (Input pulses)
-		 */
-
-NETLIST_END()
-
-/*  CD4066: Quad Bilateral Switch
- *
- *          +--------------+
- *   INOUTA |1     ++    14| VDD
- *   OUTINA |2           13| CONTROLA
- *   OUTINB |3           12| CONTROLD
- *   INOUTB |4    4066   11| INOUTD
- * CONTROLB |5           10| OUTIND
- * CONTROLC |6            9| OUTINC
- *      VSS |7            8| INOUTC
- *          +--------------+
- *
- *  FIXME: These devices are slow (~125 ns). THis is currently not reflected
- *
- *  Naming conventions follow National semiconductor datasheet
- *
- */
-
-static NETLIST_START(CD4066_DIP)
-	CD4066_GATE(A)
-	CD4066_GATE(B)
-	CD4066_GATE(C)
-	CD4066_GATE(D)
-
-	NET_C(A.VDD, B.VDD, C.VDD, D.VDD)
-	NET_C(A.VSS, B.VSS, C.VSS, D.VSS)
-
-	PARAM(A.BASER, 270.0)
-	PARAM(B.BASER, 270.0)
-	PARAM(C.BASER, 270.0)
-	PARAM(D.BASER, 270.0)
-
-	DIPPINS(        /*          +--------------+          */
-		A.R.1,      /*   INOUTA |1     ++    14| VDD      */ A.VDD,
-		A.R.2,      /*   OUTINA |2           13| CONTROLA */ A.CTL,
-		B.R.1,      /*   OUTINB |3           12| CONTROLD */ D.CTL,
-		B.R.2,      /*   INOUTB |4    4066   11| INOUTD   */ D.R.1,
-		B.CTL,      /* CONTROLB |5           10| OUTIND   */ D.R.2,
-		C.CTL,      /* CONTROLC |6            9| OUTINC   */ C.R.1,
-		A.VSS,      /*      VSS |7            8| INOUTC   */ C.R.2
-					/*          +--------------+          */
-	)
-NETLIST_END()
-
-static NETLIST_START(CD4016_DIP)
-	CD4066_GATE(A)
-	CD4066_GATE(B)
-	CD4066_GATE(C)
-	CD4066_GATE(D)
-
-	NET_C(A.VDD, B.VDD, C.VDD, D.VDD)
-	NET_C(A.VSS, B.VSS, C.VSS, D.VSS)
-
-	PARAM(A.BASER, 1000.0)
-	PARAM(B.BASER, 1000.0)
-	PARAM(C.BASER, 1000.0)
-	PARAM(D.BASER, 1000.0)
-
-	DIPPINS(        /*          +--------------+          */
-		A.R.1,      /*   INOUTA |1     ++    14| VDD      */ A.VDD,
-		A.R.2,      /*   OUTINA |2           13| CONTROLA */ A.CTL,
-		B.R.1,      /*   OUTINB |3           12| CONTROLD */ D.CTL,
-		B.R.2,      /*   INOUTB |4    4016   11| INOUTD   */ D.R.1,
-		B.CTL,      /* CONTROLB |5           10| OUTIND   */ D.R.2,
-		C.CTL,      /* CONTROLC |6            9| OUTINC   */ C.R.1,
-		A.VSS,      /*      VSS |7            8| INOUTC   */ C.R.2
-					/*          +--------------+          */
-	)
-NETLIST_END()
-
-/*
- *  CD4069: Hex Inverter
- *                 _
- *             Y = A
- *          +---++---+
- *          | A || Y |
- *          +===++===+
- *          | 0 || 1 |
- *          | 1 || 0 |
- *          +---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
-
-static NETLIST_START(CD4069_DIP)
-	CD4069_GATE(A)
-	CD4069_GATE(B)
-	CD4069_GATE(C)
-	CD4069_GATE(D)
-	CD4069_GATE(E)
-	CD4069_GATE(F)
-
-	NET_C(A.VDD, B.VDD, C.VDD, D.VDD, E.VDD, E.VDD)
-	NET_C(A.VSS, B.VSS, C.VSS, D.VSS, E.VSS, F.VSS)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VDD  */ A.VDD,
-		A.Q,  /*    Y1 |2           13| A6   */ F.A,
-		B.A,  /*    A2 |3           12| Y6   */ F.Q,
-		B.Q,  /*    Y2 |4    4069   11| A5   */ E.A,
-		C.A,  /*    A3 |5           10| Y5   */ E.Q,
-		C.Q,  /*    Y3 |6            9| A4   */ D.A,
-		A.VSS,/*   VSS |7            8| Y4   */ D.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  CD4070: Quad 2-Input Exclusive-OR Gates
- *
- *             Y = A+B
- *          +---+---++---+
- *          | A | B || Y |
- *          +===+===++===+
- *          | 0 | 0 || 0 |
- *          | 0 | 1 || 1 |
- *          | 1 | 0 || 1 |
- *          | 1 | 1 || 0 |
- *          +---+---++---+
- *
- */
-
-static NETLIST_START(CD4070_DIP)
-	CD4070_GATE(A)
-	CD4070_GATE(B)
-	CD4070_GATE(C)
-	CD4070_GATE(D)
-
-	NET_C(A.VDD, B.VDD, C.VDD, D.VDD)
-	NET_C(A.VSS, B.VSS, C.VSS, D.VSS)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VDD  */ A.VDD,
-		A.B,  /*    B1 |2           13| B4   */ D.B,
-		A.Q,  /*    Y1 |3           12| A4   */ D.A,
-		B.Q,  /*    Y2 |4    4070   11| Y4   */ D.Q,
-		B.A,  /*    A2 |5           10| Y3   */ C.Q,
-		B.B,  /*    B2 |6            9| B3   */ C.B,
-		A.VSS,/*   VSS |7            8| A3   */ C.A
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-
-static NETLIST_START(CD4316_DIP)
-	CD4316_GATE(A)
-	CD4316_GATE(B)
-	CD4316_GATE(C)
-	CD4316_GATE(D)
-
-	NET_C(A.E, B.E, C.E, D.E)
-	NET_C(A.VDD, B.VDD, C.VDD, D.VDD)
-	NET_C(A.VSS, B.VSS, C.VSS, D.VSS)
-
-	PARAM(A.BASER, 45.0)
-	PARAM(B.BASER, 45.0)
-	PARAM(C.BASER, 45.0)
-	PARAM(D.BASER, 45.0)
-
-	DIPPINS(        /*          +--------------+          */
-		A.R.2,      /*       1Z |1     ++    16| VCC      */ A.VDD,
-		A.R.1,      /*       1Y |2           15| 1S       */ A.S,
-		B.R.1,      /*       2Y |3           14| 4S       */ D.S,
-		B.R.2,      /*       2Z |4    4316   13| 4Z       */ D.R.2,
-		B.S,        /*       2S |5           12| 4Y       */ D.R.1,
-		C.S,        /*       3S |6           11| 3Y       */ C.R.1,
-		A.E,        /*       /E |7           10| 3Z       */ C.R.2,
-		A.VSS,      /*      GND |8            9| VEE      */ VEE
-					/*          +--------------+          */
-	)
-
-NETLIST_END()
-
-NETLIST_START(CD4XXX_lib)
-
-	TRUTHTABLE_START(CD4001_GATE, 2, 1, "")
-		TT_HEAD("A , B | Q ")
-		TT_LINE("0,0|1|110")
-		TT_LINE("X,1|0|120")
-		TT_LINE("1,X|0|120")
-		TT_FAMILY("CD4XXX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(CD4069_GATE, 1, 1, "")
-		TT_HEAD("A|Q ")
-		TT_LINE("0|1|55")
-		TT_LINE("1|0|55")
-		TT_FAMILY("CD4XXX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(CD4070_GATE, 2, 1, "")
-		TT_HEAD("A,B|Q ")
-		TT_LINE("0,0|0|15")
-		TT_LINE("0,1|1|22")
-		TT_LINE("1,0|1|22")
-		TT_LINE("1,1|0|15")
-		TT_FAMILY("CD4XXX")
-	TRUTHTABLE_END()
-
-	LOCAL_LIB_ENTRY(CD4001_DIP)
-	LOCAL_LIB_ENTRY(CD4069_DIP)
-	LOCAL_LIB_ENTRY(CD4070_DIP)
-
-	/* DIP ONLY */
-	LOCAL_LIB_ENTRY(CD4020_DIP)
-	LOCAL_LIB_ENTRY(CD4016_DIP)
-	LOCAL_LIB_ENTRY(CD4066_DIP)
-	LOCAL_LIB_ENTRY(CD4316_DIP)
-
-NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx.h mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx.h
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,73 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-#ifndef NLD_CD4XXX_H_
-#define NLD_CD4XXX_H_
-
-/// \file nlm_cd4xxx.h
-///
-
-#include "netlist/nl_setup.h"
-
-/*
- * Devices:
- *
- * CD4001_NOR : single gate
- * CD4001_DIP : dip package
- * CD4020_DIP : dip package (device model in core)
- * CD4016_DIP : dip package (device model in core)
- * CD4066_DIP : dip package (device model in core)
- *
- */
-
-#ifndef __PLIB_PREPROCESSOR__
-
-/* ----------------------------------------------------------------------------
- *  Netlist Macros
- * ---------------------------------------------------------------------------*/
-
-#if !NL_AUTO_DEVICES
-
-#define CD4001_GATE(name)                                                      \
-		NET_REGISTER_DEV(CD4001_GATE, name)
-
-#define CD4001_DIP(name)                                                      \
-		NET_REGISTER_DEV(CD4001_DIP, name)
-
-#define CD4069_GATE(name)                                                      \
-		NET_REGISTER_DEV(CD4069_GATE, name)
-
-#define CD4069_DIP(name)                                                      \
-		NET_REGISTER_DEV(CD4069_DIP, name)
-
-#define CD4070_GATE(name)                                                      \
-		NET_REGISTER_DEV(CD4070_GATE, name)
-
-#define CD4070_DIP(name)                                                      \
-		NET_REGISTER_DEV(CD4070_DIP, name)
-
-/* ----------------------------------------------------------------------------
- *  DIP only macros
- * ---------------------------------------------------------------------------*/
-
-#define CD4020_DIP(name)                                                      \
-		NET_REGISTER_DEV(CD4020_DIP, name)
-
-#define CD4066_DIP(name)                                                      \
-		NET_REGISTER_DEV(CD4066_DIP, name)
-
-#define CD4016_DIP(name)                                                      \
-		NET_REGISTER_DEV(CD4016_DIP, name)
-
-#define CD4316_DIP(name)                                                      \
-		NET_REGISTER_DEV(CD4016_DIP, name)
-
-#endif
-/* ----------------------------------------------------------------------------
- *  External declarations
- * ---------------------------------------------------------------------------*/
-
-NETLIST_EXTERNAL(CD4XXX_lib)
-
-#endif
-
-#endif
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx_lib.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,607 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#include "netlist/devices/net_lib.h"
+
+//- Identifier: CD4001_DIP
+//- Title: CD4001BM/CD4001BC Quad 2-Input NOR Buffered B Series Gate
+//- Description: These quad gates are monolithic complementary MOS (CMOS) integrated circuits constructed with N- and P-channel enhancement mode transistors.
+//-   They have equal source and sink current capabilities and conform to standard B series output drive.
+//-   The devices also have buffered outputs which improve transfer characteristics by providing very high gain.
+//-   All inputs are protected against static discharge with diodes to VDD and VSS.
+//- Pinalias: A1,B1,Y1,Y2,A2,B2,VSS,A3,B3,Y3,Y4,A4,B4,VDD
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheets/166/108518_DS.pdf
+//-
+//-     +---+---++---+
+//-     | A | B || Y |
+//-     +===+===++===+
+//-     | 0 | 0 || 1 |
+//-     | X | 1 || 0 |
+//-     | 1 | X || 0 |
+//-     +---+---++---+
+//-
+static NETLIST_START(CD4001_DIP)
+	CD4001_GATE(A)
+	CD4001_GATE(B)
+	CD4001_GATE(C)
+	CD4001_GATE(D)
+
+	NET_C(A.VDD, B.VDD, C.VDD, D.VDD)
+	NET_C(A.VSS, B.VSS, C.VSS, D.VSS)
+
+	DIPPINS(   /*     +--------------+     */
+		  A.A, /*  A1 |1     ++    14| VDD */ A.VDD,
+		  A.B, /*  B1 |2           13| B4  */ D.B,
+		  A.Q, /*  Y1 |3           12| A4  */ D.A,
+		  B.Q, /*  Y2 |4    4001   11| Y4  */ D.Q,
+		  B.A, /*  A2 |5           10| Y3  */ C.Q,
+		  B.B, /*  B2 |6            9| B3  */ C.B,
+		A.VSS, /* VSS |7            8| A3  */ C.A
+			   /*     +--------------+     */
+	)
+NETLIST_END()
+
+//- Identifier: CD4006_DIP
+//- Title: CD4006BM/CD4006BC 18-Stage Static Shift Register
+//- Description: The CD4006BM/CD4006BC 18-stage static shift register is comprised of four separate shift register sections, two sections of four stages and two sections of five stages.
+//-   Each section has an independent data input.
+//-   Outputs are available at the fourth stage and the fifth stage of each section.
+//-   A common clock signal is used for all stages.
+//-   Data is shifted to the next stage on the negative-going transition of the clock.
+//-   Through appropriate connections of inputs and outputs, multiple register sections of 4, 5, 8, and 9 stages, or single register sections of 10, 12, 13, 14, 16, 17, and 18 stages can be implemented using one package.
+//- Pinalias: D1,NC,CLOCK,D2,D3,D4,VSS,D4P4,D4P5,D3P4,D2P4,D2P5,D1P4,VDD
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS005942.PDF
+//-
+static NETLIST_START(CD4006_DIP)
+	CD4006(A)
+	NC_PIN(NC)
+
+	DIPPINS(     /*       +--------------+      */
+		   A.D1, /*    D1 |1     ++    14| VDD  */ A.VDD,
+		   NC.I, /*    NC |2           13| D1+4 */ A.D1P4,
+		A.CLOCK, /* CLOCK |3           12| D2+5 */ A.D2P5,
+		   A.D2, /*    D2 |4    4006   11| D2+4 */ A.D2P4,
+		   A.D3, /*    D3 |5           10| D3+4 */ A.D3P4,
+		   A.D4, /*    D4 |6            9| D4+5 */ A.D4P5,
+		  A.VSS, /*   VSS |7            8| D4+4 */ A.D4P4
+				 /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: CD4011_DIP
+//- Title: CD4011BM/CD4011BC Quad 2-Input NAND Buffered B Series Gate
+//- Description: These quad gates are monolithic complementary MOS (CMOS) integrated circuits constructed with N- and P-channel enhancement mode transistors.
+//-   They have equal source and sink current capabilities and conform to standard B series output drive.
+//-   The devices also have buffered outputs which improve transfer characteristics by providing very high gain.
+//-   All inputs are protected against static discharge with diodes to VDD and VSS.
+//- Pinalias: A1,B1,Y1,Y2,A2,B2,VSS,A3,B3,Y3,Y4,A4,B4,VDD
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheets/166/108518_DS.pdf
+//-
+//-     +---+---++---+
+//-     | A | B || Y |
+//-     +===+===++===+
+//-     | X | 0 || 1 |
+//-     | 0 | X || 1 |
+//-     | 1 | 1 || 0 |
+//-     +---+---++---+
+//-
+static NETLIST_START(CD4011_DIP)
+	   CD4011_GATE(A)
+	   CD4011_GATE(B)
+	   CD4011_GATE(C)
+	   CD4011_GATE(D)
+
+	   NET_C(A.VDD, B.VDD, C.VDD, D.VDD)
+	   NET_C(A.VSS, B.VSS, C.VSS, D.VSS)
+
+	   DIPPINS(    /*     +--------------+     */
+			  A.A, /*   A |1     ++    14| VDD */ A.VDD,
+			  A.B, /*   B |2           13| H   */ D.B,
+			  A.Q, /*   J |3           12| G   */ D.A,
+			  B.Q, /*   K |4    4011   11| M   */ D.Q,
+			  B.A, /*   C |5           10| L   */ C.Q,
+			  B.B, /*   D |6            9| F   */ C.B,
+			A.VSS, /* VSS |7            8| E   */ C.A
+				   /*     +--------------+     */
+	   )
+NETLIST_END()
+
+//- Identifier: CD4013_DIP
+//- Title: CD4013BM/CD4013BC Dual D Flip-Flop
+//- Description: The CD4013B dual D flip-flop is a monolithic complementary MOS (CMOS) integrated circuit constructed with N- and P-channel enhancement mode transistors.
+//-   Each flip-flop has independent data, set, reset, and clock inputs and Q and QQ outputs.
+//-   These devices can be used for shift register applications, and by connecting Q output to the data input, for counter and toggle applications.
+//-   The logic levelpresent at the D input is transferred to the Q output during the positive-going transition of the clock pulse.
+//-   Setting or resetting is independent of the clock and is accomplished by a high level on the set or reset line respectively.
+//- Pinalias: Q1,QQ1,CLOCK1,RESET1,DATA1,SET1,VSS,SET2,DATA2,RESET2,CLOCK2,QQ2,Q2,VDD
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheets/150/108670_DS.pdf
+//-
+//-     +-----+---+---+---++---+----+
+//-     | CLK | D | R | S || Q | QQ |
+//-     +=====+===+===+===++===+====+
+//-     | 0-1 | 0 | 0 | 0 || 0 |  1 |
+//-     | 0-1 | 1 | 0 | 0 || 1 |  0 |
+//-     | 1-0 | X | 0 | 0 || Q | QQ |
+//-     |  X  | X | 1 | 0 || 0 |  1 |
+//-     |  X  | X | 0 | 1 || 1 |  0 |
+//-     |  X  | X | 1 | 1 || 1 |  1 |
+//-     +-----+---+---+---++---+----+
+//-
+static NETLIST_START(CD4013_DIP)
+	CD4013(A)
+	CD4013(B)
+
+	NET_C(A.VDD, B.VDD)
+	NET_C(A.VSS, B.VSS)
+
+	DIPPINS(     /*         +--------------+        */
+			A.Q, /*      Q1 |1     ++    14| VDD    */ A.VDD,
+		   A.QQ, /*     Q1Q |2           13| Q2     */ B.Q,
+		A.CLOCK, /*  CLOCK1 |3           12| Q2Q    */ B.QQ,
+		A.RESET, /*  RESET1 |4    4013   11| CLOCK2 */ B.CLOCK,
+		 A.DATA, /*   DATA1 |5           10| RESET2 */ B.RESET,
+		  A.SET, /*    SET1 |6            9| DATA2  */ B.DATA,
+		  A.VSS, /*     VSS |7            8| SET2   */ B.SET
+				 /*         +--------------+        */
+	)
+NETLIST_END()
+
+//- Identifier: CD4016_DIP
+//- Title: CD4016BM/CD4016BC Quad Bilateral Switch
+//- Description: The CD4016BM/CD4016BC is a quad bilateral switch intended for the transmission or multiplexing of analog or digital signals.
+//-   It is pin-for-pin compatible with CD4066BM/CD4066BC.
+//- Pinalias: INOUTA,OUTINA,OUTINB,INOUTB,CONTROLB,CONTROLC,VSS,INOUTC,OUTINC,OUTIND,INOUTD,CONTROLD,CONTROLA,VDD
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheets/185/108711_DS.pdf
+//-
+static NETLIST_START(CD4016_DIP)
+	CD4066_GATE(A)
+	CD4066_GATE(B)
+	CD4066_GATE(C)
+	CD4066_GATE(D)
+
+	NET_C(A.VDD, B.VDD, C.VDD, D.VDD)
+	NET_C(A.VSS, B.VSS, C.VSS, D.VSS)
+
+	PARAM(A.BASER, 1000.0)
+	PARAM(B.BASER, 1000.0)
+	PARAM(C.BASER, 1000.0)
+	PARAM(D.BASER, 1000.0)
+
+	DIPPINS(        /*          +--------------+          */
+		A.R.1,      /*   INOUTA |1     ++    14| VDD      */ A.VDD,
+		A.R.2,      /*   OUTINA |2           13| CONTROLA */ A.CTL,
+		B.R.1,      /*   OUTINB |3           12| CONTROLD */ D.CTL,
+		B.R.2,      /*   INOUTB |4    4016   11| INOUTD   */ D.R.1,
+		B.CTL,      /* CONTROLB |5           10| OUTIND   */ D.R.2,
+		C.CTL,      /* CONTROLC |6            9| OUTINC   */ C.R.1,
+		A.VSS,      /*      VSS |7            8| INOUTC   */ C.R.2
+					/*          +--------------+          */
+	)
+NETLIST_END()
+
+//- Identifier: CD4017_DIP
+//- Title: CD4017BM/CD4017BC Decade Counter/Divider with 10 Decoded Outputs
+//- Description: The CD4017BM/CD4017BC is a 5-stage divide-by-10 Johnson counter with 10 decoded outputs and a carry out bit.
+//-   These counters are cleared to their zero count by a logical 1 on their reset line.
+//-   These counters are advanced on the positive edge of the clock signal when the clock enable signal is in the logical 0 state.
+//-   The configuration of the CD4017BM/CD4017BC permits medium speed operation and assures a hazard free counting sequence.
+//-   The 10 decoded outputs are normally in the logical 0 state and go to the logical 1 state only at their respective time slot.
+//-   Each decoded output remains high for 1 full clock cycle.
+//-   The carry-out signal completes a full cycle for every 10 clock input cycles and is used as a ripple carry signal to any succeeding stages.
+//- Pinalias: Q5,Q1,Q0,Q2,Q6,Q7,Q3,VSS,Q8,Q4,Q9,CARRY_OUT,CLOCK_ENABLE,CLOCK,RESET,VDD
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheets/166/108736_DS.pdf
+//-
+static NETLIST_START(CD4017_DIP)
+	CD4017(A)
+
+	DIPPINS(   /*     +--------------+              */
+		 A.Q5, /*  Q5 |1     ++    16| VDD          */ A.VDD,
+		 A.Q1, /*  Q1 |2           15| RESET        */ A.RESET,
+		 A.Q0, /*  Q0 |3           14| CLOCK        */ A.CLK,
+		 A.Q2, /*  Q2 |4    4017   13| CLOCK ENABLE */ A.CLKEN,
+		 A.Q6, /*  Q6 |5           12| CARRY OUT    */ A.CO,
+		 A.Q7, /*  Q7 |6           11| Q9           */ A.Q9,
+		 A.Q3, /*  Q3 |7           10| Q4           */ A.Q4,
+		A.VSS, /* VSS |8            9| Q8           */ A.Q8
+			   /*     +--------------+              */
+	)
+NETLIST_END()
+
+//- Identifier: CD4020_DIP
+//- Title: CD4020BC 14-Stage Ripple Carry Binary Counters
+//- Description: The CD4020BC is a 14-stage ripple carry binary counter.
+//-   The counters are advanced one count on the negative transition of each clock pulse.
+//-   The counters are reset to the zero state by a logical 1 at the reset input independent of clock.
+//- Pinalias: Q12,Q13,Q14,Q6,Q5,Q7,Q4,VSS,Q1,PHI1,RESET,Q9,Q8,Q10,Q11,VDD
+//- Package: DIP
+//- NamingConvention: Naming conventions follow Fairchild Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheets/90/109006_DS.pdf
+//-
+static NETLIST_START(CD4020_DIP)
+	CD4020(A)
+
+	DIPPINS(   /*     +--------------+       */
+		A.Q12, /* Q12 |1     ++    16| VDD   */ A.VDD,
+		A.Q13, /* Q13 |2           15| Q11   */ A.Q11,
+		A.Q14, /* Q14 |3           14| Q10   */ A.Q10,
+		 A.Q6, /*  Q6 |4    4020   13| Q8    */ A.Q8,
+		 A.Q5, /*  Q5 |5           12| Q9    */ A.Q9,
+		 A.Q7, /*  Q7 |6           11| RESET */ A.RESET,
+		 A.Q4, /*  Q4 |7           10| PHI1  */ A.IP,
+		A.VSS, /* VSS |8            9| Q1    */ A.Q1
+			   /*     +--------------+       */)
+NETLIST_END()
+
+//- Identifier: CD4022_DIP
+//- Title: CD4022BM/CD4022BC Divide-by-8 Counter/Divider with 8 Decoded Outputs
+//- Description: The CD4022BM/CD4022BC is a 4-stage divide-by-8 Johnson counter with 8 decoded outputs and a carry-out bit.
+//-   These counters are cleared to their zero count by a logical 1 on their reset line.
+//-   These counters are advanced on the positive edge of the clock signal when the clock enable signal is in the logical 0 state.
+//-   The configuration of the CD4022BM/CD4022BC permits medium speed operation and assures a hazard free counting sequence.
+//-   The 8 decoded outputs are normally in the logical 0 state and go to the logical 1 state only at their respective time slot.
+//-   Each decoded output remains high for 1 full clock cycle.
+//-   The carry-out signal completes a full cycle for every 8 clock input cycles and is used as a ripple carry signal to any succeeding stages
+//- Pinalias: Q1,Q0,Q2,Q5,Q6,NC,Q3,VSS,NC,Q7,Q4,CARRY_OUT,CLOCK_ENABLE,CLOCK,RESET,VDD
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheets/166/108736_DS.pdf
+//-
+static NETLIST_START(CD4022_DIP)
+	CD4022(A)
+	NC_PIN(NC)
+
+	DIPPINS(   /*     +--------------+              */
+		 A.Q1, /*  Q1 |1     ++    16| VDD          */ A.VDD,
+		 A.Q0, /*  Q0 |2           15| RESET        */ A.RESET,
+		 A.Q2, /*  Q2 |3           14| CLOCK        */ A.CLK,
+		 A.Q5, /*  Q5 |4    4022   13| CLOCK ENABLE */ A.CLKEN,
+		 A.Q6, /*  Q6 |5           12| CARRY OUT    */ A.CO,
+		 NC.I, /*  NC |6           11| Q4           */ A.Q4,
+		 A.Q3, /*  Q3 |7           10| Q7           */ A.Q7,
+		A.VSS, /* VSS |8            9| NC           */ NC.I
+			   /*     +--------------+              */
+	)
+NETLIST_END()
+
+//- Identifier: CD4024_DIP
+//- Title: CD4024BM/CD4024BC 7-Stage Ripple Carry Binary Counter
+//- Description: The CD4024BM/CD4024BC is a 7-stage ripple-carry binary counter.
+//-   Buffered outputs are externally available from stages 1 through 7.
+//-   The counter is reset to its logical 0 stage by a logical 1 on the reset input.
+//-   The counter is advanced one count on the negative transition of each clock pulse.
+//- Pinalias: IP,RESET,Q7,Q6,Q5,Q4,VSS,NC,Q3,NC,Q2,Q1,NC,VDD
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheets/120/108894_DS.pdf
+//-
+static NETLIST_START(CD4024_DIP)
+	CD4024(A)
+	NC_PIN(NC)
+
+	DIPPINS(     /*       +--------------+     */
+		   A.IP, /*    IP |1     ++    14| VDD */ A.VDD,
+		A.RESET, /* RESET |2           13| NC  */ NC.I,
+		   A.Q7, /*    Q7 |3           12| Q1  */ A.Q1,
+		   A.Q6, /*    Q6 |4    4024   11| Q2  */ A.Q2,
+		   A.Q5, /*    Q5 |5           10| NC  */ NC.I,
+		   A.Q4, /*    Q4 |6            9| Q3  */ A.Q3,
+		  A.VSS, /*   VSS |7            8| NC  */ NC.I
+				 /*       +--------------+     */)
+NETLIST_END()
+
+//- Identifier: CD4053_DIP
+//- Title: CD4053BM/CD4053BC Triple 2-Channel AnalogMultiplexer/Demultiplexer
+//- Description: These analog multiplexers/demultiplexers are digitally controlled analog switches having low ON impedance andvery low OFF leakage currents.
+//-   Control of analog signalsup to 15V(p-p) can be achieved by digital signal amplitudes of 3–15V.
+//-   For example, if VDD=5V, VSS=0V and VEE=-5V, analog signals from -5V to +5V can be controlled by digital inputs of 0–5V.
+//-   The multiplexer circuits dissipate extremely low quiescent power over the full VDD-VSS and VDD-VEE supply voltage ranges, independent of the logic state of the control signals.
+//-   When a logical 1 is present atthe inhibit input terminal all channels are OFF.
+//-   CD4053BM/CD4053BC is a triple 2-channel multiplexer having three separate digital control inputs, A, B, and C, and an inhibit input.
+//-   Each control input selects one of a pair of channels which are connected in a single-pole double-throw configuration.
+//- Pinalias: INOUTBY,INOUTBX,INOUTCY,OUTINC,INOUTCX,INH,VEE,VSS,C,B,A,INOUTAX,INOUTAY,OUTINA,OUTINB,VDD
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS005662.PDF
+//-
+static NETLIST_START(CD4053_DIP)
+	CD4053_GATE(A)
+	CD4053_GATE(B)
+	CD4053_GATE(C)
+
+	NET_C(A.VEE, B.VEE, C.VEE)
+	NET_C(A.VDD, B.VDD, C.VDD)
+	NET_C(A.VSS, B.VSS, C.VSS)
+	NET_C(A.INH, B.INH, C.INH)
+
+	PARAM(A.BASER, 270.0)
+	PARAM(B.BASER, 270.0)
+	PARAM(C.BASER, 270.0)
+
+	DIPPINS(   /*         +--------------+         */
+		  B.Y, /* INOUTBY |1     ++    16| VDD     */ A.VDD,
+		  B.X, /* INOUTBX |2           15| OUTINB  */ B.XY,
+		  C.Y, /* INOUTCY |3           14| OUTINA  */ A.XY,
+		 C.XY, /*  OUTINC |4    4053   13| INOUTAY */ A.Y,
+		  C.X, /* INOUTCX |5           12| INOUTAX */ A.X,
+		A.INH, /*     INH |6           11| A       */ A.S,
+		A.VEE, /*     VEE |7           10| B       */ B.S,
+		A.VSS, /*     VSS |8            9| C       */ C.S
+			   /*         +--------------+         */
+	)
+NETLIST_END()
+
+//- Identifier: CD4066_DIP
+//- Title: CD4066BM/CD4066BC Quad Bilateral Switch
+//- Description: The CD4066BM/CD4066BC is a quad bilateral switch intended for the transmission or multiplexing of analog or digital signals.
+//-   It is pin-for-pin compatible with CD4016BM/CD4016BC, but has a much lower ON resistance, and ON resistance is relatively constant over the input-signal range.
+//- Pinalias: INOUTA,OUTINA,OUTINB,INOUTB,CONTROLB,CONTROLC,VSS,INOUTC,OUTINC,OUTIND,INOUTD,CONTROLD,CONTROLA,VDD
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS005665.PDF
+//-
+static NETLIST_START(CD4066_DIP)
+	CD4066_GATE(A)
+	CD4066_GATE(B)
+	CD4066_GATE(C)
+	CD4066_GATE(D)
+
+	NET_C(A.VDD, B.VDD, C.VDD, D.VDD)
+	NET_C(A.VSS, B.VSS, C.VSS, D.VSS)
+
+	PARAM(A.BASER, 270.0)
+	PARAM(B.BASER, 270.0)
+	PARAM(C.BASER, 270.0)
+	PARAM(D.BASER, 270.0)
+
+	DIPPINS(   /*          +--------------+          */
+		A.R.1, /*   INOUTA |1     ++    14| VDD      */ A.VDD,
+		A.R.2, /*   OUTINA |2           13| CONTROLA */ A.CTL,
+		B.R.1, /*   OUTINB |3           12| CONTROLD */ D.CTL,
+		B.R.2, /*   INOUTB |4    4066   11| INOUTD   */ D.R.1,
+		B.CTL, /* CONTROLB |5           10| OUTIND   */ D.R.2,
+		C.CTL, /* CONTROLC |6            9| OUTINC   */ C.R.1,
+		A.VSS, /*      VSS |7            8| INOUTC   */ C.R.2
+			   /*          +--------------+          */
+	)
+NETLIST_END()
+
+//- Identifier: CD4069_DIP
+//- Title: CD4069UBM/CD4069UBC Inverter Circuits
+//- Description: The CD4069UB consists of six inverter circuits and is manufactured using complementary MOS (CMOS) to achieve wide power supply operating range, low power consumption, high noise immunity, and symmetric controlled rise and fall times.
+//-   This device is intended for all general purpose inverter applications where the special characteristics of the MM74C901, MM74C903, MM74C907, and CD4049A Hex Inverter/Buffers are not required.
+//-   In those applications requiring larger noise immunity the MM74C14 or MM74C914 Hex Schmitt Trigger is suggested.
+//-   All inputs are protected from damage due to static discharge by diode clamps to VDD and VSS.
+//- Pinalias: A1,Y1,A2,Y2,A3,Y3,VSS,Y4,A4,Y5,A5,Y6,A6,VDD
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheets/150/206783_DS.pdf
+//-
+static NETLIST_START(CD4069_DIP)
+	CD4069_GATE(A)
+	CD4069_GATE(B)
+	CD4069_GATE(C)
+	CD4069_GATE(D)
+	CD4069_GATE(E)
+	CD4069_GATE(F)
+
+	NET_C(A.VDD, B.VDD, C.VDD, D.VDD, E.VDD, F.VDD)
+	NET_C(A.VSS, B.VSS, C.VSS, D.VSS, E.VSS, F.VSS)
+
+	DIPPINS(   /*     +--------------+     */
+		  A.A, /*  A1 |1     ++    14| VDD */ A.VDD,
+		  A.Q, /*  Y1 |2           13| A6  */ F.A,
+		  B.A, /*  A2 |3           12| Y6  */ F.Q,
+		  B.Q, /*  Y2 |4    4069   11| A5  */ E.A,
+		  C.A, /*  A3 |5           10| Y5  */ E.Q,
+		  C.Q, /*  Y3 |6            9| A4  */ D.A,
+		A.VSS, /* VSS |7            8| Y4  */ D.Q
+			   /*     +--------------+     */
+	)
+NETLIST_END()
+
+//- Identifier: CD4070_DIP
+//- Title: CD4070BM/CD4070BC Quad 2-Input EXCLUSIVE-OR Gate
+//- Description: Employing complementary MOS (CMOS) transistors to achieve wide power supply operating range, low power consumption, and high noise margin, the CD4070BM/BC provides basic functions used in the implementation of digital integrated circuit systems.
+//-   The N- and P-channel enhancement mode transistors provide a symmetrical circuit with output swing essentially equal to the supply voltage.
+//-   No DC power other than that caused by leakage current is consumed during static condition.
+//-   All inputs are protected from damage due to static discharge by diode clamps to VDD and VSS.
+//- Pinalias: A,B,J,K,C,D,VSS,E,F,L,M,G,H,VDD
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheets/150/206783_DS.pdf
+//-
+static NETLIST_START(CD4070_DIP)
+	CD4070_GATE(A)
+	CD4070_GATE(B)
+	CD4070_GATE(C)
+	CD4070_GATE(D)
+
+	NET_C(A.VDD, B.VDD, C.VDD, D.VDD)
+	NET_C(A.VSS, B.VSS, C.VSS, D.VSS)
+
+	DIPPINS(   /*     +--------------+     */
+		  A.A, /*   A |1     ++    14| VDD */ A.VDD,
+		  A.B, /*   B |2           13| H   */ D.B,
+		  A.Q, /*   J |3           12| G   */ D.A,
+		  B.Q, /*   K |4    4070   11| M   */ D.Q,
+		  B.A, /*   C |5           10| L   */ C.Q,
+		  B.B, /*   D |6            9| F   */ C.B,
+		A.VSS, /* VSS |7            8| E   */ C.A
+			   /*     +--------------+     */
+	)
+NETLIST_END()
+
+//- Identifier: CD4316_DIP
+//- Title: 74HC/HCT4316 Quad bilateral switches
+//- Description: The 74HC/HCT4316 are high-speed Si-gate CMOS devices.
+//-   They are specified in compliance with JEDEC standard no. 7A.
+//-   The 74HC/HCT4316 have four independent analog switches.
+//-   Each switch has two input/output terminals (nY, nZ) and an active HIGH select input (nS).
+//-   When the enable input (E) is HIGH, all four analog switches are turned off.
+//-   Current through a switch will not cause additional VCC current provided the voltage at the terminals of the switch is maintained within the supply voltage range; VCC >> (VY, VZ) >> VEE.
+//-   Inputs nY and nZ are electrically equivalent terminals.
+//-   VCC and GND are the supply voltage pins for the digital control inputs (EQ and nS).
+//-   The VCC to GND ranges are 2.0 to 10.0V for HC and 4.5 to 5.5V for HCT.
+//-   The analog inputs/outputs (nY and nZ) can swing between VCC as a positive limit and VEE as a negative limit.
+//-   VCC−VEE may not exceed 10.0 V
+//- Pinalias: 1Z,1Y,2Y,2Z,2S,3S,EQ,GND,VEE,3Z,3Y,4Y,4Z,4S,1S,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow Philips datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheet/philips/74HCT4316.pdf
+//-
+static NETLIST_START(CD4316_DIP)
+	CD4316_GATE(A)
+	CD4316_GATE(B)
+	CD4316_GATE(C)
+	CD4316_GATE(D)
+
+	NET_C(A.E, B.E, C.E, D.E)
+	NET_C(A.VDD, B.VDD, C.VDD, D.VDD)
+	NET_C(A.VSS, B.VSS, C.VSS, D.VSS)
+
+	PARAM(A.BASER, 45.0)
+	PARAM(B.BASER, 45.0)
+	PARAM(C.BASER, 45.0)
+	PARAM(D.BASER, 45.0)
+
+	DIPPINS(   /*     +--------------+     */
+		A.R.2, /*  1Z |1     ++    16| VCC */ A.VDD,
+		A.R.1, /*  1Y |2           15| 1S  */ A.S,
+		B.R.1, /*  2Y |3           14| 4S  */ D.S,
+		B.R.2, /*  2Z |4    4316   13| 4Z  */ D.R.2,
+		  B.S, /*  2S |5           12| 4Y  */ D.R.1,
+		  C.S, /*  3S |6           11| 3Y  */ C.R.1,
+		  A.E, /*  EQ |7           10| 3Z  */ C.R.2,
+		A.VSS, /* GND |8            9| VEE */ VEE
+			   /*     +--------------+     */
+	)
+NETLIST_END()
+
+//- Identifier:  CD4538_DIP
+//- Title: CD4538BC Dual Precision Monostable
+//- Description: The CD4538BC is a dual, precision monostable multivibrator with
+//-   independent trigger and reset controls. The device
+//-   is retriggerable and resettable, and the control inputs are
+//-   internally latched. Two trigger inputs are provided to allow
+//-   either rising or falling edge triggering. The reset inputs are
+//-   active LOW and prevent triggering while active. Precise
+//-   control of output pulse-width has been achieved using linear
+//-   CMOS techniques. The pulse duration and accuracy
+//-   are determined by external components RX and CX. The
+//-   device does not allow the timing capacitor to discharge
+//-   through the timing pin on power-down condition. For this
+//-   reason, no external protection resistor is required in series
+//-   with the timing pin. Input protection from static discharge is
+//-   provided on all pins.
+//-
+//- Pinalias: C1,RC1,CLRQ1,B1,A1,Q1,QQ1,GND,QQ2,Q2,A2,B2,CLRQ2,RC2,C2,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow Fairchild Semiconductor datasheet
+//- Limitations:
+//-    Timing inaccuracies may occur for capacitances < 1nF. Please consult datasheet
+//-
+//- Example: 74123.cpp,74123_example
+//-
+//- FunctionTable:
+//-    https://pdf1.alldatasheet.com/datasheet-pdf/view/50871/FAIRCHILD/CD4538.html
+//-
+static NETLIST_START(CD4538_DIP)
+	CD4538(A)
+	CD4538(B)
+
+	NET_C(A.VDD, B.VDD)
+	NET_C(A.VSS, B.VSS)
+
+	DIPPINS(    /*     +--------------+     */
+		   A.C, /*  1Z |1     ++    16| VCC */ A.VDD,
+		  A.RC, /*  1Y |2           15| 1S  */ B.C,
+		A.CLRQ, /*  2Y |3           14| 4S  */ B.RC,
+		   A.A, /*  2Z |4    4316   13| 4Z  */ B.CLRQ,
+		   A.B, /*  2S |5           12| 4Y  */ B.A,
+		   A.Q, /*  3S |6           11| 3Y  */ B.B,
+		  A.QQ, /*  EQ |7           10| 3Z  */ B.Q,
+		 A.VSS, /* GND |8            9| VEE */ B.QQ
+				/*     +--------------+     */
+	)
+NETLIST_END()
+
+
+NETLIST_START(cd4xxx_lib)
+
+	TRUTHTABLE_START(CD4001_GATE, 2, 1, "")
+		TT_HEAD("A , B | Q ")
+		TT_LINE("0,0|1|110")
+		TT_LINE("X,1|0|120")
+		TT_LINE("1,X|0|120")
+		TT_FAMILY("CD4XXX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(CD4011_GATE, 2, 1, "")
+		TT_HEAD("A,B|Q ")
+		TT_LINE("0,X|1|100")
+		TT_LINE("X,0|1|100")
+		TT_LINE("1,1|0|100")
+		TT_FAMILY("CD4XXX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(CD4069_GATE, 1, 1, "")
+		TT_HEAD("A|Q ")
+		TT_LINE("0|1|55")
+		TT_LINE("1|0|55")
+		TT_FAMILY("CD4XXX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(CD4070_GATE, 2, 1, "")
+		TT_HEAD("A,B|Q ")
+		TT_LINE("0,0|0|15")
+		TT_LINE("0,1|1|22")
+		TT_LINE("1,0|1|22")
+		TT_LINE("1,1|0|15")
+		TT_FAMILY("CD4XXX")
+	TRUTHTABLE_END()
+
+	LOCAL_LIB_ENTRY(CD4001_DIP)
+	LOCAL_LIB_ENTRY(CD4011_DIP)
+	LOCAL_LIB_ENTRY(CD4069_DIP)
+	LOCAL_LIB_ENTRY(CD4070_DIP)
+
+	/* DIP ONLY */
+	LOCAL_LIB_ENTRY(CD4006_DIP)
+	LOCAL_LIB_ENTRY(CD4013_DIP)
+	LOCAL_LIB_ENTRY(CD4017_DIP)
+	LOCAL_LIB_ENTRY(CD4022_DIP)
+	LOCAL_LIB_ENTRY(CD4020_DIP)
+	LOCAL_LIB_ENTRY(CD4024_DIP)
+	LOCAL_LIB_ENTRY(CD4053_DIP)
+	LOCAL_LIB_ENTRY(CD4066_DIP)
+	LOCAL_LIB_ENTRY(CD4016_DIP)
+	LOCAL_LIB_ENTRY(CD4316_DIP)
+	LOCAL_LIB_ENTRY(CD4538_DIP)
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx_lib.h mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx_lib.h
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx_lib.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_cd4xxx_lib.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,104 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+#ifndef NLD_CD4XXX_H_
+#define NLD_CD4XXX_H_
+
+/// \file nlm_cd4xxx.h
+///
+
+#include "netlist/nl_setup.h"
+
+/*
+ * Devices:
+ *
+ * CD4001_NOR : single gate
+ * CD4001_DIP : dip package
+ * CD4013_DIP : dip package (device model in core)
+ * CD4020_DIP : dip package (device model in core)
+ * CD4024_DIP : dip package (device model in core)
+ * CD4016_DIP : dip package (device model in core)
+ * CD4053_DIP : dip package (device model in core)
+ * CD4066_DIP : dip package (device model in core)
+ *
+ */
+
+#ifndef __PLIB_PREPROCESSOR__
+
+/* ----------------------------------------------------------------------------
+ *  Netlist Macros
+ * ---------------------------------------------------------------------------*/
+
+#if !NL_AUTO_DEVICES
+
+#define CD4001_GATE(name)                                                      \
+		NET_REGISTER_DEV(CD4001_GATE, name)
+
+#define CD4001_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4001_DIP, name)
+
+#define CD4011_GATE(name)                                                      \
+		NET_REGISTER_DEV(CD4011_GATE, name)
+
+#define CD4011_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4011_DIP, name)
+
+#define CD4069_GATE(name)                                                      \
+		NET_REGISTER_DEV(CD4069_GATE, name)
+
+#define CD4069_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4069_DIP, name)
+
+#define CD4070_GATE(name)                                                      \
+		NET_REGISTER_DEV(CD4070_GATE, name)
+
+#define CD4070_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4070_DIP, name)
+
+/* ----------------------------------------------------------------------------
+ *  DIP only macros
+ * ---------------------------------------------------------------------------*/
+
+#define CD4006_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4006_DIP, name)
+
+#define CD4013_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4013_DIP, name)
+
+#define CD4017_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4017_DIP, name)
+
+#define CD4022_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4022_DIP, name)
+
+#define CD4020_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4020_DIP, name)
+
+#define CD4024_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4024_DIP, name)
+
+#define CD4053_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4053_DIP, name)
+
+#define CD4066_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4066_DIP, name)
+
+#define CD4016_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4016_DIP, name)
+
+#define CD4316_DIP(name)                                                      \
+		NET_REGISTER_DEV(CD4016_DIP, name)
+
+#define CD4538_DIP(name)                                                        \
+		NET_REGISTER_DEV(CD4538_DIP, name)
+
+#endif // !NL_AUTO_DEVICES
+
+/* ----------------------------------------------------------------------------
+ *  External declarations
+ * ---------------------------------------------------------------------------*/
+
+// moved to net_lib.h
+
+#endif
+
+#endif // NLD_CD4XXX_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_opamp.cpp mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_opamp.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_opamp.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_opamp.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,428 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#include "netlist/devices/net_lib.h"
-
-/*
- * 0 = Basic hack (Norton with just amplification, no voltage cutting)
- * 1 = Model from LTSPICE mailing list - slow!
- * 2 = Simplified model using diode inputs and netlist
- * 3 = Model according to datasheet
- * 4 = Faster model by Colin Howell
- *
- * For Money Money 1 and 3 delivery comparable results.
- * 3 is simpler (less BJTs) and converges a lot faster.
- *
- * Model 4 uses a lot less resources and pn-junctions. The preferred new normal.
- */
-#define USE_LM3900_MODEL (4)
-
-/*
- *   Generic layout with 4 opamps, VCC on pin 4 and GND on pin 11
- */
-
-static NETLIST_START(opamp_layout_4_4_11)
-	DIPPINS(        /*   +--------------+   */
-		A.OUT,      /*   |1     ++    14|   */ D.OUT,
-		A.MINUS,    /*   |2           13|   */ D.MINUS,
-		A.PLUS,     /*   |3           12|   */ D.PLUS,
-		A.VCC,      /*   |4           11|   */ A.GND,
-		B.PLUS,     /*   |5           10|   */ C.PLUS,
-		B.MINUS,    /*   |6            9|   */ C.MINUS,
-		B.OUT,      /*   |7            8|   */ C.OUT
-					/*   +--------------+   */
-	)
-	NET_C(A.GND, B.GND, C.GND, D.GND)
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
-NETLIST_END()
-
-/*
- *   Generic layout with 2 opamps, VCC on pin 8 and GND on pin 4
- */
-
-static NETLIST_START(opamp_layout_2_8_4)
-	DIPPINS(        /*   +--------------+   */
-		A.OUT,      /*   |1     ++     8|   */ A.VCC,
-		A.MINUS,    /*   |2            7|   */ B.OUT,
-		A.PLUS,     /*   |3            6|   */ B.MINUS,
-		A.GND,      /*   |4            5|   */ B.PLUS
-					/*   +--------------+   */
-	)
-	NET_C(A.GND, B.GND)
-	NET_C(A.VCC, B.VCC)
-NETLIST_END()
-
-/*
- *   Generic layout with 2 opamps, VCC+ on pins 9/13,  VCC- on pin 4 and compensation
- */
-
-static NETLIST_START(opamp_layout_2_13_9_4)
-	DIPPINS(        /*   +--------------+   */
-		A.MINUS,    /*   |1     ++    14|   */ A.N2,
-		A.PLUS,     /*   |2           13|   */ A.VCC,
-		A.N1,       /*   |3           12|   */ A.OUT,
-		A.GND,      /*   |4           11|   */ NC,
-		B.N1,       /*   |5           10|   */ B.OUT,
-		B.PLUS,     /*   |6            9|   */ B.VCC,
-		B.MINUS,    /*   |7            8|   */ B.N2
-					/*   +--------------+   */
-	)
-	NET_C(A.GND, B.GND)
-NETLIST_END()
-
-/*
- *   Generic layout with 1 opamp, VCC+ on pin 7, VCC- on pin 4 and compensation
- *   // FIXME: Offset inputs are not supported!
- */
-
-static NETLIST_START(opamp_layout_1_7_4)
-	DIPPINS(             /*   +--------------+   */
-		NC /* OFFSET */, /*   |1     ++     8|   */ NC,
-		A.MINUS,         /*   |2            7|   */ A.VCC,
-		A.PLUS,          /*   |3            6|   */ A.OUT,
-		A.GND,           /*   |4            5|   */ NC /* OFFSET */
-						 /*   +--------------+   */
-	)
-NETLIST_END()
-
-/*
- *   Generic layout with 1 opamp, VCC+ on pin 8, VCC- on pin 5 and compensation
- */
-
-static NETLIST_START(opamp_layout_1_8_5)
-	DIPPINS(        /*   +--------------+   */
-		NC.1,       /*   |1           10|   */ NC.3,
-		OFFSET.N1,  /*   |2            9|   */ NC.2,
-		MINUS,      /*   |3            8|   */ VCC.PLUS,
-		PLUS,       /*   |4            7|   */ OUT,
-		VCC.MINUS,  /*   |5            6|   */ OFFSET.N2
-					/*   +--------------+   */
-	)
-	NET_C(A.GND, VCC.MINUS)
-	NET_C(A.VCC, VCC.PLUS)
-	NET_C(A.MINUS, MINUS)
-	NET_C(A.PLUS, PLUS)
-	NET_C(A.OUT, OUT)
-NETLIST_END()
-
-/*
- *   Generic layout with 1 opamp, VCC+ on pin 11, VCC- on pin 6 and compensation
- */
-
-static NETLIST_START(opamp_layout_1_11_6)
-	DIPPINS(        /*   +--------------+   */
-		NC.1,       /*   |1     ++    14|   */ NC.7,
-		NC.2,       /*   |2           13|   */ NC.6,
-		OFFSET.N1,  /*   |3           12|   */ NC.5,
-		MINUS,      /*   |4           11|   */ VCC.PLUS,
-		PLUS,       /*   |5           10|   */ OUT,
-		VCC.MINUS,  /*   |6            9|   */ OFFSET.N2,
-		NC.3,       /*   |7            8|   */ NC.4
-					/*   +--------------+   */
-	)
-	NET_C(A.GND, VCC.MINUS)
-	NET_C(A.VCC, VCC.PLUS)
-	NET_C(A.MINUS, MINUS)
-	NET_C(A.PLUS, PLUS)
-	NET_C(A.OUT, OUT)
-NETLIST_END()
-
-static NETLIST_START(MB3614_DIP)
-	OPAMP(A, "MB3614")
-	OPAMP(B, "MB3614")
-	OPAMP(C, "MB3614")
-	OPAMP(D, "MB3614")
-
-	INCLUDE(opamp_layout_4_4_11)
-
-NETLIST_END()
-
-static NETLIST_START(TL081_DIP)
-	OPAMP(A, "TL084")
-
-	INCLUDE(opamp_layout_1_7_4)
-
-NETLIST_END()
-
-static NETLIST_START(TL084_DIP)
-	OPAMP(A, "TL084")
-	OPAMP(B, "TL084")
-	OPAMP(C, "TL084")
-	OPAMP(D, "TL084")
-
-	INCLUDE(opamp_layout_4_4_11)
-
-NETLIST_END()
-
-static NETLIST_START(LM324_DIP)
-	OPAMP(A, "LM324")
-	OPAMP(B, "LM324")
-	OPAMP(C, "LM324")
-	OPAMP(D, "LM324")
-
-	INCLUDE(opamp_layout_4_4_11)
-
-NETLIST_END()
-
-static NETLIST_START(LM2902_DIP)
-	// Same datasheet and mostly same characteristics as LM324
-	OPAMP(A, "LM324")
-	OPAMP(B, "LM324")
-	OPAMP(C, "LM324")
-	OPAMP(D, "LM324")
-
-	INCLUDE(opamp_layout_4_4_11)
-
-NETLIST_END()
-
-static NETLIST_START(LM358_DIP)
-	OPAMP(A, "LM358")
-	OPAMP(B, "LM358")
-
-	INCLUDE(opamp_layout_2_8_4)
-
-NETLIST_END()
-
-static NETLIST_START(UA741_DIP8)
-	OPAMP(A, "UA741")
-
-	INCLUDE(opamp_layout_1_7_4)
-
-NETLIST_END()
-
-static NETLIST_START(UA741_DIP10)
-	OPAMP(A, "UA741")
-
-	INCLUDE(opamp_layout_1_8_5)
-
-NETLIST_END()
-
-static NETLIST_START(UA741_DIP14)
-	OPAMP(A, "UA741")
-
-	INCLUDE(opamp_layout_1_11_6)
-
-NETLIST_END()
-
-static NETLIST_START(LM747_DIP)
-	OPAMP(A, "LM747")
-	OPAMP(B, "LM747")
-
-	INCLUDE(opamp_layout_2_13_9_4)
-	NET_C(A.VCC, B.VCC)
-
-NETLIST_END()
-
-static NETLIST_START(LM747A_DIP)
-	OPAMP(A, "LM747A")
-	OPAMP(B, "LM747A")
-
-	INCLUDE(opamp_layout_2_13_9_4)
-	NET_C(A.VCC, B.VCC)
-
-NETLIST_END()
-
-#if USE_LM3900_MODEL == 0
-static NETLIST_START(LM3900)
-
-	/*
-	 *  Fast norton opamp model without bandwidth
-	 */
-
-	/* Terminal definitions for calling netlists */
-
-	ALIAS(PLUS, R1.1) // Positive input
-	ALIAS(MINUS, R2.1) // Negative input
-	ALIAS(OUT, G1.OP) // Opamp output ...
-	ALIAS(GND, G1.ON)  // V- terminal
-	ALIAS(VCC, DUMMY.1)  // V+ terminal
-
-	RES(DUMMY, RES_K(1))
-	NET_C(DUMMY.2, GND)
-
-	/* The opamp model */
-
-	RES(R1, 1)
-	RES(R2, 1)
-	NET_C(R1.1, G1.IP)
-	NET_C(R2.1, G1.IN)
-	NET_C(R1.2, R2.2, G1.ON)
-	VCVS(G1, 10000000)
-	//PARAM(G1.RI, 1)
-	PARAM(G1.RO, RES_K(8))
-
-NETLIST_END()
-#endif
-
-#if USE_LM3900_MODEL == 1
-//  LTSPICE MODEL OF LM3900 FROM NATIONAL SEMICONDUCTOR
-//  MADE BY HELMUT SENNEWALD, 8/6/2004
-//  THE LM3900 IS A SO CALLED NORTON AMPLIFIER.
-//
-//  PIN ORDER:    IN+ IN- VCC VSS OUT
-static NETLIST_START(LM3900)
-	PARAM(E1.G, 0.5)
-	//ALIAS(IN+, Q2.B)
-	//ALIAS(IN-, Q2.C)
-	//ALIAS(VCC, Q10.C)
-	//ALIAS(VSS, Q2.E)
-
-	ALIAS(PLUS, Q2.B)
-	ALIAS(MINUS, Q2.C)
-	ALIAS(VCC, Q10.C)
-	ALIAS(GND, Q2.E)
-	ALIAS(OUT, Q6.C)
-
-	//CS(B1/*I=LIMIT(0, V(VCC,VSS)/10K, 0.2m)*/)
-	CS(B1, 2e-4)
-	CAP(C1, CAP_P(6.000000))
-	VCVS(E1, 1)
-	QBJT_EB(Q1, "LM3900_NPN1")
-	QBJT_EB(Q10, "LM3900_NPN1")
-	QBJT_EB(Q11, "LM3900_NPN1")
-	QBJT_EB(Q12, "LM3900_NPN1")
-	QBJT_EB(Q2, "LM3900_NPN1")
-	QBJT_EB(Q3, "LM3900_NPN1")
-	QBJT_EB(Q4, "LM3900_PNP1")
-	QBJT_EB(Q5, "LM3900_PNP1")
-	QBJT_EB(Q6, "LM3900_PNP1")
-	QBJT_EB(Q7, "LM3900_PNP1")
-	QBJT_EB(Q8, "LM3900_NPN1")
-	QBJT_EB(Q9, "LM3900_NPN1")
-	RES(R1, RES_K(2.000000))
-	RES(R6, RES_K(1.600000))
-	NET_C(Q11.B, Q12.B, R6.2)
-	NET_C(Q5.C, Q5.B, B1.P, Q4.B)
-	NET_C(Q8.C, Q8.B, B1.N, R1.1, E1.IP)
-	NET_C(Q9.B, R1.2)
-	NET_C(R6.1, E1.OP)
-	NET_C(Q10.C, Q5.E, Q4.E, Q11.C, Q12.C)
-	NET_C(Q2.C, Q3.B, Q12.E)
-	NET_C(Q2.E, Q3.E, Q9.E, C1.2, Q1.E, Q8.E, E1.ON, E1.IN, Q7.C)
-	NET_C(Q3.C, Q6.B, C1.1, Q7.B)
-	NET_C(Q6.E, Q10.B, Q4.C)
-	NET_C(Q6.C, Q10.E, Q9.C, Q7.E)
-	NET_C(Q2.B, Q1.C, Q1.B, Q11.E)
-NETLIST_END()
-#endif
-
-#if USE_LM3900_MODEL == 2
-static NETLIST_START(LM3900)
-	OPAMP(A, "LM3900")
-
-	DIODE(D1, "D(IS=1e-15 N=1)")
-	CCCS(CS1, 1) // Current Mirror
-
-	ALIAS(VCC, A.VCC)
-	ALIAS(GND, A.GND)
-	ALIAS(PLUS, A.PLUS)
-	ALIAS(MINUS, A.MINUS)
-	ALIAS(OUT, A.OUT)
-
-	NET_C(A.PLUS, CS1.IP)
-	NET_C(D1.A, CS1.IN)
-	NET_C(CS1.ON, A.MINUS)
-	NET_C(CS1.OP, A.GND, D1.K)
-
-NETLIST_END()
-#endif
-
-#if USE_LM3900_MODEL == 3
-static NETLIST_START(LM3900)
-
-	ALIAS(VCC, Q5.C)
-	ALIAS(GND, Q1.E)
-	ALIAS(PLUS, Q1.B)
-	ALIAS(MINUS, Q1.C)
-	ALIAS(OUT, Q5.E)
-
-	CAP(C1, CAP_P(6.000000))
-	CS(I1, 1.300000e-3)
-	CS(I2, 200e-6)
-	QBJT_EB(Q1, "NPN")
-	QBJT_EB(Q2, "NPN")
-	QBJT_EB(Q3, "PNP")
-	QBJT_EB(Q4, "PNP")
-	QBJT_EB(Q5, "NPN")
-	QBJT_EB(Q6, "NPN")
-	NET_C(Q3.E, Q5.B, I2.2)
-	NET_C(Q3.C, Q4.E, Q5.E, I1.1)
-	NET_C(Q5.C, I2.1)
-	NET_C(Q1.B, Q6.C, Q6.B)
-	NET_C(Q1.E, Q2.E, Q4.C, C1.2, I1.2, Q6.E)
-	NET_C(Q1.C, Q2.B)
-	NET_C(Q2.C, Q3.B, Q4.B, C1.1)
-NETLIST_END()
-#endif
-
-#if USE_LM3900_MODEL == 4
-static NETLIST_START(LM3900)
-	OPAMP(A, "OPAMP(TYPE=3 VLH=0.5 VLL=0.03 FPF=2k UGF=2.5M SLEW=1M RI=10M RO=100 DAB=0.0015)")
-
-	DIODE(D1, "D(IS=6e-15 N=1)")
-	DIODE(D2, "D(IS=6e-15 N=1)")
-	CCCS(CS1, 1) // Current Mirror
-
-	ALIAS(VCC, A.VCC)
-	ALIAS(GND, A.GND)
-	ALIAS(OUT, A.OUT)
-
-	ALIAS(PLUS, CS1.IP)
-	NET_C(D1.A, CS1.IN)
-	NET_C(A.GND, D1.K)
-
-	CS(CS_BIAS, 10e-6)
-	NET_C(A.VCC, CS_BIAS.P)
-
-	ALIAS(MINUS, CS1.OP)
-	NET_C(CS1.ON, A.GND)
-
-	CCVS(VS1, 200000) // current-to-voltage gain
-	NET_C(CS1.OP, VS1.IP)
-	NET_C(VS1.IN, CS_BIAS.N, D2.A)
-	NET_C(D2.K, A.GND)
-	NET_C(VS1.OP, A.MINUS)
-	NET_C(VS1.ON, A.PLUS, A.GND)
-NETLIST_END()
-#endif
-
-NETLIST_START(OPAMP_lib)
-	LOCAL_LIB_ENTRY(opamp_layout_4_4_11)
-	LOCAL_LIB_ENTRY(opamp_layout_2_8_4)
-	LOCAL_LIB_ENTRY(opamp_layout_2_13_9_4)
-	LOCAL_LIB_ENTRY(opamp_layout_1_7_4)
-	LOCAL_LIB_ENTRY(opamp_layout_1_8_5)
-	LOCAL_LIB_ENTRY(opamp_layout_1_11_6)
-
-	// FIXME: JFET Opamp may need better model
-	// VLL and VHH for +-6V  RI=10^12 (for numerical stability 10^9 is used below
-	// RO from data sheet
-	NET_MODEL("TL084       OPAMP(TYPE=3 VLH=0.75 VLL=0.75 FPF=10 UGF=3000k SLEW=13M RI=1000M RO=192 DAB=0.0014)")
-
-	NET_MODEL("LM324       OPAMP(TYPE=3 VLH=2.0 VLL=0.2 FPF=5 UGF=500k SLEW=0.3M RI=1000k RO=50 DAB=0.00075)")
-	NET_MODEL("LM358       OPAMP(TYPE=3 VLH=2.0 VLL=0.2 FPF=5 UGF=500k SLEW=0.3M RI=1000k RO=50 DAB=0.001)")
-	NET_MODEL("MB3614      OPAMP(TYPE=3 VLH=1.4 VLL=0.02 FPF=3 UGF=1000k SLEW=0.6M RI=1000k RO=100 DAB=0.002)")
-	NET_MODEL("UA741       OPAMP(TYPE=3 VLH=1.0 VLL=1.0 FPF=5 UGF=1000k SLEW=0.5M RI=2000k RO=75 DAB=0.0017)")
-	NET_MODEL("LM747       OPAMP(TYPE=3 VLH=1.0 VLL=1.0 FPF=5 UGF=1000k SLEW=0.5M RI=2000k RO=50 DAB=0.0017)")
-	NET_MODEL("LM747A      OPAMP(TYPE=3 VLH=2.0 VLL=2.0 FPF=5 UGF=1000k SLEW=0.7M RI=6000k RO=50 DAB=0.0015)")
-	// TI and Motorola Datasheets differ - below are Motorola values, SLEW is average of LH and HL
-	NET_MODEL("LM3900      OPAMP(TYPE=3 VLH=1.0 VLL=0.03 FPF=2k UGF=4M SLEW=10M RI=10M RO=2k DAB=0.0015)")
-
-#if USE_LM3900_MODEL == 1
-	NET_MODEL("LM3900_NPN1 NPN(IS=1E-14 BF=150 TF=1E-9 CJC=1E-12 CJE=1E-12 VAF=150 RB=100 RE=5 IKF=0.002)")
-	NET_MODEL("LM3900_PNP1 PNP(IS=1E-14 BF=40 TF=1E-7 CJC=1E-12 CJE=1E-12 VAF=150 RB=100 RE=5)")
-#endif
-	LOCAL_LIB_ENTRY(MB3614_DIP)
-	LOCAL_LIB_ENTRY(TL081_DIP)
-	LOCAL_LIB_ENTRY(TL084_DIP)
-	LOCAL_LIB_ENTRY(LM324_DIP)
-	LOCAL_LIB_ENTRY(LM358_DIP)
-	LOCAL_LIB_ENTRY(LM2902_DIP)
-	LOCAL_LIB_ENTRY(UA741_DIP8)
-	LOCAL_LIB_ENTRY(UA741_DIP10)
-	LOCAL_LIB_ENTRY(UA741_DIP14)
-	LOCAL_LIB_ENTRY(LM747_DIP)
-	LOCAL_LIB_ENTRY(LM747A_DIP)
-	LOCAL_LIB_ENTRY(LM3900)
-
-NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_opamp.h mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_opamp.h
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_opamp.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_opamp.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLM_OPAMP_H_
-#define NLM_OPAMP_H_
-
-///
-/// \file nlm_opamp.h
-///
-
-#include "netlist/nl_setup.h"
-
-#ifndef __PLIB_PREPROCESSOR__
-
-/* ----------------------------------------------------------------------------
- *  Netlist Macros
- * ---------------------------------------------------------------------------*/
-
-#if !NL_AUTO_DEVICES
-
-#define MB3614_DIP(name)                                                       \
-		NET_REGISTER_DEV(MB3614_DIP, name)
-
-#define LM324_DIP(name)                                                        \
-		NET_REGISTER_DEV(LM324_DIP, name)
-
-#define TL081_DIP(name)                                                        \
-		NET_REGISTER_DEV(TL081_DIP, name)
-
-#define TL084_DIP(name)                                                        \
-		NET_REGISTER_DEV(TL084_DIP, name)
-
-#define LM2902_DIP(name)                                                       \
-		NET_REGISTER_DEV(LM2902_DIP, name)
-
-#define LM358_DIP(name)                                                        \
-		NET_REGISTER_DEV(LM358_DIP, name)
-
-#define LM3900(name)                                                           \
-		NET_REGISTER_DEV(LM3900, name)
-
-#define UA741_DIP8(name)                                                       \
-		NET_REGISTER_DEV(UA741_DIP8, name)
-
-#define UA741_DIP10(name)                                                      \
-		NET_REGISTER_DEV(UA741_DIP10, name)
-
-#define UA741_DIP14(name)                                                      \
-		NET_REGISTER_DEV(UA741_DIP14, name)
-
-#define LM747_DIP(name)                                                        \
-		NET_REGISTER_DEV(LM747_DIP, name)
-
-#define LM747A_DIP(name)                                                       \
-		NET_REGISTER_DEV(LM747A_DIP, name)
-
-#endif // NL_AUTO_DEVICES
-
-/* ----------------------------------------------------------------------------
- *  External declarations
- * ---------------------------------------------------------------------------*/
-
-NETLIST_EXTERNAL(OPAMP_lib)
-
-#endif // __PLIB_PREPROCESSOR__
-
-#endif
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_opamp_lib.cpp mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_opamp_lib.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_opamp_lib.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_opamp_lib.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,653 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#include "netlist/devices/net_lib.h"
+
+/*
+ * 0 = Basic hack (Norton with just amplification, no voltage cutting)
+ * 1 = Model from LTSPICE mailing list - slow!
+ * 2 = Simplified model using diode inputs and netlist
+ * 3 = Model according to datasheet
+ * 4 = Faster model by Colin Howell
+ *
+ * For Money Money 1 and 3 delivery comparable results.
+ * 3 is simpler (less BJTs) and converges a lot faster.
+ *
+ * Model 4 uses a lot less resources and pn-junctions. The preferred new normal.
+ */
+#define USE_LM3900_MODEL (4)
+
+/*
+ *   Generic layout with 4 opamps, VCC on pin 4 and GND on pin 11
+ */
+
+static NETLIST_START(opamp_layout_4_4_11)
+	DIPPINS(        /*   +--------------+   */
+		A.OUT,      /*   |1     ++    14|   */ D.OUT,
+		A.MINUS,    /*   |2           13|   */ D.MINUS,
+		A.PLUS,     /*   |3           12|   */ D.PLUS,
+		A.VCC,      /*   |4           11|   */ A.GND,
+		B.PLUS,     /*   |5           10|   */ C.PLUS,
+		B.MINUS,    /*   |6            9|   */ C.MINUS,
+		B.OUT,      /*   |7            8|   */ C.OUT
+					/*   +--------------+   */
+	)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+NETLIST_END()
+
+/*
+ *   Generic layout with 2 opamps, VCC on pin 8 and GND on pin 4
+ */
+
+static NETLIST_START(opamp_layout_2_8_4)
+	DIPPINS(        /*   +--------------+   */
+		A.OUT,      /*   |1     ++     8|   */ A.VCC,
+		A.MINUS,    /*   |2            7|   */ B.OUT,
+		A.PLUS,     /*   |3            6|   */ B.MINUS,
+		A.GND,      /*   |4            5|   */ B.PLUS
+					/*   +--------------+   */
+	)
+	NET_C(A.GND, B.GND)
+	NET_C(A.VCC, B.VCC)
+NETLIST_END()
+
+/*
+ *   Generic layout with 2 opamps, VCC+ on pins 9/13,  VCC- on pin 4 and compensation
+ */
+
+static NETLIST_START(opamp_layout_2_13_9_4)
+	DIPPINS(        /*   +--------------+   */
+		A.MINUS,    /*   |1     ++    14|   */ A.N2,
+		A.PLUS,     /*   |2           13|   */ A.VCC,
+		A.N1,       /*   |3           12|   */ A.OUT,
+		A.GND,      /*   |4           11|   */ NC,
+		B.N1,       /*   |5           10|   */ B.OUT,
+		B.PLUS,     /*   |6            9|   */ B.VCC,
+		B.MINUS,    /*   |7            8|   */ B.N2
+					/*   +--------------+   */
+	)
+	NET_C(A.GND, B.GND)
+NETLIST_END()
+
+/*
+ *   Generic layout with 1 opamp, VCC+ on pin 7, VCC- on pin 4 and compensation
+ *   // FIXME: Offset inputs are not supported!
+ */
+
+static NETLIST_START(opamp_layout_1_7_4)
+	DIPPINS(             /*   +--------------+   */
+		NC /* OFFSET */, /*   |1     ++     8|   */ NC,
+		A.MINUS,         /*   |2            7|   */ A.VCC,
+		A.PLUS,          /*   |3            6|   */ A.OUT,
+		A.GND,           /*   |4            5|   */ NC /* OFFSET */
+						 /*   +--------------+   */
+	)
+NETLIST_END()
+
+/*
+ *   Generic layout with 1 opamp, VCC+ on pin 8, VCC- on pin 5 and compensation
+ */
+
+static NETLIST_START(opamp_layout_1_8_5)
+	DIPPINS(        /*   +--------------+   */
+		NC.1,       /*   |1           10|   */ NC.3,
+		OFFSET.N1,  /*   |2            9|   */ NC.2,
+		MINUS,      /*   |3            8|   */ VCC.PLUS,
+		PLUS,       /*   |4            7|   */ OUT,
+		VCC.MINUS,  /*   |5            6|   */ OFFSET.N2
+					/*   +--------------+   */
+	)
+	NET_C(A.GND, VCC.MINUS)
+	NET_C(A.VCC, VCC.PLUS)
+	NET_C(A.MINUS, MINUS)
+	NET_C(A.PLUS, PLUS)
+	NET_C(A.OUT, OUT)
+NETLIST_END()
+
+/*
+ *   Generic layout with 1 opamp, VCC+ on pin 11, VCC- on pin 6 and compensation
+ */
+
+static NETLIST_START(opamp_layout_1_11_6)
+	DIPPINS(        /*   +--------------+   */
+		NC.1,       /*   |1     ++    14|   */ NC.7,
+		NC.2,       /*   |2           13|   */ NC.6,
+		OFFSET.N1,  /*   |3           12|   */ NC.5,
+		MINUS,      /*   |4           11|   */ VCC.PLUS,
+		PLUS,       /*   |5           10|   */ OUT,
+		VCC.MINUS,  /*   |6            9|   */ OFFSET.N2,
+		NC.3,       /*   |7            8|   */ NC.4
+					/*   +--------------+   */
+	)
+	NET_C(A.GND, VCC.MINUS)
+	NET_C(A.VCC, VCC.PLUS)
+	NET_C(A.MINUS, MINUS)
+	NET_C(A.PLUS, PLUS)
+	NET_C(A.OUT, OUT)
+NETLIST_END()
+
+static NETLIST_START(MB3614_DIP)
+	OPAMP(A, "MB3614")
+	OPAMP(B, "MB3614")
+	OPAMP(C, "MB3614")
+	OPAMP(D, "MB3614")
+
+	INCLUDE(opamp_layout_4_4_11)
+
+NETLIST_END()
+
+static NETLIST_START(MC3340_DIP)
+	// A netlist description of the Motorola MC3340 Electronic Attenuator
+	// IC, a voltage-controlled amplifier/attenuator. It amplifies or
+	// attenuates an input signal according to the voltage of a second,
+	// control signal, with a maximum gain of about 12-13 dB (about a
+	// factor of 4 in voltage), and higher control voltages giving greater
+	// attenuation, which scales logarithmically.
+
+	// The netlist here is based on the circuit schematic given in
+	// Motorola's own data books, especially the most recent ones
+	// published in the 1990s (e.g. _Motorola Analog/Interface ICs Device
+	// Data, Vol. II_ (1996), p. 9-67), which are the only schematics that
+	// include resistor values. However, the 1990s schematics are missing
+	// one crossover connection which is present in older schematics
+	// published in the 1970s (e.g. _Motorola Linear Integrated Circuits_
+	// (1979), p. 5-130). This missing connection is clearly an error
+	// which has been fixed in this netlist; without it, the circuit won't
+	// amplify properly, generating only a very weak output signal.
+
+	// The 1990s schematics also omit a couple of diodes which are present
+	// in the 1970s schematics. Both of these diodes have been included
+	// here. One raises the minimum control voltage at which signal
+	// attenuation starts, so it makes the netlist's profile of
+	// attenuation vs. control voltage better match Motorola's charts for
+	// the device. The other affects the level of the input "midpoint",
+	// and including it makes the engine sound closer to that on real
+	// 280-ZZZAP machines.
+
+	// The Motorola schematics do not label components, so I've created my
+	// own labeling scheme based on numbering components on the schematics
+	// from top to bottom, left to right, with resistors also getting
+	// their value (expressed European-style to avoid decimal points) as
+	// part of the name. The netlist is also listed following the
+	// schematics in roughly top-to-bottom, left-to-right order.
+
+	// A very simple model is used for the transistors here, based on the
+	// generic NPN default but with a larger scale current. Again, this
+	// was chosen to better match the netlist's attenuation vs. control
+	// voltage profile to that given in Motorola's charts for the device.
+
+	// The MC3340 has the same circuit internally as an older Motorola
+	// device, the MFC6040, which was replaced by the MC3340 in the
+	// mid-1970s. The two chips differ only in packaging. Older arcade
+	// games which use the MFC6040 may also benefit from this netlist
+	// implementation.
+
+	RES(R1_5K1, RES_K(5.1))
+
+	DIODE(D1, "D(IS=1e-15 N=1)")
+
+	RES(R2_4K7, RES_K(4.7))
+
+	QBJT_EB(Q1, "NPN(IS=1E-13 BF=100)")
+
+	RES(R3_750, RES_R(750))
+	RES(R4_10K, RES_K(10))
+
+	QBJT_EB(Q2, "NPN(IS=1E-13 BF=100)")
+
+	RES(R5_750, RES_R(750))
+	RES(R6_3K9, RES_K(3.9))
+
+	RES(R7_5K1, RES_K(5.1))
+	RES(R8_20K, RES_K(20))
+
+	DIODE(D2, "D(IS=1e-15 N=1)")
+
+	RES(R9_510, RES_R(510))
+
+	QBJT_EB(Q3, "NPN(IS=1E-13 BF=100)")
+
+	QBJT_EB(Q4, "NPN(IS=1E-13 BF=100)")
+
+	QBJT_EB(Q5, "NPN(IS=1E-13 BF=100)")
+
+	RES(R10_1K3, RES_K(1.3))
+
+	QBJT_EB(Q6, "NPN(IS=1E-13 BF=100)")
+
+	RES(R11_5K1, RES_K(5.1))
+
+	QBJT_EB(Q7, "NPN(IS=1E-13 BF=100)")
+
+	QBJT_EB(Q8, "NPN(IS=1E-13 BF=100)")
+
+	RES(R12_1K5, RES_K(1.5))
+
+	RES(R13_6K2, RES_K(6.2))
+
+	QBJT_EB(Q9, "NPN(IS=1E-13 BF=100)")
+
+	RES(R14_5K1, RES_K(5.1))
+
+	QBJT_EB(Q10, "NPN(IS=1E-13 BF=100)")
+
+	RES(R15_5K1, RES_K(5.1))
+
+	RES(R16_200, RES_R(200))
+
+	RES(R17_5K1, RES_K(5.1))
+
+	DIODE(D3, "D(IS=1e-15 N=1)")
+
+	RES(R18_510, RES_R(510))
+
+	ALIAS(VCC, R1_5K1.1)
+	NET_C(R1_5K1.1, Q1.C, Q2.C, R7_5K1.1, Q3.C, Q4.C, Q7.C,
+		R13_6K2.1, Q10.C, R17_5K1.1)
+	// Location of first diode present on 1970s schematics but omitted on
+	// 1990s ones. Including it raises the control voltage threshold for
+	// attenuation significantly.
+	NET_C(R1_5K1.2, D1.A, Q1.B)
+	NET_C(D1.K, R2_4K7.1)
+	NET_C(R2_4K7.2, GND)
+
+	NET_C(Q1.E, R3_750.1, R5_750.1)
+	NET_C(R3_750.2, R4_10K.1, Q2.B)
+	NET_C(R4_10K.2, GND)
+
+	NET_C(R5_750.2, R6_3K9.1, Q3.B)
+	ALIAS(CONTROL, R6_3K9.2)
+
+	ALIAS(INPUT, Q5.B)
+
+	NET_C(INPUT, R8_20K.1)
+	// Location of second diode present on 1970s schematics but omitted on
+	// 1990s ones. Including it is critical to making the tone of the
+	// output engine sound match that of real 280-ZZZAP machines.
+	NET_C(R7_5K1.2, R8_20K.2, D2.A)
+	NET_C(D2.K, R9_510.1)
+	NET_C(R9_510.2, GND)
+
+	NET_C(Q4.E, Q6.E, Q5.C)
+	NET_C(Q5.E, R10_1K3.1)
+	NET_C(R10_1K3.2, GND)
+
+	NET_C(Q6.B, Q7.B, Q2.E, R11_5K1.1)
+	NET_C(R11_5K1.2, GND)
+
+	NET_C(Q7.E, Q9.E, Q8.C)
+	NET_C(Q8.E, R12_1K5.1)
+	NET_C(R12_1K5.2, GND)
+
+	NET_C(Q4.B, Q9.B, Q3.E, R14_5K1.1)
+	NET_C(R14_5K1.2, GND)
+
+	// This is where the cross-connection is erroneously omitted from
+	// 1990s schematics.
+	NET_C(Q6.C, R13_6K2.2, Q9.C, Q10.B)
+
+	// Connection for external frequency compensation capacitor; unused
+	// here.
+	ALIAS(ROLLOFF, Q10.B)
+
+	NET_C(Q10.E, R16_200.1, R15_5K1.1)
+	NET_C(R15_5K1.2, GND)
+	ALIAS(OUTPUT, R16_200.2)
+
+	NET_C(R17_5K1.2, D3.A, Q8.B)
+	NET_C(D3.K, R18_510.1)
+	ALIAS(GND, R18_510.2)
+
+	ALIAS(1, INPUT)
+	ALIAS(2, CONTROL)
+	ALIAS(3, GND)
+	ALIAS(6, ROLLOFF)
+	ALIAS(7, OUTPUT)
+	ALIAS(8, VCC)
+NETLIST_END()
+
+static NETLIST_START(TL081_DIP)
+	OPAMP(A, "TL084")
+
+	INCLUDE(opamp_layout_1_7_4)
+
+NETLIST_END()
+
+static NETLIST_START(TL082_DIP)
+	OPAMP(A, "TL084")
+	OPAMP(B, "TL084")
+
+	INCLUDE(opamp_layout_2_8_4)
+
+NETLIST_END()
+
+static NETLIST_START(TL084_DIP)
+	OPAMP(A, "TL084")
+	OPAMP(B, "TL084")
+	OPAMP(C, "TL084")
+	OPAMP(D, "TL084")
+
+	INCLUDE(opamp_layout_4_4_11)
+
+NETLIST_END()
+
+static NETLIST_START(LM324_DIP)
+	OPAMP(A, "LM324")
+	OPAMP(B, "LM324")
+	OPAMP(C, "LM324")
+	OPAMP(D, "LM324")
+
+	INCLUDE(opamp_layout_4_4_11)
+
+NETLIST_END()
+
+static NETLIST_START(LM2902_DIP)
+	// Same datasheet and mostly same characteristics as LM324
+	OPAMP(A, "LM324")
+	OPAMP(B, "LM324")
+	OPAMP(C, "LM324")
+	OPAMP(D, "LM324")
+
+	INCLUDE(opamp_layout_4_4_11)
+
+NETLIST_END()
+
+static NETLIST_START(LM358_DIP)
+	OPAMP(A, "LM358")
+	OPAMP(B, "LM358")
+
+	INCLUDE(opamp_layout_2_8_4)
+
+NETLIST_END()
+
+static NETLIST_START(UA741_DIP8)
+	OPAMP(A, "UA741")
+
+	INCLUDE(opamp_layout_1_7_4)
+
+NETLIST_END()
+
+static NETLIST_START(UA741_DIP10)
+	OPAMP(A, "UA741")
+
+	INCLUDE(opamp_layout_1_8_5)
+
+NETLIST_END()
+
+static NETLIST_START(UA741_DIP14)
+	OPAMP(A, "UA741")
+
+	INCLUDE(opamp_layout_1_11_6)
+
+NETLIST_END()
+
+static NETLIST_START(MC1558_DIP)
+	OPAMP(A, "UA741")
+	OPAMP(B, "UA741")
+
+	INCLUDE(opamp_layout_2_8_4)
+
+NETLIST_END()
+
+static NETLIST_START(LM747_DIP)
+	OPAMP(A, "LM747")
+	OPAMP(B, "LM747")
+
+	INCLUDE(opamp_layout_2_13_9_4)
+	NET_C(A.VCC, B.VCC)
+
+NETLIST_END()
+
+static NETLIST_START(LM747A_DIP)
+	OPAMP(A, "LM747A")
+	OPAMP(B, "LM747A")
+
+	INCLUDE(opamp_layout_2_13_9_4)
+	NET_C(A.VCC, B.VCC)
+
+NETLIST_END()
+
+//- Identifier: AN6551_SIL
+//- Title: AN6551 Dual Operational Amplifier
+//- Description: The AN6551 is a dual operational Amplifier with a
+//-   phase compensation circuit built-in. It is suitable for application to
+//-   various electronic circuits such as active filters and
+//-   audio pre-amplifiers
+//-
+//-   Features: Phase compensation circuit, High gain, low noise,
+//-   Output short-circuit protection, Two circuits symmetrically arranged in 9-pin SIL plastic package
+//- Pinalias: VCC,A.OUT,A-,A+,GND,B+,B-,B.OUT,VCC
+//- Package: SIL
+//- NamingConvention: Naming conventions follow Panasonic datasheet
+//- FunctionTable:
+//-   https://datasheetspdf.com/pdf-file/182163/PanasonicSemiconductor/AN6551/1
+//-
+static NETLIST_START(AN6551_SIL)
+	OPAMP(A, "AN6551")
+	OPAMP(B, "AN6551")
+
+	NET_C(A.GND, B.GND)
+
+	ALIAS(1, A.VCC)
+	ALIAS(2, A.OUT)
+	ALIAS(3, A.MINUS)
+	ALIAS(4, A.PLUS)
+	ALIAS(5, A.GND)
+	ALIAS(6, B.PLUS)
+	ALIAS(7, B.MINUS)
+	ALIAS(8, B.OUT)
+	ALIAS(9, B.VCC)
+NETLIST_END()
+
+#if USE_LM3900_MODEL == 0
+static NETLIST_START(LM3900)
+
+	/*
+	 *  Fast norton opamp model without bandwidth
+	 */
+
+	/* Terminal definitions for calling netlists */
+
+	ALIAS(PLUS, R1.1) // Positive input
+	ALIAS(MINUS, R2.1) // Negative input
+	ALIAS(OUT, G1.OP) // Opamp output ...
+	ALIAS(GND, G1.ON)  // V- terminal
+	ALIAS(VCC, DUMMY.1)  // V+ terminal
+
+	RES(DUMMY, RES_K(1))
+	NET_C(DUMMY.2, GND)
+
+	/* The opamp model */
+
+	RES(R1, 1)
+	RES(R2, 1)
+	NET_C(R1.1, G1.IP)
+	NET_C(R2.1, G1.IN)
+	NET_C(R1.2, R2.2, G1.ON)
+	VCVS(G1, 10000000)
+	//PARAM(G1.RI, 1)
+	PARAM(G1.RO, RES_K(8))
+
+NETLIST_END()
+#endif
+
+#if USE_LM3900_MODEL == 1
+//  LTSPICE MODEL OF LM3900 FROM NATIONAL SEMICONDUCTOR
+//  MADE BY HELMUT SENNEWALD, 8/6/2004
+//  THE LM3900 IS A SO CALLED NORTON AMPLIFIER.
+//
+//  PIN ORDER:    IN+ IN- VCC VSS OUT
+static NETLIST_START(LM3900)
+	PARAM(E1.G, 0.5)
+	//ALIAS(IN+, Q2.B)
+	//ALIAS(IN-, Q2.C)
+	//ALIAS(VCC, Q10.C)
+	//ALIAS(VSS, Q2.E)
+
+	ALIAS(PLUS, Q2.B)
+	ALIAS(MINUS, Q2.C)
+	ALIAS(VCC, Q10.C)
+	ALIAS(GND, Q2.E)
+	ALIAS(OUT, Q6.C)
+
+	//CS(B1/*I=LIMIT(0, V(VCC,VSS)/10K, 0.2m)*/)
+	CS(B1, 2e-4)
+	CAP(C1, CAP_P(6.000000))
+	VCVS(E1, 1)
+	QBJT_EB(Q1, "LM3900_NPN1")
+	QBJT_EB(Q10, "LM3900_NPN1")
+	QBJT_EB(Q11, "LM3900_NPN1")
+	QBJT_EB(Q12, "LM3900_NPN1")
+	QBJT_EB(Q2, "LM3900_NPN1")
+	QBJT_EB(Q3, "LM3900_NPN1")
+	QBJT_EB(Q4, "LM3900_PNP1")
+	QBJT_EB(Q5, "LM3900_PNP1")
+	QBJT_EB(Q6, "LM3900_PNP1")
+	QBJT_EB(Q7, "LM3900_PNP1")
+	QBJT_EB(Q8, "LM3900_NPN1")
+	QBJT_EB(Q9, "LM3900_NPN1")
+	RES(R1, RES_K(2.000000))
+	RES(R6, RES_K(1.600000))
+	NET_C(Q11.B, Q12.B, R6.2)
+	NET_C(Q5.C, Q5.B, B1.P, Q4.B)
+	NET_C(Q8.C, Q8.B, B1.N, R1.1, E1.IP)
+	NET_C(Q9.B, R1.2)
+	NET_C(R6.1, E1.OP)
+	NET_C(Q10.C, Q5.E, Q4.E, Q11.C, Q12.C)
+	NET_C(Q2.C, Q3.B, Q12.E)
+	NET_C(Q2.E, Q3.E, Q9.E, C1.2, Q1.E, Q8.E, E1.ON, E1.IN, Q7.C)
+	NET_C(Q3.C, Q6.B, C1.1, Q7.B)
+	NET_C(Q6.E, Q10.B, Q4.C)
+	NET_C(Q6.C, Q10.E, Q9.C, Q7.E)
+	NET_C(Q2.B, Q1.C, Q1.B, Q11.E)
+NETLIST_END()
+#endif
+
+#if USE_LM3900_MODEL == 2
+static NETLIST_START(LM3900)
+	OPAMP(A, "LM3900")
+
+	DIODE(D1, "D(IS=1e-15 N=1)")
+	CCCS(CS1, 1) // Current Mirror
+
+	ALIAS(VCC, A.VCC)
+	ALIAS(GND, A.GND)
+	ALIAS(PLUS, A.PLUS)
+	ALIAS(MINUS, A.MINUS)
+	ALIAS(OUT, A.OUT)
+
+	NET_C(A.PLUS, CS1.IP)
+	NET_C(D1.A, CS1.IN)
+	NET_C(CS1.ON, A.MINUS)
+	NET_C(CS1.OP, A.GND, D1.K)
+
+NETLIST_END()
+#endif
+
+#if USE_LM3900_MODEL == 3
+static NETLIST_START(LM3900)
+
+	ALIAS(VCC, Q5.C)
+	ALIAS(GND, Q1.E)
+	ALIAS(PLUS, Q1.B)
+	ALIAS(MINUS, Q1.C)
+	ALIAS(OUT, Q5.E)
+
+	CAP(C1, CAP_P(6.000000))
+	CS(I1, 1.300000e-3)
+	CS(I2, 200e-6)
+	QBJT_EB(Q1, "NPN")
+	QBJT_EB(Q2, "NPN")
+	QBJT_EB(Q3, "PNP")
+	QBJT_EB(Q4, "PNP")
+	QBJT_EB(Q5, "NPN")
+	QBJT_EB(Q6, "NPN")
+	NET_C(Q3.E, Q5.B, I2.2)
+	NET_C(Q3.C, Q4.E, Q5.E, I1.1)
+	NET_C(Q5.C, I2.1)
+	NET_C(Q1.B, Q6.C, Q6.B)
+	NET_C(Q1.E, Q2.E, Q4.C, C1.2, I1.2, Q6.E)
+	NET_C(Q1.C, Q2.B)
+	NET_C(Q2.C, Q3.B, Q4.B, C1.1)
+NETLIST_END()
+#endif
+
+#if USE_LM3900_MODEL == 4
+static NETLIST_START(LM3900)
+	OPAMP(A, "OPAMP(TYPE=3 VLH=0.5 VLL=0.03 FPF=2k UGF=2.5M SLEW=1M RI=10M RO=100 DAB=0.0015)")
+
+	DIODE(D1, "D(IS=6e-15 N=1)")
+	DIODE(D2, "D(IS=6e-15 N=1)")
+	CCCS(CS1, 1) // Current Mirror
+
+	ALIAS(VCC, A.VCC)
+	ALIAS(GND, A.GND)
+	ALIAS(OUT, A.OUT)
+
+	ALIAS(PLUS, CS1.IP)
+	NET_C(D1.A, CS1.IN)
+	NET_C(A.GND, D1.K)
+
+	CS(CS_BIAS, 10e-6)
+	NET_C(A.VCC, CS_BIAS.P)
+
+	ALIAS(MINUS, CS1.OP)
+	NET_C(CS1.ON, A.GND)
+
+	CCVS(VS1, 200000) // current-to-voltage gain
+	NET_C(CS1.OP, VS1.IP)
+	NET_C(VS1.IN, CS_BIAS.N, D2.A)
+	NET_C(D2.K, A.GND)
+	NET_C(VS1.OP, A.MINUS)
+	NET_C(VS1.ON, A.PLUS, A.GND)
+NETLIST_END()
+#endif
+
+NETLIST_START(opamp_lib)
+	LOCAL_LIB_ENTRY(opamp_layout_4_4_11)
+	LOCAL_LIB_ENTRY(opamp_layout_2_8_4)
+	LOCAL_LIB_ENTRY(opamp_layout_2_13_9_4)
+	LOCAL_LIB_ENTRY(opamp_layout_1_7_4)
+	LOCAL_LIB_ENTRY(opamp_layout_1_8_5)
+	LOCAL_LIB_ENTRY(opamp_layout_1_11_6)
+
+	// FIXME: JFET Opamp may need better model
+	// VLL and VHH for +-6V  RI=10^12 (for numerical stability 10^9 is used below
+	// RO from data sheet
+	NET_MODEL("TL084       OPAMP(TYPE=3 VLH=0.75 VLL=0.75 FPF=10 UGF=3000k SLEW=13M RI=1000M RO=192 DAB=0.0014)")
+
+	NET_MODEL("LM324       OPAMP(TYPE=3 VLH=2.0 VLL=0.2 FPF=5 UGF=500k SLEW=0.3M RI=1000k RO=50 DAB=0.00075)")
+	NET_MODEL("LM358       OPAMP(TYPE=3 VLH=2.0 VLL=0.2 FPF=5 UGF=500k SLEW=0.3M RI=1000k RO=50 DAB=0.001)")
+	NET_MODEL("MB3614      OPAMP(TYPE=3 VLH=1.4 VLL=0.02 FPF=3 UGF=1000k SLEW=0.6M RI=1000k RO=100 DAB=0.002)")
+	NET_MODEL("UA741       OPAMP(TYPE=3 VLH=1.0 VLL=1.0 FPF=5 UGF=1000k SLEW=0.5M RI=2000k RO=75 DAB=0.0017)")
+	NET_MODEL("LM747       OPAMP(TYPE=3 VLH=1.0 VLL=1.0 FPF=5 UGF=1000k SLEW=0.5M RI=2000k RO=50 DAB=0.0017)")
+	NET_MODEL("LM747A      OPAMP(TYPE=3 VLH=2.0 VLL=2.0 FPF=5 UGF=1000k SLEW=0.7M RI=6000k RO=50 DAB=0.0015)")
+	// FIXME: LM748 values are calculated based on a documented schematic of the part and may be wrong.
+	// TI and Motorola Datasheets differ - below are Motorola values, SLEW is average of LH and HL
+	NET_MODEL("LM3900      OPAMP(TYPE=3 VLH=1.0 VLL=0.03 FPF=2k UGF=4M SLEW=10M RI=10M RO=2k DAB=0.0015)")
+
+	NET_MODEL("AN6551      OPAMP(TYPE=3 VLH=1.0 VLL=0.03 FPF=20 UGF=2M SLEW=1M RI=10M RO=200 DAB=0.0015)")
+
+	#if USE_LM3900_MODEL == 1
+	NET_MODEL("LM3900_NPN1 NPN(IS=1E-14 BF=150 TF=1E-9 CJC=1E-12 CJE=1E-12 VAF=150 RB=100 RE=5 IKF=0.002)")
+	NET_MODEL("LM3900_PNP1 PNP(IS=1E-14 BF=40 TF=1E-7 CJC=1E-12 CJE=1E-12 VAF=150 RB=100 RE=5)")
+#endif
+	LOCAL_LIB_ENTRY(MB3614_DIP)
+	LOCAL_LIB_ENTRY(MC3340_DIP)
+	LOCAL_LIB_ENTRY(TL081_DIP)
+	LOCAL_LIB_ENTRY(TL082_DIP)
+	LOCAL_LIB_ENTRY(TL084_DIP)
+	LOCAL_LIB_ENTRY(LM324_DIP)
+	LOCAL_LIB_ENTRY(LM358_DIP)
+	LOCAL_LIB_ENTRY(LM2902_DIP)
+	LOCAL_LIB_ENTRY(UA741_DIP8)
+	LOCAL_LIB_ENTRY(UA741_DIP10)
+	LOCAL_LIB_ENTRY(UA741_DIP14)
+	LOCAL_LIB_ENTRY(MC1558_DIP)
+	LOCAL_LIB_ENTRY(LM747_DIP)
+	LOCAL_LIB_ENTRY(LM747A_DIP)
+	LOCAL_LIB_ENTRY(LM3900)
+	LOCAL_LIB_ENTRY(AN6551_SIL)
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_opamp_lib.h mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_opamp_lib.h
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_opamp_lib.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_opamp_lib.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,79 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#ifndef NLM_OPAMP_H_
+#define NLM_OPAMP_H_
+
+///
+/// \file nlm_opamp.h
+///
+
+#include "netlist/nl_setup.h"
+
+#ifndef __PLIB_PREPROCESSOR__
+
+/* ----------------------------------------------------------------------------
+ *  Netlist Macros
+ * ---------------------------------------------------------------------------*/
+
+#if !NL_AUTO_DEVICES
+
+#define MB3614_DIP(name)                                                       \
+		NET_REGISTER_DEV(MB3614_DIP, name)
+
+#define LM324_DIP(name)                                                        \
+		NET_REGISTER_DEV(LM324_DIP, name)
+
+#define TL081_DIP(name)                                                        \
+		NET_REGISTER_DEV(TL081_DIP, name)
+
+#define TL082_DIP(name)                                                        \
+		NET_REGISTER_DEV(TL082_DIP, name)
+
+#define TL084_DIP(name)                                                        \
+		NET_REGISTER_DEV(TL084_DIP, name)
+
+#define LM2902_DIP(name)                                                       \
+		NET_REGISTER_DEV(LM2902_DIP, name)
+
+#define LM358_DIP(name)                                                        \
+		NET_REGISTER_DEV(LM358_DIP, name)
+
+#define LM3900(name)                                                           \
+		NET_REGISTER_DEV(LM3900, name)
+
+#define UA741_DIP8(name)                                                       \
+		NET_REGISTER_DEV(UA741_DIP8, name)
+
+#define UA741_DIP10(name)                                                      \
+		NET_REGISTER_DEV(UA741_DIP10, name)
+
+#define UA741_DIP14(name)                                                      \
+		NET_REGISTER_DEV(UA741_DIP14, name)
+
+#define MC1558_DIP(name)                                                        \
+		NET_REGISTER_DEV(MC1558_DIP, name)
+
+#define LM747_DIP(name)                                                        \
+		NET_REGISTER_DEV(LM747_DIP, name)
+
+#define LM747A_DIP(name)                                                       \
+		NET_REGISTER_DEV(LM747A_DIP, name)
+
+#define MC3340_DIP(name)                                                       \
+		NET_REGISTER_DEV(MC3340_DIP, name)
+
+#define AN6551_SIL(name)                                                       \
+		NET_REGISTER_DEV(AN6551_SIL, name)
+
+#endif // NL_AUTO_DEVICES
+
+/* ----------------------------------------------------------------------------
+ *  External declarations
+ * ---------------------------------------------------------------------------*/
+
+// moved to net_lib.h
+
+#endif // __PLIB_PREPROCESSOR__
+
+#endif
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_other.cpp mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_other.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_other.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_other.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,168 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#include "netlist/devices/net_lib.h"
-
-/*
- *   MC14584B: Hex Schmitt Trigger
- *             ON Semiconductor
- *
- *          +--------------+
- *       A1 |1     ++    14| VCC
- *       Y1 |2           13| A6
- *       A2 |3           12| Y6
- *       Y2 |4  MC14584B 11| A5
- *       A3 |5           10| Y5
- *       Y3 |6            9| A4
- *      GND |7            8| Y4
- *          +--------------+
- *
- */
-
-static NETLIST_START(MC14584B_DIP)
-	MC14584B_GATE(A)
-	MC14584B_GATE(B)
-	MC14584B_GATE(C)
-	MC14584B_GATE(D)
-	MC14584B_GATE(E)
-	MC14584B_GATE(F)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.Q,  /*    Y1 |2           13| A6   */ F.A,
-		B.A,  /*    A2 |3           12| Y6   */ F.Q,
-		B.Q,  /*    Y2 |4  MC14584B 11| A5   */ E.A,
-		C.A,  /*    A3 |5           10| Y5   */ E.Q,
-		C.Q,  /*    Y3 |6            9| A4   */ D.A,
-		A.GND,/*   GND |7            8| Y4   */ D.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-//- Identifier:  NE566_DIP
-//- Title: NE566 Voltage Controlled Oscillator
-//- Description: The LM566CN is a general purpose voltage controlled oscillator
-//-    which may be used to generate square and triangula waves, the frequency
-//-    of which is a very linear function of a control voltage. The frequency
-//-    is also a function of an external resistor and capacitor.
-//-
-//-    The LM566CN is specified for operation over the 0°C to a 70°C
-//-    temperature range.
-//-
-//-    Applications
-//-
-//-    - FM modulation
-//-    - Signal generation
-//-    - Function generation
-//-    - Frequency shift keying
-//-    - Tone generation
-//-
-//-    Features
-//-    - Wide supply voltage range: 10V to 24V
-//-    - Very linear modulation characteristics
-//-    - High temperature stability
-//-    - Excellent supply voltage rejection
-//-    - 10 to 1 frequency range with fixed capacitor
-//-    - Frequency programmable by means of current, voltage, resistor or capacitor
-//-
-//.
-//- Pinalias: GND,NC,SQUARE,TRIANGLE,MODULATION,R1,C1,VCC
-//- Package: DIP
-//- NamingConvention: Naming conventions follow National Semiconductor datasheet
-//- Limitations:
-//-    This implementation is focused on performance. There may be edge cases
-//-    which lead to issues and ringing.
-//.
-//- Example: ne566.cpp,ne566_example
-//- FunctionTable:
-//-    https://www.egr.msu.edu/eceshop/Parts_Inventory/datasheets/lm566.pdf
-//-
-//.
-
-static NETLIST_START(NE566_DIP)
-
-	VCVS(VI, 1)
-	CCCS(CI1, -1)
-	CCCS(CI2, 1)
-	SYS_COMPD(COMP)
-	SYS_DSW2(SW)
-	VCVS(VO, 1)
-	DIODE(DC, "D")
-	DIODE(DM, "D")
-	RES(ROD, 5200)
-	RES(ROU, 200)
-
-	PARAM(VO.RO, 50)
-	PARAM(COMP.MODEL, "FAMILY(TYPE=CUSTOM IVL=0.16 IVH=0.4 OVL=0.1 OVH=0.1 ORL=50 ORH=50)")
-	PARAM(SW.GOFF, 0) // This has to be zero to block current sources
-
-	NET_C(CI2.IN, VI.OP)
-	NET_C(CI2.IP, CI1.IN)
-	NET_C(COMP.Q, SW.I)
-	NET_C(SW.1, CI1.OP)
-	NET_C(SW.3, CI2.OP)
-	NET_C(SW.2, VO.IP)
-	NET_C(VO.OP, COMP.IN)
-
-	// Avoid singular Matrix due to G=0 switch
-	RES(RX1, 1e10)
-	RES(RX2, 1e10)
-	NET_C(RX1.1, SW.1)
-	NET_C(RX2.1, SW.3)
-
-	NET_C(COMP.GND, RX1.2, RX2.2)
-
-	// Block if VC < V+ - ~4
-	VS(VM, 3)
-	PARAM(VM.RI, 10)
-	NET_C(VM.1, COMP.VCC)
-	NET_C(VM.2, DM.A)
-	NET_C(DM.K, VI.OP)
-
-	// Block if VC > V+
-	NET_C(COMP.GND, DC.A)
-	NET_C(SW.2, DC.K)
-
-	RES(R1, 5000)
-	RES(R2, 1800)
-	RES(R3, 6000)
-
-	// Square output wave
-	AFUNC(FO, 2, "min(A1-1,A0 + 5)")
-	NET_C(COMP.QQ, FO.A0)
-	NET_C(FO.Q, ROU.1)
-	NET_C(ROU.2, ROD.1)
-
-	NET_C(COMP.GND, SW.GND, VI.ON, VI.IN, CI1.ON, CI2.ON, VO.IN, VO.ON, R2.2, ROD.2)
-	NET_C(COMP.VCC, SW.VCC, R1.2)
-	NET_C(COMP.IP, R1.1, R2.1, R3.1)
-	NET_C(COMP.Q, R3.2)
-
-	ALIAS(1, VI.ON) // GND
-	ALIAS(3, ROD.1) // Square out
-	ALIAS(4, VO.OP) // Diag out
-	ALIAS(5, VI.IP) // VC
-	ALIAS(6, CI1.IP) // R1
-	ALIAS(7, SW.2) // C1
-	ALIAS(8, COMP.VCC) // V+
-
-	NET_C(COMP.VCC, FO.A1)
-
-
-NETLIST_END()
-
-NETLIST_START(otheric_lib)
-	TRUTHTABLE_START(MC14584B_GATE, 1, 1, "")
-		TT_HEAD(" A | Q ")
-		TT_LINE(" 0 | 1 |100")
-		TT_LINE(" 1 | 0 |100")
-		// 2.1V negative going and 2.7V positive going at 5V
-		TT_FAMILY("FAMILY(TYPE=CMOS IVL=0.42 IVH=0.54 OVL=0.05 OVH=0.05 ORL=10.0 ORH=10.0)")
-	TRUTHTABLE_END()
-
-	LOCAL_LIB_ENTRY(MC14584B_DIP)
-	LOCAL_LIB_ENTRY(NE566_DIP)
-NETLIST_END()
-
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_other.h mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_other.h
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_other.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_other.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLM_OTHER_H_
-#define NLM_OTHER_H_
-
-///
-/// \file nlm_other.h
-///
-///
-#include "netlist/nl_setup.h"
-
-#ifndef __PLIB_PREPROCESSOR__
-
-/* ----------------------------------------------------------------------------
- *  Netlist Macros
- * ---------------------------------------------------------------------------*/
-
-#if !NL_AUTO_DEVICES
-
-#define MC14584B_GATE(name)                                                    \
-		NET_REGISTER_DEV(MC14584B_GATE, name)
-
-#define MC14584B_DIP(name)                                                     \
-		NET_REGISTER_DEV(MC14584B_DIP, name)
-
-#define NE566_DIP(name)                                                        \
-		NET_REGISTER_DEV(NE566_DIP, name)
-
-#endif
-
-/* ----------------------------------------------------------------------------
- *  External declarations
- * ---------------------------------------------------------------------------*/
-
-NETLIST_EXTERNAL(otheric_lib)
-
-#endif
-
-#endif
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_otheric_lib.cpp mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_otheric_lib.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_otheric_lib.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_otheric_lib.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,168 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#include "netlist/devices/net_lib.h"
+
+/*
+ *   MC14584B: Hex Schmitt Trigger
+ *             ON Semiconductor
+ *
+ *          +--------------+
+ *       A1 |1     ++    14| VCC
+ *       Y1 |2           13| A6
+ *       A2 |3           12| Y6
+ *       Y2 |4  MC14584B 11| A5
+ *       A3 |5           10| Y5
+ *       Y3 |6            9| A4
+ *      GND |7            8| Y4
+ *          +--------------+
+ *
+ */
+
+static NETLIST_START(MC14584B_DIP)
+	MC14584B_GATE(A)
+	MC14584B_GATE(B)
+	MC14584B_GATE(C)
+	MC14584B_GATE(D)
+	MC14584B_GATE(E)
+	MC14584B_GATE(F)
+
+	NET_C(A.VDD, B.VDD, C.VDD, D.VDD, E.VDD, F.VDD)
+	NET_C(A.VSS, B.VSS, C.VSS, D.VSS, E.VSS, F.VSS)
+	DIPPINS(  /*       +--------------+      */
+		A.A,  /*    A1 |1     ++    14| VDD  */ A.VDD,
+		A.Q,  /*    Y1 |2           13| A6   */ F.A,
+		B.A,  /*    A2 |3           12| Y6   */ F.Q,
+		B.Q,  /*    Y2 |4  MC14584B 11| A5   */ E.A,
+		C.A,  /*    A3 |5           10| Y5   */ E.Q,
+		C.Q,  /*    Y3 |6            9| A4   */ D.A,
+		A.VSS,/*   VSS |7            8| Y4   */ D.Q
+			  /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier:  NE566_DIP
+//- Title: NE566 Voltage Controlled Oscillator
+//- Description: The LM566CN is a general purpose voltage controlled oscillator
+//-    which may be used to generate square and triangula waves, the frequency
+//-    of which is a very linear function of a control voltage. The frequency
+//-    is also a function of an external resistor and capacitor.
+//-
+//-    The LM566CN is specified for operation over the 0°C to a 70°C
+//-    temperature range.
+//-
+//-    Applications
+//-
+//-    - FM modulation
+//-    - Signal generation
+//-    - Function generation
+//-    - Frequency shift keying
+//-    - Tone generation
+//-
+//-    Features
+//-    - Wide supply voltage range: 10V to 24V
+//-    - Very linear modulation characteristics
+//-    - High temperature stability
+//-    - Excellent supply voltage rejection
+//-    - 10 to 1 frequency range with fixed capacitor
+//-    - Frequency programmable by means of current, voltage, resistor or capacitor
+//-
+//.
+//- Pinalias: GND,NC,SQUARE,TRIANGLE,MODULATION,R1,C1,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- Limitations:
+//-    This implementation is focused on performance. There may be edge cases
+//-    which lead to issues and ringing.
+//.
+//- Example: ne566.cpp,ne566_example
+//- FunctionTable:
+//-    https://www.egr.msu.edu/eceshop/Parts_Inventory/datasheets/lm566.pdf
+//-
+//.
+
+static NETLIST_START(NE566_DIP)
+
+	VCVS(VI, 1)
+	CCCS(CI1, -1)
+	CCCS(CI2, 1)
+	SYS_COMPD(COMP)
+	SYS_DSW2(SW)
+	VCVS(VO, 1)
+	DIODE(DC, "D")
+	DIODE(DM, "D")
+	RES(ROD, 5200)
+	RES(ROU, 200)
+
+	PARAM(VO.RO, 50)
+	PARAM(COMP.MODEL, "FAMILY(TYPE=CUSTOM IVL=0.16 IVH=0.4 OVL=0.1 OVH=0.1 ORL=50 ORH=50)")
+	PARAM(SW.GOFF, 0) // This has to be zero to block current sources
+
+	NET_C(CI2.IN, VI.OP)
+	NET_C(CI2.IP, CI1.IN)
+	NET_C(COMP.Q, SW.I)
+	NET_C(SW.1, CI1.OP)
+	NET_C(SW.3, CI2.OP)
+	NET_C(SW.2, VO.IP)
+	NET_C(VO.OP, COMP.IN)
+
+	// Avoid singular Matrix due to G=0 switch
+	RES(RX1, 1e10)
+	RES(RX2, 1e10)
+	NET_C(RX1.1, SW.1)
+	NET_C(RX2.1, SW.3)
+
+	NET_C(COMP.GND, RX1.2, RX2.2)
+
+	// Block if VC < V+ - ~4
+	VS(VM, 3)
+	PARAM(VM.RI, 10)
+	NET_C(VM.1, COMP.VCC)
+	NET_C(VM.2, DM.A)
+	NET_C(DM.K, VI.OP)
+
+	// Block if VC > V+
+	NET_C(COMP.GND, DC.A)
+	NET_C(SW.2, DC.K)
+
+	RES(R1, 5000)
+	RES(R2, 1800)
+	RES(R3, 6000)
+
+	// Square output wave
+	AFUNC(FO, 2, "min(A1-1,A0 + 5)")
+	NET_C(COMP.QQ, FO.A0)
+	NET_C(FO.Q, ROU.1)
+	NET_C(ROU.2, ROD.1)
+
+	NET_C(COMP.GND, SW.GND, VI.ON, VI.IN, CI1.ON, CI2.ON, VO.IN, VO.ON, R2.2, ROD.2)
+	NET_C(COMP.VCC, SW.VCC, R1.2)
+	NET_C(COMP.IP, R1.1, R2.1, R3.1)
+	NET_C(COMP.Q, R3.2)
+
+	ALIAS(1, VI.ON) // GND
+	ALIAS(3, ROD.1) // Square out
+	ALIAS(4, VO.OP) // Diag out
+	ALIAS(5, VI.IP) // VC
+	ALIAS(6, CI1.IP) // R1
+	ALIAS(7, SW.2) // C1
+	ALIAS(8, COMP.VCC) // V+
+
+	NET_C(COMP.VCC, FO.A1)
+
+
+NETLIST_END()
+
+NETLIST_START(otheric_lib)
+	TRUTHTABLE_START(MC14584B_GATE, 1, 1, "")
+		TT_HEAD(" A | Q ")
+		TT_LINE(" 0 | 1 |100")
+		TT_LINE(" 1 | 0 |100")
+		// 2.1V negative going and 2.7V positive going at 5V
+		TT_FAMILY("FAMILY(TYPE=CMOS IVL=0.42 IVH=0.54 OVL=0.05 OVH=0.05 ORL=10.0 ORH=10.0)")
+	TRUTHTABLE_END()
+
+	LOCAL_LIB_ENTRY(MC14584B_DIP)
+	LOCAL_LIB_ENTRY(NE566_DIP)
+NETLIST_END()
+
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_otheric_lib.h mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_otheric_lib.h
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_otheric_lib.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_otheric_lib.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,40 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#ifndef NLM_OTHER_H_
+#define NLM_OTHER_H_
+
+///
+/// \file nlm_other.h
+///
+///
+#include "netlist/nl_setup.h"
+
+#ifndef __PLIB_PREPROCESSOR__
+
+/* ----------------------------------------------------------------------------
+ *  Netlist Macros
+ * ---------------------------------------------------------------------------*/
+
+#if !NL_AUTO_DEVICES
+
+#define MC14584B_GATE(name)                                                    \
+		NET_REGISTER_DEV(MC14584B_GATE, name)
+
+#define MC14584B_DIP(name)                                                     \
+		NET_REGISTER_DEV(MC14584B_DIP, name)
+
+#define NE566_DIP(name)                                                        \
+		NET_REGISTER_DEV(NE566_DIP, name)
+
+#endif
+
+/* ----------------------------------------------------------------------------
+ *  External declarations
+ * ---------------------------------------------------------------------------*/
+
+// moved to net_lib.h
+
+#endif
+
+#endif
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_roms.cpp mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_roms.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_roms.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_roms.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,275 +0,0 @@
-// license:CC0
-// copyright-holders:Couriersud
-
-#include "netlist/devices/net_lib.h"
-
-
-//- Identifier:  PROM_82S126_DIP
-//- Title: 82S126 1K-bit TTL bipolar PROM
-//- Description: The 82S126 and 82S129 are field programmable, which means that
-//-    custom patterns are immediately available by following the Signetics
-//-    Generic I fusing procedure. The 82S126 and 82S129 devices are supplied
-//-    with all outputs at logical Low. Outputs are programmed to a logic High
-//-    level at any specified address by fusing the Ni-Cr link matrix.
-//-
-//-    These devices include on-chip decoding and 2 Chip Enable inputs for ease
-//-    of memory expansion. They feature either open collector or 3-State outputs
-//-    for optimization of word expansion in bused organizations.
-//-
-//.
-//- Pinalias: A6,A5,A4,A3,A0,A1,A2,GND,O4,O3,O2,O1,CE1Q,CE2Q,A7,VCC
-//- Package: DIP
-//- Param: ROM
-//-    The name of the source to load the rom content from
-//- Param: FORCE_TRISTATE_LOGIC
-//-    Set this parameter to 1 force tristate outputs into logic mode.
-//-    This should be done only if the device enable inputs are connected
-//-    in a way which always enables the device.
-//- Param: MODEL
-//-    Overwrite the default model of the device. Use with care.
-//- NamingConvention: Naming conventions follow Philips Components-Signetics datasheet
-//- Limitations:
-//-    Currently OC is not supported.
-//-
-//- Example: 82S126.cpp,82S126_example
-//- FunctionTable:
-//-    http://pdf.datasheetcatalog.com/datasheet/philips/82S129.pdf
-//-
-
-static NETLIST_START(PROM_82S126_DIP)
-
-	PROM_82S126(A)
-
-	DEFPARAM(ROM, "unknown")
-	DEFPARAM(FORCE_TRISTATE_LOGIC, 0)
-	DEFPARAM(MODEL, "$(A.MODEL)")
-	PARAM(A.ROM, "$(@.ROM)")
-	PARAM(A.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
-	PARAM(A.MODEL, "$(@.MODEL)")
-	ALIAS(1, A.A6)
-	ALIAS(2, A.A5)
-	ALIAS(3, A.A4)
-	ALIAS(4, A.A3)
-	ALIAS(5, A.A0)
-	ALIAS(6, A.A1)
-	ALIAS(7, A.A2)
-	ALIAS(8, A.GND)
-	ALIAS(9, A.O4)
-	ALIAS(10, A.O3)
-	ALIAS(11, A.O2)
-	ALIAS(12, A.O1)
-	ALIAS(13, A.CE1Q)
-	ALIAS(14, A.CE2Q)
-	ALIAS(15, A.A7)
-	ALIAS(16, A.VCC)
-NETLIST_END()
-
-//- Identifier:  PROM_74S287_DIP
-//- Title: 74S287 (256 x 4) 1024-Bit TTL PROM
-//- Description: This Schottky memory is organized in the popular 256 words by
-//-    4 bits configuration. Memory enable inputs are provided to control the
-//-    output states. When the device is enabled, the outputs represent the
-//-    contents of the selected word. When disabled, the 4 outputs go to the
-//-    or high impedance state.
-//-
-//-    PROMs are shipped from the factory with lows in all locations. A high
-//-    may be programmed into any selected location by following the
-//-    programming instructions.
-//-
-//.
-//- Pinalias: A6,A5,A4,A3,A0,A1,A2,GND,O3,O2,O1,O0,CE1Q,CE2Q,A7,VCC
-//- Package: DIP
-//- Param: ROM
-//-    The name of the source to load the rom content from
-//- Param: FORCE_TRISTATE_LOGIC
-//-    Set this parameter to 1 force tristate outputs into logic mode.
-//-    This should be done only if the device enable inputs are connected
-//-    in a way which always enables the device.
-//- Param: MODEL
-//-    Overwrite the default model of the device. Use with care.
-//- NamingConvention: Naming conventions follow National Semiconductor datasheet
-//- Limitations:
-//-    None.
-//-
-//- Example: 74S287.cpp,74S287_example
-//- FunctionTable:
-//-    http://pdf.datasheetcatalog.com/datasheet_pdf/national-semiconductor/DM54S287AJ_to_DM74S287V.pdf
-//-
-
-static NETLIST_START(PROM_74S287_DIP)
-
-	PROM_74S287(A)
-
-	DEFPARAM(ROM, "unknown")
-	DEFPARAM(FORCE_TRISTATE_LOGIC, 0)
-	DEFPARAM(MODEL, "$(A.MODEL)")
-	PARAM(A.ROM, "$(@.ROM)")
-	PARAM(A.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
-	PARAM(A.MODEL, "$(@.MODEL)")
-	ALIAS(1, A.A6)
-	ALIAS(2, A.A5)
-	ALIAS(3, A.A4)
-	ALIAS(4, A.A3)
-	ALIAS(5, A.A0)
-	ALIAS(6, A.A1)
-	ALIAS(7, A.A2)
-	ALIAS(8, A.GND)
-	ALIAS(9, A.O3)
-	ALIAS(10, A.O2)
-	ALIAS(11, A.O1)
-	ALIAS(12, A.O0)
-	ALIAS(13, A.CE1Q)
-	ALIAS(14, A.CE2Q)
-	ALIAS(15, A.A7)
-	ALIAS(16, A.VCC)
-NETLIST_END()
-
-//- Identifier:  PROM_82S123_DIP
-//- Title: 82S123 256 bit TTL bipolar PROM
-//- Description: The 82S123 and 82S23 are field programmable, which means that
-//-    custom patterns are immediately available by following the Signetics
-//-    Generic I fusing procedure. The 82S123 and 82S23 devices are supplied
-//-    with all outputs at logical Low. Outputs are programmed to a logic High
-//-    level at any specified address by fusing the Ni-Cr link matrix.
-//-
-//-    These devices include on-chip decoding and 1 Chip Enable inputs for
-//-    memory expansion. They feature either open collector or 3-State outputs
-//-    for optimization of word expansion in bused organizations.
-//-
-//-
-//- Pinalias: O1,O2,O3,O4,O5,O6,O7,GND,O8,A0,A1,A2,A3,A4,CEQ,VCC
-//- Package: DIP
-//- Param: ROM
-//-    The name of the source to load the rom content from
-//- Param: FORCE_TRISTATE_LOGIC
-//-    Set this parameter to 1 force tristate outputs into logic mode.
-//-    This should be done only if the device enable inputs are connected
-//-    in a way which always enables the device.
-//- Param: MODEL
-//-    Overwrite the default model of the device. Use with care.
-//- NamingConvention: Naming conventions follow Philips Components-Signetics datasheet
-//- Limitations:
-//-    Currently OC is not supported.
-//-
-//- Example: 82S123.cpp,82S123_example
-//- FunctionTable:
-//-    http://pdf.datasheetcatalog.com/datasheet/philips/82S123.pdf
-//-
-
-static NETLIST_START(PROM_82S123_DIP)
-
-	PROM_82S123(A)
-
-	DEFPARAM(ROM, "unknown")
-	DEFPARAM(FORCE_TRISTATE_LOGIC, 0)
-	DEFPARAM(MODEL, "$(A.MODEL)")
-	PARAM(A.ROM, "$(@.ROM)")
-	PARAM(A.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
-	PARAM(A.MODEL, "$(@.MODEL)")
-	ALIAS(1, A.O0)
-	ALIAS(2, A.O1)
-	ALIAS(3, A.O2)
-	ALIAS(4, A.O3)
-	ALIAS(5, A.O4)
-	ALIAS(6, A.O5)
-	ALIAS(7, A.O6)
-	ALIAS(8, A.GND)
-
-	ALIAS(9, A.O7)
-	ALIAS(10, A.A0)
-	ALIAS(11, A.A1)
-	ALIAS(12, A.A2)
-	ALIAS(13, A.A3)
-	ALIAS(14, A.A4)
-	ALIAS(15, A.CEQ)
-	ALIAS(16, A.VCC)
-NETLIST_END()
-
-//- Identifier:  EPROM_2716_DIP
-//- Title: 2716 16K (2K x 8) UV ERASABLE PROM
-//- Description: The Intel®2716 is a 16,384-bit ultraviolet erasable and
-//-   electrically programmable read-only memory (EPROM). The 2716 operates
-//-   from a single 5-volt power supply, has a static standby mode, and
-//-   features fast single address location programming. It makes designing
-//-   with EPROMs faster, easier and more economical.
-//-
-//-   The 2716, with its single 5-volt supply and with an access time up
-//-   to 350 ns, is ideal for use with the newer high performance
-//-   +5V microprocessors such as Intel's 8085 and 8086. A selected
-//-   2716-5 and 2716-6 is available for slower speed applications.
-//-   The 2716 is also the first EPROM with a static standby mode which reduces
-//-   the power dissipation without increasing access time. The maximum
-//-   active power dissipation is 525 mW while the maximum standby power
-//-   dissipation is only 132 mW, a 75% savings.
-//-
-//-   The 2716 has the simplest and fastest method yet devised for
-//-   programming EPROMs - single pulse TTL level programming. No need for high
-//-   voltage pulsing because all programming controls are handled by
-//-   TTL signals. Program any location at any time-either individually,
-//-   sequentially or at random, with the 2716's single address location
-//-   programming. Total programming time for all 16,384 bits is only 100 seconds
-//-
-//- Pinalias: A7,A6,A6,A4,A4,A2,A1,A0,O0,O1,O2,GND,O3,O4,O5,O6,O7,CE1Q/CE,A10,CE2Q/OE,VPP,A9,A8,VCC
-//- Package: DIP
-//- Param: ROM
-//-    The name of the source to load the rom content from
-//- Param: FORCE_TRISTATE_LOGIC
-//-    Set this parameter to 1 force tristate outputs into logic mode.
-//-    This should be done only if the device enable inputs are connected
-//-    in a way which always enables the device.
-//- Param: MODEL
-//-    Overwrite the default model of the device. Use with care.
-//- NamingConvention: Naming conventions follow Intel datasheet
-//- Limitations:
-//-    Currently OC is not supported.
-//-
-//- Example: 2716.cpp,2716_example
-//- FunctionTable:
-//-    http://pdf.datasheetcatalog.com/datasheets/400/500340_DS.pdf
-//-
-static NETLIST_START(EPROM_2716_DIP)
-
-	EPROM_2716(A)
-
-	DEFPARAM(ROM, "unknown")
-	DEFPARAM(FORCE_TRISTATE_LOGIC, 0)
-	DEFPARAM(MODEL, "$(A.MODEL)")
-	PARAM(A.ROM, "$(@.ROM)")
-	PARAM(A.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
-	PARAM(A.MODEL, "$(@.MODEL)")
-	ALIAS(1, A.A7)
-	ALIAS(2, A.A6)
-	ALIAS(3, A.A5)
-	ALIAS(4, A.A4)
-	ALIAS(5, A.A3)
-	ALIAS(6, A.A2)
-	ALIAS(7, A.A1)
-	ALIAS(8, A.A0)
-	ALIAS(9, A.D0)
-	ALIAS(10, A.D1)
-	ALIAS(11, A.D2)
-	ALIAS(12, A.GND)
-
-	ALIAS(13, A.D3)
-	ALIAS(14, A.D4)
-	ALIAS(15, A.D5)
-	ALIAS(16, A.D6)
-	ALIAS(17, A.D7)
-	ALIAS(18, A.CE1Q) // CEQ
-	ALIAS(19, A.A10)
-	ALIAS(20, A.CE2Q) // OEQ
-	ALIAS(22, A.A9)
-	ALIAS(23, A.A8)
-	ALIAS(24, A.VCC)
-NETLIST_END()
-
-
-NETLIST_START(ROMS_lib)
-
-	LOCAL_LIB_ENTRY(PROM_82S123_DIP)
-	LOCAL_LIB_ENTRY(PROM_82S126_DIP)
-	LOCAL_LIB_ENTRY(PROM_74S287_DIP)
-	LOCAL_LIB_ENTRY(EPROM_2716_DIP)
-
-	NETLIST_END()
-
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_roms.h mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_roms.h
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_roms.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_roms.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLM_ROMS_H_
-#define NLM_ROMS_H_
-
-///
-/// \file nlm_roms.h
-///
-
-#include "netlist/nl_setup.h"
-
-#ifndef __PLIB_PREPROCESSOR__
-
-/* ----------------------------------------------------------------------------
- *  Netlist Macros
- * ---------------------------------------------------------------------------*/
-
-#if !NL_AUTO_DEVICES
-
-#define PROM_82S126_DIP(name)                                                  \
-		NET_REGISTER_DEV(PROM_82S126_DIP, name)
-
-#define PROM_82S123_DIP(name)                                                  \
-		NET_REGISTER_DEV(PROM_82S123_DIP, name)
-
-#define PROM_74S287_DIP(name)                                                  \
-		NET_REGISTER_DEV(PROM_74S287_DIP, name)
-
-#define EPROM_2716_DIP(name)                                                   \
-		NET_REGISTER_DEV(EPROM_2716_DIP, name)
-
-#endif // NL_AUTO_DEVICES
-
-
-/* ----------------------------------------------------------------------------
- *  External declarations
- * ---------------------------------------------------------------------------*/
-
-NETLIST_EXTERNAL(ROMS_lib)
-
-#endif // __PLIB_PREPROCESSOR__
-
-#endif
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_roms_lib.cpp mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_roms_lib.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_roms_lib.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_roms_lib.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,447 @@
+// license:CC0
+// copyright-holders:Couriersud
+
+#include "netlist/devices/net_lib.h"
+
+
+//- Identifier:  PROM_82S126_DIP
+//- Title: 82S126 1K-bit TTL bipolar PROM
+//- Description: The 82S126 and 82S129 are field programmable, which means that
+//-    custom patterns are immediately available by following the Signetics
+//-    Generic I fusing procedure. The 82S126 and 82S129 devices are supplied
+//-    with all outputs at logical Low. Outputs are programmed to a logic High
+//-    level at any specified address by fusing the Ni-Cr link matrix.
+//-
+//-    These devices include on-chip decoding and 2 Chip Enable inputs for ease
+//-    of memory expansion. They feature either open collector or 3-State outputs
+//-    for optimization of word expansion in bused organizations.
+//-
+//.
+//- Pinalias: A6,A5,A4,A3,A0,A1,A2,GND,O4,O3,O2,O1,CE1Q,CE2Q,A7,VCC
+//- Package: DIP
+//- Param: ROM
+//-    The name of the source to load the rom content from
+//- Param: FORCE_TRISTATE_LOGIC
+//-    Set this parameter to 1 force tristate outputs into logic mode.
+//-    This should be done only if the device enable inputs are connected
+//-    in a way which always enables the device.
+//- Param: MODEL
+//-    Overwrite the default model of the device. Use with care.
+//- NamingConvention: Naming conventions follow Philips Components-Signetics datasheet
+//- Limitations:
+//-    Currently OC is not supported.
+//-
+//- Example: 82S126.cpp,82S126_example
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheet/philips/82S129.pdf
+//-
+
+static NETLIST_START(PROM_82S126_DIP)
+
+	PROM_82S126(A)
+
+	DEFPARAM(ROM, "unknown")
+	DEFPARAM(FORCE_TRISTATE_LOGIC, 0)
+	DEFPARAM(MODEL, "$(@.A.MODEL)")
+	PARAM(A.ROM, "$(@.ROM)")
+	PARAM(A.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
+	PARAM(A.MODEL, "$(@.MODEL)")
+	ALIAS(1, A.A6)
+	ALIAS(2, A.A5)
+	ALIAS(3, A.A4)
+	ALIAS(4, A.A3)
+	ALIAS(5, A.A0)
+	ALIAS(6, A.A1)
+	ALIAS(7, A.A2)
+	ALIAS(8, A.GND)
+	ALIAS(9, A.O4)
+	ALIAS(10, A.O3)
+	ALIAS(11, A.O2)
+	ALIAS(12, A.O1)
+	ALIAS(13, A.CE1Q)
+	ALIAS(14, A.CE2Q)
+	ALIAS(15, A.A7)
+	ALIAS(16, A.VCC)
+NETLIST_END()
+
+//- Identifier:  PROM_74S287_DIP
+//- Title: 74S287 (256 x 4) 1024-Bit TTL PROM
+//- Description: This Schottky memory is organized in the popular 256 words by
+//-    4 bits configuration. Memory enable inputs are provided to control the
+//-    output states. When the device is enabled, the outputs represent the
+//-    contents of the selected word. When disabled, the 4 outputs go to the
+//-    or high impedance state.
+//-
+//-    PROMs are shipped from the factory with lows in all locations. A high
+//-    may be programmed into any selected location by following the
+//-    programming instructions.
+//-
+//.
+//- Pinalias: A6,A5,A4,A3,A0,A1,A2,GND,O3,O2,O1,O0,CE1Q,CE2Q,A7,VCC
+//- Package: DIP
+//- Param: ROM
+//-    The name of the source to load the rom content from
+//- Param: FORCE_TRISTATE_LOGIC
+//-    Set this parameter to 1 force tristate outputs into logic mode.
+//-    This should be done only if the device enable inputs are connected
+//-    in a way which always enables the device.
+//- Param: MODEL
+//-    Overwrite the default model of the device. Use with care.
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- Limitations:
+//-    None.
+//-
+//- Example: 74S287.cpp,74S287_example
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheet_pdf/national-semiconductor/DM54S287AJ_to_DM74S287V.pdf
+//-
+
+static NETLIST_START(PROM_74S287_DIP)
+
+	PROM_74S287(A)
+
+	DEFPARAM(ROM, "unknown")
+	DEFPARAM(FORCE_TRISTATE_LOGIC, 0)
+	DEFPARAM(MODEL, "$(@.A.MODEL)")
+	PARAM(A.ROM, "$(@.ROM)")
+	PARAM(A.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
+	PARAM(A.MODEL, "$(@.MODEL)")
+	ALIAS(1, A.A6)
+	ALIAS(2, A.A5)
+	ALIAS(3, A.A4)
+	ALIAS(4, A.A3)
+	ALIAS(5, A.A0)
+	ALIAS(6, A.A1)
+	ALIAS(7, A.A2)
+	ALIAS(8, A.GND)
+	ALIAS(9, A.O3)
+	ALIAS(10, A.O2)
+	ALIAS(11, A.O1)
+	ALIAS(12, A.O0)
+	ALIAS(13, A.CE1Q)
+	ALIAS(14, A.CE2Q)
+	ALIAS(15, A.A7)
+	ALIAS(16, A.VCC)
+NETLIST_END()
+
+//- Identifier:  PROM_82S123_DIP
+//- Title: 82S123 256 bit TTL bipolar PROM
+//- Description: The 82S123 and 82S23 are field programmable, which means that
+//-    custom patterns are immediately available by following the Signetics
+//-    Generic I fusing procedure. The 82S123 and 82S23 devices are supplied
+//-    with all outputs at logical Low. Outputs are programmed to a logic High
+//-    level at any specified address by fusing the Ni-Cr link matrix.
+//-
+//-    These devices include on-chip decoding and 1 Chip Enable inputs for
+//-    memory expansion. They feature either open collector or 3-State outputs
+//-    for optimization of word expansion in bused organizations.
+//-
+//-
+//- Pinalias: O1,O2,O3,O4,O5,O6,O7,GND,O8,A0,A1,A2,A3,A4,CEQ,VCC
+//- Package: DIP
+//- Param: ROM
+//-    The name of the source to load the rom content from
+//- Param: FORCE_TRISTATE_LOGIC
+//-    Set this parameter to 1 force tristate outputs into logic mode.
+//-    This should be done only if the device enable inputs are connected
+//-    in a way which always enables the device.
+//- Param: MODEL
+//-    Overwrite the default model of the device. Use with care.
+//- NamingConvention: Naming conventions follow Philips Components-Signetics datasheet
+//- Limitations:
+//-    Currently OC is not supported.
+//-
+//- Example: 82S123.cpp,82S123_example
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheet/philips/82S123.pdf
+//-
+
+static NETLIST_START(PROM_82S123_DIP)
+
+	PROM_82S123(A)
+
+	DEFPARAM(ROM, "unknown")
+	DEFPARAM(FORCE_TRISTATE_LOGIC, 0)
+	DEFPARAM(MODEL, "$(@.A.MODEL)")
+	PARAM(A.ROM, "$(@.ROM)")
+	PARAM(A.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
+	PARAM(A.MODEL, "$(@.MODEL)")
+	ALIAS(1, A.O0)
+	ALIAS(2, A.O1)
+	ALIAS(3, A.O2)
+	ALIAS(4, A.O3)
+	ALIAS(5, A.O4)
+	ALIAS(6, A.O5)
+	ALIAS(7, A.O6)
+	ALIAS(8, A.GND)
+
+	ALIAS(9, A.O7)
+	ALIAS(10, A.A0)
+	ALIAS(11, A.A1)
+	ALIAS(12, A.A2)
+	ALIAS(13, A.A3)
+	ALIAS(14, A.A4)
+	ALIAS(15, A.CEQ)
+	ALIAS(16, A.VCC)
+NETLIST_END()
+
+/*
+ * nld_82S16.h
+ *
+ *  DM82S16: 256 Bit bipolar ram
+ *
+ *          +--------------+
+ *       A1 |1     ++    16| VCC
+ *       A0 |2           15| A2
+ *     CE1Q |3           14| A3
+ *     CE2Q |4   82S16   13| DIN
+ *     CE3Q |5           12| WEQ
+ *    DOUTQ |6           11| A7
+ *       A4 |7           10| A6
+ *      GND |8            9| A5
+ *          +--------------+
+ *
+ *
+ *  Naming conventions follow Signetics datasheet
+ */
+
+
+//- Identifier:  EPROM_2716_DIP
+//- Title: 2716 16K (2K x 8) UV ERASABLE PROM
+//- Description: The Intel®2716 is a 16,384-bit ultraviolet erasable and
+//-   electrically programmable read-only memory (EPROM). The 2716 operates
+//-   from a single 5-volt power supply, has a static standby mode, and
+//-   features fast single address location programming. It makes designing
+//-   with EPROMs faster, easier and more economical.
+//-
+//-   The 2716, with its single 5-volt supply and with an access time up
+//-   to 350 ns, is ideal for use with the newer high performance
+//-   +5V microprocessors such as Intel's 8085 and 8086. A selected
+//-   2716-5 and 2716-6 is available for slower speed applications.
+//-   The 2716 is also the first EPROM with a static standby mode which reduces
+//-   the power dissipation without increasing access time. The maximum
+//-   active power dissipation is 525 mW while the maximum standby power
+//-   dissipation is only 132 mW, a 75% savings.
+//-
+//-   The 2716 has the simplest and fastest method yet devised for
+//-   programming EPROMs - single pulse TTL level programming. No need for high
+//-   voltage pulsing because all programming controls are handled by
+//-   TTL signals. Program any location at any time-either individually,
+//-   sequentially or at random, with the 2716's single address location
+//-   programming. Total programming time for all 16,384 bits is only 100 seconds
+//-
+//- Pinalias: A7,A6,A6,A4,A4,A2,A1,A0,O0,O1,O2,GND,O3,O4,O5,O6,O7,CE1Q/CE,A10,CE2Q/OE,VPP,A9,A8,VCC
+//- Package: DIP
+//- Param: ROM
+//-    The name of the source to load the rom content from
+//- Param: FORCE_TRISTATE_LOGIC
+//-    Set this parameter to 1 force tristate outputs into logic mode.
+//-    This should be done only if the device enable inputs are connected
+//-    in a way which always enables the device.
+//- Param: MODEL
+//-    Overwrite the default model of the device. Use with care.
+//- NamingConvention: Naming conventions follow Intel datasheet
+//- Limitations:
+//-    Currently OC is not supported.
+//-
+//- Example: 2716.cpp,2716_example
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheets/400/500340_DS.pdf
+//-
+static NETLIST_START(EPROM_2716_DIP)
+
+	EPROM_2716(A)
+
+	DEFPARAM(ROM, "unknown")
+	DEFPARAM(FORCE_TRISTATE_LOGIC, 0)
+	DEFPARAM(MODEL, "$(@.A.MODEL)")
+	PARAM(A.ROM, "$(@.ROM)")
+	PARAM(A.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
+	PARAM(A.MODEL, "$(@.MODEL)")
+	ALIAS(1, A.A7)
+	ALIAS(2, A.A6)
+	ALIAS(3, A.A5)
+	ALIAS(4, A.A4)
+	ALIAS(5, A.A3)
+	ALIAS(6, A.A2)
+	ALIAS(7, A.A1)
+	ALIAS(8, A.A0)
+	ALIAS(9, A.D0)
+	ALIAS(10, A.D1)
+	ALIAS(11, A.D2)
+	ALIAS(12, A.GND)
+
+	ALIAS(13, A.D3)
+	ALIAS(14, A.D4)
+	ALIAS(15, A.D5)
+	ALIAS(16, A.D6)
+	ALIAS(17, A.D7)
+	ALIAS(18, A.CE1Q) // CEQ
+	ALIAS(19, A.A10)
+	ALIAS(20, A.CE2Q) // OEQ
+	ALIAS(22, A.A9)
+	ALIAS(23, A.A8)
+	ALIAS(24, A.VCC)
+NETLIST_END()
+
+/*  DM82S16: 256 Bit bipolar ram
+ *
+ *          +--------------+
+ *       A1 |1     ++    16| VCC
+ *       A0 |2           15| A2
+ *     CE1Q |3           14| A3
+ *     CE2Q |4   82S16   13| DIN
+ *     CE3Q |5           12| WEQ
+ *    DOUTQ |6           11| A7
+ *       A4 |7           10| A6
+ *      GND |8            9| A5
+ *          +--------------+
+ *
+ *  Naming conventions follow Signetics datasheet
+ */
+
+static NETLIST_START(TTL_82S16_DIP)
+	TTL_82S16(A)
+
+	DIPPINS(     /*        +--------------+       */
+		   A.A1, /*     A1 |1     ++    16| VCC   */ A.VCC,
+		   A.A0, /*     A0 |2           15| A2    */ A.A2,
+		 A.CE1Q, /*   CE1Q |3           14| A3    */ A.A3,
+		 A.CE2Q, /*   CE2Q |4   82S16   13| DIN   */ A.DIN,
+		 A.CE3Q, /*   CE3Q |5           12| WEQ   */ A.WEQ,
+		A.DOUTQ, /*  DOUTQ |6           11| A7    */ A.A7,
+		   A.A4, /*     A4 |7           10| A6    */ A.A6,
+		  A.GND, /*    GND |8            9| A5    */ A.A5
+				 /*        +--------------+       */
+	)
+NETLIST_END()
+
+/*  82S115: 4K-bit TTL bipolar PROM (512 x 8)
+ *
+ *          +--------------+
+ *       A3 |1     ++    24| VCC
+ *       A4 |2           23| A2
+ *       A5 |3           22| A1
+ *       A6 |4   82S115  21| A0
+ *       A7 |5           20| CE1Q
+ *       A8 |6           19| CE2
+ *       O1 |7           18| STROBE
+ *       O2 |8           17| O8
+ *       O3 |9           16| O7
+ *       O4 |10          15| O6
+ *      FE2 |11          14| O5
+ *      GND |12          13| FE1
+ *          +--------------+
+ */
+
+static NETLIST_START(PROM_82S115_DIP)
+	PROM_82S115(A)
+	NC_PIN(NC)
+
+	DIPPINS(   /*      +--------------+        */
+		 A.A3, /*   A3 |1     ++    24| VCC    */ A.VCC,
+		 A.A4, /*   A4 |2           23| A2     */ A.A2,
+		 A.A5, /*   A5 |3           22| A1     */ A.A1,
+		 A.A6, /*   A6 |4   82S115  21| A0     */ A.A0,
+		 A.A7, /*   A7 |5           20| CE1Q   */ A.CE1Q,
+		 A.A8, /*   A8 |6           19| CE2    */ A.CE2,
+		 A.O1, /*   O1 |7           18| STROBE */ A.STROBE,
+		 A.O2, /*   O2 |8           17| O8     */ A.O8,
+		 A.O3, /*   O3 |9           16| O7     */ A.O7,
+		 A.O4, /*   O4 |10          15| O6     */ A.O6,
+		 NC.I, /*  FE2 |11          14| O5     */ A.O5,
+		A.GND, /*  GND |12          13| FE1    */ NC.I
+			   /*      +--------------+        */
+	)
+NETLIST_END()
+
+//- Identifier:  PROM_MK28000_DIP
+//- Title: MK28000 (2048 x 8 or 4096 x 4) 16384-Bit TTL PROM
+//- Description: This dynamic ROM is organized internally as 2048 x 8 bits,
+//-    but has separate enables for the upper and lower nybbles, permitting
+//-    use as 4096 x 4 as well.
+//.
+//- Pinalias: VCC,A1,A2,A3,A4,A5,A6,A10,GND,A9,A8,A7,ARQ,OE2,A11,O8,O7,O6,O5,O4,O3,O2,O1,OE1
+//- Package: DIP
+//- Param: ROM
+//-    The name of the source to load the rom content from
+//- NamingConvention: Naming conventions follow Mostek datasheet
+//- Limitations:
+//-    None.
+
+static NETLIST_START(PROM_MK28000_DIP)
+
+	PROM_MK28000(A)
+
+	DEFPARAM(ROM, "unknown")
+	PARAM(A.ROM, "$(@.ROM)")
+	ALIAS(1, A.VCC)
+	ALIAS(2, A.A1)
+	ALIAS(3, A.A2)
+	ALIAS(4, A.A3)
+	ALIAS(5, A.A4)
+	ALIAS(6, A.A5)
+	ALIAS(7, A.A6)
+	ALIAS(8, A.A10)
+	ALIAS(9, A.GND)
+	ALIAS(10, A.A9)
+	ALIAS(11, A.A8)
+	ALIAS(12, A.A7)
+	ALIAS(13, A.ARQ)
+	ALIAS(14, A.OE2)
+	ALIAS(15, A.A11)
+	ALIAS(16, A.O8)
+	ALIAS(17, A.O7)
+	ALIAS(18, A.O6)
+	ALIAS(19, A.O5)
+	ALIAS(20, A.O4)
+	ALIAS(21, A.O3)
+	ALIAS(22, A.O2)
+	ALIAS(23, A.O1)
+	ALIAS(24, A.OE1)
+NETLIST_END()
+
+/*  2102: 1024 x 1-bit Static RAM
+ *
+ *          +--------------+
+ *       A6 |1     ++    16| A7
+ *       A5 |2           15| A8
+ *      RWQ |3           14| A9
+ *       A1 |4   82S16   13| CEQ
+ *       A2 |5           12| DO
+ *       A3 |6           11| DI
+ *       A4 |7           10| VCC
+ *       A0 |8            9| GND
+ *          +--------------+
+ */
+
+ static NETLIST_START(RAM_2102A_DIP)
+	RAM_2102A(A)
+
+	DIPPINS(   /*      +--------------+      */
+		 A.A6, /*   A6 |1     ++    16| A7   */ A.A7,
+		 A.A5, /*   A5 |2           15| A8   */ A.A8,
+		A.RWQ, /*  RWQ |3           14| A9   */ A.A9,
+		 A.A1, /*   A1 |4   82S16   13| CEQ  */ A.CEQ,
+		 A.A2, /*   A2 |5           12| DO   */ A.DO,
+		 A.A3, /*   A3 |6           11| DI   */ A.DI,
+		 A.A4, /*   A4 |7           10| VCC  */ A.VCC,
+		 A.A0, /*   A0 |8            9| GND  */ A.GND
+			   /*      +--------------+      */
+	)
+NETLIST_END()
+
+
+NETLIST_START(roms_lib)
+
+	LOCAL_LIB_ENTRY(PROM_82S123_DIP)
+	LOCAL_LIB_ENTRY(PROM_82S126_DIP)
+	LOCAL_LIB_ENTRY(PROM_74S287_DIP)
+	LOCAL_LIB_ENTRY(EPROM_2716_DIP)
+	LOCAL_LIB_ENTRY(TTL_82S16_DIP)
+	LOCAL_LIB_ENTRY(PROM_82S115_DIP)
+	LOCAL_LIB_ENTRY(PROM_MK28000_DIP)
+	LOCAL_LIB_ENTRY(RAM_2102A_DIP)
+
+	NETLIST_END()
+
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_roms_lib.h mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_roms_lib.h
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_roms_lib.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_roms_lib.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,57 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#ifndef NLM_ROMS_H_
+#define NLM_ROMS_H_
+
+///
+/// \file nlm_roms.h
+///
+
+#include "netlist/nl_setup.h"
+
+#ifndef __PLIB_PREPROCESSOR__
+
+/* ----------------------------------------------------------------------------
+ *  Netlist Macros
+ * ---------------------------------------------------------------------------*/
+
+#if !NL_AUTO_DEVICES
+
+#define PROM_82S115_DIP(name)                                                  \
+		NET_REGISTER_DEV(PROM_82S115_DIP, name)
+
+#define PROM_82S126_DIP(name)                                                  \
+		NET_REGISTER_DEV(PROM_82S126_DIP, name)
+
+#define PROM_82S123_DIP(name)                                                  \
+		NET_REGISTER_DEV(PROM_82S123_DIP, name)
+
+#define PROM_74S287_DIP(name)                                                  \
+		NET_REGISTER_DEV(PROM_74S287_DIP, name)
+
+#define PROM_MK28000_DIP(name)                                                 \
+		NET_REGISTER_DEV(PROM_MK28000_DIP, name)
+
+#define EPROM_2716_DIP(name)                                                   \
+		NET_REGISTER_DEV(EPROM_2716_DIP, name)
+
+// usage       : TTL_82S16_DIP(name)
+#define TTL_82S16_DIP(...)                                                     \
+	NET_REGISTER_DEVEXT(TTL_82S16_DIP, __VA_ARGS__)
+
+#define RAM_2102A_DIP(name)                                                    \
+		NET_REGISTER_DEV(RAM_2102A_DIP, name)
+
+#endif // NL_AUTO_DEVICES
+
+
+/* ----------------------------------------------------------------------------
+ *  External declarations
+ * ---------------------------------------------------------------------------*/
+
+// moved to net_lib.h
+
+#endif // __PLIB_PREPROCESSOR__
+
+#endif
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx.cpp mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,1689 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#include "netlist/devices/net_lib.h"
-
-/*
- *  DM7400: Quad 2-Input NAND Gates
- *
- *                  _
- *              Y = AB
- *          +---+---++---+
- *          | A | B || Y |
- *          +===+===++===+
- *          | 0 | 0 || 1 |
- *          | 0 | 1 || 1 |
- *          | 1 | 0 || 1 |
- *          | 1 | 1 || 0 |
- *          +---+---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
-
-static NETLIST_START(TTL_7400_DIP)
-	TTL_7400_GATE(A)
-	TTL_7400_GATE(B)
-	TTL_7400_GATE(C)
-	TTL_7400_GATE(D)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.B,  /*    B1 |2           13| B4   */ D.B,
-		A.Q,  /*    Y1 |3           12| A4   */ D.A,
-		B.A,  /*    A2 |4    7400   11| Y4   */ D.Q,
-		B.B,  /*    B2 |5           10| B3   */ C.B,
-		B.Q,  /*    Y2 |6            9| A3   */ C.A,
-		A.GND,/*   GND |7            8| Y3   */ C.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM7402: Quad 2-Input NOR Gates
- *
- *              Y = A+B
- *          +---+---++---+
- *          | A | B || Y |
- *          +===+===++===+
- *          | 0 | 0 || 1 |
- *          | 0 | 1 || 0 |
- *          | 1 | 0 || 0 |
- *          | 1 | 1 || 0 |
- *          +---+---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
-
-static NETLIST_START(TTL_7402_DIP)
-	TTL_7402_GATE(A)
-	TTL_7402_GATE(B)
-	TTL_7402_GATE(C)
-	TTL_7402_GATE(D)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.Q,  /*    Y1 |1     ++    14| VCC  */ A.VCC,
-		A.A,  /*    A1 |2           13| Y4   */ D.Q,
-		A.B,  /*    B1 |3           12| B4   */ D.B,
-		B.Q,  /*    Y2 |4    7402   11| A4   */ D.A,
-		B.A,  /*    A2 |5           10| Y3   */ C.Q,
-		B.B,  /*    B2 |6            9| B3   */ C.B,
-		A.GND,/*   GND |7            8| A3   */ C.A
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *   DM7404: Hex Inverting Gates
- *
- *             Y = A
- *          +---++---+
- *          | A || Y |
- *          +===++===+
- *          | 0 || 1 |
- *          | 1 || 0 |
- *          +---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
-
-static NETLIST_START(TTL_7404_DIP)
-	TTL_7404_GATE(A)
-	TTL_7404_GATE(B)
-	TTL_7404_GATE(C)
-	TTL_7404_GATE(D)
-	TTL_7404_GATE(E)
-	TTL_7404_GATE(F)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.Q,  /*    Y1 |2           13| A6   */ F.A,
-		B.A,  /*    A2 |3           12| Y6   */ F.Q,
-		B.Q,  /*    Y2 |4    7404   11| A5   */ E.A,
-		C.A,  /*    A3 |5           10| Y5   */ E.Q,
-		C.Q,  /*    Y3 |6            9| A4   */ D.A,
-		A.GND,/*   GND |7            8| Y4   */ D.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *   DM7406: Hex Inverting Buffers with
- *           High Voltage Open-Collector Outputs
- *
- *  Naming conventions follow Fairchild Semiconductor datasheet
- *
- */
-
-static NETLIST_START(TTL_7406_DIP)
-	TTL_7406_GATE(A)
-	TTL_7406_GATE(B)
-	TTL_7406_GATE(C)
-	TTL_7406_GATE(D)
-	TTL_7406_GATE(E)
-	TTL_7406_GATE(F)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.Y,  /*    Y1 |2           13| A6   */ F.A,
-		B.A,  /*    A2 |3           12| Y6   */ F.Y,
-		B.Y,  /*    Y2 |4    7406   11| A5   */ E.A,
-		C.A,  /*    A3 |5           10| Y5   */ E.Y,
-		C.Y,  /*    Y3 |6            9| A4   */ D.A,
-		A.GND,/*   GND |7            8| Y4   */ D.Y
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM7408: Quad 2-Input AND Gates
- *
- *
- *              Y = AB
- *          +---+---++---+
- *          | A | B || Y |
- *          +===+===++===+
- *          | 0 | 0 || 0 |
- *          | 0 | 1 || 0 |
- *          | 1 | 0 || 0 |
- *          | 1 | 1 || 1 |
- *          +---+---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
-
-static NETLIST_START(TTL_7408_DIP)
-	TTL_7408_GATE(A)
-	TTL_7408_GATE(B)
-	TTL_7408_GATE(C)
-	TTL_7408_GATE(D)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.B,  /*    B1 |2           13| B4   */ D.B,
-		A.Q,  /*    Y1 |3           12| A4   */ D.A,
-		B.A,  /*    A2 |4    7400   11| Y4   */ D.Q,
-		B.B,  /*    B2 |5           10| B3   */ C.B,
-		B.Q,  /*    Y2 |6            9| A3   */ C.A,
-		A.GND,/*   GND |7            8| Y3   */ C.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM7410: Triple 3-Input NAND Gates
- *                  __
- *              Y = ABC
- *          +---+---+---++---+
- *          | A | B | C || Y |
- *          +===+===+===++===+
- *          | X | X | 0 || 1 |
- *          | X | 0 | X || 1 |
- *          | 0 | X | X || 1 |
- *          | 1 | 1 | 1 || 0 |
- *          +---+---+---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
-
-static NETLIST_START(TTL_7410_DIP)
-	TTL_7410_GATE(A)
-	TTL_7410_GATE(B)
-	TTL_7410_GATE(C)
-
-	NET_C(A.VCC, B.VCC, C.VCC)
-	NET_C(A.GND, B.GND, C.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.B,  /*    B1 |2           13| C1   */ A.C,
-		B.A,  /*    A2 |3           12| Y1   */ A.Q,
-		B.B,  /*    B2 |4    7410   11| C3   */ C.C,
-		B.C,  /*    C2 |5           10| B3   */ C.B,
-		B.Q,  /*    Y2 |6            9| A3   */ C.A,
-		A.GND,/*   GND |7            8| Y3   */ C.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM7411: Triple 3-Input AND Gates
- *
- *              Y = ABC
- *          +---+---+---++---+
- *          | A | B | C || Y |
- *          +===+===+===++===+
- *          | X | X | 0 || 0 |
- *          | X | 0 | X || 0 |
- *          | 0 | X | X || 0 |
- *          | 1 | 1 | 1 || 1 |
- *          +---+---+---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
-
-static NETLIST_START(TTL_7411_DIP)
-	TTL_7411_GATE(A)
-	TTL_7411_GATE(B)
-	TTL_7411_GATE(C)
-
-	NET_C(A.VCC, B.VCC, C.VCC)
-	NET_C(A.GND, B.GND, C.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.B,  /*    B1 |2           13| C1   */ A.C,
-		B.A,  /*    A2 |3           12| Y1   */ A.Q,
-		B.B,  /*    B2 |4    7411   11| C3   */ C.C,
-		B.C,  /*    C2 |5           10| B3   */ C.B,
-		B.Q,  /*    Y2 |6            9| A3   */ C.A,
-		A.GND,/*   GND |7            8| Y3   */ C.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *   DM7414/DM74LS14: Hex Inverter with
- *                    Schmitt Trigger Inputs
- *
- */
-
-static NETLIST_START(TTL_7414_GATE)
-	SCHMITT_TRIGGER(X, "DM7414")
-	ALIAS(A, X.A)
-	ALIAS(Q, X.Q)
-	ALIAS(GND, X.GND)
-	ALIAS(VCC, X.VCC)
-NETLIST_END()
-
-static NETLIST_START(TTL_74LS14_GATE)
-	SCHMITT_TRIGGER(X, "DM74LS14")
-	ALIAS(A, X.A)
-	ALIAS(Q, X.Q)
-	ALIAS(GND, X.GND)
-	ALIAS(VCC, X.VCC)
-NETLIST_END()
-
-static NETLIST_START(TTL_7414_DIP)
-	SCHMITT_TRIGGER(A, "DM7414")
-	SCHMITT_TRIGGER(B, "DM7414")
-	SCHMITT_TRIGGER(C, "DM7414")
-	SCHMITT_TRIGGER(D, "DM7414")
-	SCHMITT_TRIGGER(E, "DM7414")
-	SCHMITT_TRIGGER(F, "DM7414")
-
-	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
-
-	DIPPINS(   /*       +--------------+      */
-		A.A,   /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.Q,   /*    Y1 |2           13| A6   */ F.A,
-		B.A,   /*    A2 |3           12| Y6   */ F.Q,
-		B.Q,   /*    Y2 |4    7414   11| A5   */ E.A,
-		C.A,   /*    A3 |5           10| Y5   */ E.Q,
-		C.Q,   /*    Y3 |6            9| A4   */ D.A,
-		A.GND, /*   GND |7            8| Y4   */ D.Q
-			   /*       +--------------+      */
-	)
-NETLIST_END()
-
-static NETLIST_START(TTL_74LS14_DIP)
-	SCHMITT_TRIGGER(A, "DM74LS14")
-	SCHMITT_TRIGGER(B, "DM74LS14")
-	SCHMITT_TRIGGER(C, "DM74LS14")
-	SCHMITT_TRIGGER(D, "DM74LS14")
-	SCHMITT_TRIGGER(E, "DM74LS14")
-	SCHMITT_TRIGGER(F, "DM74LS14")
-
-	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
-
-	DIPPINS(   /*       +--------------+      */
-		A.A,   /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.Q,   /*    Y1 |2           13| A6   */ F.A,
-		B.A,   /*    A2 |3           12| Y6   */ F.Q,
-		B.Q,   /*    Y2 |4   74LS14  11| A5   */ E.A,
-		C.A,   /*    A3 |5           10| Y5   */ E.Q,
-		C.Q,   /*    Y3 |6            9| A4   */ D.A,
-		A.GND, /*   GND |7            8| Y4   */ D.Q
-			   /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *   DM7416: Hex Inverting Buffers with
- *           High Voltage Open-Collector Outputs
- *
- */
-
-static NETLIST_START(TTL_7416_DIP)
-	TTL_7416_GATE(A)
-	TTL_7416_GATE(B)
-	TTL_7416_GATE(C)
-	TTL_7416_GATE(D)
-	TTL_7416_GATE(E)
-	TTL_7416_GATE(F)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.Q,  /*    Y1 |2           13| A6   */ F.A,
-		B.A,  /*    A2 |3           12| Y6   */ F.Q,
-		B.Q,  /*    Y2 |4    7416   11| A5   */ E.A,
-		C.A,  /*    A3 |5           10| Y5   */ E.Q,
-		C.Q,  /*    Y3 |6            9| A4   */ D.A,
-		A.GND,/*   GND |7            8| Y4   */ D.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM7420: Dual 4-Input NAND Gates
- *
- *                  ___
- *              Y = ABCD
- *          +---+---+---+---++---+
- *          | A | B | C | D || Y |
- *          +===+===+===+===++===+
- *          | X | X | X | 0 || 1 |
- *          | X | X | 0 | X || 1 |
- *          | X | 0 | X | X || 1 |
- *          | 0 | X | X | X || 1 |
- *          | 1 | 1 | 1 | 1 || 0 |
- *          +---+---+---+---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet *
- */
-
-static NETLIST_START(TTL_7420_DIP)
-	TTL_7420_GATE(A)
-	TTL_7420_GATE(B)
-
-	NET_C(A.VCC, B.VCC)
-	NET_C(A.GND, B.GND)
-	NC_PIN(NC)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.B,  /*    B1 |2           13| D2   */ B.D,
-		NC.I, /*    NC |3           12| C2   */ B.C,
-		A.C,  /*    C1 |4    7420   11| NC   */ NC.I,
-		A.D,  /*    D1 |5           10| B2   */ B.B,
-		A.Q,  /*    Y1 |6            9| A2   */ B.A,
-		A.GND,/*   GND |7            8| Y2   */ B.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM7421: Dual 4-Input AND Gates
- *
- *                  ___
- *              Y = ABCD
- *          +---+---+---+---++---+
- *          | A | B | C | D || Y |
- *          +===+===+===+===++===+
- *          | X | X | X | 0 || 0 |
- *          | X | X | 0 | X || 0 |
- *          | X | 0 | X | X || 0 |
- *          | 0 | X | X | X || 0 |
- *          | 1 | 1 | 1 | 1 || 1 |
- *          +---+---+---+---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet *
- */
-
-static NETLIST_START(TTL_7421_DIP)
-	TTL_7421_GATE(A)
-	TTL_7421_GATE(B)
-
-	NET_C(A.VCC, B.VCC)
-	NET_C(A.GND, B.GND)
-	NC_PIN(NC)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.B,  /*    B1 |2           13| D2   */ B.D,
-		NC.I, /*    NC |3           12| C2   */ B.C,
-		A.C,  /*    C1 |4    7420   11| NC   */ NC.I,
-		A.D,  /*    D1 |5           10| B2   */ B.B,
-		A.Q,  /*    Y1 |6            9| A2   */ B.A,
-		A.GND,/*   GND |7            8| Y2   */ B.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM7425: Dual 4-Input NOR Gates
- *
- *                  ______
- *              Y = A+B+C+D
- *          +---+---+---+---+---++---+
- *          | A | B | C | D | X || Y |
- *          +===+===+===+===+===++===+
- *          | X | X | X | X | 0 || Z |
- *          | 0 | 0 | 0 | 0 | 1 || 1 |
- *          | X | X | X | 1 | 1 || 0 |
- *          | X | X | 1 | X | 1 || 0 |
- *          | X | 1 | X | X | 1 || 0 |
- *          | 1 | X | X | X | 1 || 0 |
- *          +---+---+---+---+---++---+
- *
- *  FIXME: The "X" input and high impedance output are currently not simulated.
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
-
-static NETLIST_START(TTL_7425_DIP)
-	TTL_7425_GATE(A)
-	TTL_7425_GATE(B)
-
-	NET_C(A.VCC, B.VCC)
-	NET_C(A.GND, B.GND)
-	NC_PIN(XA) // FIXME: Functionality needs to be implemented
-	NC_PIN(XB) // FIXME: Functionality needs to be implemented
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.B,  /*    B1 |2           13| D2   */ B.D,
-		XA.I, /*    X1 |3           12| C2   */ B.C,
-		A.C,  /*    C1 |4    7425   11| X2   */ XB.I,
-		A.D,  /*    D1 |5           10| B2   */ B.B,
-		A.Q,  /*    Y1 |6            9| A2   */ B.A,
-		A.GND,/*   GND |7            8| Y2   */ B.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM7427: Triple 3-Input NOR Gates
- *
- *                  ____
- *              Y = A+B+C
- *          +---+---+---++---+
- *          | A | B | C || Y |
- *          +===+===+===++===+
- *          | X | X | 1 || 0 |
- *          | X | 1 | X || 0 |
- *          | 1 | X | X || 0 |
- *          | 0 | 0 | 0 || 1 |
- *          +---+---+---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
-
-static NETLIST_START(TTL_7427_DIP)
-	TTL_7427_GATE(A)
-	TTL_7427_GATE(B)
-	TTL_7427_GATE(C)
-
-	NET_C(A.VCC, B.VCC, C.VCC)
-	NET_C(A.GND, B.GND, C.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.B,  /*    B1 |2           13| C1   */ A.C,
-		B.A,  /*    A2 |3           12| Y1   */ A.Q,
-		B.B,  /*    B2 |4    7427   11| C3   */ C.C,
-		B.C,  /*    C2 |5           10| B3   */ C.B,
-		B.Q,  /*    Y2 |6            9| A3   */ C.A,
-		A.GND,/*   GND |7            8| Y3   */ C.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM7430: 8-Input NAND Gate
- *
- *                  _______
- *              Y = ABCDEFGH
- *          +---+---+---+---+---+---+---+---++---+
- *          | A | B | C | D | E | F | G | H || Y |
- *          +===+===+===+===+===+===+===+===++===+
- *          | X | X | X | X | X | X | X | 0 || 1 |
- *          | X | X | X | X | X | X | 0 | X || 1 |
- *          | X | X | X | X | X | 0 | X | X || 1 |
- *          | X | X | X | X | 0 | X | X | X || 1 |
- *          | X | X | X | 0 | X | X | X | X || 1 |
- *          | X | X | 0 | X | X | X | X | X || 1 |
- *          | X | 0 | X | X | X | X | X | X || 1 |
- *          | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 || 0 |
- *          +---+---+---+---+---+---+---+---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet
- */
-
-static NETLIST_START(TTL_7430_DIP)
-	TTL_7430_GATE(A)
-
-	NC_PIN(NC9)
-	NC_PIN(NC10)
-	NC_PIN(NC13)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*     A |1     ++    14| VCC  */ A.VCC,
-		A.B,  /*     B |2           13| NC   */ NC13.I,
-		A.C,  /*     C |3           12| H    */ A.H,
-		A.D,  /*     D |4    7430   11| G    */ A.G,
-		A.E,  /*     E |5           10| NC   */ NC10.I,
-		A.F,  /*     F |6            9| NC   */ NC9.I,
-		A.GND,/*   GND |7            8| Y    */ A.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM7432: Quad 2-Input OR Gates
- *
- *                  __
- *              Y = A+B
- *          +---+---++---+
- *          | A | B || Y |
- *          +===+===++===+
- *          | 0 | 0 || 0 |
- *          | 0 | 1 || 1 |
- *          | 1 | 0 || 1 |
- *          | 1 | 1 || 1 |
- *          +---+---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
-
-static NETLIST_START(TTL_7432_DIP)
-	TTL_7432_GATE(A)
-	TTL_7432_GATE(B)
-	TTL_7432_GATE(C)
-	TTL_7432_GATE(D)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.B,  /*    B1 |2           13| B4   */ D.B,
-		A.Q,  /*    Y1 |3           12| A4   */ D.A,
-		B.A,  /*    A2 |4    7400   11| Y4   */ D.Q,
-		B.B,  /*    B2 |5           10| B3   */ C.B,
-		B.Q,  /*    Y2 |6            9| A3   */ C.A,
-		A.GND,/*   GND |7            8| Y3   */ C.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-
-/*
- *  DM7437: Quad 2-Input NAND Gates
- *
- *                  _
- *              Y = AB
- *          +---+---++---+
- *          | A | B || Y |
- *          +===+===++===+
- *          | 0 | 0 || 1 |
- *          | 0 | 1 || 1 |
- *          | 1 | 0 || 1 |
- *          | 1 | 1 || 0 |
- *          +---+---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- *  NOTE: Same as 7400, but drains higher output currents.
- *         Netlist currently does not model over currents (should it ever?)
- */
-
-static NETLIST_START(TTL_7437_DIP)
-	TTL_7437_GATE(A)
-	TTL_7437_GATE(B)
-	TTL_7437_GATE(C)
-	TTL_7437_GATE(D)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.B,  /*    B1 |2           13| B4   */ D.B,
-		A.Q,  /*    Y1 |3           12| A4   */ D.A,
-		B.A,  /*    A2 |4    7400   11| Y4   */ D.Q,
-		B.B,  /*    B2 |5           10| B3   */ C.B,
-		B.Q,  /*    Y2 |6            9| A3   */ C.A,
-		A.GND,/*   GND |7            8| Y3   */ C.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM7486: Quad 2-Input Exclusive-OR Gates
- *
- *             Y = A+B
- *          +---+---++---+
- *          | A | B || Y |
- *          +===+===++===+
- *          | 0 | 0 || 0 |
- *          | 0 | 1 || 1 |
- *          | 1 | 0 || 1 |
- *          | 1 | 1 || 0 |
- *          +---+---++---+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
-
-static NETLIST_START(TTL_7486_DIP)
-	TTL_7486_GATE(A)
-	TTL_7486_GATE(B)
-	TTL_7486_GATE(C)
-	TTL_7486_GATE(D)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
-		A.B,  /*    B1 |2           13| B4   */ D.B,
-		A.Q,  /*    Y1 |3           12| A4   */ D.A,
-		B.A,  /*    A2 |4    7486   11| Y4   */ D.Q,
-		B.B,  /*    B2 |5           10| B3   */ C.B,
-		B.Q,  /*    Y2 |6            9| A3   */ C.A,
-		A.GND,/*   GND |7            8| Y3   */ C.Q
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-#if (NL_USE_TRUTHTABLE_74107)
-#ifndef __PLIB_PREPROCESSOR__
-#define TTL_74107_TT(name)                                                         \
-		NET_REGISTER_DEV(TTL_74107, name)
-#endif
-
-static NETLIST_START(TTL_74107_DIP)
-	TTL_74107_TT(A)
-	TTL_74107_TT(B)
-
-	NET_C(A.VCC, B.VCC)
-	NET_C(A.GND, B.GND)
-
-	DIPPINS(    /*          +--------------+        */
-		A.J,    /*       1J |1     ++    14| VCC    */ A.VCC,
-		A.QQ,   /*      1QQ |2           13| 1CLRQ  */ A.CLRQ,
-		A.Q,    /*       1Q |3           12| 1CLK   */ A.CLK,
-		A.K,    /*       1K |4    74107  11| 2K     */ B.K,
-		B.Q,    /*       2Q |5           10| 2CLRQ  */ B.CLRQ,
-		B.QQ,   /*      2QQ |6            9| 2CLK   */ B.CLK,
-		B.GND,  /*      GND |7            8| 2J     */ B.J
-				/*          +--------------+        */
-	)
-
-NETLIST_END()
-#endif
-
-
-/*
- * DM74155/DM74156: Dual 2-Line to 4-Line Decoders/Demultiplexers
- *
- *      +-----+-------++-----------------+
- *      | B A | G1 C1 || 1Y0 1Y1 1Y2 1Y3 |
- *      +=====+=======++=================+
- *      | X X | 1  X  ||  1   1   1   1  |
- *      | 0 0 | 0  1  ||  0   1   1   1  |
- *      | 0 1 | 0  1  ||  1   0   1   1  |
- *      | 1 0 | 0  1  ||  1   1   0   1  |
- *      | 1 1 | 0  1  ||  1   1   1   0  |
- *      | X X | X  0  ||  1   1   1   1  |
- *      +-----+-------++-----------------+
- *
- *      +-----+-------++-----------------+
- *      | B A | G2 C2 || 2Y0 2Y1 2Y2 2Y3 |
- *      +=====+=======++=================+
- *      | X X | 1  X  ||  1   1   1   1  |
- *      | 0 0 | 0  0  ||  0   1   1   1  |
- *      | 0 1 | 0  0  ||  1   0   1   1  |
- *      | 1 0 | 0  0  ||  1   1   0   1  |
- *      | 1 1 | 0  0  ||  1   1   1   0  |
- *      | X X | X  1  ||  1   1   1   1  |
- *      +-----+-------++-----------------+
- *
- * Naming conventions follow National Semiconductor datasheet
- *
- */
-
-//- Identifier:  TTL_74125_DIP
-//- Title: SN74125 QUADRUPLE BUS BUFFERS WITH 3-STATE OUTPUTS
-//- Description: These bus buffers feature three-state outputs
-//-    that, when enabled, have the low impedance characteristics of a
-//-    TTL output with additional drive capability at high logic levels
-//-    to permit driving heavily loaded bus lines without external
-//-    pullup resistors. When disabled, both output transistors are turned
-//-    off, presenting a high-impedance state to the bus so the output will
-//-    act neither as a significant load nor as a driver. The ’125 and
-//-    ’LS125A devices’ outputs are disabled when G is high.
-//-    The ’126 and ’LS126A devices’ outputs are disabled when G is low
-//-
-//- Pinalias: 1GQ,1A,1Y,2GQ,2A,2Y,GND,3Y,3A,3GQ,4Y,4A,4GQ,VCC
-//- Package: DIP
-//- Param: FORCE_TRISTATE_LOGIC
-//-    Set this parameter to 1 force tristate outputs into logic mode.
-//-    This should be done only if the device enable inputs are connected
-//-    in a way which always enables the device.
-//- NamingConvention: Naming conventions follow Texas instruments datasheet
-//- Limitations:
-//-    No limitations
-//-
-//- Example: 74125.cpp,74125_example
-//-
-//- FunctionTable:
-//-
-//-    | GQ  | A  | Y  |
-//-    |:---:|:--:|:--:|
-//-    |  L  |  L |  L |
-//-    |  L  |  H |  H |
-//-    |  H  |  X |  Z |
-//-
-
-static NETLIST_START(TTL_74125_DIP)
-
-	TTL_74125_GATE(A1)
-	TTL_74125_GATE(A2)
-	TTL_74125_GATE(A3)
-	TTL_74125_GATE(A4)
-
-	DEFPARAM(FORCE_TRISTATE_LOGIC, "$(@.A1.FORCE_TRISTATE_LOGIC")
-
-	PARAM(A1.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
-	PARAM(A2.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
-	PARAM(A3.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
-	PARAM(A4.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
-
-	ALIAS(1, A1.GQ)
-	ALIAS(2, A1.A)
-	ALIAS(3, A1.Y)
-	ALIAS(4, A2.GQ)
-	ALIAS(5, A2.A)
-	ALIAS(6, A2.Y)
-	ALIAS(7, A1.GND)
-
-	ALIAS(8, A3.Y)
-	ALIAS(9, A3.A)
-	ALIAS(10, A3.GQ)
-	ALIAS(11, A4.Y)
-	ALIAS(12, A4.A)
-	ALIAS(13, A4.GQ)
-	ALIAS(14, A1.VCC)
-
-	NET_C(A1.VCC, A2.VCC, A3.VCC, A4.VCC)
-	NET_C(A1.GND, A2.GND, A3.GND, A4.GND)
-NETLIST_END()
-
-static NETLIST_START(TTL_74126_DIP)
-
-	TTL_74126_GATE(A1)
-	TTL_74126_GATE(A2)
-	TTL_74126_GATE(A3)
-	TTL_74126_GATE(A4)
-
-	DEFPARAM(FORCE_TRISTATE_LOGIC, 0)
-	PARAM(A1.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
-	PARAM(A2.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
-	PARAM(A3.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
-	PARAM(A4.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
-
-	ALIAS(1, A1.G)
-	ALIAS(2, A1.A)
-	ALIAS(3, A1.Y)
-	ALIAS(4, A2.G)
-	ALIAS(5, A2.A)
-	ALIAS(6, A2.Y)
-	ALIAS(7, A1.GND)
-
-	ALIAS(8, A3.Y)
-	ALIAS(9, A3.A)
-	ALIAS(10, A3.G)
-	ALIAS(11, A4.Y)
-	ALIAS(12, A4.A)
-	ALIAS(13, A4.G)
-	ALIAS(14, A1.VCC)
-
-	NET_C(A1.VCC, A2.VCC, A3.VCC, A4.VCC)
-	NET_C(A1.GND, A2.GND, A3.GND, A4.GND)
-NETLIST_END()
-
-static NETLIST_START(TTL_74155_DIP)
-	NET_REGISTER_DEV(TTL_74155A_GATE, A)
-	NET_REGISTER_DEV(TTL_74155B_GATE, B)
-
-	NET_C(A.A, B.A)
-	NET_C(A.B, B.B)
-
-	NET_C(A.VCC, B.VCC)
-	NET_C(A.GND, B.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.C,  /*    C1 |1     ++    16| VCC  */ A.VCC,
-		A.G,  /*    G1 |2           15| B4   */ B.C,
-		A.B,  /*     B |3           14| B4   */ B.G,
-		A.3,  /*   1Y3 |4   74155   13| A4   */ B.A,
-		B.2,  /*   1Y2 |5           12| Y4   */ B.3,
-		B.1,  /*   1Y1 |6           11| B3   */ B.2,
-		B.0,  /*   1Y0 |7           10| A3   */ B.1,
-		A.GND,/*   GND |8            9| Y3   */ B.0
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-static NETLIST_START(TTL_74156_DIP)
-	NET_REGISTER_DEV(TTL_74156A_GATE, A)
-	NET_REGISTER_DEV(TTL_74156B_GATE, B)
-
-	NET_C(A.A, B.A)
-	NET_C(A.B, B.B)
-
-	NET_C(A.VCC, B.VCC)
-	NET_C(A.GND, B.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.C,  /*    C1 |1     ++    16| VCC  */ A.VCC,
-		A.G,  /*    G1 |2           15| B4   */ B.C,
-		A.B,  /*     B |3           14| B4   */ B.G,
-		A.3,  /*   1Y3 |4   74156   13| A4   */ B.A,
-		B.2,  /*   1Y2 |5           12| Y4   */ B.3,
-		B.1,  /*   1Y1 |6           11| B3   */ B.2,
-		B.0,  /*   1Y0 |7           10| A3   */ B.1,
-		A.GND,/*   GND |8            9| Y3   */ B.0
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM74260: Dual 5-Input NOR Gates
- *                 _________
- *             Y = A+B+C+D+E
- *          +---+---+---+---+---++---+
- *          | A | B | B | B | B || Y |
- *          +===+===+===+===+===++===+
- *          | 0 | 0 | 0 | 0 | 0 || 1 |
- *          | 0 | 0 | 0 | 0 | 1 || 0 |
- *          | 0 | 0 | 0 | 1 | 0 || 0 |
- *          | 0 | 0 | 1 | 0 | 0 || 0 |
- *          | 0 | 1 | 0 | 0 | 0 || 0 |
- *          | 1 | 0 | 0 | 0 | 0 || 0 |
- *          +---+---+---+---+---++---+
- *
- *  Naming conventions follow Texas Instruments datasheet
- *
- */
-
-static NETLIST_START(TTL_74260_DIP)
-	TTL_74260_GATE(A)
-	TTL_74260_GATE(B)
-
-	NET_C(A.VCC, B.VCC)
-	NET_C(A.GND, B.GND)
-
-	DIPPINS(  /*       +--------------+      */
-		A.C,  /*    C1 |1     ++    14| VCC  */ A.VCC,
-		A.D,  /*    D1 |2           13| B1   */ A.B,
-		A.E,  /*    E1 |3           12| A1   */ A.A,
-		B.E,  /*    E2 |4   74260   11| D2   */ B.D,
-		A.Q,  /*    Y1 |5           10| C2   */ B.C,
-		B.Q,  /*    Y2 |6            9| B2   */ B.B,
-		A.GND,/*   GND |7            8| A2   */ B.A
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM74279: Quad S-R Latch
- *
- *          +---+---+---++---+
- *          |S1 |S2 | R || Q |
- *          +===+===+===++===+
- *          | 0 | 0 | 0 || 1 |
- *          | 0 | 1 | 1 || 1 |
- *          | 1 | 0 | 1 || 1 |
- *          | 1 | 1 | 0 || 0 |
- *          | 1 | 1 | 1 ||QP |
- *          +---+---+---++---+
- *
- *  QP: Previous Q
- *
- *  Naming conventions follow Fairchild Semiconductor datasheet
- *
- */
-
-#if !NL_AUTO_DEVICES
-#ifndef __PLIB_PREPROCESSOR__
-#define TTL_74279A(name)                                                         \
-		NET_REGISTER_DEV(TTL_74279A, name)
-#define TTL_74279B(name)                                                         \
-		NET_REGISTER_DEV(TTL_74279B, name)
-#endif
-#endif
-
-static NETLIST_START(TTL_74279_DIP)
-	TTL_74279B(A)
-	TTL_74279A(B)
-	TTL_74279B(C)
-	TTL_74279A(D)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND)
-
-	DIPPINS(   /*     +--------------+     */
-		A.R,   /*  1R |1     ++    16| VCC */ A.VCC,
-		A.S1,  /* 1S1 |2           15| 4S  */ D.S,
-		A.S2,  /* 1S2 |3           14| 4R  */ D.R,
-		A.Q,   /*  1Q |4    74279  13| 4Q  */ D.Q,
-		B.R,   /*  2R |5           12| 3S2 */ C.S2,
-		B.S,   /*  2S |6           11| 3S1 */ C.S1,
-		B.Q,   /*  2Q |7           10| 3R  */ C.R,
-		A.GND, /* GND |8            9| 3Q  */ C.Q
-			   /*     +--------------+     */
-	)
-NETLIST_END()
-
-/*
- *  DM74377: Octal D Flip-Flop With Enable
- *  DM74378: Hex D Flip-Flop With Enable
- *  DM74379: 4-bit D Flip-Flop With Enable
- *
- */
-
-static NETLIST_START(TTL_74377_DIP)
-	TTL_74377_GATE(A)
-	TTL_74377_GATE(B)
-	TTL_74377_GATE(C)
-	TTL_74377_GATE(D)
-	TTL_74377_GATE(E)
-	TTL_74377_GATE(F)
-	TTL_74377_GATE(G)
-	TTL_74377_GATE(H)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC, G.VCC, H.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND, G.GND, H.GND)
-	NET_C(A.CP, B.CP, C.CP, D.CP, E.CP, F.CP, G.CP, H.CP)
-	NET_C(A.E, B.E, C.E, D.E, E.E, F.E, G.E, H.E)
-
-	DIPPINS(  /*       +--------------+      */
-		A.E,  /*    /E |1     ++    20| VCC  */ A.VCC,
-		A.Q,  /*    Q0 |2           19| Q7   */ H.Q,
-		A.D,  /*    D0 |3           18| D7   */ H.D,
-		B.D,  /*    D1 |4   74377   17| D6   */ G.D,
-		B.Q,  /*    Q1 |5           16| Q6   */ G.Q,
-		C.Q,  /*    Q2 |6           15| Q5   */ F.Q,
-		C.D,  /*    D2 |7           14| D5   */ F.D,
-		D.D,  /*    D3 |8           13| D4   */ E.D,
-		D.Q,  /*    Q3 |9           12| Q4   */ E.D,
-		A.GND,/*   GND |10          11| CP   */ A.CP
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-static NETLIST_START(TTL_74378_DIP)
-	TTL_74377_GATE(A)
-	TTL_74377_GATE(B)
-	TTL_74377_GATE(C)
-	TTL_74377_GATE(D)
-	TTL_74377_GATE(E)
-	TTL_74377_GATE(F)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
-	NET_C(A.CP, B.CP, C.CP, D.CP, E.CP, F.CP)
-	NET_C(A.E, B.E, C.E, D.E, E.E, F.E)
-
-	DIPPINS(  /*       +--------------+      */
-		A.E,  /*    /E |1     ++    16| VCC  */ A.VCC,
-		A.Q,  /*    Q0 |2           15| Q5   */ F.Q,
-		A.D,  /*    D0 |3           14| D5   */ F.D,
-		B.D,  /*    D1 |4   74378   13| D4   */ E.D,
-		B.Q,  /*    Q1 |5           12| Q4   */ E.Q,
-		C.D,  /*    D2 |6           11| D3   */ D.D,
-		C.Q,  /*    Q2 |7           10| Q3   */ D.Q,
-		A.GND,/*   GND |8            9| CP   */ A.CP
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-static NETLIST_START(TTL_74379_DIP)
-	TTL_74377_GATE(A)
-	TTL_74377_GATE(B)
-	TTL_74377_GATE(C)
-	TTL_74377_GATE(D)
-
-	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
-	NET_C(A.GND, B.GND, C.GND, D.GND)
-	NET_C(A.CP, B.CP, C.CP, D.CP)
-	NET_C(A.E, B.E, C.E, D.E)
-
-	DIPPINS(  /*       +--------------+      */
-		A.E,  /*    /E |1     ++    16| VCC  */ A.VCC,
-		A.Q,  /*    Q0 |2           15| Q3   */ D.Q,
-		A.QQ, /*   /Q0 |3           14| /Q3  */ D.QQ,
-		A.D,  /*    D0 |4   74379   13| D3   */ D.D,
-		B.D,  /*    D1 |5           12| D2   */ C.D,
-		B.QQ, /*   /Q1 |6           11| /Q2  */ C.QQ,
-		B.Q,  /*    Q1 |7           10| Q2   */ C.Q,
-		A.GND,/*   GND |8            9| CP   */ A.CP
-			  /*       +--------------+      */
-	)
-NETLIST_END()
-
-/*
- *  DM9312: One of Eight Line Data Selectors/Multiplexers
- *
- *          +--------------+
- *       D0 |1     ++    16| VCC
- *       D1 |2           15| Y
- *       D2 |3           14| YQ
- *       D3 |4    9312   13| C
- *       D4 |5           12| B
- *       D5 |6           11| A
- *       D6 |7           10| G   Strobe
- *      GND |8            9| D7
- *          +--------------+
- *                  __
- *          +---+---+---+---++---+---+
- *          | C | B | A | G || Y | YQ|
- *          +===+===+===+===++===+===+
- *          | X | X | X | 1 ||  0| 1 |
- *          | 0 | 0 | 0 | 0 || D0|D0Q|
- *          | 0 | 0 | 1 | 0 || D1|D1Q|
- *          | 0 | 1 | 0 | 0 || D2|D2Q|
- *          | 0 | 1 | 1 | 0 || D3|D3Q|
- *          | 1 | 0 | 0 | 0 || D4|D4Q|
- *          | 1 | 0 | 1 | 0 || D5|D5Q|
- *          | 1 | 1 | 0 | 0 || D6|D6Q|
- *          | 1 | 1 | 1 | 0 || D7|D7Q|
- *          +---+---+---+---++---+---+
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
-
-#ifndef __PLIB_PREPROCESSOR__
-#define DM9312_TT(name)     \
-		NET_REGISTER_DEV(DM9312, name)
-#endif
-
-static NETLIST_START(DM9312_DIP)
-	DM9312_TT(s)
-
-	DIPPINS(    /*     +--------------+     */
-		s.D0,   /*  D0 |1     ++    16| VCC */ s.VCC,
-		s.D1,   /*  D1 |2           15| Y   */ s.Y,
-		s.D2,   /*  D2 |3           14| YQ  */ s.YQ,
-		s.D3,   /*  D3 |4    9312   13| C   */ s.C,
-		s.D4,   /*  D4 |5           12| B   */ s.B,
-		s.D5,   /*  D5 |6           11| A   */ s.A,
-		s.D6,   /*  D6 |7           10| G   */ s.G, //Strobe
-		s.GND,  /* GND |8            9| D7  */ s.D7
-				/*     +--------------+     */
-	)
-NETLIST_END()
-
-#if (NL_USE_TRUTHTABLE_7448)
-
-/*
- *  DM7448: BCD to 7-Segment decoders/drivers
- *
- *           +--------------+
- *         B |1     ++    16| VCC
- *         C |2           15| f
- * LAMP TEST |3           14| g
- *    BI/RBQ |4    7448   13| a
- *       RBI |5           12| b
- *         D |6           11| c
- *         A |7           10| d
- *       GND |8            9| e
- *           +--------------+
- *
- *
- *  Naming conventions follow National Semiconductor datasheet
- *
- */
-#ifndef __PLIB_PREPROCESSOR__
-#define TTL_7448_TT(name)     \
-		NET_REGISTER_DEV(TTL_7448_TT, name)
-#endif
-
-static NETLIST_START(TTL_7448_DIP)
-	TTL_7448_TT(s)
-
-	DIPPINS(    /*      +--------------+     */
-		s.B,    /* B    |1     ++    16| VCC */ s.VCC,
-		s.C,    /* C    |2           15| f   */ s.f,
-		s.LTQ,  /* LTQ  |3           14| g   */ s.g,
-		s.BIQ,  /* BIQ  |4    7448   13| a   */ s.a,
-		s.RBIQ, /* RBIQ |5           12| b   */ s.b,
-		s.D,    /* D    |6           11| c   */ s.c,
-		s.A,    /* A    |7           10| d   */ s.d,
-		s.GND,  /* GND  |8            9| e   */ s.e
-				/*      +--------------+     */
-	)
-NETLIST_END()
-#endif
-
-NETLIST_START(TTL74XX_lib)
-	NET_MODEL("DM7414         SCHMITT_TRIGGER(VTP=1.7 VTM=0.9 VI=4.35 RI=6.15k VOH=3.5 ROH=120 VOL=0.1 ROL=37.5 TPLH=15 TPHL=15)")
-	NET_MODEL("TTL_7414_GATE  SCHMITT_TRIGGER(VTP=1.7 VTM=0.9 VI=4.35 RI=6.15k VOH=3.5 ROH=120 VOL=0.1 ROL=37.5 TPLH=15 TPHL=15)")
-	NET_MODEL("DM74LS14       SCHMITT_TRIGGER(VTP=1.6 VTM=0.8 VI=4.4 RI=19.3k VOH=3.45 ROH=130 VOL=0.1 ROL=31.2 TPLH=15 TPHL=15)")
-	//NET_MODEL("DM7414 FAMILY(IVL=0.16 IVH=0.4 OVL=0.1 OVH=0.05 ORL=10.0 ORH=1.0e8)")
-
-
-	TRUTHTABLE_START(TTL_7400_GATE, 2, 1, "")
-		TT_HEAD("A,B|Q ")
-		TT_LINE("0,X|1|22")
-		TT_LINE("X,0|1|22")
-		TT_LINE("1,1|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7400_NAND, 2, 1, "+A,+B,@VCC,@GND")
-		TT_HEAD("A,B|Q ")
-		TT_LINE("0,X|1|22")
-		TT_LINE("X,0|1|22")
-		TT_LINE("1,1|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7402_GATE, 2, 1, "")
-		TT_HEAD("A,B|Q ")
-		TT_LINE("0,0|1|22")
-		TT_LINE("X,1|0|15")
-		TT_LINE("1,X|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7402_NOR, 2, 1, "+A,+B,@VCC,@GND")
-		TT_HEAD("A,B|Q ")
-		TT_LINE("0,0|1|22")
-		TT_LINE("X,1|0|15")
-		TT_LINE("1,X|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7404_GATE, 1, 1, "")
-		TT_HEAD(" A | Q ")
-		TT_LINE(" 0 | 1 |22")
-		TT_LINE(" 1 | 0 |15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7404_INVERT, 1, 1, "+A,@VCC,@GND")
-		TT_HEAD(" A | Q ")
-		TT_LINE(" 0 | 1 |22")
-		TT_LINE(" 1 | 0 |15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7406_GATE, 1, 1, "")
-		TT_HEAD("A|Y ")
-		TT_LINE("0|1|15")
-		TT_LINE("1|0|23")
-		/* Open Collector */
-		TT_FAMILY("74XXOC")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7408_GATE, 2, 1, "")
-		TT_HEAD("A,B|Q ")
-		TT_LINE("0,X|0|15")
-		TT_LINE("X,0|0|15")
-		TT_LINE("1,1|1|22")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7408_AND, 2, 1, "+A,+B,@VCC,@GND")
-		TT_HEAD("A,B|Q ")
-		TT_LINE("0,X|0|15")
-		TT_LINE("X,0|0|15")
-		TT_LINE("1,1|1|22")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7410_NAND, 3, 1, "+A,+B,+C,@VCC,@GND")
-		TT_HEAD("A,B,C|Q ")
-		TT_LINE("0,X,X|1|22")
-		TT_LINE("X,0,X|1|22")
-		TT_LINE("X,X,0|1|22")
-		TT_LINE("1,1,1|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7410_GATE, 3, 1, "")
-		TT_HEAD("A,B,C|Q ")
-		TT_LINE("0,X,X|1|22")
-		TT_LINE("X,0,X|1|22")
-		TT_LINE("X,X,0|1|22")
-		TT_LINE("1,1,1|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7411_AND, 3, 1, "+A,+B,+C,@VCC,@GND")
-		TT_HEAD("A,B,C|Q ")
-		TT_LINE("0,X,X|0|15")
-		TT_LINE("X,0,X|0|15")
-		TT_LINE("X,X,0|0|15")
-		TT_LINE("1,1,1|1|22")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7411_GATE, 3, 1, "")
-		TT_HEAD("A,B,C|Q ")
-		TT_LINE("0,X,X|0|15")
-		TT_LINE("X,0,X|0|15")
-		TT_LINE("X,X,0|0|15")
-		TT_LINE("1,1,1|1|22")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7416_GATE, 1, 1, "")
-		TT_HEAD(" A | Q ")
-		TT_LINE(" 0 | 1 |15")
-		TT_LINE(" 1 | 0 |23")
-		/* Open Collector */
-		TT_FAMILY("74XXOC")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7420_GATE, 4, 1, "")
-		TT_HEAD("A,B,C,D|Q ")
-		TT_LINE("0,X,X,X|1|22")
-		TT_LINE("X,0,X,X|1|22")
-		TT_LINE("X,X,0,X|1|22")
-		TT_LINE("X,X,X,0|1|22")
-		TT_LINE("1,1,1,1|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7420_NAND, 4, 1, "+A,+B,+C,+D,@VCC,@GND")
-		TT_HEAD("A,B,C,D|Q ")
-		TT_LINE("0,X,X,X|1|22")
-		TT_LINE("X,0,X,X|1|22")
-		TT_LINE("X,X,0,X|1|22")
-		TT_LINE("X,X,X,0|1|22")
-		TT_LINE("1,1,1,1|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7421_GATE, 4, 1, "")
-		TT_HEAD("A,B,C,D|Q ")
-		TT_LINE("0,X,X,X|0|22")
-		TT_LINE("X,0,X,X|0|22")
-		TT_LINE("X,X,0,X|0|22")
-		TT_LINE("X,X,X,0|0|22")
-		TT_LINE("1,1,1,1|1|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7421_AND, 4, 1, "+A,+B,+C,+D,@VCC,@GND")
-		TT_HEAD("A,B,C,D|Q ")
-		TT_LINE("0,X,X,X|0|22")
-		TT_LINE("X,0,X,X|0|22")
-		TT_LINE("X,X,0,X|0|22")
-		TT_LINE("X,X,X,0|0|22")
-		TT_LINE("1,1,1,1|1|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7425_GATE, 4, 1, "")
-		TT_HEAD("A,B,C,D|Q ")
-		TT_LINE("1,X,X,X|0|15")
-		TT_LINE("X,1,X,X|0|15")
-		TT_LINE("X,X,1,X|0|15")
-		TT_LINE("X,X,X,1|0|15")
-		TT_LINE("0,0,0,0|1|22")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7425_NOR, 4, 1, "+A,+B,+C,+D,@VCC,@GND")
-		TT_HEAD("A,B,C,D|Q ")
-		TT_LINE("1,X,X,X|0|15")
-		TT_LINE("X,1,X,X|0|15")
-		TT_LINE("X,X,1,X|0|15")
-		TT_LINE("X,X,X,1|0|15")
-		TT_LINE("0,0,0,0|1|22")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7427_GATE, 3, 1, "")
-		TT_HEAD("A,B,C|Q ")
-		TT_LINE("1,X,X|0|15")
-		TT_LINE("X,1,X|0|15")
-		TT_LINE("X,X,1|0|15")
-		TT_LINE("0,0,0|1|22")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7427_NOR, 3, 1, "+A,+B,+C,@VCC,@GND")
-		TT_HEAD("A,B,C|Q ")
-		TT_LINE("1,X,X|0|15")
-		TT_LINE("X,1,X|0|15")
-		TT_LINE("X,X,1|0|15")
-		TT_LINE("0,0,0|1|22")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7430_GATE, 8, 1, "")
-		TT_HEAD("A,B,C,D,E,F,G,H|Q ")
-		TT_LINE("0,X,X,X,X,X,X,X|1|22")
-		TT_LINE("X,0,X,X,X,X,X,X|1|22")
-		TT_LINE("X,X,0,X,X,X,X,X|1|22")
-		TT_LINE("X,X,X,0,X,X,X,X|1|22")
-		TT_LINE("X,X,X,X,0,X,X,X|1|22")
-		TT_LINE("X,X,X,X,X,0,X,X|1|22")
-		TT_LINE("X,X,X,X,X,X,0,X|1|22")
-		TT_LINE("X,X,X,X,X,X,X,0|1|22")
-		TT_LINE("1,1,1,1,1,1,1,1|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7430_NAND, 8, 1, "+A,+B,+C,+D,+E,+F,+G,+H,@VCC,@GND")
-		TT_HEAD("A,B,C,D,E,F,G,H|Q ")
-		TT_LINE("0,X,X,X,X,X,X,X|1|22")
-		TT_LINE("X,0,X,X,X,X,X,X|1|22")
-		TT_LINE("X,X,0,X,X,X,X,X|1|22")
-		TT_LINE("X,X,X,0,X,X,X,X|1|22")
-		TT_LINE("X,X,X,X,0,X,X,X|1|22")
-		TT_LINE("X,X,X,X,X,0,X,X|1|22")
-		TT_LINE("X,X,X,X,X,X,0,X|1|22")
-		TT_LINE("X,X,X,X,X,X,X,0|1|22")
-		TT_LINE("1,1,1,1,1,1,1,1|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7432_GATE, 2, 1, "")
-		TT_HEAD("A,B|Q ")
-		TT_LINE("1,X|1|22")
-		TT_LINE("X,1|1|22")
-		TT_LINE("0,0|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7432_OR, 2, 1, "+A,+B,@VCC,@GND")
-		TT_HEAD("A,B|Q ")
-		TT_LINE("1,X|1|22")
-		TT_LINE("X,1|1|22")
-		TT_LINE("0,0|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	/*  FIXME: Same as 7400, but drains higher output currents.
-	 *         Netlist currently does not model over currents (should it ever?)
-	 */
-
-	TRUTHTABLE_START(TTL_7437_GATE, 2, 1, "")
-		TT_HEAD("A,B|Q ")
-		TT_LINE("0,X|1|22")
-		TT_LINE("X,0|1|22")
-		TT_LINE("1,1|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-#if (NL_USE_TRUTHTABLE_7448)
-	TRUTHTABLE_START(TTL_7448, 7, 7, "+A,+B,+C,+D,+LTQ,+BIQ,+RBIQ,@VCC,@GND")
-		TT_HEAD(" LTQ,BIQ,RBIQ, A , B , C , D | a, b, c, d, e, f, g")
-
-		TT_LINE("  1,  1,  1,   0,  0,  0,  0 | 1, 1, 1, 1, 1, 1, 0|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  0,  0,  0 | 0, 1, 1, 0, 0, 0, 0|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  1,  0,  0 | 1, 1, 0, 1, 1, 0, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  1,  0,  0 | 1, 1, 1, 1, 0, 0, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  0,  1,  0 | 0, 1, 1, 0, 0, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  0,  1,  0 | 1, 0, 1, 1, 0, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  1,  1,  0 | 0, 0, 1, 1, 1, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  1,  1,  0 | 1, 1, 1, 0, 0, 0, 0|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  0,  0,  1 | 1, 1, 1, 1, 1, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  0,  0,  1 | 1, 1, 1, 0, 0, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  1,  0,  1 | 0, 0, 0, 1, 1, 0, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  1,  0,  1 | 0, 0, 1, 1, 0, 0, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  0,  1,  1 | 0, 1, 0, 0, 0, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  0,  1,  1 | 1, 0, 0, 1, 0, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  1,  1,  1 | 0, 0, 0, 1, 1, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  1,  1,  1 | 0, 0, 0, 0, 0, 0, 0|100,100,100,100,100,100,100")
-
-		// BI/RBO is input output. In the next case it is used as an input will go low.
-		TT_LINE("  1,  1,  0,   0,  0,  0,  0 | 0, 0, 0, 0, 0, 0, 0|100,100,100,100,100,100,100") // RBI
-
-		TT_LINE("  0,  1,  X,   X,  X,  X,  X | 1, 1, 1, 1, 1, 1, 1|100,100,100,100,100,100,100") // LT
-
-		// This condition has precedence
-		TT_LINE("  X,  0,  X,   X,  X,  X,  X | 0, 0, 0, 0, 0, 0, 0|100,100,100,100,100,100,100") // BI
-		TT_FAMILY("74XX")
-
-	TRUTHTABLE_END()
-
-	// FIXME: We need a more elegant solution than defining twice
-	TRUTHTABLE_START(TTL_7448_TT, 7, 7, "")
-		TT_HEAD(" LTQ,BIQ,RBIQ, A , B , C , D | a, b, c, d, e, f, g")
-
-		TT_LINE("  1,  1,  1,   0,  0,  0,  0 | 1, 1, 1, 1, 1, 1, 0|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  0,  0,  0 | 0, 1, 1, 0, 0, 0, 0|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  1,  0,  0 | 1, 1, 0, 1, 1, 0, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  1,  0,  0 | 1, 1, 1, 1, 0, 0, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  0,  1,  0 | 0, 1, 1, 0, 0, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  0,  1,  0 | 1, 0, 1, 1, 0, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  1,  1,  0 | 0, 0, 1, 1, 1, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  1,  1,  0 | 1, 1, 1, 0, 0, 0, 0|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  0,  0,  1 | 1, 1, 1, 1, 1, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  0,  0,  1 | 1, 1, 1, 0, 0, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  1,  0,  1 | 0, 0, 0, 1, 1, 0, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  1,  0,  1 | 0, 0, 1, 1, 0, 0, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  0,  1,  1 | 0, 1, 0, 0, 0, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  0,  1,  1 | 1, 0, 0, 1, 0, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   0,  1,  1,  1 | 0, 0, 0, 1, 1, 1, 1|100,100,100,100,100,100,100")
-		TT_LINE("  1,  1,  X,   1,  1,  1,  1 | 0, 0, 0, 0, 0, 0, 0|100,100,100,100,100,100,100")
-
-		// BI/RBO is input output. In the next case it is used as an input will go low.
-		TT_LINE("  1,  1,  0,   0,  0,  0,  0 | 0, 0, 0, 0, 0, 0, 0|100,100,100,100,100,100,100") // RBI
-
-		TT_LINE("  0,  1,  X,   X,  X,  X,  X | 1, 1, 1, 1, 1, 1, 1|100,100,100,100,100,100,100") // LT
-
-		// This condition has precedence
-		TT_LINE("  X,  0,  X,   X,  X,  X,  X | 0, 0, 0, 0, 0, 0, 0|100,100,100,100,100,100,100") // BI
-		TT_FAMILY("74XX")
-
-	TRUTHTABLE_END()
-
-#endif
-
-	TRUTHTABLE_START(TTL_7437_NAND, 2, 1, "+A,+B")
-		TT_HEAD("A,B|Q ")
-		TT_LINE("0,X|1|22")
-		TT_LINE("X,0|1|22")
-		TT_LINE("1,1|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7486_GATE, 2, 1, "")
-		TT_HEAD("A,B|Q ")
-		TT_LINE("0,0|0|15")
-		TT_LINE("0,1|1|22")
-		TT_LINE("1,0|1|22")
-		TT_LINE("1,1|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_7486_XOR, 2, 1, "+A,+B,@VCC,@GND")
-		TT_HEAD("A,B|Q ")
-		TT_LINE("0,0|0|15")
-		TT_LINE("0,1|1|22")
-		TT_LINE("1,0|1|22")
-		TT_LINE("1,1|0|15")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-#if (NL_USE_TRUTHTABLE_74107)
-	/*
-	 *          +-----+-----+-----+---++---+-----+
-	 *          | CLRQ| CLK |  J  | K || Q | QQ  |
-	 *          +=====+=====+=====+===++===+=====+
-	 *          |  0  |  X  |  X  | X || 0 |  1  |
-	 *          |  1  |  *  |  0  | 0 || Q0| Q0Q |
-	 *          |  1  |  *  |  1  | 0 || 1 |  0  |
-	 *          |  1  |  *  |  0  | 1 || 0 |  1  |
-	 *          |  1  |  *  |  1  | 1 || TOGGLE  |
-	 *          +-----+-----+-----+---++---+-----+
-	 */
-	TRUTHTABLE_START(TTL_74107, 6, 4, "+CLK,+J,+K,+CLRQ,@VCC,@GND")
-		TT_HEAD("CLRQ, CLK, _CO,  J, K,_QX | Q, QQ, CO, QX")
-		TT_LINE("  0,   0,    X,  X, X,  X | 0,  1,  0,  0 | 16, 25, 1, 1")
-		TT_LINE("  0,   1,    X,  X, X,  X | 0,  1,  1,  0 | 16, 25, 1, 1")
-
-		TT_LINE("  1,   0,    X,  0, 0,  0 | 0,  1,  0,  0 | 16, 25, 1, 1")
-		TT_LINE("  1,   1,    X,  0, 0,  0 | 0,  1,  1,  0 | 16, 25, 1, 1")
-		TT_LINE("  1,   0,    X,  0, 0,  1 | 1,  0,  0,  1 | 25, 16, 1, 1")
-		TT_LINE("  1,   1,    X,  0, 0,  1 | 1,  0,  1,  1 | 25, 16, 1, 1")
-
-		TT_LINE("  1,   0,    1,  1, 0,  X | 1,  0,  0,  1 | 25, 16, 1, 1")
-		TT_LINE("  1,   0,    0,  1, 0,  0 | 0,  1,  0,  0 | 16, 25, 1, 1")
-		TT_LINE("  1,   0,    0,  1, 0,  1 | 1,  0,  0,  1 | 25, 16, 1, 1")
-		TT_LINE("  1,   1,    X,  1, 0,  0 | 0,  1,  1,  0 | 16, 25, 1, 1")
-		TT_LINE("  1,   1,    X,  1, 0,  1 | 1,  0,  1,  1 | 25, 16, 1, 1")
-
-		TT_LINE("  1,   0,    1,  0, 1,  X | 0,  1,  0,  0 | 16, 25, 1, 1")
-		TT_LINE("  1,   0,    0,  0, 1,  0 | 0,  1,  0,  0 | 16, 25, 1, 1")
-		TT_LINE("  1,   0,    0,  0, 1,  1 | 1,  0,  0,  1 | 25, 16, 1, 1")
-		TT_LINE("  1,   1,    X,  0, 1,  0 | 0,  1,  1,  0 | 16, 25, 1, 1")
-		TT_LINE("  1,   1,    X,  0, 1,  1 | 1,  0,  1,  1 | 25, 16, 1, 1")
-
-		// Toggle
-		TT_LINE("  1,   0,    0,  1, 1,  0 | 0,  1,  0,  0 | 16, 25, 1, 1")
-		TT_LINE("  1,   0,    0,  1, 1,  1 | 1,  0,  0,  1 | 25, 16, 1, 1")
-		TT_LINE("  1,   1,    0,  1, 1,  0 | 0,  1,  1,  0 | 16, 25, 1, 1")
-		TT_LINE("  1,   1,    0,  1, 1,  1 | 1,  0,  1,  1 | 25, 16, 1, 1")
-		TT_LINE("  1,   1,    1,  1, 1,  0 | 0,  1,  1,  0 | 16, 25, 1, 1")
-		TT_LINE("  1,   1,    1,  1, 1,  1 | 1,  0,  1,  1 | 25, 16, 1, 1")
-
-		TT_LINE("  1,   0,    1,  1, 1,  1 | 0,  1,  0,  0 | 16, 25, 1, 1")
-		TT_LINE("  1,   0,    1,  1, 1,  0 | 1,  0,  0,  1 | 25, 16, 1, 1")
-	TRUTHTABLE_END()
-#endif
-
-	TRUTHTABLE_START(TTL_74155A_GATE, 4, 4, "")
-		TT_HEAD("B,A,G,C|0,1,2,3")
-		TT_LINE("X,X,1,X|1,1,1,1|13,13,13,13")
-		TT_LINE("X,X,0,0|1,1,1,1|13,13,13,13")
-		TT_LINE("0,0,0,1|0,1,1,1|13,13,13,13")
-		TT_LINE("0,1,0,1|1,0,1,1|13,13,13,13")
-		TT_LINE("1,0,0,1|1,1,0,1|13,13,13,13")
-		TT_LINE("1,1,0,1|1,1,1,0|13,13,13,13")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_74155B_GATE, 4, 4, "")
-		TT_HEAD("B,A,G,C|0,1,2,3")
-		TT_LINE("X,X,1,X|1,1,1,1|13,13,13,13")
-		TT_LINE("X,X,0,1|1,1,1,1|13,13,13,13")
-		TT_LINE("0,0,0,0|0,1,1,1|13,13,13,13")
-		TT_LINE("0,1,0,0|1,0,1,1|13,13,13,13")
-		TT_LINE("1,0,0,0|1,1,0,1|13,13,13,13")
-		TT_LINE("1,1,0,0|1,1,1,0|13,13,13,13")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_74156A_GATE, 4, 4, "")
-		TT_HEAD("B,A,G,C|0,1,2,3")
-		TT_LINE("X,X,1,X|1,1,1,1|13,13,13,13")
-		TT_LINE("X,X,0,0|1,1,1,1|13,13,13,13")
-		TT_LINE("0,0,0,1|0,1,1,1|13,13,13,13")
-		TT_LINE("0,1,0,1|1,0,1,1|13,13,13,13")
-		TT_LINE("1,0,0,1|1,1,0,1|13,13,13,13")
-		TT_LINE("1,1,0,1|1,1,1,0|13,13,13,13")
-		TT_FAMILY("74XXOC")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_74156B_GATE, 4, 4, "")
-		TT_HEAD("B,A,G,C|0,1,2,3")
-		TT_LINE("X,X,1,X|1,1,1,1|13,13,13,13")
-		TT_LINE("X,X,0,1|1,1,1,1|13,13,13,13")
-		TT_LINE("0,0,0,0|0,1,1,1|13,13,13,13")
-		TT_LINE("0,1,0,0|1,0,1,1|13,13,13,13")
-		TT_LINE("1,0,0,0|1,1,0,1|13,13,13,13")
-		TT_LINE("1,1,0,0|1,1,1,0|13,13,13,13")
-		TT_FAMILY("74XXOC")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_74260_GATE, 5, 1, "")
-		TT_HEAD("A,B,C,D,E|Q ")
-		TT_LINE("0,0,0,0,0|1|10")
-		TT_LINE("X,X,X,X,1|0|12")
-		TT_LINE("X,X,X,1,X|0|12")
-		TT_LINE("X,X,1,X,X|0|12")
-		TT_LINE("X,1,X,X,X|0|12")
-		TT_LINE("1,X,X,X,X|0|12")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_74260_NOR, 5, 1, "+A,+B,+C,+D,+E,@VCC,@GND")
-		TT_HEAD("A,B,C,D,E|Q")
-		TT_LINE("0,0,0,0,0|1|10")
-		TT_LINE("X,X,X,X,1|0|12")
-		TT_LINE("X,X,X,1,X|0|12")
-		TT_LINE("X,X,1,X,X|0|12")
-		TT_LINE("X,1,X,X,X|0|12")
-		TT_LINE("1,X,X,X,X|0|12")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	// FIXME: We need "private" devices
-	TRUTHTABLE_START(TTL_74279A, 3, 1, "")
-		TT_HEAD("S,R,_Q|Q")
-		TT_LINE("0,X,X|1|22")
-		TT_LINE("1,0,X|0|27")
-		TT_LINE("1,1,0|0|27")
-		TT_LINE("1,1,1|1|22")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(TTL_74279B, 4, 1, "")
-		TT_HEAD("S1,S2,R,_Q|Q")
-		TT_LINE("0,X,X,X|1|22")
-		TT_LINE("X,0,X,X|1|22")
-		TT_LINE("1,1,0,X|0|27")
-		TT_LINE("1,1,1,0|0|27")
-		TT_LINE("1,1,1,1|1|22")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	TRUTHTABLE_START(DM9312, 12, 2, "+A,+B,+C,+G,+D0,+D1,+D2,+D3,+D4,+D5,+D6,+D7,@VCC,@GND")
-		TT_HEAD(" C, B, A, G,D0,D1,D2,D3,D4,D5,D6,D7| Y,YQ")
-		TT_LINE(" X, X, X, 1, X, X, X, X, X, X, X, X| 0, 1|33,19")
-		TT_LINE(" 0, 0, 0, 0, 0, X, X, X, X, X, X, X| 0, 1|33,28")
-		TT_LINE(" 0, 0, 0, 0, 1, X, X, X, X, X, X, X| 1, 0|33,28")
-		TT_LINE(" 0, 0, 1, 0, X, 0, X, X, X, X, X, X| 0, 1|33,28")
-		TT_LINE(" 0, 0, 1, 0, X, 1, X, X, X, X, X, X| 1, 0|33,28")
-		TT_LINE(" 0, 1, 0, 0, X, X, 0, X, X, X, X, X| 0, 1|33,28")
-		TT_LINE(" 0, 1, 0, 0, X, X, 1, X, X, X, X, X| 1, 0|33,28")
-		TT_LINE(" 0, 1, 1, 0, X, X, X, 0, X, X, X, X| 0, 1|33,28")
-		TT_LINE(" 0, 1, 1, 0, X, X, X, 1, X, X, X, X| 1, 0|33,28")
-		TT_LINE(" 1, 0, 0, 0, X, X, X, X, 0, X, X, X| 0, 1|33,28")
-		TT_LINE(" 1, 0, 0, 0, X, X, X, X, 1, X, X, X| 1, 0|33,28")
-		TT_LINE(" 1, 0, 1, 0, X, X, X, X, X, 0, X, X| 0, 1|33,28")
-		TT_LINE(" 1, 0, 1, 0, X, X, X, X, X, 1, X, X| 1, 0|33,28")
-		TT_LINE(" 1, 1, 0, 0, X, X, X, X, X, X, 0, X| 0, 1|33,28")
-		TT_LINE(" 1, 1, 0, 0, X, X, X, X, X, X, 1, X| 1, 0|33,28")
-		TT_LINE(" 1, 1, 1, 0, X, X, X, X, X, X, X, 0| 0, 1|33,28")
-		TT_LINE(" 1, 1, 1, 0, X, X, X, X, X, X, X, 1| 1, 0|33,28")
-		TT_FAMILY("74XX")
-	TRUTHTABLE_END()
-
-	LOCAL_LIB_ENTRY(TTL_7400_DIP)
-	LOCAL_LIB_ENTRY(TTL_7402_DIP)
-	LOCAL_LIB_ENTRY(TTL_7404_DIP)
-	LOCAL_LIB_ENTRY(TTL_7406_DIP)
-	LOCAL_LIB_ENTRY(TTL_7408_DIP)
-	LOCAL_LIB_ENTRY(TTL_7410_DIP)
-	LOCAL_LIB_ENTRY(TTL_7411_DIP)
-	LOCAL_LIB_ENTRY(TTL_7414_GATE)
-	LOCAL_LIB_ENTRY(TTL_74LS14_GATE)
-	LOCAL_LIB_ENTRY(TTL_7414_DIP)
-	LOCAL_LIB_ENTRY(TTL_74LS14_DIP)
-	LOCAL_LIB_ENTRY(TTL_7416_DIP)
-	LOCAL_LIB_ENTRY(TTL_7420_DIP)
-	LOCAL_LIB_ENTRY(TTL_7421_DIP)
-	LOCAL_LIB_ENTRY(TTL_7425_DIP)
-	LOCAL_LIB_ENTRY(TTL_7427_DIP)
-	LOCAL_LIB_ENTRY(TTL_7430_DIP)
-	LOCAL_LIB_ENTRY(TTL_7432_DIP)
-	LOCAL_LIB_ENTRY(TTL_7437_DIP)
-#if (NL_USE_TRUTHTABLE_7448)
-	LOCAL_LIB_ENTRY(TTL_7448_DIP)
-#endif
-	LOCAL_LIB_ENTRY(TTL_7486_DIP)
-	LOCAL_LIB_ENTRY(TTL_74125_DIP)
-	LOCAL_LIB_ENTRY(TTL_74126_DIP)
-#if (NL_USE_TRUTHTABLE_74107)
-	LOCAL_LIB_ENTRY(TTL_74107_DIP)
-#endif
-	LOCAL_LIB_ENTRY(TTL_74155_DIP)
-	LOCAL_LIB_ENTRY(TTL_74156_DIP)
-	LOCAL_LIB_ENTRY(TTL_74260_DIP)
-	LOCAL_LIB_ENTRY(TTL_74279_DIP)
-	LOCAL_LIB_ENTRY(TTL_74377_DIP)
-	LOCAL_LIB_ENTRY(TTL_74378_DIP)
-	LOCAL_LIB_ENTRY(TTL_74379_DIP)
-	LOCAL_LIB_ENTRY(DM9312_DIP)
-NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx.h mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx.h
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,355 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Couriersud
-
-#ifndef NLM_TTL74XX_H_
-#define NLM_TTL74XX_H_
-
-///
-/// \file nlm_ttl74xx.h
-///
-
-#include "netlist/nl_setup.h"
-
-#ifndef __PLIB_PREPROCESSOR__
-
-/* ----------------------------------------------------------------------------
- *  Netlist Macros
- * ---------------------------------------------------------------------------*/
-
-#if !NL_AUTO_DEVICES
-
-#define TTL_7400_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7400_GATE, name)
-
-#define TTL_7400_NAND(name, cA, cB)                                            \
-		NET_REGISTER_DEV(TTL_7400_NAND, name)                                  \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cA)                                               \
-		NET_CONNECT(name, B, cB)
-
-#define TTL_7400_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7400_DIP, name)
-
-
-#define TTL_7402_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7402_GATE, name)
-
-#define TTL_7402_NOR(name, cI1, cI2)                                           \
-		NET_REGISTER_DEV(TTL_7402_NOR, name)                                   \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cI1)                                              \
-		NET_CONNECT(name, B, cI2)
-
-#define TTL_7402_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7402_DIP, name)
-
-#define TTL_7404_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7404_GATE, name)
-
-#define TTL_7404_INVERT(name, cA)                                              \
-		NET_REGISTER_DEV(TTL_7404_INVERT, name)                                \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cA)
-
-#define TTL_7404_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7404_DIP, name)
-
-
-#define TTL_7406_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7406_GATE, name)
-
-#define TTL_7406_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7406_DIP, name)
-
-
-#define TTL_7408_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7408_GATE, name)
-
-#define TTL_7408_AND(name, cA, cB)                                 \
-		NET_REGISTER_DEV(TTL_7408_AND, name)                                   \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cA)                                               \
-		NET_CONNECT(name, B, cB)
-
-#define TTL_7408_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7408_DIP, name)
-
-#define TTL_7410_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7410_GATE, name)
-
-#define TTL_7410_NAND(name, cI1, cI2, cI3)                                     \
-		NET_REGISTER_DEV(TTL_7410_NAND, name)                                  \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cI1)                                              \
-		NET_CONNECT(name, B, cI2)                                              \
-		NET_CONNECT(name, C, cI3)
-
-#define TTL_7410_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7410_DIP, name)
-
-
-#define TTL_7411_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7411_GATE, name)
-
-#define TTL_7411_AND(name, cI1, cI2, cI3)                                      \
-		NET_REGISTER_DEV(TTL_7411_AND, name)                                   \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cI1)                                              \
-		NET_CONNECT(name, B, cI2)                                              \
-		NET_CONNECT(name, C, cI3)
-
-#define TTL_7411_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7411_DIP, name)
-
-#define TTL_7414_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7414_GATE, name)
-
-#define TTL_7414_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7414_DIP, name)
-
-
-#define TTL_74LS14_GATE(name)                                                  \
-		NET_REGISTER_DEV(TTL_74LS14_GATE, name)
-
-#define TTL_74LS14_DIP(name)                                                   \
-		NET_REGISTER_DEV(TTL_74LS14_DIP, name)
-
-
-#define TTL_7416_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7416_GATE, name)
-
-#define TTL_7416_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7416_DIP, name)
-
-
-#define TTL_7420_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7420_GATE, name)
-
-#define TTL_7420_NAND(name, cI1, cI2, cI3, cI4)                                \
-		NET_REGISTER_DEV(TTL_7420_NAND, name)                                  \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cI1)                                              \
-		NET_CONNECT(name, B, cI2)                                              \
-		NET_CONNECT(name, C, cI3)                                              \
-		NET_CONNECT(name, D, cI4)
-
-#define TTL_7420_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7420_DIP, name)
-
-
-#define TTL_7421_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7421_GATE, name)
-
-#define TTL_7421_AND(name, cI1, cI2, cI3, cI4)                                 \
-		NET_REGISTER_DEV(TTL_7421_AND, name)                                   \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cI1)                                              \
-		NET_CONNECT(name, B, cI2)                                              \
-		NET_CONNECT(name, C, cI3)                                              \
-		NET_CONNECT(name, D, cI4)
-
-#define TTL_7421_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7421_DIP, name)
-
-
-#define TTL_7425_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7425_GATE, name)
-
-#define TTL_7425_NOR(name, cI1, cI2, cI3, cI4)                                 \
-		NET_REGISTER_DEV(TTL_7425_NOR, name)                                   \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cI1)                                              \
-		NET_CONNECT(name, B, cI2)                                              \
-		NET_CONNECT(name, C, cI3)                                              \
-		NET_CONNECT(name, D, cI4)
-
-#define TTL_7425_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7425_DIP, name)
-
-
-#define TTL_7427_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7427_GATE, name)
-
-#define TTL_7427_NOR(name, cI1, cI2, cI3)                                      \
-		NET_REGISTER_DEV(TTL_7427_NOR, name)                                   \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cI1)                                              \
-		NET_CONNECT(name, B, cI2)                                              \
-		NET_CONNECT(name, C, cI3)
-
-#define TTL_7427_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7427_DIP, name)
-
-
-#define TTL_7430_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7430_GATE, name)
-
-#define TTL_7430_NAND(name, cI1, cI2, cI3, cI4, cI5, cI6, cI7, cI8)\
-		NET_REGISTER_DEV(TTL_7430_NAND, name)                                  \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cI1)                                              \
-		NET_CONNECT(name, B, cI2)                                              \
-		NET_CONNECT(name, C, cI3)                                              \
-		NET_CONNECT(name, D, cI4)                                              \
-		NET_CONNECT(name, E, cI5)                                              \
-		NET_CONNECT(name, F, cI6)                                              \
-		NET_CONNECT(name, G, cI7)                                              \
-		NET_CONNECT(name, H, cI8)
-
-#define TTL_7430_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7430_DIP, name)
-
-
-#define TTL_7432_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7432_OR, name)
-
-#define TTL_7432_OR(name, cI1, cI2)                                            \
-		NET_REGISTER_DEV(TTL_7432_OR, name)                                    \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cI1)                                              \
-		NET_CONNECT(name, B, cI2)
-
-#define TTL_7432_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7432_DIP, name)
-
-#define TTL_7437_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7437_GATE, name)
-
-#define TTL_7437_NAND(name, cA, cB)                                            \
-		NET_REGISTER_DEV(TTL_7437_NAND, name)                                  \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cA)                                               \
-		NET_CONNECT(name, B, cB)
-
-#define TTL_7437_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7437_DIP, name)
-
-
-#if (NL_USE_TRUTHTABLE_7448)
-#define TTL_7448(name, cA0, cA1, cA2, cA3, cLTQ, cBIQ, cRBIQ)                  \
-		NET_REGISTER_DEV(TTL_7448, name)                                       \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cA0)                                              \
-		NET_CONNECT(name, B, cA1)                                              \
-		NET_CONNECT(name, C, cA2)                                              \
-		NET_CONNECT(name, D, cA3)                                              \
-		NET_CONNECT(name, LTQ, cLTQ)                                           \
-		NET_CONNECT(name, BIQ, cBIQ)                                           \
-		NET_CONNECT(name, RBIQ, cRBIQ)
-
-#define TTL_7448_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7448_DIP, name)
-
-#endif
-
-#define TTL_7486_GATE(name)                                                    \
-		NET_REGISTER_DEV(TTL_7486_GATE, name)
-
-#define TTL_7486_XOR(name, cA, cB)                                             \
-		NET_REGISTER_DEV(TTL_7486_XOR, name)                                   \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cA)                                               \
-		NET_CONNECT(name, B, cB)
-
-#define TTL_7486_DIP(name)                                                     \
-		NET_REGISTER_DEV(TTL_7486_DIP, name)
-
-#if (NL_USE_TRUTHTABLE_74107)
-#define TTL_74107(name, cCLK, cJ, cK, cCLRQ)                                   \
-		NET_REGISTER_DEV(TTL_74107, name)                                      \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, CLK, cCLK)                                           \
-		NET_CONNECT(name, J, cJ)                                               \
-		NET_CONNECT(name, K, cK)                                               \
-		NET_CONNECT(name, CLRQ, cCLRQ)
-
-#define TTL_74107_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74107_DIP, name)
-
-#endif
-
-#define TTL_74125_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74125_DIP, name)
-
-#define TTL_74155_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74155_DIP, name)
-
-#define TTL_74156_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74156_DIP, name)
-
-#define TTL_74260_GATE(name)                                                   \
-		NET_REGISTER_DEV(TTL_74260_GATE, name)
-
-#define TTL_74260_NOR(name, cA, cB, cC, cD, cE)                                \
-		NET_REGISTER_DEV(TTL_74260_NOR, name)                                  \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A, cA)                                               \
-		NET_CONNECT(name, B, cB)                                               \
-		NET_CONNECT(name, C, cC)                                               \
-		NET_CONNECT(name, D, cD)                                               \
-		NET_CONNECT(name, E, cE)
-
-#define TTL_74260_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74260_DIP, name)
-
-#define TTL_74279_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74279_DIP, name)
-
-#define TTL_74377_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74377_DIP, name)
-
-#define TTL_74378_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74378_DIP, name)
-
-#define TTL_74379_DIP(name)                                                    \
-		NET_REGISTER_DEV(TTL_74379_DIP, name)
-
-#define DM9312(name, cA, cB, cC, cSTROBE, cD0, cD1, cD2, cD3, cD4, cD5, cD6, cD7)     \
-		NET_REGISTER_DEV(DM9312, name)                                         \
-		NET_CONNECT(name, VCC, VCC)                                            \
-		NET_CONNECT(name, GND, GND)                                            \
-		NET_CONNECT(name, A,  cA)                                              \
-		NET_CONNECT(name, B,  cB)                                              \
-		NET_CONNECT(name, C,  cC)                                              \
-		NET_CONNECT(name, G,  cSTROBE)                                         \
-		NET_CONNECT(name, D0, cD0)                                             \
-		NET_CONNECT(name, D1, cD1)                                             \
-		NET_CONNECT(name, D2, cD2)                                             \
-		NET_CONNECT(name, D3, cD3)                                             \
-		NET_CONNECT(name, D4, cD4)                                             \
-		NET_CONNECT(name, D5, cD5)                                             \
-		NET_CONNECT(name, D6, cD6)                                             \
-		NET_CONNECT(name, D7, cD7)
-
-#define DM9312_DIP(name)                                                       \
-		NET_REGISTER_DEV(DM9312_DIP, name)
-
-#endif // NL_AUTO_DEVICES
-
-/* ----------------------------------------------------------------------------
- *  External declarations
- * ---------------------------------------------------------------------------*/
-
-NETLIST_EXTERNAL(TTL74XX_lib)
-
-#endif // __PLIB_PREPROCESSOR__
-
-
-#endif // NLM_TTL74XX
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx_lib.cpp mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx_lib.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx_lib.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx_lib.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,3419 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#include "netlist/devices/net_lib.h"
+
+//- Identifier: TTL_7400_DIP
+//- Title: 5400/DM5400/DM7400 Quad 2-Input NAND Gates
+//- Description: This device contains four independent gates each of which performs the logic NAND function.
+//- Pinalias: A1,B1,Y1,A2,B2,Y2,GND,Y3,A3,B3,Y4,A4,B4,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006613.PDF
+//-
+//-         +---+---++---+
+//-         | A | B || Y |
+//-         +===+===++===+
+//-         | 0 | 0 || 1 |
+//-         | 0 | 1 || 1 |
+//-         | 1 | 0 || 1 |
+//-         | 1 | 1 || 0 |
+//-         +---+---++---+
+//-
+static NETLIST_START(TTL_7400_DIP)
+	TTL_7400_NAND(A)
+	TTL_7400_NAND(B)
+	TTL_7400_NAND(C)
+	TTL_7400_NAND(D)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.B, /*    B1 |2           13| B4   */ D.B,
+		  A.Q, /*    Y1 |3           12| A4   */ D.A,
+		  B.A, /*    A2 |4    7400   11| Y4   */ D.Q,
+		  B.B, /*    B2 |5           10| B3   */ C.B,
+		  B.Q, /*    Y2 |6            9| A3   */ C.A,
+		A.GND, /*   GND |7            8| Y3   */ C.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7402_DIP
+//- Title: 5402/DM5402/DM7402 Quad 2-Input NOR Gates
+//- Description: This device contains four independent gates each of which performs the logic NOR function.
+//- Pinalias: Y1,A1,B1,Y2,A2,B2,GND,A3,B3,Y3,A4,B4,Y4,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006492.PDF
+//-
+//-         +---+---++---+
+//-         | A | B || Y |
+//-         +===+===++===+
+//-         | 0 | 0 || 1 |
+//-         | 0 | 1 || 0 |
+//-         | 1 | 0 || 0 |
+//-         | 1 | 1 || 0 |
+//-         +---+---++---+
+//-
+static NETLIST_START(TTL_7402_DIP)
+	TTL_7402_NOR(A)
+	TTL_7402_NOR(B)
+	TTL_7402_NOR(C)
+	TTL_7402_NOR(D)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.Q, /*    Y1 |1     ++    14| VCC  */ A.VCC,
+		  A.A, /*    A1 |2           13| Y4   */ D.Q,
+		  A.B, /*    B1 |3           12| B4   */ D.B,
+		  B.Q, /*    Y2 |4    7402   11| A4   */ D.A,
+		  B.A, /*    A2 |5           10| Y3   */ C.Q,
+		  B.B, /*    B2 |6            9| B3   */ C.B,
+		A.GND, /*   GND |7            8| A3   */ C.A
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7404_DIP
+//- Title: 5404/DM5404/DM7404 Hex Inverting Gates
+//- Description: This device contains six independent gates each of which performs the logic INVERT function.
+//- Pinalias: A1,Y1,A2,Y2,A3,Y3,GND,Y4,A4,Y5,A5,Y6,A6,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006494.PDF
+//-
+//-         +---++---+
+//-         | A || Y |
+//-         +===++===+
+//-         | 0 || 1 |
+//-         | 1 || 0 |
+//-         +---++---+
+//-
+static NETLIST_START(TTL_7404_DIP)
+	TTL_7404_INVERT(A)
+	TTL_7404_INVERT(B)
+	TTL_7404_INVERT(C)
+	TTL_7404_INVERT(D)
+	TTL_7404_INVERT(E)
+	TTL_7404_INVERT(F)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.Q, /*    Y1 |2           13| A6   */ F.A,
+		  B.A, /*    A2 |3           12| Y6   */ F.Q,
+		  B.Q, /*    Y2 |4    7404   11| A5   */ E.A,
+		  C.A, /*    A3 |5           10| Y5   */ E.Q,
+		  C.Q, /*    Y3 |6            9| A4   */ D.A,
+		A.GND, /*   GND |7            8| Y4   */ D.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7406_DIP
+//- Title: DM5406/DM7406 Hex Inverting Buffers with High Voltage Open-Collector Outputs
+//- Description: This device contains six independent buffers each of which performs the logic INVERT function.
+//-   The open-collector outputs require external pull-up resistors for proper logical operation.
+//- Pinalias: A1,Y1,A2,Y2,A3,Y3,GND,Y4,A4,Y5,A5,Y6,A6,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- Limitations: Open collector behavior currently not simulated.
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006496.PDF
+//-
+//-         +---++---+
+//-         | A || Y |
+//-         +===++===+
+//-         | 0 || 1 |
+//-         | 1 || 0 |
+//-         +---++---+
+//-
+static NETLIST_START(TTL_7406_DIP)
+	TTL_7406_GATE(A)
+	TTL_7406_GATE(B)
+	TTL_7406_GATE(C)
+	TTL_7406_GATE(D)
+	TTL_7406_GATE(E)
+	TTL_7406_GATE(F)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.Y, /*    Y1 |2           13| A6   */ F.A,
+		  B.A, /*    A2 |3           12| Y6   */ F.Y,
+		  B.Y, /*    Y2 |4    7406   11| A5   */ E.A,
+		  C.A, /*    A3 |5           10| Y5   */ E.Y,
+		  C.Y, /*    Y3 |6            9| A4   */ D.A,
+		A.GND, /*   GND |7            8| Y4   */ D.Y
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7407_DIP
+//- Title: DM5407/DM7407 Hex Buffers with High Voltage Open-Collector Outputs
+//- Description: This device contains six independent gates each of which performs a buffer function.
+//-   The open-collector outputs re-quire external pull-up resistors for proper logical operation.
+//- Pinalias: A1,Y1,A2,Y2,A3,Y3,GND,Y4,A4,Y5,A5,Y6,A6,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- Limitations: Open collector behavior currently not simulated.
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006497.PDF
+//-
+//-         +---++---+
+//-         | A || Y |
+//-         +===++===+
+//-         | 0 || 0 |
+//-         | 1 || 1 |
+//-         +---++---+
+//-
+static NETLIST_START(TTL_7407_DIP)
+	TTL_7407_GATE(A)
+	TTL_7407_GATE(B)
+	TTL_7407_GATE(C)
+	TTL_7407_GATE(D)
+	TTL_7407_GATE(E)
+	TTL_7407_GATE(F)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
+
+	DIPPINS(  /*       +--------------+      */
+		A.A,  /*    A1 |1     ++    14| VCC  */ A.VCC,
+		A.Y,  /*    Y1 |2           13| A6   */ F.A,
+		B.A,  /*    A2 |3           12| Y6   */ F.Y,
+		B.Y,  /*    Y2 |4    7407   11| A5   */ E.A,
+		C.A,  /*    A3 |5           10| Y5   */ E.Y,
+		C.Y,  /*    Y3 |6            9| A4   */ D.A,
+		A.GND,/*   GND |7            8| Y4   */ D.Y
+			  /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7408_DIP
+//- Title: 5408/DM5408/DM7408 Quad 2-Input AND Gates
+//- Description: This device contains four independent gates each of which performs the logic AND function.
+//- Pinalias: A1,B1,Y1,A2,B2,Y2,GND,Y3,A3,B3,Y4,A4,B4,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006498.PDF
+//-
+//-         +---+---++---+
+//-         | A | B || Y |
+//-         +===+===++===+
+//-         | 0 | 0 || 0 |
+//-         | 0 | 1 || 0 |
+//-         | 1 | 0 || 0 |
+//-         | 1 | 1 || 1 |
+//-         +---+---++---+
+//-
+static NETLIST_START(TTL_7408_DIP)
+	TTL_7408_AND(A)
+	TTL_7408_AND(B)
+	TTL_7408_AND(C)
+	TTL_7408_AND(D)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.B, /*    B1 |2           13| B4   */ D.B,
+		  A.Q, /*    Y1 |3           12| A4   */ D.A,
+		  B.A, /*    A2 |4    7408   11| Y4   */ D.Q,
+		  B.B, /*    B2 |5           10| B3   */ C.B,
+		  B.Q, /*    Y2 |6            9| A3   */ C.A,
+		A.GND, /*   GND |7            8| Y3   */ C.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7410_DIP
+//- Title: 5410/DM5410/DM7410 Triple 3-Input NAND Gates
+//- Description: This device contains three independent gates each of which performs the logic NAND function.
+//- Pinalias: A1,B1,A2,B2,C2,Y2,GND,Y3,A3,B3,C3,Y1,C1,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006500.PDF
+//-
+//-         +---+---+---++---+
+//-         | A | B | C || Y |
+//-         +===+===+===++===+
+//-         | X | X | 0 || 1 |
+//-         | X | 0 | X || 1 |
+//-         | 0 | X | X || 1 |
+//-         | 1 | 1 | 1 || 0 |
+//-         +---+---+---++---+
+//-
+static NETLIST_START(TTL_7410_DIP)
+	TTL_7410_NAND(A)
+	TTL_7410_NAND(B)
+	TTL_7410_NAND(C)
+
+	NET_C(A.VCC, B.VCC, C.VCC)
+	NET_C(A.GND, B.GND, C.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.B, /*    B1 |2           13| C1   */ A.C,
+		  B.A, /*    A2 |3           12| Y1   */ A.Q,
+		  B.B, /*    B2 |4    7410   11| C3   */ C.C,
+		  B.C, /*    C2 |5           10| B3   */ C.B,
+		  B.Q, /*    Y2 |6            9| A3   */ C.A,
+		A.GND, /*   GND |7            8| Y3   */ C.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7411_DIP
+//- Title: DM7411 Triple 3-Input AND Gate
+//- Description: This device contains three independent gates with three data inputs each which perform the logic AND function.
+//- Pinalias: A1,B1,A2,B2,C2,Y2,GND,Y3,A3,B3,C3,Y1,C1,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS009774.PDF
+//-
+//-         +---+---+---++---+
+//-         | A | B | C || Y |
+//-         +===+===+===++===+
+//-         | X | X | 0 || 0 |
+//-         | X | 0 | X || 0 |
+//-         | 0 | X | X || 0 |
+//-         | 1 | 1 | 1 || 1 |
+//-         +---+---+---++---+
+//-
+static NETLIST_START(TTL_7411_DIP)
+	TTL_7411_AND(A)
+	TTL_7411_AND(B)
+	TTL_7411_AND(C)
+
+	NET_C(A.VCC, B.VCC, C.VCC)
+	NET_C(A.GND, B.GND, C.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.B, /*    B1 |2           13| C1   */ A.C,
+		  B.A, /*    A2 |3           12| Y1   */ A.Q,
+		  B.B, /*    B2 |4    7411   11| C3   */ C.C,
+		  B.C, /*    C2 |5           10| B3   */ C.B,
+		  B.Q, /*    Y2 |6            9| A3   */ C.A,
+		A.GND, /*   GND |7            8| Y3   */ C.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7414_DIP
+//- Title: DM5414/DM7414 Hex Inverter withSchmitt Trigger Inputs
+//- Description: This device contains six independent gates each of whichperforms the logic INVERT function.
+//-   Each input has hysteresis which increases the noise immunity and transforms a slowly changing input
+//-   signal to a fast changing, jitter free output.
+//- Pinalias: A1,Y1,A2,Y2,A3,Y3,GND,Y4,A4,Y5,A5,Y6,A6,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006503.PDF
+//-
+//-         +---++---+
+//-         | A || Y |
+//-         +===++===+
+//-         | 0 || 1 |
+//-         | 1 || 0 |
+//-         +---++---+
+//-
+static NETLIST_START(TTL_7414_GATE)
+	SCHMITT_TRIGGER(X, "DM7414")
+	ALIAS(A, X.A)
+	ALIAS(Q, X.Q)
+	ALIAS(GND, X.GND)
+	ALIAS(VCC, X.VCC)
+NETLIST_END()
+
+static NETLIST_START(TTL_74LS14_GATE)
+	SCHMITT_TRIGGER(X, "DM74LS14")
+	ALIAS(A, X.A)
+	ALIAS(Q, X.Q)
+	ALIAS(GND, X.GND)
+	ALIAS(VCC, X.VCC)
+NETLIST_END()
+
+static NETLIST_START(TTL_7414_DIP)
+	SCHMITT_TRIGGER(A, "DM7414")
+	SCHMITT_TRIGGER(B, "DM7414")
+	SCHMITT_TRIGGER(C, "DM7414")
+	SCHMITT_TRIGGER(D, "DM7414")
+	SCHMITT_TRIGGER(E, "DM7414")
+	SCHMITT_TRIGGER(F, "DM7414")
+
+	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.Q, /*    Y1 |2           13| A6   */ F.A,
+		  B.A, /*    A2 |3           12| Y6   */ F.Q,
+		  B.Q, /*    Y2 |4    7414   11| A5   */ E.A,
+		  C.A, /*    A3 |5           10| Y5   */ E.Q,
+		  C.Q, /*    Y3 |6            9| A4   */ D.A,
+		A.GND, /*   GND |7            8| Y4   */ D.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+static NETLIST_START(TTL_74LS14_DIP)
+	SCHMITT_TRIGGER(A, "DM74LS14")
+	SCHMITT_TRIGGER(B, "DM74LS14")
+	SCHMITT_TRIGGER(C, "DM74LS14")
+	SCHMITT_TRIGGER(D, "DM74LS14")
+	SCHMITT_TRIGGER(E, "DM74LS14")
+	SCHMITT_TRIGGER(F, "DM74LS14")
+
+	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.Q, /*    Y1 |2           13| A6   */ F.A,
+		  B.A, /*    A2 |3           12| Y6   */ F.Q,
+		  B.Q, /*    Y2 |4   74LS14  11| A5   */ E.A,
+		  C.A, /*    A3 |5           10| Y5   */ E.Q,
+		  C.Q, /*    Y3 |6            9| A4   */ D.A,
+		A.GND, /*   GND |7            8| Y4   */ D.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7416_DIP
+//- Title: DM5416/DM7416 Hex Inverting Buffers with High Voltage Open-Collector Outputs
+//- Description: This device contains six independent gates each of which performs the logic INVERT function.
+//-   The open-collector outputs require external pull-up resistors for proper logical operation.
+//- Pinalias: A1,Y1,A2,Y2,A3,Y3,GND,Y4,A4,Y5,A5,Y6,A6,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006504.PDF
+//-
+//-         +---++---+
+//-         | A || Y |
+//-         +===++===+
+//-         | 0 || 1 |
+//-         | 1 || 0 |
+//-         +---++---+
+//-
+static NETLIST_START(TTL_7416_DIP)
+	TTL_7416_GATE(A)
+	TTL_7416_GATE(B)
+	TTL_7416_GATE(C)
+	TTL_7416_GATE(D)
+	TTL_7416_GATE(E)
+	TTL_7416_GATE(F)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.Q, /*    Y1 |2           13| A6   */ F.A,
+		  B.A, /*    A2 |3           12| Y6   */ F.Q,
+		  B.Q, /*    Y2 |4    7416   11| A5   */ E.A,
+		  C.A, /*    A3 |5           10| Y5   */ E.Q,
+		  C.Q, /*    Y3 |6            9| A4   */ D.A,
+		A.GND, /*   GND |7            8| Y4   */ D.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7420_DIP
+//- Title: 5420/DM5420/DM7420 Dual 4-Input NAND Gates
+//- Description: This device contains two independent gates each of which performs the logic NAND function.
+//- Pinalias: A1,B1,NC,C1,D1,Y1,GND,Y2,A2,B2,NC,C2,D2,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006506.PDF
+//-
+//-         +---+---+---+---++---+
+//-         | A | B | C | D || Y |
+//-         +===+===+===+===++===+
+//-         | X | X | X | 0 || 1 |
+//-         | X | X | 0 | X || 1 |
+//-         | X | 0 | X | X || 1 |
+//-         | 0 | X | X | X || 1 |
+//-         | 1 | 1 | 1 | 1 || 0 |
+//-         +---+---+---+---++---+
+//-
+static NETLIST_START(TTL_7420_DIP)
+	TTL_7420_NAND(A)
+	TTL_7420_NAND(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+	NC_PIN(NC)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.B, /*    B1 |2           13| D2   */ B.D,
+		 NC.I, /*    NC |3           12| C2   */ B.C,
+		  A.C, /*    C1 |4    7420   11| NC   */ NC.I,
+		  A.D, /*    D1 |5           10| B2   */ B.B,
+		  A.Q, /*    Y1 |6            9| A2   */ B.A,
+		A.GND, /*   GND |7            8| Y2   */ B.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7421_DIP
+//- Title: 54LS21/DM54LS21/DM74LS21 Dual 4-Input AND Gates
+//- Description: This device contains two independent 4-input gates each of which performs the logic AND function.
+//- Pinalias: A1,B1,NC,C1,D1,Y1,GND,Y2,A2,B2,NC,C2,D2,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006356.PDF
+//-
+//-         +---+---+---+---++---+
+//-         | A | B | C | D || Y |
+//-         +===+===+===+===++===+
+//-         | X | X | X | 0 || 1 |
+//-         | X | X | 0 | X || 1 |
+//-         | X | 0 | X | X || 1 |
+//-         | 0 | X | X | X || 1 |
+//-         | 1 | 1 | 1 | 1 || 0 |
+//-         +---+---+---+---++---+
+//-
+static NETLIST_START(TTL_7421_DIP)
+	TTL_7421_AND(A)
+	TTL_7421_AND(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+	NC_PIN(NC)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.B, /*    B1 |2           13| D2   */ B.D,
+		 NC.I, /*    NC |3           12| C2   */ B.C,
+		  A.C, /*    C1 |4    7421   11| NC   */ NC.I,
+		  A.D, /*    D1 |5           10| B2   */ B.B,
+		  A.Q, /*    Y1 |6            9| A2   */ B.A,
+		A.GND, /*   GND |7            8| Y2   */ B.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7425_DIP
+//- Title: 5425/DM7425 Dual 4-Input NOR Gate (with Strobe)
+//- Description: This device contains 2, 4-input gates that perform the logical NOR function.
+//-   The output of each NOR gate is gated (strobed) by pin 3 and 11 by positive true logic, i.e., logic "1" equals output on.
+//- Pinalias: A1,B1,X1,C1,D1,Y1,GND,Y2,A2,B2,X2,C2,D2
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- Limitations: The "X" input and high impedance output are currently not simulated.
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet_pdf/national-semiconductor/5425DMQB_to_DM7425N.pdf
+//-
+//-         +---+---+---+---+---++---+
+//-         | A | B | C | D | X || Y |
+//-         +===+===+===+===+===++===+
+//-         | X | X | X | X | 0 || Z |
+//-         | 0 | 0 | 0 | 0 | 1 || 1 |
+//-         | X | X | X | 1 | 1 || 0 |
+//-         | X | X | 1 | X | 1 || 0 |
+//-         | X | 1 | X | X | 1 || 0 |
+//-         | 1 | X | X | X | 1 || 0 |
+//-         +---+---+---+---+---++---+
+//-
+static NETLIST_START(TTL_7425_DIP)
+	TTL_7425_NOR(A)
+	TTL_7425_NOR(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+	NC_PIN(XA) // FIXME: Functionality needs to be implemented
+	NC_PIN(XB) // FIXME: Functionality needs to be implemented
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.B, /*    B1 |2           13| D2   */ B.D,
+		 XA.I, /*    X1 |3           12| C2   */ B.C,
+		  A.C, /*    C1 |4    7425   11| X2   */ XB.I,
+		  A.D, /*    D1 |5           10| B2   */ B.B,
+		  A.Q, /*    Y1 |6            9| A2   */ B.A,
+		A.GND, /*   GND |7            8| Y2   */ B.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7427_DIP
+//- Title: DM7427 Triple 3-Input NOR Gates
+//- Description: This device contains three independent gates each of which performs the logic NOR function.
+//- Pinalias: A1,B1,A2,B2,C2,Y2,GND,Y3,A3,B3,C3,Y1,C1,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006509.PDF
+//-
+//-         +---+---+---++---+
+//-         | A | B | C || Y |
+//-         +===+===+===++===+
+//-         | X | X | 1 || 0 |
+//-         | X | 1 | X || 0 |
+//-         | 1 | X | X || 0 |
+//-         | 0 | 0 | 0 || 1 |
+//-         +---+---+---++---+
+//-
+static NETLIST_START(TTL_7427_DIP)
+	TTL_7427_NOR(A)
+	TTL_7427_NOR(B)
+	TTL_7427_NOR(C)
+
+	NET_C(A.VCC, B.VCC, C.VCC)
+	NET_C(A.GND, B.GND, C.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.B, /*    B1 |2           13| C1   */ A.C,
+		  B.A, /*    A2 |3           12| Y1   */ A.Q,
+		  B.B, /*    B2 |4    7427   11| C3   */ C.C,
+		  B.C, /*    C2 |5           10| B3   */ C.B,
+		  B.Q, /*    Y2 |6            9| A3   */ C.A,
+		A.GND, /*   GND |7            8| Y3   */ C.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7430_DIP
+//- Title: 5430/DM5430/DM7430 8-Input NAND Gate
+//- Description: This device contains a single gate which performs the logic NAND function.
+//- Pinalias: A,B,C,D,E,F,GND,Y,NC,NC,G,H,NC,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006510.PDF
+//-
+//-         +---+---+---+---+---+---+---+---++---+
+//-         | A | B | C | D | E | F | G | H || Y |
+//-         +===+===+===+===+===+===+===+===++===+
+//-         | X | X | X | X | X | X | X | 0 || 1 |
+//-         | X | X | X | X | X | X | 0 | X || 1 |
+//-         | X | X | X | X | X | 0 | X | X || 1 |
+//-         | X | X | X | X | 0 | X | X | X || 1 |
+//-         | X | X | X | 0 | X | X | X | X || 1 |
+//-         | X | X | 0 | X | X | X | X | X || 1 |
+//-         | X | 0 | X | X | X | X | X | X || 1 |
+//-         | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 || 0 |
+//-         +---+---+---+---+---+---+---+---++---+
+//-
+static NETLIST_START(TTL_7430_DIP)
+	TTL_7430_NAND(A)
+	NC_PIN(NC)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*     A |1     ++    14| VCC  */ A.VCC,
+		  A.B, /*     B |2           13| NC   */ NC.I,
+		  A.C, /*     C |3           12| H    */ A.H,
+		  A.D, /*     D |4    7430   11| G    */ A.G,
+		  A.E, /*     E |5           10| NC   */ NC.I,
+		  A.F, /*     F |6            9| NC   */ NC.I,
+		A.GND, /*   GND |7            8| Y    */ A.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7432_DIP
+//- Title: 5432/DM5432/DM7432 Quad 2-Input OR Gates
+//- Description: This device contains four independent gates each of whichperforms the logic OR function.
+//- Pinalias: A1,B1,Y1,A2,B2,Y2,GND,Y3,A3,B3,Y4,A4,B4,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006511.PDF
+//-
+//-         +---+---++---+
+//-         | A | B || Y |
+//-         +===+===++===+
+//-         | 0 | 0 || 0 |
+//-         | 0 | 1 || 1 |
+//-         | 1 | 0 || 1 |
+//-         | 1 | 1 || 1 |
+//-         +---+---++---+
+//-
+static NETLIST_START(TTL_7432_DIP)
+	TTL_7432_OR(A)
+	TTL_7432_OR(B)
+	TTL_7432_OR(C)
+	TTL_7432_OR(D)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.B, /*    B1 |2           13| B4   */ D.B,
+		  A.Q, /*    Y1 |3           12| A4   */ D.A,
+		  B.A, /*    A2 |4    7432   11| Y4   */ D.Q,
+		  B.B, /*    B2 |5           10| B3   */ C.B,
+		  B.Q, /*    Y2 |6            9| A3   */ C.A,
+		A.GND, /*   GND |7            8| Y3   */ C.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7437_DIP
+//- Title: 5437/DM5437/DM7437 Quad 2-Input NAND Buffers
+//- Description: This device contains four independent gates each of whichperforms the logic OR function.
+//- Pinalias: A1,B1,Y1,A2,B2,Y2,GND,Y3,A3,B3,Y4,A4,B4,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- Limitations: Same as 7400, but drains higher output currents. Netlist currently does not model over currents (should it ever?)
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheets/105/236976_DS.pdf
+//-
+//-         +---+---++---+
+//-         | A | B || Y |
+//-         +===+===++===+
+//-         | 0 | 0 || 1 |
+//-         | 0 | 1 || 1 |
+//-         | 1 | 0 || 1 |
+//-         | 1 | 1 || 0 |
+//-         +---+---++---+
+//-
+static NETLIST_START(TTL_7437_DIP)
+	TTL_7437_NAND(A)
+	TTL_7437_NAND(B)
+	TTL_7437_NAND(C)
+	TTL_7437_NAND(D)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.B, /*    B1 |2           13| B4   */ D.B,
+		  A.Q, /*    Y1 |3           12| A4   */ D.A,
+		  B.A, /*    A2 |4    7437   11| Y4   */ D.Q,
+		  B.B, /*    B2 |5           10| B3   */ C.B,
+		  B.Q, /*    Y2 |6            9| A3   */ C.A,
+		A.GND, /*   GND |7            8| Y3   */ C.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7442_DIP
+//- Title: 5442A/DM5442A/DM7442A BCD to Decimal Decoders
+//- Description: These BCD-to-decimal decoders consist of eight inverters
+//-   and ten, four-input NAND gates. The inverters are
+//-   connected in pairs to make BCD input data available for
+//-   decoding by the NAND gates. Full decoding of input
+//-   logic ensures that all outputs remain off for all invalid
+//-   (10-15) input conditions.
+//- Pinalias: 0,1,2,3,4,5,6,GND,7,8,9,D,C,B,A,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006516.PDF
+//-
+//-         +---+---+---+---++---+---+---+---+---+---+---+---+---+---+
+//-         | D | C | B | A || 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 |
+//-         +===+===+===+===++===+===+===+===+===+===+===+===+===+===+
+//-         | 0 | 0 | 0 | 0 || 0 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
+//-         | 0 | 0 | 0 | 1 || 1 | 0 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
+//-         | 0 | 0 | 1 | 0 || 1 | 1 | 0 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
+//-         | 0 | 0 | 1 | 1 || 1 | 1 | 1 | 0 | 1 | 1 | 1 | 1 | 1 | 1 |
+//-         | 0 | 1 | 0 | 0 || 1 | 1 | 1 | 1 | 0 | 1 | 1 | 1 | 1 | 1 |
+//-         | 0 | 1 | 0 | 1 || 1 | 1 | 1 | 1 | 1 | 0 | 1 | 1 | 1 | 1 |
+//-         | 0 | 1 | 1 | 0 || 1 | 1 | 1 | 1 | 1 | 1 | 0 | 1 | 1 | 1 |
+//-         | 0 | 1 | 1 | 1 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 0 | 1 | 1 |
+//-         | 1 | 0 | 0 | 0 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 0 | 1 |
+//-         | 1 | 0 | 0 | 1 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 0 |
+//-         | 1 | 0 | 1 | 0 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
+//-         | 1 | 0 | 1 | 1 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
+//-         | 1 | 1 | 0 | 0 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
+//-         | 1 | 1 | 0 | 1 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
+//-         | 1 | 1 | 1 | 0 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
+//-         | 1 | 1 | 1 | 1 || 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
+//-         +---+---+---+---++---+---+---+---+---+---+---+---+---+---+
+//-
+static NETLIST_START(TTL_7442_DIP)
+	NET_REGISTER_DEV(TTL_7442, A)
+
+	DIPPINS(    /*      +--------------+     */
+		  A.Q0, /*    0 |1     ++    16| VCC */ A.VCC,
+		  A.Q1, /*    1 |2           15| A   */ A.A,
+		  A.Q2, /*    2 |3           14| B   */ A.B,
+		  A.Q3, /*    3 |4           13| C   */ A.C,
+		  A.Q4, /*    4 |5    7442   12| D   */ A.D,
+		  A.Q5, /*    5 |6           11| 9   */ A.Q9,
+		  A.Q6, /*    6 |7           10| 8   */ A.Q8,
+		 A.GND, /*  GND |8            9| 7   */ A.Q7
+				/*      +--------------+     */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7448_DIP
+//- Title: DM5448/DM48LS48/DM7448/DM74LS48 BCD to 7-Segment Decoder
+//- Description: The 48 and LS48 feature active-high outputs for
+//-   driving lamp buffers or common-cathode LED's.
+//-   These circuits have full ripple-blanking input/output controls
+//-   and a lamp test input. Display patterns
+//-   for BCD input counts above nine are unique symbols
+//-   to authenticate input conditions.
+//-   These circuits incorporate automatic
+//-   leading and/or trailing-edge, zero-blanking control
+//-   (RBI and RBO). Lamp test (LT) of these devices may
+//-   be performed at any time when the BI/RBO node is at
+//-   a high logic level. They contain
+//-   an overriding blanking input (BI) which can be used
+//-   to control the lamp intensity (by pulsing), or to inhibit
+//-   the outputs.
+//- Pinalias: A1,A2,LTQ,BIQ,RBIQ,A3,A0,GND,e,d,c,b,a,g,f,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS010172.PDF
+//-
+//-         +-----+------+----+----+----+----++-----+---+---+---+---+---+---+---+
+//-         | LTQ | RBIQ | A3 | A2 | A1 | A0 || BIQ | a | b | c | d | e | f | g |
+//-         +=====+======+====+====+====+====++=====+===+===+===+===+===+===+===+
+//-         |  1  |   1  |  0 |  0 |  0 |  0 ||  1  | 1 | 1 | 1 | 1 | 1 | 1 | 0 |
+//-         |  1  |   X  |  0 |  0 |  0 |  1 ||  1  | 0 | 1 | 1 | 0 | 0 | 0 | 0 |
+//-         |  1  |   X  |  0 |  0 |  1 |  0 ||  1  | 1 | 1 | 0 | 1 | 1 | 0 | 1 |
+//-         |  1  |   X  |  0 |  0 |  1 |  1 ||  1  | 1 | 1 | 1 | 1 | 0 | 0 | 1 |
+//-         |  1  |   X  |  0 |  1 |  0 |  0 ||  1  | 0 | 1 | 1 | 0 | 0 | 1 | 1 |
+//-         |  1  |   X  |  0 |  1 |  0 |  1 ||  1  | 1 | 0 | 1 | 1 | 0 | 1 | 1 |
+//-         |  1  |   X  |  0 |  1 |  1 |  0 ||  1  | 0 | 0 | 1 | 1 | 1 | 1 | 1 |
+//-         |  1  |   X  |  0 |  1 |  1 |  1 ||  1  | 1 | 1 | 1 | 0 | 0 | 0 | 0 |
+//-         |  1  |   X  |  1 |  0 |  0 |  0 ||  1  | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
+//-         |  1  |   X  |  1 |  0 |  0 |  1 ||  1  | 1 | 1 | 1 | 0 | 0 | 1 | 1 |
+//-         |  1  |   X  |  1 |  0 |  1 |  0 ||  1  | 0 | 0 | 0 | 1 | 1 | 0 | 1 |
+//-         |  1  |   X  |  1 |  0 |  1 |  1 ||  1  | 0 | 0 | 1 | 1 | 0 | 0 | 1 |
+//-         |  1  |   X  |  1 |  1 |  0 |  0 ||  1  | 0 | 1 | 0 | 0 | 0 | 1 | 1 |
+//-         |  1  |   X  |  1 |  1 |  0 |  1 ||  1  | 1 | 0 | 0 | 1 | 0 | 1 | 1 |
+//-         |  1  |   X  |  1 |  1 |  1 |  0 ||  1  | 0 | 0 | 0 | 1 | 1 | 1 | 1 |
+//-         |  1  |   X  |  1 |  1 |  1 |  1 ||  1  | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+//-         |  X  |   X  |  X |  X |  X |  X ||  0  | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+//-         |  1  |   0  |  0 |  0 |  0 |  0 ||  0  | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
+//-         |  0  |   X  |  X |  X |  X |  X ||  1  | 1 | 1 | 1 | 1 | 1 | 1 | 1 |
+//-         +-----+------+----+----+----+----++-----+---+---+---+---+---+---+---+
+//-
+static NETLIST_START(TTL_7448_DIP)
+
+	TTL_7448(A)
+
+	DIPPINS(    /*      +--------------+     */
+		A.B,    /* B    |1     ++    16| VCC */ A.VCC,
+		A.C,    /* C    |2           15| f   */ A.f,
+		A.LTQ,  /* LTQ  |3           14| g   */ A.g,
+		A.BIQ,  /* BIQ  |4    7448   13| a   */ A.a,
+		A.RBIQ, /* RBIQ |5           12| b   */ A.b,
+		A.D,    /* D    |6           11| c   */ A.c,
+		A.A,    /* A    |7           10| d   */ A.d,
+		A.GND,  /* GND  |8            9| e   */ A.e
+				/*      +--------------+     */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7450_DIP
+//- Title: DM7450 Expandable Dual 2-Wide 2-Input AND-OR-INVERT Gate
+//- Description: This device contains two independent combinations of gates, each of which perform the logic AND-OR-INVERT function.
+//-   One set of gates has an expander node.
+//- Pinalias: A1,B1,Y1,A2,B2,Y2,GND,Y3,A3,B3,Y4,A4,B4,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- Limitations: Expander signal is not implemented
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheets/105/236976_DS.pdf
+//-
+//-         +---+---++---+
+//-         | A | B || Y |
+//-         +===+===++===+
+//-         | 0 | 0 || 1 |
+//-         | 0 | 1 || 1 |
+//-         | 1 | 0 || 1 |
+//-         | 1 | 1 || 0 |
+//-         +---+---++---+
+//-
+static NETLIST_START(TTL_7450_DIP)
+	TTL_7450_ANDORINVERT(A)
+	TTL_7450_ANDORINVERT(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+	NC_PIN(NC)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    1A |1     ++    14| VCC  */ A.VCC,
+		  B.A, /*    2A |2           13| 1B   */ A.B,
+		  B.B, /*    2B |3           12| 1XQ  */ NC.I,
+		  B.C, /*    2C |4    7450   11| 1X   */ NC.I,
+		  B.D, /*    2D |5           10| 1D   */ A.D,
+		  B.Q, /*    2Y |6            9| 1C   */ A.C,
+		A.GND, /*   GND |7            8| 1Y   */ A.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7473_DIP
+//- Title: 5473/DM5473/DM7473 Dual Master-Slave J-K Flip-Flops with Clear and Complementary Outputs
+//- Description: This device contains two independent positive pulse triggered J-K flip-flops with complementary outputs.
+//-   The J and K data is processed by the flip-flops after a complete clock pulse.
+//-   While the clock is low the slave is isolated from the master.
+//-   On the positive transition of the clock, the data from the J and K inputs is transferred to teh master.
+//-   While the clock is high the J and K inputs are disabled.
+//-   On the negative transition of the clock, the data from the master is transferred to the slave.
+//-   The logic states of the J and K inputs must not be allowed to change while the clock is high.
+//-   Data transfers to the outputs on the falling edge of the clock pulse.
+//-   A low logic level on the clear input will reset the outputs regardless of the logic states of the other inputs.
+//- Pinalias: CLK1,CLR1,K1,VCC,CLK2,CLR2,J2,QQ2,Q2,K2,GND,Q1,QQ1,J1
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet_pdf/national-semiconductor/5473DMQB_to_DM7473N.pdf
+//-
+//-         +-----+-------+---+---++---+----+
+//-         | CLR |  CLK  | J | K || Q | QQ |
+//-         +=====+=======+===+===++===+====+
+//-         |  0  |   X   | X | X || 0 |  1 |
+//-         |  1  | 0-1-0 | 0 | 0 || Q | QQ |
+//-         |  1  | 0-1-0 | 1 | 0 || 1 |  0 |
+//-         |  1  | 0-1-0 | 0 | 1 || 0 |  1 |
+//-         |  1  | 0-1-0 | 1 | 1 || Toggle |
+//-         +-----+-------+---+---++---+----+
+//-
+static NETLIST_START(TTL_7473_DIP)
+	TTL_7473(A)
+	TTL_7473(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(    /*       +--------------+      */
+		 A.CLK, /*  CLK1 |1     ++    14| J1   */ A.J,
+		A.CLRQ, /*  CLR1 |2           13| QQ1  */ A.QQ,
+		   A.K, /*    K1 |3           12| Q1   */ A.Q,
+		 A.VCC, /*   VCC |4    7473   11| GND  */ A.GND,
+		 B.CLK, /*  CLK2 |5           10| K2   */ B.K,
+		B.CLRQ, /*  CLR2 |6            9| Q2   */ B.Q,
+		   B.J, /*    J2 |7            8| QQ2  */ B.QQ
+				/*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7473A_DIP
+//- Title: DM54LS73A/DM74LS73A Dual Negative-Edge-Triggered Master-Slave J-K Flip-Flops with Clear and Complementary Outputs
+//- Description: This device contains two independent negative-edge-triggered J-K flip-flops with complementary outputs.
+//-   The J and K data is processed by the flip-flops on the falling edge of the clock pulse.
+//-   The clock triggering occurs at a voltage level and is not directly related to the transition time of the negative going edge of the clock pulse.
+//-   The data on the J and K inputs is allowed to change while the clock is high or low without affecting the outputs as long as setup and hold times are not violated.
+//-   A low logic level on the clear input will reset the outputs regardless of the levels of the other inputs.
+//- Pinalias: CLK1,CLR1,K1,VCC,CLK2,CLR2,J2,QQ2,Q2,K2,GND,Q1,QQ1,J1
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semicouductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006372.PDF
+//-
+//-         +-----+-----+---+---++---+----+
+//-         | CLR | CLK | J | K || Q | QQ |
+//-         +=====+=====+===+===++===+====+
+//-         |  0  |  X  | X | X || 0 |  1 |
+//-         |  1  | 1-0 | 0 | 0 || Q | QQ |
+//-         |  1  | 1-0 | 1 | 0 || 1 |  0 |
+//-         |  1  | 1-0 | 0 | 1 || 0 |  1 |
+//-         |  1  | 1-0 | 1 | 1 || Toggle |
+//-         |  1  |  1  | X | X || Q | QQ |
+//-         +-----+-----+---+---++---+----+
+//-
+static NETLIST_START(TTL_7473A_DIP)
+	TTL_7473A(A)
+	TTL_7473A(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(    /*       +--------------+      */
+		 A.CLK, /*  CLK1 |1     ++    14| J1   */ A.J,
+		A.CLRQ, /*  CLR1 |2           13| QQ1  */ A.QQ,
+		   A.K, /*    K1 |3           12| Q1   */ A.Q,
+		 A.VCC, /*   VCC |4   7473A   11| GND  */ A.GND,
+		 B.CLK, /*  CLK2 |5           10| K2   */ B.K,
+		B.CLRQ, /*  CLR2 |6            9| Q2   */ B.Q,
+		   B.J, /*    J2 |7            8| QQ2  */ B.QQ
+				/*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7474_DIP
+//- Title: 5474/DM5474/DM7474 Dual Positive-Edge-Triggered D Flip-Flops with Preset, Clear and Complementary Outputs
+//- Description: This device contains two independent positive-edge-triggered D flip-flops with complementary outputs.
+//-   The information on the D input is accepted by the flip-flops on the positive going edge of the clock pulse.
+//-   The triggering occurs at a voltage level and is not directly related to the transition time of the rising edge of the clock.
+//-   The data on the D input may be changed while the clock is low or high without affecting the outputs as long as the data setup and hold times are not violated.
+//-   A low logic level on the preset or clear inputs will set or reset the outputs regardless of the logic levels of the other inputs.
+//- Pinalias: CLR1,D1,CLK1,PR1,Q1,QQ1,GND,QQ2,Q2,PR2,CLK2,D2,CLR2,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006526.PDF
+//-
+//-         +----+-----+-----+---++---+----+
+//-         | PR | CLR | CLK | D || Q | QQ |
+//-         +====+=====+=====+===++===+====+
+//-         |  0 |  1  |  X  | X || 1 |  0 |
+//-         |  1 |  0  |  X  | X || 0 |  1 |
+//-         |  0 |  0  |  X  | X || 1 |  1 | (unstable)
+//-         |  1 |  1  | 0-1 | 1 || 1 |  0 |
+//-         |  1 |  1  | 0-1 | 0 || 0 |  1 |
+//-         |  1 |  1  |  0  | X || Q | QQ |
+//-         +----+-----+-----+---++---+----+
+//-
+static NETLIST_START(TTL_7474_DIP)
+	TTL_7474(A)
+	TTL_7474(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(    /*       +--------------+       */
+		A.CLRQ, /*  CLR1 |1     ++    14| VCC   */ A.VCC,
+		   A.D, /*    D1 |2           13| CLR2  */ B.CLRQ,
+		 A.CLK, /*  CLK1 |3           12| D2    */ B.D,
+		A.PREQ, /*   PR1 |4    7474   11| CLK2  */ B.CLK,
+		   A.Q, /*    Q1 |5           10| PR2   */ B.PREQ,
+		  A.QQ, /*   QQ1 |6            9| Q2    */ B.Q,
+		 A.GND, /*   GND |7            8| QQ2   */ B.QQ
+				/*       +-------------+        */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7475_DIP
+//- Title: DM5475/DM7475/DM7475A/DM74LS75 4-bit D Latch
+//- Description: These latches are ideally suited for use as temporary
+//-    storage for binary information between processing units
+//-    and input/output or indicator units. Information present
+//-    at a data (D) input is transferred to the Q output when
+//-    the enable (G) is high, and the Q output will follow
+//-    the data input as long as the enable remains high. When
+//-    the enable goes low, the information (that was present
+//-    at the data input at the time the transition occurred) is
+//-    retained at the Q output until the enable is permitted
+//-    to go high.
+//-
+//-    The DM5475/DM7475, DM54L75A/DM74L75A, and
+//-    DM54LS75/DM74LS75 feature complementary Q and
+//-    QQ outputs from a 4-bit latch, and are available in 16-pin
+//-    packages.
+//- Pinalias: QQ1,D1,D2,E34,VCC,D3,D4,QQ4,Q4,Q3,QQ3,GND,E12,QQ2,Q2,Q1
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   https://ia800608.us.archive.org/5/items/bitsavers_nationaldaTTLDatabook_40452765/1976_National_TTL_Databook.pdf
+//-
+//-         +---+---++---+----+
+//-         | D | G || Q | QQ |
+//-         +===+===++===+====+
+//-         | 0 | 1 || 0 |  1 |
+//-         | 1 | 1 || 1 |  0 |
+//-         | X | 0 || Q | QQ |
+//-         +---+---++---+----+
+//-
+static NETLIST_START(TTL_7475_DIP)
+	TTL_7475_GATE(A)
+	TTL_7475_GATE(B)
+	TTL_7475_GATE(C)
+	TTL_7475_GATE(D)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+
+	NET_C(A.CLK, B.CLK)
+	NET_C(C.CLK, D.CLK)
+
+	DIPPINS(   /*       +--------------+       */
+		 A.QQ, /*   QQ1 |1     ++    16| Q1    */ A.Q,
+		  A.D, /*    D1 |2           15| Q2    */ B.Q,
+		  B.D, /*    D2 |3           14| QQ2   */ B.QQ,
+		C.CLK, /*   E34 |4    7475   13| E12   */ A.CLK,
+		A.VCC, /*   VCC |5           12| GND   */ A.GND,
+		  C.D, /*    D3 |6           11| QQ3   */ C.QQ,
+		  D.D, /*    D4 |7           10| Q3    */ C.Q,
+		 D.QQ, /*   QQ4 |8            9| Q4    */ D.Q
+			   /*       +--------------+       */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7477_DIP
+//- Title: DM74LS77 4-bit D Latch
+//- Description: These latches are ideally suited for use as temporary
+//-    storage for binary information between processing units
+//-    and input/output or indicator units. Information present
+//-    at a data (D) input is transferred to the Q output when
+//-    the enable (G) is high, and the Q output will follow
+//-    the data input as long as the enable remains high. When
+//-    the enable goes low, the information (that was present
+//-    at the data input at the time the transition occurred) is
+//-    retained at the Q output until the enable is permitted
+//-    to go high.
+//- Pinalias: D1,D2,E34,VCC,D3,D4,NC,Q4,Q3,NC,GND,E12,Q2,Q1
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   https://ia800608.us.archive.org/5/items/bitsavers_nationaldaTTLDatabook_40452765/1976_National_TTL_Databook.pdf
+//-
+//-         +---+---++---+----+
+//-         | D | G || Q | QQ |
+//-         +===+===++===+====+
+//-         | 0 | 1 || 0 |  1 |
+//-         | 1 | 1 || 1 |  0 |
+//-         | X | 0 || Q | QQ |
+//-         +---+---++---+----+
+//-
+static NETLIST_START(TTL_7477_DIP)
+	TTL_7477_GATE(A)
+	TTL_7477_GATE(B)
+	TTL_7477_GATE(C)
+	TTL_7477_GATE(D)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+
+	NET_C(A.CLK, B.CLK)
+	NET_C(C.CLK, D.CLK)
+
+	NC_PIN(NC)
+
+	DIPPINS(   /*       +--------------+       */
+		  A.D, /*    D1 |1     ++    14| Q1    */ A.Q,
+		  B.D, /*    D2 |2           13| Q2    */ B.Q,
+		C.CLK, /*   E34 |3           12| E12   */ A.CLK,
+		A.VCC, /*   VCC |4    7477   11| GND   */ A.GND,
+		  C.D, /*    D3 |5           10| NC    */ NC.I,
+		  D.D, /*    D4 |6            9| Q3    */ C.Q,
+		 NC.I, /*    NC |7            8| Q4    */ D.Q
+			   /*       +--------------+       */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7483_DIP
+//- Title: DM5483/DM7483/DM74LS83A 4-bit Binary Adders With Fast Carry
+//- Description: These full adders perform the addition of two 4-bit
+//-   binary numbers. The sum (S) outputs are provided for
+//-   each bit and the resultant carry (C4) is obtained from
+//-   the fourth bit. These adders feature full internal look
+//-   ahead across all four bits. This provides the system
+//-   designer with partial look-ahead performance at the
+//-   economy and reduced package count of a ripple-carry
+//-   implementation.
+//-
+//-   The adder logic, including the carry, is implemented in
+//-   its true form meaning that the end-around carry can be
+//-   accomplished without the need for logic or level inversion.
+//- Pinalias: A4,S3,A3,B3,VCC,S2,B2,A2,S1,A1,B1,GND,C0,C4,S4,B4
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006378.PDF
+//-
+static NETLIST_START(TTL_7483_DIP)
+	TTL_7483(A)
+
+	DIPPINS(   /*      +--------------+     */
+		 A.A4, /*   A4 |1     ++    16| B4  */ A.B4,
+		 A.S3, /*   S3 |2           15| S4  */ A.S4,
+		 A.A3, /*   A3 |3           14| C4  */ A.C4,
+		 A.B3, /*   B3 |4    7483   13| C0  */ A.C0,
+		A.VCC, /*  VCC |5           12| GND */ A.GND,
+		 A.S2, /*   S2 |6           11| B1  */ A.B1,
+		 A.B2, /*   B2 |7           10| A1  */ A.A1,
+		 A.A2, /*   A2 |8            9| S1  */ A.S1
+			   /*      +--------------+     */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7485_DIP
+//- Title: DM5485/DM7485/DM74L85/DM74LS85 4-Bit Magnitude Comparators
+//- Description: These four-bit magnitude comparators perform comparison
+//-   of straight binary or BCD codes. Three
+//-   fully-decoded decisions about two, 4-bit words (A, B)
+//-   are made and are externally available at three outputs.
+//-   These devices are fully expandable to any number of
+//-   bits without external gates. Words of greater length may
+//-   be compared by connecting comparators in cascade. The
+//-   A > B, A < B, and A = B outputs of a stage handling
+//-   less-significant bits are connected to the corresponding
+//-   inputs of the next stage handling more-significant bits.
+//-   The stage handling the least-significant bits must have a
+//-   high-level voltage applied to the A = B input and in
+//-   addition for the L85, low-level voltages applied to the
+//-   A> B and A < B inputs. The cascading paths of the 85,
+//-   and LS85 are implemented with only a two-gate-Ievel
+//-   delay to reduce overall comparison times for long words.
+//- Pinalias: B3,LTIN,EQIN,GTIN,GTOUT,EQOUT,LTOUT,GND,B0,A0,B1,A1,A2,B2,A3,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006379.PDF
+//-
+static NETLIST_START(TTL_7485_DIP)
+	TTL_7485(A)
+
+	DIPPINS(     /*       +--------------+      */
+		   A.B3, /*    B3 |1     ++    16| VCC  */ A.VCC,
+		 A.LTIN, /*  LTIN |2           15| A3   */ A.A3,
+		 A.EQIN, /*  EQIN |3           14| B2   */ A.B2,
+		 A.GTIN, /*  GTIN |4    7485   13| A2   */ A.A2,
+		A.GTOUT, /* GTOUT |5           12| A1   */ A.A1,
+		A.EQOUT, /* EQOUT |6           11| B1   */ A.B1,
+		A.LTOUT, /* LTOUT |7           10| A0   */ A.A0,
+		  A.GND, /*   GND |8            9| B0   */ A.B0
+				 /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7486_DIP
+//- Title: 5486/DM5486/DM7486 Quad 2-Input Exclusive-OR Gates
+//- Description: This device contains four independent gates each of which performs the logic exclusive-OR function.
+//- Pinalias: A1,B1,Y1,A2,B2,Y2,GND,Y3,A3,B3,Y4,A4,B4,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006531.PDF
+//-
+//-         +---+---++---+
+//-         | A | B || Y |
+//-         +===+===++===+
+//-         | 0 | 0 || 0 |
+//-         | 0 | 1 || 1 |
+//-         | 1 | 0 || 1 |
+//-         | 1 | 1 || 0 |
+//-         +---+---++---+
+//-
+static NETLIST_START(TTL_7486_DIP)
+	TTL_7486_XOR(A)
+	TTL_7486_XOR(B)
+	TTL_7486_XOR(C)
+	TTL_7486_XOR(D)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.A, /*    A1 |1     ++    14| VCC  */ A.VCC,
+		  A.B, /*    B1 |2           13| B4   */ D.B,
+		  A.Q, /*    Y1 |3           12| A4   */ D.A,
+		  B.A, /*    A2 |4    7486   11| Y4   */ D.Q,
+		  B.B, /*    B2 |5           10| B3   */ C.B,
+		  B.Q, /*    Y2 |6            9| A3   */ C.A,
+		A.GND, /*   GND |7            8| Y3   */ C.Q
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7490_DIP
+//- Title: DM5490/DM7490A Decade Counter
+//- Description: These monolithic counters contain four
+//-   master-slave flip-flops and additional gating to provide
+//-   a divide-by-two counter and a three-stage binary counter
+//-   for which the count cycle length is divide-by-five.
+//-
+//-   These counters have a gated zero reset and
+//-   also have gated set-to-nine inputs
+//-   for use in BCD nine's complement applications.
+//-
+//-   To use their maximum count length (decade), the B input is connected
+//-   to the QA output. The input count pulses are applied to
+//-   input A and the outputs are as described in the appropriate
+//-   truth table. A symmetrical divide-by-ten count can be
+//-   obtained from the by connecting the QD output to
+//-   the A input and applying the input count to the B input
+//-   which gives a divide-by-ten square wave at output QA.
+//- Pinalias: B,R01,R02,NC,VCC,R91,R92,QC,QB,GND,QD,QA,NC,A
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006533.PDF
+//-
+//-               BCD Count Sequence                    BCD Bi-Quinary
+//-         +-------++----+----+----+----+      +-------++----+----+----+----+
+//-         | Count || QD | QC | QB | QA |      | Count || QD | QC | QB | QA |
+//-         +=======++====+====+====+====+      +=======++====+====+====+====+
+//-         |   0   ||  0 |  0 |  0 |  0 |      |   0   ||  0 |  0 |  0 |  0 |
+//-         |   1   ||  0 |  0 |  0 |  1 |      |   1   ||  0 |  0 |  0 |  1 |
+//-         |   2   ||  0 |  0 |  1 |  0 |      |   2   ||  0 |  0 |  1 |  0 |
+//-         |   3   ||  0 |  0 |  1 |  1 |      |   3   ||  0 |  0 |  1 |  1 |
+//-         |   4   ||  0 |  1 |  0 |  0 |      |   4   ||  0 |  1 |  0 |  0 |
+//-         |   5   ||  0 |  1 |  0 |  1 |      |   5   ||  1 |  0 |  0 |  0 |
+//-         |   6   ||  0 |  1 |  1 |  0 |      |   6   ||  1 |  0 |  0 |  1 |
+//-         |   7   ||  0 |  1 |  1 |  1 |      |   7   ||  1 |  0 |  1 |  0 |
+//-         |   8   ||  1 |  0 |  0 |  0 |      |   8   ||  1 |  0 |  1 |  1 |
+//-         |   9   ||  1 |  0 |  0 |  1 |      |   9   ||  1 |  1 |  0 |  0 |
+//-         +-------++----+----+----+----+      +-------++----+----+----+----+
+//-
+//-                   Reset/Count Function Table
+//-         +-----+-----+-----+-----++----+----+----+----+
+//-         | R01 | R02 | R91 | R92 || QD | QC | QB | QA |
+//-         +=====+=====+=====+=====++====+====+====+====+
+//-         |  1  |  1  |  0  |  X  ||  0 |  0 |  0 |  0 |
+//-         |  1  |  1  |  X  |  0  ||  0 |  0 |  0 |  0 |
+//-         |  X  |  X  |  1  |  1  ||  1 |  0 |  0 |  1 |
+//-         |  X  |  0  |  X  |  0  ||       COUNT       |
+//-         |  0  |  X  |  0  |  X  ||       COUNT       |
+//-         |  0  |  X  |  X  |  0  ||       COUNT       |
+//-         |  X  |  0  |  0  |  X  ||       COUNT       |
+//-         +-----+-----+-----+-----++----+----+----+----+
+//-
+static NETLIST_START(TTL_7490_DIP)
+	TTL_7490(A)
+	NC_PIN(NC)
+
+	DIPPINS(   /*     +--------------+     */
+		  A.B, /*   B |1     ++    14| A   */ A.A,
+		 A.R1, /* R01 |2           13| NC  */ NC.I,
+		 A.R2, /* R02 |3           12| QA  */ A.QA,
+		 NC.I, /*  NC |4    7490   11| QD  */ A.QD,
+		A.VCC, /* VCC |5           10| GND */ A.GND,
+		A.R91, /* R91 |6            9| QB  */ A.QB,
+		A.R92, /* R92 |7            8| QC  */ A.QC
+			   /*     +--------------+     */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7492_DIP
+//- Title: SN5492A, SN54LS92, SN7492A, SN74LS92 Divide-By-Twelve Counter
+//- Description: These monolithic counters contains four
+//-   master-slave flip-flops and additional gating to provide
+//-   a divide-by-two counter and a three-stage binary counter
+//-   for which the count cycle length is divide-by-six.
+//-
+//-   These counters have a gated zero reset.
+//-
+//-   To use their maximum count length (divide-by-
+//-   twelve), the B input is connected
+//-   to the QA output. The input count pulses are applied to
+//-   input A and the outputs are as described in the appropriate
+//-   truth table.
+//- Pinalias: CKB,NC,NC,NC,VCC,R01,R02,QD,QC,GND,QB,QA,NC,CLKA
+//- Package: DIP
+//- NamingConvention: Naming conventions follow Texas Instruments datasheet
+//- FunctionTable:
+//-   https://pdf1.alldatasheet.com/datasheet-pdf/view/27430/TI/SN7492A.html
+//-
+//-                 Count Sequence
+//-         +-------++----+----+----+----+
+//-         | Count || QD | QC | QB | QA |
+//-         +=======++====+====+====+====+
+//-         |   0   ||  0 |  0 |  0 |  0 |
+//-         |   1   ||  0 |  0 |  0 |  1 |
+//-         |   2   ||  0 |  0 |  1 |  0 |
+//-         |   3   ||  0 |  0 |  1 |  1 |
+//-         |   4   ||  0 |  1 |  0 |  0 |
+//-         |   5   ||  0 |  1 |  0 |  1 |
+//-         |   6   ||  1 |  0 |  0 |  0 |
+//-         |   7   ||  1 |  0 |  0 |  1 |
+//-         |   8   ||  1 |  0 |  1 |  0 |
+//-         |   9   ||  1 |  0 |  1 |  1 |
+//-         |  10   ||  1 |  1 |  0 |  0 |
+//-         |  11   ||  1 |  1 |  0 |  1 |
+//-         +-------++----+----+----+----+
+//-
+//-             Reset/Count Function Table
+//-         +-----+-----++----+----+----+----+
+//-         | R01 | R02 || QD | QC | QB | QA |
+//-         +=====+=====++====+====+====+====+
+//-         |  1  |  1  ||  0 |  0 |  0 |  0 |
+//-         |  0  |  X  ||       COUNT       |
+//-         |  X  |  0  ||       COUNT       |
+//-         +-----+-----++----+----+----+----+
+//-
+ static NETLIST_START(TTL_7492_DIP)
+	TTL_7492(A)
+	NC_PIN(NC)
+
+	DIPPINS(   /*      +--------------+      */
+		  A.B, /* CLKB |1     ++    14| CLKA */ A.A,
+		 NC.I, /*   NC |2           13| NC   */ NC.I,
+		 NC.I, /*   NC |3           12| QA   */ A.QA,
+		 NC.I, /*   NC |4    7492   11| QD   */ A.QD,
+		A.VCC, /*  VCC |5           10| GND  */ A.GND,
+		 A.R1, /*  R01 |6            9| QB   */ A.QB,
+		 A.R2, /*  R02 |7            8| QC   */ A.QC
+			   /*      +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7493_DIP
+//- Title: DM7493A Binary Counter
+//- Description: These monolithic counters contains four
+//-   master-slave flip-flops and additional gating to provide
+//-   a divide-by-two counter and a three-stage binary counter
+//-   for which the count cycle length is divide-by-eight.
+//-
+//-   These counters have a gated zero reset.
+//-
+//-   To use their maximum count length (four-bit binary), the B input is connected
+//-   to the QA output. The input count pulses are applied to
+//-   input A and the outputs are as described in the appropriate
+//-   truth table.
+//- Pinalias: B,R01,R02,NC,VCC,NC,NC,QC,QB,GND,QD,QA,NC,A
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006533.PDF
+//-
+//-                 Count Sequence
+//-         +-------++----+----+----+----+
+//-         | Count || QD | QC | QB | QA |
+//-         +=======++====+====+====+====+
+//-         |   0   ||  0 |  0 |  0 |  0 |
+//-         |   1   ||  0 |  0 |  0 |  1 |
+//-         |   2   ||  0 |  0 |  1 |  0 |
+//-         |   3   ||  0 |  0 |  1 |  1 |
+//-         |   4   ||  0 |  1 |  0 |  0 |
+//-         |   5   ||  0 |  1 |  0 |  1 |
+//-         |   6   ||  0 |  1 |  1 |  0 |
+//-         |   7   ||  0 |  1 |  1 |  1 |
+//-         |   8   ||  1 |  0 |  0 |  0 |
+//-         |   9   ||  1 |  0 |  0 |  1 |
+//-         |  10   ||  1 |  0 |  1 |  0 |
+//-         |  11   ||  1 |  0 |  1 |  1 |
+//-         |  12   ||  1 |  1 |  0 |  0 |
+//-         |  13   ||  1 |  1 |  0 |  1 |
+//-         |  14   ||  1 |  1 |  1 |  0 |
+//-         |  15   ||  1 |  1 |  1 |  1 |
+//-         +-------++----+----+----+----+
+//-
+//-             Reset/Count Function Table
+//-         +-----+-----++----+----+----+----+
+//-         | R01 | R02 || QD | QC | QB | QA |
+//-         +=====+=====++====+====+====+====+
+//-         |  1  |  1  ||  0 |  0 |  0 |  0 |
+//-         |  0  |  X  ||       COUNT       |
+//-         |  X  |  0  ||       COUNT       |
+//-         +-----+-----++----+----+----+----+
+//-
+ static NETLIST_START(TTL_7493_DIP)
+	TTL_7493(A)
+	NC_PIN(NC)
+
+	DIPPINS(    /*      +--------------+      */
+		A.CLKB, /* CLKB |1     ++    14| CLKA */ A.CLKA,
+		  A.R1, /*  R01 |2           13| NC   */ NC.I,
+		  A.R2, /*  R02 |3           12| QA   */ A.QA,
+		  NC.I, /*   NC |4    7493   11| QD   */ A.QD,
+		 A.VCC, /*  VCC |5           10| GND  */ A.GND,
+		  NC.I, /*   NC |6            9| QB   */ A.QB,
+		  NC.I, /*   NC |7            8| QC   */ A.QC
+				/*      +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_7497_DIP
+//- Title: 5497/DM7497 Synchronous Modulo-64 Bit Rate Multiplier
+//- Description: The ’97 contains a synchronous 6-stage binary counter and six decoding gates that serve to gate the clock through to the output at a sub-multiple of the input frequency.
+//-   The output pulse rate, relative to the clock frequency, is determined by signals applied to the Select (S0–S5) inputs.
+//-   Both true and complement outputs are available, along with an enable input for each.
+//-   A Count Enable input and a Terminal Count output are provided for cascading two or more packages.
+//-   An asynchronous Master Reset input prevents counting and resets the counter.
+//- Pinalias: S1,S4,S5,S0,ZQ,Y,TCQ,GND,CP,EZQ,CEQ,EY,MR,S2,S3,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS009780.PDF
+//-
+static NETLIST_START(TTL_7497_DIP)
+	TTL_7497(A)
+
+	DIPPINS(      /*       +--------------+ */
+			A.B1, /*    S1 |1     ++    16| VCC   */ A.VCC,
+			A.B4, /*    S4 |2           15| S3    */ A.B3,
+			A.B5, /*    S5 |3           14| S2    */ A.B2,
+			A.B0, /*    S0 |4    7497   13| MR    */ A.CLR,
+			A.ZQ, /*    ZQ |5           12| EY    */ A.UNITYQ,
+			 A.Y, /*     Y |6           11| CEQ   */ A.ENQ,
+		A.ENOUTQ, /*   TCQ |7           10| EZQ   */ A.STRBQ,
+		   A.GND, /*   GND |8            9| CP    */ A.CLK
+				  /*       +--------------+       */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74107_DIP
+//- Title: SN54107, SN74107 Dual J-K Flip-Flops With Clear
+//- Description: The '107 contains two independent J-K flip-flops with individual J-K, clock, and direct clear inputs.
+//-   The '107 is a positive pulse-triggered flip-flop.
+//-   The J-K input data is loaded into the master while the clock is high and transferred to teh slave and the outputs on the high-to-low clock transition.
+//-   For these devices the J and K inputs must be stable while the clock is high.
+//- Pinalias: 1J,1QQ,1Q,1K,2Q,2QQ,GND,2J,2CLK,2CLRQ,2K,1CLK,1CLRQ,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow Texas Instruments datasheet
+//- FunctionTable:
+//-   https://pdf1.alldatasheet.com/datasheet-pdf/view/840452/TI1/SN74107.html
+//-
+//-         +------+-------+---+---++---+----+
+//-         | CLRQ |  CLK  | J | K || Q | QQ |
+//-         +======+=======+===+===++===+====+
+//-         |   0  |   X   | X | X || 0 |  1 |
+//-         |   1  | 0-1-0 | 0 | 0 || Q | QQ |
+//-         |   1  | 0-1-0 | 1 | 0 || 1 |  0 |
+//-         |   1  | 0-1-0 | 0 | 1 || 0 |  1 |
+//-         |   1  | 0-1-0 | 1 | 1 || TOGGLE |
+//-         +------+-------+---+---++---+----+
+//-
+static NETLIST_START(TTL_74107_DIP)
+	TTL_74107(A)
+	TTL_74107(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(   /*     +--------------+       */
+		  A.J, /*  1J |1     ++    14| VCC   */ A.VCC,
+		 A.QQ, /* 1QQ |2           13| 1CLRQ */ A.CLRQ,
+		  A.Q, /*  1Q |3           12| 1CLK  */ A.CLK,
+		  A.K, /*  1K |4   74107   11| 2K    */ B.K,
+		  B.Q, /*  2Q |5           10| 2CLRQ */ B.CLRQ,
+		 B.QQ, /* 2QQ |6            9| 2CLK  */ B.CLK,
+		B.GND, /* GND |7            8| 2J    */ B.J
+			   /*     +--------------+       */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74107A_DIP
+//- Title: DM54LS107A/DM74LS107A Dual Negative-Edge-Triggered Master-Slave J-K Flip-Flops withClear and Complementary Outputs
+//- Description: This device contains two independent negative-edge-triggered J-K flip-flops with complementary outputs.
+//-   The J and K data is processed by the flip-flops on the falling edge of the clock pulse.
+//-   The clock triggering occurs at a voltage level and is not directly related to the transition time of the negative going edge of the clock pulse.
+//-   The data on the J and K inputs may change while the clock is high or low without affecting the outputs as long as setup and hold times are not violated.
+//-   A low logic level on the clear input will reset the outputs regardless of the logic levels of the other inputs.
+//- Pinalias: J1,QQ1,Q1,K1,Q2,QQ2,GND,J2,CLK2,CLRQ2,K2,CLK1,CLRQ1,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006367.PDF
+//-
+//-         +------+-----+---+---++---+----+
+//-         | CLRQ | CLK | J | K || Q | QQ |
+//-         +======+=====+===+===++===+====+
+//-         |   0  |  X  | X | X || 0 |  1 |
+//-         |   1  | 1-0 | 0 | 0 || Q | QQ |
+//-         |   1  | 1-0 | 1 | 0 || 1 |  0 |
+//-         |   1  | 1-0 | 0 | 1 || 0 |  1 |
+//-         |   1  | 1-0 | 1 | 1 || TOGGLE |
+//-         |   1  |  1  | X | X || Q | QQ |
+//-         +------+-----+---+---++---+----+
+//-
+static NETLIST_START(TTL_74107A_DIP)
+	TTL_74107A(A)
+	TTL_74107A(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(   /*     +--------------+       */
+		  A.J, /*  J1 |1     ++    14| VCC   */ A.VCC,
+		 A.QQ, /* QQ1 |2           13| CLRQ1 */ A.CLRQ,
+		  A.Q, /*  Q1 |3           12| CLK1  */ A.CLK,
+		  A.K, /*  K1 |4   74107A  11| K2    */ B.K,
+		  B.Q, /*  Q2 |5           10| CLRQ2 */ B.CLRQ,
+		 B.QQ, /* QQ2 |6            9| CLK2  */ B.CLK,
+		B.GND, /* GND |7            8| J2    */ B.J
+			   /*     +--------------+       */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74113_DIP
+//- Title: DM54S113/DM74S113 Dual Negative-Edge-Triggered Master-Slave J-K Flip-Flops with Preset and Complementary Outputs
+//- Description: This device contains two independent negative-edge-triggered J-K flip-flops with complementary outputs.
+//-   The J and K data is processed by the flip-flops on the falling edge of the clock pulse.
+//-   The clock triggering occurs at a voltage level and is not directly related to the transition time of the negative going edge of the clock pulse.
+//-   Data on the J and K inputs may be changed while the clock is high or low without affecting the outputs as long as setup and hold times are not violated.
+//-   A low logic level on the preset input will set the outputs regardless of the logic levels of the other inputs.
+//- Pinalias: CLK1,K1,J1,PRQ1,Q1,QQ1,GND,QQ2,Q2,PRQ2,J2,K2,CLK2,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow Texas Instruments datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006460.PDF
+//-
+//-         +-----+-----+---+---++---+----+
+//-         | PRQ | CLK | J | K || Q | QQ |
+//-         +=====+=====+===+===++===+====+
+//-         |  0  |  X  | X | X || 1 |  0 |
+//-         |  1  | 1-0 | 0 | 0 || Q | QQ |
+//-         |  1  | 1-0 | 1 | 0 || 1 |  0 |
+//-         |  1  | 1-0 | 0 | 1 || 0 |  1 |
+//-         |  1  | 1-0 | 1 | 1 || TOGGLE |
+//-         |  1  |  1  | X | X || Q | QQ |
+//-         +-----+-----+---+---++---+----+
+//-
+static NETLIST_START(TTL_74113_DIP)
+	TTL_74113(A)
+	TTL_74113(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(    /*       +--------------+       */
+		 A.CLK, /*  CLK1 |1     ++    14| VCC   */ A.VCC,
+		   A.K, /*    K1 |2           13| CLK2  */ B.CLK,
+		   A.J, /*    J1 |3           12| K2    */ B.K,
+		A.SETQ, /*  PRQ1 |4   74113   11| J2    */ B.J,
+		   A.Q, /*    Q1 |5           10| PRQ2  */ B.SETQ,
+		  A.QQ, /*   QQ1 |6            9| Q2    */ B.Q,
+		 A.GND, /*   GND |7            8| QQ2   */ B.QQ
+				/*       +--------------+       */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74113A_DIP
+//- Title: DM54S113/DM74S113 Dual Negative-Edge-Triggered Master-Slave J-K Flip-Flops with Preset and Complementary Outputs
+//- Description: This device contains two independent negative-edge-triggered J-K flip-flops with complementary outputs.
+//-   The J and K data is processed by the flip-flops on the falling edge of the clock pulse.
+//-   The clock triggering occurs at a voltage level and is not directly related to the transition time of the negative going edge of the clock pulse.
+//-   Data on the J and K inputs may be changed while the clock is high or low without affecting the outputs as long as setup and hold times are not violated.
+//-   A low logic level on the preset input will set the outputs regardless of the logic levels of the other inputs.
+//- Pinalias: CLK1,K1,J1,PRQ1,Q1,QQ1,GND,QQ2,Q2,PRQ2,J2,K2,CLK2,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow Texas Instruments datasheet
+//- FunctionTable:
+//-   https://pdf1.alldatasheet.com/datasheet-pdf/view/131122/TI/SN74LS113A.html
+//-
+//-         +------+-----+---+---++---+----+
+//-         | PREQ | CLK | J | K || Q | QQ |
+//-         +======+=====+===+===++===+====+
+//-         |   0  |  X  | X | X || 1 |  0 |
+//-         |   1  | 1-0 | 0 | 0 || Q | QQ |
+//-         |   1  | 1-0 | 1 | 0 || 1 |  0 |
+//-         |   1  | 1-0 | 0 | 1 || 0 |  1 |
+//-         |   1  | 1-0 | 1 | 1 || TOGGLE |
+//-         |   1  |  1  | X | X || Q | QQ |
+//-         +------+-----+---+---++---+----+
+//-
+static NETLIST_START(TTL_74113A_DIP)
+	TTL_74113A(A)
+	TTL_74113A(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(    /*       +--------------+       */
+		 A.CLK, /*  CLK1 |1     ++    14| VCC   */ A.VCC,
+		   A.K, /*    K1 |2           13| CLK2  */ B.CLK,
+		   A.J, /*    J1 |3           12| K2    */ B.K,
+		A.SETQ, /*  PRQ1 |4   74113A  11| J2    */ B.J,
+		   A.Q, /*    Q1 |5           10| PRQ2  */ B.SETQ,
+		  A.QQ, /*   QQ1 |6            9| Q2    */ B.Q,
+		 A.GND, /*   GND |7            8| QQ2   */ B.QQ
+				/*       +--------------+       */
+	)
+NETLIST_END()
+
+//- Identifier:  TTL_74121_DIP
+//- Title: DM74121 One-Shot with Clear and Complementary Outputs
+//- Description: The DM74121 is a monostable multivibrator featuring both
+//-   positive and negative edge triggering with complementary
+//-   outputs. An internal 2kΩ timing resistor is provided for
+//-   design convenience minimizing component count and layout problems. this device can be used with a single external capacitor. Inputs (A) are active-LOW trigger transition
+//-   inputs and input (B) is and active-HIGH transition Schmitttrigger input that allows jitter-free triggering from inputs with
+//-   transition rates as slow as 1 volt/second. A high immunity
+//-   to VCC noise of typically 1.5V is also provided by internal
+//-   circuitry at the input stage.
+//-   To obtain optimum and trouble free operation please read
+//-   operating rules and one-shot application notes carefully
+//-   and observe recommendations.
+//-
+//- Pinalias: QQ,NC,A1,A2,B,Q,GND,NC,RINT,C,RC,NC,NC,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow Fairchild Semiconductor datasheet
+//- Limitations:
+//-    Timing inaccuracies may occur for capacitances < 1nF. Please consult datasheet
+//-
+//- Example: 74123.cpp,74123_example
+//-
+//- FunctionTable:
+//-    https://pdf1.alldatasheet.com/datasheet-pdf/view/50894/FAIRCHILD/74121.html
+//-
+static NETLIST_START(TTL_74121_DIP)
+	TTL_74121(A)
+	NC_PIN(NC)
+	RES(RINT, RES_K(2))
+	RES(RD, RES_M(1000))
+
+	NET_C(RINT.2, A.RC)
+	// Avoid error messages if RINT is not used.
+	NET_C(RINT.1, RD.2)
+	NET_C(RD.1, A.GND)
+
+	DIPPINS(    /*       +--------------+           */
+		  A.QQ, /*    QQ |1     ++    14| VCC       */ A.VCC,
+		  NC.I, /*    NC |2           13| NC        */ NC.I,
+		  A.A1, /*    A1 |3           12| NC        */ NC.I,
+		  A.A2, /*    A2 |4   74121   11| REXT/CEXT */ A.RC,
+		   A.B, /*     B |5           10| CEXT      */ A.C,
+		   A.Q, /*     Q |6            9| RINT      */ RINT.1,
+		 A.GND, /*   GND |7            8| NC        */ NC.I
+				/*       +--------------+           */
+	)
+NETLIST_END()
+
+//- Identifier:  TTL_74123_DIP
+//- Title: DM74123 Dual Retriggerable One-Shot with Clear and Complementary Outputs
+//- Description: The DM74123 is a dual retriggerable monostable multivibrator
+//-   capable of generating output pulses from a few
+//-   nano-seconds to extremely long duration up to 100% duty
+//-   cycle. Each device has three inputs permitting the choice of
+//-   either leading-edge or trailing edge triggering. Pin (A) is an
+//-   active-LOW transition trigger input and pin (B) is an activeHIGH transition trigger input. A LOW at the clear (CLR)
+//-   input terminates the output pulse: which also inhibits triggering. An internal connection from CLR to the input gate
+//-   makes it possible to trigger the circuit by a positive-going
+//-   signal on CLR as shown in the Truth Table.
+//-
+//-   To obtain the best and trouble free operation from this
+//-   device please read the Operating Rules as well as the
+//-   One–Shot Application Notes carefully and observe recommendations.
+//-
+//- Pinalias: A1,B1,CLRQ1,QQ1,Q2,C2,RC2,GND,A2,B2,CLRQ2,QQ2,Q1,C1,RC1,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow Fairchild Semiconductor datasheet
+//- Limitations:
+//-    Timing inaccuracies may occur for capacitances < 1nF. Please consult datasheet
+//-
+//- Example: 74123.cpp,74123_example
+//-
+//- FunctionTable:
+//-    https://pdf1.alldatasheet.com/datasheet-pdf/view/50893/FAIRCHILD/DM74123.html
+//-
+static NETLIST_START(TTL_74123_DIP)
+	TTL_74123(A)
+	TTL_74123(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(      /*       +--------------+ */
+			 A.A, /*    A1 |1     ++    16| VCC   */ A.VCC,
+			 A.B, /*    B1 |2           15| RC1   */ A.RC,
+		  A.CLRQ, /* CLRQ1 |3           14| C1    */ A.C,
+			A.QQ, /*   QQ1 |4   74123   13| Q1    */ A.Q,
+			 B.Q, /*    Q2 |5           12| QQ2   */ B.QQ,
+			 B.C, /*    C2 |6           11| CLRQ  */ B.CLRQ,
+			B.RC, /*   RC2 |7           10| B2    */ B.B,
+		   A.GND, /*   GND |8            9| A2    */ B.A
+				  /*       +--------------+       */
+	)
+NETLIST_END()
+
+//- Identifier:  TTL_74125_DIP
+//- Title: SN74125 QUADRUPLE BUS BUFFERS WITH 3-STATE OUTPUTS
+//- Description: These bus buffers feature three-state outputs
+//-    that, when enabled, have the low impedance characteristics of a
+//-    TTL output with additional drive capability at high logic levels
+//-    to permit driving heavily loaded bus lines without external
+//-    pullup resistors. When disabled, both output transistors are turned
+//-    off, presenting a high-impedance state to the bus so the output will
+//-    act neither as a significant load nor as a driver. The ’125 and
+//-    ’LS125A devices’ outputs are disabled when G is high.
+//-    The ’126 and ’LS126A devices’ outputs are disabled when G is low
+//-
+//- Pinalias: 1GQ,1A,1Y,2GQ,2A,2Y,GND,3Y,3A,3GQ,4Y,4A,4GQ,VCC
+//- Package: DIP
+//- Param: FORCE_TRISTATE_LOGIC
+//-    Set this parameter to 1 force tristate outputs into logic mode.
+//-    This should be done only if the device enable inputs are connected
+//-    in a way which always enables the device.
+//- NamingConvention: Naming conventions follow Texas instruments datasheet
+//- Limitations:
+//-    No limitations
+//-
+//- Example: 74125.cpp,74125_example
+//-
+//- FunctionTable:
+//-
+//-    | GQ  | A  | Y  |
+//-    |:---:|:--:|:--:|
+//-    |  L  |  L |  L |
+//-    |  L  |  H |  H |
+//-    |  H  |  X |  Z |
+//-
+static NETLIST_START(TTL_74125_DIP)
+	TTL_74125_GATE(A)
+	TTL_74125_GATE(B)
+	TTL_74125_GATE(C)
+	TTL_74125_GATE(D)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+
+	DEFPARAM(FORCE_TRISTATE_LOGIC, "$(@.A.FORCE_TRISTATE_LOGIC")
+	PARAM(A.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
+	PARAM(B.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
+	PARAM(C.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
+	PARAM(D.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
+
+	DIPPINS(   /*      +--------------+      */
+		 A.GQ, /*  1GQ |1     ++    14| VCC  */ A.VCC,
+		  A.A, /*   1A |2           13| 4GQ  */ D.GQ,
+		  A.Y, /*   1Y |3           12| 4A   */ D.A,
+		 B.GQ, /*  2GQ |4   74125   11| 4Y   */ D.Y,
+		  B.A, /*   2A |5           10| 3GQ  */ C.GQ,
+		  B.Y, /*   2Y |6            9| 3A   */ C.A,
+		A.GND, /*  GND |7            8| 3Y   */ C.Y
+			   /*      +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74126_DIP
+//- Title: DM74LS126A Quad 3-STATE Buffer
+//- Description: This device contains four independent gates each of which performs a non-inverting buffer function.
+//-   The outputs have the 3-STATE feature.
+//-   When enabled, the outputs exhibit the low impedance characteristics of a standard LS output with additional drive capability to permit the driving of buslines without external resistors.
+//-   When disabled, both the output transistors are turned OFF presenting a high-impedance state to the bus line.
+//-   Thus the output will act neither as a significant load nor as a driver.
+//-   To minimize the possibility that two outputs will attempt to take a common bus to opposite logic levels, the disable time is shorter than the enable time of the outputs.
+//- Pinalias: C1,A1,Y1,C2,A2,Y2,GND,Y3,A3,C3,Y4,A4,C4,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheets/50/232293_DS.pdf
+//-
+//-         +---+---++------+
+//-         | A | C ||   Y  |
+//-         +===+===++======+
+//-         | 0 | 1 ||   0  |
+//-         | 1 | 1 ||   1  |
+//-         | X | 0 || Hi-Z |
+//-         +---+---++------+
+//-
+static NETLIST_START(TTL_74126_DIP)
+	TTL_74126_GATE(A)
+	TTL_74126_GATE(B)
+	TTL_74126_GATE(C)
+	TTL_74126_GATE(D)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+
+	DEFPARAM(FORCE_TRISTATE_LOGIC, 0)
+	PARAM(A.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
+	PARAM(B.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
+	PARAM(C.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
+	PARAM(D.FORCE_TRISTATE_LOGIC, "$(@.FORCE_TRISTATE_LOGIC)")
+
+	DIPPINS(   /*      +--------------+      */
+		  A.G, /*   C1 |1     ++    14| VCC  */ A.VCC,
+		  A.A, /*   A1 |2           13| C4   */ D.G,
+		  A.Y, /*   Y1 |3           12| A4   */ D.A,
+		  B.G, /*   C2 |4   74126   11| Y4   */ D.Y,
+		  B.A, /*   A2 |5           10| C3   */ C.G,
+		  B.Y, /*   Y2 |6            9| A3   */ C.A,
+		A.GND, /*  GND |7            8| Y3   */ C.Y
+			   /*      +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74139_DIP
+//- Title: 54LS139/DM54LS139/DM74LS139 Decoders/Demultiplexers
+//- Description: These Schottky-clamped circuits are designed to be used in high-performance memory-decoding or data-routing applications, requiring very short propagation delay times.
+//-   In high-performance memory systems these decoders can be used to minimize the effects of system decoding.
+//-   When used with high-speed memories, the delay times of these decoders are usually less than the typical access time of the memory.
+//-   This means that the effective system delay introduced by the decoder is negligible.
+//-   The LS139 comprises two separate two-line-to-four-line decoders in a single package.
+//-   The active-low enable input can be used as a data line in demultiplexing applications.
+//-   All of these decoders/demultiplexers feature fully buffered inputs, presenting only one normalized load to its driving circuit.
+//    All inputs are clamped with high-performance Schottky diodes to suppress line-ringing and simplify system design.
+//- Pinalias: G1,A1,B1,1Y0,1Y1,1Y2,1Y3,GND,2Y3,2Y2,2Y1,2Y0,B2,A2,G2,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   pdf.datasheetcatalog.com/datasheets/166/375388_DS.pdf
+//-
+//-         +---+-------+-------------+
+//-         | E | A0 A1 | O0 O1 O2 O3 |
+//-         +===+=======+=============+
+//-         | 1 |  X  X |  1  1  1  1 |
+//-         | 0 |  0  0 |  0  1  1  1 |
+//-         | 0 |  1  0 |  1  0  1  1 |
+//-         | 0 |  0  1 |  1  1  0  1 |
+//-         | 0 |  1  1 |  1  1  1  0 |
+//-         +---+-------+-------------+
+//-
+static NETLIST_START(TTL_74139_DIP)
+	NET_REGISTER_DEV(TTL_74139_GATE, A)
+	NET_REGISTER_DEV(TTL_74139_GATE, B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(  /*       +--------------+      */
+		A.E,  /*   /Ea |1     ++    16| VCC  */ A.VCC,
+		A.A,  /*   A0a |2           15| /Eb  */ B.E,
+		A.B,  /*   A1a |3           14| A0b  */ B.A,
+		A.0,  /*  /O0a |4   74139   13| A1b  */ B.B,
+		A.1,  /*  /O1a |5           12| /O0b */ B.0,
+		A.2,  /*  /O2a |6           11| /O1b */ B.1,
+		A.3,  /*  /O3a |7           10| /O2b */ B.2,
+		A.GND,/*   GND |8            9| /O3b */ B.3
+			  /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74153_DIP
+//- Title: 54153/DM54153/DM74153 Dual 4-Line to 1-LineData Selectors/Multiplexers
+//- Description: Each of these data selectors/multiplexers contains inverters and drivers to supply fully complementary, on-chip, binary decoding data selection to the AND-OR-invert gates.
+//-   Separate strobe inputs are provided for each of the two four-line sections.
+//- Pinalias: G1,B,1C3,1C2,1C1,1C0,Y1,GND,Y2,2C0,2C1,2C2,2C3,A,G2,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006547.PDF
+//-
+//-         +---+---+----+----+----+----+---++---+
+//-         | B | A | C0 | C1 | C2 | C3 | G || Y |
+//-         +===+===+====+====+====+====+===++===+
+//-         | X | X |  X |  X |  X |  X | 1 || 0 |
+//-         | 0 | 0 |  0 |  X |  X |  X | 0 || 0 |
+//-         | 0 | 0 |  1 |  X |  X |  X | 0 || 1 |
+//-         | 0 | 1 |  X |  0 |  X |  X | 0 || 0 |
+//-         | 0 | 1 |  X |  1 |  X |  X | 0 || 1 |
+//-         | 1 | 0 |  X |  X |  0 |  X | 0 || 0 |
+//-         | 1 | 0 |  X |  X |  1 |  X | 0 || 1 |
+//-         | 1 | 1 |  X |  X |  X |  0 | 0 || 0 |
+//-         | 1 | 1 |  X |  X |  X |  1 | 0 || 1 |
+//-         +---+---+----+----+----+----+---++---+
+//-
+static NETLIST_START(TTL_74153_DIP)
+	NET_REGISTER_DEV(TTL_74153, A)
+	NET_REGISTER_DEV(TTL_74153, B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	NET_C(A.A, B.A)
+	NET_C(A.B, B.B)
+
+	DIPPINS(   /*     +--------------+     */
+		  A.G, /*  G1 |1     ++    16| VCC */ A.VCC,
+		  A.B, /*   B |2           15| G2  */ B.G,
+		 A.C3, /* 1C3 |3           14| A   */ A.A,
+		 A.C2, /* 1C2 |4   74153   13| 2C3 */ B.C3,
+		 A.C1, /* 1C1 |5           12| 2C2 */ B.C2,
+		 A.C0, /* 1C0 |6           11| 2C1 */ B.C1,
+		 A.AY, /*  Y1 |7           10| 2C0 */ B.C0,
+		A.GND, /* GND |8            9| Y2  */ B.AY
+			   /*     +--------------+     */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74155_DIP
+//- Title: 54LS155/DM54LS155/DM74LS155 Dual 2-Line to 4-Line Decoders/Demultiplexers
+//- Description: These TTL circuits feature dual 1-line-to-4-line demultiplexers with individual strobes and common binary-address inputs in a single 16-pin package.
+//-   When both sections are enabled by the strobes, the common address inputs sequentially select and route associated input data to the appropriate output of each section.
+//-   The individual strobes permit activating or inhibiting each of the 4-bit sections as desired.
+//-   Data applied to input C1 is inverted at its outputs anddata applied at C2 is true through its outputs.
+//-   The inverter following the C1 data input permits use as a 3-to-8-line decoder, or 1-to-8-line demultiplexer, without external gating.
+//-   Input clamping diodes are provided on these circuits to minimize transmission-line effects and simplify system design.
+//- Pinalias: C1,G1,B,1Y3,1Y2,1Y1,1Y0,GND,2Y0,2Y1,2Y2,2Y3,A,G2,C2,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006395.PDF
+//-
+//-              2-line-to-4-line decoder                        2-line-to-4-line decoder
+//-     +---+---+----+----++-----+-----+-----+-----+    +---+---+----+----++-----+-----+-----+-----+
+//-     | B | A | G1 | C1 || 1Y0 | 1Y1 | 1Y2 | 1Y3 |    | B | A | G2 | C2 || 2Y0 | 2Y1 | 2Y2 | 2Y3 |
+//-     +===+===+====+====++=====+=====+=====+=====+    +===+===+====+====++=====+=====+=====+=====+
+//-     | X | X |  1 |  X ||  1  |  1  |  1  |  1  |    | X | X |  1 |  X ||  1  |  1  |  1  |  1  |
+//-     | 0 | 0 |  0 |  1 ||  0  |  1  |  1  |  1  |    | 0 | 0 |  0 |  0 ||  0  |  1  |  1  |  1  |
+//-     | 0 | 1 |  0 |  1 ||  1  |  0  |  1  |  1  |    | 0 | 1 |  0 |  0 ||  1  |  0  |  1  |  1  |
+//-     | 1 | 0 |  0 |  1 ||  1  |  1  |  0  |  1  |    | 1 | 0 |  0 |  0 ||  1  |  1  |  0  |  1  |
+//-     | 1 | 1 |  0 |  1 ||  1  |  1  |  1  |  0  |    | 1 | 1 |  0 |  0 ||  1  |  1  |  1  |  0  |
+//-     | X | X |  X |  0 ||  1  |  1  |  1  |  1  |    | X | X |  X |  1 ||  1  |  1  |  1  |  1  |
+//-     +---+---+----+----++-----+-----+-----+-----+    +---+---+----+----++-----+-----+-----+-----+
+//-
+//-                          3-line-to-8-line decoder
+//-     +---+---+---+---++-----+-----+-----+-----+-----+-----+-----+-----+
+//-     | C | B | A | G || 2Y0 | 2Y1 | 2Y2 | 2Y3 | 1Y0 | 1Y1 | 1Y2 | 1Y3 |
+//-     +===+===+===+===++=====+=====+=====+=====+=====+=====+=====+=====+
+//-     | X | X | X | 1 ||  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |
+//-     | 0 | 0 | 0 | 0 ||  0  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |
+//-     | 0 | 0 | 1 | 0 ||  1  |  0  |  1  |  1  |  1  |  1  |  1  |  1  |
+//-     | 0 | 1 | 0 | 0 ||  1  |  1  |  0  |  1  |  1  |  1  |  1  |  1  |
+//-     | 0 | 1 | 1 | 0 ||  1  |  1  |  1  |  0  |  1  |  1  |  1  |  1  |
+//-     | 1 | 0 | 0 | 0 ||  1  |  1  |  1  |  1  |  0  |  1  |  1  |  1  |
+//-     | 1 | 0 | 1 | 0 ||  1  |  1  |  1  |  1  |  1  |  0  |  1  |  1  |
+//-     | 1 | 1 | 0 | 0 ||  1  |  1  |  1  |  1  |  1  |  1  |  0  |  1  |
+//-     | 1 | 1 | 1 | 0 ||  1  |  1  |  1  |  1  |  1  |  1  |  1  |  0  |
+//-     +---+---+---+---++-----+-----+-----+-----+-----+-----+-----+-----+
+//-
+static NETLIST_START(TTL_74155_DIP)
+	NET_REGISTER_DEV(TTL_74155A_GATE, A)
+	NET_REGISTER_DEV(TTL_74155B_GATE, B)
+
+	NET_C(A.A, B.A)
+	NET_C(A.B, B.B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.C, /*    C1 |1     ++    16| VCC  */ A.VCC,
+		  A.G, /*    G1 |2           15| B4   */ B.C,
+		  A.B, /*     B |3           14| B4   */ B.G,
+		  A.3, /*   1Y3 |4   74155   13| A4   */ B.A,
+		  B.2, /*   1Y2 |5           12| Y4   */ B.3,
+		  B.1, /*   1Y1 |6           11| B3   */ B.2,
+		  B.0, /*   1Y0 |7           10| A3   */ B.1,
+		A.GND, /*   GND |8            9| Y3   */ B.0
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74156_DIP
+//- Title: 54LS156/DM54LS156/DM74LS156 Dual 2-Line to 4-Line Decoders/Demultiplexers with Open-Collector Outputs
+//- Description: These TTL circuits feature dual 1-line-to-4-line demultiplexers with individual strobes and common binary-address inputs in a single 16-pin package.
+//-   When both sections are enabled by the strobes, the common address inputs sequentially select and route associated input data to the appropriate output of each section.
+//-   The individual strobes permit activating or inhibiting each of the 4-bit sections as desired.
+//-   Data applied to input C1 is inverted at its outputs anddata applied at C2 is true through its outputs.
+//-   The inverter following the C1 data input permits use as a 3-to-8-line decoder, or 1-to-8-line demultiplexer, without external gating.
+//-   Input clamping diodes are provided on these circuits to minimize transmission-line effects and simplify system design.
+//- Pinalias: C1,G1,B,1Y3,1Y2,1Y1,1Y0,GND,2Y0,2Y1,2Y2,2Y3,A,G2,C2,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006395.PDF
+//-
+//-              2-line-to-4-line decoder                        2-line-to-4-line decoder
+//-     +---+---+----+----++-----+-----+-----+-----+    +---+---+----+----++-----+-----+-----+-----+
+//-     | B | A | G1 | C1 || 1Y0 | 1Y1 | 1Y2 | 1Y3 |    | B | A | G2 | C2 || 2Y0 | 2Y1 | 2Y2 | 2Y3 |
+//-     +===+===+====+====++=====+=====+=====+=====+    +===+===+====+====++=====+=====+=====+=====+
+//-     | X | X |  1 |  X ||  1  |  1  |  1  |  1  |    | X | X |  1 |  X ||  1  |  1  |  1  |  1  |
+//-     | 0 | 0 |  0 |  1 ||  0  |  1  |  1  |  1  |    | 0 | 0 |  0 |  0 ||  0  |  1  |  1  |  1  |
+//-     | 0 | 1 |  0 |  1 ||  1  |  0  |  1  |  1  |    | 0 | 1 |  0 |  0 ||  1  |  0  |  1  |  1  |
+//-     | 1 | 0 |  0 |  1 ||  1  |  1  |  0  |  1  |    | 1 | 0 |  0 |  0 ||  1  |  1  |  0  |  1  |
+//-     | 1 | 1 |  0 |  1 ||  1  |  1  |  1  |  0  |    | 1 | 1 |  0 |  0 ||  1  |  1  |  1  |  0  |
+//-     | X | X |  X |  0 ||  1  |  1  |  1  |  1  |    | X | X |  X |  1 ||  1  |  1  |  1  |  1  |
+//-     +---+---+----+----++-----+-----+-----+-----+    +---+---+----+----++-----+-----+-----+-----+
+//-
+//-                          3-line-to-8-line decoder
+//-     +---+---+---+---++-----+-----+-----+-----+-----+-----+-----+-----+
+//-     | C | B | A | G || 2Y0 | 2Y1 | 2Y2 | 2Y3 | 1Y0 | 1Y1 | 1Y2 | 1Y3 |
+//-     +===+===+===+===++=====+=====+=====+=====+=====+=====+=====+=====+
+//-     | X | X | X | 1 ||  1  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |
+//-     | 0 | 0 | 0 | 0 ||  0  |  1  |  1  |  1  |  1  |  1  |  1  |  1  |
+//-     | 0 | 0 | 1 | 0 ||  1  |  0  |  1  |  1  |  1  |  1  |  1  |  1  |
+//-     | 0 | 1 | 0 | 0 ||  1  |  1  |  0  |  1  |  1  |  1  |  1  |  1  |
+//-     | 0 | 1 | 1 | 0 ||  1  |  1  |  1  |  0  |  1  |  1  |  1  |  1  |
+//-     | 1 | 0 | 0 | 0 ||  1  |  1  |  1  |  1  |  0  |  1  |  1  |  1  |
+//-     | 1 | 0 | 1 | 0 ||  1  |  1  |  1  |  1  |  1  |  0  |  1  |  1  |
+//-     | 1 | 1 | 0 | 0 ||  1  |  1  |  1  |  1  |  1  |  1  |  0  |  1  |
+//-     | 1 | 1 | 1 | 0 ||  1  |  1  |  1  |  1  |  1  |  1  |  1  |  0  |
+//-     +---+---+---+---++-----+-----+-----+-----+-----+-----+-----+-----+
+//-
+static NETLIST_START(TTL_74156_DIP)
+	NET_REGISTER_DEV(TTL_74156A_GATE, A)
+	NET_REGISTER_DEV(TTL_74156B_GATE, B)
+
+	NET_C(A.A, B.A)
+	NET_C(A.B, B.B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.C, /*    C1 |1     ++    16| VCC  */ A.VCC,
+		  A.G, /*    G1 |2           15| B4   */ B.C,
+		  A.B, /*     B |3           14| B4   */ B.G,
+		  A.3, /*   1Y3 |4   74156   13| A4   */ B.A,
+		  B.2, /*   1Y2 |5           12| Y4   */ B.3,
+		  B.1, /*   1Y1 |6           11| B3   */ B.2,
+		  B.0, /*   1Y0 |7           10| A3   */ B.1,
+		A.GND, /*   GND |8            9| Y3   */ B.0
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74157_DIP
+//- Title: 54157/DM54157/DM74157 Quad 2-Line to 1-Line Data Selectors/Multiplexers
+//- Description: These data selectors/multiplexers contain inverters and drivers to supply full on-chip data selection to the four output gates.
+//-   A separate strobe input is provided.
+//-   A 4-bit word is selected from one of two sources and is routed to the four outputs.
+//- Pinalias: S,A1,B1,Y1,A2,B2,Y2,GND,Y3,B3,A3,Y4,B4,A4,G,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheets/120/236599_DS.pdf
+//-
+//-     +---+---+---+---++---+
+//-     | G | S | A | B || Y |
+//-     +===+===+===+===++===+
+//-     | 1 | X | X | X || 0 |
+//-     | 0 | 0 | 0 | X || 0 |
+//-     | 0 | 0 | 1 | X || 1 |
+//-     | 0 | 1 | X | 0 || 0 |
+//-     | 0 | 1 | X | 1 || 1 |
+//-     +---+---+---+---++---+
+//-
+static NETLIST_START(TTL_74157_DIP)
+	NET_REGISTER_DEV(TTL_74157_GATE, A)
+	NET_REGISTER_DEV(TTL_74157_GATE, B)
+	NET_REGISTER_DEV(TTL_74157_GATE, C)
+	NET_REGISTER_DEV(TTL_74157_GATE, D)
+
+	NET_C(A.E, B.E, C.E, D.E)
+	NET_C(A.S, B.S, C.S, D.S)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.S, /*     S |1     ++    16| VCC  */ A.VCC,
+		  A.I, /*    A1 |2           15| G    */ A.E,
+		  A.J, /*    B1 |3           14| A4   */ D.I,
+		  A.O, /*    Y1 |4   74157   13| B4   */ D.J,
+		  B.I, /*    A2 |5           12| Y4   */ D.O,
+		  B.J, /*    B2 |6           11| A3   */ C.I,
+		  B.O, /*    Y2 |7           10| B3   */ C.J,
+		A.GND, /*   GND |8            9| Y3   */ C.O
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74161_DIP
+//- Title: DM54161/DM74161 Synchronous 4-Bit Counter
+//- Description: These synchronous, presettable counters feature an internal carry look-ahead for application in high-speed counting designs.
+//-   The 161 is a 4-bit binary counter.
+//-   The carry output is decoded by means of a NOR gate, thus preventing spikes during the normal counting mode of operation.
+//-   Synchronous operation is provided by having all flip-flops clocked simultaneously so that the outputs change co-incident with each other when so instructed by the count-enable inputs and internal gating.
+//-   This mode of operation eliminates the output counting spikes which are normally associated with asynchronous (ripple clock) counters.
+//-   A buffered clock input triggers the four flip-flops on the rising (positive-going) edge of the clock input waveform.
+//-   These counters are fully programmable; that is, the outputs may be preset to either level.
+//-   As presetting is synchronous, setting up a low level at the load input disables the counter and causes the outputs to agree with the setup data after the next clock pulse, regardless of the levels of the enable input.
+//-   The clear function for the 161 is asynchronous; and a low level at the clear input sets all four of the flip-flop outputs low, regardless of the levels of clock, load, or enable inputs.
+//-   The carry look-ahead circuitry provides for cascading counters for n-bit synchronous applications without additional gating.
+//-   Instrumental in accomplishing this function are two count-enable inputs and a ripple carry output.
+//-   Both count-enable inputs (P and T) must be high to count, and input T is fed forward to enable the ripple carry output.
+//-   The ripple carry output thus enabled will produce a high-level output pulse with a duration approximately equal to the high-level portion of the QA output.
+//-   This high-level overflow ripple carry pulse can be used to enable successive cascaded stages.
+//-   High-to-low-level transitions at the enable P or T inputs of the 161 may occur, regardless of the logic level on the clock.
+//- Pinalias: CLRQ,CLK,A,B,C,D,ENP,GND,LOADQ,ENT,QD,QC,QB,QA,RC,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006551.PDF
+//-
+static NETLIST_START(TTL_74161_DIP)
+	TTL_74161(A)
+
+	DIPPINS(    /*          +--------------+          */
+		A.CLRQ, /*   /CLEAR |1     ++    16| VCC      */ A.VCC,
+		 A.CLK, /*    CLOCK |2           15| RC       */ A.RC,
+		   A.A, /*        A |3           14| QA       */ A.QA,
+		   A.B, /*        B |4   74161   13| QB       */ A.QB,
+		   A.C, /*        C |5           12| QC       */ A.QC,
+		   A.D, /*        D |6           11| QD       */ A.QD,
+		 A.ENP, /* Enable P |7           10| Enable T */ A.ENT,
+		 A.GND, /*      GND |8            9| /LOAD    */ A.LOADQ
+				/*          +--------------+          */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74163_DIP
+//- Title: DM74163 Synchronous 4-Bit Counter
+//- Description: These synchronous, presettable counters feature an internal carry look-ahead for application in high-speed counting designs.
+//-   The 163 is a 4-bit binary counter.
+//-   The carry output is decoded by means of a NOR gate, thus preventing spikes during the normal counting mode of operation.
+//-   Synchronous operation is provided by having all flip-flops clocked simultaneously so that the outputs change co-incident with each other when so instructed by the count-enable inputs and internal gating.
+//-   This mode of operation eliminates the output counting spikes which are normally associated with asynchronous (ripple clock) counters.
+//-   A buffered clock input triggers the four flip-flops on the rising (positive-going) edge of the clock input waveform.
+//-   These counters are fully programmable; that is, the outputs may be preset to either level.
+//-   As presetting is synchronous, setting up a low level at the load input disables the counter and causes the outputs to agree with the setup data after the next clock pulse, regardless of the levels of the enable input.
+//-   The clear function for the 163 is synchronous; and a low level at the clear input sets all four of the flip-flop outputs low after the next clock pulse, regardless of the levels of the enable inputs.
+//-   This synchronous clear allows the count length to be modified easily, as decoding the maximum count desired can be  accomplished with one external NAND gate.
+//-   The gate output is connected to the clear input to synchronously clear the counter to all low outputs.
+//-   Low-to-high transitions at the clear input of the 163 are also permissible, regardless of the logic levels on the clock,enable, or load inputs.
+//-   The carry look-ahead circuitry provides for cascading counters for n-bit synchronous applications without additional gating.
+//-   Instrumental in accomplishing this function are two count-enable inputs and a ripple carry output.
+//-   Both count-enable inputs (P and T) must be high to count, and input T is fed forward to enable the ripple carry output.
+//-   The ripple carry output thus enabled will produce a high-level output pulse with a duration approximately equal to the high-level portion of the QA output.
+//-   This high-level overflow ripple carry pulse can be used to enable successive cascaded stages.
+//-   High-to-low-level transitions at the enable P or T inputs of the 163 may occur, regardless of the logic level on the clock.
+//- Pinalias: CLRQ,CLK,A,B,C,D,ENP,GND,LOADQ,ENT,QD,QC,QB,QA,RC,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006551.PDF
+//-
+static NETLIST_START(TTL_74163_DIP)
+	TTL_74163(A)
+
+	DIPPINS(    /*          +--------------+          */
+		A.CLRQ, /*   /CLEAR |1     ++    16| VCC      */ A.VCC,
+		 A.CLK, /*    CLOCK |2           15| RC       */ A.RC,
+		   A.A, /*        A |3           14| QA       */ A.QA,
+		   A.B, /*        B |4   74163   13| QB       */ A.QB,
+		   A.C, /*        C |5           12| QC       */ A.QC,
+		   A.D, /*        D |6           11| QD       */ A.QD,
+		 A.ENP, /* Enable P |7           10| Enable T */ A.ENT,
+		 A.GND, /*      GND |8            9| /LOAD    */ A.LOADQ
+				/*          +--------------+          */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74164_DIP
+//- Title: DM74164 8-Bit Serial In/Parallel Out Shift Registers
+//- Description: These 8-bit shift registers feature gated serial inputs and an asynchronous clear.
+//-   A LOW logic level at either serial input inhibits entry of the new data, and resets the first flip-flop to the LOW level at the next clock pulse, thus providing complete control over incoming data.
+//-   A HIGH logic level on either input enables the other input, which will then determine the state of the first flip-flop.
+//-   Data at the serial inputs may be changed while the clock is HIGH or LOW, but only information meeting the setup and hold time requirements will be entered.
+//-   Clocking occurs on the LOW-to-HIGH level transition of the clock input.
+//-   All inputs are diode-clamped to minimize transmission-line effects
+//- Pinalias: A,B,QA,QB,QC,QD,GND,CLOCK,CLEAR,QE,QF,QG,QH,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow Fairchild Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/fairchild/DM74164.pdf
+//-
+//-     +-------+-------+---+---++----+----+-----+----+
+//-     | CLEAR | CLOCK | A | B || QA | QB | ... | QH |
+//-     +=======+=======+===+===++====+====+=====+====+
+//-     |   0   |   X   | X | X ||  0 |  0 | ... |  0 |
+//-     |   1   |   0   | X | X || QA | QB | ... | QH |
+//-     |   1   |  0-1  | 1 | 1 ||  1 | QA | ... | QG |
+//-     |   1   |  0-1  | 0 | X ||  0 | QA | ... | QG |
+//-     |   1   |  0-1  | X | 0 ||  0 | QA | ... | QG |
+//-     +-------+-------+---+---++----+----+-----+----+
+//-
+static NETLIST_START(TTL_74164_DIP)
+	TTL_74164(A)
+
+	DIPPINS(    /*     +--------------+      */
+		   A.A, /*   A |1     ++    14| VCC  */ A.VCC,
+		   A.B, /*   B |2           13| QH   */ A.QH,
+		  A.QA, /*  QA |3           12| QG   */ A.QG,
+		  A.QB, /*  QB |4   74164   11| QF   */ A.QF,
+		  A.QC, /*  QC |5           10| QE   */ A.QE,
+		  A.QD, /*  QD |6            9| CLRQ */ A.CLRQ,
+		 A.GND, /* GND |7            8| CLK  */ A.CLK
+				/*     +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74165_DIP
+//- Title: 54165/DM74165 8-Bit Parallel-to-Serial Converter
+//- Description: The ’165 is an 8-bit parallel load or serial-in register with complementary outputs available from the last stage.
+//-   Parallel inputting occurs asynchronously when the Parallel Load (PL) input is LOW.
+//-   With PL HIGH, serial shifting occurs on the rising edge of the clock; new data enters via the Serial Data (DS) input.
+//-   The 2-input OR clock can be used to combine two independent clock sources, or one input can act as an active LOW clock enable.
+//- Pinalias: PLQ,CP1,P4,P5,P6,P7,QQ7,GND,Q7,DS,P0,P1,P2,P3,CP2,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS009782.PDF
+//-
+//-     +-----+-----+-----++----+----+----+----+----+----+----+----+
+//-     | PLQ | CP1 | CP2 || Q0 | Q1 | Q2 | Q3 | Q4 | Q5 | Q6 | Q7 |
+//-     +=====+=====+=====++====+====+====+====+====+====+====+====+
+//-     |  0  |  X  |  X  || P0 | P1 | P2 | P3 | P4 | P5 | P6 | P7 |
+//-     |  1  |  0  | 0-1 || DS | Q0 | Q1 | Q2 | Q3 | Q4 | Q5 | Q6 |
+//-     |  1  |  1  | 0-1 || Q0 | Q1 | Q2 | Q3 | Q4 | Q5 | Q6 | Q7 |
+//-     |  1  | 0-1 |  0  || DS | Q0 | Q1 | Q2 | Q3 | Q4 | Q5 | Q6 |
+//-     |  1  | 0-1 |  1  || Q0 | Q1 | Q2 | Q3 | Q4 | Q5 | Q6 | Q7 |
+//-     +-----+-----+-----++----+----+----+----+----+----+----+----+
+//-
+static NETLIST_START(TTL_74165_DIP)
+	TTL_74165(A)
+
+	DIPPINS(      /*      +--------------+      */
+		A.SH_LDQ, /*  PLQ |1     ++    16| VCC  */ A.VCC,
+		   A.CLK, /*  CP1 |2           15| CP2  */ A.CLKINH,
+			 A.E, /*   P4 |3           14| P3   */ A.D,
+			 A.F, /*   P5 |4    74165  13| P2   */ A.C,
+			 A.G, /*   P6 |5           12| P1   */ A.B,
+			 A.H, /*   P7 |6           11| P0   */ A.A,
+		   A.QHQ, /*  QQ7 |7           10| DS   */ A.SER,
+		   A.GND, /*  GND |8            9| Q7   */ A.QH
+				  /*      +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74166_DIP
+//- Title: DM74LS166 8-Bit Parallel-In/Serial-Out Shift Registers
+//- Description: These parallel-in or serial-in, serial-out shift registers feature gated clock inputs and an overriding clear input.
+//-   All inputs are buffered to lower the drive requirements to one normalized load, and input clamping diodes minimize switching transients to simplify system design.
+//-   The load mode is established by the shift/load input.
+//-   When high, this input enables the serial data input and couples the eight flip-flops for serial shifting with each clock pulse.
+//-   When low, the parallel (broadside) data inputs are enabled and synchronous loading occurs on the next clock pulse.
+//-   During parallel loading, serial data flow is inhibited.
+//-   Clocking is accomplished on the low-to-high-level edge of the clock pulse through a two-input NOR gate, permitting one input to be used as a clock-enable or clock-inhibit function.
+//-   Holding either of the clock inputs high inhibits clocking; holding either low enables the other clock input.
+//-   This allows the system clock to be free running, and the register can be stopped on command with the other clock input.
+//-   The clock-inhibit input should be changed to the high level only while the clock input is high.
+//-   A buffered, direct clear input overrides all other inputs, including the clock, and sets all flip-flops to zero.
+//- Pinalias: SER,A,B,C,D,CLKINH,CLK,GND,CLRQ,E,F,G,QH,H,SH/LDQ,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006400.PDF
+//-
+//-     +------+--------+--------+-----+-----+------++----+----+-----+----+
+//-     | CLRQ | SH/LDQ | CLKINH | CLK | SER | A..H || QA | QB | ... | QH |
+//-     +======+========+========+=====+=====+======++====+====+=====+====+
+//-     |   0  |    X   |    X   |  X  |  X  |   X  ||  0 |  0 | ... |  0 |
+//-     |   1  |    X   |    0   |  0  |  X  |   X  || QA | QB | ... | QH |
+//-     |   1  |    0   |    0   | 0-1 |  X  | a..h ||  a |  b | ... |  h |
+//-     |   1  |    1   |    0   | 0-1 |  1  |   X  ||  1 | QA | ... | QG |
+//-     |   1  |    1   |    0   | 0-1 |  0  |   X  ||  0 | QA | ... | QG |
+//-     |   1  |    X   |    1   | 0-1 |  X  |   X  || QA | QB | ... | QH |
+//-     +------+--------+--------+-----+-----+------++----+----+-----+----+
+//-
+static NETLIST_START(TTL_74166_DIP)
+	TTL_74166(A)
+
+	DIPPINS(      /*        +--------------+        */
+		   A.SER, /*    SER |1     ++    16| VCC    */ A.VCC,
+			 A.A, /*      A |2           15| SH/LDQ */ A.SH_LDQ,
+			 A.B, /*      B |3           14| H      */ A.H,
+			 A.C, /*      C |4    74166  13| QH     */ A.QH,
+			 A.D, /*      D |5           12| G      */ A.G,
+		A.CLKINH, /* CLKINH |6           11| F      */ A.F,
+		   A.CLK, /*    CLK |7           10| E      */ A.E,
+		   A.GND, /*    GND |8            9| CLRQ   */ A.CLRQ
+				  /*        +--------------+        */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74174_DIP
+//- Title: DM74174 Hex/Quad D-Type Flip-Flop with Clear
+//- Description: These positive-edge triggered flip-flops utilize TTL circuitry to implement D-type flip-flop logic.
+//-   All have a direct clear input.
+//-   Information at the D inputs meeting the setup and hold time requirements is transferred to the Q outputs on the positive-going edge of the clock pulse.
+//-   Clock triggering occurs at a particular voltage level and is not directly related to the transition time of the positive-going pulse.
+//-   When the clock input is at either the HIGH or LOW level, the D input signal has no effect at the output.
+//- Pinalias: CLRQ,Q1,D1,D2,Q2,D3,Q3,GND,CLK,Q4,D4,Q5,D5,Q6,D6,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow Fairchild Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/fairchild/DM74174.pdf
+//-
+//-     +------+-----+---++---+
+//-     | CLRQ | CLK | D || Q |
+//-     +======+=====+===++===+
+//-     |   0  |  X  | X || 0 |
+//-     |   1  | 0-1 | 1 || 1 |
+//-     |   1  | 0-1 | 0 || 0 |
+//-     |   1  |  0  | X || Q |
+//-     +------+-----+---++---+
+//-
+static NETLIST_START(TTL_74174_DIP)
+	TTL_74174(A)
+	TTL_74174(B)
+	TTL_74174(C)
+	TTL_74174(D)
+	TTL_74174(E)
+	TTL_74174(F)
+
+	DIPPINS(    /*      +--------------+      */
+		A.CLRQ, /* CLRQ |1     ++    16| VCC  */ A.VCC,
+		   A.Q, /*   Q1 |2           15| Q6   */ F.Q,
+		   A.D, /*   D1 |3           14| D6   */ F.D,
+		   B.D, /*   D2 |4   74174   13| D5   */ E.D,
+		   B.Q, /*   Q2 |5           12| Q5   */ E.Q,
+		   C.D, /*   D3 |6           11| D4   */ D.D,
+		   C.Q, /*   Q3 |7           10| Q4   */ D.Q,
+		 A.GND, /*  GND |8            9| CLK  */ A.CLK
+				/*      +--------------+      */
+	)
+NETLIST_END()
+
+//FIXME: add documentation
+static NETLIST_START(TTL_74175_DIP)
+	TTL_74175(A)
+
+	DIPPINS(    /*      +--------------+      */
+		A.CLRQ, /* CLRQ |1     ++    16| VCC  */ A.VCC,
+		A.Q1,   /*   Q1 |2           15| Q4   */ A.Q4,
+		A.Q1Q,  /*  Q1Q |3           14| Q4Q  */ A.Q4Q,
+		A.D1,   /*   D1 |4   74175   13| D4   */ A.D4,
+		A.D2,   /*   D2 |5           12| D3   */ A.D3,
+		A.Q2Q,  /*  Q2Q |6           11| Q3Q  */ A.Q3Q,
+		A.Q2,   /*   Q2 |7           10| Q3   */ A.Q3,
+		A.GND,  /*  GND |8            9| CLK  */ A.CLK
+				/*      +--------------+   */
+	)
+NETLIST_END()
+
+//FIXME: add documentation
+static NETLIST_START(TTL_74192_DIP)
+	TTL_74192(A)
+
+	DIPPINS(    /*      +--------------+        */
+		A.B,    /*    B |1     ++    16| VCC    */ A.VCC,
+		A.QB,   /*   QB |2           15| A      */ A.A,
+		A.QA,   /*   QA |3           14| CLEAR  */ A.CLEAR,
+		A.CD,   /*   CD |4    74192  13| BORROWQ*/ A.BORROWQ,
+		A.CU,   /*   CU |5           12| CARRYQ */ A.CARRYQ,
+		A.QC,   /*   QC |6           11| LOADQ  */ A.LOADQ,
+		A.QD,   /*   QD |7           10| C      */ A.C,
+		A.GND,  /*  GND |8            9| D      */ A.D
+				/*      +--------------+        */
+	)
+NETLIST_END()
+
+//FIXME: add documentation
+static NETLIST_START(TTL_74193_DIP)
+	TTL_74193(A)
+
+	DIPPINS(    /*      +--------------+        */
+		A.B,    /*    B |1     ++    16| VCC    */ A.VCC,
+		A.QB,   /*   QB |2           15| A      */ A.A,
+		A.QA,   /*   QA |3           14| CLEAR  */ A.CLEAR,
+		A.CD,   /*   CD |4    74192  13| BORROWQ*/ A.BORROWQ,
+		A.CU,   /*   CU |5           12| CARRYQ */ A.CARRYQ,
+		A.QC,   /*   QC |6           11| LOADQ  */ A.LOADQ,
+		A.QD,   /*   QD |7           10| C      */ A.C,
+		A.GND,  /*  GND |8            9| D      */ A.D
+				/*      +--------------+        */
+	)
+NETLIST_END()
+
+//FIXME: add documentation
+static NETLIST_START(TTL_74194_DIP)
+	TTL_74194(A)
+
+	DIPPINS(    /*        +--------------+     */
+		A.CLRQ, /*   CLRQ |1     ++    16| VCC */ A.VCC,
+		A.SRIN, /*   SRIN |2           15| QA  */ A.QA,
+		A.A,    /*      A |3           14| QB  */ A.QB,
+		A.B,    /*      B |4    74194  13| QC  */ A.QC,
+		A.C,    /*      C |5           12| QD  */ A.QD,
+		A.D,    /*      D |6           11| CLK */ A.CLK,
+		A.SLIN, /*   SLIN |7           10| S1  */ A.S1,
+		A.GND,  /*    GND |8            9| S0  */ A.S0
+				/*        +--------------+     */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74260_DIP
+//- Title: DM54LS260/DM74LS260 Dual 5-Input NOR Gate
+//- Description: This device contains two individual five input gates, each of which perform the logic NOR function.
+//- Pinalias: A1,B1,C1,A2,Q1,Q2,GND,B2,C2,D2,E2,D1,E1,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS009824.PDF
+//-
+//-     +---+---+---+---+---++---+
+//-     | A | B | C | D | E || Y |
+//-     +===+===+===+===+===++===+
+//-     | 0 | 0 | 0 | 0 | 0 || 1 |
+//-     | X | X | X | X | 1 || 0 |
+//-     | X | X | X | 1 | X || 0 |
+//-     | X | X | 1 | X | X || 0 |
+//-     | X | 1 | X | X | X || 0 |
+//-     | 1 | X | X | X | X || 0 |
+//-     +---+---+---+---+---++---+
+//-
+static NETLIST_START(TTL_74260_DIP)
+	TTL_74260_NOR(A)
+	TTL_74260_NOR(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.C, /*    C1 |1     ++    14| VCC  */ A.VCC,
+		  A.D, /*    D1 |2           13| B1   */ A.B,
+		  A.E, /*    E1 |3           12| A1   */ A.A,
+		  B.E, /*    E2 |4   74260   11| D2   */ B.D,
+		  A.Q, /*    Y1 |5           10| C2   */ B.C,
+		  B.Q, /*    Y2 |6            9| B2   */ B.B,
+		A.GND, /*   GND |7            8| A2   */ B.A
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74279_DIP
+//- Title: 54279/DM74279 Quad Set-Reset Latch
+//- Description: These latches are ideaily suited ·for use as temporary
+//-   storage of bfnary information between processing units
+//-   and I/O units. When either one of the data inputs is at
+//-   a low logic level, the output will follow the level of the
+//-   R input. When both data inputs are high, the output will
+//-   remain latched in its previous state. When both inputs
+//-   are low, the output will .go high. However, this high
+//-   level may not persist when either one of the data inputs
+//-   returns to the high state.
+//- Pinalias: 1RQ,1S1Q,1S2Q,1Q,2RQ,2SQ,2Q,GND,3Q,3RQ,3S1Q,3S2Q,4Q,4RQ,4SQ,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS009785.PDF
+//-
+//-     +-----+-----+----++---+
+//-     | S1Q | S2Q | RQ || Q |
+//-     +=====+=====+====++===+
+//-     |  0  |  0  |  0 || 1 | (as long as SQ1 or SQ2 are low)
+//-     |  0  |  X  |  1 || 1 |
+//-     |  X  |  0  |  1 || 1 |
+//-     |  1  |  1  |  0 || 0 |
+//-     |  1  |  1  |  1 || Q |
+//-     +-----+-----+----++---+
+//-
+#ifndef __PLIB_PREPROCESSOR__
+#if !NL_AUTO_DEVICES
+#define TTL_74279A(name)                                                         \
+		NET_REGISTER_DEV(TTL_74279A, name)
+#define TTL_74279B(name)                                                         \
+		NET_REGISTER_DEV(TTL_74279B, name)
+#endif
+#endif
+
+static NETLIST_START(TTL_74279_DIP)
+	TTL_74279B(A)
+	TTL_74279A(B)
+	TTL_74279B(C)
+	TTL_74279A(D)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+
+	DIPPINS(   /*      +--------------+      */
+		  A.R, /*  1RQ |1     ++    16| VCC  */ A.VCC,
+		 A.S1, /* 1S1Q |2           15| 4SQ  */ D.S,
+		 A.S2, /* 1S2Q |3           14| 4RQ  */ D.R,
+		  A.Q, /*   1Q |4    74279  13| 4Q   */ D.Q,
+		  B.R, /*  2RQ |5           12| 3S2Q */ C.S2,
+		  B.S, /*  2SQ |6           11| 3S1Q */ C.S1,
+		  B.Q, /*   2Q |7           10| 3RQ  */ C.R,
+		A.GND, /*  GND |8            9| 3Q   */ C.Q
+			   /*      +--------------+      */
+	)
+NETLIST_END()
+
+// FIXME: Documentation
+static NETLIST_START(TTL_74365_DIP)
+	TTL_74365(A)
+
+	DIPPINS(   /*      +--------------+     */
+		A.G1Q, /*  G1Q |1     ++    16| VCC */ A.VCC,
+		A.A1,  /*   A1 |2           15| G2Q */ A.G2Q,
+		A.Y1,  /*   Y1 |3           14| A6  */ A.A6,
+		A.A2,  /*   A2 |4    74365  13| Y6  */ A.Y6,
+		A.Y2,  /*   Y2 |5           12| A5  */ A.A5,
+		A.A3,  /*   A3 |6           11| Y5  */ A.Y5,
+		A.Y3,  /*   Y3 |7           10| A4  */ A.A4,
+		A.GND, /*  GND |8            9| Y4  */ A.Y4
+			   /*      +--------------+     */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74377_DIP
+//- Title: DM54LS377/DM74LS377 Octal D Flip-Flop with Common Enable and Clock
+//- Description: The ’LS377 is an 8-bit register built using advanced low power Schottky technology.
+//-   This register consists of eight D-type flip-flops with a buffered common clock and a buffered common input enable.
+//-   The device is packaged in the space-saving (0.3 inch row spacing) 20-pin package.
+//- Pinalias: EQ,Q0,D0,D1,Q1,Q2,D2,D3,Q3,GND,CP,Q4,D4,D5,Q5,Q6,D6,D7,Q7,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS009785.PDF
+//-
+//-     +----+-----+----++----+
+//-     | EQ |  CP | Dn || Qn |
+//-     +====+=====+====++====+
+//-     |  1 |  X  |  X || Qn |
+//-     |  0 | 0-1 |  1 ||  1 |
+//-     |  0 | 0-1 |  0 ||  0 |
+//-     +----+-----+----++----+
+//-
+static NETLIST_START(TTL_74377_DIP)
+	TTL_74377_GATE(A)
+	TTL_74377_GATE(B)
+	TTL_74377_GATE(C)
+	TTL_74377_GATE(D)
+	TTL_74377_GATE(E)
+	TTL_74377_GATE(F)
+	TTL_74377_GATE(G)
+	TTL_74377_GATE(H)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC, G.VCC, H.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND, G.GND, H.GND)
+	NET_C(A.CP, B.CP, C.CP, D.CP, E.CP, F.CP, G.CP, H.CP)
+	NET_C(A.E, B.E, C.E, D.E, E.E, F.E, G.E, H.E)
+
+	HINT(A.QQ, NC)
+	HINT(B.QQ, NC)
+	HINT(C.QQ, NC)
+	HINT(D.QQ, NC)
+	HINT(E.QQ, NC)
+	HINT(F.QQ, NC)
+	HINT(G.QQ, NC)
+	HINT(H.QQ, NC)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.E, /*    EQ |1     ++    20| VCC  */ A.VCC,
+		  A.Q, /*    Q0 |2           19| Q7   */ H.Q,
+		  A.D, /*    D0 |3           18| D7   */ H.D,
+		  B.D, /*    D1 |4   74377   17| D6   */ G.D,
+		  B.Q, /*    Q1 |5           16| Q6   */ G.Q,
+		  C.Q, /*    Q2 |6           15| Q5   */ F.Q,
+		  C.D, /*    D2 |7           14| D5   */ F.D,
+		  D.D, /*    D3 |8           13| D4   */ E.D,
+		  D.Q, /*    Q3 |9           12| Q4   */ E.Q,
+		A.GND, /*   GND |10          11| CP   */ A.CP
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74378_DIP
+//- Title: DM54LS378/DM74LS378 Parallel D Register with Enable
+//- Description: The ’LS378 is a 6-bit register with a buffered common enable.
+//-   This device is similar to the ’LS174, but with common Enable rather than common Master Reset.
+//- Pinalias: EQ,Q0,D0,D1,Q1,D2,Q2,GND,CP,Q3,D3,Q4,D4,D5,Q6,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS009832.PDF
+//-
+//-     +----+-----+----++----+
+//-     | EQ |  CP | Dn || Qn |
+//-     +====+=====+====++====+
+//-     |  1 |  X  |  X || Qn |
+//-     |  0 | 0-1 |  1 ||  1 |
+//-     |  0 | 0-1 |  0 ||  0 |
+//-     +----+-----+----++----+
+//-
+static NETLIST_START(TTL_74378_DIP)
+	TTL_74377_GATE(A)
+	TTL_74377_GATE(B)
+	TTL_74377_GATE(C)
+	TTL_74377_GATE(D)
+	TTL_74377_GATE(E)
+	TTL_74377_GATE(F)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC, E.VCC, F.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND, E.GND, F.GND)
+	NET_C(A.CP, B.CP, C.CP, D.CP, E.CP, F.CP)
+	NET_C(A.E, B.E, C.E, D.E, E.E, F.E)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.E, /*    EQ |1     ++    16| VCC  */ A.VCC,
+		  A.Q, /*    Q0 |2           15| Q5   */ F.Q,
+		  A.D, /*    D0 |3           14| D5   */ F.D,
+		  B.D, /*    D1 |4   74378   13| D4   */ E.D,
+		  B.Q, /*    Q1 |5           12| Q4   */ E.Q,
+		  C.D, /*    D2 |6           11| D3   */ D.D,
+		  C.Q, /*    Q2 |7           10| Q3   */ D.Q,
+		A.GND, /*   GND |8            9| CP   */ A.CP
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74379_DIP
+//- Title: 54LS379/DM74LS379 Quad Parallel Register with Enable
+//- Description: The LS379 is a 4-bit register with buffered common Enable.
+//-   This device is similar to the LS175 but features the common Enable rather than common Master Reset.
+//- Pinalias: EEQ,Q0,QQ0,D0,QQ1,Q1,GND,CP,Q2,QQ2,D2,D3,QQ3,Q3,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS009832.PDF
+//-
+//-     +----+-----+----++----+-----+
+//-     | EQ |  CP | Dn || Qn | QQn |
+//-     +====+=====+====++====+=====+
+//-     |  1 |  X  |  X || Qn | QQn |
+//-     |  0 | 0-1 |  1 ||  1 |  0  |
+//-     |  0 | 0-1 |  0 ||  0 |  1  |
+//-     +----+-----+----++----+-----+
+//-
+static NETLIST_START(TTL_74379_DIP)
+	TTL_74377_GATE(A)
+	TTL_74377_GATE(B)
+	TTL_74377_GATE(C)
+	TTL_74377_GATE(D)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+	NET_C(A.CP, B.CP, C.CP, D.CP)
+	NET_C(A.E, B.E, C.E, D.E)
+
+	DIPPINS(   /*       +--------------+      */
+		  A.E, /*    EQ |1     ++    16| VCC  */ A.VCC,
+		  A.Q, /*    Q0 |2           15| Q3   */ D.Q,
+		 A.QQ, /*   QQ0 |3           14| QQ3  */ D.QQ,
+		  A.D, /*    D0 |4   74379   13| D3   */ D.D,
+		  B.D, /*    D1 |5           12| D2   */ C.D,
+		 B.QQ, /*   QQ1 |6           11| QQ2  */ C.QQ,
+		  B.Q, /*    Q1 |7           10| Q2   */ C.Q,
+		A.GND, /*   GND |8            9| CP   */ A.CP
+			   /*       +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_74393_DIP
+//- Title: Dual 4-Bit Binary Counter
+//- Description: DM74LS393 Each of these monolithic circuits contains eight master-slave flip-flops and additional gating to implement two individual four-bit counters in a single package.
+//-   The ’LS393 comprises two independent four-bit binary counters each having a clear and a clock input.
+//-   N-bit binary counters can be implemented with each package providing the capability of divide-by-256.
+//-   The LS393 has parallel outputs from each counter stage so that any submultiple of the input count freqency is available for system-timing signals.
+//- Pinalias: 1A,1CLR,1QA,1QB,1QC,1QD,GND,2QD,2QC,2QB,2QA,2CLR,2A,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-   http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006434.PDF
+//-
+static NETLIST_START(TTL_74393_DIP)
+	TTL_74393(A)
+	TTL_74393(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(   /*      +--------------+      */
+		 A.CP, /*   1A |1    ++     14| VCC  */ A.VCC,
+		 A.MR, /* 1CLR |2           13| 2A   */ B.CP,
+		 A.Q0, /*  1QA |3           12| 2CLR */ B.MR,
+		 A.Q1, /*  1QB |4   74393   11| 2QA  */ B.Q0,
+		 A.Q2, /*  1QC |5           10| 2QB  */ B.Q1,
+		 A.Q3, /*  1QD |6            9| 2QC  */ B.Q2,
+		A.GND, /*  GND |7            8| 2QD  */ B.Q3
+			   /*      +--------------+      */
+	)
+NETLIST_END()
+
+//- Identifier: SN74LS629_DIP
+//- Title: SN74LS629 VOLTAGE-CONTROLLED OSCILLATORS
+//- Description: Please add a detailed description
+//-    FIXME: Missing description
+//-
+//- Pinalias: 2FC,1FC,1RNG,1CX1,1CX2,1ENQ,1Y,OSC_GND,GND,2Y,2ENQ,2CX2,2CX1,2RNG,OSC_VCC,VCC
+//- Package: DIP
+//- Param: A.CAP
+//-    Capacitor value of capacitor connected to 1CX1 and 1CX2 pins
+//- Param: B.CAP
+//-    Capacitor value of capacitor connected to 2CX1 and 2CX2 pins
+//- Limitations:
+//-    The capacitor inputs are NC. Capacitor values need to be specified as
+//-    ```
+//-    SN74LS629_DIP(X)
+//-    PARAM(X.A.CAP, CAP_U(1))
+//-    PARAM(X.B.CAP, CAP_U(2))
+//-    ```
+//-
+//- Example: 74ls629.cpp,74ls629_example
+//-
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheets/400/335051_DS.pdf
+//-
+static NETLIST_START(SN74LS629_DIP)
+	SN74LS629(A, CAP_U(1))
+	SN74LS629(B, CAP_U(1))
+
+	NET_C(A.GND, B.GND)
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.OSCGND, B.OSCGND)
+	NET_C(A.OSCVCC, B.OSCVCC)
+	NC_PIN(NC)
+
+	DIPPINS(   /*          +--------------+         */
+		 B.FC, /*      2FC |1     ++    16| VCC     */ A.VCC,
+		 A.FC, /*      1FC |2           15| OSC VCC */ A.OSCVCC,
+		A.RNG, /*     1RNG |3           14| 2RNG    */ B.RNG,
+		 NC.I, /*     1CX1 |4  74LS629  13| 2CX1    */ NC.I,
+		 NC.I, /*     1CX2 |5           12| 2CX2    */ NC.I,
+		A.ENQ, /*     1ENQ |6           11| 2ENQ    */ B.ENQ,
+		  B.Y, /*       1Y |7           10| 2Y      */ B.Y,
+	 A.OSCGND, /*  OSC GND |8            9| GND     */ A.GND
+			   /*          +--------------+         */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_9310_DIP
+//- Title: DM9310/DM8310 Synchronous 4-Bit Decade Counter
+//- Description: These synchronous, presettable counters feature an
+//-   internal carry look-ahead for application in high-speed
+//-   counting designs. The DM9310/DM8310 are decade
+//-   counters. The carry output is decoded by means of a
+//-   NOR gate, thus preventing spikes during the normal
+//-   counting mode of operation. Synchronous operation
+//-   is provided by having all flip-flops clocked simultaneously
+//-   so that the outputs change coincident with each
+//-   other when so instructed by the count-enable inputs
+//-   and internal gating. This mode of operation eliminates
+//-   the output counting spikes which are normally
+//-   associated with asynchronous (ripple clock) counters.
+//-   A buffered clock input triggers the four flip-flops on
+//-   the rising (positive-going) edge of the clock input
+//-   waveform.
+//-
+//-   These counters are fully programmable; that is, the
+//-   outputs may be preset to either level. As presetting is
+//-   synchronous, setting up a low level at the load input
+//-   disables the counter and causes the outputs to agree
+//-   with the setup data after the next clock pulse regardless
+//-   of the levels of the enable input. Low-to-high transitions
+//-   at the· load input are perfectly acceptable regardless of
+//-   the logic levels on the clock or enable inputs. The clear
+//-   function is asynchronous and a low level at the clear
+//-   input sets all four of the flip-flop outputs low regardless
+//-   of the levels of clock, load, or enable inputs.
+//-
+//-   The carry look-ahead circuitry provides for cascading
+//-   counters for n-bit synchronous applications without
+//-   additional gating. Instrumental in accomplishing this
+//-   function are two count-enable inputs and a ripple carry
+//-   output. Both count-enable inputs (P and T) must be
+//-   high to count, and input T is fed-forward to enable the
+//-   ripple carry output. The ripple carry output thus
+//-   enabled will produce a high-level output pulse with a
+//-   duration approximately equal to the high-level portion
+//-   of the QA output. This high-level overflow ripply carry
+//-   pulse can be used to enable successive cascaded stages.
+//-   High-to-Low level transitions at the enable P or T inputs
+//-   may occur regardless of the logic level in the clock.
+//- Pinalias: CLEARQ,CLOCK,A,B,C,D,ENABLEP,GND,LOADQ,ENABLET,QD,QC,QB,QA,RC,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    https://ia800608.us.archive.org/5/items/bitsavers_nationaldaTTLDatabook_40452765/1976_National_TTL_Databook.pdf
+//-
+static NETLIST_START(TTL_9310_DIP)
+	TTL_9310(A)
+
+	DIPPINS(    /*          +--------------+          */
+		A.CLRQ, /*   /CLEAR |1     ++    16| VCC      */ A.VCC,
+		 A.CLK, /*    CLOCK |2           15| RC       */ A.RC,
+		   A.A, /*        A |3           14| QA       */ A.QA,
+		   A.B, /*        B |4    9310   13| QB       */ A.QB,
+		   A.C, /*        C |5           12| QC       */ A.QC,
+		   A.D, /*        D |6           11| QD       */ A.QD,
+		 A.ENP, /* Enable P |7           10| Enable T */ A.ENT,
+		 A.GND, /*      GND |8            9| /LOAD    */ A.LOADQ
+				/*          +--------------+          */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_9312_DIP
+//- Title: DM9312/DM8312 One of Eight Line Data Selectors/Multiplexers
+//- Description: These data selectors/multiplexers contain inverter/
+//-   drivers to supply full complementary, on-chip, binary
+//-   decoded data selection to the AND-OR-INVERT gates.
+//-
+//-   The DM9312/8312 is a single 8-bit multiplexer with
+//-   complementary outputs and a strobe control. When the
+//-   strobe is low, the function is enabled. When a high logic
+//-   level is applied to the strobe, the outputs are latched.
+//- Pinalias: D0,D1,D2,D3,D4,D5,D6,GND,D7,G,A,B,C,YQ,Y,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DM9312.pdf
+//-
+//-     +---+---+---+---++----+-----+
+//-     | C | B | A | G ||  Y |  YQ |
+//-     +===+===+===+===++====+=====+
+//-     | X | X | X | 1 ||  0 |  1  |
+//-     | 0 | 0 | 0 | 0 || D0 | D0Q |
+//-     | 0 | 0 | 1 | 0 || D1 | D1Q |
+//-     | 0 | 1 | 0 | 0 || D2 | D2Q |
+//-     | 0 | 1 | 1 | 0 || D3 | D3Q |
+//-     | 1 | 0 | 0 | 0 || D4 | D4Q |
+//-     | 1 | 0 | 1 | 0 || D5 | D5Q |
+//-     | 1 | 1 | 0 | 0 || D6 | D6Q |
+//-     | 1 | 1 | 1 | 0 || D7 | D7Q |
+//-     +---+---+---+---++----+-----+
+//-
+static NETLIST_START(TTL_9312_DIP)
+	TTL_9312(A)
+
+	DIPPINS(   /*     +--------------+     */
+		 A.D0, /*  D0 |1     ++    16| VCC */ A.VCC,
+		 A.D1, /*  D1 |2           15| Y   */ A.Y,
+		 A.D2, /*  D2 |3           14| YQ  */ A.YQ,
+		 A.D3, /*  D3 |4    9312   13| C   */ A.C,
+		 A.D4, /*  D4 |5           12| B   */ A.B,
+		 A.D5, /*  D5 |6           11| A   */ A.A,
+		 A.D6, /*  D6 |7           10| G   */ A.G, //Strobe
+		A.GND, /* GND |8            9| D7  */ A.D7
+			   /*     +--------------+     */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_9316_DIP
+//- Title: DM9316/DM8316 Synchronous 4-Bit Counters
+//- Description: These synchronous, presettable counters feature an
+//-   internal carry look-ahead for application in high-speed
+//-   counting designs. The DM9316/DM8316 are 4-bit binary
+//-   counters. The carry output is decoded by means of a
+//-   NOR gate, thus preventing spikes during the normal
+//-   counting mode of operation. Synchronous operation
+//-   is provided by having all flip-flops clocked simultaneously
+//-   so that the outputs change coincident with each
+//-   other when so instructed by the count-enable inputs
+//-   and internal gating. This mode of operation eliminates
+//-   the output counting spikes which are normally
+//-   associated with asynchronous (ripple clock) counters.
+//-   A buffered clock input triggers the four flip-flops on
+//-   the rising (positive-going) edge of the clock input
+//-   waveform.
+//-
+//-   These counters are fully programmable; that is, the
+//-   outputs may be preset to either level. As presetting is
+//-   synchronous, setting up a low level at the load input
+//-   disables the counter and causes the outputs to agree
+//-   with the setup data after the next clock pulse regardless
+//-   of the levels of the enable input. Low-to-high transitions
+//-   at the· load input are perfectly acceptable regardless of
+//-   the logic levels on the clock or enable inputs. The clear
+//-   function is asynchronous and a low level at the clear
+//-   input sets all four of the flip-flop outputs low regardless
+//-   of the levels of clock, load, or enable inputs.
+//-
+//-   The carry look-ahead circuitry provides for cascading
+//-   counters for n-bit synchronous applications without
+//-   additional gating. Instrumental in accomplishing this
+//-   function are two count-enable inputs and a ripple carry
+//-   output. Both count-enable inputs (P and T) must be
+//-   high to count, and input T is fed-forward to enable the
+//-   ripple carry output. The ripple carry output thus
+//-   enabled will produce a high-level output pulse with a
+//-   duration approximately equal to the high-level portion
+//-   of the QA output. This high-level overflow ripply carry
+//-   pulse can be used to enable successive cascaded stages.
+//-   High-to-Low level transitions at the enable P or T inputs
+//-   may occur regardless of the logic level in the clock.
+//- Pinalias: CLEARQ,CLOCK,A,B,C,D,ENABLEP,GND,LOADQ,ENABLET,QD,QC,QB,QA,RC,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006606.PDF
+//-
+static NETLIST_START(TTL_9316_DIP)
+	TTL_9316(A)
+
+	DIPPINS(    /*          +--------------+          */
+		A.CLRQ, /*   CLEARQ |1     ++    16| VCC      */ A.VCC,
+		 A.CLK, /*    CLOCK |2           15| RC       */ A.RC,
+		   A.A, /*        A |3           14| QA       */ A.QA,
+		   A.B, /*        B |4    9316   13| QB       */ A.QB,
+		   A.C, /*        C |5           12| QC       */ A.QC,
+		   A.D, /*        D |6           11| QD       */ A.QD,
+		 A.ENP, /* Enable P |7           10| Enable T */ A.ENT,
+		 A.GND, /*      GND |8            9| LOADQ    */ A.LOADQ
+				/*          +--------------+          */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_9322_DIP
+//- Title: DM9322/DM8322 Quad 2-Line to 1-Line Data Selectors/Multiplexers
+//- Description: These data selectors/multiplexers contain inverters and
+//-   drivers to supply full on-chip data selection to the four
+//-   output gates. A separate strobe input is provided. A
+//-   4-bit word is selected from one of two sources and is
+//-   routed to the four outputs. True data is presented
+//-   at the outputs.
+//- Pinalias: SELECT,A1,B1,Y1,A2,B2,Y2,GND,Y3,B3,A3,Y4,B4,A4,STROBE,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//- FunctionTable:
+//-    http://pdf.datasheetcatalog.com/datasheet/nationalsemiconductor/DS006606.PDF
+//-
+static NETLIST_START(TTL_9322_DIP)
+	TTL_9322(A)
+
+	DIPPINS(      /*        +--------------+        */
+		 A.SELECT, /* SELECT |1     ++    16| VCC    */ A.VCC,
+			 A.A1, /*     A1 |2           15| STROBE */ A.STROBE,
+			 A.B1, /*     B1 |3           14| A4     */ A.A4,
+			 A.Y1, /*     Y1 |4    9322   13| B4     */ A.B4,
+			 A.A2, /*     A2 |5           12| Y4     */ A.Y4,
+			 A.B2, /*     B2 |6           11| A3     */ A.A3,
+			 A.Y2, /*     Y2 |7           10| B3     */ A.B3,
+			A.GND, /*    GND |8            9| Y3     */ A.Y3
+				  /*        +--------------+        */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_9321_DIP
+//- Title: DM9321/DM8321 Dual 4-Line to 1-Line Data Selectors/Multiplexers
+//- Pinalias: AE,AA0,AA1,AD0,AD1,AD2,AD3,GND,BD3,BD2,BD1,BD0,BA1,BA0,BE,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow National Semiconductor datasheet
+//-
+static NETLIST_START(TTL_9321_DIP)
+	TTL_9321(A)
+	TTL_9321(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(      /*        +--------------+        */
+			 A.E, /*     /E |1     ++    16| VCC    */ A.VCC,
+			A.A0, /*     A0 |2           15| /E     */ B.E,
+			A.A1, /*     A1 |3           14| A0     */ B.A0,
+			A.D0, /*    /D0 |4    9321   13| A1     */ B.A1,
+			A.D1, /*    /D1 |5           12| /D0    */ B.D0,
+			A.D2, /*    /D2 |6           11| /D1    */ B.D1,
+			A.D3, /*    /D3 |7           10| /D2    */ B.D2,
+		   A.GND, /*    GND |8            9| /D3    */ B.D3
+				  /*        +--------------+        */
+	)
+NETLIST_END()
+
+//- Identifier: TTL_9602_DIP
+//- Title: DM9602/DM6802 Dual Retriggerable, Resettable One Shots
+//- Description: These dual resettable, retriggerable one shots have two
+//-   inputs per function; one which is active high, and one
+//-   which is active low. This allows the designer to employ
+//-   either leading-edge or trailing-edge triggering, which is
+//-   independent of input transition times. When input con·
+//-   ditions for triggering are met, a new cycle starts and the
+//-   external capacitor is allowed to rapidly discharge and
+//-   then charge again. The retriggerable feature permits
+//-   output pulse widths to be extended. In fact a continuous
+//-   true output can be maintained by having an input cycle
+//-   time which is shorter than the output cycle time. The
+//-   output pulse may then be terminated at any time by
+//-   applying a low logic level to the RESET pin. Retriggering
+//-   may be inhibited by either connecting the Q output to
+//-   an active high input, or the Q output to an active
+//-   low input.
+//- Pinalias: C1,RC1,CLRQ1,B1,A1,Q1,QQ1,GND,QQ2,Q2,A2,B2,CLRQ2,RC2,C2,VCC
+//- Package: DIP
+//- NamingConvention: Naming conventions follow Fairchild Semiconductor datasheet
+//- Limitations:
+//-    Timing inaccuracies may occur for capacitances < 1nF. Please consult datasheet
+//-
+//- Example: 74123.cpp,74123_example
+//-
+//- FunctionTable:
+//-    https://pdf1.alldatasheet.com/datasheet-pdf/view/51137/FAIRCHILD/DM9602.html
+//-
+static NETLIST_START(TTL_9602_DIP)
+	TTL_9602(A)
+	TTL_9602(B)
+
+	NET_C(A.VCC, B.VCC)
+	NET_C(A.GND, B.GND)
+
+	DIPPINS(    /*       +--------------+ */
+		   A.C, /*    C1 |1     ++    16| VCC   */ A.VCC,
+		  A.RC, /*   RC1 |2           15| C2    */ B.C,
+		A.CLRQ, /* CLRQ1 |3           14| RC2   */ B.RC,
+		   A.B, /*    B1 |4    9602   13| CLRQ2 */ B.CLRQ,
+		   A.A, /*    A1 |5           12| B2    */ B.B,
+		   A.Q, /*    Q1 |6           11| A2    */ B.A,
+		  A.QQ, /*   QQ1 |7           10| Q2    */ B.Q,
+		 A.GND, /*   GND |8            9| QQ2   */ B.QQ
+				/*       +--------------+       */
+	)
+NETLIST_END()
+
+
+NETLIST_START(ttl74xx_lib)
+	NET_MODEL("DM7414         SCHMITT_TRIGGER(VTP=1.7 VTM=0.9 VI=4.35 RI=6.15k VOH=3.5 ROH=120 VOL=0.1 ROL=37.5 TPLH=15 TPHL=15)")
+	NET_MODEL("TTL_7414_GATE  SCHMITT_TRIGGER(VTP=1.7 VTM=0.9 VI=4.35 RI=6.15k VOH=3.5 ROH=120 VOL=0.1 ROL=37.5 TPLH=15 TPHL=15)")
+	NET_MODEL("DM74LS14       SCHMITT_TRIGGER(VTP=1.6 VTM=0.8 VI=4.4 RI=19.3k VOH=3.45 ROH=130 VOL=0.1 ROL=31.2 TPLH=15 TPHL=15)")
+	//NET_MODEL("DM7414 FAMILY(IVL=0.16 IVH=0.4 OVL=0.1 OVH=0.05 ORL=10.0 ORH=1.0e8)")
+
+
+	TRUTHTABLE_START(TTL_7400_NAND, 2, 1, "+A,+B,@VCC,@GND")
+		TT_HEAD("A,B|Q ")
+		TT_LINE("0,X|1|22")
+		TT_LINE("X,0|1|22")
+		TT_LINE("1,1|0|15")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7402_NOR, 2, 1, "+A,+B,@VCC,@GND")
+		TT_HEAD("A,B|Q ")
+		TT_LINE("0,0|1|22")
+		TT_LINE("X,1|0|15")
+		TT_LINE("1,X|0|15")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7404_INVERT, 1, 1, "+A,@VCC,@GND")
+		TT_HEAD(" A | Q ")
+		TT_LINE(" 0 | 1 |22")
+		TT_LINE(" 1 | 0 |15")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7406_GATE, 1, 1, "")
+		TT_HEAD("A|Y ")
+		TT_LINE("0|1|15")
+		TT_LINE("1|0|23")
+		/* Open Collector */
+		TT_FAMILY("74XXOC")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7407_GATE, 1, 1, "")
+		TT_HEAD("A|Y ")
+		TT_LINE("0|0|15")
+		TT_LINE("1|1|23")
+		/* Open Collector */
+		TT_FAMILY("74XXOC")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7408_GATE, 2, 1, "")
+		TT_HEAD("A,B|Q ")
+		TT_LINE("0,X|0|15")
+		TT_LINE("X,0|0|15")
+		TT_LINE("1,1|1|22")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7408_AND, 2, 1, "+A,+B,@VCC,@GND")
+		TT_HEAD("A,B|Q ")
+		TT_LINE("0,X|0|15")
+		TT_LINE("X,0|0|15")
+		TT_LINE("1,1|1|22")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7410_NAND, 3, 1, "+A,+B,+C,@VCC,@GND")
+		TT_HEAD("A,B,C|Q ")
+		TT_LINE("0,X,X|1|22")
+		TT_LINE("X,0,X|1|22")
+		TT_LINE("X,X,0|1|22")
+		TT_LINE("1,1,1|0|15")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7410_GATE, 3, 1, "")
+		TT_HEAD("A,B,C|Q ")
+		TT_LINE("0,X,X|1|22")
+		TT_LINE("X,0,X|1|22")
+		TT_LINE("X,X,0|1|22")
+		TT_LINE("1,1,1|0|15")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7411_AND, 3, 1, "+A,+B,+C,@VCC,@GND")
+		TT_HEAD("A,B,C|Q ")
+		TT_LINE("0,X,X|0|15")
+		TT_LINE("X,0,X|0|15")
+		TT_LINE("X,X,0|0|15")
+		TT_LINE("1,1,1|1|22")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7411_GATE, 3, 1, "")
+		TT_HEAD("A,B,C|Q ")
+		TT_LINE("0,X,X|0|15")
+		TT_LINE("X,0,X|0|15")
+		TT_LINE("X,X,0|0|15")
+		TT_LINE("1,1,1|1|22")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7416_GATE, 1, 1, "")
+		TT_HEAD(" A | Q ")
+		TT_LINE(" 0 | 1 |15")
+		TT_LINE(" 1 | 0 |23")
+		/* Open Collector */
+		TT_FAMILY("74XXOC")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7420_NAND, 4, 1, "+A,+B,+C,+D,@VCC,@GND")
+		TT_HEAD("A,B,C,D|Q ")
+		TT_LINE("0,X,X,X|1|22")
+		TT_LINE("X,0,X,X|1|22")
+		TT_LINE("X,X,0,X|1|22")
+		TT_LINE("X,X,X,0|1|22")
+		TT_LINE("1,1,1,1|0|15")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7421_AND, 4, 1, "+A,+B,+C,+D,@VCC,@GND")
+		TT_HEAD("A,B,C,D|Q ")
+		TT_LINE("0,X,X,X|0|22")
+		TT_LINE("X,0,X,X|0|22")
+		TT_LINE("X,X,0,X|0|22")
+		TT_LINE("X,X,X,0|0|22")
+		TT_LINE("1,1,1,1|1|15")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7425_NOR, 4, 1, "+A,+B,+C,+D,@VCC,@GND")
+		TT_HEAD("A,B,C,D|Q ")
+		TT_LINE("1,X,X,X|0|15")
+		TT_LINE("X,1,X,X|0|15")
+		TT_LINE("X,X,1,X|0|15")
+		TT_LINE("X,X,X,1|0|15")
+		TT_LINE("0,0,0,0|1|22")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7427_NOR, 3, 1, "+A,+B,+C,@VCC,@GND")
+		TT_HEAD("A,B,C|Q ")
+		TT_LINE("1,X,X|0|15")
+		TT_LINE("X,1,X|0|15")
+		TT_LINE("X,X,1|0|15")
+		TT_LINE("0,0,0|1|22")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7430_NAND, 8, 1, "+A,+B,+C,+D,+E,+F,+G,+H,@VCC,@GND")
+		TT_HEAD("A,B,C,D,E,F,G,H|Q ")
+		TT_LINE("0,X,X,X,X,X,X,X|1|22")
+		TT_LINE("X,0,X,X,X,X,X,X|1|22")
+		TT_LINE("X,X,0,X,X,X,X,X|1|22")
+		TT_LINE("X,X,X,0,X,X,X,X|1|22")
+		TT_LINE("X,X,X,X,0,X,X,X|1|22")
+		TT_LINE("X,X,X,X,X,0,X,X|1|22")
+		TT_LINE("X,X,X,X,X,X,0,X|1|22")
+		TT_LINE("X,X,X,X,X,X,X,0|1|22")
+		TT_LINE("1,1,1,1,1,1,1,1|0|15")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7432_OR, 2, 1, "+A,+B,@VCC,@GND")
+		TT_HEAD("A,B|Q ")
+		TT_LINE("1,X|1|22")
+		TT_LINE("X,1|1|22")
+		TT_LINE("0,0|0|15")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7442, 4, 10, "")
+		TT_HEAD("D,C,B,A|0,1,2,3,4,5,6,7,8,9")
+		TT_LINE("0,0,0,0|0,1,1,1,1,1,1,1,1,1|30,30,30,30,30,30,30,30,30,30")
+		TT_LINE("0,0,0,1|1,0,1,1,1,1,1,1,1,1|30,30,30,30,30,30,30,30,30,30")
+		TT_LINE("0,0,1,0|1,1,0,1,1,1,1,1,1,1|30,30,30,30,30,30,30,30,30,30")
+		TT_LINE("0,0,1,1|1,1,1,0,1,1,1,1,1,1|30,30,30,30,30,30,30,30,30,30")
+		TT_LINE("0,1,0,0|1,1,1,1,0,1,1,1,1,1|30,30,30,30,30,30,30,30,30,30")
+		TT_LINE("0,1,0,1|1,1,1,1,1,0,1,1,1,1|30,30,30,30,30,30,30,30,30,30")
+		TT_LINE("0,1,1,0|1,1,1,1,1,1,0,1,1,1|30,30,30,30,30,30,30,30,30,30")
+		TT_LINE("0,1,1,1|1,1,1,1,1,1,1,0,1,1|30,30,30,30,30,30,30,30,30,30")
+		TT_LINE("1,0,0,0|1,1,1,1,1,1,1,1,0,1|30,30,30,30,30,30,30,30,30,30")
+		TT_LINE("1,0,0,1|1,1,1,1,1,1,1,1,1,0|30,30,30,30,30,30,30,30,30,30")
+		TT_LINE("1,0,1,X|1,1,1,1,1,1,1,1,1,1|30,30,30,30,30,30,30,30,30,30")
+		TT_LINE("1,1,X,X|1,1,1,1,1,1,1,1,1,1|30,30,30,30,30,30,30,30,30,30")
+	TRUTHTABLE_END()
+
+	/*  FIXME: Same as 7400, but drains higher output currents.
+	 *         Netlist currently does not model over currents (should it ever?)
+	 */
+
+	TRUTHTABLE_START(TTL_7437_NAND, 2, 1, "+A,+B")
+		TT_HEAD("A,B|Q ")
+		TT_LINE("0,X|1|22")
+		TT_LINE("X,0|1|22")
+		TT_LINE("1,1|0|15")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_7486_XOR, 2, 1, "+A,+B,@VCC,@GND")
+		TT_HEAD("A,B|Q ")
+		TT_LINE("0,0|0|15")
+		TT_LINE("0,1|1|22")
+		TT_LINE("1,0|1|22")
+		TT_LINE("1,1|0|15")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+
+	TRUTHTABLE_START(TTL_74139_GATE, 3, 4, "")
+		TT_HEAD("E,A,B|0,1,2,3")
+		TT_LINE("1,X,X|1,1,1,1|14")
+		TT_LINE("0,0,0|0,1,1,1|14")
+		TT_LINE("0,0,1|1,0,1,1|14")
+		TT_LINE("0,1,0|1,1,0,1|14")
+		TT_LINE("0,1,1|1,1,1,0|14")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_74155A_GATE, 4, 4, "")
+		TT_HEAD("B,A,G,C|0,1,2,3")
+		TT_LINE("X,X,1,X|1,1,1,1|13,13,13,13")
+		TT_LINE("X,X,0,0|1,1,1,1|13,13,13,13")
+		TT_LINE("0,0,0,1|0,1,1,1|13,13,13,13")
+		TT_LINE("0,1,0,1|1,0,1,1|13,13,13,13")
+		TT_LINE("1,0,0,1|1,1,0,1|13,13,13,13")
+		TT_LINE("1,1,0,1|1,1,1,0|13,13,13,13")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_74155B_GATE, 4, 4, "")
+		TT_HEAD("B,A,G,C|0,1,2,3")
+		TT_LINE("X,X,1,X|1,1,1,1|13,13,13,13")
+		TT_LINE("X,X,0,1|1,1,1,1|13,13,13,13")
+		TT_LINE("0,0,0,0|0,1,1,1|13,13,13,13")
+		TT_LINE("0,1,0,0|1,0,1,1|13,13,13,13")
+		TT_LINE("1,0,0,0|1,1,0,1|13,13,13,13")
+		TT_LINE("1,1,0,0|1,1,1,0|13,13,13,13")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_74156A_GATE, 4, 4, "")
+		TT_HEAD("B,A,G,C|0,1,2,3")
+		TT_LINE("X,X,1,X|1,1,1,1|13,13,13,13")
+		TT_LINE("X,X,0,0|1,1,1,1|13,13,13,13")
+		TT_LINE("0,0,0,1|0,1,1,1|13,13,13,13")
+		TT_LINE("0,1,0,1|1,0,1,1|13,13,13,13")
+		TT_LINE("1,0,0,1|1,1,0,1|13,13,13,13")
+		TT_LINE("1,1,0,1|1,1,1,0|13,13,13,13")
+		TT_FAMILY("74XXOC")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_74156B_GATE, 4, 4, "")
+		TT_HEAD("B,A,G,C|0,1,2,3")
+		TT_LINE("X,X,1,X|1,1,1,1|13,13,13,13")
+		TT_LINE("X,X,0,1|1,1,1,1|13,13,13,13")
+		TT_LINE("0,0,0,0|0,1,1,1|13,13,13,13")
+		TT_LINE("0,1,0,0|1,0,1,1|13,13,13,13")
+		TT_LINE("1,0,0,0|1,1,0,1|13,13,13,13")
+		TT_LINE("1,1,0,0|1,1,1,0|13,13,13,13")
+		TT_FAMILY("74XXOC")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_74157_GATE, 4, 4, "")
+		TT_HEAD("E,S,I,J|O")
+		TT_LINE("1,X,X,X|0|14")
+		TT_LINE("0,1,X,0|0|14")
+		TT_LINE("0,1,X,1|1|14")
+		TT_LINE("0,0,0,X|0|14")
+		TT_LINE("0,0,1,X|1|14")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_74260_NOR, 5, 1, "+A,+B,+C,+D,+E,@VCC,@GND")
+		TT_HEAD("A,B,C,D,E|Q")
+		TT_LINE("0,0,0,0,0|1|10")
+		TT_LINE("X,X,X,X,1|0|12")
+		TT_LINE("X,X,X,1,X|0|12")
+		TT_LINE("X,X,1,X,X|0|12")
+		TT_LINE("X,1,X,X,X|0|12")
+		TT_LINE("1,X,X,X,X|0|12")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	// FIXME: We need "private" devices
+	TRUTHTABLE_START(TTL_74279A, 3, 1, "")
+		TT_HEAD("S,R,_Q|Q")
+		TT_LINE("0,X,X|1|22")
+		TT_LINE("1,0,X|0|27")
+		TT_LINE("1,1,0|0|27")
+		TT_LINE("1,1,1|1|22")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_74279B, 4, 1, "")
+		TT_HEAD("S1,S2,R,_Q|Q")
+		TT_LINE("0,X,X,X|1|22")
+		TT_LINE("X,0,X,X|1|22")
+		TT_LINE("1,1,0,X|0|27")
+		TT_LINE("1,1,1,0|0|27")
+		TT_LINE("1,1,1,1|1|22")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	TRUTHTABLE_START(TTL_9312, 12, 2, "+A,+B,+C,+G,+D0,+D1,+D2,+D3,+D4,+D5,+D6,+D7,@VCC,@GND")
+		TT_HEAD(" C, B, A, G,D0,D1,D2,D3,D4,D5,D6,D7| Y,YQ")
+		TT_LINE(" X, X, X, 1, X, X, X, X, X, X, X, X| 0, 1|33,19")
+		TT_LINE(" 0, 0, 0, 0, 0, X, X, X, X, X, X, X| 0, 1|33,28")
+		TT_LINE(" 0, 0, 0, 0, 1, X, X, X, X, X, X, X| 1, 0|33,28")
+		TT_LINE(" 0, 0, 1, 0, X, 0, X, X, X, X, X, X| 0, 1|33,28")
+		TT_LINE(" 0, 0, 1, 0, X, 1, X, X, X, X, X, X| 1, 0|33,28")
+		TT_LINE(" 0, 1, 0, 0, X, X, 0, X, X, X, X, X| 0, 1|33,28")
+		TT_LINE(" 0, 1, 0, 0, X, X, 1, X, X, X, X, X| 1, 0|33,28")
+		TT_LINE(" 0, 1, 1, 0, X, X, X, 0, X, X, X, X| 0, 1|33,28")
+		TT_LINE(" 0, 1, 1, 0, X, X, X, 1, X, X, X, X| 1, 0|33,28")
+		TT_LINE(" 1, 0, 0, 0, X, X, X, X, 0, X, X, X| 0, 1|33,28")
+		TT_LINE(" 1, 0, 0, 0, X, X, X, X, 1, X, X, X| 1, 0|33,28")
+		TT_LINE(" 1, 0, 1, 0, X, X, X, X, X, 0, X, X| 0, 1|33,28")
+		TT_LINE(" 1, 0, 1, 0, X, X, X, X, X, 1, X, X| 1, 0|33,28")
+		TT_LINE(" 1, 1, 0, 0, X, X, X, X, X, X, 0, X| 0, 1|33,28")
+		TT_LINE(" 1, 1, 0, 0, X, X, X, X, X, X, 1, X| 1, 0|33,28")
+		TT_LINE(" 1, 1, 1, 0, X, X, X, X, X, X, X, 0| 0, 1|33,28")
+		TT_LINE(" 1, 1, 1, 0, X, X, X, X, X, X, X, 1| 1, 0|33,28")
+		TT_FAMILY("74XX")
+	TRUTHTABLE_END()
+
+	LOCAL_LIB_ENTRY(TTL_7400_DIP)
+	LOCAL_LIB_ENTRY(TTL_7402_DIP)
+	LOCAL_LIB_ENTRY(TTL_7404_DIP)
+	LOCAL_LIB_ENTRY(TTL_7406_DIP)
+	LOCAL_LIB_ENTRY(TTL_7407_DIP)
+	LOCAL_LIB_ENTRY(TTL_7408_DIP)
+	LOCAL_LIB_ENTRY(TTL_7410_DIP)
+	LOCAL_LIB_ENTRY(TTL_7411_DIP)
+	LOCAL_LIB_ENTRY(TTL_7414_GATE)
+	LOCAL_LIB_ENTRY(TTL_74LS14_GATE)
+	LOCAL_LIB_ENTRY(TTL_7414_DIP)
+	LOCAL_LIB_ENTRY(TTL_74LS14_DIP)
+	LOCAL_LIB_ENTRY(TTL_7416_DIP)
+	LOCAL_LIB_ENTRY(TTL_7420_DIP)
+	LOCAL_LIB_ENTRY(TTL_7421_DIP)
+	LOCAL_LIB_ENTRY(TTL_7425_DIP)
+	LOCAL_LIB_ENTRY(TTL_7427_DIP)
+	LOCAL_LIB_ENTRY(TTL_7430_DIP)
+	LOCAL_LIB_ENTRY(TTL_7432_DIP)
+	LOCAL_LIB_ENTRY(TTL_7437_DIP)
+	LOCAL_LIB_ENTRY(TTL_7442_DIP)
+	LOCAL_LIB_ENTRY(TTL_7448_DIP)
+	LOCAL_LIB_ENTRY(TTL_7450_DIP)
+	LOCAL_LIB_ENTRY(TTL_7473_DIP)
+	LOCAL_LIB_ENTRY(TTL_7473A_DIP)
+	LOCAL_LIB_ENTRY(TTL_7474_DIP)
+	LOCAL_LIB_ENTRY(TTL_7475_DIP)
+	LOCAL_LIB_ENTRY(TTL_7477_DIP)
+	LOCAL_LIB_ENTRY(TTL_7483_DIP)
+	LOCAL_LIB_ENTRY(TTL_7485_DIP)
+	LOCAL_LIB_ENTRY(TTL_7486_DIP)
+	LOCAL_LIB_ENTRY(TTL_7490_DIP)
+	LOCAL_LIB_ENTRY(TTL_7492_DIP)
+	LOCAL_LIB_ENTRY(TTL_7493_DIP)
+	LOCAL_LIB_ENTRY(TTL_7497_DIP)
+	LOCAL_LIB_ENTRY(TTL_74107_DIP)
+	LOCAL_LIB_ENTRY(TTL_74107A_DIP)
+	LOCAL_LIB_ENTRY(TTL_74113_DIP)
+	LOCAL_LIB_ENTRY(TTL_74113A_DIP)
+	LOCAL_LIB_ENTRY(TTL_74121_DIP)
+	LOCAL_LIB_ENTRY(TTL_74123_DIP)
+	LOCAL_LIB_ENTRY(TTL_9602_DIP)
+	LOCAL_LIB_ENTRY(TTL_74125_DIP)
+	LOCAL_LIB_ENTRY(TTL_74126_DIP)
+	LOCAL_LIB_ENTRY(TTL_74139_DIP)
+	LOCAL_LIB_ENTRY(TTL_74153_DIP)
+	LOCAL_LIB_ENTRY(TTL_74155_DIP)
+	LOCAL_LIB_ENTRY(TTL_74156_DIP)
+	LOCAL_LIB_ENTRY(TTL_74157_DIP)
+	LOCAL_LIB_ENTRY(TTL_74161_DIP)
+	LOCAL_LIB_ENTRY(TTL_74163_DIP)
+	LOCAL_LIB_ENTRY(TTL_74164_DIP)
+	LOCAL_LIB_ENTRY(TTL_74165_DIP)
+	LOCAL_LIB_ENTRY(TTL_74166_DIP)
+	LOCAL_LIB_ENTRY(TTL_74174_DIP)
+	LOCAL_LIB_ENTRY(TTL_74175_DIP)
+	LOCAL_LIB_ENTRY(TTL_74192_DIP)
+	LOCAL_LIB_ENTRY(TTL_74193_DIP)
+	LOCAL_LIB_ENTRY(TTL_74194_DIP)
+	LOCAL_LIB_ENTRY(TTL_74260_DIP)
+	LOCAL_LIB_ENTRY(TTL_74279_DIP)
+	LOCAL_LIB_ENTRY(TTL_74365_DIP)
+	LOCAL_LIB_ENTRY(TTL_74377_DIP)
+	LOCAL_LIB_ENTRY(TTL_74378_DIP)
+	LOCAL_LIB_ENTRY(TTL_74379_DIP)
+	LOCAL_LIB_ENTRY(TTL_74393_DIP)
+	LOCAL_LIB_ENTRY(SN74LS629_DIP)
+	LOCAL_LIB_ENTRY(TTL_9312_DIP)
+	LOCAL_LIB_ENTRY(TTL_9310_DIP)
+	LOCAL_LIB_ENTRY(TTL_9316_DIP)
+	LOCAL_LIB_ENTRY(TTL_9321_DIP)
+	LOCAL_LIB_ENTRY(TTL_9322_DIP)
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx_lib.h mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx_lib.h
--- mame-0.222+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx_lib.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/macro/nlm_ttl74xx_lib.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,316 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#ifndef NLM_TTL74XX_H_
+#define NLM_TTL74XX_H_
+
+///
+/// \file nlm_ttl74xx.h
+///
+
+#include "netlist/nl_setup.h"
+
+#ifndef __PLIB_PREPROCESSOR__
+
+/* ----------------------------------------------------------------------------
+ *  Netlist Macros
+ * ---------------------------------------------------------------------------*/
+
+#if !NL_AUTO_DEVICES
+
+#define TTL_7400_NAND(...)                                                     \
+	NET_REGISTER_DEVEXT(TTL_7400_NAND, __VA_ARGS__)
+
+#define TTL_7400_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7400_DIP, name)
+
+
+#define TTL_7402_NOR(...)                                                     \
+	NET_REGISTER_DEVEXT(TTL_7402_NOR, __VA_ARGS__)
+
+#define TTL_7402_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7402_DIP, name)
+
+#define TTL_7404_INVERT(...)                                                     \
+	NET_REGISTER_DEVEXT(TTL_7404_INVERT, __VA_ARGS__)
+
+#define TTL_7404_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7404_DIP, name)
+
+
+#define TTL_7406_GATE(name)                                                    \
+		NET_REGISTER_DEV(TTL_7406_GATE, name)
+
+#define TTL_7406_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7406_DIP, name)
+
+
+#define TTL_7407_GATE(name)                                                    \
+		NET_REGISTER_DEV(TTL_7407_GATE, name)
+
+#define TTL_7407_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7407_DIP, name)
+
+
+#define TTL_7408_AND(...)                                                      \
+	NET_REGISTER_DEVEXT(TTL_7408_AND, __VA_ARGS__)
+
+#define TTL_7408_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7408_DIP, name)
+
+
+#define TTL_7410_NAND(...)                                                     \
+	NET_REGISTER_DEVEXT(TTL_7410_NAND, __VA_ARGS__)
+
+#define TTL_7410_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7410_DIP, name)
+
+
+#define TTL_7411_AND(...)                                                      \
+	NET_REGISTER_DEVEXT(TTL_7411_AND, __VA_ARGS__)
+
+#define TTL_7411_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7411_DIP, name)
+
+
+#define TTL_7414_GATE(name)                                                    \
+		NET_REGISTER_DEV(TTL_7414_GATE, name)
+
+#define TTL_7414_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7414_DIP, name)
+
+
+#define TTL_74LS14_GATE(name)                                                  \
+		NET_REGISTER_DEV(TTL_74LS14_GATE, name)
+
+#define TTL_74LS14_DIP(name)                                                   \
+		NET_REGISTER_DEV(TTL_74LS14_DIP, name)
+
+
+#define TTL_7416_GATE(name)                                                    \
+		NET_REGISTER_DEV(TTL_7416_GATE, name)
+
+#define TTL_7416_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7416_DIP, name)
+
+
+#define TTL_7420_NAND(...)                                                     \
+	NET_REGISTER_DEVEXT(TTL_7420_NAND, __VA_ARGS__)
+
+#define TTL_7420_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7420_DIP, name)
+
+
+#define TTL_7421_AND(...)                                                      \
+	NET_REGISTER_DEVEXT(TTL_7421_AND, __VA_ARGS__)
+
+#define TTL_7421_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7421_DIP, name)
+
+
+#define TTL_7425_NOR(...)                                                      \
+	NET_REGISTER_DEVEXT(TTL_7425_NOR, __VA_ARGS__)
+
+#define TTL_7425_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7425_DIP, name)
+
+
+#define TTL_7427_NOR(...)                                                      \
+	NET_REGISTER_DEVEXT(TTL_7427_NOR, __VA_ARGS__)
+
+#define TTL_7427_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7427_DIP, name)
+
+
+#define TTL_7430_NAND(...)                                                      \
+	NET_REGISTER_DEVEXT(TTL_7430_NAND, __VA_ARGS__)
+
+#define TTL_7430_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7430_DIP, name)
+
+
+#define TTL_7432_OR(...)                                                       \
+	NET_REGISTER_DEVEXT(TTL_7432_OR, __VA_ARGS__)
+
+#define TTL_7432_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7432_DIP, name)
+
+
+#define TTL_7437_NAND(...)                                                     \
+	NET_REGISTER_DEVEXT(TTL_7437_NAND, __VA_ARGS__)
+
+#define TTL_7437_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7437_DIP, name)
+
+
+#define TTL_7442_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7442_DIP, name)
+
+#define TTL_7448_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7448_DIP, name)
+
+#define TTL_7450_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7450_DIP, name)
+
+#define TTL_7473_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7473_DIP, name)
+
+#define TTL_7473A_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_7473A_DIP, name)
+
+#define TTL_7474_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7474_DIP, name)
+
+#define TTL_7475_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7475_DIP, name)
+
+#define TTL_7477_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7477_DIP, name)
+
+#define TTL_7483_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7483_DIP, name)
+
+#define TTL_7485_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7485_DIP, name)
+
+#define TTL_7486_XOR(...)                                                      \
+	NET_REGISTER_DEVEXT(TTL_7486_XOR, __VA_ARGS__)
+
+#define TTL_7486_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7486_DIP, name)
+
+#define TTL_7490_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7490_DIP, name)
+
+#define TTL_7492_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7492_DIP, name)
+
+#define TTL_7493_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7493_DIP, name)
+
+#define TTL_7497_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_7497_DIP, name)
+
+#define TTL_74107_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74107_DIP, name)
+
+#define TTL_74107A_DIP(name)                                                   \
+		NET_REGISTER_DEV(TTL_74107A_DIP, name)
+
+#define TTL_74113_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74113_DIP, name)
+
+#define TTL_74113A_DIP(name)                                                   \
+		NET_REGISTER_DEV(TTL_74113A_DIP, name)
+
+#define TTL_74121_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74121_DIP, name)
+
+#define TTL_74123_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74123_DIP, name)
+
+#define TTL_9602_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_9602_DIP, name)
+
+#define TTL_74125_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74125_DIP, name)
+
+#define TTL_74139_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74139_DIP, name)
+
+#define TTL_74153_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74153_DIP, name)
+
+#define TTL_74155_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74155_DIP, name)
+
+#define TTL_74156_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74156_DIP, name)
+
+#define TTL_74157_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74157_DIP, name)
+
+#define TTL_74161_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_74161_DIP, name)
+
+#define TTL_74163_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_74163_DIP, name)
+
+#define TTL_74164_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_74164_DIP, name)
+
+#define TTL_74165_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_74165_DIP, name)
+
+#define TTL_74166_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_74166_DIP, name)
+
+#define TTL_74174_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_74174_DIP, name)
+
+#define TTL_74175_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_74175_DIP, name)
+
+#define TTL_74192_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_74192_DIP, name)
+
+#define TTL_74193_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_74193_DIP, name)
+
+#define TTL_74194_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_74194_DIP, name)
+
+#define TTL_74260_NOR(...)                                                     \
+	NET_REGISTER_DEVEXT(TTL_74260_NOR, __VA_ARGS__)
+
+#define TTL_74260_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74260_DIP, name)
+
+#define TTL_74279_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74279_DIP, name)
+
+#define TTL_74365_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_74365_DIP, name)
+
+#define TTL_74377_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74377_DIP, name)
+
+#define TTL_74378_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74378_DIP, name)
+
+#define TTL_74379_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74379_DIP, name)
+
+#define TTL_74393_DIP(name)                                                    \
+		NET_REGISTER_DEV(TTL_74393_DIP, name)
+
+#define TTL_9312(...)                                                          \
+		NET_REGISTER_DEVEXT(TTL_9312, __VA_ARGS__)
+
+#define TTL_9312_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_9312_DIP, name)
+
+#define TTL_9310_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_9310_DIP, name)
+
+#define TTL_9316_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_9316_DIP, name)
+
+#define TTL_9321_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_9321_DIP, name)
+
+#define TTL_9322_DIP(name)                                                     \
+		NET_REGISTER_DEV(TTL_9322_DIP, name)
+
+#endif // NL_AUTO_DEVICES
+
+/* ----------------------------------------------------------------------------
+ *  External declarations
+ * ---------------------------------------------------------------------------*/
+
+// moved to net_lib.h
+
+#endif // __PLIB_PREPROCESSOR__
+
+
+#endif // NLM_TTL74XX
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/nl_base.cpp mame-0.224+dfsg.1/src/lib/netlist/nl_base.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/nl_base.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/nl_base.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,17 +1,18 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 
+#include "macro/nlm_base_lib.h"
 #include "solver/nld_matrix_solver.h"
 #include "solver/nld_solver.h"
 
 #include "plib/palloc.h"
+#include "plib/pdynlib.h"
 #include "plib/pfmtlog.h"
 #include "plib/pmempool.h"
 #include "plib/putil.h"
 
+#include "core/setup.h"
 #include "devices/nlid_proxy.h"
-#include "devices/nlid_system.h"
-#include "macro/nlm_base.h"
 #include "nl_base.h"
 
 #include "nl_errstr.h"
@@ -25,54 +26,15 @@
 	// callbacks_t
 	// ----------------------------------------------------------------------------------------
 
-	host_arena::unique_ptr<plib::dynlib_base> callbacks_t:: static_solver_lib() const
+	std::unique_ptr<plib::dynlib_base> callbacks_t:: static_solver_lib() const
 	{
-		return plib::make_unique<plib::dynlib_static, host_arena>(nullptr);
+		return std::make_unique<plib::dynlib_static>(nullptr);
 	}
 
 	// ----------------------------------------------------------------------------------------
 	// queue_t
 	// ----------------------------------------------------------------------------------------
 
-	detail::queue_t::queue_t(netlist_t &nl, const pstring &name)
-		: timed_queue<plib::pqentry_t<netlist_time_ext, net_t *>, false>(config::MAX_QUEUE_SIZE::value)
-		, netlist_object_t(nl, name)
-		, m_qsize(0)
-		, m_times(config::MAX_QUEUE_SIZE::value)
-		, m_net_ids(config::MAX_QUEUE_SIZE::value)
-	{
-	}
-
-	void detail::queue_t::register_state(plib::state_manager_t &manager, const pstring &module)
-	{
-		//state().log().debug("register_state\n");
-		manager.save_item(this, m_qsize, module + "." + "qsize");
-		manager.save_item(this, &m_times[0], module + "." + "times", m_times.size());
-		manager.save_item(this, &m_net_ids[0], module + "." + "names", m_net_ids.size());
-	}
-
-	void detail::queue_t::on_pre_save(plib::state_manager_t &manager)
-	{
-		plib::unused_var(manager);
-		m_qsize = this->size();
-		for (std::size_t i = 0; i < m_qsize; i++ )
-		{
-			m_times[i] =  this->listptr()[i].exec_time().as_raw();
-			m_net_ids[i] = state().find_net_id(this->listptr()[i].object());
-		}
-	}
-
-	void detail::queue_t::on_post_load(plib::state_manager_t &manager)
-	{
-		plib::unused_var(manager);
-		this->clear();
-		for (std::size_t i = 0; i < m_qsize; i++ )
-		{
-			detail::net_t *n = state().nets()[m_net_ids[i]].get();
-			this->push<false>(queue_t::entry_t(netlist_time_ext::from_raw(m_times[i]),n));
-		}
-	}
-
 	// ----------------------------------------------------------------------------------------
 	// device_object_t
 	// ----------------------------------------------------------------------------------------
@@ -99,6 +61,30 @@
 		//return terminal_type::TERMINAL; // please compiler
 	}
 
+	netlist_state_t &detail::device_object_t::state() noexcept
+	{
+		return m_device->state();
+	}
+
+	const netlist_state_t &detail::device_object_t::state() const noexcept
+	{
+		return m_device->state();
+	}
+
+	// ----------------------------------------------------------------------------------------
+	// netlist_object_t
+	// ----------------------------------------------------------------------------------------
+
+	netlist_state_t & detail::netlist_object_t::state() noexcept
+	{
+		return m_netlist.nlstate();
+	}
+
+	const netlist_state_t & detail::netlist_object_t::state() const noexcept
+	{
+		return m_netlist.nlstate();
+	}
+
 	// ----------------------------------------------------------------------------------------
 	// netlist_t
 	// ----------------------------------------------------------------------------------------
@@ -108,7 +94,9 @@
 		, m_solver(nullptr)
 		, m_time(netlist_time_ext::zero())
 		, m_mainclock(nullptr)
-		, m_queue(*this, aname + "." + "m_queue")
+		, m_queue(config::MAX_QUEUE_SIZE::value,
+			detail::queue_t::id_delegate(&netlist_state_t :: find_net_id, &state),
+			detail::queue_t::obj_delegate(&netlist_state_t :: net_by_id, &state))
 		, m_use_stats(false)
 	{
 		state.save(*this, static_cast<plib::state_manager_t::callback_t &>(m_queue), aname, "m_queue");
@@ -126,7 +114,6 @@
 	, m_extended_validation(false)
 	, m_dummy_version(1)
 	{
-
 		m_lib = m_callbacks->static_solver_lib();
 
 		m_setup = plib::make_unique<setup_t, host_arena>(*this);
@@ -141,7 +128,6 @@
 		devices::initialize_factory(m_setup->parser().factory());
 
 		// Add default include file
-		using a = plib::psource_str_t;
 		const pstring content =
 		"#define RES_R(res) (res)            \n"
 		"#define RES_K(res) ((res) * 1e3)    \n"
@@ -152,8 +138,26 @@
 		"#define IND_U(ind) ((ind) * 1e-6)   \n"
 		"#define IND_N(ind) ((ind) * 1e-9)   \n"
 		"#define IND_P(ind) ((ind) * 1e-12)  \n";
-		m_setup->parser().add_include<a>("netlist/devices/net_lib.h", content);
-		NETLIST_NAME(base)(m_setup->parser());
+		m_setup->parser().add_include<plib::psource_str_t>("netlist/devices/net_lib.h", content);
+#if 1
+		NETLIST_NAME(base_lib)(m_setup->parser());
+#else
+		// FIXME: This is very slow - need optimized parsing scanning
+#if 1
+		m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/macro/nlm_{1}.cpp");
+		m_setup->parser().include("base_lib");
+#else
+		pstring dir = "src/lib/netlist/macro/";
+		//m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/macro/nlm_{}.cpp");
+		m_setup->parser().register_source<source_file_t>(dir + "nlm_base_lib.cpp");
+		m_setup->parser().register_source<source_file_t>(dir + "nlm_opamp_lib.cpp");
+		m_setup->parser().register_source<source_file_t>(dir + "nlm_roms_lib.cpp");
+		m_setup->parser().register_source<source_file_t>(dir + "nlm_cd4xxx_lib.cpp");
+		m_setup->parser().register_source<source_file_t>(dir + "nlm_otheric_lib.cpp");
+		m_setup->parser().register_source<source_file_t>(dir + "nlm_ttl74xx_lib.cpp");
+		m_setup->parser().include("base_lib");
+#endif
+#endif
 	}
 
 
@@ -173,6 +177,10 @@
 				return i;
 		return std::numeric_limits<std::size_t>::max();
 	}
+	detail::net_t *netlist_state_t::net_by_id(std::size_t id) const
+	{
+		return m_nets[id].get();
+	}
 
 	void netlist_state_t::rebuild_lists()
 	{
@@ -201,7 +209,6 @@
 		ENTRY(NL_USE_MEMPOOL)
 		ENTRY(NL_USE_QUEUE_STATS)
 		ENTRY(NL_USE_COPY_INSTEAD_OF_REFERENCE)
-		ENTRY(NL_USE_TRUTHTABLE_7448)
 		ENTRY(NL_AUTO_DEVICES)
 		ENTRY(NL_USE_FLOAT128)
 		ENTRY(NL_USE_FLOAT_MATRIX)
@@ -270,19 +277,24 @@
 		log().debug("Searching for solver\n");
 		m_solver = m_state.get_single_device<devices::NETLIB_NAME(solver)>("solver");
 
-		m_time = netlist_time_ext::zero();
+		// Don't reset time
+		//m_time = netlist_time_ext::zero();
 		m_queue.clear();
 		if (m_mainclock != nullptr)
-			m_mainclock->m_Q.net().set_next_scheduled_time(netlist_time_ext::zero());
+			m_mainclock->m_Q.net().set_next_scheduled_time(m_time);
 		//if (m_solver != nullptr)
 		//  m_solver->reset();
 
 		m_state.reset();
 	}
 
-	void netlist_state_t::reset()
+	void netlist_state_t::free_setup_resources()
 	{
 		m_setup = nullptr;
+	}
+
+	void netlist_state_t::reset()
+	{
 		// Reset all nets once !
 		log().verbose("Call reset on all nets:");
 		for (auto & n : nets())
@@ -297,9 +309,14 @@
 		// Currently analog input and logic input also
 		// push their outputs to queue.
 
+		std::vector<core_device_t *> devices_called;
 		log().verbose("Call update_param on all devices:");
 		for (auto & dev : m_devices)
+		{
 			dev.second->update_param();
+			if (!plib::container::contains(devices_called, dev.second.get()))
+				devices_called.push_back(dev.second.get());
+		}
 
 		// Step all devices once !
 		//
@@ -312,55 +329,35 @@
 		{
 			case 0:
 			{
-				std::vector<core_device_t *> d;
 				std::vector<const nldelegate *> t;
 				log().verbose("Using default startup strategy");
 				for (auto &n : m_nets)
+				{
+					n->update_inputs(); // only used if USE_COPY_INSTEAD_OF_REFERENCE == 1
 					for (auto & term : n->core_terms())
-						if (term->delegate().has_object())
+					{
+						if (!plib::container::contains(t, &term->delegate()))
 						{
-							if (!plib::container::contains(t, &term->delegate()))
-							{
-								t.push_back(&term->delegate());
-								term->run_delegate();
-							}
-							// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-							auto *dev = reinterpret_cast<core_device_t *>(term->delegate().object());
-							if (!plib::container::contains(d, dev))
-								d.push_back(dev);
+							t.push_back(&term->delegate());
+							term->run_delegate();
 						}
+						// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+						auto *dev = reinterpret_cast<core_device_t *>(term->delegate().object());
+						if (!plib::container::contains(devices_called, dev))
+							devices_called.push_back(dev);
+					}
+				}
 				log().verbose("Devices not yet updated:");
 				for (auto &dev : m_devices)
-					if (!plib::container::contains(d, dev.second.get()))
+					if (!plib::container::contains(devices_called, dev.second.get()))
 					{
-						log().verbose("\t ...{1}", dev.second->name());
-						dev.second->update();
+						// FIXME: doesn't seem to be needed, use cases include
+						// analog output devices. Check and remove
+						log().error("\t Device {1} not yet updated", dev.second->name());
+						//dev.second->update();
 					}
 			}
 			break;
-			case 1:     // brute force backward
-			{
-				log().verbose("Using brute force backward startup strategy");
-
-				for (auto &n : m_nets)  // only used if USE_COPY_INSTEAD_OF_REFERENCE == 1
-					n->update_inputs();
-
-				std::size_t i = m_devices.size();
-				while (i>0)
-					m_devices[--i].second->update();
-
-				for (auto &n : m_nets)  // only used if USE_COPY_INSTEAD_OF_REFERENCE == 1
-					n->update_inputs();
-
-			}
-			break;
-			case 2:     // brute force forward
-			{
-				log().verbose("Using brute force forward startup strategy");
-				for (auto &d : m_devices)
-					d.second->update();
-			}
-			break;
 		}
 
 		// the above may screw up m_active and the list
@@ -500,12 +497,6 @@
 			m_stats = owner.state().make_pool_object<stats_t>();
 	}
 
-	void core_device_t::set_default_delegate(detail::core_terminal_t &term)
-	{
-		if (!term.delegate().is_set())
-			term.set_delegate(nldelegate(&core_device_t::update, this));
-	}
-
 	log_type & core_device_t::log()
 	{
 		return state().log();
@@ -635,7 +626,7 @@
 
 	void detail::net_t::reset() noexcept
 	{
-		m_next_scheduled_time = netlist_time_ext::zero();
+		m_next_scheduled_time = exec().time();
 		m_in_queue = queue_status::DELIVERED;
 
 		m_new_Q = 0;
@@ -678,6 +669,11 @@
 	{
 	}
 
+	void analog_net_t::reset() noexcept
+	{
+		net_t::reset();
+		m_cur_Analog = nlconst::zero();
+	}
 	// ----------------------------------------------------------------------------------------
 	// core_terminal_t
 	// ----------------------------------------------------------------------------------------
@@ -704,8 +700,8 @@
 	// terminal_t
 	// ----------------------------------------------------------------------------------------
 
-	terminal_t::terminal_t(core_device_t &dev, const pstring &aname, terminal_t *otherterm)
-	: analog_t(dev, aname, STATE_BIDIR)
+	terminal_t::terminal_t(core_device_t &dev, const pstring &aname, terminal_t *otherterm, nldelegate delegate)
+	: analog_t(dev, aname, STATE_BIDIR, delegate)
 	, m_Idr(nullptr)
 	, m_go(nullptr)
 	, m_gt(nullptr)
@@ -713,14 +709,6 @@
 		state().setup().register_term(*this, *otherterm);
 	}
 
-	void terminal_t::solve_now() const
-	{
-		const auto *solv(solver());
-		// Nets may belong to railnets which do not have a solver attached
-		if (solv != nullptr)
-				solver()->solve_now();
-	}
-
 	void terminal_t::set_ptrs(nl_fptype *gt, nl_fptype *go, nl_fptype *Idr) noexcept(false)
 	{
 		// NOLINTNEXTLINE(readability-implicit-bool-conversion)
@@ -759,7 +747,7 @@
 
 	logic_input_t::logic_input_t(device_t &dev, const pstring &aname,
 			nldelegate delegate)
-			: logic_t(dev, aname, STATE_INP_ACTIVE, delegate.is_set() ? delegate : dev.default_delegate())
+			: logic_t(dev, aname, STATE_INP_ACTIVE, delegate)
 	{
 		state().setup().register_term(*this);
 	}
@@ -770,7 +758,7 @@
 	// ----------------------------------------------------------------------------------------
 
 	logic_output_t::logic_output_t(device_t &dev, const pstring &aname, bool dummy)
-		: logic_t(dev, aname, STATE_OUT)
+		: logic_t(dev, aname, STATE_OUT, nldelegate())
 		, m_my_net(dev.state(), name() + ".net", this)
 	{
 		plib::unused_var(dummy);
@@ -785,6 +773,16 @@
 			net().initial(val);
 	}
 
+	// -----------------------------------------------------------------------------
+	// tristate_output_t
+	// -----------------------------------------------------------------------------
+	tristate_output_t::tristate_output_t(device_t &dev, const pstring &aname, bool force_logic)
+	: logic_output_t(dev, aname)
+	, m_last_logic(dev, name() + "." + "m_last_logic", 1) // force change
+	, m_tristate(dev, name() + "." + "m_tristate", force_logic ? 0 : 2) // force change
+	, m_force_logic(force_logic)
+	{}
+
 	// ----------------------------------------------------------------------------------------
 	// analog_input_t
 	// ----------------------------------------------------------------------------------------
@@ -801,7 +799,7 @@
 	// ----------------------------------------------------------------------------------------
 
 	analog_output_t::analog_output_t(core_device_t &dev, const pstring &aname)
-		: analog_t(dev, aname, STATE_OUT)
+		: analog_t(dev, aname, STATE_OUT, nldelegate())
 		, m_my_net(dev.state(), name() + ".net", this)
 	{
 		state().register_net(device_arena::owned_ptr<analog_net_t>(&m_my_net, false));
@@ -907,7 +905,7 @@
 	}
 
 
-	std::unique_ptr<std::istream> param_data_t::stream()
+	plib::psource_t::stream_ptr param_data_t::stream()
 	{
 		return device().state().parser().get_data_stream(str());
 	}
@@ -965,6 +963,94 @@
 	nlparse_t &netlist_state_t::parser() { return m_setup->parser(); }
 	const nlparse_t &netlist_state_t::parser() const { return m_setup->parser(); }
 
+	void netlist_state_t::remove_device(core_device_t *dev)
+	{
+		for (auto it = m_devices.begin(); it != m_devices.end(); it++)
+			if (it->second.get() == dev)
+			{
+				m_state.remove_save_items(dev);
+				m_devices.erase(it);
+				return;
+			}
+	}
+
+	// ----------------------------------------------------------------------------------------
+	// netlist_t
+	//
+	// Hot section
+	//
+	// Any changes below will impact performance.
+	// -----------------------------------------------------------------------------
+
+	template <bool KEEP_STATS>
+	void netlist_t::process_queue_stats(const netlist_time_ext delta) noexcept
+	{
+		netlist_time_ext stop(m_time + delta);
+
+		qpush(stop, nullptr);
+
+		if (m_mainclock == nullptr)
+		{
+			m_time = m_queue.top().exec_time();
+			detail::net_t *obj(m_queue.top().object());
+			m_queue.pop();
+
+			while (obj != nullptr)
+			{
+				obj->template update_devs<KEEP_STATS>();
+				if (KEEP_STATS)
+					m_perf_out_processed.inc();
+				const detail::queue_t::entry_t *top = &m_queue.top();
+				m_time = top->exec_time();
+				obj = top->object();
+				m_queue.pop();
+			}
+		}
+		else
+		{
+			logic_net_t &mc_net(m_mainclock->m_Q.net());
+			const netlist_time inc(m_mainclock->m_inc);
+			netlist_time_ext mc_time(mc_net.next_scheduled_time());
+
+			do
+			{
+				const detail::queue_t::entry_t *top = &m_queue.top();
+				while (top->exec_time() > mc_time)
+				{
+					m_time = mc_time;
+					mc_net.toggle_new_Q();
+					mc_net.update_devs<KEEP_STATS>();
+					top = &m_queue.top();
+					mc_time += inc;
+				}
+
+				m_time = top->exec_time();
+				auto *const obj(top->object());
+				m_queue.pop();
+				if (obj != nullptr)
+					obj->template update_devs<KEEP_STATS>();
+				else
+					break;
+				if (KEEP_STATS)
+					m_perf_out_processed.inc();
+			} while (true);
+
+			mc_net.set_next_scheduled_time(mc_time);
+		}
+	}
+
+	void netlist_t::process_queue(netlist_time_ext delta) noexcept
+	{
+		if (!m_use_stats)
+			process_queue_stats<false>(delta);
+		else
+		{
+			auto sm_guard(m_stat_mainloop.guard());
+			process_queue_stats<true>(delta);
+		}
+	}
+
+
 	template struct state_var<std::uint8_t>;
 	template struct state_var<std::uint16_t>;
 	template struct state_var<std::uint32_t>;
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/nl_base.h mame-0.224+dfsg.1/src/lib/netlist/nl_base.h
--- mame-0.222+dfsg.1/src/lib/netlist/nl_base.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/nl_base.h	2020-08-26 08:57:19.000000000 +0000
@@ -12,190 +12,19 @@
 #error "nl_base.h included. Please correct."
 #endif
 
-#include "plib/palloc.h" // owned_ptr
-#include "plib/pdynlib.h"
-#include "plib/pexception.h"
-#include "plib/pfmtlog.h"
-#include "plib/pfunction.h"
-#include "plib/plists.h"
-#include "plib/pmempool.h"
-#include "plib/ppmf.h"
-#include "plib/pstate.h"
-#include "plib/pstonum.h"
-#include "plib/pstream.h"
-#include "plib/ptime.h"
-#include "plib/ptimed_queue.h"
-#include "plib/ptypes.h"
-
-#include "nl_errstr.h"
-#include "nltypes.h"
-
-#include <initializer_list>
-#include <unordered_map>
-#include <vector>
-
-//============================================================
-//  MACROS / New Syntax
-//============================================================
-
-/// \brief Construct a netlist device name
-///
-#define NETLIB_NAME(chip) nld_ ## chip
-
-/// \brief Start a netlist device class.
-///
-/// Used to start defining a netlist device class.
-/// The simplest device without inputs or outputs would look like this:
-///
-///      NETLIB_OBJECT(some_object)
-///      {
-///      public:
-///          NETLIB_CONSTRUCTOR(some_object) { }
-///      };
-///
-///  Also refer to #NETLIB_CONSTRUCTOR.
-#define NETLIB_OBJECT(name)                                                    \
-class NETLIB_NAME(name) : public delegator_t<device_t>
-
-/// \brief Start a derived netlist device class.
-///
-/// Used to define a derived device class based on plcass.
-/// The simplest device without inputs or outputs would look like this:
-///
-///      NETLIB_OBJECT_DERIVED(some_object, parent_object)
-///      {
-///      public:
-///          NETLIB_CONSTRUCTOR(some_object) { }
-///      };
-///
-///  Also refer to #NETLIB_CONSTRUCTOR.
-#define NETLIB_OBJECT_DERIVED(name, pclass)                                   \
-class NETLIB_NAME(name) : public delegator_t<NETLIB_NAME(pclass)>
-
-
-
-// Only used for analog objects like diodes and resistors
-
-#define NETLIB_BASE_OBJECT(name)                                               \
-class NETLIB_NAME(name) : public delegator_t<base_device_t>
-
-#define NETLIB_CONSTRUCTOR_PASS(cname, ...)                                    \
-	using this_type = NETLIB_NAME(cname);                                      \
-	public: template <class CLASS> NETLIB_NAME(cname)(CLASS &owner, const pstring &name) \
-	: base_type(owner, name, __VA_ARGS__)
-
-/// \brief Used to define the constructor of a netlist device.
-///
-///  Use this to define the constructor of a netlist device. Please refer to
-///  #NETLIB_OBJECT for an example.
-#define NETLIB_CONSTRUCTOR(cname)                                              \
-	using this_type = NETLIB_NAME(cname);                                      \
-	public: template <class CLASS> NETLIB_NAME(cname)(CLASS &owner, const pstring &name) \
-		: base_type(owner, name)
-
-/// \brief Used to define the constructor of a netlist device and define a default model.
-///
-///
-///      NETLIB_CONSTRUCTOR_MODEL(some_object, "TTL")
-///      {
-///      public:
-///          NETLIB_CONSTRUCTOR(some_object) { }
-///      };
-///
-#define NETLIB_CONSTRUCTOR_MODEL(cname, cmodel)                                              \
-	using this_type = NETLIB_NAME(cname);                                      \
-	public: template <class CLASS> NETLIB_NAME(cname)(CLASS &owner, const pstring &name) \
-		: base_type(owner, name, cmodel)
-
-/// \brief Define an extended constructor and add further parameters to it.
-/// The macro allows to add further parameters to a device constructor. This is
-/// normally used for sub-devices and system devices only.
-#define NETLIB_CONSTRUCTOR_EX(cname, ...)                                      \
-	using this_type = NETLIB_NAME(cname);                                      \
-	public: template <class CLASS> NETLIB_NAME(cname)(CLASS &owner, const pstring &name, __VA_ARGS__) \
-		: base_type(owner, name)
-
-/// \brief Used to define the destructor of a netlist device.
-/// The use of a destructor for netlist device should normally not be necessary.
-#define NETLIB_DESTRUCTOR(name) public: virtual ~NETLIB_NAME(name)() noexcept override
-
-/// \brief Add this to a device definition to mark the device as dynamic.
-///
-///  If NETLIB_IS_DYNAMIC(true) is added to the device definition the device
-///  is treated as an analog dynamic device, i.e. \ref NETLIB_UPDATE_TERMINALSI
-///  is called on a each step of the Newton-Raphson step
-///  of solving the linear equations.
-///
-///  You may also use e.g. NETLIB_IS_DYNAMIC(m_func() != "") to only make the
-///  device a dynamic device if parameter m_func is set.
-///
-///  \param expr boolean expression
-///
-#define NETLIB_IS_DYNAMIC(expr)                                                \
-	public: virtual bool is_dynamic() const noexcept override { return expr; }
-
-/// \brief Add this to a device definition to mark the device as a time-stepping device.
-///
-///  You have to implement NETLIB_TIMESTEP in this case as well. Currently, only
-///  the capacitor and inductor devices uses this.
-///
-///  You may also use e.g. NETLIB_IS_TIMESTEP(m_func() != "") to only make the
-///  device a dynamic device if parameter m_func is set. This is used by the
-///  Voltage Source element.
-///
-///  Example:
-///
-///  \code
-///  NETLIB_TIMESTEP_IS_TIMESTEP()
-///  NETLIB_TIMESTEPI()
-///  {
-///      // Gpar should support convergence
-///      const nl_fptype G = m_C.Value() / step +  m_GParallel;
-///      const nl_fptype I = -G/// deltaV();
-///      set(G, 0.0, I);
-///  }
-///  \endcode
-
-#define NETLIB_IS_TIMESTEP(expr)                                               \
-	public: virtual bool is_timestep() const  noexcept override { return expr; }
-
-/// \brief Used to implement the time stepping code.
-///
-/// Please see \ref NETLIB_IS_TIMESTEP for an example.
-
-#define NETLIB_TIMESTEPI()                                                     \
-	public: virtual void timestep(nl_fptype step)  noexcept override
-
-/// \brief Used to implement the body of the time stepping code.
-///
-/// Used when the implementation is outside the class definition
-///
-/// Please see \ref NETLIB_IS_TIMESTEP for an example.
-///
-/// \param cname Name of object as given to \ref NETLIB_OBJECT
-///
-#define NETLIB_TIMESTEP(cname)                                                 \
-	void NETLIB_NAME(cname) :: timestep(nl_fptype step) noexcept
-
-#define NETLIB_DELEGATE(name) nldelegate(&this_type :: name, this)
-
-#define NETLIB_UPDATE_TERMINALSI() virtual void update_terminals() noexcept override
-#define NETLIB_HANDLERI(name) void name() noexcept
-#define NETLIB_UPDATEI() virtual void update() noexcept override
-#define NETLIB_UPDATE_PARAMI() virtual void update_param() noexcept override
-#define NETLIB_RESETI() virtual void reset() override
-
-#define NETLIB_SUB(chip) nld_ ## chip
-#define NETLIB_SUB_UPTR(ns, chip) device_arena::unique_ptr< ns :: nld_ ## chip >
-
-#define NETLIB_HANDLER(chip, name) void NETLIB_NAME(chip) :: name() noexcept
-#define NETLIB_UPDATE(chip) NETLIB_HANDLER(chip, update)
-
-#define NETLIB_RESET(chip) void NETLIB_NAME(chip) :: reset(void)
-
-#define NETLIB_UPDATE_PARAM(chip) void NETLIB_NAME(chip) :: update_param() noexcept
-
-#define NETLIB_UPDATE_TERMINALS(chip) void NETLIB_NAME(chip) :: update_terminals() noexcept
+#include "core/analog.h"
+#include "core/base_objects.h"
+#include "core/device.h"
+#include "core/logic.h"
+#include "core/logic_family.h"
+#include "core/netlist_state.h"
+#include "core/nets.h"
+#include "core/object_array.h"
+#include "core/param.h"
+#include "core/state_var.h"
+#include "core/exec.h"
+#include "core/device_macros.h"
+#include "core/devices.h"
 
 //============================================================
 // Namespace starts
@@ -203,2416 +32,6 @@
 
 namespace netlist
 {
-	/// \brief Delegate type for device notification.
-	///
-	using nldelegate = plib::pmfp<void>;
-	using nldelegate_ts = plib::pmfp<void, nl_fptype>;
-	using nldelegate_dyn = plib::pmfp<void>;
-
-	// -----------------------------------------------------------------------------
-	// forward definitions
-	// -----------------------------------------------------------------------------
-
-	namespace devices
-	{
-		class NETLIB_NAME(solver);
-		class NETLIB_NAME(mainclock);
-		class NETLIB_NAME(base_proxy);
-		class NETLIB_NAME(base_d_to_a_proxy);
-		class NETLIB_NAME(base_a_to_d_proxy);
-	} // namespace devices
-
-	namespace solver
-	{
-		class matrix_solver_t;
-	} // namespace solver
-
-	class logic_output_t;
-	class logic_input_t;
-	class analog_net_t;
-	class logic_net_t;
-	class setup_t;
-	class nlparse_t;
-	class netlist_t;
-	class netlist_state_t;
-	class core_device_t;
-	class device_t;
-
-	template <class CX>
-	class delegator_t : public CX
-	{
-	protected:
-		using base_type = delegator_t<CX>;
-		using delegated_type = CX;
-		using delegated_type::delegated_type;
-	};
-
-	namespace detail
-	{
-		class net_t;
-	} // namespace detail
-
-	//============================================================
-	//  Exceptions
-	//============================================================
-
-	/// \brief Generic netlist exception.
-	///  The exception is used in all events which are considered fatal.
-
-	class nl_exception : public plib::pexception
-	{
-	public:
-		/// \brief Constructor.
-		///  Allows a descriptive text to be assed to the exception
-
-		explicit nl_exception(const pstring &text //!< text to be passed
-				)
-		: plib::pexception(text) { }
-
-		/// \brief Constructor.
-		///  Allows to use \ref plib::pfmt logic to be used in exception
-
-		template<typename... Args>
-		explicit nl_exception(const pstring &fmt //!< format to be used
-			, Args&&... args //!< arguments to be passed
-			)
-		: plib::pexception(plib::pfmt(fmt)(std::forward<Args>(args)...)) { }
-	};
-
-	/// \brief Logic families descriptors are used to create proxy devices.
-	///  The logic family describes the analog capabilities of logic devices,
-	///  inputs and outputs.
-
-	class logic_family_desc_t
-	{
-	public:
-		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-member-init, modernize-use-equals-default)
-		logic_family_desc_t()
-		{
-		}
-
-
-		PCOPYASSIGNMOVE(logic_family_desc_t, delete)
-
-		virtual ~logic_family_desc_t() noexcept = default;
-
-		virtual device_arena::unique_ptr<devices::nld_base_d_to_a_proxy> create_d_a_proxy(netlist_state_t &anetlist, const pstring &name,
-				const logic_output_t *proxied) const = 0;
-		virtual device_arena::unique_ptr<devices::nld_base_a_to_d_proxy> create_a_d_proxy(netlist_state_t &anetlist, const pstring &name,
-				const logic_input_t *proxied) const = 0;
-
-		nl_fptype low_thresh_V(nl_fptype VN, nl_fptype VP) const noexcept{ return VN + (VP - VN) * m_low_thresh_PCNT; }
-		nl_fptype high_thresh_V(nl_fptype VN, nl_fptype VP) const noexcept{ return VN + (VP - VN) * m_high_thresh_PCNT; }
-		nl_fptype low_offset_V() const noexcept{ return m_low_VO; }
-		nl_fptype high_offset_V() const noexcept{ return m_high_VO; }
-		nl_fptype R_low() const noexcept{ return m_R_low; }
-		nl_fptype R_high() const noexcept{ return m_R_high; }
-
-		bool is_above_high_thresh_V(nl_fptype V, nl_fptype VN, nl_fptype VP) const noexcept
-		{ return V > high_thresh_V(VN, VP); }
-
-		bool is_below_low_thresh_V(nl_fptype V, nl_fptype VN, nl_fptype VP) const noexcept
-		{ return V < low_thresh_V(VN, VP); }
-
-		nl_fptype m_low_thresh_PCNT;   //!< low input threshhold offset. If the input voltage is below this value times supply voltage, a "0" input is signalled
-		nl_fptype m_high_thresh_PCNT;  //!< high input threshhold offset. If the input voltage is above the value times supply voltage, a "0" input is signalled
-		nl_fptype m_low_VO;            //!< low output voltage offset. This voltage is output if the ouput is "0"
-		nl_fptype m_high_VO;           //!< high output voltage offset. The supply voltage minus this offset is output if the ouput is "1"
-		nl_fptype m_R_low;             //!< low output resistance. Value of series resistor used for low output
-		nl_fptype m_R_high;            //!< high output resistance. Value of series resistor used for high output
-	};
-
-	/// \brief Base class for devices, terminals, outputs and inputs which support
-	///  logic families.
-	///  This class is a storage container to store the logic family for a
-	///  netlist object. You will not directly use it. Please refer to
-	///  \ref NETLIB_FAMILY to learn how to define a logic family for a device.
-	///
-	/// All terminals inherit the family description from the device
-	/// The default is the ttl family, but any device can override the family.
-	/// For individual terminals, the family can be overwritten as well.
-	///
-
-	class logic_family_t
-	{
-	public:
-		logic_family_t() : m_logic_family(nullptr) {}
-		logic_family_t(const logic_family_desc_t *d) : m_logic_family(d) {}
-		PCOPYASSIGNMOVE(logic_family_t, delete)
-
-		const logic_family_desc_t *logic_family() const noexcept { return m_logic_family; }
-		void set_logic_family(const logic_family_desc_t *fam) noexcept { m_logic_family = fam; }
-
-	protected:
-		~logic_family_t() noexcept = default; // prohibit polymorphic destruction
-	private:
-		const logic_family_desc_t *m_logic_family;
-	};
-
-	/// \brief A persistent variable template.
-	///  Use the state_var template to define a variable whose value is saved.
-	///  Within a device definition use
-	///
-	///      NETLIB_OBJECT(abc)
-	///      {
-	///          NETLIB_CONSTRUCTOR(abc)
-	///          , m_var(*this, "myvar", 0)
-	///          ...
-	///          state_var<unsigned> m_var;
-	///      }
-	template <typename T>
-	struct state_var
-	{
-	public:
-
-		using value_type = T;
-
-		template <typename O>
-		//! Constructor.
-		state_var(O &owner,             //!< owner must have a netlist() method.
-				const pstring &name,    //!< identifier/name for this state variable
-				const T &value          //!< Initial value after construction
-				);
-
-		template <typename O>
-		//! Constructor.
-		state_var(O &owner,             //!< owner must have a netlist() method.
-				const pstring &name     //!< identifier/name for this state variable
-		);
-
-		PMOVEASSIGN(state_var, delete)
-
-		//! Destructor.
-		~state_var() noexcept = default;
-
-		//! Copy Constructor removed.
-		constexpr state_var(const state_var &rhs) = delete;
-		//! Assignment operator to assign value of a state var.
-		constexpr state_var &operator=(const state_var &rhs) noexcept { m_value = rhs.m_value; return *this; } // OSX doesn't like noexcept
-		//! Assignment operator to assign value of type T.
-		constexpr state_var &operator=(const T &rhs) noexcept { m_value = rhs; return *this; }
-		//! Assignment move operator to assign value of type T.
-		constexpr state_var &operator=(T &&rhs) noexcept { std::swap(m_value, rhs); return *this; }
-		//! Return non-const value of state variable.
-		constexpr operator T & () noexcept { return m_value; }
-		//! Return const value of state variable.
-		constexpr operator const T & () const noexcept { return m_value; }
-		//! Return non-const value of state variable.
-		constexpr T & var() noexcept { return m_value; }
-		//! Return const value of state variable.
-		constexpr const T & var() const noexcept { return m_value; }
-		//! Return non-const value of state variable.
-		constexpr T & operator ()() noexcept { return m_value; }
-		//! Return const value of state variable.
-		constexpr const T & operator ()() const noexcept { return m_value; }
-		//! Access state variable by ->.
-		constexpr T * operator->() noexcept { return &m_value; }
-		//! Access state variable by const ->.
-		constexpr const T * operator->() const noexcept{ return &m_value; }
-
-	private:
-		T m_value;
-	};
-
-	/// \brief A persistent array template.
-	///  Use this state_var template to define an array whose contents are saved.
-	///  Please refer to \ref state_var.
-	///
-	///  \tparam C container class to use.
-
-	template <typename C>
-	struct state_container : public C
-	{
-	public:
-		using value_type = typename C::value_type;
-		//! Constructor.
-		template <typename O>
-		state_container(O &owner,           //!< owner must have a netlist() method.
-				const pstring &name,        //!< identifier/name for this state variable
-				const value_type &value     //!< Initial value after construction
-				);
-		//! Constructor.
-		template <typename O>
-		state_container(O &owner,           //!< owner must have a netlist() method.
-				const pstring &name,        //!< identifier/name for this state variable
-				std::size_t n,              //!< number of elements to allocate
-				const value_type &value     //!< Initial value after construction
-				);
-		//! Copy Constructor.
-		state_container(const state_container &rhs) noexcept = default;
-		//! Destructor.
-		~state_container() noexcept = default;
-		//! Move Constructor.
-		state_container(state_container &&rhs) noexcept = default;
-		state_container &operator=(const state_container &rhs) noexcept = default;
-		state_container &operator=(state_container &&rhs) noexcept = default;
-	};
-
-	// -----------------------------------------------------------------------------
-	// State variables - predefined and c++11 non-optional
-	// -----------------------------------------------------------------------------
-
-	/// \brief predefined state variable type for uint8_t
-	using state_var_u8 = state_var<std::uint8_t>;
-	/// \brief predefined state variable type for int8_t
-	using state_var_s8 = state_var<std::int8_t>;
-
-	/// \brief predefined state variable type for uint32_t
-	using state_var_u32 = state_var<std::uint32_t>;
-	/// \brief predefined state variable type for int32_t
-	using state_var_s32 = state_var<std::int32_t>;
-	/// \brief predefined state variable type for sig_t
-	using state_var_sig = state_var<netlist_sig_t>;
-
-	namespace detail {
-
-		template <typename C, typename T>
-		struct property_store_t
-		{
-			using value_type = T;
-			using key_type = const C *;
-			static void add(key_type obj, const value_type &aname) noexcept
-			{
-				store().insert({obj, aname});
-			}
-
-			static value_type *get(key_type obj) noexcept
-			{
-				try
-				{
-					auto ret(store().find(obj));
-					if (ret == store().end())
-						return nullptr;
-					return &ret->second;
-				}
-				catch (...)
-				{
-					plib::terminate("exception in property_store_t.get()");
-					return static_cast<value_type *>(nullptr);
-				}
-			}
-
-			static void remove(key_type obj) noexcept
-			{
-				store().erase(store().find(obj));
-			}
-
-			static std::unordered_map<key_type, value_type> &store() noexcept
-			{
-				static std::unordered_map<key_type, value_type> lstore;
-				return lstore;
-			}
-
-		};
-
-		// -----------------------------------------------------------------------------
-		// object_t
-		// -----------------------------------------------------------------------------
-
-		/// \brief The base class for netlist devices, terminals and parameters.
-		///
-		///  This class serves as the base class for all device, terminal and
-		///  objects.
-
-		class object_t
-		{
-		public:
-
-			/// \brief Constructor.
-			/// Every class derived from the object_t class must have a name.
-			///
-			/// \param aname string containing name of the object
-
-			explicit object_t(const pstring &aname)
-			{
-				props::add(this, aname);
-			}
-
-			PCOPYASSIGNMOVE(object_t, delete)
-			/// \brief return name of the object
-			///
-			/// \returns name of the object.
-
-			const pstring &name() const noexcept
-			{
-				return *props::get(this);
-			}
-
-		protected:
-
-			using props = property_store_t<object_t, pstring>;
-
-			// only childs should be destructible
-			~object_t() noexcept
-			{
-				props::remove(this);
-			}
-
-		private:
-		};
-
-		/// \brief Base class for all objects bejng owned by a netlist
-		///
-		/// The object provides adds \ref netlist_state_t and \ref netlist_t
-		/// accessors.
-		///
-		class netlist_object_t : public object_t
-		{
-		public:
-			explicit netlist_object_t(netlist_t &nl, const pstring &name)
-			: object_t(name)
-			, m_netlist(nl)
-			{ }
-
-			~netlist_object_t() = default;
-
-			PCOPYASSIGNMOVE(netlist_object_t, delete)
-
-			netlist_state_t & state() noexcept;
-			const netlist_state_t & state() const noexcept;
-
-			netlist_t & exec() noexcept { return m_netlist; }
-			const netlist_t & exec() const noexcept { return m_netlist; }
-
-			// to ease template design
-			template<typename T, typename... Args>
-			device_arena::unique_ptr<T> make_pool_object(Args&&... args);
-
-		private:
-			netlist_t & m_netlist;
-
-		};
-
-		// -----------------------------------------------------------------------------
-		// device_object_t
-		// -----------------------------------------------------------------------------
-
-		/// \brief Base class for all objects being owned by a device.
-		///
-		/// Serves as the base class of all objects being owned by a device.
-		///
-		/// The class also supports device-less objects. In this case,
-		/// nullptr is passed in as the device object.
-		///
-
-		class device_object_t : public object_t
-		{
-		public:
-			/// \brief Constructor.
-			///
-			/// \param dev  pointer to device owning the object.
-			/// \param name string holding the name of the device
-
-			device_object_t(core_device_t *dev, const pstring &name);
-
-			/// \brief returns reference to owning device.
-			/// \returns reference to owning device.
-
-			core_device_t &device() noexcept { return *m_device; }
-			const core_device_t &device() const noexcept { return *m_device; }
-
-			/// \brief The netlist owning the owner of this object.
-			/// \returns reference to netlist object.
-
-			netlist_state_t &state() noexcept;
-			const netlist_state_t &state() const noexcept;
-
-			netlist_t &exec() noexcept;
-			const netlist_t &exec() const noexcept;
-
-		private:
-			core_device_t * m_device;
-		};
-
-		// -----------------------------------------------------------------------------
-		// core_terminal_t
-		// -----------------------------------------------------------------------------
-
-		/// \brief Base class for all terminals.
-		///
-		/// All terminals are derived from this class.
-		///
-		class core_terminal_t : public device_object_t,
-								public plib::linkedlist_t<core_terminal_t>::element_t
-		{
-		public:
-			/// \brief Number of signal bits
-			///
-			/// Going forward setting this to 8 will allow 8-bit signal
-			/// busses to be used in netlist, e.g. for more complex memory
-			/// arrangements.
-			/// Mimimum value is 2 here to support tristate output on proxies.
-			static constexpr const unsigned int INP_BITS = 2;
-
-			static constexpr const unsigned int INP_MASK = (1 << INP_BITS) - 1;
-			static constexpr const unsigned int INP_HL_SHIFT = 0;
-			static constexpr const unsigned int INP_LH_SHIFT = INP_BITS;
-
-			static constexpr netlist_sig_t OUT_TRISTATE() { return INP_MASK; }
-
-			static_assert(INP_BITS * 2 <= sizeof(netlist_sig_t) * 8, "netlist_sig_t size not sufficient");
-
-			enum state_e {
-				STATE_INP_PASSIVE = 0,
-				STATE_INP_HL      = (INP_MASK << INP_HL_SHIFT),
-				STATE_INP_LH      = (INP_MASK << INP_LH_SHIFT),
-				STATE_INP_ACTIVE  = STATE_INP_HL | STATE_INP_LH,
-				STATE_OUT         = (1 << (2*INP_BITS)),
-				STATE_BIDIR       = (1 << (2*INP_BITS + 1))
-			};
-
-			core_terminal_t(core_device_t &dev, const pstring &aname,
-					state_e state, nldelegate delegate = nldelegate());
-			virtual ~core_terminal_t() noexcept = default;
-
-			PCOPYASSIGNMOVE(core_terminal_t, delete)
-
-			/// \brief The object type.
-			/// \returns type of the object
-			terminal_type type() const noexcept(false);
-
-			/// \brief Checks if object is of specified type.
-			/// \param atype type to check object against.
-			/// \returns true if object is of specified type else false.
-			bool is_type(const terminal_type atype) const noexcept(false) { return (type() == atype); }
-
-			void set_net(net_t *anet) noexcept { m_net = anet; }
-			void clear_net() noexcept { m_net = nullptr; }
-			bool has_net() const noexcept { return (m_net != nullptr); }
-
-			net_t & net() const noexcept { return *m_net;}
-
-			bool is_logic() const noexcept;
-			bool is_logic_input() const noexcept;
-			bool is_logic_output() const noexcept;
-			bool is_tristate_output() const noexcept;
-			bool is_analog() const noexcept;
-			bool is_analog_input() const noexcept;
-			bool is_analog_output() const noexcept;
-
-			bool is_state(state_e astate) const noexcept { return (m_state == astate); }
-			state_e terminal_state() const noexcept { return m_state; }
-			void set_state(state_e astate) noexcept { m_state = astate; }
-
-			void reset() noexcept { set_state(is_type(terminal_type::OUTPUT) ? STATE_OUT : STATE_INP_ACTIVE); }
-
-	#if NL_USE_COPY_INSTEAD_OF_REFERENCE
-			void set_copied_input(netlist_sig_t val) noexcept
-			{
-				m_Q = val;
-			}
-
-			state_var_sig m_Q;
-	#else
-			void set_copied_input(netlist_sig_t val) const noexcept { plib::unused_var(val); } // NOLINT: static means more message elsewhere
-	#endif
-
-			void set_delegate(const nldelegate &delegate) noexcept { m_delegate = delegate; }
-			const nldelegate &delegate() const noexcept { return m_delegate; }
-			inline void run_delegate() noexcept { return m_delegate(); }
-		private:
-			nldelegate m_delegate;
-			net_t * m_net;
-			state_var<state_e> m_state;
-		};
-
-		// -----------------------------------------------------------------------------
-		// net_t
-		// -----------------------------------------------------------------------------
-
-		class net_t : public netlist_object_t
-		{
-		public:
-
-			enum class queue_status
-			{
-				DELAYED_DUE_TO_INACTIVE = 0,
-				QUEUED,
-				DELIVERED
-			};
-
-			net_t(netlist_state_t &nl, const pstring &aname, core_terminal_t *railterminal = nullptr);
-
-			PCOPYASSIGNMOVE(net_t, delete)
-
-			virtual ~net_t() noexcept = default;
-
-			void reset() noexcept;
-
-			void toggle_new_Q() noexcept { m_new_Q = (m_cur_Q ^ 1);   }
-
-			void toggle_and_push_to_queue(const netlist_time &delay) noexcept
-			{
-				toggle_new_Q();
-				push_to_queue(delay);
-			}
-
-			void push_to_queue(const netlist_time &delay) noexcept;
-			NVCC_CONSTEXPR bool is_queued() const noexcept { return m_in_queue == queue_status::QUEUED; }
-
-			template <bool KEEP_STATS>
-			inline void update_devs() noexcept;
-
-			netlist_time_ext next_scheduled_time() const noexcept { return m_next_scheduled_time; }
-			void set_next_scheduled_time(netlist_time_ext ntime) noexcept { m_next_scheduled_time = ntime; }
-
-			NVCC_CONSTEXPR bool is_rail_net() const noexcept { return !(m_railterminal == nullptr); }
-			core_terminal_t & railterminal() const noexcept { return *m_railterminal; }
-
-			bool has_connections() const noexcept { return !m_core_terms.empty(); }
-
-			void add_to_active_list(core_terminal_t &term) noexcept;
-			void remove_from_active_list(core_terminal_t &term) noexcept;
-
-			// setup stuff
-
-			bool is_logic() const noexcept;
-			bool is_analog() const noexcept;
-
-			void rebuild_list();     // rebuild m_list after a load
-
-			std::vector<core_terminal_t *> &core_terms() noexcept { return m_core_terms; }
-
-			void update_inputs() noexcept
-			{
-#if NL_USE_COPY_INSTEAD_OF_REFERENCE
-				for (auto & term : m_core_terms)
-					term->m_Q = m_cur_Q;
-#endif
-				// nothing needs to be done if define not set
-			}
-
-		protected:
-
-			// only used for logic nets
-			NVCC_CONSTEXPR netlist_sig_t Q() const noexcept { return m_cur_Q; }
-
-			// only used for logic nets
-			void initial(netlist_sig_t val) noexcept
-			{
-				m_cur_Q = m_new_Q = val;
-				update_inputs();
-			}
-
-			// only used for logic nets
-			inline void set_Q_and_push(const netlist_sig_t &newQ, const netlist_time &delay) noexcept
-			{
-				if (newQ != m_new_Q)
-				{
-					m_new_Q = newQ;
-					push_to_queue(delay);
-				}
-			}
-
-			// only used for logic nets
-			inline void set_Q_time(const netlist_sig_t &newQ, const netlist_time_ext &at) noexcept
-			{
-				if (newQ != m_new_Q)
-				{
-					m_in_queue = queue_status::DELAYED_DUE_TO_INACTIVE;
-					m_next_scheduled_time = at;
-					m_cur_Q = m_new_Q = newQ;
-					update_inputs();
-				}
-				else
-				{
-					m_cur_Q = newQ;
-					update_inputs();
-				}
-			}
-
-			// internal state support
-			// FIXME: get rid of this and implement export/import in MAME
-
-		private:
-			state_var<netlist_sig_t>     m_new_Q;
-			state_var<netlist_sig_t>     m_cur_Q;
-			state_var<queue_status>      m_in_queue;
-			state_var<netlist_time_ext>  m_next_scheduled_time;
-
-			core_terminal_t * m_railterminal;
-			plib::linkedlist_t<core_terminal_t> m_list_active;
-			std::vector<core_terminal_t *> m_core_terms; // save post-start m_list ...
-
-			template <bool KEEP_STATS, typename T, typename S>
-			void process(T mask, const S &sig) noexcept;
-		};
-	} // namespace detail
-
-	// -----------------------------------------------------------------------------
-	// analog_t
-	// -----------------------------------------------------------------------------
-
-	class analog_t : public detail::core_terminal_t
-	{
-	public:
-
-		analog_t(core_device_t &dev, const pstring &aname, state_e state,
-			nldelegate delegate = nldelegate());
-
-		const analog_net_t & net() const noexcept;
-		analog_net_t & net() noexcept;
-
-		solver::matrix_solver_t *solver() const noexcept;
-	};
-
-	/// \brief Base clase for terminals.
-	///
-	/// Each \ref nld_twoterm object consists of two terminals. Terminals
-	/// are at the core of analog netlists and provide. \ref net_t objects
-	/// connect terminals.
-	///
-	class terminal_t : public analog_t
-	{
-	public:
-
-		/// \brief constructor
-		///
-		/// @param dev core_devict_t object owning the terminal
-		/// @param aname name of this terminal
-		/// @param otherterm pointer to the sibling terminal
-		terminal_t(core_device_t &dev, const pstring &aname, terminal_t *otherterm);
-
-		/// \brief Returns voltage of connected net
-		///
-		/// @return voltage of net this terminal is connected to
-		nl_fptype operator ()() const  noexcept;
-
-		/// @brief sets conductivity value of this terminal
-		///
-		/// @param G Conductivity
-		void set_conductivity(nl_fptype G) const noexcept
-		{
-			set_go_gt_I(-G, G, nlconst::zero());
-		}
-
-		void set_go_gt(nl_fptype GO, nl_fptype GT) const noexcept
-		{
-			set_go_gt_I(GO, GT, nlconst::zero());
-		}
-
-		void set_go_gt_I(nl_fptype GO, nl_fptype GT, nl_fptype I) const noexcept
-		{
-			// Check for rail nets ...
-			if (m_go != nullptr)
-			{
-				*m_Idr = I;
-				*m_go = GO;
-				*m_gt = GT;
-			}
-		}
-
-		/// @brief Solve the system this terminal is connected to.
-		///
-		/// \note deprecated - will be removed
-		void solve_now() const; // FIXME: remove this
-
-		void set_ptrs(nl_fptype *gt, nl_fptype *go, nl_fptype *Idr) noexcept(false);
-
-	private:
-		nl_fptype *m_Idr; ///< drive current
-		nl_fptype *m_go;  ///< conductance for Voltage from other term
-		nl_fptype *m_gt;  ///< conductance for total conductance
-
-	};
-
-
-	// -----------------------------------------------------------------------------
-	// logic_t
-	// -----------------------------------------------------------------------------
-
-	class logic_t : public detail::core_terminal_t, public logic_family_t
-	{
-	public:
-		logic_t(device_t &dev, const pstring &aname,
-				state_e terminal_state, nldelegate delegate = nldelegate());
-
-		logic_net_t & net() noexcept;
-		const logic_net_t &  net() const noexcept;
-	};
-
-	// -----------------------------------------------------------------------------
-	// logic_input_t
-	// -----------------------------------------------------------------------------
-
-	class logic_input_t : public logic_t
-	{
-	public:
-		logic_input_t(device_t &dev, const pstring &aname,
-				nldelegate delegate = nldelegate());
-
-#if 0
-		template <class D>
-		logic_input_t(D &dev, const pstring &aname);
-#endif
-		inline netlist_sig_t operator()() const noexcept;
-
-		void inactivate() noexcept;
-		void activate() noexcept;
-		void activate_hl() noexcept;
-		void activate_lh() noexcept;
-	};
-
-	// -----------------------------------------------------------------------------
-	// analog_input_t
-	// -----------------------------------------------------------------------------
-
-	/// \brief terminal providing analog input voltage.
-	///
-	/// This terminal class provides a voltage measurement. The conductance against
-	/// ground is infinite.
-
-	class analog_input_t : public analog_t
-	{
-	public:
-		/// \brief Constructor
-		analog_input_t(core_device_t &dev,  ///< owning device
-				const pstring &aname,       ///< name of terminal
-				nldelegate delegate = nldelegate() ///< delegate
-		);
-
-		/// \brief returns voltage at terminal.
-		///  \returns voltage at terminal.
-		nl_fptype operator()() const noexcept { return Q_Analog(); }
-
-		/// \brief returns voltage at terminal.
-		///  \returns voltage at terminal.
-		nl_fptype Q_Analog() const noexcept;
-	};
-
-	class logic_net_t : public detail::net_t
-	{
-	public:
-
-		logic_net_t(netlist_state_t &nl, const pstring &aname, detail::core_terminal_t *railterminal = nullptr);
-
-		using detail::net_t::Q;
-		using detail::net_t::initial;
-		using detail::net_t::set_Q_and_push;
-		using detail::net_t::set_Q_time;
-	};
-
-	class analog_net_t : public detail::net_t
-	{
-	public:
-
-		using list_t =  plib::aligned_vector<analog_net_t *>;
-
-		analog_net_t(netlist_state_t &nl, const pstring &aname, detail::core_terminal_t *railterminal = nullptr);
-
-		nl_fptype Q_Analog() const noexcept { return m_cur_Analog; }
-		void set_Q_Analog(nl_fptype v) noexcept { m_cur_Analog = v; }
-		// used by solver code ...
-		nl_fptype *Q_Analog_state_ptr() noexcept { return &m_cur_Analog(); }
-
-		//FIXME: needed by current solver code
-		solver::matrix_solver_t *solver() const noexcept { return m_solver; }
-		void set_solver(solver::matrix_solver_t *solver) noexcept { m_solver = solver; }
-
-		friend constexpr bool operator==(const analog_net_t &lhs, const analog_net_t &rhs) noexcept
-		{
-			return &lhs == &rhs;
-		}
-
-	private:
-		state_var<nl_fptype>     m_cur_Analog;
-		solver::matrix_solver_t *m_solver;
-	};
-
-	// -----------------------------------------------------------------------------
-	// logic_output_t
-	// -----------------------------------------------------------------------------
-
-	class logic_output_t : public logic_t
-	{
-	public:
-
-		/// \brief logic output constructor
-		///
-		/// The third parameter does nothing. It is provided only for
-		/// compatibility with tristate_output_t in templatized device models
-		///
-		/// \param dev Device owning this output
-		/// \param aname The name of this output
-		/// \param dummy Dummy parameter to allow construction like tristate output
-		///
-		logic_output_t(device_t &dev, const pstring &aname, bool dummy = false);
-
-		void initial(netlist_sig_t val) noexcept;
-
-		inline void push(const netlist_sig_t &newQ, const netlist_time &delay) noexcept
-		{
-			m_my_net.set_Q_and_push(newQ, delay); // take the shortcut
-		}
-
-		inline void set_Q_time(const netlist_sig_t &newQ, const netlist_time_ext &at) noexcept
-		{
-			m_my_net.set_Q_time(newQ, at); // take the shortcut
-		}
-
-		/// \brief Dummy implementation for templatized generic devices
-		///
-		/// This function shall never be called. It is defined here so that
-		/// templatized generic device models do not have to do tons of
-		/// template magic.
-		///
-		/// This function terminates if actually called.
-		///
-		[[noreturn]] static void set_tristate(netlist_sig_t v,
-			netlist_time ts_off_on, netlist_time ts_on_off)
-		{
-			plib::unused_var(v, ts_off_on, ts_on_off);
-			plib::terminate("set_tristate on logic_output should never be called!");
-		}
-	private:
-		logic_net_t m_my_net;
-	};
-
-	// -----------------------------------------------------------------------------
-	// tristate_output_t
-	// -----------------------------------------------------------------------------
-
-	/// \brief Tristate output
-	///
-	/// In a lot of applications tristate enable inputs are just connected to
-	/// VCC/GND to permanently enable the outputs. In this case a pure
-	/// implementation using analog outputs would not perform well.
-	///
-	/// For this object during creation it can be decided if a logic output or
-	/// a tristate output is used. Generally the owning device uses parameter
-	/// FORCE_TRISTATE_LOGIC to determine this.
-	///
-	/// This is the preferred way to implement tristate outputs.
-	///
-
-	class tristate_output_t : public logic_output_t
-	{
-	public:
-
-		tristate_output_t(device_t &dev, const pstring &aname, bool force_logic)
-		: logic_output_t(dev, aname)
-		, m_last_logic(dev, name() + "." + "m_last_logic", 1) // force change
-		, m_tristate(dev, name() + "." + "m_tristate", force_logic ? 0 : 2) // force change
-		, m_force_logic(force_logic)
-		{}
-
-		void push(netlist_sig_t newQ, netlist_time delay) noexcept
-		{
-			if (!m_tristate)
-				logic_output_t::push(newQ, delay);
-			m_last_logic = newQ;
-		}
-
-		void set_tristate(netlist_sig_t v,
-			netlist_time ts_off_on, netlist_time ts_on_off) noexcept
-		{
-			if (!m_force_logic)
-				if (v != m_tristate)
-				{
-					logic_output_t::push((v != 0) ? OUT_TRISTATE() : m_last_logic, v ? ts_off_on : ts_on_off);
-					m_tristate = v;
-				}
-		}
-
-		bool is_force_logic() const noexcept
-		{
-			return m_force_logic;
-		}
-
-	private:
-		using logic_output_t::initial;
-		using logic_output_t::set_Q_time;
-		state_var<netlist_sig_t> m_last_logic;
-		state_var<netlist_sig_t> m_tristate;
-		bool m_force_logic;
-	};
-
-
-	// -----------------------------------------------------------------------------
-	// analog_output_t
-	// -----------------------------------------------------------------------------
-
-	class analog_output_t : public analog_t
-	{
-	public:
-		analog_output_t(core_device_t &dev, const pstring &aname);
-
-		void push(nl_fptype val) noexcept;
-		void initial(nl_fptype val) noexcept;
-
-	private:
-		analog_net_t m_my_net;
-	};
-
-	/// @brief Base class for all device parameters
-	///
-	/// All device parameters classes derive from this object.
-	class param_t : public detail::device_object_t
-	{
-	public:
-
-		enum param_type_t {
-			STRING,
-			DOUBLE,
-			INTEGER,
-			LOGIC,
-			POINTER // Special-case which is always initialized at MAME startup time
-		};
-
-		//deviceless, it's the responsibility of the owner to register!
-		param_t(const pstring &name);
-
-		param_t(core_device_t &device, const pstring &name);
-
-		PCOPYASSIGNMOVE(param_t, delete)
-		virtual ~param_t() noexcept;
-
-		param_type_t param_type() const noexcept(false);
-
-		virtual pstring valstr() const = 0;
-
-	protected:
-
-		void update_param() noexcept;
-
-		pstring get_initial(const core_device_t *dev, bool *found) const;
-
-		template<typename C>
-		void set_and_update_param(C &p, const C v) noexcept
-		{
-			if (p != v)
-			{
-				p = v;
-				update_param();
-			}
-		}
-
-	};
-
-	// -----------------------------------------------------------------------------
-	// numeric parameter template
-	// -----------------------------------------------------------------------------
-
-	template <typename T>
-	class param_num_t final: public param_t
-	{
-	public:
-		using value_type = T;
-
-		param_num_t(core_device_t &device, const pstring &name, T val) noexcept(false);
-
-		T operator()() const noexcept { return m_param; }
-		operator T() const noexcept { return m_param; }
-
-		void set(const T &param) noexcept { set_and_update_param(m_param, param); }
-
-		pstring valstr() const override
-		{
-			return plib::pfmt("{}").e(gsl::narrow<nl_fptype>(m_param));
-		}
-
-	private:
-		T m_param;
-	};
-
-	template <typename T>
-	class param_enum_t final: public param_t
-	{
-	public:
-		using value_type = T;
-
-		param_enum_t(core_device_t &device, const pstring &name, T val) noexcept(false);
-
-		T operator()() const noexcept { return T(m_param); }
-		operator T() const noexcept { return T(m_param); }
-		void set(const T &param) noexcept { set_and_update_param(m_param, static_cast<int>(param)); }
-
-		pstring valstr() const override
-		{
-			// returns the numerical value
-			return plib::pfmt("{}")(m_param);
-		}
-	private:
-		int m_param;
-	};
-
-	// FIXME: these should go as well
-	using param_logic_t = param_num_t<bool>;
-	using param_int_t = param_num_t<int>;
-	using param_fp_t = param_num_t<nl_fptype>;
-
-	// -----------------------------------------------------------------------------
-	// pointer parameter
-	// -----------------------------------------------------------------------------
-
-	// FIXME: not a core component -> legacy
-	class param_ptr_t final: public param_t
-	{
-	public:
-		param_ptr_t(core_device_t &device, const pstring &name, std::uint8_t* val);
-		std::uint8_t * operator()() const noexcept { return m_param; }
-		void set(std::uint8_t *param) noexcept { set_and_update_param(m_param, param); }
-
-		pstring valstr() const override
-		{
-			// returns something which errors
-			return pstring("PTRERROR");
-		}
-
-	private:
-		std::uint8_t* m_param;
-	};
-
-	// -----------------------------------------------------------------------------
-	// string parameter
-	// -----------------------------------------------------------------------------
-
-	class param_str_t : public param_t
-	{
-	public:
-		param_str_t(core_device_t &device, const pstring &name, const pstring &val);
-		param_str_t(netlist_state_t &state, const pstring &name, const pstring &val);
-
-		pstring operator()() const noexcept { return str(); }
-		void set(const pstring &param)
-		{
-			if (*m_param != param)
-			{
-				*m_param = param;
-				changed();
-				update_param();
-			}
-		}
-		pstring valstr() const override
-		{
-			return *m_param;
-		}
-	protected:
-		virtual void changed() noexcept;
-		pstring str() const noexcept { pstring ret = *m_param; return ret;}
-	private:
-		host_arena::unique_ptr<pstring> m_param;
-	};
-
-	// -----------------------------------------------------------------------------
-	// model parameter
-	// -----------------------------------------------------------------------------
-
-	class param_model_t : public param_str_t
-	{
-	public:
-
-		template <typename T>
-		class value_base_t
-		{
-		public:
-			template <typename P, typename Y=T, typename DUMMY = std::enable_if_t<plib::is_arithmetic<Y>::value>>
-			value_base_t(P &param, const pstring &name)
-			: m_value(gsl::narrow<T>(param.value(name)))
-			{
-			}
-			template <typename P, typename Y=T, std::enable_if_t<!plib::is_arithmetic<Y>::value, int> = 0>
-			value_base_t(P &param, const pstring &name)
-			: m_value(static_cast<T>(param.value_str(name)))
-			{
-			}
-			T operator()() const noexcept { return m_value; }
-			operator T() const noexcept { return m_value; }
-		private:
-			const T m_value;
-		};
-
-		using value_t = value_base_t<nl_fptype>;
-		using value_str_t = value_base_t<pstring>;
-
-		param_model_t(core_device_t &device, const pstring &name, const pstring &val)
-		: param_str_t(device, name, val)
-		{
-		}
-
-		pstring value_str(const pstring &entity);
-		nl_fptype value(const pstring &entity);
-		pstring type();
-		// hide this
-		void set(const pstring &param) = delete;
-	protected:
-		void changed() noexcept override;
-	private:
-	};
-
-	// -----------------------------------------------------------------------------
-	// data parameter
-	// -----------------------------------------------------------------------------
-
-	class param_data_t : public param_str_t
-	{
-	public:
-		param_data_t(core_device_t &device, const pstring &name)
-		: param_str_t(device, name, "")
-		{
-		}
-
-		std::unique_ptr<std::istream> stream();
-	protected:
-		void changed() noexcept override { }
-	};
-
-	// -----------------------------------------------------------------------------
-	// rom parameter
-	// -----------------------------------------------------------------------------
-
-	template <typename ST, std::size_t AW, std::size_t DW>
-	class param_rom_t final: public param_data_t
-	{
-	public:
-
-		param_rom_t(core_device_t &device, const pstring &name);
-
-		const ST & operator[] (std::size_t n) const noexcept { return m_data[n]; }
-	protected:
-		void changed() noexcept override
-		{
-			stream()->read(reinterpret_cast<std::istream::char_type *>(&m_data[0]),1<<AW);
-		}
-
-	private:
-		std::array<ST, 1 << AW> m_data;
-	};
-
-
-	// -----------------------------------------------------------------------------
-	// core_device_t
-	// -----------------------------------------------------------------------------
-
-	class core_device_t : public detail::netlist_object_t
-	{
-	public:
-		core_device_t(netlist_state_t &owner, const pstring &name);
-		core_device_t(core_device_t &owner, const pstring &name);
-
-		PCOPYASSIGNMOVE(core_device_t, delete)
-
-		virtual ~core_device_t() noexcept = default;
-
-		void do_inc_active() noexcept
-		{
-			if (m_hint_deactivate)
-			{
-				if (++m_active_outputs == 1)
-				{
-					if (m_stats)
-						m_stats->m_stat_inc_active.inc();
-					inc_active();
-				}
-			}
-		}
-
-		void do_dec_active() noexcept
-		{
-			if (m_hint_deactivate)
-				if (--m_active_outputs == 0)
-				{
-					dec_active();
-				}
-		}
-
-		void set_hint_deactivate(bool v) noexcept { m_hint_deactivate = v; }
-		bool get_hint_deactivate() const noexcept { return m_hint_deactivate; }
-		// Has to be set in device reset
-		void set_active_outputs(int n) noexcept { m_active_outputs = n; }
-
-		void set_default_delegate(detail::core_terminal_t &term);
-
-		// stats
-		struct stats_t
-		{
-			// NL_KEEP_STATISTICS
-			plib::pperftime_t<true>  m_stat_total_time;
-			plib::pperfcount_t<true> m_stat_call_count;
-			plib::pperfcount_t<true> m_stat_inc_active;
-		};
-
-		stats_t * stats() const noexcept { return m_stats.get(); }
-
-		virtual void update() noexcept { }
-		virtual void reset() { }
-
-	protected:
-
-		virtual void inc_active() noexcept {  }
-		virtual void dec_active() noexcept {  }
-
-		log_type & log();
-
-	public:
-		virtual void timestep(const nl_fptype st) noexcept { plib::unused_var(st); }
-		virtual void update_terminals() noexcept { }
-
-		virtual void update_param() noexcept {}
-		virtual bool is_dynamic() const noexcept { return false; }
-		virtual bool is_timestep() const noexcept { return false; }
-
-	private:
-		bool            m_hint_deactivate;
-		state_var_s32   m_active_outputs;
-		device_arena::unique_ptr<stats_t> m_stats;
-	};
-
-	// -----------------------------------------------------------------------------
-	// base_device_t
-	// -----------------------------------------------------------------------------
-
-	class base_device_t :   public core_device_t
-	{
-	public:
-		base_device_t(netlist_state_t &owner, const pstring &name);
-		base_device_t(base_device_t &owner, const pstring &name);
-
-		PCOPYASSIGNMOVE(base_device_t, delete)
-
-		~base_device_t() noexcept override = default;
-
-		template<class O, class C, typename... Args>
-		void create_and_register_subdevice(O& owner, const pstring &name, device_arena::unique_ptr<C> &dev, Args&&... args);
-
-		void register_subalias(const pstring &name, const detail::core_terminal_t &term);
-		void register_subalias(const pstring &name, const pstring &aliased);
-
-		void connect(const pstring &t1, const pstring &t2);
-		void connect(const detail::core_terminal_t &t1, const detail::core_terminal_t &t2);
-	protected:
-
-		NETLIB_UPDATEI() { }
-		NETLIB_UPDATE_TERMINALSI() { }
-
-	private:
-	};
-
-	// -----------------------------------------------------------------------------
-	// device_t
-	// -----------------------------------------------------------------------------
-
-	class device_t :    public base_device_t,
-						public logic_family_t
-	{
-	public:
-		device_t(netlist_state_t &owner, const pstring &name);
-		device_t(netlist_state_t &owner, const pstring &name,
-			const pstring &model);
-		// only needed by proxies
-		device_t(netlist_state_t &owner, const pstring &name,
-			const logic_family_desc_t *desc);
-
-		device_t(device_t &owner, const pstring &name);
-		// pass in a default model - this may be overwritten by PARAM(DEVICE.MODEL, "XYZ(...)")
-		device_t(device_t &owner, const pstring &name,
-			const pstring &model);
-
-		PCOPYASSIGNMOVE(device_t, delete)
-
-		~device_t() noexcept override = default;
-
-		//nldelegate default_delegate() { return nldelegate(&device_t::update, this); }
-		nldelegate default_delegate() { return { &device_t::update, this }; }
-	protected:
-
-		NETLIB_UPDATEI() { }
-		NETLIB_UPDATE_TERMINALSI() { }
-
-	private:
-		param_model_t m_model;
-	};
-
-	namespace detail {
-		// Use timed_queue_heap to use stdc++ heap functions instead of linear processing.
-		// This slows down processing by about 25% on a Kaby Lake.
-		// template <class T, bool TS>
-		// using timed_queue = plib::timed_queue_heap<T, TS>;
-
-		template <class T, bool TS>
-		using timed_queue = plib::timed_queue_linear<T, TS>;
-
-		// -----------------------------------------------------------------------------
-		// queue_t
-		// -----------------------------------------------------------------------------
-
-		// We don't need a thread-safe queue currently. Parallel processing of
-		// solvers will update inputs after parallel processing.
-
-		class queue_t :
-				//public timed_queue<pqentry_t<net_t *, netlist_time>, false, NL_KEEP_STATISTICS>,
-				public timed_queue<plib::pqentry_t<netlist_time_ext, net_t *>, false>,
-				public netlist_object_t,
-				public plib::state_manager_t::callback_t
-		{
-		public:
-			using entry_t = plib::pqentry_t<netlist_time_ext, net_t *>;
-			using base_queue = timed_queue<entry_t, false>;
-			explicit queue_t(netlist_t &nl, const pstring &name);
-			~queue_t() noexcept override = default;
-
-			queue_t(const queue_t &) = delete;
-			queue_t(queue_t &&) = delete;
-			queue_t &operator=(const queue_t &) = delete;
-			queue_t &operator=(queue_t &&) = delete;
-
-		protected:
-
-			void register_state(plib::state_manager_t &manager, const pstring &module) override;
-			void on_pre_save(plib::state_manager_t &manager) override;
-			void on_post_load(plib::state_manager_t &manager) override;
-
-		private:
-			std::size_t m_qsize;
-			std::vector<netlist_time_ext::internal_type> m_times;
-			std::vector<std::size_t> m_net_ids;
-		};
-
-	} // namespace detail
-
-	// -----------------------------------------------------------------------------
-	// netlist_state__t
-	// -----------------------------------------------------------------------------
-
-	class netlist_state_t
-	{
-	public:
-
-		using nets_collection_type = std::vector<device_arena::owned_ptr<detail::net_t>>;
-		using family_collection_type = std::unordered_map<pstring, host_arena::unique_ptr<logic_family_desc_t>>;
-
-		// need to preserve order of device creation ...
-		using devices_collection_type = std::vector<std::pair<pstring, device_arena::owned_ptr<core_device_t>>>;
-		netlist_state_t(const pstring &name, host_arena::unique_ptr<callbacks_t> &&callbacks);
-
-		PCOPYASSIGNMOVE(netlist_state_t, delete)
-
-		/// \brief Destructor
-		///
-		/// The destructor is virtual to allow implementation specific devices
-		/// to connect to the outside world. For examples see MAME netlist.cpp.
-		///
-		virtual ~netlist_state_t() noexcept = default;
-
-		template<class C>
-		static bool check_class(core_device_t *p) noexcept
-		{
-			return dynamic_cast<C *>(p) != nullptr;
-		}
-
-		core_device_t *get_single_device(const pstring &classname, bool (*cc)(core_device_t *)) const noexcept(false);
-
-		/// \brief Get single device filtered by class and name
-		///
-		/// \tparam C Device class for which devices will be returned
-		/// \param  name Name of the device
-		///
-		/// \return pointers to device
-
-		template<class C>
-		C *get_single_device(const pstring &name) const
-		{
-			return dynamic_cast<C *>(get_single_device(name, check_class<C>));
-		}
-
-		/// \brief Get vector of devices
-		///
-		/// \tparam C Device class for which devices will be returned
-		///
-		/// \return vector with pointers to devices
-
-		template<class C>
-		inline std::vector<C *> get_device_list() const
-		{
-			std::vector<C *> tmp;
-			for (const auto &d : m_devices)
-			{
-				auto * const dev = dynamic_cast<C *>(d.second.get());
-				if (dev != nullptr)
-					tmp.push_back(dev);
-			}
-			return tmp;
-		}
-
-		// logging
-
-		log_type & log() noexcept { return m_log; }
-		const log_type &log() const noexcept { return m_log; }
-
-		plib::dynlib_base &lib() const noexcept { return *m_lib; }
-
-		netlist_t &exec() noexcept { return *m_netlist; }
-		const netlist_t &exec() const noexcept { return *m_netlist; }
-
-		// state handling
-		plib::state_manager_t &run_state_manager() noexcept { return m_state; }
-
-		template<typename O, typename C>
-		void save(O &owner, C &state, const pstring &module, const pstring &stname)
-		{
-			this->run_state_manager().save_item(static_cast<void *>(&owner), state, module + "." + stname);
-		}
-
-		template<typename O, typename C>
-		void save(O &owner, C *state, const pstring &module, const pstring &stname, const std::size_t count)
-		{
-			this->run_state_manager().save_state_ptr(static_cast<void *>(&owner), module + "." + stname, plib::state_manager_t::dtype<C>(), count, state);
-		}
-
-		// FIXME: only used by queue_t save state
-		std::size_t find_net_id(const detail::net_t *net) const;
-
-		template <typename T>
-		void register_net(device_arena::owned_ptr<T> &&net) { m_nets.push_back(std::move(net)); }
-
-		/// \brief Get device pointer by name
-		///
-		///
-		/// \param name Name of the device
-		///
-		/// \return core_device_t pointer if device exists, else nullptr
-
-		core_device_t *find_device(const pstring &name) const
-		{
-			for (const auto & d : m_devices)
-				if (d.first == name)
-					return d.second.get();
-			return nullptr;
-		}
-
-		/// \brief Register device using owned_ptr
-		///
-		/// Used to register owned devices. These are devices declared as objects
-		/// in another devices.
-		///
-		/// \param name Name of the device
-		/// \param dev Device to be registered
-
-		template <typename T>
-		void register_device(const pstring &name, device_arena::owned_ptr<T> &&dev) noexcept(false)
-		{
-			for (auto & d : m_devices)
-				if (d.first == name)
-				{
-					dev.release();
-					log().fatal(MF_DUPLICATE_NAME_DEVICE_LIST(name));
-					throw nl_exception(MF_DUPLICATE_NAME_DEVICE_LIST(name));
-				}
-			//m_devices.push_back(std::move(dev));
-			m_devices.insert(m_devices.end(), { name, std::move(dev) });
-		}
-
-		/// \brief Register device using unique_ptr
-		///
-		/// Used to register devices.
-		///
-		/// \param name Name of the device
-		/// \param dev Device to be registered
-
-		template <typename T>
-		void register_device(const pstring &name, device_arena::unique_ptr<T> &&dev)
-		{
-			register_device(name, device_arena::owned_ptr<T>(dev.release(), true, dev.get_deleter()));
-		}
-
-		/// \brief Remove device
-		///
-		/// Care needs to be applied if this is called to remove devices with
-		/// sub-devices which may have registered state.
-		///
-		/// \param dev Device to be removed
-
-		void remove_device(core_device_t *dev)
-		{
-			for (auto it = m_devices.begin(); it != m_devices.end(); it++)
-				if (it->second.get() == dev)
-				{
-					m_state.remove_save_items(dev);
-					m_devices.erase(it);
-					return;
-				}
-		}
-
-		setup_t &setup() noexcept { return *m_setup; }
-		const setup_t &setup() const noexcept { return *m_setup; }
-
-		nlparse_t &parser();
-		const nlparse_t &parser() const;
-
-		// FIXME: make a postload member and include code there
-		void rebuild_lists(); // must be called after post_load !
-
-		static void compile_defines(std::vector<std::pair<pstring, pstring>> &defs);
-		static pstring version();
-		static pstring version_patchlevel();
-
-		nets_collection_type & nets() noexcept { return m_nets; }
-		const nets_collection_type & nets() const noexcept { return m_nets; }
-
-		devices_collection_type & devices() noexcept { return m_devices; }
-		const devices_collection_type & devices() const noexcept { return m_devices; }
-
-		family_collection_type &family_cache() { return m_family_cache; }
-
-		template<typename T, typename... Args>
-		device_arena::unique_ptr<T> make_pool_object(Args&&... args)
-		{
-			return plib::make_unique<T>(m_pool, std::forward<Args>(args)...);
-		}
-		// memory pool - still needed in some places
-		device_arena &pool() noexcept { return m_pool; }
-		const device_arena &pool() const noexcept { return m_pool; }
-
-		/// \brief set extended validation mode.
-		///
-		/// The extended validation mode is not intended for running.
-		/// The intention is to identify power pins which are not properly
-		/// connected. The downside is that this mode creates a netlist which
-		/// is different (and not able to run).
-		///
-		/// Extended validation is supported by nltool validate option.
-		///
-		/// \param val Boolean value enabling/disabling extended validation mode
-		void set_extended_validation(bool val) { m_extended_validation = val; }
-
-		/// \brief State of extended validation mode.
-		///
-		/// \returns boolean value indicating if extended validation mode is
-		/// turned on.
-		bool is_extended_validation() const { return m_extended_validation; }
-
-		struct stats_info
-		{
-			const detail::queue_t               &m_queue;// performance
-			const plib::pperftime_t<true>       &m_stat_mainloop;
-			const plib::pperfcount_t<true>      &m_perf_out_processed;
-		};
-
-		/// \brief print statistics gathered during run
-		///
-		void print_stats(stats_info &si) const;
-
-		void reset();
-
-	private:
-
-		device_arena                               m_pool; // must be deleted last!
-
-		device_arena::unique_ptr<netlist_t>        m_netlist;
-		host_arena::unique_ptr<plib::dynlib_base>  m_lib;
-		plib::state_manager_t               m_state;
-		host_arena::unique_ptr<callbacks_t>        m_callbacks;
-		log_type                                   m_log;
-
-		// FIXME: should only be available during device construcion
-		host_arena::unique_ptr<setup_t>            m_setup;
-
-		nets_collection_type                       m_nets;
-		// sole use is to manage lifetime of net objects
-		devices_collection_type                    m_devices;
-		// sole use is to manage lifetime of family objects
-		family_collection_type                     m_family_cache;
-		bool                                       m_extended_validation;
-
-		// dummy version
-		int                                        m_dummy_version;
-	};
-
-	namespace devices
-	{
-		// -----------------------------------------------------------------------------
-		// mainclock
-		// -----------------------------------------------------------------------------
-
-		NETLIB_OBJECT(mainclock)
-		{
-			NETLIB_CONSTRUCTOR(mainclock)
-			, m_Q(*this, "Q")
-			, m_freq(*this, "FREQ", nlconst::magic(7159000.0 * 5))
-			{
-				m_inc = netlist_time::from_fp(plib::reciprocal(m_freq()*nlconst::two()));
-			}
-
-			NETLIB_RESETI()
-			{
-				m_Q.net().set_next_scheduled_time(netlist_time_ext::zero());
-			}
-
-			NETLIB_UPDATE_PARAMI()
-			{
-				m_inc = netlist_time::from_fp(plib::reciprocal(m_freq()*nlconst::two()));
-			}
-
-			NETLIB_UPDATEI()
-			{
-				// only called during start up.
-				// mainclock will step forced by main loop
-			}
-
-		public:
-			logic_output_t m_Q; // NOLINT: needed in core
-			netlist_time m_inc; // NOLINT: needed in core
-		private:
-			param_fp_t m_freq;
-		};
-	} // namespace devices
-
-	// -----------------------------------------------------------------------------
-	// netlist_t
-	// -----------------------------------------------------------------------------
-
-	class netlist_t // NOLINT(clang-analyzer-optin.performance.Padding)
-	{
-	public:
-
-		explicit netlist_t(netlist_state_t &state, const pstring &aname);
-
-		PCOPYASSIGNMOVE(netlist_t, delete)
-
-		virtual ~netlist_t() noexcept = default;
-
-		// run functions
-
-		netlist_time_ext time() const noexcept { return m_time; }
-
-		void process_queue(netlist_time_ext delta) noexcept;
-		void abort_current_queue_slice() noexcept
-		{
-			if (!NL_USE_QUEUE_STATS || !m_use_stats)
-				m_queue.retime<false>(detail::queue_t::entry_t(m_time, nullptr));
-			else
-				m_queue.retime<true>(detail::queue_t::entry_t(m_time, nullptr));
-		}
-
-		const detail::queue_t &queue() const noexcept { return m_queue; }
-
-		template<typename... Args>
-		void qpush(Args&&...args) noexcept
-		{
-			if (!NL_USE_QUEUE_STATS || !m_use_stats)
-				m_queue.emplace<false>(std::forward<Args>(args)...); // NOLINT(performance-move-const-arg)
-			else
-				m_queue.emplace<true>(std::forward<Args>(args)...); // NOLINT(performance-move-const-arg)
-		}
-
-		template <class R>
-		void qremove(const R &elem) noexcept
-		{
-			if (!NL_USE_QUEUE_STATS || !m_use_stats)
-				m_queue.remove<false>(elem);
-			else
-				m_queue.remove<true>(elem);
-		}
-
-		// Control functions
-
-		void stop();
-		void reset();
-
-		// only used by nltool to create static c-code
-		devices::NETLIB_NAME(solver) *solver() const noexcept { return m_solver; }
-
-		// force late type resolution
-		template <typename X = devices::NETLIB_NAME(solver)>
-		nl_fptype gmin(X *solv = nullptr) const noexcept
-		{
-			plib::unused_var(solv);
-			return static_cast<X *>(m_solver)->gmin();
-		}
-
-		netlist_state_t &nlstate() noexcept { return m_state; }
-		const netlist_state_t &nlstate() const noexcept { return m_state; }
-
-		log_type & log() noexcept { return m_state.log(); }
-		const log_type &log() const noexcept { return m_state.log(); }
-
-		void print_stats() const;
-
-		bool stats_enabled() const noexcept { return m_use_stats; }
-		void enable_stats(bool val) noexcept { m_use_stats = val; }
-
-	private:
-
-		template <bool KEEP_STATS>
-		void process_queue_stats(netlist_time_ext delta) noexcept;
-
-		netlist_state_t &                   m_state;
-		devices::NETLIB_NAME(solver) *      m_solver;
-
-		// mostly rw
-		PALIGNAS_CACHELINE()
-		netlist_time_ext                    m_time;
-		devices::NETLIB_NAME(mainclock) *   m_mainclock;
-
-		PALIGNAS_CACHELINE()
-		detail::queue_t                     m_queue;
-		bool                                m_use_stats;
-		// performance
-		plib::pperftime_t<true>             m_stat_mainloop;
-		plib::pperfcount_t<true>            m_perf_out_processed;
-	};
-
-	// -----------------------------------------------------------------------------
-	// Support classes for devices
-	// -----------------------------------------------------------------------------
-
-	template<class C, std::size_t N>
-	class object_array_base_t : public plib::uninitialised_array_t<C, N>
-	{
-	public:
-		template<class D, typename... Args>
-		object_array_base_t(D &dev, const std::initializer_list<const char *> &names, Args&&... args)
-		{
-			passert_always_msg(names.size() == N, "initializer_list size mismatch");
-			std::size_t i = 0;
-			for (const auto &n : names)
-				this->emplace(i++, dev, pstring(n), std::forward<Args>(args)...);
-		}
-
-		template<class D>
-		object_array_base_t(D &dev, const pstring &fmt)
-		{
-			for (std::size_t i = 0; i<N; i++)
-				this->emplace(i, dev, formatted(fmt, i));
-		}
-
-		template<class D, typename... Args>
-		object_array_base_t(D &dev, std::size_t offset, const pstring &fmt, Args&&... args)
-		{
-			for (std::size_t i = 0; i<N; i++)
-				this->emplace(i, dev, formatted(fmt, i+offset), std::forward<Args>(args)...);
-		}
-
-		template<class D>
-		object_array_base_t(D &dev, std::size_t offset, const pstring &fmt, nldelegate delegate)
-		{
-			for (std::size_t i = 0; i<N; i++)
-				this->emplace(i, dev, formatted(fmt, i+offset), delegate);
-		}
-
-		template<class D>
-		object_array_base_t(D &dev, std::size_t offset, std::size_t qmask, const pstring &fmt)
-		{
-			for (std::size_t i = 0; i<N; i++)
-			{
-				pstring name(formatted(fmt, i+offset));
-				if ((qmask >> i) & 1)
-					name += "Q";
-				this->emplace(i, dev, name);
-			}
-		}
-	protected:
-		object_array_base_t() = default;
-
-		static pstring formatted(const pstring &fmt, std::size_t n)
-		{
-			if (N != 1)
-				return plib::pfmt(fmt)(n);
-			return plib::pfmt(fmt)("");
-		}
-	};
-
-
-	template<class C, std::size_t N>
-	class object_array_t : public object_array_base_t<C, N>
-	{
-	public:
-		using base_type = object_array_base_t<C, N>;
-		using base_type::base_type;
-	};
-
-	template<std::size_t N>
-	class object_array_t<logic_input_t,N> : public object_array_base_t<logic_input_t, N>
-	{
-	public:
-		using base_type = object_array_base_t<logic_input_t, N>;
-		using base_type::base_type;
-
-		template<class D, std::size_t ND>
-		object_array_t(D &dev, std::size_t offset, std::size_t qmask,
-			const pstring &fmt, std::array<nldelegate, ND> &&delegates)
-		{
-			passert_always_msg(delegates.size() >= N, "initializer_list size mismatch");
-			std::size_t i = 0;
-			for (auto &e : delegates)
-			{
-				if (i < N)
-				{
-					pstring name(this->formatted(fmt, i+offset));
-					if ((qmask >> i) & 1)
-						name += "Q";
-					this->emplace(i, dev, name, e);
-				}
-				i++;
-			}
-		}
-
-		//using value_type = typename plib::fast_type_for_bits<N>::type;
-		using value_type = std::uint32_t;
-		value_type operator ()()
-		{
-			if (N == 1) return e<0>() ;
-			if (N == 2) return e<0>() | (e<1>() << 1);
-			if (N == 3) return e<0>() | (e<1>() << 1) | (e<2>() << 2);
-			if (N == 4) return e<0>() | (e<1>() << 1) | (e<2>() << 2) | (e<3>() << 3);
-			if (N == 5) return e<0>() | (e<1>() << 1) | (e<2>() << 2) | (e<3>() << 3)
-				| (e<4>() << 4);
-			if (N == 6) return e<0>() | (e<1>() << 1) | (e<2>() << 2) | (e<3>() << 3)
-				| (e<4>() << 4) | (e<5>() << 5);
-			if (N == 7) return e<0>() | (e<1>() << 1) | (e<2>() << 2) | (e<3>() << 3)
-				| (e<4>() << 4) | (e<5>() << 5) | (e<6>() << 6);
-			if (N == 8) return e<0>() | (e<1>() << 1) | (e<2>() << 2) | (e<3>() << 3)
-				| (e<4>() << 4) | (e<5>() << 5) | (e<6>() << 6) | (e<7>() << 7);
-
-			value_type r(0);
-			for (std::size_t i = 0; i < N; i++)
-				r = static_cast<value_type>((*this)[i]() << (N-1)) | (r >> 1);
-			return r;
-		}
-
-	private:
-		template <std::size_t P>
-		inline constexpr value_type e() const { return (*this)[P](); }
-	};
-
-	template<std::size_t N>
-	class object_array_t<logic_output_t,N> : public object_array_base_t<logic_output_t, N>
-	{
-	public:
-		using base_type = object_array_base_t<logic_output_t, N>;
-		using base_type::base_type;
-
-		template <typename T>
-		inline void push(const T &v, const netlist_time &t)
-		{
-			if (N >= 1) (*this)[0].push((v >> 0) & 1, t);
-			if (N >= 2) (*this)[1].push((v >> 1) & 1, t);
-			if (N >= 3) (*this)[2].push((v >> 2) & 1, t);
-			if (N >= 4) (*this)[3].push((v >> 3) & 1, t);
-			if (N >= 5) (*this)[4].push((v >> 4) & 1, t);
-			if (N >= 6) (*this)[5].push((v >> 5) & 1, t);
-			if (N >= 7) (*this)[6].push((v >> 6) & 1, t);
-			if (N >= 8) (*this)[7].push((v >> 7) & 1, t);
-			for (std::size_t i = 8; i < N; i++)
-				(*this)[i].push((v >> i) & 1, t);
-		}
-
-		template<typename T>
-		void push(const T &v, const netlist_time * t)
-		{
-			if (N >= 1) (*this)[0].push((v >> 0) & 1, t[0]);
-			if (N >= 2) (*this)[1].push((v >> 1) & 1, t[1]);
-			if (N >= 3) (*this)[2].push((v >> 2) & 1, t[2]);
-			if (N >= 4) (*this)[3].push((v >> 3) & 1, t[3]);
-			if (N >= 5) (*this)[4].push((v >> 4) & 1, t[4]);
-			if (N >= 6) (*this)[5].push((v >> 5) & 1, t[5]);
-			if (N >= 7) (*this)[6].push((v >> 6) & 1, t[6]);
-			if (N >= 8) (*this)[7].push((v >> 7) & 1, t[7]);
-			for (std::size_t i = 8; i < N; i++)
-				(*this)[i].push((v >> i) & 1, t[i]);
-		}
-
-		template<typename T, std::size_t NT>
-		void push(const T &v, const std::array<netlist_time, NT> &t)
-		{
-			static_assert(NT >= N, "Not enough timing entries provided");
-
-			push(v, t.data());
-		}
-
-		void set_tristate(netlist_sig_t v,
-			netlist_time ts_off_on, netlist_time ts_on_off) noexcept
-		{
-			for (std::size_t i = 0; i < N; i++)
-				(*this)[i].set_tristate(v, ts_off_on, ts_on_off);
-		}
-	};
-
-	template<std::size_t N>
-	class object_array_t<tristate_output_t,N> : public object_array_base_t<tristate_output_t, N>
-	{
-	public:
-		using base_type = object_array_base_t<tristate_output_t, N>;
-		using base_type::base_type;
-
-		template <typename T>
-		inline void push(const T &v, const netlist_time &t)
-		{
-			if (N >= 1) (*this)[0].push((v >> 0) & 1, t);
-			if (N >= 2) (*this)[1].push((v >> 1) & 1, t);
-			if (N >= 3) (*this)[2].push((v >> 2) & 1, t);
-			if (N >= 4) (*this)[3].push((v >> 3) & 1, t);
-			if (N >= 5) (*this)[4].push((v >> 4) & 1, t);
-			if (N >= 6) (*this)[5].push((v >> 5) & 1, t);
-			if (N >= 7) (*this)[6].push((v >> 6) & 1, t);
-			if (N >= 8) (*this)[7].push((v >> 7) & 1, t);
-			for (std::size_t i = 8; i < N; i++)
-				(*this)[i].push((v >> i) & 1, t);
-		}
-
-		void set_tristate(netlist_sig_t v,
-			netlist_time ts_off_on, netlist_time ts_on_off) noexcept
-		{
-			for (std::size_t i = 0; i < N; i++)
-				(*this)[i].set_tristate(v, ts_off_on, ts_on_off);
-		}
-	};
-
-	// -----------------------------------------------------------------------------
-	// power pins - not a device, but a helper
-	// -----------------------------------------------------------------------------
-
-	/// \brief Power pins class.
-	///
-	/// Power Pins are passive inputs. Delegate noop will silently ignore any
-	/// updates.
-
-	class nld_power_pins
-	{
-	public:
-		using this_type = nld_power_pins;
-
-		explicit nld_power_pins(device_t &owner, const pstring &sVCC = sPowerVCC,
-			const pstring &sGND = sPowerGND)
-		: m_VCC(owner, sVCC, NETLIB_DELEGATE(noop))
-		, m_GND(owner, sGND, NETLIB_DELEGATE(noop))
-		{
-		}
-
-		const analog_input_t &VCC() const noexcept
-		{
-			return m_VCC;
-		}
-		const analog_input_t &GND() const noexcept
-		{
-			return m_GND;
-		}
-
-	private:
-		void noop() { }
-		analog_input_t m_VCC;
-		analog_input_t m_GND;
-	};
-
-	// -----------------------------------------------------------------------------
-	// Hot section
-	//
-	// Any changes below will impact performance.
-	// -----------------------------------------------------------------------------
-
-	// -----------------------------------------------------------------------------
-	// logic_input_t
-	// -----------------------------------------------------------------------------
-
-#if 0
-	template <class D>
-	logic_input_t::logic_input_t(D &dev, const pstring &aname)
-			: logic_input_t(dev, aname, STATE_INP_ACTIVE, nldelegate(&D :: update, &dev))
-	{
-	}
-#endif
-	inline void logic_input_t::inactivate() noexcept
-	{
-		if (!is_state(STATE_INP_PASSIVE))
-		{
-			set_state(STATE_INP_PASSIVE);
-			net().remove_from_active_list(*this);
-		}
-	}
-
-	inline void logic_input_t::activate() noexcept
-	{
-		if (is_state(STATE_INP_PASSIVE))
-		{
-			net().add_to_active_list(*this);
-			set_state(STATE_INP_ACTIVE);
-		}
-	}
-
-	inline void logic_input_t::activate_hl() noexcept
-	{
-		if (is_state(STATE_INP_PASSIVE))
-		{
-			net().add_to_active_list(*this);
-			set_state(STATE_INP_HL);
-		}
-	}
-
-	inline void logic_input_t::activate_lh() noexcept
-	{
-		if (is_state(STATE_INP_PASSIVE))
-		{
-			net().add_to_active_list(*this);
-			set_state(STATE_INP_LH);
-		}
-	}
-
-	inline void detail::net_t::push_to_queue(const netlist_time &delay) noexcept
-	{
-		if (has_connections())
-		{
-			if (!!is_queued())
-				exec().qremove(this);
-
-			const auto nst(exec().time() + delay);
-			m_next_scheduled_time = nst;
-
-			if (!m_list_active.empty())
-			{
-				m_in_queue = queue_status::QUEUED;
-				exec().qpush(nst, this);
-			}
-			else
-			{
-				m_in_queue = queue_status::DELAYED_DUE_TO_INACTIVE;
-				update_inputs();
-			}
-		}
-	}
-
-	inline void detail::net_t::add_to_active_list(core_terminal_t &term) noexcept
-	{
-		if (!m_list_active.empty())
-		{
-			term.set_copied_input(m_cur_Q);
-			m_list_active.push_front(&term);
-		}
-		else
-		{
-			m_list_active.push_front(&term);
-			railterminal().device().do_inc_active();
-			if (m_in_queue == queue_status::DELAYED_DUE_TO_INACTIVE)
-			{
-				if (m_next_scheduled_time > exec().time())
-				{
-					m_in_queue = queue_status::QUEUED;     // pending
-					exec().qpush(m_next_scheduled_time, this);
-				}
-				else
-				{
-					m_in_queue = queue_status::DELIVERED;
-					m_cur_Q = m_new_Q;
-				}
-				update_inputs();
-			}
-			else
-				term.set_copied_input(m_cur_Q);
-		}
-	}
-
-	inline void detail::net_t::remove_from_active_list(core_terminal_t &term) noexcept
-	{
-		gsl_Expects(!m_list_active.empty());
-		m_list_active.remove(&term);
-		if (m_list_active.empty())
-			railterminal().device().do_dec_active();
-	}
-
-	inline const analog_net_t & analog_t::net() const noexcept
-	{
-		return plib::downcast<const analog_net_t &>(core_terminal_t::net());
-	}
-
-	inline analog_net_t & analog_t::net() noexcept
-	{
-		return plib::downcast<analog_net_t &>(core_terminal_t::net());
-	}
-
-	inline nl_fptype terminal_t::operator ()() const noexcept { return net().Q_Analog(); }
-
-	inline logic_net_t & logic_t::net() noexcept
-	{
-		return plib::downcast<logic_net_t &>(core_terminal_t::net());
-	}
-
-	inline const logic_net_t & logic_t::net() const noexcept
-	{
-		return plib::downcast<const logic_net_t &>(core_terminal_t::net());
-	}
-
-	inline netlist_sig_t logic_input_t::operator()() const noexcept
-	{
-		nl_assert(terminal_state() != STATE_INP_PASSIVE);
-#if NL_USE_COPY_INSTEAD_OF_REFERENCE
-		return m_Q;
-#else
-		return net().Q();
-#endif
-	}
-
-	inline nl_fptype analog_input_t::Q_Analog() const noexcept
-	{
-		return net().Q_Analog();
-	}
-
-	inline void analog_output_t::push(nl_fptype val) noexcept
-	{
-		if (val != m_my_net.Q_Analog())
-		{
-			m_my_net.set_Q_Analog(val);
-			m_my_net.toggle_and_push_to_queue(netlist_time::quantum());
-		}
-	}
-
-	inline netlist_t &detail::device_object_t::exec() noexcept
-	{
-		return m_device->exec();
-	}
-
-	inline const netlist_t &detail::device_object_t::exec() const noexcept
-	{
-		return m_device->exec();
-	}
-
-	template <bool KEEP_STATS, typename T, typename S>
-	inline void detail::net_t::process(T mask, const S &sig) noexcept
-	{
-		m_cur_Q = sig;
-
-		if (KEEP_STATS)
-		{
-			for (auto & p : m_list_active)
-			{
-				p.set_copied_input(sig);
-				auto *stats(p.device().stats());
-				stats->m_stat_call_count.inc();
-				if ((p.terminal_state() & mask))
-				{
-					auto g(stats->m_stat_total_time.guard());
-					p.run_delegate();
-				}
-			}
-		}
-		else
-		{
-			for (auto &p : m_list_active)
-			{
-				p.set_copied_input(sig);
-				if ((p.terminal_state() & mask) != 0)
-					p.run_delegate();
-			}
-		}
-	}
-
-	template <bool KEEP_STATS>
-	inline void detail::net_t::update_devs() noexcept
-	{
-		nl_assert(this->is_rail_net());
-
-		m_in_queue = queue_status::DELIVERED; // mark as taken ...
-		if (m_new_Q ^ m_cur_Q)
-		{
-			process<KEEP_STATS>((m_new_Q << core_terminal_t::INP_LH_SHIFT)
-				| (m_cur_Q << core_terminal_t::INP_HL_SHIFT), m_new_Q);
-		}
-	}
-
-	template <bool KEEP_STATS>
-	inline void netlist_t::process_queue_stats(const netlist_time_ext delta) noexcept
-	{
-		netlist_time_ext stop(m_time + delta);
-
-		qpush(stop, nullptr);
-
-		if (m_mainclock == nullptr)
-		{
-			m_time = m_queue.top().exec_time();
-			detail::net_t *obj(m_queue.top().object());
-			m_queue.pop();
-
-			while (obj != nullptr)
-			{
-				obj->template update_devs<KEEP_STATS>();
-				if (KEEP_STATS)
-					m_perf_out_processed.inc();
-				const detail::queue_t::entry_t *top = &m_queue.top();
-				m_time = top->exec_time();
-				obj = top->object();
-				m_queue.pop();
-			}
-		}
-		else
-		{
-			logic_net_t &mc_net(m_mainclock->m_Q.net());
-			const netlist_time inc(m_mainclock->m_inc);
-			netlist_time_ext mc_time(mc_net.next_scheduled_time());
-
-			do
-			{
-				const detail::queue_t::entry_t *top = &m_queue.top();
-				while (top->exec_time() > mc_time)
-				{
-					m_time = mc_time;
-					mc_net.toggle_new_Q();
-					mc_net.update_devs<KEEP_STATS>();
-					top = &m_queue.top();
-					mc_time += inc;
-				}
-
-				m_time = top->exec_time();
-				auto *const obj(top->object());
-				m_queue.pop();
-				if (obj != nullptr)
-					obj->template update_devs<KEEP_STATS>();
-				else
-					break;
-				if (KEEP_STATS)
-					m_perf_out_processed.inc();
-			} while (true);
-
-			mc_net.set_next_scheduled_time(mc_time);
-		}
-	}
-
-	inline void netlist_t::process_queue(netlist_time_ext delta) noexcept
-	{
-		if (!m_use_stats)
-			process_queue_stats<false>(delta);
-		else
-		{
-			auto sm_guard(m_stat_mainloop.guard());
-			process_queue_stats<true>(delta);
-		}
-	}
-
-
-
-	// -----------------------------------------------------------------------------
-	// inline implementations - cold
-	// -----------------------------------------------------------------------------
-
-	inline netlist_state_t & detail::netlist_object_t::state() noexcept
-	{
-		return m_netlist.nlstate();
-	}
-
-	inline const netlist_state_t & detail::netlist_object_t::state() const noexcept
-	{
-		return m_netlist.nlstate();
-	}
-
-	template<typename T, typename... Args>
-	inline device_arena::unique_ptr<T> detail::netlist_object_t::make_pool_object(Args&&... args)
-	{
-		return state().make_pool_object<T>(std::forward<Args>(args)...);
-	}
-
-	inline void param_t::update_param() noexcept
-	{
-		device().update_param();
-	}
-
-	template <typename T>
-	param_num_t<T>::param_num_t(core_device_t &device, const pstring &name, const T val)
-	: param_t(device, name)
-	, m_param(val)
-	{
-		bool found = false;
-		pstring p = this->get_initial(&device, &found);
-		if (found)
-		{
-			plib::pfunction<nl_fptype> func;
-			func.compile_infix(p, {});
-			auto valx = func.evaluate();
-			if (plib::is_integral<T>::value)
-				if (plib::abs(valx - plib::trunc(valx)) > nlconst::magic(1e-6))
-					throw nl_exception(MF_INVALID_NUMBER_CONVERSION_1_2(device.name() + "." + name, p));
-			m_param = plib::narrow_cast<T>(valx);
-		}
-
-		device.state().save(*this, m_param, this->name(), "m_param");
-	}
-
-	template <typename T>
-	param_enum_t<T>::param_enum_t(core_device_t &device, const pstring &name, const T val)
-	: param_t(device, name)
-	, m_param(val)
-	{
-		bool found = false;
-		pstring p = this->get_initial(&device, &found);
-		if (found)
-		{
-			T temp(val);
-			bool ok = temp.set_from_string(p);
-			if (!ok)
-			{
-				device.state().log().fatal(MF_INVALID_ENUM_CONVERSION_1_2(name, p));
-				throw nl_exception(MF_INVALID_ENUM_CONVERSION_1_2(name, p));
-			}
-			m_param = temp;
-		}
-
-		device.state().save(*this, m_param, this->name(), "m_param");
-	}
-
-	template <typename ST, std::size_t AW, std::size_t DW>
-	param_rom_t<ST, AW, DW>::param_rom_t(core_device_t &device, const pstring &name)
-	: param_data_t(device, name)
-	{
-		auto f = stream();
-		if (f != nullptr)
-		{
-			f->read(reinterpret_cast<std::istream::char_type *>(&m_data[0]),1<<AW);
-			// FIXME: check for failbit if not in validation.
-		}
-		else
-			device.state().log().warning(MW_ROM_NOT_FOUND(str()));
-	}
-
-	template<class O, class C, typename... Args>
-	void base_device_t::create_and_register_subdevice(O &owner, const pstring &name, device_arena::unique_ptr<C> &dev, Args&&... args)
-	{
-		dev = state().make_pool_object<C>(owner, name, std::forward<Args>(args)...);
-	}
-
-	inline netlist_state_t &detail::device_object_t::state() noexcept
-	{
-		return m_device->state();
-	}
-
-	inline const netlist_state_t &detail::device_object_t::state() const noexcept
-	{
-		return m_device->state();
-	}
-
-	inline solver::matrix_solver_t *analog_t::solver() const noexcept
-	{
-		return (this->has_net() ? net().solver() : nullptr);
-	}
-
-	template <typename T>
-	template <typename O>
-	state_var<T>::state_var(O &owner, const pstring &name, const T &value)
-	: m_value(value)
-	{
-		owner.state().save(owner, m_value, owner.name(), name);
-	}
-
-	template <typename T>
-	template <typename O>
-	state_var<T>::state_var(O &owner, const pstring &name)
-	{
-		owner.state().save(owner, m_value, owner.name(), name);
-	}
-
-	template <typename C>
-	template <typename O>
-	state_container<C>::state_container(O &owner, const pstring &name,
-		const state_container<C>::value_type & value)
-	{
-		owner.state().save(owner, static_cast<C &>(*this), owner.name(), name);
-		for (std::size_t i=0; i < this->size(); i++)
-			(*this)[i] = value;
-	}
-
-	template <typename C>
-	template <typename O>
-	state_container<C>::state_container(O &owner, const pstring &name,
-		std::size_t n, const state_container<C>::value_type & value)
-	: C(n, value)
-	{
-		owner.state().save(owner, static_cast<C &>(*this), owner.name(), name);
-	}
 
 	extern template struct state_var<std::uint8_t>;
 	extern template struct state_var<std::uint16_t>;
@@ -2661,14 +80,4 @@
 
 } // namespace netlist
 
-namespace plib
-{
-	template<typename X>
-	struct ptype_traits<netlist::state_var<X>> : ptype_traits<X>
-	{
-	};
-} // namespace plib
-
-
-
 #endif // NLBASE_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/nl_config.h mame-0.224+dfsg.1/src/lib/netlist/nl_config.h
--- mame-0.222+dfsg.1/src/lib/netlist/nl_config.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/nl_config.h	2020-08-26 08:57:19.000000000 +0000
@@ -44,6 +44,17 @@
 #define NL_USE_MEMPOOL               (1)
 #endif
 
+/// brief default minimum alignment of mempool_arena
+///
+/// 256 is the best compromise between logic applications like MAME
+/// TTL games (e.g. pong) and analog applications like e.g. kidnikik sound.
+///
+/// Best performance for pong is achieved with a value of 16, but this degrades
+/// kidniki performance by ~10%.
+///
+/// More work is needed here.
+#define NL_MEMPOOL_ALIGN            (16)
+
 /// \brief  Enable queue statistics.
 ///
 /// Queue statistics come at a performance cost. Although
@@ -86,25 +97,18 @@
 #define NL_USE_COPY_INSTEAD_OF_REFERENCE (0)
 #endif
 
-/// \brief  Use the truthtable implementation of 7448 instead of the coded device
+/// \brief Use backward Euler integration
 ///
-/// FIXME: Using truthtable is a lot slower than the explicit device
-///        in breakout. Performance drops by 20%. This can be fixed by
-///        setting param USE_DEACTIVATE for the device.
-
-#ifndef NL_USE_TRUTHTABLE_7448
-#define NL_USE_TRUTHTABLE_7448 (0)
-#endif
-
-/// \brief  Use the truthtable implementation of 74107 instead of the coded device
+/// This will use backward Euler instead of trapezoidal integration.
 ///
-/// FIXME: The truthtable implementation of 74107 (JK-Flipflop)
-///        is included for educational purposes to demonstrate how
-///        to implement state holding devices as truthtables.
-///        It will completely nuke performance for pong.
+/// FIXME: Longterm this will become a runtime setting. Only the capacitor model
+/// currently has a trapezoidal version and there is no support currently for
+/// variable capacitors.
+/// The change will have impact on timings since trapezoidal improves timing
+/// accuracy.
 
-#ifndef NL_USE_TRUTHTABLE_74107
-#define NL_USE_TRUTHTABLE_74107 (0)
+#ifndef NL_USE_BACKWARD_EULER
+#define NL_USE_BACKWARD_EULER (1)
 #endif
 
 /// \brief  Use the __float128 type for matrix calculations.
@@ -198,7 +202,11 @@
 
 		/// \brief Maximum queue size
 		///
-		using MAX_QUEUE_SIZE = std::integral_constant<std::size_t, 512>; // NOLINT
+		using MAX_QUEUE_SIZE = std::integral_constant<std::size_t, 1024>; // NOLINT
+
+		/// \brief Maximum queue size for solvers
+		///
+		using MAX_SOLVER_QUEUE_SIZE = std::integral_constant<std::size_t, 512>; // NOLINT
 
 		using use_float_matrix = std::integral_constant<bool, NL_USE_FLOAT_MATRIX>;
 		using use_long_double_matrix = std::integral_constant<bool, NL_USE_LONG_DOUBLE_MATRIX>;
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/nl_create_mame_solvers.sh mame-0.224+dfsg.1/src/lib/netlist/nl_create_mame_solvers.sh
--- mame-0.222+dfsg.1/src/lib/netlist/nl_create_mame_solvers.sh	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/nl_create_mame_solvers.sh	2020-08-26 08:57:19.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GENERATED=src/lib/netlist/generated/static_solvers.cpp
-FILES=`ls src/mame/machine/nl_*.cpp src/mame/audio/nl_*.cpp | grep -v pongdoubles` 
+FILES=`ls src/mame/machine/nl_*.cpp src/mame/audio/nl_*.cpp | grep -v pongdoubles`
 
 OUTDIR=/tmp/static_syms
 
@@ -14,9 +14,9 @@
 rm -rf ${OUTDIR}
 mkdir ${OUTDIR}
 
-if ${NLTOOL} --cmd static --output=${GENERATED}.tmp ${FILES}; then
+if ${NLTOOL} --cmd static --output=${GENERATED}.tmp --include=src/mame/audio ${FILES}; then
 	mv -f ${GENERATED}.tmp ${GENERATED}
 	echo Created ${GENERATED} file
 else
 	echo Failed to create ${GENERATED}
-fi 
+fi
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/nl_errstr.h mame-0.224+dfsg.1/src/lib/netlist/nl_errstr.h
--- mame-0.222+dfsg.1/src/lib/netlist/nl_errstr.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/nl_errstr.h	2020-08-26 08:57:19.000000000 +0000
@@ -14,8 +14,7 @@
 {
 
 	static constexpr const char sHINT_NO_DEACTIVATE[] = ".HINT_NO_DEACTIVATE"; // NOLINT(cppcoreguidelines-avoid-c-arrays, modernize-avoid-c-arrays)
-	static constexpr const char sPowerGND[] = "GND"; // NOLINT(cppcoreguidelines-avoid-c-arrays, modernize-avoid-c-arrays)
-	static constexpr const char sPowerVCC[] = "VCC"; // NOLINT(cppcoreguidelines-avoid-c-arrays, modernize-avoid-c-arrays)
+	static constexpr const char sHINT_NC[] = ".HINT_NC"; // NOLINT(cppcoreguidelines-avoid-c-arrays, modernize-avoid-c-arrays)
 
 	// nl_base.cpp
 
@@ -25,8 +24,7 @@
 	PERRMSGV(MF_NULLPTR_FAMILY,                     2, "Unable to determine family for device {1} from model {2}")
 	PERRMSGV(MF_REMOVE_TERMINAL_1_FROM_NET_2,       2, "Can not remove terminal {1} from net {2}.")
 	PERRMSGV(MF_UNKNOWN_PARAM_TYPE,                 1, "Can not determine param_type for {1}")
-	PERRMSGV(MF_ERROR_CONNECTING_1_TO_2,            2, "Error connecting {1} to {2}")
-	PERRMSGV(MF_NO_SOLVER,                          0, "No solver found for this netlist although analog elements are present")
+	//PERRMSGV(MF_ERROR_CONNECTING_1_TO_2,            2, "Error connecting {1} to {2}")
 	PERRMSGV(ME_HND_VAL_NOT_SUPPORTED,              1, "HINT_NO_DEACTIVATE value not supported: <{1}>")
 	PERRMSGV(MW_ROM_NOT_FOUND,                      1, "Rom {1} not found")
 
@@ -45,18 +43,25 @@
 	PERRMSGV(MF_UNEXPECTED_NETLIST_END,             0, "Unexpected NETLIST_END")
 	PERRMSGV(MF_UNEXPECTED_END_OF_FILE,             0, "Unexpected end of file, missing NETLIST_END")
 	PERRMSGV(MF_UNEXPECTED_NETLIST_START,           0, "Unexpected NETLIST_START")
+	PERRMSGV(MF_UNEXPECTED_NETLIST_EXTERNAL,        0, "Unexpected NETLIST_EXTERNAL within a netlist")
+	PERRMSGV(MF_EXPECTED_NETLIST_START_1,           1, "Expected NETLIST_START but got {1}")
 	PERRMSGV(MF_EXPECTED_IDENTIFIER_GOT_1,          1, "Expected an identifier, but got {1}")
 	PERRMSGV(MF_EXPECTED_COMMA_OR_RP_1,             1, "Expected comma or right parenthesis but found <{1}>")
 	PERRMSGV(MF_DIPPINS_EQUAL_NUMBER_1,             1, "DIPPINS requires equal number of pins to DIPPINS, first pin is {}")
 	PERRMSGV(MF_PARAM_NOT_FP_1,                     1, "Parameter value <{1}> not floating point")
 	PERRMSGV(MF_TT_LINE_WITHOUT_HEAD,               0, "TT_LINE found without TT_HEAD")
+	PERRMSGV(MF_LOCAL_SOURCE_NOT_FOUND_1,           1, "Local source not found: <{1}>")
 
 	// nl_setup.cpp
 
 	PERRMSGV(MF_UNABLE_TO_PARSE_MODEL_1,            1, "Unable to parse model: {1}")
-	PERRMSGV(MF_MODEL_ALREADY_EXISTS_1,             1, "Model already exists: {1}")
+	// FIXME: Add an directive MODEL_OVERWRITE to netlist language
+	//PERRMSGV(MF_MODEL_ALREADY_EXISTS_1,             1, "Model already exists: {1}")
+	PERRMSGV(MI_MODEL_OVERWRITE_1,                  2, "Model already exists, overwriting {1} with {2}")
 	PERRMSGV(MF_DEVICE_ALREADY_EXISTS_1,            1, "Device already exists: {1}")
-	PERRMSGV(MF_ADDING_ALI1_TO_ALIAS_LIST,          1, "Error adding alias {1} to alias list")
+	PERRMSGV(MF_UNUSED_HINT_1,                      1, "Error hint {1} is not used")
+	PERRMSGV(MF_ADDING_HINT_1,                      1, "Error adding hint {1} to hint list")
+	PERRMSGV(MF_ALIAS_ALREAD_EXISTS_1,              1, "Alias already exists: {1}")
 	PERRMSGV(MF_DIP_PINS_MUST_BE_AN_EQUAL_NUMBER_OF_PINS_1, 1,"You must pass an equal number of pins to DIPPINS {1}")
 	PERRMSGV(MF_PARAM_COUNT_MISMATCH_2,             2, "Parameter count mismatch for {1} - only found {2}")
 	PERRMSGV(MF_PARAM_COUNT_EXCEEDED_2,             2, "Parameter count exceed for {1} - found {2}")
@@ -89,7 +94,10 @@
 
 	PERRMSGV(MI_OVERWRITING_PARAM_1_OLD_2_NEW_3,    3, "Overwriting {1} old <{2}> new <{3}>")
 	PERRMSGV(MW_CONNECTING_1_TO_ITSELF,             1, "Connecting net {1} to itself.")
-	PERRMSGV(MW_CONNECTING_1_TO_2_SAME_NET,         3, "Connecting terminals {1} and {2} which are already both on net {3}")
+	PERRMSGV(MI_CONNECTING_1_TO_2_SAME_NET,         3, "Connecting terminals {1} and {2} which are already both on net {3}. "
+		"It is ok if you read this warning and it relates to pin which is connected internally to GND and the schematics "
+		"show an external connection as well. Onde example is the CD4538. In other cases this warning may indicate "
+		"an error in your netlist.")
 	PERRMSGV(ME_NC_PIN_1_WITH_CONNECTIONS,          1, "Found NC (not connected) terminal {1} with connections")
 	PERRMSGV(MI_ANALOG_OUTPUT_1_WITHOUT_CONNECTIONS,1, "Found analog output {1} without connections")
 	PERRMSGV(MI_LOGIC_OUTPUT_1_WITHOUT_CONNECTIONS, 1, "Found logic output {1} without connections")
@@ -108,7 +116,7 @@
 		"but has been forced to act as a logic output. Parameter "
 		" FORCE_TRISTATE_LOGIC for device {2} needs to be disabled!.")
 
-	PERRMSGV(MI_REMOVE_DEVICE_1_CONNECTED_ONLY_TO_RAILS_2_3, 3, "Found device {1} connected only to railterminals {2}/{3}. Will be removed")
+	PERRMSGV(MI_REMOVE_DEVICE_1_CONNECTED_ONLY_TO_RAILS_2_3, 3, "Found device {1} connected only to railterminals {2}/{3}. Please consider commenting those out.")
 
 	PERRMSGV(MW_DATA_1_NOT_FOUND,                   1, "unable to find data {1} in sources collection")
 
@@ -116,6 +124,9 @@
 	PERRMSGV(ME_UNKNOWN_PARAMETER,                  1, "Unknown parameter {1}")
 	PERRMSGV(MF_ERRORS_FOUND,                       1, "Counted {1} errors which need to be fixed")
 
+	PERRMSGV(MF_NO_SOLVER,                          0, "No solver found for this netlist although analog elements are present")
+	PERRMSGV(MF_DELEGATE_NOT_SET_1,                 1, "delegate not set for terminal {1}")
+
 	// nlid_proxy.cpp
 
 	PERRMSGV(MF_NO_POWER_TERMINALS_ON_DEVICE_2,     2, "D/A Proxy {1}: Found no valid combination of power terminals on device {2}")
@@ -127,7 +138,8 @@
 	PERRMSGV(MF_UNHANDLED_ELEMENT_1_FOUND,          1, "setup_base:unhandled element <{1}> found")
 	PERRMSGV(MF_FOUND_TERM_WITH_MISSING_OTHERNET,   1, "found term with missing othernet {1}")
 
-	PERRMSGV(MW_NEWTON_LOOPS_EXCEEDED_ON_NET_1,     1, "NEWTON_LOOPS exceeded on net {1}... reschedule")
+	PERRMSGV(MW_NEWTON_LOOPS_EXCEEDED_INVOCATION_3, 3, "NEWTON_LOOPS exceeded resolution invoked {1} times on net {2} at {3} us")
+	PERRMSGV(MW_NEWTON_LOOPS_EXCEEDED_ON_NET_2,     2, "NEWTON_LOOPS exceeded resolution failed on net {1} ... reschedule  at {2} us")
 
 	// nld_solver.cpp
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/nl_factory.cpp mame-0.224+dfsg.1/src/lib/netlist/nl_factory.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/nl_factory.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/nl_factory.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -23,8 +23,7 @@
 		{
 		}
 	protected:
-		NETLIB_RESETI() { }
-		NETLIB_UPDATEI() { }
+		//NETLIB_RESETI() {}
 	};
 
 	element_t::element_t(const pstring &name, properties &&props)
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/nl_factory.h mame-0.224+dfsg.1/src/lib/netlist/nl_factory.h
--- mame-0.222+dfsg.1/src/lib/netlist/nl_factory.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/nl_factory.h	2020-08-26 08:57:19.000000000 +0000
@@ -10,6 +10,7 @@
 
 #include "nltypes.h"
 #include "plib/palloc.h"
+#include "plib/pmempool.h"
 #include "plib/ptypes.h"
 #include "plib/putil.h"
 
@@ -38,8 +39,6 @@
 	factory::constructor_ptr_t decl_ ## p_alias = NETLIB_NAME(p_alias ## _c);
 
 namespace netlist {
-	class core_device_t;
-	class netlist_state_t;
 
 namespace factory {
 
@@ -130,6 +129,7 @@
 							const pstring &name, std::tuple<Args...>& args, std::index_sequence<Is...>)
 		{
 			return plib::make_unique<C>(pool, anetlist, name, std::forward<Args>(std::get<Is>(args))...);
+			//return anetlist.make_pool_object<C>(anetlist, name, std::forward<Args>(std::get<Is>(args))...);
 		}
 
 		dev_uptr make_device(device_arena &pool,
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/nl_interface.h mame-0.224+dfsg.1/src/lib/netlist/nl_interface.h
--- mame-0.222+dfsg.1/src/lib/netlist/nl_interface.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/nl_interface.h	2020-08-26 08:57:19.000000000 +0000
@@ -12,6 +12,7 @@
 
 #include "nl_base.h"
 #include "nl_setup.h"
+#include "core/setup.h"
 
 #include <memory>
 #include <array>
@@ -50,13 +51,11 @@
 		///
 
 		template <typename FUNC>
-		class NETLIB_NAME(analog_callback) : public device_t
+		NETLIB_OBJECT(analog_callback)
 		{
 		public:
-			NETLIB_NAME(analog_callback)(netlist_state_t &anetlist,
-				const pstring &name, nl_fptype threshold, FUNC &&func)
-				: device_t(anetlist, name)
-				, m_in(*this, "IN")
+			NETLIB_CONSTRUCTOR_EX(analog_callback, nl_fptype threshold, FUNC &&func)
+				, m_in(*this, "IN", NETLIB_DELEGATE(in))
 				, m_threshold(threshold)
 				, m_last(*this, "m_last", 0)
 				, m_func(func)
@@ -68,7 +67,7 @@
 				m_last = 0.0;
 			}
 
-			NETLIB_UPDATEI()
+			NETLIB_HANDLERI(in)
 			{
 				const nl_fptype cur = m_in();
 				if (plib::abs(cur - m_last) > m_threshold)
@@ -98,17 +97,16 @@
 		/// analog callback device instead.
 
 		template <typename FUNC>
-		class NETLIB_NAME(logic_callback) : public device_t
+		NETLIB_OBJECT(logic_callback)
 		{
 		public:
-			NETLIB_NAME(logic_callback)(netlist_state_t &anetlist, const pstring &name, FUNC &&func)
-				: device_t(anetlist, name)
-				, m_in(*this, "IN")
+			NETLIB_CONSTRUCTOR_EX(logic_callback, FUNC &&func)
+				, m_in(*this, "IN", NETLIB_DELEGATE(in))
 				, m_func(func)
 			{
 			}
 
-			NETLIB_UPDATEI()
+			NETLIB_HANDLERI(in)
 			{
 				const netlist_sig_t cur = m_in();
 				m_func(*this, cur);
@@ -121,54 +119,50 @@
 
 		/// \brief Set parameters to buffers contents at regular intervals
 		///
-		/// This devices will set up to N parameters from buffers passed to the device.
+		/// This device will update a parameter from a buffers passed to the device.
 		/// It is the responsibility of the controlling application to ensure that
-		/// buffers filled at regular intervals.
+		/// the buffer is filled at regular intervals.
 		///
 		/// \tparam T The buffer type
 		/// \tparam N Maximum number of supported buffers
 		///
-		template <typename T, std::size_t N>
-		class NETLIB_NAME(buffered_param_setter) : public device_t
+		template <typename T>
+		NETLIB_OBJECT(buffered_param_setter)
 		{
 		public:
 
-			static const int MAX_INPUT_CHANNELS = N;
-
-			NETLIB_NAME(buffered_param_setter)(netlist_state_t &anetlist, const pstring &name)
-			: device_t(anetlist, name)
+			NETLIB_CONSTRUCTOR(buffered_param_setter)
 			, m_sample_time(netlist_time::zero())
-			, m_feedback(*this, "FB") // clock part
+			, m_feedback(*this, "FB", NETLIB_DELEGATE(feedback)) // clock part
 			, m_Q(*this, "Q")
 			, m_pos(0)
 			, m_samples(0)
-			, m_num_channels(0)
-			, m_param_names(*this, 0, "CHAN{}", "")
-			, m_param_mults(*this, 0, "MULT{}", 1.0)
-			, m_param_offsets(*this, 0, "OFFSET{}", 0.0)
+			, m_param_name(*this, "CHAN", "")
+			, m_param_mult(*this, "MULT", 1.0)
+			, m_param_offset(*this, "OFFSET", 0.0)
+			, m_param(nullptr)
+			, m_id(*this, "ID", 0)
 			{
 				connect(m_feedback, m_Q);
+				m_buffer = nullptr;
 			}
 
 		protected:
 			NETLIB_RESETI()
 			{
-				m_pos = 0;
-				for (auto & elem : m_buffers)
-					elem = nullptr;
 			}
 
-			NETLIB_UPDATEI()
+			NETLIB_HANDLERI(feedback)
 			{
 				if (m_pos < m_samples)
 				{
-					for (std::size_t i=0; i<m_num_channels; i++)
-					{
-						if (m_buffers[i] == nullptr)
-							break; // stop, called outside of stream_update
-						const nl_fptype v = m_buffers[i][m_pos];
-						m_params[i]->set(v * m_param_mults[i]() + m_param_offsets[i]());
-					}
+						// check if called outside of stream_update
+						if (m_buffer != nullptr)
+						{
+							const nl_fptype v = (*m_buffer)[m_pos];
+							//m_params[i]->set(v * m_param_mults[i]() + m_param_offsets[i]());
+							m_param_setter(v * m_param_mult() + m_param_offset());
+						}
 				}
 				else
 				{
@@ -191,34 +185,35 @@
 			{
 				m_pos = 0;
 				m_sample_time = sample_time;
-				for (std::size_t i = 0; i < MAX_INPUT_CHANNELS; i++)
+				if (m_param_name() != pstring(""))
 				{
-					if (m_param_names[i]() != pstring(""))
-					{
-						if (i != m_num_channels)
-							state().log().fatal("sound input numbering has to be sequential!");
-						m_num_channels++;
-						m_params[i] = dynamic_cast<param_fp_t *>(
-							&state().setup().find_param(m_param_names[i]()).param()
-						);
-					}
+					param_t *p = &state().setup().find_param(m_param_name()).param();
+					m_param = p;
+					if (dynamic_cast<param_fp_t *>(p) != nullptr)
+						m_param_setter = setter_t(&NETLIB_NAME(buffered_param_setter)::setter<param_fp_t>, this);
+					else if (dynamic_cast<param_logic_t *>(p) != nullptr)
+						m_param_setter = setter_t(&NETLIB_NAME(buffered_param_setter)::setter<param_logic_t>, this);
 				}
 			}
 
-			void buffer_reset(netlist_time sample_time, std::size_t num_samples, T **inputs)
+			void buffer_reset(netlist_time sample_time, std::size_t num_samples, T *inputs)
 			{
 				m_samples = num_samples;
 				m_sample_time = sample_time;
 				m_pos = 0;
-				for (std::size_t i=0; i < m_num_channels; i++)
-				{
-					m_buffers[i] = inputs[i];
-				}
+				m_buffer = inputs;
 			}
 
-			int num_channels() { return m_num_channels; }
-
+			std::size_t id() const { return m_id; }
 		private:
+			using setter_t = plib::pmfp<void,nl_fptype>;
+
+			template <typename S>
+			void setter(nl_fptype v)
+			{
+				static_cast<S *>(m_param)->set(v);
+			}
+
 			netlist_time m_sample_time;
 
 			logic_input_t m_feedback;
@@ -226,13 +221,14 @@
 
 			std::size_t m_pos;
 			std::size_t m_samples;
-			std::size_t m_num_channels;
 
-			object_array_t<param_str_t, MAX_INPUT_CHANNELS> m_param_names;
-			object_array_t<param_fp_t, MAX_INPUT_CHANNELS>  m_param_mults;
-			object_array_t<param_fp_t, MAX_INPUT_CHANNELS>  m_param_offsets;
-			std::array<param_fp_t *, MAX_INPUT_CHANNELS>             m_params;
-			std::array<T *, MAX_INPUT_CHANNELS>                               m_buffers;
+			param_str_t m_param_name;
+			param_fp_t  m_param_mult;
+			param_fp_t  m_param_offset;
+			param_t *   m_param;
+			setter_t    m_param_setter;
+			T *         m_buffer;
+			param_num_t<std::size_t> m_id;
 		};
 
 	} // namespace interface
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/nl_parser.cpp mame-0.224+dfsg.1/src/lib/netlist/nl_parser.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/nl_parser.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/nl_parser.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,7 @@
 
 #include "nl_parser.h"
 #include "nl_base.h"
+#include "nl_setup.h"
 #include "nl_errstr.h"
 #include "nl_factory.h"
 
@@ -18,47 +19,74 @@
 	throw nl_exception(plib::pfmt("{1}")(msg));
 }
 
-bool parser_t::parse(const pstring &nlname)
+parser_t::parser_t(nlparse_t &setup)
+	: m_setup(setup)
+	, m_cur_local(nullptr)
 {
-	this->identifier_chars("abcdefghijklmnopqrstuvwvxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-$@")
+	m_tokenizer.identifier_chars("abcdefghijklmnopqrstuvwvxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-$@")
 		.number_chars(".0123456789", "0123456789eE-.") //FIXME: processing of numbers
 		.whitespace(pstring("") + ' ' + static_cast<char>(9) + static_cast<char>(10) + static_cast<char>(13))
 		.comment("/*", "*/", "//");
-	m_tok_paren_left = register_token("(");
-	m_tok_paren_right = register_token(")");
-	m_tok_comma = register_token(",");
-
-	m_tok_ALIAS = register_token("ALIAS");
-	m_tok_DIPPINS = register_token("DIPPINS");
-	m_tok_NET_C = register_token("NET_C");
-	m_tok_FRONTIER = register_token("OPTIMIZE_FRONTIER");
-	m_tok_PARAM = register_token("PARAM");
-	m_tok_DEFPARAM = register_token("DEFPARAM");
-	m_tok_HINT = register_token("HINT");
-	m_tok_NET_MODEL = register_token("NET_MODEL");
-	m_tok_INCLUDE = register_token("INCLUDE");
-	m_tok_LOCAL_SOURCE = register_token("LOCAL_SOURCE");
-	m_tok_LOCAL_LIB_ENTRY = register_token("LOCAL_LIB_ENTRY");
-	m_tok_SUBMODEL = register_token("SUBMODEL");
-	m_tok_NETLIST_START = register_token("NETLIST_START");
-	m_tok_NETLIST_END = register_token("NETLIST_END");
-	m_tok_TRUTHTABLE_START = register_token("TRUTHTABLE_START");
-	m_tok_TRUTHTABLE_END = register_token("TRUTHTABLE_END");
-	m_tok_TT_HEAD = register_token("TT_HEAD");
-	m_tok_TT_LINE = register_token("TT_LINE");
-	m_tok_TT_FAMILY = register_token("TT_FAMILY");
-
-	register_token("RES_R");
-	register_token("RES_K");
-	register_token("RES_M");
-	register_token("CAP_U");
-	register_token("CAP_N");
-	register_token("CAP_P");
+	m_tok_paren_left = m_tokenizer.register_token("(");
+	m_tok_paren_right = m_tokenizer.register_token(")");
+	m_tok_comma = m_tokenizer.register_token(",");
+
+	m_tok_static = m_tokenizer.register_token("static");
+	m_tok_ALIAS = m_tokenizer.register_token("ALIAS");
+	m_tok_DIPPINS = m_tokenizer.register_token("DIPPINS");
+	m_tok_NET_C = m_tokenizer.register_token("NET_C");
+	m_tok_FRONTIER = m_tokenizer.register_token("OPTIMIZE_FRONTIER");
+	m_tok_PARAM = m_tokenizer.register_token("PARAM");
+	m_tok_DEFPARAM = m_tokenizer.register_token("DEFPARAM");
+	m_tok_HINT = m_tokenizer.register_token("HINT");
+	m_tok_NET_MODEL = m_tokenizer.register_token("NET_MODEL");
+	m_tok_NET_REGISTER_DEV = m_tokenizer.register_token("NET_REGISTER_DEV");
+	m_tok_INCLUDE = m_tokenizer.register_token("INCLUDE");
+	m_tok_LOCAL_SOURCE = m_tokenizer.register_token("LOCAL_SOURCE");
+	m_tok_LOCAL_LIB_ENTRY = m_tokenizer.register_token("LOCAL_LIB_ENTRY");
+	m_tok_SUBMODEL = m_tokenizer.register_token("SUBMODEL");
+	m_tok_NETLIST_START = m_tokenizer.register_token("NETLIST_START");
+	m_tok_NETLIST_END = m_tokenizer.register_token("NETLIST_END");
+	m_tok_NETLIST_EXTERNAL = m_tokenizer.register_token("NETLIST_EXTERNAL");
+	m_tok_EXTERNAL_SOURCE = m_tokenizer.register_token("EXTERNAL_SOURCE");
+	m_tok_TRUTHTABLE_START = m_tokenizer.register_token("TRUTHTABLE_START");
+	m_tok_TRUTHTABLE_END = m_tokenizer.register_token("TRUTHTABLE_END");
+	m_tok_TT_HEAD = m_tokenizer.register_token("TT_HEAD");
+	m_tok_TT_LINE = m_tokenizer.register_token("TT_LINE");
+	m_tok_TT_FAMILY = m_tokenizer.register_token("TT_FAMILY");
+
+	m_tokenizer.register_token("RES_R");
+	m_tokenizer.register_token("RES_K");
+	m_tokenizer.register_token("RES_M");
+	m_tokenizer.register_token("CAP_U");
+	m_tokenizer.register_token("CAP_N");
+	m_tokenizer.register_token("CAP_P");
+
+}
+
+bool parser_t::parse(plib::psource_t::stream_ptr &&strm, const pstring &nlname)
+{
+	token_store tokstor;
+	parse_tokens(std::move(strm), tokstor);
+	return parse(tokstor, nlname);
+}
+
+void parser_t::parse_tokens(plib::psource_t::stream_ptr &&strm, token_store &tokstor)
+{
+	plib::putf8_reader u8reader(strm.release_stream());
+	m_tokenizer.append_to_store(&u8reader, tokstor);
+}
+
+bool parser_t::parse(const token_store &tokstor, const pstring &nlname)
+{
+	set_token_source(&tokstor);
 
 	bool in_nl = false;
 
 	while (true)
 	{
+		// FIXME: line numbers in cached local netlists are wrong
+		//        need to process raw tokens here.
 		token_t token = get_token();
 		if (token.is_type(token_type::ENDOFFILE))
 		{
@@ -75,6 +103,11 @@
 				in_nl = false;
 			}
 			require_token(m_tok_paren_right);
+
+			m_cur_local->push_back(token);
+			m_cur_local->push_back(token_t(m_tok_paren_left));
+			m_cur_local->push_back(token_t(m_tok_paren_right));
+
 		}
 		else if (token.is(m_tok_NETLIST_START))
 		{
@@ -89,8 +122,37 @@
 				return true;
 			}
 
+			// create a new cached local store
+			m_local.emplace(name.str(), token_store());
+			m_cur_local = &m_local[name.str()];
+			m_cur_local->push_back(token_t(token_type::LINEMARKER));
+			auto sl = sourceloc();
+			auto num = plib::pfmt("{1}")(sl.line());
+			m_cur_local->push_back(token_t(token_type::NUMBER, num));
+			m_cur_local->push_back(token_t(token_type::STRING, sl.file_name()));
+			m_cur_local->push_back(token_t(m_tok_NETLIST_START));
+			m_cur_local->push_back(token_t(m_tok_paren_left));
+			m_cur_local->push_back(name);
+			m_cur_local->push_back(token_t(m_tok_paren_right));
 			in_nl = true;
 		}
+		else if (token.is(m_tok_NETLIST_EXTERNAL))
+		{
+			if (in_nl)
+				error (MF_UNEXPECTED_NETLIST_EXTERNAL());
+			require_token(m_tok_paren_left);
+			token_t name = get_token();
+			require_token(m_tok_paren_right);
+		}
+		else if (!in_nl)
+		{
+			if (!token.is(m_tok_static))
+				error(MF_EXPECTED_NETLIST_START_1(token.str()));
+		}
+		else
+		{
+			m_cur_local->push_back(token);
+		}
 	}
 }
 
@@ -127,15 +189,23 @@
 			net_include();
 		else if (token.is(m_tok_LOCAL_SOURCE))
 			net_local_source();
+		else if (token.is(m_tok_EXTERNAL_SOURCE))
+			net_external_source();
 		else if (token.is(m_tok_TRUTHTABLE_START))
 			net_truthtable_start(nlname);
 		else if (token.is(m_tok_LOCAL_LIB_ENTRY))
 		{
 			require_token(m_tok_paren_left);
+			pstring name(get_identifier());
+			register_local_as_source(name);
 			// FIXME: Need to pass in parameter definition FIXME: get line number right
-			m_setup.register_lib_entry(get_identifier(), factory::properties("", plib::source_location("parser: " + nlname, 1)));
+			m_setup.register_lib_entry(name, "", plib::source_location("parser: " + nlname, 1));
 			require_token(m_tok_paren_right);
 		}
+		else if (token.is(m_tok_NET_REGISTER_DEV))
+		{
+			net_register_dev();
+		}
 		else if (token.is(m_tok_NETLIST_END))
 		{
 			netdev_netlist_end();
@@ -199,7 +269,7 @@
 			require_token(m_tok_paren_left);
 			require_token(m_tok_paren_right);
 			// FIXME: proper location
-			m_setup.truthtable_create(desc, factory::properties("+" + def_param, plib::source_location(nlname, 1)));
+			m_setup.truthtable_create(desc, def_param, plib::source_location(nlname, 1));
 			return;
 		}
 	}
@@ -265,6 +335,27 @@
 	pstring name(get_identifier());
 	require_token(m_tok_paren_right);
 
+	register_local_as_source(name);
+}
+
+void parser_t::register_local_as_source(const pstring &name)
+{
+	auto p = m_local.find(name);
+	if (p != m_local.end())
+	{
+		m_setup.register_source<source_token_t>(name, p->second);
+	}
+	else
+		error(MF_LOCAL_SOURCE_NOT_FOUND_1(name));
+}
+
+void parser_t::net_external_source()
+{
+	// This directive is only for hardcoded netlists. Ignore it here.
+	require_token(m_tok_paren_left);
+	pstring name(get_identifier());
+	require_token(m_tok_paren_right);
+
 }
 
 void parser_t::net_alias()
@@ -375,13 +466,24 @@
 void parser_t::netdev_hint()
 {
 	require_token(m_tok_paren_left);
-	pstring dev(get_identifier());
+	pstring id(get_identifier());
 	require_token(m_tok_comma);
 	pstring hint(get_identifier());
-	m_setup.register_param_val(dev + ".HINT_" + hint, 1);
+	m_setup.register_hint(id, ".HINT_" + hint);
 	require_token(m_tok_paren_right);
 }
 
+void parser_t::net_register_dev()
+{
+	require_token(m_tok_paren_left);
+	pstring type(get_identifier());
+	require_token(m_tok_comma);
+	pstring name(get_identifier());
+	require_token(m_tok_paren_right);
+
+	m_setup.register_dev(type, name);
+}
+
 void parser_t::device(const pstring &dev_type)
 {
 	std::vector<pstring> params;
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/nl_parser.h mame-0.224+dfsg.1/src/lib/netlist/nl_parser.h
--- mame-0.222+dfsg.1/src/lib/netlist/nl_parser.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/nl_parser.h	2020-08-26 08:57:19.000000000 +0000
@@ -8,22 +8,26 @@
 #ifndef NL_PARSER_H_
 #define NL_PARSER_H_
 
-#include "nl_setup.h"
+#include "nltypes.h" // for setup_t
 #include "plib/ptokenizer.h"
 
+#include <unordered_map>
+
 namespace netlist
 {
-	class parser_t : public plib::ptokenizer
+	class parser_t : public plib::ptoken_reader
 	{
 	public:
-		template <typename T>
-		parser_t(T &&strm, nlparse_t &setup)
-			: plib::ptokenizer(std::forward<T>(strm))
-			, m_setup(setup)
-		{
-		}
-
-		bool parse(const pstring &nlname = "");
+		using token_t = plib::ptokenizer::token_t;
+		using token_type = plib::ptokenizer::token_type;
+		using token_id_t = plib::ptokenizer::token_id_t;
+		using token_store = plib::ptokenizer::token_store;
+
+		parser_t(nlparse_t &setup);
+
+		bool parse(plib::psource_t::stream_ptr &&strm, const pstring &nlname);
+		bool parse(const token_store &tokstor, const pstring &nlname);
+		void parse_tokens(plib::psource_t::stream_ptr &&strm, token_store &tokstor);
 
 	protected:
 		void parse_netlist(const pstring &nlname);
@@ -40,14 +44,20 @@
 		void net_submodel();
 		void net_include();
 		void net_local_source();
+		void net_external_source();
+		void net_register_dev();
 		void net_truthtable_start(const pstring &nlname);
 
 		void verror(const pstring &msg) override;
 	private:
+		void register_local_as_source(const pstring &name);
+
 		pstring stringify_expression(token_t &tok);
+
 		token_id_t m_tok_paren_left;
 		token_id_t m_tok_paren_right;
 		token_id_t m_tok_comma;
+		token_id_t m_tok_static;
 		token_id_t m_tok_ALIAS;
 		token_id_t m_tok_NET_C;
 		token_id_t m_tok_DIPPINS;
@@ -56,10 +66,13 @@
 		token_id_t m_tok_DEFPARAM;
 		token_id_t m_tok_HINT;
 		token_id_t m_tok_NET_MODEL;
+		token_id_t m_tok_NET_REGISTER_DEV;
 		token_id_t m_tok_NETLIST_START;
 		token_id_t m_tok_NETLIST_END;
+		token_id_t m_tok_NETLIST_EXTERNAL;
 		token_id_t m_tok_SUBMODEL;
 		token_id_t m_tok_INCLUDE;
+		token_id_t m_tok_EXTERNAL_SOURCE;
 		token_id_t m_tok_LOCAL_SOURCE;
 		token_id_t m_tok_LOCAL_LIB_ENTRY;
 		token_id_t m_tok_TRUTHTABLE_START;
@@ -68,7 +81,11 @@
 		token_id_t m_tok_TT_LINE;
 		token_id_t m_tok_TT_FAMILY;
 
+		plib::ptokenizer m_tokenizer;
 		nlparse_t &m_setup;
+
+		std::unordered_map<pstring, token_store> m_local;
+		token_store *m_cur_local;
 };
 
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/nl_setup.cpp mame-0.224+dfsg.1/src/lib/netlist/nl_setup.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/nl_setup.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/nl_setup.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,8 +3,8 @@
 
 #include "plib/palloc.h"
 #include "analog/nld_twoterm.h"
+#include "core/setup.h"
 #include "devices/nlid_proxy.h"
-#include "devices/nlid_system.h"
 #include "devices/nlid_truthtable.h"
 #include "nl_base.h"
 #include "nl_factory.h"
@@ -12,18 +12,20 @@
 #include "nl_setup.h"
 #include "plib/penum.h"
 #include "plib/putil.h"
+#include "plib/pstonum.h"
 
 #include "solver/nld_solver.h"
 
+#include <sstream>
+
 namespace netlist
 {
 	// ----------------------------------------------------------------------------------------
 	// nl_parse_t
 	// ----------------------------------------------------------------------------------------
 
-	nlparse_t::nlparse_t(log_type &log, abstract_t &abstract)
-	: m_factory(log)
-	, m_abstract(abstract)
+	nlparse_t::nlparse_t(log_type &log, detail::abstract_t &abstract)
+	: m_abstract(abstract)
 	, m_log(log)
 	, m_frontier_cnt(0)
 	{ }
@@ -70,7 +72,7 @@
 		factory::element_t **felem)
 	{
 
-		auto *f = m_factory.factory_by_name(classname);
+		auto *f = factory().factory_by_name(classname);
 
 		// make sure we parse macro library entries
 		// FIXME: this could be done here if e.g. f
@@ -85,8 +87,8 @@
 		pstring key = build_fqn(name);
 		if (device_exists(key))
 		{
-			log().fatal(MF_DEVICE_ALREADY_EXISTS_1(name));
-			throw nl_exception(MF_DEVICE_ALREADY_EXISTS_1(name));
+			log().fatal(MF_DEVICE_ALREADY_EXISTS_1(key));
+			throw nl_exception(MF_DEVICE_ALREADY_EXISTS_1(key));
 		}
 
 		m_abstract.m_device_factory.insert(m_abstract.m_device_factory.end(), {key, f});
@@ -110,7 +112,7 @@
 						//break;
 					}
 					pstring output_name = *ptok;
-					log().debug("Link: {1} {2}\n", tp, output_name);
+					log().debug("Link: {1} {2}", tp, output_name);
 
 					register_link(name + "." + tp.substr(1), output_name);
 					++ptok;
@@ -118,7 +120,7 @@
 				else if (plib::startsWith(tp, "@"))
 				{
 					pstring term = tp.substr(1);
-					log().debug("Link: {1} {2}\n", tp, term);
+					log().debug("Link: {1} {2}", tp, term);
 
 					register_link(name + "." + term, term);
 				}
@@ -150,6 +152,16 @@
 			*felem = f;
 	}
 
+	void nlparse_t::register_hint(const pstring &objname, const pstring &hintname)
+	{
+		const auto name = build_fqn(objname) + hintname;
+		if (!m_abstract.m_hints.insert({name, false}).second)
+		{
+			log().fatal(MF_ADDING_HINT_1(name));
+			throw nl_exception(MF_ADDING_HINT_1(name));
+		}
+	}
+
 	void nlparse_t::register_link(const pstring &sin, const pstring &sout)
 	{
 		register_link_fqn(build_fqn(sin), build_fqn(sout));
@@ -246,9 +258,20 @@
 		m_abstract.m_defparams.emplace_back(namespace_prefix() + name, val);
 	}
 
-	void nlparse_t::register_lib_entry(const pstring &name, factory::properties &&props)
+	factory::list_t &nlparse_t::factory() noexcept
+	{
+		return m_abstract.m_factory;
+	}
+
+	const factory::list_t &nlparse_t::factory() const noexcept
+	{
+		return m_abstract.m_factory;
+	}
+
+
+	void nlparse_t::register_lib_entry(const pstring &name, const pstring &def_params, plib::source_location &&loc)
 	{
-		m_factory.add(plib::make_unique<factory::library_element_t, host_arena>(name, std::move(props)));
+		factory().add(plib::make_unique<factory::library_element_t, host_arena>(name, factory::properties(def_params, std::move(loc))));
 	}
 
 	void nlparse_t::register_frontier(const pstring &attach, const pstring &r_IN,
@@ -284,10 +307,15 @@
 		register_link(attach, frontier_name + ".Q");
 	}
 
-	void nlparse_t::truthtable_create(tt_desc &desc, factory::properties &&props)
+	void nlparse_t::register_source_proc(const pstring &name, nlsetup_func func)
+	{
+		register_source<netlist::source_proc_t>(name, func);
+	}
+
+	void nlparse_t::truthtable_create(tt_desc &desc, const pstring &def_params, plib::source_location &&loc)
 	{
-		auto fac = factory::truthtable_create(desc, std::move(props));
-		m_factory.add(std::move(fac));
+		auto fac = factory::truthtable_create(desc, netlist::factory::properties(def_params, std::move(loc)));
+		factory().add(std::move(fac));
 	}
 
 	pstring nlparse_t::namespace_prefix() const
@@ -304,15 +332,14 @@
 	{
 		if (!m_abstract.m_alias.insert({alias, out}).second)
 		{
-			log().fatal(MF_ADDING_ALI1_TO_ALIAS_LIST(alias));
-			throw nl_exception(MF_ADDING_ALI1_TO_ALIAS_LIST(alias));
+			log().fatal(MF_ALIAS_ALREAD_EXISTS_1(alias));
+			throw nl_exception(MF_ALIAS_ALREAD_EXISTS_1(alias));
 		}
-
 	}
 
 	void nlparse_t::register_link_fqn(const pstring &sin, const pstring &sout)
 	{
-		link_t temp = link_t(sin, sout);
+		detail::abstract_t::link_t temp(sin, sout);
 		log().debug("link {1} <== {2}", sin, sout);
 		m_abstract.m_links.push_back(temp);
 	}
@@ -325,12 +352,47 @@
 		return false;
 	}
 
+	bool nlparse_t::parse_tokens(const parser_t::token_store &tokens, const pstring &name)
+	{
+		parser_t parser(*this);
+		return parser.parse(tokens, name);
+	}
+
 	bool nlparse_t::parse_stream(plib::psource_t::stream_ptr &&istrm, const pstring &name)
 	{
-		auto y = std::make_unique<plib::ppreprocessor>(m_includes, &m_defines);
-		y->process(std::move(istrm));
-		return parser_t(std::move(y), *this).parse(name);
-		//return parser_t(std::move(plib::ppreprocessor(&m_defines).process(std::move(istrm))), *this).parse(name);
+#if 0
+		auto key = istrm.filename();
+
+		if (m_source_cache.find(key) != m_source_cache.end())
+		{
+			return parser_t(*this).parse(m_source_cache[key], name);
+		}
+		else
+		{
+			//printf("searching %s\n", name.c_str());
+			plib::ppreprocessor y(m_includes, &m_defines);
+			y.process(std::move(istrm), istrm.filename());
+
+			auto abc = std::make_unique<std::stringstream>();
+			plib::copystream(*abc, y);
+
+			parser_t::token_store &st = m_source_cache[key];
+			parser_t parser(*this);
+			parser.parse_tokens(plib::psource_t::stream_ptr(std::move(abc), key), st);
+			return parser.parse(st, name);
+		}
+#else
+		plib::ppreprocessor y(m_includes, &m_defines);
+		y.process(std::move(istrm), istrm.filename());
+
+		auto abc = std::make_unique<std::stringstream>();
+		plib::copystream(*abc, y);
+
+		parser_t::token_store st;
+		parser_t parser(*this);
+		parser.parse_tokens(plib::psource_t::stream_ptr(std::move(abc), istrm.filename()), st);
+		return parser.parse(st, name);
+#endif
 	}
 
 	void nlparse_t::add_define(const pstring &defstr)
@@ -386,7 +448,12 @@
 		pstring model = plib::ucase(plib::trim(plib::left(model_in, pos)));
 		pstring def = plib::trim(model_in.substr(pos + 1));
 		if (!m_abstract.m_models.insert({model, def}).second)
-			throw nl_exception(MF_MODEL_ALREADY_EXISTS_1(model_in));
+		{
+			// FIXME: Add an directive MODEL_OVERWRITE to netlist language
+			//throw nl_exception(MF_MODEL_ALREADY_EXISTS_1(model_in));
+			log().info(MI_MODEL_OVERWRITE_1(model, model_in));
+			m_abstract.m_models[model] = def;
+		}
 	}
 
 
@@ -397,10 +464,10 @@
 	plib::psource_t::stream_ptr nlparse_t::get_data_stream(const pstring &name)
 	{
 		auto strm = m_sources.get_stream<source_data_t>(name);
-		if (strm)
+		if (!strm.empty())
 			return strm;
 		log().warning(MW_DATA_1_NOT_FOUND(name));
-		return plib::psource_t::stream_ptr(nullptr);
+		return plib::psource_t::stream_ptr();
 	}
 
 	// ----------------------------------------------------------------------------------------
@@ -409,7 +476,7 @@
 
 
 setup_t::setup_t(netlist_state_t &nlstate)
-	: m_abstract()
+	: m_abstract(nlstate.log())
 	, m_parser(nlstate.log(), m_abstract)
 	, m_nlstate(nlstate)
 	, m_models(m_abstract.m_models) // FIXME : parse abstract_t only
@@ -434,6 +501,13 @@
 
 pstring setup_t::get_initial_param_val(const pstring &name, const pstring &def) const
 {
+	// when get_intial_param_val is called the parameter <name> is already registered
+	// and the value (valstr()) is set to the default value, e.g. "74XX"
+	// If thus $(IC5E.A.MODEL) is given for name=="IC5E.A.MODEL" valstr() below
+	// will return the default.
+	// FIXME: It may be more explicit and stable to test if pattern==name and return
+	// def in this case.
+
 	auto i = m_abstract.m_param_values.find(name);
 	auto found_pat(false);
 	pstring v = (i == m_abstract.m_param_values.end()) ? def : i->second;
@@ -701,9 +775,8 @@
 		return iter_proxy->second;
 
 	log().debug("connect_terminal_input: connecting proxy\n");
-	pstring x = plib::pfmt("proxy_ad_{1}_{2}")(inp.name())(m_proxy_cnt);
-	auto new_proxy = incast.logic_family()->create_a_d_proxy(m_nlstate, x, &incast);
-	//auto new_proxy = plib::owned_ptr<devices::nld_a_to_d_proxy>::Create(netlist(), x, &incast);
+	auto new_proxy = incast.logic_family()->create_a_d_proxy(m_nlstate,
+		plib::pfmt("proxy_ad_{1}_{2}")(inp.name())(m_proxy_cnt), &incast);
 
 	auto *ret(new_proxy.get());
 
@@ -716,20 +789,25 @@
 
 	if (inp.has_net())
 	{
-		for (auto & p : inp.net().core_terms())
+		for (detail::core_terminal_t * p : inp.net().core_terms())
 		{
-			p->clear_net(); // de-link from all nets ...
-			if (!connect(ret->proxy_term(), *p))
+			// inp may already belongs to the logic net. Thus skip it here.
+			// It will be removed by the clear further down.
+			if (p != &inp)
 			{
-				log().fatal(MF_CONNECTING_1_TO_2(
-						ret->proxy_term().name(), (*p).name()));
-				throw nl_exception(MF_CONNECTING_1_TO_2(
-						ret->proxy_term().name(), (*p).name()));
-
+				p->clear_net(); // de-link from all nets ...
+				if (!connect(ret->proxy_term(), *p))
+				{
+					log().fatal(MF_CONNECTING_1_TO_2(
+							ret->proxy_term().name(), (*p).name()));
+					throw nl_exception(MF_CONNECTING_1_TO_2(
+							ret->proxy_term().name(), (*p).name()));
+				}
 			}
 		}
 		inp.net().core_terms().clear(); // clear the list
 	}
+	inp.clear_net();
 	add_terminal(ret->out().net(), inp);
 	m_nlstate.register_device(new_proxy->name(), std::move(new_proxy));
 	return ret;
@@ -836,9 +914,13 @@
 		// no proxy needed, just merge existing terminal net
 		if (in.has_net())
 		{
-			if (&out.net() == &in.net())
-				log().warning(MW_CONNECTING_1_TO_2_SAME_NET(in.name(), out.name(), in.net().name()));
-			merge_nets(out.net(), in.net());
+			if (&out.net() != &in.net())
+				merge_nets(out.net(), in.net());
+			else
+				// Only an info - some ICs (CD4538) connect pins internally to GND
+				// and the schematics again externally. This will cause this warning.
+				// FIXME: Add a hint to suppress the warning.
+				log().info(MI_CONNECTING_1_TO_2_SAME_NET(in.name(), out.name(), in.net().name()));
 		}
 		else
 			add_terminal(out.net(), in);
@@ -976,7 +1058,9 @@
 		ret = connect_input_input(t1, t2);
 	}
 	else
+	{
 		ret = false;
+	}
 	return ret;
 }
 
@@ -1071,31 +1155,47 @@
 	for (auto & i : m_terminals)
 	{
 		detail::core_terminal_t *term = i.second;
-		bool is_nc(dynamic_cast< devices::NETLIB_NAME(nc_pin) *>(&term->device()) != nullptr);
-		if (term->has_net() && is_nc)
+		const pstring name_da = de_alias(term->name());
+		bool is_nc_pin(dynamic_cast< devices::NETLIB_NAME(nc_pin) *>(&term->device()) != nullptr);
+		bool is_nc_flagged(false);
+
+		auto hnc = m_abstract.m_hints.find(name_da + sHINT_NC);
+		if (hnc != m_abstract.m_hints.end())
+		{
+			hnc->second = true; // mark as used
+			is_nc_flagged = true;
+		}
+
+		if (term->has_net() && is_nc_pin)
 		{
-			log().error(ME_NC_PIN_1_WITH_CONNECTIONS(term->name()));
+			log().error(ME_NC_PIN_1_WITH_CONNECTIONS(name_da));
 			err = true;
 		}
-		else if (is_nc)
+		else if (is_nc_pin)
 		{
 			/* ignore */
 		}
 		else if (!term->has_net())
 		{
-			log().error(ME_TERMINAL_1_WITHOUT_NET(de_alias(term->name())));
+			log().error(ME_TERMINAL_1_WITHOUT_NET(name_da));
 			err = true;
 		}
 		else if (!term->net().has_connections())
 		{
 			if (term->is_logic_input())
-				log().warning(MW_LOGIC_INPUT_1_WITHOUT_CONNECTIONS(term->name()));
+				log().warning(MW_LOGIC_INPUT_1_WITHOUT_CONNECTIONS(name_da));
 			else if (term->is_logic_output())
-				log().info(MI_LOGIC_OUTPUT_1_WITHOUT_CONNECTIONS(term->name()));
+			{
+				if (!is_nc_flagged)
+					log().info(MI_LOGIC_OUTPUT_1_WITHOUT_CONNECTIONS(name_da));
+			}
 			else if (term->is_analog_output())
-				log().info(MI_ANALOG_OUTPUT_1_WITHOUT_CONNECTIONS(term->name()));
+			{
+				if (!is_nc_flagged)
+					log().info(MI_ANALOG_OUTPUT_1_WITHOUT_CONNECTIONS(name_da));
+			}
 			else
-				log().warning(MW_TERMINAL_1_WITHOUT_CONNECTIONS(term->name()));
+				log().warning(MW_TERMINAL_1_WITHOUT_CONNECTIONS(name_da));
 		}
 	}
 	log().verbose("checking tristate consistency  ...");
@@ -1399,6 +1499,22 @@
 	ret->m_R_low = modv.m_ORL();
 	ret->m_R_high = modv.m_ORH();
 
+	switch (ft)
+	{
+		case family_type::CUSTOM:
+		case family_type::TTL:
+		case family_type::NMOS:
+			ret->m_vcc = "VCC";
+			ret->m_gnd = "GND";
+			break;
+		case family_type::MOS:
+		case family_type::CMOS:
+		case family_type::PMOS:
+			ret->m_vcc = "VDD";
+			ret->m_gnd = "VSS";
+			break;
+	}
+
 	auto *retp = ret.get();
 
 	m_nlstate.family_cache().emplace(model, std::move(ret));
@@ -1440,7 +1556,7 @@
 		m_parser.register_dynamic_log_devices(loglist);
 	}
 
-	// create defparams!
+	// create defparams first!
 
 	for (auto & e : m_abstract.m_defparams)
 	{
@@ -1485,56 +1601,22 @@
 	}
 
 	int errcnt(0);
-	log().debug("Looking for unknown parameters ...\n");
-	for (auto &p : m_abstract.m_param_values)
-	{
-		auto f = m_params.find(p.first);
-		if (f == m_params.end())
-		{
-			if (plib::endsWith(p.first, sHINT_NO_DEACTIVATE))
-			{
-				// FIXME: get device name, check for device
-				auto *dev = m_nlstate.find_device(plib::replace_all(p.first, sHINT_NO_DEACTIVATE, ""));
-				if (dev == nullptr)
-				{
-					log().error(ME_DEVICE_NOT_FOUND_FOR_HINT(p.first));
-					errcnt++;
-				}
-			}
-			else
-			{
-				log().error(ME_UNKNOWN_PARAMETER(p.first));
-				errcnt++;
-			}
-		}
-	}
 
 	const bool use_deactivate = m_netlist_params->m_use_deactivate();
 
 	for (auto &d : m_nlstate.devices())
 	{
-		if (use_deactivate)
+		auto p = m_abstract.m_hints.find(d.second->name() + sHINT_NO_DEACTIVATE);
+		if (p != m_abstract.m_hints.end())
 		{
-			auto p = m_abstract.m_param_values.find(d.second->name() + sHINT_NO_DEACTIVATE);
-			if (p != m_abstract.m_param_values.end())
-			{
-				//FIXME: check for errors ...
-				bool err(false);
-				auto v = plib::pstonum_ne<nl_fptype>(p->second, err);
-				if (err || plib::abs(v - plib::floor(v)) > nlconst::magic(1e-6) )
-				{
-					log().error(ME_HND_VAL_NOT_SUPPORTED(p->second));
-					errcnt++;
-				}
-				else
-				{
-					// FIXME comparison with zero
-					d.second->set_hint_deactivate(v == nlconst::zero());
-				}
-			}
+			p->second = true; // mark as used
+			if (use_deactivate)
+				d.second->set_hint_deactivate(false);
+			else
+				d.second->set_hint_deactivate(true);
 		}
 		else
-			d.second->set_hint_deactivate(false);
+			d.second->set_hint_deactivate(true);
 	}
 
 	if (errcnt > 0)
@@ -1546,6 +1628,7 @@
 	// resolve inputs
 	resolve_inputs();
 
+#if 0
 	log().verbose("looking for two terms connected to rail nets ...");
 	for (auto & t : m_nlstate.get_device_list<analog::NETLIB_NAME(twoterm)>())
 	{
@@ -1553,9 +1636,23 @@
 		{
 			log().info(MI_REMOVE_DEVICE_1_CONNECTED_ONLY_TO_RAILS_2_3(
 				t->name(), t->N().net().name(), t->P().net().name()));
+			// The following would remove internal devices in e.g. MOSFETs as well.
+#if 0
 			remove_terminal(t->setup_N().net(), t->setup_N());
 			remove_terminal(t->setup_P().net(), t->setup_P());
 			m_nlstate.remove_device(t);
+#endif
+		}
+	}
+#endif
+
+	log().verbose("looking for unused hints ...");
+	for (auto &h : m_abstract.m_hints)
+	{
+		if (!h.second)
+		{
+			log().fatal(MF_UNUSED_HINT_1(h.first));
+			throw nl_exception(MF_UNUSED_HINT_1(h.first));
 		}
 	}
 
@@ -1573,13 +1670,33 @@
 	else
 		solver->post_start();
 
-	for (auto &n : m_nlstate.nets())
-		for (auto & term : n->core_terms())
+	errcnt = 0;
+	log().debug("Looking for unknown parameters ...\n");
+	for (auto &p : m_abstract.m_param_values)
+	{
+		auto f = m_params.find(p.first);
+		if (f == m_params.end())
 		{
-			core_device_t *dev = &term->device();
-			dev->set_default_delegate(*term);
+			log().error(ME_UNKNOWN_PARAMETER(p.first));
+			errcnt++;
 		}
+	}
+	if (errcnt > 0)
+	{
+		log().fatal(MF_ERRORS_FOUND(errcnt));
+		throw nl_exception(MF_ERRORS_FOUND(errcnt));
+	}
 
+	for (auto &n : m_nlstate.nets())
+	{
+		for (auto & term : n->core_terms())
+			if (!term->delegate())
+			{
+				log().fatal(MF_DELEGATE_NOT_SET_1(term->name()));
+				throw nl_exception(MF_DELEGATE_NOT_SET_1(term->name()));
+			}
+		n->rebuild_list();
+	}
 }
 
 // ----------------------------------------------------------------------------------------
@@ -1589,32 +1706,50 @@
 bool source_netlist_t::parse(nlparse_t &setup, const pstring &name)
 {
 	auto strm(stream(name));
-	return (strm) ? setup.parse_stream(std::move(strm), name) : false;
+	return (!strm.empty()) ? setup.parse_stream(std::move(strm), name) : false;
 }
 
 source_string_t::stream_ptr source_string_t::stream(const pstring &name)
 {
 	plib::unused_var(name);
-	source_string_t::stream_ptr ret(std::make_unique<std::istringstream>(m_str));
-	ret->imbue(std::locale::classic());
+	source_string_t::stream_ptr ret(std::make_unique<std::istringstream>(m_str), name);
+	ret.stream().imbue(std::locale::classic());
 	return ret;
 }
 
 source_mem_t::stream_ptr source_mem_t::stream(const pstring &name)
 {
 	plib::unused_var(name);
-	source_mem_t::stream_ptr ret(std::make_unique<std::istringstream>(m_str, std::ios_base::binary));
-	ret->imbue(std::locale::classic());
+	source_mem_t::stream_ptr ret(std::make_unique<std::istringstream>(m_str, std::ios_base::binary), name);
+	ret.stream().imbue(std::locale::classic());
 	return ret;
 }
 
 source_file_t::stream_ptr source_file_t::stream(const pstring &name)
 {
 	plib::unused_var(name);
-	auto ret(std::make_unique<plib::ifstream>(plib::filesystem::u8path(m_filename)));
-	return (ret->is_open()) ? std::move(ret) : stream_ptr(nullptr);
+	auto f = std::make_unique<plib::ifstream>(plib::filesystem::u8path(m_filename));
+	if (f->is_open())
+	{
+		return stream_ptr(std::move(f), m_filename);
+	}
+	else
+		return stream_ptr();
 }
 
+source_file_t::stream_ptr source_pattern_t::stream(const pstring &name)
+{
+	pstring filename = plib::pfmt(m_pattern)(name);
+	auto f = std::make_unique<plib::ifstream>(plib::filesystem::u8path(filename));
+	if (f->is_open())
+	{
+		return stream_ptr(std::move(f), filename);
+	}
+	else
+		return stream_ptr();
+}
+
+
 bool source_proc_t::parse(nlparse_t &setup, const pstring &name)
 {
 	if (name == m_setup_func_name)
@@ -1629,8 +1764,24 @@
 source_proc_t::stream_ptr source_proc_t::stream(const pstring &name)
 {
 	plib::unused_var(name);
-	stream_ptr p(nullptr);
-	return p;
+	return stream_ptr();
+}
+
+bool source_token_t::parse(nlparse_t &setup, const pstring &name)
+{
+	if (name == m_name)
+	{
+		auto ret = setup.parse_tokens(m_store, name);
+		return ret;
+	}
+
+	return false;
+}
+
+source_proc_t::stream_ptr source_token_t::stream(const pstring &name)
+{
+	plib::unused_var(name);
+	return stream_ptr();
 }
 
 } // namespace netlist
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/nl_setup.h mame-0.224+dfsg.1/src/lib/netlist/nl_setup.h
--- mame-0.222+dfsg.1/src/lib/netlist/nl_setup.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/nl_setup.h	2020-08-26 08:57:19.000000000 +0000
@@ -16,8 +16,10 @@
 #include "plib/putil.h"
 
 #include "nl_config.h"
-#include "nl_factory.h"
 #include "nltypes.h"
+#include "nl_parser.h"
+// FIXME: avoid including factory
+//#include "nl_factory.h"
 
 #include <initializer_list>
 #include <memory>
@@ -61,7 +63,7 @@
 		setup.defparam(NET_STR(name), NET_STR(val));
 
 #define HINT(name, val)                                                        \
-		setup.register_param(# name ".HINT_" # val, "1");
+		setup.register_hint(# name , ".HINT_" # val);
 
 #define NETDEV_PARAMI(name, param, val)                                        \
 		setup.register_param(# name "." # param, val);
@@ -79,18 +81,19 @@
 #define NETLIST_END()  }
 
 #define LOCAL_SOURCE(name)                                                     \
-		setup.register_source<netlist::source_proc_t>(# name, &NETLIST_NAME(name));
+		setup.register_source_proc(# name, &NETLIST_NAME(name));
+
+#define EXTERNAL_SOURCE(name)                                                  \
+		setup.register_source_proc(# name, &NETLIST_NAME(name));
 
 // FIXME: Need to pass in parameter definition
 #define LOCAL_LIB_ENTRY_1(name)                                                \
 		LOCAL_SOURCE(name)                                                     \
-		setup.register_lib_entry(# name,                                       \
-			netlist::factory::properties("", PSOURCELOC()));
+		setup.register_lib_entry(# name, "", PSOURCELOC());
 
 #define LOCAL_LIB_ENTRY_2(name, param_spec)                                    \
 		LOCAL_SOURCE(name)                                                     \
-		setup.register_lib_entry(# name,                                       \
-			netlist::factory::properties(param_spec, PSOURCELOC()));
+		setup.register_lib_entry(# name, param_spec, PSOURCELOC());
 
 #define LOCAL_LIB_ENTRY(...) PCALLVARARG(LOCAL_LIB_ENTRY_, __VA_ARGS__)
 
@@ -109,14 +112,15 @@
 // truthtable defines
 // -----------------------------------------------------------------------------
 
-#define TRUTHTABLE_START(cname, in, out, def_params)                           \
+#define TRUTHTABLE_START(cname, in, out, pdef_params)                          \
 	{ \
 		netlist::tt_desc desc;                                                 \
 		desc.name = #cname ;                                                   \
 		desc.ni = in;                                                          \
 		desc.no = out;                                                         \
 		desc.family = "";                                                      \
-		netlist::factory::properties props(def_params, PSOURCELOC());
+		auto sloc = PSOURCELOC();                                              \
+		const pstring def_params = pdef_params;
 
 #define TT_HEAD(x) \
 		desc.desc.emplace_back(x);
@@ -128,31 +132,12 @@
 		desc.family = x;
 
 #define TRUTHTABLE_END() \
-		setup.truthtable_create(desc, std::move(props)); \
+		setup.truthtable_create(desc, def_params, std::move(sloc)); \
 	}
 
 namespace netlist
 {
 
-	namespace detail {
-		class core_terminal_t;
-		class net_t;
-	} // namespace detail
-
-	namespace devices {
-		class nld_base_proxy;
-		class nld_netlistparams;
-	} // namespace devices
-
-	class core_device_t;
-	class param_t;
-	class nlparse_t;
-	class setup_t;
-	class netlist_state_t;
-	class netlist_t;
-	class logic_family_desc_t;
-	class terminal_t;
-
 	// -----------------------------------------------------------------------------
 	// truthtable desc
 	// -----------------------------------------------------------------------------
@@ -167,97 +152,11 @@
 		pstring family;
 	};
 
-	// -----------------------------------------------------------------------------
-	// param_ref_t
-	// -----------------------------------------------------------------------------
-
-	struct param_ref_t
-	{
-		param_ref_t() noexcept : m_device(nullptr), m_param(nullptr) {}
-		param_ref_t(core_device_t &device, param_t &param) noexcept
-		: m_device(&device)
-		, m_param(&param)
-		{ }
-
-		~param_ref_t() = default;
-		PCOPYASSIGNMOVE(param_ref_t, default)
-
-		const core_device_t &device() const noexcept { return *m_device; }
-		param_t &param() const noexcept { return *m_param; }
-
-		bool is_valid() const noexcept { return (m_device != nullptr) && (m_param != nullptr); }
-	private:
-		core_device_t *m_device;
-		param_t *m_param;
-	};
-
-	// ----------------------------------------------------------------------------------------
-	// Specific netlist psource_t implementations
-	// ----------------------------------------------------------------------------------------
-
-	class source_netlist_t : public plib::psource_t
-	{
-	public:
-
-		source_netlist_t() = default;
-
-		PCOPYASSIGNMOVE(source_netlist_t, delete)
-		~source_netlist_t() noexcept override = default;
-
-		virtual bool parse(nlparse_t &setup, const pstring &name);
-	};
-
-	class source_data_t : public plib::psource_t
-	{
-	public:
-
-		source_data_t() = default;
-
-		PCOPYASSIGNMOVE(source_data_t, delete)
-		~source_data_t() noexcept override = default;
-	};
-
 	// ----------------------------------------------------------------------------------------
-	// Collection of models
+	// static compiled netlist.
 	// ----------------------------------------------------------------------------------------
 
-	class models_t
-	{
-	public:
-		using raw_map_t = std::unordered_map<pstring, pstring>;
-		using map_t = std::unordered_map<pstring, pstring>;
-		class model_t
-		{
-		public:
-			model_t(const pstring &model, const map_t &map)
-			: m_model(model), m_map(map) { }
-
-			pstring value_str(const pstring &entity) const;
-
-			nl_fptype value(const pstring &entity) const;
-
-			pstring type() const { return value_str("COREMODEL"); }
-
-		private:
-			static pstring model_string(const map_t &map);
-
-			const pstring m_model; // only for error messages
-			const map_t &m_map;
-		};
-
-		models_t(const raw_map_t &models)
-		: m_models(models)
-		{}
-
-		model_t get_model(const pstring &model);
-
-	private:
-
-		void model_parse(const pstring &model, map_t &map);
-
-		const raw_map_t &m_models;
-		std::unordered_map<pstring, map_t> m_cache;
-	};
+	using nlsetup_func = void (*)(nlparse_t &);
 
 	// ----------------------------------------------------------------------------------------
 	// nlparse_t
@@ -266,22 +165,7 @@
 	class nlparse_t
 	{
 	public:
-		using link_t = std::pair<pstring, pstring>;
-
-		struct abstract_t
-		{
-			std::unordered_map<pstring, pstring>        m_alias;
-			std::vector<link_t>                         m_links;
-			std::unordered_map<pstring, pstring>        m_param_values;
-			models_t::raw_map_t                         m_models;
-
-			// need to preserve order of device creation ...
-			std::vector<std::pair<pstring, factory::element_t *>> m_device_factory;
-			// lifetime control only - can be cleared before run
-			std::vector<std::pair<pstring, pstring>>    m_defparams;
-		};
-
-		nlparse_t(log_type &log, abstract_t &abstract);
+		nlparse_t(log_type &log, detail::abstract_t &abstract);
 
 		void register_model(const pstring &model_in);
 		void register_alias(const pstring &alias, const pstring &out);
@@ -298,6 +182,8 @@
 			register_dev(classname, name, std::vector<pstring>());
 		}
 
+		void register_hint(const pstring &objname, const pstring &hintname);
+
 		void register_link(const pstring &sin, const pstring &sout);
 		void register_link_arr(const pstring &terms);
 		// also called from devices for latebinding connected terminals
@@ -313,7 +199,7 @@
 			register_param(param, plib::narrow_cast<nl_fptype>(value));
 		}
 
-		void register_lib_entry(const pstring &name, factory::properties &&props);
+		void register_lib_entry(const pstring &name, const pstring &def_params, plib::source_location &&loc);
 
 		void register_frontier(const pstring &attach, const pstring &r_IN, const pstring &r_OUT);
 
@@ -327,7 +213,9 @@
 			m_sources.add_source(std::move(src));
 		}
 
-		void truthtable_create(tt_desc &desc, factory::properties &&props);
+		void register_source_proc(const pstring &name, nlsetup_func func);
+
+		void truthtable_create(tt_desc &desc, const pstring &def_params, plib::source_location &&loc);
 
 		// handle namespace
 
@@ -345,6 +233,7 @@
 
 		// FIXME: used by source_t - need a different approach at some time
 		bool parse_stream(plib::psource_t::stream_ptr &&istrm, const pstring &name);
+		bool parse_tokens(const parser_t::token_store &tokens, const pstring &name);
 
 		template <typename S, typename... Args>
 		void add_include(Args&&... args)
@@ -368,8 +257,8 @@
 		// register a list of logs
 		void register_dynamic_log_devices(const std::vector<pstring> &loglist);
 
-		factory::list_t &factory() noexcept { return m_factory; }
-		const factory::list_t &factory() const noexcept  { return m_factory; }
+		factory::list_t &factory() noexcept;
+		const factory::list_t &factory() const noexcept;
 
 		log_type &log() noexcept { return m_log; }
 		const log_type &log() const noexcept { return m_log; }
@@ -384,191 +273,13 @@
 		plib::psource_collection_t<>                m_includes;
 		std::stack<pstring>                         m_namespace_stack;
 		plib::psource_collection_t<>                m_sources;
-		// FIXME: convert to hash and deal with sorting in nltool
-		factory::list_t                             m_factory;
-		abstract_t                                 &m_abstract;
+		detail::abstract_t &                        m_abstract;
 
+		std::unordered_map<pstring, parser_t::token_store>    m_source_cache;
 		log_type &m_log;
 		unsigned m_frontier_cnt;
 	};
 
-	// ----------------------------------------------------------------------------------------
-	// setup_t
-	// ----------------------------------------------------------------------------------------
-
-	class setup_t
-	{
-	public:
-
-		explicit setup_t(netlist_state_t &nlstate);
-		~setup_t() noexcept = default;
-
-		PCOPYASSIGNMOVE(setup_t, delete)
-
-		// called from param_t creation
-		void register_param_t(param_t &param);
-		pstring get_initial_param_val(const pstring &name, const pstring &def) const;
-
-		void register_term(detail::core_terminal_t &term);
-		void register_term(terminal_t &term, terminal_t &other_term);
-
-		// called from net_splitter
-		terminal_t *get_connected_terminal(const terminal_t &term) const noexcept
-		{
-			auto ret(m_connected_terminals.find(&term));
-			return (ret != m_connected_terminals.end()) ? ret->second : nullptr;
-		}
-
-		// get family -> truthtable
-		const logic_family_desc_t *family_from_model(const pstring &model);
-
-		// FIXME: return param_ref_t
-		param_ref_t find_param(const pstring &param_in) const;
-		// needed by nltool
-		std::vector<pstring> get_terminals_for_device_name(const pstring &devname) const;
-
-		// needed by proxy device to check power terminals
-		detail::core_terminal_t *find_terminal(const pstring &terminal_in, detail::terminal_type atype, bool required = true) const;
-		detail::core_terminal_t *find_terminal(const pstring &terminal_in, bool required = true) const;
-		pstring de_alias(const pstring &alias) const;
-		// FIXME: only needed by solver code outside of setup_t
-		bool connect(detail::core_terminal_t &t1, detail::core_terminal_t &t2);
-
-		// run preparation
-
-		void prepare_to_run();
-
-		models_t &models() noexcept { return m_models; }
-		const models_t &models() const noexcept { return m_models; }
-
-		netlist_state_t &nlstate() { return m_nlstate; }
-		const netlist_state_t &nlstate() const { return m_nlstate; }
-
-		nlparse_t &parser() { return m_parser; }
-		const nlparse_t &parser() const { return m_parser; }
-
-		log_type &log() noexcept;
-		const log_type &log() const noexcept;
-
-		// FIXME: needed from matrix_solver_t
-		void add_terminal(detail::net_t &net, detail::core_terminal_t &terminal) noexcept(false);
-
-	private:
-
-		void resolve_inputs();
-		pstring resolve_alias(const pstring &name) const;
-
-		void merge_nets(detail::net_t &thisnet, detail::net_t &othernet);
-
-		void connect_terminals(detail::core_terminal_t &t1, detail::core_terminal_t &t2);
-		void connect_input_output(detail::core_terminal_t &in, detail::core_terminal_t &out);
-		void connect_terminal_output(terminal_t &in, detail::core_terminal_t &out);
-		void connect_terminal_input(terminal_t &term, detail::core_terminal_t &inp);
-		bool connect_input_input(detail::core_terminal_t &t1, detail::core_terminal_t &t2);
-
-		// helpers
-		static pstring termtype_as_str(detail::core_terminal_t &in);
-
-		devices::nld_base_proxy *get_d_a_proxy(const detail::core_terminal_t &out);
-		devices::nld_base_proxy *get_a_d_proxy(detail::core_terminal_t &inp);
-		detail::core_terminal_t &resolve_proxy(detail::core_terminal_t &term);
-
-		// net manipulations
-
-		void remove_terminal(detail::net_t &net, detail::core_terminal_t &terminal) noexcept(false);
-		void move_connections(detail::net_t &net, detail::net_t &dest_net);
-		void delete_empty_nets();
-
-		nlparse_t::abstract_t                       m_abstract;
-		nlparse_t                                   m_parser;
-		netlist_state_t                             &m_nlstate;
-
-		models_t                                    m_models;
-
-		// FIXME: currently only used during setup
-		devices::nld_netlistparams *                           m_netlist_params;
-
-		// FIXME: can be cleared before run
-		std::unordered_map<pstring, detail::core_terminal_t *> m_terminals;
-		std::unordered_map<const terminal_t *, terminal_t *>   m_connected_terminals;
-		std::unordered_map<pstring, param_ref_t>               m_params;
-		std::unordered_map<const detail::core_terminal_t *,
-			devices::nld_base_proxy *>                         m_proxies;
-		std::vector<host_arena::unique_ptr<param_t>>           m_defparam_lifetime;
-
-		unsigned m_proxy_cnt;
-	};
-
-	// ----------------------------------------------------------------------------------------
-	// base sources
-	// ----------------------------------------------------------------------------------------
-
-	class source_string_t : public source_netlist_t
-	{
-	public:
-
-		explicit source_string_t(const pstring &source)
-		: m_str(source)
-		{
-		}
-
-	protected:
-		stream_ptr stream(const pstring &name) override;
-
-	private:
-		pstring m_str;
-	};
-
-	class source_file_t : public source_netlist_t
-	{
-	public:
-
-		explicit source_file_t(const pstring &filename)
-		: m_filename(filename)
-		{
-		}
-
-	protected:
-		stream_ptr stream(const pstring &name) override;
-
-	private:
-		pstring m_filename;
-	};
-
-	class source_mem_t : public source_netlist_t
-	{
-	public:
-		explicit source_mem_t(const char *mem)
-		: m_str(mem)
-		{
-		}
-
-	protected:
-		stream_ptr stream(const pstring &name) override;
-
-	private:
-		pstring m_str;
-	};
-
-	class source_proc_t : public source_netlist_t
-	{
-	public:
-		source_proc_t(const pstring &name, void (*setup_func)(nlparse_t &))
-		: m_setup_func(setup_func)
-		, m_setup_func_name(name)
-		{
-		}
-
-		bool parse(nlparse_t &setup, const pstring &name) override;
-
-	protected:
-		stream_ptr stream(const pstring &name) override;
-
-	private:
-		void (*m_setup_func)(nlparse_t &);
-		pstring m_setup_func_name;
-	};
-
 	// -----------------------------------------------------------------------------
 	// inline implementations
 	// -----------------------------------------------------------------------------
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/nltypes.h mame-0.224+dfsg.1/src/lib/netlist/nltypes.h
--- mame-0.222+dfsg.1/src/lib/netlist/nltypes.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/nltypes.h	2020-08-26 08:57:19.000000000 +0000
@@ -13,19 +13,100 @@
 #define NLTYPES_H_
 
 #include "nl_config.h"
-#include "plib/pchrono.h"
-#include "plib/pdynlib.h"
-#include "plib/pfmtlog.h"
+
 #include "plib/pmempool.h"
-#include "plib/pstate.h"
+#include "plib/ppmf.h"
 #include "plib/pstring.h"
 #include "plib/ptime.h"
-#include "plib/putil.h"
+#include "plib/ptypes.h"
+
+#include <memory>
+
+// FIXME: Move to ptypes
+namespace plib
+{
+	// FORWARD declarations
+	template <typename BASEARENA, std::size_t MINALIGN>
+	class mempool_arena;
+
+	struct aligned_arena;
+	class dynlib_base;
+
+	template<class T, bool debug_enabled>
+	class plog_base;
 
-#include <unordered_map>
+	struct plog_level;
+} // namespace plib
 
 namespace netlist
 {
+	// -----------------------------------------------------------------------------
+	// forward definitions
+	// -----------------------------------------------------------------------------
+
+	class logic_output_t;
+	class tristate_output_t;
+	class logic_input_t;
+	class analog_net_t;
+	class logic_net_t;
+	class setup_t;
+	class nlparse_t;
+	class netlist_t;
+	class netlist_state_t;
+	class core_device_t;
+	class device_t;
+	class netlist_state_t;
+	class param_t;
+	class logic_family_desc_t;
+	class terminal_t;
+
+	class models_t;
+
+	namespace devices
+	{
+		class nld_solver;
+		class nld_mainclock;
+		class nld_base_proxy;
+		class nld_base_d_to_a_proxy;
+		class nld_base_a_to_d_proxy;
+		class nld_netlistparams;
+	} // namespace devices
+
+	namespace solver
+	{
+		class matrix_solver_t;
+	} // namespace solver
+
+	namespace detail
+	{
+		struct abstract_t;
+		class core_terminal_t;
+		class net_t;
+		class device_object_t;
+	} // namespace detail
+
+	namespace factory
+	{
+		class list_t;
+		class element_t;
+		struct properties;
+	} // namespace factory
+
+	template <class CX>
+	class delegator_t : public CX
+	{
+	protected:
+		using base_type = delegator_t<CX>;
+		using delegated_type = CX;
+		using delegated_type::delegated_type;
+	};
+
+} // namespace netlist
+
+
+namespace netlist
+{
+
 	/// \brief Constants and const calculations for the library
 	///
 	template<typename T>
@@ -79,7 +160,7 @@
 	///
 
 	using device_arena = std::conditional_t<config::use_mempool::value,
-		plib::mempool_arena<plib::aligned_arena>,
+		plib::mempool_arena<plib::aligned_arena, NL_MEMPOOL_ALIGN>,
 		plib::aligned_arena>;
 	using host_arena   = plib::aligned_arena;
 
@@ -109,7 +190,7 @@
 		/// of a callbacks_t implementation to optionally provide such a collection
 		/// of symbols.
 		///
-		virtual host_arena::unique_ptr<plib::dynlib_base> static_solver_lib() const;
+		virtual std::unique_ptr<plib::dynlib_base> static_solver_lib() const;
 	};
 
 	using log_type =  plib::plog_base<callbacks_t, NL_DEBUG>;
@@ -118,6 +199,22 @@
 	//  Types needed by various includes
 	//============================================================
 
+	/// \brief Timestep type.
+	///
+	/// May be either FORWARD or RESTORE
+	///
+	enum class timestep_type
+	{
+		FORWARD,  ///< forward time
+		RESTORE   ///< restore state before last forward
+	};
+
+	/// \brief Delegate type for device notification.
+	///
+	using nldelegate = plib::pmfp<void>;
+	using nldelegate_ts = plib::pmfp<void, timestep_type, nl_fptype>;
+	using nldelegate_dyn = plib::pmfp<void>;
+
 	namespace detail {
 
 		/// \brief Enum specifying the type of object
@@ -198,6 +295,32 @@
 		using desc_const_t =  std::integral_constant<const T, V>;
 	};
 
+	//============================================================
+	//  Exceptions
+	//============================================================
+
+	/// \brief Generic netlist exception.
+	///  The exception is used in all events which are considered fatal.
+
+	class nl_exception : public plib::pexception
+	{
+	public:
+		/// \brief Constructor.
+		///  Allows a descriptive text to be passed to the exception
+
+		explicit nl_exception(const pstring &text //!< text to be passed
+				)
+		: plib::pexception(text) { }
+
+		/// \brief Constructor.
+		///  Allows to use \ref plib::pfmt logic to be used in exception
+
+		template<typename... Args>
+		explicit nl_exception(const pstring &fmt //!< format to be used
+			, Args&&... args //!< arguments to be passed
+			)
+		: plib::pexception(plib::pfmt(fmt)(std::forward<Args>(args)...)) { }
+	};
 
 } // namespace netlist
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/mat_cr.h mame-0.224+dfsg.1/src/lib/netlist/plib/mat_cr.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/mat_cr.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/mat_cr.h	2020-08-26 08:57:19.000000000 +0000
@@ -14,6 +14,7 @@
 #include "parray.h"
 #include "pconfig.h"
 #include "pmath.h"
+#include "pmatrix2d.h"
 #include "pomp.h"
 #include "pstate.h"
 #include "ptypes.h"
@@ -62,7 +63,7 @@
 		, A(n*n)
 		, nz_num(0)
 		//, nzbd(n * (n+1) / 2)
-		, nzbd(n)
+		, m_nzbd(n, n)
 		, m_size(n)
 		{
 			for (std::size_t i=0; i<n+1; i++)
@@ -148,10 +149,17 @@
 
 			for (std::size_t k=0; k < size(); k++)
 			{
+#if 0
 				for (std::size_t j=k + 1; j < size(); j++)
 					if (f[j][k] < FILL_INFINITY)
-						nzbd[k].push_back(narrow_cast<C>(j));
-				nzbd[k].push_back(0); // end of sequence
+						m_nzbd[k].push_back(narrow_cast<C>(j));
+				m_nzbd[k].push_back(0); // end of sequence
+#else
+				for (std::size_t j=k + 1; j < size(); j++)
+					if (f[j][k] < FILL_INFINITY)
+						m_nzbd.set(k, m_nzbd.colcount(k), narrow_cast<C>(j));
+				m_nzbd.set(k, m_nzbd.colcount(k), 0); // end of sequence
+#endif
 			}
 
 		}
@@ -241,10 +249,13 @@
 				A[k] = src.A[k];
 		}
 
+		index_type * nzbd(std::size_t row) { return m_nzbd[row]; }
+		std::size_t nzbd_count(std::size_t row) { return m_nzbd.colcount(row) - 1; }
 	protected:
 		// FIXME: this should be private
 		// NOLINTNEXTLINE
-		parray<std::vector<index_type>, N > nzbd;    // Support for gaussian elimination
+		//parray<std::vector<index_type>, N > m_nzbd;    // Support for gaussian elimination
+		pmatrix2d_vrl<index_type> m_nzbd;    // Support for gaussian elimination
 	private:
 		//parray<C, N < 0 ? -N * (N-1) / 2 : N * (N+1) / 2 > nzbd;    // Support for gaussian elimination
 		std::size_t m_size;
@@ -309,8 +320,8 @@
 				std::size_t pi = base::diag[i];
 				auto f = reciprocal(base::A[pi++]);
 				const std::size_t piie = base::row_idx[i+1];
-				const auto &nz = base::nzbd[i];
 
+				const auto *nz = base::m_nzbd[i];
 				while (auto j = nz[nzbdp++]) // NOLINT(bugprone-infinite-loop)
 				{
 					// proceed to column i
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/palloc.h mame-0.224+dfsg.1/src/lib/netlist/plib/palloc.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/palloc.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/palloc.h	2020-08-26 08:57:19.000000000 +0000
@@ -10,8 +10,8 @@
 
 #include "pconfig.h"
 #include "pgsl.h"
-#include "pmath.h"
-#include "pstring.h"
+#include "pgsl.h"
+#include "pmath.h"  // FIXME: only uses lcm ... move to ptypes.
 #include "ptypes.h"
 
 #include <algorithm>
@@ -245,14 +245,18 @@
 		static /*constexpr*/ const std::size_t align_size = ALIGN;
 		using arena_type = ARENA;
 
-		static_assert(align_size >= alignof(T) && (align_size % alignof(T)) == 0,
+		static_assert(align_size >= alignof(T),
+			"ALIGN must be greater than alignof(T) and a multiple");
+		static_assert((align_size % alignof(T)) == 0,
 			"ALIGN must be greater than alignof(T) and a multiple");
 
 		arena_allocator() noexcept
 		: m_a(arena_type::instance())
 		{ }
 
-		//~arena_allocator() noexcept = default;
+		~arena_allocator() noexcept = default;
+
+		PCOPYASSIGNMOVE(arena_allocator, default)
 
 		explicit arena_allocator(arena_type & a) noexcept : m_a(a)
 		{
@@ -415,7 +419,7 @@
 		#if (PUSE_ALIGNED_ALLOCATION)
 		#if defined(_WIN32) || defined(_WIN64) || defined(_MSC_VER)
 			return _aligned_malloc(size, alignment);
-		#elif defined(__APPLE__)
+		#elif defined(__APPLE__) || defined(__ANDROID__)
 			void* p;
 			if (::posix_memalign(&p, alignment, size) != 0) {
 				p = nullptr;
@@ -435,8 +439,13 @@
 			//unused_var(size);
 			dec_alloc_stat(size);
 			#if (PUSE_ALIGNED_ALLOCATION)
+				#if defined(_WIN32) || defined(_WIN64) || defined(_MSC_VER)
+				// NOLINTNEXTLINE(cppcoreguidelines-no-malloc)
+				_aligned_free(ptr);
+				#else
 				// NOLINTNEXTLINE(cppcoreguidelines-no-malloc)
 				::free(ptr);
+				#endif
 			#else
 				::operator delete(ptr);
 			#endif
@@ -614,13 +623,11 @@
 	struct align_traits : public align_traits_base<T, has_align<T>::value>
 	{};
 
-	template <typename BASEARENA = aligned_arena, std::size_t PAGESIZE = 1024>
-	class paged_arena : public arena_base<paged_arena<BASEARENA, PAGESIZE>, true, true>
+	template <typename BASEARENA = aligned_arena, std::size_t PG_SIZE = 1024>
+	class paged_arena : public arena_base<paged_arena<BASEARENA, PG_SIZE>, true, true>
 	{
 	public:
-		paged_arena()
-		{
-		}
+		paged_arena() = default;
 
 		PCOPYASSIGNMOVE(paged_arena, delete)
 
@@ -629,13 +636,13 @@
 		static void *allocate(size_t align, size_t size)
 		{
 			plib::unused_var(align);
-			//size = ((size + PAGESIZE - 1) / PAGESIZE) * PAGESIZE;
-			return arena().allocate(PAGESIZE, size);
+			//size = ((size + PG_SIZE - 1) / PG_SIZE) * PG_SIZE;
+			return arena().allocate(PG_SIZE, size);
 		}
 
 		static void deallocate(void *ptr, size_t size) noexcept
 		{
-			//size = ((size + PAGESIZE - 1) / PAGESIZE) * PAGESIZE;
+			//size = ((size + PG_SIZE - 1) / PG_SIZE) * PG_SIZE;
 			arena().deallocate(ptr, size);
 		}
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/pchrono.h mame-0.224+dfsg.1/src/lib/netlist/plib/pchrono.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/pchrono.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/pchrono.h	2020-08-26 08:57:19.000000000 +0000
@@ -217,6 +217,12 @@
 					/ narrow_cast<S>(T::per_second()); }
 
 			guard_t guard() noexcept { return guard_t(*this); }
+
+			// pause must be followed by cont(inue)
+			void stop() noexcept { m_time += T::stop(); }
+			void start() noexcept { m_time -= T::start(); }
+
+
 		private:
 			type m_time;
 			ctype m_count;
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/pconfig.h mame-0.224+dfsg.1/src/lib/netlist/plib/pconfig.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/pconfig.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/pconfig.h	2020-08-26 08:57:19.000000000 +0000
@@ -41,7 +41,11 @@
 /// Set this to one if you want to use aligned storage optimizations.
 ///
 #ifndef PUSE_ALIGNED_OPTIMIZATIONS
+#if defined(__EMSCRIPTEN__)
 #define PUSE_ALIGNED_OPTIMIZATIONS (0)
+#else
+#define PUSE_ALIGNED_OPTIMIZATIONS (1)
+#endif
 #endif
 
 /// \brief Use aligned allocations.
@@ -63,11 +67,13 @@
 
 /// \brief Number of bytes for cache line alignment
 ///
-#define PALIGN_CACHELINE        (16)
+#define PALIGN_CACHELINE        (64)
 
 /// \brief Number of bytes for vector alignment
 ///
-#define PALIGN_VECTOROPT        (16)
+#define PALIGN_VECTOROPT        (32)
+
+#define PALIGN_MIN_SIZE         (16)
 
 #define PALIGNAS_CACHELINE()    PALIGNAS(PALIGN_CACHELINE)
 #define PALIGNAS_VECTOROPT()    PALIGNAS(PALIGN_VECTOROPT)
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/penum.h mame-0.224+dfsg.1/src/lib/netlist/plib/penum.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/penum.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/penum.h	2020-08-26 08:57:19.000000000 +0000
@@ -9,8 +9,6 @@
 ///
 
 #include "pstring.h"
-#include "pstrutil.h"
-#include "putil.h"
 
 namespace plib
 {
@@ -45,6 +43,7 @@
 		pstring name() const { \
 			return nthstr(m_v, strings()); \
 		} \
+		template <typename S> void save_state(S &saver) { saver.save_item(m_v, "m_v"); } \
 		private: E m_v; \
 		static pstring strings() {\
 			static const char * lstrings = # __VA_ARGS__; \
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/pfmtlog.h mame-0.224+dfsg.1/src/lib/netlist/plib/pfmtlog.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/pfmtlog.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/pfmtlog.h	2020-08-26 08:57:19.000000000 +0000
@@ -5,13 +5,12 @@
 /// \file pfmtlog.h
 ///
 
-#ifndef PFMT_H_
-#define PFMT_H_
+#ifndef PFMTLOG_H_
+#define PFMTLOG_H_
 
 #include "penum.h"
 #include "pstring.h"
 #include "ptypes.h"
-#include "putil.h"
 
 #include <limits>
 #include <locale>
@@ -423,4 +422,4 @@
 template<typename T>
 plib::pfmt& operator<<(plib::pfmt &p, T&& val) { return p(std::forward<T>(val)); }
 
-#endif // PSTRING_H_
+#endif // PFMT_LOG_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/pfunction.cpp mame-0.224+dfsg.1/src/lib/netlist/plib/pfunction.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/plib/pfunction.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/pfunction.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -11,6 +11,7 @@
 
 #include <array>
 #include <map>
+#include <map>
 #include <stack>
 #include <type_traits>
 #include <utility>
@@ -19,6 +20,44 @@
 
 	static constexpr const std::size_t MAX_STACK = 32;
 
+	struct pcmd_t
+	{
+		rpn_cmd cmd;
+		int adj;
+		int prio;
+	};
+
+	static const std::map<pstring, pcmd_t> &pcmds()
+	{
+		static const std::map<pstring, pcmd_t> lpcmds =
+		{
+			{ "^",     { POW,   1, 30 } },
+			{ "neg",   { NEG,   0, 25 } },
+			{ "+",     { ADD,   1, 10 } },
+			{ "-",     { SUB,   1, 10 } },
+			{ "*",     { MULT,  1, 20 } },
+			{ "/",     { DIV,   1, 20 } },
+			{ "<",     { LT,    1,  9 } },
+			{ ">",     { GT,    1,  9 } },
+			{ "<=",    { LE,    1,  9 } },
+			{ ">=",    { GE,    1,  9 } },
+			{ "==",    { EQ,    1,  8 } },
+			{ "!=",    { NE,    1,  8 } },
+			{ "if",    { IF,    2,  0 } },
+			{ "pow",   { POW,   1,  0 } },
+			{ "log",   { LOG,   0,  0 } },
+			{ "sin",   { SIN,   0,  0 } },
+			{ "cos",   { COS,   0,  0 } },
+			{ "max",   { MAX,   1,  0 } },
+			{ "min",   { MIN,   1,  0 } },
+			{ "trunc", { TRUNC, 0,  0 } },
+			{ "rand",  { RAND, -1,  0 } },
+
+			{ "(",     { LP,    0,  1 } },
+			{ ")",     { RP,    0,  1 } },
+		};
+		return lpcmds;
+	}
 	// FIXME: Exa parsing conflicts with e,E parsing
 	template<typename F>
 	static const std::map<pstring, F> &units_si()
@@ -76,28 +115,12 @@
 		for (const pstring &cmd : cmds)
 		{
 			rpn_inst rc;
-			if (cmd == "+")
-				{ rc.m_cmd = ADD; stk -= 1; }
-			else if (cmd == "-")
-				{ rc.m_cmd = SUB; stk -= 1; }
-			else if (cmd == "*")
-				{ rc.m_cmd = MULT; stk -= 1; }
-			else if (cmd == "/")
-				{ rc.m_cmd = DIV; stk -= 1; }
-			else if (cmd == "pow")
-				{ rc.m_cmd = POW; stk -= 1; }
-			else if (cmd == "sin")
-				{ rc.m_cmd = SIN; stk -= 0; }
-			else if (cmd == "cos")
-				{ rc.m_cmd = COS; stk -= 0; }
-			else if (cmd == "max")
-				{ rc.m_cmd = MAX; stk -= 1; }
-			else if (cmd == "min")
-				{ rc.m_cmd = MIN; stk -= 1; }
-			else if (cmd == "trunc")
-				{ rc.m_cmd = TRUNC; stk -= 0; }
-			else if (cmd == "rand")
-				{ rc.m_cmd = RAND; stk += 1; }
+			auto p = pcmds().find(cmd);
+			if (p != pcmds().end())
+			{
+				rc.m_cmd = p->second.cmd;
+				stk -= p->second.adj;
+			}
 			else
 			{
 				for (std::size_t i = 0; i < inputs.size(); i++)
@@ -105,22 +128,22 @@
 					if (inputs[i] == cmd)
 					{
 						rc.m_cmd = PUSH_INPUT;
-						rc.m_param = narrow_cast<NT>(i);
+						rc.m_param.index = i;
 						stk += 1;
 						break;
 					}
 				}
 				if (rc.m_cmd != PUSH_INPUT)
 				{
-					using fl_t = decltype(rc.m_param);
+					using fl_t = decltype(rc.m_param.val);
 					rc.m_cmd = PUSH_CONST;
 					bool err(false);
 					auto rs(plib::right(cmd,1));
 					auto r=units_si<fl_t>().find(rs);
 					if (r == units_si<fl_t>().end())
-						rc.m_param = plib::pstonum_ne<fl_t>(cmd, err);
+						rc.m_param.val = plib::pstonum_ne<fl_t>(cmd, err);
 					else
-						rc.m_param = plib::pstonum_ne<fl_t>(plib::left(cmd, cmd.size()-1), err) * r->second;
+						rc.m_param.val = plib::pstonum_ne<fl_t>(plib::left(cmd, cmd.size()-1), err) * r->second;
 					if (err)
 						throw pexception(plib::pfmt("pfunction: unknown/misformatted token <{1}> in <{2}>")(cmd)(expr));
 					stk += 1;
@@ -133,22 +156,32 @@
 			m_precompiled.push_back(rc);
 		}
 		if (stk != 1)
-			throw pexception(plib::pfmt("pfunction: stack count different to one on <{2}>")(expr));
+			throw pexception(plib::pfmt("pfunction: stack count {1} different to one on <{2}>")(stk, expr));
+	}
+
+	static bool is_number(const pstring &n)
+	{
+		if (n.empty())
+			return false;
+		const auto l = n.substr(0,1);
+		return (l >= "0" && l <= "9");
+	}
+
+	static bool is_id(const pstring &n)
+	{
+		if (n.empty())
+			return false;
+		const auto l = n.substr(0,1);
+		return ((l >= "a" && l <= "z") || (l >= "A" && l <= "Z"));
 	}
 
 	static int get_prio(const pstring &v)
 	{
-		if (v == "(" || v == ")")
-			return 1;
+		auto p = pcmds().find(v);
+		if (p != pcmds().end())
+			return p->second.prio;
 		if (plib::left(v, 1) >= "a" && plib::left(v, 1) <= "z")
 			return 0;
-		if (v == "*" || v == "/")
-			return 20;
-		if (v == "+" || v == "-")
-			return 10;
-		if (v == "^")
-			return 30;
-
 		return -1;
 	}
 
@@ -165,53 +198,56 @@
 	void pfunction<NT>::compile_infix(const pstring &expr, const inputs_container &inputs)
 	{
 		// Shunting-yard infix parsing
-		std::vector<pstring> sep = {"(", ")", ",", "*", "/", "+", "-", "^"};
-		std::vector<pstring> sexpr1(plib::psplit(plib::replace_all(expr, " ", ""), sep));
+		std::vector<pstring> sep = {"(", ")", ",", "*", "/", "+", "-", "^", "<=", ">=", "==", "!=", "<", ">"};
+		std::vector<pstring> sexpr2(plib::psplit(plib::replace_all(expr, " ", ""), sep));
 		std::stack<pstring> opstk;
 		std::vector<pstring> postfix;
+		std::vector<pstring> sexpr1;
 		std::vector<pstring> sexpr;
 
 		// FIXME: We really need to switch to ptokenizer and fix negative number
 		//        handling in ptokenizer.
 
-		// Fix numbers
-		for (std::size_t i = 0; i < sexpr1.size(); )
+		// Fix numbers exponential numbers
+		for (std::size_t i = 0; i < sexpr2.size(); )
 		{
-			if ((i == 0) && (sexpr1.size() > 1) && (sexpr1[0] == "-")
-				&& (plib::left(sexpr1[1],1) >= "0") && (plib::left(sexpr1[1],1) <= "9"))
+			if (i + 2 < sexpr2.size() && sexpr2[i].length() > 1)
 			{
-				if (sexpr1.size() < 4)
+				auto r(plib::right(sexpr2[i], 1));
+				auto ne(sexpr2[i+1]);
+				if ((is_number(sexpr2[i]))
+					&& (r == "e" || r == "E")
+					&& (ne == "-" || ne == "+"))
 				{
-					sexpr.push_back(sexpr1[0] + sexpr1[1]);
-					i+=2;
+					sexpr1.push_back(sexpr2[i] + ne + sexpr2[i+2]);
+					i+=3;
 				}
 				else
+					sexpr1.push_back(sexpr2[i++]);
+			}
+			else
+				sexpr1.push_back(sexpr2[i++]);
+		}
+		// Fix numbers with unary minus/plus
+		for (std::size_t i = 0; i < sexpr1.size(); )
+		{
+			if (sexpr1[i]=="-" && (i+1 < sexpr1.size()) && is_number(sexpr1[i+1]))
+			{
+				if (i==0 || !(is_number(sexpr1[i-1]) || sexpr1[i-1] == ")" || is_id(sexpr1[i-1])))
 				{
-					auto r(plib::right(sexpr1[1], 1));
-					auto ne(sexpr1[2]);
-					if ((r == "e" || r == "E") && (ne == "-" || ne == "+"))
-					{
-						sexpr.push_back(sexpr1[0] + sexpr1[1] + ne + sexpr1[3]);
-						i+=4;
-					}
-					else
-					{
-						sexpr.push_back(sexpr1[0] + sexpr1[1]);
-						i+=2;
-					}
+					sexpr.push_back("-" + sexpr1[i+1]);
+					i+=2;
 				}
+				else
+					sexpr.push_back(sexpr1[i++]);
 			}
-			else if (i + 2 < sexpr1.size() && sexpr1[i].length() > 1)
+			else if (sexpr1[i]=="-" && (i+1 < sexpr1.size()) && (is_id(sexpr1[i+1]) || sexpr1[i+1] == "("))
 			{
-				auto l(plib::left(sexpr1[i], 1));
-				auto r(plib::right(sexpr1[i], 1));
-				auto ne(sexpr1[i+1]);
-				if ((l >= "0") && (l <= "9")
-					&& (r == "e" || r == "E")
-					&& (ne == "-" || ne == "+"))
+				if (i==0 || !(is_number(sexpr1[i-1]) || sexpr1[i-1] == ")" || is_id(sexpr1[i-1])))
 				{
-					sexpr.push_back(sexpr1[i] + ne + sexpr1[i+2]);
-					i+=3;
+					sexpr.emplace_back("neg");
+					sexpr.push_back(sexpr1[i+1]);
+					i+=2;
 				}
 				else
 					sexpr.push_back(sexpr1[i++]);
@@ -247,19 +283,19 @@
 				opstk.push(x);
 			}
 			else {
-				int p = get_prio(s);
-				if (p>0)
+				int prio = get_prio(s);
+				if (prio>0)
 				{
 					if (opstk.empty())
 						opstk.push(s);
 					else
 					{
-						if (get_prio(opstk.top()) >= get_prio(s))
+						if (get_prio(opstk.top()) >= prio)
 							postfix.push_back(pop_check(opstk, expr));
 						opstk.push(s);
 					}
 				}
-				else if (p == 0) // Function or variable
+				else if (prio == 0) // Function or variable
 				{
 					if ((i+1<sexpr.size()) && sexpr[i+1] == "(")
 						opstk.push(s);
@@ -275,6 +311,8 @@
 			postfix.push_back(opstk.top());
 			opstk.pop();
 		}
+		//for (auto &e : postfix)
+		//  printf("\t%s\n", e.c_str());
 		compile_postfix(inputs, postfix, expr);
 	}
 
@@ -288,7 +326,8 @@
 			lfsr ^= 0xB400U; // NOLINT: taps 15, 13, 12, 10
 		return narrow_cast<NT>(lfsr) / narrow_cast<NT>(0xffffU); // NOLINT
 	}
-
+#if 0
+	// Currently unused since no integral type pfunction defined
 	template <typename NT>
 	static inline std::enable_if_t<plib::is_integral<NT>::value, NT>
 	lfsr_random(std::uint16_t &lfsr) noexcept
@@ -299,7 +338,8 @@
 			lfsr ^= 0xB400U; // NOLINT: taps 15, 13, 12, 10
 		return narrow_cast<NT>(lfsr);
 	}
-
+#endif
+	#define ST0 stack[ptr+1]
 	#define ST1 stack[ptr]
 	#define ST2 stack[ptr-1]
 
@@ -314,6 +354,8 @@
 	{
 		std::array<value_type, MAX_STACK> stack = { plib::constants<value_type>::zero() };
 		unsigned ptr = 0;
+		constexpr auto zero = plib::constants<value_type>::zero();
+		constexpr auto one = plib::constants<value_type>::one();
 		stack[0] = plib::constants<value_type>::zero();
 		for (auto &rc : m_precompiled)
 		{
@@ -323,7 +365,16 @@
 				OP(MULT, 1, ST2 * ST1)
 				OP(SUB,  1, ST2 - ST1)
 				OP(DIV,  1, ST2 / ST1)
+				OP(EQ,   1, ST2 == ST1 ? one : zero)
+				OP(NE,   1, ST2 != ST1 ? one : zero)
+				OP(GT,   1, ST2 > ST1 ? one : zero)
+				OP(LT,   1, ST2 < ST1 ? one : zero)
+				OP(LE,   1, ST2 <= ST1 ? one : zero)
+				OP(GE,   1, ST2 >= ST1 ? one : zero)
+				OP(IF,   2, (ST2 != zero) ? ST1 : ST0)
+				OP(NEG,  0, -ST2)
 				OP(POW,  1, plib::pow(ST2, ST1))
+				OP(LOG,  0, plib::log(ST2))
 				OP(SIN,  0, plib::sin(ST2))
 				OP(COS,  0, plib::cos(ST2))
 				OP(MAX,  1, std::max(ST2, ST1))
@@ -333,10 +384,14 @@
 					stack[ptr++] = lfsr_random<value_type>(m_lfsr);
 					break;
 				case PUSH_INPUT:
-					stack[ptr++] = values[narrow_cast<unsigned>(rc.m_param)];
+					stack[ptr++] = values[rc.m_param.index];
 					break;
 				case PUSH_CONST:
-					stack[ptr++] = rc.m_param;
+					stack[ptr++] = rc.m_param.val;
+					break;
+				// please compiler
+				case LP:
+				case RP:
 					break;
 			}
 		}
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/pfunction.h mame-0.224+dfsg.1/src/lib/netlist/plib/pfunction.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/pfunction.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/pfunction.h	2020-08-26 08:57:19.000000000 +0000
@@ -10,7 +10,6 @@
 
 #include "pmath.h"
 #include "pstring.h"
-#include "putil.h"
 
 #include <vector>
 
@@ -20,6 +19,36 @@
 	//  function evaluation
 	//============================================================
 
+	enum rpn_cmd
+	{
+		ADD,
+		MULT,
+		SUB,
+		DIV,
+		EQ,
+		NE,
+		LT,
+		GT,
+		LE,
+		GE,
+		IF,
+		NEG,    // unary minus
+		POW,
+		LOG,
+		SIN,
+		COS,
+		MIN,
+		MAX,
+		RAND, /// random number between 0 and 1
+		TRUNC,
+
+		PUSH_CONST,
+		PUSH_INPUT,
+
+		LP, // Left parenthesis - for infix parsing
+		RP  // right parenthesis - for infix parsing
+	};
+
 	/// \brief Class providing support for evaluating expressions
 	///
 	///  \tparam NT Number type, should be float or double
@@ -27,27 +56,18 @@
 	template <typename NT>
 	class pfunction
 	{
-		enum rpn_cmd
-		{
-			ADD,
-			MULT,
-			SUB,
-			DIV,
-			POW,
-			SIN,
-			COS,
-			MIN,
-			MAX,
-			RAND, /// random number between 0 and 1
-			TRUNC,
-			PUSH_CONST,
-			PUSH_INPUT
-		};
 		struct rpn_inst
 		{
-			rpn_inst() : m_cmd(ADD), m_param(plib::constants<NT>::zero()) { }
+			rpn_inst() : m_cmd(ADD)
+			{
+				m_param.val = plib::constants<NT>::zero();
+			}
 			rpn_cmd m_cmd;
-			NT m_param;
+			union
+			{
+				NT          val;
+				std::size_t index;
+			} m_param;
 		};
 	public:
 
@@ -63,27 +83,45 @@
 		{
 		}
 
+		/// \brief Constructor with compile
+		///
+		pfunction(const pstring &expr, const inputs_container &inputs = inputs_container())
+		: m_lfsr(0xace1U) // NOLINT
+		{
+			compile(expr, inputs);
+		}
+
+		/// \brief Evaluate the expression
+		///
+		/// \param values for input variables, e.g. {1.1, 2.2}
+		/// \return value of expression
+		///
+		value_type operator()(const values_container &values = values_container()) noexcept
+		{
+			return evaluate(values);
+		}
+
 		/// \brief Compile an expression
 		///
 		/// \param expr infix or postfix expression. default is infix, postrix
 		///          to be prefixed with rpn, e.g. "rpn:A B + 1.3 /"
 		/// \param inputs Vector of input variables, e.g. {"A","B"}
 		///
-		void compile(const pstring &expr, const inputs_container &inputs) noexcept(false);
+		void compile(const pstring &expr, const inputs_container &inputs = inputs_container()) noexcept(false);
 
 		/// \brief Compile a rpn expression
 		///
 		/// \param expr Reverse polish notation expression, e.g. "A B + 1.3 /"
 		/// \param inputs Vector of input variables, e.g. {"A","B"}
 		///
-		void compile_postfix(const pstring &expr, const inputs_container &inputs) noexcept(false);
+		void compile_postfix(const pstring &expr, const inputs_container &inputs = inputs_container()) noexcept(false);
 
 		/// \brief Compile an infix expression
 		///
 		/// \param expr Infix expression, e.g. "(A+B)/1.3"
 		/// \param inputs Vector of input variables, e.g. {"A","B"}
 		///
-		void compile_infix(const pstring &expr, const inputs_container &inputs) noexcept(false);
+		void compile_infix(const pstring &expr, const inputs_container &inputs = inputs_container()) noexcept(false);
 
 		/// \brief Evaluate the expression
 		///
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/plists.h mame-0.224+dfsg.1/src/lib/netlist/plib/plists.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/plists.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/plists.h	2020-08-26 08:57:19.000000000 +0000
@@ -8,9 +8,7 @@
 /// \file plists.h
 ///
 
-#include "palloc.h"
-#include "pchrono.h"
-#include "pstring.h"
+#include "ptypes.h"
 
 #include <algorithm>
 #include <array>
@@ -19,14 +17,13 @@
 
 namespace plib {
 
-	/// \brief fixed size array allowing to override constructor and initialize members by placement new.
+	/// \brief Array holding uninitialized elements
 	///
 	/// Use with care. This template is provided to improve locality of storage
 	/// in high frequency applications. It should not be used for anything else.
 	///
-	///
 	template <class C, std::size_t N>
-	class uninitialised_array_t
+	class uninitialised_array
 	{
 	public:
 
@@ -43,18 +40,10 @@
 		using const_reverse_iterator = std::reverse_iterator<const_iterator>;
 
 		//uninitialised_array_t() noexcept = default;
-		uninitialised_array_t() noexcept
-		: m_initialized(0)
-		{
-		}
+		uninitialised_array() noexcept = default;
 
-		PCOPYASSIGNMOVE(uninitialised_array_t, delete)
-		~uninitialised_array_t() noexcept
-		{
-			if (m_initialized>=N)
-				for (size_type i=0; i<N; ++i)
-					(*this)[i].~C();
-		}
+		PCOPYASSIGNMOVE(uninitialised_array, delete)
+		~uninitialised_array() noexcept = default;
 
 		constexpr size_t size() const noexcept { return N; }
 
@@ -72,37 +61,113 @@
 			return reinterpret_cast<const_reference>(m_buf[index]);
 		}
 
+		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+		iterator begin() const noexcept { return reinterpret_cast<iterator>(&m_buf[0]); }
+		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+		iterator end() const noexcept { return reinterpret_cast<iterator>(&m_buf[0] + N); }
+
+		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+		iterator begin() noexcept { return reinterpret_cast<iterator>(&m_buf[0]); }
+		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+		iterator end() noexcept { return reinterpret_cast<iterator>(&m_buf[0] + N); }
+
+		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+		const_iterator cbegin() const noexcept { return reinterpret_cast<const_iterator>(&m_buf[0]); }
+		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+		const_iterator cend() const noexcept { return reinterpret_cast<const_iterator>(&m_buf[0] + N); }
+
+	protected:
+
+	private:
+		std::array<typename std::aligned_storage<sizeof(C), alignof(C)>::type, N> m_buf;
+	};
+
+	/// \brief fixed allocation vector
+	///
+	/// Currently only emplace_back and clear are supported.
+	///
+	/// Use with care. This template is provided to improve locality of storage
+	/// in high frequency applications. It should not be used for anything else.
+	///
+	template <class C, std::size_t N>
+	class static_vector
+	{
+	public:
+
+		using value_type = C;
+		using pointer = value_type *;
+		using const_pointer = const value_type *;
+		using reference = value_type &;
+		using const_reference = const value_type &;
+		using iterator = value_type *;
+		using const_iterator = const value_type *;
+		using size_type = std::size_t;
+		using difference_type = std::ptrdiff_t;
+		using reverse_iterator = std::reverse_iterator<iterator>;
+		using const_reverse_iterator = std::reverse_iterator<const_iterator>;
+
+		static_vector() noexcept
+		: m_pos(0)
+		{
+		}
+
+		PCOPYASSIGNMOVE(static_vector, delete)
+		~static_vector() noexcept
+		{
+			clear();
+		}
+
+		constexpr size_t size() const noexcept { return m_pos; }
+
+		constexpr bool empty() const noexcept { return size() == 0; }
+
+		void clear()
+		{
+			for (size_type i=0; i<m_pos; ++i)
+				(*this)[i].~C();
+			m_pos = 0;
+		}
+
 		template<typename... Args>
-		void emplace(size_type index, Args&&... args)
+		void emplace_back(Args&&... args)
 		{
-			m_initialized++;
-			// allocate on buffer
-			new (&m_buf[index]) C(std::forward<Args>(args)...);
+			// placement new on buffer
+			new (&m_buf[m_pos]) C(std::forward<Args>(args)...);
+			m_pos++;
+		}
+
+		reference operator[](size_type index) noexcept
+		{
+			// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+			return reinterpret_cast<reference>(m_buf[index]);
+		}
+
+		constexpr const_reference operator[](size_type index) const noexcept
+		{
+			// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+			return reinterpret_cast<const_reference>(m_buf[index]);
 		}
 
 		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
 		iterator begin() const noexcept { return reinterpret_cast<iterator>(&m_buf[0]); }
 		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-		iterator end() const noexcept { return reinterpret_cast<iterator>(&m_buf[N]); }
+		iterator end() const noexcept { return reinterpret_cast<iterator>(&m_buf[0] + m_pos); }
 
 		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
 		iterator begin() noexcept { return reinterpret_cast<iterator>(&m_buf[0]); }
 		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-		iterator end() noexcept { return reinterpret_cast<iterator>(&m_buf[N]); }
+		iterator end() noexcept { return reinterpret_cast<iterator>(&m_buf[0] + m_pos); }
 
 		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
 		const_iterator cbegin() const noexcept { return reinterpret_cast<const_iterator>(&m_buf[0]); }
 		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-		const_iterator cend() const noexcept { return reinterpret_cast<const_iterator>(&m_buf[N]); }
+		const_iterator cend() const noexcept { return reinterpret_cast<const_iterator>(&m_buf[0] + m_pos); }
 
 	protected:
 
 	private:
-
-		// ensure proper alignment
-		PALIGNAS_VECTOROPT()
 		std::array<typename std::aligned_storage<sizeof(C), alignof(C)>::type, N> m_buf;
-		unsigned m_initialized;
+		size_type m_pos;
 	};
 
 	/// \brief a simple linked list.
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/pmath.h mame-0.224+dfsg.1/src/lib/netlist/plib/pmath.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/pmath.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/pmath.h	2020-08-26 08:57:19.000000000 +0000
@@ -439,6 +439,13 @@
 		return (m != 0 && n != 0) ? (plib::abs(m) / gcd(m, n)) * plib::abs(n) : 0;
 	}
 
+	template<class T>
+	constexpr const T& clamp( const T& v, const T& low, const T& high)
+	{
+		gsl_Expects(high >= low);
+		return (v < low) ? low : (high < v) ? high : v;
+	}
+
 	static_assert(noexcept(constants<double>::one()), "Not evaluated as constexpr");
 
 } // namespace plib
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/pmatrix2d.h mame-0.224+dfsg.1/src/lib/netlist/plib/pmatrix2d.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/pmatrix2d.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/pmatrix2d.h	2020-08-26 08:57:19.000000000 +0000
@@ -23,7 +23,7 @@
 	public:
 		using size_type = std::size_t;
 		using arena_type = A;
-		using allocator_type = typename A::template allocator_type<T>;
+		using allocator_type = typename A::template allocator_type<T, PALIGN_VECTOROPT>;
 
 		static constexpr const size_type align_size = align_traits<allocator_type>::align_size;
 		static constexpr const size_type stride_size = align_traits<allocator_type>::stride_size;
@@ -138,10 +138,11 @@
 		using size_type = std::size_t;
 		using value_type = T;
 		using arena_type = A;
-		using allocator_type = typename A::template allocator_type<T>;
+		using allocator_type = typename A::template allocator_type<T, PALIGN_VECTOROPT>;
 
 		static constexpr const size_type align_size = align_traits<allocator_type>::align_size;
 		static constexpr const size_type stride_size = align_traits<allocator_type>::stride_size;
+
 		pmatrix2d_vrl() noexcept
 		: m_N(0), m_M(0), m_v()
 		{
@@ -154,6 +155,9 @@
 			m_v.resize(N); //FIXME
 		}
 
+		PCOPYASSIGNMOVE(pmatrix2d_vrl, default)
+		~pmatrix2d_vrl() = default;
+
 		void resize(size_type N, size_type M)
 		{
 			m_N = N;
@@ -214,7 +218,12 @@
 			return m_row[r] + c;
 		}
 
-		std::size_t tx() const { return m_v.size(); }
+		size_type colcount(size_type row) const noexcept
+		{
+			return m_row[row + 1] - m_row[row];
+		}
+
+		size_type tx() const { return m_v.size(); }
 	private:
 
 		size_type m_N;
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/pmempool.h mame-0.224+dfsg.1/src/lib/netlist/plib/pmempool.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/pmempool.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/pmempool.h	2020-08-26 08:57:19.000000000 +0000
@@ -10,10 +10,10 @@
 
 #include "palloc.h"
 #include "pconfig.h"
-#include "pstream.h"
-#include "pstring.h"
+#include "pstream.h"  // perrlogger
+//#include "pstring.h"
 #include "ptypes.h"
-#include "putil.h"
+//#include "putil.h"
 
 #include <algorithm>
 #include <memory>
@@ -27,17 +27,17 @@
 	//  Memory pool
 	//============================================================
 
-	template <typename BASEARENA>
-	class mempool_arena : public arena_base<mempool_arena<BASEARENA>, false, false>
+	template <typename BASEARENA, std::size_t MINALIGN = PALIGN_MIN_SIZE>
+	class mempool_arena : public arena_base<mempool_arena<BASEARENA, MINALIGN>, false, false>
 	{
 	public:
 
 		using size_type = typename BASEARENA::size_type;
-		using base_type = arena_base<mempool_arena<BASEARENA>, false, false>;
+		using base_type = arena_base<mempool_arena<BASEARENA, MINALIGN>, false, false>;
 		template <class T>
 		using base_allocator_type = typename BASEARENA::template allocator_type<T>;
 
-		mempool_arena(size_t min_alloc = (1<<21), size_t min_align = PALIGN_CACHELINE)
+		mempool_arena(size_t min_align = MINALIGN, size_t min_alloc = (1<<21))
 		: m_min_alloc(min_alloc)
 		, m_min_align(min_align)
 		, m_block_align(1024)
@@ -70,6 +70,7 @@
 				align = m_min_align;
 
 			size_t rs = size + align;
+
 			for (auto &bs : m_blocks)
 			{
 				if (bs->m_free > rs)
@@ -84,7 +85,7 @@
 			}
 			b->m_free -= rs;
 			b->m_num_alloc++;
-			void *ret = reinterpret_cast<void *>(b->m_data + b->m_cur);
+			void *ret = reinterpret_cast<void *>(b->m_data + b->m_cur); // NOLINT(cppcoreguidelines-pro-type-reinterpret
 			auto capacity(rs);
 			ret = std::align(align, size, ret, capacity);
 			m_info.insert({ ret, info(b, b->m_cur)});
@@ -141,7 +142,7 @@
 				m_data_allocated = static_cast<std::uint8_t *>(mp.base_arena().allocate(mp.m_block_align, m_bytes_allocated));
 				void *r = m_data_allocated;
 				std::align(mp.m_block_align, min_bytes, r, m_bytes_allocated);
-				m_data  = reinterpret_cast<std::uint8_t *>(r);
+				m_data  = reinterpret_cast<std::uint8_t *>(r); // NOLINT(cppcoreguidelines-pro-type-reinterpret
 			}
 			~block()
 			{
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/pmulti_threading.h mame-0.224+dfsg.1/src/lib/netlist/plib/pmulti_threading.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/pmulti_threading.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/pmulti_threading.h	2020-08-26 08:57:19.000000000 +0000
@@ -12,6 +12,7 @@
 
 #include <algorithm>
 #include <atomic>
+#include <condition_variable>
 #include <mutex>
 #include <type_traits>
 #include <utility>
@@ -38,6 +39,49 @@
 		void unlock() const noexcept { }
 	};
 
+	class psemaphore
+	{
+	public:
+
+		psemaphore(long count = 0) noexcept: m_count(count) { }
+
+		psemaphore(const psemaphore& other) = delete;
+		psemaphore& operator=(const psemaphore& other) = delete;
+		psemaphore(psemaphore&& other) = delete;
+		psemaphore& operator=(psemaphore&& other) = delete;
+		~psemaphore() = default;
+
+		void release(long update = 1)
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			m_count += update;
+			m_cv.notify_one();
+		}
+
+		void acquire()
+		{
+			std::unique_lock<std::mutex> lock(m_mutex);
+			while (m_count == 0)
+				m_cv.wait(lock);
+			--m_count;
+		}
+
+		bool try_acquire()
+		{
+			std::lock_guard<std::mutex> lock(m_mutex);
+			if (m_count)
+			{
+				--m_count;
+				return true;
+			}
+			return false;
+		}
+	private:
+		std::mutex m_mutex;
+		std::condition_variable m_cv;
+		long m_count;
+	};
+
 
 } // namespace plib
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/ppmf.h mame-0.224+dfsg.1/src/lib/netlist/plib/ppmf.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/ppmf.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/ppmf.h	2020-08-26 08:57:19.000000000 +0000
@@ -34,7 +34,6 @@
 
 #include "pconfig.h"
 #include "ptypes.h"
-#include "putil.h"
 
 #include <algorithm>
 #include <cstdint> // uintptr_t
@@ -234,6 +233,9 @@
 		template <class C>
 		using specific_member_function = R (C::*)(Targs...);
 
+		template <class C>
+		using const_specific_member_function = R (C::*)(Targs...) const;
+
 		using generic_member_function = specific_member_function<generic_class>;
 
 		template <class C>
@@ -263,6 +265,9 @@
 		template <class C>
 		using specific_member_function = R (C::*)(Targs...);
 
+		template <class C>
+		using const_specific_member_function = R (C::*)(Targs...) const;
+
 		class generic_class;
 		using generic_member_function = specific_member_function<generic_class>;
 
@@ -291,6 +296,9 @@
 		template <class C>
 		using specific_member_function = R (C::*)(Targs...);
 
+		template <class C>
+		using const_specific_member_function = R (C::*)(Targs...) const;
+
 		class generic_class;
 		using generic_member_function = specific_member_function<generic_class>;
 
@@ -321,6 +329,9 @@
 		template <class C>
 		using specific_member_function = typename helper::template specific_member_function<C>;
 
+		template <class C>
+		using const_specific_member_function = typename helper::template const_specific_member_function<C>;
+
 		using generic_class = typename helper::generic_class;
 		using generic_member_function = typename helper::generic_member_function;
 
@@ -344,10 +355,18 @@
 			// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
 			auto *s = reinterpret_cast<std::uint8_t *>(&m_resolved);
 			std::fill(s, s + sizeof(m_resolved), 0);
-			bind(object, &mftp);
+			bind<specific_member_function<O>>(object, &mftp);
 		}
 
-		bool is_set() const noexcept { return m_resolved != nullptr; }
+		template<typename O>
+		pmfp_base(const_specific_member_function<O> mftp, O *object)
+		: m_obj(nullptr)
+		{
+			// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+			auto *s = reinterpret_cast<std::uint8_t *>(&m_resolved);
+			std::fill(s, s + sizeof(m_resolved), 0);
+			bind<const_specific_member_function<O>>(object, &mftp);
+		}
 
 		generic_class *object() const noexcept { return m_obj; }
 		bool has_object() const noexcept { return m_obj != nullptr; }
@@ -355,7 +374,7 @@
 		template<typename O>
 		void set(specific_member_function<O> mftp, O *object)
 		{
-			bind(object, &mftp);
+			bind<specific_member_function<O>>(object, &mftp);
 		}
 
 		inline R operator()(Targs... args) const noexcept(true)
@@ -363,12 +382,12 @@
 			return this->call(std::forward<Targs>(args)...);
 		}
 
+		operator bool() const noexcept { return m_resolved != nullptr; }
 	private:
-		template<typename O, typename MF>
+		template<typename SPC, typename O, typename MF>
 		void bind(O * object, MF *fraw)
 		{
-			//auto pFunc = *reinterpret_cast<specific_member_function<O> *>(fraw); // mftp;
-			specific_member_function<O> pFunc;
+			SPC pFunc;
 			static_assert(sizeof(pFunc) >= sizeof(MF), "size error");
 			// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
 			*reinterpret_cast<MF *>(&pFunc) = *fraw;
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/ppreprocessor.cpp mame-0.224+dfsg.1/src/lib/netlist/plib/ppreprocessor.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/plib/ppreprocessor.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/ppreprocessor.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4,6 +4,7 @@
 #include "ppreprocessor.h"
 #include "palloc.h"
 #include "pstonum.h"
+#include "pstrutil.h"
 #include "putil.h"
 
 namespace plib {
@@ -16,6 +17,8 @@
 	: std::istream(new readbuffer(this))
 	, m_sources(sources)
 	, m_if_flag(0)
+	, m_if_seen(0)
+	, m_elif(0)
 	, m_if_level(0)
 	, m_pos(0)
 	, m_state(PROCESS)
@@ -196,7 +199,14 @@
 			CHECKTOK2(||, 15)
 			else
 			{
-				val = plib::pstonum<decltype(val)>(tok);
+				try
+				{
+					val = plib::pstonum<decltype(val)>(tok);
+				}
+				catch (pexception &e)
+				{
+					sexpr.error(e.text());
+				}
 				has_val = true;
 				sexpr.next();
 			}
@@ -459,45 +469,82 @@
 			if (lti[0] == "#if")
 			{
 				m_if_level++;
-				lt = replace_macros(lt);
-				simple_iter<ppreprocessor> t(this, tokenize(lt.substr(3), m_expr_sep, true, true));
-				auto val = narrow_cast<int>(prepro_expr(t, 255));
-				t.skip_ws();
-				if (!t.eod())
-					error("found unprocessed content at end of line");
-				if (val == 0)
-					m_if_flag |= (1 << m_if_level);
+				m_if_seen |= (1 << m_if_level);
+				if (m_if_flag == 0)
+				{
+					lt = replace_macros(lt);
+					simple_iter<ppreprocessor> t(this, tokenize(lt.substr(3), m_expr_sep, true, true));
+					auto val = narrow_cast<int>(prepro_expr(t, 255));
+					t.skip_ws();
+					if (!t.eod())
+						error("found unprocessed content at end of line");
+					if (val == 0)
+						m_if_flag |= (1 << m_if_level);
+					else
+						m_elif |= (1 << m_if_level);
+				}
 			}
 			else if (lti[0] == "#ifdef")
 			{
 				m_if_level++;
+				m_if_seen |= (1 << m_if_level);
 				if (get_define(lti[1]) == nullptr)
 					m_if_flag |= (1 << m_if_level);
+				else
+					m_elif |= (1 << m_if_level);
 			}
 			else if (lti[0] == "#ifndef")
 			{
 				m_if_level++;
+				m_if_seen |= (1 << m_if_level);
 				if (get_define(lti[1]) != nullptr)
 					m_if_flag |= (1 << m_if_level);
+				else
+					m_elif |= (1 << m_if_level);
 			}
-			else if (lti[0] == "#else")
+			else if (lti[0] == "#else") // basically #elif (1)
 			{
-				m_if_flag ^= (1 << m_if_level);
+				if (!(m_if_seen & (1 << m_if_level)))
+					error("#else without #if");
+
+				if (m_elif & (1 << m_if_level)) // elif disabled
+					m_if_flag |= (1 << m_if_level);
+				else
+					m_if_flag &= ~(1 << m_if_level);
+				m_elif |= (1 << m_if_level);
 			}
 			else if (lti[0] == "#elif")
 			{
-				m_if_flag ^= (1 << m_if_level);
-				lt = replace_macros(lt);
-				simple_iter<ppreprocessor> t(this, tokenize(lt.substr(5), m_expr_sep, true, true));
-				auto val = narrow_cast<int>(prepro_expr(t, 255));
-				t.skip_ws();
-				if (!t.eod())
-					error("found unprocessed content at end of line");
-				if (val == 0)
+				if (!(m_if_seen & (1 << m_if_level)))
+					error("#elif without #if");
+
+				//if ((m_if_flag & (1 << m_if_level)) == 0)
+				//  m_if_flag ^= (1 << m_if_level);
+				if (m_elif & (1 << m_if_level)) // elif disabled
 					m_if_flag |= (1 << m_if_level);
+				else
+					m_if_flag &= ~(1 << m_if_level);
+				if (m_if_flag == 0)
+				{
+					//m_if_flag ^= (1 << m_if_level);
+					lt = replace_macros(lt);
+					simple_iter<ppreprocessor> t(this, tokenize(lt.substr(5), m_expr_sep, true, true));
+					auto val = narrow_cast<int>(prepro_expr(t, 255));
+					t.skip_ws();
+					if (!t.eod())
+						error("found unprocessed content at end of line");
+					if (val == 0)
+						m_if_flag |= (1 << m_if_level);
+					else
+						m_elif |= (1 << m_if_level);
+				}
 			}
 			else if (lti[0] == "#endif")
 			{
+				if (!(m_if_seen & (1 << m_if_level)))
+					error("#else without #if");
+				m_if_seen &= ~(1 << m_if_level);
+				m_elif &= ~(1 << m_if_level);
 				m_if_flag &= ~(1 << m_if_level);
 				m_if_level--;
 			}
@@ -517,16 +564,16 @@
 						// first try local context
 						auto l(plib::util::buildpath({m_stack.back().m_local_path, arg}));
 						auto lstrm(m_sources.get_stream(l));
-						if (lstrm)
+						if (!lstrm.empty())
 						{
-							m_stack.emplace_back(input_context(std::move(lstrm), plib::util::path(l), l));
+							m_stack.emplace_back(input_context(lstrm.release_stream(), plib::util::path(l), l));
 						}
 						else
 						{
 							auto strm(m_sources.get_stream(arg));
-							if (strm)
+							if (!strm.empty())
 							{
-								m_stack.emplace_back(input_context(std::move(strm), plib::util::path(arg), arg));
+								m_stack.emplace_back(input_context(strm.release_stream(), plib::util::path(arg), arg));
 							}
 							else
 								error("include not found:" + arg);
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/ppreprocessor.h mame-0.224+dfsg.1/src/lib/netlist/plib/ppreprocessor.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/ppreprocessor.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/ppreprocessor.h	2020-08-26 08:57:19.000000000 +0000
@@ -68,10 +68,17 @@
 			delete rdbuf();
 		}
 
+		/// \brief process stream
+		///
+		/// \param filename a filename or identifier identifying the stream.
+		///
+		/// FIXME: this is sub-optimal. Refactor input_context into pinput_context
+		/// and pass this to ppreprocessor.
+		///
 		template <typename T>
-		ppreprocessor & process(T &&istrm)
+		ppreprocessor & process(T &&istrm, const pstring &filename)
 		{
-			m_stack.emplace_back(input_context(std::forward<T>(istrm),"","<stream>"));
+			m_stack.emplace_back(input_context(istrm.release_stream(),plib::util::path(filename), filename));
 			process_stack();
 			return *this;
 		}
@@ -139,7 +146,9 @@
 		psource_collection_t<> &m_sources;
 		string_list m_expr_sep;
 
-		std::uint_least64_t m_if_flag; // 31 if levels
+		std::uint_least64_t m_if_flag; // 63 if levels
+		std::uint_least64_t m_if_seen; // 63 if levels
+		std::uint_least64_t m_elif; // 63 if levels - for #elif
 		int m_if_level;
 
 		struct input_context
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/pstate.h mame-0.224+dfsg.1/src/lib/netlist/plib/pstate.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/pstate.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/pstate.h	2020-08-26 08:57:19.000000000 +0000
@@ -8,7 +8,6 @@
 /// \file pstate.h
 ///
 
-#include "palloc.h"
 #include "pstring.h"
 #include "ptypes.h"
 
@@ -54,7 +53,7 @@
 				plib::is_floating_point<T>::value);
 	}
 
-	class callback_t
+	struct callback_t
 	{
 	public:
 		using list_t = std::vector<callback_t *>;
@@ -201,7 +200,6 @@
 		save_state_ptr( owner, stname, dtype<C>(), 1, &state);
 	}
 
-
 	template<typename C>
 	std::enable_if_t<!(plib::is_integral<C>::value || std::is_enum<C>::value
 			|| plib::is_floating_point<C>::value)>
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/pstream.h mame-0.224+dfsg.1/src/lib/netlist/plib/pstream.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/pstream.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/pstream.h	2020-08-26 08:57:19.000000000 +0000
@@ -9,12 +9,10 @@
 /// \file pstream.h
 ///
 
-#include "palloc.h"
 #include "pconfig.h"
-#include "pexception.h"
 #include "pfmtlog.h"
+#include "pgsl.h"
 #include "pstring.h"
-#include "pstrutil.h"
 
 #include <array>
 #include <fstream>
@@ -27,8 +25,29 @@
 
 namespace plib {
 
+	/// \brief wrapper around isteam read
+	///
+	template <typename S, typename T>
+	static inline S & istream_read(S &is, T * data, size_t len)
+	{
+		using ct = typename S::char_type;
+		static_assert((sizeof(T) % sizeof(ct)) == 0, "istream_read sizeof issue");
+		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+		return is.read(reinterpret_cast<ct *>(data), gsl::narrow<std::streamsize>(len * sizeof(T)));
+	}
+
+	/// \brief wrapper around osteam write
+	///
+	template <typename S, typename T>
+	static inline S & ostream_write(S &os, const T * data, size_t len)
+	{
+		using ct = typename S::char_type;
+		static_assert((sizeof(T) % sizeof(ct)) == 0, "ostream_write sizeof issue");
+		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+		return os.write(reinterpret_cast<const ct *>(data), gsl::narrow<std::streamsize>(len * sizeof(T)));
+	}
+
 ///
-/// \brief: putf8reader_t: reader on top of istream.
 ///
 /// putf8reader_t digests linux & dos/windows text files
 ///
@@ -49,10 +68,19 @@
 	putf8_reader(std::unique_ptr<std::istream> &&rhs) noexcept
 	: m_strm(std::move(rhs))
 	{
+		// no bad surprises
+		m_strm->imbue(std::locale::classic());
 	}
 
 	bool eof() const { return m_strm->eof(); }
 
+	/// \brief Read a line of UTF8 characters from the stream.
+	///
+	/// The line will not contain a trailing linefeed
+	///
+	/// \param line pstring reference to the result
+	/// \returns Returns false if at end of file
+	///
 	bool readline(pstring &line)
 	{
 		putf8string::code_t c = 0;
@@ -75,6 +103,35 @@
 		return true;
 	}
 
+	/// \brief Read a line of UTF8 characters from the stream including trailing linefeed.
+	///
+	/// The line will contain the trailing linefeed
+	///
+	/// \param line pstring reference to the result
+	/// \returns Returns false if at end of file
+	///
+	bool readline_lf(pstring &line)
+	{
+		putf8string::code_t c = 0;
+		m_linebuf = putf8string("");
+		if (!this->readcode(c))
+		{
+			line = "";
+			return false;
+		}
+		while (true)
+		{
+			if (c != 13) // ignore CR
+				m_linebuf += putf8string(1, c);
+			if (c == 10)
+				break;
+			if (!this->readcode(c))
+				break;
+		}
+		line = m_linebuf;
+		return true;
+	}
+
 	bool readbyte(std::istream::char_type &b)
 	{
 		if (m_strm->eof())
@@ -91,6 +148,7 @@
 		m_strm->read(&b[0], 1);
 		if (m_strm->eof())
 			return false;
+		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
 		const std::size_t l = putf8string::traits_type::codelen(reinterpret_cast<putf8string::traits_type::mem_t *>(&b));
 		for (std::size_t i = 1; i < l; i++)
 		{
@@ -98,6 +156,7 @@
 			if (m_strm->eof())
 				return false;
 		}
+		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
 		c = putf8string::traits_type::code(reinterpret_cast<putf8string::traits_type::mem_t *>(&b));
 		return true;
 	}
@@ -134,7 +193,8 @@
 	{
 		// NOLINTNEXTLINE(performance-unnecessary-copy-initialization)
 		const putf8string conv_utf8(text);
-		m_strm->write(conv_utf8.c_str(), static_cast<std::streamsize>(plib::strlen(conv_utf8.c_str())));
+		//m_strm->write(conv_utf8.c_str(), static_cast<std::streamsize>(plib::strlen(conv_utf8.c_str()  )));
+		ostream_write(*m_strm, conv_utf8.c_str(), string_info<pstring>::mem_size(conv_utf8));
 	}
 
 	void write(const pstring::value_type c) const
@@ -143,6 +203,7 @@
 		write(t);
 	}
 
+	void flush() { m_strm->flush(); }
 private:
 	std::ostream *m_strm;
 };
@@ -188,23 +249,23 @@
 	template <typename T>
 	void write(const T &val)
 	{
-		m_strm.write(reinterpret_cast<const std::ostream::char_type *>(&val), sizeof(T));
+		ostream_write(m_strm, &val, 1);
 	}
 
 	void write(const pstring &s)
 	{
-		const auto *const sm = reinterpret_cast<const std::ostream::char_type *>(s.c_str());
-		const auto sl(static_cast<std::streamsize>(std::char_traits<std::ostream::char_type>::length(sm)));
+		const auto *sm = s.c_str();
+		const auto sl(std::char_traits<pstring::mem_t>::length(sm));
 		write(sl);
-		m_strm.write(sm, sl);
+		ostream_write(m_strm, sm, sl);
 	}
 
 	template <typename T>
 	void write(const std::vector<T> &val)
 	{
-		const auto sz(static_cast<std::streamsize>(val.size()));
+		const auto sz(val.size());
 		write(sz);
-		m_strm.write(reinterpret_cast<const std::ostream::char_type *>(val.data()), sz * gsl::narrow<std::streamsize>(sizeof(T)));
+		ostream_write(m_strm, val.data(), sz);
 	}
 
 private:
@@ -225,7 +286,7 @@
 	template <typename T>
 	void read(T &val)
 	{
-		m_strm.read(reinterpret_cast<std::istream::char_type *>(&val), gsl::narrow<std::streamsize>(sizeof(T)));
+		istream_read(m_strm, &val, 1);
 	}
 
 	void read( pstring &s)
@@ -244,7 +305,7 @@
 		std::size_t sz = 0;
 		read(sz);
 		val.resize(sz);
-		m_strm.read(reinterpret_cast<std::istream::char_type *>(val.data()), gsl::narrow<std::streamsize>(sizeof(T) * sz));
+		istream_read(m_strm, val.data(), sz);
 	}
 
 private:
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/pstring.h mame-0.224+dfsg.1/src/lib/netlist/plib/pstring.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/pstring.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/pstring.h	2020-08-26 08:57:19.000000000 +0000
@@ -53,8 +53,8 @@
 	constexpr bool operator==(const pstring_const_iterator& rhs) const noexcept { return p == rhs.p; }
 	constexpr bool operator!=(const pstring_const_iterator& rhs) const noexcept { return p != rhs.p; }
 
-	reference operator*() const noexcept { return *reinterpret_cast<pointer>(&(*p)); }
-	pointer operator->() const noexcept { return reinterpret_cast<pointer>(&(*p)); }
+	reference operator*() const noexcept { return *reinterpret_cast<pointer>(&(*p)); } // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
+	pointer operator->() const noexcept { return reinterpret_cast<pointer>(&(*p)); }   // NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
 
 private:
 	template <typename G> friend struct pstring_t;
@@ -204,15 +204,14 @@
 		return ostrm;
 	}
 
-	const_reference at(const size_type pos) const { return *reinterpret_cast<const ref_value_type *>(F::nthcode(m_str.c_str(),pos)); }
+	const_reference at(const size_type pos) const { return *reinterpret_cast<const ref_value_type *>(F::nthcode(m_str.c_str(),pos)); } // NOLINT(cppcoreguidelines-pro-type-reinterpret
 
 	static constexpr const size_type npos = static_cast<size_type>(-1);
 
 	// the following are extensions to <string>
-
-private:
 	// FIXME: remove those
 	size_type mem_t_size() const noexcept { return m_str.size(); }
+private:
 
 	string_type m_str;
 };
@@ -254,9 +253,10 @@
 		}
 		return ret;
 	}
+
 	static std::size_t codelen(const mem_t *p) noexcept
 	{
-		const auto *p1 = reinterpret_cast<const unsigned char *>(p);
+		const auto *p1 = reinterpret_cast<const unsigned char *>(p); // NOLINT(cppcoreguidelines-pro-type-reinterpret
 		if ((*p1 & 0xE0) == 0xC0) // NOLINT
 			return 2;
 		if ((*p1 & 0xF0) == 0xE0) // NOLINT
@@ -283,7 +283,7 @@
 
 	static code_t code(const mem_t *p) noexcept
 	{
-		const auto *p1 = reinterpret_cast<const unsigned char *>(p);
+		const auto *p1 = reinterpret_cast<const unsigned char *>(p); // NOLINT(cppcoreguidelines-pro-type-reinterpret
 		if ((*p1 & 0x80) == 0x00) // NOLINT
 			return *p1;
 		if ((*p1 & 0xE0) == 0xC0) // NOLINT
@@ -460,6 +460,28 @@
 using putf32string = pstring_t<putf32_traits>;
 using pwstring = pstring_t<pwchar_traits>;
 
+namespace plib
+{
+	template<class T>
+	struct string_info
+	{
+	};
+
+	template<typename T>
+	struct string_info<pstring_t<T>>
+	{
+		using mem_t = typename T::mem_t;
+		static std::size_t mem_size(const pstring_t<T> &s) { return s.mem_t_size(); }
+	};
+
+	template<typename T>
+	struct string_info<std::basic_string<T>>
+	{
+		using mem_t = T;
+		static std::size_t mem_size(const std::string &s) { return s.size(); }
+	};
+} // namespace plib
+
 // custom specialization of std::hash can be injected in namespace std
 namespace std
 {
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/pstrutil.h mame-0.224+dfsg.1/src/lib/netlist/plib/pstrutil.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/pstrutil.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/pstrutil.h	2020-08-26 08:57:19.000000000 +0000
@@ -21,18 +21,6 @@
 
 namespace plib
 {
-	template<class T>
-	struct string_info
-	{
-		using mem_t = typename T::mem_t;
-	};
-
-	template<>
-	struct string_info<std::string>
-	{
-		using mem_t = char;
-	};
-
 	template<typename T>
 	pstring to_string(const T &v)
 	{
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/ptests.h mame-0.224+dfsg.1/src/lib/netlist/plib/ptests.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/ptests.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/ptests.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,174 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+#ifndef PTESTS_H_
+#define PTESTS_H_
+
+///
+/// \file ptests.h
+///
+/// google tests compatible (hopefully) test macros. This is work in progress!
+///
+
+#include <exception>
+#include <functional>
+#include <iostream>
+#include <string>
+#include <vector>
+
+#if defined(__clang__)
+#pragma clang diagnostic ignored "-Wglobal-constructors"
+#endif
+
+#define PEXPECT_EQ(exp1, exp2) PINT_EXPECT(eq, exp1, exp2)
+#define PEXPECT_NE(exp1, exp2) PINT_EXPECT(ne, exp1, exp2)
+#define PEXPECT_GT(exp1, exp2) PINT_EXPECT(gt, exp1, exp2)
+#define PEXPECT_LT(exp1, exp2) PINT_EXPECT(lt, exp1, exp2)
+#define PEXPECT_GE(exp1, exp2) PINT_EXPECT(ge, exp1, exp2)
+#define PEXPECT_LE(exp1, exp2) PINT_EXPECT(le, exp1, exp2)
+
+#define PEXPECT_TRUE(exp1) PINT_EXPECT(eq, exp1, true)
+#define PEXPECT_FALSE(exp1) PINT_EXPECT(eq, exp1, false)
+
+#define PEXPECT_THROW(exp, excep) PINT_EXPECT_THROW(exp, excep)
+
+#define PTEST(name, desc) PINT_TEST(name, desc)
+#define PTEST_F(name, desc) PINT_TEST_F(name, desc, name)
+#define PRUN_ALL_TESTS() plib::testing::run_all_tests()
+
+#define PINT_TEST(name, desc) PINT_TEST_F(name, desc, plib::testing::Test)
+
+#define PINT_TEST_F(name, desc, base) \
+	class name ## _ ## desc : public base \
+	{ public:\
+		void desc (); \
+		void run() override { desc (); } \
+	}; \
+	extern const plib::testing::reg_entry<name ## _ ## desc> name ## _ ## desc ## _reg; \
+	const plib::testing::reg_entry<name ## _ ## desc> name ## _ ## desc ## _reg(#name, #desc); \
+	void name ## _ ## desc :: desc ()
+
+#define PINT_EXPECT(comp, exp1, exp2) \
+	if (!plib::testing::internal_assert(plib::testing::comp_ ## comp (), # exp1, # exp2, exp1, exp2)) \
+		std::cout << __FILE__ << ":" << __LINE__ << ":1: error: test failed\n"
+
+#define PINT_EXPECT_THROW(exp, excep) \
+	if (const char *ptest_f = __FILE__) \
+	{ \
+		try { exp; std::cout << ptest_f << ":" << __LINE__ << ":1: error: no " #excep " exception thrown\n";} \
+		catch (excep &) { std::cout << "\tOK: got " #excep " for " # exp "\n";} \
+		catch (std::exception &ptest_e) { std::cout << ptest_f << ":" << __LINE__ << ":1: error: unexpected exception thrown: " << ptest_e.what() << "\n"; } \
+		catch (...) { std::cout << ptest_f << ":" << __LINE__ << ":1: error: unexpected exception thrown\n"; } \
+	} else do {} while (0)
+
+namespace plib
+{
+namespace testing
+{
+
+	class Test
+	{
+	public:
+		Test() = default;
+		virtual ~Test() = default;
+
+		Test(const Test &) = delete;
+		Test &operator=(const Test &) = delete;
+		Test(Test &&) noexcept = delete;
+		Test &operator=(Test &&) noexcept = delete;
+
+		virtual void run() {}
+		virtual void SetUp() {}
+		virtual void TearDown() {}
+	};
+
+	struct reg_entry_base
+	{
+		using list_t = std::vector<reg_entry_base *>;
+		reg_entry_base(const std::string &n, const std::string &d)
+		: name(n), desc(d)
+		{
+			registry().push_back(this);
+		}
+
+		reg_entry_base(const reg_entry_base &) = delete;
+		reg_entry_base &operator=(const reg_entry_base &) = delete;
+		reg_entry_base(reg_entry_base &&) noexcept = delete;
+		reg_entry_base &operator=(reg_entry_base &&) noexcept = delete;
+
+		virtual ~reg_entry_base() = default;
+
+		virtual Test *create() const { return nullptr; }
+
+		std::string name;
+		std::string desc;
+	public:
+		static list_t & registry()
+		{
+			static list_t prlist;
+			return prlist;
+		}
+	};
+
+	template <typename T>
+	struct reg_entry : public reg_entry_base
+	{
+		using reg_entry_base::reg_entry_base;
+
+		Test *create() const override { return new T(); }
+	};
+
+	template <typename C, typename T1, typename T2>
+	bool internal_assert(C comp,
+		const char* exp1, const char* exp2,
+		const T1& val1, const T2& val2)
+	{
+		if (comp(val1, val2))
+		{
+			std::cout << "\tOK: " << exp1 << " " << C::opstr() << " " << exp2 << "\n";
+			return true;
+		}
+		std::cout << "\tFAIL: " << exp1 << " " << C::opstr() << " " << exp2
+			<< " <" << val1 << ">,<" << val2 << ">\n";
+		return false;
+	}
+
+	static inline int run_all_tests()
+	{
+		std::cout << "======================================\n";
+		std::cout << "Running " << reg_entry_base::registry().size() << " tests\n";
+		std::cout << "======================================\n";
+		for (auto &e : reg_entry_base::registry())
+		{
+			std::cout << e->name << "::" << e->desc << ":\n";
+			Test *t = e->create();
+			t->SetUp();
+			t->run();
+			t->TearDown();
+			delete t;
+		}
+		return 0;
+	}
+
+#define DEF_COMP(name, op) \
+	struct comp_ ## name \
+	{ \
+		static const char * opstr() { return #op ; } \
+		template <typename T1, typename T2> \
+		bool operator()(const T1 &v1, const T2 &v2) { return v1 op v2; } \
+	}; \
+
+	DEF_COMP(eq, ==)
+	DEF_COMP(ne, !=)
+	DEF_COMP(gt, >)
+	DEF_COMP(lt, <)
+	DEF_COMP(ge, >=)
+	DEF_COMP(le, <=)
+
+#undef DEF_COMP
+
+} // namespace testing
+} // namespace plib
+
+
+#endif // PTESTS_H_
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/ptimed_queue.h mame-0.224+dfsg.1/src/lib/netlist/plib/ptimed_queue.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/ptimed_queue.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/ptimed_queue.h	2020-08-26 08:57:19.000000000 +0000
@@ -8,10 +8,10 @@
 /// \file ptimed_queue.h
 ///
 
-#include "palloc.h"
+#include "palloc.h" // FIXME: for aligned_vector
 #include "pchrono.h"
 #include "pmulti_threading.h"
-#include "pstring.h"
+#include "ptypes.h"
 
 #include <algorithm>
 #include <mutex>
@@ -217,7 +217,6 @@
 		using lock_guard_type  = std::lock_guard<mutex_type>;
 
 		mutex_type               m_lock;
-		PALIGNAS_CACHELINE()
 		T *                      m_end;
 		aligned_vector<T>        m_list;
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/ptime.h mame-0.224+dfsg.1/src/lib/netlist/plib/ptime.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/ptime.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/ptime.h	2020-08-26 08:57:19.000000000 +0000
@@ -207,10 +207,10 @@
 		static constexpr ptime never() noexcept { return ptime(plib::numeric_limits<internal_type>::max(), RES); }
 		static constexpr internal_type resolution() noexcept { return RES; }
 
-		constexpr internal_type in_nsec() const noexcept { return m_time / (RES / UINT64_C(1000000000)); }
-		constexpr internal_type in_usec() const noexcept { return m_time / (RES / UINT64_C(   1000000)); }
-		constexpr internal_type in_msec() const noexcept { return m_time / (RES / UINT64_C(      1000)); }
-		constexpr internal_type in_sec()  const noexcept { return m_time / (RES / UINT64_C(         1)); }
+		constexpr internal_type in_nsec() const noexcept { return m_time / (RES / INT64_C(1000000000)); }
+		constexpr internal_type in_usec() const noexcept { return m_time / (RES / INT64_C(   1000000)); }
+		constexpr internal_type in_msec() const noexcept { return m_time / (RES / INT64_C(      1000)); }
+		constexpr internal_type in_sec()  const noexcept { return m_time / (RES / INT64_C(         1)); }
 
 	private:
 		template <typename FT>
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/ptokenizer.cpp mame-0.224+dfsg.1/src/lib/netlist/plib/ptokenizer.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/plib/ptokenizer.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/ptokenizer.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,9 +1,9 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 
-#include "ptokenizer.h"
 #include "palloc.h"
 #include "pstonum.h"
+#include "ptokenizer.h"
 #include "putil.h"
 
 namespace plib {
@@ -21,11 +21,6 @@
 	// A simple tokenizer
 	// ----------------------------------------------------------------------------------------
 
-	pstring ptokenizer::currentline_str() const
-	{
-		return m_cur_line;
-	}
-
 	void ptokenizer::skipeol()
 	{
 		pstring::value_type c = getc();
@@ -52,12 +47,15 @@
 		}
 		if (m_px == m_cur_line.end())
 		{
-			++m_source_location.back();
-			if (m_strm.readline(m_cur_line))
+			//++m_source_location.back();
+			if (m_strm->readline_lf(m_cur_line))
+			{
 				m_px = m_cur_line.begin();
+				if (*m_px != '#')
+					m_token_queue->push_back(token_t(token_type::SOURCELINE, m_cur_line));
+			}
 			else
 				return 0;
-			return '\n';
 		}
 		pstring::value_type c = *(m_px++);
 		return c;
@@ -68,23 +66,19 @@
 		m_unget = c;
 	}
 
-	void ptokenizer::require_token(const token_id_t &token_num)
+	void ptoken_reader::require_token(const token_id_t &token_num)
 	{
 		require_token(get_token(), token_num);
 	}
-	void ptokenizer::require_token(const token_t &tok, const token_id_t &token_num)
+	void ptoken_reader::require_token(const token_t &tok, const token_id_t &token_num)
 	{
 		if (!tok.is(token_num))
 		{
-			pstring val("");
-			for (auto &i : m_tokens)
-				if (i.second.id() == token_num.id())
-					val = i.first;
-			error(MF_EXPECTED_TOKEN_1_GOT_2(val, tok.str()));
+			error(MF_EXPECTED_TOKEN_1_GOT_2(token_num.name(), tok.str()));
 		}
 	}
 
-	pstring ptokenizer::get_string()
+	pstring ptoken_reader::get_string()
 	{
 		token_t tok = get_token();
 		if (!tok.is_type(token_type::STRING))
@@ -95,7 +89,7 @@
 	}
 
 
-	pstring ptokenizer::get_identifier()
+	pstring ptoken_reader::get_identifier()
 	{
 		token_t tok = get_token();
 		if (!tok.is_type(token_type::IDENTIFIER))
@@ -105,7 +99,7 @@
 		return tok.str();
 	}
 
-	pstring ptokenizer::get_identifier_or_number()
+	pstring ptoken_reader::get_identifier_or_number()
 	{
 		token_t tok = get_token();
 		if (!(tok.is_type(token_type::IDENTIFIER) || tok.is_type(token_type::NUMBER)))
@@ -116,7 +110,7 @@
 	}
 
 	// FIXME: combine into template
-	double ptokenizer::get_number_double()
+	double ptoken_reader::get_number_double()
 	{
 		token_t tok = get_token();
 		if (!tok.is_type(token_type::NUMBER))
@@ -130,7 +124,7 @@
 		return ret;
 	}
 
-	long ptokenizer::get_number_long()
+	long ptoken_reader::get_number_long()
 	{
 		token_t tok = get_token();
 		if (!tok.is_type(token_type::NUMBER))
@@ -144,56 +138,51 @@
 		return ret;
 	}
 
-	ptokenizer::token_t ptokenizer::get_token()
+	ptoken_reader::token_t ptoken_reader::get_token()
 	{
-		token_t ret = get_token_internal();
+		token_t ret = get_token_queue();
 		while (true)
 		{
 			if (ret.is_type(token_type::token_type::ENDOFFILE))
 				return ret;
 
-			if (m_support_line_markers && ret.is_type(token_type::LINEMARKER))
+			//printf("%s\n", ret.str().c_str());
+			if (ret.is_type(token_type::LINEMARKER))
 			{
 				bool benter(false);
 				bool bexit(false);
 				pstring file;
 				unsigned lineno(0);
 
-				ret = get_token_internal();
+				ret = get_token_queue();
 				if (!ret.is_type(token_type::NUMBER))
 					error(MF_EXPECTED_LINENUM_GOT_1(ret.str()));
 				lineno = pstonum<unsigned>(ret.str());
-				ret = get_token_internal();
+				ret = get_token_queue();
 				if (!ret.is_type(token_type::STRING))
 					error(MF_EXPECTED_FILENAME_GOT_1(ret.str()));
 				file = ret.str();
-				ret = get_token_internal();
+				ret = get_token_queue();
 				while (ret.is_type(token_type::NUMBER))
 				{
 					if (ret.str() == "1")
 						benter = true;
 					if (ret.str() == "2")
-						bexit = false;
+						bexit = true;
 					// FIXME: process flags; actually only 1 (file enter) and 2 (after file exit)
-					ret = get_token_internal();
+					ret = get_token_queue();
 				}
 				if (bexit) // pop the last location
 					m_source_location.pop_back();
 				if (!benter) // new location!
 					m_source_location.pop_back();
-				m_source_location.emplace_back(plib::source_location(file, lineno));
+				m_source_location.emplace_back(plib::source_location(file, lineno - 1));
 			}
-			else if (ret.is(m_tok_comment_start))
+			else if (ret.is_type(token_type::SOURCELINE))
 			{
-				do {
-					ret = get_token_internal();
-				} while (ret.is_not(m_tok_comment_end));
-				ret = get_token_internal();
-			}
-			else if (ret.is(m_tok_line_comment))
-			{
-				skipeol();
-				ret = get_token_internal();
+				m_line = ret.str();
+				++m_source_location.back();
+				ret = get_token_queue();
 			}
 			else
 			{
@@ -202,7 +191,7 @@
 		}
 	}
 
-	ptokenizer::token_t ptokenizer::get_token_internal()
+	ptoken_reader::token_t ptokenizer::get_token_internal()
 	{
 		// skip ws
 		pstring::value_type c = getc();
@@ -287,7 +276,35 @@
 		}
 	}
 
-	void ptokenizer::error(const perrmsg &errs)
+	ptoken_reader::token_t ptokenizer::get_token_comment()
+	{
+		token_t ret = get_token_internal();
+		while (true)
+		{
+			if (ret.is_type(token_type::token_type::ENDOFFILE))
+				return ret;
+
+			if (ret.is(m_tok_comment_start))
+			{
+				do {
+					ret = get_token_internal();
+				} while (ret.is_not(m_tok_comment_end));
+				ret = get_token_internal();
+			}
+			else if (ret.is(m_tok_line_comment))
+			{
+				skipeol();
+				ret = get_token_internal();
+			}
+			else
+			{
+				return ret;
+			}
+		}
+	}
+
+
+	void ptoken_reader::error(const perrmsg &errs)
 	{
 		pstring s("");
 		pstring trail      ("                 from ");
@@ -302,7 +319,7 @@
 			s = plib::pfmt("{1}{2}:{3}:0\n{4}")(trail, m_source_location.back().file_name(), m_source_location.back().line(), s);
 			m_source_location.pop_back();
 		}
-		verror("\n" + s + e + " " + currentline_str() + "\n");
+		verror("\n" + s + e + " " + m_line + "\n");
 	}
 
 } // namespace plib
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/ptokenizer.h mame-0.224+dfsg.1/src/lib/netlist/plib/ptokenizer.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/ptokenizer.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/ptokenizer.h	2020-08-26 08:57:19.000000000 +0000
@@ -22,17 +22,13 @@
 	class ptokenizer
 	{
 	public:
-		template <typename T>
-		explicit ptokenizer(T &&strm) // NOLINT(misc-forwarding-reference-overload, bugprone-forwarding-reference-overload)
-		: m_strm(std::forward<T>(strm))
-		, m_cur_line("")
-		, m_px(m_cur_line.begin())
-		, m_unget(0)
+		explicit ptokenizer() // NOLINT(misc-forwarding-reference-overload, bugprone-forwarding-reference-overload)
+		: m_strm(nullptr)
 		, m_string('"')
 		, m_support_line_markers(true) // FIXME
+		, m_token_queue(nullptr)
 		{
-			// add a first entry to the stack
-			m_source_location.emplace_back(plib::source_location("Unknown", 0));
+			clear();
 		}
 
 		PCOPYASSIGNMOVE(ptokenizer, delete)
@@ -46,6 +42,7 @@
 			STRING,
 			COMMENT,
 			LINEMARKER,
+			SOURCELINE,
 			UNKNOWN,
 			ENDOFFILE
 		)
@@ -57,28 +54,37 @@
 			static constexpr std::size_t npos = static_cast<std::size_t>(-1);
 
 			token_id_t() : m_id(npos) {}
-			explicit token_id_t(const std::size_t id) : m_id(id) {}
+			explicit token_id_t(std::size_t id, const pstring &name)
+			: m_id(id)
+			, m_name(name)
+			{}
 			std::size_t id() const { return m_id; }
+			pstring name() const { return m_name; }
 		private:
 			std::size_t m_id;
+			pstring     m_name;
 		};
 
 		struct token_t
 		{
 			explicit token_t(token_type type)
-			: m_type(type), m_token("")
+			: m_type(type), m_id(token_id_t::npos), m_token("")
 			{
 			}
 			token_t(token_type type, const pstring &str)
-			: m_type(type), m_token(str)
+			: m_type(type), m_id(token_id_t::npos), m_token(str)
+			{
+			}
+			token_t(const token_id_t &id)
+			: m_type(token_type::TOKEN), m_id(id.id()), m_token(id.name())
 			{
 			}
 			token_t(const token_id_t &id, const pstring &str)
-			: m_type(token_type::TOKEN), m_id(id), m_token(str)
+			: m_type(token_type::TOKEN), m_id(id.id()), m_token(str)
 			{
 			}
 
-			bool is(const token_id_t &tok_id) const noexcept { return m_id.id() == tok_id.id(); }
+			bool is(const token_id_t &tok_id) const noexcept { return m_id == tok_id.id(); }
 			bool is_not(const token_id_t &tok_id) const noexcept { return !is(tok_id); }
 
 			bool is_type(const token_type type) const noexcept { return m_type == type; }
@@ -89,28 +95,17 @@
 
 		private:
 			token_type m_type;
-			token_id_t m_id;
+			std::size_t m_id;
 			pstring m_token;
 		};
 
-		pstring currentline_str() const;
+		using token_store = std::vector<token_t>;
 
 		// tokenizer stuff follows ...
 
-		token_t get_token();
-		pstring get_string();
-		pstring get_identifier();
-		pstring get_identifier_or_number();
-
-		double get_number_double();
-		long get_number_long();
-
-		void require_token(const token_id_t &token_num);
-		void require_token(const token_t &tok, const token_id_t &token_num);
-
 		token_id_t register_token(const pstring &token)
 		{
-			token_id_t ret(m_tokens.size());
+			token_id_t ret(m_tokens.size(), token);
 			m_tokens.emplace(token, ret);
 			return ret;
 		}
@@ -127,22 +122,42 @@
 			return *this;
 		}
 
+		void append_to_store(putf8_reader *reader, token_store &tokstor)
+		{
+			clear();
+			m_strm = reader;
+			// Process tokens into queue
+			token_t ret(token_type::UNKNOWN);
+			m_token_queue = &tokstor;
+			do {
+				ret = get_token_comment();
+				tokstor.push_back(ret);
+			} while (!ret.is_type(token_type::token_type::ENDOFFILE));
+			m_token_queue = nullptr;
+		}
+
+	private:
+
+		void clear()
+		{
+			m_cur_line = "";
+			m_px = m_cur_line.begin();
+			m_unget = 0;
+		}
+
 		token_t get_token_internal();
-		void error(const perrmsg &errs);
 
-		putf8_reader &stream() { return m_strm; }
-	protected:
-		virtual void verror(const pstring &msg) = 0;
+		// get internal token with comment processing
+		token_t get_token_comment();
 
-	private:
 		void skipeol();
 
 		pstring::value_type getc();
 		void ungetc(pstring::value_type c);
 
-		bool eof() const { return m_strm.eof(); }
+		bool eof() const { return m_strm->eof(); }
 
-		putf8_reader m_strm;
+		putf8_reader *m_strm;
 
 		pstring m_cur_line;
 		pstring::const_iterator m_px;
@@ -161,10 +176,72 @@
 		token_id_t m_tok_comment_end;
 		token_id_t m_tok_line_comment;
 
+	protected:
+		bool m_support_line_markers;
+		token_store *m_token_queue;
+	};
+
+	class ptoken_reader
+	{
+	public:
+
+		using token_t = ptokenizer::token_t;
+		using token_type = ptokenizer::token_type;
+		using token_id_t = ptokenizer::token_id_t;
+		using token_store = ptokenizer::token_store;
+
+		explicit ptoken_reader()
+		: m_idx(0)
+		, m_token_store(nullptr)
+		{
+			// add a first entry to the stack
+			m_source_location.emplace_back(plib::source_location("Unknown", 0));
+		}
+
+		PCOPYASSIGNMOVE(ptoken_reader, delete)
+
+		virtual ~ptoken_reader() = default;
+
+		void set_token_source(const token_store *tokstor)
+		{
+			m_token_store = tokstor;
+		}
+
+		pstring currentline_str() const;
+
+		// tokenizer stuff follows ...
+
+		token_t get_token();
+		pstring get_string();
+		pstring get_identifier();
+		pstring get_identifier_or_number();
+
+		double get_number_double();
+		long get_number_long();
+
+		void require_token(const token_id_t &token_num);
+		void require_token(const token_t &tok, const token_id_t &token_num);
+
+		void error(const perrmsg &errs);
+
+		plib::source_location sourceloc() { return m_source_location.back(); }
+	protected:
+		virtual void verror(const pstring &msg) = 0;
+
+	private:
+		token_t get_token_queue()
+		{
+			if (m_idx < m_token_store->size())
+				return (*m_token_store)[m_idx++];
+			return token_t(token_type::ENDOFFILE);
+		}
+
 		// source locations, vector used as stack because we need to loop through stack
 
-		bool m_support_line_markers;
 		std::vector<plib::source_location> m_source_location;
+		pstring m_line;
+		std::size_t m_idx;
+		const token_store * m_token_store;
 	};
 
 } // namespace plib
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/ptypes.h mame-0.224+dfsg.1/src/lib/netlist/plib/ptypes.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/ptypes.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/ptypes.h	2020-08-26 08:57:19.000000000 +0000
@@ -23,19 +23,21 @@
 #endif
 
 // noexcept on move operator -> issue with macosx clang
-#define PCOPYASSIGNMOVE(name, def)  \
-		name(const name &) = def; \
-		name(name &&) noexcept = def; \
-		name &operator=(const name &) = def; \
-		name &operator=(name &&) noexcept = def;
+#define PCOPYASSIGNMOVE(name, def) \
+	PCOPYASSIGN(name, def) \
+	PMOVEASSIGN(name, def)
 
 #define PCOPYASSIGN(name, def)  \
-		name(const name &) = def; \
-		name &operator=(const name &) = def; \
+	name(const name &) = def; \
+	name &operator=(const name &) = def;
 
 #define PMOVEASSIGN(name, def)  \
-		name(name &&) noexcept = def; \
-		name &operator=(name &&) noexcept = def;
+	name(name &&) /*noexcept*/ = def; \
+	name &operator=(name &&) /*noexcept*/ = def;
+
+#if defined(EMSCRIPTEN)
+#undef EMSCRIPTEN
+#endif
 
 namespace plib
 {
@@ -261,12 +263,34 @@
 		using type = typename fast_type_for_size<size_for_bits<bits>::value>::type;
 	};
 
-	//============================================================
-	// Avoid unused variable warnings
-	//============================================================
+	/// \brief mark arguments as not used for compiler
+	///
+	/// @tparam Ts unsused parameters
+	///
 	template<typename... Ts>
 	inline void unused_var(Ts&&...) noexcept {} // NOLINT(readability-named-parameter)
 
+	/// \brief copy type S to type D byte by byte
+	///
+	/// The purpose of this copy function is to suppress compiler warnings.
+	/// Use at your own risk. This is dangerous.
+	///
+	/// \param s Source object
+	/// \param d Destination object
+	/// \tparam S Type of source object
+	/// \tparam D Type of destination object
+	template <typename S, typename D>
+	void reinterpret_copy(S &s, D &d)
+	{
+		static_assert(sizeof(D) >= sizeof(S), "size mismatch");
+		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+		auto *dp = reinterpret_cast<std::uint8_t *>(&d);
+		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
+		const auto *sp = reinterpret_cast<std::uint8_t *>(&s);
+		std::copy(sp, sp + sizeof(S), dp);
+	}
+
+
 } // namespace plib
 
 //============================================================
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/plib/putil.h mame-0.224+dfsg.1/src/lib/netlist/plib/putil.h
--- mame-0.222+dfsg.1/src/lib/netlist/plib/putil.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/plib/putil.h	2020-08-26 08:57:19.000000000 +0000
@@ -154,7 +154,38 @@
 	{
 	public:
 
-		using stream_ptr = std::unique_ptr<std::istream>;
+		struct stream_ext
+		{
+			explicit stream_ext() = default;
+
+			stream_ext(std::unique_ptr<std::istream> &&strm, const pstring &filename)
+			: m_strm(std::move(strm))
+			, m_filename(filename)
+			{
+			}
+			stream_ext(const stream_ext &) = delete;
+			stream_ext &operator=(const stream_ext &) = delete;
+			stream_ext(stream_ext &&rhs) /*noexcept*/
+			{
+				m_strm = std::move(rhs.m_strm);
+				m_filename = rhs.m_filename;
+			}
+			stream_ext &operator=(stream_ext &&) /*noexcept*/ = delete;
+
+			std::istream &stream() noexcept { return *m_strm; }
+			pstring filename() { return m_filename; }
+
+			bool empty() { return m_strm == nullptr; }
+
+			// FIXME: workaround input context should accept stream_ptr
+
+			std::unique_ptr<std::istream> release_stream() { return std::move(m_strm); }
+		private:
+			std::unique_ptr<std::istream> m_strm;
+			pstring m_filename;
+		};
+
+		using stream_ptr = stream_ext; //FIXME: rename to stream_type
 
 		psource_t() noexcept = default;
 
@@ -184,9 +215,9 @@
 		typename psource_t::stream_ptr stream(const pstring &name) override
 		{
 			if (name == m_name)
-				return std::make_unique<std::stringstream>(m_str);
+				return stream_ptr(std::make_unique<std::stringstream>(m_str), name);
 
-			return psource_t::stream_ptr(nullptr);
+			return psource_t::stream_ptr();
 		}
 	private:
 		pstring m_name;
@@ -223,11 +254,11 @@
 				if (source)
 				{
 					auto strm = source->stream(name);
-					if (strm)
+					if (!strm.empty())
 						return strm;
 				}
 			}
-			return typename S::stream_ptr(nullptr);
+			return typename S::stream_ptr();
 		}
 
 		template <typename S, typename F>
@@ -249,26 +280,6 @@
 		list_t m_collection;
 	};
 
-	/// \brief copy type S to type D byte by byte
-	///
-	/// The purpose of this copy function is to suppress compiler warnings.
-	/// Use at your own risk. This is dangerous.
-	///
-	/// \param s Source object
-	/// \param d Destination object
-	/// \tparam S Type of source object
-	/// \tparam D Type of destination object
-	template <typename S, typename D>
-	void reinterpret_copy(S &s, D &d)
-	{
-		static_assert(sizeof(D) >= sizeof(S), "size mismatch");
-		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-		auto *dp = reinterpret_cast<std::uint8_t *>(&d);
-		// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast)
-		const auto *sp = reinterpret_cast<std::uint8_t *>(&s);
-		std::copy(sp, sp + sizeof(S), dp);
-	}
-
 	namespace util
 	{
 		pstring basename(const pstring &filename, const pstring &suffix = "");
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/prg/nltool.cpp mame-0.224+dfsg.1/src/lib/netlist/prg/nltool.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/prg/nltool.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/prg/nltool.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -9,15 +9,19 @@
 //
 // ***************************************************************************
 
-#include "netlist/plib/pmain.h"
+#include "netlist/plib/pdynlib.h"
+#include "netlist/core/setup.h"
 #include "netlist/devices/net_lib.h"
 #include "netlist/nl_errstr.h"
 #include "netlist/nl_parser.h"
 #include "netlist/nl_setup.h"
+#include "netlist/plib/pmain.h"
 #include "netlist/plib/pstrutil.h"
 #include "netlist/solver/nld_solver.h"
 #include "netlist/tools/nl_convert.h"
 
+#include "plib/ptests.h"
+
 #include <cstdio> // scanf
 #include <iomanip> // scanf
 #include <ios>
@@ -29,6 +33,10 @@
 
 extern const plib::dynlib_static_sym nl_static_solver_syms[];
 
+// Forward declarations
+
+class netlist_tool_t;
+
 class tool_app_t : public plib::app
 {
 public:
@@ -38,13 +46,14 @@
 		m_errors(0),
 
 		opt_grp1(*this,     "General options",              "The following options apply to all commands."),
-		opt_cmd (*this,     "c", "cmd",         0,          std::vector<pstring>({"run","validate","convert","listdevices","static","header","docheader"}), "run|validate|convert|listdevices|static|header|docheader"),
+		opt_cmd (*this,     "c", "cmd",         0,          std::vector<pstring>({"run","validate","convert","listdevices","static","header","docheader","tests"}), "run|validate|convert|listdevices|static|header|docheader|tests"),
 		opt_includes(*this, "I", "include",                 "Add the directory to the list of directories to be searched for header files. This option may be specified repeatedly."),
 		opt_defines(*this,  "D", "define",                  "predefine value as macro, e.g. -Dname=value. If '=value' is omitted predefine it as 1. This option may be specified repeatedly."),
 		opt_rfolders(*this, "r", "rom",                     "where to look for data files"),
 		opt_verb(*this,     "v", "verbose",                 "be verbose - this produces lots of output"),
 		opt_quiet(*this,    "q", "quiet",                   "be quiet - no warnings"),
 		opt_prepro(*this,   "",  "prepro",                  "output preprocessor output to stderr"),
+		opt_progress(*this, "",  "progress",                "show progress bar on longer operations"),
 
 		opt_files(*this, "files to process"),
 
@@ -87,7 +96,9 @@
 		opt_ex3(*this,     "nltool --cmd=header --tab-width=8 --line-width=80",
 				"Create the header file needed for including netlists as code."),
 		opt_ex4(*this,     "nltool --cmd static --output src/lib/netlist/generated/static_solvers.cpp src/mame/audio/nl_*.cpp src/mame/machine/nl_*.cpp",
-				"Create static solvers for the MAME project.")
+				"Create static solvers for the MAME project."),
+		opt_ex5(*this,     "nltool --cmd tests",
+			"Run unit tests. In case the unit tests are not linked in, this will do nothing.")
 		{}
 
 	int execute() override;
@@ -116,6 +127,7 @@
 	plib::option_bool   opt_verb;
 	plib::option_bool   opt_quiet;
 	plib::option_bool   opt_prepro;
+	plib::option_bool   opt_progress;
 	plib::option_args   opt_files;
 	plib::option_bool   opt_version;
 	plib::option_bool   opt_help;
@@ -150,6 +162,7 @@
 	plib::option_example opt_ex2;
 	plib::option_example opt_ex3;
 	plib::option_example opt_ex4;
+	plib::option_example opt_ex5;
 
 	struct compile_map_entry
 	{
@@ -161,6 +174,8 @@
 
 	using compile_map = std::map<pstring, compile_map_entry>;
 
+	void run_with_progress(netlist_tool_t &nt, netlist::netlist_time_ext nlstart, netlist::netlist_time_ext ttr);
+
 	void run();
 	void validate();
 	void convert();
@@ -201,11 +216,11 @@
 	stream_ptr stream(const pstring &file) override
 	{
 		pstring name = m_folder + "/" + file;
-		stream_ptr strm(std::make_unique<plib::ifstream>(plib::filesystem::u8path(name)));
-		if (strm->fail())
-			return stream_ptr(nullptr);
+		stream_ptr strm(std::make_unique<plib::ifstream>(plib::filesystem::u8path(name)), plib::filesystem::u8path(name));
+		if (strm.stream().fail())
+			return stream_ptr();
 
-		strm->imbue(std::locale::classic());
+		strm.stream().imbue(std::locale::classic());
 		return strm;
 	}
 
@@ -222,17 +237,17 @@
 
 	void vlog(const plib::plog_level &l, const pstring &ls) const noexcept override;
 
-	netlist::host_arena::unique_ptr<plib::dynlib_base> static_solver_lib() const override
+	std::unique_ptr<plib::dynlib_base> static_solver_lib() const override
 	{
 		if (m_boostlib == "builtin")
-			return plib::make_unique<plib::dynlib_static, netlist::host_arena>(nl_static_solver_syms);
+			return std::make_unique<plib::dynlib_static>(nl_static_solver_syms);
 		if (m_boostlib == "generic")
-			return plib::make_unique<plib::dynlib_static, netlist::host_arena>(nullptr);
+			return std::make_unique<plib::dynlib_static>(nullptr);
 		if (NL_DISABLE_DYNAMIC_LOAD)
 			throw netlist::nl_exception("Dynamic library loading not supported due to project security concerns.");
 
 		//pstring libpath = plib::util::environment("NL_BOOSTLIB", plib::util::buildpath({".", "nlboost.so"}));
-		return plib::make_unique<plib::dynlib, netlist::host_arena>(m_boostlib);
+		return std::make_unique<plib::dynlib>(m_boostlib);
 	}
 
 private:
@@ -402,6 +417,36 @@
 	return ret;
 }
 
+void tool_app_t::run_with_progress(netlist_tool_t &nt, netlist::netlist_time_ext nlstart, netlist::netlist_time_ext ttr)
+{
+	if (!opt_progress())
+		nt.exec().process_queue(ttr);
+	else
+	{
+		auto now = nt.exec().time();
+		auto end = now + ttr;
+		// run to next_sec
+		while (now < end)
+		{
+			auto elapsed = now - nlstart;
+			auto elapsed_sec = elapsed.in_sec() + 1;
+
+			auto next_sec = nlstart + netlist::netlist_time_ext::from_sec(elapsed_sec);
+			if (end < next_sec)
+			{
+				nt.exec().process_queue(end - now);
+			}
+			else
+			{
+				nt.exec().process_queue(next_sec - now);
+				pout("progress {1:4}s : {2}\r", elapsed_sec, pstring(gsl::narrow_cast<std::size_t>(elapsed_sec), '*'));
+				pout.flush();
+			}
+			now = nt.exec().time();
+		}
+	}
+}
+
 void tool_app_t::run()
 {
 	plib::chrono::timer<plib::chrono::system_ticks> t;
@@ -414,31 +459,28 @@
 	if (!plib::util::exists(opt_files()[0]))
 		throw netlist::nl_exception("nltool: file doesn't exists: {}", opt_files()[0]);
 
-	netlist_tool_t nt(*this, "netlist", opt_boostlib());
-
-	{
-		auto t_guard(t.guard());
-		//plib::perftime_t<plib::exact_ticks> t;
-
-		nt.exec().enable_stats(opt_stats());
-
-		if (!opt_verb())
-			nt.log().verbose.set_enabled(false);
-		if (opt_quiet())
-			nt.log().info.set_enabled(false);
+	t.start();
 
-		nt.read_netlist(opt_files()[0], opt_name(),
-				opt_logs(),
-				m_defines, opt_rfolders(), opt_includes());
+	netlist_tool_t nt(*this, "netlist", opt_boostlib());
 
-		// Inputs must be read before reset -> will clear setup and parser
-		inps = read_input(nt.setup(), opt_inp());
-		nt.exec().reset();
+	nt.exec().enable_stats(opt_stats());
 
-		ttr = netlist::netlist_time_ext::from_fp(opt_ttr());
-	}
+	if (!opt_verb())
+		nt.log().verbose.set_enabled(false);
+	if (opt_quiet())
+		nt.log().info.set_enabled(false);
 
+	nt.read_netlist(opt_files()[0], opt_name(),
+			opt_logs(),
+			m_defines, opt_rfolders(), opt_includes());
+
+	// Inputs must be read before reset -> will clear setup and parser
+	inps = read_input(nt.setup(), opt_inp());
+	nt.free_setup_resources();
+	nt.exec().reset();
 
+	ttr = netlist::netlist_time_ext::from_fp(opt_ttr());
+	t.stop();
 	pout("startup time ==> {1:5.3f}\n", t.as_seconds<netlist::nl_fptype>() );
 
 	// FIXME: error handling
@@ -468,14 +510,14 @@
 				&& inps[pos].m_time < ttr
 				&& inps[pos].m_time >= nlt)
 		{
-			nt.exec().process_queue(inps[pos].m_time - nlt);
+			run_with_progress(nt, nlstart, inps[pos].m_time - nlt);
 			inps[pos].setparam();
 			nlt = inps[pos].m_time;
 			pos++;
 		}
 
 		if (ttr > nlt)
-			nt.exec().process_queue(ttr - nlt);
+			run_with_progress(nt, nlstart, ttr - nlt);
 		else
 		{
 			pout("end time {1:.6f} less than saved time {2:.6f}\n",
@@ -497,6 +539,8 @@
 	}
 	nt.exec().stop();
 
+	if (opt_progress())
+		pout("\n");
 	auto emutime(t.as_seconds<netlist::nl_fptype>());
 	pout("{1:f} seconds emulation took {2:f} real time ==> {3:5.2f}%\n",
 			(ttr - nlstart).as_fp<netlist::nl_fptype>(), emutime,
@@ -561,6 +605,7 @@
 
 		// need to reset ...
 
+		nt.free_setup_resources();
 		nt.exec().reset();
 
 		auto mp(nt.exec().solver()->create_solver_code(target));
@@ -985,15 +1030,19 @@
 			poutprefix("///", "");
 			poutprefix("///", "  @snippet devsyn.dox.h {} csynopsis", d.id);
 			poutprefix("///", "");
-#if 1
+
 			poutprefix("///", "  @section {}_2 Parameters", d.id);
 			poutprefix("///", "");
-			poutprefix("///", "  <table>");
-			poutprefix("///", "  <tr><th>Name</th><th>Description</th></tr>");
-			for (auto &e : d.params)
-				poutprefix("///", "  <tr><td>{1}</td><td>{2}</td></tr>", e.first, e.second);
-			poutprefix("///", "  </table>");
-#endif
+			if (!d.params.empty())
+			{
+				poutprefix("///", "  <table>");
+				poutprefix("///", "  <tr><th>Name</th><th>Description</th></tr>");
+				for (auto &e : d.params)
+					poutprefix("///", "  <tr><td>{1}</td><td>{2}</td></tr>", e.first, e.second);
+				poutprefix("///", "  </table>");
+			}
+			else
+				poutprefix("///", "  This device has no parameters.");
 			poutprefix("///", "");
 			poutprefix("///", "  @section {}_3 Connection Diagram", d.id);
 			poutprefix("///", "");
@@ -1006,13 +1055,25 @@
 					auto & pins = d.pinalias;
 					//const int w = 8;
 					poutprefix("///", " {1:10} +--------+", " ");
-					for (std::size_t i=0; i<pins.size()/2; i++)
+					for (std::size_t i=0; i < pins.size() / 2; i++)
 					{
 						poutprefix("///", " {1:10} |{2:-2}    {3:2}| {4:-10}",
 							pins[i], i+1, pins.size()-i, pins[pins.size()-i-1]);
 					}
 					poutprefix("///", " {1:10} +--------+", " ");
 				}
+				else if (d.package == "SIL")
+				{
+					auto & pins = d.pinalias;
+					//const int w = 8;
+					poutprefix("///", " {1:10} +--------+", " ");
+					for (std::size_t i=0; i < pins.size(); i++)
+					{
+						poutprefix("///", " {1:10} |{2:-2}      |",
+							pins[i], i+1);
+					}
+					poutprefix("///", " {1:10} +--------+", " ");
+				}
 				poutprefix("///", "  </pre>");
 			}
 			poutprefix("///", "");
@@ -1020,7 +1081,7 @@
 			poutprefix("///", "");
 			poutprefix("///", "  @section {}_4 Function Table", d.id);
 			poutprefix("///", "");
-			if (!d.functiontable.empty())
+			if (d.functiontable.empty())
 				poutprefix("///", "  Please refer to the datasheet.");
 			else
 				poutprefix("///", "  {}", d.functiontable);
@@ -1225,6 +1286,10 @@
 			create_docheader();
 		else if (cmd == "convert")
 			convert();
+		else if (cmd == "tests")
+		{
+			return PRUN_ALL_TESTS();
+		}
 		else
 		{
 			perr("Unknown command {}\n", cmd.c_str());
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/prg/nlwav.cpp mame-0.224+dfsg.1/src/lib/netlist/prg/nlwav.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/prg/nlwav.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/prg/nlwav.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,10 +1,10 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 #include "netlist/plib/pstring.h"
-//#include "netlist/nl_setup.h"
 #include "netlist/plib/pmain.h"
 #include "netlist/plib/ppmf.h"
 #include "netlist/plib/pstream.h"
+#include "netlist/plib/pstrutil.h"
 
 #include <cstdio>
 
@@ -76,9 +76,7 @@
 	template <typename T>
 	void write(const T &val)
 	{
-		static_assert(sizeof(std::ostream::char_type) == 1, "char_type size must be 1");
-		const auto *ptr(reinterpret_cast<const std::ostream::char_type *>(&val));
-		m_f.write(ptr, sizeof(T));
+		plib::ostream_write(m_f, &val, 1);
 	}
 
 	template <typename T>
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_matrix_solver.cpp mame-0.224+dfsg.1/src/lib/netlist/solver/nld_matrix_solver.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_matrix_solver.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_matrix_solver.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,8 +1,10 @@
 // license:GPL-2.0+
 // copyright-holders:Couriersud
 
-#include "nld_matrix_solver.h"
+#include "nld_solver.h"
+#include "core/setup.h"
 #include "nl_setup.h"
+#include "nld_matrix_solver.h"
 #include "plib/putil.h"
 
 namespace netlist
@@ -36,30 +38,26 @@
 	// matrix_solver
 	// ----------------------------------------------------------------------------------------
 
-	matrix_solver_t::matrix_solver_t(netlist_state_t &anetlist, const pstring &name,
-		const analog_net_t::list_t &nets,
-		const solver_parameters_t *params)
-		: device_t(anetlist, name)
+	matrix_solver_t::matrix_solver_t(devices::nld_solver &main_solver, const pstring &name,
+		const net_list_t &nets,
+		const solver::solver_parameters_t *params)
+		: device_t(static_cast<device_t &>(main_solver), name)
 		, m_params(*params)
 		, m_iterative_fail(*this, "m_iterative_fail", 0)
 		, m_iterative_total(*this, "m_iterative_total", 0)
+		, m_main_solver(main_solver)
 		, m_stat_calculations(*this, "m_stat_calculations", 0)
 		, m_stat_newton_raphson(*this, "m_stat_newton_raphson", 0)
+		, m_stat_newton_raphson_fail(*this, "m_stat_newton_raphson_fail", 0)
 		, m_stat_vsolver_calls(*this, "m_stat_vsolver_calls", 0)
 		, m_last_step(*this, "m_last_step", netlist_time_ext::zero())
-		, m_fb_sync(*this, "FB_sync")
-		, m_Q_sync(*this, "Q_sync")
 		, m_ops(0)
 	{
-		if (!anetlist.setup().connect(m_fb_sync, m_Q_sync))
-		{
-			log().fatal(MF_ERROR_CONNECTING_1_TO_2(m_fb_sync.name(), m_Q_sync.name()));
-			throw nl_exception(MF_ERROR_CONNECTING_1_TO_2(m_fb_sync.name(), m_Q_sync.name()));
-		}
-		setup_base(anetlist.setup(), nets);
+		setup_base(this->state().setup(), nets);
 
 		// now setup the matrix
 		setup_matrix();
+		//printf("Freq: %f\n", m_params.m_freq());
 	}
 
 	analog_net_t *matrix_solver_t::get_connected_net(terminal_t *term)
@@ -67,7 +65,12 @@
 		return &state().setup().get_connected_terminal(*term)->net();
 	}
 
-	void matrix_solver_t::setup_base(setup_t &setup, const analog_net_t::list_t &nets)
+	void matrix_solver_t::reschedule(netlist_time ts)
+	{
+		m_main_solver.reschedule(this, ts);
+	}
+
+	void matrix_solver_t::setup_base(setup_t &setup, const net_list_t &nets)
 	{
 		log().debug("New solver setup\n");
 		std::vector<core_device_t *> step_devices;
@@ -427,71 +430,127 @@
 
 	void matrix_solver_t::reset()
 	{
-		m_last_step = netlist_time_ext::zero();
+		//m_last_step = netlist_time_ext::zero();
 	}
 
-	void matrix_solver_t::step(netlist_time delta) noexcept
+	void matrix_solver_t::step(timestep_type ts_type, netlist_time delta) noexcept
 	{
 		const auto dd(delta.as_fp<fptype>());
 		for (auto &d : m_step_funcs)
-			d(dd);
+			d(ts_type, dd);
+	}
+
+	bool matrix_solver_t::solve_nr_base()
+	{
+		bool this_resched(false);
+		std::size_t newton_loops = 0;
+		do
+		{
+			update_dynamic();
+			// Gauss-Seidel will revert to Gaussian elemination if steps exceeded.
+			this->m_stat_calculations++;
+			this->vsolve_non_dynamic();
+			this_resched = this->check_err();
+			this->store();
+			newton_loops++;
+		} while (this_resched && newton_loops < m_params.m_nr_loops);
+
+		m_stat_newton_raphson += newton_loops;
+		if (this_resched)
+			m_stat_newton_raphson_fail++;
+		return this_resched;
+	}
+
+	netlist_time matrix_solver_t::newton_loops_exceeded(netlist_time delta)
+	{
+		netlist_time next_time_step;
+		bool resched(false);
+
+		restore();
+		step(timestep_type::RESTORE, delta);
+
+		for (std::size_t i=0; i< 10; i++)
+		{
+			backup();
+			step(timestep_type::FORWARD, netlist_time::from_fp(m_params.m_min_ts_ts()));
+			resched = solve_nr_base();
+			// update timestep calculation
+			next_time_step = compute_next_timestep(m_params.m_min_ts_ts(), m_params.m_min_ts_ts(), m_params.m_max_timestep);
+			delta -= netlist_time_ext::from_fp(m_params.m_min_ts_ts());
+		}
+		// try remaining time using compute_next_timestep
+		while (delta > netlist_time::zero())
+		{
+			if (next_time_step > delta)
+				next_time_step = delta;
+			backup();
+			step(timestep_type::FORWARD, next_time_step);
+			delta -= next_time_step;
+			resched = solve_nr_base();
+			next_time_step = compute_next_timestep(next_time_step.as_fp<nl_fptype>(), m_params.m_min_ts_ts(), m_params.m_max_timestep);
+		}
+
+		if (m_stat_newton_raphson % 100 == 0)
+			log().warning(MW_NEWTON_LOOPS_EXCEEDED_INVOCATION_3(100, this->name(), exec().time().as_double() * 1e6));
+
+		if (resched)
+		{
+			// reschedule ....
+			log().warning(MW_NEWTON_LOOPS_EXCEEDED_ON_NET_2(this->name(), exec().time().as_double() * 1e6));
+			return netlist_time::from_fp(m_params.m_nr_recalc_delay());
+		}
+		if (m_params.m_dynamic_ts)
+			return next_time_step;
+
+		return netlist_time::from_fp(m_params.m_max_timestep);
 	}
 
-	netlist_time matrix_solver_t::solve(netlist_time_ext now)
+	netlist_time matrix_solver_t::solve(netlist_time_ext now, const char *source)
 	{
-		const netlist_time_ext delta = now - m_last_step();
+		netlist_time_ext delta = now - m_last_step();
+		PFDEBUG(printf("solve %.10f\n", delta.as_double());)
+		plib::unused_var(source);
 
 		// We are already up to date. Avoid oscillations.
 		// FIXME: Make this a parameter!
 		if (delta < netlist_time_ext::quantum())
-			return netlist_time::zero();
+		{
+			//printf("solve return %s at %f\n", source, now.as_double());
+			return timestep_device_count() > 0 ? netlist_time::from_fp(m_params.m_min_timestep) : netlist_time::zero();
+		}
 
+		backup(); // save voltages for backup and timestep calculation
 		// update all terminals for new time step
 		m_last_step = now;
-		step(static_cast<netlist_time>(delta));
 
 		++m_stat_vsolver_calls;
 		if (dynamic_device_count() != 0)
 		{
-			bool this_resched(false);
-			std::size_t newton_loops = 0;
-			do
-			{
-				update_dynamic();
-				// Gauss-Seidel will revert to Gaussian elemination if steps exceeded.
-				this->m_stat_calculations++;
-				this->vsolve_non_dynamic();
-				this_resched = this->check_err();
-				this->store();
-				newton_loops++;
-			} while (this_resched && newton_loops < m_params.m_nr_loops);
+			step(timestep_type::FORWARD, delta);
+			const auto resched = solve_nr_base();
 
-			m_stat_newton_raphson += newton_loops;
-			// reschedule ....
-			if (this_resched && !m_Q_sync.net().is_queued())
-			{
-				log().warning(MW_NEWTON_LOOPS_EXCEEDED_ON_NET_1(this->name()));
-				// FIXME: test and enable - this is working better, though not optimal yet
-#if 0
-				// Don't store, the result can not be used
-				return netlist_time::from_fp(m_params.m_nr_recalc_delay());
-#else
-				m_Q_sync.net().toggle_and_push_to_queue(netlist_time::from_fp(m_params.m_nr_recalc_delay()));
-#endif
-			}
+			if (resched)
+				return newton_loops_exceeded(delta);
 		}
 		else
 		{
+			step(timestep_type::FORWARD, delta);
 			this->m_stat_calculations++;
 			this->vsolve_non_dynamic();
 			this->store();
 		}
 
-
 		if (m_params.m_dynamic_ts)
-			return compute_next_timestep(delta.as_fp<fptype>(), m_params.m_max_timestep);
+		{
+			if (timestep_device_count() > 0)
+				return compute_next_timestep(delta.as_fp<nl_fptype>(), m_params.m_min_timestep, m_params.m_max_timestep);
+		}
+
+		if (timestep_device_count() > 0)
+			return netlist_time::from_fp(m_params.m_max_timestep);
+
+		return netlist_time::zero();
 
-		return netlist_time::from_fp(m_params.m_max_timestep);
 	}
 
 	int matrix_solver_t::get_net_idx(const analog_net_t *net) const noexcept
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_matrix_solver_ext.h mame-0.224+dfsg.1/src/lib/netlist/solver/nld_matrix_solver_ext.h
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_matrix_solver_ext.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_matrix_solver_ext.h	2020-08-26 08:57:19.000000000 +0000
@@ -24,10 +24,10 @@
 
 		using float_type = FT;
 
-		matrix_solver_ext_t(netlist_state_t &anetlist, const pstring &name,
-			const analog_net_t::list_t &nets,
-			const solver_parameters_t *params, const std::size_t size)
-		: matrix_solver_t(anetlist, name, nets, params)
+		matrix_solver_ext_t(devices::nld_solver &main_solver, const pstring &name,
+			const net_list_t &nets,
+			const solver::solver_parameters_t *params, const std::size_t size)
+		: matrix_solver_t(main_solver, name, nets, params)
 		, m_new_V(size)
 		, m_RHS(size)
 		, m_mat_ptr(size, this->max_railstart() + 1)
@@ -56,15 +56,6 @@
 		//PALIGNAS_VECTOROPT() parrays define alignment already
 		plib::pmatrix2d<float_type *> m_mat_ptr;
 
-		std::size_t max_railstart() const noexcept
-		{
-			std::size_t max_rail = 0;
-			for (std::size_t k = 0; k < m_terms.size(); k++)
-				max_rail = std::max(max_rail, m_terms[k].railstart());
-			return max_rail;
-		}
-
-
 		template <typename T, typename M>
 		void log_fill(const T &fill, M &mat)
 		{
@@ -164,9 +155,23 @@
 			return false;
 		}
 
-		netlist_time compute_next_timestep(fptype cur_ts, fptype max_ts) override
+		void backup() override
+		{
+			const std::size_t iN = size();
+			for (std::size_t i = 0; i < iN; i++)
+				m_last_V[i] = gsl::narrow_cast<fptype>(this->m_terms[i].getV());
+		}
+
+		void restore() override
 		{
-			fptype new_solver_timestep(max_ts);
+			const std::size_t iN = size();
+			for (std::size_t i = 0; i < iN; i++)
+				this->m_terms[i].setV(static_cast<nl_fptype>(m_last_V[i]));
+		}
+
+		netlist_time compute_next_timestep(fptype cur_ts, fptype min_ts, fptype max_ts) override
+		{
+			fptype new_solver_timestep_sq(max_ts * max_ts);
 
 			for (std::size_t k = 0; k < size(); k++)
 			{
@@ -176,25 +181,25 @@
 				const fptype DD_n = std::max(-fp_constants<fptype>::TIMESTEP_MAXDIFF(),
 					std::min(+fp_constants<fptype>::TIMESTEP_MAXDIFF(),(v - m_last_V[k])));
 
-				m_last_V[k] = v;
+				//m_last_V[k] = v;
 				const fptype hn = cur_ts;
 
 				fptype DD2 = (DD_n / hn - m_DD_n_m_1[k] / m_h_n_m_1[k]) / (hn + m_h_n_m_1[k]);
-				fptype new_net_timestep(0);
 
 				m_h_n_m_1[k] = hn;
 				m_DD_n_m_1[k] = DD_n;
 				if (plib::abs(DD2) > fp_constants<fptype>::TIMESTEP_MINDIV()) // avoid div-by-zero
-					new_net_timestep = plib::sqrt(m_params.m_dynamic_lte / plib::abs(nlconst::half()*DD2));
-				else
-					new_net_timestep = m_params.m_max_timestep;
-
-				new_solver_timestep = std::min(new_net_timestep, new_solver_timestep);
+				{
+					// save the sqrt for the end
+					const fptype new_net_timestep_sq = m_params.m_dynamic_lte / plib::abs(nlconst::half()*DD2);
+					new_solver_timestep_sq = std::min(new_net_timestep_sq, new_solver_timestep_sq);
+				}
 			}
-			new_solver_timestep = std::max(new_solver_timestep, m_params.m_min_timestep);
+
+			new_solver_timestep_sq = std::max(plib::sqrt(new_solver_timestep_sq), min_ts);
 
 			// FIXME: Factor 2 below is important. Without, we get timing issues. This must be a bug elsewhere.
-			return std::max(netlist_time::from_fp(new_solver_timestep), netlist_time::quantum() * 2);
+			return std::max(netlist_time::from_fp(new_solver_timestep_sq), netlist_time::quantum() * 2);
 		}
 
 		template <typename M>
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_matrix_solver.h mame-0.224+dfsg.1/src/lib/netlist/solver/nld_matrix_solver.h
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_matrix_solver.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_matrix_solver.h	2020-08-26 08:57:19.000000000 +0000
@@ -20,6 +20,10 @@
 
 #include <numeric>
 
+//FIXME: remove again
+
+#define PFDEBUG(x)
+
 namespace netlist
 {
 namespace solver
@@ -58,38 +62,78 @@
 
 	using static_compile_container = std::vector<std::pair<pstring, pstring>>;
 
+	struct solver_parameter_defaults
+	{
+		constexpr nl_fptype          m_freq() { return nlconst::magic(48000.0); }
+
+		// iteration parameters
+		constexpr nl_fptype          m_gs_sor() { return nlconst::magic(1.059); }
+		constexpr matrix_type_e      m_method() { return matrix_type_e::MAT_CR; }
+		constexpr matrix_fp_type_e   m_fp_type() { return matrix_fp_type_e::DOUBLE; }
+		constexpr nl_fptype          m_reltol() { return nlconst::magic(1e-3); }
+		constexpr nl_fptype          m_vntol() { return nlconst::magic(1e-7); }
+		constexpr nl_fptype          m_accuracy() { return nlconst::magic(1e-7); }
+		constexpr std::size_t        m_nr_loops() { return 250; }
+		constexpr std::size_t        m_gs_loops() { return 9; }
+
+		// general parameters
+		constexpr nl_fptype          m_gmin() { return nlconst::magic(1e-9); }
+		constexpr bool               m_pivot() { return false; }
+		constexpr nl_fptype          m_nr_recalc_delay(){ return netlist_time::quantum().as_fp<nl_fptype>(); }
+		constexpr int                m_parallel() { return 0; }
+
+		constexpr nl_fptype          m_min_ts_ts() { return nlconst::magic(1e-9); }
+		// automatic time step
+		constexpr bool               m_dynamic_ts() { return false; }
+		constexpr nl_fptype          m_dynamic_lte() { return nlconst::magic(1e-5); }
+		constexpr nl_fptype          m_dynamic_min_ts() { return nlconst::magic(1e-6); }
+
+		// matrix sorting
+		constexpr matrix_sort_type_e m_sort_type() { return matrix_sort_type_e::PREFER_IDENTITY_TOP_LEFT; }
+
+		// special
+		constexpr bool               m_use_gabs() { return true; }
+
+		static solver_parameter_defaults &get_instance()
+		{
+			static solver_parameter_defaults s;
+			return s;
+		}
+	};
+
 	struct solver_parameters_t
 	{
-		solver_parameters_t(device_t &parent)
-		: m_freq(parent, "FREQ", nlconst::magic(48000.0))
+		template <typename D>
+		solver_parameters_t(device_t &parent, const pstring &prefix, D &defaults)
+		: m_freq(parent, prefix + "FREQ", defaults.m_freq())
 
 		// iteration parameters
-		, m_gs_sor(parent,   "SOR_FACTOR", nlconst::magic(1.059))
-		, m_method(parent,   "METHOD", matrix_type_e::MAT_CR)
-		, m_fp_type(parent,  "FPTYPE", matrix_fp_type_e::DOUBLE)
-		, m_reltol(parent,   "RELTOL", nlconst::magic(1e-3))            ///< SPICE RELTOL parameter
-		, m_vntol(parent,    "VNTOL",  nlconst::magic(1e-7))            ///< SPICE VNTOL parameter
-		, m_accuracy(parent, "ACCURACY", nlconst::magic(1e-7))          ///< Iterative solver accuracy
-		, m_nr_loops(parent, "NR_LOOPS", 250)           ///< Maximum number of Newton-Raphson loops
-		, m_gs_loops(parent, "GS_LOOPS", 9)             ///< Maximum number of Gauss-Seidel loops
+		, m_gs_sor(parent,   prefix + "SOR_FACTOR", defaults.m_gs_sor())
+		, m_method(parent,   prefix + "METHOD", defaults.m_method())
+		, m_fp_type(parent,  prefix + "FPTYPE", defaults.m_fp_type())
+		, m_reltol(parent,   prefix + "RELTOL", defaults.m_reltol())            ///< SPICE RELTOL parameter
+		, m_vntol(parent,    prefix + "VNTOL",  defaults.m_vntol())            ///< SPICE VNTOL parameter
+		, m_accuracy(parent, prefix + "ACCURACY", defaults.m_accuracy())          ///< Iterative solver accuracy
+		, m_nr_loops(parent, prefix + "NR_LOOPS", defaults.m_nr_loops())           ///< Maximum number of Newton-Raphson loops
+		, m_gs_loops(parent, prefix + "GS_LOOPS", defaults.m_gs_loops())             ///< Maximum number of Gauss-Seidel loops
 
 		// general parameters
-		, m_gmin(parent, "GMIN", nlconst::magic(1e-9))
-		, m_pivot(parent, "PIVOT", false)               ///< use pivoting on supported solvers
-		, m_nr_recalc_delay(parent, "NR_RECALC_DELAY",
-			netlist_time::quantum().as_fp<nl_fptype>()) ///< Delay to next solve attempt if nr loops exceeded
-		, m_parallel(parent, "PARALLEL", 0)
+		, m_gmin(parent, prefix + "GMIN", defaults.m_gmin())
+		, m_pivot(parent, prefix + "PIVOT", defaults.m_pivot())               ///< use pivoting on supported solvers
+		, m_nr_recalc_delay(parent, prefix + "NR_RECALC_DELAY", defaults.m_nr_recalc_delay()) ///< Delay to next solve attempt if nr loops exceeded
+		, m_parallel(parent, prefix + "PARALLEL", defaults.m_parallel())
+		, m_min_ts_ts(parent, prefix + "MIN_TS_TS", defaults.m_min_ts_ts()) ///< The minimum time step for solvers with time stepping devices.
 
 		// automatic time step
-		, m_dynamic_ts(parent, "DYNAMIC_TS", false)     ///< Use dynamic time stepping
-		, m_dynamic_lte(parent, "DYNAMIC_LTE", nlconst::magic(1e-5))    ///< dynamic time stepping slope
-		, m_dynamic_min_ts(parent, "DYNAMIC_MIN_TIMESTEP", nlconst::magic(1e-6)) ///< smallest time step allowed
+		, m_dynamic_ts(parent, prefix + "DYNAMIC_TS", defaults.m_dynamic_ts())     ///< Use dynamic time stepping
+		, m_dynamic_lte(parent, prefix + "DYNAMIC_LTE", defaults.m_dynamic_lte())    ///< dynamic time stepping slope
+		, m_dynamic_min_ts(parent, prefix + "DYNAMIC_MIN_TIMESTEP", defaults.m_dynamic_min_ts()) ///< smallest time step allowed
 
 		// matrix sorting
-		, m_sort_type(parent, "SORT_TYPE", matrix_sort_type_e::PREFER_IDENTITY_TOP_LEFT)
+		, m_sort_type(parent, prefix + "SORT_TYPE", defaults.m_sort_type())
 
 		// special
-		, m_use_gabs(parent, "USE_GABS", true)
+		, m_use_gabs(parent, prefix + "USE_GABS", defaults.m_use_gabs())
 
 		{
 			m_min_timestep = m_dynamic_min_ts();
@@ -118,7 +162,8 @@
 		param_logic_t  m_pivot;
 		param_fp_t m_nr_recalc_delay;
 		param_int_t m_parallel;
-		param_logic_t  m_dynamic_ts;
+		param_fp_t m_min_ts_ts;
+		param_logic_t m_dynamic_ts;
 		param_fp_t m_dynamic_lte;
 		param_fp_t m_dynamic_min_ts;
 		param_enum_t<matrix_sort_type_e> m_sort_type;
@@ -185,12 +230,13 @@
 	public:
 		using list_t = std::vector<matrix_solver_t *>;
 		using fptype = nl_fptype;
-		using arena_type = plib::mempool_arena<plib::aligned_arena>;
+		using arena_type = plib::mempool_arena<plib::aligned_arena, PALIGN_VECTOROPT>;
+		using net_list_t =  plib::aligned_vector<analog_net_t *>;
 
 		// after every call to solve, update inputs must be called.
 		// this can be done as well as a batch to ease parallel processing.
 
-		netlist_time solve(netlist_time_ext now);
+		netlist_time solve(netlist_time_ext now, const char *source);
 		void update_inputs();
 
 		/// \brief Checks if solver may alter a net
@@ -204,6 +250,12 @@
 		std::size_t dynamic_device_count() const noexcept { return m_dynamic_funcs.size(); }
 		std::size_t timestep_device_count() const noexcept { return m_step_funcs.size(); }
 
+		/// \brief reschedule solver execution
+		///
+		/// Calls reschedule on main solver
+		///
+		void reschedule(netlist_time ts);
+
 		/// \brief Immediately solve system at current time
 		///
 		/// This should only be called from update and update_param events.
@@ -214,41 +266,35 @@
 			// this should only occur outside of execution and thus
 			// using time should be safe.
 
-			const netlist_time new_timestep = solve(exec().time());
+			const netlist_time new_timestep = solve(exec().time(), "solve_now");
 			plib::unused_var(new_timestep);
 
 			update_inputs();
 
-			if (m_params.m_dynamic_ts && (timestep_device_count() != 0))
+			if (timestep_device_count() > 0)
 			{
-				m_Q_sync.net().toggle_and_push_to_queue(netlist_time::from_fp(m_params.m_min_timestep));
+				this->reschedule(netlist_time::from_fp(m_params.m_dynamic_ts ? m_params.m_min_timestep : m_params.m_max_timestep));
 			}
 		}
 
 		template <typename F>
-		void change_state(F f, netlist_time delay = netlist_time::quantum())
+		void change_state(F f)
 		{
 			// We only need to update the net first if this is a time stepping net
 			if (timestep_device_count() > 0)
 			{
-				const netlist_time new_timestep = solve(exec().time());
+				const netlist_time new_timestep = solve(exec().time(), "change_state");
 				plib::unused_var(new_timestep);
 				update_inputs();
 			}
 			f();
-			m_Q_sync.net().toggle_and_push_to_queue(delay);
-		}
-
-		// netdevice functions
-		NETLIB_UPDATEI()
-		{
-			const netlist_time new_timestep = solve(exec().time());
-			update_inputs();
-
-			if (m_params.m_dynamic_ts && (timestep_device_count() != 0) && new_timestep > netlist_time::zero())
+			if (timestep_device_count() > 0)
 			{
-				m_Q_sync.net().toggle_and_push_to_queue(new_timestep);
+				PFDEBUG(printf("here2\n");)
+				this->reschedule(netlist_time::from_fp(m_params.m_min_ts_ts()));
 			}
+			else
+				this->reschedule(netlist_time::quantum());
 		}
 
 		NETLIB_RESETI();
@@ -265,22 +311,32 @@
 		constexpr std::size_t ops() const { return m_ops; }
 
 	protected:
-		matrix_solver_t(netlist_state_t &anetlist, const pstring &name,
-			const analog_net_t::list_t &nets,
+		matrix_solver_t(devices::nld_solver &main_solver, const pstring &name,
+			const net_list_t &nets,
 			const solver_parameters_t *params);
 
 		virtual void vsolve_non_dynamic() = 0;
-		virtual netlist_time compute_next_timestep(fptype cur_ts, fptype max_ts) = 0;
+		virtual netlist_time compute_next_timestep(fptype cur_ts, fptype min_ts, fptype max_ts) = 0;
 		virtual bool check_err() const = 0;
 		virtual void store() = 0;
+		virtual void backup() = 0;
+		virtual void restore() = 0;
+
+		std::size_t max_railstart() const noexcept
+		{
+			std::size_t max_rail = 0;
+			for (std::size_t k = 0; k < m_terms.size(); k++)
+				max_rail = std::max(max_rail, m_terms[k].railstart());
+			return max_rail;
+		}
+
+		const solver_parameters_t &m_params;
 
 		plib::pmatrix2d_vrl<fptype, arena_type>    m_gonn;
 		plib::pmatrix2d_vrl<fptype, arena_type>    m_gtn;
 		plib::pmatrix2d_vrl<fptype, arena_type>    m_Idrn;
 		plib::pmatrix2d_vrl<fptype *, arena_type>  m_connected_net_Vn;
 
-		const solver_parameters_t &m_params;
-
 		state_var<std::size_t> m_iterative_fail;
 		state_var<std::size_t> m_iterative_total;
 
@@ -289,12 +345,15 @@
 	private:
 
 		// base setup - called from constructor
-		void setup_base(setup_t &setup, const analog_net_t::list_t &nets) noexcept(false);
+		void setup_base(setup_t &setup, const net_list_t &nets) noexcept(false);
+
+		bool solve_nr_base();
+		netlist_time newton_loops_exceeded(netlist_time delta);
 
 		void sort_terms(matrix_sort_type_e sort);
 
 		void update_dynamic() noexcept;
-		void step(netlist_time delta) noexcept;
+		void step(timestep_type ts_type, netlist_time delta) noexcept;
 
 		int get_net_idx(const analog_net_t *net) const noexcept;
 		std::pair<int, int> get_left_right_of_diag(std::size_t irow, std::size_t idiag);
@@ -309,8 +368,11 @@
 
 		analog_net_t *get_connected_net(terminal_t *term);
 
+		devices::nld_solver &m_main_solver;
+
 		state_var<std::size_t> m_stat_calculations;
 		state_var<std::size_t> m_stat_newton_raphson;
+		state_var<std::size_t> m_stat_newton_raphson_fail;
 		state_var<std::size_t> m_stat_vsolver_calls;
 
 		state_var<netlist_time_ext> m_last_step;
@@ -318,13 +380,9 @@
 		plib::aligned_vector<nldelegate_dyn> m_dynamic_funcs;
 		plib::aligned_vector<device_arena::unique_ptr<proxied_analog_output_t>> m_inps;
 
-		logic_input_t m_fb_sync;
-		logic_output_t m_Q_sync;
-
 		std::size_t m_ops;
 
 		plib::aligned_vector<terms_for_net_t> m_rails_temp; // setup only
-
 	};
 
 } // namespace solver
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_direct1.h mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_direct1.h
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_direct1.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_direct1.h	2020-08-26 08:57:19.000000000 +0000
@@ -24,10 +24,10 @@
 		using float_type = FT;
 		using base_type = matrix_solver_direct_t<FT, 1>;
 
-		matrix_solver_direct1_t(netlist_state_t &anetlist, const pstring &name,
-			const analog_net_t::list_t &nets,
-			const solver_parameters_t *params)
-			: matrix_solver_direct_t<FT, 1>(anetlist, name, nets, params, 1)
+		matrix_solver_direct1_t(devices::nld_solver &main_solver, const pstring &name,
+			const matrix_solver_t::net_list_t &nets,
+			const solver::solver_parameters_t *params)
+			: matrix_solver_direct_t<FT, 1>(main_solver, name, nets, params, 1)
 			{}
 
 		// ----------------------------------------------------------------------------------------
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_direct2.h mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_direct2.h
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_direct2.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_direct2.h	2020-08-26 08:57:19.000000000 +0000
@@ -28,10 +28,10 @@
 
 		using float_type = FT;
 
-		matrix_solver_direct2_t(netlist_state_t &anetlist, const pstring &name,
-			const analog_net_t::list_t &nets,
-			const solver_parameters_t *params)
-		: matrix_solver_direct_t<FT, 2>(anetlist, name, nets, params, 2)
+		matrix_solver_direct2_t(devices::nld_solver &main_solver, const pstring &name,
+			const matrix_solver_t::net_list_t &nets,
+			const solver::solver_parameters_t *params)
+		: matrix_solver_direct_t<FT, 2>(main_solver, name, nets, params, 2)
 		{}
 		void vsolve_non_dynamic() override
 		{
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_direct.h mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_direct.h
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_direct.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_direct.h	2020-08-26 08:57:19.000000000 +0000
@@ -29,9 +29,9 @@
 
 		using float_type = FT;
 
-		matrix_solver_direct_t(netlist_state_t &anetlist, const pstring &name,
-			const analog_net_t::list_t &nets,
-			const solver_parameters_t *params, std::size_t size);
+		matrix_solver_direct_t(devices::nld_solver &main_solver, const pstring &name,
+			const matrix_solver_t::net_list_t &nets,
+			const solver::solver_parameters_t *params, std::size_t size);
 
 		void reset() override { matrix_solver_t::reset(); }
 
@@ -188,11 +188,11 @@
 	}
 
 	template <typename FT, int SIZE>
-	matrix_solver_direct_t<FT, SIZE>::matrix_solver_direct_t(netlist_state_t &anetlist, const pstring &name,
-		const analog_net_t::list_t &nets,
-		const solver_parameters_t *params,
+	matrix_solver_direct_t<FT, SIZE>::matrix_solver_direct_t(devices::nld_solver &main_solver, const pstring &name,
+		const matrix_solver_t::net_list_t &nets,
+		const solver::solver_parameters_t *params,
 		std::size_t size)
-	: matrix_solver_ext_t<FT, SIZE>(anetlist, name, nets, params, size)
+	: matrix_solver_ext_t<FT, SIZE>(main_solver, name, nets, params, size)
 	, m_pitch(m_pitch_ABS ? m_pitch_ABS : (((size + 0) + 7) / 8) * 8)
 	, m_A(size, m_pitch)
 	{
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_gcr.h mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_gcr.h
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_gcr.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_gcr.h	2020-08-26 08:57:19.000000000 +0000
@@ -35,10 +35,10 @@
 		using base_type = matrix_solver_ext_t<FT, SIZE>;
 		using fptype = typename base_type::fptype;
 
-		matrix_solver_GCR_t(netlist_state_t &anetlist, const pstring &name,
-			const analog_net_t::list_t &nets,
-			const solver_parameters_t *params, const std::size_t size)
-		: matrix_solver_ext_t<FT, SIZE>(anetlist, name, nets, params, size)
+		matrix_solver_GCR_t(devices::nld_solver &main_solver, const pstring &name,
+			const matrix_solver_t::net_list_t &nets,
+			const solver::solver_parameters_t *params, const std::size_t size)
+		: matrix_solver_ext_t<FT, SIZE>(main_solver, name, nets, params, size)
 		, mat(static_cast<typename mat_type::index_type>(size))
 		, m_proc()
 		{
@@ -86,10 +86,10 @@
 				this->m_mat_ptr[k][this->m_terms[k].railstart()] = &mat.A[mat.diag[k]];
 			}
 
-			anetlist.log().verbose("maximum fill: {1}", gr.first);
-			anetlist.log().verbose("Post elimination occupancy ratio: {2} Ops: {1}", gr.second,
+			this->state().log().verbose("maximum fill: {1}", gr.first);
+			this->state().log().verbose("Post elimination occupancy ratio: {2} Ops: {1}", gr.second,
 					static_cast<fptype>(mat.nz_num) / static_cast<fptype>(iN * iN));
-			anetlist.log().verbose(" Pre elimination occupancy ratio: {2}",
+			this->state().log().verbose(" Pre elimination occupancy ratio: {1}",
 					static_cast<fptype>(raw_elements) / static_cast<fptype>(iN * iN));
 
 			// FIXME: Move me
@@ -98,17 +98,17 @@
 			// During extended validation there is no reason to check for
 			// differences in the generated code since during
 			// extended validation this will be different (and non-functional)
-			if (!anetlist.is_extended_validation() && anetlist.lib().isLoaded())
+			if (!this->state().is_extended_validation() && this->state().lib().isLoaded())
 			{
 				pstring symname = static_compile_name();
-				m_proc.load(anetlist.lib(), symname);
+				m_proc.load(this->state().lib(), symname);
 				if (m_proc.resolved())
 				{
-					anetlist.log().info("External static solver {1} found ...", symname);
+					this->state().log().info("External static solver {1} found ...", symname);
 				}
 				else
 				{
-					anetlist.log().warning("External static solver {1} not found ...", symname);
+					this->state().log().warning("External static solver {1} not found ...", symname);
 				}
 			}
 		}
@@ -141,6 +141,9 @@
 		pstring fptype(fp_constants<FT>::name());
 		pstring fpsuffix(fp_constants<FT>::suffix());
 
+		// avoid unused variable warnings
+		strm("\tplib::unused_var({1});\n", "cnV");
+
 		for (std::size_t i = 0; i < mat.nz_num; i++)
 			strm("\t{1} m_A{2}(0.0);\n", fptype, i, i);
 
@@ -200,9 +203,11 @@
 
 		for (std::size_t i = 0; i < iN - 1; i++)
 		{
-			const auto &nzbd = this->m_terms[i].m_nzbd;
+			//const auto &nzbd = this->m_terms[i].m_nzbd;
+			const auto *nzbd = mat.nzbd(i);
+			const auto nzbd_count = mat.nzbd_count(i);
 
-			if (!nzbd.empty())
+			if (nzbd_count > 0)
 			{
 				std::size_t pi = mat.diag[i];
 
@@ -212,8 +217,9 @@
 				const std::size_t piie = mat.row_idx[i+1];
 
 				//for (auto & j : nzbd)
-				for (std::size_t j : nzbd)
+				for (std::size_t jj = 0; jj < nzbd_count; jj++)
 				{
+					std::size_t j = nzbd[jj];
 					// proceed to column i
 					std::size_t pj = mat.row_idx[j];
 
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_gmres.h mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_gmres.h
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_gmres.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_gmres.h	2020-08-26 08:57:19.000000000 +0000
@@ -34,11 +34,11 @@
 		// maximize the efficiency of the incomplete LUT.
 		// This is already preconditioning.
 
-		matrix_solver_GMRES_t(netlist_state_t &anetlist, const pstring &name,
-			analog_net_t::list_t &nets,
-			const solver_parameters_t *params,
+		matrix_solver_GMRES_t(devices::nld_solver &main_solver, const pstring &name,
+			matrix_solver_t::net_list_t &nets,
+			const solver::solver_parameters_t *params,
 			const std::size_t size)
-			: matrix_solver_direct_t<FT, SIZE>(anetlist, name, nets, params, size)
+			: matrix_solver_direct_t<FT, SIZE>(main_solver, name, nets, params, size)
 			, m_ops(size, 0)
 			, m_gmres(size)
 			{
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_sm.h mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_sm.h
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_sm.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_sm.h	2020-08-26 08:57:19.000000000 +0000
@@ -54,10 +54,10 @@
 		// FIXME: dirty hack to make this compile
 		static constexpr const std::size_t storage_N = 100;
 
-		matrix_solver_sm_t(netlist_state_t &anetlist, const pstring &name,
-			const analog_net_t::list_t &nets,
+		matrix_solver_sm_t(devices::nld_solver &main_solver, const pstring &name,
+			const matrix_solver_t::net_list_t &nets,
 			const solver_parameters_t *params, const std::size_t size)
-		: matrix_solver_ext_t<FT, SIZE>(anetlist, name, nets, params, size)
+		: matrix_solver_ext_t<FT, SIZE>(main_solver, name, nets, params, size)
 		, m_cnt(0)
 		{
 			this->build_mat_ptr(m_A);
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_sor.h mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_sor.h
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_sor.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_sor.h	2020-08-26 08:57:19.000000000 +0000
@@ -29,10 +29,10 @@
 
 		using float_type = FT;
 
-		matrix_solver_SOR_t(netlist_state_t &anetlist, const pstring &name,
-			analog_net_t::list_t &nets,
+		matrix_solver_SOR_t(devices::nld_solver &main_solver, const pstring &name,
+			matrix_solver_t::net_list_t &nets,
 			const solver_parameters_t *params, const std::size_t size)
-			: matrix_solver_direct_t<FT, SIZE>(anetlist, name, nets, params, size)
+			: matrix_solver_direct_t<FT, SIZE>(main_solver, name, nets, params, size)
 			, m_lp_fact(*this, "m_lp_fact", 0)
 			, w(size, plib::constants<FT>::zero())
 			, one_m_w(size, plib::constants<FT>::zero())
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_sor_mat.h mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_sor_mat.h
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_sor_mat.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_sor_mat.h	2020-08-26 08:57:19.000000000 +0000
@@ -29,10 +29,10 @@
 
 		using float_type = FT;
 
-		matrix_solver_SOR_mat_t(netlist_state_t &anetlist, const pstring &name,
-			const analog_net_t::list_t &nets,
+		matrix_solver_SOR_mat_t(devices::nld_solver &main_solver, const pstring &name,
+			const matrix_solver_t::net_list_t &nets,
 			const solver_parameters_t *params, std::size_t size)
-			: matrix_solver_direct_t<FT, SIZE>(anetlist, name, nets, params, size)
+			: matrix_solver_direct_t<FT, SIZE>(main_solver, name, nets, params, size)
 			, m_omega(*this, "m_omega", static_cast<float_type>(params->m_gs_sor))
 			{
 			}
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_w.h mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_w.h
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_ms_w.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_ms_w.h	2020-08-26 08:57:19.000000000 +0000
@@ -60,10 +60,10 @@
 		// FIXME: dirty hack to make this compile
 		static constexpr const std::size_t storage_N = 100;
 
-		matrix_solver_w_t(netlist_state_t &anetlist, const pstring &name,
-			const analog_net_t::list_t &nets,
+		matrix_solver_w_t(devices::nld_solver &main_solver, const pstring &name,
+			const matrix_solver_t::net_list_t &nets,
 			const solver_parameters_t *params, const std::size_t size)
-		: matrix_solver_ext_t<FT, SIZE>(anetlist, name, nets, params, size)
+		: matrix_solver_ext_t<FT, SIZE>(main_solver, name, nets, params, size)
 		, m_cnt(0)
 		{
 			this->build_mat_ptr(m_A);
@@ -79,7 +79,6 @@
 		template <typename T>
 		void LE_compute_x(T & x);
 
-
 		template <typename T1, typename T2>
 		float_ext_type &A(const T1 &r, const T2 &c) { return m_A[r][c]; }
 		template <typename T1, typename T2>
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_solver.cpp mame-0.224+dfsg.1/src/lib/netlist/solver/nld_solver.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_solver.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_solver.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,7 @@
 
 
 #include "netlist/nl_factory.h"
+#include "core/setup.h"
 #include "netlist/nl_setup.h" // FIXME: only needed for splitter code
 #include "nld_matrix_solver.h"
 #include "nld_ms_direct.h"
@@ -16,6 +17,7 @@
 #include "nld_ms_w.h"
 #include "nld_solver.h"
 #include "plib/pomp.h"
+#include "plib/ptimed_queue.h"
 
 #include <algorithm>
 #include <type_traits>
@@ -31,8 +33,12 @@
 
 	NETLIB_RESET(solver)
 	{
+		if (exec().use_stats())
+			m_fb_step.set_delegate(NETLIB_DELEGATE(fb_step<true>));
 		for (auto &s : m_mat_solvers)
 			s->reset();
+		for (auto &s : m_mat_solvers)
+			m_queue.push<false>({netlist_time_ext::zero(), s.get()});
 	}
 
 	void NETLIB_NAME(solver)::stop()
@@ -41,7 +47,92 @@
 			s->log_stats();
 	}
 
-	NETLIB_UPDATE(solver)
+#if 1
+
+	template<bool KEEP_STATS>
+	NETLIB_HANDLER(solver, fb_step)
+	{
+		const netlist_time_ext now(exec().time());
+		const std::size_t nthreads = m_params.m_parallel() < 2 ? 1 : std::min(static_cast<std::size_t>(m_params.m_parallel()), plib::omp::get_max_threads());
+		const netlist_time_ext sched(now + (nthreads <= 1 ? netlist_time_ext::zero() : netlist_time_ext::from_nsec(100)));
+		plib::uninitialised_array<solver::matrix_solver_t *, config::MAX_SOLVER_QUEUE_SIZE::value> tmp;
+		plib::uninitialised_array<netlist_time, config::MAX_SOLVER_QUEUE_SIZE::value> nt;
+		std::size_t p=0;
+
+		while (m_queue.size() > 0)
+		{
+			auto t = m_queue.top().exec_time();
+			auto o = m_queue.top().object();
+			if (t != now)
+				if (t > sched)
+					break;
+			tmp[p++] = o;
+			m_queue.pop();
+		}
+
+		// FIXME: Disabled for now since parallel processing will decrease performance
+		//        for tested applications. More testing required here
+		if (1 || nthreads < 2)
+		{
+			if (!KEEP_STATS)
+			{
+				for (std::size_t i = 0; i < p; i++)
+						nt[i] = tmp[i]->solve(now, "no-parallel");
+			}
+			else
+			{
+				stats()->m_stat_total_time.stop();
+				for (std::size_t i = 0; i < p; i++)
+				{
+					tmp[i]->stats()->m_stat_call_count.inc();
+					auto g(tmp[i]->stats()->m_stat_total_time.guard());
+					nt[i] = tmp[i]->solve(now, "no-parallel");
+				}
+				stats()->m_stat_total_time.start();
+			}
+
+			for (std::size_t i = 0; i < p; i++)
+			{
+				if (nt[i] != netlist_time::zero())
+					m_queue.push<false>({now + nt[i], tmp[i]});
+				tmp[i]->update_inputs();
+			}
+		}
+		else
+		{
+			plib::omp::set_num_threads(nthreads);
+			plib::omp::for_static(static_cast<std::size_t>(0), p, [&tmp, &nt,now](std::size_t i)
+				{
+					nt[i] = tmp[i]->solve(now, "parallel");
+				});
+			for (std::size_t i = 0; i < p; i++)
+			{
+				if (nt[i] != netlist_time::zero())
+					m_queue.push<false>({now + nt[i], tmp[i]});
+				tmp[i]->update_inputs();
+			}
+		}
+		if (m_queue.size() > 0)
+			m_Q_step.net().toggle_and_push_to_queue(m_queue.top().exec_time() - now);
+	}
+
+	void NETLIB_NAME(solver) :: reschedule(solver::matrix_solver_t *solv, netlist_time ts)
+	{
+		const netlist_time_ext now(exec().time());
+		const netlist_time_ext sched(now + ts);
+		m_queue.remove<false>(solv);
+		m_queue.push<false>({sched, solv});
+
+		if (m_Q_step.net().is_queued())
+		{
+			if (m_Q_step.net().next_scheduled_time() > sched)
+				m_Q_step.net().toggle_and_push_to_queue(ts);
+		}
+		else
+			m_Q_step.net().toggle_and_push_to_queue(ts);
+	}
+#else
+	NETLIB_HANDLER(solver, fb_step)
 	{
 		if (m_params.m_dynamic_ts)
 			return;
@@ -53,26 +144,26 @@
 
 		std::size_t nthreads = std::min(static_cast<std::size_t>(m_params.m_parallel()), plib::omp::get_max_threads());
 
-		std::vector<solver::matrix_solver_t *> &solvers = (force_solve ? m_mat_solvers_all : m_mat_solvers_timestepping);
+		std::vector<solver_entry *> &solvers = (force_solve ? m_mat_solvers_all : m_mat_solvers_timestepping);
 
 		if (nthreads > 1 && solvers.size() > 1)
 		{
 			plib::omp::set_num_threads(nthreads);
 			plib::omp::for_static(static_cast<std::size_t>(0), solvers.size(), [&solvers, now](std::size_t i)
 				{
-					const netlist_time ts = solvers[i]->solve(now);
+					const netlist_time ts = solvers[i]->ptr->solve(now);
 					plib::unused_var(ts);
 				});
 		}
 		else
 			for (auto & solver : solvers)
 			{
-				const netlist_time ts = solver->solve(now);
+				const netlist_time ts = solver->ptr->solve(now);
 				plib::unused_var(ts);
 			}
 
 		for (auto & solver : solvers)
-			solver->update_inputs();
+			solver->ptr->update_inputs();
 
 		// step circuit
 		if (!m_Q_step.net().is_queued())
@@ -80,104 +171,105 @@
 			m_Q_step.net().toggle_and_push_to_queue(netlist_time::from_fp(m_params.m_max_timestep));
 		}
 	}
+#endif
 
 	// FIXME: should be created in device space
 	template <class C>
-	host_arena::unique_ptr<solver::matrix_solver_t> create_it(netlist_state_t &nl, pstring name,
-		analog_net_t::list_t &nets,
-		solver::solver_parameters_t &params, std::size_t size)
+	NETLIB_NAME(solver)::solver_ptr create_it(NETLIB_NAME(solver) &main_solver, pstring name,
+		NETLIB_NAME(solver)::net_list_t &nets,
+		const solver::solver_parameters_t *params, std::size_t size)
 	{
-		return plib::make_unique<C, host_arena>(nl, name, nets, &params, size);
+		return plib::make_unique<C, device_arena>(main_solver, name, nets, params, size);
 	}
 
 	template <typename FT, int SIZE>
-	host_arena::unique_ptr<solver::matrix_solver_t> NETLIB_NAME(solver)::create_solver(std::size_t size,
-		const pstring &solvername,
-		analog_net_t::list_t &nets)
+	NETLIB_NAME(solver)::solver_ptr NETLIB_NAME(solver)::create_solver(std::size_t size,
+		const pstring &solvername, const solver::solver_parameters_t *params,
+		NETLIB_NAME(solver)::net_list_t &nets)
 	{
-		switch (m_params.m_method())
+		switch (params->m_method())
 		{
 			case solver::matrix_type_e::MAT_CR:
-				return create_it<solver::matrix_solver_GCR_t<FT, SIZE>>(state(), solvername, nets, m_params, size);
+				return create_it<solver::matrix_solver_GCR_t<FT, SIZE>>(*this, solvername, nets, params, size);
 			case solver::matrix_type_e::MAT:
-				return create_it<solver::matrix_solver_direct_t<FT, SIZE>>(state(), solvername, nets, m_params, size);
-#if (NL_USE_ACADEMIC_SOLVERS)
+				return create_it<solver::matrix_solver_direct_t<FT, SIZE>>(*this, solvername, nets, params, size);
 			case solver::matrix_type_e::GMRES:
-				return create_it<solver::matrix_solver_GMRES_t<FT, SIZE>>(state(), solvername, nets, m_params, size);
+				return create_it<solver::matrix_solver_GMRES_t<FT, SIZE>>(*this, solvername, nets, params, size);
+#if (NL_USE_ACADEMIC_SOLVERS)
 			case solver::matrix_type_e::SOR:
-				return create_it<solver::matrix_solver_SOR_t<FT, SIZE>>(state(), solvername, nets, m_params, size);
+				return create_it<solver::matrix_solver_SOR_t<FT, SIZE>>(*this, solvername, nets, params, size);
 			case solver::matrix_type_e::SOR_MAT:
-				return create_it<solver::matrix_solver_SOR_mat_t<FT, SIZE>>(state(), solvername, nets, m_params, size);
+				return create_it<solver::matrix_solver_SOR_mat_t<FT, SIZE>>(*this, solvername, nets, params, size);
 			case solver::matrix_type_e::SM:
 				// Sherman-Morrison Formula
-				return create_it<solver::matrix_solver_sm_t<FT, SIZE>>(state(), solvername, nets, m_params, size);
+				return create_it<solver::matrix_solver_sm_t<FT, SIZE>>(*this, solvername, nets, params, size);
 			case solver::matrix_type_e::W:
 				// Woodbury Formula
-				return create_it<solver::matrix_solver_w_t<FT, SIZE>>(state(), solvername, nets, m_params, size);
+				return create_it<solver::matrix_solver_w_t<FT, SIZE>>(*this, solvername, nets, params, size);
 #else
-			case solver::matrix_type_e::GMRES:
+			//case solver::matrix_type_e::GMRES:
 			case solver::matrix_type_e::SOR:
 			case solver::matrix_type_e::SOR_MAT:
 			case solver::matrix_type_e::SM:
 			case solver::matrix_type_e::W:
-				state().log().warning(MW_SOLVER_METHOD_NOT_SUPPORTED(m_params.m_method().name(), "MAT_CR"));
-				return create_it<solver::matrix_solver_GCR_t<FT, SIZE>>(state(), solvername, nets, m_params, size);
+				state().log().warning(MW_SOLVER_METHOD_NOT_SUPPORTED(params->m_method().name(), "MAT_CR"));
+				return create_it<solver::matrix_solver_GCR_t<FT, SIZE>>(*this, solvername, nets, params, size);
 #endif
 		}
-		return host_arena::unique_ptr<solver::matrix_solver_t>();
+		return solver_ptr();
 	}
 
 	template <typename FT>
-	host_arena::unique_ptr<solver::matrix_solver_t> NETLIB_NAME(solver)::create_solvers(
-		const pstring &sname,
-		analog_net_t::list_t &nets)
+	NETLIB_NAME(solver)::solver_ptr NETLIB_NAME(solver)::create_solvers(
+		const pstring &sname, const solver::solver_parameters_t *params,
+		net_list_t &nets)
 	{
 		std::size_t net_count = nets.size();
 		switch (net_count)
 		{
 			case 1:
-				return plib::make_unique<solver::matrix_solver_direct1_t<FT>, host_arena>(state(), sname, nets, &m_params);
+				return plib::make_unique<solver::matrix_solver_direct1_t<FT>, device_arena>(*this, sname, nets, params);
 			case 2:
-				return plib::make_unique<solver::matrix_solver_direct2_t<FT>, host_arena>(state(), sname, nets, &m_params);
+				return plib::make_unique<solver::matrix_solver_direct2_t<FT>, device_arena>(*this, sname, nets, params);
 			case 3:
-				return create_solver<FT, 3>(3, sname, nets);
+				return create_solver<FT, 3>(3, sname, params, nets);
 			case 4:
-				return create_solver<FT, 4>(4, sname, nets);
+				return create_solver<FT, 4>(4, sname, params, nets);
 			case 5:
-				return create_solver<FT, 5>(5, sname, nets);
+				return create_solver<FT, 5>(5, sname, params, nets);
 			case 6:
-				return create_solver<FT, 6>(6, sname, nets);
+				return create_solver<FT, 6>(6, sname, params, nets);
 			case 7:
-				return create_solver<FT, 7>(7, sname, nets);
+				return create_solver<FT, 7>(7, sname, params, nets);
 			case 8:
-				return create_solver<FT, 8>(8, sname, nets);
+				return create_solver<FT, 8>(8, sname, params, nets);
 			default:
 				log().info(MI_NO_SPECIFIC_SOLVER(net_count));
 				if (net_count <= 16)
 				{
-					return create_solver<FT, -16>(net_count, sname, nets);
+					return create_solver<FT, -16>(net_count, sname, params, nets);
 				}
 				if (net_count <= 32)
 				{
-					return create_solver<FT, -32>(net_count, sname, nets);
+					return create_solver<FT, -32>(net_count, sname, params, nets);
 				}
 				if (net_count <= 64)
 				{
-					return create_solver<FT, -64>(net_count, sname, nets);
+					return create_solver<FT, -64>(net_count, sname, params, nets);
 				}
 				if (net_count <= 128)
 				{
-					return create_solver<FT, -128>(net_count, sname, nets);
+					return create_solver<FT, -128>(net_count, sname, params, nets);
 				}
 				if (net_count <= 256)
 				{
-					return create_solver<FT, -256>(net_count, sname, nets);
+					return create_solver<FT, -256>(net_count, sname, params, nets);
 				}
 				if (net_count <= 512)
 				{
-					return create_solver<FT, -512>(net_count, sname, nets);
+					return create_solver<FT, -512>(net_count, sname, params, nets);
 				}
-				return create_solver<FT, 0>(net_count, sname, nets);
+				return create_solver<FT, 0>(net_count, sname, params, nets);
 		}
 	}
 
@@ -195,7 +287,7 @@
 					auto &n = dynamic_cast<analog_net_t &>(*net);
 					if (!already_processed(n))
 					{
-						groupspre.emplace_back(analog_net_t::list_t());
+						groupspre.emplace_back(NETLIB_NAME(solver)::net_list_t());
 						process_net(netlist, n);
 					}
 				}
@@ -205,7 +297,7 @@
 					groups.push_back(g);
 		}
 
-		std::vector<analog_net_t::list_t> groups;
+		std::vector<NETLIB_NAME(solver)::net_list_t> groups;
 
 	private:
 
@@ -275,7 +367,7 @@
 			}
 		}
 
-		std::vector<analog_net_t::list_t> groupspre;
+		std::vector<NETLIB_NAME(solver)::net_list_t> groupspre;
 	};
 
 	void NETLIB_NAME(solver)::post_start()
@@ -291,30 +383,31 @@
 		log().verbose("Found {1} net groups in {2} nets\n", splitter.groups.size(), state().nets().size());
 		for (auto & grp : splitter.groups)
 		{
-			host_arena::unique_ptr<solver::matrix_solver_t> ms;
+			solver_ptr ms;
 			pstring sname = plib::pfmt("Solver_{1}")(m_mat_solvers.size());
+			params_uptr params = plib::make_unique<solver::solver_parameters_t, solver_arena>(*this, sname + ".", m_params);
 
-			switch (m_params.m_fp_type())
+			switch (params->m_fp_type())
 			{
 				case solver::matrix_fp_type_e::FLOAT:
 					if (!config::use_float_matrix())
-						log().info("FPTYPE {1} not supported. Using DOUBLE", m_params.m_fp_type().name());
-					ms = create_solvers<std::conditional_t<config::use_float_matrix::value, float, double>>(sname, grp);
+						log().info("FPTYPE {1} not supported. Using DOUBLE", params->m_fp_type().name());
+					ms = create_solvers<std::conditional_t<config::use_float_matrix::value, float, double>>(sname, params.get(), grp);
 					break;
 				case solver::matrix_fp_type_e::DOUBLE:
-					ms = create_solvers<double>(sname, grp);
+					ms = create_solvers<double>(sname, params.get(), grp);
 					break;
 				case solver::matrix_fp_type_e::LONGDOUBLE:
 					if (!config::use_long_double_matrix())
-						log().info("FPTYPE {1} not supported. Using DOUBLE", m_params.m_fp_type().name());
-					ms = create_solvers<std::conditional_t<config::use_long_double_matrix::value, long double, double>>(sname, grp);
+						log().info("FPTYPE {1} not supported. Using DOUBLE", params->m_fp_type().name());
+					ms = create_solvers<std::conditional_t<config::use_long_double_matrix::value, long double, double>>(sname, params.get(), grp);
 					break;
 				case solver::matrix_fp_type_e::FLOATQ128:
 #if (NL_USE_FLOAT128)
-					ms = create_solvers<FLOAT128>(sname, grp);
+					ms = create_solvers<FLOAT128>(sname, params.get(), grp);
 #else
-					log().info("FPTYPE {1} not supported. Using DOUBLE", m_params.m_fp_type().name());
-					ms = create_solvers<double>(sname, grp);
+					log().info("FPTYPE {1} not supported. Using DOUBLE", params->m_fp_type().name());
+					ms = create_solvers<double>(sname, params.get(), grp);
 #endif
 					break;
 			}
@@ -332,12 +425,10 @@
 				}
 			}
 
-			m_mat_solvers_all.push_back(ms.get());
-			if (ms->timestep_device_count() != 0)
-				m_mat_solvers_timestepping.push_back(ms.get());
-
-			m_mat_solvers.emplace_back(std::move(ms));
+			m_mat_params.push_back(std::move(params));
+			m_mat_solvers.push_back(std::move(ms));
 		}
+
 	}
 
 	solver::static_compile_container NETLIB_NAME(solver)::create_solver_code(solver::static_compile_target target)
@@ -352,6 +443,20 @@
 		return mp;
 	}
 
+	std::size_t NETLIB_NAME(solver)::get_solver_id(const solver::matrix_solver_t *net) const
+	{
+		for (std::size_t i=0; i < m_mat_solvers.size(); i++)
+			if (m_mat_solvers[i].get() == net)
+				return i;
+		return std::numeric_limits<std::size_t>::max();
+	}
+
+	solver::matrix_solver_t * NETLIB_NAME(solver)::solver_by_id(std::size_t id) const
+	{
+		return m_mat_solvers[id].get();
+	}
+
+
 	NETLIB_DEVICE_IMPL(solver, "SOLVER", "FREQ")
 
 } // namespace devices
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/solver/nld_solver.h mame-0.224+dfsg.1/src/lib/netlist/solver/nld_solver.h
--- mame-0.222+dfsg.1/src/lib/netlist/solver/nld_solver.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/solver/nld_solver.h	2020-08-26 08:57:19.000000000 +0000
@@ -26,12 +26,20 @@
 {
 	NETLIB_OBJECT(solver)
 	{
+	public:
+		using queue_type = detail::queue_base<solver::matrix_solver_t, false>;
+		using solver_arena = device_arena;
+
 		NETLIB_CONSTRUCTOR(solver)
-		, m_fb_step(*this, "FB_step")
+		, m_fb_step(*this, "FB_step", NETLIB_DELEGATE(fb_step<false>))
 		, m_Q_step(*this, "Q_step")
-		, m_params(*this)
+		, m_params(*this, "", solver::solver_parameter_defaults::get_instance())
+		, m_queue(config::MAX_SOLVER_QUEUE_SIZE::value,
+			queue_type::id_delegate(&NETLIB_NAME(solver) :: get_solver_id, this),
+			queue_type::obj_delegate(&NETLIB_NAME(solver) :: solver_by_id, this))
 		{
-			// internal staff
+			// internal stuff
+			state().save(*this, static_cast<plib::state_manager_t::callback_t &>(m_queue), this->name(), "m_queue");
 
 			connect(m_fb_step, m_Q_step);
 		}
@@ -43,28 +51,42 @@
 
 		solver::static_compile_container create_solver_code(solver::static_compile_target target);
 
-		NETLIB_UPDATEI();
 		NETLIB_RESETI();
 		// NETLIB_UPDATE_PARAMI();
 
+		using solver_ptr = solver_arena::unique_ptr<solver::matrix_solver_t>;
+
+		using net_list_t = solver::matrix_solver_t::net_list_t;
+
+		void reschedule(solver::matrix_solver_t *solv, netlist_time ts);
+
 	private:
+		using params_uptr = solver_arena::unique_ptr<solver::solver_parameters_t>;
+
+		template<bool KEEP_STATS>
+		NETLIB_HANDLERI(fb_step);
+
 		logic_input_t m_fb_step;
 		logic_output_t m_Q_step;
 
 		// FIXME: these should be created in device space
-		std::vector<host_arena::unique_ptr<solver::matrix_solver_t>> m_mat_solvers;
-		std::vector<solver::matrix_solver_t *> m_mat_solvers_all;
-		std::vector<solver::matrix_solver_t *> m_mat_solvers_timestepping;
+		std::vector<params_uptr> m_mat_params;
+		std::vector<solver_ptr> m_mat_solvers;
 
 		solver::solver_parameters_t m_params;
+		queue_type m_queue;
 
 		template <typename FT, int SIZE>
-		host_arena::unique_ptr<solver::matrix_solver_t> create_solver(std::size_t size,
-			const pstring &solvername, analog_net_t::list_t &nets);
+		solver_ptr create_solver(std::size_t size, const pstring &solvername,
+			const solver::solver_parameters_t *params,net_list_t &nets);
 
 		template <typename FT>
-		host_arena::unique_ptr<solver::matrix_solver_t> create_solvers(
-			const pstring &sname, analog_net_t::list_t &nets);
+		solver_ptr create_solvers(const pstring &sname,
+			const solver::solver_parameters_t *params, net_list_t &nets);
+
+		std::size_t get_solver_id(const solver::matrix_solver_t *net) const;
+		solver::matrix_solver_t *solver_by_id(std::size_t id) const;
+
 	};
 
 } // namespace devices
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/tests/test_pfunction.cpp mame-0.224+dfsg.1/src/lib/netlist/tests/test_pfunction.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/tests/test_pfunction.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/tests/test_pfunction.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,55 @@
+// license:GPL-2.0+
+// copyright-holders:Couriersud
+
+///
+/// \file pfunction_test.cpp
+///
+/// tests for pfunction
+///
+
+#include "plib/ptests.h"
+
+#include "plib/pexception.h"
+#include "plib/pfunction.h"
+
+#define PFUNCEXPECT(formula, val) \
+	PEXPECT_EQ(val, plib::pfunction<double>(formula)())
+
+PTEST(pfunction, operators)
+{
+	PFUNCEXPECT("1==1", 1.0);
+	PFUNCEXPECT("1 *0 == 2-1-1", 1.0);
+	PFUNCEXPECT("0!=1", 1.0);
+	PFUNCEXPECT("0<1",  1.0);
+	PFUNCEXPECT("1>0",  1.0);
+	PFUNCEXPECT("0<=1", 1.0);
+	PFUNCEXPECT("1>=0", 1.0);
+	PFUNCEXPECT("1<=1", 1.0);
+	PFUNCEXPECT("1>=1", 1.0);
+	PEXPECT_EQ(1.0, plib::pfunction<double>("0!=a", {"a"})({1.0}));
+}
+
+PTEST(pfunction, func_if)
+{
+	PFUNCEXPECT("if(1>0, 2, 0)", 2.0);
+	PFUNCEXPECT("if(0>1, 2, 3)", 3.0);
+	PFUNCEXPECT("if(sin(1)>0, 2, 3)", 3.0); // fail
+	PEXPECT_EQ( 1.0,   plib::pfunction<double>("if(A2>2.5, 0-A1, (0.07-(0.005*A1))*if(A0>2.5,1,0-1))", {"A0","A1","A2"})({1.0,-1.0,3.0}));
+	PEXPECT_EQ(-0.065, plib::pfunction<double>("if(A2>2.5, 0-A1, (0.07-(0.005*A1))*if(A0>2.5,1,0-1))", {"A0","A1","A2"})({1.0,1.0,1.0}));
+	PEXPECT_EQ( 0.065, plib::pfunction<double>("if(A2>2.5, 0-A1, (0.07-(0.005*A1))*if(A0>2.5,1,0-1))", {"A0","A1","A2"})({3.0,1.0,1.0}));
+	PEXPECT_TRUE(1.0 == plib::pfunction<double>("0!=a", {"a"})({1.0}));
+}
+
+PTEST(pfunction, unary_minus)
+{
+	PFUNCEXPECT("-1>-2", 1.0);
+	PFUNCEXPECT("(-3)*(-4)", 12.0);
+	PFUNCEXPECT("(-3)*-4", 12.0);
+	PFUNCEXPECT("-3*-4", 12.0);
+	PEXPECT_EQ( -3.0, plib::pfunction<double>("-A0", {"A0"})({3.0}));
+	PFUNCEXPECT("3*-trunc(3.2)", -9.0);
+	PFUNCEXPECT("3*-(3*2)", -18.0);
+	PFUNCEXPECT("3*-(2*1)^2", -12.0);
+	PEXPECT_THROW(plib::pfunction<double>("(3, 4)")(), plib::pexception);
+	PEXPECT_THROW(plib::pfunction<double>("(3)")(), plib::pexception); // fail
+}
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/tools/nl_convert.cpp mame-0.224+dfsg.1/src/lib/netlist/tools/nl_convert.cpp
--- mame-0.222+dfsg.1/src/lib/netlist/tools/nl_convert.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/tools/nl_convert.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,6 +3,7 @@
 
 #include "plib/palloc.h"
 #include "plib/pstonum.h"
+#include "plib/pstrutil.h"
 #include "plib/putil.h"
 
 #include "nl_convert.h"
@@ -730,8 +731,8 @@
 //    Eagle converter
 // -------------------------------------------------
 
-nl_convert_eagle_t::tokenizer::tokenizer(nl_convert_eagle_t &convert, plib::putf8_reader &&strm)
-	: plib::ptokenizer(std::move(strm))
+nl_convert_eagle_t::tokenizer::tokenizer(nl_convert_eagle_t &convert)
+	: plib::ptokenizer()
 	, m_convert(convert)
 {
 	this->identifier_chars("abcdefghijklmnopqrstuvwvxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_.-")
@@ -758,8 +759,13 @@
 void nl_convert_eagle_t::convert(const pstring &contents)
 {
 
-	tokenizer tok(*this, plib::putf8_reader(std::make_unique<std::istringstream>(contents)));
-	tok.stream().stream().imbue(std::locale::classic());
+	tokenizer tok(*this);
+
+	tokenizer::token_store tokstor;
+	plib::putf8_reader u8reader(std::make_unique<std::istringstream>(contents));
+
+	tok.append_to_store(&u8reader, tokstor);
+	tok.set_token_source(&tokstor);
 
 	out("NETLIST_START(dummy)\n");
 	add_term("GND", "GND");
@@ -868,8 +874,8 @@
 //    RINF converter
 // -------------------------------------------------
 
-nl_convert_rinf_t::tokenizer::tokenizer(nl_convert_rinf_t &convert, plib::putf8_reader &&strm)
-	: plib::ptokenizer(std::move(strm))
+nl_convert_rinf_t::tokenizer::tokenizer(nl_convert_rinf_t &convert)
+	: plib::ptokenizer()
 	, m_convert(convert)
 {
 	this->identifier_chars(".abcdefghijklmnopqrstuvwvxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890_-")
@@ -905,8 +911,14 @@
 
 void nl_convert_rinf_t::convert(const pstring &contents)
 {
-	tokenizer tok(*this, plib::putf8_reader(std::make_unique<std::istringstream>(contents)));
-	tok.stream().stream().imbue(std::locale::classic());
+	tokenizer tok(*this);
+
+	tokenizer::token_store tokstor;
+	plib::putf8_reader u8reader(std::make_unique<std::istringstream>(contents));
+
+	tok.append_to_store(&u8reader, tokstor);
+	tok.set_token_source(&tokstor);
+
 	auto lm = read_lib_map(s_lib_map);
 
 	out("NETLIST_START(dummy)\n");
@@ -1008,7 +1020,7 @@
 			if (token.is(tok.m_tok_TER))
 			{
 				token = tok.get_token();
-				while (token.is_type(plib::ptokenizer::token_type::IDENTIFIER))
+				while (token.is_type(plib::ptoken_reader::token_type::IDENTIFIER))
 				{
 					pin = tok.get_identifier_or_number();
 					add_term(net, token.str() + "." + pin);
diff -Nru mame-0.222+dfsg.1/src/lib/netlist/tools/nl_convert.h mame-0.224+dfsg.1/src/lib/netlist/tools/nl_convert.h
--- mame-0.222+dfsg.1/src/lib/netlist/tools/nl_convert.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/lib/netlist/tools/nl_convert.h	2020-08-26 08:57:19.000000000 +0000
@@ -10,11 +10,12 @@
 
 #include "plib/palloc.h"
 #include "plib/pstring.h"
-#include "plib/ptokenizer.h"
 #include "plib/ptypes.h"
 
 #include <memory>
 
+#include "../plib/ptokenizer.h"
+
 // -------------------------------------------------
 //  convert - convert a spice netlist
 // -------------------------------------------------
@@ -212,10 +213,15 @@
 
 	nl_convert_eagle_t() = default;
 
-	class tokenizer : public plib::ptokenizer
+	class tokenizer : public plib::ptokenizer, public plib::ptoken_reader
 	{
 	public:
-		tokenizer(nl_convert_eagle_t &convert, plib::putf8_reader &&strm);
+		using token_t = ptokenizer::token_t;
+		using token_type = ptokenizer::token_type;
+		using token_id_t = ptokenizer::token_id_t;
+		using token_store = ptokenizer::token_store;
+
+		tokenizer(nl_convert_eagle_t &convert);
 
 		token_id_t m_tok_ADD;       // NOLINT
 		token_id_t m_tok_VALUE;     // NOLINT
@@ -244,10 +250,14 @@
 
 	nl_convert_rinf_t() = default;
 
-	class tokenizer : public plib::ptokenizer
+	class tokenizer : public plib::ptokenizer, public plib::ptoken_reader
 	{
 	public:
-		tokenizer(nl_convert_rinf_t &convert, plib::putf8_reader &&strm);
+		using token_t = ptokenizer::token_t;
+		using token_type = ptokenizer::token_type;
+		using token_id_t = ptokenizer::token_id_t;
+		using token_store = ptokenizer::token_store;
+		tokenizer(nl_convert_rinf_t &convert);
 
 		token_id_t m_tok_HEA; // NOLINT
 		token_id_t m_tok_APP; // NOLINT
diff -Nru mame-0.222+dfsg.1/src/mame/arcade.flt mame-0.224+dfsg.1/src/mame/arcade.flt
--- mame-0.222+dfsg.1/src/mame/arcade.flt	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/arcade.flt	2020-08-26 08:57:19.000000000 +0000
@@ -436,6 +436,7 @@
 gaelco.cpp
 gaelco2.cpp
 gaelco3d.cpp
+gaelcof3.cpp
 gaelcopc.cpp
 gaiden.cpp
 gal3.cpp
@@ -1127,6 +1128,7 @@
 sidearms.cpp
 sidepckt.cpp
 sigma21.cpp
+sigmab31.cpp
 sigmab52.cpp
 sigmab98.cpp
 silkroad.cpp
@@ -1169,6 +1171,7 @@
 spcforce.cpp
 spdheat.cpp
 spdodgeb.cpp
+special_gambl.cpp
 spectra.cpp
 speedatk.cpp
 speedbal.cpp
@@ -1178,6 +1181,7 @@
 spinb.cpp
 spirit76.cpp
 splash.cpp
+splash_ms.cpp
 splus.cpp
 spoker.cpp
 spool99.cpp
@@ -1285,6 +1289,7 @@
 tecmo.cpp
 tecmo16.cpp
 tecmosys.cpp
+tecnodar.cpp
 tehkanwc.cpp
 tempest.cpp
 terracre.cpp
@@ -1357,7 +1362,6 @@
 undrfire.cpp
 unianapc.cpp
 unico.cpp
-unkfr.cpp
 unkhorse.cpp
 unkpoker.cpp
 upscope.cpp
diff -Nru mame-0.222+dfsg.1/src/mame/audio/bzone.cpp mame-0.224+dfsg.1/src/mame/audio/bzone.cpp
--- mame-0.222+dfsg.1/src/mame/audio/bzone.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/bzone.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -267,7 +267,7 @@
 	m_gain[1] = BZONE_CUSTOM_FILTER__R5 / m_gain[1] + 1;
 	m_v_in1_gain = RES_VOLTAGE_DIVIDER(BZONE_CUSTOM_FILTER__R3, BZONE_CUSTOM_FILTER__R4);
 	m_v_p = BZONE_CUSTOM_FILTER__VP - OP_AMP_VP_RAIL_OFFSET;
-	m_exponent = RC_CHARGE_EXP(BZONE_CUSTOM_FILTER__R5 * BZONE_CUSTOM_FILTER__C);;
+	m_exponent = RC_CHARGE_EXP(BZONE_CUSTOM_FILTER__R5 * BZONE_CUSTOM_FILTER__C);
 	m_out_v = 0.0;
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/audio/cage.cpp mame-0.224+dfsg.1/src/mame/audio/cage.cpp
--- mame-0.222+dfsg.1/src/mame/audio/cage.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/cage.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -163,6 +163,7 @@
 	save_item(NAME(m_timer_enabled));
 	save_item(NAME(m_from_main));
 	save_item(NAME(m_control));
+	save_item(NAME(m_tms32031_io_regs));
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/audio/cinemat.cpp mame-0.224+dfsg.1/src/mame/audio/cinemat.cpp
--- mame-0.222+dfsg.1/src/mame/audio/cinemat.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/cinemat.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -21,6 +21,18 @@
 #include "emu.h"
 #include "includes/cinemat.h"
 
+#include "audio/nl_armora.h"
+#include "audio/nl_barrier.h"
+#include "audio/nl_boxingb.h"
+#include "audio/nl_ripoff.h"
+#include "audio/nl_solarq.h"
+#include "audio/nl_spacewar.h"
+#include "audio/nl_speedfrk.h"
+#include "audio/nl_starcas.h"
+#include "audio/nl_starhawk.h"
+#include "audio/nl_sundance.h"
+#include "audio/nl_tailg.h"
+#include "audio/nl_warrior.h"
 #include "cpu/z80/z80.h"
 #include "machine/z80daisy.h"
 #include "machine/z80ctc.h"
@@ -29,190 +41,127 @@
 
 /*************************************
  *
- *  Macros
+ *  Base class
  *
  *************************************/
 
-#define RISING_EDGE(bit, changed, val)  (((changed) & (bit)) && ((val) & (bit)))
-#define FALLING_EDGE(bit, changed, val) (((changed) & (bit)) && !((val) & (bit)))
-
-#define SHIFTREG_RISING_EDGE(bit)       RISING_EDGE(bit, (m_last_shift ^ m_current_shift), m_current_shift)
-#define SHIFTREG_FALLING_EDGE(bit)      FALLING_EDGE(bit, (m_last_shift ^ m_current_shift), m_current_shift)
-
-#define SHIFTREG2_RISING_EDGE(bit)      RISING_EDGE(bit, (m_last_shift2 ^ m_current_shift), m_current_shift)
-#define SHIFTREG2_FALLING_EDGE(bit)     FALLING_EDGE(bit, (m_last_shift2 ^ m_current_shift), m_current_shift)
-
-
-/*************************************
- *
- *  Generic sound init
- *
- *************************************/
-
-void cinemat_state::sound_start()
+cinemat_audio_device::cinemat_audio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 inputs_mask, void (*netlist)(netlist::nlparse_t &), double output_scale)
+	: device_t(mconfig, type, tag, owner, clock)
+	, m_out_input(*this, "sound_nl:out_%u", 0)
+	, m_inputs_mask(inputs_mask)
+	, m_netlist(netlist)
+	, m_output_scale(output_scale)
 {
-	/* register for save states */
-	save_item(NAME(m_current_shift));
-	save_item(NAME(m_last_shift));
-	save_item(NAME(m_last_shift2));
-	save_item(NAME(m_current_pitch));
-	save_item(NAME(m_last_frame));
 }
 
-
-void cinemat_state::sound_reset()
+void cinemat_audio_device::configure_latch_inputs(ls259_device &latch, u8 mask)
 {
-	/* reset shift register values */
-	m_current_shift = 0xffff;
-	m_last_shift = 0xffff;
-	m_last_shift2 = 0xffff;
-
-	/* reset frame counters */
-	m_last_frame = 0;
-
-	/* reset Star Castle pitch */
-	m_current_pitch = 0x10000;
+	if (mask == 0)
+		mask = m_inputs_mask;
+	if (BIT(mask, 0))
+		latch.q_out_cb<0>().set(write_line_delegate(*this, FUNC(cinemat_audio_device::sound_w<0>)));
+	if (BIT(mask, 1))
+		latch.q_out_cb<1>().set(write_line_delegate(*this, FUNC(cinemat_audio_device::sound_w<1>)));
+	if (BIT(mask, 2))
+		latch.q_out_cb<2>().set(write_line_delegate(*this, FUNC(cinemat_audio_device::sound_w<2>)));
+	if (BIT(mask, 3))
+		latch.q_out_cb<3>().set(write_line_delegate(*this, FUNC(cinemat_audio_device::sound_w<3>)));
+	if (BIT(mask, 4))
+		latch.q_out_cb<4>().set(write_line_delegate(*this, FUNC(cinemat_audio_device::sound_w<4>)));
+	if (BIT(mask, 7))
+		latch.q_out_cb<7>().set(write_line_delegate(*this, FUNC(cinemat_audio_device::sound_w<7>)));
 }
 
-
-
-/*************************************
- *
- *  Space Wars
- *
- *************************************/
-
-static const char *const spacewar_sample_names[] =
+void cinemat_audio_device::device_add_mconfig(machine_config &config)
 {
-	"*spacewar",
-	"explode1",
-	"fire1",
-	"idle",
-	"thrust1",
-	"thrust2",
-	"pop",
-	"explode2",
-	"fire2",
-	nullptr
-};
+	SPEAKER(config, "mono").front_center();
 
-WRITE_LINE_MEMBER(cinemat_state::spacewar_sound0_w)
-{
-	/* Explosion - rising edge */
-	if (state)
-		m_samples->start(0, (machine().rand() & 1) ? 0 : 6);
-}
+	if (m_netlist != nullptr)
+	{
+		NETLIST_SOUND(config, "sound_nl", 48000)
+			.set_source(m_netlist)
+			.add_route(ALL_OUTPUTS, "mono", 1.0);
 
-WRITE_LINE_MEMBER(cinemat_state::spacewar_sound1_w)
-{
-	/* Fire sound - rising edge */
-	if (state)
-		m_samples->start(1, (machine().rand() & 1) ? 1 : 7);
+		if ((m_inputs_mask & 0x01) != 0)
+			NETLIST_LOGIC_INPUT(config, m_out_input[0], "I_OUT_0.IN", 0);
+		if ((m_inputs_mask & 0x02) != 0)
+			NETLIST_LOGIC_INPUT(config, m_out_input[1], "I_OUT_1.IN", 0);
+		if ((m_inputs_mask & 0x04) != 0)
+			NETLIST_LOGIC_INPUT(config, m_out_input[2], "I_OUT_2.IN", 0);
+		if ((m_inputs_mask & 0x08) != 0)
+			NETLIST_LOGIC_INPUT(config, m_out_input[3], "I_OUT_3.IN", 0);
+		if ((m_inputs_mask & 0x10) != 0)
+			NETLIST_LOGIC_INPUT(config, m_out_input[4], "I_OUT_4.IN", 0);
+		if ((m_inputs_mask & 0x80) != 0)
+			NETLIST_LOGIC_INPUT(config, m_out_input[7], "I_OUT_7.IN", 0);
+
+		NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "OUTPUT").set_mult_offset(m_output_scale, 0.0);
+	}
 }
 
-WRITE_LINE_MEMBER(cinemat_state::spacewar_sound2_w)
+void cinemat_audio_device::device_start()
 {
-	/* Player 1 thrust - 0=on, 1=off */
-	if (!state)
-		m_samples->start(3, 3, true);
-	if (state)
-		m_samples->stop(3);
+#if ENABLE_NETLIST_LOGGING
+	m_logfile = fopen("cinemat.csv", "w");
+#endif
 }
 
-WRITE_LINE_MEMBER(cinemat_state::spacewar_sound3_w)
+void cinemat_audio_device::device_stop()
 {
-	/* Player 2 thrust - 0=on, 1-off */
-	if (!state)
-		m_samples->start(4, 4, true);
-	if (state)
-		m_samples->stop(4);
+#if ENABLE_NETLIST_LOGGING
+	if (m_logfile != nullptr)
+		fclose(m_logfile);
+#endif
 }
 
-WRITE_LINE_MEMBER(cinemat_state::spacewar_sound4_w)
+void cinemat_audio_device::input_set(int bit, int state)
 {
-	/* Mute - 0=off, 1=on */
-	if (!state)
-		m_samples->start(2, 2, true); /* play idle sound */
-	if (state)
+	u8 oldvals = m_inputs;
+	m_inputs = (m_inputs & ~(1 << bit)) | ((state & 1) << bit);
+	if (oldvals != m_inputs)
 	{
-		int i;
-
-		/* turn off all but the idle sound */
-		for (i = 0; i < 5; i++)
-			if (i != 2)
-				m_samples->stop(i);
-
-		/* Pop when board is shut off */
-		m_samples->start(2, 5);
+#if ENABLE_NETLIST_LOGGING
+		attotime time = machine().scheduler().time();
+		for (int bit = 0; bit < 8; bit++)
+			if (((m_inputs_mask >> bit) & 1) != 0)
+				if ((((m_inputs ^ oldvals) >> bit) & 1) != 0)
+					fprintf(m_logfile, "%s,I_OUT_%u.IN,%d\n", time.as_string(), bit, (m_inputs >> bit) & 1);
+#endif
+		for (int index = 0; index < 8; index++)
+			if (m_out_input[index] != nullptr)
+				m_out_input[index]->write_line(BIT(m_inputs, index));
 	}
 }
 
-void cinemat_state::spacewar_sound(machine_config &config)
-{
-	m_outlatch->q_out_cb<0>().set(FUNC(cinemat_state::spacewar_sound0_w));
-	m_outlatch->q_out_cb<1>().set(FUNC(cinemat_state::spacewar_sound1_w));
-	m_outlatch->q_out_cb<2>().set(FUNC(cinemat_state::spacewar_sound2_w));
-	m_outlatch->q_out_cb<3>().set(FUNC(cinemat_state::spacewar_sound3_w));
-	m_outlatch->q_out_cb<4>().set(FUNC(cinemat_state::spacewar_sound4_w));
-
-	SPEAKER(config, "mono").front_center();
-
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(8);
-	m_samples->set_samples_names(spacewar_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.50);
-}
 
 
 
 /*************************************
  *
- *  Barrier
+ *  Space Wars
  *
  *************************************/
 
-static const char *const barrier_sample_names[] =
-{
-	"*barrier",
-	"playrdie",
-	"playmove",
-	"enemmove",
-	nullptr
-};
+DEFINE_DEVICE_TYPE(SPACE_WARS_AUDIO, spacewar_audio_device, "spacewar_audio", "Space Wars Sound Board")
 
-WRITE_LINE_MEMBER(cinemat_state::barrier_sound0_w)
+spacewar_audio_device::spacewar_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cinemat_audio_device(mconfig, SPACE_WARS_AUDIO, tag, owner, clock, 0x1f, NETLIST_NAME(spacewar), 150000.0)
 {
-	/* Player die - rising edge */
-	if (state)
-		m_samples->start(0, 0);
 }
 
-WRITE_LINE_MEMBER(cinemat_state::barrier_sound1_w)
-{
-	/* Player move - falling edge */
-	if (!state)
-		m_samples->start(1, 1);
-}
 
-WRITE_LINE_MEMBER(cinemat_state::barrier_sound2_w)
-{
-	/* Enemy move - falling edge */
-	if (!state)
-		m_samples->start(2, 2);
-}
 
-void cinemat_state::barrier_sound(machine_config &config)
-{
-	m_outlatch->q_out_cb<0>().set(FUNC(cinemat_state::barrier_sound0_w));
-	m_outlatch->q_out_cb<1>().set(FUNC(cinemat_state::barrier_sound1_w));
-	m_outlatch->q_out_cb<2>().set(FUNC(cinemat_state::barrier_sound2_w));
+/*************************************
+ *
+ *  Barrier
+ *
+ *************************************/
 
-	SPEAKER(config, "mono").front_center();
+DEFINE_DEVICE_TYPE(BARRIER_AUDIO, barrier_audio_device, "barrier_audio", "Barrier Sound Board")
 
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(3);
-	m_samples->set_samples_names(barrier_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.50);
+barrier_audio_device::barrier_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cinemat_audio_device(mconfig, BARRIER_AUDIO, tag, owner, clock, 0x07, NETLIST_NAME(barrier), 200000.0)
+{
 }
 
 
@@ -223,53 +172,11 @@
  *
  *************************************/
 
-static const char *const speedfrk_sample_names[] =
-{
-	"*speedfrk",
-	"offroad",
-	nullptr
-};
-
-WRITE_LINE_MEMBER(cinemat_state::speedfrk_sound3_w)
-{
-	/* on the falling edge of bit 0x08, clock the inverse of bit 0x04 into the top of the shiftreg */
-	if (!state)
-	{
-		m_current_shift = ((m_current_shift >> 1) & 0x7fff) | ((~m_outlatch->q2_r() << 13) & 1);
-		/* high 12 bits control the frequency - counts from value to $FFF, carry triggers */
-		/* another counter */
-
-		/* low 4 bits control the volume of the noise output (explosion?) */
-	}
-}
-
-WRITE_LINE_MEMBER(cinemat_state::speedfrk_sound4_w)
-{
-	/* off-road - 1=on, 0=off */
-	if (state)
-		m_samples->start(0, 0, true);
-	if (!state)
-		m_samples->stop(0);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::speedfrk_start_led_w)
-{
-	/* start LED is controlled by bit 0x02 */
-	m_led = !state;
-}
+DEFINE_DEVICE_TYPE(SPEED_FREAK_AUDIO, speedfrk_audio_device, "speedfrk_audio", "Speed Freak Sound Board")
 
-void cinemat_state::speedfrk_sound(machine_config &config)
+speedfrk_audio_device::speedfrk_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cinemat_audio_device(mconfig, SPEED_FREAK_AUDIO, tag, owner, clock, 0x9f, NETLIST_NAME(speedfrk), 12000.0)
 {
-	m_outlatch->q_out_cb<1>().set(FUNC(cinemat_state::speedfrk_start_led_w));
-	m_outlatch->q_out_cb<3>().set(FUNC(cinemat_state::speedfrk_sound3_w));
-	m_outlatch->q_out_cb<4>().set(FUNC(cinemat_state::speedfrk_sound4_w));
-
-	SPEAKER(config, "mono").front_center();
-
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(1);
-	m_samples->set_samples_names(speedfrk_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.50);
 }
 
 
@@ -280,81 +187,11 @@
  *
  *************************************/
 
-static const char *const starhawk_sample_names[] =
-{
-	"*starhawk",
-	"explode",
-	"rlaser",
-	"llaser",
-	"k",
-	"master",
-	"kexit",
-	nullptr
-};
+DEFINE_DEVICE_TYPE(STAR_HAWK_AUDIO, starhawk_audio_device, "starhawk_audio", "Star Hawk Sound Board")
 
-WRITE_LINE_MEMBER(cinemat_state::starhawk_sound0_w)
+starhawk_audio_device::starhawk_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cinemat_audio_device(mconfig, STAR_HAWK_AUDIO, tag, owner, clock, 0x9f, NETLIST_NAME(starhawk), 50000.0)
 {
-	/* explosion - falling edge */
-	if (!state)
-		m_samples->start(0, 0);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::starhawk_sound1_w)
-{
-	/* right laser - falling edge */
-	if (!state)
-		m_samples->start(1, 1);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::starhawk_sound2_w)
-{
-	/* left laser - falling edge */
-	if (!state)
-		m_samples->start(2, 2);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::starhawk_sound3_w)
-{
-	/* K - 0=on, 1=off */
-	if (!state)
-		m_samples->start(3, 3, true);
-	if (state)
-		m_samples->stop(3);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::starhawk_sound4_w)
-{
-	/* master - 0=on, 1=off */
-	if (!state)
-		m_samples->start(4, 4, true);
-	if (state)
-		m_samples->stop(4);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::starhawk_sound7_w)
-{
-	/* K exit - 1=on, 0=off */
-	if (state && !m_outlatch->q3_r())
-		m_samples->start(3, 5, true);
-	if (!state)
-		m_samples->stop(3);
-}
-
-void cinemat_state::starhawk_sound(machine_config &config)
-{
-	m_outlatch->q_out_cb<0>().set(FUNC(cinemat_state::starhawk_sound0_w));
-	m_outlatch->q_out_cb<1>().set(FUNC(cinemat_state::starhawk_sound1_w));
-	m_outlatch->q_out_cb<2>().set(FUNC(cinemat_state::starhawk_sound2_w));
-	m_outlatch->q_out_cb<3>().set(FUNC(cinemat_state::starhawk_sound3_w));
-	m_outlatch->q_out_cb<4>().set(FUNC(cinemat_state::starhawk_sound4_w));
-	m_outlatch->q_out_cb<7>().set(FUNC(cinemat_state::starhawk_sound7_w));
-
-	SPEAKER(config, "mono").front_center();
-
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(5);
-	m_samples->set_samples_names(starhawk_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.50);
 }
 
 
@@ -365,75 +202,11 @@
  *
  *************************************/
 
-static const char *const sundance_sample_names[] =
-{
-	"*sundance",
-	"bong",
-	"whoosh",
-	"explsion",
-	"ping1",
-	"ping2",
-	"hatch",
-	nullptr
-};
-
-WRITE_LINE_MEMBER(cinemat_16level_state::sundance_sound0_w)
-{
-	/* bong - falling edge */
-	if (!state)
-		m_samples->start(0, 0);
-}
-
-WRITE_LINE_MEMBER(cinemat_16level_state::sundance_sound1_w)
-{
-	/* whoosh - falling edge */
-	if (!state)
-		m_samples->start(1, 1);
-}
-
-WRITE_LINE_MEMBER(cinemat_16level_state::sundance_sound2_w)
-{
-	/* explosion - falling edge */
-	if (!state)
-		m_samples->start(2, 2);
-}
-
-WRITE_LINE_MEMBER(cinemat_16level_state::sundance_sound3_w)
-{
-	/* ping - falling edge */
-	if (!state)
-		m_samples->start(3, 3);
-}
-
-WRITE_LINE_MEMBER(cinemat_16level_state::sundance_sound4_w)
-{
-	/* ping - falling edge */
-	if (!state)
-		m_samples->start(4, 4);
-}
-
-WRITE_LINE_MEMBER(cinemat_16level_state::sundance_sound7_w)
-{
-	/* hatch - falling edge */
-	if (!state)
-		m_samples->start(5, 5);
-}
+DEFINE_DEVICE_TYPE(SUNDANCE_AUDIO, sundance_audio_device, "sundance_audio", "Sundance Sound Board")
 
-void cinemat_16level_state::sundance_sound(machine_config &config)
+sundance_audio_device::sundance_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cinemat_audio_device(mconfig, SUNDANCE_AUDIO, tag, owner, clock, 0x9f, NETLIST_NAME(sundance), 45000.0)
 {
-	m_outlatch->q_out_cb<0>().set(FUNC(cinemat_16level_state::sundance_sound0_w));
-	m_outlatch->q_out_cb<1>().set(FUNC(cinemat_16level_state::sundance_sound1_w));
-	m_outlatch->q_out_cb<2>().set(FUNC(cinemat_16level_state::sundance_sound2_w));
-	m_outlatch->q_out_cb<3>().set(FUNC(cinemat_16level_state::sundance_sound3_w));
-	m_outlatch->q_out_cb<4>().set(FUNC(cinemat_16level_state::sundance_sound4_w));
-	m_outlatch->q_out_cb<7>().set(FUNC(cinemat_16level_state::sundance_sound7_w));
-
-	SPEAKER(config, "mono").front_center();
-
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(6);
-	m_samples->set_samples_names(sundance_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.50);
 }
 
 
@@ -444,74 +217,11 @@
  *
  *************************************/
 
-static const char *const tailg_sample_names[] =
-{
-	"*tailg",
-	"sexplode",
-	"thrust1",
-	"slaser",
-	"shield",
-	"bounce",
-	"hypersp",
-	nullptr
-};
-
-WRITE_LINE_MEMBER(cinemat_state::tailg_sound_w)
-{
-	/* the falling edge of bit 0x10 clocks bit 0x08 into the mux selected by bits 0x07 */
-	if (!state)
-	{
-		/* update the shift register (actually just a simple mux) */
-		m_current_shift = (m_current_shift & ~(1 << (m_outlatch->output_state() & 7))) | (m_outlatch->q3_r() << (m_outlatch->output_state() & 7));
-
-		/* explosion - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x01))
-			m_samples->start(0, 0);
-
-		/* rumble - 0=on, 1=off */
-		if (SHIFTREG_FALLING_EDGE(0x02))
-			m_samples->start(1, 1, true);
-		if (SHIFTREG_RISING_EDGE(0x02))
-			m_samples->stop(1);
-
-		/* laser - 0=on, 1=off */
-		if (SHIFTREG_FALLING_EDGE(0x04))
-			m_samples->start(2, 2, true);
-		if (SHIFTREG_RISING_EDGE(0x04))
-			m_samples->stop(2);
-
-		/* shield - 0=on, 1=off */
-		if (SHIFTREG_FALLING_EDGE(0x08))
-			m_samples->start(3, 3, true);
-		if (SHIFTREG_RISING_EDGE(0x08))
-			m_samples->stop(3);
-
-		/* bounce - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x10))
-			m_samples->start(4, 4);
-
-		/* hyperspace - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x20))
-			m_samples->start(5, 5);
-
-		/* LED */
-		m_led = BIT(m_current_shift, 6);
+DEFINE_DEVICE_TYPE(TAIL_GUNNER_AUDIO, tailg_audio_device, "tailg_audio", "Tail Gunner Sound Board")
 
-		/* remember the previous value */
-		m_last_shift = m_current_shift;
-	}
-}
-
-void cinemat_state::tailg_sound(machine_config &config)
+tailg_audio_device::tailg_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cinemat_audio_device(mconfig, TAIL_GUNNER_AUDIO, tag, owner, clock, 0x1f, NETLIST_NAME(tailg), 75000.0)
 {
-	m_outlatch->q_out_cb<4>().set(FUNC(cinemat_state::tailg_sound_w));
-
-	SPEAKER(config, "mono").front_center();
-
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(6);
-	m_samples->set_samples_names(tailg_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.50);
 }
 
 
@@ -522,70 +232,11 @@
  *
  *************************************/
 
-static const char *const warrior_sample_names[] =
-{
-	"*warrior",
-	"bgmhum1",
-	"bgmhum2",
-	"killed",
-	"fall",
-	"appear",
-	nullptr
-};
-
-WRITE_LINE_MEMBER(cinemat_state::warrior_sound0_w)
-{
-	/* normal level - 0=on, 1=off */
-	if (!state)
-		m_samples->start(0, 0, true);
-	if (state)
-		m_samples->stop(0);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::warrior_sound1_w)
-{
-	/* hi level - 0=on, 1=off */
-	if (!state)
-		m_samples->start(1, 1, true);
-	if (state)
-		m_samples->stop(1);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::warrior_sound2_w)
-{
-	/* explosion - falling edge */
-	if (!state)
-		m_samples->start(2, 2);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::warrior_sound3_w)
-{
-	/* fall - falling edge */
-	if (!state)
-		m_samples->start(3, 3);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::warrior_sound4_w)
-{
-	/* appear - falling edge */
-	if (!state)
-		m_samples->start(4, 4);
-}
+DEFINE_DEVICE_TYPE(WARRIOR_AUDIO, warrior_audio_device, "warrior_audio", "Warrior Sound Board")
 
-void cinemat_state::warrior_sound(machine_config &config)
+warrior_audio_device::warrior_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cinemat_audio_device(mconfig, WARRIOR_AUDIO, tag, owner, clock, 0x1f, NETLIST_NAME(warrior), 50000.0)
 {
-	m_outlatch->q_out_cb<0>().set(FUNC(cinemat_state::warrior_sound0_w));
-	m_outlatch->q_out_cb<1>().set(FUNC(cinemat_state::warrior_sound1_w));
-	m_outlatch->q_out_cb<2>().set(FUNC(cinemat_state::warrior_sound2_w));
-	m_outlatch->q_out_cb<3>().set(FUNC(cinemat_state::warrior_sound3_w));
-	m_outlatch->q_out_cb<4>().set(FUNC(cinemat_state::warrior_sound4_w));
-
-	SPEAKER(config, "mono").front_center();
-
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(5);
-	m_samples->set_samples_names(warrior_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.50);
 }
 
 
@@ -596,96 +247,11 @@
  *
  *************************************/
 
-static const char *const armora_sample_names[] =
-{
-	"*armora",
-	"loexp",
-	"jeepfire",
-	"hiexp",
-	"tankfire",
-	"tankeng",
-	"beep",
-	"chopper",
-	nullptr
-};
+DEFINE_DEVICE_TYPE(ARMOR_ATTACK_AUDIO, armora_audio_device, "armora_audio", "Armor Atrack Sound Board")
 
-WRITE_LINE_MEMBER(cinemat_state::armora_sound4_w)
+armora_audio_device::armora_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cinemat_audio_device(mconfig, ARMOR_ATTACK_AUDIO, tag, owner, clock, 0x9f, NETLIST_NAME(armora), 5000.0)
 {
-	/* on the rising edge of bit 0x10, clock bit 0x80 into the shift register */
-	if (state)
-		m_current_shift = ((m_current_shift >> 1) & 0x7f) | (m_outlatch->q7_r() << 7);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::armora_sound0_w)
-{
-	/* execute on the rising edge of bit 0x01 */
-	if (state)
-	{
-		/* bits 0-4 control the tank sound speed */
-
-		/* lo explosion - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x10))
-			m_samples->start(0, 0);
-
-		/* jeep fire - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x20))
-			m_samples->start(1, 1);
-
-		/* hi explosion - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x40))
-			m_samples->start(2, 2);
-
-		/* tank fire - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x80))
-			m_samples->start(3, 3);
-
-		/* remember the previous value */
-		m_last_shift = m_current_shift;
-	}
-}
-
-WRITE_LINE_MEMBER(cinemat_state::armora_sound1_w)
-{
-	/* tank sound - 0=on, 1=off */
-	/* still not totally correct - should be multiple speeds based on remaining bits in shift reg */
-	if (!state)
-		m_samples->start(4, 4, true);
-	if (state)
-		m_samples->stop(4);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::armora_sound2_w)
-{
-	/* beep sound - 0=on, 1=off */
-	if (!state)
-		m_samples->start(5, 5, true);
-	if (state)
-		m_samples->stop(5);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::armora_sound3_w)
-{
-	/* chopper sound - 0=on, 1=off */
-	if (!state)
-		m_samples->start(6, 6, true);
-	if (state)
-		m_samples->stop(6);
-}
-
-void cinemat_state::armora_sound(machine_config &config)
-{
-	m_outlatch->q_out_cb<0>().set(FUNC(cinemat_state::armora_sound0_w));
-	m_outlatch->q_out_cb<1>().set(FUNC(cinemat_state::armora_sound1_w));
-	m_outlatch->q_out_cb<2>().set(FUNC(cinemat_state::armora_sound2_w));
-	m_outlatch->q_out_cb<3>().set(FUNC(cinemat_state::armora_sound3_w));
-	m_outlatch->q_out_cb<4>().set(FUNC(cinemat_state::armora_sound4_w));
-
-	SPEAKER(config, "mono").front_center();
-
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(7);
-	m_samples->set_samples_names(armora_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.50);
 }
 
 
@@ -696,93 +262,11 @@
  *
  *************************************/
 
-static const char *const ripoff_sample_names[] =
-{
-	"*ripoff",
-	"bonuslvl",
-	"eattack",
-	"shipfire",
-	"efire",
-	"explosn",
-	"bg1",
-	"bg2",
-	"bg3",
-	"bg4",
-	"bg5",
-	"bg6",
-	"bg7",
-	"bg8",
-	nullptr
-};
-
-WRITE_LINE_MEMBER(cinemat_state::ripoff_sound1_w)
-{
-	/* on the rising edge of bit 0x02, clock bit 0x01 into the shift register */
-	if (state)
-		m_current_shift = ((m_current_shift >> 1) & 0x7f) | (m_outlatch->q0_r() << 7);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::ripoff_sound2_w)
-{
-	/* execute on the rising edge of bit 0x04 */
-	if (state)
-	{
-		/* background - 0=on, 1=off, selected by bits 0x38 */
-		if ((((m_current_shift ^ m_last_shift) & 0x38) && !(m_current_shift & 0x04)) || SHIFTREG_FALLING_EDGE(0x04))
-			m_samples->start(5, 5 + ((m_current_shift >> 5) & 7), true);
-		if (SHIFTREG_RISING_EDGE(0x04))
-			m_samples->stop(5);
-
-		/* beep - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x02))
-			m_samples->start(0, 0);
-
-		/* motor - 0=on, 1=off */
-		if (SHIFTREG_FALLING_EDGE(0x01))
-			m_samples->start(1, 1, true);
-		if (SHIFTREG_RISING_EDGE(0x01))
-			m_samples->stop(1);
-
-		/* remember the previous value */
-		m_last_shift = m_current_shift;
-	}
-}
-
-WRITE_LINE_MEMBER(cinemat_state::ripoff_sound3_w)
-{
-	/* torpedo - falling edge */
-	if (!state)
-		m_samples->start(2, 2);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::ripoff_sound4_w)
-{
-	/* laser - falling edge */
-	if (!state)
-		m_samples->start(3, 3);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::ripoff_sound7_w)
-{
-	/* explosion - falling edge */
-	if (!state)
-		m_samples->start(4, 4);
-}
+DEFINE_DEVICE_TYPE(RIPOFF_AUDIO, ripoff_audio_device, "ripoff_audio", "Rip Off Sound Board")
 
-void cinemat_state::ripoff_sound(machine_config &config)
+ripoff_audio_device::ripoff_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cinemat_audio_device(mconfig, RIPOFF_AUDIO, tag, owner, clock, 0x9f, NETLIST_NAME(ripoff), 20000.0)
 {
-	m_outlatch->q_out_cb<1>().set(FUNC(cinemat_state::ripoff_sound1_w));
-	m_outlatch->q_out_cb<2>().set(FUNC(cinemat_state::ripoff_sound2_w));
-	m_outlatch->q_out_cb<3>().set(FUNC(cinemat_state::ripoff_sound3_w));
-	m_outlatch->q_out_cb<4>().set(FUNC(cinemat_state::ripoff_sound4_w));
-	m_outlatch->q_out_cb<7>().set(FUNC(cinemat_state::ripoff_sound7_w));
-
-	SPEAKER(config, "mono").front_center();
-
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(6);
-	m_samples->set_samples_names(ripoff_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.50);
 }
 
 
@@ -793,113 +277,11 @@
  *
  *************************************/
 
-static const char *const starcas_sample_names[] =
-{
-	"*starcas",
-	"cfire",
-	"shield",
-	"star",
-	"thrust",
-	"drone",
-	"lexplode",
-	"sexplode",
-	"pfire",
-	nullptr
-};
-
-WRITE_LINE_MEMBER(cinemat_state::starcas_sound4_w)
-{
-	/* on the rising edge of bit 0x10, clock bit 0x80 into the shift register */
-	if (state)
-		m_current_shift = ((m_current_shift >> 1) & 0x7f) | (m_outlatch->q7_r() << 7);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::starcas_sound0_w)
-{
-	/* execute on the rising edge of bit 0x01 */
-	if (state)
-	{
-		/* fireball - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x80))
-			m_samples->start(0, 0);
-
-		/* shield hit - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x40))
-			m_samples->start(1, 1);
-
-		/* star sound - 0=off, 1=on */
-		if (SHIFTREG_RISING_EDGE(0x20))
-			m_samples->start(2, 2, true);
-		if (SHIFTREG_FALLING_EDGE(0x20))
-			m_samples->stop(2);
-
-		/* thrust sound - 1=off, 0=on*/
-		if (SHIFTREG_FALLING_EDGE(0x10))
-			m_samples->start(3, 3, true);
-		if (SHIFTREG_RISING_EDGE(0x10))
-			m_samples->stop(3);
-
-		/* drone - 1=off, 0=on */
-		if (SHIFTREG_FALLING_EDGE(0x08))
-			m_samples->start(4, 4, true);
-		if (SHIFTREG_RISING_EDGE(0x08))
-			m_samples->stop(4);
-
-		/* latch the drone pitch */
-		u32 target_pitch = (m_current_shift & 7) + ((m_current_shift & 2) << 2);
-		target_pitch = 0x5800 + (target_pitch << 12);
-
-		/* once per frame slide the pitch toward the target */
-		if (m_screen->frame_number() > m_last_frame)
-		{
-			if (m_current_pitch > target_pitch)
-				m_current_pitch -= 225;
-			if (m_current_pitch < target_pitch)
-				m_current_pitch += 150;
-			m_samples->set_frequency(4, m_current_pitch);
-			m_last_frame = m_screen->frame_number();
-		}
-
-		/* remember the previous value */
-		m_last_shift = m_current_shift;
-	}
-}
-
-WRITE_LINE_MEMBER(cinemat_state::starcas_sound1_w)
-{
-	/* loud explosion - falling edge */
-	if (!state)
-		m_samples->start(5, 5);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::starcas_sound2_w)
-{
-	/* soft explosion - falling edge */
-	if (!state)
-		m_samples->start(6, 6);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::starcas_sound3_w)
-{
-	/* player fire - falling edge */
-	if (!state)
-		m_samples->start(7, 7);
-}
+DEFINE_DEVICE_TYPE(STAR_CASTLE_AUDIO, starcas_audio_device, "starcas_audio", "Star Castle Sound Board")
 
-void cinemat_state::starcas_sound(machine_config &config)
+starcas_audio_device::starcas_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cinemat_audio_device(mconfig, STAR_CASTLE_AUDIO, tag, owner, clock, 0x9f, NETLIST_NAME(starcas), 5000.0)
 {
-	m_outlatch->q_out_cb<0>().set(FUNC(cinemat_state::starcas_sound0_w));
-	m_outlatch->q_out_cb<1>().set(FUNC(cinemat_state::starcas_sound1_w));
-	m_outlatch->q_out_cb<2>().set(FUNC(cinemat_state::starcas_sound2_w));
-	m_outlatch->q_out_cb<3>().set(FUNC(cinemat_state::starcas_sound3_w));
-	m_outlatch->q_out_cb<4>().set(FUNC(cinemat_state::starcas_sound4_w));
-
-	SPEAKER(config, "mono").front_center();
-
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(8);
-	m_samples->set_samples_names(starcas_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.5);
 }
 
 
@@ -910,128 +292,11 @@
  *
  *************************************/
 
-static const char *const solarq_sample_names[] =
-{
-	"*solarq",
-	"bigexpl",
-	"smexpl",
-	"lthrust",
-	"slaser",
-	"pickup",
-	"nuke2",
-	"nuke1",
-	"music",
-	nullptr
-};
-
-WRITE_LINE_MEMBER(cinemat_64level_state::solarq_sound4_w)
-{
-	/* on the rising edge of bit 0x10, clock bit 0x80 into the shift register */
-	if (state)
-		m_current_shift = ((m_current_shift >> 1) & 0x7fff) | (m_outlatch->q7_r() << 15);
-}
-
-WRITE_LINE_MEMBER(cinemat_64level_state::solarq_sound1_w)
-{
-	/* execute on the rising edge of bit 0x02 */
-	if (state)
-	{
-		/* only the upper 8 bits matter */
-		m_current_shift >>= 8;
-
-		/* loud explosion - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x80))
-			m_samples->start(0, 0);
-
-		/* soft explosion - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x40))
-			m_samples->start(1, 1);
-
-		/* thrust - 0=on, 1=off */
-		if (SHIFTREG_FALLING_EDGE(0x20))
-		{
-			m_target_volume = 1.0;
-			if (!m_samples->playing(2))
-				m_samples->start(2, 2, true);
-		}
-		if (SHIFTREG_RISING_EDGE(0x20))
-			m_target_volume = 0;
-
-		/* ramp the thrust volume */
-		if (m_samples->playing(2) && m_screen->frame_number() > m_last_frame)
-		{
-			if (m_current_volume > m_target_volume)
-				m_current_volume -= 0.078f;
-			if (m_current_volume < m_target_volume)
-				m_current_volume += 0.078f;
-			if (m_current_volume > 0)
-				m_samples->set_volume(2, m_current_volume);
-			else
-				m_samples->stop(2);
-			m_last_frame = m_screen->frame_number();
-		}
-
-		/* fire - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x10))
-			m_samples->start(3, 3);
-
-		/* capture - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x08))
-			m_samples->start(4, 4);
-
-		/* nuke - 1=on, 0=off */
-		if (SHIFTREG_RISING_EDGE(0x04))
-			m_samples->start(5, 5, true);
-		if (SHIFTREG_FALLING_EDGE(0x04))
-			m_samples->stop(5);
-
-		/* photon - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x02))
-			m_samples->start(6, 6);
-
-		/* remember the previous value */
-		m_last_shift = m_current_shift;
-	}
-}
-
-WRITE_LINE_MEMBER(cinemat_64level_state::solarq_sound0_w)
-{
-	/* clock music data on the rising edge of bit 0x01 */
-	if (state)
-	{
-		int freq, vol;
+DEFINE_DEVICE_TYPE(SOLAR_QUEST_AUDIO, solarq_audio_device, "solarq_audio", "Solar Quest Sound Board")
 
-		/* start/stop the music sample on the high bit */
-		if (SHIFTREG2_RISING_EDGE(0x8000))
-			m_samples->start(7, 7, true);
-		if (SHIFTREG2_FALLING_EDGE(0x8000))
-			m_samples->stop(7);
-
-		/* set the frequency */
-		freq = 56818.181818 / (4096 - (m_current_shift & 0xfff));
-		m_samples->set_frequency(7, 44100 * freq / 1050);
-
-		/* set the volume */
-		vol = (~m_current_shift >> 12) & 7;
-		m_samples->set_volume(7, vol / 7.0);
-
-		/* remember the previous value */
-		m_last_shift2 = m_current_shift;
-	}
-}
-
-void cinemat_64level_state::solarq_sound(machine_config &config)
+solarq_audio_device::solarq_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cinemat_audio_device(mconfig, SOLAR_QUEST_AUDIO, tag, owner, clock, 0x9f, NETLIST_NAME(solarq), 5000.0)
 {
-	m_outlatch->q_out_cb<0>().set(FUNC(cinemat_64level_state::solarq_sound0_w));
-	m_outlatch->q_out_cb<1>().set(FUNC(cinemat_64level_state::solarq_sound1_w));
-	m_outlatch->q_out_cb<4>().set(FUNC(cinemat_64level_state::solarq_sound4_w));
-
-	SPEAKER(config, "mono").front_center();
-
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(8);
-	m_samples->set_samples_names(solarq_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.5);
 }
 
 
@@ -1042,136 +307,11 @@
  *
  *************************************/
 
-static const char *const boxingb_sample_names[] =
-{
-	"*boxingb",
-	"softexpl",
-	"loudexpl",
-	"chirp",
-	"eggcrack",
-	"bugpusha",
-	"bugpushb",
-	"bugdie",
-	"beetle",
-	"music",
-	"cannon",
-	"bounce",
-	"bell",
-	nullptr
-};
-
-WRITE_LINE_MEMBER(cinemat_color_state::boxingb_sound4_w)
-{
-	/* on the rising edge of bit 0x10, clock bit 0x80 into the shift register */
-	if (state)
-		m_current_shift = ((m_current_shift >> 1) & 0x7fff) | (m_outlatch->q7_r() << 15);
-}
-
-WRITE_LINE_MEMBER(cinemat_color_state::boxingb_sound1_w)
-{
-	/* execute on the rising edge of bit 0x02 */
-	if (state)
-	{
-		/* only the upper 8 bits matter */
-		m_current_shift >>= 8;
-
-		/* soft explosion - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x80))
-			m_samples->start(0, 0);
-
-		/* loud explosion - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x40))
-			m_samples->start(1, 1);
-
-		/* chirping birds - 0=on, 1=off */
-		if (SHIFTREG_FALLING_EDGE(0x20))
-			m_samples->start(2, 2);
-		if (SHIFTREG_RISING_EDGE(0x20))
-			m_samples->stop(2);
-
-		/* egg cracking - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x10))
-			m_samples->start(3, 3);
-
-		/* bug pushing A - rising edge */
-		if (SHIFTREG_RISING_EDGE(0x08))
-			m_samples->start(4, 4);
-
-		/* bug pushing B - rising edge */
-		if (SHIFTREG_RISING_EDGE(0x04))
-			m_samples->start(5, 5);
-
-		/* bug dying - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x02))
-			m_samples->start(6, 6);
-
-		/* beetle on screen - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x01))
-			m_samples->start(7, 7);
-
-		/* remember the previous value */
-		m_last_shift = m_current_shift;
-	}
-}
-
-WRITE_LINE_MEMBER(cinemat_color_state::boxingb_sound0_w)
-{
-	/* clock music data on the rising edge of bit 0x01 */
-	if (state)
-	{
-		int freq, vol;
-
-		/* start/stop the music sample on the high bit */
-		if (SHIFTREG2_RISING_EDGE(0x8000))
-			m_samples->start(8, 8, true);
-		if (SHIFTREG2_FALLING_EDGE(0x8000))
-			m_samples->stop(8);
-
-		/* set the frequency */
-		freq = 56818.181818 / (4096 - (m_current_shift & 0xfff));
-		m_samples->set_frequency(8, 44100 * freq / 1050);
-
-		/* set the volume */
-		vol = (~m_current_shift >> 12) & 3;
-		m_samples->set_volume(8, vol / 3.0);
-
-		/* cannon - falling edge */
-		if (SHIFTREG2_RISING_EDGE(0x4000))
-			m_samples->start(9, 9);
-
-		/* remember the previous value */
-		m_last_shift2 = m_current_shift;
-	}
-}
-
-WRITE_LINE_MEMBER(cinemat_color_state::boxingb_sound2_w)
-{
-	/* bounce - rising edge */
-	if (state)
-		m_samples->start(10, 10);
-}
-
-WRITE_LINE_MEMBER(cinemat_color_state::boxingb_sound3_w)
-{
-	/* bell - falling edge */
-	if (state)
-		m_samples->start(11, 11);
-}
+DEFINE_DEVICE_TYPE(BOXING_BUGS_AUDIO, boxingb_audio_device, "boxingb_audio", "Boxing Bugs Sound Board")
 
-void cinemat_color_state::boxingb_sound(machine_config &config)
+boxingb_audio_device::boxingb_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cinemat_audio_device(mconfig, BOXING_BUGS_AUDIO, tag, owner, clock, 0x9f, NETLIST_NAME(boxingb), 5000.0)
 {
-	m_outlatch->q_out_cb<0>().set(FUNC(cinemat_color_state::boxingb_sound0_w));
-	m_outlatch->q_out_cb<1>().set(FUNC(cinemat_color_state::boxingb_sound1_w));
-	m_outlatch->q_out_cb<2>().set(FUNC(cinemat_color_state::boxingb_sound2_w));
-	m_outlatch->q_out_cb<3>().set(FUNC(cinemat_color_state::boxingb_sound3_w));
-	m_outlatch->q_out_cb<4>().set(FUNC(cinemat_color_state::boxingb_sound4_w));
-
-	SPEAKER(config, "mono").front_center();
-
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(12);
-	m_samples->set_samples_names(boxingb_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.50);
 }
 
 
@@ -1182,113 +322,11 @@
  *
  *************************************/
 
-static const char *const wotw_sample_names[] =
-{
-	"*wotw",
-	"cfire",
-	"shield",
-	"star",
-	"thrust",
-	"drone",
-	"lexplode",
-	"sexplode",
-	"pfire",
-	nullptr
-};
-
-WRITE_LINE_MEMBER(cinemat_state::wotw_sound4_w)
-{
-	/* on the rising edge of bit 0x10, clock bit 0x80 into the shift register */
-	if (state)
-		m_current_shift = ((m_current_shift >> 1) & 0x7f) | (m_outlatch->q7_r() << 7);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::wotw_sound0_w)
-{
-	/* execute on the rising edge of bit 0x01 */
-	if (state)
-	{
-		/* fireball - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x80))
-			m_samples->start(0, 0);
-
-		/* shield hit - falling edge */
-		if (SHIFTREG_FALLING_EDGE(0x40))
-			m_samples->start(1, 1);
-
-		/* star sound - 0=off, 1=on */
-		if (SHIFTREG_RISING_EDGE(0x20))
-			m_samples->start(2, 2, true);
-		if (SHIFTREG_FALLING_EDGE(0x20))
-			m_samples->stop(2);
-
-		/* thrust sound - 1=off, 0=on*/
-		if (SHIFTREG_FALLING_EDGE(0x10))
-			m_samples->start(3, 3, true);
-		if (SHIFTREG_RISING_EDGE(0x10))
-			m_samples->stop(3);
-
-		/* drone - 1=off, 0=on */
-		if (SHIFTREG_FALLING_EDGE(0x08))
-			m_samples->start(4, 4, true);
-		if (SHIFTREG_RISING_EDGE(0x08))
-			m_samples->stop(4);
-
-		/* latch the drone pitch */
-		u32 target_pitch = (m_current_shift & 7) + ((m_current_shift & 2) << 2);
-		target_pitch = 0x10000 + (target_pitch << 12);
-
-		/* once per frame slide the pitch toward the target */
-		if (m_screen->frame_number() > m_last_frame)
-		{
-			if (m_current_pitch > target_pitch)
-				m_current_pitch -= 300;
-			if (m_current_pitch < target_pitch)
-				m_current_pitch += 200;
-			m_samples->set_frequency(4, m_current_pitch);
-			m_last_frame = m_screen->frame_number();
-		}
-
-		/* remember the previous value */
-		m_last_shift = m_current_shift;
-	}
-}
-
-WRITE_LINE_MEMBER(cinemat_state::wotw_sound1_w)
-{
-	/* loud explosion - falling edge */
-	if (!state)
-		m_samples->start(5, 5);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::wotw_sound2_w)
-{
-	/* soft explosion - falling edge */
-	if (!state)
-		m_samples->start(6, 6);
-}
-
-WRITE_LINE_MEMBER(cinemat_state::wotw_sound3_w)
-{
-	/* player fire - falling edge */
-	if (!state)
-		m_samples->start(7, 7);
-}
+DEFINE_DEVICE_TYPE(WAR_OF_THE_WORLDS_AUDIO, wotw_audio_device, "wotw_audio", "War of the Worlds Sound Board")
 
-void cinemat_state::wotw_sound(machine_config &config)
+wotw_audio_device::wotw_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cinemat_audio_device(mconfig, WAR_OF_THE_WORLDS_AUDIO, tag, owner, clock, 0x9f, NETLIST_NAME(wotw), 5000.0)
 {
-	m_outlatch->q_out_cb<0>().set(FUNC(cinemat_state::wotw_sound0_w));
-	m_outlatch->q_out_cb<1>().set(FUNC(cinemat_state::wotw_sound1_w));
-	m_outlatch->q_out_cb<2>().set(FUNC(cinemat_state::wotw_sound2_w));
-	m_outlatch->q_out_cb<3>().set(FUNC(cinemat_state::wotw_sound3_w));
-	m_outlatch->q_out_cb<4>().set(FUNC(cinemat_state::wotw_sound4_w));
-
-	SPEAKER(config, "mono").front_center();
-
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(8);
-	m_samples->set_samples_names(wotw_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.50);
 }
 
 
@@ -1314,20 +352,20 @@
 }
 
 
-uint8_t demon_state::sound_porta_r()
+u8 demon_state::sound_porta_r()
 {
 	/* bits 0-3 are the sound data; bit 4 is the data ready */
 	return m_sound_fifo[m_sound_fifo_out] | ((m_sound_fifo_in != m_sound_fifo_out) << 4);
 }
 
 
-uint8_t demon_state::sound_portb_r()
+u8 demon_state::sound_portb_r()
 {
 	return m_last_portb_write;
 }
 
 
-void demon_state::sound_portb_w(uint8_t data)
+void demon_state::sound_portb_w(u8 data)
 {
 	/* watch for a 0->1 edge on bit 0 ("shift out") to advance the data pointer */
 	if ((data & 1) != (m_last_portb_write & 1) && (data & 1) != 0)
@@ -1345,7 +383,7 @@
 	m_last_portb_write = data;
 }
 
-void demon_state::sound_output_w(uint8_t data)
+void demon_state::sound_output_w(u8 data)
 {
 	logerror("sound_output = %02X\n", data);
 }
@@ -1442,9 +480,9 @@
  *
  *************************************/
 
-void qb3_state::qb3_sound_fifo_w(uint8_t data)
+void qb3_state::qb3_sound_fifo_w(u8 data)
 {
-	uint16_t rega = m_maincpu->state_int(ccpu_cpu_device::CCPU_A);
+	u16 rega = m_maincpu->state_int(ccpu_cpu_device::CCPU_A);
 	machine().scheduler().synchronize(timer_expired_delegate(FUNC(qb3_state::synced_sound_w), this), rega & 0x0f);
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/audio/cinemat.h mame-0.224+dfsg.1/src/mame/audio/cinemat.h
--- mame-0.222+dfsg.1/src/mame/audio/cinemat.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/cinemat.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,151 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_CINEMAT_H
+#define MAME_AUDIO_CINEMAT_H
+
+#pragma once
+
+#include "machine/74259.h"
+#include "machine/netlist.h"
+#include "netlist/nl_setup.h"
+
+// log to cinemat.csv for nltool playback/analysis
+#define ENABLE_NETLIST_LOGGING      (0)
+
+
+class cinemat_audio_device : public device_t
+{
+public:
+	cinemat_audio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 inputs_mask, void (*netlist)(netlist::nlparse_t &), double output_scale);
+
+	void configure_latch_inputs(ls259_device &latch, u8 mask = 0);
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+	virtual void device_stop() override;
+
+	template<int _Index> DECLARE_WRITE_LINE_MEMBER(sound_w) { input_set(_Index, state); }
+	void input_set(int bit, int state);
+
+	optional_device_array<netlist_mame_logic_input_device, 8> m_out_input;
+
+private:
+	u8 m_inputs = 0xff;
+	u8 m_inputs_mask = 0xff;
+	void (*m_netlist)(netlist::nlparse_t &) = nullptr;
+	double m_output_scale = 0;
+
+#if ENABLE_NETLIST_LOGGING
+	FILE *m_logfile = nullptr;
+#endif
+
+};
+
+
+class spacewar_audio_device : public cinemat_audio_device
+{
+public:
+	spacewar_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class barrier_audio_device : public cinemat_audio_device
+{
+public:
+	barrier_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class speedfrk_audio_device : public cinemat_audio_device
+{
+public:
+	speedfrk_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class starhawk_audio_device : public cinemat_audio_device
+{
+public:
+	starhawk_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class sundance_audio_device : public cinemat_audio_device
+{
+public:
+	sundance_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class tailg_audio_device : public cinemat_audio_device
+{
+public:
+	tailg_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class warrior_audio_device : public cinemat_audio_device
+{
+public:
+	warrior_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class armora_audio_device : public cinemat_audio_device
+{
+public:
+	armora_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class ripoff_audio_device : public cinemat_audio_device
+{
+public:
+	ripoff_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class starcas_audio_device : public cinemat_audio_device
+{
+public:
+	starcas_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class solarq_audio_device : public cinemat_audio_device
+{
+public:
+	solarq_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class boxingb_audio_device : public cinemat_audio_device
+{
+public:
+	boxingb_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class wotw_audio_device : public cinemat_audio_device
+{
+public:
+	wotw_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+DECLARE_DEVICE_TYPE(SPACE_WARS_AUDIO, spacewar_audio_device)
+DECLARE_DEVICE_TYPE(BARRIER_AUDIO, barrier_audio_device)
+DECLARE_DEVICE_TYPE(STAR_HAWK_AUDIO, starhawk_audio_device)
+DECLARE_DEVICE_TYPE(SUNDANCE_AUDIO, sundance_audio_device)
+DECLARE_DEVICE_TYPE(SPEED_FREAK_AUDIO, speedfrk_audio_device)
+DECLARE_DEVICE_TYPE(TAIL_GUNNER_AUDIO, tailg_audio_device)
+DECLARE_DEVICE_TYPE(WARRIOR_AUDIO, warrior_audio_device)
+DECLARE_DEVICE_TYPE(ARMOR_ATTACK_AUDIO, armora_audio_device)
+DECLARE_DEVICE_TYPE(RIPOFF_AUDIO, ripoff_audio_device)
+DECLARE_DEVICE_TYPE(SOLAR_QUEST_AUDIO, solarq_audio_device)
+DECLARE_DEVICE_TYPE(BOXING_BUGS_AUDIO, boxingb_audio_device)
+DECLARE_DEVICE_TYPE(STAR_CASTLE_AUDIO, starcas_audio_device)
+DECLARE_DEVICE_TYPE(WAR_OF_THE_WORLDS_AUDIO, wotw_audio_device)
+
+#endif // MAME_AUDIO_CINEMAT_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/cmi01a.cpp mame-0.224+dfsg.1/src/mame/audio/cmi01a.cpp
--- mame-0.222+dfsg.1/src/mame/audio/cmi01a.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/cmi01a.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -8,19 +8,87 @@
 
 #include "emu.h"
 #include "audio/cmi01a.h"
-#include "machine/input_merger.h"
 
 #define VERBOSE     (0)
 #include "logmacro.h"
 
 #define MASTER_OSCILLATOR       XTAL(34'291'712)
 
-
 DEFINE_DEVICE_TYPE(CMI01A_CHANNEL_CARD, cmi01a_device, "cmi_01a", "Fairlight CMI-01A Channel Card")
 
+
+const uint8_t cmi01a_device::s_7497_rate_table[64][64] =
+{
+	{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
+	{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
+	{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
+	{1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1},
+	{1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1},
+	{1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1},
+	{1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1},
+	{1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,1},
+	{1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1},
+	{1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1},
+	{1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1},
+	{1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,1},
+	{1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1},
+	{1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1},
+	{1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1},
+	{1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,1},
+	{1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1},
+	{1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1},
+	{1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1},
+	{1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,1},
+	{1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1},
+	{1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1},
+	{1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1},
+	{1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,1},
+	{1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1},
+	{1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1},
+	{1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1},
+	{1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,1},
+	{1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1},
+	{1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1},
+	{1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1},
+	{1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1},
+	{0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1},
+	{0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1},
+	{0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1},
+	{0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1},
+	{0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1},
+	{0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1},
+	{0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1},
+	{0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,1},
+	{0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1},
+	{0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1},
+	{0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1},
+	{0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,1},
+	{0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1},
+	{0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1},
+	{0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1},
+	{0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,1},
+	{0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1},
+	{0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1},
+	{0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1},
+	{0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,1},
+	{0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1},
+	{0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1},
+	{0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1},
+	{0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,1},
+	{0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1},
+	{0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1},
+	{0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1},
+	{0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,1},
+	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
+	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
+	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1},
+	{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1}
+};
+
 cmi01a_device::cmi01a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, CMI01A_CHANNEL_CARD, tag, owner, clock)
 	, device_sound_interface(mconfig, *this)
+	, m_irq_merger(*this, "cmi01a_irq")
 	, m_pia(*this, "cmi01a_pia_%u", 0U)
 	, m_ptm(*this, "cmi01a_ptm")
 	, m_cmi02_pia(*this, "^cmi02_pia_%u", 1U)
@@ -33,49 +101,61 @@
 {
 	PIA6821(config, m_pia[0], 0); // pia_cmi01a_1_config
 	m_pia[0]->readcb1_handler().set(FUNC(cmi01a_device::tri_r));
+	m_pia[0]->readpa_handler().set(FUNC(cmi01a_device::ws_dir_r));
 	m_pia[0]->writepa_handler().set(FUNC(cmi01a_device::ws_dir_w));
 	m_pia[0]->writepb_handler().set(FUNC(cmi01a_device::rp_w));
-	m_pia[0]->ca2_handler().set(FUNC(cmi01a_device::pia_0_ca2_w));
+	m_pia[0]->ca2_handler().set(FUNC(cmi01a_device::load_w));
 	m_pia[0]->cb2_handler().set(FUNC(cmi01a_device::pia_0_cb2_w));
-	m_pia[0]->irqa_handler().set("cmi01a_irq", FUNC(input_merger_device::in_w<0>));
-	m_pia[0]->irqb_handler().set("cmi01a_irq", FUNC(input_merger_device::in_w<1>));
+	m_pia[0]->irqa_handler().set(m_irq_merger, FUNC(input_merger_device::in_w<0>));
+	m_pia[0]->irqb_handler().set(m_irq_merger, FUNC(input_merger_device::in_w<1>));
+	//if (m_channel == 5) m_pia[0]->enable_logging();
 
 	PIA6821(config, m_pia[1], 0); // pia_cmi01a_2_config
 	m_pia[1]->readca1_handler().set(FUNC(cmi01a_device::zx_r));
-	m_pia[1]->readca2_handler().set(FUNC(cmi01a_device::eosi_r));
+	m_pia[1]->readcb1_handler().set(FUNC(cmi01a_device::eosi_r));
+	m_pia[1]->readpa_handler().set(FUNC(cmi01a_device::pia_1_a_r));
 	m_pia[1]->writepa_handler().set(FUNC(cmi01a_device::pia_1_a_w));
 	m_pia[1]->writepb_handler().set(FUNC(cmi01a_device::pia_1_b_w));
-	m_pia[1]->irqa_handler().set("cmi01a_irq", FUNC(input_merger_device::in_w<2>));
-	m_pia[1]->irqb_handler().set("cmi01a_irq", FUNC(input_merger_device::in_w<3>));
+	m_pia[1]->ca2_handler().set(FUNC(cmi01a_device::eload_w));
+	m_pia[1]->cb2_handler().set(FUNC(cmi01a_device::wpe_w));
+	m_pia[1]->irqa_handler().set(m_irq_merger, FUNC(input_merger_device::in_w<2>));
+	m_pia[1]->irqb_handler().set(m_irq_merger, FUNC(input_merger_device::in_w<3>));
+	//if (m_channel == 5) m_pia[1]->enable_logging();
 
 	PTM6840(config, m_ptm, DERIVED_CLOCK(1, 1)); // ptm_cmi01a_config
 	m_ptm->o1_callback().set(FUNC(cmi01a_device::ptm_o1));
-	m_ptm->irq_callback().set("cmi01a_irq", FUNC(input_merger_device::in_w<4>));
+	m_ptm->o2_callback().set(FUNC(cmi01a_device::ptm_o2));
+	m_ptm->o3_callback().set(FUNC(cmi01a_device::ptm_o3));
+	m_ptm->irq_callback().set(FUNC(cmi01a_device::ptm_irq));
 
-	INPUT_MERGER_ANY_HIGH(config, "cmi01a_irq").output_handler().set(FUNC(cmi01a_device::cmi01a_irq));
+	INPUT_MERGER_ANY_HIGH(config, m_irq_merger).output_handler().set(FUNC(cmi01a_device::cmi01a_irq));
 }
 
 
 void cmi01a_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
 {
-	if (m_active && m_vol_latch)
+	if (m_run)
 	{
-		int length = samples;
-		int seg_addr = m_segment_cnt & 0x7f;
+		int mask = m_load ? 0x7fff : 0x7f;
+		int addr = m_segment_cnt;
+
 		uint8_t *wave_ptr = &m_wave_ram[m_segment_cnt & 0x3fff];
 		stream_sample_t *buf = outputs[0];
 
-		while (length--)
+		while (samples--)
 		{
-			*buf++ = wave_ptr[seg_addr];
-			seg_addr = (seg_addr + 1) & 0x7f;
+			const uint8_t sample8 = wave_ptr[addr++ & 0x3fff];
+			int32_t sample = (int32_t)(int8_t)(sample8 ^ 0x80) * m_env * m_vol_latch;
+			if (m_channel == 5) printf("%08x:%02x:%02x:%02x", (uint32_t)sample, sample8, m_env, m_vol_latch);
+			*buf++ = (int16_t)(sample >> 8);
 		}
+		if (m_channel == 5) printf("\n");
 
-		m_segment_cnt = (m_segment_cnt & ~0x7f) | seg_addr;
+		m_segment_cnt = (m_segment_cnt & ~mask) | addr;
 	}
 	else
 	{
-		memset(outputs[0], 0, samples);
+		memset(outputs[0], 0, samples * sizeof(stream_sample_t));
 	}
 }
 
@@ -89,11 +169,17 @@
 	m_wave_ram = std::make_unique<uint8_t[]>(0x4000);
 
 	m_zx_timer = timer_alloc(TIMER_ZX);
+	m_eosi_timer = timer_alloc(TIMER_EOSI);
+	m_bcas_timer = timer_alloc(TIMER_BCAS);
+
 	m_zx_timer->adjust(attotime::never);
+	m_eosi_timer->adjust(attotime::never);
 
 	m_stream = stream_alloc(0, 1, 44100);
 
 	m_ptm->set_external_clocks(clock() / 8, clock() / 4, clock() / 4);
+
+
 }
 
 void cmi01a_device::device_reset()
@@ -104,55 +190,151 @@
 
 	m_segment_cnt = 0;
 	m_new_addr = 0;
-	m_env_dir_ctrl = 0;
 	m_vol_latch = 0;
 	m_flt_latch = 0;
 	m_rp = 0;
 	m_ws = 0;
 	m_dir = 0;
+	m_env = 0;
+	m_pia0_cb2_state = 1;
+	m_bcas_q1_ticks = 2;
+	m_bcas_q1 = 0;
+	m_bcas_q2_ticks = 4;
+	m_bcas_q2 = 0;
+	m_zx_flag = 0;
 
 	m_freq = 0.0;
-	m_active = false;
 
 	m_ptm_o1 = 0;
+	m_ptm_o2 = 0;
+	m_ptm_o3 = 0;
+
+	m_load = true;
+	m_run = false;
+	m_gzx = true;
+	m_nwpe = true;
+	m_tri = true;
+	m_pia1_ca2 = false;
+
+	m_eclk = false;
+	m_env_clk = false;
+	m_ediv_out = true;
+	m_ediv_rate = 3;
+	m_ediv_count = 0;
+
+	m_pitch = 0;
+	m_octave = 0;
+
+	m_zx_timer->adjust(attotime::never);
+	m_eosi_timer->adjust(attotime::never);
+	//m_bcas_timer->adjust(attotime::from_hz(clock()), 0, attotime::from_hz(clock()));
+	m_bcas_timer->adjust(attotime::never);
+}
+
+void cmi01a_device::pulse_zcint()
+{
+	m_pia[0]->ca1_w(0);
+	m_pia[0]->ca1_w(1);
+
+	pulse_gzx();
 }
 
-WRITE_LINE_MEMBER( cmi01a_device::pia_0_ca2_w )
+void cmi01a_device::pulse_gzx()
 {
-	// update_stream()
-	if (!state)
+	if (!m_pia1_ca2)
 	{
-		m_segment_cnt = 0x4000 | ((m_pia[0]->a_output() & 0x7f) << 7);
-		m_new_addr = 1;
-		m_pia[1]->cb1_w(1);
+		return;
+	}
+
+	reset_waveform_segment();
+	m_env = m_rp;
+	m_env_dir = m_dir;
+}
+
+void cmi01a_device::reset_waveform_segment()
+{
+	m_segment_cnt &= 0x007f;
+	m_segment_cnt = 0x4000 | (m_ws << 7);
+}
+
+void cmi01a_device::load_w(int state)
+{
+	const bool old_load = m_load;
+	m_load = state ? false : true;
+
+	if (old_load != m_load)
+	{
+		check_segment_load();
+	}
+}
+
+void cmi01a_device::check_segment_load()
+{
+	bool run_strobe = false;
+	if (m_load != m_run)
+	{
+		run_strobe = true;
+		m_segment_cnt &= ~0x7f;
 	}
+
+	if (!run_strobe)
+	{
+		return;
+	}
+
+	if (!m_nwpe)
+	{
+		reset_waveform_segment();
+	}
+
+	if (m_channel == 5) LOG("CH%d beginning load with m_segment_cnt %04x\n", m_channel, m_segment_cnt);
+	m_pia[1]->cb1_w(1);
 }
 
 void cmi01a_device::pia_1_a_w(uint8_t data)
 {
-// top two
+	m_pitch &= 0x0ff;
+	m_pitch |= (data & 3) << 8;
+	m_octave = (data >> 2) & 0x0f;
+}
+
+uint8_t cmi01a_device::pia_1_a_r()
+{
+	return ((m_pitch >> 8) & 3) | (m_octave << 2);
 }
 
 void cmi01a_device::pia_1_b_w(uint8_t data)
 {
+	m_pitch &= 0xf00;
+	m_pitch |= data;
 }
 
 void cmi01a_device::rp_w(uint8_t data)
 {
 	m_rp = data;
+	m_ediv_rate = ((m_rp >> 2) & 0x3c) | 0x03;
+	if (m_channel == 5) LOG("CH%d: Initial ramp value: %02x, EDIV divider: %02x\n", m_channel, data, m_ediv_rate);
 }
 
 void cmi01a_device::ws_dir_w(uint8_t data)
 {
+	if (m_channel == 5) LOG("CH%d: WS/DIR write: %02x\n", m_channel, data);
 	m_ws = data & 0x7f;
 	m_dir = (data >> 7) & 1;
 }
 
+uint8_t cmi01a_device::ws_dir_r()
+{
+	return m_ws | (m_dir << 7);
+}
+
 READ_LINE_MEMBER( cmi01a_device::tri_r )
 {
-	bool top_terminal_count = (m_dir == ENV_DIR_UP && m_rp == 0);
-	bool bottom_terminal_count = (m_dir == ENV_DIR_DOWN && m_rp == 0xff);
-	return (top_terminal_count || bottom_terminal_count) ? 1 : 0;
+	const bool top_terminal_count = (m_env_dir == ENV_DIR_UP && m_env == 0xff);
+	const bool bottom_terminal_count = (m_env_dir == ENV_DIR_DOWN && m_env == 0x00);
+	const int state = (top_terminal_count || bottom_terminal_count) ? 1 : 0;
+	if (m_channel == 5) LOG("CH%d: PIA0 CB1 Read (/TRI): %d\n", m_channel, state);
+	return state;
 }
 
 WRITE_LINE_MEMBER( cmi01a_device::cmi01a_irq )
@@ -167,76 +349,221 @@
 		case TIMER_ZX:
 			zx_timer_cb();
 			break;
+		case TIMER_EOSI:
+			eosi_timer_cb();
+			break;
+		case TIMER_BCAS:
+			bcas_tick();
 	}
 }
 
+void cmi01a_device::reset_bcas_counter()
+{
+	m_bcas_q1_ticks = 2;
+	m_bcas_q1 = 0;
+	m_bcas_q2_ticks = 4;
+	m_bcas_q2 = 0;
+
+	m_ptm->set_clock(0, 0);
+	m_ptm->set_clock(1, 0);
+	m_ptm->set_clock(2, 0);
+}
+
+void cmi01a_device::bcas_tick()
+{
+	if (m_ptm_o1 != m_zx_ff)
+		return;
+}
+
+void cmi01a_device::eosi_timer_cb()
+{
+	m_stream->update();
+	m_segment_cnt &= ~0x4000;
+	m_pia[1]->cb1_w(0);
+
+	if (m_channel == 5) LOG("CH%d: End of sound\n", m_channel);
+}
+
 void cmi01a_device::zx_timer_cb()
 {
-	/* Set ZX */
+	// Toggle ZX
+	m_zx_flag ^= 1;
+
+	// Update ZX input to PIA 1
+	m_pia[1]->ca1_w(m_zx_flag);
+
+	// 74LS74 A12 (1) is clocked by /ZX, so a 1->0 transition of the ZX flag is a positive clock transition
 	if (m_zx_flag == 0)
-		m_pia[1]->ca1_w(1);
+	{
+		// Pulse /ZCINT if the O1 output of the PTM has changed
+		if (m_ptm_o1 != m_zx_ff)
+		{
+			reset_bcas_counter();
+			pulse_zcint();
+		}
+
+		m_zx_ff = m_ptm_o1;
+	}
+
+	update_eclk();
+}
+
+void cmi01a_device::update_eclk()
+{
+	bool eclk = (m_ptm_o2 && m_zx_ff) || (m_ptm_o3 && !m_zx_ff);
+	if (m_channel == 5) logerror("CH%d: eclk = (%d && %d) || (%d && %d) = %d\n", m_channel, m_ptm_o2, m_zx_ff, m_ptm_o3, m_zx_ff ? 0 : 1, eclk ? 1 : 0);
+	m_stream->update();
+	set_eclk(eclk);
+}
+
+void cmi01a_device::wpe_w(int state)
+{
+	m_nwpe = state ? false : true;
+}
+
+void cmi01a_device::eload_w(int state)
+{
+	if (m_channel == 5) LOG("CH%d PIA1 CA2: %d\n", m_channel, state);
+	m_pia1_ca2 = state;
+}
+
+void cmi01a_device::clock_envelope()
+{
+	m_stream->update();
+	const bool old_tri = m_tri;
+	if (m_env_dir == ENV_DIR_DOWN)
+	{
+		if (m_env > 0)
+		{
+			m_env--;
+			m_ediv_rate = ((m_env >> 2) & 0x3c) | 0x03;
+			if (m_channel == 5) LOG("CH%d, Clocking envelope down, new rp: %02x\n", m_channel, m_env);
+		}
+		m_tri = m_env == 0x00;
+	}
 	else
-		m_pia[1]->ca1_w(0);
+	{
+		if (m_env < 0xff)
+		{
+			m_env++;
+			m_ediv_rate = ((~m_env >> 2) & 0x3c) | 0x03;
+			if (m_channel == 5) LOG("CH%d, Clocking envelope up, new rp: %02x\n", m_channel, m_env);
+		}
+		m_tri = m_env == 0xff;
+	}
+	if (old_tri != m_tri)
+	{
+		m_pia[0]->cb1_w(m_tri ? 0 : 1);
+	}
+}
 
-	m_zx_flag ^= 1;
+void cmi01a_device::tick_ediv()
+{
+	if (m_channel == 5) logerror("CH%d ticking ediv, rate: %02x\n", m_channel, m_ediv_rate);
+	m_ediv_out = s_7497_rate_table[m_ediv_rate][m_ediv_count];
+	m_ediv_count = (m_ediv_count + 1) & 0x3f;
+}
 
-	if (m_zx_flag == 0)
+void cmi01a_device::set_eclk(bool eclk)
+{
+	bool old_eclk = m_eclk;
+	m_eclk = eclk;
+
+	if (old_eclk == m_eclk)
+		return;
+
+	if (!old_eclk && m_eclk)
 	{
-		/* Low to high transition - clock flip flop */
-		int op = m_ptm_o1;
+		tick_ediv();
+	}
 
-		/* Set /ZCINT */
-		if (op != m_zx_ff)
-			m_pia[0]->ca1_w(0);
+	//  A   B   !(A && B)   !A || !B
+	//  0   0   1           1
+	//  0   1   1           1
+	//  1   0   1           1
+	//  1   1   0           0
 
-		m_zx_ff = op;
-		m_pia[0]->ca1_w(1);
+	const bool a = !m_load || !eclk;
+	const bool b =  m_load || !m_ediv_out;
+
+	const bool old_env_clk = m_env_clk;
+	m_env_clk = !a || !b;
+	LOG("CH%d checking envelope: A: !!load(%d) || !eclk(%d) = %d\n", m_channel, m_load ? 0 : 1, eclk ? 0 : 1, a);
+	LOG("CH%d checking envelope: B:  !load(%d) || !eout(%d) = %d\n", m_channel, m_load ? 1 : 0, m_ediv_out ? 0 : 1, b);
+	LOG("CH%d checking envelope: C: !%d || !%d = %d\n", m_channel, a ? 1 : 0, b ? 1 : 0, m_env_clk ? 1 : 0);
+	if (!old_env_clk && m_env_clk)
+	{
+		clock_envelope();
 	}
 }
 
 void cmi01a_device::run_voice()
 {
-	int val_a = m_pia[1]->a_output();
-	int pitch = ((val_a & 3) << 8) | m_pia[1]->b_output();
-	int o_val = (val_a >> 2) & 0xf;
+	if (m_channel == 5) LOG("CH%d running voice: Pitch = %04x\n", m_channel, (uint16_t)m_pitch);
+	if (m_channel == 5) LOG("CH%d running voice: o_val = %x\n", m_channel, m_octave);
 
 	int m_tune = m_cmi02_pia[0]->b_output();
-	double mfreq = (double)(0xf00 | m_tune) * (MASTER_OSCILLATOR / 2.0 / 4096.0).dvalue();
+	if (m_channel == 5) LOG("CH%d running voice: Tuning = %02x\n", m_channel, (uint8_t)m_tune);
+	double mfreq = (double)(0xf00 | m_tune) * ((MASTER_OSCILLATOR.dvalue() / 2.0) / 4096.0);
+	if (m_channel == 5) LOG("CH%d running voice: mfreq = %f (%03x * %f)\n", m_channel, mfreq, 0xf00 | m_tune, (MASTER_OSCILLATOR.dvalue() / 2.0) / 4096.0);
 
-	double cfreq = ((double)(0x800 | (pitch << 1))* mfreq) / 4096.0;
+	double cfreq = ((double)(0x800 | (m_pitch << 1)) * mfreq) / 4096.0;
+	if (m_channel == 5) LOG("CH%d running voice: cfreq = %f (%04x * %f) / 4096.0\n", m_channel, cfreq, 0x800 | (m_pitch << 1), mfreq, cfreq);
 
-//  if (cfreq > 0.0)
+	if (cfreq > MASTER_OSCILLATOR.dvalue())
 	{
-		/* Octave register enabled? */
-		if (!(o_val & 0x8))
-			cfreq /= 2 << ((7 ^ o_val) & 7);
+		if (m_channel == 5) LOG("CH%d Ignoring voice run due to excessive frequency\n");
+		return;
+	}
+
+	if (m_channel == 5) LOG("CH%d Running voice\n", m_channel);
+	/* Octave register enabled? */
+	if (!BIT(m_octave, 3))
+		cfreq /= (double)(2 << ((7 ^ m_octave) & 7));
+
+	cfreq /= 16.0;
 
-		cfreq /= 16.0f;
+	m_freq = cfreq;
 
-		m_freq = cfreq;
+	if (m_channel == 5) LOG("CH%d running voice: Final freq: %f\n", m_channel, m_freq);
 
-		m_stream->set_sample_rate(cfreq);
+	m_stream->set_sample_rate(cfreq);
 
-		// Set timers and things?
-		attotime zx_period = attotime::from_ticks(64, cfreq);
-		m_zx_timer->adjust(zx_period, 0, zx_period);
+	// Set timers and things
+	m_zx_flag = 0;
+	attotime zx_period = attotime::from_ticks(64, cfreq);
+	m_zx_timer->adjust(zx_period, 0, zx_period);
 
-		m_active = true;
+	if (m_load)
+	{
+		int samples = 0x4000 - (m_segment_cnt & 0x3fff);
+		if (m_channel == 5) LOG("CH%d voice is %04x samples long\n", m_channel, samples);
+		m_eosi_timer->adjust(attotime::from_ticks(samples, cfreq));
 	}
 }
 
 WRITE_LINE_MEMBER( cmi01a_device::pia_0_cb2_w )
 {
-	//streams_update();
+	int old_state = m_pia0_cb2_state;
+	m_pia0_cb2_state = state;
+	if (m_channel == 5) LOG("CH%d PIA0 CB2: %d\n", m_channel, state);
+
+	m_stream->update();
 
 	/* RUN */
-	if (state)
+	if (!old_state && m_pia0_cb2_state)
 	{
-		m_segment_cnt = 0x4000 | ((m_pia[0]->a_output() & 0x7f) << 7);
-		m_new_addr = 1;
+		m_run = true;
 
 		/* Clear /EOSI */
-//      pia6821_cb1_w(card->pia[1], 0, 1);
+		m_pia[1]->cb1_w(1);
+
+		/* Only reset address counter if LOAD not asserted */
+		if (!m_load)
+		{
+			m_segment_cnt = 0x4000 | (m_ws << 7);
+			m_new_addr = 1;
+		}
 
 		/* Clear ZX */
 		m_pia[1]->ca1_w(0);
@@ -250,18 +577,20 @@
 
 		run_voice();
 	}
-	else
+
+	if (old_state && !m_pia0_cb2_state)
 	{
-		/* Clear /EOSI */
-		m_pia[1]->cb1_w(1);
+		m_run = false;
+
+		/* Set /EOSI */
+		m_pia[1]->cb1_w(0);
 
 		m_ptm->set_g1(1);
 		m_ptm->set_g2(1);
 		m_ptm->set_g3(1);
 
 		m_zx_timer->adjust(attotime::never);
-		m_active = false;
-		m_zx_flag = 0;  // TEST
+		m_eosi_timer->adjust(attotime::never);
 		m_zx_ff = 0;
 	}
 
@@ -283,7 +612,6 @@
 	/* Clock a latch on a transition */
 	if ((old_cnt & 0x40) && !(m_segment_cnt & 0x40))
 	{
-		// TODO: ECLK
 		m_pia[1]->ca2_w(1);
 		m_pia[1]->ca2_w(0);
 	}
@@ -291,28 +619,48 @@
 	/* Zero crossing interrupt is a pulse */
 }
 
+WRITE_LINE_MEMBER( cmi01a_device::ptm_irq )
+{
+	m_irq_merger->in_w<4>(state);
+}
+
 WRITE_LINE_MEMBER( cmi01a_device::ptm_o1 )
 {
 	m_ptm_o1 = state;
+	if (m_ptm_o1 != m_zx_ff)
+		reset_bcas_counter();
+	update_eclk();
+}
+
+WRITE_LINE_MEMBER( cmi01a_device::ptm_o2 )
+{
+	m_ptm_o2 = state;
+	update_eclk();
+}
+
+WRITE_LINE_MEMBER( cmi01a_device::ptm_o3 )
+{
+	m_ptm_o3 = state;
+	update_eclk();
 }
 
 READ_LINE_MEMBER( cmi01a_device::eosi_r )
 {
-	return (m_segment_cnt & 0x4000) >> 14;
+	if (m_channel == 5) LOG("CH%d PIA1 CB1 Read: %d\n", m_channel, BIT(m_segment_cnt, 14));
+	return BIT(m_segment_cnt, 14);
 }
 
 READ_LINE_MEMBER( cmi01a_device::zx_r )
 {
-	return m_segment_cnt & 0x40;
+	return (m_segment_cnt & 0x40) >> 6;
 }
 
 void cmi01a_device::write(offs_t offset, uint8_t data)
 {
-	LOG("%s: channel card %d write: %02x = %02x\n", machine().describe_context(), m_channel, offset, data);
-
 	switch (offset)
 	{
 		case 0x0:
+			if (m_channel == 5) LOG("%s: CH%d Porthole Write to %04x: %02x\n", machine().describe_context(), m_channel, m_segment_cnt & 0x3fff, data);
 			if (m_new_addr)
 				m_new_addr = 0;
 
@@ -321,26 +669,32 @@
 			break;
 
 		case 0x3:
-			m_env_dir_ctrl = ENV_DIR_DOWN;
+			if (m_channel == 5) LOG("%s: CH%d set Envelope Dir Down (%02x)\n", machine().describe_context(), m_channel, data);
+			m_env_dir = ENV_DIR_DOWN;
 			break;
 
 		case 0x4:
-			m_env_dir_ctrl = ENV_DIR_UP;
+			if (m_channel == 5) LOG("%s: CH%d set Envelope Dir Up (%02x)\n", machine().describe_context(), m_channel, data);
+			m_env_dir = ENV_DIR_UP;
 			break;
 
 		case 0x5:
+			if (m_channel == 5) LOG("%s: CH%d set Volume Latch: %02x\n", machine().describe_context(), m_channel, data);
 			m_vol_latch = data;
 			break;
 
 		case 0x6:
+			if (m_channel == 5) LOG("%s: CH%d set Filter Latch: %02x\n", machine().describe_context(), m_channel, data);
 			m_flt_latch = data;
 			break;
 
 		case 0x8: case 0x9: case 0xa: case 0xb:
+			if (m_channel == 5) LOG("CH%d PIA0 Write: %d = %02x\n", m_channel, offset & 3, data);
 			m_pia[0]->write(offset & 3, data);
 			break;
 
 		case 0xc: case 0xd: case 0xe: case 0xf:
+			if (m_channel == 5) LOG("CH%d PIA1 Write: %d = %02x\n", m_channel, (BIT(offset, 0) << 1) | BIT(offset, 1), data);
 			m_pia[1]->write((BIT(offset, 0) << 1) | BIT(offset, 1), data);
 			break;
 
@@ -351,13 +705,16 @@
 			int a1 = (m_ptm_o1 && BIT(offset, 3)) || (!BIT(offset, 3) && BIT(offset, 2));
 			int a2 = BIT(offset, 1);
 
-			//osd_printf_debug("CH%d PTM W: [%x] = %02x\n", m_channel, (a2 << 2) | (a1 << 1) | a0, data);
+			if ((offset == 5 || offset == 7) && (data < 0x30))
+				data = 0xff;
+
+			if (m_channel == 5) LOG("CH%d PTM Write: %d = %02x\n", m_channel, (a2 << 2) | (a1 << 1) | a0, data);
 			m_ptm->write((a2 << 2) | (a1 << 1) | a0, data);
 			break;
 		}
 
 		default:
-			LOG("%s: Unknown channel card write to E0%02X = %02X\n", machine().describe_context(), offset, data);
+			if (m_channel == 5) LOG("%s: Unknown channel card write to E0%02X = %02X\n", machine().describe_context(), offset, data);
 			break;
 	}
 }
@@ -378,47 +735,53 @@
 				break;
 			}
 			data = m_wave_ram[m_segment_cnt & 0x3fff];
+			if (m_channel == 5) LOG("%s: CH%d Porthole Read: %02x\n", machine().describe_context(), m_channel, data);
 			update_wave_addr(1);
 			break;
 
 		case 0x3:
-			m_env_dir_ctrl = ENV_DIR_DOWN;
+			if (m_channel == 5) LOG("%s: CH%d set Envelope Dir Down (R)\n", machine().describe_context(), m_channel);
+			m_env_dir = ENV_DIR_DOWN;
 			break;
 
 		case 0x4:
-			m_env_dir_ctrl = ENV_DIR_UP;
+			if (m_channel == 5) LOG("%s: CH%d set Envelope Dir Up (R)\n", machine().describe_context(), m_channel);
+			m_env_dir = ENV_DIR_UP;
 			break;
 
 		case 0x5:
+			if (m_channel == 5) LOG("%s: CH%d read Volume Latch (ff)\n", machine().describe_context(), m_channel);
 			data = 0xff;
 			break;
 
 		case 0x8: case 0x9: case 0xa: case 0xb:
 			data = m_pia[0]->read(offset & 3);
+			if (m_channel == 5) LOG("CH%d PIA0 Read: %d = %02x\n", m_channel, offset & 3, data);
 			break;
 
 		case 0xc: case 0xd: case 0xe: case 0xf:
 			data = m_pia[1]->read((BIT(offset, 0) << 1) | BIT(offset, 1));
+			if (m_channel == 5) LOG("CH%d PIA1 Read: %d = %02x\n", m_channel, (BIT(offset, 0) << 1) | BIT(offset, 1), data);
 			break;
 
 		case 0x10: case 0x11: case 0x12: case 0x13: case 0x14: case 0x15: case 0x16: case 0x17:
 		{
 			int a0 = offset & 1;
-			int a1 = ((m_ptm_o1 && BIT(offset, 3)) || (!BIT(offset, 3) && BIT(offset, 2))) ? 1 : 0;
+			int a1 = (m_ptm_o1 && BIT(offset, 3)) || (!BIT(offset, 3) && BIT(offset, 2));
 			int a2 = BIT(offset, 1);
 
 			data = m_ptm->read((a2 << 2) | (a1 << 1) | a0);
 
-			//osd_printf_debug("CH%d PTM R: [%x] %02x\n", m_channel, (a2 << 2) | (a1 << 1) | a0, data);
+			if (m_channel == 5) LOG("CH%d PTM Read: %d = %02x\n", m_channel, (a2 << 2) | (a1 << 1) | a0, data);
 			break;
 		}
 
 		default:
-			LOG("%s: Unknown channel card %d read from E0%02X\n", machine().describe_context(), m_channel, offset);
+			if (m_channel == 5) LOG("%s: Unknown channel card %d read from E0%02X\n", machine().describe_context(), m_channel, offset);
 			break;
 	}
 
-	LOG("%s: channel card %d read: %02x = %02x\n", machine().describe_context(), m_channel, offset, data);
+	if (m_channel == 5) LOG("%s: channel card %d read: %02x = %02x\n", machine().describe_context(), m_channel, offset, data);
 
 	return data;
 }
diff -Nru mame-0.222+dfsg.1/src/mame/audio/cmi01a.h mame-0.224+dfsg.1/src/mame/audio/cmi01a.h
--- mame-0.222+dfsg.1/src/mame/audio/cmi01a.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/cmi01a.h	2020-08-26 08:57:19.000000000 +0000
@@ -11,10 +11,13 @@
 
 #include "machine/6821pia.h"
 #include "machine/6840ptm.h"
+#include "machine/input_merger.h"
 
-#define ENV_DIR_DOWN            0
-#define ENV_DIR_UP              1
+#define ENV_DIR_UP              0
+#define ENV_DIR_DOWN            1
 
+#define CHANNEL_STATUS_LOAD     1
+#define CHANNEL_STATUS_RUN      2
 
 class cmi01a_device : public device_t, public device_sound_interface {
 public:
@@ -41,7 +44,10 @@
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
 	static const device_timer_id TIMER_ZX = 0;
+	static const device_timer_id TIMER_EOSI = 1;
+	static const device_timer_id TIMER_BCAS = 2;
 
+	required_device<input_merger_device> m_irq_merger;
 	required_device_array<pia6821_device, 2> m_pia;
 	required_device<ptm6840_device> m_ptm;
 
@@ -52,7 +58,23 @@
 private:
 	DECLARE_WRITE_LINE_MEMBER(cmi01a_irq);
 
+	void bcas_tick();
+	void reset_bcas_counter();
+
+	void clock_envelope();
+	void tick_ediv();
+	void set_eclk(bool eclk);
+	void update_eclk();
+
+	void pulse_zcint();
+	void pulse_gzx();
+	void reset_waveform_segment();
+	void check_segment_load();
+	void wpe_w(int state);
+	void load_w(int state);
+
 	void zx_timer_cb();
+	void eosi_timer_cb();
 	void run_voice();
 	void update_wave_addr(int inc);
 
@@ -61,35 +83,70 @@
 	uint8_t     m_zx_flag;
 	uint8_t     m_zx_ff;
 
+	emu_timer * m_eosi_timer;
+
+	emu_timer * m_bcas_timer;
+
 	std::unique_ptr<uint8_t[]>    m_wave_ram;
 	uint16_t  m_segment_cnt;
 	uint8_t   m_new_addr;     // Flag
-	uint8_t   m_env_dir_ctrl;
 	uint8_t   m_vol_latch;
 	uint8_t   m_flt_latch;
-	uint8_t m_rp;
-	uint8_t m_ws;
-	int     m_dir;
-
-	double  m_freq;
-	bool    m_active;
+	uint8_t   m_rp;
+	uint8_t   m_ws;
+	int       m_dir;
+	int       m_env_dir;
+	uint8_t   m_env;
+	int       m_pia0_cb2_state;
+
+	uint8_t   m_bcas_q1_ticks;
+	uint8_t   m_bcas_q1;
+	uint8_t   m_bcas_q2_ticks;
+	uint8_t   m_bcas_q2;
+
+	double    m_freq;
+
+	int       m_ptm_o1;
+	int       m_ptm_o2;
+	int       m_ptm_o3;
+
+	bool      m_load;
+	bool      m_run;
+	bool      m_gzx;
+	bool      m_nwpe;
+	bool      m_tri;
+	bool      m_pia1_ca2;
+
+	bool      m_eclk;
+	bool      m_env_clk;
+	bool      m_ediv_out;
+	uint8_t   m_ediv_rate;
+	uint8_t   m_ediv_count;
 
-	int     m_ptm_o1;
+	uint16_t  m_pitch;
+	uint8_t   m_octave;
 
 	devcb_write_line m_irq_cb;
 
 	void rp_w(uint8_t data);
 	void ws_dir_w(uint8_t data);
+	uint8_t ws_dir_r();
 	DECLARE_READ_LINE_MEMBER( tri_r );
-	DECLARE_WRITE_LINE_MEMBER( pia_0_ca2_w );
 	DECLARE_WRITE_LINE_MEMBER( pia_0_cb2_w );
+	DECLARE_WRITE_LINE_MEMBER( eload_w );
 
 	DECLARE_READ_LINE_MEMBER( eosi_r );
 	DECLARE_READ_LINE_MEMBER( zx_r );
+	uint8_t pia_1_a_r();
 	void pia_1_a_w(uint8_t data);
 	void pia_1_b_w(uint8_t data);
 
 	DECLARE_WRITE_LINE_MEMBER( ptm_o1 );
+	DECLARE_WRITE_LINE_MEMBER( ptm_o2 );
+	DECLARE_WRITE_LINE_MEMBER( ptm_o3 );
+	DECLARE_WRITE_LINE_MEMBER( ptm_irq );
+
+	static const uint8_t s_7497_rate_table[64][64];
 };
 
 // device type definition
diff -Nru mame-0.222+dfsg.1/src/mame/audio/harddriv.cpp mame-0.224+dfsg.1/src/mame/audio/harddriv.cpp
--- mame-0.222+dfsg.1/src/mame/audio/harddriv.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/harddriv.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -8,7 +8,6 @@
 
 #include "emu.h"
 #include "includes/harddriv.h"
-#include "machine/atarigen.h"
 
 #include "cpu/tms32010/tms32010.h"
 #include "sound/volt_reg.h"
diff -Nru mame-0.222+dfsg.1/src/mame/audio/mw8080bw.cpp mame-0.224+dfsg.1/src/mame/audio/mw8080bw.cpp
--- mame-0.222+dfsg.1/src/mame/audio/mw8080bw.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/mw8080bw.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -574,6 +574,7 @@
 DEFINE_DEVICE_TYPE(INVADERS_AUDIO, invaders_audio_device, "invaders_audio", "Taito Space Invaders Audio")
 DEFINE_DEVICE_TYPE(INVAD2CT_AUDIO, invad2ct_audio_device, "invad2ct_audio", "Midway Space Invaders II Audio")
 DEFINE_DEVICE_TYPE(ZZZAP_AUDIO,    zzzap_audio_device,    "zzzap_audio",    "Midway 280-ZZZAP Audio")
+DEFINE_DEVICE_TYPE(LAGUNAR_AUDIO,  lagunar_audio_device,  "lagunar_audio",  "Midway Laguna Racer Audio")
 
 
 /*************************************
@@ -715,6 +716,24 @@
  *
  *************************************/
 
+// Sound board volume potentiometers. By default, these are all set to their
+// midpoint values.
+
+static INPUT_PORTS_START(gunfight_audio)
+	PORT_START("POT_1_LEFT_MASTER_VOL")
+	PORT_ADJUSTER( 50, "Pot: Left Master Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "pot_left_master_vol")
+	PORT_START("POT_2_RIGHT_MASTER_VOL")
+	PORT_ADJUSTER( 50, "Pot: Right Master Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "pot_right_master_vol")
+	PORT_START("POT_3_LEFT_SHOT_VOL")
+	PORT_ADJUSTER( 50, "Pot: Left Shot Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "pot_left_shot_vol")
+	PORT_START("POT_4_RIGHT_SHOT_VOL")
+	PORT_ADJUSTER( 50, "Pot: Right Shot Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "pot_right_shot_vol")
+	PORT_START("POT_5_LEFT_HIT_VOL")
+	PORT_ADJUSTER( 50, "Pot: Left Hit Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "pot_left_hit_vol")
+	PORT_START("POT_6_RIGHT_HIT_VOL")
+	PORT_ADJUSTER( 50, "Pot: Right Hit Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "pot_right_hit_vol")
+INPUT_PORTS_END
+
 gunfight_audio_device::gunfight_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) :
 	device_t(mconfig, GUNFIGHT_AUDIO, tag, owner, clock),
 	m_left_shot(*this, "sound_nl:left_shot"),
@@ -733,10 +752,10 @@
 	// the 74175 latches and inverts the top 4 bits
 	switch ((~data >> 4) & 0x0f)
 	{
-	case 0x01: // LEFT SHOOT sound (left speaker)
+	case 0x01: // LEFT SHOT sound (left speaker)
 		m_left_shot->write_line(1);
 		break;
-	case 0x02: // RIGHT SHOOT sound (right speaker)
+	case 0x02: // RIGHT SHOT sound (right speaker)
 		m_right_shot->write_line(1);
 		break;
 	case 0x03: // LEFT HIT sound (left speaker)
@@ -770,15 +789,30 @@
 	NETLIST_LOGIC_INPUT(config, "sound_nl:left_hit",   "I_LEFT_HIT.IN",  0);
 	NETLIST_LOGIC_INPUT(config, "sound_nl:right_hit",  "I_RIGHT_HIT.IN",  0);
 
-	// Multipliers set so that the highest output spikes of
-	// +/- 3 volts at mid potentiometer settings give safe
-	// non-clipping sample values of +/- 30,000. This would
-	// lead to clipping if all the potentiometers were set to max,
-	// but that's unlikely to happen, since the potentiometers are
-	// currently fixed and even on the real machine were service
-	// adjustments only.
-	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "OUT_L").set_mult_offset(30000.0 / 3.0, 0.0);
-	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout1", 1, "OUT_R").set_mult_offset(30000.0 / 3.0, 0.0);
+	// With all the volume potentiometers at their default midpoint
+	// settings, the highest output spikes are around +/- 3 volts, for an
+	// extreme output swing of 6 volts. Gun Fight's audio power amplifiers
+	// are configured with a voltage gain of 15 and have a single power
+	// supply of about 22 volts, so they will definitely clip the highest
+	// output peaks, but we don't model them. Instead, be cautious: scale
+	// the outputs before the power amps so that the highest output spikes
+	// of +/- 3 volts just reach the clipping limits for signed 16-bit
+	// samples.
+	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "OUT_L").set_mult_offset(32767.0 / 3.0, 0.0);
+	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout1", 1, "OUT_R").set_mult_offset(32767.0 / 3.0, 0.0);
+
+	// Netlist volume-potentiometer interfaces
+	NETLIST_ANALOG_INPUT(config, "sound_nl:pot_left_master_vol", "R103.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:pot_right_master_vol", "R203.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:pot_left_shot_vol", "R123.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:pot_right_shot_vol", "R223.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:pot_left_hit_vol", "R110.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:pot_right_hit_vol", "R210.DIAL");
+}
+
+ioport_constructor gunfight_audio_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(gunfight_audio);
 }
 
 void gunfight_audio_device::device_start()
@@ -3613,8 +3647,16 @@
  *
  *************************************/
 
-zzzap_audio_device::zzzap_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) :
-	device_t(mconfig, ZZZAP_AUDIO, tag, owner, clock),
+// Sound board volume potentiometer, set to its midpoint value by default.
+
+static INPUT_PORTS_START(zzzap_audio)
+	PORT_START("POT_MASTER_VOL")
+	PORT_ADJUSTER( 50, "Pot: Master Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "pot_master_vol")
+INPUT_PORTS_END
+
+zzzap_common_audio_device::zzzap_common_audio_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock, void (*netlist)(netlist::nlparse_t &)) :
+	device_t(mconfig, type, tag, owner, clock),
+	m_netlist(netlist),
 	m_pedal_bit0(*this, "sound_nl:pedal_bit0"),
 	m_pedal_bit1(*this, "sound_nl:pedal_bit1"),
 	m_pedal_bit2(*this, "sound_nl:pedal_bit2"),
@@ -3629,71 +3671,128 @@
 }
 
 
-void zzzap_audio_device::p1_w(u8 data)
+void zzzap_common_audio_device::p1_w(u8 data)
 {
-	/* set ENGINE SOUND FREQ(data & 0x0f)  the value written is
-	                                       the gas pedal position */
+	// **** Output pins from 74174 latch at F5 ****
+
+	// Bits 0-3 (PEDAL_BIT0 to PEDAL_BIT3): accelerator pedal position
+	// Sets the frequency and volume of the engine sound oscillators.
 	m_pedal_bit0->write_line(BIT(data, 0));
 	m_pedal_bit1->write_line(BIT(data, 1));
 	m_pedal_bit2->write_line(BIT(data, 2));
 	m_pedal_bit3->write_line(BIT(data, 3));
 
-	/* if (data & 0x10)  enable HI SHIFT engine sound modifier */
+	// Bit 4 (HI SHIFT): set when gearshift is in high gear
+	// Modifies the engine sound to be lower pitched at a given speed and
+	// to change more slowly.
 	m_hi_shift->write_line(BIT(data, 4));
 
-	/* if (data & 0x20)  enable LO SHIFT engine sound modifier */
+	// Bit 5 (LO SHIFT): set when gearshift is in low gear
+	// Modifies the engine sound to be higher pitched at a given speed and
+	// to change faster.
 	m_lo_shift->write_line(BIT(data, 5));
 
-	/* D6 and D7 are not connected */
+	// Bits 6-7 (D6, D7): not connected.
 }
 
 
-void zzzap_audio_device::p2_w(u8 data)
+void zzzap_common_audio_device::p2_w(u8 data)
 {
-	/* if (data & 0x01)  enable BOOM sound */
+	// **** Output pins from 74174 latch at F4 ****
+
+	// Bit 0 (BOOM): Set to activate boom sound for a crash. Cleared to
+	// terminate boom.
 	m_boom->write_line(BIT(data, 0));
 
-	/* if (data & 0x02)  enable ENGINE sound (global) */
+	// Bit 1 (ENGINE SOUND OFF): Set to turn *off* engine sound.
+	// Used in a crash or when game is not running.
 	m_engine_sound_off->write_line(BIT(data, 1));
 
-	/* if (data & 0x04)  enable CR 1 (screeching sound) */
+	// Bit 2 (NOISE CR 1): tire squealing sound
+	// Set to activate "tire squeal" noise from noise generator.
 	m_noise_cr_1->write_line(BIT(data, 2));
 
-	/* if (data & 0x08)  enable NOISE CR 2 (happens only after the car blows up, but
-	                                        before it appears again, not sure what
-	                                        it is supposed to sound like) */
+	// Bit 3 (NOISE CR 2): post-crash noise
+	// Set to activate screeching noise that follows BOOM (the car blowing
+	// up). This sounds like a generic high-pitched screeching hiss, and
+	// it is unclear what it was meant to represent. It's just as
+	// ambiguous in the real game.
 	m_noise_cr_2->write_line(BIT(data, 3));
 
+	// Bit 5 is for the coin counter.
 	machine().bookkeeping().coin_counter_w(0, (data >> 5) & 0x01);
 
-	/* D4, D6 and D7 are not connected */
+	// Bits 4, 6-7 (D4, D6, D7): not connected.
 }
 
 
-void zzzap_audio_device::device_add_mconfig(machine_config &config)
+void zzzap_common_audio_device::device_add_mconfig(machine_config &config)
 {
 	SPEAKER(config, "mono").front_center();
 
-	NETLIST_SOUND(config, "sound_nl", 48000)
-		.set_source(NETLIST_NAME(280zzzap))
-		.add_route(ALL_OUTPUTS, "mono", 1.0);
-
-	NETLIST_LOGIC_INPUT(config, "sound_nl:pedal_bit0", "I_PEDAL_BIT0", 0);
-	NETLIST_LOGIC_INPUT(config, "sound_nl:pedal_bit1", "I_PEDAL_BIT1", 0);
-	NETLIST_LOGIC_INPUT(config, "sound_nl:pedal_bit2", "I_PEDAL_BIT2", 0);
-	NETLIST_LOGIC_INPUT(config, "sound_nl:pedal_bit3", "I_PEDAL_BIT3", 0);
-	NETLIST_LOGIC_INPUT(config, "sound_nl:hi_shift", "I_HI_SHIFT", 0);
-	NETLIST_LOGIC_INPUT(config, "sound_nl:lo_shift", "I_LO_SHIFT", 0);
-	NETLIST_LOGIC_INPUT(config, "sound_nl:boom", "I_BOOM", 0);
-	NETLIST_LOGIC_INPUT(config, "sound_nl:engine_sound_off", "I_ENGINE_SOUND_OFF", 0);
-	NETLIST_LOGIC_INPUT(config, "sound_nl:noise_cr_1", "I_NOISE_CR_1", 0);
-	NETLIST_LOGIC_INPUT(config, "sound_nl:noise_cr_2", "I_NOISE_CR_2", 0);
+	if (m_netlist != nullptr) {
+
+		NETLIST_SOUND(config, "sound_nl", 48000)
+			.set_source(m_netlist)
+			.add_route(ALL_OUTPUTS, "mono", 1.0);
+
+		NETLIST_LOGIC_INPUT(config, "sound_nl:pedal_bit0",
+					"I_PEDAL_BIT0", 0);
+		NETLIST_LOGIC_INPUT(config, "sound_nl:pedal_bit1",
+					"I_PEDAL_BIT1", 0);
+		NETLIST_LOGIC_INPUT(config, "sound_nl:pedal_bit2",
+					"I_PEDAL_BIT2", 0);
+		NETLIST_LOGIC_INPUT(config, "sound_nl:pedal_bit3",
+					"I_PEDAL_BIT3", 0);
+		NETLIST_LOGIC_INPUT(config, "sound_nl:hi_shift",
+					"I_HI_SHIFT", 0);
+		NETLIST_LOGIC_INPUT(config, "sound_nl:lo_shift",
+					"I_LO_SHIFT", 0);
+		NETLIST_LOGIC_INPUT(config, "sound_nl:boom", "I_BOOM", 0);
+		NETLIST_LOGIC_INPUT(config, "sound_nl:engine_sound_off",
+					"I_ENGINE_SOUND_OFF", 0);
+		NETLIST_LOGIC_INPUT(config, "sound_nl:noise_cr_1",
+					"I_NOISE_CR_1", 0);
+		NETLIST_LOGIC_INPUT(config, "sound_nl:noise_cr_2",
+					"I_NOISE_CR_2", 0);
+
+		// The audio output is taken from an LM3900 op-amp whose
+		// output has a peak-to-peak range of about 5 volts, centered
+		// on 2.5 volts. With the master volume potentiometer at its
+		// default midpoint setting, this range is cut in half, to 2.5
+		// volts peak to peak. In the real machine, the audio power
+		// amps might clip the highest output peaks, but I don't model
+		// this. Instead, I take the easy way out: assume the output
+		// at midpoint volume will just avoid clipping the extreme
+		// peaks, and scale and offset it so that those peaks will
+		// just reach the clipping limits for signed 16-bit samples.
+		// So turning the volume up much higher than the default will
+		// give clipped output.
+		NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "OUTPUT").set_mult_offset(32767.0 / 1.25, -(32767.0 / 1.25) * 2.50);
+
+		// Netlist volume-potentiometer interface
+		NETLIST_ANALOG_INPUT(config, "sound_nl:pot_master_vol", "R70.DIAL");
+	}
+}
+
+ioport_constructor zzzap_common_audio_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(zzzap_audio);
+}
+
+void zzzap_common_audio_device::device_start()
+{
+}
 
-	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "OUTPUT").set_mult_offset(30000.0 / 2.5, -30000.0);
+
+zzzap_audio_device::zzzap_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) :
+		zzzap_common_audio_device(mconfig, ZZZAP_AUDIO, tag, owner, clock, NETLIST_NAME(280zzzap))
+{
 }
 
 
-void zzzap_audio_device::device_start()
+lagunar_audio_device::lagunar_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) :
+		zzzap_common_audio_device(mconfig, LAGUNAR_AUDIO, tag, owner, clock, NETLIST_NAME(lagunar))
 {
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/audio/mw8080bw.h mame-0.224+dfsg.1/src/mame/audio/mw8080bw.h
--- mame-0.222+dfsg.1/src/mame/audio/mw8080bw.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/mw8080bw.h	2020-08-26 08:57:19.000000000 +0000
@@ -56,6 +56,7 @@
 
 protected:
 	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
 	virtual void device_start() override;
 
 private:
@@ -300,19 +301,21 @@
 };
 
 
-class zzzap_audio_device : public device_t
+class zzzap_common_audio_device : public device_t
 {
 public:
-	zzzap_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 0);
-
 	void p1_w(u8 data);
 	void p2_w(u8 data);
 
 protected:
+	zzzap_common_audio_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock, void (*netlist)(netlist::nlparse_t &));
+
 	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
 	virtual void device_start() override;
 
 private:
+	void (*m_netlist)(netlist::nlparse_t &) = nullptr;
 	required_device<netlist_mame_logic_input_device> m_pedal_bit0;
 	required_device<netlist_mame_logic_input_device> m_pedal_bit1;
 	required_device<netlist_mame_logic_input_device> m_pedal_bit2;
@@ -326,6 +329,20 @@
 };
 
 
+class zzzap_audio_device : public zzzap_common_audio_device
+{
+public:
+	zzzap_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 0);
+};
+
+
+class lagunar_audio_device : public zzzap_common_audio_device
+{
+public:
+	lagunar_audio_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 0);
+};
+
+
 DECLARE_DEVICE_TYPE(SEAWOLF_AUDIO,  seawolf_audio_device)
 DECLARE_DEVICE_TYPE(GUNFIGHT_AUDIO, gunfight_audio_device)
 DECLARE_DEVICE_TYPE(BOOTHILL_AUDIO, boothill_audio_device)
@@ -340,6 +357,7 @@
 DECLARE_DEVICE_TYPE(PHANTOM2_AUDIO, phantom2_audio_device)
 DECLARE_DEVICE_TYPE(INVADERS_AUDIO, invaders_audio_device)
 DECLARE_DEVICE_TYPE(INVAD2CT_AUDIO, invad2ct_audio_device)
-DECLARE_DEVICE_TYPE(ZZZAP_AUDIO, zzzap_audio_device)
+DECLARE_DEVICE_TYPE(ZZZAP_AUDIO,    zzzap_audio_device)
+DECLARE_DEVICE_TYPE(LAGUNAR_AUDIO,  lagunar_audio_device)
 
 #endif // MAME_AUDIO_MW8080BW_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_280zzzap.cpp mame-0.224+dfsg.1/src/mame/audio/nl_280zzzap.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_280zzzap.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_280zzzap.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4,11 +4,15 @@
 #include "netlist/devices/net_lib.h"
 
 
-// This is a netlist description for the sound circuits of Midway's 280-ZZZAP,
-// based on Midway's schematic "280 ZZZAP Game Logic P.C. 0610-00907A". It
-// should also apply to Midway's Laguna Racer with only very minor changes and
-// to Taito/Midway's Super Speed Race with only modest changes, because these
-// games use almost identical sound circuits to 280-ZZZAP.
+// This is a netlist description for the sound circuits of Midway's 280-ZZZAP
+// and Laguna Racer, based on Midway's schematics "280 ZZZAP Game Logic P.C.
+// 0610-00907A", "Laguna Racer Game Logic A084-90700-A622", and "Laguna Racer
+// Game Logic A084-90700-B622". Midway PCB drawings for Laguna Racer and a
+// photo by Andrew Wellburn of a 280-ZZZAP game logic board were also used to
+// help determine correct values for certain components. The netlist should
+// also apply to Taito/Midway's Super Speed Race with only modest changes,
+// because that game uses very similar sound circuits to 280-ZZZAP and Laguna
+// Racer.
 
 // (Incidentally, the 280-ZZZAP schematic has some notes on changes made to
 // the circuitry during production, a few of which were to audio circuits.
@@ -19,7 +23,7 @@
 // speedups have been employed to allow the game to run at full speed on
 // modern hardware with some CPU to spare. The main sources of complexity are
 // the op-amps (15 of them, all of which are National Semiconductor LM3900
-// current-differencing "Norton-type" opamps) and the Motorola MC3340
+// current-differencing "Norton-type" op-amps) and the Motorola MC3340
 // Electronic Attenuator, the latter of which is emulated at its internal
 // component level, which includes 10 bipolar junction transistors. Several of
 // the circuits are oscillators which run at frequencies up to hundreds of
@@ -45,6 +49,20 @@
 // and crashes), and the final mix and amplification of all sounds.
 
 
+// When comparing the sound circuitry and components between 280-ZZZAP and
+// Laguna Racer, here are some things to note. There are two different
+// versions of the Laguna Racer game logic board (where the sound circuits
+// reside): A622 and B622. Midway's A622 schematic was clearly copied directly
+// from 280-ZZZAP's--even the letter indicators for change notes in
+// 280-ZZZAP's circuitry remain, though the actual notes were blanked out.
+// B622's schematics show sound circuitry differences from 280-ZZZAP and A622,
+// and these differences are consistent with Midway's PCB drawings for *both*
+// the A622 and B622 games boards. Some of them are also consistent with
+// Wellburn's 280-ZZZAP PCB photo. So it seems that actual 280-ZZZAP boards
+// lie somewhere between the 280-ZZZAP schematic and the B622 Laguna Racer
+// schematic.
+
+
 // Include special frontiers within engine sound oscillators whose purpose is
 // to improve solution convergence by reducing the oscillators' inherent
 // numeric instability. Also adjusts values of resistors associated with these
@@ -52,173 +70,63 @@
 
 #define CONVERGENCE_FRONTIERS   1
 
+// Use the fast high-level emulation of the analog noise generator, based on
+// passing the noise signal to a simple AFUNC that outputs a high or low level
+// according to the sign of the noise. This sounds the same as an accurate run
+// of the component-level noise generator, but it is fast enough to run in
+// real time.
 
-static NETLIST_START(mc3340)
-
-	// A netlist description of the Motorola MC3340 Electronic Attenuator
-	// IC, a voltage-controlled amplifier/attenuator. It amplifies or
-	// attenuates an input signal according to the voltage of a second,
-	// control signal, with a maximum gain of about 12-13 dB (about a
-	// factor of 4 in voltage), and higher control voltages giving greater
-	// attenuation, which scales logarithmically.
-
-	// The netlist here is based on the circuit schematic given in
-	// Motorola's own data books, especially the most recent ones
-	// published in the 1990s (e.g. _Motorola Analog/Interface ICs Device
-	// Data, Vol. II_ (1996), p. 9-67), which are the only schematics that
-	// include resistor values. However, the 1990s schematics are missing
-	// one crossover connection which is present in older schematics
-	// published in the 1970s (e.g. _Motorola Linear Integrated Circuits_
-	// (1979), p. 5-130). This missing connection is clearly an error
-	// which has been fixed in this netlist; without it, the circuit won't
-	// amplify properly, generating only a very weak output signal.
-
-	// The 1990s schematics also omit a couple of diodes which are present
-	// in the 1970s schematics. One of these omitted diodes noticeably
-	// raises the minimum control voltage at which signal attenuation
-	// starts; that diode has been included here, to get the netlist's
-	// profile of attenuation vs. control voltage to better match
-	// Motorola's charts for the device.
-
-	// The Motorola schematics do not label components, so I've created my
-	// own labeling scheme based on numbering components on the schematics
-	// from top to bottom, left to right, with resistors also getting
-	// their value (expressed European-style to avoid decimal points) as
-	// part of the name. The netlist is also listed following the
-	// schematics in roughly top-to-bottom, left-to-right order.
-
-	// A very simple model is used for the transistors here, based on the
-	// generic NPN default but with a larger scale current. Again, this
-	// was chosen to better match the netlist's attenuation vs. control
-	// voltage profile to that given in Motorola's charts for the device.
-
-	// The MC3340 has the same circuit internally as an older Motorola
-	// device, the MFC6040, which was replaced by the MC3340 in the
-	// mid-1970s. The two chips differ only in packaging. Older arcade
-	// games which use the MFC6040 may also benefit from this netlist
-	// implementation.
-
-	RES(R1_5K1, RES_K(5.1))
-
-	DIODE(D1_MC3340, "D(IS=1e-15 N=1)")
-
-	RES(R2_4K7, RES_K(4.7))
-
-	NET_MODEL("NPN1 NPN(IS=1E-13 BF=100)")
-
-	QBJT_EB(Q1, "NPN1")
-
-	RES(R3_750, RES_R(750))
-	RES(R4_10K, RES_K(10))
-
-	QBJT_EB(Q2, "NPN1")
-
-	RES(R5_750, RES_R(750))
-	RES(R6_3K9, RES_K(3.9))
-
-	RES(R7_5K1, RES_K(5.1))
-	RES(R8_20K, RES_K(20))
-
-	// 1970s Motorola schematics have another diode just above what I call
-	// "R9_510"; this diode doesn't seem to affect normal operation much,
-	// so I've left it out.
-	RES(R9_510, RES_R(510))
-
-	QBJT_EB(Q3, "NPN1")
-
-	QBJT_EB(Q4, "NPN1")
-
-	QBJT_EB(Q5, "NPN1")
-
-	RES(R10_1K3, RES_K(1.3))
-
-	QBJT_EB(Q6, "NPN1")
-
-	RES(R11_5K1, RES_K(5.1))
-
-	QBJT_EB(Q7, "NPN1")
-
-	QBJT_EB(Q8, "NPN1")
-
-	RES(R12_1K5, RES_K(1.5))
+#define FAST_HLE_NOISE_GEN  1
 
-	RES(R13_6K2, RES_K(6.2))
+// Enable a voltage limiter on the output of the op-amp which generates the
+// post-crash sound. This removes voltage glitches from the output which would
+// otherwise be audible when the netlist is run with a fixed 48 kHz timestep,
+// as it is in MAME.
 
-	QBJT_EB(Q9, "NPN1")
+#define REMOVE_POST_CRASH_NOISE_GLITCHES  1
 
-	RES(R14_5K1, RES_K(5.1))
 
-	QBJT_EB(Q10, "NPN1")
+// Netlists for two different games are defined in this file. These netlists
+// are mostly alike but differ in a few key components. I use Aaron Giles'
+// scheme for combining the two definitions in one file.
+//
+// Initial compilation includes this section.
+//
 
-	RES(R15_5K1, RES_K(5.1))
+#ifndef SOUND_VARIANT
 
-	RES(R16_200, RES_R(200))
 
-	RES(R17_5K1, RES_K(5.1))
+//
+// Now include ourselves twice, once for 280-ZZZAP and once for Laguna Racer.
+//
 
-	DIODE(D2_MC3340, "D(IS=1e-15 N=1)")
+#define VARIANT_280ZZZAP  0
+#define VARIANT_LAGUNAR   1
 
-	RES(R18_510, RES_R(510))
+#define SOUND_VARIANT       (VARIANT_280ZZZAP)
+#include "nl_280zzzap.cpp"
 
-	ALIAS(MC3340_VCC, R1_5K1.1)
-	NET_C(R1_5K1.1, Q1.C, Q2.C, R7_5K1.1, Q3.C, Q4.C, Q7.C,
-		R13_6K2.1, Q10.C, R17_5K1.1)
-	// Location of first diode present on 1970s schematics but omitted on
-	// 1990s ones. Including it raises the control voltage threshold for
-	// attenuation significantly.
-	NET_C(R1_5K1.2, D1_MC3340.A, Q1.B)
-	NET_C(D1_MC3340.K, R2_4K7.1)
-	NET_C(R2_4K7.2, GND)
+#undef SOUND_VARIANT
+#define SOUND_VARIANT       (VARIANT_LAGUNAR)
+#include "nl_280zzzap.cpp"
 
-	NET_C(Q1.E, R3_750.1, R5_750.1)
-	NET_C(R3_750.2, R4_10K.1, Q2.B)
-	NET_C(R4_10K.2, GND)
 
-	NET_C(R5_750.2, R6_3K9.1, Q3.B)
-	ALIAS(MC3340_CONTROL, R6_3K9.2)
-
-	ALIAS(MC3340_INPUT, Q5.B)
-
-	NET_C(MC3340_INPUT, R8_20K.1)
-	NET_C(R7_5K1.2, R8_20K.2, R9_510.1)
-	// (This is approximately where the other omitted diode, which I've
-	// left out, would go.)
-	NET_C(R9_510.2, GND)
-
-	NET_C(Q4.E, Q6.E, Q5.C)
-	NET_C(Q5.E, R10_1K3.1)
-	NET_C(R10_1K3.2, GND)
-
-	NET_C(Q6.B, Q7.B, Q2.E, R11_5K1.1)
-	NET_C(R11_5K1.2, GND)
-
-	NET_C(Q7.E, Q9.E, Q8.C)
-	NET_C(Q8.E, R12_1K5.1)
-	NET_C(R12_1K5.2, GND)
-
-	NET_C(Q4.B, Q9.B, Q3.E, R14_5K1.1)
-	NET_C(R14_5K1.2, GND)
+#else
 
-	// This is where the cross-connection is erroneously omitted from
-	// 1990s schematics.
-	NET_C(Q6.C, R13_6K2.2, Q9.C, Q10.B)
 
-	// Connection for external frequency compensation capacitor; unused
-	// here.
-	ALIAS(MC3340_ROLLOFF, Q10.B)
+//
+// Main netlist
+//
 
-	NET_C(Q10.E, R16_200.1, R15_5K1.1)
-	NET_C(R15_5K1.2, GND)
-	ALIAS(MC3340_OUTPUT, R16_200.2)
+#if (SOUND_VARIANT == VARIANT_280ZZZAP)
 
-	NET_C(R17_5K1.2, D2_MC3340.A, Q8.B)
-	NET_C(D2_MC3340.K, R18_510.1)
-	NET_C(R18_510.2, GND)
+static NETLIST_START(280zzzap_schematics)
 
-NETLIST_END()
+#else // (SOUND_VARIANT == VARIANT_LAGUNAR)
 
+static NETLIST_START(lagunar_schematics)
 
-static NETLIST_START(280zzzap_schematics)
+#endif
 
 	// **** Conversion of accelerator level to "engine speed" control
 	// **** voltage for engine sound, with capacitor-based "engine
@@ -282,15 +190,19 @@
 	RES(R62, RES_K(1))
 	RES(R61, RES_K(1))
 
-	// The 480 Kohm resistors listed here are shown as such on the
-	// 280-ZZZAP schematic and the schematic for the earlier Laguna Racer
-	// board, but this is a non-standard value. The nearest standard value
-	// is 470 Kohm, and this may have been used in production. Need to
-	// check against actual PCBs.
-	RES(R51, RES_K(480))  // 470 Kohm in later Laguna and Super Speed Race
-	RES(R46, RES_M(2))    // 2.2 Mohm in later Laguna and Super Speed Race
+	// For the following resistors R51 and R46-R49, the values given are
+	// those shown in the Laguna Racer PCB drawings, the Laguna Racer B622
+	// board schematic, the Super Speed Race schematic, and Andrew
+	// Wellburn's 280-ZZZAP PCB photo. In the 280-ZZZAP schematic (and the
+	// Laguna Racer A622 board schematic, a near copy), R51 and R48 are
+	// 480 Kohms and R46 is 2 Mohms, but these seem to be errors in that
+	// schematic. 480 Kohm is not even a standard resistor value for any
+	// tolerance band, so it could not have been used on production
+	// boards.
+	RES(R51, RES_K(470))
+	RES(R46, RES_M(2.2))
 	RES(R47, RES_M(1))
-	RES(R48, RES_K(480))  // 470 Kohm in later Laguna and Super Speed Race
+	RES(R48, RES_K(470))
 	RES(R49, RES_K(240))
 
 	RES(R50, RES_K(100))
@@ -308,7 +220,19 @@
 	RES(R59, RES_K(560))
 	RES(R60, RES_K(10))
 
-	CAP(C18, CAP_U(47))  // 22 uF in later Laguna and Super Speed Race
+	// The size of capacitor C18 varies with the game: 47 uF in 280-ZZZAP,
+	// 22 uF in Laguna Racer and Super Speed Race:
+
+#if (SOUND_VARIANT == VARIANT_280ZZZAP)
+
+	CAP(C18, CAP_U(47))
+
+#else // (SOUND_VARIANT == VARIANT_LAGUNAR)
+
+	CAP(C18, CAP_U(22))
+
+#endif
+
 	NET_C(C18.2, GND)
 
 	CAP(C19, CAP_U(2.2))
@@ -398,6 +322,8 @@
 	// These are the remaining connections from H5_4.OUT:
 	NET_C(H5_4.OUT, R36.1, R37.1, R31.1, R32.1, R29.1, R30.1)
 
+	MC3340_DIP(MC3340_H2)
+
 	CD4016_DIP(J4)
 
 	// First oscillator (bottommost in schematics).
@@ -485,26 +411,60 @@
 	NET_C(J3_4.OUT, R35.1, J4.5)
 	NET_C(I_V5.Q, R34.1)
 	NET_C(J3_4.PLUS, R34.2, R35.2)
-	NET_C(C16.2, MC3340_INPUT)  // to MC3340 H2 pin 1
+	NET_C(C16.2, MC3340_H2.1)  // to MC3340 input pin
 
 	// Third oscillator (topmost in schematics).
-	// This is the amplitude-modulation oscillator.
-	// Schematic shows frequency of "428 Hz", but when modeled without a
-	// frontier, the maximum in low gear is 465 Hz.
-	// With a frontier, uncompensated, this decreases to 442 Hz.
+
+	// This is the amplitude-modulation oscillator, whose frequency
+	// differs slightly between 280-ZZZAP and the later games, Laguna
+	// Racer and Super Speed Race. This difference distinctly changes the
+	// tone of the engine sound.
+	// The 280-ZZZAP and Laguna Racer schematics all show a frequency of
+	// "428 Hz", but for 280-ZZZAP, when equipped with a 110 Kohm resistor
+	// and modeled without a frontier, the maximum in low gear is 465 Hz;
+	// with a frontier, uncompensated, this decreases to 442 Hz.
+	// For Laguna Racer, when equipped with a 100 Kohm resistor and
+	// modeled without a frontier, the maximum low gear frequency is 511
+	// Hz; with a frontier, uncompensated, it's 482 Hz.
 
 	LM3900(J3_2)
 	LM3900(J3_1)
 
 	RES(R29, RES_K(220))
-	RES(R30, RES_K(110))  // 100 Kohm in later Laguna and Super Speed Race
+
+	// The value of resistor R30 is what changes the engine sound between
+	// 280-ZZZAP and the later games. The 280-ZZZAP schematic indicates
+	// that it is 110 Kohm in that game. This resistor is hidden on Andrew
+	// Wellburn's 280-ZZZAP PCB photo, but the sound resulting from 110
+	// Kohm is more consistent with actual 280-ZZZAP machines than that
+	// from 100 Kohm.
+	// The resistor is 100 Kohm in the B622 Laguna Racer and Super Speed
+	// Race schematics and on the PCB drawings for both Laguna Racer board
+	// versions, so I assume all Laguna Racer versions had this value.
+#if (SOUND_VARIANT == VARIANT_280ZZZAP)
+
+	RES(R30, RES_K(110))
+
+#else // (SOUND_VARIANT == VARIANT_LAGUNAR)
+
+	RES(R30, RES_K(100))
+
+#endif
+
 	RES(R28, RES_K(100))
 
 #if CONVERGENCE_FRONTIERS
 	// Schmitt trigger resistors changed to compensate for waveform changes
-	// from use of frontier:
+	// from use of frontier.
+	// Since the different games have different oscillator frequencies,
+	// the compensated values of these resistors differ slightly as well.
+#if (SOUND_VARIANT == VARIANT_280ZZZAP)
 	RES(R26, RES_K(455))
 	RES(R27, RES_K(284))
+#else // (SOUND_VARIANT == VARIANT_LAGUNAR)
+	RES(R26, RES_K(453))
+	RES(R27, RES_K(286))
+#endif
 #else
 	RES(R26, RES_K(470))
 	RES(R27, RES_K(270))
@@ -535,7 +495,7 @@
 	NET_C(J3_1.OUT, R27.1, J4.13)
 	NET_C(I_V5.Q, R26.1)
 	NET_C(J3_1.PLUS, R26.2, R27.2)
-	NET_C(D1.K, R23.2, C13.2, R25.1, MC3340_CONTROL)  // to MC3340 H2 pin 2
+	NET_C(D1.K, R23.2, C13.2, R25.1, MC3340_H2.2)  // to MC3340 ctrl pin
 
 	// The MC3340's output is the complete engine sound, which is sent to
 	// the final mix.
@@ -546,30 +506,62 @@
 	// **** (NOISE_CR_2).
 
 	// The noise generator circuit for 280-ZZZAP and Laguna Racer is based
-	// on a reverse-biased 9.1-volt 1N5239 Zener diode which generates a
-	// noisy current for an LM3900 Norton op-amp input. The op-amp then
-	// amplifies the noise in that current to generate more intense noise
-	// for the other circuits.
-
-	// The netlist library supports Zener diodes, but not their noise
-	// behavior, so I simulate it with an additional source of noise
-	// voltage, inserted in series between the Zener and the op-amp input.
-
+	// on a reverse-biased 9.1-volt 1N5239 zener diode which generates a
+	// noisy current for an LM3900 Norton op-amp input. This op-amp then
+	// amplifies the noise so strongly that its output saturates, randomly
+	// oscillating between the maximum and mininum values, producing a
+	// quasi-digital random waveform which is then smoothed and filtered
+	// by another op-amp to form a continuous analog noise signal.
+	// Following circuits re-filter and reshape this noise for the
+	// noise-based sound effects.
+	//
+	// The noise of zener diodes is not well controlled during their
+	// manufacture, and it can vary widely in strength from one part to
+	// another even within a single production lot. However, this
+	// op-amp-based noise generator takes zener noise of unpredictable
+	// strength and converts it into an analog noise stream whose strength
+	// is predictable, determined by the response of the op-amp circuits.
+	//
 	// Super Speed Race generates its noise in a different fashion, using
-	// a linear-feedback shift register on the main motherboard. However,
-	// it processes the noise signal through similar sound effect
-	// circuits.
-
+	// a linear-feedback shift register on the main motherboard to
+	// generate a true digital random noise signal. However, once this
+	// digital noise has been generated, it gets smoothed and filtered
+	// into continuous analog form in the same way and is further
+	// processed through similar sound effect circuits.
+	//
 	// Since the noise generator discrete components are unlabeled on the
 	// 280-ZZZAP and Laguna Racer schematics and are not present in Super
 	// Speed Race, I've chosen my own labels for them.
-
-	// Simple model of a 1N5239 9.1-volt Zener diode; according to
-	// datasheets, this diode conducts 20 mA of current at 9.1 V reverse
-	// bias. The amount of noise produced by the generator turns out to
-	// depend on NBV, as does the mean voltage. I choose NBV=1 to maximize
-	// the noise and reduce the mean voltage offset.
-	ZDIODE(ZD_1N5239, "D(BV=9.1 IBV=0.020 NBV=1)")
+	//
+	// The netlist library supports zener diodes, but not zener noise. The
+	// noise is simulated using an additional source of noise voltage.
+	// This noise is handled in one of two ways, depending on how the
+	// netlist is configured.
+	//
+	// If the netlist is configured for detailed circuit simulation, the
+	// noise source is inserted in series between the zener diode's output
+	// and the op-amp's non-inverting input. This netlist configuration
+	// tries to accurately reproduce the amplified noise signal which the
+	// op-amp would generate. Because of the rapidly changing noise signal
+	// and the op-amp's high gain, however, producing an accurate,
+	// glitch-free signal requires using dynamic time-stepping with a very
+	// short minimum time step on the order of 10 nanoseconds. This has an
+	// unacceptable impact on performance and is unsuitable for real-time
+	// operation, like in a normal MAME session.
+	//
+	// For such operation, a simpler high-level emulation configuration is
+	// used. Because of the very high gain of the op-amp, the real output
+	// signal will always lie at either the op-amp's maximum or minimum
+	// output value, almost never being in between. So we take the same
+	// input noise signal and replace the op-amp with a simple AFUNC()
+	// module which only checks the input signal's sign and outputs the
+	// corresponding maximum or minimum value. This version runs much
+	// faster, not requiring dynamic time-stepping at all for a
+	// glitch-free result, and its output is very similar to running the
+	// detailed emulation with a short minimum timestep. Once the output
+	// has been smoothed and filtered, the two configurations will be
+	// effectively identical, and there will be no difference in the
+	// resulting sound effects except for how fast they are computed.
 
 	// 24 kHz noise clock for the noise source, chosen to retain noise
 	// frequencies as high as possible for 48 kHz sample rate.
@@ -577,14 +569,52 @@
 	NET_C(I_V5.Q, NCLK.VCC)
 	NET_C(GND, NCLK.GND)
 
-	// Normally-distributed noise of 10 microvolts RMS voltage.
-	// With the Zener above using NBV=1, this seems to be good enough.
-	// Increasing it further begins to distort the NOISE_CR_2 post-crash
-	// noise while not adding much volume to the NOISE_CR_1 skid noise.
-	SYS_NOISE_MT_N(NOISE, 10e-6)
+	// Normally-distributed noise of 10 millivolts RMS voltage. With the
+	// zener passing about 25 microamps of current, the real noise may be
+	// even stronger than this, but this is strong enough to cause the
+	// op-amp to saturate its output, which this noise generator is
+	// designed to do.
+	// (If the simplified noise generator netlist is being used, the noise
+	// signal is re-centered on zero volts, and its amplitude no longer
+	// matters, only its sign.)
+	SYS_NOISE_MT_N(NOISE, 0.01)
 
 	NET_C(NCLK.Q, NOISE.I)
 
+	// Both the quasi-digital noise signal produced by the 280-ZZZAP and
+	// Laguna Racer noise generators and the digital noise signal produced
+	// by the Super Speed Race noise generator enter at the upstream end
+	// of capacitor C1.
+
+	CAP(C1, CAP_U(10))
+
+#if FAST_HLE_NOISE_GEN
+
+	// Simplified high-level emulation of the noise generator: oscillate
+	// between full on and full off according to the sign of the noise
+	// input.
+
+	NET_C(NOISE.1, A_NOISE.A0)
+	NET_C(NOISE.2, GND)
+	AFUNC(A_NOISE, 1, "if(A0 > 0, 4.5, 0.03)")
+
+	NET_C(A_NOISE.Q, C1.1)
+
+#else
+
+	// Simple model of a 1N5239 9.1-volt Zener diode. The 1N5239 is
+	// specified to conduct 20 mA of current at its nominal breakdown
+	// voltage of 9.1 V. The model produces an exponential I-V curve,
+	// passing through this point, which has the same general shape as
+	// that of a normal forward-biased diode. NBV is an exponent scale
+	// factor; its value here of 1 gives the curve a steep rise and a
+	// relatively sharp knee. Actual breakdown I-V curves have an even
+	// steeper rise and sharper knee, too steep and sharp to be
+	// represented by an exponential, but this model is good enough for
+	// this emulation, since the diode operates very close to a single
+	// point on the curve.
+	ZDIODE(ZD_1N5239, "D(BV=9.1 IBV=0.020 NBV=1)")
+
 	RES(RNOISE0, RES_K(100))
 	CAP(CNOISE0, CAP_U(10))
 	NET_C(CNOISE0.2, GND)
@@ -594,6 +624,9 @@
 
 	LM3900(H4_2)
 
+	NET_C(I_V5.Q, H4_2.VCC)
+	NET_C(GND, H4_2.GND)
+
 	RES(RNOISE1, RES_K(56))
 	RES(RNOISE2, RES_K(47))
 	RES(RNOISE3, RES_K(1))
@@ -608,17 +641,16 @@
 	NET_C(H4_2.OUT, RNOISE2.2, RNOISE3.1, C1.1)
 	NET_C(RNOISE3.2, GND)
 
-	// In Super Speed Race, which lacks the noise generator described
-	// above, the noise signal enters at the upstream end of capacitor C1.
-
-	CAP(C1, CAP_U(10))
+#endif
 
 	NET_C(C1.2, R1.1)
 
 	// The noise generator is followed by a single-amplifier active
 	// low-pass filter with a corner frequency of about 6.3 kHz, a very
-	// broad Q of 0.014, and a gain of about 0.8. This filter basically
-	// attenuates the highest noise frequencies.
+	// broad Q of 0.014, and a gain of about 0.8. This filter attenuates
+	// the very highest noise frequencies, converting the initial
+	// quasi-digital noise waveform into a smoother analog noise waveform
+	// that is still of pretty high frequency.
 
 	RES(R1, RES_K(330))  // 680 Kohm in Super Speed Race
 
@@ -637,8 +669,8 @@
 	NET_C(H4_1.PLUS, R3.2)
 	NET_C(H4_1.OUT, C3.2, R4.2, R5.1, R17.1, C5.1, C4.1)
 
-	// The low-pass-filtered noise is passed to three different
-	// sound-effect circuits, each of which is also an active-filter type.
+	// The smoothed analog noise is passed to three different sound-effect
+	// circuits, each of which is also an active-filter type.
 
 	// First noise circuit: tire skid (NOISE_CR_1)
 
@@ -648,10 +680,8 @@
 
 	// The result is a high-pitched "tire skid" screeching sound.
 
-	// The circuit appears to be taken almost verbatim from page 19 of
-	// National Semiconductor's Application Note 72 about the LM3900, with
-	// only minor changes in the values of a few components to alter the
-	// DC bias.
+	// The circuit appears to be taken practically verbatim from page 19 of
+	// National Semiconductor's Application Note 72 about the LM3900.
 
 	CD4016_DIP(G4)
 
@@ -678,9 +708,17 @@
 
 	LM3900(H4_4)
 
+	// For resistor R11, the value given is that shown in the Laguna Racer
+	// PCB drawings, the Laguna Racer B622 board schematic, the Super
+	// Speed Race schematic, and Andrew Wellburn's 280-ZZZAP PCB photo. In
+	// the 280-ZZZAP schematic and the near-copy Laguna Racer A622 board
+	// schematic, R11 is 100 Kohms, but this seems to be a schematic
+	// error. (The original National Semiconductor Application Note 72
+	// from which this circuit was apparently taken also uses 120 Kohm for
+	// R11.)
 	RES(R9, RES_K(39))
 	RES(R10, RES_K(62))   // 240 Kohm in Super Speed Race
-	RES(R11, RES_K(100))  // 120 Kohm in later Laguna and Super Speed Race
+	RES(R11, RES_K(120))
 	RES(R12, RES_K(62))
 
 	NET_C(H4_4.MINUS, R9.2, R11.1)
@@ -698,8 +736,8 @@
 	// number. (I'm not sure what effect this has on a filter, but it
 	// might indicate instability.)
 
-	// The result is saturated, clipped noise, a bit like randomized
-	// square waves, with frequencies mainly below 1 kHz.
+	// The result is saturated, heavily clipped noise with frequencies
+	// mainly below 1 kHz.
 
 	// I don't know why the circuit was designed this way, or whether it
 	// was deliberate or a design or production error which the makers
@@ -728,7 +766,21 @@
 	NET_C(H5_2.MINUS, R15.2, C9.1)
 	NET_C(I_V5.Q, R14.1)
 	NET_C(H5_2.PLUS, R14.2)
+#if REMOVE_POST_CRASH_NOISE_GLITCHES
+	// With the static time-stepping used to ensure acceptable performance
+	// with MAME, this part of the netlist will generate extra spikes on
+	// the op-amp output with voltages outside of the real op-amp's output
+	// range. These spikes give the sound an unwanted "grittiness" not in
+	// the original, so I've added a voltage-limiting AFUNC to the op-amp
+	// output beyond its feedback connection. This gives a smoother sound,
+	// closer to the original.
+
+	NET_C(H5_2.OUT, C9.2, R13.2, H5_2_LIM.A0)
+	AFUNC(H5_2_LIM, 1, "max(min(A0, 4.5), 0)")
+	NET_C(H5_2_LIM.Q, G4.8)
+#else
 	NET_C(H5_2.OUT, C9.2, R13.2, G4.8)
+#endif
 	NET_C(G4.9, R64.1)
 	NET_C(G4.6, NOISE_CR_2)
 
@@ -742,17 +794,21 @@
 	// The filter is normally cut off from the noise signal, and thus it
 	// remains quiet. When the BOOM signal is activated, CD4016 switch
 	// G4_A opens, letting in the noise to be filtered and amplified until
-	// the switch is cut off again, generating a loud sort of "boom".
-	// (The sound doesn't have much decay, though; it gets cut abruptly.)
+	// the switch is cut off again, generating a loud, fairly deep "boom".
+	// (The "boom" doesn't have much decay, though; it gets cut abruptly.)
 
 	LM3900(H5_1)
 
-	// On the 280-ZZZAP game logic board schematic, resistor R18 (which is
-	// not labeled as such) is a 2.2K resistor, but it has a note "E"
-	// stating that one of the changes made after the first 325 units was:
-	// "2.2K resistor at G4 pin 2 was 6.8K." I interpret this to mean that
-	// the resistor was lowered to 2.2K from 6.8K.
+	// Resistor R18, part of the BOOM filter, is 2.2 Kohms on the
+	// 280-ZZZAP schematic as well as in Laguna Racer, but the 280-ZZZAP
+	// schematic has a note "E" saying that the first 325 machines had a
+	// 6.8 Kohm resistor here instead. Andrew Wellburn's 280-ZZZAP board
+	// photo may show such a resistor. With this larger resistor, the
+	// filter's values are: center frequency 54 Hz, Q 16.9, gain 73.5; so
+	// the filter is slightly broader, pitched a bit lower, and has only a
+	// third as much gain. Still, the basic effect is the same.
 	RES(R18, RES_K(2.2))  // 20 Kohm in Super Speed Race
+
 	RES(R19, RES_K(1))
 	RES(R20, RES_M(3.3))
 	RES(R21, RES_M(1))    // 1.5 Mohm in Super Speed Race
@@ -774,70 +830,111 @@
 	// **** Final mix of sound effects and sound preamplification.
 
 	// The preamplification stage after the final mix has two LM3900
-	// op-amps, only one of which is modeled here. This is because of the
-	// way the speaker is driven. The power amplification that drives the
-	// speaker is done by a National Semiconductor LM377 dual audio power
-	// amplifier chip, with the chip's two amplifiers wired in a so-called
-	// "bridge configuration" to drive the speaker's positive and negative
-	// terminals in a push-pull fashion. This effectively converts the
-	// dual power amp into a single amp of twice the power.
-
-	// The preamplified input signals for these power amps are generated
-	// from the final mix by the two LM3900s, each driving one power amp.
-	// The first LM3900, J5_3, also preamplifies the final mix signal,
-	// sending its output to the first power amp. The second LM3900, J5_4,
-	// simply inverts J5_3's output so it can drive the second power amp
-	// in opposing fashion. Since the second LM3900 doesn't otherwise
-	// alter the output signal, and we don't care about power
-	// amplification, this op-amp and its associated circuitry can be
-	// omitted.
+	// op-amps. The audio power amplifier beyond it is a National
+	// Semiconductor LM377 integrated dual power amp, with two 2-watt
+	// power amps on the same chip. Both of these power amps drive the
+	// single speaker from opposite ends in a push-pull fashion, a
+	// so-called "bridge configuration" which effectively converts the
+	// dual 2-watt power amp into a single 4-watt amp.
+
+	// The two power amps get their inputs from the outputs of the two
+	// LM3900 op-amps. The first LM3900, J5_3, pre-amplifies the signal
+	// from the final mix and has a master volume potentiometer to control
+	// its gain. Its output gets sent directly to one power amp and is
+	// also passed to the second LM3900, J5_4, which inverts the signal
+	// without changing the gain. The inverted signal is sent to the
+	// second power amp that drives the speaker's other end. The first
+	// LM3900 is AC-coupled to the second, and both are AC-coupled to the
+	// power amps. As a result, the output signal of the second LM3900
+	// more closely resembles the final output in waveform and tone
+	// quality than the first LM3900's output does, so I have chosen the
+	// second LM3900 as the final output for the emulation. The power amps
+	// themselves are not emulated.
+
+	// The master volume potentiometer is user-adjustable and is set to
+	// its midpoint by default. Higher settings may produce clipped,
+	// distorted output, but since the power amps are configured for a
+	// voltage gain of 20 and use a 20 V power supply, this is likely true
+	// for the original hardware as well.
 
 	RES(R63, RES_K(12))  // 3 Kohm in Super Speed Race
 	RES(R64, RES_K(150))
-	// On the 280-ZZZAP game logic board schematic, resistor R65 (which is
-	// not labeled as such) is a 12K resistor, but it has a note "F"
-	// stating that one of the changes made after the first 325 units was:
-	// "12K resistor in series with 10MF cap and J5 pin 8 was 4.3K." I
-	// interpret this to mean that the resistor was raised to 12K from
-	// 4.3K.
+
+	// Resistor R65, the mixing resistor for the BOOM effect, is 12 Kohms
+	// on the 280-ZZZAP schematic and in Laguna Racer and Super Speed
+	// Race, but the 280-ZZZAP schematic has a note "F" saying that the
+	// first 325 machines had a 4.3 Kohm resistor here instead. Andrew
+	// Wellburn's 280-ZZZAP board photo shows such a resistor. The lower
+	// resistor makes the BOOM effect much louder, countering the reduced
+	// gain on its generating filter described above. In fact, it makes it
+	// loud enough to be clipped by the post-mixer op-amps; turning down
+	// the volume to prevent this clipping makes all other sounds quieter
+	// by comparison. This may explain why both the mixing resistor and
+	// the filter resistor were changed in later machines.
 	RES(R65, RES_K(12))
+
 	RES(R66, RES_K(33))
 
 	CAP(C20, CAP_U(10))
 	CAP(C21, CAP_U(10))
 
 	NET_C(R63.2, R64.2, R65.2, C20.1)
-	NET_C(MC3340_OUTPUT, R66.1)
+	NET_C(MC3340_H2.7, R66.1)  // MC3340 output pin
 	NET_C(R66.2, C21.1)
 
 	LM3900(J5_3)
+	LM3900(J5_4)
 
 	RES(R67, RES_K(2))
 	CAP(C22, CAP_U(10))
 	RES(R68, RES_K(220))
+	RES(R74, RES_K(220))
 
 	NET_C(I_V5.Q, R67.1)
-	NET_C(R67.2, C22.1, R68.1)
+	NET_C(R67.2, C22.1, R68.1, R74.1)
 	NET_C(C22.2, GND)
 	NET_C(J5_3.PLUS, R68.2)
+	NET_C(J5_4.PLUS, R74.2)
 
 	RES(R69, RES_K(100))
-	RES(R70, RES_K(10))  // actually a potentiometer, at max. volume
+	POT2(R70, RES_K(10))  // Master volume potentiometer (2 terminals)
 	CAP(C23, CAP_U(10))
+	CAP(C24, CAP_U(0.1))
+	RES(R73, RES_K(100))
+	RES(R75, RES_K(100))
 
 	NET_C(R70.2, C23.2)
 	NET_C(J5_3.MINUS, C20.2, C21.2, R69.1, R70.1)
-	NET_C(J5_3.OUT, C23.1, R69.2)
+	NET_C(J5_3.OUT, C23.1, R69.2, C24.1)
+	NET_C(C24.2, R73.1)
+	NET_C(J5_4.MINUS, R73.2, R75.1)
+	NET_C(J5_4.OUT, R75.2)
 
-	ALIAS(OUTPUT, J5_3.OUT)
+	ALIAS(OUTPUT, J5_4.OUT)
 
 NETLIST_END()
 
 
+#if (SOUND_VARIANT == VARIANT_280ZZZAP)
+
 NETLIST_START(280zzzap)
 
+#else // (SOUND_VARIANT == VARIANT_LAGUNAR)
+
+NETLIST_START(lagunar)
+
+#endif
+
 	SOLVER(Solver, 48000)
 
+#if !(FAST_HLE_NOISE_GEN)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	// 10 ns is the minimum timestep to avoid significant spikes outside
+	// the allowed LM3900 output region of 0-4.5 V; even 20 ns gives
+	// frequent spikes into the 4.5-5 volt region.
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 1e-8)
+#endif
+
 	// All together, loosening both tolerances and reducing accuracy
 	// increases speed by ~10%, but it also causes audible "crackling".
 //  PARAM(Solver.RELTOL, 1e-2) // default 1e-3 (several % faster, but < quality)
@@ -851,16 +948,23 @@
 	ANALOG_INPUT(I_V12, 12)
 	ANALOG_INPUT(I_V5, 5)
 
-	LOCAL_SOURCE(mc3340)
-	INCLUDE(mc3340)
-
-	// The MC3340 gets 12-volt power in 280-ZZZAP and Laguna Racer.
-	// In Super Speed Race it gets 5-volt power.
-	NET_C(I_V12.Q, MC3340_VCC)
+#if (SOUND_VARIANT == VARIANT_280ZZZAP)
 
 	LOCAL_SOURCE(280zzzap_schematics)
 	INCLUDE(280zzzap_schematics)
 
+#else // (SOUND_VARIANT == VARIANT_LAGUNAR)
+
+	LOCAL_SOURCE(lagunar_schematics)
+	INCLUDE(lagunar_schematics)
+
+#endif
+
+	// The MC3340 gets 12-volt power in 280-ZZZAP and Laguna Racer.
+	// In Super Speed Race it gets 5-volt power.
+	NET_C(I_V12.Q, MC3340_H2.8)
+	NET_C(GND, MC3340_H2.3)
+
 	// Logic inputs which represent output pins from 74174 latches at F4
 	// and F5
 	LOGIC_INPUT(I_F4_2, 0, "74XX")  // BOOM
@@ -910,16 +1014,18 @@
 	// Power inputs for the LM3900 op-amps. These aren't shown on the
 	// schematics, but it looks like 5-volt power is needed to get proper
 	// results.
+	// (H4_2, the noise generator op-amp, is not listed here because it's
+	// inside the #else clause of the #if FAST_HLE_NOISE_GEN conditional.)
 	NET_C(I_V5.Q,
-		  H4_1.VCC, H4_2.VCC, H4_3.VCC, H4_4.VCC,
-		  H5_1.VCC, H5_2.VCC, H5_3.VCC, H5_4.VCC,
-		  J3_1.VCC, J3_2.VCC, J3_3.VCC, J3_4.VCC,
-		  J5_1.VCC, J5_2.VCC, J5_3.VCC)
+		H4_1.VCC, H4_3.VCC, H4_4.VCC,
+		H5_1.VCC, H5_2.VCC, H5_3.VCC, H5_4.VCC,
+		J3_1.VCC, J3_2.VCC, J3_3.VCC, J3_4.VCC,
+		J5_1.VCC, J5_2.VCC, J5_3.VCC, J5_4.VCC)
 	NET_C(GND,
-		  H4_1.GND, H4_2.GND, H4_3.GND, H4_4.GND,
-		  H5_1.GND, H5_2.GND, H5_3.GND, H5_4.GND,
-		  J3_1.GND, J3_2.GND, J3_3.GND, J3_4.GND,
-		  J5_1.GND, J5_2.GND, J5_3.GND)
+		H4_1.GND, H4_3.GND, H4_4.GND,
+		H5_1.GND, H5_2.GND, H5_3.GND, H5_4.GND,
+		J3_1.GND, J3_2.GND, J3_3.GND, J3_4.GND,
+		J5_1.GND, J5_2.GND, J5_3.GND, J5_4.GND)
 
 	// Power inputs for the CD4016 switches. Again, these aren't shown on
 	// the schematics, but 5-volt power must be used for the switches to
@@ -930,11 +1036,13 @@
 	NET_C(GND, G5.10, G5.11, G5.12, J4.6, J4.8, J4.9, G4.10, G4.11, G4.12)
 
 	// Frontier after output of noise generator.
-	// This makes a speed boost of ~10%.
+	// FIXME: Anomaly - with FAST_HLE_NOISE_GEN set, this frontier cannot
+	// be removed, because doing so kills the noise entirely, even though
+	// the AFUNC is still generating the same output. Perhaps an AFUNC
+	// output by itself won't change the capacitor state?
 	OPTIMIZE_FRONTIER(C1.1, RES_M(1), 50)
 
 	// Frontier before skid screech generator.
-	// This makes a speed boost of ~8%.
 	OPTIMIZE_FRONTIER(R5.1, RES_K(39), 50)
 	// (Adding a frontier *after* the skid screech generator makes the
 	// sudden jumps in signal level on skids much larger, so the resulting
@@ -942,28 +1050,27 @@
 	// nothing for speed. That's why I don't have such a frontier.)
 
 	// Frontiers after NOISE CR 2 and BOOM generators.
-	// Each of these boosts speed by several percent and reduces
-	// NEWTON_LOOPS warnings.
 	OPTIMIZE_FRONTIER(R64.1, RES_K(150), 50)
 	OPTIMIZE_FRONTIER(R65.1, RES_K(12), 50)
 
 	// Frontier after engine sound generation.
-	// This makes a speed boost of ~5%.
 	OPTIMIZE_FRONTIER(R66.1, RES_K(33), 50)
 
 	// Frontiers before MC3340 inputs.
-	// Together, these make a speed boost of ~15%.
 	OPTIMIZE_FRONTIER(C16.1, RES_M(1), 50)
 	OPTIMIZE_FRONTIER(C13.1, RES_M(1), 50)
 
 	// Frontiers before engine sound op-amp oscillators.
-	// All together, these make a speed boost of ~12%.
 	OPTIMIZE_FRONTIER(R36.1, RES_K(560), 50)
 	OPTIMIZE_FRONTIER(R37.1, RES_K(270), 50)
 	OPTIMIZE_FRONTIER(R31.1, RES_K(300), 50)
 	OPTIMIZE_FRONTIER(R32.1, RES_K(150), 50)
 	OPTIMIZE_FRONTIER(R29.1, RES_K(220), 50)
+#if (SOUND_VARIANT == VARIANT_280ZZZAP)
 	OPTIMIZE_FRONTIER(R30.1, RES_K(110), 50)
+#else // (SOUND_VARIANT == VARIANT_LAGUNAR)
+	OPTIMIZE_FRONTIER(R30.1, RES_K(100), 50)
+#endif
 
 #if CONVERGENCE_FRONTIERS
 	// Frontiers at Schmitt trigger op-amp outputs of engine sound
@@ -973,7 +1080,14 @@
 	// otherwise change the oscillator waveforms.
 	OPTIMIZE_FRONTIER(R40.1, RES_K(275), 50)
 	OPTIMIZE_FRONTIER(R35.1, RES_K(281), 50)
+#if (SOUND_VARIANT == VARIANT_280ZZZAP)
 	OPTIMIZE_FRONTIER(R27.1, RES_K(284), 50)
+#else // (SOUND_VARIANT == VARIANT_LAGUNAR)
+	OPTIMIZE_FRONTIER(R27.1, RES_K(286), 50)
+#endif
 #endif
 
 NETLIST_END()
+
+
+#endif
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_280zzzap.h mame-0.224+dfsg.1/src/mame/audio/nl_280zzzap.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_280zzzap.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_280zzzap.h	2020-08-26 08:57:19.000000000 +0000
@@ -8,5 +8,6 @@
 #include "netlist/nl_setup.h"
 
 NETLIST_EXTERNAL(280zzzap)
+NETLIST_EXTERNAL(lagunar)
 
 #endif // MAME_AUDIO_NL_280ZZZAP_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_armora.cpp mame-0.224+dfsg.1/src/mame/audio/nl_armora.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_armora.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_armora.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,681 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Armor Attack
+//
+// Derived from the schematics in the Armor Attack manual.
+//
+// Known problems/issues:
+//
+//    * Worked pretty well the first time.
+//
+//    * The squeak on the tank treads is not right, need to
+//       understand what's going on.
+//
+//    * Entire schematic needs a verification pass.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_cinemat_common.h"
+
+
+//
+// Optimizations
+//
+
+#define HLE_TANK_VCO (1)
+
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(armora)
+
+#if (HLE_TANK_VCO)
+	SOLVER(Solver, 1000)
+#else
+	SOLVER(Solver, 4800000)
+#endif
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	TTL_INPUT(I_OUT_0, 0)               // active high
+	TTL_INPUT(I_OUT_1, 0)               // active high
+	TTL_INPUT(I_OUT_2, 0)               // active high
+	TTL_INPUT(I_OUT_3, 0)               // active high
+	TTL_INPUT(I_OUT_4, 0)               // active high
+	TTL_INPUT(I_OUT_7, 0)               // active high
+
+	NET_C(GND, I_OUT_0.GND, I_OUT_1.GND, I_OUT_2.GND, I_OUT_3.GND, I_OUT_4.GND, I_OUT_7.GND)
+	NET_C(I_V5, I_OUT_0.VCC, I_OUT_1.VCC, I_OUT_2.VCC, I_OUT_3.VCC, I_OUT_4.VCC, I_OUT_7.VCC)
+
+	CINEMAT_LOCAL_MODELS
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V15, 15)
+	ANALOG_INPUT(I_VM15, -15)
+
+	RES(R1, RES_K(1))
+	RES(R2, RES_K(1.3))
+	RES(R3, RES_K(1.3))
+	RES(R4, RES_K(2))
+	RES(R5, RES_K(2))
+	RES(R6, RES_K(12))
+	RES(R7, RES_K(24))
+	RES(R8, RES_K(1))
+	RES(R9, RES_K(2))
+	RES(R10, RES_K(1))
+	RES(R11, RES_K(3.6))
+	RES(R12, RES_K(10))
+	RES(R13, RES_K(1))
+	RES(R14, RES_K(240))
+	RES(R15, RES_K(22))
+	RES(R16, RES_K(22))
+	RES(R17, RES_K(22))
+	RES(R18, RES_K(20))
+	RES(R19, RES_K(430))
+	RES(R20, RES_M(1.5))
+	RES(R21, RES_K(390))
+	RES(R22, RES_M(1.5))
+	RES(R23, RES_K(51))
+//  RES(R24, RES_K(390))  -- part of final amp (not emulated)
+//  RES(R25, RES_K(390))  -- part of final amp (not emulated)
+	RES(R26, RES_M(1))
+	RES(R27, RES_K(4.7))
+	RES(R28, RES_K(2.7))
+	RES(R29, RES_K(4.7))
+	RES(R30, RES_K(39))
+	RES(R31, RES_K(12))
+	RES(R32, RES_K(1))
+	RES(R33, RES_K(240))
+	RES(R34, RES_K(18))
+	RES(R35, RES_K(16))
+	RES(R36, RES_K(7.5))
+	RES(R37, 620)
+	RES(R38, 620)
+	RES(R39, RES_K(4.7))
+	RES(R40, RES_K(2.7))
+	RES(R41, RES_K(4.7))
+	RES(R42, RES_K(39))
+	RES(R43, RES_K(12))
+	RES(R44, RES_K(1))
+	RES(R45, RES_K(150))
+	RES(R46, RES_K(20))
+	RES(R47, RES_K(22))
+	RES(R48, RES_K(30))
+	RES(R49, 680)
+	RES(R50, 680)
+	RES(R51, RES_K(4.7))
+	RES(R52, RES_K(2.7))
+	RES(R53, RES_K(4.7))
+	RES(R54, RES_K(39))
+	RES(R55, RES_K(12))
+	RES(R56, RES_K(1))
+	RES(R57, RES_K(220))
+	RES(R58, RES_K(10))
+	RES(R59, RES_K(47))
+	RES(R60, 750)
+	RES(R61, 750)
+	RES(R62, RES_K(4.7))
+	RES(R63, RES_K(2.7))
+	RES(R64, RES_K(4.7))
+	RES(R65, RES_K(39))
+	RES(R66, RES_K(12))
+	RES(R67, RES_K(1))
+	RES(R68, RES_K(910))
+	RES(R69, RES_K(8.2))
+	RES(R70, RES_K(43))
+	RES(R71, RES_K(22))
+	RES(R72, 750)
+	RES(R73, 750)
+	RES(R74, RES_K(4.7))
+	RES(R75, RES_K(2.7))
+	RES(R76, RES_K(4.7))
+	RES(R77, RES_K(39))
+	RES(R78, RES_K(12))
+	RES(R79, RES_K(1))
+	RES(R80, RES_K(750))
+	RES(R81, RES_K(20))
+	RES(R82, RES_K(8.2))
+	RES(R83, RES_K(330))
+//  RES(R84, RES_K(15))   -- part of final amp (not emulated)
+//  RES(R85, 150)         -- part of final amp (not emulated)
+//  RES(R86, RES_K(22))   -- part of final amp (not emulated)
+//  RES(R87, 150)         -- part of final amp (not emulated)
+//  RES(R88, 0.51)        -- part of final amp (not emulated)
+//  RES(R89, 0.51)        -- part of final amp (not emulated)
+	RES(R90, RES_K(100))
+	RES(R91, RES_K(8.2))
+	RES(R92, RES_K(20))
+//  POT(R93, RES_K(10))   -- part of final amp (not emulated)
+	RES(R94, RES_K(30))
+	RES(R95, RES_K(4.7))
+	RES(R96, RES_K(2.7))
+	RES(R97, RES_K(39))
+	RES(R98, RES_K(12))
+	RES(R99, RES_K(2.4))
+	RES(R100, RES_K(4.7))
+	RES(R101, RES_K(2.7))
+	RES(R102, RES_K(39))
+	RES(R103, RES_K(12))
+	RES(R104, RES_K(2.4))
+	RES(R105, RES_K(4.7))
+	RES(R106, RES_K(2.7))
+	RES(R107, RES_K(39))
+	RES(R108, RES_K(12))
+	RES(R109, RES_K(2.4))
+	RES(R110, RES_K(1))
+
+//  CAP(C1, CAP_U(0.1))   -- part of voltage converter (not emulated)
+//  CAP(C2, CAP_U(22))    -- part of voltage converter (not emulated)
+//  CAP(C3, CAP_U(0.1))   -- part of voltage converter (not emulated)
+//  CAP(C4, CAP_U(22))    -- part of voltage converter (not emulated)
+//  CAP(C5, CAP_U(22))    -- part of voltage converter (not emulated)
+//  CAP(C6, CAP_U(0.1))   -- part of voltage converter (not emulated)
+//  CAP(C7, CAP_U(22))    -- part of voltage converter (not emulated)
+//  CAP(C8, CAP_U(0.1))   -- part of voltage converter (not emulated)
+//  CAP(C9, CAP_U(22))    -- part of voltage converter (not emulated)
+//  CAP(C10, CAP_U(0.1))  -- part of voltage converter (not emulated)
+	CAP(C11, CAP_U(0.047))
+	CAP(C12, CAP_U(0.01))
+	CAP(C13, CAP_U(0.047))
+	CAP(C14, CAP_U(0.47))
+	CAP(C15, CAP_U(0.001))
+	CAP(C16, CAP_U(0.1))
+	CAP(C17, CAP_U(0.0047))
+	CAP(C18, CAP_U(2.2))
+	CAP(C19, CAP_U(0.1))
+	CAP(C20, CAP_U(100))
+	CAP(C21, CAP_U(0.1))
+	CAP(C22, CAP_U(2.2))
+	CAP(C23, CAP_U(0.22))
+	CAP(C24, CAP_U(0.22))
+	CAP(C25, CAP_U(3.3))
+	CAP(C26, CAP_U(0.1))
+	CAP(C27, CAP_U(0.047))
+//  CAP(C28, CAP_U())   -- don't see it anywhere
+	CAP(C29, CAP_U(0.047))
+	CAP(C30, CAP_U(0.047))
+	CAP(C31, CAP_U(0.22))
+	CAP(C32, CAP_U(0.22))
+	CAP(C33, CAP_U(0.0047))
+	CAP(C34, CAP_U(1))
+	CAP(C35, CAP_U(0.1))
+	CAP(C36, CAP_U(0.1))
+	CAP(C37, CAP_U(0.01))
+//  CAP(C38, CAP_U(0.68))  -- part of final amp (not emulated)
+//  CAP(C39, CAP_P(470))   -- part of final amp (not emulated)
+//  CAP(C40, CAP_P(470))   -- part of final amp (not emulated)
+//  CAP(C41, CAP_U(0.005)) -- part of final amp (not emulated)
+//  CAP(C42, CAP_P(470))   -- part of final amp (not emulated)
+	CAP(C43, CAP_U(0.33))
+
+
+//  D_1N4003(D1)        -- part of voltage converter (not emulated)
+//  D_1N4003(D2)        -- part of voltage converter (not emulated)
+//  D_1N4003(D3)        -- part of voltage converter (not emulated)
+//  D_1N4003(D4)        -- part of voltage converter (not emulated)
+	D_1N914(D5)
+//  D_1N4003(D6)        -- part of final amp (not emulated)
+//  D_1N4003(D7)        -- part of final amp (not emulated)
+	D_1N914(D8)
+
+
+	Q_2N3904(Q1)            // NPN
+	Q_2N3906(Q2)            // PNP
+	Q_2N3906(Q3)            // PNP
+	Q_2N3906(Q4)            // PNP
+	Q_2N3906(Q5)            // PNP
+	Q_2N3906(Q6)            // PNP
+	Q_2N3906(Q7)            // PNP
+	Q_2N3906(Q8)            // PNP
+	Q_2N3906(Q9)            // PNP
+	Q_2N3906(Q10)           // PNP
+	Q_2N3906(Q11)           // PNP
+//  Q_2N6292(Q12)           // NPN -- part of final amp (not emulated)
+//  Q_2N6107(Q13)           // PNP -- part of final amp (not emulated)
+	Q_2N3906(Q14)           // PNP
+	Q_2N3904(Q15)           // NPN
+	Q_2N3906(Q16)           // PNP
+	Q_2N3904(Q17)           // NPN
+	Q_2N3906(Q18)           // PNP
+	Q_2N3904(Q19)           // NPN
+
+	TTL_7414_DIP(IC1)       // Hex Inverter
+	NET_C(IC1.7, GND)
+	NET_C(IC1.14, I_V5)
+
+	TTL_74LS164_DIP(IC2)    // 8-bit Shift Reg.
+	NET_C(IC2.7, GND)
+	NET_C(IC2.14, I_V5)
+
+	TTL_74LS377_DIP(IC3)    // Octal D Flip Flop
+	NET_C(IC3.10, GND)
+	NET_C(IC3.20, I_V5)
+
+//  TTL_7815_DIP(IC4)       // +15V Regulator -- part of voltage converter (not emulated)
+//  TTL_7915_DIP(IC5)       // -15V Regulator -- part of voltage converter (not emulated)
+
+	LM555_DIP(IC6)
+
+	TTL_7406_DIP(IC7)       // Hex inverter -- currently using a clone of 7416, no open collector behavior
+	NET_C(IC7.7, GND)
+	NET_C(IC7.14, I_V5)
+
+	TTL_74LS163_DIP(IC8)    // Binary Counter (schems say can sub a 74161)
+	NET_C(IC8.8, GND)
+	NET_C(IC8.16, I_V5)
+
+	TTL_74LS00_DIP(IC9)     // Quad 4-Input NAND Gate
+	NET_C(IC9.7, GND)
+	NET_C(IC9.14, I_V5)
+
+	TTL_74LS393_DIP(IC10)   // Dual 4-Stage Binary Counter
+	NET_C(IC10.7, GND)
+	NET_C(IC10.14, I_V5)
+
+	TTL_74LS163_DIP(IC11)   // Binary Counter (schems say can sub a 74161)
+	NET_C(IC11.8, GND)
+	NET_C(IC11.16, I_V5)
+
+	// IC12 was deleted from schematics
+
+	TTL_74LS393_DIP(IC13)   // Dual 4-Stage Binary Counter
+	NET_C(IC13.7, GND)
+	NET_C(IC13.14, I_V5)
+
+	// IC14 was deleted from schematics
+
+#if (!HLE_TANK_VCO)
+	LM566_DIP(IC15)
+#endif
+
+	// IC16 was deleted from schematics
+
+	AMI_S2688(IC17)         // Noise generator
+
+	TL081_DIP(IC18)         // Op. Amp.
+	NET_C(IC18.7, I_V15)
+	NET_C(IC18.4, I_VM15)
+
+	CA3080_DIP(IC19)        // Op. Amp.
+	NET_C(IC19.4, I_VM15)
+	NET_C(IC19.7, I_V15)
+
+	CA3080_DIP(IC20)        // Op. Amp.
+	NET_C(IC20.4, I_VM15)
+	NET_C(IC20.7, I_V15)
+
+	CA3080_DIP(IC21)        // Op. Amp.
+	NET_C(IC21.4, I_VM15)
+	NET_C(IC21.7, I_V15)
+
+	CA3080_DIP(IC22)        // Op. Amp.
+	NET_C(IC22.4, I_VM15)
+	NET_C(IC22.7, I_V15)
+
+	LM555_DIP(IC23)
+
+	TL081_DIP(IC24)         // Op. Amp.
+	NET_C(IC24.7, I_V15)
+	NET_C(IC24.4, I_VM15)
+
+	TL081_DIP(IC25)         // Op. Amp.
+	NET_C(IC25.7, I_V15)
+	NET_C(IC25.4, I_VM15)
+
+	TL081_DIP(IC26)         // Op. Amp.
+	NET_C(IC26.7, I_V15)
+	NET_C(IC26.4, I_VM15)
+
+	TTL_7414_DIP(IC27)      // Hex Inverter
+	NET_C(IC27.7, GND)
+	NET_C(IC27.14, I_V5)
+
+	//
+	// Page 1: inputs and shift register
+	//
+
+	NET_C(I_OUT_1, IC27.13)
+	ALIAS(TANK_EN, IC27.12)
+	NET_C(I_OUT_2, IC27.9)
+	ALIAS(BEEP_EN, IC27.8)
+	NET_C(I_OUT_3, IC27.3)
+	ALIAS(CHOPPER_SW, IC27.4)
+
+	NET_C(I_V5, R1.1)
+	NET_C(R1.2, IC2.9, IC2.1)
+	ALIAS(HI, R1.2)
+	NET_C(I_OUT_7, IC1.13)
+	NET_C(IC1.12, IC1.1)
+	NET_C(IC1.2, IC2.2)
+	NET_C(I_OUT_4, IC1.11)
+	NET_C(IC1.10, IC1.5)
+	NET_C(IC1.6, IC2.8)
+	NET_C(IC2.3, IC3.3)
+	NET_C(IC2.4, IC3.4)
+	NET_C(IC2.5, IC3.7)
+	NET_C(IC2.6, IC3.8)
+	NET_C(IC2.10, IC3.13)
+	NET_C(IC2.11, IC3.14)
+	NET_C(IC2.12, IC3.17)
+	NET_C(IC2.13, IC3.18)
+
+	NET_C(I_OUT_0, IC27.11)
+	NET_C(IC27.10, IC27.5)
+	NET_C(IC27.6, IC3.11)
+	NET_C(IC3.1, GND)
+	ALIAS(TANK_FIRE, IC3.2)
+	ALIAS(HI_EXP, IC3.5)
+	ALIAS(JEEP_FIRE, IC3.6)
+	ALIAS(LO_EXP, IC3.9)
+	NET_C(IC3.12, IC8.6)
+	NET_C(IC3.15, IC8.5)
+	NET_C(IC3.16, IC8.4)
+	NET_C(IC3.19, IC8.3)
+
+	//
+	// Page 1: Tank EN
+	//
+
+	NET_C(I_V5, IC6.8, R2.2)
+	NET_C(R2.1, IC6.7, R3.2)
+	NET_C(R3.1, IC6.2, IC6.6, C11.1)
+	NET_C(C11.2, GND)
+	NET_C(TANK_EN, IC6.4, IC7.9)
+	NET_C(IC6.1, GND)
+	NET_C(IC6.5, C12.1)
+	NET_C(C12.2, GND)
+	NET_C(IC6.3, IC1.9)
+	NET_C(IC1.8, IC8.2)
+	NET_C(IC8.7, IC8.10, IC8.1, HI)
+	NET_C(IC8.15, IC9.1, IC9.2, IC11.2, IC10.1)
+	NET_C(IC8.9, IC9.3)
+	NET_C(IC10.2, GND)
+	NET_C(IC10.6, IC9.9, IC13.13)
+
+	NET_C(IC11.1, IC11.10, IC11.7, IC11.3, IC11.4, HI)
+	NET_C(IC11.5, IC11.6, GND)
+	NET_C(IC11.15, IC1.3)
+	NET_C(IC1.4, IC11.9)
+	NET_C(IC11.11, IC9.10)
+	NET_C(IC9.8, IC10.13)
+	NET_C(IC10.12, GND)
+	NET_C(IC10.11, R6.1)
+	NET_C(R6.2, C13.1, C14.2)
+	NET_C(C13.2, GND)
+	NET_C(C14.1, R7.1)
+	ALIAS(SJ, R7.2)
+
+	NET_C(IC7.8, R8.1, IC13.12)
+	NET_C(R8.2, I_V5)
+	NET_C(IC13.8, R5.1, IC7.5)
+	ALIAS(SH2_1, IC13.8)
+	NET_C(R5.2, I_V5)
+	NET_C(IC13.9, IC7.11, R9.1, IC7.13)
+	ALIAS(SH2_3, IC13.9)
+	NET_C(R9.2, I_V5)
+	NET_C(IC7.10, IC7.6, R10.1)
+	ALIAS(SH2_5, R10.1)
+	NET_C(R10.2, I_V5)
+
+	ALIAS(SH2_2, R19.1)
+	ALIAS(SH2_4, R20.1)
+	ALIAS(SH2_6, R21.1)
+	NET_C(R19.2, R20.2, R21.2, R22.2, C18.1, R23.1)
+	NET_C(R22.1, GND)
+	NET_C(C18.2, GND)
+	NET_C(R23.2, I_V15)
+
+#if (HLE_TANK_VCO)
+	//
+	//    R2 = 0.98110: HP = (0.00000599036*A0) - 0.0000565124
+	//    R2 = 0.99782: HP = (0.00000194885*A0*A0) - (0.0000415989*A0) + 0.000233746
+	//    R2 = 0.99811: HP = (0.000000646112*A0*A0*A0) - (0.0000215063*A0*A0) + (0.000242010*A0) - 0.000908469
+	//    R2 = 0.99589: HP = (0.000000217354*A0*A0*A0*A0) - (0.0000098166*A0*A0*A0) + (0.000167248*A0*A0) - (0.00127054*A0) + 0.00363402
+	//    R2 = 0.92249: HP = (0.00000000630602*A0*A0*A0*A0*A0) - (0.000000220145*A0*A0*A0*A0) + (0.00000210638*A0*A0*A0) + (0.00000707526*A0*A0) - (0.000207037*A0) + 0.000836264
+	//
+	VARCLOCK(TANKCLK, 1, "max(0.000001,min(0.1,(0.000000646112*A0*A0*A0) - (0.0000215063*A0*A0) + (0.000242010*A0) - 0.000908469))")
+	NET_C(TANKCLK.GND, GND)
+	NET_C(TANKCLK.VCC, I_V5)
+	NET_C(R19.2, TANKCLK.A0)
+	NET_C(TANKCLK.Q, IC13.1)
+	NET_C(GND, R4.1, R4.2, R11.1, R11.2, R12.1, R12.2, R13.1, R13.2, C15.1, C15.2, C16.1, C16.2, C17.1, C17.2, D5.A, D5.K, D8.A, D8.K)
+#else
+	NET_C(IC15.5, R19.2, C15.2)
+	NET_C(IC15.7, C17.1)
+	NET_C(C17.2, GND)
+	NET_C(IC15.1, GND)
+	NET_C(IC15.6, C15.1, R11.1)
+	NET_C(R11.2, IC15.8, I_V15)
+	NET_C(IC15.3, C16.2)
+	NET_C(C16.1, R12.1, D5.K)
+	NET_C(D5.A, GND)
+	NET_C(R12.2, Q1.B)
+	NET_C(Q1.E, D8.K, R4.2)
+	NET_C(D8.A, GND)
+	NET_C(R4.1, I_VM15)
+	NET_C(Q1.C, IC13.1, R13.1)
+	NET_C(R13.2, I_V5)
+#endif
+
+	NET_C(IC7.12, R110.1, IC13.2)
+	NET_C(R110.2, I_V5)
+	NET_C(IC13.5, R15.1)
+	NET_C(IC13.4, R16.1)
+	NET_C(IC13.3, R17.1)
+	NET_C(R15.2, R16.2, R17.2, R18.2, C19.2)
+	NET_C(R18.1, GND)
+	NET_C(C19.1, R14.1)
+	NET_C(R14.2, SJ)
+
+	//
+	// Page 2 stuff
+	//
+
+	NET_C(SH2_1, R96.1)
+	NET_C(R96.2, R95.1, Q14.B)
+	NET_C(R95.2, I_V5, Q14.E)
+	NET_C(Q14.C, R97.2, R98.2, R99.1)
+	NET_C(R97.1, I_VM15)
+	NET_C(R98.1, GND, Q15.E)
+	NET_C(R99.2, Q15.B)
+	NET_C(Q15.C, SH2_2)
+
+	NET_C(SH2_3, R101.1)
+	NET_C(R101.2, R100.1, Q16.B)
+	NET_C(R100.2, I_V5, Q16.E)
+	NET_C(Q16.C, R102.2, R103.2, R104.1)
+	NET_C(R102.1, I_VM15)
+	NET_C(R103.1, GND, Q17.E)
+	NET_C(R104.2, Q17.B)
+	NET_C(Q17.C, SH2_4)
+
+	NET_C(SH2_5, R106.1)
+	NET_C(R106.2, R105.1, Q18.B)
+	NET_C(R105.2, I_V5, Q18.E)
+	NET_C(Q18.C, R107.2, R108.2, R109.1)
+	NET_C(R107.1, I_VM15)
+	NET_C(R108.1, GND, Q19.E)
+	NET_C(R109.2, Q19.B)
+	NET_C(Q19.C, SH2_6)
+
+	//
+	// Page 3
+	//
+
+	NET_C(I_V15, C20.1, IC17.4)
+	NET_C(C20.2, GND)
+	NET_C(IC17.2, IC17.1, GND, R26.1)
+	NET_C(IC17.3, C21.2)
+	NET_C(C21.1, R26.2, IC18.3)
+	NET_C(IC18.2, IC18.6)
+	ALIAS(NOISE, IC18.6)
+
+	//
+	// TANK FIRE
+	//
+
+	NET_C(TANK_FIRE, R27.1, R28.1)
+	NET_C(R27.2, I_V5, R29.2, Q2.E)
+	NET_C(R28.2, R29.1, Q2.B)
+	NET_C(Q2.C, R30.2, R31.2, Q3.E)
+	NET_C(R30.1, I_VM15)
+	NET_C(R31.1, GND, R32.1)
+	NET_C(R32.2, Q3.B)
+	NET_C(Q3.C, C22.1, R33.1)
+	NET_C(C22.2, I_VM15)
+	NET_C(R33.2, IC19.5)
+	NET_C(NOISE, R34.1)
+	NET_C(R34.2, C23.1, R35.1)
+	NET_C(R35.2, C24.1, R36.1)
+	NET_C(C23.2, C24.2, GND, R37.1, R38.1)
+	NET_C(R36.2, R37.2, IC19.2)
+	NET_C(R38.2, IC19.3)
+	NET_C(IC19.6, IC25.3)
+
+	//
+	// LO EXP
+	//
+
+	NET_C(LO_EXP, R39.1, R40.1)
+	NET_C(R39.2, I_V5, R41.2, Q4.E)
+	NET_C(R40.2, R41.1, Q4.B)
+	NET_C(Q4.C, R42.2, R43.2, Q5.E)
+	NET_C(R42.1, I_VM15)
+	NET_C(R43.1, GND, R44.1)
+	NET_C(R44.2, Q5.B)
+	NET_C(Q5.C, C25.1, R45.1)
+	NET_C(C25.2, I_VM15)
+	NET_C(R45.2, IC20.5)
+	NET_C(NOISE, R46.1)
+	NET_C(R46.2, C26.1, R47.1)
+	NET_C(R47.2, C27.1, R48.1)
+	NET_C(C26.2, C27.2, GND, R49.1, R50.1)
+	NET_C(R48.2, R49.2, IC20.2)
+	NET_C(R50.2, IC20.3)
+	NET_C(IC20.6, IC25.3)
+
+	//
+	// CHOPPER SW
+	//
+
+	NET_C(CHOPPER_SW, IC7.3)
+	NET_C(IC7.4, R51.1, R52.1)
+	NET_C(R51.2, I_V5, R53.2, Q6.E)
+	NET_C(R52.2, R53.1, Q6.B)
+	NET_C(Q6.C, R54.2, R55.2, Q7.E)
+	NET_C(R54.1, I_VM15)
+	NET_C(R55.1, R56.1, GND)
+	NET_C(R56.2, Q7.B)
+	NET_C(Q7.C, R57.1)
+	NET_C(R57.2, IC21.5)
+	NET_C(NOISE, R58.1)
+	NET_C(R58.2, C29.1, R59.1)
+	NET_C(R59.2, C30.1, R94.1)
+	NET_C(C29.2, C30.2, GND, R60.1, R61.1)
+	NET_C(R94.2, R60.2, IC21.2)
+	NET_C(R61.2, IC21.3)
+	NET_C(IC21.6, IC25.3)
+
+	//
+	// JEEP FIRE
+	//
+
+	NET_C(JEEP_FIRE, R62.1, R63.1)
+	NET_C(R62.2, I_V5, R64.2, Q8.E)
+	NET_C(R63.2, R64.1, Q8.B)
+	NET_C(Q8.C, R65.2, R66.2, Q9.E)
+	NET_C(R65.1, I_VM15)
+	NET_C(R66.1, GND, R67.1)
+	NET_C(R67.2, Q9.B)
+	NET_C(Q9.C, C31.1, R68.1)
+	NET_C(C31.2, I_VM15)
+	NET_C(R68.2, R80.2, IC22.5)
+	NET_C(NOISE, R69.1)
+	NET_C(R69.2, C32.1, R70.1)
+	NET_C(R70.2, C33.1, R71.1)
+	NET_C(C32.2, C33.2, GND, R72.1, R73.1)
+	NET_C(R71.2, R72.2, IC22.2)
+	NET_C(R73.2, IC22.3)
+	NET_C(IC22.6, IC25.3)
+
+	//
+	// HI EXP
+	//
+
+	NET_C(HI_EXP, R74.1, R75.1)
+	NET_C(R74.2, I_V5, R76.2, Q10.E)
+	NET_C(R75.2, R76.1, Q10.B)
+	NET_C(Q10.C, R77.2, R78.2, Q11.E)
+	NET_C(R77.1, I_VM15)
+	NET_C(R78.1, GND, R79.1)
+	NET_C(R79.2, Q11.B)
+	NET_C(Q11.C, C34.1, R80.1)
+	NET_C(C34.2, I_VM15)
+
+	//
+	// BEEP EN
+	//
+
+	NET_C(BEEP_EN, IC23.4)
+	NET_C(I_V5, R81.2, IC23.8)
+	NET_C(R81.1, R82.1, IC23.6, IC23.2, C35.1)
+	NET_C(R82.2, IC23.7)
+	NET_C(C35.2, GND)
+	NET_C(IC23.1, GND)
+	NET_C(IC23.5, C37.1)
+	NET_C(C37.2, GND)
+	NET_C(IC23.3, R83.1)
+	NET_C(R83.2, C36.1)
+	NET_C(C36.2, SJ)
+
+	//
+	// Final mix
+	//
+
+	NET_C(R90.2, IC25.3)
+	NET_C(R90.1, GND)
+	NET_C(IC25.2, IC25.6, C43.1)
+	NET_C(C43.2, R91.1)
+	NET_C(R91.2, IC26.2, SJ, R92.1)
+	NET_C(IC26.3, GND)
+	NET_C(IC26.6, R92.2)
+	ALIAS(OUTPUT, R92.2)
+
+	//
+	// Unconnected inputs
+	//
+
+	NET_C(GND, IC7.1, IC9.4, IC9.5, IC9.12, IC9.13, IC27.1, IC27.2)
+	NET_C(GND, IC24.2, IC24.3)  // part of final amp
+
+	//
+	// Unconnected outputs
+	//
+
+	HINT(IC7.2, NC)
+	HINT(IC8.11, NC)    // QD
+	HINT(IC8.12, NC)    // QC
+	HINT(IC8.13, NC)    // QB
+	HINT(IC8.14, NC)    // QA
+	HINT(IC9.6, NC)
+	HINT(IC9.11, NC)
+	HINT(IC10.3, NC)    // QA
+	HINT(IC10.4, NC)    // QB
+	HINT(IC10.5, NC)    // QC
+	HINT(IC10.8, NC)    // QD
+	HINT(IC10.9, NC)    // QC
+	HINT(IC10.10, NC)   // QB
+	HINT(IC11.12, NC)   // QC
+	HINT(IC11.13, NC)   // QB
+	HINT(IC11.14, NC)   // QA
+	HINT(IC13.6, NC)
+	HINT(IC13.10, NC)
+	HINT(IC13.11, NC)
+//    HINT(IC27.2, NC)
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_armora.h mame-0.224+dfsg.1/src/mame/audio/nl_armora.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_armora.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_armora.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_ARMORA_H
+#define MAME_AUDIO_NL_ARMORA_H
+
+#pragma once
+
+NETLIST_EXTERNAL(armora)
+
+#endif // MAME_AUDIO_NL_ARMORA_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_astrob.cpp mame-0.224+dfsg.1/src/mame/audio/nl_astrob.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_astrob.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_astrob.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,1161 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Astro Blaster
+//
+// Derived from the schematics in the Astro Blaster manual.
+//
+// Known problems/issues:
+//
+//    * All sounds work under the right conditions.
+//
+//    * SONAR and BONUS sounds fail to trigger after the first
+//       few seconds. For some reason the triggering via CD4011
+//       never actually fires the one-shot that controls the
+//       duration of the sound.
+//
+//    * Performance is poor, primarily due to the SONAR sound
+//       and its connection to the mixing net. All attempts at
+//       separating the two have ended in failure so far.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_astrob.h"
+
+
+//
+// Optimizations
+//
+
+#define HLE_LASER_1_VCO (1)
+#define HLE_LASER_2_VCO (1)
+#define SIMPLIFY_SONAR (1)
+#define ENABLE_FRONTIERS (1)
+#define UNDERCLOCK_NOISE_GEN (1)
+
+
+
+//
+// Hacks
+//
+
+#define ADD_CLIPPING_DIODES (1)
+
+
+
+// not really found anywhere, just took the 5239 and changed the
+// breakdown voltage to 5.1 according to the datasheet
+#define D_1N5231(name) ZDIODE(name, "D(BV=5.1 IBV=0.020 NBV=1)")
+#define D_1N914(name) DIODE(name, "1N914")
+
+// SPICE model taken from https://www.onsemi.com/support/design-resources/models?rpn=2N4403
+#define Q_2N4403(name) QBJT_EB(name, "PNP(Is=650.6E-18 Xti=3 Eg=1.11 Vaf=115.7 Bf=216.2 Ne=1.829 Ise=58.72f Ikf=1.079 Xtb=1.5 Br=3.578 Nc=2 Isc=0 Ikr=0 Rc=.715 Cjc=14.76p Mjc=.5383 Vjc=.75 Fc=.5 Cje=19.82p Mje=.3357 Vje=.75 Tr=111.6n Tf=603.7p Itf=.65 Vtf=5 Xtf=1.7 Rb=10)")
+
+// JFET transistors not supported, but this should do the trick
+#define Q_2N4093(name) MOSFET(name, "NMOS(VTO=-1 CAPMOD=0)")
+
+#define LM555_DIP NE555_DIP
+#define LM566_DIP NE566_DIP
+
+#define TTL_74LS00_DIP TTL_7400_DIP
+#define TTL_74LS04_DIP TTL_7404_DIP
+
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(astrob)
+
+#if 1
+	SOLVER(Solver, 1000)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 4e-5)
+#if (SIMPLIFY_SONAR)
+	PARAM(Solver.Solver_54.DYNAMIC_MIN_TIMESTEP, 7e-6)  // gets rid of NR loops failure
+#else
+	PARAM(Solver.Solver_40.DYNAMIC_MIN_TIMESTEP, 7e-6)  // gets rid of NR loops failure
+#endif
+#else
+	SOLVER(Solver, 48000)
+#endif
+
+	// Overwrite model - the default model uses minimum datasheet
+	// specifications for 5V. These are for 10V and thus closer to the
+	// 12V used in this circuit.
+	NET_MODEL("CD4XXX FAMILY(TYPE=CMOS IVL=0.3 IVH=0.7 OVL=0.05 OVH=0.05 ORL=384 ORH=384)")
+
+	TTL_INPUT(I_LO_D0, 0)
+	NET_C(I_LO_D0, U31.1)
+	ALIAS(I_INVADER_1, U31.2)
+	TTL_INPUT(I_LO_D1, 0)
+	NET_C(I_LO_D1, U31.3)
+	ALIAS(I_INVADER_2, U31.4)
+	TTL_INPUT(I_LO_D2, 0)
+	NET_C(I_LO_D2, U31.11)
+	ALIAS(I_INVADER_3, U31.10)
+	TTL_INPUT(I_LO_D3, 0)
+	NET_C(I_LO_D3, U31.9)
+	ALIAS(I_INVADER_4, U31.8)
+	TTL_INPUT(I_LO_D4, 0)
+	NET_C(I_LO_D4, U30.13)
+	ALIAS(I_ASTROIDS, U30.12)
+	TTL_INPUT(I_LO_D5, 0)
+	ALIAS(I_MUTE, I_LO_D5)
+	TTL_INPUT(I_LO_D6, 0)
+	NET_C(I_LO_D6, U30.3, U29.11)
+	ALIAS(I_REFILL, U29.10)
+	ALIAS(I_REFILL_Q, U30.4)
+	TTL_INPUT(I_LO_D7, 0)
+	ALIAS(W, I_LO_D7)
+	NET_C(I_LO_D7, U31.5)
+	ALIAS(I_WARP, U31.6)
+
+	NET_C(GND, I_LO_D0.GND, I_LO_D1.GND, I_LO_D2.GND, I_LO_D3.GND, I_LO_D4.GND, I_LO_D5.GND, I_LO_D6.GND, I_LO_D7.GND)
+	NET_C(I_V5, I_LO_D0.VCC, I_LO_D1.VCC, I_LO_D2.VCC, I_LO_D3.VCC, I_LO_D4.VCC, I_LO_D5.VCC, I_LO_D6.VCC, I_LO_D7.VCC)
+
+	TTL_INPUT(I_HI_D0, 0)
+	NET_C(I_HI_D0, U26.5)
+	ALIAS(I_LASER_1, U26.6)
+	TTL_INPUT(I_HI_D1, 0)
+	NET_C(I_HI_D1, U26.3)
+	ALIAS(I_LASER_2, U26.4)
+	TTL_INPUT(I_HI_D2, 0)
+	NET_C(I_HI_D2, U26.11)
+	ALIAS(I_SHORT_EXPL, U26.10)
+	TTL_INPUT(I_HI_D3, 0)
+	NET_C(I_HI_D3, U26.9)
+	ALIAS(I_LONG_EXPL, U26.8)
+	TTL_INPUT(I_HI_D4, 0)
+	NET_C(I_HI_D4, U26.1)
+	ALIAS(I_ATTACK_RATE, U26.2)
+	TTL_INPUT(I_HI_D5, 0)
+	NET_C(I_HI_D5, U31.13)
+	ALIAS(I_RATE_RESET, U31.12)
+	TTL_INPUT(I_HI_D6, 0)
+	NET_C(I_HI_D6, U29.9)
+	ALIAS(I_BONUS, U29.8)
+	TTL_INPUT(I_HI_D7, 0)
+	NET_C(I_HI_D7, U29.5)
+	ALIAS(I_SONAR, U29.6)
+
+	NET_C(GND, I_HI_D0.GND, I_HI_D1.GND, I_HI_D2.GND, I_HI_D3.GND, I_HI_D4.GND, I_HI_D5.GND, I_HI_D6.GND, I_HI_D7.GND)
+	NET_C(I_V5, I_HI_D0.VCC, I_HI_D1.VCC, I_HI_D2.VCC, I_HI_D3.VCC, I_HI_D4.VCC, I_HI_D5.VCC, I_HI_D6.VCC, I_HI_D7.VCC)
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V12, 12)
+	ANALOG_INPUT(I_VM12, -12)
+
+	RES(R1, RES_K(100))
+	RES(R2, RES_K(1.5))
+	RES(R3, RES_K(330))
+	RES(R4, RES_K(10))
+#if (SIMPLIFY_SONAR)
+	// use less resistance to account for only emulating 1/4 identical circuits
+	RES(R5, RES_K(17))
+#else
+	RES(R5, RES_K(68))
+#endif
+	RES(R6, RES_K(68))
+	RES(R7, RES_K(22))
+	RES(R8, RES_K(18))
+	RES(R9, RES_K(33))
+	RES(R10, RES_K(100))
+	RES(R11, RES_K(150))
+	RES(R12, RES_K(39))
+	RES(R13, RES_K(330))
+	RES(R14, RES_K(47))
+	RES(R15, RES_K(220))
+	RES(R16, RES_K(10))
+	RES(R17, RES_K(10))
+	RES(R18, RES_M(2.7))
+//  RES(R19, RES_K(1))
+	RES(R20, RES_M(1))
+	RES(R21, RES_K(100))
+	RES(R22, RES_K(470))
+	RES(R23, RES_K(100))
+	RES(R24, RES_M(2.2))
+	RES(R25, RES_K(10))
+	RES(R26, RES_K(820))
+	RES(R27, RES_K(47))
+	RES(R28, RES_K(22))
+	RES(R29, RES_K(10))
+	RES(R30, RES_K(82))
+	RES(R31, RES_K(10))
+	RES(R32, RES_K(22))
+	RES(R33, RES_K(39))
+	RES(R34, RES_K(4.7))
+	RES(R35, RES_K(4.7))
+	RES(R36, RES_K(100.1))  // part of SONAR circuit that relies on subtle part differences
+	RES(R37, RES_K(1.51))   // part of SONAR circuit that relies on subtle part differences
+	RES(R38, RES_K(330.1))  // part of SONAR circuit that relies on subtle part differences
+	RES(R39, RES_K(10.1))   // part of SONAR circuit that relies on subtle part differences
+	RES(R40, RES_K(68.1))   // part of SONAR circuit that relies on subtle part differences
+	RES(R41, RES_K(10))
+	RES(R42, RES_K(100))
+	RES(R43, RES_K(470))
+	RES(R44, RES_M(1))
+	RES(R45, RES_K(100))
+	RES(R46, RES_K(470))
+	RES(R47, RES_K(10))
+	RES(R48, RES_K(82))
+	RES(R49, RES_K(39))
+	RES(R50, RES_K(22))
+	RES(R51, RES_K(10))
+	RES(R52, RES_K(68))
+	RES(R53, RES_K(10))
+	RES(R54, RES_K(22))
+	RES(R55, RES_M(2.2))
+	RES(R56, RES_K(33))
+	RES(R57, RES_K(33))
+	RES(R58, RES_K(820))
+	RES(R59, RES_K(100))
+	RES(R60, RES_K(10))
+	RES(R61, RES_K(100))
+	RES(R62, RES_K(99.9))   // part of SONAR circuit that relies on subtle part differences
+	RES(R63, RES_K(1.49))   // part of SONAR circuit that relies on subtle part differences
+	RES(R64, RES_K(329.9))  // part of SONAR circuit that relies on subtle part differences
+	RES(R65, RES_K(9.9))    // part of SONAR circuit that relies on subtle part differences
+	RES(R66, RES_K(67.9))   // part of SONAR circuit that relies on subtle part differences
+	RES(R67, RES_K(10))
+	RES(R68, RES_K(82))
+	RES(R69, RES_K(470))
+	RES(R70, RES_K(100))
+	RES(R71, RES_K(10))
+	RES(R72, RES_K(10))
+	RES(R73, RES_K(100))
+	RES(R74, RES_K(4.7))
+	RES(R75, RES_K(100))
+	RES(R76, RES_K(22))
+	RES(R77, RES_K(330))
+	RES(R78, RES_K(1))
+	RES(R79, RES_K(150))
+	RES(R80, RES_M(1))
+	RES(R81, RES_K(10))
+	RES(R82, RES_K(100))
+	RES(R83, RES_K(1))
+	RES(R84, RES_K(5.6))
+	RES(R85, RES_K(150))
+	RES(R86, RES_K(10))
+	RES(R87, RES_K(10))
+	RES(R88, RES_K(100))
+	RES(R89, RES_K(10))
+	RES(R90, RES_K(100))
+	RES(R91, RES_K(100.2))  // part of SONAR circuit that relies on subtle part differences
+	RES(R92, RES_K(1.52))   // part of SONAR circuit that relies on subtle part differences
+	RES(R93, RES_K(330.2))  // part of SONAR circuit that relies on subtle part differences
+	RES(R94, RES_K(10.2))   // part of SONAR circuit that relies on subtle part differences
+	RES(R95, RES_K(68.2))   // part of SONAR circuit that relies on subtle part differences
+	RES(R96, RES_K(10))
+	RES(R97, RES_K(4.7))
+	RES(R98, RES_M(1))
+	RES(R99, RES_M(1))
+	RES(R100, RES_M(1))
+	RES(R101, RES_M(1))
+	RES(R102, RES_K(470))
+	RES(R103, RES_M(1))
+	RES(R104, RES_K(10))
+	RES(R105, RES_K(10))
+	RES(R106, RES_M(2.7))
+	RES(R107, RES_K(100))
+	RES(R108, RES_K(100))
+	RES(R109, RES_K(10))
+	RES(R110, RES_K(10))
+	RES(R111, RES_K(10))
+	RES(R112, RES_K(10))
+	RES(R113, RES_K(10))
+	RES(R114, 100)
+//  RES(R115, RES_K(100))   -- part of final amp (not emulated)
+//  RES(R116, RES_K(470))   -- part of final amp (not emulated)
+	RES(R117, RES_K(1))
+	RES(R118, RES_K(470))
+	RES(R119, RES_K(470))
+	RES(R120, RES_K(220))
+	RES(R121, RES_K(10))
+	RES(R122, RES_K(4.7))
+//  RES(R123, RES_K(1))     -- part of final amp (not emulated)
+//  RES(R124, RES_K(100))   -- part of final amp (not emulated)
+	RES(R125, RES_K(82))
+	RES(R126, RES_K(39))
+	RES(R127, RES_K(10))
+	RES(R128, RES_K(22))
+	RES(R129, RES_K(10))
+	RES(R130, RES_K(22))
+	RES(R131, RES_K(39))
+	RES(R132, RES_K(82))
+	RES(R133, RES_K(100))
+	RES(R134, RES_M(2.7))
+//  RES(R135, RES_K(22))    -- part of final amp (not emulated)
+	RES(R136, RES_K(1))
+	RES(R137, RES_K(4.7))
+	RES(R138, RES_M(2.2))
+	RES(R139, RES_K(4.7))
+	RES(R140, RES_K(4.7))
+//  RES(R141, RES_K(22))
+//  RES(R142, RES_M(1))     -- part of final amp (not emulated)
+//  RES(R143, RES_K(22))    -- part of final amp (not emulated)
+//  RES(R144, RES_K(22))    -- part of final amp (not emulated)
+	RES(R145, RES_K(4.7))
+	RES(R146, RES_K(100))
+	RES(R147, RES_M(2.2))
+	RES(R148, RES_K(100))
+	RES(R149, RES_K(100))
+	RES(R150, RES_K(33))
+	RES(R151, RES_M(1))
+	RES(R152, RES_K(22))
+	RES(R153, RES_K(47))
+	RES(R154, RES_K(24))
+	RES(R155, RES_K(56))
+	RES(R156, RES_K(39))
+	RES(R157, RES_K(27))
+	RES(R158, RES_K(33))
+	RES(R159, RES_K(62))
+	RES(R160, RES_K(82))
+	RES(R161, RES_K(120))
+	RES(R162, RES_K(4.7))
+	RES(R163, RES_K(10))
+	RES(R164, RES_K(10))
+	RES(R165, RES_M(1))
+	RES(R166, RES_M(1))
+	RES(R167, RES_K(1))
+	RES(R168, RES_M(1))
+	RES(R169, RES_K(100))
+	RES(R170, RES_M(2.2))
+	RES(R171, RES_K(100))
+	RES(R172, RES_K(33))
+	RES(R173, RES_K(47))
+	RES(R174, RES_K(47))
+	RES(R175, RES_K(47))
+	RES(R176, RES_K(47))
+	RES(R177, RES_K(47))
+	RES(R178, RES_K(22))
+	RES(R179, RES_K(47))
+	RES(R180, RES_K(47))
+	RES(R181, RES_K(47))
+	RES(R182, RES_K(10))
+	RES(R183, RES_K(10))
+	RES(R184, RES_K(4.7))
+	RES(R185, RES_M(1))
+	RES(R186, RES_K(1))
+
+	CAP(C1, CAP_U(0.01))
+	CAP(C2, CAP_U(0.01))
+	CAP(C3, CAP_U(0.1))
+	CAP(C4, CAP_U(0.05))
+	CAP(C5, CAP_U(0.1))
+	CAP(C6, CAP_U(10))
+	CAP(C7, CAP_U(0.1))
+	CAP(C8, CAP_U(0.1))
+	CAP(C9, CAP_U(0.1))
+//  CAP(C10, CAP_U(0.05))
+//  CAP(C11, CAP_U(0.05))
+	CAP(C12, CAP_U(10))
+//  CAP(C13, CAP_U(0.05))
+//  CAP(C14, CAP_U(0.05))
+	CAP(C15, CAP_U(10))
+	CAP(C16, CAP_U(0.01))
+	CAP(C17, CAP_U(0.01))
+	CAP(C18, CAP_U(0.022))
+	CAP(C19, CAP_U(0.05))
+	CAP(C20, CAP_U(0.1))
+	CAP(C21, CAP_U(0.33))
+	CAP(C22, CAP_U(0.33))
+	CAP(C23, CAP_U(0.01))
+	CAP(C24, CAP_U(0.01))
+	CAP(C25, CAP_U(0.01))
+	CAP(C26, CAP_U(0.022))
+	CAP(C27, CAP_U(10))
+	CAP(C28, CAP_U(0.05))
+//  CAP(C29, CAP_U(0.05))
+//  CAP(C30, CAP_U(0.05))
+	CAP(C31, CAP_U(0.0047))
+	CAP(C32, CAP_U(0.05))
+	CAP(C33, CAP_U(10))
+	CAP(C34, CAP_U(10))
+	CAP(C35, CAP_U(0.1))
+	CAP(C36, CAP_U(0.0022))
+	CAP(C37, CAP_U(0.1))
+	CAP(C38, CAP_U(0.1))
+	CAP(C39, CAP_U(0.1))
+	CAP(C40, CAP_U(0.01))
+	CAP(C41, CAP_U(0.01))
+//  CAP(C42, CAP_U(0.001))
+//  CAP(C43, CAP_U(10))
+//  CAP(C44, CAP_U(0.001))
+//  CAP(C45, CAP_U(0.001))
+//  CAP(C46, CAP_U(10))
+	CAP(C47, CAP_U(4.7))
+//  CAP(C48, CAP_U(22))     -- part of final amp (not emulated)
+	CAP(C49, CAP_U(0.05))
+	CAP(C50, CAP_U(0.05))
+	CAP(C51, CAP_U(0.05))
+	CAP(C52, CAP_U(0.05))
+	CAP(C53, CAP_U(0.1))
+//  CAP(C54, CAP_U(0.05))
+	CAP(C55, CAP_U(0.05))
+	CAP(C56, CAP_U(10))
+	CAP(C57, CAP_U(0.1))
+//  CAP(C58, CAP_U(4.7))    -- part of final amp (not emulated)
+	CAP(C59, CAP_U(0.33))
+	CAP(C60, CAP_U(4.7))
+	CAP(C61, CAP_U(4.7))
+	CAP(C62, CAP_U(10))
+	CAP(C63, CAP_U(0.1))
+	CAP(C64, CAP_U(0.1))
+	CAP(C65, CAP_U(0.01))
+//  CAP(C66, CAP_U(0.05))
+	CAP(C67, CAP_U(0.05))
+	CAP(C68, CAP_U(0.0047))
+	CAP(C69, CAP_U(4.7))
+	CAP(C70, CAP_U(0.1))
+	CAP(C71, CAP_U(0.022))
+	CAP(C72, CAP_U(0.05))
+//  CAP(C73, CAP_U(0.05))
+	CAP(C74, CAP_U(0.05))
+	CAP(C75, CAP_U(0.05))
+	CAP(C76, CAP_U(0.022))
+	CAP(C77, CAP_U(0.0047))
+	CAP(C78, CAP_U(0.1))
+//  CAP(C79, CAP_U(0.05))
+	CAP(C80, CAP_U(4.7))
+	CAP(C81, CAP_U(0.05))
+	CAP(C82, CAP_U(0.1))
+
+	D_1N5231(D1)
+	D_1N914(D2)
+	D_1N5231(D3)
+	D_1N5231(D4)
+	D_1N5231(D5)
+	D_1N5231(D6)
+	D_1N914(D7)
+	D_1N914(D8)
+	D_1N914(D9)
+	D_1N5231(D10)
+	D_1N914(D11)
+	D_1N914(D12)
+//  D_1N914(D13)            -- part of final amp (not emulated)
+	D_1N914(D14)
+	D_1N914(D15)
+	D_1N914(D16)
+	D_1N914(D17)
+	D_1N914(D18)
+	D_1N914(D19)
+	D_1N914(D20)
+	D_1N914(D21)
+	D_1N914(D22)
+	D_1N914(D23)
+	D_1N914(D24)
+	D_1N914(D25)
+	D_1N914(D26)
+	D_1N914(D27)
+	D_1N914(D28)
+	D_1N914(D29)
+	D_1N914(D30)
+	D_1N914(D31)
+
+	Q_2N4403(Q1)
+	Q_2N4403(Q2)
+	Q_2N4403(Q3)
+	Q_2N4093(Q4)
+	Q_2N4093(Q5)
+	Q_2N4093(Q6)
+	Q_2N4403(Q7)
+	Q_2N4403(Q8)
+	Q_2N4403(Q9)
+	Q_2N4403(Q10)
+
+	TL084_DIP(U1)           // Op. Amp.
+	NET_C(U1.4, I_V12)
+	NET_C(U1.11, I_VM12)
+
+	TL084_DIP(U2)           // Op. Amp.
+	NET_C(U2.4, I_V12)
+	NET_C(U2.11, I_VM12)
+
+	CD4017_DIP(U3)          // Decade Counter/Divider
+	NET_C(U3.8, GND)
+	NET_C(U3.16, I_V12)
+
+	NE555_DIP(U4)           // Timer
+
+	NE555_DIP(U5)           // Timer
+
+	NE555_DIP(U6)           // Timer
+
+	TL084_DIP(U7)           // Op. Amp.
+	NET_C(U7.4, I_V12)
+	NET_C(U7.11, I_VM12)
+
+	MM5837_DIP(U8)          // Noise Generator
+#if (UNDERCLOCK_NOISE_GEN)
+	// officially runs at 48-112kHz, but little noticeable difference
+	// in exchange for a big performance boost
+	PARAM(U8.FREQ, 12000)
+#endif
+
+	CD4011_DIP(U9)          // Quad 2-Input NAND Gates
+	NET_C(U9.7, GND)
+	NET_C(U9.14, I_V12)
+
+	CD4011_DIP(U10)         // Quad 2-Input NAND Gates
+	NET_C(U10.7, GND)
+	NET_C(U10.14, I_V12)
+
+	CD4011_DIP(U11)         // Quad 2-Input NAND Gates
+	NET_C(U11.7, GND)
+	NET_C(U11.14, I_V12)
+
+	CD4024_DIP(U12)         // 7-Stage Ripple Binary Counter
+	NET_C(U12.7, GND)
+	NET_C(U12.14, I_V12)
+
+	NE555_DIP(U13)          // Timer
+
+	CD4024_DIP(U14)         // 7-Stage Ripple Binary Counter
+	NET_C(U14.7, GND)
+	NET_C(U14.14, I_V12)
+
+	CD4017_DIP(U15)         // Decade Counter/Divider
+	NET_C(U15.8, GND)
+	NET_C(U15.16, I_V12)
+
+	TL084_DIP(U16)          // Op. Amp.
+	NET_C(U16.4, I_V12)
+	NET_C(U16.11, I_VM12)
+
+	NE555_DIP(U17)          // Timer
+
+	NE555_DIP(U18)          // Timer
+
+	CD4024_DIP(U19)         // 7-Stage Ripple Binary Counter
+	NET_C(U19.7, GND)
+	NET_C(U19.14, I_V12)
+
+	NE555_DIP(U20)          // Timer
+
+	CD4011_DIP(U21)         // Quad 2-Input NAND Gates
+	NET_C(U21.7, GND)
+	NET_C(U21.14, I_V12)
+
+	TL084_DIP(U22)          // Op. Amp.
+	NET_C(U22.4, I_V12)
+	NET_C(U22.11, I_VM12)
+
+	NE555_DIP(U23)          // Timer
+
+	NE555_DIP(U24)          // Timer
+
+	CD4011_DIP(U25)         // Quad 2-Input NAND Gates
+	NET_C(U25.7, GND)
+	NET_C(U25.14, I_V12)
+
+	TTL_7407_DIP(U26)       // Hex Buffers with High Votage Open-Collector Outputs
+	NET_C(U26.7, GND)
+	NET_C(U26.14, I_V5)
+
+	CD4011_DIP(U27)         // Quad 2-Input NAND Gates
+	NET_C(U27.7, GND)
+	NET_C(U27.14, I_V12)
+
+	CD4024_DIP(U28)         // 7-Stage Ripple Binary Counter
+	NET_C(U28.7, GND)
+	NET_C(U28.14, I_V12)
+
+	TTL_7407_DIP(U29)       // Hex Buffers with High Votage Open-Collector Outputs
+	NET_C(U29.7, GND)
+	NET_C(U29.14, I_V5)
+
+	TTL_7406_DIP(U30)       // Hex inverter -- currently using a clone of 7416, no open collector behavior
+	NET_C(U30.7, GND)
+	NET_C(U30.14, I_V5)
+
+	TTL_7406_DIP(U31)       // Hex inverter -- currently using a clone of 7416, no open collector behavior
+	NET_C(U31.7, GND)
+	NET_C(U31.14, I_V5)
+
+//  TTL_74LS374_DIP(U32)    // Octal D-Type Transparent Latches And Edge-Triggered Flip-Flop
+//  NET_C(U32.10, GND)
+//  NET_C(U32.20, I_V5)
+
+//  TTL_74LS374_DIP(U33)    // Octal D-Type Transparent Latches And Edge-Triggered Flip-Flop
+//  NET_C(U33.10, GND)
+//  NET_C(U33.20, I_V5)
+
+//  TTL_74LS00_DIP(U34)     // Quad 4-Input NAND Gate
+//  NET_C(U34.7, GND)
+//  NET_C(U34.14, I_V5)
+
+//  TTL_74LS30_DIP(U35)     // 8-Input NAND Gate
+//  NET_C(U35.7, GND)
+//  NET_C(U35.14, I_V5)
+
+//  TTL_74LS04_DIP(U36)     // Hex Inverting Gates
+//  NET_C(U36.7, GND)
+//  NET_C(U36.14, I_V5)
+
+	NE555_DIP(U37)          // Timer
+
+	NE555_DIP(U38)          // Timer
+
+	//
+	// Sheet 7, top-left (SONAR)
+	//
+
+	NET_C(U1.3, GND)
+	NET_C(U1.2, D1.A, R4.1)
+	NET_C(U1.1, D1.K, R1.1)
+	NET_C(R1.2, R2.2, C1.1, C2.1)
+	NET_C(R2.1, GND)
+	NET_C(R4.2, R3.2, U1.7, C2.2, R5.2)
+	NET_C(C1.2, R3.1, U1.6)
+	NET_C(U1.5, GND)
+
+#if (SIMPLIFY_SONAR)
+	// sonar has 4 identical circuits; reduce the net size
+	// by only emulating one and multiplying it by 4
+	NET_C(U1.9, U1.10, U1.12, U1.13, GND)
+	NET_C(R36.1, R36.2, R37.1, R37.2, R38.1, R38.2, R39.1, R39.2, R40.1, R40.2, GND)
+	NET_C(C16.1, C16.2, C17.1, C17.2, GND)
+	NET_C(D4.A, D4.K, GND)
+
+	NET_C(U2.2, U2.3, U2.5, U2.6, GND)
+	NET_C(R62.1, R62.2, R63.1, R63.2, R64.1, R64.2, R65.1, R65.2, R66.1, R66.2, GND)
+	NET_C(C24.1, C24.2, C25.1, C25.2, GND)
+	NET_C(D6.A, D6.K, GND)
+
+	NET_C(U2.9, U2.10, U2.12, U2.13, GND)
+	NET_C(R91.1, R91.2, R92.1, R92.2, R93.1, R93.2, R94.1, R94.2, R95.1, R95.2, GND)
+	NET_C(C40.1, C40.2, C41.1, C41.2, GND)
+	NET_C(D10.A, D10.K, GND)
+
+	NET_C(R5.1, R114.1, Q3.B)
+#else
+	NET_C(U1.12, GND)
+	NET_C(U1.13, D4.A, R39.1)
+	NET_C(U1.14, D4.K, R36.1)
+	NET_C(R36.2, R37.2, C16.1, C17.1)
+	NET_C(R37.1, GND)
+	NET_C(R39.2, R38.2, U1.8, C17.2, R40.2)
+	NET_C(C16.2, R38.1, U1.9)
+	NET_C(U1.10, GND)
+
+	NET_C(U2.3, GND)
+	NET_C(U2.2, D6.A, R65.1)
+	NET_C(U2.14, D6.K, R62.1)
+	NET_C(R62.2, R63.2, C24.1, C25.1)
+	NET_C(R63.1, GND)
+	NET_C(R65.2, R64.2, U2.7, C25.2, R66.2)
+	NET_C(C24.2, R64.1, U2.6)
+	NET_C(U2.5, GND)
+
+	NET_C(U2.12, GND)
+	NET_C(U2.13, D10.A, R94.1)
+	NET_C(U2.14, D10.K, R91.1)
+	NET_C(R91.2, R92.2, C40.1, C41.1)
+	NET_C(R92.1, GND)
+	NET_C(R94.2, R93.2, U2.8, C41.2, R95.2)
+	NET_C(C40.2, R93.1, U2.9)
+	NET_C(U2.10, GND)
+
+	NET_C(R5.1, R40.1, R114.1, Q3.B, R95.1, R66.1)
+#endif
+
+	NET_C(R114.2, GND)
+	NET_C(Q3.E, Q2.E, Q1.C)
+	NET_C(Q1.B, R108.2, C47.2, R117.2)
+	NET_C(C47.1, R108.1, I_V12)
+	NET_C(I_V12, R109.1)
+	NET_C(R109.2, Q1.E)
+	NET_C(R117.1, D2.A)
+	NET_C(D2.K, U11.4, C4.2)
+	NET_C(C4.1, U11.2, R20.1)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_SONAR)
+	NET_C(D_SONAR.A, U11.2)
+	NET_C(D_SONAR.K, I_V12)
+#endif
+	NET_C(U11.5, U11.6, U11.3)
+	NET_C(U11.1, R21.1)
+	NET_C(I_SONAR, R21.1)
+	NET_C(R21.2, R20.2, I_V12)
+
+	NET_C(Q2.B, GND)
+	NET_C(Q2.C, R110.2, R111.2, U7.3)
+	NET_C(R110.1, GND)
+	NET_C(R111.1, R112.1, I_VM12)
+	NET_C(Q3.C, U7.2, R112.2, R113.1)
+	NET_C(R113.2, U7.1)
+	ALIAS(SONAR, U7.1)
+
+	//
+	// Sheet 7, middle-left (LASER-1)
+	//
+
+	NET_C(I_LASER_1, R146.1, U25.9)
+	NET_C(U25.8, C64.2, R138.1)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_LASER_1)
+	NET_C(D_LASER_1.A, U25.8)
+	NET_C(D_LASER_1.K, I_V12)
+#endif
+	NET_C(R146.2, R138.2, R134.2, R139.2, U24.8, C56.1, I_V12)
+	NET_C(U25.10, U25.5, U25.6, D11.K, U24.4)
+	NET_C(C64.1, U25.4, U19.2)
+	NET_C(D11.A, R107.1, C57.2)
+	NET_C(C57.1, Q10.C, C65.1, U24.1, GND)
+	NET_C(R107.2, Q10.B, R134.1)
+	NET_C(Q10.E, U24.5)
+#if (HLE_LASER_1_VCO)
+	//
+	//    R2 = 0.98461: HP = (0.00000524285*A0) + 0.00000563193
+	//    R2 = 0.99441: HP = (0.000000368659*A0*A0) + (0.00000116694*A0) + 0.0000155514
+	//    R2 = 0.99797: HP = (0.000000154808*A0*A0*A0) - (0.00000213809*A0*A0) + (0.0000138122*A0) - 0.00000398935
+	//    R2 = 0.99877: HP = (-0.0000000527853*A0*A0*A0*A0) + (0.00000128033*A0*A0*A0) - (0.0000107258*A0*A0) + (0.0000413916*A0) - 0.0000352437
+	//    R2 = 0.99943: HP = (0.0000000343262*A0*A0*A0*A0*A0) - (0.00000096054*A0*A0*A0*A0) + (0.0000105481*A0*A0*A0) - (0.0000561978*A0*A0) + (0.000148191*A0) - 0.000131018
+	//
+	VARCLOCK(LASER1CLK, 1, "max(0.000001,min(0.1,(0.0000000343262*A0*A0*A0*A0*A0) - (0.00000096054*A0*A0*A0*A0) + (0.0000105481*A0*A0*A0) - (0.0000561978*A0*A0) + (0.000148191*A0) - 0.000131018))")
+	NET_C(LASER1CLK.GND, GND)
+	NET_C(LASER1CLK.VCC, I_V12)
+	NET_C(LASER1CLK.A0, Q10.E)
+	NET_C(LASER1CLK.Q, LASER1ENV.A1)
+	AFUNC(LASER1ENV, 2, "if(A0>6,A1,0)")
+	NET_C(LASER1ENV.A0, U25.10)
+	NET_C(LASER1ENV.Q, U19.1)
+	NET_C(U24.3, GND)
+	NET_C(U24.2, U24.6, R140.1, C65.2, GND)
+#else
+	NET_C(U24.3, U19.1)
+	NET_C(U24.2, U24.6, R140.1, C65.2)
+#endif
+	NET_C(R140.2, U24.7, R139.1)
+	NET_C(C56.2, GND)
+	NET_C(U19.12, R132.1)
+	NET_C(U19.11, R131.1)
+	NET_C(U19.9, R130.1)
+	NET_C(U19.6, R105.1)
+	NET_C(U19.4, R104.1)
+	NET_C(R104.2, R105.2, R130.2, R131.2, R132.2, C52.1)
+	ALIAS(LASER_1, C52.2)
+
+	//
+	// Sheet 7, bottom-left (LASER-2)
+	//
+
+	NET_C(I_LASER_2, R149.1, U25.12)
+	NET_C(U25.13, C63.2, R147.1)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_LASER_2)
+	NET_C(D_LASER_2.A, U25.13)
+	NET_C(D_LASER_2.K, I_V12)
+#endif
+	NET_C(R149.2, R147.2, R106.2, R145.2, U20.8, C62.1, I_V12)
+	NET_C(U25.11, U25.1, U25.2, D12.K, U20.4)
+	NET_C(C63.1, U25.3, U14.2)
+	NET_C(D12.A, R133.1, C53.2)
+	NET_C(C53.1, Q9.C, C68.1, U20.1, GND)
+	NET_C(R133.2, Q9.B, R106.1)
+	NET_C(Q9.E, U20.5)
+#if (HLE_LASER_2_VCO)
+	//
+	//    R2 = 0.98942: HP = (0.00000251528*A0) + 0.00000244265
+	//    R2 = 0.99596: HP = (0.000000160852*A0*A0) + (0.000000694298*A0) + 0.00000690896
+	//    R2 = 0.99821: HP = (0.000000068284*A0*A0*A0) - (0.000000949931*A0*A0) + (0.00000630369*A0) - 0.00000175548
+	//    R2 = 0.99896: HP = (-0.0000000291178*A0*A0*A0*A0) + (0.000000689145*A0*A0*A0) - (0.00000568073*A0*A0) + (0.0000214603*A0) - 0.0000188875
+	//    R2 = 0.99937: HP = (0.0000000153499*A0*A0*A0*A0*A0) - (0.000000433800*A0*A0*A0*A0) + (0.00000480504*A0*A0*A0) - (0.0000257871*A0*A0) + (0.000068467*A0) - 0.0000608574
+	//
+	VARCLOCK(LASER2CLK, 1, "max(0.000001,min(0.1,(0.0000000153499*A0*A0*A0*A0*A0) - (0.000000433800*A0*A0*A0*A0) + (0.00000480504*A0*A0*A0) - (0.0000257871*A0*A0) + (0.000068467*A0) - 0.0000608574))")
+	NET_C(LASER2CLK.GND, GND)
+	NET_C(LASER2CLK.VCC, I_V12)
+	NET_C(LASER2CLK.A0, Q9.E)
+	NET_C(LASER2CLK.Q, LASER2ENV.A1)
+	AFUNC(LASER2ENV, 2, "if(A0>6,A1,0)")
+	NET_C(LASER2ENV.A0, U25.11)
+	NET_C(LASER2ENV.Q, U14.1)
+	NET_C(U20.3, GND)
+	NET_C(U20.2, U20.6, R137.1, C68.2, GND)
+#else
+	NET_C(U20.3, U14.1)
+	NET_C(U20.2, U20.6, R137.1, C68.2)
+#endif
+	NET_C(R137.2, U20.7, R145.1)
+	NET_C(C62.2, GND)
+	NET_C(U14.12, R125.1)
+	NET_C(U14.11, R126.1)
+	NET_C(U14.9, R128.1)
+	NET_C(U14.6, R129.1)
+	NET_C(U14.4, R127.1)
+	NET_C(R127.2, R129.2, R128.2, R126.2, R125.2, C51.1)
+	ALIAS(LASER_2, C51.2)
+
+	//
+	// Sheet 7, middle-top (REFILL)
+	//
+
+	NET_C(I_REFILL, U3.15, R59.1)
+	NET_C(R59.2, I_V12, R17.2)
+
+	// CD4011 oscillator: R18=2.7M, C3=0.1u, freq=2.664
+	CLOCK(OSC1, 2.664)
+	NET_C(OSC1.GND, GND)
+	NET_C(OSC1.VCC, I_V12)
+	NET_C(OSC1.Q, U3.14)
+	NET_C(R18.1, R18.2, C3.1, C3.2, U9.1, U9.2, U9.5, U9.6, GND)
+
+	NET_C(U3.3, R8.1)
+	NET_C(U3.2, R7.1)
+	NET_C(U3.4, R9.1)
+	NET_C(U3.7, R12.1)
+	NET_C(U3.10, R14.1)
+	NET_C(U3.1, R6.1)
+	NET_C(U3.5, R10.1)
+	NET_C(U3.6, R11.1)
+	NET_C(U3.9, R15.1)
+	NET_C(U3.11, R13.1)
+	NET_C(U3.13, GND)
+	NET_C(R17.1, R8.2, R7.2, R9.2, R12.2, R14.2, R6.2, R10.2, R11.2, R15.2, R13.2, R16.2)
+	NET_C(R16.1, Q7.B)
+
+	// CD4011 oscillator: R46=470k, C20=0.1u, freq=15.307
+	CLOCK(OSC2, 15.307)
+	NET_C(OSC2.GND, GND)
+	NET_C(OSC2.VCC, I_V12)
+	NET_C(OSC2.Q, U4.4, U9.12, U9.13)
+	NET_C(U9.11, U5.4)
+	NET_C(R46.1, R46.2, C20.1, C20.2, U9.8, U9.9, GND)
+
+	NET_C(U5.7, R67.1, R68.2)
+	NET_C(R68.1, U5.2, U5.6, C26.2)
+	NET_C(C26.1, GND, U5.1, C18.1, U4.1, Q7.C)
+	NET_C(U5.5, U4.5, Q7.E)
+	NET_C(R67.2, U5.8, R41.2, U4.8, I_V12)
+	NET_C(R41.1, R42.2, U4.7)
+	NET_C(R42.1, U4.2, U4.6, C18.2)
+	NET_C(U5.3, R69.2)
+	NET_C(U4.3, R43.2)
+	NET_C(R43.1, C49.1, R69.1, I_REFILL_Q)
+	ALIAS(REFILL, C49.2)
+
+	//
+	// Sheet 7, middle-bottom (ATTACK, RATE RESET)
+	//
+
+	NET_C(I_RATE_RESET, U15.15, R96.1)
+	NET_C(R96.2, I_V12)
+	NET_C(I_ATTACK_RATE, R148.1, U21.5)
+	NET_C(R148.2, R166.2, I_V12)
+	NET_C(U21.6, R166.1, C67.2)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_ATTACK_RATE)
+	NET_C(D_ATTACK_RATE.A, U21.6)
+	NET_C(D_ATTACK_RATE.K, I_V12)
+#endif
+	NET_C(C67.1, U21.3)
+	NET_C(U21.4, U21.1, U21.2, U15.14)
+
+	NET_C(U15.3, D23.A)
+	NET_C(D23.K, R161.1)
+	NET_C(U15.2, D22.A)
+	NET_C(D22.K, R160.1)
+	NET_C(U15.4, D21.A)
+	NET_C(D21.K, R159.1)
+	NET_C(U15.7, D17.A)
+	NET_C(D17.K, R155.1)
+	NET_C(U15.10, D15.A)
+	NET_C(D15.K, R153.1)
+	NET_C(U15.1, D18.A)
+	NET_C(D18.K, R156.1)
+	NET_C(U15.5, D20.A)
+	NET_C(D20.K, R158.1)
+	NET_C(U15.6, D19.A)
+	NET_C(D19.K, R157.1)
+	NET_C(U15.9, D16.A)
+	NET_C(D16.K, R154.1)
+	NET_C(U15.11, D14.A)
+	NET_C(D14.K, R152.1)
+	NET_C(U15.13, GND)
+	NET_C(R161.2, R160.2, R159.2, R155.2, R153.2, R156.2, R158.2, R157.2, R154.2, R152.2, R178.2, U16.6)
+
+	NET_C(I_WARP, R164.1)
+	NET_C(R164.2, R162.1, R163.2, U16.5)
+	NET_C(R162.2, I_V12)
+	NET_C(R163.1, GND)
+	NET_C(U16.7, R178.1)
+	ALIAS(V, U16.7)
+
+	//
+	// Sheet 7, top-right (EXPLOSIONS)
+	//
+
+	NET_C(I_SHORT_EXPL, R169.1, U27.2)
+	NET_C(R169.2, R185.2, I_V12)
+	NET_C(U27.1, R185.1, C81.2)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_SHORT_EXPL)
+	NET_C(D_SHORT_EXPL.A, U27.1)
+	NET_C(D_SHORT_EXPL.K, I_V12)
+#endif
+	NET_C(C81.1, U27.11)
+	NET_C(U27.13, U27.12, U27.3)
+	NET_C(U27.3, R184.1)
+	NET_C(R184.2, D31.A)
+	NET_C(D31.K, D30.A, R182.2, R183.2)
+	NET_C(R182.1, GND)
+	NET_C(D30.K, R180.1, R181.1, C80.1, D29.K)
+	NET_C(C80.2, GND)
+	NET_C(R180.2, U16.9, R179.1)
+	NET_C(R179.2, U16.8, R177.1)
+	NET_C(R181.2, U16.10, Q6.D, D26.K)  // D and S swapped on schematics???
+	NET_C(Q6.G, C72.2, R151.2, Q5.G)
+	NET_C(R151.1, GND)
+	NET_C(C72.1, U8.3)
+	NET_C(U8.4, I_V12)
+	NET_C(U8.2, I_VM12)
+	NET_C(U8.1, GND)
+	NET_C(Q6.S, D26.A, GND)
+	NET_C(D29.A, D24.K, C69.1)
+	NET_C(C69.2, GND)
+	NET_C(R183.1, R186.2, U27.4, U27.8, U27.9, D28.K)
+	NET_C(R186.1, C75.1)
+	NET_C(C75.2, U21.8, U21.9, R168.2)
+	NET_C(R168.1, U21.11)
+	NET_C(I_LONG_EXPL, R171.1, U27.6)
+	NET_C(R171.2, R170.2, I_V12)
+	NET_C(R170.1, U27.5, C82.2)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_LONG_EXPL)
+	NET_C(D_LONG_EXPL.A, U27.5)
+	NET_C(D_LONG_EXPL.K, I_V12)
+#endif
+	NET_C(C82.1, U27.10)
+	NET_C(U21.12, U21.13, C74.1, R165.2)
+	NET_C(U21.10, C74.2, R167.1)
+	NET_C(R165.1, GND)
+	NET_C(R167.2, D24.A)
+	NET_C(R177.2, R176.1, C78.1)
+	NET_C(C78.2, U16.2, U16.1, C61.1)
+	NET_C(R176.2, U16.3, C77.2, C76.2)
+	ALIAS(EXPLOSIONS, C61.2)
+	NET_C(C77.1, GND)
+	NET_C(C76.1, D27.K, D28.A)
+	NET_C(D27.A, GND)
+
+	//
+	// Sheet 7, middle-right (ASTROIDS)
+	//
+
+	NET_C(I_ASTROIDS, R97.1, R174.1, R175.1)
+	NET_C(R97.2, I_V12)
+	NET_C(R174.2, U16.13, R173.1)
+	NET_C(R175.2, U16.12, Q5.D, D25.K)  // D and S swapped on schematics???
+	NET_C(D25.A, Q5.S, GND)
+	NET_C(R173.2, U16.14, R172.1)
+	NET_C(R172.2, R150.1, C70.1)
+	NET_C(C70.2, U7.9, U7.8, R136.1)
+	NET_C(R150.2, C71.2, U7.10)
+	NET_C(C71.1, GND)
+	NET_C(R136.2, C59.2, C60.1)
+	NET_C(C59.1, GND)
+	ALIAS(ASTROIDS, C60.2)
+
+	//
+	// Sheet 7, bottom-right (mixer)
+	//
+
+	ALIAS(INVADER_1, R98.1)
+	ALIAS(INVADER_2, R99.1)
+	ALIAS(INVADER_3, R100.1)
+	ALIAS(INVADER_4, R101.1)
+	NET_C(R98.2, R99.2, R100.2, R101.2, C55.1)
+	NET_C(ASTROIDS, R121.1)
+	NET_C(EXPLOSIONS, R122.1)
+	ALIAS(BONUS, R118.1)
+	NET_C(REFILL, R119.1)
+	NET_C(LASER_1, R102.1)
+	NET_C(LASER_2, R103.1)
+	NET_C(SONAR, R120.1)
+	NET_C(C55.2, R121.2, R122.2, R118.2, R119.2, R102.2, R103.2, R120.2)
+	AFUNC(MUTEFUNC, 2, "if(A0>2.5,0,A1)")
+	NET_C(MUTEFUNC.A0, I_MUTE)
+	NET_C(MUTEFUNC.A1, R121.2)
+	ALIAS(OUTPUT, MUTEFUNC.Q)
+//  ALIAS(OUTPUT, C55.2)
+
+	//
+	// Sheet 8, middle-top (INVADER_1)
+	//
+
+	NET_C(U22.10, GND)
+	NET_C(U22.9, D5.A, R29.1)
+	NET_C(R29.2, R55.2, U22.14, C21.2, R72.1)
+	NET_C(D5.K, U22.8, R58.1)
+	NET_C(R58.2, C22.1, R57.2, R56.2, C21.1)
+	NET_C(W, U30.5)
+	NET_C(U30.6, R57.1)
+	NET_C(R56.1, GND)
+	NET_C(U22.13, C22.2, R55.1)
+	NET_C(U22.12, GND)
+
+	NET_C(R85.1, U23.7, R86.2)
+	NET_C(R85.2, U23.8, R83.2, R84.2, R73.2, U18.8, I_V12)
+	NET_C(R86.1, U23.2, U23.6, C38.2)
+	NET_C(C38.1, U23.1, C37.1, C28.1, U18.1, GND)
+	NET_C(I_INVADER_1, U23.4, R73.1, U18.4)
+	NET_C(C28.2, U18.5)
+	NET_C(U23.3, U18.2)
+	NET_C(U23.5, R87.2)
+	NET_C(R87.1, V)
+	NET_C(R83.1, D9.A)
+	NET_C(D9.K, Q8.B, R72.2)
+	NET_C(Q8.E, R84.1)
+	NET_C(Q8.C, C37.2, U18.6, U18.7)
+	NET_C(U18.3, INVADER_1)
+
+	//
+	// Sheet 8, middle (INVADER_2)
+	//
+
+	NET_C(R81.2, R70.2, U13.8, C27.1, I_V12)
+	NET_C(C27.2, GND)
+	NET_C(R81.1, R82.2, U13.7)
+	NET_C(R82.1, U13.2, U13.6, C36.2)
+	NET_C(C36.1, U13.1, GND)
+	NET_C(U13.5, R71.2)
+	NET_C(R71.1, V)
+	NET_C(I_INVADER_2, U13.4, R70.1)
+	NET_C(U13.3, U12.1)
+	// CD4011 oscillator: R22=470k, C5=0.1u, freq=15.3Hz
+	CLOCK(OSC3, 15.3)
+	NET_C(OSC3.GND, GND)
+	NET_C(OSC3.VCC, I_V12)
+	NET_C(OSC3.Q, U12.2)
+	NET_C(R22.1, R22.2, C5.1, C5.2, U11.8, U11.9, U11.12, U11.13, GND)
+	NET_C(U12.12, R48.1)
+	NET_C(U12.11, R49.1)
+	NET_C(U12.9, R50.1)
+	NET_C(U12.6, R47.1)
+	NET_C(R47.2, R50.2, R49.2, R48.2)
+	NET_C(R48.2, INVADER_2)
+
+	//
+	// Sheet 8, middle-bottom (INVADER_4)
+	//
+
+	NET_C(R89.2, U37.4, U37.8, C15.1, R60.2, R88.2, U38.8, I_V12)
+	NET_C(R89.1, U37.7, R90.2)
+	NET_C(R90.1, U37.2, U37.6, C39.2)
+	NET_C(C39.1, U37.1, C23.1, U38.1, GND)
+	NET_C(U37.5, R35.1)
+	NET_C(R35.2, V, R34.1)
+	NET_C(C15.2, GND)
+	NET_C(U37.3, U28.1)
+	NET_C(U28.2, U28.5)
+	NET_C(U28.12, R31.1)
+	NET_C(U28.11, R32.1)
+	NET_C(U28.9, R33.1)
+	NET_C(U28.6, R30.1)
+	NET_C(R31.2, R32.2, R33.2, R30.2, R34.2, U38.5)
+	NET_C(U38.2, U38.6, C23.2, R61.1)
+	NET_C(R61.2, U38.7, R60.1)
+	NET_C(U38.4, R88.1, I_INVADER_4)
+	NET_C(INVADER_4, U38.3)
+
+	//
+	// Sheet 8, middle-bottom (BONUS)
+	//
+
+	NET_C(I_BONUS, R45.1, U10.6)
+	NET_C(C34.1, R77.2, I_V12)
+	NET_C(R45.2, R44.2, R74.2, U6.4, U6.8, C33.1, I_V12)
+
+	NET_C(R44.1, U10.5, C19.1)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_BONUS)
+	NET_C(D_BONUS.A, U10.5)
+	NET_C(D_BONUS.K, I_V12)
+#endif
+	NET_C(U10.4, U10.1, U10.2)
+	NET_C(C19.2, U10.3, D7.K)
+	NET_C(D7.A, R78.1)
+	NET_C(R78.2, R77.1, C34.2, R76.1)
+	// CD4011 oscillator: R80=1M, C35=0.1, freq=7.19Hz
+	CLOCK(OSC4, 7.19)
+	NET_C(OSC4.GND, GND)
+	NET_C(OSC4.VCC, I_V12)
+	NET_C(OSC4.Q, R79.1)
+	NET_C(R80.1, R80.2, C35.1, C35.2, U10.8, U10.9, U10.12, U10.13, GND)
+	NET_C(R79.2, R74.1, R75.2, U6.7)
+	NET_C(R75.1, U6.2, U6.6, C31.2)
+	NET_C(C31.1, C32.1, U6.1, GND)
+	NET_C(C32.2, U6.5)
+	NET_C(R76.2, D8.K, C50.1)
+	NET_C(U6.3, D8.A)
+	NET_C(C33.2, GND)
+	NET_C(BONUS, C50.2)
+
+	//
+	// Sheet 8, top-right (INVADER_3)
+	//
+
+	NET_C(U22.5, GND)
+	NET_C(U22.6, D3.A, R25.1)
+	NET_C(R25.2, C12.2, R24.2, U22.1, C8.2)
+	NET_C(D3.K, U22.7, R26.1)
+	NET_C(W, U30.9)
+	NET_C(U30.8, R28.1)
+	NET_C(R28.2, R26.2, C9.1, R27.2, C8.1)
+	NET_C(R27.1, GND)
+	NET_C(C9.2, U22.2, R24.1)
+	NET_C(U22.3, GND)
+	NET_C(C12.1, R54.1)
+	NET_C(R54.2, R53.1, U17.5)
+	NET_C(R53.2, V)
+	NET_C(U17.1, C7.1, GND)
+	NET_C(C7.2, U17.2, U17.6, R52.1)
+	NET_C(R52.2, U17.7, R51.1)
+	NET_C(R51.2, R23.2, U17.8, C6.1, I_V12)
+	NET_C(R23.1, U17.4, I_INVADER_3)
+	NET_C(C6.2, GND)
+	NET_C(INVADER_3, U17.3)
+
+	//
+	// Unconnected inputs
+	//
+
+	NET_C(GND, U7.5, U7.6, U7.12, U7.13)
+	NET_C(GND, U26.13)
+	NET_C(GND, U29.1, U29.3, U29.13)
+	NET_C(GND, U30.1, U30.11)
+
+	//
+	// Unconnected outputs
+	//
+
+#if (ENABLE_FRONTIERS)
+#define RXX 192
+	OPTIMIZE_FRONTIER(INVADER_1, RES_M(1), RXX)
+	OPTIMIZE_FRONTIER(INVADER_2, RES_M(1), RXX)
+	OPTIMIZE_FRONTIER(INVADER_3, RES_M(1), RXX)
+	OPTIMIZE_FRONTIER(INVADER_4, RES_M(1), RXX)
+
+	OPTIMIZE_FRONTIER(C50.1, RES_M(10), RXX)
+	OPTIMIZE_FRONTIER(C60.1, RES_M(10), RXX)    // this is a big one
+	OPTIMIZE_FRONTIER(C61.1, RES_M(10), RXX)
+#endif
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_astrob.h mame-0.224+dfsg.1/src/mame/audio/nl_astrob.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_astrob.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_astrob.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_ASTROB_H
+#define MAME_AUDIO_NL_ASTROB_H
+
+#pragma once
+
+NETLIST_EXTERNAL(astrob)
+
+#endif // MAME_AUDIO_NL_ASTROB_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_barrier.cpp mame-0.224+dfsg.1/src/mame/audio/nl_barrier.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_barrier.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_barrier.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,299 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Barrier
+//
+// Derived from the schematics in the Barrier manual. This sound
+// board is quite similar to Space Wars.
+//
+// Known problems/issues:
+//
+//    * The schematics show a connection between U8.6 and
+//       R37.2; however, implementing this leads to a direct input
+//       from the noise source at all times to the summing amp.
+//       Suspecting this is a typo in the schematics.
+//
+//    * Unsure if Barrier should have the noisy background like
+//       Space Wars. Space Wars has a hard overall mute to suppress
+//       it when the game isn't running, but Barrier does not.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_cinemat_common.h"
+
+
+//
+// Optimizations
+//
+
+#define HLE_NOISE_GEN (1)
+#define ENABLE_FRONTIERS (1)
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(barrier)
+
+	SOLVER(Solver, 1000)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	TTL_INPUT(I_OUT_0, 0)               // active high
+	TTL_INPUT(I_OUT_1, 0)               // active high
+	TTL_INPUT(I_OUT_2, 0)               // active high
+
+	NET_C(GND, I_OUT_0.GND, I_OUT_1.GND, I_OUT_2.GND)
+	NET_C(I_V5, I_OUT_0.VCC, I_OUT_1.VCC, I_OUT_2.VCC)
+
+	CINEMAT_LOCAL_MODELS
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V15, 15)
+	ANALOG_INPUT(I_VM15, -15)
+
+	RES(R1, RES_K(18))
+	RES(R2, 470)
+	RES(R3, RES_K(47))
+	RES(R4, RES_K(220))
+	RES(R5, 470)
+	RES(R6, 150)
+	RES(R7, RES_K(180))
+	RES(R8, RES_M(10))
+	RES(R9, RES_K(39))
+	RES(R10, RES_K(2.2))
+	RES(R11, 470)
+	RES(R12, RES_K(30))
+	RES(R13, RES_K(8.2))
+	RES(R14, RES_K(33))
+	RES(R15, RES_K(15))
+	RES(R16, RES_M(10))
+	RES(R17, RES_K(10))
+	RES(R18, RES_K(47))
+	RES(R19, 820)
+//  POT(R20, RES_K(10))     -- part of final amp (not emulated)
+//  RES(R21, 150)           -- part of final amp (not emulated), not present on Space Wars
+//  RES(R22, 2.7)           -- part of final amp (not emulated), not present on Space Wars
+//  RES(R23, 2.7)           -- part of final amp (not emulated), not present on Space Wars
+	RES(R24, RES_K(47))
+	RES(R25, 150)
+	RES(R26, RES_K(160))
+	RES(R27, 750)
+//  RES(R28, RES_K(150))    -- part of final amp (not emulated), illegible on Space Wars
+//  POT(R29, RES_K(10))     -- part of final amp (not emulated)
+//  RES(R30, 470)           -- part of final amp (not emulated)
+	RES(R31, 470)
+	RES(R32, RES_K(1))
+	RES(R33, RES_K(39))
+	RES(R34, RES_K(6.8))
+	RES(R35, RES_K(560))
+	RES(R36, RES_M(1))
+	RES(R37, RES_K(10))
+	RES(R38, RES_K(10))
+
+	CAP(C1, CAP_U(1))
+	CAP(C2, CAP_U(1))
+	CAP(C3, CAP_U(0.01))
+	CAP(C4, CAP_U(0.01))
+	CAP(C5, CAP_U(0.1))
+//  CAP(C6, CAP_U(4.7))     // not needed
+	CAP(C7, CAP_U(0.01))
+	CAP(C8, CAP_U(1))
+	CAP(C9, CAP_U(0.1))
+	CAP(C10, CAP_P(220))
+	CAP(C11, CAP_U(0.1))
+//  CAP(C12, CAP_U(0.01))   -- part of final amp (not emulated)
+//  CAP(C13, CAP_P(470))    -- part of final amp (not emulated)
+//  CAP(C14, CAP_P(470))    -- part of final amp (not emulated)
+//  CAP(C15, CAP_U(50))     -- not needed
+//  CAP(C16, CAP_U(2.2))    -- not needed
+	CAP(C17, CAP_U(0.01))
+	CAP(C18, CAP_U(15))
+//  CAP(C19, CAP_U(50))     -- not needed
+//  CAP(C20, CAP_U(2.2))    -- not needed
+	CAP(C21, CAP_U(0.02))
+	CAP(C22, CAP_U(0.1))
+
+	D_1N914(CR1)
+	D_1N914(CR2)
+	D_1N914(CR3)
+	D_1N914(CR4)
+	D_1N914(CR5)
+	D_1N914(CR6)
+
+	Q_2N3906(Q1)    // PNP
+	Q_2N3904(Q2)    // NPN
+	Q_2N6426(Q3)    // NPN Darlington
+	Q_2N6292(Q4)    // NPN
+	Q_2N6107(Q5)    // PNP
+	Q_2N6426(Q6)    // NPN Darlington
+	Q_2N3904(Q7)    // NPN
+
+	TL081_DIP(U1)           // Op. Amp.
+	NET_C(U1.4, I_VM15)
+	NET_C(U1.7, I_V15)
+
+	TTL_7406_DIP(U2)        // Hex inverter -- currently using a clone of 7416, no open collector behavior
+	NET_C(U2.7, GND)
+	NET_C(U2.14, I_V5)
+
+	TL081_DIP(U3)           // Op. Amp.
+	NET_C(U3.4, I_VM15)
+	NET_C(U3.7, I_V15)
+
+//  TTL_7815_DIP(U4)        // +15V Regulator -- not needed
+
+	TL182_DIP(U5)           // Analog switch
+	NET_C(U5.6, I_V15)
+	NET_C(U5.7, I_V5)
+	NET_C(U5.8, GND)
+	NET_C(U5.9, I_VM15)
+
+//  TL081_DIP(U6)           // Op. Amp. -- part of final amp (not emulated)
+//  NET_C(U6.4, I_VM15)
+//  NET_C(U6.7, I_V15)
+
+//  TTL_7915_DIP(U7)        // -15V Regulator -- not needed
+
+	TL081_DIP(U8)           // Op. Amp.
+	NET_C(U8.4, I_VM15)
+	NET_C(U8.7, I_V15)
+
+	TL081_DIP(U9)           // Op. Amp.
+	NET_C(U9.4, I_VM15)
+	NET_C(U9.7, I_V15)
+
+	//
+	// Top-left until output from U1
+	//
+
+#if (HLE_NOISE_GEN)
+	CLOCK(NOISE_CLOCK, 2000)
+	NET_C(NOISE_CLOCK.GND, GND)
+	NET_C(NOISE_CLOCK.VCC, I_V5)
+
+	SYS_NOISE_MT_N(NOISE, 0.0001)
+	NET_C(NOISE.I, NOISE_CLOCK.Q)
+	NET_C(NOISE.1, GND)
+	NET_C(NOISE.2, C1.1)
+
+	NET_C(GND, R1.1, R1.2, R2.1, R2.2, CR1.A, CR1.K, CR2.A, CR2.K)
+#else
+	NET_C(I_V15, CR1.A)
+	NET_C(CR1.K, CR2.A)
+	NET_C(CR2.K, R1.2, Q1.B)
+	NET_C(R1.1, GND)
+	NET_C(I_V15, R2.2)
+	NET_C(R2.1, Q1.E)
+	NET_C(Q2.E, Q1.C, C1.1)
+	NET_C(Q2.C, GND)
+#endif
+
+	NET_C(C1.2, R3.2, U1.3)
+	NET_C(R3.1, GND)
+	NET_C(U1.2, R5.2, R4.1)
+	NET_C(R5.1, GND)
+	NET_C(R4.2, U1.6)
+
+	//
+	// Top-middle, from O1 until output from CR3
+	//
+
+	NET_C(I_OUT_1, U2.13)
+	NET_C(U2.12, R6.1)
+	NET_C(R6.2, R7.1, C2.1, Q3.B)
+	NET_C(R7.2, I_V5)
+	NET_C(C2.2, GND)
+	NET_C(Q3.E, R11.2)
+	NET_C(Q3.C, I_V5)
+	NET_C(R11.1, CR3.A)
+
+	//
+	// Middle chunk, from C3 until output from R13
+	//
+
+	NET_C(U1.6, C3.1)
+	NET_C(C3.2, R8.1, U3.2)
+	NET_C(U3.3, GND)
+	NET_C(R8.2, U3.6, R9.1)
+	NET_C(R9.2, CR3.K, C4.1, CR4.A, R10.2)
+	NET_C(R10.1, CR4.K, GND)
+	NET_C(C4.2, R12.1)
+	NET_C(R12.2, C5.2, R13.1)
+	NET_C(C5.1, GND)
+
+	//
+	// Big middle section, from C8 until output from R15/R41/R37
+	//
+
+	NET_C(U1.6, C8.2)
+	NET_C(C8.1, R24.1)
+	NET_C(R24.2, U8.2, C10.1, R16.1)
+	NET_C(U8.3, GND)
+	NET_C(U8.6, R16.2, C10.2, R31.1, R38.1)
+//  NET_C(U8.6, R13.2)      // Schems show noise source into summing amp -- wrong??
+	NET_C(R38.2, U5.14)
+	NET_C(I_OUT_2, U5.10)
+	NET_C(U5.13, C7.1)
+	NET_C(C7.2, R14.1)
+	NET_C(R37.2, R13.2)
+	NET_C(R14.2, C9.2, R15.1)
+	NET_C(C9.1, GND)
+	NET_C(R15.2, R13.2)
+	NET_C(I_OUT_0, U2.9)
+	NET_C(U2.8, R25.1)
+	NET_C(R25.2, R26.1, C17.1, Q6.B, C18.1)
+	NET_C(R26.2, C17.2, I_V5)
+	NET_C(C18.2, GND)
+	NET_C(Q6.E, R27.2)
+	NET_C(Q6.C, I_V5)
+	NET_C(R27.1, CR5.A)
+	NET_C(CR5.K, R33.2, CR6.A, R34.2, C21.2, C22.1)
+	NET_C(R31.2, R32.2, R33.1, Q7.E)
+	NET_C(R32.1, Q7.B)
+	NET_C(Q7.C, CR6.K, R34.1, C21.1, GND)
+	NET_C(C22.2, R35.1)
+	NET_C(R35.2, U9.2, R36.1)
+	NET_C(U9.3, GND)
+	NET_C(U9.6, R36.2, R37.1)
+
+	//
+	// Final stage
+	//
+
+	NET_C(R17.2, C11.1, R13.2)
+	NET_C(R17.1, R18.1, GND)
+	NET_C(C11.2, R18.2, R19.1)
+	NET_C(R19.2, GND)
+	ALIAS(OUTPUT, R18.2)
+
+	//
+	// Unconnected inputs
+	//
+
+	NET_C(GND, U2.3, U2.5, U2.11)
+	NET_C(GND, U5.1, U5.2, U5.5, U2.1)
+
+	//
+	// Frontier optimizations
+	//
+
+#if (ENABLE_FRONTIERS)
+	// Separate each input into the summing network
+	OPTIMIZE_FRONTIER(R13.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R15.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R37.1, RES_M(1), 50)
+
+	// Decouple the Darlington BJTs from the sounds they enable
+	OPTIMIZE_FRONTIER(R27.2, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R11.2, RES_M(1), 50)
+
+	// Decouple the noise source from the downstream filters
+	OPTIMIZE_FRONTIER(C3.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R24.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R38.1, RES_M(1), 50)
+#endif
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_barrier.h mame-0.224+dfsg.1/src/mame/audio/nl_barrier.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_barrier.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_barrier.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_BARRIER_H
+#define MAME_AUDIO_NL_BARRIER_H
+
+#pragma once
+
+NETLIST_EXTERNAL(barrier)
+
+#endif // MAME_AUDIO_NL_BARRIER_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_boxingb.cpp mame-0.224+dfsg.1/src/mame/audio/nl_boxingb.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_boxingb.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_boxingb.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,1716 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Boxing Bugs
+//
+// Derived from the schematics in the Boxing Bugs manual.
+//
+// Known problems/issues:
+//
+//    * WIP.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_cinemat_common.h"
+
+//
+// Hacks/workarounds
+//
+
+#define HACK_SIMPLIFY_INPUTS (1)
+#define HACK_VOLTAGE_SWITCH (1)
+
+
+
+//
+// Optimizations
+//
+
+#define HLE_SFX_CLOCK (1)
+#define HLE_MUSIC_CLOCK (1)
+#define HLE_CHIRPING_VCO (1)
+#define HLE_DYING_BUG_VCO (1)
+#define HLE_CRACKING_VCO (1)
+#define HLE_BEETLE_VCO (1)
+#define HLE_BOUNCE_VCO (1)
+#define HLE_CANNON_VCO (1)
+#define ENABLE_FRONTIERS (1)
+
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(boxingb)
+
+	SOLVER(Solver, 1000)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	TTL_INPUT(I_OUT_0, 0)               // active high
+	TTL_INPUT(I_OUT_1, 0)               // active high
+	TTL_INPUT(I_OUT_2, 0)               // active high
+	TTL_INPUT(I_OUT_3, 0)               // active high
+	TTL_INPUT(I_OUT_4, 0)               // active high
+	TTL_INPUT(I_OUT_7, 0)               // active high
+
+	NET_C(GND, I_OUT_0.GND, I_OUT_1.GND, I_OUT_2.GND, I_OUT_3.GND, I_OUT_4.GND, I_OUT_7.GND)
+	NET_C(I_V5, I_OUT_0.VCC, I_OUT_1.VCC, I_OUT_2.VCC, I_OUT_3.VCC, I_OUT_4.VCC, I_OUT_7.VCC)
+
+	CINEMAT_LOCAL_MODELS
+
+	ANALOG_INPUT(I_V2_2, 2.2)
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V15, 15)
+	ANALOG_INPUT(I_VM15, -15)
+
+//  RES(R4, 620)             -- part of voltage converter (not emulated)
+//  RES(R5, 620)             -- part of voltage converter (not emulated)
+//  RES(R6, 430)             -- part of 2.2V voltage converter (not emulated)
+//  RES(R7, 560)             -- part of 2.2V voltage converter (not emulated)
+//  RES(R8, RES_K(3.3))      -- part of 2.2V voltage converter (not emulated)
+	RES(R9, RES_K(1))
+	RES(R10, RES_K(4.7))
+	RES(R11, RES_K(1))
+	RES(R12, RES_K(39))
+	RES(R13, RES_K(12))
+	RES(R14, RES_K(1))
+	RES(R15, RES_K(4.7))
+	RES(R16, RES_K(75))
+	RES(R17, RES_K(75))
+	RES(R18, 200)
+	RES(R19, 200)
+	RES(R20, RES_K(200))
+	RES(R21, RES_K(4.7))
+	RES(R22, RES_K(4.7))
+	RES(R23, RES_K(2.7))
+	RES(R24, RES_K(4.7))
+	RES(R25, RES_K(39))
+	RES(R26, RES_K(12))
+	RES(R27, RES_K(2.4))
+	RES(R28, RES_K(51))
+	RES(R29, RES_K(270))
+	RES(R30, RES_M(1))
+	RES(R31, RES_K(16))
+	RES(R32, RES_K(10))
+	RES(R33, RES_K(1))
+	RES(R34, RES_K(4.7))
+	RES(R35, RES_K(2.7))
+	RES(R36, RES_K(4.7))
+	RES(R37, RES_K(39))
+	RES(R38, RES_K(12))
+	RES(R39, RES_K(2.4))
+	RES(R40, RES_K(51))
+	RES(R41, RES_K(270))
+	RES(R42, RES_M(1))
+	RES(R43, RES_K(11))
+	RES(R44, RES_K(10))
+	RES(R45, RES_K(1))
+	RES(R46, RES_K(2))
+	RES(R47, RES_K(1))
+	RES(R48, RES_K(12))
+	RES(R49, RES_K(1))
+	RES(R50, RES_K(20))
+	RES(R51, RES_K(20))
+	RES(R52, RES_K(20))
+	RES(R53, RES_K(20))
+	RES(R54, RES_K(2))
+	RES(R55, RES_K(4.7))
+	RES(R56, RES_K(2.7))
+	RES(R57, RES_K(4.7))
+	RES(R58, RES_K(39))
+	RES(R59, RES_K(12))
+	RES(R60, RES_K(2.4))
+	RES(R61, RES_K(51))
+	RES(R62, RES_K(270))
+	RES(R63, RES_M(1))
+	RES(R64, RES_K(6.2))
+	RES(R65, RES_K(10))
+	RES(R66, RES_K(1))
+	RES(R67, RES_K(2))
+	RES(R68, RES_K(22))
+	RES(R69, RES_K(39))
+	RES(R70, RES_K(47))
+	RES(R71, RES_K(1))
+	RES(R72, RES_K(10))
+	RES(R73, RES_K(2))
+	RES(R74, RES_K(910))
+	RES(R75, 390)
+#if (HACK_VOLTAGE_SWITCH)
+	RES(R76, 100)
+#else
+	RES(R76, RES_K(4.7))
+#endif
+	RES(R77, RES_K(2.7))
+	RES(R78, RES_K(4.7))
+	RES(R79, RES_K(39))
+	RES(R80, RES_K(12))
+	RES(R81, RES_K(2.4))
+	RES(R82, RES_K(51))
+	RES(R83, RES_K(270))
+	RES(R84, RES_M(1))
+	RES(R85, RES_K(12))
+	RES(R86, RES_K(10))
+	RES(R87, RES_K(1))
+	RES(R88, RES_K(2))
+	RES(R89, RES_K(20))
+	RES(R90, RES_K(2))
+	RES(R91, RES_K(20))
+#if (HACK_VOLTAGE_SWITCH)
+	RES(R92, 100)
+#else
+	RES(R92, RES_K(4.7))
+#endif
+	RES(R93, RES_K(2.7))
+	RES(R94, RES_K(4.7))
+	RES(R95, RES_K(39))
+	RES(R96, RES_K(12))
+	RES(R97, RES_K(2.4))
+	RES(R98, RES_K(51))
+	RES(R99, RES_K(330))
+	RES(R100, RES_K(1))
+	RES(R101, RES_M(1))
+	RES(R102, 47)
+	RES(R103, RES_K(4.7))
+	RES(R104, RES_K(1))
+	RES(R105, RES_K(39))
+	RES(R106, RES_K(12))
+	RES(R107, RES_K(1))
+	RES(R108, RES_K(6.8))
+	RES(R109, RES_K(100))
+	RES(R110, RES_K(270))
+	RES(R111, 100)
+	RES(R112, 100)
+	RES(R113, RES_K(4.7))
+	RES(R114, RES_K(1))
+	RES(R115, RES_K(39))
+	RES(R116, RES_K(12))
+	RES(R117, RES_K(2.4))
+	RES(R118, RES_K(51))
+	RES(R119, RES_K(270))
+	RES(R120, RES_M(1))
+	RES(R121, RES_K(10))
+	RES(R122, RES_K(10))
+	RES(R123, RES_K(1))
+	RES(R124, RES_K(2))
+	RES(R125, RES_K(20))
+	RES(R126, RES_K(2))
+	RES(R127, RES_K(3.9))
+	RES(R128, 10)
+	RES(R129, RES_M(1))
+	RES(R130, RES_K(6.8))
+	RES(R131, RES_K(18))
+	RES(R132, RES_K(47))
+	RES(R133, 390)
+	RES(R134, 390)
+	RES(R135, RES_K(4.7))
+	RES(R136, RES_K(2.7))
+	RES(R137, RES_K(4.7))
+	RES(R138, RES_K(39))
+	RES(R139, RES_K(12))
+	RES(R140, RES_K(1))
+	RES(R141, RES_K(75))
+	RES(R142, RES_K(4.7))
+	RES(R143, RES_K(2.7))
+	RES(R144, RES_K(4.7))
+	RES(R145, RES_K(39))
+	RES(R146, RES_K(12))
+	RES(R147, RES_K(1))
+	RES(R148, RES_K(240))
+	RES(R149, RES_K(300))
+	RES(R150, RES_K(300))
+//  RES(R151, RES_K(15))    -- part of final amp (not emulated)
+//  RES(R152, 150)          -- part of final amp (not emulated)
+//  RES(R153, 150)          -- part of final amp (not emulated)
+//  RES(R154, RES_K(22))    -- part of final amp (not emulated)
+//  RES(R155, RES_K(390))   -- part of final amp (not emulated)
+//  RES(R156, 0.51)         -- part of final amp (not emulated)
+//  RES(R157, 0.51)         -- part of final amp (not emulated)
+//  RES(R158, RES_K(390))   -- part of final amp (not emulated)
+	RES(R159, RES_K(30))
+	RES(R160, RES_K(8.2))
+	RES(R161, RES_K(20))
+//  RES(R162, RES_K(10))    -- part of shaft encoder (not emulated)
+//  RES(R163, RES_K(100))   -- part of shaft encoder (not emulated)
+//  RES(R164, RES_M(1.8))   -- part of shaft encoder (not emulated)
+//  RES(R165, RES_K(10))    -- part of shaft encoder (not emulated)
+//  RES(R166, RES_K(2.4))   -- part of shaft encoder (not emulated)
+//  RES(R167, RES_K(1))     -- part of shaft encoder (not emulated)
+//  RES(R168, RES_K(470))   -- part of shaft encoder (not emulated)
+//  RES(R169, RES_K(10))    -- part of shaft encoder (not emulated)
+//  RES(R170, RES_K(470))   -- part of shaft encoder (not emulated)
+//  RES(R171, RES_K(100))   -- part of shaft encoder (not emulated)
+//  RES(R172, RES_M(1.8))   -- part of shaft encoder (not emulated)
+//  RES(R173, RES_K(10))    -- part of shaft encoder (not emulated)
+//  RES(R174, RES_K(2.4))   -- part of shaft encoder (not emulated)
+//  RES(R175, RES_K(1))     -- part of shaft encoder (not emulated)
+//  RES(R176, RES_K(1))     -- part of shaft encoder (not emulated)
+	RES(R177, RES_K(1))
+	RES(R178, 330)
+	RES(R179, 330)
+	RES(R180, RES_K(1))
+	RES(R181, RES_K(1))
+	RES(R182, RES_K(1))
+	RES(R183, RES_K(4.7))
+	RES(R184, RES_K(510))
+	RES(R185, 470)
+	RES(R186, 470)
+	RES(R187, RES_K(4.7))
+	RES(R188, RES_K(2.7))
+	RES(R189, RES_K(4.7))
+	RES(R190, RES_K(39))
+	RES(R191, RES_K(12))
+	RES(R192, RES_K(1))
+	RES(R193, RES_K(24))
+	RES(R194, RES_K(100))
+	RES(R195, RES_K(4.7))
+	RES(R196, RES_K(2.7))
+	RES(R197, RES_K(4.7))
+	RES(R198, RES_K(39))
+	RES(R199, RES_K(12))
+	RES(R200, RES_K(1))
+	RES(R201, RES_K(51))
+	RES(R202, RES_K(36))
+	RES(R203, RES_K(1))
+	RES(R204, RES_K(1))
+	RES(R205, RES_K(2))
+	RES(R206, RES_K(1))
+	RES(R207, RES_K(1))
+	RES(R208, RES_K(1))
+	RES(R209, RES_K(1))
+
+//  CAP(C1, CAP_U(0.1))     -- part of voltage converter (not emulated)
+//  CAP(C2, CAP_U(0.1))     -- part of voltage converter (not emulated)
+//  CAP(C3, CAP_U(22))      -- part of voltage converter (not emulated)
+//  CAP(C4, CAP_U(22))      -- part of voltage converter (not emulated)
+//  CAP(C5, CAP_U(22))      -- part of voltage converter (not emulated)
+//  CAP(C6, CAP_U(22))      -- part of voltage converter (not emulated)
+//  CAP(C7, CAP_U(22))      -- part of voltage converter (not emulated)
+//  CAP(C8, CAP_U(0.1))     -- part of voltage converter (not emulated)
+//  CAP(C9, CAP_U(0.1))     -- part of voltage converter (not emulated)
+//  CAP(C10, CAP_U(0.1))    -- part of 2.2V voltage converter (not emulated)
+	CAP(C11, CAP_U(0.1))
+	CAP(C12, CAP_U(0.1))
+	CAP(C13, CAP_U(1))
+	CAP(C14, CAP_U(2.2))
+	CAP(C15, CAP_U(0.001))
+	CAP(C16, CAP_U(0.001))
+	CAP(C17, CAP_U(0.1))
+	CAP(C18, CAP_U(2.2))
+	CAP(C19, CAP_U(0.001))
+	CAP(C20, CAP_U(0.001))
+	CAP(C21, CAP_U(0.1))
+	CAP(C22, CAP_U(0.01))
+	CAP(C23, CAP_U(0.1))
+	CAP(C24, CAP_U(0.68))
+	CAP(C25, CAP_U(0.001))
+	CAP(C26, CAP_U(0.0022))
+	CAP(C27, CAP_U(0.1))
+	CAP(C28, CAP_U(0.1))
+	CAP(C29, CAP_U(0.1))
+	CAP(C30, CAP_U(0.01))
+	CAP(C31, CAP_U(4.7))
+	CAP(C32, CAP_U(0.001))
+	CAP(C33, CAP_U(0.01))
+	CAP(C34, CAP_U(0.1))
+	CAP(C35, CAP_U(0.1))
+	CAP(C36, CAP_U(2.2))
+	CAP(C37, CAP_U(0.1))
+	CAP(C38, CAP_U(0.01))
+	CAP(C39, CAP_U(0.001))
+	CAP(C40, CAP_U(0.47))
+	CAP(C41, CAP_U(1))
+	CAP(C42, CAP_U(0.1))
+	CAP(C43, CAP_U(0.47))
+	CAP(C44, CAP_U(0.001))
+	CAP(C45, CAP_U(0.1))
+	CAP(C46, CAP_U(0.1))
+	CAP(C47, CAP_U(100))
+	CAP(C48, CAP_U(0.1))
+	CAP(C49, CAP_U(0.1))
+	CAP(C50, CAP_U(0.01))
+	CAP(C51, CAP_U(4.7))
+	CAP(C52, CAP_U(0.47))
+	CAP(C53, CAP_U(0.1))
+	CAP(C54, CAP_U(0.1))
+//  CAP(C55, CAP_U(0.68))
+//  CAP(C56, CAP_U(0.005))  -- part of final amp (not emulated)
+//  CAP(C57, CAP_P(470))    -- part of final amp (not emulated)
+//  CAP(C58, CAP_P(470))    -- part of final amp (not emulated)
+//  CAP(C59, CAP_P(470))    -- part of final amp (not emulated)
+	CAP(C60, CAP_U(0.33))
+	CAP(C61, CAP_P(330))
+//  CAP(C62, CAP_U(0.1))    -- part of shaft encoder (not emulated)
+//  CAP(C63, CAP_P(330))    -- part of shaft encoder (not emulated)
+//  CAP(C64, CAP_P(330))    -- part of shaft encoder (not emulated)
+//  CAP(C65, CAP_P(330))    -- part of shaft encoder (not emulated)
+//  CAP(C66, CAP_P(330))    -- part of shaft encoder (not emulated)
+	CAP(C67, CAP_U(0.001))
+	CAP(C68, CAP_P(680))
+	CAP(C69, CAP_U(0.001))
+	CAP(C70, CAP_U(0.001))
+	CAP(C71, CAP_U(0.68))
+	CAP(C72, CAP_U(0.22))
+	CAP(C73, CAP_U(0.1))
+	CAP(C74, CAP_U(0.1))
+	CAP(C75, CAP_U(0.01))
+
+//  Q_2N3904(Q1)            // NPN -- part of 2.2V voltage converter (not emulated)
+	Q_2N3906(Q2)            // PNP
+	Q_2N3906(Q3)            // PNP
+	Q_2N3906(Q4)            // PNP
+	Q_2N3904(Q5)            // NPN
+	Q_2N3904(Q6)            // NPN
+	Q_2N3906(Q7)            // PNP
+	Q_2N3904(Q8)            // NPN
+	Q_2N3904(Q9)            // NPN
+	Q_2N3906(Q10)           // PNP
+	Q_2N3904(Q11)           // NPN
+	Q_2N3904(Q12)           // NPN
+	Q_2N3906(Q13)           // PNP
+	Q_2N3904(Q14)           // NPN
+	Q_2N3904(Q15)           // NPN
+	Q_2N3906(Q16)           // PNP
+	Q_2N3904(Q17)           // NPN
+	Q_2N3906(Q18)           // PNP
+	Q_2N3906(Q19)           // PNP
+	Q_2N3906(Q20)           // PNP
+	Q_2N3904(Q21)           // NPN
+	Q_2N3904(Q22)           // NPN
+	Q_2N3906(Q23)           // PNP
+	Q_2N3906(Q24)           // PNP
+	Q_2N3906(Q25)           // PNP
+	Q_2N3906(Q26)           // PNP
+//  Q_2N6292(Q27)           // PNP -- part of final amp (not emulated)
+//  Q_2N6107(Q28)           // NPN -- part of final amp (not emulated)
+	Q_2N5210(Q29)           // NPN
+	Q_2N5210(Q30)           // NPN
+	Q_2N3906(Q31)           // PNP
+	Q_2N3906(Q32)           // PNP
+	Q_2N3906(Q33)           // PNP
+	Q_2N3906(Q34)           // PNP
+
+//  D_1N4003(D1)            -- part of voltage converter (not emulated)
+//  D_1N4003(D2)            -- part of voltage converter (not emulated)
+//  D_1N4003(D3)            -- part of voltage converter (not emulated)
+//  D_1N4003(D4)            -- part of voltage converter (not emulated)
+//  D_1N914(D5)             -- part of voltage converter (not emulated)
+//  D_1N914(D6)             -- part of voltage converter (not emulated)
+//  D_1N5236(D7)            -- part of voltage converter (not emulated)
+//  D_1N5236(D8)            -- part of voltage converter (not emulated)
+//  D_1N5236(D9)            -- part of voltage converter (not emulated)
+//  D_1N5236(D10)           -- part of voltage converter (not emulated)
+//  D_1N914(D11)            -- part of voltage converter (not emulated)
+//  D_1N914(D12)            -- part of voltage converter (not emulated)
+	D_1N914(D13)
+	D_1N914(D14)
+	D_1N914(D15)
+	D_1N914(D16)
+	D_1N914(D17)
+	D_1N914(D18)
+	D_1N914(D19)
+	D_1N914(D20)
+	D_1N914(D21)
+	D_1N914(D22)
+//  D_1N4003(D23)           -- part of final amp (not emulated)
+//  D_1N4003(D24)           -- part of final amp (not emulated)
+	D_1N914(D25)
+	D_1N914(D26)
+	D_1N914(D27)
+	D_1N914(D28)
+	D_1N914(D29)
+	D_1N914(D30)
+
+#if (!HLE_MUSIC_CLOCK)
+	CLOCK(Y1, 20000000)
+	NET_C(Y1.GND, GND)
+	NET_C(Y1.VCC, I_V5)
+#endif
+
+	TTL_74LS393_DIP(U1)     // Dual 4-Stage Binary Counter
+	NET_C(U1.7, GND)
+	NET_C(U1.14, I_V5)
+
+	TTL_74S04_DIP(U2)       // Hex Inverting Gates
+	NET_C(U2.7, GND)
+	NET_C(U2.14, I_V5)
+
+//  TTL_74LS74_DIP(U7)      // Dual D Flip Flop -- part of shaft encoder (not emulated)
+//  NET_C(U7.7, GND)
+//  NET_C(U7.14, I_V5)
+
+//  TTL_74LS74_DIP(U8)      // Dual D Flip Flop -- part of shaft encoder (not emulated)
+//  NET_C(U8.7, GND)
+//  NET_C(U8.14, I_V5)
+
+	TTL_74LS107_DIP(U9)     // DUAL J-K FLIP-FLOPS WITH CLEAR
+	NET_C(U9.7, GND)
+	NET_C(U9.14, I_V5)
+
+//  TTL_74LS74_DIP(U10)     // Dual D Flip Flop -- part of shaft encoder (not emulated)
+//  NET_C(U10.7, GND)
+//  NET_C(U10.14, I_V5)
+
+	TTL_74LS164_DIP(U11)    // 8-bit Shift Reg.
+	NET_C(U11.7, GND)
+	NET_C(U11.14, I_V5)
+
+	TTL_74LS86_DIP(U12)     // Quad 2-Input XOR Gates
+	NET_C(U12.7, GND)
+	NET_C(U12.14, I_V5)
+
+	TTL_74LS393_DIP(U13)    // Dual 4-Stage Binary Counter
+	NET_C(U13.7, GND)
+	NET_C(U13.14, I_V5)
+
+	TTL_74LS393_DIP(U15)    // Dual 4-Stage Binary Counter
+	NET_C(U15.7, GND)
+	NET_C(U15.14, I_V5)
+
+//  TTL_74LS191_DIP(U16)    // Presettable 4-bit Binary Up/Down Counter -- part of shaft encoder (not emulated)
+//  NET_C(U16.8, GND)
+//  NET_C(U16.16, I_V5)
+
+//  TTL_74LS191_DIP(U17)    // Presettable 4-bit Binary Up/Down Counter -- part of shaft encoder (not emulated)
+//  NET_C(U17.8, GND)
+//  NET_C(U17.16, I_V5)
+
+//  TTL_74LS157_DIP(U18)    // Quad 2-Input Multiplexor -- part of shaft encoder (not emulated)
+//  NET_C(U18.8, GND)
+//  NET_C(U18.16, I_V5)
+
+	LM555_DIP(U19)
+
+	TTL_7414_DIP(U20)       // Hex Inverter
+	NET_C(U20.7, GND)
+	NET_C(U20.14, I_V5)
+
+	TTL_74LS393_DIP(U21)    // Dual 4-Stage Binary Counter
+	NET_C(U21.7, GND)
+	NET_C(U21.14, I_V5)
+
+	TTL_74LS393_DIP(U22)    // Dual 4-Stage Binary Counter
+	NET_C(U22.7, GND)
+	NET_C(U22.14, I_V5)
+
+	TTL_74S113_DIP(U23)     // Dual JK Negative Edge-Trigged Flip Flop
+	NET_C(U23.7, GND)
+	NET_C(U23.14, I_V5)
+
+	TTL_74LS74_DIP(U24)     // Dual D Flip Flop
+	NET_C(U24.7, GND)
+	NET_C(U24.14, I_V5)
+
+	TTL_74LS74_DIP(U25)     // Dual D Flip Flop
+	NET_C(U25.7, GND)
+	NET_C(U25.14, I_V5)
+
+	TTL_74LS393_DIP(U26)    // Dual 4-Stage Binary Counter
+	NET_C(U26.7, GND)
+	NET_C(U26.14, I_V5)
+
+	TTL_74LS163_DIP(U27)    // Binary Counter
+	NET_C(U27.8, GND)
+	NET_C(U27.16, I_V5)
+
+	TTL_74LS163_DIP(U28)    // Binary Counter
+	NET_C(U28.8, GND)
+	NET_C(U28.16, I_V5)
+
+	TTL_74LS74_DIP(U29)     // Dual D Flip Flop
+	NET_C(U29.7, GND)
+	NET_C(U29.14, I_V5)
+
+	TTL_7414_DIP(U30)       // Hex Inverter
+	NET_C(U30.7, GND)
+	NET_C(U30.14, I_V5)
+
+	TTL_74LS04_DIP(U31)     // Hex Inverting Gates
+	NET_C(U31.7, GND)
+	NET_C(U31.14, I_V5)
+
+	TTL_74LS393_DIP(U32)    // Dual 4-Stage Binary Counter
+	NET_C(U32.7, GND)
+	NET_C(U32.14, I_V5)
+
+	TTL_74LS107_DIP(U33)    // DUAL J-K FLIP-FLOPS WITH CLEAR
+	NET_C(U33.7, GND)
+	NET_C(U33.14, I_V5)
+
+	TTL_74LS107_DIP(U34)    // DUAL J-K FLIP-FLOPS WITH CLEAR
+	NET_C(U34.7, GND)
+	NET_C(U34.14, I_V5)
+
+	TTL_74LS02_DIP(U35)     // Quad 2-input Nor Gate
+	NET_C(U35.7, GND)
+	NET_C(U35.14, I_V5)
+
+	TTL_74LS163_DIP(U36)    // Binary Counter
+	NET_C(U36.8, GND)
+	NET_C(U36.16, I_V5)
+
+	TTL_74LS163_DIP(U37)    // Binary Counter
+	NET_C(U37.8, GND)
+	NET_C(U37.16, I_V5)
+
+	TTL_74LS377_DIP(U38)    // Octal D Flip Flop
+	NET_C(U38.10, GND)
+	NET_C(U38.20, I_V5)
+
+	TTL_74LS164_DIP(U39)    // 8-bit Shift Reg.
+	NET_C(U39.7, GND)
+	NET_C(U39.14, I_V5)
+
+	TTL_7406_DIP(U40)       // Hex inverter -- currently using a clone of 7416, no open collector behavior
+	NET_C(U40.7, GND)
+	NET_C(U40.14, I_V5)
+
+	TTL_74LS393_DIP(U41)    // Dual 4-Stage Binary Counter
+	NET_C(U41.7, GND)
+	NET_C(U41.14, I_V5)
+
+	TTL_74LS393_DIP(U42)    // Dual 4-Stage Binary Counter
+	NET_C(U42.7, GND)
+	NET_C(U42.14, I_V5)
+
+	TTL_74LS163_DIP(U43)    // Binary Counter
+	NET_C(U43.8, GND)
+	NET_C(U43.16, I_V5)
+
+	TTL_74LS74_DIP(U44)     // Dual D Flip Flop
+	NET_C(U44.7, GND)
+	NET_C(U44.14, I_V5)
+
+	TTL_74LS74_DIP(U45)     // Dual D Flip Flop
+	NET_C(U45.7, GND)
+	NET_C(U45.14, I_V5)
+
+	TTL_74LS163_DIP(U46)    // Binary Counter
+	NET_C(U46.8, GND)
+	NET_C(U46.16, I_V5)
+
+	TTL_74LS377_DIP(U47)    // Octal D Flip Flop
+	NET_C(U47.10, GND)
+	NET_C(U47.20, I_V5)
+
+	TTL_74LS377_DIP(U48)    // Octal D Flip Flop
+	NET_C(U48.10, GND)
+	NET_C(U48.20, I_V5)
+
+	TTL_74LS164_DIP(U49)    // 8-bit Shift Reg.
+	NET_C(U49.7, GND)
+	NET_C(U49.14, I_V5)
+
+	TTL_7414_DIP(U50)       // Hex Inverter
+	NET_C(U50.7, GND)
+	NET_C(U50.14, I_V5)
+
+#if (!HLE_CHIRPING_VCO)
+	LM566_DIP(U51)          // 566 VCO
+#endif
+
+#if (!HLE_DYING_BUG_VCO)
+	LM566_DIP(U52)          // 566 VCO
+#endif
+
+#if (!HLE_CRACKING_VCO)
+	LM566_DIP(U53)          // 566 VCO
+#endif
+
+	TL081_DIP(U54)          // Op. Amp.
+	NET_C(U54.7, I_V15)
+	NET_C(U54.4, I_VM15)
+
+	TL081_DIP(U55)          // Op. Amp.
+	NET_C(U55.7, I_V15)
+	NET_C(U55.4, I_VM15)
+
+#if (!HLE_BEETLE_VCO)
+	LM566_DIP(U56)          // 566 VCO
+#endif
+
+#if (!HLE_BOUNCE_VCO)
+	LM566_DIP(U57)          // 566 VCO
+#endif
+
+	LM555_DIP(U58)
+
+	CA3080_DIP(U59)         // Op. Amp.
+	NET_C(U59.4, I_VM15)
+	NET_C(U59.7, I_V15)
+
+#if (!HLE_CANNON_VCO)
+	LM566_DIP(U60)          // 566 VCO
+#endif
+
+	CA3080_DIP(U61)         // Op. Amp.
+	NET_C(U61.4, I_VM15)
+	NET_C(U61.7, I_V15)
+
+	AMI_S2688(U62)          // Noise generator
+
+	TL081_DIP(U63)          // Op. Amp.
+	NET_C(U63.7, I_V15)
+	NET_C(U63.4, I_VM15)
+
+	CA3080_DIP(U64)         // Op. Amp.
+	NET_C(U64.4, I_VM15)
+	NET_C(U64.7, I_V15)
+
+//  TL081_DIP(U65)          // Op. Amp. -- part of shaft encoder (not emulated)
+//  NET_C(U65.7, I_V15)
+//  NET_C(U65.4, I_VM15)
+
+//  TL081_DIP(U66)          // Op. Amp. -- part of shaft encoder (not emulated)
+//  NET_C(U66.7, I_V15)
+//  NET_C(U66.4, I_VM15)
+
+	CA3080_DIP(U67)         // Op. Amp.
+	NET_C(U67.4, I_VM15)
+	NET_C(U67.7, I_V15)
+
+//  TTL_7815_DIP(U68)       // +15V Regulator -- part of voltage converter (not emulated)
+//  TTL_7915_DIP(U69)       // -15V Regulator -- part of voltage converter (not emulated)
+
+//  TL081_DIP(U70)          // Op. Amp. --  part of final amp (not emulated)
+//  NET_C(U70.7, I_V15)
+//  NET_C(U70.4, I_VM15)
+
+	//
+	// Page 1, top right
+	//
+
+	ALIAS(HIB_P, U27.6)
+	NET_C(HIB_P, U27.5, U27.4, U27.1, U27.7)
+	NET_C(GND, U27.3)
+	ALIAS(BLOAD_M, U27.9)
+	ALIAS(BCLK_P, U27.2)
+	NET_C(U27.2, U26.1)
+	NET_C(U27.10, U28.15)
+	NET_C(U27.15, U24.12)
+	HINT(U27.11, NC)
+	HINT(U27.12, NC)
+	HINT(U27.13, NC)
+	HINT(U27.14, NC)
+
+	NET_C(HIB_P, U28.6, U28.3, U28.1, U28.7, U28.10)
+	NET_C(GND, U28.4, U28.5)
+	NET_C(BLOAD_M, U28.9)
+	ALIAS(ACLK_M, U28.2)
+	HINT(U28.11, NC)
+	HINT(U28.12, NC)
+	HINT(U28.13, NC)
+	HINT(U28.14, NC)
+
+	ALIAS(HIA_P, U24.10)
+	ALIAS(BCLK_M, U24.11)
+	NET_C(U24.13, R9.2)
+	NET_C(R9.1, I_V5)
+	NET_C(U24.9, U34.12)
+	NET_C(BLOAD_M, U24.8)
+
+	NET_C(HIA_P, U34.1, U34.4, U34.13)
+	NET_C(U34.3, R21.1, C11.1)
+	ALIAS(_588USEC_P, U34.3)
+	NET_C(R21.2, I_V5)
+	HINT(U34.2, NC)
+
+	NET_C(U26.2, GND)
+	NET_C(U26.6, U26.13)
+	HINT(U26.5, NC)
+	HINT(U26.4, NC)
+	HINT(U26.3, NC)
+	NET_C(U26.12, GND)
+	ALIAS(_327USEC_P, U26.8)
+	HINT(U26.9, NC)
+	HINT(U26.10, NC)
+	NET_C(U26.11, R15.1, C12.2)
+	NET_C(R15.2, I_V5)
+	NET_C(C12.1, R16.1)
+	NET_C(R16.2, R17.1, R18.2, U61.2)
+	NET_C(R17.2, C11.2)
+	NET_C(R18.1, GND)
+
+	NET_C(U61.3, R19.2)
+	NET_C(R19.1, GND)
+
+	ALIAS(BELL_EN_M, R10.1)
+	NET_C(R10.1, R11.1)
+	NET_C(R10.2, I_V5)
+	NET_C(R11.2, Q2.B)
+	NET_C(Q2.E, I_V2_2)
+	NET_C(Q2.C, R12.2, R13.2, Q3.E)
+	NET_C(R12.1, I_VM15)
+	NET_C(R13.1, GND)
+	NET_C(Q3.B, R14.2)
+	NET_C(R14.1, GND)
+	NET_C(Q3.C, C13.1, R20.1)
+	NET_C(C13.2, I_VM15)
+	NET_C(R20.2, U61.5)
+	ALIAS(CS, U61.6)
+
+	//
+	// Page 1, bottom-right
+	//
+
+#if (HLE_SFX_CLOCK)
+	//
+	// A 20MHz crystal (Y1) is divided by 4 by a pair of
+	// JK flip flops (U23) to 5MHz. This is fed to a
+	// 74LS393 counter (U13) and the divide-by-16 output
+	// is divided again by a JK flip flop (U9) into a
+	// 156250Hz counter. Skip the work of dividing this
+	// manually and just create a clock directly.
+	//
+	CLOCK(SFXCLOCK, 156250)
+	NET_C(SFXCLOCK.GND, GND)
+	NET_C(SFXCLOCK.VCC, I_V5)
+	NET_C(SFXCLOCK.Q, U29.3, U2.5)
+	NET_C(U2.6, U29.11)
+	NET_C(GND, U13.12, U13.13)
+	NET_C(GND, U9.9, U9.10, U9.11)
+#else
+	NET_C(U25.5, GND)   // unused inverter borrowed
+	HINT(U2.6, NC)      // for HLE SFX clock
+
+	ALIAS(_5MHZ_M, U13.13)
+	NET_C(U13.12, GND)
+	NET_C(U13.8, U9.9)
+	HINT(U13.9, NC)
+	HINT(U13.10, NC)
+	HINT(U13.11, NC)
+
+	NET_C(U9.8, U9.10, U9.11)
+	NET_C(U9.5, U29.3)
+	NET_C(U9.6, U29.11)
+#endif
+	ALIAS(HID_P, U9.8)
+
+	NET_C(U29.2, BCLK_M)
+	NET_C(HIB_P, U29.4, U29.1)
+	NET_C(U29.5, U29.12)
+	ALIAS(ACLK_P, U29.5)
+	NET_C(ACLK_M, U29.6)
+
+	NET_C(HIB_P, U29.10, U29.13)
+	NET_C(BCLK_P, U29.9)
+	NET_C(BCLK_M, U29.8)
+
+	//
+	// Page 2, top (noise generator)
+	//
+
+	NET_C(_588USEC_P, U1.1)
+	NET_C(U1.2, GND)
+	NET_C(U1.6, U1.13)
+	HINT(U1.5, NC)
+	HINT(U1.4, NC)
+	HINT(U1.3, NC)
+	NET_C(U1.12, GND)
+	HINT(U1.8, NC)
+	HINT(U1.9, NC)
+	NET_C(U1.10, U11.8, U32.1)
+	HINT(U1.11, NC)
+
+	NET_C(U11.9, U35.1)
+	NET_C(U11.1, U11.2, U12.8)
+	NET_C(U11.13, U12.1)
+	ALIAS(RANDOM_NOISE_P, U11.13)
+	HINT(U11.12, NC)
+	HINT(U11.11, NC)
+	HINT(U11.10, NC)
+	NET_C(U11.6, U12.2)
+	NET_C(U11.5, U12.5)
+	NET_C(U11.4, U12.4)
+	HINT(U11.3, NC)
+
+	NET_C(U12.3, U12.13)
+	NET_C(U12.6, U12.12)
+	NET_C(U12.11, U32.2, U12.9)
+	NET_C(U12.10, HID_P)
+	ALIAS(IN_M, U12.8)
+
+	NET_C(U32.6, U35.2, U35.3)
+	HINT(U32.5, NC)
+	HINT(U32.4, NC)
+	HINT(U32.3, NC)
+	ALIAS(ERRCLR_M, U35.1)
+
+	//
+	// Page 2, middle (Chirping Birds)
+	//
+
+	NET_C(RANDOM_NOISE_P, U31.5)
+	NET_C(U31.6, R22.1, R23.1)
+	NET_C(R22.2, I_V5, R24.2, Q4.E)
+	NET_C(R23.2, R24.1, Q4.B)
+	NET_C(Q4.C, R25.2, R26.2, R27.1)
+	NET_C(R25.1, I_VM15)
+	NET_C(R26.1, GND)
+	NET_C(R27.2, Q5.B)
+	NET_C(Q5.E, GND)
+	NET_C(Q5.C, R29.1)
+	NET_C(R29.2, R28.1, C14.1, R30.2, C15.2)
+	NET_C(R28.2, I_V15)
+	NET_C(C14.2, GND)
+	NET_C(R30.1, GND)
+	NET_C(C15.1, R31.1)
+	NET_C(R31.2, I_V15)
+
+#if (HLE_CHIRPING_VCO)
+	//
+	// Standard mapping:
+	//    R2 = 0.91650: HP = (0.0000123028*A0) - 0.000136645
+	//    R2 = 0.98600: HP = (0.00000750231*A0*A0) - (0.000183288*A0) + 0.00113698
+	//    R2 = 0.99008: HP = (0.00000414207*A0*A0*A0) - (0.000154885*A0*A0) + (0.00193729*A0) - 0.0080873
+	//    R2 = 0.98800: HP = (0.00000603082*A0*A0*A0*A0) - (0.000311647*A0*A0*A0) + (0.00604258*A0*A0) - (0.0520898*A0) + 0.168437
+	//    R2 = 0.98586: HP = (0.000000081416*A0*A0*A0*A0*A0) - (0.00000284650*A0*A0*A0*A0) + (0.0000136226*A0*A0*A0) + (0.000571759*A0*A0) - (0.0083734*A0) + 0.0333905
+	//
+	VARCLOCK(CHIRPCLK, 1, "max(0.000001,min(0.1,(0.000000081416*A0*A0*A0*A0*A0) - (0.00000284650*A0*A0*A0*A0) + (0.0000136226*A0*A0*A0) + (0.000571759*A0*A0) - (0.0083734*A0) + 0.0333905))")
+	NET_C(CHIRPCLK.GND, GND)
+	NET_C(CHIRPCLK.VCC, I_V5)
+	NET_C(CHIRPCLK.A0, C15.2)
+	NET_C(CHIRPCLK.Q, U41.1)
+	NET_C(GND, R32.1, R32.2, R33.1, R33.2, R205.1, R205.2, C16.1, C16.2, C17.1, C17.2, D13.A, D13.K, D14.A, D14.K)
+#else
+	NET_C(R29.2, U51.5)
+	NET_C(C15.1, U51.6)
+	NET_C(R31.2, U51.8)
+	NET_C(U51.7, C16.1)
+	NET_C(C16.2, GND)
+	NET_C(U51.1, GND)
+	HINT(U51.4, NC)
+	NET_C(U51.3, C17.2)
+	NET_C(C17.1, D13.K, R32.1)
+	NET_C(D13.A, GND)
+	NET_C(R32.2, Q6.B)
+	NET_C(Q6.E, R205.2, D14.K)
+	NET_C(R205.1, I_VM15)
+	NET_C(D14.A, GND)
+	NET_C(Q6.C, R33.1, U41.1)
+	NET_C(R33.2, I_V5)
+#endif
+
+	NET_C(U41.2, RANDOM_NOISE_P)
+	HINT(U41.6, NC)
+	HINT(U41.5, NC)
+	HINT(U41.4, NC)
+	NET_C(U41.3, U41.13)
+
+	ALIAS(CHIRPING_BIRDS_M, U41.12)
+	HINT(U41.8, NC)
+	HINT(U41.9, NC)
+	NET_C(U41.10, R47.1, R48.1)
+	HINT(U41.11, NC)
+	NET_C(R47.2, I_V5)
+	NET_C(R48.2, R49.2, C22.2)
+	NET_C(R49.1, GND)
+	ALIAS(SJ, C22.1)
+
+	//
+	// Page 2, bottom (Dying Bug)
+	//
+
+	ALIAS(BUG_DYING_M, U31.3)
+	NET_C(U31.4, R34.1, R35.1)
+	NET_C(R34.2, I_V5, R36.2, Q7.E)
+	NET_C(R35.2, R36.1, Q7.B)
+	NET_C(Q7.C, R37.2, R38.2, R39.1)
+	NET_C(R37.1, I_VM15)
+	NET_C(R38.1, GND)
+	NET_C(R39.2, Q8.B)
+	NET_C(Q8.E, GND)
+	NET_C(Q8.C, R41.1)
+	NET_C(R41.2, R40.1, C18.1, R42.2, C19.2)
+	NET_C(R40.2, I_V15)
+	NET_C(C18.2, GND)
+	NET_C(R42.1, GND)
+	NET_C(R43.2, I_V15)
+	NET_C(C19.1, R43.1)
+
+#if (HLE_DYING_BUG_VCO)
+	//
+	// Standard mapping:
+	//    R2 = 0.94234: HP = (0.0000126953*A0) - 0.000142795
+	//    R2 = 0.99216: HP = (0.0000085544*A0*A0) - (0.000211995*A0) + 0.00132411
+	//    R2 = 0.99610: HP = (0.00000512381*A0*A0*A0) - (0.000194224*A0*A0) + (0.00245729*A0) - 0.0103626
+	//    R2 = 0.99646: HP = (0.00000347185*A0*A0*A0*A0) - (0.000178231*A0*A0*A0) + (0.00343236*A0*A0) - (0.0293814*A0) + 0.094321
+	//    R2 = 0.99644: HP = (0.000000064673*A0*A0*A0*A0*A0) - (0.00000153002*A0*A0*A0*A0) - (0.0000269128*A0*A0*A0) + (0.00118283*A0*A0) - (0.0128917*A0) + 0.0465240
+	//
+	VARCLOCK(DYINGCLK, 1, "max(0.000001,min(0.1,(0.000000064673*A0*A0*A0*A0*A0) - (0.00000153002*A0*A0*A0*A0) - (0.0000269128*A0*A0*A0) + (0.00118283*A0*A0) - (0.0128917*A0) + 0.0465240))")
+	NET_C(DYINGCLK.GND, GND)
+	NET_C(DYINGCLK.VCC, I_V5)
+	NET_C(DYINGCLK.A0, C19.2)
+	NET_C(DYINGCLK.Q, U42.1)
+	NET_C(GND, R44.1, R44.2, R45.1, R45.2, R46.1, R46.2, C20.1, C20.2, C21.1, C21.2, D15.A, D15.K, D16.A, D16.K)
+#else
+	NET_C(C19.2, U52.5)
+	NET_C(C19.1, U52.6)
+	NET_C(R43.2, U52.8)
+	NET_C(U52.7, C20.1)
+	NET_C(C20.2, GND)
+	NET_C(U52.1, GND)
+	HINT(U52.4, NC)
+	NET_C(U52.3, C21.2)
+	NET_C(C21.1, D15.K, R44.1)
+	NET_C(D15.A, GND)
+	NET_C(R44.2, Q9.B)
+	NET_C(Q9.E, R46.2, D16.K)
+	NET_C(R46.1, I_VM15)
+	NET_C(D16.A, GND)
+	NET_C(Q9.C, R45.1, U42.1)
+	NET_C(R45.2, I_V5)
+#endif
+
+	NET_C(_327USEC_P, U32.13)
+	NET_C(U32.12, GND)
+	ALIAS(_5232USEC_P, U32.8)
+	ALIAS(_2616USEC_P, U32.9)
+	NET_C(U32.9, U42.2)
+	HINT(U32.10, NC)
+	HINT(U32.11, NC)
+
+	HINT(U42.6, NC)
+	HINT(U42.5, NC)
+	HINT(U42.4, NC)
+	NET_C(U42.3, U42.13)
+	NET_C(U42.12, BUG_DYING_M)
+	NET_C(U42.8, R51.1)
+	NET_C(U42.9, R52.1)
+	NET_C(U42.10, R53.1)
+	HINT(U42.11, NC)
+	NET_C(R54.2, R53.2, R52.2, R51.2, R50.1)
+	NET_C(R54.1, GND)
+	NET_C(R50.2, C23.2)
+	NET_C(C23.1, SJ)
+
+	//
+	// Page 3, top (Egg Cracking)
+	//
+
+	ALIAS(EGG_CRACKING_M, U31.13)
+	NET_C(U31.12, R55.1, R56.1)
+	NET_C(R55.2, I_V5, R57.2, Q10.E)
+	NET_C(R56.2, R57.1, Q10.B)
+	NET_C(Q10.C, R58.2, R59.2, R60.1)
+	NET_C(R58.1, I_VM15)
+	NET_C(R59.1, GND)
+	NET_C(Q11.E, GND)
+	NET_C(R60.2, Q11.B)
+	NET_C(Q11.C, R62.1)
+	NET_C(R62.2, R61.1, C24.1, R63.2, C25.2)
+	NET_C(C24.2, GND)
+	NET_C(R63.1, GND)
+	NET_C(R61.2, R64.2, I_V15)
+	NET_C(C25.1, R64.1)
+
+#if (HLE_CRACKING_VCO)
+	//
+	// Standard mapping:
+	//    R2 = 0.89585: HP = (0.0000175988*A0) - 0.000207278
+	//    R2 = 0.98810: HP = (0.0000104596*A0*A0) - (0.000261248*A0) + 0.00164623
+	//    R2 = 0.99788: HP = (0.00000629669*A0*A0*A0) - (0.000240194*A0*A0) + (0.00305980*A0) - 0.0129994
+	//    R2 = 0.99873: HP = (0.00000350292*A0*A0*A0*A0) - (0.000179267*A0*A0*A0) + (0.00344234*A0*A0) - (0.0293869*A0) + 0.094097
+	//    R2 = 0.99653: HP = (0.000000075716*A0*A0*A0*A0*A0) - (0.00000154725*A0*A0*A0*A0) - (0.0000446414*A0*A0*A0) + (0.00164941*A0*A0) - (0.0174578*A0) + 0.0623765
+	//
+	VARCLOCK(CRACKINGCLK, 1, "max(0.000001,min(0.1,(0.000000064673*A0*A0*A0*A0*A0) - (0.00000153002*A0*A0*A0*A0) - (0.0000269128*A0*A0*A0) + (0.00118283*A0*A0) - (0.0128917*A0) + 0.0465240))")
+	NET_C(CRACKINGCLK.GND, GND)
+	NET_C(CRACKINGCLK.VCC, I_V5)
+	NET_C(CRACKINGCLK.A0, C25.2)
+	NET_C(CRACKINGCLK.Q, U22.13)
+	NET_C(GND, R65.1, R65.2, R66.1, R66.2, R67.1, R67.2, C26.1, C26.2, C27.1, C27.2, D17.A, D17.K, D18.A, D18.K)
+#else
+	NET_C(R61.2, U53.8)
+	NET_C(C25.1, U53.6)
+	NET_C(R62.2, U53.5)
+	NET_C(U53.7, C26.1)
+	NET_C(C26.2, GND)
+	NET_C(U53.1, GND)
+	HINT(U53.4, NC)
+	NET_C(U53.3, C27.2)
+	NET_C(C27.1, D17.K, R65.1)
+	NET_C(D17.A, GND)
+	NET_C(R65.2, Q12.B)
+	NET_C(Q12.E, R67.2, D18.K)
+	NET_C(R67.1, I_VM15)
+	NET_C(D18.A, GND)
+	NET_C(Q12.C, R66.1, U22.13)
+	NET_C(R66.2, I_V5)
+#endif
+
+	NET_C(EGG_CRACKING_M, U22.12)
+	NET_C(U22.8, R68.1)
+	NET_C(U22.9, R69.1)
+	NET_C(U22.10, R70.1)
+	HINT(U22.11, NC)
+	NET_C(R68.2, R69.2, R70.2, R71.2, R72.1)
+	NET_C(R71.1, GND)
+	NET_C(R72.2, C28.2)
+	NET_C(C28.1, SJ)
+
+	//
+	// Page 3, middle (Beetle on screen)
+	//
+
+	ALIAS(BEETLE_ON_SCREEN_M, U31.1)
+	NET_C(U31.2, U19.4)
+	NET_C(U19.8, R73.2, I_V5)
+	NET_C(R73.1, U19.7, R74.2)
+	NET_C(R74.1, U19.6, U19.2, C29.1)
+	NET_C(C29.2, GND)
+	NET_C(U19.1, GND)
+	NET_C(U19.5, C30.1)
+	NET_C(C30.2, GND)
+	NET_C(U19.3, R75.2, U20.1)
+	NET_C(R75.1, GND)
+
+	NET_C(U20.2, R77.1, R76.1)
+	NET_C(R76.2, I_V5, R78.2, Q13.E)
+	NET_C(R77.2, R78.1, Q13.B)
+	NET_C(Q13.C, R79.2, R80.2, R81.1)
+	NET_C(R79.1, I_VM15)
+	NET_C(R80.1, GND)
+	NET_C(R81.2, Q14.B)
+	NET_C(Q14.E, GND)
+	NET_C(Q14.C, R83.1)
+	NET_C(R83.2, R82.1, C31.1, R84.2, C32.2)
+	NET_C(C31.2, GND)
+	NET_C(R84.1, GND)
+	NET_C(R82.2, I_V15, R85.2)
+	NET_C(R85.1, C32.1)
+
+#if (HLE_BEETLE_VCO)
+	//
+	// Standard mapping:
+	//    R2 = 0.92906: HP = (0.000127227*A0) - 0.00149583
+	//    R2 = 0.97372: HP = (0.000086592*A0*A0) - (0.00218553*A0) + 0.0139420
+	//    R2 = 0.97589: HP = (0.000063925*A0*A0*A0) - (0.00248748*A0*A0) + (0.0323532*A0) - 0.140489
+	//    R2 = 0.97153: HP = (-0.00000615887*A0*A0*A0*A0) + (0.000395273*A0*A0*A0) - (0.0091707*A0*A0) + (0.092250*A0) - 0.341743
+	//    R2 = 0.96812: HP = (0.00000145563*A0*A0*A0*A0*A0) - (0.0000505655*A0*A0*A0*A0) + (0.000151855*A0*A0*A0) + (0.0134189*A0*A0) - (0.189302*A0) + 0.763397
+	//
+	VARCLOCK(BEETLECLK, 1, "max(0.000001,min(0.1,(0.00000145563*A0*A0*A0*A0*A0) - (0.0000505655*A0*A0*A0*A0) + (0.000151855*A0*A0*A0) + (0.0134189*A0*A0) - (0.189302*A0) + 0.763397))")
+	NET_C(BEETLECLK.GND, GND)
+	NET_C(BEETLECLK.VCC, I_V5)
+	NET_C(BEETLECLK.A0, C32.2)
+	NET_C(BEETLECLK.Q, U22.1)
+	NET_C(GND, R86.1, R86.2, R87.1, R87.2, R88.1, R88.2, C33.1, C33.2, C34.1, C34.2, D19.A, D19.K, D20.A, D20.K)
+#else
+	NET_C(R83.2, U56.5)
+	NET_C(R82.2, U56.8)
+	NET_C(R85.1, U56.6)
+	NET_C(U56.7, C33.1)
+	NET_C(C33.2, GND)
+	NET_C(U56.1, GND)
+	HINT(U56.4, NC)
+	NET_C(U56.3, C34.2)
+	NET_C(C34.1, D19.K, R86.1)
+	NET_C(D19.A, GND)
+	NET_C(R86.2, Q15.B)
+	NET_C(Q15.E, R88.2, D20.K)
+	NET_C(R88.1, I_VM15)
+	NET_C(D20.A, GND)
+	NET_C(Q15.C, R87.1, U22.1)
+	NET_C(R87.2, I_V5)
+#endif
+
+	NET_C(BEETLE_ON_SCREEN_M, U22.2)
+	HINT(U22.6, NC)
+	HINT(U22.5, NC)
+	NET_C(U22.4, R89.1)
+	HINT(U22.3, NC)
+	NET_C(R89.2, R90.2, R91.1)
+	NET_C(R90.1, GND)
+	NET_C(R91.2, C35.2)
+	NET_C(C35.1, SJ)
+
+	//
+	// Page 3, bottom (BOUNCE)
+	//
+
+	ALIAS(BOUNCE_EN_P, R93.1)
+	NET_C(R93.1, R92.1)
+	NET_C(R92.2, R94.2, I_V5, Q16.E)
+	NET_C(R93.2, R94.1, Q16.B)
+	NET_C(Q16.C, R95.2, R96.2, R97.1)
+	NET_C(R95.1, I_VM15)
+	NET_C(R96.1, GND)
+	NET_C(R97.2, Q17.B)
+	NET_C(Q17.E, GND)
+	NET_C(Q17.C, R99.1)
+	NET_C(R99.2, R98.1, C36.1, R101.2, C39.2, R102.2)
+	NET_C(R98.2, I_V15)
+	NET_C(C36.2, GND)
+	NET_C(R101.1, GND)
+
+	NET_C(_5232USEC_P, R100.1, U58.6, U58.2)
+	NET_C(R100.2, I_V5)
+	NET_C(U58.7, GND)   // not connected
+	NET_C(U58.4, U58.8, I_V5)
+	NET_C(U58.1, GND)
+	NET_C(U58.5, C38.1)
+	NET_C(C38.2, GND)
+	NET_C(U58.3, C37.2)
+	NET_C(C37.1, R102.1)
+
+	NET_C(C39.1, R108.1)
+	NET_C(R108.2, I_V15)
+#if (HLE_BOUNCE_VCO)
+	//
+	// Unlike all the other VCOs, this one doesn't go directly into a
+	// TTL device. The actual square wave is tapered from the top and
+	// slightly modulated with the frequency, but it makes little
+	// practical difference, so we just scale the output square wave
+	// to +/-5V as input to R109.
+	//
+	// Standard mapping:
+	//    R2 = 0.89933: HP = (0.00476268*A0) - 0.0576442
+	//    R2 = 0.97773: HP = (0.00311005*A0*A0) - (0.079281*A0) + 0.509096
+	//    R2 = 0.97985: HP = (0.00115078*A0*A0*A0) - (0.0435380*A0*A0) + (0.550407*A0) - 2.321385
+	//    R2 = 0.97985: HP = (0.0000369937*A0*A0*A0*A0) - (0.000849582*A0*A0*A0) - (0.00300315*A0*A0) + (0.185593*A0) - 1.090973
+	//    R2 = 0.24613: HP = (-0.000199982*A0*A0*A0*A0*A0) + (0.0134882*A0*A0*A0*A0) - (0.362557*A0*A0*A0) + (4.857498*A0*A0) - (32.45284*A0) + 86.5278
+	//
+	VARCLOCK(BOUNCECLK, 1, "max(0.000001,min(0.1,((0.00115078*A0*A0*A0) - (0.0435380*A0*A0) + (0.550407*A0) - 2.321385))")
+	NET_C(BOUNCECLK.GND, GND)
+	NET_C(BOUNCECLK.VCC, I_V5)
+	NET_C(BOUNCECLK.A0, C39.2)
+	NET_C(BOUNCECLK.Q, BOUNCEENV.A0)
+	AFUNC(BOUNCEENV, 1, "if(A0>2.5,5,-5)")
+	NET_C(BOUNCEENV, R109.1)
+	NET_C(GND, C40.1, C40.2)
+	NET_C(GND, C42.1, C42.2)
+#else
+	NET_C(C39.1, U57.6)
+	NET_C(R108.2, U57.8)
+	NET_C(R99.2, U57.5)
+	NET_C(C39.1, U57.6, R108.1)
+	NET_C(R108.2, I_V15, U57.8)
+	NET_C(U57.7, C40.1)
+	NET_C(C40.2, GND)
+	NET_C(U57.1, GND)
+	HINT(U57.4, NC)
+	NET_C(U57.3, C42.2)
+	NET_C(C42.1, R109.1)
+#endif
+
+	NET_C(R109.2, R111.2, U59.2)
+	NET_C(R111.1, GND)
+	NET_C(U59.3, R112.2)
+	NET_C(R112.1, GND)
+
+	ALIAS(BOUNCE_EN_M, R104.1)
+	NET_C(R104.1, R103.1)
+	NET_C(R103.2, I_V5)
+	NET_C(R104.2, Q18.B)
+	NET_C(Q18.E, I_V2_2)
+	NET_C(Q18.C, R105.2, R106.2, Q19.E)
+	NET_C(R105.1, I_VM15)
+	NET_C(R106.1, GND)
+	NET_C(Q19.B, R107.2)
+	NET_C(R107.1, GND)
+	NET_C(Q19.C, C41.1, R110.1)
+	NET_C(C41.2, I_VM15)
+	NET_C(R110.2, U59.5)
+	NET_C(U59.6, CS)
+
+	//
+	// Page 4, top (Cannon)
+	//
+
+	ALIAS(CANNON_M, R114.1)
+	NET_C(R114.1, R113.1)
+	NET_C(R113.2, I_V5)
+	NET_C(R114.2, Q20.B)
+	NET_C(Q20.E, I_V2_2)
+	NET_C(Q20.C, R115.2, R116.2, R117.1)
+	NET_C(R115.1, I_VM15)
+	NET_C(R116.1, GND)
+	NET_C(R117.2, Q21.B)
+	NET_C(Q21.E, GND)
+	NET_C(Q21.C, R119.1)
+	NET_C(R119.2, R118.1, C43.1, R120.2, C44.2)
+	NET_C(R118.2, I_V15, R121.2)
+	NET_C(C43.2, GND)
+	NET_C(R120.1, GND)
+	NET_C(C44.1, R121.1)
+
+#if (HLE_CANNON_VCO)
+	//
+	// Standard mapping:
+	//    R2 = 0.96910: HP = (0.000125667*A0) - 0.00142938
+	//    R2 = 0.99026: HP = (0.000076462*A0*A0) - (0.00189006*A0) + 0.0117720
+	//    R2 = 0.99181: HP = (0.0000429163*A0*A0*A0) - (0.00161661*A0*A0) + (0.0203246*A0) - 0.085173
+	//    R2 = 0.99203: HP = (0.0000167801*A0*A0*A0*A0) - (0.000839548*A0*A0*A0) + (0.0157634*A0*A0) - (0.131604*A0) + 0.412204
+	//    R2 = 0.99209: HP = (0.00000283657*A0*A0*A0*A0*A0) - (0.000141443*A0*A0*A0*A0) + (0.00257240*A0*A0*A0) - (0.0192167*A0*A0) + (0.0334224*A0) + 0.148265
+	//
+	VARCLOCK(CANNONCLK, 1, "max(0.000001,min(0.1,(0.00000283657*A0*A0*A0*A0*A0) - (0.000141443*A0*A0*A0*A0) + (0.00257240*A0*A0*A0) - (0.0192167*A0*A0) + (0.0334224*A0) + 0.148265))")
+	NET_C(CANNONCLK.GND, GND)
+	NET_C(CANNONCLK.VCC, I_V5)
+	NET_C(CANNONCLK.A0, C44.2)
+	NET_C(CANNONCLK.Q, U13.1)
+	NET_C(GND, R122.1, R122.2, R123.1, R123.2, R124.1, R124.2, C75.1, C75.2, C45.1, C45.2, D21.A, D21.K, D22.A, D22.K)
+#else
+	NET_C(R119.2, U60.5)
+	NET_C(R118.2, U60.8)
+	NET_C(C44.1, U60.6)
+	NET_C(U60.7, C75.1)
+	NET_C(C75.2, GND)
+	NET_C(U60.1, GND)
+	HINT(U60.4, NC)
+	NET_C(U60.3, C45.2)
+	NET_C(C45.1, D21.K, R122.1)
+	NET_C(D21.A, GND)
+	NET_C(R122.2, Q22.B)
+	NET_C(Q22.E, R124.2, D22.K)
+	NET_C(R124.1, I_VM15)
+	NET_C(D22.A, GND)
+	NET_C(Q22.C, R123.1, U13.1)
+	NET_C(R123.2, I_V5)
+#endif
+
+	NET_C(CANNON_M, U13.2)
+	HINT(U13.6, NC)
+	HINT(U13.5, NC)
+	NET_C(U13.4, R125.1)
+	HINT(U13.3, NC)
+	NET_C(R125.2, R126.1, R127.2)
+	NET_C(R126.2, GND)
+	NET_C(R127.1, C46.2)
+	NET_C(C46.1, SJ)
+
+	//
+	// Page 4, bottom-left (explosions)
+	//
+
+	NET_C(U62.2, GND)
+	NET_C(U62.1, GND)
+	NET_C(U62.4, R128.1, C47.1, C74.1)
+	NET_C(R128.2, I_V15)
+	NET_C(C47.2, GND)
+	NET_C(C74.2, GND)
+	NET_C(U62.3, C48.2)
+	NET_C(C48.1, R129.2, U63.3)
+	NET_C(R129.1, GND)
+	NET_C(U63.2, U63.6, R130.1)
+	NET_C(R130.2, C49.1, R131.1)
+	NET_C(C49.2, GND)
+	NET_C(R131.2, C50.1, R132.1)
+	NET_C(C50.2, GND)
+	NET_C(R132.2, R133.2, U64.2)
+	NET_C(R133.1, GND)
+	NET_C(U64.3, R134.2)
+	NET_C(R134.1, GND)
+	NET_C(U64.6, CS)
+
+	ALIAS(LOUD_EXPL_M, R136.1)
+	NET_C(R136.1, R135.1)
+	NET_C(R135.2, I_V5, R137.2, Q23.E)
+	NET_C(R136.2, R137.1, Q23.B)
+	NET_C(Q23.C, R138.2, R139.2, Q24.E)
+	NET_C(R138.1, I_VM15)
+	NET_C(R139.1, GND)
+	NET_C(Q24.B, R140.2)
+	NET_C(R140.1, GND)
+	NET_C(Q24.C, C51.1, R141.1)
+	NET_C(C51.2, I_VM15)
+	NET_C(R141.2, R148.2, U64.5)
+
+	ALIAS(SOFT_EXPL_M, R143.1)
+	NET_C(R143.1, R142.1)
+	NET_C(R142.2, I_V5, R144.2, Q25.E)
+	NET_C(R143.2, R144.1, Q25.B)
+	NET_C(Q25.C, R145.2, R146.2, Q26.E)
+	NET_C(R145.1, I_VM15)
+	NET_C(R146.1, GND)
+	NET_C(Q26.B, R147.2)
+	NET_C(R147.1, GND)
+	NET_C(Q26.C, C52.1, R148.1)
+	NET_C(C52.2, I_VM15)
+
+	//
+	// Page 4, bottom-right (bug pushing and final mix)
+	//
+
+	ALIAS(BUG_PUSHING_A_P, U31.9)
+	NET_C(U31.8, U21.2)
+	NET_C(_588USEC_P, U21.1)
+	HINT(U21.6, NC)
+	NET_C(U21.5, R149.1)
+	HINT(U21.4, NC)
+	HINT(U21.3, NC)
+	NET_C(R149.2, C53.1)
+
+	ALIAS(BUG_PUSHING_B_P, U31.11)
+	NET_C(U31.10, U21.12)
+	NET_C(_588USEC_P, U21.13)
+	NET_C(U21.8, R150.1)
+	HINT(U21.9, NC)
+	HINT(U21.10, NC)
+	HINT(U21.11, NC)
+	NET_C(R150.2, C54.2)
+
+	NET_C(C53.2, C54.1, SJ, U54.2, R160.2, R161.1, C61.1)
+	NET_C(C61.2, R161.2)
+	ALIAS(OUTPUT, R161.2)
+	NET_C(R161.2, U54.6)
+	NET_C(U54.3, GND)
+	NET_C(CS, U55.3, R159.2)
+	NET_C(R159.1, GND)
+	NET_C(U55.2, U55.6, C60.2)
+	NET_C(C60.1, R160.1)
+
+	//
+	// Page 5, shaft encoder -- not emulated
+	//
+
+	//
+	// Page 6, top left
+	//
+
+	NET_C(I_V5, R206.1, R207.1, R208.1, R209.1)
+	NET_C(R206.2, HIA_P)
+	NET_C(R207.2, HIB_P)
+	ALIAS(HIC_P, R208.2)
+	NET_C(R209.2, HID_P)
+
+	NET_C(I_OUT_7, D25.K, U50.9)
+	NET_C(D25.A, GND)
+	NET_C(U50.8, U50.1)
+	NET_C(U50.2, U49.1)
+	ALIAS(DATA_P, U50.2)
+
+#if (HACK_SIMPLIFY_INPUTS)
+	//
+	// Several of the inputs go through several rounds of inverters
+	// diodes and pullups, and eventually something goes wrong.
+	// Bypassing these extra devices helps make the inputs reliable.
+	//
+	NET_C(I_OUT_4, U30.13)
+	NET_C(GND, D26.A, D26.K, U50.13, U50.12, U40.9, R177.1, R177.2, C67.1, C67.2)
+#else
+	NET_C(I_OUT_4, D26.K, U50.13)
+	NET_C(D26.A, GND)
+	NET_C(U50.12, U40.9)
+	NET_C(U40.8, C67.2, R177.1, U30.13)
+	NET_C(C67.1, GND)
+	NET_C(R177.2, I_V5)
+#endif
+	NET_C(U30.12, U30.1)
+	NET_C(U30.2, U49.8, U39.8)
+
+	NET_C(U49.2, U49.9, U39.2, U39.9, HIA_P)
+	NET_C(U49.3, U48.3, U47.3)
+	NET_C(U49.4, U48.4, U47.4)
+	NET_C(U49.5, U48.7, U47.7)
+	NET_C(U49.6, U48.8, U47.8)
+	NET_C(U49.10, U48.13, U47.13)
+	NET_C(U49.11, U48.14, U47.14)
+	NET_C(U49.12, U48.17, U47.17)
+	NET_C(U49.13, U48.18, U47.18, U39.1)
+
+	NET_C(U39.3, U38.3)
+	NET_C(U39.4, U38.4)
+	NET_C(U39.5, U38.7)
+	NET_C(U39.6, U38.8)
+	NET_C(U39.10, U38.13)
+	NET_C(U39.11, U38.14)
+	NET_C(U39.12, U38.17)
+	NET_C(U39.13, U38.18)
+
+	ALIAS(MEN_P, U48.2)
+	NET_C(CANNON_M, U48.5)
+	ALIAS(AS1_M, U48.6)
+	ALIAS(AS0_M, U48.9)
+	ALIAS(FS11_P, U48.12)
+	ALIAS(FS10_P, U48.15)
+	ALIAS(FS09_P, U48.16)
+	ALIAS(FS08_P, U48.19)
+	NET_C(U48.1, GND)
+	ALIAS(MLATCH_P, U48.11)
+
+	ALIAS(FS07_P, U38.2)
+	ALIAS(FS06_P, U38.5)
+	ALIAS(FS05_P, U38.6)
+	ALIAS(FS04_P, U38.9)
+	ALIAS(FS03_P, U38.12)
+	ALIAS(FS02_P, U38.15)
+	ALIAS(FS01_P, U38.16)
+	ALIAS(FS00_P, U38.19)
+	NET_C(U38.1, GND)
+	NET_C(MLATCH_P, U38.11)
+
+	NET_C(SOFT_EXPL_M, U47.2)
+	NET_C(LOUD_EXPL_M, U47.5)
+	NET_C(CHIRPING_BIRDS_M, U47.6)
+	NET_C(EGG_CRACKING_M, U47.9)
+	NET_C(BUG_PUSHING_A_P, U47.12)
+	NET_C(BUG_PUSHING_B_P, U47.15)
+	NET_C(BUG_DYING_M, U47.16)
+	NET_C(BEETLE_ON_SCREEN_M, U47.19)
+	NET_C(U47.11, U30.6)
+	NET_C(U47.1, GND)
+
+	//
+	// Page 6, middle-left
+	//
+
+#if (HLE_MUSIC_CLOCK)
+	//
+	// The 20MHz clock (Y1) is divided by 4 via a pair
+	// of JK flip-flops (U23) to 5MHz. That signal is
+	// used to clock a 74LS163 counter (U43) that divides
+	// the clock by 9 via a preset value. It then goes
+	// through another JK flip-flop (U33) for another
+	// divide by 2, ending up at 277778Hz. No sense in
+	// running all this manually.
+	//
+	CLOCK(MUSICCLK, 277778)
+	NET_C(MUSICCLK.VCC, I_V5)
+	NET_C(MUSICCLK.GND, GND)
+	ALIAS(_227KC_P, MUSICCLK.Q)
+	NET_C(MUSICCLK.Q, U2.13)
+	ALIAS(_227KC_M, U2.12)
+	NET_C(GND, R178.1, R178.2, R179.1, R179.2, R204.1, R204.2, C68.1, C68.2)
+	NET_C(GND, U2.1, U2.3)
+	NET_C(GND, U23.1, U23.2, U23.3, U23.4, U23.10, U23.11, U23.12, U23.13)
+#else
+	//
+	// This is just here for documentation; the crystal is
+	// not modelled for this circuit.
+	//
+	NET_C(U2.3, R178.1, C68.1)
+	NET_C(R178.2, U2.4, Y1.1)
+	NET_C(Y1.2, R179.1, U2.1)
+	NET_C(R179.2, U2.2, U2.13, C68.2)
+	NET_C(U2.12, U23.1)
+	NET_C(HIC_P, U23.3, U23.2, U23.4, U23.11, U23.12, U23.10)
+	NET_C(U23.5, U23.13)
+	HINT(U23.6, NC)
+	ALIAS(_5MHZ_P, U23.9)
+	NET_C(_5MHZ_M, U23.8)
+#endif
+
+	//
+	// Page 6, bottom-left
+	//
+
+#if (HACK_SIMPLIFY_INPUTS)
+	NET_C(I_OUT_1, U30.9)
+	NET_C(GND, D27.A, D27.K, U50.3, U50.4, U40.13, R180.1, R180.2, C69.1, C69.2)
+#else
+	NET_C(I_OUT_1, U50.3, D27.K)
+	NET_C(D27.A, GND)
+	NET_C(U50.4, U40.13)
+	NET_C(U40.12, R180.1, C69.2, U30.9)
+	NET_C(R180.2, I_V5)
+	NET_C(C69.1, GND)
+#endif
+	NET_C(U30.8, U30.5)
+	ALIAS(SLATCH_P, U30.6)
+
+#if (HACK_SIMPLIFY_INPUTS)
+	NET_C(I_OUT_0, U30.11)
+	NET_C(GND, D28.A, D28.K, U50.11, U50.10, U40.11, R181.1, R181.2, C70.1, C70.2)
+#else
+	NET_C(I_OUT_0, U50.11, D28.K)
+	NET_C(D28.A, GND)
+	NET_C(U50.10, U40.11)
+	NET_C(U40.10, R181.1, C70.2, U30.11)
+	NET_C(R181.2, I_V5)
+	NET_C(C70.1, GND)
+#endif
+	NET_C(U30.10, U30.3)
+	ALIAS(LATCH_CLK_P, U30.4)
+
+	NET_C(I_OUT_2, U50.5, BOUNCE_EN_M, D29.K)
+	NET_C(D29.A, GND)
+	NET_C(U50.6, BOUNCE_EN_P)
+
+	NET_C(I_OUT_3, D30.K, BELL_EN_M)
+	NET_C(D30.A, GND)
+
+	//
+	// Page 6, bottom-middle
+	//
+
+#if (HLE_MUSIC_CLOCK)
+	NET_C(_227KC_P, U44.3)
+	NET_C(_227KC_M, U44.11)
+	NET_C(GND, U24.1, U24.2, U24.3, U24.4)
+	NET_C(GND, U33.1, U33.4, U33.12)
+	NET_C(GND, U43.1, U43.2, U43.3, U43.4, U43.5, U43.6, U43.7, U43.9, U43.10)
+	NET_C(HIC_P, U33.13)
+#else
+	NET_C(HIC_P, U43.5, U43.3, U43.1, U43.10, U43.7)
+	NET_C(GND, U43.6, U43.4)
+	NET_C(_5MHZ_P, U43.2)
+	NET_C(U43.9, U33.12, U24.6)
+	HINT(U43.11, NC)
+	HINT(U43.12, NC)
+	HINT(U43.13, NC)
+	HINT(U43.14, NC)
+	NET_C(U43.15, U24.2)
+
+	NET_C(U24.4, HIC_P)
+	HINT(U24.5, NC)
+	NET_C(U24.3, _5MHZ_M)
+	NET_C(U24.1, R204.2)
+	NET_C(R204.1, I_V5)
+
+	NET_C(HIC_P, U33.1, U33.4, U33.13)
+	NET_C(U33.3, U44.3)
+	ALIAS(_227KC_P, U33.3)
+	NET_C(U33.2, U44.11)
+	ALIAS(_227KC_M, U33.2)
+#endif
+
+	NET_C(HIA_P, U44.4, U44.1, U44.10, U44.13)
+	ALIAS(MACLK_M, U44.2)
+	NET_C(U44.5, U44.12)
+	ALIAS(MBCLK_P, U44.5)
+	ALIAS(MBCLK_M, U44.6)
+	ALIAS(MACLK_P, U44.9)
+	NET_C(MACLK_M, U44.8, U25.11)
+
+	ALIAS(MCARRY_P, U25.12)
+	NET_C(U25.13, R182.2)
+	NET_C(R182.1, I_V5)
+	ALIAS(MLOAD_M, U25.8)
+	NET_C(U25.9, U35.8, U34.9)
+	ALIAS(MLOAD_P, U25.9)
+	NET_C(HIA_P, U25.10)
+
+	NET_C(HIA_P, U34.8, U34.11, U34.10)
+	ALIAS(DMUSIC_P, U34.5)
+	HINT(U34.6, NC)
+
+	NET_C(HIA_P, U25.2, U25.4)
+	NET_C(LATCH_CLK_P, U25.3)
+	NET_C(U25.1, U45.6)
+	HINT(U25.5, NC)
+	NET_C(U25.6, U35.9, U15.12)
+
+	NET_C(MBCLK_M, U15.13)
+	HINT(U15.8, NC)
+	NET_C(U15.9, U35.11, U35.12)
+	HINT(U15.10, NC)
+	HINT(U15.11, NC)
+
+	NET_C(U35.13, U45.10)
+	NET_C(U35.10, U45.12)
+	NET_C(MBCLK_P, U45.11)
+	NET_C(HIA_P, U45.13)
+	HINT(U45.8, NC)
+	NET_C(U45.9, MLATCH_P, U45.2)
+	NET_C(HIA_P, U45.4)
+	HINT(U45.5, NC)
+	NET_C(U45.1, R203.2)
+	NET_C(R203.1, I_V5)
+	NET_C(MACLK_P, U45.3)
+
+	//
+	// Page 6, right (music generator)
+	//
+
+	NET_C(FS11_P, U46.6)
+	NET_C(FS10_P, U46.5)
+	NET_C(FS09_P, U46.4)
+	NET_C(FS08_P, U46.3)
+	NET_C(HIA_P, U46.1)
+	NET_C(MEN_P, U46.7)
+	NET_C(MLOAD_M, U46.9)
+	NET_C(MBCLK_P, U46.2)
+	NET_C(U46.15, MCARRY_P)
+	NET_C(U46.10, U36.15)
+	HINT(U46.11, NC)
+	HINT(U46.12, NC)
+	HINT(U46.13, NC)
+	HINT(U46.14, NC)
+
+	NET_C(FS07_P, U36.6)
+	NET_C(FS06_P, U36.5)
+	NET_C(FS05_P, U36.4)
+	NET_C(FS04_P, U36.3)
+	NET_C(HIA_P, U36.1)
+	NET_C(MEN_P, U36.7)
+	NET_C(MLOAD_M, U36.9)   // schems say MLOAD_P, but solarq says MLOAD_M
+	NET_C(MACLK_P, U36.2)
+	NET_C(U36.10, U37.15)
+	HINT(U36.11, NC)
+	HINT(U36.12, NC)
+	HINT(U36.13, NC)
+	HINT(U36.14, NC)
+
+	NET_C(FS03_P, U37.6)
+	NET_C(FS02_P, U37.5)
+	NET_C(FS01_P, U37.4)
+	NET_C(FS00_P, U37.3)
+	NET_C(HIA_P, U37.1)
+	NET_C(MEN_P, U37.7, U37.10)
+	NET_C(MLOAD_M, U37.9)
+	NET_C(MBCLK_M, U37.2)
+	HINT(U37.11, NC)
+	HINT(U37.12, NC)
+	HINT(U37.13, NC)
+	HINT(U37.14, NC)
+
+	NET_C(DMUSIC_P, R183.1, R184.1)
+	NET_C(R183.2, I_V5)
+	NET_C(R184.2, C71.1)
+	NET_C(C71.2, R185.1, U67.2)
+	NET_C(R185.2, R186.1, GND)
+	NET_C(R186.2, U67.3)
+	NET_C(U67.6, CS)
+
+	NET_C(AS1_M, R187.1, R188.1)
+	NET_C(R187.2, I_V5, R189.2, Q31.E)
+	NET_C(R188.2, R189.1, Q31.B)
+	NET_C(Q31.C, R190.2, R191.1, Q32.E)
+	NET_C(R190.1, I_VM15)
+	NET_C(R191.2, R192.1, GND)
+	NET_C(R192.2, Q32.B)
+	NET_C(Q32.C, R193.1)
+	NET_C(R193.2, C72.2, R194.1)
+	NET_C(C72.1, I_VM15)
+	NET_C(R194.2, U67.5, R202.2)
+
+	NET_C(AS0_M, R195.1, R196.1)
+	NET_C(R195.2, I_V5, R197.2, Q33.E)
+	NET_C(R196.2, R197.1, Q33.B)
+	NET_C(Q33.C, R198.2, R199.1, Q34.E)
+	NET_C(R198.1, I_VM15)
+	NET_C(R199.2, R200.1, GND)
+	NET_C(R200.2, Q34.B)
+	NET_C(Q34.C, R201.1)
+	NET_C(R201.2, C73.2, R202.1)
+	NET_C(C73.1, I_VM15)
+
+	//
+	// Unconnected inputs
+	//
+
+	NET_C(U2.9, U2.11, U9.1, U9.4, U9.12, U9.13, U15.1, U15.2, U20.4, U20.6, U20.8, U20.10, U20.12, U33.8, U33.9, U33.10, U33.11, U35.5, U35.6, U40.1, U40.3, U40.5)
+
+	//
+	// Unconnected outputs
+	//
+
+	HINT(U2.8, NC)
+	HINT(U2.10, NC)
+	HINT(U40.2, NC)
+	HINT(U40.4, NC)
+	HINT(U40.6, NC)
+
+//    HINT(U2.9, NC)
+//    HINT(U2.11, NC)
+//    HINT(U24.4, NC)
+
+#if (ENABLE_FRONTIERS)
+	//
+	// Isolate the CS sounds from the rest of the mixer
+	//
+	OPTIMIZE_FRONTIER(U55.3, RES_M(1), 50)
+#endif
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_boxingb.h mame-0.224+dfsg.1/src/mame/audio/nl_boxingb.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_boxingb.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_boxingb.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_BOXINGB_H
+#define MAME_AUDIO_NL_BOXINGB_H
+
+#pragma once
+
+NETLIST_EXTERNAL(boxingb)
+
+#endif // MAME_AUDIO_NL_BOXINGB_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_carpolo.cpp mame-0.224+dfsg.1/src/mame/audio/nl_carpolo.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_carpolo.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_carpolo.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,157 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//
+// Netlist for Car Polo audio
+//
+// Derived from the schematics in the Car Polo manual.
+//
+// Known problems/issues:
+//
+//    * Uses HLE noise due to abusing a 2N3904 in breakdown as a noise source.
+//    * Very slow
+//
+
+#include "netlist/devices/net_lib.h"
+
+#define HLE_NOISE (1)
+
+//
+// Player Crash netlist
+//
+
+static NETLIST_START(PLAYER_CRASH)
+	ALIAS(V15, R200.1)
+	ALIAS(VCC, 4C.VCC)
+	ALIAS(GND, R210.2)
+	ALIAS(CRASH_IN, 4C.A)
+	ALIAS(AUDIO_OUT, R217.1)
+	ALIAS(NOISE_IN, CR10.K)
+
+	TTL_7407_GATE(4C)
+	NET_C(4C.GND, GND)
+
+	RES(R200, RES_K(1.2))
+	RES(R202, RES_K(150))
+	RES(R203, RES_K(550))
+	RES(R204, RES_K(100))
+	RES(R205, RES_K(270))
+	RES(R210, RES_K(33))
+	RES(R212, RES_K(1))
+	RES(R213, RES_K(10))
+	RES(R216, RES_K(47))
+	RES(R217, RES_K(5))
+
+	CAP(C89, CAP_U(0.1))
+	CAP(C90, CAP_U(0.01))
+	CAP(C91, CAP_U(0.01))
+	CAP(C92, CAP_U(6.8))
+	CAP(C93, CAP_U(2.2))
+
+	DIODE(CR10, "1N4454")
+	DIODE(CR11, "1N4454")
+	DIODE(CR14, "1N4454")
+
+	QBJT_EB(Q6, "2N3904")
+
+	NET_C(R200.1, R212.1, R216.1)
+	NET_C(R200.2, 4C.Y, CR11.A)
+	NET_C(CR11.K, C93.1, R204.1, R205.1)
+	NET_C(C93.2, R205.2, Q6.E, R217.1, R210.2, C92.2)
+	NET_C(R204.2, R203.1, R202.1, CR10.A)
+	NET_C(R202.2, C89.1)
+	NET_C(C89.2, C90.1, R203.2, Q6.B)
+	NET_C(C90.2, R210.1, C91.1)
+	NET_C(C91.2, Q6.C, CR14.K, R213.1)
+	NET_C(R213.2, R212.2, C92.1)
+	NET_C(R217.2, CR14.A, R216.2)
+NETLIST_END()
+
+//
+// Main netlist
+//
+
+NETLIST_START(carpolo)
+	NET_MODEL("1N4454 D(Is=168.1e-21 Rs=.1 N=1 Cjo=2p M=.333 tt=5.771n Iave=400m Vpk=35 Bv=75 Ibv=100u mfg=OnSemi type=silicon)")
+	NET_MODEL("2N3904 NPN(IS=1E-14 VAF=100 Bf=300 IKF=0.4 XTB=1.5 BR=4 CJC=4E-12 CJE=8E-12 RB=20 RC=0.1 RE=0.1 TR=250E-9 TF=350E-12 ITF=1 VTF=2 XTF=3 Vceo=40 Icrating=200m mfg=Philips)")
+	NET_MODEL("LM748 OPAMP(TYPE=3 VLH=2.0 VLL=2.0 FPF=5 UGF=800k SLEW=0.7M RI=800k RO=60 DAB=0.001)")
+
+	SOLVER(Solver, 48000)
+	ANALOG_INPUT(V15, 15)
+	ANALOG_INPUT(V7_5, 7.5)
+	ANALOG_INPUT(V5, 5)
+	ALIAS(VCC, V5)
+
+	TTL_INPUT(PL1_CRASH, 1) // active high
+	TTL_INPUT(PL2_CRASH, 0) // active high
+	TTL_INPUT(PL3_CRASH, 0) // active high
+	TTL_INPUT(PL4_CRASH, 0) // active high
+
+	LOCAL_SOURCE(PLAYER_CRASH)
+
+	NET_C(GND, PL1_CRASH.GND, PL2_CRASH.GND, PL3_CRASH.GND, PL4_CRASH.GND)
+	NET_C(VCC, PL1_CRASH.VCC, PL2_CRASH.VCC, PL3_CRASH.VCC, PL4_CRASH.VCC)
+
+	// HLE Noise Gen
+	CLOCK(NOISE_CLOCK, 10000)
+	NET_C(NOISE_CLOCK.GND, GND)
+	NET_C(NOISE_CLOCK.VCC, VCC)
+
+	SYS_NOISE_MT_N(NOISE, 0.1)
+	NET_C(NOISE.I, NOISE_CLOCK.Q)
+
+	// White Noise
+#if HLE_NOISE
+	NET_C(NOISE.1, V7_5)
+	ALIAS(WHITE_NOISE, NOISE.2)
+#else
+	RES(R240, RES_K(1.2))
+	RES(R241, RES_M(1))
+	RES(R242, 100)
+	RES(R243, RES_M(1))
+	RES(R244, RES_K(47))
+	RES(R245, RES_K(10))
+	RES(R246, RES_K(1))
+	RES(R247, RES_K(10))
+	RES(R248, RES_M(1))
+
+	CAP(C99,  CAP_U(2.2))
+	//CAP(C100, CAP_P(100))
+	CAP(C101, CAP_U(6.8))
+	CAP(C102, CAP_U(2.2))
+	CAP(C103, CAP_U(6.8))
+
+	//QBJT_EB(Q8, "2N3904") // Used as a reverse-biased noise source.
+	QBJT_EB(Q9, "2N3904")
+
+	OPAMP(1A, "LM748")
+	NET_C(1A.GND, GND)
+	NET_C(1A.VCC, C101.1, R241.1, R240.1)
+
+	DIODE(CR22, "1N4454")
+
+	NET_C(NOISE.1, R241.2, 1A.PLUS)
+	NET_C(NOISE.2, C99.1, GND)
+
+	// White Noise
+	NET_C(V15, R240.2, R246.1)
+	NET_C(C99.2, R242.1)
+	NET_C(R242.2, R243.1, CR22.K, 1A.MINUS)
+	NET_C(CR22.A, R244.1)
+	NET_C(R243.2, R244.2, 1A.OUT, R245.1)
+	NET_C(C101.2, GND)
+	NET_C(R245.2, C102.1)
+	NET_C(C102.2, R248.1, Q9.B)
+	NET_C(Q9.E, GND)
+	NET_C(Q9.C, R248.2, R247.1)
+	NET_C(R247.2, R246.2, C103.1)
+	NET_C(C103.2, GND)
+	ALIAS(WHITE_NOISE, Q9.C)
+#endif
+
+	SUBMODEL(PLAYER_CRASH, PLAYER_1_CRASH)
+	NET_C(PLAYER_1_CRASH.NOISE_IN, WHITE_NOISE)
+	NET_C(PLAYER_1_CRASH.CRASH_IN, PL1_CRASH.Q)
+	NET_C(PLAYER_1_CRASH.V15, V15)
+	NET_C(PLAYER_1_CRASH.VCC, VCC)
+	NET_C(PLAYER_1_CRASH.GND, GND)
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_carpolo.h mame-0.224+dfsg.1/src/mame/audio/nl_carpolo.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_carpolo.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_carpolo.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+#ifndef MAME_AUDIO_NL_CARPOLO_H
+#define MAME_AUDIO_NL_CARPOLO_H
+
+#pragma once
+
+NETLIST_EXTERNAL(carpolo)
+
+#endif // MAME_AUDIO_NL_CARPOLO_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_cinemat_common.h mame-0.224+dfsg.1/src/mame/audio/nl_cinemat_common.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_cinemat_common.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_cinemat_common.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,382 @@
+// license:CC0
+// copyright-holders:Aaron Giles,Couriersud
+#ifndef MAME_AUDIO_NL_CINEMAT_COMMON_H
+#define MAME_AUDIO_NL_CINEMAT_COMMON_H
+
+
+//
+// Misc common devices used by Cinematronics games.
+//
+// Eventually these should be included in the core.
+//
+// Known problems/issues:
+//
+//    * There are 5 different models of the CA3080 presented here.
+//       More analysis on the pros/cons of each should be done.
+//
+//    * The TL182 analog switch is cobbled together from a pair of
+//       CD4066 gates and a pair of inverters on the inputs. This
+//       seems to work but perhaps should be properly added as a
+//       system model.
+//
+//    * The 2N6426 Darlington transistors are not properly emulated.
+//       Currently they are modeled as a pair of 2N3904s. A pspice
+//       model ported into the netlist schema creates a very poor
+//       balance with the background noise in Space Wars/Barrier.
+//
+
+#include "netlist/devices/net_lib.h"
+
+
+//
+// Direct mappings
+//
+
+// AMI S2688 is compatible with MM5837
+#define AMI_S2688 MM5837_DIP
+
+// LM555/566 is compatible with NE555/566
+#define LM555_DIP NE555_DIP
+#define LM566_DIP NE566_DIP
+
+// alias LS devices to real devices
+#define TTL_74LS00_DIP TTL_7400_DIP
+#define TTL_74LS02_DIP TTL_7402_DIP     // Quad 2-input Nor Gate
+#define TTL_74S04_DIP TTL_7404_DIP      // Hex Inverting Gates
+#define TTL_74LS04_DIP TTL_7404_DIP     // Hex Inverting Gates
+#define TTL_74LS08_DIP TTL_7408_DIP     // Quad 2-Input AND Gates
+#define TTL_74LS21_DIP TTL_7421_DIP     // Dual 4-Input AND Gates
+#define TTL_74LS74_DIP TTL_7474_DIP     // Dual D Flip Flop
+#define TTL_74LS75_DIP TTL_7475_DIP     // 4-Bit Bistable Latches with Complementary Outputs
+#define TTL_74LS86_DIP TTL_7486_DIP     // Quad 2-Input Exclusive-OR Gates
+#define TTL_74LS107_DIP TTL_74107_DIP
+#define TTL_74S113_DIP TTL_74113_DIP
+#define TTL_74S113A_DIP TTL_74113A_DIP
+#define TTL_74LS123_DIP TTL_74123_DIP
+#define TTL_74LS125_DIP TTL_74125_DIP
+#define TTL_74LS157_DIP TTL_74157_DIP
+#define TTL_74LS163_DIP TTL_74163_DIP
+#define TTL_74LS164_DIP TTL_74164_DIP
+#define TTL_74LS191_DIP TTL_74191_DIP
+#define TTL_74LS259_DIP TTL_9334_DIP    // Seems to be pin-compatible
+#define TTL_74LS377_DIP TTL_74377_DIP
+#define TTL_74LS393_DIP TTL_74393_DIP
+
+
+
+//
+// Diode models
+//
+
+// models copied from https://www.diodes.com/assets/Spice-Models/Discrete-Prodcut-Groups/Zener-Diodes.txt
+#define D_1N914(name) DIODE(name, "1N914")
+#define D_1N914B(name) DIODE(name, "1N914")
+#define D_1N5236B(name) ZDIODE(name, "D(BV=7.5 IS=27.5p RS=33.8 N=1.10 CJO=58.2p VJ=0.750 M=0.330 TT=50.1n)")
+#define D_1N5240(name) ZDIODE(name, "D(BV=10 IS=14.4p RS=32.0 N=1.10 CJO=24.1p VJ=0.750 M=0.330 TT=50.1n)")
+#define D_1N5240B(name) ZDIODE(name, "D(BV=10 IS=14.4p RS=32.0 N=1.10 CJO=24.1p VJ=0.750 M=0.330 TT=50.1n)")
+
+
+
+//
+// Op-amp models
+//
+
+// SPICE model taken directly from Fairchild Semiconductor datasheet
+#define Q_2N3904(name) QBJT_EB(name, "NPN(Is=6.734f Xti=3 Eg=1.11 Vaf=74.03 Bf=416.4 Ne=1.259 Ise=6.734 Ikf=66.78m Xtb=1.5 Br=.7371 Nc=2 Isc=0 Ikr=0 Rc=1 Cjc=3.638p Mjc=.3085 Vjc=.75 Fc=.5 Cje=4.493p Mje=.2593 Vje=.75 Tr=239.5n f=301.2p Itf=.4 Vtf=4 Xtf=2 Rb=10)")
+
+// SPICE model taken directly from Fairchild Semiconductor datasheet
+#define Q_2N3906(name) QBJT_EB(name, "PNP(Is=1.41f Xti=3 Eg=1.11 Vaf=18.7 Bf=180.7 Ne=1.5 Ise=0 Ikf=80m Xtb=1.5 Br=4.977 Nc=2 Isc=0 Ikr=0 Rc=2.5 Cjc=9.728p Mjc=.5776 Vjc=.75 Fc=.5 Cje=8.063p Mje=.3677 Vje=.75 Tr=33.42n Tf=179.3p Itf=.4 Vtf=4 Xtf=6 Rb=10)")
+
+// SPICE model taken from https://www.onsemi.com/support/design-resources/models?rpn=2N6107
+#define Q_2N6107(name) QBJT_EB(name, "PNP(IS=7.62308e-14 BF=6692.56 NF=0.85 VAF=10 IKF=0.032192 ISE=2.07832e-13 NE=2.41828 BR=15.6629 NR=1.5 VAR=1.44572 IKR=0.32192 ISC=4.75e-16 NC=3.9375 RB=7.19824 IRB=0.1 RBM=0.1 RE=0.0001 RC=0.355458 XTB=0.1 XTI=2.97595 EG=1.206 CJE=1.84157e-10 VJE=0.99 MJE=0.347177 TF=6.63757e-09 XTF=1.50003 VTF=1.0001 ITF=1 CJC=1.06717e-10 VJC=0.942679 MJC=0.245405 XCJC=0.8 FC=0.533334 CJS=0 VJS=0.75 MJS=0.5 TR=1.32755e-07 PTF=0 KF=0 AF=1)")
+
+// SPICE model taken from https://www.onsemi.com/support/design-resources/models?rpn=2N6292
+#define Q_2N6292(name) QBJT_EB(name, "NPN(IS=9.3092e-13 BF=2021.8 NF=0.85 VAF=63.2399 IKF=1 ISE=1.92869e-13 NE=1.97024 BR=40.0703 NR=1.5 VAR=0.89955 IKR=10 ISC=4.92338e-16 NC=3.9992 RB=6.98677 IRB=0.1 RBM=0.1 RE=0.0001 RC=0.326141 XTB=0.1 XTI=2.86739 EG=1.206 CJE=1.84157e-10 VJE=0.99 MJE=0.347174 TF=6.73756e-09 XTF=1.49917 VTF=0.997395 ITF=0.998426 CJC=1.06717e-10 VJC=0.942694 MJC=0.245406 XCJC=0.8 FC=0.533405 CJS=0 VJS=0.75 MJS=0.5 TR=6.0671e-08 PTF=0 KF=0 AF=1)")
+
+// SPICE model taken from http://ltwiki.org/files/LTspiceIV/Vendor%20List/Fairchild/2N/index.html
+#define Q_2N5210(name) QBJT_EB(name, "NPN(Is=5.911f Xti=3 Eg=1.11 Vaf=62.37 Bf=809.9 Ne=1.358 Ise=5.911f Ikf=14.26m Xtb=1.5 Br=1.287 Nc=2 Isc=0 Ikr=0 Rc=1.61 Cjc=4.017p Mjc=.3174 Vjc=.75 Fc=.5 Cje=4.973p Mje=.4146 Vje=.75 Tr=4.68n Tf=820.9p Itf=.35 Vtf=4 Xtf=7 Rb=10)")
+
+
+
+//
+// 556 is just two 555s in one package
+//
+
+#define NE556_DIP(name) SUBMODEL(_NE556_DIP, name)
+#define LM556_DIP NE556_DIP
+
+static NETLIST_START(_NE556_DIP)
+	NE555(A)
+	NE555(B)
+
+	NET_C(A.GND, B.GND)
+	NET_C(A.VCC, B.VCC)
+
+	DIPPINS(      /*        +--------------+        */
+		 A.DISCH, /* 1DISCH |1     ++    14| VCC    */ A.VCC,
+		A.THRESH, /* 1THRES |2           13| 2DISCH */ B.DISCH,
+		  A.CONT, /*  1CONT |3           12| 2THRES */ B.THRESH,
+		 A.RESET, /* 1RESET |4   NE556   11| 2CONT  */ B.CONT,
+		   A.OUT, /*   1OUT |5           10| 2RESET */ B.RESET,
+		  A.TRIG, /*  1TRIG |6            9| 2OUT   */ B.OUT,
+		   A.GND, /*    GND |7            8| 2TRIG  */ B.TRIG
+				  /*        +--------------+        */
+	)
+NETLIST_END()
+
+
+
+//
+// TL182 analog switch
+//
+
+#define TL182_DIP(name) SUBMODEL(_TL182_DIP, name)
+
+static NETLIST_START(_TL182_DIP)
+	CD4066_GATE(A)
+	CD4066_GATE(B)
+
+	NET_C(A.VDD, B.VDD)
+	NET_C(A.VSS, B.VSS)
+
+	PARAM(A.BASER, 270.0)
+	PARAM(B.BASER, 270.0)
+
+	RES(VR, 100)
+	NC_PIN(NC)
+
+	TTL_7406_GATE(AINV)
+	TTL_7406_GATE(BINV)
+	NET_C(AINV.VCC, BINV.VCC, A.VDD)
+	NET_C(AINV.GND, BINV.GND, A.VSS)
+	NET_C(AINV.Y, A.CTL)
+	NET_C(BINV.Y, B.CTL)
+
+	DIPPINS(   /*      +--------------+      */
+		A.R.1, /*   1S |1     ++    14| 2S   */ B.R.1,
+		A.R.2, /*   1D |2           13| 2D   */ B.R.2,
+		 NC.I, /*   NC |3           12| NC   */ NC.I,
+		 NC.I, /*   NC |4   TL182   11| NC   */ NC.I,
+	   AINV.A, /*   1A |5           10| 2A   */ BINV.A,
+		 VR.1, /*  VCC |6            9| VEE  */ VR.2,
+		A.VDD, /*  VLL |7            8| VREF */ A.VSS
+			   /*      +--------------+      */
+	)
+NETLIST_END()
+
+
+
+//
+// 2N6426, Darlington transistor
+//
+
+#define Q_2N6426(name) SUBMODEL(_Q_2N6426, name)
+
+#if 0
+
+//
+// This model causes the background noise level to domainate all other sounds in spacewar?
+//
+
+// Model dervied from https://www.onsemi.com/support/design-resources/models?rpn=2N6284
+static NETLIST_START(_Q_2N6426)
+
+	QBJT_EB(Q1, "NPN(IS=1.73583e-11 BF=831.056 NF=1.05532 VAF=957.147 IKF=0.101183 ISE=1.65383e-10 NE=1.59909 BR=2.763 NR=1.03428 VAR=4.18534 IKR=0.0674174 ISC=1.00007e-13 NC=2.00765 RB=22.2759 IRB=0.208089 RBM=22.2759 RE=0.0002 RC=0.001 XTB=2.12676 XTI=1.82449 EG=1.05 CJE=2.62709e-10 VJE=0.95 MJE=0.23 TF=1e-09 XTF=1 VTF=10 ITF=0.01 CJC=3.59851e-10 VJC=0.845279 MJC=0.23 XCJC=0.9 FC=0.5 TR=1e-07 PTF=0 KF=0 AF=1)")
+
+	QBJT_EB(Q2, "NPN(IS=1.73583e-11 BF=831.056 NF=1.05532 VAF=957.147 IKF=0.101183 ISE=1.65383e-10 NE=1.59909 BR=2.763 NR=1.03428 VAR=4.18534 IKR=0.0674174 ISC=1.00007e-13 NC=2.00765 RB=22.2759 IRB=0.208089 RBM=22.2759 RE=0.0002 RC=0.001 XTB=2.12676 XTI=1.82449 EG=1.05 CJE=2.62709e-10 VJE=0.95 MJE=0.23 TF=1e-09 XTF=1 VTF=10 ITF=0.01 CJC=0 VJC=0.845279 MJC=0.23 XCJC=0.9 FC=0.5 TR=1e-07 PTF=0 KF=0 AF=1)")  // NPN
+
+	DIODE(D1, "D(IS=1e-12 RS=10.8089 N=1.00809 XTI=3.00809 CJO=0 VJ=0.75 M=0.33 FC=0.5)")
+	RES(R1, RES_K(8))
+	RES(R2, 50)
+
+	ALIAS(B, Q1.B)
+	ALIAS(C, Q1.C)
+	ALIAS(E, Q2.E)
+	NET_C(Q1.C, Q2.C, D1.K)
+	NET_C(Q1.B, R1.1)
+	NET_C(Q2.E, D1.A, R2.2)
+	NET_C(Q1.E, Q2.B, R1.2, R2.1)
+NETLIST_END()
+
+#else
+
+// super brain-dead model I threw together from a pair of 2N3904
+static NETLIST_START(_Q_2N6426)
+	QBJT_EB(Q1, "NPN")
+	QBJT_EB(Q2, "NPN")
+
+	ALIAS(B, Q1.B)
+	ALIAS(C, Q1.C)
+	ALIAS(E, Q2.E)
+	NET_C(Q1.C, Q2.C)
+	NET_C(Q1.E, Q2.B)
+NETLIST_END()
+
+#endif
+
+
+
+//
+// LM3900, quad op-amp
+//
+
+#define LM3900_DIP(name) SUBMODEL(_LM3900_DIP, name)
+
+static NETLIST_START(_LM3900_DIP)
+	LM3900(A)
+	LM3900(B)
+	LM3900(C)
+	LM3900(D)
+
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+
+	DIPPINS(   /*      +--------------+      */
+	   A.PLUS, /* 1IN+ |1     ++    14| VCC  */ A.VCC,
+	   B.PLUS, /* 2IN+ |2           13| 3IN+ */ C.PLUS,
+	  B.MINUS, /* 2IN- |3           12| 4IN+ */ D.PLUS,
+		B.OUT, /* 2OUT |4  LM3900   11| 4IN- */ D.MINUS,
+		A.OUT, /* 1OUT |5           10| 4OUT */ D.OUT,
+	  A.MINUS, /* 1IN- |6            9| 3OUT */ C.OUT,
+		A.GND, /*  GND |7            8| 3IN- */ C.MINUS
+			   /*      +--------------+      */
+	)
+NETLIST_END()
+
+
+
+// *************************************************
+//  EQUIVALENT SUBSTITUTE FOR CA3080 IS NTE996
+//  (SAME 8-PIN DIP PINOUT)
+// *************************************************
+//
+//  CA3080 OPERATIONAL TRANSCONDUCTANCE AMPLIFIER
+//
+//  SPICE (SIMULATION PROGRAM WITH INTEGRATED CIRCUIT EMPHASIS)
+//  SUBCIRCUIT
+//
+//  CONNECTIONS:
+//               INVERTING INPUT
+//                | NON-INVERTING INPUT
+//                |  |  NEGATIVE POWER SUPPLY
+//                |  |  |  I BIAS
+//                |  |  |  | OUTPUT
+//                |  |  |  |  |  POSITIVE POWER SUPPLY
+//                |  |  |  |  |  |
+//.SUBCKT CA3080  2  3  4  5  6  7
+
+//
+// DIP mappings use the submodels below for CA3080
+//
+#define CA3080_FAST_DIP(name) SUBMODEL(_CA3080_FAST_DIP, name)
+#define CA3080_SLOW_DIP(name) SUBMODEL(_CA3080_SLOW_DIP, name)
+
+
+//
+// Default to the fast model unless otherwise directed
+//
+#ifndef CA3080_DIP
+#define CA3080_DIP CA3080_FAST_DIP
+#endif
+
+
+//
+// Fast model: works well for most cases in Cinematronics games,
+// except when used in a network with multiple CA3080's, due to
+// the presence of an AFUNC.
+//
+static NETLIST_START(_CA3080_FAST_DIP)
+	ALIAS(2, F.A0) // -
+	ALIAS(3, F.A1) // +
+	ALIAS(4, F.A2) // V-
+	ALIAS(5, RIABC.1) // IB
+	ALIAS(6, VO.OP)  // FIXME
+	ALIAS(7, F.A4) // V+
+
+	RES(RI, 26000)
+	NET_C(RI.1, F.A0)
+	NET_C(RI.2, F.A1)
+	// Delivers I0
+	AFUNC(F, 5, "max(-0.5e-3, min(0.5e-3, 19.2 * (A3 - A2) * A0))")
+	RES(RIABC, 1)
+	NET_C(RIABC.2, F.A2)
+	NET_C(RIABC.1, F.A3) // IB
+	VCCS(VO, 1)
+	ANALOG_INPUT(XGND, 0)
+	NET_C(XGND, VO.IN, VO.ON) // FIXME: assume symmetric supply
+	NET_C(F.Q, VO.IP)
+NETLIST_END()
+
+
+//
+// Slow model: derived from
+//    https://github.com/xxv/gedasymbols/blob/master/www/user/john_doty/models/opamp/ca3080.mod
+//
+// This seems to produce reasonable results as a slow drop-in
+// replacement for the fast model above in solarq, but is quite
+// slow. One advantage is that it works in a network with multiple
+// CA3080's.
+//
+static NETLIST_START(_CA3080_SLOW_DIP)
+//
+// These items are common to several models
+//
+#define CA3080_D(name) DIODE(name, "D(IS=2p RS=5 BV=40 CJO=3p TT=6n)")
+#define CA3080_NPN(name) QBJT_EB(name, "NPN(IS=21.48f XTI=3 EG=1.11 VAF=80 BF=550 ISE=50f NE=1.5 IKF=10m XTB=1.5 BR=.1 ISC=10f NC=2 IKR=3m RC=10 CJC=800f MJC=.3333 VJC=.75 FC=.5 CJE=1.3p MJE=.3333 VJE=.75 TR=30n TF=400P ITF=30m XTF=1 VTF=10 CJS=5.8P MJS=.3333 VJS=.75)")
+#define CA3080_PNP(name) QBJT_EB(name, "PNP(IS=50f XTI=3 EG=1.11 VAF=80 BF=100 ISE=130f NE=1.5 IKF=1m XTB=1.5 BR=1 ISC=0 NC=2 IKR=0 RC=0 CJC=4p MJC=.3333 VJC=.75 FC=.5 CJE=1.4p MJE=.3333 VJE=.75 TR=500n TF=23n ITF=.1 XTF=1 VTF=10 CJS=5.5P MJS=.3333 VJS=.75)")
+
+	CA3080_D(D1)
+	CA3080_D(D2)
+	CA3080_NPN(Q1)
+	CA3080_PNP(Q2)
+	CA3080_PNP(Q3)
+	CA3080_NPN(Q4)
+	CA3080_NPN(Q5)
+	CA3080_PNP(Q6)
+	CA3080_PNP(Q7)
+	CA3080_PNP(Q8)
+	CA3080_PNP(Q9)
+	CA3080_NPN(Q10)
+	CA3080_NPN(Q11)
+	CA3080_NPN(Q12)
+	CA3080_NPN(Q13)
+	CA3080_PNP(Q14)
+	CA3080_PNP(Q15)
+
+	ALIAS(2, Q10.B)     // N1
+	ALIAS(3, Q5.B)      // N28
+	ALIAS(4, Q1.E)      // N13
+	ALIAS(5, Q1.B)      // N11
+	ALIAS(6, Q6.C)      // N30
+	ALIAS(7, Q8.E)      // N8
+	NET_C(Q8.E, Q9.E, Q14.E, Q15.E)     // N8
+	NET_C(Q1.B, Q1.C, Q4.B)             // N11
+	NET_C(Q1.E, Q4.E, Q11.E, Q12.E)     // N13
+	NET_C(Q6.C, Q7.C, Q13.C)            // N30
+	NET_C(Q3.B, Q10.C, Q14.C, D1.A)     // N1N13
+	NET_C(Q2.E, Q14.B, Q15.C, Q15.B)    // N1N15
+	NET_C(Q2.B, Q3.E, D1.K)             // N1N17
+	NET_C(Q2.C, Q3.C, Q11.C, Q13.B)     // N1N22
+	NET_C(Q5.C, Q6.B, Q9.C, D2.A)       // N1N32
+	NET_C(Q6.E, Q7.B, D2.K)             // N1N34
+	NET_C(Q7.E, Q8.C, Q8.B, Q9.B)       // N1N36
+	NET_C(Q4.C, Q5.E, Q10.E)            // N1N52
+	NET_C(Q11.B, Q12.C, Q12.B, Q13.E)   // N1N44
+NETLIST_END()
+
+
+
+//
+// List of local models to include to make MAME happy
+//
+
+#define CINEMAT_LOCAL_MODELS \
+	LOCAL_SOURCE(_NE556_DIP) \
+	LOCAL_SOURCE(_TL182_DIP) \
+	LOCAL_SOURCE(_Q_2N6426) \
+	LOCAL_SOURCE(_LM3900_DIP) \
+	LOCAL_SOURCE(_CA3080_FAST_DIP) \
+	LOCAL_SOURCE(_CA3080_SLOW_DIP) \
+
+
+#endif // MAME_AUDIO_NL_CINEMAT_COMMON_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_destroyr.cpp mame-0.224+dfsg.1/src/mame/audio/nl_destroyr.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_destroyr.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_destroyr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,316 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//
+// Netlist for Atari's Destroyer
+//
+// Derived from the schematics in the manual.
+//
+// Known problems/issues:
+//    * Sonar sound effect appears to be more noisy than a real cabinet. Unsure, as yet, why.
+//
+
+#include "netlist/devices/net_lib.h"
+
+static NETLIST_START(LM324_VM5V12_DIP)
+	OPAMP(A, "LM324_M5V12V")
+	OPAMP(B, "LM324_M5V12V")
+	OPAMP(C, "LM324_M5V12V")
+	OPAMP(D, "LM324_M5V12V")
+
+	DIPPINS(        /*   +--------------+   */
+		A.OUT,      /*   |1     ++    14|   */ D.OUT,
+		A.MINUS,    /*   |2           13|   */ D.MINUS,
+		A.PLUS,     /*   |3           12|   */ D.PLUS,
+		A.VCC,      /*   |4           11|   */ A.GND,
+		B.PLUS,     /*   |5           10|   */ C.PLUS,
+		B.MINUS,    /*   |6            9|   */ C.MINUS,
+		B.OUT,      /*   |7            8|   */ C.OUT
+					/*   +--------------+   */
+	)
+
+	NET_C(A.GND, B.GND, C.GND, D.GND)
+	NET_C(A.VCC, B.VCC, C.VCC, D.VCC)
+NETLIST_END()
+
+static NETLIST_START(NE556_DIP)
+	NE555(A)
+	NE555(B)
+
+	NET_C(A.GND, B.GND)
+	NET_C(A.VCC, B.VCC)
+
+	DIPPINS(      /*        +--------------+        */
+		 A.DISCH, /* 1DISCH |1     ++    14| VCC    */ A.VCC,
+		A.THRESH, /* 1THRES |2           13| 2DISCH */ B.DISCH,
+		  A.CONT, /*  1CONT |3           12| 2THRES */ B.THRESH,
+		 A.RESET, /* 1RESET |4   NE556   11| 2CONT  */ B.CONT,
+		   A.OUT, /*   1OUT |5           10| 2RESET */ B.RESET,
+		  A.TRIG, /*  1TRIG |6            9| 2OUT   */ B.OUT,
+		   A.GND, /*    GND |7            8| 2TRIG  */ B.TRIG
+				  /*        +--------------+        */
+	)
+NETLIST_END()
+
+NETLIST_START(destroyr)
+
+	SOLVER(Solver, 48000)
+	ANALOG_INPUT(V5, 5)
+	ANALOG_INPUT(VM5, -5)
+	ANALOG_INPUT(V12, 12)
+	ALIAS(VCC, V5)
+	CLOCK(H256, 15750)
+	CLOCK(V8, 984.375)
+	NET_C(VCC, H256.VCC, V8.VCC)
+	NET_C(GND, H256.GND, V8.GND)
+
+	NET_MODEL("LM324_M5V12V OPAMP(TYPE=3 VLH=1.1 VLL=0.11 FPF=5 UGF=50k SLEW=0.3M RI=1000k RO=50 DAB=0.00075)")
+
+	LOCAL_SOURCE(NE556_DIP)
+	LOCAL_SOURCE(LM324_VM5V12_DIP)
+
+	TTL_INPUT(MOTOR_SPEED, 0)
+	TTL_INPUT(NOISE, 0)
+	TTL_INPUT(ATTRACT, 0)
+	TTL_INPUT(SONGATE, 0)
+	TTL_INPUT(LAUNCH, 0)
+	TTL_INPUT(EXPLO, 0)
+	TTL_INPUT(SONLAT, 0)
+	TTL_INPUT(HE, 0)
+	TTL_INPUT(LE, 0)
+	NET_C(VCC, MOTOR_SPEED.VCC, NOISE.VCC, ATTRACT.VCC, SONGATE.VCC, LAUNCH.VCC, EXPLO.VCC, SONLAT.VCC, HE.VCC, LE.VCC)
+	NET_C(GND, MOTOR_SPEED.GND, NOISE.GND, ATTRACT.GND, SONGATE.GND, LAUNCH.GND, EXPLO.GND, SONLAT.GND, HE.GND, LE.GND)
+
+	RES(R39, 220)
+	RES(R40, 220)
+	RES(R41, RES_K(2.2))
+	RES(R42, RES_K(39))
+	RES(R43, RES_K(150))
+	RES(R44, 820)
+	RES(R54, RES_K(10))
+	RES(R59, RES_K(470))
+	RES(R60, RES_K(470))
+	RES(R61, RES_K(10))
+	RES(R62, RES_K(10))
+	RES(R63, RES_M(10))
+	RES(R64, RES_K(100))
+	RES(R65, RES_K(100))
+	RES(R66, RES_K(100))
+	RES(R67, RES_K(10))
+	RES(R68, RES_K(10))
+	RES(R69, RES_K(10))
+	RES(R70, RES_K(3.3))
+	RES(R71, RES_K(15))
+	RES(R72, RES_K(33))
+	RES(R73, RES_K(10))
+	RES(R74, RES_K(100))
+	RES(R75, RES_K(33))
+	RES(R76, RES_K(22))
+	RES(R77, RES_K(47))
+	RES(R78, RES_K(5.6))
+	RES(R79, RES_K(33))
+	RES(R80, RES_K(3.9))
+	RES(R81, RES_K(3.9))
+	RES(R82, RES_K(2.2))
+	RES(R83, RES_K(330))
+	RES(R86, 680)
+	RES(R88, RES_K(2.7))
+	RES(R89, RES_K(10))
+	RES(R92, RES_K(2.2))
+	RES(R93, RES_K(2.2))
+	RES(R94, RES_K(68))
+	POT(R95, RES_K(50))
+
+	CAP(C38, CAP_U(10))
+	CAP(C39, CAP_U(0.1))
+	CAP(C40, CAP_U(0.1))
+	CAP(C48, CAP_U(10))
+	CAP(C49, CAP_P(330))
+	CAP(C51, CAP_P(330))
+	CAP(C52, CAP_U(0.1))
+	CAP(C53, CAP_U(10))
+	CAP(C56, CAP_U(0.22))
+	CAP(C57, CAP_U(0.22))
+	CAP(C58, CAP_U(0.22))
+	CAP(C59, CAP_U(0.1))
+	CAP(C61, CAP_U(0.22))
+	CAP(C62, CAP_U(0.022))
+	CAP(C63, CAP_U(22))
+	CAP(C64, CAP_U(0.022))
+	CAP(C66, CAP_U(10))
+	CAP(C71, CAP_U(0.1))
+	CAP(C72, CAP_U(0.1))
+	CAP(C74, CAP_U(0.22))
+	//CAP(C81, CAP_U(0.1))
+	CAP(C85, CAP_U(22))
+
+	DIODE(CR2, "1N914")
+
+	QBJT_EB(Q4, "2N3643")
+	QBJT_EB(Q6, "2N3643")
+
+	TTL_7486_DIP(IC_L7)
+	TTL_74164_DIP(IC_L9)
+	TTL_74164_DIP(IC_M9)
+	TTL_7402_DIP(IC_K8) // Should be a 7428 positive-NOR gate
+	TTL_7432_DIP(IC_M8)
+	TTL_7400_DIP(IC_A9)
+	TTL_7404_DIP(IC_K9)
+	NET_C(VCC, IC_L9.14, IC_M9.14, IC_L7.14, IC_K8.14, IC_M8.14, IC_K9.14, IC_A9.14)
+	NET_C(GND, IC_L9.7,  IC_M9.7,  IC_L7.7,  IC_K8.7,  IC_M8.7,  IC_K9.7,  IC_A9.7)
+
+	SUBMODEL(NE556_DIP, IC_H8)
+	NET_C(VCC, IC_H8.14)
+	NET_C(GND, IC_H8.7)
+
+	MC3340_DIP(IC_D10)
+	NET_C(VCC, IC_D10.8)
+	NET_C(VM5, IC_D10.3)
+
+	CD4066_DIP(IC_E9)
+	NET_C(VCC, IC_E9.14)
+	NET_C(GND, IC_E9.7)
+
+	SUBMODEL(LM324_VM5V12_DIP, IC_C9)
+	SUBMODEL(LM324_VM5V12_DIP, IC_H9)
+	NET_C(V12, IC_C9.4,  IC_H9.4)
+	NET_C(VM5, IC_C9.11, IC_H9.11)
+
+	// Tie off unused gates and pins
+	NET_C(GND, IC_L7.1,  IC_L7.2)
+	NET_C(GND, IC_L7.4,  IC_L7.5)
+	NET_C(GND, IC_L7.9,  IC_L7.10)
+	NET_C(GND, IC_M8.4,  IC_M8.5)
+	NET_C(GND, IC_M8.9,  IC_M8.10)
+	NET_C(GND, IC_M8.12, IC_M8.13)
+	NET_C(GND, IC_A9.1,  IC_A9.2)
+	NET_C(GND, IC_A9.9,  IC_A9.10)
+	NET_C(GND, IC_A9.12, IC_A9.13)
+	NET_C(GND, IC_K9.1,  IC_K9.5, IC_K9.9, IC_K9.11, IC_K9.13)
+	NET_C(GND, IC_H8.5,  IC_H8.9)
+	NET_C(VCC, IC_H8.4,  IC_H8.10)
+
+	// Noise Clock
+	NET_C(H256.Q, IC_K8.2)
+	NET_C(EXPLO.Q, IC_K8.3)
+	NET_C(V8.Q, IC_K8.5)
+	NET_C(SONLAT.Q, IC_K8.6)
+	NET_C(IC_K8.1, IC_M8.1)
+	NET_C(IC_K8.4, IC_M8.2)
+	ALIAS(NOISECLK, IC_M8.3)
+
+	// Noise
+	NET_C(NOISE.Q, IC_L9.9, IC_M9.9)
+	NET_C(NOISECLK, IC_L9.8, IC_M9.8)
+	NET_C(IC_M9.12, IC_K9.3)
+	NET_C(IC_K9.4, IC_L7.13)
+	NET_C(IC_M9.11, IC_L7.12)
+	ALIAS(RNOISE, IC_M9.11)
+	NET_C(IC_L7.11, IC_L9.1, IC_L9.2)
+	NET_C(IC_L9.13, IC_M9.1, IC_M9.2)
+
+	// Explosions
+	NET_C(SONLAT.Q, IC_K8.9)
+	NET_C(EXPLO.Q, IC_K8.8)
+	NET_C(IC_K8.10, CR2.A, R39.2, IC_K8.11)
+	NET_C(RNOISE, IC_K8.12)
+	NET_C(V5, R39.1, R68.1)
+	NET_C(IC_K8.13, IC_E9.5)
+	NET_C(CR2.K, C38.1, IC_E9.4)
+	NET_C(GND, C38.2, R70.2, R61.2, C48.2, R73.2, R86.2, C53.2, R67.2, Q6.E, Q4.E, C85.2)
+	NET_C(IC_E9.3, R74.1, IC_E9.11, R71.1)
+	NET_C(LE.Q, IC_E9.13)
+	NET_C(HE.Q, IC_E9.12)
+	NET_C(R71.2, C52.1, R70.1)
+	NET_C(C52.2, R66.1)
+	NET_C(R66.2, IC_H9.10, R63.1)
+	NET_C(IC_H9.9, R64.1, R65.1)
+	NET_C(IC_H9.8, R64.2, R60.1)
+	NET_C(R60.2, C49.1, IC_H9.6)
+	NET_C(C49.2, IC_H9.7, R59.1, R63.2, R72.1)
+	NET_C(IC_H9.5, IC_H9.3, R62.2, R61.1, C48.1)
+	NET_C(V12, R62.1)
+	NET_C(R59.2, C51.1, IC_H9.2)
+	NET_C(IC_H9.1, C51.2, R65.2)
+	NET_C(SONGATE.Q, IC_E9.6)
+	NET_C(R72.2, R73.1, IC_E9.8, R82.1)
+	NET_C(R74.2, R86.1, C71.1, C72.1)
+	NET_C(R68.2, R67.1, C53.1, IC_H9.12, IC_C9.3)
+	NET_C(C71.2, R83.1, IC_H9.13)
+	NET_C(C72.2, R83.2, IC_H9.14, R69.1)
+	NET_C(R69.2, IC_E9.1)
+	NET_C(IC_E9.2, R79.1, IC_C9.2)
+	NET_C(IC_C9.1, R79.2, C61.1)
+	NET_C(C61.2, R78.1)
+	NET_C(IC_E9.10, C57.1)
+	NET_C(C57.2, R77.1)
+	NET_C(IC_E9.9, C56.1)
+	NET_C(C56.2, R76.1)
+
+	// Launch
+	NET_C(RNOISE, IC_A9.4)
+	NET_C(LAUNCH.Q, IC_A9.5)
+	NET_C(IC_A9.6, R81.1)
+	NET_C(R81.2, C64.1)
+	NET_C(C64.2, IC_C9.9, R80.1, C62.1)
+	NET_C(C62.2, R80.2, IC_C9.8, C58.1)
+	NET_C(GND, IC_C9.10)
+	NET_C(C58.2, R75.1)
+
+	// Motor
+	NET_C(MOTOR_SPEED.Q, R44.1)
+	NET_C(R44.2, R40.2, IC_H8.3, IC_H8.11, C63.1)
+	NET_C(V5, R40.1, R41.1, R54.1, R89.1)
+	NET_C(R41.2, R42.1, IC_H8.1)
+	NET_C(R42.2, IC_H8.2, IC_H8.6, C39.1, IC_C9.5)
+	NET_C(R54.2, R43.1, IC_H8.13)
+	NET_C(R43.2, IC_H8.8, IC_H8.12, C40.1, IC_C9.12)
+	NET_C(C63.2, IC_C9.13, IC_C9.14, C66.2)
+	NET_C(GND, C39.2, C40.2)
+	NET_C(IC_C9.6, IC_C9.7, C59.2)
+	NET_C(C59.1, IC_D10.1)
+	NET_C(C66.1, R88.2, R89.2, IC_D10.2)
+	NET_C(VM5, R88.1)
+	NET_C(IC_D10.6, Q4.C)
+	NET_C(IC_D10.7, C74.1)
+	NET_C(C74.2, R94.1)
+
+	// Attract Mute
+	NET_C(ATTRACT.Q, R92.1, R93.1)
+	NET_C(R92.2, C85.1, Q4.B)
+	NET_C(R93.2, Q6.B)
+	NET_C(Q6.C, R82.2)
+
+	// Mixer
+	NET_C(GND, R95.1)
+	NET_C(R94.2, R75.2, R76.2, R77.2, R78.2, R95.3)
+	ALIAS(OUTPUT, R95.2)
+
+	// Unconnected pins
+	HINT(IC_A9.3, NC)
+	HINT(IC_A9.8, NC)
+	HINT(IC_A9.11, NC)
+	HINT(IC_K9.2, NC)
+	HINT(IC_K9.6, NC)
+	HINT(IC_K9.8, NC)
+	HINT(IC_K9.10, NC)
+	HINT(IC_K9.12, NC)
+	HINT(IC_L9.3, NC)
+	HINT(IC_L9.4, NC)
+	HINT(IC_L9.5, NC)
+	HINT(IC_L9.6, NC)
+	HINT(IC_L9.10, NC)
+	HINT(IC_L9.11, NC)
+	HINT(IC_L9.12, NC)
+	HINT(IC_M9.3, NC)
+	HINT(IC_M9.4, NC)
+	HINT(IC_M9.5, NC)
+	HINT(IC_M9.6, NC)
+	HINT(IC_M9.10, NC)
+	HINT(IC_M9.13, NC)
+	HINT(IC_L7.3, NC)
+	HINT(IC_L7.6, NC)
+	HINT(IC_L7.8, NC)
+	HINT(IC_M8.6, NC)
+	HINT(IC_M8.8, NC)
+	HINT(IC_M8.11, NC)
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_destroyr.h mame-0.224+dfsg.1/src/mame/audio/nl_destroyr.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_destroyr.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_destroyr.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+#ifndef MAME_AUDIO_NL_DESTROYR_H
+#define MAME_AUDIO_NL_DESTROYR_H
+
+#pragma once
+
+NETLIST_EXTERNAL(destroyr)
+
+#endif // MAME_AUDIO_NL_DESTROYR_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_elim.cpp mame-0.224+dfsg.1/src/mame/audio/nl_elim.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_elim.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_elim.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,1225 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//NL_CONTAINS elim zektor
+
+//
+// Netlist for Eliminator/Zektor
+//
+// Derived from the schematics in the Eliminator and Zektor manuals.
+//
+// Known problems/issues:
+//
+//    * The noise signal (WBN) is connected into the TORPEDO_2 sound
+//       but seems to make no audible difference, either in the
+//       simulation or in recordings. Disabling it gives a nice speedup.
+//
+//    * Torpedo sounds don't retrigger until they're complete. This means
+//       you can fire several times before the next firing sound triggers.
+//       In recordings of games this doesn't appear to be the case.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_elim.h"
+
+
+//
+// Optimizations
+//
+
+#define UNDERCLOCK_NOISE_GEN (1)
+#define HLE_BACKGROUND_VCO (1)
+#define HLE_TORPEDO1_VCO (1)
+#define HLE_TORPEDO2_VCO (1)
+#define HLE_SKITTER_VCO (1)
+#define ENABLE_FRONTIERS (1)
+
+
+
+//
+// Hacks
+//
+
+#define ADD_CLIPPING_DIODES (1)
+#define DISABLE_TORPEDO2_NOISE (1)
+
+
+
+//
+// Initial compilation includes this section.
+//
+
+#ifndef SOUND_VARIANT
+
+
+#define D_1N914(name) DIODE(name, "1N914")
+#define D_1N4002(name) DIODE(name, "D(IS=65.4p RS=42.2m BV=100 IBV=5.00u CJO=14.8p M=0.333 N=1.36 TT=2.88u)")
+
+// SPICE model taken from https://www.onsemi.com/support/design-resources/models?rpn=2N4403
+#define Q_2N4403(name) QBJT_EB(name, "PNP(Is=650.6E-18 Xti=3 Eg=1.11 Vaf=115.7 Bf=216.2 Ne=1.829 Ise=58.72f Ikf=1.079 Xtb=1.5 Br=3.578 Nc=2 Isc=0 Ikr=0 Rc=.715 Cjc=14.76p Mjc=.5383 Vjc=.75 Fc=.5 Cje=19.82p Mje=.3357 Vje=.75 Tr=111.6n Tf=603.7p Itf=.65 Vtf=5 Xtf=1.7 Rb=10)")
+
+#define LM555_DIP NE555_DIP
+#define LM566_DIP NE566_DIP
+
+#define TTL_74LS00_DIP TTL_7400_DIP
+
+//
+// DIP mappings use the submodels below for CA3080
+//
+#define CA3080_DIP(name) SUBMODEL(_CA3080_FAST_DIP, name)
+static NETLIST_START(_CA3080_FAST_DIP)
+	ALIAS(2, F.A0) // -
+	ALIAS(3, F.A1) // +
+	ALIAS(4, F.A2) // V-
+	ALIAS(5, RIABC.1) // IB
+	ALIAS(6, VO.OP)  // FIXME
+	ALIAS(7, F.A4) // V+
+
+	RES(RI, 26000)
+	NET_C(RI.1, F.A0)
+	NET_C(RI.2, F.A1)
+	// Delivers I0
+	AFUNC(F, 5, "max(-0.5e-3, min(0.5e-3, 19.2 * (A3 - A2) * A0))")
+	RES(RIABC, 1)
+	NET_C(RIABC.2, F.A2)
+	NET_C(RIABC.1, F.A3) // IB
+	VCCS(VO, 1)
+	ANALOG_INPUT(XGND, 0)
+	NET_C(XGND, VO.IN, VO.ON) // FIXME: assume symmetric supply
+	NET_C(F.Q, VO.IP)
+NETLIST_END()
+
+
+
+//
+// Now include ourselves twice, once for Eliminator and
+// once for Zektor
+//
+
+#define VARIANT_ELIMINATOR  0
+#define VARIANT_ZEKTOR      1
+
+#define SOUND_VARIANT       (VARIANT_ELIMINATOR)
+#include "nl_elim.cpp"
+
+#undef SOUND_VARIANT
+#define SOUND_VARIANT       (VARIANT_ZEKTOR)
+#include "nl_elim.cpp"
+
+
+#else
+
+
+//
+// Main netlist
+//
+
+#if (SOUND_VARIANT == VARIANT_ELIMINATOR)
+NETLIST_START(elim)
+#else // (SOUND_VARIANT == VARIANT_ZEKTOR)
+NETLIST_START(zektor)
+#endif
+
+	SOLVER(Solver, 1000)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	// Overwrite model - the default model uses minimum datasheet
+	// specifications for 5V. These are for 10V and thus closer to the
+	// 12V used in this circuit.
+	NET_MODEL("CD4XXX FAMILY(TYPE=CMOS IVL=0.3 IVH=0.7 OVL=0.05 OVH=0.05 ORL=384 ORH=384)")
+
+	LOCAL_SOURCE(_CA3080_FAST_DIP)
+
+//  TTL_INPUT(I_LO_D0, 0)
+	TTL_INPUT(I_LO_D1, 0)
+	ALIAS(I_FIREBALL, I_LO_D1)
+	TTL_INPUT(I_LO_D2, 0)
+	ALIAS(I_EXPLOSION_1, I_LO_D2)
+	TTL_INPUT(I_LO_D3, 0)
+	ALIAS(I_EXPLOSION_2, I_LO_D3)
+	TTL_INPUT(I_LO_D4, 0)
+	ALIAS(I_EXPLOSION_3, I_LO_D4)
+	TTL_INPUT(I_LO_D5, 0)
+	ALIAS(I_BOUNCE, I_LO_D5)
+	TTL_INPUT(I_LO_D6, 0)
+	ALIAS(I_TORPEDO_1, I_LO_D6)
+	TTL_INPUT(I_LO_D7, 0)
+	ALIAS(I_TORPEDO_2, I_LO_D7)
+
+	NET_C(GND, I_LO_D1.GND, I_LO_D2.GND, I_LO_D3.GND, I_LO_D4.GND, I_LO_D5.GND, I_LO_D6.GND, I_LO_D7.GND)
+	NET_C(I_V5, I_LO_D1.VCC, I_LO_D2.VCC, I_LO_D3.VCC, I_LO_D4.VCC, I_LO_D5.VCC, I_LO_D6.VCC, I_LO_D7.VCC)
+
+	TTL_INPUT(I_HI_D0, 0)
+	ALIAS(I_THRUST_LOW, I_HI_D0)
+	TTL_INPUT(I_HI_D1, 0)
+	ALIAS(I_THRUST_HI, I_HI_D1)
+	TTL_INPUT(I_HI_D2, 0)
+	ALIAS(I_THRUST_LSB, I_HI_D2)
+	TTL_INPUT(I_HI_D3, 0)
+	ALIAS(I_THRUST_MSB, I_HI_D3)
+	TTL_INPUT(I_HI_D4, 0)
+	ALIAS(I_SKITTER, I_HI_D4)
+	TTL_INPUT(I_HI_D5, 0)
+	ALIAS(I_ENEMY_SHIP, I_HI_D5)
+	TTL_INPUT(I_HI_D6, 0)
+	ALIAS(I_BACKGROUND_LSB, I_HI_D6)
+	TTL_INPUT(I_HI_D7, 0)
+	ALIAS(I_BACKGROUND_MSB, I_HI_D7)
+
+	NET_C(GND, I_HI_D0.GND, I_HI_D1.GND, I_HI_D2.GND, I_HI_D3.GND, I_HI_D4.GND, I_HI_D5.GND, I_HI_D6.GND, I_HI_D7.GND)
+	NET_C(I_V5, I_HI_D0.VCC, I_HI_D1.VCC, I_HI_D2.VCC, I_HI_D3.VCC, I_HI_D4.VCC, I_HI_D5.VCC, I_HI_D6.VCC, I_HI_D7.VCC)
+
+	RES(R_PSG_1, 1000)
+	RES(R_PSG_2, 1000)
+	RES(R_PSG_3, 1000)
+	NET_C(I_V5, R_PSG_1.1, R_PSG_2.1, R_PSG_3.1)
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V12, 12)
+	ANALOG_INPUT(I_VM12, -12)
+
+	//
+	// Part differences between Eliminator and Zektor
+	//
+	//  Ref Des         ELIMINATOR      ZEKTOR
+	//  R5              10K             4.7K
+	//  R9              33K             12K
+	//  R71             270K            100K
+	//  R79             2 MEG           unused
+	//  R122            220K            390K
+	//  R132            220K            100K
+	//  C9              0.01uF          0.0047uF
+	//  C46             0.022uF         0.047uF
+	//
+
+//  RES(R1, RES_K(100))     -- part of final amp (not emulated)
+//  RES(R2, RES_M(1))       -- part of final amp (not emulated)
+//  RES(R3, RES_K(22))      -- part of final amp (not emulated)
+//  RES(R4, RES_K(2.2))     -- part of final amp (not emulated)
+#if (SOUND_VARIANT == VARIANT_ELIMINATOR)
+//  RES(R5, RES_K(10))      -- part of final amp (not emulated)
+#else // (SOUND_VARIANT == VARIANT_ZEKTOR)
+//  RES(R5, RES_K(4.7))     -- part of final amp (not emulated)
+#endif
+	RES(R6, RES_K(220))
+	RES(R7, RES_K(220))
+	RES(R8, RES_K(10))
+#if (SOUND_VARIANT == VARIANT_ELIMINATOR)
+	RES(R9, RES_K(33))
+#else // (SOUND_VARIANT == VARIANT_ZEKTOR)
+	RES(R9, RES_K(12))
+#endif
+	RES(R10, RES_K(10))
+//  RES(R11, RES_K(2.2))    -- part of final amp (not emulated)
+//  RES(R12, RES_M(1))      -- part of final amp (not emulated)
+//  RES(R13, RES_K(330))    -- part of final amp (not emulated)
+	RES(R14, RES_K(470))
+	RES(R15, RES_K(100))
+	RES(R16, RES_K(100))
+	RES(R17, RES_K(10))
+	RES(R18, RES_K(10))
+	RES(R19, RES_K(1))
+	RES(R20, RES_K(10))
+	RES(R21, RES_K(100))
+	RES(R22, RES_K(10))
+	RES(R23, RES_K(4.7))
+// R24??
+	RES(R25, RES_K(220))
+	RES(R26, RES_K(470))
+	RES(R27, RES_K(470))
+	RES(R28, RES_K(33))
+	RES(R29, RES_K(68))
+	RES(R30, RES_K(22))
+	RES(R31, RES_K(1))
+	RES(R32, RES_K(47))
+	RES(R33, RES_K(82))
+	RES(R34, RES_K(22))
+	RES(R35, RES_K(1))
+	RES(R36, RES_M(1.5))
+	RES(R37, RES_K(6.8))
+	RES(R38, RES_K(33))
+	RES(R39, RES_K(22))
+	RES(R40, RES_K(1))
+	RES(R41, RES_M(2.2))
+	RES(R42, RES_M(2.2))
+	RES(R43, RES_K(1))
+	RES(R44, RES_K(10))
+	RES(R45, RES_K(47))
+	RES(R46, RES_K(22))
+	RES(R47, RES_K(2))
+	RES(R48, RES_K(6.8))
+	RES(R49, RES_K(33))
+	RES(R50, RES_K(22))
+	RES(R51, RES_K(1))
+	RES(R52, RES_K(1))
+	RES(R53, RES_K(1))
+	RES(R54, RES_K(2))
+	RES(R55, RES_K(1))
+	RES(R56, RES_K(1))
+	RES(R57, RES_K(1))
+	RES(R58, RES_K(33))
+	RES(R59, RES_K(2))
+	RES(R60, RES_K(10))
+	RES(R61, RES_K(47))
+	RES(R62, RES_K(220))
+	RES(R63, RES_K(1))
+	RES(R64, RES_K(150))
+	RES(R65, RES_K(390))
+	RES(R66, RES_K(33))
+	RES(R67, RES_K(100))
+	RES(R68, RES_K(100))
+	RES(R69, RES_K(1))
+	RES(R70, RES_K(470))
+#if (SOUND_VARIANT == VARIANT_ELIMINATOR)
+	RES(R71, RES_K(270))
+#else // (SOUND_VARIANT == VARIANT_ZEKTOR)
+	RES(R71, RES_K(100))
+#endif
+	RES(R72, RES_K(1))
+	RES(R73, RES_K(680))
+	RES(R74, RES_K(390))
+	RES(R75, RES_K(150))
+	RES(R76, RES_K(10))
+	RES(R77, RES_K(10))
+	RES(R78, RES_K(10))
+#if (SOUND_VARIANT == VARIANT_ELIMINATOR)
+	RES(R79, RES_M(2))
+#endif
+	RES(R80, RES_K(1))
+	RES(R81, RES_M(1.5))
+	RES(R82, 470)
+	RES(R83, 470)
+	RES(R84, RES_K(2.2))
+	RES(R85, RES_K(2.2))
+	RES(R86, RES_K(2.2))
+	RES(R87, RES_K(2.2))
+	RES(R88, RES_K(2.2))
+	RES(R89, RES_K(2.2))
+	RES(R90, RES_K(15))
+	RES(R91, RES_M(1))
+	RES(R92, RES_K(22))
+	RES(R93, RES_M(1))
+	RES(R94, RES_K(10))
+	RES(R95, RES_K(10))
+	RES(R96, RES_K(22))
+	RES(R97, RES_K(39))
+	RES(R98, RES_K(82))
+	RES(R99, RES_K(10))
+	RES(R100, RES_K(10))
+	RES(R101, 910)
+	RES(R102, RES_K(6.8))
+	RES(R103, RES_K(9.1))  // RES_K(2.2))
+	RES(R104, RES_K(15))
+	RES(R105, RES_K(10))
+	RES(R106, RES_K(680))
+	RES(R107, RES_K(4.7))
+	RES(R108, RES_K(4.7))
+	RES(R109, RES_K(2.2))
+	RES(R110, RES_K(2.2))
+	RES(R111, RES_K(100))
+	RES(R112, RES_M(2.2))
+	RES(R113, RES_M(1))
+	RES(R114, RES_K(100))
+	RES(R115, RES_M(1))
+	RES(R116, RES_M(1))
+	RES(R117, RES_M(1))
+	RES(R118, RES_K(100))
+	RES(R119, RES_K(100))
+	RES(R120, RES_K(100))
+	RES(R121, RES_M(2.2))
+#if (SOUND_VARIANT == VARIANT_ELIMINATOR)
+	RES(R122, RES_K(220))
+#else // (SOUND_VARIANT == VARIANT_ZEKTOR)
+	RES(R122, RES_K(390))
+#endif
+	RES(R123, RES_K(100))
+	RES(R124, RES_M(2.2))
+	RES(R125, RES_K(100))
+	RES(R126, RES_K(10))
+	RES(R127, RES_K(22))
+	RES(R128, RES_K(39))
+	RES(R129, RES_K(82))
+	RES(R130, RES_K(22))
+	RES(R131, RES_K(1))
+#if (SOUND_VARIANT == VARIANT_ELIMINATOR)
+	RES(R132, RES_K(220))
+#else // (SOUND_VARIANT == VARIANT_ZEKTOR)
+	RES(R132, RES_K(100))
+#endif
+	RES(R133, 680)
+	RES(R134, RES_K(10))
+	RES(R135, RES_K(10))
+	RES(R136, RES_K(680))
+	RES(R137, RES_K(10))
+	RES(R138, RES_K(10))
+	RES(R139, RES_K(330))
+	RES(R140, RES_K(270))
+	RES(R141, RES_K(220))
+	RES(R142, RES_K(330))
+	RES(R143, RES_K(680))
+	RES(R144, RES_K(100))
+	RES(R145, RES_K(68))
+	RES(R146, RES_K(22))
+	RES(R147, RES_K(2.2))
+
+//  CAP(C1, CAP_U(4.7))     -- part of final amp (not emulated)
+//  CAP(C2, CAP_U(0.1))
+//  CAP(C3, CAP_U(0.1))
+//  CAP(C4, CAP_U(10))      -- part of final amp (not emulated)
+	CAP(C5, CAP_U(0.1))
+	CAP(C6, CAP_U(0.1))
+	CAP(C7, CAP_U(0.001))
+	CAP(C8, CAP_U(10))
+#if (SOUND_VARIANT == VARIANT_ELIMINATOR)
+	CAP(C9, CAP_U(0.01))
+#else // (SOUND_VARIANT == VARIANT_ZEKTOR)
+	CAP(C9, CAP_U(0.0047))
+#endif
+	CAP(C10, CAP_U(0.068))
+	CAP(C11, CAP_U(0.068))
+	CAP(C12, CAP_U(0.1))
+	CAP(C13, CAP_U(0.1))
+	CAP(C14, CAP_U(0.1))
+	CAP(C15, CAP_U(0.068))
+	CAP(C16, CAP_U(0.068))
+	CAP(C17, CAP_U(0.068))
+	CAP(C18, CAP_U(0.068))
+	CAP(C19, CAP_U(0.068))
+	CAP(C20, CAP_U(0.068))
+	CAP(C21, CAP_U(2.2))
+//  CAP(C22, CAP_U(0.1))
+//  CAP(C23, CAP_U(0.1))
+//  CAP(C24, CAP_U(0.1))
+//  CAP(C25, CAP_U(0.1))
+//  CAP(C26, CAP_U(0.1))
+//  CAP(C27, CAP_U(0.1))
+	CAP(C28, CAP_U(0.1))
+	CAP(C29, CAP_U(0.1))
+	CAP(C30, CAP_U(0.022))
+//  CAP(C31, CAP_U(0.1))
+//  CAP(C32, CAP_U(0.1))
+	CAP(C33, CAP_U(0.1))
+	CAP(C34, CAP_U(0.1))
+	CAP(C35, CAP_U(1))
+	CAP(C36, CAP_U(2.2))
+	CAP(C37, CAP_U(10))
+	CAP(C38, CAP_U(4.7))
+	CAP(C39, CAP_U(0.1))
+//  CAP(C40, CAP_U(0.1))
+//  CAP(C41, CAP_U(0.1))
+// C42??
+	CAP(C43, CAP_U(0.033))
+	CAP(C44, CAP_U(0.1))
+	CAP(C45, CAP_U(0.1))
+#if (SOUND_VARIANT == VARIANT_ELIMINATOR)
+	CAP(C46, CAP_U(0.022))
+#else // (SOUND_VARIANT == VARIANT_ZEKTOR)
+	CAP(C46, CAP_U(0.047))
+#endif
+	CAP(C47, CAP_U(0.047))
+	CAP(C48, CAP_U(0.05))
+	CAP(C49, CAP_U(0.1))
+	CAP(C50, CAP_U(0.05))
+	CAP(C51, CAP_U(0.05))
+	CAP(C52, CAP_U(0.05))
+	CAP(C53, CAP_U(0.1))
+	CAP(C54, CAP_U(0.1))
+	CAP(C55, CAP_U(0.1))
+	CAP(C56, CAP_U(33))
+	CAP(C57, CAP_U(0.1))
+	CAP(C58, CAP_U(0.1))
+	CAP(C59, CAP_U(0.1))
+	CAP(C60, CAP_U(0.001))
+	CAP(C61, CAP_U(0.068))
+//  CAP(C62, CAP_U(0.1))
+	CAP(C63, CAP_P(100))
+	CAP(C64, CAP_U(0.1))
+	CAP(C65, CAP_U(0.01))
+	CAP(C66, CAP_U(0.022))
+	CAP(C67, CAP_U(0.047))
+	CAP(C68, CAP_U(0.01))
+	CAP(C69, CAP_U(0.1))
+//  CAP(C70, CAP_U(0.1))
+//  CAP(C71, CAP_U(0.1))
+//  CAP(C72, CAP_U(0.1))
+//  CAP(C73, CAP_U(10))
+//  CAP(C74, CAP_U(0.1))
+	CAP(C75, CAP_U(0.1))
+	CAP(C76, CAP_U(0.1))
+	CAP(C77, CAP_U(0.1))
+
+	D_1N914(D1)
+	D_1N914(D2)
+	D_1N914(D3)
+	D_1N914(D4)
+	D_1N914(D5)
+	D_1N914(D6)
+	D_1N914(D7)
+	D_1N4002(D8)
+
+//  Q_2N4093(Q1)        -- part of final amp (not emulated)
+	Q_2N4403(Q2)
+	Q_2N4403(Q3)
+	Q_2N4403(Q4)
+	Q_2N4403(Q5)
+	Q_2N4403(Q6)
+	Q_2N4403(Q7)
+	Q_2N4403(Q8)
+	Q_2N4403(Q9)
+	Q_2N4403(Q10)
+	Q_2N4403(Q11)
+
+	TL081_DIP(U1)           // Op. Amp.
+	NET_C(U1.7, I_V12)
+	NET_C(U1.4, I_VM12)
+
+//  TL082_DIP(U2)           // Op. Amp. -- part of final amp (not emulated)
+//  NET_C(U2.8, I_V12)
+//  NET_C(U2.4, I_VM12)
+
+	TL081_DIP(U3)           // Op. Amp.
+	NET_C(U3.7, I_V12)
+	NET_C(U3.4, I_VM12)
+
+	MM5837_DIP(U4)          // Noise Generator
+#if (UNDERCLOCK_NOISE_GEN)
+	PARAM(U4.FREQ, 24000)
+#endif
+
+	LM555_DIP(U5)           // Timer
+
+	CA3080_DIP(U6)          // Op. Amp.
+	NET_C(U6.4, I_VM12)
+	NET_C(U6.7, I_V12)
+
+	CA3080_DIP(U7)          // Op. Amp.
+	NET_C(U7.4, I_VM12)
+	NET_C(U7.7, I_V12)
+
+	CA3080_DIP(U8)          // Op. Amp.
+	NET_C(U8.4, I_VM12)
+	NET_C(U8.7, I_V12)
+
+	CA3080_DIP(U9)          // Op. Amp.
+	NET_C(U9.4, I_VM12)
+	NET_C(U9.7, I_V12)
+
+	CA3080_DIP(U10)         // Op. Amp.
+	NET_C(U10.4, I_VM12)
+	NET_C(U10.7, I_V12)
+
+	CA3080_DIP(U11)         // Op. Amp.
+	NET_C(U11.4, I_VM12)
+	NET_C(U11.7, I_V12)
+
+	TL081_DIP(U12)          // Op. Amp.
+	NET_C(U12.7, I_V12)
+	NET_C(U12.4, I_VM12)
+
+	LM555_DIP(U13)          // Timer
+
+	CA3080_DIP(U14)         // Op. Amp.
+	NET_C(U14.4, I_VM12)
+	NET_C(U14.7, I_V12)
+
+	CA3080_DIP(U15)         // Op. Amp.
+	NET_C(U15.4, I_VM12)
+	NET_C(U15.7, I_V12)
+
+	TL082_DIP(U16)          // Op. Amp.
+	NET_C(U16.8, I_V12)
+	NET_C(U16.4, I_VM12)
+
+	CD4011_DIP(U17)         // Quad 2-Input NAND Gates
+	NET_C(U17.7, GND)
+	NET_C(U17.14, I_V12)
+
+	CD4011_DIP(U18)         // Quad 2-Input NAND Gates
+	NET_C(U18.7, GND)
+	NET_C(U18.14, I_V12)
+
+	CD4011_DIP(U19)         // Quad 2-Input NAND Gates
+	NET_C(U19.7, GND)
+	NET_C(U19.14, I_V12)
+
+	TL082_DIP(U20)          // Op. Amp.
+	NET_C(U20.8, I_V12)
+	NET_C(U20.4, I_VM12)
+
+	CD4024_DIP(U21)         // 7-Stage Ripple Binary Counter
+	NET_C(U21.7, GND)
+	NET_C(U21.14, I_V12)
+
+	CD4011_DIP(U22)         // Quad 2-Input NAND Gates
+	NET_C(U22.7, GND)
+	NET_C(U22.14, I_V12)
+
+	CD4024_DIP(U23)         // 7-Stage Ripple Binary Counter
+	NET_C(U23.7, GND)
+	NET_C(U23.14, I_V12)
+
+	TTL_7406_DIP(U24)       // Hex inverter -- currently using a clone of 7416, no open collector behavior
+	NET_C(U24.7, GND)
+	NET_C(U24.14, I_V5)
+
+#if (!HLE_BACKGROUND_VCO)
+	LM566_DIP(U25)          // Voltage-Controlled Oscillator
+#endif
+
+	TTL_74LS00_DIP(U26)     // Quad 4-Input NAND Gate
+	NET_C(U26.7, GND)
+	NET_C(U26.14, I_V5)
+
+	TTL_7407_DIP(U27)       // Hex Buffers with High Votage Open-Collector Outputs
+	NET_C(U27.7, GND)
+	NET_C(U27.14, I_V5)
+
+	TTL_7407_DIP(U28)       // Hex Buffers with High Votage Open-Collector Outputs
+	NET_C(U28.7, GND)
+	NET_C(U28.14, I_V5)
+
+	TL081_DIP(U29)          // Op. Amp.
+	NET_C(U29.7, I_V12)
+	NET_C(U29.4, I_VM12)
+
+//  AY_3_8912_DIP(U30)      // PSG -- emulated by MAME
+
+	CD4069_DIP(U31)         // Hex Inverter
+	NET_C(U31.7, GND)
+	NET_C(U31.14, I_V12)
+
+	CD4069_DIP(U32)         // Hex Inverter
+	NET_C(U32.7, GND)
+	NET_C(U32.14, I_V12)
+
+//  TTL_74LS125_DIP(U33)    // Quad 3-state buffer
+//  NET_C(U33.7, GND)
+//  NET_C(U33.14, I_V5)
+
+//  TTL_74LS374_DIP(U34)    // Octal D-Type Transparent Latches And Edge-Triggered Flip-Flop
+//  NET_C(U34.10, GND)
+//  NET_C(U34.20, I_V5)
+//
+//  TTL_74LS374_DIP(U35)    // Octal D-Type Transparent Latches And Edge-Triggered Flip-Flop
+//  NET_C(U34.10, GND)
+//  NET_C(U34.20, I_V5)
+
+//  TTL_74LS74_DIP(U36)     // Dual D Flip Flop
+//  NET_C(U36.7, GND)
+//  NET_C(U36.14, I_V5)
+
+//  TTL_74LS10_DIP(U37)     // Triple 3-Input NAND Gate
+//  NET_C(U37.7, GND)
+//  NET_C(U37.14, I_V5)
+
+//  TTL_74LS14_DIP(U38)
+//  NET_C(U38.7, GND)
+//  NET_C(U38.14, I_V5)
+
+//  TTL_74LS08_DIP(U39)     // Quad 2-Input AND Gates
+//  NET_C(U39.7, GND)
+//  NET_C(U39.14, I_V5)
+
+//  TTL_74LS30_DIP(U40)     // 8-Input NAND Gate
+//  NET_C(U40.7, GND)
+//  NET_C(U40.14, I_V5)
+
+//  TTL_74LS14_DIP(U41)
+//  NET_C(U41.7, GND)
+//  NET_C(U41.14, I_V5)
+
+	//
+	// Sheet 7, top-left/middle (Thrust)
+	//
+
+	NET_C(R58.1, GND)
+	NET_C(R58.2, U12.3, U10.6, U11.6, U15.6)
+	ALIAS(SUM_VCA, R58.2)
+	NET_C(U12.2, R75.1, R76.2)
+	NET_C(R76.1, GND)
+	NET_C(R75.2, U12.6)
+	ALIAS(BUFFER, U12.6)
+
+	NET_C(I_V12, U4.4, C75.2)
+	NET_C(C75.1, GND)
+	NET_C(U4.1, GND)
+	NET_C(U4.2, I_VM12, C76.2)
+	NET_C(C76.1, GND)
+	NET_C(U4.3, C77.1)
+	NET_C(C77.2, R27.2, U3.3)
+	NET_C(R27.1, GND)
+	NET_C(U3.2, U3.6, R28.1, R32.1)
+	ALIAS(WBN, U3.6)
+
+	NET_C(R28.2, C17.2, R29.1)
+	NET_C(C17.1, GND)
+	NET_C(R29.2, C18.2, R30.1)
+	NET_C(C18.1, GND)
+	NET_C(R30.2, R31.2, U10.2)
+	NET_C(R31.1, GND)
+	NET_C(U10.3, R56.2)
+	NET_C(R56.1, GND)
+
+	NET_C(I_THRUST_LOW, U24.5)
+	NET_C(U24.6, R99.1, R70.1)
+	NET_C(R99.2, I_V12)
+	NET_C(R70.2, R71.2, Q4.E)
+	NET_C(I_THRUST_HI, U24.3)
+	NET_C(U24.4, R100.1, R71.1)
+	NET_C(R100.2, I_V12)
+	NET_C(Q4.B, GND)
+	NET_C(Q4.C, R69.1)
+	NET_C(R69.2, U10.5)
+
+	NET_C(R32.2, C19.2, R33.1)
+	NET_C(C19.1, GND)
+	NET_C(R33.2, C20.2, R34.1)
+	NET_C(C20.1, GND)
+	NET_C(R34.2, R35.2, U11.2)
+	NET_C(R35.1, GND)
+	NET_C(U11.3, R57.2)
+	NET_C(R57.1, GND)
+
+	NET_C(I_THRUST_LSB, U24.1)
+	NET_C(U24.2, R77.1, R73.1)
+	NET_C(R77.2, I_V12)
+	NET_C(R73.2, R74.2, Q5.E)
+	NET_C(I_THRUST_MSB, U24.13)
+	NET_C(U24.12, R78.1, R74.1)
+	NET_C(R78.2, I_V12)
+	NET_C(Q5.B, GND)
+	NET_C(Q5.C, R72.1)
+	NET_C(R72.2, U11.5)
+
+	//
+	// Sheet 7, top-right (Skitter)
+	//
+
+	NET_C(I_SKITTER, U24.9)
+	NET_C(U24.8, R25.2, D1.K, R17.1)
+	NET_C(R17.2, I_V12)
+	NET_C(D1.A, C21.1, R26.2, R25.1, Q3.B)
+	NET_C(C21.2, GND)
+	NET_C(R26.1, GND)
+	NET_C(Q3.C, GND, Q2.C)
+	NET_C(Q3.E, R23.1)
+	NET_C(R23.2, R22.2)
+	NET_C(R22.1, Q2.E)
+
+#if (HLE_SKITTER_VCO)
+	//
+	// U1 is basically a standalone oscillator. Simulation at high
+	// frequency puts it at around 45Hz. Samples from real machines
+	// show it to be about 35Hz.
+	//
+	CLOCK(SKITTERCLK, 45)
+	NET_C(SKITTERCLK.GND, GND)
+	NET_C(SKITTERCLK.VCC, I_V12)
+	AFUNC(SKITTERENV, 1, "if(A0<6,2,18)")
+	NET_C(SKITTERENV.A0, SKITTERCLK.Q)
+	NET_C(SKITTERENV.Q, Q2.B)
+	NET_C(GND, C5.1, C5.2, C47.1, C47.2, R14.1, R14.2, R15.1, R15.2, R16.1, R16.2, R19.1, R19.2, U1.2, U1.3)
+#else
+	NET_C(Q2.B, R19.1)
+	NET_C(R19.2, C5.1)
+	NET_C(C5.2, C47.2, U1.2, R16.1)
+	NET_C(C47.1, GND)
+	NET_C(U1.3, R15.1, R14.2)
+	NET_C(R14.1, GND)
+	NET_C(R15.2, U1.6, R16.2)
+#endif
+
+	NET_C(C9.2, R21.1)
+	NET_C(C9.1, GND)
+	NET_C(R21.2, R18.1)
+	NET_C(R18.2, I_V12)
+	NET_C(I_V12, C8.1)
+	NET_C(C8.2, GND)
+	NET_C(U5.7, R18.1)
+	NET_C(U5.5, R23.2)
+	NET_C(U5.4, U24.8)
+	NET_C(U5.2, U5.6, R21.1)
+	NET_C(U5.8, I_V12)
+	NET_C(U5.1, GND)
+	NET_C(U5.3, R20.1)
+	NET_C(R20.2, C7.2, C6.1)
+	NET_C(C7.1, GND)
+	ALIAS(SKITTER, C6.2)
+
+	//
+	// Sheet 7, middle-right (Enemy Ship)
+	//
+
+	NET_C(I_ENEMY_SHIP, U24.11)
+	NET_C(U24.10, R60.1, U13.4)
+	NET_C(R60.2, I_V12)
+	NET_C(U13.7, R59.1, R61.2)
+	NET_C(R59.2, I_V12)
+	NET_C(R61.1, U13.2, U13.6, C30.2)
+	NET_C(C30.1, GND)
+	NET_C(U13.5, R145.1, R144.1)
+	ALIAS(_10HZ, R144.2)
+	NET_C(U13.1, GND)
+	NET_C(U13.8, I_V12, C29.2)
+	NET_C(C29.1, GND)
+	NET_C(U13.3, C28.1)
+	ALIAS(ENEMY_SHIP, C28.2)
+
+	ALIAS(_100HZ, R135.1)
+	NET_C(R145.2, R135.1)
+	ALIAS(_50HZ, R134.1)
+	ALIAS(_200HZA, R137.1)
+	ALIAS(_200HZB, R138.1)
+	NET_C(R138.2, R137.2, R134.2, R135.2, C61.2, R136.1)
+	NET_C(C61.1, GND)
+	NET_C(R136.2, Q11.E, U27.6)
+	NET_C(U27.5, U26.8)
+	NET_C(Q11.B, GND)
+	NET_C(Q11.C, R131.1)
+	NET_C(R131.2, U15.5)
+	NET_C(U15.2, R106.2, R83.2)
+	NET_C(R83.1, GND)
+	NET_C(U15.3, R82.2)
+	NET_C(R82.1, GND)
+
+	//
+	// Sheet 7, bottom-right (Background)
+	//
+
+	NET_C(I_BACKGROUND_LSB, U27.1, U26.10)
+	NET_C(U27.2, R107.1, R108.1)
+	NET_C(R107.2, I_V12)
+	NET_C(R108.2, R101.1, U16.6, R109.2)
+	NET_C(I_BACKGROUND_MSB, U27.3, U26.9)
+	NET_C(U27.4, R110.1, R109.1)
+	NET_C(R110.2, I_V12)
+	NET_C(U16.5, GND)
+	NET_C(U16.7, R101.2, R104.1)
+	NET_C(R104.2, U16.2, R105.1, C56.2)
+	NET_C(U16.3, R102.2, R103.1)
+	NET_C(R103.2, I_V12)
+	NET_C(R102.1, GND)
+	NET_C(U16.1, R105.2, C56.1, C60.1)
+	NET_C(C60.2, R130.1)
+	NET_C(R130.2, D8.K, C59.1)
+	NET_C(D8.A, I_V12)
+	NET_C(C59.2, GND)
+
+#if (HLE_BACKGROUND_VCO)
+	//
+	//    R2 = 0.96310: HP = (0.000237231*A0) - 0.000561399
+	//    R2 = 0.99617: HP = (0.0000527091*A0*A0) - (0.000501828*A0) + 0.00197538
+	//    R2 = 0.99867: HP = (0.0000174335*A0*A0*A0) - (0.000309878*A0*A0) + (0.00198163*A0) - 0.00362162
+	//    R2 = 0.99898: HP = (0.00000748879*A0*A0*A0*A0) - (0.000189174*A0*A0*A0) + (0.00180942*A0*A0) - (0.00759439*A0) + 0.0124560
+	//    R2 = 0.99899: HP = (0.00000135301*A0*A0*A0*A0*A0) - (0.0000390321*A0*A0*A0*A0) + (0.000446417*A0*A0*A0) - (0.00250299*A0*A0) + (0.00693360*A0) - 0.00698302
+	//
+	VARCLOCK(BGCLK, 1, "max(0.000001,min(0.1,(0.00000748879*A0*A0*A0*A0) - (0.000189174*A0*A0*A0) + (0.00180942*A0*A0) - (0.00759439*A0) + 0.0124560))")
+	NET_C(BGCLK.GND, GND)
+	NET_C(BGCLK.VCC, I_V5)
+	NET_C(BGCLK.A0, U16.1)
+	NET_C(BGCLK.Q, BGENV.A0)
+	NET_C(GND, C57.1, C57.2, C58.1, C58.2)
+	AFUNC(BGENV, 1, "if(A0>2.5,2.5,-2.5)")
+	NET_C(BGENV.Q, R106.1)
+#else
+	NET_C(U16.1, U25.5)
+	NET_C(C60.2, U25.6)
+	NET_C(R130.2, U25.8)
+	NET_C(U25.7, C58.2)
+	NET_C(C58.1, GND)
+	NET_C(U25.1, GND)
+	NET_C(U25.3, C57.1)
+	NET_C(C57.2, R106.1)
+#endif
+
+	//
+	// Sheet 7, PSG input
+	//
+
+	NET_C(R_PSG_1.2, R_PSG_2.2, R_PSG_3.2, R133.2, C64.1)
+	NET_C(R133.1, GND)
+	NET_C(C64.2, R132.1)
+	NET_C(R132.2, U29.2, R122.1, C63.1)
+	NET_C(U29.3, GND)
+	NET_C(C63.2, R122.2, U29.6)
+	ALIAS(PSG, U29.6)
+
+	//
+	// Sheet 8, oscillators
+	//
+	// Pairs of CD4069 are used together with resistors and capacitors
+	// to create oscillators. The formula for the frequency is
+	// 1/(1.39*R*C). The following are simulated here:
+	//
+	// _200HZA: R142=330K, C68=0.01uF,  Freq=218.01Hz
+	// _200HZB: R139=330K, C65=0.01uF,  Freq=218.01Hz
+	//   _10HZ: R143=680K, C69=0.1uF,   Freq=10.58Hz
+	//   _50HZ: R141=220K, C67=0.047uF, Freq=69.58Hz
+	//  _100HZ: R140=270K, C66=0.022uF, Freq=121.12Hz
+	//
+
+	CLOCK(_200HZACLK, 218.01)
+	NET_C(_200HZACLK.VCC, I_V12)
+	NET_C(_200HZACLK.GND, GND)
+	NET_C(_200HZA, _200HZACLK.Q)
+	NET_C(R142.1, R142.2, C68.1, C68.2, U32.5, U32.9, GND)
+	HINT(U32.6, NC)
+	HINT(U32.8, NC)
+
+	CLOCK(_200HZBCLK, 217.98)   // tweak frequency so this is out of phase
+	NET_C(_200HZBCLK.VCC, I_V12)
+	NET_C(_200HZBCLK.GND, GND)
+	NET_C(_200HZB, _200HZBCLK.Q)
+	NET_C(R139.1, R139.2, C65.1, C65.2, U32.13, U32.11, GND)
+	HINT(U32.12, NC)
+	HINT(U32.10, NC)
+
+	CLOCK(_10HZCLK, 10.58)
+	NET_C(_10HZCLK.VCC, I_V12)
+	NET_C(_10HZCLK.GND, GND)
+	NET_C(_10HZ, _10HZCLK.Q)
+	NET_C(R143.1, R143.2, C69.1, C69.2, U32.1, U32.3, GND)
+	HINT(U32.2, NC)
+	HINT(U32.4, NC)
+
+	CLOCK(_50HZCLK, 69.58)
+	NET_C(_50HZCLK.VCC, I_V12)
+	NET_C(_50HZCLK.GND, GND)
+	NET_C(_50HZ, _50HZCLK.Q)
+	NET_C(R141.1, R141.2, C67.1, C67.2, U31.1, U31.3, GND)
+	HINT(U31.2, NC)
+	HINT(U31.4, NC)
+
+	// Note this oscillator is on Sheet 7, in the right-middle section
+	CLOCK(_100HZCLK, 121.12)
+	NET_C(_100HZCLK.VCC, I_V12)
+	NET_C(_100HZCLK.GND, GND)
+	NET_C(_100HZ, _100HZCLK.Q)
+	NET_C(R140.1, R140.2, C66.1, C66.2, U31.5, U31.9, GND)
+	HINT(U31.6, NC)
+	HINT(U31.8, NC)
+
+	//
+	// Sheet 8, top middle (Explosion 1)
+	//
+
+	NET_C(WBN, R44.1)
+	NET_C(R44.2, C13.2, R45.1)
+	NET_C(C13.1, GND)
+	NET_C(R45.2, C14.2, R46.1)
+	NET_C(C14.1, GND)
+	NET_C(R46.2, R47.2, U8.2)
+	NET_C(R47.1, GND)
+	NET_C(U8.3, R54.2)
+	NET_C(R54.1, GND)
+	NET_C(U8.6, SUM_VCA)
+
+	NET_C(I_EXPLOSION_1, U28.11)
+	NET_C(U28.10, R120.1, U19.6)
+	NET_C(R120.2, I_V12)
+	NET_C(U19.5, R116.1, C51.1)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_EXPLOSION_1)
+	NET_C(D_EXPLOSION_1.A, U19.5)
+	NET_C(D_EXPLOSION_1.K, I_V12)
+#endif
+	NET_C(R116.2, I_V12)
+	NET_C(C51.2, U19.3)
+	NET_C(U19.4, U19.1, U19.2, R87.1)
+	NET_C(R87.2, Q9.E)
+	NET_C(Q9.B, GND)
+	NET_C(Q9.C, C37.1, R66.1)
+	NET_C(C37.2, I_VM12)
+	NET_C(R66.2, U8.5)
+
+	//
+	// Sheet 8, top right (Explosion 2)
+	//
+
+	NET_C(WBN, R48.1)
+	NET_C(R48.2, C15.2, R49.1)
+	NET_C(C15.1, GND)
+	NET_C(R49.2, C16.2, R50.1)
+	NET_C(C16.1, GND)
+	NET_C(R50.2, R51.2, U9.2)
+	NET_C(R51.1, GND)
+	NET_C(U9.3, R55.2)
+	NET_C(R55.1, GND)
+	NET_C(U9.6, SUM_VCA)
+
+	NET_C(I_EXPLOSION_2, U28.9)
+	NET_C(U28.8, R119.1, U19.8)
+	NET_C(R119.2, I_V12)
+	NET_C(U19.9, R117.1, C52.1)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_EXPLOSION_2)
+	NET_C(D_EXPLOSION_2.A, U19.9)
+	NET_C(D_EXPLOSION_2.K, I_V12)
+#endif
+	NET_C(R117.2, I_V12)
+	NET_C(C52.2, U19.11)
+	NET_C(U19.10, U19.12, U19.13, R88.1)
+	NET_C(R88.2, Q10.E)
+	NET_C(Q10.B, GND)
+	NET_C(Q10.C, C38.1, R68.1)
+	NET_C(C38.2, I_VM12)
+	NET_C(R68.2, U9.5)
+
+	//
+	// Sheet 8, bottom left (Explosion 3)
+
+	NET_C(WBN, R37.1)
+	NET_C(R37.2, C10.2, R38.1)
+	NET_C(C10.1, GND)
+	NET_C(R38.2, C11.2, R39.1)
+	NET_C(C11.1, GND)
+	NET_C(R39.2, R40.2, U6.2)
+	NET_C(R40.1, GND)
+	NET_C(U6.3, R52.2)
+	NET_C(R52.1, GND)
+	NET_C(U6.6, SUM_VCA)
+
+	NET_C(I_EXPLOSION_3, U28.5)
+	NET_C(U28.6, R118.1, U18.8)
+	NET_C(R118.2, I_V12)
+	NET_C(U18.9, R115.1, C50.1)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_EXPLOSION_3)
+	NET_C(D_EXPLOSION_3.A, U18.9)
+	NET_C(D_EXPLOSION_3.K, I_V12)
+#endif
+	NET_C(R115.2, I_V12)
+	NET_C(C50.2, U18.11)
+	NET_C(U18.10, U18.12, U18.13, R86.1)
+	NET_C(R86.2, Q8.E)
+	NET_C(Q8.B, GND)
+	NET_C(Q8.C, C36.1, R62.1)
+	NET_C(C36.2, I_VM12)
+	NET_C(R62.2, U6.5)
+
+	//
+	// Sheet 8, bottom left (Fireball)
+	//
+
+	NET_C(WBN, R41.1)
+	NET_C(R41.2, R43.2, U7.2, R42.2)
+	NET_C(R43.1, GND)
+	NET_C(R42.1, C12.2)
+	NET_C(C12.1, _50HZ)
+	NET_C(U7.3, R53.2)
+	NET_C(R53.1, GND)
+	NET_C(U7.6, SUM_VCA)
+
+	NET_C(I_FIREBALL, U28.13)
+	NET_C(U28.12, R111.1, U18.6)
+	NET_C(R111.2, I_V12)
+	NET_C(U18.5, R112.1, C49.1)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_FIREBALL)
+	NET_C(D_FIREBALL.A, U18.5)
+	NET_C(D_FIREBALL.K, I_V12)
+#endif
+	NET_C(R112.2, I_V12)
+	NET_C(C49.2, U18.3)
+	NET_C(U18.4, U18.1, U18.2, R85.1)
+	NET_C(R85.2, Q7.E)
+	NET_C(Q7.B, GND)
+	NET_C(Q7.C, R67.1)
+	NET_C(R67.2, C35.1, R64.1)
+	NET_C(C35.2, I_VM12)
+	NET_C(R64.2, U7.5)
+
+	//
+	// Sheet 8, bottom-ish middle (Bounce)
+	//
+
+	NET_C(_50HZ, C45.1)
+	NET_C(C45.2, R81.1)
+	NET_C(R81.2, R80.2, U14.2)
+#if (SOUND_VARIANT == VARIANT_ELIMINATOR)
+	NET_C(WBN, R79.1)
+	NET_C(R79.2, R80.2)
+#endif
+	NET_C(R80.1, GND)
+	NET_C(U14.3, R63.2)
+	NET_C(R63.1, GND)
+	NET_C(U14.6, SUM_VCA)
+
+	NET_C(I_BOUNCE, U28.3)
+	NET_C(U28.4, R114.1, U17.8)
+	NET_C(R114.2, I_V12)
+	NET_C(U17.9, R113.1, C48.1)
+	NET_C(R113.2, I_V12)
+	NET_C(C48.2, U17.11)
+	NET_C(U17.10, U17.13, U17.12, R84.1)
+	NET_C(R84.2, Q6.E)
+	NET_C(Q6.B, GND)
+	NET_C(Q6.C, C34.1, C33.1, R65.1)
+	NET_C(C33.2, C34.2, I_VM12)
+	NET_C(R65.2, U14.5)
+
+	//
+	// Sheet 8, bottom middle (Torpedo 1)
+	//
+
+	NET_C(I_TORPEDO_1, U27.9)
+	NET_C(U27.8, R125.1, U22.8)
+	NET_C(R125.2, I_V12)
+	NET_C(U22.9, R124.1, C55.1)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_TORPEDO_1)
+	NET_C(D_TORPEDO_1.A, U22.9)
+	NET_C(D_TORPEDO_1.K, I_V12)
+#endif
+	NET_C(R124.2, I_V12)
+	NET_C(C55.2, U22.11, U23.2)
+	NET_C(U22.10, U22.12, U22.13, D4.K)
+	NET_C(D4.A, R89.1)
+	NET_C(R89.2, C39.2, D2.K)
+	NET_C(C39.1, GND)
+
+#if (HLE_TORPEDO1_VCO)
+	//
+	//    R2 = 0.99044: HP = (0.000104804*A0) - 0.00000213808
+	//    R2 = 0.99913: HP = (0.0000155103*A0*A0) + (0.0000595259*A0) + 0.0000223086
+	//    R2 = 0.99930: HP = (0.00000342725*A0*A0*A0) + (0.000000183693*A0*A0) + (0.000079091*A0) + 0.0000157375
+	//    R2 = 0.99930: HP = (-0.000000204983*A0*A0*A0*A0) + (0.00000466123*A0*A0*A0) - (0.00000232484*A0*A0) + (0.000081060*A0) + 0.0000152562
+	//    R2 = 0.99931: HP = (-0.00000210641*A0*A0*A0*A0*A0) + (0.0000157326*A0*A0*A0*A0) - (0.0000399041*A0*A0*A0) + (0.0000541020*A0*A0) + (0.0000495068*A0) + 0.0000213321
+	//
+	VARCLOCK(TORP1CLK, 1, "max(0.000001,min(0.1,(0.00000342725*A0*A0*A0) + (0.000000183693*A0*A0) + (0.000079091*A0) + 0.0000157375))")
+	NET_C(TORP1CLK.GND, GND)
+	NET_C(TORP1CLK.VCC, I_V5)
+	NET_C(TORP1CLK.A0, D2.K)
+	NET_C(TORP1CLK.Q, T1ENV.A0)
+	AFUNC(T1ENV, 1, "if(A0>2.5,11.1,-11.1)")
+	NET_C(T1ENV.Q, U23.1)
+	NET_C(D2.A, D3.K, R91.1)
+	NET_C(C46.2, R90.1)
+	NET_C(R90.2, R91.2, R146.1)
+	NET_C(GND, U20.3, U20.2)
+#else
+	NET_C(D2.A, D3.K, R91.1, U20.3)
+	NET_C(U20.2, C46.2, R90.1)
+	NET_C(R90.2, U20.1, R91.2, R146.1)
+#endif
+	NET_C(D3.A, GND)
+	NET_C(C46.1, GND)
+	NET_C(R146.2, U23.1)
+
+	NET_C(U23.12, R129.1)
+	NET_C(U23.11, R128.1)
+	NET_C(U23.9, R126.1)
+	NET_C(U23.6, R127.1)
+	NET_C(R127.2, R126.2, R128.2, R129.2, C44.1)
+
+	//
+	// Sheet 8, middle (Torpedo 2)
+	//
+
+	NET_C(WBN, R36.1)
+#if (DISABLE_TORPEDO2_NOISE)
+	NET_C(R36.2, GND)   // noise source
+#else
+	NET_C(R36.2, D6.A)  // noise source
+#endif
+
+#if (HLE_TORPEDO2_VCO)
+	//
+	//    R2 = 0.98868: HP = (0.000142472*A0) - 0.0000121481
+	//    R2 = 0.99851: HP = (0.0000304790*A0*A0) + (0.000072730*A0) + 0.0000185913
+	//    R2 = 0.99875: HP = (0.0000104419*A0*A0*A0) - (0.00000603211*A0*A0) + (0.000109865*A0) + 0.0000082421
+	//    R2 = 0.99875: HP = (0.000000506238*A0*A0*A0*A0) + (0.0000080617*A0*A0*A0) - (0.00000220640*A0*A0) + (0.000107441*A0) + 0.0000087378
+	//    R2 = 0.99876: HP = (-0.0000095532*A0*A0*A0*A0*A0) + (0.0000569271*A0*A0*A0*A0) - (0.000116200*A0*A0*A0) + (0.000123414*A0*A0) + (0.0000501789*A0) + 0.0000180007
+	//
+	VARCLOCK(TORP2CLK, 1, "max(0.000001,min(0.1,(0.0000104419*A0*A0*A0) - (0.00000603211*A0*A0) + (0.000109865*A0) + 0.0000082421))")
+	NET_C(TORP2CLK.GND, GND)
+	NET_C(TORP2CLK.VCC, I_V5)
+	NET_C(TORP2CLK.A0, D6.K)
+	NET_C(TORP2CLK.Q, T2ENV.A0)
+	AFUNC(T2ENV, 1, "if(A0>2.5,11.1,-11.1)")
+	NET_C(T2ENV.Q, U21.1)
+	NET_C(D6.A, D7.K, R93.1)
+	NET_C(C43.2, R94.1)
+	NET_C(R94.2, R93.2, R92.2)
+	NET_C(GND, U20.6, U20.5)
+#else
+	NET_C(D6.A, U20.5, D7.K, R93.1)
+	NET_C(U20.6, C43.2, R94.1)
+	NET_C(R94.2, U20.7, R93.2, R92.2)
+#endif
+
+	NET_C(D7.A, GND)
+	NET_C(D6.K, C53.2, R147.2)
+	NET_C(C53.1, GND)
+	NET_C(R147.1, D5.A)
+	NET_C(U22.4, U22.1, U22.2, D5.K)
+	NET_C(C43.1, GND)
+	NET_C(R92.1, U21.1)
+
+	NET_C(I_TORPEDO_2, U27.11)
+	NET_C(U27.10, R123.1, U22.6)
+	NET_C(R123.2, I_V12)
+	NET_C(U22.5, R121.1, C54.1)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_TORPEDO_2)
+	NET_C(D_TORPEDO_2.A, U22.5)
+	NET_C(D_TORPEDO_2.K, I_V12)
+#endif
+	NET_C(R121.2, I_V12)
+	NET_C(C54.2, U22.3, U21.2)
+	NET_C(U21.12, R98.1)
+	NET_C(U21.11, R97.1)
+	NET_C(U21.9, R95.1)
+	NET_C(U21.6, R96.1)
+	NET_C(R98.2, R97.2, R95.2, R96.2, C44.1)
+
+	//
+	// Sheet 8, middle right (Final sum)
+	//
+
+	NET_C(PSG, R10.1)
+	NET_C(ENEMY_SHIP, R7.1)
+	NET_C(SKITTER, R6.1)
+	NET_C(BUFFER, R8.1)
+	NET_C(C44.2, R9.1)
+	NET_C(R10.2, R7.2, R6.2, R8.2, R9.2)
+	ALIAS(OUTPUT, R9.2)
+
+	//
+	// Unconnected inputs
+	//
+
+	NET_C(GND, U17.1, U17.2, U17.5, U17.6)
+	NET_C(GND, U26.1, U26.2, U26.4, U26.5, U26.12, U26.13)
+	NET_C(GND, U27.13, U28.1)
+	NET_C(GND, U31.11, U31.13)
+
+	//
+	// Unconnected outputs
+	//
+
+
+#if (ENABLE_FRONTIERS)
+#define RXX 384
+	OPTIMIZE_FRONTIER(R10.1, RES_K(10), RXX)
+	OPTIMIZE_FRONTIER(R7.1, RES_K(220), RXX)
+	OPTIMIZE_FRONTIER(R6.1, RES_K(220), RXX)
+	OPTIMIZE_FRONTIER(R8.1, RES_K(10), RXX)
+#endif
+
+NETLIST_END()
+
+#endif
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_elim.h mame-0.224+dfsg.1/src/mame/audio/nl_elim.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_elim.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_elim.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_ELIM_H
+#define MAME_AUDIO_NL_ELIM_H
+
+#pragma once
+
+NETLIST_EXTERNAL(elim)
+NETLIST_EXTERNAL(zektor)
+
+#endif // MAME_AUDIO_NL_ELIM_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_fireone.cpp mame-0.224+dfsg.1/src/mame/audio/nl_fireone.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_fireone.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_fireone.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,690 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//
+// Netlist for Fire One
+//
+// Derived from the schematics in the manual.
+//
+// Known problems/issues:
+//
+//    * Slow!
+//
+
+#include "netlist/devices/net_lib.h"
+
+//
+// 556 is just two 555s in one package
+//
+
+static NETLIST_START(NE556_DIP)
+	NE555(A)
+	NE555(B)
+
+	NET_C(A.GND, B.GND)
+	NET_C(A.VCC, B.VCC)
+
+	DIPPINS(      /*        +--------------+        */
+		 A.DISCH, /* 1DISCH |1     ++    14| VCC    */ A.VCC,
+		A.THRESH, /* 1THRES |2           13| 2DISCH */ B.DISCH,
+		  A.CONT, /*  1CONT |3           12| 2THRES */ B.THRESH,
+		 A.RESET, /* 1RESET |4   NE556   11| 2CONT  */ B.CONT,
+		   A.OUT, /*   1OUT |5           10| 2RESET */ B.RESET,
+		  A.TRIG, /*  1TRIG |6            9| 2OUT   */ B.OUT,
+		   A.GND, /*    GND |7            8| 2TRIG  */ B.TRIG
+				  /*        +--------------+        */
+	)
+NETLIST_END()
+
+
+//
+// ICL8038 is broadly similar to a 566 VCO, and can be simulated partially as such.
+//
+
+static NETLIST_START(ICL8038_DIP)
+	VCVS(VI, 1)
+	CCCS(CI1, -1)
+	CCCS(CI2, 2)
+	SYS_COMPD(COMP)
+	SYS_DSW2(SW)
+	VCVS(VO, 1)
+	RES(R_SHUNT, RES_R(50))
+
+	PARAM(VO.RO, 50)
+	PARAM(COMP.MODEL, "FAMILY(TYPE=CUSTOM IVL=0.16 IVH=0.4 OVL=0.01 OVH=0.01 ORL=50 ORH=50)")
+	PARAM(SW.GOFF, 0) // This has to be zero to block current sources
+
+	NET_C(VI.OP, CI1.IN, CI2.IN)
+	NET_C(CI1.OP, VO.IP)
+	NET_C(COMP.Q, SW.I)
+	NET_C(CI2.OP, SW.2)
+	NET_C(COMP.VCC, R_SHUNT.1)
+	NET_C(SW.1, R_SHUNT.2)
+	NET_C(SW.3, VO.IP)
+	NET_C(VO.OP, COMP.IN)
+
+	// Avoid singular Matrix due to G=0 switch
+	RES(RX1, 1e10)
+	RES(RX2, 1e10)
+	NET_C(RX1.1, SW.1)
+	NET_C(RX2.1, SW.3)
+
+	NET_C(COMP.GND, RX1.2, RX2.2)
+
+	RES(R1, 5000)
+	RES(R2, 5000)
+	RES(R3, 5000)
+
+	// Square output wave
+	VCVS(V_SQR, 1)
+	NET_C(COMP.Q, V_SQR.IP)
+
+	NET_C(COMP.GND, SW.GND, VI.ON, VI.IN, CI1.ON, CI2.ON, VO.IN, VO.ON, R2.2, V_SQR.IN, V_SQR.ON)
+	NET_C(COMP.VCC, SW.VCC, R1.2)
+	NET_C(COMP.IP, R1.1, R2.1, R3.1)
+	NET_C(COMP.Q, R3.2)
+
+	ALIAS(11, VI.ON) // GND
+	ALIAS(9, V_SQR.OP) // Square out
+	ALIAS(3, VO.OP) // Triag out
+	ALIAS(8, VI.IP) // VC
+	ALIAS(4, CI1.IP) // R1
+	ALIAS(5, CI2.IP) // R2
+	ALIAS(10, VO.IP) // C1
+	ALIAS(6, COMP.VCC) // V+
+NETLIST_END()
+
+//
+// Main netlist
+//
+
+NETLIST_START(fireone)
+	NET_MODEL("2N3704 NPN(IS=26.03f VAF=90.7 Bf=736.1K IKF=.1983 XTB=1.5 BR=1.024 CJC=11.01p CJE=24.07p RB=10 RC=.5 RE=.5 TR=233.8n TF=1.03n ITF=0 VTF=0 XTF=0 mfg=Motorola)")
+
+	SOLVER(Solver, 48000)
+
+	ANALOG_INPUT(V12, 12)
+	ANALOG_INPUT(VM12, -12)
+	ANALOG_INPUT(V5, 5)
+	ALIAS(VCC, V5)
+
+	NET_MODEL("PIT8253PORT FAMILY(TYPE=NMOS OVL=0.05 OVH=0.05 ORL=100.0 ORH=0.5k)")
+
+	TTL_INPUT(LTORP, 0)         // active high
+	TTL_INPUT(LSHPHT, 0)        // active high
+	TTL_INPUT(LBOOM, 0)         // active high
+	TTL_INPUT(SOUND_OFF_L, 0)   // active high
+	TTL_INPUT(SOUND_OFF_R, 0)   // active high
+	TTL_INPUT(RTORP, 0)         // active high
+	TTL_INPUT(RSHPHT, 0)        // active high
+	TTL_INPUT(RBOOM, 0)         // active high
+	TTL_INPUT(TORPCOLL, 0)      // active high
+	TTL_INPUT(SUBENG, 0)        // active high
+	TTL_INPUT(ALERT, 0)         // active high
+	//TTL_INPUT(SONAR_ENABLE, 0)    // active high
+	TTL_INPUT(SONAR_SYNC, 0)    // active low
+
+	LOGIC_INPUT(MUSIC_A,   0, "PIT8253PORT")
+	LOGIC_INPUT(MUSIC_B,   0, "PIT8253PORT")
+	LOGIC_INPUT(MUSIC_C,   0, "PIT8253PORT")
+
+	NET_C(VCC, LTORP.VCC, LSHPHT.VCC, LBOOM.VCC, SOUND_OFF_L.VCC, SOUND_OFF_R.VCC, RTORP.VCC, RSHPHT.VCC, RBOOM.VCC, TORPCOLL.VCC, SUBENG.VCC, ALERT.VCC, SONAR_SYNC.VCC)
+	NET_C(GND, LTORP.GND, LSHPHT.GND, LBOOM.GND, SOUND_OFF_L.GND, SOUND_OFF_R.GND, RTORP.GND, RSHPHT.GND, RBOOM.GND, TORPCOLL.GND, SUBENG.GND, ALERT.GND, SONAR_SYNC.GND)
+	NET_C(VCC, MUSIC_A.VCC, MUSIC_B.VCC, MUSIC_C.VCC)
+	NET_C(GND, MUSIC_A.GND, MUSIC_B.GND, MUSIC_C.GND)
+
+	LOCAL_SOURCE(NE556_DIP)
+	LOCAL_SOURCE(ICL8038_DIP)
+
+	TTL_7406_GATE(IC27_A)
+	TTL_7406_GATE(IC27_B)
+	TTL_7406_GATE(IC27_C)
+	TTL_7406_GATE(IC27_D)
+	NET_C(VCC, IC27_A.VCC, IC27_B.VCC, IC27_C.VCC, IC27_D.VCC)
+	NET_C(GND, IC27_A.GND, IC27_B.GND, IC27_C.GND, IC27_D.GND)
+
+	//CD4070_GATE(IC41_A)
+	//CD4070_GATE(IC41_B)
+	CD4070_GATE(IC41_C)
+	CD4070_GATE(IC41_D)
+	NET_C(V12, /*IC41_A.VDD, IC41_B.VDD,*/ IC41_C.VDD, IC41_D.VDD)
+	NET_C(GND, /*IC41_A.VSS, IC41_B.VSS,*/ IC41_C.VSS, IC41_D.VSS)
+
+	CD4006_DIP(IC40)
+	NET_C(V12, IC40.14)
+	NET_C(GND, IC40.7)
+
+	CD4017_DIP(IC25)
+	NET_C(V12, IC25.16)
+	NET_C(GND, IC25.8)
+
+	CD4013(IC3_A)
+	CD4013(IC3_B)
+	NET_C(V12, IC3_A.VDD, IC3_B.VDD)
+	NET_C(GND, IC3_A.VSS, IC3_A.SET, IC3_A.RESET, IC3_B.VSS, IC3_B.SET)
+
+	MC1558_DIP(IC6)
+	NET_C(IC6.8, V12)
+	NET_C(IC6.4, VM12)
+
+	MC1558_DIP(IC16)
+	NET_C(IC16.8, V12)
+	NET_C(IC16.4, VM12)
+
+	MC1558_DIP(IC17)
+	NET_C(IC17.8, V12)
+	NET_C(IC17.4, VM12)
+
+	NE555(IC29)
+
+	SUBMODEL(NE556_DIP, IC31)
+	NET_C(IC31.14, V5)
+	NET_C(IC31.7, GND)
+
+	MC3340_DIP(IC28)
+	NET_C(IC28.8, V12)
+	NET_C(IC28.3, GND)
+
+	MC3340_DIP(IC30)
+	NET_C(IC30.8, V12)
+	NET_C(IC30.3, GND)
+
+	SUBMODEL(ICL8038_DIP, IC15)
+	NET_C(V12, IC15.6)
+	NET_C(GND, IC15.11)
+
+	LM3900(IC2_A)
+	LM3900(IC2_D)
+	LM3900(IC4_A)
+	LM3900(IC4_B)
+	LM3900(IC4_D)
+	LM3900(IC14_A)
+	LM3900(IC14_B)
+	LM3900(IC14_C)
+	LM3900(IC14_D)
+	NET_C(V12, IC2_A.VCC, IC2_D.VCC, IC4_A.VCC, IC4_B.VCC, IC4_D.VCC, IC14_A.VCC, IC14_B.VCC, IC14_C.VCC, IC14_D.VCC)
+	NET_C(GND, IC2_A.GND, IC2_D.GND, IC4_A.GND, IC4_B.GND, IC4_D.GND, IC14_A.GND, IC14_B.GND, IC14_C.GND, IC14_D.GND)
+
+	RES(R1, RES_K(560))
+	RES(R2, RES_K(560))
+	RES(R3, RES_K(560))
+	RES(R4, RES_K(560))
+	RES(R5, RES_K(560))
+	RES(R6, RES_K(560))
+	RES(R8, RES_M(2))
+	RES(R9, RES_K(820))
+	RES(R10, RES_K(220))
+	RES(R11, RES_K(620))
+	RES(R12, RES_K(3.9))
+	RES(R13, RES_K(3.9))
+	RES(R14, RES_K(3.9))
+	RES(R15, RES_M(5.6))
+	RES(R16, RES_K(680))
+	RES(R17, RES_K(10))
+	RES(R18, RES_K(1))
+	RES(R19, RES_K(150))
+	RES(R20, RES_K(2))
+	RES(R21, RES_K(180))
+	RES(R22, RES_K(180))
+	RES(R23, RES_K(130))
+	RES(R24, RES_K(10))
+	RES(R25, RES_K(2))
+	RES(R26, RES_K(68))
+	RES(R27, RES_K(270))
+	RES(R28, RES_K(10))
+	RES(R29, RES_K(130))
+	RES(R31, RES_K(560))
+	RES(R32, RES_K(220))
+	RES(R33, RES_M(1.2))
+	RES(R34, RES_K(12))
+	RES(R35, RES_K(1))
+	RES(R36, RES_K(15))
+	RES(R37, RES_K(15))
+	RES(R38, RES_K(820))
+	RES(R39, RES_M(1))
+	RES(R40, RES_K(220))
+	RES(R41, RES_K(680))
+	RES(R42, RES_K(820))
+	RES(R43, RES_K(12))
+	RES(R44, RES_K(560))
+	RES(R45, RES_M(1.2))
+	RES(R46, RES_K(680))
+	RES(R47, RES_M(1.2))
+	RES(R48, RES_K(12))
+	RES(R49, RES_M(1.2))
+	RES(R50, RES_K(820))
+	RES(R51, RES_M(5.6))
+	RES(R52, RES_K(680))
+	RES(R53, RES_K(680))
+	RES(R54, RES_M(2))
+	RES(R55, RES_K(1))
+	RES(R56, RES_K(10))
+	RES(R57, RES_K(680))
+	RES(R58, RES_M(1))
+	RES(R59, RES_K(43))
+	RES(R60, RES_K(43))
+	RES(R61, RES_K(150))
+	RES(R62, RES_M(1))
+	//RES(R63, RES_K(82))
+	POT(R64, RES_K(10))
+	POT(R65, RES_K(10))
+	RES(R66, RES_K(27))
+	RES(R67, RES_K(68))
+	RES(R68, RES_K(100))
+	RES(R69, RES_M(1))
+	RES(R70, RES_K(10))
+	RES(R71, RES_K(16))
+	RES(R72, RES_K(68))
+	RES(R73, RES_K(47))
+	RES(R74, RES_K(12))
+	RES(R75, RES_K(120))
+	RES(R76, RES_K(33))
+	RES(R77, RES_K(33))
+	RES(R78, RES_K(150))
+	RES(R79, RES_K(130))
+	RES(R80, RES_K(130))
+	RES(R81, RES_K(560))
+	RES(R82, RES_K(160))
+	RES(R83, RES_M(1))
+	RES(R84, RES_K(100))
+	RES(R85, RES_K(270))
+	RES(R86, RES_K(16))
+	RES(R87, RES_K(100))
+	RES(R94, RES_K(1))
+	RES(R95, RES_K(1))
+	RES(R96, RES_K(1))
+	RES(R99, RES_K(1))
+	RES(R100, RES_K(1))
+	//RES(R101, RES_K(10))
+	RES(R102, RES_K(3))
+	RES(R103, RES_K(3))
+	RES(R104, RES_M(1))
+	RES(R105, RES_K(100))
+	RES(R106, RES_K(100))
+	RES(R107, RES_K(47))
+	RES(R108, RES_K(20))
+	RES(R109, RES_K(560))
+	RES(R110, RES_K(1))
+	RES(R116, RES_K(4.7))
+	RES(R117, RES_K(20))
+	RES(R118, RES_K(560))
+	RES(R119, RES_K(560))
+	RES(R120, RES_K(5.6))
+	RES(R122, RES_K(2.7))
+	RES(R123, RES_K(100))
+	RES(R124, RES_K(3))
+	RES(R125, RES_K(3))
+	RES(R126, RES_K(6.8))
+	RES(R127, RES_K(8.2))
+	RES(R132, RES_M(1))
+	RES(R133, RES_M(1))
+	RES(R134, RES_M(1))
+	RES(R135, RES_M(1))
+	RES(R137, RES_K(5.6))
+	RES(R138, RES_K(47))
+	RES(R139, 100)
+	RES(R140, RES_K(10))
+	RES(R141, RES_K(3))
+	//RES(R142, RES_K(56))
+	//RES(R143, RES_K(56))
+	RES(R144, RES_K(100))
+	RES(R150, RES_K(100))
+
+	CAP(C3, CAP_U(1.0))
+	CAP(C4, CAP_U(0.1))
+	CAP(C6, CAP_U(4.7))
+	CAP(C7, CAP_U(0.33))
+	CAP(C8, CAP_U(0.33))
+	CAP(C10, CAP_U(0.1))
+	CAP(C11, CAP_U(2.2))
+	CAP(C12, CAP_U(2.2))
+	CAP(C13, CAP_U(4.7))
+	CAP(C14, CAP_U(2.2))
+	CAP(C15, CAP_U(1.0))
+	CAP(C16, CAP_U(10))
+	CAP(C17, CAP_U(0.1))
+	CAP(C18, CAP_U(0.1))
+	CAP(C20, CAP_U(10))
+	CAP(C22, CAP_U(0.033))
+	CAP(C23, CAP_U(0.33))
+	CAP(C26, CAP_U(0.022))
+	CAP(C27, CAP_U(0.022))
+	CAP(C35, CAP_U(0.0022))
+	CAP(C37, CAP_U(0.0022))
+	CAP(C38, CAP_U(0.1))
+	CAP(C39, CAP_U(0.0022))
+	CAP(C40, CAP_U(0.033))
+	CAP(C41, CAP_U(1.0))
+	CAP(C42, CAP_U(1.0))
+	CAP(C44, CAP_U(0.0047))
+	CAP(C45, CAP_U(0.1))
+	CAP(C48, CAP_U(0.1))
+	CAP(C49, CAP_U(0.0022))
+	CAP(C50, CAP_U(1.0))
+	CAP(C51, CAP_U(0.1))
+	CAP(C52, CAP_U(0.1))
+	CAP(C55, CAP_U(0.1))
+	CAP(C70, CAP_U(1.0))
+	CAP(C72, CAP_U(2.2))
+	CAP(C73, CAP_U(1.0))
+	CAP(C74, CAP_U(1.0))
+	CAP(C75, CAP_U(0.1))
+	CAP(C80, CAP_U(1.0))
+	CAP(C81, CAP_U(0.1))
+	CAP(C82, CAP_U(0.1))
+	CAP(C84, CAP_U(0.1))
+	CAP(C85, CAP_U(2.2))
+	CAP(C97, CAP_U(0.0022))
+	CAP(C98, CAP_U(0.0022))
+	CAP(C100, CAP_U(0.22))
+	//CAP(C102, CAP_U(0.001))
+	CAP(C106, CAP_U(0.1))
+	CAP(C109, CAP_U(0.1))
+	CAP(C114, CAP_U(0.1))
+	CAP(C121, CAP_U(0.001))
+	CAP(C122, CAP_U(0.001))
+
+	DIODE(D1, "1N914")
+	DIODE(D2, "1N914")
+	DIODE(D3, "1N914")
+	DIODE(D4, "1N914")
+	DIODE(D5, "1N914")
+	DIODE(D6, "1N914")
+	DIODE(D7, "1N914")
+	DIODE(D8, "1N914")
+	DIODE(D9, "1N914")
+	DIODE(D10, "1N914")
+	DIODE(D11, "1N914")
+	DIODE(D12, "1N914")
+	DIODE(D13, "1N914")
+	DIODE(D14, "1N914")
+	DIODE(D15, "1N914")
+
+	QBJT_EB(Q1, "2N3704")
+	QBJT_EB(Q2, "2N3704")
+
+	// Noise Generator
+	CLOCK(HLE_SONAR_CLOCK, 1000)
+	NET_C(HLE_SONAR_CLOCK.GND, GND)
+	NET_C(HLE_SONAR_CLOCK.VCC, V12)
+
+	SWITCH2(SONAR_ENABLE)
+	NET_C(SONAR_ENABLE.1, HLE_SONAR_CLOCK.Q)
+	NET_C(SONAR_ENABLE.2, GND)
+	NET_C(SONAR_ENABLE.Q, IC40.3)
+
+	NET_C(IC40.1, IC40.12, IC41_C.A)
+	NET_C(IC40.4, IC41_C.Q)
+	NET_C(IC40.5, IC41_D.Q)
+	NET_C(R141.1, IC40.6, IC40.10, C45.1)
+	ALIAS(NOISE_A, R141.1)
+	NET_C(R141.2, R140.1)
+	NET_C(R140.2, V12)
+	ALIAS(NOISE, R140.1)
+	NET_C(IC40.8, IC41_C.B)
+	NET_C(IC40.13, IC41_D.A)
+
+	// Sonar
+	NET_C(IC27_A.A, SONAR_SYNC.Q)
+	NET_C(IC27_A.Y, R70.1, IC25.15, IC41_D.B)
+	NET_C(R70.2, V12, IC29.RESET)
+	NET_C(IC29.GND, GND)
+	NET_C(IC29.VCC, V12)
+	NET_C(IC29.DISCH, R110.1, R107.1)
+	NET_C(R110.2, V12)
+	NET_C(IC29.THRESH, IC29.TRIG, R107.2, C72.1)
+	NET_C(C72.2, GND)
+	NET_C(IC29.OUT, D3.K, IC3_A.CLOCK)
+	NET_C(IC3_A.QQ, IC3_A.DATA)
+	NET_C(IC3_A.Q, D2.K, IC25.14)
+	NET_C(IC25.13, GND)
+	NET_C(IC25.2, R36.1)
+	NET_C(IC25.4, R72.1)
+	NET_C(IC25.10, R73.1)
+	NET_C(IC25.11, R75.1)
+	NET_C(R36.2, R72.2, R73.2, R75.2, D3.A, D2.A, R19.2, Q2.C)
+	NET_C(NOISE_A, R138.1)
+	NET_C(R138.2, C100.1, R137.1)
+	NET_C(C100.2, GND)
+	NET_C(R137.2, R139.1, C27.1, C26.1, R19.1)
+	NET_C(R139.2, GND)
+	NET_C(IC6.3, GND)
+	NET_C(IC6.2, R38.1, C27.2)
+	NET_C(IC6.1, R37.1, R38.2, R85.1, R27.1, C26.2)
+	NET_C(R37.2, D7.A, D8.K, IC6.5)
+	NET_C(D7.K, GND)
+	NET_C(D8.A, GND)
+	NET_C(IC6.6, R35.1, R39.1)
+	NET_C(R35.2, C23.1)
+	NET_C(C23.2, GND)
+	NET_C(IC6.7, R56.1, R39.2)
+	NET_C(R56.2, D14.K, Q2.B)
+	NET_C(D14.A, GND)
+	NET_C(Q2.E, GND)
+
+	ALIAS(MIX_L, R27.2)
+	ALIAS(MIX_R, R85.2)
+
+	// Low Filter
+	NET_C(C45.2, R68.1)
+	NET_C(R68.2, IC16.6, R66.1)
+	NET_C(IC16.5, GND)
+	NET_C(R66.2, IC16.7, R71.1)
+	NET_C(R71.2, R86.1, C51.1)
+	NET_C(R86.2, C55.1, IC17.5)
+	NET_C(C55.2, GND)
+	NET_C(C51.2, IC17.7, R82.1)
+	NET_C(R82.2, IC17.6, R123.1)
+	NET_C(R123.2, GND)
+	ALIAS(RUMBLE, IC17.7)
+
+	// Submarine Engine
+	NET_C(IC31.4, V5)
+	NET_C(IC31.1, R120.1, R122.1)
+	NET_C(R120.2, V5)
+	NET_C(IC31.2, IC31.6, IC31.11, R122.2, C85.1)
+	NET_C(C85.2, GND)
+	NET_C(IC31.5, GND)
+	NET_C(IC31.13, R126.1, R127.1)
+	NET_C(R126.2, V5)
+	NET_C(IC31.8, IC31.12, R127.2, C84.1)
+	NET_C(C84.2, GND)
+	NET_C(IC31.10, SUBENG.Q)
+	NET_C(IC31.9, R124.1)
+	NET_C(R124.2, R125.1, C114.1)
+	NET_C(C114.2, GND)
+	NET_C(R125.2, R79.1, R80.1, C52.1)
+	NET_C(C52.2, GND)
+	NET_C(R79.2, MIX_L)
+	NET_C(R80.2, MIX_R)
+
+	// Ship Explosion (L)
+	NET_C(RUMBLE, R87.1)
+	NET_C(R87.2, R84.1, C80.1)
+	NET_C(R84.2, GND)
+	NET_C(IC30.1, C80.2)
+	NET_C(IC30.7, R117.1)
+	NET_C(IC30.6, C81.1)
+	NET_C(C81.2, GND)
+	NET_C(LBOOM.Q, IC27_C.A)
+	NET_C(IC27_C.Y, R103.1)
+	NET_C(R103.2, R104.1, C70.1)
+	NET_C(C70.2, GND)
+	NET_C(R104.2, IC17.3, R83.1)
+	NET_C(R83.2, V5)
+	NET_C(IC17.1, IC17.2, IC30.2)
+	NET_C(R117.2, MIX_L)
+
+	// Ship Explosion (R)
+	NET_C(RUMBLE, R105.1)
+	NET_C(R105.2, R106.1, C74.1)
+	NET_C(R106.2, GND)
+	NET_C(IC28.1, C74.2)
+	NET_C(IC28.7, R108.1)
+	NET_C(IC28.6, C75.1)
+	NET_C(C75.2, GND)
+	NET_C(RBOOM.Q, IC27_D.A)
+	NET_C(IC27_D.Y, R102.1)
+	NET_C(R102.2, R69.1, C73.1)
+	NET_C(C73.2, GND)
+	NET_C(R69.2, IC16.3, R62.1)
+	NET_C(R62.2, V5)
+	NET_C(IC16.1, IC16.2, IC28.2)
+	NET_C(R108.2, MIX_R)
+
+	// Torpedo (L)
+	NET_C(LTORP.Q, R100.1, D10.A, D11.A)
+	NET_C(R100.2, V5)
+	NET_C(D10.K, C7.1, R46.1)
+	NET_C(D11.K, C14.1, R53.1)
+	NET_C(C7.2, C14.2, R132.2, R133.2, GND)
+	NET_C(R53.2, IC14_C.PLUS)
+	NET_C(R51.1, V12)
+	NET_C(R51.2, C42.1, R54.1, IC14_C.MINUS)
+	NET_C(R54.2, C42.2, IC14_C.OUT, R57.1)
+	NET_C(R57.2, R46.2, IC14_B.PLUS)
+	NET_C(NOISE, R42.1)
+	NET_C(R42.2, R47.1, IC14_B.MINUS)
+	NET_C(R47.2, C35.1, IC14_B.OUT)
+	NET_C(C35.2, R132.1, C98.1)
+	NET_C(C98.2, R133.1, R118.1)
+	NET_C(R118.2, MIX_L)
+
+	// Torpedo (R)
+	NET_C(RTORP.Q, R55.1, D12.A, D9.A)
+	NET_C(R55.2, V5)
+	NET_C(D12.K, C8.1, R52.1)
+	NET_C(D9.K, C12.1, R16.1)
+	NET_C(C8.2, C12.2, R134.2, R135.2, GND)
+	NET_C(R16.2, IC2_A.PLUS)
+	NET_C(R15.1, V12)
+	NET_C(R15.2, C3.1, R8.1, IC2_A.MINUS)
+	NET_C(R8.2, C3.2, IC2_A.OUT, R41.1)
+	NET_C(R41.2, R52.2, IC14_A.PLUS)
+	NET_C(NOISE, R50.1)
+	NET_C(R50.2, R49.1, IC14_A.MINUS)
+	NET_C(R49.2, C37.1, IC14_A.OUT)
+	NET_C(C37.2, R134.1, C97.1)
+	NET_C(C97.2, R135.1, R109.1)
+	NET_C(R109.2, MIX_R)
+
+	// Ship Partial Hit (L)
+	NET_C(LSHPHT.Q, R94.1, D6.A)
+	NET_C(R94.2, V5)
+	NET_C(D6.K, C13.1, R32.1)
+	NET_C(C13.2, C49.2, C22.2, GND)
+	NET_C(R32.2, IC4_D.PLUS)
+	NET_C(NOISE, R31.1)
+	NET_C(R31.2, R33.1, IC4_D.MINUS)
+	NET_C(R33.2, R34.1, IC4_D.OUT)
+	NET_C(R34.2, C49.1, R74.1)
+	NET_C(R74.2, C22.1, R78.1)
+	NET_C(R78.2, MIX_L)
+
+	// Ship Partial Hit (R)
+	NET_C(RSHPHT.Q, R99.1, D13.A)
+	NET_C(R99.2, V5)
+	NET_C(D13.K, C6.1, R40.1)
+	NET_C(C6.2, C39.2, C40.2, GND)
+	NET_C(R40.2, IC14_D.PLUS)
+	NET_C(NOISE, R44.1)
+	NET_C(R44.2, R45.1, IC14_D.MINUS)
+	NET_C(R45.2, R48.1, IC14_D.OUT)
+	NET_C(R48.2, C39.1, R43.1)
+	NET_C(R43.2, C40.1, R61.1)
+	NET_C(R61.2, MIX_L)
+
+	// Torpedo Collision
+	NET_C(TORPCOLL.Q, R95.1, D1.A)
+	NET_C(R95.2, V5)
+	NET_C(D1.K, C11.1, R10.1)
+	NET_C(C11.2, C4.2, C38.2, GND)
+	NET_C(R10.2, IC2_D.PLUS)
+	NET_C(NOISE, R11.1)
+	NET_C(R11.2, R9.1, IC2_D.MINUS)
+	NET_C(R9.2, R12.1, IC2_D.OUT)
+	NET_C(R12.2, C4.1, R13.1)
+	NET_C(R13.2, C38.1, R76.1, R77.1)
+	NET_C(R77.2, MIX_L)
+	NET_C(R76.2, MIX_R)
+
+	// Alert
+	NET_C(ALERT.Q, IC27_B.A)
+	NET_C(IC27_B.Y, R96.2, D15.A, IC3_B.RESET)
+	NET_C(D15.K, C41.2, Q1.C, IC15.8)
+	NET_C(R14.2, R17.1, Q1.B)
+	NET_C(Q1.E, R58.1)
+	NET_C(IC15.10, C44.1)
+	NET_C(IC15.4, R59.2)
+	NET_C(IC15.5, R60.2)
+	NET_C(IC15.9, R116.2, IC3_B.CLOCK)
+	NET_C(IC3_B.QQ, IC3_B.DATA)
+	NET_C(IC3_B.Q, R18.1)
+	NET_C(R18.2, C10.1, R119.1, R81.1)
+	NET_C(V12, R96.1, C41.1, R14.1, R116.1, R59.1, R60.1)
+	NET_C(GND, R17.2, R58.2, C44.2, C10.2)
+	NET_C(R119.2, MIX_L)
+	NET_C(R81.2, MIX_R)
+
+	// Mixers (shared)
+	NET_C(SOUND_OFF_L.Q, D4.A)
+	NET_C(SOUND_OFF_R.Q, D5.A)
+
+	// Music
+	NET_C(MUSIC_A.Q, R1.1, R4.1)
+	NET_C(MUSIC_B.Q, R5.1, R6.1)
+	NET_C(MUSIC_C.Q, R3.1, R2.1)
+	NET_C(R1.2, R3.2, R5.2, MIX_L)
+	NET_C(R2.2, R4.2, R6.2, MIX_R)
+
+	// Mixer (L)
+	NET_C(MIX_L, C15.1)
+	NET_C(R25.1, V12)
+	NET_C(R25.2, C16.1, C48.1, R23.1)
+	NET_C(C16.2, C48.2, C82.2, R64.1, R144.2, GND)
+	NET_C(R23.2, IC4_A.PLUS)
+	NET_C(D4.K, C82.1, R24.1)
+	NET_C(R24.2, C15.2, IC4_A.MINUS, R26.1, C121.1)
+	NET_C(C121.2, R26.2, IC4_A.OUT, R21.1)
+	NET_C(R21.2, R64.3)
+	NET_C(R64.2, C106.1)
+	NET_C(C106.2, R144.1)
+	ALIAS(OUT_L, C106.2)
+
+	// Mixer (R)
+	NET_C(MIX_R, C50.1)
+	NET_C(R20.1, V12)
+	NET_C(R20.2, C20.1, C18.1, R29.1)
+	NET_C(C20.2, C18.2, C17.2, R65.1, R150.2, GND)
+	NET_C(R29.2, IC4_B.PLUS)
+	NET_C(D5.K, C17.1, R28.1)
+	NET_C(R28.2, C50.2, IC4_B.MINUS, R67.1, C122.1)
+	NET_C(C122.2, R67.2, IC4_B.OUT, R22.1)
+	NET_C(R22.2, R65.3)
+	NET_C(R65.2, C109.1)
+	NET_C(C109.2, R150.1)
+	ALIAS(OUT_R, C109.2)
+
+	// Separate each input into the summing network
+	OPTIMIZE_FRONTIER(R27.1, RES_K(270), 50) // SONAR (L)
+	OPTIMIZE_FRONTIER(R77.1, RES_K(33), 50) // TORPCOLL (L)
+	OPTIMIZE_FRONTIER(R78.1, RES_K(150), 50) // L SHPHT
+	OPTIMIZE_FRONTIER(R79.1, RES_K(130), 50) // SUBENG (L)
+	OPTIMIZE_FRONTIER(R117.1, RES_K(20), 50) // L BOOM
+	OPTIMIZE_FRONTIER(R118.1, RES_K(560), 50) // L TORP
+
+	OPTIMIZE_FRONTIER(R85.1, RES_K(270), 50) // SONAR (R)
+	OPTIMIZE_FRONTIER(R76.1, RES_K(33), 50) // TORPCOLL (R)
+	OPTIMIZE_FRONTIER(R61.1, RES_K(150), 50) // R SHPHT
+	OPTIMIZE_FRONTIER(R80.1, RES_K(130), 50) // SUBENG (R)
+	OPTIMIZE_FRONTIER(R108.1, RES_K(20), 50) // R BOOM
+	OPTIMIZE_FRONTIER(R109.1, RES_K(560), 50) // R TORP
+
+	OPTIMIZE_FRONTIER(R138.1, RES_K(47), 50) // Isolation for NOISE_A going into SONAR section
+	OPTIMIZE_FRONTIER(R42.1, RES_K(820), 50) // Isolation for NOISE going into L TORP section
+	OPTIMIZE_FRONTIER(R50.1, RES_K(820), 50) // Isolation for NOISE going into R TORP section
+	OPTIMIZE_FRONTIER(R31.1, RES_K(560), 50) // Isolation for NOISE going into L SHPHT section
+	OPTIMIZE_FRONTIER(R44.1, RES_K(560), 50) // Isolation for NOISE going into R SHPHT section
+	OPTIMIZE_FRONTIER(R11.1, RES_K(620), 50) // Isolation for NOISE going into TORPCOLL section
+	OPTIMIZE_FRONTIER(R87.1, RES_K(100), 50) // Isolation for RUMBLE going into L BOOM section
+	OPTIMIZE_FRONTIER(R105.1, RES_K(100), 50) // Isolation for RUMBLE going into R BOOM section
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_fireone.h mame-0.224+dfsg.1/src/mame/audio/nl_fireone.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_fireone.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_fireone.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+#ifndef MAME_AUDIO_NL_FIREONE_H
+#define MAME_AUDIO_NL_FIREONE_H
+
+#pragma once
+
+NETLIST_EXTERNAL(fireone)
+
+#endif // MAME_AUDIO_NL_FIREONE_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_flyball.cpp mame-0.224+dfsg.1/src/mame/audio/nl_flyball.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_flyball.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_flyball.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,191 @@
+// license:CC0
+// copyright-holders:Ryan Holtz, Ivan Vangelista
+//
+// Netlist for Atari's Flyball
+//
+// Derived from the schematics in the manual.
+//
+// Known problems/issues:
+//    * None.
+//
+
+#include "netlist/devices/net_lib.h"
+
+static NETLIST_START(NE556_DIP)
+	NE555(A)
+	NE555(B)
+
+	NET_C(A.GND, B.GND)
+	NET_C(A.VCC, B.VCC)
+
+	DIPPINS(      /*        +--------------+        */
+		 A.DISCH, /* 1DISCH |1     ++    14| VCC    */ A.VCC,
+		A.THRESH, /* 1THRES |2           13| 2DISCH */ B.DISCH,
+		  A.CONT, /*  1CONT |3           12| 2THRES */ B.THRESH,
+		 A.RESET, /* 1RESET |4   NE556   11| 2CONT  */ B.CONT,
+		   A.OUT, /*   1OUT |5           10| 2RESET */ B.RESET,
+		  A.TRIG, /*  1TRIG |6            9| 2OUT   */ B.OUT,
+		   A.GND, /*    GND |7            8| 2TRIG  */ B.TRIG
+				  /*        +--------------+        */
+	)
+NETLIST_END()
+
+NETLIST_START(flyball)
+
+	SOLVER(Solver, 48000)
+	ANALOG_INPUT(V5, 5)
+	ANALOG_INPUT(V18, 18)
+	ALIAS(VCC, V5)
+	CLOCK(H256, 15750.0)
+	CLOCK(V128, 61.5234375)
+	NET_C(VCC, H256.VCC, V128.VCC)
+	NET_C(GND, H256.GND, V128.GND)
+
+	LOCAL_SOURCE(NE556_DIP)
+
+	TTL_INPUT(BAT_SOUND, 1)
+	TTL_INPUT(FOOTSTEP, 1)
+	TTL_INPUT(CROWD_SL, 1)
+	TTL_INPUT(CROWD_ON, 1)
+	TTL_INPUT(CROWD_VL, 1)
+	NET_C(VCC, BAT_SOUND.VCC, FOOTSTEP.VCC, CROWD_SL.VCC, CROWD_ON.VCC, CROWD_VL.VCC)
+	NET_C(GND, BAT_SOUND.GND, FOOTSTEP.GND, CROWD_SL.GND, CROWD_ON.GND, CROWD_VL.GND)
+
+	RES(R43, RES_K(68)) // RES., CARBON, 5%, 1/4W, 68K
+	RES(R73, RES_K(1)) // RES., CARBON, 5%, 1/4W, 1K
+	RES(R74, RES_K(1)) // RES., CARBON, 5%, 1/4W, 1K
+	POT(R75, RES_K(50)) // TRIMPOT, 50K
+	RES(R76, RES_K(100)) // RES., CARBON, 5%, 1/4W, 100K
+	RES(R77, 820)  // RES., CARBON, 5%, 1/4W, 820
+	RES(R78, RES_K(100)) // RES., CARBON, 5%, 1/4W, 100K
+	RES(R79, RES_K(1)) // RES., CARBON, 5%, 1/4W, 820K // Verified as 1K on a real board
+	RES(R80, RES_K(330))  // RES., CARBON, 5%, 1/4W, 330 // (330 on parts list, but 330K on schematic, 330 does not work in the netlist)
+	RES(R87, RES_K(1)) // RES., CARBON, 5%, 1/4W, 1K
+	RES(R88, RES_K(3.3)) // RES., CARBON, 5%, 1/4W, 3.3K
+	RES(R89, RES_K(10)) // RES., CARBON, 5%, 1/4W, 10K
+	RES(R90, RES_K(10)) // RES., CARBON, 5%, 1/4W, 10K
+	RES(R91, RES_K(10)) // RES., CARBON, 5%, 1/4W, 10K
+	RES(R92, RES_K(10)) // RES., CARBON, 5%, 1/4W, 10K
+	POT(R95, RES_K(10)) // TRIMPOT, 10K
+	RES(R96, RES_K(47)) // RES., CARBON, 5%, 1/4W, 47K
+	RES(R97A, RES_K(10)) // RES., CARBON, 5%, 1/4W, 10K
+	RES(R97B, RES_K(24.4)) // RES., CARBON, 5%, 1/4W, 10K // Verified to exist on a real board
+	RES(R98, RES_K(10)) // RES., CARBON, 5%, 1/4W, 10K
+	RES(R99, RES_K(33)) // RES., CARBON, 5%, 1/4W, 33K
+
+	CAP(C34, CAP_U(0.0047)) // CAP., MYLAR, .0047uf
+	CAP(C44, CAP_U(0.0047)) // CAP., MYLAR, .0047uf
+	CAP(C45, CAP_U(0.1)) // CAP., CERAMIC DISC., 0.1 uf, 25V
+	CAP(C46, CAP_U(0.015)) // CAP., CERAMIC DISC., 0.015 uf, 25V
+	CAP(C47, CAP_U(0.015)) // CAP., CERAMIC DISC., 0.015 uf, 25V
+	CAP(C48, CAP_U(10)) // CAP., ELECTROLYTIC, 10 uf, 25V
+	CAP(C49, CAP_U(100)) // CAP., ELECTROLYTIC, 100 uf, 25V
+	CAP(C51, CAP_U(0.1)) // CAP., CERAMIC DISC., 0.1 uf, 25V
+	CAP(C52, CAP_U(0.1)) // CAP., CERAMIC DISC., 0.1 uf, 25V
+	CAP(C53, CAP_U(0.1)) // CAP., CERAMIC DISC., 0.1 uf, 25V
+	CAP(C79, CAP_U(0.1)) // CAP., CERAMIC DISC., 0.1 uf, 25V
+	CAP(C80, CAP_U(0.1)) // CAP., CERAMIC DISC., 0.1 uf, 25V
+
+	TTL_7486_DIP(IC_E7)
+	TTL_74164_DIP(IC_B7)
+	TTL_74164_DIP(IC_C7)
+	TTL_7474_DIP(IC_D7)
+	NET_C(VCC, IC_E7.14, IC_B7.14, IC_C7.14, IC_D7.14, IC_E7.13, IC_B7.9, IC_B7.2, IC_C7.9, IC_C7.2)
+	NET_C(GND, IC_E7.7,  IC_B7.7,  IC_C7.7,  IC_D7.7,  IC_D7.2, IC_E7.4, IC_E7.5)
+
+	SUBMODEL(NE556_DIP, IC_E8)
+	NET_C(VCC, IC_E8.14)
+	NET_C(GND, IC_E8.7)
+
+	MC3340_DIP(IC_A8)
+	MC3340_DIP(IC_C8)
+	NET_C(V18, IC_A8.8, IC_C8.8)
+	NET_C(GND, IC_A8.3, IC_C8.3)
+
+	UA741_DIP8(IC_D8)
+	NET_C(V18, IC_D8.7)
+	NET_C(GND, IC_D8.4)
+
+	// Random Noise Generator
+	NET_C(H256.Q, IC_B7.8, IC_C7.8, IC_D7.11, IC_D7.4)
+	NET_C(VCC, IC_D7.13, IC_D7.1)
+	NET_C(IC_B7.13, IC_C7.1)
+	NET_C(IC_C7.13, IC_D7.12)
+	NET_C(IC_D7.9, IC_E7.9)
+	NET_C(IC_B7.5, IC_E7.10)
+	NET_C(IC_E7.8, IC_E7.12)
+	NET_C(IC_E7.11, IC_B7.1)
+	NET_C(IC_D7.5, IC_D7.10)
+	NET_C(V128, IC_D7.3)
+
+	// Band Pass Filter
+	NET_C(IC_D7.8, R78.1)
+	NET_C(R78.2, R77.1, C46.1, C47.1)
+	NET_C(GND, R77.2)
+	NET_C(C46.2, R80.1, IC_D8.6)
+	NET_C(C47.2, R80.2, IC_D8.2)
+	NET_C(V5, IC_D8.3)
+
+	// Bat Sound
+	NET_C(BAT_SOUND.Q, IC_E8.4, IC_E8.10, IC_E7.1)
+	NET_C(V5, IC_E7.2, R73.1, R74.1)
+	NET_C(R74.2, R75.3, R75.2, IC_E8.1)
+	NET_C(R75.1, R43.1)
+	NET_C(R43.2, IC_E8.2, IC_E8.6, C34.1)
+	NET_C(R73.2, IC_E8.13, R76.1)
+	NET_C(R76.2, IC_E8.12, IC_E8.8, C44.1)
+	NET_C(IC_E8.3, IC_E8.11, C45.1)
+	NET_C(GND, C34.2, C44.2, C45.2)
+	NET_C(IC_E8.5, R91.1)
+	NET_C(IC_E8.9, R90.1)
+	NET_C(IC_E7.3, R89.1)
+
+	// Footstep Envelope Generator
+	NET_C(FOOTSTEP.Q, R88.1)
+	NET_C(IC_D7.8, R79.1)
+	NET_C(R79.2, C79.1)
+	NET_C(C79.2, IC_C8.1)
+	NET_C(R88.2, C48.1, IC_C8.2)
+	NET_C(GND, C48.2)
+	NET_C(IC_C8.7, R92.1)
+
+	// Crowd & Whistle Volume Control
+	NET_C(IC_D8.6, R87.1)
+	NET_C(R87.2, C80.1)
+	NET_C(C80.2, IC_A8.1)
+	NET_C(CROWD_VL.Q, R97A.2, R97B.2)
+	NET_C(CROWD_ON.Q, R98.2)
+	NET_C(CROWD_SL.Q, R99.2)
+	NET_C(R97A.1, R97B.1, R98.1, R99.1, C49.1, IC_A8.2)
+	NET_C(GND, C49.2)
+	NET_C(IC_A8.7, R96.1)
+
+	// Mixer
+	NET_C(R89.2, R90.2, R91.2, R92.2, R96.2, C51.1, R95.3)
+	NET_C(GND, C51.2, R95.1)
+	NET_C(R95.2, C53.1)
+	NET_C(C53.2, C52.1)
+	NET_C(C52.2, GND)
+	ALIAS(OUTPUT, C53.2)
+
+	// Unconnected pins
+	HINT(IC_A8.6, NC)
+	HINT(IC_C8.6, NC)
+	HINT(IC_B7.2, NC)
+	HINT(IC_B7.9, NC)
+	HINT(IC_B7.3, NC)
+	HINT(IC_B7.4, NC)
+	HINT(IC_B7.6, NC)
+	HINT(IC_B7.10, NC)
+	HINT(IC_B7.11, NC)
+	HINT(IC_B7.12, NC)
+	HINT(IC_C7.3, NC)
+	HINT(IC_C7.4, NC)
+	HINT(IC_C7.5, NC)
+	HINT(IC_C7.6, NC)
+	HINT(IC_C7.10, NC)
+	HINT(IC_C7.11, NC)
+	HINT(IC_C7.12, NC)
+	HINT(IC_D7.6, NC)
+	HINT(IC_E7.6, NC)
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_flyball.h mame-0.224+dfsg.1/src/mame/audio/nl_flyball.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_flyball.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_flyball.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:CC0
+// copyright-holders:Ivan Vangelista, Ryan Holtz
+#ifndef MAME_AUDIO_NL_FLYBALL_H
+#define MAME_AUDIO_NL_FLYBALL_H
+
+#pragma once
+
+NETLIST_EXTERNAL(flyball)
+
+#endif // MAME_AUDIO_NL_FLYBALL_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_gamemachine.cpp mame-0.224+dfsg.1/src/mame/audio/nl_gamemachine.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_gamemachine.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_gamemachine.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -40,8 +40,8 @@
 	LOGIC_INPUT(P14, 1, "OPENDRAIN")
 	LOGIC_INPUT(P15, 1, "OPENDRAIN")
 
-	NET_C(V5,  P08.VCC, P09.VCC, P10.VCC, P11.VCC, P12.VCC, P13.VCC, P14.VCC, P15.VCC)
-	NET_C(GND, P08.GND, P09.GND, P10.GND, P11.GND, P12.GND, P13.GND, P14.GND, P15.GND)
+	NET_C(V5,  P08.VDD, P09.VDD, P10.VDD, P11.VDD, P12.VDD, P13.VDD, P14.VDD, P15.VDD)
+	NET_C(GND, P08.VSS, P09.VSS, P10.VSS, P11.VSS, P12.VSS, P13.VSS, P14.VSS, P15.VSS)
 
 	RES(R1, RES_K(2.4))
 	RES(R2, RES_K(10))
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_gunfight.cpp mame-0.224+dfsg.1/src/mame/audio/nl_gunfight.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_gunfight.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_gunfight.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4,86 +4,252 @@
 #include "netlist/devices/net_lib.h"
 
 
-#ifndef __PLIB_PREPROCESSOR__
-
-	#define NOISE(_name)                                                     \
-			NET_REGISTER_DEV(NOISE, _name)
-
-#endif
-
 #define USE_FRONTIERS   1
 #define FAST_SWITCHES   1
 
-// I got this circuit's layout from Midway's schematic, "Gun Fight Sound
-// Generator Detail P.C. 597-907E".
+// This is a netlist description for the sound circuits of Midway's Gun Fight,
+// based on Midway's schematic "Gun Fight Sound Generator Detail P.C.
+// 597-907E".
+//
+// (This sound circuitry seems to have evolved from that for an older Midway
+// game, an electromechanical rifle game from 1974 called Twin Pirate Gun. The
+// schematics for Twin Pirate Gun's sound circuitry (P.C. 569-907-88),
+// although not completely identical to Gun Fight's, are similar both in
+// general structure and in many details.)
+//
+// Gun Fight's sound effects are simple "bang" sounds, both for the shooting
+// of bullets and for bullets hitting targets. The effects are directed to the
+// left or right speaker, depending on whether the left or right player is
+// shooting or being hit. (Hits to obstacles get the same sound as hits to the
+// right player and thus play from the right speaker.) Each sound effect gets
+// a different pitch, with shots being higher pitched than hits. Shot sounds
+// also decay faster than hit sounds and have slightly separated initial and
+// secondary attacks, resulting in a "ka-pow" effect.
+//
+// The sounds are generated in stages by different sections of the circuitry.
+// A noise generator, based on a zener diode, continuously produces white
+// noise that forms the basis for all the sounds, and this noise is fed to
+// four separate sound generators. Each generator filters the noise to produce
+// the distinct pitch of its sound. Each generator's sound is triggered by a
+// switch, activated digitally by the CPU. When this switch is turned on
+// momentarily, a storage capacitor is charged up, and that sends power to the
+// sound generator's transistor amplifier. This amplifies the filtered noise
+// with a sharp attack as the switch is turned on and gradual decay as the
+// capacitor drains. The generated sound is filtered further and then
+// attenuated by a potentiometer which controls that sound's relative volume.
+// Each side's two sound effect signals, after being generated and then
+// attenuated by their respective volume pots, are mixed together and then
+// further amplified by a second-stage transistor amplifier for that side.
+// This mixed and amplified signal is itself filtered and then attenuated by
+// the side's master volume potentiometer. Finally it gets sent to the power
+// amplifier IC for that side's speaker. (This emulation does not handle the
+// final power amplification.)
+//
+// The different sound effect generators have a common structure which is
+// repeated four times. The mixers and second-stage amplifiers likewise have a
+// common structure which is repeated twice, and their amplifiers are also
+// rather similar to the effect amplifiers.
+//
+// To make the netlist easier to follow and verify, I've grouped its
+// components and connections by function, with the groups ordered roughly
+// according to the flow of signals:
+//
+// * the activating switches,
+// * the shared noise generator,
+// * the sound-effect noise filters,
+// * the sound-effect initial amplifiers, output coupling capacitors and
+//   filters, and effect-volume potentiometers,
+// * the mixing circuits,
+// * the second-stage amplifiers, output coupling capacitors and filters, and
+//   master-volume potentiometers.
+//
+// Within each group, I've placed the sets of four similar components or
+// connections together and listed them in the order: left-shot, right-shot,
+// left-hit, right-hit. (For mixing and second-stage amplification components,
+// the order is simply left, right.) Individual components are labeled the
+// same as on the schematic.
+
+
+// There are some uncertainties in this emulation about sound levels. The
+// average level of the initially generated noise is uncertain, which poses a
+// problem because all of the sound effects are based on amplifying that
+// noise. The noise is generated by passing a small amount of current through
+// a zener diode on the verge of its breakdown voltage, which results in very
+// noisy current flow. Even though both the type of zener and the average
+// current are known, the average strength of the noise is still uncertain,
+// both because zener manufacturers do not specify performance under these
+// conditions (they recommended zeners for voltage control under more stable,
+// relatively noise-free operating conditions) and because the amount of noise
+// may vary greatly from one zener to the next, even within the same
+// production batch--let alone from one manufacturer to another. This is an
+// inherent problem with zener diodes when used for noise generation.
+//
+// I have chosen a round figure of 2 mV RMS for the zener's average (RMS)
+// noise level. Although this is only a guess, it seems to be in the ballpark
+// for similar zeners operated with similar amounts of average current. It
+// also keeps the noise component of the sound effects strong enough so as not
+// to be overwhelmed by the pulse of the sound effects' initial attacks; this
+// pulse is created by switching on their generating amplifiers and is
+// independent of noise level. Meanwhile, this noise level is still low enough
+// that, with all the volume potentiometers set to their midpoints, the noise
+// won't be clipped by any subsequent amplification stage in the netlist, up
+// to the power amp inputs. (Some such clipping may occur if a sound effect's
+// volume is turned up well beyond its midpoint. That may also be true on real
+// hardware.)
+//
+// The other big uncertainty is the audible effect of the power amp ICs. These
+// amplifiers add both power and voltage gain, which may be enough to distort
+// or clip the output. They may also have an audible filtering effect. In the
+// Gun Fight schematic, and apparently in real machines, they are configured
+// for a voltage gain of 15. Furthermore, any input voltages beyond a few
+// hundred mV (positive or negative) should produce at least some clipping
+// distortion, with the distortion getting worse for stronger signals. With
+// all potentiometers set to the midpoint, the power amp signal inputs should
+// see extreme pulses of +/- 3 V from the initial attack for sound effects,
+// and even past those initial attack pulses, the sound effect noise should
+// kick in at levels above +/- 1 V on the power amp inputs. If these levels
+// are correct and the power amp ICs work as described, the noise of the sound
+// effects should initially be heavily distorted, but since the original
+// signal is already random noise, it's not clear whether that distortion
+// would be apparent. Anyhow, the power amp ICs are completely unemulated
+// here, and any distortion effects they might produce would be quite
+// different from the hard clipping produced when limiting output levels
+// digitally.
+//
+// I have compromized by setting the volume multipliers for the netlist stream
+// outputs so that output levels of +/- 3 volts will produce the maximum
+// allowed stream output magnitudes of +/- 32767. Voltages beyond that will be
+// clipped. This at least produces some distortion if the volume
+// potentiometers are adjusted above their midpoints.
+//
+// Further improving accuracy would require testing signal levels on actual
+// hardware, with allowances made for variations in components, as well as a
+// better understanding of the electrical and sonic behavior of the power
+// amplifiers, speakers, and cabinet. It's questionable whether doing so is
+// worth the effort.
+
+
+// As I've said, this netlist does not include the final stage of sound
+// generation, the twin audio power amplifier ICs. Although it is the norm for
+// MAME analog sound emulation to omit this stage, some discussion of the
+// power amplifiers is worthwhile in this case. Each is an SGS-ATES
+// TAA-621-A11 single-channel amplifier, driving one 8-ohm speaker of about 4
+// or 5 inches.
+//
+// (On the Gun Fight schematic, the TAA-621-A11 is also labeled "LM354". The
+// TAA-621-A11 was introduced in 1970 by the Italian firm SGS. The very
+// similar LM354 was introduced in 1972 by European Electronic Products.
+// However, this company seems to have been a mere U.S. importer and
+// distributor of European components, making the LM354 just a rebadged
+// TAA-621-A11. The LM354 occasionally comes up in discussions of Gun Fight
+// audio but seems to have been otherwise short-lived. One problem with its
+// name is that it can easily be mistaken for a National Semiconductor LMxxx
+// linear IC, even though it's unrelated to that company. To further confuse
+// matters, National Semiconductor had already introduced an LM354 of their
+// own in 1970 which wasn't an audio amplifier at all, but a second-source
+// version of Texas Instruments' SN7525 sense amplifier for minicomputer
+// magnetic-core memory systems.)
+//
+// As is normal for TAA-621-A11 amps, those in Gun Fight are configured with
+// some negative feedback to control their voltage gain. The gain is
+// determined by the ratio of the chip's internal 15-kohm feedback resistor to
+// the external resistor connected to the feedback terminal, pin 10. In Gun
+// Fight this external resistor is 1 kohm, so the ratio, and thus the voltage
+// gain, is 15.
+//
+// The TAA-621-A11 is rated at 4 watts at 10% total harmonic distortion (THD)
+// when supplied with 24-volt power and driving a 16-ohm load. (Although not
+// explicitly stated, this appears to be an RMS rating rather than a peak
+// rating.) In Gun Fight's case, the speaker load is only 8 ohms, and the
+// power supply voltage is a bit lower, about 22 volts (it comes from
+// rectified 16.5-volt-RMS AC, buffered by a large smoothing capacitor). Both
+// of these factors lower the power rating somewhat. Also, a power rating at
+// 10% THD implies clipping is already heavy. The unclipped, clean power
+// rating in Gun Fight would be lower, probably no more than 2 watts RMS,
+// giving output around 4 volts RMS or about 5.5 volts in extreme amplitude.
+// With a power amp voltage gain of 15, this would mean that any input signals
+// with extreme amplitudes greater than about a third of a volt would be
+// subject to power amp clipping.
+//
+// The power amps also have a few other connections, including ripple bypass
+// capacitors to suppress ripple from the unregulated power supply, frequency
+// compensation capacitors to prevent inducing unstable amplifier oscillations
+// at high frequencies, and some filtering on the output to the speakers.
+
 
 // All of the amplifying transistors in this circuit are NPN transistors of a
 // particular type, marked as "A-138" on the Gun Fight schematics. This seems
 // to be the Amperex A-138, a low-power silicon NPN transistor made by Amperex
-// Electronics, which was a U.S. division of Philips. This transistor is long
-// obsolete and has fallen into obscurity. The only source I could find with
-// any data on it (given in greatly abbreviated form) is _Transistor
-// Discontinued Devices D.A.T.A.Book, Edition 16_ (1980), by Derivation and
-// Tabulation Associates; the A-138 is listed on p. 76, line 86. From that
-// source, and the way the transistor is used in Gun Fight, it appears to be
-// a fairly ordinary NPN transistor not very different from the 2N3904.
-
-// Gun Fight's noise generator circuit is based on a reverse-biased 9.1-volt
-// Zener diode (D304, a 1N5239). The Zener's noise current is amplified by a
-// transistor, resulting in white noise output whose peak-to-peak voltage
-// should be around a volt, according to various sources (e.g., _Diode,
-// Transistor & FET Circuits Manual_, R. M. Marston (2013), p. 107). Since the
-// netlist library does not yet support Zener diodes or their noise behavior,
-// I use a very simple 1-volt peak-to-peak white noise generator instead.
-
-static NETLIST_START(NOISE)
-	VS(FV, 0)
-	PARAM(FV.FUNC, "rand() - 0.5")
-
-	ALIAS(P, FV.P)
-	ALIAS(N, FV.N)
-NETLIST_END()
+// Electronic Corporation, which was a U.S. division of Philips. This
+// transistor, being a vendor-specific type long out of production, seems to
+// have fallen into obscurity. The only source I could find with any data on
+// it (given in greatly abbreviated form) is _Transistor Discontinued Devices
+// D.A.T.A.Book, Edition 16_ (1980), by Derivation and Tabulation Associates,
+// which lists the A-138 on p. 76, line 86.
+//
+// This source shows the A-138 to be an ordinary amplifier transistor of
+// fairly high gain, with a maximum small-signal forward current transfer
+// ratio (h_fe, AC current gain) of 650. The minimum h_fe is not given, but it
+// can be estimated using the fact that such transistors are often graded and
+// designated by gain. The A-137, another Amperex transistor listed on line 85
+// of the same D.A.T.A.Book page, has the same limits on power, collector
+// current, and junction voltages, and thus appears to be in the same series,
+// but it has a maximum h_fe of 415. If the A-137 was the next lower grade of
+// gain from the A-138, the latter should have a minimum h_fe around 400.
+// Values for h_FE, the DC forward current transfer ratio (DC current gain),
+// aren't given for the A-138, but the range would be about the same or a bit
+// lower, perhaps 350-600, with an average around 450-500.
+//
+// The high gain of Gun Fight's A-138 transistors causes a "ka-pow" effect in
+// its shot sounds; I explain how later. (Andy Wellburn, in a Discord chat on
+// 2020-06-05, confirmed this effect can be heard in some actual machines. He
+// measured an h_FE of 238 for one A-138 from a Gun Fight sound board, but he
+// warned that for old transistors like this, h_FE measurements can vary a
+// lot, and I'm not surprised that the transistors' gain might be reduced more
+// than 40 years later. But even a gain of 238 turns out to be high enough to
+// give the "ka-pow" shot effect.)
+//
+// Considering the A-138's high gain and other limits, a decent match for it
+// here seems to be the BC548C, which is modeled in the netlist library. The
+// BC548C is the high-gain version of the BC548, a widely used Pro Electron
+// standard type of general-purpose small-signal transistor in a through-hole
+// TO-92 package. All A-138 transistors in this netlist are modeled as
+// BC548Cs.
 
-// Most of the Gun Fight sound circuits have a common structure which is
-// repeated four times, one for each type of sound effect. (For the common
-// left-master and right-master amplifiers and outputs, the structure is
-// repeated only twice.) To make the netlist easier to follow and verify, I've
-// grouped its components and connections by function, ordering the groups
-// approximately according to the flow of signals from the activating switches
-// (and the common noise source) to the initial sound-effect filters and
-// amplifiers, to their coupling capacitors and potentiometers, and then to
-// the mixing circuits and the second-stage amplifiers, coupling capacitors
-// and master-volume potentiometers. Within each group, I've grouped the sets
-// of four similar components or connections together and listed them in the
-// order: left-shot, right-shot, left-hit, right-hit. (For master-related
-// components, the order is simply left and right.)
-
-// The sound effects are simple "bang" sounds that are generated by
-// single-transistor amplifiers which are wired in a common-emitter
-// configuration. These amplifiers draw their current from storage capacitors
-// which are charged from the 16.5-volt power supply via dual-transistor
-// switches; the switches, in turn, are activated by digital signals from TTL
-// logic. The charging of the capacitors by the switches, and their
-// discharging by the amplifiers, provide the attack and decay of the "bang"
-// sounds.
 
 static NETLIST_START(gunfight_schematics)
 
-#if FAST_SWITCHES
+	// **** Sound effect activation switches.
+
+	// These switches are triggered by digital logic signals activated by
+	// the CPU. A high TTL logic level turns the switch on, allowing
+	// 16-volt power to flow through the switch into the sound effect
+	// generator's amplifier and storage capacitor, and a low logic level
+	// turns the switch off, cutting off the power flow. In practice, each
+	// sound effect is triggered by turning its switch on for about 50 ms
+	// and then switching it off again.
+	//
+	// Each switch is built from two transistors: a "low-side" NPN
+	// transistor which is switched on when a high TTL output level drives
+	// the NPN's base high, and a "high-side" PNP transistor which is
+	// switched on when the now conducting NPN pulls the PNP's base low.
+	// It is the high-side PNP transistor that actually switches the
+	// 16-volt power, hence the term "high-side".
 
-	// Use fast, abstracted activation switches instead of a detailed
-	// circuit model of the actual dual-transistor activation switches.
-	// Although the latter would simulate the total circuit more
-	// accurately, it does not make any audible difference in the
-	// sound output produced.
-
-	SYS_DSW(SW_LEFT_SHOT,  IN_LS, I_V16_5.Q, R130.1)
-	SYS_DSW(SW_RIGHT_SHOT, IN_RS, I_V16_5.Q, R230.1)
-	SYS_DSW(SW_LEFT_HIT,   IN_LH, I_V16_5.Q, R117.1)
-	SYS_DSW(SW_RIGHT_HIT,  IN_RH, I_V16_5.Q, R217.1)
+#if FAST_SWITCHES
 
-	// The default on-resistance of 1 ohm is a bit high for my tastes,
-	// considering the charging resistor which follows is only 15 ohms.
+	// Use abstracted activation switches instead of a detailed circuit
+	// model of the dual-transistor switches. This gives faster emulation
+	// while not making any audible difference in the sound produced.
+
+	SYS_DSW(SW_LEFT_SHOT,  IN_LS, I_V16.Q, R130.1)
+	SYS_DSW(SW_RIGHT_SHOT, IN_RS, I_V16.Q, R230.1)
+	SYS_DSW(SW_LEFT_HIT,   IN_LH, I_V16.Q, R117.1)
+	SYS_DSW(SW_RIGHT_HIT,  IN_RH, I_V16.Q, R217.1)
+
+	// Lower the on-resistance to a more accurate value. The charging
+	// resistor which follows is only 15 ohms, so the default
+	// on-resistance of 1 ohm might noticeably affect the result.
 	PARAM(SW_LEFT_SHOT.RON, 0.1)
 	PARAM(SW_RIGHT_SHOT.RON, 0.1)
 	PARAM(SW_LEFT_HIT.RON, 0.1)
@@ -91,11 +257,7 @@
 
 #else
 
-	// Each dual-transistor switch has two parts: a "low-side" NPN
-	// transistor which is switched by a TTL logic input, and a
-	// "high-side" PNP transistor which is switched by the low-side
-	// NPN transistor. It is the PNP transistor which actually switches
-	// the 16.5-volt power.
+	// Detailed circuit model of the dual-transistor switches.
 
 	// "Low-side" NPN transistor switches, driven by TTL logic inputs.
 
@@ -114,14 +276,16 @@
 	RES(R120, RES_K(5.1))
 	RES(R220, RES_K(5.1))
 
-	QBJT_SW(Q108, "NPN")
-	QBJT_SW(Q208, "NPN")
-	QBJT_SW(Q105, "NPN")
-	QBJT_SW(Q205, "NPN")
-
-	// These actually all go to TTL ground at pin 7 of 7404 IC H6,
-	// rather than the usual circuit ground.
-	NET_C(R133.2, R233.2, R120.2, R220.2, Q108.E, Q208.E, Q105.E, Q205.E, GND)
+	QBJT_SW(Q108, "BC548C")
+	QBJT_SW(Q208, "BC548C")
+	QBJT_SW(Q105, "BC548C")
+	QBJT_SW(Q205, "BC548C")
+
+	// These all go to TTL ground at pin 7 of 7404 IC H6, rather than the
+	// ground used for the other sound circuits.
+	NET_C(GND,
+		  R133.2, R233.2, R120.2, R220.2,
+		  Q108.E, Q208.E, Q105.E, Q205.E)
 
 	NET_C(R134.2, R133.1, Q108.B)
 	NET_C(R234.2, R233.1, Q208.B)
@@ -138,22 +302,26 @@
 	NET_C(Q105.C, R118.1)
 	NET_C(Q205.C, R218.1)
 
-	// "High-side" PNP transistor switches, driven by "low-side"
-	// NPN switch outputs. The output of these goes to the storage
-	// capacitors and the current inputs of the sound-effect amplifiers.
+	// "High-side" PNP transistor switches, driven by "low-side" NPN
+	// switch outputs. The PNP switch outputs charge the storage
+	// capacitors that supply power to the sound-effect amplifiers; in
+	// addition, while they are on they power the amplifiers directly.
 
 	RES(R132, RES_K(5.1))
 	RES(R232, RES_K(5.1))
 	RES(R119, RES_K(5.1))
 	RES(R219, RES_K(5.1))
 
+	// The actual transistors used here are 2N4125s:
 	QBJT_SW(Q107, "PNP")
 	QBJT_SW(Q207, "PNP")
 	QBJT_SW(Q104, "PNP")
 	QBJT_SW(Q204, "PNP")
 
-	// All connected to 16.5-volt power.
-	NET_C(R132.1, R232.1, R119.1, R219.1, Q107.E, Q207.E, Q104.E, Q204.E, I_V16_5.Q)
+	// All connected to 16-volt power.
+	NET_C(I_V16.Q,
+		  R132.1, R232.1, R119.1, R219.1,
+		  Q107.E, Q207.E, Q104.E, Q204.E)
 
 	NET_C(R131.2, R132.2, Q107.B)
 	NET_C(R231.2, R232.2, Q207.B)
@@ -165,12 +333,13 @@
 	NET_C(Q104.C, R117.1)
 	NET_C(Q204.C, R217.1)
 
-	// Description of switches ends here.
+	// End of switch description.
 
 #endif
 
-	// The following are the current inputs to the storage capacitors and
-	// sound-effect amplifiers.
+
+	// **** Current supply and storage capacitors for sound-effect
+	// **** amplifiers.
 
 	RES(R130, RES_R(15))
 	RES(R230, RES_R(15))
@@ -181,35 +350,126 @@
 	CAP(C222, CAP_U(10))
 	CAP(C116, CAP_U(20))
 	CAP(C216, CAP_U(20))
-	NET_C(C122.2, C222.2, C116.2, C216.2, GND)
+	NET_C(GND, C122.2, C222.2, C116.2, C216.2)
 
 	NET_C(R130.2, C122.1, R126.1, R124.1)
 	NET_C(R230.2, C222.1, R226.1, R224.1)
 	NET_C(R117.2, C116.1, R113.1, R111.1)
 	NET_C(R217.2, C216.1, R213.1, R211.1)
 
-	// Use a simple noise generating macro device, based on a voltage
-	// source, to simulate the AC noise generated by amplified Zener.
-	// This is the basic noise source which is filtered and amplified by
-	// the sound-effect circuits.
-
-	NOISE(N1)
-	NET_C(N1.N, GND)
 
-	// Coupling capacitors from noise generator to sound effect
-	// frequency filters.
+	// **** Shared white-noise generator circuit. This is the basic noise
+	// **** source which is filtered and amplified by the sound-effect
+	// **** circuits.
+
+	// Gun Fight's noise generator circuit is based on a reverse-biased
+	// 9.1-volt zener diode (D304, a 1N5239) whose noise current is then
+	// amplified by an A-138 NPN transistor, producing white noise at
+	// audio frequencies.
+	//
+	// (Strictly speaking, this is not a *pure* white noise generator,
+	// because the generator's bypass capacitor and biasing resistor, in
+	// combination with negative feedback from the amplified signal, act
+	// as a high-pass RC filter, filtering out the lowest noise
+	// frequencies.)
+	//
+	// Figuring out how strong the noise signal should be for this circuit
+	// is difficult. The noise generator's biasing resistors and
+	// transistor gain limit the average current through its zener to
+	// around 2 microamps, but the 1N5239 is normally expected to be used
+	// with much larger currents, in the range of 250 microamps to 50
+	// milliamps.
+	//
+	// Zeners are most often used for smoothly controlling and limiting
+	// voltage with minimal fluctuation, like in a power regulator. But a
+	// zener can only do this smoothly if it passes a large enough
+	// current. This is especially true for "zeners" of voltages of 9.1
+	// volts or more, which properly speaking are "avalanche diodes" that
+	// don't user the actual Zener effect but rather a different effect,
+	// avalanche breakdown, which is capable of generating far more noise.
+	// Standard zener specifications include "knee" figures which in
+	// effect give the minimum expected current, along with the maximum
+	// "dynamic impedance" at that current: how much the voltage may vary
+	// if the current changes, or vice versa. For the 1N5239, the knee is
+	// at 250 microamps, and the maximum dynamic impedance at the knee is
+	// 600 ohms, so a 1 microamp increase in current at that point would
+	// raise the voltage drop by up to 0.6 millivolts. Noise values for
+	// zeners are often not given at all, or if they are (as with
+	// Motorola's zeners), they are given at the knee current. In short,
+	// the manufacturer expects the current to be kept above the knee
+	// value, and if your current is lower, you're on your own.
+	//
+	// At very low currents, still within the breakdown region but well
+	// below the knee current, the zener's dynamic impedance is much
+	// greater, and more importantly, so is its noise. The conduction of
+	// current is no longer smooth and regular, but pulsing and episodic,
+	// as small conducting "microplasmas" within the diode's junction are
+	// repeatedly triggered and extinguished, like microscopic versions of
+	// lightning bolts in a thunderstorm.
+	//
+	// The netlist library includes a Zener diode model, but this model
+	// does not simulate the Zener's noise behavior. Instead I generate
+	// the noise from a noise voltage source in series with the Zener.
+
+	// Simple model of a 1N5239 9.1-volt Zener diode. The 1N5239 is
+	// specified to conduct 20 mA of current at its nominal breakdown
+	// voltage of 9.1 V. The model produces an exponential I-V curve,
+	// passing through this point, which has the same general shape as
+	// that of a normal forward-biased diode. NBV is an exponent scale
+	// factor; its value here of 1 gives the curve a steep rise and a
+	// relatively sharp knee. Actual breakdown I-V curves have an even
+	// steeper rise and sharper knee, too steep and sharp to be
+	// represented by an exponential, but this model is good enough for
+	// this emulation, since the diode operates very close to a single
+	// point on the curve.
+	ZDIODE(D304, "D(BV=9.1 IBV=0.020 NBV=1)")
+
+	// 24 kHz noise clock for the noise source, chosen to retain noise
+	// frequencies as high as possible for 48 kHz sample rate.
+	CLOCK(NCLK, 24000)
+	NET_C(I_V5.Q, NCLK.VCC)
+	NET_C(GND, NCLK.GND)
+
+	// Normally-distributed noise of 2 millivolts RMS voltage.
+	// This level was chosen to have a strong amplified noise signal that
+	// won't be clipped by any subsequent stages of amplification before
+	// the power amps, if the volume potentiometers are not raised beyond
+	// their approximate midpoints.
+	SYS_NOISE_MT_N(NOISE, 0.002)
+
+	NET_C(NCLK.Q, NOISE.I)
+
+	RES(R302, RES_K(6.8))
+	RES(R303, RES_K(6.8))
+	CAP(C307, CAP_U(10))
+	NET_C(C307.2, GND)
+	QBJT_EB(Q302, "BC548C")
+	NET_C(Q302.E, GND)
+
+	NET_C(I_V16.Q, R302.1)
+	NET_C(Q302.B, NOISE.1)
+	NET_C(D304.A, NOISE.2)
+	NET_C(R303.2, C307.1, D304.K)
+
+	// Coupling capacitors from noise generator to sound effect frequency
+	// filters. (These coupling capacitors, together with the resistances
+	// beyond them, act as high-pass filters with very low cutoff
+	// frequencies.)
 
 	CAP(C303, CAP_U(0.1))
 	CAP(C306, CAP_U(0.1))
 	CAP(C304, CAP_U(0.1))
 	CAP(C305, CAP_U(0.1))
 
-	NET_C(C303.1, C306.1, C304.1, C305.1, N1.P)
+	NET_C(R302.2, Q302.C, R303.1, C303.1, C306.1, C304.1, C305.1)
+
 
-	// Sound effect frequency filters. Each of these is a second-order
-	// low-pass filter with cutoff frequency determined by its component
-	// values. The different capacitor values produce each sound effect's
-	// distinct pitch.
+	// **** Sound effect frequency filters.
+
+	// Each sound effect has a pair of passive low-pass RC filters with
+	// cutoff frequencies determined by their component values. The
+	// different capacitor values produce each sound effect's distinct
+	// pitch.
 
 	RES(R129, RES_K(20))
 	RES(R229, RES_K(20))
@@ -243,12 +503,65 @@
 	CAP(C214, CAP_U(0.047))
 	NET_C(C120.2, C220.2, C114.2, C214.2, GND)
 
-	// Sound effect amplifier circuits. Each of these is a single NPN
-	// transistor wired as a common-emitter amplifier. The "hit"
-	// sound effect amplifiers also have a bypass capacitor at the
-	// emitter. The attack and decay of the sound effects is handled
-	// by controlling the current supply to each amplifier, which is
-	// done by the switching circuits described above.
+
+	// **** Sound effect amplifier circuits.
+
+	// Each sound-effect amplifier is a single NPN transistor wired as a
+	// common-emitter amplifier. The amplifiers for "hit" sounds also have
+	// a bypass capacitor at the emitter, while those for "shot" sounds
+	// have no bypass capacitor and a much lower emitter resistance. The
+	// attack and decay of the sound effects is handled by controlling the
+	// current supply to each amplifier, which is done by the switching
+	// circuits and supply capacitors described above.
+
+	// More explanation is needed for the "shot" sounds. Apart from their
+	// higher frequency and faster decay, the "ka-pow" effect in their
+	// initial attack further distinguishes them from the "hit" sounds.
+	// This effect comes from the high current gain (around 450-500) of
+	// the amplifier's A-138 transistor together with the low emitter
+	// resistance. When the current supply for the sound is switched on,
+	// the collector voltage at first spikes upward as the supply
+	// capacitor is charged. But the transistor's base voltage and base
+	// current also rise, which "turns on" the transistor, and as its
+	// collector current increases through its biasing resistor, the
+	// collector voltage plummets. For the "shot" sound transistors,
+	// because of their high current gain and low emitter resistance, the
+	// collector current grows so much that the collector voltage is
+	// pulled below the base voltage, pushing the transistor into
+	// saturation. This persists for as long as the current supply switch
+	// remains on; the collector voltage stays low with little variation.
+	// In this state the amplifier's input noise signal is being clipped
+	// rather than amplified.
+
+	// The result is that the sound effect's initial voltage spike is
+	// followed by a relatively prolonged low with almost no noise. As
+	// this signal passes through the output coupling capacitor, the
+	// intervening filter and potentiometer, and then the second
+	// amplification stage, it becomes a series of strong oscillations,
+	// followed by a momentary silence which lasts as long as the sound's
+	// switch is held on: around 50 milliseconds.
+
+	// Finally the sound switch is turned off, and the amplifier's supply
+	// voltage and current begin to drop as the supply capacitor
+	// discharges. The base current and collector current drop also, and
+	// the collector voltage begins to rise, eventually rising above the
+	// base voltage again. The transistor leaves saturation and returns to
+	// forward active mode. Now the noise signal is not being clipped but
+	// gets properly amplified on the collector output. So the momentary
+	// silence is followed by a sudden burst of noise, which then dies
+	// away as the supply capacitor is drained.
+
+	// The result is the shot's distinct "ka-pow" sound: an initial
+	// punctuating crack, a very brief silence, and a sudden noise burst
+	// that quickly fades.
+
+	// The "hit" sounds don't have this effect, despite using the same
+	// high-gain transistors, because their transistor amplifiers have a
+	// bypass capacitor and a much larger emitter resistance, 1 Kohm
+	// versus 100 ohms. That higher resistance keeps the collector current
+	// low enough that the collector voltage never drops below the base
+	// voltage, so the transistor never saturates, while the bypass
+	// capacitor allows the amplifier's AC gain to remain very high.
 
 	RES(R126, RES_K(330))
 	RES(R226, RES_K(330))
@@ -276,10 +589,10 @@
 	CAP(C213, CAP_U(50))
 	NET_C(C113.2, C213.2, GND)
 
-	QBJT_EB(Q106, "NPN")
-	QBJT_EB(Q206, "NPN")
-	QBJT_EB(Q103, "NPN")
-	QBJT_EB(Q203, "NPN")
+	QBJT_EB(Q106, "BC548C")
+	QBJT_EB(Q206, "BC548C")
+	QBJT_EB(Q103, "BC548C")
+	QBJT_EB(Q203, "BC548C")
 
 	NET_C(R128.2, C120.1, R126.2, R127.1, Q106.B)
 	NET_C(R228.2, C220.1, R226.2, R227.1, Q206.B)
@@ -291,10 +604,18 @@
 	NET_C(R112.1, C113.1, Q103.E)
 	NET_C(R212.1, C213.1, Q203.E)
 
-	// Coupling capacitors and volume potentiometers for sound effect
-	// amplifier outputs. There are four volume pots, for shot and hit
-	// sounds on left and right. Presently these pots are fixed at the
-	// midpoint of their range.
+
+	// **** Coupling capacitors, high-pass (pulse-differentiator) filters,
+	// **** and volume potentiometers for sound effect amplifier outputs.
+
+	// These circuits act as high-pass filters on the sound effect
+	// generator outputs, with very low cutoff frequencies. Because the
+	// cutoff frequency is so low, one of the main effects of the filter
+	// is to remove any flat areas from the initial turn-on pulse of the
+	// sound effect generator amplifier. The filter effectively
+	// differentiates the pulse, producing output voltage proportional to
+	// the steepness of its slope. This replaces the single wide pulse of
+	// the initial attack with a sequence of sharp spike pulses.
 
 	CAP(C119, CAP_U(0.047))
 	CAP(C219, CAP_U(0.047))
@@ -312,7 +633,9 @@
 	CAP(C211, CAP_U(0.033))
 	NET_C(C118.2, C218.2, C111.2, C211.2, GND)
 
-	// FIXME - sound effect volume potentiometers should be adjustable.
+	// There are four sound-effect volume pots, for shot and hit sounds on
+	// left and right.
+
 	POT(R123, RES_K(50))
 	POT(R223, RES_K(50))
 	POT(R110, RES_K(50))
@@ -320,23 +643,19 @@
 	NET_C(R123.3, R223.3, R110.3, R210.3, GND)
 
 	// Reverse the sense of pot adjustments so that larger values result
-	// in greater volume, which we will want if, as I hope, these are
-	// made user-adjustable.
+	// in greater volume.
 	PARAM(R123.REVERSE, 1)
 	PARAM(R223.REVERSE, 1)
 	PARAM(R110.REVERSE, 1)
 	PARAM(R210.REVERSE, 1)
-	PARAM(R123.DIAL, 0.5)
-	PARAM(R223.DIAL, 0.5)
-	PARAM(R110.DIAL, 0.5)
-	PARAM(R210.DIAL, 0.5)
 
 	NET_C(C119.2, C118.1, R123.1)
 	NET_C(C219.2, C218.1, R223.1)
 	NET_C(C112.2, C111.1, R110.1)
 	NET_C(C212.2, C211.1, R210.1)
 
-	// Mixing of shot and hit sounds for each side.
+
+	// **** Mixing of shot and hit sounds for each side.
 
 	RES(R122, RES_K(30))
 	RES(R222, RES_K(30))
@@ -358,13 +677,16 @@
 	NET_C(R109.1, C110.2)
 	NET_C(R209.1, C210.2)
 
-	// Second-stage amplifier circuits, which amplify each side's
-	// mixed shot and hit sounds. These are similar to the sound-effect
-	// amplifiers (particularly the "hit" ones), each being a single
-	// NPN transistor wired in common-emitter configuration, with a
-	// bypass capacitor at the emitter. They have no need for an
-	// attack-decay envelope, however, and so get their current
-	// directly from the 16.5-volt power supply.
+
+	// **** Second-stage amplifier circuits, which amplify each side's
+	// **** mixed shot and hit sounds.
+
+	// These amplifiers are similar to those for the "hit" sound effects,
+	// each being a single A-138 NPN transistor wired in common-emitter
+	// configuration, with a 1-Kohm resistance and a bypass capacitor at
+	// the emitter. They have no need for an attack-decay envelope,
+	// however, and so get their current directly from the 16-volt power
+	// supply.
 
 	RES(R107, RES_K(150))
 	RES(R207, RES_K(150))
@@ -384,10 +706,10 @@
 	CAP(C209, CAP_U(50))
 	NET_C(C109.2, C209.2, GND)
 
-	NET_C(R107.1, R207.1, R108.1, R208.1, I_V16_5.Q)
+	NET_C(R107.1, R207.1, R108.1, R208.1, I_V16.Q)
 
-	QBJT_EB(Q102, "NPN")
-	QBJT_EB(Q202, "NPN")
+	QBJT_EB(Q102, "BC548C")
+	QBJT_EB(Q202, "BC548C")
 
 	NET_C(C110.1, C117.1, R107.2, R105.1, Q102.B)
 	NET_C(C210.1, C217.1, R207.2, R205.1, Q202.B)
@@ -395,10 +717,9 @@
 	NET_C(R106.1, C109.1, Q102.E)
 	NET_C(R206.1, C209.1, Q202.E)
 
-	// Coupling capacitors and volume potentiometers for second-stage
-	// amplifier outputs. There are two volume pots, for left and right
-	// master volume. Presently these pots are fixed at the midpoint of
-	// their range.
+
+	// **** Coupling capacitors, bandpass filters, and volume
+	// **** potentiometers for second-stage amplifier outputs.
 
 	CAP(C108, CAP_U(0.047))
 	CAP(C208, CAP_U(0.047))
@@ -416,31 +737,35 @@
 	CAP(C207, CAP_U(0.001))
 	NET_C(C107.2, C207.2, GND)
 
-	// FIXME - master volume potentiometers should be adjustable.
+	// There are two master volume pots, for left and right.
+
 	POT(R103, RES_K(47))
 	POT(R203, RES_K(47))
 	NET_C(R103.3, R203.3, GND)
 
 	// Reverse the sense of pot adjustments so that larger values result
-	// in greater volume, which we will want if, as I hope, these are
-	// made user-adjustable.
+	// in greater volume.
 	PARAM(R103.REVERSE, 1)
 	PARAM(R203.REVERSE, 1)
-	PARAM(R103.DIAL, 0.5)
-	PARAM(R203.DIAL, 0.5)
 
 	NET_C(R104.2, C107.1, R103.1)
 	NET_C(R204.2, C207.1, R203.1)
 
-	// The following are the left and right speaker outputs. In the real
-	// circuit they don't drive the speakers directly, being far too weak,
-	// but rather go to pin 7, the signal input, of the respective
-	// TAA621A11 (or LM354) audio power amplifier ICs for the left and
-	// right speakers.
+	// The potentiometer outputs are used here as the left and right audio
+	// outputs. In the real circuit they drive the signal inputs of the
+	// audio power amplifier ICs for the left and right speakers.
 
 	ALIAS(OUT_L, R103.2)
 	ALIAS(OUT_R, R203.2)
 
+	// The real outputs are somewhat constrained in that they drive the
+	// bases of the input transistors within the power amplifiers. If they
+	// go too low in voltage, there seems to be a peculiar effect on the
+	// speaker output waveforms, although I'm not sure whether this is a
+	// real effect or an artifact of the LTspice simulation I constructed.
+	// Nor am I sure whether it matters in practice. In any case, it's not
+	// modeled here.
+
 NETLIST_END()
 
 
@@ -448,17 +773,20 @@
 
 	SOLVER(Solver, 48000)
 	PARAM(Solver.SORT_TYPE, "ASCENDING")
-	// For this netlist, ASCENDING turns out to be the fastest of the
-	// available sort types, roughly 40% faster than the default
-	// PREFER_IDENTITY_TOP_LEFT.
-
-	LOCAL_LIB_ENTRY(NOISE)
+	// For this netlist, ASCENDING turns out to be slightly faster than
+	// the default sort type of PREFER_IDENTITY_TOP_LEFT, but the
+	// difference when using static solvers is very small.
 
 	LOCAL_SOURCE(gunfight_schematics)
 
 	INCLUDE(gunfight_schematics)
 
-	ANALOG_INPUT(I_V16_5, 16.5)  // 16.5-volt power for sound amplifiers
+	// The amplifying transistors all get 16-volt power. The raw AC power
+	// input from the main power supply to the game logic board is 16.5
+	// volts, but this is rectified and regulated to about 16 volts via
+	// TIP-31 power transistor Q301 and BZX61-C16 16-volt Zener diode
+	// D304.
+	ANALOG_INPUT(I_V16, 16)  // 16-volt power for sound amplifiers
 	ANALOG_INPUT(I_V5, 5)  // 5-volt power for logic input devices
 
 	LOGIC_INPUT(I_LEFT_SHOT,  0, "74XX")
@@ -467,10 +795,12 @@
 	LOGIC_INPUT(I_RIGHT_HIT,  0, "74XX")
 
 	// Power and ground connections for logic input devices:
-	NET_C(I_V5.Q, I_LEFT_SHOT.VCC, I_RIGHT_SHOT.VCC,
-		I_LEFT_HIT.VCC, I_RIGHT_HIT.VCC)
-	NET_C(GND, I_LEFT_SHOT.GND, I_RIGHT_SHOT.GND,
-		I_LEFT_HIT.GND, I_RIGHT_HIT.GND)
+	NET_C(I_V5.Q,
+		  I_LEFT_SHOT.VCC, I_RIGHT_SHOT.VCC,
+		  I_LEFT_HIT.VCC, I_RIGHT_HIT.VCC)
+	NET_C(GND,
+		  I_LEFT_SHOT.GND, I_RIGHT_SHOT.GND,
+		  I_LEFT_HIT.GND, I_RIGHT_HIT.GND)
 
 	ALIAS(IN_LS, I_LEFT_SHOT.Q)
 	ALIAS(IN_RS, I_RIGHT_SHOT.Q)
@@ -480,9 +810,11 @@
 #if USE_FRONTIERS
 	// These frontiers keep the mostly independant halves of the circuit
 	// (left channel and right channel) from affecting each other and the
-	// noise generator, which speeds up processing by about 10% while
-	// making no audible change in the output. Perhaps better ones could
-	// be found, but I don't know how to do so or if it's even possible.
+	// noise generator, which speeds up processing substantially while
+	// making no audible change in the output. These seem to be the only
+	// frontiers which improve performance; I haven't been able to find
+	// any additional beneficial ones from examining the circuit and
+	// experimenting.
 	OPTIMIZE_FRONTIER(C303.1, RES_M(1), 50)
 	OPTIMIZE_FRONTIER(C306.1, RES_M(1), 50)
 	OPTIMIZE_FRONTIER(C304.1, RES_M(1), 50)
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_kidniki.cpp mame-0.224+dfsg.1/src/mame/audio/nl_kidniki.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_kidniki.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_kidniki.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -367,7 +367,7 @@
 	PARAM(Solver.FPTYPE, "DOUBLE")
 	//PARAM(Solver.METHOD, "MAT")
 	//PARAM(Solver.PIVOT, 1)
-	//PARAM(Solver.METHOD, "GMRES")
+	//PARAM(Solver.Solver_0.METHOD, "GMRES")
 	PARAM(Solver.SOR_FACTOR, 1.313)
 	PARAM(Solver.DYNAMIC_TS, 0)
 	PARAM(Solver.DYNAMIC_LTE, 5e-4)
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_mario.cpp mame-0.224+dfsg.1/src/mame/audio/nl_mario.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_mario.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_mario.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -53,14 +53,16 @@
 	SN74LS629(1J_A, CAP_N(3.9))
 	NET_C(1J_A.RNG, V5)
 	NET_C(1J_A.ENQ, ttllow)
-	NET_C(GND, 1J_A.GND)
+	NET_C(GND, 1J_A.OSCGND)
+	NET_C(VCC, 1J_A.OSCVCC)
 
 	// #define MR_C17      CAP_N(22)        /* verified                            */
 
 	SN74LS629(2J_A, CAP_N(22))
 	NET_C(2J_A.RNG, V5)
 	NET_C(2J_A.ENQ, ttllow)
-	NET_C(GND, 2J_A.GND)
+	NET_C(GND, 2J_A.OSCGND)
+	NET_C(VCC, 2J_A.OSCVCC)
 
 	TTL_7486_XOR(1K_A, 1J_A.Y, 2J_A.Y)
 	TTL_7408_AND(2K_A, 2H_A.Q, 1K_A)
@@ -99,12 +101,14 @@
 	SN74LS629(1J_B, CAP_N(39))      /* C5 */
 	NET_C(1J_B.RNG, V5)
 	NET_C(1J_B.ENQ, ttllow)
-	NET_C(GND, 1J_B.GND)
+	NET_C(GND, 1J_B.OSCGND)
+	NET_C(VCC, 1J_B.OSCVCC)
 
 	SN74LS629(2J_B, CAP_N(6.8))     /* C16 */
 	NET_C(2J_B.RNG, V5)
 	NET_C(2J_B.ENQ, ttllow)
-	NET_C(GND, 2J_B.GND)
+	NET_C(GND, 2J_B.OSCGND)
+	NET_C(VCC, 2J_B.OSCVCC)
 
 	TTL_7486_XOR(1K_B, 1J_B.Y, 2J_B.Y)
 	TTL_7408_AND(2K_B, 2H_B.Q, 1K_B)
@@ -139,12 +143,13 @@
 	SN74LS629(4K_A, CAP_U(0.022))
 	NET_C(4K_A.RNG, V5)
 	NET_C(4K_A.ENQ, ttllow)
-	NET_C(GND, 4K_A.GND)
+	NET_C(GND, 4K_A.OSCGND)
+	NET_C(VCC, 4K_A.OSCVCC)
 	NET_C(R65.1, 4J_A.Q)
 	NET_C(R65.2, 4K_A.FC, C44.1)
 	NET_C(C44.2, GND)
 
-	CD4020_WI(3H, 4K_B.Y, ttllow, V5, GND)
+	CD4020(3H, 4K_B.Y, ttllow, V5, GND)
 	TTL_7404_INVERT(4J_B, 3H.Q12)
 
 	RES(R64, RES_K(20))
@@ -153,7 +158,8 @@
 	SN74LS629(4K_B, CAP_U(0.0047))
 	NET_C(4K_B.RNG, V5)
 	NET_C(4K_B.ENQ, ttllow)
-	NET_C(GND, 4K_B.GND)
+	NET_C(GND, 4K_B.OSCGND)
+	NET_C(VCC, 4K_B.OSCVCC)
 	NET_C(R64.1, 4J_B.Q)
 	NET_C(R64.2, 4K_B.FC, C43.1)
 	NET_C(C43.2, GND)
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_ripoff.cpp mame-0.224+dfsg.1/src/mame/audio/nl_ripoff.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_ripoff.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_ripoff.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,699 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Rip Off
+//
+// Derived from the schematics in the Rip Off manual.
+//
+// Known problems/issues:
+//
+//    * Voltage triggers for Motor 1 and Beep need a hack to
+//       work (reducing resistance on one resistor from 4.7K to 100)
+//       Need to understand why.
+//
+//    * Motor 1 and beep sounds dominate the output. They are
+//       controlled by the current driven into the CCAs IC12 and
+//       IC6. Not sure if this overdrive is related to the problem
+//       with the switch above, but for now a hack is enabled to
+//       multiply the resistance by 5x going into the CCA, which
+//       seems to restore the balance to something reasonable.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_cinemat_common.h"
+
+//
+// Optimizations
+//
+
+#define HLE_LASER_VCO (1)
+#define HLE_TORPEDO_VCO (1)
+#define HLE_BACKGROUND_VCOS (1)
+#define ENABLE_FRONTIERS (1)
+
+
+//
+// Hacks
+//
+
+#define HACK_VOLTAGE_SWITCH (1)
+#define HACK_CCA_RESISTANCE (1)
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(ripoff)
+
+	SOLVER(Solver, 1000)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	TTL_INPUT(I_OUT_0, 0)               // active high
+	TTL_INPUT(I_OUT_1, 0)               // active high
+	TTL_INPUT(I_OUT_2, 0)               // active high
+	TTL_INPUT(I_OUT_3, 0)               // active high
+	TTL_INPUT(I_OUT_4, 0)               // active high
+	TTL_INPUT(I_OUT_7, 0)               // active high
+
+	NET_C(GND, I_OUT_0.GND, I_OUT_1.GND, I_OUT_2.GND, I_OUT_3.GND, I_OUT_4.GND, I_OUT_7.GND)
+	NET_C(I_V5, I_OUT_0.VCC, I_OUT_1.VCC, I_OUT_2.VCC, I_OUT_3.VCC, I_OUT_4.VCC, I_OUT_7.VCC)
+
+	CINEMAT_LOCAL_MODELS
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V15, 15)
+	ANALOG_INPUT(I_VM15, -15)
+
+	RES(R1, RES_K(47))
+	RES(R2, RES_K(47))
+	RES(R3, RES_K(330))
+	RES(R4, RES_K(10))
+	RES(R5, RES_K(2.7))
+	RES(R6, RES_K(2.7))
+	RES(R7, RES_K(1))
+	RES(R8, RES_K(470))
+	RES(R9, 330)
+	RES(R10, RES_K(20))
+#if (HACK_VOLTAGE_SWITCH)
+	RES(R11, 100)
+#else
+	RES(R11, RES_K(4.7))
+#endif
+	RES(R12, 300)
+	RES(R13, RES_K(4.7))
+	RES(R14, RES_K(8.2))
+	RES(R15, RES_K(15))
+	RES(R16, RES_K(2.7))
+	RES(R17, RES_K(2.7))
+#if (HACK_CCA_RESISTANCE)
+	RES(R18, RES_K(4100))
+#else
+	RES(R18, RES_K(820))
+#endif
+	RES(R19, RES_K(27))
+	RES(R20, RES_K(39))
+	RES(R21, RES_K(10))
+	RES(R22, 330)
+	RES(R23, 160)
+	RES(R24, RES_K(1))
+	RES(R25, RES_K(1))
+	RES(R26, RES_K(1))
+	RES(R27, RES_K(2))
+	RES(R28, RES_K(2))
+	RES(R29, RES_K(4.7))
+	RES(R30, RES_K(3.3))
+	RES(R31, RES_K(68))
+	RES(R32, RES_K(30))
+	RES(R33, RES_K(15))
+	RES(R34, RES_K(2.7))
+	RES(R35, RES_K(2.7))
+#if (HACK_CCA_RESISTANCE)
+	RES(R36, RES_M(5))
+#else
+	RES(R36, RES_M(1))
+#endif
+	RES(R37, RES_K(56))
+	RES(R38, RES_K(24))
+	RES(R39, RES_K(15))
+#if (HACK_VOLTAGE_SWITCH)
+	RES(R40, 100)
+#else
+	RES(R40, RES_K(4.7))
+#endif
+	RES(R41, 300)
+	RES(R42, RES_K(39))
+	RES(R43, RES_K(10))
+	RES(R44, 330)
+	RES(R45, RES_K(27))
+//  RES(R46, RES_K(12))  -- part of final amp (not emulated)
+	RES(R47, RES_K(1))
+	RES(R48, RES_K(2.7))
+	RES(R49, 470)
+//  POT(R50, RES_K())    -- listed as optional on schematics
+//  RES(R51, RES_K(1.5)) -- part of final amp (not emulated)
+//  RES(R52, 150)        -- part of final amp (not emulated)
+//  RES(R53, RES_K(22))  -- part of final amp (not emulated)
+//  RES(R54, 150)        -- part of final amp (not emulated)
+//  RES(R55, RES_K(39))  -- part of final amp (not emulated)
+	RES(R56, 150)
+	RES(R57, RES_K(2.7))
+	RES(R58, RES_M(1))
+	RES(R59, RES_K(20))
+	RES(R60, RES_K(10))
+	RES(R61, RES_K(1))
+	RES(R62, RES_K(10))
+	RES(R63, RES_K(20))
+	RES(R64, RES_K(39))
+	RES(R65, RES_K(82))
+	RES(R66, RES_K(2.7))
+	RES(R67, RES_K(3.9))
+	RES(R68, RES_M(1))
+	RES(R69, RES_K(20))
+	RES(R70, RES_K(10))
+	RES(R71, RES_K(1))
+	RES(R72, RES_K(10))
+	RES(R73, RES_K(20))
+	RES(R74, RES_K(39))
+	RES(R75, RES_K(82))
+	RES(R76, 470)
+	RES(R77, RES_M(1.5))
+	RES(R78, RES_K(20))
+	RES(R79, RES_M(1))
+	RES(R80, RES_K(43))
+	RES(R81, RES_K(20))
+	RES(R82, RES_M(1))
+	RES(R83, RES_K(20))
+	RES(R84, RES_K(10))
+	RES(R85, RES_K(1))
+	RES(R86, RES_K(10))
+	RES(R87, RES_K(20))
+	RES(R88, RES_K(39))
+	RES(R89, RES_K(82))
+	RES(R90, RES_K(1))
+	RES(R91, RES_K(2.7))
+
+	CAP(C1, CAP_U(100))
+	CAP(C2, CAP_U(0.1))
+	CAP(C3, CAP_U(0.1))
+	CAP(C4, CAP_U(0.02))
+	CAP(C5, CAP_U(0.1))
+	CAP(C6, CAP_U(0.68))
+	CAP(C7, CAP_U(0.01))
+	CAP(C8, CAP_U(4.7))
+	CAP(C9, CAP_U(0.047))
+	CAP(C10, CAP_U(0.01))
+	CAP(C11, CAP_U(0.1))
+	CAP(C12, CAP_U(0.1))
+//  CAP(C13, CAP_U())      -- not used according to schematics
+	CAP(C14, CAP_U(0.22))
+	CAP(C15, CAP_U(0.01))
+	CAP(C16, CAP_U(0.1))
+	CAP(C17, CAP_U(0.1))
+	CAP(C18, CAP_U(0.01))
+	CAP(C19, CAP_U(0.1))
+//  CAP(C20, CAP_U())      -- not used according to schematics
+	CAP(C21, CAP_U(0.68))
+//  CAP(C22, CAP_U(0.005)) -- part of final amp (not emulated)
+//  CAP(C23, CAP_P(470))   -- part of final amp (not emulated)
+//  CAP(C24, CAP_P(470))   -- part of final amp (not emulated)
+//  CAP(C25, CAP_P(470))   -- part of final amp (not emulated)
+	CAP(C26, CAP_U(0.1))
+	CAP(C27, CAP_U(0.1))
+	CAP(C28, CAP_U(0.01))
+	CAP(C29, CAP_U(0.047))
+	CAP(C30, CAP_U(0.22))
+	CAP(C31, CAP_U(0.1))
+	CAP(C32, CAP_U(0.68))
+//  CAP(C33, CAP_U(0.1))   -- part of voltage converter (not emulated)
+//  CAP(C34, CAP_U(25))    -- part of voltage converter (not emulated)
+//  CAP(C35, CAP_U(25))    -- part of voltage converter (not emulated)
+//  CAP(C36, CAP_U())      -- part of voltage converter (not emulated)
+//  CAP(C37, CAP_U(0.1))   -- part of voltage converter (not emulated)
+//  CAP(C38, CAP_U(25))    -- part of voltage converter (not emulated)
+//  CAP(C39, CAP_U(25))    -- part of voltage converter (not emulated)
+//  CAP(C40, CAP_U())      -- part of voltage converter (not emulated)
+//  CAP(C41, CAP_U(25))    -- part of voltage converter (not emulated)
+//  CAP(C42, CAP_U(0.1))   -- part of voltage converter (not emulated)
+
+	D_1N5240(D1)
+	D_1N914(D2)
+	D_1N914(D3)
+	D_1N914(D4)
+	D_1N914(D5)
+	D_1N914(D6)
+	D_1N914(D7)
+	D_1N914(D8)
+	D_1N914(D9)
+	D_1N914(D10)
+	D_1N914(D11)
+	D_1N5240(D12)
+	D_1N5240(D13)
+
+	Q_2N3906(Q1)            // PNP
+	Q_2N3906(Q2)            // PNP
+	Q_2N3906(Q3)            // PNP
+	Q_2N3906(Q4)            // PNP
+	Q_2N3906(Q5)            // PNP
+//  Q_2N6292(Q6)            // PNP -- part of final amp (not emulated)
+//  Q_2N6107(Q7)            // PNP -- part of final amp (not emulated)
+	Q_2N3904(Q8)            // NPN
+	Q_2N3904(Q9)            // NPN
+	Q_2N3904(Q10)           // NPN
+
+	AMI_S2688(IC1)          // Noise generator
+
+	TL081_DIP(IC2)          // Op. Amp.
+	NET_C(IC2.7, I_V15)
+	NET_C(IC2.4, I_VM15)
+
+	CA3080_DIP(IC3)         // Op. Amp.
+	NET_C(IC3.4, I_VM15)
+	NET_C(IC3.7, I_V15)
+
+	LM555_DIP(IC4)
+
+	LM555_DIP(IC5)
+
+	CA3080_DIP(IC6)         // Op. Amp.
+	NET_C(IC6.4, I_VM15)
+	NET_C(IC6.7, I_V15)
+
+	TL081_DIP(IC7)          // Op. Amp.
+	NET_C(IC7.7, I_V15)
+	NET_C(IC7.4, I_VM15)
+
+	TTL_74LS164_DIP(IC8)    // 8-bit Shift Reg.
+	NET_C(IC8.7, GND)
+	NET_C(IC8.14, I_V5)
+
+	TTL_74LS377_DIP(IC9)    // Octal D Flip Flop
+	NET_C(IC9.10, GND)
+	NET_C(IC9.20, I_V5)
+
+	TTL_7406_DIP(IC10)      // Hex inverter -- currently using a clone of 7416, no open collector behavior
+	NET_C(IC10.7, GND)
+	NET_C(IC10.14, I_V5)
+
+	LM555_DIP(IC11)
+
+	CA3080_DIP(IC12)        // Op. Amp.
+	NET_C(IC12.4, I_VM15)
+	NET_C(IC12.7, I_V15)
+
+	LM555_DIP(IC13)
+
+	TL081_DIP(IC14)         // Op. Amp.
+	NET_C(IC14.7, I_V15)
+	NET_C(IC14.4, I_VM15)
+
+	TL081_DIP(IC15)         // Op. Amp.
+	NET_C(IC15.7, I_V15)
+	NET_C(IC15.4, I_VM15)
+
+	TL081_DIP(IC16)         // Op. Amp.
+	NET_C(IC16.7, I_V15)
+	NET_C(IC16.4, I_VM15)
+
+	TL081_DIP(IC17)         // Op. Amp.
+	NET_C(IC17.7, I_V15)
+	NET_C(IC17.4, I_VM15)
+
+	TTL_74LS393_DIP(IC18)   // Dual 4 Bit B.C.
+	NET_C(IC18.7, GND)
+	NET_C(IC18.14, I_V5)
+
+	TL081_DIP(IC19)         // Op. Amp.
+	NET_C(IC19.7, I_V15)
+	NET_C(IC19.4, I_VM15)
+
+	TL081_DIP(IC20)         // Op. Amp.
+	NET_C(IC20.7, I_V15)
+	NET_C(IC20.4, I_VM15)
+
+	TL081_DIP(IC21)         // Op. Amp.
+	NET_C(IC21.7, I_V15)
+	NET_C(IC21.4, I_VM15)
+
+	TTL_74LS393_DIP(IC22)   // Dual 4 Bit B.C.
+	NET_C(IC22.7, GND)
+	NET_C(IC22.14, I_V5)
+
+//  TTL_7915_DIP(IC23)      // -15V Regulator -- not emulated
+//  TTL_7815_DIP(IC24)      // +15V Regulator -- not emulated
+
+	TTL_7414_DIP(IC25)      // Hex Inverter
+	NET_C(IC25.7, GND)
+	NET_C(IC25.14, I_V5)
+
+	//
+	// Explosion
+	//
+
+	NET_C(I_OUT_7, R7.1, IC4.2)
+	NET_C(IC4.8, IC4.4, I_V5)   // pin 4 not documented in schematics
+	NET_C(R7.2, I_V5)
+	NET_C(R8.2, I_V5)
+	NET_C(R8.1, IC4.6, IC4.7, C6.1)
+	NET_C(C6.2, GND)
+	NET_C(IC4.5, C7.2)
+	NET_C(C7.1, GND)
+	NET_C(IC4.1, GND)
+	NET_C(IC4.3, Q1.E)
+	NET_C(Q1.B, R9.2)
+	NET_C(R9.1, GND)
+	NET_C(Q1.C, C8.1, R10.1)
+	NET_C(C8.2, I_VM15)
+	NET_C(R10.2, IC3.5)
+
+	NET_C(C1.1, IC1.4, I_V15)
+	NET_C(C1.2, GND)
+	NET_C(IC1.1, IC1.2, GND)
+	NET_C(IC1.3, R1.1)
+	NET_C(R1.2, C2.2, R2.1)
+	NET_C(C2.1, GND)
+	NET_C(R2.2, C3.1)
+	NET_C(C3.2, IC2.2, C4.1, R3.1)
+	NET_C(IC2.3, GND)
+	NET_C(IC2.6, C4.2, R3.2, R4.1)
+	NET_C(R4.2, C5.1)
+	NET_C(C5.2, R5.2, IC3.2)
+	NET_C(R5.1, GND)
+	NET_C(IC3.3, R6.2)
+	NET_C(R6.1, GND)
+	NET_C(IC3.6, IC7.3, R19.2)
+	NET_C(R19.1, GND)
+
+	//
+	// Shift register
+	//
+
+	NET_C(I_OUT_0, IC25.1)
+	NET_C(IC25.2, IC25.13)
+	NET_C(IC25.12, IC8.2)
+	NET_C(I_OUT_1, IC25.3)
+	NET_C(IC25.4, IC25.11)
+	NET_C(IC25.10, IC8.8)
+	NET_C(R24.1, I_V5)
+	NET_C(R24.2, IC8.9, IC8.1)
+	NET_C(I_OUT_2, IC25.5)
+	NET_C(IC25.6, IC25.9)
+	NET_C(IC25.8, IC9.11)
+	NET_C(IC9.1, GND)
+	NET_C(IC8.3, IC9.3)
+	NET_C(IC8.4, IC9.4)
+	NET_C(IC8.5, IC9.7)
+	NET_C(IC8.6, IC9.8)
+	NET_C(IC8.10, IC9.13)
+	NET_C(IC8.11, IC9.14)
+
+	//
+	// Background
+	//
+
+	NET_C(IC9.9, IC22.2)
+	NET_C(IC9.2, IC10.1)
+	NET_C(IC10.2, R25.2, R26.1)
+	NET_C(IC9.5, IC10.3)
+	NET_C(IC10.4, R27.2, R28.1)
+	NET_C(IC9.6, IC10.5)
+	NET_C(IC10.6, R29.2, R30.1)
+	NET_C(R29.1, R27.1, R25.1, D1.K, R23.1) // also R50.2 if present
+	NET_C(R23.2, I_V15)
+	NET_C(D1.A, GND)
+	NET_C(R26.2, R28.2, R30.2, R76.1, IC19.2) // also R50.1 if present
+	NET_C(IC19.3, GND)
+	NET_C(IC19.6, R76.2, D8.A, D6.A)
+
+#if (HLE_BACKGROUND_VCOS)
+	//
+	// The two background VCOs are done with diodes and op-amps,
+	// but end up generating a quite linear voltage-to-period
+	// mapping. There is a low-frequency VCO and a high-frequency
+	// one. They are combined and sent to an LS393 counter as a
+	// clock after going through a voltage converter. Here we
+	// skip the whole lot.
+	//
+	// First VCO, vs IC19.6:
+	//    R2 = 0.99406: HP = (-0.0235033*A0) + 0.0179360
+	//    R2 = 0.99415: HP = (0.000193041*A0*A0) - (0.0227932*A0) + 0.0182436
+	//    R2 = 0.99418: HP = (-0.000106682*A0*A0*A0) - (0.000443621*A0*A0) - (0.0237264*A0) + 0.0180362
+	//    R2 = 0.99419: HP = (0.000069781*A0*A0*A0*A0) + (0.000470159*A0*A0*A0) + (0.00104384*A0*A0) - (0.0224827*A0) + 0.0182202
+	//    R2 = 0.99419: HP = (-0.0000242172*A0*A0*A0*A0*A0) - (0.000186286*A0*A0*A0*A0) - (0.000483269*A0*A0*A0) - (0.000431519*A0*A0) - (0.0233265*A0) + 0.0181209
+	//
+	// Second VCO, vs IC19.6:
+	//    R2 = 0.99969: HP = (-0.000308955*A0) + 0.000256399
+	//    R2 = 0.99986: HP = (0.00000356099*A0*A0) - (0.000295774*A0) + 0.000262224
+	//    R2 = 0.99986: HP = (-0.000000646439*A0*A0*A0) - (0.000000309249*A0*A0) - (0.000301475*A0) + 0.000260938
+	//    R2 = 0.99986: HP = (0.0000000315553*A0*A0*A0*A0) - (0.000000385224*A0*A0*A0) + (0.000000365474*A0*A0) - (0.000300909*A0) + 0.000261022
+	//    R2 = 0.99986: HP = (-0.0000000265364*A0*A0*A0*A0*A0) - (0.000000249089*A0*A0*A0*A0) - (0.00000143038*A0*A0*A0) - (0.00000125235*A0*A0) - (0.000301835*A0) + 0.000260913
+	//
+	VARCLOCK(BGCLK1, 1, "max(0.000001,min(0.1,(-0.0235033*A0) + 0.0179360))")
+	NET_C(BGCLK1.GND, GND)
+	NET_C(BGCLK1.VCC, I_V15)
+	NET_C(BGCLK1.A0, IC19.6)
+	NET_C(BGCLK1.Q, BGCOMBINE.A0)
+	NET_C(GND, R77.1, R77.2, R78.1, R78.2, R79.1, R79.2, C30.1, C30.2, D6.K, D7.A, D7.K, IC20.2, IC20.3)
+
+	VARCLOCK(BGCLK2, 1, "max(0.000001,min(0.1,(-0.000308955*A0) + 0.000256399))")
+	NET_C(BGCLK2.GND, GND)
+	NET_C(BGCLK2.VCC, I_V15)
+	NET_C(BGCLK2.A0, IC19.6)
+	NET_C(BGCLK2.Q, BGCOMBINE.A1)
+	NET_C(GND, R80.1, R80.2, R81.1, R81.2, R82.1, R82.2, C31.1, C31.2, D8.K, D9.A, D9.K, IC21.2, IC21.3)
+
+	AFUNC(BGCOMBINE, 2, "max(A0,A1)")
+	NET_C(BGCOMBINE.Q, IC22.1)
+	NET_C(GND, R83.1, R83.2, R84.1, R84.2, R85.1, R85.2, D10.A, D10.K, D11.A, D11.K)
+#else
+	NET_C(D6.K, D7.A, R79.1, IC20.3)
+	NET_C(D7.K, GND)
+	NET_C(IC20.2, C30.2, R77.1)
+	NET_C(C30.1, GND)
+	NET_C(IC20.6, R77.2, D10.A, R78.1, R79.2)
+	NET_C(D10.K, R78.2, R83.1, R81.2, D11.K)
+	NET_C(D11.A, R82.2, IC21.6, R80.2, R81.1)
+	NET_C(IC21.3, R82.1, D9.A, D8.K)
+	NET_C(D9.K, GND)
+	NET_C(IC21.2, C31.2, R80.1)
+	NET_C(C31.1, GND)
+	NET_C(R83.2, R84.2, Q10.B)
+	NET_C(R84.1, GND)
+	NET_C(Q10.E, GND)
+	NET_C(Q10.C, R85.1, IC22.1)
+	NET_C(R85.2, I_V5)
+#endif
+	NET_C(IC22.3, R86.1)
+	NET_C(IC22.4, R87.1)
+	NET_C(IC22.5, R88.1)
+	NET_C(IC22.6, R89.1)
+	NET_C(R86.2, R87.2, R88.2, R89.2, R90.2, R91.1)
+	NET_C(R90.1, GND)
+	NET_C(R91.2, C32.1)
+	NET_C(C32.2, R49.1)
+	NET_C(R49.2, R45.1)
+
+	//
+	// Beep
+	//
+
+	NET_C(IC9.12, Q2.B, R11.1)
+	NET_C(R11.2, R12.2, I_V5)
+	NET_C(Q2.E, R12.1)
+	NET_C(Q2.C, R20.2, R21.2, Q3.E)
+	NET_C(R20.1, I_VM15)
+	NET_C(R21.1, GND)
+	NET_C(Q3.B, R22.2)
+	NET_C(R22.1, GND)
+	NET_C(Q3.C, R18.1)
+	NET_C(R18.2, IC6.5)
+
+	NET_C(R13.2, IC5.4, IC5.8, I_V5)
+	NET_C(R13.1, IC5.7, R14.2)
+	NET_C(R14.1, IC5.6, IC5.2, C9.2)
+	NET_C(C9.1, GND)
+	NET_C(IC5.1, GND)
+	NET_C(IC5.5, C10.2)
+	NET_C(C10.1, GND)
+	NET_C(IC5.3, R15.1)
+	NET_C(R15.2, C11.1)
+	NET_C(C11.2, R16.2, IC6.2)
+	NET_C(R16.1, GND)
+	NET_C(IC6.3, R17.2)
+	NET_C(R17.1, GND)
+	NET_C(IC6.6, IC7.3)
+
+	NET_C(IC7.6, IC7.2, C12.1)
+	NET_C(C12.2, R45.2)
+	ALIAS(OUTPUT, R45.1)
+
+	//
+	// Motor 1
+	//
+
+	NET_C(IC9.15, R40.1, Q4.B)
+	NET_C(R40.2, R41.1, I_V5)
+	NET_C(R41.2, Q4.E)
+	NET_C(Q4.C, R42.2, R43.2, Q5.E)
+	NET_C(R42.1, I_VM15)
+	NET_C(R43.1, GND)
+	NET_C(Q5.B, R44.2)
+	NET_C(R44.1, GND)
+	NET_C(Q5.C, R36.1)
+	NET_C(R36.2, IC12.5)
+
+	NET_C(R31.2, IC11.4, IC11.8, I_V5)
+	NET_C(R31.1, IC11.7, R32.2)
+	NET_C(R32.1, IC11.6, IC11.2, C14.2)
+	NET_C(C14.1, GND, IC11.1, C15.1)
+	NET_C(C15.2, IC11.5)
+	NET_C(IC11.3, R33.1)
+	NET_C(R33.2, C16.1)
+	NET_C(C16.2, R34.2, IC12.2, C19.2)
+	NET_C(R34.1, GND)
+	NET_C(IC12.3, R35.2)
+	NET_C(R35.1, GND)
+	NET_C(IC12.6, D12.A, IC7.3)
+	NET_C(D12.K, D13.K)
+	NET_C(D13.A, GND)
+
+	NET_C(R37.2, IC13.4, IC13.8, I_V5)
+	NET_C(R37.1, IC13.7, R38.2)
+	NET_C(R38.1, IC13.6, IC13.2, C17.2)
+	NET_C(C17.1, GND)
+	NET_C(IC13.1, GND)
+	NET_C(IC13.5, C18.2)
+	NET_C(C18.1, GND)
+	NET_C(IC13.3, R39.1)
+	NET_C(R39.2, C19.1)
+
+	//
+	// Laser
+	//
+
+	NET_C(I_OUT_4, IC10.13, IC18.12)
+	NET_C(IC10.12, R56.1)
+	NET_C(R56.2, C26.2, D2.K)
+	NET_C(C26.1, GND)
+
+#if (HLE_LASER_VCO)
+	//
+	// This is a typical Cinemtraonics VCO, driving a TTL counter.
+	// Netlist simulation requires a very small step which is not
+	// realtime performant, so we model it offline with the small
+	// step count, and then for realtime performance replace it
+	// with a mapping.
+	//
+	// Here is the mapping between 26.2 and the TTL clock IC18.13
+	// when the circuit is present:
+	//
+	//    R2 = 0.99566: HP = (0.0000211106*A0) + 0.0000233926
+	//    R2 = 0.99925: HP = (0.000000616538*A0*A0) + (0.0000166899*A0) + 0.0000239800
+	//    R2 = 0.99946: HP = (0.000000065592*A0*A0*A0) - (0.000000207181*A0*A0) + (0.0000190091*A0) + 0.0000237318
+	//    R2 = 0.99946: HP = (0.00000000399629*A0*A0*A0*A0) - (0.00000000517200*A0*A0*A0) + (0.000000172470*A0*A0) + (0.0000184103*A0) + 0.0000237906
+	//    R2 = 0.99946: HP = (0.0000000000207619*A0*A0*A0*A0*A0) + (0.00000000352382*A0*A0*A0*A0) - (0.00000000145304*A0*A0*A0) + (0.000000160778*A0*A0) + (0.0000184225*A0) + 0.0000237894
+	//
+	// And here is the mapping when the circuit is removed:
+	//
+	//    R2 = 0.98806: HP = (0.00245939*A0) - 0.000220173
+	//    R2 = 0.99179: HP = (0.00545522*A0*A0) + (0.00103499*A0) - 0.000132203
+	//    R2 = 0.99913: HP = (-0.102004*A0*A0*A0) + (0.0406935*A0*A0) - (0.00277839*A0) - 0.00000140594
+	//    R2 = 0.99941: HP = (0.651650*A0*A0*A0*A0) - (0.377655*A0*A0*A0) + (0.078834*A0*A0) - (0.00454290*A0) + 0.00000408830
+	//    R2 = 0.99941: HP = (2.264700*A0*A0*A0*A0*A0) - (0.633172*A0*A0*A0*A0) - (0.108936*A0*A0*A0) + (0.0542944*A0*A0) - (0.00371696*A0) + 0.00000401368
+	//
+	VARCLOCK(LASERCLK, 1, "max(0.000001,min(0.1,(-0.102004*A0*A0*A0) + (0.0406935*A0*A0) - (0.00277839*A0) - 0.00000140594))")
+	NET_C(LASERCLK.GND, GND)
+	NET_C(LASERCLK.VCC, I_V5)
+	NET_C(LASERCLK.A0, C26.2)
+	NET_C(LASERCLK.Q, IC18.13)
+	NET_C(GND, R57.1, R57.2, R58.1, R58.2, R59.1, R59.2, R60.1, R60.2, R61.1, R61.2, C27.1, C27.2, D2.A, D3.A, D3.K, IC16.2, IC16.3)
+#else
+	NET_C(D2.A, IC16.3, D3.K, R58.1)
+	NET_C(D3.A, GND)
+	NET_C(IC16.2, R57.1, C27.2)
+	NET_C(C27.1, GND)
+	NET_C(IC16.6, R57.2, R58.2, R59.1)
+	NET_C(R59.2, R60.2, Q8.B)
+	NET_C(R60.1, GND)
+	NET_C(Q8.E, GND)
+	NET_C(Q8.C, R61.1, IC18.13)
+	NET_C(R61.2, I_V5)
+#endif
+
+	NET_C(IC18.9, R62.1)
+	NET_C(IC18.8, R63.1)
+	NET_C(IC18.10, R64.1)
+	NET_C(IC18.11, R65.1)
+	NET_C(R62.2, R63.2, R64.2, R65.2, R47.2, R48.1)
+	NET_C(R47.1, GND)
+	NET_C(R48.2, C21.1)
+	NET_C(C21.2, R49.1)
+
+	//
+	// Torpedo
+	//
+
+	NET_C(I_OUT_3, IC10.11, IC18.2)
+	NET_C(IC10.10, R66.1)
+	NET_C(R66.2, C28.2, D4.K)
+	NET_C(C28.1, GND)
+
+#if (HLE_TORPEDO_VCO)
+	//
+	// Another tricky Cinematronics VCO. Here is the mapping between
+	// C28.2 and the TTL clock IC18.1 when the circuit is present:
+	//
+	//    R2 = 0.97255: HP = (0.0000327662*A0) + 0.0000149365
+	//    R2 = 0.99171: HP = (0.00000331016*A0*A0) - (0.0000125849*A0) + 0.0000206090
+	//    R2 = 0.99613: HP = (0.000000536978*A0*A0*A0) - (0.0000078207*A0*A0) + (0.0000390037*A0) + 0.0000148210
+	//    R2 = 0.99748: HP = (0.000000092476*A0*A0*A0*A0) - (0.00000204069*A0*A0*A0) + (0.0000139512*A0*A0) - (0.0000143884*A0) + 0.0000205567
+	//    R2 = 0.99798: HP = (0.0000000168890*A0*A0*A0*A0*A0) - (0.000000498868*A0*A0*A0*A0) + (0.00000512183*A0*A0*A0) - (0.0000205655*A0*A0) + (0.0000394849*A0) + 0.0000149619
+	//
+	// And here is the mapping when the circuit is removed:
+	//
+	//    R2 = 0.83356: HP = (0.000387263*A0) - 0.0000161072
+	//    R2 = 0.96482: HP = (-0.000459844*A0*A0) + (0.00110697*A0) - 0.000085961
+	//    R2 = 0.99210: HP = (0.000512521*A0*A0*A0) - (0.00183716*A0*A0) + (0.00202778*A0) - 0.000165571
+	//    R2 = 0.99614: HP = (-0.000450996*A0*A0*A0*A0) + (0.00218565*A0*A0*A0) - (0.00381123*A0*A0) + (0.00280823*A0) - 0.000225737
+	//    R2 = 0.99625: HP = (-0.000161974*A0*A0*A0*A0*A0) + (0.000309626*A0*A0*A0*A0) + (0.000915096*A0*A0*A0) - (0.00291505*A0*A0) + (0.00256587*A0) - 0.000209241
+	//
+	VARCLOCK(TORPEDOCLK, 1, "max(0.000001,min(0.1,(0.000512521*A0*A0*A0) - (0.00183716*A0*A0) + (0.00202778*A0) - 0.000165571))")
+	NET_C(TORPEDOCLK.GND, GND)
+	NET_C(TORPEDOCLK.VCC, I_V5)
+	NET_C(TORPEDOCLK.A0, C28.2)
+	NET_C(TORPEDOCLK.Q, IC18.1)
+	NET_C(GND, R67.1, R67.2, R68.1, R68.2, R69.1, R69.2, R70.1, R70.2, R71.1, R71.2, C29.1, C29.2, D4.A, D5.A, D5.K, IC17.2, IC17.3)
+#else
+	NET_C(D4.A, IC17.3, D5.K, R68.1)
+	NET_C(D5.A, GND)
+	NET_C(IC17.2, C29.2, R67.1)
+	NET_C(C29.1, GND)
+	NET_C(IC17.6, R67.2, R68.2, R69.1)
+	NET_C(R69.2, R70.2, Q9.B)
+	NET_C(R70.1, GND)
+	NET_C(Q9.E, GND)
+	NET_C(Q9.C, R71.1, IC18.1)
+	NET_C(R71.2, I_V5)
+#endif
+
+	NET_C(IC18.5, R72.1)
+	NET_C(IC18.6, R73.1)
+	NET_C(IC18.4, R74.1)
+	NET_C(IC18.3, R75.1)
+	NET_C(R72.2, R73.2, R74.2, R75.2, R48.1)
+
+	//
+	// Unconnected inputs
+	//
+
+	NET_C(GND, IC9.17, IC9.18, IC10.9, IC22.12, IC22.13)
+	NET_C(GND, IC14.2, IC14.3, IC15.2, IC15.3)  // part of final amp
+
+	//
+	// Unconnected outputs
+	//
+
+	HINT(IC9.16, NC)        // Q6
+	HINT(IC9.19, NC)        // Q7
+	HINT(IC10.8, NC)        // QD
+	HINT(IC22.11, NC)       // Q0
+	HINT(IC22.10, NC)       // Q1
+	HINT(IC22.9, NC)        // Q2
+	HINT(IC22.8, NC)        // Q3
+
+#if (ENABLE_FRONTIERS)
+	//
+	// Split explosion/beep/motor from other sources
+	//
+	OPTIMIZE_FRONTIER(R45.2, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(IC7.3, RES_M(1), 50)
+
+	//
+	// Split noise generator from consumers
+	//
+	OPTIMIZE_FRONTIER(R1.1, RES_M(1), 50)
+#endif
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_ripoff.h mame-0.224+dfsg.1/src/mame/audio/nl_ripoff.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_ripoff.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_ripoff.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_RIPOFF_H
+#define MAME_AUDIO_NL_RIPOFF_H
+
+#pragma once
+
+NETLIST_EXTERNAL(ripoff)
+
+#endif // MAME_AUDIO_NL_RIPOFF_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_segaspeech.cpp mame-0.224+dfsg.1/src/mame/audio/nl_segaspeech.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_segaspeech.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_segaspeech.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,119 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Sega Speech board
+//
+// Derived from the schematics in the Sega G-80 manual.
+//
+// Known problems/issues:
+//
+//    * Mostly works. Not 100% sure about using a current source
+//       for input.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_segaspeech.h"
+
+//
+// Optimizations
+//
+
+
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(segaspeech)
+
+	SOLVER(Solver, 1000)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	TTL_INPUT(I_SP0250, 0)
+	PARAM(I_SP0250.MODEL, "74XXOC")
+	NET_C(I_SP0250.GND, GND)
+	NET_C(I_SP0250.VCC, I_V5)
+	ALIAS(I_SPEECH, I_SP0250.Q)
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_VM5, -5)
+
+	//
+	// There are two schematic drawings of the speech board
+	// that show fairly different outputs from the SP0250.
+	// Both have their problems.
+	//
+	// The simpler one is included in the Astro Blaster and
+	// Space Fury manuals. This is largely correct, except
+	// that it is believed (not verified) that R20 should be
+	// 4.7K instead of 470 Ohms. This schematic does not show
+	// the CD4053 mixer.
+	//
+	// The more complex schematic is included in the G-80
+	// schematics package, and in the Star Trek and Zektor
+	// manuals. It has several significant errors (all verified
+	// from a working PCB):
+	//
+	//    1. U8 pins 2 and 3 are swapped
+	//    2. The connection from R20 to GND should be removed
+	//        (this also disconnected C50 and R21 from GND)
+	//    3. R13 should be 220k, not 22k
+	//
+	// With the fixes above, the output sections of the two
+	// schematics line up, minus the mixing section, which is
+	// only shown on the more complex schematic.
+	//
+	// The mixing section is trivial, with 3 bits from a control
+	// port controlling three switches in the CD4053. Bit 3
+	// enables/disables speech. Bit 4 enables/disables an
+	// unconnected source. And bit 5 enables/disables incoming
+	// external sound. The incoming sound is also routed through
+	// a pot to enable control over the relative volume.
+	//
+	// For purposes of this netlist, and since it runs at high
+	// speeds, we tap the speech output before it hits the
+	// CD4053 and manually manage the speech output.
+	//
+	// Since we use MAME to manage the mixing, the control bits
+	// are managed directly there, rather than in this netlist.
+	//
+
+	//
+	// This represents the schematic drawing from Astro Blaster
+	// and Space Fury; there is no control register and it
+	// works.
+	//
+	RES(R17, RES_K(10))
+	RES(R18, RES_K(22))
+	RES(R19, RES_K(250))
+	RES(R20, RES_K(4.7))    // schematic shows 470Ohm, but a real PCB had 4.7k here
+	RES(R21, RES_K(10))
+
+	CAP(C9, CAP_U(0.1))
+	CAP(C10, CAP_U(0.047))
+	CAP(C50, CAP_U(0.003))
+
+	TL081_DIP(U8)           // Op. Amp.
+	NET_C(U8.7, I_V5)
+	NET_C(U8.4, I_VM5)
+
+	NET_C(I_SPEECH, R17.1, C9.1)
+	NET_C(R17.2, I_V5)
+	NET_C(C9.2, R18.1)
+	NET_C(R18.2, C10.1, R19.2, U8.3)
+	NET_C(R19.1, C10.2, GND)
+	NET_C(R20.1, GND)
+	NET_C(R20.2, U8.2, R21.2, C50.2)
+	NET_C(U8.6, R21.1, C50.1)
+	ALIAS(OUTPUT, U8.6)
+
+	//
+	// In the more complex case, this would feed into a
+	// CD4053 for switching. We rely on this being managed
+	// at the driver level.
+	//
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_segaspeech.h mame-0.224+dfsg.1/src/mame/audio/nl_segaspeech.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_segaspeech.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_segaspeech.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_SEGASPEECH_H
+#define MAME_AUDIO_NL_SEGASPEECH_H
+
+#pragma once
+
+NETLIST_EXTERNAL(segaspeech)
+
+#endif // MAME_AUDIO_NL_SEGASPEECH_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_segausb.cpp mame-0.224+dfsg.1/src/mame/audio/nl_segausb.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_segausb.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_segausb.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,544 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Sega Universal Sound Board
+//
+// The Sega Universal Sound Board was used by several early G80
+// vector and raster games, notably Star Trek and Tac/Scan,
+// among others. It is largely implemented as a MAME device, but
+// the analog audio section is implemented here.
+//
+// Known problems/issues:
+//
+//    * WIP.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_segausb.h"
+
+
+
+//
+// Optimizations
+//
+
+#define USE_AFUNC_MIXING (1)
+#define ENABLE_NOISE_FRONTIERS (1)
+#define UNDERCLOCK_NOISE_GEN (1)
+#define ENABLE_FRONTIERS (0)
+
+
+
+//
+// Hacks
+//
+
+
+
+NETLIST_START(segausb)
+
+	SOLVER(Solver, 1000)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	ANALOG_INPUT(I_U12_DAC, 0)      // AD7524
+	ANALOG_INPUT(I_U13_DAC, 0)      // AD7524
+	ANALOG_INPUT(I_U14_DAC, 0)      // AD7524
+	TTL_INPUT(I_U2B_SEL, 0)         // 74LS74
+
+	ANALOG_INPUT(I_U24_DAC, 0)      // AD7524
+	ANALOG_INPUT(I_U25_DAC, 0)      // AD7524
+	ANALOG_INPUT(I_U26_DAC, 0)      // AD7524
+	TTL_INPUT(I_U38B_SEL, 0)        // 74LS74
+
+	ANALOG_INPUT(I_U27_DAC, 0)      // AD7524
+	ANALOG_INPUT(I_U28_DAC, 0)      // AD7524
+	ANALOG_INPUT(I_U29_DAC, 0)      // AD7524
+	TTL_INPUT(I_U2A_SEL, 0)         // 74LS74
+
+	NET_C(GND, I_U2B_SEL.GND, I_U38B_SEL.GND, I_U2A_SEL.GND)
+	NET_C(I_V5, I_U2B_SEL.VCC, I_U38B_SEL.VCC, I_U2A_SEL.VCC)
+
+	TTL_INPUT(I_U41_OUT0, 0)        // 8253 PIT U41
+	TTL_INPUT(I_U41_OUT1, 0)
+	TTL_INPUT(I_U41_OUT2, 0)
+
+	TTL_INPUT(I_U42_OUT0, 0)        // 8253 PIT U42
+	TTL_INPUT(I_U42_OUT1, 0)
+	TTL_INPUT(I_U42_OUT2, 0)
+
+	TTL_INPUT(I_U43_OUT0, 0)        // 8253 PIT U43
+	TTL_INPUT(I_U43_OUT1, 0)
+	TTL_INPUT(I_U43_OUT2, 0)
+
+	NET_C(GND, I_U41_OUT0.GND, I_U41_OUT1.GND, I_U41_OUT2.GND)
+	NET_C(I_V5, I_U41_OUT0.VCC, I_U41_OUT1.VCC, I_U41_OUT2.VCC)
+
+	NET_C(GND, I_U42_OUT0.GND, I_U42_OUT1.GND, I_U42_OUT2.GND)
+	NET_C(I_V5, I_U42_OUT0.VCC, I_U42_OUT1.VCC, I_U42_OUT2.VCC)
+
+	NET_C(GND, I_U43_OUT0.GND, I_U43_OUT1.GND, I_U43_OUT2.GND)
+	NET_C(I_V5, I_U43_OUT0.VCC, I_U43_OUT1.VCC, I_U43_OUT2.VCC)
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V12, 12)
+	ANALOG_INPUT(I_VM12, -12)
+
+	RES(R7, RES_K(100))
+	RES(R8, RES_K(100))
+	RES(R9, RES_K(100))
+	RES(R10, RES_K(100))
+	RES(R12, RES_K(100))
+	RES(R13, RES_K(100))
+	RES(R14, RES_K(33))
+	RES(R15, RES_K(100))
+	RES(R16, RES_K(100))
+	RES(R17, RES_K(5.6))
+	RES(R18, RES_K(100))
+	RES(R19, RES_K(100))
+	RES(R20, RES_K(10))
+	RES(R21, RES_K(10))
+	RES(R22, RES_K(10))
+	RES(R23, RES_K(1))
+	RES(R24, RES_K(1))
+	RES(R25, RES_K(100))
+	RES(R26, RES_K(5.6))
+	RES(R27, RES_K(10))
+	RES(R28, RES_K(100))
+	RES(R29, RES_K(100))
+	RES(R30, RES_K(1))
+	RES(R31, RES_K(100))
+	RES(R32, RES_K(100))
+	RES(R33, RES_K(1))
+	RES(R34, RES_K(100))
+	RES(R35, RES_K(100))
+	RES(R36, RES_K(100))
+	RES(R37, RES_K(33))
+	RES(R38, RES_K(100))
+	RES(R39, RES_K(100))
+	RES(R40, RES_K(10))
+	RES(R41, RES_K(10))
+	RES(R42, RES_K(100))
+	RES(R43, RES_K(100))
+	RES(R44, RES_K(33))
+	RES(R45, RES_K(100))
+	RES(R46, RES_K(100))
+	RES(R47, RES_K(5.6))
+	RES(R48, RES_K(100))
+	RES(R49, RES_K(100))
+	RES(R50, RES_K(10))
+	RES(R51, RES_K(10))
+	RES(R52, RES_K(10))
+	RES(R53, RES_K(1))
+	RES(R54, RES_K(100))
+	RES(R55, RES_K(100))
+	RES(R56, RES_K(1))
+	RES(R59, RES_K(1))
+	RES(R60, RES_K(2.2))
+	RES(R61, RES_K(33))
+	RES(R62, 270)
+	RES(R63, RES_K(1))
+	RES(R64, RES_K(2.7))
+	RES(R65, RES_K(2.7))
+
+//  CAP(C6, CAP_P(100))
+//  CAP(C7, CAP_P(100))
+//  CAP(C8, CAP_P(100))
+	CAP(C9, CAP_U(0.01))
+	CAP(C13, CAP_U(0.01))
+	CAP(C14, CAP_U(1))
+	CAP(C15, CAP_U(1))
+	CAP(C16, CAP_U(0.01))
+	CAP(C17, CAP_U(0.01))
+//  CAP(C19, CAP_P(100))
+//  CAP(C20, CAP_P(100))
+//  CAP(C21, CAP_P(100))
+//  CAP(C22, CAP_P(100))
+//  CAP(C23, CAP_P(100))
+//  CAP(C24, CAP_P(100))
+	CAP(C25, CAP_U(0.01))
+	CAP(C32, CAP_U(0.01))
+	CAP(C33, CAP_U(1))
+	CAP(C34, CAP_U(1))
+	CAP(C35, CAP_U(1))
+	CAP(C36, CAP_U(1))
+	CAP(C51, CAP_U(0.15))
+	CAP(C52, CAP_U(0.1))
+	CAP(C53, CAP_U(0.082))
+	CAP(C54, CAP_U(1))
+	CAP(C55, CAP_U(0.15))
+	CAP(C56, CAP_U(0.15))
+
+//  TL082_DIP(U1)           // Op. Amp.
+//  NET_C(U1.7, I_V12)
+//  NET_C(U1.4, I_VM12)
+
+//  TTL_74LS74(U2)          // Dual D-Type Positive Edge-Triggered Flip-Flop -- not emulated
+//  NET_C(U2.7, GND)
+//  NET_C(U2.14, I_V5)
+
+	TL082_DIP(U3)           // Op. Amp.
+	NET_C(U3.8, I_V12)
+	NET_C(U3.4, I_VM12)
+
+	TL082_DIP(U4)           // Op. Amp.
+	NET_C(U4.8, I_V12)
+	NET_C(U4.4, I_VM12)
+
+	TL082_DIP(U5)           // Op. Amp.
+	NET_C(U5.8, I_V12)
+	NET_C(U5.4, I_VM12)
+
+	TL082_DIP(U6)           // Op. Amp.
+	NET_C(U6.8, I_V12)
+	NET_C(U6.4, I_VM12)
+
+	CD4053_DIP(U7)          // 3x analog demuxer
+	NET_C(U7.16, I_V5)
+	NET_C(U7.6, GND)        // INH
+	NET_C(U7.7, I_V12)      // VEE
+	NET_C(U7.8, GND)
+
+	CD4053_DIP(U8)          // 3x analog demuxer
+	NET_C(U8.16, I_V5)
+	NET_C(U8.6, GND)        // INH
+	NET_C(U8.7, I_V12)      // VEE
+	NET_C(U8.8, GND)
+
+	TL082_DIP(U9)           // Op. Amp.
+	NET_C(U9.8, I_V12)
+	NET_C(U9.4, I_VM12)
+
+//  TTL_74LS139_DIP(U10)    // Dual 1-of-4 Decoder -- not emulated
+
+//  TTL_74LS139_DIP(U11)    // Dual 1-of-4 Decoder -- not emulated
+
+//  AD7524_DIP(U12)         // DAC -- not emulated
+//  NET_C(U12.3, GND)
+//  NET_C(U12.14, I_V5)
+
+//  AD7524_DIP(U13)         // DAC -- not emulated
+//  NET_C(U12.3, GND)
+//  NET_C(U12.14, I_V5)
+
+//  AD7524_DIP(U14)         // DAC -- not emulated
+//  NET_C(U12.3, GND)
+//  NET_C(U12.14, I_V5)
+
+	CD4053_DIP(U15)         // 3x analog demuxer
+	NET_C(U15.16, I_V5)
+	NET_C(U15.6, GND)       // INH
+	NET_C(U15.7, I_V12)     // VEE
+	NET_C(U15.8, GND)
+
+	CD4053_DIP(U16)         // 3x analog demuxer
+	NET_C(U16.16, I_V5)
+	NET_C(U16.6, GND)       // INH
+	NET_C(U16.7, I_V12)     // VEE
+	NET_C(U16.8, GND)
+
+	TL082_DIP(U17)          // Op. Amp.
+	NET_C(U17.8, I_V12)
+	NET_C(U17.4, I_VM12)
+
+	TL082_DIP(U18)          // Op. Amp.
+	NET_C(U18.8, I_V12)
+	NET_C(U18.4, I_VM12)
+
+	TL082_DIP(U19)          // Op. Amp.
+	NET_C(U19.8, I_V12)
+	NET_C(U19.4, I_VM12)
+
+	TL082_DIP(U20)          // Op. Amp.
+	NET_C(U20.8, I_V12)
+	NET_C(U20.4, I_VM12)
+
+	TL082_DIP(U21)          // Op. Amp.
+	NET_C(U21.8, I_V12)
+	NET_C(U21.4, I_VM12)
+
+	TL082_DIP(U22)          // Op. Amp.
+	NET_C(U22.8, I_V12)
+	NET_C(U22.4, I_VM12)
+
+	TL082_DIP(U23)          // Op. Amp.
+	NET_C(U23.8, I_V12)
+	NET_C(U23.4, I_VM12)
+
+//  AD7524_DIP(U24)         // DAC -- not emulated
+//  NET_C(U24.3, GND)
+//  NET_C(U24.14, I_V5)
+
+//  AD7524_DIP(U25)         // DAC -- not emulated
+//  NET_C(U25.3, GND)
+//  NET_C(U25.14, I_V5)
+
+//  AD7524_DIP(U26)         // DAC -- not emulated
+//  NET_C(U26.3, GND)
+//  NET_C(U26.14, I_V5)
+
+//  AD7524_DIP(U27)         // DAC -- not emulated
+//  NET_C(U27.3, GND)
+//  NET_C(U27.14, I_V5)
+
+//  AD7524_DIP(U28)         // DAC -- not emulated
+//  NET_C(U28.3, GND)
+//  NET_C(U28.14, I_V5)
+
+//  AD7524_DIP(U29)         // DAC -- not emulated
+//  NET_C(U29.3, GND)
+//  NET_C(U29.14, I_V5)
+
+	CD4053_DIP(U30)         // 3x analog demuxer
+	NET_C(U30.16, I_V5)
+	NET_C(U30.6, GND)       // INH
+	NET_C(U30.7, I_V12)     // VEE
+	NET_C(U30.8, GND)
+
+	CD4053_DIP(U31)         // 3x analog demuxer
+	NET_C(U31.16, I_V5)
+	NET_C(U31.6, GND)       // INH
+	NET_C(U31.7, I_V12)     // VEE
+	NET_C(U31.8, GND)
+
+//  TTL_74LS74(U38)         // Dual D-Type Positive Edge-Triggered Flip-Flop -- not emulated
+//  NET_C(U38.7, GND)
+//  NET_C(U38.14, I_V5)
+
+	TL081_DIP(U49)          // Op. Amp.
+	NET_C(U49.7, I_V12)
+	NET_C(U49.4, I_VM12)
+
+	MM5837_DIP(U60)
+	NET_C(U60.2, I_VM12)
+	NET_C(U60.4, I_V12)
+#if (UNDERCLOCK_NOISE_GEN)
+	// officially runs at 48-112kHz, but little noticeable difference
+	// in exchange for a big performance boost
+	PARAM(U60.FREQ, 24000)
+#endif
+
+	//
+	// Sheet 6, noise source
+	//
+
+	NET_C(U60.1, GND)
+	NET_C(U60.3, R65.1)
+	NET_C(R65.2, R64.2, R63.2, R62.2, C53.2, C52.1)
+	NET_C(R64.1, C54.1)
+	NET_C(C54.2, GND)
+	NET_C(R63.1, C55.2, C56.2)
+	NET_C(C55.1, GND)
+	NET_C(C56.1, GND)
+	NET_C(R62.1, C51.2)
+	NET_C(C51.1, GND)
+	NET_C(C53.1, GND)
+	NET_C(C52.2, R61.2, U49.3)
+	NET_C(R61.1, GND)
+	NET_C(U49.2, R60.1, R59.2)
+	NET_C(R60.2, U49.6)
+	NET_C(R59.1, GND)
+#if (ENABLE_NOISE_FRONTIERS)
+	AFUNC(NOISEFUNC, 1, "A0")
+	NET_C(R60.2, NOISEFUNC.A0)
+	ALIAS(NOISE, NOISEFUNC.Q)
+#else
+	ALIAS(NOISE, R60.2)
+#endif
+
+	//
+	// Sheet 7, top-left
+	//
+
+	NET_C(I_U42_OUT0, C14.1)
+	NET_C(C14.2, R20.2, U3.5)
+	NET_C(R20.1, GND)
+	NET_C(U3.6, U3.7)
+	AFUNC(DAC_U12, 2, "A0*A1")
+	NET_C(DAC_U12.A0, U3.7)
+	NET_C(DAC_U12.A1, I_U12_DAC)
+	NET_C(DAC_U12.Q, R12.2)
+
+	NET_C(I_U42_OUT1, C15.1)
+	NET_C(C15.2, R21.2, U4.5)
+	NET_C(R21.1, GND)
+	NET_C(U4.6, U4.7)
+	AFUNC(DAC_U13, 2, "A0*A1")
+	NET_C(DAC_U13.A0, U4.7)
+	NET_C(DAC_U13.A1, I_U13_DAC)
+	NET_C(DAC_U13.Q, R13.2)
+
+	NET_C(I_U42_OUT2, U15.10, U15.9)
+	NET_C(U15.15, U15.14, R32.1)
+	NET_C(U15.1, R33.1)
+	NET_C(U15.12, NOISE)
+	NET_C(U15.13, U16.3)
+	NET_C(U15.11, U16.11, U16.10, U16.9, I_U2B_SEL)
+	NET_C(R33.2, C13.2, R32.2, R31.1, U15.4)
+	NET_C(C13.1, GND)
+	NET_C(U15.3, R30.1)
+	NET_C(R31.2, R30.2, C9.2, U6.3)
+	NET_C(C9.1, GND)
+	NET_C(U6.2, R22.2, R17.1)
+	NET_C(R22.1, GND)
+	NET_C(R17.2, U6.1, U16.14)
+
+	NET_C(U16.13, U16.5, R9.1)
+	NET_C(U16.12, R19.2)
+	NET_C(U16.15, NOISE)
+	NET_C(U16.1, R18.2)
+	NET_C(R18.1, R19.1, U5.6, R15.2)
+	NET_C(U5.5, GND)
+	NET_C(R15.1, U5.7)
+	AFUNC(DAC_U14, 2, "A0*A1")
+	PARAM(DAC_U14.THRESH, 1e-5)
+	NET_C(DAC_U14.A0, U5.7)
+	NET_C(DAC_U14.A1, I_U14_DAC)
+	NET_C(DAC_U14.Q, R14.2)
+	NET_C(R14.1, R13.1, R12.1, U6.6, R16.1)
+	NET_C(U6.5, GND)
+	NET_C(U6.7, R16.2, U16.4)
+
+	//
+	// Sheet 7, bottom-left
+	//
+
+	NET_C(I_U41_OUT0, C34.1)
+	NET_C(C34.2, R41.2, U19.5)
+	NET_C(R41.1, GND)
+	NET_C(U19.6, U19.7)
+	AFUNC(DAC_U26, 2, "A0*A1")
+	NET_C(DAC_U26.A0, U19.7)
+	NET_C(DAC_U26.A1, I_U26_DAC)
+	NET_C(DAC_U26.Q, R39.2)
+
+	NET_C(I_U41_OUT1, C33.1)
+	NET_C(C33.2, R40.2, U18.5)
+	NET_C(R40.1, GND)
+	NET_C(U18.6, U18.7)
+	AFUNC(DAC_U25, 2, "A0*A1")
+	NET_C(DAC_U25.A0, U18.7)
+	NET_C(DAC_U25.A1, I_U25_DAC)
+	NET_C(DAC_U25.Q, R38.2)
+
+	NET_C(I_U41_OUT2, U8.10, U8.9)
+	NET_C(U8.15, U8.14, R25.1)
+	NET_C(U8.1, R24.1)
+	NET_C(U8.12, NOISE)
+	NET_C(U8.13, U7.3)
+	NET_C(U8.11, U7.11, U7.10, U7.9, I_U38B_SEL)
+	NET_C(R24.2, C16.2, R25.2, R29.1, U8.4)
+	NET_C(C16.1, GND)
+	NET_C(U8.3, R23.1)
+	NET_C(R23.2, R29.2, C17.2, U9.3)
+	NET_C(C17.1, GND)
+	NET_C(U9.2, R27.2, R26.1)
+	NET_C(R27.1, GND)
+	NET_C(R26.2, U9.1, U7.14)
+
+	NET_C(U7.13, U7.5, R8.1)
+	NET_C(U7.12, R35.2)
+	NET_C(U7.15, NOISE)
+	NET_C(U7.1, R34.2)
+	NET_C(R34.1, R35.1, U17.6, R36.2)
+	NET_C(U17.5, GND)
+	NET_C(R36.1, U17.7)
+	AFUNC(DAC_U24, 2, "A0*A1")
+	PARAM(DAC_U24.THRESH, 1e-5)
+	NET_C(DAC_U24.A0, U17.7)
+	NET_C(DAC_U24.A1, I_U24_DAC)
+	NET_C(DAC_U24.Q, R37.2)
+	NET_C(R37.1, R38.1, R39.1, U9.6, R28.1)
+	NET_C(U9.5, GND)
+	NET_C(U9.7, R28.2, U7.4)
+
+	//
+	// Sheet 7, top-right
+	//
+
+	NET_C(I_U43_OUT0, C35.1)
+	NET_C(C35.2, R50.2, U20.5)
+	NET_C(R50.1, GND)
+	NET_C(U20.6, U20.7)
+	AFUNC(DAC_U27, 2, "A0*A1")
+	NET_C(DAC_U27.A0, U20.7)
+	NET_C(DAC_U27.A1, I_U27_DAC)
+	NET_C(DAC_U27.Q, R42.2)
+
+	NET_C(I_U43_OUT1, C36.1)
+	NET_C(C36.2, R51.2, U21.5)
+	NET_C(R51.1, GND)
+	NET_C(U21.6, U21.7)
+	AFUNC(DAC_U28, 2, "A0*A1")
+	NET_C(DAC_U28.A0, U21.7)
+	NET_C(DAC_U28.A1, I_U28_DAC)
+	NET_C(DAC_U28.Q, R43.2)
+
+	NET_C(I_U43_OUT2, U30.10, U30.9)
+	NET_C(U30.15, U30.14, R55.1)
+	NET_C(U30.1, R56.1)
+	NET_C(U30.12, NOISE)
+	NET_C(U30.13, U31.3)
+	NET_C(U30.11, U31.11, U31.10, U31.9, I_U2A_SEL)
+	NET_C(R54.2, C32.2, R55.2, R56.2, U30.4)
+	NET_C(C32.1, GND)
+	NET_C(U30.3, R53.1)
+	NET_C(R53.2, R54.1, C25.2, U23.3)
+	NET_C(C25.1, GND)
+	NET_C(U23.2, R52.2, R47.1)
+	NET_C(R52.1, GND)
+	NET_C(R47.2, U23.1, U31.14)
+
+	NET_C(U31.13, U31.5, R10.1)
+	NET_C(U31.12, R49.2)
+	NET_C(U31.15, NOISE)
+	NET_C(U31.1, R48.2)
+	NET_C(R48.1, R49.1, U22.6, R45.2)
+	NET_C(U22.5, GND)
+	NET_C(R45.1, U22.7)
+	AFUNC(DAC_U29, 2, "A0*A1")
+	PARAM(DAC_U29.THRESH, 1e-5)
+	NET_C(DAC_U29.A0, U22.7)
+	NET_C(DAC_U29.A1, I_U29_DAC)
+	NET_C(DAC_U29.Q, R44.2)
+	NET_C(R42.1, R43.1, R44.1, U23.6, R46.1)
+	NET_C(U23.5, GND)
+	NET_C(U23.7, R46.2, U31.4)
+
+#if (USE_AFUNC_MIXING)
+	// This prevents the individual sound nets from combining
+	// at the mixing resistors.
+	AFUNC(MIXFUNC, 4, "(A0+A1+A2+A3)/4")
+	NET_C(MIXFUNC.A0, R7.1)
+	NET_C(MIXFUNC.A1, R10.2)
+	NET_C(MIXFUNC.A2, R9.2)
+	NET_C(MIXFUNC.A3, R8.2)
+	ALIAS(OUTPUT, MIXFUNC.Q)
+#else
+	NET_C(R7.1, R10.2, R9.2, R8.2)
+	ALIAS(OUTPUT, R8.2)
+#endif
+
+	//
+	// Unconnected inputs
+	//
+	NET_C(GND, R7.2)
+	NET_C(GND, U3.2, U3.3, U4.2, U4.3, U5.2, U5.3)
+	NET_C(GND, U17.2, U17.3, U18.2, U18.3, U19.2, U19.3)
+	NET_C(GND, U20.2, U20.3, U21.2, U21.3, U22.2, U22.3)
+
+	// unconnected inputs to analog switch -- what's the right approach?
+	NET_C(GND, U8.2, U8.5, U7.2)
+	NET_C(GND, U15.2, U15.5, U16.2)
+	NET_C(GND, U30.2, U30.5, U31.2)
+/*
+    OPTIMIZE_FRONTIER(R48.1, RES_M(1), 50)
+    OPTIMIZE_FRONTIER(R49.1, RES_M(1), 50)
+    OPTIMIZE_FRONTIER(R18.1, RES_M(1), 50)
+    OPTIMIZE_FRONTIER(R19.1, RES_M(1), 50)
+    OPTIMIZE_FRONTIER(R34.1, RES_M(1), 50)
+    OPTIMIZE_FRONTIER(R35.1, RES_M(1), 50)
+*/
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_segausb.h mame-0.224+dfsg.1/src/mame/audio/nl_segausb.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_segausb.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_segausb.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_SEGAUSB_H
+#define MAME_AUDIO_NL_SEGAUSB_H
+
+#pragma once
+
+NETLIST_EXTERNAL(segausb)
+
+#endif // MAME_AUDIO_NL_SEGAUSB_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_solarq.cpp mame-0.224+dfsg.1/src/mame/audio/nl_solarq.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_solarq.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_solarq.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,1271 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Solar Quest
+//
+// Derived from the schematics in the Solar Quest manual.
+//
+// Known problems/issues:
+//
+//    * This was the most challenging netlist so far to get
+//       into realtime performance.
+//
+//    * The FIRE sound in particular uses a complex network
+//       of op-amps (mix of TL081 and CA3080) with lots of
+//       feedback. The default "fast" CA3080 is not sufficient
+//       here because it uses an instantaneous AFUNC which
+//       is bad in feedback loops, so instead we use the
+//       much slower 15xBJT model. Frontiers are used to
+//       isolate the two relevant CA3080s from the more
+//       common CA3080s used for final mixing.
+//
+//    * A few important frontiers are used to isolate parts
+//       of the circuit from one another.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_cinemat_common.h"
+
+
+//
+// Optimizations
+//
+
+#define HLE_MUSIC_CLOCK (1)
+#define HLE_CAPTURE_VCO (1)
+#define HLE_PHOTON_VCO (1)
+#define HLE_NOISE_CONVERT (1)
+#define ENABLE_FRONTIERS (1)
+
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(solarq)
+
+	SOLVER(Solver, 1000)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 4e-5)
+
+	TTL_INPUT(I_OUT_0, 0)               // active high
+	TTL_INPUT(I_OUT_1, 0)               // active high
+	TTL_INPUT(I_OUT_2, 0)               // active high
+	TTL_INPUT(I_OUT_3, 0)               // active high
+	TTL_INPUT(I_OUT_4, 0)               // active high
+	TTL_INPUT(I_OUT_7, 0)               // active high
+
+	NET_C(GND, I_OUT_0.GND, I_OUT_1.GND, I_OUT_2.GND, I_OUT_3.GND, I_OUT_4.GND, I_OUT_7.GND)
+	NET_C(I_V5, I_OUT_0.VCC, I_OUT_1.VCC, I_OUT_2.VCC, I_OUT_3.VCC, I_OUT_4.VCC, I_OUT_7.VCC)
+
+	CINEMAT_LOCAL_MODELS
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V15, 15)
+	ANALOG_INPUT(I_VM15, -15)
+
+	RES(R1, RES_K(1))
+	RES(R2, RES_K(1))
+	RES(R3, RES_K(1))
+	RES(R4, RES_K(2))
+	RES(R5, RES_K(15))
+	RES(R6, 390)
+	RES(R7, RES_M(1))
+	RES(R8, RES_K(4.7))
+	RES(R9, 330)
+	RES(R10, 330)
+	RES(R11, RES_K(4.7))
+	RES(R12, RES_K(20))
+	RES(R13, RES_K(24))
+	RES(R14, RES_M(1))
+	RES(R15, RES_K(6.8))
+	RES(R16, RES_K(18))
+	RES(R17, RES_K(47))
+	RES(R18, 390)
+	RES(R19, 390)
+	RES(R20, RES_K(4.7))
+	RES(R21, RES_K(2.7))
+	RES(R22, RES_K(4.7))
+	RES(R23, RES_K(39))
+	RES(R24, RES_K(12))
+	RES(R25, RES_K(1))
+	RES(R26, RES_K(75))
+	RES(R27, RES_K(4.7))
+	RES(R28, RES_K(2.7))
+	RES(R29, RES_K(4.7))
+	RES(R30, RES_K(39))
+	RES(R31, RES_K(12))
+	RES(R32, RES_K(1))
+	RES(R33, RES_K(200))
+	RES(R34, RES_K(8.2))
+	RES(R35, RES_K(47))
+	RES(R36, RES_K(22))
+	RES(R37, RES_K(1))
+	RES(R38, RES_K(1))
+	RES(R39, RES_K(4.7))
+	RES(R40, RES_K(2.7))
+	RES(R41, RES_K(4.7))
+	RES(R42, RES_K(39))
+	RES(R43, RES_K(12))
+	RES(R44, RES_K(1))
+	RES(R45, RES_K(36))
+	RES(R46, RES_K(100))
+	RES(R47, RES_K(2))
+	RES(R48, RES_M(1))
+	RES(R49, RES_K(4.7))
+	RES(R50, RES_K(2.7))
+	RES(R51, RES_K(4.7))
+	RES(R52, RES_K(39))
+	RES(R53, RES_K(2.7))
+	RES(R54, RES_K(12))
+//  RES(R55, xx)           -- deleted
+//  RES(R56, xx)           -- deleted
+//  RES(R57, xx)           -- deleted
+	RES(R58, RES_K(8.2))
+	RES(R59, RES_K(51))
+	RES(R60, RES_M(1))
+	RES(R61, RES_K(20))
+	RES(R62, RES_K(20))
+	RES(R63, 100)
+	RES(R64, RES_K(100))
+	RES(R65, RES_K(20))
+	RES(R66, RES_K(2))
+	RES(R67, 100)
+	RES(R68, RES_K(100))
+	RES(R69, RES_K(20))
+	RES(R70, RES_K(20))
+	RES(R71, RES_K(13))
+	RES(R72, RES_K(300))
+	RES(R73, 100)
+	RES(R74, 100)
+	RES(R75, RES_K(4.7))
+	RES(R76, RES_K(2.7))
+	RES(R77, RES_K(4.7))
+	RES(R78, RES_K(39))
+	RES(R79, RES_K(12))
+	RES(R80, RES_K(1))
+	RES(R81, RES_K(360))
+	RES(R82, RES_K(4.7))
+	RES(R83, RES_K(2.7))
+	RES(R84, RES_K(4.7))
+	RES(R85, RES_K(39))
+	RES(R86, RES_K(12))
+	RES(R87, RES_K(2.7))
+	RES(R88, RES_K(270))
+	RES(R89, RES_K(51))
+	RES(R90, RES_M(1))
+	RES(R91, RES_K(10))
+	RES(R92, RES_K(10))
+	RES(R93, RES_K(1))
+	RES(R94, RES_K(2))
+	RES(R95, RES_K(10))
+	RES(R96, RES_K(12))
+	RES(R97, RES_K(1))
+	RES(R98, RES_K(10))
+	RES(R99, RES_K(11))
+	RES(R100, RES_K(100))
+	RES(R101, RES_K(100))
+	RES(R102, RES_K(240))
+	RES(R103, RES_K(100))
+	RES(R104, RES_K(100))
+	RES(R105, RES_K(100))
+	RES(R106, 200)
+	RES(R107, 200)
+	RES(R108, RES_K(120))
+	RES(R109, RES_M(10))
+	RES(R110, RES_K(100))
+	RES(R111, 200)
+	RES(R112, 200)
+	RES(R113, RES_K(4.7))
+	RES(R114, RES_K(2.7))
+	RES(R115, RES_K(4.7))
+	RES(R116, RES_K(39))
+	RES(R117, RES_K(12))
+	RES(R118, RES_K(1))
+	RES(R119, RES_K(120))
+	RES(R120, RES_M(10))
+	RES(R121, RES_K(4.7))
+	RES(R122, RES_M(1.5))
+	RES(R123, 390)
+	RES(R124, 390)
+	RES(R125, RES_K(4.7))
+	RES(R126, RES_K(2.7))
+	RES(R127, RES_K(4.7))
+	RES(R128, RES_K(39))
+	RES(R129, RES_K(12))
+	RES(R130, RES_K(1))
+//  RES(R131, xx)          -- deleted
+	RES(R132, RES_K(75))
+	RES(R133, RES_K(4.7))
+	RES(R134, RES_K(2.7))
+	RES(R135, RES_K(4.7))
+	RES(R136, RES_K(39))
+	RES(R137, RES_K(12))
+	RES(R138, RES_K(1))
+	RES(R139, RES_K(51))
+	RES(R140, RES_K(100))
+	RES(R141, RES_K(4.7))
+	RES(R142, RES_K(2.7))
+	RES(R143, RES_K(4.7))
+	RES(R144, RES_K(39))
+	RES(R145, RES_K(12))
+	RES(R146, RES_K(1))
+	RES(R147, RES_K(51))
+	RES(R148, RES_K(200))
+	RES(R149, RES_K(30))
+	RES(R150, RES_K(8.2))
+	RES(R151, RES_K(51))
+//  POT(R152, RES_K(10))  -- part of final amp (not emulated)
+//  RES(R153, RES_K(15))  -- part of final amp (not emulated)
+//  RES(R154, RES_K(390)) -- part of final amp (not emulated)
+//  RES(R155, RES_K(150)) -- part of final amp (not emulated)
+//  RES(R156, 150)        -- part of final amp (not emulated)
+//  RES(R157, RES_K(22))  -- part of final amp (not emulated)
+//  RES(R158, 0.51)       -- part of final amp (not emulated)
+//  RES(R159, 0.51)       -- part of final amp (not emulated)
+//  RES(R160, RES_K(390)) -- part of final amp (not emulated)
+	RES(R161, RES_K(1))
+	RES(R162, RES_K(1))
+	RES(R163, RES_K(1))
+	RES(R164, RES_K(1))
+
+	CAP(C1, CAP_U(0.001))
+	CAP(C2, CAP_U(0.01))
+	CAP(C3, CAP_U(0.1))
+	CAP(C4, CAP_P(680))
+	CAP(C5, CAP_U(0.1))
+	CAP(C6, CAP_U(0.1))
+	CAP(C7, CAP_U(0.01))
+	CAP(C8, CAP_U(3.3))
+	CAP(C9, CAP_U(1))
+	CAP(C10, CAP_U(0.22))
+	CAP(C11, CAP_U(0.33))
+	CAP(C12, CAP_U(4.7))
+	CAP(C13, CAP_U(0.1))
+	CAP(C14, CAP_U(0.01))
+	CAP(C15, CAP_U(1))
+	CAP(C16, CAP_U(0.1))
+	CAP(C17, CAP_U(1))
+	CAP(C18, CAP_U(0.47))
+	CAP(C19, CAP_U(0.001))
+	CAP(C20, CAP_U(0.01))
+	CAP(C21, CAP_U(0.1))
+	CAP(C22, CAP_U(0.1))
+	CAP(C23, CAP_P(330))
+	CAP(C24, CAP_U(0.68))
+	CAP(C25, CAP_P(330))
+	CAP(C26, CAP_U(2.2))
+	CAP(C27, CAP_U(0.22))
+	CAP(C28, CAP_U(2.2))
+	CAP(C29, CAP_U(2.2))
+	CAP(C30, CAP_U(0.1))
+	CAP(C31, CAP_U(0.33))
+//  CAP(C32, CAP_U(0.68))   -- part of final amp (not emulated)
+//  CAP(C33, CAP_P(470))    -- part of final amp (not emulated)
+//  CAP(C34, CAP_P(470))    -- part of final amp (not emulated)
+//  CAP(C35, CAP_U(0.005))  -- part of final amp (not emulated)
+//  CAP(C36, CAP_P(470))    -- part of final amp (not emulated)
+//  CAP(C37, CAP_U(0.1))    -- part of voltage converter (not emulated)
+//  CAP(C38, CAP_U(25))     -- part of voltage converter (not emulated)
+//  CAP(C39, CAP_U(25))     -- part of voltage converter (not emulated)
+//  CAP(C40, CAP_U(0.1))    -- part of voltage converter (not emulated)
+//  CAP(C41, CAP_U(25))     -- part of voltage converter (not emulated)
+//  CAP(C42, CAP_U(25))     -- part of voltage converter (not emulated)
+//  CAP(C43, CAP_U(25))     -- part of voltage converter (not emulated)
+
+//  D_1N4003(D1)            -- part of voltage converter (not emulated)
+//  D_1N4003(D2)            -- part of voltage converter (not emulated)
+//  D_1N4003(D3)            -- part of voltage converter (not emulated)
+//  D_1N4003(D4)            -- part of voltage converter (not emulated)
+	D_1N5240(D5)
+	D_1N5240(D6)
+	D_1N914(D7)
+	D_1N914(D8)
+//  D_1N4003(D9)            -- part of final amp (not emulated)
+//  D_1N4003(D10)           -- part of final amp (not emulated)
+
+	Q_2N3906(Q1)            // PNP
+	Q_2N3906(Q2)            // PNP
+	Q_2N3906(Q3)            // PNP
+	Q_2N3906(Q4)            // PNP
+	Q_2N3906(Q5)            // PNP
+	Q_2N3906(Q6)            // PNP
+	Q_2N3906(Q7)            // PNP
+	Q_2N3904(Q8)            // NPN
+	Q_2N3906(Q9)            // PNP
+	Q_2N3906(Q10)           // PNP
+	Q_2N3906(Q11)           // PNP
+	Q_2N3904(Q12)           // NPN
+	Q_2N3904(Q13)           // NPN
+	Q_2N3906(Q14)           // PNP
+	Q_2N3906(Q15)           // PNP
+	Q_2N3906(Q16)           // PNP
+	Q_2N3906(Q17)           // PNP
+	Q_2N3906(Q18)           // PNP
+	Q_2N3906(Q19)           // PNP
+	Q_2N3906(Q20)           // PNP
+	Q_2N3906(Q21)           // PNP
+//  Q_2N6292(Q22)           // NPN -- part of final amp (not emulated)
+//  Q_2N6107(Q23)           // PNP -- part of final amp (not emulated)
+
+#if (!HLE_MUSIC_CLOCK)
+	CLOCK(Y1, 20000000)
+	NET_C(Y1.GND, GND)
+	NET_C(Y1.VCC, I_V5)
+#endif
+
+	TTL_7414_DIP(U1)        // Hex Inverter
+	NET_C(U1.7, GND)
+	NET_C(U1.14, I_V5)
+
+	TTL_7414_DIP(U2)        // Hex Inverter
+	NET_C(U2.7, GND)
+	NET_C(U2.14, I_V5)
+
+	TTL_74LS164_DIP(U3)     // 8-bit Shift Reg.
+	NET_C(U3.7, GND)
+	NET_C(U3.14, I_V5)
+
+	TTL_74LS164_DIP(U4)     // 8-bit Shift Reg.
+	NET_C(U4.7, GND)
+	NET_C(U4.14, I_V5)
+
+	TTL_74LS377_DIP(U5)     // Octal D Flip Flop
+	NET_C(U5.10, GND)
+	NET_C(U5.20, I_V5)
+
+	TTL_74LS377_DIP(U6)     // Octal D Flip Flop
+	NET_C(U6.10, GND)
+	NET_C(U6.20, I_V5)
+
+	TTL_74LS377_DIP(U7)     // Octal D Flip Flop
+	NET_C(U7.10, GND)
+	NET_C(U7.20, I_V5)
+
+	TTL_74LS163_DIP(U8)     // Binary Counter
+	NET_C(U8.8, GND)
+	NET_C(U8.16, I_V5)
+
+	TTL_74LS163_DIP(U9)     // Binary Counter
+	NET_C(U9.8, GND)
+	NET_C(U9.16, I_V5)
+
+	TTL_74LS163_DIP(U10)    // Binary Counter
+	NET_C(U10.8, GND)
+	NET_C(U10.16, I_V5)
+
+	TTL_74LS163_DIP(U11)    // Binary Counter
+	NET_C(U11.8, GND)
+	NET_C(U11.16, I_V5)
+
+	TTL_74LS163_DIP(U12)    // Binary Counter
+	NET_C(U12.8, GND)
+	NET_C(U12.16, I_V5)
+
+	LM555_DIP(U13)
+
+	TTL_74LS74_DIP(U14)     // Dual D Flip Flop
+	NET_C(U14.7, GND)
+	NET_C(U14.14, I_V5)
+
+	TTL_74LS74_DIP(U15)     // Dual D Flip Flop
+	NET_C(U15.7, GND)
+	NET_C(U15.14, I_V5)
+
+	TTL_74LS107_DIP(U16)    // DUAL J-K FLIP-FLOPS WITH CLEAR
+	NET_C(U16.7, GND)
+	NET_C(U16.14, I_V5)
+
+	TTL_74LS393_DIP(U17)    // Dual 4-Stage Binary Counter
+	NET_C(U17.7, GND)
+	NET_C(U17.14, I_V5)
+
+	TTL_74LS86_DIP(U18)     // Quad 2-Input XOR Gates
+	NET_C(U18.7, GND)
+	NET_C(U18.14, I_V5)
+
+	TTL_74LS74_DIP(U19)     // Dual D Flip Flop
+	NET_C(U19.7, GND)
+	NET_C(U19.14, I_V5)
+
+	TTL_74LS74_DIP(U20)     // Dual D Flip Flop
+	NET_C(U20.7, GND)
+	NET_C(U20.14, I_V5)
+
+	TTL_74LS393_DIP(U21)    // Dual 4-Stage Binary Counter
+	NET_C(U21.7, GND)
+	NET_C(U21.14, I_V5)
+
+	TTL_74LS02_DIP(U22)     // Quad 2-input Nor Gate
+	NET_C(U22.7, GND)
+	NET_C(U22.14, I_V5)
+
+	TTL_74LS74_DIP(U23)     // Dual D Flip Flop
+	NET_C(U23.7, GND)
+	NET_C(U23.14, I_V5)
+
+	TTL_74S04_DIP(U24)      // Hex Inverting Gates
+	NET_C(U24.7, GND)
+	NET_C(U24.14, I_V5)
+
+	TTL_74S113A_DIP(U25)    // Dual JK Negative Edge-Trigged Flip Flop
+	NET_C(U25.7, GND)
+	NET_C(U25.14, I_V5)
+
+	TTL_74LS163_DIP(U26)    // Binary Counter
+	NET_C(U26.8, GND)
+	NET_C(U26.16, I_V5)
+
+	TTL_74LS107_DIP(U27)    // DUAL J-K FLIP-FLOPS WITH CLEAR
+	NET_C(U27.7, GND)
+	NET_C(U27.14, I_V5)
+
+	TTL_74LS164_DIP(U28)    // 8-bit Shift Reg.
+	NET_C(U28.7, GND)
+	NET_C(U28.14, I_V5)
+
+	TTL_74LS164_DIP(U29)    // 8-bit Shift Reg.
+	NET_C(U29.7, GND)
+	NET_C(U29.14, I_V5)
+
+	TTL_74LS164_DIP(U30)    // 8-bit Shift Reg.
+	NET_C(U30.7, GND)
+	NET_C(U30.14, I_V5)
+
+	TTL_74LS393_DIP(U31)    // Dual 4-Stage Binary Counter
+	NET_C(U31.7, GND)
+	NET_C(U31.14, I_V5)
+
+	TL081_DIP(U32)          // Op. Amp.
+	NET_C(U32.7, I_V15)
+	NET_C(U32.4, I_VM15)
+
+	CA3080_DIP(U33)         // Op. Amp.
+	NET_C(U33.4, I_VM15)
+	NET_C(U33.7, I_V15)
+
+	CA3080_DIP(U34)         // Op. Amp.
+	NET_C(U34.4, I_VM15)
+	NET_C(U34.7, I_V15)
+
+	LM555_DIP(U35)
+
+	TL081_DIP(U36)          // Op. Amp.
+	NET_C(U36.7, I_V15)
+	NET_C(U36.4, I_VM15)
+
+	TL081_DIP(U37)          // Op. Amp.
+	NET_C(U37.7, I_V15)
+	NET_C(U37.4, I_VM15)
+
+	TL081_DIP(U38)          // Op. Amp.
+	NET_C(U38.7, I_V15)
+	NET_C(U38.4, I_VM15)
+
+	TL081_DIP(U39)          // Op. Amp.
+	NET_C(U39.7, I_V15)
+	NET_C(U39.4, I_VM15)
+
+	TL081_DIP(U40)          // Op. Amp.
+	NET_C(U40.7, I_V15)
+	NET_C(U40.4, I_VM15)
+
+	CA3080_DIP(U41)         // Op. Amp.
+	NET_C(U41.4, I_VM15)
+	NET_C(U41.7, I_V15)
+
+#if (!HLE_CAPTURE_VCO)
+	LM566_DIP(U42)
+#endif
+
+	TL081_DIP(U43)          // Op. Amp.
+	NET_C(U43.7, I_V15)
+	NET_C(U43.4, I_VM15)
+
+	CA3080_SLOW_DIP(U44)        // Op. Amp.
+	NET_C(U44.4, I_VM15)
+	NET_C(U44.7, I_V15)
+
+	TL081_DIP(U45)          // Op. Amp.
+	NET_C(U45.7, I_V15)
+	NET_C(U45.4, I_VM15)
+
+	CA3080_SLOW_DIP(U46)        // Op. Amp.
+	NET_C(U46.4, I_VM15)
+	NET_C(U46.7, I_V15)
+
+	TL081_DIP(U47)          // Op. Amp.
+	NET_C(U47.7, I_V15)
+	NET_C(U47.4, I_VM15)
+
+	CA3080_DIP(U48)         // Op. Amp.
+	NET_C(U48.4, I_VM15)
+	NET_C(U48.7, I_V15)
+
+	TL081_DIP(U49)          // Op. Amp.
+	NET_C(U49.7, I_V15)
+	NET_C(U49.4, I_VM15)
+
+	TL081_DIP(U50)          // Op. Amp.
+	NET_C(U50.7, I_V15)
+	NET_C(U50.4, I_VM15)
+
+//  TL081_DIP(U51)          // Op. Amp. -- part of final amp (not emulated)
+//  NET_C(U51.7, I_V15)
+//  NET_C(U51.4, I_VM15)
+
+//  TTL_7815_DIP(U52)       // +15V Regulator -- part of voltage converter (not emulated)
+//  TTL_7915_DIP(U53)       // -15V Regulator -- part of voltage converter (not emulated)
+
+	//
+	// Page 1, top left
+	//
+
+	NET_C(I_OUT_7, U1.1)
+	NET_C(U1.2, U1.3)
+	NET_C(U1.4, U3.1)
+
+	NET_C(I_OUT_4, U1.5)
+	NET_C(U1.6, U1.13)
+	NET_C(U1.12, U3.8, U4.8)
+
+	NET_C(I_V5, R1.1, R2.1, R3.1)
+	ALIAS(HIA_P, R1.2)
+	ALIAS(HIB_P, R2.2)
+	ALIAS(HIC_P, R3.2)
+
+	NET_C(HIA_P, U3.9, U3.2)
+	NET_C(U3.3, U5.3, U7.3)
+	NET_C(U3.4, U5.4, U7.4)
+	NET_C(U3.5, U5.7, U7.7)
+	NET_C(U3.6, U5.8, U7.8)
+	NET_C(U3.10, U5.13, U7.13)
+	NET_C(U3.11, U5.14, U7.14)
+	NET_C(U3.12, U5.17, U7.17)
+	NET_C(U3.13, U5.18, U7.18, U4.1)
+
+	NET_C(HIA_P, U4.2, U4.9)
+	NET_C(U4.3, U6.3)
+	NET_C(U4.4, U6.4)
+	NET_C(U4.5, U6.7)
+	NET_C(U4.6, U6.8)
+	NET_C(U4.10, U6.13)
+	NET_C(U4.11, U6.14)
+	NET_C(U4.12, U6.17)
+	NET_C(U4.13, U6.18)
+
+	ALIAS(MEN_P, U5.2)
+	ALIAS(AS2_M, U5.5)
+	ALIAS(AS1_M, U5.6)
+	ALIAS(AS0_M, U5.9)
+	ALIAS(FS11_P, U5.12)
+	ALIAS(FS10_P, U5.15)
+	ALIAS(FS09_P, U5.16)
+	ALIAS(FS08_P, U5.19)
+	ALIAS(MLATCH_P, U5.11)
+	NET_C(U5.1, GND)
+
+	ALIAS(FS07_P, U6.2)
+	ALIAS(FS06_P, U6.5)
+	ALIAS(FS05_P, U6.6)
+	ALIAS(FS04_P, U6.9)
+	ALIAS(FS03_P, U6.12)
+	ALIAS(FS02_P, U6.15)
+	ALIAS(FS01_P, U6.16)
+	ALIAS(FS00_P, U6.19)
+	NET_C(U6.11, MLATCH_P)
+	NET_C(U6.1, GND)
+
+	//
+	// Page 1, bottom
+	//
+
+	NET_C(I_OUT_0, U2.3)
+	NET_C(U2.4, U2.5)
+	ALIAS(LATCH_CLK_P, U2.6)
+
+	NET_C(I_OUT_1, U1.11)
+	NET_C(U1.10, U1.9)
+	NET_C(U1.8, U7.11)
+
+	ALIAS(LOUD_EXP_M, U7.2)
+	ALIAS(SOFT_EXP_M, U7.5)
+	ALIAS(THRUST_M, U7.6)
+	ALIAS(FIRE_M, U7.9)
+	ALIAS(CAPTURE_M, U7.12)
+	ALIAS(NUKE_P, U7.15)
+	ALIAS(PHOTON_M, U7.16)
+	HINT(U7.19, NC)
+	NET_C(U7.1, GND)
+
+	NET_C(HIA_P, U19.4, U19.1)
+	ALIAS(MACLK_M, U19.2)
+	ALIAS(_227KC_P, U19.3)
+	ALIAS(MBCLK_P, U19.5)
+	ALIAS(MBCLK_M, U19.6)
+
+	NET_C(HIA_P, U19.10, U19.13)
+	NET_C(MBCLK_P, U19.12)
+	ALIAS(_227KC_M, U19.11)
+	ALIAS(MACLK_P, U19.9)
+	NET_C(U19.8, MACLK_M, U20.11)
+
+	NET_C(HIA_P, U16.8, U16.11, U16.10)
+	NET_C(U16.9, U20.9, U22.8)
+	ALIAS(DMUSIC_P, U16.5)
+	HINT(U16.6, NC)
+
+	NET_C(HIA_P, U20.10)
+	ALIAS(MCARRY_P, U20.12)
+	NET_C(R162.1, I_V5)
+	NET_C(R162.2, U20.13)
+	ALIAS(MLOAD_M, U20.8)
+
+	NET_C(MBCLK_M, U21.13)
+	HINT(U21.8, NC)
+	NET_C(U21.9, U22.11, U22.12)
+	HINT(U21.10, NC)
+	HINT(U21.11, NC)
+	NET_C(U21.12, U20.6, U22.9)
+
+	NET_C(HIA_P, U20.2, U20.4)
+	NET_C(LATCH_CLK_P, U20.3)
+	ALIAS(KILL_FLAG_M, U20.1)
+	HINT(U20.5, NC)
+
+	NET_C(U22.13, U23.10)
+	NET_C(U22.10, U23.12)
+	NET_C(MBCLK_P, U23.11)
+	NET_C(HIA_P, U23.13)
+	HINT(U23.8, NC)
+	NET_C(U23.9, U23.2, MLATCH_P)
+
+	NET_C(HIA_P, U23.4)
+	NET_C(MACLK_P, U23.3)
+	NET_C(I_V5, R163.1)
+	NET_C(R163.2, U23.1)
+	HINT(U23.5, NC)
+	NET_C(U23.6, KILL_FLAG_M)
+
+	//
+	// Page 1, middle
+	//
+
+	NET_C(FS11_P, U8.6)
+	NET_C(FS10_P, U8.5)
+	NET_C(FS09_P, U8.4)
+	NET_C(FS08_P, U8.3)
+	NET_C(HIB_P, U8.1)
+	NET_C(MEN_P, U8.7)
+	NET_C(MLOAD_M, U8.9)
+	NET_C(MBCLK_P, U8.2)
+	NET_C(U8.10, U9.15)
+	NET_C(U8.15, MCARRY_P)
+	HINT(U8.11, NC)
+	HINT(U8.12, NC)
+	HINT(U8.13, NC)
+	HINT(U8.14, NC)
+
+	NET_C(FS07_P, U9.6)
+	NET_C(FS06_P, U9.5)
+	NET_C(FS05_P, U9.4)
+	NET_C(FS04_P, U9.3)
+	NET_C(HIB_P, U9.1)
+	NET_C(MEN_P, U9.7)
+	NET_C(MLOAD_M, U9.9)
+	NET_C(MACLK_P, U9.2)
+	NET_C(U9.10, U10.15)
+	HINT(U9.11, NC)
+	HINT(U9.12, NC)
+	HINT(U9.13, NC)
+	HINT(U9.14, NC)
+
+	NET_C(FS03_P, U10.6)
+	NET_C(FS02_P, U10.5)
+	NET_C(FS01_P, U10.4)
+	NET_C(FS00_P, U10.3)
+	NET_C(HIB_P, U10.1)
+	NET_C(MLOAD_M, U10.9)
+	NET_C(MBCLK_M, U10.2)
+	NET_C(MEN_P, U10.7, U10.10)
+	HINT(U10.11, NC)
+	HINT(U10.12, NC)
+	HINT(U10.13, NC)
+	HINT(U10.14, NC)
+
+	//
+	// Page 1, top-right
+	//
+
+	NET_C(GND, U11.6, U11.4, U11.3)
+	NET_C(HIB_P, U11.5, U11.1, U11.7)
+	ALIAS(NLOAD_M, U11.9)
+	ALIAS(NBCLK_P, U11.2)
+	NET_C(U11.10, U12.15)
+	NET_C(U11.15, U15.12)
+	HINT(U11.11, NC)
+	HINT(U11.12, NC)
+	HINT(U11.13, NC)
+	HINT(U11.14, NC)
+
+	NET_C(GND, U12.6, U12.5, U12.4)
+	NET_C(HIB_P, U12.3, U12.1, U12.7, U12.10)
+	NET_C(NLOAD_M, U12.9)
+	ALIAS(NACLK_M, U12.2)
+	HINT(U12.11, NC)
+	HINT(U12.12, NC)
+	HINT(U12.13, NC)
+	HINT(U12.14, NC)
+
+	NET_C(HIB_P, U15.10)
+	ALIAS(NBCLK_M, U15.11)
+	NET_C(I_V5, R164.1)
+	NET_C(R164.2, U15.13)
+	NET_C(U15.9, U16.12)
+	NET_C(U15.8, NLOAD_M)
+
+	NET_C(U16.1, U16.4, U16.13, HIB_P)
+	NET_C(U16.3, U18.2)
+	HINT(U16.2, NC)
+
+	NET_C(GND, U17.2)
+	NET_C(NBCLK_P, U17.1)
+	NET_C(U17.6, U17.13)
+	HINT(U17.5, NC)
+	HINT(U17.4, NC)
+	HINT(U17.3, NC)
+
+	NET_C(GND, U17.12)
+	HINT(U17.8, NC)
+	NET_C(U17.9, U18.1)
+	HINT(U17.10, NC)
+	HINT(U17.11, NC)
+
+	NET_C(U18.3, R7.1, R8.2)
+	NET_C(R7.2, C3.1)
+	ALIAS(SJ, C3.2)
+	NET_C(R8.1, I_V5)
+
+	//
+	// Page 1, middle-right
+	//
+
+	NET_C(I_V5, U13.8, R4.2)
+	NET_C(R4.1, U13.7, R5.2)
+	NET_C(R5.1, U13.2, U13.6, C1.2)
+	NET_C(C1.1, GND)
+	NET_C(NUKE_P, U13.4)
+	NET_C(U13.1, GND)
+	NET_C(U13.5, C2.2)
+	NET_C(C2.1, GND)
+	NET_C(U13.3, R6.2, U2.1)
+	NET_C(R6.1, GND)
+	NET_C(U2.2, U2.13, U14.3)
+
+	NET_C(HIB_P, U14.1, U14.13)
+	NET_C(U14.6, NACLK_M)
+	NET_C(U14.5, U14.12)
+	NET_C(U14.2, U14.8, NBCLK_M)
+	NET_C(HIB_P, U14.4, U14.10)
+	NET_C(U14.9, NBCLK_P)
+	NET_C(U2.12, U14.11)
+
+#if (HLE_MUSIC_CLOCK)
+	//
+	// The 20MHz clock (Y1) is divided by 4 via a pair
+	// of JK flip-flops (U25) to 5MHz. That signal is only
+	// used to clock a 74LS163 counter (U26) that divides
+	// the clock by 9 via a preset value. It then goes
+	// through another JK flip-flop (U27) for another
+	// divide by 2, ending up at 277778Hz. No sense in
+	// running all this manually.
+	//
+	CLOCK(MUSICCLK, 277778)
+	NET_C(MUSICCLK.VCC, I_V5)
+	NET_C(MUSICCLK.GND, GND)
+	NET_C(_227KC_P, MUSICCLK.Q)
+	NET_C(MUSICCLK.Q, U24.13)
+	NET_C(_227KC_M, U24.12)
+	NET_C(GND, R9.1, R9.2, R10.1, R10.2, R161.1, R161.2, C4.1, C4.2)
+	NET_C(GND, U15.1, U15.2, U15.3, U15.4)
+	NET_C(GND, U24.1, U24.5)
+	NET_C(GND, U25.1, U25.2, U25.3, U25.4, U25.10, U25.11, U25.12, U25.13)
+	NET_C(GND, U26.1, U26.2, U26.3, U26.4, U26.5, U26.6, U26.7, U26.9, U26.10)
+	NET_C(GND, U27.1, U27.4, U27.12)
+	NET_C(HIC_P, U27.13)
+
+#else
+
+	//
+	// Page 2, top-left (clock)
+	//
+
+	//
+	// This is just here for documentation; the crystal is
+	// not modelled for this circuit.
+	//
+	NET_C(U24.5, R9.1, C4.1)
+	NET_C(U24.6, R9.2, Y1.1)
+	NET_C(Y1.2, R10.1, U24.1)
+	NET_C(R10.2, U24.2, C4.2, U24.13)
+	NET_C(U24.12, U25.1)
+	NET_C(HIC_P, U25.3, U25.2, U25.4, U25.11, U25.12, U25.10)
+	NET_C(U25.5, U25.13)
+	ALIAS(_5MC_P, U25.9)
+	ALIAS(_5MC_M, U25.8)
+
+	//
+	// Page 2, middle-left
+	//
+
+	NET_C(HIC_P, U26.5, U26.3, U26.1, U26.10, U26.7)
+	NET_C(GND, U26.6, U26.4)
+	NET_C(_5MC_P, U26.2)
+	HINT(U26.11, NC)
+	HINT(U26.12, NC)
+	HINT(U26.13, NC)
+	HINT(U26.14, NC)
+	NET_C(U26.9, U27.12, U15.6)
+	NET_C(U26.15, U15.2)
+
+	NET_C(_5MC_M, U15.3)
+	NET_C(HIC_P, U15.4)
+	NET_C(I_V5, R161.1)
+	NET_C(R161.2, U15.1)
+
+	NET_C(HIC_P, U27.1, U27.4, U27.13)
+	NET_C(_227KC_P, U27.3)
+	NET_C(_227KC_M, U27.2)
+#endif
+
+	//
+	// Page 2, top-middle
+	//
+
+	NET_C(MACLK_P, U29.8)
+	ALIAS(IN_M, U29.2)
+	NET_C(U29.2, U29.1)
+	ALIAS(RN_M, U29.9)
+	NET_C(U29.9, U28.9, U30.9)
+	NET_C(U29.13, U28.1, U28.2)
+	HINT(U29.12, NC)
+	HINT(U29.11, NC)
+	HINT(U29.10, NC)
+	HINT(U29.6, NC)
+	HINT(U29.5, NC)
+	HINT(U29.4, NC)
+	HINT(U29.3, NC)
+
+	NET_C(MACLK_P, U28.8)
+	NET_C(U28.13, U30.1, U30.2)
+	HINT(U28.12, NC)
+	HINT(U28.11, NC)
+	HINT(U28.10, NC)
+	HINT(U28.6, NC)
+	HINT(U28.5, NC)
+	HINT(U28.4, NC)
+	HINT(U28.3, NC)
+
+	NET_C(MACLK_P, U30.8)
+	NET_C(U30.13, U18.10)
+	NET_C(U30.6, U18.5)
+	NET_C(U30.5, U18.4)
+	NET_C(U30.3, U18.9)
+	HINT(U30.12, NC)
+	HINT(U30.11, NC)
+	HINT(U30.10, NC)
+	HINT(U30.4, NC)
+
+#if (HLE_NOISE_CONVERT)
+	//
+	// The TTL-to-analog conversion takes a noticeable
+	// amount of time, so just do it directly. The 4.2
+	// P-P value is observed from the original netlist.
+	//
+	AFUNC(NOISECONV, 1, "if(A0>2.5,-4.2,4.2)")
+	NET_C(U30.13, NOISECONV.A0)
+	ALIAS(NOISE, NOISECONV.Q)
+	NET_C(GND, C5.1, C5.2, R11.1, R11.2, R12.1, R12.2, R13.1, R13.2, R14.1, R14.2, U32.2, U32.3)
+#else
+	NET_C(U30.13, R11.1, C5.1)
+	NET_C(R11.2, I_V5)
+	NET_C(C5.2, R14.2, U32.3)
+	NET_C(R14.1, GND)
+	NET_C(U32.2, R12.2, R13.1)
+	NET_C(R12.1, GND)
+	NET_C(R13.2, U32.6)
+	ALIAS(NOISE, R13.2)
+#endif
+
+	NET_C(U18.6, U18.12)
+	NET_C(U18.8, U18.13)
+	NET_C(U18.11, U31.12, U31.2, U24.9)
+	NET_C(U24.8, IN_M)
+
+	NET_C(MACLK_M, U31.1)
+	NET_C(U31.6, U31.13)
+	HINT(U31.5, NC)
+	HINT(U31.4, NC)
+	HINT(U31.3, NC)
+	NET_C(U31.10, U24.11)
+	HINT(U31.8, NC)
+	HINT(U31.9, NC)
+	HINT(U31.11, NC)
+	NET_C(U24.10, RN_M)
+
+	//
+	// Page 2, bottom-middle and top-right (fire)
+	//
+
+	NET_C(FIRE_M, R113.1, R114.1)
+	NET_C(R113.2, I_V5, R115.2, Q14.E)
+	NET_C(R114.2, R115.1, Q14.B)
+	NET_C(Q14.C, R116.2, R117.2, Q15.E)
+	NET_C(R116.1, I_VM15)
+	NET_C(R117.1, R118.1, GND)
+	NET_C(R118.2, Q15.B)
+	NET_C(Q15.C, C26.1, R108.1, R119.1)
+	NET_C(C26.2, I_VM15)
+	NET_C(R119.2, U46.5)
+	NET_C(R108.2, U44.5)
+
+	NET_C(NOISE, R98.2)
+	NET_C(R98.1, R99.2, R100.1)
+	NET_C(R99.1, GND)
+	NET_C(R100.2, U43.2, R104.1, R102.1, R101.1)
+	NET_C(U43.3, GND)
+	NET_C(R104.2, U43.6, R105.1)
+	NET_C(R105.2, R106.2, U44.3)
+	NET_C(R106.1, GND)
+	NET_C(U44.2, R107.2)
+	NET_C(R107.1, GND)
+	NET_C(U44.6, C23.2, R109.2, U45.3)
+	NET_C(C23.1, GND)
+	NET_C(R109.1, GND)
+	NET_C(U45.6, U45.2, R110.1, R103.1, R102.2)
+	NET_C(R103.2, C24.1)
+	NET_C(C24.2, SJ)
+	NET_C(R110.2, R111.2, U46.3)
+	NET_C(R111.1, R112.1, GND)
+	NET_C(R112.2, U46.2)
+	NET_C(U46.6, C25.2, R120.2, U47.3)
+	NET_C(C25.1, R120.1, GND)
+	NET_C(U47.2, U47.6, R101.2)
+
+	//
+	// Page 2, bottom-right (AS0-2)
+	//
+
+	NET_C(I_V5, R121.1)
+	NET_C(R121.2, DMUSIC_P, R122.1)
+	NET_C(R122.2, C27.1)
+	NET_C(C27.2, R123.2, U48.2)
+	NET_C(R123.1, GND, R124.1)
+	NET_C(R124.2, U48.3)
+	NET_C(R148.2, R140.2, R132.2, U48.5)
+	ALIAS(CS, U48.6)
+
+	NET_C(AS2_M, R125.1, R126.1)
+	NET_C(R125.2, I_V5, R127.2, Q16.E)
+	NET_C(R126.2, R127.1, Q16.B)
+	NET_C(Q16.C, R128.2, R129.2, Q17.E)
+	NET_C(R128.1, I_VM15)
+	NET_C(R129.1, R130.1, GND)
+	NET_C(R130.2, Q17.B)
+	NET_C(Q17.C, C28.1, R132.1)
+	NET_C(C28.2, I_VM15)
+
+	NET_C(AS1_M, R133.1, R134.1)
+	NET_C(R133.2, I_V5, R135.2, Q18.E)
+	NET_C(R134.2, R135.1, Q18.B)
+	NET_C(Q18.C, R136.2, R137.2, Q19.E)
+	NET_C(R136.1, I_VM15)
+	NET_C(R137.1, R138.1, GND)
+	NET_C(R138.2, Q19.B)
+	NET_C(Q19.C, R139.1)
+	NET_C(R139.2, C29.1, R140.1)
+	NET_C(C29.2, I_VM15)
+
+	NET_C(AS0_M, R141.1, R142.1)
+	NET_C(R141.2, I_V5, R143.2, Q20.E)
+	NET_C(R142.2, R143.1, Q20.B)
+	NET_C(Q20.C, R144.2, R145.2, Q21.E)
+	NET_C(R144.1, I_VM15)
+	NET_C(R145.1, R146.1, GND)
+	NET_C(R146.2, Q21.B)
+	NET_C(Q21.C, R147.1)
+	NET_C(R147.2, C30.1, R148.1)
+	NET_C(C30.2, I_VM15)
+
+	//
+	// Page 3, top-left (explosions)
+	//
+
+	NET_C(NOISE, R15.1)
+	NET_C(R15.2, C6.2, R16.1)
+	NET_C(C6.1, GND)
+	NET_C(R16.2, C7.2, R17.1)
+	NET_C(C7.1, GND)
+	NET_C(R17.2, R18.2, U33.2)
+	NET_C(R18.1, GND)
+	NET_C(U33.3, R19.2)
+	NET_C(R19.1, GND)
+	NET_C(CS, U33.6)
+
+	NET_C(LOUD_EXP_M, R20.1, R21.1)
+	NET_C(R20.2, I_V5, R22.2, Q1.E)
+	NET_C(R21.2, R22.1, Q1.B)
+	NET_C(Q1.C, R23.2, R24.2, Q2.E)
+	NET_C(R23.1, I_VM15)
+	NET_C(R24.1, GND)
+	NET_C(Q2.B, R25.2)
+	NET_C(R25.1, GND)
+	NET_C(Q2.C, C8.1, R26.1)
+	NET_C(C8.2, I_VM15)
+	NET_C(R26.2, U33.5)
+
+	NET_C(SOFT_EXP_M, R27.1, R28.1)
+	NET_C(R27.2, I_V5, R29.2, Q3.E)
+	NET_C(R28.2, R29.1, Q3.B)
+	NET_C(Q3.C, R30.2, R31.2, Q4.E)
+	NET_C(R30.1, I_VM15)
+	NET_C(R31.1, GND)
+	NET_C(Q4.B, R32.2)
+	NET_C(R32.1, GND)
+	NET_C(Q4.C, C9.1, R33.1)
+	NET_C(C9.2, I_VM15)
+	NET_C(R33.2, U33.5)
+
+	//
+	// Page 3, bottom-left (thrust)
+	//
+
+	NET_C(NOISE, R34.1)
+	NET_C(R34.2, C10.2, R35.1)
+	NET_C(C10.1, GND)
+	NET_C(R35.2, C11.2, R36.1)
+	NET_C(C11.1, GND)
+	NET_C(R36.2, R37.2, U34.2)
+	NET_C(R37.1, GND)
+	NET_C(U34.3, R38.2)
+	NET_C(R38.1, GND)
+	NET_C(U34.6, CS)
+
+	NET_C(THRUST_M, R39.1, R40.1)
+	NET_C(R39.2, I_V5, R41.2, Q5.E)
+	NET_C(R40.2, R41.1, Q5.B)
+	NET_C(Q5.C, R42.2, R43.2, Q6.E)
+	NET_C(R42.1, I_VM15)
+	NET_C(R43.1, GND)
+	NET_C(Q6.B, R44.2)
+	NET_C(R44.1, GND)
+	NET_C(Q6.C, R45.1)
+	NET_C(R45.2, C12.1, R46.1)
+	NET_C(C12.2, I_VM15)
+	NET_C(R46.2, U34.5)
+
+	//
+	// Page 3, top-middle/right (capture)
+	//
+
+	NET_C(CAPTURE_M, R82.1, R83.1, U21.2)
+	NET_C(R82.2, I_V5, R84.2, Q11.E)
+	NET_C(R83.2, R84.1, Q11.B)
+	NET_C(Q11.C, R85.2, R86.2, R87.1)
+	NET_C(R85.1, I_VM15)
+	NET_C(R86.1, GND)
+	NET_C(R87.2, Q12.B)
+	NET_C(Q12.E, GND)
+	NET_C(Q12.C, R88.1)
+	NET_C(R88.2, R89.1, C18.2, R90.2, C19.1)
+	NET_C(R89.2, I_V15)
+	NET_C(C18.1, GND)
+	NET_C(R90.1, GND)
+
+#if (HLE_CAPTURE_VCO)
+	//
+	// The capture VCO actually doesn't sound bad at default
+	// settings, but still takes up a lot of horsepower, so
+	// HLE it as usual. The mappings aren't as good as they
+	// usually are, but the sound is short and the result is
+	// pretty indistinguishable from reality, so we'll go
+	// with it.
+	//
+	//    R2 = 0.87013: HP = (0.000085296*A0) - 0.000965124
+	//    R2 = 0.91754: HP = (0.0000395501*A0*A0) - (0.000953905*A0) + 0.00585023
+	//    R2 = 0.91858: HP = (-0.0000119561*A0*A0*A0) + (0.000513446*A0*A0) - (0.00720853*A0) + 0.0333386
+	//    R2 = 0.93063: HP = (-0.000085348*A0*A0*A0*A0) + (0.00450954*A0*A0*A0) - (0.089245*A0*A0) + (0.784128*A0) - 2.580951
+	//    R2 = 0.84993: HP = (0.00000301512*A0*A0*A0*A0*A0) - (0.000286000*A0*A0*A0*A0) + (0.0098476*A0*A0*A0) - (0.160207*A0*A0) + (1.255519*A0) - 3.832746
+	//
+	VARCLOCK(CAPTURECLK, 1, "max(0.000001,min(0.1,(-0.0000119561*A0*A0*A0) + (0.000513446*A0*A0) - (0.00720853*A0) + 0.0333386))")
+	NET_C(CAPTURECLK.GND, GND)
+	NET_C(CAPTURECLK.VCC, I_V5)
+	NET_C(CAPTURECLK.Q, U21.1)
+	NET_C(CAPTURECLK.A0, C19.1)
+	NET_C(GND, R91.1, R91.2, R92.1, R92.2, R93.1, R93.2, R94.1, R94.2, C19.2, C20.1, C20.2, C21.1, C21.2, D7.A, D7.K, D8.A, D8.K)
+#else
+	NET_C(R88.2, U42.5)
+	NET_C(C19.2, U42.6, R91.1)
+	NET_C(R91.2, I_V15, U42.8)
+	NET_C(U42.7, C20.2)
+	NET_C(C20.1, GND)
+	NET_C(U42.1, GND)
+	NET_C(U42.3, C21.1)
+	NET_C(C21.2, D7.K, R92.1)
+	NET_C(D7.A, GND)
+	NET_C(R92.2, Q13.B)
+	NET_C(Q13.C, R93.1, U21.1)
+	NET_C(R93.2, I_V5)
+	NET_C(Q13.E, D8.K, R94.2)
+	NET_C(D8.A, GND)
+	NET_C(R94.1, I_VM15)
+#endif
+
+	NET_C(U21.3, R95.1)
+	HINT(U21.6, NC)
+	HINT(U21.5, NC)
+	HINT(U21.4, NC)
+	NET_C(R95.2, R97.2, R96.1)
+	NET_C(R97.1, GND)
+	NET_C(R96.2, C22.1)
+	NET_C(C22.2, SJ)
+
+	//
+	// Page 3, bottom-middle+right (photon)
+	//
+
+	NET_C(U35.1, GND)
+	NET_C(U35.6, U35.2, R48.1, C13.2)
+	NET_C(C13.1, GND)
+	NET_C(R48.2, U35.7, R47.1)
+	NET_C(R47.2, U35.8, U35.4, R49.2, R51.2, I_V5, Q7.E)
+	NET_C(U35.5, C14.2)
+	NET_C(C14.1, GND)
+	NET_C(U35.3, R49.1, R50.1)
+	NET_C(R50.2, R51.1, Q7.B)
+	NET_C(Q7.C, R52.2, R54.2, R53.1)
+	NET_C(R52.1, I_VM15)
+	NET_C(R54.1, GND)
+	NET_C(R53.2, Q8.B)
+	NET_C(Q8.E, GND)
+	NET_C(Q8.C, R58.1)
+	NET_C(R58.2, R59.1, R60.2, C15.1, U36.3)
+	NET_C(R59.2, I_V15)
+	NET_C(R60.1, GND)
+	NET_C(C15.2, GND)
+	NET_C(U36.2, U36.6, R61.2)
+	ALIAS(VP, R61.2)
+	NET_C(R61.1, R62.1, U37.2)
+	NET_C(R62.2, U37.6)
+	ALIAS(VN, R62.2)
+	NET_C(U37.3, GND)
+
+	NET_C(VP, R63.1)
+	NET_C(R63.2, U38.3, R64.1)
+	NET_C(R64.2, U38.6, R65.1)
+	NET_C(U38.2, R71.1, C16.2, U39.2)
+	NET_C(C16.1, GND)
+
+#if (HLE_PHOTON_VCO)
+	//
+	// The PHOTON VCO is modulated by the 555 timer U35,
+	// fed through some capacitors and an op-amp to
+	// produce a periodic charge/discharge curve. The
+	// output of the op-amp U36 tracks the final
+	// frequency pretty closely, but only if charge and
+	// discharge curves are considered separately. Use
+	// the raw U35.3 output as a switch to pick the
+	// appropriate curve.
+	//
+	// U35.3 on:
+	//    R2 = 0.95303: HP = (0.000454865*A0) - 0.000727100
+	//    R2 = 0.97158: HP = (0.0000320398*A0*A0) + (0.000096187*A0) + 0.000101501
+	//    R2 = 0.99149: HP = (0.0000173739*A0*A0*A0) - (0.000265948*A0*A0) + (0.00163589*A0) - 0.00222259
+	//    R2 = 0.99201: HP = (-0.00000151250*A0*A0*A0*A0) + (0.0000522525*A0*A0*A0) - (0.000547752*A0*A0) + (0.00256844*A0) - 0.00327534
+	//    R2 = 0.99549: HP = (0.00000220778*A0*A0*A0*A0*A0) - (0.000065312*A0*A0*A0*A0) + (0.000753266*A0*A0*A0) - (0.00418112*A0*A0) + (0.0113844*A0) - 0.0112392
+	//
+	// U35.3 off:
+	//    R2 = 0.18174: HP = (0.000065384*A0) + 0.000468783
+	//    R2 = 0.83543: HP = (-0.0000468095*A0*A0) + (0.000655196*A0) - 0.000641642
+	//    R2 = 0.99434: HP = (-0.0000088969*A0*A0*A0) + (0.000127464*A0*A0) - (0.000276787*A0) + 0.000661774
+	//    R2 = 0.99978: HP = (-0.000000655767*A0*A0*A0*A0) + (0.0000088937*A0*A0*A0) - (0.0000336865*A0*A0) + (0.000281719*A0) + 0.0000419612
+	//    R2 = 0.99987: HP = (0.0000000525584*A0*A0*A0*A0*A0) - (0.00000241385*A0*A0*A0*A0) + (0.0000304913*A0*A0*A0) - (0.000153608*A0*A0) + (0.000579685*A0) - 0.000223579
+	//
+	VARCLOCK(PHOTONCLK, 2, "max(0.000001,min(0.1,if(A1>2.5,(0.0000173739*A0*A0*A0) - (0.000265948*A0*A0) + (0.00163589*A0) - 0.00222259,(-0.0000088969*A0*A0*A0) + (0.000127464*A0*A0) - (0.000276787*A0) + 0.000661774)))")
+	NET_C(PHOTONCLK.GND, GND)
+	NET_C(PHOTONCLK.VCC, I_V5)
+	NET_C(PHOTONCLK.Q, PHOTONENV.A0)
+	NET_C(PHOTONCLK.A0, U36.6)
+	NET_C(PHOTONCLK.A1, U35.3)
+	AFUNC(PHOTONENV, 1, "if(A0>2.5,0.0038,-0.0038)")
+	NET_C(PHOTONENV.Q, U41.2)
+	NET_C(GND, U40.2, U40.3, R65.2, R66.1, R66.2, R69.2, R70.1, R70.2, R71.2, R72.1, R72.2, R73.2, D5.A, D5.K, D6.A, D6.K)
+#else
+	NET_C(R65.2, U40.3, R70.1, R69.2)
+	NET_C(U40.2, GND, D5.A)
+	NET_C(D5.K, D6.K)
+	NET_C(D6.A, R71.2, R72.2, R66.2)
+	NET_C(U40.6, R66.1, R70.2)
+	NET_C(R72.1, R73.2, U41.2)
+#endif
+
+	NET_C(R73.1, GND)
+	NET_C(U41.3, R74.2)
+	NET_C(R74.1, GND)
+	NET_C(VN, R67.1)
+	NET_C(R67.2, U39.3, R68.1)
+	NET_C(R68.2, U39.6, R69.1)
+
+	NET_C(PHOTON_M, R75.1, R76.1)
+	NET_C(R75.2, I_V5, R77.2, Q9.E)
+	NET_C(R76.2, R77.1, Q9.B)
+	NET_C(Q9.C, R78.2, R79.2, Q10.E)
+	NET_C(R78.1, I_VM15)
+	NET_C(R79.1, GND)
+	NET_C(Q10.B, R80.2)
+	NET_C(R80.1, GND)
+	NET_C(Q10.C, C17.1, R81.1)
+	NET_C(C17.2, I_VM15)
+	NET_C(R81.2, U41.5)
+
+	NET_C(U41.6, CS, R149.2, U49.3)
+	NET_C(R149.1, GND)
+	NET_C(U49.2, U49.6, C31.1)
+	NET_C(C31.2, R150.1)
+	NET_C(R150.2, SJ, U50.2, R151.1)
+	NET_C(U50.3, GND)
+	NET_C(R151.2, U50.6)
+	ALIAS(OUTPUT, R151.2)
+
+	//
+	// Unconnected inputs
+	//
+
+	NET_C(GND, U2.8, U2.10, U22.2, U22.3, U22.5, U22.6, U24.3, U27.8, U27.9, U27.10, U27.11)
+
+	//
+	// Unconnected outputs
+	//
+
+	HINT(U2.9, NC)
+	HINT(U2.11, NC)
+	HINT(U24.4, NC)
+
+#if (ENABLE_FRONTIERS)
+	//
+	// Isolate the NOISE consumers from one another; the first one
+	// in particular is a big win
+	//
+	OPTIMIZE_FRONTIER(R100.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R15.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R34.1, RES_M(1), 50)
+
+	//
+	// Isolate the CS sounds from the rest of the mixer (huge!)
+	//
+	OPTIMIZE_FRONTIER(U49.3, RES_M(1), 50)
+#endif
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_solarq.h mame-0.224+dfsg.1/src/mame/audio/nl_solarq.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_solarq.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_solarq.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_SOLARQ_H
+#define MAME_AUDIO_NL_SOLARQ_H
+
+#pragma once
+
+NETLIST_EXTERNAL(solarq)
+
+#endif // MAME_AUDIO_NL_SOLARQ_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_spacewar.cpp mame-0.224+dfsg.1/src/mame/audio/nl_spacewar.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_spacewar.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_spacewar.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,313 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Space Wars
+//
+// Derived from the Audio Board Schematic redrawn by William J.
+// Boucher at Biltronix.com. Part numbers are not present on the
+// schematic, so the equivalent part numbers were taken from the
+// Barrier schematics, which are quite similar.
+//
+// Known problems/issues:
+//
+//    * None.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_cinemat_common.h"
+
+
+//
+// Optimizations
+//
+
+#define HLE_NOISE_GEN (1)
+#define ENABLE_FRONTIERS (1)
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(spacewar)
+
+	SOLVER(Solver, 1000)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+//  PARAM(Solver.MIN_TS_TS, 2e-5)
+
+	TTL_INPUT(I_OUT_0, 0)               // active high
+	TTL_INPUT(I_OUT_1, 0)               // active high
+	TTL_INPUT(I_OUT_2, 0)               // active high
+	TTL_INPUT(I_OUT_3, 0)               // active high
+	TTL_INPUT(I_OUT_4, 0)               // active high
+
+	NET_C(GND, I_OUT_0.GND, I_OUT_1.GND, I_OUT_2.GND, I_OUT_3.GND, I_OUT_4.GND)
+	NET_C(I_V5, I_OUT_0.VCC, I_OUT_1.VCC, I_OUT_2.VCC, I_OUT_3.VCC, I_OUT_4.VCC)
+
+	CINEMAT_LOCAL_MODELS
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V15, 15)
+	ANALOG_INPUT(I_VM15, -15)
+
+	RES(R1, RES_K(18))
+	RES(R2, 470)
+	RES(R3, RES_K(47))
+	RES(R4, RES_K(220))
+	RES(R5, 470)
+	RES(R6, 150)
+	RES(R7, RES_K(180))
+	RES(R8, RES_M(10))
+	RES(R9, RES_K(39))
+	RES(R10, RES_K(2.2))
+	RES(R11, 470)
+//  RES(R12, 0)             -- not present on Space Wars
+	RES(R13, RES_K(8.2))
+	RES(R14, RES_K(120))
+	RES(R15, RES_K(20))
+	RES(R16, RES_M(10))
+	RES(R17, RES_K(10))
+	RES(R18, RES_K(47))
+	RES(R19, 820)
+//  POT(R20, RES_K(10))     -- part of final amp (not emulated)
+//  RES(R21, 150)           -- part of final amp (not emulated), not present on Space Wars
+//  RES(R22, 2.7)           -- part of final amp (not emulated), not present on Space Wars
+//  RES(R23, 2.7)           -- part of final amp (not emulated), not present on Space Wars
+	RES(R24, RES_K(47))
+	RES(R25, 150)
+	RES(R26, RES_K(160))
+	RES(R27, 750)
+//  RES(R28, RES_K(68))     -- part of final amp (not emulated), illegible on Space Wars
+//  POT(R29, RES_K(10))     -- part of final amp (not emulated)
+//  RES(R30, 750)           -- part of final amp (not emulated)
+	RES(R31, 470)
+	RES(R32, RES_K(1))
+	RES(R33, RES_K(39))
+	RES(R34, RES_K(6.8))
+	RES(R35, RES_K(560))
+	RES(R36, RES_M(1))
+	RES(R37, RES_K(10))
+	RES(R38, RES_K(10))
+//  RES(R39, RES_K(120))
+	RES(R40, RES_K(120))
+	RES(R41, RES_K(20))
+	RES(R42, RES_K(1))
+	RES(R43, RES_K(10))
+
+	CAP(C1, CAP_U(1))
+	CAP(C2, CAP_U(1))
+	CAP(C3, CAP_U(0.01))
+	CAP(C4, CAP_U(0.01))
+	CAP(C5, CAP_U(0.1))
+//  CAP(C6, CAP_U(4.7))     // not needed
+//  CAP(C7, 0)              // not present
+	CAP(C8, CAP_U(1))
+	CAP(C9, CAP_U(0.1))
+	CAP(C10, CAP_P(220))
+	CAP(C11, CAP_U(0.1))
+//  CAP(C12, CAP_U(0.01))   -- part of final amp (not emulated)
+//  CAP(C13, CAP_P(470))    -- part of final amp (not emulated)
+//  CAP(C14, CAP_P(470))    -- part of final amp (not emulated)
+//  CAP(C15, CAP_U(50))     -- not needed
+//  CAP(C16, CAP_U(2.2))    -- not needed
+	CAP(C17, CAP_U(0.01))
+	CAP(C18, CAP_U(33))
+//  CAP(C19, CAP_U(50))     -- not needed
+//  CAP(C20, CAP_U(2.2))    -- not needed
+	CAP(C21, CAP_U(0.02))
+	CAP(C22, CAP_U(0.1))
+	CAP(C23, CAP_U(0.1))
+	CAP(C24, CAP_U(2.2))
+
+	D_1N914(CR1)
+	D_1N914(CR2)
+	D_1N914(CR3)
+	D_1N914(CR4)
+	D_1N914(CR5)
+	D_1N914(CR6)
+
+	Q_2N3906(Q1)    // PNP
+	Q_2N3904(Q2)    // NPN
+	Q_2N6426(Q3)    // NPN Darlington
+	Q_2N6292(Q4)    // NPN
+	Q_2N6107(Q5)    // PNP
+	Q_2N6426(Q6)    // NPN Darlington
+	Q_2N3904(Q7)    // NPN
+
+	TL081_DIP(U1)           // Op. Amp.
+	NET_C(U1.4, I_VM15)
+	NET_C(U1.7, I_V15)
+
+	TTL_7406_DIP(U2)        // Hex inverter -- currently using a clone of 7416, no open collector behavior
+	NET_C(U2.7, GND)
+	NET_C(U2.14, I_V5)
+
+	TL081_DIP(U3)           // Op. Amp.
+	NET_C(U3.4, I_VM15)
+	NET_C(U3.7, I_V15)
+
+//  TTL_7815_DIP(U4)        // +15V Regulator -- not needed
+
+	TL182_DIP(U5)           // Analog switch
+	NET_C(U5.6, I_V15)
+	NET_C(U5.7, I_V5)
+	NET_C(U5.8, GND)
+	NET_C(U5.9, I_VM15)
+
+//  TL081_DIP(U6)           // Op. Amp. -- part of final amp (not emulated)
+//  NET_C(U6.4, I_VM15)
+//  NET_C(U6.7, I_V15)
+
+//  TTL_7915_DIP(U7)        // -15V Regulator -- not needed
+
+	TL081_DIP(U8)           // Op. Amp.
+	NET_C(U8.4, I_VM15)
+	NET_C(U8.7, I_V15)
+
+	TL081_DIP(U9)           // Op. Amp.
+	NET_C(U9.4, I_VM15)
+	NET_C(U9.7, I_V15)
+
+	TL182_DIP(U10)          // Analog switch
+	NET_C(U10.6, I_V15)
+	NET_C(U10.7, I_V5)
+	NET_C(U10.8, GND)
+	NET_C(U10.9, I_VM15)
+
+	//
+	// Top-left until output from U1
+	//
+
+#if (HLE_NOISE_GEN)
+	CLOCK(NOISE_CLOCK, 2000)
+	NET_C(NOISE_CLOCK.GND, GND)
+	NET_C(NOISE_CLOCK.VCC, I_V5)
+
+	SYS_NOISE_MT_N(NOISE, 0.0001)
+	NET_C(NOISE.I, NOISE_CLOCK.Q)
+	NET_C(NOISE.1, GND)
+	NET_C(NOISE.2, C1.1)
+
+	NET_C(GND, R1.1, R1.2, R2.1, R2.2, CR1.A, CR1.K, CR2.A, CR2.K)
+#else
+	NET_C(I_V15, CR1.A, R2.2)
+	NET_C(CR1.K, CR2.A)
+	NET_C(CR2.K, R1.2, Q1.B)
+	NET_C(R1.1, Q2.C, GND)
+	NET_C(R2.1, Q1.E)
+	NET_C(Q2.E, Q1.C, C1.1)
+#endif
+
+	NET_C(C1.2, R3.2, U1.3)
+	NET_C(R3.1, GND, R5.1)
+	NET_C(U1.2, R5.2, R4.1)
+	NET_C(R4.2, U1.6)
+
+	//
+	// Top-middle, from O1 until output from CR3
+	//
+
+	NET_C(I_OUT_1, U2.13)
+	NET_C(U2.12, R6.1)
+	NET_C(R6.2, R7.1, C2.1, Q3.B)
+	NET_C(R7.2, I_V5, Q3.C)
+	NET_C(C2.2, GND)
+	NET_C(Q3.E, R11.2)
+	NET_C(R11.1, CR3.A)
+
+	//
+	// Middle chunk, from C3 until output from R13
+	//
+
+	NET_C(U1.6, C3.1)
+	NET_C(C3.2, R8.1, U3.2)
+	NET_C(U3.3, GND)
+	NET_C(R8.2, U3.6, R9.1)
+	NET_C(R9.2, CR3.K, C4.1, CR4.A, R10.2)
+	NET_C(R10.1, CR4.K, GND, C5.1)
+	NET_C(C4.2, C5.2, R13.1)
+
+	//
+	// Big middle section, from C8 until output from R15/R41/R37
+	//
+
+	NET_C(U1.6, C8.1)
+	NET_C(C8.2, C24.2)
+	NET_C(C24.1, R24.1)
+	NET_C(R24.2, U8.2, C10.1, R16.1)
+	NET_C(U8.3, GND)
+	NET_C(U8.6, R16.2, C10.2, R31.2, R38.2)
+	NET_C(R38.1, U5.14, U5.1)
+	NET_C(I_OUT_2, U5.10)
+	NET_C(U5.13, R14.1)
+	NET_C(I_OUT_3, U5.5)
+	NET_C(U5.2, R40.1)
+	NET_C(R40.2, C23.2, R41.1)
+	NET_C(R41.2, R13.2)
+	NET_C(C23.1, GND)
+	NET_C(R37.2, R13.2)
+	NET_C(R14.2, C9.2, R15.1)
+	NET_C(C9.1, GND)
+	NET_C(R15.2, R13.2)
+	NET_C(I_OUT_0, U2.9)
+	NET_C(U2.8, R25.1)
+	NET_C(R25.2, R26.1, C17.1, Q6.B, C18.1)
+	NET_C(R26.2, C17.2, I_V5, Q6.C)
+	NET_C(C18.2, GND)
+	NET_C(Q6.E, R27.1)
+	NET_C(R27.2, CR5.A)
+	NET_C(CR5.K, R33.2, CR6.A, R34.2, C21.2, C22.1)
+	NET_C(R31.1, R32.2, R33.1, Q7.E)
+	NET_C(R32.1, Q7.B)
+	NET_C(Q7.C, CR6.K, R34.1, C21.1, GND)
+	NET_C(C22.2, R35.1)
+	NET_C(R35.2, U9.2, R36.1)
+	NET_C(U9.3, GND)
+	NET_C(U9.6, R36.2, R37.1)
+
+	//
+	// Final stage
+	//
+
+	NET_C(U10.1, U10.14, R13.2)
+	NET_C(I_OUT_4, U10.5, U2.1)
+	NET_C(U2.2, R42.1, U10.10)
+	NET_C(R42.2, I_V5)
+	NET_C(U10.2, R17.2, C11.1)
+	NET_C(U10.13, R43.2)
+	NET_C(R43.1, GND)
+	NET_C(R17.1, R18.1, GND)
+	NET_C(C11.2, R18.2, R19.1)
+	NET_C(R19.2, GND)
+	ALIAS(OUTPUT, R18.2)
+
+	//
+	// Unconnected inputs
+	//
+
+	NET_C(GND, U2.3, U2.5, U2.11)
+
+	//
+	// Frontier optimizations
+	//
+
+#if (ENABLE_FRONTIERS)
+	// Separate each input into the summing network
+	OPTIMIZE_FRONTIER(R13.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R15.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R41.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R37.1, RES_M(1), 50)
+
+	// Decouple the Darlington BJTs from the sounds they enable
+	OPTIMIZE_FRONTIER(R27.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R11.2, RES_M(1), 50)
+
+	// Decouple the noise source from the downstream filters
+	OPTIMIZE_FRONTIER(C3.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R24.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R38.2, RES_M(1), 50)
+#endif
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_spacewar.h mame-0.224+dfsg.1/src/mame/audio/nl_spacewar.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_spacewar.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_spacewar.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_SPACEWAR_H
+#define MAME_AUDIO_NL_SPACEWAR_H
+
+#pragma once
+
+NETLIST_EXTERNAL(spacewar)
+
+#endif // MAME_AUDIO_NL_SPACEWAR_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_spacfury.cpp mame-0.224+dfsg.1/src/mame/audio/nl_spacfury.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_spacfury.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_spacfury.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,1105 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Space Fury
+//
+// Derived from the schematics in the Space Fury manual.
+//
+// Known problems/issues:
+//
+//    * Works pretty well. All sounds trigger.
+//
+//    * Very challenging to get running at speed. We have to use
+//       the "slow" CA3080 model for the star spin sound, which
+//       creates a giant net that dominates time and is sensitive
+//       to cheats to reduce timesteps, etc
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_spacfury.h"
+
+
+//
+// Optimizations
+//
+
+#define HLE_SHOOT_VCO (1)
+#define SPLIT_SHARED_OSCILLATORS (1)
+#define ENABLE_SPIN_VCO_FRONTIER (1)
+#define ENABLE_NOISE_FRONTIERS (1)
+#define ENABLE_FRONTIERS (1)
+#define UNDERCLOCK_NOISE_GEN (1 && ENABLE_NOISE_FRONTIERS)
+
+
+
+
+//
+// Hacks
+//
+
+#define ADD_CLIPPING_DIODES (1)
+
+
+
+//
+// Local models
+//
+
+#define D_1N914(name) DIODE(name, "1N914")
+#define D_1N4002(name) DIODE(name, "D(IS=65.4p RS=42.2m BV=100 IBV=5.00u CJO=14.8p M=0.333 N=1.36 TT=2.88u)")
+
+// SPICE model taken from https://www.onsemi.com/support/design-resources/models?rpn=2N4401
+#define Q_2N4401(name) QBJT_EB(name, "NPN(Is=26.03f Xti=3 Eg=1.11 Vaf=90.7 Bf=4.292K Ne=1.244 Ise=26.03f Ikf=.2061 Xtb=1.5 Br=1.01 Nc=2 Isc=0 Ikr=0 Rc=.5 Cjc=11.01p Mjc=.3763 Vjc=.75 Fc=.5 Cje=24.07p Mje=.3641 Vje=.75 Tr=233.7n Tf=466.5p Itf=0 Vtf=0 Xtf=0 Rb=10)")
+
+// SPICE model taken from https://www.onsemi.com/support/design-resources/models?rpn=2N4403
+#define Q_2N4403(name) QBJT_EB(name, "PNP(Is=650.6E-18 Xti=3 Eg=1.11 Vaf=115.7 Bf=216.2 Ne=1.829 Ise=58.72f Ikf=1.079 Xtb=1.5 Br=3.578 Nc=2 Isc=0 Ikr=0 Rc=.715 Cjc=14.76p Mjc=.5383 Vjc=.75 Fc=.5 Cje=19.82p Mje=.3357 Vje=.75 Tr=111.6n Tf=603.7p Itf=.65 Vtf=5 Xtf=1.7 Rb=10)")
+
+// JFET transistors not supported, but this should do the trick
+//#define Q_2N4093(name) MOSFET(name, "NMOS(VTO=-1.0)")
+#define Q_2N4093(name) MOSFET(name, "NMOS(VTO=-1 CAPMOD=0)")
+
+#define LM555_DIP NE555_DIP
+#define LM566_DIP NE566_DIP
+
+#define TTL_74LS00_DIP TTL_7400_DIP
+
+
+
+//
+// DIP mappings use the submodels below for CA3080
+//
+#define CA3080_FAST_DIP(name) SUBMODEL(_CA3080_FAST_DIP, name)
+#define CA3080_SLOW_DIP(name) SUBMODEL(_CA3080_SLOW_DIP, name)
+static NETLIST_START(_CA3080_FAST_DIP)
+	ALIAS(2, F.A0) // -
+	ALIAS(3, F.A1) // +
+	ALIAS(4, F.A2) // V-
+	ALIAS(5, RIABC.1) // IB
+	ALIAS(6, VO.OP)  // FIXME
+	ALIAS(7, F.A4) // V+
+
+	RES(RI, 26000)
+	NET_C(RI.1, F.A0)
+	NET_C(RI.2, F.A1)
+	// Delivers I0
+	AFUNC(F, 5, "max(-0.5e-3, min(0.5e-3, 19.2 * (A3 - A2) * A0))")
+	RES(RIABC, 1)
+	NET_C(RIABC.2, F.A2)
+	NET_C(RIABC.1, F.A3) // IB
+	VCCS(VO, 1)
+	ANALOG_INPUT(XGND, 0)
+	NET_C(XGND, VO.IN, VO.ON) // FIXME: assume symmetric supply
+	NET_C(F.Q, VO.IP)
+NETLIST_END()
+
+static NETLIST_START(_CA3080_SLOW_DIP)
+//
+// These items are common to several models
+//
+#define CA3080_D(name) DIODE(name, "D(IS=2p RS=5 BV=40 CJO=3p TT=6n)")
+#define CA3080_NPN(name) QBJT_EB(name, "NPN(IS=21.48f XTI=3 EG=1.11 VAF=80 BF=550 ISE=50f NE=1.5 IKF=10m XTB=1.5 BR=.1 ISC=10f NC=2 IKR=3m RC=10 CJC=800f MJC=.3333 VJC=.75 FC=.5 CJE=1.3p MJE=.3333 VJE=.75 TR=30n TF=400P ITF=30m XTF=1 VTF=10 CJS=5.8P MJS=.3333 VJS=.75)")
+#define CA3080_PNP(name) QBJT_EB(name, "PNP(IS=50f XTI=3 EG=1.11 VAF=80 BF=100 ISE=130f NE=1.5 IKF=1m XTB=1.5 BR=1 ISC=0 NC=2 IKR=0 RC=0 CJC=4p MJC=.3333 VJC=.75 FC=.5 CJE=1.4p MJE=.3333 VJE=.75 TR=500n TF=23n ITF=.1 XTF=1 VTF=10 CJS=5.5P MJS=.3333 VJS=.75)")
+
+	CA3080_D(D1)
+	CA3080_D(D2)
+	CA3080_NPN(Q1)
+	CA3080_PNP(Q2)
+	CA3080_PNP(Q3)
+	CA3080_NPN(Q4)
+	CA3080_NPN(Q5)
+	CA3080_PNP(Q6)
+	CA3080_PNP(Q7)
+	CA3080_PNP(Q8)
+	CA3080_PNP(Q9)
+	CA3080_NPN(Q10)
+	CA3080_NPN(Q11)
+	CA3080_NPN(Q12)
+	CA3080_NPN(Q13)
+	CA3080_PNP(Q14)
+	CA3080_PNP(Q15)
+
+	ALIAS(2, Q10.B)     // N1
+	ALIAS(3, Q5.B)      // N28
+	ALIAS(4, Q1.E)      // N13
+	ALIAS(5, Q1.B)      // N11
+	ALIAS(6, Q6.C)      // N30
+	ALIAS(7, Q8.E)      // N8
+	NET_C(Q8.E, Q9.E, Q14.E, Q15.E)     // N8
+	NET_C(Q1.B, Q1.C, Q4.B)             // N11
+	NET_C(Q1.E, Q4.E, Q11.E, Q12.E)     // N13
+	NET_C(Q6.C, Q7.C, Q13.C)            // N30
+	NET_C(Q3.B, Q10.C, Q14.C, D1.A)     // N1N13
+	NET_C(Q2.E, Q14.B, Q15.C, Q15.B)    // N1N15
+	NET_C(Q2.B, Q3.E, D1.K)             // N1N17
+	NET_C(Q2.C, Q3.C, Q11.C, Q13.B)     // N1N22
+	NET_C(Q5.C, Q6.B, Q9.C, D2.A)       // N1N32
+	NET_C(Q6.E, Q7.B, D2.K)             // N1N34
+	NET_C(Q7.E, Q8.C, Q8.B, Q9.B)       // N1N36
+	NET_C(Q4.C, Q5.E, Q10.E)            // N1N52
+	NET_C(Q11.B, Q12.C, Q12.B, Q13.E)   // N1N44
+NETLIST_END()
+
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(spacfury)
+
+	SOLVER(Solver, 1000)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 4e-5)
+	// subtle but noticeable effect where the spin "whoosh" is missing
+	// some upper harmonics at 4e-5; however, this is the most demanding
+	// solver in the system and it keeps jumping around as I tweak things
+//  PARAM(Solver.Solver_21.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	// Overwrite model - the default model uses minimum datasheet
+	// specifications for 5V. These are for 10V and thus closer to the
+	// 12V used in this circuit.
+	NET_MODEL("CD4XXX FAMILY(TYPE=CMOS IVL=0.3 IVH=0.7 OVL=0.05 OVH=0.05 ORL=384 ORH=384)")
+
+	LOCAL_SOURCE(_CA3080_FAST_DIP)
+	LOCAL_SOURCE(_CA3080_SLOW_DIP)
+
+	TTL_INPUT(I_LO_D0, 0)
+	ALIAS(I_CRAFTS_SCALE, I_LO_D0)
+	TTL_INPUT(I_LO_D1, 0)
+	ALIAS(I_MOVING, I_LO_D1)
+	TTL_INPUT(I_LO_D2, 0)
+	ALIAS(I_THRUST, I_LO_D2)
+	TTL_INPUT(I_LO_D6, 0)
+	ALIAS(I_STAR_SPIN, I_LO_D6)
+	TTL_INPUT(I_LO_D7, 0)
+	ALIAS(I_PARTIAL_WARSHIP, I_LO_D7)
+
+	NET_C(GND, I_LO_D0.GND, I_LO_D1.GND, I_LO_D2.GND, I_LO_D6.GND, I_LO_D7.GND)
+	NET_C(I_V5, I_LO_D0.VCC, I_LO_D1.VCC, I_LO_D2.VCC, I_LO_D6.VCC, I_LO_D7.VCC)
+
+	TTL_INPUT(I_HI_D0, 0)
+	ALIAS(I_CRAFTS_JOINING, I_HI_D0)
+	TTL_INPUT(I_HI_D1, 0)
+	ALIAS(I_SHOOT, I_HI_D1)
+	TTL_INPUT(I_HI_D2, 0)
+	ALIAS(I_FIREBALL, I_HI_D2)
+	TTL_INPUT(I_HI_D3, 0)
+	ALIAS(I_SMALL_EXPL, I_HI_D3)
+	TTL_INPUT(I_HI_D4, 0)
+	ALIAS(I_LARGE_EXPL, I_HI_D4)
+	TTL_INPUT(I_HI_D5, 0)
+	ALIAS(I_DOCKING_BANG, I_HI_D5)
+
+	NET_C(GND, I_HI_D0.GND, I_HI_D1.GND, I_HI_D2.GND, I_HI_D3.GND, I_HI_D4.GND, I_HI_D5.GND)
+	NET_C(I_V5, I_HI_D0.VCC, I_HI_D1.VCC, I_HI_D2.VCC, I_HI_D3.VCC, I_HI_D4.VCC, I_HI_D5.VCC)
+
+	RES(R_PSG_1, 1000)
+	RES(R_PSG_2, 1000)
+	RES(R_PSG_3, 1000)
+	NET_C(I_V5, R_PSG_1.1, R_PSG_2.1, R_PSG_3.1)
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V12, 12)
+	ANALOG_INPUT(I_VM12, -12)
+
+//  RES(R1, RES_K(2.2))     -- part of final amp (not emulated)
+//  RES(R2, RES_K(10))      -- part of final amp (not emulated)
+//  RES(R4, RES_K(330))     -- part of final amp (not emulated)
+//  RES(R5, RES_M(1))       -- part of final amp (not emulated)
+	RES(R6, RES_K(680))
+	RES(R7, RES_K(680))
+	RES(R8, RES_K(10))
+	RES(R9, RES_K(100))
+	RES(R10, 680)
+	RES(R11, RES_K(47))
+	RES(R12, RES_K(47))
+	RES(R13, RES_K(47))
+	RES(R14, RES_M(1))
+//  RES(R15, RES_K(100))    -- part of final amp (not emulated)
+	RES(R18, RES_K(10))
+	RES(R19, RES_K(470))
+	RES(R20, RES_K(22))
+	RES(R21, RES_K(47))
+	RES(R22, RES_K(3.9))
+	RES(R23, RES_K(82))
+	RES(R24, RES_K(4.7))
+	RES(R25, RES_K(47))
+	RES(R26, 100)
+	RES(R27, RES_K(100))
+	RES(R28, RES_K(100))
+	RES(R29, RES_K(2.2))
+	RES(R30, RES_K(4.7))
+	RES(R31, RES_K(100))
+	RES(R32, RES_K(100))
+	RES(R33, RES_M(1))
+	RES(R34, RES_K(10))
+	RES(R35, RES_K(680))
+	RES(R36, 680)
+	RES(R37, RES_K(47))
+	RES(R38, RES_K(47))
+	RES(R39, RES_K(2.2))
+	RES(R40, RES_K(47))
+	RES(R41, RES_K(47))
+	RES(R42, RES_K(100))
+	RES(R43, RES_K(2.2))
+	RES(R44, RES_K(100))
+	RES(R45, RES_M(2.2))
+	RES(R46, RES_K(100))
+	RES(R47, RES_K(9.1))
+	RES(R48, 100)
+	RES(R49, RES_K(4.7))
+	RES(R50, RES_K(47))
+	RES(R51, RES_K(10))
+	RES(R52, RES_K(47))
+	RES(R53, RES_K(47))
+	RES(R54, RES_K(100))
+	RES(R55, RES_K(47))
+	RES(R56, RES_K(100))
+	RES(R57, RES_K(47))
+	RES(R58, RES_K(100))
+	RES(R59, RES_K(10))
+	RES(R60, 100)
+	RES(R61, RES_K(9.1))
+	RES(R62, RES_K(100))
+	RES(R63, RES_K(47))
+	RES(R64, RES_K(10))
+	RES(R65, RES_K(470))
+	RES(R66, RES_K(10))
+	RES(R67, 100)
+	RES(R68, RES_K(10))
+	RES(R69, RES_K(22))
+	RES(R70, RES_K(220))
+	RES(R71, RES_K(2.2))
+	RES(R72, RES_K(22))
+	RES(R73, RES_K(330))
+	RES(R74, RES_K(330))
+	RES(R75, RES_K(100))
+	RES(R76, RES_K(10))
+	RES(R77, RES_K(10))
+	RES(R78, RES_K(22))
+	RES(R79, RES_K(10))
+	RES(R80, RES_K(100))
+	RES(R81, RES_K(82))
+	RES(R82, RES_K(39))
+	RES(R83, RES_K(10))
+	RES(R84, RES_K(22))
+	RES(R85, RES_K(47))
+	RES(R86, RES_K(47))
+	RES(R87, RES_K(47))
+	RES(R88, RES_K(100))
+	RES(R89, RES_K(100))
+	RES(R90, RES_K(10))
+	RES(R91, RES_M(1))
+	RES(R92, RES_K(470))
+	RES(R93, RES_K(470))
+	RES(R94, RES_K(220))
+	RES(R95, RES_K(22))
+	RES(R96, RES_K(100))
+	RES(R97, RES_K(100))
+	RES(R98, RES_K(10))
+	RES(R99, RES_K(3.9))
+	RES(R100, RES_K(47))
+	RES(R101, RES_K(2.2))
+	RES(R102, RES_M(1))
+	RES(R103, RES_K(10))
+	RES(R104, RES_K(10))
+	RES(R105, RES_K(100))
+	RES(R106, RES_K(10))
+	RES(R107, RES_K(220))
+	RES(R108, RES_K(220))
+	RES(R109, RES_K(10))
+	RES(R110, 100)
+	RES(R111, RES_K(10))
+	RES(R112, RES_K(470))
+	RES(R113, RES_K(100))
+	RES(R114, RES_K(100))
+	RES(R115, RES_K(100))
+	RES(R116, RES_K(100))
+	RES(R117, RES_K(100))
+	RES(R118, RES_K(100))
+	RES(R119, RES_M(2.2))
+	RES(R120, RES_K(100))
+	RES(R121, RES_K(100))
+	RES(R122, RES_M(2.2))
+	RES(R123, RES_K(22))
+	RES(R124, RES_M(3.9))
+	RES(R125, RES_K(100))
+	RES(R126, RES_K(100))
+	RES(R127, RES_M(2.2))
+	RES(R128, RES_K(22))
+	RES(R129, RES_K(22))
+	RES(R130, RES_K(22))
+	RES(R131, RES_K(10))
+	RES(R132, RES_K(2.2))
+	RES(R133, RES_K(2.2))
+	RES(R135, RES_K(10))
+	RES(R136, RES_K(10))
+	RES(R134, RES_K(10))
+	RES(R137, RES_K(2.2))
+	RES(R138, RES_K(150))
+	RES(R139, RES_K(150))
+	RES(R140, RES_K(2.2))
+	RES(R141, RES_K(220))
+	RES(R142, RES_K(100))
+	RES(R143, RES_K(10))
+	RES(R144, RES_K(220))
+	RES(R146, RES_K(220))
+	RES(R147, 680)
+	RES(R148, RES_K(10))
+	RES(R149, RES_K(220))
+
+//  CAP(C1, CAP_U(4.7))     -- part of final amp (not emulated)
+//  CAP(C2, CAP_U(0.05))
+//  CAP(C3, CAP_U(0.05))
+//  CAP(C4, CAP_U(10))      -- part of final amp (not emulated)
+	CAP(C5, CAP_U(0.01))
+	CAP(C6, CAP_U(0.01))
+	CAP(C7, CAP_U(4.7))
+	CAP(C8, CAP_U(0.047))
+//  CAP(C9, CAP_U(0.05))
+//  CAP(C10, CAP_U(0.05))
+	CAP(C11, CAP_U(0.01))
+	CAP(C12, CAP_U(0.01))
+	CAP(C13, CAP_U(0.01))
+	CAP(C14, CAP_U(0.01))
+	CAP(C15, CAP_U(0.01))
+//  CAP(C16, CAP_U(0.05))
+//  CAP(C17, CAP_U(0.05))
+	CAP(C18, CAP_U(0.01))
+	CAP(C19, CAP_U(0.047))
+	CAP(C20, CAP_U(0.01))
+	CAP(C21, CAP_U(4.7))
+	CAP(C22, CAP_U(0.05))
+	CAP(C23, CAP_U(0.05))
+	CAP(C24, CAP_U(10))
+//  CAP(C25, CAP_U(0.05))
+	CAP(C26, CAP_U(0.0033))
+//  CAP(C27, CAP_U(0.05))
+	CAP(C28, CAP_U(0.1))
+	CAP(C29, CAP_U(0.001))
+	CAP(C30, CAP_U(0.0022))
+	CAP(C31, CAP_U(0.022))
+	CAP(C32, CAP_U(10))
+	CAP(C33, CAP_U(0.1))
+	CAP(C34, CAP_U(0.1))
+	CAP(C35, CAP_U(0.0033))
+	CAP(C36, CAP_U(4.7))
+	CAP(C37, CAP_U(0.0022))
+//  CAP(C38, CAP_U(0.05))
+//  CAP(C39, CAP_U(0.05))
+	CAP(C40, CAP_U(0.047))
+	CAP(C41, CAP_U(0.0047))
+	CAP(C42, CAP_U(0.01))
+	CAP(C43, CAP_U(0.01))
+	CAP(C44, CAP_U(4.7))
+//  CAP(C45, CAP_U(0.05))
+//  CAP(C46, CAP_U(0.05))
+	CAP(C47, CAP_U(0.047))
+	CAP(C48, CAP_U(4.7))
+	CAP(C49, CAP_U(0.1))
+	CAP(C50, CAP_U(4.7))
+	CAP(C51, CAP_U(0.1))
+	CAP(C52, CAP_U(0.022))
+	CAP(C53, CAP_U(10))
+	CAP(C54, CAP_U(0.1))
+	CAP(C55, CAP_U(100))
+//  CAP(C56, CAP_U(0.05))
+	CAP(C57, CAP_U(4.7))
+//  CAP(C58, CAP_U(0.05))
+	CAP(C59, CAP_U(0.01))
+	CAP(C60, CAP_U(0.01))
+	CAP(C61, CAP_U(0.047))
+	CAP(C62, CAP_U(0.047))
+	CAP(C63, CAP_U(0.05))
+	CAP(C64, CAP_U(0.05))
+//  CAP(C65, CAP_U(0.05))
+	CAP(C66, CAP_U(0.033))
+//  CAP(C67, CAP_U(0.05))
+	CAP(C68, CAP_U(0.1))
+	CAP(C69, CAP_U(0.1))
+	CAP(C70, CAP_U(0.1))
+	CAP(C71, CAP_U(0.047))
+	CAP(C72, CAP_P(100))
+	CAP(C73, CAP_U(0.1))
+//  CAP(C75, CAP_U(10))
+//  CAP(C76, CAP_U(10))
+//  CAP(C77, CAP_U(0.1))
+//  CAP(C78, CAP_U(0.1))
+//  CAP(C79, CAP_U(0.1))
+//  CAP(C80, CAP_U(0.1))
+
+	D_1N914(D1)
+	D_1N914(D2)
+	D_1N914(D3)
+	D_1N914(D4)
+	D_1N914(D5)
+	D_1N914(D6)
+	D_1N914(D7)
+	D_1N914(D8)
+	D_1N914(D9)
+	D_1N914(D10)
+	D_1N914(D11)
+	D_1N914(D12)
+	D_1N914(D13)
+	D_1N914(D14)
+	D_1N914(D15)
+	D_1N914(D16)
+
+//  Q_2N4093(Q1)        -- part of final amp (not emulated)
+	Q_2N4093(Q2)
+	Q_2N4093(Q3)
+	Q_2N4403(Q4)
+	Q_2N4403(Q5)
+	Q_2N4403(Q6)
+	Q_2N4093(Q7)
+	Q_2N4093(Q8)
+	Q_2N4403(Q9)
+	Q_2N4403(Q10)
+	Q_2N4401(Q11)
+	Q_2N4401(Q12)
+	Q_2N4403(Q13)
+
+//  TL082_DIP(U1)           // Op. Amp. -- part of final amp (not emulated)
+//  NET_C(U1.8, I_V12)
+//  NET_C(U1.4, I_VM12)
+
+	TL082_DIP(U2)           // Op. Amp.
+	NET_C(U2.8, I_V12)
+	NET_C(U2.4, I_VM12)
+
+	CD4069_DIP(U3)          // Hex Inverter
+	NET_C(U3.7, GND)
+	NET_C(U3.14, I_V12)
+
+	TL082_DIP(U4)           // Op. Amp.
+	NET_C(U4.8, I_V12)
+	NET_C(U4.4, I_VM12)
+
+	TL082_DIP(U5)           // Op. Amp.
+	NET_C(U5.8, I_V12)
+	NET_C(U5.4, I_VM12)
+
+	CD4011_DIP(U6)          // Quad 2-Input NAND Gates
+	NET_C(U6.7, GND)
+	NET_C(U6.14, I_V12)
+
+	CA3080_SLOW_DIP(U7)         // Op. Amp.
+	NET_C(U7.4, I_VM12)
+	NET_C(U7.7, I_V12)
+
+	TL082_DIP(U8)           // Op. Amp.
+	NET_C(U8.8, I_V12)
+	NET_C(U8.4, I_VM12)
+
+	MM5837_DIP(U9)          // Noise Generator
+#if (UNDERCLOCK_NOISE_GEN)
+	// officially runs at 48-112kHz, but little noticeable difference
+	// in exchange for a big performance boost
+	PARAM(U9.FREQ, 24000)
+
+	// the NOISE_B signal can run even lower, so use a second
+	// MM5837 instance at a lower frequency to drive it; this
+	// second instance doesn't really exist, it just allows us
+	// a bit more performance
+	MM5837_DIP(U9B)         // Noise Generator
+	PARAM(U9B.FREQ, 12000)
+#endif
+
+	TL082_DIP(U10)          // Op. Amp.
+	NET_C(U10.8, I_V12)
+	NET_C(U10.4, I_VM12)
+
+	CD4024_DIP(U11)         // 7-Stage Ripple Binary Counter
+	NET_C(U11.7, GND)
+	NET_C(U11.14, I_V12)
+
+	CA3080_SLOW_DIP(U12)            // Op. Amp.
+	NET_C(U12.4, I_VM12)
+	NET_C(U12.7, I_V12)
+
+	TL082_DIP(U13)          // Op. Amp.
+	NET_C(U13.8, I_V12)
+	NET_C(U13.4, I_VM12)
+
+	TL082_DIP(U14)          // Op. Amp.
+	NET_C(U14.8, I_V12)
+	NET_C(U14.4, I_VM12)
+
+	TL082_DIP(U15)          // Op. Amp.
+	NET_C(U15.8, I_V12)
+	NET_C(U15.4, I_VM12)
+
+	TL082_DIP(U16)          // Op. Amp.
+	NET_C(U16.8, I_V12)
+	NET_C(U16.4, I_VM12)
+
+	LM555_DIP(U17)
+
+	TL082_DIP(U18)          // Op. Amp.
+	NET_C(U18.8, I_V12)
+	NET_C(U18.4, I_VM12)
+
+	CD4069_DIP(U19)         // Hex Inverter
+	NET_C(U19.7, GND)
+	NET_C(U19.14, I_V12)
+
+	CD4011_DIP(U20)         // Quad 2-Input NAND Gates
+	NET_C(U20.7, GND)
+	NET_C(U20.14, I_V12)
+
+	TL082_DIP(U21)          // Op. Amp.
+	NET_C(U21.8, I_V12)
+	NET_C(U21.4, I_VM12)
+
+	CD4011_DIP(U22)         // Quad 2-Input NAND Gates
+	NET_C(U22.7, GND)
+	NET_C(U22.14, I_V12)
+
+	TL082_DIP(U23)          // Op. Amp.
+	NET_C(U23.8, I_V12)
+	NET_C(U23.4, I_VM12)
+
+//  TTL_74LS08_DIP(U25)     // Quad 2-Input AND Gates
+//  NET_C(U25.7, GND)
+//  NET_C(U25.14, I_V5)
+
+	TTL_7407_DIP(U26)       // Hex Buffers with High Votage Open-Collector Outputs
+	NET_C(U26.7, GND)
+	NET_C(U26.14, I_V5)
+
+//  TTL_74LS10_DIP(U28)     // Triple 3-Input NAND Gate
+//  NET_C(U28.7, GND)
+//  NET_C(U28.14, I_V5)
+
+//  TTL_74LS14_DIP(U30)
+//  NET_C(U30.7, GND)
+//  NET_C(U30.14, I_V5)
+
+	TTL_7406_DIP(U31)       // Hex inverter -- currently using a clone of 7416, no open collector behavior
+	NET_C(U31.7, GND)
+	NET_C(U31.14, I_V5)
+
+//  TTL_74LS374_DIP(U32)    // Octal D-Type Transparent Latches And Edge-Triggered Flip-Flop
+//  NET_C(U32.10, GND)
+//  NET_C(U32.20, I_V5)
+//
+//  TTL_74LS374_DIP(U33)    // Octal D-Type Transparent Latches And Edge-Triggered Flip-Flop
+//  NET_C(U33.10, GND)
+//  NET_C(U33.20, I_V5)
+
+//  TTL_74LS30_DIP(U34)     // 8-Input NAND Gate
+//  NET_C(U34.7, GND)
+//  NET_C(U34.14, I_V5)
+
+//  TTL_74LS14_DIP(U35)
+//  NET_C(U35.7, GND)
+//  NET_C(U35.14, I_V5)
+
+	//
+	// Sheet 7, top (Moving)
+	//
+
+	// Pairs of CD4069 are used together with resistors and capacitors
+	// to create oscillators. The formula for the frequency is
+	// 1/1.39*R*C. The following are simulated here:
+	//
+	// #1: R35=680K, C12=0.01uF,  Freq=105.80Hz
+	// #2:  R6=680K, C11=0.01uF,  Freq=105.80Hz
+	// #3:  R7=680K, C13=0.01uF,  Freq=105.80Hz
+	//
+	// Since these are all the same and components have tolerances,
+	// we use tweaked frequencies for #2 and #3
+
+	CLOCK(O1CLK, 105.8)
+	NET_C(O1CLK.GND, GND)
+	NET_C(O1CLK.VCC, I_V12)
+	NET_C(O1CLK.Q, R56.1)
+	NET_C(GND, R35.1, R35.2, C12.1, C12.2, U3.5, U3.9)
+
+	CLOCK(O2CLK, 105.7)
+	NET_C(O2CLK.GND, GND)
+	NET_C(O2CLK.VCC, I_V12)
+	NET_C(O2CLK.Q, R54.1)
+	NET_C(GND, R6.1, R6.2, C11.1, C11.2, U3.1, U3.3)
+
+	CLOCK(O3CLK, 105.9)
+	NET_C(O3CLK.GND, GND)
+	NET_C(O3CLK.VCC, I_V12)
+	NET_C(O3CLK.Q, R58.1)
+	NET_C(GND, R7.1, R7.2, C13.1, C13.2, U3.13, U3.11)
+
+	NET_C(I_MOVING, U31.13)
+	NET_C(U31.12, R56.2, R54.2, R58.2, R59.1)
+	NET_C(R59.2, C15.2, R36.2, C14.1)
+	NET_C(C15.1, U4.2, R28.2)
+	NET_C(R28.1, U4.1, C14.2, R8.1)
+	NET_C(U4.3, GND, R36.1)
+
+	NET_C(R8.2, C5.2, R10.2, C6.1)
+	NET_C(C5.1, U4.6, R9.2)
+	NET_C(R9.1, U4.7, C6.2)
+	ALIAS(MOVING_SUM, C6.2)
+	NET_C(U4.5, GND, R10.1)
+
+	//
+	// Sheet 7, 2nd from top (Star Spin/Partial Warship)
+	//
+
+#if (SPLIT_SHARED_OSCILLATORS)
+
+	// In the schematics, the below oscillators are shared; however,
+	// connecting them also brings the two nets together, so we just
+	// duplicate the clocks here to help keep the very expensive net
+	// below more isolated.
+
+	CLOCK(O1CLKA, 105.8)
+	NET_C(O1CLKA.GND, GND)
+	NET_C(O1CLKA.VCC, I_V12)
+	NET_C(O1CLKA.Q, R55.2)
+
+	CLOCK(O2CLKB, 105.7)
+	NET_C(O2CLKB.GND, GND)
+	NET_C(O2CLKB.VCC, I_V12)
+	NET_C(O2CLKB.Q, R53.2)
+
+	CLOCK(O3CLKC, 105.9)
+	NET_C(O3CLKC.GND, GND)
+	NET_C(O3CLKC.VCC, I_V12)
+	NET_C(O3CLKC.Q, R57.2)
+
+#else
+
+	NET_C(O1CLK.Q, R55.2)
+	NET_C(O2CLK.Q, R53.2)
+	NET_C(O3CLK.Q, R57.2)
+
+#endif
+
+	NET_C(I_STAR_SPIN, U31.3, U31.1)
+	NET_C(U31.2, R148.1)
+	NET_C(C32.1, I_V12, R62.1, R72.1)
+
+	NET_C(R148.2, C32.2, R62.2, U13.5)
+	NET_C(R72.2, R90.2, R91.1, D6.A)
+	NET_C(R90.1, GND)
+	NET_C(U13.6, U13.7, D5.A)
+	NET_C(D5.K, D6.K, R94.1, R92.1)
+	NET_C(R94.2, R108.2, U16.5)
+	NET_C(R108.1, GND)
+	NET_C(R92.2, U16.6, R107.1, C47.1)
+
+#if (ENABLE_SPIN_VCO_FRONTIER)
+	// split the envelope VCO from the rest of the circuit
+	// to break up a giant net into 2 smaller ones
+	NET_C(C47.2, U16.7, U16.2, TESTFUNC.A0)
+	AFUNC(TESTFUNC, 1, "A0")
+	NET_C(TESTFUNC.Q, R89.1, R88.1)
+#else
+	NET_C(C47.2, U16.7, U16.2, R89.1, R88.1)
+#endif
+
+	NET_C(U16.3, R93.1, R91.2)
+	NET_C(R93.2, U16.1, D10.A)
+	NET_C(D10.K, R106.2)
+	NET_C(R106.1, Q11.B, R133.2)
+	NET_C(R133.1, GND)
+	NET_C(Q11.E, GND)
+	NET_C(Q11.C, R107.2)
+
+	NET_C(I_PARTIAL_WARSHIP, U31.5)
+	NET_C(U31.6, R57.1, R53.1, R55.1, C33.1)
+	NET_C(C33.2, R63.1)
+	NET_C(R63.2, R34.1, R51.2, R64.2, U8.6)
+	NET_C(R34.2, U8.1, C26.2)
+	ALIAS(STAR_SPIN_PARTIAL_WARSHIP_SUM, U8.1)
+	NET_C(C26.1, U8.2, U7.6)
+	NET_C(U8.3, GND)
+	NET_C(U31.4, C34.1)
+	NET_C(NOISE_A, C34.1)
+	NET_C(C34.2, R64.1)
+	NET_C(U8.5, R49.2, R50.1)
+	NET_C(R49.1, GND)
+	NET_C(U8.7, R61.1, R51.1)
+	NET_C(R61.2, R60.2, U12.3)
+	NET_C(R60.1, GND)
+	NET_C(U12.2, GND)
+	NET_C(U12.5, R88.2)
+	NET_C(R89.2, U7.5)
+	NET_C(U7.3, R48.2, R47.2)
+	NET_C(U7.2, GND)
+	NET_C(R48.1, GND)
+	NET_C(R47.1, C35.2, U13.1, R50.2)
+	NET_C(U13.3, GND)
+	NET_C(U13.2, C35.1, U12.6)
+
+	//
+	// Sheet 7, middle (Fireball)
+	//
+
+	NET_C(I_FIREBALL, U26.11)
+	NET_C(U26.10, U22.12, R125.2)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_FIREBALL)
+	NET_C(D_FIREBALL.A, U22.12)
+	NET_C(D_FIREBALL.K, I_V12)
+#endif
+	NET_C(R125.1, I_V12, R124.1)
+	NET_C(R124.2, U22.13, C70.1)
+	NET_C(C70.2, U22.10)
+	NET_C(U22.8, U22.9, U22.11)
+	NET_C(U22.11, R123.1)
+	NET_C(R123.2, D12.A)
+	NET_C(D12.K, R86.1, R87.1, C50.1)
+	NET_C(C50.2, GND)
+	NET_C(R86.2, U14.6, R85.1)
+	NET_C(R87.2, U14.5, D8.K, Q8.D)
+	NET_C(NOISE_B, Q8.G)
+	NET_C(Q8.S, GND)
+	NET_C(D8.A, GND)
+	NET_C(R85.2, R71.1, U14.7)
+	NET_C(R71.2, R70.1, C31.2)
+	NET_C(C31.1, GND)
+	NET_C(R70.2, C30.1, R149.1)
+	NET_C(C30.2, U14.2, U14.1, C44.1)
+	NET_C(R149.2, C29.2, U14.3)
+	NET_C(C29.1, GND)
+	ALIAS(FIREBALL_SUM, C44.2)
+
+	//
+	// Sheet 7, 2nd from bottom (Explosions)
+	//
+
+	NET_C(U9.1, GND)
+	NET_C(U9.4, I_V12)
+	NET_C(U9.2, I_VM12)
+	NET_C(C28.1, R14.2)
+
+#if (UNDERCLOCK_NOISE_GEN)
+
+	NET_C(U9B.1, GND)
+	NET_C(U9B.4, I_V12)
+	NET_C(U9B.2, I_VM12)
+	NET_C(U9B.3, C28.2)
+	// Yes - AFuncs are frontiers as well
+	AFUNC(NOISE_B_FUNC, 1, "A0")
+	NET_C(R14.2, NOISE_B_FUNC.A0)
+	ALIAS(NOISE_B, NOISE_B_FUNC.Q)
+	NET_C(R14.1, GND)
+	// Yes - AFuncs are frontiers as well
+	AFUNC(NOISE_A_FUNC, 1, "A0")
+	NET_C(U9.3, NOISE_A_FUNC.A0)
+	NET_C(R52.1, NOISE_A_FUNC.Q)
+	ALIAS(NOISE_A, R52.2)
+
+#else
+
+#if (ENABLE_NOISE_FRONTIERS)
+	// Yes - AFuncs are frontiers as well
+	AFUNC(NOISE_B_FUNC, 1, "A0")
+	NET_C(R14.2, NOISE_B_FUNC.A0)
+	ALIAS(NOISE_B, NOISE_B_FUNC.Q)
+#else
+	ALIAS(NOISE_B, R14.2)
+#endif
+	NET_C(R14.1, GND)
+#if (ENABLE_NOISE_FRONTIERS)
+	// Yes - AFuncs are frontiers as well
+	AFUNC(NOISE_A_FUNC, 1, "A0")
+	NET_C(U9.3, NOISE_A_FUNC.A0, C28.2)
+	NET_C(R52.1, NOISE_A_FUNC.Q)
+#else
+	NET_C(U9.3, R52.1, C28.2)
+#endif
+	ALIAS(NOISE_A, R52.2)
+
+#endif
+
+	NET_C(I_SMALL_EXPL, U26.13)
+	NET_C(U26.12, R32.2, U6.2)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_SMALL_EXPL)
+	NET_C(D_SMALL_EXPL.A, U6.2)
+	NET_C(D_SMALL_EXPL.K, I_V12)
+#endif
+	NET_C(U6.1, C22.1, R33.2)
+	NET_C(R33.1, I_V12, R45.2, R46.2, R32.1)
+	NET_C(R45.1, C23.2, U6.13)
+	NET_C(R46.1, U6.12, U26.6)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(I_LARGE_EXPL)
+	NET_C(I_LARGE_EXPL.A, U6.12)
+	NET_C(I_LARGE_EXPL.K, I_V12)
+#endif
+	NET_C(I_LARGE_EXPL, U26.5)
+	NET_C(C23.1, U6.10)
+	NET_C(U6.8, U6.9, U6.11)
+	NET_C(U6.11, D3.A)
+	NET_C(D3.K, R43.1)
+	NET_C(R43.2, R42.1, R44.1, C24.1)
+	NET_C(C24.2, C21.2, Q3.S, Q2.S, D4.A, D1.A, C18.2, C20.1, GND)
+	NET_C(R42.2, U5.6, R31.1)
+	NET_C(R31.2, R38.1, U5.7)
+	NET_C(U5.5, R44.2, Q3.D, D4.K)
+	NET_C(Q3.G, NOISE_B)
+	NET_C(R38.2, C19.1, R37.1)
+	NET_C(C19.2, U5.2, U5.1, R29.1)
+	NET_C(R37.2, U5.3, C18.1)
+	NET_C(R29.2, C7.1, R30.1)
+	ALIAS(EXPL_SUM, C7.2)
+
+	NET_C(C22.2, U6.4)
+	NET_C(U6.5, U6.6, D2.A, U6.3)
+	NET_C(D2.K, R39.1)
+	NET_C(R39.2, R41.1, R40.1, C21.1)
+	NET_C(R41.2, U2.6, R13.1)
+	NET_C(R13.2, U2.7, R11.1)
+	NET_C(U2.5, R40.2, Q2.D, D1.K)
+	NET_C(Q2.G, NOISE_B)
+	NET_C(R11.2, C8.1, R12.1)
+	NET_C(R12.2, C20.2, U2.3)
+	NET_C(C8.2, U2.2, U2.1, R30.2)
+
+	//
+	// Sheet 7, bottom-left (PSG)
+	//
+
+	NET_C(R_PSG_1.2, R_PSG_2.2, R_PSG_3.2, R147.2, C73.1)
+	NET_C(R147.1, GND)
+	NET_C(C73.2, R146.1)
+	NET_C(R146.2, U23.2, R141.1, C72.1)
+	NET_C(U23.3, GND)
+	NET_C(C72.2, R141.2, U23.1)
+	ALIAS(PSG_SUM, U23.1)
+
+	//
+	// Sheet 7, bottom (Thrust)
+	//
+
+	NET_C(I_THRUST, U31.11)
+	NET_C(U31.10, R96.1, R97.1, R98.2)
+	NET_C(R98.1, I_V12)
+	NET_C(R96.2, U15.2, R75.1)
+	NET_C(U15.3, R97.2, Q7.D, D7.K)
+	NET_C(Q7.G, NOISE_B)
+	NET_C(Q7.S, GND)
+	NET_C(D7.A, GND)
+	NET_C(U15.1, R75.2, R95.1)
+	NET_C(R95.2, C40.2, R73.1)
+	NET_C(C40.1, GND)
+	NET_C(R73.2, R74.1, C41.1)
+	NET_C(R74.2, C37.2, U15.5)
+	NET_C(C37.1, GND)
+	NET_C(C41.2, U15.6, U15.7, C36.1)
+	ALIAS(THRUST_SUM, C36.2)
+
+	//
+	// Sheet 8, top (Crafts Joining)
+	//
+
+	NET_C(I_CRAFTS_JOINING, U26.1)
+	NET_C(U26.2, R120.1, U20.12)
+	NET_C(R120.2, I_V12, R119.2, C48.1, R80.2, R79.2)
+	NET_C(R119.1, C64.1, U20.13)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_CRAFTS_JOINING)
+	NET_C(D_CRAFTS_JOINING.A, U20.13)
+	NET_C(D_CRAFTS_JOINING.K, I_V12)
+#endif
+	NET_C(U20.11, U20.8, U20.9)
+	NET_C(U20.10, C64.2, D9.K)
+	NET_C(D9.A, R101.1)
+	NET_C(R101.2, C48.2, R80.1, Q6.B)
+	NET_C(Q6.E, R79.1)
+	NET_C(Q6.C, Q5.E, Q4.E)
+
+	// Another set of CD4069 oscillators:
+	//
+	// #4: R138=150K, C61=0.047uF,  Freq=102.05Hz
+	// #5: R144=220K, C71=0.047uF,  Freq=69.58Hz
+	// #6: R139=150K, C62=0.047uF,  Freq=102.05Hz
+
+	CLOCK(O4CLK, 102.05)
+	NET_C(O4CLK.GND, GND)
+	NET_C(O4CLK.VCC, I_V12)
+	NET_C(O4CLK.Q, R115.1, R116.2)
+	NET_C(GND, R138.1, R138.2, C61.1, C61.2, U19.1, U19.3)
+
+	CLOCK(O5CLK, 69.58)
+	NET_C(O5CLK.GND, GND)
+	NET_C(O5CLK.VCC, I_V12)
+	NET_C(O5CLK.Q, R114.1, R117.2)
+	NET_C(GND, R144.1, R144.2, C71.1, C71.2, U19.5, U19.9)
+
+	CLOCK(O6CLK, 102.15)
+	NET_C(O6CLK.GND, GND)
+	NET_C(O6CLK.VCC, I_V12)
+	NET_C(O6CLK.Q, R113.1, R118.2)
+	NET_C(GND, R139.1, R139.2, C62.1, C62.2, U19.13, U19.11)
+
+	NET_C(R115.2, R114.2, R113.2, C43.2, C42.1, R100.2)
+	NET_C(C43.1, R65.1, U10.2)
+	NET_C(U10.3, R100.1, R99.2, U18.5, R67.1, R110.2, R68.1, Q5.B, R134.2, Q9.B, GND)
+	NET_C(R65.2, U10.1, C42.2, R78.1)
+	NET_C(R78.2, Q4.B, R67.2)
+	NET_C(Q4.C, R68.2, R76.1, U10.5)
+	NET_C(Q5.C, R77.1, R66.1, U10.6)
+	NET_C(R76.2, R77.2, I_VM12)
+	NET_C(R66.2, U10.7)
+	ALIAS(JOINING_SUM, U10.7)
+
+	//
+	// Sheet 8, middle (Docking Bang)
+	//
+
+	NET_C(R116.1, R117.1, R118.1, R99.1, C60.1, C59.1)
+	NET_C(C60.2, R112.1, U18.6)
+	NET_C(C59.2, R112.2, U18.7, R111.1)
+	NET_C(R111.2, R110.1, Q10.B)
+	NET_C(Q10.C, R134.1, R135.2, U18.3)
+	NET_C(Q10.E, Q9.E, Q13.C)
+	NET_C(Q9.C, U18.2, R109.1, R136.2)
+	NET_C(R135.1, R136.1, I_VM12)
+	NET_C(R109.2, U18.1)
+	ALIAS(BANG_SUM, U18.1)
+
+	NET_C(I_DOCKING_BANG, U26.3)
+	NET_C(U26.4, R121.2, U20.2)
+	NET_C(R121.1, I_V12, R127.2, R126.2, R122.1, C57.1, R142.1, R143.1)
+	NET_C(R122.2, C63.1, U20.1)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_DOCKING_BANG)
+	NET_C(D_DOCKING_BANG.A, U20.1)
+	NET_C(D_DOCKING_BANG.K, I_V12)
+#endif
+	NET_C(U20.3, U20.5, U20.6)
+	NET_C(U20.4, C63.2, D16.K)
+	NET_C(D16.A, R137.1)
+	NET_C(R137.2, C57.2, R142.2, Q13.B)
+	NET_C(Q13.E, R143.2)
+
+	//
+	// Sheet 8, 2nd from bottom (Shoot)
+	//
+
+	NET_C(I_SHOOT, U26.9)
+	NET_C(U26.8, R126.1, U22.2)
+#if (ADD_CLIPPING_DIODES)
+	// fast retriggering relies on clipping diodes which
+	// aren't implemented by default for speed
+	D_1N914(D_SHOOT)
+	NET_C(D_SHOOT.A, U22.2)
+	NET_C(D_SHOOT.K, I_V12)
+#endif
+	NET_C(U22.1, R127.1, C69.2)
+	NET_C(C69.1, U22.4, U11.2)
+	NET_C(U22.5, U22.6, U22.3)
+	NET_C(U22.3, D14.K)
+	NET_C(D14.A, R140.1)
+	NET_C(R140.2, D15.K, C68.2)
+	NET_C(C68.1, C66.1, D13.A, GND)
+	NET_C(D15.A, R102.1, D13.K) // and U21.3
+	NET_C(C66.2, R103.1)        // and U21.2
+	NET_C(R103.2, R102.2, R84.1)// and U21.1
+
+#if (HLE_SHOOT_VCO)
+	//
+	//    R2 = 0.96721: HP = (0.000138452*A0) - 0.0000076731
+	//    R2 = 0.97638: HP = (0.0000289361*A0*A0) + (0.000074399*A0) + 0.0000125173
+	//    R2 = 0.97705: HP = (0.0000152345*A0*A0*A0) - (0.0000278973*A0*A0) + (0.000132881*A0) - 0.00000173354
+	//    R2 = 0.97706: HP = (-0.00000384290*A0*A0*A0*A0) + (0.0000353504*A0*A0*A0) - (0.000063189*A0*A0) + (0.000156402*A0) - 0.00000642730
+	//    R2 = 0.97712: HP = (0.0000167037*A0*A0*A0*A0*A0) - (0.000115736*A0*A0*A0*A0) + (0.000312133*A0*A0*A0) - (0.000372722*A0*A0) + (0.000308685*A0) - 0.0000319600
+	//
+	VARCLOCK(SHOOTCLK, 1, "max(0.000001,min(0.1,(0.0000152345*A0*A0*A0) - (0.0000278973*A0*A0) + (0.000132881*A0) - 0.00000173354))")
+	NET_C(SHOOTCLK.GND, GND)
+	NET_C(SHOOTCLK.VCC, I_V5)
+	NET_C(SHOOTCLK.A0, D15.K)
+	NET_C(SHOOTCLK.Q, SHOOTENV.A0)
+	AFUNC(SHOOTENV, 1, "if(A0>2.5,11.1,-11.1)")
+	NET_C(SHOOTENV.Q, U11.1)
+	NET_C(GND, U21.3, U21.2)
+#else
+	NET_C(D15.A, U21.3)
+	NET_C(U21.2, C66.2)
+	NET_C(R103.2, U21.1)
+#endif
+
+	NET_C(R84.2, U11.1)
+	NET_C(U11.12, R81.1)
+	NET_C(U11.11, R82.1)
+	NET_C(U11.9, R83.1)
+	NET_C(U11.6, R69.1)
+	NET_C(R81.2, R82.2, R83.2, R69.2, C49.1)
+	ALIAS(SHOOT_SUM, C49.2)
+
+	//
+	// Sheet 8, bottom (Crafts Scale)
+	//
+
+	NET_C(I_CRAFTS_SCALE, U31.9)
+	NET_C(U31.8, R130.1, R129.1, U17.4)
+	NET_C(R130.2, R132.2, C55.1, R104.2, U17.8, C53.1, I_V12)
+	NET_C(R129.2, R128.2, Q12.B)
+	NET_C(Q12.C, D11.A, R131.1, R132.1)
+	NET_C(R128.1, Q12.E, C52.1, U17.1, C54.1, C53.2, GND)
+	NET_C(D11.K, R131.2, C55.2, C54.2, U17.5)
+	NET_C(R104.1, R105.2, U17.7)
+	NET_C(C52.2, U17.6, U17.2, R105.1)
+	NET_C(U17.3, C51.1)
+	ALIAS(SCALE_SUM, C51.2)
+
+	//
+	// Sheet 8, right (summing)
+	//
+
+	NET_C(JOINING_SUM, R25.1)
+	NET_C(BANG_SUM, R21.1)
+	NET_C(SHOOT_SUM, R23.1)
+	NET_C(SCALE_SUM, R19.1)
+	NET_C(EXPL_SUM, R26.1)
+	NET_C(THRUST_SUM, R22.1)
+	NET_C(MOVING_SUM, R27.1)
+	NET_C(FIREBALL_SUM, R24.1)
+	NET_C(STAR_SPIN_PARTIAL_WARSHIP_SUM, R20.1)
+	NET_C(PSG_SUM, R18.1)
+
+	NET_C(R25.2, R21.2, R23.2, R19.2, R26.2, R22.2, R27.2, R24.2, R20.2, R18.2)
+	ALIAS(OUTPUT, R18.2)
+
+	//
+	// Unconnected inputs
+	//
+
+	NET_C(GND, U21.5, U21.6)
+	NET_C(GND, U23.5, U23.6)
+
+	//
+	// Unconnected outputs
+	//
+
+#if (ENABLE_FRONTIERS)
+#define RXX 384
+	OPTIMIZE_FRONTIER(C36.1, RES_K(3.9), RXX)
+	OPTIMIZE_FRONTIER(C44.1, RES_K(4.7), RXX)
+	OPTIMIZE_FRONTIER(R25.1, RES_K(47), RXX)
+	OPTIMIZE_FRONTIER(R21.1, RES_K(47), RXX)
+	OPTIMIZE_FRONTIER(R23.1, RES_K(82), RXX)
+	OPTIMIZE_FRONTIER(R19.1, RES_K(470), RXX)
+	OPTIMIZE_FRONTIER(R26.1, 100, RXX)
+	OPTIMIZE_FRONTIER(R22.1, RES_K(3.9), RXX)
+	OPTIMIZE_FRONTIER(R27.1, RES_K(100), RXX)
+	OPTIMIZE_FRONTIER(R24.1, RES_K(4.7), RXX)
+	OPTIMIZE_FRONTIER(R20.1, RES_K(22), RXX)
+#endif
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_spacfury.h mame-0.224+dfsg.1/src/mame/audio/nl_spacfury.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_spacfury.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_spacfury.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_SPACFURY_H
+#define MAME_AUDIO_NL_SPACFURY_H
+
+#pragma once
+
+NETLIST_EXTERNAL(spacfury)
+
+#endif // MAME_AUDIO_NL_SPACFURY_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_speedfrk.cpp mame-0.224+dfsg.1/src/mame/audio/nl_speedfrk.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_speedfrk.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_speedfrk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,451 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Speed Freak
+//
+// Derived from the utterly terrible schematics in the Speed Freak
+// manual. Newly-drawn schematics are available upon request.
+//
+// Special thanks to:
+//    * Frank Palazzolo for helping to verify connections and parts
+//    * Brian Tarachi for supplying his corrected schematics
+//
+// Known problems/issues:
+//
+//    * Works pretty well. Needs more detailed comparison with clean
+//       audio recordings from PCBs, but it's pretty close.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_cinemat_common.h"
+
+
+//
+// Optimizations
+//
+
+#define HLE_CLOCK_GENERATOR (1)
+#define HLE_CLOCK_INPUT (1)
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(speedfrk)
+
+	SOLVER(Solver, 1000)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	TTL_INPUT(I_OUT_0, 1)   // active low
+	TTL_INPUT(I_OUT_1, 1)   // active low
+	TTL_INPUT(I_OUT_2, 1)   // active low
+	TTL_INPUT(I_OUT_3, 1)   // active low
+	TTL_INPUT(I_OUT_4, 1)   // active low
+	TTL_INPUT(I_OUT_7, 1)   // active low
+
+	NET_C(GND, I_OUT_0.GND, I_OUT_1.GND, I_OUT_2.GND, I_OUT_3.GND, I_OUT_4.GND, I_OUT_7.GND)
+	NET_C(I_V5, I_OUT_0.VCC, I_OUT_1.VCC, I_OUT_2.VCC, I_OUT_3.VCC, I_OUT_4.VCC, I_OUT_7.VCC)
+
+	CINEMAT_LOCAL_MODELS
+
+	ANALOG_INPUT(I_V5, 5)
+
+//  RES(R1, 2.7)
+//  RES(R2, 2.7)
+//  RES(R3, 2.7)
+//  RES(R4, 2.7)
+//  RES(R5, 150)            // PCB verified
+//  RES(R6, 150)
+//  RES(R7, RES_K(10))      // PCB verified
+//  RES(R8, RES_K(68))      // PCB verified
+//  RES(R9, RES_K(2.2))     // PCB verified
+//  RES(R10, 820)           // PCB verified
+//  RES(R11, RES_K(47))     // PCB verified
+//  RES(R12, RES_K(1))   ??
+	RES(R13, 150)
+	RES(R14, RES_K(2.2))    // PCB verified
+	RES(R15, RES_K(10))     // PCB verified
+	RES(R16, RES_K(2.2))    // PCB verified
+	RES(R17, RES_K(1))      // PCB verified
+	RES(R18, RES_K(8.2))    // PCB verified
+	RES(R19, RES_K(3.9))    // PCB verified
+	RES(R20, RES_K(4.7))    // PCB verified
+	RES(R21, RES_K(3.3))    // PCB verified
+	RES(R22, RES_K(10))     // PCB verified
+	RES(R23, RES_K(4.7))    // PCB verified
+	RES(R24, RES_K(10))
+	RES(R25, RES_K(18))     // PCB verified
+	RES(R26, RES_K(18))     // PCB verified
+	RES(R27, RES_K(6.8))    // PCB verified
+	RES(R28, RES_K(10))     // PCB verified
+	RES(R29, RES_K(2.2))    // PCB verified
+	RES(R30, 330)           // PCB verified
+	RES(R31, 330)           // PCB verified
+	RES(R32, RES_K(1))      // PCB verified
+	RES(R33, RES_K(1))      // PCB verified
+	RES(R34, RES_K(1))      // PCB verified
+//  RES(R35, 0)             // PCB verified: not populated
+	RES(R36, RES_K(1))      // PCB verified
+	RES(R37, RES_K(1))      // PCB verified
+	RES(R38, RES_K(1))      // PCB verified
+	RES(R39, RES_K(1))      // PCB verified
+	RES(R40, RES_K(1))      // PCB verified
+	RES(R41, RES_K(1))      // PCB verified
+	RES(R42, RES_K(1))      // PCB verified
+	RES(R43, RES_K(1))      // PCB verified
+	RES(R44, RES_K(30))     // PCB verified
+	RES(R45, RES_K(4.7))    // PCB verified
+	RES(R46, RES_K(10))     // PCB verified
+
+//  CAP(C4, CAP_U(4.7))
+//  CAP(C5, CAP_U(4.7))
+	CAP(C12, CAP_U(0.001))
+	CAP(C13, CAP_U(0.001))
+	CAP(C17, CAP_U(0.02))
+	CAP(C20, CAP_U(0.1))
+	CAP(C23, CAP_U(0.1))
+
+//  CAP(C1, CAP_U(50))
+//  CAP(C2, CAP_U(50))
+//  CAP(C3, CAP_U(4.7))
+//  CAP(C6, CAP_U(0.002))
+//  CAP(C7, CAP_U(0.002))
+//  CAP(C8, CAP_U(0.01))
+//  CAP(C9, CAP_U(0.1))
+//  CAP(C10, CAP_U(0.1))
+//  CAP(C11, CAP_U(0.02))
+
+//  D_1N914B(CR1)   // OK
+//  D_1N914B(CR2)   // OK
+	D_1N914B(CR3)   // OK
+
+//  Q_2N6292(Q1)    // NPN
+//  Q_2N6107(Q2)    // PNP
+	Q_2N3904(Q3)    // NPN
+//  Q_2N3904(Q3)    // NPN -- unknown type
+
+	TTL_74LS04_DIP(U2)      // Hex Inverting Gates
+	NET_C(U2.7, GND)
+	NET_C(U2.14, I_V5)
+
+	TL081_DIP(U3)           // Op. Amp.
+	NET_C(U3.4, GND)
+	NET_C(U3.7, I_V5)
+
+	TTL_74LS163_DIP(U4)     // Synchronous 4-Bit Counters
+	NET_C(U4.8, GND)
+	NET_C(U4.16, I_V5)
+
+	TTL_74LS107_DIP(U5)     // DUAL J-K FLIP-FLOPS WITH CLEAR
+	NET_C(U5.7, GND)
+	NET_C(U5.14, I_V5)
+
+	TTL_74LS08_DIP(U6)      // Quad 2-Input AND Gates
+	NET_C(U6.7, GND)
+	NET_C(U6.14, I_V5)
+
+	TTL_74LS163_DIP(U7)     // Synchronous 4-Bit Counters
+	NET_C(U7.8, GND)
+	NET_C(U7.16, I_V5)
+
+	TTL_74LS163_DIP(U8)     // Synchronous 4-Bit Counters
+	NET_C(U8.8, GND)
+	NET_C(U8.16, I_V5)
+
+	TTL_74LS163_DIP(U9)     // Synchronous 4-Bit Counters
+	NET_C(U9.8, GND)
+	NET_C(U9.16, I_V5)
+
+//  TTL_7915_DIP(U8)        // -15V Regulator -- not needed
+//  TTL_7815_DIP(U9)        // +15V Regulator -- not needed
+
+	TTL_74LS04_DIP(U10)     // Hex Inverting Gates
+	NET_C(U10.7, GND)
+	NET_C(U10.14, I_V5)
+
+	TTL_74LS08_DIP(U11)     // Quad 2-Input AND Gates
+	NET_C(U11.7, GND)
+	NET_C(U11.14, I_V5)
+
+	TTL_74LS75_DIP(U12)     // 4-Bit Bistable Latches with Complementary Outputs
+	NET_C(U12.12, GND)
+	NET_C(U12.5, I_V5)
+
+	TTL_74LS164_DIP(U13)    // 8-bit parallel-out serial shift registers
+	NET_C(U13.7, GND)
+	NET_C(U13.14, I_V5)
+
+	TTL_74LS164_DIP(U14)    // 8-bit parallel-out serial shift registers
+	NET_C(U14.7, GND)
+	NET_C(U14.14, I_V5)
+
+	TTL_74LS163_DIP(U15)    // Synchronous 4-Bit Counters
+	NET_C(U15.8, GND)
+	NET_C(U15.16, I_V5)
+
+	TTL_74LS107_DIP(U17)    // DUAL J-K FLIP-FLOPS WITH CLEAR
+	NET_C(U17.7, GND)
+	NET_C(U17.14, I_V5)
+
+	TTL_74LS393_DIP(U18)    // Dual 4-Stage Binary Counter
+	NET_C(U18.7, GND)
+	NET_C(U18.14, I_V5)
+
+	TTL_74LS86_DIP(U19)     // Quad 2-Input XOR Gates
+	NET_C(U19.7, GND)
+	NET_C(U19.14, I_V5)
+
+	TTL_74LS164_DIP(U20)    // 8-bit parallel-out serial shift registers
+	NET_C(U20.7, GND)
+	NET_C(U20.14, I_V5)
+
+	LM555_DIP(U22)          // 5-5-5 Timer
+
+	TTL_74LS163_DIP(U23)    // Dual 4-Stage Binary Counter
+	NET_C(U23.8, GND)
+	NET_C(U23.16, I_V5)
+
+	TTL_74LS164_DIP(U24)    // 8-bit parallel-out serial shift registers
+	NET_C(U24.7, GND)
+	NET_C(U24.14, I_V5)
+
+	//
+	// 76kHz coming from the logic PCB
+	//
+	CLOCK(J4_2, 76000)
+	NET_C(J4_2.GND, GND)
+	NET_C(J4_2.VCC, I_V5)
+
+#if (HLE_CLOCK_GENERATOR)
+	//
+	// Skip the clock generator and just do it directly
+	//
+	CLOCK(C2MHZ, 2000000)
+	NET_C(C2MHZ.GND, GND)
+	NET_C(C2MHZ.VCC, I_V5)
+	NET_C(GND, R30.1, R30.2, R31.1, R31.2, C12.1, C12.2, C13.1, C13.2, U10.1, U10.3, U10.5)
+#else
+	NET_C(R30.1, U10.1, C13.1)
+	NET_C(R30.2, U10.2, C12.1)
+	NET_C(C12.2, U10.3, R31.1)
+	NET_C(R31.2, U10.4, C13.2, U10.5)
+	ALIAS(C2MHZ, U10.6)
+#endif
+
+#if (HLE_CLOCK_INPUT)
+	//
+	// The clock input from the main PCB is run through a voltage
+	// converter which eats a lot of time and is unnecessary since
+	// we're just generating a TTL signal already.
+	//
+	NET_C(J4_2.Q, U5.12)
+	NET_C(GND, R27.1, R27.2, R28.1, R28.2, R29.1, R29.2, CR3.A, CR3.K, U3.2, U3.3)
+#else
+	NET_C(J4_2.Q, U3.3)
+	NET_C(R27.1, GND)
+	NET_C(R27.2, U3.2, R28.1)
+	NET_C(R28.2, I_V5)
+	NET_C(U3.6, R29.1)
+	NET_C(R29.2, CR3.K, U5.12)
+#endif
+
+	NET_C(CR3.A, GND)
+	NET_C(U5.1, R41.1)
+	NET_C(R41.2, I_V5)
+	NET_C(U5.4, GND)
+	NET_C(U5.13, U5.10, U10.9, U4.15)
+	NET_C(U5.3, U5.8)
+	NET_C(U5.2, U5.11)
+	NET_C(U5.6, U4.9)
+	NET_C(U5.9, U4.2, C2MHZ.Q)
+
+	NET_C(U10.8, U4.7)
+	NET_C(U4.3, U4.1, I_V5)
+	NET_C(U4.6, R36.1)
+	NET_C(U4.4, U4.5, GND)
+	NET_C(U4.14, U18.1, U6.13, U7.2)
+	NET_C(U4.10, I_V5)          // need to verify
+
+	NET_C(U18.6, U18.13)
+	NET_C(U18.2, U18.12, GND)
+	NET_C(U18.8, U17.12)
+	NET_C(U18.10, U20.8, U24.8)
+	NET_C(U18.11, U23.2)
+
+	NET_C(I_OUT_0, U2.13)
+	NET_C(U2.12, U2.1)
+	ALIAS(STEERING, U2.12)
+	NET_C(U2.2, U6.4)
+	NET_C(U6.6, U19.13, U19.5)
+	NET_C(U19.12, R39.1)
+	NET_C(R39.2, I_V5)
+
+	NET_C(I_OUT_1, U6.9)
+	NET_C(U6.10, R32.2)
+	NET_C(R32.1, I_V5)
+	NET_C(U6.8, U2.5, U6.12, U12.4, U12.13)
+	NET_C(U2.6, R14.2, U6.5)
+	NET_C(R14.1, Q3.B)
+	NET_C(Q3.E, GND)
+	NET_C(Q3.C, R13.1)
+	NET_C(R13.2, GND)
+	ALIAS(LAMP, R13.2)
+
+	NET_C(U19.11, U20.1)
+	NET_C(U20.9, R42.1)
+//  NET_C(R42.2, I_V5)
+	NET_C(U20.2, U19.3)
+	NET_C(U20.12, U19.1)
+	NET_C(U20.13, U19.4)
+
+	NET_C(U19.6, U24.1, U24.2)
+	NET_C(U24.12, U19.2)
+	NET_C(U24.9, R43.1)
+	NET_C(R43.2, I_V5)
+	NET_C(U24.13, R44.1, U11.12, U11.9, U11.5, U11.2)
+
+	NET_C(U23.1, U23.3, U23.5, U23.7, R40.2)
+	NET_C(U23.10, R40.2)        // need to verify
+	NET_C(R40.1, I_V5)
+	NET_C(U23.4, U23.6, GND)
+	NET_C(U23.9, U19.8, U17.9)
+	NET_C(U23.15, U19.10)
+	NET_C(U19.9, R39.1)
+
+	NET_C(I_OUT_7, U2.9)
+	NET_C(U2.8, U17.10, U17.13)
+	NET_C(U17.8, U17.11, U17.1, U17.4, R34.1)
+	NET_C(R34.2, I_V5)
+	NET_C(U17.5, R25.1)
+	NET_C(U17.3, R26.1)
+
+	NET_C(R44.2, U22.7, R45.1, R46.2)
+	NET_C(R45.2, U22.4, U22.8, I_V5)
+	NET_C(R46.1, U22.6, U22.2, C23.2)
+	NET_C(C23.1, GND)
+	NET_C(U22.1, GND)
+	NET_C(U22.5, C17.2)
+	NET_C(C17.1, GND)
+
+	NET_C(I_OUT_4, U6.2)
+	NET_C(U22.3, U6.1)
+	NET_C(U6.3, R15.1)
+
+	NET_C(U6.11, U15.2, U9.2, U8.2)
+	NET_C(U15.1, U15.7, R42.1)
+	NET_C(R42.2, I_V5)
+	NET_C(U9.1, U9.7, U8.1, U8.7, R37.1)
+	NET_C(R37.2, I_V5)
+	NET_C(U15.15, U10.11, U7.10)
+	NET_C(U15.6, U14.3)
+	NET_C(U15.5, U14.4)
+	NET_C(U15.4, U14.5)
+	NET_C(U15.3, U14.6)
+	NET_C(U15.10, U9.15)
+	NET_C(U15.9, U9.9, U8.9, U10.10)
+
+	NET_C(U9.6, U14.10)
+	NET_C(U9.5, U14.11)
+	NET_C(U9.4, U14.12)
+	NET_C(U9.3, U14.13, U13.1, U13.2)
+	NET_C(U9.10, U8.15)
+
+	NET_C(U8.6, U13.3)
+	NET_C(U8.5, U13.4)
+	NET_C(U8.4, U13.5)
+	NET_C(U8.3, U13.6)
+	NET_C(U8.10, R36.1)
+	NET_C(R36.2, I_V5)
+
+	NET_C(I_OUT_2, U2.11)
+	NET_C(I_OUT_3, U2.3)
+	NET_C(U2.10, U14.1, U14.2)
+	NET_C(U2.4, U14.8, U13.8)
+	NET_C(U14.9, U13.9, R38.1)
+	NET_C(R38.2, I_V5)
+
+	NET_C(U12.9, U11.13)
+	NET_C(U12.10, U11.10)
+	NET_C(U12.15, U11.4)
+	NET_C(U12.16, U11.1)
+	NET_C(U12.7, U13.10)
+	NET_C(U12.6, U13.11)
+	NET_C(U12.3, U13.12)
+	NET_C(U12.2, U13.13)
+
+	NET_C(U11.11, R17.1)
+	NET_C(U11.8, R16.1)
+	NET_C(U11.6, R19.1)
+	NET_C(U11.3, R18.1)
+	NET_C(R17.2, R16.2, R19.2, R18.2, R20.1)
+
+	NET_C(U7.1, U7.5, R33.2)
+	NET_C(R33.1, I_V5)
+	NET_C(U7.7, STEERING)
+	NET_C(U7.9, U10.12)
+	NET_C(U7.15, U10.13)
+	NET_C(U7.3, U7.4, U7.6, GND)
+	NET_C(U7.11, R22.1)
+	NET_C(U7.12, R23.1)
+	NET_C(U7.13, R24.1)
+	NET_C(R22.2, R23.2, R24.2, C20.2, R21.1)
+	NET_C(C20.1, GND)
+
+	NET_C(R15.2, R25.2, R26.2, R21.2, R20.2)
+	ALIAS(OUTPUT, R20.2)
+
+	//
+	// Unconnected outputs
+	//
+
+	HINT(U4.11, NC)     // Q3
+	HINT(U4.12, NC)     // Q2
+	HINT(U4.13, NC)     // Q1
+	HINT(U5.5, NC)      // Q2
+	HINT(U7.14, NC)     // Q0
+	HINT(U8.11, NC)     // Q3
+	HINT(U8.12, NC)     // Q2
+	HINT(U8.13, NC)     // Q1
+	HINT(U8.14, NC)     // Q0
+	HINT(U9.11, NC)     // Q3
+	HINT(U9.12, NC)     // Q2
+	HINT(U9.13, NC)     // Q1
+	HINT(U9.14, NC)     // Q0
+	HINT(U10.2, NC)     // QQ1 -- part of 2MHz clock gen
+	HINT(U10.4, NC)     // QQ2 -- part of 2MHz clock gen
+	HINT(U10.6, NC)     // QQ3 -- part of 2MHz clock gen
+	HINT(U12.1, NC)     // QQ0
+	HINT(U12.8, NC)     // QQ3
+	HINT(U12.11, NC)    // QQ2
+	HINT(U12.14, NC)    // QQ1
+	HINT(U15.11, NC)    // Q3
+	HINT(U15.12, NC)    // Q2
+	HINT(U15.13, NC)    // Q1
+	HINT(U15.14, NC)    // Q0
+	HINT(U17.2, NC)     // QQ1
+	HINT(U17.6, NC)     // QQ2
+	HINT(U18.3, NC)     // Q0
+	HINT(U18.4, NC)     // Q1
+	HINT(U18.5, NC)     // Q2
+	HINT(U18.9, NC)     // Q2
+	HINT(U20.3, NC)     // Q0
+	HINT(U20.4, NC)     // Q1
+	HINT(U20.5, NC)     // Q2
+	HINT(U20.6, NC)     // Q3
+	HINT(U20.10, NC)    // Q4
+	HINT(U20.11, NC)    // Q5
+	HINT(U23.11, NC)    // Q3
+	HINT(U23.12, NC)    // Q2
+	HINT(U23.13, NC)    // Q1
+	HINT(U23.14, NC)    // Q0
+	HINT(U24.3, NC)     // Q0
+	HINT(U24.4, NC)     // Q1
+	HINT(U24.5, NC)     // Q2
+	HINT(U24.6, NC)     // Q3
+	HINT(U24.10, NC)    // Q4
+	HINT(U24.11, NC)    // Q5
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_speedfrk.h mame-0.224+dfsg.1/src/mame/audio/nl_speedfrk.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_speedfrk.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_speedfrk.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_SPEEDFRK_H
+#define MAME_AUDIO_NL_SPEEDFRK_H
+
+#pragma once
+
+NETLIST_EXTERNAL(speedfrk)
+
+#endif // MAME_AUDIO_NL_SPEEDFRK_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_sspeedr.cpp mame-0.224+dfsg.1/src/mame/audio/nl_sspeedr.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_sspeedr.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_sspeedr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,651 @@
+// license:CC0
+// copyright-holders:Colin Douglas Howell
+
+#include "netlist/devices/net_lib.h"
+
+
+// This is a netlist description for the sound circuits of Midway's Super
+// Speed Race, based on the schematics in _Midway's Super Speed Race Parts and
+// Operating Manual_. These circuits are generally quite similar to those in
+// Midway's earlier games 280-ZZZAP and Laguna Racer (see nl_280zzzap.cpp),
+// but the Super Speed Race circuits have some significant changes, and their
+// board layout is different.
+
+// The components are all labeled as they are on the Super Speed Race
+// schematics, except that since the noise generator discrete components are
+// on the main motherboard and thus may have the same labels as components on
+// the audio board, a prefix "NOISE_" has been added to their labels. Each
+// LM3900 IC contains 4 op-amps, so I have labeled these op-amps as _1 to _4,
+// the same scheme used in the LM3900 datasheet, using the pin numbers on the
+// schematic to identify the specific op-amp. Likewise, each CD4016 IC
+// contains 4 switches, so I identify a specific switch from its pin numbers
+// on the schematic; these are labeled _A through _D in the CD4016 datasheet,
+// so I use that scheme.
+
+// The sound circuitry can be divided into three sections: engine sound
+// generation and control, generation of noise-based sound effects (skidding
+// and crashes), and the final mix and amplification of all sounds.
+
+// For detailed descriptions of these circuits, see the 280-ZZZAP/Laguna Racer
+// netlist, nl_280zzzap.cpp. I do not repeat those descriptions here.
+
+
+// Include special frontiers within engine sound oscillators whose purpose is
+// to improve solution convergence by reducing the oscillators' inherent
+// numeric instability. Also adjusts values of resistors associated with these
+// oscillators to maintain their frequency and voltage levels.
+
+#define CONVERGENCE_FRONTIERS   1
+
+// Enable a voltage limiter on the output of the op-amp which generates the
+// post-crash sound. This removes voltage glitches from the output which would
+// otherwise be audible when the netlist is run with a fixed 48 kHz timestep,
+// as it is in MAME.
+
+#define REMOVE_POST_CRASH_NOISE_GLITCHES  1
+
+
+static NETLIST_START(sspeedr_noisegen)
+
+	// See p. 25 of the Super Speed Race manual for the motherboard
+	// schematic, which includes the noise generator.
+
+	// This is a digital noise source of 12-volt amplitude, formed by a
+	// linear-feedback shift register driven by a 4 kHz clock.
+
+	CD4006_DIP(H5_SHFTREG)
+	CD4070_DIP(J5_XORx4)
+
+	NET_C(I_V12.Q, H5_SHFTREG.14, J5_XORx4.14)
+	NET_C(GND, H5_SHFTREG.7, J5_XORx4.7)
+	NET_C(GND, J5_XORx4.8, J5_XORx4.9)
+
+	RES(NOISE_R22, RES_K(680))
+	RES(NOISE_R23, RES_K(56))
+	RES(NOISE_R24, RES_K(27))
+	RES(NOISE_R25, RES_K(220))
+	RES(NOISE_R62, RES_M(1))
+
+	// The following is a very low-valued dummy resistance inserted to
+	// make the noise source's startup circuit voltage behave properly;
+	// without this it just stays at zero from the beginning and the
+	// generator refuses to start:
+	RES(NOISE_RDUMMY, RES_R(1))
+
+	CAP(NOISE_C8, CAP_U(0.001))
+	CAP(NOISE_C9, CAP_U(0.1))
+	DIODE(NOISE_CR3, "1N4148")
+
+	NET_C(GND, J5_XORx4.6)
+	NET_C(J5_XORx4.4, J5_XORx4.12, NOISE_C8.1)
+	NET_C(I_V12.Q, J5_XORx4.13)
+	NET_C(J5_XORx4.11, H5_SHFTREG.3, NOISE_R23.1)
+	NET_C(NOISE_R23.2, NOISE_C8.2, NOISE_R22.1)
+	NET_C(NOISE_R22.2, J5_XORx4.5)
+
+	NET_C(H5_SHFTREG.13, H5_SHFTREG.5)
+	NET_C(H5_SHFTREG.12, H5_SHFTREG.1, J5_XORx4.1)
+	NET_C(H5_SHFTREG.8, J5_XORx4.2)
+	NET_C(H5_SHFTREG.10, H5_SHFTREG.6)
+	NET_C(NOISE_R24.2, H5_SHFTREG.4)
+	NET_C(J5_XORx4.3, NOISE_R25.1)
+	NET_C(NOISE_R25.2, NOISE_CR3.K, NOISE_R24.1)
+	NET_C(NOISE_C9.2, NOISE_CR3.A, NOISE_R62.1)
+	NET_C(I_V12.Q, NOISE_RDUMMY.1)
+	NET_C(NOISE_RDUMMY.2, NOISE_C9.1)
+	NET_C(NOISE_R62.2, GND)
+
+	ALIAS(NOISE_OUT, H5_SHFTREG.10)
+
+NETLIST_END()
+
+
+//
+// Main netlist
+//
+
+
+static NETLIST_START(sspeedr_schematics)
+
+	// **** Conversion of accelerator level to "engine speed" control
+	// **** voltage for engine sound, with capacitor-based "engine
+	// **** inertia" and gear shift changes.
+
+	CD4016_DIP(A2)
+
+	LM3900(C1_3)
+	LM3900(C1_4)
+
+	RES(R42, RES_K(1))
+	RES(R43, RES_K(1))
+	RES(R44, RES_K(1))
+	RES(R45, RES_K(1))
+	RES(R62, RES_K(1))
+	RES(R61, RES_K(1))
+
+	RES(R51, RES_K(470))
+	RES(R46, RES_M(2.2))
+	RES(R47, RES_M(1))
+	RES(R48, RES_K(470))
+	RES(R49, RES_K(240))
+
+	RES(R50, RES_K(100))
+	CAP(C30, CAP_U(1))
+	RES(R53, RES_K(47))
+	RES(R52, RES_K(10))
+	RES(R56, RES_R(270))
+
+	RES(R54, RES_K(560))
+	RES(R55, RES_M(4.7))
+
+	RES(R57, RES_M(2.7))
+	RES(R58, RES_K(560))
+
+	RES(R59, RES_K(560))
+	RES(R60, RES_K(10))
+
+	CAP(C18, CAP_U(22))
+
+	NET_C(C18.2, GND)
+
+	CAP(C19, CAP_U(2.2))
+
+	DIODE(D4, 1N914)
+	DIODE(D5, 1N914)
+
+	NET_C(I_V5.Q, R42.1, R43.1, R44.1, R45.1, R62.1, R61.1, R51.1,
+		R55.1, R57.1)
+
+	NET_C(PEDAL_BIT0, R42.2, R46.1)
+	NET_C(PEDAL_BIT1, R43.2, R47.1)
+	NET_C(PEDAL_BIT2, R44.2, R48.1)
+	NET_C(PEDAL_BIT3, R45.2, R49.1)
+	NET_C(C1_3.PLUS, R46.2, R47.2, R48.2, R49.2, R51.2)
+	NET_C(C1_3.MINUS, R50.2, C30.2)
+	NET_C(C1_3.OUT, R50.1, C30.1, R53.1, D4.K)
+	NET_C(R53.2, R52.1, C18.1, R56.2, R54.1)
+	NET_C(R52.2, D4.A)
+	NET_C(C1_4.PLUS, R54.2, R55.2)
+	NET_C(C1_4.MINUS, R58.2, R57.2, A2.4)
+	// The following are only local connections to C1_4.OUT. It also runs
+	// to all the oscillators; those connections are listed further down.
+	NET_C(C1_4.OUT, D5.A, R59.1)
+	NET_C(D5.K, R58.1)
+	NET_C(C19.1, R59.2, R60.2)
+
+	NET_C(A2.1, GND)
+	NET_C(A2.2, R56.1)
+	NET_C(A2.13, ENGINE_SOUND_OFF)
+
+	NET_C(A2.5, R62.2, HI_SHIFT)
+
+	NET_C(A2.3, A2.8, C19.2)
+	NET_C(A2.9, R60.1)
+	NET_C(A2.6, R61.2, LO_SHIFT)
+
+
+	// **** Engine sound generation, using three triangle-wave oscillators
+	// **** running at frequency and amplitude determined by engine speed
+	// **** control voltage and modulated by MC3340 amplifier/attenuator.
+
+	// These are the remaining connections from C1_4.OUT:
+	NET_C(C1_4.OUT, R36.1, R37.1, R31.1, R32.1, R29.1, R30.1)
+
+	MC3340_DIP(MC3340_F1)
+
+	CD4016_DIP(B1)
+
+	// First oscillator (bottommost in schematics).
+
+	LM3900(C1_2)
+	LM3900(C1_1)
+
+	RES(R36, RES_K(560))
+	RES(R37, RES_K(270))
+	RES(R38, RES_K(100))
+	RES(R41, RES_K(10))
+	NET_C(R41.2, GND)
+
+#if CONVERGENCE_FRONTIERS
+	// Schmitt trigger resistors changed to compensate for waveform changes
+	// from use of frontier:
+	RES(R39, RES_K(465.0))
+	RES(R40, RES_K(275.0))
+#else
+	RES(R39, RES_K(470))
+	RES(R40, RES_K(270))
+#endif
+
+	CAP(C17, CAP_U(0.022))
+
+	DIODE(D3, 1N914)
+
+	NET_C(R37.2, B1.10)
+	NET_C(B1.11, C1_2.PLUS)
+	NET_C(R36.2, C1_2.MINUS, C17.1)
+	NET_C(C1_2.OUT, C17.2, R38.1, D3.A)
+	NET_C(R38.2, C1_1.MINUS)
+	NET_C(C1_1.OUT, R40.1, B1.12)
+	NET_C(I_V5.Q, R39.1)
+	NET_C(C1_1.PLUS, R39.2, R40.2)
+	NET_C(R41.1, D3.K, D2.K, C16.1)
+
+	// Second oscillator (middle in schematics).
+
+	LM3900(A1_3)
+	LM3900(A1_4)
+
+	RES(R31, RES_K(300))
+	RES(R32, RES_K(150))
+	RES(R33, RES_K(100))
+
+#if CONVERGENCE_FRONTIERS
+	// Schmitt trigger resistors changed to compensate for waveform changes
+	// from use of frontier:
+	RES(R34, RES_K(460))
+	RES(R35, RES_K(281))
+#else
+	RES(R34, RES_K(470))
+	RES(R35, RES_K(270))
+#endif
+
+	CAP(C15, CAP_U(0.01))
+
+	CAP(C16, CAP_U(10))
+
+	DIODE(D2, 1N914)
+
+	NET_C(R32.2, B1.4)
+	NET_C(B1.3, A1_3.PLUS)
+	NET_C(R31.2, A1_3.MINUS, C15.1)
+	NET_C(A1_3.OUT, C15.2, R33.1, D2.A)
+	NET_C(R33.2, A1_4.MINUS)
+	NET_C(A1_4.OUT, R35.1, B1.5)
+	NET_C(I_V5.Q, R34.1)
+	NET_C(A1_4.PLUS, R34.2, R35.2)
+	NET_C(C16.2, MC3340_F1.1)  // to MC3340 input pin
+
+	// Third oscillator (topmost in schematics).
+
+	LM3900(A1_2)
+	LM3900(A1_1)
+
+	RES(R29, RES_K(220))
+
+	RES(R30, RES_K(100))
+
+	RES(R28, RES_K(100))
+
+#if CONVERGENCE_FRONTIERS
+	// Schmitt trigger resistors changed to compensate for waveform changes
+	// from use of frontier.
+	RES(R26, RES_K(453))
+	RES(R27, RES_K(286))
+#else
+	RES(R26, RES_K(470))
+	RES(R27, RES_K(270))
+#endif
+
+	CAP(C14, CAP_U(0.01))
+
+	RES(R23, RES_K(10))
+	NET_C(R23.1, I_V5.Q)
+
+	RES(R25, RES_K(3.3))
+	NET_C(R25.2, GND)
+
+	CAP(C13, CAP_U(10))
+
+	RES(R22, RES_R(470))
+
+	DIODE(D1, 1N914)
+
+	NET_C(I_V5.Q, R22.1)
+	NET_C(ENGINE_SOUND_OFF, R22.2, D1.A)
+
+	NET_C(R30.2, B1.1)
+	NET_C(B1.2, A1_2.PLUS)
+	NET_C(R29.2, A1_2.MINUS, C14.1)
+	NET_C(A1_2.OUT, C14.2, R28.1, C13.1)
+	NET_C(R28.2, A1_1.MINUS)
+	NET_C(A1_1.OUT, R27.1, B1.13)
+	NET_C(I_V5.Q, R26.1)
+	NET_C(A1_1.PLUS, R26.2, R27.2)
+	NET_C(D1.K, R23.2, C13.2, R25.1, MC3340_F1.2)  // to MC3340 ctrl pin
+
+	// The MC3340's output is the complete engine sound, which is sent to
+	// the final mix.
+
+
+	// **** Noise generation and noise-based sound effects: tire skid
+	// **** (NOISE_CR_1), boom from crash (BOOM), post-crash noise
+	// **** (NOISE_CR_2).
+
+	// The noise generator circuit for Super Speed Race is a
+	// linear-feedback shift register on the main motherboard which
+	// generates a digital random noise signal. This digital noise gets
+	// smoothed and filtered into continuous analog form in the same way
+	// as in 280-ZZZAP and Laguna Racer, and the noise-based sound effect
+	// circuits are similar.
+
+	CAP(C1, CAP_U(10))
+
+	LOCAL_SOURCE(sspeedr_noisegen)
+	INCLUDE(sspeedr_noisegen)
+
+	NET_C(NOISE_OUT, C1.1)
+
+	NET_C(C1.2, R1.1)
+
+	// The noise generator is followed by a single-amplifier active
+	// low-pass filter which converts the digital noise waveform into a
+	// smoother analog noise waveform.
+
+	RES(R1, RES_K(680))
+
+	LM3900(H2_1)
+
+	CAP(C2, CAP_P(6800))
+	RES(R2, RES_K(10))
+	RES(R3, RES_K(820))
+	RES(R4, RES_K(270))
+	CAP(C3, CAP_P(220))
+
+	NET_C(R1.2, C2.1, R2.1, R4.1)
+	NET_C(C2.2, GND)
+	NET_C(H2_1.MINUS, R2.2, C3.1)
+	NET_C(I_V5.Q, R3.1)
+	NET_C(H2_1.PLUS, R3.2)
+	NET_C(H2_1.OUT, C3.2, R4.2, R5.1, R17.1, C5.1, C4.1)
+
+	// The smoothed analog noise is passed to three different sound-effect
+	// circuits, each of which is also an active-filter type.
+
+	// First noise circuit: tire skid (NOISE_CR_1), a two-amplifier active
+	// bandpass filter.
+
+	CD4016_DIP(E2)
+
+	LM3900(H2_3)
+
+	RES(R5, RES_K(39))
+	RES(R6, RES_R(62))
+	RES(R7, RES_K(82))
+	RES(R8, RES_K(39))
+
+	CAP(C7, CAP_U(0.1))
+	CAP(C8, CAP_U(0.1))
+	CAP(C25, CAP_U(0.1))
+
+	NET_C(R5.2, R6.1, C7.1, C8.1, R12.1)
+	NET_C(R6.2, GND)
+	NET_C(H2_3.MINUS, C7.2, R8.1)
+	NET_C(I_V5.Q, R7.1)
+	NET_C(H2_3.PLUS, R7.2)
+	NET_C(H2_3.OUT, R8.2, C8.2, E2.10)
+	NET_C(E2.11, C25.1)
+	NET_C(C25.2, R9.1)
+
+	LM3900(J1_2)
+
+	// Unlike the other LM3900s, those on chip J1 get 12-volt power.
+	NET_C(I_V12.Q, J1_2.VCC)
+	NET_C(GND, J1_2.GND)
+
+	RES(R9, RES_K(39))
+	RES(R10, RES_K(240))
+	RES(R11, RES_K(120))
+	RES(R12, RES_K(62))
+
+	NET_C(J1_2.MINUS, R9.2, R11.1)
+	NET_C(I_V5.Q, R10.1)
+	NET_C(J1_2.PLUS, R10.2)
+	NET_C(J1_2.OUT, R11.2, R12.2, E2.4)
+	NET_C(E2.3, R63.1)
+	NET_C(E2.5, E2.12, NOISE_CR_1)
+
+	// Second noise circuit: secondary crash noise (NOISE_CR_2), a
+	// single-amplifier active low-pass filter.
+
+	RES(R17, RES_K(10))
+
+	CAP(C5, CAP_U(10))
+	CAP(C4, CAP_U(0.022))
+
+	LM3900(H2_2)
+
+	RES(R16, RES_K(1.5))
+	RES(R15, RES_K(15))
+	RES(R14, RES_M(2.7))
+	RES(R13, RES_K(150))
+
+	CAP(C6, CAP_U(0.01))
+	CAP(C9, CAP_U(0.001))
+
+	NET_C(C4.2, R16.1)
+	NET_C(R16.2, C6.1, R15.1, R13.1)
+	NET_C(C6.2, GND)
+	NET_C(H2_2.MINUS, R15.2, C9.1)
+	NET_C(I_V5.Q, R14.1)
+	NET_C(H2_2.PLUS, R14.2)
+#if REMOVE_POST_CRASH_NOISE_GLITCHES
+	// With the static time-stepping used to ensure acceptable performance
+	// with MAME, this part of the netlist will generate extra spikes on
+	// the op-amp output with voltages outside of the real op-amp's output
+	// range. These spikes give the sound an unwanted "grittiness" not in
+	// the original, so I've added a voltage-limiting AFUNC to the op-amp
+	// output beyond its feedback connection. This gives a smoother sound,
+	// closer to the original.
+
+	NET_C(H2_2.OUT, C9.2, R13.2, H2_2_LIM.A0)
+	AFUNC(H2_2_LIM, 1, "max(min(A0, 4.5), 0)")
+	NET_C(H2_2_LIM.Q, E2.8)
+#else
+	NET_C(H2_2.OUT, C9.2, R13.2, E2.8)
+#endif
+	NET_C(E2.9, R64.1)
+	NET_C(E2.6, NOISE_CR_2)
+
+	// Third noise circuit: boom from crash (BOOM), a single-amplifier
+	// active bandpass filter.
+
+	LM3900(H2_4)
+
+	RES(R18, RES_K(20))
+
+	RES(R19, RES_K(1))
+	RES(R20, RES_M(3.3))
+	RES(R21, RES_M(1.5))
+
+	CAP(C10, CAP_U(0.1))
+	CAP(C11, CAP_U(0.1))
+
+	NET_C(R17.2, C5.2, E2.1)
+	NET_C(E2.2, R18.1)
+	NET_C(E2.13, BOOM)
+	NET_C(R18.2, R19.1, C10.1, C11.1)
+	NET_C(R19.2, GND)
+	NET_C(H2_4.MINUS, C10.2, R21.1)
+	NET_C(I_V5.Q, R20.1)
+	NET_C(H2_4.PLUS, R20.2)
+	NET_C(H2_4.OUT, R21.2, C11.2, R65.1)
+
+
+	// **** Final mix of sound effects and sound preamplification.
+
+	RES(R63, RES_K(3))
+	RES(R64, RES_K(150))
+
+	RES(R65, RES_K(12))
+
+	RES(R66, RES_K(33))
+
+	CAP(C20, CAP_U(1.0))
+	CAP(C21, CAP_U(10))
+
+	NET_C(R63.2, R64.2, R65.2, C20.1)
+	NET_C(MC3340_F1.7, R66.1)  // MC3340 output pin
+	NET_C(R66.2, C21.1)
+
+	LM3900(J1_4)
+	LM3900(J1_1)
+
+	NET_C(I_V12.Q, J1_4.VCC, J1_1.VCC)
+	NET_C(GND, J1_4.GND, J1_1.GND)
+
+	RES(R67, RES_K(2))
+	CAP(C22, CAP_U(10))
+	RES(R68, RES_K(220))
+	RES(R74, RES_K(220))
+
+	NET_C(I_V12.Q, R67.1)
+	NET_C(R67.2, C22.1, R68.1, R74.1)
+	NET_C(C22.2, GND)
+	NET_C(J1_4.PLUS, R68.2)
+	NET_C(J1_1.PLUS, R74.2)
+
+	RES(R69, RES_K(100))
+	POT2(R70, RES_K(50))  // Master volume potentiometer (2 terminals)
+	CAP(C23, CAP_U(10))
+	CAP(C24, CAP_U(0.1))
+	RES(R73, RES_K(100))
+	RES(R75, RES_K(100))
+
+	DIODE(D6, 1N914)
+	DIODE(D7, 1N914)
+	RES(R71, RES_K(10))
+	RES(R72, RES_K(10))
+
+	NET_C(SILENCE, D6.A, D7.A)
+	NET_C(D6.K, R71.1)
+	NET_C(D7.K, R72.1)
+
+	NET_C(R70.2, C23.2)
+	NET_C(J1_4.MINUS, C20.2, C21.2, R69.1, R70.1, R71.2)
+	NET_C(J1_4.OUT, C23.1, R69.2, C24.1)
+	NET_C(C24.2, R73.1)
+	NET_C(J1_1.MINUS, R73.2, R75.1, R72.2)
+	NET_C(J1_1.OUT, R75.2)
+
+	ALIAS(OUTPUT, J1_1.OUT)
+
+NETLIST_END()
+
+
+NETLIST_START(sspeedr)
+
+	SOLVER(Solver, 48000)
+
+	ANALOG_INPUT(I_V12, 12)
+	ANALOG_INPUT(I_V5, 5)
+
+	LOCAL_SOURCE(sspeedr_schematics)
+	INCLUDE(sspeedr_schematics)
+
+	// The MC3340 gets 5-volt power in Super Speed Race.
+	NET_C(I_V5.Q, MC3340_F1.8)
+	NET_C(GND, MC3340_F1.3)
+
+	// Logic inputs which represent output pins from 74174 latches at C2
+	// and D2
+	LOGIC_INPUT(I_F4_2, 0, "74XX")  // BOOM
+	LOGIC_INPUT(I_F4_5, 0, "74XX")  // ENGINE SOUND OFF
+	LOGIC_INPUT(I_F4_7, 0, "74XX")  // NOISE CR 1
+	LOGIC_INPUT(I_F4_10, 0, "74XX")  // NOISE CR 2
+	LOGIC_INPUT(I_F4_12, 0, "74XX")  // SILENCE
+	LOGIC_INPUT(I_F5_2, 1, "74XX")  // PEDAL_BIT0
+	LOGIC_INPUT(I_F5_5, 1, "74XX")  // PEDAL_BIT1
+	LOGIC_INPUT(I_F5_7, 1, "74XX")  // PEDAL_BIT2
+	LOGIC_INPUT(I_F5_10, 1, "74XX")  // PEDAL_BIT3
+	LOGIC_INPUT(I_F5_12, 0, "74XX")  // HI SHIFT
+	LOGIC_INPUT(I_F5_15, 1, "74XX")  // LO SHIFT
+
+	ALIAS(I_BOOM, I_F4_2.IN)
+	ALIAS(I_ENGINE_SOUND_OFF, I_F4_5.IN)
+	ALIAS(I_NOISE_CR_1, I_F4_7.IN)
+	ALIAS(I_NOISE_CR_2, I_F4_10.IN)
+	ALIAS(I_SILENCE, I_F4_12.IN)
+	ALIAS(I_PEDAL_BIT0, I_F5_2.IN)
+	ALIAS(I_PEDAL_BIT1, I_F5_5.IN)
+	ALIAS(I_PEDAL_BIT2, I_F5_7.IN)
+	ALIAS(I_PEDAL_BIT3, I_F5_10.IN)
+	ALIAS(I_HI_SHIFT, I_F5_12.IN)
+	ALIAS(I_LO_SHIFT, I_F5_15.IN)
+
+	ALIAS(BOOM, I_F4_2.Q)
+	ALIAS(ENGINE_SOUND_OFF, I_F4_5.Q)
+	ALIAS(NOISE_CR_1, I_F4_7.Q)
+	ALIAS(NOISE_CR_2, I_F4_10.Q)
+	ALIAS(SILENCE, I_F4_12.Q)
+	ALIAS(PEDAL_BIT0, I_F5_2.Q)
+	ALIAS(PEDAL_BIT1, I_F5_5.Q)
+	ALIAS(PEDAL_BIT2, I_F5_7.Q)
+	ALIAS(PEDAL_BIT3, I_F5_10.Q)
+	ALIAS(HI_SHIFT, I_F5_12.Q)
+	ALIAS(LO_SHIFT, I_F5_15.Q)
+
+	// Power pins for logic inputs:
+	NET_C(I_V5.Q,
+		  I_F4_2.VCC, I_F4_5.VCC, I_F4_7.VCC, I_F4_10.VCC, I_F4_12.VCC,
+		  I_F5_2.VCC, I_F5_5.VCC, I_F5_7.VCC, I_F5_10.VCC, I_F5_12.VCC,
+		  I_F5_15.VCC)
+	NET_C(GND,
+		  I_F4_2.GND, I_F4_5.GND, I_F4_7.GND, I_F4_10.GND, I_F4_12.GND,
+		  I_F5_2.GND, I_F5_5.GND, I_F5_7.GND, I_F5_10.GND, I_F5_12.GND,
+		  I_F5_15.GND)
+
+	// 5-volt power for most of the LM3900 op-amps.
+	NET_C(I_V5.Q,
+		H2_1.VCC, H2_3.VCC,
+		H2_4.VCC, H2_2.VCC, C1_3.VCC, C1_4.VCC,
+		A1_1.VCC, A1_2.VCC, A1_3.VCC, A1_4.VCC,
+		C1_1.VCC, C1_2.VCC)
+	NET_C(GND,
+		H2_1.GND, H2_3.GND,
+		H2_4.GND, H2_2.GND, C1_3.GND, C1_4.GND,
+		A1_1.GND, A1_2.GND, A1_3.GND, A1_4.GND,
+		C1_1.GND, C1_2.GND)
+
+	// 5-volt power for the CD4016 switches.
+	NET_C(I_V5.Q, A2.14, B1.14, E2.14)
+	NET_C(GND, A2.7, B1.7, E2.7)
+	// Switches A2_D and B1_C are unused.
+	NET_C(GND, A2.10, A2.11, A2.12, B1.6, B1.8, B1.9)
+
+	// Frontier after output of noise generator.
+	OPTIMIZE_FRONTIER(C1.1, RES_M(1), 50)
+
+	// Frontier before skid screech generator.
+	OPTIMIZE_FRONTIER(R5.1, RES_K(39), 50)
+
+	// Frontiers after NOISE CR 2 and BOOM generators.
+	OPTIMIZE_FRONTIER(R64.1, RES_K(150), 50)
+	OPTIMIZE_FRONTIER(R65.1, RES_K(12), 50)
+
+	// Frontier after engine sound generation.
+	OPTIMIZE_FRONTIER(R66.1, RES_K(33), 50)
+
+	// Frontiers before MC3340 inputs.
+	OPTIMIZE_FRONTIER(C16.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(C13.1, RES_M(1), 50)
+
+	// Frontiers before engine sound op-amp oscillators.
+	OPTIMIZE_FRONTIER(R36.1, RES_K(560), 50)
+	OPTIMIZE_FRONTIER(R37.1, RES_K(270), 50)
+	OPTIMIZE_FRONTIER(R31.1, RES_K(300), 50)
+	OPTIMIZE_FRONTIER(R32.1, RES_K(150), 50)
+	OPTIMIZE_FRONTIER(R29.1, RES_K(220), 50)
+	OPTIMIZE_FRONTIER(R30.1, RES_K(100), 50)
+
+#if CONVERGENCE_FRONTIERS
+	// Frontiers at Schmitt trigger op-amp outputs of engine sound
+	// oscillators, to eliminate numeric instability and speed convergence
+	// rather than to partition matrices. The resistor values given are
+	// the modified ones which compensate for how the frontiers would
+	// otherwise change the oscillator waveforms.
+	OPTIMIZE_FRONTIER(R40.1, RES_K(275), 50)
+	OPTIMIZE_FRONTIER(R35.1, RES_K(281), 50)
+	OPTIMIZE_FRONTIER(R27.1, RES_K(286), 50)
+#endif
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_sspeedr.h mame-0.224+dfsg.1/src/mame/audio/nl_sspeedr.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_sspeedr.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_sspeedr.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,12 @@
+// license:CC0
+// copyright-holders:Colin Douglas Howell
+#ifndef MAME_AUDIO_NL_SSPEEDR_H
+#define MAME_AUDIO_NL_SSPEEDR_H
+
+#pragma once
+
+#include "netlist/nl_setup.h"
+
+NETLIST_EXTERNAL(sspeedr)
+
+#endif // MAME_AUDIO_NL_SSPEEDR_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_starcas.cpp mame-0.224+dfsg.1/src/mame/audio/nl_starcas.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_starcas.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_starcas.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,808 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//NL_CONTAINS starcas wotw
+
+//
+// Netlist for Star Castle/War of the Worlds
+//
+// Derived from the schematics and parts list in the Star Castle
+// manual.
+//
+// War of the Worlds uses effectively the same sound board, but
+// with a swizzled set of inputs.
+//
+// Special thanks to:
+//    * Frank Palazzolo for creating a schematic of the War of the
+//       Worlds signal mapping
+//
+// Known problems/issues:
+//
+//    * The VCOs require high solver frequencies (100x+) to reach the
+//       correct pitches. For this reason, HLE'ed versions are
+//       provided that work correctly even at 48kHz.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_cinemat_common.h"
+
+
+//
+// Optimizations
+//
+
+#define HLE_BACKGROUND_VCO (1)
+#define HLE_LASER_VCO (1)
+#define ENABLE_FRONTIERS (1)
+
+
+//
+// Initial compilation includes this section.
+//
+
+#ifndef SOUND_VARIANT
+
+
+//
+// Now include ourselves twice, once for Star Castle and
+// once for War of the Worlds
+//
+
+#define VARIANT_STARCASTLE  0
+#define VARIANT_WOTW        1
+
+#define SOUND_VARIANT       (VARIANT_STARCASTLE)
+#include "nl_starcas.cpp"
+
+#undef SOUND_VARIANT
+#define SOUND_VARIANT       (VARIANT_WOTW)
+#include "nl_starcas.cpp"
+
+
+#else
+
+
+//
+// Main netlist
+//
+
+#if (SOUND_VARIANT == VARIANT_STARCASTLE)
+NETLIST_START(starcas)
+#else // (SOUND_VARIANT == VARIANT_WOTW)
+NETLIST_START(wotw)
+#endif
+
+	// 192k is not high enough to make the laser and background pitches high enough
+#if (HLE_BACKGROUND_VCO && HLE_LASER_VCO)
+	SOLVER(Solver, 1000)
+#else
+	SOLVER(Solver, 4800000)
+#endif
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	TTL_INPUT(I_OUT_0, 0)       // active low
+	TTL_INPUT(I_OUT_1, 1)       // active low
+	TTL_INPUT(I_OUT_2, 1)       // active low
+	TTL_INPUT(I_OUT_3, 1)       // active low
+	TTL_INPUT(I_OUT_4, 0)       // active low
+	TTL_INPUT(I_OUT_7, 0)       // active low
+
+	NET_C(GND, I_OUT_0.GND, I_OUT_1.GND, I_OUT_2.GND, I_OUT_3.GND, I_OUT_4.GND, I_OUT_7.GND)
+	NET_C(I_V5, I_OUT_0.VCC, I_OUT_1.VCC, I_OUT_2.VCC, I_OUT_3.VCC, I_OUT_4.VCC, I_OUT_7.VCC)
+
+	CINEMAT_LOCAL_MODELS
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V15, 15)
+	ANALOG_INPUT(I_VM15, -15)
+
+	RES(R1, RES_K(1))
+	RES(R2, 160)
+	RES(R3, RES_K(1))
+	RES(R4, RES_K(1))
+	RES(R5, RES_K(2))
+	RES(R6, RES_K(2))
+	RES(R7, RES_K(4.7))
+	RES(R8, RES_K(3.3))
+	RES(R9, 820)
+	RES(R10, RES_M(3.3))
+	RES(R11, RES_M(3.3))
+	RES(R12, RES_M(5.1))
+	RES(R13, RES_M(1.6))
+	RES(R14, RES_K(2))
+	RES(R15, RES_K(18))
+	RES(R16, RES_K(10))
+	RES(R17, RES_K(10))
+	RES(R18, RES_K(91))
+	RES(R19, RES_K(10))
+	RES(R20, RES_K(1))
+	RES(R21, RES_K(2))
+	RES(R22, RES_K(1))
+	RES(R24, RES_K(200))
+	RES(R25, RES_K(30))
+	RES(R26, RES_K(200))
+	RES(R27, RES_K(51))
+	RES(R28, RES_M(1))
+	RES(R29, 430)
+	RES(R30, 560)
+	RES(R31, RES_K(3.3))
+	RES(R32, RES_K(2))
+	RES(R33, RES_K(130))
+	RES(R34, RES_K(4.7))
+	RES(R35, RES_K(2.7))
+	RES(R36, RES_K(1))
+	RES(R37, RES_K(39))
+	RES(R38, RES_K(12))
+	RES(R39, RES_K(51))
+	RES(R40, RES_K(2.4))
+	RES(R41, RES_K(270))
+	RES(R42, RES_M(1))
+	RES(R43, RES_K(4.3))
+	RES(R44, RES_K(10))
+	RES(R45, RES_K(1))
+	RES(R46, RES_K(2))
+	RES(R47, RES_K(82))
+	RES(R48, RES_K(39))
+	RES(R49, RES_K(20))
+	RES(R50, RES_K(1))
+	RES(R51, RES_K(12))
+	RES(R52, RES_K(4.7))
+	RES(R53, RES_K(1))
+	RES(R54, RES_K(39))
+	RES(R55, RES_K(12))
+	RES(R56, RES_K(1))
+	RES(R57, RES_K(100))
+	RES(R58, RES_K(18))
+	RES(R59, RES_K(15))
+	RES(R60, RES_K(7.5))
+	RES(R61, 430)
+	RES(R62, 430)
+	RES(R63, RES_K(4.7))
+	RES(R64, RES_K(1))
+	RES(R65, RES_K(39))
+	RES(R66, RES_K(12))
+	RES(R67, RES_K(1))
+	RES(R68, RES_K(100))
+	RES(R69, RES_K(6.8))
+	RES(R70, RES_K(18))
+	RES(R71, RES_K(47))
+	RES(R72, 390)
+	RES(R73, 390)
+	RES(R74, RES_K(4.7))
+	RES(R75, RES_K(2.7))
+	RES(R76, RES_K(4.7))
+	RES(R77, RES_K(39))
+	RES(R78, RES_K(12))
+	RES(R79, RES_K(1))
+	RES(R80, RES_K(200))
+	RES(R81, RES_K(300))
+	RES(R82, RES_K(240))
+	RES(R83, 200)
+	RES(R84, 200)
+	RES(R85, RES_K(4.7))
+	RES(R86, RES_K(2.7))
+	RES(R87, RES_K(4.7))
+	RES(R88, RES_K(1))
+	RES(R89, RES_K(1.8))
+	RES(R90, RES_K(3.9))
+	RES(R91, RES_K(39))
+	RES(R92, RES_K(12))
+	RES(R93, 620)
+	RES(R94, RES_K(360))
+	RES(R95, RES_K(27))
+	RES(R96, RES_K(33))
+	RES(R97, 47)
+	RES(R98, 47)
+	RES(R99, RES_K(4.7))
+	RES(R100, RES_K(2.7))
+	RES(R101, RES_K(4.7))
+	RES(R102, RES_K(39))
+	RES(R103, RES_K(12))
+	RES(R104, RES_K(1))
+	RES(R105, RES_K(36))
+	RES(R106, RES_K(36))
+	RES(R107, RES_K(8.2))
+	RES(R108, RES_K(47))
+	RES(R109, RES_K(22))
+	RES(R110, RES_K(1))
+	RES(R111, RES_K(1))
+	RES(R112, RES_K(10))
+	RES(R113, RES_K(160))
+	RES(R114, RES_K(39))
+	RES(R115, RES_K(47))
+	RES(R116, RES_K(3.9))
+	RES(R117, RES_K(5.1))
+	RES(R118, RES_K(820))
+	RES(R119, RES_K(100))
+//  RES(R120, RES_K(390)) -- part of final amp (not emulated)
+//  RES(R121, RES_K(15))  -- part of final amp (not emulated)
+//  RES(R122, 150)        -- part of final amp (not emulated)
+//  RES(R123, RES_K(22))  -- part of final amp (not emulated)
+//  RES(R124, 150)        -- part of final amp (not emulated)
+	RES(R125, RES_K(8.2))
+	RES(R126, RES_K(20))
+	RES(R127, RES_K(30))
+	POT(R128, RES_K(10))
+	PARAM(R128.DIAL, 0.500000)
+
+//  CAP(C2, CAP_U(25))      // electrolytic
+//  CAP(C4, CAP_U(25))      // electrolytic
+//  CAP(C5, CAP_U(25))      // electrolytic
+//  CAP(C7, CAP_U(25))      // electrolytic
+//  CAP(C9, CAP_U(25))      // electrolytic
+	CAP(C11, CAP_U(0.68))   // film
+	CAP(C12, CAP_U(0.001))  // disk
+	CAP(C13, CAP_U(0.0022)) // film
+	CAP(C14, CAP_U(0.1))    // film
+	CAP(C15, CAP_U(0.1))    // film
+	CAP(C16, CAP_U(0.1))    // disk*
+	CAP(C17, CAP_U(100))    // electrolytic
+	CAP(C18, CAP_U(0.1))    // film
+	CAP(C19, CAP_U(0.1))    // disk*
+	CAP(C20, CAP_U(0.1))    // film
+	CAP(C21, CAP_U(0.01))   // disk
+	CAP(C22, CAP_U(0.68))   // film
+	CAP(C23, CAP_U(0.001))  // disk
+	CAP(C24, CAP_U(0.0047)) // film
+	CAP(C25, CAP_U(0.1))    // film
+	CAP(C26, CAP_U(0.1))    // film
+	CAP(C27, CAP_U(2.2))    // electrolytic
+	CAP(C28, CAP_U(0.22))   // film
+	CAP(C29, CAP_U(0.1))    // film
+	CAP(C30, CAP_U(4.7))    // electrolytic
+	CAP(C31, CAP_U(0.1))    // film
+	CAP(C32, CAP_U(0.01))   // film
+	CAP(C33, CAP_U(0.68))   // film
+	CAP(C34, CAP_U(3.3))    // electrolytic
+	CAP(C35, CAP_U(0.22))   // film
+	CAP(C36, CAP_U(0.33))   // film
+	CAP(C37, CAP_U(0.47))   // film
+	CAP(C38, CAP_U(0.01))   // disk
+	CAP(C39, CAP_U(0.68))   // film
+	CAP(C40, CAP_U(0.1))    // film
+	CAP(C41, CAP_U(0.01))   // disk
+	CAP(C42, CAP_U(0.1))    // film
+//  CAP(C43, CAP_U(0.68))   // film -- part of final amp (not emulated)
+//  CAP(C44, CAP_P(470))    // disk -- part of final amp (not emulated)
+//  CAP(C45, CAP_P(470))    // disk -- part of final amp (not emulated)
+//  CAP(C46, CAP_P(470))    // disk -- part of final amp (not emulated)
+//  CAP(C47, CAP_U(0.005))  // disk -- part of final amp (not emulated)
+	CAP(C48, CAP_U(0.33))   // film
+
+//  D_1N4003(D1)            // not needed
+//  D_1N4003(D2)            // not needed
+//  D_1N4003(D3)            // not needed
+//  D_1N4003(D4)            // not needed
+	D_1N5240B(D5)
+	D_1N5236B(D6)
+	D_1N914B(D7)
+	D_1N914B(D8)
+	D_1N914B(D9)
+	D_1N914B(D10)
+
+	Q_2N3904(Q1)            // NPN
+	Q_2N3904(Q2)            // NPN
+	Q_2N3906(Q3)            // PNP
+	Q_2N3904(Q4)            // NPN
+	Q_2N3904(Q5)            // NPN
+	Q_2N3906(Q6)            // PNP
+	Q_2N3906(Q7)            // PNP
+	Q_2N3906(Q8)            // PNP
+	Q_2N3906(Q9)            // PNP
+	Q_2N3906(Q10)           // PNP
+	Q_2N3906(Q11)           // PNP
+	Q_2N3906(Q12)           // PNP
+	Q_2N3906(Q13)           // PNP
+	Q_2N3906(Q14)           // PNP
+	Q_2N3906(Q15)           // PNP
+	Q_2N3906(Q16)           // PNP
+//  Q_2N6107(Q17)           // PNP -- part of final amp (not emulated)
+//  Q_2N6292(Q18)           // NPN -- part of final amp (not emulated)
+
+	TTL_7414_DIP(IC1)       // Hex Inverter
+	NET_C(IC1.7, GND)
+	NET_C(IC1.14, I_V5)
+
+	TTL_74LS164_DIP(IC2)    // 8-bit Shift Reg.
+	NET_C(IC2.7, GND)
+	NET_C(IC2.14, I_V5)
+
+	TTL_74LS377_DIP(IC3)    // Octal D Flip Flop
+	NET_C(IC3.10, GND)
+	NET_C(IC3.20, I_V5)
+
+//  TTL_7815_DIP(IC4)       // +15V Regulator -- not needed
+//  TTL_7915_DIP(IC5)       // -15V Regulator -- not needed
+
+	TTL_7406_DIP(IC6)       // Hex Inverter -- currently using a clone of 7416, no open collector behavior
+	NET_C(IC6.7, GND)
+	NET_C(IC6.14, I_V5)
+
+	TL081_DIP(IC7)          // Op. Amp.
+	NET_C(IC7.7, I_V15)
+	NET_C(IC7.4, I_VM15)
+
+	TL081_DIP(IC8)          // Op. Amp.
+	NET_C(IC8.7, I_V15)
+	NET_C(IC8.4, I_VM15)
+
+#if (!HLE_BACKGROUND_VCO)
+	LM566_DIP(IC9)          // 566 VCO
+#endif
+
+	TTL_74LS163_DIP(IC10)   // Binary Counter (schems say can sub a 74161)
+	NET_C(IC10.8, GND)
+	NET_C(IC10.16, I_V5)
+
+	TTL_74LS163_DIP(IC11)   // Binary Counter (schems say can sub a 74161)
+	NET_C(IC11.8, GND)
+	NET_C(IC11.16, I_V5)
+
+	TTL_74LS393_DIP(IC12)   // Dual 4 Bit B.C.
+	NET_C(IC12.7, GND)
+	NET_C(IC12.14, I_V5)
+
+	TTL_74LS393_DIP(IC13)   // Dual 4 Bit B.C.
+	NET_C(IC13.7, GND)
+	NET_C(IC13.14, I_V5)
+
+	AMI_S2688(IC14)         // Noise generator
+
+	TL081_DIP(IC15)         // Op. Amp.
+	NET_C(IC15.7, I_V15)
+	NET_C(IC15.4, I_VM15)
+
+	LM555_DIP(IC16)         // Timer
+
+#if (!HLE_LASER_VCO)
+	LM566_DIP(IC17)         // 566 VCO
+#endif
+
+	CA3080_DIP(IC18)        // Trnscndt. Op. Amp.
+	NET_C(IC18.7, I_V15)
+	NET_C(IC18.4, I_VM15)
+
+	CA3080_DIP(IC19)        // Trnscndt. Op. Amp.
+	NET_C(IC19.7, I_V15)
+	NET_C(IC19.4, I_VM15)
+
+	CA3080_DIP(IC20)        // Trnscndt. Op. Amp.
+	NET_C(IC20.7, I_V15)
+	NET_C(IC20.4, I_VM15)
+
+	CA3080_DIP(IC21)        // Trnscndt. Op. Amp.
+	NET_C(IC21.7, I_V15)
+	NET_C(IC21.4, I_VM15)
+
+	CA3080_DIP(IC22)        // Trnscndt. Op. Amp.
+	NET_C(IC22.7, I_V15)
+	NET_C(IC22.4, I_VM15)
+
+	LM555_DIP(IC23)         // Timer
+
+	LM555_DIP(IC24)         // Timer
+
+//  TL081_DIP(IC25)         // Op. Amp. -- part of final amp (not emulated)
+//  NET_C(IC25.7, I_V15)
+//  NET_C(IC25.4, I_VM15)
+
+	TL081_DIP(IC26)         // Op. Amp.
+	NET_C(IC26.7, I_V15)
+	NET_C(IC26.4, I_VM15)
+
+	TL081_DIP(IC27)         // Op. Amp.
+	NET_C(IC27.7, I_V15)
+	NET_C(IC27.4, I_VM15)
+
+	TTL_74LS107_DIP(IC28)   // Dual J-K Flip Flop
+	NET_C(IC28.7, GND)
+	NET_C(IC28.14, I_V5)
+
+	//
+	// Sheet 1, shift register (top left)
+	//
+
+	NET_C(I_V5, R1.1)
+	ALIAS(HI, R1.2)
+
+	NET_C(R1.2, IC2.9, IC2.2)
+	NET_C(I_OUT_7, IC1.13)
+	NET_C(IC1.12, IC1.1)
+	NET_C(IC1.2, IC2.1)
+	NET_C(I_OUT_4, IC1.9)
+	NET_C(IC1.8, IC1.5)
+	NET_C(IC1.6, IC2.8)
+	NET_C(I_OUT_0, IC1.11)
+	NET_C(IC1.10, IC1.3)
+	NET_C(IC1.4, IC3.11)
+
+	NET_C(IC2.3, IC3.3)
+	NET_C(IC2.4, IC3.4)
+	NET_C(IC2.5, IC3.7)
+	NET_C(IC2.6, IC3.8)
+	NET_C(IC2.10, IC3.13)
+	NET_C(IC2.11, IC3.14)
+	NET_C(IC2.12, IC3.17)
+	NET_C(IC2.13, IC3.18)
+	NET_C(GND, IC3.1)
+
+#if (SOUND_VARIANT == VARIANT_STARCASTLE)
+
+	ALIAS(FIREBALL_EN, IC3.2)
+	ALIAS(SHIELD_EN, IC3.5)
+	ALIAS(STAR_EN, IC3.6)
+	ALIAS(THRUST_EN, IC3.9)
+	ALIAS(BACKGROUND_EN, IC3.12)
+	ALIAS(BL2, IC3.15)
+	ALIAS(BL1, IC3.16)
+	ALIAS(BL0, IC3.19)
+
+#else // (SOUND_VARIANT == VARIANT_WOTW)
+
+	ALIAS(BACKGROUND_EN, IC3.2)
+	ALIAS(BL2, IC3.6)
+	ALIAS(BL1, IC3.6)
+	ALIAS(BL0, IC3.6)
+	ALIAS(SHIELD_EN, IC3.9)
+	ALIAS(FIREBALL_EN, IC3.12)
+	RES(REXTRA, RES_K(1))
+	NET_C(IC3.16, IC6.3)
+	NET_C(IC6.4, REXTRA.1)
+	NET_C(REXTRA.2, I_V5)
+	ALIAS(STAR_EN, IC6.4)
+	ALIAS(THRUST_EN, IC3.19)
+
+#endif
+
+	//
+	// Sheet 1, BACKGROUND (top portion)
+	//
+
+	NET_C(GND, D5.A, D6.K, R13.1, R16.1, R17.1, IC7.3)
+	NET_C(I_V15, R2.1)
+	NET_C(I_VM15, R12.1, R18.1)
+	NET_C(R2.2, D5.K, R3.1, R5.1, R7.1)
+	NET_C(BL2, IC6.9)
+	NET_C(IC6.8, R3.2, R4.1)
+	NET_C(BL1, IC6.11)
+	NET_C(IC6.10, R5.2, R6.1)
+	NET_C(BL0, IC6.13)
+	NET_C(IC6.12, R7.2, R8.1)
+	NET_C(R4.2, R6.2, R8.2, IC7.2, R9.1)
+	NET_C(IC7.6, R9.2, R10.1)
+	NET_C(R10.2, IC8.2, R11.1, C11.1)
+	NET_C(R12.2, R13.2, IC8.3)
+	NET_C(IC8.6, C11.2, R11.2, R14.1)
+	NET_C(R14.2, D6.A, R15.1)
+
+#if (HLE_BACKGROUND_VCO)
+	//
+	// The background clock is a VCO controlled via a 566 timer.
+	// Getting the frequency high enough to not miss clocking
+	// the downstream dividers requires increasing the solver
+	// frequency too much for realtime.
+	//
+	// Instead, clip out the circuit from the control voltage
+	// coming into IC9 (pin 5), through the TTL converter, and
+	// directly output the clock into IC10 pin 2. The equation
+	// for the clock frequency is computed from running the
+	// full emulation at 1000x frequency and fitting a curve
+	// to the resulting dataset.
+	//
+	VARCLOCK(BGCLK, 1, "max(0.000001,min(0.1,(0.00000215073*A0*A0*A0*A0) + (0.0000224782*A0*A0*A0) + (0.000090697*A0*A0) + (0.000175878*A0) + 0.000163685))")
+	NET_C(BGCLK.GND, GND)
+	NET_C(BGCLK.VCC, I_V5)
+	NET_C(R17.2, R15.2, R18.2, BGCLK.A0, C12.2)
+	NET_C(C12.1, R16.2)
+	ALIAS(CLK, BGCLK.Q)
+	NET_C(C13.1, C13.2, C14.1, C14.2, R19.1, R19.2, R20.1, R20.2, R21.1, R21.2, D7.A, D7.K, D8.A, D8.K, GND)
+#else
+	NET_C(GND, IC9.8, D7.A, D8.A)
+	NET_C(I_V5, R20.1)
+	NET_C(I_VM15, IC9.1, C13.2, R21.1)
+	NET_C(R17.2, R15.2, R18.2, IC9.5, C12.2)
+	NET_C(C13.1, IC9.7)
+	NET_C(C12.1, IC9.6, R16.2)
+	NET_C(IC9.3, C14.1)
+	NET_C(C14.2, D7.K, R19.1)
+	NET_C(R19.2, Q1.B)
+	NET_C(Q1.E, R21.2, D8.K)
+	NET_C(Q1.C, R20.2)
+	ALIAS(CLK, R20.2)
+#endif
+
+	//
+	// Sheet 1, BACKGROUND (bottom portion)
+	//
+
+	NET_C(GND, R27.1, IC10.4, IC10.5, IC10.6, IC11.3, IC11.4, IC12.12, IC13.12, IC28.4)
+	NET_C(I_V5, R22.1)
+	NET_C(CLK, IC10.2, IC11.2, IC13.1, IC28.12)
+	NET_C(BACKGROUND_EN, IC6.1, IC13.2)
+	NET_C(IC6.2, R22.2, IC10.1, IC11.1)
+	NET_C(HI, IC10.3, IC10.7, IC10.10, IC11.5, IC11.6, IC11.7)
+	NET_C(IC10.15, IC11.10)
+	NET_C(IC11.15, IC28.1, IC28.13)
+	NET_C(IC28.2, IC11.9, IC10.9, IC12.13)
+	NET_C(IC12.11, R24.1)
+	NET_C(R24.2, C15.1, R26.2, R27.2)
+	NET_C(IC13.6, IC13.13)
+	NET_C(IC13.9, R26.1)
+	NET_C(C15.2, R25.1)
+	ALIAS(SJ, R25.2)
+
+	//
+	// Sheet 2, NOISE GENERATOR
+	//
+
+	NET_C(GND, C16.2, C17.2, R28.1, IC14.1, IC14.2)
+	NET_C(I_V15, C16.1, C17.1, IC14.4)
+	NET_C(IC14.3, C18.2)
+	NET_C(C18.1, R28.2, IC15.3)
+	NET_C(IC15.6, IC15.2)
+	ALIAS(NOISE, IC15.6)
+
+	//
+	// Sheet 2, +2.2V
+	//
+
+	NET_C(GND, C19.2, R30.1, R31.1)
+	NET_C(I_V5, R29.1, Q2.C)
+	NET_C(R30.2, R29.2, Q2.B)
+	NET_C(R31.2, Q2.E, C19.1)
+	ALIAS(V2_2, Q2.E)
+
+	//
+	// Sheet 2, SQUARE WAVE
+	//
+
+	NET_C(GND, C20.2, C21.2, IC16.1)
+	NET_C(I_V5, R32.1, IC16.4, IC16.8)
+	NET_C(R32.2, R33.1, IC16.7)
+	NET_C(R33.2, IC16.6, IC16.2, C20.1)
+	NET_C(C21.1, IC16.5)
+	ALIAS(SQUAREWAVE, IC16.3)
+
+	//
+	// Sheet 2, LASER VCO
+	//
+
+	NET_C(GND, C22.2, C24.2, Q4.E, R38.1, R42.1, R50.1)
+	NET_C(I_V5, R34.1, R36.1, Q3.E)
+	NET_C(I_V15, R39.1, R43.1)
+	NET_C(I_VM15, R37.1)
+	NET_C(I_OUT_3, IC6.5, IC12.2)
+	NET_C(IC6.6, R36.2, R35.1)
+	NET_C(R35.2, Q3.B, R34.2)
+	NET_C(Q3.C, R37.2, R38.2, R40.1)
+	NET_C(R40.2, Q4.B)
+	NET_C(R39.2, R41.1, C22.1, R42.2, C23.2)
+	NET_C(Q4.C, R41.2)
+	NET_C(C23.1, R43.2)
+
+#if (HLE_LASER_VCO)
+	//
+	// The laser VCO is the same story as the background VCO,
+	// requiring a large multiplier to the solver frequency
+	// to clock downstream gates. Again, just replace it
+	// with a VARCLOCK tuned based on output from running
+	// the full simulation.
+	//
+	VARCLOCK(LASERCLK, 1, "max(0.000001,min(0.1,(0.00000385462*A0*A0*A0*A0) - (0.000195567*A0*A0*A0) + (0.00372371*A0*A0) - (0.0315254*A0) + 0.100119))")
+	NET_C(LASERCLK.GND, GND)
+	NET_C(LASERCLK.VCC, I_V5)
+	NET_C(C23.2, LASERCLK.A0)
+	NET_C(LASERCLK.Q, IC12.1)
+	NET_C(GND, C24.1, C25.1, C25.2, D9.A, D9.K, D10.A, D10.K, R44.1, R44.2, R45.1, R45.2, R46.1, R46.2)
+#else
+	NET_C(GND, D9.A, D10.A, IC17.1)
+	NET_C(I_V15, IC17.8)
+	NET_C(C23.2, IC17.5)
+	NET_C(C23.1, IC17.6)
+	NET_C(C24.1, IC17.7)
+	NET_C(IC17.3, C25.1)
+	NET_C(C25.2, D9.K, R44.1)
+	NET_C(R44.2, Q5.B)
+	NET_C(I_VM15, R46.1)
+	NET_C(Q5.E, D10.K, R46.2)
+	NET_C(I_V5, R45.1)
+	NET_C(Q5.C, R45.2, IC12.1)
+#endif
+
+	NET_C(IC12.3, R47.1)
+	NET_C(IC12.4, R48.1)
+	NET_C(IC12.6, R49.1)
+	NET_C(R47.2, R48.2, R49.2, R50.2, R51.1)
+	NET_C(R51.2, C26.1)
+	NET_C(C26.2, SJ)
+
+	//
+	// Sheet 2, SOFT EXPLOSION
+	//
+
+	NET_C(GND, C28.2, C29.2, R55.1, R56.1, R61.2, R62.1)
+	NET_C(I_V5, R52.1)
+	NET_C(I_VM15, C27.2, R54.1)
+	NET_C(I_OUT_2, R52.2, R53.1)
+	NET_C(R53.2, Q6.B)
+	NET_C(Q6.E, V2_2)
+	NET_C(Q6.C, R54.2, R55.2, Q7.E)
+	NET_C(R56.2, Q7.B)
+	NET_C(Q7.C, C27.1, R57.1)
+	NET_C(R57.2, IC18.5)
+	NET_C(NOISE, R58.1)
+	NET_C(R58.2, C28.1, R59.1)
+	NET_C(R59.2, C29.1, R60.1)
+	NET_C(R60.2, R61.1, IC18.2)
+	NET_C(R62.2, IC18.3)
+
+	//
+	// Sheet 2, LOUD EXPLOSION
+	//
+
+	NET_C(GND, C31.2, C32.2, R66.1, R67.1, R72.2, R73.1)
+	NET_C(I_V5, R63.1)
+	NET_C(I_VM15, C30.2, R65.1)
+	NET_C(I_OUT_1, R63.2, R64.1)
+	NET_C(R64.2, Q8.B)
+	NET_C(Q8.E, V2_2)
+	NET_C(Q8.C, R65.2, R66.2, Q9.E)
+	NET_C(R67.2, Q9.B)
+	NET_C(Q9.C, C30.1, R68.1)
+	NET_C(R68.2, IC19.5)
+	NET_C(NOISE, R69.1)
+	NET_C(R69.2, C31.1, R70.1)
+	NET_C(R70.2, C32.1, R71.1)
+	NET_C(R71.2, R72.1, IC19.2)
+	NET_C(R73.2, IC19.3)
+
+	//
+	// Sheet 2, FIREBALL
+	//
+
+	NET_C(GND, R78.1, R79.1, R83.1, R84.1)
+	NET_C(I_V5, Q10.E, R74.1, R76.1)
+	NET_C(I_VM15, C33.2, R77.1)
+	NET_C(FIREBALL_EN, R74.2, R75.1)
+	NET_C(R75.2, R76.2, Q10.B)
+	NET_C(Q10.C, R77.2, R78.2, Q11.E)
+	NET_C(R79.2, Q11.B)
+	NET_C(Q11.C, C33.1, R80.1)
+	NET_C(R80.2, IC20.5)
+	NET_C(NOISE, R81.1)
+	NET_C(SQUAREWAVE, R82.1)
+	NET_C(R81.2, R82.2, R83.2, IC20.2)
+	NET_C(R84.2, IC20.3)
+
+	//
+	// Sheet 2, SHIELD
+	//
+
+	NET_C(GND, R92.1, R93.1, R97.1, R98.1)
+	NET_C(I_V5, R85.1, R87.1, R88.1, Q12.E)
+	NET_C(I_VM15, R91.1)
+	NET_C(SHIELD_EN, R85.2, R86.1)
+	NET_C(R86.2, R87.2, Q12.B)
+	NET_C(Q12.C, R90.1, Q13.E)
+	NET_C(SQUAREWAVE, R88.2, R89.1)
+	NET_C(R89.2, R90.2, Q13.B)
+	NET_C(Q13.C, R91.2, R92.2, Q14.E)
+	NET_C(R93.2, Q14.B)
+	NET_C(Q14.C, R94.1)
+	NET_C(R94.2, IC21.5)
+	NET_C(SQUAREWAVE, R96.1)
+	NET_C(NOISE, R95.1)
+	NET_C(R96.2, R95.2, R97.2, IC21.2)
+	NET_C(R98.2, IC21.3)
+
+	//
+	// Sheet 2, THRUST
+	//
+
+	NET_C(GND, R103.1, R104.1, C35.2, C36.2, R110.1, R111.1)
+	NET_C(I_V5, R99.1, R101.1, Q15.E)
+	NET_C(I_VM15, C34.2, R102.1)
+	NET_C(THRUST_EN, R99.2, R100.1)
+	NET_C(R100.2, R101.2, Q15.B)
+	NET_C(Q15.C, R102.2, R103.2, Q16.E)
+	NET_C(R104.2, Q16.B)
+	NET_C(Q16.C, R105.1)
+	NET_C(R105.2, C34.1, R106.1)
+	NET_C(R106.2, IC22.5)
+	NET_C(NOISE, R107.1)
+	NET_C(R107.2, C35.1, R108.1)
+	NET_C(R108.2, C36.1, R109.1)
+	NET_C(R109.2, R110.2, IC22.2)
+	NET_C(R111.2, IC22.3)
+
+	//
+	// Sheet 2, STAR SOUND
+	//
+
+	NET_C(GND, C37.1, C38.1, C39.1, C40.1, C41.1, R119.1, IC23.1, IC24.1)
+	NET_C(I_V5, R112.1, R117.1, IC23.8, IC24.8)
+	NET_C(STAR_EN, IC23.4, IC24.4)
+	NET_C(R112.2, IC23.7, R113.1)
+	NET_C(R113.2, IC23.2, IC23.6, C37.2)
+	NET_C(C38.2, IC23.5)
+	NET_C(IC23.3, R114.1)
+	NET_C(R114.2, C39.2, R115.1)
+	NET_C(R115.2, C40.2, IC24.6, IC24.2, R116.1)
+	NET_C(R116.2, IC24.7, R117.2)
+	NET_C(C41.2, IC24.5)
+	NET_C(IC24.3, R119.2, R118.1)
+	NET_C(R118.2, C42.1)
+	NET_C(C42.2, SJ)
+
+	//
+	// Sheet 2, preamp
+	//
+
+	NET_C(GND, R127.1, IC27.3, R128.1)
+	NET_C(IC18.6, IC19.6, IC20.6, IC21.6, IC22.6, R127.2, IC26.3)
+	NET_C(IC26.2, IC26.6, C48.1)
+	NET_C(C48.2, R125.1)
+	NET_C(R125.2, SJ, IC27.2, R126.1)
+	NET_C(R126.2, IC27.6, R128.3)
+
+	//
+	// Sheet 2, final amp
+	//
+
+	ALIAS(OUTPUT, R126.2)
+
+	//
+	// Unconnected inputs
+	//
+
+	NET_C(GND, IC28.8, IC28.9, IC28.10, IC28.11)
+#if (SOUND_VARIANT == VARIANT_STARCASTLE)
+	NET_C(GND, IC6.3)
+#endif
+
+	//
+	// Unconnected outputs
+	//
+
+	HINT(IC28.3, NC)
+	HINT(IC28.5, NC)
+	HINT(IC28.6, NC)
+
+#if (SOUND_VARIANT == VARIANT_STARCASTLE)
+	HINT(IC6.4, NC)
+#endif
+	HINT(IC10.11, NC)
+	HINT(IC10.12, NC)
+	HINT(IC10.13, NC)
+	HINT(IC10.14, NC)
+	HINT(IC11.11, NC)
+	HINT(IC11.12, NC)
+	HINT(IC11.13, NC)
+	HINT(IC11.14, NC)
+	HINT(IC12.5, NC)
+	HINT(IC12.8, NC)
+	HINT(IC12.9, NC)
+	HINT(IC12.10, NC)
+	HINT(IC13.3, NC)
+	HINT(IC13.4, NC)
+	HINT(IC13.5, NC)
+	HINT(IC13.8, NC)
+	HINT(IC13.10, NC)
+	HINT(IC13.11, NC)
+
+#if (ENABLE_FRONTIERS)
+	//
+	// Disconnect noise source from consumers
+	//
+	OPTIMIZE_FRONTIER(IC15.3, RES_M(1), 50)
+
+	//
+	// Split noise outputs from output outputs before the mixer
+	//
+	OPTIMIZE_FRONTIER(IC26.3, RES_M(1), 50)
+#endif
+
+NETLIST_END()
+
+#endif
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_starcas.h mame-0.224+dfsg.1/src/mame/audio/nl_starcas.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_starcas.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_starcas.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,11 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_STARCAS_H
+#define MAME_AUDIO_NL_STARCAS_H
+
+#pragma once
+
+NETLIST_EXTERNAL(starcas)
+NETLIST_EXTERNAL(wotw)
+
+#endif // MAME_AUDIO_NL_STARCAS_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_starcrus.cpp mame-0.224+dfsg.1/src/mame/audio/nl_starcrus.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_starcrus.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_starcrus.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,325 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+
+//
+// Netlist for Star Cruiser
+//
+// Derived from the schematics in the Star Cruiser manual.
+//
+// Known problems/issues:
+//
+//    * Uses HLE noise due to abusing a 2N4124 in breakdown as a noise source.
+//
+
+#include "netlist/devices/net_lib.h"
+
+//
+// Main netlist
+//
+
+NETLIST_START(starcrus)
+
+	SOLVER(Solver, 48000)
+	ANALOG_INPUT(V12, 12)
+	ANALOG_INPUT(V5, 5)
+	ANALOG_INPUT(VM5, -5)
+	ALIAS(VCC, V5)
+
+	TTL_INPUT(EXPLODE_1, 1) // active low
+	TTL_INPUT(EXPLODE_2, 1) // active low
+	TTL_INPUT(LAUNCH_1, 1)  // active low
+	TTL_INPUT(LAUNCH_2, 1)  // active low
+	TTL_INPUT(ENGINE_1, 1)  // active low
+	TTL_INPUT(ENGINE_2, 1)  // active low
+
+	NET_C(GND, EXPLODE_1.GND, EXPLODE_2.GND, LAUNCH_1.GND, LAUNCH_2.GND, ENGINE_1.GND, ENGINE_2.GND)
+	NET_C(V5, EXPLODE_1.VCC, EXPLODE_2.VCC, LAUNCH_1.VCC, LAUNCH_2.VCC, ENGINE_1.VCC, ENGINE_2.VCC)
+
+	RES(R22, 470)
+	POT(R23, RES_K(2.5))
+	RES(R24, RES_K(10))
+	RES(R25, RES_K(15))
+	RES(R26, RES_K(2.2))
+	RES(R28, RES_K(100))
+	RES(R29, RES_K(220))
+	RES(R30, RES_K(220))
+	RES(R31, RES_K(470))
+	RES(R32, RES_K(100))
+	RES(R33, RES_K(2.2))
+	RES(R34, RES_K(2.2))
+	RES(R35, RES_K(2.2))
+	RES(R36, RES_K(2.2))
+	RES(R37, 220)
+	RES(R38, RES_K(10))
+	RES(R39, RES_K(10))
+	RES(R40, RES_K(56))
+	RES(R41, RES_K(100))
+	RES(R42, RES_K(1))
+	RES(R43, RES_K(100))
+	RES(R44, RES_K(2.2))
+	RES(R45, RES_K(2.2))
+	RES(R46, RES_K(10))
+	RES(R47, RES_K(3))
+	RES(R48, RES_K(10))
+	RES(R49, 220)
+	RES(R50, RES_K(150))
+	RES(R51, RES_K(10))
+	RES(R52, RES_K(10))
+	RES(R53, RES_K(2.2))
+	RES(R54, RES_K(10))
+	RES(R55, 220)
+	RES(R56, RES_K(2.2))
+	RES(R57, RES_K(2.2))
+	RES(R58, RES_K(2.2))
+	RES(R59, RES_K(10))
+	RES(R60, RES_K(3))
+	RES(R61, RES_K(10))
+	RES(R62, 220)
+	RES(R63, RES_K(150))
+	RES(R64, RES_K(10))
+	RES(R65, RES_K(10))
+	RES(R66, RES_K(2.2))
+	RES(R67, RES_K(10))
+	RES(R68, 220)
+	RES(R69, RES_K(2.2))
+	RES(R70, RES_K(47))
+	RES(R71, RES_K(100))
+	RES(R72, RES_K(6.8))
+	RES(R73, RES_K(6.8))
+	RES(R74, RES_K(3.3))
+	POT(R75, RES_K(50))
+	RES(R76, RES_K(22))
+	RES(R77, 470)
+
+	CAP(C12, CAP_U(0.1))
+	//CAP(C13, CAP_U(3.3))
+	CAP(C14, CAP_U(0.1))
+	CAP(C16, CAP_U(1.0))
+	CAP(C17, CAP_U(0.47))
+	CAP(C18, CAP_U(39))
+	CAP(C19, CAP_U(4.7))
+	CAP(C20, CAP_U(22))
+	CAP(C21, CAP_U(0.15))
+	CAP(C22, CAP_U(0.047))
+	CAP(C23, CAP_U(1.0))
+	CAP(C24, CAP_U(22))
+	CAP(C25, CAP_U(0.15))
+	CAP(C26, CAP_U(0.047))
+	CAP(C27, CAP_U(1.0))
+	CAP(C28, CAP_P(470))
+	CAP(C29, CAP_U(4.7))
+	CAP(C30, CAP_U(4.7))
+	CAP(C31, CAP_U(4.7))
+	CAP(C32, CAP_U(0.1))
+
+	QBJT_EB(Q6, "2N4124")
+	//QBJT_EB(Q7, "2N4124")
+	QBJT_EB(Q8, "2N4124")
+	QBJT_EB(Q9, "2N4124")
+	QBJT_EB(Q10, "2N4126")
+	QBJT_EB(Q11, "2N4124")
+	QBJT_EB(Q12, "2N4124")
+	QBJT_EB(Q13, "2N4124")
+	QBJT_EB(Q14, "2N4124")
+	QBJT_EB(Q15, "2N4126")
+	QBJT_EB(Q16, "2N4124")
+	QBJT_EB(Q17, "2N4124")
+	QBJT_EB(Q18, "2N4124")
+	QBJT_EB(Q19, "2N4126")
+	QBJT_EB(Q20, "2N4124")
+	QBJT_EB(Q21, "2N4124")
+
+	UA741_DIP8(U1)
+	UA741_DIP8(U2)
+	UA741_DIP8(U5)
+
+	NE566_DIP(U3)
+	NE566_DIP(U4)
+
+	DIODE(CR29, "1N4154")
+	DIODE(CR30, "1N4154")
+	DIODE(CR31, "1N4154")
+	DIODE(CR32, "1N4154")
+
+	TTL_7408_DIP(H6)
+	NET_C(H6.7, GND)
+	NET_C(H6.14, V5)
+	NET_C(ENGINE_1, H6.9)
+	NET_C(ENGINE_2, H6.10)
+	NET_C(EXPLODE_1, H6.4)
+	NET_C(EXPLODE_2, H6.5)
+	NET_C(LAUNCH_1, H6.1, H6.2)
+	NET_C(LAUNCH_2, H6.12, H6.13)
+
+	TTL_7404_INVERT(F8)
+	NET_C(F8.GND, GND)
+	NET_C(F8.VCC, V5)
+	NET_C(H6.6, F8.A)
+
+	// HLE Noise Gen
+	CLOCK(NOISE_CLOCK, 10000)
+	NET_C(NOISE_CLOCK.GND, GND)
+	NET_C(NOISE_CLOCK.VCC, V5)
+
+	SYS_NOISE_MT_N(NOISE, 0.05)
+	NET_C(NOISE.I, NOISE_CLOCK.Q)
+	NET_C(NOISE.1, R24.2)
+	NET_C(NOISE.2, Q6.B)
+
+	// Engine Sound
+	NET_C(H6.8, R26.1)
+	NET_C(R26.2, Q8.B)
+	NET_C(Q8.E, GND)
+	NET_C(Q8.C, R25.1, R70.1)
+	NET_C(R25.2, C14.1)
+	NET_C(C14.2, R23.2, C12.1)
+	NET_C(R23.1, R22.1)
+	NET_C(R22.2, V12)
+	NET_C(R23.3, R24.1, Q6.C)
+	//NET_C(R24.2, Q7.E, C13.1)
+	//NET_C(C13.2, GND)
+	//NET_C(Q7.B, Q7.C, Q6.B)
+	NET_C(Q6.E, GND)
+	NET_C(C12.2, U2.3, R28.1)
+	NET_C(R28.2, GND)
+	NET_C(U2.7, V5)
+	NET_C(U2.4, VM5)
+	NET_C(U2.2, R29.1)
+	NET_C(R29.2, C16.1, R30.1)
+	NET_C(C16.2, GND)
+	NET_C(R30.2, U2.6, R31.1)
+	NET_C(R31.2, C17.1, Q12.C, R32.1, U1.3)
+	NET_C(C17.2, GND)
+	NET_C(R32.2, GND)
+	NET_C(U1.7, V5)
+	NET_C(U1.4, VM5)
+	NET_C(U1.2, R43.1, R42.1)
+	NET_C(R43.2, U1.6, R71.1)
+	NET_C(R42.2, C19.1)
+	NET_C(C19.2, Q13.C)
+	NET_C(Q13.E, GND)
+	NET_C(Q13.B, R41.1, R40.1)
+	NET_C(R41.2, GND)
+	NET_C(R40.2, C18.1, R38.1, R37.1)
+	NET_C(C18.2, GND)
+	NET_C(R38.2, Q11.B)
+	NET_C(Q11.E, GND)
+	NET_C(Q12.E, GND)
+	NET_C(Q11.C, R39.1, Q12.B)
+	NET_C(R39.2, V5)
+	NET_C(R37.2, Q10.C)
+	NET_C(Q10.E, R35.1, V5)
+	NET_C(R35.2, Q10.B, R36.1)
+	NET_C(R36.2, Q9.C)
+	NET_C(Q9.E, GND)
+	NET_C(Q9.B, R34.1)
+	NET_C(R34.2, R33.1, F8.Q)
+	NET_C(R33.2, V5)
+
+	// Launch Sound 1
+	NET_C(H6.3, R44.1)
+	NET_C(R44.2, Q14.B)
+	NET_C(Q14.E, GND)
+	NET_C(Q14.C, R46.1)
+	NET_C(R46.2, Q15.B)
+	NET_C(R46.2, R45.1)
+	NET_C(R45.2, R47.1)
+	NET_C(R45.2, Q15.E)
+	NET_C(R47.2, R48.1)
+	NET_C(R48.2, GND)
+	NET_C(R48.1, Q16.B)
+	NET_C(Q15.C, CR29.A)
+	NET_C(CR29.K, R49.1)
+	NET_C(R49.2, Q16.C)
+	NET_C(Q16.E, R50.1)
+	NET_C(R50.2, GND)
+	NET_C(Q15.E, R51.1)
+	NET_C(Q15.E, V12)
+	NET_C(Q15.E, U3.8)
+	NET_C(R51.2, U3.6)
+	NET_C(Q16.C, C20.1)
+	NET_C(C20.2, GND)
+	NET_C(C20.1, U3.5)
+	NET_C(U3.1, GND)
+	NET_C(U3.7, C21.1)
+	NET_C(C21.2, GND)
+	NET_C(U3.3, C22.1)
+	NET_C(C22.2, R52.1)
+	NET_C(R52.2, GND)
+	NET_C(R52.1, CR30.A)
+	NET_C(CR30.K, R53.1)
+	NET_C(R53.2, Q17.C)
+	NET_C(Q17.E, GND)
+	NET_C(Q17.B, R56.1)
+	NET_C(R56.2, R44.1)
+	NET_C(Q17.C, R54.1)
+	NET_C(R54.2, R55.1)
+	NET_C(R55.2, GND)
+	NET_C(R55.1, C23.1)
+	NET_C(C23.2, GND)
+	NET_C(C23.1, R72.1)
+
+	// Launch Sound 2
+	NET_C(H6.11, R57.1)
+	NET_C(R57.2, Q18.B)
+	NET_C(Q18.E, GND)
+	NET_C(Q18.C, R59.1)
+	NET_C(R59.2, Q19.B)
+	NET_C(R59.2, R58.1)
+	NET_C(R58.2, R60.1)
+	NET_C(R58.2, Q19.E)
+	NET_C(R60.2, R61.1)
+	NET_C(R61.2, GND)
+	NET_C(R61.1, Q20.B)
+	NET_C(Q19.C, CR31.A)
+	NET_C(CR31.K, R62.1)
+	NET_C(R62.2, Q20.C)
+	NET_C(Q20.E, R63.1)
+	NET_C(R63.2, GND)
+	NET_C(Q19.E, R64.1)
+	NET_C(Q19.E, V12)
+	NET_C(Q19.E, U4.8)
+	NET_C(R64.2, U4.6)
+	NET_C(Q20.C, C24.1)
+	NET_C(C24.2, GND)
+	NET_C(C24.1, U4.5)
+	NET_C(U4.1, GND)
+	NET_C(U4.7, C25.1)
+	NET_C(C25.2, GND)
+	NET_C(U4.3, C26.1)
+	NET_C(C26.2, R65.1)
+	NET_C(R65.2, GND)
+	NET_C(R65.1, CR32.A)
+	NET_C(CR32.K, R66.1)
+	NET_C(R66.2, Q21.C)
+	NET_C(Q21.E, GND)
+	NET_C(Q21.B, R69.1)
+	NET_C(R69.2, R57.1)
+	NET_C(Q21.C, R67.1)
+	NET_C(R67.2, R68.1)
+	NET_C(R68.2, GND)
+	NET_C(R68.1, C27.1)
+	NET_C(C27.2, GND)
+	NET_C(C27.1, R73.1)
+
+	NET_C(R70.2, R71.2, R72.2, R73.2, R74.1, U5.2, C28.1)
+
+	NET_C(R74.2, R75.2, R75.3)
+	NET_C(C28.2, R75.1, R77.1, U5.6)
+	NET_C(C29.1, U5.7, V5)
+	NET_C(C29.2, GND)
+	NET_C(U5.3, C31.1, R76.1)
+	NET_C(C31.2, GND)
+	NET_C(R76.2, GND)
+	NET_C(U5.4, C30.1, VM5)
+	NET_C(C30.2, GND)
+	NET_C(R77.2, C32.1)
+	NET_C(C32.2, GND)
+
+	// Separate each input into the summing network
+	OPTIMIZE_FRONTIER(R70.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R71.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R72.1, RES_M(1), 50)
+	OPTIMIZE_FRONTIER(R73.1, RES_M(1), 50)
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_starcrus.h mame-0.224+dfsg.1/src/mame/audio/nl_starcrus.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_starcrus.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_starcrus.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+#ifndef MAME_AUDIO_NL_STARCRUS_H
+#define MAME_AUDIO_NL_STARCRUS_H
+
+#pragma once
+
+NETLIST_EXTERNAL(starcrus)
+
+#endif // MAME_AUDIO_NL_STARCRUS_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_starfire.cpp mame-0.224+dfsg.1/src/mame/audio/nl_starfire.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_starfire.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_starfire.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,437 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+//
+// Netlist for Star Fire
+//
+// Derived from the schematics in the manual.
+//
+// Known problems/issues:
+//
+//    * Tracking computer might not be 100% right, compared to recordings.
+//    * Slow.
+//
+
+#include "netlist/devices/net_lib.h"
+
+//
+// 556 is just two 555s in one package
+//
+
+static NETLIST_START(NE556_DIP)
+	NE555(A)
+	NE555(B)
+
+	NET_C(A.GND, B.GND)
+	NET_C(A.VCC, B.VCC)
+
+	DIPPINS(      /*        +--------------+        */
+		 A.DISCH, /* 1DISCH |1     ++    14| VCC    */ A.VCC,
+		A.THRESH, /* 1THRES |2           13| 2DISCH */ B.DISCH,
+		  A.CONT, /*  1CONT |3           12| 2THRES */ B.THRESH,
+		 A.RESET, /* 1RESET |4   NE556   11| 2CONT  */ B.CONT,
+		   A.OUT, /*   1OUT |5           10| 2RESET */ B.RESET,
+		  A.TRIG, /*  1TRIG |6            9| 2OUT   */ B.OUT,
+		   A.GND, /*    GND |7            8| 2TRIG  */ B.TRIG
+				  /*        +--------------+        */
+	)
+NETLIST_END()
+
+static NETLIST_START(ICL8038_DIP)
+	VCVS(VI, 1)
+	CCCS(CI1, -1)
+	CCCS(CI2, 2)
+	SYS_COMPD(COMP)
+	SYS_DSW2(SW)
+	VCVS(VO, 1)
+	RES(R_SHUNT, RES_R(50))
+
+	PARAM(VO.RO, 50)
+	PARAM(COMP.MODEL, "FAMILY(TYPE=CUSTOM IVL=0.16 IVH=0.4 OVL=0.01 OVH=0.01 ORL=50 ORH=50)")
+	PARAM(SW.GOFF, 0) // This has to be zero to block current sources
+
+	NET_C(VI.OP, CI1.IN, CI2.IN)
+	NET_C(CI1.OP, VO.IP)
+	NET_C(COMP.Q, SW.I)
+	NET_C(CI2.OP, SW.2)
+	NET_C(COMP.VCC, R_SHUNT.1)
+	NET_C(SW.1, R_SHUNT.2)
+	NET_C(SW.3, VO.IP)
+	NET_C(VO.OP, COMP.IN)
+
+	// Avoid singular Matrix due to G=0 switch
+	RES(RX1, 1e10)
+	RES(RX2, 1e10)
+	NET_C(RX1.1, SW.1)
+	NET_C(RX2.1, SW.3)
+
+	NET_C(COMP.GND, RX1.2, RX2.2)
+
+	RES(R1, 5000)
+	RES(R2, 5000)
+	RES(R3, 5000)
+
+	// Square output wave
+	VCVS(V_SQR, 1)
+	NET_C(COMP.Q, V_SQR.IP)
+
+	NET_C(COMP.GND, SW.GND, VI.ON, VI.IN, CI1.ON, CI2.ON, VO.IN, VO.ON, R2.2, V_SQR.IN, V_SQR.ON)
+	NET_C(COMP.VCC, SW.VCC, R1.2)
+	NET_C(COMP.IP, R1.1, R2.1, R3.1)
+	NET_C(COMP.Q, R3.2)
+
+	ALIAS(11, VI.ON) // GND
+	ALIAS(9, V_SQR.OP) // Square out
+	ALIAS(3, VO.OP) // Triag out
+	ALIAS(8, VI.IP) // VC
+	ALIAS(4, CI1.IP) // R1
+	ALIAS(5, CI2.IP) // R2
+	ALIAS(10, VO.IP) // C1
+	ALIAS(6, COMP.VCC) // V+
+NETLIST_END()
+
+//
+// Main netlist
+//
+
+NETLIST_START(starfire)
+	NET_MODEL("2N3702 PNP(Is=650.6E-18 Xti=3 Eg=1.11 Vaf=115.7 Bf=133.8 Ne=1.832 Ise=97.16f Ikf=1.081 Xtb=1.5 Br=3.73 Nc=2 Isc=0 Ikr=0 Rc=.715 Cjc=14.76p Mjc=.5383 Vjc=.75 Fc=.5 Cje=19.82p Mje=.3357 Vje=.75 Tr=114.1n Tf=761.3p Itf=.65 Vtf=5 Xtf=1.7 Rb=10 mfg=National)")
+	NET_MODEL("LM324_12V OPAMP(TYPE=3 VLH=1.6 VLL=0.16 FPF=5 UGF=500k SLEW=0.3M RI=1000k RO=50 DAB=0.00075)")
+	NET_MODEL("LM324_5V OPAMP(TYPE=3 VLH=0.667 VLL=0.0667 FPF=5 UGF=500k SLEW=0.3M RI=1000k RO=50 DAB=0.00075)")
+
+	SOLVER(Solver, 48000)
+	ANALOG_INPUT(V1_2, 1.2)
+	ANALOG_INPUT(V12, 12)
+	ANALOG_INPUT(VM12, -12)
+	ANALOG_INPUT(V5, 5)
+	ANALOG_INPUT(VM5, -5)
+	ALIAS(VCC, V5)
+
+	TTL_INPUT(SIZE, 0)          // active high
+	TTL_INPUT(SEXPLO, 0)        // active high
+	TTL_INPUT(STIE, 0)          // active high
+	TTL_INPUT(SLASER, 0)        // active high
+	TTL_INPUT(TRACK, 0)         // active high
+	TTL_INPUT(LOCK, 0)          // active high
+	TTL_INPUT(SCANNER, 0)       // active high
+	TTL_INPUT(OHEAT, 0)         // active high
+
+	NET_C(VCC, SIZE.VCC, SEXPLO.VCC, STIE.VCC, SLASER.VCC, TRACK.VCC, LOCK.VCC, SCANNER.VCC, OHEAT.VCC)
+	NET_C(GND, SIZE.GND, SEXPLO.GND, STIE.GND, SLASER.GND, TRACK.GND, LOCK.GND, SCANNER.GND, OHEAT.GND)
+
+	LOCAL_SOURCE(NE556_DIP)
+	LOCAL_SOURCE(ICL8038_DIP)
+
+	RES(R12, RES_K(10))
+	RES(R13, RES_K(470))
+	RES(R14, RES_K(470))
+	POT(R15, RES_K(100))
+	POT(R16, RES_K(100))
+	POT(R17, RES_K(100))
+	POT(R18, RES_K(100))
+	POT(R19, RES_K(33))
+	POT(R20, RES_K(10))
+	POT(R21, RES_K(10))
+	RES(R23, RES_K(47))
+	RES(R24, 470)
+	RES(R25, RES_K(10))
+	RES(R26, RES_K(1))
+	RES(R27, RES_K(30))
+	RES(R28, RES_K(30))
+	RES(R29, RES_K(1))
+	RES(R30, RES_K(4.7))
+	RES(R31, RES_M(1))
+	RES(R37, RES_K(10))
+	RES(R38, RES_K(2.7))
+	RES(R39, RES_K(10))
+	RES(R40, RES_K(2.7))
+	RES(R41, RES_K(3))
+	RES(R42, RES_K(1))
+	RES(R43, RES_M(1))
+	RES(R44, RES_K(2.2))
+	RES(R45, RES_K(3.3))
+	RES(R46, RES_K(27))
+	RES(R47, RES_K(82))
+	RES(R48, RES_K(10))
+	RES(R49, RES_K(100))
+	RES(R50, RES_K(160))
+	RES(R51, RES_K(16))
+	RES(R52, RES_K(16))
+	RES(R53, RES_K(16))
+	RES(R54, RES_K(100))
+	RES(R55, RES_K(100))
+	RES(R56, RES_K(4.7))
+	RES(R57, RES_K(10))
+	RES(R58, RES_K(82))
+	RES(R59, RES_K(27))
+	RES(R60, RES_K(2.7))
+	RES(R61, RES_K(10))
+	RES(R62, RES_M(1))
+	RES(R63, RES_M(1))
+	RES(R64, RES_K(4.7))
+	RES(R67, RES_K(10))
+	RES(R68, RES_K(2.7))
+	RES(R69, RES_K(470))
+	RES(R70, RES_K(470))
+	RES(R71, RES_K(100))
+	RES(R72, RES_K(330))
+	RES(R73, RES_K(4.7))
+	RES(R74, RES_K(100))
+	RES(R75, RES_K(27))
+	RES(R77, RES_K(470))
+	RES(R78, RES_K(4.7))
+	RES(R79, RES_K(10))
+	RES(R80, RES_K(3))
+	RES(R81, RES_K(1))
+	RES(R82, RES_K(10))
+	RES(R83, RES_K(4.7))
+	RES(R84, RES_K(1))
+	RES(R85, RES_K(3))
+	RES(R86, RES_K(1))
+	RES(R87, RES_K(2))
+	//RES(R88, RES_K(82))
+	RES(R89, RES_K(22))
+	RES(R90, RES_K(22))
+	RES(R91, RES_M(1))
+	//RES(R, RES_K())
+
+	CAP(C7, CAP_U(0.1))
+	CAP(C9, CAP_U(0.1))
+	CAP(C10, CAP_U(0.1))
+	CAP(C11, CAP_U(0.1))
+	CAP(C12, CAP_U(0.01))
+	CAP(C13, CAP_U(1.0))
+	CAP(C14, CAP_U(0.1))
+	CAP(C15, CAP_U(0.01))
+	CAP(C18, CAP_U(1.0))
+	CAP(C20, CAP_U(1.0))
+	CAP(C21, CAP_U(0.1))
+	CAP(C22, CAP_U(0.1))
+	CAP(C23, CAP_U(0.1))
+	CAP(C25, CAP_U(1.0))
+	CAP(C26, CAP_U(0.1))
+	CAP(C27, CAP_U(1.0))
+	CAP(C29, CAP_U(0.1))
+	CAP(C32, CAP_U(1.0))
+	CAP(C34, CAP_U(1.0))
+	CAP(C38, CAP_U(0.1))
+	CAP(C39, CAP_U(0.01))
+	CAP(C45, CAP_U(4.7))
+	//CAP(C, CAP_U())
+
+	DIODE(D3, "1N914")
+
+	TTL_7406_GATE(IC_6C_A)
+	TTL_7406_GATE(IC_6C_B)
+	TTL_7406_GATE(IC_6C_C)
+	TTL_7406_GATE(IC_6C_D)
+	TTL_7406_GATE(IC_6C_E)
+	TTL_7406_GATE(IC_6C_F)
+	NET_C(VCC, IC_6C_A.VCC, IC_6C_B.VCC, IC_6C_C.VCC, IC_6C_D.VCC, IC_6C_E.VCC, IC_6C_F.VCC)
+	NET_C(GND, IC_6C_A.GND, IC_6C_B.GND, IC_6C_C.GND, IC_6C_D.GND, IC_6C_E.GND, IC_6C_F.GND)
+
+	CD4070_GATE(IC_7E_A)
+	CD4070_GATE(IC_7E_B)
+	CD4070_GATE(IC_7E_C)
+	CD4070_GATE(IC_7E_D)
+	NET_C(V12, IC_7E_A.VDD, IC_7E_B.VDD, IC_7E_C.VDD, IC_7E_D.VDD)
+	NET_C(GND, IC_7E_A.VSS, IC_7E_B.VSS, IC_7E_C.VSS, IC_7E_D.VSS)
+
+	NE555(IC_5B_A)
+	NE555(IC_6E_A)
+	NET_C(V5, IC_5B_A.VCC)
+	NET_C(V12, IC_6E_A.VCC)
+	NET_C(GND, IC_5B_A.GND, IC_6E_A.GND)
+
+	SUBMODEL(NE556_DIP, IC_6A)
+	SUBMODEL(NE556_DIP, IC_8F)
+	NET_C(V5, IC_6A.14)
+	NET_C(V12, IC_8F.14)
+	NET_C(GND, IC_6A.7, IC_8F.7)
+
+	CD4006_DIP(IC_8E)
+	NET_C(V12, IC_8E.14)
+	NET_C(GND, IC_8E.7)
+
+	OPAMP(IC_6D_A, "LM324_12V")
+	OPAMP(IC_6D_B, "LM324_12V")
+	OPAMP(IC_6D_C, "LM324_12V")
+	OPAMP(IC_6D_D, "LM324_12V")
+	OPAMP(IC_8D_A, "LM324_12V")
+	OPAMP(IC_8D_B, "LM324_12V")
+	OPAMP(IC_8D_C, "LM324_12V")
+	OPAMP(IC_8D_D, "LM324_12V")
+	NET_C(V12, IC_6D_A.VCC, IC_6D_B.VCC, IC_6D_C.VCC, IC_6D_D.VCC, IC_8D_A.VCC, IC_8D_B.VCC, IC_8D_C.VCC, IC_8D_D.VCC)
+	NET_C(VM12, IC_6D_A.GND, IC_6D_B.GND, IC_6D_C.GND, IC_6D_D.GND, IC_8D_A.GND, IC_8D_B.GND, IC_8D_C.GND, IC_8D_D.GND)
+
+	OPAMP(IC_7C_A, "LM324_5V")
+	OPAMP(IC_7C_B, "LM324_5V")
+	OPAMP(IC_7C_C, "LM324_5V")
+	OPAMP(IC_7C_D, "LM324_5V")
+	NET_C(V5, IC_7C_A.VCC, IC_7C_B.VCC, IC_7C_C.VCC, IC_7C_D.VCC)
+	NET_C(VM5, IC_7C_A.GND, IC_7C_B.GND, IC_7C_C.GND, IC_7C_D.GND)
+
+	MC3340_DIP(IC_7D)
+	MC3340_DIP(IC_6B)
+	NET_C(V12, IC_6B.8, IC_7D.8)
+	NET_C(GND, IC_6B.3, IC_7D.3)
+
+	SUBMODEL(ICL8038_DIP, IC_6F)
+	NET_C(V12, IC_6F.6)
+	NET_C(VM12, IC_6F.11)
+
+	CD4016_DIP(IC_7B)
+	NET_C(V5, IC_7B.14)
+	NET_C(VM5, IC_7B.7)
+
+	QBJT_EB(Q1, "2N3702")
+	QBJT_EB(Q2, "2N3702")
+
+	// Tie Weapon
+	NET_C(STIE.Q, IC_6C_E.A)
+	NET_C(IC_6C_E.Y, R39.1, IC_7E_C.A)
+	NET_C(V1_2, IC_7C_C.MINUS) // HACK: +12V is actually fed into this pin per the schematic, but it relies on LM324 abuse.
+	NET_C(V12, R39.2, IC_7E_C.B, R83.1, R91.1, R86.1, IC_7E_A.A, IC_8F.10)
+	NET_C(IC_7E_C.Q, IC_8F.4, IC_8F.6)
+	NET_C(IC_8F.1, C45.1, Q2.C, IC_8D_D.PLUS)
+	NET_C(GND, C38.2, C45.2, R82.2, R57.1, R61.2, R84.2, IC_8D_A.PLUS)
+	NET_C(R83.2, R82.1, Q2.B)
+	NET_C(R91.2, Q2.E)
+	NET_C(IC_8F.5, R85.1)
+	NET_C(R85.2, R84.1, IC_7C_C.PLUS)
+	ALIAS(TIE_ON, IC_7C_C.OUT)
+	ALIAS(TIEON1, R84.1)
+	NET_C(R58.2, VM12)
+	NET_C(R58.1, R57.2, R59.1, IC_8D_D.MINUS)
+	NET_C(R59.2, IC_8D_D.OUT, R60.1, IC_8F.11)
+	NET_C(R60.2, R61.1, IC_8F.2)
+	NET_C(R86.2, R87.1, IC_8F.13)
+	NET_C(R87.2, IC_8F.8, IC_8F.12, C38.1)
+	NET_C(IC_8F.9, IC_8E.3)
+	NET_C(IC_8E.13, IC_7E_A.B)
+	NET_C(IC_7E_A.Q, IC_8E.5)
+	NET_C(IC_8E.1, IC_8E.12, IC_7E_B.B)
+	NET_C(IC_8E.8, IC_7E_B.A)
+	NET_C(IC_7E_B.Q, IC_8E.4)
+	NET_C(IC_8E.10, IC_8E.6, R73.1)
+	NET_C(SIZE.Q, IC_6C_F.A)
+	NET_C(IC_6C_F.Y, R56.1)
+	NET_C(R56.2, R73.2, C29.1)
+	NET_C(C29.2, R74.1)
+	NET_C(R74.2, R75.1, IC_8D_A.MINUS)
+	NET_C(R75.2, IC_8D_A.OUT)
+	ALIAS(NOISE, IC_8D_A.OUT)
+
+	// Explosion
+	NET_C(NOISE, R53.1)
+	NET_C(R53.2, C23.1, R52.1)
+	NET_C(R52.2, C22.1, IC_6D_C.PLUS)
+	NET_C(R50.2, R49.1, IC_6D_C.MINUS)
+	NET_C(C23.2, R50.1, R51.1, R54.1, IC_6D_C.OUT)
+	NET_C(R51.2, C21.1)
+	ALIAS(RUMBLE_2, C21.1)
+	NET_C(C21.2, C22.2, R49.2, C27.2, R55.2, C26.2, GND)
+	NET_C(R54.2, R55.1, C34.1)
+	NET_C(C34.2, IC_7D.1)
+	NET_C(SEXPLO.Q, IC_6C_C.A)
+	NET_C(IC_6C_C.Y, R40.1)
+	NET_C(R40.2, C27.1, R63.1)
+	NET_C(R63.2, R62.2, IC_8D_C.PLUS)
+	NET_C(R62.1, V5)
+	NET_C(IC_8D_C.MINUS, IC_8D_C.OUT, IC_7D.2)
+	NET_C(IC_7D.6, C26.1)
+	NET_C(IC_7D.7, C25.1)
+	ALIAS(EXPLO, C25.2)
+
+	// Tracking Computer
+	NET_C(SCANNER.Q, IC_5B_A.RESET)
+	NET_C(V5, R24.1, R70.1, R13.1, R27.1)
+	NET_C(GND, C15.2, R26.2, C20.2, C11.2, C7.2, C12.2, R29.2)
+	NET_C(R24.2, R23.1, R12.1, IC_6A.5, IC_5B_A.DISCH)
+	NET_C(R23.2, C15.1, IC_5B_A.THRESH, IC_5B_A.TRIG)
+	NET_C(OHEAT.Q, IC_6C_B.A)
+	NET_C(IC_6C_B.Y, R38.1)
+	NET_C(R38.2, C20.1, R69.1)
+	NET_C(R69.2, R70.2, IC_6D_A.PLUS)
+	NET_C(IC_6D_A.MINUS, IC_6D_A.OUT, IC_6B.2)
+	NET_C(IC_5B_A.OUT, R25.1)
+	NET_C(R25.2, C9.1, R26.1)
+	NET_C(C9.2, IC_6B.1)
+	NET_C(IC_6B.6, C11.1)
+	NET_C(IC_6B.7, C10.1)
+	ALIAS(LOH, C10.2)
+	NET_C(R13.2, R14.1, IC_6A.1)
+	NET_C(R14.2, C7.1, IC_6A.2, IC_6A.6)
+	NET_C(LOCK.Q, IC_6A.4)
+	NET_C(R12.2, IC_6A.11)
+	NET_C(R27.2, R28.1, IC_6A.13)
+	NET_C(R28.2, C12.1, IC_6A.12, IC_6A.8)
+	NET_C(TRACK.Q, IC_6A.10)
+	NET_C(IC_6A.9, C13.1)
+	NET_C(C13.2, R30.1)
+	NET_C(R30.2, R29.1)
+	ALIAS(COMPUTER, R30.2)
+
+	// Laser
+	NET_C(SIZE.Q, IC_6C_D.A)
+	NET_C(IC_6C_D.Y, R41.1)
+	NET_C(R41.2, R78.2, R79.1, Q1.B)
+	NET_C(V1_2, IC_7C_B.MINUS) // HACK: +12V is actually fed into this pin per the schematic, but it relies on LM324 abuse.
+	NET_C(V12, R78.1, R77.1, R37.1, IC_7E_D.B, R89.1, R90.1)
+	NET_C(GND, R79.2, C32.2, R48.2, R81.2, R67.2, IC_6D_B.PLUS)
+	NET_C(R77.2, Q1.E)
+	NET_C(Q1.C, C32.1, IC_6E_A.DISCH, IC_6D_D.PLUS)
+	NET_C(SLASER.Q, IC_6C_A.A)
+	NET_C(IC_6C_A.Y, R37.2, IC_7E_D.A)
+	NET_C(IC_7E_D.Q, IC_6E_A.TRIG, IC_6E_A.RESET)
+	NET_C(IC_6E_A.OUT, R80.1)
+	NET_C(R80.2, R81.1, IC_7C_B.PLUS)
+	ALIAS(LASERON1, R80.2)
+	ALIAS(LASER_ON, IC_7C_B.OUT)
+	NET_C(R48.1, R47.1, R46.1, IC_6D_D.MINUS)
+	NET_C(VM12, R47.2, C39.2)
+	NET_C(R46.2, IC_6D_D.OUT, R68.1, IC_6F.8)
+	NET_C(R68.2, R67.1, IC_6E_A.THRESH)
+	NET_C(C39.1, IC_6F.10)
+	NET_C(R89.2, IC_6F.4)
+	NET_C(R90.2, IC_6F.5)
+	NET_C(IC_6F.3, R72.1)
+	NET_C(R72.2, R71.1, IC_6D_B.MINUS)
+	NET_C(R71.2, IC_6D_B.OUT)
+	ALIAS(LASER, R71.2)
+
+	// Mixer
+	NET_C(V5, R45.1, R42.2)
+	NET_C(R45.2, R44.1, IC_7C_A.MINUS, IC_7C_D.MINUS)
+	NET_C(GND, R44.2, C18.2, R43.2)
+	NET_C(SIZE.Q, R42.1, D3.A)
+	NET_C(D3.K, C18.1, R43.1, IC_7C_D.PLUS)
+
+	NET_C(TRACK.Q, IC_7C_A.PLUS)
+	NET_C(IC_7C_A.OUT, IC_7B.13)
+	NET_C(COMPUTER, IC_7B.1)
+	NET_C(IC_7B.2, R16.1, R16.2)
+
+	NET_C(LASER, IC_7B.11)
+	NET_C(LASER_ON, IC_7B.12)
+	NET_C(IC_7B.10, R18.1, R18.2)
+
+	NET_C(NOISE, IC_7B.4)
+	NET_C(TIE_ON, IC_7B.5)
+	NET_C(IC_7B.3, R17.1, R17.2)
+
+	NET_C(RUMBLE_2, IC_7B.8)
+	NET_C(IC_7C_D.OUT, IC_7B.6)
+	NET_C(IC_7B.9, R19.1, R19.2)
+
+	NET_C(EXPLO, R20.1, R20.2)
+
+	NET_C(LOH, R15.1, R15.2)
+
+	NET_C(R16.3, R18.3, R17.3, R19.3, R20.3, R15.3, R64.1, IC_8D_B.MINUS)
+	NET_C(GND, IC_8D_B.PLUS)
+	NET_C(R64.2, R21.3, IC_8D_B.OUT)
+	NET_C(R21.1, R31.2, GND)
+	NET_C(R21.2, C14.1)
+	NET_C(C14.2, R31.1)
+	ALIAS(OUTPUT, R31.1)
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_starfire.h mame-0.224+dfsg.1/src/mame/audio/nl_starfire.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_starfire.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_starfire.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+#ifndef MAME_AUDIO_NL_STARFIRE_H
+#define MAME_AUDIO_NL_STARFIRE_H
+
+#pragma once
+
+NETLIST_EXTERNAL(starfire)
+
+#endif // MAME_AUDIO_NL_STARFIRE_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_starhawk.cpp mame-0.224+dfsg.1/src/mame/audio/nl_starhawk.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_starhawk.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_starhawk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,640 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Star Hawk
+//
+// Derived from the schematics in the Star Hawk manual.
+//
+// Special thanks to:
+//    * Jay Gallagher for verifying PCB components
+//
+// Known problems/issues:
+//
+//    * The VCOs require high solver frequencies (100x+) to reach the
+//       correct pitches. For this reason, HLE'ed versions are
+//       provided that work correctly even at 48kHz.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_cinemat_common.h"
+
+
+//
+// Optimizations
+//
+
+#define HLE_SHIP_VCO (1)
+#define HLE_LAZER_VCOS (1)
+
+
+//
+// Debugging/test - should be off for release
+//
+
+#define SLOW_SHIP_WOBBLE (0)
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(starhawk)
+
+#if (HLE_LAZER_VCOS && HLE_SHIP_VCO)
+	SOLVER(Solver, 1000)
+#else
+	SOLVER(Solver, 48000000)
+#endif
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	TTL_INPUT(I_OUT_0, 0)               // active high
+	TTL_INPUT(I_OUT_1, 0)               // active high
+	TTL_INPUT(I_OUT_2, 0)               // active high
+	TTL_INPUT(I_OUT_3, 0)               // active high
+	TTL_INPUT(I_OUT_4, 0)               // active high
+	TTL_INPUT(I_OUT_7, 0)               // active high
+
+	NET_C(GND, I_OUT_0.GND, I_OUT_1.GND, I_OUT_2.GND, I_OUT_3.GND, I_OUT_4.GND, I_OUT_7.GND)
+	NET_C(I_V5, I_OUT_0.VCC, I_OUT_1.VCC, I_OUT_2.VCC, I_OUT_3.VCC, I_OUT_4.VCC, I_OUT_7.VCC)
+
+	CINEMAT_LOCAL_MODELS
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V15, 15)
+	ANALOG_INPUT(I_VM15, -15)
+
+	RES(R1, RES_K(10))
+	RES(R2, RES_K(10))
+	RES(R3, RES_K(20))
+	RES(R4, RES_K(10))
+	RES(R5, RES_K(1))
+	RES(R6, RES_K(150))
+	RES(R7, 330)
+	RES(R8, RES_K(10))
+	RES(R9, RES_K(47))
+	RES(R10, RES_K(150))
+	RES(R11, RES_K(100))
+	RES(R12, RES_K(47))
+	RES(R13, RES_K(10))
+	RES(R14, RES_K(2.7))
+	RES(R15, RES_K(2.7))
+	RES(R16, RES_K(30))
+	RES(R17, RES_K(510))
+	RES(R18, RES_K(10))
+	RES(R19, RES_K(33))
+//  RES(R20, 150)       -- part of final amp (not emulated)
+//  RES(R21, RES_K(22)) -- part of final amp (not emulated)
+	RES(R22, RES_K(1))
+//  RES(R23, RES_K(10)) -- part of final amp (not emulated)
+//  RES(R24, 150)       -- part of final amp (not emulated)
+//  POT(R25, RES_K(100))-- part of final amp (not emulated)
+	RES(R26, RES_K(1))
+	RES(R27, RES_K(1))
+	RES(R28, RES_K(510))
+	RES(R29, RES_K(10))     // PCB verified
+//  RES(R30, ???)
+	RES(R31, RES_K(47))     // PCB verified
+	RES(R32, RES_M(3.3))    // PCB verified
+	RES(R33, RES_M(1))
+	RES(R34, RES_K(47))
+	RES(R35, RES_M(1))
+	RES(R36, RES_M(1))
+	RES(R37, RES_M(1))
+	RES(R38, RES_M(1))
+	RES(R39, 150)
+	RES(R40, RES_K(10))
+	RES(R41, RES_K(20))
+	RES(R42, RES_K(1))
+	RES(R43, RES_M(1))
+	RES(R44, RES_K(10))
+	RES(R45, RES_K(10))
+	RES(R46, 150)
+	RES(R47, RES_K(20))
+	RES(R48, RES_M(1))
+	RES(R49, RES_K(10))
+	RES(R50, RES_K(1))
+	RES(R51, RES_K(10))
+	RES(R52, RES_K(20))
+	RES(R53, RES_K(39))
+	RES(R54, RES_K(82))
+	RES(R55, RES_K(2.2))
+	RES(R56, RES_K(1))
+	RES(R57, RES_K(10))
+	RES(R58, RES_K(20))
+	RES(R59, RES_K(39))
+	RES(R60, RES_K(82))
+
+//  CAP(C1, CAP_U(2.2))
+//  CAP(C2, CAP_U(2.2))
+//  CAP(C3, CAP_U(3.3))
+//  CAP(C4, CAP_U(3.3))
+	CAP(C5, CAP_P(100))
+	CAP(C6, CAP_U(3.3))
+	CAP(C7, CAP_U(0.01))
+	CAP(C8, CAP_U(1))
+	CAP(C9, CAP_U(0.022))
+	CAP(C10, CAP_U(0.15))       // 15?
+	CAP(C11, CAP_U(0.15))
+	CAP(C12, CAP_U(15))
+	CAP(C13, CAP_U(0.0033))
+	CAP(C14, CAP_U(0.0047))
+	CAP(C15, CAP_U(1))
+//  CAP(C16, CAP_P(470))    -- part of final amp (not emulated)
+	CAP(C17, CAP_U(22))
+//  CAP(C18, CAP_P(470))    -- part of final amp (not emulated)
+//  CAP(C19, CAP_P(470))    -- part of final amp (not emulated)
+	CAP(C20, CAP_U(1))
+#if (SLOW_SHIP_WOBBLE)
+	CAP(C21, CAP_U(22))     // discovered by accident, makes HLE analysis easier
+#else
+	CAP(C21, CAP_U(0.22))   // PCB verified
+#endif
+	CAP(C22, CAP_U(0.1))
+	CAP(C23, CAP_U(0.0027))
+	CAP(C24, CAP_U(0.1))
+	CAP(C25, CAP_U(0.0027))
+	CAP(C26, CAP_U(1))
+	CAP(C27, CAP_U(0.1))
+//  CAP(C39, CAP_U(1))
+//  CAP(C40, CAP_U(1))
+
+	D_1N914(CR1)
+	D_1N914(CR2)
+	D_1N914(CR3)
+	D_1N914(CR4)
+	D_1N914(CR5)
+	D_1N914(CR6)
+	D_1N914(CR7)
+	D_1N914(CR8)
+	D_1N914(CR9)
+	D_1N914(CR10)
+
+	Q_2N3906(Q1)            // PNP
+//  Q_2N6292(Q2)            // NPN -- part of final amp (not emulated)
+//  Q_2N6107(Q3)            // PNP -- part of final amp (not emulated)
+#if (!HLE_LAZER_VCOS)
+	Q_2N3904(Q4)            // NPN
+	Q_2N3904(Q5)            // NPN
+#endif
+
+	TL182_DIP(IC3A)         // Analog switch
+	NET_C(IC3A.6, I_V15)
+	NET_C(IC3A.7, I_V5)
+	NET_C(IC3A.8, GND)
+	NET_C(IC3A.9, I_VM15)
+
+//  TTL_7815_DIP(IC2D)      // +15V Regulator -- not needed
+//  TTL_7915_DIP(IC2C)      // -15V Regulator -- not needed
+
+	TL081_DIP(IC4A)         // Op. Amp.
+	NET_C(IC4A.4, I_VM15)
+	NET_C(IC4A.7, I_V15)
+
+	TL081_DIP(IC4B)         // Op. Amp.
+	NET_C(IC4B.4, I_VM15)
+	NET_C(IC4B.7, I_V15)
+
+//  TL081_DIP(IC4C)         // Op. Amp. -- part of final amp (not emulated)
+//  NET_C(IC4C.4, I_VM15)
+//  NET_C(IC4C.7, I_V15)
+
+	TTL_74LS393_DIP(IC4E)   // Dual 4-Stage Binary Counter
+	NET_C(IC4E.7, GND)
+	NET_C(IC4E.14, I_V5)
+
+	TL081_DIP(IC5A)         // Op. Amp.
+	NET_C(IC5A.4, I_VM15)
+	NET_C(IC5A.7, I_V15)
+
+	TL081_DIP(IC5B)         // Op. Amp.
+	NET_C(IC5B.4, I_VM15)
+	NET_C(IC5B.7, I_V15)
+
+	LM556_DIP(IC5D)
+
+	PROM_74S287_DIP(IC5E)   // 1024-bit PROM -- dump needed
+	PARAM(IC5E.A.ROM, "2085.5e8e")
+	NET_C(IC5E.8, GND)
+	NET_C(IC5E.16, I_V5)
+
+	CA3080_DIP(IC6A)        // Trnscndt. Op. Amp.
+	NET_C(IC6A.7, I_V15)
+	NET_C(IC6A.4, I_VM15)
+
+	TL081_DIP(IC6B)         // Op. Amp.
+	NET_C(IC6B.4, I_VM15)
+	NET_C(IC6B.7, I_V15)
+
+	TTL_74LS04_DIP(IC6C)    // Hex Inverting Gates
+	NET_C(IC6C.7, GND)
+	NET_C(IC6C.14, I_V5)
+
+	LM556_DIP(IC6D)
+
+	TL081_DIP(IC6E)         // Op. Amp.
+	NET_C(IC6E.4, I_VM15)
+	NET_C(IC6E.7, I_V15)
+
+	TL081_DIP(IC6F)         // Op. Amp.
+	NET_C(IC6F.4, I_VM15)
+	NET_C(IC6F.7, I_V15)
+
+	TTL_7406_DIP(IC7C)      // Hex inverter -- currently using a clone of 7416, no open collector behavior
+	NET_C(IC7C.7, GND)
+	NET_C(IC7C.14, I_V5)
+
+	TTL_74LS393_DIP(IC7E)   // Dual 4-Stage Binary Counter
+	NET_C(IC7E.7, GND)
+	NET_C(IC7E.14, I_V5)
+
+	TTL_74LS164_DIP(IC8C)   // 8-bit Shift Reg.
+	NET_C(IC8C.7, GND)
+	NET_C(IC8C.14, I_V5)
+
+	TTL_74LS164_DIP(IC8D)   // 8-bit Shift Reg.
+	NET_C(IC8D.7, GND)
+	NET_C(IC8D.14, I_V5)
+
+	PROM_74S287_DIP(IC8E)   // 1024-bit PROM -- dump needed
+	PARAM(IC8E.A.ROM, "2085.5e8e")
+	NET_C(IC8E.8, GND)
+	NET_C(IC8E.16, I_V5)
+
+	TTL_74LS164_DIP(IC9C)   // 8-bit Shift Reg.
+	NET_C(IC9C.7, GND)
+	NET_C(IC9C.14, I_V5)
+
+	TTL_74LS164_DIP(IC9D)   // 8-bit Shift Reg.
+	NET_C(IC9D.7, GND)
+	NET_C(IC9D.14, I_V5)
+
+	TTL_74LS163_DIP(IC9E)   // Binary Counter (schems say can sub a 74161)
+	NET_C(IC9E.8, GND)
+	NET_C(IC9E.16, I_V5)
+
+	TTL_74LS86_DIP(IC10C)   // Quad 2-Input XOR Gates
+	NET_C(IC10C.7, GND)
+	NET_C(IC10C.14, I_V5)
+
+	TTL_74LS21_DIP(IC10D)   // Dual 4-Input AND Gates
+	NET_C(IC10D.7, GND)
+	NET_C(IC10D.14, I_V5)
+
+	TTL_74LS393_DIP(IC10E)  // Dual 4-Stage Binary Counter
+	NET_C(IC10E.7, GND)
+	NET_C(IC10E.14, I_V5)
+
+	//
+	// Top-left noise generator
+	//
+
+	NET_C(I_V5, R1.2, IC6D.14, IC6D.4, R3.2)
+	NET_C(R1.1, IC6D.1, R2.2)
+	NET_C(R2.1, IC6D.2, IC6D.6, C7.2)
+	NET_C(C7.1, GND)
+	NET_C(IC6D.7, GND)
+	NET_C(IC6D.3, C8.1, R3.1, R4.1)
+	NET_C(C8.2, GND)
+	NET_C(R4.2, IC8D.4)
+	NET_C(IC6D.5, IC8D.8, IC9D.8, IC10E.1, IC9E.2)
+
+	NET_C(IC9E.9, IC9E.7, IC9E.10, I_V5)
+	NET_C(IC9E.1, I_V5)
+	NET_C(IC9E.15, IC10E.13, IC8C.8, IC9C.8)
+
+	NET_C(IC10E.2, IC8D.3)
+	NET_C(IC10E.3, IC10D.1)
+	NET_C(IC10E.4, IC10D.2)
+	NET_C(IC10E.5, IC10D.4)
+	NET_C(IC10E.6, IC10D.5)
+
+	NET_C(IC10D.6, IC10C.5)
+	NET_C(IC10C.4, IC10C.11)
+	NET_C(IC10C.6, IC8D.1, IC8D.2)
+
+	NET_C(IC8D.9, I_V5)
+	NET_C(IC8D.13, IC9D.1, IC9D.2)
+	NET_C(IC9D.10, IC10C.13)
+	NET_C(IC9D.12, IC10C.12)
+	NET_C(IC9D.13, R8.2)
+	NET_C(IC9D.9, I_V5)
+
+	NET_C(R8.1, C10.2, R9.1)
+	NET_C(C10.1, GND)
+	NET_C(R9.2, CR1.K, CR2.A)
+
+	NET_C(IC10E.12, IC8C.3)
+	NET_C(IC10E.8, IC10D.9)
+	NET_C(IC10E.9, IC10D.10)
+	NET_C(IC10E.10, IC10D.12)
+	NET_C(IC10E.11, IC10D.13)
+
+	NET_C(IC10D.8, IC10C.1)
+	NET_C(IC10C.2, IC10C.8)
+	NET_C(IC10C.3, IC8C.1, IC8C.2)
+
+	NET_C(IC8C.9, I_V5)
+	NET_C(IC8C.13, IC9C.1, IC9C.2)
+	NET_C(IC9C.10, IC10C.10)
+	NET_C(IC9C.12, IC10C.9)
+	NET_C(IC9C.13, R10.1)
+	NET_C(IC9C.9, I_V5)
+
+	NET_C(R10.2, C11.2, R11.1)
+	NET_C(C11.1, GND)
+	NET_C(R11.2, CR2.K, CR1.A, C12.1)
+
+	NET_C(C12.2, IC6B.2, R12.1, C13.1)
+	NET_C(IC6B.3, GND)
+	NET_C(IC6B.6, C13.2, R12.2, R13.1)
+	NET_C(R13.2, C15.1)
+	NET_C(C15.2, R14.2, IC6A.2)
+	NET_C(R14.1, GND)
+	NET_C(IC6A.3, R15.2)
+	NET_C(R15.1, GND)
+	NET_C(IC6A.5, R16.2)
+
+	//
+	// Explosion
+	//
+
+	NET_C(I_OUT_0, IC6C.11)
+	NET_C(IC6C.10, R5.1)
+	NET_C(R5.2, C5.2, IC6D.8)
+	NET_C(C5.1, GND)
+	NET_C(IC6D.10, R6.2, I_V5)
+	NET_C(IC6D.12, IC6D.13, R6.1, C6.1)
+	NET_C(C6.2, GND)
+	NET_C(IC6D.9, Q1.E)
+	NET_C(Q1.B, R7.2)
+	NET_C(R7.1, GND)
+	NET_C(Q1.C, R17.2, C17.1, R16.1)
+	NET_C(R17.1, GND)
+	NET_C(C17.2, I_VM15)
+
+	//
+	// On/off switches
+	//
+
+	NET_C(I_OUT_3, IC3A.5, IC6C.3)
+	NET_C(I_OUT_4, IC3A.10)
+
+	NET_C(IC3A.1, IC4A.2, R18.1, C14.1)
+	NET_C(IC4A.3, GND)
+	NET_C(C14.2, R18.2, IC4A.6, R19.1)
+	NET_C(R19.2, IC3A.14, IC6A.6)
+
+#if (HLE_SHIP_VCO)
+	//
+	// This VCO is tricky to simulate, as there is both a frequency aspect
+	// and an envelope aspect. The frequency is relatively straightforward.
+	// Pick up the voltage from the anode of CR4 and map to a frequency
+	// with a polynominal derived from the LLE implementation.
+	//
+	// Here is the mapping I get for CR4.A vs. IC3A.5 (using a -0.1-0.1 threshold):
+	//    R2 = 0.99832: HP = (-0.000160539*A0) + 0.0000331984
+	//    R2 = 0.99927: HP = (0.00000397232*A0*A0) - (0.000129210*A0) + 0.000083240
+	//    R2 = 0.99927: HP = (-0.000000185528*A0*A0*A0) + (0.00000154157*A0*A0) - (0.000138889*A0) + 0.000071961
+	//    R2 = 0.99929: HP = (-0.000000215021*A0*A0*A0*A0) - (0.00000393775*A0*A0*A0) - (0.0000213646*A0*A0) - (0.000196307*A0) + 0.0000221998
+	//    R2 = 0.99931: HP = (0.000000153378*A0*A0*A0*A0*A0) + (0.00000317059*A0*A0*A0*A0) + (0.0000244935*A0*A0*A0) + (0.000091436*A0*A0) + (0.0000138241*A0) + 0.000169151
+	//
+	VARCLOCK(SHIPCLK, 1, "max(0.000001,min(0.1,(0.00000397232*A0*A0) - (0.000129210*A0) + 0.000083240))")
+	NET_C(SHIPCLK.GND, GND)
+	NET_C(SHIPCLK.VCC, I_V5)
+	NET_C(SHIPCLK.A0, CR4.A)
+	//
+	// The envelope is trickier. When the signal is OFF (3A pin 5 is HIGH),
+	// the envelope tracks the voltage from CR4. When the signal is ON
+	// (3A pin 5 is LOW), the raw clock from SHIPCLK is clamped to -1..1
+	// and scaled down by a constant factor with a small additional
+	// envelope from the CR4 anode voltage.
+	//
+	AFUNC(SHIPENV, 3, "if(A2>2.5, -A1, (0.07-(0.005*A1))*if(A0>2.5,1,-1))")
+	NET_C(SHIPENV.A0, SHIPCLK.Q)
+	NET_C(SHIPENV.A1, CR4.A)
+	NET_C(SHIPENV.A2, IC3A.5)
+	NET_C(SHIPENV.Q, IC3A.2)
+	NET_C(R34.2, R35.1)
+	NET_C(R35.2, CR4.K)
+	NET_C(R36.1, IC5B.6, R38.2, CR4.A)
+	NET_C(GND, R34.1, R36.2, R37.1, R37.2, C9.1, C9.2, CR5.A, CR5.K, IC4B.2, IC4B.3, IC5A.2, IC5A.3)
+#else
+	NET_C(IC3A.2, C9.2)
+	NET_C(C9.1, IC4B.2, R34.1)
+	NET_C(IC4B.6, R34.2, R35.1)
+	NET_C(IC4B.3, R35.2, CR4.K, CR5.A)
+	NET_C(R36.1, IC5B.6, R38.2, CR4.A)
+	NET_C(R36.2, IC5A.2, R37.1)
+	NET_C(IC5A.3, GND)
+	NET_C(R37.2, IC5A.6, CR5.K)
+#endif
+
+	NET_C(IC3A.13, R22.1)
+	NET_C(R22.2, GND)
+	ALIAS(OUTPUT, R22.1)
+
+	//
+	// K exit
+	//
+
+	NET_C(I_OUT_7, IC7C.1)
+	NET_C(IC7C.2, R27.1, CR6.A)
+	NET_C(R27.2, I_V5)
+
+	NET_C(IC6C.4, IC7C.11)
+	NET_C(IC7C.10, CR3.A, R26.1)
+	NET_C(R26.2, I_V15, IC5D.14, IC5D.4, R29.2)
+	NET_C(CR3.K, R28.2)
+	NET_C(R28.1, CR6.K, C20.1, R33.1)
+	NET_C(C20.2, GND)
+	NET_C(R33.2, C27.1, R38.1, IC5B.2)
+	NET_C(IC5D.1, R29.1, R31.2)
+	NET_C(IC5D.2, IC5D.6, R31.1, R32.1, C21.1)
+	NET_C(R32.2, C27.2)
+	NET_C(C21.2, GND)
+	NET_C(IC5B.3, GND)
+	NET_C(IC5D.7, GND)
+
+	// pin 5 (OUTPUT) of the 555 timer is not connected;
+	// use this kludge to simulate that
+	RES(RDUMMY, RES_K(100))
+	NET_C(IC5D.5, RDUMMY.1)
+	NET_C(RDUMMY.2, GND)
+
+	//
+	// Lazer 1
+	//
+
+	NET_C(I_OUT_1, IC6C.5)
+	NET_C(IC6C.6, IC8E.14, IC7C.9)
+	NET_C(IC7C.8, R39.1)
+	NET_C(R39.2, C22.2, CR7.K)
+	NET_C(C22.1, GND)
+
+#if (HLE_LAZER_VCOS)
+	//
+	// This VCO is very difficult to simulate without cranking the speed up
+	// and killing performance. Even at 1000x frequency, we still get failures
+	// to converge. Here we clip the circuit at the diode CR7 and substitute
+	// a VARCLOCK that directly drives the counter at 7E, skipping the analog
+	// to TTL conversion logic after the VCO.
+	//
+	// Here is the mapping I get for C22.2 vs. IC7E.1 half-period:
+	//
+	//    R2 = 0.97399: HP = (0.00000249069*A0) + 0.00000439991
+	//    R2 = 0.99638: HP = (0.000000142614*A0*A0) + (0.00000104196*A0) + 0.00000471406
+	//    R2 = 0.99932: HP = (0.0000000174880*A0*A0*A0) - (0.000000159311*A0*A0) + (0.00000222025*A0) + 0.00000455815
+	//    R2 = 0.99978: HP = (0.00000000229608*A0*A0*A0*A0) - (0.0000000377974*A0*A0*A0) + (0.000000245492*A0*A0) + (0.00000134883*A0) + 0.00000465357
+	//    R2 = 0.99985: HP = (0.000000000286259*A0*A0*A0*A0*A0) - (0.00000000650969*A0*A0*A0*A0) + (0.0000000560876*A0*A0*A0) - (0.000000154720*A0*A0) + (0.00000190838*A0) + 0.0000045976
+	//
+	// One additional wrinkle is that when we clip the circuit, the voltage
+	// input to the VCO changes from a curve to linear, so to compute the
+	// mapping below, we had to map the C22.2 value from the clipped circuit
+	// against the frequency. Fortunately, the relationship still held, and
+	// in fact became almost linear.
+	//
+	// Here is the mapping for the clipped C22.2 vs. the original IC7E.1:
+	//    R2 = 0.99947: HP = (0.000226684*A0) - 0.0000178774
+	//    R2 = 0.99947: HP = (-0.0000111790*A0*A0) + (0.000230333*A0) - 0.0000181329
+	//    R2 = 0.99958: HP = (-0.00124814*A0*A0*A0) + (0.000641071*A0*A0) + (0.000124020*A0) - 0.0000127688
+	//    R2 = 0.99976: HP = (0.0197918*A0*A0*A0*A0) - (0.0148601*A0*A0*A0) + (0.00399181*A0*A0) - (0.000225308*A0) + 0.000000287255
+	//    R2 = 0.99979: HP = (-0.095062*A0*A0*A0*A0*A0) + (0.093556*A0*A0*A0*A0) - (0.0361209*A0*A0*A0) + (0.00677578*A0*A0) - (0.000384926*A0) + 0.00000324102
+	//
+	VARCLOCK(LAZER1CLK, 1, "max(0.000001,min(0.1,(0.000226684*A0) - 0.0000178774))")
+	NET_C(LAZER1CLK.GND, GND)
+	NET_C(LAZER1CLK.VCC, I_V5)
+	NET_C(LAZER1CLK.Q, IC7E.1)
+	NET_C(LAZER1CLK.A0, C22.2)
+	NET_C(GND, R40.1, R40.2, R41.1, R41.2, R42.1, R42.2, R43.1, R43.2, R44.1, R44.2, C23.1, C23.2, CR7.A, CR8.A, CR8.K, IC6C.9, IC6F.2, IC6F.3)
+#else
+	NET_C(CR7.A, IC6F.3, CR8.K, R43.1)
+	NET_C(CR8.A, GND)
+	NET_C(IC6F.2, C23.2, R40.1)
+	NET_C(C23.1, GND)
+	NET_C(IC6F.6, R40.2, R43.2, R41.1)
+	NET_C(R41.2, R44.2, Q4.B)
+	NET_C(R44.1, GND)
+	NET_C(Q4.E, GND)
+	NET_C(Q4.C, R42.1, IC6C.9)
+	NET_C(R42.2, I_V5)
+	NET_C(IC6C.8, IC7E.1)
+#endif
+
+	NET_C(IC7E.2, IC7E.12, GND)
+	NET_C(IC7E.3, IC8E.7)
+	NET_C(IC7E.4, IC8E.4)
+	NET_C(IC7E.5, IC8E.6)
+	NET_C(IC7E.6, IC8E.5, IC7E.13)
+	NET_C(IC7E.8, IC8E.15)
+	NET_C(IC7E.10, IC8E.2)
+	NET_C(IC7E.11, IC8E.3)
+
+	NET_C(IC8E.1, GND)
+	NET_C(IC8E.13, GND)
+	NET_C(IC8E.12, R51.1)
+	NET_C(IC8E.11, R52.1)
+	NET_C(IC8E.10, R53.1)
+	NET_C(IC8E.9, R54.1)
+	NET_C(R51.2, R52.2, R53.2, R54.2, R55.1, R56.2)
+	NET_C(R56.1, GND)
+	NET_C(R55.2, C26.1)
+	NET_C(C26.2, IC6A.6)
+
+	//
+	// Lazer 2
+	//
+
+	NET_C(I_OUT_2, IC6C.1)
+	NET_C(IC6C.2, IC5E.14, IC7C.13)
+	NET_C(IC7C.12, R46.1)
+	NET_C(R46.2, C24.2, CR9.K)
+	NET_C(C24.1, GND)
+
+#if (HLE_LAZER_VCOS)
+	//
+	// This VCO is identical to the one above, just using different components
+	//
+	VARCLOCK(LAZER2CLK, 1, "max(0.000001,min(0.1,(0.000226684*A0) - 0.0000178774))")
+	NET_C(LAZER2CLK.GND, GND)
+	NET_C(LAZER2CLK.VCC, I_V5)
+	NET_C(LAZER2CLK.Q, IC4E.1)
+	NET_C(LAZER2CLK.A0, C24.2)
+	NET_C(GND, R45.1, R45.2, R47.1, R47.2, R48.1, R48.2, R49.1, R49.2, R50.1, R50.2, C25.1, C25.2, CR9.A, CR10.A, CR10.K, IC6C.13, IC6E.2, IC6E.3)
+#else
+	NET_C(CR9.A, IC6E.3, CR10.K, R48.1)
+	NET_C(CR10.A, GND)
+	NET_C(IC6E.2, C25.2, R45.1)
+	NET_C(C25.1, GND)
+	NET_C(IC6E.6, R45.2, R48.2, R47.1)
+	NET_C(R47.2, R49.2, Q5.B)
+	NET_C(R49.1, GND)
+	NET_C(Q5.E, GND)
+	NET_C(Q5.C, R50.1, IC6C.13)
+	NET_C(R50.2, I_V5)
+	NET_C(IC6C.12, IC4E.1)
+#endif
+
+	NET_C(IC4E.2, IC4E.12, GND)
+	NET_C(IC4E.3, IC5E.7)
+	NET_C(IC4E.4, IC5E.4)
+	NET_C(IC4E.5, IC5E.6)
+	NET_C(IC4E.6, IC5E.5, IC4E.13)
+	NET_C(IC4E.8, IC5E.15)
+	NET_C(IC4E.10, IC5E.2)
+	NET_C(IC4E.11, IC5E.3)
+
+	NET_C(IC5E.1, GND)
+	NET_C(IC5E.13, GND)
+	NET_C(IC5E.12, R57.1)
+	NET_C(IC5E.11, R58.1)
+	NET_C(IC5E.10, R59.1)
+	NET_C(IC5E.9, R60.1)
+	NET_C(R57.2, R58.2, R59.2, R60.2, R55.1)
+
+	//
+	// Unconnected inputs
+	//
+
+	NET_C(GND, IC5D.8, IC5D.9, IC5D.10, IC5D.12, IC5D.13, IC7C.3, IC7C.5, IC9E.3, IC9E.4, IC9E.5, IC9E.6)
+
+	//
+	// Unconnected outputs
+	//
+
+	HINT(IC4E.9, NC)    // Q3
+#if (HLE_LAZER_VCOS)
+	HINT(IC6C.8, NC)    // QD
+	HINT(IC6C.12, NC)   // QF
+#endif
+	HINT(IC7C.4, NC)    // QB
+	HINT(IC7C.6, NC)    // QC
+	HINT(IC7E.9, NC)    // Q3
+	HINT(IC8C.4, NC)    // Q1
+	HINT(IC8C.5, NC)    // Q2
+	HINT(IC8C.6, NC)    // Q3
+	HINT(IC8C.10, NC)   // Q4
+	HINT(IC8C.11, NC)   // Q5
+	HINT(IC8C.12, NC)   // Q6
+	HINT(IC8D.5, NC)    // Q2
+	HINT(IC8D.6, NC)    // Q3
+	HINT(IC8D.10, NC)   // Q4
+	HINT(IC8D.11, NC)   // Q5
+	HINT(IC8D.12, NC)   // Q6
+	HINT(IC9C.3, NC)    // Q0
+	HINT(IC9C.4, NC)    // Q1
+	HINT(IC9C.5, NC)    // Q2
+	HINT(IC9C.6, NC)    // Q3
+	HINT(IC9C.11, NC)   // Q5
+	HINT(IC9D.3, NC)    // Q0
+	HINT(IC9D.4, NC)    // Q1
+	HINT(IC9D.5, NC)    // Q2
+	HINT(IC9D.6, NC)    // Q3
+	HINT(IC9D.11, NC)   // Q5
+	HINT(IC9E.11, NC)   // Q3
+	HINT(IC9E.12, NC)   // Q2
+	HINT(IC9E.13, NC)   // Q1
+	HINT(IC9E.14, NC)   // Q0
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_starhawk.h mame-0.224+dfsg.1/src/mame/audio/nl_starhawk.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_starhawk.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_starhawk.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_STARHAWK_H
+#define MAME_AUDIO_NL_STARHAWK_H
+
+#pragma once
+
+NETLIST_EXTERNAL(starhawk)
+
+#endif // MAME_AUDIO_NL_STARHAWK_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_sundance.cpp mame-0.224+dfsg.1/src/mame/audio/nl_sundance.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_sundance.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_sundance.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,482 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Sundance
+//
+// Derived from the schematics in the Sundance manual.
+//
+// Known problems/issues:
+//
+//    * The "whoosh" sound is close to correct, though there may
+//       be some missing harmonics in the HLE.
+//
+//    * The "wideband noise generator" is simulated with a generic
+//       noise source. This seems to work fine and doesn't sound
+//       too different from recordings.
+//
+//    * The pitch of the pings and bongs seems a little lower than
+//       some recordings, though it's hard to say if this is due
+//       to aging as the frequencies are controlled by 555 timers
+//       and RC networks.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_cinemat_common.h"
+
+
+//
+// Optimizations
+//
+
+#define HLE_NOISE_GEN (1)
+#define HLE_WHOOSH_MOD (1)
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(sundance)
+
+	SOLVER(Solver, 1000)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	TTL_INPUT(I_OUT_0, 1)       // active low
+	TTL_INPUT(I_OUT_1, 1)       // active low
+	TTL_INPUT(I_OUT_2, 1)       // active low
+	TTL_INPUT(I_OUT_3, 1)       // active low
+	TTL_INPUT(I_OUT_4, 1)       // active low
+	TTL_INPUT(I_OUT_7, 1)       // active low
+
+	NET_C(GND, I_OUT_0.GND, I_OUT_1.GND, I_OUT_2.GND, I_OUT_3.GND, I_OUT_4.GND, I_OUT_7.GND)
+	NET_C(I_V5, I_OUT_0.VCC, I_OUT_1.VCC, I_OUT_2.VCC, I_OUT_3.VCC, I_OUT_4.VCC, I_OUT_7.VCC)
+
+	CINEMAT_LOCAL_MODELS
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V15, 15)
+	ANALOG_INPUT(I_VM15, -15)
+
+	RES(R1, RES_M(1))
+	RES(R2, 470)
+	RES(R3, 470)
+	RES(R4, RES_K(470))
+	RES(R5, 100)
+	RES(R6, RES_K(470))
+	RES(R7, RES_K(10))
+	RES(R8, RES_M(1))
+	RES(R9, RES_K(10))
+	RES(R10, RES_K(47))
+	RES(R11, RES_K(100))
+	RES(R12, RES_K(220))
+	RES(R13, RES_M(3.3))
+	RES(R14, RES_K(390))
+	RES(R15, RES_K(56))
+	RES(R16, RES_M(1))
+	RES(R17, RES_K(100))
+	RES(R18, RES_K(10))
+	RES(R19, RES_K(3.3))
+	RES(R20, RES_K(100))
+	RES(R21, RES_K(47))
+	RES(R22, RES_K(47))
+	RES(R23, RES_K(750))
+	RES(R24, 470)
+	RES(R25, RES_K(220))
+	RES(R26, 330)
+	RES(R27, RES_K(10))
+	RES(R28, RES_K(47))
+	RES(R29, RES_K(330))
+	RES(R30, RES_K(30))
+	RES(R31, RES_K(10))
+	RES(R32, RES_K(2.7))
+	RES(R33, RES_K(2.7))
+	RES(R34, RES_K(100))
+	RES(R35, RES_K(10))
+	RES(R36, RES_K(4.7))
+	RES(R37, RES_K(8.2))
+	RES(R38, RES_K(120))
+	RES(R39, RES_M(3.3))
+	RES(R40, RES_K(39))
+	RES(R41, RES_K(2.7))
+	RES(R42, RES_K(2.7))
+	RES(R43, RES_K(47))
+	RES(R44, RES_K(8.2))
+	RES(R45, RES_K(2.7))
+	RES(R46, RES_K(2.7))
+	RES(R47, RES_M(10))
+	RES(R48, RES_M(10))
+	RES(R49, RES_K(1))
+	RES(R50, 330)
+	RES(R51, RES_K(510))
+	RES(R52, RES_K(15))
+	RES(R53, RES_K(20))
+	RES(R54, RES_K(47))
+	RES(R55, RES_K(2.7))
+	RES(R56, RES_K(2.7))
+	RES(R57, 330)
+	RES(R58, RES_K(390))
+	RES(R59, RES_K(15))
+	RES(R60, RES_K(24))
+	RES(R61, RES_K(56))
+	RES(R62, RES_K(2.7))
+	RES(R63, RES_K(2.7))
+	RES(R64, 470)
+//  RES(R65, 150)       -- part of final amp (not emulated)
+//  RES(R66, RES_K(22)) -- part of final amp (not emulated)
+//  RES(R67, 150)       -- part of final amp (not emulated)
+	RES(R68, 330)
+	RES(R69, RES_K(390))
+	RES(R70, RES_K(15))
+	RES(R71, RES_K(30))
+	RES(R72, RES_K(68))
+	RES(R73, RES_K(2.7))
+	RES(R74, RES_K(2.7))
+//  RES(R75, RES_K(10)) -- part of final amp (not emulated)
+//  POT(R76, RES_K(100)) -- part of final amp (not emulated)
+//  PARAM(R76.DIAL, 0.500000) -- part of final amp (not emulated)
+	RES(R77, 330)
+	RES(R78, RES_K(220))
+
+	CAP(C1, CAP_U(0.1))
+	CAP(C2, CAP_U(100))
+	CAP(C3, CAP_U(0.01))
+	CAP(C4, CAP_U(0.1))
+	CAP(C5, CAP_U(100))
+	CAP(C6, CAP_U(1))
+	CAP(C7, CAP_U(1))
+	CAP(C8, CAP_U(10))
+	CAP(C9, CAP_U(0.05))
+	CAP(C10, CAP_U(0.1))
+	CAP(C11, CAP_U(0.01))
+	CAP(C12, CAP_U(0.1))
+	CAP(C13, CAP_U(0.001))
+	CAP(C14, CAP_U(0.005))
+	CAP(C15, CAP_U(10))
+//  CAP(C16, CAP_U(3.3)) -- not needed
+//  CAP(C17, CAP_U(3.3)) -- not needed
+//  CAP(C18, CAP_U(3.3)) -- not needed
+//  CAP(C19, CAP_U(3.3)) -- not needed
+//  CAP(C20, CAP_U(3.3)) -- not needed
+	CAP(C21, CAP_U(0.1))
+	CAP(C22, CAP_U(0.005))
+	CAP(C23, CAP_U(0.1))
+	CAP(C24, CAP_U(0.1))
+	CAP(C25, CAP_U(0.1))
+	CAP(C26, CAP_U(0.01))
+	CAP(C27, CAP_U(0.1))
+	CAP(C28, CAP_U(0.15))
+	CAP(C29, CAP_U(0.1))
+	CAP(C30, CAP_U(0.01))
+	CAP(C31, CAP_U(0.1))
+//  CAP(C32, CAP_P(470)) -- part of final amp (not emulated)
+//  CAP(C33, CAP_P(470)) -- part of final amp (not emulated)
+//  CAP(C34, CAP_P(470)) -- part of final amp (not emulated)
+	CAP(C35, CAP_U(0.15))
+	CAP(C36, CAP_U(0.1))
+	CAP(C37, CAP_U(0.01))
+	CAP(C38, CAP_U(0.1))
+	CAP(C39, CAP_U(1))
+
+	D_1N5240(D1)
+	D_1N914(D2)
+	D_1N914(D3)
+
+	Q_2N3904(Q1)            // NPN
+	Q_2N3904(Q2)            // NPN
+	Q_2N3906(Q3)            // PNP
+	Q_2N3906(Q4)            // PNP
+	Q_2N3906(Q5)            // PNP
+	Q_2N3906(Q6)            // PNP
+//  Q_2N6292(Q7)            // NPN -- part of final amp (not emulated)
+//  Q_2N6107(Q9)            // PNP -- part of final amp (not emulated)
+	Q_2N3906(Q8)            // PNP
+	Q_2N3906(Q10)           // PNP
+
+	TL081_DIP(IC1)          // Op. Amp.
+//  NET_C(IC1.7, I_V15)     // (indirectly via R5)
+	NET_C(IC1.4, I_VM15)
+
+	TL081_DIP(IC2)          // Op. Amp.
+	NET_C(IC2.7, I_V15)
+	NET_C(IC2.4, I_VM15)
+
+	TL081_DIP(IC3)          // Op. Amp.
+	NET_C(IC3.7, I_V15)
+	NET_C(IC3.4, I_VM15)
+
+	LM3900_DIP(IC4)
+	NET_C(IC4.7, GND)
+	NET_C(IC4.14, I_V15)
+
+//  TTL_7815_DIP(IC5)       // +15V Regulator -- not needed
+//  TTL_7915_DIP(IC6)       // -15V Regulator -- not needed
+
+	LM555_DIP(IC7)
+
+	TL081_DIP(IC8)          // Op. Amp.
+	NET_C(IC8.7, I_V15)
+	NET_C(IC8.4, I_VM15)
+
+	CA3080_DIP(IC9)
+	NET_C(IC9.7, I_V15)
+	NET_C(IC9.4, I_VM15)
+
+	CA3080_DIP(IC10)
+	NET_C(IC10.7, I_V15)
+	NET_C(IC10.4, I_VM15)
+
+	LM555_DIP(IC11)
+
+	CA3080_DIP(IC12)
+	NET_C(IC12.7, I_V15)
+	NET_C(IC12.4, I_VM15)
+
+	TTL_74LS125_DIP(IC13)   // Quad 3-state buffer
+	NET_C(IC13.7, GND)
+	NET_C(IC13.14, I_V5)
+
+	LM555_DIP(IC14)
+
+	LM555_DIP(IC15)
+
+	LM555_DIP(IC16)
+
+	CA3080_DIP(IC17)
+	NET_C(IC17.7, I_V15)
+	NET_C(IC17.4, I_VM15)
+
+	CA3080_DIP(IC18)
+	NET_C(IC18.7, I_V15)
+	NET_C(IC18.4, I_VM15)
+
+	CA3080_DIP(IC19)
+	NET_C(IC19.7, I_V15)
+	NET_C(IC19.4, I_VM15)
+
+	TL081_DIP(IC20)         // Op. Amp.
+	NET_C(IC20.7, I_V15)
+	NET_C(IC20.4, I_VM15)
+
+#if (HLE_NOISE_GEN)
+	//
+	// The "wideband noise gen" relies on properties
+	// of the components to create noise. Not only
+	// does this simulate poorly, but it would be too
+	// slow for realtime, so HLE it with some quality
+	// noise.
+	//
+	// Note that Tail Gunner has the exact same
+	// circuit.
+	//
+	CLOCK(NOISE_CLOCK, 10000)
+	NET_C(NOISE_CLOCK.GND, GND)
+	NET_C(NOISE_CLOCK.VCC, I_V5)
+
+	SYS_NOISE_MT_U(NOISE, 3)
+	NET_C(NOISE.I, NOISE_CLOCK.Q)
+	NET_C(NOISE.1, GND)
+	NET_C(NOISE.2, R27.2, R36.1, R43.1)
+
+	NET_C(GND, C1.1, C1.2, C2.1, C2.2, C3.1, C3.2, C4.1, C4.2, C5.1, C5.2)
+	NET_C(GND, D1.A, D1.K, D2.A, D2.K, D3.A, D3.K)
+	NET_C(GND, R1.1, R1.2, R3.1, R3.2, R4.1, R4.2, R5.1, R5.2, R6.1, R6.2, R7.1, R7.2, R8.1, R8.2, R9.1, R9.2, R10.1, R10.2)
+	NET_C(GND, IC1.2, IC1.3, IC1.7, IC2.2, IC2.3, IC3.2, IC3.3)
+#else
+	NET_C(C1.1, C2.2, R1.1, R3.1, C5.2, GND)
+	NET_C(C1.2, C2.1, D1.K, R5.1, IC1.7)
+	NET_C(R1.2, C3.1, D1.A)
+	NET_C(R3.2, R4.1, C4.1)
+	NET_C(R4.2, C3.2, IC1.3)
+	NET_C(C4.2, IC1.2, R6.1)
+	NET_C(R6.2, IC1.6, R7.1)
+	NET_C(R5.2, C5.1, I_V15)
+	NET_C(R7.2, IC2.2, R8.1, D3.A, D2.K)
+	NET_C(IC2.3, GND)
+	NET_C(IC2.6, R8.2, D3.K, D2.A, R9.1)
+	NET_C(R9.2, R10.1, IC3.2)
+	NET_C(IC3.3, GND)
+	NET_C(IC3.6, R10.2, R43.1, R27.2, R36.1)
+#endif
+
+	NET_C(I_OUT_1, R2.1, IC11.2)
+	NET_C(R2.2, I_V5)
+	NET_C(IC11.8, IC11.4, I_V5)     // -- IC11.4 not documented
+	NET_C(IC11.3, R35.1)
+	NET_C(IC11.1, GND)
+	NET_C(R34.1, I_V5)
+	NET_C(R34.2, IC11.6, IC11.7, C13.2)
+	NET_C(C13.1, GND)
+
+	NET_C(R35.2, R17.1, IC4.13)
+	NET_C(R11.1, R14.1, R17.2, IC4.9)
+	NET_C(R11.2, IC4.3)
+	NET_C(R12.1, IC4.2)
+	NET_C(R12.2, R16.2, R18.2, Q2.C, R22.2, I_V15)
+	NET_C(IC4.4, R13.1)
+	NET_C(R13.2, C6.2, IC4.6)
+	NET_C(R14.2, IC4.1)
+	NET_C(IC4.5, C6.1, R15.1, Q1.B)
+	NET_C(R15.2, R16.1, IC4.8)
+
+	NET_C(Q1.C, R18.1, Q2.B)
+	NET_C(Q1.E, R19.2)
+	NET_C(R19.1, GND)
+	NET_C(Q2.E, Q3.B, R20.2)
+	NET_C(R20.1, I_VM15)
+	NET_C(Q3.E, R21.1)
+	NET_C(R21.2, R22.1, R23.2)
+	NET_C(R23.1, GND)
+	NET_C(Q3.C, IC12.5)
+
+	NET_C(R36.2, C14.1)
+	NET_C(C14.2, R37.2, R40.2, C15.1)
+	NET_C(R37.1, GND)
+
+#if (HLE_WHOOSH_MOD)
+	//
+	// The "whoosh" sound has a noise modulator that is a steady
+	// clock ~64.5Hz, generated by an LM3900 and an RC network.
+	// When run at 48kHz, this network does not clock at the
+	// correct frequency, so HLE this with a basic clock.
+	//
+	CLOCK(WHOOSH_CLK, 64.5)
+	NET_C(WHOOSH_CLK.GND, GND)
+	NET_C(WHOOSH_CLK.VCC, I_V15)
+	NET_C(WHOOSH_CLK.Q, R40.1)
+	NET_C(GND, C21.1, C21.2, R38.1, R38.2, R39.1, R39.2, R47.1, R47.2, R48.1, R48.2, IC4.11, IC4.12)
+#else
+	NET_C(R40.1, R38.2, IC4.10, R48.2)
+	NET_C(C21.2, R38.1, R39.2)
+	NET_C(C21.1, GND)
+	NET_C(R39.1, IC4.11)
+	NET_C(I_V15, R47.1)
+	NET_C(R47.2, IC4.12, R48.1)
+#endif
+
+	NET_C(C15.2, R41.2, IC12.2)
+	NET_C(R41.1, R42.1, GND)
+	NET_C(R42.2, IC12.3)
+	NET_C(IC12.6, IC10.6, IC9.6, IC17.6, IC18.6, IC19.6, R64.1)
+
+	NET_C(I_OUT_2, R24.1, IC7.2)
+	NET_C(R25.1, IC7.6, IC7.7, C7.1)
+	NET_C(C7.2, IC7.1, GND)
+	NET_C(R24.2, I_V5)
+	NET_C(R25.2, IC7.8, IC7.4, I_V5)    // IC7.4 -- not documented
+	NET_C(IC7.3, Q4.E)
+	NET_C(Q4.B, R26.2)
+	NET_C(R26.1, GND)
+	NET_C(Q4.C, C8.1, R30.1)
+	NET_C(C8.2, I_VM15)
+	NET_C(R30.2, IC10.5)
+
+	NET_C(R27.1, C9.2, R28.1)
+	NET_C(C9.1, GND)
+	NET_C(R28.2, C10.1)
+	NET_C(C10.2, C11.1, R29.1, IC8.2)
+	NET_C(IC8.3, GND)
+	NET_C(IC8.6, C11.2, R29.2, R31.1)
+	NET_C(R31.2, C12.1)
+	NET_C(C12.2, R32.2, IC10.2)
+	NET_C(R32.1, R33.1, GND)
+	NET_C(R33.2, IC10.3)
+
+	NET_C(R43.2, C22.1)
+	NET_C(C22.2, R44.2, C23.1)
+	NET_C(R44.1, GND)
+	NET_C(C23.2, R45.2, IC9.2)
+	NET_C(R45.1, GND)
+	NET_C(R46.1, GND)
+	NET_C(R46.2, IC9.3)
+
+	NET_C(I_OUT_7, IC13.1)
+	NET_C(I_V5, R49.2)
+	NET_C(R49.1, IC13.2, IC13.5, IC13.9, IC13.12)
+	NET_C(IC13.3, Q5.E)
+	NET_C(Q5.B, R50.2)
+	NET_C(R50.1, GND)
+	NET_C(Q5.C, C24.2, R51.1)
+	NET_C(C24.1, I_VM15)
+	NET_C(R51.2, IC9.5)
+
+	NET_C(I_OUT_3, IC13.4)
+	NET_C(IC13.6, Q6.E)
+	NET_C(Q6.B, R57.2)
+	NET_C(R57.1, GND)
+	NET_C(Q6.C, C28.1, R58.1)
+	NET_C(C28.2, I_VM15)
+	NET_C(R58.2, IC17.5)
+	NET_C(IC14.4, IC14.8, I_V5)
+	NET_C(IC14.3, R52.1)
+	NET_C(R52.2, C25.1)
+	NET_C(C25.2, R55.2, IC17.2)
+	NET_C(IC14.2, IC14.6, R54.1, R53.2, C27.2)
+	NET_C(R54.2, I_V5)
+	NET_C(C27.1, GND)
+	NET_C(IC14.7, R53.1)
+	NET_C(IC14.5, C26.2)
+	NET_C(C26.1, GND)
+	NET_C(IC14.1, GND)
+	NET_C(R55.1, GND)
+	NET_C(R56.1, GND)
+	NET_C(R56.2, IC17.3)
+
+	NET_C(I_OUT_4, IC13.10)
+	NET_C(IC13.8, Q8.E)
+	NET_C(Q8.B, R68.2)
+	NET_C(R68.1, GND)
+	NET_C(Q8.C, C35.1, R69.1)
+	NET_C(C35.2, I_VM15)
+	NET_C(R69.2, IC18.5)
+	NET_C(IC15.4, IC15.8, I_V5)
+	NET_C(IC15.3, R59.1)
+	NET_C(R59.2, C29.1)
+	NET_C(C29.2, R62.2, IC18.2)
+	NET_C(IC15.2, IC15.6, R61.1, R60.2, C31.2)
+	NET_C(R61.2, I_V5)
+	NET_C(C31.1, GND)
+	NET_C(IC15.7, R60.1)
+	NET_C(IC15.5, C30.2)
+	NET_C(C30.1, GND)
+	NET_C(IC15.1, GND)
+	NET_C(R62.1, GND)
+	NET_C(R63.1, GND)
+	NET_C(R63.2, IC18.3)
+
+	NET_C(I_OUT_0, IC13.13)
+	NET_C(IC13.11, Q10.E)
+	NET_C(Q10.B, R77.2)
+	NET_C(R77.1, GND)
+	NET_C(Q10.C, C39.1, R78.1)
+	NET_C(C39.2, I_VM15)
+	NET_C(R78.2, IC19.5)
+	NET_C(IC16.4, IC16.8, I_V5)
+	NET_C(IC16.3, R70.1)
+	NET_C(R70.2, C36.1)
+	NET_C(C36.2, R73.2, IC19.2)
+	NET_C(IC16.2, IC16.6, R72.1, R71.2, C38.2)
+	NET_C(R72.2, I_V5)
+	NET_C(C38.1, GND)
+	NET_C(IC16.7, R71.1)
+	NET_C(IC16.5, C37.2)
+	NET_C(C37.1, GND)
+	NET_C(IC16.1, GND)
+	NET_C(R73.1, GND)
+	NET_C(R74.1, GND)
+	NET_C(R74.2, IC19.3)
+
+	ALIAS(OUTPUT, R64.1)
+	NET_C(R64.2, GND)
+
+
+	//
+	// Unconnected pins
+	//
+
+	NET_C(GND, IC20.2, IC20.3)  // part of final amp
+
+//  NET_C(GND, IC6.3, IC28.8, IC28.9, IC28.10, IC28.11)
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_sundance.h mame-0.224+dfsg.1/src/mame/audio/nl_sundance.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_sundance.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_sundance.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_SUNDANCE_H
+#define MAME_AUDIO_NL_SUNDANCE_H
+
+#pragma once
+
+NETLIST_EXTERNAL(sundance)
+
+#endif // MAME_AUDIO_NL_SUNDANCE_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_tailg.cpp mame-0.224+dfsg.1/src/mame/audio/nl_tailg.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_tailg.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_tailg.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,697 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Tail Gunner
+//
+// Derived from the schematics and parts list in the
+// Tail Gunner manual.
+//
+// Known problems/issues:
+//
+//    * The diodes (D8/D9) connected to LS123 Rext/Cext pins
+//       cause major performance issues. Snipping them out
+//       seems to have no effect apart from giving back all
+//       the lost performance.
+//
+//    * The "wideband noise generator" is simulated with a generic
+//       noise source. This seems to work fine and doesn't sound
+//       too different from recordings.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_cinemat_common.h"
+
+
+//
+// Optimizations
+//
+
+#define HLE_NOISE_GEN (1)
+#define HLE_HYPERSPACE_VCO (1)
+#define HLE_LASER_VCO (1)
+#define REMOVE_LS123_DIODES (1)
+#define ADD_LS125_PULLUPS (1)
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(tailg)
+
+#if (HLE_HYPERSPACE_VCO && HLE_LASER_VCO)
+	SOLVER(Solver, 1000)
+#else
+	SOLVER(Solver, 48000000)
+#endif
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	TTL_INPUT(I_OUT_0, 0)               // active high
+	TTL_INPUT(I_OUT_1, 0)               // active high
+	TTL_INPUT(I_OUT_2, 0)               // active high
+	TTL_INPUT(I_OUT_3, 0)               // active high
+	TTL_INPUT(I_OUT_4, 0)               // active high
+
+	NET_C(GND, I_OUT_0.GND, I_OUT_1.GND, I_OUT_2.GND, I_OUT_3.GND, I_OUT_4.GND)
+	NET_C(I_V5, I_OUT_0.VCC, I_OUT_1.VCC, I_OUT_2.VCC, I_OUT_3.VCC, I_OUT_4.VCC)
+
+	CINEMAT_LOCAL_MODELS
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V15, 15)
+	ANALOG_INPUT(I_VM15, -15)
+
+	RES(R1, RES_M(1))
+	RES(R2, RES_K(470))
+	RES(R3, 470)
+	RES(R4, RES_K(470))
+	RES(R5, 100)
+	RES(R6, RES_K(10))
+	RES(R7, RES_M(1))
+	RES(R8, RES_K(10))
+	RES(R9, RES_K(47))
+	RES(R10, RES_K(1))
+	RES(R11, RES_K(330))
+	RES(R12, RES_K(9.1))
+	RES(R13, RES_M(1))
+	RES(R14, RES_K(20))
+	RES(R15, RES_K(10))
+	RES(R16, RES_K(1))
+	RES(R17, RES_K(10))
+	RES(R18, RES_K(20))
+	RES(R19, RES_K(39))
+	RES(R20, RES_K(82))
+	RES(R21, RES_K(2.7))
+	RES(R22, RES_K(1))
+	RES(R23, RES_K(10))
+	RES(R24, RES_K(47))
+	RES(R25, RES_K(330))
+	RES(R26, RES_K(10))
+	RES(R27, RES_K(2.7))
+	RES(R28, RES_K(2.7))
+	RES(R29, 150)
+	RES(R30, RES_K(10))
+	RES(R31, RES_M(1))
+	RES(R32, RES_K(20))
+	RES(R33, RES_K(10))
+	RES(R34, RES_K(1))
+	RES(R35, RES_K(10))
+	RES(R36, RES_K(20))
+	RES(R37, RES_K(39))
+	RES(R38, RES_K(82))
+	RES(R39, RES_K(100))
+	RES(R40, RES_K(68))
+	RES(R41, 330)
+	RES(R42, 330)
+	RES(R43, RES_K(560))
+	RES(R44, RES_K(30))
+	RES(R45, RES_K(1))
+	RES(R46, 330)
+	RES(R47, RES_K(220))
+	RES(R48, RES_K(2.7))
+	RES(R49, RES_K(2.7))
+	RES(R50, RES_K(820))
+	RES(R51, RES_K(360))
+	RES(R52, RES_K(330))
+	RES(R53, RES_K(150))
+	RES(R54, RES_K(4.7))
+	RES(R55, RES_K(390))
+	RES(R56, RES_K(910))
+	RES(R57, RES_K(4.7))
+	RES(R58, RES_K(2))
+	RES(R59, RES_K(10))
+	RES(R60, RES_K(1))
+	RES(R61, RES_K(4.7))
+	RES(R62, RES_K(20))
+	RES(R63, RES_K(180))
+	RES(R64, RES_K(10))
+	RES(R65, RES_K(20))
+	RES(R66, RES_K(15))
+	RES(R67, RES_K(10))
+	RES(R68, RES_K(20))
+	RES(R69, RES_K(30))
+	RES(R70, 470)
+//  RES(R71, 150)        -- part of final amp (not emulated)
+//  RES(R72, RES_K(22))  -- part of final amp (not emulated)
+//  RES(R73, 150)        -- part of final amp (not emulated)
+//  RES(R74, RES_K(47))  -- part of final amp (not emulated)
+//  POT(R75, RES_K(100)) -- part of final amp (not emulated)
+//  PARAM(R75.DIAL, 0.5) -- part of final amp (not emulated)
+	RES(R76, RES_K(47))
+	RES(R77, RES_K(47))
+	RES(R78, RES_K(2.7))
+	RES(R79, RES_K(2.7))
+	RES(R80, RES_K(100))
+	RES(R81, RES_K(1))
+	RES(R82, RES_K(330))
+	RES(R83, RES_K(10))
+	RES(R84, RES_K(91))
+
+	CAP(C1, CAP_U(100))
+	CAP(C2, CAP_U(0.1))
+	CAP(C3, CAP_U(0.01))
+	CAP(C4, CAP_U(0.1))
+	CAP(C5, CAP_U(100))
+	CAP(C6, CAP_U(0.68))
+	CAP(C7, CAP_U(0.1))
+	CAP(C8, CAP_U(1))
+	CAP(C9, CAP_U(0.1))
+	CAP(C10, CAP_U(0.1))
+	CAP(C11, CAP_U(0.005))
+	CAP(C12, CAP_U(0.1))
+	CAP(C13, CAP_U(0.1))
+	CAP(C14, CAP_U(0.05))
+	CAP(C15, CAP_U(10))
+	CAP(C16, CAP_U(10))
+	CAP(C17, CAP_U(0.002))
+	CAP(C18, CAP_U(0.01))
+	CAP(C19, CAP_U(0.01))
+	CAP(C20, CAP_U(0.01))
+	CAP(C21, CAP_U(0.1))
+	CAP(C22, CAP_U(0.1))
+	CAP(C23, CAP_U(0.01))
+	CAP(C24, CAP_U(15))
+	CAP(C25, CAP_U(0.22))
+	CAP(C26, CAP_U(4.7))
+	CAP(C27, CAP_U(0.1))
+	CAP(C28, CAP_U(0.47))
+	CAP(C29, CAP_U(0.47))
+	CAP(C30, CAP_U(0.01))
+	CAP(C31, CAP_U(0.05))
+	CAP(C32, CAP_U(0.1))
+	CAP(C33, CAP_U(0.1))
+//  CAP(C34, CAP_P(470)) -- part of final amp (not emulated)
+//  CAP(C35, CAP_P(470)) -- part of final amp (not emulated)
+//  CAP(C36, CAP_P(470)) -- part of final amp (not emulated)
+//  CAP(C37, CAP_U(3.3))
+//  CAP(C38, CAP_U(3.3))
+//  CAP(C39, CAP_U(3.3))
+//  CAP(C40, CAP_U(3.3))
+	CAP(C41, CAP_U(0.005))
+	CAP(C42, CAP_U(0.1))
+	CAP(C43, CAP_U(10))
+	CAP(C44, CAP_U(2.2))
+
+	D_1N5240(D1)
+	D_1N914(D2)
+	D_1N914(D3)
+	D_1N914(D4)
+	D_1N914(D5)
+	D_1N914(D6)
+	D_1N914(D7)
+	D_1N914(D8)
+	D_1N914(D9)
+
+	Q_2N3904(Q1)            // NPN
+	Q_2N3904(Q2)            // NPN
+	Q_2N3906(Q3)            // PNP
+	Q_2N3906(Q4)            // PNP
+	Q_2N3906(Q5)            // PNP
+//  Q_2N6292(Q6)            // NPN -- part of final amp (not emulated)
+//  Q_2N6107(Q7)            // PNP -- part of final amp (not emulated)
+	Q_2N3906(Q8)            // PNP
+
+	TL081_DIP(IC1)          // Op. Amp.
+//  NET_C(IC1.7, I_V15)     // (indirectly via R5)
+	NET_C(IC1.4, I_VM15)
+
+	TL081_DIP(IC2)          // Op. Amp.
+	NET_C(IC2.4, I_VM15)
+	NET_C(IC2.7, I_V15)
+
+	TL081_DIP(IC3)          // Op. Amp.
+	NET_C(IC3.4, I_VM15)
+	NET_C(IC3.7, I_V15)
+
+	TTL_74LS125_DIP(IC4)    // Quad 3-state Buffers
+	NET_C(IC4.7, GND)
+	NET_C(IC4.14, I_V5)
+
+	TTL_7404_DIP(IC5)       // Hex Inverting Gates
+	NET_C(IC5.7, GND)
+	NET_C(IC5.14, I_V5)
+
+	TTL_7406_DIP(IC6)       // Hex inverter -- currently using a clone of 7416, no open collector behavior
+	NET_C(IC6.7, GND)
+	NET_C(IC6.14, I_V5)
+
+	TL081_DIP(IC7)          // Op. Amp.
+	NET_C(IC7.4, I_VM15)
+	NET_C(IC7.7, I_V15)
+
+	TTL_74LS393_DIP(IC8)    // Dual 4-Stage Binary Counter
+	NET_C(IC8.7, GND)
+	NET_C(IC8.14, I_V5)
+
+	TL081_DIP(IC9)          // Op. Amp.
+	NET_C(IC9.4, I_VM15)
+	NET_C(IC9.7, I_V15)
+
+	CA3080_DIP(IC10)        // Op. Amp.
+	NET_C(IC10.4, I_VM15)
+	NET_C(IC10.7, I_V15)
+
+	TL081_DIP(IC11)         // Op. Amp.
+	NET_C(IC11.4, I_VM15)
+	NET_C(IC11.7, I_V15)
+
+	TTL_74LS123_DIP(IC12)   // Retriggerable Monostable Multivibrators
+	NET_C(IC12.8, GND)
+	NET_C(IC12.16, I_V5)
+
+	CA3080_DIP(IC13)        // Op. Amp.
+	NET_C(IC13.4, I_VM15)
+	NET_C(IC13.7, I_V15)
+
+	LM555_DIP(IC14)
+
+	LM555_DIP(IC15)
+
+	LM555_DIP(IC16)
+
+	LM555_DIP(IC17)
+
+	TTL_74LS393_DIP(IC18)   // Dual 4-Stage Binary Counter
+	NET_C(IC18.7, GND)
+	NET_C(IC18.14, I_V5)
+
+	TL081_DIP(IC19)         // Op. Amp.
+	NET_C(IC19.4, I_VM15)
+	NET_C(IC19.7, I_V15)
+
+//  TTL_7915_DIP(IC20)      // -15V Regulator -- not needed
+//  TTL_7815_DIP(IC21)      // +15V Regulator -- not needed
+
+	CA3080_DIP(IC22)        // Op. Amp.
+	NET_C(IC22.4, I_VM15)
+	NET_C(IC22.7, I_V15)
+
+	TTL_74LS259_DIP(IC23)
+	NET_C(IC23.8, GND)
+	NET_C(IC23.16, I_V5)
+
+#if (HLE_NOISE_GEN)
+	//
+	// The "wideband noise gen" relies on properties
+	// of the components to create noise. Not only
+	// does this simulate poorly, but it would be too
+	// slow for realtime, so HLE it with some quality
+	// noise.
+	//
+	// Note that Sundance has the exact same circuit.
+	//
+	CLOCK(NOISE_CLOCK, 10000)
+	NET_C(NOISE_CLOCK.GND, GND)
+	NET_C(NOISE_CLOCK.VCC, I_V5)
+
+	SYS_NOISE_MT_U(NOISE, 3)
+	NET_C(NOISE.I, NOISE_CLOCK.Q)
+	NET_C(NOISE.1, GND)
+	NET_C(NOISE.2, R9.2, R23.2, R55.2, R76.1)
+
+	NET_C(GND, C1.1, C1.2, C2.1, C2.2, C3.1, C3.2, C4.1, C4.2, C5.1, C5.2)
+	NET_C(GND, D1.A, D1.K, D2.A, D2.K, D3.A, D3.K)
+	NET_C(GND, R1.1, R1.2, R2.1, R2.2, R3.1, R3.2, R4.1, R4.2, R5.1, R5.2, R6.1, R6.2, R7.1, R7.2, R8.1, R8.2, R9.1)
+	NET_C(GND, IC1.2, IC1.3, IC1.7, IC2.2, IC2.3, IC3.2, IC3.3)
+#else
+	NET_C(C1.1, GND)
+	NET_C(C1.2, C2.2, D1.K, IC1.7, R5.1)
+	NET_C(C2.1, GND)
+	NET_C(D1.A, C3.1, R1.2)
+	NET_C(R1.1, GND)
+	NET_C(C3.2, R2.2, IC1.2)
+	NET_C(R3.1, GND)
+	NET_C(R2.1, C4.1, R3.2)
+	NET_C(C4.2, IC1.3, R4.1)
+	NET_C(R4.2, IC1.6, R6.1)
+	NET_C(R5.2, C5.1, I_V15)
+	NET_C(C5.2, GND)
+
+	NET_C(R6.2, IC2.2, R7.1, D3.A, D2.K)
+	NET_C(IC2.3, GND)
+	NET_C(IC2.6, R7.2, D3.K, D2.A, R8.1)
+	NET_C(R8.2, IC3.2, R9.1)
+	NET_C(IC3.3, GND)
+	NET_C(IC3.6, R9.2, R23.2, R55.2, R76.1)
+#endif
+
+	//
+	// Input mux
+	//
+
+	NET_C(I_OUT_0, IC23.1)
+	NET_C(I_OUT_1, IC23.2)
+	NET_C(I_OUT_2, IC23.3)
+	NET_C(I_OUT_3, IC23.13)
+	NET_C(I_OUT_4, IC23.14)
+	NET_C(IC23.15, I_V5)
+
+	NET_C(R23.1, R24.1, C9.2)
+	NET_C(C9.1, GND)
+	NET_C(R24.2, C10.1)
+	NET_C(C10.2, IC9.2, R25.1, C11.1)
+	NET_C(IC9.3, GND)
+	NET_C(IC9.6, R25.2, C11.2, R26.1)
+	NET_C(R26.2, C12.1)
+	NET_C(C12.2, R27.2, IC10.2)
+	NET_C(R27.1, GND)
+	NET_C(IC10.3, R28.2)
+	NET_C(R28.1, GND)
+	NET_C(IC10.6, R70.1)
+
+	//
+	// Explosion
+	//
+
+	NET_C(IC23.4, IC12.1)
+	NET_C(IC12.14, C15.2)
+
+#if (REMOVE_LS123_DIODES)
+	//
+	// The diodes connected to the Rext/Cext pins on the
+	// LS123 (monostable multivibrators) absolutely tank
+	// performance for reasons yet not understood. Their
+	// purpose is unclear, and removing them seems to have
+	// no effect on the sound, while fixing the performance
+	// so we'll just snip them out for now.
+	//
+	NET_C(IC12.15, C15.1, R39.1)
+	NET_C(GND, D8.A, D8.K)
+#else
+	NET_C(IC12.15, D8.K)
+	NET_C(D8.A, C15.1, R39.1)
+#endif
+
+	NET_C(R39.2, IC12.2, IC12.3, I_V5)
+	NET_C(IC12.13, Q3.E)
+	NET_C(Q3.B, R42.2)
+	NET_C(R42.1, GND)
+	NET_C(Q3.C, R43.2, C16.1, R44.1)
+	NET_C(C16.2, I_VM15)
+	NET_C(R44.2, IC10.5)
+
+	//
+	// Rumble
+	//
+
+	NET_C(IC23.5, IC6.5)
+	NET_C(IC6.6, R40.1, Q4.E)
+	NET_C(R40.2, I_V5)
+	NET_C(Q4.B, R41.2)
+	NET_C(R41.1, GND)
+	NET_C(Q4.C, R43.1)
+
+	//
+	// Shield
+	//
+
+	NET_C(IC23.7, IC4.13)
+	NET_C(I_V5, R45.1)
+	NET_C(R45.2, IC4.12)
+	NET_C(IC4.11, Q5.E)
+	NET_C(Q5.B, R46.2)
+	NET_C(R46.1, GND)
+	NET_C(Q5.C, R47.1)
+	NET_C(R47.2, IC13.5)
+	NET_C(IC13.6, R70.1)
+
+	NET_C(I_V15, R54.2, IC16.4, IC16.8)
+	NET_C(R54.1, IC16.7, R56.2)
+	NET_C(R56.1, IC16.6, IC16.2, C22.2)
+	NET_C(C22.1, IC16.1, C23.1, GND)
+	NET_C(C23.2, IC16.5)
+	NET_C(IC16.3, R57.1)
+	NET_C(R57.2, C24.1, R58.1)
+	NET_C(C24.2, GND)
+	NET_C(R58.2, C26.1, C25.1)
+	NET_C(C26.2, GND)
+	NET_C(C25.2, C27.1, R48.2, IC13.2, C21.1)
+	NET_C(R48.1, GND)
+	NET_C(IC13.3, R49.2)
+	NET_C(R49.1, GND)
+	NET_C(C27.2, R59.1)
+	NET_C(R59.2, C28.1, R60.1)
+	NET_C(C28.2, GND)
+	NET_C(R60.2, C29.1, R62.1)
+	NET_C(C29.2, GND)
+	NET_C(R62.2, IC17.3)
+	NET_C(IC17.7, R61.2, R63.2)
+	NET_C(R61.1, IC17.4, IC17.8, I_V15)
+	NET_C(R63.1, IC17.6, IC17.2, C31.2)
+	NET_C(C31.1, IC17.1, C30.1, GND)
+	NET_C(C30.2, IC17.5)
+	NET_C(C21.2, R55.1)
+
+	//
+	// Hyperspace
+	//
+
+	NET_C(IC23.10, IC4.1)
+	NET_C(IC4.2, GND)
+
+#if (ADD_LS125_PULLUPS)
+	//
+	// The 74LS125 is being abuse here, assuming the tristate
+	// will pull high instead of low. This is not how it is
+	// modelled, so add a pullup resistor between the output
+	// and the TTL source.
+	//
+	RES(RTEMP1, RES_K(1))
+	NET_C(RTEMP1.1, I_V5)
+	NET_C(IC4.3, RTEMP1.2)
+#endif
+
+	NET_C(IC4.3, IC5.5, IC8.12)
+	NET_C(IC5.6, IC6.1)
+	NET_C(IC6.2, R10.1, R11.1)
+	NET_C(R10.2, I_V5)
+	NET_C(R11.2, D4.K, C6.1)
+	NET_C(C6.2, GND)
+
+#if (HLE_HYPERSPACE_VCO)
+	//
+	// The hyperspace VCO is troublesome to emulate without
+	// cranking up the solver frequency, so model it instead.
+	// Take the voltage at C6.1 and map it to the TTL
+	// frequency at IC8.13, then remove the circuit in favor
+	// of a variable clock.
+	//
+	// Here is the mapping I get for C6.1 vs IC8.13 half-period:
+	//    R2 = 0.99919: HP = (0.000070760*A0) + 0.0000496821
+	//    R2 = 0.99991: HP = (0.00000141986*A0*A0) + (0.0000592676*A0) + 0.000067917
+	//    R2 = 0.99995: HP = (0.000000176200*A0*A0*A0) - (0.000000394224*A0*A0) + (0.000064351*A0) + 0.000063955
+	//    R2 = 0.99995: HP = (-0.00000000225454*A0*A0*A0*A0) + (0.000000207009*A0*A0*A0) - (0.000000529599*A0*A0) + (0.000064557*A0) + 0.000063885
+	//    R2 = 0.99995: HP = (0.0000000099503*A0*A0*A0*A0*A0) - (0.000000173841*A0*A0*A0*A0) + (0.00000127300*A0*A0*A0) - (0.00000339043*A0*A0) + (0.000067595*A0) + 0.000063196
+	//
+	// However, when we clip the circuit, the C6.1 values change,
+	// so here is a mapping for the clipped C6.1 vs. the original
+	// IC8.13 half-period:
+	//
+	//    R2 = 0.97319: HP = (0.0000572507*A0) + 0.000194746
+	//    R2 = 0.97692: HP = (0.00000283778*A0*A0) + (0.0000473318*A0) + 0.000197383
+	//    R2 = 0.97785: HP = (-0.00000116165*A0*A0*A0) + (0.0000100018*A0*A0) + (0.0000372162*A0) + 0.000199308
+	//    R2 = 0.97830: HP = (-0.000000661779*A0*A0*A0*A0) + (0.00000465155*A0*A0*A0) - (0.00000545641*A0*A0) + (0.0000499499*A0) + 0.000197353
+	//    R2 = 0.97930: HP = (-0.000000814292*A0*A0*A0*A0*A0) + (0.0000086074*A0*A0*A0*A0) - (0.0000317523*A0*A0*A0) + (0.0000522027*A0*A0) + (0.0000173329*A0) + 0.000201604
+	//
+	VARCLOCK(HYPERCLK, 1, "max(0.000001,min(0.1,(-0.000000814292*A0*A0*A0*A0*A0) + (0.0000086074*A0*A0*A0*A0) - (0.0000317523*A0*A0*A0) + (0.0000522027*A0*A0) + (0.0000173329*A0) + 0.000201604))")
+	NET_C(HYPERCLK.GND, GND)
+	NET_C(HYPERCLK.VCC, I_V5)
+	NET_C(HYPERCLK.Q, IC8.13)
+	NET_C(HYPERCLK.A0, C6.1)
+	NET_C(GND, R12.1, R12.2, R13.1, R13.2, R14.1, R14.2, R15.1, R15.2, R16.1, R16.2, C7.1, C7.2, D4.A, D5.A, D5.K, IC7.2, IC7.3, IC5.1)
+	HINT(IC5.2, NC)
+#else
+	NET_C(D4.A, IC7.3, D5.K, R13.1)
+	NET_C(IC7.2, C7.2, R12.1)
+	NET_C(C7.1, GND)
+	NET_C(R12.2, IC7.6, R13.2, R14.1)
+	NET_C(D5.A, GND)
+	NET_C(R14.2, R15.2, Q1.B)
+	NET_C(R15.1, GND)
+	NET_C(Q1.E, GND)
+	NET_C(Q1.C, R16.1, IC5.1)
+	NET_C(R16.2, I_V5)
+	NET_C(IC5.2, IC8.13)
+#endif
+
+	NET_C(IC8.9, R17.1)
+	NET_C(IC8.8, R18.1)
+	NET_C(IC8.10, R19.1)
+	NET_C(IC8.11, R20.1)
+	NET_C(R17.2, R18.2, R19.2, R20.2, R22.2, R21.1)
+	NET_C(R22.1, GND)
+	NET_C(R21.2, C8.1)
+	NET_C(C8.2, R70.1)
+
+	//
+	// Laser
+	//
+
+	NET_C(IC23.6, IC4.4)
+	NET_C(IC4.5, GND)
+
+#if (ADD_LS125_PULLUPS)
+	//
+	// see previous comment about why this is necessary
+	//
+	RES(RTEMP2, RES_K(1))
+	NET_C(RTEMP2.1, I_V5)
+	NET_C(IC4.6, RTEMP2.2)
+#endif
+
+	NET_C(IC4.6, IC8.2, IC6.3)
+	NET_C(IC6.4, R29.1)
+	NET_C(R29.2, D6.K, C13.2)
+	NET_C(C13.1, GND)
+
+#if (HLE_LASER_VCO)
+	//
+	// The laser VCO is almost identical to the hyperspace VCO,
+	// apart from the component values. The same approach is used
+	// for HLE.
+	//
+	// Here is the mapping I get for C13.2 vs IC8.1 half-period:
+	//    R2 = 0.99489: HP = (0.0000346649*A0) + 0.0000391143
+	//    R2 = 0.99489: HP = (0.0000000539278*A0*A0) + (0.0000345904*A0) + 0.0000391217
+	//    R2 = 0.99491: HP = (0.00000116177*A0*A0*A0) - (0.00000273810*A0*A0) + (0.0000362549*A0) + 0.0000389782
+	//    R2 = 0.99502: HP = (-0.00000728180*A0*A0*A0*A0) + (0.0000256184*A0*A0*A0) - (0.0000288539*A0*A0) + (0.0000456890*A0) + 0.0000382619
+	//    R2 = 0.99526: HP = (0.0000241755*A0*A0*A0*A0*A0) - (0.000110184*A0*A0*A0*A0) + (0.000181339*A0*A0*A0) - (0.000128682*A0*A0) + (0.000070619*A0) + 0.0000366068
+	//
+	// And here is the mapping for the clipped C13.2 vs the original
+	// IC8.1 half-period:
+	//    R2 = 0.10697: HP = (0.000449852*A0) - 0.000000764127
+	//    R2 = 0.99164: HP = (0.0445612*A0*A0) - (0.00441596*A0) + 0.0000386659
+	//    R2 = 0.99165: HP = (0.0576325*A0*A0*A0) + (0.0325274*A0*A0) - (0.00378669*A0) + 0.0000384468
+	//    R2 = 0.99422: HP = (-37.92188*A0*A0*A0*A0) + (11.77137*A0*A0*A0) - (1.173779*A0*A0) + (0.0377702*A0) + 0.0000242577
+	//    R2 = 0.99536: HP = (-1435.864*A0*A0*A0*A0*A0) + (418.8404*A0*A0*A0*A0) - (37.19112*A0*A0*A0) + (0.653446*A0*A0) + (0.0314777*A0) + 0.0000261637
+	//
+	VARCLOCK(LASERCLK, 1, "max(0.000001,min(0.1,(0.0576325*A0*A0*A0) + (0.0325274*A0*A0) - (0.00378669*A0) + 0.0000384468))")
+	NET_C(LASERCLK.GND, GND)
+	NET_C(LASERCLK.VCC, I_V5)
+	NET_C(LASERCLK.Q, IC8.1)
+	NET_C(LASERCLK.A0, C13.2)
+	NET_C(GND, R30.1, R30.2, R31.1, R31.2, R32.1, R32.2, R33.1, R33.2, R34.1, R34.2, C14.1, C14.2, D6.A, D7.A, D7.K, IC11.2, IC11.3, IC5.3)
+	HINT(IC5.4, NC)
+#else
+	NET_C(D6.A, IC11.3, D7.K, R31.1)
+	NET_C(D7.A, GND)
+	NET_C(IC11.2, C14.2, R30.1)
+	NET_C(C14.1, GND)
+	NET_C(IC11.6, R30.2, R31.2, R32.1)
+	NET_C(R32.2, R33.2, Q2.B)
+	NET_C(R33.1, GND)
+	NET_C(Q2.E, GND)
+	NET_C(Q2.C, R34.1, IC5.3)
+	NET_C(R34.2, I_V5)
+	NET_C(IC5.4, IC8.1)
+#endif
+
+	NET_C(IC8.5, R35.1)
+	NET_C(IC8.6, R36.1)
+	NET_C(IC8.4, R37.1)
+	NET_C(IC8.3, R38.1)
+	NET_C(R35.2, R36.2, R37.2, R38.2, R21.1)
+
+	//
+	// Shield Bounce
+	//
+
+	NET_C(R50.2, I_V5, IC14.4, IC14.8)
+	NET_C(R50.1, R51.1, IC14.6, IC14.2, C17.2)
+	NET_C(R51.2, IC14.7)
+	NET_C(C17.1, IC14.1, C18.1, GND)
+	NET_C(C18.2, IC14.5)
+	NET_C(IC14.3, IC18.1)
+	NET_C(IC18.2, GND)
+	NET_C(IC18.4, R64.2)
+	NET_C(R64.1, R65.1, C32.2)
+	NET_C(IC18.6, R65.2)
+	NET_C(C32.1, R66.2)
+	NET_C(R66.1, R69.1, IC22.2, R78.2, C42.2)
+
+	NET_C(R52.2, I_V5, IC15.4, IC15.8)
+	NET_C(R52.1, R53.1, IC15.6, IC15.2, C19.2)
+	NET_C(R53.2, IC15.7)
+	NET_C(C19.1, IC15.1, C20.1, GND)
+	NET_C(C20.2, IC15.5)
+	NET_C(IC15.3, IC18.13)
+	NET_C(IC18.12, GND)
+	NET_C(IC18.8, R67.2)
+	NET_C(R67.1, R68.1, C33.2)
+	NET_C(IC18.11, R68.2)
+	NET_C(C33.1, R69.2)
+
+	NET_C(C42.1, R77.2, C41.2)
+	NET_C(R77.1, GND)
+	NET_C(C41.1, R76.2)
+
+	NET_C(R78.1, GND)
+	NET_C(IC22.3, R79.2)
+	NET_C(R79.1, GND)
+
+	NET_C(IC23.9, IC12.9)
+	NET_C(IC12.6, C43.2)
+
+#if (REMOVE_LS123_DIODES)
+	//
+	// A second instance of problematic diode; see above
+	// comment for an explanation.
+	//
+	NET_C(C43.1, R80.1, IC12.7)
+	NET_C(GND, D9.A, D9.K)
+#else
+	NET_C(C43.1, D9.A, R80.1)
+	NET_C(D9.K, IC12.7)
+#endif
+
+	NET_C(R80.2, IC12.10, IC12.11, I_V5)
+
+	NET_C(IC12.12, IC4.10)
+	NET_C(IC4.9, R81.2)
+	NET_C(R81.1, I_V5)
+	NET_C(IC4.8, Q8.E)
+	NET_C(Q8.B, R82.2)
+	NET_C(R82.1, GND)
+	NET_C(Q8.C, R83.1)
+	NET_C(R83.2, C44.1, R84.1)
+	NET_C(C44.2, I_VM15)
+	NET_C(R84.2, IC22.5)
+	NET_C(IC22.6, R70.1)
+
+	//
+	// Final amp
+	//
+
+//NET_C(R70.1, GND) // temp
+	ALIAS(OUTPUT, R70.1)
+	NET_C(R70.2, GND)
+
+	//
+	// Unconnected inputs
+	//
+
+	NET_C(GND, IC19.2, IC19.3)  // part of final amp
+	NET_C(GND, IC5.9, IC5.11, IC5.13, IC6.9, IC6.11, IC6.13)
+
+	//
+	// Unconnected outputs
+	//
+
+	HINT(IC5.8, NC)     // QC
+	HINT(IC5.10, NC)    // QD
+	HINT(IC5.12, NC)    // QE
+	HINT(IC6.8, NC)     // QC
+	HINT(IC6.10, NC)    // QD
+	HINT(IC6.12, NC)    // QE
+	HINT(IC12.4, NC)    // /QA
+	HINT(IC12.5, NC)    // QB
+	HINT(IC18.3, NC)    // Q0A
+	HINT(IC18.5, NC)    // Q2A
+	HINT(IC18.9, NC)    // Q2B
+	HINT(IC18.10, NC)   // Q1B
+	HINT(IC23.11, NC)   // Q6
+	HINT(IC23.12, NC)   // Q7
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_tailg.h mame-0.224+dfsg.1/src/mame/audio/nl_tailg.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_tailg.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_tailg.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_TAILG_H
+#define MAME_AUDIO_NL_TAILG_H
+
+#pragma once
+
+NETLIST_EXTERNAL(tailg)
+
+#endif // MAME_AUDIO_NL_TAILG_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_tankbatt.cpp mame-0.224+dfsg.1/src/mame/audio/nl_tankbatt.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_tankbatt.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_tankbatt.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,164 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+
+//
+// Netlist for Tank Battalion
+//
+// Derived from the schematics in the manual.
+//
+// Known problems/issues:
+//
+//    * None.
+//
+
+#include "netlist/devices/net_lib.h"
+
+//
+// Main netlist
+//
+
+NETLIST_START(tankbatt)
+
+	SOLVER(Solver, 48000)
+	ANALOG_INPUT(V5, 5)
+	ALIAS(VCC, V5)
+
+	CLOCK(2V, 4000) // 18.432MHz / (3 * 384 * 2)
+	CLOCK(4V, 2000) // 18.432MHz / (3 * 384 * 4)
+
+	TTL_INPUT(S1, 0)        // active high
+	TTL_INPUT(S2, 0)        // active high
+	TTL_INPUT(OFF, 1)       // active high
+	TTL_INPUT(ENGINE_HI, 0) // active high
+	TTL_INPUT(SHOOT, 0)     // active high
+	TTL_INPUT(HIT, 0)       // active high
+
+	RES(R31, 470)
+	RES(R32, 470)
+	RES(R35, RES_K(4.7))
+	RES(R36, RES_K(4.7))
+	RES(R37, RES_K(6.8))
+	RES(R38, RES_K(10))
+	//RES(R41, RES_K(22))
+	RES(R42, RES_K(22))
+	RES(R43, RES_K(22))
+	RES(R44, RES_K(33))
+	RES(R45, RES_K(47))
+	RES(R46, RES_K(4.7)) // Possible schematic or scan-quality error: Schematic says 47K
+	RES(R47, RES_K(4.7))
+	RES(R48, RES_K(4.7))
+	RES(R49, RES_K(4.7)) // Possible schematic or scan-quality error: Schematic says 47K
+	RES(R50, RES_K(150))
+	RES(R51, RES_K(150))
+	RES(R52, RES_K(220))
+	RES(R53, RES_K(470))
+	RES(R54, RES_K(470))
+	RES(R56_1, RES_K(1))
+	RES(R56_2, RES_K(1))
+	RES(R57, RES_K(10))
+	RES(R58, RES_K(1))
+	RES(R59, RES_K(1))
+	RES(R60, RES_K(1))
+	RES(R61, RES_K(1))
+
+	CAP(C10, CAP_U(2.2))
+	CAP(C11, CAP_U(2.2))
+	CAP(C12, CAP_U(2.2))
+	CAP(C13, CAP_U(2.2))
+	CAP(C14, CAP_U(0.1))
+	CAP(C15, CAP_U(0.01))
+	CAP(C16, CAP_U(0.01))
+	CAP(C17, CAP_U(0.01))
+	CAP(C18, CAP_U(0.01))
+	CAP(C42, CAP_U(0.1))
+
+	DIODE(D8, "D") // Generic diodes, types not listed on schematic
+	DIODE(D9, "D")
+	DIODE(D10, "D")
+	DIODE(D11, "D")
+
+	CD4006(_6F)
+	CD4066_DIP(_6L)
+	LM324_DIP(_6J)
+	TTL_7486_DIP(_6K)
+	TTL_7492_DIP(_5K)
+
+	NET_C(VCC, _5K.5, _6F.VDD, _6J.4, _6K.7, _6L.14, S1.VCC, S2.VCC, OFF.VCC, ENGINE_HI.VCC, SHOOT.VCC, HIT.VCC, 2V.VCC, 4V.VCC)
+	NET_C(GND, _5K.10, _6F.VSS, _6J.11, _6K.14, _6L.7, S1.GND, S2.GND, OFF.GND, ENGINE_HI.GND, SHOOT.GND, HIT.GND, 2V.GND, 4V.GND)
+
+	// Noise generation (presumably)
+	NET_C(_6F.CLOCK, 2V)
+	NET_C(_6F.D1P4, _6F.D3)
+	NET_C(_6F.D3P4, _6F.D4, _6L.12, _6L.6)
+	NET_C(_6F.D1, _6F.D2P5, _6K.A.A)
+	NET_C(_6F.D4P4, _6K.A.B)
+	NET_C(_6K.A.Q, R38.1)
+	NET_C(_6F.D2, R38.2, D9.K)
+	NET_C(_6F.D4P5, D8.A, R53.1)
+	NET_C(D8.K, R53.2, C42.1, _6J.2)
+	NET_C(_6J.1, C42.2, D9.A)
+	NET_C(_6J.3, C12.1, R43.1, R44.1, _6J.12, _6J.10)
+	NET_C(C12.2, GND)
+	NET_C(R43.2, GND)
+	NET_C(R44.2, V5)
+
+	// S1
+	NET_C(S1.Q, _6L.5)
+	NET_C(4V, _6L.4)
+	NET_C(_6L.3, R35.1)
+
+	// S2
+	NET_C(S2.Q, _6L.13)
+	NET_C(2V, _6L.1)
+	NET_C(_6L.2, R36.1)
+
+	// Hit
+	NET_C(HIT.Q, R31.1)
+	NET_C(R31.2, D10.A)
+	NET_C(D10.K, C10.1, _6L.8)
+	NET_C(C10.2, GND)
+	NET_C(_6L.9, R50.1)
+	NET_C(R50.2, R42.1, C15.1, C16.1)
+	NET_C(R42.2, GND)
+	NET_C(C16.2, R54.1, _6J.9)
+	NET_C(C15.2, R54.2, _6J.8, R56_1.1)
+
+	// Shoot
+	NET_C(SHOOT.Q, R32.1)
+	NET_C(R32.2, D11.A)
+	NET_C(D11.K, C11.1, _6L.11)
+	NET_C(C11.2, GND)
+	NET_C(_6L.10, R45.1)
+	NET_C(R45.2, R37.1, C17.1, C18.1)
+	NET_C(R37.2, GND)
+	NET_C(C18.2, R51.1, _6J.13)
+	NET_C(C17.2, R51.2, _6J.14, R56_2.1)
+
+	// Engine Rumble
+	NET_C(ENGINE_HI.Q, _6K.B.A)
+	NET_C(_6K.B.B, _6K.C.Q)
+	NET_C(_6K.B.Q, R52.1, _5K.1)
+	NET_C(R52.2, R46.1, _6J.6, C14.1)
+	NET_C(C14.2, GND)
+	NET_C(_6J.5, R47.1, R48.1, R49.1)
+	NET_C(R47.2, V5)
+	NET_C(R48.2, GND)
+	NET_C(R49.2, R57.1, _6J.7, R46.2, _6K.C.A)
+	NET_C(R57.2, GND)
+	NET_C(_6K.C.B, VCC)
+	NET_C(_5K.7, VCC)
+	NET_C(_5K.6, OFF.Q)
+	NET_C(_5K.11, R60.1, _6K.D.A)
+	NET_C(_5K.8, R58.1, _6K.D.B)
+	NET_C(_6K.D.Q, _5K.14)
+	NET_C(_5K.12, R61.1)
+	NET_C(R58.2, R60.2, R61.2, C13.1, R59.1)
+	NET_C(C13.2, GND)
+
+	// Mixing
+	//NET_C(R56_1.2, R56_2.2)
+	//NET_C(R35.2, R36.2)
+	//NET_C(R56_2.2, R59.2)
+	NET_C(R35.2, R36.2, R56_1.2, R56_2.2, R59.2)
+	//NET_C(R41.2, GND)
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_tankbatt.h mame-0.224+dfsg.1/src/mame/audio/nl_tankbatt.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_tankbatt.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_tankbatt.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+#ifndef MAME_AUDIO_NL_TANKBATT_H
+#define MAME_AUDIO_NL_TANKBATT_H
+
+#pragma once
+
+NETLIST_EXTERNAL(tankbatt)
+
+#endif // MAME_AUDIO_NL_TANKBATT_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_warrior.cpp mame-0.224+dfsg.1/src/mame/audio/nl_warrior.cpp
--- mame-0.222+dfsg.1/src/mame/audio/nl_warrior.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_warrior.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,489 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+
+//
+// Netlist for Warrior
+//
+// Derived from the schematics in the Warrior manual.
+//
+// Known problems/issues:
+//
+//    * Not yet tested.
+//
+
+#include "netlist/devices/net_lib.h"
+#include "nl_cinemat_common.h"
+
+
+//
+// Optimizations
+//
+
+#define HLE_NOISE_GEN (1)
+#define HLE_PITFALL_VCO (1)
+
+
+
+//
+// Main netlist
+//
+
+NETLIST_START(warrior)
+
+#if (HLE_PITFALL_VCO)
+	SOLVER(Solver, 1000)
+#else
+	SOLVER(Solver, 48000000)
+#endif
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 2e-5)
+
+	TTL_INPUT(I_OUT_0, 0)               // active high
+	TTL_INPUT(I_OUT_1, 0)               // active high
+	TTL_INPUT(I_OUT_2, 0)               // active high
+	TTL_INPUT(I_OUT_3, 0)               // active high
+	TTL_INPUT(I_OUT_4, 0)               // active high
+
+	NET_C(GND, I_OUT_0.GND, I_OUT_1.GND, I_OUT_2.GND, I_OUT_3.GND, I_OUT_4.GND)
+	NET_C(I_V5, I_OUT_0.VCC, I_OUT_1.VCC, I_OUT_2.VCC, I_OUT_3.VCC, I_OUT_4.VCC)
+
+	CINEMAT_LOCAL_MODELS
+
+	ANALOG_INPUT(I_V5, 5)
+	ANALOG_INPUT(I_V15, 15)
+	ANALOG_INPUT(I_VM15, -15)
+
+	RES(R1, RES_K(10))
+	RES(R2, RES_K(47))
+	RES(R3, RES_K(330))
+	RES(R4, RES_K(10))
+	RES(R5, RES_K(2.7))
+	RES(R6, RES_K(2.7))
+	RES(R7, RES_K(4.7))
+	RES(R8, RES_K(8.2))
+	RES(R9, RES_K(2.7))
+	RES(R10, RES_K(2.7))
+	RES(R11, 470)
+	RES(R12, RES_K(470))
+	RES(R13, 330)
+	RES(R14, RES_K(30))
+	RES(R15, 100)
+	RES(R16, RES_M(1))
+	RES(R17, RES_M(1))
+	RES(R18, RES_K(470))
+	RES(R19, 470)
+	RES(R20, RES_K(470))
+	RES(R21, RES_K(10))
+	RES(R22, RES_K(10))
+	RES(R23, RES_K(47))
+	RES(R24, RES_K(1))
+	RES(R25, RES_K(510))
+	RES(R26, 330)
+	RES(R27, 330)
+	RES(R28, RES_K(120))
+	RES(R29, RES_K(82))
+	RES(R30, 330)
+	RES(R31, RES_K(4.7))
+	RES(R32, RES_K(910))
+	RES(R33, RES_K(4.7))
+	RES(R34, RES_K(2))
+	RES(R35, RES_K(390))
+	RES(R36, RES_K(4.7))
+	RES(R37, RES_K(180))
+	RES(R38, RES_K(20))
+	RES(R39, RES_K(1))
+	RES(R40, RES_K(10))
+	RES(R41, RES_K(2.7))
+	RES(R42, RES_K(2.7))
+	RES(R43, RES_K(20))
+	RES(R44, 150)
+	RES(R45, RES_K(30))
+	RES(R46, RES_K(360))
+	RES(R47, RES_K(12))
+	RES(R48, RES_M(1))
+	RES(R49, RES_K(30))
+	RES(R50, RES_K(10))
+	RES(R51, RES_K(1))
+	RES(R52, RES_K(4.7))
+	RES(R53, RES_K(680))
+	RES(R54, RES_K(30))
+	RES(R55, RES_K(2.7))
+	RES(R56, RES_K(2.7))
+	RES(R57, RES_K(820))
+	RES(R58, 470)
+//  RES(R59, 150)        -- part of final amp (not emulated)
+//  RES(R60, RES_K(2.2)) -- part of final amp (not emulated)
+//  RES(R61, 150)        -- part of final amp (not emulated)
+//  RES(R62, RES_K(47))  -- part of final amp (not emulated)
+//  POT(R63, RES_K(100)) -- part of final amp (not emulated)
+
+	CAP(C1, CAP_U(0.1))
+	CAP(C2, CAP_U(0.1))
+	CAP(C3, CAP_U(0.01))
+	CAP(C4, CAP_U(0.1))
+	CAP(C5, CAP_U(0.005))
+	CAP(C6, CAP_U(0.1))
+	CAP(C7, CAP_U(1))
+	CAP(C8, CAP_U(15))
+	CAP(C9, CAP_U(100))
+	CAP(C10, CAP_U(0.1))
+	CAP(C11, CAP_U(0.01))
+	CAP(C12, CAP_U(0.1))
+	CAP(C13, CAP_U(100))
+	CAP(C14, CAP_U(0.33))
+	CAP(C15, CAP_U(0.68))
+	CAP(C16, CAP_U(0.01))
+	CAP(C17, CAP_U(15))
+	CAP(C18, CAP_U(4.7))
+	CAP(C19, CAP_U(0.22))   // 22?
+	CAP(C20, CAP_U(0.1))
+	CAP(C21, CAP_U(0.1))
+//  CAP(C22, CAP_U(3.3)) -- part of voltage converter (not emulated)
+//  CAP(C23, CAP_U(3.3)) -- part of voltage converter (not emulated)
+//  CAP(C24, CAP_U(3.3)) -- part of voltage converter (not emulated)
+//  CAP(C25, CAP_U(3.3)) -- part of voltage converter (not emulated)
+//  CAP(C26, CAP_U(3.3)) -- part of voltage converter (not emulated)
+	CAP(C27, CAP_U(0.047))
+	CAP(C28, CAP_U(0.01))
+	CAP(C29, CAP_U(0.47))
+	CAP(C30, CAP_U(0.47))
+	CAP(C31, CAP_U(1))
+	CAP(C32, CAP_U(0.1))
+	CAP(C33, CAP_U(0.47))
+	CAP(C34, CAP_U(0.05))
+	CAP(C35, CAP_U(0.05))
+	CAP(C36, CAP_U(0.01))
+	CAP(C37, CAP_U(0.1))
+//  CAP(C38, CAP_P(470)) -- part of final amp (not emulated)
+//  CAP(C39, CAP_P(470)) -- part of final amp (not emulated)
+//  CAP(C40, CAP_P(470)) -- part of final amp (not emulated)
+
+	D_1N5240(D1)
+	D_1N914(D2)
+	D_1N914(D3)
+	D_1N914(D4)
+	D_1N914(D5)
+
+	Q_2N3906(Q1)            // PNP
+	Q_2N3906(Q2)            // PNP
+	Q_2N3906(Q3)            // PNP
+	Q_2N3906(Q4)            // PNP
+	Q_2N3904(Q5)            // NPN
+//  Q_2N5878(Q6)            // NPN -- part of final amp (not emulated)
+//  Q_2N5876(Q7)            // PNP -- part of final amp (not emulated)
+
+	TL081_DIP(IC1)          // Op. Amp.
+	NET_C(IC1.7, I_V15)
+	NET_C(IC1.4, I_VM15)
+
+	CA3080_DIP(IC2)         // Op. Amp.
+	NET_C(IC2.4, I_VM15)
+	NET_C(IC2.7, I_V15)
+
+	CA3080_DIP(IC3)         // Op. Amp.
+	NET_C(IC3.4, I_VM15)
+	NET_C(IC3.7, I_V15)
+
+	LM555_DIP(IC4)
+
+	TL081_DIP(IC5)          // Op. Amp.
+//  NET_C(IC5.7, I_V15)     // (indirectly via R15)
+	NET_C(IC5.4, I_VM15)
+
+	TL081_DIP(IC6)          // Op. Amp.
+	NET_C(IC6.4, I_VM15)
+	NET_C(IC6.7, I_V15)
+
+	TL081_DIP(IC7)          // Op. Amp.
+	NET_C(IC7.4, I_VM15)
+	NET_C(IC7.7, I_V15)
+
+	TTL_74LS125_DIP(IC8)    // Quad 3-state Buffers
+	NET_C(IC8.7, GND)
+	NET_C(IC8.14, I_V5)
+
+	LM555_DIP(IC9)
+
+//  TTL_7815_DIP(IC10)      // +15V Regulator -- not emulated
+//  TTL_7915_DIP(IC11)      // -15V Regulator -- not emulated
+
+	LM555_DIP(IC12)
+
+	CA3080_DIP(IC13)        // Op. Amp.
+	NET_C(IC13.4, I_VM15)
+	NET_C(IC13.7, I_V15)
+
+	TTL_74121_DIP(IC14)     // Monostable multivibrators with Schmitt-trigger inputs
+	NET_C(IC14.7, GND)
+	NET_C(IC14.14, I_V5)
+
+	TTL_7406_DIP(IC15)      // Hex inverter -- currently using a clone of 7416, no open collector behavior
+	NET_C(IC15.7, GND)
+	NET_C(IC15.14, I_V5)
+
+	TL081_DIP(IC16)         // Op. Amp.
+	NET_C(IC16.4, I_VM15)
+	NET_C(IC16.7, I_V15)
+
+	LM555_DIP(IC17)
+
+	CA3080_DIP(IC18)        // Op. Amp.
+	NET_C(IC18.4, I_VM15)
+	NET_C(IC18.7, I_V15)
+
+//  TL081_DIP(IC19)         // Op. Amp. -- part of final amp (not emulated)
+//  NET_C(IC19.4, I_VM15)
+//  NET_C(IC19.7, I_V15)
+
+#if (HLE_NOISE_GEN)
+	//
+	// The "wideband noise gen" relies on properties
+	// of the components to create noise. Not only
+	// does this simulate poorly, but it would be too
+	// slow for realtime, so HLE it with some quality
+	// noise.
+	//
+	// Note that Sundance and Tail Gunner have the
+	// exact same circuit.
+	//
+	CLOCK(NOISE_CLOCK, 10000)
+	NET_C(NOISE_CLOCK.GND, GND)
+	NET_C(NOISE_CLOCK.VCC, I_V5)
+
+	SYS_NOISE_MT_U(NOISE, 3)
+	NET_C(NOISE.I, NOISE_CLOCK.Q)
+	NET_C(NOISE.1, GND)
+	NET_C(NOISE.2, R1.2, R7.1, R35.1)
+
+	NET_C(GND, C9.1, C9.2, C10.1, C10.2, C11.1, C11.2, C12.1, C12.2, C13.1, C13.2)
+	NET_C(GND, D1.A, D1.K, D2.A, D2.K, D3.A, D3.K)
+	NET_C(GND, R15.1, R15.2, R16.1, R16.2, R17.1, R17.2, R18.1, R18.2, R19.1, R19.2, R20.1, R20.2, R21.1, R21.2, R22.1, R22.2, R23.1, R23.2)
+	NET_C(GND, IC5.2, IC5.3, IC5.7, IC6.2, IC6.3, IC7.2, IC7.3)
+#else
+	NET_C(C9.2, C10.1, GND)
+	NET_C(C9.1, C10.2, D1.K, R15.1, IC5.7)
+	NET_C(R15.2, C13.1, I_V15)
+	NET_C(C13.2, GND)
+	NET_C(D1.A, C11.1, R17.2)
+	NET_C(R17.1, GND)
+	NET_C(C11.2, R18.2, IC5.3)
+	NET_C(R18.1, C12.1, R19.2)
+	NET_C(R19.1, GND)
+	NET_C(C12.2, IC5.2, R20.1)
+	NET_C(R20.2, IC5.6, R21.1)
+	NET_C(R21.2, IC6.2, R16.1, D3.A, D2.K)
+	NET_C(D2.A, A3.K, R16.2, IC6.6)
+	NET_C(IC6.3, GND)
+	NET_C(R22.2, R23.1, IC7.2)
+	NET_C(IC7.3, GND)
+	NET_C(R23.2, IC7.6, R1.2, R7.1, R35.1)
+#endif
+
+	//
+	// Explosion
+	//
+
+	NET_C(I_OUT_2, R11.1, IC4.2)
+	NET_C(R11.2, R12.2, IC4.8, IC4.4, I_V5) // IC4.4 not listed
+	NET_C(R12.1, IC4.6, IC4.7, C7.1)
+	NET_C(C7.2, GND)
+	NET_C(IC4.1, GND)
+	NET_C(IC4.3, Q1.E)
+	NET_C(Q1.B, R13.2)
+	NET_C(R13.1, GND)
+	NET_C(Q1.C, C8.1, R14.1)
+	NET_C(C8.2, I_VM15)
+	NET_C(R14.2, IC2.5)
+
+	NET_C(C1.1, GND)
+	NET_C(C1.2, R2.1, R1.1)
+	NET_C(R2.2, C2.1)
+	NET_C(C2.2, IC1.2, R3.1, C3.1)
+	NET_C(IC1.3, GND)
+	NET_C(C3.2, R3.2, IC1.6, R4.1)
+	NET_C(R4.2, C4.1)
+	NET_C(C4.2, R5.2, IC2.2)
+	NET_C(R5.1, GND)
+	NET_C(IC2.3, R6.2)
+	NET_C(R6.1, GND)
+	NET_C(IC2.6, R58.1)
+
+	//
+	// Reappearance hiss
+	//
+
+	NET_C(I_OUT_4, IC8.13)
+	NET_C(IC8.12, R24.1)
+	NET_C(R24.2, I_V5)
+	NET_C(IC8.11, Q2.E)
+	NET_C(Q2.B, R26.2)
+	NET_C(R26.1, GND)
+	NET_C(Q2.C, C14.1, R25.1)
+	NET_C(C14.2, I_VM15)
+	NET_C(R25.2, IC3.5)
+
+	NET_C(R7.2, C5.1)
+	NET_C(C5.2, R8.2, C6.1)
+	NET_C(R8.1, GND)
+	NET_C(C6.2, R9.2, IC3.2)
+	NET_C(R9.1, GND)
+	NET_C(IC3.3, R10.2)
+	NET_C(R10.1, GND)
+	NET_C(IC3.6, R58.1)
+
+	//
+	// Hi level / Normal level sword hum
+	//
+
+	NET_C(I_OUT_1, IC8.4)
+	NET_C(IC8.5, R24.1)
+	NET_C(IC8.6, Q3.E)
+	NET_C(Q3.B, R27.2)
+	NET_C(R27.1, GND)
+	NET_C(Q3.C, R28.1, R29.1)
+	NET_C(R28.2, IC13.5)
+	NET_C(R29.2, Q4.C)
+	NET_C(Q4.B, R30.2)
+	NET_C(R30.1, GND)
+	NET_C(Q4.E, IC8.3)
+	NET_C(IC8.2, R24.1)
+	NET_C(I_OUT_0, IC8.1)
+
+	NET_C(R36.2, IC12.4, IC12.8, I_V15)
+	NET_C(R36.1, IC12.7, R37.2)
+	NET_C(R37.1, IC12.6, IC12.2, C27.2)
+	NET_C(C27.1, GND, IC12.1, C28.1)
+	NET_C(C28.2, IC12.5)
+	NET_C(IC12.3, R38.1)
+	NET_C(R38.2, C29.1, R39.1)
+	NET_C(C29.2, GND)
+	NET_C(R39.2, C30.1, R40.1)
+	NET_C(C30.2, GND)
+
+	NET_C(R31.2, IC9.4, IC9.8, I_V15)
+	NET_C(R31.1, IC9.7, R32.2)
+	NET_C(R32.1, IC9.6, IC9.2, C15.1)
+	NET_C(C15.2, IC9.1, GND, C16.1)
+	NET_C(C16.2, IC9.5)
+	NET_C(IC9.3, R33.1)
+	NET_C(R33.2, C17.1, R34.1)
+	NET_C(C17.2, GND)
+	NET_C(R34.2, C18.1, C19.1)
+	NET_C(C18.2, GND)
+	NET_C(C19.2, C20.2, C21.2, R41.2, IC13.2)
+	NET_C(R41.1, GND)
+	NET_C(R35.2, C20.1)
+	NET_C(C21.1, R40.2)
+	NET_C(IC13.3, R42.2)
+	NET_C(R42.1, GND)
+	NET_C(IC13.6, R58.1)
+	NET_C(R58.2, GND)
+	ALIAS(OUTPUT, R58.1)
+
+	//
+	// Pit fall
+	//
+
+	NET_C(I_OUT_3, IC8.10, IC14.4)
+	NET_C(R43.2, I_V5)
+	NET_C(R43.1, IC14.11, C31.1)
+	NET_C(C31.2, IC14.10)
+	NET_C(IC14.5, IC14.3, I_V5)
+	NET_C(IC14.6, IC15.1)
+	NET_C(IC15.2, R44.1)
+	NET_C(R44.2, D4.K, C33.1)
+	NET_C(C33.2, GND)
+	NET_C(D4.A, R46.1)
+
+	NET_C(R52.2, IC17.4, IC17.8, I_V15)
+	NET_C(R52.1, IC17.7, R53.2)
+	NET_C(R53.1, IC17.6, IC17.2, C35.2)
+	NET_C(C35.1, IC17.1, C36.1, GND)
+	NET_C(C36.2, IC17.5)
+	NET_C(IC17.3, C32.2)
+	NET_C(C32.1, R45.2)
+
+#if (HLE_PITFALL_VCO)
+	//
+	// This VCO is very tricky to HLE. There is an rising curve
+	// controlling the VCO that is modulated by a 555 timer. To
+	// approximate this, the 555 was disconnected from the ciruit
+	// and full simulation recorded at 1000x rate to find the
+	// mapping between the input (taken from R46.2) and the final
+	// TTL output at IC8.9.
+	//
+	// Map from original R46.2 to IC8.9 with 555 timer removed:
+	//    R2 = 0.97609: HP = (0.000065653*A0) - 0.000100931
+	//    R2 = 0.99674: HP = (0.00000448319*A0*A0) - (0.00000588451*A0) + 0.000158263
+	//    R2 = 0.99695: HP = (0.000000153649*A0*A0*A0) + (0.000000894331*A0*A0) + (0.0000204462*A0) + 0.000098055
+	//    R2 = 0.99808: HP = (0.000000086668*A0*A0*A0*A0) - (0.00000223815*A0*A0*A0) + (0.0000235819*A0*A0) - (0.000064560*A0) + 0.000198836
+	//    R2 = 0.99808: HP = (-0.000000000510037*A0*A0*A0*A0*A0) + (0.000000103515*A0*A0*A0*A0) - (0.00000243946*A0*A0*A0) + (0.0000246047*A0*A0) - (0.000066382*A0) + 0.000198653
+	//
+	// As usual this mapping changed once the VCO was removed
+	// from the ciruit, so this is the mapping that is used:
+	//
+	// Map from clipped R46.2 to IC8.9 when the 555 timer is removed:
+	//    R2 = 0.99759: HP = (0.00369938*A0) - 0.000165421
+	//    R2 = 0.99774: HP = (-0.00117988*A0*A0) + (0.00409590*A0) - 0.000196405
+	//    R2 = 0.99774: HP = (0.00262450*A0*A0*A0) - (0.00252128*A0*A0) + (0.00431521*A0) - 0.000207837
+	//    R2 = 0.99774: HP = (-0.00269118*A0*A0*A0*A0) + (0.00447056*A0*A0*A0) - (0.00298272*A0*A0) + (0.00436492*A0) - 0.000209783
+	//    R2 = 0.99774: HP = (1.393570*A0*A0*A0*A0*A0) - (1.202353*A0*A0*A0*A0) + (0.408585*A0*A0*A0) - (0.069485*A0*A0) + (0.0097063*A0) - 0.000377210
+	//
+	// Then the 555 timer modulation is added back in via an
+	// AFUNC. This is not 100% perfect, since we are modulating
+	// the clipped value not the original, but it provides a
+	// reasonable approximation.
+	//
+	AFUNC(PITFALLMOD, 2, "A0 + (A1-7.5)/150")
+	NET_C(R46.2, PITFALLMOD.A0)
+	NET_C(R45.1, PITFALLMOD.A1)
+	VARCLOCK(PITFALLCLK, 1, "max(0.000001,min(0.1,(0.00262450*A0*A0*A0) - (0.00252128*A0*A0) + (0.00431521*A0) - 0.000207837))")
+	NET_C(PITFALLCLK.GND, GND)
+	NET_C(PITFALLCLK.VCC, I_V5)
+	NET_C(PITFALLCLK.Q, IC8.9)
+	NET_C(PITFALLCLK.A0, PITFALLMOD.Q)
+	NET_C(GND, R47.1, R47.2, R48.1, R48.2, R49.1, R49.2, R50.1, R50.2, R51.1, R51.2, C34.1, C34.2, D5.A, D5.K, IC16.2, IC16.3)
+#else
+	NET_C(R45.1, D4.K)
+	NET_C(R46.2, IC16.3, D5.K, R48.1)
+	NET_C(D5.A, GND)
+	NET_C(R48.2, IC16.6, R47.2, R49.1)
+	NET_C(R47.1, IC16.2, C34.2)
+	NET_C(C34.1, GND)
+	NET_C(R49.2, R50.2, Q5.B)
+	NET_C(R50.1, GND)
+	NET_C(Q5.E, GND)
+	NET_C(Q5.C, R51.1)
+	NET_C(Q5.C, IC8.9)
+	NET_C(R51.2, I_V5)
+#endif
+
+	NET_C(IC8.8, C37.1)
+	NET_C(C37.2, R54.1)
+	NET_C(R54.2, R55.2, IC18.2)
+	NET_C(R55.1, GND)
+	NET_C(IC18.3, R56.2)
+	NET_C(R56.1, GND)
+	NET_C(R57.2, IC18.5)
+	NET_C(R57.1, GND)
+	NET_C(IC18.6, R58.1)
+
+	//
+	// Unconnected inputs
+	//
+
+	NET_C(GND, IC15.3, IC15.5, IC15.9, IC15.11, IC15.13)
+
+	//
+	// Unconnected outputs
+	//
+
+/*
+    HINT(IC5.4, NC)     // Q1
+    HINT(IC5.6, NC)     // Q2
+    HINT(IC5.8, NC)     // Q3
+    HINT(IC5.10, NC)    // Q4
+    HINT(IC5.12, NC)    // Q5
+*/
+
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/audio/nl_warrior.h mame-0.224+dfsg.1/src/mame/audio/nl_warrior.h
--- mame-0.222+dfsg.1/src/mame/audio/nl_warrior.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/nl_warrior.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,10 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_NL_WARRIOR_H
+#define MAME_AUDIO_NL_WARRIOR_H
+
+#pragma once
+
+NETLIST_EXTERNAL(warrior)
+
+#endif // MAME_AUDIO_NL_WARRIOR_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/pinsnd88.cpp mame-0.224+dfsg.1/src/mame/audio/pinsnd88.cpp
--- mame-0.222+dfsg.1/src/mame/audio/pinsnd88.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/pinsnd88.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,274 @@
+// license:BSD-3-Clause
+// copyright-holders: Jonathan Gevaryahu
+/*
+ * pinsnd88.h - D-12338-567 Williams Pin Sound '88 board (M68B09E + YM2151 + DAC, two channels)
+ * PCB solder side trace P/N: 5766-12342-00 REV -
+ *
+ * Used only by the Williams System 11B pinball game "Jokerz!"
+ *
+ * The interface connector for this board is a 20 pin header J1 with the following pinout:
+ *
+ *            +--------+
+ *        GND |  1   2 | NC
+ *        PB0 |  3   4 | PB1
+ *        PB2 |  5   6 | PB3
+ *        PB4 |  7   8 | PB5
+ *        PB6 |  9  10 | PB7
+ *         NC | 11  12 | NC [/SYNC_PULSE] (normal system 11 bg sound board uses this pin)
+ *    /STROBE | 13  14 | NC [/RESET_S11]
+ *         NC | 15  16 | /SYNC_PULSE_ALT
+ *         NC | 17  18 | /RESET
+ *         NC | 19  20 | NC
+ *            +--------+
+ *
+ * Technically:
+ * Pin 13 is 'strobe in' and is asserted low to write to the sound board
+ * Pin 12 is 'sync out' and is asserted low to indicate the sound board
+ * has done some action. Unlike the D-11581 sound board, this board cannot
+ * write response data back to the host device.
+ *
+ * The actual full pinout of the connector, from the System 11 end is:
+ *        +--------+
+ *    GND |  1   2 | BLANKING
+ *    MD0 |  3   4 | MD1
+ *    MD2 |  5   6 | MD3
+ *    MD4 |  7   8 | MD5
+ *    MD6 |  9  10 | MD7
+ *   LCB1 | 11  12 | MCB1
+ *   MCB2 | 13  14 | /RESET
+ *   LCA1 | 15  16 | MCA1
+ *    R/W | 17  18 | MCA2
+ *      E | 19  20 | NC
+ *        +--------+
+ *
+ *
+ * This PCB shows deisgn choices which place it between the design of the
+ * D-11581 Williams System 11 Background Sound board (s11c_bg.cpp) and
+ * the A-12738-500xx WPC Sound board (wpcsnd.cpp), notably that it does
+ * not use a 68B21 PIA, and it has a fixed ROM bank from 0xC000-0xFFFF
+ * with the vectors instead of requiring the 68B09E vectors to appear in
+ * every rom bank.
+ * It even has two unused I/O addresses for supporting a CVSD chip with latches
+ * though the pcb is not configured for this.
+ * The C-12350 NARC sound board's master CPU shares its memory map with this
+ * board, but the NARC board was seemingly, based on its part number, designed
+ * slightly later.
+ *
+ *
+ * D-12338 Jumpers:
+ * W1 : enables the 8MHz clock to the divider to the 68B09E. present.
+ * W2 : enables /SYNC PULSE on J1 P16. present, despite being missing on the schematics.
+ * W3 : enables /SYNC PULSE on J1 P12 (as the usual S11 BG sound board does). absent.
+ * W4 : enables /RESET from J1 P18 (under cpu control, as the usual S11 BG sound board does). present.
+ * W5 : enables /RESET from J1 P14 (this makes the board reset on S11 power up reset only). absent.
+ * W6 : enables the 3.579545MHz clock to the YM2151. present.
+ * W7 : ties J4 pin 1 and 2 to GND. absent, despite being present on the schematics.
+ * W8 : ties J4 pin 5-through-inductor and the final audio power amp + pins to +12v. absent, as power is presuambly delivered in through J4 pin 5 instead.
+
+ * see https://a.allegroimg.com/s1024/0c2cfa/0433164f4bfa94aa99cec60874f5 re: W2 being connected on the real board. (also see undumped REV1 rom)
+ * see https://a.allegroimg.com/s1024/0c3dce/74cdfa004e1dbac943986a94999b re: W8 being absent
+ * see https://a.allegroimg.com/s1024/0c2979/0ffe7737466bb0ee363d4e127e33 re: W8 being absent
+
+ * NOTE: The Jokerz! pinball cabinet is known to have some significant issues with hum in the audio,
+ * Williams released a service bulletin which involved modifying the power pins on the CVSD chip
+ * on the System 11B Mainboard, but even that didn't completely fix it. The exact cause of this
+ * issue is not entirely clear at this point.
+
+
+ * TODO: the 'reset twice on reset' thing seems necessary or else tempo is horrendously screwed up. why?
+ * TODO: the 'treat reading the analog control port as if it is connected to the input latch and clear the input semaphore' seems necessary for sound to work. why? It doesn't match the schematics...
+
+
+ * NOTE: The Pin Sound '88 board used by Jokerz! can handle up to two 27c010
+ * EPROMs, but it only ever shipped with a single 27512 EPROM.
+ * Because of the way that the 27512 sits in the lower 28 pins of the 32 pin socket,
+ * this makes the mapping a little odd.
+ *  Bank # and area         Banked space    If 2x 27c010    If 1x 27512
+ *  Bank 0 4000-7fff        00000-03fff     U6 00000-03fff  open bus
+ *  Bank 0 8000-bfff        04000-07fff     U6 04000-07fff  open bus
+ *  Bank 1 4000-7fff        08000-0bfff     U6 08000-0bfff  open bus
+ *  Bank 1 8000-bfff        0c000-0ffff     U6 0c000-0ffff  open bus
+ *  Bank 2 4000-7fff        10000-13fff     U6 10000-13fff  open bus
+ *  Bank 2 8000-bfff        14000-17fff     U6 14000-17fff  open bus
+ *  Bank 3 4000-7fff        18000-1bfff     U6 18000-1bfff  open bus
+ *  Bank 3 8000-bfff        1c000-1ffff     U6 1c000-1ffff  open bus
+ *  Bank 4 4000-7fff        20000-23fff     U5 00000-03fff  U5 00000-03fff
+ *  Bank 4 8000-bfff        24000-27fff     U5 04000-07fff  U5 04000-07fff
+ *  Bank 5 4000-7fff        28000-2bfff     U5 08000-0bfff  U5 08000-0bfff
+ *  Bank 5 8000-bfff        2c000-2ffff     U5 0c000-0ffff  U5 0c000-0ffff
+ *  Bank 6 4000-7fff        30000-33fff     U5 10000-13fff  U5 00000-03fff
+ *  Bank 6 8000-bfff        34000-37fff     U5 14000-17fff  U5 04000-07fff
+ *  Bank 7 4000-7fff        38000-3bfff     U5 18000-1bfff  U5 08000-0bfff
+ *  Bank 7 8000-bfff +fixed 3c000-3ffff     U5 1c000-1ffff  U5 0c000-0ffff
+*/
+
+#include "emu.h"
+#include "pinsnd88.h"
+#include "sound/volt_reg.h"
+
+
+DEFINE_DEVICE_TYPE(PINSND88, pinsnd88_device, "pinsnd88", "Williams Pin Sound '88 Audio Board")
+
+pinsnd88_device::pinsnd88_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig,PINSND88,tag,owner,clock)
+	, device_mixer_interface(mconfig, *this, 2) // 2 channels
+	, m_cpu(*this, "cpu")
+	, m_dac(*this, "dac")
+	, m_ym2151(*this, "ym2151")
+	, m_cpubank(*this, "bank")
+	, m_syncq_cb(*this)
+	, m_old_resetq_state(ASSERT_LINE)
+	, m_data_in(0xff)
+	, m_inputlatch(*this, "inputlatch")
+{
+}
+
+/*
+15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00 RW
+0  0  0  *  *  *  *  *  *  *  *  *  *  *  *  *  RW  - 0x0000 - SRAM @U7
+0  0  1  0  0  0  x  x  x  x  x  x  x  x  x  *  RW  - 0x2000 - YM2151 @U16
+0  0  1  0  0  1  x  x  x  x  x  x  x  x  x  x  x   - 0x2400 - open bus (hypothesis: leftover from cvsd_clock_set_w circuit)
+0  0  1  0  1  0  x  x  x  x  x  x  x  x  x  x  W[1]- 0x2800 - ANALOG SWITCH, input sound and output stereo control; on NARC, latch to respond to main pcb
+0  0  1  0  1  1  x  x  x  x  x  x  x  x  x  x  x   - 0x2C00 - open bus (hypothesis: leftover from cvsd_digit_clock_clear_w circuit; on NARC, secondary command_w)
+0  0  1  1  0  0  x  x  x  x  x  x  x  x  x  x  W   - 0x3000 - 7224 DAC write
+0  0  1  1  0  1  x  x  x  x  x  x  x  x  x  x  R[2]- 0x3400 - Latch Read and de-assert MC68B09E /IRQ
+0  0  1  1  1  0  x  x  x  x  x  x  x  x  x  x  W[1]- 0x3800 - write ROM bank
+0  0  1  1  1  1  x  x  x  x  x  x  x  x  x  x  *   - 0x3C00 - pulse the /SYNC_PULSE line low using a 74LS123 retriggerable monostable multivibrator[3]
+0  1  *  *  *  *  *  *  *  *  *  *  *  *  *  *  R   - banked rom area (A14 low)
+1  0  *  *  *  *  *  *  *  *  *  *  *  *  *  *  R   - banked rom area (A14 high)
+1  1  *  *  *  *  *  *  *  *  *  *  *  *  *  *  R   - fixed rom area (permanently on the last bank, A14 high)
+[1] reading this address writes open bus garbage to it
+[2] writing this address clears the /IRQ state but doesn't read the latch/bus conflict
+[3] R=4.7k and C=.001uf, which pulses the /sync_pulse pin output from the sound board
+    low according to the datasheet formula:
+    TS = KRC, where K is the constant ~0.37, R is 4700),
+    and C is 0.000000001, for a result of 1.739us
+*/
+void pinsnd88_device::pinsnd88_map(address_map &map)
+{
+	map(0x0000, 0x1fff).ram();
+	map(0x2000, 0x2001).mirror(0x03fe).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write));
+	// 2400 open bus
+	// TODO: map(0x2800, 0x2800).mirror(0x03ff).w(FUNC(pinsnd88_device::analog_w));
+	map(0x2800, 0x2800).mirror(0x03ff).r(m_inputlatch, FUNC(generic_latch_8_device::read)); // TODO: For some inexplicable reason, this has to be mapped here or you get no sound. The schematic shows this mapped at 0x3400, not 0x2800?
+	// 2c00 open bus
+	map(0x3000, 0x3000).mirror(0x03ff).w(m_dac, FUNC(dac_byte_interface::data_w));
+	map(0x3400, 0x3400).mirror(0x03ff).r(m_inputlatch, FUNC(generic_latch_8_device::read));
+	map(0x3800, 0x3800).mirror(0x03ff).w(FUNC(pinsnd88_device::bgbank_w));
+	map(0x3c00, 0x3c00).mirror(0x03ff).w(FUNC(pinsnd88_device::sync_w));
+	map(0x4000, 0xbfff).bankr("bank").region("cpu", 0); // banked rom
+	map(0xc000, 0xffff).rom().region("cpu",0x3c000); // fixed bank
+}
+
+void pinsnd88_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	switch(id)
+	{
+		case TIMER_SYNC:
+			if (!m_syncq_cb.isnull())
+			{
+				logerror("pinsnd88 sync cleared!\n");
+				m_syncq_cb(ASSERT_LINE);
+				m_sync_timer->adjust(attotime::never);
+			}
+		break;
+	}
+}
+
+TIMER_CALLBACK_MEMBER(pinsnd88_device::deferred_sync_w)
+{
+	if (!m_syncq_cb.isnull())
+	{
+		logerror("pinsnd88 sync asserted!\n");
+		m_syncq_cb(CLEAR_LINE);
+		m_sync_timer->adjust(attotime::from_usec(2));
+	}
+	else
+		logerror("pinsnd88 sync writeback called, but callback is not registered!\n");
+}
+
+void pinsnd88_device::sync_w(uint8_t data)
+{
+	machine().scheduler().synchronize(timer_expired_delegate(FUNC(pinsnd88_device::deferred_sync_w),this), 0);
+}
+
+WRITE_LINE_MEMBER(pinsnd88_device::strobe_w)
+{
+	m_inputlatch->write(m_data_in);
+}
+
+void pinsnd88_device::data_w(uint8_t data)
+{
+	m_data_in = data;
+}
+
+WRITE_LINE_MEMBER(pinsnd88_device::resetq_w)
+{
+	if ((m_old_resetq_state != CLEAR_LINE) && (state == CLEAR_LINE))
+	{
+		logerror("PINSND88 device received reset request\n");
+		common_reset();
+	}
+	m_old_resetq_state = state;
+}
+
+
+void pinsnd88_device::device_add_mconfig(machine_config &config)
+{
+	MC6809E(config, m_cpu, XTAL(8'000'000) / 4); // MC68B09E
+	m_cpu->set_addrmap(AS_PROGRAM, &pinsnd88_device::pinsnd88_map);
+	config.set_maximum_quantum(attotime::from_hz(50));
+
+	// TODO: analog filters and "volume" controls for the two channels
+	AD7224(config, m_dac, 0);
+	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
+	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
+	vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
+	m_dac->add_route(ALL_OUTPUTS, *this, 0.41/2.0, AUTO_ALLOC_INPUT, 0); // 470K
+	m_dac->add_route(ALL_OUTPUTS, *this, 0.5/2.0, AUTO_ALLOC_INPUT, 1); // 330K
+
+	GENERIC_LATCH_8(config, m_inputlatch);
+	m_inputlatch->data_pending_callback().set_inputline(m_cpu, M6809_IRQ_LINE);
+
+	YM2151(config, m_ym2151, XTAL(3'579'545)); // "3.58 MHz" on schematics and parts list
+	m_ym2151->irq_handler().set_inputline(m_cpu, M6809_FIRQ_LINE); // IRQ is not true state, but neither is the M6809_FIRQ_LINE so we're fine.
+	m_ym2151->add_route(ALL_OUTPUTS, *this, 0.59/2.0, AUTO_ALLOC_INPUT, 0); // 330K
+	m_ym2151->add_route(ALL_OUTPUTS, *this, 0.5/2.0, AUTO_ALLOC_INPUT, 1); // 330K
+}
+
+void pinsnd88_device::device_start()
+{
+	u8 *rom = memregion("cpu")->base();
+	m_cpubank->configure_entries(0, 8, &rom[0x0], 0x8000);
+	m_cpubank->set_entry(0);
+	/* resolve lines */
+	m_syncq_cb.resolve();
+	/* timer */
+	m_sync_timer = timer_alloc(TIMER_SYNC);
+	m_sync_timer->adjust(attotime::never);
+	save_item(NAME(m_old_resetq_state));
+	save_item(NAME(m_data_in));
+}
+
+void pinsnd88_device::common_reset()
+{
+	// reset the CPU again, so that the CPU are starting with the right vectors (otherwise sound may die on reset)
+	m_cpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero); // TODO: WHY is this needed? this board uses a fixed set of vectors at a fixed rom bank! but it still doesn't work properly without this.
+	m_ym2151->reset();
+}
+
+void pinsnd88_device::device_reset()
+{
+	common_reset();
+}
+
+/*
+    Rom mapping for the 3 banking bits:
+    2 1 0
+    0 r q -  U6, A15 q, A16 r
+    1 r q -  U5, A15 q, A16 r
+*/
+void pinsnd88_device::bgbank_w(uint8_t data)
+{
+	m_cpubank->set_entry(data&0x7);
+}
diff -Nru mame-0.222+dfsg.1/src/mame/audio/pinsnd88.h mame-0.224+dfsg.1/src/mame/audio/pinsnd88.h
--- mame-0.222+dfsg.1/src/mame/audio/pinsnd88.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/pinsnd88.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,74 @@
+// license:BSD-3-Clause
+// copyright-holders: Jonathan Gevaryahu
+/*
+ * pinsnd88.h - D-12338-567 Williams Pin Sound '88 board (M68B09E + YM2151 + DAC, two channels)
+ *
+ */
+
+#ifndef MAME_AUDIO_PINSND88_H
+#define MAME_AUDIO_PINSND88_H
+
+#pragma once
+
+#include "cpu/m6809/m6809.h"
+#include "machine/gen_latch.h"
+#include "sound/ym2151.h"
+#include "sound/dac.h"
+
+
+class pinsnd88_device : public device_t, public device_mixer_interface
+{
+public:
+	// construction/destruction
+	pinsnd88_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+
+	// overrides
+	virtual void device_reset() override; // power up reset
+
+	// note to keep synchronization working, the host machine should have synchronization timer expired delegates
+	// if possible, before writing to the following things:
+	DECLARE_WRITE_LINE_MEMBER(strobe_w); // external write to board (J1 pin 13)
+	void data_w(uint8_t data); // external write to board data bus (J1 pins 3 thru 10 for D0-D7)
+	DECLARE_WRITE_LINE_MEMBER(resetq_w); // external write to board /RESET (J1 pin 18)
+
+	// callbacks
+	auto syncq_cb() { return m_syncq_cb.bind(); }
+
+	void pinsnd88_map(address_map &map);
+
+protected:
+	// constructor with overridable type for subclass, in case we want to put NARC's sound board in here eventually
+	//pinsnd88_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock = 0);
+
+	// overrides
+	virtual void device_start() override;
+	virtual void device_add_mconfig(machine_config &config) override;
+
+	TIMER_CALLBACK_MEMBER(deferred_sync_w);
+
+	// members
+	required_device<mc6809e_device> m_cpu;
+	required_device<ad7224_device> m_dac;
+	required_device<ym2151_device> m_ym2151;
+	required_memory_bank m_cpubank;
+
+	static const device_timer_id TIMER_SYNC = 0;
+private:
+	// overrides
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+	// members
+	devcb_write_line m_syncq_cb;
+	uint8_t m_old_resetq_state;
+	uint8_t m_data_in;
+	required_device<generic_latch_8_device> m_inputlatch;
+	emu_timer* m_sync_timer;
+
+	void common_reset(); // common reset function used by both internal and external reset
+	void sync_w(uint8_t data); // internal helper for deferred sync writeback
+	void bgbank_w(uint8_t data);
+};
+
+DECLARE_DEVICE_TYPE(PINSND88, pinsnd88_device)
+
+#endif // MAME_AUDIO_PINSND88_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/s11c_bg.cpp mame-0.224+dfsg.1/src/mame/audio/s11c_bg.cpp
--- mame-0.222+dfsg.1/src/mame/audio/s11c_bg.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/s11c_bg.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,56 +1,341 @@
 // license:BSD-3-Clause
-// copyright-holders:Barry Rodewald
+// copyright-holders:Barry Rodewald, Jonathan Gevaryahu
 /*
- * s11c_bg.c - Williams System 11C background music (M68B09E + YM2151 + HC55516 + DAC)
+ * s11c_bg.cpp - Williams D-11581 "Audio Board" PCB trace part number: 5766-12130-00 REV A.
+ * (M68B09E + YM2151 + HC555xx + DAC)
+ *
+ * Used by Williams System 11A (F-14), all System 11B (except Jokerz) and all System 11C pinballs
+ * Used by Midway Y-Unit Arcade Hardware (for Smash TV, Trog, and Strike Force; see below
+ * for [Super] High Impact Football)
+ *
+ * The interface connector for this board is a 20 pin header J4 with the following pinout:
+ *
+ *            +--------+
+ *        GND |  1   2 | NC
+ *        PB0 |  3   4 | PB1
+ *        PB2 |  5   6 | PB3
+ *        PB4 |  7   8 | PB5
+ *        PB6 |  9  10 | PB7
+ *         NC | 11  12 | CB2 (/stbr)
+ * (/stb) CB1 | 13  14 | NC
+ *         NC | 15  16 | NC
+ *         NC | 17  18 | /RESET
+ *         NC | 19  20 | NC
+ *            +--------+
+ *
+ * Technically:
+ * CB1 Pin 13 is 'strobe in' and is asserted low to write to the sound board
+ * CB2 Pin 12 is 'strobe out' and is asserted low to indicate the sound board
+ * has written and needs the mainboard to read its bus
+ *
+ * The actual full pinout of the connector, from the System 11 end is:
+ *        +--------+
+ *    GND |  1   2 | BLANKING
+ *    MD0 |  3   4 | MD1
+ *    MD2 |  5   6 | MD3
+ *    MD4 |  7   8 | MD5
+ *    MD6 |  9  10 | MD7
+ *   LCB1 | 11  12 | MCB1
+ *   MCB2 | 13  14 | /RESET
+ *   LCA1 | 15  16 | MCA1
+ *    R/W | 17  18 | MCA2
+ *      E | 19  20 | NC
+ *        +--------+
+ *
+ *
+ * The mixing resistors before the MC1458 differ between the D-11581,
+ * D-11581-20xx (System 11C), and D-1129x board schematics:
+ * (All resistors are 5% unless otherwise noted)
+ * newstyle P/N                              A-13971-43313 (and A-13971-500xx)
+ * oldstyle P/N    D-1129x    D-11581        D-11581-20xx or D-11581-400xx
+ * CPU_SOUND       R32 2.2k   R12 2.2k       R12 4.7k
+ * YM2151 CH1      R33 10k    R14 10k        R14 20k
+ * YM2151 CH2      R34 10k    R15 10k        R15 20k
+ * MC1408 DAC      R35 10k    R16 6.3k       R16 13k
+ * CVSD           [R30 10k]  [R13 4.99k 1%]  R13 4.99k 1%
+ * MC1458 Feedback R38 10k    R17 10k        R17 10k
+ * MC1458 +-to-gnd R36 4.7k   R11 4.7k       R11 4.7k
+ * [] - if CVSD section present
+
+ * Note that some D-11581 boards have the D-11297/8 mixing resistors in place,
+ * i.e. those intended for use as replacement parts for D-1129x boards.
+ * See https://pinwiki.com/wiki/images/f/fc/System_11_Sound_Board.JPG for an
+ * example, which may have originally been a D-11298 replacement, as the CVSD
+ * section is unpopulated.
+
+ * Note that the System11C D-11581-20xx/400xx boards have the mixing resistors
+ * changed to make the CVSD sound roughly twice as loud as it typically
+ * would be, by doubling the resistor values for the other mixer inputs,
+ * see https://pinwiki.com/wiki/images/7/7e/System11CSoundBoard.jpg
+
+ * D-11581 Jumpers:
+ * W1 - exclusive w/W4, W6 : YM2151 reset comes from Board PIA CA2
+ * W2 - exclusive w/W3     : EPROMS U4, U19, [U20] are 27512
+ * W3 - exclusive w/W2     : EPROMS U4, U19, [U20] are 2764, 27128 or 27256 (where pin 1 must be high) [Pre-System 11C boards (i.e. D-11581) have a trace shorting W3 closed permanently which must be cut if 27512 EPROMs are to be used]
+ * W4 -'exclusive'w/W4, W6 : YM2151 reset comes from PIA CB2/J4 P12 (internal or external)
+ * W5                      : Board Reset comes from J4 P18 (if absent, Board Reset is generated from power up)
+ * W6 - exclusive w/W4, W6 : YM2151 reset comes from Board Reset
+ * W7                      : if present, the VCC/+5v rail is shorted to the +12v rail. (This is used in the case where the board is only run on +5v and -12v instead of +5v, +12v, and -12v)
+ * W8 - exclusive w/W9     : U5 is a 6164 SRAM (pin 23/A11 is grounded)
+ * W9 - exclusive w/W8     : U5 is a 6116 SRAM (pin 21, footprint pin 23, is /WE)
+
+ * These two jumpers are only on the D-11581-20xx/400xx (System 11C) version,
+ *   and W2 and W3 do not affect U20 on this PCB version:
+ * W10 - linked w/W2+W3    : (only if W2 is also set) EPROM U20 is a 27512
+ * W11 - linked w/W2+W3    : EPROM U20 is a 2764, 27128 or 27256 (where pin 1 must be high)
+
+
+ * NOTE: A board called A-13971-50003 is used on Midway Y-Unit Arcade Hardware
+ * High Impact Football and Super High Impact Football, and on the first 500 or
+ * so Funhouse Pinball machines. (Later Funhouse pinballs use the A-12738-50003
+ * WPC Sound board, mentioned in the CVSD filtering section below. Despite its
+ * earlier part number, the A-12738-50003 WPC Sound Board is a newer design,
+ * with the A-13971-50003 mentioned here seemingly produced later as a stopgap
+ * due to development or production issues with the WPC Sound Board.)
+ * The A-13971-50003 board is ALMOST the same as the D-11581-20xx System 11C
+ * version, except it has 32 pin sockets for 27c010 chips, instead of 28 pin
+ * sockets for smaller chips. Despite this, the board is fully backwards
+ * compatible with the D-11581-20xx, including the mixing resistors.
+ * The highest address bit (A16, pin 2) for all 3 EPROMs (as shown in the
+ * High Impact Football schematics) is driven by the ROM banking register
+ * 0x7800 bit 3, which is unused/unconnected on all older board revisions.
+ * The 32 pin EPROM socket pins 1(VPP), 31(/PGM), 32(VCC) and 30(NC) are all
+ * tied to VCC.
+ * Jumpers W2, W3, W10 and W11 act the same as they do on D-11581-20xx, just
+ * the pins they control are offset down in the socket by 2 pins.
+ * This means this board is fully backwards compatible with D-11581-20xx.
+ * (Note that the prototype Funhouse Schematics and the Super High Impact
+ * Footall Kit Service manual both incorrectly have schematics for the
+ * D-11581-20xx System 11C version of the board, and do not show the extra
+ * banking bit and larger sockets that the A-13971-50003 board has.)
+
+
+
+ * Williams D-11297/D-11298 "BG Music & Speech Board":
+ * D-11297/D-11298 is the predecessor to D-11581, and is fully compatible with it.
+ * It is a larger board, physically.
+ * It is used on the following Williams System 11A games:
+ * D-11297 (CVSD populated)  : PIN*BOT (and prototype F-14 Tomcat)
+ * D-11298 (CVSD unpopulated): Millionaire!
+ * It has different mixing resistors to the D-11581.
+
+ * Unlike the later D-11581 board which has mono output only, the D-11297/8 board
+ * has provisions for stereo output from the YM2151, but it is unclear if these were
+ * ever populated on any shipping boards.
+
+ * D-1129x Jumpers:
+ * W1                      : Board Reset comes from J4 P18 (if absent, Board Reset is generated from power up or a manual test switch sw1)
+ * W2 - exclusive w/W3     : EPROMS U4, U19, U20 are 27512
+ * W3 - exclusive w/W2     : EPROMS U4, U19, U20 are 2764, 27128 or 27256 (where pin 1 must be high)
+ * W4                      : if present, the VCC/+5v rail is shorted to the +12v rail. (This is used in the case where the board is only run on +5v and -12v instead of +5v, +12v, and -12v)
+ * W5 - exclusive w/W6, W7 : YM2151 reset comes from Board Reset
+ * W6 -'exclusive'w/W5, W7 : YM2151 reset comes from PIA CB2/J4 P12 (internal or external)
+ * W7 - exclusive w/W5, W6 : YM2151 reset comes from Board PIA CA2
+
+
+
+ * CVSD filter:
+ * The CVSD filter on all of these boards has the same components:
+ *
+ *                                     .--------+---------.                      .--------+---------.
+ *                                     |        |         |                      |        |         |
+ *                                     Z       --- c2     |                      Z       --- c12    |
+ *                                     Z r3    --- 180pf  |                      Z r13   --- 1200pf |
+ *                                     Z 180k   |         |                      Z 27k    |         |
+ *          + c10     r1               |   r2   |  |\     |     r11              |   r12  |  |\     |
+ *   In >----|(------ZZZZ----+---------+--ZZZZ--+  | \    +----ZZZZ----+---------+--ZZZZ--+  | \    |
+ *            1uf     43k    |             36k  '--|- \   |     27k    |             15k  '--|- \   |   + c20
+ *                          ---  c1                |   >--'           ---  c11               |   >--+----|(----> to mix resistor
+ *                          ---  0uf[1]         .--|+ /               ---  4700pf         .--|+ /         10uf
+ *                           |             r4   |  | /                 |             r14  |  | /
+ *                          gnd        .--ZZZZ--'  |/                 gnd        .--ZZZZ--'  |/
+ *                                     |   220k     MC1458                       |   27k      MC1458
+ *                                    gnd                                       gnd
+ *
+ *
+ * [1] Logically there should be a capacitor to ground at c1 of value 1800uf,
+ *     but this was omitted on the D-11297 board, possibly in error, and this
+ *     omission carried over to future sound boards including all versions of the D-11581.
+ *     The later WPC Sound board, A-12738-500xx, fixed this by completely redesigning the filters
+ *     for the YM2151, DAC and CVSD.
+ *
+ * This circuit would be a 4th order (cascaded 2nd order) op-amp multifeedback lowpass filter,
+ *  but because of the capacitor omitted, it is actually a first order-with-gain lowpass,
+ *  cascaded into a 2nd order lowpass, forming a 3rd order filter.
+ *
+ * This same exact circuit, same component values (but including the capacitor missing here),
+ * appears on the System 11 and System 11A mainboards, where it forms a 4th order filter.
+ * System 11B changed the components slightly, presumably so the CVSD produced on the mainboard
+ * sounded a bit different tone-wise to the CVSD produced from the Audio Board, or to reduce the
+ * number of distinct part values to reduce cost per board.
+
+
+
+ * Williams "BG Music Board" D-11197-542 16-8972
+ *  * used on Williams System 11 'Road Kings' only
+ *  * has DAC and YM2151/YM3012
+ *  * PIA CA2 EPROM banking
+ *  * This board, like D-1129x, has provisions for YM2151 stereo via two amplifiers to be
+ *     populated on the board itself, but like D-1129x they and their supporting passives are not populated.
+
+ * The mixing resistors on this board are the same as D-1129x, except the CPU_SOUND input resistor is 2.7k instead of 2.2k
+ * There is no CVSD section at all.
+
+ * D-11197 Jumpers:
+ * W1                      : Board Reset comes from J4 P18 (if absent, Board Reset is generated from power up or a manual test switch sw1)
+ * W2 - exclusive w/W3     : EPROMS U4 is a 27512
+ * W3 - exclusive w/W2     : EPROMS U4 is a 2764, 27128 or 27256 (where pin 1 must be high)
+ * W4                      : if present, the VCC/+5v rail is shorted to the +12v rail. (This is used in the case where the board is only run on +5v and -12v instead of +5v, +12v, and -12v)
+ * W5 - exclusive w/W6, W7 : YM2151 reset comes from Board Reset
+ * W6 -'exclusive'w/W5, W7 : YM2151 reset comes from PIA CB2/J4 P12 (internal or external)
+
+
+
+ * Williams "BG Sound Board" C-11029/C-11030 5766-10929-00
+ *  * used on Williams System 11 'High Speed' and 'Grand Lizard' only (as well as the "Wreck'n Ball" prototype, see https://www.ipdb.org/machine.cgi?id=6167 )
+ *  * has DAC only
+ *  * no EPROM banking hardware, 1 28-pin ROM socket (2764/27128/27256 only)
+ *  * PIA CA1 and CA2 are labeled 'HAND1' and 'HAND2' on schematics and are tied high/unused.
+ *  * This board has some provisions for what looks like incoming and outgoing octal latch
+ *    for data to be read from/writen to by the PIA, but this is unpopulated/bypassed on the pcb
+
+ * C-11029/C-11030 Jumpers:
+ * W1                      : Board Reset comes from J4 P18 (if absent, Board Reset is generated from power up or a manual test switch sw1)
+
+
+
  *
  *  Created on: 2/10/2013
  *      Author: bsr
+ *  Updated on: 7/6/2020
+ *      Author: lord nightmare
  */
 
 #include "emu.h"
 #include "s11c_bg.h"
-#include "sound/dac.h"
 #include "sound/volt_reg.h"
 
 
-DEFINE_DEVICE_TYPE(S11C_BG, s11c_bg_device, "s11c_bg", "Williams System 11C Background Music")
+DEFINE_DEVICE_TYPE(S11C_BG, s11c_bg_device, "s11c_bg", "Williams System 11C Background Audio Board") // D-11581-20xx or D-11581-400xx or A-13971-50003
+DEFINE_DEVICE_TYPE(S11_BG, s11_bg_device, "s11_bg", "Williams System 11 Background Audio Board") // D-11581 (without the W10/W11 jumpers)
+DEFINE_DEVICE_TYPE(S11_OBG, s11_obg_device, "s11_obg", "Williams System 11 (Older) Background Audio Board") // D-11297 or D-11298
+DEFINE_DEVICE_TYPE(S11_BGM, s11_bgm_device, "s11_bgm", "Williams System 11 Background Sound/Music Board") // D-11197
+DEFINE_DEVICE_TYPE(S11_BGS, s11_bgs_device, "s11_bgs", "Williams System 11 Background Sound Board") // C-11029 or C-11030
 
 s11c_bg_device::s11c_bg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-	: device_t(mconfig, S11C_BG,tag,owner,clock)
+	: device_t(mconfig,S11C_BG,tag,owner,clock)
+	, device_mixer_interface(mconfig, *this)
+	, m_cpu(*this, "cpu")
+	, m_dac(*this, "dac")
+	, m_ym2151(*this, "ym2151")
+	, m_cvsd(*this, "hc55516")
+	, m_pia40(*this, "pia40")
+	, m_cpubank(*this, "bgbank")
+	, m_cb2_cb(*this)
+	, m_pb_cb(*this)
+	, m_old_resetq_state(ASSERT_LINE)
+{
+}
+
+// constructor with overridable type for subclass
+s11c_bg_device::s11c_bg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig,type,tag,owner,clock)
 	, device_mixer_interface(mconfig, *this)
-	, m_cpu(*this, "bgcpu")
+	, m_cpu(*this, "cpu")
+	, m_dac(*this, "dac")
 	, m_ym2151(*this, "ym2151")
-	, m_hc55516(*this, "hc55516_bg")
+	, m_cvsd(*this, "hc55516")
 	, m_pia40(*this, "pia40")
 	, m_cpubank(*this, "bgbank")
-	, m_rom(*this, finder_base::DUMMY_TAG)
+	, m_cb2_cb(*this)
+	, m_pb_cb(*this)
+	, m_old_resetq_state(ASSERT_LINE)
+{
+}
+
+// subclass definitions
+s11_bg_device::s11_bg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: s11c_bg_device(mconfig,S11_BG,tag,owner,clock)
+{
+}
+
+s11_obg_device::s11_obg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: s11c_bg_device(mconfig,S11_OBG,tag,owner,clock)
+{
+}
+
+s11_bgm_device::s11_bgm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: s11c_bg_device(mconfig,S11_BGM,tag,owner,clock)
+{
+}
+
+s11_bgs_device::s11_bgs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: s11c_bg_device(mconfig,S11_BGS,tag,owner,clock)
 {
 }
 
 void s11c_bg_device::s11c_bg_map(address_map &map)
 {
-	map(0x0000, 0x07ff).ram();
+	map(0x0000, 0x07ff).mirror(0x1800).ram();
+	map(0x2000, 0x2001).mirror(0x1ffe).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write));
+	map(0x4000, 0x4003).mirror(0x1ffc).rw("pia40", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0x6000, 0x6000).mirror(0x07ff).w(FUNC(s11c_bg_device::bg_cvsd_clock_set_w));
+	map(0x6800, 0x6800).mirror(0x07ff).w(FUNC(s11c_bg_device::bg_cvsd_digit_clock_clear_w));
+	map(0x7800, 0x7800).mirror(0x07ff).w(FUNC(s11c_bg_device::bgbank_w));
+	map(0x8000, 0xffff).bankr("bgbank");
+}
+
+void s11c_bg_device::s11c_bgm_map(address_map &map)
+{
+	map(0x0000, 0x07ff).mirror(0x1800).ram();
 	map(0x2000, 0x2001).mirror(0x1ffe).rw(m_ym2151, FUNC(ym2151_device::read), FUNC(ym2151_device::write));
 	map(0x4000, 0x4003).mirror(0x1ffc).rw("pia40", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
-	map(0x6000, 0x67ff).w(FUNC(s11c_bg_device::bg_speech_digit_w));
-	map(0x6800, 0x6fff).w(FUNC(s11c_bg_device::bg_speech_clock_w));
-	map(0x7800, 0x7fff).w(FUNC(s11c_bg_device::bgbank_w));
 	map(0x8000, 0xffff).bankr("bgbank");
 }
 
+void s11c_bg_device::s11c_bgs_map(address_map &map)
+{
+	map(0x0000, 0x07ff).mirror(0x1800).ram();
+	map(0x4000, 0x4003).mirror(0x1ffc).rw("pia40", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0x8000, 0xffff).bankr("bgbank");
+}
+
+TIMER_CALLBACK_MEMBER(s11c_bg_device::deferred_cb2_w)
+{
+	if (!m_cb2_cb.isnull())
+		m_cb2_cb(param);
+	else
+		logerror("S11C_BG CB2 writeback called, but callback is not registered!\n");
+}
+
+TIMER_CALLBACK_MEMBER(s11c_bg_device::deferred_pb_w)
+{
+	if (!m_pb_cb.isnull())
+		m_pb_cb(param);
+	else
+		logerror("S11C_BG PB writeback called, but callback is not registered!\n");
+}
+
+
 WRITE_LINE_MEMBER( s11c_bg_device::pia40_cb2_w)
 {
-//  m_pia34->cb1_w(state);  // To Widget MCB1 through CPU Data interface
+	machine().scheduler().synchronize(timer_expired_delegate(FUNC(s11c_bg_device::deferred_cb2_w),this), state);
 }
 
 void s11c_bg_device::pia40_pb_w(uint8_t data)
 {
-//  m_pia34->portb_w(data);
+	machine().scheduler().synchronize(timer_expired_delegate(FUNC(s11c_bg_device::deferred_pb_w),this), data);
+}
+
+
+WRITE_LINE_MEMBER( s11c_bg_device::extra_w )
+{
+	m_pia40->cb2_w(state);
 }
 
-void s11c_bg_device::ctrl_w(uint8_t data)
+WRITE_LINE_MEMBER( s11c_bg_device::ctrl_w )
 {
-	m_pia40->cb1_w(data);
+	m_pia40->cb1_w(state);
 }
 
 void s11c_bg_device::data_w(uint8_t data)
@@ -58,66 +343,186 @@
 	m_pia40->portb_w(data);
 }
 
-void s11c_bg_device::device_add_mconfig(machine_config &config)
+WRITE_LINE_MEMBER( s11c_bg_device::resetq_w )
+{
+	if ((m_old_resetq_state != CLEAR_LINE) && (state == CLEAR_LINE))
+	{
+		logerror("S11 bg device received reset request\n");
+		common_reset();
+	}
+	m_old_resetq_state = state;
+}
+
+
+// just the 6809, the DAC and the PIA
+void s11c_bg_device::s11_bg_base(machine_config &config)
 {
 	MC6809E(config, m_cpu, XTAL(8'000'000) / 4); // MC68B09E
-	m_cpu->set_addrmap(AS_PROGRAM, &s11c_bg_device::s11c_bg_map);
+	m_cpu->set_addrmap(AS_PROGRAM, &s11c_bg_device::s11c_bg_map); // override this as needed
 	config.set_maximum_quantum(attotime::from_hz(50));
 
-	YM2151(config, m_ym2151, XTAL(3'579'545)); // "3.58 MHz" on schematics and parts list
-	m_ym2151->irq_handler().set(FUNC(s11c_bg_device::ym2151_irq_w));
-	m_ym2151->add_route(ALL_OUTPUTS, *this, 0.25);
-
-	MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, *this, 0.25);
+	MC1408(config, m_dac, 0);
 	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
 	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
 	vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
 
-	HC55516(config, m_hc55516, 0).add_route(ALL_OUTPUTS, *this, 0.5);
-
 	PIA6821(config, m_pia40, 0);
 	m_pia40->writepa_handler().set("dac", FUNC(dac_byte_interface::data_w));
 	m_pia40->writepb_handler().set(FUNC(s11c_bg_device::pia40_pb_w));
-	m_pia40->ca2_handler().set(m_ym2151, FUNC(ym2151_device::reset_w));
+	// ca2 handler is set in the s11_bg_ym function
 	m_pia40->cb2_handler().set(FUNC(s11c_bg_device::pia40_cb2_w));
 	m_pia40->irqa_handler().set_inputline(m_cpu, M6809_FIRQ_LINE);
 	m_pia40->irqb_handler().set_inputline(m_cpu, INPUT_LINE_NMI);
 }
 
+// add a YM2151 for boards which have it
+void s11c_bg_device::s11_bg_ym(machine_config &config)
+{
+	m_pia40->ca2_handler().set(m_ym2151, FUNC(ym2151_device::reset_w));
+
+	YM2151(config, m_ym2151, XTAL(3'579'545)); // "3.58 MHz" on schematics and parts list
+	m_ym2151->irq_handler().set(m_pia40, FUNC(pia6821_device::ca1_w)).invert(); // IRQ is not true state
+}
+
+// add a CVSD chip for boards which have it
+void s11c_bg_device::s11_bg_cvsd(machine_config &config)
+{
+	HC55516(config, m_cvsd, 0);
+}
+
+
+// D-11581-20xx or D-11581-400xx or A-13971-50003
+void s11c_bg_device::device_add_mconfig(machine_config &config)
+{
+	s11_bg_base(config);
+	s11_bg_ym(config);
+	s11_bg_cvsd(config);
+	// volume mixer stuff
+	// the sum of all resistances is 13k + 20k + 20k + 4.99k = 57990
+	// 1/resistance * 57990 is 4.460769, 2.8895, 2.8895, 11.62124
+	// the sum of the previous 4 values is 21.88101; 100/21.88101 = 4.570173
+	// the 4 (1/r)*rtotal numbers * 4.570173 are 20.38649, 13.25122, 13.25122 and 53.11108 respectively
+	// NOTE: audio passthrough from the mainboard is 4.7kohm
+	m_dac->add_route(ALL_OUTPUTS, *this, 0.2038); // 13Kohm
+	m_ym2151->add_route(1, *this, 0.1325); // 20kohm
+	m_ym2151->add_route(0, *this, 0.1325); // 20kohm
+	m_cvsd->add_route(ALL_OUTPUTS, *this, 0.5311); // 4.99kohm
+}
+
+// D-11581 (without the W10/W11 jumpers)
+void s11_bg_device::device_add_mconfig(machine_config &config)
+{
+	s11_bg_base(config);
+	s11_bg_ym(config);
+	s11_bg_cvsd(config);
+	// volume mixer stuff
+	// the sum of all resistances is 6.3k + 10k + 10k + 4.99k = 31290
+	// 1/resistance * 57990 is 4.9666, 3.129, 3.129, 6.2705
+	// the sum of the previous 4 values is 17.49521; 100/17.49521 = 5.715851
+	// the 4 (1/r)*rtotal numbers * 5.715851 are 28.38873, 17.8849, 17.8849, and 35.84148 respectively
+	// NOTE: audio passthrough from the mainboard is 2.2kohm
+	m_dac->add_route(ALL_OUTPUTS, *this, 0.2839); // 6.3Kohm
+	m_ym2151->add_route(1, *this, 0.1788); // 10kohm
+	m_ym2151->add_route(0, *this, 0.1788); // 10kohm
+	m_cvsd->add_route(ALL_OUTPUTS, *this, 0.3584); // 4.99kohm
+}
+
+// D-11297 or D-11298
+void s11_obg_device::device_add_mconfig(machine_config &config)
+{
+	s11_bg_base(config);
+	s11_bg_ym(config);
+	s11_bg_cvsd(config);
+	// volume mixer stuff
+	// the sum of all resistances is 10k + 10k + 10k + 10k = 40000
+	// 1/resistance * 40000 is 4.0, 4.0, 4.0, 4.0
+	// the sum of the previous 4 values is 16.0; 100/16 = 6.25
+	// the 4 (1/r)*rtotal numbers * 6.25 are 25.0, 25.0, 25.0, 25.0 respectively
+	// NOTE: audio passthrough from the mainboard is 2.2kohm
+	m_dac->add_route(ALL_OUTPUTS, *this, 0.25); // 10Kohm
+	m_ym2151->add_route(1, *this, 0.25); // 10kohm
+	m_ym2151->add_route(0, *this, 0.25); // 10kohm
+	m_cvsd->add_route(ALL_OUTPUTS, *this, 0.25); // 10kohm
+}
+
+// D-11197
+void s11_bgm_device::device_add_mconfig(machine_config &config)
+{
+	s11_bg_base(config);
+	m_cpu->set_addrmap(AS_PROGRAM, &s11c_bg_device::s11c_bgm_map);
+	s11_bg_ym(config);
+	// volume mixer stuff
+	// the sum of all resistances is 10k + 10k + 10k + 10k = 40000
+	// 1/resistance * 40000 is 4.0, 4.0, 4.0, 4.0
+	// the sum of the previous 4 values is 16.0; 100/16 = 6.25
+	// the 4 (1/r)*rtotal numbers * 6.25 are 25.0, 25.0, 25.0, 25.0 respectively
+	// NOTE: audio passthrough from the mainboard is 2.2kohm
+	m_dac->add_route(ALL_OUTPUTS, *this, 0.25); // 10Kohm
+	m_ym2151->add_route(1, *this, 0.25); // 10kohm
+	m_ym2151->add_route(0, *this, 0.25); // 10kohm
+	// interestingly, there is no cvsd, but a fourth 10k resistor here, but it is tied to ground. this makes the board quieter than it would otherwise be, presumably.
+}
+
+// C-11029 or C-11030
+void s11_bgs_device::device_add_mconfig(machine_config &config)
+{
+	s11_bg_base(config);
+	m_cpu->set_addrmap(AS_PROGRAM, &s11c_bg_device::s11c_bgs_map);
+	// volume mixer stuff
+	// the sum of all resistances is 10k + 10k = 20k
+	// NOTE: audio passthrough from the mainboard is 10k
+	m_dac->add_route(ALL_OUTPUTS, *this, 1.00); // 10Kohm
+}
+
 void s11c_bg_device::device_start()
 {
+	u8 *rom = memregion("cpu")->base();
+	m_cpubank->configure_entries(0, 16, &rom[0x0], 0x8000);
+	m_cpubank->set_entry(0);
+	/* resolve lines */
+	m_cb2_cb.resolve();
+	m_pb_cb.resolve();
+	save_item(NAME(m_old_resetq_state));
 }
 
-void s11c_bg_device::device_reset()
+void s11c_bg_device::common_reset()
 {
-	m_cpubank->configure_entries(0, 8, &m_rom[0x10000], 0x8000);
 	m_cpubank->set_entry(0);
 	// reset the CPU again, so that the CPU are starting with the right vectors (otherwise sound may die on reset)
 	m_cpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
 }
 
-WRITE_LINE_MEMBER( s11c_bg_device::ym2151_irq_w)
+void s11c_bg_device::device_reset()
 {
-	if(state == CLEAR_LINE)
-		m_pia40->ca1_w(1);
-	else
-		m_pia40->ca1_w(0);
+	common_reset();
 }
 
-void s11c_bg_device::bg_speech_clock_w(uint8_t data)
+void s11c_bg_device::bg_cvsd_clock_set_w(uint8_t data)
 {
-	// pulses clock input?
-	m_hc55516->clock_w(1);
-	m_hc55516->clock_w(0);
+	if (m_cvsd)
+		m_cvsd->clock_w(1);
 }
 
-void s11c_bg_device::bg_speech_digit_w(uint8_t data)
+void s11c_bg_device::bg_cvsd_digit_clock_clear_w(uint8_t data)
 {
-	m_hc55516->digit_w(data);
+	if (m_cvsd)
+	{
+		m_cvsd->clock_w(0);
+		m_cvsd->digit_w(data&1);
+	}
 }
 
+/*
+    Rom mapping for the 4 banking bits:
+    3 2 1 0
+    r q 0 0 -  U4, A15 q, A16 r
+    r q 0 1 - U19, A15 q, A16 r
+    r q 1 0 - U20, A15 q, A16 r
+    x x 1 1 - open bus
+    for ease of loading the roms, we swap the bits to the order '1 0 3 2'
+*/
 void s11c_bg_device::bgbank_w(uint8_t data)
 {
-	uint8_t bank = ((data & 0x04) >> 2) | ((data & 0x03) << 1);
-	m_cpubank->set_entry(bank);
+	uint8_t bank = bitswap<8>(data,7,6,5,4,1,0,3,2);
+	m_cpubank->set_entry(bank&0xf);
 }
diff -Nru mame-0.222+dfsg.1/src/mame/audio/s11c_bg.h mame-0.224+dfsg.1/src/mame/audio/s11c_bg.h
--- mame-0.222+dfsg.1/src/mame/audio/s11c_bg.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/s11c_bg.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Barry Rodewald
+// copyright-holders:Barry Rodewald, Jonathan Gevaryahu
 /*
  * s11c_bg.h - Williams System 11C background sound (M68B09E + YM2151 + HC55516 + DAC)
  *
@@ -15,6 +15,7 @@
 #include "machine/6821pia.h"
 #include "sound/hc55516.h"
 #include "sound/ym2151.h"
+#include "sound/dac.h"
 
 
 class s11c_bg_device : public device_t, public device_mixer_interface
@@ -23,34 +24,98 @@
 	// construction/destruction
 	s11c_bg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
 
-	void bg_speech_clock_w(uint8_t data);
-	void bg_speech_digit_w(uint8_t data);
-	void bgbank_w(uint8_t data);
-	void ctrl_w(uint8_t data);
-	void data_w(uint8_t data);
-
-	template <typename T> void set_romregion(T &&tag) { m_rom.set_tag(std::forward<T>(tag)); }
+	// base config
+	void s11_bg_base(machine_config &config);
+	// add ym2151
+	void s11_bg_ym(machine_config &config);
+	// add cvsd
+	void s11_bg_cvsd(machine_config &config);
+
+	// note to keep synchronization working, the host machine should have synchronization timer expired delegates
+	// before writing to the following 3 things:
+	DECLARE_WRITE_LINE_MEMBER(extra_w); // external write to board CB2 (J4 pin 12), does anything actually do this?
+	DECLARE_WRITE_LINE_MEMBER(ctrl_w); // external write to board CB1 (J4 pin 13)
+	void data_w(uint8_t data); // external write to board data bus (J4 pins 3 thru 10 for D0-D7)
+	virtual void device_reset() override; // power up reset
+	DECLARE_WRITE_LINE_MEMBER(resetq_w); // external write to board /RESET (J4 pin 18)
+
+	// callbacks
+	auto cb2_cb() { return m_cb2_cb.bind(); }
+	auto pb_cb() { return m_pb_cb.bind(); }
 
 	void s11c_bg_map(address_map &map);
+	void s11c_bgm_map(address_map &map);
+	void s11c_bgs_map(address_map &map);
+
+	//mc6809e_device *get_cpu() { return m_cpu; }
 protected:
+	// constructor with overridable type for subclass
+	s11c_bg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock = 0);
+
 	// overrides
 	virtual void device_start() override;
-	virtual void device_reset() override;
 	virtual void device_add_mconfig(machine_config &config) override;
 
-private:
-	required_device<cpu_device> m_cpu;
-	required_device<ym2151_device> m_ym2151;
-	required_device<hc55516_device> m_hc55516;
+	TIMER_CALLBACK_MEMBER(deferred_cb2_w);
+	TIMER_CALLBACK_MEMBER(deferred_pb_w);
+
+	required_device<mc6809e_device> m_cpu;
+	required_device<mc1408_device> m_dac;
+	optional_device<ym2151_device> m_ym2151;
+	optional_device<hc55516_device> m_cvsd;
 	required_device<pia6821_device> m_pia40;
 	required_memory_bank m_cpubank;
-	required_region_ptr<uint8_t> m_rom;
 
-	DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w);
-	void pia40_pb_w(uint8_t data);
+private:
+	devcb_write_line m_cb2_cb;
+	devcb_write8 m_pb_cb;
+
+	void common_reset(); // common reset function used by both internal and external reset
+	uint8_t m_old_resetq_state;
 	DECLARE_WRITE_LINE_MEMBER(pia40_cb2_w);
+	void pia40_pb_w(uint8_t data);
+
+	void bg_cvsd_clock_set_w(uint8_t data);
+	void bg_cvsd_digit_clock_clear_w(uint8_t data);
+	void bgbank_w(uint8_t data);
+};
+
+class s11_bg_device : public s11c_bg_device
+{
+public:
+	s11_bg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+};
+
+class s11_obg_device : public s11c_bg_device
+{
+public:
+	s11_obg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+};
+
+class s11_bgm_device : public s11c_bg_device
+{
+public:
+	s11_bgm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+};
+
+class s11_bgs_device : public s11c_bg_device
+{
+public:
+	s11_bgs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
 };
 
 DECLARE_DEVICE_TYPE(S11C_BG, s11c_bg_device)
+DECLARE_DEVICE_TYPE(S11_BG, s11_bg_device)
+DECLARE_DEVICE_TYPE(S11_OBG, s11_obg_device)
+DECLARE_DEVICE_TYPE(S11_BGM, s11_bgm_device)
+DECLARE_DEVICE_TYPE(S11_BGS, s11_bgs_device)
 
 #endif // MAME_AUDIO_S11C_BG_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/segag80.cpp mame-0.224+dfsg.1/src/mame/audio/segag80.cpp
--- mame-0.222+dfsg.1/src/mame/audio/segag80.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/segag80.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,185 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+/*************************************************************************
+
+    Sega vector hardware
+
+*************************************************************************/
+
+#include "emu.h"
+
+#include "audio/segag80.h"
+#include "audio/nl_astrob.h"
+#include "audio/nl_elim.h"
+#include "audio/nl_spacfury.h"
+#include "includes/segag80v.h"
+#include "sound/samples.h"
+
+
+
+/*************************************
+ *
+ *  Base class
+ *
+ *************************************/
+
+segag80_audio_device::segag80_audio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 lomask, u8 himask, bool haspsg, void (*netlist)(netlist::nlparse_t &), double output_scale)
+	: device_t(mconfig, type, tag, owner, clock)
+	, device_mixer_interface(mconfig, *this)
+	, m_lo_input(*this, "sound_nl:lo_%u", 0)
+	, m_hi_input(*this, "sound_nl:hi_%u", 0)
+	, m_psg(*this, "psg")
+	, m_lo_vals(0xff)
+	, m_hi_vals(0xff)
+	, m_lo_mask(lomask)
+	, m_hi_mask(himask)
+	, m_has_psg(haspsg)
+	, m_netlist(netlist)
+	, m_output_scale(output_scale)
+{
+}
+
+void segag80_audio_device::device_add_mconfig(machine_config &config)
+{
+	NETLIST_SOUND(config, "sound_nl", 48000)
+		.set_source(m_netlist)
+		.add_route(ALL_OUTPUTS, *this, 1.0);
+
+	if (BIT(m_lo_mask, 0))
+		NETLIST_LOGIC_INPUT(config, m_lo_input[0], "I_LO_D0.IN", 0);
+	if (BIT(m_lo_mask, 1))
+		NETLIST_LOGIC_INPUT(config, m_lo_input[1], "I_LO_D1.IN", 0);
+	if (BIT(m_lo_mask, 2))
+		NETLIST_LOGIC_INPUT(config, m_lo_input[2], "I_LO_D2.IN", 0);
+	if (BIT(m_lo_mask, 3))
+		NETLIST_LOGIC_INPUT(config, m_lo_input[3], "I_LO_D3.IN", 0);
+	if (BIT(m_lo_mask, 4))
+		NETLIST_LOGIC_INPUT(config, m_lo_input[4], "I_LO_D4.IN", 0);
+	if (BIT(m_lo_mask, 5))
+		NETLIST_LOGIC_INPUT(config, m_lo_input[5], "I_LO_D5.IN", 0);
+	if (BIT(m_lo_mask, 6))
+		NETLIST_LOGIC_INPUT(config, m_lo_input[6], "I_LO_D6.IN", 0);
+	if (BIT(m_lo_mask, 7))
+		NETLIST_LOGIC_INPUT(config, m_lo_input[7], "I_LO_D7.IN", 0);
+
+	if (BIT(m_hi_mask, 0))
+		NETLIST_LOGIC_INPUT(config, m_hi_input[0], "I_HI_D0.IN", 0);
+	if (BIT(m_hi_mask, 1))
+		NETLIST_LOGIC_INPUT(config, m_hi_input[1], "I_HI_D1.IN", 0);
+	if (BIT(m_hi_mask, 2))
+		NETLIST_LOGIC_INPUT(config, m_hi_input[2], "I_HI_D2.IN", 0);
+	if (BIT(m_hi_mask, 3))
+		NETLIST_LOGIC_INPUT(config, m_hi_input[3], "I_HI_D3.IN", 0);
+	if (BIT(m_hi_mask, 4))
+		NETLIST_LOGIC_INPUT(config, m_hi_input[4], "I_HI_D4.IN", 0);
+	if (BIT(m_hi_mask, 5))
+		NETLIST_LOGIC_INPUT(config, m_hi_input[5], "I_HI_D5.IN", 0);
+	if (BIT(m_hi_mask, 6))
+		NETLIST_LOGIC_INPUT(config, m_hi_input[6], "I_HI_D6.IN", 0);
+	if (BIT(m_hi_mask, 7))
+		NETLIST_LOGIC_INPUT(config, m_hi_input[7], "I_HI_D7.IN", 0);
+
+	if (m_has_psg)
+	{
+		AY8912(config, m_psg, VIDEO_CLOCK/4/2);
+		m_psg->set_flags(AY8910_RESISTOR_OUTPUT);
+		m_psg->set_resistors_load(10000.0, 10000.0, 10000.0);
+		m_psg->add_route(0, "sound_nl", 1.0, 0);
+		m_psg->add_route(1, "sound_nl", 1.0, 1);
+		m_psg->add_route(2, "sound_nl", 1.0, 2);
+
+		NETLIST_STREAM_INPUT(config, "sound_nl:cin0", 0, "R_PSG_1.R");
+		NETLIST_STREAM_INPUT(config, "sound_nl:cin1", 1, "R_PSG_2.R");
+		NETLIST_STREAM_INPUT(config, "sound_nl:cin2", 2, "R_PSG_3.R");
+	}
+
+	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "OUTPUT").set_mult_offset(m_output_scale, 0.0);
+}
+
+void segag80_audio_device::device_start()
+{
+}
+
+void segag80_audio_device::device_stop()
+{
+}
+
+void segag80_audio_device::write(offs_t addr, uint8_t data)
+{
+	addr &= 1;
+
+	auto &inputs = (addr == 0) ? m_lo_input : m_hi_input;
+	auto &oldvals = (addr == 0) ? m_lo_vals : m_hi_vals;
+	auto &mask = (addr == 0) ? m_lo_mask : m_hi_mask;
+
+	for (int bit = 0; bit < 8; bit++)
+		if (BIT(mask, bit))
+			inputs[bit]->write_line(BIT(data, bit));
+	oldvals = data;
+}
+
+void segag80_audio_device::write_ay(offs_t addr, uint8_t data)
+{
+	assert(m_has_psg);
+	m_psg->address_data_w(addr, data);
+}
+
+
+
+/*************************************
+ *
+ *  Eliminator
+ *
+ *************************************/
+
+DEFINE_DEVICE_TYPE(ELIMINATOR_AUDIO, elim_audio_device, "elim_audio", "Eliminator Sound Board")
+
+elim_audio_device::elim_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: segag80_audio_device(mconfig, ELIMINATOR_AUDIO, tag, owner, clock, 0xfe, 0xff, false, NETLIST_NAME(elim), 5000.0)
+{
+}
+
+
+
+/*************************************
+ *
+ *  Zektor
+ *
+ *************************************/
+
+DEFINE_DEVICE_TYPE(ZEKTOR_AUDIO, zektor_audio_device, "zektor_audio", "Zektor Sound Board")
+
+zektor_audio_device::zektor_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: segag80_audio_device(mconfig, ZEKTOR_AUDIO, tag, owner, clock, 0xfe, 0xff, true, NETLIST_NAME(zektor), 5000.0)
+{
+}
+
+
+
+/*************************************
+ *
+ *  Space Fury
+ *
+ *************************************/
+
+DEFINE_DEVICE_TYPE(SPACE_FURY_AUDIO, spacfury_audio_device, "spcfury_audio", "Space Fury Sound Board")
+
+spacfury_audio_device::spacfury_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: segag80_audio_device(mconfig, SPACE_FURY_AUDIO, tag, owner, clock, 0xc7, 0x3f, false, NETLIST_NAME(spacfury), 60000.0)
+{
+}
+
+
+
+/*************************************
+ *
+ *  Astro Blaster
+ *
+ *************************************/
+
+DEFINE_DEVICE_TYPE(ASTRO_BLASTER_AUDIO, astrob_audio_device, "astrob_audio", "Astro Blaster Sound Board")
+
+astrob_audio_device::astrob_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: segag80_audio_device(mconfig, ASTRO_BLASTER_AUDIO, tag, owner, clock, 0xff, 0xff, false, NETLIST_NAME(astrob), 25000.0)
+{
+}
diff -Nru mame-0.222+dfsg.1/src/mame/audio/segag80.h mame-0.224+dfsg.1/src/mame/audio/segag80.h
--- mame-0.222+dfsg.1/src/mame/audio/segag80.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/segag80.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,74 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+#ifndef MAME_AUDIO_SEGAG80V_H
+#define MAME_AUDIO_SEGAG80V_H
+
+#pragma once
+
+#include "machine/netlist.h"
+#include "netlist/nl_setup.h"
+#include "sound/ay8910.h"
+
+
+class segag80_audio_device : public device_t, public device_mixer_interface
+{
+public:
+	segag80_audio_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 lomask, u8 himask, bool haspsg, void (*netlist)(netlist::nlparse_t &), double output_scale);
+
+	void write(offs_t addr, uint8_t data);
+	void write_ay(offs_t addr, uint8_t data);
+
+protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+	virtual void device_stop() override;
+
+	optional_device_array<netlist_mame_logic_input_device, 8> m_lo_input;
+	optional_device_array<netlist_mame_logic_input_device, 8> m_hi_input;
+	optional_device<ay8912_device> m_psg;
+
+private:
+	u8 m_lo_vals;
+	u8 m_hi_vals;
+	u8 m_lo_mask;
+	u8 m_hi_mask;
+	bool m_has_psg;
+	void (*m_netlist)(netlist::nlparse_t &) = nullptr;
+	double m_output_scale = 0;
+};
+
+
+class elim_audio_device : public segag80_audio_device
+{
+public:
+	elim_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class zektor_audio_device : public segag80_audio_device
+{
+public:
+	zektor_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class spacfury_audio_device : public segag80_audio_device
+{
+public:
+	spacfury_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+class astrob_audio_device : public segag80_audio_device
+{
+public:
+	astrob_audio_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+};
+
+
+DECLARE_DEVICE_TYPE(ELIMINATOR_AUDIO, elim_audio_device)
+DECLARE_DEVICE_TYPE(ZEKTOR_AUDIO, zektor_audio_device)
+DECLARE_DEVICE_TYPE(SPACE_FURY_AUDIO, spacfury_audio_device)
+DECLARE_DEVICE_TYPE(ASTRO_BLASTER_AUDIO, astrob_audio_device)
+
+#endif // MAME_AUDIO_SEGAG80V_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/segag80r.cpp mame-0.224+dfsg.1/src/mame/audio/segag80r.cpp
--- mame-0.222+dfsg.1/src/mame/audio/segag80r.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/segag80r.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -88,260 +88,6 @@
 
 /*************************************
  *
- *  Astro Blaster sound hardware
- *
- *************************************/
-
-/*
-    Description of Astro Blaster sounds (in the hope of future discrete goodness):
-
-    CD4017 = decade counter with one output per decoded stage (10 outputs altogether)
-    CD4024 = 7-bit counter with 7 outputs
-
-
-    "V" signal
-    ----------
-        CD4017 @ U15:
-            reset by RATE RESET signal = 1
-            clocked by falling edge of ATTACK signal
-            +12V output from here goes through a diode and one of 10 resistors:
-                0 = 120k
-                1 = 82k
-                2 = 62k
-                3 = 56k
-                4 = 47k
-                5 = 39k
-                6 = 35k
-                7 = 27k
-                8 = 24k
-                9 = 22k
-            and then in series through a 22k resistor
-
-        Op-amp @ U6 takes the WARP signal and the output of CD4017 @ U15
-            and forms the signal "V" which is used to control the invader
-            sounds
-
-
-        How to calculate the output voltage at U16 labeled (V).
-        (Derrick Renaud)
-
-        First you have an inverting amp.  To get the gain you
-        use G=-Rf/Ri, where Rf=R178=22k.  Ri is the selected
-        resistor on the output of U15.
-
-        The input voltage to the amp (pin 6) will always be
-        about 12V - 0.5V (diode drop in low current circuit) =
-        11.5V.
-
-        Now you need to calculate the reference voltage on the
-        + input (pin 5).  Depending on the state of WARP...
-
-        If the warp data is 0, then U31 inverts it to an Open
-        Collector high, meaning WARP is out of circuit. So:
-        Vref = 12V * (R163)/(R162+R163)
-             = 12V * 10k/(10K+4.7k)
-             = 8.163V
-
-        When warp data is 1, then U31 inverts it to low,
-        grounding R164 putting it in parallel with R163,
-        giving:
-        Vref = 12V * (R163||R164)/(R163||R164 +R162)
-             = 12V * 5k/(5k+4.7k)
-             = 6.186V
-
-        Now to get the control voltage V:
-        V = (Vi - Vref) * G + Vref
-          = (11.5V - Vref) * G + Vref
-
-        That gives you the control voltage at V.  From there I
-        would have to millman the voltage with the internal
-        voltage/resistors of the 555 to get the actual used
-        control voltage.
-
-        But it seems you just want a range, so just use the
-        above info to get the highest and lowest voltages
-        generated, and create the frequency shift you desire.
-        Remember as the control voltage (V) lowers, the
-        frequency increases.
-
-
-
-    INVADER-1 output
-    ----------------
-
-
-
-
-    INVADER-2 output
-    ----------------
-        555 timer @ U13 in astable mode with the following parameters:
-            R1 = 10k
-            R2 = 100k
-            C = 0.0022u
-            CV = "V" signal
-            Reset = (PORT076 & 0x02)
-        Output goes to CD4024 @ U12
-
-        CD4024 @ U12:
-            reset through some unknown means
-            clocked by 555 timer @ U13
-            +12 output from here goes through a resistor ladder:
-                Q1 -> 82k
-                Q2 -> 39k
-                Q3 -> 22k
-                Q4 -> 10k
-        Summed output from here is INVADER-2
-
-
-    INVADER-3 output
-    ----------------
-        555 timer at U17 in astable mode with the following parameters:
-            R1 = 10k
-            R2 = 68k
-            C = 0.1u
-            CV = some combination of "V" and "W" signals
-            Reset = (PORT076 & 0x04)
-        Output from here is INVADER-3
-
-*/
-
-static const char *const astrob_sample_names[] =
-{
-	"*astrob",
-	"invadr1",      /* 0 */
-	"winvadr1",     /* 1 */
-	"invadr2",      /* 2 */
-	"winvadr2",     /* 3 */
-	"invadr3",      /* 4 */
-	"winvadr3",     /* 5 */
-	"invadr4",      /* 6 */
-	"winvadr4",     /* 7 */
-	"asteroid",     /* 8 */
-	"refuel",       /* 9 */
-	"pbullet",      /* 10 */
-	"ebullet",      /* 11 */
-	"eexplode",     /* 12 */
-	"pexplode",     /* 13 */
-	"deedle",       /* 14 */
-	"sonar",        /* 15 */
-	nullptr
-};
-
-
-void segag80r_state::astrob_sound_board(machine_config &config)
-{
-	/* sound hardware */
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(11);
-	m_samples->set_samples_names(astrob_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "speaker", 0.25);
-}
-
-
-/*************************************
- *
- *  Astro Blaster sound triggers
- *
- *************************************/
-
-void segag80r_state::astrob_sound_w(offs_t offset, uint8_t data)
-{
-	static const float attack_resistor[10] =
-	{
-		120.0f, 82.0f, 62.0f, 56.0f, 47.0f, 39.0f, 33.0f, 27.0f, 24.0f, 22.0f
-	};
-	float freq_factor;
-
-	uint8_t diff = data ^ m_sound_state[offset];
-	m_sound_state[offset] = data;
-
-	switch (offset)
-	{
-		case 0:
-			/* INVADER-1: channel 0 */
-			if ((diff & 0x01) && !(data & 0x01)) m_samples->start(0, (data & 0x80) ? 0 : 1, true);
-			if ((data & 0x01) && m_samples->playing(0)) m_samples->stop(0);
-
-			/* INVADER-2: channel 1 */
-			if ((diff & 0x02) && !(data & 0x02)) m_samples->start(1, (data & 0x80) ? 2 : 3, true);
-			if ((data & 0x02) && m_samples->playing(1)) m_samples->stop(1);
-
-			/* INVADER-3: channel 2 */
-			if ((diff & 0x04) && !(data & 0x04)) m_samples->start(2, (data & 0x80) ? 4 : 5, true);
-			if ((data & 0x04) && m_samples->playing(2)) m_samples->stop(2);
-
-			/* INVADER-4: channel 3 */
-			if ((diff & 0x08) && !(data & 0x08)) m_samples->start(3, (data & 0x80) ? 6 : 7, true);
-			if ((data & 0x08) && m_samples->playing(3)) m_samples->stop(3);
-
-			/* ASTROIDS: channel 4 */
-			if ((diff & 0x10) && !(data & 0x10)) m_samples->start(4, 8, true);
-			if ((data & 0x10) && m_samples->playing(4)) m_samples->stop(4);
-
-			/* MUTE */
-			machine().sound().system_mute(data & 0x20);
-
-			/* REFILL: channel 5 */
-			if (!(data & 0x40) && !m_samples->playing(5)) m_samples->start(5, 9);
-			if ( (data & 0x40) && m_samples->playing(5))  m_samples->stop(5);
-
-			/* WARP: changes which sample is played for the INVADER samples above */
-			if (diff & 0x80)
-			{
-				if (m_samples->playing(0)) m_samples->start(0, (data & 0x80) ? 0 : 1, true);
-				if (m_samples->playing(1)) m_samples->start(1, (data & 0x80) ? 2 : 3, true);
-				if (m_samples->playing(2)) m_samples->start(2, (data & 0x80) ? 4 : 5, true);
-				if (m_samples->playing(3)) m_samples->start(3, (data & 0x80) ? 6 : 7, true);
-			}
-			break;
-
-		case 1:
-			/* LASER #1: channel 6 */
-			if ((diff & 0x01) && !(data & 0x01)) m_samples->start(6, 10);
-
-			/* LASER #2: channel 7 */
-			if ((diff & 0x02) && !(data & 0x02)) m_samples->start(7, 11);
-
-			/* SHORT EXPL: channel 8 */
-			if ((diff & 0x04) && !(data & 0x04)) m_samples->start(8, 12);
-
-			/* LONG EXPL: channel 8 */
-			if ((diff & 0x08) && !(data & 0x08)) m_samples->start(8, 13);
-
-			/* ATTACK RATE */
-			if ((diff & 0x10) && !(data & 0x10)) m_sound_rate = (m_sound_rate + 1) % 10;
-
-			/* RATE RESET */
-			if (!(data & 0x20)) m_sound_rate = 0;
-
-			/* BONUS: channel 9 */
-			if ((diff & 0x40) && !(data & 0x40)) m_samples->start(9, 14);
-
-			/* SONAR: channel 10 */
-			if ((diff & 0x80) && !(data & 0x80)) m_samples->start(10, 15);
-			break;
-	}
-
-	/* the samples were recorded with sound_rate = 0, so we need to scale */
-	/* the frequency as a fraction of that; these equations come from */
-	/* Derrick's analysis above; we compute the inverted scale factor to */
-	/* account for the fact that frequency goes up as CV goes down */
-	/* WARP is already taken into account by the differing samples above */
-	freq_factor  = (11.5f - 8.163f) * (-22.0f / attack_resistor[0]) + 8.163f;
-	freq_factor /= (11.5f - 8.163f) * (-22.0f / attack_resistor[m_sound_rate]) + 8.163f;
-
-	/* adjust the sample rate of invader sounds based the sound_rate */
-	/* this is an approximation */
-	if (m_samples->playing(0)) m_samples->set_frequency(0, m_samples->base_frequency(0) * freq_factor);
-	if (m_samples->playing(1)) m_samples->set_frequency(1, m_samples->base_frequency(1) * freq_factor);
-	if (m_samples->playing(2)) m_samples->set_frequency(2, m_samples->base_frequency(2) * freq_factor);
-	if (m_samples->playing(3)) m_samples->set_frequency(3, m_samples->base_frequency(3) * freq_factor);
-}
-
-
-
-/*************************************
- *
  *  005 sound hardware
  *
  *************************************/
diff -Nru mame-0.222+dfsg.1/src/mame/audio/segag80v.cpp mame-0.224+dfsg.1/src/mame/audio/segag80v.cpp
--- mame-0.222+dfsg.1/src/mame/audio/segag80v.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/segag80v.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,327 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/*************************************************************************
-
-    Sega vector hardware
-
-*************************************************************************/
-
-#include "emu.h"
-#include "includes/segag80v.h"
-#include "sound/samples.h"
-
-/* History:
-
-
-
- * 4/25/99 Tac-Scan now makes Credit Noises with $2c                    (Jim Hernandez)
- * 4/9/99 Zektor Discrete Sound Support mixed with voice samples.       (Jim Hernandez)
-          Zektor uses some Eliminator sounds.
-
- * 2/5/99 Extra Life sound constant found $1C after fixing main driver. (Jim Hernandez)
- * 1/29/99 Supports Tac Scan new 44.1 kHz sample set.                    (Jim Hernandez)
-
- * -Stuff to do -
- * Find hex bit for warp.wav sound calls.
- *
- * 2/05/98 now using the new sample_*() functions. BW
- *
- */
-
-/*
-    Tac/Scan sound constants
-
-    There are some sounds that are unknown:
-    $09 Tunnel Warp Sound?
-    $0a
-    $0b Formation Change
-        $0c
-        $0e
-        $0f
-        $1c 1up (Extra Life)
-        $2c Credit
-        $30 - $3f  Hex numbers for ship position flight sounds
-    $41
-
-    Some sound samples are missing:
-    - I use the one bullet and one explosion sound for all 3 for example.
-
-Star Trk Sounds (USB Loaded from 5400 in main EPROMs)
-
-8     PHASER
-a     PHOTON
-e     TARGETING
-10    DENY
-12    SHEILD HIT
-14    ENTERPRISE HIT
-16    ENT EXPLOSION
-1a    KLINGON EXPLOSION
-1c    DOCK
-1e    STARBASE HIT
-11    STARBASE RED
-22    STARBASE EXPLOSION
-24    SMALL BONUS
-25    LARGE BONUS
-26    STARBASE INTRO
-27    KLINGON INTRO
-28    ENTERPRISE INTRO
-29    PLAYER CHANGE
-2e    KLINGON FIRE
-4,5   IMPULSE
-6,7   WARP
-c,d   RED ALERT
-18,2f WARP SUCK
-19,2f SAUCER EXIT
-2c,21 NOMAD MOTION
-2d,21 NOMAD STOPPED
-2b    COIN DROP MUSIC
-2a    HIGH SCORE MUSIC
-
-
-Eliminator Sound Board (800-3174)
----------------------------------
-
-inputs
-0x3c-0x3f
-
-d0 speech ready
-
-outputs ( 0 = ON)
-
-0x3e (076)
-
-d7      torpedo 2
-d6      torpedo 1
-d5      bounce
-d4      explosion 3
-d3      explosion 2
-d2      explosion 1
-d1      fireball
-d0      -
-
-0x3f (077)
-
-d7      background msb
-d6      background lsb
-d5      enemy ship
-d4      skitter
-d3      thrust msb
-d2      thrust lsb
-d1      thrust hi
-d0      thrust lo
-
-Space Fury Sound Board (800-0241)
----------------------------------
-
-0x3e (076) (0 = ON)
-
-d7      partial warship, low frequency oscillation
-d6      star spin
-d5      -
-d4      -
-d3      -
-d2      thrust, low frequency noise
-d1      fire, metalic buzz
-d0      craft scale, rising tone
-
-0x3f (077)
-
-d7      -
-d6      -
-d5      docking bang
-d4      large explosion
-d3      small explosion, low frequency noise
-d2      fireball
-d1      shot
-d0      crafts joining
-
-*/
-
-void segag80v_state::elim1_sh_w(uint8_t data)
-{
-	data ^= 0xff;
-
-	/* Play fireball sample */
-	if (data & 0x02)
-		m_samples->start(0, 0);
-
-	/* Play explosion samples */
-	if (data & 0x04)
-		m_samples->start(1, 10);
-	if (data & 0x08)
-		m_samples->start(1, 9);
-	if (data & 0x10)
-		m_samples->start(1, 8);
-
-	/* Play bounce sample */
-	if (data & 0x20)
-	{
-		if (m_samples->playing(2))
-			m_samples->stop(2);
-		m_samples->start(2, 1);
-	}
-
-	/* Play lazer sample */
-	if (data & 0xc0)
-	{
-		if (m_samples->playing(3))
-			m_samples->stop(3);
-		m_samples->start(3, 5);
-	}
-}
-
-void segag80v_state::elim2_sh_w(uint8_t data)
-{
-	data ^= 0xff;
-
-	/* Play thrust sample */
-	if (data & 0x0f)
-		m_samples->start(4, 6);
-	else
-		m_samples->stop(4);
-
-	/* Play skitter sample */
-	if (data & 0x10)
-		m_samples->start(5, 2);
-
-	/* Play eliminator sample */
-	if (data & 0x20)
-		m_samples->start(6, 3);
-
-	/* Play electron samples */
-	if (data & 0x40)
-		m_samples->start(7, 7);
-	if (data & 0x80)
-		m_samples->start(7, 4);
-}
-
-
-void segag80v_state::zektor1_sh_w(uint8_t data)
-{
-	data ^= 0xff;
-
-	/* Play fireball sample */
-	if (data & 0x02)
-				m_samples->start(0, 0);
-
-	/* Play explosion samples */
-	if (data & 0x04)
-				m_samples->start(1, 10);
-	if (data & 0x08)
-					m_samples->start(1, 9);
-	if (data & 0x10)
-					m_samples->start(1, 8);
-
-	/* Play bounce sample */
-	if (data & 0x20)
-	{
-				if (m_samples->playing(2))
-						m_samples->stop(2);
-				m_samples->start(2, 1);
-	}
-
-	/* Play lazer sample */
-	if (data & 0xc0)
-	{
-		if (m_samples->playing(3))
-			m_samples->stop(3);
-				m_samples->start(3, 5);
-	}
-}
-
-void segag80v_state::zektor2_sh_w(uint8_t data)
-{
-	data ^= 0xff;
-
-	/* Play thrust sample */
-	if (data & 0x0f)
-			m_samples->start(4, 6);
-	else
-		m_samples->stop(4);
-
-	/* Play skitter sample */
-	if (data & 0x10)
-				m_samples->start(5, 2);
-
-	/* Play eliminator sample */
-	if (data & 0x20)
-				m_samples->start(6, 3);
-
-	/* Play electron samples */
-	if (data & 0x40)
-				m_samples->start(7, 40);
-	if (data & 0x80)
-				m_samples->start(7, 41);
-}
-
-
-
-void segag80v_state::spacfury1_sh_w(uint8_t data)
-{
-	data ^= 0xff;
-
-	/* craft growing */
-	if (data & 0x01)
-		m_samples->start(1, 0);
-
-	/* craft moving */
-	if (data & 0x02)
-	{
-		if (!m_samples->playing(2))
-			m_samples->start(2, 1, true);
-	}
-	else
-		m_samples->stop(2);
-
-	/* Thrust */
-	if (data & 0x04)
-	{
-		if (!m_samples->playing(3))
-			m_samples->start(3, 4, true);
-	}
-	else
-		m_samples->stop(3);
-
-	/* star spin */
-	if (data & 0x40)
-		m_samples->start(4, 8);
-
-	/* partial warship? */
-	if (data & 0x80)
-		m_samples->start(4, 9);
-
-}
-
-void segag80v_state::spacfury2_sh_w(uint8_t data)
-{
-	data ^= 0xff;
-
-	/* craft joining */
-	if (data & 0x01)
-		m_samples->start(5, 2);
-
-	/* ship firing */
-	if (data & 0x02)
-	{
-		if (m_samples->playing(6))
-			m_samples->stop(6);
-		m_samples->start(6, 3);
-
-	}
-
-	/* fireball */
-	if (data & 0x04)
-		m_samples->start(7, 6);
-
-	/* small explosion */
-	if (data & 0x08)
-		m_samples->start(7, 6);
-	/* large explosion */
-	if (data & 0x10)
-		m_samples->start(7, 5);
-
-	/* docking bang */
-	if (data & 0x20)
-		m_samples->start(0, 7);
-
-}
diff -Nru mame-0.222+dfsg.1/src/mame/audio/segasnd.cpp mame-0.224+dfsg.1/src/mame/audio/segasnd.cpp
--- mame-0.222+dfsg.1/src/mame/audio/segasnd.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/segasnd.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,909 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/***************************************************************************
-
-    segasnd.cpp
-
-    Sound boards for early Sega G-80 based games.
-
-***************************************************************************/
-
-#include "emu.h"
-#include "segasnd.h"
-
-#include "sound/sp0250.h"
-#include "includes/segag80r.h"
-#include "includes/segag80v.h"
-
-#include <cmath>
-
-
-#define VERBOSE 0
-#include "logmacro.h"
-
-
-/***************************************************************************
-    CONSTANTS
-***************************************************************************/
-
-#define SPEECH_MASTER_CLOCK 3120000
-
-#define USB_MASTER_CLOCK    6000000
-#define USB_2MHZ_CLOCK      (USB_MASTER_CLOCK/3)
-#define USB_PCS_CLOCK       (USB_2MHZ_CLOCK/2)
-#define USB_GOS_CLOCK       (USB_2MHZ_CLOCK/16/4)
-#define MM5837_CLOCK        100000
-
-#define SAMPLE_RATE         (USB_2MHZ_CLOCK/8)
-
-
-
-/***************************************************************************
-    INLINE FUNCTIONS
-***************************************************************************/
-
-inline void usb_sound_device::g80_filter_state::configure(double r, double c)
-{
-	capval = 0.0;
-	exponent = 1.0 - std::exp(-1.0 / (r * c * SAMPLE_RATE));
-}
-
-
-inline double usb_sound_device::g80_filter_state::step_rc(double input)
-{
-	return capval += (input - capval) * exponent;
-}
-
-
-inline double usb_sound_device::g80_filter_state::step_cr(double input)
-{
-	double const result = input - capval;
-	capval += result * exponent;
-	return result;
-}
-
-
-
-/***************************************************************************
-    SPEECH BOARD
-***************************************************************************/
-
-DEFINE_DEVICE_TYPE(SEGASPEECH, speech_sound_device, "sega_speech_sound", "Sega Speech Sound Board")
-
-#define SEGASPEECH_REGION "speech"
-
-speech_sound_device::speech_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
-	: device_t(mconfig, SEGASPEECH, tag, owner, clock),
-		device_sound_interface(mconfig, *this),
-		m_int_cb(*this),
-		m_speech(*this, SEGASPEECH_REGION),
-		m_drq(0),
-		m_latch(0),
-		m_t0(0),
-		m_p2(0)
-{
-}
-
-//-------------------------------------------------
-//  device_start - device-specific startup
-//-------------------------------------------------
-
-void speech_sound_device::device_start()
-{
-	m_int_cb.resolve();
-
-	save_item(NAME(m_latch));
-	save_item(NAME(m_t0));
-	save_item(NAME(m_p2));
-	save_item(NAME(m_drq));
-}
-
-
-/*************************************
- *
- *  i8035 port accessors
- *
- *************************************/
-
-
-
-READ_LINE_MEMBER( speech_sound_device::t0_r )
-{
-	return m_t0;
-}
-
-READ_LINE_MEMBER( speech_sound_device::t1_r )
-{
-	return m_drq;
-}
-
-uint8_t speech_sound_device::p1_r()
-{
-	return m_latch & 0x7f;
-}
-
-uint8_t speech_sound_device::rom_r(offs_t offset)
-{
-	return m_speech->base()[0x100 * (m_p2 & 0x3f) + offset];
-}
-
-void speech_sound_device::p1_w(uint8_t data)
-{
-	if (!(data & 0x80))
-		m_t0 = 0;
-}
-
-void speech_sound_device::p2_w(uint8_t data)
-{
-	m_p2 = data;
-}
-
-
-
-/*************************************
- *
- *  i8035 port accessors
- *
- *************************************/
-
-WRITE_LINE_MEMBER(speech_sound_device::drq_w)
-{
-	m_drq = (state == ASSERT_LINE);
-}
-
-
-
-/*************************************
- *
- *  External access
- *
- *************************************/
-
-TIMER_CALLBACK_MEMBER( speech_sound_device::delayed_speech_w )
-{
-	int data = param;
-	u8 old = m_latch;
-
-	/* all 8 bits are latched */
-	m_latch = data;
-
-	/* the high bit goes directly to the INT line */
-	m_int_cb((data & 0x80) ? CLEAR_LINE : ASSERT_LINE);
-
-	/* a clock on the high bit clocks a 1 into T0 */
-	if (!(old & 0x80) && (data & 0x80))
-		m_t0 = 1;
-}
-
-
-void speech_sound_device::data_w(uint8_t data)
-{
-	machine().scheduler().synchronize(timer_expired_delegate(FUNC(speech_sound_device::delayed_speech_w), this), data);
-}
-
-
-void speech_sound_device::control_w(uint8_t data)
-{
-	LOG("Speech control = %X\n", data);
-}
-
-
-//-------------------------------------------------
-//  sound_stream_update - handle a stream update
-//-------------------------------------------------
-
-void speech_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
-{
-}
-
-/*************************************
- *
- *  Speech board functions
- *
- *************************************/
-
-WRITE_LINE_MEMBER(segag80snd_common::segaspeech_int_w)
-{
-	m_audiocpu->set_input_line(0, state);
-}
-
-/*************************************
- *
- *  Speech board address maps
- *
- *************************************/
-
-void segag80snd_common::speech_map(address_map &map)
-{
-	map(0x0000, 0x07ff).mirror(0x0800).rom();
-}
-
-
-void segag80snd_common::speech_portmap(address_map &map)
-{
-	map(0x00, 0xff).r("segaspeech", FUNC(speech_sound_device::rom_r));
-	map(0x00, 0xff).w("speech", FUNC(sp0250_device::write));
-}
-
-
-/*************************************
- *
- *  Speech board machine drivers
- *
- *************************************/
-
-void segag80snd_common::sega_speech_board(machine_config &config)
-{
-	/* CPU for the speech board */
-	i8035_device &audiocpu(I8035(config, m_audiocpu, SPEECH_MASTER_CLOCK));        /* divide by 15 in CPU */
-	audiocpu.set_addrmap(AS_PROGRAM, &segag80snd_common::speech_map);
-	audiocpu.set_addrmap(AS_IO, &segag80snd_common::speech_portmap);
-	audiocpu.p1_in_cb().set("segaspeech", FUNC(speech_sound_device::p1_r));
-	audiocpu.p1_out_cb().set("segaspeech", FUNC(speech_sound_device::p1_w));
-	audiocpu.p2_out_cb().set("segaspeech", FUNC(speech_sound_device::p2_w));
-	audiocpu.t0_in_cb().set("segaspeech", FUNC(speech_sound_device::t0_r));
-	audiocpu.t1_in_cb().set("segaspeech", FUNC(speech_sound_device::t1_r));
-
-	/* sound hardware */
-	SEGASPEECH(config, "segaspeech", 0).int_cb().set(FUNC(segag80snd_common::segaspeech_int_w));
-	sp0250_device &speech(SP0250(config, "speech", SPEECH_MASTER_CLOCK));
-	speech.drq().set("segaspeech", FUNC(speech_sound_device::drq_w));
-	speech.add_route(ALL_OUTPUTS, "speaker", 1.0);
-}
-
-
-
-/***************************************************************************
-    UNIVERSAL SOUND BOARD
-***************************************************************************/
-
-DEFINE_DEVICE_TYPE(SEGAUSB, usb_sound_device, "segausb", "Sega Universal Sound Board")
-
-usb_sound_device::usb_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
-	: device_t(mconfig, type, tag, owner, clock),
-		device_sound_interface(mconfig, *this),
-		m_ourcpu(*this, "ourcpu"),
-		m_maincpu(*this, finder_base::DUMMY_TAG),
-		m_stream(nullptr),
-		m_in_latch(0),
-		m_out_latch(0),
-		m_last_p2_value(0),
-		m_program_ram(*this, "pgmram"),
-		m_work_ram(*this, "workram"),
-		m_work_ram_bank(0),
-		m_t1_clock(0),
-		m_t1_clock_mask(0),
-		m_noise_shift(0),
-		m_noise_state(0),
-		m_noise_subcount(0)
-{
-}
-
-usb_sound_device::usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
-	: usb_sound_device(mconfig, SEGAUSB, tag, owner, clock)
-{
-}
-
-//-------------------------------------------------
-//  device_start - device-specific startup
-//-------------------------------------------------
-
-void usb_sound_device::device_start()
-{
-	/* create a sound stream */
-	m_stream = machine().sound().stream_alloc(*this, 0, 1, SAMPLE_RATE);
-
-	/* initialize state */
-	m_noise_shift = 0x15555;
-
-	for (timer8253 &g : m_timer_group)
-	{
-		g.chan_filter[0].configure(10e3, 1e-6);
-		g.chan_filter[1].configure(10e3, 1e-6);
-		g.gate1.configure(100e3, 0.01e-6);
-		g.gate2.configure(2 * 100e3, 0.01e-6);
-	}
-
-	g80_filter_state temp;
-	temp.configure(100e3, 0.01e-6);
-	m_gate_rc1_exp[0] = temp.exponent;
-	temp.configure(1e3, 0.01e-6);
-	m_gate_rc1_exp[1] = temp.exponent;
-	temp.configure(2 * 100e3, 0.01e-6);
-	m_gate_rc2_exp[0] = temp.exponent;
-	temp.configure(2 * 1e3, 0.01e-6);
-	m_gate_rc2_exp[1] = temp.exponent;
-
-	m_noise_filters[0].configure(2.7e3 + 2.7e3, 1.0e-6);
-	m_noise_filters[1].configure(2.7e3 + 1e3, 0.30e-6);
-	m_noise_filters[2].configure(2.7e3 + 270, 0.15e-6);
-	m_noise_filters[3].configure(2.7e3 + 0, 0.082e-6);
-	m_noise_filters[4].configure(33e3, 0.1e-6);
-
-	m_final_filter.configure(100e3, 4.7e-6);
-
-	/* register for save states */
-	save_item(NAME(m_in_latch));
-	save_item(NAME(m_out_latch));
-	save_item(NAME(m_last_p2_value));
-	save_item(NAME(m_work_ram_bank));
-	save_item(NAME(m_t1_clock));
-
-	for (int tgroup = 0; tgroup < 3; tgroup++)
-	{
-		timer8253 *group = &m_timer_group[tgroup];
-		for (int tchan = 0; tchan < 3; tchan++)
-		{
-			timer8253::channel *channel = &group->chan[tchan];
-			save_item(NAME(channel->holding), tgroup * 3 + tchan);
-			save_item(NAME(channel->latchmode), tgroup * 3 + tchan);
-			save_item(NAME(channel->latchtoggle), tgroup * 3 + tchan);
-			save_item(NAME(channel->clockmode), tgroup * 3 + tchan);
-			save_item(NAME(channel->bcdmode), tgroup * 3 + tchan);
-			save_item(NAME(channel->output), tgroup * 3 + tchan);
-			save_item(NAME(channel->lastgate), tgroup * 3 + tchan);
-			save_item(NAME(channel->gate), tgroup * 3 + tchan);
-			save_item(NAME(channel->subcount), tgroup * 3 + tchan);
-			save_item(NAME(channel->count), tgroup * 3 + tchan);
-			save_item(NAME(channel->remain), tgroup * 3 + tchan);
-		}
-		save_item(NAME(group->env), tgroup);
-		save_item(NAME(group->chan_filter[0].capval), tgroup);
-		save_item(NAME(group->chan_filter[1].capval), tgroup);
-		save_item(NAME(group->gate1.capval), tgroup);
-		save_item(NAME(group->gate2.capval), tgroup);
-		save_item(NAME(group->config), tgroup);
-	}
-
-	save_item(NAME(m_timer_mode));
-	save_item(NAME(m_noise_shift));
-	save_item(NAME(m_noise_state));
-	save_item(NAME(m_noise_subcount));
-	save_item(NAME(m_final_filter.capval));
-	save_item(NAME(m_noise_filters[0].capval));
-	save_item(NAME(m_noise_filters[1].capval));
-	save_item(NAME(m_noise_filters[2].capval));
-	save_item(NAME(m_noise_filters[3].capval));
-	save_item(NAME(m_noise_filters[4].capval));
-}
-
-//-------------------------------------------------
-//  device_reset - device-specific reset
-//-------------------------------------------------
-
-void usb_sound_device::device_reset()
-{
-	/* halt the USB CPU at reset time */
-	m_ourcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
-
-	/* start the clock timer */
-	m_t1_clock_mask = 0x10;
-}
-
-/*************************************
- *
- *  Initialization/reset
- *
- *************************************/
-
-TIMER_DEVICE_CALLBACK_MEMBER( usb_sound_device::increment_t1_clock_timer_cb )
-{
-	/* only increment if it is not being forced clear */
-	if (!(m_last_p2_value & 0x80))
-		m_t1_clock++;
-}
-
-/*************************************
- *
- *  External access
- *
- *************************************/
-
-uint8_t usb_sound_device::status_r()
-{
-	LOG("%s:usb_data_r = %02X\n", machine().describe_context(), (m_out_latch & 0x81) | (m_in_latch & 0x7e));
-
-	m_maincpu->adjust_icount(-200);
-
-	/* only bits 0 and 7 are controlled by the I8035; the remaining */
-	/* bits 1-6 reflect the current input latch values */
-	return (m_out_latch & 0x81) | (m_in_latch & 0x7e);
-}
-
-
-TIMER_CALLBACK_MEMBER( usb_sound_device::delayed_usb_data_w )
-{
-	int data = param;
-
-	/* look for rising/falling edges of bit 7 to control the RESET line */
-	m_ourcpu->set_input_line(INPUT_LINE_RESET, (data & 0x80) ? ASSERT_LINE : CLEAR_LINE);
-
-	/* if the CLEAR line is set, the low 7 bits of the input are ignored */
-	if ((m_last_p2_value & 0x40) == 0)
-		data &= ~0x7f;
-
-	/* update the effective input latch */
-	m_in_latch = data;
-}
-
-
-void usb_sound_device::data_w(uint8_t data)
-{
-	LOG("%s:usb_data_w = %02X\n", machine().describe_context(), data);
-	machine().scheduler().synchronize(timer_expired_delegate(FUNC(usb_sound_device::delayed_usb_data_w), this), data);
-
-	/* boost the interleave so that sequences can be sent */
-	machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(250));
-}
-
-
-uint8_t usb_sound_device::ram_r(offs_t offset)
-{
-	return m_program_ram[offset];
-}
-
-
-void usb_sound_device::ram_w(offs_t offset, uint8_t data)
-{
-	if (m_in_latch & 0x80)
-		m_program_ram[offset] = data;
-	else
-		LOG("%s:sega_usb_ram_w(%03X) = %02X while /LOAD disabled\n", machine().describe_context(), offset, data);
-}
-
-
-
-/*************************************
- *
- *  I8035 port accesses
- *
- *************************************/
-
-uint8_t usb_sound_device::p1_r()
-{
-	/* bits 0-6 are inputs and map to bits 0-6 of the input latch */
-	if ((m_in_latch & 0x7f) != 0)
-		LOG("%s: P1 read = %02X\n", machine().describe_context(), m_in_latch & 0x7f);
-	return m_in_latch & 0x7f;
-}
-
-
-void usb_sound_device::p1_w(uint8_t data)
-{
-	/* bit 7 maps to bit 0 on the output latch */
-	m_out_latch = (m_out_latch & 0xfe) | (data >> 7);
-	LOG("%s: P1 write = %02X\n", machine().describe_context(), data);
-}
-
-
-void usb_sound_device::p2_w(uint8_t data)
-{
-	u8 old = m_last_p2_value;
-	m_last_p2_value = data;
-
-	/* low 2 bits control the bank of work RAM we are addressing */
-	m_work_ram_bank = data & 3;
-
-	/* bit 6 controls the "ready" bit output to the host */
-	/* it also clears the input latch from the host (active low) */
-	m_out_latch = ((data & 0x40) << 1) | (m_out_latch & 0x7f);
-	if ((data & 0x40) == 0)
-		m_in_latch = 0;
-
-	/* bit 7 controls the reset on the upper counter at U33 */
-	if ((old & 0x80) && !(data & 0x80))
-		m_t1_clock = 0;
-
-	LOG("%s: P2 write -> bank=%d ready=%d clock=%d\n", machine().describe_context(), data & 3, (data >> 6) & 1, (data >> 7) & 1);
-}
-
-
-READ_LINE_MEMBER( usb_sound_device::t1_r )
-{
-	/* T1 returns 1 based on the value of the T1 clock; the exact */
-	/* pattern is determined by one or more jumpers on the board. */
-	return (m_t1_clock & m_t1_clock_mask) != 0;
-}
-
-
-
-/*************************************
- *
- *  Sound generation
- *
- *************************************/
-
-inline void usb_sound_device::timer8253::channel::clock()
-{
-	u8 const old_lastgate = lastgate;
-
-	/* update the gate */
-	lastgate = gate;
-
-	/* if we're holding, skip */
-	if (holding)
-		return;
-
-	/* switch off the clock mode */
-	switch (clockmode)
-	{
-		/* oneshot; waits for trigger to restart */
-		case 1:
-			if (!old_lastgate && gate)
-			{
-				output = 0;
-				remain = count;
-			}
-			else
-			{
-				if (--remain == 0)
-					output = 1;
-			}
-			break;
-
-		/* square wave: counts down by 2 and toggles output */
-		case 3:
-			remain = (remain - 1) & ~1;
-			if (remain == 0)
-			{
-				output ^= 1;
-				remain = count;
-			}
-			break;
-	}
-}
-
-
-/*************************************
- *
- *  USB timer and envelope controls
- *
- *************************************/
-
-void usb_sound_device::timer_w(int which, u8 offset, u8 data)
-{
-	timer8253 *g = &m_timer_group[which];
-	timer8253::channel *ch;
-	int was_holding;
-
-	m_stream->update();
-
-	/* switch off the offset */
-	switch (offset)
-	{
-		case 0:
-		case 1:
-		case 2:
-			ch = &g->chan[offset];
-			was_holding = ch->holding;
-
-			/* based on the latching mode */
-			switch (ch->latchmode)
-			{
-				case 1: /* low word only */
-					ch->count = data;
-					ch->holding = false;
-					break;
-
-				case 2: /* high word only */
-					ch->count = data << 8;
-					ch->holding = false;
-					break;
-
-				case 3: /* low word followed by high word */
-					if (ch->latchtoggle == 0)
-					{
-						ch->count = (ch->count & 0xff00) | (data & 0x00ff);
-						ch->latchtoggle = 1;
-					}
-					else
-					{
-						ch->count = (ch->count & 0x00ff) | (data << 8);
-						ch->holding = false;
-						ch->latchtoggle = 0;
-					}
-					break;
-			}
-
-			/* if we're not holding, load the initial count for some modes */
-			if (was_holding && !ch->holding)
-				ch->remain = 1;
-			break;
-
-		case 3:
-			/* break out the components */
-			if (((data & 0xc0) >> 6) < 3)
-			{
-				ch = &g->chan[(data & 0xc0) >> 6];
-
-				/* extract the bits */
-				ch->holding = true;
-				ch->latchmode = (data >> 4) & 3;
-				ch->clockmode = (data >> 1) & 7;
-				ch->bcdmode = (data >> 0) & 1;
-				ch->latchtoggle = 0;
-				ch->output = (ch->clockmode == 1);
-			}
-			break;
-	}
-}
-
-
-void usb_sound_device::env_w(int which, u8 offset, u8 data)
-{
-	timer8253 *g = &m_timer_group[which];
-
-	m_stream->update();
-
-	if (offset < 3)
-		g->env[offset] = (double)data;
-	else
-		g->config = data & 1;
-}
-
-
-
-/*************************************
- *
- *  USB work RAM access
- *
- *************************************/
-
-uint8_t usb_sound_device::workram_r(offs_t offset)
-{
-	offset += 256 * m_work_ram_bank;
-	return m_work_ram[offset];
-}
-
-
-void usb_sound_device::workram_w(offs_t offset, uint8_t data)
-{
-	offset += 256 * m_work_ram_bank;
-	m_work_ram[offset] = data;
-
-	/* writes to the low 32 bytes go to various controls */
-	switch (offset & ~3)
-	{
-		case 0x00:  /* CTC0 */
-			timer_w(0, offset & 3, data);
-			break;
-
-		case 0x04:  /* ENV0 */
-			env_w(0, offset & 3, data);
-			break;
-
-		case 0x08:  /* CTC1 */
-			timer_w(1, offset & 3, data);
-			break;
-
-		case 0x0c:  /* ENV1 */
-			env_w(1, offset & 3, data);
-			break;
-
-		case 0x10:  /* CTC2 */
-			timer_w(2, offset & 3, data);
-			break;
-
-		case 0x14:  /* ENV2 */
-			env_w(2, offset & 3, data);
-			break;
-	}
-}
-
-//-------------------------------------------------
-//  sound_stream_update - handle a stream update
-//-------------------------------------------------
-
-void usb_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
-{
-	stream_sample_t *dest = outputs[0];
-
-	/* iterate over samples */
-	while (samples--)
-	{
-		double noiseval;
-		double sample = 0;
-		int group;
-		int step;
-
-
-		/*----------------
-		    Noise Source
-		  ----------------
-
-		                 RC
-		   MM5837 ---> FILTER ---> CR FILTER ---> 3.2x AMP ---> NOISE
-		               LADDER
-		*/
-
-		/* update the noise source */
-		for (step = USB_2MHZ_CLOCK / SAMPLE_RATE; step >= m_noise_subcount; step -= m_noise_subcount)
-		{
-			m_noise_shift = (m_noise_shift << 1) | (((m_noise_shift >> 13) ^ (m_noise_shift >> 16)) & 1);
-			m_noise_state = (m_noise_shift >> 16) & 1;
-			m_noise_subcount = USB_2MHZ_CLOCK / MM5837_CLOCK;
-		}
-		m_noise_subcount -= step;
-
-		/* update the filtered noise value -- this is just an approximation to the pink noise filter */
-		/* being applied on the PCB, but it sounds pretty close */
-		m_noise_filters[0].capval = 0.99765 * m_noise_filters[0].capval + m_noise_state * 0.0990460;
-		m_noise_filters[1].capval = 0.96300 * m_noise_filters[1].capval + m_noise_state * 0.2965164;
-		m_noise_filters[2].capval = 0.57000 * m_noise_filters[2].capval + m_noise_state * 1.0526913;
-		noiseval = m_noise_filters[0].capval + m_noise_filters[1].capval + m_noise_filters[2].capval + m_noise_state * 0.1848;
-
-		/* final output goes through a CR filter; the scaling factor is arbitrary to get the noise to the */
-		/* correct relative volume */
-		noiseval = m_noise_filters[4].step_cr(noiseval);
-		noiseval *= 0.075;
-
-		/* there are 3 identical groups of circuits, each with its own 8253 */
-		for (group = 0; group < 3; group++)
-		{
-			timer8253 *g = &m_timer_group[group];
-			double chan0, chan1, chan2, mix;
-
-
-			/*-------------
-			    Channel 0
-			  -------------
-
-			    8253        CR                   AD7524
-			    OUT0 ---> FILTER ---> BUFFER--->  VRef  ---> 100k ---> mix
-			*/
-
-			/* channel 0 clocks with the PCS clock */
-			for (step = USB_2MHZ_CLOCK / SAMPLE_RATE; step >= g->chan[0].subcount; step -= g->chan[0].subcount)
-			{
-				g->chan[0].subcount = USB_2MHZ_CLOCK / USB_PCS_CLOCK;
-				g->chan[0].gate = 1;
-				g->chan[0].clock();
-			}
-			g->chan[0].subcount -= step;
-
-			/* channel 0 is mixed in with a resistance of 100k */
-			chan0 = g->chan_filter[0].step_cr(g->chan[0].output) * g->env[0] * (1.0/100.0);
-
-
-			/*-------------
-			    Channel 1
-			  -------------
-
-			    8253        CR                   AD7524
-			    OUT1 ---> FILTER ---> BUFFER--->  VRef  ---> 100k ---> mix
-			*/
-
-			/* channel 1 clocks with the PCS clock */
-			for (step = USB_2MHZ_CLOCK / SAMPLE_RATE; step >= g->chan[1].subcount; step -= g->chan[1].subcount)
-			{
-				g->chan[1].subcount = USB_2MHZ_CLOCK / USB_PCS_CLOCK;
-				g->chan[1].gate = 1;
-				g->chan[1].clock();
-			}
-			g->chan[1].subcount -= step;
-
-			/* channel 1 is mixed in with a resistance of 100k */
-			chan1 = g->chan_filter[1].step_cr(g->chan[1].output) * g->env[1] * (1.0/100.0);
-
-
-			/*-------------
-			    Channel 2
-			  -------------
-
-			  If timer_mode == 0:
-
-			               SWITCHED                                  AD7524
-			    NOISE --->    RC   ---> 1.56x AMP ---> INVERTER --->  VRef ---> 33k ---> mix
-			                FILTERS
-
-			  If timer mode == 1:
-
-			                             AD7524                                    SWITCHED
-			    NOISE ---> INVERTER --->  VRef ---> 33k ---> mix ---> INVERTER --->   RC   ---> 1.56x AMP ---> finalmix
-			                                                                        FILTERS
-			*/
-
-			/* channel 2 clocks with the 2MHZ clock and triggers with the GOS clock */
-			for (step = 0; step < USB_2MHZ_CLOCK / SAMPLE_RATE; step++)
-			{
-				if (g->chan[2].subcount-- == 0)
-				{
-					g->chan[2].subcount = USB_2MHZ_CLOCK / USB_GOS_CLOCK / 2 - 1;
-					g->chan[2].gate = !g->chan[2].gate;
-				}
-				g->chan[2].clock();
-			}
-
-			/* the exponents for the gate filters are determined by channel 2's output */
-			g->gate1.exponent = m_gate_rc1_exp[g->chan[2].output];
-			g->gate2.exponent = m_gate_rc2_exp[g->chan[2].output];
-
-			/* based on the envelope mode, we do one of two things with source 2 */
-			if (g->config == 0)
-			{
-				chan2 = g->gate2.step_rc(g->gate1.step_rc(noiseval)) * -1.56 * g->env[2] * (1.0/33.0);
-				mix = chan0 + chan1 + chan2;
-			}
-			else
-			{
-				chan2 = -noiseval * g->env[2] * (1.0/33.0);
-				mix = chan0 + chan1 + chan2;
-				mix = g->gate2.step_rc(g->gate1.step_rc(-mix)) * 1.56;
-			}
-
-			/* accumulate the sample */
-			sample += mix;
-		}
-
-
-		/*-------------
-		    Final mix
-		  -------------
-
-		  INPUTS
-		  EQUAL ---> 1.2x INVERTER ---> CR FILTER ---> out
-		  WEIGHT
-
-		*/
-		*dest++ = 4000 * m_final_filter.step_cr(sample);
-	}
-}
-
-
-/*************************************
- *
- *  USB address maps
- *
- *************************************/
-
-void usb_sound_device::usb_map(address_map &map)
-{
-	map(0x0000, 0x0fff).ram().share("pgmram");
-}
-
-void usb_sound_device::usb_portmap(address_map &map)
-{
-	map(0x00, 0xff).rw(FUNC(usb_sound_device::workram_r), FUNC(usb_sound_device::workram_w)).share("workram");
-}
-
-
-//-------------------------------------------------
-// device_add_mconfig - add device configuration
-//-------------------------------------------------
-
-void usb_sound_device::device_add_mconfig(machine_config &config)
-{
-	/* CPU for the usb board */
-	I8035(config, m_ourcpu, USB_MASTER_CLOCK);     /* divide by 15 in CPU */
-	m_ourcpu->set_addrmap(AS_PROGRAM, &usb_sound_device::usb_map);
-	m_ourcpu->set_addrmap(AS_IO, &usb_sound_device::usb_portmap);
-	m_ourcpu->p1_in_cb().set(FUNC(usb_sound_device::p1_r));
-	m_ourcpu->p1_out_cb().set(FUNC(usb_sound_device::p1_w));
-	m_ourcpu->p2_out_cb().set(FUNC(usb_sound_device::p2_w));
-	m_ourcpu->t1_in_cb().set(FUNC(usb_sound_device::t1_r));
-
-	TIMER(config, "usb_timer", 0).configure_periodic(
-			FUNC(usb_sound_device::increment_t1_clock_timer_cb),
-			attotime::from_hz(USB_2MHZ_CLOCK / 256));
-}
-
-
-DEFINE_DEVICE_TYPE(SEGAUSBROM, usb_rom_sound_device, "segausbrom", "Sega Universal Sound Board with ROM")
-
-usb_rom_sound_device::usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
-	: usb_sound_device(mconfig, SEGAUSBROM, tag, owner, clock)
-{
-}
-
-void usb_sound_device::usb_map_rom(address_map &map)
-{
-	map(0x0000, 0x0fff).rom().region(":usbcpu", 0);
-}
-
-void usb_rom_sound_device::device_add_mconfig(machine_config &config)
-{
-	usb_sound_device::device_add_mconfig(config);
-
-	/* CPU for the usb board */
-	m_ourcpu->set_addrmap(AS_PROGRAM, &usb_rom_sound_device::usb_map_rom);
-}
diff -Nru mame-0.222+dfsg.1/src/mame/audio/segasnd.h mame-0.224+dfsg.1/src/mame/audio/segasnd.h
--- mame-0.222+dfsg.1/src/mame/audio/segasnd.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/segasnd.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,214 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/*************************************************************************
-
-    Sega g80 common sound hardware
-
-*************************************************************************/
-#ifndef MAME_AUDIO_SEGASND_H
-#define MAME_AUDIO_SEGASND_H
-
-#pragma once
-
-#include "cpu/mcs48/mcs48.h"
-#include "machine/timer.h"
-
-class segag80snd_common : public driver_device {
-public:
-	segag80snd_common(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_audiocpu(*this, "audiocpu")
-	{ }
-
-	virtual ~segag80snd_common() = default;
-
-	DECLARE_WRITE_LINE_MEMBER(segaspeech_int_w);
-
-	void sega_speech_board(machine_config &config);
-
-protected:
-	void speech_map(address_map &map);
-	void speech_portmap(address_map &map);
-
-	optional_device<cpu_device> m_audiocpu;
-};
-
-#define SEGASND_SEGASPEECH_REGION "segaspeech:speech"
-
-class speech_sound_device : public device_t, public device_sound_interface
-{
-public:
-	speech_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
-
-	auto int_cb() { return m_int_cb.bind(); }
-
-	void data_w(uint8_t data);
-	void control_w(uint8_t data);
-
-	DECLARE_READ_LINE_MEMBER( t0_r );
-	DECLARE_READ_LINE_MEMBER( t1_r );
-	uint8_t p1_r();
-	uint8_t rom_r(offs_t offset);
-	void p1_w(uint8_t data);
-	void p2_w(uint8_t data);
-
-	DECLARE_WRITE_LINE_MEMBER(drq_w);
-
-protected:
-	// device-level overrides
-	virtual void device_start() override;
-
-	// sound stream update overrides
-	virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-
-private:
-	devcb_write_line m_int_cb;
-	required_memory_region m_speech;
-
-	// internal state
-	u8 m_drq;
-	u8 m_latch;
-	u8 m_t0;
-	u8 m_p2;
-
-	TIMER_CALLBACK_MEMBER( delayed_speech_w );
-};
-
-DECLARE_DEVICE_TYPE(SEGASPEECH, speech_sound_device)
-
-class usb_sound_device : public device_t, public device_sound_interface
-{
-public:
-	template <typename T> usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, T &&maincpu_tag)
-		: usb_sound_device(mconfig, tag, owner, clock)
-	{
-		m_maincpu.set_tag(maincpu_tag);
-	}
-
-	usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
-
-	uint8_t status_r();
-	void data_w(uint8_t data);
-	uint8_t ram_r(offs_t offset);
-	void ram_w(offs_t offset, uint8_t data);
-
-	uint8_t workram_r(offs_t offset);
-	void workram_w(offs_t offset, uint8_t data);
-
-	TIMER_DEVICE_CALLBACK_MEMBER( increment_t1_clock_timer_cb );
-
-	void usb_map(address_map &map);
-	void usb_map_rom(address_map &map);
-	void usb_portmap(address_map &map);
-
-protected:
-	usb_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
-
-	// device-level overrides
-	virtual void device_add_mconfig(machine_config &config) override;
-	virtual void device_start() override;
-	virtual void device_reset() override;
-
-	// sound stream update overrides
-	virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
-
-	required_device<i8035_device> m_ourcpu;
-	required_device<cpu_device> m_maincpu;
-
-private:
-	struct g80_filter_state
-	{
-		g80_filter_state() { }
-
-		void configure(double r, double c);
-		double step_rc(double input);
-		double step_cr(double input);
-
-		double capval   = 0.0; // current capacitor value
-		double exponent = 0.0; // constant exponent
-	};
-
-
-	struct timer8253
-	{
-		struct channel
-		{
-			channel() { }
-
-			void clock();
-
-			u8  holding     = 0; // holding until counts written? */
-			u8  latchmode   = 0; // latching mode */
-			u8  latchtoggle = 0; // latching state */
-			u8  clockmode   = 0; // clocking mode */
-			u8  bcdmode     = 0; // BCD mode? */
-			u8  output      = 0; // current output value */
-			u8  lastgate    = 0; // previous gate value */
-			u8  gate        = 0; // current gate value */
-			u8  subcount    = 0; // subcount (2MHz clocks per input clock) */
-			u16 count       = 0; // initial count
-			u16 remain      = 0; // current down counter value
-		};
-
-		timer8253() : env{ 0.0, 0.0, 0.0 } { }
-
-		channel             chan[3];        // three channels' worth of information
-		double              env[3];         // envelope value for each channel
-		g80_filter_state    chan_filter[2]; // filter states for the first two channels
-		g80_filter_state    gate1;          // first RC filter state
-		g80_filter_state    gate2;          // second RC filter state
-		u8                  config = 0;     // configuration for this timer
-	};
-
-	// internal state
-	sound_stream            *m_stream;              // output stream
-	u8                      m_in_latch;             // input latch
-	u8                      m_out_latch;            // output latch
-	u8                      m_last_p2_value;        // current P2 output value
-	optional_shared_ptr<u8> m_program_ram;          // pointer to program RAM
-	required_shared_ptr<u8> m_work_ram;             // pointer to work RAM
-	u8                      m_work_ram_bank;        // currently selected work RAM bank
-	u8                      m_t1_clock;             // T1 clock value
-	u8                      m_t1_clock_mask;        // T1 clock mask (configured via jumpers)
-	timer8253               m_timer_group[3];       // 3 groups of timers
-	u8                      m_timer_mode[3];        // mode control for each group
-	u32                     m_noise_shift;
-	u8                      m_noise_state;
-	u8                      m_noise_subcount;
-	double                  m_gate_rc1_exp[2];
-	double                  m_gate_rc2_exp[2];
-	g80_filter_state        m_final_filter;
-	g80_filter_state        m_noise_filters[5];
-
-	TIMER_CALLBACK_MEMBER( delayed_usb_data_w );
-	void timer_w(int which, u8 offset, u8 data);
-	void env_w(int which, u8 offset, u8 data);
-
-	uint8_t p1_r();
-	void p1_w(uint8_t data);
-	void p2_w(uint8_t data);
-	DECLARE_READ_LINE_MEMBER( t1_r );
-};
-
-DECLARE_DEVICE_TYPE(SEGAUSB, usb_sound_device)
-
-
-class usb_rom_sound_device : public usb_sound_device
-{
-public:
-	template <typename T> usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, T &&maincpu_tag)
-		: usb_rom_sound_device(mconfig, tag, owner, clock)
-	{
-		m_maincpu.set_tag(maincpu_tag);
-	}
-
-	usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
-
-protected:
-	// device-level overrides
-	virtual void device_add_mconfig(machine_config &config) override;
-};
-
-DECLARE_DEVICE_TYPE(SEGAUSBROM, usb_rom_sound_device)
-
-#endif // MAME_AUDIO_SEGASND_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/segaspeech.cpp mame-0.224+dfsg.1/src/mame/audio/segaspeech.cpp
--- mame-0.222+dfsg.1/src/mame/audio/segaspeech.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/segaspeech.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,217 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+/***************************************************************************
+
+    segaspeech.cpp
+
+    Sega Speech board for early G-80 games.
+
+***************************************************************************/
+
+#include "emu.h"
+#include "segaspeech.h"
+
+#include "sound/sp0250.h"
+#include "includes/segag80r.h"
+#include "includes/segag80v.h"
+#include "audio/nl_segaspeech.h"
+
+#define VERBOSE 0
+#include "logmacro.h"
+
+
+/***************************************************************************
+    CONSTANTS
+***************************************************************************/
+
+#define SPEECH_MASTER_CLOCK 3120000
+
+
+
+/***************************************************************************
+    SPEECH BOARD
+***************************************************************************/
+
+DEFINE_DEVICE_TYPE(SEGA_SPEECH_BOARD, sega_speech_device, "sega_speech_device", "Sega Speech Sound Board")
+
+sega_speech_device::sega_speech_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) :
+	device_t(mconfig, SEGA_SPEECH_BOARD, tag, owner, clock),
+	device_mixer_interface(mconfig, *this),
+	m_speech(*this, "data"),
+	m_cpu(*this, "cpu"),
+	m_drq(0),
+	m_latch(0),
+	m_t0(0),
+	m_p2(0)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void sega_speech_device::device_start()
+{
+	save_item(NAME(m_latch));
+	save_item(NAME(m_t0));
+	save_item(NAME(m_p2));
+	save_item(NAME(m_drq));
+}
+
+
+/*************************************
+ *
+ *  i8035 port accessors
+ *
+ *************************************/
+
+READ_LINE_MEMBER( sega_speech_device::t0_r )
+{
+	return m_t0;
+}
+
+READ_LINE_MEMBER( sega_speech_device::t1_r )
+{
+//printf("%s: t1_r=%d\n", machine().scheduler().time().as_string(), m_drq);
+	return m_drq;
+}
+
+uint8_t sega_speech_device::p1_r()
+{
+	return m_latch & 0x7f;
+}
+
+uint8_t sega_speech_device::rom_r(offs_t offset)
+{
+	return m_speech->base()[0x100 * (m_p2 & 0x3f) + offset];
+}
+
+void sega_speech_device::p1_w(uint8_t data)
+{
+	if (!(data & 0x80))
+		m_t0 = 0;
+}
+
+void sega_speech_device::p2_w(uint8_t data)
+{
+	m_p2 = data;
+}
+
+
+
+/*************************************
+ *
+ *  i8035 port accessors
+ *
+ *************************************/
+
+WRITE_LINE_MEMBER(sega_speech_device::drq_w)
+{
+//printf("%s: DRQ=%d\n", machine().scheduler().time().as_string(), state);
+	m_drq = (state == ASSERT_LINE);
+}
+
+
+
+/*************************************
+ *
+ *  External access
+ *
+ *************************************/
+
+TIMER_CALLBACK_MEMBER( sega_speech_device::delayed_speech_w )
+{
+	int data = param;
+	u8 old = m_latch;
+
+	/* all 8 bits are latched */
+	m_latch = data;
+
+	/* the high bit goes directly to the INT line */
+	m_cpu->set_input_line(INPUT_LINE_IRQ0, (data & 0x80) ? CLEAR_LINE : ASSERT_LINE);
+
+	/* a clock on the high bit clocks a 1 into T0 */
+	if (!(old & 0x80) && (data & 0x80))
+		m_t0 = 1;
+}
+
+
+void sega_speech_device::data_w(uint8_t data)
+{
+	machine().scheduler().synchronize(timer_expired_delegate(FUNC(sega_speech_device::delayed_speech_w), this), data);
+}
+
+
+void sega_speech_device::control_w(uint8_t data)
+{
+	// bit 3 controls channel #1 of a CD4053 to enable/disable
+	// speech output
+	this->set_input_gain(0, BIT(data, 3) ? 1.0 : 0.0);
+
+	// bit 4 controls channel #2, but the source is unconnected
+
+	// bit 5 controls channel #3, which comes from off-board
+	// and has a pot to control the incoming volume; at least on
+	// Star Trek, this is the audio from the Universal Sound Board
+	this->set_input_gain(1, BIT(data, 5) ? 1.0 : 0.0);
+
+	LOG("Speech control = %X\n", data);
+}
+
+
+/*************************************
+ *
+ *  Speech board address maps
+ *
+ *************************************/
+
+void sega_speech_device::speech_map(address_map &map)
+{
+	map(0x0000, 0x07ff).mirror(0x0800).rom();
+}
+
+
+void sega_speech_device::speech_portmap(address_map &map)
+{
+	map(0x00, 0xff).r(FUNC(sega_speech_device::rom_r));
+	map(0x00, 0xff).w("sp0250", FUNC(sp0250_device::write));
+}
+
+
+/*************************************
+ *
+ *  Speech board machine drivers
+ *
+ *************************************/
+
+void sega_speech_device::device_add_mconfig(machine_config &config)
+{
+	// CPU for the speech board
+	i8035_device &audiocpu(I8035(config, "cpu", SPEECH_MASTER_CLOCK));    // divide by 15 in CPU
+	audiocpu.set_addrmap(AS_PROGRAM, &sega_speech_device::speech_map);
+	audiocpu.set_addrmap(AS_IO, &sega_speech_device::speech_portmap);
+	audiocpu.p1_in_cb().set(FUNC(sega_speech_device::p1_r));
+	audiocpu.p1_out_cb().set(FUNC(sega_speech_device::p1_w));
+	audiocpu.p2_out_cb().set(FUNC(sega_speech_device::p2_w));
+	audiocpu.t0_in_cb().set(FUNC(sega_speech_device::t0_r));
+	audiocpu.t1_in_cb().set(FUNC(sega_speech_device::t1_r));
+
+	// speech chip
+	sp0250_device &speech(SP0250(config, "sp0250", SPEECH_MASTER_CLOCK));
+	speech.drq().set(FUNC(sega_speech_device::drq_w));
+#if (ENABLE_NETLIST_FILTERING)
+	speech.set_pwm_mode();
+	speech.add_route(ALL_OUTPUTS, "sound_nl", 1.0, 0);
+
+	// netlist filtering
+	NETLIST_SOUND(config, "sound_nl", SPEECH_MASTER_CLOCK/2)
+		.set_source(NETLIST_NAME(segaspeech))
+		.add_route(ALL_OUTPUTS, *this, 1.0);
+
+	NETLIST_STREAM_INPUT(config, "sound_nl:cin0", 0, "I_SP0250.IN").set_mult_offset(1.0 / 32767.0, 0);
+
+	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "OUTPUT").set_mult_offset(75000.0, 0.0);
+#else
+	speech.add_route(ALL_OUTPUTS, *this, 1.0);
+#endif
+}
diff -Nru mame-0.222+dfsg.1/src/mame/audio/segaspeech.h mame-0.224+dfsg.1/src/mame/audio/segaspeech.h
--- mame-0.222+dfsg.1/src/mame/audio/segaspeech.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/segaspeech.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,61 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+/*************************************************************************
+
+    Sega speech board
+
+*************************************************************************/
+#ifndef MAME_AUDIO_SEGASPEECH_H
+#define MAME_AUDIO_SEGASPEECH_H
+
+#pragma once
+
+#define ENABLE_NETLIST_FILTERING (0)
+
+#include "cpu/mcs48/mcs48.h"
+#include "machine/netlist.h"
+#include "machine/timer.h"
+
+class sega_speech_device : public device_t, public device_mixer_interface
+{
+public:
+	sega_speech_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+//  auto int_cb() { return m_int_cb.bind(); }
+
+	void data_w(uint8_t data);
+	void control_w(uint8_t data);
+
+protected:
+	// device-level overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+
+	DECLARE_READ_LINE_MEMBER( t0_r );
+	DECLARE_READ_LINE_MEMBER( t1_r );
+	uint8_t p1_r();
+	uint8_t rom_r(offs_t offset);
+	void p1_w(uint8_t data);
+	void p2_w(uint8_t data);
+
+	DECLARE_WRITE_LINE_MEMBER(drq_w);
+
+private:
+	void speech_map(address_map &map);
+	void speech_portmap(address_map &map);
+
+	required_memory_region m_speech;
+	required_device<cpu_device> m_cpu;
+
+	// internal state
+	u8 m_drq;
+	u8 m_latch;
+	u8 m_t0;
+	u8 m_p2;
+
+	TIMER_CALLBACK_MEMBER( delayed_speech_w );
+};
+
+DECLARE_DEVICE_TYPE(SEGA_SPEECH_BOARD, sega_speech_device)
+
+#endif // MAME_AUDIO_SEGASPEECH_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/segausb.cpp mame-0.224+dfsg.1/src/mame/audio/segausb.cpp
--- mame-0.222+dfsg.1/src/mame/audio/segausb.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/segausb.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,859 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+/***************************************************************************
+
+    segausb.cpp
+
+    Sega Universal Sound Board.
+
+***************************************************************************/
+
+#include "emu.h"
+#include "segausb.h"
+#include "nl_segausb.h"
+
+#include "includes/segag80r.h"
+#include "includes/segag80v.h"
+
+#include <cmath>
+
+
+#define VERBOSE 0
+#include "logmacro.h"
+
+
+/***************************************************************************
+    CONSTANTS
+***************************************************************************/
+
+#define USB_MASTER_CLOCK    6000000
+#define USB_2MHZ_CLOCK      (USB_MASTER_CLOCK/3)
+#define USB_PCS_CLOCK       (USB_2MHZ_CLOCK/2)
+#define USB_GOS_CLOCK       (USB_2MHZ_CLOCK/16/4)
+#define MM5837_CLOCK        100000
+
+
+/***************************************************************************
+    UNIVERSAL SOUND BOARD
+***************************************************************************/
+
+DEFINE_DEVICE_TYPE(SEGAUSB, usb_sound_device, "segausb", "Sega Universal Sound Board")
+
+usb_sound_device::usb_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+	: device_t(mconfig, type, tag, owner, clock),
+		device_mixer_interface(mconfig, *this),
+		m_in_latch(0),
+		m_out_latch(0),
+		m_last_p2_value(0),
+		m_program_ram(*this, "pgmram"),
+		m_work_ram(*this, "workram"),
+		m_work_ram_bank(0),
+		m_t1_clock(0),
+		m_t1_clock_mask(0),
+		m_ourcpu(*this, "ourcpu"),
+		m_maincpu(*this, finder_base::DUMMY_TAG),
+#if (ENABLE_SEGAUSB_NETLIST)
+		m_pit(*this, "pit_%u", 0),
+		m_nl_dac0(*this, "sound_nl:dac0_%u", 0),
+		m_nl_sel0(*this, "sound_nl:sel0"),
+		m_nl_pit0_out(*this, "sound_nl:pit0_out%u", 0),
+		m_nl_dac1(*this, "sound_nl:dac1_%u", 0),
+		m_nl_sel1(*this, "sound_nl:sel1"),
+		m_nl_pit1_out(*this, "sound_nl:pit1_out%u", 0),
+		m_nl_dac2(*this, "sound_nl:dac2_%u", 0),
+		m_nl_sel2(*this, "sound_nl:sel2"),
+		m_nl_pit2_out(*this, "sound_nl:pit2_out%u", 0),
+		m_gos_clock(0)
+#else
+		m_stream(nullptr),
+		m_noise_shift(0),
+		m_noise_state(0),
+		m_noise_subcount(0)
+#endif
+{
+}
+
+usb_sound_device::usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: usb_sound_device(mconfig, SEGAUSB, tag, owner, clock)
+{
+}
+
+//-------------------------------------------------
+//  device_start - device-specific startup
+//-------------------------------------------------
+
+void usb_sound_device::device_start()
+{
+	// register for save states
+	save_item(NAME(m_in_latch));
+	save_item(NAME(m_out_latch));
+	save_item(NAME(m_last_p2_value));
+	save_item(NAME(m_work_ram_bank));
+	save_item(NAME(m_t1_clock));
+
+#if (ENABLE_SEGAUSB_NETLIST)
+
+	for (int index = 0; index < 3; index++)
+	{
+		m_pit[index]->write_gate0(1);
+		m_pit[index]->write_gate1(1);
+		m_pit[index]->write_gate2(1);
+	}
+	save_item(NAME(m_gos_clock));
+
+#else
+
+	m_stream = stream_alloc(0, 1, USB_2MHZ_CLOCK);
+
+	m_noise_shift = 0x15555;
+
+	for (timer8253 &group : m_timer_group)
+	{
+		group.chan_filter[0].configure(10e3, 1e-6);
+		group.chan_filter[1].configure(10e3, 1e-6);
+		group.gate1.configure(100e3, 0.01e-6);
+		group.gate2.configure(2 * 100e3, 0.01e-6);
+	}
+
+	g80_filter_state temp;
+	temp.configure(100e3, 0.01e-6);
+	m_gate_rc1_exp[0] = temp.exponent;
+	temp.configure(1e3, 0.01e-6);
+	m_gate_rc1_exp[1] = temp.exponent;
+	temp.configure(2 * 100e3, 0.01e-6);
+	m_gate_rc2_exp[0] = temp.exponent;
+	temp.configure(2 * 1e3, 0.01e-6);
+	m_gate_rc2_exp[1] = temp.exponent;
+
+	m_noise_filters[0].configure(2.7e3 + 2.7e3, 1.0e-6);
+	m_noise_filters[1].configure(2.7e3 + 1e3, 0.30e-6);
+	m_noise_filters[2].configure(2.7e3 + 270, 0.15e-6);
+	m_noise_filters[3].configure(2.7e3 + 0, 0.082e-6);
+	m_noise_filters[4].configure(33e3, 0.1e-6);
+
+	m_final_filter.configure(100e3, 4.7e-6);
+
+	for (int tgroup = 0; tgroup < 3; tgroup++)
+	{
+		timer8253 &group = m_timer_group[tgroup];
+		for (int tchan = 0; tchan < 3; tchan++)
+		{
+			timer8253::channel &channel = group.chan[tchan];
+			save_item(NAME(channel.holding), tgroup * 3 + tchan);
+			save_item(NAME(channel.latchmode), tgroup * 3 + tchan);
+			save_item(NAME(channel.latchtoggle), tgroup * 3 + tchan);
+			save_item(NAME(channel.clockmode), tgroup * 3 + tchan);
+			save_item(NAME(channel.bcdmode), tgroup * 3 + tchan);
+			save_item(NAME(channel.output), tgroup * 3 + tchan);
+			save_item(NAME(channel.lastgate), tgroup * 3 + tchan);
+			save_item(NAME(channel.gate), tgroup * 3 + tchan);
+			save_item(NAME(channel.subcount), tgroup * 3 + tchan);
+			save_item(NAME(channel.count), tgroup * 3 + tchan);
+			save_item(NAME(channel.remain), tgroup * 3 + tchan);
+		}
+		save_item(NAME(group.env), tgroup);
+		save_item(NAME(group.chan_filter[0].capval), tgroup);
+		save_item(NAME(group.chan_filter[1].capval), tgroup);
+		save_item(NAME(group.gate1.capval), tgroup);
+		save_item(NAME(group.gate2.capval), tgroup);
+		save_item(NAME(group.config), tgroup);
+	}
+
+	save_item(NAME(m_timer_mode));
+	save_item(NAME(m_noise_shift));
+	save_item(NAME(m_noise_state));
+	save_item(NAME(m_noise_subcount));
+	save_item(NAME(m_final_filter.capval));
+	save_item(NAME(m_noise_filters[0].capval));
+	save_item(NAME(m_noise_filters[1].capval));
+	save_item(NAME(m_noise_filters[2].capval));
+	save_item(NAME(m_noise_filters[3].capval));
+	save_item(NAME(m_noise_filters[4].capval));
+
+#endif
+}
+
+
+//-------------------------------------------------
+//  device_reset - device-specific reset
+//-------------------------------------------------
+
+void usb_sound_device::device_reset()
+{
+	// halt the USB CPU at reset time
+	m_ourcpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
+
+	// start the clock timer
+	m_t1_clock_mask = 0x10;
+}
+
+
+/*************************************
+ *
+ *  Initialization/reset
+ *
+ *************************************/
+
+TIMER_DEVICE_CALLBACK_MEMBER( usb_sound_device::increment_t1_clock_timer_cb )
+{
+	// only increment if it is not being forced clear
+	if (!(m_last_p2_value & 0x80))
+		m_t1_clock++;
+}
+
+
+/*************************************
+ *
+ *  External access
+ *
+ *************************************/
+
+u8 usb_sound_device::status_r()
+{
+	LOG("%s:usb_data_r = %02X\n", machine().describe_context(), (m_out_latch & 0x81) | (m_in_latch & 0x7e));
+
+	m_maincpu->adjust_icount(-200);
+
+	// only bits 0 and 7 are controlled by the I8035; the remaining
+	// bits 1-6 reflect the current input latch values
+	return (m_out_latch & 0x81) | (m_in_latch & 0x7e);
+}
+
+
+TIMER_CALLBACK_MEMBER( usb_sound_device::delayed_usb_data_w )
+{
+	// look for rising/falling edges of bit 7 to control the RESET line
+	int data = param;
+	m_ourcpu->set_input_line(INPUT_LINE_RESET, (data & 0x80) ? ASSERT_LINE : CLEAR_LINE);
+
+	// if the CLEAR line is set, the low 7 bits of the input are ignored
+	if ((m_last_p2_value & 0x40) == 0)
+		data &= ~0x7f;
+
+	// update the effective input latch
+	m_in_latch = data;
+}
+
+
+void usb_sound_device::data_w(u8 data)
+{
+	LOG("%s:usb_data_w = %02X\n", machine().describe_context(), data);
+	machine().scheduler().synchronize(timer_expired_delegate(FUNC(usb_sound_device::delayed_usb_data_w), this), data);
+
+	// boost the interleave so that sequences can be sent
+	machine().scheduler().boost_interleave(attotime::zero, attotime::from_usec(250));
+}
+
+
+u8 usb_sound_device::ram_r(offs_t offset)
+{
+	return m_program_ram[offset];
+}
+
+
+void usb_sound_device::ram_w(offs_t offset, u8 data)
+{
+	if (m_in_latch & 0x80)
+		m_program_ram[offset] = data;
+	else
+		LOG("%s:sega_usb_ram_w(%03X) = %02X while /LOAD disabled\n", machine().describe_context(), offset, data);
+}
+
+
+
+/*************************************
+ *
+ *  I8035 port accesses
+ *
+ *************************************/
+
+u8 usb_sound_device::p1_r()
+{
+	// bits 0-6 are inputs and map to bits 0-6 of the input latch
+	if ((m_in_latch & 0x7f) != 0)
+		LOG("%s: P1 read = %02X\n", machine().describe_context(), m_in_latch & 0x7f);
+	return m_in_latch & 0x7f;
+}
+
+
+void usb_sound_device::p1_w(u8 data)
+{
+	// bit 7 maps to bit 0 on the output latch
+	m_out_latch = (m_out_latch & 0xfe) | (data >> 7);
+	LOG("%s: P1 write = %02X\n", machine().describe_context(), data);
+}
+
+
+void usb_sound_device::p2_w(u8 data)
+{
+	u8 old = m_last_p2_value;
+	m_last_p2_value = data;
+
+	// low 2 bits control the bank of work RAM we are addressing
+	m_work_ram_bank = data & 3;
+
+	// bit 6 controls the "ready" bit output to the host
+	// it also clears the input latch from the host (active low)
+	m_out_latch = ((data & 0x40) << 1) | (m_out_latch & 0x7f);
+	if ((data & 0x40) == 0)
+		m_in_latch = 0;
+
+	// bit 7 controls the reset on the upper counter at U33
+	if ((old & 0x80) && !(data & 0x80))
+		m_t1_clock = 0;
+
+	LOG("%s: P2 write -> bank=%d ready=%d clock=%d\n", machine().describe_context(), data & 3, (data >> 6) & 1, (data >> 7) & 1);
+}
+
+
+READ_LINE_MEMBER( usb_sound_device::t1_r )
+{
+	// T1 returns 1 based on the value of the T1 clock; the exact
+	// pattern is determined by one or more jumpers on the board.
+	return (m_t1_clock & m_t1_clock_mask) != 0;
+}
+
+
+
+/*************************************
+ *
+ *  Sound generation
+ *
+ *************************************/
+
+#if (!ENABLE_SEGAUSB_NETLIST)
+
+inline void usb_sound_device::g80_filter_state::configure(double r, double c)
+{
+	capval = 0.0;
+	exponent = 1.0 - std::exp(-1.0 / (r * c * USB_2MHZ_CLOCK));
+}
+
+inline void usb_sound_device::timer8253::channel::clock()
+{
+	u8 const old_lastgate = lastgate;
+
+	// update the gate
+	lastgate = gate;
+
+	// if we're holding, skip
+	if (holding)
+		return;
+
+	// switch off the clock mode
+	switch (clockmode)
+	{
+		// oneshot; waits for trigger to restart
+		case 1:
+			if (!old_lastgate && gate)
+			{
+				output = 0;
+				remain = count;
+			}
+			else
+			{
+				if (--remain == 0)
+					output = 1;
+			}
+			break;
+
+		// square wave: counts down by 2 and toggles output
+		case 3:
+			remain = (remain - 1) & ~1;
+			if (remain == 0)
+			{
+				output ^= 1;
+				remain = count;
+			}
+			break;
+	}
+}
+
+
+/*************************************
+ *
+ *  USB timer and envelope controls
+ *
+ *************************************/
+
+void usb_sound_device::timer_w(int which, u8 offset, u8 data)
+{
+	timer8253 &group = m_timer_group[which];
+
+	m_stream->update();
+
+	// switch off the offset
+	switch (offset)
+	{
+		case 0:
+		case 1:
+		case 2:
+		{
+			timer8253::channel &ch = group.chan[offset];
+			bool was_holding = ch.holding;
+
+			// based on the latching mode
+			switch (ch.latchmode)
+			{
+				case 1: // low word only
+					ch.count = data;
+					ch.holding = false;
+					break;
+
+				case 2: // high word only
+					ch.count = data << 8;
+					ch.holding = false;
+					break;
+
+				case 3: // low word followed by high word
+					if (ch.latchtoggle == 0)
+					{
+						ch.count = (ch.count & 0xff00) | (data & 0x00ff);
+						ch.latchtoggle = 1;
+					}
+					else
+					{
+						ch.count = (ch.count & 0x00ff) | (data << 8);
+						ch.holding = false;
+						ch.latchtoggle = 0;
+					}
+					break;
+			}
+
+			// if we're not holding, load the initial count for some modes
+			if (was_holding && !ch.holding)
+				ch.remain = 1;
+			break;
+		}
+
+		case 3:
+			// break out the components
+			if (((data & 0xc0) >> 6) < 3)
+			{
+				timer8253::channel &ch = group.chan[(data & 0xc0) >> 6];
+
+				// extract the bits
+				ch.holding = true;
+				ch.latchmode = (data >> 4) & 3;
+				ch.clockmode = (data >> 1) & 7;
+				ch.bcdmode = (data >> 0) & 1;
+				ch.latchtoggle = 0;
+				ch.output = (ch.clockmode == 1);
+			}
+			break;
+	}
+}
+
+
+void usb_sound_device::env_w(int which, u8 offset, u8 data)
+{
+	timer8253 &group = m_timer_group[which];
+
+	m_stream->update();
+
+	if (offset < 3)
+		group.env[offset] = double(data);
+	else
+		group.config = data & 1;
+}
+
+//-------------------------------------------------
+//  sound_stream_update - handle a stream update
+//-------------------------------------------------
+
+void usb_sound_device::sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples)
+{
+	stream_sample_t *dest = outputs[0];
+
+	// iterate over samples
+	while (samples--)
+	{
+		/*----------------
+		    Noise Source
+		  ----------------
+
+		                 RC
+		   MM5837 ---> FILTER ---> CR FILTER ---> 3.2x AMP ---> NOISE
+		               LADDER
+		*/
+
+		// update the noise source
+		if (m_noise_subcount-- == 0)
+		{
+			m_noise_shift = (m_noise_shift << 1) | (((m_noise_shift >> 13) ^ (m_noise_shift >> 16)) & 1);
+			m_noise_state = (m_noise_shift >> 16) & 1;
+			m_noise_subcount += USB_2MHZ_CLOCK / MM5837_CLOCK;
+		}
+
+		// update the filtered noise value -- this is just an approximation to the pink noise filter
+		// being applied on the PCB, but it sounds pretty close
+		m_noise_filters[0].capval = 0.99765 * m_noise_filters[0].capval + m_noise_state * 0.0990460;
+		m_noise_filters[1].capval = 0.96300 * m_noise_filters[1].capval + m_noise_state * 0.2965164;
+		m_noise_filters[2].capval = 0.57000 * m_noise_filters[2].capval + m_noise_state * 1.0526913;
+		double noiseval = m_noise_filters[0].capval + m_noise_filters[1].capval + m_noise_filters[2].capval + m_noise_state * 0.1848;
+
+		// final output goes through a CR filter; the scaling factor is arbitrary to get the noise to the
+		// correct relative volume
+		noiseval = m_noise_filters[4].step_cr(noiseval);
+		noiseval *= 0.075;
+
+		// there are 3 identical groups of circuits, each with its own 8253
+		double sample = 0;
+		for (int groupnum = 0; groupnum < 3; groupnum++)
+		{
+			timer8253 &group = m_timer_group[groupnum];
+
+			/*-------------
+			    Channel 0
+			  -------------
+
+			    8253        CR                   AD7524
+			    OUT0 ---> FILTER ---> BUFFER--->  VRef  ---> 100k ---> mix
+			*/
+
+			// channel 0 clocks with the PCS clock
+			if (group.chan[0].subcount-- == 0)
+			{
+				group.chan[0].subcount += USB_2MHZ_CLOCK / USB_PCS_CLOCK;
+				group.chan[0].gate = 1;
+				group.chan[0].clock();
+			}
+
+			// channel 0 is mixed in with a resistance of 100k
+			double chan0 = group.chan_filter[0].step_cr(group.chan[0].output) * group.env[0] * (1.0/100.0);
+
+			/*-------------
+			    Channel 1
+			  -------------
+
+			    8253        CR                   AD7524
+			    OUT1 ---> FILTER ---> BUFFER--->  VRef  ---> 100k ---> mix
+			*/
+
+			// channel 1 clocks with the PCS clock
+			if (group.chan[1].subcount-- == 0)
+			{
+				group.chan[1].subcount += USB_2MHZ_CLOCK / USB_PCS_CLOCK;
+				group.chan[1].gate = 1;
+				group.chan[1].clock();
+			}
+
+			// channel 1 is mixed in with a resistance of 100k
+			double chan1 = group.chan_filter[1].step_cr(group.chan[1].output) * group.env[1] * (1.0/100.0);
+
+			/*-------------
+			    Channel 2
+			  -------------
+
+			  If timer_mode == 0:
+
+			               SWITCHED                                  AD7524
+			    NOISE --->    RC   ---> 1.56x AMP ---> INVERTER --->  VRef ---> 33k ---> mix
+			                FILTERS
+
+			  If timer mode == 1:
+
+			                             AD7524                                    SWITCHED
+			    NOISE ---> INVERTER --->  VRef ---> 33k ---> mix ---> INVERTER --->   RC   ---> 1.56x AMP ---> finalmix
+			                                                                        FILTERS
+			*/
+
+			// channel 2 clocks with the 2MHZ clock and triggers with the GOS clock
+			if (group.chan[2].subcount-- == 0)
+			{
+				group.chan[2].subcount += USB_2MHZ_CLOCK / USB_GOS_CLOCK / 2;
+				group.chan[2].gate = !group.chan[2].gate;
+			}
+			group.chan[2].clock();
+
+			// the exponents for the gate filters are determined by channel 2's output
+			group.gate1.exponent = m_gate_rc1_exp[group.chan[2].output];
+			group.gate2.exponent = m_gate_rc2_exp[group.chan[2].output];
+
+			// based on the envelope mode, we do one of two things with source 2
+			double chan2, mix;
+			if (group.config == 0)
+			{
+				chan2 = group.gate2.step_rc(group.gate1.step_rc(noiseval)) * -1.56 * group.env[2] * (1.0/33.0);
+				mix = chan0 + chan1 + chan2;
+			}
+			else
+			{
+				chan2 = -noiseval * group.env[2] * (1.0/33.0);
+				mix = chan0 + chan1 + chan2;
+				mix = group.gate2.step_rc(group.gate1.step_rc(-mix)) * 1.56;
+			}
+
+			// accumulate the sample
+			sample += mix;
+		}
+
+		/*-------------
+		    Final mix
+		  -------------
+
+		  INPUTS
+		  EQUAL ---> 1.2x INVERTER ---> CR FILTER ---> out
+		  WEIGHT
+
+		*/
+		*dest++ = 3000 * m_final_filter.step_cr(sample);
+	}
+}
+
+#endif
+
+
+
+/*************************************
+ *
+ *  USB work RAM access
+ *
+ *************************************/
+
+u8 usb_sound_device::workram_r(offs_t offset)
+{
+	offset += 256 * m_work_ram_bank;
+	return m_work_ram[offset];
+}
+
+
+void usb_sound_device::workram_w(offs_t offset, u8 data)
+{
+	offset += 256 * m_work_ram_bank;
+	m_work_ram[offset] = data;
+
+	// writes to the low 32 bytes go to various controls
+#if (ENABLE_SEGAUSB_NETLIST)
+
+	switch (offset)
+	{
+		case 0x00:  // 8253 U41
+		case 0x01:  // 8253 U41
+		case 0x02:  // 8253 U41
+		case 0x03:  // 8253 U41
+			if ((offset & 3) != 3)
+				printf("%s: 2.%d count=%d\n", machine().scheduler().time().as_string(), offset & 3, data);
+			m_pit[0]->write(offset & 3, data);
+			break;
+
+		case 0x04:  // ENV0 U26
+		case 0x05:  // ENV0 U25
+		case 0x06:  // ENV0 U24
+			m_nl_dac0[offset & 3]->write(double(data) / 255.0);
+			break;
+
+		case 0x07:  // ENV0 U38B
+			m_nl_sel0->write(data & 1);
+			break;
+
+		case 0x08:  // 8253 U42
+		case 0x09:  // 8253 U42
+		case 0x0a:  // 8253 U42
+		case 0x0b:  // 8253 U42
+			if ((offset & 3) != 3)
+				printf("%s: 2.%d count=%d\n", machine().scheduler().time().as_string(), offset & 3, data);
+			m_pit[1]->write(offset & 3, data);
+			break;
+
+		case 0x0c:  // ENV1 U12
+		case 0x0d:  // ENV1 U13
+		case 0x0e:  // ENV1 U14
+			m_nl_dac1[offset & 3]->write(double(data) / 255.0);
+			break;
+
+		case 0x0f:  // ENV1 U2B
+			m_nl_sel1->write(data & 1);
+			break;
+
+		case 0x10:  // 8253 U43
+		case 0x11:  // 8253 U43
+		case 0x12:  // 8253 U43
+		case 0x13:  // 8253 U43
+			if ((offset & 3) != 3)
+				printf("%s: 2.%d count=%d\n", machine().scheduler().time().as_string(), offset & 3, data);
+			m_pit[2]->write(offset & 3, data);
+			break;
+
+		case 0x14:  // ENV2 U27
+		case 0x15:  // ENV2 U28
+		case 0x16:  // ENV2 U29
+			m_nl_dac2[offset & 3]->write(double(data) / 255.0);
+			break;
+
+		case 0x17:  // ENV2 U38B
+			m_nl_sel2->write(data & 1);
+			break;
+	}
+
+#else
+
+	switch (offset & ~3)
+	{
+		case 0x00:  // CTC0
+			timer_w(0, offset & 3, data);
+			break;
+
+		case 0x04:  // ENV0
+			env_w(0, offset & 3, data);
+			break;
+
+		case 0x08:  // CTC1
+			timer_w(1, offset & 3, data);
+			break;
+
+		case 0x0c:  // ENV1
+			env_w(1, offset & 3, data);
+			break;
+
+		case 0x10:  // CTC2
+			timer_w(2, offset & 3, data);
+			break;
+
+		case 0x14:  // ENV2
+			env_w(2, offset & 3, data);
+			break;
+	}
+
+#endif
+}
+
+
+
+/*************************************
+ *
+ *  USB address maps
+ *
+ *************************************/
+
+void usb_sound_device::usb_map(address_map &map)
+{
+	map(0x0000, 0x0fff).ram().share("pgmram");
+}
+
+void usb_sound_device::usb_portmap(address_map &map)
+{
+	map(0x00, 0xff).rw(FUNC(usb_sound_device::workram_r), FUNC(usb_sound_device::workram_w)).share("workram");
+}
+
+
+//-------------------------------------------------
+// device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+#if (ENABLE_SEGAUSB_NETLIST)
+
+TIMER_DEVICE_CALLBACK_MEMBER( usb_sound_device::gos_timer )
+{
+	// technically we should clock at 2x and toggle between states
+	// however, in practice this is just used to trigger a oneshot
+	// so we can halve the high frequency rate and just toggle both
+	// ways to initiate the countdown
+	m_pit[0]->write_gate2(0);
+	m_pit[1]->write_gate2(0);
+	m_pit[2]->write_gate2(0);
+	m_pit[0]->write_gate2(1);
+	m_pit[1]->write_gate2(1);
+	m_pit[2]->write_gate2(1);
+}
+
+#endif
+
+
+void usb_sound_device::device_add_mconfig(machine_config &config)
+{
+	// CPU for the usb board
+	I8035(config, m_ourcpu, USB_MASTER_CLOCK);     // divide by 15 in CPU
+	m_ourcpu->set_addrmap(AS_PROGRAM, &usb_sound_device::usb_map);
+	m_ourcpu->set_addrmap(AS_IO, &usb_sound_device::usb_portmap);
+	m_ourcpu->p1_in_cb().set(FUNC(usb_sound_device::p1_r));
+	m_ourcpu->p1_out_cb().set(FUNC(usb_sound_device::p1_w));
+	m_ourcpu->p2_out_cb().set(FUNC(usb_sound_device::p2_w));
+	m_ourcpu->t1_in_cb().set(FUNC(usb_sound_device::t1_r));
+
+	TIMER(config, "usb_timer", 0).configure_periodic(
+			FUNC(usb_sound_device::increment_t1_clock_timer_cb),
+			attotime::from_hz(USB_2MHZ_CLOCK / 256));
+
+#if (ENABLE_SEGAUSB_NETLIST)
+
+	TIMER(config, "gos_timer", 0).configure_periodic(
+			FUNC(usb_sound_device::gos_timer), attotime::from_hz(USB_GOS_CLOCK));
+
+	NETLIST_SOUND(config, "sound_nl", 48000)
+		.set_source(NETLIST_NAME(segausb))
+		.add_route(ALL_OUTPUTS, *this, 1.0);
+
+	// channel 0 inputs
+	NETLIST_ANALOG_INPUT(config, m_nl_dac0[0], "I_U26_DAC.IN");
+	NETLIST_ANALOG_INPUT(config, m_nl_dac0[1], "I_U25_DAC.IN");
+	NETLIST_ANALOG_INPUT(config, m_nl_dac0[2], "I_U24_DAC.IN");
+	NETLIST_LOGIC_INPUT(config, m_nl_sel0, "I_U38B_SEL.IN", 0);
+	NETLIST_LOGIC_INPUT(config, m_nl_pit0_out[0], "I_U41_OUT0.IN", 0);
+	NETLIST_LOGIC_INPUT(config, m_nl_pit0_out[1], "I_U41_OUT1.IN", 0);
+	NETLIST_LOGIC_INPUT(config, m_nl_pit0_out[2], "I_U41_OUT2.IN", 0);
+
+	// channel 1 inputs
+	NETLIST_ANALOG_INPUT(config, m_nl_dac1[0], "I_U12_DAC.IN");
+	NETLIST_ANALOG_INPUT(config, m_nl_dac1[1], "I_U13_DAC.IN");
+	NETLIST_ANALOG_INPUT(config, m_nl_dac1[2], "I_U14_DAC.IN");
+	NETLIST_LOGIC_INPUT(config, m_nl_sel1, "I_U2B_SEL.IN", 0);
+	NETLIST_LOGIC_INPUT(config, m_nl_pit1_out[0], "I_U42_OUT0.IN", 0);
+	NETLIST_LOGIC_INPUT(config, m_nl_pit1_out[1], "I_U42_OUT1.IN", 0);
+	NETLIST_LOGIC_INPUT(config, m_nl_pit1_out[2], "I_U42_OUT2.IN", 0);
+
+	// channel 2 inputs
+	NETLIST_ANALOG_INPUT(config, m_nl_dac2[0], "I_U27_DAC.IN");
+	NETLIST_ANALOG_INPUT(config, m_nl_dac2[1], "I_U28_DAC.IN");
+	NETLIST_ANALOG_INPUT(config, m_nl_dac2[2], "I_U29_DAC.IN");
+	NETLIST_LOGIC_INPUT(config, m_nl_sel2, "I_U2A_SEL.IN", 0);
+	NETLIST_LOGIC_INPUT(config, m_nl_pit2_out[0], "I_U43_OUT0.IN", 0);
+	NETLIST_LOGIC_INPUT(config, m_nl_pit2_out[1], "I_U43_OUT1.IN", 0);
+	NETLIST_LOGIC_INPUT(config, m_nl_pit2_out[2], "I_U43_OUT2.IN", 0);
+
+	// final output
+	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "OUTPUT").set_mult_offset(5000.0, 0.0);
+
+	// configure the PIT clocks and gates
+	for (int index = 0; index < 3; index++)
+	{
+		PIT8253(config, m_pit[index], 0);
+		m_pit[index]->set_clk<0>(USB_PCS_CLOCK);
+		m_pit[index]->set_clk<1>(USB_PCS_CLOCK);
+		m_pit[index]->set_clk<2>(USB_2MHZ_CLOCK);
+	}
+
+	// connect the PIT outputs to the netlist
+	m_pit[0]->out_handler<0>().set(m_nl_pit0_out[0], FUNC(netlist_mame_logic_input_device::write_line));
+	m_pit[0]->out_handler<1>().set(m_nl_pit0_out[1], FUNC(netlist_mame_logic_input_device::write_line));
+	m_pit[0]->out_handler<2>().set(m_nl_pit0_out[2], FUNC(netlist_mame_logic_input_device::write_line));
+	m_pit[1]->out_handler<0>().set(m_nl_pit1_out[0], FUNC(netlist_mame_logic_input_device::write_line));
+	m_pit[1]->out_handler<1>().set(m_nl_pit1_out[1], FUNC(netlist_mame_logic_input_device::write_line));
+	m_pit[1]->out_handler<2>().set(m_nl_pit1_out[2], FUNC(netlist_mame_logic_input_device::write_line));
+	m_pit[2]->out_handler<0>().set(m_nl_pit2_out[0], FUNC(netlist_mame_logic_input_device::write_line));
+	m_pit[2]->out_handler<1>().set(m_nl_pit2_out[1], FUNC(netlist_mame_logic_input_device::write_line));
+	m_pit[2]->out_handler<2>().set(m_nl_pit2_out[2], FUNC(netlist_mame_logic_input_device::write_line));
+
+#endif
+}
+
+
+DEFINE_DEVICE_TYPE(SEGAUSBROM, usb_rom_sound_device, "segausbrom", "Sega Universal Sound Board with ROM")
+
+usb_rom_sound_device::usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: usb_sound_device(mconfig, SEGAUSBROM, tag, owner, clock)
+{
+}
+
+void usb_sound_device::usb_map_rom(address_map &map)
+{
+	map(0x0000, 0x0fff).rom().region(":usbcpu", 0);
+}
+
+void usb_rom_sound_device::device_add_mconfig(machine_config &config)
+{
+	usb_sound_device::device_add_mconfig(config);
+
+	// CPU for the usb board
+	m_ourcpu->set_addrmap(AS_PROGRAM, &usb_rom_sound_device::usb_map_rom);
+}
diff -Nru mame-0.222+dfsg.1/src/mame/audio/segausb.h mame-0.224+dfsg.1/src/mame/audio/segausb.h
--- mame-0.222+dfsg.1/src/mame/audio/segausb.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/segausb.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,192 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+/*************************************************************************
+
+    Sega g80 common sound hardware
+
+*************************************************************************/
+#ifndef MAME_AUDIO_SEGAUSB_H
+#define MAME_AUDIO_SEGAUSB_H
+
+#pragma once
+
+#define ENABLE_SEGAUSB_NETLIST (0)
+
+#include "cpu/mcs48/mcs48.h"
+#include "machine/netlist.h"
+#include "machine/timer.h"
+#include "netlist/nl_setup.h"
+#include "nl_segausb.h"
+
+#if (ENABLE_SEGAUSB_NETLIST)
+#include "machine/pit8253.h"
+#endif
+
+class usb_sound_device : public device_t, public device_mixer_interface
+{
+public:
+	template <typename T> usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, T &&maincpu_tag)
+		: usb_sound_device(mconfig, tag, owner, clock)
+	{
+		m_maincpu.set_tag(maincpu_tag);
+	}
+
+	usb_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+	uint8_t status_r();
+	void data_w(uint8_t data);
+	uint8_t ram_r(offs_t offset);
+	void ram_w(offs_t offset, uint8_t data);
+
+	uint8_t workram_r(offs_t offset);
+	void workram_w(offs_t offset, uint8_t data);
+
+	TIMER_DEVICE_CALLBACK_MEMBER( increment_t1_clock_timer_cb );
+
+	void usb_map(address_map &map);
+	void usb_map_rom(address_map &map);
+	void usb_portmap(address_map &map);
+
+#if (ENABLE_SEGAUSB_NETLIST)
+	TIMER_DEVICE_CALLBACK_MEMBER( gos_timer );
+#endif
+
+protected:
+
+	usb_sound_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+
+	// device-level overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+#if (!ENABLE_SEGAUSB_NETLIST)
+	// sound stream update overrides
+	virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override;
+#endif
+
+private:
+	// internal state
+	u8 m_in_latch;             // input latch
+	u8 m_out_latch;            // output latch
+	u8 m_last_p2_value;        // current P2 output value
+	optional_shared_ptr<u8> m_program_ram;          // pointer to program RAM
+	required_shared_ptr<u8> m_work_ram;             // pointer to work RAM
+	u8 m_work_ram_bank;        // currently selected work RAM bank
+	u8 m_t1_clock;             // T1 clock value
+	u8 m_t1_clock_mask;        // T1 clock mask (configured via jumpers)
+
+protected:
+	// devices
+	required_device<i8035_device> m_ourcpu;
+	required_device<cpu_device> m_maincpu;
+
+private:
+#if (ENABLE_SEGAUSB_NETLIST)
+	// PIT devices
+	required_device_array<pit8253_device, 3> m_pit;
+
+	// channel 0
+	required_device_array<netlist_mame_analog_input_device, 3> m_nl_dac0;
+	required_device<netlist_mame_logic_input_device> m_nl_sel0;
+	required_device_array<netlist_mame_logic_input_device, 3> m_nl_pit0_out;
+
+	// channel 1
+	required_device_array<netlist_mame_analog_input_device, 3> m_nl_dac1;
+	required_device<netlist_mame_logic_input_device> m_nl_sel1;
+	required_device_array<netlist_mame_logic_input_device, 3> m_nl_pit1_out;
+
+	// channel 2
+	required_device_array<netlist_mame_analog_input_device, 3> m_nl_dac2;
+	required_device<netlist_mame_logic_input_device> m_nl_sel2;
+	required_device_array<netlist_mame_logic_input_device, 3> m_nl_pit2_out;
+
+	u8 m_gos_clock;            // state of the GOD clock
+#else
+	struct g80_filter_state
+	{
+		g80_filter_state() { }
+
+		void configure(double r, double c);
+		double step_rc(double input) { return capval += (input - capval) * exponent; }
+		double step_cr(double input) { double const result = input - capval; capval += result * exponent; return result; }
+
+		double capval = 0.0; // current capacitor value
+		double exponent = 0.0; // constant exponent
+	};
+
+	struct timer8253
+	{
+		struct channel
+		{
+			channel() { }
+
+			void clock();
+
+			u8  holding     = 0; // holding until counts written?
+			u8  latchmode   = 0; // latching mode
+			u8  latchtoggle = 0; // latching state
+			u8  clockmode   = 0; // clocking mode
+			u8  bcdmode     = 0; // BCD mode?
+			u8  output      = 0; // current output value
+			u8  lastgate    = 0; // previous gate value
+			u8  gate        = 0; // current gate value
+			u16 count       = 0; // initial count
+			u16 remain      = 0; // current down counter value
+			s32 subcount    = 0; // subcount (2MHz clocks per input clock)
+		};
+
+		timer8253() : env{ 0.0, 0.0, 0.0 } { }
+
+		channel chan[3];                 // three channels' worth of information
+		double env[3];                   // envelope value for each channel
+		g80_filter_state chan_filter[2]; // filter states for the first two channels
+		g80_filter_state gate1;          // first RC filter state
+		g80_filter_state gate2;          // second RC filter state
+		u8 config = 0;                   // configuration for this timer
+	};
+
+	sound_stream *m_stream;      // output stream
+	timer8253 m_timer_group[3];  // 3 groups of timers
+	u8 m_timer_mode[3];          // mode control for each group
+	u32 m_noise_shift;
+	u8 m_noise_state;
+	s32 m_noise_subcount;
+	double m_gate_rc1_exp[2];
+	double m_gate_rc2_exp[2];
+	g80_filter_state m_final_filter;
+	g80_filter_state m_noise_filters[5];
+#endif
+
+	TIMER_CALLBACK_MEMBER( delayed_usb_data_w );
+	void timer_w(int which, u8 offset, u8 data);
+	void env_w(int which, u8 offset, u8 data);
+
+	uint8_t p1_r();
+	void p1_w(uint8_t data);
+	void p2_w(uint8_t data);
+	DECLARE_READ_LINE_MEMBER( t1_r );
+};
+
+DECLARE_DEVICE_TYPE(SEGAUSB, usb_sound_device)
+
+
+class usb_rom_sound_device : public usb_sound_device
+{
+public:
+	template <typename T> usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, T &&maincpu_tag)
+		: usb_rom_sound_device(mconfig, tag, owner, clock)
+	{
+		m_maincpu.set_tag(maincpu_tag);
+	}
+
+	usb_rom_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+
+protected:
+	// device-level overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+};
+
+DECLARE_DEVICE_TYPE(SEGAUSBROM, usb_rom_sound_device)
+
+#endif // MAME_AUDIO_SEGAUSB_H
diff -Nru mame-0.222+dfsg.1/src/mame/audio/t5182.h mame-0.224+dfsg.1/src/mame/audio/t5182.h
--- mame-0.222+dfsg.1/src/mame/audio/t5182.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/t5182.h	2020-08-26 08:57:19.000000000 +0000
@@ -58,7 +58,7 @@
 	TIMER_CALLBACK_MEMBER( setirq_callback );
 
 	void sharedram_semaphore_snd_acquire_w(uint8_t data);
-	void sharedram_semaphore_snd_release_w(uint8_t data);;
+	void sharedram_semaphore_snd_release_w(uint8_t data);
 	uint8_t sharedram_semaphore_main_r();
 	void ym2151_irq_ack_w(uint8_t data);
 	void cpu_irq_ack_w(uint8_t data);
diff -Nru mame-0.222+dfsg.1/src/mame/audio/tx1.h mame-0.224+dfsg.1/src/mame/audio/tx1.h
--- mame-0.222+dfsg.1/src/mame/audio/tx1.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/tx1.h	2020-08-26 08:57:19.000000000 +0000
@@ -111,7 +111,7 @@
 	double m_weights0[4] = { 0, 0, 0, 0 };
 	double m_weights1[3] = { 0, 0, 0 };
 	double m_weights2[3] = { 0, 0, 0 };
-	int m_eng0[4] = { 0, 0, 0, 0 };;
+	int m_eng0[4] = { 0, 0, 0, 0 };
 	int m_eng1[4] = { 0, 0, 0, 0 };
 	int m_eng2[4] = { 0, 0, 0, 0 };
 
diff -Nru mame-0.222+dfsg.1/src/mame/audio/wpcsnd.cpp mame-0.224+dfsg.1/src/mame/audio/wpcsnd.cpp
--- mame-0.222+dfsg.1/src/mame/audio/wpcsnd.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/audio/wpcsnd.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,9 +1,42 @@
 // license:BSD-3-Clause
 // copyright-holders:Barry Rodewald
 /*
- * wpcsnd.c - Williams WPC pinball sound
+ * wpcsnd.c - A-12738-50003 Williams WPC Sound Board
  *   M6809E + YM2151 + HC55516 + DAC
  *
+ * TODO: The sound and io interface here needs to be verified from the ASIC on a real PCB, and documented better.
+ *       The WPC mainboard has two connectors used for IO/sound:
+ *       HDR 17X2 "I/O SOUND"
+ *         has the 68B09E signals:
+ *           A0-A4, D0-D7, and /FIRQ (with pullup)
+ *         it also has the WPC ASIC signals:
+ *           BLANK, WDEN, RESET
+ *       HDR 2X13 "I/O EXTEND"
+ *         has the 68B09E signals:
+ *           A5-A12, /FIRQ (with pullup (as above)), /IRQ (with pullup), /E, /Q
+ *         it also has the WPC ASIC signal:
+ *           /IO
+ *
+ *       The funhouse schematics show the A-12738-50003 WPC Sound Board to the HDR 17X2 "I/O SOUND" connector as such:
+ *       A4 A3 A2 A1 A0 WDEN R/W
+ *        0  x  x  x  x    x   x   open bus
+ *        x  0  x  x  x    x   x   open bus
+ *        x  x  0  x  x    x   x   open bus
+ *        x  x  x  x  x    1   x   open bus
+ *        1  1  1  1  *    0   *   open bus* (technically the 74LS138 is enabled here, with ** selecting between 4 unused outputs)
+ *        1  1  1  0  *    0   *   The used registers, see below
+ *        1  1  1  0  0    0   W   write to input gen_8_latch and set semamphore to assert /IRQ on the sound board 68B09E
+ *        1  1  1  0  0    0   R   read the output gen_8_latch and clear semamphore to deassert /FIRQ on the main board 68B09E
+ *        1  1  1  0  1    0   W   any write here causes the sound board to be reset
+ *        1  1  1  0  1    0   R   read from here returns the sound->mainboard semaphore status on D7, all other pins are open bus
+ *
+ *      Exactly which addresses cause the WPC ASIC to assert low the WDEN pin is not clear,
+ *      but presumably it is asserted in the 0x0x3fc0-3fdf area, meaning that the addresses
+ *      actually used are 0x3fdc and 0x3fdd (offsets 0x2c and 0x2d).
+ *      See /machine/wpc.h
+ *
+ * TODO: add generic_latch_8 devices for the two latch+semaphore pairs.
+ *
  *  Created on: 4/10/2013
  */
 
diff -Nru mame-0.222+dfsg.1/src/mame/ci.lst mame-0.224+dfsg.1/src/mame/ci.lst
--- mame-0.222+dfsg.1/src/mame/ci.lst	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/ci.lst	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,43 @@
+// license:BSD-3-Clause
+// copyright-holders:Aaron Giles
+/******************************************************************************
+
+    ci.lst
+
+    List of all enabled drivers in the system. This file is parsed by
+    makelist.exe, sorted, and output as C code describing the drivers.
+
+******************************************************************************/
+
+robby           // (c) 1981 Bally Midway
+gridlee         // [1983 Videa] prototype - no copyright notice
+alienar         // (c) 1985 Duncan Brown
+
+carpolo         // (c) 1977 Exidy
+sidetrac        // (c) 1979 Exidy
+targ            // (c) 1980 Exidy
+spectar         // (c) 1980 Exidy
+teetert         // (c) 1982 Exidy
+hardhat         // (c) 1982
+fax             // (c) 1983
+fax2            // (c) 1983
+circus          // (c) 1977 Exidy
+robotbwl        // (c) 197? Exidy
+crash           // (c) 1979 Exidy
+ripcord         // (c) 1979 Exidy
+starfire        // (c) 1979 Exidy
+starfirea       // (c) 1979 Exidy
+fireone         // (c) 1979 Exidy
+starfir2        // (c) 1979 Exidy
+victory         // (c) 1982
+victorba        // (c) 1982
+topgunnr        // (c) 1986
+
+looping         // (c) 1982 Video Games GMBH
+supertnk        // (c) 1981 VIDEO GAMES GmbH, W.-GERMANY
+
+wrally          // (c) 1993 - Ref 930705
+
+kinst           // (c) 1994 Rare
+
+akkaarrh        // (c) 1982 Atari (prototype)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/39in1.cpp mame-0.224+dfsg.1/src/mame/drivers/39in1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/39in1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/39in1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -18,7 +18,13 @@
  * PCB also contains a custom ASIC, probably used for the decryption
  *
  * TODO:
- *   PXA255 peripherals
+ *   - PXA255 peripherals
+ *   - 4in1a and 4in1b are very similar to 39in1, currently boot but stuck at
+ *     'Hardware Check' with an error
+ *   - rodent should be correctly decrypted but expects something different
+       from the CPLD (probably)
+ *   - 19in1, 48in1, 48in1a, 48in1b seem to have a slightly different encryption
+ *   - 60in1 expects something different from the CPLD (probably)
  *
  * 39in1 notes:
  * The actual PCB just normally boots up to the game, whereas in MAME it
@@ -49,14 +55,24 @@
 		, m_maincpu(*this, "maincpu")
 	{ }
 
-	void _60in1(machine_config &config);
 	void _39in1(machine_config &config);
 
-	void driver_init() override;
+	void init_4in1a();
+	void init_4in1b();
+	void init_19in1();
+	void init_39in1();
+	void init_48in1();
+	void init_48in1a();
+	void init_60in1();
+	void init_rodent();
+
 private:
 	uint32_t m_seed;
 	uint32_t m_magic;
 	uint32_t m_state;
+	uint32_t m_mcu_ipt_pc;
+
+	void driver_init() override;
 
 	required_device<pxa255_periphs_device> m_pxa_periphs;
 	required_shared_ptr<uint32_t> m_ram;
@@ -68,12 +84,12 @@
 	uint32_t cpld_r(offs_t offset);
 	void cpld_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
 	uint32_t prot_cheater_r();
-	DECLARE_MACHINE_START(60in1);
-	virtual void machine_start() override;
 	required_device<cpu_device> m_maincpu;
 	void _39in1_map(address_map &map);
 
 	inline void ATTR_PRINTF(3,4) verboselog(int n_level, const char *s_fmt, ... );
+
+	void decrypt(uint8_t xor00, uint8_t xor08, uint8_t xor10, uint8_t xor20, uint8_t xor40, uint8_t bit7, uint8_t bit6, uint8_t bit5, uint8_t bit4, uint8_t bit3, uint8_t bit2, uint8_t bit1, uint8_t bit0);
 };
 
 
@@ -109,13 +125,13 @@
 
 uint32_t _39in1_state::cpld_r(offs_t offset)
 {
-	//if (m_maincpu->pc() != 0xe3af4) printf("CPLD read @ %x (PC %x state %d)\n", offset, m_maincpu->pc(), state);
+	// if (m_maincpu->pc() != m_mcu_ipt_pc) printf("CPLD read @ %x (PC %x state %d)\n", offset, m_maincpu->pc(), m_state);
 
 	if (m_maincpu->pc() == 0x3f04)
 	{
 		return 0xf0;      // any non-zero value works here
 	}
-	else if (m_maincpu->pc() == 0xe3af4)
+	else if (m_maincpu->pc() == m_mcu_ipt_pc)
 	{
 		return ioport("MCUIPT")->read();
 	}
@@ -249,35 +265,64 @@
 	PORT_BIT( 0x40000000, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_SERVICE_NO_TOGGLE( 0x80000000, IP_ACTIVE_LOW )
 
-/*  The following dips apply to 39in1 and 48in1. 60in1 is the same but the last unused dipsw#4 is test mode off/on.
+//  The following dips apply to 39in1 and 48in1. 60in1 is the same but the last unused dipsw#4 is test mode off/on.
 
-    PORT_START("DSW")      // 1x 4-position DIP switch labelled SW3
-    PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )    PORT_DIPLOCATION("SW3:1")
-    PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
-    PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-    PORT_DIPNAME( 0x02, 0x02, "Display Mode" )            PORT_DIPLOCATION("SW3:2")
-    PORT_DIPSETTING(    0x02, "CGA 15.75kHz" )
-    PORT_DIPSETTING(    0x00, "VGA 31.5kHz" )
-    PORT_DIPNAME( 0x04, 0x04, "High Score Saver" )        PORT_DIPLOCATION("SW3:3")
-    PORT_DIPSETTING(    0x04, "Disabled" )
-    PORT_DIPSETTING(    0x00, "Enabled" )
-    PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) )         PORT_DIPLOCATION("SW3:4")
-    PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
-    PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-*/
+	PORT_START("DSW")      // 1x 4-position DIP switch labelled SW3
+	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )    PORT_DIPLOCATION("SW3:1")
+	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x00, "Display Mode" )            PORT_DIPLOCATION("SW3:2")
+	PORT_DIPSETTING(    0x02, "VGA 31.5kHz" )
+	PORT_DIPSETTING(    0x00, "CGA 15.75kHz" )
+	PORT_DIPNAME( 0x04, 0x04, "High Score Saver" )        PORT_DIPLOCATION("SW3:3")
+	PORT_DIPSETTING(    0x04, "Disabled" )
+	PORT_DIPSETTING(    0x00, "Enabled" )
+	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unused ) )         PORT_DIPLOCATION("SW3:4")
+	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 INPUT_PORTS_END
 
-void _39in1_state::machine_start()
+void _39in1_state::decrypt(uint8_t xor00, uint8_t xor08, uint8_t xor10, uint8_t xor20, uint8_t xor40, uint8_t bit7, uint8_t bit6, uint8_t bit5, uint8_t bit4, uint8_t bit3, uint8_t bit2, uint8_t bit1, uint8_t bit0)
 {
-	uint8_t *ROM = memregion("maincpu")->base();
+	uint8_t *rom = memregion("maincpu")->base();
+
 	for (int i = 0; i < 0x80000; i += 2)
 	{
-		ROM[i] = bitswap<8>(ROM[i],7,2,5,6,0,3,1,4) ^ bitswap<8>((i>>3)&0xf, 3,2,4,1,4,4,0,4) ^ 0x90;
-	}
-}
+		if (i & 0x08)
+			rom[i] ^= xor08;
+		if (i & 0x10)
+			rom[i] ^= xor10;
+		if (i & 0x20)
+			rom[i] ^= xor20;
+		if (i & 0x40)
+			rom[i] ^= xor40;
+
+		rom[i] = bitswap<8>(rom[i] ^ xor00, bit7, bit6, bit5, bit4, bit3, bit2, bit1, bit0);
+	}
+
+	/*{
+	    char filename[256];
+	    sprintf(filename,"p_decrypted_%s", machine().system().name);
+	    FILE *fp = fopen(filename, "w+b");
+	    if (fp)
+	    {
+	        fwrite(rom, 0x80000, 1, fp);
+	        fclose(fp);
+	    }
+	}*/
+}
+
+void _39in1_state::init_39in1()  { driver_init(); decrypt(0xc0, 0x02, 0x40, 0x04, 0x80, 7, 2, 5, 6, 0, 3, 1, 4); m_mcu_ipt_pc = 0xe3af4; } // good
+void _39in1_state::init_4in1a()  { driver_init(); decrypt(0x25, 0x01, 0x80, 0x04, 0x40, 6, 0, 2, 1, 7, 5, 4, 3); m_mcu_ipt_pc = 0x45814; } // good
+void _39in1_state::init_4in1b()  { driver_init(); decrypt(0x43, 0x80, 0x04, 0x40, 0x08, 2, 4, 0, 6, 7, 3, 1, 5); m_mcu_ipt_pc = 0x57628; } // good
+void _39in1_state::init_19in1()  { driver_init(); decrypt(0x00, 0x04, 0x01, 0x80, 0x40, 2, 1, 7, 4, 5, 0, 6, 3); m_mcu_ipt_pc = 0x00000; } // TODO: seems to have different bitswaps depending on XOR address
+void _39in1_state::init_48in1()  { driver_init(); decrypt(0x00, 0x01, 0x40, 0x00, 0x20, 5, 3, 2, 1, 4, 6, 0, 7); m_mcu_ipt_pc = 0x00000; } // applies to both 48in1 and 48in1b, same main CPU ROM. TODO: see above
+void _39in1_state::init_48in1a() { init_48in1(); m_mcu_ipt_pc = 0x00000; } // same encryption as 48in1
+void _39in1_state::init_rodent() { init_4in1b(); /*m_mcu_ipt_pc = 0x?????;*/ } // same encryption as 4in1b, thus good, but doesn't boot because of different CPLD calls
 
-MACHINE_START_MEMBER(_39in1_state,60in1)
+void _39in1_state::init_60in1() // different encryption scheme
 {
+	driver_init();
 	// TODO: Machine is marked as MNW; is this decrypt correct?
 	uint8_t *ROM = memregion("maincpu")->base();
 	for (int i = 0; i < 0x80000; i += 2)
@@ -287,6 +332,8 @@
 			ROM[i] = bitswap<8>(ROM[i],5,1,4,2,0,7,6,3)^bitswap<8>(i, 6,0,4,13,0,5,3,11);
 		}
 	}
+
+	// m_mcu_ipt_pc = 0x?????;
 }
 
 void _39in1_state::_39in1(machine_config &config)
@@ -299,12 +346,7 @@
 	PXA255_PERIPHERALS(config, m_pxa_periphs, 200000000, m_maincpu);
 	m_pxa_periphs->gpio0_write().set(FUNC(_39in1_state::eeprom_w));
 	m_pxa_periphs->gpio0_read().set(FUNC(_39in1_state::eeprom_r));
-}
-
-void _39in1_state::_60in1(machine_config &config)
-{
-	_39in1(config);
-	MCFG_MACHINE_START_OVERRIDE(_39in1_state,60in1)
+	m_pxa_periphs->gpio1_read().set_ioport("DSW").lshift(21);
 }
 
 ROM_START( 39in1 )
@@ -436,12 +478,12 @@
 	ROM_LOAD( "93c66.u32", 0x000, 0x200, CRC(c311c7bc) SHA1(8328002b7f6a8b7a3ffca079b7960bc990211d7b) )
 ROM_END
 
-GAME(2004, 4in1a,  39in1, _39in1, 39in1, _39in1_state, driver_init, ROT270, "bootleg", "4 in 1 MAME bootleg (set 1, ver 3.00)",             MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
-GAME(2004, 4in1b,  39in1, _39in1, 39in1, _39in1_state, driver_init, ROT270, "bootleg", "4 in 1 MAME bootleg (set 2)",                       MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
-GAME(2004, 19in1,  39in1, _39in1, 39in1, _39in1_state, driver_init, ROT270, "bootleg", "19 in 1 MAME bootleg",                              MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
-GAME(2004, 39in1,  0,     _39in1, 39in1, _39in1_state, driver_init, ROT270, "bootleg", "39 in 1 MAME bootleg",                              MACHINE_IMPERFECT_SOUND)
-GAME(2004, 48in1,  39in1, _39in1, 39in1, _39in1_state, driver_init, ROT270, "bootleg", "48 in 1 MAME bootleg (set 1, ver 3.09)",            MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
-GAME(2004, 48in1b, 39in1, _39in1, 39in1, _39in1_state, driver_init, ROT270, "bootleg", "48 in 1 MAME bootleg (set 2, ver 3.09, alt flash)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
-GAME(2004, 48in1a, 39in1, _39in1, 39in1, _39in1_state, driver_init, ROT270, "bootleg", "48 in 1 MAME bootleg (set 3, ver 3.02)",            MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
-GAME(2004, 60in1,  39in1, _60in1, 39in1, _39in1_state, driver_init, ROT270, "bootleg", "60 in 1 MAME bootleg (ver 3.00)",                   MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
-GAME(2005, rodent, 0,     _39in1, 39in1, _39in1_state, driver_init, ROT270, "The Game Room", "Rodent Exterminator",                         MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2004, 4in1a,  39in1, _39in1, 39in1, _39in1_state, init_4in1a,  ROT90, "bootleg", "4 in 1 MAME bootleg (set 1, ver 3.00, PLZ-V014)",   MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2004, 4in1b,  39in1, _39in1, 39in1, _39in1_state, init_4in1b,  ROT90, "bootleg", "4 in 1 MAME bootleg (set 2, PLZ-V001)",             MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2004, 19in1,  39in1, _39in1, 39in1, _39in1_state, init_19in1,  ROT90, "bootleg", "19 in 1 MAME bootleg (SAC-V000)",                   MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2004, 39in1,  0,     _39in1, 39in1, _39in1_state, init_39in1,  ROT90, "bootleg", "39 in 1 MAME bootleg (GNO-V000)",                   MACHINE_IMPERFECT_SOUND)
+GAME(2004, 48in1,  39in1, _39in1, 39in1, _39in1_state, init_48in1,  ROT90, "bootleg", "48 in 1 MAME bootleg (set 1, ver 3.09)",            MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2004, 48in1b, 39in1, _39in1, 39in1, _39in1_state, init_48in1,  ROT90, "bootleg", "48 in 1 MAME bootleg (set 2, ver 3.09, alt flash)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2004, 48in1a, 39in1, _39in1, 39in1, _39in1_state, init_48in1a, ROT90, "bootleg", "48 in 1 MAME bootleg (set 3, ver 3.02)",            MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2004, 60in1,  39in1, _39in1, 39in1, _39in1_state, init_60in1,  ROT90, "bootleg", "60 in 1 MAME bootleg (ver 3.00)",                   MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
+GAME(2005, rodent, 0,     _39in1, 39in1, _39in1_state, init_rodent, ROT0,  "The Game Room", "Rodent Exterminator",                         MACHINE_NOT_WORKING|MACHINE_IMPERFECT_SOUND)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/4dpi.cpp mame-0.224+dfsg.1/src/mame/drivers/4dpi.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/4dpi.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/4dpi.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -61,6 +61,8 @@
 // video and audio
 #include "video/sgi_gr1.h"
 
+#include "4dpi.lh"
+
 #define LOG_GENERAL (1U << 0)
 
 #define VERBOSE (LOG_GENERAL)
@@ -331,13 +333,13 @@
 		[this](u8 data)
 		{
 			// cpu leds
-			m_leds[LED_HBT] = !BIT(data, 0);
-			m_leds[LED_CPU] = !BIT(data, 1);
-			m_leds[LED_GFX] = !BIT(data, 2);
-			m_leds[LED_FPU] = !BIT(data, 3);
+			m_leds[LED_HBT] = BIT(data, 0);
+			m_leds[LED_CPU] = BIT(data, 1);
+			m_leds[LED_GFX] = BIT(data, 2);
+			m_leds[LED_FPU] = BIT(data, 3);
 
 			// console led
-			m_leds[LED_CON] = !BIT(data, 4);
+			m_leds[LED_CON] = BIT(data, 4);
 
 			// serial eeprom chip select and clock out
 			m_eeprom->cs_write(BIT(data, 5));
@@ -770,6 +772,8 @@
 	// TODO: vme slot, cpu interrupt 0
 
 	SOFTWARE_LIST(config, m_softlist).set_original("sgi_mips");
+
+	config.set_default_layout(layout_4dpi);
 }
 
 void pi4d3x_state::common(machine_config &config)
@@ -989,18 +993,24 @@
 
 ROM_START(4d20)
 	ROM_REGION32_BE(0x40000, "boot", 0)
-	ROM_SYSTEM_BIOS(0, "3.1c", "Version 4D1-3.1 Rev C, Tue Jan 10 15:11:42 PST 1989 SGI")
-	ROMX_LOAD("070_8000_005_boot_0.h1c5", 0x000000, 0x010000, CRC(c7a182de) SHA1(56038f54b5a3254960ad7c8232f1a7cf058b9ead), ROM_BIOS(0) | ROM_SKIP(3))
-	ROMX_LOAD("070_8000_005_boot_1.h1d2", 0x000001, 0x010000, CRC(4b1395f5) SHA1(926f3172b79ebaf7040ff04b0cfdc3d48d03293c), ROM_BIOS(0) | ROM_SKIP(3))
-	ROMX_LOAD("070_8000_005_boot_2.h1d9", 0x000002, 0x010000, CRC(e0a55120) SHA1(0b675489ea94bf85a5a0e5f0ebf0c0b7ff5fc389), ROM_BIOS(0) | ROM_SKIP(3))
-	ROMX_LOAD("070_8000_005_boot_3.h1e6", 0x000003, 0x010000, CRC(11536526) SHA1(5149f453347ae566e9fee4447615dff88c7f6a37), ROM_BIOS(0) | ROM_SKIP(3))
-
-	// this firmware has been found in both 4D/20 and 4D/25 hardware
-	ROM_SYSTEM_BIOS(1, "3.2e", "Version 3.2 Rev E, Fri Jul 14 14:37:38 PDT 1989 SGI")
-	ROMX_LOAD("070_8000_007_boot_0.h1c5", 0x000000, 0x010000, CRC(e448b865) SHA1(f0276b76360ea0b3250dbdaa7a1e57ea8f6144d6), ROM_BIOS(1) | ROM_SKIP(3))
-	ROMX_LOAD("070_8000_007_boot_1.h1d2", 0x000001, 0x010000, CRC(59fda717) SHA1(ef3ccb1f8a815e7b13c79deeea0d73006deed09f), ROM_BIOS(1) | ROM_SKIP(3))
-	ROMX_LOAD("070_8000_007_boot_2.h1d9", 0x000002, 0x010000, CRC(569146ad) SHA1(5442a13ed93afdaa55c1951b97e335cf60dde834), ROM_BIOS(1) | ROM_SKIP(3))
-	ROMX_LOAD("070_8000_007_boot_3.h1e6", 0x000003, 0x010000, CRC(682977c3) SHA1(d9bcf7cdc5caef4221929fe26eccf34253fa7f29), ROM_BIOS(1) | ROM_SKIP(3))
+	// 3.2e firmware has been found in both 4D/20 and 4D/25 hardware
+	ROM_SYSTEM_BIOS(0, "3.2e", "Version 3.2 Rev E, Fri Jul 14 14:37:38 PDT 1989 SGI")
+	ROMX_LOAD("070_8000_007_boot_0.h1c5", 0x000000, 0x010000, CRC(e448b865) SHA1(f0276b76360ea0b3250dbdaa7a1e57ea8f6144d6), ROM_BIOS(0) | ROM_SKIP(3))
+	ROMX_LOAD("070_8000_007_boot_1.h1d2", 0x000001, 0x010000, CRC(59fda717) SHA1(ef3ccb1f8a815e7b13c79deeea0d73006deed09f), ROM_BIOS(0) | ROM_SKIP(3))
+	ROMX_LOAD("070_8000_007_boot_2.h1d9", 0x000002, 0x010000, CRC(569146ad) SHA1(5442a13ed93afdaa55c1951b97e335cf60dde834), ROM_BIOS(0) | ROM_SKIP(3))
+	ROMX_LOAD("070_8000_007_boot_3.h1e6", 0x000003, 0x010000, CRC(682977c3) SHA1(d9bcf7cdc5caef4221929fe26eccf34253fa7f29), ROM_BIOS(0) | ROM_SKIP(3))
+
+	ROM_SYSTEM_BIOS(1, "3.1c", "Version 4D1-3.1 Rev C, Tue Jan 10 15:11:42 PST 1989 SGI")
+	ROMX_LOAD("070_8000_005_boot_0.h1c5", 0x000000, 0x010000, CRC(c7a182de) SHA1(56038f54b5a3254960ad7c8232f1a7cf058b9ead), ROM_BIOS(1) | ROM_SKIP(3))
+	ROMX_LOAD("070_8000_005_boot_1.h1d2", 0x000001, 0x010000, CRC(4b1395f5) SHA1(926f3172b79ebaf7040ff04b0cfdc3d48d03293c), ROM_BIOS(1) | ROM_SKIP(3))
+	ROMX_LOAD("070_8000_005_boot_2.h1d9", 0x000002, 0x010000, CRC(e0a55120) SHA1(0b675489ea94bf85a5a0e5f0ebf0c0b7ff5fc389), ROM_BIOS(1) | ROM_SKIP(3))
+	ROMX_LOAD("070_8000_005_boot_3.h1e6", 0x000003, 0x010000, CRC(11536526) SHA1(5149f453347ae566e9fee4447615dff88c7f6a37), ROM_BIOS(1) | ROM_SKIP(3))
+
+	ROM_SYSTEM_BIOS(2, "3.1a", "Version 4D1-3.1 Rev A, Tue Aug  9 17:50:39 PDT 1988 SGI")
+	ROMX_LOAD("070_8000_003_boot_0.h1c5", 0x000000, 0x010000, CRC(32cdcdc5) SHA1(1568ae3877193d3c93bdcccd755736b6cd82cbf3), ROM_BIOS(2) | ROM_SKIP(3))
+	ROMX_LOAD("070_8000_003_boot_1.h1d2", 0x000001, 0x010000, CRC(4b3a02ee) SHA1(248e5cea8d3218686a044e5b013a1213441a5332), ROM_BIOS(2) | ROM_SKIP(3))
+	ROMX_LOAD("070_8000_003_boot_2.h1d9", 0x000002, 0x010000, CRC(3d80d19c) SHA1(42fb95f4d76ede073c5d9bbc2f144b4f2fbf407f), ROM_BIOS(2) | ROM_SKIP(3))
+	ROMX_LOAD("070_8000_003_boot_3.h1e6", 0x000003, 0x010000, CRC(48b9322c) SHA1(600554a0ccc4bab4881a96a9886eea40cd04c8e4), ROM_BIOS(2) | ROM_SKIP(3))
 ROM_END
 
 ROM_START(4d25)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/4enlinea.cpp mame-0.224+dfsg.1/src/mame/drivers/4enlinea.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/4enlinea.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/4enlinea.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -181,7 +181,7 @@
 
   - [DUMPED]  4 en Línea (Compumatic)
   - [DUMPED]  Olympic Darts (K7 Kursaal. At least three different hardware revisions)
-  - [MISSING] Sport Dart TV (Compumatic)
+  - [DUMPED]  Sport Dart TV (Compumatic / Desarrollos y Recambios S.L.)
   - [MISSING] Dart Queen (Compumatic / Daryde)
 
 **************************************************************************
@@ -211,10 +211,10 @@
 #define SEC_CLOCK            XTAL(8'000'000)
 #define HCGA_CLOCK           XTAL(14'318'181)
 
-#define PRG_CPU_CLOCK        MAIN_CLOCK /2      /* 8 MHz. (measured) */
-#define SND_CPU_CLOCK        SEC_CLOCK /2       /* 4 MHz. (measured) */
-#define SND_AY_CLOCK         SEC_CLOCK /4       /* 2 MHz. (measured) */
-#define CRTC_CLOCK           SEC_CLOCK /2       /* 8 MHz. (measured) */
+#define PRG_CPU_CLOCK        MAIN_CLOCK /2      // 8 MHz. (measured)
+#define SND_CPU_CLOCK        SEC_CLOCK /2       // 4 MHz. (measured)
+#define SND_AY_CLOCK         SEC_CLOCK /4       // 2 MHz. (measured)
+#define CRTC_CLOCK           SEC_CLOCK /2       // 8 MHz. (measured)
 
 class _4enlinea_state : public driver_device
 {
@@ -335,7 +335,7 @@
 	m_isa->install_device(0x3d0, 0x3df, read8sm_delegate(*this, FUNC(isa8_cga_4enlinea_device::_4enlinea_io_read)), write8sm_delegate(*this, FUNC(isa8_cga_device::io_write)));
 	m_isa->install_bank(0x8000, 0xbfff, "bank1", &m_vram[0]);
 
-	/* Initialise the cga palette */
+	// Initialise the CGA palette
 	int i;
 
 	for (int i = 0; i < CGA_PALETTE_SETS * 16; i++ )
@@ -405,7 +405,7 @@
 	m_serial_flags = data; // probably just clears
 }
 
-/* TODO: do this really routes to 0xe000-0xe001 of Main CPU? */
+// TODO: do this really routes to 0xe000-0xe001 of Main CPU?
 void _4enlinea_state::serial_w(offs_t offset, uint8_t data)
 {
 	m_serial_data[offset] = data;
@@ -584,7 +584,7 @@
 	device.option_add_internal("4enlinea",  ISA8_CGA_4ENLINEA);
 }
 
-/* TODO: irq sources are unknown */
+// TODO: IRQ sources are unknown
 INTERRUPT_GEN_MEMBER(_4enlinea_state::_4enlinea_irq)
 {
 	if(m_irq_count == 0)
@@ -605,7 +605,7 @@
 
 void _4enlinea_state::_4enlinea(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	Z80(config, m_maincpu, PRG_CPU_CLOCK);
 	m_maincpu->set_addrmap(AS_PROGRAM, &_4enlinea_state::main_map);
 	m_maincpu->set_addrmap(AS_IO, &_4enlinea_state::main_portmap);
@@ -635,7 +635,7 @@
     CRTC_CLOCK / 5.0 = 53.569037 Hz.
 */
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	AY8910(config, m_ay, SND_AY_CLOCK);
 	m_ay->port_a_read_callback().set_ioport("IN-P2");
@@ -679,13 +679,27 @@
 	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "cuatro_en_linea_27c256__cicplay-1.ic19", 0x0000, 0x8000, CRC(307a57a3) SHA1(241329d919ec43d0eeb1dad0a4db6cf6de06e7e1) )
 
-	ROM_REGION( 0x0800, "eeprom", 0 )   /* default serial EEPROM */
+	ROM_REGION( 0x0800, "eeprom", 0 ) // default serial EEPROM
 	ROM_LOAD( "cuatro_en_linea_x24c16p__nosticker.ic17", 0x0000, 0x0800, CRC(21f81f5a) SHA1(00b10eee5af1ca79ced2878f4be4cac2bb8d26a0) )
 
 	ROM_REGION( 0x0200, "plds", 0 )
 	ROM_LOAD( "cuatro_en_linea_gal16v8as__nosticker.ic04", 0x0000, 0x0117, CRC(094edf29) SHA1(428a2f6568ac1032833ee0c65fa8304967a58607) )
 ROM_END
 
+ROM_START( 4enlineb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "cuatro_en_linea_2_a06.ic6",  0x0000, 0x8000, CRC(f8f14bf8) SHA1(e48fbedbd1b9be6fb56a0f65db80eddbedb487c7) )
+
+	ROM_REGION( 0x10000, "audiocpu", 0 )
+	ROM_LOAD( "cuatro_en_linea_1_a06.ic19", 0x0000, 0x8000, CRC(993d0581) SHA1(d6e366dd827543508037d2071c4b6e638c2cf87b) )
+
+	ROM_REGION( 0x0800, "eeprom", 0 ) // From an operated PCB, a clean one for default need to be created...
+	ROM_LOAD( "cuatro_en_linea_24c16.ic17", 0x0000, 0x0800, CRC(56722dd4) SHA1(f818d882b3070f9b1fac486987a044ab1d418985) )
+
+	ROM_REGION( 0x0200, "plds", 0 )
+	ROM_LOAD( "cuatro_en_linea_gal16v8a.ic04", 0x0000, 0x0117, CRC(1edaf06c) SHA1(51e44c2e6b54991330d6ef945e98fa2c8a49408d) )
+ROM_END
+
 /* Kursaal K7 Olympic Darts PCB
     __________________________________________________      SUBBOARD CM3080
     |           ________  __   ______  ______________ |     ________________
@@ -730,10 +744,25 @@
 ROM_END
 
 
+ROM_START( sprtdart )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sport_dart_27c512.ic19", 0x00000, 0x10000, CRC(6c9ae27f) SHA1(92fbdef7747a9096daf4714f45b119ad8f3a1436) )
+
+	ROM_REGION( 0x0800, "eeprom", 0 )
+	ROM_LOAD( "24c16.ic17", 0x0000, 0x0800, NO_DUMP ) // Undumped
+
+	ROM_REGION( 0x0300, "plds", 0 )
+	ROM_LOAD( "gal16v8a.ic11", 0x0000, 0x0117, NO_DUMP ) // protected
+	ROM_LOAD( "gal16v8a.ic4",  0x0117, 0x0117, NO_DUMP ) // protected
+ROM_END
+
+
 /***********************************
 *           Game Drivers           *
 ***********************************/
 
-/*    YEAR  NAME      PARENT  MACHINE    INPUT     CLASS            INIT        ROT   COMPANY       FULLNAME              FLAGS  */
-GAME( 1991, 4enlinea, 0,      _4enlinea, 4enlinea, _4enlinea_state, empty_init, ROT0, "Compumatic", "Cuatro en Linea",    MACHINE_NOT_WORKING )
-GAME( 1994, k7_olym,  0,      k7_olym,   k7_olym,  _4enlinea_state, empty_init, ROT0, "K7 Kursaal", "Olympic Darts (K7)", MACHINE_NOT_WORKING | MACHINE_MECHANICAL )
+//    YEAR  NAME      PARENT    MACHINE    INPUT     CLASS            INIT        ROT   COMPANY                                      FULLNAME                       FLAGS
+GAME( 1991, 4enlinea, 0,        _4enlinea, 4enlinea, _4enlinea_state, empty_init, ROT0, "Compumatic / CIC Play",                     "Cuatro en Linea (rev. A-07)", MACHINE_NOT_WORKING )
+GAME( 1991, 4enlineb, 4enlinea, _4enlinea, 4enlinea, _4enlinea_state, empty_init, ROT0, "Compumatic / CIC Play",                     "Cuatro en Linea (rev. A-06)", MACHINE_NOT_WORKING )
+GAME( 1994, k7_olym,  0,        k7_olym,   k7_olym,  _4enlinea_state, empty_init, ROT0, "K7 Kursaal",                                "Olympic Darts (K7)",          MACHINE_NOT_WORKING | MACHINE_MECHANICAL )
+GAME( 1993, sprtdart, 0,        k7_olym,   k7_olym,  _4enlinea_state, empty_init, ROT0, "Compumatic / Desarrollos y Recambios S.L.", "Sport Dart TV",               MACHINE_NOT_WORKING | MACHINE_MECHANICAL )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/a51xx.cpp mame-0.224+dfsg.1/src/mame/drivers/a51xx.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/a51xx.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/a51xx.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -31,7 +31,7 @@
 
 private:
 	virtual void machine_reset() override;
-	virtual void video_start() override;
+	virtual void machine_start() override;
 	DECLARE_MACHINE_RESET(a5130);
 	DECLARE_VIDEO_START(a5130);
 	uint32_t screen_update_a5120(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -80,7 +80,7 @@
 {
 }
 
-void a51xx_state::video_start()
+void a51xx_state::machine_start()
 {
 }
 
@@ -165,7 +165,7 @@
 
 /* ROM definition */
 ROM_START( a5120 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x0400, "maincpu", 0 )
 	ROM_SYSTEM_BIOS( 0, "v1", "v1" )
 	ROMX_LOAD( "a5120_v1.rom", 0x0000, 0x0400, CRC(b2b3fee0) SHA1(6198513b263d8a7a867f1dda368b415bb37fcdae), ROM_BIOS(0))
 	ROM_SYSTEM_BIOS( 1, "v2", "v2" )
@@ -178,7 +178,7 @@
 
 /* ROM definition */
 ROM_START( a5130 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x1000, "maincpu", 0 )
 	ROM_LOAD( "dzr5130.rom", 0x0000, 0x1000, CRC(4719beb7) SHA1(09295a658b8c5b75b20faea57ad925f69f07a9b5))
 
 	ROM_REGION(0x0800, "chargen",0)
@@ -189,5 +189,5 @@
 /* Driver */
 
 //    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY         FULLNAME  FLAGS
-COMP( 1982, a5120, 0,      0,      a5120,   a5120, a51xx_state, empty_init, "VEB Robotron", "A5120",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1983, a5130, a5120,  0,      a5130,   a5130, a51xx_state, empty_init, "VEB Robotron", "A5130",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1982, a5120, 0,      0,      a5120,   a5120, a51xx_state, empty_init, "VEB Robotron", "A5120",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+COMP( 1983, a5130, a5120,  0,      a5130,   a5130, a51xx_state, empty_init, "VEB Robotron", "A5130",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/a7150.cpp mame-0.224+dfsg.1/src/mame/drivers/a7150.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/a7150.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/a7150.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,20 +2,23 @@
 // copyright-holders:Miodrag Milanovic, Sergey Svishchev
 /***************************************************************************
 
-    Robotron A7150
+Robotron A7150
 
-    04/10/2009 Skeleton driver.
+2009-10-04 Skeleton driver.
 
-    http://www.robotrontechnik.de/index.htm?/html/computer/a7150.htm
+http://www.robotrontechnik.de/index.htm?/html/computer/a7150.htm
 
-    http://www.tiffe.de/Robotron/MMS16/
-    - Confidence test is documented in A7150_Rechner...pdf, pp. 112-119
-    - Internal test of KGS -- in KGS-K7070.pdf, pp. 19-23
+http://www.tiffe.de/Robotron/MMS16/
+- Confidence test is documented in A7150_Rechner...pdf, pp. 112-119
+- Internal test of KGS -- in KGS-K7070.pdf, pp. 19-23
 
-    To do:
-    - MMS16 (Multibus clone) and slot devices
-    - native keyboard
-    - A7100 model
+After about a minute, the self-test will appear.
+
+To do:
+- Machine hangs when screen should scroll
+- MMS16 (Multibus clone) and slot devices
+- native keyboard
+- A7100 model
 
 ****************************************************************************/
 
@@ -109,8 +112,8 @@
 	required_device<address_map_bank_device> m_video_bankdev;
 	required_device<palette_device> m_palette;
 
-	void a7150_io(address_map &map);
-	void a7150_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 	void k7070_cpu_banked(address_map &map);
 	void k7070_cpu_io(address_map &map);
 	void k7070_cpu_mem(address_map &map);
@@ -313,14 +316,14 @@
 }
 
 
-void a7150_state::a7150_mem(address_map &map)
+void a7150_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x00000, 0xf7fff).ram();
-	map(0xf8000, 0xfffff).rom().region("user1", 0);
+	map(0xf8000, 0xfffff).rom().region("maincpu", 0);
 }
 
-void a7150_state::a7150_io(address_map &map)
+void a7150_state::io_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x004a, 0x004a).w("isbc_215g", FUNC(isbc_215g_device::write)); // KES board
@@ -448,6 +451,12 @@
 
 void a7150_state::machine_start()
 {
+	save_item(NAME(m_kgs_msel));
+	save_item(NAME(m_kgs_iml));
+	save_item(NAME(m_kgs_datao));
+	save_item(NAME(m_kgs_datai));
+	save_item(NAME(m_kgs_ctrl));
+	save_item(NAME(m_ifss_loopback));
 }
 
 static const z80_daisy_config k7070_daisy_chain[] =
@@ -469,8 +478,8 @@
 void a7150_state::a7150(machine_config &config)
 {
 	I8086(config, m_maincpu, XTAL(9'832'000)/2);
-	m_maincpu->set_addrmap(AS_PROGRAM, &a7150_state::a7150_mem);
-	m_maincpu->set_addrmap(AS_IO, &a7150_state::a7150_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &a7150_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &a7150_state::io_map);
 	m_maincpu->set_irq_acknowledge_callback("pic8259", FUNC(pic8259_device::inta_cb));
 	m_maincpu->esc_opcode_handler().set("i8087", FUNC(i8087_device::insn_w));
 	m_maincpu->esc_data_handler().set("i8087", FUNC(i8087_device::addr_w));
@@ -567,7 +576,7 @@
 
 /* ROM definition */
 ROM_START( a7150 )
-	ROM_REGION16_LE( 0x10000, "user1", ROMREGION_ERASEFF )
+	ROM_REGION16_LE( 0x8000, "maincpu", 0 )
 	ROM_DEFAULT_BIOS("2.3")
 
 	// A7100
@@ -596,7 +605,7 @@
 	ROMX_LOAD("275.rom",  0x4000, 0x2000, CRC(0da54426) SHA1(7492caff98b1d1a896c5964942b17beadf996b60), ROM_BIOS(3) | ROM_SKIP(1))
 	ROMX_LOAD("276.rom",  0x0000, 0x2000, CRC(5924192a) SHA1(eb494d9f96a0b3ea69f4b9cb2b7add66a8c16946), ROM_BIOS(3) | ROM_SKIP(1))
 
-	ROM_REGION( 0x10000, "user2", ROMREGION_ERASEFF )
+	ROM_REGION( 0x2000, "user2", ROMREGION_ERASEFF )
 	// ROM from A7100
 	ROM_LOAD( "kgs7070-152.bin", 0x0000, 0x2000, CRC(403f4235) SHA1(d07ccd40f8b600651d513f588bcf1ea4f15ed094))
 //  ROM_LOAD( "kgs7070-153.rom", 0x0000, 0x2000, CRC(a72fe820) SHA1(4b77ab2b59ea8c3632986847ff359df26b16196b))
@@ -606,4 +615,4 @@
 /* Driver */
 
 //    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY         FULLNAME  FLAGS
-COMP( 1986, a7150, 0,      0,      a7150,   a7150, a7150_state, empty_init, "VEB Robotron", "A7150",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1986, a7150, 0,      0,      a7150,   a7150, a7150_state, empty_init, "VEB Robotron", "A7150",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/abc1600.cpp mame-0.224+dfsg.1/src/mame/drivers/abc1600.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/abc1600.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/abc1600.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -17,7 +17,7 @@
     sa(40,0)
     y
     5
-    necd5126a
+    micr1325a
 
     How to install OS:
     ------------------
@@ -66,8 +66,6 @@
     - CIO
         - optimize timers!
         - port C, open drain output bit PC1 (RTC/NVRAM data)
-    - hard disk
-        - 4105 SASI interface card
     - connect RS-232 printer port
     - Z80 SCC/DART interrupt chain
     - Z80 SCC DMA request
@@ -463,19 +461,16 @@
 		m_sysscc = state;
 
 		m_cio->pb5_w(!state);
-		m_bus1->pren_w(!state);
 
-		update_drdy1();
+		update_drdy1(0);
 		break;
 
 	case 7: // SYSFS
 		m_sysfs = state;
 
 		m_cio->pb6_w(!state);
-		m_bus0i->pren_w(!state);
-		m_bus0x->pren_w(!state);
 
-		update_drdy0();
+		update_drdy0(0);
 		break;
 	}
 }
@@ -549,7 +544,23 @@
 //  Z80DMA 0
 //-------------------------------------------------
 
-void abc1600_state::update_drdy0()
+void abc1600_state::update_pren0(int state)
+{
+	if (m_sysfs)
+	{
+		// floppy
+		m_dma0->iei_w(0);
+	}
+	else
+	{
+		// BUS0I/BUS0X
+		bool pren0 = m_bus0i->pren_r() && m_bus0x->pren_r();
+
+		m_dma0->iei_w(!pren0);
+	}
+}
+
+void abc1600_state::update_drdy0(int state)
 {
 	if (m_sysfs)
 	{
@@ -574,28 +585,32 @@
 //  Z80DMA 1
 //-------------------------------------------------
 
-void abc1600_state::update_drdy1()
+void abc1600_state::update_pren1(int state)
 {
 	if (m_sysscc)
 	{
 		// SCC
-		m_dma1->rdy_w(1);
+		m_dma1->iei_w(1);
 	}
 	else
 	{
 		// BUS1
-		m_dma1->rdy_w(m_bus1->trrq_r());
+		m_dma1->iei_w(!m_bus1->pren_r());
 	}
 }
 
-//-------------------------------------------------
-//  Z80DMA 2
-//-------------------------------------------------
-
-void abc1600_state::update_drdy2()
+void abc1600_state::update_drdy1(int state)
 {
-	// Winchester
-	m_dma2->rdy_w(1);
+	if (m_sysscc)
+	{
+		// SCC
+		m_dma1->rdy_w(m_sccrq_a && m_sccrq_b);
+	}
+	else
+	{
+		// BUS1
+		m_dma1->rdy_w(m_bus1->trrq_r());
+	}
 }
 
 //-------------------------------------------------
@@ -779,11 +794,6 @@
 	device.option_add("525qd", FLOPPY_525_QD);
 }
 
-WRITE_LINE_MEMBER( abc1600_state::fdc_drq_w )
-{
-	update_drdy0();
-}
-
 
 //-------------------------------------------------
 //  ABC1600BUS_INTERFACE( abcbus_intf )
@@ -822,7 +832,10 @@
 	save_item(NAME(m_bus0));
 	save_item(NAME(m_csb));
 	save_item(NAME(m_atce));
-	save_item(NAME(m_btce));
+	save_item(NAME(m_sccrq_a));
+	save_item(NAME(m_sccrq_b));
+	save_item(NAME(m_scc_irq));
+	save_item(NAME(m_dart_irq));
 }
 
 
@@ -863,35 +876,39 @@
 	ABC1600_MOVER(config, ABC1600_MOVER_TAG, 0);
 
 	// devices
-	abc1600_mac_device &mac(ABC1600_MAC(config, "mac", 0));
-	mac.set_addrmap(AS_PROGRAM, &abc1600_state::mac_mem);
-	mac.set_cpu_tag(m_maincpu);
+	ABC1600_MAC(config, m_mac, 0);
+	m_mac->set_addrmap(AS_PROGRAM, &abc1600_state::mac_mem);
+	m_mac->set_cpu_tag(m_maincpu);
 
 	Z80DMA(config, m_dma0, 64_MHz_XTAL / 16);
 	m_dma0->out_busreq_callback().set(FUNC(abc1600_state::dbrq_w));
 	m_dma0->out_bao_callback().set(m_dma1, FUNC(z80dma_device::bai_w));
-	m_dma0->in_mreq_callback().set(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dma0_mreq_r));
-	m_dma0->out_mreq_callback().set(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dma0_mreq_w));
-	m_dma0->in_iorq_callback().set(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dma0_iorq_r));
-	m_dma0->out_iorq_callback().set(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dma0_iorq_w));
+	m_dma0->in_mreq_callback().set(m_mac, FUNC(abc1600_mac_device::dma0_mreq_r));
+	m_dma0->out_mreq_callback().set(m_mac, FUNC(abc1600_mac_device::dma0_mreq_w));
+	m_dma0->out_ieo_callback().set(m_bus0i, FUNC(abcbus_slot_device::prac_w));
+	//m_dma0->out_ieo_callback().set(m_bus0x, FUNC(abcbus_slot_device::prac_w));
+	m_dma0->in_iorq_callback().set(FUNC(abc1600_state::dma0_iorq_r));
+	m_dma0->out_iorq_callback().set(FUNC(abc1600_state::dma0_iorq_w));
 
 	Z80DMA(config, m_dma1, 64_MHz_XTAL / 16);
 	m_dma1->out_busreq_callback().set(FUNC(abc1600_state::dbrq_w));
 	m_dma1->out_bao_callback().set(m_dma2, FUNC(z80dma_device::bai_w));
-	m_dma1->in_mreq_callback().set(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dma1_mreq_r));
-	m_dma1->out_mreq_callback().set(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dma1_mreq_w));
-	m_dma1->in_iorq_callback().set(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dma1_iorq_r));
-	m_dma1->out_iorq_callback().set(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dma1_iorq_w));
+	m_dma1->in_mreq_callback().set(m_mac, FUNC(abc1600_mac_device::dma1_mreq_r));
+	m_dma1->out_mreq_callback().set(m_mac, FUNC(abc1600_mac_device::dma1_mreq_w));
+	m_dma1->out_ieo_callback().set(m_bus1, FUNC(abcbus_slot_device::prac_w));
+	m_dma1->in_iorq_callback().set(FUNC(abc1600_state::dma1_iorq_r));
+	m_dma1->out_iorq_callback().set(FUNC(abc1600_state::dma1_iorq_w));
 
 	Z80DMA(config, m_dma2, 64_MHz_XTAL / 16);
 	m_dma2->out_busreq_callback().set(FUNC(abc1600_state::dbrq_w));
-	m_dma2->in_mreq_callback().set(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dma2_mreq_r));
-	m_dma2->out_mreq_callback().set(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dma2_mreq_w));
-	m_dma2->in_iorq_callback().set(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dma2_iorq_r));
-	m_dma2->out_iorq_callback().set(ABC1600_MAC_TAG, FUNC(abc1600_mac_device::dma2_iorq_w));
+	m_dma2->in_mreq_callback().set(m_mac, FUNC(abc1600_mac_device::dma2_mreq_r));
+	m_dma2->out_mreq_callback().set(m_mac, FUNC(abc1600_mac_device::dma2_mreq_w));
+	m_dma2->out_ieo_callback().set(m_bus2, FUNC(abcbus_slot_device::prac_w));
+	m_dma2->in_iorq_callback().set(m_bus2, FUNC(abcbus_slot_device::read_tren));
+	m_dma2->out_iorq_callback().set(m_bus2, FUNC(abcbus_slot_device::write_tren));
 
 	Z80DART(config, m_dart, 64_MHz_XTAL / 16);
-	m_dart->out_int_callback().set_inputline(m_maincpu, M68K_IRQ_5);    // shared with SCC
+	m_dart->out_int_callback().set(FUNC(abc1600_state::dart_irq_w));
 	m_dart->out_txda_callback().set(RS232_PR_TAG, FUNC(rs232_port_device::write_txd));
 	//m_dart->out_dtra_callback().set(RS232_PR_TAG, FUNC(rs232_port_device::write_dcd));
 	//m_dart->out_rtsa_callback().set(RS232_PR_TAG, FUNC(rs232_port_device::write_cts));
@@ -903,14 +920,14 @@
 	kb.out_keydown_handler().set(m_dart, FUNC(z80dart_device::dcdb_w));
 
 	rs232_port_device &rs232pr(RS232_PORT(config, RS232_PR_TAG, default_rs232_devices, nullptr));
-	rs232pr.rxd_handler().set(Z8470AB1_TAG, FUNC(z80dart_device::rxa_w));
-	//rs232pr.rts_handler().set(Z8470AB1_TAG, FUNC(z80dart_device::ctsa_w));
-	//rs232pr.dtr_handler().set(Z8470AB1_TAG, FUNC(z80dart_device::dcda_w));
+	rs232pr.rxd_handler().set(m_dart, FUNC(z80dart_device::rxa_w));
+	//rs232pr.rts_handler().set(m_dart, FUNC(z80dart_device::ctsa_w));
+	//rs232pr.dtr_handler().set(m_dart, FUNC(z80dart_device::dcda_w));
 
 	SCC8530N(config, m_scc, 64_MHz_XTAL / 16);
-	m_scc->out_int_callback().set_inputline(MC68008P8_TAG, M68K_IRQ_5);
-	//m_scc->out_wreqa_callback().set(FUNC(abc1600_state::sccrq_w));
-	//m_scc->out_wreqb_callback().set(FUNC(abc1600_state::sccrq_w));
+	m_scc->out_int_callback().set(FUNC(abc1600_state::scc_irq_w));
+	m_scc->out_wreqa_callback().set(FUNC(abc1600_state::sccrq_a_w));
+	m_scc->out_wreqb_callback().set(FUNC(abc1600_state::sccrq_b_w));
 	m_scc->out_txda_callback().set(RS232_A_TAG, FUNC(rs232_port_device::write_txd));
 	m_scc->out_dtra_callback().set(RS232_A_TAG, FUNC(rs232_port_device::write_dtr));
 	m_scc->out_rtsa_callback().set(RS232_A_TAG, FUNC(rs232_port_device::write_rts));
@@ -919,15 +936,16 @@
 	m_scc->out_rtsb_callback().set(RS232_B_TAG, FUNC(rs232_port_device::write_rts));
 
 	rs232_port_device &rs232a(RS232_PORT(config, RS232_A_TAG, default_rs232_devices, nullptr));
-	rs232a.rxd_handler().set(Z8530B1_TAG, FUNC(scc8530_device::rxa_w));
-	rs232a.cts_handler().set(Z8530B1_TAG, FUNC(scc8530_device::ctsa_w));
-	rs232a.dcd_handler().set(Z8530B1_TAG, FUNC(scc8530_device::dcda_w));
-	rs232a.ri_handler().set(Z8530B1_TAG, FUNC(scc8530_device::synca_w));
+	rs232a.rxd_handler().set(m_scc, FUNC(scc8530_device::rxa_w));
+	rs232a.cts_handler().set(m_scc, FUNC(scc8530_device::ctsa_w));
+	rs232a.dcd_handler().set(m_scc, FUNC(scc8530_device::dcda_w));
+	rs232a.ri_handler().set(m_scc, FUNC(scc8530_device::synca_w));
+
 	rs232_port_device &rs232b(RS232_PORT(config, RS232_B_TAG, default_rs232_devices, nullptr));
-	rs232b.rxd_handler().set(Z8530B1_TAG, FUNC(scc8530_device::rxb_w));
-	rs232b.cts_handler().set(Z8530B1_TAG, FUNC(scc8530_device::ctsb_w));
-	rs232b.dcd_handler().set(Z8530B1_TAG, FUNC(scc8530_device::dcdb_w));
-	rs232b.ri_handler().set(Z8530B1_TAG, FUNC(scc8530_device::syncb_w));
+	rs232b.rxd_handler().set(m_scc, FUNC(scc8530_device::rxb_w));
+	rs232b.cts_handler().set(m_scc, FUNC(scc8530_device::ctsb_w));
+	rs232b.dcd_handler().set(m_scc, FUNC(scc8530_device::dcdb_w));
+	rs232b.ri_handler().set(m_scc, FUNC(scc8530_device::syncb_w));
 
 	Z8536(config, m_cio, 64_MHz_XTAL / 16);
 	m_cio->irq_wr_cb().set_inputline(MC68008P8_TAG, M68K_IRQ_2);
@@ -943,27 +961,36 @@
 
 	FD1797(config, m_fdc, 64_MHz_XTAL / 64);
 	m_fdc->intrq_wr_callback().set(m_cio, FUNC(z8536_device::pb7_w));
-	m_fdc->drq_wr_callback().set(FUNC(abc1600_state::fdc_drq_w));
+	m_fdc->drq_wr_callback().set(FUNC(abc1600_state::update_drdy0));
 
 	FLOPPY_CONNECTOR(config, SAB1797_02P_TAG":0", abc1600_floppies, nullptr, floppy_image_device::default_floppy_formats);
 	FLOPPY_CONNECTOR(config, SAB1797_02P_TAG":1", abc1600_floppies, nullptr, floppy_image_device::default_floppy_formats);
 	FLOPPY_CONNECTOR(config, SAB1797_02P_TAG":2", abc1600_floppies, "525qd", floppy_image_device::default_floppy_formats);
 
-	abcbus_slot_device &bus0i(ABCBUS_SLOT(config, "bus0i", 64_MHz_XTAL / 16, abc1600bus_cards, nullptr));
-	bus0i.irq_callback().set(m_cio, FUNC(z8536_device::pa7_w));
-	abcbus_slot_device &bus0x(ABCBUS_SLOT(config, "bus0x", 64_MHz_XTAL / 16, abc1600bus_cards, nullptr));
-	bus0x.irq_callback().set(m_cio, FUNC(z8536_device::pa6_w));
-	bus0x.nmi_callback().set(FUNC(abc1600_state::nmi_w));
-	bus0x.xint2_callback().set(m_cio, FUNC(z8536_device::pa2_w));
-	bus0x.xint3_callback().set(m_cio, FUNC(z8536_device::pa3_w));
-	bus0x.xint4_callback().set(m_cio, FUNC(z8536_device::pa4_w));
-	bus0x.xint5_callback().set(m_cio, FUNC(z8536_device::pa5_w));
-	abcbus_slot_device &bus1(ABCBUS_SLOT(config, "bus1", 64_MHz_XTAL / 16, abc1600bus_cards, nullptr));
-	bus1.irq_callback().set(m_cio, FUNC(z8536_device::pa1_w));
-	abcbus_slot_device &bus2(ABCBUS_SLOT(config, "bus2", 64_MHz_XTAL / 16, abc1600bus_cards, "4105"));
-	bus2.irq_callback().set(m_cio, FUNC(z8536_device::pa0_w));
-	//bus2.pren_callback().set(Z8410AB1_2_TAG, FUNC(z80dma_device::iei_w));
-	bus2.trrq_callback().set(Z8410AB1_2_TAG, FUNC(z80dma_device::rdy_w));
+	ABCBUS_SLOT(config, m_bus0i, 64_MHz_XTAL / 16, abc1600bus_cards, nullptr);
+	m_bus0i->irq_callback().set(m_cio, FUNC(z8536_device::pa7_w));
+	m_bus0i->pren_callback().set(FUNC(abc1600_state::update_pren0));
+	m_bus0i->trrq_callback().set(FUNC(abc1600_state::update_drdy0));
+
+	ABCBUS_SLOT(config, m_bus0x, 64_MHz_XTAL / 16, abc1600bus_cards, nullptr);
+	m_bus0x->irq_callback().set(m_cio, FUNC(z8536_device::pa6_w));
+	m_bus0x->nmi_callback().set(FUNC(abc1600_state::nmi_w));
+	m_bus0x->xint2_callback().set(m_cio, FUNC(z8536_device::pa2_w));
+	m_bus0x->xint3_callback().set(m_cio, FUNC(z8536_device::pa3_w));
+	m_bus0x->xint4_callback().set(m_cio, FUNC(z8536_device::pa4_w));
+	m_bus0x->xint5_callback().set(m_cio, FUNC(z8536_device::pa5_w));
+	m_bus0x->pren_callback().set(FUNC(abc1600_state::update_pren0));
+	m_bus0x->trrq_callback().set(FUNC(abc1600_state::update_drdy0));
+
+	ABCBUS_SLOT(config, m_bus1, 64_MHz_XTAL / 16, abc1600bus_cards, nullptr);
+	m_bus1->irq_callback().set(m_cio, FUNC(z8536_device::pa1_w));
+	m_bus1->pren_callback().set(FUNC(abc1600_state::update_pren1));
+	m_bus1->trrq_callback().set(FUNC(abc1600_state::update_drdy1));
+
+	ABCBUS_SLOT(config, m_bus2, 64_MHz_XTAL / 16, abc1600bus_cards, "4105");
+	m_bus2->irq_callback().set(m_cio, FUNC(z8536_device::pa0_w));
+	m_bus2->pren_callback().set(m_dma2, FUNC(z80dma_device::iei_w));
+	m_bus2->trrq_callback().set(m_dma2, FUNC(z80dma_device::rdy_w));
 
 	// internal ram
 	RAM(config, RAM_TAG).set_default_size("1M");
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ac1.cpp mame-0.224+dfsg.1/src/mame/drivers/ac1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ac1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ac1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -19,18 +19,153 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "includes/ac1.h"
-
 #include "cpu/z80/z80.h"
 #include "imagedev/cassette.h"
 #include "machine/z80pio.h"
+#include "machine/z80ctc.h"
 #include "screen.h"
 #include "speaker.h"
+#include "sound/spkrdev.h"
+#include "emupal.h"
 
+class ac1_state : public driver_device
+{
+public:
+	ac1_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_cassette(*this, "cassette")
+		, m_maincpu(*this, "maincpu")
+		, m_vram(*this, "videoram")
+		, m_gfxdecode(*this, "gfxdecode")
+		, m_palette(*this, "palette")
+		, m_speaker(*this, "speaker")
+		, m_io_line(*this, "LINE.%u", 0U)
+	{ }
+
+	void ac1(machine_config &config);
+	void ac1_32(machine_config &config);
+	void ac1scch(machine_config &config);
+	void init_upper();
+	void init_lower();
+
+private:
+	u32 screen_update_ac1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	u32 screen_update_ac1_32(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	u8 ac1_port_b_r();
+	u8 ac1_port_a_r();
+	bool has_lowercase;
+	void machine_start() override;
+	void ac1_port_a_w(u8 data);
+	void ac1_port_b_w(u8 data);
+
+	void ac1_32_mem(address_map &map);
+	void ac1_io(address_map &map);
+	void ac1scch_io(address_map &map);
+	void ac1_mem(address_map &map);
+
+	required_device<cassette_image_device> m_cassette;
+	required_device<cpu_device> m_maincpu;
+	required_shared_ptr<u8> m_vram;
+	required_device<gfxdecode_device> m_gfxdecode;
+	required_device<palette_device> m_palette;
+	required_device<speaker_sound_device> m_speaker;
+	required_ioport_array<7> m_io_line;
+};
 
-static GFXDECODE_START( gfx_ac1 )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, ac1_charlayout, 0, 1 )
-GFXDECODE_END
+
+u8 ac1_state::ac1_port_b_r()
+{
+	u8 data = 0x7f;
+
+	if (m_cassette->input() > 0.03)
+		data |= 0x80;
+
+	return data;
+}
+
+// standard ascii keyboard with bit 7 high
+u8 ac1_state::ac1_port_a_r()
+{
+	u8 line[7] = { 0,0,0,0,0,0,0} ;
+
+	line[6] = m_io_line[6]->read();
+	if (BIT(line[6], 2,3))
+	{
+		if (BIT(line[6], 2))
+			return 0xa0;  // space
+		if (BIT(line[6], 3))
+			return 0x8d;  // enter
+		if (BIT(line[6], 4))
+			return 0x88;  // backspace
+	}
+
+	bool SH = BIT(line[6],0);
+	u8 i;
+
+	line[0] = m_io_line[0]->read();
+	if (line[0])
+		for (i = 0; i < 8; i++)
+			if (BIT(line[0], i))
+				return (SH) ? 0xa0+i : 0xb0+i;
+
+	line[1] = m_io_line[1]->read();
+	if (line[1])
+	{
+		for (i = 0; i < 4; i++)
+			if (BIT(line[1], i))
+				return (SH) ? 0xa8+i : 0xb8+i;
+		for (i = 4; i < 8; i++)
+			if (BIT(line[1], i))
+				return (SH) ? 0xb8+i : 0xa8+i;
+	}
+
+	bool CTRL = BIT(line[6],1);
+
+	line[2] = m_io_line[2]->read();
+	line[3] = m_io_line[3]->read();
+	line[4] = m_io_line[4]->read();
+	line[5] = m_io_line[5]->read();
+
+	if (!has_lowercase)
+	{
+		SH = false;
+		CTRL = false;
+	}
+
+	for (u8 j = 2; j < 6; j++)
+		for (i = 0; i < 8; i++)
+			if (BIT(line[j], i))
+			{
+				u8 k = 0x70 + i + j*8;
+				return (CTRL) ? k : ((SH) ? k+0x60 : k+0x40);
+			}
+
+	return 0; // no key pressed
+}
+
+void ac1_state::ac1_port_a_w(u8 data)
+{
+}
+
+void ac1_state::ac1_port_b_w(u8 data)
+{
+	/*
+
+	    bit     description
+
+	    0
+	    1       RTTY receive
+	    2       RTTY transmit
+	    3       RTTY PTT
+	    4
+	    5
+	    6       cassette out
+	    7       cassette in
+
+	*/
+	m_speaker->level_w(BIT(data, 0));
+	m_cassette->output(BIT(data, 6) ? -1.0 : +1.0);
+}
 
 /* Address maps */
 void ac1_state::ac1_mem(address_map &map)
@@ -38,23 +173,29 @@
 	map.unmap_value_high();
 	map(0x0000, 0x07ff).rom();  // Monitor
 	map(0x0800, 0x0fff).rom();  // BASIC
-	map(0x1000, 0x17ff).ram();  // Video RAM
-	map(0x1800, 0x1fff).ram();  // RAM
+	map(0x1000, 0x17ff).ram().share("videoram");
+	map(0x1800, 0x1fff).ram();
 }
 
 void ac1_state::ac1_32_mem(address_map &map)
 {
-	map.unmap_value_high();
-	map(0x0000, 0x07ff).rom();  // Monitor
-	map(0x0800, 0x0fff).rom();  // BASIC
-	map(0x1000, 0x17ff).ram();  // Video RAM
-	map(0x1800, 0xffff).ram();  // RAM
+	ac1_mem(map);
+	map(0x1800, 0xffff).ram();
 }
 
 void ac1_state::ac1_io(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0x04, 0x07).rw("z80pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
+	map(0x00, 0x03).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));  // on the board, but ignored by standard bios
+	map(0x04, 0x07).rw("pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
+}
+
+void ac1_state::ac1scch_io(address_map &map)
+{
+	map.global_mask(0xff);
+	ac1_io(map);
+	map(0x08, 0x0b).rw("pio2", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
+	// more...
 }
 
 /* Input ports */
@@ -73,11 +214,11 @@
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') PORT_CHAR('*')
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR(';') PORT_CHAR('+')
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR('<') PORT_CHAR(',')
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('=') PORT_CHAR('-')
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('>') PORT_CHAR('.')
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('?') PORT_CHAR('/')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(';') PORT_CHAR('+')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
 
 	PORT_START("LINE.2")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('@') PORT_CHAR('`')
@@ -113,11 +254,11 @@
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('x')
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_CHAR('y')
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHAR('z')
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR(']')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('|')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('{') PORT_CHAR('}')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_END) PORT_CHAR('^') PORT_CHAR('~')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_HOME) PORT_CHAR('_') PORT_CHAR(127)
 
 	PORT_START("LINE.6")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
@@ -127,7 +268,56 @@
 	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Backspace") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
 INPUT_PORTS_END
 
-/* Machine driver */
+
+const gfx_layout charlayout =
+{
+	6, 8,               /* 6x8 characters */
+	256,                /* 256 characters */
+	1,                  /* 1 bits per pixel */
+	{0},                /* no bitplanes; 1 bit per pixel */
+	{7, 6, 5, 4, 3, 2},
+	{0 * 8, 1 * 8, 2 * 8, 3 * 8, 4 * 8, 5 * 8, 6 * 8, 7 * 8},
+	8*8                 /* size of one char */
+};
+
+static GFXDECODE_START( gfx_ac1 )
+	GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 1 )
+GFXDECODE_END
+
+u32 ac1_state::screen_update_ac1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	for (u8 y = 0; y < 16; y++ )
+		for (u8 x = 0; x < 64; x++ )
+			m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_vram[x + y*64], 0, 0, 0, 63*6-x*6, 15*8-y*8);
+
+	return 0;
+}
+
+u32 ac1_state::screen_update_ac1_32(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	for (u8 y = 0; y < 32; y++ )
+		for (u8 x = 0; x < 64; x++ )
+			m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, m_vram[x + y*64], 0, 0, 0, 63*6-x*6, 31*8-y*8);
+
+	return 0;
+}
+
+void ac1_state::machine_start()
+{
+	save_item(NAME(has_lowercase));
+}
+
+void ac1_state::init_upper()
+{
+	has_lowercase = false;
+}
+
+void ac1_state::init_lower()
+{
+	has_lowercase = true;
+}
+
+
 void ac1_state::ac1(machine_config &config)
 {
 	/* basic machine hardware */
@@ -135,13 +325,15 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &ac1_state::ac1_mem);
 	m_maincpu->set_addrmap(AS_IO, &ac1_state::ac1_io);
 
-	z80pio_device& pio(Z80PIO(config, "z80pio", XTAL(8'000'000)/4));
+	z80pio_device& pio(Z80PIO(config, "pio", XTAL(8'000'000)/4));
 	pio.in_pa_callback().set(FUNC(ac1_state::ac1_port_a_r));
 	pio.out_pa_callback().set(FUNC(ac1_state::ac1_port_a_w));
 	pio.in_pb_callback().set(FUNC(ac1_state::ac1_port_b_r));
 	pio.out_pb_callback().set(FUNC(ac1_state::ac1_port_b_w));
 
-	/* video hardware */
+	Z80CTC(config, "ctc", 8'000'000 / 4); // all connections go external
+
+	// video hardware
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(50);
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
@@ -154,7 +346,9 @@
 
 	PALETTE(config, m_palette, palette_device::MONOCHROME);
 
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
+	SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
 
 	CASSETTE(config, m_cassette);
 	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
@@ -173,15 +367,26 @@
 	screen.set_screen_update(FUNC(ac1_state::screen_update_ac1_32));
 }
 
+void ac1_state::ac1scch(machine_config &config)
+{
+	ac1_32(config);
+	m_maincpu->set_addrmap(AS_IO, &ac1_state::ac1scch_io);
+
+	Z80PIO(config, "pio2", XTAL(8'000'000)/4);  // for V24 and printer
+	// more...
+}
+
+
 /* ROM definition */
 ROM_START( ac1 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x1000, "maincpu", ROMREGION_ERASEFF )
 	ROM_SYSTEM_BIOS( 0, "v1", "Version 3.1 (orig)" )
 	ROMX_LOAD("mon_v31_16.bin",  0x0000, 0x0800, CRC(1ba65e4d) SHA1(3382b8d03f31166a56aea49fd1ec1e82a7108300), ROM_BIOS(0))
 	ROM_SYSTEM_BIOS( 1, "v2", "Version 3.1 (fixed)" )
 	ROMX_LOAD("mon_v31_16_v2.bin",  0x0000, 0x0800, CRC(8904beb4) SHA1(db8d00a2537ac3a662e3c91e55eb2bf824a72062), ROM_BIOS(1))
 	// from Funkamateur 01/85
 	ROM_LOAD("minibasic.bin",   0x0800, 0x0800, CRC(06782639) SHA1(3fd57b3ae3f538374b0d794d8aa15d06bcaaddd8))
+
 	ROM_REGION(0x0800, "gfx1",0)
 	// 64 chars - U402 BM513
 	ROM_LOAD("u402.bin", 0x0000, 0x0200, CRC(cfb67f28) SHA1(e3a62a3a8bce0d098887e31fd16410f38832fd18))
@@ -191,10 +396,11 @@
 ROM_END
 
 ROM_START( ac1_32 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x1000, "maincpu", ROMREGION_ERASEFF )
 	ROM_LOAD("mon_v31_32.bin",  0x0000, 0x0800, CRC(bea78b1a) SHA1(8a3e2ac2033aa0bb016be742cfea7e4b09c0813b))
 	// from Funkamateur 01/85
 	ROM_LOAD("minibasic.bin",   0x0800, 0x0800, CRC(06782639) SHA1(3fd57b3ae3f538374b0d794d8aa15d06bcaaddd8))
+
 	ROM_REGION(0x0800, "gfx1",0)
 	ROM_SYSTEM_BIOS( 0, "128", "128 chars" )
 	// 128 chars - U555 or 2708 from Funkamateur 06/86 128 including pseudo graphics
@@ -206,21 +412,25 @@
 ROM_END
 
 ROM_START( ac1scch )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x1000, "maincpu", ROMREGION_ERASEFF )
 	ROM_SYSTEM_BIOS( 0, "v7", "Version 7" )
 	ROMX_LOAD("mon_v7.bin",  0x0000, 0x1000, CRC(fd17b0cf) SHA1(e47113025bd9dadc1522425e21703f43e584b00f), ROM_BIOS(0))
 	ROM_SYSTEM_BIOS( 1, "v8", "Version 8" )
 	ROMX_LOAD("mon_v8.bin",  0x0000, 0x1000, CRC(5af68da5) SHA1(e760d4400b9c937e7e789d52b8ec975ff253a122), ROM_BIOS(1))
 	ROM_SYSTEM_BIOS( 2, "v10", "Version 10" )
-	ROMX_LOAD("mon_v10.bin",  0x0000, 0x1000, CRC(f8e67ecb) SHA1(7953676fc8c22824ceff464c7177e9ac0343b8ce), ROM_BIOS(2))
+	ROMX_LOAD("mon_v10.bin",  0x0000, 0x1000, CRC(f8e67ecb) SHA1(7953676fc8c22824ceff464c7177e9ac0343b8ce), ROM_BIOS(2)) // not working
 	ROM_SYSTEM_BIOS( 3, "v1088", "Version 10/88" )
 	ROMX_LOAD("mon_v1088.bin",  0x0000, 0x1000, CRC(bbb0a6df) SHA1(de9389e142541a8b5ff238b59e98bf571c794bef), ROM_BIOS(3))
+
 	ROM_REGION(0x0800, "gfx1",0)
 	ROM_LOAD("zg_scch.bin", 0x0000, 0x0800, CRC(fbfaf5da) SHA1(667568c5909e9a17675cf09dfbce2fc090c420ab))
 ROM_END
 
 // Driver
 //    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT  CLASS      INIT      COMPANY         FULLNAME                                 FLAGS
-COMP( 1984, ac1,     0,      0,      ac1,     ac1,   ac1_state, init_ac1, "Frank Heyder", "Amateurcomputer AC1 Berlin",            0 )
-COMP( 1984, ac1_32,  ac1,    0,      ac1_32,  ac1,   ac1_state, init_ac1, "Frank Heyder", "Amateurcomputer AC1 Berlin (32 lines)", 0 )
-COMP( 1984, ac1scch, ac1,    0,      ac1_32,  ac1,   ac1_state, init_ac1, "Frank Heyder", "Amateurcomputer AC1 SCCH",              0 )
+COMP( 1984, ac1,     0,      0,      ac1,     ac1,   ac1_state, init_upper, "Frank Heyder", "Amateurcomputer AC1 Berlin",            MACHINE_SUPPORTS_SAVE )
+COMP( 1984, ac1_32,  ac1,    0,      ac1_32,  ac1,   ac1_state, init_lower, "Frank Heyder", "Amateurcomputer AC1 Berlin (32 lines)", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, ac1scch, ac1,    0,      ac1scch, ac1,   ac1_state, init_lower, "Frank Heyder", "Amateurcomputer AC1 SCCH", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+// ac1_2010
+// ac1_2017
+
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/accomm.cpp mame-0.224+dfsg.1/src/mame/drivers/accomm.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/accomm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/accomm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -46,6 +46,7 @@
 	accomm_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
+		m_maincpu_region(*this, "maincpu"),
 		m_beeper(*this, "beeper"),
 		m_ram(*this, RAM_TAG),
 		m_via(*this, "via6522"),
@@ -60,6 +61,8 @@
 
 	void accomm(machine_config &config);
 
+	DECLARE_INPUT_CHANGED_MEMBER(trigger_reset);
+
 private:
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
@@ -80,6 +83,7 @@
 
 	// devices
 	required_device<g65816_device> m_maincpu;
+	required_memory_region m_maincpu_region;
 	required_device<beep_device> m_beeper;
 	required_device<ram_device> m_ram;
 	required_device<via6522_device> m_via;
@@ -438,7 +442,7 @@
 
 	if (m_ch00rom_enabled && (offset < 0x10000))
 	{
-		data = memregion("maincpu")->base()[offset];
+		data = m_maincpu_region->base()[offset];
 	}
 	else
 	{
@@ -646,6 +650,11 @@
 	map(0xff0000, 0xffffff).rom().region("maincpu", 0x010000);                                      /* ROM bank 1 (ROM Slot 0) */
 }
 
+INPUT_CHANGED_MEMBER(accomm_state::trigger_reset)
+{
+	m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE);
+}
+
 static INPUT_PORTS_START( accomm )
 	PORT_START("LINE1.0")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('/') PORT_CHAR('?')
@@ -716,7 +725,7 @@
 	PORT_START("LINE1.11")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR('\\') PORT_CHAR('|')
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']')  PORT_CHAR('}')
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F10)        PORT_CHAR(UCHAR_MAMEKEY(F10))       PORT_NAME("Phone")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F9)         PORT_CHAR(UCHAR_MAMEKEY(F9))        PORT_NAME("Phone")
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE)  PORT_CHAR(UCHAR_MAMEKEY(ESC))       PORT_NAME("Escape")
 
 	PORT_START("LINE1.12")
@@ -798,9 +807,9 @@
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7_PAD)      PORT_CHAR(UCHAR_MAMEKEY(7_PAD))
 
 	PORT_START("LINE2.11")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F9)         PORT_CHAR(UCHAR_MAMEKEY(F9))       PORT_NAME("Stop")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F10)        PORT_CHAR(UCHAR_MAMEKEY(F10))      PORT_NAME("Comp")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F12)        PORT_CHAR(UCHAR_MAMEKEY(F12))      PORT_NAME("Calc")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F11)        PORT_CHAR(UCHAR_MAMEKEY(F11))      PORT_NAME("Calc")
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER)      PORT_CHAR(13)
 
 	PORT_START("LINE2.12")
@@ -814,6 +823,9 @@
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_START("STOP")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F12)        PORT_CHAR(UCHAR_MAMEKEY(F12))      PORT_NAME("Stop") PORT_CHANGED_MEMBER(DEVICE_SELF, accomm_state, trigger_reset, 0)
 INPUT_PORTS_END
 
 void accomm_state::accomm(machine_config &config)
@@ -969,7 +981,7 @@
 	ROM_REGION(0x380000, "ext", ROMREGION_ERASEFF)
 ROM_END
 
-COMP( 1986, accomm,  0,      0, accomm, accomm, accomm_state, empty_init, "Acorn", "Acorn Communicator",             MACHINE_NOT_WORKING )
-COMP( 1985, accommp, accomm, 0, accomm, accomm, accomm_state, empty_init, "Acorn", "Acorn Communicator (prototype)", MACHINE_NOT_WORKING )
-COMP( 1987, accommb, accomm, 0, accomm, accomm, accomm_state, empty_init, "Acorn", "Acorn Briefcase Communicator",   MACHINE_NOT_WORKING )
-COMP( 1988, accommi, accomm, 0, accomm, accomm, accomm_state, empty_init, "Acorn", "Acorn Communicator (Italian)",   MACHINE_NOT_WORKING )
+COMP( 1986, accomm,  0,      0, accomm, accomm, accomm_state, empty_init, "Acorn Computers", "Acorn Communicator",             MACHINE_NOT_WORKING )
+COMP( 1985, accommp, accomm, 0, accomm, accomm, accomm_state, empty_init, "Acorn Computers", "Acorn Communicator (prototype)", MACHINE_NOT_WORKING )
+COMP( 1987, accommb, accomm, 0, accomm, accomm, accomm_state, empty_init, "Acorn Computers", "Acorn Briefcase Communicator",   MACHINE_NOT_WORKING )
+COMP( 1988, accommi, accomm, 0, accomm, accomm, accomm_state, empty_init, "Acorn Computers", "Acorn Communicator (Italian)",   MACHINE_NOT_WORKING )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/aci_prodigy.cpp mame-0.224+dfsg.1/src/mame/drivers/aci_prodigy.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/aci_prodigy.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/aci_prodigy.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -116,20 +116,14 @@
 	void shift_clock_w(int state);
 	void shift_data_w(int state);
 
-	u8 m_select;
-	u8 m_led_data;
-	u8 m_shift_data;
-	u8 m_shift_clock;
+	u8 m_select = 0;
+	u8 m_led_data = 0;
+	u8 m_shift_data = 0;
+	u8 m_shift_clock = 0;
 };
 
 void prodigy_state::machine_start()
 {
-	// zerofill
-	m_select = 0;
-	m_led_data = 0;
-	m_shift_data = 0;
-	m_shift_clock = 0;
-
 	// register for savestates
 	save_item(NAME(m_select));
 	save_item(NAME(m_led_data));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/aerofgt.cpp mame-0.224+dfsg.1/src/mame/drivers/aerofgt.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/aerofgt.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/aerofgt.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1979,7 +1979,7 @@
 	m_maincpu->set_vblank_int("screen", FUNC(aerofgt_state::irq1_line_hold)); /* all irq vectors are the same */
 
 	Z80(config, m_audiocpu, XTAL(20'000'000)/4); /* 5 MHz verified on pcb */
-	m_audiocpu->set_addrmap(AS_PROGRAM, &aerofgt_state::sound_map);;
+	m_audiocpu->set_addrmap(AS_PROGRAM, &aerofgt_state::sound_map);
 	m_audiocpu->set_addrmap(AS_IO, &aerofgt_state::aerofgt_sound_portmap); /* IRQs are triggered by the YM2610 */
 
 	MCFG_MACHINE_START_OVERRIDE(aerofgt_state,aerofgt)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/altos486.cpp mame-0.224+dfsg.1/src/mame/drivers/altos486.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/altos486.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/altos486.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -237,6 +237,9 @@
 
 	ROM_REGION( 0x1000, "iocpu", 0 )
 	ROM_LOAD("16019_z80.bin", 0x0000, 0x1000, CRC(68b1b2e1) SHA1(5d83609a465029212d5e3f72ac9c520b3dbed838))
+
+	ROM_REGION( 0x0020, "proms", 0 )
+	ROM_LOAD( "15020.bin",    0x0000, 0x0020, CRC(6a2bd961) SHA1(e9a9ed235574c9871dc32a80ff5ca4df6bd531e1) )
 ROM_END
 
 COMP( 1984, altos486, 0, 0, altos486, 0, altos486_state, empty_init, "Altos Computer Systems", "Altos 486", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ampro.cpp mame-0.224+dfsg.1/src/mame/drivers/ampro.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ampro.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ampro.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -40,6 +40,7 @@
 		, m_maincpu(*this, "maincpu")
 		, m_rom(*this, "maincpu")
 		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
 		, m_dart(*this, "dart")
 		, m_ctc(*this, "ctc")
 		, m_fdc(*this, "fdc")
@@ -67,11 +68,11 @@
 
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
-	bool m_rom_in_map;
 
 	required_device<z80_device> m_maincpu;
 	required_region_ptr<u8> m_rom;
 	required_shared_ptr<u8> m_ram;
+	required_memory_bank    m_bank1;
 	required_device<z80dart_device> m_dart;
 	required_device<z80ctc_device> m_ctc;
 	required_device<wd1772_device> m_fdc;
@@ -92,7 +93,7 @@
 */
 void ampro_state::port00_w(uint8_t data)
 {
-	m_rom_in_map = BIT(~data, 6);
+	m_bank1->set_entry(BIT(~data, 6));
 	m_fdc->dden_w(BIT(data, 5));
 	floppy_image_device *floppy = nullptr;
 	if (BIT(data, 0)) floppy = m_floppy0->get_device();
@@ -137,7 +138,7 @@
 void ampro_state::mem_map(address_map &map)
 {
 	map(0x0000, 0xffff).ram().share("mainram");
-	map(0x0000, 0x0fff).lr8(NAME([this] (offs_t offset) { if(m_rom_in_map) return m_rom[offset]; else return m_ram[offset]; }));
+	map(0x0000, 0x0fff).bankr("bank1");
 }
 
 void ampro_state::io_map(address_map &map)
@@ -190,12 +191,13 @@
 
 void ampro_state::machine_start()
 {
-	save_item(NAME(m_rom_in_map));
+	m_bank1->configure_entry(0, m_ram);
+	m_bank1->configure_entry(1, m_rom);
 }
 
 void ampro_state::machine_reset()
 {
-	m_rom_in_map = 1;
+	m_bank1->set_entry(1);
 
 	port00_w(0);
 	clear_strobe(0);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/amstrad.cpp mame-0.224+dfsg.1/src/mame/drivers/amstrad.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/amstrad.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/amstrad.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -86,7 +86,7 @@
     - Implement full Asic for CPC+ emulation.  Soft scroll is rather dodgy.
     - The KC Compact should not reuse the gate array functionality. Instead z8536 support should be added. (bug #42)
 
- ******************************************************************************/
+******************************************************************************/
 
 /* Core includes */
 #include "emu.h"
@@ -1327,5 +1327,5 @@
 COMP( 1990, cpc464p,   0,      0,      cpcplus, plus,      amstrad_state, empty_init, "Amstrad plc",         "Amstrad CPC464+",                           0 )
 COMP( 1990, cpc6128p,  0,      0,      cpcplus, plus,      amstrad_state, empty_init, "Amstrad plc",         "Amstrad CPC6128+",                          0 )
 CONS( 1990, gx4000,    0,      0,      gx4000,  gx4000,    amstrad_state, empty_init, "Amstrad plc",         "Amstrad GX4000",                            0 )
-COMP( 1989, kccomp,    cpc464, 0,      kccomp,  kccomp,    amstrad_state, empty_init, "VEB Mikroelektronik \"Wilhelm Pieck\" Muehlhausen", "KC Compact",  0 )
+COMP( 1989, kccomp,    cpc464, 0,      kccomp,  kccomp,    amstrad_state, empty_init, u8"VEB Mikroelektronik \"Wilhelm Pieck\" Mühlhausen", "KC Compact", 0 )
 COMP( 1993, al520ex,   cpc464, 0,      aleste,  aleste,    amstrad_state, empty_init, "Patisonic",           "Aleste 520EX",                              MACHINE_IMPERFECT_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/amust.cpp mame-0.224+dfsg.1/src/mame/drivers/amust.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/amust.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/amust.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -100,6 +100,7 @@
 		, m_maincpu(*this, "maincpu")
 		, m_rom(*this, "maincpu")
 		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
 		, m_p_chargen(*this, "chargen")
 		, m_beep(*this, "beeper")
 		, m_fdc (*this, "fdc")
@@ -149,7 +150,6 @@
 	//bool m_intrq;
 	bool m_hsync;
 	bool m_vsync;
-	bool m_rom_in_map;
 	std::unique_ptr<u8[]> m_vram;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 	memory_passthrough_handler *m_rom_shadow_tap;
@@ -157,6 +157,7 @@
 	required_device<cpu_device> m_maincpu;
 	required_region_ptr<u8> m_rom;
 	required_shared_ptr<u8> m_ram;
+	required_memory_bank    m_bank1;
 	required_region_ptr<u8> m_p_chargen;
 	required_device<beep_device> m_beep;
 	required_device<upd765a_device> m_fdc;
@@ -190,7 +191,7 @@
 void amust_state::mem_map(address_map &map)
 {
 	map(0x0000, 0xffff).ram().share("mainram");
-	map(0xf800, 0xffff).lr8(NAME([this] (offs_t offset) { if(m_rom_in_map) return m_rom[offset]; else return m_ram[offset]; }));
+	map(0xf800, 0xffff).bankr("bank1");
 }
 
 void amust_state::io_map(address_map &map)
@@ -412,7 +413,7 @@
 
 void amust_state::machine_reset()
 {
-	m_rom_in_map = true;
+	m_bank1->set_entry(1);
 	m_port04 = 0;
 	m_port06 = 0;
 	m_port08 = 0;
@@ -456,7 +457,8 @@
 	//save_item(NAME(m_intrq));
 	save_item(NAME(m_hsync));
 	save_item(NAME(m_vsync));
-	save_item(NAME(m_rom_in_map));
+	m_bank1->configure_entry(0, m_ram+0xf800);
+	m_bank1->configure_entry(1, m_rom);
 }
 
 void amust_state::amust(machine_config &config)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/apogee.cpp mame-0.224+dfsg.1/src/mame/drivers/apogee.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/apogee.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/apogee.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -13,13 +13,10 @@
 #include "includes/radio86.h"
 
 #include "cpu/i8085/i8085.h"
-#include "imagedev/cassette.h"
-#include "machine/i8255.h"
 #include "machine/pit8253.h"
 #include "sound/spkrdev.h"
 
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
 #include "formats/rk_cas.h"
@@ -45,21 +42,22 @@
 	I8275_DRAW_CHARACTER_MEMBER(display_pixels);
 
 	required_device<speaker_sound_device> m_speaker;
-	void apogee_mem(address_map &map);
+	void mem_map(address_map &map);
+	void machine_reset() override;
+	void machine_start() override;
 };
 
 
 /* Address maps */
-void apogee_state::apogee_mem(address_map &map)
+void apogee_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x0fff).bankrw("bank1"); // First bank
-	map(0x1000, 0xebff).ram();  // RAM
-	map(0xec00, 0xec03).rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).mirror(0x00fc);
-	map(0xed00, 0xed03).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x00fc);
-	//map(0xee00, 0xee03).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x00fc);
-	map(0xef00, 0xef01).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x00fe); // video
-	map(0xf000, 0xf0ff).w(m_dma8257, FUNC(i8257_device::write));    // DMA
-	map(0xf000, 0xffff).rom();  // System ROM
+	map(0x0000, 0xebff).ram().share("mainram");
+	map(0xec00, 0xec03).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).mirror(0x00fc);
+	map(0xed00, 0xed03).rw(m_ppi1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x00fc);
+	//map(0xee00, 0xee03).rw(m_ppi2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x00fc);
+	map(0xef00, 0xef01).rw("crtc", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x00fe); // video
+	map(0xf000, 0xf0ff).w(m_dma, FUNC(i8257_device::write));    // DMA
+	map(0xf000, 0xffff).rom().region("maincpu",0);  // System ROM
 }
 
 /* Input ports */
@@ -175,23 +173,50 @@
 	m_speaker->level_w(m_out0+m_out1+m_out2);
 }
 
+void apogee_state::machine_reset()
+{
+	address_space &program = m_maincpu->space(AS_PROGRAM);
+	program.install_rom(0x0000, 0x0fff, m_rom+0x0800);   // do it here for F3
+	m_rom_shadow_tap = program.install_read_tap(0xf000, 0xffff, "rom_shadow_r",[this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+		{
+			// delete this tap
+			m_rom_shadow_tap->remove();
+
+			// reinstall ram over the rom shadow
+			m_maincpu->space(AS_PROGRAM).install_ram(0x0000, 0x0fff, m_ram);
+		}
+
+		// return the original data
+		return data;
+	});
+}
+
+void apogee_state::machine_start()
+{
+	save_item(NAME(m_tape_value));
+	save_item(NAME(m_out0));
+	save_item(NAME(m_out1));
+	save_item(NAME(m_out2));
+}
+
 I8275_DRAW_CHARACTER_MEMBER(apogee_state::display_pixels)
 {
 	rgb_t const *const palette = m_palette->palette()->entry_list_raw();
-	uint8_t const *const charmap = &m_charmap[(gpa & 1) * 0x400];
+	uint8_t const *const charmap = &m_chargen[(gpa & 1) * 0x400];
 	uint8_t pixels = charmap[(linecount & 7) + (charcode << 3)] ^ 0xff;
-	if (vsp) {
+	if (vsp)
 		pixels = 0;
-	}
-	if (lten) {
+
+	if (lten)
 		pixels = 0xff;
-	}
-	if (rvv) {
+
+	if (rvv)
 		pixels ^= 0xff;
-	}
-	for(int i=0;i<6;i++) {
+
+	for(int i=0;i<6;i++)
 		bitmap.pix32(y, x + i) = palette[(pixels >> (5-i)) & 1 ? (hlgt ? 2 : 1) : 0];
-	}
 }
 
 /* F4 Character Displayer */
@@ -209,7 +234,7 @@
 };
 
 static GFXDECODE_START( gfx_apogee )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, apogee_charlayout, 0, 1 )
+	GFXDECODE_ENTRY( "chargen", 0x0000, apogee_charlayout, 0, 1 )
 GFXDECODE_END
 
 
@@ -218,32 +243,32 @@
 {
 	/* basic machine hardware */
 	I8080(config, m_maincpu, XTAL(16'000'000) / 9);
-	m_maincpu->set_addrmap(AS_PROGRAM, &apogee_state::apogee_mem);
+	m_maincpu->set_addrmap(AS_PROGRAM, &apogee_state::mem_map);
 
-	pit8253_device &pit8253(PIT8253(config, "pit8253", 0));
-	pit8253.set_clk<0>(XTAL(16'000'000)/9);
-	pit8253.out_handler<0>().set(FUNC(apogee_state::pit8253_out0_changed));
-	pit8253.set_clk<1>(XTAL(16'000'000)/9);
-	pit8253.out_handler<1>().set(FUNC(apogee_state::pit8253_out1_changed));
-	pit8253.set_clk<2>(XTAL(16'000'000)/9);
-	pit8253.out_handler<2>().set(FUNC(apogee_state::pit8253_out2_changed));
-
-	I8255(config, m_ppi8255_1);
-	m_ppi8255_1->out_pa_callback().set(FUNC(radio86_state::radio86_8255_porta_w2));
-	m_ppi8255_1->in_pb_callback().set(FUNC(radio86_state::radio86_8255_portb_r2));
-	m_ppi8255_1->in_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_r2));
-	m_ppi8255_1->out_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_w2));
+	pit8253_device &pit(PIT8253(config, "pit", 0));
+	pit.set_clk<0>(XTAL(16'000'000)/9);
+	pit.out_handler<0>().set(FUNC(apogee_state::pit8253_out0_changed));
+	pit.set_clk<1>(XTAL(16'000'000)/9);
+	pit.out_handler<1>().set(FUNC(apogee_state::pit8253_out1_changed));
+	pit.set_clk<2>(XTAL(16'000'000)/9);
+	pit.out_handler<2>().set(FUNC(apogee_state::pit8253_out2_changed));
+
+	I8255(config, m_ppi1);
+	m_ppi1->out_pa_callback().set(FUNC(apogee_state::radio86_8255_porta_w2));
+	m_ppi1->in_pb_callback().set(FUNC(apogee_state::radio86_8255_portb_r2));
+	m_ppi1->in_pc_callback().set(FUNC(apogee_state::radio86_8255_portc_r2));
+	m_ppi1->out_pc_callback().set(FUNC(apogee_state::radio86_8255_portc_w2));
 
-	//I8255(config, "ppi8255_2");
+	//I8255(config, m_ppi2);
 
-	i8275_device &i8275(I8275(config, "i8275", XTAL(16'000'000) / 12));
+	i8275_device &i8275(I8275(config, "crtc", XTAL(16'000'000) / 12));
 	i8275.set_character_width(6);
 	i8275.set_display_callback(FUNC(apogee_state::display_pixels));
-	i8275.drq_wr_callback().set(m_dma8257, FUNC(i8257_device::dreq2_w));
+	i8275.drq_wr_callback().set(m_dma, FUNC(i8257_device::dreq2_w));
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_screen_update("i8275", FUNC(i8275_device::screen_update));
+	screen.set_screen_update("crtc", FUNC(i8275_device::screen_update));
 	screen.set_refresh_hz(50);
 	screen.set_size(78*6, 30*10);
 	screen.set_visarea(0, 78*6-1, 0, 30*10-1);
@@ -256,12 +281,12 @@
 	m_speaker->set_levels(4, speaker_levels);
 	m_speaker->add_route(ALL_OUTPUTS, "mono", 0.75);
 
-	I8257(config, m_dma8257, XTAL(16'000'000) / 9);
-	m_dma8257->out_hrq_cb().set(FUNC(radio86_state::hrq_w));
-	m_dma8257->in_memr_cb().set(FUNC(radio86_state::memory_read_byte));
-	m_dma8257->out_memw_cb().set(FUNC(radio86_state::memory_write_byte));
-	m_dma8257->out_iow_cb<2>().set("i8275", FUNC(i8275_device::dack_w));
-	m_dma8257->set_reverse_rw_mode(1);
+	I8257(config, m_dma, XTAL(16'000'000) / 9);
+	m_dma->out_hrq_cb().set(FUNC(apogee_state::hrq_w));
+	m_dma->in_memr_cb().set(FUNC(apogee_state::memory_read_byte));
+	m_dma->out_memw_cb().set(FUNC(apogee_state::memory_write_byte));
+	m_dma->out_iow_cb<2>().set("crtc", FUNC(i8275_device::dack_w));
+	m_dma->set_reverse_rw_mode(1);
 
 	CASSETTE(config, m_cassette);
 	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
@@ -274,13 +299,14 @@
 
 /* ROM definition */
 ROM_START( apogee )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "apogee.rom", 0xf000, 0x1000, CRC(a47383a7) SHA1(6a868371c7980f92c2fc9ced921517209f197375))
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x1000, "maincpu", 0 )
+	ROM_LOAD( "apogee.rom", 0x0000, 0x1000, CRC(a47383a7) SHA1(6a868371c7980f92c2fc9ced921517209f197375))
+
+	ROM_REGION(0x0800, "chargen",0)
 	ROM_LOAD ("apogee.fnt", 0x0000, 0x0800, CRC(fe5867f0) SHA1(82c5aca63ada5e4533eb0516384aaa7b77a1f8e2))
 ROM_END
 
 /* Driver */
 
 //    YEAR  NAME    PARENT   COMPAT  MACHINE  INPUT   CLASS         INIT          COMPANY      FULLNAME        FLAGS
-COMP( 1989, apogee, radio86, 0,      apogee,  apogee, apogee_state, init_radio86, "Zavod BRA", "Apogee BK-01", 0 )
+COMP( 1989, apogee, radio86, 0,      apogee,  apogee, apogee_state, init_radio86, "Zavod BRA", "Apogee BK-01", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/apple2.cpp mame-0.224+dfsg.1/src/mame/drivers/apple2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/apple2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/apple2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1408,6 +1408,7 @@
 	CASSETTE(config, m_cassette);
 	m_cassette->set_default_state(CASSETTE_STOPPED);
 	m_cassette->set_interface("apple2_cass");
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
 }
 
 void apple2_state::apple2(machine_config &config)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/apple2e.cpp mame-0.224+dfsg.1/src/mame/drivers/apple2e.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/apple2e.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/apple2e.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -138,6 +138,7 @@
 #include "bus/a2bus/a2cffa.h"
 #include "bus/a2bus/a2memexp.h"
 #include "bus/a2bus/a2scsi.h"
+#include "bus/a2bus/cmsscsi.h"
 #include "bus/a2bus/a2hsscsi.h"
 #include "bus/a2bus/a2thunderclock.h"
 #include "bus/a2bus/a2softcard.h"
@@ -3100,7 +3101,7 @@
 	map(0xc000, 0xc07f).rw(FUNC(apple2e_state::c000_iic_r), FUNC(apple2e_state::c000_iic_w));
 	map(0xc080, 0xc0ff).rw(FUNC(apple2e_state::c080_r), FUNC(apple2e_state::c080_w));
 	map(0xc098, 0xc09b).rw(m_acia1, FUNC(mos6551_device::read), FUNC(mos6551_device::write));
-	map(0xc0a8, 0xc0ab).rw(IIC_ACIA2_TAG, FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+	map(0xc0a8, 0xc0ab).rw(m_acia2, FUNC(mos6551_device::read), FUNC(mos6551_device::write));
 	map(0xc100, 0xc2ff).m(m_c100bank, FUNC(address_map_bank_device::amap8));
 	map(0xc300, 0xc3ff).m(m_c300bank, FUNC(address_map_bank_device::amap8));
 	map(0xc400, 0xc7ff).m(m_c400bank, FUNC(address_map_bank_device::amap8));
@@ -3119,7 +3120,7 @@
 	map(0xc000, 0xc07f).rw(FUNC(apple2e_state::c000_iic_r), FUNC(apple2e_state::c000_iic_w));
 	map(0xc080, 0xc0ff).rw(FUNC(apple2e_state::c080_r), FUNC(apple2e_state::c080_w));
 	map(0xc098, 0xc09b).rw(m_acia1, FUNC(mos6551_device::read), FUNC(mos6551_device::write));
-	map(0xc0a8, 0xc0ab).rw(IIC_ACIA2_TAG, FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+	map(0xc0a8, 0xc0ab).rw(m_acia2, FUNC(mos6551_device::read), FUNC(mos6551_device::write));
 	map(0xc0c0, 0xc0c3).rw(FUNC(apple2e_state::memexp_r), FUNC(apple2e_state::memexp_w));
 	map(0xc100, 0xc2ff).m(m_c100bank, FUNC(address_map_bank_device::amap8));
 	map(0xc300, 0xc3ff).m(m_c300bank, FUNC(address_map_bank_device::amap8));
@@ -3352,11 +3353,12 @@
 
 static INPUT_PORTS_START( apple2_sysconfig )
 	PORT_START("a2_config")
-	PORT_CONFNAME(0x03, 0x00, "Composite monitor type")
+	PORT_CONFNAME(0x07, 0x00, "Monitor type")
 	PORT_CONFSETTING(0x00, "Color")
 	PORT_CONFSETTING(0x01, "B&W")
 	PORT_CONFSETTING(0x02, "Green")
 	PORT_CONFSETTING(0x03, "Amber")
+	PORT_CONFSETTING(0x04, "Video-7 RGB")
 
 	PORT_CONFNAME(0x10, 0x00, "CPU type")
 	PORT_CONFSETTING(0x00, "Standard")
@@ -4497,6 +4499,7 @@
 	device.option_add("ceyes2", A2BUS_COMPUTEREYES2); /* ComputerEyes/2 Video Digitizer */
 	device.option_add("applesurance", A2BUS_APPLESURANCE);  /* Applesurance Diagnostic Controller */
 	device.option_add("byte8251", A2BUS_BYTE8251); /* BYTE Magazine 8251 serial card */
+	device.option_add("cmsscsi", A2BUS_CMSSCSI);  /* CMS Apple II SCSI Card */
 }
 
 static void apple2eaux_cards(device_slot_interface &device)
@@ -4623,6 +4626,7 @@
 
 	CASSETTE(config, m_cassette);
 	m_cassette->set_default_state(CASSETTE_STOPPED);
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
 }
 
 void apple2e_state::mprof3(machine_config &config)
@@ -4691,10 +4695,12 @@
 	MOS6551(config, m_acia1, 0);
 	m_acia1->set_xtal(XTAL(14'318'181) / 8); // ~1.789 MHz
 	m_acia1->txd_handler().set(PRINTER_PORT_TAG, FUNC(rs232_port_device::write_txd));
+	m_acia1->irq_handler().set(FUNC(apple2e_state::a2bus_irq_w));
 
 	MOS6551(config, m_acia2, 0);
-	m_acia2->set_xtal(XTAL(1'843'200));   // matches SSC so modem software is compatible
+	m_acia2->set_xtal(1.8432_MHz_XTAL);   // matches SSC so modem software is compatible
 	m_acia2->txd_handler().set("modem", FUNC(rs232_port_device::write_txd));
+	m_acia2->irq_handler().set(FUNC(apple2e_state::a2bus_irq_w));
 
 	rs232_port_device &printer(RS232_PORT(config, PRINTER_PORT_TAG, default_rs232_devices, nullptr));
 	printer.rxd_handler().set(m_acia1, FUNC(mos6551_device::write_rxd));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/apple2gs.cpp mame-0.224+dfsg.1/src/mame/drivers/apple2gs.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/apple2gs.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/apple2gs.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -79,6 +79,7 @@
 #include "bus/a2bus/a2memexp.h"
 #include "bus/a2bus/a2scsi.h"
 #include "bus/a2bus/a2hsscsi.h"
+#include "bus/a2bus/cmsscsi.h"
 #include "bus/a2bus/a2thunderclock.h"
 #include "bus/a2bus/a2softcard.h"
 #include "bus/a2bus/a2videoterm.h"
@@ -106,6 +107,7 @@
 //#include "bus/a2bus/pc_xporter.h"
 #include "bus/a2bus/byte8251.h"
 //#include "bus/a2bus/hostram.h"
+//#include "bus/a2bus/ramfast.h"
 
 #include "bus/a2gameio/gameio.h"
 
@@ -4566,6 +4568,8 @@
 //  device.option_add("pcxport", A2BUS_PCXPORTER); /* Applied Engineering PC Transporter */
 	device.option_add("byte8251", A2BUS_BYTE8251); /* BYTE Magazine 8251 serial card */
 //  device.option_add("hostram", A2BUS_HOSTRAM); /* Slot 7 RAM for GS Plus host protocol */
+//  device.option_add("ramfast", A2BUS_RAMFAST); /* C.V. Technologies RAMFast SCSI card */
+	device.option_add("cmsscsi", A2BUS_CMSSCSI);  /* CMS Apple II SCSI Card */
 }
 
 void apple2gs_state::apple2gs(machine_config &config)
@@ -4615,8 +4619,7 @@
 
 	APPLE2_VIDEO(config, m_video, A2GS_14M).set_screen(m_screen);
 
-	APPLE2_COMMON(config, m_a2common, A2GS_14M);
-	m_a2common->set_GS_cputag(m_maincpu);
+	APPLE2_COMMON(config, m_a2common, A2GS_14M).set_GS_cputag(m_maincpu);
 
 //  APPLE2_HOST(config, m_a2host, A2GS_14M);
 //  m_a2host->set_cputag(m_maincpu);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/apple3.cpp mame-0.224+dfsg.1/src/mame/drivers/apple3.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/apple3.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/apple3.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -26,6 +26,7 @@
 #include "bus/a2bus/a2thunderclock.h"
 #include "bus/a2bus/mouse.h"
 #include "bus/a2bus/a2zipdrive.h"
+#include "bus/a2bus/cmsscsi.h"
 
 #include "bus/rs232/rs232.h"
 
@@ -46,6 +47,7 @@
 	device.option_add("thclock", A2BUS_THUNDERCLOCK);   // ThunderWare ThunderClock Plus - driver assumes slot 2 by default
 	device.option_add("mouse", A2BUS_MOUSE);            // Apple II Mouse Card
 	device.option_add("focusdrive", A2BUS_FOCUSDRIVE);  // Focus Drive IDE card
+	device.option_add("cmsscsi", A2BUS_CMSSCSI);        // CMS Apple II SCSI Card
 }
 
 static void a3_floppies(device_slot_interface &device)
@@ -354,7 +356,11 @@
 
 ROM_START(apple3)
 	ROM_REGION(0x1000,"maincpu",0)
-	ROM_LOAD( "apple3.rom", 0x0000, 0x1000, CRC(55e8eec9) SHA1(579ee4cd2b208d62915a0aa482ddc2744ff5e967))
+	ROM_SYSTEM_BIOS(0, "soshd", "Rob Justice SOSHDBOOT")
+	ROMX_LOAD( "soshdboot.bin", 0x000000, 0x001000, CRC(fd5ac9e2) SHA1(ba466a54ddb7f618c4f18f344754343c5945b417), ROM_BIOS(0))
+
+	ROM_SYSTEM_BIOS(1, "original", "Apple /// boot ROM")
+	ROMX_LOAD( "apple3.rom", 0x0000, 0x1000, CRC(55e8eec9) SHA1(579ee4cd2b208d62915a0aa482ddc2744ff5e967), ROM_BIOS(1))
 ROM_END
 
 /*    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT         COMPANY           FULLNAME */
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/armedf.cpp mame-0.224+dfsg.1/src/mame/drivers/armedf.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/armedf.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/armedf.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1032,13 +1032,13 @@
 	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )        PORT_DIPLOCATION("DSW1:5")
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )        PORT_DIPLOCATION("DSW1:6")
+	PORT_DIPNAME( 0x20, 0x20, "Debug 2 (requires Debug On) (P2 Start skip stage, Invulnerability)" ) PORT_DIPLOCATION("DSW1:6")
 	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Flip_Screen ) )    PORT_DIPLOCATION("DSW1:7")
 	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )        PORT_DIPLOCATION("DSW1:8")
+	PORT_DIPNAME( 0x80, 0x80, "Debug (P1 Start to pause)" ) PORT_DIPLOCATION("DSW1:8")
 	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 INPUT_PORTS_END
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/astrof.cpp mame-0.224+dfsg.1/src/mame/drivers/astrof.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/astrof.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/astrof.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1049,6 +1049,26 @@
 ROM_END
 
 
+ROM_START( astroff )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b.4a",        0xd000, 0x0400, CRC(18bdc2d9) SHA1(1fc93de1212f04f04acc224d91c2308758f5d5ca) )
+	ROM_LOAD( "a.4c",        0xd400, 0x0400, CRC(2344521c) SHA1(7f50890df10219b51bf4cf617e8ffb4336e19ae3) )
+	ROM_LOAD( "9.5a",        0xd800, 0x0400, CRC(9bd0e10d) SHA1(0170f56ce0c7a3827548bdd954acb2c0e4a2cb24) )
+	ROM_LOAD( "8.5c",        0xdc00, 0x0400, CRC(c00d8f28) SHA1(08abc667b2c079bee1242b30545002fa7fea8a72) )
+	ROM_LOAD( "7.4d",        0xe000, 0x0400, CRC(6cd01b9e) SHA1(597db331008a4a561bc8d9bbd42ffde9bcd565dc) )
+	ROM_LOAD( "6.4f",        0xe400, 0x0400, CRC(69cd2604) SHA1(09201ae691330e3bd788f9c714f6dcbb7e8335d0) )
+	ROM_LOAD( "5.5d",        0xe800, 0x0400, CRC(14a4118f) SHA1(d99876f405dd646a7f0e85e584f2509d9cf17372) )
+	ROM_LOAD( "4.5f",        0xec00, 0x0400, CRC(0513bc92) SHA1(dbf774e8353c966c303e02ce8196b888d235bdb2) )
+	ROM_LOAD( "3.4h",        0xf000, 0x0400, CRC(e01713bd) SHA1(e0370a070c727f8f7ff767fdd84f7aeef31c8347) )
+	ROM_LOAD( "2.4k",        0xf400, 0x0400, CRC(24ab94d5) SHA1(1e0a61d83fa67340d4b1477377ed9d65cf826f53) )
+	ROM_LOAD( "1.5h",        0xf800, 0x0400, CRC(142bbc5d) SHA1(55017fd88a19d09943cde16d583db00cf4c3218b) )
+	ROM_LOAD( "0.5k",        0xfc00, 0x0400, CRC(c63a9c80) SHA1(f51694912d823a5ae7883c603915b9c1aa0e0733) )
+
+	ROM_REGION( 0x0020, "proms", 0 )
+	ROM_LOAD( "im5610-82s123.2f",    0x0000, 0x0020, CRC(61329fd1) SHA1(15782d8757d4dda5a8b97815e94c90218f0e08dd) )
+ROM_END
+
+
 ROM_START( abattle )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "10405-b.bin",  0xd000, 0x0400, CRC(9ba57987) SHA1(becf89b7d474f86839f13f9be5502c91491e8584) )
@@ -1386,6 +1406,7 @@
 GAME( 1979, astrof,    0,        astrof,   astrof,    astrof_state, empty_init,    ROT90, "Data East",             "Astro Fighter (set 1)",         MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1979, astrof2,   astrof,   astrof,   astrof,    astrof_state, empty_init,    ROT90, "Data East",             "Astro Fighter (set 2)",         MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1979, astrof3,   astrof,   astrof,   astrof,    astrof_state, empty_init,    ROT90, "Data East",             "Astro Fighter (set 3)",         MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, astroff,   astrof,   astrof,   astrof,    astrof_state, empty_init,    ROT90, "bootleg? (Famaresa)",   "Astro Fighter (set 4)",         MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1979, abattle,   astrof,   abattle,  abattle,   astrof_state, init_abattle,  ROT90, "bootleg? (Sidam)",      "Astro Battle (set 1)",          MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1979, abattle2,  astrof,   abattle,  abattle,   astrof_state, init_abattle,  ROT90, "bootleg? (Sidam)",      "Astro Battle (set 2)",          MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 1979, afire,     astrof,   abattle,  abattle,   astrof_state, init_afire,    ROT90, "bootleg (Rene Pierre)", "Astro Fire",                    MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/atari_s1.cpp mame-0.224+dfsg.1/src/mame/drivers/atari_s1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/atari_s1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/atari_s1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -531,7 +531,16 @@
 	ROM_LOAD("608.bin", 0x7800, 0x0800, CRC(28b92faf) SHA1(8585770f4059049f1dcbc0c6ef5718b6ff1a5431))
 
 	ROM_REGION(0x0200, "proms", 0)
-	ROM_LOAD("82s130.bin", 0x0000, 0x0200, CRC(da1f77b4) SHA1(b21fdc1c6f196c320ec5404013d672c35f95890b))
+	ROM_LOAD("20252-01.bin", 0x0000, 0x0200, CRC(3d44551d) SHA1(926100f8169ab20230ad2168f94e6ad65fb1a7dc))
+ROM_END
+
+ROM_START(mideartha)
+	ROM_REGION(0x10000, "maincpu", 0)
+	ROM_LOAD("20855-01.bin", 0x7000, 0x0800, CRC(4a9d47ca) SHA1(57c4458822109c3ba2fa53ac1c1cd6e169e51b24))
+	ROM_LOAD("20856-01.bin", 0x7800, 0x0800, CRC(8f119e37) SHA1(5a4d63605865f3ceca4c09dbdcd888498c615b89))
+
+	ROM_REGION(0x0200, "proms", 0)
+	ROM_LOAD("20252-01.bin", 0x0000, 0x0200, CRC(3d44551d) SHA1(926100f8169ab20230ad2168f94e6ad65fb1a7dc))
 ROM_END
 
 /*-------------------------------------------------------------------
@@ -547,8 +556,9 @@
 ROM_END
 
 
-GAME( 1976, atarians, 0, atarians, atari_s1, atari_s1_state, empty_init, ROT0, "Atari", "The Atarians",     MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME( 1977, time2000, 0, atari_s1, atari_s1, atari_s1_state, empty_init, ROT0, "Atari", "Time 2000",        MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME( 1977, aavenger, 0, atari_s1, atari_s1, atari_s1_state, empty_init, ROT0, "Atari", "Airborne Avenger", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
-GAME( 1978, midearth, 0, midearth, atari_s1, atari_s1_state, empty_init, ROT0, "Atari", "Middle Earth",     MACHINE_IS_SKELETON_MECHANICAL)
-GAME( 1978, spcrider, 0, atari_s1, atari_s1, atari_s1_state, empty_init, ROT0, "Atari", "Space Riders",     MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME( 1976, atarians,  0,        atarians, atari_s1, atari_s1_state, empty_init, ROT0, "Atari", "The Atarians",             MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME( 1977, time2000,  0,        atari_s1, atari_s1, atari_s1_state, empty_init, ROT0, "Atari", "Time 2000",                MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME( 1977, aavenger,  0,        atari_s1, atari_s1, atari_s1_state, empty_init, ROT0, "Atari", "Airborne Avenger",         MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
+GAME( 1978, midearth,  0,        midearth, atari_s1, atari_s1_state, empty_init, ROT0, "Atari", "Middle Earth",             MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1978, mideartha, midearth, midearth, atari_s1, atari_s1_state, empty_init, ROT0, "Atari", "Middle Earth (alternate)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1978, spcrider,  0,        atari_s1, atari_s1, atari_s1_state, empty_init, ROT0, "Atari", "Space Riders",             MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/atarittl.cpp mame-0.224+dfsg.1/src/mame/drivers/atarittl.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/atarittl.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/atarittl.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -56,12 +56,10 @@
    netlist system per-game:
 
  TM-057 (Stunt Cycle)
-    566    Voltage-Controlled Oscillator
     1N751A Zener Diode
     1N752A Zener Diode
 
  TM-055 (Indy 4)
-    7406  Hex Inverter Buffers/Drivers with O.C. H.V. Outputs (note: Might not be needed, could just clone from 7404)
     7417  Hex Buffers/Drivers
     9301  1-of-10 Decoder
     LM339 Quad Comparator
@@ -72,8 +70,10 @@
 #include "emu.h"
 
 #include "machine/netlist.h"
+#include "netlist/nl_setup.h"
 #include "machine/nl_stuntcyc.h"
 #include "machine/nl_gtrak10.h"
+#include "machine/nl_tank.h"
 #include "netlist/devices/net_lib.h"
 #include "video/fixfreq.h"
 #include "screen.h"
@@ -85,12 +85,12 @@
 #define V_TOTAL         (0x105+1)       // 262
 #define H_TOTAL         (0x1C6+1)       // 454
 
-#define HBSTART                 (H_TOTAL)
-#define HBEND                   (32)
-#define VBSTART                 (V_TOTAL)
-#define VBEND                   (16)
+#define HBSTART         (H_TOTAL)
+#define HBEND           (32)
+#define VBSTART         (V_TOTAL)
+#define VBEND           (16)
 
-#define HRES_MULT                   (1)
+#define HRES_MULT       (1)
 // end
 
 #define SC_VIDCLOCK     (14318000/2)
@@ -101,6 +101,10 @@
 #define SC_VBSTART      (SC_VTOTAL)
 #define SC_VBEND        (8)
 
+#define TANK_VIDCLOCK   (14318181)
+#define TANK_HTOTAL     (952)
+#define TANK_VTOTAL     (262)
+
 #define GTRAK10_VIDCLOCK 14318181
 #define GTRAK10_HTOTAL 451
 #define GTRAK10_VTOTAL 521
@@ -120,16 +124,6 @@
 	required_device<fixedfreq_device> m_video;
 
 	void atarikee(machine_config &config);
-protected:
-
-	// driver_device overrides
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-
-	virtual void video_start() override;
-
-private:
-
 };
 
 class stuntcyc_state : public driver_device
@@ -143,11 +137,23 @@
 	}
 
 	void stuntcyc(machine_config &config);
-protected:
 
-	// driver_device overrides
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
+private:
+	required_device<netlist_mame_device> m_maincpu;
+	required_device<fixedfreq_device> m_video;
+};
+
+class tank_state : public driver_device
+{
+public:
+	tank_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_video(*this, "fixfreq")
+	{
+	}
+
+	void tank(machine_config &config);
 
 private:
 	required_device<netlist_mame_device> m_maincpu;
@@ -182,26 +188,6 @@
 NETLIST_END()
 
 
-void atarikee_state::machine_start()
-{
-}
-
-void atarikee_state::machine_reset()
-{
-}
-
-void atarikee_state::video_start()
-{
-}
-
-void stuntcyc_state::machine_start()
-{
-}
-
-void stuntcyc_state::machine_reset()
-{
-}
-
 void atarikee_state::atarikee(machine_config &config)
 {
 	/* basic machine hardware */
@@ -217,7 +203,6 @@
 	m_video->set_threshold(0.30);
 }
 
-//#define STUNTCYC_NL_CLOCK (14318181*69)
 #define STUNTCYC_NL_CLOCK (SC_HTOTAL*SC_VTOTAL*60*140)
 
 void stuntcyc_state::stuntcyc(machine_config &config)
@@ -241,6 +226,38 @@
 	m_video->set_horz_scale(4);
 }
 
+void tank_state::tank(machine_config &config)
+{
+	/* basic machine hardware */
+	NETLIST_CPU(config, m_maincpu, netlist::config::DEFAULT_CLOCK()).set_source(NETLIST_NAME(tank));
+	NETLIST_ANALOG_OUTPUT(config, "maincpu:vid0", 0).set_params("VIDEO_OUT", "fixfreq", FUNC(fixedfreq_device::update_composite_monochrome));
+	NETLIST_LOGIC_INPUT(config, "maincpu:p1lup",   "P1_LEFT_UP.POS", 0);
+	NETLIST_LOGIC_INPUT(config, "maincpu:p1ldown", "P1_LEFT_DOWN.POS", 0);
+	NETLIST_LOGIC_INPUT(config, "maincpu:p1rup",   "P1_RIGHT_UP.POS", 0);
+	NETLIST_LOGIC_INPUT(config, "maincpu:p1rdown", "P1_RIGHT_DOWN.POS", 0);
+	NETLIST_LOGIC_INPUT(config, "maincpu:p2lup",   "P2_LEFT_UP.POS", 0);
+	NETLIST_LOGIC_INPUT(config, "maincpu:p2ldown", "P2_LEFT_DOWN.POS", 0);
+	NETLIST_LOGIC_INPUT(config, "maincpu:p2rup",   "P2_RIGHT_UP.POS", 0);
+	NETLIST_LOGIC_INPUT(config, "maincpu:p2rdown", "P2_RIGHT_DOWN.POS", 0);
+	NETLIST_LOGIC_INPUT(config, "maincpu:p1fire",  "P1_FIRE.POS", 0);
+	NETLIST_LOGIC_INPUT(config, "maincpu:p2fire",  "P2_FIRE.POS", 0);
+	NETLIST_LOGIC_INPUT(config, "maincpu:coin1",   "COIN1.POS", 0);
+	NETLIST_LOGIC_INPUT(config, "maincpu:coin2",   "COIN2.POS", 0);
+
+	/* video hardware */
+	SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+	FIXFREQ(config, m_video).set_screen("screen");
+	m_video->set_monitor_clock(TANK_VIDCLOCK);
+	//                    Length of active video,   end of front-porch,   end of sync signal,  end of back porch
+	m_video->set_horz_params(776,                   776,                  808,                 904);
+	m_video->set_vert_params(512,                   512,                  520,                 520);
+	m_video->set_fieldcount(2);
+	m_video->set_threshold(1.0);
+	m_video->set_vsync_threshold(0.3);
+	m_video->set_gain(0.47);
+	m_video->set_horz_scale(3);
+}
+
 void gtrak10_state::gtrak10(machine_config &config)
 {
 	/* basic machine hardware */
@@ -286,12 +303,30 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( stuntcyc )
-	PORT_START("IN0") /* fake */
+	PORT_START("IN0")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_COIN1)     NETLIST_LOGIC_PORT_CHANGED("maincpu", "coinsw")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_START1)    NETLIST_LOGIC_PORT_CHANGED("maincpu", "startsw1")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_START2)    NETLIST_LOGIC_PORT_CHANGED("maincpu", "startsw2")
 INPUT_PORTS_END
 
+static INPUT_PORTS_START( tank )
+	PORT_START("IN0")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP )    PORT_2WAY NETLIST_LOGIC_PORT_CHANGED("maincpu", "p1lup")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_DOWN )  PORT_2WAY NETLIST_LOGIC_PORT_CHANGED("maincpu", "p1ldown")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN ) PORT_2WAY NETLIST_LOGIC_PORT_CHANGED("maincpu", "p1rup")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_UP )   PORT_2WAY NETLIST_LOGIC_PORT_CHANGED("maincpu", "p1rdown")
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_UP )    PORT_2WAY PORT_PLAYER(2) NETLIST_LOGIC_PORT_CHANGED("maincpu", "p1lup")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICKLEFT_DOWN )  PORT_2WAY PORT_PLAYER(2) NETLIST_LOGIC_PORT_CHANGED("maincpu", "p1ldown")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_DOWN ) PORT_2WAY PORT_PLAYER(2) NETLIST_LOGIC_PORT_CHANGED("maincpu", "p1rup")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICKRIGHT_UP )   PORT_2WAY PORT_PLAYER(2) NETLIST_LOGIC_PORT_CHANGED("maincpu", "p1rdown")
+
+	PORT_START("IN1")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) NETLIST_LOGIC_PORT_CHANGED("maincpu", "p1fire")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) NETLIST_LOGIC_PORT_CHANGED("maincpu", "p2fire")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_COIN1 ) NETLIST_LOGIC_PORT_CHANGED("maincpu", "coin1")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_COIN2 ) NETLIST_LOGIC_PORT_CHANGED("maincpu", "coin2")
+INPUT_PORTS_END
+
 /***************************************************************************
 
   Game driver(s)
@@ -486,7 +521,7 @@
 	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
 
 	/* The "custom" 24-pin ROM used in Atari/Kee Games "Tank" is known as a MOSTEK MK28000P. */
-	ROM_REGION( 0x0801, "gfx", ROMREGION_ERASE00 )
+	ROM_REGION( 0x0801, "maincpu:gfx", ROMREGION_ERASE00 )
 	ROM_LOAD( "90-2006.k10",  0x0000, 0x0800, CRC(87f5c365) SHA1(bc518a5795ef3ed8a7c0463653d70f60780ddda1) )
 ROM_END
 
@@ -596,7 +631,7 @@
 GAME(1975,  sharkjaw,  0,        atarikee,        0, atarikee_state, empty_init, ROT0,  "Atari/Horror Games",    "Shark JAWS [TTL]",     MACHINE_IS_SKELETON)
 GAME(1975,  steeplec,  0,        atarikee,        0, atarikee_state, empty_init, ROT0,  "Atari",        "Steeplechase [TTL]",     MACHINE_IS_SKELETON)
 GAME(1976,  stuntcyc,  0,        stuntcyc, stuntcyc, stuntcyc_state, empty_init, ROT0,  "Atari",        "Stunt Cycle [TTL]",      MACHINE_IS_SKELETON)
-GAME(1974,  tank,      0,        atarikee,        0, atarikee_state, empty_init, ROT0,  "Atari/Kee",    "Tank/Tank Cocktail [TTL]",     MACHINE_IS_SKELETON)
+GAME(1974,  tank,      0,        tank,         tank, tank_state,     empty_init, ROT0,  "Atari/Kee",    "Tank/Tank Cocktail [TTL]",     MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 GAME(1975,  tankii,    0,        atarikee,        0, atarikee_state, empty_init, ROT0,  "Atari/Kee",    "Tank II [TTL]",          MACHINE_IS_SKELETON)
 
 // MISSING ROM DUMPS
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/atom.cpp mame-0.224+dfsg.1/src/mame/drivers/atom.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/atom.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/atom.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -110,13 +110,16 @@
         * A 5v DC input is added in addition to the standard power in (but this may be a later upgrade),
         * The Utility ROM is labelled P2/FP is installed
 
+    - Cassette UEF not working - all data blocks overwrite each other at 0000 in ram
+
+
 */
 
 #include "emu.h"
 #include "includes/atom.h"
+#include "machine/clock.h"
 #include "formats/imageutl.h"
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
 /***************************************************************************
@@ -150,7 +153,6 @@
 	*/
 
 	uint8_t header[0x16] = { 0 };
-	void *ptr;
 
 	image.fread(header, 0x16);
 
@@ -160,17 +162,28 @@
 
 	if (LOG)
 	{
-		header[16] = 0;
-		logerror("ATM filename: %s\n", header);
+		char pgmname[17];
+		for (u8 i = 0; i < 16; i++)
+			pgmname[i] = header[i];
+		pgmname[16] = 0;
+		logerror("ATM filename: %s\n", pgmname);
 		logerror("ATM start address: %04x\n", start_address);
 		logerror("ATM run address: %04x\n", run_address);
 		logerror("ATM size: %04x\n", size);
 	}
 
-	ptr = m_maincpu->space(AS_PROGRAM).get_write_ptr(start_address);
+	void *ptr = m_maincpu->space(AS_PROGRAM).get_write_ptr(start_address);
 	image.fread(ptr, size);
 
-	m_maincpu->set_pc(run_address);
+	if (run_address == 0xc2b2)
+	{
+		address_space &space = m_maincpu->space(AS_PROGRAM);
+		u16 end_address = start_address + size;
+		space.write_byte(13, end_address);
+		space.write_byte(14, end_address >> 8);
+	}
+	else
+		m_maincpu->set_state_int(M6502_PC, run_address);   // if not basic, autostart program (set_pc doesn't work)
 
 	return image_init_result::PASS;
 }
@@ -233,7 +246,8 @@
 {
 	if (m_e0->exists() && !BIT(m_eprom, 7))
 		return m_e0->read_rom(offset);
-	else if (m_e1->exists() && BIT(m_eprom, 7))
+	else
+	if (m_e1->exists() && BIT(m_eprom, 7))
 		return m_e1->read_rom(offset);
 	else
 		return 0xff;
@@ -250,17 +264,15 @@
 
 void atom_state::atom_mem(address_map &map)
 {
-	map(0x0000, 0x09ff).ram();
+	map(0x0000, 0x9fff).ram();
 	map(0x0a00, 0x0a03).mirror(0x1f8).m(m_fdc, FUNC(i8271_device::map));
 	map(0x0a04, 0x0a04).mirror(0x1f8).rw(m_fdc, FUNC(i8271_device::data_r), FUNC(i8271_device::data_w));
-	map(0x0a05, 0x7fff).ram();
-	map(0x8000, 0x97ff).ram().share("video_ram");
-	map(0x9800, 0x9fff).ram();
+	map(0x8000, 0x97ff).ram().share("videoram");
 //  map(0xa000, 0xafff)        // mapped by the cartslot
-	map(0xb000, 0xb003).mirror(0x3fc).rw(INS8255_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0xb000, 0xb003).mirror(0x3fc).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
 //  map(0xb400, 0xb403).rw(MC6854_TAG, FUNC(mc6854_device::read), FUNC(mc6854_device::write));
 //  map(0xb404, 0xb404).portr("ECONET");
-	map(0xb800, 0xb80f).mirror(0x3f0).m(R6522_TAG, FUNC(via6522_device::map));
+	map(0xb800, 0xb80f).mirror(0x3f0).m(m_via, FUNC(via6522_device::map));
 	map(0xc000, 0xffff).rom().region(SY6502_TAG, 0);
 }
 
@@ -283,9 +295,9 @@
 void atom_state::atombb_mem(address_map &map)
 {
 	map(0x0000, 0x3fff).ram();
-	map(0x4000, 0x57ff).ram().share("video_ram");
-	map(0x7000, 0x7003).mirror(0x3fc).rw(INS8255_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0x7800, 0x780f).mirror(0x3f0).m(R6522_TAG, FUNC(via6522_device::map));
+	map(0x4000, 0x57ff).ram().share("videoram");
+	map(0x7000, 0x7003).mirror(0x3fc).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0x7800, 0x780f).mirror(0x3f0).m(m_via, FUNC(via6522_device::map));
 	map(0x8000, 0xbfff).rom().region("basic", 0);
 	map(0xf000, 0xffff).rom().region(SY6502_TAG, 0);
 }
@@ -296,13 +308,11 @@
 
 void atom_state::prophet_mem(address_map &map)
 {
-	map(0x0000, 0x09ff).ram();
-	map(0x0a00, 0x7fff).ram();
-	map(0x8000, 0x97ff).ram().share("video_ram");
-	map(0x9800, 0x9fff).ram();
+	map(0x0000, 0x9fff).ram();
+	map(0x8000, 0x97ff).ram().share("videoram");
 	map(0xa000, 0xafff).rom().region("ic24", 0);
-	map(0xb000, 0xb003).mirror(0x3fc).rw(INS8255_TAG, FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0xb800, 0xb80f).mirror(0x3f0).m(R6522_TAG, FUNC(via6522_device::map));
+	map(0xb000, 0xb003).mirror(0x3fc).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0xb800, 0xb80f).mirror(0x3f0).m(m_via, FUNC(via6522_device::map));
 	map(0xc000, 0xffff).rom().region(SY6502_TAG, 0);
 }
 
@@ -316,7 +326,12 @@
 
 INPUT_CHANGED_MEMBER( atom_state::trigger_reset )
 {
-	m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? CLEAR_LINE : ASSERT_LINE);
+	if (newval)
+	{
+		m_ppi->reset();
+		m_via->reset();
+		m_maincpu->reset();
+	}
 }
 
 /*-------------------------------------------------
@@ -331,8 +346,6 @@
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_G)          PORT_CHAR('g') PORT_CHAR('G')
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_Q)          PORT_CHAR('q') PORT_CHAR('Q')
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("ESC")          PORT_CODE(KEYCODE_TILDE)      PORT_CHAR(UCHAR_MAMEKEY(ESC))
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("Y1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -341,8 +354,6 @@
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_F)          PORT_CHAR('f') PORT_CHAR('F')
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_P)          PORT_CHAR('p') PORT_CHAR('P')
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_Z)          PORT_CHAR('z') PORT_CHAR('Z')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("Y2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("\xE2\x87\x95") PORT_CODE(KEYCODE_UP)         PORT_CHAR(UCHAR_MAMEKEY(UP)) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
@@ -351,8 +362,6 @@
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_E)          PORT_CHAR('e') PORT_CHAR('E')
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_O)          PORT_CHAR('o') PORT_CHAR('O')
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_Y)          PORT_CHAR('y') PORT_CHAR('Y')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("Y3")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("\xE2\x87\x94") PORT_CODE(KEYCODE_RIGHT)      PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
@@ -361,18 +370,14 @@
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_D)          PORT_CHAR('d') PORT_CHAR('D')
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_N)          PORT_CHAR('n') PORT_CHAR('N')
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_X)          PORT_CHAR('x') PORT_CHAR('X')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("Y4")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LOCK")         PORT_CODE(KEYCODE_CAPSLOCK)   PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_TOGGLE
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LOCK")         PORT_CODE(KEYCODE_CAPSLOCK)   PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("DELETE")       PORT_CODE(KEYCODE_DEL)        PORT_CHAR(8)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_9)          PORT_CHAR('9') PORT_CHAR(')')
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_C)          PORT_CHAR('c') PORT_CHAR('C')
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_M)          PORT_CHAR('m') PORT_CHAR('M')
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_W)          PORT_CHAR('w') PORT_CHAR('W')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("Y5")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME(UTF8_UP) PORT_CODE(KEYCODE_BACKSPACE)  PORT_CHAR('^')
@@ -381,8 +386,6 @@
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_B)          PORT_CHAR('b') PORT_CHAR('B')
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_L)          PORT_CHAR('l') PORT_CHAR('L')
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_V)          PORT_CHAR('v') PORT_CHAR('V')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("Y6")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_BACKSLASH)  PORT_CHAR(']')
@@ -391,8 +394,6 @@
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_A)          PORT_CHAR('a') PORT_CHAR('A')
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_K)          PORT_CHAR('k') PORT_CHAR('K')
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_U)          PORT_CHAR('u') PORT_CHAR('U')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("Y7")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('\\')
@@ -401,8 +402,6 @@
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR('@')
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_J)          PORT_CHAR('j') PORT_CHAR('J')
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_T)          PORT_CHAR('t') PORT_CHAR('T')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("Y8")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR('[')
@@ -411,8 +410,6 @@
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('/') PORT_CHAR('?')
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_I)          PORT_CHAR('i') PORT_CHAR('I')
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_S)          PORT_CHAR('s') PORT_CHAR('S')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("Y9")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("SPACE")        PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(32)
@@ -421,21 +418,13 @@
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_STOP)       PORT_CHAR('.') PORT_CHAR('>')
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_H)          PORT_CHAR('h') PORT_CHAR('H')
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD )                           PORT_CODE(KEYCODE_R)          PORT_CHAR('r') PORT_CHAR('R')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("Y10")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("CTRL")         PORT_CODE(KEYCODE_LCONTROL)   PORT_CHAR(UCHAR_MAMEKEY(LCONTROL))
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("SHIFT")        PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT)     PORT_CHAR(UCHAR_SHIFT_1)
 
-	PORT_START("RPT")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("REPT")         PORT_CODE(KEYCODE_RCONTROL)   PORT_CHAR(UCHAR_MAMEKEY(RCONTROL))
+	PORT_START("Y11")
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("REPT")         PORT_CODE(KEYCODE_RCONTROL)   PORT_CHAR(UCHAR_MAMEKEY(RCONTROL))
 
 	PORT_START("BRK")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("BREAK")        PORT_CODE(KEYCODE_ESC)   PORT_CHAR(UCHAR_MAMEKEY(ESC)) PORT_CHANGED_MEMBER(DEVICE_SELF, atom_state, trigger_reset, 0)
@@ -496,23 +485,12 @@
 
 	*/
 
-	uint8_t data = 0xff;
+	uint8_t data = 0x3f;
 
-	switch (m_keylatch)
-	{
-	case 0: data &= m_y0->read(); break;
-	case 1: data &= m_y1->read(); break;
-	case 2: data &= m_y2->read(); break;
-	case 3: data &= m_y3->read(); break;
-	case 4: data &= m_y4->read(); break;
-	case 5: data &= m_y5->read(); break;
-	case 6: data &= m_y6->read(); break;
-	case 7: data &= m_y7->read(); break;
-	case 8: data &= m_y8->read(); break;
-	case 9: data &= m_y9->read(); break;
-	}
+	if (m_keylatch < 10)
+		data = m_io_keyboard[m_keylatch]->read();
 
-	data &= m_y10->read();
+	data |= m_io_keyboard[10]->read();
 
 	return data;
 }
@@ -534,19 +512,17 @@
 
 	*/
 
-	uint8_t data = 0;
-
 	/* 2400 Hz input */
-	data |= m_hz2400 << 4;
+	u8 data = m_hz2400 ? 0x10 : 0;
 
 	/* cassette input */
-	data |= (m_cassette->input() > 0.0) << 5;
+	data |= (m_cassette->input() > 0.02) << 5;
 
 	/* keyboard RPT */
-	data |= BIT(m_rpt->read(), 0) << 6;
+	data |= m_io_keyboard[11]->read();
 
 	/* MC6847 FS */
-	data |= (m_vdg->fs_r() ? 1 : 0) << 7;
+	data |= m_vdg->fs_r() ? 0x80 : 0;
 
 	return data;
 }
@@ -591,7 +567,7 @@
 	is cleared this will not cause another nmi */
 	/* I'll emulate it like this to be sure */
 
-	if (state!=m_previous_i8271_int_state)
+	if (state != m_previous_i8271_int_state)
 	{
 		if (state)
 		{
@@ -606,23 +582,23 @@
 
 WRITE_LINE_MEMBER( atom_state::motor_w )
 {
-	for (int i=0; i != 2; i++) {
+	for (u8 i = 0; i < 2; i++)
+	{
 		char devname[8];
 		sprintf(devname, "%d", i);
 		floppy_connector *con = m_fdc->subdevice<floppy_connector>(devname);
-		if (con) {
+		if (con)
 			con->get_device()->mon_w(!state);
-		}
 	}
 }
 
-TIMER_DEVICE_CALLBACK_MEMBER(atom_state::cassette_output_tick)
+WRITE_LINE_MEMBER(atom_state::cassette_output_tick)
 {
-	int level = !(!(!m_hz2400 && m_pc1) && m_pc0);
+	m_hz2400 = state;
 
-	m_cassette->output(level ? -1.0 : +1.0);
+	bool level = m_pc0 && !(m_pc1 && !m_hz2400);
 
-	m_hz2400 = !m_hz2400;
+	m_cassette->output(level ? -1.0 : +1.0);
 }
 
 /*-------------------------------------------------
@@ -633,11 +609,11 @@
 {
 	if (offset == ~0) return 0xff;
 
-	m_vdg->as_w(BIT(m_video_ram[offset], 6));
-	m_vdg->intext_w(BIT(m_video_ram[offset], 6));
-	m_vdg->inv_w(BIT(m_video_ram[offset], 7));
+	m_vdg->as_w(BIT(m_vram[offset], 6));
+	m_vdg->intext_w(BIT(m_vram[offset], 6));
+	m_vdg->inv_w(BIT(m_vram[offset], 7));
 
-	return m_video_ram[offset];
+	return m_vram[offset];
 }
 
 /***************************************************************************
@@ -664,6 +640,12 @@
 
 	if (m_cart.found() && m_cart->exists())
 		m_maincpu->space(AS_PROGRAM).install_read_handler(0xa000, 0xafff, read8sm_delegate(*m_cart, FUNC(generic_slot_device::read_rom)));
+
+	save_item(NAME(m_keylatch));
+	save_item(NAME(m_hz2400));
+	save_item(NAME(m_pc0));
+	save_item(NAME(m_pc1));
+	save_item(NAME(m_previous_i8271_int_state));
 }
 
 /*-------------------------------------------------
@@ -673,6 +655,22 @@
 void atomeb_state::machine_start()
 {
 	atom_state::machine_start();
+	save_item(NAME(m_eprom));
+}
+
+void atom_state::machine_reset()
+{
+	m_keylatch = 0;
+	m_hz2400 = 0;
+	m_pc0 = 0;
+	m_pc1 = 0;
+	m_previous_i8271_int_state = 0;
+}
+
+void atomeb_state::machine_reset()
+{
+	atom_state::machine_reset();
+	m_eprom = 0;
 }
 
 /***************************************************************************
@@ -708,46 +706,40 @@
     MACHINE_DRIVER( atom )
 -------------------------------------------------*/
 
-void atom_state::atom(machine_config &config)
+void atom_state::atom_common(machine_config &config)
 {
 	/* basic machine hardware */
 	M6502(config, m_maincpu, X2/4);
-	m_maincpu->set_addrmap(AS_PROGRAM, &atom_state::atom_mem);
 
 	/* video hardware */
-	SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER);
+	SCREEN(config, "screen", SCREEN_TYPE_RASTER);
 
 	MC6847_PAL(config, m_vdg, XTAL(4'433'619));
 	m_vdg->input_callback().set(FUNC(atom_state::vdg_videoram_r));
-	m_vdg->set_screen(SCREEN_TAG);
+	m_vdg->set_screen("screen");
 
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
 	SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 1.00);
 
 	/* devices */
-	TIMER(config, "hz2400").configure_periodic(FUNC(atom_state::cassette_output_tick), attotime::from_hz(4806));
+	clock_device &cass_clock(CLOCK(config, "cass_clock", X2/16/13/8));
+	cass_clock.signal_handler().set(FUNC(atom_state::cassette_output_tick));  // 2403.846Hz
 
-	via6522_device &via(VIA6522(config, R6522_TAG, X2/4));
-	via.writepa_handler().set("cent_data_out", FUNC(output_latch_device::write));
-	via.ca2_handler().set(m_centronics, FUNC(centronics_device::write_strobe));
-	via.irq_handler().set_inputline(SY6502_TAG, M6502_IRQ_LINE);
-
-	i8255_device &ppi(I8255(config, INS8255_TAG));
-	ppi.out_pa_callback().set(FUNC(atom_state::ppi_pa_w));
-	ppi.in_pb_callback().set(FUNC(atom_state::ppi_pb_r));
-	ppi.in_pc_callback().set(FUNC(atom_state::ppi_pc_r));
-	ppi.out_pc_callback().set(FUNC(atom_state::ppi_pc_w));
-
-	I8271(config, m_fdc, 0);
-	m_fdc->intrq_wr_callback().set(FUNC(atom_state::atom_8271_interrupt_callback));
-	m_fdc->hdl_wr_callback().set(FUNC(atom_state::motor_w));
-	FLOPPY_CONNECTOR(config, I8271_TAG ":0", atom_floppies, "525sssd", atom_state::floppy_formats).enable_sound(true);
-	FLOPPY_CONNECTOR(config, I8271_TAG ":1", atom_floppies, "525sssd", atom_state::floppy_formats).enable_sound(true);
+	VIA6522(config, m_via, X2/4);
+	m_via->writepa_handler().set("cent_data_out", FUNC(output_latch_device::write));
+	m_via->ca2_handler().set(m_centronics, FUNC(centronics_device::write_strobe));
+	m_via->irq_handler().set_inputline(SY6502_TAG, M6502_IRQ_LINE);
+
+	I8255(config, m_ppi);
+	m_ppi->out_pa_callback().set(FUNC(atom_state::ppi_pa_w));
+	m_ppi->in_pb_callback().set(FUNC(atom_state::ppi_pb_r));
+	m_ppi->in_pc_callback().set(FUNC(atom_state::ppi_pc_r));
+	m_ppi->out_pc_callback().set(FUNC(atom_state::ppi_pc_w));
 
 	CENTRONICS(config, m_centronics, centronics_devices, "printer");
-	m_centronics->ack_handler().set(R6522_TAG, FUNC(via6522_device::write_ca1));
-	m_centronics->busy_handler().set(R6522_TAG, FUNC(via6522_device::write_pa7));
+	m_centronics->ack_handler().set(m_via, FUNC(via6522_device::write_ca1));
+	m_centronics->busy_handler().set(m_via, FUNC(via6522_device::write_pa7));
 
 	output_latch_device &cent_data_out(OUTPUT_LATCH(config, "cent_data_out"));
 	m_centronics->set_output_latch(cent_data_out);
@@ -757,8 +749,20 @@
 	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
 	m_cassette->set_formats(atom_cassette_formats);
 	m_cassette->set_interface("atom_cass");
+}
+
+void atom_state::atom(machine_config &config)
+{
+	atom_common(config);
+	m_maincpu->set_addrmap(AS_PROGRAM, &atom_state::atom_mem);
+
+	I8271(config, m_fdc, 0);
+	m_fdc->intrq_wr_callback().set(FUNC(atom_state::atom_8271_interrupt_callback));
+	m_fdc->hdl_wr_callback().set(FUNC(atom_state::motor_w));
+	FLOPPY_CONNECTOR(config, I8271_TAG ":0", atom_floppies, "525sssd", atom_state::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, I8271_TAG ":1", atom_floppies, "525sssd", atom_state::floppy_formats).enable_sound(true);
 
-	QUICKLOAD(config, "quickload", "atm").set_load_callback(FUNC(atom_state::quickload_cb));
+	QUICKLOAD(config, "quickload", "atm", attotime::from_seconds(2)).set_load_callback(FUNC(atom_state::quickload_cb));
 
 	/* utility rom slot */
 	GENERIC_CARTSLOT(config, "cartslot", generic_linear_slot, "atom_cart", "bin,rom").set_device_load(FUNC(atom_state::cart_load));
@@ -777,7 +781,7 @@
 -------------------------------------------------*/
 
 #define ATOM_ROM(_tag, _load) \
-	GENERIC_SOCKET(config, _tag, generic_linear_slot, "atom_cart", "bin,rom").set_device_load(FUNC(atomeb_state::_load)) \
+	GENERIC_SOCKET(config, _tag, generic_linear_slot, "atom_cart", "bin,rom").set_device_load(FUNC(atomeb_state::_load))
 
 void atomeb_state::atomeb(machine_config &config)
 {
@@ -814,46 +818,9 @@
 
 void atom_state::atombb(machine_config &config)
 {
-	/* basic machine hardware */
-	M6502(config, m_maincpu, X2/4);
-	m_maincpu->set_addrmap(AS_PROGRAM, &atom_state::atombb_mem);
-
-	/* video hardware */
-	SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER);
-
-	MC6847_PAL(config, m_vdg, XTAL(4'433'619));
-	m_vdg->input_callback().set(FUNC(atom_state::vdg_videoram_r));
-	m_vdg->set_screen(SCREEN_TAG);
+	atom_common(config);
 
-	/* sound hardware */
-	SPEAKER(config, "mono").front_center();
-	SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 1.00);
-
-	/* devices */
-	TIMER(config, "hz2400").configure_periodic(FUNC(atom_state::cassette_output_tick), attotime::from_hz(4806));
-
-	via6522_device &via(VIA6522(config, R6522_TAG, X2/4));
-	via.writepa_handler().set("cent_data_out", FUNC(output_latch_device::write));
-	via.ca2_handler().set(m_centronics, FUNC(centronics_device::write_strobe));
-	via.irq_handler().set_inputline(SY6502_TAG, M6502_IRQ_LINE);
-
-	i8255_device &ppi(I8255(config, INS8255_TAG));
-	ppi.out_pa_callback().set(FUNC(atom_state::ppi_pa_w));
-	ppi.in_pb_callback().set(FUNC(atom_state::ppi_pb_r));
-	ppi.in_pc_callback().set(FUNC(atom_state::ppi_pc_r));
-	ppi.out_pc_callback().set(FUNC(atom_state::ppi_pc_w));
-
-	CENTRONICS(config, m_centronics, centronics_devices, "printer");
-	m_centronics->ack_handler().set(R6522_TAG, FUNC(via6522_device::write_ca1));
-	m_centronics->busy_handler().set(R6522_TAG, FUNC(via6522_device::write_pa7));
-
-	output_latch_device &cent_data_out(OUTPUT_LATCH(config, "cent_data_out"));
-	m_centronics->set_output_latch(cent_data_out);
-
-	CASSETTE(config, m_cassette);
-	m_cassette->set_formats(atom_cassette_formats);
-	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
-	m_cassette->set_interface("atom_cass");
+	m_maincpu->set_addrmap(AS_PROGRAM, &atom_state::atombb_mem);
 
 	/* internal ram */
 	RAM(config, RAM_TAG).set_default_size("16K").set_extra_options("8K,12K");
@@ -972,9 +939,9 @@
 ***************************************************************************/
 
 /*    YEAR  NAME      PARENT  COMPAT  MACHINE   INPUT  CLASS          INIT         COMPANY          FULLNAME               FLAGS */
-COMP( 1979, atom,     0,      0,      atom,     atom,  atom_state,    empty_init,  "Acorn",         "Atom",                0)
-COMP( 1979, atomeb,   atom,   0,      atomeb,   atom,  atomeb_state,  empty_init,  "Acorn",         "Atom with Eprom Box", 0)
-COMP( 1982, atombb,   atom,   0,      atombb,   atom,  atom_state,    empty_init,  "Acorn",         "Atom with BBC Basic", 0)
-//COMP( 1983, prophet2, atom,   0,      prophet2, atom,  driver_device, empty_init,  "Busicomputers", "Prophet 2",           0)
-//COMP( 1983, prophet3, atom,   0,      prophet3, atom,  driver_device, empty_init,  "Busicomputers", "Prophet 3",           0)
-//COMP( 2011, atommc,   atom,   0,      atommc,   atom,  driver_device, empty_init,  "Acorn",         "Atom with AtoMMC2",   0)
+COMP( 1979, atom,     0,      0,      atom,     atom,  atom_state,    empty_init,  "Acorn",         "Atom",                MACHINE_SUPPORTS_SAVE )
+COMP( 1979, atomeb,   atom,   0,      atomeb,   atom,  atomeb_state,  empty_init,  "Acorn",         "Atom with Eprom Box", MACHINE_SUPPORTS_SAVE )
+COMP( 1982, atombb,   atom,   0,      atombb,   atom,  atom_state,    empty_init,  "Acorn",         "Atom with BBC Basic", MACHINE_SUPPORTS_SAVE )
+//COMP( 1983, prophet2, atom,   0,      prophet2, atom,  driver_device, empty_init,  "Busicomputers", "Prophet 2",           MACHINE_SUPPORTS_SAVE )
+//COMP( 1983, prophet3, atom,   0,      prophet3, atom,  driver_device, empty_init,  "Busicomputers", "Prophet 3",           MACHINE_SUPPORTS_SAVE )
+//COMP( 2011, atommc,   atom,   0,      atommc,   atom,  driver_device, empty_init,  "Acorn",         "Atom with AtoMMC2",   MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/atronic.cpp mame-0.224+dfsg.1/src/mame/drivers/atronic.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/atronic.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/atronic.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -359,7 +359,7 @@
 	required_device<tms34020_device> m_videocpu;
 	required_device<ramdac_device> m_ramdac;
 
-	required_shared_ptr<uint16_t> m_vidram;
+	required_shared_ptr<uint32_t> m_vidram;
 
 	TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg);
 	TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg);
@@ -422,17 +422,19 @@
 
 TMS340X0_SCANLINE_RGB32_CB_MEMBER(atronic_state::scanline_update)
 {
-	uint32_t fulladdr = ((params->rowaddr << 16) | params->coladdr) >> 4;
-	uint16_t* bg0_base = &m_vidram[(fulladdr & 0xffc00)]; // this probably isn't screen ram, but some temp gfx are copied on startup
+	uint32_t fulladdr = ((params->rowaddr << 16) | params->coladdr) >> 5;
+	uint32_t* bg0_base = &m_vidram[(fulladdr & 0x7fe00)]; // this probably isn't screen ram, but some temp gfx are copied on startup
 	uint32_t* dst = &bitmap.pix32(scanline);
-	int coladdr = fulladdr & 0x3ff;
+	int coladdr = fulladdr & 0x1ff;
 	const pen_t *pens = m_palette->pens();
 
-	for (int x = params->heblnk; x < params->hsblnk; x += 2, coladdr++)
+	for (int x = params->heblnk; x < params->hsblnk; x += 4, coladdr++)
 	{
-		uint16_t bg0pix = bg0_base[coladdr & 0x3ff];
-		dst[x + 0] = pens[(bg0pix & 0x00ff)];
-		dst[x + 1] = pens[(bg0pix & 0xff00) >> 8];
+		uint32_t bg0pix = bg0_base[coladdr & 0x1ff];
+		dst[x + 0] = pens[(bg0pix & 0x000000ff)];
+		dst[x + 1] = pens[(bg0pix & 0x0000ff00) >> 8];
+		dst[x + 2] = pens[(bg0pix & 0x00ff0000) >> 16];
+		dst[x + 3] = pens[(bg0pix & 0xff000000) >> 24];
 	}
 }
 
@@ -440,9 +442,9 @@
 {
 	map(0x00000000, 0x01ffffff).ram().share("vidram");
 
-	map(0xa0000010, 0xa000001f).w(m_ramdac, FUNC(ramdac_device::index_w)).umask16(0x00ff);
-	map(0xa0000020, 0xa000002f).w(m_ramdac, FUNC(ramdac_device::pal_w)).umask16(0x00ff);
-	map(0xa0000030, 0xa000003f).w(m_ramdac, FUNC(ramdac_device::mask_w)).umask16(0x00ff);
+	map(0xa0000000, 0xa000001f).w(m_ramdac, FUNC(ramdac_device::index_w)).umask32(0x00ff0000);
+	map(0xa0000020, 0xa000003f).w(m_ramdac, FUNC(ramdac_device::pal_w)).umask32(0x000000ff);
+	map(0xa0000020, 0xa000003f).w(m_ramdac, FUNC(ramdac_device::mask_w)).umask32(0x00ff0000);
 
 	map(0xfc000000, 0xffffffff).rom().region("user1", 0);
 }
@@ -503,7 +505,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "atronic u6.bin", 0x0000, 0x020000, CRC(9742b2d8) SHA1(9f5851c78f92055730b834de18f8dc7bd9b29a37) )
 
-	ROM_REGION16_LE( 0x800000, "user1", ROMREGION_ERASE00 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", ROMREGION_ERASE00 ) /* TMS34020APCM-40 code (34020) */
 	ROM_REGION( 0x400000, "u18u21",ROMREGION_ERASE00 ) // sound
 	ROM_REGION( 0x400000, "pals",ROMREGION_ERASE00 ) // pal (converted from JED)
 
@@ -518,7 +520,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "atronic u6 std.bin", 0x0000, 0x020000, CRC(9ef7ae79) SHA1(3ed0ea056b23cee8829421c2369ff869b370ee80) )
 
-	ROM_REGION16_LE( 0x800000, "user1", ROMREGION_ERASE00 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", ROMREGION_ERASE00 ) /* TMS34020APCM-40 code (34020) */
 	ROM_REGION( 0x400000, "u18u21",ROMREGION_ERASE00 ) // sound
 	ROM_REGION( 0x400000, "pals",ROMREGION_ERASE00 ) // pal (converted from JED)
 ROM_END
@@ -532,7 +534,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "u6.1 atla01-a-zb-std-5-xx-xx-axx", 0x0000, 0x020000, CRC(5d09a4bf) SHA1(94aea5396a968ff659ac9e2f4879262c55eba2fe) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9.8 atla01-a-e-std-5",  0x000000, 0x100000, CRC(7f8210fa) SHA1(f71faee0d606c6aa06287f6ea31f41727e2a22d9) )
 	ROM_LOAD32_BYTE( "u11.8 atla01-a-e-std-5", 0x000001, 0x100000, CRC(af648717) SHA1(8ab57dc9962ed47a8beb03dcfc686c57de326793) )
 	ROM_LOAD32_BYTE( "u13.8 atla01-a-e-std-5", 0x000002, 0x100000, CRC(6e89bf2b) SHA1(0c3346a5da6c67bf2ef38cf657860dccb03a0461) )
@@ -560,7 +562,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "u6.1 atla01-a-zb-std-5-xx-xx-axx", 0x0000, 0x020000, CRC(5d09a4bf) SHA1(94aea5396a968ff659ac9e2f4879262c55eba2fe) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9-80.bin",  0x000000, 0x100000, CRC(1c51f9e1) SHA1(9300c80409f28ba55b94b93a3359fac732262b27) )
 	ROM_LOAD32_BYTE( "u11-80.bin", 0x000001, 0x100000, CRC(b2b1f41f) SHA1(7551c7acc5c6c26b672e4a42d847ec9af79b50fe) )
 	ROM_LOAD32_BYTE( "u13-80.bin", 0x000002, 0x100000, CRC(515820fa) SHA1(2f5def7145b45f8cd63d5463880a548e58e2b2d3) )
@@ -589,7 +591,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "u6-10.bin", 0x0000, 0x020000, CRC(8b0ccfd2) SHA1(abdc59ebddc9e4fc3aa5b723a746de1419f7d6e7) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9-80.bin",  0x000000, 0x100000, CRC(1a5d8a4f) SHA1(ff8160f000ecb032831ef4320b686fdd37c19bc9) )
 	ROM_LOAD32_BYTE( "u11-80.bin", 0x000001, 0x100000, CRC(713e18c9) SHA1(eb14213101c3ee09601bf01000631c3a2509e876) )
 	ROM_LOAD32_BYTE( "u13-80.bin", 0x000002, 0x100000, CRC(dfbc8c2f) SHA1(1ae2dcd572fa5fc31be5cdb7d6de2bced06ff94e) )
@@ -614,7 +616,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "u6.bin", 0x0000, 0x020000, CRC(63690e7e) SHA1(9dcb3d64bae03556875185ead23d9b911773f5bd) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9.bin",  0x000000, 0x100000, CRC(d1c2ad08) SHA1(e53c7e91b2ab86e64f4ae753404aa86ae881becf) )
 	ROM_LOAD32_BYTE( "u11.bin", 0x000001, 0x100000, CRC(42872aef) SHA1(54d7cf6a9f3d5d8b2b14fa381fd7b9db974525e1) )
 	ROM_LOAD32_BYTE( "u13.bin", 0x000002, 0x100000, CRC(7da9415b) SHA1(aaa73465417dcf92838021b37cb412d52ccb4d85) )
@@ -639,7 +641,7 @@
 	ROM_LOAD( "u6-10.bin", 0x0000, 0x020000, CRC(0db0531d) SHA1(391e41b2dcd38669dcc24e938e9838feee972559) )
 	ROM_LOAD( "u6low-10.bin", 0x0000, 0x020000, CRC(3cbad206) SHA1(d2a468d5bfd441b74ef85be088873d1f74d5c66e) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9-80.bin",  0x000000, 0x100000, CRC(37b3a499) SHA1(eb3252185596dd513d3cce95f3425241ca8513ab) )
 	ROM_LOAD32_BYTE( "u11-80.bin", 0x000001, 0x100000, CRC(d98b2b1d) SHA1(414d300d113e9737d63efea09b358aeb8eeed7fc) )
 	ROM_LOAD32_BYTE( "u13-80.bin", 0x000002, 0x100000, CRC(478bb4a5) SHA1(94304fe1477bfc66e8dcf2c2c91226754cb8c32a) )
@@ -664,7 +666,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "u6-10.bin", 0x0000, 0x020000, CRC(3cbad206) SHA1(d2a468d5bfd441b74ef85be088873d1f74d5c66e) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9-80.bin",  0x000000, 0x100000, CRC(19a47a1b) SHA1(ae9ad2027fddf96062833345a5e2b9e7101b3380) )
 	ROM_LOAD32_BYTE( "u11-80.bin", 0x000001, 0x100000, CRC(7d805f07) SHA1(0bb27a702e45d3d660363ac75c0f52f07248d40a) )
 	ROM_LOAD32_BYTE( "u13-80.bin", 0x000002, 0x100000, CRC(104110dc) SHA1(9322598a94e3c71f546da3b42f137a22fc78a894) )
@@ -689,7 +691,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "u6-10.bin", 0x0000, 0x020000, CRC(bac68023) SHA1(fdc5d540ceb4a2d44013dfd59b46103ec6745dea) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9-80.bin",  0x000000, 0x100000, CRC(1109b7d6) SHA1(c0f6f5d56ee95982688b595894a2985ef53629e7) )
 	ROM_LOAD32_BYTE( "u11-80.bin", 0x000001, 0x100000, CRC(5a1449f6) SHA1(3903858239223c37615f12a8db6a8e873722e34c) )
 	ROM_LOAD32_BYTE( "u13-80.bin", 0x000002, 0x100000, CRC(e1081c7a) SHA1(dd6390d64cda9af93093092361ca24b551d82549) )
@@ -714,7 +716,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "u6-10.bin", 0x0000, 0x020000, CRC(ab86b3d4) SHA1(b0d32887674f971a3ccd482775ec3f978a2ea0c1) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9-80.bin",  0x000000, 0x100000, CRC(8bcbb27f) SHA1(d953268213580af11a2cc0dbd8bf1652f97f3929) )
 	ROM_LOAD32_BYTE( "u11-80.bin", 0x000001, 0x100000, CRC(73fb3169) SHA1(8bbe5d8b8898e2d3368506e7b66d05b8f8ac7d02) )
 	ROM_LOAD32_BYTE( "u13-80.bin", 0x000002, 0x100000, CRC(47580998) SHA1(37a6e409618aa3fe7d24bd3580fa93269895b059) )
@@ -740,7 +742,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "u6-10.bin", 0x0000, 0x020000, CRC(94409a39) SHA1(99af058e48147fc75a8c23e4f1a28484f3d5f625) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9-80.bin",  0x000000, 0x100000, CRC(01e69d2d) SHA1(a6e6974aec52931aeeb1f90d8f917ab85ebe843e) )
 	ROM_LOAD32_BYTE( "u11-80.bin", 0x000001, 0x100000, CRC(6c39a180) SHA1(95f91ec10961d36c86dee5ce42fc7c8ab693e271) )
 	ROM_LOAD32_BYTE( "u13-80.bin", 0x000002, 0x100000, CRC(e60a093f) SHA1(fa0af661f869f80e11097e101ec6100a75d1e63f) )
@@ -765,7 +767,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "u6-10.bin", 0x0000, 0x020000, CRC(5e7d8a05) SHA1(255355cf594c2818d358860e616b5b578a87e974) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9-80.bin",  0x000000, 0x100000, CRC(db77fe46) SHA1(2502c5c165a9720e5ff1196eaa17189281c3145c) )
 	ROM_LOAD32_BYTE( "u11-80.bin", 0x000001, 0x100000, CRC(3a512c6c) SHA1(ba8592773d71e57b3dc6aaff7df1214a57429b10) )
 	ROM_LOAD32_BYTE( "u13-80.bin", 0x000002, 0x100000, CRC(75fadda8) SHA1(5a968f10e582fbe74000f3de33dc1e2d07c3fec1) )
@@ -791,7 +793,7 @@
 	ROM_LOAD( "u6-10.bin", 0x0000, 0x020000, CRC(4d37999a) SHA1(678dc788cfe00ab2599df08941660324793d7f6c) )
 	ROM_LOAD( "sphinx ii.bin", 0x0000, 0x020000, CRC(7fae09a6) SHA1(5c26798337d3691d81f853ee447cb7119fce7b14) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9-80.bin",  0x000000, 0x100000, CRC(c54e4e07) SHA1(1249494773dae044a7bb4381b084e3d2e14367d7) )
 	ROM_LOAD32_BYTE( "u11-80.bin", 0x000001, 0x100000, CRC(5c1e82ab) SHA1(f22ba1dc6799388e855d8f3064b96d568619a75b) )
 	ROM_LOAD32_BYTE( "u13-80.bin", 0x000002, 0x100000, CRC(fb49ae3e) SHA1(bf0cb5815639ebc3db3333249ab2ed81d3bdc684) )
@@ -819,7 +821,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "u06_crp5bs1a.bin", 0x0000, 0x020000, CRC(0db0531d) SHA1(391e41b2dcd38669dcc24e938e9838feee972559) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u09_bep5a01d.bin", 0x000000, 0x100000, CRC(0f4614de) SHA1(2181c552e9a3669fda5e87d0c596d5534d24d4b3) )
 	ROM_LOAD32_BYTE( "u11_bep5a01d.bin", 0x000001, 0x100000, CRC(4f8c6fee) SHA1(2b75fe948bddda899969ef4a7663a52dc7b0eb81) )
 	ROM_LOAD32_BYTE( "u13_bep5a01d.bin", 0x000002, 0x100000, CRC(ca9a24e5) SHA1(67276f680f3aedf480c54c666f0db1110cd77aee) )
@@ -847,7 +849,7 @@
 	ROM_LOAD( "u06_n5b0-a-05-b.648f.bin", 0x0000, 0x020000, CRC(2d2ff35f) SHA1(97759fbad4b6b30ca8f8ea74da74cfaa433a7fa2) )
 	ROM_LOAD( "u06_n5b0-a-06-b.64 56.bin", 0x0000, 0x020000, CRC(7b4a6a97) SHA1(e3d54476730ca34a9f7214219cf991a220e15d5c) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u09_7b88.bin", 0x000000, 0x100000, CRC(8443972b) SHA1(5f2eea84ba18a83502f36eeaa52cff49a1631668) )
 	ROM_LOAD32_BYTE( "u11_1957.bin", 0x000001, 0x100000, CRC(36c7e5c5) SHA1(2bad0bb6b363af6a37f5b11c7ca8b3b674df4072) )
 	ROM_LOAD32_BYTE( "u13_b661.bin", 0x000002, 0x100000, CRC(0e74726c) SHA1(3103d801a622315877fc09d9c99290b54b266885) )
@@ -874,7 +876,7 @@
 	ROM_LOAD( "big blue bags.bin", 0x0000, 0x020000, CRC(4ec3fc1c) SHA1(7a081d370c54a6ea333957958b1341560458e845) )
 	ROM_LOAD( "bbbu01-c-za-std_-5-xx-xx-axx.1mu06.bin", 0x0000, 0x020000, CRC(09e6df0b) SHA1(85961160f95cb8d223f73483d6edad79fa37d729) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "bbbu01-a_-a-std_-5_.8gu09.bin", 0x000000, 0x100000, CRC(6f11b908) SHA1(663382bc295615afbc3a9a39c7089470b8b55926) )
 	ROM_LOAD32_BYTE( "bbbu01-a_-a-std_-5_.8gu11.bin", 0x000001, 0x100000, CRC(4cddcb5a) SHA1(e23354ab36f814b22c39564111558d4935fe8d70) )
 	ROM_LOAD32_BYTE( "bbbu01-a_-a-std_-5_.8gu13.bin", 0x000002, 0x100000, CRC(3a6dd649) SHA1(0f2b6cdf4f10ded99adc4fe0b47e4fada4aa6643) )
@@ -898,7 +900,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "u6.1 c5bo-a-03-a", 0x0000, 0x020000, CRC(3917302a) SHA1(39b0672c36554712825a0e310522933be4b46d84) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9.8 cw5_b-03-b",  0x000000, 0x100000, CRC(c49aaf25) SHA1(5518312046208b4f912e9dee2ff24653a9976c6f) )
 	ROM_LOAD32_BYTE( "u11.8 cw5_b-03-b", 0x000001, 0x100000, CRC(24267b4b) SHA1(9103923dd1bba0b01f6020f7c357ac9b7bef4951) )
 	ROM_LOAD32_BYTE( "u13.8 cw5_b-03-b", 0x000002, 0x100000, CRC(3e606516) SHA1(5edad0a3099700bfeedff5a143591a85b3c4f582) )
@@ -922,7 +924,7 @@
 	ROM_REGION( 0x080000, "u6", 0 ) // config?
 	ROM_LOAD( "u-6 m27c801.bin", 0x0000, 0x080000, CRC(86538b30) SHA1(6b8d732b59af2cc1a6524989f8cf12a4d4dac484) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	// seem to be half size, doesn't have the TMS vectors
 	ROM_LOAD32_BYTE( "u-9 m27c801.bin",  0x000000, 0x080000, BAD_DUMP CRC(4a5efe38) SHA1(23e82eeadccdd0224858686b1d96bd5d184904cb) )
 	ROM_LOAD32_BYTE( "u-11 m27c801.bin", 0x000001, 0x080000, BAD_DUMP CRC(099e27e2) SHA1(4419ac8090ccab673e61f4f73c837971e341e7e2) )
@@ -952,7 +954,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "dasp01-d-za-std_-5-xx-xx-axx.1mu06", 0x0000, 0x020000, CRC(2d5f7976) SHA1(77de321ba2f46726a0c26aa498a4c3deb7f8c421) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "dasp01-a_-c-std_-5_.8gu09", 0x000000, 0x100000, CRC(e6941863) SHA1(c9fe08bd070c9fac7b8c9089a6ecbff581265b3a) )
 	ROM_LOAD32_BYTE( "dasp01-a_-c-std_-5_.8gu11", 0x000001, 0x100000, CRC(400b82ab) SHA1(5af6daf65e50b0c5ad27c43b0f3d4d8d24f38102) )
 	ROM_LOAD32_BYTE( "dasp01-a_-c-std_-5_.8gu13", 0x000002, 0x100000, CRC(b425a8f6) SHA1(82d8e0d8602a81c6d4cf528b73f3c84ab5dde11b) )
@@ -977,7 +979,7 @@
 	ROM_LOAD( "u6-1001", 0x0000, 0x020000, CRC(7a00ad2a) SHA1(67d90b10b4f62922c4ed94bb8a0f77e474ee385d) )
 	ROM_LOAD( "dream maker.bin", 0x0000, 0x020000, CRC(49c19eb3) SHA1(a55d4f9a0dd2b1db41fb28f475efa7e9f7c85be6) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9-801",  0x000000, 0x100000, CRC(e560eeff) SHA1(fe33927a91be7ecd2a283bb09b87f5f3d659cf09) )
 	ROM_LOAD32_BYTE( "u11-801", 0x000001, 0x100000, CRC(693cec8e) SHA1(83d33603fa11aa4341a40b2ffc4862992307dcfc) )
 	ROM_LOAD32_BYTE( "u13-801", 0x000002, 0x100000, CRC(8b78f6aa) SHA1(74804c44124b71f0f11446da342d0548130394f6) )
@@ -1004,7 +1006,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "jujp01-a-za-std_-5_u06.bin", 0x0000, 0x020000, CRC(0f19b0c1) SHA1(c118215bcf502287277c34e6f389af70ab945674) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "jujp01-a_-b-std_-5_u09.bin", 0x000000, 0x100000, CRC(7d3cb293) SHA1(e9f102620f01309327678e115e206fd29dcffde6) )
 	ROM_LOAD32_BYTE( "jujp01-a_-b-std_-5_u11.bin", 0x000001, 0x100000, CRC(d92c0c7e) SHA1(680032b81e76c74539ff56f8c5fc7d4d16fd4793) )
 	ROM_LOAD32_BYTE( "jujp01-a_-b-std_-5_u13.bin", 0x000002, 0x100000, CRC(555ced70) SHA1(1ec115a2e2a1c171070775913a3eb831efc81dab) )
@@ -1030,7 +1032,7 @@
 	ROM_REGION( 0x080000, "u6", 0 ) // config?
 	ROM_LOAD( "mb-u06.bin", 0x0000, 0x080000, CRC(10e3f3f6) SHA1(458f5be7ee01e361b4c31c099fc721521fbe3864) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "gb-u09.bin", 0x000000, 0x100000, CRC(f2d82cee) SHA1(78a15f757bbbb1f4f0a5ab889a9807d886a543a8) )
 	ROM_LOAD32_BYTE( "gb-u11.bin", 0x000001, 0x100000, CRC(3ead238a) SHA1(21956bd6b24e3281db70b6d28d97ee7bbd9ae75f) )
 	ROM_LOAD32_BYTE( "gb-u13.bin", 0x000002, 0x100000, CRC(58c191e6) SHA1(b0f86f407958de2b8e0f5e61288f8b6c7a2c0c2f) )
@@ -1056,7 +1058,7 @@
 	ROM_LOAD( "mb-u6 ebda.bin", 0x0000, 0x020000, CRC(7e73e9c7) SHA1(a8b00af9a3bf936e54391a96777ac78773b3cee0) )
 	ROM_LOAD( "speel master.bin", 0x0000, 0x020000, CRC(04168ab7) SHA1(70a387599bf6629a9a8a6ff38ed0d40e92e54504) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "gb-u9 b408.bin",  0x000000, 0x100000, CRC(e7146c72) SHA1(21b143ae93a73dd59b652a0033ceaa9116575239) )
 	ROM_LOAD32_BYTE( "gb-u11 abf6.bin", 0x000001, 0x100000, CRC(de54f849) SHA1(b628a69c8ad5f81543cd78c458dd9348226114a7) )
 	ROM_LOAD32_BYTE( "gb-u13 6526.bin", 0x000002, 0x100000, CRC(e5744b4f) SHA1(8c36b087dc4fad6cd463abea5b1e7c0bd9c30074) )
@@ -1094,7 +1096,7 @@
 	ROM_LOAD32_BYTE( "t5_d01d.u12", 0x600002, 0x080000, CRC(c2ca0b17) SHA1(cfd553f1943552620f6d324f767fd1f1957e8e25) )
 	ROM_LOAD32_BYTE( "t5_d01d.u14", 0x600003, 0x080000, CRC(0d512057) SHA1(f5f43dad25940193516d467725ecbe1989cc9003) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) - is this an alt set, or a 2nd video board? */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) - is this an alt set, or a 2nd video board? */
 	ROM_LOAD32_BYTE( "u9",  0x400000, 0x080000, CRC(157b9860) SHA1(6e04f035a945a63617e32b196fa0c1b6fd26b281) )
 	ROM_LOAD32_BYTE( "u11", 0x400001, 0x080000, CRC(6aa2cecc) SHA1(7b1d6bb81fed7413f69e926e7cefe1ee171453b4) )
 	ROM_LOAD32_BYTE( "u13", 0x400002, 0x080000, CRC(5c091b7a) SHA1(d1c758a6d155bbc7359f3f46a29bac44d96ec4b1) )
@@ -1127,7 +1129,7 @@
 	ROM_LOAD( "three wishes.bin", 0x0000, 0x020000, CRC(37d85da7) SHA1(64db855e06dab5ea85c669bd72f1e8ee8856607a) )
 	ROM_LOAD( "590a13a.1u6", 0x0000, 0x020000, CRC(3e674907) SHA1(ca933c416764ebf355d8e04f871f8421c9039078) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "tw5b01a.8u9", 0x000000, 0x100000, CRC(2410659a) SHA1(2bcd2539c0e3e7389c27c21e58d9199b9c7c742e) )
 	ROM_LOAD32_BYTE( "tw5b01a.u11", 0x000001, 0x100000, CRC(44ca9ce1) SHA1(b1c6d83f749202c072c6ce99c0470a31cfab8986) )
 	ROM_LOAD32_BYTE( "tw5b01a.u13", 0x000002, 0x100000, CRC(6c60097b) SHA1(f5ddb86b481b7b95d6ec151b37d662b583817813) )
@@ -1156,7 +1158,7 @@
 	ROM_LOAD( "mb-u22-d.bin", 0x000, 0x117, CRC(dc097847) SHA1(305294284d0ffd578f9115b836ef1f9e906c1599) )
 	ROM_LOAD( "mb-u32-b.bin", 0x000, 0x117, CRC(78a9310b) SHA1(deb84d96b0411b05c54fb2c998bed020a37d5005) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u8.bin",  0x600000, 0x080000, CRC(4acafd98) SHA1(d516c55ddce1470e4e19725b6d7dfd5f70ba1129) )
 	ROM_LOAD32_BYTE( "u10.bin", 0x600001, 0x080000, CRC(804800be) SHA1(5fb2a5479c2a7073c2abd40e14a162fbf783eb70) )
 	ROM_LOAD32_BYTE( "u12.bin", 0x600002, 0x080000, CRC(0845ff27) SHA1(5012569a79c9fcbee178a0cee45d25769a1cf9be) )
@@ -1177,7 +1179,7 @@
 	ROM_LOAD( "mb-u32-d.bin", 0x000, 0x2e5, CRC(996854bc) SHA1(647d2f49b739f7ca55c0b85290b6a21256834fd8) )
 	ROM_LOAD( "mb-u35-65994077_icm-s.bin", 0x000, 0x2e5, CRC(996854bc) SHA1(647d2f49b739f7ca55c0b85290b6a21256834fd8) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "gb-u9.bin",  0x000000, 0x100000, CRC(eff83f95) SHA1(743f2fb0dd84a83387919db70175aa62f5f6f858) )
 	ROM_LOAD32_BYTE( "gb-u11.bin", 0x000001, 0x100000, CRC(3fc27ae9) SHA1(896da175c11b48fb28dbb0678849b8f167cf5f6e) )
 	ROM_LOAD32_BYTE( "gb-u13.bin", 0x000002, 0x100000, CRC(6ad50f67) SHA1(b32781f06acc3e9929467d6d1212cf0dc757e5b3) )
@@ -1210,7 +1212,7 @@
 	ROM_LOAD( "u6-b.bin", 0x000, 0x117, CRC(2750fb0a) SHA1(3814c4755a215073425a9d6bb048315498962c76) )
 	ROM_LOAD( "u7-a.bin", 0x000, 0x117, CRC(adcb2789) SHA1(cc2ebd69abec73d66665faaec19b8706e539b34c) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	ROM_LOAD32_BYTE( "u9.bin",  0x400000, 0x080000, CRC(5b8450f1) SHA1(27fc771c3fb824cdb845237324984778fcd0a737) )
 	ROM_LOAD32_BYTE( "u11.bin", 0x400001, 0x080000, CRC(c8c52bd1) SHA1(081b8b4c46f18d030329bf519a8ed50385f7c062) )
 	ROM_LOAD32_BYTE( "u13.bin", 0x400002, 0x080000, CRC(23164a85) SHA1(e6de6aac28f1dac9ea908aaab9760b56ded1bb91) )
@@ -1231,7 +1233,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "bigc21-d-zf-std_-5-xx-xx-axx.1mu06", 0x0000, 0x020000, CRC(0eb376fb) SHA1(34e1f28e71503ffb0e1e922bd3ba17bad0d37d99) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	// not valid TMS code, looks like some x86 drive image split into ROMs?
 	ROM_LOAD( "bigc01-a_-f-rus_-5_-g101.wigu09", 0x000000, 0x100000, CRC(c87e6bb4) SHA1(387e2498625ff718fccaa7701dd595ee787b9a83) )
 	ROM_LOAD( "bigc01-a_-f-rus_-5_-g101.wigu11", 0x100000, 0x100000, CRC(c9e9fa7f) SHA1(1698215845f21cfde0274e880d89c66fb3226f04) )
@@ -1256,7 +1258,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "u6_bene21-e-zg-std_-5-xx-xx-axx_0f78.bin", 0x0000, 0x020000, CRC(d956484f) SHA1(d2d659a4350d7204666234a511ebd4dd7a021d89) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	// not valid TMS code, looks like some x86 drive image split into ROMs?
 	ROM_LOAD( "u09_a632.bin", 0x000000, 0x100000, CRC(a671b6e8) SHA1(86b97ba98fdd09575a371b5b7f7d42bf2916fe17) )
 	ROM_LOAD( "u11_947b.bin", 0x100000, 0x100000, CRC(3dc60963) SHA1(d824cd4fbe4116744727180762fbf0ffe22e6398) )
@@ -1281,7 +1283,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "goci21-e-zf-std_-5-xx-xx-axx.1mu06", 0x0000, 0x020000, CRC(73ab9c41) SHA1(0888923bdaede83f264979c0757894f5cb2e0ec8) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	// not valid TMS code, looks like some x86 drive image split into ROMs?
 	ROM_LOAD( "goci01-a_-c-rus_-5_-g101.wigu09", 0x000000, 0x100000, CRC(72c9b584) SHA1(1345e7ea34a819fbc01b9a64e9f9c1a2de927dda) )
 	ROM_LOAD( "goci01-a_-c-rus_-5_-g101.wigu11", 0x100000, 0x100000, CRC(2ebe1d71) SHA1(1b540c3bb9b232f475c3fe2b56c55f473d8c09ee) )
@@ -1309,7 +1311,7 @@
 	ROM_REGION( 0x020000, "u6", 0 ) // config?
 	ROM_LOAD( "u06_1m_m27c1001-10f_da21h.bin", 0x0000, 0x020000, CRC(51c0a380) SHA1(861c8b4f825f4bc11dd02ac03dcc2cc7e8c65129) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* TMS34020APCM-40 code (34020) */
 	// not valid TMS code, looks like some x86 drive image split into ROMs?
 	ROM_LOAD( "gb_u09_8m_m27c801-100f1_9df6h.bin", 0x000000, 0x100000, CRC(470ccae5) SHA1(0521af7830cc59102edcc658df4d21a3d669d6db) )
 	ROM_LOAD( "gb_u11_8m_m27c801-100f1_7621h.bin", 0x100000, 0x100000, CRC(8f9a1031) SHA1(1aca654b62e73f3005e627625bea2b4198c04a99) )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ave_arb.cpp mame-0.224+dfsg.1/src/mame/drivers/ave_arb.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ave_arb.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ave_arb.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -73,9 +73,9 @@
 	{ }
 
 	// halt button is tied to NMI, reset button to RESET(but only if halt button is held)
-	void update_reset() { m_maincpu->set_input_line(INPUT_LINE_RESET, (m_inputs[1]->read() == 3) ? ASSERT_LINE : CLEAR_LINE); }
 	DECLARE_INPUT_CHANGED_MEMBER(reset_button) { update_reset(); }
 	DECLARE_INPUT_CHANGED_MEMBER(halt_button) { m_maincpu->set_input_line(M6502_NMI_LINE, newval ? ASSERT_LINE : CLEAR_LINE); update_reset(); }
+	void update_reset();
 
 	// machine configs
 	void arb(machine_config &config);
@@ -109,22 +109,15 @@
 	void control_w(u8 data);
 	u8 input_r();
 
-	u16 m_inp_mux;
-	u16 m_led_select;
-	u8 m_led_group;
-	u8 m_led_latch;
-	u16 m_led_data;
+	u16 m_inp_mux = 0;
+	u16 m_led_select = 0;
+	u8 m_led_group = 0;
+	u8 m_led_latch = 0;
+	u16 m_led_data = 0;
 };
 
 void arb_state::machine_start()
 {
-	// zerofill
-	m_inp_mux = 0;
-	m_led_select = 0;
-	m_led_group = 0;
-	m_led_latch = 0;
-	m_led_data = 0;
-
 	// register for savestates
 	save_item(NAME(m_inp_mux));
 	save_item(NAME(m_led_select));
@@ -133,6 +126,16 @@
 	save_item(NAME(m_led_data));
 }
 
+void arb_state::update_reset()
+{
+	bool state = m_inputs[1]->read() == 3;
+
+	// RESET goes to 6502+6522
+	m_maincpu->set_input_line(INPUT_LINE_RESET, state ? ASSERT_LINE : CLEAR_LINE);
+	if (state)
+		m_via->reset();
+}
+
 
 
 /******************************************************************************
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/avrmax.cpp mame-0.224+dfsg.1/src/mame/drivers/avrmax.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/avrmax.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/avrmax.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,235 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+/******************************************************************************
+
+AVR-Max Chess Computer, aka "SHAH"
+In Germany it was named AVR-Max-Schachzwerg
+
+The chess engine is H.G. Muller's micro-Max 4.8, ATMega88 port and prototype
+hardware design by Andre Adrian. PCB finalization by Elektor, published in
+Elektor magazine in 2009.
+
+FN 1 = new game, FN 2 = set level, FN 3 = principle variation.
+Moves are confirmed by pressing GO twice.
+
+Hardware notes:
+- PCB label 081101-1 (c)Elektor v1.4
+- Atmel ATMega88P-20PU @ ~8MHz, 8KB internal ROM
+- 4-digit 7seg display, button panel, no sound
+
+TODO:
+- AVR8 SLEEP opcode is not working, it's used for power-saving here and was
+  harmless to hack out, but needs to be put back when it's emulated
+- add Elektor CC2 version with custom LCD screen
+
+******************************************************************************/
+
+#include "emu.h"
+#include "cpu/avr8/avr8.h"
+#include "video/pwm.h"
+
+// internal artwork
+#include "avrmax.lh" // clickable
+
+
+namespace {
+
+class avrmax_state : public driver_device
+{
+public:
+	avrmax_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu"),
+		m_display(*this, "display"),
+		m_inputs(*this, "IN.%u", 0)
+	{ }
+
+	void avrmax(machine_config &config);
+
+protected:
+	virtual void machine_start() override;
+
+private:
+	// devices/pointers
+	required_device<avr8_device> m_maincpu;
+	required_device<pwm_display_device> m_display;
+	required_ioport_array<4> m_inputs;
+
+	// address maps
+	void main_map(address_map &map);
+	void data_map(address_map &map);
+	void io_map(address_map &map);
+
+	// I/O handlers
+	void update_display();
+	void mux_w(u8 data);
+	void led_w(u8 data);
+	u8 input_r();
+
+	u8 m_inp_mux = 0;
+	u8 m_7seg_data = 0;
+};
+
+void avrmax_state::machine_start()
+{
+	// register for savestates
+	save_item(NAME(m_inp_mux));
+	save_item(NAME(m_7seg_data));
+}
+
+
+
+/******************************************************************************
+    I/O
+******************************************************************************/
+
+void avrmax_state::update_display()
+{
+	m_display->matrix(m_inp_mux, m_7seg_data);
+}
+
+void avrmax_state::mux_w(u8 data)
+{
+	// PC0-PC3: input mux/digit select
+	m_inp_mux = ~data & 0xf;
+	update_display();
+}
+
+void avrmax_state::led_w(u8 data)
+{
+	// PD0-PD7: 7seg data
+	m_7seg_data = ~data;
+	update_display();
+}
+
+u8 avrmax_state::input_r()
+{
+	u8 data = 0;
+
+	// PB0-PB2: multiplexed inputs
+	for (int i = 0; i < 4; i++)
+		if (BIT(m_inp_mux, i))
+			data |= m_inputs[i]->read();
+
+	return ~data & 7;
+}
+
+
+
+/******************************************************************************
+    Address Maps
+******************************************************************************/
+
+void avrmax_state::main_map(address_map &map)
+{
+	map(0x0000, 0x1fff).rom();
+}
+
+void avrmax_state::data_map(address_map &map)
+{
+	map(0x0100, 0x04ff).ram();
+}
+
+void avrmax_state::io_map(address_map &map)
+{
+	map(AVR8_IO_PORTB, AVR8_IO_PORTB).r(FUNC(avrmax_state::input_r));
+	map(AVR8_IO_PORTC, AVR8_IO_PORTC).w(FUNC(avrmax_state::mux_w));
+	map(AVR8_IO_PORTD, AVR8_IO_PORTD).w(FUNC(avrmax_state::led_w));
+}
+
+
+
+/******************************************************************************
+    Input Ports
+******************************************************************************/
+
+static INPUT_PORTS_START( avrmax )
+	PORT_START("IN.0")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("A1") PORT_CODE(KEYCODE_A) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("E5") PORT_CODE(KEYCODE_E) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("FN") PORT_CODE(KEYCODE_N)
+
+	PORT_START("IN.1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("B2") PORT_CODE(KEYCODE_B) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("F6") PORT_CODE(KEYCODE_F) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("CL") PORT_CODE(KEYCODE_DEL) PORT_CODE(KEYCODE_BACKSPACE)
+
+	PORT_START("IN.2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("C3") PORT_CODE(KEYCODE_C) PORT_CODE(KEYCODE_3) PORT_CODE(KEYCODE_3_PAD)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("G7") PORT_CODE(KEYCODE_G) PORT_CODE(KEYCODE_7) PORT_CODE(KEYCODE_7_PAD)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("GO") PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD)
+
+	PORT_START("IN.3")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("D4") PORT_CODE(KEYCODE_D) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("H8") PORT_CODE(KEYCODE_H) PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_8_PAD)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+INPUT_PORTS_END
+
+
+
+/******************************************************************************
+    Machine Configs
+******************************************************************************/
+
+void avrmax_state::avrmax(machine_config &config)
+{
+	/* basic machine hardware */
+	ATMEGA88(config, m_maincpu, 8000000); // internal R/C clock
+	m_maincpu->set_addrmap(AS_PROGRAM, &avrmax_state::main_map);
+	m_maincpu->set_addrmap(AS_DATA, &avrmax_state::data_map);
+	m_maincpu->set_addrmap(AS_IO, &avrmax_state::io_map);
+	m_maincpu->set_eeprom_tag("eeprom");
+
+	/* video hardware */
+	PWM_DISPLAY(config, m_display).set_size(4, 8);
+	m_display->set_segmask(0xf, 0xff);
+	config.set_default_layout(layout_avrmax);
+}
+
+
+
+/******************************************************************************
+    ROM Definitions
+******************************************************************************/
+
+ROM_START( avrmax )
+	ROM_REGION( 0x2000, "maincpu", 0 )
+	ROM_LOAD( "elektor_081101-41.ic1", 0x0000, 0x2000, CRC(86d2a654) SHA1(3c235b8f6f735eaf408f54cbf44872166e7161d5) )
+
+	// HACK: changed SLEEP to NOP
+	ROM_FILL( 0x025c, 2, 0x00 )
+	ROM_FILL( 0x0f8e, 2, 0x00 )
+	ROM_FILL( 0x0fde, 2, 0x00 )
+	ROM_FILL( 0x1020, 2, 0x00 )
+	ROM_FILL( 0x1060, 2, 0x00 )
+	ROM_FILL( 0x129a, 2, 0x00 )
+
+	ROM_REGION( 0x200, "eeprom", ROMREGION_ERASE00 )
+ROM_END
+
+ROM_START( avrmaxg )
+	ROM_REGION( 0x2000, "maincpu", 0 )
+	ROM_LOAD( "elektor_081101-41_d.ic1", 0x0000, 0x2000, CRC(18ec7a56) SHA1(a018421aa0ad8cce3d852f7519dec3691f3c55a0) )
+
+	// HACK: changed SLEEP to NOP
+	ROM_FILL( 0x025c, 2, 0x00 )
+	ROM_FILL( 0x0f8e, 2, 0x00 )
+	ROM_FILL( 0x0fde, 2, 0x00 )
+	ROM_FILL( 0x1020, 2, 0x00 )
+	ROM_FILL( 0x1060, 2, 0x00 )
+	ROM_FILL( 0x129a, 2, 0x00 )
+
+	ROM_REGION( 0x200, "eeprom", ROMREGION_ERASE00 )
+ROM_END
+
+} // anonymous namespace
+
+
+
+/******************************************************************************
+    Drivers
+******************************************************************************/
+
+//    YEAR  NAME     PARENT CMP MACHINE  INPUT   STATE         INIT        COMPANY, FULLNAME, FLAGS
+CONS( 2009, avrmax,  0,      0, avrmax,  avrmax, avrmax_state, empty_init, "Elektor", "AVR-Max Chess Computer (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NO_SOUND_HW )
+CONS( 2009, avrmaxg, avrmax, 0, avrmax,  avrmax, avrmax_state, empty_init, "Elektor", "AVR-Max-Schachzwerg (German)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NO_SOUND_HW ) // German 'text'
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/b2m.cpp mame-0.224+dfsg.1/src/mame/drivers/b2m.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/b2m.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/b2m.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,24 +2,40 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        Bashkiria-2M driver by Miodrag Milanovic
+Bashkiria-2M driver by Miodrag Milanovic
 
-        28/03/2008 Preliminary driver.
+2008-03-28 Preliminary driver.
+
+To get numbers, you have to hold down Shift.
+
+B2M:
+- Hit enter while the square block is showing - it will attempt to boot
+  a disk. But, it is loaded corruptly, and it runs into the weeds.
+- Or, just wait and a menu appears with choices S,L,W,R,G. It's all in
+  Russian, and choosing any of them produces an error.
+
+B2MROM:
+- At start you are in an empty ramdisk called A:
+- You can use SAVE to create an empty file in the CP/M fashion, and you can
+  TYPE it.
+- You can go to Basic by typing BAS. This is corrupted and only a few
+  commands are accepted: REM, LIST. The commands RUN and NEW cause a disk
+  error and the machine freezes. SYSTEM quits back to A:
+- There's nothing else on the romdisk.
+
+So, in the end, nothing useful works.
+
+Need a schematic so that the fdc could be repaired.
 
 ****************************************************************************/
 
 
 #include "emu.h"
 #include "cpu/i8085/i8085.h"
-#include "machine/i8255.h"
-#include "machine/pic8259.h"
 #include "machine/i8251.h"
-#include "machine/wd_fdc.h"
-#include "machine/ram.h"
 #include "includes/b2m.h"
 #include "formats/smx_dsk.h"
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
 /* Address maps */
@@ -36,10 +52,10 @@
 {
 	map.global_mask(0x1f);
 	map(0x00, 0x03).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write));
-	map(0x04, 0x07).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0x08, 0x0b).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0x0c, 0x0c).rw(FUNC(b2m_state::b2m_localmachine_r), FUNC(b2m_state::b2m_localmachine_w));
-	map(0x10, 0x13).rw(FUNC(b2m_state::b2m_palette_r), FUNC(b2m_state::b2m_palette_w));
+	map(0x04, 0x07).rw("ppi2", FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0x08, 0x0b).rw("ppi1", FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0x0c, 0x0c).rw(FUNC(b2m_state::localmachine_r), FUNC(b2m_state::localmachine_w));
+	map(0x10, 0x13).rw(FUNC(b2m_state::palette_r), FUNC(b2m_state::palette_w));
 	map(0x14, 0x15).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write));
 	map(0x18, 0x19).rw("uart", FUNC(i8251_device::read), FUNC(i8251_device::write));
 	map(0x1c, 0x1f).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write));
@@ -49,10 +65,10 @@
 {
 	map.global_mask(0x1f);
 	map(0x00, 0x03).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write));
-	map(0x04, 0x07).rw("ppi8255_3", FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0x08, 0x0b).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0x0c, 0x0c).rw(FUNC(b2m_state::b2m_localmachine_r), FUNC(b2m_state::b2m_localmachine_w));
-	map(0x10, 0x13).rw(FUNC(b2m_state::b2m_palette_r), FUNC(b2m_state::b2m_palette_w));
+	map(0x04, 0x07).rw("ppi3", FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0x08, 0x0b).rw("ppi1", FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0x0c, 0x0c).rw(FUNC(b2m_state::localmachine_r), FUNC(b2m_state::localmachine_w));
+	map(0x10, 0x13).rw(FUNC(b2m_state::palette_r), FUNC(b2m_state::palette_w));
 	map(0x14, 0x15).rw(m_pic, FUNC(pic8259_device::read), FUNC(pic8259_device::write));
 	map(0x18, 0x19).rw("uart", FUNC(i8251_device::read), FUNC(i8251_device::write));
 }
@@ -192,8 +208,8 @@
 	i8080_cpu_device &maincpu(I8080(config, m_maincpu, 2000000));
 	maincpu.set_addrmap(AS_PROGRAM, &b2m_state::b2m_mem);
 	maincpu.set_addrmap(AS_IO, &b2m_state::b2m_io);
-	maincpu.set_vblank_int("screen", FUNC(b2m_state::b2m_vblank_interrupt));
-	maincpu.in_inta_func().set("pic8259", FUNC(pic8259_device::acknowledge));
+	maincpu.set_vblank_int("screen", FUNC(b2m_state::vblank_interrupt));
+	maincpu.in_inta_func().set("pic", FUNC(pic8259_device::acknowledge));
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -201,7 +217,7 @@
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	screen.set_size(384, 256);
 	screen.set_visarea_full();
-	screen.set_screen_update(FUNC(b2m_state::screen_update_b2m));
+	screen.set_screen_update(FUNC(b2m_state::screen_update));
 	screen.set_palette(m_palette);
 
 	PALETTE(config, m_palette, FUNC(b2m_state::b2m_palette), 4);
@@ -210,23 +226,23 @@
 	m_pit->set_clk<0>(0);
 	m_pit->out_handler<0>().set(m_pic, FUNC(pic8259_device::ir1_w));
 	m_pit->set_clk<1>(2000000);
-	m_pit->out_handler<1>().set(FUNC(b2m_state::bm2_pit_out1));
+	m_pit->out_handler<1>().set(FUNC(b2m_state::pit_out1));
 	m_pit->set_clk<2>(2000000);
 	m_pit->out_handler<2>().set(m_pit, FUNC(pit8253_device::write_clk0));
 
-	i8255_device &ppi1(I8255(config, "ppi8255_1"));
-	ppi1.out_pa_callback().set(FUNC(b2m_state::b2m_8255_porta_w));
-	ppi1.in_pb_callback().set(FUNC(b2m_state::b2m_8255_portb_r));
-	ppi1.out_pb_callback().set(FUNC(b2m_state::b2m_8255_portb_w));
-	ppi1.out_pc_callback().set(FUNC(b2m_state::b2m_8255_portc_w));
-
-	i8255_device &ppi2(I8255(config, "ppi8255_2"));
-	ppi2.out_pc_callback().set(FUNC(b2m_state::b2m_ext_8255_portc_w));
-
-	i8255_device &ppi3(I8255(config, "ppi8255_3"));
-	ppi3.in_pa_callback().set(FUNC(b2m_state::b2m_romdisk_porta_r));
-	ppi3.out_pb_callback().set(FUNC(b2m_state::b2m_romdisk_portb_w));
-	ppi3.out_pc_callback().set(FUNC(b2m_state::b2m_romdisk_portc_w));
+	i8255_device &ppi1(I8255(config, "ppi1"));
+	ppi1.out_pa_callback().set(FUNC(b2m_state::ppi1_porta_w));
+	ppi1.in_pb_callback().set(FUNC(b2m_state::ppi1_portb_r));
+	ppi1.out_pb_callback().set(FUNC(b2m_state::ppi1_portb_w));
+	ppi1.out_pc_callback().set(FUNC(b2m_state::ppi1_portc_w));
+
+	i8255_device &ppi2(I8255(config, "ppi2"));
+	ppi2.out_pc_callback().set(FUNC(b2m_state::ppi2_portc_w));
+
+	i8255_device &ppi3(I8255(config, "ppi3"));
+	ppi3.in_pa_callback().set(FUNC(b2m_state::romdisk_porta_r));
+	ppi3.out_pb_callback().set(FUNC(b2m_state::romdisk_portb_w));
+	ppi3.out_pc_callback().set(FUNC(b2m_state::romdisk_portc_w));
 
 	PIC8259(config, m_pic, 0);
 	m_pic->out_int_callback().set_inputline(m_maincpu, 0);
@@ -239,7 +255,7 @@
 	I8251(config, "uart", 0);
 
 	FD1793(config, m_fdc, 8_MHz_XTAL / 8);
-	m_fdc->drq_wr_callback().set(FUNC(b2m_state::b2m_fdc_drq));
+	m_fdc->drq_wr_callback().set(FUNC(b2m_state::fdc_drq));
 
 	FLOPPY_CONNECTOR(config, "fd0", b2m_floppies, "525qd", b2m_state::b2m_floppy_formats);
 	FLOPPY_CONNECTOR(config, "fd1", b2m_floppies, "525qd", b2m_state::b2m_floppy_formats);
@@ -258,19 +274,19 @@
 /* ROM definition */
 
 ROM_START( b2m )
-	ROM_REGION( 0x12000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "b2m.rom", 0x10000, 0x2000, CRC(3f3214d6) SHA1(dd93e7fbabf14d1aed6777fe1ccfe0a3ca8fcaf2) )
+	ROM_REGION( 0x2000, "maincpu", 0 )
+	ROM_LOAD( "b2m.rom", 0x0000, 0x2000, CRC(3f3214d6) SHA1(dd93e7fbabf14d1aed6777fe1ccfe0a3ca8fcaf2) )
 ROM_END
 
 ROM_START( b2mrom )
-	ROM_REGION( 0x22000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "bios2.rom",  0x10000, 0x2000, CRC(c22a98b7) SHA1(7de91e653bf4b191ded62cf21532578268e4a2c1) )
-	ROM_LOAD( "ramdos.sys", 0x12000, 0x60c0, CRC(91ed6df0) SHA1(4fd040f2647a6b7930c330c75560a035027d0606) )
+	ROM_REGION( 0x12000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "bios2.rom",  0x00000, 0x2000, CRC(c22a98b7) SHA1(7de91e653bf4b191ded62cf21532578268e4a2c1) )
+	ROM_LOAD( "ramdos.sys", 0x02000, 0x60c0, CRC(91ed6df0) SHA1(4fd040f2647a6b7930c330c75560a035027d0606) )
 ROM_END
 
 
 /* Driver */
 
 /*    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT  CLASS      INIT        COMPANY  FULLNAME                 FLAGS */
-COMP( 1989, b2m,    0,      0,      b2m,     b2m,   b2m_state, empty_init, "BNPO",  "Bashkiria-2M",          MACHINE_SUPPORTS_SAVE)
-COMP( 1989, b2mrom, b2m,    0,      b2mrom,  b2m,   b2m_state, empty_init, "BNPO",  "Bashkiria-2M ROM-disk", MACHINE_SUPPORTS_SAVE)
+COMP( 1989, b2m,    0,      0,      b2m,     b2m,   b2m_state, empty_init, "BNPO",  "Bashkiria-2M",          MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE)
+COMP( 1989, b2mrom, b2m,    0,      b2mrom,  b2m,   b2m_state, empty_init, "BNPO",  "Bashkiria-2M ROM-disk", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/bbc.cpp mame-0.224+dfsg.1/src/mame/drivers/bbc.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/bbc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/bbc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -168,7 +168,7 @@
 	map(0x0000, 0x7fff).rw(FUNC(bbc_state::bbc_ram_r), FUNC(bbc_state::bbc_ram_w));                                   //    0000-7fff                 Regular RAM
 	map(0x8000, 0xbfff).rw(FUNC(bbc_state::bbc_paged_r), FUNC(bbc_state::bbc_paged_w));                               //    8000-bfff                 Paged ROM/RAM
 	map(0xfe30, 0xfe3f).rw(FUNC(bbc_state::bbc_romsel_r), FUNC(bbc_state::bbc_romsel_w));                             // W: fe30-fe3f  84LS161        Paged ROM selector
-	map(0xfe80, 0xfe9f).rw(m_fdc, FUNC(bbc_fdc_slot_device::read), FUNC(bbc_fdc_slot_device::write));                 //    fe84-fe9f  8271 FDC       Floppy disc controller
+	map(0xfe80, 0xfe9f).rw(m_fdc, FUNC(bbc_fdc_slot_device::read), FUNC(bbc_fdc_slot_device::write));                 //    fe80-fe9f  8271 FDC       Floppy disc controller
 }
 
 
@@ -329,7 +329,7 @@
 {
 	m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? CLEAR_LINE : ASSERT_LINE);
 
-	if (newval)
+	if (!newval)
 	{
 		if (m_via6522_1) m_via6522_1->reset();
 		if (m_adlc) m_adlc->reset();
@@ -431,7 +431,7 @@
 	PORT_START("COL8")
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^ ~")                PORT_CODE(KEYCODE_EQUALS)       PORT_CHAR('^') PORT_CHAR('~')
-	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("_ \xC2\xA3")         PORT_CODE(KEYCODE_TILDE)        PORT_CHAR('_') PORT_CHAR(0xA3)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(u8"_ £")              PORT_CODE(KEYCODE_TILDE)        PORT_CHAR('_') PORT_CHAR(0xA3)
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("[ {")                PORT_CODE(KEYCODE_OPENBRACE)    PORT_CHAR('[') PORT_CHAR('{')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(": *")                PORT_CODE(KEYCODE_QUOTE)        PORT_CHAR(':') PORT_CHAR('*')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("] }")                PORT_CODE(KEYCODE_CLOSEBRACE)   PORT_CHAR(']') PORT_CHAR('}')
@@ -665,7 +665,7 @@
 
 	PORT_START("COL5")
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("3 \xC2\xA3")         PORT_CODE(KEYCODE_3)            PORT_CHAR('3')      PORT_CHAR(0xA3)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(u8"3 £")              PORT_CODE(KEYCODE_3)            PORT_CHAR('3')      PORT_CHAR(0xA3)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Keypad +")           PORT_CODE(KEYCODE_PLUS_PAD)     PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C")                  PORT_CODE(KEYCODE_C)            PORT_CHAR('C')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D")                  PORT_CODE(KEYCODE_D)            PORT_CHAR('D')
@@ -747,7 +747,7 @@
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("- _")                PORT_CODE(KEYCODE_MINUS)        PORT_CHAR('-')      PORT_CHAR('_')
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Keypad 8")           PORT_CODE(KEYCODE_8_PAD) PORT_CODE(KEYCODE_UP)      PORT_CHAR(UCHAR_MAMEKEY(8_PAD))
-	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("# \xC2\xA3")         PORT_CODE(KEYCODE_BACKSLASH)    PORT_CHAR('#')      PORT_CHAR(0xA3)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(u8"# £")              PORT_CODE(KEYCODE_BACKSLASH)    PORT_CHAR('#')      PORT_CHAR(0xA3)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("' @")                PORT_CODE(KEYCODE_QUOTE)        PORT_CHAR('\'')     PORT_CHAR('@')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("[ {")                PORT_CODE(KEYCODE_OPENBRACE)    PORT_CHAR('[')      PORT_CHAR('{')
 	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(UTF8_LEFT)            PORT_CODE(KEYCODE_LEFT)         PORT_CHAR(UCHAR_MAMEKEY(LEFT))
@@ -1296,11 +1296,11 @@
 	torchf(config);
 
 	/* fdc */
-	//m_fdc->subdevice<floppy_connector>("1")->set_default_option(nullptr);
+	//m_fdc->subdevice<floppy_connector>("acorn8271:i8271:1")->set_default_option(nullptr);
 
 	/* 10MB or 21MB HDD */
-	//m_1mhzbus->set_default_option("sasi");
-	//m_1mhzbus->set_fixed(true);
+	m_1mhzbus->set_default_option("torchhd");
+	m_1mhzbus->set_fixed(true);
 }
 
 
@@ -1308,12 +1308,17 @@
 {
 	torchf(config);
 
+	/* fdc */
+	//m_fdc->subdevice<floppy_connector>("acorn8271:i8271:1")->set_default_option(nullptr);
+
 	/* Torch Z80 Communicator co-processor */
 	m_tube->set_default_option("zep100");
 	m_tube->set_fixed(true);
 	m_tube->set_insert_rom(false);
 
 	/* 20MB HDD */
+	m_1mhzbus->set_default_option("torchhd");
+	m_1mhzbus->set_fixed(true);
 }
 
 
@@ -1321,12 +1326,17 @@
 {
 	torchf(config);
 
+	/* fdc */
+	//m_fdc->subdevice<floppy_connector>("acorn8271:i8271:1")->set_default_option(nullptr);
+
 	/* Torch 68000 Atlas co-processor */
 	//m_tube->set_default_option("atlas");
 	m_tube->set_fixed(true);
 	m_tube->set_insert_rom(false);
 
 	/* 20MB HDD */
+	m_1mhzbus->set_default_option("torchhd");
+	m_1mhzbus->set_fixed(true);
 }
 
 
@@ -1407,17 +1417,12 @@
 	m_wd_fdc->subdevice<floppy_connector>("1")->set_default_option(nullptr);
 
 	/* Acorn Z80 co-processor */
-	m_tube->set_default_option("z80");
+	m_tube->set_default_option("z80w");
 	m_tube->set_fixed(true);
 
 	/* Acorn Winchester Disc 10MB */
 	m_1mhzbus->set_default_option("awhd");
 	m_1mhzbus->set_fixed(true);
-
-	/* software lists */
-	config.device_remove("cass_ls");
-	config.device_remove("flop_ls_b");
-	config.device_remove("flop_ls_b_orig");
 }
 
 
@@ -1437,9 +1442,6 @@
 
 	/* software lists */
 	SOFTWARE_LIST(config, "flop_ls_32016").set_original("bbc_flop_32016");
-	config.device_remove("cass_ls");
-	config.device_remove("flop_ls_b");
-	config.device_remove("flop_ls_b_orig");
 }
 
 
@@ -1457,9 +1459,8 @@
 	m_1mhzbus->set_default_option("awhd");
 	m_1mhzbus->set_fixed(true);
 
-	/* software lists */
-	config.device_remove("cass_ls");
-	config.device_remove("flop_ls_b");
+	/* Acorn Mouse */
+	m_userport->set_default_option("m512mouse");
 }
 
 
@@ -2161,7 +2162,24 @@
 ROM_END
 
 
-#define rom_torchh rom_torchf
+ROM_START(torchh)
+	ROM_REGION(0x40000, "swr", ROMREGION_ERASEFF) /* Sideways ROMs */
+	/* rom page 0 00000 IC52  BASIC */
+	/* rom page 1 04000 IC88  DNFS */
+	/* rom page 2 08000 IC100 CPN (inserted by device) */
+	/* rom page 3 0c000 IC101 SPARE SOCKET */
+	ROM_LOAD("basic2.rom", 0x0000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281))
+	ROM_LOAD("dnfs120-201666.rom", 0x4000, 0x4000, CRC(8ccd2157) SHA1(7e3c536baeae84d6498a14e8405319e01ee78232))
+
+	ROM_REGION(0x4000, "mos", 0)
+	ROM_LOAD("os12.rom", 0x0000, 0x4000, CRC(3c14fc70) SHA1(0d9bcaf6a393c9ce2359ed700ddb53c232c2c45d))
+
+	ROM_REGION(0x4000, "vsm", 0) /* system speech PHROM */
+	ROM_LOAD("phrom_us.bin", 0x0000, 0x4000, CRC(bf4b3b64) SHA1(66876702d1d95eecc034d20f25047f893a27cde5))
+
+	DISK_REGION("1mhzbus:torchhd:sasi:0:s1410:image")
+	DISK_IMAGE("torch_utilities", 0, BAD_DUMP SHA1(33a5f169bd91b9c6049e8bd0b237429c091fddd0)) /* NEC D5126 contains Standard and Hard Disc Utilities, not known what was factory installed */
+ROM_END
 
 
 ROM_START(torch301)
@@ -2887,10 +2905,10 @@
 /*     YEAR  NAME      PARENT  COMPAT MACHINE   INPUT   CLASS        INIT       COMPANY            FULLNAME                              FLAGS */
 COMP ( 1981, bbcb,     0,      bbca,  bbcb,     bbcb,   bbc_state,   init_bbc,  "Acorn Computers", "BBC Micro Model B",                  MACHINE_IMPERFECT_GRAPHICS)
 COMP ( 1981, bbca,     bbcb,   0,     bbca,     bbca,   bbc_state,   init_bbc,  "Acorn Computers", "BBC Micro Model A",                  MACHINE_IMPERFECT_GRAPHICS)
-COMP ( 1982, torchf,   bbcb,   0,     torchf,   torchb, torch_state, init_bbc,  "Torch Computers", "Torch CF240",                        MACHINE_IMPERFECT_GRAPHICS)
-COMP ( 1982, torchh,   bbcb,   0,     torchh,   torchb, torch_state, init_bbc,  "Torch Computers", "Torch CH240",                        MACHINE_NOT_WORKING)
 COMP ( 1982, bbcb_de,  bbcb,   0,     bbcb_de,  bbcb,   bbc_state,   init_bbc,  "Acorn Computers", "BBC Micro Model B (German)",         MACHINE_IMPERFECT_GRAPHICS)
 COMP ( 1983, bbcb_us,  bbcb,   0,     bbcb_us,  bbcb,   bbc_state,   init_bbc,  "Acorn Computers", "BBC Micro Model B (US)",             MACHINE_IMPERFECT_GRAPHICS)
+COMP ( 1982, torchf,   bbcb,   0,     torchf,   torchb, torch_state, init_bbc,  "Torch Computers", "Torch CF240",                        MACHINE_IMPERFECT_GRAPHICS)
+COMP ( 1983, torchh,   bbcb,   0,     torchh,   torchb, torch_state, init_bbc,  "Torch Computers", "Torch CH240",                        MACHINE_IMPERFECT_GRAPHICS)
 COMP ( 1984, torch301, bbcb,   0,     torch301, torchi, torch_state, init_bbc,  "Torch Computers", "Torch Model 301",                    MACHINE_NOT_WORKING)
 COMP ( 1984, torch725, bbcb,   0,     torch725, torchi, torch_state, init_bbc,  "Torch Computers", "Torch Model 725",                    MACHINE_NOT_WORKING)
 COMP ( 1985, bbcbp,    0,      bbcb,  bbcbp,    bbcbp,  bbcbp_state, init_bbc,  "Acorn Computers", "BBC Micro Model B+ 64K",             MACHINE_IMPERFECT_GRAPHICS)
@@ -2912,7 +2930,7 @@
 COMP ( 1986, bbcmc,    0,      bbcm,  bbcmc,    bbcm,   bbcm_state,  init_bbc,  "Acorn Computers", "BBC Master Compact",                 MACHINE_IMPERFECT_GRAPHICS)
 COMP ( 1986, bbcmc_ar, bbcmc,  0,     bbcmc,    bbcm,   bbcm_state,  init_bbc,  "Acorn Computers", "BBC Master Compact (Arabic)",        MACHINE_IMPERFECT_GRAPHICS)
 COMP ( 1987, pro128s,  bbcmc,  0,     pro128s,  bbcm,   bbcm_state,  init_bbc,  "Olivetti",        "Prodest PC 128S",                    MACHINE_IMPERFECT_GRAPHICS)
-COMP ( 1988, autoc15,  bbcmc,  0,     autoc15,  autoc,  bbcm_state,  init_bbc,  "Autocue Ltd.",    "Autocue 1500",                       MACHINE_NOT_WORKING)
+COMP ( 1988, autoc15,  bbcmc,  0,     autoc15,  autoc,  bbcm_state,  init_bbc,  "Autocue Ltd.",    "Autocue 1500 Telepromter",           MACHINE_NOT_WORKING)
 COMP ( 1988, discmon,  bbcm,   0,     discmon,  bbcm,   bbcm_state,  init_bbc,  "Arbiter Leisure", "Arbiter Discmonitor A-01",           MACHINE_NOT_WORKING)
 COMP ( 1988, discmate, bbcm,   0,     discmate, bbcm,   bbcm_state,  init_bbc,  "Arbiter Leisure", "Arbiter Discmate A-02",              MACHINE_NOT_WORKING)
 //COMP ( 1988, discmast, bbcm,   0,     discmast, bbcm,   bbcm_state,  init_bbc, "Arbiter Leisure", "Arbiter Discmaster A-03",            MACHINE_NOT_WORKING)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/bbl380.cpp mame-0.224+dfsg.1/src/mame/drivers/bbl380.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/bbl380.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/bbl380.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,139 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:David Haywood
-
-// the BBL 380 - 180 in 1 features similar menus / presentation / games to the 'ORB Gaming Retro Arcade Pocket Handheld Games Console with 153 Games' (eg has Matchstick Man, Gang Tie III etc.)
-// https://www.youtube.com/watch?v=NacY2WHd-CY
-
-#include "emu.h"
-
-#include "cpu/m6502/st2205u.h"
-#include "screen.h"
-#include "emupal.h"
-#include "speaker.h"
-
-class bbl380_state : public driver_device
-{
-public:
-	bbl380_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_palette(*this, "palette"),
-		m_screen(*this, "screen")
-	{ }
-
-	void bbl380(machine_config &config);
-	void init_ragc153();
-
-private:
-	void lcdc_command_w(u8 data);
-	u8 lcdc_data_r();
-	void lcdc_data_w(u8 data);
-
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
-	void bbl380_map(address_map &map);
-
-	required_device<st2xxx_device> m_maincpu;
-	required_device<palette_device> m_palette;
-	required_device<screen_device> m_screen;
-};
-
-uint32_t bbl380_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	return 0;
-}
-
-void bbl380_state::machine_start()
-{
-}
-
-void bbl380_state::machine_reset()
-{
-}
-
-void bbl380_state::lcdc_command_w(u8 data)
-{
-	logerror("%s: LCDC command $%02X\n", machine().describe_context(), data);
-}
-
-u8 bbl380_state::lcdc_data_r()
-{
-	if (!machine().side_effects_disabled())
-		logerror("%s: LCDC data read\n", machine().describe_context());
-	return 0;
-}
-
-void bbl380_state::lcdc_data_w(u8 data)
-{
-	logerror("%s: LCDC data $%02X\n", machine().describe_context(), data);
-}
-
-void bbl380_state::bbl380_map(address_map &map)
-{
-	map(0x000000, 0x3fffff).rom().region("maincpu", 0); // FIXME: probably not directly mapped (ST2205U has serial Flash interface on port F)
-	map(0x600000, 0x600000).w(FUNC(bbl380_state::lcdc_command_w));
-	map(0x604000, 0x604000).rw(FUNC(bbl380_state::lcdc_data_r), FUNC(bbl380_state::lcdc_data_w));
-}
-
-static INPUT_PORTS_START( bbl380 )
-INPUT_PORTS_END
-
-void bbl380_state::bbl380(machine_config &config)
-{
-	ST2205U(config, m_maincpu, 8000000); // unknown clock; type guessed
-	m_maincpu->set_addrmap(AS_DATA, &bbl380_state::bbl380_map);
-
-	SCREEN(config, m_screen, SCREEN_TYPE_LCD); // TFT color LCD
-	m_screen->set_refresh_hz(60);
-	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0));
-	m_screen->set_size(132, 162);
-	m_screen->set_visarea(0, 132-1, 0, 162-1);
-	m_screen->set_screen_update(FUNC(bbl380_state::screen_update));
-	m_screen->set_palette(m_palette);
-
-	PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x200);
-
-	// LCD controller seems to be either Sitronix ST7735R or (if RDDID bytes match) Ilitek ILI9163C
-	// (unless the SoC's built-in one is used and the routines which program these are leftovers)
-	// Several other LCDC models are identified by ragc153 and dphh8630
-}
-
-ROM_START( bbl380 )
-	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "bbl380_st2205u.bin", 0x000000, 0x004000, NO_DUMP ) // internal OTPROM BIOS
-	ROM_LOAD( "bbl 380 180 in 1.bin", 0x000000, 0x400000, CRC(146c88da) SHA1(7f18526a6d8cf991f86febce3418d35aac9f49ad) BAD_DUMP )
-	// 0x0022XX, 0x0026XX, 0x002AXX, 0x002CXX, 0x002DXX, 0x0031XX, 0x0036XX, etc. should not be FF fill
-ROM_END
-
-
-ROM_START( ragc153 )
-	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "ragc153_st2205u.bin", 0x000000, 0x004000, NO_DUMP ) // internal OTPROM BIOS (addresses are different from bbl380)
-	ROM_LOAD( "25q32ams.bin", 0x000000, 0x400000, CRC(de328d73) SHA1(d17b97e9057be4add68b9f5a26e04c9f0a139673) ) // first 0x100 bytes would read as 0xff at regular speed, but give valid looking consistent data at a slower rate
-ROM_END
-
-ROM_START( dphh8630 )
-	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "ragc153_st2205u.bin", 0x000000, 0x004000, NO_DUMP ) // internal OTPROM BIOS
-	ROM_LOAD( "bg25q16.bin", 0x000000, 0x200000, CRC(277850d5) SHA1(740087842e1e63bf99b4ca9c1b2053361f267269) )
-ROM_END
-
-
-
-void bbl380_state::init_ragc153()
-{
-	uint8_t *ROM = memregion("maincpu")->base();
-	int size = memregion("maincpu")->bytes();
-
-	for (int i = 0; i < size; i++)
-	{
-		ROM[i] = ROM[i] ^ 0xe4;
-	}
-}
-
-CONS( 200?, bbl380,        0,       0,      bbl380,   bbl380, bbl380_state, empty_init, "BaoBaoLong", "BBL380 - 180 in 1", MACHINE_IS_SKELETON )
-CONS( 200?, ragc153,       0,       0,      bbl380,   bbl380, bbl380_state, init_ragc153, "Orb", "Retro Arcade Game Controller 153-in-1", MACHINE_IS_SKELETON )
-CONS( 200?, dphh8630,      0,       0,      bbl380,   bbl380, bbl380_state, init_ragc153, "<unknown>", "Digital Pocket Hand Held System Model: 8630 - 230-in-1", MACHINE_IS_SKELETON )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/bfcobra.cpp mame-0.224+dfsg.1/src/mame/drivers/bfcobra.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/bfcobra.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/bfcobra.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -52,14 +52,32 @@
     ==================
 
     A compact video expansion board for Scorpion II.
-    The Z80 is replaced by a Z180 and there is no Flare DSP or FDC
-
+    The Z80 is replaced by a Z180 and there is no Flare DSP.
+    The FDC is replaced by a NCR53C80 SCSI controller.
+    Cyclone was never released due to reliability issues.
+
+    Cobra II Jamma
+    ==============
+    Based on Cobra II but with a JAMMA edge connector for easy use in video game cabinets.
+    This is a standalone board which is not paired with any Scorpion boards.
+    Break Ball is the only released game for this platform.
+    The only other known software is for a functional test unit (FTU).
+
+    Note that for Z8S180 boards the CPU has 20 address lines so can select the entire memory map
+    without using the Flare chipset paging option. I believe changing the addresses using chipset_w
+    have no effect on Z8S180 boards.
 
     To do:
 
     * Complete blitter emulation
-    * Cobra II support
+    * Cobra II support.
     * Hook up additional inputs, EM meters, lamps etc
+    * The prom range selected for the first 16K of Z80 memory map is not fixed so chipset_w
+      function needs changing to process offset 0. Note that no released software changes this anyway.
+    * Frame interrupt for Z80 boards is wrong. It isn't a frame interrupt but an interrupt which can be
+      triggered on any scan line. For Z80 boards the fact that it's treated as a frame interrupt doesn't
+      matter as no released software changes the position of the interrupt.  Emulation for Z8S180 boards
+      is correct as Break Ball uses multiple scan line interrupts.
 
     Known issues:
 
@@ -71,35 +89,50 @@
     * Plane priority is probably wrong but it's only used in Treble Top.
     * Blitter loop counts and step are wrong - they are 9 bit counts, not 8.
     * Blitter emulation doesn't support hi-res mode (needed for Inquizitor)
+    * Blitter emulation currently runs until blit is complete then burns the required number of Z80
+      cycles to simulate it holding the bus. On the real hardware the blitter halts the CPU until the
+      operation is complete or an interrupt is issued to CPU. When the interrupt line is asserted the
+      CPU is allowed to run until the interrupt line is released. This allows all interrupts to run at
+      the correct time. The current emulation is OK for Z80 boards and all released software for those
+      boards, however, for Cobra II/JAMMA this causes problems due to the UPD7759 audio chip issuing
+      dma requests which are then processed too late if the Z8S180 cycles are burnt. To get round this
+      the Z8S180 blitter emulation does not burn CPU cycles.
+      The blitter emulation ought to take account of irq/dma requests but I don't know how to do that!
 
 ******************************************************************************/
 
 #include "emu.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/z80/z80.h"
+#include "cpu/z180/z180.h"
 #include "machine/6850acia.h"
 #include "machine/clock.h"
+#include "machine/i2cmem.h"
 #include "machine/meters.h"
 #include "machine/nvram.h"
 #include "sound/ay8910.h"
 #include "sound/upd7759.h"
+#include "sound/ym2413.h"
+#include "video/bfm_dm01.h"
 #include "video/ramdac.h"
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
+#include "brkball.lh"
 
 
 /*
     Defines
 */
+#define Z8S180_XTAL 24000000
 #define Z80_XTAL    5910000     /* Unconfirmed */
-#define M6809_XTAL  4000000     /* Unconfirmed */
+#define M6809_XTAL  4000000
 
 
 
 /***************************************************************************
 
-    Split into video\cobra.c !
+    Split into video\bfcobra.cpp !
 
 ***************************************************************************/
 
@@ -641,8 +674,7 @@
 				}
 				if (blitter.compfunc & CMPFUNC_LT)
 				{
-					/* Might be wrong */
-					if ((srcdata & 0xc0) < (dstdata & 0xc0))
+					if ((srcdata & 0xc0) > (dstdata & 0xc0))
 					{
 						inhibit = 1;
 
@@ -664,8 +696,7 @@
 				}
 				if (blitter.compfunc & CMPFUNC_GT)
 				{
-					/* Might be wrong */
-					if ((srcdata & 0xc0) > (dstdata & 0xc0))
+					if ((srcdata & 0xc0) < (dstdata & 0xc0))
 					{
 						inhibit = 1;
 
@@ -984,7 +1015,7 @@
 
 /***************************************************************************
 
-    Split into machine\cobra.c !
+    Split into machine\bfcobra.cpp !
 
     Alternatively chuck it all away and borrow the MESS implementation
     because it's a million times better.
@@ -1691,111 +1722,1205 @@
 }
 
 /***************************************************************************
+  Cobra II Jamma.
 
-  Game driver(s)
-
-  Note: Two different versions of each 6809 ROM exist: standard and protocol
-  It appears sets can be a combination of disk images, 6809 and Z80 ROMs!
+  This has a Z180 and no 6809
 
 ***************************************************************************/
+class bfcobjam_state : public driver_device
+{
+public:
+	bfcobjam_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu"),
+		m_acia6850_0(*this, "acia6850_0"),
+		m_screen(*this, "screen"),
+		m_palette(*this, "palette"),
+		m_aux_upd7759(*this, "upd"),
+		m_upd7759_int(*this, "updint"),
+		m_ym2413(*this, "ymsnd"),
+		m_i2cmem(*this, "i2cmem"),
+		m_dm01(*this, "dm01"),
+		m_work_ram(*this, "work_ram"),
+		m_video_ram(*this, "video_ram")
+	{
+	}
 
-ROM_START( inquiztr )
-	ROM_REGION( 0x10000, "audiocpu", 0 )
-	ROM_LOAD( "inq6809", 0x08000, 0x08000, CRC(ae996600) SHA1(f360399e77b81399d910770fa8106c196f04363c) )
+	void init_bfcobjam();
+	void bfcobjam(machine_config &config);
+	void bfcobjam_with_dmd(machine_config &config);
 
-	ROM_REGION( 0x20000, "user1", 0 )
-	ROM_LOAD( "9576002.bin", 0x00000, 0x10000, CRC(5b8c8a04) SHA1(af5328fee79c370f45bff36f534aaf50964b6900) )
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	virtual void video_start() override;
 
-	ROM_REGION( 0x20000, "altuser1", 0 )
-	ROM_LOAD( "9576028.bin", 0x10000, 0x10000, CRC(2d85682c) SHA1(baec47bff4b8beef5afbb737dc57b22bf93ebcf8) )
+private:
+	uint8_t m_bank_data[4];
+	uint8_t m_rompage;
+	uint8_t m_h_scroll;
+	uint8_t m_v_scroll;
+	uint8_t m_flip_8;
+	uint8_t m_flip_22;
+	uint8_t m_videomode;
+	uint8_t m_data_r;
+	uint8_t m_data_t;
+	uint8_t m_port_0;
+	int m_irq_state;
+	int m_acia_irq;
+	int m_scanline_irq;
+	int m_blitter_irq;
+	int m_global_volume;
+	uint8_t dm_shift_data ;
+	int dm_shift = 0 ;
+	int dm_last_data = 0 ;
 
-		// these look quite different.. (like they belong together) but booting with these gives a checksum error (banking?)
-	ROM_LOAD( "inqvypp1", 0x00000, 0x010000, CRC(9bac8c6e) SHA1(15e24d60c2f3997e637694f60daa552b22628766) )
-	ROM_LOAD( "inqvypp2", 0x10000, 0x010000, CRC(f9cd196c) SHA1(0ac31d87462cbee6f41e19aefe740d876910bdf5) )
+	uint8_t m_z8s180_int;
+	uint8_t m_z8s180_inten;
+	uint8_t m_col4bit[16];
+	uint8_t m_col3bit[16];
+	uint8_t m_col8bit[256];
+	uint8_t m_col7bit[256];
+	uint8_t m_col6bit[256];
+	struct bf_blitter_t m_blitter;
+	emu_timer *m_scanline_timer;
+	uint8_t m_genio ;
+	required_device<cpu_device> m_maincpu;
+	required_device<acia6850_device> m_acia6850_0;
+	required_device<screen_device> m_screen;
+	required_device<palette_device> m_palette;
+	optional_device<upd7759_device> m_aux_upd7759;
+	required_device<upd7759_device> m_upd7759_int;
+	required_device<ym2413_device> m_ym2413;
+	required_device<i2c_24c08_device> m_i2cmem;
+	optional_device<bfm_dm01_device> m_dm01;
+	required_shared_ptr<uint8_t> m_work_ram;
+	required_shared_ptr<uint8_t> m_video_ram;
 
-	ROM_REGION( 0x1c2000, "user2", 0 )
-	ROM_LOAD( "inqdisk.img", 0x000000, 0x1c2000, NO_DUMP )
-ROM_END
+	uint8_t chipset_r(offs_t offset);
+	void chipset_w(offs_t offset, uint8_t data);
+	void rombank_w(uint8_t data);
+	void upd7759_w(uint8_t data);
+	uint8_t aux_upd7759_r();
+	void aux_upd7759_w(uint8_t data);
+	void output0_w(uint8_t data);
+	uint8_t input0_r();
+	uint8_t input1_r();
+	DECLARE_WRITE_LINE_MEMBER(z8s180_acia_irq);
+	DECLARE_WRITE_LINE_MEMBER(data_acia_tx_w);
+	DECLARE_WRITE_LINE_MEMBER(write_acia_clock);
+	DECLARE_WRITE_LINE_MEMBER(upd7759_generate_dreq );
+	uint32_t screen_update_bfcobjam(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+	INTERRUPT_GEN_MEMBER(timer_irq);
+	TIMER_CALLBACK_MEMBER( scanline_callback ) ;
+	void RunBlit();
+	void update_irqs();
+	void genio_w( uint8_t data ) ;
+	void dotmatrix_w( uint8_t data );
+	inline uint8_t* blitter_get_addr(uint32_t addr);
+	inline void z8s180_bank(int num, int data);
 
+	void ramdac_map(address_map &map);
+	void z8s180_io_map(address_map &map);
+	void z8s180_prog_map(address_map &map);
+};
 
+void bfcobjam_state::init_bfcobjam()
+{
+	m_rompage = 0 ;
+	m_bank_data[0] = 0;
+	m_bank_data[1] = 0;
+	m_bank_data[2] = 0;
+	m_bank_data[3] = 0;
 
+	/* Fixed 16kB ROM region */
+	membank("bank4")->set_base(memregion("user1")->base());
+	membank("bank1")->set_base(memregion("user1")->base()+0x04000);
+	membank("bank2")->set_base(memregion("user1")->base()+0x08000);
+	membank("bank3")->set_base(memregion("user1")->base()+0x0c000);
 
-ROM_START( escounts )
-	ROM_REGION( 0x10000, "audiocpu", 0 )
-	ROM_LOAD( "esc12int", 0x08000, 0x08000, CRC(741a1fe6) SHA1(e741d0ae0d2f11036a358120381e4b0df4a560a1) )
+	m_scanline_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(bfcobjam_state::scanline_callback),this));
 
-	ROM_REGION( 0x10000, "altrevs", 0 )
-	ROM_LOAD( "bfm_esc.bin", 0x08000, 0x08000, CRC(27acb5a5) SHA1(da50d650ab6456d61d0fb7f89247f2040b4bb9a8) )
-	ROM_LOAD( "escint1b",    0x08000, 0x08000, CRC(fde413c9) SHA1(18724a1b771ba4c72e571c356591c5be32948d7a) )
+	/* Finish this */
+	save_item(NAME(m_data_r));
+	save_item(NAME(m_data_t));
+	save_item(NAME(m_h_scroll));
+	save_item(NAME(m_v_scroll));
+	save_item(NAME(m_flip_8));
+	save_item(NAME(m_flip_22));
+	save_item(NAME(m_z8s180_int));
+	save_item(NAME(m_z8s180_inten));
+	save_item(NAME(m_bank_data));
+	save_item(NAME(m_genio));
+	save_item(NAME(m_global_volume));
 
-	ROM_REGION( 0x10000, "user1", 0 )
-	ROM_LOAD( "esccobpa", 0x00000, 0x10000, CRC(d8eadeb7) SHA1(9b94f1454e6a17bf8321b0ef4ddd0ed1a56150f7) )
+}
 
-	/* 95-100-207 */
-	ROM_REGION( 0x190000, "user2", 0 )
-	ROM_LOAD( "escdisk4.img", 0x000000, 0x190000, CRC(24156e0f) SHA1(e163daa8effadd93ace2bc2ba1af0f4a190abd7f) )
-ROM_END
+/*
+    This is based this on the Slipstream technical reference manual.
+    The Flare One blitter is a simpler design with slightly different parameters
+    and will require hardware tests to figure everything out correctly.
+*/
+void bfcobjam_state::RunBlit()
+{
+#define BLITPRG_READ(x)     blitter.x = *(blitter_get_addr(blitter.program.addr++))
 
-ROM_START( trebltop )
-	ROM_REGION( 0x10000, "audiocpu", 0 )
-	ROM_LOAD( "95740078.bin", 0x08000, 0x08000, CRC(aca1980b) SHA1(3d4ed1dc545cc80f56d7daa13028fb10a12a718b) )
+	struct bf_blitter_t &blitter = m_blitter;
+	int cycles_used = 0;
 
-	ROM_REGION( 0x10000, "altrevs", 0 )
-	ROM_LOAD( "ttopint", 0x08000, 0x08000, CRC(cc798f90) SHA1(c3f541ebbb3a2c29cc4f00bbd47e289bcff50ecb) )
 
-	ROM_REGION( 0x20000, "user1", 0 )
-	ROM_LOAD( "95760031.bin", 0x00000, 0x10000, CRC(8e75edb8) SHA1(0aaa3834d5ac20f92bdf1f2b8f1eb71854469cbe) )
-	ROM_LOAD( "95760021.bin", 0x10000, 0x10000, CRC(f42016c0) SHA1(7067d018cb4bdcfba777267fb01cddf44e4216c3) )
+	do
+	{
+		uint8_t srcdata = 0;
+		uint8_t dstdata = 0;
 
-	ROM_REGION( 0x1c2000, "user2", 0 )
-	ROM_LOAD( "ttdisk1.img", 0x000000, 0x190000, CRC(b2003228) SHA1(5eb49f05137cdd404f22948d39aa79c1518c06eb) )
+		/* Read the blitter command */
+		BLITPRG_READ(source.as8bit.addr0);
+		BLITPRG_READ(source.as8bit.addr1);
+		BLITPRG_READ(source.as8bit.addr2);
+		BLITPRG_READ(dest.as8bit.addr0);
+		BLITPRG_READ(dest.as8bit.addr1);
+		BLITPRG_READ(dest.as8bit.addr2);
+		BLITPRG_READ(modectl);
+		BLITPRG_READ(compfunc);
+		BLITPRG_READ(outercnt);
+		BLITPRG_READ(innercnt);
+		BLITPRG_READ(step);
+		BLITPRG_READ(pattern);
 
-	ROM_REGION( 0x20000, "upd", 0 )
-	ROM_LOAD( "95000172.bin", 0x00000, 0x10000, CRC(e85367a5) SHA1(695fd95ddeecdb16602f7b0f075cf5128a2fb808) )
-	ROM_LOAD( "95000173.bin", 0x10000, 0x10000, CRC(8bda2c5e) SHA1(79aab5a2af7a5add5fe9132dc13bcc3705c6faf3) )
-ROM_END
+#if 0
+		/* This debug is now wrong ! */
+		if (DEBUG_BLITTER)
+		{
+			osd_printf_debug("\n%s:Blitter: Running command from 0x%.5x\n\n", device->machine().describe_context(), blitter.program.addr - 12);
+			osd_printf_debug("Command Reg         %.2x",   blitter.command);
+			osd_printf_debug("     %s %s %s %s %s %s %s\n",
+				blitter.command & CMD_RUN ? "RUN" : "     ",
+				blitter.command & CMD_COLST ? "COLST" : "     ",
+				blitter.command & CMD_PARRD ? "PARRD" : "     ",
+				blitter.command & CMD_SRCUP ? "SRCUP" : "     ",
+				blitter.command & CMD_DSTUP ? "DSTUP" : "     ");
 
-ROM_START( beeline )
-	ROM_REGION( 0x10000, "audiocpu", 0 )
-	ROM_LOAD( "bln12int.a", 0x08000, 0x08000, CRC(cb97905e) SHA1(9725156bf64e53a56bc0f90795d4b07db41d059e) )
+			osd_printf_debug("Src Address Byte 0  %.2x\n", blitter.source.as8bit.addr0);
+			osd_printf_debug("Src Address Byte 1  %.2x\n", blitter.source.as8bit.addr1);
+			osd_printf_debug("Src Control         %.2x\n", blitter.source.as8bit.addr2);
+			osd_printf_debug("  Src Address       %.5x\n", blitter.source.addr & 0xfffff);
+			osd_printf_debug("Dest Address Byte 0 %.2x\n", blitter.dest.as8bit.addr0);
+			osd_printf_debug("Dest Address Byte 1 %.2x\n", blitter.dest.as8bit.addr1);
+			osd_printf_debug("Dest Control        %.2x\n", blitter.dest.as8bit.addr2);
+			osd_printf_debug("  Dst. Address      %.5x\n", blitter.dest.addr & 0xfffff);
+			osd_printf_debug("Mode Control        %.2x",   blitter.modectl);
+			osd_printf_debug("     %s\n", blitter.modectl & MODE_BITTOBYTE ? "BIT_TO_BYTE" : "");
 
-	ROM_REGION( 0x10000, "altrevs", 0 )
-	ROM_LOAD( "beeint12", 0x8000, 0x008000, CRC(0a77d0be) SHA1(8e55e7b4eb85cc2521d8fdf7ede02131ed80372e) )
+			osd_printf_debug("Comp. and LFU       %.2x\n", blitter.compfunc);
+			osd_printf_debug("Outer Loop Count    %.2x (%d)\n", blitter.outercnt, blitter.outercnt);
+			osd_printf_debug("Inner Loop Count    %.2x (%d)\n", blitter.innercnt, blitter.innercnt);
+			osd_printf_debug("Step Value          %.2x\n", blitter.step);
+			osd_printf_debug("Pattern Byte        %.2x\n", blitter.pattern);
+		}
+#endif
 
+		/* Ignore these writes */
+		if (blitter.dest.addr == 0)
+			return;
 
-	ROM_REGION( 0x20000, "user1", 0 )
-	ROM_LOAD( "blncob.pa", 0x00000, 0x10000, CRC(8abc0017) SHA1(ecf6e7a4021b35295eb9bb9aed1b88fff27ffbd1) )
-	ROM_LOAD( "blncob.pb", 0x10000, 0x10000, CRC(feb121fe) SHA1(e83bfd6db00a3264e5076f257e261a1cb4605a83) )
+		/* Begin outer loop */
+		for (;;)
+		{
+			uint8_t innercnt = blitter.innercnt;
+			dstdata = blitter.pattern;
 
-	ROM_REGION( 0x1c2000, "user2", 0 )
-	ROM_LOAD( "beedisk.img", 0x000000, 0x1c2000, NO_DUMP )
-ROM_END
+			if (blitter.command & CMD_LINEDRAW)
+			{
+				do
+				{
+					if (blitter.modectl & MODE_YFRAC)
+					{
+						if (blitter.modectl & MODE_SSIGN )
+							blitter.dest.as8bit.addr0--;
+						else
+							blitter.dest.as8bit.addr0++;
+					}
+					else
+					{
+						if (blitter.modectl & MODE_DSIGN )
+							blitter.dest.as8bit.addr1--;
+						else
+							blitter.dest.as8bit.addr1++;
+					}
+					if( blitter.source.as8bit.addr0 < blitter.step )
+					{
+						blitter.source.as8bit.addr0 -= blitter.step ;
+						blitter.source.as8bit.addr0 += blitter.source.as8bit.addr1;
 
-ROM_START( quizvadr )
-	ROM_REGION( 0x10000, "audiocpu", 0 )
-	ROM_LOAD( "q6809.bin", 0x08000, 0x8000, CRC(a74dff10) SHA1(87578694a022dc3d7ade9cc76d387c1ae5fc74d9) )
+						if ( blitter.modectl & MODE_YFRAC )
+						{
+							if (blitter.modectl & MODE_DSIGN )
+								blitter.dest.as8bit.addr1--;
+							else
+								blitter.dest.as8bit.addr1++;
+						}
+						else
+						{
+							if (blitter.modectl & MODE_SSIGN )
+								blitter.dest.as8bit.addr0--;
+							else
+								blitter.dest.as8bit.addr0++;
+						}
+					}
+					else
+					{
+						blitter.source.as8bit.addr0 -= blitter.step;
+					}
 
-	ROM_REGION( 0x10000, "altrevs", 0 )
-	ROM_LOAD( "qvadrint", 0x08000, 0x08000, CRC(4c729943) SHA1(ab4e0fb6cfc66540ea1e9e36eebdf85f65c5fd2a) )
+					*blitter_get_addr( blitter.dest.addr) = blitter.pattern;
+					cycles_used++;
 
-	ROM_REGION( 0x200000, "user1", 0 )
-	ROM_LOAD( "5947011r.0", 0x000000, 0x80000, CRC(cac43c97) SHA1(3af529cd0f8ec57dd3596f5bca7b9c74cff171e4) )
-	ROM_LOAD( "5947011r.1", 0x080000, 0x80000, CRC(120018dc) SHA1(cd153d2b7ed535b04dbcaf189d2fc96fe3c5b466) )
-	ROM_LOAD( "5947011r.2", 0x100000, 0x80000, CRC(689b3b5a) SHA1(ea32d18acfd380de822efff4f2c95ce9873a33a2) )
-	ROM_LOAD( "5947011r.3", 0x180000, 0x80000, CRC(c38dafeb) SHA1(d693387a5c3cde34c9d581f81a08a5fbc6f753f2) )
+				} while (--innercnt);
+			}
+			else do
+			{
+				uint8_t   inhibit = 0;
 
-	ROM_REGION( 0x20000, "upd", 0 )
-	ROM_LOAD( "185snd2.bin", 0x00000, 0x10000, CRC(e36eccc2) SHA1(cfd8ca4c71528ea4e229074016240681b6de37cd) )
-	ROM_LOAD( "184snd1.bin", 0x10000, 0x10000, CRC(aac058e8) SHA1(39e59ad9524130fc3bd8d46e1aa78bc4daf04e39) )
-ROM_END
+				/* TODO: Set this correctly */
+				uint8_t   result = blitter.pattern;
 
-ROM_START( qos )
-	ROM_REGION( 0x10000, "audiocpu", 0 )
-	ROM_LOAD( "39360107.bin", 0x08000, 0x8000, CRC(20844655) SHA1(b67c7f7bbabf6d5139b8ad8cbb5f8cc3f28e9cc7) )
+				if (LOOPTYPE == 3 && innercnt == blitter.innercnt)
+				{
+					srcdata = *(blitter_get_addr( blitter.source.addr & 0xfffff));
+					blitter.source.as16bit.loword++;
+					cycles_used++;
+				}
 
-	ROM_REGION( 0x200000, "user1", 0 )
-	ROM_LOAD( "95000338.rm0", 0x000000, 0x80000, CRC(96918aae) SHA1(849ce7b8eccc89c45aacc840a73935f95788a141) )
-	ROM_LOAD( "95000339.rm1", 0x080000, 0x80000, CRC(b4c6dcc0) SHA1(56d8761766dfbd5b0e71f8c3ca575e88f1bc9929) )
+				/* Enable source address read and increment? */
+				if (!(blitter.modectl & (MODE_BITTOBYTE | MODE_PALREMAP)))
+				{
+					if (LOOPTYPE == 0 || LOOPTYPE == 1)
+					{
+						srcdata = *(blitter_get_addr( blitter.source.addr & 0xfffff));
+						cycles_used++;
+
+						if (blitter.modectl & MODE_SSIGN)
+							blitter.source.as16bit.loword-- ;
+						else
+							blitter.source.as16bit.loword++;
+
+						result = srcdata;
+					}
+				}
+
+				/* Read destination pixel? */
+				if (LOOPTYPE == 0)
+				{
+					dstdata = *blitter_get_addr( blitter.dest.addr & 0xfffff);
+					cycles_used++;
+				}
+
+				/* Inhibit depending on the bit selected by the inner count */
+
+				/* Switch on comparator type? */
+				if (blitter.modectl & MODE_BITTOBYTE)
+				{
+					inhibit = !(srcdata & (1 << (8 - innercnt)));
+				}
+
+				if (blitter.compfunc & CMPFUNC_BEQ)
+				{
+					if (srcdata == blitter.pattern)
+					{
+						inhibit = 1;
+
+						/* TODO: Resume from inhibit? */
+						if (blitter.command & CMD_COLST)
+							return;
+					}
+				}
+				if (blitter.compfunc & CMPFUNC_LT)
+				{
+					if ((srcdata & 0xc0) > (dstdata & 0xc0))
+					{
+						inhibit = 1;
+
+						/* TODO: Resume from inhibit? */
+						if (blitter.command & CMD_COLST)
+							return;
+					}
+				}
+				if (blitter.compfunc & CMPFUNC_EQ)
+				{
+					if ((srcdata & 0xc0) == (dstdata & 0xc0))
+					{
+						inhibit = 1;
+
+						/* TODO: Resume from inhibit? */
+						if (blitter.command & CMD_COLST)
+							return;
+					}
+				}
+				if (blitter.compfunc & CMPFUNC_GT)
+				{
+					if ((srcdata & 0xc0) < (dstdata & 0xc0))
+					{
+						inhibit = 1;
+
+						/* TODO: Resume from inhibit? */
+						if (blitter.command & CMD_COLST)
+							return;
+					}
+				}
+
+				/* Write the data if not inhibited */
+				if (!inhibit)
+				{
+					if (blitter.modectl == MODE_PALREMAP)
+					{
+						/*
+						    In this mode, the source points to a 256 entry lookup table.
+						    The existing destination pixel is used as a lookup
+						    into the table and the colours is replaced.
+						*/
+						uint8_t dest = *blitter_get_addr( blitter.dest.addr);
+						uint8_t newcol = *(blitter_get_addr( (blitter.source.addr + dest) & 0xfffff));
+
+						*blitter_get_addr( blitter.dest.addr) = newcol;
+						cycles_used += 3;
+					}
+					else
+					{
+						uint8_t final_result = 0;
+
+						if (blitter.compfunc & CMPFUNC_LOG3)
+							final_result |= result & dstdata;
+
+						if (blitter.compfunc & CMPFUNC_LOG2)
+							final_result |= result & ~dstdata;
+
+						if (blitter.compfunc & CMPFUNC_LOG1)
+							final_result |= ~result & dstdata;
+
+						if (blitter.compfunc & CMPFUNC_LOG0)
+							final_result |= ~result & ~dstdata;
+
+						*blitter_get_addr( blitter.dest.addr) = final_result;
+						cycles_used++;
+					}
+				}
+
+				/* Update destination address */
+				if (blitter.modectl & MODE_DSIGN)
+					blitter.dest.as16bit.loword--;
+				else
+					blitter.dest.as16bit.loword++;
+
+			} while (--innercnt);
+
+			if (!--blitter.outercnt)
+			{
+				break;
+			}
+			else
+			{
+				if (blitter.command & CMD_DSTUP)
+					blitter.dest.as16bit.loword += blitter.step;
+
+				if (blitter.command & CMD_SRCUP)
+					blitter.source.as16bit.loword += blitter.step;
+
+				if (blitter.command & CMD_PARRD)
+				{
+					BLITPRG_READ(innercnt);
+					BLITPRG_READ(step);
+					BLITPRG_READ(pattern);
+				}
+			}
+		}
+
+		/* Read next command header */
+		BLITPRG_READ(command);
+
+	} while (blitter.command  & CMD_RUN);
+
+	/* Burn Z180 cycles while blitter is in operation */
+	/* Don't burn for Z8S180 */
+//  m_maincpu->spin_until_time(attotime::from_nsec( (1000000000 / Z8S180_XTAL)*cycles_used * 2 ) );
+}
+
+uint8_t* bfcobjam_state::blitter_get_addr(uint32_t addr)
+{
+	if (addr < 0x10000)
+	{
+		/* Is this region fixed? */
+		return (uint8_t*)(memregion("user1")->base() + addr);
+	}
+	else if(addr < 0x20000)
+	{
+		addr &= 0xffff;
+		addr += m_rompage * 0x10000 ;
+
+		return (uint8_t*)(memregion("user1")->base() + addr );
+	}
+	else if (addr >= 0x20000 && addr < 0x40000)
+	{
+		return (uint8_t*)&m_video_ram[addr - 0x20000];
+	}
+	else
+	{
+		return (uint8_t*)&m_work_ram[addr - 0x40000];
+	}
+}
+
+uint8_t bfcobjam_state::chipset_r(offs_t offset)
+{
+	uint8_t val = 0xff;
+
+	switch(offset)
+	{
+		case 0:
+		case 1:
+		case 2:
+		case 3:
+		{
+			val = m_bank_data[offset];
+			break;
+		}
+		case 6:
+		{
+			/* TODO */
+			val = m_scanline_irq << 4;
+			break;
+		}
+		case 7:
+		{
+			m_scanline_irq = 0;
+			val = 0x1;
+
+			/* TODO */
+			update_irqs();
+			break;
+		}
+		case 0x1C:
+		{
+			/* Blitter status ? */
+			val = ioport("CJIN3")->read();
+			break;
+		}
+		case 0x20:
+		{
+			/* Seems correct - used during RLE pic decoding */
+			val = m_blitter.dest.as8bit.addr0;
+			break;
+		}
+		case 0x22:
+		{
+			val = 0x40 | ioport("CJIN2")->read() | ( m_upd7759_int->busy_r() ? 0x20 : 0 ) ;
+			break;
+		}
+		default:
+		{
+			osd_printf_debug("Flare One unknown read: 0x%.2x (PC:0x%.4x)\n", offset, m_maincpu->pcbase());
+		}
+	}
+
+	return val;
+}
+
+void bfcobjam_state::chipset_w(offs_t offset, uint8_t data)
+{
+	switch (offset)
+	{
+		case 0x00:
+		case 0x01:
+		case 0x02:
+		case 0x03:
+		{
+			popmessage("%x: Unusual bank access (%x)\n", m_maincpu->pcbase(), data);
+
+			data &= 0x3f;
+			m_bank_data[offset] = data;
+			z8s180_bank(offset, data);
+			break;
+		}
+
+		case 0x07:
+			m_scanline_timer->adjust(m_screen->time_until_pos(data));
+			break ;
+
+		case 0x08:
+		{
+			m_flip_8 = data;
+			break;
+		}
+		case 9:
+			m_videomode = data;
+			break;
+
+		case 0x0B:
+		{
+			m_h_scroll = data;
+			break;
+		}
+		case 0x0C:
+		{
+			m_v_scroll = data;
+			break;
+		}
+		case 0x0E:
+		{
+			m_col4bit[5] = data;
+			m_col3bit[5] = data;
+			m_col3bit[5 + 8] = data;
+			break;
+		}
+		case 0x0f:
+		{
+			m_col4bit[6] = data;
+			m_col3bit[6] = data;
+			m_col3bit[6 + 8] = data;
+			break;
+		}
+		case 0x18:
+		{
+			m_blitter.program.as8bit.addr0 = data;
+			break;
+		}
+		case 0x19:
+		{
+			m_blitter.program.as8bit.addr1 = data;
+			break;
+		}
+		case 0x1A:
+		{
+			m_blitter.program.as8bit.addr2 = data;
+			break;
+		}
+		case 0x20:
+		{
+			m_blitter.command = data;
+
+			if (data & CMD_RUN)
+				RunBlit();
+			else
+				osd_printf_debug("Blitter stopped by IO.\n");
+
+			break;
+		}
+		case 0x22:
+		{
+			m_flip_22 = data;
+			genio_w( data ) ;
+			break;
+		}
+		default:
+		{
+			osd_printf_debug("Flare One unknown write: 0x%.2x with 0x%.2x (PC:0x%.4x)\n", offset, data, m_maincpu->pcbase());
+		}
+	}
+}
+
+uint32_t bfcobjam_state::screen_update_bfcobjam(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+{
+	int x, y;
+	uint8_t  *src;
+	uint32_t *dest;
+	uint32_t offset;
+	uint8_t *hirescol;
+	uint8_t *lorescol;
+
+
+	/* Select screen has to be programmed into two registers */
+	/* No idea what happens if the registers are different */
+	if (m_flip_8 & 0x40 && m_flip_22 & 0x40)
+		offset = 0x10000;
+	else
+		offset = 0;
+
+	if(m_videomode & 0x20)
+	{
+		hirescol = m_col3bit;
+		lorescol = m_col7bit;
+	}
+	else if(m_videomode & 0x40)
+	{
+		hirescol = m_col4bit;
+		lorescol = m_col6bit;
+	}
+	else
+	{
+		hirescol = m_col4bit;
+		lorescol = m_col8bit;
+	}
+
+	for (y = cliprect.top(); y <= cliprect.bottom(); ++y)
+	{
+		uint16_t y_offset = (y + m_v_scroll) * 256;
+		src = &m_video_ram[offset + y_offset];
+		dest = &bitmap.pix32(y);
+
+		for (x = cliprect.left(); x <= cliprect.right() / 2; ++x)
+		{
+			uint8_t x_offset = x + m_h_scroll;
+			uint8_t pen = *(src + x_offset);
+
+			if ( ( m_videomode & 0x81 ) == 1 || (m_videomode & 0x80 && pen & 0x80) )
+			{
+				*dest++ = m_palette->pen(hirescol[pen & 0x0f]);
+				*dest++ = m_palette->pen(hirescol[(pen >> 4) & 0x0f]);
+			}
+			else
+			{
+				*dest++ = m_palette->pen(lorescol[pen]);
+				*dest++ = m_palette->pen(lorescol[pen]);
+			}
+		}
+	}
+
+	return 0;
+}
+
+void bfcobjam_state::ramdac_map(address_map &map)
+{
+	map(0x000, 0x3ff).rw("ramdac", FUNC(ramdac_device::ramdac_pal_r), FUNC(ramdac_device::ramdac_rgb666_w));
+}
+
+
+void bfcobjam_state::z8s180_bank(int num, int data)
+{
+	static const char * const bank_names[] = { "bank4","bank1", "bank2", "bank3" };
+
+	if (data < 0x04)
+	{
+		membank(bank_names[num])->set_base(memregion("user1")->base() + (data*0x4000));
+	}
+	else if (data < 0x08)
+	{
+		uint32_t offset ;
+		offset = m_rompage * 0x10000 ;
+		offset += (data-4) * 0x4000 ;
+
+		membank(bank_names[num])->set_base(memregion("user1")->base() + offset);
+	}
+	else if (data < 0x10)
+	{
+		membank(bank_names[num])->set_base(&m_video_ram[(data - 0x08) * 0x4000]);
+	}
+	else
+	{
+		membank(bank_names[num])->set_base(&m_work_ram[(data - 0x10) * 0x4000]);
+	}
+}
+
+void bfcobjam_state::update_irqs()
+{
+	int newstate = m_blitter_irq || m_scanline_irq || m_acia_irq;
+
+	if (newstate != m_irq_state)
+	{
+		m_irq_state = newstate;
+		m_maincpu->set_input_line(0, m_irq_state ? ASSERT_LINE : CLEAR_LINE);
+	}
+}
+
+TIMER_CALLBACK_MEMBER( bfcobjam_state::scanline_callback )
+{
+	m_scanline_timer->adjust(m_screen->time_until_pos(0));
+	m_scanline_irq = 1;
+	update_irqs();
+}
+
+WRITE_LINE_MEMBER(bfcobjam_state::z8s180_acia_irq)
+{
+	m_acia_irq = state;
+	update_irqs();
+}
+
+
+void bfcobjam_state::rombank_w(uint8_t data)
+{
+	m_rompage = data ;
+
+	membank("bank5")->set_entry(m_rompage & 0x0f);
+}
+
+/*
+  This parallel port is used for bit-bashing the following devices.
+    1. Dot matrix display
+    2. I2C 24C08
+  The bit use is as follows:
+    b0 =
+    b1 =
+    b2 = Dot matrix clock
+    b3 = Dot matrix data
+    b4 = Dot matrix reset
+    b5 = I2C SDA
+    b6 = I2C SCL
+    b7 =
+*/
+void bfcobjam_state::output0_w(uint8_t data)
+{
+	uint8_t changed = m_port_0 ^ data ;
+	m_port_0 = data ;
+
+	dotmatrix_w( data ) ;
+
+	//cobra handling of scl and sda is wrong but devices handle it ok
+	//unfortunately mame emulation of i2c 24c08 doesn't :(
+	//we frig the driving of scl/sda to correct this
+	changed &= 0x60 ;
+
+	if( changed == 0x60 )
+	{
+		if( data & 0x40 )
+		{
+			m_i2cmem->write_scl(!(BIT(data, 6)));
+			m_i2cmem->write_sda(!(BIT(data, 5)));
+		}
+		else
+		{
+			m_i2cmem->write_sda(!(BIT(data, 5)));
+			m_i2cmem->write_scl(!(BIT(data, 6)));
+		}
+	}
+	else
+	{
+		m_i2cmem->write_scl(!(BIT(data, 6)));
+		m_i2cmem->write_sda(!(BIT(data, 5)));
+	}
+}
+
+void bfcobjam_state::dotmatrix_w( uint8_t data )
+{
+	if( m_dm01 )
+	{
+		data &= 0x1c ;
+
+		if( data != dm_last_data )
+		{
+			if( data & 0x10 )
+			{
+			}
+			else
+			{
+				m_dm01->reset() ;
+				dm_shift=0;
+				dm_shift_data=0;
+			}
+			if( !(data & 4 ) && ( dm_last_data & 4 ) && data & 0x10 ) // clock is low but was high and out of reset
+			{
+				dm_shift_data <<= 1 ;
+				if( !(data & 0x08 ))
+				{
+					dm_shift_data |=1 ;
+				}
+				dm_shift++;
+				if( dm_shift == 8 )
+				{
+					dm_shift=0;
+					m_dm01->writedata( dm_shift_data ) ;
+				}
+			}
+			dm_last_data = data ;
+		}
+	}
+}
+
+uint8_t bfcobjam_state::input0_r()
+{
+	return ioport("CJIN0")->read() | (m_i2cmem->read_sda() ? 0x80 : 0x00);
+}
+
+uint8_t bfcobjam_state::input1_r()
+{
+	return ioport("CJIN1")->read();
+}
+
+void bfcobjam_state::aux_upd7759_w(uint8_t data)
+{
+	if( m_aux_upd7759 )
+	{
+		m_aux_upd7759->set_rom_bank((data>>2)&3);
+
+		m_aux_upd7759->port_w((data>>4)&0xf);
+
+		m_aux_upd7759->md_w(1);
+
+		m_aux_upd7759->reset_w(BIT(data, 0));
+
+		m_aux_upd7759->start_w(!BIT(data, 1));
+	}
+}
+
+uint8_t bfcobjam_state::aux_upd7759_r()
+{
+	if( m_aux_upd7759 )
+	{
+		return m_aux_upd7759->busy_r();
+	}
+	else
+	{
+		return 0 ;
+	}
+}
+
+void bfcobjam_state::genio_w( uint8_t data )
+{
+	//bit 0 = ??
+	//bit 1 = upd7759 start
+	//bit 2 = upd7759 reset
+	//bit 3 = ??
+	//bit 4 = digital volume clock
+	//bit 5 = digital volume up/down
+	//bit 6 = ??
+	//bit 7 = ??
+
+	uint8_t changed = m_genio ^ data ;
+
+	m_genio = data ;
+
+	if ( changed & 0x10)
+	{ // digital volume clock line changed
+		if ( !(data & 0x10) )
+		{ // changed from high to low,
+			if ( data & 0x20 )
+			{
+				if ( m_global_volume < 31 ) m_global_volume++; //0-31 expressed as 1-32
+			}
+			else
+			{
+				if ( m_global_volume > 0  ) m_global_volume--;
+			}
+
+			{
+				if (m_ym2413)
+				{
+					float percent = (32 - m_global_volume) / 32.0f;
+
+					m_ym2413->set_output_gain(ALL_OUTPUTS, percent);
+					m_upd7759_int->set_output_gain(ALL_OUTPUTS, percent);
+					if( m_aux_upd7759 )
+					{
+						m_aux_upd7759->set_output_gain(ALL_OUTPUTS, percent);
+					}
+				}
+			}
+		}
+	}
+
+	//bits 1 and 2 are for upd7759
+	m_upd7759_int->md_w(0);
+	m_upd7759_int->reset_w(!BIT(data,2));
+	m_upd7759_int->start_w(BIT(data,1));
+}
+
+void bfcobjam_state::upd7759_w(uint8_t data)
+{
+	m_upd7759_int->port_w(data);
+}
+
+WRITE_LINE_MEMBER( bfcobjam_state::upd7759_generate_dreq )
+{
+	if( state )
+	{
+		m_maincpu->set_input_line(Z180_INPUT_LINE_DREQ0, ASSERT_LINE );
+	}
+	else
+	{
+		m_maincpu->set_input_line(Z180_INPUT_LINE_DREQ0, CLEAR_LINE );
+	}
+}
+
+void bfcobjam_state::video_start()
+{
+	memcpy(m_col4bit, col4bit_default, sizeof(m_col4bit));
+	memcpy(m_col3bit, col3bit_default, sizeof(m_col3bit));
+	for (int i = 0; i < 256; ++i)
+	{
+		uint8_t col;
+
+		m_col8bit[i] = i;
+		col = i & 0x7f;
+		col = (col & 0x1f) | (col76index[ ( (col & 0x60) >> 5 ) & 3] << 5);
+		m_col7bit[i] = col;
+
+		col = (col & 3) | (col76index[( (col & 0x0c) >> 2) & 3] << 2 ) |
+				(col76index[( (col & 0x30) >> 4) & 3] << 5 );
+		m_col6bit[i] = col;
+	}
+}
+
+/***************************************************************************
+
+    Cobra II Z8S180 Memory Map
+
+***************************************************************************/
+
+void bfcobjam_state::z8s180_prog_map(address_map &map)
+{
+	map(0x00000, 0x03fff).bankrw("bank4");
+	map(0x04000, 0x07fff).bankrw("bank1");
+	map(0x08000, 0x0bfff).bankrw("bank2");
+	map(0x0c000, 0x0ffff).bankrw("bank3");
+	map(0x10000, 0x1ffff).bankrw("bank5");
+	map(0x20000, 0x3ffff).ram().share(m_video_ram);
+	map(0x40000, 0xfffff).ram().share(m_work_ram);
+}
+
+void bfcobjam_state::z8s180_io_map(address_map &map)
+{
+	map.global_mask(0xff);
+	map(0x00, 0x23).rw(FUNC(bfcobjam_state::chipset_r), FUNC(bfcobjam_state::chipset_w));
+	map(0x24, 0x25).w(m_acia6850_0, FUNC(acia6850_device::write));
+	map(0x26, 0x27).r(m_acia6850_0, FUNC(acia6850_device::read));
+	map(0x2c, 0x2c).w(FUNC(bfcobjam_state::rombank_w));
+	map(0x30, 0x30).w(FUNC(bfcobjam_state::upd7759_w));
+	map(0x50, 0x50).w("ramdac", FUNC(ramdac_device::index_w));
+	map(0x51, 0x51).rw("ramdac", FUNC(ramdac_device::pal_r), FUNC(ramdac_device::pal_w));
+	map(0x52, 0x52).w("ramdac", FUNC(ramdac_device::mask_w));
+	map(0x53, 0x53).w("ramdac", FUNC(ramdac_device::index_r_w));
+	map(0x80, 0x87).r(FUNC(bfcobjam_state::input1_r));
+	map(0x88, 0x8f).r(FUNC(bfcobjam_state::input0_r));
+	map(0x88, 0x8f).w(FUNC(bfcobjam_state::output0_w));
+	map(0x90, 0x97).r(FUNC(bfcobjam_state::aux_upd7759_r));
+	map(0x90, 0x97).w(m_ym2413,FUNC(ym2413_device::write));
+	map(0x98, 0x9f).w(FUNC(bfcobjam_state::aux_upd7759_w));
+}
+
+
+static INPUT_PORTS_START( brkball )
+	PORT_START("CJIN0")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_NAME("P2 FIRE C")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_COIN1 )
+
+	PORT_START("CJIN1")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START2 )
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("P1 Left Flip")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("P1 Right Flip")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_START("CJIN2")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P1 Left Flip")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)  PORT_NAME("P1 Right Flip")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SERVICE1 )
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_COIN2 )
+
+	PORT_START("CJIN3")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_TILT ) PORT_NAME("TEST") PORT_CODE(KEYCODE_F1)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+INPUT_PORTS_END
+
+
+void bfcobjam_state::machine_start()
+{
+	membank("bank5")->configure_entries(0, 0x10, memregion("user1")->base(), 0x10000);
+	membank("bank5")->set_entry(1);
+}
+
+void bfcobjam_state::machine_reset()
+{
+	for (unsigned int pal = 0; pal < 256; ++pal)
+	{
+		m_palette->set_pen_color(pal, pal3bit((pal>>5)&7), pal3bit((pal>>2)&7), pal2bit(pal&3));
+	}
+
+	m_rompage = 0 ;
+	m_bank_data[0] = 0;
+	m_bank_data[1] = 0;
+	m_bank_data[2] = 0;
+	m_bank_data[3] = 0;
+
+	m_genio = 0 ;
+	m_global_volume = 0;
+
+	m_ym2413->reset();
+
+
+	m_irq_state = m_blitter_irq = m_scanline_irq = m_acia_irq = 0;
+
+	m_scanline_timer->adjust(m_screen->time_until_pos(0));
+
+	if( m_dm01 )
+		m_dm01->reset() ;
+}
+
+WRITE_LINE_MEMBER(bfcobjam_state::write_acia_clock)
+{
+	m_acia6850_0->write_txc(state);
+	m_acia6850_0->write_rxc(state);
+}
+
+void bfcobjam_state::bfcobjam(machine_config &config)
+{
+	Z8S180(config, m_maincpu, Z8S180_XTAL);
+	m_maincpu->set_addrmap(AS_PROGRAM, &bfcobjam_state::z8s180_prog_map);
+	m_maincpu->set_addrmap(AS_IO, &bfcobjam_state::z8s180_io_map);
+
+	/* TODO */
+	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+	m_screen->set_refresh_hz(50);
+	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500) /* not accurate */);
+	m_screen->set_size(512, 256);
+	m_screen->set_visarea_full();
+	m_screen->set_screen_update(FUNC(bfcobjam_state::screen_update_bfcobjam));
+
+	PALETTE(config, m_palette).set_entries(256);
+
+	ramdac_device &ramdac(RAMDAC(config, "ramdac", 0, m_palette)); // MUSIC Semiconductor TR9C1710 RAMDAC or equivalent
+	ramdac.set_addrmap(0, &bfcobjam_state::ramdac_map);
+	ramdac.set_split_read(1);
+
+	SPEAKER(config, "mono").front_center();
+
+	UPD7759(config, m_upd7759_int);
+	m_upd7759_int->add_route(ALL_OUTPUTS, "mono", 0.40);
+	m_upd7759_int->drq().set(FUNC(bfcobjam_state::upd7759_generate_dreq));
+
+	YM2413(config, m_ym2413, XTAL(3'579'545)).add_route(ALL_OUTPUTS, "mono", 1.0);
+
+
+	/* ACIAs */
+	ACIA6850(config, m_acia6850_0, 0);
+	m_acia6850_0->irq_handler().set(FUNC(bfcobjam_state::z8s180_acia_irq));
+
+	clock_device &acia_clock(CLOCK(config, "acia_clock", 31250*16)); // What are the correct ACIA clocks ?
+	acia_clock.signal_handler().set(FUNC(bfcobjam_state::write_acia_clock));
+
+	I2C_24C08(config, m_i2cmem);
+}
+
+void bfcobjam_state::bfcobjam_with_dmd(machine_config &config)
+{
+	bfcobjam( config ) ;
+
+	UPD7759(config, m_aux_upd7759);
+	m_aux_upd7759->add_route(ALL_OUTPUTS, "mono", 0.40);
+
+	BFM_DM01(config, m_dm01, 0);
+}
+
+/***************************************************************************
+
+  Game driver(s)
+
+  Note: Two different versions of each 6809 ROM exist: standard and protocol
+  It appears sets can be a combination of disk images, 6809 and Z80 ROMs!
+
+***************************************************************************/
+
+ROM_START( inquiztr )
+	ROM_REGION( 0x10000, "audiocpu", 0 )
+	ROM_LOAD( "inq6809", 0x08000, 0x08000, CRC(ae996600) SHA1(f360399e77b81399d910770fa8106c196f04363c) )
+
+	ROM_REGION( 0x20000, "user1", 0 )
+	ROM_LOAD( "9576002.bin", 0x00000, 0x10000, CRC(5b8c8a04) SHA1(af5328fee79c370f45bff36f534aaf50964b6900) )
+
+	ROM_REGION( 0x20000, "altuser1", 0 )
+	ROM_LOAD( "9576028.bin", 0x10000, 0x10000, CRC(2d85682c) SHA1(baec47bff4b8beef5afbb737dc57b22bf93ebcf8) )
+
+		// these look quite different.. (like they belong together) but booting with these gives a checksum error (banking?)
+	ROM_LOAD( "inqvypp1", 0x00000, 0x010000, CRC(9bac8c6e) SHA1(15e24d60c2f3997e637694f60daa552b22628766) )
+	ROM_LOAD( "inqvypp2", 0x10000, 0x010000, CRC(f9cd196c) SHA1(0ac31d87462cbee6f41e19aefe740d876910bdf5) )
+
+	ROM_REGION( 0x1c2000, "user2", 0 )
+	ROM_LOAD( "inqdisk.img", 0x000000, 0x1c2000, NO_DUMP )
+ROM_END
+
+
+
+
+ROM_START( escounts )
+	ROM_REGION( 0x10000, "audiocpu", 0 )
+	ROM_LOAD( "esc12int", 0x08000, 0x08000, CRC(741a1fe6) SHA1(e741d0ae0d2f11036a358120381e4b0df4a560a1) )
+
+	ROM_REGION( 0x10000, "altrevs", 0 )
+	ROM_LOAD( "bfm_esc.bin", 0x08000, 0x08000, CRC(27acb5a5) SHA1(da50d650ab6456d61d0fb7f89247f2040b4bb9a8) )
+	ROM_LOAD( "escint1b",    0x08000, 0x08000, CRC(fde413c9) SHA1(18724a1b771ba4c72e571c356591c5be32948d7a) )
+
+	ROM_REGION( 0x10000, "user1", 0 )
+	ROM_LOAD( "esccobpa", 0x00000, 0x10000, CRC(d8eadeb7) SHA1(9b94f1454e6a17bf8321b0ef4ddd0ed1a56150f7) )
+
+	/* 95-100-207 */
+	ROM_REGION( 0x190000, "user2", 0 )
+	ROM_LOAD( "escdisk4.img", 0x000000, 0x190000, CRC(24156e0f) SHA1(e163daa8effadd93ace2bc2ba1af0f4a190abd7f) )
+ROM_END
+
+ROM_START( trebltop )
+	ROM_REGION( 0x10000, "audiocpu", 0 )
+	ROM_LOAD( "95740078.bin", 0x08000, 0x08000, CRC(aca1980b) SHA1(3d4ed1dc545cc80f56d7daa13028fb10a12a718b) )
+
+	ROM_REGION( 0x10000, "altrevs", 0 )
+	ROM_LOAD( "ttopint", 0x08000, 0x08000, CRC(cc798f90) SHA1(c3f541ebbb3a2c29cc4f00bbd47e289bcff50ecb) )
+
+	ROM_REGION( 0x20000, "user1", 0 )
+	ROM_LOAD( "95760031.bin", 0x00000, 0x10000, CRC(8e75edb8) SHA1(0aaa3834d5ac20f92bdf1f2b8f1eb71854469cbe) )
+	ROM_LOAD( "95760021.bin", 0x10000, 0x10000, CRC(f42016c0) SHA1(7067d018cb4bdcfba777267fb01cddf44e4216c3) )
+
+	ROM_REGION( 0x1c2000, "user2", 0 )
+	ROM_LOAD( "ttdisk1.img", 0x000000, 0x190000, CRC(b2003228) SHA1(5eb49f05137cdd404f22948d39aa79c1518c06eb) )
+
+	ROM_REGION( 0x20000, "upd", 0 )
+	ROM_LOAD( "95000172.bin", 0x00000, 0x10000, CRC(e85367a5) SHA1(695fd95ddeecdb16602f7b0f075cf5128a2fb808) )
+	ROM_LOAD( "95000173.bin", 0x10000, 0x10000, CRC(8bda2c5e) SHA1(79aab5a2af7a5add5fe9132dc13bcc3705c6faf3) )
+ROM_END
+
+ROM_START( beeline )
+	ROM_REGION( 0x10000, "audiocpu", 0 )
+	ROM_LOAD( "bln12int.a", 0x08000, 0x08000, CRC(cb97905e) SHA1(9725156bf64e53a56bc0f90795d4b07db41d059e) )
+
+	ROM_REGION( 0x10000, "altrevs", 0 )
+	ROM_LOAD( "beeint12", 0x8000, 0x008000, CRC(0a77d0be) SHA1(8e55e7b4eb85cc2521d8fdf7ede02131ed80372e) )
+
+
+	ROM_REGION( 0x20000, "user1", 0 )
+	ROM_LOAD( "blncob.pa", 0x00000, 0x10000, CRC(8abc0017) SHA1(ecf6e7a4021b35295eb9bb9aed1b88fff27ffbd1) )
+	ROM_LOAD( "blncob.pb", 0x10000, 0x10000, CRC(feb121fe) SHA1(e83bfd6db00a3264e5076f257e261a1cb4605a83) )
+
+	ROM_REGION( 0x1c2000, "user2", 0 )
+	ROM_LOAD( "beedisk.img", 0x000000, 0x1c2000, NO_DUMP )
+ROM_END
+
+ROM_START( quizvadr )
+	ROM_REGION( 0x10000, "audiocpu", 0 )
+	ROM_LOAD( "q6809.bin", 0x08000, 0x8000, CRC(a74dff10) SHA1(87578694a022dc3d7ade9cc76d387c1ae5fc74d9) )
+
+	ROM_REGION( 0x10000, "altrevs", 0 )
+	ROM_LOAD( "qvadrint", 0x08000, 0x08000, CRC(4c729943) SHA1(ab4e0fb6cfc66540ea1e9e36eebdf85f65c5fd2a) )
+
+	ROM_REGION( 0x200000, "user1", 0 )
+	ROM_LOAD( "5947011r.0", 0x000000, 0x80000, CRC(cac43c97) SHA1(3af529cd0f8ec57dd3596f5bca7b9c74cff171e4) )
+	ROM_LOAD( "5947011r.1", 0x080000, 0x80000, CRC(120018dc) SHA1(cd153d2b7ed535b04dbcaf189d2fc96fe3c5b466) )
+	ROM_LOAD( "5947011r.2", 0x100000, 0x80000, CRC(689b3b5a) SHA1(ea32d18acfd380de822efff4f2c95ce9873a33a2) )
+	ROM_LOAD( "5947011r.3", 0x180000, 0x80000, CRC(c38dafeb) SHA1(d693387a5c3cde34c9d581f81a08a5fbc6f753f2) )
+
+	ROM_REGION( 0x20000, "upd", 0 )
+	ROM_LOAD( "185snd2.bin", 0x00000, 0x10000, CRC(e36eccc2) SHA1(cfd8ca4c71528ea4e229074016240681b6de37cd) )
+	ROM_LOAD( "184snd1.bin", 0x10000, 0x10000, CRC(aac058e8) SHA1(39e59ad9524130fc3bd8d46e1aa78bc4daf04e39) )
+ROM_END
+
+ROM_START( qos )
+	ROM_REGION( 0x10000, "audiocpu", 0 )
+	ROM_LOAD( "39360107.bin", 0x08000, 0x8000, CRC(20844655) SHA1(b67c7f7bbabf6d5139b8ad8cbb5f8cc3f28e9cc7) )
+
+	ROM_REGION( 0x200000, "user1", 0 )
+	ROM_LOAD( "95000338.rm0", 0x000000, 0x80000, CRC(96918aae) SHA1(849ce7b8eccc89c45aacc840a73935f95788a141) )
+	ROM_LOAD( "95000339.rm1", 0x080000, 0x80000, CRC(b4c6dcc0) SHA1(56d8761766dfbd5b0e71f8c3ca575e88f1bc9929) )
 	ROM_LOAD( "95000340.rm2", 0x100000, 0x80000, CRC(66d121fd) SHA1(ac65cc0ac6b0a41e78a3159c21ee44f765bdb5c8) )
 	ROM_LOAD( "95000341.rm3", 0x180000, 0x80000, CRC(ef13658d) SHA1(240bc589900214eac79c91a531f254a9ac2f4ef6) )
 
@@ -1846,12 +2971,28 @@
 
 ROM_END
 
+/*  The dot matrix software "ledv1.bin" is development software and not the release version.
+    Everything appears to work correctly except there are issues when the machine first starts with the
+    display showing a strange animation.
+*/
+ROM_START( brkball )
+	ROM_REGION( 0x200000, "user1", 0 )
+	ROM_LOAD( "95000352.bin", 0x000000, 0x80000, CRC(8daad60a) SHA1(10ac31b7791c2215d0561972ae63e1405361b908) )
+	ROM_LOAD( "95000353.bin", 0x080000, 0x80000, CRC(8e7b84ed) SHA1(b5e9ffe08eabe1446aa583fb85548451d944e811) )
+
+	ROM_REGION( 0x80000, "upd", 0 )
+	ROM_LOAD( "sounds.bin", 0x00000, 0x80000, CRC(4e84402d) SHA1(f6056669f005d8790331be5b0f34d9441190b120) )
+
+	ROM_REGION( 0x20000, "dm01:matrix", 0 )
+	ROM_LOAD("ledv1.bin",  0x00000, 0x10000, CRC(ea918cb9) SHA1(9e7047613cf1cb4b9a7fefb8a02d8479a7b09e6a))
+ROM_END
 
-GAME( 1989, inquiztr, 0,   bfcobra, bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM", "Inquizitor",                       MACHINE_NOT_WORKING )
-GAME( 1990, escounts, 0,   bfcobra, bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM", "Every Second Counts (39-360-053)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1991, trebltop, 0,   bfcobra, bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM", "Treble Top (39-360-070)",          MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1991, beeline,  0,   bfcobra, bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM", "Beeline (39-360-075)",             MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1991, quizvadr, 0,   bfcobra, bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM", "Quizvaders (39-360-078)",          MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1992, qos,      0,   bfcobra, bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM", "A Question of Sport (set 1, 39-960-107)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1992, qosa,     qos, bfcobra, bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM", "A Question of Sport (set 2, 39-960-099)", MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1992, qosb,     qos, bfcobra, bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM", "A Question of Sport (set 3, 39-960-089)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1989, inquiztr, 0,   bfcobra,          bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM",      "Inquizitor",                              MACHINE_NOT_WORKING )
+GAME( 1990, escounts, 0,   bfcobra,          bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM",      "Every Second Counts (39-360-053)",        MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1991, trebltop, 0,   bfcobra,          bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM",      "Treble Top (39-360-070)",                 MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1991, beeline,  0,   bfcobra,          bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM",      "Beeline (39-360-075)",                    MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1991, quizvadr, 0,   bfcobra,          bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM",      "Quizvaders (39-360-078)",                 MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1992, qos,      0,   bfcobra,          bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM",      "A Question of Sport (set 1, 39-960-107)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1992, qosa,     qos, bfcobra,          bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM",      "A Question of Sport (set 2, 39-960-099)", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1992, qosb,     qos, bfcobra,          bfcobra, bfcobra_state, init_bfcobra, ROT0, "BFM",      "A Question of Sport (set 3, 39-960-089)", MACHINE_IMPERFECT_GRAPHICS )
+GAMEL(1994, brkball,  0,   bfcobjam_with_dmd,brkball, bfcobjam_state,init_bfcobjam,ROT0, "BFM/ATOD", "Break Ball",                              MACHINE_IMPERFECT_GRAPHICS, layout_brkball )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/bfm_sc4.cpp mame-0.224+dfsg.1/src/mame/drivers/bfm_sc4.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/bfm_sc4.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/bfm_sc4.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -910,8 +910,8 @@
 	m_duart->set_clocks(XTAL(16'000'000)/2/8, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/16, XTAL(16'000'000)/2/8);
 	m_duart->irq_cb().set(FUNC(sc4_state::bfm_sc4_duart_irq_handler));
 	m_duart->a_tx_cb().set(FUNC(sc4_state::bfm_sc4_duart_txa));
-	m_duart->inport_cb().set(FUNC(sc4_state::bfm_sc4_duart_input_r));;
-	m_duart->outport_cb().set(FUNC(sc4_state::bfm_sc4_duart_output_w));;
+	m_duart->inport_cb().set(FUNC(sc4_state::bfm_sc4_duart_input_r));
+	m_duart->outport_cb().set(FUNC(sc4_state::bfm_sc4_duart_output_w));
 
 	BFM_BDA(config, m_vfd0, 60, 0);
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/bfm_sc5.cpp mame-0.224+dfsg.1/src/mame/drivers/bfm_sc5.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/bfm_sc5.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/bfm_sc5.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -347,8 +347,8 @@
 	m_duart->set_clocks(16000000/2/8, 16000000/2/16, 16000000/2/16, 16000000/2/8);
 	m_duart->irq_cb().set(FUNC(bfm_sc5_state::bfm_sc5_duart_irq_handler));
 	m_duart->a_tx_cb().set(FUNC(bfm_sc5_state::bfm_sc5_duart_txa));
-	m_duart->inport_cb().set(FUNC(bfm_sc5_state::bfm_sc5_duart_input_r));;
-	m_duart->outport_cb().set(FUNC(bfm_sc5_state::bfm_sc5_duart_output_w));;
+	m_duart->inport_cb().set(FUNC(bfm_sc5_state::bfm_sc5_duart_input_r));
+	m_duart->outport_cb().set(FUNC(bfm_sc5_state::bfm_sc5_duart_output_w));
 
 	BFM_BDA(config, m_vfd0, 60, 0);
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/big10.cpp mame-0.224+dfsg.1/src/mame/drivers/big10.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/big10.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/big10.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -51,7 +51,7 @@
 ***************************************************************************/
 
 
-#define MASTER_CLOCK        XTAL(21'477'272)     /* Dumper notes poorly refers to a 21.?727 Xtal. */
+#define MASTER_CLOCK        XTAL(21'477'272)     // Dumper notes poorly refers to a 21.?727 Xtal.
 
 
 #include "emu.h"
@@ -136,11 +136,11 @@
 void big10_state::main_io(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0x00, 0x00).r(FUNC(big10_state::mux_r));         /* present in test mode */
-	map(0x02, 0x02).portr("SYSTEM"); /* coins and service */
+	map(0x00, 0x00).r(FUNC(big10_state::mux_r));         // present in test mode
+	map(0x02, 0x02).portr("SYSTEM"); // coins and service
 	map(0x98, 0x9b).rw("v9938", FUNC(v9938_device::read), FUNC(v9938_device::write));
 	map(0xa0, 0xa1).w("aysnd", FUNC(ay8910_device::address_data_w));
-	map(0xa2, 0xa2).r("aysnd", FUNC(ay8910_device::data_r)); /* Dip-Switches routes here. */
+	map(0xa2, 0xa2).r("aysnd", FUNC(ay8910_device::data_r)); // Dip-Switches routes here.
 }
 
 
@@ -219,7 +219,7 @@
 	PORT_DIPSETTING(    0x80, "x5" )
 	PORT_DIPSETTING(    0xC0, "x10" )
 
-	/* Unconnected, probably missing from the board */
+	// Unconnected, probably missing from the board
 	PORT_START("DSW2")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
 INPUT_PORTS_END
@@ -231,23 +231,23 @@
 
 void big10_state::big10(machine_config &config)
 {
-	/* basic machine hardware */
-	Z80(config, m_maincpu, MASTER_CLOCK/6);    /* guess */
+	// basic machine hardware
+	Z80(config, m_maincpu, MASTER_CLOCK/6);    // guess
 	m_maincpu->set_addrmap(AS_PROGRAM, &big10_state::main_map);
 	m_maincpu->set_addrmap(AS_IO, &big10_state::main_io);
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
 
-	/* video hardware */
+	// video hardware
 	v9938_device &v9938(V9938(config, "v9938", MASTER_CLOCK));
 	v9938.set_screen_ntsc("screen");
 	v9938.set_vram_size(VDP_MEM);
 	v9938.int_cb().set_inputline("maincpu", 0);
 	SCREEN(config, "screen", SCREEN_TYPE_RASTER);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
-	ym2149_device &aysnd(YM2149(config, "aysnd", MASTER_CLOCK/12));    /* guess */
+	ym2149_device &aysnd(YM2149(config, "aysnd", MASTER_CLOCK/12));    // guess
 	aysnd.port_a_read_callback().set_ioport("DSW2");
 	aysnd.port_b_read_callback().set_ioport("DSW1");
 	aysnd.port_a_write_callback().set(FUNC(big10_state::mux_w));
@@ -273,5 +273,5 @@
 *           Game Driver(s)            *
 **************************************/
 
-/*    YEAR  NAME   PARENT    MACHINE   INPUT     STATE        INIT        ROT      COMPANY     FULLNAME   FLAGS  */
-GAME( 1985, big10, 0,        big10,    big10,    big10_state, empty_init, ROT0,   "Success",  "Big 10",   0 )
+/*    YEAR  NAME   PARENT    MACHINE   INPUT     STATE        INIT        ROT     COMPANY     FULLNAME   FLAGS  */
+GAME( 1985, big10, 0,        big10,    big10,    big10_state, empty_init, ROT0,   "Success",  "Big 10",  MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/bigkarnk_ms.cpp mame-0.224+dfsg.1/src/mame/drivers/bigkarnk_ms.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/bigkarnk_ms.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/bigkarnk_ms.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -283,9 +283,15 @@
 
 #include "emu.h"
 #include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
+#include "tilemap.h"
+#include "sound/msm5205.h"
+#include "sound/3812intf.h"
+#include "machine/gen_latch.h"
+#include "machine/bankdev.h"
 
 
 class bigkarnk_ms_state : public driver_device
@@ -294,34 +300,202 @@
 	bigkarnk_ms_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
+		m_soundcpu(*this, "soundcpu"),
+		m_soundlatch(*this, "soundlatch"),
+		m_msm(*this, "msm"),
 		m_palette(*this, "palette"),
 		m_screen(*this, "screen"),
 		m_paletteram(*this, "palette"),
-		m_gfxdecode(*this, "gfxdecode")
+		m_gfxdecode(*this, "gfxdecode"),
+		m_spriteram(*this, "spriteram"),
+		m_videoram1(*this, "videoram1"),
+		m_videoram2(*this, "videoram2"),
+		m_videoram3(*this, "videoram3"),
+		m_scrollregs(*this, "scrollregs"),
+		m_soundrom(*this, "soundrom")
 	{ }
 
 	void bigkarnkm(machine_config &config);
+	void init_bigkarnkm();
+
+protected:
+	virtual void video_start() override;
 
 private:
 	required_device<cpu_device> m_maincpu;
+	required_device<cpu_device> m_soundcpu;
+	required_device<generic_latch_8_device> m_soundlatch;
+	required_device<msm5205_device> m_msm;
 	required_device<palette_device> m_palette;
 	required_device<screen_device> m_screen;
 
 	required_shared_ptr<uint16_t> m_paletteram;
 	required_device<gfxdecode_device> m_gfxdecode;
+	required_shared_ptr<uint16_t> m_spriteram;
+	required_shared_ptr<uint16_t> m_videoram1;
+	required_shared_ptr<uint16_t> m_videoram2;
+	required_shared_ptr<uint16_t> m_videoram3;
+	required_shared_ptr<uint16_t> m_scrollregs;
+	required_device<address_map_bank_device> m_soundrom;
 
 	virtual void machine_start() override;
+	virtual void machine_reset() override;
 
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	void bigkarnkm_map(address_map &map);
+	void sound_map(address_map &map);
+	void soundrom_map(address_map &map);
+
+	uint16_t vram1_r(offs_t offset, uint16_t mem_mask);
+	uint16_t vram2_r(offs_t offset, uint16_t mem_mask);
+	uint16_t vram3_r(offs_t offset, uint16_t mem_mask);
+
+	void vram1_w(offs_t offset, uint16_t data, uint16_t mem_mask);
+	void vram2_w(offs_t offset, uint16_t data, uint16_t mem_mask);
+	void vram3_w(offs_t offset, uint16_t data, uint16_t mem_mask);
+
+	TILE_GET_INFO_MEMBER(get_tile_info_tilemap1);
+	TILE_GET_INFO_MEMBER(get_tile_info_tilemap2);
+	TILE_GET_INFO_MEMBER(get_tile_info_tilemap3);
+
+	tilemap_t *m_bg_tilemap1;
+	tilemap_t *m_bg_tilemap2;
+	tilemap_t *m_bg_tilemap3;
+
+	uint16_t unknown_0x40000x_r();
+
+	DECLARE_WRITE_LINE_MEMBER(splash_msm5205_int);
+	void splash_adpcm_data_w(uint8_t data);
+	void splash_adpcm_control_w(uint8_t data);
+	int m_adpcm_data;
+
+	void descramble_16x16tiles(uint8_t* src, int len);
 };
 
+uint16_t bigkarnk_ms_state::unknown_0x40000x_r()
+{
+	return 0xffff;
+}
+
+TILE_GET_INFO_MEMBER(bigkarnk_ms_state::get_tile_info_tilemap1)
+{
+	int tile = m_videoram1[tile_index*2];
+	int attr = m_videoram1[(tile_index*2)+1] & 0x1f;
+//  int fx = (m_videoram1[(tile_index*2)+1] & 0xc0)>>6;
+
+	// we rearranged the tile order for the 16x16 deode, so have to swap back here
+	tile = ((tile & 0x300) >> 8) | ((tile & 0xff) << 2) | (tile & 0xfc00);
+
+	tileinfo.set(1,tile,attr,0);
+}
+
+
+TILE_GET_INFO_MEMBER(bigkarnk_ms_state::get_tile_info_tilemap2)
+{
+	int tile = m_videoram2[tile_index*2];
+
+	tile &= 0x1fff;
+
+	int attr = m_videoram2[(tile_index*2)+1] & 0xff;
+	//int fx = (m_videoram2[(tile_index*2)+1] & 0xc0)>>6;
+
+	int col = attr & 0x1f;
+
+
+	tileinfo.set(0,tile,col,0);
+}
+
+TILE_GET_INFO_MEMBER(bigkarnk_ms_state::get_tile_info_tilemap3)
+{
+	int tile = m_videoram3[tile_index*2];
+
+	tile &= 0x1fff;
+
+	int attr = m_videoram3[(tile_index*2)+1] & 0xff;
+	//int fx = (m_videoram3[(tile_index*2)+1] & 0xc0)>>6;
+
+	int col = attr & 0x1f;
+
+	tileinfo.set(0,tile,col,0);
+}
+
+uint16_t bigkarnk_ms_state::vram1_r(offs_t offset, uint16_t mem_mask)
+{
+	return m_videoram1[offset];
+}
+
+void bigkarnk_ms_state::vram1_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	COMBINE_DATA(&m_videoram1[offset]);
+	m_bg_tilemap1->mark_tile_dirty(offset/2);
+}
+
+uint16_t bigkarnk_ms_state::vram2_r(offs_t offset, uint16_t mem_mask)
+{
+	return m_videoram2[offset];
+}
+
+void bigkarnk_ms_state::vram2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	COMBINE_DATA(&m_videoram2[offset]);
+	m_bg_tilemap2->mark_tile_dirty(offset/2);
+}
+
+
+uint16_t bigkarnk_ms_state::vram3_r(offs_t offset, uint16_t mem_mask)
+{
+	return m_videoram3[offset];
+}
+
+void bigkarnk_ms_state::vram3_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	COMBINE_DATA(&m_videoram3[offset]);
+	m_bg_tilemap3->mark_tile_dirty(offset/2);
+}
+
+
+
+void bigkarnk_ms_state::video_start()
+{
+	m_bg_tilemap1 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(bigkarnk_ms_state::get_tile_info_tilemap1)), TILEMAP_SCAN_ROWS,  8,  8, 64, 32);
+	m_bg_tilemap2 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(bigkarnk_ms_state::get_tile_info_tilemap2)), TILEMAP_SCAN_ROWS,  16,  16, 32, 32);
+	m_bg_tilemap3 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(bigkarnk_ms_state::get_tile_info_tilemap3)), TILEMAP_SCAN_ROWS,  16,  16, 32, 32);
+
+	m_bg_tilemap1->set_transparent_pen(15);
+	m_bg_tilemap2->set_transparent_pen(0);
+
+}
+
+
 
 void bigkarnk_ms_state::bigkarnkm_map(address_map &map)
 {
 	map(0x000000, 0x07ffff).rom();
+
+	map(0x080000, 0x081fff).rw(FUNC(bigkarnk_ms_state::vram1_r), FUNC(bigkarnk_ms_state::vram1_w)).share("videoram1");
+
+	map(0x090000, 0x090fff).rw(FUNC(bigkarnk_ms_state::vram2_r), FUNC(bigkarnk_ms_state::vram2_w)).share("videoram2");
+	map(0x091000, 0x091fff).ram();
+
+	map(0x0a0000, 0x0a0fff).rw(FUNC(bigkarnk_ms_state::vram3_r), FUNC(bigkarnk_ms_state::vram3_w)).share("videoram3");
+
+	map(0x0c0000, 0x0c000f).ram().share("scrollregs");
+
+	map(0x100000, 0x100fff).ram().share("spriteram");
+
+	map(0x102000, 0x103fff).ram();
+
 	map(0x200000, 0x2007ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
+
+	map(0x400000, 0x400001).portr("IN0");
+	map(0x400002, 0x400003).portr("IN1");
+	map(0x400006, 0x400007).portr("IN2");
+	map(0x400008, 0x400009).portr("IN3");
+
+	map(0x40000c, 0x40000d).noprw();
+	map(0x40000e, 0x40000e).w(m_soundlatch, FUNC(generic_latch_8_device::write));
+
 	map(0xff0000, 0xffffff).ram();
 }
 
@@ -333,10 +507,130 @@
 
 uint32_t bigkarnk_ms_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
+	bitmap.fill(0, cliprect);
+
+	m_bg_tilemap3->set_scrollx(0, 112-(m_scrollregs[6]-0x4));
+	m_bg_tilemap3->set_scrolly(0, -m_scrollregs[7]);
+
+	m_bg_tilemap2->set_scrollx(0, 112-(m_scrollregs[0]-0x2));
+	m_bg_tilemap2->set_scrolly(0, -m_scrollregs[1]);
+
+	m_bg_tilemap1->set_scrollx(0, 112-(m_scrollregs[2]));
+	m_bg_tilemap1->set_scrolly(0, -m_scrollregs[3]);
+
+	m_bg_tilemap3->draw(screen, bitmap, cliprect, 0, 0);
+	m_bg_tilemap2->draw(screen, bitmap, cliprect, 0, 0);
+
+
+	// TODO, convert to device, share between Modualar System games
+	const int NUM_SPRITES = 0x200;
+	const int X_EXTRA_OFFSET = 112;
+
+	for (int i = NUM_SPRITES-2; i >= 0; i-=2)
+	{
+		gfx_element *gfx = m_gfxdecode->gfx(2);
+
+		uint16_t attr0 = m_spriteram[i + 0];
+		uint16_t attr1 = m_spriteram[i + 1];
+
+		uint16_t attr2 = m_spriteram[i + NUM_SPRITES];
+		//uint16_t attr3 = m_spriteram[i + NUM_SPRITES + 1]; // unused?
+
+		int ypos = attr0 & 0x00ff;
+		int xpos = (attr1 & 0xff00)>>8;
+		xpos |= (attr2 & 0x8000) ? 0x100 : 0x000;
+
+		ypos = (0xff - ypos);
+		ypos |= (attr2 & 0x4000) ? 0x100 : 0x000; // maybe
+
+		int tile = (attr0 & 0xff00) >> 8;
+		tile |= (attr1 & 0x003f) << 8;
+
+		int flipx = (attr1 & 0x0040);
+		int flipy = (attr1 & 0x0080);
+
+		gfx->transpen(bitmap,cliprect,tile,(attr2&0x0f00)>>8,flipx,flipy,xpos-16-X_EXTRA_OFFSET,ypos-16,15);
+	}
+
+	m_bg_tilemap1->draw(screen, bitmap, cliprect, 0, 0);
+
 	return 0;
 }
 
 static INPUT_PORTS_START( bigkarnkm )
+
+	PORT_START("IN0")
+	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START1 )
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 )
+	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
+
+	PORT_START("IN1")
+	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(2)
+	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
+	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_START2 )
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN2 )
+	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
+
+	PORT_START("IN2")
+	PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:8,7,6,5")
+	PORT_DIPSETTING(      0x0007, DEF_STR( 4C_1C ) )
+	PORT_DIPSETTING(      0x0008, DEF_STR( 3C_1C ) )
+	PORT_DIPSETTING(      0x0009, DEF_STR( 2C_1C ) )
+	PORT_DIPSETTING(      0x000f, DEF_STR( 1C_1C ) )
+	PORT_DIPSETTING(      0x0006, DEF_STR( 2C_3C ) )
+	PORT_DIPSETTING(      0x000e, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING(      0x000d, DEF_STR( 1C_3C ) )
+	PORT_DIPSETTING(      0x000c, DEF_STR( 1C_4C ) )
+	PORT_DIPSETTING(      0x000b, DEF_STR( 1C_5C ) )
+	PORT_DIPSETTING(      0x000a, DEF_STR( 1C_6C ) )
+	PORT_DIPSETTING(      0x0000, "Free Play (if Coin B too)" )
+	PORT_DIPNAME( 0x00f0, 0x00f0, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:4,3,2,1")
+	PORT_DIPSETTING(      0x0070, DEF_STR( 4C_1C ) )
+	PORT_DIPSETTING(      0x0080, DEF_STR( 3C_1C ) )
+	PORT_DIPSETTING(      0x0090, DEF_STR( 2C_1C ) )
+	PORT_DIPSETTING(      0x00f0, DEF_STR( 1C_1C ) )
+	PORT_DIPSETTING(      0x0060, DEF_STR( 2C_3C ) )
+	PORT_DIPSETTING(      0x00e0, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING(      0x00d0, DEF_STR( 1C_3C ) )
+	PORT_DIPSETTING(      0x00c0, DEF_STR( 1C_4C ) )
+	PORT_DIPSETTING(      0x00b0, DEF_STR( 1C_5C ) )
+	PORT_DIPSETTING(      0x00a0, DEF_STR( 1C_6C ) )
+	PORT_DIPSETTING(      0x0000, "Free Play (if Coin A too)" )
+	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
+
+	PORT_START("IN3")
+	PORT_DIPNAME( 0x0007, 0x0006, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:8,7,6")
+	PORT_DIPSETTING(      0x0007, "0" )
+	PORT_DIPSETTING(      0x0006, "1" )
+	PORT_DIPSETTING(      0x0005, "2" )
+	PORT_DIPSETTING(      0x0004, "3" )
+	PORT_DIPSETTING(      0x0003, "4" )
+	PORT_DIPSETTING(      0x0002, "5" )
+	PORT_DIPSETTING(      0x0001, "6" )
+	PORT_DIPSETTING(      0x0000, "7" )
+	PORT_DIPNAME( 0x0018, 0x0008, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:5,4")
+	PORT_DIPSETTING(      0x0018, "1" )
+	PORT_DIPSETTING(      0x0010, "2" )
+	PORT_DIPSETTING(      0x0008, "3" )
+	PORT_DIPSETTING(      0x0000, "4" )
+	PORT_DIPNAME( 0x0020, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:3")
+	PORT_DIPSETTING(      0x0020, DEF_STR( Off ) )
+	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
+	PORT_DIPNAME( 0x0040, 0x0040, "Impact" ) PORT_DIPLOCATION("SW2:2")
+	PORT_DIPSETTING(      0x0000, DEF_STR( Off ) )
+	PORT_DIPSETTING(      0x0040, DEF_STR( On ) )
+	PORT_SERVICE_DIPLOC(  0x0080, IP_ACTIVE_LOW, "SW2:1" )
+	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
 INPUT_PORTS_END
 
 static const gfx_layout tiles16x16x4_layout =
@@ -350,11 +644,71 @@
 	16 * 16 * 4
 };
 
+static const gfx_layout tiles8x8x4_layout =
+{
+	8,8,
+	RGN_FRAC(1,1),
+	4,
+	{ 0,8,16,24 },
+	{ 0,1,2,3,4,5,6,7 },
+	{ STEP8(0,32) },
+	16 * 16
+};
+
+
 static GFXDECODE_START( gfx_bigkarnk_ms )
-	GFXDECODE_ENTRY( "gfx1", 0, tiles16x16x4_layout, 0, 16 )
-	GFXDECODE_ENTRY( "gfx2", 0, tiles16x16x4_layout, 0, 16 )
+	GFXDECODE_ENTRY( "bgtile", 0, tiles16x16x4_layout, 0, 32 )
+	GFXDECODE_ENTRY( "bgtile", 0, tiles8x8x4_layout, 0, 32 )
+	GFXDECODE_ENTRY( "sprites", 0, tiles16x16x4_layout, 0x200, 32 )
 GFXDECODE_END
 
+void bigkarnk_ms_state::splash_adpcm_data_w(uint8_t data)
+{
+	m_adpcm_data = data;
+}
+
+void bigkarnk_ms_state::splash_adpcm_control_w(uint8_t data)
+{
+	m_msm->reset_w(BIT(data, 7));
+
+	int bank = data & 0x7f;
+
+	if ((bank != 0x02) &&
+		(bank != 0x04) && (bank != 0x05) && (bank != 0x06) && (bank != 0x07) &&
+		(bank != 0x0c) && (bank != 0x0d) && (bank != 0x0e) && (bank != 0x0f))
+	{
+		logerror("splash_adpcm_control_w %02x\n", data);
+	}
+
+	m_soundrom->set_bank(bank & 0xf);
+}
+
+WRITE_LINE_MEMBER(bigkarnk_ms_state::splash_msm5205_int)
+{
+	m_msm->data_w(m_adpcm_data >> 4);
+	m_adpcm_data = (m_adpcm_data << 4) & 0xf0;
+}
+void bigkarnk_ms_state::sound_map(address_map &map)
+{
+	map(0x0000, 0x7fff).rom();
+
+	map(0x8000, 0xbfff).m(m_soundrom, FUNC(address_map_bank_device::amap8));
+
+	map(0xe000, 0xe000).w(FUNC(bigkarnk_ms_state::splash_adpcm_control_w));
+	map(0xe400, 0xe400).w(FUNC(bigkarnk_ms_state::splash_adpcm_data_w));
+
+	map(0xe800, 0xe801).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write));
+
+	map(0xf000, 0xf7ff).ram();
+	map(0xf800, 0xf800).r(m_soundlatch, FUNC(generic_latch_8_device::read));
+}
+
+void bigkarnk_ms_state::soundrom_map(address_map &map)
+{
+	map(0x00000, 0x3ffff).rom().region("soundcpu", 0x000000);
+}
+
+
 void bigkarnk_ms_state::bigkarnkm(machine_config &config)
 {
 	/* basic machine hardware */
@@ -362,23 +716,68 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &bigkarnk_ms_state::bigkarnkm_map);
 	m_maincpu->set_vblank_int("screen", FUNC(bigkarnk_ms_state::irq6_line_hold));
 
+	Z80(config, m_soundcpu, 16_MHz_XTAL/4);
+	m_soundcpu->set_addrmap(AS_PROGRAM, &bigkarnk_ms_state::sound_map);
+	m_soundcpu->set_periodic_int(FUNC(bigkarnk_ms_state::nmi_line_pulse), attotime::from_hz(60*64));
+
+	ADDRESS_MAP_BANK(config, m_soundrom).set_map(&bigkarnk_ms_state::soundrom_map).set_options(ENDIANNESS_LITTLE, 8, 18, 0x4000);
+
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
 	m_screen->set_refresh_hz(60);
 	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500) /* not accurate */);
-	m_screen->set_size(256, 256);
-	m_screen->set_visarea(0, 256-1, 0, 256-32-1);
+	m_screen->set_size(512, 256);
+	m_screen->set_visarea(0, 320-1, 0, 256-16-1);
 	m_screen->set_screen_update(FUNC(bigkarnk_ms_state::screen_update));
 	m_screen->set_palette(m_palette);
 
-	PALETTE(config, m_palette).set_format(palette_device::xRGB_444, 0x400);
+	PALETTE(config, m_palette).set_format(palette_device::xBRG_444, 0x400);
 
 	GFXDECODE(config, m_gfxdecode, "palette", gfx_bigkarnk_ms);
 
+	GENERIC_LATCH_8(config, m_soundlatch);
+	m_soundlatch->data_pending_callback().set_inputline(m_soundcpu, INPUT_LINE_IRQ0);
+
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
+
+	YM3812(config, "ymsnd", XTAL(16'000'000)/4).add_route(ALL_OUTPUTS, "mono", 0.80);
+
+	MSM5205(config, m_msm, XTAL(384'000));
+	m_msm->vck_legacy_callback().set(FUNC(bigkarnk_ms_state::splash_msm5205_int));
+	m_msm->set_prescaler_selector(msm5205_device::S48_4B);
+	m_msm->add_route(ALL_OUTPUTS, "mono", 0.80);
+}
+
+
+// reorganize graphics into something we can decode with a single pass
+void bigkarnk_ms_state::descramble_16x16tiles(uint8_t* src, int len)
+{
+	std::vector<uint8_t> buffer(len);
+	{
+		for (int i = 0; i < len; i++)
+		{
+			int j = bitswap<20>(i, 19,18,17,16,15,12,11,10,9,8,7,6,5,14,13,4,3,2,1,0);
+			buffer[j] = src[i];
+		}
+
+		std::copy(buffer.begin(), buffer.end(), &src[0]);
+	}
+}
+
+void bigkarnk_ms_state::init_bigkarnkm()
+{
+	descramble_16x16tiles(memregion("bgtile")->base(), memregion("bgtile")->bytes());
 }
 
+
+void bigkarnk_ms_state::machine_reset()
+{
+	m_soundrom->set_bank(0);
+}
+
+
+
 ROM_START( bigkarnkm )
 	ROM_REGION( 0x080000, "maincpu", 0 )    /* 68000 code */
 	ROM_LOAD16_BYTE( "cpu_ka_6.ic8",   0x000001, 0x020000, CRC(ab71c1d3) SHA1(3174f1c68e4aa5b6053b118da1fed1f4001193b0) )
@@ -386,35 +785,36 @@
 	ROM_LOAD16_BYTE( "cpu_ka_6.ic11",  0x040001, 0x020000, CRC(30674ef3) SHA1(d1b29337068ed7323c104a48de593c9ac4668e66) )
 	ROM_LOAD16_BYTE( "cpu_ka_6.ic20",  0x040000, 0x020000, CRC(332d6dea) SHA1(cd7e402642f57c12cb7405c49b75bfaa0d104421) )
 
-	ROM_REGION( 0x010000, "audiocpu", 0 )    /* Z80 code (uses YM3812 + M5205) */
-	ROM_LOAD( "snd_ka.ic6",   0x000000, 0x010000, CRC(48a66be8) SHA1(0ca8e4ef5b5e257d56afda6946c5f2a0712917a3) )
-
-	ROM_REGION( 0x020000, "audiodata", 0 )
-	ROM_LOAD( "snd_ka.ic11",   0x000000, 0x020000, CRC(8e53a6b8) SHA1(5082bbcb042216a6d58c654a52c98d75df700ac8) )
-
-	ROM_REGION( 0x180000, "gfx1", ROMREGION_ERASEFF ) // sprites (same rom subboard type as galpanic_ms.cpp)
-	ROM_LOAD32_BYTE( "5_ka.ic4",         0x000003, 0x020000, CRC(2bee07ea) SHA1(afd8769955314768db894e4e98f65422fc0dbb4f) )
-	ROM_LOAD32_BYTE( "5_ka.ic13",        0x000002, 0x020000, CRC(d55e3024) SHA1(71c84a76b08f8983f65ac4b99430eeb30dc3f8ea) )
-	ROM_LOAD32_BYTE( "5_ka.ic19",        0x000001, 0x020000, CRC(fc682c21) SHA1(c3fa9907fbe276bc4b74b79dda52713e702e441c) )
-	ROM_LOAD32_BYTE( "5_ka.ic25",        0x000000, 0x020000, CRC(1157b739) SHA1(fdea10f808f258409e19e41dedfb3d4699e7daa2) )
-	ROM_LOAD32_BYTE( "5_ka.ic5",         0x080003, 0x020000, CRC(507056f7) SHA1(e754c803f85862a37d2a48be6554ff5bc4128b4d) )
-	ROM_LOAD32_BYTE( "5_ka.ic14",        0x080002, 0x020000, CRC(ef936e76) SHA1(ed93b04a45c38c0fa7333f182beba33fafe17f38) )
-	ROM_LOAD32_BYTE( "5_ka.ic20",        0x080001, 0x020000, CRC(38854cd6) SHA1(b32efc1c621a9d8559c294f7431c219a05a37db6) )
-	ROM_LOAD32_BYTE( "5_ka.ic26",        0x080000, 0x020000, CRC(3f63c4ed) SHA1(e0dd3ec27e7aa0b7db1587e83d20d1b9333ca405) )
-	ROM_LOAD32_BYTE( "5_ka.ic6",         0x100003, 0x020000, CRC(2fdbc484) SHA1(6e8ac1a8bde8189b7ebf32c59185425c512ab911) )
-	ROM_LOAD32_BYTE( "5_ka.ic15",        0x100002, 0x020000, CRC(802128e4) SHA1(20cfdf28aa7ada404ceca236c6eb554dcaa8e633) )
-	ROM_LOAD32_BYTE( "5_ka.ic21",        0x100001, 0x020000, CRC(5ccc0f99) SHA1(ae2b2d4b2aa77a099ad2711032e6a05ab52789b9) )
-	ROM_LOAD32_BYTE( "5_ka.ic27",        0x100000, 0x020000, CRC(55509d96) SHA1(ddd064695ca7e8c2377f13484e385bf7ea7df610) )
-
-	ROM_REGION( 0x100000, "gfx2", 0 )
-	ROM_LOAD32_BYTE( "8_ka_814.ic14",      0x000003, 0x020000, CRC(50e6cab6) SHA1(5af8b27f35a59611484ea35a2883b1e59d5c7517) )
-	ROM_LOAD32_BYTE( "8_ka_821.ic21",      0x000002, 0x020000, CRC(90c1d93e) SHA1(581a1e2f30e8b467c8d8f5c8e528c78c0c3904f2) )
-	ROM_LOAD32_BYTE( "8_ka_829.ic29",      0x000001, 0x020000, CRC(8c5df0ec) SHA1(15a5b847d6d035f27300435a03bd254dd9b3f99c) )
-	ROM_LOAD32_BYTE( "8_ka_836.ic36",      0x000000, 0x020000, CRC(43de75db) SHA1(419e7702d17c52365addb8bfda582e916762ead5) )
-	ROM_LOAD32_BYTE( "8_ka_815.ic15",      0x080003, 0x020000, CRC(59d79b33) SHA1(70b9c60a72e517ac70f807c918f0ad4dd6c98f98) )
-	ROM_LOAD32_BYTE( "8_ka_822.ic22",      0x080002, 0x020000, CRC(12fc89c0) SHA1(883144d0c453cd8f829b2209d9a8028b7f87d0d5) )
-	ROM_LOAD32_BYTE( "8_ka_830.ic30",      0x080001, 0x020000, CRC(9904ae87) SHA1(5df3b35185c53a64c0647d297a19b9c013a3b3c2) )
-	ROM_LOAD32_BYTE( "8_ka_837.ic37",      0x080000, 0x020000, CRC(f475eaa7) SHA1(8e5c7f0231d7f84bc377b756b99d055a4791e3bf) )
+	ROM_REGION( 0x040000, "soundcpu", 0 )    /* Z80 code (uses YM3812 + M5205) */
+	ROM_LOAD( "snd_ka.ic6",    0x000000, 0x010000, CRC(48a66be8) SHA1(0ca8e4ef5b5e257d56afda6946c5f2a0712917a3) ) // 0,1,2,3
+	ROM_LOAD( "snd_ka.ic11",   0x010000, 0x010000, CRC(8e53a6b8) SHA1(5082bbcb042216a6d58c654a52c98d75df700ac8) ) // 4,5,6,7
+	ROM_CONTINUE(0x30000,0x10000) // c,d,e,f
+
+	ROM_REGION( 0x180000, "sprites", ROMREGION_ERASEFF | ROMREGION_INVERT ) // sprites (same rom subboard type as galpanic_ms.cpp)
+	ROM_LOAD32_BYTE( "5_ka.ic4",         0x080003, 0x020000, CRC(2bee07ea) SHA1(afd8769955314768db894e4e98f65422fc0dbb4f) )
+	ROM_LOAD32_BYTE( "5_ka.ic13",        0x080002, 0x020000, CRC(d55e3024) SHA1(71c84a76b08f8983f65ac4b99430eeb30dc3f8ea) )
+	ROM_LOAD32_BYTE( "5_ka.ic19",        0x080001, 0x020000, CRC(fc682c21) SHA1(c3fa9907fbe276bc4b74b79dda52713e702e441c) )
+	ROM_LOAD32_BYTE( "5_ka.ic25",        0x080000, 0x020000, CRC(1157b739) SHA1(fdea10f808f258409e19e41dedfb3d4699e7daa2) )
+
+	ROM_LOAD32_BYTE( "5_ka.ic5",         0x100003, 0x020000, CRC(507056f7) SHA1(e754c803f85862a37d2a48be6554ff5bc4128b4d) )
+	ROM_LOAD32_BYTE( "5_ka.ic14",        0x100002, 0x020000, CRC(ef936e76) SHA1(ed93b04a45c38c0fa7333f182beba33fafe17f38) )
+	ROM_LOAD32_BYTE( "5_ka.ic20",        0x100001, 0x020000, CRC(38854cd6) SHA1(b32efc1c621a9d8559c294f7431c219a05a37db6) )
+	ROM_LOAD32_BYTE( "5_ka.ic26",        0x100000, 0x020000, CRC(3f63c4ed) SHA1(e0dd3ec27e7aa0b7db1587e83d20d1b9333ca405) )
+
+	ROM_LOAD32_BYTE( "5_ka.ic6",         0x000003, 0x020000, CRC(2fdbc484) SHA1(6e8ac1a8bde8189b7ebf32c59185425c512ab911) )
+	ROM_LOAD32_BYTE( "5_ka.ic15",        0x000002, 0x020000, CRC(802128e4) SHA1(20cfdf28aa7ada404ceca236c6eb554dcaa8e633) )
+	ROM_LOAD32_BYTE( "5_ka.ic21",        0x000001, 0x020000, CRC(5ccc0f99) SHA1(ae2b2d4b2aa77a099ad2711032e6a05ab52789b9) )
+	ROM_LOAD32_BYTE( "5_ka.ic27",        0x000000, 0x020000, CRC(55509d96) SHA1(ddd064695ca7e8c2377f13484e385bf7ea7df610) )
+
+	ROM_REGION( 0x100000, "bgtile", 0 )
+	ROM_LOAD32_BYTE( "8_ka_815.ic15",      0x000003, 0x020000, CRC(59d79b33) SHA1(70b9c60a72e517ac70f807c918f0ad4dd6c98f98) )
+	ROM_LOAD32_BYTE( "8_ka_822.ic22",      0x000002, 0x020000, CRC(12fc89c0) SHA1(883144d0c453cd8f829b2209d9a8028b7f87d0d5) )
+	ROM_LOAD32_BYTE( "8_ka_830.ic30",      0x000001, 0x020000, CRC(9904ae87) SHA1(5df3b35185c53a64c0647d297a19b9c013a3b3c2) )
+	ROM_LOAD32_BYTE( "8_ka_837.ic37",      0x000000, 0x020000, CRC(f475eaa7) SHA1(8e5c7f0231d7f84bc377b756b99d055a4791e3bf) )
+	ROM_LOAD32_BYTE( "8_ka_814.ic14",      0x080003, 0x020000, CRC(50e6cab6) SHA1(5af8b27f35a59611484ea35a2883b1e59d5c7517) )
+	ROM_LOAD32_BYTE( "8_ka_821.ic21",      0x080002, 0x020000, CRC(90c1d93e) SHA1(581a1e2f30e8b467c8d8f5c8e528c78c0c3904f2) )
+	ROM_LOAD32_BYTE( "8_ka_829.ic29",      0x080001, 0x020000, CRC(8c5df0ec) SHA1(15a5b847d6d035f27300435a03bd254dd9b3f99c) )
+	ROM_LOAD32_BYTE( "8_ka_836.ic36",      0x080000, 0x020000, CRC(43de75db) SHA1(419e7702d17c52365addb8bfda582e916762ead5) )
 
 	ROM_REGION( 0x100, "prom", ROMREGION_ERASEFF )
 	ROM_LOAD( "51_p0502_n82s129n.ic10",      0x000, 0x100, CRC(15085e44) SHA1(646e7100fcb112594023cf02be036bd3d42cc13c) ) // common PROM found on all? Modular System sets?
@@ -438,4 +838,4 @@
 	ROM_LOAD( "snd_9348_gal16v8-25hb1.ic10", 0, 1, NO_DUMP )
 ROM_END
 
-GAME( 1991, bigkarnkm,  bigkarnk,  bigkarnkm,  bigkarnkm,  bigkarnk_ms_state, empty_init, ROT0, "Gaelco", "Big Karnak (Modular System)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1991, bigkarnkm,  bigkarnk,  bigkarnkm,  bigkarnkm,  bigkarnk_ms_state, init_bigkarnkm, ROT0, "Gaelco", "Big Karnak (Modular System)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/bingor.cpp mame-0.224+dfsg.1/src/mame/drivers/bingor.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/bingor.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/bingor.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -132,7 +132,7 @@
   |                      |  M  | |  M  |             |
   |                      +-----+ +-----+             |
   |                    +-----------------+           |
-  |                    | P825GAH         |           |
+  |                    | P8256AH         |           |
   |                    | L4203043        |           |
   |                    | INTEL 1975      |           |
   |                    +-----------------+           |
@@ -211,7 +211,7 @@
   |                      |  M  | |  M  |             |
   |                      +-----+ +-----+             |
   |                    +-----------------+           |
-  |                    | P825GAH         |           |
+  |                    | P8256AH         |           |
   |                    | L4203043        |           |
   |                    | INTEL 1975      |           |
   |                    +-----------------+           |
@@ -291,7 +291,7 @@
   |                      |  M  | |  M  |             |
   |                      +-----+ +-----+             |
   |                    +-----------------+           |
-  |                    | P825GAH         |           |
+  |                    | P8256AH         |           |
   |                    | L4203043        |           |
   |                    | INTEL 1975      |           |
   |                    +-----------------+           |
@@ -370,7 +370,7 @@
   |                      |  M  | |  M  |             |
   |                      +-----+ +-----+             |
   |                    +-----------------+           |
-  |                    | P825GAH         |           |
+  |                    | P8256AH         |           |
   |                    | L4203043        |           |
   |                    | INTEL 1975      |           |
   |                    +-----------------+           |
@@ -568,33 +568,33 @@
 
 	bitmap.fill(m_palette->black_pen(), cliprect);
 
-	count = (0x2000/2);
+	count = (0x2000 / 2);
 
-	for(y=0;y<256;y++)
+	for(y = 0; y < 256; y++)
 	{
-		for(x=0;x<286;x+=4)
+		for(x = 0; x < 286; x += 4)
 		{
 			uint32_t color;
 
-			color = (m_blit_ram[count] & 0xf000)>>12;
+			color = (m_blit_ram[count] & 0xf000) >> 12;
 
-			if(cliprect.contains(x+3, y))
-				bitmap.pix32(y, x+3) = m_palette->pen(color);
+			if(cliprect.contains(x + 3, y))
+				bitmap.pix32(y, x + 3) = m_palette->pen(color);
 
-			color = (m_blit_ram[count] & 0x0f00)>>8;
+			color = (m_blit_ram[count] & 0x0f00) >> 8;
 
-			if(cliprect.contains(x+2, y))
-				bitmap.pix32(y, x+2) = m_palette->pen(color);
+			if(cliprect.contains(x + 2, y))
+				bitmap.pix32(y, x + 2) = m_palette->pen(color);
 
-			color = (m_blit_ram[count] & 0x00f0)>>4;
+			color = (m_blit_ram[count] & 0x00f0) >> 4;
 
-			if(cliprect.contains(x+1, y))
-				bitmap.pix32(y, x+1) = m_palette->pen(color);
+			if(cliprect.contains(x + 1, y))
+				bitmap.pix32(y, x + 1) = m_palette->pen(color);
 
-			color = (m_blit_ram[count] & 0x000f)>>0;
+			color = (m_blit_ram[count] & 0x000f) >> 0;
 
-			if(cliprect.contains(x+0, y))
-				bitmap.pix32(y, x+0) = m_palette->pen(color);
+			if(cliprect.contains(x + 0, y))
+				bitmap.pix32(y, x + 0) = m_palette->pen(color);
 
 			count++;
 		}
@@ -680,17 +680,17 @@
 
 static const gfx_layout bingor_layout =
 {
-	8,8,
-	RGN_FRAC(1,1),
+	8, 8,
+	RGN_FRAC(1, 1),
 	4,
-	{ 0,1,2,3 },
-	{ 0,4,8,12,16,20,24,28 },
+	{ 0, 1, 2, 3 },
+	{ 0, 4, 8, 12, 16, 20, 24, 28 },
 	{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 },
-	8*32
+	8 * 32
 };
 
 static GFXDECODE_START( gfx_bingor )
-	GFXDECODE_ENTRY( "gfx", 0, bingor_layout,   0x0, 2  )
+	GFXDECODE_ENTRY( "gfx", 0, bingor_layout, 0, 2  )
 GFXDECODE_END
 
 
@@ -761,6 +761,7 @@
 	map(0xc000, 0xcfff).ram();
 }
 
+
 void bingor_state::vip2000(machine_config &config)
 {
 	I80186(config, m_maincpu, XTAL(10'000'000));
@@ -795,73 +796,74 @@
 	ymz.add_route(ALL_OUTPUTS, "mono", 0.50);
 }
 
+
 // I doubt we need to load the EEPROMs
 
-ROM_START( bingor1 )
-	ROM_REGION16_LE( 0x10000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */
+ROM_START( bingor1 )    // Strings: Big Roll / Bingo Roll / 1991 AWR / 1992 Rosenauer Electronic Austria.
+	ROM_REGION16_LE( 0x10000, "boot_prg", ROMREGION_ERASE00 )   // i186 code
 	ROM_LOAD16_BYTE( "bingo v 29.4.99 l.bin", 0x00000, 0x08000, CRC(b6773bff) SHA1(74e375662730e002e05186bd77098fa0d8e43ade) )
 	ROM_LOAD16_BYTE( "bingo v 29.4.99 h.bin", 0x00001, 0x08000, CRC(0e18f90a) SHA1(0743302e675f01f8ad42ac2e67ecb1c1bf870ae7) )
 
 	// gfx roms on this one are twice the size of the others
-	ROM_REGION16_LE( 0x20000, "gfx", 0 ) /* blitter data? */
+	ROM_REGION16_LE( 0x20000, "gfx", 0 )    // blitter data?
 	ROM_LOAD16_BYTE( "bingo turbo l.bin", 0x000000, 0x10000, CRC(86b10566) SHA1(5f74b250ced3574feffdc40b6ed013ec5a0c2c97) )
 	ROM_LOAD16_BYTE( "bingo turbo h.bin", 0x000001, 0x10000, CRC(7e18f9d7) SHA1(519b65d6812a3762e3215f4918c834d5a444b28a) )
 
-	ROM_REGION( 0x20000, "pic", 0 ) /* protection? */
+	ROM_REGION( 0x20000, "pic", 0 ) // protection?
 	ROM_LOAD( "pic16c54b.bin", 0x000, 0x200, CRC(21e8a699) SHA1(8a22292fa3669105d52a9d681d5be345fcfe6607) )
 
-	ROM_REGION( 0x20000, "eeprom", 0 ) /* eeprom */
+	ROM_REGION( 0x20000, "eeprom", 0 )  // eeprom
 	ROM_LOAD( "bingor1_24c04a.bin", 0x000000, 0x200, CRC(b169df46) SHA1(ebafc81c6918aae9daa6b90df16161751cfd2590) )
 ROM_END
 
-ROM_START( bingor2 )
-	ROM_REGION16_LE( 0x20000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */
+ROM_START( bingor2 )    // Strings: Euro Bingo / 1988-1992 Rosenauer Electronic Austria.
+	ROM_REGION16_LE( 0x20000, "boot_prg", ROMREGION_ERASE00 )   // i186 code
 	ROM_LOAD16_BYTE( "bingo roll vip2 v26.02.02_l.bin", 0x00000, 0x10000, CRC(40df6ee8) SHA1(1e90ef906e47f95ebde85b6dd32fdfe50c0564fc) )
 	ROM_LOAD16_BYTE( "bingo roll vip2 v26.02.02_h.bin", 0x00001, 0x10000, CRC(9154c183) SHA1(a4060294295a9b8df07ce9fcfeefcf009e129817) )
 
-	ROM_REGION16_LE( 0x20000, "gfx", 0 ) /* blitter data? */
+	ROM_REGION16_LE( 0x20000, "gfx", 0 )    // blitter data?
 	ROM_LOAD16_BYTE( "bingo roll grafik l.bin", 0x000000, 0x10000, CRC(3e753e13) SHA1(011b5f530e54332be194830c0a1d2ec31425017a) )
 	ROM_LOAD16_BYTE( "bingo roll grafik h.bin", 0x000001, 0x10000, CRC(4eec39ad) SHA1(4201d5ec207d30dcac9813dd6866d2b61c168e75) )
 
-	ROM_REGION( 0x20000, "pic", 0 ) /* protection? */
+	ROM_REGION( 0x20000, "pic", 0 ) // protection
 	ROM_LOAD( "pic16c54c.bin", 0x000, 0x200, CRC(21e8a699) SHA1(8a22292fa3669105d52a9d681d5be345fcfe6607) )
 
-	ROM_REGION( 0x20000, "eeprom", 0 ) /* eeprom */
+	ROM_REGION( 0x20000, "eeprom", 0 )  // eeprom
 	ROM_LOAD( "bingor2_24c04a.bin", 0x000000, 0x200, CRC(a7c87036) SHA1(f7d6161bbfdcdc50212f6b71eb2cbbbb18548cc6) )
 ROM_END
 
-ROM_START( bingor3 )
-	ROM_REGION16_LE( 0x10000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */
+ROM_START( bingor3 )    // Strings: 1995-1997 Paloma Elektronik / 2002 Paloma Elektronik / Play Star Austria 0316/821193.
+	ROM_REGION16_LE( 0x10000, "boot_prg", ROMREGION_ERASE00 )   // i186 code
 	ROM_LOAD16_BYTE( "bellstar vip2l 27.07_1.bin", 0x00000, 0x08000, CRC(0115bca7) SHA1(0b692b46bc6641296861666f00ec0475dc7296a1) )
 	ROM_LOAD16_BYTE( "bellstar vip2l 27.07_2.bin", 0x00001, 0x08000, CRC(c689aa69) SHA1(fb1f477654909f156c30a6be29f84962f4edb1c3) )
 
-	ROM_REGION16_LE( 0x20000, "gfx", ROMREGION_ERASE00 ) /* blitter data? */
+	ROM_REGION16_LE( 0x20000, "gfx", ROMREGION_ERASE00 )    // blitter data?
 	ROM_LOAD16_BYTE( "bsg-11.10.02_l.bin", 0x000000, 0x08000, CRC(a8b22477) SHA1(92d638f0f188a43f14487989cf42195311fb2c35) ) //half size?
 	ROM_LOAD16_BYTE( "bsg-11.10.02_h.bin", 0x000001, 0x08000, CRC(969d201c) SHA1(7705ceb383ef122538ebf8046041d1c24ec9b9a4) )
 
-	ROM_REGION( 0x20000, "pic", 0 ) /* protection? */
+	ROM_REGION( 0x20000, "pic", 0 ) // protection
 	ROM_LOAD( "pic16c54c.bin", 0x000, 0x400, CRC(5a507be6) SHA1(f4fbfb7e7516eecab32d96b3a34ad88395edac9e) )
 
-	ROM_REGION( 0x20000, "eeprom", 0 ) /* eeprom */
-	ROM_LOAD( "bingor3_24c04a.bin", 0x000000, 0x200,  CRC(7a5eb172) SHA1(12d2fc96049427ef1a8acf47242b41b2095d28b6) )
-	ROM_LOAD( "bingor3_24c04a_alt.bin", 0x000000, 0x200,  CRC(fcff2d26) SHA1(aec1ddd38149404741a057c74bf84bfb4a8e4aa1) )
+	ROM_REGION( 0x20000, "eeprom", 0 )  // eeprom
+	ROM_LOAD( "bingor3_24c04a.bin",     0x000000, 0x200, CRC(7a5eb172) SHA1(12d2fc96049427ef1a8acf47242b41b2095d28b6) )
+	ROM_LOAD( "bingor3_24c04a_alt.bin", 0x000000, 0x200, CRC(fcff2d26) SHA1(aec1ddd38149404741a057c74bf84bfb4a8e4aa1) )
 ROM_END
 
 // this is a mix of 2 of the other sets.. I don't know if it's correct
-ROM_START( bingor4 )
-	ROM_REGION16_LE( 0x10000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */
+ROM_START( bingor4 )    // Strings: 1995-1997 Paloma Elektronik / 2002 Paloma Elektronik / Play Star Austria 0316/821193 / CBA Design, Lyon France.
+	ROM_REGION16_LE( 0x10000, "boot_prg", ROMREGION_ERASE00 )   // i186 code
 	ROM_LOAD16_BYTE( "01.bin", 0x00000, 0x08000, CRC(0115bca7) SHA1(0b692b46bc6641296861666f00ec0475dc7296a1) )
 	ROM_LOAD16_BYTE( "02.bin", 0x00001, 0x08000, CRC(c689aa69) SHA1(fb1f477654909f156c30a6be29f84962f4edb1c3) )
 
-	ROM_REGION16_LE( 0x20000, "gfx", 0 ) /* blitter data? */
+	ROM_REGION16_LE( 0x20000, "gfx", 0 )    // blitter data?
 	ROM_LOAD16_BYTE( "bingo roll grafik l.bin", 0x000000, 0x10000, CRC(3e753e13) SHA1(011b5f530e54332be194830c0a1d2ec31425017a) )
 	ROM_LOAD16_BYTE( "bingo roll grafik h.bin", 0x000001, 0x10000, CRC(4eec39ad) SHA1(4201d5ec207d30dcac9813dd6866d2b61c168e75) )
 
-	ROM_REGION( 0x20000, "pic", 0 ) /* protection? */
+	ROM_REGION( 0x20000, "pic", 0 ) // protection?
 	ROM_LOAD( "pic16c54c.bin", 0x000, 0x200, CRC(21e8a699) SHA1(8a22292fa3669105d52a9d681d5be345fcfe6607) )
 
-	ROM_REGION( 0x20000, "eeprom", 0 ) /* eeprom */
-	ROM_LOAD( "bingor4_24c04a.bin", 0x000000, 0x200,  CRC(38cf70a9) SHA1(ba9a1640200963e2d58d761edc13a24fa5ef44c2) )
+	ROM_REGION( 0x20000, "eeprom", 0 )  // eeprom
+	ROM_LOAD( "bingor4_24c04a.bin", 0x000000, 0x200, CRC(38cf70a9) SHA1(ba9a1640200963e2d58d761edc13a24fa5ef44c2) )
 ROM_END
 
 /*
@@ -871,25 +873,55 @@
 
 */
 
-ROM_START( bingor5 )    /* BellStar V3 */
-	ROM_REGION16_LE( 0x10000, "boot_prg", ROMREGION_ERASE00 ) /* i186 code */
+ROM_START( bingor5 )    // BellStar V3.  Strings: 1995-1997 Paloma Elektronik / 2002 Paloma Elektronik / Play Star Austria 0316/821193 / CBA Design, Lyon France.
+	ROM_REGION16_LE( 0x10000, "boot_prg", ROMREGION_ERASE00 )   // i186 code
 	ROM_LOAD16_BYTE( "bellstar_v3_v.3.6.02_l.bin", 0x00000, 0x08000, CRC(56b84a5d) SHA1(1bda4fb972b4f0f0575089b545bf15dfea859948) )
 	ROM_LOAD16_BYTE( "bellstar_v3_v.3.6.02_h.bin", 0x00001, 0x08000, CRC(d6945bb8) SHA1(b620f1b547be03c4609bff8d06111d0ea425bae8) )
 
-	ROM_REGION16_LE( 0x20000, "gfx", ROMREGION_ERASE00 ) /* blitter data? */
+	ROM_REGION16_LE( 0x20000, "gfx", ROMREGION_ERASE00 )    // blitter data?
 	ROM_LOAD16_BYTE( "b.s.grafik_11.10.02_l.bin", 0x000000, 0x08000, CRC(a8b22477) SHA1(92d638f0f188a43f14487989cf42195311fb2c35) ) //half size?
 	ROM_LOAD16_BYTE( "b.s.grafik_11.10.02_h.bin", 0x000001, 0x08000, CRC(969d201c) SHA1(7705ceb383ef122538ebf8046041d1c24ec9b9a4) )
 
-	ROM_REGION( 0x20000, "pic", 0 ) /* protection? */
+	ROM_REGION( 0x20000, "pic", 0 ) // protection?
 	ROM_LOAD( "pic16c54c.bin", 0x000, 0x400, CRC(5a507be6) SHA1(f4fbfb7e7516eecab32d96b3a34ad88395edac9e) )
 
-	ROM_REGION( 0x20000, "eeprom", 0 ) /* eeprom */
-	ROM_LOAD( "bingor5_24c04a.bin", 0x000000, 0x200,  CRC(fcff2d26) SHA1(aec1ddd38149404741a057c74bf84bfb4a8e4aa1) )
+	ROM_REGION( 0x20000, "eeprom", 0 )  // eeprom
+	ROM_LOAD( "bingor5_24c04a.bin", 0x000000, 0x200, CRC(fcff2d26) SHA1(aec1ddd38149404741a057c74bf84bfb4a8e4aa1) )
+ROM_END
+
+/* Bingo Roll / Turbo Bingo?
+   1991,
+   AWR Hard & Soft
+   Austria.
+
+   Same PCB layout as bingor3,
+   but 2x crystals:
+
+   1x 16 MHz. (sub board)
+   1x 10 MHz. (main board)
+
+   1x MP690P
+
+*/
+ROM_START( bingor6 )    // Strings: 1988-1992 AWR Hard & Soft Austria.
+	ROM_REGION16_LE( 0x10000, "boot_prg", ROMREGION_ERASE00 )   // i186 code
+	ROM_LOAD16_BYTE( "bingo_l.bin", 0x00000, 0x08000, CRC(78df905d) SHA1(197c5a795bdda964db780dd3b9c0f9b76197a610) )
+	ROM_LOAD16_BYTE( "bingo_h.bin", 0x00001, 0x08000, CRC(f25958fd) SHA1(8a8c061accc4c2fa8475188a1281518e63fb456d) )
+
+	ROM_REGION16_LE( 0x20000, "gfx", ROMREGION_ERASE00 )    // blitter data?
+	ROM_LOAD16_BYTE( "turbo_l.bin", 0x000000, 0x10000, CRC(86b10566) SHA1(5f74b250ced3574feffdc40b6ed013ec5a0c2c97) )
+	ROM_LOAD16_BYTE( "turbo_h.bin", 0x000001, 0x10000, CRC(7e18f9d7) SHA1(519b65d6812a3762e3215f4918c834d5a444b28a) )
+
+	ROM_REGION( 0x20000, "pic", 0 ) // protection?
+	ROM_LOAD( "pic16c54rc.bin", 0x000, 0x400, NO_DUMP )
+
+	ROM_REGION( 0x20000, "eeprom", 0 )  // eeprom
+	ROM_LOAD( "bingor6_24c04a.bin", 0x000000, 0x200, CRC(9d271c5f) SHA1(8ac5c4848fb8d9a156ba760324022839fefcbb72) )
 ROM_END
 
 
 ROM_START( vip2000 )
-	ROM_REGION16_LE( 0x10000, "boot_prg", ROMREGION_ERASE00 )
+	ROM_REGION16_LE( 0x10000, "boot_prg", ROMREGION_ERASE00 )   // i186 code
 	ROM_LOAD16_BYTE( "vipbios8l.bin", 0x00000, 0x08000, CRC(a4c2b351) SHA1(bb718584bfe32b9ed27fadfd89b4094d4bbd6d7f) )
 	ROM_LOAD16_BYTE( "vipbios8h.bin", 0x00001, 0x08000, CRC(7c42c5ee) SHA1(c419a834ddb245363bacfe70d31cff7c2d4a2d03) )
 
@@ -910,11 +942,12 @@
 ROM_END
 
 
+//    YEAR  NAME     PARENT   MACHINE   INPUT   STATE         INIT        ROT    COMPANY                          FULLNAME                             FLAGS
+GAME( 1992, bingor1, 0,       bingor,   bingor, bingor_state, empty_init, ROT0, "Rosenauer Electronic Austria?", "Bingo Roll / Bell Star? (set 1)",    MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1992, bingor2, 0,       bingor2,  bingor, bingor_state, empty_init, ROT0, "Rosenauer Electronic Austria?", "Bingo Roll / Bell Star? (set 2)",    MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002, bingor3, 0,       bingor,   bingor, bingor_state, empty_init, ROT0, "Paloma-Elektronik?",            "Bingo Roll / Bell Star? (set 3)",    MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002, bingor4, 0,       bingor,   bingor, bingor_state, empty_init, ROT0, "Paloma-Elektronik?",            "Bingo Roll / Bell Star? (set 4)",    MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002, bingor5, 0,       bingor,   bingor, bingor_state, empty_init, ROT0, "Paloma-Elektronik?",            "Bingo Roll / Bell Star V3? (set 5)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1991, bingor6, 0,       bingor,   bingor, bingor_state, empty_init, ROT0, "AWR Hard & Soft Austria?",      "Bingo Roll / Turbo Bingo?",          MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 
-GAME( 2002, bingor1, 0, bingor,   bingor, bingor_state, empty_init, ROT0, "<unknown>",          "Bingo Roll / Bell Star? (set 1)",     MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2002, bingor2, 0, bingor2,  bingor, bingor_state, empty_init, ROT0, "<unknown>",          "Bingo Roll / Bell Star? (set 2)",     MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2002, bingor3, 0, bingor,   bingor, bingor_state, empty_init, ROT0, "<unknown>",          "Bingo Roll / Bell Star? (set 3)",     MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2002, bingor4, 0, bingor,   bingor, bingor_state, empty_init, ROT0, "<unknown>",          "Bingo Roll / Bell Star? (set 4)",     MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2002, bingor5, 0, bingor,   bingor, bingor_state, empty_init, ROT0, "<unknown>",          "Bingo Roll / Bell Star V3? (set 5)",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-
-GAME( 2001, vip2000, 0, vip2000,  bingor, bingor_state, empty_init, ROT0, "Paloma-Elektronik?", "unknown 'VIP 2000' game",             MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2001, vip2000, 0,       vip2000,  bingor, bingor_state, empty_init, ROT0, "Paloma-Elektronik?",            "unknown 'VIP 2000' game",            MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/bishi.cpp mame-0.224+dfsg.1/src/mame/drivers/bishi.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/bishi.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/bishi.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -50,7 +50,7 @@
 Notes:
       68000  - clock 12.000MHz (24/2)
       YMZ280 - clock 16.9344MHz
-      CN3/4  - connector for ROM daugterboard
+      CN3/4  - connector for ROM daughterboard
       CN1    - large flat cable connector for power/controls
       675KAA01 to 04 - 27C040 EPROMs
       675KAA07 to 10 - 27C240 EPROMs
@@ -362,77 +362,6 @@
 	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) // 'p2' START
 INPUT_PORTS_END
 
-static INPUT_PORTS_START( dobouchn )
-	PORT_INCLUDE( bishi )
-
-	PORT_MODIFY("IN0")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-	PORT_MODIFY("INPUTS")
-	PORT_BIT( 0x001f, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("P1 Shoot")
-	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
-
-	PORT_MODIFY("SYSTEM")
-	PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("M. Ack") // ???
-	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNKNOWN )
-	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_NAME("Coin 2 (Medal)")
-	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_COIN1 )
-	PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-	PORT_MODIFY("DSW")
-	PORT_DIPNAME( 0x07, 0x07, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW1:1,2,3")
-	PORT_DIPSETTING(    0x00, "5 Coins / 2 Credits" )
-	PORT_DIPSETTING(    0x01, DEF_STR( 4C_3C ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( 2C_3C ) )
-	PORT_DIPSETTING(    0x03, DEF_STR( 5C_1C ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( 4C_1C ) )
-	PORT_DIPSETTING(    0x05, DEF_STR( 3C_1C ) )
-	PORT_DIPSETTING(    0x06, DEF_STR( 2C_1C ) )
-	PORT_DIPSETTING(    0x07, DEF_STR( 1C_1C ) )
-	PORT_DIPUNUSED_DIPLOC( 0x08, 0x08, "SW1:4" )
-	PORT_DIPNAME( 0x70, 0x70, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:5,6,7")
-	PORT_DIPSETTING(    0x00, "15 Medals" )
-	PORT_DIPSETTING(    0x10, "13 Medals" )
-	PORT_DIPSETTING(    0x20, "11 Medals" )
-	PORT_DIPSETTING(    0x30, "9 Medals" )
-	PORT_DIPSETTING(    0x40, "7 Medals" )
-	PORT_DIPSETTING(    0x50, "5 Medals" )
-	PORT_DIPSETTING(    0x60, "3 Medals" )
-	PORT_DIPSETTING(    0x70, "2 Medals" )
-	PORT_DIPUNUSED_DIPLOC( 0x80, 0x80, "SW1:8" )
-
-	PORT_DIPNAME( 0x0f00, 0x0f00, "Payout" ) PORT_DIPLOCATION("SW2:1,2,3,4")
-	PORT_DIPSETTING(    0x000, "90%" )
-	PORT_DIPSETTING(    0x100, "85%" )
-	PORT_DIPSETTING(    0x200, "80%" )
-	PORT_DIPSETTING(    0x300, "75%" )
-	PORT_DIPSETTING(    0x400, "70%" )
-	PORT_DIPSETTING(    0x500, "65%" )
-	PORT_DIPSETTING(    0x600, "60%" )
-	PORT_DIPSETTING(    0x700, "55%" )
-	PORT_DIPSETTING(    0x800, "50%" )
-	PORT_DIPSETTING(    0x900, "45%" )
-	PORT_DIPSETTING(    0xa00, "40%" )
-	PORT_DIPSETTING(    0xb00, "35%" )
-	PORT_DIPSETTING(    0xc00, "30%" )
-	PORT_DIPSETTING(    0xd00, "25%" )
-	PORT_DIPSETTING(    0xe00, "20%" )
-	PORT_DIPSETTING(    0xf00, "15%" )
-	PORT_DIPNAME( 0x3000, 0x3000, "Play Timer" ) PORT_DIPLOCATION("SW2:5,6")
-	PORT_DIPSETTING(    0x0000, "30 seconds" )
-	PORT_DIPSETTING(    0x1000, "24 seconds" )
-	PORT_DIPSETTING(    0x2000, "18 seconds" )
-	PORT_DIPSETTING(    0x3000, "12 seconds" )
-	// TODO: needs NVRAM hookup and default hookup
-	PORT_DIPNAME( 0x4000, 0x0000, "Backup RAM clear" ) PORT_DIPLOCATION("SW2:7")
-	PORT_DIPSETTING(      0x4000, DEF_STR( No ) )
-	PORT_DIPSETTING(      0x0000, DEF_STR( Yes ) )
-	PORT_DIPNAME( 0x8000, 0x0000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8")
-	PORT_DIPSETTING(    0x8000, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x0000, DEF_STR( On ) )
-INPUT_PORTS_END
-
 void bishi_state::machine_start()
 {
 	save_item(NAME(m_cur_control));
@@ -485,14 +414,6 @@
 	ymz.add_route(1, "rspeaker", 1.0);
 }
 
-void bishi_state::dobouchn(machine_config &config)
-{
-	bishi(config);
-//  TODO: change accordingly (ASCII charset definitely not 8bpp, 5bpp perhaps?)
-//  m_k056832->set_tile_callback(FUNC(bishi_state::dobouchn_tile_callback));
-	m_k056832->set_config(K056832_BPP_8, 1, 0);
-}
-
 // ROM definitions
 
 
@@ -581,29 +502,7 @@
 	ROM_LOAD( "675kaa04.8f", 0x180000, 0x080000, CRC(ebcbd813) SHA1(d67540d0ea303f09866f4a766e2d5162f05cd4ac) )
 ROM_END
 
-ROM_START( dobouchn )
-	ROM_REGION( 0x100000, "maincpu", 0 )
-	ROM_LOAD16_WORD_SWAP( "640-a05-2n.bin", 0x000000, 0x080000, CRC(7643dbc6) SHA1(3b55a782f04a741088b93954279b35c1c90af622) )
-
-	ROM_REGION( 0x200000, "k056832", 0 )
-	// makes GFX ROM test to pass
-	// must return 0xf0c3 and 0xee9e, check snippets at 0x2e1c and 0x2e42
-	// TODO: might require a different K056832_rom_r callback instead
-	ROM_LOAD16_BYTE( "640-a06-14n.bin", 0x000000, 0x080000, CRC(c6c5016c) SHA1(ad0b5258e2c1d0ba95dfc0d8fc6332b524f2c1e2) )
-	ROM_RELOAD(                         0x100001, 0x080000 )
-	ROM_LOAD16_BYTE( "640-a07-17n.bin", 0x000001, 0x080000, CRC(614fee32) SHA1(080fea72c0417752eb0a0b109b524d87379b2921) )
-	ROM_RELOAD(                         0x100000, 0x080000 )
-
-	// dummy region (game has no sprites, but we want to use the GX mixer)
-	ROM_REGION( 0x80000, "gfx2", ROMREGION_ERASE00 )
-
-	ROM_REGION( 0x200000, "ymz", 0 )
-	ROM_LOAD( "640-a01-2f.bin", 0x000000, 0x080000, CRC(326e2844) SHA1(62ce14ffe5d0a35c37c9a5a98c9c3a5df63d4512) )
-	ROM_LOAD( "640-a02-4f.bin", 0x080000, 0x080000, CRC(ab6593f5) SHA1(95907ee4a2cdf3bf27b7c0c1283b2bc36b868d9d) )
-ROM_END
-
 GAME( 1996, bishi,    0,      bishi,    bishi,    bishi_state, empty_init, ROT0, "Konami", "Bishi Bashi Championship Mini Game Senshuken (ver JAA, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
 GAME( 1998, sbishi,   0,      bishi,    bishi2p,  bishi_state, empty_init, ROT0, "Konami", "Super Bishi Bashi Championship (ver JAA, 2 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
 GAME( 1998, sbishik,  sbishi, bishi,    bishi,    bishi_state, empty_init, ROT0, "Konami", "Super Bishi Bashi Championship (ver KAB, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
 GAME( 1998, sbishika, sbishi, bishi,    bishi,    bishi_state, empty_init, ROT0, "Konami", "Super Bishi Bashi Championship (ver KAA, 3 Players)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
-GAME( 1996, dobouchn, 0,      dobouchn, dobouchn, bishi_state, empty_init, ROT0, "Konami", "Dobou-Chan (ver JAA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/bk.cpp mame-0.224+dfsg.1/src/mame/drivers/bk.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/bk.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/bk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,9 +2,27 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        BK driver by Miodrag Milanovic
+BK driver by Miodrag Milanovic
 
-        10/03/2008 Preliminary driver.
+2008-03-10 Preliminary driver.
+
+
+TODO:
+- Tape motor on/off to be emulated.
+
+- BK0010 - error message at start - thrown into monitor. H for help.
+  Can use M to load a tape. How to run it?
+
+- BK001001 - can load its own recordings, but cannot proceed past the header
+  of software-list items.
+  However...if you enter the Monitor with MON, enter M, enter the filename
+  (case sensitive), start tape - it loads. But then, how to run it?
+
+- BK0010FD - continually reboots. The system expects a rom at A000. Can be
+  patched by writing 0087 to address A000 in the debugger at start.
+
+- BK0011M - black screen. No emulation of this variant has been done.
+- BK0011M - 128KB RAM, clock speed 4MHz by default, floppy drive facility.
 
 ****************************************************************************/
 
@@ -16,7 +34,6 @@
 
 #include "emupal.h"
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
 
@@ -24,32 +41,29 @@
 void bk_state::bk0010_mem(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0x3fff).ram();  // RAM
-	map(0x4000, 0x7fff).ram().share("video_ram"); // Video RAM
-	map(0x8000, 0x9fff).rom();  // ROM
-	map(0xa000, 0xbfff).rom();  // ROM
-	map(0xc000, 0xdfff).rom();  // ROM
-	map(0xe000, 0xfeff).rom();  // ROM
-	map(0xffb0, 0xffb1).rw(FUNC(bk_state::bk_key_state_r), FUNC(bk_state::bk_key_state_w));
-	map(0xffb2, 0xffb3).r(FUNC(bk_state::bk_key_code_r));
-	map(0xffb4, 0xffb5).rw(FUNC(bk_state::bk_vid_scrool_r), FUNC(bk_state::bk_vid_scrool_w));
-	map(0xffce, 0xffcf).rw(FUNC(bk_state::bk_key_press_r), FUNC(bk_state::bk_key_press_w));
+	map(0x0000, 0x3fff).ram();
+	map(0x4000, 0x7fff).ram().share("videoram");
+	map(0x8000, 0xfeff).rom().region("maincpu",0);
+	map(0xffb0, 0xffb1).rw(FUNC(bk_state::key_state_r), FUNC(bk_state::key_state_w));
+	map(0xffb2, 0xffb3).r(FUNC(bk_state::key_code_r));
+	map(0xffb4, 0xffb5).rw(FUNC(bk_state::vid_scroll_r), FUNC(bk_state::vid_scroll_w));
+	map(0xffce, 0xffcf).rw(FUNC(bk_state::key_press_r), FUNC(bk_state::key_press_w));
 }
 
 void bk_state::bk0010fd_mem(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0x3fff).ram();  // RAM
-	map(0x4000, 0x7fff).ram().share("video_ram"); // Video RAM
-	map(0x8000, 0x9fff).rom();  // ROM
-	map(0xa000, 0xdfff).ram();  // RAM
-	map(0xe000, 0xfdff).rom();  // ROM
-	map(0xfe58, 0xfe59).rw(FUNC(bk_state::bk_floppy_cmd_r), FUNC(bk_state::bk_floppy_cmd_w));
-	map(0xfe5a, 0xfe5b).rw(FUNC(bk_state::bk_floppy_data_r), FUNC(bk_state::bk_floppy_data_w));
-	map(0xffb0, 0xffb1).rw(FUNC(bk_state::bk_key_state_r), FUNC(bk_state::bk_key_state_w));
-	map(0xffb2, 0xffb3).r(FUNC(bk_state::bk_key_code_r));
-	map(0xffb4, 0xffb5).rw(FUNC(bk_state::bk_vid_scrool_r), FUNC(bk_state::bk_vid_scrool_w));
-	map(0xffce, 0xffcf).rw(FUNC(bk_state::bk_key_press_r), FUNC(bk_state::bk_key_press_w));
+	map(0x0000, 0x3fff).ram();
+	map(0x4000, 0x7fff).ram().share("videoram");
+	map(0x8000, 0x9fff).rom().region("maincpu",0);
+	map(0xa000, 0xdfff).ram();
+	map(0xe000, 0xfdff).rom().region("maincpu",0x6000);
+	map(0xfe58, 0xfe59).rw(FUNC(bk_state::floppy_cmd_r), FUNC(bk_state::floppy_cmd_w));
+	map(0xfe5a, 0xfe5b).rw(FUNC(bk_state::floppy_data_r), FUNC(bk_state::floppy_data_w));
+	map(0xffb0, 0xffb1).rw(FUNC(bk_state::key_state_r), FUNC(bk_state::key_state_w));
+	map(0xffb2, 0xffb3).r(FUNC(bk_state::key_code_r));
+	map(0xffb4, 0xffb5).rw(FUNC(bk_state::vid_scroll_r), FUNC(bk_state::vid_scroll_w));
+	map(0xffce, 0xffcf).rw(FUNC(bk_state::key_press_r), FUNC(bk_state::key_press_w));
 }
 
 /* Input ports */
@@ -169,7 +183,7 @@
 	T11(config, m_maincpu, 3000000); // FIXME: actually K1801VM1
 	m_maincpu->set_initial_mode(0x36ff); /* initial mode word has DAL15,14,11,8 pulled low */
 	m_maincpu->set_addrmap(AS_PROGRAM, &bk_state::bk0010_mem);
-	m_maincpu->in_iack().set(FUNC(bk_state::bk0010_irq_callback));
+	m_maincpu->in_iack().set(FUNC(bk_state::irq_callback));
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -177,7 +191,7 @@
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	screen.set_size(512, 256);
 	screen.set_visarea(0, 512-1, 0, 256-1);
-	screen.set_screen_update(FUNC(bk_state::screen_update_bk0010));
+	screen.set_screen_update(FUNC(bk_state::screen_update));
 	screen.set_palette("palette");
 
 	PALETTE(config, "palette", palette_device::MONOCHROME);
@@ -203,39 +217,39 @@
 /* ROM definition */
 
 ROM_START( bk0010 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "monit10.rom", 0x8000, 0x2000, CRC(26c6e8a0) SHA1(4e83a94ae5155bbea14d7331a5a8db82457bd5ae) )
-	ROM_LOAD( "focal.rom",   0xa000, 0x2000, CRC(717149b7) SHA1(75df26f81ebd281bcb5c55ba81a7d97f31e388b2) )
-	ROM_LOAD( "tests.rom",   0xe000, 0x1f80, CRC(91aecb4d) SHA1(6b14d552045194a3004bb6b795a2538110921519) )
+	ROM_REGION( 0x8000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "monit10.rom", 0x0000, 0x2000, CRC(26c6e8a0) SHA1(4e83a94ae5155bbea14d7331a5a8db82457bd5ae) )  // to 8000
+	ROM_LOAD( "focal.rom",   0x2000, 0x2000, CRC(717149b7) SHA1(75df26f81ebd281bcb5c55ba81a7d97f31e388b2) )  // to A000
+	ROM_LOAD( "tests.rom",   0x6000, 0x1f80, CRC(91aecb4d) SHA1(6b14d552045194a3004bb6b795a2538110921519) )  // to E000
 ROM_END
 
 ROM_START( bk001001 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "monit10.rom",   0x8000, 0x2000, CRC(26c6e8a0) SHA1(4e83a94ae5155bbea14d7331a5a8db82457bd5ae) )
-	ROM_LOAD( "basic10-1.rom", 0xa000, 0x2000, CRC(5e3ff5da) SHA1(5ea4db1eaac87bd0ac96e52a608bc783709f5042) )
-	ROM_LOAD( "basic10-2.rom", 0xc000, 0x2000, CRC(ea63863c) SHA1(acf068925e4052989b05dd5cf736a1dab5438011) )
-	ROM_LOAD( "basic10-3.rom", 0xe000, 0x1f80, CRC(63f3df2e) SHA1(b5463f08e7c5f9f5aa31a2e7b6c1ed94fe029d65) )
+	ROM_REGION( 0x8000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "monit10.rom",   0x0000, 0x2000, CRC(26c6e8a0) SHA1(4e83a94ae5155bbea14d7331a5a8db82457bd5ae) ) // to 8000
+	ROM_LOAD( "basic10-1.rom", 0x2000, 0x2000, CRC(5e3ff5da) SHA1(5ea4db1eaac87bd0ac96e52a608bc783709f5042) ) // to A000
+	ROM_LOAD( "basic10-2.rom", 0x4000, 0x2000, CRC(ea63863c) SHA1(acf068925e4052989b05dd5cf736a1dab5438011) ) // to C000
+	ROM_LOAD( "basic10-3.rom", 0x6000, 0x1f80, CRC(63f3df2e) SHA1(b5463f08e7c5f9f5aa31a2e7b6c1ed94fe029d65) ) // to E000
 ROM_END
 
 ROM_START( bk0010fd )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "monit10.rom",  0x8000, 0x2000, CRC(26c6e8a0) SHA1(4e83a94ae5155bbea14d7331a5a8db82457bd5ae) )
-	ROM_LOAD( "disk_327.rom", 0xe000, 0x1000, CRC(ed8a43ae) SHA1(28eefbb63047b26e4aec104aeeca74e2f9d0276c) )
+	ROM_REGION( 0x8000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "monit10.rom",  0x0000, 0x2000, CRC(26c6e8a0) SHA1(4e83a94ae5155bbea14d7331a5a8db82457bd5ae) ) // to 8000
+	ROM_LOAD( "disk_327.rom", 0x6000, 0x1000, CRC(ed8a43ae) SHA1(28eefbb63047b26e4aec104aeeca74e2f9d0276c) ) // to E000
 ROM_END
 
 ROM_START( bk0011m )
-	ROM_REGION( 0x1A000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x1b000, "maincpu", ROMREGION_ERASEFF )
 	ROM_LOAD( "bas11m_0.rom", 0x10000, 0x4000, CRC(e71f9339) SHA1(9d76f3eefd64e032c763fa1ebf9cd3d9bd22317a) )
 	ROM_LOAD( "bas11m_1.rom", 0x14000, 0x2000, CRC(4c68ff59) SHA1(34fa37599f2f9eb607390ef2458a3c22d87f09a9) )
 	ROM_LOAD( "b11m_ext.rom", 0x16000, 0x2000, CRC(b2e4c33c) SHA1(f087af69044432a1ef2431a72ac06946e32f2dd3) )
 	ROM_LOAD( "b11m_bos.rom", 0x18000, 0x2000, CRC(8ffd5efa) SHA1(7e9a30e38d7b78981999821640a68a201bb6df01) )
-	ROM_LOAD( "disk_327.rom", 0x19000, 0x1000, CRC(ed8a43ae) SHA1(28eefbb63047b26e4aec104aeeca74e2f9d0276c) )
+	ROM_LOAD( "disk_327.rom", 0x1A000, 0x1000, CRC(ed8a43ae) SHA1(28eefbb63047b26e4aec104aeeca74e2f9d0276c) )
 ROM_END
 
 /* Driver */
 
 /*    YEAR  NAME      PARENT  COMPAT  MACHINE   INPUT   CLASS     INIT        COMPANY        FULLNAME       FLAGS */
-COMP( 1985, bk0010,   0,      0,      bk0010,   bk0010, bk_state, empty_init, "Elektronika", "BK 0010",     0)
-COMP( 1986, bk001001, bk0010, 0,      bk0010,   bk0010, bk_state, empty_init, "Elektronika", "BK 0010-01",  0)
-COMP( 1986, bk0010fd, bk0010, 0,      bk0010fd, bk0010, bk_state, empty_init, "Elektronika", "BK 0010 FDD", MACHINE_NOT_WORKING)
-COMP( 1986, bk0011m,  bk0010, 0,      bk0010fd, bk0010, bk_state, empty_init, "Elektronika", "BK 0011M",    MACHINE_NOT_WORKING)
+COMP( 1985, bk0010,   0,      0,      bk0010,   bk0010, bk_state, empty_init, "Elektronika", "BK 0010",     MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1986, bk001001, bk0010, 0,      bk0010,   bk0010, bk_state, empty_init, "Elektronika", "BK 0010-01",  MACHINE_SUPPORTS_SAVE )
+COMP( 1986, bk0010fd, bk0010, 0,      bk0010fd, bk0010, bk_state, empty_init, "Elektronika", "BK 0010 FDD", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1986, bk0011m,  bk0010, 0,      bk0010fd, bk0010, bk_state, empty_init, "Elektronika", "BK 0011M",    MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/blackt96.cpp mame-0.224+dfsg.1/src/mame/drivers/blackt96.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/blackt96.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/blackt96.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -103,30 +103,8 @@
 		m_oki1bank(*this, "oki1bank")
 	{ }
 
-	// read/write handlers
-	void output_w(uint8_t data);
-	void sound_cmd_w(uint8_t data);
-	void tx_vram_w(offs_t offset, uint16_t data);
-
-	void blackt96_soundio_port_a_w(uint8_t data);
-	uint8_t blackt96_soundio_port_b_r();
-	void blackt96_soundio_port_b_w(uint8_t data);
-	uint8_t blackt96_soundio_port_c_r();
-	void blackt96_soundio_port_c_w(uint8_t data);
-
-	uint16_t random_r() // todo, get rid of this once we work out where reads are from
-	{
-		return machine().rand();
-	}
-
-	// video
-	TILE_GET_INFO_MEMBER(get_tx_tile_info);
-	uint32_t screen_update_blackt96(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void tile_callback(int &tile, int& fx, int& fy, int& region);
-
 	void blackt96(machine_config &config);
-	void blackt96_map(address_map &map);
-	void oki1_map(address_map &map);
+
 protected:
 	// overrides
 	virtual void machine_start() override;
@@ -153,6 +131,30 @@
 	required_device<snk68_spr_device> m_sprites;
 	required_device_array<okim6295_device, 2> m_oki;
 	required_memory_bank m_oki1bank;
+
+	// read/write handlers
+	void output_w(uint8_t data);
+	void sound_cmd_w(uint8_t data);
+	void tx_vram_w(offs_t offset, uint16_t data);
+
+	void soundio_port_a_w(uint8_t data);
+	uint8_t soundio_port_b_r();
+	void soundio_port_b_w(uint8_t data);
+	uint8_t soundio_port_c_r();
+	void soundio_port_c_w(uint8_t data);
+
+	uint16_t random_r() // todo, get rid of this once we work out where reads are from
+	{
+		return machine().rand();
+	}
+
+	// video
+	TILE_GET_INFO_MEMBER(get_tx_tile_info);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	void tile_callback(int &tile, int& fx, int& fy, int& region);
+
+	void blackt96_map(address_map &map);
+	void oki1_map(address_map &map);
 };
 
 TILE_GET_INFO_MEMBER(blackt96_state::get_tx_tile_info)
@@ -177,7 +179,7 @@
 }
 
 
-uint32_t blackt96_state::screen_update_blackt96(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t blackt96_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	bitmap.fill(m_palette->black_pen(), cliprect);
 
@@ -301,7 +303,7 @@
 	PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 	PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 
-	/* Dipswitch Port A */
+	// Dipswitch Port A
 	PORT_START("DSW1")
 	PORT_DIPNAME( 0x0300, 0x0000, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("SW1:!7,!8")
 	PORT_DIPSETTING(      0x0000, DEF_STR( 1C_1C ) )
@@ -326,7 +328,7 @@
 	PORT_DIPSETTING(      0x0000, DEF_STR( No ) )
 	PORT_DIPSETTING(      0x8000, DEF_STR( Yes ) ) // buggy, applies to attract mode only.
 
-	/* Dipswitch Port B */
+	// Dipswitch Port B
 	PORT_START("DSW2")
 	PORT_SERVICE( 0x0100, IP_ACTIVE_HIGH ) PORT_DIPLOCATION("SW2:!8")
 	PORT_DIPNAME( 0x0200, 0x0000, "Continue" ) PORT_DIPLOCATION("SW2:!7")
@@ -387,42 +389,42 @@
 };
 
 static GFXDECODE_START( gfx_blackt96 )
-	GFXDECODE_ENTRY( "gfx1", 0, blackt96_layout,      0, 8  )
-	GFXDECODE_ENTRY( "gfx2", 0, blackt962_layout,     0, 128 )
-	GFXDECODE_ENTRY( "gfx3", 0, blackt96_text_layout, 0, 16 )
+	GFXDECODE_ENTRY( "bgtiles", 0, blackt96_layout,      0, 8  )
+	GFXDECODE_ENTRY( "sprtiles", 0, blackt962_layout,     0, 128 )
+	GFXDECODE_ENTRY( "txttiles", 0, blackt96_text_layout, 0, 16 )
 GFXDECODE_END
 
 
-void blackt96_state::blackt96_soundio_port_a_w(uint8_t data)
+void blackt96_state::soundio_port_a_w(uint8_t data)
 {
 	// soundbank
-	logerror("%s: blackt96_soundio_port_a_w (set soundbank %02x)\n", machine().describe_context().c_str(), data);
+	logerror("%s: soundio_port_a_w (set soundbank %02x)\n", machine().describe_context().c_str(), data);
 	m_oki1bank->set_entry(data & 0x07);
 }
 
-uint8_t blackt96_state::blackt96_soundio_port_b_r()
+uint8_t blackt96_state::soundio_port_b_r()
 {
-	//logerror("%s: blackt96_soundio_port_b_r (data read is %02x)\n", machine().describe_context().c_str(), m_port_b_latch);
+	//logerror("%s: soundio_port_b_r (data read is %02x)\n", machine().describe_context().c_str(), m_port_b_latch);
 	return m_port_b_latch;
 }
 
-void blackt96_state::blackt96_soundio_port_b_w(uint8_t data)
+void blackt96_state::soundio_port_b_w(uint8_t data)
 {
 	m_port_b_latch = data;
-	//logerror("%s: blackt96_soundio_port_b_w (set latch to %02x)\n", machine().describe_context().c_str(), m_port_b_latch);
+	//logerror("%s: soundio_port_b_w (set latch to %02x)\n", machine().describe_context().c_str(), m_port_b_latch);
 }
 
-uint8_t blackt96_state::blackt96_soundio_port_c_r()
+uint8_t blackt96_state::soundio_port_c_r()
 {
 	// bit 0x40 = sound command ready?
 	if (m_soundcmd_ready) return 0x40;
 	return 0x00;
 }
 
-void blackt96_state::blackt96_soundio_port_c_w(uint8_t data)
+void blackt96_state::soundio_port_c_w(uint8_t data)
 {
-//  logerror("%s: blackt96_soundio_port_c_w (PREV DATA %02x CURR DATA %02x)\n", machine().describe_context().c_str(), m_port_c_data, data);
-	// data & 0x80 unuused?
+//  logerror("%s: soundio_port_c_w (PREV DATA %02x CURR DATA %02x)\n", machine().describe_context().c_str(), m_port_c_data, data);
+	// data & 0x80 unused?
 	// data & 0x40 is read - see above
 
 	if (((data & 0x20) == 0x00) && ((m_port_c_data & 0x20) == 0x20)) // high -> low on bit 0x20 after processing command
@@ -433,7 +435,7 @@
 	if (((data & 0x10) == 0x00) && ((m_port_c_data & 0x10) == 0x10)) // high -> low on bit 0x10 latches sound command
 	{
 		m_port_b_latch = m_soundcmd;
-		//logerror("%s: blackt96_soundio_port_c_w (latch sound command %02x)\n", machine().describe_context().c_str(), m_port_b_latch);
+		//logerror("%s: soundio_port_c_w (latch sound command %02x)\n", machine().describe_context().c_str(), m_port_b_latch);
 	}
 
 	if (((data & 0x08) == 0x00) && ((m_port_c_data & 0x08) == 0x08)) // high -> low on bit 0x08 selects second oki?
@@ -448,7 +450,7 @@
 
 	if (((data & 0x02) == 0x00) && ((m_port_c_data & 0x02) == 0x02)) // high -> low on bit 0x02 writes to selected OKI
 	{
-		//logerror("%s: blackt96_soundio_port_c_w (write to OKI %02x) (oki selected is %02x)\n", machine().describe_context().c_str(), m_port_b_latch, m_oki_selected);
+		//logerror("%s: soundio_port_c_w (write to OKI %02x) (oki selected is %02x)\n", machine().describe_context().c_str(), m_port_b_latch, m_oki_selected);
 		if (m_oki_selected == 0) m_oki[0]->write(m_port_b_latch);
 		else if (m_oki_selected == 1) m_oki[1]->write(m_port_b_latch);
 	}
@@ -486,11 +488,11 @@
 	m_maincpu->set_vblank_int("screen", FUNC(blackt96_state::irq1_line_hold));
 
 	pic16c57_device &audiocpu(PIC16C57(config, "audiocpu", 8_MHz_XTAL / 2));
-	audiocpu.write_a().set(FUNC(blackt96_state::blackt96_soundio_port_a_w));
-	audiocpu.read_b().set(FUNC(blackt96_state::blackt96_soundio_port_b_r));
-	audiocpu.write_b().set(FUNC(blackt96_state::blackt96_soundio_port_b_w));
-	audiocpu.read_c().set(FUNC(blackt96_state::blackt96_soundio_port_c_r));
-	audiocpu.write_c().set(FUNC(blackt96_state::blackt96_soundio_port_c_w));
+	audiocpu.write_a().set(FUNC(blackt96_state::soundio_port_a_w));
+	audiocpu.read_b().set(FUNC(blackt96_state::soundio_port_b_r));
+	audiocpu.write_b().set(FUNC(blackt96_state::soundio_port_b_w));
+	audiocpu.read_c().set(FUNC(blackt96_state::soundio_port_c_r));
+	audiocpu.write_c().set(FUNC(blackt96_state::soundio_port_c_w));
 
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_blackt96);
 
@@ -500,7 +502,7 @@
 	screen.set_size(256, 256);
 //  screen.set_visarea(0*8, 16*32-1, 0*8, 16*32-1);
 	screen.set_visarea(0*8, 256-1, 2*8, 240-1);
-	screen.set_screen_update(FUNC(blackt96_state::screen_update_blackt96));
+	screen.set_screen_update(FUNC(blackt96_state::screen_update));
 	screen.set_palette(m_palette);
 
 	PALETTE(config, m_palette).set_format(palette_device::xRGB_444, 0x800);
@@ -527,32 +529,32 @@
 
 
 ROM_START( blackt96 )
-	ROM_REGION( 0x80000, "maincpu", 0 ) /* 68000 Code */
+	ROM_REGION( 0x80000, "maincpu", 0 ) // 68000 Code
 	ROM_LOAD16_BYTE( "3", 0x00001, 0x40000, CRC(fc2c1d79) SHA1(742478237819af16d3fd66039283202b3c07eedd) )
 	ROM_LOAD16_BYTE( "4", 0x00000, 0x40000, CRC(caff5b4a) SHA1(9a388cbb07211fa66f27082a8a5b847168c86a4f) )
 
-	ROM_REGION( 0x80000, "audiocpu", 0 ) /* PIC16c57 Code */
+	ROM_REGION( 0x80000, "audiocpu", 0 ) // PIC16c57 Code
 	ROM_LOAD( "pic16c57.bin", 0x00000, 0x2000, CRC(6053ba2f) SHA1(5dd28ddff17555de0e8574b78ff9e71204c503d3) )
 
-	ROM_REGION( 0x080000, "oki1", 0 ) /* Samples */
+	ROM_REGION( 0x080000, "oki1", 0 ) // Samples
 	ROM_LOAD( "1", 0x00000, 0x80000, CRC(6a934174) SHA1(087f5fa226dc68ee217f99c64d16cdf14372d44c) )
 
-	ROM_REGION( 0x040000, "oki2", 0 ) /* Samples */
+	ROM_REGION( 0x040000, "oki2", 0 ) // Samples
 	ROM_LOAD( "2", 0x00000, 0x40000, CRC(94009cd4) SHA1(aa36298e280c20bf86d70f3eb3fb33aca4df07e3) )
 
-	ROM_REGION( 0x200000, "gfx1", 0 ) // bg tiles
+	ROM_REGION( 0x200000, "bgtiles", 0 )
 	ROM_LOAD16_BYTE( "5", 0x100000, 0x40000, CRC(6e52c331) SHA1(31ef1d352d4ee5f7b3ef336b1f052c3a1468f22e) )
 	ROM_LOAD16_BYTE( "6", 0x100001, 0x40000, CRC(69637a5a) SHA1(a5731478856d8bb91d34b747838b2b47772864ef) )
 	ROM_LOAD16_BYTE( "7", 0x000000, 0x80000, CRC(6b04e8a8) SHA1(309ba1efd60600a30e1ae8f6e8b92939c23cd9c6) )
 	ROM_LOAD16_BYTE( "8", 0x000001, 0x80000, CRC(16c656be) SHA1(06c40c16080a97b01a638776d28f36594ce4fb3b) )
 
-	ROM_REGION( 0x100000, "gfx2", 0 ) // sprite tiles
+	ROM_REGION( 0x100000, "sprtiles", 0 )
 	ROM_LOAD32_BYTE( "11", 0x00000, 0x40000, CRC(9eb773a3) SHA1(9c91ee938438a61f5fa650ced6249e34aa5321bd) )
 	ROM_LOAD32_BYTE( "12", 0x00001, 0x40000, CRC(8894e608) SHA1(389974a0b208b7cbf7d5f83641ddc058ad5ebe87) )
 	ROM_LOAD32_BYTE( "13", 0x00002, 0x40000, CRC(0acceb9d) SHA1(e8a85c7eab45d84613ac37a9b7ffbc45b44eb2e5) )
 	ROM_LOAD32_BYTE( "14", 0x00003, 0x40000, CRC(b5e3de25) SHA1(33ac5602ab6bcadc8b0d1aa805a3bdce0b67c215) )
 
-	ROM_REGION( 0x10000, "gfx3", 0 ) // txt tiles
+	ROM_REGION( 0x10000, "txttiles", 0 )
 	ROM_LOAD16_BYTE( "9",  0x00000, 0x08000, CRC(81a4cf4c) SHA1(94b2bbcbc8327d9babbc3b222bd88954c7e7b80e) )
 	ROM_CONTINUE(          0x00000, 0x08000 ) // first half is empty
 	ROM_LOAD16_BYTE( "10", 0x00001, 0x08000, CRC(b78232a2) SHA1(36a4f01011faf64e46b73f0082ab04843ac8b0e2) )
@@ -560,4 +562,4 @@
 ROM_END
 
 // I'm not really sure this needs MACHINE_IS_INCOMPLETE just because there are some original game bugs, it's quite typical of this type of Korean release
-GAME( 1996, blackt96, 0, blackt96, blackt96, blackt96_state, empty_init, ROT0, "D.G.R.M.", "Black Touch '96", MACHINE_IS_INCOMPLETE )
+GAME( 1996, blackt96, 0, blackt96, blackt96, blackt96_state, empty_init, ROT0, "D.G.R.M.", "Black Touch '96", MACHINE_IS_INCOMPLETE | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/blktiger.cpp mame-0.224+dfsg.1/src/mame/drivers/blktiger.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/blktiger.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/blktiger.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -586,7 +586,7 @@
 	ROM_LOAD( "10.9a",  0x20000, 0x10000, CRC(fc33ccc6) SHA1(d492626a88565c2626f98ecb1d74535f1ad68e4c) )
 	ROM_LOAD( "9.8a",   0x30000, 0x10000, CRC(f449de01) SHA1(f6b40e9eb2471b89c42ab84f4214295d284db0c3) )
 
-	ROM_REGION( 0x0400, "proms", 0 )    /* PROMs (function unknown) */ // misisng in this dump
+	ROM_REGION( 0x0400, "proms", 0 )    // PROMs (function unknown), missing in this dump
 	ROM_LOAD( "bd01.8j",   0x0000, 0x0100, CRC(29b459e5) SHA1(0034734a533df3dea16b7b48e072485d7f26f850) )
 	ROM_LOAD( "bd02.9j",   0x0100, 0x0100, CRC(8b741e66) SHA1(6c1fda59936a7217b05949f5c54b1f91f4b49dbe) )
 	ROM_LOAD( "bd03.11k",  0x0200, 0x0100, CRC(27201c75) SHA1(c54d87f06bfe0b0908389c005014d97156e272c2) )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/blktiger_ms.cpp mame-0.224+dfsg.1/src/mame/drivers/blktiger_ms.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/blktiger_ms.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/blktiger_ms.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -38,6 +38,8 @@
 
 	void blktigerm(machine_config &config);
 
+	void init_blktigerm();
+
 protected:
 	virtual void machine_start() override;
 
@@ -48,14 +50,31 @@
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	void blktigerm_map(address_map &map);
+	void blktigerm_sound_map(address_map &map);
 };
 
 
 void blktiger_ms_state::blktigerm_map(address_map &map)
 {
-	map(0x0000, 0x7fff).rom();
+	map(0x0000, 0x7fff).rom().region("maincpu", 0);
+	//map(0x8000, 0xbfff).bankr("mainbank");
+	//map(0xc003, 0xc003).r(); // ??
+	//map(0xd800, 0xd800).w(); // bankswitch?
+	map(0xe000, 0xffff).ram();
 }
 
+void blktiger_ms_state::blktigerm_sound_map(address_map &map) // seems similar to toki_ms.cpp and raiden_ms.cpp
+{
+	map(0x0000, 0x7fff).rom().region("audiocpu", 0);
+	map(0xc000, 0xc7ff).ram();
+	map(0xc900, 0xc900).noprw(); // what lives here?
+	map(0xdff8, 0xdff8).r("soundlatch", FUNC(generic_latch_8_device::read));
+	map(0xdff0, 0xdfff).nopw(); // what lives here?
+	map(0xe000, 0xe001).w("ym1", FUNC(ym2203_device::write));
+	map(0xe002, 0xe003).w("ym2", FUNC(ym2203_device::write));
+	map(0xe008, 0xe009).r("ym1", FUNC(ym2203_device::read));
+	map(0xe00a, 0xe00b).r("ym2", FUNC(ym2203_device::read));
+}
 
 void blktiger_ms_state::machine_start()
 {
@@ -75,16 +94,17 @@
 
 void blktiger_ms_state::blktigerm(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	Z80(config, m_maincpu, 24_MHz_XTAL / 4); // divisor unknown
 	m_maincpu->set_addrmap(AS_PROGRAM, &blktiger_ms_state::blktigerm_map);
 
-	Z80(config, "audiocpu", 24_MHz_XTAL / 8).set_disable(); // divisor unknown, no XTAL on the PCB, might also use the 20 MHz one
+	z80_device &audiocpu(Z80(config, "audiocpu", 24_MHz_XTAL / 8)); // divisor unknown, no XTAL on the PCB, might also use the 20 MHz one
+	audiocpu.set_addrmap(AS_PROGRAM, &blktiger_ms_state::blktigerm_sound_map);
 
-	/* video hardware */
+	// video hardware
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER); // all wrong
 	m_screen->set_refresh_hz(60);
-	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500) /* not accurate */);
+	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500)); // not accurate
 	m_screen->set_size(256, 256);
 	m_screen->set_visarea(0, 256-1, 0, 256-32-1);
 	m_screen->set_screen_update(FUNC(blktiger_ms_state::screen_update));
@@ -94,7 +114,7 @@
 
 	GFXDECODE(config, "gfxdecode", "palette", gfx_blktiger_ms);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 
 	GENERIC_LATCH_8(config, "soundlatch");
@@ -106,34 +126,34 @@
 
 ROM_START( blktigerm )
 	ROM_REGION( 0x50000, "maincpu", 0 ) // on MOD 3/4 board
-	ROM_LOAD( "3_bl_301.ic14",   0x00000, 0x08000, CRC(b4525312) SHA1(958ce9a7f41422f3011412e4a16dd3ad65019733) ) // encrypted / scrambled?
+	ROM_LOAD( "3_bl_301.ic14",   0x00000, 0x08000, CRC(b4525312) SHA1(958ce9a7f41422f3011412e4a16dd3ad65019733) )
 	ROM_LOAD( "3_bl_302_c.ic13", 0x10000, 0x10000, CRC(c943415f) SHA1(08e82d2557de01c979a0a58b5433e9bdcdb118cb) )
 	ROM_LOAD( "3_bl_303_b.ic12", 0x20000, 0x10000, CRC(72114f6b) SHA1(049e747431cd95db2e7414467754424f68a8d757) )
-	ROM_LOAD( "3_bl_304.ic18",   0x30000, 0x10000, CRC(36f669c6) SHA1(e91fd222919904d4d4b3ef70a22ab599a7cfa263) )
-	ROM_LOAD( "3_bl_305.ic19",   0x40000, 0x10000, CRC(b30a99af) SHA1(19d6dbe11ffeb9a21dbfe75eb39ce9ceaef5eb31) )
+	ROM_LOAD( "3_bl_304.ic18",   0x30000, 0x10000, CRC(36f669c6) SHA1(e91fd222919904d4d4b3ef70a22ab599a7cfa263) ) // this and the following ROM are swapped wrt to the sets in blktiger.cpp
+	ROM_LOAD( "3_bl_305.ic19",   0x40000, 0x10000, CRC(b30a99af) SHA1(19d6dbe11ffeb9a21dbfe75eb39ce9ceaef5eb31) ) // leaving them in the order suggested by the labels for now, since the banking calls have been changed
 
-	ROM_REGION( 0x10000, "audiocpu", 0 ) //
+	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "1_bl_101.ic12",  0x0000, 0x8000, CRC(14028686) SHA1(64dc219d906f1bdd0c2bc05aff5aa73e001a6901) )
 
 	ROM_REGION( 0x08000, "gfx1", 0 ) // on one of the MOD 4/3 boards, both ROMs 0xxxxxxxxxxxxxx = 0xFF
-	ROM_LOAD( "4_bl_401.ic17",  0x00000, 0x04000, CRC(ab1afb3d) SHA1(555332ccfb69e65b776f94ffac9a4a051fb6f09e) ) /* characters */
+	ROM_LOAD( "4_bl_401.ic17",  0x00000, 0x04000, CRC(ab1afb3d) SHA1(555332ccfb69e65b776f94ffac9a4a051fb6f09e) ) // characters
 	ROM_CONTINUE(               0x00000, 0x04000)
 	ROM_LOAD( "4_bl_402.ic16",  0x04000, 0x04000, CRC(89445b11) SHA1(7d9ab6e88d7de3a0e31b3b8a5e57dd39afd7940d) )
 	ROM_CONTINUE(               0x04000, 0x04000)
 
 	ROM_REGION( 0x40000, "gfx2", 0 ) // on the other MOD 4/3 board
-	ROM_LOAD( "4_a_bl_4a01.ic17",  0x00000, 0x10000, CRC(fc00fd6c) SHA1(066714421fa782c6cfad9f695f05e6e3551ffdc7) ) /* tiles */
+	ROM_LOAD( "4_a_bl_4a01.ic17",  0x00000, 0x10000, CRC(fc00fd6c) SHA1(066714421fa782c6cfad9f695f05e6e3551ffdc7) ) // tiles
 	ROM_LOAD( "4_a_bl_4a02.ic16",  0x10000, 0x10000, CRC(49cd8afa) SHA1(147b65dad4f05b940d1f7a4028f5748ba1b7daa5) )
 	ROM_LOAD( "4_a_bl_4a03.ic15",  0x20000, 0x10000, CRC(50207dd4) SHA1(bee343fbefc817fa14b8b303f013bf5b89e911f8) )
 	ROM_LOAD( "4_a_bl_4a04.ic14",  0x30000, 0x10000, CRC(4bb0c1ba) SHA1(9433c78f0de7cb1f92b22612b9f3c51d813b025a) )
 
 	ROM_REGION( 0x40000, "gfx3", 0 ) // on MOD 51/1 board
-	ROM_LOAD( "51_bl_501.ic43",   0x00000, 0x10000, CRC(ace32b94) SHA1(4a09e8dc73bd16f7d378aefbe5d433dd1396f97d) )    /* sprites */
+	ROM_LOAD( "51_bl_501.ic43",   0x00000, 0x10000, CRC(ace32b94) SHA1(4a09e8dc73bd16f7d378aefbe5d433dd1396f97d) )    // sprites
 	ROM_LOAD( "51_bl_502.ic42",   0x10000, 0x10000, CRC(f6c4cc0b) SHA1(678fd71e90237f8e19eae78fe150a4c5d3494c6c) )
 	ROM_LOAD( "51_bl_503.ic41",   0x20000, 0x10000, CRC(61e3ae0b) SHA1(cbb83827f027acd6b905f4210476810bcd4b03a9) )
 	ROM_LOAD( "51_bl_504.ic40",   0x30000, 0x10000, CRC(2cb45034) SHA1(b2fd3b7b7b9d68b6ff1985166b106e65b17dbb23) )
 
-	ROM_REGION( 0x0700, "proms", 0 )    /* PROMs (function unknown) */
+	ROM_REGION( 0x0700, "proms", 0 )    // PROMs (function unknown)
 	ROM_LOAD( "1_p0101_82s123.ic20",       0x0000, 0x0020, CRC(3fd60d3a) SHA1(8100fa7453638ac40193b5d92404f41b101ed2cc) )
 	ROM_LOAD( "21_p0201_82s129.ic4",       0x0100, 0x0100, CRC(2697da58) SHA1(e62516b886ff6e204b718e5f0c6ce2712e4b7fc5) )
 	ROM_LOAD( "21_p0202_82s129.ic12",      0x0200, 0x0100, CRC(e434128a) SHA1(ef0f6d8daef8b25211095577a182cdf120a272c1) )
@@ -147,4 +167,21 @@
 	ROM_LOAD( "51_p0503_pal16r8a.ic56",         0x000, 0x104, CRC(07eb86d2) SHA1(482eb325df5bc60353bac85412cf45429cd03c6d) )
 ROM_END
 
-GAME( 1991, blktigerm,  blktiger,  blktigerm,  blktigerm,  blktiger_ms_state, empty_init, ROT0, "bootleg (Gaelco / Ervisa)", "Black Tiger (Modular System)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+void blktiger_ms_state::init_blktigerm()
+{
+	uint8_t *src = memregion("maincpu")->base();
+	int len = 0x50000;
+
+	// bitswap data
+	for (int i = 0; i < len; i++)
+		src[i] = bitswap<8>(src[i], 5, 3, 7, 2, 0, 1, 4, 6);
+
+	// descramble address
+	std::vector<uint8_t> buffer(len);
+	memcpy(&buffer[0], src, len);
+
+	for (int i = 0; i < len; i++)
+		src[i] = buffer[bitswap<24>(i, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 10, 8, 6, 4, 0, 2, 7, 3, 1, 9, 11, 5)];
+}
+
+GAME( 1991, blktigerm,  blktiger,  blktigerm,  blktigerm,  blktiger_ms_state, init_blktigerm, ROT0, "bootleg (Gaelco / Ervisa)", "Black Tiger (Modular System)", MACHINE_IS_SKELETON )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/bloodbro_ms.cpp mame-0.224+dfsg.1/src/mame/drivers/bloodbro_ms.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/bloodbro_ms.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/bloodbro_ms.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -39,27 +39,59 @@
 	bloodbro_ms_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_screen(*this, "screen")
+		m_palette(*this, "palette"),
+		m_screen(*this, "screen"),
+		m_spriteram(*this, "spriteram"),
+		m_gfxdecode(*this, "gfxdecode")
 	{ }
 
 	void bloodbrom(machine_config &config);
+	void init_bloodbrom();
 
 protected:
 	virtual void machine_start() override;
 
 private:
 	required_device<cpu_device> m_maincpu;
+	required_device<palette_device> m_palette;
 	required_device<screen_device> m_screen;
+	required_shared_ptr<uint16_t> m_spriteram;
+	required_device<gfxdecode_device> m_gfxdecode;
 
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	void bloodbrom_map(address_map &map);
+
+	void descramble_16x16tiles(uint8_t* src, int len);
 };
 
 
 void bloodbro_ms_state::bloodbrom_map(address_map &map)
 {
-	map(0x000000, 0x7ffff).rom();
+	map(0x000000, 0x07ffff).rom();
+
+
+	map(0x080000, 0x08ffff).ram(); // original vram is in here, but bootleg copies some of it elsewhere for use
+
+	map(0x0a0000, 0x0a0001).nopw();
+	map(0x0a0008, 0x0a0009).nopw();
+	map(0x0a000c, 0x0a000d).nopw();
+
+	map(0x0c0100, 0x0c0101).nopw();
+
+	map(0x0e000e, 0x0e000f).nopw();
+
+
+	map(0x100000, 0x1003ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
+	map(0x100400, 0x1007ff).ram().w(m_palette, FUNC(palette_device::write16_ext)).share("palette_ext");
+	map(0x100800, 0x100fff).ram();
+	map(0x101000, 0x1017ff).ram().share("spriteram");
+	map(0x101800, 0x101fff).ram();
+
+	map(0x102000, 0x102001).nopw();
+
+	map(0x18d000, 0x18dfff).ram();
+
 }
 
 
@@ -70,20 +102,82 @@
 
 uint32_t bloodbro_ms_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
+	bitmap.fill(0, cliprect);
+
+	// TODO, convert to device, share between Modualar System games
+	const int NUM_SPRITES = 0x200;
+	const int X_EXTRA_OFFSET = 256;
+
+	for (int i = NUM_SPRITES-2; i >= 0; i-=2)
+	{
+		gfx_element *gfx = m_gfxdecode->gfx(0);
+
+		uint16_t attr0 = m_spriteram[i + 0];
+		uint16_t attr1 = m_spriteram[i + 1];
+
+		uint16_t attr2 = m_spriteram[i + NUM_SPRITES];
+		//uint16_t attr3 = m_spriteram[i + NUM_SPRITES + 1]; // unused?
+
+		int ypos = attr0 & 0x00ff;
+		int xpos = (attr1 & 0xff00)>>8;
+		xpos |= (attr2 & 0x8000) ? 0x100 : 0x000;
+
+		ypos = (0xff - ypos);
+
+		int tile = (attr0 & 0xff00) >> 8;
+		tile |= (attr1 & 0x003f) << 8;
+
+		int flipx = (attr1 & 0x0040);
+		int flipy = (attr2 & 0x4000);
+
+		gfx->transpen(bitmap,cliprect,tile,(attr2&0x0f00)>>8,flipx,flipy,xpos-16-X_EXTRA_OFFSET,ypos-16,15);
+	}
+
 	return 0;
 }
 
-static INPUT_PORTS_START( bloodbrom )
-INPUT_PORTS_END
+
+
+static const gfx_layout tiles16x16x4_layout =
+{
+	16,16,
+	RGN_FRAC(1,1),
+	4,
+	{ 0,8,16,24 },
+	{ 0,1,2,3,4,5,6,7, 512,513,514,515,516,517,518,519 },
+	{ STEP16(0,32) },
+	16 * 16 * 4
+};
+
+/*
+static const gfx_layout tiles8x8x4_layout =
+{
+    8,8,
+    RGN_FRAC(1,1),
+    4,
+    { 0,8,16,24 },
+    { 0,1,2,3,4,5,6,7 },
+    { STEP8(0,32) },
+    16 * 16
+};
+*/
 
 static GFXDECODE_START( gfx_bloodbro_ms )
+	GFXDECODE_ENTRY( "sprites", 0, tiles16x16x4_layout, 0x100, 32 )
+	GFXDECODE_ENTRY( "gfx1", 0, tiles16x16x4_layout, 0x000, 32 )
+	GFXDECODE_ENTRY( "gfx2", 0, tiles16x16x4_layout, 0x000, 32 )
 GFXDECODE_END
 
+
+static INPUT_PORTS_START( bloodbrom )
+INPUT_PORTS_END
+
 void bloodbro_ms_state::bloodbrom(machine_config &config)
 {
 	/* basic machine hardware */
 	M68000(config, m_maincpu, 22.1184_MHz_XTAL / 2); // divisor unknown
 	m_maincpu->set_addrmap(AS_PROGRAM, &bloodbro_ms_state::bloodbrom_map);
+	m_maincpu->set_vblank_int("screen", FUNC(bloodbro_ms_state::irq4_line_hold));
 
 	Z80(config, "audiocpu", 24_MHz_XTAL / 8).set_disable(); // divisor unknown, no XTAL on the PCB, might also use the 20 MHz one
 
@@ -96,7 +190,7 @@
 	m_screen->set_screen_update(FUNC(bloodbro_ms_state::screen_update));
 	m_screen->set_palette("palette");
 
-	PALETTE(config, "palette").set_format(palette_device::xBRG_444, 1024);
+	PALETTE(config, m_palette).set_format(palette_device::xBGR_444, 0x400);
 
 	GFXDECODE(config, "gfxdecode", "palette", gfx_bloodbro_ms);
 
@@ -112,12 +206,36 @@
 	MSM5205(config, "msm", 24_MHz_XTAL / 8).add_route(ALL_OUTPUTS, "mono", 0.15); // divisor unknown, no XTAL on the PCB, might also use the 20 MHz one
 }
 
+// reorganize graphics into something we can decode with a single pass
+void bloodbro_ms_state::descramble_16x16tiles(uint8_t* src, int len)
+{
+	std::vector<uint8_t> buffer(len);
+	{
+		for (int i = 0; i < len; i++)
+		{
+			int j = bitswap<20>(i, 19,18,17,16,15,12,11,10,9,8,7,6,5,14,13,4,3,2,1,0);
+			buffer[j] = src[i];
+		}
+
+		std::copy(buffer.begin(), buffer.end(), &src[0]);
+	}
+}
+
+void bloodbro_ms_state::init_bloodbrom()
+{
+	descramble_16x16tiles(memregion("gfx1")->base(), memregion("gfx1")->bytes());
+	descramble_16x16tiles(memregion("gfx2")->base(), memregion("gfx2")->bytes());
+}
+
+
+
+
 ROM_START( bloodbrom )
 	ROM_REGION( 0x100000, "maincpu", 0 ) // on MOD 6/1 board
 	ROM_LOAD16_BYTE( "6-1_bb606.ic8",   0x00001, 0x10000, CRC(3c069061) SHA1(537a10376ad24537367fb221817789bdc31787fa) )
-	ROM_LOAD16_BYTE( "6-1_bb605.ic11",  0x20001, 0x10000, CRC(2dc3fb8c) SHA1(44e8e4136979464101385531f97cce27abe1de34) )
 	ROM_LOAD16_BYTE( "6-1_bb603.ic17",  0x00000, 0x10000, CRC(10f4c8e9) SHA1(e5c078395b70b73d21c100c6b60cff89e4668473) )
-	ROM_LOAD16_BYTE( "6-1_bb602.ic20",  0x10000, 0x10000, CRC(8e507cce) SHA1(93bef8838cf8f73eb158dfe276f53c29f364fd45) )
+	ROM_LOAD16_BYTE( "6-1_bb605.ic11",  0x20001, 0x10000, CRC(2dc3fb8c) SHA1(44e8e4136979464101385531f97cce27abe1de34) )
+	ROM_LOAD16_BYTE( "6-1_bb602.ic20",  0x20000, 0x10000, CRC(8e507cce) SHA1(93bef8838cf8f73eb158dfe276f53c29f364fd45) )
 	ROM_LOAD16_BYTE( "6-1_bb604.ic25",  0x40001, 0x10000, CRC(cc069a40) SHA1(314b27cde5427b285272840f41da097326b39ee9) )
 	ROM_LOAD16_BYTE( "6-1_bb601.ic26",  0x40000, 0x10000, CRC(d06bf68d) SHA1(7df7a99805aa7dd2ad91fb3d641e369c058cc6ae) )
 
@@ -128,34 +246,41 @@
 	// with pins 32, 31 and 31 soldered together and pin 2 connected between all four chips,
 	// while the sockets are for 28 pin chips (with 27C512 silkscreened on the PCB behind the chips)
 	ROM_REGION( 0x80000, "gfx1", 0 ) // on one of the MOD 4/3 boards
-	ROM_LOAD( "4-3-a_bb4a1.ic17",  0x00000, 0x20000, CRC(499c91db) SHA1(bd7142a311a4f3e606f8a31aafc0b504f3d5a2e4) )
-	ROM_LOAD( "4-3-a_bb4a2.ic16",  0x20000, 0x20000, CRC(e8f87153) SHA1(f4147c971d1c66e7c6133c6318357ced7e30e217) )
-	ROM_LOAD( "4-3-a_bb4a3.ic15",  0x40000, 0x20000, CRC(13b888f2) SHA1(7a53f78f22a09fe4db45c36bf3912ad379deca64) )
-	ROM_LOAD( "4-3-a_bb4a4.ic14",  0x60000, 0x20000, CRC(19bc0508) SHA1(01c4eb570dc7ba9401085012d23bdb865df78029) )
+	ROM_LOAD32_BYTE( "4-3-a_bb4a1.ic17",  0x00003, 0x20000, CRC(499c91db) SHA1(bd7142a311a4f3e606f8a31aafc0b504f3d5a2e4) )
+	ROM_LOAD32_BYTE( "4-3-a_bb4a2.ic16",  0x00002, 0x20000, CRC(e8f87153) SHA1(f4147c971d1c66e7c6133c6318357ced7e30e217) )
+	ROM_LOAD32_BYTE( "4-3-a_bb4a3.ic15",  0x00001, 0x20000, CRC(13b888f2) SHA1(7a53f78f22a09fe4db45c36bf3912ad379deca64) )
+	ROM_LOAD32_BYTE( "4-3-a_bb4a4.ic14",  0x00000, 0x20000, CRC(19bc0508) SHA1(01c4eb570dc7ba9401085012d23bdb865df78029) )
 
 	ROM_REGION( 0x80000, "gfx2", 0 ) // on another MOD 4/3 board
-	ROM_LOAD( "4-3-b_bb4b1.ic17",  0x00000, 0x20000, CRC(aa86ae59) SHA1(c15a78eaaca36bebd3261cb2c4a2c232b967a135) )
-	ROM_LOAD( "4-3-b_bb4b2.ic16",  0x20000, 0x20000, CRC(f25dd182) SHA1(eff29970c7b898744b08a151f9e17b68ce77e78d) )
-	ROM_LOAD( "4-3-b_bb4b3.ic15",  0x40000, 0x20000, CRC(3efcb6aa) SHA1(0a162285d08e171e946147e0725db879643ae113) )
-	ROM_LOAD( "4-3-b_bb4b4.ic14",  0x60000, 0x20000, CRC(6b5254fa) SHA1(1e9e3096e5f29554fb8f8cb0df0e5157f940f8c9) )
-
-	ROM_REGION( 0x100000, "gfx3", 0 ) // on MOD 51/1 board
-	ROM_LOAD( "51-1-b_bb503.ic3",   0x00000, 0x10000, CRC(9d2a382d) SHA1(734b495ace73f07c622f64b305dafe43099395c1) )
-	ROM_LOAD( "51-1-b_bb504.ic4",   0x10000, 0x10000, CRC(1fc7f229) SHA1(37120c85a170f31bc4fbf287b1ba80bc319522ec) )
-	ROM_LOAD( "51-1-b_bb505.ic5",   0x20000, 0x10000, CRC(3ec650ce) SHA1(28091f535fcd580f2d3a941251a9c4f662fcf2e4) )
-	ROM_LOAD( "51-1-b_bb506.ic6",   0x30000, 0x10000, CRC(10dba663) SHA1(ea0e4115ebb1c9f894c044a1eb11f135fcf5aba8) )
-	ROM_LOAD( "51-1-b_bb512.ic12",  0x40000, 0x10000, CRC(83bbb220) SHA1(8f43354c7cea89938d1115d7a0f27ede8f7d3e96) )
-	ROM_LOAD( "51-1-b_bb513.ic13",  0x50000, 0x10000, CRC(3767456b) SHA1(3680807282079862cdfb5ec055e7d771e708545b) )
-	ROM_LOAD( "51-1-b_bb514.ic14",  0x60000, 0x10000, CRC(a29a2f44) SHA1(4e039d9a9b225179e84590d450eca3bed05bd3b8) )
-	ROM_LOAD( "51-1-b_bb515.ic15",  0x70000, 0x10000, CRC(30110411) SHA1(fe9f418070c224d3a9acf6913bd4597b55afcc94) )
-	ROM_LOAD( "51-1-b_bb518.ic18",  0x80000, 0x10000, CRC(efcf5b1d) SHA1(515b27f8e6df7ac7ed172cbd1ac64b14791de99f) )
-	ROM_LOAD( "51-1-b_bb519.ic19",  0x90000, 0x10000, CRC(77670244) SHA1(27a5572d86ae6e9a5ef076572a4b3a04a22c86e9) )
-	ROM_LOAD( "51-1-b_bb520.ic20",  0xa0000, 0x10000, CRC(d7f3b09a) SHA1(339206a7c3389d4eac63e8314ba7fdda9de73be7) )
-	ROM_LOAD( "51-1-b_bb521.ic21",  0xb0000, 0x10000, CRC(fb8cff4c) SHA1(5fa0b52140959e029911a28928b3efad4aa9f1db) )
-	ROM_LOAD( "51-1-b_bb524.ic24",  0xc0000, 0x10000, CRC(c4ccf38d) SHA1(be93ce6ed87c79fbd13838c0fe80526ce7e7e870) )
-	ROM_LOAD( "51-1-b_bb525.ic25",  0xd0000, 0x10000, CRC(25b4e119) SHA1(7e7d95aefee2b8d4dddf105c16d347ec65cd76a5) )
-	ROM_LOAD( "51-1-b_bb526.ic26",  0xe0000, 0x10000, CRC(1c2d70b0) SHA1(703f1acbcdaa7ff539f58829890d25b51a2e269e) )
-	ROM_LOAD( "51-1-b_bb527.ic27",  0xf0000, 0x10000, CRC(a73cd7a5) SHA1(9106565d1c8a8e0efa8f5035106f3cdac2189107) )
+	ROM_LOAD32_BYTE( "4-3-b_bb4b1.ic17",  0x00003, 0x20000, CRC(aa86ae59) SHA1(c15a78eaaca36bebd3261cb2c4a2c232b967a135) )
+	ROM_LOAD32_BYTE( "4-3-b_bb4b2.ic16",  0x00002, 0x20000, CRC(f25dd182) SHA1(eff29970c7b898744b08a151f9e17b68ce77e78d) )
+	ROM_LOAD32_BYTE( "4-3-b_bb4b3.ic15",  0x00001, 0x20000, CRC(3efcb6aa) SHA1(0a162285d08e171e946147e0725db879643ae113) )
+	ROM_LOAD32_BYTE( "4-3-b_bb4b4.ic14",  0x00000, 0x20000, CRC(6b5254fa) SHA1(1e9e3096e5f29554fb8f8cb0df0e5157f940f8c9) )
+
+	// ROMs for frontmost tile layer (text) are missing?
+	ROM_REGION( 0x80000, "gfx3", 0 ) // on another MOD 4/3 board
+	ROM_LOAD32_BYTE( "text.ic17",  0x00003, 0x20000, NO_DUMP )
+	ROM_LOAD32_BYTE( "text.ic16",  0x00002, 0x20000, NO_DUMP )
+	ROM_LOAD32_BYTE( "text.ic15",  0x00001, 0x20000, NO_DUMP )
+	ROM_LOAD32_BYTE( "text.ic14",  0x00000, 0x20000, NO_DUMP )
+
+	ROM_REGION( 0x100000, "sprites", ROMREGION_INVERT ) // on MOD 51/1 board
+	ROM_LOAD32_BYTE( "51-1-b_bb503.ic3",   0x00003, 0x10000, CRC(9d2a382d) SHA1(734b495ace73f07c622f64b305dafe43099395c1) )
+	ROM_LOAD32_BYTE( "51-1-b_bb512.ic12",  0x00002, 0x10000, CRC(83bbb220) SHA1(8f43354c7cea89938d1115d7a0f27ede8f7d3e96) )
+	ROM_LOAD32_BYTE( "51-1-b_bb518.ic18",  0x00001, 0x10000, CRC(efcf5b1d) SHA1(515b27f8e6df7ac7ed172cbd1ac64b14791de99f) )
+	ROM_LOAD32_BYTE( "51-1-b_bb524.ic24",  0x00000, 0x10000, CRC(c4ccf38d) SHA1(be93ce6ed87c79fbd13838c0fe80526ce7e7e870) )
+	ROM_LOAD32_BYTE( "51-1-b_bb504.ic4",   0x40003, 0x10000, CRC(1fc7f229) SHA1(37120c85a170f31bc4fbf287b1ba80bc319522ec) )
+	ROM_LOAD32_BYTE( "51-1-b_bb513.ic13",  0x40002, 0x10000, CRC(3767456b) SHA1(3680807282079862cdfb5ec055e7d771e708545b) )
+	ROM_LOAD32_BYTE( "51-1-b_bb519.ic19",  0x40001, 0x10000, CRC(77670244) SHA1(27a5572d86ae6e9a5ef076572a4b3a04a22c86e9) )
+	ROM_LOAD32_BYTE( "51-1-b_bb525.ic25",  0x40000, 0x10000, CRC(25b4e119) SHA1(7e7d95aefee2b8d4dddf105c16d347ec65cd76a5) )
+	ROM_LOAD32_BYTE( "51-1-b_bb505.ic5",   0x80003, 0x10000, CRC(3ec650ce) SHA1(28091f535fcd580f2d3a941251a9c4f662fcf2e4) )
+	ROM_LOAD32_BYTE( "51-1-b_bb514.ic14",  0x80002, 0x10000, CRC(a29a2f44) SHA1(4e039d9a9b225179e84590d450eca3bed05bd3b8) )
+	ROM_LOAD32_BYTE( "51-1-b_bb520.ic20",  0x80001, 0x10000, CRC(d7f3b09a) SHA1(339206a7c3389d4eac63e8314ba7fdda9de73be7) )
+	ROM_LOAD32_BYTE( "51-1-b_bb526.ic26",  0x80000, 0x10000, CRC(1c2d70b0) SHA1(703f1acbcdaa7ff539f58829890d25b51a2e269e) )
+	ROM_LOAD32_BYTE( "51-1-b_bb506.ic6",   0xc0003, 0x10000, CRC(10dba663) SHA1(ea0e4115ebb1c9f894c044a1eb11f135fcf5aba8) )
+	ROM_LOAD32_BYTE( "51-1-b_bb515.ic15",  0xc0002, 0x10000, CRC(30110411) SHA1(fe9f418070c224d3a9acf6913bd4597b55afcc94) )
+	ROM_LOAD32_BYTE( "51-1-b_bb521.ic21",  0xc0001, 0x10000, CRC(fb8cff4c) SHA1(5fa0b52140959e029911a28928b3efad4aa9f1db) )
+	ROM_LOAD32_BYTE( "51-1-b_bb527.ic27",  0xc0000, 0x10000, CRC(a73cd7a5) SHA1(9106565d1c8a8e0efa8f5035106f3cdac2189107) )
 
 	ROM_REGION( 0x0400, "proms", 0 )    // PROMs (function unknown)
 	ROM_LOAD( "1-2_110_tbp18s030.ic20",  0x000, 0x020, CRC(e26e680a) SHA1(9bbe30e98e952a6113c64e1171330153ddf22ce7) )
@@ -174,4 +299,7 @@
 	ROM_LOAD( "51-1-b_5246_gal16v8-20hb1.ic8", 0x000, 0x117, NO_DUMP ) // Protected
 ROM_END
 
-GAME( 199?, bloodbrom,  bloodbro,  bloodbrom,  bloodbrom,  bloodbro_ms_state, empty_init, ROT0, "bootleg (Gaelco / Ervisa)", "Blood Bros. (Modular System)", MACHINE_IS_SKELETON )
+
+
+
+GAME( 199?, bloodbrom,  bloodbro,  bloodbrom,  bloodbrom,  bloodbro_ms_state, init_bloodbrom, ROT0, "bootleg (Gaelco / Ervisa)", "Blood Bros. (Modular System)", MACHINE_IS_SKELETON )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/bmjr.cpp mame-0.224+dfsg.1/src/mame/drivers/bmjr.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/bmjr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/bmjr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -6,10 +6,10 @@
 
     preliminary driver by Angelo Salese
 
+    To enter the monitor: MON
+    To quit: E
+
     TODO:
-    - for whatever reason, BASIC won't work if you try to use it directly,
-      it does if you enter into MON first then exit (with E)
-    - tape hook-up doesn't work yet (shouldn't be hard to fix)
     - Break key is unemulated (tied with the NMI)
 
 ****************************************************************************/
@@ -17,6 +17,7 @@
 #include "emu.h"
 #include "cpu/m6800/m6800.h"
 #include "imagedev/cassette.h"
+#include "machine/timer.h"
 #include "sound/beep.h"
 #include "emupal.h"
 #include "screen.h"
@@ -33,8 +34,12 @@
 		, m_beep(*this, "beeper")
 		, m_p_wram(*this, "wram")
 		, m_p_chargen(*this, "chargen")
+		, m_io_keyboard(*this, "KEY%d", 0U)
 	{ }
 
+	void bmjr(machine_config &config);
+
+private:
 	u8 key_r();
 	void key_w(u8 data);
 	u8 ff_r();
@@ -44,15 +49,14 @@
 	u8 tape_stop_r();
 	u8 tape_start_r();
 	void xor_display_w(u8 data);
-	void init_bmjr();
-	u32 screen_update_bmjr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
-	void bmjr(machine_config &config);
-	void bmjr_mem(address_map &map);
-private:
+	u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	void mem_map(address_map &map);
 	bool m_tape_switch;
 	u8 m_xor_display;
 	u8 m_key_mux;
+	u16 m_casscnt;
+	bool m_cassold, m_cassbit;
+	TIMER_DEVICE_CALLBACK_MEMBER(kansas_r);
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	required_device<cpu_device> m_maincpu;
@@ -60,11 +64,12 @@
 	required_device<beep_device> m_beep;
 	required_shared_ptr<u8> m_p_wram;
 	required_region_ptr<u8> m_p_chargen;
+	required_ioport_array<16> m_io_keyboard;
 };
 
 
 
-u32 bmjr_state::screen_update_bmjr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+u32 bmjr_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	u8 y,ra,chr,gfx,fg=4;
 	u16 sy=0,ma=0x100,x;
@@ -100,9 +105,7 @@
 
 u8 bmjr_state::key_r()
 {
-	char kbdrow[6];
-	sprintf(kbdrow,"KEY%X", m_key_mux);
-	return (ioport(kbdrow)->read() & 15) | (ioport("KEYMOD")->read() << 4);
+	return m_io_keyboard[m_key_mux]->read() | ioport("KEYMOD")->read();
 }
 
 void bmjr_state::key_w(u8 data)
@@ -124,11 +127,31 @@
 	return 0x30;
 }
 
+TIMER_DEVICE_CALLBACK_MEMBER( bmjr_state::kansas_r )
+{
+	/* cassette - turn pulses into a bit */
+	bool cass_ws = (m_cass->input() > +0.04) ? 1 : 0;
+	m_casscnt++;
+
+	if (cass_ws != m_cassold)
+	{
+		m_cassold = cass_ws;
+		m_cassbit = (m_casscnt < 12) ? 1 : 0;
+		m_casscnt = 0;
+	}
+	else
+	if (m_casscnt > 32)
+	{
+		m_casscnt = 32;
+		m_cassbit = 0;
+	}
+}
+
 u8 bmjr_state::tape_r()
 {
 	//m_cass->change_state(CASSETTE_PLAY,CASSETTE_MASK_UISTATE);
 
-	return ((m_cass->input()) > 0.03) ? 0xff : 0x00;
+	return m_cassbit ? 0xff : 0x00;
 }
 
 void bmjr_state::tape_w(u8 data)
@@ -164,7 +187,7 @@
 	m_xor_display = data;
 }
 
-void bmjr_state::bmjr_mem(address_map &map)
+void bmjr_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	//0x0100, 0x03ff basic vram
@@ -195,93 +218,80 @@
 	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A) PORT_CHAR('A')
 	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
 	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("1 !") PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
 
 	PORT_START("KEY1")
 	PORT_BIT(0x01,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X) PORT_CHAR('X')
 	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S) PORT_CHAR('S')
 	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W) PORT_CHAR('W')
 	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("2 \"") PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('\"')
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
 
 	PORT_START("KEY2")
 	PORT_BIT(0x01,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C) PORT_CHAR('C')
 	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D) PORT_CHAR('D')
 	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E) PORT_CHAR('E')
 	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("3 #") PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
 
 	PORT_START("KEY3")
 	PORT_BIT(0x01,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V) PORT_CHAR('V')
 	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F) PORT_CHAR('F')
 	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R) PORT_CHAR('R')
 	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("4 $") PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
 
 	PORT_START("KEY4")
 	PORT_BIT(0x01,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B) PORT_CHAR('B')
 	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G) PORT_CHAR('G')
 	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T) PORT_CHAR('T')
 	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("5 %") PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
 
 	PORT_START("KEY5")
 	PORT_BIT(0x01,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N) PORT_CHAR('N')
 	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H) PORT_CHAR('H')
 	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y) PORT_CHAR('Y')
 	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("6 &") PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&')
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
 
 	PORT_START("KEY6")
 	PORT_BIT(0x01,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M) PORT_CHAR('M')
 	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J) PORT_CHAR('J')
 	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U) PORT_CHAR('U')
 	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("7 \'") PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
 
 	PORT_START("KEY7")
 	PORT_BIT(0x01,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME(", <") PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
 	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K) PORT_CHAR('K')
 	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I) PORT_CHAR('I')
 	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("8 (") PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
 
 	PORT_START("KEY8")
 	PORT_BIT(0x01,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME(". >") PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
 	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L) PORT_CHAR('L')
 	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O) PORT_CHAR('O')
 	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("9 )") PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
 
 	PORT_START("KEY9")
 	PORT_BIT(0x01,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("/ ?") PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
 	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("; +") PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')
 	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P) PORT_CHAR('P')
 	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0) PORT_CHAR('0')
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
 
-	PORT_START("KEYA")
+	PORT_START("KEY10")
 	PORT_BIT(0x01,IP_ACTIVE_LOW,IPT_UNUSED )
 	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME(": *") PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*')
 	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("@ Up") PORT_CODE(KEYCODE_8_PAD) PORT_CHAR('@')
 	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("- =") PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=')
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
 
-	PORT_START("KEYB")
+	PORT_START("KEY11")
 	PORT_BIT(0x01,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("Space") PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
 	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("]") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']')
 	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("[ Down") PORT_CODE(KEYCODE_OPENBRACE) PORT_CODE(KEYCODE_2_PAD) PORT_CHAR('[')
 	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("^ Right") PORT_CODE(KEYCODE_6_PAD) PORT_CHAR('^')
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
 
-	PORT_START("KEYC")
+	PORT_START("KEY12")
 	PORT_BIT(0x01,IP_ACTIVE_LOW,IPT_UNUSED)
 	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
 	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("Backspace") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
 	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("\xC2\xA5 / Left") PORT_CODE(KEYCODE_4_PAD)
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
 
-	PORT_START("KEYD")
+	PORT_START("KEY13")
 	PORT_DIPNAME( 0x01, 0x01, "D" )
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
@@ -294,20 +304,18 @@
 	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
 	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("KEYE")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_START("KEY14")
+	PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("KEYF")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_START("KEY15")
+	PORT_BIT( 0x0f, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("KEYMOD") /* Note: you should press Normal to return from a Kana state and vice-versa */
-	PORT_BIT(0x01,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME(DEF_STR( Normal )) PORT_CODE(KEYCODE_LCONTROL)
-	PORT_BIT(0x02,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
-	PORT_BIT(0x04,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("Kana Shift") PORT_CODE(KEYCODE_LALT)
-	PORT_BIT(0x08,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("Kana") PORT_CODE(KEYCODE_RCONTROL)
-	PORT_BIT(0xf0,IP_ACTIVE_LOW,IPT_UNUSED )
+	PORT_BIT(0x10,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME(DEF_STR( Normal )) PORT_CODE(KEYCODE_LCONTROL)
+	PORT_BIT(0x20,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT(0x40,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("Kana Shift") PORT_CODE(KEYCODE_LALT)
+	PORT_BIT(0x80,IP_ACTIVE_LOW,IPT_KEYBOARD) PORT_NAME("Kana") PORT_CODE(KEYCODE_RCONTROL)
 INPUT_PORTS_END
 
 static const gfx_layout bmjr_charlayout =
@@ -327,30 +335,38 @@
 
 void bmjr_state::machine_start()
 {
-	m_beep->set_state(0);
+	save_item(NAME(m_tape_switch));
+	save_item(NAME(m_xor_display));
+	save_item(NAME(m_key_mux));
+	save_item(NAME(m_casscnt));
+	save_item(NAME(m_cassold));
+	save_item(NAME(m_cassbit));
 }
 
 void bmjr_state::machine_reset()
 {
+	m_beep->set_state(0);
 	m_tape_switch = 0;
+	m_xor_display = 0;
+	m_key_mux = 0;
 	m_cass->change_state(CASSETTE_MOTOR_DISABLED,CASSETTE_MASK_MOTOR);
 }
 
 void bmjr_state::bmjr(machine_config &config)
 {
 	/* basic machine hardware */
-	M6800(config, m_maincpu, XTAL(4'000'000)/4); //unknown clock / divider
-	m_maincpu->set_addrmap(AS_PROGRAM, &bmjr_state::bmjr_mem);
+	// 750khz gets the cassette sound close to a normal kansas city 300 baud
+	M6800(config, m_maincpu, 750'000); //XTAL(4'000'000)/4); //unknown clock / divider
+	m_maincpu->set_addrmap(AS_PROGRAM, &bmjr_state::mem_map);
 	m_maincpu->set_vblank_int("screen", FUNC(bmjr_state::irq0_line_hold));
 
-
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(50);
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	screen.set_size(256, 192);
 	screen.set_visarea_full();
-	screen.set_screen_update(FUNC(bmjr_state::screen_update_bmjr));
+	screen.set_screen_update(FUNC(bmjr_state::screen_update));
 	screen.set_palette("palette");
 
 	PALETTE(config, "palette", palette_device::BRG_3BIT);
@@ -363,6 +379,7 @@
 	/* Devices */
 	CASSETTE(config, m_cass);
 	m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
+	TIMER(config, "kansas_r").configure_periodic(FUNC(bmjr_state::kansas_r), attotime::from_hz(40000));
 }
 
 /* ROM definition */
@@ -377,9 +394,7 @@
 ROM_END
 
 /* Driver */
-void bmjr_state::init_bmjr()
-{
-}
+
 
 /*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS       INIT       COMPANY    FULLNAME           FLAGS */
-COMP( 1982, bmjr, 0,      0,      bmjr,    bmjr,  bmjr_state, init_bmjr, "Hitachi", "Basic Master Jr", MACHINE_NOT_WORKING)
+COMP( 1982, bmjr, 0,      0,      bmjr,    bmjr,  bmjr_state, empty_init, "Hitachi", "Basic Master Jr", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/bob85.cpp mame-0.224+dfsg.1/src/mame/drivers/bob85.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/bob85.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/bob85.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -46,8 +46,8 @@
 	void bob85(machine_config &config);
 
 private:
-	void bob85_io(address_map &map);
-	void bob85_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 	uint8_t bob85_keyboard_r();
 	void bob85_7seg_w(offs_t offset, uint8_t data);
 	DECLARE_WRITE_LINE_MEMBER(sod_w);
@@ -57,8 +57,7 @@
 	uint8_t m_count_key;
 	u16 m_casscnt;
 	bool m_cassold, m_cassbit;
-	virtual void machine_reset() override;
-	virtual void machine_start() override { m_digits.resolve(); }
+	void machine_start() override;
 	required_device<i8085a_cpu_device> m_maincpu;
 	required_device<cassette_image_device> m_cass;
 	required_ioport m_line0;
@@ -145,14 +144,14 @@
 	m_digits[offset] = bitswap<8>( data,3,2,1,0,7,6,5,4 );
 }
 
-void bob85_state::bob85_mem(address_map &map)
+void bob85_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x0000, 0x02ff).rom();
 	map(0x0600, 0x09ff).ram();
 }
 
-void bob85_state::bob85_io(address_map &map)
+void bob85_state::io_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x0a, 0x0a).r(FUNC(bob85_state::bob85_keyboard_r));
@@ -191,8 +190,14 @@
 	PORT_BIT(0xC0, IP_ACTIVE_HIGH, IPT_UNUSED)
 INPUT_PORTS_END
 
-void bob85_state::machine_reset()
+void bob85_state::machine_start()
 {
+	m_digits.resolve();
+	save_item(NAME(m_prev_key));
+	save_item(NAME(m_count_key));
+	save_item(NAME(m_casscnt));
+	save_item(NAME(m_cassold));
+	save_item(NAME(m_cassbit));
 }
 
 TIMER_DEVICE_CALLBACK_MEMBER( bob85_state::kansas_r )
@@ -229,8 +234,8 @@
 {
 	/* basic machine hardware */
 	I8085A(config, m_maincpu, XTAL(5'000'000));
-	m_maincpu->set_addrmap(AS_PROGRAM, &bob85_state::bob85_mem);
-	m_maincpu->set_addrmap(AS_IO, &bob85_state::bob85_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &bob85_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &bob85_state::io_map);
 	m_maincpu->in_sid_func().set(FUNC(bob85_state::sid_r));
 	m_maincpu->out_sod_func().set(FUNC(bob85_state::sod_w));
 
@@ -247,11 +252,11 @@
 
 /* ROM definition */
 ROM_START( bob85 )
-	ROM_REGION( 0x600, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x0300, "maincpu", 0 )
 	ROM_LOAD( "bob85.rom", 0x0000, 0x0300, BAD_DUMP CRC(adde33a8) SHA1(00f26dd0c52005e7705e6cc9cb11a20e572682c6) ) // should be 6 separate 74S287's (256x4)
 ROM_END
 
 /* Driver */
 
 //    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY             FULLNAME  FLAGS
-COMP( 1984, bob85, 0,      0,      bob85,   bob85, bob85_state, empty_init, "Josef Kratochvil", "BOB-85", MACHINE_NO_SOUND_HW)
+COMP( 1984, bob85, 0,      0,      bob85,   bob85, bob85_state, empty_init, "Josef Kratochvil", "BOB-85", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/braiplus.cpp mame-0.224+dfsg.1/src/mame/drivers/braiplus.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/braiplus.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/braiplus.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4,6 +4,22 @@
 
     Skeleton driver for BraiLab Plus talking computer.
 
+    (from a document translated from Hungarian)
+In addition to the Z80 microprocessor on the two-sided printed circuit board,
+there are 256 Kbytes of dynamic RAM, 16 Kbytes of EPROM, 2 Z80PIOs, 4 Kbytes
+of static RAM, a character generator EPROM, a WD2793 floppy disk controller,
+a I8251 PUSART and a MEA-8000 speech synthesizer.
+
+180 Kbytes of 256 Kbytes of RAM is handled as a fixed RAM disk under the
+CP/M operating system. Memory management supports the use of a dynamic RAM
+fixed disk, provides the appropriate address space for the operating system,
+and flips between them and between EPROMs. The two Z80PIOs perform centronics
+interface, system clock interrupt handling, and serial programming of the
+baud rate with serial interface I8251 and HD-4702.
+
+The increased size of 4 Kbytes memory enabled 25x80 character screen.
+Floppy disk holds 792kb (formatted).
+
 ***************************************************************************/
 
 #include "emu.h"
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/btoads.cpp mame-0.224+dfsg.1/src/mame/drivers/btoads.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/btoads.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/btoads.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -28,11 +28,34 @@
 
 void btoads_state::machine_start()
 {
+	m_nvram_data = std::make_unique<uint8_t[]>(0x2000);
+	subdevice<nvram_device>("nvram")->set_base(m_nvram_data.get(), 0x2000);
+
 	save_item(NAME(m_main_to_sound_data));
 	save_item(NAME(m_main_to_sound_ready));
 	save_item(NAME(m_sound_to_main_data));
 	save_item(NAME(m_sound_to_main_ready));
 	save_item(NAME(m_sound_int_state));
+	save_pointer(NAME(m_nvram_data), 0x2000);
+}
+
+
+
+/*************************************
+ *
+ *  NVRAM
+ *
+ *************************************/
+
+void btoads_state::nvram_w(offs_t offset, uint8_t data)
+{
+	m_nvram_data[offset] = data;
+}
+
+
+uint8_t btoads_state::nvram_r(offs_t offset)
+{
+	return m_nvram_data[offset];
 }
 
 
@@ -180,11 +203,11 @@
 	map(0x20000180, 0x200001ff).w(FUNC(btoads_state::display_control_w));
 	map(0x20000200, 0x2000027f).w(FUNC(btoads_state::scroll0_w));
 	map(0x20000280, 0x200002ff).w(FUNC(btoads_state::scroll1_w));
-	map(0x20000300, 0x2000037f).rw(FUNC(btoads_state::paletteram_r), FUNC(btoads_state::paletteram_w));
+	map(0x20000300, 0x2000037f).rw(m_tlc34076, FUNC(tlc34076_device::read), FUNC(tlc34076_device::write)).umask32(0x000000ff);
 	map(0x20000380, 0x200003ff).rw(FUNC(btoads_state::main_sound_r), FUNC(btoads_state::main_sound_w));
 	map(0x20000400, 0x2000047f).w(FUNC(btoads_state::misc_control_w));
-	map(0x40000000, 0x4000000f).nopw();    /* watchdog? */
-	map(0x60000000, 0x6003ffff).ram().share("nvram");
+	map(0x40000000, 0x4000001f).nopw();    /* watchdog? */
+	map(0x60000000, 0x6003ffff).rw(FUNC(btoads_state::nvram_r), FUNC(btoads_state::nvram_w)).umask32(0x000000ff);
 	map(0xa0000000, 0xa03fffff).rw(FUNC(btoads_state::vram_fg_display_r), FUNC(btoads_state::vram_fg_display_w)).share("vram_fg0");
 	map(0xa4000000, 0xa43fffff).rw(FUNC(btoads_state::vram_fg_draw_r), FUNC(btoads_state::vram_fg_draw_w)).share("vram_fg1");
 	map(0xa8000000, 0xa87fffff).ram().share("vram_fg_data");
@@ -228,46 +251,46 @@
 
 static INPUT_PORTS_START( btoads )
 	PORT_START("P1")
-	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
-	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
-	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
-	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+	PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+	PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+	PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+	PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+	PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+	PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(2)
+	PORT_BIT( 0x00000080, IP_ACTIVE_LOW, IPT_START1 )
+	PORT_BIT( 0xffffff00, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("P2")
-	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
-	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
-	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2)
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
-	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+	PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+	PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
+	PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+	PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+	PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+	PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(2)
+	PORT_BIT( 0x00000080, IP_ACTIVE_LOW, IPT_START2 )
+	PORT_BIT( 0xffffff00, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("P3")
-	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
-	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3)
-	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2)
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START3 )
-	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(3)
+	PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3)
+	PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(3)
+	PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(3)
+	PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
+	PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
+	PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_COIN3 ) PORT_IMPULSE(2)
+	PORT_BIT( 0x00000080, IP_ACTIVE_LOW, IPT_START3 )
+	PORT_BIT( 0xffffff00, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("UNK")
-	PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0xffffffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SPECIAL")
-	PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(btoads_state, sound_to_main_r)
+	PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(btoads_state, sound_to_main_r)
 	PORT_SERVICE_NO_TOGGLE( 0x0002, IP_ACTIVE_LOW )
-	PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(btoads_state, main_to_sound_r)
-	PORT_BIT( 0xff7c, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x00000080, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(btoads_state, main_to_sound_r)
+	PORT_BIT( 0xffffff7c, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SW1")
 	PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Demo_Sounds )) PORT_DIPLOCATION("SW1:1")
@@ -292,7 +315,7 @@
 	PORT_DIPSETTING(      0x0040, DEF_STR( Off ))
 	PORT_DIPSETTING(      0x0000, DEF_STR( On ))
 	PORT_DIPUNKNOWN_DIPLOC(0x0080, 0x0080, "SW1:8")
-	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0xffffff00, IP_ACTIVE_LOW, IPT_UNUSED )
 INPUT_PORTS_END
 
 
@@ -348,7 +371,7 @@
 	ROM_REGION( 0x10000, "audiocpu", 0 )    /* sound program, M27C256B rom */
 	ROM_LOAD( "bt.u102", 0x0000, 0x8000, CRC(a90b911a) SHA1(6ec25161e68df1c9870d48cc2b1f85cd1a49aba9) )
 
-	ROM_REGION16_LE( 0x800000, "user1", 0 ) /* 34020 code, M27C322 roms */
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* 34020 code, M27C322 roms */
 	ROM_LOAD32_WORD( "btc0-p0.u120", 0x000000, 0x400000, CRC(0dfd1e35) SHA1(733a0a4235bebd598c600f187ed2628f28cf9bd0) )
 	ROM_LOAD32_WORD( "btc0-p1.u121", 0x000002, 0x400000, CRC(df7487e1) SHA1(67151b900767bb2653b5261a98c81ff8827222c3) )
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/busicom.cpp mame-0.224+dfsg.1/src/mame/drivers/busicom.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/busicom.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/busicom.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -16,10 +16,10 @@
 
 uint8_t busicom_state::get_bit_selected(uint32_t val,int num)
 {
-	int i;
-	for(i=0;i<num;i++) {
-		if (BIT(val,i)==0) return i;
-	}
+	for(int i=0;i<num;i++)
+		if (BIT(val,i)==0)
+			return i;
+
 	return 0;
 }
 
@@ -31,7 +31,8 @@
 uint8_t busicom_state::printer_r()
 {
 	uint8_t retVal = 0;
-	if (m_drum_index==0) retVal |= 1;
+	if (m_drum_index==0)
+		retVal |= 1;
 	retVal |= ioport("PAPERADV")->read() & 1 ? 8 : 0;
 	return retVal;
 }
@@ -40,11 +41,14 @@
 void busicom_state::shifter_w(uint8_t data)
 {
 	// FIXME: detect edges, maybe make 4003 shifter a device
-	if (BIT(data,0)) {
+	if (BIT(data,0))
+	{
 		m_keyboard_shifter <<= 1;
 		m_keyboard_shifter |= BIT(data,1);
 	}
-	if (BIT(data,2)) {
+
+	if (BIT(data,2))
+	{
 		m_printer_shifter <<= 1;
 		m_printer_shifter |= BIT(data,1);
 	}
@@ -52,37 +56,41 @@
 
 void busicom_state::printer_w(uint8_t data)
 {
-	int i,j;
-	if (BIT(data,0)) {
+	u8 i,j;
+	if (BIT(data,0))
+	{
 		logerror("color : %02x %02x %d\n",BIT(data,0),data,m_drum_index);
 		m_printer_line_color[10] = 1;
-
 	}
-	if (BIT(data,1)) {
-		for(i=3;i<18;i++) {
-			if(BIT(m_printer_shifter,i)) {
+
+	if (BIT(data,1))
+	{
+		for(i=3;i<18;i++)
+			if(BIT(m_printer_shifter,i))
 				m_printer_line[10][i-3] = m_drum_index + 1;
-			}
-		}
-		if(BIT(m_printer_shifter,0)) {
+
+		if(BIT(m_printer_shifter,0))
 			m_printer_line[10][15] = m_drum_index + 13 + 1;
-		}
-		if(BIT(m_printer_shifter,1)) {
+
+		if(BIT(m_printer_shifter,1))
 			m_printer_line[10][16] = m_drum_index + 26 + 1;
-		}
 	}
-	if (BIT(data,3)) {
-		for(j=0;j<10;j++) {
-			for(i=0;i<17;i++) {
+
+	if (BIT(data,3))
+	{
+		for(j=0;j<10;j++)
+		{
+			for(i=0;i<17;i++)
+			{
 				m_printer_line[j][i] = m_printer_line[j+1][i];
 				m_printer_line_color[j] = m_printer_line_color[j+1];
 			}
 		}
-		for(i=0;i<17;i++) {
+
+		for(i=0;i<17;i++)
 			m_printer_line[10][i] = 0;
-		}
-		m_printer_line_color[10] = 0;
 
+		m_printer_line_color[10] = 0;
 	}
 }
 void busicom_state::status_w(uint8_t data)
@@ -197,13 +205,21 @@
 TIMER_DEVICE_CALLBACK_MEMBER(busicom_state::timer_callback)
 {
 	m_timer ^= 1;
-	if (m_timer == 1) m_drum_index++;
-	if (m_drum_index == 13) m_drum_index = 0;
+	if (m_timer == 1)
+		m_drum_index++;
+	if (m_drum_index == 13)
+		m_drum_index = 0;
 	m_maincpu->set_input_line(I4004_TEST_LINE, m_timer);
 }
 
 void busicom_state::machine_start()
 {
+	save_item(NAME(m_drum_index));
+	save_item(NAME(m_keyboard_shifter));
+	save_item(NAME(m_printer_shifter));
+	save_item(NAME(m_timer));
+	save_item(NAME(m_printer_line));
+	save_item(NAME(m_printer_line_color));
 }
 
 void busicom_state::machine_reset()
@@ -213,8 +229,10 @@
 	m_keyboard_shifter = 0;
 	m_printer_shifter = 0;
 
-	for(i=0;i<17;i++) {
-		for(j=0;j<11;j++) {
+	for(i=0;i<17;i++)
+	{
+		for(j=0;j<11;j++)
+		{
 			m_printer_line[j][i] = 0;
 			m_printer_line_color[j] = 0;
 		}
@@ -222,8 +240,6 @@
 
 }
 
-//static const char layout_busicom [] = "busicom";
-
 void busicom_state::busicom(machine_config &config)
 {
 	/* basic machine hardware */
@@ -250,7 +266,7 @@
 
 /* ROM definition */
 ROM_START( busicom )
-	ROM_REGION( 0x1000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x0500, "maincpu", 0 )
 	ROM_LOAD( "busicom.l01", 0x0000, 0x0100, CRC(51ae2513) SHA1(5cb4097a3945db35af4ed64b629b20b08fc9824f))
 	ROM_LOAD( "busicom.l02", 0x0100, 0x0100, CRC(a05411ad) SHA1(81503a99a0d34fa29bf1245de0a44af2f174abdd))
 	ROM_LOAD( "busicom.l05", 0x0200, 0x0100, CRC(6120addf) SHA1(4b7ec183613630120b3c313c782122713d4327c5))
@@ -261,4 +277,4 @@
 /* Driver */
 
 //    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY                          FULLNAME          FLAGS
-COMP( 1974, busicom, 0,      0,      busicom, busicom, busicom_state, empty_init, "Business Computer Corporation", "Busicom 141-PF", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1974, busicom, 0,      0,      busicom, busicom, busicom_state, empty_init, "Business Computer Corporation", "Busicom 141-PF", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/by35.cpp mame-0.224+dfsg.1/src/mame/drivers/by35.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/by35.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/by35.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2776,7 +2776,7 @@
 	ROM_REGION(0x8000, "maincpu", 0)
 	ROM_LOAD( "cpu_u1.716", 0x1000, 0x0800, CRC(e2550957) SHA1(e445548b650fec5d593ca7da587300799ef94991))
 	ROM_LOAD( "cpu_u5.716", 0x1800, 0x0800, CRC(70fcd9f7) SHA1(ca5c2ea09f45f5ba50526880c158aaac61f007d5))
-	ROM_LOAD( "cpu_u2.716", 0x5000, 0x0800, CRC(3f55d17f) SHA1(e6333e53570fb05a841a7f141872c8bd14143f9c))
+	ROM_LOAD( "cpu_u2.716", 0x5000, 0x0800, CRC(3f55d17f) SHA1(e6333e53570fb05a841a7f141872c8bd14143f9c)) // filled with FF, but assume dump is OK
 	ROM_LOAD( "cpu_u6.716", 0x5800, 0x0800, CRC(842cd307) SHA1(8429d84e8bc4343b437801d0236150e04de79b75))
 	ROM_RELOAD( 0x7800, 0x0800)
 ROM_END
@@ -2876,5 +2876,5 @@
 GAME( 1988, monrobwl, 0,        by35,             by35, by35_state, init_by35_7, ROT0, "Monroe Bowling Co.", "Stars & Strikes (Bowler)",           MACHINE_IS_SKELETON_MECHANICAL)
 GAME( 1984, bigbat,   0,        squawk_n_talk_ay, by35, by35_state, init_by35_7, ROT0, "Bally Midway",       "Big Bat (Bat game)",                 MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
 GAME( 1984, mdntmrdr, 0,        squawk_n_talk_ay, by35, by35_state, init_by35_6, ROT0, "Bally Midway",       "Midnight Marauders (Gun game)",      MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1988, blbeauty, 0,        by35,             by35, by35_state, init_by35_7, ROT0, "Stern",              "Black Beauty (Shuffle)",             MACHINE_IS_SKELETON_MECHANICAL)
+GAME( 1984, blbeauty, 0,        by35,             by35, by35_state, init_by35_7, ROT0, "Stern",              "Black Beauty (Shuffle)",             MACHINE_IS_SKELETON_MECHANICAL)
 GAME( 1984, myststar, 0,        by35,             by35, by35_state, init_by35_6, ROT0, "Zaccaria",           "Mystic Star",                        MACHINE_IS_SKELETON_MECHANICAL)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/c128.cpp mame-0.224+dfsg.1/src/mame/drivers/c128.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/c128.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/c128.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1750,13 +1750,16 @@
 	QUICKLOAD(config, "quickload", "p00,prg", CBM_QUICKLOAD_DELAY).set_load_callback(FUNC(c128_state::quickload_c128));
 
 	// software list
-	SOFTWARE_LIST(config, "cart_list_vic10").set_original("vic10").set_filter("NTSC");
-	SOFTWARE_LIST(config, "cart_list_c64").set_original("c64_cart").set_filter("NTSC");
 	SOFTWARE_LIST(config, "cart_list").set_original("c128_cart").set_filter("NTSC");
-	SOFTWARE_LIST(config, "cass_list_c64").set_original("c64_cass").set_filter("NTSC");
-	SOFTWARE_LIST(config, "flop_list_c64").set_original("c64_flop").set_filter("NTSC");
 	SOFTWARE_LIST(config, "flop_list").set_original("c128_flop").set_filter("NTSC");
 	SOFTWARE_LIST(config, "from_list").set_original("c128_rom").set_filter("NTSC");
+	SOFTWARE_LIST(config, "cart_list_c64").set_original("c64_cart").set_filter("NTSC");
+	SOFTWARE_LIST(config, "cass_list_c64").set_original("c64_cass").set_filter("NTSC");
+	SOFTWARE_LIST(config, "cart_list_vic10").set_original("vic10").set_filter("NTSC");
+	// disk softlist split into originals, cleanly cracked, and misc (homebrew and defaced cracks)
+	SOFTWARE_LIST(config, "flop525_orig").set_original("c64_flop_orig").set_filter("NTSC");
+	SOFTWARE_LIST(config, "flop525_clean").set_compatible("c64_flop_clcracked").set_filter("NTSC");
+	SOFTWARE_LIST(config, "flop525_misc").set_compatible("c64_flop_misc").set_filter("NTSC");
 
 	// function ROM
 	GENERIC_SOCKET(config, "from", generic_plain_slot, "c128_rom", "bin,rom");
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/camplynx.cpp mame-0.224+dfsg.1/src/mame/drivers/camplynx.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/camplynx.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/camplynx.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -166,6 +166,7 @@
 #include "sound/dac.h"
 #include "sound/volt_reg.h"
 #include "video/mc6845.h"
+#include "machine/ram.h"
 #include "emupal.h"
 
 #include "formats/camplynx_cas.h"
@@ -182,6 +183,8 @@
 		: driver_device(mconfig, type, tag)
 		, m_palette(*this, "palette")
 		, m_maincpu(*this, "maincpu")
+		, m_ram(*this, RAM_TAG)
+		, m_bankr(*this, "bankr%d", 0)
 		, m_cass(*this, "cassette")
 		//, m_printer(*this, "centronics")
 		, m_crtc(*this, "crtc")
@@ -210,8 +213,8 @@
 	u8 port82_r(); // cassin for 128k
 	void port82_w(u8 data); // banking 128k
 	void port84_w(u8 data); // dac port 48k
-	DECLARE_MACHINE_RESET(lynx48k);
-	DECLARE_MACHINE_RESET(lynx128k);
+	void machine_start() override;
+	void machine_reset() override;
 	DECLARE_FLOPPY_FORMATS(camplynx_floppy_formats);
 	MC6845_UPDATE_ROW(lynx48k_update_row);
 	MC6845_UPDATE_ROW(lynx128k_update_row);
@@ -228,6 +231,8 @@
 	bool m_is_128k;
 	required_device<palette_device> m_palette;
 	required_device<z80_device> m_maincpu;
+	required_device<ram_device> m_ram;
+	required_memory_bank_array<8> m_bankr;
 	required_device<cassette_image_device> m_cass;
 	//required_device<> m_printer;
 	required_device<mc6845_device> m_crtc;
@@ -266,51 +271,51 @@
 		case 0x14:
 		case 0x18:
 		case 0x1c:
-			membank("bankr1")->set_entry(0);
-			membank("bankr2")->set_entry(1);
-			membank("bankr3")->set_entry(2);
-			membank("bankr4")->set_entry(3);
-			membank("bankr5")->set_entry(0);
-			membank("bankr6")->set_entry(1);
-			membank("bankr7")->set_entry(2);
-			membank("bankr8")->set_entry(7);
+			m_bankr[0]->set_entry(0);
+			m_bankr[1]->set_entry(1);
+			m_bankr[2]->set_entry(2);
+			m_bankr[3]->set_entry(3);
+			m_bankr[4]->set_entry(0);
+			m_bankr[5]->set_entry(1);
+			m_bankr[6]->set_entry(2);
+			m_bankr[7]->set_entry(7);
 			break;
 		case 0x20:
 		case 0x24:
 		case 0x28:
 		case 0x2c:
-			membank("bankr1")->set_entry(8);
-			membank("bankr2")->set_entry(9);
-			membank("bankr3")->set_entry(10);
-			membank("bankr4")->set_entry(11);
-			membank("bankr5")->set_entry(12);
-			membank("bankr6")->set_entry(13);
-			membank("bankr7")->set_entry(14);
-			membank("bankr8")->set_entry(BIT(m_port58, 4) ? 15 : 7);
+			m_bankr[0]->set_entry(8);
+			m_bankr[1]->set_entry(9);
+			m_bankr[2]->set_entry(10);
+			m_bankr[3]->set_entry(11);
+			m_bankr[4]->set_entry(12);
+			m_bankr[5]->set_entry(13);
+			m_bankr[6]->set_entry(14);
+			m_bankr[7]->set_entry(BIT(m_port58, 4) ? 15 : 7);
 			break;
 		case 0x30:
 		case 0x34:
 		case 0x38:
 		case 0x3c:
-			membank("bankr1")->set_entry(0);
-			membank("bankr2")->set_entry(1);
-			membank("bankr3")->set_entry(2);
-			membank("bankr4")->set_entry(11);
-			membank("bankr5")->set_entry(12);
-			membank("bankr6")->set_entry(13);
-			membank("bankr7")->set_entry(14);
-			membank("bankr8")->set_entry(BIT(m_port58, 4) ? 15 : 7);
+			m_bankr[0]->set_entry(0);
+			m_bankr[1]->set_entry(1);
+			m_bankr[2]->set_entry(2);
+			m_bankr[3]->set_entry(11);
+			m_bankr[4]->set_entry(12);
+			m_bankr[5]->set_entry(13);
+			m_bankr[6]->set_entry(14);
+			m_bankr[7]->set_entry(BIT(m_port58, 4) ? 15 : 7);
 			break;
 		case 0x44:
 		case 0x64:
-			membank("bankr1")->set_entry(24);
-			membank("bankr2")->set_entry(25);
-			membank("bankr3")->set_entry(26);
-			membank("bankr4")->set_entry(27);
-			membank("bankr5")->set_entry(28);
-			membank("bankr6")->set_entry(29);
-			membank("bankr7")->set_entry(30);
-			membank("bankr8")->set_entry(31);
+			m_bankr[0]->set_entry(24);
+			m_bankr[1]->set_entry(25);
+			m_bankr[2]->set_entry(26);
+			m_bankr[3]->set_entry(27);
+			m_bankr[4]->set_entry(28);
+			m_bankr[5]->set_entry(29);
+			m_bankr[6]->set_entry(30);
+			m_bankr[7]->set_entry(31);
 			break;
 		case 0x40:
 		case 0x60:
@@ -318,25 +323,25 @@
 		case 0x68:
 		case 0x4c:
 		case 0x6c:
-			membank("bankr1")->set_entry(16);
-			membank("bankr2")->set_entry(17);
-			membank("bankr3")->set_entry(18);
-			membank("bankr4")->set_entry(19);
-			membank("bankr5")->set_entry(20);
-			membank("bankr6")->set_entry(21);
-			membank("bankr7")->set_entry(22);
-			membank("bankr8")->set_entry(23);
+			m_bankr[0]->set_entry(16);
+			m_bankr[1]->set_entry(17);
+			m_bankr[2]->set_entry(18);
+			m_bankr[3]->set_entry(19);
+			m_bankr[4]->set_entry(20);
+			m_bankr[5]->set_entry(21);
+			m_bankr[6]->set_entry(22);
+			m_bankr[7]->set_entry(23);
 			break;
 		case 0x54:
 		case 0x74:
-			membank("bankr1")->set_entry(0);
-			membank("bankr2")->set_entry(1);
-			membank("bankr3")->set_entry(2);
-			membank("bankr4")->set_entry(27);
-			membank("bankr5")->set_entry(28);
-			membank("bankr6")->set_entry(29);
-			membank("bankr7")->set_entry(30);
-			membank("bankr8")->set_entry(31);
+			m_bankr[0]->set_entry(0);
+			m_bankr[1]->set_entry(1);
+			m_bankr[2]->set_entry(2);
+			m_bankr[3]->set_entry(27);
+			m_bankr[4]->set_entry(28);
+			m_bankr[5]->set_entry(29);
+			m_bankr[6]->set_entry(30);
+			m_bankr[7]->set_entry(31);
 			break;
 		case 0x50:
 		case 0x70:
@@ -344,14 +349,14 @@
 		case 0x78:
 		case 0x5c:
 		case 0x7c:
-			membank("bankr1")->set_entry(0);
-			membank("bankr2")->set_entry(1);
-			membank("bankr3")->set_entry(2);
-			membank("bankr4")->set_entry(19);
-			membank("bankr5")->set_entry(20);
-			membank("bankr6")->set_entry(21);
-			membank("bankr7")->set_entry(22);
-			membank("bankr8")->set_entry(23);
+			m_bankr[0]->set_entry(0);
+			m_bankr[1]->set_entry(1);
+			m_bankr[2]->set_entry(2);
+			m_bankr[3]->set_entry(19);
+			m_bankr[4]->set_entry(20);
+			m_bankr[5]->set_entry(21);
+			m_bankr[6]->set_entry(22);
+			m_bankr[7]->set_entry(23);
 			break;
 		default:
 			printf("Banking code %X not handled\n", m_bankdata);
@@ -382,82 +387,82 @@
 	{
 		case 0x00:
 		case 0x01:
-			membank("bankr1")->set_entry(0);
-			membank("bankr2")->set_entry(1);
-			membank("bankr3")->set_entry(2);
-			membank("bankr4")->set_entry(3);
-			membank("bankr5")->set_entry(4);
-			membank("bankr6")->set_entry(5);
-			membank("bankr7")->set_entry(6);
-			membank("bankr8")->set_entry(7);
+			m_bankr[0]->set_entry(0);
+			m_bankr[1]->set_entry(1);
+			m_bankr[2]->set_entry(2);
+			m_bankr[3]->set_entry(3);
+			m_bankr[4]->set_entry(4);
+			m_bankr[5]->set_entry(5);
+			m_bankr[6]->set_entry(6);
+			m_bankr[7]->set_entry(7);
 			break;
 		case 0x02:
 		case 0x0a:
-			membank("bankr1")->set_entry(8);
-			membank("bankr2")->set_entry(9);
-			membank("bankr3")->set_entry(10);
-			membank("bankr4")->set_entry(11);
-			membank("bankr5")->set_entry(12);
-			membank("bankr6")->set_entry(13);
-			membank("bankr7")->set_entry(14);
-			membank("bankr8")->set_entry(15);
+			m_bankr[0]->set_entry(8);
+			m_bankr[1]->set_entry(9);
+			m_bankr[2]->set_entry(10);
+			m_bankr[3]->set_entry(11);
+			m_bankr[4]->set_entry(12);
+			m_bankr[5]->set_entry(13);
+			m_bankr[6]->set_entry(14);
+			m_bankr[7]->set_entry(15);
 			break;
 		case 0x03:
 		case 0x07:
 		case 0x0b:
 		case 0x0f:
-			membank("bankr1")->set_entry(0);
-			membank("bankr2")->set_entry(1);
-			membank("bankr3")->set_entry(2);
-			membank("bankr4")->set_entry(11);
-			membank("bankr5")->set_entry(12);
-			membank("bankr6")->set_entry(13);
-			membank("bankr7")->set_entry(14);
-			membank("bankr8")->set_entry(BIT(m_port58, 4) ? 15 : 7);
+			m_bankr[0]->set_entry(0);
+			m_bankr[1]->set_entry(1);
+			m_bankr[2]->set_entry(2);
+			m_bankr[3]->set_entry(11);
+			m_bankr[4]->set_entry(12);
+			m_bankr[5]->set_entry(13);
+			m_bankr[6]->set_entry(14);
+			m_bankr[7]->set_entry(BIT(m_port58, 4) ? 15 : 7);
 			break;
 		case 0x04:
 		case 0x06:
 		case 0x0c:
 		case 0x0e:
-			membank("bankr1")->set_entry(16);
-			membank("bankr2")->set_entry(17);
-			membank("bankr3")->set_entry(18);
-			membank("bankr4")->set_entry(19);
-			membank("bankr5")->set_entry(20);
-			membank("bankr6")->set_entry(21);
-			membank("bankr7")->set_entry(22);
-			membank("bankr8")->set_entry(23);
+			m_bankr[0]->set_entry(16);
+			m_bankr[1]->set_entry(17);
+			m_bankr[2]->set_entry(18);
+			m_bankr[3]->set_entry(19);
+			m_bankr[4]->set_entry(20);
+			m_bankr[5]->set_entry(21);
+			m_bankr[6]->set_entry(22);
+			m_bankr[7]->set_entry(23);
 			break;
 		case 0x05:
 		case 0x0d:
-			membank("bankr1")->set_entry(0);
-			membank("bankr2")->set_entry(1);
-			membank("bankr3")->set_entry(2);
-			membank("bankr4")->set_entry(19);
-			membank("bankr5")->set_entry(20);
-			membank("bankr6")->set_entry(21);
-			membank("bankr7")->set_entry(22);
-			membank("bankr8")->set_entry(23);
+			m_bankr[0]->set_entry(0);
+			m_bankr[1]->set_entry(1);
+			m_bankr[2]->set_entry(2);
+			m_bankr[3]->set_entry(19);
+			m_bankr[4]->set_entry(20);
+			m_bankr[5]->set_entry(21);
+			m_bankr[6]->set_entry(22);
+			m_bankr[7]->set_entry(23);
 			break;
 		case 0x08:
-			membank("bankr1")->set_entry(32);
-			membank("bankr2")->set_entry(33);
-			membank("bankr3")->set_entry(34);
-			membank("bankr4")->set_entry(35);
-			membank("bankr5")->set_entry(36);
-			membank("bankr6")->set_entry(37);
-			membank("bankr7")->set_entry(38);
-			membank("bankr8")->set_entry(39);
+			m_bankr[0]->set_entry(32);
+			m_bankr[1]->set_entry(33);
+			m_bankr[2]->set_entry(34);
+			m_bankr[3]->set_entry(35);
+			m_bankr[4]->set_entry(36);
+			m_bankr[5]->set_entry(37);
+			m_bankr[6]->set_entry(38);
+			m_bankr[7]->set_entry(39);
 			break;
 		case 0x09:
-			membank("bankr1")->set_entry(0);
-			membank("bankr2")->set_entry(1);
-			membank("bankr3")->set_entry(2);
-			membank("bankr4")->set_entry(35);
-			membank("bankr5")->set_entry(36);
-			membank("bankr6")->set_entry(37);
-			membank("bankr7")->set_entry(38);
-			membank("bankr8")->set_entry(39);
+			m_bankr[0]->set_entry(0);
+			m_bankr[1]->set_entry(1);
+			m_bankr[2]->set_entry(2);
+			m_bankr[3]->set_entry(35);
+			m_bankr[4]->set_entry(36);
+			m_bankr[5]->set_entry(37);
+			m_bankr[6]->set_entry(38);
+			m_bankr[7]->set_entry(39);
 			break;
 		default:
 			printf("Banking code %X not handled\n", m_bankdata);
@@ -467,28 +472,28 @@
 void camplynx_state::lynx48k_mem(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0x1fff).bankr("bankr1");
-	map(0x2000, 0x3fff).bankr("bankr2");
-	map(0x4000, 0x5fff).bankr("bankr3");
-	map(0x6000, 0x7fff).bankr("bankr4");
-	map(0x8000, 0x9fff).bankr("bankr5");
-	map(0xa000, 0xbfff).bankr("bankr6");
-	map(0xc000, 0xdfff).bankr("bankr7");
-	map(0xe000, 0xffff).bankr("bankr8");
+	map(0x0000, 0x1fff).bankr("bankr0");
+	map(0x2000, 0x3fff).bankr("bankr1");
+	map(0x4000, 0x5fff).bankr("bankr2");
+	map(0x6000, 0x7fff).bankr("bankr3");
+	map(0x8000, 0x9fff).bankr("bankr4");
+	map(0xa000, 0xbfff).bankr("bankr5");
+	map(0xc000, 0xdfff).bankr("bankr6");
+	map(0xe000, 0xffff).bankr("bankr7");
 	map(0x0000, 0xffff).w(FUNC(camplynx_state::bank6_w));
 }
 
 void camplynx_state::lynx128k_mem(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0x1fff).bankr("bankr1");
-	map(0x2000, 0x3fff).bankr("bankr2");
-	map(0x4000, 0x5fff).bankr("bankr3");
-	map(0x6000, 0x7fff).bankr("bankr4");
-	map(0x8000, 0x9fff).bankr("bankr5");
-	map(0xa000, 0xbfff).bankr("bankr6");
-	map(0xc000, 0xdfff).bankr("bankr7");
-	map(0xe000, 0xffff).bankr("bankr8");
+	map(0x0000, 0x1fff).bankr("bankr0");
+	map(0x2000, 0x3fff).bankr("bankr1");
+	map(0x4000, 0x5fff).bankr("bankr2");
+	map(0x6000, 0x7fff).bankr("bankr3");
+	map(0x8000, 0x9fff).bankr("bankr4");
+	map(0xa000, 0xbfff).bankr("bankr5");
+	map(0xc000, 0xdfff).bankr("bankr6");
+	map(0xe000, 0xffff).bankr("bankr7");
 	map(0x0000, 0xffff).w(FUNC(camplynx_state::bank1_w));
 }
 
@@ -730,19 +735,14 @@
 	return data;
 }
 
-MACHINE_RESET_MEMBER(camplynx_state, lynx48k)
+void camplynx_state::machine_reset()
 {
 	m_port58 = 0;
 	m_port80 = 0;
-	port7f_w( 0 );
-	m_maincpu->reset();
-}
-
-MACHINE_RESET_MEMBER(camplynx_state, lynx128k)
-{
-	m_port58 = 0;
-	m_port80 = 0;
-	port82_w( 0 );
+	if (m_is_128k)
+		port82_w( 0 );
+	else
+		port7f_w( 0 );
 	m_maincpu->reset();
 }
 
@@ -838,6 +838,15 @@
 	m_floppy1->get_device()->mon_w(BIT(data, 3));
 }
 
+void camplynx_state::machine_start()
+{
+	save_item(NAME(m_port58));
+	save_item(NAME(m_port80));
+	save_item(NAME(m_bankdata));
+	save_item(NAME(m_wbyte));
+	save_item(NAME(m_is_128k));
+}
+
 FLOPPY_FORMATS_MEMBER( camplynx_state::camplynx_floppy_formats )
 	FLOPPY_CAMPLYNX_FORMAT
 FLOPPY_FORMATS_END
@@ -871,8 +880,6 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &camplynx_state::lynx48k_mem);
 	m_maincpu->set_addrmap(AS_IO, &camplynx_state::lynx48k_io);
 
-	MCFG_MACHINE_RESET_OVERRIDE(camplynx_state, lynx48k)
-
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(50);
@@ -897,6 +904,9 @@
 	m_crtc->set_update_row_callback(FUNC(camplynx_state::lynx48k_update_row));
 	m_crtc->out_vsync_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
 
+	/* internal ram */
+	RAM(config, RAM_TAG).set_default_size("256K");
+
 	/* software lists */
 	SOFTWARE_LIST(config, "cass_list").set_original("camplynx_cass");
 }
@@ -920,8 +930,6 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &camplynx_state::lynx128k_mem);
 	m_maincpu->set_addrmap(AS_IO, &camplynx_state::lynx128k_io);
 
-	MCFG_MACHINE_RESET_OVERRIDE(camplynx_state, lynx128k)
-
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(50);
@@ -946,6 +954,9 @@
 	m_crtc->set_update_row_callback(FUNC(camplynx_state::lynx128k_update_row));
 	m_crtc->out_vsync_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
 
+	/* internal ram */
+	RAM(config, RAM_TAG).set_default_size("320K");
+
 	lynx_disk(config);
 
 	/* software lists */
@@ -956,69 +967,65 @@
 void camplynx_state::init_lynx48k()
 {
 	m_is_128k = false;
-	m_p_ram = memregion("maincpu")->base();
-	membank("bankr1")->configure_entries(0, 32, &m_p_ram[0], 0x2000);
-	membank("bankr2")->configure_entries(0, 32, &m_p_ram[0], 0x2000);
-	membank("bankr3")->configure_entries(0, 32, &m_p_ram[0], 0x2000);
-	membank("bankr4")->configure_entries(0, 32, &m_p_ram[0], 0x2000);
-	membank("bankr5")->configure_entries(0, 32, &m_p_ram[0], 0x2000);
-	membank("bankr6")->configure_entries(0, 32, &m_p_ram[0], 0x2000);
-	membank("bankr7")->configure_entries(0, 32, &m_p_ram[0], 0x2000);
-	membank("bankr8")->configure_entries(0, 32, &m_p_ram[0], 0x2000);
+	u8 *m = memregion("maincpu")->base();
+	m_p_ram = m_ram->pointer();
+	for (auto &bank : m_bankr)
+		bank->configure_entries(0, 32, m_p_ram, 0x2000);
+	for (u8 i = 0; i < 8; i++)
+		for (auto &bank : m_bankr)
+			bank->configure_entry(i, m+i*0x2000);
 }
 
 void camplynx_state::init_lynx128k()
 {
 	m_is_128k = true;
-	m_p_ram = memregion("maincpu")->base();
-	membank("bankr1")->configure_entries(0, 40, &m_p_ram[0], 0x2000);
-	membank("bankr2")->configure_entries(0, 40, &m_p_ram[0], 0x2000);
-	membank("bankr3")->configure_entries(0, 40, &m_p_ram[0], 0x2000);
-	membank("bankr4")->configure_entries(0, 40, &m_p_ram[0], 0x2000);
-	membank("bankr5")->configure_entries(0, 40, &m_p_ram[0], 0x2000);
-	membank("bankr6")->configure_entries(0, 40, &m_p_ram[0], 0x2000);
-	membank("bankr7")->configure_entries(0, 40, &m_p_ram[0], 0x2000);
-	membank("bankr8")->configure_entries(0, 40, &m_p_ram[0], 0x2000);
+	u8 *m = memregion("maincpu")->base();
+	m_p_ram = m_ram->pointer();
+	for (auto &bank : m_bankr)
+		bank->configure_entries(0, 40, m_p_ram, 0x2000);
+	for (u8 i = 0; i < 8; i++)
+		for (auto &bank : m_bankr)
+			bank->configure_entry(i, m+i*0x2000);
 }
 
 
 /* ROM definition */
 ROM_START( lynx48k )
-	ROM_REGION( 0x40000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
 	ROM_DEFAULT_BIOS("1")
 	ROM_SYSTEM_BIOS(0, "1", "Set1")
-	ROMX_LOAD( "lynx48-1.rom", 0x0000, 0x2000, CRC(56feec44) SHA1(7ded5184561168e159a30fa8e9d3fde5e52aa91a), ROM_BIOS(0) )
-	ROMX_LOAD( "lynx48-2.rom", 0x2000, 0x2000, CRC(d894562e) SHA1(c08a78ecb4eb05baa4c52488fce3648cd2688744), ROM_BIOS(0) )
+	ROMX_LOAD( "lynx48-1.ic46", 0x0000, 0x2000, CRC(56feec44) SHA1(7ded5184561168e159a30fa8e9d3fde5e52aa91a), ROM_BIOS(0) )
+	ROMX_LOAD( "lynx48-2.ic45", 0x2000, 0x2000, CRC(d894562e) SHA1(c08a78ecb4eb05baa4c52488fce3648cd2688744), ROM_BIOS(0) )
 	ROM_SYSTEM_BIOS(1, "2", "Set2")
-	ROMX_LOAD( "lynx4811.rom", 0x0000, 0x2000, CRC(a933e577) SHA1(c7b30a28d99b38dbe63a1314c78e3e614287143b), ROM_BIOS(1) )
-	ROMX_LOAD( "lynx4812.rom", 0x2000, 0x2000, CRC(3d3fdd0e) SHA1(259d124f05367a96f891790f9418cc9c7798e2f8), ROM_BIOS(1) )
+	ROMX_LOAD( "lynx4811.ic46", 0x0000, 0x2000, CRC(a933e577) SHA1(c7b30a28d99b38dbe63a1314c78e3e614287143b), ROM_BIOS(1) )
+	ROMX_LOAD( "lynx4812.ic45", 0x2000, 0x2000, CRC(3d3fdd0e) SHA1(259d124f05367a96f891790f9418cc9c7798e2f8), ROM_BIOS(1) )
 ROM_END
 
 ROM_START( lynx96k )
-	ROM_REGION( 0x40000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "lynx9646.rom",  0x0000, 0x2000, CRC(f86c5514) SHA1(77a4af7557382003d697d08f364839e2dc28f063) )
-	ROM_LOAD( "lynx9645.rom",  0x2000, 0x2000, CRC(f596b9a3) SHA1(3fca46bd68422d34c6cd801dd904507e52bd8846) )
+	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "lynx9646.ic46",  0x0000, 0x2000, CRC(f86c5514) SHA1(77a4af7557382003d697d08f364839e2dc28f063) )
+	ROM_LOAD( "lynx9645.ic45",  0x2000, 0x2000, CRC(f596b9a3) SHA1(3fca46bd68422d34c6cd801dd904507e52bd8846) )
 	ROM_DEFAULT_BIOS("orig")
 	ROM_SYSTEM_BIOS(0, "orig", "Original")
-	ROMX_LOAD( "lynx9644.rom", 0x4000, 0x1000, CRC(4b96b0de) SHA1(c372a8d26399b9b45e615b674d61ccda76491b8b), ROM_BIOS(0) )
+	ROMX_LOAD( "lynx9644.ic44", 0x4000, 0x1000, CRC(4b96b0de) SHA1(c372a8d26399b9b45e615b674d61ccda76491b8b), ROM_BIOS(0) )
 	ROM_SYSTEM_BIOS(1, "scorp", "Scorpion") /* Scorpion ROM v2.1 03/86 (Reading Lynx User Group) */
-	ROMX_LOAD( "skorprom.rom", 0x4000, 0x2000, CRC(698d3de9) SHA1(c707bdcecef79774c2a8a23d1f3e9ba382cb9304), ROM_BIOS(1) )
+	ROMX_LOAD( "skorprom.ic44", 0x4000, 0x2000, CRC(698d3de9) SHA1(c707bdcecef79774c2a8a23d1f3e9ba382cb9304), ROM_BIOS(1) )
 	ROM_SYSTEM_BIOS(2, "danish", "Danish")
-	ROMX_LOAD( "danish96k3.rom", 0x4000, 0x2000, CRC(795c22ea) SHA1(0a57394cd986c5b338b38d514e894bace7f6e47b), ROM_BIOS(2) )
+	ROMX_LOAD( "danish96k3.ic44", 0x4000, 0x2000, CRC(795c22ea) SHA1(0a57394cd986c5b338b38d514e894bace7f6e47b), ROM_BIOS(2) )
 	ROM_LOAD( "dosrom.rom",    0xe000, 0x2000, CRC(011e106a) SHA1(e77f0ca99790551a7122945f3194516b2390fb69) )
 ROM_END
 
 ROM_START( lynx128k )
-	ROM_REGION( 0x50000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "lynx128-1.rom", 0x0000, 0x2000, CRC(65d292ce) SHA1(36567c2fbd9cf72f758e8cb80c21cb4d82040752) )
-	ROM_LOAD( "lynx128-2.rom", 0x2000, 0x2000, CRC(23288773) SHA1(e12a7ebea3fae5eb375c03e848dbb81070d9d189) )
-	ROM_LOAD( "lynx128-3.rom", 0x4000, 0x2000, CRC(9827b9e9) SHA1(1092367b2af51c72ce9be367179240d692aeb131) )
+	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "lynx128-1.ic1", 0x0000, 0x2000, CRC(65d292ce) SHA1(36567c2fbd9cf72f758e8cb80c21cb4d82040752) )
+	ROM_LOAD( "lynx128-2.ic2", 0x2000, 0x2000, CRC(23288773) SHA1(e12a7ebea3fae5eb375c03e848dbb81070d9d189) )
+	ROM_LOAD( "lynx128-3.ic3", 0x4000, 0x2000, CRC(9827b9e9) SHA1(1092367b2af51c72ce9be367179240d692aeb131) )
 	ROM_LOAD( "dosrom.rom",    0xe000, 0x2000, CRC(011e106a) SHA1(e77f0ca99790551a7122945f3194516b2390fb69) )
 ROM_END
 
 
 /* Driver */
 /*    YEAR  NAME      PARENT   COMPAT  MACHINE   INPUT    CLASS           INIT           COMPANY      FULLNAME     FLAGS */
-COMP( 1983, lynx48k,  0,       0,      lynx48k,  lynx48k, camplynx_state, init_lynx48k,  "Camputers", "Lynx 48k",  0 )
-COMP( 1983, lynx96k,  lynx48k, 0,      lynx96k,  lynx48k, camplynx_state, init_lynx48k,  "Camputers", "Lynx 96k",  0 )
-COMP( 1983, lynx128k, lynx48k, 0,      lynx128k, lynx48k, camplynx_state, init_lynx128k, "Camputers", "Lynx 128k", 0 )
+COMP( 1983, lynx48k,  0,       0,      lynx48k,  lynx48k, camplynx_state, init_lynx48k,  "Camputers", "Lynx 48k",  MACHINE_SUPPORTS_SAVE )
+COMP( 1983, lynx96k,  lynx48k, 0,      lynx96k,  lynx48k, camplynx_state, init_lynx48k,  "Camputers", "Lynx 96k",  MACHINE_SUPPORTS_SAVE )
+COMP( 1983, lynx128k, lynx48k, 0,      lynx128k, lynx48k, camplynx_state, init_lynx128k, "Camputers", "Lynx 128k", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/carpolo.cpp mame-0.224+dfsg.1/src/mame/drivers/carpolo.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/carpolo.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/carpolo.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -24,7 +24,7 @@
 #include "machine/74153.h"
 #include "machine/6821pia.h"
 #include "screen.h"
-
+#include "speaker.h"
 
 
 /*************************************
@@ -290,6 +290,21 @@
 
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_carpolo);
 	PALETTE(config, m_palette, FUNC(carpolo_state::carpolo_palette), 12*2+2*16+4*2);
+
+	/* sound hardware */
+	SPEAKER(config, "mono").front_center();
+
+	NETLIST_SOUND(config, "sound_nl", 48000)
+		.set_source(NETLIST_NAME(carpolo))
+		.add_route(ALL_OUTPUTS, "mono", 1.0);
+
+	NETLIST_LOGIC_INPUT(config, "sound_nl:player_crash1", "PL1_CRASH.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:player_crash2", "PL2_CRASH.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:player_crash3", "PL3_CRASH.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:player_crash4", "PL4_CRASH.IN", 0);
+
+	// Temporarily just tied to an arbitrary value to preserve lack of audio.
+	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "PL1_CRASH.GND").set_mult_offset(10000.0, 0.0);
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/casloopy.cpp mame-0.224+dfsg.1/src/mame/drivers/casloopy.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/casloopy.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/casloopy.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -81,9 +81,8 @@
                     like a V60. The BIOS is tied directly to it.
       RH-7500     - Casio RH-7500 5C315 (QFP208). This is the graphics generator chip.
       RH-7501     - Casio RH-7501 5C350 (QFP64). This is probably the sound chip.
-      SH7021      - Hitachi HD6437021TE20 SuperH RISC Engine SH-2A CPU with 32k internal maskROM (TQFP100)
-                    The internal ROM (BIOS1) is not dumped. A SH-2A software programming manual is available here...
-                    http://documentation.renesas.com/eng/products/mpumcu/rej09b0051_sh2a.pdf
+      SH7021      - Hitachi HD6437021TE20 SuperH RISC Engine SH-1 CPU with 32k internal maskROM (TQFP100)
+                    The internal ROM (BIOS1) is not dumped.
       CXA1645M    - Sony CXA1645M RGB Encoder (RGB -> Composite Video) (SOIC24)
       A1603C      - NEC uPA1603C Compound Field Effect Power Transistor Array (DIP16)
       HM514260    - Hitachi HM514260 256k x 16 DRAM (SOJ40)
@@ -431,7 +430,7 @@
 //  map(0x05ffff00, 0x05ffffff).rw(FUNC(casloopy_state::sh7021_r), FUNC(casloopy_state::sh7021_w));
 //  map(0x05ffff00, 0x05ffffff) - SH7021 internal i/o
 	map(0x06000000, 0x062fffff).r(m_cart, FUNC(generic_cartslot_device::read32_rom));
-	map(0x07000000, 0x070003ff).ram().share("oram");// on-chip RAM, actually at 0xf000000 (1 kb)
+	//map(0x07000000, 0x070003ff).ram();// area 7 (CS7), NOT on-chip RAM mirror
 	map(0x09000000, 0x0907ffff).ram().share("wram");
 	map(0x0e000000, 0x0e2fffff).r(m_cart, FUNC(generic_cartslot_device::read32_rom));
 	map(0x0f000000, 0x0f0003ff).ram().share("oram");
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cat.cpp mame-0.224+dfsg.1/src/mame/drivers/cat.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cat.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cat.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1077,7 +1077,7 @@
 	m_duart->irq_cb().set(FUNC(cat_state::cat_duart_irq_handler));
 	m_duart->a_tx_cb().set(FUNC(cat_state::cat_duart_txa));
 	m_duart->b_tx_cb().set(FUNC(cat_state::cat_duart_txb));
-	m_duart->outport_cb().set(FUNC(cat_state::cat_duart_output));;
+	m_duart->outport_cb().set(FUNC(cat_state::cat_duart_output));
 
 	CENTRONICS(config, m_ctx, centronics_devices, "printer");
 	m_ctx->ack_handler().set(FUNC(cat_state::prn_ack_ff));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cave.cpp mame-0.224+dfsg.1/src/mame/drivers/cave.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cave.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cave.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1220,7 +1220,7 @@
 void cave_state::z80_rombank_w(u8 data)
 {
 	if (data & ~Mask)
-		logerror("%s: Bank %02X\n", machine().describe_context(), data);
+		logerror("%s: Z80 Bank %02X\n", machine().describe_context(), data);
 
 	m_z80bank->set_entry(data & Mask);
 }
@@ -1741,19 +1741,7 @@
 
 // 6bpp tiles are accessible only 0x400 colors
 
-/* 8x8x4 tiles */
-static const gfx_layout layout_8x8x4 =
-{
-	8,8,
-	RGN_FRAC(1,1),
-	4,
-	{STEP4(0,1)},
-	{STEP8(0,4)},
-	{STEP8(0,4*8)},
-	8*8*4
-};
-
-/* 8x8x6 tiles (in a 8x8x8 layout) */
+// 8x8x6 tiles (in a 8x8x8 layout)
 static const gfx_layout layout_8x8x6 =
 {
 	8,8,
@@ -1765,8 +1753,8 @@
 	8*8*8
 };
 
-/* 8x8x6 tiles (4 bits in one rom, 2 bits in the other,
-   unpacked in 2 pages of 4 bits) */
+// 8x8x6 tiles (4 bits in one rom, 2 bits in the other,
+// unpacked in 2 pages of 4 bits)
 static const gfx_layout layout_8x8x6_2 =
 {
 	8,8,
@@ -1778,7 +1766,7 @@
 	8*8*4
 };
 
-/* 8x8x8 tiles */
+// 8x8x8 tiles
 static const gfx_layout layout_8x8x8 =
 {
 	8,8,
@@ -1790,39 +1778,68 @@
 	8*8*8
 };
 
-#if 0
-/* 16x16x8 Zooming Sprites - No need to decode them */
+// 16~x16~x4 Zooming Sprites - decode each 16 pixel lines
 static const gfx_layout layout_sprites =
 {
-	16,16,
+	16,1,
+	RGN_FRAC(1,1),
+	4,
+	{STEP4(0,1)},
+	{1*4,0*4,3*4,2*4,5*4,4*4,7*4,6*4,9*4,8*4,11*4,10*4,13*4,12*4,15*4,14*4},
+	{0},
+	16*4
+};
+
+// 16~x16~x4 Non-zooming Sprites - decode each 16 pixel lines
+static const gfx_layout layout_sprites_msb =
+{
+	16,1,
+	RGN_FRAC(1,1),
+	4,
+	{STEP4(0,1)},
+	{STEP16(0,4)},
+	{0},
+	16*4
+};
+
+// esprade, guwange uses 8bpp sprites instead 4bpp
+static const gfx_layout layout_sprites_8bpp =
+{
+	16,1,
 	RGN_FRAC(1,1),
 	8,
-	{STEP8(0,1)},
-	{STEP16(0,8)},
-	{STEP16(0,16*8)},
-	16*16*8
+	{STEP4(0,1), STEP4(4*4,1)},
+	{STEP4(4*4*2*0+3*4,-4),STEP4(4*4*2*1+3*4,-4),STEP4(4*4*2*2+3*4,-4),STEP4(4*4*2*3+3*4,-4)},
+	{0},
+	16*8
 };
-#endif
+
+static GFXDECODE_START( gfx_common_spr )
+	GFXDECODE_ENTRY( "sprites0", 0, layout_sprites, 0x0000, 0x40 )
+GFXDECODE_END
 
 /***************************************************************************
                                 Dangun Feveron
 ***************************************************************************/
 
 static GFXDECODE_START( gfx_dfeveron )
-//  "sprites"
-	GFXDECODE_ENTRY( "layer0", 0, layout_8x8x4, 0x0400, 0x40 ) // [0] Layer 0
-	GFXDECODE_ENTRY( "layer1", 0, layout_8x8x4, 0x0400, 0x40 ) // [1] Layer 1
+	GFXDECODE_ENTRY( "layer0", 0, gfx_8x8x4_packed_msb, 0x0400, 0x40 ) // [0] Layer 0
+	GFXDECODE_ENTRY( "layer1", 0, gfx_8x8x4_packed_msb, 0x0400, 0x40 ) // [1] Layer 1
 GFXDECODE_END
 
 /***************************************************************************
                                 Dodonpachi
 ***************************************************************************/
 
+// different gfx layout
+static GFXDECODE_START( gfx_ddonpach_spr )
+	GFXDECODE_ENTRY( "sprites0", 0, layout_sprites_msb, 0x0000, 0x40 )
+GFXDECODE_END
+
 static GFXDECODE_START( gfx_ddonpach )
-//  "sprites"
-	GFXDECODE_ENTRY( "layer0", 0, layout_8x8x4, 0x4000, 0x40 ) // [0] Layer 0
-	GFXDECODE_ENTRY( "layer1", 0, layout_8x8x4, 0x4000, 0x40 ) // [1] Layer 1
-	GFXDECODE_ENTRY( "layer2", 0, layout_8x8x8, 0x4000, 0x40 ) // [2] Layer 2
+	GFXDECODE_ENTRY( "layer0", 0, gfx_8x8x4_packed_msb, 0x4000, 0x40 ) // [0] Layer 0
+	GFXDECODE_ENTRY( "layer1", 0, gfx_8x8x4_packed_msb, 0x4000, 0x40 ) // [1] Layer 1
+	GFXDECODE_ENTRY( "layer2", 0, layout_8x8x8,         0x4000, 0x40 ) // [2] Layer 2
 GFXDECODE_END
 
 /***************************************************************************
@@ -1830,18 +1847,20 @@
 ***************************************************************************/
 
 static GFXDECODE_START( gfx_donpachi )
-//  "sprites"
-	GFXDECODE_ENTRY( "layer0", 0, layout_8x8x4, 0x0400, 0x40 ) // [0] Layer 0
-	GFXDECODE_ENTRY( "layer1", 0, layout_8x8x4, 0x0400, 0x40 ) // [1] Layer 1
-	GFXDECODE_ENTRY( "layer2", 0, layout_8x8x4, 0x0400, 0x40 ) // [2] Layer 2
+	GFXDECODE_ENTRY( "layer0", 0, gfx_8x8x4_packed_msb, 0x0400, 0x40 ) // [0] Layer 0
+	GFXDECODE_ENTRY( "layer1", 0, gfx_8x8x4_packed_msb, 0x0400, 0x40 ) // [1] Layer 1
+	GFXDECODE_ENTRY( "layer2", 0, gfx_8x8x4_packed_msb, 0x0400, 0x40 ) // [2] Layer 2
 GFXDECODE_END
 
 /***************************************************************************
                                 Esprade
 ***************************************************************************/
 
+static GFXDECODE_START( gfx_esprade_spr )
+	GFXDECODE_ENTRY( "sprites0", 0, layout_sprites_8bpp, 0x0000, 0x40 )
+GFXDECODE_END
+
 static GFXDECODE_START( gfx_esprade )
-//  "sprites"
 	GFXDECODE_ENTRY( "layer0", 0, layout_8x8x8, 0x4000, 0x40 ) // [0] Layer 0
 	GFXDECODE_ENTRY( "layer1", 0, layout_8x8x8, 0x4000, 0x40 ) // [1] Layer 1
 	GFXDECODE_ENTRY( "layer2", 0, layout_8x8x8, 0x4000, 0x40 ) // [2] Layer 2
@@ -1852,19 +1871,22 @@
 ***************************************************************************/
 
 static GFXDECODE_START( gfx_hotdogst )
-//  "sprites"
-	GFXDECODE_ENTRY( "layer0", 0, layout_8x8x4, 0x0000, 0x40 ) // [0] Layer 0
-	GFXDECODE_ENTRY( "layer1", 0, layout_8x8x4, 0x0000, 0x40 ) // [1] Layer 1
-	GFXDECODE_ENTRY( "layer2", 0, layout_8x8x4, 0x0000, 0x40 ) // [2] Layer 2
+	GFXDECODE_ENTRY( "layer0", 0, gfx_8x8x4_packed_msb, 0x0000, 0x40 ) // [0] Layer 0
+	GFXDECODE_ENTRY( "layer1", 0, gfx_8x8x4_packed_msb, 0x0000, 0x40 ) // [1] Layer 1
+	GFXDECODE_ENTRY( "layer2", 0, gfx_8x8x4_packed_msb, 0x0000, 0x40 ) // [2] Layer 2
 GFXDECODE_END
 
 /***************************************************************************
                                 Koro Koro Quest
 ***************************************************************************/
 
+// different sprite base palette
+static GFXDECODE_START( gfx_korokoro_spr )
+	GFXDECODE_ENTRY( "sprites0", 0, layout_sprites, 0x3c00, 0x40 )
+GFXDECODE_END
+
 static GFXDECODE_START( gfx_korokoro )
-//  "sprites"
-	GFXDECODE_ENTRY( "layer0", 0, layout_8x8x4, 0x0400, 0x40 ) // [0] Layer 0
+	GFXDECODE_ENTRY( "layer0", 0, gfx_8x8x4_packed_msb, 0x0400, 0x40 ) // [0] Layer 0
 GFXDECODE_END
 
 /***************************************************************************
@@ -1872,9 +1894,8 @@
 ***************************************************************************/
 
 static GFXDECODE_START( gfx_mazinger )
-//  "sprites"
-	GFXDECODE_ENTRY( "layer0", 0, layout_8x8x4, 0x0000, 0x40 ) // [0] Layer 0
-	GFXDECODE_ENTRY( "layer1", 0, layout_8x8x6, 0x0400, 0x10 ) // [1] Layer 1
+	GFXDECODE_ENTRY( "layer0", 0, gfx_8x8x4_packed_msb, 0x0000, 0x40 ) // [0] Layer 0
+	GFXDECODE_ENTRY( "layer1", 0, layout_8x8x6,         0x0400, 0x10 ) // [1] Layer 1
 GFXDECODE_END
 
 /***************************************************************************
@@ -1882,27 +1903,39 @@
 ***************************************************************************/
 
 static GFXDECODE_START( gfx_ppsatan_0 )
-	GFXDECODE_ENTRY( "layer0", 0, layout_8x8x4, 0x0000, 0x40 ) // [0] Layer 0
+	GFXDECODE_ENTRY( "layer0", 0, gfx_8x8x4_packed_msb, 0x0000, 0x40 ) // [0] Layer 0
+GFXDECODE_END
+
+static GFXDECODE_START( gfx_ppsatan_spr_1 )
+	GFXDECODE_ENTRY( "sprites1", 0, layout_sprites, 0x3c00, 0x40 )
 GFXDECODE_END
 
 static GFXDECODE_START( gfx_ppsatan_1 )
-	GFXDECODE_ENTRY( "layer1", 0, layout_8x8x4, 0x0000, 0x40 ) // [1] Layer 1
+	GFXDECODE_ENTRY( "layer1", 0, gfx_8x8x4_packed_msb, 0x0000, 0x40 ) // [1] Layer 1
+GFXDECODE_END
+
+static GFXDECODE_START( gfx_ppsatan_spr_2 )
+	GFXDECODE_ENTRY( "sprites2", 0, layout_sprites, 0x3c00, 0x40 )
 GFXDECODE_END
 
 static GFXDECODE_START( gfx_ppsatan_2 )
-	GFXDECODE_ENTRY( "layer2", 0, layout_8x8x4, 0x0000, 0x40 ) // [2] Layer 2
+	GFXDECODE_ENTRY( "layer2", 0, gfx_8x8x4_packed_msb, 0x0000, 0x40 ) // [2] Layer 2
 GFXDECODE_END
 
 /***************************************************************************
                                 Power Instinct 2
 ***************************************************************************/
 
+// expanded sprite color space
+static GFXDECODE_START( gfx_pwrinst2_spr )
+	GFXDECODE_ENTRY( "sprites0", 0, layout_sprites_msb, 0x0000, 0x80 )
+GFXDECODE_END
+
 static GFXDECODE_START( gfx_pwrinst2 )
-//  "sprites"
-	GFXDECODE_ENTRY( "layer0", 0, layout_8x8x4, 0x0800, 0x40 ) // [0] Layer 0
-	GFXDECODE_ENTRY( "layer1", 0, layout_8x8x4, 0x1000, 0x40 ) // [1] Layer 1
-	GFXDECODE_ENTRY( "layer2", 0, layout_8x8x4, 0x1800, 0x40 ) // [2] Layer 2
-	GFXDECODE_ENTRY( "layer3", 0, layout_8x8x4, 0x2000, 0x40 ) // [3] Layer 3
+	GFXDECODE_ENTRY( "layer0", 0, gfx_8x8x4_packed_msb, 0x0800, 0x40 ) // [0] Layer 0
+	GFXDECODE_ENTRY( "layer1", 0, gfx_8x8x4_packed_msb, 0x1000, 0x40 ) // [1] Layer 1
+	GFXDECODE_ENTRY( "layer2", 0, gfx_8x8x4_packed_msb, 0x1800, 0x40 ) // [2] Layer 2
+	GFXDECODE_ENTRY( "layer3", 0, gfx_8x8x4_packed_msb, 0x2000, 0x40 ) // [3] Layer 3
 GFXDECODE_END
 
 
@@ -1911,10 +1944,9 @@
 ***************************************************************************/
 
 static GFXDECODE_START( gfx_sailormn )
-//  "sprites"
-	GFXDECODE_ENTRY( "layer0", 0, layout_8x8x4,   0x0400, 0x40 ) // [0] Layer 0
-	GFXDECODE_ENTRY( "layer1", 0, layout_8x8x4,   0x0800, 0x40 ) // [1] Layer 1
-	GFXDECODE_ENTRY( "layer2", 0, layout_8x8x6_2, 0x0c00, 0x10 ) // [2] Layer 2
+	GFXDECODE_ENTRY( "layer0", 0, gfx_8x8x4_packed_msb, 0x0400, 0x40 ) // [0] Layer 0
+	GFXDECODE_ENTRY( "layer1", 0, gfx_8x8x4_packed_msb, 0x0800, 0x40 ) // [1] Layer 1
+	GFXDECODE_ENTRY( "layer2", 0, layout_8x8x6_2,       0x0c00, 0x10 ) // [2] Layer 2
 GFXDECODE_END
 
 
@@ -1923,7 +1955,6 @@
 ***************************************************************************/
 
 static GFXDECODE_START( gfx_uopoko )
-//  "sprites"
 	GFXDECODE_ENTRY( "layer0", 0, layout_8x8x8, 0x4000, 0x40 ) // [0] Layer 0
 GFXDECODE_END
 
@@ -1981,6 +2012,8 @@
 
 	PALETTE(config, m_palette[0], palette_device::BLACK).set_format(palette_device::xGRB_555, 0x8000);
 
+	GFXDECODE(config, m_spr_gfxdecode[0], m_palette[0], gfx_common_spr);
+
 	for (int i = 0; i < layer; i++)
 	{
 		TMAP038(config, m_tilemap[i]);
@@ -2037,6 +2070,7 @@
 	EEPROM_93C46_16BIT(config, m_eeprom);
 
 	/* video hardware */
+	m_spr_gfxdecode[0]->set_info(gfx_ddonpach_spr);
 	GFXDECODE(config, m_gfxdecode[0], m_palette[0], gfx_ddonpach);
 
 	MCFG_VIDEO_START_OVERRIDE(cave_state,spr_8bpp)
@@ -2060,6 +2094,7 @@
 	EEPROM_93C46_16BIT(config, m_eeprom);
 
 	/* video hardware */
+	m_spr_gfxdecode[0]->set_info(gfx_ddonpach_spr);
 	GFXDECODE(config, m_gfxdecode[0], m_palette[0], gfx_donpachi);
 	m_palette[0]->set_entries(0x1000/2);
 
@@ -2095,6 +2130,7 @@
 	EEPROM_93C46_16BIT(config, m_eeprom);
 
 	/* video hardware */
+	m_spr_gfxdecode[0]->set_info(gfx_esprade_spr);
 	GFXDECODE(config, m_gfxdecode[0], m_palette[0], gfx_esprade);
 
 	MCFG_VIDEO_START_OVERRIDE(cave_state,spr_8bpp)
@@ -2143,6 +2179,7 @@
 	EEPROM_93C46_16BIT(config, m_eeprom);
 
 	/* video hardware */
+	m_spr_gfxdecode[0]->set_info(gfx_esprade_spr);
 	GFXDECODE(config, m_gfxdecode[0], m_palette[0], gfx_esprade);
 
 	MCFG_VIDEO_START_OVERRIDE(cave_state,spr_8bpp)
@@ -2213,10 +2250,11 @@
 	/* video hardware */
 	m_screen[0]->set_visarea(0, 320-1-2, 0, 240-1-1);
 
+	m_spr_gfxdecode[0]->set_info(gfx_korokoro_spr);
 	GFXDECODE(config, m_gfxdecode[0], m_palette[0], gfx_korokoro);
 	m_palette[0]->set_entries(0x8000/2);
 
-	MCFG_VIDEO_START_OVERRIDE(cave_state,korokoro)
+	MCFG_VIDEO_START_OVERRIDE(cave_state,spr_4bpp)
 
 	/* sound hardware */
 	add_ymz(config);
@@ -2412,6 +2450,9 @@
 	m_screen[2]->set_screen_update(FUNC(cave_state::screen_update_ppsatan_right));
 	TIMER(config, "int_timer_right").configure_generic(FUNC(cave_state::vblank_start_right));
 
+	m_spr_gfxdecode[0]->set_info(gfx_korokoro_spr);
+	GFXDECODE(config, m_spr_gfxdecode[1], m_palette[1], gfx_ppsatan_spr_1);
+	GFXDECODE(config, m_spr_gfxdecode[2], m_palette[2], gfx_ppsatan_spr_2);
 	GFXDECODE(config, m_gfxdecode[0], m_palette[0], gfx_ppsatan_0);
 	GFXDECODE(config, m_gfxdecode[1], m_palette[1], gfx_ppsatan_1);
 	GFXDECODE(config, m_gfxdecode[2], m_palette[2], gfx_ppsatan_2);
@@ -2467,6 +2508,7 @@
 	m_screen[0]->set_size(0x200, 240);
 	m_screen[0]->set_visarea(0x70, 0x70 + 0x140-1, 0, 240-1);
 
+	m_spr_gfxdecode[0]->set_info(gfx_pwrinst2_spr);
 	GFXDECODE(config, m_gfxdecode[0], m_palette[0], gfx_pwrinst2);
 	m_palette[0]->set_entries(0x5000/2);
 
@@ -2674,57 +2716,35 @@
 
 ***************************************************************************/
 
-/* 4 bits -> 8 bits. Even and odd pixels are swapped */
 void cave_state::unpack_sprites(int chip)
 {
-	const u32 len    =   m_spriteregion[chip]->bytes();
-	u8 *rgn          =   m_spriteregion[chip]->base();
-	u8 *src          =   rgn + len / 2 - 1;
-	u8 *dst          =   rgn + len - 1;
-
-	while (dst > src)
+	gfx_element *gfx = m_spr_gfxdecode[chip]->gfx(0);
+	m_sprite_gfx_mask[chip] = 1;
+	const u32 needed = gfx->elements() * gfx->height() * gfx->width();
+	while (m_sprite_gfx_mask[chip] < needed)
 	{
-		const u8 data = *src--;
-		/* swap even and odd pixels */
-		*dst-- = data >> 4;     *dst-- = data & 0xF;
+		m_sprite_gfx_mask[chip] <<= 1;
 	}
-}
-
+	m_sprite_gfx[chip] = make_unique_clear<u8[]>(m_sprite_gfx_mask[chip]);
 
-/* 4 bits -> 8 bits. Even and odd pixels are not swapped */
-void cave_state::ddp_unpack_sprites(int chip)
-{
-	const u32 len    =   m_spriteregion[chip]->bytes();
-	u8 *rgn          =   m_spriteregion[chip]->base();
-	u8 *src          =   rgn + len / 2 - 1;
-	u8 *dst          =   rgn + len - 1;
-
-	while (dst > src)
+	u8 *dst = m_sprite_gfx[chip].get();
+	for (int e = 0; e < gfx->elements(); e++)
 	{
-		const u8 data = *src--;
-		*dst-- = data & 0xf;     *dst-- = data >> 4;
+		const u8 *data = gfx->get_data(e);
+		for (int y = 0; y < gfx->height(); y++)
+		{
+			const u8 *datatmp = data;
+			for (int x = 0; x < gfx->width(); x++)
+			{
+				*dst++ = *datatmp++;
+			}
+			data += gfx->rowbytes();
+		}
 	}
+	m_sprite_gfx_mask[chip]--;
 }
 
 
-/* 2 pages of 4 bits -> 8 bits */
-void cave_state::esprade_unpack_sprites(int chip)
-{
-	u8 *src      =   m_spriteregion[chip]->base();
-	u8 *dst      =   src + m_spriteregion[chip]->bytes();
-
-	while (src < dst)
-	{
-		const u8 data1 = src[0];
-		const u8 data2 = src[1];
-
-		src[0] = ((data1 & 0x0f) << 4) +  (data2 & 0x0f);
-		src[1] =  (data1 & 0xf0)       + ((data2 & 0xf0) >> 4);
-
-		src += 2;
-	}
-}
-
 /***************************************************************************
 
                                 Air Gallet
@@ -2771,7 +2791,7 @@
 	ROM_REGION( 0x80000, "audiocpu", 0 ) \
 	ROM_LOAD( "bp962a.u9",  0x00000, 0x80000, CRC(06caddbe) SHA1(6a3cc50558ba19a31b21b7f3ec6c6e2846244ff1) ) \
 	\
-	ROM_REGION( 0x400000 * 2, "sprites0", 0 ) \
+	ROM_REGION( 0x400000, "sprites0", 0 ) \
 	ROM_LOAD( "bp962a.u76", 0x000000, 0x200000, CRC(858da439) SHA1(33a3d2a3ec3fa3364b00e1e43b405e5030a5b2a3) ) \
 	ROM_LOAD( "bp962a.u77", 0x200000, 0x200000, CRC(ea2ba35e) SHA1(72487f21d44fe7be9a98068ce7f57a43c132945f) ) \
 	\
@@ -2908,7 +2928,7 @@
 	ROM_LOAD16_BYTE( "cv01-u34.bin", 0x000000, 0x080000, CRC(be87f19d) SHA1(595239245df3835cdf5a99a6c62480465558d8d3) )
 	ROM_LOAD16_BYTE( "cv01-u33.bin", 0x000001, 0x080000, CRC(e53a7db3) SHA1(ddced29f78dc3cc89038757b6577ba2ba0d8b041) )
 
-	ROM_REGION( 0x800000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x800000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD( "cv01-u25.bin", 0x000000, 0x400000, CRC(a6f6a95d) SHA1(e1eb45cb5d0e6163edfd9d830633b913fb53c6ca) )
 	ROM_LOAD( "cv01-u26.bin", 0x400000, 0x400000, CRC(32edb62a) SHA1(3def74e1316b80cc25a8c3ac162cd7bcb8cc807c) )
 
@@ -3014,7 +3034,7 @@
 	ROM_LOAD16_BYTE( "cv01-u34.sos", 0x000000, 0x080000, CRC(24ef3ce6) SHA1(42799eebbb2686a837b8972aec684143deadca59) )
 	ROM_LOAD16_BYTE( "cv01-u33.sos", 0x000001, 0x080000, CRC(64ff73fd) SHA1(7fc3a8469cec2361d373a4dac4a547c13ca5f709) )
 
-	ROM_REGION( 0x800000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x800000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD( "cv01-u25.bin", 0x000000, 0x400000, CRC(a6f6a95d) SHA1(e1eb45cb5d0e6163edfd9d830633b913fb53c6ca) )
 	ROM_LOAD( "cv01-u26.bin", 0x400000, 0x400000, CRC(32edb62a) SHA1(3def74e1316b80cc25a8c3ac162cd7bcb8cc807c) )
 
@@ -3049,7 +3069,7 @@
 	ROM_LOAD16_BYTE( "b1.u27", 0x000000, 0x080000, CRC(b5cdc8d3) SHA1(58757b50e21a27e500a82c03f62cf02a85389926) )
 	ROM_LOAD16_BYTE( "b2.u26", 0x000001, 0x080000, CRC(6bbb063a) SHA1(e5de64b9c3efc0a38a2e0e16b78ee393bff63558) )
 
-	ROM_REGION( 0x800000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x800000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_WORD_SWAP( "u50.bin", 0x000000, 0x200000, CRC(14b260ec) SHA1(33bda210302428d5500115d0c7a839cdfcb67d17) )
 	ROM_LOAD16_WORD_SWAP( "u51.bin", 0x200000, 0x200000, CRC(e7ba8cce) SHA1(ad74a6b7d53760b19587c4a6dbea937daa7e87ce) )
 	ROM_LOAD16_WORD_SWAP( "u52.bin", 0x400000, 0x200000, CRC(02492ee0) SHA1(64d9cc64a4ad189a8b03cf6a749ddb732b4a0014) )
@@ -3078,7 +3098,7 @@
 	ROM_LOAD16_BYTE( "u27.bin", 0x000000, 0x080000, CRC(2432ff9b) SHA1(fbc826c30553f6553ead40b312b73c049e8f4bf6) )
 	ROM_LOAD16_BYTE( "u26.bin", 0x000001, 0x080000, CRC(4f3a914a) SHA1(ae98eba049f1462aa1145f6959b9f9a32c97278f) )
 
-	ROM_REGION( 0x800000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x800000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_WORD_SWAP( "u50.bin", 0x000000, 0x200000, CRC(14b260ec) SHA1(33bda210302428d5500115d0c7a839cdfcb67d17) )
 	ROM_LOAD16_WORD_SWAP( "u51.bin", 0x200000, 0x200000, CRC(e7ba8cce) SHA1(ad74a6b7d53760b19587c4a6dbea937daa7e87ce) )
 	ROM_LOAD16_WORD_SWAP( "u52.bin", 0x400000, 0x200000, CRC(02492ee0) SHA1(64d9cc64a4ad189a8b03cf6a749ddb732b4a0014) )
@@ -3107,7 +3127,7 @@
 	ROM_LOAD16_BYTE( "arrange_u27.bin", 0x000000, 0x080000, CRC(44b899ae) SHA1(798ec437d861b94fcd90c99a7015dd420887c788) )
 	ROM_LOAD16_BYTE( "arrange_u26.bin", 0x000001, 0x080000, CRC(727a09a8) SHA1(91876386855f19e8a3d8d1df71dfe9b3d98e9ea9) )
 
-	ROM_REGION( 0x800000 * 2, "sprites0", 0 )       /* Sprites: * 2 */
+	ROM_REGION( 0x800000, "sprites0", 0 )       /* Sprites: * 2 */
 	ROM_LOAD16_WORD_SWAP( "u50.bin", 0x000000, 0x200000, CRC(14b260ec) SHA1(33bda210302428d5500115d0c7a839cdfcb67d17) )
 	ROM_LOAD16_WORD_SWAP( "arrange_u51.bin", 0x200000, 0x200000, CRC(0f3e5148) SHA1(3016f4d075940feae691389606cd2aa7ac53849e) )
 	ROM_LOAD16_WORD_SWAP( "u52.bin", 0x400000, 0x200000, CRC(02492ee0) SHA1(64d9cc64a4ad189a8b03cf6a749ddb732b4a0014) )
@@ -3173,7 +3193,7 @@
 	ROM_REGION( 0x080000, "maincpu", 0 )        /* 68000 code */
 	ROM_LOAD16_WORD_SWAP( "prgu.u29",     0x00000, 0x80000, CRC(89c36802) SHA1(7857c726cecca5a4fce282e0d2b873774d2c1b1d) )
 
-	ROM_REGION( 0x400000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x400000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_WORD_SWAP( "atdp.u44", 0x000000, 0x200000, CRC(7189e953) SHA1(53adbe6ea5e01ecb48575e9db82cc3d0dc8a3726) )
 	ROM_LOAD16_WORD_SWAP( "atdp.u45", 0x200000, 0x200000, CRC(6984173f) SHA1(625dd6674adeb206815855b8b6a1fba79ed5c4cd) )
 
@@ -3206,7 +3226,7 @@
 	ROM_REGION( 0x080000, "maincpu", 0 )        /* 68000 code */
 	ROM_LOAD16_WORD_SWAP( "prg.u29",     0x00000, 0x80000, CRC(6be14af6) SHA1(5b1158071f160efeded816ae4c4edca1d00d6e05) )
 
-	ROM_REGION( 0x400000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x400000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_WORD_SWAP( "atdp.u44", 0x000000, 0x200000, CRC(7189e953) SHA1(53adbe6ea5e01ecb48575e9db82cc3d0dc8a3726) )
 	ROM_LOAD16_WORD_SWAP( "atdp.u45", 0x200000, 0x200000, CRC(6984173f) SHA1(625dd6674adeb206815855b8b6a1fba79ed5c4cd) )
 
@@ -3239,7 +3259,7 @@
 	ROM_REGION( 0x080000, "maincpu", 0 )        /* 68000 code */
 	ROM_LOAD16_WORD_SWAP( "prgk.u26",    0x00000, 0x80000, CRC(bbaf4c8b) SHA1(0f9d42c8c4c5b69e3d39bf768bc4b663f66b4f36) )
 
-	ROM_REGION( 0x400000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x400000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_WORD_SWAP( "atdp.u44", 0x000000, 0x200000, CRC(7189e953) SHA1(53adbe6ea5e01ecb48575e9db82cc3d0dc8a3726) )
 	ROM_LOAD16_WORD_SWAP( "atdp.u45", 0x200000, 0x200000, CRC(6984173f) SHA1(625dd6674adeb206815855b8b6a1fba79ed5c4cd) )
 
@@ -3272,7 +3292,7 @@
 	ROM_REGION( 0x080000, "maincpu", 0 )        /* 68000 code */
 	ROM_LOAD16_WORD_SWAP( "37.u29",    0x00000, 0x80000, CRC(71f39f30) SHA1(08a028208f21c073d450a29061604f27775786a8) )
 
-	ROM_REGION( 0x400000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x400000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_WORD_SWAP( "atdp.u44", 0x000000, 0x200000, CRC(7189e953) SHA1(53adbe6ea5e01ecb48575e9db82cc3d0dc8a3726) )
 	ROM_LOAD16_WORD_SWAP( "atdp.u45", 0x200000, 0x200000, CRC(6984173f) SHA1(625dd6674adeb206815855b8b6a1fba79ed5c4cd) )
 
@@ -3313,7 +3333,7 @@
 	ROM_REGION( 0x080000, "maincpu", 0 )        /* 68000 code */
 	ROM_LOAD16_WORD_SWAP( "prg.u29",     0x00000, 0x80000, CRC(810dbd42) SHA1(703a5aec90b595a1c5a679ab165643119ba6b2f3) )
 
-	ROM_REGION( 0x400000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x400000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_WORD_SWAP( "atdp.u44", 0x000000, 0x200000, CRC(7189e953) SHA1(53adbe6ea5e01ecb48575e9db82cc3d0dc8a3726) )
 	ROM_LOAD16_WORD_SWAP( "atdp.u45", 0x200000, 0x200000, CRC(6984173f) SHA1(625dd6674adeb206815855b8b6a1fba79ed5c4cd) )
 
@@ -3324,7 +3344,7 @@
 	ROM_LOAD( "atdp.u57", 0x000000, 0x100000, CRC(0a0e72b9) SHA1(997e8253777e7acca5a1c0c4026e78eecc122d5d) )
 
 	ROM_REGION( 0x040000, "layer2", 0 ) /* Text / Character Layer */
-	ROM_LOAD( "text.u58", 0x000000, 0x040000, CRC(5dba06e7) SHA1(f9dab7f6c732a683fddb4cae090a875b3962332b) )
+	ROM_LOAD( "u58.bin", 0x000000, 0x040000, CRC(285379ff) SHA1(b9552edcec29ddf4b552800b145c398b94117ab0) )
 
 	ROM_REGION( 0x240000, "oki1", 0 )   /* OKIM6295 #1 Samples */
 	/* Leave the 0x40000 bytes addressable by the chip empty */
@@ -3357,10 +3377,10 @@
 	ROM_LOAD16_BYTE( "u41.int", 0x000001, 0x080000, CRC(97c1b649) SHA1(37a56b7b9662219a356aee3f4b5cbb774ac4950e) )
 
 	ROM_REGION( 0x1000000, "sprites0", 0 )       /* Sprites */
-	ROM_LOAD16_BYTE( "esp_u63.u63", 0x000000, 0x400000, CRC(2f2fe92c) SHA1(9519e365248bcec8419786eabb16fe4aae299af5) )
-	ROM_LOAD16_BYTE( "esp_u64.u64", 0x000001, 0x400000, CRC(491a3da4) SHA1(53549a2bd3edc7b5e73fb46e1421b156bb0c190f) )
-	ROM_LOAD16_BYTE( "esp_u65.u65", 0x800000, 0x400000, CRC(06563efe) SHA1(94e72da1f542b4e0525b4b43994242816b43dbdc) )
-	ROM_LOAD16_BYTE( "esp_u66.u66", 0x800001, 0x400000, CRC(7bbe4cfc) SHA1(e77d0ed7a11b5abca1df8a0eb20ac9360cf79e76) )
+	ROM_LOAD32_WORD_SWAP( "esp_u63.u63", 0x000000, 0x400000, CRC(2f2fe92c) SHA1(9519e365248bcec8419786eabb16fe4aae299af5) )
+	ROM_LOAD32_WORD_SWAP( "esp_u64.u64", 0x000002, 0x400000, CRC(491a3da4) SHA1(53549a2bd3edc7b5e73fb46e1421b156bb0c190f) )
+	ROM_LOAD32_WORD_SWAP( "esp_u65.u65", 0x800000, 0x400000, CRC(06563efe) SHA1(94e72da1f542b4e0525b4b43994242816b43dbdc) )
+	ROM_LOAD32_WORD_SWAP( "esp_u66.u66", 0x800002, 0x400000, CRC(7bbe4cfc) SHA1(e77d0ed7a11b5abca1df8a0eb20ac9360cf79e76) )
 
 	ROM_REGION( 0x800000, "layer0", 0 ) /* Layer 0 */
 	ROM_LOAD( "esp_u54.u54", 0x000000, 0x400000, CRC(e7ca6936) SHA1(b7f5ab67071a1d9dd3d2c1cd2304d9cdad68850c) )
@@ -3386,10 +3406,10 @@
 	ROM_LOAD16_BYTE( "u41_ver.2", 0x000001, 0x080000, CRC(734b3ef0) SHA1(f584227b85c347d62d5f179445011ce0f607bcfd) )
 
 	ROM_REGION( 0x1000000, "sprites0", 0 )       /* Sprites */
-	ROM_LOAD16_BYTE( "esp_u63.u63", 0x000000, 0x400000, CRC(2f2fe92c) SHA1(9519e365248bcec8419786eabb16fe4aae299af5) )
-	ROM_LOAD16_BYTE( "esp_u64.u64", 0x000001, 0x400000, CRC(491a3da4) SHA1(53549a2bd3edc7b5e73fb46e1421b156bb0c190f) )
-	ROM_LOAD16_BYTE( "esp_u65.u65", 0x800000, 0x400000, CRC(06563efe) SHA1(94e72da1f542b4e0525b4b43994242816b43dbdc) )
-	ROM_LOAD16_BYTE( "esp_u66.u66", 0x800001, 0x400000, CRC(7bbe4cfc) SHA1(e77d0ed7a11b5abca1df8a0eb20ac9360cf79e76) )
+	ROM_LOAD32_WORD_SWAP( "esp_u63.u63", 0x000000, 0x400000, CRC(2f2fe92c) SHA1(9519e365248bcec8419786eabb16fe4aae299af5) )
+	ROM_LOAD32_WORD_SWAP( "esp_u64.u64", 0x000002, 0x400000, CRC(491a3da4) SHA1(53549a2bd3edc7b5e73fb46e1421b156bb0c190f) )
+	ROM_LOAD32_WORD_SWAP( "esp_u65.u65", 0x800000, 0x400000, CRC(06563efe) SHA1(94e72da1f542b4e0525b4b43994242816b43dbdc) )
+	ROM_LOAD32_WORD_SWAP( "esp_u66.u66", 0x800002, 0x400000, CRC(7bbe4cfc) SHA1(e77d0ed7a11b5abca1df8a0eb20ac9360cf79e76) )
 
 	ROM_REGION( 0x800000, "layer0", 0 ) /* Layer 0 */
 	ROM_LOAD( "esp_u54.u54", 0x000000, 0x400000, CRC(e7ca6936) SHA1(b7f5ab67071a1d9dd3d2c1cd2304d9cdad68850c) )
@@ -3415,10 +3435,10 @@
 	ROM_LOAD16_BYTE( "u41.bin", 0x000001, 0x080000, CRC(def30539) SHA1(957ad0b06f06689ae71393572592f6b8f818603a) )
 
 	ROM_REGION( 0x1000000, "sprites0", 0 )       /* Sprites */
-	ROM_LOAD16_BYTE( "esp_u63.u63", 0x000000, 0x400000, CRC(2f2fe92c) SHA1(9519e365248bcec8419786eabb16fe4aae299af5) )
-	ROM_LOAD16_BYTE( "esp_u64.u64", 0x000001, 0x400000, CRC(491a3da4) SHA1(53549a2bd3edc7b5e73fb46e1421b156bb0c190f) )
-	ROM_LOAD16_BYTE( "esp_u65.u65", 0x800000, 0x400000, CRC(06563efe) SHA1(94e72da1f542b4e0525b4b43994242816b43dbdc) )
-	ROM_LOAD16_BYTE( "esp_u66.u66", 0x800001, 0x400000, CRC(7bbe4cfc) SHA1(e77d0ed7a11b5abca1df8a0eb20ac9360cf79e76) )
+	ROM_LOAD32_WORD_SWAP( "esp_u63.u63", 0x000000, 0x400000, CRC(2f2fe92c) SHA1(9519e365248bcec8419786eabb16fe4aae299af5) )
+	ROM_LOAD32_WORD_SWAP( "esp_u64.u64", 0x000002, 0x400000, CRC(491a3da4) SHA1(53549a2bd3edc7b5e73fb46e1421b156bb0c190f) )
+	ROM_LOAD32_WORD_SWAP( "esp_u65.u65", 0x800000, 0x400000, CRC(06563efe) SHA1(94e72da1f542b4e0525b4b43994242816b43dbdc) )
+	ROM_LOAD32_WORD_SWAP( "esp_u66.u66", 0x800002, 0x400000, CRC(7bbe4cfc) SHA1(e77d0ed7a11b5abca1df8a0eb20ac9360cf79e76) )
 
 	ROM_REGION( 0x800000, "layer0", 0 ) /* Layer 0 */
 	ROM_LOAD( "esp_u54.u54", 0x000000, 0x400000, CRC(e7ca6936) SHA1(b7f5ab67071a1d9dd3d2c1cd2304d9cdad68850c) )
@@ -3484,7 +3504,7 @@
 	ROM_LOAD16_BYTE( "prg1.127", 0x000000, 0x080000, CRC(47b904b2) SHA1(58b9b55f59cf00f70b690a0371096e86f4d723c2) )
 	ROM_LOAD16_BYTE( "prg2.128", 0x000001, 0x080000, CRC(469b7794) SHA1(502f855c51005a866900b19c3a0a170d9ea02392) )
 
-	ROM_REGION( 0x800000 * 2, "sprites0", 0 )  /* Sprites */
+	ROM_REGION( 0x800000, "sprites0", 0 )  /* Sprites */
 	ROM_LOAD( "obj1.736", 0x000000, 0x400000, CRC(f4f84e5d) SHA1(8f445dd7a5c8a996939c211e5aec5742121a6e7e) )
 	ROM_LOAD( "obj2.738", 0x400000, 0x400000, CRC(15c2a9ce) SHA1(631eb2968395be86ef2403733e7d4ec769a013b9) )
 
@@ -3546,7 +3566,7 @@
 	ROM_LOAD16_BYTE( "t-hero-epm1.u0127", 0x000000, 0x080000, CRC(09db7195) SHA1(6aa5aa80e3b74e405ed8f1b9b801ce4367756986) )
 	ROM_LOAD16_BYTE( "t-hero-epm0.u0129", 0x000001, 0x080000, CRC(2d4e3310) SHA1(7c3284a2adc7943db50933a209d037422f87f80b) )
 
-	ROM_REGION( 0x800000 * 2, "sprites0", 0 )  /* Sprites */
+	ROM_REGION( 0x800000, "sprites0", 0 )  /* Sprites */
 	ROM_LOAD( "t-hero-obj1.u0736", 0x000000, 0x400000, CRC(35090f7c) SHA1(035e6c12a87d9c7241eea34fc7e2170bec842acc) )
 	ROM_LOAD( "t-hero-obj2.u0738", 0x400000, 0x400000, CRC(71605108) SHA1(6070c26d8f22fafc81d97cacfef96ae652e355d0) )
 
@@ -3585,12 +3605,12 @@
 	ROM_LOAD16_BYTE( "gu-u0129.bin", 0x000001, 0x080000, CRC(6c0e3b93) SHA1(aaad6569b9a7b6f9a315062f9fedfc95851c1bc6) )
 
 	ROM_REGION( 0x2000000, "sprites0", 0 )       /* Sprites */
-	ROM_LOAD16_BYTE( "u083.bin", 0x0000000, 0x800000, CRC(adc4b9c4) SHA1(3f9fb004e19187bbfa87ddfe8cfc69740656a1bd) )
-	ROM_LOAD16_BYTE( "u082.bin", 0x0000001, 0x800000, CRC(3d75876c) SHA1(705b8c2dbdc31e9516f429969f87988beec796d7) )
-	ROM_LOAD16_BYTE( "u086.bin", 0x1000000, 0x400000, CRC(188e4f81) SHA1(626074d81782a6de0b52406331b4b8561d3e36f5) )
-	ROM_RELOAD(                  0x1800000, 0x400000 )
-	ROM_LOAD16_BYTE( "u085.bin", 0x1000001, 0x400000, CRC(a7d5659e) SHA1(10abac022ebe106a3ca7186ff18ca2757f903033) )
-	ROM_RELOAD(                  0x1800001, 0x400000 )
+	ROM_LOAD32_WORD_SWAP( "u083.bin", 0x0000000, 0x800000, CRC(adc4b9c4) SHA1(3f9fb004e19187bbfa87ddfe8cfc69740656a1bd) )
+	ROM_LOAD32_WORD_SWAP( "u082.bin", 0x0000002, 0x800000, CRC(3d75876c) SHA1(705b8c2dbdc31e9516f429969f87988beec796d7) )
+	ROM_LOAD32_WORD_SWAP( "u086.bin", 0x1000000, 0x400000, CRC(188e4f81) SHA1(626074d81782a6de0b52406331b4b8561d3e36f5) )
+	ROM_RELOAD(                       0x1800000, 0x400000 )
+	ROM_LOAD32_WORD_SWAP( "u085.bin", 0x1000002, 0x400000, CRC(a7d5659e) SHA1(10abac022ebe106a3ca7186ff18ca2757f903033) )
+	ROM_RELOAD(                       0x1800002, 0x400000 )
 //  sprite bug fix?
 //  ROM_FILL(                    0x1800000, 0x800000, 0xff )
 
@@ -3622,12 +3642,12 @@
 	ROM_LOAD16_BYTE( "gu-u0129b.bin", 0x000001, 0x080000, CRC(a99c6b6c) SHA1(614a3cd1de9b325f73e461eaf250ff9cf773f4a5) )
 
 	ROM_REGION( 0x2000000, "sprites0", 0 )       /* Sprites */
-	ROM_LOAD16_BYTE( "u083.bin", 0x0000000, 0x800000, CRC(adc4b9c4) SHA1(3f9fb004e19187bbfa87ddfe8cfc69740656a1bd) )
-	ROM_LOAD16_BYTE( "u082.bin", 0x0000001, 0x800000, CRC(3d75876c) SHA1(705b8c2dbdc31e9516f429969f87988beec796d7) )
-	ROM_LOAD16_BYTE( "u086.bin", 0x1000000, 0x400000, CRC(188e4f81) SHA1(626074d81782a6de0b52406331b4b8561d3e36f5) )
-	ROM_RELOAD(                  0x1800000, 0x400000 )
-	ROM_LOAD16_BYTE( "u085.bin", 0x1000001, 0x400000, CRC(a7d5659e) SHA1(10abac022ebe106a3ca7186ff18ca2757f903033) )
-	ROM_RELOAD(                  0x1800001, 0x400000 )
+	ROM_LOAD32_WORD_SWAP( "u083.bin", 0x0000000, 0x800000, CRC(adc4b9c4) SHA1(3f9fb004e19187bbfa87ddfe8cfc69740656a1bd) )
+	ROM_LOAD32_WORD_SWAP( "u082.bin", 0x0000002, 0x800000, CRC(3d75876c) SHA1(705b8c2dbdc31e9516f429969f87988beec796d7) )
+	ROM_LOAD32_WORD_SWAP( "u086.bin", 0x1000000, 0x400000, CRC(188e4f81) SHA1(626074d81782a6de0b52406331b4b8561d3e36f5) )
+	ROM_RELOAD(                       0x1800000, 0x400000 )
+	ROM_LOAD32_WORD_SWAP( "u085.bin", 0x1000002, 0x400000, CRC(a7d5659e) SHA1(10abac022ebe106a3ca7186ff18ca2757f903033) )
+	ROM_RELOAD(                       0x1800002, 0x400000 )
 //  sprite bug fix?
 //  ROM_FILL(                    0x1800000, 0x800000, 0xff )
 
@@ -3710,7 +3730,7 @@
 	ROM_REGION( 0x40000, "audiocpu", 0 )    /* Z80 code */
 	ROM_LOAD( "mp2.u19", 0x00000, 0x40000, CRC(ff979ebe) SHA1(4cb80086cfdc69a321c7f75455cef89e20488b76) )   // FIRST AND SECOND HALF IDENTICAL
 
-	ROM_REGION( 0x400000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x400000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD( "mp9.u55", 0x000000, 0x200000, CRC(258d49ec) SHA1(f39e30c82d8f680f248e1eb59d7c5acb479fa277) )
 	ROM_LOAD( "mp8.u54", 0x200000, 0x200000, CRC(bdb4d7b8) SHA1(0dd490988aa84b0e9a21ade5fd606b03eca13f6c) )
 
@@ -3781,7 +3801,7 @@
 	ROM_REGION( 0x80000, "maincpu", 0 )     /* 68000 Code */
 	ROM_LOAD16_WORD_SWAP( "mp-001_ver07.u0130", 0x000000, 0x080000, CRC(86c7241f) SHA1(c9f0ab63c4fe36df1300445e9bb0d5c6a1bb733f) ) // 1xxxxxxxxxxxxxxxxxx = 0xFF
 
-	ROM_REGION( 0x180000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x180000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD( "mp-001_ver01.u1066", 0x000000, 0x100000, CRC(c5c6af7e) SHA1(13ac26fd703672a01d629be4e5efe9fb8720a4fb) )
 	ROM_LOAD( "mp-001_ver01.u1051", 0x100000, 0x080000, CRC(fe5e28e8) SHA1(44da1a7d813b149f9bae351bbcbd0bc2d4c70e10) )  // 1xxxxxxxxxxxxxxxxxx = 0xFF
 
@@ -3796,7 +3816,7 @@
 	ROM_REGION( 0x80000, "maincpu", 0 )     /* 68000 Code */
 	ROM_LOAD16_WORD_SWAP( "mp-003ver01.u0130", 0x000000, 0x080000, CRC(a4f56e6b) SHA1(1d3af7602c48a6b6c76c376dbc8ad3823b56868a) )
 
-	ROM_REGION( 0x200000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x200000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD( "mp-003ver01.u1067", 0x000000, 0x100000, CRC(268a4921) SHA1(8bb818466616051af01680b381af53b8b6a18428) )
 	ROM_LOAD( "mp-003ver01.u1066", 0x100000, 0x100000, CRC(79e77a6e) SHA1(9d03dd083769851d628ba6b3d77cfde9603e74f4) )
 
@@ -3843,7 +3863,7 @@
 	ROM_REGION( 0x20000, "audiocpu", 0 ) \
 	ROM_LOAD( "mzs.u21", 0x00000, 0x20000, CRC(c5b4f7ed) SHA1(01f3cd1dd4045029260544e0e1c15dd08817012e) ) \
 	\
-	ROM_REGION( 0x400000 * 2, "sprites0", ROMREGION_ERASEFF ) \
+	ROM_REGION( 0x400000, "sprites0", ROMREGION_ERASEFF ) \
 	ROM_LOAD( "bp943a-2.u56", 0x000000, 0x200000, CRC(97e13959) SHA1(c30b1093aacebafefcae701af767dd36fc55fac7) ) \
 	ROM_LOAD( "bp943a-3.u55", 0x200000, 0x080000, CRC(9c4957dd) SHA1(e775605a01b6cadc318855ac046dad03c4fc5bb4) ) \
 	\
@@ -3926,7 +3946,7 @@
 	ROM_REGION( 0x40000, "audiocpu", 0 )        /* Z80 code */
 	ROM_LOAD( "bp947a.u20",  0x00000, 0x40000, CRC(a4a36170) SHA1(ae55094518bd968ea0d04613a133c1421e412012) )
 
-	ROM_REGION( 0x800000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x800000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD( "bp947a.u49", 0x000000, 0x200000, CRC(09749531) SHA1(6deeed2712241611ec3202c49a66beed28698af8) )
 	ROM_LOAD( "bp947a.u50", 0x200000, 0x200000, CRC(19cea8b2) SHA1(87fb29458074f0e4852237e0184b8b3b44b0eb29) )
 	ROM_LOAD( "bp947a.u51", 0x400000, 0x200000, CRC(c19bed67) SHA1(ac664a15512c0e8c8b701833aede95f53cd46a45) )
@@ -3962,7 +3982,7 @@
 	ROM_REGION( 0x40000, "audiocpu", 0 )        /* Z80 code */
 	ROM_LOAD( "bp947a.u20",  0x00000, 0x40000, CRC(a4a36170) SHA1(ae55094518bd968ea0d04613a133c1421e412012) )
 
-	ROM_REGION( 0x800000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x800000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD( "bp947a.u49", 0x000000, 0x200000, CRC(09749531) SHA1(6deeed2712241611ec3202c49a66beed28698af8) )
 	ROM_LOAD( "bp947a.u50", 0x200000, 0x200000, CRC(19cea8b2) SHA1(87fb29458074f0e4852237e0184b8b3b44b0eb29) )
 	ROM_LOAD( "bp947a.u51", 0x400000, 0x200000, CRC(c19bed67) SHA1(ac664a15512c0e8c8b701833aede95f53cd46a45) )
@@ -4013,7 +4033,7 @@
 	ROM_REGION( 0x080000, "maincpu", 0 )        /* 68000 code */
 	ROM_LOAD16_WORD_SWAP( "pa1-mprob.u41", 0x00000, 0x80000, CRC(56281370) SHA1(b75a7c5997adac14486cef7be4e41d113c86021f) )
 
-	ROM_REGION( 0x100000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x100000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_BYTE( "pa1-obj0.u52", 0x00000, 0x80000, CRC(bf9232ce) SHA1(9a887a964e9a75e16c59dcf217c664404e74cc2a) )
 	ROM_LOAD16_BYTE( "pa1-obj1.u53", 0x00001, 0x80000, CRC(6eb76a04) SHA1(66c8e36bee4439c203a02b30898e4f741205d681) )
 
@@ -4057,7 +4077,7 @@
 	ROM_REGION( 0x80000, "maincpu", 0 )        /* 68000 code */
 	ROM_LOAD16_WORD_SWAP( "pae1-mpro.u41", 0x00000, 0x80000, CRC(bb026f97) SHA1(70d48f05275c64b25f37f03206219ef3ee9c0ee2) ) // 27c240
 
-	ROM_REGION( 0x100000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x100000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_BYTE( "pae1-obj0.u52", 0x00000, 0x80000, CRC(2cd99155) SHA1(146ed2b3f2763232a60e6b238a16067d3ccfa959) ) // 27c040
 	ROM_LOAD16_BYTE( "pae1-obj1.u53", 0x00001, 0x80000, CRC(9ae2685b) SHA1(5eed5f00d28d803358c8ffaf42c4979af23a0a8c) ) // ""
 
@@ -4104,15 +4124,15 @@
 	ROM_LOAD16_BYTE( "66a5.u79", 0x00000, 0x20000, CRC(60efeed3) SHA1(72095cef77065a8f1089273050f60a2e99582cf1) ) // checksum = 60D5 (OK?). 1xxxxxxxxxxxxxxxx = 0xFF
 	ROM_LOAD16_BYTE( "43b1.u61", 0x00001, 0x20000, CRC(f14e6287) SHA1(75c0465780a10ec8f533349b008f0d489bf362a5) ) // checksum = 43B1 (OK).  1xxxxxxxxxxxxxxxx = 0xFF
 
-	ROM_REGION( 0x200000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x200000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_BYTE( "ver1.0.u27", 0x00000, 0x80000, CRC(d1b02639) SHA1(19bbcf951a6ace91da72af9232f3d808afa8416c) )
 	ROM_LOAD16_BYTE( "ver1.0.u17", 0x00001, 0x80000, CRC(c66730ca) SHA1(75c18c80c1d2ced69edd4f013685c4eaf015049c) )
 
-	ROM_REGION( 0x200000 * 2, "sprites1", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x200000, "sprites1", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_BYTE( "ver1.0.u13", 0x00000, 0x80000, CRC(24c31e01) SHA1(c2c96bdd0a2a764ac0e1c8d64334d0ab76c46aa5) )
 	ROM_LOAD16_BYTE( "ver1.0.u19", 0x00001, 0x80000, CRC(ffbc6284) SHA1(05a735f3193218d32ad253c5abe21e1d00d1a5ca) )
 
-	ROM_REGION( 0x200000 * 2, "sprites2", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x200000, "sprites2", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_BYTE( "ver1.0.u15", 0x00000, 0x80000, CRC(24c31e01) SHA1(c2c96bdd0a2a764ac0e1c8d64334d0ab76c46aa5) )
 	ROM_LOAD16_BYTE( "ver1.0.u23", 0x00001, 0x80000, CRC(ffbc6284) SHA1(05a735f3193218d32ad253c5abe21e1d00d1a5ca) )
 
@@ -4165,7 +4185,7 @@
 	ROM_REGION( 0x20000, "audiocpu", 0 )        /* Z80 code */
 	ROM_LOAD( "g02.u3a", 0x00000, 0x20000, CRC(ebea5e1e) SHA1(4d3af9e5f29d0c1b26563f51250039c9e8bd3735) )
 
-	ROM_REGION( 0xe00000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0xe00000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD( "g02.u61", 0x000000, 0x200000, CRC(91e30398) SHA1(2b59a5e40bed2a988382054fe30d92808dad3348) )
 	ROM_LOAD( "g02.u62", 0x200000, 0x200000, CRC(d9455dd7) SHA1(afa69fe9a540cd78b8cfecf09cffa1401c01141a) )
 	ROM_LOAD( "g02.u63", 0x400000, 0x200000, CRC(4d20560b) SHA1(ceaee8cf0b69cc366b95ddcb689a5594d79e5114) )
@@ -4210,7 +4230,7 @@
 	ROM_REGION( 0x20000, "audiocpu", 0 )        /* Z80 code */
 	ROM_LOAD( "g02j.u3a", 0x00000, 0x20000, CRC(eead01f1) SHA1(0ced6755e471e0303fe397b3d54a5c799762ebd8) )
 
-	ROM_REGION( 0xe00000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0xe00000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD( "g02.u61", 0x000000, 0x200000, CRC(91e30398) SHA1(2b59a5e40bed2a988382054fe30d92808dad3348) )
 	ROM_LOAD( "g02.u62", 0x200000, 0x200000, CRC(d9455dd7) SHA1(afa69fe9a540cd78b8cfecf09cffa1401c01141a) )
 	ROM_LOAD( "g02.u63", 0x400000, 0x200000, CRC(4d20560b) SHA1(ceaee8cf0b69cc366b95ddcb689a5594d79e5114) )
@@ -4309,7 +4329,7 @@
 	ROM_REGION( 0x40000, "audiocpu", 0 )        /* Z80 code */
 	ROM_LOAD( "d19.u3", 0x00000, 0x40000, CRC(47598459) SHA1(4e9dcfebfbd160230768965e8c6e5ed446c1aa7b) ) /* Same as sound.u3 below, but twice the size? */
 
-	ROM_REGION( 0x1000000 * 2, "sprites0", 0 )       /* Sprites: * 2 */
+	ROM_REGION( 0x1000000, "sprites0", 0 )       /* Sprites: * 2 */
 	ROM_LOAD( "g02.u61", 0x000000, 0x200000, CRC(91e30398) SHA1(2b59a5e40bed2a988382054fe30d92808dad3348) )
 	ROM_LOAD( "g02.u62", 0x200000, 0x200000, CRC(d9455dd7) SHA1(afa69fe9a540cd78b8cfecf09cffa1401c01141a) )
 	ROM_LOAD( "g02.u63", 0x400000, 0x200000, CRC(4d20560b) SHA1(ceaee8cf0b69cc366b95ddcb689a5594d79e5114) )
@@ -4356,7 +4376,7 @@
 	ROM_REGION( 0x20000, "audiocpu", 0 )        /* Z80 code */
 	ROM_LOAD( "sound.u3", 0x00000, 0x20000, CRC(36f71520) SHA1(11d0a059ddba3e1aa4c54ccdde7b3f5c7bde482f) )
 
-	ROM_REGION( 0x1000000 * 2, "sprites0", 0 )       /* Sprites: * 2 */
+	ROM_REGION( 0x1000000, "sprites0", 0 )       /* Sprites: * 2 */
 	ROM_LOAD( "g02.u61", 0x000000, 0x200000, CRC(91e30398) SHA1(2b59a5e40bed2a988382054fe30d92808dad3348) )
 	ROM_LOAD( "g02.u62", 0x200000, 0x200000, CRC(d9455dd7) SHA1(afa69fe9a540cd78b8cfecf09cffa1401c01141a) )
 	ROM_LOAD( "g02.u63", 0x400000, 0x200000, CRC(4d20560b) SHA1(ceaee8cf0b69cc366b95ddcb689a5594d79e5114) )
@@ -4447,7 +4467,7 @@
 	ROM_REGION( 0x80000, "audiocpu", 0 ) \
 	ROM_LOAD( "bpsm945a.u9",  0x00000, 0x80000, CRC(438de548) SHA1(81a0ca1cd662e2017aa980da162d39cfd0a19f14) ) \
 	\
-	ROM_REGION( 0x400000 * 2, "sprites0", 0 ) \
+	ROM_REGION( 0x400000, "sprites0", 0 ) \
 	ROM_LOAD( "bpsm.u76", 0x000000, 0x200000, CRC(a243a5ba) SHA1(3a32d685e53e0b75977f7acb187cf414a50c7f8b) ) \
 	ROM_LOAD( "bpsm.u77", 0x200000, 0x200000, CRC(5179a4ac) SHA1(ceb8d3d889aae885debb2c9cf2263f60be3f1212) ) \
 	\
@@ -4530,7 +4550,7 @@
 	ROM_REGION( 0x80000, "audiocpu", 0 ) \
 	ROM_LOAD( "bpsm945a.u9",  0x00000, 0x80000, CRC(438de548) SHA1(81a0ca1cd662e2017aa980da162d39cfd0a19f14) ) \
 	\
-	ROM_REGION( 0x400000 * 2, "sprites0", 0 ) \
+	ROM_REGION( 0x400000, "sprites0", 0 ) \
 	ROM_LOAD( "bpsm.u76", 0x000000, 0x200000, CRC(a243a5ba) SHA1(3a32d685e53e0b75977f7acb187cf414a50c7f8b) ) \
 	ROM_LOAD( "bpsm.u77", 0x200000, 0x200000, CRC(5179a4ac) SHA1(ceb8d3d889aae885debb2c9cf2263f60be3f1212) ) \
 	\
@@ -4613,7 +4633,7 @@
 	ROM_REGION( 0x80000, "audiocpu", 0 ) \
 	ROM_LOAD( "bpsm945a.u9",  0x00000, 0x80000, CRC(438de548) SHA1(81a0ca1cd662e2017aa980da162d39cfd0a19f14) ) \
 	\
-	ROM_REGION( 0x400000 * 2, "sprites0", 0 ) \
+	ROM_REGION( 0x400000, "sprites0", 0 ) \
 	ROM_LOAD( "bpsm.u76", 0x000000, 0x200000, CRC(a243a5ba) SHA1(3a32d685e53e0b75977f7acb187cf414a50c7f8b) ) \
 	ROM_LOAD( "bpsm.u77", 0x200000, 0x200000, CRC(5179a4ac) SHA1(ceb8d3d889aae885debb2c9cf2263f60be3f1212) ) \
 	\
@@ -4711,7 +4731,7 @@
 	ROM_REGION( 0x80000, "maincpu", 0 )        /* 68000 code */
 	ROM_LOAD16_WORD_SWAP( "mpr0.u41", 0x00000, 0x80000, CRC(5b8919f3) SHA1(580298b6dc36527ab69889c848acab97726a6cc6) ) // 27c240
 
-	ROM_REGION( 0x100000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x100000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_BYTE( "obj0.u52", 0x00000, 0x80000, CRC(6d3c0c76) SHA1(92f9c9beae222a2c2a3242f812030e08036c9963) ) // 27c040
 	ROM_LOAD16_BYTE( "obj1.u53", 0x00001, 0x80000, CRC(8069b731) SHA1(9f0409c28466503092b74f635602962d9f127de8) ) // ""
 
@@ -4751,7 +4771,7 @@
 	ROM_REGION( 0x80000, "maincpu", 0 )        /* 68000 code */
 	ROM_LOAD16_WORD_SWAP( "tbs1_mpr-0a.u41", 0x00000, 0x80000, CRC(625487d3) SHA1(6bdc0f0f9877eeb1041f8f5b0d44e41b83ddcc76) ) // 27c4002
 
-	ROM_REGION( 0x100000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x100000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_BYTE( "tbs1_obj-0a.u52", 0x00000, 0x80000, CRC(a870481b) SHA1(644370e10b197832ee828b22e43f114d40740432) ) // 27c4001
 	ROM_LOAD16_BYTE( "tbs1_obj-1a.u53", 0x00001, 0x80000, CRC(73d8f520) SHA1(70ab5abeeaf0b3f5a263a7ece21d000a27148994) ) // ""
 
@@ -4791,7 +4811,7 @@
 	ROM_REGION( 0x080000, "maincpu", 0 )        /* 68000 code */
 	ROM_LOAD16_WORD_SWAP( "tj1_mpr-0c.u41", 0x00000, 0x80000, CRC(de3030b8) SHA1(5f2165ea039c34cab605ebddc0b61eadc47b1532) )
 
-	ROM_REGION( 0x100000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x100000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD16_BYTE( "tj1_obj-0a.u52", 0x00000, 0x80000, CRC(b42cf8e8) SHA1(9ed7fb3574ed163a81f34a0d8cfa7a4661439932) )
 	ROM_LOAD16_BYTE( "tj1_obj-1a.u53", 0x00001, 0x80000, CRC(5f0124d7) SHA1(4d9cfa464159998c176a178c668273d128dedff8) )
 
@@ -4831,7 +4851,7 @@
 	ROM_LOAD16_BYTE( "u26.int", 0x000000, 0x080000, CRC(b445c9ac) SHA1(4dda1c6e19de629ea4d9061560c32a9f0deabd53) )
 	ROM_LOAD16_BYTE( "u25.int", 0x000001, 0x080000, CRC(a1258482) SHA1(7f4adc4a6d069032aaf3d93eb60fde16b59483f8) )
 
-	ROM_REGION( 0x400000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x400000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD( "cave_cv-02_u33.u33", 0x000000, 0x400000, CRC(5d142ad2) SHA1(f26abcf7a625a322b83df44fbd6e852bfb03663c) ) /* mask ROM */
 
 	ROM_REGION( 0x400000, "layer0", 0 ) /* Layer 0 */
@@ -4849,7 +4869,7 @@
 	ROM_LOAD16_BYTE( "u26.bin", 0x000000, 0x080000, CRC(e7eec050) SHA1(cf3a77741029f96dbbec5ca7217a1723e4233cff) )
 	ROM_LOAD16_BYTE( "u25.bin", 0x000001, 0x080000, CRC(68cb6211) SHA1(a6db0bc2e3e54b6992a44b7d52395917e66db49b) )
 
-	ROM_REGION( 0x400000 * 2, "sprites0", 0 )        /* Sprites: * 2 */
+	ROM_REGION( 0x400000, "sprites0", 0 )        /* Sprites: * 2 */
 	ROM_LOAD( "cave_cv-02_u33.u33", 0x000000, 0x400000, CRC(5d142ad2) SHA1(f26abcf7a625a322b83df44fbd6e852bfb03663c) ) /* mask ROM */
 
 	ROM_REGION( 0x400000, "layer0", 0 ) /* Layer 0 */
@@ -4949,7 +4969,7 @@
 {
 	init_cave();
 
-	ddp_unpack_sprites(0);
+	unpack_sprites(0);
 	m_spritetype[0] = TYPE_NOZOOM;    // "different" sprites (no zooming?)
 	m_time_vblank_irq = 90;
 
@@ -4962,7 +4982,7 @@
 {
 	init_cave();
 
-	ddp_unpack_sprites(0);
+	unpack_sprites(0);
 	m_spritetype[0] = TYPE_NOZOOM;    // "different" sprites (no zooming?)
 	m_time_vblank_irq = 90;
 }
@@ -4971,7 +4991,7 @@
 {
 	init_cave();
 
-	esprade_unpack_sprites(0);
+	unpack_sprites(0);
 	m_time_vblank_irq = 2000;   /**/
 
 #if 0       //ROM PATCH
@@ -4996,7 +5016,7 @@
 {
 	init_cave();
 
-	esprade_unpack_sprites(0);
+	unpack_sprites(0);
 	m_time_vblank_irq = 2000;   /**/
 }
 
@@ -5013,8 +5033,8 @@
 
 void cave_state::init_mazinger()
 {
-	u8 *src = memregion("sprites0")->base();
-	int len = memregion("sprites0")->bytes();
+	u8 *src = m_spriteregion[0]->base();
+	const u32 len = m_spriteregion[0]->bytes();
 
 	init_cave();
 
@@ -5025,7 +5045,7 @@
 	std::vector<u8> buffer(len);
 	{
 		for (int i = 0; i < len; i++)
-			buffer[i ^ 0xdf88] = src[bitswap<24>(i,23,22,21,20,19,9,7,3,15,4,17,14,18,2,16,5,11,8,6,13,1,10,12,0)];
+			buffer[i ^ 0xdf88] = src[(i & ~0xffffff) | bitswap<24>(i,23,22,21,20,19,9,7,3,15,4,17,14,18,2,16,5,11,8,6,13,1,10,12,0)];
 		std::copy(buffer.begin(), buffer.end(), &src[0]);
 	}
 
@@ -5063,8 +5083,8 @@
 
 void cave_state::init_pwrinst2j()
 {
-	u8 *src = memregion("sprites0")->base();
-	int len = memregion("sprites0")->bytes();
+	u8 *src = m_spriteregion[0]->base();
+	const u32 len = m_spriteregion[0]->bytes();
 
 	init_cave();
 
@@ -5072,12 +5092,12 @@
 
 	std::vector<u8> buffer(len);
 	{
-		for(int i = 0; i < len/2; i++)
+		for (u32 i = 0; i < len; i++)
 		{
-			int j = bitswap<24>(i,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7, 2,4,6,1,5,3, 0);
+			u32 j = (i & ~0xffffff) | bitswap<24>(i,23,22,21,20,19,18,17,16,15,14,13,12,11,10,9,8,7, 2,4,6,1,5,3, 0);
 			if(((j & 6) == 0) || ((j & 6) == 6))
 				j ^= 6;
-			buffer[j ^ 7] = (src[i] >> 4) | (src[i] << 4);
+			buffer[j ^ 7] = src[i];
 		}
 
 		std::copy(buffer.begin(), buffer.end(), &src[0]);
@@ -5106,8 +5126,8 @@
 
 void cave_state::init_sailormn()
 {
-	u8 *src = memregion("sprites0")->base();
-	int len = memregion("sprites0")->bytes();
+	u8 *src = m_spriteregion[0]->base();
+	const u32 len = m_spriteregion[0]->bytes();
 
 	init_cave();
 
@@ -5119,7 +5139,7 @@
 	std::vector<u8> buffer(len);
 	{
 		for (int i = 0; i < len; i++)
-			buffer[i ^ 0x950c4] = src[bitswap<24>(i,23,22,21,20,15,10,12,6,11,1,13,3,16,17,2,5,14,7,18,8,4,19,9,0)];
+			buffer[i ^ 0x950c4] = src[(i & ~0xffffff) | bitswap<24>(i,23,22,21,20,15,10,12,6,11,1,13,3,16,17,2,5,14,7,18,8,4,19,9,0)];
 		std::copy(buffer.begin(), buffer.end(), &src[0]);
 	}
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ccs2810.cpp mame-0.224+dfsg.1/src/mame/drivers/ccs2810.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ccs2810.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ccs2810.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -168,6 +168,7 @@
 	ccs300_state(const machine_config &mconfig, device_type type, const char *tag)
 		: ccs_state(mconfig, type, tag)
 		, m_ram1(*this, "mainram")
+		, m_bank1(*this, "bank1")
 	{ }
 
 	void ccs300(machine_config &config);
@@ -178,8 +179,8 @@
 	void ccs300_io(address_map &map);
 	void ccs300_mem(address_map &map);
 	void port40_w(u8 data);
-	bool m_rom_in_map;
 	required_shared_ptr<u8> m_ram1;
+	required_memory_bank    m_bank1;
 };
 
 u8 ccs_state::memory_read(offs_t offset)
@@ -251,7 +252,7 @@
 void ccs300_state::ccs300_mem(address_map &map)
 {
 	map(0x0000, 0xffff).ram().share("mainram");
-	map(0x0000, 0x07ff).lr8(NAME([this] (offs_t offset) { if (m_rom_in_map) return m_rom[offset]; else return m_ram1[offset]; } ));
+	map(0x0000, 0x07ff).bankr("bank1");
 }
 
 void ccs300_state::ccs300_io(address_map &map)
@@ -965,17 +966,18 @@
 
 void ccs300_state::port40_w(u8 data)
 {
-	m_rom_in_map = !BIT(data, 0);
+	m_bank1->set_entry(BIT(~data, 0));
 }
 
 void ccs300_state::machine_reset()
 {
-	m_rom_in_map = true;
+	m_bank1->set_entry(1);
 }
 
 void ccs300_state::machine_start()
 {
-	save_item(NAME(m_rom_in_map));
+	m_bank1->configure_entry(0, m_ram1);
+	m_bank1->configure_entry(1, m_rom);
 	save_item(NAME(m_ss));
 	save_item(NAME(m_dden));
 	save_item(NAME(m_dsize));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cdi.cpp mame-0.224+dfsg.1/src/mame/drivers/cdi.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cdi.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cdi.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -885,14 +885,14 @@
 
 /*    YEAR  NAME      PARENT  COMPAT  MACHINE   INPUT     CLASS      INIT        COMPANY       FULLNAME */
 // BIOS / System
-CONS( 1991, cdimono1, 0,      0,      cdimono1, cdi,      cdi_state, empty_init, "Philips",    "CD-i (Mono-I) (PAL)",   MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+CONS( 1991, cdimono1, 0,      0,      cdimono1, cdi,      cdi_state, empty_init, "Philips",    "CD-i (Mono-I) (PAL)",   MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 CONS( 1991, cdimono2, 0,      0,      cdimono2, cdimono2, cdi_state, empty_init, "Philips",    "CD-i (Mono-II) (NTSC)",   MACHINE_NOT_WORKING )
 CONS( 1991, cdi910,   0,      0,      cdi910,   cdimono2, cdi_state, empty_init, "Philips",    "CD-i 910-17P Mini-MMC (PAL)",   MACHINE_NOT_WORKING )
 CONS( 1991, cdi490a,  0,      0,      cdimono1, cdi,      cdi_state, empty_init, "Philips",    "CD-i 490",   MACHINE_NOT_WORKING )
 
 // The Quizard games are retail CD-i units in a cabinet, with an additional JAMMA adapter and dongle for protection, hence being clones of the system.
 /*    YEAR  NAME         PARENT    MACHINE        INPUT     DEVICE          INIT         MONITOR     COMPANY         FULLNAME */
-GAME( 1995, cdibios,     0,        cdimono1,      quizard,  cdi_state,     empty_init,  ROT0,     "Philips",  "CD-i (Mono-I) (PAL) BIOS", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IS_BIOS_ROOT )
+GAME( 1995, cdibios,     0,        cdimono1,      quizard,  cdi_state,     empty_init,  ROT0,     "Philips",  "CD-i (Mono-I) (PAL) BIOS", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IS_BIOS_ROOT )
 
 GAME( 1995, quizard,     cdibios,  quizard,       quizard,  quizard_state, empty_init,  ROT0, "TAB Austria",  "Quizard (v1.8, German, i8751 DE 11 D3)", MACHINE_IMPERFECT_SOUND )
 GAME( 1995, quizard_17,  quizard,  quizard,       quizard,  quizard_state, empty_init,  ROT0, "TAB Austria",  "Quizard (v1.7, German, i8751 DE 11 D3)", MACHINE_IMPERFECT_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/champbas.cpp mame-0.224+dfsg.1/src/mame/drivers/champbas.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/champbas.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/champbas.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1182,37 +1182,37 @@
 	ROM_LOAD( "prom2.8r",     0x0120, 0x0100, CRC(8a9c0edf) SHA1(8aad387e9409cff0eeb42eeb57e9ea88770a8c9a) ) /* lookup table */
 ROM_END
 
-ROM_START( exctscc2 )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "vr.3j",        0x0000, 0x2000, CRC(c6115362) SHA1(6a258631abd72ef6b8d7968bb4b2bc88e89e597d) )
-	ROM_LOAD( "vr.3k",        0x2000, 0x2000, CRC(de36ba00) SHA1(0a0d92e710b8c749f145571bc8a204609456d19d) )
-	ROM_LOAD( "vr.3l",        0x4000, 0x2000, CRC(1ddfdf65) SHA1(313d0a7f13fc2de15aa32492c38a59fbafad9f01) )
-
-	ROM_REGION( 0x10000, "audiocpu", 0 )
-	ROM_LOAD( "vr.7d",        0x0000, 0x2000, CRC(2c675a43) SHA1(aa0a8dbcae955e3da92c435202f2a1ed238c377e) )
-	ROM_LOAD( "vr.7e",        0x2000, 0x2000, CRC(e571873d) SHA1(2dfff24f5dac86e92612f40cf3642005c7f36ad3) )
-	ROM_LOAD( "8_d6.bin",     0x4000, 0x2000, CRC(88651ee1) SHA1(2052e1b3f9784439369f464e31f4a2b0d1bb0565) )    /* vr.7f */
-	ROM_LOAD( "7_c6.bin",     0x6000, 0x2000, CRC(6d51521e) SHA1(2809bd2e61f40dcd31d43c62520982bdcfb0a865) )    /* vr.7h */
-	ROM_LOAD( "1_a6.bin",     0x8000, 0x1000, CRC(20f2207e) SHA1(b1ed2237d0bd50ddbe593fd2fbff9f1d67c1eb11) )    /* vr.7k */
-
-	ROM_REGION( 0x2000, "alpha_8201:mcu", 0 )
-	ROM_LOAD( "alpha-8303_44801b42.bin", 0x0000, 0x2000, CRC(66adcb37) SHA1(e1c72ecb161129dcbddc0b16dd90e716d0c79311) )
-
-	ROM_REGION( 0x04000, "gfx1", 0 )    // 3bpp chars + sprites: rearranged by DRIVER_INIT to leave only chars
-	ROM_LOAD( "vr.5a",        0x0000, 0x2000, CRC(4ff1783d) SHA1(c45074864c3a4bcbf3a87d164027ae16dca53d9c) ) /* planes 0,1 */
-	ROM_LOAD( "vr.5c",        0x2000, 0x2000, CRC(1fb84ee6) SHA1(56ceb86c509be783f806403ac21e7c9684760d5f) ) /* plane 3 */
-
-	ROM_REGION( 0x04000, "gfx2", 0 )    // 3bpp chars + sprites: rearranged by DRIVER_INIT to leave only sprites
-	ROM_LOAD( "vr.5b",        0x0000, 0x2000, CRC(5605b60b) SHA1(19d5909896ae4a3d7552225c369d30475c56793b) ) /* planes 0,1 */
-
-	ROM_REGION( 0x02000, "gfx3", 0 )    // 4bpp sprites
-	ROM_LOAD( "vr.5k",        0x0000, 0x1000, CRC(1d37edfa) SHA1(184fa6dd7b1b3fff4c5fc19b42301ccb7979ac84) )
-	ROM_LOAD( "vr.5l",        0x1000, 0x1000, CRC(b97f396c) SHA1(4ffe512acf047230bd593911a615fc0ef66b481d) )
-
-	ROM_REGION( 0x0220, "proms", 0 )
-	ROM_LOAD( "prom1.e1",     0x0000, 0x0020, CRC(d9b10bf0) SHA1(bc1263331968f4bf37eb70ec4f56a8cb763c29d2) ) /* palette */
-	ROM_LOAD( "prom3.k5",     0x0020, 0x0100, CRC(b5db1c2c) SHA1(900aaaac6b674a9c5c7b7804a4b0c3d5cce761aa) ) /* lookup table */
-	ROM_LOAD( "prom2.8r",     0x0120, 0x0100, CRC(8a9c0edf) SHA1(8aad387e9409cff0eeb42eeb57e9ea88770a8c9a) ) /* lookup table */
+ROM_START( exctscc2 ) // 2-PCB stack: CPU & SOUND BOARD + DISPLAY BOARD N. 58AS51-1
+	ROM_REGION( 0x10000, "maincpu", 0 ) // on CPU & sound board
+	ROM_LOAD( "eprom_1_vr_alpha_denshi.3j",        0x0000, 0x2000, CRC(c6115362) SHA1(6a258631abd72ef6b8d7968bb4b2bc88e89e597d) )
+	ROM_LOAD( "eprom_2_vr_alpha_denshi.3k",        0x2000, 0x2000, CRC(de36ba00) SHA1(0a0d92e710b8c749f145571bc8a204609456d19d) )
+	ROM_LOAD( "eprom_3_vr_alpha_denshi.3l",        0x4000, 0x2000, CRC(1ddfdf65) SHA1(313d0a7f13fc2de15aa32492c38a59fbafad9f01) )
+
+	ROM_REGION( 0x10000, "audiocpu", 0 ) // on CPU & sound board
+	ROM_LOAD( "eprom_0_vr_alpha_denshi.7d",     0x0000, 0x2000, CRC(2c675a43) SHA1(aa0a8dbcae955e3da92c435202f2a1ed238c377e) ) // yes 0, not 10
+	ROM_LOAD( "eprom_9_vr_alpha_denshi.7e",     0x2000, 0x2000, CRC(e571873d) SHA1(2dfff24f5dac86e92612f40cf3642005c7f36ad3) )
+	ROM_LOAD( "eprom_8_vr_alpha_denshi.7f",     0x4000, 0x2000, CRC(88651ee1) SHA1(2052e1b3f9784439369f464e31f4a2b0d1bb0565) )
+	ROM_LOAD( "eprom_7_vr_alpha_denshi.7h",     0x6000, 0x2000, CRC(6d51521e) SHA1(2809bd2e61f40dcd31d43c62520982bdcfb0a865) )
+	ROM_LOAD( "eprom_1_vr_alpha_denshi.7k",     0x8000, 0x1000, CRC(20f2207e) SHA1(b1ed2237d0bd50ddbe593fd2fbff9f1d67c1eb11) ) // marked for a 2764 but populated with a 2732
+
+	ROM_REGION( 0x2000, "alpha_8201:mcu", 0 ) // on CPU & sound board
+	ROM_LOAD( "alpha-8303_44801b42.1d", 0x0000, 0x2000, CRC(66adcb37) SHA1(e1c72ecb161129dcbddc0b16dd90e716d0c79311) )
+
+	ROM_REGION( 0x04000, "gfx1", 0 )    // 3bpp chars + sprites: rearranged by DRIVER_INIT to leave only chars, on display board
+	ROM_LOAD( "eprom_4_vr_alpha_denshi.5a",        0x0000, 0x2000, CRC(4ff1783d) SHA1(c45074864c3a4bcbf3a87d164027ae16dca53d9c) ) // planes 0,1
+	ROM_LOAD( "eprom_6_vr_alpha_denshi.5c",        0x2000, 0x2000, CRC(1fb84ee6) SHA1(56ceb86c509be783f806403ac21e7c9684760d5f) ) // plane 3
+
+	ROM_REGION( 0x04000, "gfx2", 0 )    // 3bpp chars + sprites: rearranged by DRIVER_INIT to leave only sprites, on display board
+	ROM_LOAD( "eprom_5_vr_alpha_denshi.5b",        0x0000, 0x2000, CRC(5605b60b) SHA1(19d5909896ae4a3d7552225c369d30475c56793b) ) // planes 0,1
+
+	ROM_REGION( 0x02000, "gfx3", 0 )    // 4bpp sprites, on display board
+	ROM_LOAD( "eprom_7_vr_alpha_denshi.5k",        0x0000, 0x1000, CRC(1d37edfa) SHA1(184fa6dd7b1b3fff4c5fc19b42301ccb7979ac84) )
+	ROM_LOAD( "eprom_8_vr_alpha_denshi.5l",        0x1000, 0x1000, CRC(b97f396c) SHA1(4ffe512acf047230bd593911a615fc0ef66b481d) )
+
+	ROM_REGION( 0x0220, "proms", 0 ) // it's suspected these weren't dumped for this set, but taken from an Exciting Soccer (see MT5026)
+	ROM_LOAD( "prom1.5j",      0x0000, 0x0020, BAD_DUMP CRC(d9b10bf0) SHA1(bc1263331968f4bf37eb70ec4f56a8cb763c29d2) ) // palette, marked as 7051 on CPU & sound board
+	ROM_LOAD( "prom3.60h",     0x0020, 0x0100, BAD_DUMP CRC(b5db1c2c) SHA1(900aaaac6b674a9c5c7b7804a4b0c3d5cce761aa) ) // lookup table, marked as 7052 on display board
+	ROM_LOAD( "prom2.61d",     0x0120, 0x0100, BAD_DUMP CRC(8a9c0edf) SHA1(8aad387e9409cff0eeb42eeb57e9ea88770a8c9a) ) // lookup table, marked as 7052 on display board
 ROM_END
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/chaos.cpp mame-0.224+dfsg.1/src/mame/drivers/chaos.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/chaos.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/chaos.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -143,7 +143,7 @@
 
 void chaos_state::machine_start()
 {
-	save_item(NAME(m_term_data));;
+	save_item(NAME(m_term_data));
 }
 
 void chaos_state::machine_reset()
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/chessmate.cpp mame-0.224+dfsg.1/src/mame/drivers/chessmate.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/chessmate.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/chessmate.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,24 +3,28 @@
 /******************************************************************************
 
 Commodore Chessmate / Novag Chess Champion MK II
-Initial version by PeT mess@utanet.at September 2000.
+Initial driver version by PeT mess@utanet.at September 2000.
 Driver mostly rewritten later.
 
-The hardware is pretty similar to KIM-1. In fact, the chess engine is Peter R. Jennings's
-Microchess, originally made for the KIM-1. Jennings went on to co-found Personal Software
-(later named VisiCorp, known for VisiCalc).
-
-Jennings also licensed Chessmate to Novag, and they released it as the MK II. The hardware
-is almost identical and the software is the same(identical ROM labels). Two designs were made,
-one jukebox shape, and one brick shape. The one in MAME came from the jukebox, but both
-models have the same ROMs. Note that like MK I, although it is a Winkler/Auge production,
-it doesn't involve SciSys company. SciSys was founded by Winkler after MK II.
+The hardware is pretty similar to KIM-1. In fact, the chess engine is Peter
+R. Jennings's Microchess, originally made for the KIM-1. Jennings went on to
+co-found Personal Software (later named VisiCorp, known for VisiCalc).
+
+Jennings also licensed Chessmate to Novag, and they released it as the MK II.
+The hardware is almost identical and the software is the same(identical ROM labels).
+Two designs were made, one jukebox shape, and one brick shape. The one in MAME came
+from the jukebox, but both models have the same ROMs.
+
+Note that like MK I, although it is a Winkler/Auge production, it doesn't involve
+SciSys company. SciSys was founded by Winkler after MK II.
 
 TODO:
 - is there an older version of chmate? chips on pcb photos are dated 1979, but
   the game is known to be released in 1978
 
-*******************************************************************************
+===============================================================================
+
+Hardware notes:
 
 MOS MPS 6504 2179
 MOS MPS 6530 024 1879
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/chicago.cpp mame-0.224+dfsg.1/src/mame/drivers/chicago.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/chicago.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/chicago.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -115,19 +115,21 @@
 
  ***************************************************************************/
 
+// Demolition Derby is licensed from Exidy, PROMs are identical to Exidy Destruction Derby
+// However, the PCBs and layouts are different, so there is a seperate driver here
 
 ROM_START( dmodrbcc )
 	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
 
 	ROM_REGION( 0x0400, "roms", ROMREGION_ERASE00 )
-	ROM_LOAD( "cdi.b2",     0x0000, 0x0200, CRC(9c727712) SHA1(0d5da25fda57da873da0c066d3472c076c18b853) )
-	ROM_LOAD( "cdi.b8",     0x0000, 0x0200, CRC(840653fa) SHA1(b71d35af4bb4a6f98acfa9161c0f3e8165440d16) )
-	ROM_LOAD( "cdi.c8",     0x0000, 0x0200, CRC(79ebcfa1) SHA1(5267a38b76f58a9add928d1241803792b35f65c0) )
-	ROM_LOAD( "cdi.d8",     0x0000, 0x0200, CRC(afcfe339) SHA1(34912eb50fe162743fa2a7433a1e8634050fb514) )
-	ROM_LOAD( "cdi.e8",     0x0000, 0x0200, CRC(7b7bf492) SHA1(6d48ae1963c6f867a461d15e657df8196fdeaf20) )
-	ROM_LOAD( "cdi.h3",     0x0000, 0x0200, CRC(66f25de0) SHA1(1984c3f9a4f5c01b1db784cec7279307aa9a851b) )
-	ROM_LOAD( "cdi.h6",     0x0000, 0x0200, CRC(9c727712) SHA1(0d5da25fda57da873da0c066d3472c076c18b853) )
-	ROM_LOAD( "cdi.n1",     0x0000, 0x0200, CRC(66f25de0) SHA1(1984c3f9a4f5c01b1db784cec7279307aa9a851b) )
+	ROM_LOAD( "cdi.b2",     0x0000, 0x0100, CRC(c3823f0b) SHA1(42fe8c1e0f54b3f968a630dd564a8941410c5d86) )
+	ROM_LOAD( "cdi.b8",     0x0000, 0x0100, CRC(9f65c1df) SHA1(e367cc418b34005198f9b958592573986d37274a) )
+	ROM_LOAD( "cdi.c8",     0x0000, 0x0100, CRC(5e27fc7c) SHA1(bae31e7f0ff7a5ebfe4a12fc537249ee24a4cf4b) )
+	ROM_LOAD( "cdi.d8",     0x0000, 0x0100, CRC(93dc096c) SHA1(b89a478ef731024eb24a79f9e82a5ef779e8e3d0) )
+	ROM_LOAD( "cdi.e8",     0x0000, 0x0100, CRC(ddbb0cc7) SHA1(6f169566cb09c78090cec2e375013c0eb2656890) )
+	ROM_LOAD( "cdi.h3",     0x0000, 0x0100, CRC(82d7d25f) SHA1(d4b3a6655f91647545d493c2ff996daa66df0395) )
+	ROM_LOAD( "cdi.h6",     0x0000, 0x0100, CRC(c3823f0b) SHA1(42fe8c1e0f54b3f968a630dd564a8941410c5d86) )
+	ROM_LOAD( "cdi.n1",     0x0000, 0x0100, CRC(82d7d25f) SHA1(d4b3a6655f91647545d493c2ff996daa66df0395) )
 
 	ROM_LOAD( "cdi.c13",    0x0000, 0x0020, CRC(f304a1fb) SHA1(0f029274bb99723ebcc271d761e1500ca50b2738) )
 	ROM_LOAD( "cdi.c14",    0x0000, 0x0020, CRC(f8dbd779) SHA1(55bdaf9eb1ba6185e20512c4874ebb625861508e) )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/chihiro.cpp mame-0.224+dfsg.1/src/mame/drivers/chihiro.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/chihiro.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/chihiro.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -36,7 +36,8 @@
 | | 2004     | Wangan Midnight Maximum Tune (Export)                | Namco                    | GDROM  | GDX-0009   | 317-5101-COM |
 | | 2004     | Wangan Midnight Maximum Tune (Export, Rev A)         | Namco                    | GDROM  | GDX-0009A  | 317-5101-COM |
 |*| 20040610 | Wangan Midnight Maximum Tune (Export, Rev B)         | Namco                    | GDROM  | GDX-0009B  | 317-5101-COM |
-| | 2004     | Sega Club Golf                                       | Sega                     | GDROM  | GDX-0010   |              |
+| | 2004     | Sega Golf Club Network Pro Tour 2005                 | Sega                     | GDROM  | GDX-0010   | ???          |
+|*| 2004     | Sega Golf Club Network Pro Tour 2005 (Rev C)         | Sega                     | GDROM  | GDX-0010C  | ???          |
 |*| 20040909 | OutRun 2 Special Tours (Japan)                       | Sega                     | GDROM  | GDX-0011   | 317-0396-COM |
 |*| 20041229 | OutRun 2 Special Tours (Japan, Rev A)                | Sega                     | GDROM  | GDX-0011A  | 317-0396-COM |
 |*| 20040914 | Ghost Squad                                          | Sega                     | GDROM  | GDX-0012   | 317-0398-COM |
@@ -2162,6 +2163,16 @@
 	ROM_LOAD("crp1231lr10_ver0110.ic2", 0, 0x20000, CRC(0d30707c) SHA1(425e25c6203d0b400d12391916db3f7cdad00f7a) ) // H8/3003 code
 ROM_END
 
+ROM_START( scg05nt )
+	CHIHIRO_BIOS
+
+	DISK_REGION( "gdrom" )
+	DISK_IMAGE_READONLY( "gdx-0010c", 0, SHA1(ef3d7577960a21cc71b4523fa26880f7897b628c) )
+
+	ROM_REGION( 0x4000, "pic", ROMREGION_ERASEFF)
+	ROM_LOAD( "317-0xxx.pic", 0x000000, 0x004000, NO_DUMP )
+ROM_END
+
 ROM_START( outr2stjo )
 	CHIHIRO_BIOS
 
@@ -2577,7 +2588,8 @@
 // 0009     GAME( 2004, wangmido, wangmid,  chihirogd,    chihiro, chihiro_state, empty_init, ROT0, "Namco",                    "Wangan Midnight Maximum Tune (Export) (GDX-0009)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
 // 0009A    GAME( 2004, wangmida, wangmid,  chihirogd,    chihiro, chihiro_state, empty_init, ROT0, "Namco",                    "Wangan Midnight Maximum Tune (Export, Rev A) (GDX-0009A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
 /* 0009B */ GAME( 2004, wangmid,  chihiro,  chihirogd,    chihiro, chihiro_state, empty_init, ROT0, "Namco",                    "Wangan Midnight Maximum Tune (Export, Rev B) (GDX-0009B)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
-// 0010  Sega Golf Club
+// 0010  Sega Golf Club Network Pro Tour 2005
+/* 0010C */ GAME( 2004, scg05nt,  chihiro,  chihirogd,    chihiro, chihiro_state, empty_init, ROT0, "Sega",                     "Sega Golf Club Network Pro Tour 2005 (Rev C) (GDX-0010C)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
 /* 0011  */ GAME( 2004, outr2stjo,outr2st,  chihirogd,    chihiro, chihiro_state, empty_init, ROT0, "Sega",                     "OutRun 2 Special Tours (Japan) (GDX-0011)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
 /* 0011A */ GAME( 2004, outr2stj, outr2st,  chihirogd,    chihiro, chihiro_state, empty_init, ROT0, "Sega",                     "OutRun 2 Special Tours (Japan, Rev A) (GDX-0011A)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING|MACHINE_SUPPORTS_SAVE )
 /* 0012  */ GAME( 2004, ghostsqo, ghostsqu, chihirogd,    chihiro, chihiro_state, empty_init, ROT0, "Sega",                     "Ghost Squad (GDX-0012)", MACHINE_NO_SOUND|MACHINE_NOT_WORKING )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cinemat.cpp mame-0.224+dfsg.1/src/mame/drivers/cinemat.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cinemat.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cinemat.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -27,9 +27,6 @@
         * QB-3
         * Space Ship
 
-    To do:
-        * look into bad sample latency
-
 ***************************************************************************/
 
 #include "emu.h"
@@ -40,8 +37,10 @@
 #include "demon.lh"
 #include "starcas.lh"
 #include "solarq.lh"
+#include "speedfrk.lh"
 #include "sundance.lh"
 #include "tailg.lh"
+#include "warrior.lh"
 #include "wotw.lh"
 
 #define MASTER_CLOCK            XTAL(19'923'000)
@@ -84,15 +83,15 @@
  *
  *************************************/
 
-uint8_t cinemat_state::inputs_r(offs_t offset)
+u8 cinemat_state::inputs_r(offs_t offset)
 {
 	return (m_inputs->read() >> offset) & 1;
 }
 
 
-uint8_t cinemat_state::switches_r(offs_t offset)
+u8 cinemat_state::switches_r(offs_t offset)
 {
-	static const uint8_t switch_shuffle[8] = { 2,5,4,3,0,1,6,7 };
+	static const u8 switch_shuffle[8] = { 2,5,4,3,0,1,6,7 };
 	return (m_switches->read() >> switch_shuffle[offset]) & 1;
 }
 
@@ -112,7 +111,7 @@
 }
 
 
-uint8_t cinemat_state::coin_input_r()
+u8 cinemat_state::coin_input_r()
 {
 	return !m_coin_detected;
 }
@@ -146,13 +145,13 @@
  *
  *************************************/
 
-uint8_t cinemat_state::joystick_read()
+u8 cinemat_state::joystick_read()
 {
 	if (machine().phase() != machine_phase::RUNNING)
 		return 0;
 	else
 	{
-		int const xval = int16_t(m_maincpu->state_int(ccpu_cpu_device::CCPU_X) << 4) >> 4;
+		int const xval = s16(m_maincpu->state_int(ccpu_cpu_device::CCPU_X) << 4) >> 4;
 		return ((m_mux_select ? m_analog_x : m_analog_y).read_safe(0) - xval) < 0x800;
 	}
 }
@@ -165,13 +164,13 @@
  *
  *************************************/
 
-uint8_t cinemat_state::speedfrk_wheel_r(offs_t offset)
+u8 cinemat_state::speedfrk_wheel_r(offs_t offset)
 {
-	static const uint8_t speedfrk_steer[] = {0xe, 0x6, 0x2, 0x0, 0x3, 0x7, 0xf};
+	static const u8 speedfrk_steer[] = {0xe, 0x6, 0x2, 0x0, 0x3, 0x7, 0xf};
 	int delta_wheel;
 
 	/* the shift register is cleared once per 'frame' */
-	delta_wheel = int8_t(m_wheel->read()) / 8;
+	delta_wheel = s8(m_wheel->read()) / 8;
 	if (delta_wheel > 3)
 		delta_wheel = 3;
 	else if (delta_wheel < -3)
@@ -181,23 +180,14 @@
 }
 
 
-uint8_t cinemat_state::speedfrk_gear_r(offs_t offset)
+u8 cinemat_state::speedfrk_gear_r(offs_t offset)
 {
-	int gearval = m_gear_input->read();
-
-	/* check the fake gear input port and determine the bit settings for the gear */
-	if ((gearval & 0x0f) != 0x0f)
-		m_gear = gearval & 0x0f;
-
-	/* add the start key into the mix -- note that it overlaps 4th gear */
-	if (!(m_inputs->read() & 0x80))
-		m_gear &= ~0x08;
-
-	return (m_gear >> offset) & 1;
+	return (m_gear != offset);
 }
 
 
 
+
 /*************************************
  *
  *  Sundance inputs
@@ -207,7 +197,7 @@
 static const struct
 {
 	const char *portname;
-	uint16_t bitmask;
+	u16 bitmask;
 } sundance_port_map[16] =
 {
 	{ "PAD1", 0x155 },  /* bit  0 is set if P1 1,3,5,7,9 is pressed */
@@ -232,7 +222,7 @@
 };
 
 
-uint8_t cinemat_16level_state::sundance_inputs_r(offs_t offset)
+u8 cinemat_16level_state::sundance_inputs_r(offs_t offset)
 {
 	/* handle special keys first */
 	if (sundance_port_map[offset].portname)
@@ -249,7 +239,7 @@
  *
  *************************************/
 
-uint8_t cinemat_color_state::boxingb_dial_r(offs_t offset)
+u8 cinemat_color_state::boxingb_dial_r(offs_t offset)
 {
 	int value = ioport("DIAL")->read();
 	if (!m_mux_select) offset += 4;
@@ -264,7 +254,7 @@
  *
  *************************************/
 
-uint8_t qb3_state::qb3_frame_r()
+u8 qb3_state::qb3_frame_r()
 {
 	attotime next_update = m_screen->time_until_update();
 	attotime frame_period = m_screen->frame_period();
@@ -275,7 +265,7 @@
 }
 
 
-void qb3_state::qb3_ram_bank_w(uint8_t data)
+void qb3_state::qb3_ram_bank_w(u8 data)
 {
 	membank("bank1")->set_entry(m_maincpu->state_int(ccpu_cpu_device::CCPU_P) & 3);
 }
@@ -482,10 +472,13 @@
 	PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_RESET
 
 	PORT_START("GEAR")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_NAME("1st gear") PORT_PLAYER(2)
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_NAME("2nd gear") PORT_PLAYER(2)
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_NAME("3rd gear") PORT_PLAYER(2)
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_NAME("4th gear") PORT_PLAYER(2)
+	PORT_BIT (0x03, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(cinemat_state, speedfrk_gear_number_r)
+
+	PORT_START("GEARRAW")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_NAME("1st gear") PORT_PLAYER(2) PORT_WRITE_LINE_MEMBER(cinemat_state, speedfrk_gear_change_w<0>)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_NAME("2nd gear") PORT_PLAYER(2) PORT_WRITE_LINE_MEMBER(cinemat_state, speedfrk_gear_change_w<1>)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_NAME("3rd gear") PORT_PLAYER(2) PORT_WRITE_LINE_MEMBER(cinemat_state, speedfrk_gear_change_w<2>)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_NAME("4th gear") PORT_PLAYER(2) PORT_WRITE_LINE_MEMBER(cinemat_state, speedfrk_gear_change_w<3>)
 INPUT_PORTS_END
 
 
@@ -1076,92 +1069,97 @@
 void cinemat_state::spacewar(machine_config &config)
 {
 	cinemat_nojmi_4k(config);
-	spacewar_sound(config);
+	SPACE_WARS_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
 	m_screen->set_screen_update(FUNC(cinemat_state::screen_update_spacewar));
 }
 
 void cinemat_state::barrier(machine_config &config)
 {
 	cinemat_jmi_4k(config);
-	barrier_sound(config);
+	BARRIER_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
+}
+
+WRITE_LINE_MEMBER(cinemat_state::speedfrk_start_led_w)
+{
+	/* start LED is controlled by bit 0x02 */
+	m_led = !state;
 }
 
 void cinemat_state::speedfrk(machine_config &config)
 {
 	cinemat_nojmi_8k(config);
-	speedfrk_sound(config);
+	SPEED_FREAK_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
+//  m_outlatch->q_out_cb<1>().set(FUNC(cinemat_state::speedfrk_start_led_w));
 }
 
 void cinemat_state::starhawk(machine_config &config)
 {
 	cinemat_jmi_4k(config);
-	starhawk_sound(config);
+	STAR_HAWK_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
 }
 
 void cinemat_16level_state::sundance(machine_config &config)
 {
 	cinemat_jmi_8k(config);
-	sundance_sound(config);
+	SUNDANCE_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
 }
 
 void cinemat_state::tailg(machine_config &config)
 {
 	cinemat_nojmi_8k(config);
-	tailg_sound(config);
-
+	TAIL_GUNNER_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
 	m_outlatch->q_out_cb<7>().set(FUNC(cinemat_state::mux_select_w));
 }
 
 void cinemat_state::warrior(machine_config &config)
 {
 	cinemat_jmi_8k(config);
-	warrior_sound(config);
+	WARRIOR_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
 }
 
 void cinemat_state::armora(machine_config &config)
 {
 	cinemat_jmi_16k(config);
-	armora_sound(config);
+	ARMOR_ATTACK_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
 }
 
 void cinemat_state::ripoff(machine_config &config)
 {
 	cinemat_jmi_8k(config);
-	ripoff_sound(config);
+	RIPOFF_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
 }
 
 void cinemat_state::starcas(machine_config &config)
 {
 	cinemat_jmi_8k(config);
-	starcas_sound(config);
+	STAR_CASTLE_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
 }
 
 void cinemat_64level_state::solarq(machine_config &config)
 {
 	cinemat_jmi_16k(config);
-	solarq_sound(config);
+	SOLAR_QUEST_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
 }
 
 void cinemat_color_state::boxingb(machine_config &config)
 {
 	cinemat_jmi_32k(config);
-	boxingb_sound(config);
+	BOXING_BUGS_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
 	m_screen->set_visarea(0, 1024, 0, 788);
-
-	m_outlatch->q_out_cb<7>().set(FUNC(cinemat_state::mux_select_w));
+	m_outlatch->q_out_cb<7>().append(FUNC(cinemat_state::mux_select_w));
 }
 
 void cinemat_state::wotw(machine_config &config)
 {
 	cinemat_jmi_16k(config);
 	m_screen->set_visarea(0, 1120, 0, 767);
-	wotw_sound(config);
+	WAR_OF_THE_WORLDS_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
 }
 
 void cinemat_color_state::wotwc(machine_config &config)
 {
 	cinemat_jmi_16k(config);
-	wotw_sound(config);
+	WAR_OF_THE_WORLDS_AUDIO(config, "soundboard", 0).configure_latch_inputs(*m_outlatch);
 }
 
 void demon_state::demon(machine_config &config)
@@ -1254,6 +1252,9 @@
 	ROM_LOAD16_BYTE( "r7", 0x0001, 0x0800, CRC(bb71144f) SHA1(79591cd3ef8df78ec26e158f7e82ca0dcd72260d) )
 
 	CCPU_PROMS
+
+	ROM_REGION( 0x100, "soundboard:sound_nl:2085.5e8e", 0 )
+	ROM_LOAD("2085.5e8e", 0x000, 0x100, CRC(9edbf536) SHA1(036ad8a231284e05f44b1106d38fc0c7e041b6e8) )
 ROM_END
 
 
@@ -1498,7 +1499,6 @@
 
 void cinemat_state::init_speedfrk()
 {
-	m_gear = 0xe;
 	m_maincpu->space(AS_IO).install_read_handler(0x00, 0x03, read8sm_delegate(*this, FUNC(cinemat_state::speedfrk_wheel_r)));
 	m_maincpu->space(AS_IO).install_read_handler(0x04, 0x06, read8sm_delegate(*this, FUNC(cinemat_state::speedfrk_gear_r)));
 	save_item(NAME(m_gear));
@@ -1525,11 +1525,7 @@
 	save_item(NAME(m_qb3_lasty));
 }
 
-void cinemat_64level_state::init_solarq()
-{
-	save_item(NAME(m_target_volume));
-	save_item(NAME(m_current_volume));
-}
+
 
 /*************************************
  *
@@ -1537,28 +1533,28 @@
  *
  *************************************/
 
-GAME(  1977, spacewar, 0,        spacewar, spacewar, cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Space Wars", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME(  1978, spaceshp, spacewar, spacewar, spaceshp, cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics (Sega license)", "Space Ship", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAMEL( 1979, barrier,  0,        barrier,  barrier,  cinemat_state,         empty_init,    ORIENTATION_FLIP_X ^ ROT270, "Cinematronics (Vectorbeam license)", "Barrier", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_barrier ) // developed by Cinematronics, then (when they noticed it wasn't going to be a successful game) sold to Vectorbeam, and ultimately back in the hands of Cinematronics again after they bought the dying company Vectorbeam
-GAME(  1979, speedfrk, 0,        speedfrk, speedfrk, cinemat_state,         init_speedfrk, ORIENTATION_FLIP_Y,   "Vectorbeam", "Speed Freak", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME(  1979, starhawk, 0,        starhawk, starhawk, cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Star Hawk", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAMEL( 1979, sundance, 0,        sundance, sundance, cinemat_16level_state, init_sundance, ORIENTATION_FLIP_X ^ ROT270, "Cinematronics", "Sundance", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_sundance )
-GAMEL( 1979, tailg,    0,        tailg,    tailg,    cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Tailgunner", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_tailg )
-GAME(  1979, warrior,  0,        warrior,  warrior,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Vectorbeam", "Warrior", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAMEL( 1980, armora,   0,        armora,   armora,   cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Armor Attack", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_armora )
-GAMEL( 1980, armorap,  armora,   armora,   armora,   cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Armor Attack (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_armora )
-GAMEL( 1980, armorar,  armora,   armora,   armora,   cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics (Rock-Ola license)", "Armor Attack (Rock-Ola)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_armora )
-GAME(  1980, ripoff,   0,        ripoff,   ripoff,   cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Rip Off", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAMEL( 1980, starcas,  0,        starcas,  starcas,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Star Castle (version 3)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
-GAMEL( 1980, starcas1, starcas,  starcas,  starcas,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Star Castle (older)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
-GAMEL( 1980, starcasc, starcas,  starcas,  starcasc, cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Star Castle (cocktail)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
-GAMEL( 1980, starcasp, starcas,  starcas,  starcas,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Star Castle (prototype)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
-GAMEL( 1980, starcase, starcas,  starcas,  starcas,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics (Mottoeis license)", "Star Castle (Mottoeis)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
-GAMEL( 1980, stellcas, starcas,  starcas,  starcas,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "bootleg (Elettronolo)", "Stellar Castle (Elettronolo)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
-GAMEL( 1981, spaceftr, starcas,  starcas,  starcas,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics (Zaccaria license)", "Space Fortress (Zaccaria)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_starcas )
-GAMEL( 1981, solarq,   0,        solarq,   solarq,   cinemat_64level_state, init_solarq,   ORIENTATION_FLIP_Y ^ ORIENTATION_FLIP_X, "Cinematronics", "Solar Quest (rev 10 8 81)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_solarq )
-GAME(  1981, boxingb,  0,        boxingb,  boxingb,  cinemat_color_state,   init_boxingb,  ORIENTATION_FLIP_Y,   "Cinematronics", "Boxing Bugs", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAMEL( 1981, wotw,     0,        wotw,     wotw,     cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "War of the Worlds", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_wotw )
-GAME(  1981, wotwc,    wotw,     wotwc,    wotw,     cinemat_color_state,   empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "War of the Worlds (color)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME(  1977, spacewar, 0,        spacewar, spacewar, cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Space Wars", MACHINE_SUPPORTS_SAVE )
+GAME(  1978, spaceshp, spacewar, spacewar, spaceshp, cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics (Sega license)", "Space Ship", MACHINE_SUPPORTS_SAVE )
+GAMEL( 1979, barrier,  0,        barrier,  barrier,  cinemat_state,         empty_init,    ORIENTATION_FLIP_X ^ ROT270, "Cinematronics (Vectorbeam license)", "Barrier", MACHINE_SUPPORTS_SAVE, layout_barrier ) // developed by Cinematronics, then (when they noticed it wasn't going to be a successful game) sold to Vectorbeam, and ultimately back in the hands of Cinematronics again after they bought the dying company Vectorbeam
+GAMEL(  1979, speedfrk, 0,        speedfrk, speedfrk, cinemat_state,         init_speedfrk, ORIENTATION_FLIP_Y,   "Vectorbeam", "Speed Freak", MACHINE_SUPPORTS_SAVE, layout_speedfrk )
+GAME(  1979, starhawk, 0,        starhawk, starhawk, cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Star Hawk", MACHINE_SUPPORTS_SAVE )
+GAMEL( 1979, sundance, 0,        sundance, sundance, cinemat_16level_state, init_sundance, ORIENTATION_FLIP_X ^ ROT270, "Cinematronics", "Sundance", MACHINE_SUPPORTS_SAVE, layout_sundance )
+GAMEL( 1979, tailg,    0,        tailg,    tailg,    cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Tailgunner", MACHINE_SUPPORTS_SAVE, layout_tailg )
+GAMEL( 1979, warrior,  0,        warrior,  warrior,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Vectorbeam", "Warrior", MACHINE_SUPPORTS_SAVE, layout_warrior )
+GAMEL( 1980, armora,   0,        armora,   armora,   cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Armor Attack", MACHINE_SUPPORTS_SAVE, layout_armora )
+GAMEL( 1980, armorap,  armora,   armora,   armora,   cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Armor Attack (prototype)", MACHINE_SUPPORTS_SAVE, layout_armora )
+GAMEL( 1980, armorar,  armora,   armora,   armora,   cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics (Rock-Ola license)", "Armor Attack (Rock-Ola)",  MACHINE_SUPPORTS_SAVE, layout_armora )
+GAME(  1980, ripoff,   0,        ripoff,   ripoff,   cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Rip Off", MACHINE_SUPPORTS_SAVE )
+GAMEL( 1980, starcas,  0,        starcas,  starcas,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Star Castle (version 3)", MACHINE_SUPPORTS_SAVE, layout_starcas )
+GAMEL( 1980, starcas1, starcas,  starcas,  starcas,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Star Castle (older)", MACHINE_SUPPORTS_SAVE, layout_starcas )
+GAMEL( 1980, starcasc, starcas,  starcas,  starcasc, cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Star Castle (cocktail)", MACHINE_SUPPORTS_SAVE, layout_starcas )
+GAMEL( 1980, starcasp, starcas,  starcas,  starcas,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "Star Castle (prototype)", MACHINE_SUPPORTS_SAVE, layout_starcas )
+GAMEL( 1980, starcase, starcas,  starcas,  starcas,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics (Mottoeis license)", "Star Castle (Mottoeis)", MACHINE_SUPPORTS_SAVE, layout_starcas )
+GAMEL( 1980, stellcas, starcas,  starcas,  starcas,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "bootleg (Elettronolo)", "Stellar Castle (Elettronolo)", MACHINE_SUPPORTS_SAVE, layout_starcas )
+GAMEL( 1981, spaceftr, starcas,  starcas,  starcas,  cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics (Zaccaria license)", "Space Fortress (Zaccaria)", MACHINE_SUPPORTS_SAVE, layout_starcas )
+GAMEL( 1981, solarq,   0,        solarq,   solarq,   cinemat_64level_state, empty_init,   ORIENTATION_FLIP_Y ^ ORIENTATION_FLIP_X, "Cinematronics", "Solar Quest (rev 10 8 81)", MACHINE_SUPPORTS_SAVE, layout_solarq )
+GAME(  1981, boxingb,  0,        boxingb,  boxingb,  cinemat_color_state,   init_boxingb,  ORIENTATION_FLIP_Y,   "Cinematronics", "Boxing Bugs", MACHINE_SUPPORTS_SAVE )
+GAMEL( 1981, wotw,     0,        wotw,     wotw,     cinemat_state,         empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "War of the Worlds", MACHINE_SUPPORTS_SAVE, layout_wotw )
+GAME(  1981, wotwc,    wotw,     wotwc,    wotw,     cinemat_color_state,   empty_init,    ORIENTATION_FLIP_Y,   "Cinematronics", "War of the Worlds (color)", MACHINE_SUPPORTS_SAVE )
 GAMEL( 1982, demon,    0,        demon,    demon,    demon_state,           empty_init,    ORIENTATION_FLIP_Y,   "Rock-Ola", "Demon", MACHINE_SUPPORTS_SAVE, layout_demon )
 GAME(  1982, qb3,      0,        qb3,      qb3,      qb3_state,             init_qb3,      ORIENTATION_FLIP_Y,   "Rock-Ola", "QB-3 (prototype)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/circus.cpp mame-0.224+dfsg.1/src/mame/drivers/circus.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/circus.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/circus.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -501,23 +501,27 @@
 
 ROM_START( robotbwl )
 	ROM_REGION( 0x10000, "maincpu", 0 ) // code
-	ROM_LOAD( "robotbwl.1a", 0xf000, 0x0200, CRC(df387a0b) SHA1(97291f1a93cbbff987b0fbc16c2e87ad0db96e12) )
-	ROM_LOAD( "robotbwl.2a", 0xf200, 0x0200, CRC(c948274d) SHA1(1bf8c6e994d601d4e6d30ca2a9da97e140ff5eee) )
-	ROM_LOAD( "robotbwl.3a", 0xf400, 0x0200, CRC(8fdb3ec5) SHA1(a9290edccb8f75e7ec91416d46617516260d5944) )
-	ROM_LOAD( "robotbwl.5a", 0xf600, 0x0200, CRC(ba9a6929) SHA1(9cc6e85431b5d82bf3a624f7b35ddec399ad6c80) )
-	ROM_LOAD( "robotbwl.6a", 0xf800, 0x0200, CRC(16fd8480) SHA1(935bb0c87d25086f326571c83f94f831b1a8b036) )
-	ROM_LOAD( "robotbwl.7a", 0xfa00, 0x0200, CRC(4cadbf06) SHA1(380c10aa83929bfbfd89facb252e68c307545755) )
-	ROM_LOAD( "robotbwl.8a", 0xfc00, 0x0200, CRC(bc809ed3) SHA1(2bb4cdae8c9619eebea30cc323960a46a509bb58) )
-	ROM_LOAD( "robotbwl.9a", 0xfe00, 0x0200, CRC(07487e27) SHA1(b5528fb3fec474df2b66f36e28df13a7e81f9ce3) )
+	ROM_LOAD( "4020.1a",  0xf000, 0x0200, CRC(df387a0b) SHA1(97291f1a93cbbff987b0fbc16c2e87ad0db96e12) ) // these are all N82S141N BPROMs
+	ROM_LOAD( "4021.2a",  0xf200, 0x0200, CRC(c948274d) SHA1(1bf8c6e994d601d4e6d30ca2a9da97e140ff5eee) )
+	ROM_LOAD( "4022.3a",  0xf400, 0x0200, CRC(8fdb3ec5) SHA1(a9290edccb8f75e7ec91416d46617516260d5944) )
+	ROM_LOAD( "4023.5a",  0xf600, 0x0200, CRC(ba9a6929) SHA1(9cc6e85431b5d82bf3a624f7b35ddec399ad6c80) )
+	ROM_LOAD( "4024.6a",  0xf800, 0x0200, CRC(16fd8480) SHA1(935bb0c87d25086f326571c83f94f831b1a8b036) )
+	ROM_LOAD( "4025.7a",  0xfa00, 0x0200, CRC(4cadbf06) SHA1(380c10aa83929bfbfd89facb252e68c307545755) )
+	ROM_LOAD( "4026a.8a", 0xfc00, 0x0200, CRC(bc809ed3) SHA1(2bb4cdae8c9619eebea30cc323960a46a509bb58) )
+	ROM_LOAD( "4027b.9a", 0xfe00, 0x0200, CRC(07487e27) SHA1(b5528fb3fec474df2b66f36e28df13a7e81f9ce3) )
 
 	ROM_REGION( 0x0800, "gfx1", 0 ) // character set
-	ROM_LOAD( "robotbwl.4c", 0x0000, 0x0200, CRC(a5f7acb9) SHA1(556dd34d0fa50415b128477e208e96bf0c050c2c) )
-	ROM_LOAD( "robotbwl.3c", 0x0200, 0x0200, CRC(d5380c9b) SHA1(b9670e87011a1b3aebd1d386f1fe6a74f8c77be9) )
-	ROM_LOAD( "robotbwl.2c", 0x0400, 0x0200, CRC(47b3e39c) SHA1(393c680fba3bd384e2c773150c3bae4d735a91bf) )
-	ROM_LOAD( "robotbwl.1c", 0x0600, 0x0200, CRC(b2991e7e) SHA1(32b6d42bb9312d6cbe5b4113fcf2262bfeef3777) )
+	ROM_LOAD( "4010.4c", 0x0000, 0x0200, CRC(a5f7acb9) SHA1(556dd34d0fa50415b128477e208e96bf0c050c2c) ) // these are all N82S141N BPROMs
+	ROM_LOAD( "4011.3c", 0x0200, 0x0200, CRC(d5380c9b) SHA1(b9670e87011a1b3aebd1d386f1fe6a74f8c77be9) )
+	ROM_LOAD( "4012.2c", 0x0400, 0x0200, CRC(47b3e39c) SHA1(393c680fba3bd384e2c773150c3bae4d735a91bf) )
+	ROM_LOAD( "4013.1c", 0x0600, 0x0200, CRC(b2991e7e) SHA1(32b6d42bb9312d6cbe5b4113fcf2262bfeef3777) )
 
 	ROM_REGION( 0x0020, "gfx2", ROMREGION_INVERT ) // ball sprite
-	ROM_LOAD( "robotbwl.14d",0x0000, 0x0020, CRC(a402ac06) SHA1(3bd75630786bcc86d9e9fbc826adc909eef9b41f) )
+	ROM_LOAD( "6000.14d",0x0000, 0x0020, CRC(a402ac06) SHA1(3bd75630786bcc86d9e9fbc826adc909eef9b41f) )
+
+	ROM_REGION( 0x100, "extra_proms", 0 ) // timing? not used by the emulation
+	ROM_LOAD( "5000.4d", 0x000, 0x020, NO_DUMP ) // both of these are MMI6306-1J (N82S131 equivalent) BPROMs
+	ROM_LOAD( "5001.5d", 0x020, 0x020, NO_DUMP )
 ROM_END
 
 ROM_START( crash )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cischeat.cpp mame-0.224+dfsg.1/src/mame/drivers/cischeat.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cischeat.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cischeat.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -626,6 +626,24 @@
 
 /**************************************************************************
                             Arm Champs II
+
+The Arm Champs II start-up arm movement and info
+---------------------------------------------------------------------
+At power-on, the arm moves left, then right then to center and stops.
+The center position is 0000.
+Note when the arm is at 0000 (center) the center limit switch is not
+on. It comes on when the arm is moved just off center (+-0002 or greater
+away from center) and stays on as long as the arm is not on
+0001-0000-FFFF (both left and right side). When the arm hits the
+left/right limit, both center and that left or right limit switch is on.
+
+Full movement to left limit switch is 0000-0040 (0x41h) and full right
+limit switch movement is 0000-FFC2 (0x3eh). Obviously the pot and arm
+are not 100% accurate and there's a small amount of slop between the
+arm shaft / motor mechanism and the pot.
+The limit switches are triggered just before the full movement.
+For the purpose of MAME emulation it can be rounded off so both sides
+move +- 0x40h.
 **************************************************************************/
 
 uint16_t armchamp2_state::motor_status_r()
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cit101.cpp mame-0.224+dfsg.1/src/mame/drivers/cit101.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cit101.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cit101.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,7 +2,7 @@
 // copyright-holders:AJR
 /***********************************************************************************************************************************
 
-Preliminary driver for first-generation C. Itoh video terminals.
+Preliminary driver for first-generation C. Itoh/CIE video terminals.
 
 CIT-101 (released December 1980)
     C. Itoh's first terminal, based on DEC VT100. ANSI X3.64 and V52 compatible.
@@ -30,6 +30,8 @@
     Ergonomic redesign of CIT-101.
     Competitive with DEC VT220 (which was released several months later).
     14-inch monochrome screen with tilt/swivel, 24 lines of 80 or 132 characters.
+    10 x 12 (80 columns)/9 x 12 (132 columns) display cell.
+    19,610 Hz (80 columns)/18,870 Hz (132 columns) horizontal frequency.
     85-key low-profile keyboard.
 CIG-201
     Plug-in graphics card for CIT-101 and CIT-101e.
@@ -47,7 +49,9 @@
 * CTRL+D: Restore default NVR settings
 * CTRL+A: Set answerback message
 * CTRL+X: Enable/disable Bidirectional Auxiliary I/O Channel and SET-UP D Mode
-          (undocumented; SET-UP B Mode only)
+          (SET-UP B Mode only; documented only for CIT-101e but also valid on original)
+
+The NVR checksum error reported when the terminal is first used is nonfatal. Default settings will be used and can be saved.
 
 ************************************************************************************************************************************/
 
@@ -63,27 +67,35 @@
 
 #include "machine/cit101_kbd.h"
 
-
 class cit101_state : public driver_device
 {
 public:
 	cit101_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
 		, m_screen(*this, "screen")
 		, m_nvr(*this, "nvr")
 		, m_comuart(*this, "comuart")
 		, m_kbduart(*this, "kbduart")
+		, m_rombank(*this, "rombank")
 		, m_chargen(*this, "chargen")
 		, m_mainram(*this, "mainram")
 		, m_extraram(*this, "extraram")
-	{ }
+	{
+	}
 
 	void cit101(machine_config &config);
+	void cit101e(machine_config &config);
+
 protected:
 	virtual void machine_start() override;
+
 private:
 	void draw_line(uint32_t *pixptr, int minx, int maxx, int line, bool last_line, u16 rowaddr, u16 rowattr, u8 scrattr);
 	u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+	void screen_reconfigure(const XTAL &xtal, int visible_width, int total_width, int visible_height, int total_height);
+
+	u8 bank_switch_r(offs_t offset);
 
 	u8 c000_ram_r(offs_t offset);
 	void c000_ram_w(offs_t offset, u8 data);
@@ -92,23 +104,29 @@
 
 	DECLARE_WRITE_LINE_MEMBER(blink_w);
 	void screen_control_w(u8 data);
+	void screen_control_101e_w(u8 data);
 	void brightness_w(u8 data);
+	void brightness_101e_w(u8 data);
 
 	void nvr_address_w(u8 data);
 	void nvr_control_w(u8 data);
 
 	void mem_map(address_map &map);
+	void mem_map_101e(address_map &map);
 	void io_map(address_map &map);
+	void io_map_101e(address_map &map);
 
 	u8 m_e0_latch;
 
 	bool m_blink;
 	u8 m_brightness;
 
+	required_device<i8085a_cpu_device> m_maincpu;
 	required_device<screen_device> m_screen;
 	required_device<er2055_device> m_nvr;
 	required_device<i8251_device> m_comuart;
 	required_device<i8251_device> m_kbduart;
+	optional_memory_bank m_rombank;
 	required_region_ptr<u8> m_chargen;
 	required_shared_ptr<u8> m_mainram;
 	required_shared_ptr<u8> m_extraram;
@@ -117,6 +135,12 @@
 
 void cit101_state::machine_start()
 {
+	if (m_rombank.found())
+	{
+		m_rombank->configure_entries(0, 8, memregion("banked")->base(), 0x1000);
+		m_rombank->set_entry(0);
+	}
+
 	m_comuart->write_cts(0);
 	m_kbduart->write_cts(0);
 
@@ -166,8 +190,8 @@
 				char_data = m_chargen[(m_mainram[rowaddr] << 4) | line];
 				if (last_line && BIT(attr, 0))
 					char_data ^= 0xff;
-				on_color = BIT(attr, 1) ? rgb_t::black() : rgb_t(m_brightness, m_brightness, m_brightness);
-				off_color = BIT(attr, 1) ? rgb_t(m_brightness, m_brightness, m_brightness) : rgb_t::black();
+				on_color = (BIT(attr, 1) != BIT(scrattr, 0)) ? rgb_t::black() : rgb_t(m_brightness, m_brightness, m_brightness);
+				off_color = (BIT(attr, 1) != BIT(scrattr, 0)) ? rgb_t(m_brightness, m_brightness, m_brightness) : rgb_t::black();
 				if (BIT(attr, 3) && m_blink)
 					on_color = rgb_t(m_brightness * 0.75, m_brightness * 0.75, m_brightness * 0.75);
 				last_bit = false;
@@ -217,6 +241,24 @@
 }
 
 
+void cit101_state::screen_reconfigure(const XTAL &xtal, int visible_width, int total_width, int visible_height, int total_height)
+{
+	const rectangle visarea(0, visible_width - 1, 0, visible_height - 1);
+	const attoseconds_t frame_period = attotime::from_ticks(total_width * total_height, xtal).as_attoseconds();
+
+	m_screen->set_unscaled_clock(xtal);
+	m_screen->configure(total_width, total_height, visarea, frame_period);
+}
+
+
+u8 cit101_state::bank_switch_r(offs_t offset)
+{
+	if (!machine().side_effects_disabled())
+		m_rombank->set_entry(offset);
+
+	return 0xc9; // RET
+}
+
 u8 cit101_state::c000_ram_r(offs_t offset)
 {
 	if (!machine().side_effects_disabled())
@@ -250,19 +292,25 @@
 	if ((m_extraram[0] & 0x06) != (data & 0x06))
 	{
 		const int height = BIT(data, 2) ? 312 : 260;
-		const attoseconds_t frame_period = HZ_TO_ATTOSECONDS(BIT(data, 2) ? 50 : 60);
 		if (BIT(data, 1))
-		{
-			const rectangle visarea(0, 799, 0, 239);
-			m_screen->set_unscaled_clock(14.976_MHz_XTAL);
-			m_screen->configure(960, height, visarea, frame_period);
-		}
+			screen_reconfigure(14.976_MHz_XTAL, 800, 960, 240, height);
 		else
-		{
-			const rectangle visarea(0, 1187, 0, 239);
-			m_screen->set_unscaled_clock(22.464_MHz_XTAL);
-			m_screen->configure(1440, height, visarea, frame_period);
-		}
+			screen_reconfigure(22.464_MHz_XTAL, 1188, 1440, 240, height);
+	}
+
+	m_extraram[0] = data;
+}
+
+void cit101_state::screen_control_101e_w(u8 data)
+{
+	if ((m_extraram[0] & 0x06) != (data & 0x06))
+	{
+		// TODO: interlace mode
+		const int height = 300;
+		if (BIT(data, 1))
+			screen_reconfigure(19.6608_MHz_XTAL, 800, 1000, 288, height);
+		else
+			screen_reconfigure(27.956_MHz_XTAL, 1188, 1476, 288, height);
 	}
 
 	m_extraram[0] = data;
@@ -274,6 +322,12 @@
 	m_brightness = pal5bit(~data & 0x1f);
 }
 
+void cit101_state::brightness_101e_w(u8 data)
+{
+	// Function of most significant bit is unknown
+	m_brightness = pal7bit(~data & 0x7f);
+}
+
 void cit101_state::nvr_address_w(u8 data)
 {
 	m_nvr->set_address(data & 0x3f);
@@ -300,6 +354,23 @@
 	map(0xfcc0, 0xfcc3).w("pit1", FUNC(pit8253_device::write));
 }
 
+void cit101_state::mem_map_101e(address_map &map)
+{
+	map(0x0000, 0x2fff).rom().region("maincpu", 0);
+	map(0x3000, 0x3ff7).bankr("rombank");
+	map(0x3ff8, 0x3fff).r(FUNC(cit101_state::bank_switch_r));
+	map(0x4000, 0x7fff).ram().share("mainram");
+	map(0x8000, 0xbfff).ram().share("extraram"); // 6 bits wide here?
+	map(0x8000, 0x8000).w(FUNC(cit101_state::screen_control_101e_w));
+	map(0xc000, 0xfbff).rw(FUNC(cit101_state::c000_ram_r), FUNC(cit101_state::c000_ram_w));
+	map(0xfc00, 0xfc01).rw("auxuart", FUNC(i8251_device::read), FUNC(i8251_device::write));
+	map(0xfc20, 0xfc21).rw("comuart", FUNC(i8251_device::read), FUNC(i8251_device::write));
+	map(0xfc40, 0xfc41).rw("kbduart", FUNC(i8251_device::read), FUNC(i8251_device::write));
+	map(0xfc60, 0xfc63).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0xfc80, 0xfc83).w("pit0", FUNC(pit8253_device::write));
+	map(0xfcc0, 0xfcc3).w("pit1", FUNC(pit8253_device::write));
+}
+
 void cit101_state::io_map(address_map &map)
 {
 	map(0x00, 0x01).rw("auxuart", FUNC(i8251_device::read), FUNC(i8251_device::write));
@@ -310,18 +381,24 @@
 	map(0xe0, 0xe0).rw(FUNC(cit101_state::e0_latch_r), FUNC(cit101_state::e0_latch_w));
 }
 
+void cit101_state::io_map_101e(address_map &map)
+{
+	io_map(map);
+	map(0xa0, 0xa0).w(FUNC(cit101_state::brightness_101e_w));
+}
 
-static INPUT_PORTS_START( cit101 )
+
+static INPUT_PORTS_START(cit101)
 INPUT_PORTS_END
 
 
 void cit101_state::cit101(machine_config &config)
 {
-	i8085a_cpu_device &maincpu(I8085A(config, "maincpu", 6.144_MHz_XTAL));
-	maincpu.set_addrmap(AS_PROGRAM, &cit101_state::mem_map);
-	maincpu.set_addrmap(AS_IO, &cit101_state::io_map);
-	maincpu.in_sid_func().set_constant(0); // used to time NVR reads
-	maincpu.out_sod_func().set(FUNC(cit101_state::blink_w));
+	I8085A(config, m_maincpu, 6.144_MHz_XTAL);
+	m_maincpu->set_addrmap(AS_PROGRAM, &cit101_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &cit101_state::io_map);
+	m_maincpu->in_sid_func().set_constant(0); // used to time NVR reads
+	m_maincpu->out_sod_func().set(FUNC(cit101_state::blink_w));
 
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
 	//m_screen->set_raw(14.976_MHz_XTAL, 960, 0, 800, 260, 0, 240);
@@ -354,10 +431,10 @@
 	INPUT_MERGER_ANY_HIGH(config, "uartint").output_handler().set_inputline("maincpu", I8085_RST55_LINE);
 
 	I8251(config, m_kbduart, 6.144_MHz_XTAL / 2);
-	m_kbduart->txd_handler().set("keyboard", FUNC(cit101_hle_keyboard_device::write_rxd));
+	m_kbduart->txd_handler().set("keyboard", FUNC(cit101_keyboard_device::write_rxd));
 	m_kbduart->rxrdy_handler().set_inputline("maincpu", I8085_RST65_LINE);
 
-	CIT101_HLE_KEYBOARD(config, "keyboard").txd_callback().set("kbduart", FUNC(i8251_device::write_rxd));
+	CIT101_KEYBOARD(config, "keyboard").txd_callback().set("kbduart", FUNC(i8251_device::write_rxd));
 
 	pit8253_device &pit0(PIT8253(config, "pit0", 0));
 	pit0.set_clk<0>(6.144_MHz_XTAL / 4);
@@ -390,29 +467,69 @@
 	ER2055(config, m_nvr);
 }
 
+void cit101_state::cit101e(machine_config &config)
+{
+	cit101(config);
+
+	m_maincpu->set_addrmap(AS_PROGRAM, &cit101_state::mem_map_101e);
+	m_maincpu->set_addrmap(AS_IO, &cit101_state::io_map_101e);
+
+	//m_screen->set_raw(19.6608_MHz_XTAL, 1000, 0, 800, 300, 0, 288); // 65.3 Hz nominal vertical frequency
+	m_screen->set_raw(27.956_MHz_XTAL, 1476, 0, 1188, 300, 0, 288); // 63.2 Hz nominal vertical frequency
+
+	CIT101E_KEYBOARD(config.replace(), "keyboard").txd_callback().set("kbduart", FUNC(i8251_device::write_rxd));
+}
+
 
 // PCB ID: HAV-2P005B / CIT-101 / C. ITOH
 // CPU: NEC D8085AC
 // RAM: 12x NEC D416C-2 (16 positions labeled 8116E, including 4 unpopulated ones)
 // Peripherals: 3x M5L8251AP-5 (2M, 7J, 7K); 2x NEC D8253C-2 (7I, 7L); NEC D8255AC-2 (7N); GI ER-2055 (8P)
 // Oscillators: 6.144 (XTAL1), 14.976 (XTAL2), 22.464 (XTAL3)
-ROM_START( cit101 )
+ROM_START(cit101)
 	ROM_REGION(0x4000, "maincpu", 0)
-	ROM_LOAD( "ic1_=3g04=_v10a.bin", 0x0000, 0x1000, CRC(5601fcac) SHA1(cad0d0335d133dd43993bc718ff72d12b8445cd1) ) // TMM2732D-45
-	ROM_LOAD( "ic2_=3h04=_v10a.bin", 0x1000, 0x1000, CRC(23d263e0) SHA1(586e8185f9804987e0a4081724c060e74769d41d) ) // TMM2732D-45
-	ROM_LOAD( "ic3_=3i04=_v10a.bin", 0x2000, 0x1000, CRC(15994b1d) SHA1(6d125db4ef5e1dd4d5a4d2f4d6f6bdf574e5bad8) ) // TMM2732D-45
-	ROM_LOAD( "ic4_=3j04=_v10a.bin", 0x3000, 0x0800, CRC(d786995f) SHA1(943b521dcc7abc0662d6e136169b7db480ae1e5c) ) // MB8516
+	ROM_LOAD("ic1_=3g04=_v10a.bin", 0x0000, 0x1000, CRC(5601fcac) SHA1(cad0d0335d133dd43993bc718ff72d12b8445cd1)) // TMM2732D-45
+	ROM_LOAD("ic2_=3h04=_v10a.bin", 0x1000, 0x1000, CRC(23d263e0) SHA1(586e8185f9804987e0a4081724c060e74769d41d)) // TMM2732D-45
+	ROM_LOAD("ic3_=3i04=_v10a.bin", 0x2000, 0x1000, CRC(15994b1d) SHA1(6d125db4ef5e1dd4d5a4d2f4d6f6bdf574e5bad8)) // TMM2732D-45
+	ROM_LOAD("ic4_=3j04=_v10a.bin", 0x3000, 0x0800, CRC(d786995f) SHA1(943b521dcc7abc0662d6e136169b7db480ae1e5c)) // MB8516
 	ROM_RELOAD(0x3800, 0x0800)
 
 	ROM_REGION(0x1000, "chargen", 0)
-	ROM_LOAD( "1h =5h 1 02= char rom.bin", 0x0000, 0x1000, CRC(ee0ff889) SHA1(a74ada19d19041b29e1b49aaf57ba7d9d54575e1) ) // TMM2332P
+	ROM_LOAD("1h =5h 1 02= char rom.bin", 0x0000, 0x1000, CRC(ee0ff889) SHA1(a74ada19d19041b29e1b49aaf57ba7d9d54575e1)) // TMM2332P
 
 	ROM_REGION(0x180, "proms", 0)
-	ROM_LOAD( "2i_=3a00=.bin", 0x000, 0x100, NO_DUMP ) // position labeled (MB)7052
-	ROM_LOAD( "2f_=6g00=.bin", 0x100, 0x020, NO_DUMP ) // position labeled TBP18S030
-	ROM_LOAD( "2e_=7i00=.bin", 0x120, 0x020, NO_DUMP ) // position labeled TBP18S030
-	ROM_LOAD( "5d_=4l00=.bin", 0x140, 0x020, NO_DUMP ) // position labeled TBP18S030
-	ROM_LOAD( "5g_=7f00=.bin", 0x160, 0x020, NO_DUMP ) // position labeled TBP18S030
+	ROM_LOAD("2i_=3a00=.bin", 0x000, 0x100, NO_DUMP) // position labeled (MB)7052
+	ROM_LOAD("2f_=6g00=.bin", 0x100, 0x020, NO_DUMP) // position labeled TBP18S030
+	ROM_LOAD("2e_=7i00=.bin", 0x120, 0x020, NO_DUMP) // position labeled TBP18S030
+	ROM_LOAD("5d_=4l00=.bin", 0x140, 0x020, NO_DUMP) // position labeled TBP18S030
+	ROM_LOAD("5g_=7f00=.bin", 0x160, 0x020, NO_DUMP) // position labeled TBP18S030
+ROM_END
+
+// PCB ID: C.ITOH CIT-101e HBG-2P002
+// CPU: NEC D8085AHC
+// RAM: 14x Fujitsu MB8118-12 (16 positions labeled 8118, including 2 unpopulated ones)
+// Peripherals: 3x NEC D8251AFC (7M, 7N, 7R); 2x NEC D8253C-2 (7J, 7K); NEC D8255AC-2 (6N); GI ER-2055 (5R)
+// Oscillators: 19.6608 (XTAL1), 27.956 (XTAL2), 6.144 (XTAL3)
+ROM_START(cit101e)
+	ROM_REGION(0x3000, "maincpu", 0)
+	ROM_LOAD("101e_v12c__12.7a", 0x0000, 0x2000, CRC(bc71ad27) SHA1(e61481752e20b115531b76688242691d265853e7))
+	ROM_LOAD("101e_v12c__3.7c", 0x2000, 0x1000, CRC(b4c63dd1) SHA1(aff9bd8e79e83c176c882fa3251a1419a283e753))
+
+	ROM_REGION(0x8000, "banked", ROMREGION_ERASEFF)
+	ROM_LOAD("101e_v12c__ab.7f", 0x0000, 0x2000, CRC(6d6bc1ee) SHA1(f42596b379bfda0468045d9e3810a1f0990f76f6))
+
+	ROM_REGION(0x1000, "chargen", 0)
+	ROM_LOAD("cit-101e_char_gen.3g", 0x0000, 0x1000, CRC(ccf259b4) SHA1(d918f16ce148c813a865280a43a766983673464a)) // position labeled 2732/2332
+
+	ROM_REGION(0x1c0, "proms", 0)
+	ROM_LOAD("2c=atr=__.bin", 0x000, 0x100, NO_DUMP) // position labeled MB7052
+	ROM_LOAD("6j=adr=00.bin", 0x100, 0x020, NO_DUMP) // position labeled (TBP)18S030
+	ROM_LOAD("1n=hs=00.bin", 0x120, 0x020, NO_DUMP) // position labeled (TBP)18S030
+	ROM_LOAD("2n=hl=__.bin", 0x140, 0x020, NO_DUMP) // position labeled (TBP)18S030
+	ROM_LOAD("1s=vs=__.bin", 0x160, 0x020, NO_DUMP) // position labeled (TBP)18S030
+	ROM_LOAD("4s=it1=__.bin", 0x180, 0x020, NO_DUMP) // position labeled (TBP)18S030
+	ROM_LOAD("4t=it2=06.bin", 0x1a0, 0x020, NO_DUMP) // position labeled (TBP)18S030
 ROM_END
 
-COMP( 1980, cit101, 0, 0, cit101, cit101, cit101_state, empty_init, "C. Itoh Electronics", "CIT-101", MACHINE_NOT_WORKING )
+COMP(1980, cit101,  0, 0, cit101,  cit101, cit101_state, empty_init, "C. Itoh Electronics", "CIT-101 Video Terminal", MACHINE_SUPPORTS_SAVE)
+COMP(1983, cit101e, 0, 0, cit101e, cit101, cit101_state, empty_init, "C. Itoh Electronics", "CIT-101e Video Terminal", MACHINE_SUPPORTS_SAVE)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cit101xl.cpp mame-0.224+dfsg.1/src/mame/drivers/cit101xl.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cit101xl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cit101xl.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,112 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***********************************************************************************************************************************
+
+Skeleton driver for CIE Terminals (C. Itoh) CIT-50+ and CIT-101XL video terminals.
+
+***********************************************************************************************************************************/
+
+#include "emu.h"
+//#include "bus/rs232/rs232.h"
+#include "cpu/z180/z180.h"
+#include "machine/nvram.h"
+#include "video/scn2674.h"
+#include "screen.h"
+
+class cit101xl_state : public driver_device
+{
+public:
+	cit101xl_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_avdc(*this, "avdc")
+	{
+	}
+
+	void cit101xl(machine_config &config);
+
+private:
+	SCN2674_DRAW_CHARACTER_MEMBER(draw_character);
+
+	void mem_map(address_map &map);
+	void io_map(address_map &map);
+	void char_map(address_map &map);
+	void attr_map(address_map &map);
+
+	required_device<z180_device> m_maincpu;
+	required_device<scn2674_device> m_avdc;
+};
+
+
+SCN2674_DRAW_CHARACTER_MEMBER(cit101xl_state::draw_character)
+{
+}
+
+
+void cit101xl_state::mem_map(address_map &map)
+{
+	map(0x00000, 0x07fff).rom().region("program", 0);
+	map(0x1c000, 0x1ffff).rom().region("program", 0x8000);
+	map(0x2e000, 0x2ffff).ram().share("nvram");
+}
+
+void cit101xl_state::io_map(address_map &map)
+{
+	map.global_mask(0xff);
+	map(0x00, 0x3f).noprw(); // HD64180 internal registers
+	map(0x40, 0x47).rw(m_avdc, FUNC(scn2674_device::read), FUNC(scn2674_device::write));
+	map(0x48, 0x48).nopr(); // watchdog?
+	map(0x60, 0x60).w(m_avdc, FUNC(scn2674_device::buffer_w));
+	map(0x68, 0x68).r(m_avdc, FUNC(scn2674_device::buffer_r));
+	map(0x70, 0x70).w(m_avdc, FUNC(scn2674_device::attr_buffer_w));
+	map(0x78, 0x78).r(m_avdc, FUNC(scn2674_device::attr_buffer_r));
+}
+
+void cit101xl_state::char_map(address_map &map)
+{
+	map(0x0000, 0x3fff).ram(); // TMM2063P-12 x2
+}
+
+void cit101xl_state::attr_map(address_map &map)
+{
+	map(0x0000, 0x3fff).ram(); // TMM2063P-12 x2
+}
+
+
+static INPUT_PORTS_START(cit101xl)
+INPUT_PORTS_END
+
+
+void cit101xl_state::cit101xl(machine_config &config)
+{
+	HD64180RP(config, m_maincpu, 12.288_MHz_XTAL); // HD64B180R0P
+	m_maincpu->set_addrmap(AS_PROGRAM, &cit101xl_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &cit101xl_state::io_map);
+
+	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // TC5564APL-15 + battery?
+
+	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
+	screen.set_raw(24.27_MHz_XTAL, 980, 0, 820, 413, 0, 364);
+	screen.set_screen_update(m_avdc, FUNC(scn2674_device::screen_update));
+
+	SCN2674(config, m_avdc, 24.27_MHz_XTAL / 10); // SCN2674BC4N40
+	//m_avdc->intr_callback().set_inputline(m_maincpu, ???);
+	m_avdc->set_character_width(10); // 10x13 character cell
+	m_avdc->set_display_callback(FUNC(cit101xl_state::draw_character));
+	m_avdc->set_addrmap(0, &cit101xl_state::char_map);
+	m_avdc->set_addrmap(1, &cit101xl_state::attr_map);
+	m_avdc->set_screen("screen");
+}
+
+// XTAL OSCs: 12.288 MHz (CPU), 24.270 MHz, 36.000 MHz
+// Gate arrays: HG61H09R84F (QFP80), L7A0084 4155P 00416A (LCC68)
+ROM_START(cit101xl)
+	ROM_REGION(0xc000, "program", 0)
+	ROM_LOAD("cit50p-101xl_v.1.1_0800.u2", 0x0000, 0x8000, CRC(2dbbd7f6) SHA1(f87b32e803bda5a8dd0e39e2e339357cfa4082ad)) // HN27256G-25 with handwritten label
+	ROM_LOAD("cit50p-101xl_v.1.1_8456.u4", 0x8000, 0x4000, CRC(4df0b677) SHA1(1916c65935c47cb0e11a8c7f293b608e648c542b)) // M5L27128K with handwritten label
+
+	ROM_REGION(0x2000, "chargen", 0)
+	ROM_LOAD("tmm2464ap_1104_cit50p_v1.2.u3", 0x0000, 0x2000, CRC(e07723f7) SHA1(466d69382cc75ac0abcda08e1a227da73fc77980)) // Toshiba OTP ROM with silkscreened label
+ROM_END
+
+COMP(1987, cit101xl, 0, 0, cit101xl, cit101xl, cit101xl_state, empty_init, "CIE Terminals", "CIT-101XL Video Display Terminal", MACHINE_IS_SKELETON)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cking_master.cpp mame-0.224+dfsg.1/src/mame/drivers/cking_master.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cking_master.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cking_master.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4,6 +4,7 @@
 /******************************************************************************
 
 Chess King Master (yes, it's plainly named "Master")
+According to the manual, the chess engine is Cyrus (by Richard Lang).
 
 Hardware notes:
 - Z80 CPU(NEC D780C-1) @ 4MHz(8MHz XTAL), IRQ from 555 timer
@@ -80,13 +81,12 @@
 	u8 input_r();
 	void control_w(u8 data);
 
-	u16 m_inp_mux;
+	u16 m_inp_mux = 0;
 };
 
 void master_state::machine_start()
 {
-	// zerofill, register for savestates
-	m_inp_mux = 0;
+	// register for savestates
 	save_item(NAME(m_inp_mux));
 }
 
@@ -225,14 +225,14 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &master_state::main_trampoline);
 	ADDRESS_MAP_BANK(config, "mainmap").set_map(&master_state::main_map).set_options(ENDIANNESS_LITTLE, 8, 16);
 
-	const attotime irq_period = attotime::from_hz(429); // theoretical frequency from 555 timer (22nF, 150K, 1K5), measurement was 418Hz
+	const attotime irq_period = attotime::from_hz(418); // 555 timer (22nF, 150K, 1K5), measured 418Hz
 	TIMER(config, m_irq_on).configure_periodic(FUNC(master_state::irq_on<INPUT_LINE_IRQ0>), irq_period);
 	m_irq_on->set_start_delay(irq_period - attotime::from_nsec(22870)); // active for 22.87us
 	TIMER(config, "irq_off").configure_periodic(FUNC(master_state::irq_off<INPUT_LINE_IRQ0>), irq_period);
 
 	SENSORBOARD(config, m_board).set_type(sensorboard_device::BUTTONS);
 	m_board->init_cb().set(m_board, FUNC(sensorboard_device::preset_chess));
-	m_board->set_delay(attotime::from_msec(100));
+	m_board->set_delay(attotime::from_msec(150));
 
 	/* video hardware */
 	PWM_DISPLAY(config, m_display).set_size(9, 2);
@@ -254,7 +254,7 @@
 
 ROM_START( ckmaster )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD("ckmaster.ic2", 0x0000, 0x2000, CRC(59cbec9e) SHA1(2e0629e65778da62bed857406b91a334698d2fe8) ) // D2764C, no label
+	ROM_LOAD("d2764c-3.ic2", 0x0000, 0x2000, CRC(59cbec9e) SHA1(2e0629e65778da62bed857406b91a334698d2fe8) ) // no custom label
 ROM_END
 
 } // anonymous namespace
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ckz80.cpp mame-0.224+dfsg.1/src/mame/drivers/ckz80.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ckz80.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ckz80.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -57,6 +57,7 @@
 		, m_maincpu(*this, "maincpu")
 		, m_rom(*this, "maincpu")
 		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
 		, m_terminal(*this, "terminal")
 		, m_fdc(*this, "fdc")
 	{ }
@@ -76,11 +77,11 @@
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
 	u8 m_term_data;
-	bool m_rom_in_map;
+	memory_passthrough_handler *m_rom_shadow_tap;
 	required_device<z80_device> m_maincpu;
 	required_region_ptr<u8> m_rom;
-	memory_passthrough_handler *m_rom_shadow_tap;
 	required_shared_ptr<u8> m_ram;
+	required_memory_bank    m_bank1;
 	required_device<generic_terminal_device> m_terminal;
 	required_device<upd765a_device> m_fdc;
 };
@@ -88,7 +89,7 @@
 
 void ckz80_state::port40_w(u8 data)
 {
-	m_rom_in_map = !BIT(data, 1);
+	m_bank1->set_entry(BIT(~data, 1));
 }
 
 u8 ckz80_state::port80_r()
@@ -106,7 +107,7 @@
 void ckz80_state::mem_map(address_map &map)
 {
 	map(0x0000, 0xffff).ram().share("mainram");
-	map(0xe000, 0xffff).lr8(NAME([this] (offs_t offset) { if (m_rom_in_map) return m_rom[offset]; else return m_ram[offset+0xe000]; } ));
+	map(0xe000, 0xffff).bankr("bank1");
 }
 
 void ckz80_state::io_map(address_map &map)
@@ -153,8 +154,9 @@
 
 void ckz80_state::machine_start()
 {
+	m_bank1->configure_entry(0, m_ram+0xe000);
+	m_bank1->configure_entry(1, m_rom);
 	save_item(NAME(m_term_data));
-	save_item(NAME(m_rom_in_map));
 }
 
 void ckz80_state::machine_reset()
@@ -176,7 +178,7 @@
 		return data;
 	});
 
-	m_rom_in_map = true;
+	m_bank1->set_entry(1);
 }
 
 static void ckz80_floppies(device_slot_interface &device)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cmi.cpp mame-0.224+dfsg.1/src/mame/drivers/cmi.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cmi.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cmi.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,7 +12,6 @@
 
     To do:
     * V12 system software reports that it can't load MIDI support and then hangs.
-    * V19 system software simply hangs.
 
     Information from:
 
@@ -93,6 +92,7 @@
 #include "machine/6850acia.h"
 #include "machine/6840ptm.h"
 #include "machine/7474.h"
+#include "machine/bankdev.h"
 #include "machine/clock.h"
 #include "machine/i8214.h"
 #include "machine/input_merger.h"
@@ -161,7 +161,7 @@
 
 static const int ch_int_levels[8] =
 {
-	0xc ^ 7, 0x8 ^ 7, 0xd ^ 7, 0x9 ^ 7, 0xe ^ 7, 0xa ^ 7, 0xf ^ 7, 0xb ^ 7
+	12 ^ 7, 8 ^ 7, 13 ^ 7, 9 ^ 7, 14 ^ 7, 10 ^ 7, 15 ^ 7, 11  ^ 7
 };
 
 #define IRQ_PERRINT_LEVEL       (0 ^ 7)
@@ -182,7 +182,6 @@
 #define FDC_STATUS_INTERRUPT    (1 << 6)
 #define FDC_STATUS_DRIVER_LOAD  (1 << 7)
 
-
 class cmi_state : public driver_device
 {
 public:
@@ -220,6 +219,8 @@
 		, m_lp_y_port(*this, "LP_Y")
 		, m_lp_touch_port(*this, "LP_TOUCH")
 		, m_cmi07_ram(*this, "cmi07_ram")
+		, m_cpu1_periphs(*this, "cpu1_periphs")
+		, m_cpu2_periphs(*this, "cpu2_periphs")
 	{
 	}
 
@@ -251,6 +252,9 @@
 	template<int cpunum> uint8_t perr_r(offs_t offset);
 	template<int cpunum> void perr_w(offs_t offset, uint8_t data);
 
+	uint16_t m_aic_ad565_in[16];
+	uint8_t m_aic_mux_latch;
+
 	uint8_t aic_ad574_r();
 	template<int Dac> void aic_dac_w(uint8_t data);
 	void aic_mux_latch_w(uint8_t data);
@@ -272,8 +276,19 @@
 	void video_w(offs_t offset, uint8_t data);
 	void vscroll_w(uint8_t data);
 	void video_attr_w(uint8_t data);
+
 	uint8_t vram_r(offs_t offset);
 	void vram_w(offs_t offset, uint8_t data);
+
+	template <int cpunum, uint16_t base> uint8_t ram_range_r(offs_t offset);
+	template <int cpunum, uint16_t base> void ram_range_w(offs_t offset, uint8_t data);
+	template <int cpunum> uint8_t vram_range_r(offs_t offset);
+	template <int cpunum> void vram_range_w(offs_t offset, uint8_t data);
+	template <int cpunum> uint8_t cards_range_r(offs_t offset);
+	template <int cpunum> void cards_range_w(offs_t offset, uint8_t data);
+	template <int cpunum> uint8_t periphs_range_r(offs_t offset);
+	template <int cpunum> void periphs_range_w(offs_t offset, uint8_t data);
+
 	uint8_t tvt_r();
 	void tvt_w(uint8_t data);
 	DECLARE_WRITE_LINE_MEMBER( pia_q219_irqa );
@@ -293,6 +308,10 @@
 	void mapsel_w(offs_t offset, uint8_t data);
 	template<int cpunum> uint8_t irq_ram_r(offs_t offset);
 	template<int cpunum> void irq_ram_w(offs_t offset, uint8_t data);
+	template<int cpunum> uint8_t scratch_ram_r(offs_t offset);
+	template<int cpunum> void scratch_ram_w(offs_t offset, uint8_t data);
+	template<int cpunum> uint8_t scratch_ram_fa_r(offs_t offset);
+	template<int cpunum> void scratch_ram_fa_w(offs_t offset, uint8_t data);
 
 	// MIDI/SMPTE
 	void midi_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
@@ -319,7 +338,6 @@
 	DECLARE_READ_LINE_MEMBER( cmi02_pia2_ca1_r );
 	DECLARE_WRITE_LINE_MEMBER( cmi02_pia2_cb2_w );
 
-	// ???
 	uint8_t cmi07_r();
 	void cmi07_w(uint8_t data);
 
@@ -335,6 +353,9 @@
 	void maincpu2_map(address_map &map);
 	void midicpu_map(address_map &map);
 
+	void cpu1_periphs_map(address_map &map);
+	void cpu2_periphs_map(address_map &map);
+
 protected:
 	required_device<mc6809e_device> m_maincpu1;
 	required_device<mc6809e_device> m_maincpu2;
@@ -379,6 +400,9 @@
 
 	required_shared_ptr<uint8_t> m_cmi07_ram;
 
+	required_device<address_map_bank_device> m_cpu1_periphs;
+	required_device<address_map_bank_device> m_cpu2_periphs;
+
 	address_space *m_cpu1space;
 	address_space *m_cpu2space;
 
@@ -392,13 +416,10 @@
 	// Memory
 	bool map_is_active(int cpunum, int map, uint8_t *map_info);
 	void update_address_space(int cpunum, uint8_t mapinfo);
-	void install_video_ram(int cpunum);
-	void install_peripherals(int cpunum);
 
 	// Video
 	void hblank();
-	void update_video_pos(int y, int x, int byte_size);
-	void video_write(int offset);
+	template <int Y, int X, bool ByteSize> void update_video_pos();
 
 	// Floppy
 	void dma_fdc_rom();
@@ -409,6 +430,7 @@
 	uint8_t *m_q133_rom;
 
 	uint16_t  m_int_state[2];
+	uint8_t   m_lp_int;
 	uint8_t   m_hp_int;
 	std::unique_ptr<uint8_t[]>    m_shared_ram;
 	std::unique_ptr<uint8_t[]>    m_scratch_ram[2];
@@ -417,10 +439,10 @@
 	uint8_t   m_map_sel[16];
 	std::unique_ptr<uint8_t[]>    m_map_ram[2];
 	std::unique_ptr<uint8_t[]>    m_q256_ram[2];
-	uint8_t   m_ram_indices[2][PAGE_COUNT];
 	uint8_t   m_map_ram_latch;
-	int     m_cpu_active_space[2]; // TODO: Make one register
+	int     m_cpu_active_space[2];
 	int     m_cpu_map_switch[2];
+	uint8_t m_curr_mapinfo[2];
 	uint8_t m_irq_address[2][2];
 	int     m_m6809_bs_hack_cnt[2];
 
@@ -434,21 +456,23 @@
 
 	/* QFC9 floppy disk controller card */
 	uint8_t * m_qfc9_region_ptr;
-	int     m_fdc_drq;
+	int       m_fdc_drq;
 	uint8_t   m_fdc_addr;
 	uint8_t   m_fdc_ctrl;
 	uint8_t   m_fdc_status;
-	PAIR    m_fdc_dma_addr;
-	PAIR    m_fdc_dma_cnt;
+	PAIR      m_fdc_dma_addr;
+	PAIR      m_fdc_dma_cnt;
 
 	/* CMI-07 */
 	uint8_t   m_cmi07_ctrl;
+	bool      m_cmi07_base_enable[2];
+	uint16_t  m_cmi07_base_addr;
 
 	uint8_t   m_msm5832_addr;
 
 	// Master card (CMI-02)
-	int     m_cmi02_ptm_irq;
-	uint8_t m_cmi02_pia_chsel;
+	int       m_cmi02_ptm_irq;
+	uint8_t   m_cmi02_pia_chsel;
 };
 
 /**************************************
@@ -461,7 +485,7 @@
 {
 	const pen_t *pen = m_palette->pens();
 	uint8_t y_scroll = m_q219_pia->a_output();
-	uint8_t invert = (!BIT(m_q219_pia->b_output(), 3)) & 1;
+	uint8_t invert = BIT(~m_q219_pia->b_output(), 3);
 
 	for (int y = cliprect.min_y; y <= cliprect.max_y; ++y)
 	{
@@ -502,12 +526,8 @@
 
 		if (v == m_lp_y_port->read())
 		{
-			if (_touch)
-				m_q219_b_touch = 1 << 5;
-			else
-				m_q219_b_touch = 0;
-
-			m_q219_pia->ca1_w(_touch ? 1 : 0);
+			m_q219_b_touch = _touch ? 0 : (1 << 5);
+			m_q219_pia->ca1_w(_touch ? 0 : 1);
 
 			if (!_touch || !_tfh)
 			{
@@ -528,11 +548,24 @@
 
 }
 
-void cmi_state::update_video_pos(int y, int x, int byte_size)
+template void cmi_state::update_video_pos< 0,  0, false>();
+template void cmi_state::update_video_pos< 0,  1, false>();
+template void cmi_state::update_video_pos< 0, -1, false>();
+template void cmi_state::update_video_pos< 0,  0, true>();
+template void cmi_state::update_video_pos< 1,  0, false>();
+template void cmi_state::update_video_pos< 1,  1, false>();
+template void cmi_state::update_video_pos< 1, -1, false>();
+template void cmi_state::update_video_pos< 1,  0, true>();
+template void cmi_state::update_video_pos<-1,  0, false>();
+template void cmi_state::update_video_pos<-1,  1, false>();
+template void cmi_state::update_video_pos<-1, -1, false>();
+template void cmi_state::update_video_pos<-1,  0, true>();
+
+template <int Y, int X, bool ByteSize> void cmi_state::update_video_pos()
 {
 	uint8_t *video_addr = &m_video_ram[m_y_pos * (512 / 8) + (m_x_pos / 8)];
 
-	if (byte_size)
+	if (ByteSize)
 	{
 		*video_addr = m_video_data;
 	}
@@ -544,35 +577,8 @@
 		*video_addr |= m_video_data & bit_mask;
 	}
 
-	if (y > 0)
-		m_y_pos = (m_y_pos + 1) & 0xff;
-	else if (y < 0)
-		m_y_pos = (m_y_pos - 1) & 0xff;
-
-	if (x > 0)
-		m_x_pos = (m_x_pos + 1) & 0x1ff;
-	else if (x < 0)
-		m_x_pos = (m_x_pos - 1) & 0x1ff;
-}
-
-void cmi_state::video_write(int offset)
-{
-	switch (offset)
-	{
-		case 0x0: update_video_pos( 0,  0, 0); break;
-		case 0x1: update_video_pos( 0,  1, 0); break;
-		case 0x2: update_video_pos( 0, -1, 0); break;
-		case 0x3: update_video_pos( 0,  0, 1); break;
-		case 0x4: update_video_pos( 1,  0, 0); break;
-		case 0x5: update_video_pos( 1,  1, 0); break;
-		case 0x6: update_video_pos( 1, -1, 0); break;
-		case 0x7: update_video_pos( 1,  0, 1); break;
-		case 0x8: update_video_pos(-1,  0, 0); break;
-		case 0x9: update_video_pos(-1,  1, 0); break;
-		case 0xa: update_video_pos(-1, -1, 0); break;
-		case 0xb: update_video_pos(-1,  0, 1); break;
-//      default: osd_printf_debug("Video Write %x %x\n", offset, m_video_data);
-	}
+	m_y_pos = (m_y_pos + Y) & 0xff;
+	m_x_pos = (m_x_pos + X) & 0x1ff;
 }
 
 uint8_t cmi_state::video_r(offs_t offset)
@@ -582,7 +588,23 @@
 
 	m_video_data = m_video_ram[m_y_pos * (512 / 8) + (m_x_pos / 8)];
 
-	video_write(offset);
+	switch (offset & 0x0f)
+	{
+		case 0x0: update_video_pos< 0,  0, false>(); break;
+		case 0x1: update_video_pos< 0,  1, false>(); break;
+		case 0x2: update_video_pos< 0, -1, false>(); break;
+		case 0x3: update_video_pos< 0,  0, true>(); break;
+		case 0x4: update_video_pos< 1,  0, false>(); break;
+		case 0x5: update_video_pos< 1,  1, false>(); break;
+		case 0x6: update_video_pos< 1, -1, false>(); break;
+		case 0x7: update_video_pos< 1,  0, true>(); break;
+		case 0x8: update_video_pos<-1,  0, false>(); break;
+		case 0x9: update_video_pos<-1,  1, false>(); break;
+		case 0xa: update_video_pos<-1, -1, false>(); break;
+		case 0xb: update_video_pos<-1,  0, true>(); break;
+		default: break;
+	}
+
 	return m_video_data;
 }
 
@@ -603,7 +625,23 @@
 void cmi_state::video_w(offs_t offset, uint8_t data)
 {
 	m_video_data = data;
-	video_write(offset);
+
+	switch (offset & 0x0f)
+	{
+		case 0x0: update_video_pos< 0,  0, false>(); break;
+		case 0x1: update_video_pos< 0,  1, false>(); break;
+		case 0x2: update_video_pos< 0, -1, false>(); break;
+		case 0x3: update_video_pos< 0,  0, true>(); break;
+		case 0x4: update_video_pos< 1,  0, false>(); break;
+		case 0x5: update_video_pos< 1,  1, false>(); break;
+		case 0x6: update_video_pos< 1, -1, false>(); break;
+		case 0x7: update_video_pos< 1,  0, true>(); break;
+		case 0x8: update_video_pos<-1,  0, false>(); break;
+		case 0x9: update_video_pos<-1,  1, false>(); break;
+		case 0xa: update_video_pos<-1, -1, false>(); break;
+		case 0xb: update_video_pos<-1,  0, true>(); break;
+		default: break;
+	}
 }
 
 void cmi_state::vscroll_w(uint8_t data)
@@ -616,11 +654,6 @@
 	// TODO
 }
 
-void cmi_state::vram_w(offs_t offset, uint8_t data)
-{
-	m_video_ram[offset] = data;
-}
-
 void cmi_state::tvt_w(uint8_t data)
 {
 	if ((data >= 0x20 && data <= 0x7e) || data == 0x0a || data == 0x0d)
@@ -634,6 +667,11 @@
 	return 0;
 }
 
+void cmi_state::vram_w(offs_t offset, uint8_t data)
+{
+	m_video_ram[offset] = data;
+}
+
 uint8_t cmi_state::vram_r(offs_t offset)
 {
 	if (machine().side_effects_disabled())
@@ -656,6 +694,220 @@
 	return *(((uint8_t *)m_q133_region->base()) + base + offset);
 }
 
+template<int cpunum> uint8_t cmi_state::perr_r(offs_t offset)
+{
+	m_maincpu2_irq0_merger->in_w<1>(1);
+
+	const uint8_t page = offset >> 11;
+	const uint8_t mapinfo = m_curr_mapinfo[cpunum];
+	const uint8_t page_info = m_map_ram[0][((mapinfo & 0x1f) << PAGE_SHIFT) + page];
+	const uint8_t data = m_q256_ram[0][(page_info & 0x7f) * PAGE_SIZE + (offset & 0x7ff)];
+	return data;
+}
+
+template<int cpunum> void cmi_state::perr_w(offs_t offset, uint8_t data)
+{
+	const uint8_t page = offset >> 11;
+	const uint8_t mapinfo = m_curr_mapinfo[cpunum];
+	const uint8_t page_info = m_map_ram[0][((mapinfo & 0x1f) << PAGE_SHIFT) + page];
+	m_q256_ram[0][(page_info & 0x7f) * PAGE_SIZE + (offset & 0x7ff)] = data;
+}
+
+template <int cpunum, uint16_t base> uint8_t cmi_state::ram_range_r(offs_t offset)
+{
+	const uint16_t addr = base + offset;
+	const uint8_t mapinfo = m_curr_mapinfo[cpunum];
+	const bool perr_en = BIT(mapinfo, 6);
+	const uint8_t page = addr >> 11;
+	const uint8_t page_info = m_map_ram[0][((mapinfo & 0x1f) << PAGE_SHIFT) + page];
+
+	if (m_cmi07_base_enable[cpunum] && (addr & 0xc000) == m_cmi07_base_addr)
+	{
+		return m_cmi07_ram[(page * PAGE_SIZE) & 0x3fff];
+	}
+
+	if (perr_en)
+	{
+		return perr_r<cpunum>(addr);
+	}
+	else if (BIT(page_info, 7))
+	{
+		const uint32_t ram_base = (page_info & 0x7f) << 11;
+		return m_q256_ram[0][ram_base | (addr & 0x7ff)];
+	}
+
+	return 0x00;
+}
+
+template <int cpunum, uint16_t base> void cmi_state::ram_range_w(offs_t offset, uint8_t data)
+{
+	const uint16_t addr = base + offset;
+	const uint8_t mapinfo = m_curr_mapinfo[cpunum];
+	const bool perr_en = BIT(mapinfo, 6);
+	const uint8_t page = addr >> 11;
+	const uint8_t page_info = m_map_ram[0][((mapinfo & 0x1f) << PAGE_SHIFT) + page];
+
+	if (m_cmi07_base_enable[cpunum] && (addr & 0xc000) == m_cmi07_base_addr)
+	{
+		m_cmi07_ram[(page * PAGE_SIZE) & 0x3fff] = data;
+		return;
+	}
+
+	if (perr_en)
+	{
+		perr_w<cpunum>(addr, data);
+	}
+	else if (BIT(page_info, 7))
+	{
+		const uint32_t ram_base = (page_info & 0x7f) << 11;
+		m_q256_ram[0][ram_base | (addr & 0x7ff)] = data;
+	}
+}
+
+template <int cpunum> uint8_t cmi_state::vram_range_r(offs_t offset)
+{
+	const uint8_t mapinfo = m_curr_mapinfo[cpunum];
+	if (!BIT(mapinfo, 5))
+	{
+		return vram_r(offset);
+	}
+	else
+	{
+		const uint16_t address = 0x8000 + offset;
+		const uint8_t page = (offset >> 11) + 16;
+		const uint8_t page_info = m_map_ram[0][((mapinfo & 0x1f) << PAGE_SHIFT) + page];
+
+		if (m_cmi07_base_enable[cpunum] && (address & 0xc000) == m_cmi07_base_addr)
+		{
+			return m_cmi07_ram[(page * PAGE_SIZE) & 0x3fff];
+		}
+
+		if (BIT(page_info, 7))
+		{
+			const uint32_t ram_base = (page_info & 0x7f) << 11;
+			return m_q256_ram[0][ram_base | (offset & 0x7ff)];
+		}
+	}
+
+	return 0x00;
+}
+
+template <int cpunum> void cmi_state::vram_range_w(offs_t offset, uint8_t data)
+{
+	const uint8_t mapinfo = m_curr_mapinfo[cpunum];
+	if (!BIT(mapinfo, 5))
+	{
+		vram_w(offset, data);
+	}
+	else
+	{
+		const uint16_t address = 0x8000 + offset;
+		const uint8_t page = (offset >> 11) + 16;
+		const uint8_t page_info = m_map_ram[0][((mapinfo & 0x1f) << PAGE_SHIFT) + page];
+
+		if (m_cmi07_base_enable[cpunum] && (address & 0xc000) == m_cmi07_base_addr)
+		{
+			m_cmi07_ram[(page * PAGE_SIZE) & 0x3fff] = data;
+			return;
+		}
+
+		if (BIT(page_info, 7))
+		{
+			const uint32_t ram_base = (page_info & 0x7f) << 11;
+			m_q256_ram[0][ram_base | (offset & 0x7ff)] = data;
+		}
+	}
+}
+
+template <int cpunum> uint8_t cmi_state::cards_range_r(offs_t offset)
+{
+	const uint8_t mapinfo = m_curr_mapinfo[cpunum];
+	if (!BIT(mapinfo, 7) && offset < 0x40)
+	{
+		return cmi02_r(offset);
+	}
+	else
+	{
+		const uint8_t page = (offset >> 11) + 28;
+		const uint8_t page_info = m_map_ram[0][((mapinfo & 0x1f) << PAGE_SHIFT) + page];
+
+		if (BIT(page_info, 7))
+		{
+			const uint32_t ram_base = (page_info & 0x7f) << 11;
+			return m_q256_ram[0][ram_base | (offset & 0x7ff)];
+		}
+	}
+	return 0x00;
+}
+
+template <int cpunum> void cmi_state::cards_range_w(offs_t offset, uint8_t data)
+{
+	const uint8_t mapinfo = m_curr_mapinfo[cpunum];
+	if (!BIT(mapinfo, 7) && offset < 0x40)
+	{
+		cmi02_w(offset, data);
+	}
+	else
+	{
+		const uint8_t page = (offset >> 11) + 28;
+		const uint8_t page_info = m_map_ram[0][((mapinfo & 0x1f) << PAGE_SHIFT) + page];
+
+		if (BIT(page_info, 7))
+		{
+			const uint32_t ram_base = (page_info & 0x7f) << 11;
+			m_q256_ram[0][ram_base | (offset & 0x7ff)] = data;
+		}
+	}
+}
+
+template <int cpunum> uint8_t cmi_state::periphs_range_r(offs_t offset)
+{
+	const uint8_t mapinfo = m_curr_mapinfo[cpunum];
+	if (!BIT(mapinfo, 7))
+	{
+		if (cpunum)
+			return m_cpu2_periphs->read8(offset);
+		else
+			return m_cpu1_periphs->read8(offset);
+	}
+	else
+	{
+		const uint8_t page = (offset >> 11) + 30;
+		const uint8_t page_info = m_map_ram[0][((mapinfo & 0x1f) << PAGE_SHIFT) + page];
+
+		if (BIT(page_info, 7))
+		{
+			const uint32_t ram_base = (page_info & 0x7f) << 11;
+			return m_q256_ram[0][ram_base | (offset & 0x7ff)];
+		}
+	}
+
+	return 0x00;
+}
+
+template <int cpunum> void cmi_state::periphs_range_w(offs_t offset, uint8_t data)
+{
+	const uint8_t mapinfo = m_curr_mapinfo[cpunum];
+	if (!BIT(mapinfo, 7))
+	{
+		if (cpunum)
+			m_cpu2_periphs->write8(offset, data);
+		else
+			m_cpu1_periphs->write8(offset, data);
+	}
+	else
+	{
+		const uint8_t page = (offset >> 11) + 30;
+		const uint8_t page_info = m_map_ram[0][((mapinfo & 0x1f) << PAGE_SHIFT) + page];
+
+		if (BIT(page_info, 7))
+		{
+			const uint32_t ram_base = (page_info & 0x7f) << 11;
+			m_q256_ram[0][ram_base | (offset & 0x7ff)] = data;
+		}
+	}
+}
+
 void cmi_state::map_ram_w(offs_t offset, uint8_t data)
 {
 	if ((offset & 1) == 0)
@@ -664,21 +916,18 @@
 	}
 	else
 	{
-		for (int i = 0; i < NUM_Q256_CARDS; ++i)
-		{
-			uint8_t map_info;
-			int map = (offset >> 6);
-			int page_enable = ((m_map_ram_latch & 0x80) && (i == (m_map_ram_latch & 7))) ? 0x80 : 0;
-
-			m_map_ram[i][offset >> 1] = page_enable | (data & 0x7f);
-
-			/* Determine if this map is in use by either CPU */
-			if (map_is_active(CPU_1, map, &map_info))
-				update_address_space(0, map_info);
+		uint8_t map_info;
+		int map = (offset >> 6);
+		int page_enable = ((m_map_ram_latch & 0x80) && (0 == (m_map_ram_latch & 7))) ? 0x80 : 0;
+
+		m_map_ram[0][offset >> 1] = page_enable | (data & 0x7f);
+
+		/* Determine if this map is in use by either CPU */
+		if (map_is_active(CPU_1, map, &map_info))
+			update_address_space(0, map_info);
 
-			if (map_is_active(CPU_2, map, &map_info))
-				update_address_space(1, map_info);
-		}
+		if (map_is_active(CPU_2, map, &map_info))
+			update_address_space(1, map_info);
 	}
 }
 
@@ -689,8 +938,7 @@
 
 template<int cpunum> uint8_t cmi_state::map_r()
 {
-	uint8_t data = (m_cpu_active_space[1] << 2) | (m_cpu_active_space[0] << 1) | cpunum;
-	return data;
+	return (m_cpu_active_space[1] << 2) | (m_cpu_active_space[0] << 1) | cpunum;
 }
 
 template<int cpunum> void cmi_state::map_w(uint8_t data)
@@ -706,7 +954,7 @@
 	if (m_m6809_bs_hack_cnt[cpunum] > 0)
 	{
 		m_m6809_bs_hack_cnt[cpunum]--;
-		LOG("CPU%d IRQ vector byte %d (offset %d): %02x\n", cpunum, 1 - m_m6809_bs_hack_cnt[cpunum], offset, m_irq_address[cpunum][offset]);
+		LOG("CPU%d IRQ vector byte %d (offset %d): %02x\n", cpunum + 1, 1 - m_m6809_bs_hack_cnt[cpunum], offset, m_irq_address[cpunum][offset]);
 		return m_irq_address[cpunum][offset];
 	}
 	return m_scratch_ram[cpunum][0xf8 + offset];
@@ -761,7 +1009,6 @@
 		case 0: set_interrupt(cpunum, IRQ_IPI2_LEVEL, bit ? ASSERT_LINE : CLEAR_LINE);
 				break;
 		case 2: // TODO: Hardware trace
-				osd_printf_debug("TODO: Hardware trace %02x\n", data);
 				break;
 		case 4: m_cpu_map_switch[cpunum] = bit;
 				break;
@@ -777,7 +1024,7 @@
 {
 	m_maincpu2_irq0_merger->in_w<1>(0);
 	LOG("%s: parity_r %04x\n", machine().describe_context(), offset);
-	return 0x00;
+	return 0xff;
 }
 
 void cmi_state::mapsel_w(offs_t offset, uint8_t data)
@@ -871,15 +1118,26 @@
 	}
 }
 
-/* The maps are dynamically populated */
 void cmi_state::maincpu1_map(address_map &map)
 {
-	map(0xfffe, 0xffff).r(FUNC(cmi_state::vector_r<0>));
+	map(0x0000, 0x7fff).rw(&cmi_state::ram_range_r<0, 0x0000>, "cmi_state::ram_range_r<0, 0x0000>",
+		&cmi_state::ram_range_w<0, 0x0000>, "cmi_state::ram_range_w<0, 0x0000>");
+	map(0x8000, 0xbfff).rw(FUNC(cmi_state::vram_range_r<0>), FUNC(cmi_state::vram_range_w<0>));
+	map(0xc000, 0xdfff).rw(&cmi_state::ram_range_r<0, 0xc000>, "cmi_state::ram_range_r<0, 0xc000>",
+		&cmi_state::ram_range_w<0, 0xc000>, "cmi_state::ram_range_w<0, 0xc000>");
+	map(0xe000, 0xefff).rw(FUNC(cmi_state::cards_range_r<0>), FUNC(cmi_state::cards_range_w<0>));
+	map(0xf000, 0xffff).rw(FUNC(cmi_state::periphs_range_r<0>), FUNC(cmi_state::periphs_range_w<0>));
 }
 
 void cmi_state::maincpu2_map(address_map &map)
 {
-	map(0xfffe, 0xffff).r(FUNC(cmi_state::vector_r<1>));
+	map(0x0000, 0x7fff).rw(&cmi_state::ram_range_r<1, 0x0000>, "cmi_state::ram_range_r<1, 0x0000>",
+		&cmi_state::ram_range_w<1, 0x0000>, "cmi_state::ram_range_w<1, 0x0000>");
+	map(0x8000, 0xbfff).rw(FUNC(cmi_state::vram_range_r<1>), FUNC(cmi_state::vram_range_w<1>));
+	map(0xc000, 0xdfff).rw(&cmi_state::ram_range_r<1, 0xc000>, "cmi_state::ram_range_r<1, 0xc000>",
+		&cmi_state::ram_range_w<1, 0xc000>, "cmi_state::ram_range_w<1, 0xc000>");
+	map(0xe000, 0xefff).rw(FUNC(cmi_state::cards_range_r<1>), FUNC(cmi_state::cards_range_w<1>));
+	map(0xf000, 0xffff).rw(FUNC(cmi_state::periphs_range_r<1>), FUNC(cmi_state::periphs_range_w<1>));
 }
 
 void cmi_state::midicpu_map(address_map &map)
@@ -910,6 +1168,69 @@
 	map(0xc000, 0xffff).ram().share("cmi07_ram");
 }
 
+void cmi_state::cpu1_periphs_map(address_map &map)
+{
+	map(0x0000, 0x07ff).rw(FUNC(cmi_state::rom_r<0>), FUNC(cmi_state::map_ram_w));
+	map(0x0800, 0x0bff).rom().region("q133", 0x2800);
+	map(0x0c40, 0x0c4f).rw(FUNC(cmi_state::parity_r), FUNC(cmi_state::mapsel_w));
+	map(0x0c5a, 0x0c5b).noprw(); // Q077 HDD controller - not installed
+	map(0x0c5e, 0x0c5e).rw(FUNC(cmi_state::atomic_r), FUNC(cmi_state::cpufunc_w));
+	map(0x0c5f, 0x0c5f).rw(FUNC(cmi_state::map_r<0>), FUNC(cmi_state::map_w<0>));
+	map(0x0c80, 0x0c83).rw(m_q133_acia[0], FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+	map(0x0c84, 0x0c87).rw(m_q133_acia[1], FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+	map(0x0c88, 0x0c8b).rw(m_q133_acia[2], FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+	map(0x0c8c, 0x0c8f).rw(m_q133_acia[3], FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+	map(0x0c90, 0x0c97).rw(m_q133_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write));
+	//map(0x0ca0, 0x0ca0).w(FUNC(cmi_state::midi_latch_w));
+	map(0x0cbc, 0x0cbc).rw(FUNC(cmi_state::cmi07_r), FUNC(cmi_state::cmi07_w));
+	map(0x0cc0, 0x0cc3).r(FUNC(cmi_state::lightpen_r));
+	map(0x0cc4, 0x0cc7).rw(m_q219_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0x0cc8, 0x0ccf).rw(m_q219_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write));
+	map(0x0cd0, 0x0cdc).rw(FUNC(cmi_state::video_r), FUNC(cmi_state::video_w));
+	map(0x0ce0, 0x0ce1).rw(FUNC(cmi_state::fdc_r), FUNC(cmi_state::fdc_w));
+	map(0x0ce2, 0x0cef).noprw(); // Monitor ROM will attempt to detect floppy disk controller cards in this entire range
+	map(0x0cf0, 0x0cf7).rw(m_q133_pia[0], FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0x0cf8, 0x0cff).rw(m_q133_pia[1], FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0x0cfc, 0x0cfc).w(FUNC(cmi_state::i8214_cpu1_w));
+	map(0x0cfd, 0x0cfd).w(FUNC(cmi_state::i8214_cpu2_w));
+	map(0x0d00, 0x0eff).rw(FUNC(cmi_state::shared_ram_r), FUNC(cmi_state::shared_ram_w));
+	map(0x0f00, 0x0ff7).rw(FUNC(cmi_state::scratch_ram_r<0>), FUNC(cmi_state::scratch_ram_w<0>));
+	map(0x0ff8, 0x0ff9).rw(FUNC(cmi_state::irq_ram_r<0>), FUNC(cmi_state::irq_ram_w<0>));
+	map(0x0ffa, 0x0ffd).rw(FUNC(cmi_state::scratch_ram_fa_r<0>), FUNC(cmi_state::scratch_ram_fa_w<0>));
+	map(0x0ffe, 0x0fff).r(FUNC(cmi_state::vector_r<0>));
+}
+
+void cmi_state::cpu2_periphs_map(address_map &map)
+{
+	map(0x0000, 0x07ff).rw(FUNC(cmi_state::rom_r<1>), FUNC(cmi_state::map_ram_w));
+	map(0x0800, 0x0bff).rom().region("q133", 0x1800);
+	map(0x0c40, 0x0c4f).rw(FUNC(cmi_state::parity_r), FUNC(cmi_state::mapsel_w));
+	map(0x0c5a, 0x0c5b).noprw(); // Q077 HDD controller - not installed
+	map(0x0c5e, 0x0c5e).rw(FUNC(cmi_state::atomic_r), FUNC(cmi_state::cpufunc_w));
+	map(0x0c5f, 0x0c5f).rw(FUNC(cmi_state::map_r<1>), FUNC(cmi_state::map_w<1>));
+	map(0x0c80, 0x0c83).rw(m_q133_acia[0], FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+	map(0x0c84, 0x0c87).rw(m_q133_acia[1], FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+	map(0x0c88, 0x0c8b).rw(m_q133_acia[2], FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+	map(0x0c8c, 0x0c8f).rw(m_q133_acia[3], FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+	map(0x0c90, 0x0c97).rw(m_q133_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write));
+	//map(0x0ca0, 0x0ca0).w(FUNC(cmi_state::midi_latch_w));
+	map(0x0cc0, 0x0cc3).r(FUNC(cmi_state::lightpen_r));
+	map(0x0cc4, 0x0cc7).rw(m_q219_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0x0cc8, 0x0ccf).rw(m_q219_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write));
+	map(0x0cd0, 0x0cdc).rw(FUNC(cmi_state::video_r), FUNC(cmi_state::video_w));
+	map(0x0ce0, 0x0ce1).rw(FUNC(cmi_state::fdc_r), FUNC(cmi_state::fdc_w));
+	map(0x0ce2, 0x0cef).noprw(); // Monitor ROM will attempt to detect floppy disk controller cards in this entire range
+	map(0x0cf0, 0x0cf7).rw(m_q133_pia[0], FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0x0cf8, 0x0cff).rw(m_q133_pia[1], FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0x0cfc, 0x0cfc).w(FUNC(cmi_state::i8214_cpu1_w));
+	map(0x0cfd, 0x0cfd).w(FUNC(cmi_state::i8214_cpu2_w));
+	map(0x0d00, 0x0eff).rw(FUNC(cmi_state::shared_ram_r), FUNC(cmi_state::shared_ram_w));
+	map(0x0f00, 0x0ff7).rw(FUNC(cmi_state::scratch_ram_r<1>), FUNC(cmi_state::scratch_ram_w<1>));
+	map(0x0ff8, 0x0ff9).rw(FUNC(cmi_state::irq_ram_r<1>), FUNC(cmi_state::irq_ram_w<1>));
+	map(0x0ffa, 0x0ffd).rw(FUNC(cmi_state::scratch_ram_fa_r<1>), FUNC(cmi_state::scratch_ram_fa_w<1>));
+	map(0x0ffe, 0x0fff).r(FUNC(cmi_state::vector_r<1>));
+}
+
 /* Input ports */
 static INPUT_PORTS_START( cmi2x )
 	PORT_START("LP_X")
@@ -919,9 +1240,29 @@
 	PORT_BIT( 0xffff, VBLANK_START/2, IPT_LIGHTGUN_Y) PORT_NAME ("Lightpen Y") PORT_MINMAX(0, VBLANK_START - 1) PORT_SENSITIVITY(50) PORT_CROSSHAIR(Y, 1.0, 0.0, 0)
 
 	PORT_START("LP_TOUCH")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME ( "Lightpen Touch" ) PORT_CODE( MOUSECODE_BUTTON1 )
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME ( "Lightpen Touch" ) PORT_CODE( MOUSECODE_BUTTON1 )
 INPUT_PORTS_END
 
+template <int cpunum> uint8_t cmi_state::scratch_ram_r(offs_t offset)
+{
+	return m_scratch_ram[cpunum][offset];
+}
+
+template <int cpunum> void cmi_state::scratch_ram_w(offs_t offset, uint8_t data)
+{
+	m_scratch_ram[cpunum][offset] = data;
+}
+
+template <int cpunum> uint8_t cmi_state::scratch_ram_fa_r(offs_t offset)
+{
+	return m_scratch_ram[cpunum][0xfa + offset];
+}
+
+template <int cpunum> void cmi_state::scratch_ram_fa_w(offs_t offset, uint8_t data)
+{
+	m_scratch_ram[cpunum][0xfa + offset] = data;
+}
+
 bool cmi_state::map_is_active(int cpunum, int map, uint8_t *map_info)
 {
 	if (m_cpu_active_space[cpunum] == MAPPING_A)
@@ -944,93 +1285,25 @@
 
 void cmi_state::update_address_space(int cpunum, uint8_t mapinfo)
 {
-	int map = mapinfo & 0x1f;
-	bool vram_en = !BIT(mapinfo, 5);
-	bool perr_en = BIT(mapinfo, 6);
-	bool periph_en = !BIT(mapinfo, 7);
-	int i;
-
-	address_space *space = (cpunum == 0 ? m_cpu1space : m_cpu2space);
-
-	space->unmap_readwrite(0x0000, 0xffff);
-
-	if (perr_en)
-	{
-		if (cpunum == CPU_1)
-		{
-			space->install_readwrite_handler(0x0000, 0xffff, read8sm_delegate(*this, FUNC(cmi_state::perr_r<CPU_1>)), write8sm_delegate(*this, FUNC(cmi_state::perr_w<CPU_1>)));
-		}
-		else
-		{
-			space->install_readwrite_handler(0x0000, 0xffff, read8sm_delegate(*this, FUNC(cmi_state::perr_r<CPU_2>)), write8sm_delegate(*this, FUNC(cmi_state::perr_w<CPU_2>)));
-		}
-	}
-
-	/* Step through the map RAM assignments */
-	for (int page = 0; page < PAGE_COUNT; ++page)
-	{
-		int address = page * PAGE_SIZE;
-		uint8_t page_info = 0;
-
-		/* Scan through the cards */
-		for (i = 0; i < NUM_Q256_CARDS; ++i)
-		{
-			page_info = m_map_ram[i][(map << PAGE_SHIFT) + page];
-
-			/* Page is enabled in this bank */
-			if (page_info & 0x80)
-				break;
-		}
-
-		if (BIT(m_cmi07_ctrl, 6))
-		{
-			if ((cpunum == 0) || !BIT(m_cmi07_ctrl, 7))
-			{
-				if ((m_cmi07_ctrl & 0x30) && (address & 0xc000) == ((m_cmi07_ctrl & 0x30) << 10))
-				{
-					space->install_ram(address, address + PAGE_SIZE - 1, &m_cmi07_ram[(page * PAGE_SIZE) & 0x3fff]);
-					continue;
-				}
-			}
-		}
-
-		/* No banks had this page enabled - skip */
-		if ((page_info & 0x80) == 0)
-			continue;
-
-		/* If Video RAM is enabled, don't install RAM here */
-		if (vram_en && address >= 0x8000 && address <= 0xbfff)
-			continue;
-
-		/* If peripherals are enabled, don't install RAM here */
-		if (periph_en && address >= 0xf000 && address <= 0xffff)
-			continue;
-
-		/* Now map the RAM page */
-		if (perr_en)
-		{
-			m_ram_indices[cpunum][page] = (i << 7) | (page_info & 0x7f);
-			LOG("update_address_space: m_ram_indices[%d][%02x] = %02x\n", cpunum, page, m_ram_indices[cpunum][page]);
-		}
-		else
-		{
-			space->install_ram(address, address + PAGE_SIZE - 1, &m_q256_ram[i][(page_info & 0x7f) * PAGE_SIZE]);
-		}
-	}
-
-	if (vram_en)
-		install_video_ram(cpunum);
-
-	if (periph_en)
-		install_peripherals(cpunum);
+	m_curr_mapinfo[cpunum] = mapinfo;
 }
 
 void cmi_state::cmi07_w(uint8_t data)
 {
 	LOG("%s: cmi07_w: %02x\n", machine().describe_context(), data);
 
+	if (true)
+	{
+		return;
+	}
+
+	const uint8_t prev = m_cmi07_ctrl;
 	m_cmi07_ctrl = data;
 
+	m_cmi07_base_enable[0] = BIT(data, 6) && (data & 0x30);
+	m_cmi07_base_enable[1] = m_cmi07_base_enable[0] && !BIT(data, 7);
+	m_cmi07_base_addr = (data & 0x30) << 10;
+
 	m_cmi07cpu->set_input_line(INPUT_LINE_RESET, BIT(data, 0) ? CLEAR_LINE : ASSERT_LINE);
 	m_cmi07cpu->set_input_line(M6809_FIRQ_LINE,  BIT(data, 1) ? CLEAR_LINE : ASSERT_LINE);
 	m_cmi07cpu->set_input_line(INPUT_LINE_NMI,   BIT(data, 2) ? CLEAR_LINE : ASSERT_LINE);
@@ -1040,6 +1313,10 @@
 	uint8_t map_info = (m_cpu_active_space[0] == MAPPING_A) ? m_map_sel[MAPSEL_P1_A] : m_map_sel[MAPSEL_P1_B];
 	update_address_space(0, map_info);
 
+	/* CPU 2 space is untouched by this update */
+	if (BIT(prev & data, 7))
+		return;
+
 	map_info = (m_cpu_active_space[1] == MAPPING_A) ? m_map_sel[MAPSEL_P2_A] : m_map_sel[MAPSEL_P2_B];
 	update_address_space(1, map_info);
 }
@@ -1340,31 +1617,39 @@
 	}
 	else
 	{
-		LOG("%s: CMI02 R: %x\n", machine().describe_context(), offset);
-
+		uint8_t data = 0;
 		switch (offset)
 		{
 			case 0x20: case 0x21: case 0x22: case 0x23:
-				return m_cmi02_pia[0]->read(offset & 3);
+				data = m_cmi02_pia[0]->read(offset & 3);
+				LOG("%s: CMI02 PIA 1 read (offset %d): %02x\n", machine().describe_context(), offset & 3, data);
+				return data;
 
 			case 0x26:
 				m_maincpu2->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
 				/* LS123 one-shot with 10n and 150k */
 				m_jam_timeout_timer->adjust(attotime::from_usec(675));
+				LOG("%s: CMI02 Jam Timeout timer trigger read: %02x\n", machine().describe_context(), 0xff);
 				return 0xff;
 
 			case 0x27:
 				m_maincpu2->set_input_line(INPUT_LINE_HALT, CLEAR_LINE);
+				LOG("%s: CMI02 CPU2 Unhalt read: %02x\n", machine().describe_context(), 0xff);
 				return 0xff;
 
 			case 0x28: case 0x29: case 0x2a: case 0x2b:
-				return m_cmi02_pia[1]->read(offset & 3);
+				data = m_cmi02_pia[1]->read(offset & 3);
+				LOG("%s: CMI02 PIA 2 read (offset %d): %02x\n", machine().describe_context(), offset & 3, data);
+				return data;
 
 			case 0x38: case 0x39: case 0x3a: case 0x3b: case 0x3c: case 0x3d: case 0x3e: case 0x3f:
-				return m_cmi02_ptm->read(offset & 7);
+				data = m_cmi02_ptm->read(offset & 7);
+				LOG("%s: CMI02 PTM read (offset %d): %02x\n", machine().describe_context(), offset & 7, data);
+				return data;
 
 			default:
-				return 0;
+				LOG("%s: CMI02 Unknown read (offset %02x): %02x\n", machine().describe_context(), offset, 0x00);
+				return data;
 		}
 	}
 }
@@ -1383,44 +1668,44 @@
 	}
 	else
 	{
-		if (offset == 0x30)
-		{
-			LOG("%s: CMI02 W: %x %x, clearing IRQ merger bit 1\n", machine().describe_context(), offset, data);
-		}
-		else
-		{
-			LOG("%s: CMI02 W: %x %x\n", machine().describe_context(), offset, data);
-		}
-
 		switch (offset)
 		{
 			case 0x20: case 0x21: case 0x22: case 0x23:
+				LOG("%s: CMI02 PIA 1 write (offset %d): %02x\n", machine().describe_context(), offset & 3, data);
 				m_cmi02_pia[0]->write(offset & 3, data);
 				break;
 
 			case 0x28: case 0x29: case 0x2a: case 0x2b:
+				LOG("%s: CMI02 PIA 2 write (offset %d): %02x\n", machine().describe_context(), offset & 3, data);
 				m_cmi02_pia[1]->write(offset & 3, data);
 				break;
 
 			case 0x30:
-				m_maincpu1_irq_merger->in_w<1>(0);
+				LOG("%s: CMI02 PICU 3 B/SGS write (clearing main CPU IRQ merger, clearing high-prio IRQ): %02x\n", machine().describe_context(), data);
 				m_hp_int = 0;
+				m_maincpu1_irq_merger->in_w<1>(0);
+				//if (m_lp_int == 0)
+				//  m_maincpu1->set_input_line(M6809_IRQ_LINE, CLEAR_LINE);
 				m_i8214[2]->b_sgs_w(~(data & 0xf));
 				break;
 
 			case 0x31: case 0x32:
+				LOG("%s: CMI02 INTP1 %s write: %02x\n", machine().describe_context(), (offset & 2) ? "clear" : "set", data);
 				set_interrupt(0, IRQ_INTP1_LEVEL, (offset & 2) ? CLEAR_LINE : ASSERT_LINE);
 				break;
 
 			case 0x33: case 0x34:
+				LOG("%s: CMI02 INTP2 %s write: %02x\n", machine().describe_context(), (offset & 4) ? "clear" : "set", data);
 				set_interrupt(1, IRQ_INTP2_LEVEL, (offset & 4) ? CLEAR_LINE : ASSERT_LINE);
 				break;
 
 			case 0x38: case 0x39: case 0x3a: case 0x3b: case 0x3c: case 0x3d: case 0x3e: case 0x3f:
+				LOG("%s: CMI02 PTM write (offset %d): %02x\n", machine().describe_context(), offset & 7, data);
 				m_cmi02_ptm->write(offset & 7, data);
 				break;
 
 			default:
+				LOG("%s: CMI02 Unknown write (offset %02x): %02x\n", machine().describe_context(), offset, data);
 				break;
 		}
 	}
@@ -1432,17 +1717,13 @@
 	set_interrupt(CPU_1, ch_int_levels[Channel], state);
 }
 
-void cmi_state::install_video_ram(int cpunum)
-{
-	address_space *space = (cpunum == CPU_1 ? m_cpu1space : m_cpu2space);
-
-	space->install_readwrite_handler(0x8000, 0xbfff, read8sm_delegate(*this, FUNC(cmi_state::vram_r)), write8sm_delegate(*this, FUNC(cmi_state::vram_w)));
-}
-
 void cmi_state::i8214_cpu1_w(uint8_t data)
 {
-	LOG("%s: i8214_cpu1_w, clearing IRQ merger bit 0: %02x\n", machine().describe_context(), data);
+	//LOG("%s: i8214_cpu1_w, clearing IRQ merger bit 0: %02x\n", machine().describe_context(), data);
 	m_maincpu1_irq_merger->in_w<0>(0);
+	m_lp_int = 0;
+	//if (m_hp_int == 0)
+	//  m_maincpu1->set_input_line(M6809_IRQ_LINE, CLEAR_LINE);
 	m_i8214[0]->b_sgs_w(~(data & 0xf));
 }
 
@@ -1454,22 +1735,6 @@
 	m_i8214[1]->b_sgs_w(~(data & 0xf));
 }
 
-template<int cpunum> uint8_t cmi_state::perr_r(offs_t offset)
-{
-	m_maincpu2_irq0_merger->in_w<1>(1);
-	const uint8_t ram_index = m_ram_indices[cpunum][offset / PAGE_SIZE];
-	const uint8_t data = m_q256_ram[BIT(ram_index, 7)][(ram_index & 0x7f) * PAGE_SIZE + offset % PAGE_SIZE];
-	LOG("%s: perr_r: offset %04x, RAM index %02x, value %02x\n", machine().describe_context(), offset, ram_index, data);
-	return data;
-}
-
-template<int cpunum> void cmi_state::perr_w(offs_t offset, uint8_t data)
-{
-	const uint8_t ram_index = m_ram_indices[cpunum][offset / PAGE_SIZE];
-	m_q256_ram[BIT(ram_index, 7)][(ram_index & 0x7f) * PAGE_SIZE + offset % PAGE_SIZE] = data;
-}
-
-// TODO: replace with share()
 uint8_t cmi_state::shared_ram_r(offs_t offset)
 {
 	return m_shared_ram[offset];
@@ -1477,15 +1742,16 @@
 
 void cmi_state::shared_ram_w(offs_t offset, uint8_t data)
 {
-	//logerror("shared_ram_w: %04x = %02x\n", 0xfe00 + offset, data);
 	m_shared_ram[offset] = data;
 }
 
 uint8_t cmi_state::aic_ad574_r()
 {
-	LOG("%s: AIC AD574 read\n", machine().describe_context());
-	// To Do
-	return 0;
+	const bool adca = BIT(m_aic_mux_latch, 5); // false - MSB, true - LSB
+	const uint16_t val = m_aic_ad565_in[m_aic_mux_latch & 0x07];
+	const uint8_t data = adca ? ((uint8_t)val) : (val >> 8);
+	LOG("%s: AIC AD574 read: %02x\n", machine().describe_context(), data);
+	return data;
 }
 
 template<int Dac> void cmi_state::aic_dac_w(uint8_t data)
@@ -1497,84 +1763,37 @@
 void cmi_state::aic_mux_latch_w(uint8_t data)
 {
 	LOG("%s: AIC mux latch write: %02x\n", machine().describe_context(), data);
-	set_interrupt(CPU_1, IRQ_AIC_LEVEL, (BIT(data, 6) && BIT(data, 7)) ? ASSERT_LINE : CLEAR_LINE);
-	// To Do
+	set_interrupt(CPU_1, IRQ_AIC_LEVEL, BIT(data, 7) ? ASSERT_LINE : CLEAR_LINE);
+	if (data & 0x07)
+	{
+		m_aic_mux_latch = data;
+	}
+	else
+	{
+		m_aic_mux_latch &= 0x07;
+		m_aic_mux_latch |= data & 0xf8;
+	}
+	if (!BIT(data, 6))
+	{
+		LOG("%s: ADCR is 0, initiating ADC conversion request\n", machine().describe_context());
+		m_aic_ad565_in[m_aic_mux_latch & 0x07] = 0;
+	}
 }
 
 void cmi_state::aic_ad565_msb_w(uint8_t data)
 {
-	LOG("%s: AIC AD565 MSB write: %02x\n", machine().describe_context(), data);
-	// To Do
+	m_aic_ad565_in[m_aic_mux_latch & 0x07] &= 0x00ff;
+	m_aic_ad565_in[m_aic_mux_latch & 0x07] |= (uint16_t)data << 8;
+	LOG("%s: AIC AD565 MSB write: %02x, input %04x\n", machine().describe_context(), data, m_aic_ad565_in[m_aic_mux_latch & 0x07]);
 }
 
 void cmi_state::aic_ad565_lsb_w(uint8_t data)
 {
 	LOG("%s: AIC AD565 LSB write: %02x\n", machine().describe_context(), data);
-	// To Do
+	m_aic_ad565_in[m_aic_mux_latch & 0x07] &= 0xff00;
+	m_aic_ad565_in[m_aic_mux_latch & 0x07] |= data;
 }
 
-void cmi_state::install_peripherals(int cpunum)
-{
-	address_space *space = (cpunum == CPU_1 ? m_cpu1space : m_cpu2space);
-
-	space->install_readwrite_handler(0xe000, 0xe03f, read8sm_delegate(*this, FUNC(cmi_state::cmi02_r)), write8sm_delegate(*this, FUNC(cmi_state::cmi02_w)));
-
-	if (cpunum)
-		space->install_readwrite_handler(0xf000, 0xf7ff, read8sm_delegate(*this, FUNC(cmi_state::rom_r<1>)), write8sm_delegate(*this, FUNC(cmi_state::map_ram_w)));
-	else
-		space->install_readwrite_handler(0xf000, 0xf7ff, read8sm_delegate(*this, FUNC(cmi_state::rom_r<0>)), write8sm_delegate(*this, FUNC(cmi_state::map_ram_w)));
-
-	space->install_rom(0xf800, 0xfbff, m_q133_rom + (cpunum == CPU_2 ? 0x1800 : 0x2800));
-
-	space->install_readwrite_handler(0xfc40, 0xfc4f, read8sm_delegate(*this, FUNC(cmi_state::parity_r)), write8sm_delegate(*this, FUNC(cmi_state::mapsel_w)));
-	space->nop_readwrite(0xfc5a, 0xfc5b); // Q077 HDD controller - not installed
-	space->install_readwrite_handler(0xfc5e, 0xfc5e, read8smo_delegate(*this, FUNC(cmi_state::atomic_r)), write8smo_delegate(*this, FUNC(cmi_state::cpufunc_w)));
-	if (cpunum)
-		space->install_readwrite_handler(0xfc5f, 0xfc5f, read8smo_delegate(*this, FUNC(cmi_state::map_r<1>)), write8smo_delegate(*this, FUNC(cmi_state::map_w<1>)));
-	else
-		space->install_readwrite_handler(0xfc5f, 0xfc5f, read8smo_delegate(*this, FUNC(cmi_state::map_r<0>)), write8smo_delegate(*this, FUNC(cmi_state::map_w<0>)));
-
-	space->install_readwrite_handler(0xfc80, 0xfc83, read8sm_delegate(*m_q133_acia[0], FUNC(mos6551_device::read)), write8sm_delegate(*m_q133_acia[0], FUNC(mos6551_device::write)));
-	space->install_readwrite_handler(0xfc84, 0xfc87, read8sm_delegate(*m_q133_acia[1], FUNC(mos6551_device::read)), write8sm_delegate(*m_q133_acia[1], FUNC(mos6551_device::write)));
-	space->install_readwrite_handler(0xfc88, 0xfc8b, read8sm_delegate(*m_q133_acia[2], FUNC(mos6551_device::read)), write8sm_delegate(*m_q133_acia[2], FUNC(mos6551_device::write)));
-	space->install_readwrite_handler(0xfc8c, 0xfc8f, read8sm_delegate(*m_q133_acia[3], FUNC(mos6551_device::read)), write8sm_delegate(*m_q133_acia[3], FUNC(mos6551_device::write)));
-	space->install_readwrite_handler(0xfc90, 0xfc97, read8sm_delegate(*m_q133_ptm, FUNC(ptm6840_device::read)), write8sm_delegate(*m_q133_ptm, FUNC(ptm6840_device::write)));
-
-	space->install_write_handler(0xfca0, 0xfca0, write8smo_delegate(*this, FUNC(cmi_state::midi_latch_w)));
-
-	space->install_readwrite_handler(0xfcbc, 0xfcbc, read8smo_delegate(*this, FUNC(cmi_state::cmi07_r)), write8smo_delegate(*this, FUNC(cmi_state::cmi07_w)));
-
-	space->install_read_handler(0xfcc0, 0xfcc3, read8sm_delegate(*this, FUNC(cmi_state::lightpen_r)));
-	space->install_readwrite_handler(0xfcc4, 0xfcc7, read8sm_delegate(*m_q219_pia, FUNC(pia6821_device::read)), write8sm_delegate(*m_q219_pia, FUNC(pia6821_device::write)));
-	space->install_readwrite_handler(0xfcc8, 0xfccf, read8sm_delegate(*m_q219_ptm, FUNC(ptm6840_device::read)), write8sm_delegate(*m_q219_ptm, FUNC(ptm6840_device::write)));
-	space->install_readwrite_handler(0xfcd0, 0xfcdc, read8sm_delegate(*this, FUNC(cmi_state::video_r)), write8sm_delegate(*this, FUNC(cmi_state::video_w)));
-	space->install_readwrite_handler(0xfce0, 0xfce1, read8sm_delegate(*this, FUNC(cmi_state::fdc_r)), write8sm_delegate(*this, FUNC(cmi_state::fdc_w)));
-	space->nop_readwrite(0xfce2, 0xfcef); // Monitor ROM will attempt to detect floppy disk controller cards in this entire range
-	space->install_readwrite_handler(0xfcf0, 0xfcf7, read8sm_delegate(*m_q133_pia[0], FUNC(pia6821_device::read)), write8sm_delegate(*m_q133_pia[0], FUNC(pia6821_device::write)));
-	space->install_readwrite_handler(0xfcf8, 0xfcff, read8sm_delegate(*m_q133_pia[1], FUNC(pia6821_device::read)), write8sm_delegate(*m_q133_pia[1], FUNC(pia6821_device::write)));
-
-	space->install_write_handler(0xfcfc, 0xfcfc, write8smo_delegate(*this, FUNC(cmi_state::i8214_cpu1_w)));
-	space->install_write_handler(0xfcfd, 0xfcfd, write8smo_delegate(*this, FUNC(cmi_state::i8214_cpu2_w)));
-
-	space->install_readwrite_handler(0xfd00, 0xfeff, read8sm_delegate(*this, FUNC(cmi_state::shared_ram_r)), write8sm_delegate(*this, FUNC(cmi_state::shared_ram_w)));
-
-	space->install_ram(0xff00, 0xfff7, &m_scratch_ram[cpunum][0]);
-	space->install_ram(0xfffa, 0xfffd, &m_scratch_ram[cpunum][0xfa]);
-
-	if (cpunum)
-	{
-		space->install_readwrite_handler(0xfff8, 0xfff9, read8sm_delegate(*this, FUNC(cmi_state::irq_ram_r<1>)), write8sm_delegate(*this, FUNC(cmi_state::irq_ram_w<1>)));
-		space->install_read_handler(0xfffe, 0xffff, read8sm_delegate(*this, FUNC(cmi_state::vector_r<1>)));
-	}
-	else
-	{
-		space->install_readwrite_handler(0xd000, 0xdfff, read8smo_delegate(*this, FUNC(cmi_state::tvt_r)), write8smo_delegate(*this, FUNC(cmi_state::tvt_w)));
-		space->install_readwrite_handler(0xfff8, 0xfff9, read8sm_delegate(*this, FUNC(cmi_state::irq_ram_r<0>)), write8sm_delegate(*this, FUNC(cmi_state::irq_ram_w<0>)));
-		space->install_read_handler(0xfffe, 0xffff, read8sm_delegate(*this, FUNC(cmi_state::vector_r<0>)));
-	}
-}
-
-
 /*************************************
  *
  *  Interrupt Handling
@@ -1603,6 +1822,10 @@
 
 		LOG("%s: CPU1 interrupt, will be pushing address %02x%02x\n", machine().describe_context(), m_irq_address[CPU_1][0], m_irq_address[CPU_1][1]);
 	}
+	else
+	{
+		LOG("%s: Some other CPU1 interrupt, line %d\n", irqline);
+	}
 
 	return 0;
 }
@@ -1646,9 +1869,6 @@
 	{
 		m_i8214[1]->r_all_w(~m_int_state[cpunum]);
 	}
-
-	//i8214_device *i8214 = ((cpunum == CPU_2) ? m_i8214[1] : (level < 8 ? m_i8214[2] : m_i8214[0]));
-	//i8214->r_w(level & 7, state ? 0 : 1);
 }
 
 WRITE_LINE_MEMBER( cmi_state::maincpu1_irq_w )
@@ -1668,7 +1888,8 @@
 	LOG("%s: i8214_1_int_w %d%s\n", machine().describe_context(), state, state ? ", setting IRQ merger bit 0" : "");
 	if (state)
 	{
-		m_hp_int = 0;
+		m_lp_int = 1;
+		//m_maincpu1->set_input_line(M6809_IRQ_LINE, ASSERT_LINE);
 		m_maincpu1_irq_merger->in_w<0>(state);
 	}
 }
@@ -1688,6 +1909,9 @@
 		m_hp_int = 1;
 		m_maincpu1_irq_merger->in_w<1>(state);
 	}
+	//m_hp_int = 1;
+	//m_maincpu1->set_input_line(M6809_IRQ_LINE, ASSERT_LINE);
+	//m_maincpu1->set_input_line(M6809_IRQ_LINE, state ? ASSERT_LINE : CLEAR_LINE);
 }
 
 
@@ -1796,13 +2020,9 @@
 	{
 		address_space *space = (cpunum == CPU_1 ? m_cpu1space : m_cpu2space);
 
-		space->unmap_readwrite(0x0000, 0xffff);
-
 		/* Select A (system) spaces */
 		m_cpu_active_space[cpunum] = MAPPING_A;
 
-		install_peripherals(cpunum);
-
 		m_irq_address[cpunum][0] = space->read_byte(0xfff8);
 		m_irq_address[cpunum][1] = space->read_byte(0xfff9);
 	}
@@ -1812,13 +2032,32 @@
 
 	/* CMI-07 */
 	m_cmi07_ctrl = 0;
+	m_cmi07_base_enable[0] = false;
+	m_cmi07_base_enable[1] = false;
+	m_cmi07_base_addr = 0;
 	m_cmi07cpu->set_input_line(INPUT_LINE_RESET, ASSERT_LINE);
 
+	// SMIDI
+	m_midicpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
+
 	m_cmi02_ptm_irq = 0;
+	m_cmi02_ptm->set_c2(1);
+	m_cmi02_ptm->set_g1(0);
+	m_cmi02_ptm->set_g2(0);
+	m_cmi02_ptm->set_g3(0);
 	m_m6809_bs_hack_cnt[0] = 0;
 	m_m6809_bs_hack_cnt[1] = 0;
 
 	memset(m_map_sel, 0, 16);
+
+	for (int i = 0; i < 4; i++)
+	{
+		m_q133_acia[i]->write_dsr(0);
+		m_q133_acia[i]->write_dcd(0);
+	}
+
+	m_curr_mapinfo[0] = 0x00;
+	m_curr_mapinfo[1] = 0x00;
 }
 
 void cmi_state::machine_start()
@@ -1885,6 +2124,12 @@
 	m_maincpu2->set_addrmap(AS_PROGRAM, &cmi_state::maincpu2_map);
 	m_maincpu2->set_irq_acknowledge_callback(FUNC(cmi_state::cpu2_interrupt_callback));
 
+	ADDRESS_MAP_BANK(config, m_cpu1_periphs).set_options(ENDIANNESS_BIG, 8, 16, 0x1000);
+	m_cpu1_periphs->set_addrmap(AS_PROGRAM, &cmi_state::cpu1_periphs_map);
+
+	ADDRESS_MAP_BANK(config, m_cpu2_periphs).set_options(ENDIANNESS_BIG, 8, 16, 0x1000);
+	m_cpu2_periphs->set_addrmap(AS_PROGRAM, &cmi_state::cpu2_periphs_map);
+
 	M68000(config, m_midicpu, 20_MHz_XTAL / 2);
 	m_midicpu->set_addrmap(AS_PROGRAM, &cmi_state::midicpu_map);
 
@@ -1947,7 +2192,8 @@
 	m_cmi02_pia[1]->readca1_handler().set(FUNC(cmi_state::cmi02_pia2_ca1_r));
 	m_cmi02_pia[1]->cb2_handler().set(FUNC(cmi_state::cmi02_pia2_cb2_w));
 
-	PTM6840(config, m_cmi02_ptm, SYSTEM_CAS_CLOCK); // ptm_cmi02_config, clock is incorrect
+	PTM6840(config, m_cmi02_ptm, SYSTEM_CAS_CLOCK);
+	m_cmi02_ptm->set_external_clocks(0, 0, 0);
 	m_cmi02_ptm->o2_callback().set(FUNC(cmi_state::cmi02_ptm_o2));
 	m_cmi02_ptm->irq_callback().set(FUNC(cmi_state::cmi02_ptm_irq));
 
@@ -2034,28 +2280,28 @@
 
 	// Channel cards
 	cmi01a_device &cmi01a_0(CMI01A_CHANNEL_CARD(config, "cmi01a_0", SYSTEM_CAS_CLOCK, 0));
-	cmi01a_0.add_route(ALL_OUTPUTS, "mono", 0.25);
+	cmi01a_0.add_route(ALL_OUTPUTS, "mono", 0.12);
 	cmi01a_0.irq_callback().set(FUNC(cmi_state::channel_irq<0>));
 	cmi01a_device &cmi01a_1(CMI01A_CHANNEL_CARD(config, "cmi01a_1", SYSTEM_CAS_CLOCK, 1));
-	cmi01a_1.add_route(ALL_OUTPUTS, "mono", 0.25);
+	cmi01a_1.add_route(ALL_OUTPUTS, "mono", 0.12);
 	cmi01a_1.irq_callback().set(FUNC(cmi_state::channel_irq<1>));
 	cmi01a_device &cmi01a_2(CMI01A_CHANNEL_CARD(config, "cmi01a_2", SYSTEM_CAS_CLOCK, 2));
-	cmi01a_2.add_route(ALL_OUTPUTS, "mono", 0.25);
+	cmi01a_2.add_route(ALL_OUTPUTS, "mono", 0.12);
 	cmi01a_2.irq_callback().set(FUNC(cmi_state::channel_irq<2>));
 	cmi01a_device &cmi01a_3(CMI01A_CHANNEL_CARD(config, "cmi01a_3", SYSTEM_CAS_CLOCK, 3));
-	cmi01a_3.add_route(ALL_OUTPUTS, "mono", 0.25);
+	cmi01a_3.add_route(ALL_OUTPUTS, "mono", 0.12);
 	cmi01a_3.irq_callback().set(FUNC(cmi_state::channel_irq<3>));
 	cmi01a_device &cmi01a_4(CMI01A_CHANNEL_CARD(config, "cmi01a_4", SYSTEM_CAS_CLOCK, 4));
-	cmi01a_4.add_route(ALL_OUTPUTS, "mono", 0.25);
+	cmi01a_4.add_route(ALL_OUTPUTS, "mono", 0.12);
 	cmi01a_4.irq_callback().set(FUNC(cmi_state::channel_irq<4>));
 	cmi01a_device &cmi01a_5(CMI01A_CHANNEL_CARD(config, "cmi01a_5", SYSTEM_CAS_CLOCK, 5));
-	cmi01a_5.add_route(ALL_OUTPUTS, "mono", 0.25);
+	cmi01a_5.add_route(ALL_OUTPUTS, "mono", 0.12);
 	cmi01a_5.irq_callback().set(FUNC(cmi_state::channel_irq<5>));
 	cmi01a_device &cmi01a_6(CMI01A_CHANNEL_CARD(config, "cmi01a_6", SYSTEM_CAS_CLOCK, 6));
-	cmi01a_6.add_route(ALL_OUTPUTS, "mono", 0.25);
+	cmi01a_6.add_route(ALL_OUTPUTS, "mono", 0.12);
 	cmi01a_6.irq_callback().set(FUNC(cmi_state::channel_irq<6>));
 	cmi01a_device &cmi01a_7(CMI01A_CHANNEL_CARD(config, "cmi01a_7", SYSTEM_CAS_CLOCK, 7));
-	cmi01a_7.add_route(ALL_OUTPUTS, "mono", 0.25);
+	cmi01a_7.add_route(ALL_OUTPUTS, "mono", 0.12);
 	cmi01a_7.irq_callback().set(FUNC(cmi_state::channel_irq<7>));
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/compuchess.cpp mame-0.224+dfsg.1/src/mame/drivers/compuchess.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/compuchess.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/compuchess.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,37 +1,66 @@
 // license:BSD-3-Clause
 // copyright-holders:Peter Trauner, Wilbert Pol, hap
-// thanks-to:Sean Riddle
+// thanks-to:Sean Riddle, Berger
 /******************************************************************************
 
 DCS CompuChess / Novag Chess Champion MK I
-Initial version by PeT mess@utanet.at 2000,2001.
+Initial driver version by PeT mess@utanet.at 2000,2001.
 Driver largely rewritten over the years.
 
+To start playing, enter difficulty level (1-6), then when it says "bP", press A
+for new game, B for empty board, or C for continue.
+
 TODO:
 - cncchess sound is wrong, it should be a long dual-tone alarm sound
-- verify CPU speed (cmpchess XTAL is not 100% certain)
-- dump/add cmpchess2
 
 BTANB:
+- cmpchess/cmpchess2 accepts illegal moves (Conic fixed that)
 - digits may flash briefly after entering a command, eg. the "b" or "P" digit
   after setting board preset, this happens on the real device
 
-*******************************************************************************
+===============================================================================
+
+DataCash Systems's CompuChess released mid-1977. One of the first chess
+computers, the first one being Fidelity Chess Challenger (fidel_cc1.cpp)
+
+Hardware notes:
+- PCB label: CompuChess 1, STAID INC, REV A, 7-77
+- Fairchild 3850PK, 2MHz XTAL
+- Fairchild 3853PK
+- 2KB ROM, 256 bytes RAM(2*D2101AL-4)
+- 4-digit 7seg led display, no sound
+
+CompuChess 2nd edition is on the same PCB, but with a 3.57MHz XTAL(!), a 3850PC,
+and Mostek MK3853N. The MCU speed was also confirmed with move calculation time.
+
+2nd edition added 3 new game modes: E for "Game of Knights", F for "Amazon Queen",
+and G for "Survival".
+
+===============================================================================
 
-Data Cash Systems's CompuChess (1977, one of the first chess computers).
-The game underneath is better known as Novag's MK I, it was an unlicensed clone.
-The ROM is identical. DCS sued JS&A / Novag Industries for copyright infringement
-and somehow didn't manage to win the case.
+The game underneath CompuChess is better known as Novag's MK I, it was an
+unlicensed clone. The ROM is identical. DCS sued JS&A / Novag Industries for
+copyright infringement and somehow didn't manage to win the case.
 
 Unlike CompuChess, MK I was a large success, we can assume that it kickstarted
 Novag's chess computer generation. It was also distributed as "Computer Chess"
-by JS&A, in the same casing as MK I.
+by JS&A, in the same housing as MK I.
 
-To start playing, enter difficulty level (1-6), then when it says "bP", press A
-for new game, B for empty board, or C for continue.
+MCU frequency is with an LC circuit. The first version was around 5% faster than
+CompuChess, the JS&A version was measured 2.18MHz on average. The 2nd version was
+much faster, judging from move calculation time: around 3.5MHz(give or take 0.2).
+
+1st (slow) version:
+- Novag MK I with Boris Spassky photo on the box
+- JS&A Computer Chess
+
+2nd (fast) version:
+- Novag MK I with Karpov photo on the box, later advertised with message
+  "Neu: Mit Quick-Electronic für Schnelle Gegenzüge"
+- Waddingtons Videomaster Chess Champion
 
 MK I hardware description:
-- An F8 3850 CPU accompanied by a 3853 memory interface, approx 2MHz
+- An F8 3850 CPU accompanied by a 3853 memory interface
   Variations seen:
   - MOSTEK MK 3853N 7915 Philippines (static memory interface for F8)
   - MOSTEK MK 3850N-3 7917 Philipines (Fairchild F8 CPU)
@@ -57,15 +86,16 @@
 - Hardware addressing is controlled by a HBF4001AE.
 - No speaker.
 
-*******************************************************************************
+===============================================================================
 
 Conic Computer Chess (aka Master I in Germany) is also based on DCS CompuChess,
-probably the 2nd edition. Conic have done a few changes, not enough to hide that
-they 'borrowed' code from CompuChess. They also added a piezo circuit.
+this time the 2nd edition. Conic have done a few changes, not enough to hide that
+they 'borrowed' code. They also added a piezo circuit.
 
-Fairchild 3850PK CPU @ 2MHz (LC circuit), 3853PK
-2KB ROM (3216), 256 bytes RAM (2*2111A)
-555, 4001, 4011 for display blinking and beeper
+Hardware notes:
+- Fairchild 3850PK CPU @ 2MHz (LC circuit), 3853PK
+- 2KB ROM (3216), 256 bytes RAM (2*2111A)
+- 555, 4001, 4011 for display blinking and beeper
 
 "bP" buttons are F, G, H (instead of A, B, C)
 
@@ -82,7 +112,7 @@
 // internal artwork
 #include "cmpchess.lh" // clickable
 #include "novag_mk1.lh" // clickable
-#include "cncchess.lh" // clickable
+#include "conic_cchess.lh" // clickable
 
 
 namespace {
@@ -100,11 +130,13 @@
 	{ }
 
 	DECLARE_INPUT_CHANGED_MEMBER(reset_switch) { update_reset(newval); }
+	DECLARE_INPUT_CHANGED_MEMBER(change_cpu_freq) { update_cpu_freq(newval); }
 
 	// machine configs
 	void cmpchess(machine_config &config);
+	void cmpchess2(machine_config &config);
 	void mk1(machine_config &config);
-	void cnc(machine_config &config);
+	void cncchess(machine_config &config);
 
 protected:
 	virtual void machine_start() override;
@@ -121,38 +153,34 @@
 	// address maps
 	void main_map(address_map &map);
 	void main_io(address_map &map);
-	void cnc_io(address_map &map);
+	void cncchess_map(address_map &map);
+	void cncchess_io(address_map &map);
 
 	TIMER_DEVICE_CALLBACK_MEMBER(beeper_off) { m_beeper->set_state(0); }
 	TIMER_DEVICE_CALLBACK_MEMBER(blink) { m_blink = !m_blink; update_display(); }
 	void update_display();
 	void update_reset(ioport_value state);
+	void update_cpu_freq(ioport_value state);
 
 	// I/O handlers
-	u8 beeper_r(offs_t offset);
 	void input_w(u8 data);
 	u8 input_r();
 	void digit_select_w(u8 data);
 	void digit_data_w(u8 data);
 	u8 digit_data_r();
+	u8 beeper_r(offs_t offset);
 
 	void input_digit_select_w(u8 data) { input_w(data); digit_select_w(data); }
 	void input_digit_data_w(u8 data) { input_w(data); digit_data_w(data); }
 
-	u8 m_inp_mux;
-	u8 m_digit_select;
-	u8 m_digit_data;
-	bool m_blink;
+	u8 m_inp_mux = 0;
+	u8 m_digit_select = 0;
+	u8 m_digit_data = 0;
+	bool m_blink = false;
 };
 
 void cmpchess_state::machine_start()
 {
-	// zerofill
-	m_inp_mux = 0;
-	m_digit_select = 0;
-	m_digit_data = 0;
-	m_blink = false;
-
 	// register for savestates
 	save_item(NAME(m_inp_mux));
 	save_item(NAME(m_digit_select));
@@ -162,6 +190,9 @@
 
 void cmpchess_state::machine_reset()
 {
+	if (ioport("FAKE") != nullptr)
+		update_cpu_freq(ioport("FAKE")->read());
+
 	update_reset(ioport("RESET")->read());
 }
 
@@ -175,24 +206,20 @@
 		m_display->clear();
 }
 
+void cmpchess_state::update_cpu_freq(ioport_value state)
+{
+	// 2 MK I versions, 2nd one was a lot faster
+	const u32 freq = state ? 3500000 : 2250000;
+	m_maincpu->set_unscaled_clock(freq);
+	subdevice<f3853_device>("smi")->set_unscaled_clock(freq);
+}
+
 
 
 /******************************************************************************
     I/O
 ******************************************************************************/
 
-u8 cmpchess_state::beeper_r(offs_t offset)
-{
-	// cncchess: trigger beeper
-	if (!machine().side_effects_disabled() && m_beeper != nullptr)
-	{
-		m_beeper->set_state(1);
-		m_beeper_off->adjust(attotime::from_msec(50)); // wrong, see TODO
-	}
-
-	return m_maincpu->space(AS_PROGRAM).read_byte(offset);
-}
-
 void cmpchess_state::update_display()
 {
 	// display panel goes into automated blink mode if DP segment is held high,
@@ -247,6 +274,18 @@
 	return data;
 }
 
+u8 cmpchess_state::beeper_r(offs_t offset)
+{
+	// cncchess: trigger beeper
+	if (!machine().side_effects_disabled())
+	{
+		m_beeper->set_state(1);
+		m_beeper_off->adjust(attotime::from_msec(50)); // wrong, see TODO
+	}
+
+	return m_maincpu->space(AS_PROGRAM).read_byte(offset);
+}
+
 
 
 /******************************************************************************
@@ -255,9 +294,9 @@
 
 void cmpchess_state::main_map(address_map &map)
 {
+	map.global_mask(0x0fff);
 	map(0x0000, 0x07ff).rom();
-	map(0x1800, 0x18ff).ram();
-	map(0x8000, 0xffff).r(FUNC(cmpchess_state::beeper_r));
+	map(0x0800, 0x08ff).mirror(0x0700).ram();
 }
 
 void cmpchess_state::main_io(address_map &map)
@@ -267,7 +306,14 @@
 	map(0x0c, 0x0f).rw("smi", FUNC(f3853_device::read), FUNC(f3853_device::write));
 }
 
-void cmpchess_state::cnc_io(address_map &map)
+void cmpchess_state::cncchess_map(address_map &map)
+{
+	map(0x0000, 0x07ff).rom();
+	map(0x1800, 0x18ff).ram();
+	map(0x8000, 0xffff).r(FUNC(cmpchess_state::beeper_r));
+}
+
+void cmpchess_state::cncchess_io(address_map &map)
 {
 	map(0x00, 0x00).rw(FUNC(cmpchess_state::digit_data_r), FUNC(cmpchess_state::digit_data_w));
 	map(0x01, 0x01).rw(FUNC(cmpchess_state::input_r), FUNC(cmpchess_state::input_digit_select_w));
@@ -306,7 +352,19 @@
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD) PORT_NAME("5 / Black Knight")
 
 	PORT_START("RESET")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CODE(KEYCODE_F1) PORT_TOGGLE PORT_CHANGED_MEMBER(DEVICE_SELF, cmpchess_state, reset_switch, 0) PORT_NAME("Reset Switch") // L.S. switch on the MK I
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CODE(KEYCODE_F1) PORT_TOGGLE PORT_CHANGED_MEMBER(DEVICE_SELF, cmpchess_state, reset_switch, 0) PORT_NAME("Reset Switch")
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( mk1 )
+	PORT_INCLUDE( cmpchess )
+
+	PORT_MODIFY("RESET")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_CODE(KEYCODE_F1) PORT_TOGGLE PORT_CHANGED_MEMBER(DEVICE_SELF, cmpchess_state, reset_switch, 0) PORT_NAME("L.S. Switch")
+
+	PORT_START("FAKE")
+	PORT_CONFNAME( 0x01, 0x00, "CPU Frequency" ) PORT_CHANGED_MEMBER(DEVICE_SELF, cmpchess_state, change_cpu_freq, 0) // factory set
+	PORT_CONFSETTING(    0x00, "2.25MHz (Spassky packaging)" )
+	PORT_CONFSETTING(    0x01, "3.5MHz (Karpov packaging)" )
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( cncchess )
@@ -347,12 +405,12 @@
 void cmpchess_state::cmpchess(machine_config &config)
 {
 	/* basic machine hardware */
-	F8(config, m_maincpu, 3.579545_MHz_XTAL/2); // Fairchild 3850PK
+	F8(config, m_maincpu, 2_MHz_XTAL);
 	m_maincpu->set_addrmap(AS_PROGRAM, &cmpchess_state::main_map);
 	m_maincpu->set_addrmap(AS_IO, &cmpchess_state::main_io);
 	m_maincpu->set_irq_acknowledge_callback("smi", FUNC(f3853_device::int_acknowledge));
 
-	f3853_device &smi(F3853(config, "smi", 3.579545_MHz_XTAL/2));
+	f3853_device &smi(F3853(config, "smi", 2_MHz_XTAL));
 	smi.int_req_callback().set_inputline("maincpu", F8_INPUT_LINE_INT_REQ);
 
 	/* video hardware */
@@ -360,7 +418,17 @@
 	m_display->set_segmask(0xf, 0xff);
 	config.set_default_layout(layout_cmpchess);
 
-	TIMER(config, "blink_display").configure_periodic(FUNC(cmpchess_state::blink), attotime::from_msec(200)); // approximation
+	const attotime blink_period = attotime::from_msec(200); // approximation
+	TIMER(config, "blink_display").configure_periodic(FUNC(cmpchess_state::blink), blink_period);
+}
+
+void cmpchess_state::cmpchess2(machine_config &config)
+{
+	cmpchess(config);
+
+	/* basic machine hardware */
+	m_maincpu->set_clock(3.579545_MHz_XTAL);
+	subdevice<f3853_device>("smi")->set_clock(3.579545_MHz_XTAL);
 }
 
 void cmpchess_state::mk1(machine_config &config)
@@ -368,22 +436,24 @@
 	cmpchess(config);
 
 	/* basic machine hardware */
-	m_maincpu->set_clock(2250000); // JS&A version measured 2.18MHz on average
+	m_maincpu->set_clock(2250000); // see notes
 	subdevice<f3853_device>("smi")->set_clock(2250000);
 
 	config.set_default_layout(layout_novag_mk1);
 }
 
-void cmpchess_state::cnc(machine_config &config)
+void cmpchess_state::cncchess(machine_config &config)
 {
-	cmpchess(config);
+	cmpchess2(config);
 
 	/* basic machine hardware */
-	m_maincpu->set_addrmap(AS_IO, &cmpchess_state::cnc_io);
 	m_maincpu->set_clock(2000000); // LC circuit, measured 2MHz
+	m_maincpu->set_addrmap(AS_PROGRAM, &cmpchess_state::cncchess_map);
+	m_maincpu->set_addrmap(AS_IO, &cmpchess_state::cncchess_io);
+
 	subdevice<f3853_device>("smi")->set_clock(2000000);
 
-	config.set_default_layout(layout_cncchess);
+	config.set_default_layout(layout_conic_cchess);
 
 	/* sound hardware */
 	SPEAKER(config, "speaker").front_center();
@@ -400,9 +470,15 @@
 
 ROM_START( cmpchess )
 	ROM_REGION( 0x0800, "maincpu", 0 )
-	ROM_LOAD("32014-4950", 0x0000, 0x0800, CRC(278f7bf3) SHA1(b384c95ba691d52dfdddd35987a71e9746a46170) )
+	ROM_LOAD("32014-4950_cmcsi_staid.u3", 0x0000, 0x0800, CRC(278f7bf3) SHA1(b384c95ba691d52dfdddd35987a71e9746a46170) )
+ROM_END
+
+ROM_START( cmpchess2 )
+	ROM_REGION( 0x0800, "maincpu", 0 )
+	ROM_LOAD("8316a-4952_cmc2_staid.u3", 0x0000, 0x0800, CRC(aee49c5f) SHA1(8a10f74207f2646164cc0deed81bd082143ac38a) )
 ROM_END
 
+
 ROM_START( ccmk1 )
 	ROM_REGION( 0x0800, "maincpu", 0 )
 	ROM_LOAD("82c210-1", 0x0000, 0x0800, CRC(278f7bf3) SHA1(b384c95ba691d52dfdddd35987a71e9746a46170) )
@@ -422,8 +498,10 @@
     Drivers
 ******************************************************************************/
 
-//    YEAR  NAME      PARENT   CMP MACHINE   INPUT     STATE           INIT        COMPANY, FULLNAME, FLAGS
-CONS( 1977, cmpchess, 0,        0, cmpchess, cmpchess, cmpchess_state, empty_init, "Data Cash Systems / Staid", "CompuChess", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1978, ccmk1,    cmpchess, 0, mk1,      cmpchess, cmpchess_state, empty_init, "Novag", "Chess Champion: MK I", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+//    YEAR  NAME       PARENT   CMP MACHINE    INPUT     STATE           INIT        COMPANY, FULLNAME, FLAGS
+CONS( 1977, cmpchess,  0,        0, cmpchess,  cmpchess, cmpchess_state, empty_init, "DataCash Systems / Staid", "CompuChess", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // aka CompuChess I
+CONS( 1978, cmpchess2, 0,        0, cmpchess2, cmpchess, cmpchess_state, empty_init, "DataCash Systems / Staid", "CompuChess: The Second Edition", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+
+CONS( 1978, ccmk1,     cmpchess, 0, mk1,       mk1,      cmpchess_state, empty_init, "Novag", "Chess Champion: MK I", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 
-CONS( 1979, cncchess, 0,        0, cnc,      cncchess, cmpchess_state, empty_init, "Conic", "Computer Chess (Conic, model 7011)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1979, cncchess,  0,        0, cncchess,  cncchess, cmpchess_state, empty_init, "Conic", "Computer Chess (Conic, model 7011)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/conchess.cpp mame-0.224+dfsg.1/src/mame/drivers/conchess.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/conchess.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/conchess.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -44,7 +44,7 @@
 - 32KB ROM, rest similar to A0
 
 A3 (Plymate Victoria)
-- W65C02S8P-14 @ 6.144Mhz (12.288MHz XTAL)
+- W65C02S8P-14(14? probably replaced chip from a repair) @ 6.144Mhz (12.288MHz XTAL)
 - 32KB ROM, rest similar to A0
 
 Library modules:
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/copsnrob.cpp mame-0.224+dfsg.1/src/mame/drivers/copsnrob.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/copsnrob.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/copsnrob.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -251,15 +251,15 @@
 void copsnrob_state::copsnrob(machine_config &config)
 {
 	/* basic machine hardware */
-	M6502(config, m_maincpu, 14318180/16);      /* 894886.25 kHz */
+	M6502(config, m_maincpu, 14.318181_MHz_XTAL / 16);      /* 894886.25 kHz */
 	m_maincpu->set_addrmap(AS_PROGRAM, &copsnrob_state::main_map);
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
-	m_screen->set_refresh_hz(60);
-	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500) /* not accurate */);
-	m_screen->set_size(32*8, 32*8);
-	m_screen->set_visarea(0*8, 32*8-1, 0*8, 26*8-1);
+	m_screen->set_raw(14.318181_MHz_XTAL / 2, 457, 0, 256, 261, 0, 200);
+	// H RESET (synchronous) = 256H & 8H & 64H & 128H
+	// V RESET (synchronous) = 256V & 4V
+	// H BLANK signal should begin at 304, but 256H gates all relevant graphics
 	m_screen->set_screen_update(FUNC(copsnrob_state::screen_update_copsnrob));
 	m_screen->set_palette(m_palette);
 
@@ -299,12 +299,12 @@
 	ROM_REGION( 0x0100, "gfx3", 0 )
 	ROM_LOAD( "5770.m2",      0x0000, 0x0100, CRC(b00bbe77) SHA1(3fd6113aa3a572ec9f5ff248ba1bf53fc9225dfb) )
 
-	ROM_REGION( 0x0260, "proms", 0 )     /* misc. PROMs (timing?) */
-	ROM_LOAD( "5765.h8",      0x0000, 0x0020, CRC(6cd58931) SHA1(a90ae8ddffdfc33f60cb9ff8f42f9155c2b09ca1) )
-	ROM_LOAD( "5766.k8",      0x0020, 0x0020, CRC(e63edf4f) SHA1(1dc8691dde033062491b03d4c926047229c45a14) )
-	ROM_LOAD( "5767.j8",      0x0040, 0x0020, CRC(381b5ae4) SHA1(91cd237878c0e092197e3025c2498b8f26f90109) )
-	ROM_LOAD( "5768.n4",      0x0060, 0x0100, CRC(cb7fc836) SHA1(dc115c8dcee9298623f1e91add2dc17d0ed870e4) )
-	ROM_LOAD( "5769.d5",      0x0160, 0x0100, CRC(75081a5a) SHA1(c7d60fc4c44cf9c160b874de92d37600c079e7b6) )
+	ROM_REGION( 0x0260, "proms", 0 )     /* misc. PROMs */
+	ROM_LOAD( "5765.h8",      0x0000, 0x0020, CRC(6cd58931) SHA1(a90ae8ddffdfc33f60cb9ff8f42f9155c2b09ca1) ) // "µp Enable"
+	ROM_LOAD( "5766.k8",      0x0020, 0x0020, CRC(e63edf4f) SHA1(1dc8691dde033062491b03d4c926047229c45a14) ) // "Enable A"
+	ROM_LOAD( "5767.j8",      0x0040, 0x0020, CRC(381b5ae4) SHA1(91cd237878c0e092197e3025c2498b8f26f90109) ) // "Enable B"
+	ROM_LOAD( "5768.n4",      0x0060, 0x0100, CRC(cb7fc836) SHA1(dc115c8dcee9298623f1e91add2dc17d0ed870e4) ) // horizontal timing
+	ROM_LOAD( "5769.d5",      0x0160, 0x0100, CRC(75081a5a) SHA1(c7d60fc4c44cf9c160b874de92d37600c079e7b6) ) // vertical timing
 ROM_END
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cortex.cpp mame-0.224+dfsg.1/src/mame/drivers/cortex.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cortex.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cortex.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -62,6 +62,7 @@
 		, m_maincpu(*this, "maincpu")
 		, m_rom(*this, "maincpu")
 		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
 		, m_beep(*this, "beeper")
 		, m_io_dsw(*this, "DSW")
 	{ }
@@ -77,7 +78,6 @@
 	u8 keyboard_r(offs_t offset);
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
-	bool m_rom_in_map;
 	bool m_kbd_ack;
 	bool m_vdp_int;
 	u8 m_term_data;
@@ -86,13 +86,14 @@
 	required_device<tms9995_device> m_maincpu;
 	required_region_ptr<u8> m_rom;
 	required_shared_ptr<u8> m_ram;
+	required_memory_bank    m_bank1;
 	required_device<beep_device>    m_beep;
 	required_ioport m_io_dsw;
 };
 
 void cortex_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x7fff).ram().share("mainram").lr8(NAME([this] (offs_t offset) { if(m_rom_in_map) return m_rom[offset]; else return m_ram[offset]; }));
+	map(0x0000, 0x7fff).ram().share("mainram").bankr("bank1");
 	map(0x8000, 0xefff).ram();
 	map(0xf100, 0xf11f).ram(); // memory mapping unit
 	map(0xf120, 0xf121).rw("crtc", FUNC(tms9928a_device::read), FUNC(tms9928a_device::write));
@@ -159,7 +160,7 @@
 
 WRITE_LINE_MEMBER( cortex_state::romsw_w )
 {
-	m_rom_in_map = state ? 0 : 1;
+	m_bank1->set_entry(state ? 0 : 1);
 }
 
 WRITE_LINE_MEMBER( cortex_state::vdp_int_w )
@@ -176,7 +177,8 @@
 
 void cortex_state::machine_start()
 {
-	save_item(NAME(m_rom_in_map));
+	m_bank1->configure_entry(0, m_ram);
+	m_bank1->configure_entry(1, m_rom);
 	save_item(NAME(m_kbd_ack));
 	save_item(NAME(m_vdp_int));
 	save_item(NAME(m_term_data));
@@ -187,7 +189,7 @@
 	m_kbd_ack = 1;
 	m_vdp_int = 0;
 	m_beep->set_state(0);
-	m_rom_in_map = true;
+	m_bank1->set_entry(1);
 	m_maincpu->ready_line(ASSERT_LINE);
 	m_maincpu->reset_line(ASSERT_LINE);
 }
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cps2.cpp mame-0.224+dfsg.1/src/mame/drivers/cps2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cps2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cps2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -641,10 +641,10 @@
  *
  *************************************/
 
-/* Maximum size of Q Sound Z80 region */
+// Maximum size of QSound Z80 region
 #define QSOUND_SIZE 0x50000
 
-/* Maximum 680000 code size */
+// Maximum 68000 code size
 #undef  CODE_SIZE
 #define CODE_SIZE   0x0400000
 
@@ -657,7 +657,7 @@
 
 TIMER_DEVICE_CALLBACK_MEMBER(cps2_state::cps2_interrupt)
 {
-	/* direct irq line connection, IPL1 is vblank, IPL2 is some sort of scanline interrupt. */
+	// Direct irq line connection, IPL1 is vblank, IPL2 is some sort of scanline interrupt.
 	if (param == 0)
 		m_scancalls = 0;
 
@@ -669,7 +669,7 @@
 
 //  popmessage("%04x %04x - %04x %04x",m_scanline1,m_scanline2,m_cps_b_regs[0x10/2],m_cps_b_regs[0x12/2]);
 
-	/* raster effects */
+	// Raster effects
 	if (m_scanline1 == param || (m_scanline1 < param && !m_scancalls))
 	{
 		m_cps_b_regs[0x10/2] = 0;
@@ -679,7 +679,7 @@
 //      popmessage("IRQ4 scancounter = %04i", param);
 	}
 
-	/* raster effects */
+	// Raster effects
 	if(m_scanline2 == param || (m_scanline2 < param && !m_scancalls))
 	{
 		m_cps_b_regs[0x12 / 2] = 0;
@@ -689,7 +689,7 @@
 //      popmessage("IRQ4 scancounter = %04i", param);
 	}
 
-	if (param == 240)  /* VBlank */
+	if (param == 240)  // VBlank
 	{
 		m_cps_b_regs[0x10 / 2] = m_scanline1;
 		m_cps_b_regs[0x12 / 2] = m_scanline2;
@@ -719,7 +719,7 @@
 		/* bit 6 - */
 		/* bit 7 - */
 
-		/* EEPROM */
+		// EEPROM
 		ioport("EEPROMOUT")->write(data, 0xffff);
 		if (m_cps2_dial_type == 2) // ecofghtr
 		{
@@ -738,7 +738,7 @@
 		/* bit 6 - */
 		/* bit 7 - */
 
-			/* Z80 Reset */
+		// Z80 Reset
 		if (m_audiocpu != nullptr)
 			m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 0x0008) ? CLEAR_LINE : ASSERT_LINE);
 
@@ -753,7 +753,7 @@
 			machine().bookkeeping().coin_counter_w(1, data & 0x0002);
 		}
 
-		if (strncmp(machine().system().name, "mmatrix", 7) == 0)      // Mars Matrix seems to require the coin lockout bit to be reversed
+		if (strncmp(machine().system().name, "mmatrix", 7) == 0) // Mars Matrix seems to require the coin lockout bit to be reversed
 		{
 			machine().bookkeeping().coin_lockout_w(0, data & 0x0010);
 			machine().bookkeeping().coin_lockout_w(1, data & 0x0020);
@@ -816,10 +816,10 @@
 	/* Only game known to use both these so far is SSF2TB */
 
 	if (m_cps2networkpresent)
-		return 0x2021; /* SSF2TB doesn't have a digital slider in the test screen */
+		return 0x2021; // SSF2TB doesn't have a digital slider in the test screen
 	else
 		if (m_cps2disabledigitalvolume)
-			return 0xd000; /* digital display isn't shown in test mode */
+			return 0xd000; // Digital display isn't shown in test mode
 		else
 			return result;
 }
@@ -850,7 +850,7 @@
 
 uint16_t cps2_state::joy_or_paddle_ecofghtr_r()
 {
-	if (m_readpaddle == 0 || (m_io_in1->read() & 0x10) == 0x10) // ignore bit if spinner not enabled
+	if (m_readpaddle == 0 || (m_io_in1->read() & 0x10) == 0x10) // Ignore bit if spinner not enabled
 	{
 		uint16_t ret = m_io_in0->read();
 
@@ -919,64 +919,64 @@
 
 void cps2_state::cps2_map(address_map &map)
 {
-	map(0x000000, 0x3fffff).rom();                                                                         /* 68000 ROM */
-	map(0x400000, 0x40000b).ram().share("output");                                                      /* CPS2 object output */
-	map(0x618000, 0x619fff).rw(FUNC(cps2_state::qsound_sharedram1_r), FUNC(cps2_state::qsound_sharedram1_w));                         /* Q RAM */
-	map(0x660000, 0x663fff).ram();                                                                         /* When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available. */
-	//  map(0x662000, 0x662001).ram();                                                                         /* Network adapter related, accessed in SSF2TB */
-	//  map(0x662008, 0x662009).ram();                                                                         /* Network adapter related, accessed in SSF2TB */
-	//  map(0x662020, 0x662021).ram();                                                                         /* Network adapter related, accessed in SSF2TB */
-	map(0x664000, 0x664001).ram();                                                                         /* Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?) */
-	map(0x700000, 0x701fff).w(FUNC(cps2_state::cps2_objram1_w)).share("objram1");                           /* Object RAM, no game seems to use it directly */
-	map(0x708000, 0x709fff).mirror(0x006000).rw(FUNC(cps2_state::cps2_objram2_r), FUNC(cps2_state::cps2_objram2_w)).share("objram2");           /* Object RAM */
-	map(0x800100, 0x80013f).w(FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs");                              /* mirror (sfa) */
-	map(0x800140, 0x80017f).rw(FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w)).share("cps_b_regs");            /* mirror (sfa) */
-	map(0x804000, 0x804001).portr("IN0");                                                            /* IN0 */
-	map(0x804010, 0x804011).portr("IN1");                                                            /* IN1 */
-	map(0x804020, 0x804021).portr("IN2");                                                            /* IN2 + EEPROM */
-	map(0x804030, 0x804031).r(FUNC(cps2_state::cps2_qsound_volume_r));                                               /* Master volume. Also when bit 14=0 addon memory is present, when bit 15=0 network adapter present. */
-	map(0x804040, 0x804041).w(FUNC(cps2_state::cps2_eeprom_port_w));                                                    /* EEPROM */
-	map(0x8040a0, 0x8040a1).nopw();                                                                    /* Unknown (reset once on startup) */
-	map(0x8040b0, 0x8040b3).r(FUNC(cps2_state::kludge_r));                                                               /* unknown (xmcotaj hangs if this is 0) */
-	map(0x8040e0, 0x8040e1).w(FUNC(cps2_state::cps2_objram_bank_w));                                                   /* bit 0 = Object ram bank swap */
-	map(0x804100, 0x80413f).w(FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs");                          /* CPS-A custom */
-	map(0x804140, 0x80417f).rw(FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w));                                       /* CPS-B custom */
-	map(0x900000, 0x92ffff).ram().w(FUNC(cps2_state::cps1_gfxram_w)).share("gfxram"); /* Video RAM */
-	map(0xff0000, 0xffffff).ram();                                                                         /* RAM */
+	map(0x000000, 0x3fffff).rom();                                                                                                    // 68000 ROM
+	map(0x400000, 0x40000b).ram().share("output");                                                                                    // CPS2 object output
+	map(0x618000, 0x619fff).rw(FUNC(cps2_state::qsound_sharedram1_r), FUNC(cps2_state::qsound_sharedram1_w));                         // Q RAM
+	map(0x660000, 0x663fff).ram();                                                                                                    // When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available.
+	//  map(0x662000, 0x662001).ram();                                                                                                // Network adapter related, accessed in SSF2TB
+	//  map(0x662008, 0x662009).ram();                                                                                                // Network adapter related, accessed in SSF2TB
+	//  map(0x662020, 0x662021).ram();                                                                                                // Network adapter related, accessed in SSF2TB
+	map(0x664000, 0x664001).ram();                                                                                                    // Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?)
+	map(0x700000, 0x701fff).w(FUNC(cps2_state::cps2_objram1_w)).share("objram1");                                                     // Object RAM, no game seems to use it directly
+	map(0x708000, 0x709fff).mirror(0x006000).rw(FUNC(cps2_state::cps2_objram2_r), FUNC(cps2_state::cps2_objram2_w)).share("objram2"); // Object RAM
+	map(0x800100, 0x80013f).w(FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs");                                                    // Mirror (sfa)
+	map(0x800140, 0x80017f).rw(FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w)).share("cps_b_regs");                   // Mirror (sfa)
+	map(0x804000, 0x804001).portr("IN0");                                                                                             // IN0
+	map(0x804010, 0x804011).portr("IN1");                                                                                             // IN1
+	map(0x804020, 0x804021).portr("IN2");                                                                                             // IN2 + EEPROM
+	map(0x804030, 0x804031).r(FUNC(cps2_state::cps2_qsound_volume_r));                                                                // Master volume. Also when bit 14=0 addon memory is present, when bit 15=0 network adapter present.
+	map(0x804040, 0x804041).w(FUNC(cps2_state::cps2_eeprom_port_w));                                                                  // EEPROM
+	map(0x8040a0, 0x8040a1).nopw();                                                                                                   // Unknown (reset once on startup)
+	map(0x8040b0, 0x8040b3).r(FUNC(cps2_state::kludge_r));                                                                            // Unknown (xmcotaj hangs if this is 0)
+	map(0x8040e0, 0x8040e1).w(FUNC(cps2_state::cps2_objram_bank_w));                                                                  // bit 0 = Object ram bank swap
+	map(0x804100, 0x80413f).w(FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs");                                                    // CPS-A custom
+	map(0x804140, 0x80417f).rw(FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w));                                       // CPS-B custom
+	map(0x900000, 0x92ffff).ram().w(FUNC(cps2_state::cps1_gfxram_w)).share("gfxram");                                                 // Video RAM
+	map(0xff0000, 0xffffff).ram();                                                                                                    // RAM
 }
 
 void cps2_state::decrypted_opcodes_map(address_map &map)
 {
-	map(0x000000, 0x3fffff).rom().share("decrypted_opcodes");                                           /* 68000 ROM */
+	map(0x000000, 0x3fffff).rom().share("decrypted_opcodes"); // 68000 ROM
 }
 
 void cps2_state::dead_cps2_map(address_map &map)
 {
-	map(0x000000, 0x3fffff).rom();                                                                         /* 68000 ROM */
-	map(0x400000, 0x40000b).ram().share("output");                                                      /* CPS2 object output */
-	map(0x618000, 0x619fff).rw(FUNC(cps2_state::qsound_sharedram1_r), FUNC(cps2_state::qsound_sharedram1_w));                         /* Q RAM */
-	map(0x660000, 0x663fff).ram();                                                                         /* When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available. */
-	//  map(0x662000, 0x662001).ram();                                                                         /* Network adapter related, accessed in SSF2TB */
-	//  map(0x662008, 0x662009).ram();                                                                         /* Network adapter related, accessed in SSF2TB */
-	//  map(0x662020, 0x662021).ram();                                                                         /* Network adapter related, accessed in SSF2TB */
-	map(0x664000, 0x664001).ram();                                                                         /* Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?) */
-	map(0x700000, 0x701fff).w(FUNC(cps2_state::cps2_objram1_w)).share("objram1");                           /* Object RAM, no game seems to use it directly */
-	map(0x708000, 0x709fff).mirror(0x006000).rw(FUNC(cps2_state::cps2_objram2_r), FUNC(cps2_state::cps2_objram2_w)).share("objram2");           /* Object RAM */
-	map(0x800100, 0x80013f).w(FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs");                              /* mirror (sfa) */
-	map(0x800140, 0x80017f).rw(FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w)).share("cps_b_regs");            /* mirror (sfa) */
-	map(0x804000, 0x804001).portr("IN0");                                                            /* IN0 */
-	map(0x804010, 0x804011).portr("IN1");                                                            /* IN1 */
-	map(0x804020, 0x804021).portr("IN2");                                                            /* IN2 + EEPROM */
-	map(0x804030, 0x804031).r(FUNC(cps2_state::cps2_qsound_volume_r));                                               /* Master volume. Also when bit 14=0 addon memory is present, when bit 15=0 network adapter present. */
-	map(0x804040, 0x804041).w(FUNC(cps2_state::cps2_eeprom_port_w));                                                    /* EEPROM */
-	map(0x8040a0, 0x8040a1).nopw();                                                                    /* Unknown (reset once on startup) */
-	map(0x8040b0, 0x8040b3).r(FUNC(cps2_state::kludge_r));                                                               /* unknown (xmcotaj hangs if this is 0) */
-	map(0x8040e0, 0x8040e1).w(FUNC(cps2_state::cps2_objram_bank_w));                                                   /* bit 0 = Object ram bank swap */
-	map(0x804100, 0x80413f).w(FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs");                              /* CPS-A custom */
-	map(0x804140, 0x80417f).rw(FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w));                                       /* CPS-B custom */
-	map(0x900000, 0x92ffff).ram().w(FUNC(cps2_state::cps1_gfxram_w)).share("gfxram"); /* Video RAM */
-	map(0xff0000, 0xffffef).ram();                                                                         /* RAM */
-	map(0xfffff0, 0xfffffb).ram().share("output");                                                      /* CPS2 output */
+	map(0x000000, 0x3fffff).rom();                                                                                                    // 68000 ROM
+	map(0x400000, 0x40000b).ram().share("output");                                                                                    // CPS2 object output
+	map(0x618000, 0x619fff).rw(FUNC(cps2_state::qsound_sharedram1_r), FUNC(cps2_state::qsound_sharedram1_w));                         // Q RAM
+	map(0x660000, 0x663fff).ram();                                                                                                    // When bit 14 of 0x804030 equals 0 this space is available. Many games store highscores and other info here if available.
+	//  map(0x662000, 0x662001).ram();                                                                                                // Network adapter related, accessed in SSF2TB
+	//  map(0x662008, 0x662009).ram();                                                                                                // Network adapter related, accessed in SSF2TB
+	//  map(0x662020, 0x662021).ram();                                                                                                // Network adapter related, accessed in SSF2TB
+	map(0x664000, 0x664001).ram();                                                                                                    // Unknown - Only used if 0x660000-0x663fff available (could be RAM enable?)
+	map(0x700000, 0x701fff).w(FUNC(cps2_state::cps2_objram1_w)).share("objram1");                                                     // Object RAM, no game seems to use it directly
+	map(0x708000, 0x709fff).mirror(0x006000).rw(FUNC(cps2_state::cps2_objram2_r), FUNC(cps2_state::cps2_objram2_w)).share("objram2"); // Object RAM
+	map(0x800100, 0x80013f).w(FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs");                                                    // Mirror (sfa)
+	map(0x800140, 0x80017f).rw(FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w)).share("cps_b_regs");                   // Mirror (sfa)
+	map(0x804000, 0x804001).portr("IN0");                                                                                             // IN0
+	map(0x804010, 0x804011).portr("IN1");                                                                                             // IN1
+	map(0x804020, 0x804021).portr("IN2");                                                                                             // IN2 + EEPROM
+	map(0x804030, 0x804031).r(FUNC(cps2_state::cps2_qsound_volume_r));                                                                // Master volume. Also when bit 14=0 addon memory is present, when bit 15=0 network adapter present.
+	map(0x804040, 0x804041).w(FUNC(cps2_state::cps2_eeprom_port_w));                                                                  // EEPROM
+	map(0x8040a0, 0x8040a1).nopw();                                                                                                   // Unknown (reset once on startup)
+	map(0x8040b0, 0x8040b3).r(FUNC(cps2_state::kludge_r));                                                                            // Unknown (xmcotaj hangs if this is 0)
+	map(0x8040e0, 0x8040e1).w(FUNC(cps2_state::cps2_objram_bank_w));                                                                  // bit 0 = Object ram bank swap
+	map(0x804100, 0x80413f).w(FUNC(cps2_state::cps1_cps_a_w)).share("cps_a_regs");                                                    // CPS-A custom
+	map(0x804140, 0x80417f).rw(FUNC(cps2_state::cps1_cps_b_r), FUNC(cps2_state::cps1_cps_b_w));                                       // CPS-B custom
+	map(0x900000, 0x92ffff).ram().w(FUNC(cps2_state::cps1_gfxram_w)).share("gfxram");                                                 // Video RAM
+	map(0xff0000, 0xffffef).ram();                                                                                                    // RAM
+	map(0xfffff0, 0xfffffb).ram().share("output");                                                                                    // CPS2 output
 	map(0xfffffc, 0xffffff).ram();
 }
 
@@ -987,9 +987,9 @@
  *
  *************************************/
 
-/* 4 players and 4 buttons */
+// 4 players and 4 buttons
 static INPUT_PORTS_START( cps2_4p4b )
-	PORT_START("IN0")      /* (0x00) */
+	PORT_START("IN0")      // (0x00)
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
@@ -1007,7 +1007,7 @@
 	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
 	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
 
-	PORT_START("IN1")      /* (0x10) */
+	PORT_START("IN1")      // (0x10)
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
@@ -1025,7 +1025,7 @@
 	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
 	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4)
 
-	PORT_START("IN2")      /* (0x20) */
+	PORT_START("IN2")      // (0x20)
 	PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, do_read)
 	PORT_SERVICE_NO_TOGGLE( 0x0002, IP_ACTIVE_LOW )
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -1044,73 +1044,73 @@
 	PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, clk_write)
 	PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_OUTPUT ) PORT_WRITE_LINE_DEVICE_MEMBER("eeprom", eeprom_serial_93cxx_device, cs_write)
 
-	/* fake inputs for digital volume buttons */
+	// Fake inputs for digital volume buttons
 	PORT_START( "DIGITALVOL" )
 	PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_VOLUME_DOWN )
 	PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_VOLUME_UP )
 INPUT_PORTS_END
 
-/* 4 players and 3 buttons */
+// 4 players and 3 buttons
 static INPUT_PORTS_START( cps2_4p3b )
 	PORT_INCLUDE(cps2_4p4b)
 
 	PORT_MODIFY("IN0")
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON4 PORT_PLAYER(1) */
-	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON4 PORT_PLAYER(2) */
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON4 PORT_PLAYER(1)
+	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON4 PORT_PLAYER(2)
 
 	PORT_MODIFY("IN1")
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON4 PORT_PLAYER(3) */
-	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON4 PORT_PLAYER(4) */
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON4 PORT_PLAYER(3)
+	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON4 PORT_PLAYER(4)
 INPUT_PORTS_END
 
-/* 4 players and 2 buttons */
+// 4 players and 2 buttons
 static INPUT_PORTS_START( cps2_4p2b )
 	PORT_INCLUDE(cps2_4p3b)
 
 	PORT_MODIFY("IN0")
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON3 PORT_PLAYER(1) */
-	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON3 PORT_PLAYER(2) */
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON3 PORT_PLAYER(1)
+	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON3 PORT_PLAYER(2)
 
 	PORT_MODIFY("IN1")
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON3 PORT_PLAYER(3) */
-	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON3 PORT_PLAYER(4) */
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON3 PORT_PLAYER(3)
+	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON3 PORT_PLAYER(4)
 INPUT_PORTS_END
 
-/* 3 players and 4 buttons */
+// 3 players and 4 buttons
 static INPUT_PORTS_START( cps2_3p4b )
 	PORT_INCLUDE(cps2_4p4b)
 
 	PORT_MODIFY("IN1")
-	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )           /* PORT_PLAYER(4) inputs */
+	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_PLAYER(4) inputs
 
 	PORT_MODIFY("IN2")
-	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNUSED )           /* START4 */
-	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )           /* COIN4 */
+	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNUSED ) // START4
+	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN4
 INPUT_PORTS_END
 
-/* 3 players and 3 buttons */
+// 3 players and 3 buttons
 static INPUT_PORTS_START( cps2_3p3b )
 	PORT_INCLUDE(cps2_3p4b)
 
 	PORT_MODIFY("IN0")
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON4 PORT_PLAYER(1) */
-	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON4 PORT_PLAYER(2) */
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON4 PORT_PLAYER(1)
+	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON4 PORT_PLAYER(2)
 
 	PORT_MODIFY("IN1")
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON4 PORT_PLAYER(3) */
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON4 PORT_PLAYER(3)
 INPUT_PORTS_END
 
-/* 3 players and 2 buttons */
+// 3 players and 2 buttons
 #ifdef UNUSED_DEFINITION
 static INPUT_PORTS_START( cps2_3p2b )
 	PORT_INCLUDE(cps2_3p3b)
 
 	PORT_MODIFY("IN0")
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON3 PORT_PLAYER(1) */
-	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON3 PORT_PLAYER(2) */
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON3 PORT_PLAYER(1)
+	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON3 PORT_PLAYER(2)
 
 	PORT_MODIFY("IN1")
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON3 PORT_PLAYER(3) */
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON3 PORT_PLAYER(3)
 INPUT_PORTS_END
 #endif
 
@@ -1119,20 +1119,20 @@
 	PORT_INCLUDE(cps2_3p4b)
 
 	PORT_MODIFY("IN1")
-	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )           /* PORT_PLAYER(3) inputs */
+	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_PLAYER(3) inputs
 
 	PORT_MODIFY("IN2")
-	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNUSED )           /* START3 */
-	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )           /* COIN3 */
+	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNUSED ) // START3
+	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN3
 INPUT_PORTS_END
 
-/* 2 players and 3 buttons */
+// 2 players and 3 buttons
 static INPUT_PORTS_START( cps2_2p3b )
 	PORT_INCLUDE(cps2_2p4b)
 
 	PORT_MODIFY("IN0")
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON4 PORT_PLAYER(1) */
-	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON4 PORT_PLAYER(2) */
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON4 PORT_PLAYER(1)
+	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON4 PORT_PLAYER(2)
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( ecofghtr )
@@ -1140,7 +1140,7 @@
 
 	PORT_MODIFY("IN1")
 	// If this bit is set then the Test Mode shows 'Rolling' instead of Shot2/3 - this is the 'spinner' mode.
-	// in this mode the IN0 port is multiplexed with an analog input, what would be Button 2 ends up being 'direction'
+	// In this mode the IN0 port is multiplexed with an analog input, what would be Button 2 ends up being 'direction'
 	PORT_CONFNAME( 0x10, 0x00, "Use Spinners" )
 	PORT_CONFSETTING(    0x00, DEF_STR( Yes ) )
 	PORT_CONFSETTING(    0x10, DEF_STR( No ) )
@@ -1154,25 +1154,25 @@
 
 
 
-/* 2 players and 2 buttons */
+// 2 players and 2 buttons
 static INPUT_PORTS_START( cps2_2p2b )
 	PORT_INCLUDE(cps2_2p3b)
 
 	PORT_MODIFY("IN0")
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON3 PORT_PLAYER(1) */
-	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON3 PORT_PLAYER(2) */
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON3 PORT_PLAYER(1)
+	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON3 PORT_PLAYER(2)
 INPUT_PORTS_END
 
-/* 2 players and 1 button */
+// 2 players and 1 button
 static INPUT_PORTS_START( cps2_2p1b )
 	PORT_INCLUDE(cps2_2p2b)
 
 	PORT_MODIFY("IN0")
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON2 PORT_PLAYER(1) */
-	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON2 PORT_PLAYER(2) */
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON2 PORT_PLAYER(1)
+	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON2 PORT_PLAYER(2)
 INPUT_PORTS_END
 
-/* 2 players and 6 buttons (2 rows of 3 buttons) */
+// 2 players and 6 buttons (2 rows of 3 buttons)
 static INPUT_PORTS_START( cps2_2p6b )
 	PORT_INCLUDE(cps2_2p3b)
 
@@ -1187,40 +1187,40 @@
 	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(2)
 INPUT_PORTS_END
 
-/* 2 players, 6 buttons, and 1 ticket dispenser (2 rows of 3 buttons) */
+// 2 players, 6 buttons, and 1 ticket dispenser (2 rows of 3 buttons)
 static INPUT_PORTS_START( cps2_2p6bt )
 	PORT_INCLUDE(cps2_2p6b)
 
 	PORT_MODIFY("IN1")
-	PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_UNUSED )           /* Ticket Empty line*/
+	PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_UNUSED ) // Ticket Empty line
 INPUT_PORTS_END
 
-/* 1 player and 4 buttons */
+// 1 player and 4 buttons
 static INPUT_PORTS_START( cps2_1p4b )
 	PORT_INCLUDE(cps2_2p4b)
 
 	PORT_MODIFY("IN0")
-	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )           /* PORT_PLAYER(2) inputs */
+	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED ) // PORT_PLAYER(2) inputs
 
 	PORT_MODIFY("IN2")
-	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED )           /* START2 */
-	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNUSED )           /* COIN2 */
+	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED ) // START2
+	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_UNUSED ) // COIN2
 INPUT_PORTS_END
 
-/* 1 player and 3 buttons */
+// 1 player and 3 buttons
 static INPUT_PORTS_START( cps2_1p3b )
 	PORT_INCLUDE(cps2_1p4b)
 
 	PORT_MODIFY("IN0")
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON4 PORT_PLAYER(1) */
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON4 PORT_PLAYER(1)
 INPUT_PORTS_END
 
-/* 1 player and 2 buttons */
+// 1 player and 2 buttons
 static INPUT_PORTS_START( cps2_1p2b )
 	PORT_INCLUDE(cps2_1p3b)
 
 	PORT_MODIFY("IN0")
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )           /* BUTTON3 PORT_PLAYER(1) */
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED ) // BUTTON3 PORT_PLAYER(1)
 INPUT_PORTS_END
 
 
@@ -1230,22 +1230,22 @@
  *
  *************************************/
 
-/* According to the "test mode", buttons layout look like a 2 players 6 buttons machine where buttons have been removed */
+// According to the "test mode", buttons layout look like a 2 players 6 buttons machine where buttons have been removed
 static INPUT_PORTS_START( cybots )
 	PORT_INCLUDE(cps2_2p6b)
 
 	PORT_MODIFY("IN1")
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
-	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )                     /* BUTTON5 PORT_PLAYER(1) */
-	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )                     /* BUTTON6 PORT_PLAYER(1) */
+	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED )                     // BUTTON5 PORT_PLAYER(1)
+	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNUSED )                     // BUTTON6 PORT_PLAYER(1)
 	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED )                     /* BUTTON5 PORT_PLAYER(2) */
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED )                     // BUTTON5 PORT_PLAYER(2)
 
 	PORT_MODIFY("IN2")
-	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )                     /* BUTTON6 PORT_PLAYER(2) */
+	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )                     // BUTTON6 PORT_PLAYER(2)
 INPUT_PORTS_END
 
-/* 2 players, no joysticks which are replaced with 4 buttons, no other buttons */
+// 2 players, no joysticks which are replaced with 4 buttons, no other buttons
 static INPUT_PORTS_START( qndream )
 	PORT_INCLUDE(cps2_2p4b)
 
@@ -1262,7 +1262,7 @@
 	PORT_BIT( 0xf000, IP_ACTIVE_LOW, IPT_UNUSED )
 INPUT_PORTS_END
 
-/* 2 players and 1 button - either 2 8-way joysticks, 2 2-way joysticks, or 2 paddles */
+// 2 players and 1 button - either 2 8-way joysticks, 2 2-way joysticks, or 2 paddles
 static INPUT_PORTS_START( pzloop2 )
 	PORT_INCLUDE(cps2_2p1b)
 
@@ -1273,7 +1273,7 @@
 	PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(100) PORT_KEYDELTA(15) PORT_PLAYER(2)
 INPUT_PORTS_END
 
-/* 1 player and 3 buttons, but 2 coins slots */
+// 1 player and 3 buttons, but 2 coins slots
 static INPUT_PORTS_START( choko )
 	PORT_INCLUDE(cps2_1p3b)
 
@@ -1297,7 +1297,7 @@
 
 void cps2_state::cps2(machine_config &config)
 {
-	/* basic machine hardware */
+	// Basic machine hardware
 	M68000(config, m_maincpu, XTAL(16'000'000));
 	m_maincpu->set_addrmap(AS_PROGRAM, &cps2_state::cps2_map);
 	m_maincpu->set_addrmap(AS_OPCODES, &cps2_state::decrypted_opcodes_map);
@@ -1313,7 +1313,7 @@
 
 	EEPROM_93C46_16BIT(config, "eeprom");
 
-	/* video hardware */
+	// Video hardware
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
 	m_screen->set_video_attributes(VIDEO_UPDATE_BEFORE_VBLANK);
 	m_screen->set_raw(CPS_PIXEL_CLOCK, CPS_HTOTAL, CPS_HBEND, CPS_HBSTART, CPS_VTOTAL, CPS_VBEND, CPS_VBSTART);
@@ -1324,7 +1324,7 @@
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_cps1);
 	PALETTE(config, m_palette, palette_device::BLACK).set_entries(0xc00);
 
-	/* sound hardware */
+	// Sound hardware
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
 
@@ -1361,7 +1361,7 @@
  *************************************/
 
 ROM_START( 1944 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "nffu.03", 0x000000, 0x80000, CRC(9693cf8f) SHA1(c296cb008e282f77b44374d1c3638a3f4d5d5d4e) )
 	ROM_LOAD16_WORD_SWAP( "nff.04",  0x080000, 0x80000, CRC(dba1c66e) SHA1(4764e77d4da5d19d9acded27df1e1bcba06b0fcf) )
 	ROM_LOAD16_WORD_SWAP( "nffu.05", 0x100000, 0x80000, CRC(ea813eb7) SHA1(34e0175a5f22d08c3538369b4bfd077a7427a128) )
@@ -1376,11 +1376,11 @@
 	ROM_LOAD64_WORD( "nff.18m",   0x1000004, 0x100000, CRC(63ca5988) SHA1(30137fa77573c84bcc24570bccb7dba61ddb413c) )
 	ROM_LOAD64_WORD( "nff.20m",   0x1000006, 0x100000, CRC(21eb8f3b) SHA1(efa69f19a958047dd91a294c88857ed3133fcbef) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "nff.01",   0x00000, 0x08000, CRC(d2e44318) SHA1(33e45f6fe9fed098a4c072b8c39406aef1a949b2) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "nff.11m",   0x000000, 0x400000, CRC(243e4e05) SHA1(83281f7290ac105a3f9a7507cbc11317d45ba706) )
 	ROM_LOAD16_WORD_SWAP( "nff.12m",   0x400000, 0x400000, CRC(4fcf1600) SHA1(36f18c5d92b79433bdf7088b29a244708929d48e) )
 
@@ -1389,7 +1389,7 @@
 ROM_END
 
 ROM_START( 1944j )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "nffj.03", 0x000000, 0x80000, CRC(247521ef) SHA1(c6a04f514dd5ab40d8813dcfb8430bce54e7aa28) )
 	ROM_LOAD16_WORD_SWAP( "nff.04",  0x080000, 0x80000, CRC(dba1c66e) SHA1(4764e77d4da5d19d9acded27df1e1bcba06b0fcf) )
 	ROM_LOAD16_WORD_SWAP( "nffj.05", 0x100000, 0x80000, CRC(7f20c2ef) SHA1(380dc54d94c29c049a4c00ed58013e04eec87086) )
@@ -1404,11 +1404,11 @@
 	ROM_LOAD64_WORD( "nff.18m",   0x1000004, 0x100000, CRC(63ca5988) SHA1(30137fa77573c84bcc24570bccb7dba61ddb413c) )
 	ROM_LOAD64_WORD( "nff.20m",   0x1000006, 0x100000, CRC(21eb8f3b) SHA1(efa69f19a958047dd91a294c88857ed3133fcbef) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "nff.01",   0x00000, 0x08000, CRC(d2e44318) SHA1(33e45f6fe9fed098a4c072b8c39406aef1a949b2) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "nff.11m",   0x000000, 0x400000, CRC(243e4e05) SHA1(83281f7290ac105a3f9a7507cbc11317d45ba706) )
 	ROM_LOAD16_WORD_SWAP( "nff.12m",   0x400000, 0x400000, CRC(4fcf1600) SHA1(36f18c5d92b79433bdf7088b29a244708929d48e) )
 
@@ -1417,7 +1417,7 @@
 ROM_END
 
 ROM_START( 19xx )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "19xe.03b",     0x000000, 0x080000, CRC(9bf9d9b1) SHA1(df32f2e6b3ebafd892368430d786a58e3614ef80) )
 	ROM_LOAD16_WORD_SWAP( "19xe.04b",     0x080000, 0x080000, CRC(9aa46476) SHA1(dd677b87620198c22738e9f54105998a761298de) )
 	ROM_LOAD16_WORD_SWAP( "19xe.05b",     0x100000, 0x080000, CRC(a04a2c5e) SHA1(aff5a324daa4641bfdef486824127010e4b803f7) )
@@ -1434,11 +1434,11 @@
 	ROM_LOAD64_WORD( "19x.18m",   0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) )
 	ROM_LOAD64_WORD( "19x.20m",   0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "19x.01",   0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "19x.11m",   0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) )
 	ROM_LOAD16_WORD_SWAP( "19x.12m",   0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) )
 
@@ -1447,7 +1447,7 @@
 ROM_END
 
 ROM_START( 19xxu )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "19xu.03", 0x000000, 0x80000, CRC(05955268) SHA1(d3b6b416f1f9eb1c1cbca6647630d1155647082d) )
 	ROM_LOAD16_WORD_SWAP( "19xu.04", 0x080000, 0x80000, CRC(3111ab7f) SHA1(8bbce20ae7ba47949f4939b2f35014fb6decd283) )
 	ROM_LOAD16_WORD_SWAP( "19xu.05", 0x100000, 0x80000, CRC(38df4a63) SHA1(1303f7ab6296f1454907a24d64878bdbd1ef88a7) )
@@ -1464,11 +1464,11 @@
 	ROM_LOAD64_WORD( "19x.18m",   0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) )
 	ROM_LOAD64_WORD( "19x.20m",   0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "19x.01",   0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "19x.11m",   0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) )
 	ROM_LOAD16_WORD_SWAP( "19x.12m",   0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) )
 
@@ -1477,7 +1477,7 @@
 ROM_END
 
 ROM_START( 19xxj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "19xj-03b.6a", 0x000000, 0x80000, CRC(bcad93dd) SHA1(9b08cfdf278fc0cf60827518c4fecb99f224578b) )
 	ROM_LOAD16_WORD_SWAP( "19xj-04b.7a", 0x080000, 0x80000, CRC(931882a1) SHA1(940a4fe52c1eb208071ab9d0a0c256eb39620091) )
 	ROM_LOAD16_WORD_SWAP( "19xj-05b.8a", 0x100000, 0x80000, CRC(e7eeddc4) SHA1(40c79bc454d5fb8e5004db3df4fdcb10fae6c1e9) )
@@ -1506,11 +1506,11 @@
 	ROM_LOAD64_WORD( "19x-95.10p",  0x0c00006, 0x080000, CRC(2b86fa67) SHA1(96a3cb8b203738fff33e2ca6340fdef928a816b9) )
 	ROM_LOAD64_WORD( "19x-96.11p",  0x0e00006, 0x080000, CRC(ae6eb692) SHA1(4b564a375a08872aea534635ec526cce62dcdadd) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "19x-01.1a",   0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "19x-51.6a",   0x000000, 0x080000, CRC(e9cd7780) SHA1(23c3d3968c2aec01ca25338b687be14407580b32) )
 	ROM_LOAD16_WORD_SWAP( "19x-52.7a",   0x080000, 0x080000, CRC(b27b91a8) SHA1(1fd424c118fabcdb70ea025804552e99b8f8348a) )
 	ROM_LOAD16_WORD_SWAP( "19x-53.8a",   0x100000, 0x080000, CRC(2e563ee2) SHA1(ed91404f27e36ff7c4bf4c297e81c4ebeb125db7) )
@@ -1525,7 +1525,7 @@
 ROM_END
 
 ROM_START( 19xxjr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "19xj.03a", 0x000000, 0x80000, CRC(ed08bdd1) SHA1(4b49f988faf4a6a99d3596bb12e4685862a20a3e) )
 	ROM_LOAD16_WORD_SWAP( "19xj.04a", 0x080000, 0x80000, CRC(fb8e3f29) SHA1(513b85bfe5b86692faa4d20b755fe261a7f95bfc) )
 	ROM_LOAD16_WORD_SWAP( "19xj.05a", 0x100000, 0x80000, CRC(aa508ac4) SHA1(c906f4a92872f4ecda662146690acbe5165ae79e) )
@@ -1542,11 +1542,11 @@
 	ROM_LOAD64_WORD( "19x.18m",   0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) )
 	ROM_LOAD64_WORD( "19x.20m",   0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "19x.01",   0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "19x.11m",   0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) )
 	ROM_LOAD16_WORD_SWAP( "19x.12m",   0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) )
 
@@ -1555,7 +1555,7 @@
 ROM_END
 
 ROM_START( 19xxjr2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "19xj.03", 0x000000, 0x80000, CRC(26a381ed) SHA1(9a6bd9a8c152096f653c0b5a161dd08314fdb5e7) )
 	ROM_LOAD16_WORD_SWAP( "19xj.04", 0x080000, 0x80000, CRC(30100cca) SHA1(3fc964e6daffa5dd7b9f72c8ace3a4b9d515e9ce) )
 	ROM_LOAD16_WORD_SWAP( "19xj.05", 0x100000, 0x80000, CRC(de67e938) SHA1(5f977c07c6ffa816ccfa2c7bab8a77b64c232610) )
@@ -1572,11 +1572,11 @@
 	ROM_LOAD64_WORD( "19x.18m",   0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) )
 	ROM_LOAD64_WORD( "19x.20m",   0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "19x.01",   0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "19x.11m",   0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) )
 	ROM_LOAD16_WORD_SWAP( "19x.12m",   0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) )
 
@@ -1585,12 +1585,12 @@
 ROM_END
 
 ROM_START( 19xxa )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
-	ROM_LOAD16_WORD_SWAP( "09xa.03b", 0x000000, 0x80000, CRC(2e994897) SHA1(8dee5d84fd01f416fa6dfef76be0dfff90f45595) ) /* Yes it's actually 09xa, that's not a typo */
-	ROM_LOAD16_WORD_SWAP( "09xa.04b", 0x080000, 0x80000, CRC(6364d001) SHA1(a6f3f0015c9a3c27bc2109d557b88d0773a83465) ) /* Yes it's actually 09xa, that's not a typo */
-	ROM_LOAD16_WORD_SWAP( "09xa.05b", 0x100000, 0x80000, CRC(00c1949b) SHA1(4120a57d06638c637b74442b200e46d9b13fa431) ) /* Yes it's actually 09xa, that's not a typo */
-	ROM_LOAD16_WORD_SWAP( "09xa.06b", 0x180000, 0x80000, CRC(363c1f6e) SHA1(2e358e345f1d5963836b0ac8c6a1b455638bd19d) ) /* Yes it's actually 09xa, that's not a typo */
-	ROM_LOAD16_WORD_SWAP( "19xa.07",  0x200000, 0x80000, CRC(61c0296c) SHA1(9e225beccffd14bb53a32f8c0f2aef7f331dae30) ) /* This one was different, it actually was 19xa */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
+	ROM_LOAD16_WORD_SWAP( "09xa.03b", 0x000000, 0x80000, CRC(2e994897) SHA1(8dee5d84fd01f416fa6dfef76be0dfff90f45595) ) // Yes it's actually 09xa, that's not a typo
+	ROM_LOAD16_WORD_SWAP( "09xa.04b", 0x080000, 0x80000, CRC(6364d001) SHA1(a6f3f0015c9a3c27bc2109d557b88d0773a83465) ) // Yes it's actually 09xa, that's not a typo
+	ROM_LOAD16_WORD_SWAP( "09xa.05b", 0x100000, 0x80000, CRC(00c1949b) SHA1(4120a57d06638c637b74442b200e46d9b13fa431) ) // Yes it's actually 09xa, that's not a typo
+	ROM_LOAD16_WORD_SWAP( "09xa.06b", 0x180000, 0x80000, CRC(363c1f6e) SHA1(2e358e345f1d5963836b0ac8c6a1b455638bd19d) ) // Yes it's actually 09xa, that's not a typo
+	ROM_LOAD16_WORD_SWAP( "19xa.07",  0x200000, 0x80000, CRC(61c0296c) SHA1(9e225beccffd14bb53a32f8c0f2aef7f331dae30) ) // This one was different, it actually was 19xa
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
 	ROM_LOAD64_WORD( "19x.13m",   0x0000000, 0x080000, CRC(427aeb18) SHA1(901029b5423e4bda85f592735036c06b7d426680) )
@@ -1602,11 +1602,11 @@
 	ROM_LOAD64_WORD( "19x.18m",   0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) )
 	ROM_LOAD64_WORD( "19x.20m",   0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "19x.01",   0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "19x.11m",   0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) )
 	ROM_LOAD16_WORD_SWAP( "19x.12m",   0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) )
 
@@ -1615,7 +1615,7 @@
 ROM_END
 
 ROM_START( 19xxar1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "19xa.03", 0x000000, 0x80000, CRC(0c20fd50) SHA1(3aeb698ac67e6c8d0224e68d9258ef45f735432a) )
 	ROM_LOAD16_WORD_SWAP( "19xa.04", 0x080000, 0x80000, CRC(1fc37508) SHA1(f4b858b5dc6243c5cd432d1a72d828831c8eca6f) )
 	ROM_LOAD16_WORD_SWAP( "19xa.05", 0x100000, 0x80000, CRC(6c9cc4ed) SHA1(2b01ffe0bba41640ffc0c13dfdacf3cf0e3e131d) )
@@ -1632,11 +1632,11 @@
 	ROM_LOAD64_WORD( "19x.18m",   0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) )
 	ROM_LOAD64_WORD( "19x.20m",   0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "19x.01",   0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "19x.11m",   0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) )
 	ROM_LOAD16_WORD_SWAP( "19x.12m",   0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) )
 
@@ -1645,7 +1645,7 @@
 ROM_END
 
 ROM_START( 19xxh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "19xh.03a", 0x000000, 0x80000, CRC(357be2ac) SHA1(660641d8cd2f7b574809badf99924f0a31a0cccd) )
 	ROM_LOAD16_WORD_SWAP( "19xh.04a", 0x080000, 0x80000, CRC(bb13ea3b) SHA1(3ae0fa09ae031e2a0f1ea8645a9baced44289383) )
 	ROM_LOAD16_WORD_SWAP( "19xh.05a", 0x100000, 0x80000, CRC(cbd76601) SHA1(a6b64e5f4b35a120dc463a6c9e98e2ec8e739e59) )
@@ -1662,11 +1662,11 @@
 	ROM_LOAD64_WORD( "19x.18m",   0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) )
 	ROM_LOAD64_WORD( "19x.20m",   0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "19x.01",   0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "19x.11m",   0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) )
 	ROM_LOAD16_WORD_SWAP( "19x.12m",   0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) )
 
@@ -1675,7 +1675,7 @@
 ROM_END
 
 ROM_START( 19xxb )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "19xb.03a", 0x000000, 0x80000, CRC(341bdf4a) SHA1(e7deccd034f2a2664507dbb7fed9757c2424dbf7) )
 	ROM_LOAD16_WORD_SWAP( "19xb.04a", 0x080000, 0x80000, CRC(dff8069e) SHA1(3b31d1f66680cee1da3f3d3fd822739e99f48ccd) )
 	ROM_LOAD16_WORD_SWAP( "19xb.05a", 0x100000, 0x80000, CRC(a47a92a8) SHA1(20254ec70029ec027793d4fbd9a7067c2a756315) )
@@ -1692,11 +1692,11 @@
 	ROM_LOAD64_WORD( "19x.18m",   0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) )
 	ROM_LOAD64_WORD( "19x.20m",   0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "19x.01",   0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "19x.11m",   0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) )
 	ROM_LOAD16_WORD_SWAP( "19x.12m",   0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) )
 
@@ -1705,7 +1705,7 @@
 ROM_END
 
 ROM_START( armwar )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pwge.03c", 0x000000, 0x80000, CRC(31f74931) SHA1(66150fc9896acca1691c9d586abeb2c7299bb9ad) )
 	ROM_LOAD16_WORD_SWAP( "pwge.04c", 0x080000, 0x80000, CRC(16f34f5f) SHA1(b831e3915d8cbffdfe4720d356e5196cdebdb6e7) )
 	ROM_LOAD16_WORD_SWAP( "pwge.05b", 0x100000, 0x80000, CRC(4403ed08) SHA1(cc78c84105a58e43e7a6429281397d68b91e86e5) )
@@ -1725,12 +1725,12 @@
 	ROM_LOAD64_WORD( "pwg.18m",   0x1000004, 0x100000, CRC(0109c71b) SHA1(eb51284ee0c85ff8f605fe1d166b7aa202be1344) )
 	ROM_LOAD64_WORD( "pwg.20m",   0x1000006, 0x100000, CRC(eb75ffbe) SHA1(e9d1deca60be696ac5bff2017fb5de3525e5239a) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pwg.01",   0x00000, 0x08000, CRC(18a5c0e4) SHA1(bb1353dd74884aaeec9b5f1d0b284d9cad53c0ff) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pwg.02",   0x28000, 0x20000, CRC(c9dfffa6) SHA1(64e71028befe9a2514074be765dd020e1d2ea70b) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pwg.11m",   0x000000, 0x200000, CRC(a78f7433) SHA1(e47ffba7b9dac9d0dda985c5d966194be18260f7) )
 	ROM_LOAD16_WORD_SWAP( "pwg.12m",   0x200000, 0x200000, CRC(77438ed0) SHA1(733ca6c6a792e66e2aa12c5fc06dd459527afe4b) )
 
@@ -1739,7 +1739,7 @@
 ROM_END
 
 ROM_START( armwarr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pwge.03b", 0x000000, 0x80000, CRC(e822e3e9) SHA1(dcd153bb70f6c2baffa2f3687def30d85fca44ba) )
 	ROM_LOAD16_WORD_SWAP( "pwge.04b", 0x080000, 0x80000, CRC(4f89de39) SHA1(1e54ed70a6ed9330ec83fb189f76e9417c6dfc13) )
 	ROM_LOAD16_WORD_SWAP( "pwge.05a", 0x100000, 0x80000, CRC(83df24e5) SHA1(39801452769569c3271b26c6be8d3ce5e72b0629) )
@@ -1759,12 +1759,12 @@
 	ROM_LOAD64_WORD( "pwg.18m",   0x1000004, 0x100000, CRC(0109c71b) SHA1(eb51284ee0c85ff8f605fe1d166b7aa202be1344) )
 	ROM_LOAD64_WORD( "pwg.20m",   0x1000006, 0x100000, CRC(eb75ffbe) SHA1(e9d1deca60be696ac5bff2017fb5de3525e5239a) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pwg.01",   0x00000, 0x08000, CRC(18a5c0e4) SHA1(bb1353dd74884aaeec9b5f1d0b284d9cad53c0ff) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pwg.02",   0x28000, 0x20000, CRC(c9dfffa6) SHA1(64e71028befe9a2514074be765dd020e1d2ea70b) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pwg.11m",   0x000000, 0x200000, CRC(a78f7433) SHA1(e47ffba7b9dac9d0dda985c5d966194be18260f7) )
 	ROM_LOAD16_WORD_SWAP( "pwg.12m",   0x200000, 0x200000, CRC(77438ed0) SHA1(733ca6c6a792e66e2aa12c5fc06dd459527afe4b) )
 
@@ -1773,7 +1773,7 @@
 ROM_END
 
 ROM_START( armwaru )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pwgu.03b", 0x000000, 0x80000, CRC(8b95497a) SHA1(0c037b8a484d69f5e8c9600de71177fb78e9ede0) )
 	ROM_LOAD16_WORD_SWAP( "pwgu.04b", 0x080000, 0x80000, CRC(29eb5661) SHA1(7ee9150072882c9e158ca8231f26a9f62c8fa50e) )
 	ROM_LOAD16_WORD_SWAP( "pwgu.05b", 0x100000, 0x80000, CRC(a54e9e44) SHA1(e235dcdbd0111f018519d9c8eef130121ea20a20) )
@@ -1793,12 +1793,12 @@
 	ROM_LOAD64_WORD( "pwg.18m",   0x1000004, 0x100000, CRC(0109c71b) SHA1(eb51284ee0c85ff8f605fe1d166b7aa202be1344) )
 	ROM_LOAD64_WORD( "pwg.20m",   0x1000006, 0x100000, CRC(eb75ffbe) SHA1(e9d1deca60be696ac5bff2017fb5de3525e5239a) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pwg.01",   0x00000, 0x08000, CRC(18a5c0e4) SHA1(bb1353dd74884aaeec9b5f1d0b284d9cad53c0ff) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pwg.02",   0x28000, 0x20000, CRC(c9dfffa6) SHA1(64e71028befe9a2514074be765dd020e1d2ea70b) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pwg.11m",   0x000000, 0x200000, CRC(a78f7433) SHA1(e47ffba7b9dac9d0dda985c5d966194be18260f7) )
 	ROM_LOAD16_WORD_SWAP( "pwg.12m",   0x200000, 0x200000, CRC(77438ed0) SHA1(733ca6c6a792e66e2aa12c5fc06dd459527afe4b) )
 
@@ -1807,7 +1807,7 @@
 ROM_END
 
 ROM_START( armwaru1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pwgu.03a", 0x000000, 0x80000, CRC(73d397b1) SHA1(43c33f5268e98411fbbb27f8b59c2ff5dcaf3c34) )
 	ROM_LOAD16_WORD_SWAP( "pwgu.04a", 0x080000, 0x80000, CRC(1f1de215) SHA1(b0a74a4effddd30fbc972d94e4bf3848c4893363) )
 	ROM_LOAD16_WORD_SWAP( "pwgu.05a", 0x100000, 0x80000, CRC(835fbe73) SHA1(6218aa1b480105ffabded980c92679fafb19b824) )
@@ -1827,12 +1827,12 @@
 	ROM_LOAD64_WORD( "pwg.18m",   0x1000004, 0x100000, CRC(0109c71b) SHA1(eb51284ee0c85ff8f605fe1d166b7aa202be1344) )
 	ROM_LOAD64_WORD( "pwg.20m",   0x1000006, 0x100000, CRC(eb75ffbe) SHA1(e9d1deca60be696ac5bff2017fb5de3525e5239a) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pwg.01",   0x00000, 0x08000, CRC(18a5c0e4) SHA1(bb1353dd74884aaeec9b5f1d0b284d9cad53c0ff) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pwg.02",   0x28000, 0x20000, CRC(c9dfffa6) SHA1(64e71028befe9a2514074be765dd020e1d2ea70b) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pwg.11m",   0x000000, 0x200000, CRC(a78f7433) SHA1(e47ffba7b9dac9d0dda985c5d966194be18260f7) )
 	ROM_LOAD16_WORD_SWAP( "pwg.12m",   0x200000, 0x200000, CRC(77438ed0) SHA1(733ca6c6a792e66e2aa12c5fc06dd459527afe4b) )
 
@@ -1841,7 +1841,7 @@
 ROM_END
 
 ROM_START( pgear )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pwgj.03a", 0x000000, 0x80000, CRC(c79c0c02) SHA1(4e24d34be255bb3886bd6b767779ee5fc81dca6e) )
 	ROM_LOAD16_WORD_SWAP( "pwgj.04a", 0x080000, 0x80000, CRC(167c6ed8) SHA1(23a4a7faae817ffc6c5faa4db5b96b8c8c0dfe86) )
 	ROM_LOAD16_WORD_SWAP( "pwgj.05a", 0x100000, 0x80000, CRC(a63fb400) SHA1(b27464b000cd12d9247254f843be27639fbf3a48) )
@@ -1861,12 +1861,12 @@
 	ROM_LOAD64_WORD( "pwg.18m",   0x1000004, 0x100000, CRC(0109c71b) SHA1(eb51284ee0c85ff8f605fe1d166b7aa202be1344) )
 	ROM_LOAD64_WORD( "pwg.20m",   0x1000006, 0x100000, CRC(eb75ffbe) SHA1(e9d1deca60be696ac5bff2017fb5de3525e5239a) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pwg.01",   0x00000, 0x08000, CRC(18a5c0e4) SHA1(bb1353dd74884aaeec9b5f1d0b284d9cad53c0ff) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pwg.02",   0x28000, 0x20000, CRC(c9dfffa6) SHA1(64e71028befe9a2514074be765dd020e1d2ea70b) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pwg.11m",   0x000000, 0x200000, CRC(a78f7433) SHA1(e47ffba7b9dac9d0dda985c5d966194be18260f7) )
 	ROM_LOAD16_WORD_SWAP( "pwg.12m",   0x200000, 0x200000, CRC(77438ed0) SHA1(733ca6c6a792e66e2aa12c5fc06dd459527afe4b) )
 
@@ -1875,7 +1875,7 @@
 ROM_END
 
 ROM_START( pgearr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pwgj.03", 0x000000, 0x80000, CRC(f264e74b) SHA1(db0a675a9d46df9227334259db633e27f7dc79ab) )
 	ROM_LOAD16_WORD_SWAP( "pwgj.04", 0x080000, 0x80000, CRC(23a84983) SHA1(a3ed606f6213bb6e447c4ff84d6d3435a0170762) )
 	ROM_LOAD16_WORD_SWAP( "pwgj.05", 0x100000, 0x80000, CRC(bef58c62) SHA1(178c255171c4010cec758ee11d96bdcee85abee0) )
@@ -1895,12 +1895,12 @@
 	ROM_LOAD64_WORD( "pwg.18m",   0x1000004, 0x100000, CRC(0109c71b) SHA1(eb51284ee0c85ff8f605fe1d166b7aa202be1344) )
 	ROM_LOAD64_WORD( "pwg.20m",   0x1000006, 0x100000, CRC(eb75ffbe) SHA1(e9d1deca60be696ac5bff2017fb5de3525e5239a) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pwg.01",   0x00000, 0x08000, CRC(18a5c0e4) SHA1(bb1353dd74884aaeec9b5f1d0b284d9cad53c0ff) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pwg.02",   0x28000, 0x20000, CRC(c9dfffa6) SHA1(64e71028befe9a2514074be765dd020e1d2ea70b) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pwg.11m",   0x000000, 0x200000, CRC(a78f7433) SHA1(e47ffba7b9dac9d0dda985c5d966194be18260f7) )
 	ROM_LOAD16_WORD_SWAP( "pwg.12m",   0x200000, 0x200000, CRC(77438ed0) SHA1(733ca6c6a792e66e2aa12c5fc06dd459527afe4b) )
 
@@ -1909,7 +1909,7 @@
 ROM_END
 
 ROM_START( armwara )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pwga.03b", 0x000000, 0x80000, CRC(347743e1) SHA1(0cf27209792e70c361e2981b82a4d37643d1b298) )
 	ROM_LOAD16_WORD_SWAP( "pwga.04b", 0x080000, 0x80000, CRC(42dbfb2e) SHA1(cbb7ac2a97de977394eb015f3582ea72432a4529) )
 	ROM_LOAD16_WORD_SWAP( "pwga.05b", 0x100000, 0x80000, CRC(835fbe73) SHA1(6218aa1b480105ffabded980c92679fafb19b824) )
@@ -1929,12 +1929,12 @@
 	ROM_LOAD64_WORD( "pwg.18m",   0x1000004, 0x100000, CRC(0109c71b) SHA1(eb51284ee0c85ff8f605fe1d166b7aa202be1344) )
 	ROM_LOAD64_WORD( "pwg.20m",   0x1000006, 0x100000, CRC(eb75ffbe) SHA1(e9d1deca60be696ac5bff2017fb5de3525e5239a) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pwg.01",   0x00000, 0x08000, CRC(18a5c0e4) SHA1(bb1353dd74884aaeec9b5f1d0b284d9cad53c0ff) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pwg.02",   0x28000, 0x20000, CRC(c9dfffa6) SHA1(64e71028befe9a2514074be765dd020e1d2ea70b) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pwg.11m",   0x000000, 0x200000, CRC(a78f7433) SHA1(e47ffba7b9dac9d0dda985c5d966194be18260f7) )
 	ROM_LOAD16_WORD_SWAP( "pwg.12m",   0x200000, 0x200000, CRC(77438ed0) SHA1(733ca6c6a792e66e2aa12c5fc06dd459527afe4b) )
 
@@ -1943,7 +1943,7 @@
 ROM_END
 
 ROM_START( armwarar1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pwga.03a", 0x000000, 0x80000, CRC(8d474ab1) SHA1(46baa3a263189001cfc6003fcb346a1996be8b24) )
 	ROM_LOAD16_WORD_SWAP( "pwga.04a", 0x080000, 0x80000, CRC(81b5aec7) SHA1(f1371149a00e7c52d022d5c0cb6f8821c6474d35) )
 	ROM_LOAD16_WORD_SWAP( "pwga.05a", 0x100000, 0x80000, CRC(2618e819) SHA1(58c857988e0ad2839d936d3e405637d8e2a45fe9) )
@@ -1963,12 +1963,12 @@
 	ROM_LOAD64_WORD( "pwg.18m",   0x1000004, 0x100000, CRC(0109c71b) SHA1(eb51284ee0c85ff8f605fe1d166b7aa202be1344) )
 	ROM_LOAD64_WORD( "pwg.20m",   0x1000006, 0x100000, CRC(eb75ffbe) SHA1(e9d1deca60be696ac5bff2017fb5de3525e5239a) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pwg.01",   0x00000, 0x08000, CRC(18a5c0e4) SHA1(bb1353dd74884aaeec9b5f1d0b284d9cad53c0ff) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pwg.02",   0x28000, 0x20000, CRC(c9dfffa6) SHA1(64e71028befe9a2514074be765dd020e1d2ea70b) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pwg.11m",   0x000000, 0x200000, CRC(a78f7433) SHA1(e47ffba7b9dac9d0dda985c5d966194be18260f7) )
 	ROM_LOAD16_WORD_SWAP( "pwg.12m",   0x200000, 0x200000, CRC(77438ed0) SHA1(733ca6c6a792e66e2aa12c5fc06dd459527afe4b) )
 
@@ -1977,7 +1977,7 @@
 ROM_END
 
 ROM_START( avsp )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "avpe.03d", 0x000000, 0x80000, CRC(774334a9) SHA1(f60b0e39139ea40e0b0ba97ed01d4a757ed65e1a) )
 	ROM_LOAD16_WORD_SWAP( "avpe.04d", 0x080000, 0x80000, CRC(7fa83769) SHA1(930f02e4d35686e80fbdd673380c4b2bd784a9e5) )
 	ROM_LOAD16_WORD_SWAP( "avp.05d",  0x100000, 0x80000, CRC(fbfb5d7a) SHA1(5549bc9d780753bc9c10fba82588e5c3d4a2acb2) )
@@ -1993,11 +1993,11 @@
 	ROM_LOAD64_WORD( "avp.18m",   0x0800004, 0x200000, CRC(34fb7232) SHA1(8b1f15bfa758a61e6ad519af24ca774edc70d194) )
 	ROM_LOAD64_WORD( "avp.20m",   0x0800006, 0x200000, CRC(f90baa21) SHA1(20a900819a9d321316e3dfd241210725d7191ecf) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "avp.01",   0x00000, 0x08000, CRC(2d3b4220) SHA1(2b2d04d4282550fa9f6e1ad8528f20d1f2ac02eb) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "avp.11m",   0x000000, 0x200000, CRC(83499817) SHA1(e65b0ebd61ddc748842a9d4d92404b5305307623) )
 	ROM_LOAD16_WORD_SWAP( "avp.12m",   0x200000, 0x200000, CRC(f4110d49) SHA1(f27538776cc1ba8213f19f98728ed8c02508d3ac) )
 
@@ -2006,7 +2006,7 @@
 ROM_END
 
 ROM_START( avspu )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "avpu.03d", 0x000000, 0x80000, CRC(42757950) SHA1(e6acae73a300c0e07c21f776e6aa87628184b152) )
 	ROM_LOAD16_WORD_SWAP( "avpu.04d", 0x080000, 0x80000, CRC(5abcdee6) SHA1(205e1ac8f4e359fd04e3a1e12425ba0b8330b1c1) )
 	ROM_LOAD16_WORD_SWAP( "avp.05d",  0x100000, 0x80000, CRC(fbfb5d7a) SHA1(5549bc9d780753bc9c10fba82588e5c3d4a2acb2) )
@@ -2022,11 +2022,11 @@
 	ROM_LOAD64_WORD( "avp.18m",   0x0800004, 0x200000, CRC(34fb7232) SHA1(8b1f15bfa758a61e6ad519af24ca774edc70d194) )
 	ROM_LOAD64_WORD( "avp.20m",   0x0800006, 0x200000, CRC(f90baa21) SHA1(20a900819a9d321316e3dfd241210725d7191ecf) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "avp.01",   0x00000, 0x08000, CRC(2d3b4220) SHA1(2b2d04d4282550fa9f6e1ad8528f20d1f2ac02eb) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "avp.11m",   0x000000, 0x200000, CRC(83499817) SHA1(e65b0ebd61ddc748842a9d4d92404b5305307623) )
 	ROM_LOAD16_WORD_SWAP( "avp.12m",   0x200000, 0x200000, CRC(f4110d49) SHA1(f27538776cc1ba8213f19f98728ed8c02508d3ac) )
 
@@ -2035,7 +2035,7 @@
 ROM_END
 
 ROM_START( avspj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "avpj.03d", 0x000000, 0x80000, CRC(49799119) SHA1(71a938b779291c3092ef6ef22935d89fd9c1186c) )
 	ROM_LOAD16_WORD_SWAP( "avpj.04d", 0x080000, 0x80000, CRC(8cd2bba8) SHA1(1ea493d0d4b6e202ad38843b93035fa3f7e1b8c7) )
 	ROM_LOAD16_WORD_SWAP( "avp.05d",  0x100000, 0x80000, CRC(fbfb5d7a) SHA1(5549bc9d780753bc9c10fba82588e5c3d4a2acb2) )
@@ -2051,11 +2051,11 @@
 	ROM_LOAD64_WORD( "avp.18m",   0x0800004, 0x200000, CRC(34fb7232) SHA1(8b1f15bfa758a61e6ad519af24ca774edc70d194) )
 	ROM_LOAD64_WORD( "avp.20m",   0x0800006, 0x200000, CRC(f90baa21) SHA1(20a900819a9d321316e3dfd241210725d7191ecf) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "avp.01",   0x00000, 0x08000, CRC(2d3b4220) SHA1(2b2d04d4282550fa9f6e1ad8528f20d1f2ac02eb) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "avp.11m",   0x000000, 0x200000, CRC(83499817) SHA1(e65b0ebd61ddc748842a9d4d92404b5305307623) )
 	ROM_LOAD16_WORD_SWAP( "avp.12m",   0x200000, 0x200000, CRC(f4110d49) SHA1(f27538776cc1ba8213f19f98728ed8c02508d3ac) )
 
@@ -2064,7 +2064,7 @@
 ROM_END
 
 ROM_START( avspa )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "avpa.03d", 0x000000, 0x80000, CRC(6c1c1858) SHA1(29af268cf070ea2adc0aac0c5187debdd9706037) )
 	ROM_LOAD16_WORD_SWAP( "avpa.04d", 0x080000, 0x80000, CRC(94f50b0c) SHA1(607b13e4cb4968c47a598f7dfec965c6d6ba68f0) )
 	ROM_LOAD16_WORD_SWAP( "avp.05d",  0x100000, 0x80000, CRC(fbfb5d7a) SHA1(5549bc9d780753bc9c10fba82588e5c3d4a2acb2) )
@@ -2080,11 +2080,11 @@
 	ROM_LOAD64_WORD( "avp.18m",   0x0800004, 0x200000, CRC(34fb7232) SHA1(8b1f15bfa758a61e6ad519af24ca774edc70d194) )
 	ROM_LOAD64_WORD( "avp.20m",   0x0800006, 0x200000, CRC(f90baa21) SHA1(20a900819a9d321316e3dfd241210725d7191ecf) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "avp.01",   0x00000, 0x08000, CRC(2d3b4220) SHA1(2b2d04d4282550fa9f6e1ad8528f20d1f2ac02eb) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "avp.11m",   0x000000, 0x200000, CRC(83499817) SHA1(e65b0ebd61ddc748842a9d4d92404b5305307623) )
 	ROM_LOAD16_WORD_SWAP( "avp.12m",   0x200000, 0x200000, CRC(f4110d49) SHA1(f27538776cc1ba8213f19f98728ed8c02508d3ac) )
 
@@ -2093,7 +2093,7 @@
 ROM_END
 
 ROM_START( avsph )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "avph.03d", 0x000000, 0x80000, CRC(3e440447) SHA1(5b7431de6b9e243f041d0e76b3a69002662c321a) )
 	ROM_LOAD16_WORD_SWAP( "avph.04d", 0x080000, 0x80000, CRC(af6fc82f) SHA1(c0293d71a657dbbe14ce15121d0970ccc7e584cf) )
 	ROM_LOAD16_WORD_SWAP( "avp.05d",  0x100000, 0x80000, CRC(fbfb5d7a) SHA1(5549bc9d780753bc9c10fba82588e5c3d4a2acb2) )
@@ -2109,11 +2109,11 @@
 	ROM_LOAD64_WORD( "avp.18m",   0x0800004, 0x200000, CRC(34fb7232) SHA1(8b1f15bfa758a61e6ad519af24ca774edc70d194) )
 	ROM_LOAD64_WORD( "avp.20m",   0x0800006, 0x200000, CRC(f90baa21) SHA1(20a900819a9d321316e3dfd241210725d7191ecf) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "avp.01",   0x00000, 0x08000, CRC(2d3b4220) SHA1(2b2d04d4282550fa9f6e1ad8528f20d1f2ac02eb) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "avp.11m",   0x000000, 0x200000, CRC(83499817) SHA1(e65b0ebd61ddc748842a9d4d92404b5305307623) )
 	ROM_LOAD16_WORD_SWAP( "avp.12m",   0x200000, 0x200000, CRC(f4110d49) SHA1(f27538776cc1ba8213f19f98728ed8c02508d3ac) )
 
@@ -2122,7 +2122,7 @@
 ROM_END
 
 ROM_START( batcir )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "btce.03", 0x000000, 0x80000, CRC(bc60484b) SHA1(9b4e46d0f3d96edcd1c3707409507a5027c69039) )
 	ROM_LOAD16_WORD_SWAP( "btce.04", 0x080000, 0x80000, CRC(457d55f6) SHA1(19a39ec30166d4b797babe9d70328ac572d1f916) )
 	ROM_LOAD16_WORD_SWAP( "btce.05", 0x100000, 0x80000, CRC(e86560d7) SHA1(a978a7f5e0069cd78c8588c2d91b825796c723a5) )
@@ -2137,12 +2137,12 @@
 	ROM_LOAD64_WORD( "btc.17m",   0x000004, 0x400000, CRC(b33f4112) SHA1(e501fd921c8bcede69946b029e05d422714c1040) )
 	ROM_LOAD64_WORD( "btc.19m",   0x000006, 0x400000, CRC(a6fcdb7e) SHA1(7a28d5d7aa036d23d97fad17d0cdb8210dc8153a) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "btc.01",   0x00000, 0x08000, CRC(1e194310) SHA1(3b29de0aca9dbca59d6b50fb2509e2a913c6b0af) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "btc.02",   0x28000, 0x20000, CRC(01aeb8e6) SHA1(50a5d1cce0caf7c5143d4904431e8f41e2a57464) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "btc.11m",   0x000000, 0x200000, CRC(c27f2229) SHA1(df2459493af40937b6656a16fad43ff51bed2204) )
 	ROM_LOAD16_WORD_SWAP( "btc.12m",   0x200000, 0x200000, CRC(418a2e33) SHA1(0642ddff2ab9255f154419da24ba644ed63f34ab) )
 
@@ -2151,7 +2151,7 @@
 ROM_END
 
 ROM_START( batcirj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "btcj.03", 0x000000, 0x80000, CRC(6b7e168d) SHA1(7e95cc436d53d1ce34b575bc7e2b6e2a7ae06cfb) )
 	ROM_LOAD16_WORD_SWAP( "btcj.04", 0x080000, 0x80000, CRC(46ba3467) SHA1(0cc4a6c82f110d2334fd81f2d3abe5de882768bd) )
 	ROM_LOAD16_WORD_SWAP( "btcj.05", 0x100000, 0x80000, CRC(0e23a859) SHA1(6c7eec9bf823c66fddbc6b297ea6aa883d03bff5) )
@@ -2166,12 +2166,12 @@
 	ROM_LOAD64_WORD( "btc.17m",   0x000004, 0x400000, CRC(b33f4112) SHA1(e501fd921c8bcede69946b029e05d422714c1040) )
 	ROM_LOAD64_WORD( "btc.19m",   0x000006, 0x400000, CRC(a6fcdb7e) SHA1(7a28d5d7aa036d23d97fad17d0cdb8210dc8153a) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "btc.01",   0x00000, 0x08000, CRC(1e194310) SHA1(3b29de0aca9dbca59d6b50fb2509e2a913c6b0af) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "btc.02",   0x28000, 0x20000, CRC(01aeb8e6) SHA1(50a5d1cce0caf7c5143d4904431e8f41e2a57464) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "btc.11m",   0x000000, 0x200000, CRC(c27f2229) SHA1(df2459493af40937b6656a16fad43ff51bed2204) )
 	ROM_LOAD16_WORD_SWAP( "btc.12m",   0x200000, 0x200000, CRC(418a2e33) SHA1(0642ddff2ab9255f154419da24ba644ed63f34ab) )
 
@@ -2180,7 +2180,7 @@
 ROM_END
 
 ROM_START( batcira )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "btca.03", 0x000000, 0x80000, CRC(1ad20d87) SHA1(0ad8b7725604a61314883cd4ed8599445fe1cbf8) )
 	ROM_LOAD16_WORD_SWAP( "btca.04", 0x080000, 0x80000, CRC(2b3f4dbe) SHA1(be4ab2ac411523def5e05081a754b651ead52e1f) )
 	ROM_LOAD16_WORD_SWAP( "btca.05", 0x100000, 0x80000, CRC(8238a3d9) SHA1(4b0fe0e6c6a8a6572fc3554f2ee77dc01c2f75c3) )
@@ -2195,12 +2195,12 @@
 	ROM_LOAD64_WORD( "btc.17m",   0x000004, 0x400000, CRC(b33f4112) SHA1(e501fd921c8bcede69946b029e05d422714c1040) )
 	ROM_LOAD64_WORD( "btc.19m",   0x000006, 0x400000, CRC(a6fcdb7e) SHA1(7a28d5d7aa036d23d97fad17d0cdb8210dc8153a) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "btc.01",   0x00000, 0x08000, CRC(1e194310) SHA1(3b29de0aca9dbca59d6b50fb2509e2a913c6b0af) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "btc.02",   0x28000, 0x20000, CRC(01aeb8e6) SHA1(50a5d1cce0caf7c5143d4904431e8f41e2a57464) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "btc.11m",   0x000000, 0x200000, CRC(c27f2229) SHA1(df2459493af40937b6656a16fad43ff51bed2204) )
 	ROM_LOAD16_WORD_SWAP( "btc.12m",   0x200000, 0x200000, CRC(418a2e33) SHA1(0642ddff2ab9255f154419da24ba644ed63f34ab) )
 
@@ -2209,34 +2209,34 @@
 ROM_END
 
 ROM_START( choko )
-	ROM_REGION( CODE_SIZE, "maincpu", ROMREGION_ERASEFF )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", ROMREGION_ERASEFF ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "tkoj.03", 0x000000, 0x80000, CRC(11f5452f) SHA1(1575729cdbb857a3a780df6e3e0efd6968926fb8) )
 	ROM_LOAD16_WORD_SWAP( "tkoj.04", 0x080000, 0x80000, CRC(68655378) SHA1(a2d82996394cc28622e93f6c338f9b78aa798775) )
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "tkoj1_d.simm1",   0x0000000, 0x200000, CRC(6933377d) SHA1(a79e129e5faaadd401379905ac76a24fa616d736) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "tkoj1_c.simm1",   0x0000001, 0x200000, CRC(7f668950) SHA1(247b2b3fa24afd43b0fe6cfb3df987a38c7385cf) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "tkoj1_b.simm1",   0x0000002, 0x200000, CRC(cfb68ca9) SHA1(36460724b8df36a4ccf88228d9d5f027714c6628) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "tkoj1_a.simm1",   0x0000003, 0x200000, CRC(437e21c5) SHA1(2c4ace6fa421c91effab8ab8db931b8451b8e6b1) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "tkoj3_d.simm3",   0x0000004, 0x200000, CRC(a9e32b57) SHA1(0ddbfefa0cc110e46297ecbfbf4b8bc87ce43c95) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "tkoj3_c.simm3",   0x0000005, 0x200000, CRC(b7ab9338) SHA1(0bb57640eed167e672b5f40cdff0a7b177ff2507) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "tkoj3_b.simm3",   0x0000006, 0x200000, CRC(4d3f919a) SHA1(eb7f90415a263f0a2b94d9699d72c1d14b4fdaad) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "tkoj3_a.simm3",   0x0000007, 0x200000, CRC(cfef17ab) SHA1(1de738c1e537c3df80171e82bc1cc05a25d9cc13) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "tkoj1_d.simm1",   0x0000000, 0x200000, CRC(6933377d) SHA1(a79e129e5faaadd401379905ac76a24fa616d736) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "tkoj1_c.simm1",   0x0000001, 0x200000, CRC(7f668950) SHA1(247b2b3fa24afd43b0fe6cfb3df987a38c7385cf) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "tkoj1_b.simm1",   0x0000002, 0x200000, CRC(cfb68ca9) SHA1(36460724b8df36a4ccf88228d9d5f027714c6628) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "tkoj1_a.simm1",   0x0000003, 0x200000, CRC(437e21c5) SHA1(2c4ace6fa421c91effab8ab8db931b8451b8e6b1) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "tkoj3_d.simm3",   0x0000004, 0x200000, CRC(a9e32b57) SHA1(0ddbfefa0cc110e46297ecbfbf4b8bc87ce43c95) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "tkoj3_c.simm3",   0x0000005, 0x200000, CRC(b7ab9338) SHA1(0bb57640eed167e672b5f40cdff0a7b177ff2507) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "tkoj3_b.simm3",   0x0000006, 0x200000, CRC(4d3f919a) SHA1(eb7f90415a263f0a2b94d9699d72c1d14b4fdaad) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "tkoj3_a.simm3",   0x0000007, 0x200000, CRC(cfef17ab) SHA1(1de738c1e537c3df80171e82bc1cc05a25d9cc13) ) // ROM on a SIMM
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "tko.01",   0x00000, 0x08000, CRC(6eda50c2) SHA1(7e67c104094a3ced8b3fdd81f52ee42483b30fc5) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_BYTE( "tkoj5_a.simm5",   0x000000, 0x200000, CRC(ab45d509) SHA1(c58cf87d3828dfe0643cf4c58615f3352bd45508) ) // ROM on a simm
-	ROM_LOAD16_BYTE( "tkoj5_b.simm5",   0x000001, 0x200000, CRC(fa905c3d) SHA1(3eae65b01d50ec4ec4aeff49f434b9b88a50463c) ) // ROM on a simm
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_BYTE( "tkoj5_a.simm5",   0x000000, 0x200000, CRC(ab45d509) SHA1(c58cf87d3828dfe0643cf4c58615f3352bd45508) ) // ROM on a SIMM
+	ROM_LOAD16_BYTE( "tkoj5_b.simm5",   0x000001, 0x200000, CRC(fa905c3d) SHA1(3eae65b01d50ec4ec4aeff49f434b9b88a50463c) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "choko.key",    0x000000, 0x000014, CRC(08505e8b) SHA1(5c481ffaa93faec57d0b80b678c8c0cca1a699c0) )
 ROM_END
 
 ROM_START( csclub )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "csce.03a", 0x000000, 0x80000, CRC(824082be) SHA1(a44e7e17d73e089b4e7784317f2387d135d01482) )
 	ROM_LOAD16_WORD_SWAP( "csce.04a", 0x080000, 0x80000, CRC(74e6a4fe) SHA1(2a732a6e57088885e77256eb17ddd3ae523db09f) )
 	ROM_LOAD16_WORD_SWAP( "csce.05a", 0x100000, 0x80000, CRC(8ae0df19) SHA1(88e7bf1ee0e18d74748cecd875cb96524dfa01cf) )
@@ -2262,11 +2262,11 @@
 	ROM_LOAD64_WORD( "csc.95",  0xc00006, 0x080000, CRC(4d014297) SHA1(df172a3723793b9955ff1f65e76fe5c20fc37b89) )
 	ROM_LOAD64_WORD( "csc.96",  0xe00006, 0x080000, CRC(6754b1ef) SHA1(ab5d62056b19999ccecd0eeec7b7c5869ca8fea8) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "csc.01",   0x00000, 0x08000, CRC(ee162111) SHA1(ce8d4bd32bb10ee8b0274ba6fcef05a583b39d48) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "csc.51",   0x000000, 0x080000, CRC(5a52afd5) SHA1(ab873ec556933b75be82ba249357cceb01a7a0bd) )
 	ROM_LOAD16_WORD_SWAP( "csc.52",   0x080000, 0x080000, CRC(1408a811) SHA1(1d31e3cd505245b5ff4d3c55d5fa7017c0f1e168) )
 	ROM_LOAD16_WORD_SWAP( "csc.53",   0x100000, 0x080000, CRC(4fb9f57c) SHA1(093e8e3a03b62783a84fe4ae239e9eb46cbfd71e) )
@@ -2281,7 +2281,7 @@
 ROM_END
 
 ROM_START( csclub1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "csce.03", 0x000000, 0x80000, CRC(f2c852ef) SHA1(bc2d403958640d7ab0785d01a3df79ec31d0c239) )
 	ROM_LOAD16_WORD_SWAP( "csce.04", 0x080000, 0x80000, CRC(1184530f) SHA1(18565f6a06e6078fc20dd9cf70802ac1da60c67a) )
 	ROM_LOAD16_WORD_SWAP( "csce.05", 0x100000, 0x80000, CRC(804e2b6b) SHA1(e638f73442e3165ace84cdb1bd2a9d419e2d8c41) )
@@ -2295,11 +2295,11 @@
 	ROM_LOAD64_WORD( "csc.18m",  0x800004, 0x200000, CRC(c030df5a) SHA1(6d5e5a05531e168d0d44c591f9185ae300908fc2) )
 	ROM_LOAD64_WORD( "csc.20m",  0x800006, 0x200000, CRC(b4e55863) SHA1(da66f0a36266b906e4c149aec152c323bb184c57) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "csc.01",   0x00000, 0x08000, CRC(ee162111) SHA1(ce8d4bd32bb10ee8b0274ba6fcef05a583b39d48) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "csc.11m",   0x000000, 0x200000, CRC(a027b827) SHA1(6d58a63efc7bd5d07353d9b55826c01a3c416c33) )
 	ROM_LOAD16_WORD_SWAP( "csc.12m",   0x200000, 0x200000, CRC(cb7f6e55) SHA1(b64e6b663fd09e887d2dc0f4b545e88688c0af55) )
 
@@ -2308,7 +2308,7 @@
 ROM_END
 
 ROM_START( csclubj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "cscj.03", 0x000000, 0x80000, CRC(ec4ddaa2) SHA1(f84af8bd01cc994ecd6ac24e829e2bd33817d862) )
 	ROM_LOAD16_WORD_SWAP( "cscj.04", 0x080000, 0x80000, CRC(60c632bb) SHA1(0d42c33aa476d2cc4efcdad78667353b88225966) )
 	ROM_LOAD16_WORD_SWAP( "cscj.05", 0x100000, 0x80000, CRC(ad042003) SHA1(1e167c88f3b0617c38c9f43bdc816045ac0296e0) )
@@ -2317,25 +2317,25 @@
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
 	ROM_FILL(              0x000000, 0x800000, 0x00 )
-	ROM_LOAD64_WORD( "csc.14m",  0x800000, 0x200000, CRC(e8904afa) SHA1(39713ffca4e3a754c7c44c0ef4d99fb5a77d8da7) ) /* roms 73 to 76 joined in all eprom version */
-	ROM_LOAD64_WORD( "csc.16m",  0x800002, 0x200000, CRC(c98c8079) SHA1(22d68ba2ef62b51981bb3e99ec2cde8d1b36514b) ) /* roms 63 to 66 joined in all eprom version */
-	ROM_LOAD64_WORD( "csc.18m",  0x800004, 0x200000, CRC(c030df5a) SHA1(6d5e5a05531e168d0d44c591f9185ae300908fc2) ) /* roms 83 to 86 joined in all eprom version */
-	ROM_LOAD64_WORD( "csc.20m",  0x800006, 0x200000, CRC(b4e55863) SHA1(da66f0a36266b906e4c149aec152c323bb184c57) ) /* roms 93 to 96 joined in all eprom version */
+	ROM_LOAD64_WORD( "csc.14m",  0x800000, 0x200000, CRC(e8904afa) SHA1(39713ffca4e3a754c7c44c0ef4d99fb5a77d8da7) ) // ROMs 73 to 76 joined in all EPROM version
+	ROM_LOAD64_WORD( "csc.16m",  0x800002, 0x200000, CRC(c98c8079) SHA1(22d68ba2ef62b51981bb3e99ec2cde8d1b36514b) ) // ROMs 63 to 66 joined in all EPROM version
+	ROM_LOAD64_WORD( "csc.18m",  0x800004, 0x200000, CRC(c030df5a) SHA1(6d5e5a05531e168d0d44c591f9185ae300908fc2) ) // ROMs 83 to 86 joined in all EPROM version
+	ROM_LOAD64_WORD( "csc.20m",  0x800006, 0x200000, CRC(b4e55863) SHA1(da66f0a36266b906e4c149aec152c323bb184c57) ) // ROMs 93 to 96 joined in all EPROM version
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "csc.01",   0x00000, 0x08000, CRC(ee162111) SHA1(ce8d4bd32bb10ee8b0274ba6fcef05a583b39d48) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "csc.11m",   0x000000, 0x200000, CRC(a027b827) SHA1(6d58a63efc7bd5d07353d9b55826c01a3c416c33) ) /* roms 51 to 54 joined in all eprom version */
-	ROM_LOAD16_WORD_SWAP( "csc.12m",   0x200000, 0x200000, CRC(cb7f6e55) SHA1(b64e6b663fd09e887d2dc0f4b545e88688c0af55) ) /* roms 55 to 58 joined in all eprom version */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "csc.11m",   0x000000, 0x200000, CRC(a027b827) SHA1(6d58a63efc7bd5d07353d9b55826c01a3c416c33) ) // ROMs 51 to 54 joined in all EPROM version
+	ROM_LOAD16_WORD_SWAP( "csc.12m",   0x200000, 0x200000, CRC(cb7f6e55) SHA1(b64e6b663fd09e887d2dc0f4b545e88688c0af55) ) // ROMs 55 to 58 joined in all EPROM version
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "csclubj.key",  0x000000, 0x000014, CRC(519a04db) SHA1(8f792831dc7e07fb621806c4e320a047f801e9b8) )
 ROM_END
 
-ROM_START( csclubjy ) // this is fairly redundant, same code as csclubj, same gfx as csclub (yellow case - all eprom), but it's a valid shipped combination
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+ROM_START( csclubjy ) // This is fairly redundant, same code as csclubj, same gfx as csclub (yellow case - all eprom), but it's a valid shipped combination
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "cscj.03", 0x000000, 0x80000, CRC(ec4ddaa2) SHA1(f84af8bd01cc994ecd6ac24e829e2bd33817d862) )
 	ROM_LOAD16_WORD_SWAP( "cscj.04", 0x080000, 0x80000, CRC(60c632bb) SHA1(0d42c33aa476d2cc4efcdad78667353b88225966) )
 	ROM_LOAD16_WORD_SWAP( "cscj.05", 0x100000, 0x80000, CRC(ad042003) SHA1(1e167c88f3b0617c38c9f43bdc816045ac0296e0) )
@@ -2361,11 +2361,11 @@
 	ROM_LOAD64_WORD( "csc.95",  0xc00006, 0x080000, CRC(4d014297) SHA1(df172a3723793b9955ff1f65e76fe5c20fc37b89) )
 	ROM_LOAD64_WORD( "csc.96",  0xe00006, 0x080000, CRC(6754b1ef) SHA1(ab5d62056b19999ccecd0eeec7b7c5869ca8fea8) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "csc.01",   0x00000, 0x08000, CRC(ee162111) SHA1(ce8d4bd32bb10ee8b0274ba6fcef05a583b39d48) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "csc.51",   0x000000, 0x080000, CRC(5a52afd5) SHA1(ab873ec556933b75be82ba249357cceb01a7a0bd) )
 	ROM_LOAD16_WORD_SWAP( "csc.52",   0x080000, 0x080000, CRC(1408a811) SHA1(1d31e3cd505245b5ff4d3c55d5fa7017c0f1e168) )
 	ROM_LOAD16_WORD_SWAP( "csc.53",   0x100000, 0x080000, CRC(4fb9f57c) SHA1(093e8e3a03b62783a84fe4ae239e9eb46cbfd71e) )
@@ -2381,7 +2381,7 @@
 
 
 ROM_START( cscluba )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "csca.03", 0x000000, 0x80000, CRC(b6acd708) SHA1(27d316053b0e74b1e9db979d500767cfa49fbce3) )
 	ROM_LOAD16_WORD_SWAP( "csca.04", 0x080000, 0x80000, CRC(d44ae35f) SHA1(cd464792fe777183b0b0587239fb1b52bd7f9ec7) )
 	ROM_LOAD16_WORD_SWAP( "csca.05", 0x100000, 0x80000, CRC(8da76aec) SHA1(04552f2c9c424d808703136a7909df903aec290a) )
@@ -2395,11 +2395,11 @@
 	ROM_LOAD64_WORD( "csc.18m",  0x800004, 0x200000, CRC(c030df5a) SHA1(6d5e5a05531e168d0d44c591f9185ae300908fc2) )
 	ROM_LOAD64_WORD( "csc.20m",  0x800006, 0x200000, CRC(b4e55863) SHA1(da66f0a36266b906e4c149aec152c323bb184c57) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "csc.01",   0x00000, 0x08000, CRC(ee162111) SHA1(ce8d4bd32bb10ee8b0274ba6fcef05a583b39d48) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "csc.11m",   0x000000, 0x200000, CRC(a027b827) SHA1(6d58a63efc7bd5d07353d9b55826c01a3c416c33) )
 	ROM_LOAD16_WORD_SWAP( "csc.12m",   0x200000, 0x200000, CRC(cb7f6e55) SHA1(b64e6b663fd09e887d2dc0f4b545e88688c0af55) )
 
@@ -2408,7 +2408,7 @@
 ROM_END
 
 ROM_START( csclubh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "csch.03", 0x000000, 0x80000, CRC(0dd7e46d) SHA1(deacd350b8954998636065cf070c9955d08402b8) )
 	ROM_LOAD16_WORD_SWAP( "csch.04", 0x080000, 0x80000, CRC(486e8143) SHA1(d50ab8a5fdc194a9cded74cff94e5b3b69069826) )
 	ROM_LOAD16_WORD_SWAP( "csch.05", 0x100000, 0x80000, CRC(9e509dfb) SHA1(4a6cd8488a63ad3f7d5a08f2a6af4728dc147790) )
@@ -2417,25 +2417,25 @@
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
 	ROM_FILL(              0x000000, 0x800000, 0x00 )
-	ROM_LOAD64_WORD( "csc.14m",  0x800000, 0x200000, CRC(e8904afa) SHA1(39713ffca4e3a754c7c44c0ef4d99fb5a77d8da7) ) /* roms 73 to 76 joined in all eprom version */
-	ROM_LOAD64_WORD( "csc.16m",  0x800002, 0x200000, CRC(c98c8079) SHA1(22d68ba2ef62b51981bb3e99ec2cde8d1b36514b) ) /* roms 63 to 66 joined in all eprom version */
-	ROM_LOAD64_WORD( "csc.18m",  0x800004, 0x200000, CRC(c030df5a) SHA1(6d5e5a05531e168d0d44c591f9185ae300908fc2) ) /* roms 83 to 86 joined in all eprom version */
-	ROM_LOAD64_WORD( "csc.20m",  0x800006, 0x200000, CRC(b4e55863) SHA1(da66f0a36266b906e4c149aec152c323bb184c57) ) /* roms 93 to 96 joined in all eprom version */
+	ROM_LOAD64_WORD( "csc.14m",  0x800000, 0x200000, CRC(e8904afa) SHA1(39713ffca4e3a754c7c44c0ef4d99fb5a77d8da7) ) // ROMs 73 to 76 joined in all EPROM version
+	ROM_LOAD64_WORD( "csc.16m",  0x800002, 0x200000, CRC(c98c8079) SHA1(22d68ba2ef62b51981bb3e99ec2cde8d1b36514b) ) // ROMs 63 to 66 joined in all EPROM version
+	ROM_LOAD64_WORD( "csc.18m",  0x800004, 0x200000, CRC(c030df5a) SHA1(6d5e5a05531e168d0d44c591f9185ae300908fc2) ) // ROMs 83 to 86 joined in all EPROM version
+	ROM_LOAD64_WORD( "csc.20m",  0x800006, 0x200000, CRC(b4e55863) SHA1(da66f0a36266b906e4c149aec152c323bb184c57) ) // ROMs 93 to 96 joined in all EPROM version
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "csc.01",   0x00000, 0x08000, CRC(ee162111) SHA1(ce8d4bd32bb10ee8b0274ba6fcef05a583b39d48) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "csc.11m",   0x000000, 0x200000, CRC(a027b827) SHA1(6d58a63efc7bd5d07353d9b55826c01a3c416c33) ) /* roms 51 to 54 joined in all eprom version */
-	ROM_LOAD16_WORD_SWAP( "csc.12m",   0x200000, 0x200000, CRC(cb7f6e55) SHA1(b64e6b663fd09e887d2dc0f4b545e88688c0af55) ) /* roms 55 to 58 joined in all eprom version */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "csc.11m",   0x000000, 0x200000, CRC(a027b827) SHA1(6d58a63efc7bd5d07353d9b55826c01a3c416c33) ) // ROMs 51 to 54 joined in all EPROM version
+	ROM_LOAD16_WORD_SWAP( "csc.12m",   0x200000, 0x200000, CRC(cb7f6e55) SHA1(b64e6b663fd09e887d2dc0f4b545e88688c0af55) ) // ROMs 55 to 58 joined in all EPROM version
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "csclubh.key",  0x000000, 0x000014, CRC(b0adc39e) SHA1(37f29580497d24c8f248031acdfab06374ed77fd) )
 ROM_END
 
 ROM_START( cybots )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "cybe.03", 0x000000, 0x80000, CRC(234381cd) SHA1(6202a2a318feda525e16fd7b31c03af9ccc5d964) )
 	ROM_LOAD16_WORD_SWAP( "cybe.04", 0x080000, 0x80000, CRC(80691061) SHA1(4f3ef24fc76d3a5b369aa6192ad390d9c3c9b0e8) )
 	ROM_LOAD16_WORD_SWAP( "cyb.05",  0x100000, 0x80000, CRC(ec40408e) SHA1(dd611c1708e7ef86e4f7cac4b7b0dff7baaee5ed) )
@@ -2455,12 +2455,12 @@
 	ROM_LOAD64_WORD( "cyb.18m",   0x1000004, 0x400000, CRC(d83e977d) SHA1(e03f4a120c95a2f476ffc8492bca85e0c5cea068) )
 	ROM_LOAD64_WORD( "cyb.20m",   0x1000006, 0x400000, CRC(77cdad5c) SHA1(94d0cc5f05de4bc2d43977d91f887005dc10310c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "cyb.01",   0x00000, 0x08000, CRC(9c0fb079) SHA1(06d260875a76da08d56ea2b2ae277e8c2dbae6e3) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "cyb.02",   0x28000, 0x20000, CRC(51cb0c4e) SHA1(c322957558d8d3e9dad090aebbe485978cbce8f5) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "cyb.11m",   0x000000, 0x200000, CRC(362ccab2) SHA1(28e537067d4846f22657ee37166d18b8f05f4da1) )
 	ROM_LOAD16_WORD_SWAP( "cyb.12m",   0x200000, 0x200000, CRC(7066e9cc) SHA1(eb6a9d4998b3311344d73bae88d661d81609c492) )
 
@@ -2469,7 +2469,7 @@
 ROM_END
 
 ROM_START( cybotsu )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "cybu.03", 0x000000, 0x80000, CRC(db4da8f4) SHA1(de9f3f261003f4f70ae32114a15e498387c23f6d) )
 	ROM_LOAD16_WORD_SWAP( "cybu.04", 0x080000, 0x80000, CRC(1eec68ac) SHA1(b2b9379c84b121048cb83a8c48756b48cdbc3ea1) )
 	ROM_LOAD16_WORD_SWAP( "cyb.05",  0x100000, 0x80000, CRC(ec40408e) SHA1(dd611c1708e7ef86e4f7cac4b7b0dff7baaee5ed) )
@@ -2489,12 +2489,12 @@
 	ROM_LOAD64_WORD( "cyb.18m",   0x1000004, 0x400000, CRC(d83e977d) SHA1(e03f4a120c95a2f476ffc8492bca85e0c5cea068) )
 	ROM_LOAD64_WORD( "cyb.20m",   0x1000006, 0x400000, CRC(77cdad5c) SHA1(94d0cc5f05de4bc2d43977d91f887005dc10310c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "cyb.01",   0x00000, 0x08000, CRC(9c0fb079) SHA1(06d260875a76da08d56ea2b2ae277e8c2dbae6e3) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "cyb.02",   0x28000, 0x20000, CRC(51cb0c4e) SHA1(c322957558d8d3e9dad090aebbe485978cbce8f5) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "cyb.11m",   0x000000, 0x200000, CRC(362ccab2) SHA1(28e537067d4846f22657ee37166d18b8f05f4da1) )
 	ROM_LOAD16_WORD_SWAP( "cyb.12m",   0x200000, 0x200000, CRC(7066e9cc) SHA1(eb6a9d4998b3311344d73bae88d661d81609c492) )
 
@@ -2503,7 +2503,7 @@
 ROM_END
 
 ROM_START( cybotsj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "cybj.03", 0x000000, 0x80000, CRC(6096eada) SHA1(ea3fa2e6229d90cc3f69c59f447b6b373d64d2aa) )
 	ROM_LOAD16_WORD_SWAP( "cybj.04", 0x080000, 0x80000, CRC(7b0ffaa9) SHA1(595c3e679ea02282bf8a5aa6c7c09e5c30e839c7) )
 	ROM_LOAD16_WORD_SWAP( "cyb.05",  0x100000, 0x80000, CRC(ec40408e) SHA1(dd611c1708e7ef86e4f7cac4b7b0dff7baaee5ed) )
@@ -2523,12 +2523,12 @@
 	ROM_LOAD64_WORD( "cyb.18m",   0x1000004, 0x400000, CRC(d83e977d) SHA1(e03f4a120c95a2f476ffc8492bca85e0c5cea068) )
 	ROM_LOAD64_WORD( "cyb.20m",   0x1000006, 0x400000, CRC(77cdad5c) SHA1(94d0cc5f05de4bc2d43977d91f887005dc10310c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "cyb.01",   0x00000, 0x08000, CRC(9c0fb079) SHA1(06d260875a76da08d56ea2b2ae277e8c2dbae6e3) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "cyb.02",   0x28000, 0x20000, CRC(51cb0c4e) SHA1(c322957558d8d3e9dad090aebbe485978cbce8f5) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "cyb.11m",   0x000000, 0x200000, CRC(362ccab2) SHA1(28e537067d4846f22657ee37166d18b8f05f4da1) )
 	ROM_LOAD16_WORD_SWAP( "cyb.12m",   0x200000, 0x200000, CRC(7066e9cc) SHA1(eb6a9d4998b3311344d73bae88d661d81609c492) )
 
@@ -2537,7 +2537,7 @@
 ROM_END
 
 ROM_START( ddtod )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dade.03c", 0x000000, 0x80000, CRC(8e73533d) SHA1(6eece222e562dd0c453d8dec188c9553c46dfe3c) )
 	ROM_LOAD16_WORD_SWAP( "dade.04c", 0x080000, 0x80000, CRC(00c2e82e) SHA1(fad4dcdac8d6ef04b71e987936bf27e3d93809fc) )
 	ROM_LOAD16_WORD_SWAP( "dade.05c", 0x100000, 0x80000, CRC(ea996008) SHA1(9f41679531e971e62483415c07ef4ee7489ff779) )
@@ -2554,11 +2554,11 @@
 	ROM_LOAD64_WORD( "dad.18m",   0x800004, 0x100000, CRC(cef393ef) SHA1(830b33c86cc24776d17ad65fa89a3b16c40446a1) )
 	ROM_LOAD64_WORD( "dad.20m",   0x800006, 0x100000, CRC(8953fe9e) SHA1(f4795beb006335d13e3934aa9760e775eb0bb950) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dad.01",   0x00000, 0x08000, CRC(3f5e2424) SHA1(4aa744576bc6752c43a90a27a816ebd90076b248) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dad.11m",   0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
 	ROM_LOAD16_WORD_SWAP( "dad.12m",   0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
 
@@ -2567,7 +2567,7 @@
 ROM_END
 
 ROM_START( ddtodr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dade.03a", 0x000000, 0x80000, CRC(665a035e) SHA1(4aa81f7055bc288be1282dcbf9a33c77d3c963f5) )
 	ROM_LOAD16_WORD_SWAP( "dade.04a", 0x080000, 0x80000, CRC(02613207) SHA1(a29258848e8f6ac7469c88668a83e07bf325f96a) )
 	ROM_LOAD16_WORD_SWAP( "dade.05a", 0x100000, 0x80000, CRC(36845996) SHA1(a767564b62c1e25c62e4d31201f10d8c4a368197) )
@@ -2584,11 +2584,11 @@
 	ROM_LOAD64_WORD( "dad.18m",   0x800004, 0x100000, CRC(cef393ef) SHA1(830b33c86cc24776d17ad65fa89a3b16c40446a1) )
 	ROM_LOAD64_WORD( "dad.20m",   0x800006, 0x100000, CRC(8953fe9e) SHA1(f4795beb006335d13e3934aa9760e775eb0bb950) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dad.01",   0x00000, 0x08000, CRC(3f5e2424) SHA1(4aa744576bc6752c43a90a27a816ebd90076b248) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dad.11m",   0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
 	ROM_LOAD16_WORD_SWAP( "dad.12m",   0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
 
@@ -2597,7 +2597,7 @@
 ROM_END
 
 ROM_START( ddtodu )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dadu.03b", 0x000000, 0x80000, CRC(a519905f) SHA1(7f846d7ac5d5e0d06657f712a7a09bee984a4f4b) )
 	ROM_LOAD16_WORD_SWAP( "dadu.04b", 0x080000, 0x80000, CRC(52562d38) SHA1(3ee21399a19ee5e2db2a8c2a893d8a31a3419399) )
 	ROM_LOAD16_WORD_SWAP( "dadu.05b", 0x100000, 0x80000, CRC(ee1cfbfe) SHA1(4107e495827ada1712a2393dffcdf52d98aca2e0) )
@@ -2614,11 +2614,11 @@
 	ROM_LOAD64_WORD( "dad.18m",   0x800004, 0x100000, CRC(cef393ef) SHA1(830b33c86cc24776d17ad65fa89a3b16c40446a1) )
 	ROM_LOAD64_WORD( "dad.20m",   0x800006, 0x100000, CRC(8953fe9e) SHA1(f4795beb006335d13e3934aa9760e775eb0bb950) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dad.01",   0x00000, 0x08000, CRC(3f5e2424) SHA1(4aa744576bc6752c43a90a27a816ebd90076b248) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dad.11m",   0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
 	ROM_LOAD16_WORD_SWAP( "dad.12m",   0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
 
@@ -2627,7 +2627,7 @@
 ROM_END
 
 ROM_START( ddtodur1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dadu.03a", 0x000000, 0x80000, CRC(4413f177) SHA1(26c8d06adc83ffc5bec4abf05aa64e874e85d539) )
 	ROM_LOAD16_WORD_SWAP( "dadu.04a", 0x080000, 0x80000, CRC(168de230) SHA1(3f8af1625bb0d9097e538f8ba7cd23d95b0233aa) )
 	ROM_LOAD16_WORD_SWAP( "dadu.05a", 0x100000, 0x80000, CRC(03d39e91) SHA1(92461b87c55cb41bbe89bcb3e3f2e9b1ed521067) )
@@ -2644,11 +2644,11 @@
 	ROM_LOAD64_WORD( "dad.18m",   0x800004, 0x100000, CRC(cef393ef) SHA1(830b33c86cc24776d17ad65fa89a3b16c40446a1) )
 	ROM_LOAD64_WORD( "dad.20m",   0x800006, 0x100000, CRC(8953fe9e) SHA1(f4795beb006335d13e3934aa9760e775eb0bb950) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dad.01",   0x00000, 0x08000, CRC(3f5e2424) SHA1(4aa744576bc6752c43a90a27a816ebd90076b248) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dad.11m",   0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
 	ROM_LOAD16_WORD_SWAP( "dad.12m",   0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
 
@@ -2657,7 +2657,7 @@
 ROM_END
 
 ROM_START( ddtodj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dadj.03c", 0x000000, 0x80000, CRC(0b1b5798) SHA1(ce2749164a6cf4c99db4bfa7e515a9022006cf92) )
 	ROM_LOAD16_WORD_SWAP( "dadj.04c", 0x080000, 0x80000, CRC(c6a2fbc8) SHA1(cb7105e9d35c9e64f5535eb5f491e3f2cf6de64e) )
 	ROM_LOAD16_WORD_SWAP( "dadj.05c", 0x100000, 0x80000, CRC(189b15fe) SHA1(91baef189549a25122fd5ab238a849bad2766862) )
@@ -2674,11 +2674,11 @@
 	ROM_LOAD64_WORD( "dad.18m",   0x800004, 0x100000, CRC(cef393ef) SHA1(830b33c86cc24776d17ad65fa89a3b16c40446a1) )
 	ROM_LOAD64_WORD( "dad.20m",   0x800006, 0x100000, CRC(8953fe9e) SHA1(f4795beb006335d13e3934aa9760e775eb0bb950) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dad.01",   0x00000, 0x08000, CRC(3f5e2424) SHA1(4aa744576bc6752c43a90a27a816ebd90076b248) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dad.11m",   0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
 	ROM_LOAD16_WORD_SWAP( "dad.12m",   0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
 
@@ -2687,7 +2687,7 @@
 ROM_END
 
 ROM_START( ddtodjr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dadj.03b", 0x000000, 0x80000, CRC(87606b85) SHA1(1311c9ae321207db4632572f6c838b732974b087) )
 	ROM_LOAD16_WORD_SWAP( "dadj.04b", 0x080000, 0x80000, CRC(24d49575) SHA1(419d7d2f970c23c39334a7f2e8c5caa237769c5d) )
 	ROM_LOAD16_WORD_SWAP( "dadj.05b", 0x100000, 0x80000, CRC(56ce51f7) SHA1(3a15537c479e3798ec30d5e313a727d7f91955c0) )
@@ -2704,11 +2704,11 @@
 	ROM_LOAD64_WORD( "dad.18m",   0x800004, 0x100000, CRC(cef393ef) SHA1(830b33c86cc24776d17ad65fa89a3b16c40446a1) )
 	ROM_LOAD64_WORD( "dad.20m",   0x800006, 0x100000, CRC(8953fe9e) SHA1(f4795beb006335d13e3934aa9760e775eb0bb950) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dad.01",   0x00000, 0x08000, CRC(3f5e2424) SHA1(4aa744576bc6752c43a90a27a816ebd90076b248) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dad.11m",   0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
 	ROM_LOAD16_WORD_SWAP( "dad.12m",   0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
 
@@ -2717,7 +2717,7 @@
 ROM_END
 
 ROM_START( ddtodjr2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dadj.03a", 0x000000, 0x80000, CRC(711638dc) SHA1(30c1d1a694aa8e51d072b26b47ba55aed6d77b7b) )
 	ROM_LOAD16_WORD_SWAP( "dadj.04a", 0x080000, 0x80000, CRC(4869639c) SHA1(1544813e6712a78267c1d27b6b49148d42c11127) )
 	ROM_LOAD16_WORD_SWAP( "dadj.05a", 0x100000, 0x80000, CRC(484c0efa) SHA1(d4ddef54149ef0141dcbe05df5f669fccf462559) )
@@ -2734,11 +2734,11 @@
 	ROM_LOAD64_WORD( "dad.18m",   0x800004, 0x100000, CRC(cef393ef) SHA1(830b33c86cc24776d17ad65fa89a3b16c40446a1) )
 	ROM_LOAD64_WORD( "dad.20m",   0x800006, 0x100000, CRC(8953fe9e) SHA1(f4795beb006335d13e3934aa9760e775eb0bb950) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dad.01",   0x00000, 0x08000, CRC(3f5e2424) SHA1(4aa744576bc6752c43a90a27a816ebd90076b248) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dad.11m",   0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
 	ROM_LOAD16_WORD_SWAP( "dad.12m",   0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
 
@@ -2747,7 +2747,7 @@
 ROM_END
 
 ROM_START( ddtoda )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dada.03c", 0x000000, 0x80000, CRC(bf243e15) SHA1(6ee212defb69064a9caddf2e3aab71c24cb67a82) )
 	ROM_LOAD16_WORD_SWAP( "dada.04c", 0x080000, 0x80000, CRC(76551eec) SHA1(71f4fd59ccbca6b212ec21729ac024933abafb74) )
 	ROM_LOAD16_WORD_SWAP( "dada.05c", 0x100000, 0x80000, CRC(0a0ad827) SHA1(f17a3100f40c24862d717edc8e2a75b9cb29f4fe) )
@@ -2764,11 +2764,11 @@
 	ROM_LOAD64_WORD( "dad.18m",   0x800004, 0x100000, CRC(cef393ef) SHA1(830b33c86cc24776d17ad65fa89a3b16c40446a1) )
 	ROM_LOAD64_WORD( "dad.20m",   0x800006, 0x100000, CRC(8953fe9e) SHA1(f4795beb006335d13e3934aa9760e775eb0bb950) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dad.01",   0x00000, 0x08000, CRC(3f5e2424) SHA1(4aa744576bc6752c43a90a27a816ebd90076b248) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dad.11m",   0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
 	ROM_LOAD16_WORD_SWAP( "dad.12m",   0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
 
@@ -2777,7 +2777,7 @@
 ROM_END
 
 ROM_START( ddtodar1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dada.03a", 0x000000, 0x80000, CRC(fc6f2dd7) SHA1(82f59670ec77a11e9765e2acd0e846d1c768b542) )
 	ROM_LOAD16_WORD_SWAP( "dada.04a", 0x080000, 0x80000, CRC(d4be4009) SHA1(c914ddc8f0c237efb52dd1a8f56395b17a6583be) )
 	ROM_LOAD16_WORD_SWAP( "dada.05a", 0x100000, 0x80000, CRC(6712d1cf) SHA1(a716ee5ca434badc57f67e0802c6b184bf243dbb) )
@@ -2794,11 +2794,11 @@
 	ROM_LOAD64_WORD( "dad.18m",   0x800004, 0x100000, CRC(cef393ef) SHA1(830b33c86cc24776d17ad65fa89a3b16c40446a1) )
 	ROM_LOAD64_WORD( "dad.20m",   0x800006, 0x100000, CRC(8953fe9e) SHA1(f4795beb006335d13e3934aa9760e775eb0bb950) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dad.01",   0x00000, 0x08000, CRC(3f5e2424) SHA1(4aa744576bc6752c43a90a27a816ebd90076b248) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dad.11m",   0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
 	ROM_LOAD16_WORD_SWAP( "dad.12m",   0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
 
@@ -2807,7 +2807,7 @@
 ROM_END
 
 ROM_START( ddtodh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dadh.03c", 0x000000, 0x80000, CRC(5750a861) SHA1(3b94999779f1b5f7cdaf78468256e2b60ba8c076) )
 	ROM_LOAD16_WORD_SWAP( "dadh.04c", 0x080000, 0x80000, CRC(cfbf1b56) SHA1(d8919397f1d6dacddc6811889b69b65cd91be683) )
 	ROM_LOAD16_WORD_SWAP( "dadh.05c", 0x100000, 0x80000, CRC(a6e562ba) SHA1(42998024a3bb4464843411ebe7283c6f5369694d) )
@@ -2824,11 +2824,11 @@
 	ROM_LOAD64_WORD( "dad.18m",   0x800004, 0x100000, CRC(cef393ef) SHA1(830b33c86cc24776d17ad65fa89a3b16c40446a1) )
 	ROM_LOAD64_WORD( "dad.20m",   0x800006, 0x100000, CRC(8953fe9e) SHA1(f4795beb006335d13e3934aa9760e775eb0bb950) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dad.01",   0x00000, 0x08000, CRC(3f5e2424) SHA1(4aa744576bc6752c43a90a27a816ebd90076b248) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dad.11m",   0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
 	ROM_LOAD16_WORD_SWAP( "dad.12m",   0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
 
@@ -2837,7 +2837,7 @@
 ROM_END
 
 ROM_START( ddtodhr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dadh.03b", 0x000000, 0x80000, CRC(ae0cb98e) SHA1(e85fb56d8f55fd1626a47301953b66597814e516) )
 	ROM_LOAD16_WORD_SWAP( "dadh.04b", 0x080000, 0x80000, CRC(b5774363) SHA1(c91a6b257de4355a29d0a9742909592e69d287fb) )
 	ROM_LOAD16_WORD_SWAP( "dadh.05b", 0x100000, 0x80000, CRC(6ce2a485) SHA1(7397105bbf88f6f2aa46614395df38b205e6461c) )
@@ -2854,11 +2854,11 @@
 	ROM_LOAD64_WORD( "dad.18m",   0x800004, 0x100000, CRC(cef393ef) SHA1(830b33c86cc24776d17ad65fa89a3b16c40446a1) )
 	ROM_LOAD64_WORD( "dad.20m",   0x800006, 0x100000, CRC(8953fe9e) SHA1(f4795beb006335d13e3934aa9760e775eb0bb950) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dad.01",   0x00000, 0x08000, CRC(3f5e2424) SHA1(4aa744576bc6752c43a90a27a816ebd90076b248) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dad.11m",   0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
 	ROM_LOAD16_WORD_SWAP( "dad.12m",   0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
 
@@ -2867,7 +2867,7 @@
 ROM_END
 
 ROM_START( ddtodhr2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dadh.03a", 0x000000, 0x80000, CRC(43d04aa3) SHA1(550fcc8ebf48d704223347abee759d0ed903432b) )
 	ROM_LOAD16_WORD_SWAP( "dadh.04a", 0x080000, 0x80000, CRC(8b8d296c) SHA1(4cd6612855317ba13dd4c6b0dd024243677b5fbe) )
 	ROM_LOAD16_WORD_SWAP( "dadh.05a", 0x100000, 0x80000, CRC(daae6b14) SHA1(ee132b19f8d8c17da6fd2d2da24205f2404a62d1) )
@@ -2884,11 +2884,11 @@
 	ROM_LOAD64_WORD( "dad.18m",   0x800004, 0x100000, CRC(cef393ef) SHA1(830b33c86cc24776d17ad65fa89a3b16c40446a1) )
 	ROM_LOAD64_WORD( "dad.20m",   0x800006, 0x100000, CRC(8953fe9e) SHA1(f4795beb006335d13e3934aa9760e775eb0bb950) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dad.01",   0x00000, 0x08000, CRC(3f5e2424) SHA1(4aa744576bc6752c43a90a27a816ebd90076b248) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dad.11m",   0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
 	ROM_LOAD16_WORD_SWAP( "dad.12m",   0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
 
@@ -2897,7 +2897,7 @@
 ROM_END
 
 ROM_START( ddsom )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2e.03e", 0x000000, 0x80000, CRC(449361af) SHA1(14af2b35e6f43f92c9e071f1dc85b18cf73ecb35) )
 	ROM_LOAD16_WORD_SWAP( "dd2e.04e", 0x080000, 0x80000, CRC(5b7052b6) SHA1(8a5f069f450da939d0f02518751cd9815d621d81) )
 	ROM_LOAD16_WORD_SWAP( "dd2e.05e", 0x100000, 0x80000, CRC(788d5f60) SHA1(b8b42c11530a34c2878fb119c0a388e33067b66d) )
@@ -2917,12 +2917,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -2931,7 +2931,7 @@
 ROM_END
 
 ROM_START( ddsomr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2e.03d", 0x000000, 0x80000, CRC(6c084ab5) SHA1(edfb4094086836c9ba47fed149b5756cf40d8bc1) )
 	ROM_LOAD16_WORD_SWAP( "dd2e.04d", 0x080000, 0x80000, CRC(9b94a947) SHA1(6b170d9d07c5fe98a186c2eb7d65639cbbe828fc) )
 	ROM_LOAD16_WORD_SWAP( "dd2e.05d", 0x100000, 0x80000, CRC(5d6a63c6) SHA1(2f1cefe2531688c305b3ddcc4c8adae39dcadb33) )
@@ -2951,12 +2951,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -2965,7 +2965,7 @@
 ROM_END
 
 ROM_START( ddsomr2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2e.03b", 0x000000, 0x80000, CRC(cd2deb66) SHA1(8a3fa5aca364f11bea76f69504e82416efc0ec11) )
 	ROM_LOAD16_WORD_SWAP( "dd2e.04b", 0x080000, 0x80000, CRC(bfee43cc) SHA1(16cb34103bede42599ff3083a70ff918fdce9929) )
 	ROM_LOAD16_WORD_SWAP( "dd2e.05b", 0x100000, 0x80000, CRC(049ab19d) SHA1(dfd2ed64c409389fed9b1d96955cbe0cf2abd2b7) )
@@ -2985,12 +2985,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -2999,7 +2999,7 @@
 ROM_END
 
 ROM_START( ddsomr3 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2e.03a", 0x000000, 0x80000, CRC(6de67678) SHA1(df4846b963ea0449fbd16152600a9628d20b278a) )
 	ROM_LOAD16_WORD_SWAP( "dd2e.04a", 0x080000, 0x80000, CRC(0e45739a) SHA1(4fa9dc8109fad30e4037047ddec1b367b5b7600f) )
 	ROM_LOAD16_WORD_SWAP( "dd2e.05a", 0x100000, 0x80000, CRC(3dce8025) SHA1(5fb0a58b7cccc889507b0085b5e74d7aef507f08) )
@@ -3019,12 +3019,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -3033,7 +3033,7 @@
 ROM_END
 
 ROM_START( ddsomu )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2u.03g", 0x000000, 0x80000, CRC(fb089b39) SHA1(2d00ad87d5e862745d730a84a8b9b9a8c9423282) )
 	ROM_LOAD16_WORD_SWAP( "dd2u.04g", 0x080000, 0x80000, CRC(cd432b73) SHA1(7c5ddad66f9f08fef79efb01ccf230a9eae366c6) )
 	ROM_LOAD16_WORD_SWAP( "dd2.05g",  0x100000, 0x80000, CRC(5eb1991c) SHA1(429a60b5396ff4192904867fbe0524268f0edbcb) )
@@ -3053,12 +3053,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -3067,7 +3067,7 @@
 ROM_END
 
 ROM_START( ddsomur1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2u.03d", 0x000000, 0x80000, CRC(0f700d84) SHA1(f4788d4046e0f6aba146c18a930196f5f9f8f14a) )
 	ROM_LOAD16_WORD_SWAP( "dd2u.04d", 0x080000, 0x80000, CRC(b99eb254) SHA1(507ad31b0d77dfbaaaf0fa5830c4ef14845a80de) )
 	ROM_LOAD16_WORD_SWAP( "dd2.05d",  0x100000, 0x80000, CRC(b23061f3) SHA1(471a1238770a5109f34a0b450b214a5490cc6ecb) )
@@ -3087,12 +3087,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -3101,7 +3101,7 @@
 ROM_END
 
 ROM_START( ddsomj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2j.03g", 0x000000, 0x80000, CRC(e6c8c985) SHA1(0736a84d7d9d37d51826eac6826a7728260bc625) )
 	ROM_LOAD16_WORD_SWAP( "dd2j.04g", 0x080000, 0x80000, CRC(8386c0bd) SHA1(59bfc71914ec2bb7d1b9f327b25d2399181d4bb2) )
 	ROM_LOAD16_WORD_SWAP( "dd2.05g",  0x100000, 0x80000, CRC(5eb1991c) SHA1(429a60b5396ff4192904867fbe0524268f0edbcb) )
@@ -3121,12 +3121,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -3135,7 +3135,7 @@
 ROM_END
 
 ROM_START( ddsomjr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2j.03b", 0x000000, 0x80000, CRC(965d74e5) SHA1(d7aa1b78043cdf09ee71a6dd5fe78e0588ca7875) )
 	ROM_LOAD16_WORD_SWAP( "dd2j.04b", 0x080000, 0x80000, CRC(958eb8f3) SHA1(3d9747bc9091b0b42c953a19992b94cb2bf69159) )
 	ROM_LOAD16_WORD_SWAP( "dd2.05b",  0x100000, 0x80000, CRC(d38571ca) SHA1(f0105a4f201e11f489e44c8061b0025de2e32f93) )
@@ -3155,12 +3155,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -3169,7 +3169,7 @@
 ROM_END
 
 ROM_START( ddsomjr2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2j.03b", 0x000000, 0x80000, CRC(b2fd4a24) SHA1(6b5bd11e665e84a9de56d167a5d8957a3a967f8c) )
 	ROM_LOAD16_WORD_SWAP( "dd2j.04b", 0x080000, 0x80000, CRC(3a68c310) SHA1(8806ea2765e82f396158f0ae8a906cda90bd3472) )
 	ROM_LOAD16_WORD_SWAP( "dd2.05b",  0x100000, 0x80000, CRC(aa56f42f) SHA1(2795a1c8978c5f459daaca57985c24027139d7e1) )
@@ -3189,12 +3189,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -3203,7 +3203,7 @@
 ROM_END
 
 ROM_START( ddsoma )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2a.03g", 0x000000, 0x80000, CRC(0b4fec22) SHA1(4dd69637898e0bc64d1b1dc34561ce1807da314b) )
 	ROM_LOAD16_WORD_SWAP( "dd2a.04g", 0x080000, 0x80000, CRC(055b7019) SHA1(5dab39552fee20bd6f94c992c1c3a995595fdf94) )
 	ROM_LOAD16_WORD_SWAP( "dd2.05g",  0x100000, 0x80000, CRC(5eb1991c) SHA1(429a60b5396ff4192904867fbe0524268f0edbcb) )
@@ -3223,12 +3223,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -3238,7 +3238,7 @@
 
 
 ROM_START( ddsomar1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2a.03c", 0x000000, 0x80000, CRC(17162039) SHA1(d6e161cc888c2c7cd7b955ef9f1fc47a5302e29d) )
 	ROM_LOAD16_WORD_SWAP( "dd2a.04c", 0x080000, 0x80000, CRC(950bec38) SHA1(99b50388015730142d28263de1b4f918f7a353fa) )
 	ROM_LOAD16_WORD_SWAP( "dd2a.05c", 0x100000, 0x80000, CRC(fa298eba) SHA1(64d248de4e5655129bb3a420020ca041f5e7b740) )
@@ -3258,12 +3258,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -3272,7 +3272,7 @@
 ROM_END
 
 ROM_START( ddsomb )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2b.03a", 0x000000, 0x80000, CRC(e8ce7fbb) SHA1(645133fb07b34f663709896a0f55a9a51de4ee9b) )
 	ROM_LOAD16_WORD_SWAP( "dd2b.04a", 0x080000, 0x80000, CRC(6b679664) SHA1(480d8b225c69d528528b6a4db86797a9d9e6ac80) )
 	ROM_LOAD16_WORD_SWAP( "dd2b.05a", 0x100000, 0x80000, CRC(9b2534eb) SHA1(04a9f9b75f817dff1b94641aba399d487b57a9f7) )
@@ -3292,12 +3292,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -3306,7 +3306,7 @@
 ROM_END
 
 ROM_START( ddsomh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2h.03a", 0x000000, 0x80000, CRC(e472c9f3) SHA1(43e0767cca3ce0c151f1bd12d476cc2f0013b5e5) )
 	ROM_LOAD16_WORD_SWAP( "dd2h.04a", 0x080000, 0x80000, CRC(315a7706) SHA1(de6ced251a483455b0d0371c60bce0c209879b43) )
 	ROM_LOAD16_WORD_SWAP( "dd2h.05a", 0x100000, 0x80000, CRC(9b2534eb) SHA1(04a9f9b75f817dff1b94641aba399d487b57a9f7) ) /* Roms 05 through 10 are the same as the Brazil set */
@@ -3326,12 +3326,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -3340,7 +3340,7 @@
 ROM_END
 
 ROM_START( dimahoo )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "gmde.03", 0x000000, 0x80000, CRC(968fcecd) SHA1(82d6eb6488df48bc7b977fc900c24b29bd6573a9) )
 	ROM_LOAD16_WORD_SWAP( "gmd.04",  0x080000, 0x80000, CRC(37485567) SHA1(643c41fce6057bcaef0e0bedc62914c33d97eeaf) )
 	ROM_LOAD16_WORD_SWAP( "gmd.05",  0x100000, 0x80000, CRC(da269ffb) SHA1(e99b04192030b6006cf67b563f40cea29c1b2e78) )
@@ -3352,12 +3352,12 @@
 	ROM_LOAD64_WORD( "gmd.17m",   0x000004, 0x400000, CRC(16356520) SHA1(058713bef30c1b1d8b7dd0ceaaa57a3ab9751a70) )
 	ROM_LOAD64_WORD( "gmd.19m",   0x000006, 0x400000, CRC(dfc33031) SHA1(a1ceaeddc2a79d5b79f1b107cac2ef6a5e621e77) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "gmd.01",   0x00000, 0x08000, CRC(3f9bc985) SHA1(1616bbee82877b1052a07531066f5009a80706be) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "gmd.02",   0x28000, 0x20000, CRC(3fd39dde) SHA1(6a6e3ef9baa430ee83ab2312aa0221bae4d73dbd) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "gmd.11m",   0x000000, 0x400000, CRC(06a65542) SHA1(a1b3df70c90055a3cd59d0149fd18a74eff5bcc9) )
 	ROM_LOAD16_WORD_SWAP( "gmd.12m",   0x400000, 0x400000, CRC(50bc7a31) SHA1(7283569fc646c39f4c693f14e0ce7ff2ee49111a) )
 
@@ -3366,7 +3366,7 @@
 ROM_END
 
 ROM_START( dimahoou )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "gmdu.03", 0x000000, 0x80000, CRC(43bcb15f) SHA1(8cf758f9b3b416273e5b20e5d1c09c0a67029a01) )
 	ROM_LOAD16_WORD_SWAP( "gmd.04",  0x080000, 0x80000, CRC(37485567) SHA1(643c41fce6057bcaef0e0bedc62914c33d97eeaf) )
 	ROM_LOAD16_WORD_SWAP( "gmd.05",  0x100000, 0x80000, CRC(da269ffb) SHA1(e99b04192030b6006cf67b563f40cea29c1b2e78) )
@@ -3378,12 +3378,12 @@
 	ROM_LOAD64_WORD( "gmd.17m",   0x000004, 0x400000, CRC(16356520) SHA1(058713bef30c1b1d8b7dd0ceaaa57a3ab9751a70) )
 	ROM_LOAD64_WORD( "gmd.19m",   0x000006, 0x400000, CRC(dfc33031) SHA1(a1ceaeddc2a79d5b79f1b107cac2ef6a5e621e77) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "gmd.01",   0x00000, 0x08000, CRC(3f9bc985) SHA1(1616bbee82877b1052a07531066f5009a80706be) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "gmd.02",   0x28000, 0x20000, CRC(3fd39dde) SHA1(6a6e3ef9baa430ee83ab2312aa0221bae4d73dbd) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "gmd.11m",   0x000000, 0x400000, CRC(06a65542) SHA1(a1b3df70c90055a3cd59d0149fd18a74eff5bcc9) )
 	ROM_LOAD16_WORD_SWAP( "gmd.12m",   0x400000, 0x400000, CRC(50bc7a31) SHA1(7283569fc646c39f4c693f14e0ce7ff2ee49111a) )
 
@@ -3392,7 +3392,7 @@
 ROM_END
 
 ROM_START( gmahou )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "gmdj.03", 0x000000, 0x80000, CRC(cd6979e3) SHA1(b033408f49299eac376fc798c3429e5db97dd4fe) )
 	ROM_LOAD16_WORD_SWAP( "gmd.04",  0x080000, 0x80000, CRC(37485567) SHA1(643c41fce6057bcaef0e0bedc62914c33d97eeaf) )
 	ROM_LOAD16_WORD_SWAP( "gmd.05",  0x100000, 0x80000, CRC(da269ffb) SHA1(e99b04192030b6006cf67b563f40cea29c1b2e78) )
@@ -3404,12 +3404,12 @@
 	ROM_LOAD64_WORD( "gmd.17m",   0x000004, 0x400000, CRC(16356520) SHA1(058713bef30c1b1d8b7dd0ceaaa57a3ab9751a70) )
 	ROM_LOAD64_WORD( "gmd.19m",   0x000006, 0x400000, CRC(dfc33031) SHA1(a1ceaeddc2a79d5b79f1b107cac2ef6a5e621e77) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "gmd.01",   0x00000, 0x08000, CRC(3f9bc985) SHA1(1616bbee82877b1052a07531066f5009a80706be) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "gmd.02",   0x28000, 0x20000, CRC(3fd39dde) SHA1(6a6e3ef9baa430ee83ab2312aa0221bae4d73dbd) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "gmd.11m",   0x000000, 0x400000, CRC(06a65542) SHA1(a1b3df70c90055a3cd59d0149fd18a74eff5bcc9) )
 	ROM_LOAD16_WORD_SWAP( "gmd.12m",   0x400000, 0x400000, CRC(50bc7a31) SHA1(7283569fc646c39f4c693f14e0ce7ff2ee49111a) )
 
@@ -3418,7 +3418,7 @@
 ROM_END
 
 ROM_START( dstlk )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vame.03a", 0x000000, 0x80000, CRC(004c9cff) SHA1(9cab8ab734b29abf321b47e46271dab549bf46df) )
 	ROM_LOAD16_WORD_SWAP( "vame.04a", 0x080000, 0x80000, CRC(ae413ff2) SHA1(e9b85ac04d6d1a57368c70aa24e3ab8a8d67409f) )
 	ROM_LOAD16_WORD_SWAP( "vame.05a", 0x100000, 0x80000, CRC(60678756) SHA1(5d10829ad7522b5de3b318dd8cbf1b506ba4c2d4) )
@@ -3438,12 +3438,12 @@
 	ROM_LOAD64_WORD( "vam.18m",   0x1000004, 0x100000, CRC(3a033625) SHA1(294238f30cba5cf4f8f1de951d54c2077bd95de9) )
 	ROM_LOAD64_WORD( "vam.20m",   0x1000006, 0x100000, CRC(2bff6a89) SHA1(8f4e131e5ce0af48fb89f98026d9f0356c7c301f) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vam.01",   0x00000, 0x08000, CRC(64b685d5) SHA1(6c180e7420db754eca5cad17a40f5a64f5c3bd15) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vam.02",   0x28000, 0x20000, CRC(cf7c97c7) SHA1(109a4b56ecd59be9c3f5869de99d40619bdaef21) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vam.11m",   0x000000, 0x200000, CRC(4a39deb2) SHA1(7e63e615869958db66a4e52a0272afee5a10e446) )
 	ROM_LOAD16_WORD_SWAP( "vam.12m",   0x200000, 0x200000, CRC(1a3e5c03) SHA1(c5a556e125d6c3d68da745b4d56cd7a851f2a23d) )
 
@@ -3452,7 +3452,7 @@
 ROM_END
 
 ROM_START( dstlku )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vamu.03b", 0x000000, 0x80000, CRC(68a6343f) SHA1(9e1b13e3419470b3c14065c85342b2dcf42eb4cd) )
 	ROM_LOAD16_WORD_SWAP( "vamu.04b", 0x080000, 0x80000, CRC(58161453) SHA1(7b5674b8bdb7e3165e090105f6716073696d4bd0) )
 	ROM_LOAD16_WORD_SWAP( "vamu.05b", 0x100000, 0x80000, CRC(dfc038b8) SHA1(1b8911033a458f2d20f740c1bd1b3a2157d24b8a) )
@@ -3472,12 +3472,12 @@
 	ROM_LOAD64_WORD( "vam.18m",   0x1000004, 0x100000, CRC(3a033625) SHA1(294238f30cba5cf4f8f1de951d54c2077bd95de9) )
 	ROM_LOAD64_WORD( "vam.20m",   0x1000006, 0x100000, CRC(2bff6a89) SHA1(8f4e131e5ce0af48fb89f98026d9f0356c7c301f) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vam.01",   0x00000, 0x08000, CRC(64b685d5) SHA1(6c180e7420db754eca5cad17a40f5a64f5c3bd15) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vam.02",   0x28000, 0x20000, CRC(cf7c97c7) SHA1(109a4b56ecd59be9c3f5869de99d40619bdaef21) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vam.11m",   0x000000, 0x200000, CRC(4a39deb2) SHA1(7e63e615869958db66a4e52a0272afee5a10e446) )
 	ROM_LOAD16_WORD_SWAP( "vam.12m",   0x200000, 0x200000, CRC(1a3e5c03) SHA1(c5a556e125d6c3d68da745b4d56cd7a851f2a23d) )
 
@@ -3486,7 +3486,7 @@
 ROM_END
 
 ROM_START( dstlkur1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vamu.03a", 0x000000, 0x80000, CRC(628899f9) SHA1(989414a62aed67504f15a542a148e32a4b349949) )
 	ROM_LOAD16_WORD_SWAP( "vamu.04a", 0x080000, 0x80000, CRC(696d9b25) SHA1(743c53ac7fc27960ecc80fed3f2a3c506ee655a1) )
 	ROM_LOAD16_WORD_SWAP( "vamu.05a", 0x100000, 0x80000, CRC(673ed50a) SHA1(7dff27dba1da55a18eb459e4a2d679cf699f2804) )
@@ -3506,12 +3506,12 @@
 	ROM_LOAD64_WORD( "vam.18m",   0x1000004, 0x100000, CRC(3a033625) SHA1(294238f30cba5cf4f8f1de951d54c2077bd95de9) )
 	ROM_LOAD64_WORD( "vam.20m",   0x1000006, 0x100000, CRC(2bff6a89) SHA1(8f4e131e5ce0af48fb89f98026d9f0356c7c301f) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vam.01",   0x00000, 0x08000, CRC(64b685d5) SHA1(6c180e7420db754eca5cad17a40f5a64f5c3bd15) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vam.02",   0x28000, 0x20000, CRC(cf7c97c7) SHA1(109a4b56ecd59be9c3f5869de99d40619bdaef21) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vam.11m",   0x000000, 0x200000, CRC(4a39deb2) SHA1(7e63e615869958db66a4e52a0272afee5a10e446) )
 	ROM_LOAD16_WORD_SWAP( "vam.12m",   0x200000, 0x200000, CRC(1a3e5c03) SHA1(c5a556e125d6c3d68da745b4d56cd7a851f2a23d) )
 
@@ -3520,7 +3520,7 @@
 ROM_END
 
 ROM_START( vampj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vamj.03a", 0x000000, 0x80000, CRC(f55d3722) SHA1(e26bbcc47a2485914d567a6cf1cddd0f668689a1) ) /* Incomplete updated set? At least rom 03 */
 	ROM_LOAD16_WORD_SWAP( "vamj.04b", 0x080000, 0x80000, CRC(4d9c43c4) SHA1(2087090306646fed959d503ee75e24996ad95b88) ) /* should be "B" revision too. Both this   */
 	ROM_LOAD16_WORD_SWAP( "vamj.05a", 0x100000, 0x80000, CRC(6c497e92) SHA1(7c1ccdfd77fb50afe024c8402376daaeab641a24) ) /* set & "vampja" below have the same date */
@@ -3540,12 +3540,12 @@
 	ROM_LOAD64_WORD( "vam.18m",   0x1000004, 0x100000, CRC(3a033625) SHA1(294238f30cba5cf4f8f1de951d54c2077bd95de9) )
 	ROM_LOAD64_WORD( "vam.20m",   0x1000006, 0x100000, CRC(2bff6a89) SHA1(8f4e131e5ce0af48fb89f98026d9f0356c7c301f) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vam.01",   0x00000, 0x08000, CRC(64b685d5) SHA1(6c180e7420db754eca5cad17a40f5a64f5c3bd15) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vam.02",   0x28000, 0x20000, CRC(cf7c97c7) SHA1(109a4b56ecd59be9c3f5869de99d40619bdaef21) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vam.11m",   0x000000, 0x200000, CRC(4a39deb2) SHA1(7e63e615869958db66a4e52a0272afee5a10e446) )
 	ROM_LOAD16_WORD_SWAP( "vam.12m",   0x200000, 0x200000, CRC(1a3e5c03) SHA1(c5a556e125d6c3d68da745b4d56cd7a851f2a23d) )
 
@@ -3554,7 +3554,7 @@
 ROM_END
 
 ROM_START( vampja )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vamj.03a", 0x000000, 0x80000, CRC(f55d3722) SHA1(e26bbcc47a2485914d567a6cf1cddd0f668689a1) )
 	ROM_LOAD16_WORD_SWAP( "vamj.04a", 0x080000, 0x80000, CRC(fdcbdae3) SHA1(46a1251a2affbe13b200448cf77a455d840f3c9f) )
 	ROM_LOAD16_WORD_SWAP( "vamj.05a", 0x100000, 0x80000, CRC(6c497e92) SHA1(7c1ccdfd77fb50afe024c8402376daaeab641a24) )
@@ -3574,12 +3574,12 @@
 	ROM_LOAD64_WORD( "vam.18m",   0x1000004, 0x100000, CRC(3a033625) SHA1(294238f30cba5cf4f8f1de951d54c2077bd95de9) )
 	ROM_LOAD64_WORD( "vam.20m",   0x1000006, 0x100000, CRC(2bff6a89) SHA1(8f4e131e5ce0af48fb89f98026d9f0356c7c301f) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vam.01",   0x00000, 0x08000, CRC(64b685d5) SHA1(6c180e7420db754eca5cad17a40f5a64f5c3bd15) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vam.02",   0x28000, 0x20000, CRC(cf7c97c7) SHA1(109a4b56ecd59be9c3f5869de99d40619bdaef21) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vam.11m",   0x000000, 0x200000, CRC(4a39deb2) SHA1(7e63e615869958db66a4e52a0272afee5a10e446) )
 	ROM_LOAD16_WORD_SWAP( "vam.12m",   0x200000, 0x200000, CRC(1a3e5c03) SHA1(c5a556e125d6c3d68da745b4d56cd7a851f2a23d) )
 
@@ -3588,7 +3588,7 @@
 ROM_END
 
 ROM_START( vampjr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vamj.03", 0x000000, 0x80000, CRC(8895bf77) SHA1(7977dad8c4baf89f28668f54225233a8e759aa3e) )
 	ROM_LOAD16_WORD_SWAP( "vamj.04", 0x080000, 0x80000, CRC(5027db3d) SHA1(64bd09f2b5fd2435d8ec86f64543b640ab08f82f) )
 	ROM_LOAD16_WORD_SWAP( "vamj.05", 0x100000, 0x80000, CRC(97c66fdb) SHA1(fe5c099dd29797aef28a247913f8931aa8ce6160) )
@@ -3608,12 +3608,12 @@
 	ROM_LOAD64_WORD( "vam.18m",   0x1000004, 0x100000, CRC(3a033625) SHA1(294238f30cba5cf4f8f1de951d54c2077bd95de9) )
 	ROM_LOAD64_WORD( "vam.20m",   0x1000006, 0x100000, CRC(2bff6a89) SHA1(8f4e131e5ce0af48fb89f98026d9f0356c7c301f) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vam.01",   0x00000, 0x08000, CRC(64b685d5) SHA1(6c180e7420db754eca5cad17a40f5a64f5c3bd15) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vam.02",   0x28000, 0x20000, CRC(cf7c97c7) SHA1(109a4b56ecd59be9c3f5869de99d40619bdaef21) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vam.11m",   0x000000, 0x200000, CRC(4a39deb2) SHA1(7e63e615869958db66a4e52a0272afee5a10e446) )
 	ROM_LOAD16_WORD_SWAP( "vam.12m",   0x200000, 0x200000, CRC(1a3e5c03) SHA1(c5a556e125d6c3d68da745b4d56cd7a851f2a23d) )
 
@@ -3622,7 +3622,7 @@
 ROM_END
 
 ROM_START( dstlka )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vama.03a", 0x000000, 0x80000, CRC(294e0bec) SHA1(e90844cd18ad431e999e606d076738384b346b9d) )
 	ROM_LOAD16_WORD_SWAP( "vama.04a", 0x080000, 0x80000, CRC(bc18e128) SHA1(53116cddb7123b573d76064640c3829fd978c67a) )
 	ROM_LOAD16_WORD_SWAP( "vama.05a", 0x100000, 0x80000, CRC(e709fa59) SHA1(824d2b22c5627b9dba046b76c1ff5a46f577eddd) )
@@ -3642,12 +3642,12 @@
 	ROM_LOAD64_WORD( "vam.18m",   0x1000004, 0x100000, CRC(3a033625) SHA1(294238f30cba5cf4f8f1de951d54c2077bd95de9) )
 	ROM_LOAD64_WORD( "vam.20m",   0x1000006, 0x100000, CRC(2bff6a89) SHA1(8f4e131e5ce0af48fb89f98026d9f0356c7c301f) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vam.01",   0x00000, 0x08000, CRC(64b685d5) SHA1(6c180e7420db754eca5cad17a40f5a64f5c3bd15) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vam.02",   0x28000, 0x20000, CRC(cf7c97c7) SHA1(109a4b56ecd59be9c3f5869de99d40619bdaef21) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vam.11m",   0x000000, 0x200000, CRC(4a39deb2) SHA1(7e63e615869958db66a4e52a0272afee5a10e446) )
 	ROM_LOAD16_WORD_SWAP( "vam.12m",   0x200000, 0x200000, CRC(1a3e5c03) SHA1(c5a556e125d6c3d68da745b4d56cd7a851f2a23d) )
 
@@ -3656,7 +3656,7 @@
 ROM_END
 
 ROM_START( dstlkh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vamh.03c", 0x000000, 0x80000, CRC(4d7b9e8f) SHA1(08555da1b024e6ab4dfe802352065c132ddc2abb) )
 	ROM_LOAD16_WORD_SWAP( "vamh.04c", 0x080000, 0x80000, CRC(2217e9a0) SHA1(b86ee89457d8a0cf828f1bed247f3b2c0c91b170) )
 	ROM_LOAD16_WORD_SWAP( "vamh.05c", 0x100000, 0x80000, CRC(3a05b13c) SHA1(14b58954bdff8dd699f867037a86f0bae8095e9d) )
@@ -3676,12 +3676,12 @@
 	ROM_LOAD64_WORD( "vam.18m",   0x1000004, 0x100000, CRC(3a033625) SHA1(294238f30cba5cf4f8f1de951d54c2077bd95de9) )
 	ROM_LOAD64_WORD( "vam.20m",   0x1000006, 0x100000, CRC(2bff6a89) SHA1(8f4e131e5ce0af48fb89f98026d9f0356c7c301f) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vam.01",   0x00000, 0x08000, CRC(64b685d5) SHA1(6c180e7420db754eca5cad17a40f5a64f5c3bd15) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vam.02",   0x28000, 0x20000, CRC(cf7c97c7) SHA1(109a4b56ecd59be9c3f5869de99d40619bdaef21) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vam.11m",   0x000000, 0x200000, CRC(4a39deb2) SHA1(7e63e615869958db66a4e52a0272afee5a10e446) )
 	ROM_LOAD16_WORD_SWAP( "vam.12m",   0x200000, 0x200000, CRC(1a3e5c03) SHA1(c5a556e125d6c3d68da745b4d56cd7a851f2a23d) )
 
@@ -3690,7 +3690,7 @@
 ROM_END
 
 ROM_START( ecofghtr )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "uece.03", 0x000000, 0x80000, CRC(ec2c1137) SHA1(19c5b68cccd682d3996faf8c5f07a644b2384b1c) )
 	ROM_LOAD16_WORD_SWAP( "uece.04", 0x080000, 0x80000, CRC(b35f99db) SHA1(4dd5c4840406a9323431f5bda7224cadacf8b419) )
 	ROM_LOAD16_WORD_SWAP( "uece.05", 0x100000, 0x80000, CRC(d9d42d31) SHA1(58e7438fa212655ca56cbb477ea353e1083e0933) )
@@ -3706,11 +3706,11 @@
 	ROM_LOAD64_WORD( "uec.18m",   0x800004, 0x100000, CRC(b167ae12) SHA1(48c552d02caad27d680aa51170560794f2a51478) )
 	ROM_LOAD64_WORD( "uec.20m",   0x800006, 0x100000, CRC(1064bdc2) SHA1(c51f75ac8d3f02a771feda0a933314a928555c4e) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "uec.01",   0x00000, 0x08000, CRC(c235bd15) SHA1(feb7cd7db9dc0b9887b33eed9796bb0205fb719d) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "uec.11m",   0x000000, 0x200000, CRC(81b25d39) SHA1(448adfcc7d98873a48c710d857225cdd1580e5c9) )
 	ROM_LOAD16_WORD_SWAP( "uec.12m",   0x200000, 0x200000, CRC(27729e52) SHA1(a55c8159adf766dda70cb047f5ac85ce6bc0a3f3) )
 
@@ -3719,7 +3719,7 @@
 ROM_END
 
 ROM_START( ecofghtru )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "uecu.03a", 0x000000, 0x80000, CRC(22d88a4d) SHA1(0aa5a4b51ae98b8b3bfc65aef9449796ffad7f10) )
 	ROM_LOAD16_WORD_SWAP( "uecu.04a", 0x080000, 0x80000, CRC(6436cfcd) SHA1(adb4e1ab2a01a1ea1b08a76ecf58654450e13cf9) )
 	ROM_LOAD16_WORD_SWAP( "uecu.05a", 0x100000, 0x80000, CRC(336f121b) SHA1(93800c459b516382cc62cebeb456274f48322fab) )
@@ -3735,11 +3735,11 @@
 	ROM_LOAD64_WORD( "uec.18m",   0x800004, 0x100000, CRC(b167ae12) SHA1(48c552d02caad27d680aa51170560794f2a51478) )
 	ROM_LOAD64_WORD( "uec.20m",   0x800006, 0x100000, CRC(1064bdc2) SHA1(c51f75ac8d3f02a771feda0a933314a928555c4e) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "uec.01",   0x00000, 0x08000, CRC(c235bd15) SHA1(feb7cd7db9dc0b9887b33eed9796bb0205fb719d) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "uec.11m",   0x000000, 0x200000, CRC(81b25d39) SHA1(448adfcc7d98873a48c710d857225cdd1580e5c9) )
 	ROM_LOAD16_WORD_SWAP( "uec.12m",   0x200000, 0x200000, CRC(27729e52) SHA1(a55c8159adf766dda70cb047f5ac85ce6bc0a3f3) )
 
@@ -3748,7 +3748,7 @@
 ROM_END
 
 ROM_START( ecofghtru1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "uecu.03", 0x000000, 0x80000, CRC(6792480c) SHA1(89d7095a36a1094237f9e1d82a0dc482409999ca) )
 	ROM_LOAD16_WORD_SWAP( "uecu.04", 0x080000, 0x80000, CRC(95ce69d5) SHA1(d32c7e2a99ae29cbf9fee1e092a418f300a218ca) )
 	ROM_LOAD16_WORD_SWAP( "uecu.05", 0x100000, 0x80000, CRC(3a1e78ad) SHA1(133b65cd4bfd45a9d9d3feec9ccb1e6fc2891818) )
@@ -3764,11 +3764,11 @@
 	ROM_LOAD64_WORD( "uec.18m",   0x800004, 0x100000, CRC(b167ae12) SHA1(48c552d02caad27d680aa51170560794f2a51478) )
 	ROM_LOAD64_WORD( "uec.20m",   0x800006, 0x100000, CRC(1064bdc2) SHA1(c51f75ac8d3f02a771feda0a933314a928555c4e) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "uec.01",   0x00000, 0x08000, CRC(c235bd15) SHA1(feb7cd7db9dc0b9887b33eed9796bb0205fb719d) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "uec.11m",   0x000000, 0x200000, CRC(81b25d39) SHA1(448adfcc7d98873a48c710d857225cdd1580e5c9) )
 	ROM_LOAD16_WORD_SWAP( "uec.12m",   0x200000, 0x200000, CRC(27729e52) SHA1(a55c8159adf766dda70cb047f5ac85ce6bc0a3f3) )
 
@@ -3777,7 +3777,7 @@
 ROM_END
 
 ROM_START( uecology )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "uecj.03", 0x000000, 0x80000, CRC(94c40a4c) SHA1(6446b22a30a9a3c87b7a9fc2f15fbceccfbfb942) )
 	ROM_LOAD16_WORD_SWAP( "uecj.04", 0x080000, 0x80000, CRC(8d6e3a09) SHA1(80167275f288a4c4b2bb61bdde956015f4206b78) )
 	ROM_LOAD16_WORD_SWAP( "uecj.05", 0x100000, 0x80000, CRC(8604ecd7) SHA1(e1690565b40db84f4ce30e6eb2d7940b82989678) )
@@ -3793,11 +3793,11 @@
 	ROM_LOAD64_WORD( "uec.18m",   0x800004, 0x100000, CRC(b167ae12) SHA1(48c552d02caad27d680aa51170560794f2a51478) )
 	ROM_LOAD64_WORD( "uec.20m",   0x800006, 0x100000, CRC(1064bdc2) SHA1(c51f75ac8d3f02a771feda0a933314a928555c4e) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "uec.01",   0x00000, 0x08000, CRC(c235bd15) SHA1(feb7cd7db9dc0b9887b33eed9796bb0205fb719d) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "uec.11m",   0x000000, 0x200000, CRC(81b25d39) SHA1(448adfcc7d98873a48c710d857225cdd1580e5c9) )
 	ROM_LOAD16_WORD_SWAP( "uec.12m",   0x200000, 0x200000, CRC(27729e52) SHA1(a55c8159adf766dda70cb047f5ac85ce6bc0a3f3) )
 
@@ -3806,7 +3806,7 @@
 ROM_END
 
 ROM_START( ecofghtra )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ueca.03", 0x000000, 0x80000, CRC(bd4589b1) SHA1(8ec03a750de155c6ce0a2c3a6b57e6a6dcaf9ebc) )
 	ROM_LOAD16_WORD_SWAP( "ueca.04", 0x080000, 0x80000, CRC(1d134b7d) SHA1(c9dd725ff45f29a3fa68bfe6d5aea2e8c3c64bd8) )
 	ROM_LOAD16_WORD_SWAP( "ueca.05", 0x100000, 0x80000, CRC(9c581fc7) SHA1(300983148da59da7d2fcbc5bc45b068fdfbcb512) )
@@ -3822,11 +3822,11 @@
 	ROM_LOAD64_WORD( "uec.18m",   0x800004, 0x100000, CRC(b167ae12) SHA1(48c552d02caad27d680aa51170560794f2a51478) )
 	ROM_LOAD64_WORD( "uec.20m",   0x800006, 0x100000, CRC(1064bdc2) SHA1(c51f75ac8d3f02a771feda0a933314a928555c4e) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "uec.01",   0x00000, 0x08000, CRC(c235bd15) SHA1(feb7cd7db9dc0b9887b33eed9796bb0205fb719d) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "uec.11m",   0x000000, 0x200000, CRC(81b25d39) SHA1(448adfcc7d98873a48c710d857225cdd1580e5c9) )
 	ROM_LOAD16_WORD_SWAP( "uec.12m",   0x200000, 0x200000, CRC(27729e52) SHA1(a55c8159adf766dda70cb047f5ac85ce6bc0a3f3) )
 
@@ -3835,7 +3835,7 @@
 ROM_END
 
 ROM_START( ecofghtrh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "uech.03", 0x000000, 0x80000, CRC(14c9365e) SHA1(caba5e617a2c9516c6f24a327451edcff39b1bfd) )
 	ROM_LOAD16_WORD_SWAP( "uech.04", 0x080000, 0x80000, CRC(579495dc) SHA1(4b0f59da30c86d6c433429c46b4f24c7c55d6731) )
 	ROM_LOAD16_WORD_SWAP( "uech.05", 0x100000, 0x80000, CRC(96807a8e) SHA1(6f12d5fbff17797338f26e2b32e9f27d8288262e) )
@@ -3851,11 +3851,11 @@
 	ROM_LOAD64_WORD( "uec.18m",   0x800004, 0x100000, CRC(b167ae12) SHA1(48c552d02caad27d680aa51170560794f2a51478) )
 	ROM_LOAD64_WORD( "uec.20m",   0x800006, 0x100000, CRC(1064bdc2) SHA1(c51f75ac8d3f02a771feda0a933314a928555c4e) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "uec.01",   0x00000, 0x08000, CRC(c235bd15) SHA1(feb7cd7db9dc0b9887b33eed9796bb0205fb719d) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "uec.11m",   0x000000, 0x200000, CRC(81b25d39) SHA1(448adfcc7d98873a48c710d857225cdd1580e5c9) )
 	ROM_LOAD16_WORD_SWAP( "uec.12m",   0x200000, 0x200000, CRC(27729e52) SHA1(a55c8159adf766dda70cb047f5ac85ce6bc0a3f3) )
 
@@ -3864,7 +3864,7 @@
 ROM_END
 
 ROM_START( gigawing )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ggwu.03", 0x000000, 0x80000, CRC(ac725eb2) SHA1(a4be9fe537cdb47b37478c8397f6effe8a536233) )
 	ROM_LOAD16_WORD_SWAP( "ggwu.04", 0x080000, 0x80000, CRC(392f4118) SHA1(3bb0bd9503ef60892d5abd8640af524cf71da848) )
 	ROM_LOAD16_WORD_SWAP( "ggw.05",  0x100000, 0x80000, CRC(3239d642) SHA1(2fe3984c46a72aedb30a28e3db5af2612bdf0045) )
@@ -3875,11 +3875,11 @@
 	ROM_LOAD64_WORD( "ggw.17m",   0x000004, 0x400000, CRC(466e0ba4) SHA1(9563455b95d36fafe508290659088b153539cfdf) )
 	ROM_LOAD64_WORD( "ggw.19m",   0x000006, 0x400000, CRC(840c8dea) SHA1(ea04afce17f00b45d3d2cd5140d0dd7ab4bccc00) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ggw.01",   0x00000, 0x08000, CRC(4c6351d5) SHA1(cef81fb7c4b8cb2ef1f8f3c27982aefbcbe38160) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "ggw.11m",   0x000000, 0x400000, CRC(e172acf5) SHA1(d7b0963d66165f3607d887741c5e7ab952bcf2ff) )
 	ROM_LOAD16_WORD_SWAP( "ggw.12m",   0x400000, 0x400000, CRC(4bee4e8f) SHA1(c440b5a38359ec3b8002f39690b79bf78703f5d0) )
 
@@ -3888,7 +3888,7 @@
 ROM_END
 
 ROM_START( gigawingj )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ggwj.03a", 0x000000, 0x80000, CRC(fdd23b91) SHA1(c805473d3dc6bdb7ce232a9d7181d213544b2e7b) )
 	ROM_LOAD16_WORD_SWAP( "ggwj.04a", 0x080000, 0x80000, CRC(8c6e093c) SHA1(a4864b3b54cf648af81f74e2936d2bb8b99d68a9) )
 	ROM_LOAD16_WORD_SWAP( "ggwj.05a", 0x100000, 0x80000, CRC(43811454) SHA1(2a9563c840bd934c7e94f434a01686b7ff92e6d2) )
@@ -3899,11 +3899,11 @@
 	ROM_LOAD64_WORD( "ggw.17m",   0x000004, 0x400000, CRC(466e0ba4) SHA1(9563455b95d36fafe508290659088b153539cfdf) )
 	ROM_LOAD64_WORD( "ggw.19m",   0x000006, 0x400000, CRC(840c8dea) SHA1(ea04afce17f00b45d3d2cd5140d0dd7ab4bccc00) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ggw.01",   0x00000, 0x08000, CRC(4c6351d5) SHA1(cef81fb7c4b8cb2ef1f8f3c27982aefbcbe38160) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "ggw.11m",   0x000000, 0x400000, CRC(e172acf5) SHA1(d7b0963d66165f3607d887741c5e7ab952bcf2ff) )
 	ROM_LOAD16_WORD_SWAP( "ggw.12m",   0x400000, 0x400000, CRC(4bee4e8f) SHA1(c440b5a38359ec3b8002f39690b79bf78703f5d0) )
 
@@ -3912,7 +3912,7 @@
 ROM_END
 
 ROM_START( gigawinga )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ggwa.03a", 0x000000, 0x80000, CRC(116f8837) SHA1(9ade6c2fae319e0111e7afd3af10096d8d88f0c5) )
 	ROM_LOAD16_WORD_SWAP( "ggwa.04a", 0x080000, 0x80000, CRC(e6e3f0c4) SHA1(3c28cc050f36fb070a8abf057f0972dc16bc5629) )
 	ROM_LOAD16_WORD_SWAP( "ggwa.05a", 0x100000, 0x80000, CRC(465e8ac9) SHA1(da94fb64c7ea64ac9e4e847b69e2b870f716dd34) )
@@ -3923,11 +3923,11 @@
 	ROM_LOAD64_WORD( "ggw.17m",   0x000004, 0x400000, CRC(466e0ba4) SHA1(9563455b95d36fafe508290659088b153539cfdf) )
 	ROM_LOAD64_WORD( "ggw.19m",   0x000006, 0x400000, CRC(840c8dea) SHA1(ea04afce17f00b45d3d2cd5140d0dd7ab4bccc00) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ggw.01",   0x00000, 0x08000, CRC(4c6351d5) SHA1(cef81fb7c4b8cb2ef1f8f3c27982aefbcbe38160) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "ggw.11m",   0x000000, 0x400000, CRC(e172acf5) SHA1(d7b0963d66165f3607d887741c5e7ab952bcf2ff) )
 	ROM_LOAD16_WORD_SWAP( "ggw.12m",   0x400000, 0x400000, CRC(4bee4e8f) SHA1(c440b5a38359ec3b8002f39690b79bf78703f5d0) )
 
@@ -3936,7 +3936,7 @@
 ROM_END
 
 ROM_START( gigawingh )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ggwh.03a", 0x000000, 0x80000, CRC(b9ee36eb) SHA1(7b977dcd27c1ed8f9d2ebaccf2497abeafcc6081) )
 	ROM_LOAD16_WORD_SWAP( "ggwh.04a", 0x080000, 0x80000, CRC(72e548fe) SHA1(67d4870d6f7df4b947f1ac6f6605a2344bfc04c1) )
 	ROM_LOAD16_WORD_SWAP( "ggw.05",   0x100000, 0x80000, CRC(3239d642) SHA1(2fe3984c46a72aedb30a28e3db5af2612bdf0045) )
@@ -3947,11 +3947,11 @@
 	ROM_LOAD64_WORD( "ggw.17m",   0x000004, 0x400000, CRC(466e0ba4) SHA1(9563455b95d36fafe508290659088b153539cfdf) )
 	ROM_LOAD64_WORD( "ggw.19m",   0x000006, 0x400000, CRC(840c8dea) SHA1(ea04afce17f00b45d3d2cd5140d0dd7ab4bccc00) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ggw.01",   0x00000, 0x08000, CRC(4c6351d5) SHA1(cef81fb7c4b8cb2ef1f8f3c27982aefbcbe38160) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "ggw.11m",   0x000000, 0x400000, CRC(e172acf5) SHA1(d7b0963d66165f3607d887741c5e7ab952bcf2ff) )
 	ROM_LOAD16_WORD_SWAP( "ggw.12m",   0x400000, 0x400000, CRC(4bee4e8f) SHA1(c440b5a38359ec3b8002f39690b79bf78703f5d0) )
 
@@ -3960,7 +3960,7 @@
 ROM_END
 
 ROM_START( gigawingb )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ggwb.03", 0x000000, 0x80000, CRC(a1f8a448) SHA1(a88ed9fea9ec08fda59a1ca9622dfb9f8afdda78) )
 	ROM_LOAD16_WORD_SWAP( "ggwb.04", 0x080000, 0x80000, CRC(6a423e76) SHA1(f6ed20f09e852b4fad78ee32617122d5deb98789) )
 	ROM_LOAD16_WORD_SWAP( "ggw.05",  0x100000, 0x80000, CRC(3239d642) SHA1(2fe3984c46a72aedb30a28e3db5af2612bdf0045) )
@@ -3971,11 +3971,11 @@
 	ROM_LOAD64_WORD( "ggw.17m",   0x000004, 0x400000, CRC(466e0ba4) SHA1(9563455b95d36fafe508290659088b153539cfdf) )
 	ROM_LOAD64_WORD( "ggw.19m",   0x000006, 0x400000, CRC(840c8dea) SHA1(ea04afce17f00b45d3d2cd5140d0dd7ab4bccc00) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ggw.01",   0x00000, 0x08000, CRC(4c6351d5) SHA1(cef81fb7c4b8cb2ef1f8f3c27982aefbcbe38160) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "ggw.11m",   0x000000, 0x400000, CRC(e172acf5) SHA1(d7b0963d66165f3607d887741c5e7ab952bcf2ff) )
 	ROM_LOAD16_WORD_SWAP( "ggw.12m",   0x400000, 0x400000, CRC(4bee4e8f) SHA1(c440b5a38359ec3b8002f39690b79bf78703f5d0) )
 
@@ -3984,7 +3984,7 @@
 ROM_END
 
 ROM_START( hsf2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "hs2u.03",  0x000000, 0x80000, CRC(b308151e) SHA1(afdfd3b049c6435e2291bc35d8c26ff5bff223d8) )
 	ROM_LOAD16_WORD_SWAP( "hs2u.04",  0x080000, 0x80000, CRC(327aa49c) SHA1(6719cd6ecc2a4487fdbf5cbcd47e35fc43000607) )
 	ROM_LOAD16_WORD_SWAP( "hs2.05",   0x100000, 0x80000, CRC(dde34a35) SHA1(f5be2d2916db6e86e0886d61d55bddf138273ebc) )
@@ -4000,12 +4000,12 @@
 	ROM_LOAD64_WORD( "hs2.17m",   0x0000004, 0x800000, CRC(adfa7726) SHA1(8d36ec125a8c91abfe5213893d794f8bc11c8acd) )
 	ROM_LOAD64_WORD( "hs2.19m",   0x0000006, 0x800000, CRC(bb3ae322) SHA1(ecd289d7a0fe365fdd7c5527cb17796002beb553) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "hs2.01",   0x00000, 0x08000, CRC(c1a13786) SHA1(c7392c7efb15ea4042e75bd9007e974293d8935d) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "hs2.02",   0x28000, 0x20000, CRC(2d8794aa) SHA1(c634affdc2568020cce6af97b4fa79925d9943f3) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "hs2.11m",   0x000000, 0x800000, CRC(0e15c359) SHA1(176108b0d76d821a849324680aba0cd04b5016c1) )
 
 	ROM_REGION( 0x20, "key", 0 )
@@ -4013,7 +4013,7 @@
 ROM_END
 
 ROM_START( hsf2a )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "hs2a.03",  0x000000, 0x80000, CRC(d50a17e0) SHA1(5d8d6d309260cc2d862aa080d44a72886ee08c77) )
 	ROM_LOAD16_WORD_SWAP( "hs2a.04",  0x080000, 0x80000, CRC(a27f42de) SHA1(7a355831b57a35e327b2618fd5dca11afed2a233) )
 	ROM_LOAD16_WORD_SWAP( "hs2.05",   0x100000, 0x80000, CRC(dde34a35) SHA1(f5be2d2916db6e86e0886d61d55bddf138273ebc) )
@@ -4029,12 +4029,12 @@
 	ROM_LOAD64_WORD( "hs2.17m",   0x0000004, 0x800000, CRC(adfa7726) SHA1(8d36ec125a8c91abfe5213893d794f8bc11c8acd) )
 	ROM_LOAD64_WORD( "hs2.19m",   0x0000006, 0x800000, CRC(bb3ae322) SHA1(ecd289d7a0fe365fdd7c5527cb17796002beb553) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "hs2.01",   0x00000, 0x08000, CRC(c1a13786) SHA1(c7392c7efb15ea4042e75bd9007e974293d8935d) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "hs2.02",   0x28000, 0x20000, CRC(2d8794aa) SHA1(c634affdc2568020cce6af97b4fa79925d9943f3) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "hs2.11m",   0x000000, 0x800000, CRC(0e15c359) SHA1(176108b0d76d821a849324680aba0cd04b5016c1) )
 
 	ROM_REGION( 0x20, "key", 0 )
@@ -4042,7 +4042,7 @@
 ROM_END
 
 ROM_START( hsf2j )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "hs2j.03c", 0x000000, 0x80000, CRC(6efe661f) SHA1(5e8df6183cc04ae0f3002f85ffedaa09b4397cd9) )
 	ROM_LOAD16_WORD_SWAP( "hs2j.04b", 0x080000, 0x80000, CRC(93f2500a) SHA1(d340e8afd0a05066e19d795fdea31b4d1e00ad97) )
 	ROM_LOAD16_WORD_SWAP( "hs2j.05",  0x100000, 0x80000, CRC(dde34a35) SHA1(f5be2d2916db6e86e0886d61d55bddf138273ebc) )
@@ -4058,12 +4058,12 @@
 	ROM_LOAD64_WORD( "hs2.17m",   0x0000004, 0x800000, CRC(adfa7726) SHA1(8d36ec125a8c91abfe5213893d794f8bc11c8acd) )
 	ROM_LOAD64_WORD( "hs2.19m",   0x0000006, 0x800000, CRC(bb3ae322) SHA1(ecd289d7a0fe365fdd7c5527cb17796002beb553) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "hs2.01",   0x00000, 0x08000, CRC(c1a13786) SHA1(c7392c7efb15ea4042e75bd9007e974293d8935d) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "hs2.02",   0x28000, 0x20000, CRC(2d8794aa) SHA1(c634affdc2568020cce6af97b4fa79925d9943f3) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "hs2.11m",   0x000000, 0x800000, CRC(0e15c359) SHA1(176108b0d76d821a849324680aba0cd04b5016c1) )
 
 	ROM_REGION( 0x20, "key", 0 )
@@ -4071,7 +4071,7 @@
 ROM_END
 
 ROM_START( hsf2j1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "hs2j.03",  0x000000, 0x80000, CRC(00738f73) SHA1(99947a621f21a88dc4c425d9bfbc30b3c5f76ecd) )
 	ROM_LOAD16_WORD_SWAP( "hs2j.04",  0x080000, 0x80000, CRC(40072c4a) SHA1(85b95bd3c907b4276a31777e092b8c40d3763257) )
 	ROM_LOAD16_WORD_SWAP( "hs2.05",   0x100000, 0x80000, CRC(dde34a35) SHA1(f5be2d2916db6e86e0886d61d55bddf138273ebc) )
@@ -4087,12 +4087,12 @@
 	ROM_LOAD64_WORD( "hs2.17m",   0x0000004, 0x800000, CRC(adfa7726) SHA1(8d36ec125a8c91abfe5213893d794f8bc11c8acd) )
 	ROM_LOAD64_WORD( "hs2.19m",   0x0000006, 0x800000, CRC(bb3ae322) SHA1(ecd289d7a0fe365fdd7c5527cb17796002beb553) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "hs2.01",   0x00000, 0x08000, CRC(c1a13786) SHA1(c7392c7efb15ea4042e75bd9007e974293d8935d) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "hs2.02",   0x28000, 0x20000, CRC(2d8794aa) SHA1(c634affdc2568020cce6af97b4fa79925d9943f3) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "hs2.11m",   0x000000, 0x800000, CRC(0e15c359) SHA1(176108b0d76d821a849324680aba0cd04b5016c1) )
 
 	ROM_REGION( 0x20, "key", 0 )
@@ -4100,33 +4100,33 @@
 ROM_END
 
 ROM_START( jyangoku )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "majj.03", 0x000000, 0x80000, CRC(4614a3b2) SHA1(f7226006feafaf561046ae7fce18bf62289d41df) )
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "maj1_d.simm1",   0x0000000, 0x200000, CRC(ba0fe27b) SHA1(60a4fdee8da663777af1e126a1aa6308c9d9a5a9) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "maj1_c.simm1",   0x0000001, 0x200000, CRC(2cd141bf) SHA1(57ec73ea24d594fc1e4d2d194a3c548a7043666e) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "maj1_b.simm1",   0x0000002, 0x200000, CRC(e29e4c26) SHA1(51e99536f40481c4c208695354e90fb3fe9416d5) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "maj1_a.simm1",   0x0000003, 0x200000, CRC(7f68b88a) SHA1(944bf34dc998dffe39b25c3e9fcec17ad421ce81) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "maj3_d.simm3",   0x0000004, 0x200000, CRC(3aaeb90b) SHA1(d426d5c7ae5ca99321ec1280abdd1fdfe4882829) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "maj3_c.simm3",   0x0000005, 0x200000, CRC(97894cea) SHA1(a501cd80e6da75409e3381d66bd0a13e021e89f3) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "maj3_b.simm3",   0x0000006, 0x200000, CRC(ec737d9d) SHA1(cfff42cc24ac011fab2670dec42cab16f4e0d84d) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "maj3_a.simm3",   0x0000007, 0x200000, CRC(c23b6f22) SHA1(fb3120ea28c67ecb7c4a2b61a64feb62c033ef68) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "maj1_d.simm1",   0x0000000, 0x200000, CRC(ba0fe27b) SHA1(60a4fdee8da663777af1e126a1aa6308c9d9a5a9) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "maj1_c.simm1",   0x0000001, 0x200000, CRC(2cd141bf) SHA1(57ec73ea24d594fc1e4d2d194a3c548a7043666e) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "maj1_b.simm1",   0x0000002, 0x200000, CRC(e29e4c26) SHA1(51e99536f40481c4c208695354e90fb3fe9416d5) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "maj1_a.simm1",   0x0000003, 0x200000, CRC(7f68b88a) SHA1(944bf34dc998dffe39b25c3e9fcec17ad421ce81) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "maj3_d.simm3",   0x0000004, 0x200000, CRC(3aaeb90b) SHA1(d426d5c7ae5ca99321ec1280abdd1fdfe4882829) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "maj3_c.simm3",   0x0000005, 0x200000, CRC(97894cea) SHA1(a501cd80e6da75409e3381d66bd0a13e021e89f3) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "maj3_b.simm3",   0x0000006, 0x200000, CRC(ec737d9d) SHA1(cfff42cc24ac011fab2670dec42cab16f4e0d84d) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "maj3_a.simm3",   0x0000007, 0x200000, CRC(c23b6f22) SHA1(fb3120ea28c67ecb7c4a2b61a64feb62c033ef68) ) // ROM on a SIMM
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "maj.01",  0x00000, 0x08000, CRC(1fe8c213) SHA1(e0045566337851d8261ed65d5bea483f09ae96b4) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_BYTE( "maj5_a.simm5",   0x000000, 0x200000, CRC(5ad9ee53) SHA1(acfb7ec137209409c1a439ebc62d8fa3f87e7012) ) // ROM on a simm
-	ROM_LOAD16_BYTE( "maj5_b.simm5",   0x000001, 0x200000, CRC(efb3dbfb) SHA1(3b32b9890f79805b6a2e1ec63f2cadaca14cf11a) ) // ROM on a simm
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_BYTE( "maj5_a.simm5",   0x000000, 0x200000, CRC(5ad9ee53) SHA1(acfb7ec137209409c1a439ebc62d8fa3f87e7012) ) // ROM on a SIMM
+	ROM_LOAD16_BYTE( "maj5_b.simm5",   0x000001, 0x200000, CRC(efb3dbfb) SHA1(3b32b9890f79805b6a2e1ec63f2cadaca14cf11a) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "jyangoku.key", 0x000000, 0x000014, CRC(95b0a560) SHA1(6c0684ab321bd555ec9f8f16e63f6c358318ad7e) )
 ROM_END
 
 ROM_START( megaman2 )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "rm2u.03", 0x000000, 0x80000, CRC(8ffc2cd1) SHA1(919ef08311008288b31ed42fb13172580d50433a) )
 	ROM_LOAD16_WORD_SWAP( "rm2u.04", 0x080000, 0x80000, CRC(bb30083a) SHA1(466b818a01ad367a8df6df8661f616f5a0236714) )
 	ROM_LOAD16_WORD_SWAP( "rm2.05",  0x100000, 0x80000, CRC(02ee9efc) SHA1(1b80c40389b51a03b930051f232630616c12e6c5) )
@@ -4138,12 +4138,12 @@
 	ROM_LOAD64_WORD( "rm2.18m",  0x800004, 0x200000, CRC(12257251) SHA1(20cb58afda0e6200991277817485340a6a41ae2b) )
 	ROM_LOAD64_WORD( "rm2.20m",  0x800006, 0x200000, CRC(f9b6e786) SHA1(aeb4acff7208e66a35198143fd2478039fdaa3a6) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "rm2.01a",  0x00000, 0x08000, CRC(d18e7859) SHA1(0939fac70042d0b4db5c2fdcef1f79b95febd45e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "rm2.02",   0x28000, 0x20000, CRC(c463ece0) SHA1(5c3e41eb61610b3f8c431206f6672907e3a0bdb0) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "rm2.11m",   0x000000, 0x200000, CRC(2106174d) SHA1(0a35d9ca8ebcad74904b20648d5320f839d6377e) )
 	ROM_LOAD16_WORD_SWAP( "rm2.12m",   0x200000, 0x200000, CRC(546c1636) SHA1(f96b172ab899f2c6ee17a5dd1fb61af9432e3cd2) )
 
@@ -4152,7 +4152,7 @@
 ROM_END
 
 ROM_START( megaman2a )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "rm2a.03", 0x000000, 0x80000, CRC(2b330ca7) SHA1(afa86ef73f5660600d18ff221ed135c026042e05) )
 	ROM_LOAD16_WORD_SWAP( "rm2a.04", 0x080000, 0x80000, CRC(8b47942b) SHA1(160574a38e89d31b975c56264f3f5a7a68ce760c) )
 	ROM_LOAD16_WORD_SWAP( "rm2.05",  0x100000, 0x80000, CRC(02ee9efc) SHA1(1b80c40389b51a03b930051f232630616c12e6c5) )
@@ -4164,12 +4164,12 @@
 	ROM_LOAD64_WORD( "rm2.18m",  0x800004, 0x200000, CRC(12257251) SHA1(20cb58afda0e6200991277817485340a6a41ae2b) )
 	ROM_LOAD64_WORD( "rm2.20m",  0x800006, 0x200000, CRC(f9b6e786) SHA1(aeb4acff7208e66a35198143fd2478039fdaa3a6) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "rm2.01a",  0x00000, 0x08000, CRC(d18e7859) SHA1(0939fac70042d0b4db5c2fdcef1f79b95febd45e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "rm2.02",   0x28000, 0x20000, CRC(c463ece0) SHA1(5c3e41eb61610b3f8c431206f6672907e3a0bdb0) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "rm2.11m",   0x000000, 0x200000, CRC(2106174d) SHA1(0a35d9ca8ebcad74904b20648d5320f839d6377e) )
 	ROM_LOAD16_WORD_SWAP( "rm2.12m",   0x200000, 0x200000, CRC(546c1636) SHA1(f96b172ab899f2c6ee17a5dd1fb61af9432e3cd2) )
 
@@ -4178,7 +4178,7 @@
 ROM_END
 
 ROM_START( rockman2j )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "rm2j.03", 0x000000, 0x80000, CRC(dbaa1437) SHA1(849572090bdbde7d9f191959f4b6ad26f46811f4) )
 	ROM_LOAD16_WORD_SWAP( "rm2j.04", 0x080000, 0x80000, CRC(cf5ba612) SHA1(f0b56db8df7ad676e00325c97cf16791f409e35a) )
 	ROM_LOAD16_WORD_SWAP( "rm2.05",  0x100000, 0x80000, CRC(02ee9efc) SHA1(1b80c40389b51a03b930051f232630616c12e6c5) )
@@ -4190,12 +4190,12 @@
 	ROM_LOAD64_WORD( "rm2.18m",  0x800004, 0x200000, CRC(12257251) SHA1(20cb58afda0e6200991277817485340a6a41ae2b) )
 	ROM_LOAD64_WORD( "rm2.20m",  0x800006, 0x200000, CRC(f9b6e786) SHA1(aeb4acff7208e66a35198143fd2478039fdaa3a6) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "rm2.01a",  0x00000, 0x08000, CRC(d18e7859) SHA1(0939fac70042d0b4db5c2fdcef1f79b95febd45e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "rm2.02",   0x28000, 0x20000, CRC(c463ece0) SHA1(5c3e41eb61610b3f8c431206f6672907e3a0bdb0) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "rm2.11m",   0x000000, 0x200000, CRC(2106174d) SHA1(0a35d9ca8ebcad74904b20648d5320f839d6377e) )
 	ROM_LOAD16_WORD_SWAP( "rm2.12m",   0x200000, 0x200000, CRC(546c1636) SHA1(f96b172ab899f2c6ee17a5dd1fb61af9432e3cd2) )
 
@@ -4204,7 +4204,7 @@
 ROM_END
 
 ROM_START( megaman2h )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "rm2h.03", 0x000000, 0x80000, CRC(bb180378) SHA1(ecf5e9907500139073e3b1b4e384039957dca354) )
 	ROM_LOAD16_WORD_SWAP( "rm2h.04", 0x080000, 0x80000, CRC(205ffcd6) SHA1(d1e3a164f4fd4f372ad2f3b4e2026d6487395503) )
 	ROM_LOAD16_WORD_SWAP( "rm2.05",  0x100000, 0x80000, CRC(02ee9efc) SHA1(1b80c40389b51a03b930051f232630616c12e6c5) )
@@ -4216,12 +4216,12 @@
 	ROM_LOAD64_WORD( "rm2.18m",  0x800004, 0x200000, CRC(12257251) SHA1(20cb58afda0e6200991277817485340a6a41ae2b) )
 	ROM_LOAD64_WORD( "rm2.20m",  0x800006, 0x200000, CRC(f9b6e786) SHA1(aeb4acff7208e66a35198143fd2478039fdaa3a6) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "rm2.01a",  0x00000, 0x08000, CRC(d18e7859) SHA1(0939fac70042d0b4db5c2fdcef1f79b95febd45e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "rm2.02",   0x28000, 0x20000, CRC(c463ece0) SHA1(5c3e41eb61610b3f8c431206f6672907e3a0bdb0) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "rm2.11m",   0x000000, 0x200000, CRC(2106174d) SHA1(0a35d9ca8ebcad74904b20648d5320f839d6377e) )
 	ROM_LOAD16_WORD_SWAP( "rm2.12m",   0x200000, 0x200000, CRC(546c1636) SHA1(f96b172ab899f2c6ee17a5dd1fb61af9432e3cd2) )
 
@@ -4245,7 +4245,7 @@
 */
 
 ROM_START( gigaman2 )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sys_rom1.bin", 0x000000, 0x400000, CRC(2eaa5e10) SHA1(79f9a137bf5b3317579c548f346c1dc1cccdb771) )
 
 	ROM_REGION(0x10000, "mcu", 0 )      /* sound MCU code */
@@ -4257,13 +4257,13 @@
 	ROM_LOAD( "cg_rom2.bin",  0x0400000, 0x400000, CRC(63918c05) SHA1(3a7fdf88e87bdbc622504276287740c08df38f6f) )
 	ROM_IGNORE( 0x400000 )
 
-	ROM_REGION( 0x800000, "oki", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "oki", 0 ) // QSound samples
 	/* No Qsound, OKI instead.. */
 	ROM_LOAD( "pcm_rom1.bin", 0x000000, 0x800000, CRC(41a854ab) SHA1(206448c3e27d260d0650c28a9cd524854ce0b64d) )
 ROM_END
 
 ROM_START( mmatrix )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mmxu.03", 0x000000, 0x80000, CRC(ab65b599) SHA1(d4c35f5a6cf0b37a35c466f0e347a660b2e0b21b) )
 	ROM_LOAD16_WORD_SWAP( "mmxu.04", 0x080000, 0x80000, CRC(0135fc6c) SHA1(e40c8fa51dcb300b3ee72dc7de137e0b39dea490) )
 	ROM_LOAD16_WORD_SWAP( "mmxu.05", 0x100000, 0x80000, CRC(f1fd2b84) SHA1(d34816eff4af98009f94f5dd14097b39426e0468) )
@@ -4278,11 +4278,11 @@
 	ROM_LOAD64_WORD( "mmx.18m",   0x1000004, 0x400000, CRC(2562c9d5) SHA1(e7defc3d33db632c4035ae069f2f2332c58afaf5) )
 	ROM_LOAD64_WORD( "mmx.20m",   0x1000006, 0x400000, CRC(583a9687) SHA1(1d0b08b1e88509245db3c2090f0201938fd750b4) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mmx.01",   0x00000, 0x08000, CRC(c57e8171) SHA1(dedb92af1910d38727f816e6f507d25148f31b74) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mmx.11m",   0x000000, 0x400000, CRC(4180b39f) SHA1(cabb1c358eae1bb6cfed07f5b92e4acd38650667) )
 	ROM_LOAD16_WORD_SWAP( "mmx.12m",   0x400000, 0x400000, CRC(95e22a59) SHA1(b3431d170c0a1a0d826ad0af21300b9180e3f114) )
 
@@ -4291,7 +4291,7 @@
 ROM_END
 
 ROM_START( mmatrixj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mmxj.03", 0x000000, 0x80000, CRC(1d5de213) SHA1(2d7ad9cb50540a14aa0ac564d4ab84a3779d595c) )
 	ROM_LOAD16_WORD_SWAP( "mmxj.04", 0x080000, 0x80000, CRC(d943a339) SHA1(ae3d217b35f92fc727bda3b14f13f3658dab3dd8) )
 	ROM_LOAD16_WORD_SWAP( "mmxj.05", 0x100000, 0x80000, CRC(0c8b4abb) SHA1(c136186b9f57d68c0b36f5a4273347f696a227c0) )
@@ -4306,11 +4306,11 @@
 	ROM_LOAD64_WORD( "mmx.18m",   0x1000004, 0x400000, CRC(2562c9d5) SHA1(e7defc3d33db632c4035ae069f2f2332c58afaf5) )
 	ROM_LOAD64_WORD( "mmx.20m",   0x1000006, 0x400000, CRC(583a9687) SHA1(1d0b08b1e88509245db3c2090f0201938fd750b4) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mmx.01",   0x00000, 0x08000, CRC(c57e8171) SHA1(dedb92af1910d38727f816e6f507d25148f31b74) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mmx.11m",   0x000000, 0x400000, CRC(4180b39f) SHA1(cabb1c358eae1bb6cfed07f5b92e4acd38650667) )
 	ROM_LOAD16_WORD_SWAP( "mmx.12m",   0x400000, 0x400000, CRC(95e22a59) SHA1(b3431d170c0a1a0d826ad0af21300b9180e3f114) )
 
@@ -4319,7 +4319,7 @@
 ROM_END
 
 ROM_START( msh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mshe.03e", 0x000000, 0x80000, CRC(bd951414) SHA1(5585bdd1484dc18c7630d689f60d91c068aafc97) )
 	ROM_LOAD16_WORD_SWAP( "mshe.04e", 0x080000, 0x80000, CRC(19dd42f2) SHA1(48bd3e4d2d7e9e07275bd9c00530719deb100090) )
 	ROM_LOAD16_WORD_SWAP( "msh.05",   0x100000, 0x80000, CRC(6a091b9e) SHA1(7fa54e69e1a1ca348cb08d892d55023e9a3ff4cb) )
@@ -4339,12 +4339,12 @@
 	ROM_LOAD64_WORD( "msh.18m",   0x1000004, 0x400000, CRC(4db92d94) SHA1(f1b25ccc0627139ad5b287a8f2ab3b4a2fb8b8e4) )
 	ROM_LOAD64_WORD( "msh.20m",   0x1000006, 0x400000, CRC(a2b0c6c0) SHA1(71016c01c1a706b73cf5b9ac7e384a030c6cf08d) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "msh.01",   0x00000, 0x08000, CRC(c976e6f9) SHA1(281025e5aaf97c0aeddc8bd0f737d092daadad9e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "msh.02",   0x28000, 0x20000, CRC(ce67d0d9) SHA1(324226597cc5a11603f04085fef7715a314ecc05) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "msh.11m",   0x000000, 0x200000, CRC(37ac6d30) SHA1(ec67421fbf4a08a686e76792cb35e9cbf04d022d) )
 	ROM_LOAD16_WORD_SWAP( "msh.12m",   0x200000, 0x200000, CRC(de092570) SHA1(a03d0df901f6ea79685eaed67db65bee14ec29c6) )
 
@@ -4353,7 +4353,7 @@
 ROM_END
 
 ROM_START( mshu )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mshu.03", 0x000000, 0x80000, CRC(d2805bdd) SHA1(a6f78c31a82168bb5f7d614dcebbeab8231e2d75) )
 	ROM_LOAD16_WORD_SWAP( "mshu.04", 0x080000, 0x80000, CRC(743f96ff) SHA1(abb82359bb68966028ea33e94996803599f3e273) )
 	ROM_LOAD16_WORD_SWAP( "msh.05",  0x100000, 0x80000, CRC(6a091b9e) SHA1(7fa54e69e1a1ca348cb08d892d55023e9a3ff4cb) )
@@ -4373,12 +4373,12 @@
 	ROM_LOAD64_WORD( "msh.18m",   0x1000004, 0x400000, CRC(4db92d94) SHA1(f1b25ccc0627139ad5b287a8f2ab3b4a2fb8b8e4) )
 	ROM_LOAD64_WORD( "msh.20m",   0x1000006, 0x400000, CRC(a2b0c6c0) SHA1(71016c01c1a706b73cf5b9ac7e384a030c6cf08d) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "msh.01",   0x00000, 0x08000, CRC(c976e6f9) SHA1(281025e5aaf97c0aeddc8bd0f737d092daadad9e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "msh.02",   0x28000, 0x20000, CRC(ce67d0d9) SHA1(324226597cc5a11603f04085fef7715a314ecc05) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "msh.11m",   0x000000, 0x200000, CRC(37ac6d30) SHA1(ec67421fbf4a08a686e76792cb35e9cbf04d022d) )
 	ROM_LOAD16_WORD_SWAP( "msh.12m",   0x200000, 0x200000, CRC(de092570) SHA1(a03d0df901f6ea79685eaed67db65bee14ec29c6) )
 
@@ -4387,7 +4387,7 @@
 ROM_END
 
 ROM_START( mshj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mshj.03g", 0x000000, 0x80000, CRC(261f4091) SHA1(f4509780768e3601720d0d78c8a9824d410d59da) )
 	ROM_LOAD16_WORD_SWAP( "mshj.04g", 0x080000, 0x80000, CRC(61d791c6) SHA1(9f883bcc48058a99c4ba653d0855c58c5d081243) )
 	ROM_LOAD16_WORD_SWAP( "msh.05a",  0x100000, 0x80000, CRC(f37539e6) SHA1(770febc25ca5615b6c2023727edab3c68b15b2c4) )
@@ -4407,12 +4407,12 @@
 	ROM_LOAD64_WORD( "msh.18m",   0x1000004, 0x400000, CRC(4db92d94) SHA1(f1b25ccc0627139ad5b287a8f2ab3b4a2fb8b8e4) )
 	ROM_LOAD64_WORD( "msh.20m",   0x1000006, 0x400000, CRC(a2b0c6c0) SHA1(71016c01c1a706b73cf5b9ac7e384a030c6cf08d) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "msh.01",   0x00000, 0x08000, CRC(c976e6f9) SHA1(281025e5aaf97c0aeddc8bd0f737d092daadad9e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "msh.02",   0x28000, 0x20000, CRC(ce67d0d9) SHA1(324226597cc5a11603f04085fef7715a314ecc05) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "msh.11m",   0x000000, 0x200000, CRC(37ac6d30) SHA1(ec67421fbf4a08a686e76792cb35e9cbf04d022d) )
 	ROM_LOAD16_WORD_SWAP( "msh.12m",   0x200000, 0x200000, CRC(de092570) SHA1(a03d0df901f6ea79685eaed67db65bee14ec29c6) )
 
@@ -4421,7 +4421,7 @@
 ROM_END
 
 ROM_START( mshjr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mshj.03f", 0x000000, 0x80000, CRC(ff172fd2) SHA1(2dd507e3fcf1a30fde1e6ce63d4233a67e7bfc9e) )
 	ROM_LOAD16_WORD_SWAP( "mshj.04f", 0x080000, 0x80000, CRC(ebbb205a) SHA1(0b110ea4c71bdab819b72e6f9736368575e4cccf) )
 	ROM_LOAD16_WORD_SWAP( "msh.05",   0x100000, 0x80000, CRC(6a091b9e) SHA1(7fa54e69e1a1ca348cb08d892d55023e9a3ff4cb) )
@@ -4441,12 +4441,12 @@
 	ROM_LOAD64_WORD( "msh.18m",   0x1000004, 0x400000, CRC(4db92d94) SHA1(f1b25ccc0627139ad5b287a8f2ab3b4a2fb8b8e4) )
 	ROM_LOAD64_WORD( "msh.20m",   0x1000006, 0x400000, CRC(a2b0c6c0) SHA1(71016c01c1a706b73cf5b9ac7e384a030c6cf08d) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "msh.01",   0x00000, 0x08000, CRC(c976e6f9) SHA1(281025e5aaf97c0aeddc8bd0f737d092daadad9e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "msh.02",   0x28000, 0x20000, CRC(ce67d0d9) SHA1(324226597cc5a11603f04085fef7715a314ecc05) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "msh.11m",   0x000000, 0x200000, CRC(37ac6d30) SHA1(ec67421fbf4a08a686e76792cb35e9cbf04d022d) )
 	ROM_LOAD16_WORD_SWAP( "msh.12m",   0x200000, 0x200000, CRC(de092570) SHA1(a03d0df901f6ea79685eaed67db65bee14ec29c6) )
 
@@ -4455,7 +4455,7 @@
 ROM_END
 
 ROM_START( msha )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "msha.03e", 0x000000, 0x80000, CRC(ec84ec44) SHA1(4d434df6cf5c961f0dbba352d1353db0a8f353dc) )
 	ROM_LOAD16_WORD_SWAP( "msha.04e", 0x080000, 0x80000, CRC(098b8503) SHA1(4cc74754796d5e41f13bf5cd4e8868b0d0c7852c) )
 	ROM_LOAD16_WORD_SWAP( "msh.05",   0x100000, 0x80000, CRC(6a091b9e) SHA1(7fa54e69e1a1ca348cb08d892d55023e9a3ff4cb) )
@@ -4475,12 +4475,12 @@
 	ROM_LOAD64_WORD( "msh.18m",   0x1000004, 0x400000, CRC(4db92d94) SHA1(f1b25ccc0627139ad5b287a8f2ab3b4a2fb8b8e4) )
 	ROM_LOAD64_WORD( "msh.20m",   0x1000006, 0x400000, CRC(a2b0c6c0) SHA1(71016c01c1a706b73cf5b9ac7e384a030c6cf08d) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "msh.01",   0x00000, 0x08000, CRC(c976e6f9) SHA1(281025e5aaf97c0aeddc8bd0f737d092daadad9e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "msh.02",   0x28000, 0x20000, CRC(ce67d0d9) SHA1(324226597cc5a11603f04085fef7715a314ecc05) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "msh.11m",   0x000000, 0x200000, CRC(37ac6d30) SHA1(ec67421fbf4a08a686e76792cb35e9cbf04d022d) )
 	ROM_LOAD16_WORD_SWAP( "msh.12m",   0x200000, 0x200000, CRC(de092570) SHA1(a03d0df901f6ea79685eaed67db65bee14ec29c6) )
 
@@ -4489,7 +4489,7 @@
 ROM_END
 
 ROM_START( mshh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mshh.03c", 0x000000, 0x80000, CRC(8d84b0fa) SHA1(e1fd2869abbe4f8736e496f194e23a1ab0526811) )
 	ROM_LOAD16_WORD_SWAP( "mshh.04c", 0x080000, 0x80000, CRC(d638f601) SHA1(cbdd9776f71c6ef8d80be23a57cba3529d53a070) )
 	ROM_LOAD16_WORD_SWAP( "msh.05a",  0x100000, 0x80000, CRC(f37539e6) SHA1(770febc25ca5615b6c2023727edab3c68b15b2c4) )
@@ -4509,12 +4509,12 @@
 	ROM_LOAD64_WORD( "msh.18m",   0x1000004, 0x400000, CRC(4db92d94) SHA1(f1b25ccc0627139ad5b287a8f2ab3b4a2fb8b8e4) )
 	ROM_LOAD64_WORD( "msh.20m",   0x1000006, 0x400000, CRC(a2b0c6c0) SHA1(71016c01c1a706b73cf5b9ac7e384a030c6cf08d) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "msh.01",   0x00000, 0x08000, CRC(c976e6f9) SHA1(281025e5aaf97c0aeddc8bd0f737d092daadad9e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "msh.02",   0x28000, 0x20000, CRC(ce67d0d9) SHA1(324226597cc5a11603f04085fef7715a314ecc05) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "msh.11m",   0x000000, 0x200000, CRC(37ac6d30) SHA1(ec67421fbf4a08a686e76792cb35e9cbf04d022d) )
 	ROM_LOAD16_WORD_SWAP( "msh.12m",   0x200000, 0x200000, CRC(de092570) SHA1(a03d0df901f6ea79685eaed67db65bee14ec29c6) )
 
@@ -4523,7 +4523,7 @@
 ROM_END
 
 ROM_START( mshb )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mshb.03c", 0x000000, 0x80000, CRC(19697f74) SHA1(c3809ecbdb242bdbb57f8d9b029264e9c0ed8a13) )
 	ROM_LOAD16_WORD_SWAP( "mshb.04c", 0x080000, 0x80000, CRC(95317a6f) SHA1(143a26e349f21d3a720320bb7010a26f767e5e73) )
 	ROM_LOAD16_WORD_SWAP( "msh.05a",  0x100000, 0x80000, CRC(f37539e6) SHA1(770febc25ca5615b6c2023727edab3c68b15b2c4) )
@@ -4543,12 +4543,12 @@
 	ROM_LOAD64_WORD( "msh.18m",   0x1000004, 0x400000, CRC(4db92d94) SHA1(f1b25ccc0627139ad5b287a8f2ab3b4a2fb8b8e4) )
 	ROM_LOAD64_WORD( "msh.20m",   0x1000006, 0x400000, CRC(a2b0c6c0) SHA1(71016c01c1a706b73cf5b9ac7e384a030c6cf08d) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "msh.01",   0x00000, 0x08000, CRC(c976e6f9) SHA1(281025e5aaf97c0aeddc8bd0f737d092daadad9e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "msh.02",   0x28000, 0x20000, CRC(ce67d0d9) SHA1(324226597cc5a11603f04085fef7715a314ecc05) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "msh.11m",   0x000000, 0x200000, CRC(37ac6d30) SHA1(ec67421fbf4a08a686e76792cb35e9cbf04d022d) )
 	ROM_LOAD16_WORD_SWAP( "msh.12m",   0x200000, 0x200000, CRC(de092570) SHA1(a03d0df901f6ea79685eaed67db65bee14ec29c6) )
 
@@ -4557,7 +4557,7 @@
 ROM_END
 
 ROM_START( mshbr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mshb.03b", 0x000000, 0x80000, CRC(eb16165b) SHA1(37ca9d7f2ee5320aff1d9de56f766e2dcad5935c) )
 	ROM_LOAD16_WORD_SWAP( "mshb.04b", 0x080000, 0x80000, CRC(94fb3c97) SHA1(fd5fe7ed39bb1bae436ccd510f88979a16c1e4ab) )
 	ROM_LOAD16_WORD_SWAP( "msh.05",   0x100000, 0x80000, CRC(6a091b9e) SHA1(7fa54e69e1a1ca348cb08d892d55023e9a3ff4cb) )
@@ -4577,12 +4577,12 @@
 	ROM_LOAD64_WORD( "msh.18m",   0x1000004, 0x400000, CRC(4db92d94) SHA1(f1b25ccc0627139ad5b287a8f2ab3b4a2fb8b8e4) )
 	ROM_LOAD64_WORD( "msh.20m",   0x1000006, 0x400000, CRC(a2b0c6c0) SHA1(71016c01c1a706b73cf5b9ac7e384a030c6cf08d) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "msh.01",   0x00000, 0x08000, CRC(c976e6f9) SHA1(281025e5aaf97c0aeddc8bd0f737d092daadad9e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "msh.02",   0x28000, 0x20000, CRC(ce67d0d9) SHA1(324226597cc5a11603f04085fef7715a314ecc05) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "msh.11m",   0x000000, 0x200000, CRC(37ac6d30) SHA1(ec67421fbf4a08a686e76792cb35e9cbf04d022d) )
 	ROM_LOAD16_WORD_SWAP( "msh.12m",   0x200000, 0x200000, CRC(de092570) SHA1(a03d0df901f6ea79685eaed67db65bee14ec29c6) )
 
@@ -4591,7 +4591,7 @@
 ROM_END
 
 ROM_START( mshvsf )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvse.03f", 0x000000, 0x80000, CRC(b72dc199) SHA1(61bd581ea4b969298f8a39fe03023b5456cac750) )
 	ROM_LOAD16_WORD_SWAP( "mvse.04f", 0x080000, 0x80000, CRC(6ef799f9) SHA1(2d45dbf7bc277b84c6bcd9615ab3b80c42af7781) )
 	ROM_LOAD16_WORD_SWAP( "mvs.05a",  0x100000, 0x80000, CRC(1a5de0cb) SHA1(738a27f83704c208d36d73bf766d861ef2d51a89) )
@@ -4611,12 +4611,12 @@
 	ROM_LOAD64_WORD( "mvs.18m",   0x1000004, 0x400000, CRC(c1228b35) SHA1(7afdfb552888c79d0fbb30242b3d917b87fad57a) )
 	ROM_LOAD64_WORD( "mvs.20m",   0x1000006, 0x400000, CRC(366cc6c2) SHA1(6f2a789087c8e404c5227b927fa8328c03593243) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvs.01",   0x00000, 0x08000, CRC(68252324) SHA1(138ef320ef27956b2ab5591d49a1315b7b0a194c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvs.02",   0x28000, 0x20000, CRC(b34e773d) SHA1(3bcf44bf06c35814cff29d244142db7abe05bd39) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvs.11m",   0x000000, 0x400000, CRC(86219770) SHA1(4e5b68d382a5aa37f8b0b6434c53a2b95f5f9a4d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.12m",   0x400000, 0x400000, CRC(f2fd7f68) SHA1(28a30d55d3eaf963006c7cbe7c288099cd3ba536) )
 
@@ -4625,7 +4625,7 @@
 ROM_END
 
 ROM_START( mshvsfu )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvsu.03g", 0x000000, 0x80000, CRC(0664ab15) SHA1(939fb1e3c06c33fc212b26ecfceac3180e108e9d) )
 	ROM_LOAD16_WORD_SWAP( "mvsu.04g", 0x080000, 0x80000, CRC(97e060ee) SHA1(787924e04508c83ecd4c3a872882d2be9e57eb50) )
 	ROM_LOAD16_WORD_SWAP( "mvs.05d",  0x100000, 0x80000, CRC(921fc542) SHA1(b813082a480d42d663c713062892245faabe9101) )
@@ -4645,12 +4645,12 @@
 	ROM_LOAD64_WORD( "mvs.18m",   0x1000004, 0x400000, CRC(c1228b35) SHA1(7afdfb552888c79d0fbb30242b3d917b87fad57a) )
 	ROM_LOAD64_WORD( "mvs.20m",   0x1000006, 0x400000, CRC(366cc6c2) SHA1(6f2a789087c8e404c5227b927fa8328c03593243) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvs.01",   0x00000, 0x08000, CRC(68252324) SHA1(138ef320ef27956b2ab5591d49a1315b7b0a194c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvs.02",   0x28000, 0x20000, CRC(b34e773d) SHA1(3bcf44bf06c35814cff29d244142db7abe05bd39) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvs.11m",   0x000000, 0x400000, CRC(86219770) SHA1(4e5b68d382a5aa37f8b0b6434c53a2b95f5f9a4d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.12m",   0x400000, 0x400000, CRC(f2fd7f68) SHA1(28a30d55d3eaf963006c7cbe7c288099cd3ba536) )
 
@@ -4659,7 +4659,7 @@
 ROM_END
 
 ROM_START( mshvsfu1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvsu.03d", 0x000000, 0x80000, CRC(ae60a66a) SHA1(1fa7e6534d02ec8059153705b1161a55b9cfe803) )
 	ROM_LOAD16_WORD_SWAP( "mvsu.04d", 0x080000, 0x80000, CRC(91f67d8a) SHA1(e95f7a3fb281e1bafdbe7a1b22532c4fab5ec89d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.05a",  0x100000, 0x80000, CRC(1a5de0cb) SHA1(738a27f83704c208d36d73bf766d861ef2d51a89) )
@@ -4679,12 +4679,12 @@
 	ROM_LOAD64_WORD( "mvs.18m",   0x1000004, 0x400000, CRC(c1228b35) SHA1(7afdfb552888c79d0fbb30242b3d917b87fad57a) )
 	ROM_LOAD64_WORD( "mvs.20m",   0x1000006, 0x400000, CRC(366cc6c2) SHA1(6f2a789087c8e404c5227b927fa8328c03593243) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvs.01",   0x00000, 0x08000, CRC(68252324) SHA1(138ef320ef27956b2ab5591d49a1315b7b0a194c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvs.02",   0x28000, 0x20000, CRC(b34e773d) SHA1(3bcf44bf06c35814cff29d244142db7abe05bd39) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvs.11m",   0x000000, 0x400000, CRC(86219770) SHA1(4e5b68d382a5aa37f8b0b6434c53a2b95f5f9a4d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.12m",   0x400000, 0x400000, CRC(f2fd7f68) SHA1(28a30d55d3eaf963006c7cbe7c288099cd3ba536) )
 
@@ -4693,7 +4693,7 @@
 ROM_END
 
 ROM_START( mshvsfj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvsj.03i", 0x000000, 0x80000, CRC(d8cbb691) SHA1(16820cf3bc7285477e61bd598a3ed4ea5e0e770d) )
 	ROM_LOAD16_WORD_SWAP( "mvsj.04i", 0x080000, 0x80000, CRC(32741ace) SHA1(36db3a3aeaf29369977593c051bf5665cffefb2d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.05h",  0x100000, 0x80000, CRC(77870dc3) SHA1(924a7c82456bb44d7b0be65af11dbe1a2420a3f0) )
@@ -4713,12 +4713,12 @@
 	ROM_LOAD64_WORD( "mvs.18m",   0x1000004, 0x400000, CRC(c1228b35) SHA1(7afdfb552888c79d0fbb30242b3d917b87fad57a) )
 	ROM_LOAD64_WORD( "mvs.20m",   0x1000006, 0x400000, CRC(366cc6c2) SHA1(6f2a789087c8e404c5227b927fa8328c03593243) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvs.01",   0x00000, 0x08000, CRC(68252324) SHA1(138ef320ef27956b2ab5591d49a1315b7b0a194c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvs.02",   0x28000, 0x20000, CRC(b34e773d) SHA1(3bcf44bf06c35814cff29d244142db7abe05bd39) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvs.11m",   0x000000, 0x400000, CRC(86219770) SHA1(4e5b68d382a5aa37f8b0b6434c53a2b95f5f9a4d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.12m",   0x400000, 0x400000, CRC(f2fd7f68) SHA1(28a30d55d3eaf963006c7cbe7c288099cd3ba536) )
 
@@ -4727,7 +4727,7 @@
 ROM_END
 
 ROM_START( mshvsfj1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvsj.03h", 0x000000, 0x80000, CRC(fbe2115f) SHA1(b2d8a62e394c2eb4070cac742b0f403252e46a25) )
 	ROM_LOAD16_WORD_SWAP( "mvsj.04h", 0x080000, 0x80000, CRC(b528a367) SHA1(ecac71b032b431c63a4cf73a1d1d1be1faebc12b) )
 	ROM_LOAD16_WORD_SWAP( "mvs.05g",  0x100000, 0x80000, CRC(9515a245) SHA1(eafa877fd4a4e58e7c98336658e986a4a27d6b91) )
@@ -4747,12 +4747,12 @@
 	ROM_LOAD64_WORD( "mvs.18m",   0x1000004, 0x400000, CRC(c1228b35) SHA1(7afdfb552888c79d0fbb30242b3d917b87fad57a) )
 	ROM_LOAD64_WORD( "mvs.20m",   0x1000006, 0x400000, CRC(366cc6c2) SHA1(6f2a789087c8e404c5227b927fa8328c03593243) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvs.01",   0x00000, 0x08000, CRC(68252324) SHA1(138ef320ef27956b2ab5591d49a1315b7b0a194c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvs.02",   0x28000, 0x20000, CRC(b34e773d) SHA1(3bcf44bf06c35814cff29d244142db7abe05bd39) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvs.11m",   0x000000, 0x400000, CRC(86219770) SHA1(4e5b68d382a5aa37f8b0b6434c53a2b95f5f9a4d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.12m",   0x400000, 0x400000, CRC(f2fd7f68) SHA1(28a30d55d3eaf963006c7cbe7c288099cd3ba536) )
 
@@ -4761,7 +4761,7 @@
 ROM_END
 
 ROM_START( mshvsfj2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvsj.03g", 0x000000, 0x80000, CRC(fdfa7e26) SHA1(e9fb93249e48e1bb7c769c3ce674dd4be404574f) )
 	ROM_LOAD16_WORD_SWAP( "mvsj.04g", 0x080000, 0x80000, CRC(c921825f) SHA1(471e44268cebba631b81f131bf31e27b8a28c548) )
 	ROM_LOAD16_WORD_SWAP( "mvs.05a",  0x100000, 0x80000, CRC(1a5de0cb) SHA1(738a27f83704c208d36d73bf766d861ef2d51a89) )
@@ -4781,12 +4781,12 @@
 	ROM_LOAD64_WORD( "mvs.18m",   0x1000004, 0x400000, CRC(c1228b35) SHA1(7afdfb552888c79d0fbb30242b3d917b87fad57a) )
 	ROM_LOAD64_WORD( "mvs.20m",   0x1000006, 0x400000, CRC(366cc6c2) SHA1(6f2a789087c8e404c5227b927fa8328c03593243) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvs.01",   0x00000, 0x08000, CRC(68252324) SHA1(138ef320ef27956b2ab5591d49a1315b7b0a194c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvs.02",   0x28000, 0x20000, CRC(b34e773d) SHA1(3bcf44bf06c35814cff29d244142db7abe05bd39) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvs.11m",   0x000000, 0x400000, CRC(86219770) SHA1(4e5b68d382a5aa37f8b0b6434c53a2b95f5f9a4d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.12m",   0x400000, 0x400000, CRC(f2fd7f68) SHA1(28a30d55d3eaf963006c7cbe7c288099cd3ba536) )
 
@@ -4795,7 +4795,7 @@
 ROM_END
 
 ROM_START( mshvsfh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvsh.03f", 0x000000, 0x80000, CRC(4f60f41e) SHA1(dd926a9cac4bff05845615d0b61948e2dc4b1ed8) )
 	ROM_LOAD16_WORD_SWAP( "mvsh.04f", 0x080000, 0x80000, CRC(dc08ec12) SHA1(594e4383eb776c09075577cd1f4e42ef11748f0f) )
 	ROM_LOAD16_WORD_SWAP( "mvs.05a",  0x100000, 0x80000, CRC(1a5de0cb) SHA1(738a27f83704c208d36d73bf766d861ef2d51a89) )
@@ -4815,12 +4815,12 @@
 	ROM_LOAD64_WORD( "mvs.18m",   0x1000004, 0x400000, CRC(c1228b35) SHA1(7afdfb552888c79d0fbb30242b3d917b87fad57a) )
 	ROM_LOAD64_WORD( "mvs.20m",   0x1000006, 0x400000, CRC(366cc6c2) SHA1(6f2a789087c8e404c5227b927fa8328c03593243) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvs.01",   0x00000, 0x08000, CRC(68252324) SHA1(138ef320ef27956b2ab5591d49a1315b7b0a194c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvs.02",   0x28000, 0x20000, CRC(b34e773d) SHA1(3bcf44bf06c35814cff29d244142db7abe05bd39) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvs.11m",   0x000000, 0x400000, CRC(86219770) SHA1(4e5b68d382a5aa37f8b0b6434c53a2b95f5f9a4d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.12m",   0x400000, 0x400000, CRC(f2fd7f68) SHA1(28a30d55d3eaf963006c7cbe7c288099cd3ba536) )
 
@@ -4829,7 +4829,7 @@
 ROM_END
 
 ROM_START( mshvsfa )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvsa.03f", 0x000000, 0x80000, CRC(5b863716) SHA1(6a129274711765bbf5acbb225e3fce6d93d7f421) )
 	ROM_LOAD16_WORD_SWAP( "mvsa.04f", 0x080000, 0x80000, CRC(4886e65f) SHA1(758fc9c453a864e32588c7fb33166c93e798a39c) )
 	ROM_LOAD16_WORD_SWAP( "mvs.05a",  0x100000, 0x80000, CRC(1a5de0cb) SHA1(738a27f83704c208d36d73bf766d861ef2d51a89) )
@@ -4849,12 +4849,12 @@
 	ROM_LOAD64_WORD( "mvs.18m",   0x1000004, 0x400000, CRC(c1228b35) SHA1(7afdfb552888c79d0fbb30242b3d917b87fad57a) )
 	ROM_LOAD64_WORD( "mvs.20m",   0x1000006, 0x400000, CRC(366cc6c2) SHA1(6f2a789087c8e404c5227b927fa8328c03593243) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvs.01",   0x00000, 0x08000, CRC(68252324) SHA1(138ef320ef27956b2ab5591d49a1315b7b0a194c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvs.02",   0x28000, 0x20000, CRC(b34e773d) SHA1(3bcf44bf06c35814cff29d244142db7abe05bd39) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvs.11m",   0x000000, 0x400000, CRC(86219770) SHA1(4e5b68d382a5aa37f8b0b6434c53a2b95f5f9a4d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.12m",   0x400000, 0x400000, CRC(f2fd7f68) SHA1(28a30d55d3eaf963006c7cbe7c288099cd3ba536) )
 
@@ -4863,7 +4863,7 @@
 ROM_END
 
 ROM_START( mshvsfa1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvsa.03", 0x000000, 0x80000, CRC(92ef1933) SHA1(34e6a074734032af74afa52bfebbc213a9c886d7) )
 	ROM_LOAD16_WORD_SWAP( "mvsa.04", 0x080000, 0x80000, CRC(4b24373c) SHA1(f340dda7d5339645fd1ea523e72783fb7bb7aba1) )
 	ROM_LOAD16_WORD_SWAP( "mvs.05",  0x100000, 0x80000, CRC(ac180c1c) SHA1(1b368ebe7680796dc068b511b72359eec546cd9f) )
@@ -4883,12 +4883,12 @@
 	ROM_LOAD64_WORD( "mvs.18m",   0x1000004, 0x400000, CRC(c1228b35) SHA1(7afdfb552888c79d0fbb30242b3d917b87fad57a) )
 	ROM_LOAD64_WORD( "mvs.20m",   0x1000006, 0x400000, CRC(366cc6c2) SHA1(6f2a789087c8e404c5227b927fa8328c03593243) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvs.01",   0x00000, 0x08000, CRC(68252324) SHA1(138ef320ef27956b2ab5591d49a1315b7b0a194c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvs.02",   0x28000, 0x20000, CRC(b34e773d) SHA1(3bcf44bf06c35814cff29d244142db7abe05bd39) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvs.11m",   0x000000, 0x400000, CRC(86219770) SHA1(4e5b68d382a5aa37f8b0b6434c53a2b95f5f9a4d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.12m",   0x400000, 0x400000, CRC(f2fd7f68) SHA1(28a30d55d3eaf963006c7cbe7c288099cd3ba536) )
 
@@ -4897,7 +4897,7 @@
 ROM_END
 
 ROM_START( mshvsfb )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvsb.03g", 0x000000, 0x80000, CRC(143895ef) SHA1(0664fad64996118df86e9887bd6e301d04d84978) )
 	ROM_LOAD16_WORD_SWAP( "mvsb.04g", 0x080000, 0x80000, CRC(dd8a886c) SHA1(a16f262fd14e726c7837980d0556a9c3bdc7fb11) )
 	ROM_LOAD16_WORD_SWAP( "mvs.05d",  0x100000, 0x80000, CRC(921fc542) SHA1(b813082a480d42d663c713062892245faabe9101) )
@@ -4917,12 +4917,12 @@
 	ROM_LOAD64_WORD( "mvs.18m",   0x1000004, 0x400000, CRC(c1228b35) SHA1(7afdfb552888c79d0fbb30242b3d917b87fad57a) )
 	ROM_LOAD64_WORD( "mvs.20m",   0x1000006, 0x400000, CRC(366cc6c2) SHA1(6f2a789087c8e404c5227b927fa8328c03593243) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvs.01",   0x00000, 0x08000, CRC(68252324) SHA1(138ef320ef27956b2ab5591d49a1315b7b0a194c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvs.02",   0x28000, 0x20000, CRC(b34e773d) SHA1(3bcf44bf06c35814cff29d244142db7abe05bd39) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvs.11m",   0x000000, 0x400000, CRC(86219770) SHA1(4e5b68d382a5aa37f8b0b6434c53a2b95f5f9a4d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.12m",   0x400000, 0x400000, CRC(f2fd7f68) SHA1(28a30d55d3eaf963006c7cbe7c288099cd3ba536) )
 
@@ -4931,7 +4931,7 @@
 ROM_END
 
 ROM_START( mshvsfb1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvsb.03f", 0x000000, 0x80000, CRC(9c4bb950) SHA1(85d0026a691682c195d6e617bf28def50029cb03) )
 	ROM_LOAD16_WORD_SWAP( "mvsb.04f", 0x080000, 0x80000, CRC(d3320d13) SHA1(c6fa2b8b727a1192fd21131496067447053b5547) )
 	ROM_LOAD16_WORD_SWAP( "mvs.05a",  0x100000, 0x80000, CRC(1a5de0cb) SHA1(738a27f83704c208d36d73bf766d861ef2d51a89) )
@@ -4951,12 +4951,12 @@
 	ROM_LOAD64_WORD( "mvs.18m",   0x1000004, 0x400000, CRC(c1228b35) SHA1(7afdfb552888c79d0fbb30242b3d917b87fad57a) )
 	ROM_LOAD64_WORD( "mvs.20m",   0x1000006, 0x400000, CRC(366cc6c2) SHA1(6f2a789087c8e404c5227b927fa8328c03593243) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvs.01",   0x00000, 0x08000, CRC(68252324) SHA1(138ef320ef27956b2ab5591d49a1315b7b0a194c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvs.02",   0x28000, 0x20000, CRC(b34e773d) SHA1(3bcf44bf06c35814cff29d244142db7abe05bd39) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvs.11m",   0x000000, 0x400000, CRC(86219770) SHA1(4e5b68d382a5aa37f8b0b6434c53a2b95f5f9a4d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.12m",   0x400000, 0x400000, CRC(f2fd7f68) SHA1(28a30d55d3eaf963006c7cbe7c288099cd3ba536) )
 
@@ -4975,7 +4975,7 @@
 */
 
 ROM_START( mvsc )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvce.03a", 0x000000, 0x80000, CRC(824e4a90) SHA1(5c79c166d988d8a75d9941f4ee6fa4d6476e55e1) )
 //  ROM_LOAD16_WORD_SWAP( "mvce.04a", 0x080000, 0x80000, BAD_DUMP CRC(cac02153) SHA1(ee9f9da6fda53f21ba7b74367612c90281269690) )
 	ROM_LOAD16_WORD_SWAP( "mvce.04a", 0x080000, 0x80000, CRC(436c5a4e) SHA1(82f4586e888f2550c53bfdc93a53791a595e05bd) )
@@ -4996,12 +4996,12 @@
 	ROM_LOAD64_WORD( "mvc.18m",   0x1000004, 0x400000, CRC(67aaf727) SHA1(e0e69104e31d2c41e18c0d24e9ab962406a7ca9a) )
 	ROM_LOAD64_WORD( "mvc.20m",   0x1000006, 0x400000, CRC(8b0bade8) SHA1(c5732361bb4bf284c4d12a82ac2c5750b1f9d441) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvc.01",   0x00000, 0x08000, CRC(41629e95) SHA1(36925c05b5fdcbe43283a882d021e5360c947061) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvc.02",   0x28000, 0x20000, CRC(963abf6b) SHA1(6b784870e338701cefabbbe4669984b5c4e8a9a5) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvc.11m",   0x000000, 0x400000, CRC(850fe663) SHA1(81e519d05a08855f242ea2e17ee0859b449db895) )
 	ROM_LOAD16_WORD_SWAP( "mvc.12m",   0x400000, 0x400000, CRC(7ccb1896) SHA1(74caadf3282fcc6acffb1bbe3734106f81124121) )
 
@@ -5010,7 +5010,7 @@
 ROM_END
 
 ROM_START( mvscr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvce.03", 0x000000, 0x80000, CRC(e0633fc0) SHA1(d2feffb5505a2f8940192ae267f49561fc580b87) )
 	ROM_LOAD16_WORD_SWAP( "mvce.04", 0x080000, 0x80000, CRC(a450a251) SHA1(1e34fa55bb93c7573ab0205f8c5620a51765d3eb) )
 	ROM_LOAD16_WORD_SWAP( "mvc.05",  0x100000, 0x80000, CRC(7db71ce9) SHA1(a0097109e9f4aba40791932269d600c0ffa099a7) )
@@ -5030,12 +5030,12 @@
 	ROM_LOAD64_WORD( "mvc.18m",   0x1000004, 0x400000, CRC(67aaf727) SHA1(e0e69104e31d2c41e18c0d24e9ab962406a7ca9a) )
 	ROM_LOAD64_WORD( "mvc.20m",   0x1000006, 0x400000, CRC(8b0bade8) SHA1(c5732361bb4bf284c4d12a82ac2c5750b1f9d441) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvc.01",   0x00000, 0x08000, CRC(41629e95) SHA1(36925c05b5fdcbe43283a882d021e5360c947061) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvc.02",   0x28000, 0x20000, CRC(963abf6b) SHA1(6b784870e338701cefabbbe4669984b5c4e8a9a5) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvc.11m",   0x000000, 0x400000, CRC(850fe663) SHA1(81e519d05a08855f242ea2e17ee0859b449db895) )
 	ROM_LOAD16_WORD_SWAP( "mvc.12m",   0x400000, 0x400000, CRC(7ccb1896) SHA1(74caadf3282fcc6acffb1bbe3734106f81124121) )
 
@@ -5044,7 +5044,7 @@
 ROM_END
 
 ROM_START( mvscu )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvcu.03d", 0x000000, 0x80000, CRC(c6007557) SHA1(c027c1a204345ce611cb042d60939e4de156763f) )
 	ROM_LOAD16_WORD_SWAP( "mvcu.04d", 0x080000, 0x80000, CRC(724b2b20) SHA1(872bbcf5d344d634f3523318fa4763e6d6302bb5) )
 	ROM_LOAD16_WORD_SWAP( "mvc.05a",  0x100000, 0x80000, CRC(2d8c8e86) SHA1(b07d640a734c5d336054ed05195786224c9a6cd4) )
@@ -5064,12 +5064,12 @@
 	ROM_LOAD64_WORD( "mvc.18m",   0x1000004, 0x400000, CRC(67aaf727) SHA1(e0e69104e31d2c41e18c0d24e9ab962406a7ca9a) )
 	ROM_LOAD64_WORD( "mvc.20m",   0x1000006, 0x400000, CRC(8b0bade8) SHA1(c5732361bb4bf284c4d12a82ac2c5750b1f9d441) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvc.01",   0x00000, 0x08000, CRC(41629e95) SHA1(36925c05b5fdcbe43283a882d021e5360c947061) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvc.02",   0x28000, 0x20000, CRC(963abf6b) SHA1(6b784870e338701cefabbbe4669984b5c4e8a9a5) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvc.11m",   0x000000, 0x400000, CRC(850fe663) SHA1(81e519d05a08855f242ea2e17ee0859b449db895) )
 	ROM_LOAD16_WORD_SWAP( "mvc.12m",   0x400000, 0x400000, CRC(7ccb1896) SHA1(74caadf3282fcc6acffb1bbe3734106f81124121) )
 
@@ -5078,7 +5078,7 @@
 ROM_END
 
 ROM_START( mvscur1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvcu.03",  0x000000, 0x80000, CRC(13f2be57) SHA1(229520c5f4171abae1acdfb9544b356b568b5f2d) )
 	ROM_LOAD16_WORD_SWAP( "mvcu.04",  0x080000, 0x80000, CRC(5e9b380d) SHA1(8989192b575fb717c13bfb8175e83d7f1a285310) )
 	ROM_LOAD16_WORD_SWAP( "mvcu.05",  0x100000, 0x80000, CRC(12f321be) SHA1(32942c4690253c1545ce05dc084de227e46d942a) )
@@ -5098,12 +5098,12 @@
 	ROM_LOAD64_WORD( "mvc.18m",   0x1000004, 0x400000, CRC(67aaf727) SHA1(e0e69104e31d2c41e18c0d24e9ab962406a7ca9a) )
 	ROM_LOAD64_WORD( "mvc.20m",   0x1000006, 0x400000, CRC(8b0bade8) SHA1(c5732361bb4bf284c4d12a82ac2c5750b1f9d441) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvc.01",   0x00000, 0x08000, CRC(41629e95) SHA1(36925c05b5fdcbe43283a882d021e5360c947061) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvc.02",   0x28000, 0x20000, CRC(963abf6b) SHA1(6b784870e338701cefabbbe4669984b5c4e8a9a5) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvc.11m",   0x000000, 0x400000, CRC(850fe663) SHA1(81e519d05a08855f242ea2e17ee0859b449db895) )
 	ROM_LOAD16_WORD_SWAP( "mvc.12m",   0x400000, 0x400000, CRC(7ccb1896) SHA1(74caadf3282fcc6acffb1bbe3734106f81124121) )
 
@@ -5112,7 +5112,7 @@
 ROM_END
 
 ROM_START( mvscj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvcj.03a", 0x000000, 0x80000, CRC(3df18879) SHA1(2b91da6e5dd792967337e873ebb08ecf5194a97b) )
 	ROM_LOAD16_WORD_SWAP( "mvcj.04a", 0x080000, 0x80000, CRC(07d212e8) SHA1(c5420e9bd580910c1f1d0264240aeef20aac30a7) )
 	ROM_LOAD16_WORD_SWAP( "mvc.05a",  0x100000, 0x80000, CRC(2d8c8e86) SHA1(b07d640a734c5d336054ed05195786224c9a6cd4) )
@@ -5132,12 +5132,12 @@
 	ROM_LOAD64_WORD( "mvc.18m",   0x1000004, 0x400000, CRC(67aaf727) SHA1(e0e69104e31d2c41e18c0d24e9ab962406a7ca9a) )
 	ROM_LOAD64_WORD( "mvc.20m",   0x1000006, 0x400000, CRC(8b0bade8) SHA1(c5732361bb4bf284c4d12a82ac2c5750b1f9d441) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvc.01",   0x00000, 0x08000, CRC(41629e95) SHA1(36925c05b5fdcbe43283a882d021e5360c947061) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvc.02",   0x28000, 0x20000, CRC(963abf6b) SHA1(6b784870e338701cefabbbe4669984b5c4e8a9a5) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvc.11m",   0x000000, 0x400000, CRC(850fe663) SHA1(81e519d05a08855f242ea2e17ee0859b449db895) )
 	ROM_LOAD16_WORD_SWAP( "mvc.12m",   0x400000, 0x400000, CRC(7ccb1896) SHA1(74caadf3282fcc6acffb1bbe3734106f81124121) )
 
@@ -5146,7 +5146,7 @@
 ROM_END
 
 ROM_START( mvscjr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvcj.03", 0x000000, 0x80000, CRC(2164213f) SHA1(00e3500ed334bb80d4d159eacf439860a2bfc3b7) )
 	ROM_LOAD16_WORD_SWAP( "mvcj.04", 0x080000, 0x80000, CRC(c905c86f) SHA1(965fa3bdc29bd901e9efcc53b195c6be3a74c9f9) )
 	ROM_LOAD16_WORD_SWAP( "mvc.05",  0x100000, 0x80000, CRC(7db71ce9) SHA1(a0097109e9f4aba40791932269d600c0ffa099a7) )
@@ -5166,12 +5166,12 @@
 	ROM_LOAD64_WORD( "mvc.18m",   0x1000004, 0x400000, CRC(67aaf727) SHA1(e0e69104e31d2c41e18c0d24e9ab962406a7ca9a) )
 	ROM_LOAD64_WORD( "mvc.20m",   0x1000006, 0x400000, CRC(8b0bade8) SHA1(c5732361bb4bf284c4d12a82ac2c5750b1f9d441) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvc.01",   0x00000, 0x08000, CRC(41629e95) SHA1(36925c05b5fdcbe43283a882d021e5360c947061) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvc.02",   0x28000, 0x20000, CRC(963abf6b) SHA1(6b784870e338701cefabbbe4669984b5c4e8a9a5) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvc.11m",   0x000000, 0x400000, CRC(850fe663) SHA1(81e519d05a08855f242ea2e17ee0859b449db895) )
 	ROM_LOAD16_WORD_SWAP( "mvc.12m",   0x400000, 0x400000, CRC(7ccb1896) SHA1(74caadf3282fcc6acffb1bbe3734106f81124121) )
 
@@ -5206,7 +5206,7 @@
 */
 
 ROM_START( mvscjsing )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_BYTE( "mvc_ja.simm1", 0x000000, 0x200000, CRC(6a2ef7c2) SHA1(625530b92217375014db4694196e6ab2a4684db6) ) // == mvc_ja.simm4
 	ROM_LOAD16_BYTE( "mvc_ja.simm3", 0x000001, 0x200000, CRC(699d09ad) SHA1(67f6587808f55f10f58e067512f8db3f67dda770) ) // == mvc_ja.simm6
 
@@ -5216,12 +5216,12 @@
 	ROM_LOAD64_WORD( "mvc64-17m.17",   0x0000004, 0x800000, CRC(308ca826) SHA1(2ef1fb4999e7e25e7f605c788f61a85da6715475) )
 	ROM_LOAD64_WORD( "mvc64-19m.19",   0x0000006, 0x800000, CRC(10699fe1) SHA1(4bb65999c2a73c46cd0c7b6ea26ffb0d8ab24602) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvc.01",   0x00000, 0x08000, CRC(41629e95) SHA1(36925c05b5fdcbe43283a882d021e5360c947061) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvc.02",   0x28000, 0x20000, CRC(963abf6b) SHA1(6b784870e338701cefabbbe4669984b5c4e8a9a5) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvc64-11m.11",   0x000000, 0x800000, CRC(5d8819e0) SHA1(afe2ec7fa4786e6d9a9a0ffa5787862ad69b0010) )
 
 	ROM_REGION( 0x20, "key", 0 )
@@ -5229,7 +5229,7 @@
 ROM_END
 
 ROM_START( mvsca )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvca.03a", 0x000000, 0x80000, CRC(2ff4ae25) SHA1(74cc3656a265f912c72cc6e591de14791fa9a50d) )
 	ROM_LOAD16_WORD_SWAP( "mvca.04a", 0x080000, 0x80000, CRC(f28427ef) SHA1(3e4c91753b19c6307abd0ad87a0184730a418efb) )
 	ROM_LOAD16_WORD_SWAP( "mvc.05a",  0x100000, 0x80000, CRC(2d8c8e86) SHA1(b07d640a734c5d336054ed05195786224c9a6cd4) )
@@ -5249,12 +5249,12 @@
 	ROM_LOAD64_WORD( "mvc.18m",   0x1000004, 0x400000, CRC(67aaf727) SHA1(e0e69104e31d2c41e18c0d24e9ab962406a7ca9a) )
 	ROM_LOAD64_WORD( "mvc.20m",   0x1000006, 0x400000, CRC(8b0bade8) SHA1(c5732361bb4bf284c4d12a82ac2c5750b1f9d441) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvc.01",   0x00000, 0x08000, CRC(41629e95) SHA1(36925c05b5fdcbe43283a882d021e5360c947061) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvc.02",   0x28000, 0x20000, CRC(963abf6b) SHA1(6b784870e338701cefabbbe4669984b5c4e8a9a5) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvc.11m",   0x000000, 0x400000, CRC(850fe663) SHA1(81e519d05a08855f242ea2e17ee0859b449db895) )
 	ROM_LOAD16_WORD_SWAP( "mvc.12m",   0x400000, 0x400000, CRC(7ccb1896) SHA1(74caadf3282fcc6acffb1bbe3734106f81124121) )
 
@@ -5263,7 +5263,7 @@
 ROM_END
 
 ROM_START( mvscar1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvca.03", 0x000000, 0x80000, CRC(fe5fa7b9) SHA1(c27b987ffb631c3433aa32a29989dbf2b3e53f1e) )
 	ROM_LOAD16_WORD_SWAP( "mvca.04", 0x080000, 0x80000, CRC(082b701c) SHA1(363770ecd5f4e160db6448845ba6d7fd0beea291) )
 	ROM_LOAD16_WORD_SWAP( "mvc.05",  0x100000, 0x80000, CRC(7db71ce9) SHA1(a0097109e9f4aba40791932269d600c0ffa099a7) )
@@ -5283,12 +5283,12 @@
 	ROM_LOAD64_WORD( "mvc.18m",   0x1000004, 0x400000, CRC(67aaf727) SHA1(e0e69104e31d2c41e18c0d24e9ab962406a7ca9a) )
 	ROM_LOAD64_WORD( "mvc.20m",   0x1000006, 0x400000, CRC(8b0bade8) SHA1(c5732361bb4bf284c4d12a82ac2c5750b1f9d441) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvc.01",   0x00000, 0x08000, CRC(41629e95) SHA1(36925c05b5fdcbe43283a882d021e5360c947061) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvc.02",   0x28000, 0x20000, CRC(963abf6b) SHA1(6b784870e338701cefabbbe4669984b5c4e8a9a5) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvc.11m",   0x000000, 0x400000, CRC(850fe663) SHA1(81e519d05a08855f242ea2e17ee0859b449db895) )
 	ROM_LOAD16_WORD_SWAP( "mvc.12m",   0x400000, 0x400000, CRC(7ccb1896) SHA1(74caadf3282fcc6acffb1bbe3734106f81124121) )
 
@@ -5297,7 +5297,7 @@
 ROM_END
 
 ROM_START( mvsch )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvch.03", 0x000000, 0x80000, CRC(6a0ec9f7) SHA1(62d7b28cc9ddf975ccdc8992d51bd3d085e3e136) )
 	ROM_LOAD16_WORD_SWAP( "mvch.04", 0x080000, 0x80000, CRC(00f03fa4) SHA1(3a79400a7ac6e7594ca7e0fbb2486ddf6c759d18) )
 	ROM_LOAD16_WORD_SWAP( "mvc.05a", 0x100000, 0x80000, CRC(2d8c8e86) SHA1(b07d640a734c5d336054ed05195786224c9a6cd4) )
@@ -5317,12 +5317,12 @@
 	ROM_LOAD64_WORD( "mvc.18m",   0x1000004, 0x400000, CRC(67aaf727) SHA1(e0e69104e31d2c41e18c0d24e9ab962406a7ca9a) )
 	ROM_LOAD64_WORD( "mvc.20m",   0x1000006, 0x400000, CRC(8b0bade8) SHA1(c5732361bb4bf284c4d12a82ac2c5750b1f9d441) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvc.01",   0x00000, 0x08000, CRC(41629e95) SHA1(36925c05b5fdcbe43283a882d021e5360c947061) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvc.02",   0x28000, 0x20000, CRC(963abf6b) SHA1(6b784870e338701cefabbbe4669984b5c4e8a9a5) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvc.11m",   0x000000, 0x400000, CRC(850fe663) SHA1(81e519d05a08855f242ea2e17ee0859b449db895) )
 	ROM_LOAD16_WORD_SWAP( "mvc.12m",   0x400000, 0x400000, CRC(7ccb1896) SHA1(74caadf3282fcc6acffb1bbe3734106f81124121) )
 
@@ -5331,7 +5331,7 @@
 ROM_END
 
 ROM_START( mvscb )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvcb.03a", 0x000000, 0x80000, CRC(7155953b) SHA1(acd1f86bc24636a02aeef566994d38ffa6dbf72f) )
 	ROM_LOAD16_WORD_SWAP( "mvcb.04a", 0x080000, 0x80000, CRC(fb117d0e) SHA1(c513f430e7c4f32e220a800c53ffdcea68c6cfcf) )
 	ROM_LOAD16_WORD_SWAP( "mvc.05a",  0x100000, 0x80000, CRC(2d8c8e86) SHA1(b07d640a734c5d336054ed05195786224c9a6cd4) )
@@ -5351,12 +5351,12 @@
 	ROM_LOAD64_WORD( "mvc.18m",   0x1000004, 0x400000, CRC(67aaf727) SHA1(e0e69104e31d2c41e18c0d24e9ab962406a7ca9a) )
 	ROM_LOAD64_WORD( "mvc.20m",   0x1000006, 0x400000, CRC(8b0bade8) SHA1(c5732361bb4bf284c4d12a82ac2c5750b1f9d441) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvc.01",   0x00000, 0x08000, CRC(41629e95) SHA1(36925c05b5fdcbe43283a882d021e5360c947061) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvc.02",   0x28000, 0x20000, CRC(963abf6b) SHA1(6b784870e338701cefabbbe4669984b5c4e8a9a5) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvc.11m",   0x000000, 0x400000, CRC(850fe663) SHA1(81e519d05a08855f242ea2e17ee0859b449db895) )
 	ROM_LOAD16_WORD_SWAP( "mvc.12m",   0x400000, 0x400000, CRC(7ccb1896) SHA1(74caadf3282fcc6acffb1bbe3734106f81124121) )
 
@@ -5365,61 +5365,61 @@
 ROM_END
 
 ROM_START( mpang )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mpne.03c", 0x000000, 0x80000, CRC(fe16fc9f) SHA1(be22bf8a0abd53d2e7ebc12d3d0020bf799a25e9) )
 	ROM_LOAD16_WORD_SWAP( "mpne.04c", 0x080000, 0x80000, CRC(2cc5ec22) SHA1(c188349c26a64bad325cfa218849ed1e94303087) )
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "mpn-simm.01c",   0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.01d",   0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.01a",   0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.01b",   0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.03c",   0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.03d",   0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.03a",   0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.03b",   0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "mpn-simm.01c",   0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.01d",   0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.01a",   0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.01b",   0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03c",   0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03d",   0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03a",   0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03b",   0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) ) // ROM on a SIMM
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mpn.01",   0x00000, 0x08000, CRC(90c7adb6) SHA1(a2653e977e5e0457b249e098e5ca0abc93dac336) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "mpn-simm.05a",   0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "mpn-simm.05b",   0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) // ROM on a simm
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "mpn-simm.05a",   0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "mpn-simm.05b",   0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "mpang.key",    0x000000, 0x000014, CRC(95354b0f) SHA1(6e015eda29ac94aa420d7c70cdebffee52fde032) )
 ROM_END
 
 ROM_START( mpangr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mpne.03b", 0x000000, 0x80000, CRC(6ef0f9b2) SHA1(fd1c76e151466fe27b02a6d07683fdd9c6a4816d) )
 	ROM_LOAD16_WORD_SWAP( "mpne.04b", 0x080000, 0x80000, CRC(30a468bb) SHA1(f2f8f600a079ff050c9a0c12e1a6368943bdc536) )
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "mpn-simm.01c",   0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.01d",   0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.01a",   0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.01b",   0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.03c",   0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.03d",   0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.03a",   0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.03b",   0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "mpn-simm.01c",   0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.01d",   0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.01a",   0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.01b",   0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03c",   0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03d",   0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03a",   0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03b",   0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) ) // ROM on a SIMM
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mpn.01",   0x00000, 0x08000, CRC(90c7adb6) SHA1(a2653e977e5e0457b249e098e5ca0abc93dac336) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "mpn-simm.05a",   0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "mpn-simm.05b",   0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) // ROM on a simm
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "mpn-simm.05a",   0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "mpn-simm.05b",   0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "mpang.key",    0x000000, 0x000014, CRC(95354b0f) SHA1(6e015eda29ac94aa420d7c70cdebffee52fde032) )
 ROM_END
 
 ROM_START( mpangu )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mpnu.03", 0x000000, 0x80000, CRC(6e7ed03c) SHA1(3562362d9573252d4d19dbfd0ec7e47e9eaa5f46) ) /* USA version, but has no "u" in label code */
 	ROM_LOAD16_WORD_SWAP( "mpnu.04", 0x080000, 0x80000, CRC(de079131) SHA1(95da2a03cb642963aabfebd8337003961ca4db71) )
 
@@ -5430,11 +5430,11 @@
 	ROM_LOAD64_WORD( "mpn.17m",  0x800004, 0x200000, CRC(cfcd73d2) SHA1(3415c063ac3632159df0fa74899bde8c90f4a2a1) )
 	ROM_LOAD64_WORD( "mpn.19m",  0x800006, 0x200000, CRC(2db1ffbc) SHA1(ca58c9359c2c629896c40e78c14907f562e2cdad) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mpn.01",   0x00000, 0x08000, CRC(90c7adb6) SHA1(a2653e977e5e0457b249e098e5ca0abc93dac336) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mpn.q1",   0x000000, 0x100000, CRC(d21c1f5a) SHA1(94cfcf01e656c0fb690e6204964ac70fbc89064d) ) /* This version uses roms chips */
 	ROM_LOAD16_WORD_SWAP( "mpn.q2",   0x100000, 0x100000, CRC(d22090b1) SHA1(0ba65c0efb46af3cfb8ea3fe5087186248c57420) )
 	ROM_LOAD16_WORD_SWAP( "mpn.q3",   0x200000, 0x100000, CRC(60aa5ef2) SHA1(03fa994d7f5b43e05e8417a8769e07c22548a27a) )
@@ -5445,34 +5445,61 @@
 ROM_END
 
 ROM_START( mpangj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mpnj.03a", 0x000000, 0x80000, CRC(bf597b1c) SHA1(0412e826eec7a9f3e70c84b64c9fbcecf7e0c56a) )
 	ROM_LOAD16_WORD_SWAP( "mpnj.04a", 0x080000, 0x80000, CRC(f4a3ab0f) SHA1(2e54bbc95304827fcd24dab35e4895f4e6566be0) )
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "mpn-simm.01c",   0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.01d",   0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.01a",   0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.01b",   0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.03c",   0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.03d",   0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.03a",   0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "mpn-simm.03b",   0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "mpn-simm.01c",   0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.01d",   0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.01a",   0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.01b",   0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03c",   0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03d",   0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03a",   0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03b",   0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) ) // ROM on a SIMM
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mpn.01",   0x00000, 0x08000, CRC(90c7adb6) SHA1(a2653e977e5e0457b249e098e5ca0abc93dac336) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "mpn-simm.05a",   0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "mpn-simm.05b",   0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) // ROM on a simm
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "mpn-simm.05a",   0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "mpn-simm.05b",   0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) // ROM on a SIMM
+
+	ROM_REGION( 0x20, "key", 0 )
+	ROM_LOAD( "mpang.key",    0x000000, 0x000014, CRC(95354b0f) SHA1(6e015eda29ac94aa420d7c70cdebffee52fde032) )
+ROM_END
+
+ROM_START( mpanga )
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
+	ROM_LOAD16_WORD_SWAP( "mpn_03a.6a", 0x000000, 0x80000, CRC(b05ebc34) SHA1(b30784dcc1aaf0f37930c125331dfa41240c5859) )
+	ROM_LOAD16_WORD_SWAP( "mpn_04a.7a", 0x080000, 0x80000, CRC(8e4814b4) SHA1(f86e0b7986de115b76c579e6ffd4e77da2360a01) )
+
+	ROM_REGION( 0x1000000, "gfx", 0 )
+	ROM_LOAD64_BYTE( "mpn-simm.01c",   0x0000000, 0x200000, CRC(388db66b) SHA1(7416cce3d0dbea71c92ea9f72f5536146f757b45) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.01d",   0x0000001, 0x200000, CRC(aff1b494) SHA1(d376c02ce01e71a7707d3d3fe5b0ae59ce781686) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.01a",   0x0000002, 0x200000, CRC(a9c4857b) SHA1(66f538105c710d1480141e48a15b1a760f5ce985) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.01b",   0x0000003, 0x200000, CRC(f759df22) SHA1(1678e3e819dd808f3a6fdd52b7c933eac4777b5b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03c",   0x0000004, 0x200000, CRC(dec6b720) SHA1(331776e1cba3fb82071e7c2195dc4ae27b3613a2) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03d",   0x0000005, 0x200000, CRC(f8774c18) SHA1(58e0ea4dd62e39bcfaa3a2be4ef08eb2f0bd3c00) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03a",   0x0000006, 0x200000, CRC(c2aea4ec) SHA1(f5e2a815fa802598611efa48e5de97e929155e77) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "mpn-simm.03b",   0x0000007, 0x200000, CRC(84d6dc33) SHA1(f5ababb479facc08c425381570644230c09334e7) ) // ROM on a SIMM
+
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
+	ROM_LOAD( "mpn.01",   0x00000, 0x08000, CRC(90c7adb6) SHA1(a2653e977e5e0457b249e098e5ca0abc93dac336) )
+	ROM_CONTINUE(         0x10000, 0x18000 )
+
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "mpn-simm.05a",   0x000000, 0x200000, CRC(318a2e21) SHA1(c573cd88f8279a062c73ef1d79cd8421dbdcd93e) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "mpn-simm.05b",   0x200000, 0x200000, CRC(5462f4e8) SHA1(299fbdab700e735e6395c5d9e3f079bb2e3dbd73) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "mpang.key",    0x000000, 0x000014, CRC(95354b0f) SHA1(6e015eda29ac94aa420d7c70cdebffee52fde032) )
 ROM_END
 
 ROM_START( nwarr )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vphe.03f", 0x000000, 0x80000, CRC(a922c44f) SHA1(aa06c7ee9b9878d999a21201f4ff3134cef1fff0) )
 	ROM_LOAD16_WORD_SWAP( "vphe.04c", 0x080000, 0x80000, CRC(7312d890) SHA1(8cf2ff6eb2c13e308e65d7ac7a5f9664c44170df) )
 	ROM_LOAD16_WORD_SWAP( "vphe.05d", 0x100000, 0x80000, CRC(cde8b506) SHA1(1c4f7fa6799be1aa444ed31464cddb79fee22928) )
@@ -5492,12 +5519,12 @@
 	ROM_LOAD64_WORD( "vph.18m",   0x1000004, 0x400000, CRC(64498eed) SHA1(d64e54a9ad1cbb927b7bac2eb16e1487834c5706) )
 	ROM_LOAD64_WORD( "vph.20m",   0x1000006, 0x400000, CRC(17f2433f) SHA1(0cbf8c96f92016fefb4a9c668ce5fd260342d712) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vph.01",   0x00000, 0x08000, CRC(5045dcac) SHA1(fd1a6586fbdd48a707df1fa52309b4cf50e3cc4c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vph.02",   0x28000, 0x20000, CRC(86b60e59) SHA1(197d07ced8b9850729c83fa59b7afc283500bdee) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vph.11m",   0x000000, 0x200000, CRC(e1837d33) SHA1(e3cb69f64767bacbec7286d0b4cd0ce7a0ba13d8) )
 	ROM_LOAD16_WORD_SWAP( "vph.12m",   0x200000, 0x200000, CRC(fbd3cd90) SHA1(4813c25802ad71b77ca04fd8f3a86344f99f0d6a) )
 
@@ -5506,7 +5533,7 @@
 ROM_END
 
 ROM_START( nwarru )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vphu.03f", 0x000000, 0x80000, CRC(85d6a359) SHA1(38f4bb5cf2e1e82ce9673b911329fdc8220ce0dc) )
 	ROM_LOAD16_WORD_SWAP( "vphu.04c", 0x080000, 0x80000, CRC(cb7fce77) SHA1(85a8c8b1c71df0eee5f23e0bf28b2d95af2ce830) )
 	ROM_LOAD16_WORD_SWAP( "vphu.05e", 0x100000, 0x80000, CRC(e08f2bba) SHA1(0f6d01a3b05085df23ead4c09c5363a1587b527e) )
@@ -5526,12 +5553,12 @@
 	ROM_LOAD64_WORD( "vph.18m",   0x1000004, 0x400000, CRC(64498eed) SHA1(d64e54a9ad1cbb927b7bac2eb16e1487834c5706) )
 	ROM_LOAD64_WORD( "vph.20m",   0x1000006, 0x400000, CRC(17f2433f) SHA1(0cbf8c96f92016fefb4a9c668ce5fd260342d712) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vph.01",   0x00000, 0x08000, CRC(5045dcac) SHA1(fd1a6586fbdd48a707df1fa52309b4cf50e3cc4c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vph.02",   0x28000, 0x20000, CRC(86b60e59) SHA1(197d07ced8b9850729c83fa59b7afc283500bdee) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vph.11m",   0x000000, 0x200000, CRC(e1837d33) SHA1(e3cb69f64767bacbec7286d0b4cd0ce7a0ba13d8) )
 	ROM_LOAD16_WORD_SWAP( "vph.12m",   0x200000, 0x200000, CRC(fbd3cd90) SHA1(4813c25802ad71b77ca04fd8f3a86344f99f0d6a) )
 
@@ -5540,7 +5567,7 @@
 ROM_END
 
 ROM_START( nwarrh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vphh.03d", 0x000000, 0x80000, CRC(6029c7be) SHA1(687c382d02d18ef5781c9d928e74f161461c2641) )
 	ROM_LOAD16_WORD_SWAP( "vphh.04a", 0x080000, 0x80000, CRC(d26625ee) SHA1(2b415a28ee39949a1e80e7e65b89f3d707bdfae7) )
 	ROM_LOAD16_WORD_SWAP( "vphh.05c", 0x100000, 0x80000, CRC(73ee0b8a) SHA1(d31ccb2cbc6133972f6dc76f0a40154368953625) )
@@ -5560,12 +5587,12 @@
 	ROM_LOAD64_WORD( "vph.18m",   0x1000004, 0x400000, CRC(64498eed) SHA1(d64e54a9ad1cbb927b7bac2eb16e1487834c5706) )
 	ROM_LOAD64_WORD( "vph.20m",   0x1000006, 0x400000, CRC(17f2433f) SHA1(0cbf8c96f92016fefb4a9c668ce5fd260342d712) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vph.01",   0x00000, 0x08000, CRC(5045dcac) SHA1(fd1a6586fbdd48a707df1fa52309b4cf50e3cc4c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vph.02",   0x28000, 0x20000, CRC(86b60e59) SHA1(197d07ced8b9850729c83fa59b7afc283500bdee) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vph.11m",   0x000000, 0x200000, CRC(e1837d33) SHA1(e3cb69f64767bacbec7286d0b4cd0ce7a0ba13d8) )
 	ROM_LOAD16_WORD_SWAP( "vph.12m",   0x200000, 0x200000, CRC(fbd3cd90) SHA1(4813c25802ad71b77ca04fd8f3a86344f99f0d6a) )
 
@@ -5574,7 +5601,7 @@
 ROM_END
 
 ROM_START( nwarrb )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vphb.03d", 0x000000, 0x80000, CRC(3a426d3f) SHA1(76d7c39c901aa768bb1600179509752d1fc0d558) )
 	ROM_LOAD16_WORD_SWAP( "vphb.04a", 0x080000, 0x80000, CRC(51c4bb2f) SHA1(c885813ff13bfd251accf38da1bc0bd9c526e4c5) )
 	ROM_LOAD16_WORD_SWAP( "vphb.05c", 0x100000, 0x80000, CRC(ac44d997) SHA1(b28e55d83a33e885125f2def76259d0ab21b0f9b) )
@@ -5594,12 +5621,12 @@
 	ROM_LOAD64_WORD( "vph.18m",   0x1000004, 0x400000, CRC(64498eed) SHA1(d64e54a9ad1cbb927b7bac2eb16e1487834c5706) )
 	ROM_LOAD64_WORD( "vph.20m",   0x1000006, 0x400000, CRC(17f2433f) SHA1(0cbf8c96f92016fefb4a9c668ce5fd260342d712) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vph.01",   0x00000, 0x08000, CRC(5045dcac) SHA1(fd1a6586fbdd48a707df1fa52309b4cf50e3cc4c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vph.02",   0x28000, 0x20000, CRC(86b60e59) SHA1(197d07ced8b9850729c83fa59b7afc283500bdee) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vph.11m",   0x000000, 0x200000, CRC(e1837d33) SHA1(e3cb69f64767bacbec7286d0b4cd0ce7a0ba13d8) )
 	ROM_LOAD16_WORD_SWAP( "vph.12m",   0x200000, 0x200000, CRC(fbd3cd90) SHA1(4813c25802ad71b77ca04fd8f3a86344f99f0d6a) )
 
@@ -5608,7 +5635,7 @@
 ROM_END
 
 ROM_START( nwarra )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vpha.03b", 0x000000, 0x80000, CRC(0a70cdd6) SHA1(08d3f3892bfc8e741c59071150e6c3a8bf5ffbef) )
 	ROM_LOAD16_WORD_SWAP( "vpha.04b", 0x080000, 0x80000, CRC(70ce62e4) SHA1(8bc9066071585805b6420bcc40eb03e641e3f027) )
 	ROM_LOAD16_WORD_SWAP( "vpha.05b", 0x100000, 0x80000, CRC(5692a03f) SHA1(7c2ba1022ee4045d985477a6c9026140b7809234) )
@@ -5628,12 +5655,12 @@
 	ROM_LOAD64_WORD( "vph.18m",   0x1000004, 0x400000, CRC(64498eed) SHA1(d64e54a9ad1cbb927b7bac2eb16e1487834c5706) )
 	ROM_LOAD64_WORD( "vph.20m",   0x1000006, 0x400000, CRC(17f2433f) SHA1(0cbf8c96f92016fefb4a9c668ce5fd260342d712) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vph.01",   0x00000, 0x08000, CRC(5045dcac) SHA1(fd1a6586fbdd48a707df1fa52309b4cf50e3cc4c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vph.02",   0x28000, 0x20000, CRC(86b60e59) SHA1(197d07ced8b9850729c83fa59b7afc283500bdee) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vph.11m",   0x000000, 0x200000, CRC(e1837d33) SHA1(e3cb69f64767bacbec7286d0b4cd0ce7a0ba13d8) )
 	ROM_LOAD16_WORD_SWAP( "vph.12m",   0x200000, 0x200000, CRC(fbd3cd90) SHA1(4813c25802ad71b77ca04fd8f3a86344f99f0d6a) )
 
@@ -5642,7 +5669,7 @@
 ROM_END
 
 ROM_START( vhuntj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vphj.03f", 0x000000, 0x80000, CRC(3de2e333) SHA1(2f9f756c5c91646625d70debd5b19b8dbd13a62f) )
 	ROM_LOAD16_WORD_SWAP( "vphj.04c", 0x080000, 0x80000, CRC(c95cf304) SHA1(0544ab9d0f398b558e1119d94885058ad4a7d929) )
 	ROM_LOAD16_WORD_SWAP( "vphj.05d", 0x100000, 0x80000, CRC(50de5ddd) SHA1(2bcc6c254ead06e9ea0a9ae4348195d3d55de277) )
@@ -5662,12 +5689,12 @@
 	ROM_LOAD64_WORD( "vph.18m",   0x1000004, 0x400000, CRC(64498eed) SHA1(d64e54a9ad1cbb927b7bac2eb16e1487834c5706) )
 	ROM_LOAD64_WORD( "vph.20m",   0x1000006, 0x400000, CRC(17f2433f) SHA1(0cbf8c96f92016fefb4a9c668ce5fd260342d712) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vph.01",   0x00000, 0x08000, CRC(5045dcac) SHA1(fd1a6586fbdd48a707df1fa52309b4cf50e3cc4c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vph.02",   0x28000, 0x20000, CRC(86b60e59) SHA1(197d07ced8b9850729c83fa59b7afc283500bdee) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vph.11m",   0x000000, 0x200000, CRC(e1837d33) SHA1(e3cb69f64767bacbec7286d0b4cd0ce7a0ba13d8) )
 	ROM_LOAD16_WORD_SWAP( "vph.12m",   0x200000, 0x200000, CRC(fbd3cd90) SHA1(4813c25802ad71b77ca04fd8f3a86344f99f0d6a) )
 
@@ -5676,7 +5703,7 @@
 ROM_END
 
 ROM_START( vhuntjr1s )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vphjstop.03b", 0x000000, 0x80000,CRC(9c4e6191) SHA1(a247beae3400583d5bf950b7c856befef45d3ad6) ) // should be 03c?, handwritten label..
 	ROM_LOAD16_WORD_SWAP( "vphj.04c", 0x080000, 0x80000, CRC(c95cf304) SHA1(0544ab9d0f398b558e1119d94885058ad4a7d929) )
 	ROM_LOAD16_WORD_SWAP( "vphj.05d", 0x100000, 0x80000, CRC(50de5ddd) SHA1(2bcc6c254ead06e9ea0a9ae4348195d3d55de277) )
@@ -5696,12 +5723,12 @@
 	ROM_LOAD64_WORD( "vph.18m",   0x1000004, 0x400000, CRC(64498eed) SHA1(d64e54a9ad1cbb927b7bac2eb16e1487834c5706) )
 	ROM_LOAD64_WORD( "vph.20m",   0x1000006, 0x400000, CRC(17f2433f) SHA1(0cbf8c96f92016fefb4a9c668ce5fd260342d712) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vph.01",   0x00000, 0x08000, CRC(5045dcac) SHA1(fd1a6586fbdd48a707df1fa52309b4cf50e3cc4c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vph.02",   0x28000, 0x20000, CRC(86b60e59) SHA1(197d07ced8b9850729c83fa59b7afc283500bdee) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vph.11m",   0x000000, 0x200000, CRC(e1837d33) SHA1(e3cb69f64767bacbec7286d0b4cd0ce7a0ba13d8) )
 	ROM_LOAD16_WORD_SWAP( "vph.12m",   0x200000, 0x200000, CRC(fbd3cd90) SHA1(4813c25802ad71b77ca04fd8f3a86344f99f0d6a) )
 
@@ -5710,7 +5737,7 @@
 ROM_END
 
 ROM_START( vhuntjr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vphj.03c", 0x000000, 0x80000, CRC(606b682a) SHA1(dd5c1b90a050e344b4f29fc468cfbd92aa392edf) )
 	ROM_LOAD16_WORD_SWAP( "vphj.04b", 0x080000, 0x80000, CRC(a3b40393) SHA1(04929e24c14b40f55745e02f07ff6af61739a8b4) )
 	ROM_LOAD16_WORD_SWAP( "vphj.05b", 0x100000, 0x80000, CRC(fccd5558) SHA1(a4d0f4cad7666e61c11e2571850df79b48332f28) )
@@ -5730,12 +5757,12 @@
 	ROM_LOAD64_WORD( "vph.18m",   0x1000004, 0x400000, CRC(64498eed) SHA1(d64e54a9ad1cbb927b7bac2eb16e1487834c5706) )
 	ROM_LOAD64_WORD( "vph.20m",   0x1000006, 0x400000, CRC(17f2433f) SHA1(0cbf8c96f92016fefb4a9c668ce5fd260342d712) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vph.01",   0x00000, 0x08000, CRC(5045dcac) SHA1(fd1a6586fbdd48a707df1fa52309b4cf50e3cc4c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vph.02",   0x28000, 0x20000, CRC(86b60e59) SHA1(197d07ced8b9850729c83fa59b7afc283500bdee) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vph.11m",   0x000000, 0x200000, CRC(e1837d33) SHA1(e3cb69f64767bacbec7286d0b4cd0ce7a0ba13d8) )
 	ROM_LOAD16_WORD_SWAP( "vph.12m",   0x200000, 0x200000, CRC(fbd3cd90) SHA1(4813c25802ad71b77ca04fd8f3a86344f99f0d6a) )
 
@@ -5744,7 +5771,7 @@
 ROM_END
 
 ROM_START( vhuntjr2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vphj.03b", 0x000000, 0x80000, CRC(679c3fa9) SHA1(25c3f595e4d93c16ac483e4f9ba20ad714ecf4ef) )
 	ROM_LOAD16_WORD_SWAP( "vphj.04a", 0x080000, 0x80000, CRC(eb6e71e4) SHA1(7a7cd34f7a70d87b817c0a4242844103db3e9f66) )
 	ROM_LOAD16_WORD_SWAP( "vphj.05a", 0x100000, 0x80000, CRC(eaf634ea) SHA1(d46cb9d5172bb626396354ff2742d4394f0816f1) )
@@ -5764,12 +5791,12 @@
 	ROM_LOAD64_WORD( "vph.18m",   0x1000004, 0x400000, CRC(64498eed) SHA1(d64e54a9ad1cbb927b7bac2eb16e1487834c5706) )
 	ROM_LOAD64_WORD( "vph.20m",   0x1000006, 0x400000, CRC(17f2433f) SHA1(0cbf8c96f92016fefb4a9c668ce5fd260342d712) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vph.01",   0x00000, 0x08000, CRC(5045dcac) SHA1(fd1a6586fbdd48a707df1fa52309b4cf50e3cc4c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vph.02",   0x28000, 0x20000, CRC(86b60e59) SHA1(197d07ced8b9850729c83fa59b7afc283500bdee) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vph.11m",   0x000000, 0x200000, CRC(e1837d33) SHA1(e3cb69f64767bacbec7286d0b4cd0ce7a0ba13d8) )
 	ROM_LOAD16_WORD_SWAP( "vph.12m",   0x200000, 0x200000, CRC(fbd3cd90) SHA1(4813c25802ad71b77ca04fd8f3a86344f99f0d6a) )
 
@@ -5778,181 +5805,181 @@
 ROM_END
 
 ROM_START( progear )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pgau.03", 0x000000, 0x80000, CRC(343a783e) SHA1(7ba8ae041b062767bf64328adf22ef100c38cdfd) )
 	ROM_LOAD16_WORD_SWAP( "pgau.04", 0x080000, 0x80000, CRC(16208d79) SHA1(c477de7f31df44144a60d10dc4d933f3a7c20722) )
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "pga-simm.01c",   0x0000000, 0x200000,  CRC(452f98b0) SHA1(a10e615c32098f6d25becd466da8faa967523a7b) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01d",   0x0000001, 0x200000,  CRC(9e672092) SHA1(fce0b8b43a1c069262f4e3e81c1a04621e232c88) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01a",   0x0000002, 0x200000,  CRC(ae9ddafe) SHA1(afbb26fed6cd0cb5c0099a10d35aeb453318c14d) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01b",   0x0000003, 0x200000,  CRC(94d72d94) SHA1(df6a3fe49c008f73b160eb6f2a44dc371ff73cba) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03c",   0x0000004, 0x200000,  CRC(48a1886d) SHA1(ebf44b42d784924e08a832a7e5f66a887bab244b) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03d",   0x0000005, 0x200000,  CRC(172d7e37) SHA1(0eaedd24cd3fa87b6f35fbd63078d40c493c92d0) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03a",   0x0000006, 0x200000,  CRC(9ee33d98) SHA1(85d1bd31940e35ac8c732165020881a2d65cd6b1) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03b",   0x0000007, 0x200000,  CRC(848dee32) SHA1(c591288e86ad1624d0fe66563808af9fac786e64) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "pga-simm.01c",   0x0000000, 0x200000,  CRC(452f98b0) SHA1(a10e615c32098f6d25becd466da8faa967523a7b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01d",   0x0000001, 0x200000,  CRC(9e672092) SHA1(fce0b8b43a1c069262f4e3e81c1a04621e232c88) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01a",   0x0000002, 0x200000,  CRC(ae9ddafe) SHA1(afbb26fed6cd0cb5c0099a10d35aeb453318c14d) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01b",   0x0000003, 0x200000,  CRC(94d72d94) SHA1(df6a3fe49c008f73b160eb6f2a44dc371ff73cba) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03c",   0x0000004, 0x200000,  CRC(48a1886d) SHA1(ebf44b42d784924e08a832a7e5f66a887bab244b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03d",   0x0000005, 0x200000,  CRC(172d7e37) SHA1(0eaedd24cd3fa87b6f35fbd63078d40c493c92d0) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03a",   0x0000006, 0x200000,  CRC(9ee33d98) SHA1(85d1bd31940e35ac8c732165020881a2d65cd6b1) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03b",   0x0000007, 0x200000,  CRC(848dee32) SHA1(c591288e86ad1624d0fe66563808af9fac786e64) ) // ROM on a SIMM
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pga.01",   0x00000, 0x08000, CRC(bdbfa992) SHA1(7c5496c1daaea6a7ab95c0b25625d325ec3427cc) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "pga-simm.05a",   0x000000, 0x200000, CRC(c0aac80c) SHA1(91784d35d4f7e113529bb5be6081b67094b150ea) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.05b",   0x200000, 0x200000, CRC(37a65d86) SHA1(374d562a4648734f82aa2ddb6d258e870896dd45) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.06a",   0x400000, 0x200000, CRC(d3f1e934) SHA1(5dcea28c873d0d472f5b94e07d97cd77ace2b252) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.06b",   0x600000, 0x200000, CRC(8b39489a) SHA1(fd790efaf37dc2c4c16f657941044e3e2d3c2711) ) // ROM on a simm
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "pga-simm.05a",   0x000000, 0x200000, CRC(c0aac80c) SHA1(91784d35d4f7e113529bb5be6081b67094b150ea) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.05b",   0x200000, 0x200000, CRC(37a65d86) SHA1(374d562a4648734f82aa2ddb6d258e870896dd45) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.06a",   0x400000, 0x200000, CRC(d3f1e934) SHA1(5dcea28c873d0d472f5b94e07d97cd77ace2b252) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.06b",   0x600000, 0x200000, CRC(8b39489a) SHA1(fd790efaf37dc2c4c16f657941044e3e2d3c2711) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "progear.key",  0x000000, 0x000014, CRC(46736b17) SHA1(3fd0cc78fad80210a7cf8b1150cba1e6121998dd) )
 ROM_END
 
 ROM_START( progearj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pgaj.03", 0x000000, 0x80000, CRC(06dbba54) SHA1(b0b808e9974c727bd187f2cdcba71a301b78c759) )
 	ROM_LOAD16_WORD_SWAP( "pgaj.04", 0x080000, 0x80000, CRC(a1f1f1bc) SHA1(839cdc89d9483632883c185951c76deb4ff7657e) )
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "pga-simm.01c",   0x0000000, 0x200000,  CRC(452f98b0) SHA1(a10e615c32098f6d25becd466da8faa967523a7b) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01d",   0x0000001, 0x200000,  CRC(9e672092) SHA1(fce0b8b43a1c069262f4e3e81c1a04621e232c88) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01a",   0x0000002, 0x200000,  CRC(ae9ddafe) SHA1(afbb26fed6cd0cb5c0099a10d35aeb453318c14d) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01b",   0x0000003, 0x200000,  CRC(94d72d94) SHA1(df6a3fe49c008f73b160eb6f2a44dc371ff73cba) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03c",   0x0000004, 0x200000,  CRC(48a1886d) SHA1(ebf44b42d784924e08a832a7e5f66a887bab244b) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03d",   0x0000005, 0x200000,  CRC(172d7e37) SHA1(0eaedd24cd3fa87b6f35fbd63078d40c493c92d0) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03a",   0x0000006, 0x200000,  CRC(9ee33d98) SHA1(85d1bd31940e35ac8c732165020881a2d65cd6b1) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03b",   0x0000007, 0x200000,  CRC(848dee32) SHA1(c591288e86ad1624d0fe66563808af9fac786e64) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "pga-simm.01c",   0x0000000, 0x200000,  CRC(452f98b0) SHA1(a10e615c32098f6d25becd466da8faa967523a7b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01d",   0x0000001, 0x200000,  CRC(9e672092) SHA1(fce0b8b43a1c069262f4e3e81c1a04621e232c88) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01a",   0x0000002, 0x200000,  CRC(ae9ddafe) SHA1(afbb26fed6cd0cb5c0099a10d35aeb453318c14d) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01b",   0x0000003, 0x200000,  CRC(94d72d94) SHA1(df6a3fe49c008f73b160eb6f2a44dc371ff73cba) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03c",   0x0000004, 0x200000,  CRC(48a1886d) SHA1(ebf44b42d784924e08a832a7e5f66a887bab244b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03d",   0x0000005, 0x200000,  CRC(172d7e37) SHA1(0eaedd24cd3fa87b6f35fbd63078d40c493c92d0) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03a",   0x0000006, 0x200000,  CRC(9ee33d98) SHA1(85d1bd31940e35ac8c732165020881a2d65cd6b1) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03b",   0x0000007, 0x200000,  CRC(848dee32) SHA1(c591288e86ad1624d0fe66563808af9fac786e64) ) // ROM on a SIMM
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pga.01",   0x00000, 0x08000, CRC(bdbfa992) SHA1(7c5496c1daaea6a7ab95c0b25625d325ec3427cc) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "pga-simm.05a",   0x000000, 0x200000, CRC(c0aac80c) SHA1(91784d35d4f7e113529bb5be6081b67094b150ea) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.05b",   0x200000, 0x200000, CRC(37a65d86) SHA1(374d562a4648734f82aa2ddb6d258e870896dd45) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.06a",   0x400000, 0x200000, CRC(d3f1e934) SHA1(5dcea28c873d0d472f5b94e07d97cd77ace2b252) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.06b",   0x600000, 0x200000, CRC(8b39489a) SHA1(fd790efaf37dc2c4c16f657941044e3e2d3c2711) ) // ROM on a simm
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "pga-simm.05a",   0x000000, 0x200000, CRC(c0aac80c) SHA1(91784d35d4f7e113529bb5be6081b67094b150ea) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.05b",   0x200000, 0x200000, CRC(37a65d86) SHA1(374d562a4648734f82aa2ddb6d258e870896dd45) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.06a",   0x400000, 0x200000, CRC(d3f1e934) SHA1(5dcea28c873d0d472f5b94e07d97cd77ace2b252) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.06b",   0x600000, 0x200000, CRC(8b39489a) SHA1(fd790efaf37dc2c4c16f657941044e3e2d3c2711) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "progearj.key", 0x000000, 0x000014, CRC(d8d515e5) SHA1(d0cfe4effac0e9ede8ad31db8972436638ff8d6f) )
 ROM_END
 
 ROM_START( progeara )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pgaa.03", 0x000000, 0x80000, CRC(25e6e2ce) SHA1(15b702ccc2bab7f2f9e7724ed83931c686763ffe) )
 	ROM_LOAD16_WORD_SWAP( "pgaa.04", 0x080000, 0x80000, CRC(8104307e) SHA1(3ed134fcbf5c1c9f068f59b49b96d01a1ea33eeb) )
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "pga-simm.01c",   0x0000000, 0x200000,  CRC(452f98b0) SHA1(a10e615c32098f6d25becd466da8faa967523a7b) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01d",   0x0000001, 0x200000,  CRC(9e672092) SHA1(fce0b8b43a1c069262f4e3e81c1a04621e232c88) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01a",   0x0000002, 0x200000,  CRC(ae9ddafe) SHA1(afbb26fed6cd0cb5c0099a10d35aeb453318c14d) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01b",   0x0000003, 0x200000,  CRC(94d72d94) SHA1(df6a3fe49c008f73b160eb6f2a44dc371ff73cba) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03c",   0x0000004, 0x200000,  CRC(48a1886d) SHA1(ebf44b42d784924e08a832a7e5f66a887bab244b) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03d",   0x0000005, 0x200000,  CRC(172d7e37) SHA1(0eaedd24cd3fa87b6f35fbd63078d40c493c92d0) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03a",   0x0000006, 0x200000,  CRC(9ee33d98) SHA1(85d1bd31940e35ac8c732165020881a2d65cd6b1) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03b",   0x0000007, 0x200000,  CRC(848dee32) SHA1(c591288e86ad1624d0fe66563808af9fac786e64) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "pga-simm.01c",   0x0000000, 0x200000,  CRC(452f98b0) SHA1(a10e615c32098f6d25becd466da8faa967523a7b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01d",   0x0000001, 0x200000,  CRC(9e672092) SHA1(fce0b8b43a1c069262f4e3e81c1a04621e232c88) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01a",   0x0000002, 0x200000,  CRC(ae9ddafe) SHA1(afbb26fed6cd0cb5c0099a10d35aeb453318c14d) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01b",   0x0000003, 0x200000,  CRC(94d72d94) SHA1(df6a3fe49c008f73b160eb6f2a44dc371ff73cba) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03c",   0x0000004, 0x200000,  CRC(48a1886d) SHA1(ebf44b42d784924e08a832a7e5f66a887bab244b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03d",   0x0000005, 0x200000,  CRC(172d7e37) SHA1(0eaedd24cd3fa87b6f35fbd63078d40c493c92d0) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03a",   0x0000006, 0x200000,  CRC(9ee33d98) SHA1(85d1bd31940e35ac8c732165020881a2d65cd6b1) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03b",   0x0000007, 0x200000,  CRC(848dee32) SHA1(c591288e86ad1624d0fe66563808af9fac786e64) ) // ROM on a SIMM
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pga.01",   0x00000, 0x08000, CRC(bdbfa992) SHA1(7c5496c1daaea6a7ab95c0b25625d325ec3427cc) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "pga-simm.05a",   0x000000, 0x200000, CRC(c0aac80c) SHA1(91784d35d4f7e113529bb5be6081b67094b150ea) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.05b",   0x200000, 0x200000, CRC(37a65d86) SHA1(374d562a4648734f82aa2ddb6d258e870896dd45) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.06a",   0x400000, 0x200000, CRC(d3f1e934) SHA1(5dcea28c873d0d472f5b94e07d97cd77ace2b252) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.06b",   0x600000, 0x200000, CRC(8b39489a) SHA1(fd790efaf37dc2c4c16f657941044e3e2d3c2711) ) // ROM on a simm
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "pga-simm.05a",   0x000000, 0x200000, CRC(c0aac80c) SHA1(91784d35d4f7e113529bb5be6081b67094b150ea) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.05b",   0x200000, 0x200000, CRC(37a65d86) SHA1(374d562a4648734f82aa2ddb6d258e870896dd45) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.06a",   0x400000, 0x200000, CRC(d3f1e934) SHA1(5dcea28c873d0d472f5b94e07d97cd77ace2b252) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.06b",   0x600000, 0x200000, CRC(8b39489a) SHA1(fd790efaf37dc2c4c16f657941044e3e2d3c2711) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "progeara.key", 0x000000, 0x000014, CRC(30a0fab6) SHA1(be3884a223e76750abe2556b000a821a262423f0) )
 ROM_END
 
 ROM_START( pzloop2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pl2e.03", 0x000000, 0x80000, CRC(3b1285b2) SHA1(f90f98fb15068306a57109ad954845be0a99e8ab) )
 	ROM_LOAD16_WORD_SWAP( "pl2e.04", 0x080000, 0x80000, CRC(40a2d647) SHA1(d1c5fa87b368efe0d2cc3f614d0165bd95748b81) )
 	ROM_LOAD16_WORD_SWAP( "pl2e.05", 0x100000, 0x80000, CRC(0f11d818) SHA1(ca2d5ea892aebfa1a2a825fb45c57b7923936917) )
 	ROM_LOAD16_WORD_SWAP( "pl2e.06", 0x180000, 0x80000, CRC(86fbbdf4) SHA1(325ba5dc54f3d82f39e1299d5f27de7227a458b2) )
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "pl2-simm.01c",   0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.01d",   0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.01a",   0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.01b",   0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03c",   0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03d",   0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03a",   0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03b",   0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "pl2-simm.01c",   0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.01d",   0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.01a",   0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.01b",   0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03c",   0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03d",   0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03a",   0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03b",   0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) ) // ROM on a SIMM
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pl2.01",   0x00000, 0x08000, CRC(35697569) SHA1(13718923cffb9ec53cef9e22d8875370b5f3dd74) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "pl2-simm.05a",   0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pl2-simm.05b",   0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) // ROM on a simm
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "pl2-simm.05a",   0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pl2-simm.05b",   0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "pzloop2.key",  0x000000, 0x000014, CRC(ae13be78) SHA1(5c715f0ef1e0664027faa6c2a7f0f878462cb7ae) )
 ROM_END
 
 ROM_START( pzloop2j )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pl2j.03c", 0x000000, 0x80000, CRC(3b76b806) SHA1(743808ccd470da075ca2f4a8872b22feb7e993ef) ) // 'c' handwritten over 'a' label
 	ROM_LOAD16_WORD_SWAP( "pl2j.04c", 0x080000, 0x80000, CRC(8878a42a) SHA1(178efe9be9ab7f209489f35d653cb5fef4e9565b) ) // ^^
 	ROM_LOAD16_WORD_SWAP( "pl2j.05c", 0x100000, 0x80000, CRC(51081ea4) SHA1(175dc70ba0b6a158d23e7271dd65f28e7beea746) ) // ^^
 	ROM_LOAD16_WORD_SWAP( "pl2j.06c", 0x180000, 0x80000, CRC(51c68494) SHA1(c3b2055af11138f5280fe89e248536069a22ddca) ) // ^^
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "pl2-simm.01c",   0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.01d",   0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.01a",   0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.01b",   0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03c",   0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03d",   0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03a",   0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03b",   0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "pl2-simm.01c",   0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.01d",   0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.01a",   0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.01b",   0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03c",   0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03d",   0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03a",   0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03b",   0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) ) // ROM on a SIMM
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pl2.01",   0x00000, 0x08000, CRC(35697569) SHA1(13718923cffb9ec53cef9e22d8875370b5f3dd74) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "pl2-simm.05a",   0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pl2-simm.05b",   0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) // ROM on a simm
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "pl2-simm.05a",   0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pl2-simm.05b",   0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "pzloop2.key",  0x000000, 0x000014, CRC(ae13be78) SHA1(5c715f0ef1e0664027faa6c2a7f0f878462cb7ae) )
 ROM_END
 
 ROM_START( pzloop2jr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pl2j.03a", 0x000000, 0x80000, CRC(0a751bd0) SHA1(a5a0b60387aacdafdf46ecd1acd764c9cb086b90) )
 	ROM_LOAD16_WORD_SWAP( "pl2j.04a", 0x080000, 0x80000, CRC(c3f72afe) SHA1(597a302e4bba50193c53f239e715962fcc4e3e5e) )
 	ROM_LOAD16_WORD_SWAP( "pl2j.05a", 0x100000, 0x80000, CRC(6ea9dbfc) SHA1(c3065e02516755e8b94a741dd2ab960c96d0ff8c) )
 	ROM_LOAD16_WORD_SWAP( "pl2j.06a", 0x180000, 0x80000, CRC(0f14848d) SHA1(94a3ee00d65cd9a310b3a330e2c37467b5863c64) )
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "pl2-simm.01c",   0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.01d",   0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.01a",   0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.01b",   0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03c",   0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03d",   0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03a",   0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03b",   0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "pl2-simm.01c",   0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.01d",   0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.01a",   0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.01b",   0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03c",   0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03d",   0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03a",   0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03b",   0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) ) // ROM on a SIMM
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pl2.01",   0x00000, 0x08000, CRC(35697569) SHA1(13718923cffb9ec53cef9e22d8875370b5f3dd74) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "pl2-simm.05a",   0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pl2-simm.05b",   0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) // ROM on a simm
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "pl2-simm.05a",   0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pl2-simm.05b",   0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "pzloop2.key",  0x000000, 0x000014, CRC(ae13be78) SHA1(5c715f0ef1e0664027faa6c2a7f0f878462cb7ae) )
 ROM_END
 
 ROM_START( qndream )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "tqzj.03a", 0x000000, 0x80000, CRC(7acf3e30) SHA1(5e2a697f98185731afc4130286a2699033dd02af) )
 	ROM_LOAD16_WORD_SWAP( "tqzj.04",  0x080000, 0x80000, CRC(f1044a87) SHA1(3fd6e5dd6be8c037c8a77cb840bf7d387497a98b) )
 	ROM_LOAD16_WORD_SWAP( "tqzj.05",  0x100000, 0x80000, CRC(4105ba0e) SHA1(73aacdf4176029f8e21506319e41ce03ed480122) )
@@ -5965,11 +5992,11 @@
 	ROM_LOAD64_WORD( "tqz.18m",  0x800004, 0x200000, CRC(42f132ff) SHA1(0e0a128524010dba033a9b9ab2c56fe92a1767da) )
 	ROM_LOAD64_WORD( "tqz.20m",  0x800006, 0x200000, CRC(b2e128a3) SHA1(8ae3161749d5206f16b755c29466cd5ca249b665) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "tqz.01",   0x00000, 0x08000, CRC(e9ce9d0a) SHA1(29f2987788e914e0a55f9130a99e411d15a7cc9b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "tqz.11m",   0x000000, 0x200000, CRC(78e7884f) SHA1(82fbbf704ac4bc0e0e7a6f407686861aa3693c23) )
 	ROM_LOAD16_WORD_SWAP( "tqz.12m",   0x200000, 0x200000, CRC(2e049b13) SHA1(e026f444b905e679e8240c7dd371658c4a3fd713) )
 
@@ -5978,7 +6005,7 @@
 ROM_END
 
 ROM_START( ringdest )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "smbe.03b", 0x000000, 0x80000, CRC(b8016278) SHA1(f744b08b27c11b8567ca7a94fbd75e398563c008) )
 	ROM_LOAD16_WORD_SWAP( "smbe.04b", 0x080000, 0x80000, CRC(18c4c447) SHA1(3723ad6d6939fa1ac7dd016254b32017b5e7b24e) )
 	ROM_LOAD16_WORD_SWAP( "smbe.05b", 0x100000, 0x80000, CRC(18ebda7f) SHA1(eacc3e76af5c47abe0a778be7a7beacf0924884e) )
@@ -6000,12 +6027,12 @@
 	ROM_LOAD64_WORD( "smb.25m",   0x1000004, 0x080000, CRC(82d6c4ec) SHA1(ed8ed02a00f59a048b9891ec2a77720bb6a5e03d) )
 	ROM_LOAD64_WORD( "smb.27m",   0x1000006, 0x080000, CRC(9b48678b) SHA1(4fa300d356c538947983ae85bb5c5cfd1fb835e7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "smb.01",   0x00000, 0x08000, CRC(0abc229a) SHA1(967f574e6358dfc1b01e6a4a4df1a8f34eb3d814) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "smb.02",   0x28000, 0x20000, CRC(d051679a) SHA1(583c2521a30db1740d95dd94a38751fbeff3aae5) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "smb.11m",   0x000000, 0x200000, CRC(c56935f9) SHA1(ca1705e48e31ddc13505e6297bceca2bec1bb209) )
 	ROM_LOAD16_WORD_SWAP( "smb.12m",   0x200000, 0x200000, CRC(955b0782) SHA1(ee09500e7b44e923126533613bfe26cdabc7ab5f) )
 
@@ -6014,7 +6041,7 @@
 ROM_END
 
 ROM_START( smbomb )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "smbj.03a", 0x000000, 0x80000, CRC(1c5613de) SHA1(e6257078ad2e18537aa606b0d0c5e04806244386) )
 	ROM_LOAD16_WORD_SWAP( "smbj.04a", 0x080000, 0x80000, CRC(29071ed7) SHA1(eb438fcb42e3fbe38e20bc021be079a3dd7a89fa) )
 	ROM_LOAD16_WORD_SWAP( "smbj.05a", 0x100000, 0x80000, CRC(eb20bce4) SHA1(b78a447d3d1d3f9a62a6b5abcd893f5e091f1bbc) )
@@ -6036,12 +6063,12 @@
 	ROM_LOAD64_WORD( "smb.25m",   0x1000004, 0x080000, CRC(82d6c4ec) SHA1(ed8ed02a00f59a048b9891ec2a77720bb6a5e03d) )
 	ROM_LOAD64_WORD( "smb.27m",   0x1000006, 0x080000, CRC(9b48678b) SHA1(4fa300d356c538947983ae85bb5c5cfd1fb835e7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "smb.01",   0x00000, 0x08000, CRC(0abc229a) SHA1(967f574e6358dfc1b01e6a4a4df1a8f34eb3d814) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "smb.02",   0x28000, 0x20000, CRC(d051679a) SHA1(583c2521a30db1740d95dd94a38751fbeff3aae5) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "smb.11m",   0x000000, 0x200000, CRC(c56935f9) SHA1(ca1705e48e31ddc13505e6297bceca2bec1bb209) )
 	ROM_LOAD16_WORD_SWAP( "smb.12m",   0x200000, 0x200000, CRC(955b0782) SHA1(ee09500e7b44e923126533613bfe26cdabc7ab5f) )
 
@@ -6050,7 +6077,7 @@
 ROM_END
 
 ROM_START( smbombr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "smbj.03", 0x000000, 0x80000, CRC(52eafb10) SHA1(5abfe07e948748eba982dc8f2e21462aec187590) )
 	ROM_LOAD16_WORD_SWAP( "smbj.04", 0x080000, 0x80000, CRC(aa6e8078) SHA1(58b4e15e7e3209e59a37ce48d8b9f0dc8b933cdc) )
 	ROM_LOAD16_WORD_SWAP( "smbj.05", 0x100000, 0x80000, CRC(b69e7d5f) SHA1(e66430ef05ed0d1c848d24c7436ee5f1b511dcea) )
@@ -6072,12 +6099,12 @@
 	ROM_LOAD64_WORD( "smb.25m",   0x1000004, 0x080000, CRC(82d6c4ec) SHA1(ed8ed02a00f59a048b9891ec2a77720bb6a5e03d) )
 	ROM_LOAD64_WORD( "smb.27m",   0x1000006, 0x080000, CRC(9b48678b) SHA1(4fa300d356c538947983ae85bb5c5cfd1fb835e7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "smb.01",   0x00000, 0x08000, CRC(0abc229a) SHA1(967f574e6358dfc1b01e6a4a4df1a8f34eb3d814) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "smb.02",   0x28000, 0x20000, CRC(d051679a) SHA1(583c2521a30db1740d95dd94a38751fbeff3aae5) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "smb.11m",   0x000000, 0x200000, CRC(c56935f9) SHA1(ca1705e48e31ddc13505e6297bceca2bec1bb209) )
 	ROM_LOAD16_WORD_SWAP( "smb.12m",   0x200000, 0x200000, CRC(955b0782) SHA1(ee09500e7b44e923126533613bfe26cdabc7ab5f) )
 
@@ -6086,7 +6113,7 @@
 ROM_END
 
 ROM_START( ringdesta )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "smba.03a", 0x000000, 0x80000, CRC(d3744dfd) SHA1(462dbdbdda75c498680889355cc4897d67ceddec) )
 	ROM_LOAD16_WORD_SWAP( "smba.04a", 0x080000, 0x80000, CRC(f32d5b4f) SHA1(de001ff00c4bc7797f4dd4c2d0b59b9b0cbb6d1f) )
 	ROM_LOAD16_WORD_SWAP( "smba.05a", 0x100000, 0x80000, CRC(1016454f) SHA1(3b176afdf550d565a75a0f3e8238c79d4e6863ac) )
@@ -6108,12 +6135,12 @@
 	ROM_LOAD64_WORD( "smb.25m",   0x1000004, 0x080000, CRC(82d6c4ec) SHA1(ed8ed02a00f59a048b9891ec2a77720bb6a5e03d) )
 	ROM_LOAD64_WORD( "smb.27m",   0x1000006, 0x080000, CRC(9b48678b) SHA1(4fa300d356c538947983ae85bb5c5cfd1fb835e7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "smb.01",   0x00000, 0x08000, CRC(0abc229a) SHA1(967f574e6358dfc1b01e6a4a4df1a8f34eb3d814) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "smb.02",   0x28000, 0x20000, CRC(d051679a) SHA1(583c2521a30db1740d95dd94a38751fbeff3aae5) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "smb.11m",   0x000000, 0x200000, CRC(c56935f9) SHA1(ca1705e48e31ddc13505e6297bceca2bec1bb209) )
 	ROM_LOAD16_WORD_SWAP( "smb.12m",   0x200000, 0x200000, CRC(955b0782) SHA1(ee09500e7b44e923126533613bfe26cdabc7ab5f) )
 
@@ -6122,7 +6149,7 @@
 ROM_END
 
 ROM_START( ringdesth )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "smbh.03b", 0x000000, 0x80000, CRC(2e316584) SHA1(7a7c2ec21bd46d784c2971e1dbb8d8312362371a) )
 	ROM_LOAD16_WORD_SWAP( "smbh.04b", 0x080000, 0x80000, CRC(9950a23a) SHA1(5afd12ae7f3e7283ba42f844f2ee5a96875dc74e) )
 	ROM_LOAD16_WORD_SWAP( "smbh.05b", 0x100000, 0x80000, CRC(41e0b3fc) SHA1(67fea6e194650c2a45cc0408ab1b0c2743ec6efa) )
@@ -6144,12 +6171,12 @@
 	ROM_LOAD64_WORD( "smb.25m",   0x1000004, 0x080000, CRC(82d6c4ec) SHA1(ed8ed02a00f59a048b9891ec2a77720bb6a5e03d) )
 	ROM_LOAD64_WORD( "smb.27m",   0x1000006, 0x080000, CRC(9b48678b) SHA1(4fa300d356c538947983ae85bb5c5cfd1fb835e7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "smb.01",   0x00000, 0x08000, CRC(0abc229a) SHA1(967f574e6358dfc1b01e6a4a4df1a8f34eb3d814) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "smb.02",   0x28000, 0x20000, CRC(d051679a) SHA1(583c2521a30db1740d95dd94a38751fbeff3aae5) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "smb.11m",   0x000000, 0x200000, CRC(c56935f9) SHA1(ca1705e48e31ddc13505e6297bceca2bec1bb209) )
 	ROM_LOAD16_WORD_SWAP( "smb.12m",   0x200000, 0x200000, CRC(955b0782) SHA1(ee09500e7b44e923126533613bfe26cdabc7ab5f) )
 
@@ -6157,8 +6184,54 @@
 	ROM_LOAD( "ringdesth.key", 0x000000, 0x000014, CRC(ffb8d049) SHA1(c6d111412c3960b24a1be5c49fe4ec4d17324e06) )
 ROM_END
 
+/*
+About the Ring of Destruction: Slammasters II (Brazil 940902) below:
+
+Only ROM smbb.03b is different then the above Hispanic (ringdesth) set, while ROMs 04 through 08 match.  ROM smbb.03b has 3 bytes changed:
+   0x00C1 == 0A  (vs 05 for smbh.03b), this is the region byte.
+   0x1D20 == 6D  (vs 6E for smbh.03b), this is a checksum byte.
+   0x1D24 == 73  (vs 66 for smbh.03b), this is a checksum byte.
+
+It also uses the ringdesth key for decryption.  For all intents and purposes, this set is a factory region hack which has been verified on multiple boards.
+*/
+ROM_START( ringdestb )
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
+	ROM_LOAD16_WORD_SWAP( "smbb.03b", 0x000000, 0x80000, CRC(234eebcc) SHA1(61ae407d0b2fb6e685231849f4db7ddf249466d1) ) /* all hand written labels */
+	ROM_LOAD16_WORD_SWAP( "smbb.04b", 0x080000, 0x80000, CRC(9950a23a) SHA1(5afd12ae7f3e7283ba42f844f2ee5a96875dc74e) )
+	ROM_LOAD16_WORD_SWAP( "smbb.05b", 0x100000, 0x80000, CRC(41e0b3fc) SHA1(67fea6e194650c2a45cc0408ab1b0c2743ec6efa) )
+	ROM_LOAD16_WORD_SWAP( "smbb.06b", 0x180000, 0x80000, CRC(89c80007) SHA1(4c85aa5b224fdbb64f719a7b8b5b2e7413107c70) )
+	ROM_LOAD16_WORD_SWAP( "smbb.07b", 0x200000, 0x80000, CRC(b9a11577) SHA1(e9b58ef8acd1fedd3c9e0a3489593c7e931106c0) )
+	ROM_LOAD16_WORD_SWAP( "smbb.08b", 0x280000, 0x80000, CRC(f931b76b) SHA1(0b7e8d1278dcba89f0063bd09cda96d6ae1bc282) )
+
+	ROM_REGION( 0x1200000, "gfx", 0 )
+	ROM_LOAD64_WORD( "smb.13m",   0x0000000, 0x200000, CRC(d9b2d1de) SHA1(e8658983070dadcd1300a680a42c8431579e2b4f) )
+	ROM_LOAD64_WORD( "smb.15m",   0x0000002, 0x200000, CRC(9a766d92) SHA1(afdf88afbec527268d63c11ea32f861b52e11489) )
+	ROM_LOAD64_WORD( "smb.17m",   0x0000004, 0x200000, CRC(51800f0f) SHA1(9526cd69a23340a81841271b51de03d9bf2b979f) )
+	ROM_LOAD64_WORD( "smb.19m",   0x0000006, 0x200000, CRC(35757e96) SHA1(c915f3b9e4fdec3defc7eecb2c1f7377e6072228) )
+	ROM_LOAD64_WORD( "smb.14m",   0x0800000, 0x200000, CRC(e5bfd0e7) SHA1(327e626df4c2152f921f15535c01dda6c4437527) )
+	ROM_LOAD64_WORD( "smb.16m",   0x0800002, 0x200000, CRC(c56c0866) SHA1(1e2218e852ae72a9a95861dd37129fe78d4b1329) )
+	ROM_LOAD64_WORD( "smb.18m",   0x0800004, 0x200000, CRC(4ded3910) SHA1(d883541ce4d83f4e7ab095f2ef273408d9911f9a) )
+	ROM_LOAD64_WORD( "smb.20m",   0x0800006, 0x200000, CRC(26ea1ec5) SHA1(22be249b1f73272feacf4026f09fc877f5d86353) )
+	ROM_LOAD64_WORD( "smb.21m",   0x1000000, 0x080000, CRC(0a08c5fc) SHA1(ff3fad4fbc98e3013291c7ba7ee5e057a2628b36) )
+	ROM_LOAD64_WORD( "smb.23m",   0x1000002, 0x080000, CRC(0911b6c4) SHA1(e7a7061b192658724d98cae8693f63dd5bc40c00) )
+	ROM_LOAD64_WORD( "smb.25m",   0x1000004, 0x080000, CRC(82d6c4ec) SHA1(ed8ed02a00f59a048b9891ec2a77720bb6a5e03d) )
+	ROM_LOAD64_WORD( "smb.27m",   0x1000006, 0x080000, CRC(9b48678b) SHA1(4fa300d356c538947983ae85bb5c5cfd1fb835e7) )
+
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
+	ROM_LOAD( "smb.01",   0x00000, 0x08000, CRC(0abc229a) SHA1(967f574e6358dfc1b01e6a4a4df1a8f34eb3d814) )
+	ROM_CONTINUE(         0x10000, 0x18000 )
+	ROM_LOAD( "smb.02",   0x28000, 0x20000, CRC(d051679a) SHA1(583c2521a30db1740d95dd94a38751fbeff3aae5) )
+
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "smb.11m",   0x000000, 0x200000, CRC(c56935f9) SHA1(ca1705e48e31ddc13505e6297bceca2bec1bb209) )
+	ROM_LOAD16_WORD_SWAP( "smb.12m",   0x200000, 0x200000, CRC(955b0782) SHA1(ee09500e7b44e923126533613bfe26cdabc7ab5f) )
+
+	ROM_REGION( 0x20, "key", 0 )
+	ROM_LOAD( "ringdesth.key", 0x000000, 0x000014, CRC(ffb8d049) SHA1(c6d111412c3960b24a1be5c49fe4ec4d17324e06) ) /* Brazilian set, but still uses the Hispanic key */
+ROM_END
+
 ROM_START( mmancp2u )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "rcmu.03b", 0x000000, 0x80000, CRC(c39f037f) SHA1(eefc5aa0fde322c6f895a37399424060c702a459) )
 	ROM_LOAD16_WORD_SWAP( "rcmu.04b", 0x080000, 0x80000, CRC(cd6f5e99) SHA1(46d5298bdf7dd3ccfe5d491c61f3c2e2da011e3b) )
 	ROM_LOAD16_WORD_SWAP( "rcm.05b",  0x100000, 0x80000, CRC(4376ea95) SHA1(7370ceffca513aa9f68a74f6869d561476589200) ) // == rcma_21a.rom from CPS1 version
@@ -6182,11 +6255,11 @@
 	ROM_LOAD64_WORD( "rcm.86",   0xe00004, 0x080000, CRC(6d974ebd) SHA1(41de66481a64fa8a6471c512fc5dcaf96d95ee69) )
 	ROM_LOAD64_WORD( "rcm.96",   0xe00006, 0x080000, CRC(7da4cd24) SHA1(dd44377ff9f83f15cac032c4e7ef2071adcfa196) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "rcm.01",   0x00000, 0x08000, CRC(d60cf8a3) SHA1(dccd84b93e62489c703011422d0fe84444c7f7db) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "rcm.51",   0x000000, 0x80000, CRC(b6d07080) SHA1(b8f07553c01b1f67b0696110cd4e35e4cf4fa158) )
 	ROM_LOAD16_WORD_SWAP( "rcm.52",   0x080000, 0x80000, CRC(dfddc493) SHA1(56b5129f24d05d2c85a767b0a632bf260f5425b2) )
 	ROM_LOAD16_WORD_SWAP( "rcm.53",   0x100000, 0x80000, CRC(6062ae3a) SHA1(28a4d59bce0c341c240ee8cc92f85850ea8ffb10) )
@@ -6201,7 +6274,7 @@
 ROM_END
 
 ROM_START( mmancp2ur1 )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "rcmu.03a", 0x000000, 0x80000, CRC(c6b75320) SHA1(652aa5cf916fa50ce5e4023cebc234fbf404cd01) )
 	ROM_LOAD16_WORD_SWAP( "rcmu.04a", 0x080000, 0x80000, CRC(47880111) SHA1(893da977b3b1153646a524b106407c43ef8209c8) )
 	ROM_LOAD16_WORD_SWAP( "rcmu.05a", 0x100000, 0x80000, CRC(4376ea95) SHA1(7370ceffca513aa9f68a74f6869d561476589200) )
@@ -6225,11 +6298,11 @@
 	ROM_LOAD64_WORD( "rcm.86",   0xe00004, 0x080000, CRC(6d974ebd) SHA1(41de66481a64fa8a6471c512fc5dcaf96d95ee69) )
 	ROM_LOAD64_WORD( "rcm.96",   0xe00006, 0x080000, CRC(7da4cd24) SHA1(dd44377ff9f83f15cac032c4e7ef2071adcfa196) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "rcm.01",   0x00000, 0x08000, CRC(d60cf8a3) SHA1(dccd84b93e62489c703011422d0fe84444c7f7db) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "rcm.51",   0x000000, 0x80000, CRC(b6d07080) SHA1(b8f07553c01b1f67b0696110cd4e35e4cf4fa158) )
 	ROM_LOAD16_WORD_SWAP( "rcm.52",   0x080000, 0x80000, CRC(dfddc493) SHA1(56b5129f24d05d2c85a767b0a632bf260f5425b2) )
 	ROM_LOAD16_WORD_SWAP( "rcm.53",   0x100000, 0x80000, CRC(6062ae3a) SHA1(28a4d59bce0c341c240ee8cc92f85850ea8ffb10) )
@@ -6245,7 +6318,7 @@
 
 
 ROM_START( rmancp2j )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "rcmj.03a", 0x000000, 0x80000, CRC(30559f60) SHA1(7a7c7c00613e379317383d68cac47dfbbb2200c9) )
 	ROM_LOAD16_WORD_SWAP( "rcmj.04a", 0x080000, 0x80000, CRC(5efc9366) SHA1(33420ac6ccf3c4982ce7644c574414574f706bd3) )
 	ROM_LOAD16_WORD_SWAP( "rcm.05a", 0x100000, 0x80000, CRC(517ccde2) SHA1(492256c192f0c4814efa1ee1dd390453dd2e5865) )
@@ -6269,11 +6342,11 @@
 	ROM_LOAD64_WORD( "rcm.86",   0xe00004, 0x080000, CRC(6d974ebd) SHA1(41de66481a64fa8a6471c512fc5dcaf96d95ee69) )
 	ROM_LOAD64_WORD( "rcm.96",   0xe00006, 0x080000, CRC(7da4cd24) SHA1(dd44377ff9f83f15cac032c4e7ef2071adcfa196) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "rcm.01",   0x00000, 0x08000, CRC(d60cf8a3) SHA1(dccd84b93e62489c703011422d0fe84444c7f7db) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "rcm.51",   0x000000, 0x80000, CRC(b6d07080) SHA1(b8f07553c01b1f67b0696110cd4e35e4cf4fa158) )
 	ROM_LOAD16_WORD_SWAP( "rcm.52",   0x080000, 0x80000, CRC(dfddc493) SHA1(56b5129f24d05d2c85a767b0a632bf260f5425b2) )
 	ROM_LOAD16_WORD_SWAP( "rcm.53",   0x100000, 0x80000, CRC(6062ae3a) SHA1(28a4d59bce0c341c240ee8cc92f85850ea8ffb10) )
@@ -6288,7 +6361,7 @@
 ROM_END
 
 ROM_START( sfa )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfze.03d", 0x000000, 0x80000, CRC(ebf2054d) SHA1(6e7b9e4202b86ab237ea5634c98b71b82d812ef2) )
 	ROM_LOAD16_WORD_SWAP( "sfz.04b",  0x080000, 0x80000, CRC(8b73b0e5) SHA1(5318761f615c21395366b5333e75eaaa73ef2073) ) // also found as sfze.04c, same hash
 	ROM_LOAD16_WORD_SWAP( "sfz.05a",  0x100000, 0x80000, CRC(0810544d) SHA1(5f39bda3e7b16508eb58e5a2e0cc58c09cf428ce) ) // also found as sfze.05b, same hash
@@ -6301,12 +6374,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6315,7 +6388,7 @@
 ROM_END
 
 ROM_START( sfar1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfze.03c", 0x000000, 0x80000, CRC(a1b69dd7) SHA1(b41440eba8f33eed955c987a04d99fca6c5c90e5) )  // Rom name dosnt appear to follow normal capcom naming system and was written on rom by hand
 	ROM_LOAD16_WORD_SWAP( "sfze.04b", 0x080000, 0x80000, CRC(bb90acd5) SHA1(a19795963b90f1152f44cae29e78dd2ce67a41d6) )  // Rom name dosnt appear to follow normal capcom naming system and was written on rom by hand
 	ROM_LOAD16_WORD_SWAP( "sfz.05a",  0x100000, 0x80000, CRC(0810544d) SHA1(5f39bda3e7b16508eb58e5a2e0cc58c09cf428ce) )
@@ -6328,12 +6401,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6342,7 +6415,7 @@
 ROM_END
 
 ROM_START( sfar2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfze.03b", 0x000000, 0x80000, CRC(2bf5708e) SHA1(6ce55082e0befef47f25b4be76c607d79ec0828c) )  // Rom name dosnt appear to follow normal capcom naming system and was written on rom by hand
 	ROM_LOAD16_WORD_SWAP( "sfz.04a",  0x080000, 0x80000, CRC(5f99e9a5) SHA1(e9f286315d17096adc08e6b4e6ff7c5351f5bef3) )
 	ROM_LOAD16_WORD_SWAP( "sfz.05a",  0x100000, 0x80000, CRC(0810544d) SHA1(5f39bda3e7b16508eb58e5a2e0cc58c09cf428ce) )
@@ -6355,12 +6428,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6369,7 +6442,7 @@
 ROM_END
 
 ROM_START( sfar3 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfze.03a", 0x000000, 0x80000, CRC(fdbcd434) SHA1(1d5f9b821d9e0d45be61896969500b877a112fad) )
 	ROM_LOAD16_WORD_SWAP( "sfz.04",   0x080000, 0x80000, CRC(0c436d30) SHA1(84229896c99bb2a4fbbab33644f779c9f86704fb) )
 	ROM_LOAD16_WORD_SWAP( "sfz.05",   0x100000, 0x80000, CRC(1f363612) SHA1(87203b5db2d3887762da431d6fc2f2b76d4feedb) )
@@ -6382,12 +6455,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6396,7 +6469,7 @@
 ROM_END
 
 ROM_START( sfau )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfzu.03a", 0x000000, 0x80000, CRC(49fc7db9) SHA1(2a13d987fade88e0372f418cf451f34de67372d5) ) // If there's a US 950605 then this should be sfzu.03b
 	ROM_LOAD16_WORD_SWAP( "sfz.04a",  0x080000, 0x80000, CRC(5f99e9a5) SHA1(e9f286315d17096adc08e6b4e6ff7c5351f5bef3) )
 	ROM_LOAD16_WORD_SWAP( "sfz.05a",  0x100000, 0x80000, CRC(0810544d) SHA1(5f39bda3e7b16508eb58e5a2e0cc58c09cf428ce) )
@@ -6409,12 +6482,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6423,7 +6496,7 @@
 ROM_END
 
 ROM_START( sfza )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfza.03b", 0x000000, 0x80000, CRC(ca91bed9) SHA1(af238a4a1b87fa09ae7da7e0c41964c95dae6513) )
 	ROM_LOAD16_WORD_SWAP( "sfz.04a",  0x080000, 0x80000, CRC(5f99e9a5) SHA1(e9f286315d17096adc08e6b4e6ff7c5351f5bef3) )
 	ROM_LOAD16_WORD_SWAP( "sfz.05a",  0x100000, 0x80000, CRC(0810544d) SHA1(5f39bda3e7b16508eb58e5a2e0cc58c09cf428ce) )
@@ -6436,12 +6509,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6450,7 +6523,7 @@
 ROM_END
 
 ROM_START( sfzar1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfza.03a", 0x000000, 0x80000, CRC(f38d8c8d) SHA1(06770ea1944da5867483e647a306591be454d25e) )
 	ROM_LOAD16_WORD_SWAP( "sfz.04",   0x080000, 0x80000, CRC(0c436d30) SHA1(84229896c99bb2a4fbbab33644f779c9f86704fb) )
 	ROM_LOAD16_WORD_SWAP( "sfz.05",   0x100000, 0x80000, CRC(1f363612) SHA1(87203b5db2d3887762da431d6fc2f2b76d4feedb) )
@@ -6463,12 +6536,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6477,7 +6550,7 @@
 ROM_END
 
 ROM_START( sfzj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfzj.03c", 0x000000, 0x80000, CRC(f5444120) SHA1(22158894971754ad83b8eeb8bdfb9874794b98c0) )
 	ROM_LOAD16_WORD_SWAP( "sfz.04b",  0x080000, 0x80000, CRC(8b73b0e5) SHA1(5318761f615c21395366b5333e75eaaa73ef2073) )
 	ROM_LOAD16_WORD_SWAP( "sfz.05a",  0x100000, 0x80000, CRC(0810544d) SHA1(5f39bda3e7b16508eb58e5a2e0cc58c09cf428ce) )
@@ -6490,12 +6563,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6504,7 +6577,7 @@
 ROM_END
 
 ROM_START( sfzjr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfzj.03b", 0x000000, 0x80000, CRC(844220c2) SHA1(ff295207e0f9679285d805aa494537ae7daf1634) )
 	ROM_LOAD16_WORD_SWAP( "sfz.04a",  0x080000, 0x80000, CRC(5f99e9a5) SHA1(e9f286315d17096adc08e6b4e6ff7c5351f5bef3) )
 	ROM_LOAD16_WORD_SWAP( "sfz.05a",  0x100000, 0x80000, CRC(0810544d) SHA1(5f39bda3e7b16508eb58e5a2e0cc58c09cf428ce) )
@@ -6517,12 +6590,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6531,7 +6604,7 @@
 ROM_END
 
 ROM_START( sfzjr2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfzj.03a", 0x000000, 0x80000, CRC(3cfce93c) SHA1(5f64e9707cb3d911f44e041d980e4b2250f49d75) )
 	ROM_LOAD16_WORD_SWAP( "sfz.04",   0x080000, 0x80000, CRC(0c436d30) SHA1(84229896c99bb2a4fbbab33644f779c9f86704fb) )
 	ROM_LOAD16_WORD_SWAP( "sfz.05",   0x100000, 0x80000, CRC(1f363612) SHA1(87203b5db2d3887762da431d6fc2f2b76d4feedb) )
@@ -6544,12 +6617,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6558,7 +6631,7 @@
 ROM_END
 
 ROM_START( sfzh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfzh.03d", 0x000000, 0x80000, CRC(6e08cbe0) SHA1(c9d0e709004677b51efe0b62e0ae9b681dde1744) )
 	ROM_LOAD16_WORD_SWAP( "sfz.04c",  0x080000, 0x80000, CRC(bb90acd5) SHA1(a19795963b90f1152f44cae29e78dd2ce67a41d6) )
 	ROM_LOAD16_WORD_SWAP( "sfz.05c",  0x100000, 0x80000, CRC(0810544d) SHA1(5f39bda3e7b16508eb58e5a2e0cc58c09cf428ce) ) /* Same as revision "A" below */
@@ -6571,12 +6644,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6585,7 +6658,7 @@
 ROM_END
 
 ROM_START( sfzhr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfzh.03c", 0x000000, 0x80000, CRC(bce635aa) SHA1(323da2de6c3ff6fd8c2c66ce6bd1d287873db9b1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.04a",  0x080000, 0x80000, CRC(5f99e9a5) SHA1(e9f286315d17096adc08e6b4e6ff7c5351f5bef3) )
 	ROM_LOAD16_WORD_SWAP( "sfz.05a",  0x100000, 0x80000, CRC(0810544d) SHA1(5f39bda3e7b16508eb58e5a2e0cc58c09cf428ce) )
@@ -6598,12 +6671,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6612,7 +6685,7 @@
 ROM_END
 
 ROM_START( sfzb )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfzb.03g", 0x000000, 0x80000, CRC(348862d4) SHA1(b48c7df17f8b681fc726931dbf81f5aeb762a5b3) )
 	ROM_LOAD16_WORD_SWAP( "sfzb.04e", 0x080000, 0x80000, CRC(8d9b2480) SHA1(405305c1572908d00eab735f28676fbbadb4fac6) )
 	ROM_LOAD16_WORD_SWAP( "sfz.05a", 0x100000,  0x80000, CRC(0810544d) SHA1(5f39bda3e7b16508eb58e5a2e0cc58c09cf428ce) )
@@ -6625,12 +6698,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6639,7 +6712,7 @@
 ROM_END
 
 ROM_START( sfzbr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfzb.03e", 0x000000, 0x80000, CRC(ecba89a3) SHA1(5a3d7a978b6dc1f334eddf8e065318d60501f223) )
 	ROM_LOAD16_WORD_SWAP( "sfz.04b",  0x080000, 0x80000, CRC(8b73b0e5) SHA1(5318761f615c21395366b5333e75eaaa73ef2073) )
 	ROM_LOAD16_WORD_SWAP( "sfz.05a", 0x100000,  0x80000, CRC(0810544d) SHA1(5f39bda3e7b16508eb58e5a2e0cc58c09cf428ce) )
@@ -6652,12 +6725,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",  0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",  0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",   0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",   0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -6666,7 +6739,7 @@
 ROM_END
 
 ROM_START( sfa2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz2e.03", 0x000000, 0x80000, CRC(1061e6bb) SHA1(f9b05e5cbcb1dc874de6874b01058defd6e4c407) )
 	ROM_LOAD16_WORD_SWAP( "sz2e.04", 0x080000, 0x80000, CRC(22d17b26) SHA1(2d7a9cedae1bb2b7cfb80d2bfcf24cb7738df0bf) )
 	ROM_LOAD16_WORD_SWAP( "sz2.05",  0x100000, 0x80000, CRC(4b442a7c) SHA1(a0d7d229cff8efb2a253ff06270258b0b4d2761e) )
@@ -6684,12 +6757,12 @@
 	ROM_LOAD64_WORD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -6698,7 +6771,7 @@
 ROM_END
 
 ROM_START( sfa2u )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz2u.03a", 0x000000, 0x80000, CRC(d03e504f) SHA1(14173d650ca4ca7f53e6dab76bac6e2724ff3d9d) )
 	ROM_LOAD16_WORD_SWAP( "sz2u.04a", 0x080000, 0x80000, CRC(fae0e9c3) SHA1(d84cfbf16079f9987df683911b83896b80b52b1a) )
 	ROM_LOAD16_WORD_SWAP( "sz2u.05a", 0x100000, 0x80000, CRC(d02dd758) SHA1(581bcd451b1d081b9b73d4a1b485da9f29756613) )
@@ -6716,12 +6789,12 @@
 	ROM_LOAD64_WORD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -6730,7 +6803,7 @@
 ROM_END
 
 ROM_START( sfa2ur1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz2u.03", 0x000000, 0x80000, CRC(84a09006) SHA1(334c33f9eb324d71443cc9c44e94f5a72451fa3f) )
 	ROM_LOAD16_WORD_SWAP( "sz2u.04", 0x080000, 0x80000, CRC(ac46e5ed) SHA1(a01b57daba4c255d5f07465c553bcbfe51d9ab0d) )
 	ROM_LOAD16_WORD_SWAP( "sz2u.05", 0x100000, 0x80000, CRC(6c0c79d3) SHA1(ae2a4e2903beec1f10fff6edac1a2385d6ac1c38) )
@@ -6748,12 +6821,12 @@
 	ROM_LOAD64_WORD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -6762,7 +6835,7 @@
 ROM_END
 
 ROM_START( sfz2j )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz2j.03b", 0x000000, 0x80000, CRC(3e1e2e85) SHA1(11447b08803d6bf7aeca7aa348b817bd6d448fe8) )
 	ROM_LOAD16_WORD_SWAP( "sz2j.04b", 0x080000, 0x80000, CRC(f53d6c45) SHA1(674c06b2775834887db3b7705941feea7367f500) )
 	ROM_LOAD16_WORD_SWAP( "sz2j.05b", 0x100000, 0x80000, CRC(dd224156) SHA1(85d29f2a288430d51c53b88130f255131e5dc601) )
@@ -6780,12 +6853,12 @@
 	ROM_LOAD64_WORD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -6794,7 +6867,7 @@
 ROM_END
 
 ROM_START( sfz2jr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz2j.03a", 0x000000, 0x80000, CRC(97461e28) SHA1(8fbe4c9a59f51612f86adb8ef5057e43be0348bf) )
 	ROM_LOAD16_WORD_SWAP( "sz2j.04a", 0x080000, 0x80000, CRC(ae4851a9) SHA1(4771bc22fe1b376b753a68506c012c52bd4b886d) )
 	ROM_LOAD16_WORD_SWAP( "sz2.05a",  0x100000, 0x80000, CRC(98e8e992) SHA1(41745b63e6b3888081d189b8315ed3b7526b3d20) )
@@ -6812,12 +6885,12 @@
 	ROM_LOAD64_WORD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -6826,7 +6899,7 @@
 ROM_END
 
 ROM_START( sfz2a )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz2a.03a", 0x000000, 0x80000, CRC(30d2099f) SHA1(d4c7d8c2ad08cae228544bd692aedecd4fab829c) )
 	ROM_LOAD16_WORD_SWAP( "sz2a.04a", 0x080000, 0x80000, CRC(1cc94db1) SHA1(518151f443ff5219b20c9fd59b7614920302aecd) )
 	ROM_LOAD16_WORD_SWAP( "sz2.05a",  0x100000, 0x80000, CRC(98e8e992) SHA1(41745b63e6b3888081d189b8315ed3b7526b3d20) )
@@ -6844,12 +6917,12 @@
 	ROM_LOAD64_WORD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -6858,7 +6931,7 @@
 ROM_END
 
 ROM_START( sfz2b )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz2b.03b", 0x000000, 0x80000, CRC(1ac12812) SHA1(b948b939021ffe20437b19325fe94daa072c1271) )
 	ROM_LOAD16_WORD_SWAP( "sz2b.04b", 0x080000, 0x80000, CRC(e4ffaf68) SHA1(e22bb4f92a965108570c2beee1fd533380838d90) )
 	ROM_LOAD16_WORD_SWAP( "sz2b.05a", 0x100000, 0x80000, CRC(dd224156) SHA1(85d29f2a288430d51c53b88130f255131e5dc601) )
@@ -6876,12 +6949,12 @@
 	ROM_LOAD64_WORD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -6890,7 +6963,7 @@
 ROM_END
 
 ROM_START( sfz2br1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz2b.03", 0x000000, 0x80000, CRC(e6ce530b) SHA1(044c3f6f6c64d18f4f9ce96b67ff86b3c8bcd065) )
 	ROM_LOAD16_WORD_SWAP( "sz2b.04", 0x080000, 0x80000, CRC(1605a0cb) SHA1(5041c87dbb3ed41fe1cb3e9eade195bc2f7cba2a) )
 	ROM_LOAD16_WORD_SWAP( "sz2.05",  0x100000, 0x80000, CRC(4b442a7c) SHA1(a0d7d229cff8efb2a253ff06270258b0b4d2761e) )
@@ -6908,12 +6981,12 @@
 	ROM_LOAD64_WORD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -6922,7 +6995,7 @@
 ROM_END
 
 ROM_START( sfz2h )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz2h.03", 0x000000, 0x80000, CRC(bfeddf5b) SHA1(dd4a748ba8674725a399b78e721ff9c7adaaf890) )
 	ROM_LOAD16_WORD_SWAP( "sz2h.04", 0x080000, 0x80000, CRC(ea5009fb) SHA1(9186c702994f99488d52d4dbccb3823d2b9a6dd9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.05",  0x100000, 0x80000, CRC(4b442a7c) SHA1(a0d7d229cff8efb2a253ff06270258b0b4d2761e) )
@@ -6940,12 +7013,12 @@
 	ROM_LOAD64_WORD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -6954,7 +7027,7 @@
 ROM_END
 
 ROM_START( sfz2n )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz2n.03", 0x000000, 0x80000, CRC(58924741) SHA1(b077867a6a601b5f87a644ebfe9b8d0c87d0471f) )
 	ROM_LOAD16_WORD_SWAP( "sz2n.04", 0x080000, 0x80000, CRC(592a17c5) SHA1(7262f9017834e932858e81dadfba9d9feb946530) )
 	ROM_LOAD16_WORD_SWAP( "sz2.05",  0x100000, 0x80000, CRC(4b442a7c) SHA1(a0d7d229cff8efb2a253ff06270258b0b4d2761e) )
@@ -6972,12 +7045,12 @@
 	ROM_LOAD64_WORD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -6986,7 +7059,7 @@
 ROM_END
 
 ROM_START( sfz2al )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "szaa.03", 0x000000, 0x80000, CRC(88e7023e) SHA1(34e74ec54c05d75e5cf207abb6e536fcca233b8b) )
 	ROM_LOAD16_WORD_SWAP( "szaa.04", 0x080000, 0x80000, CRC(ae8ec36e) SHA1(b2f3de9e33169f6266aaabd5eae6c057ea10dcab) )
 	ROM_LOAD16_WORD_SWAP( "szaa.05", 0x100000, 0x80000, CRC(f053a55e) SHA1(f98a8af5cd33a543a5596d59381f9adafed38854) )
@@ -7004,12 +7077,12 @@
 	ROM_LOAD64_WORD( "sza.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sza.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sza.01",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sza.02",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sza.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sza.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -7018,7 +7091,7 @@
 ROM_END
 
 ROM_START( sfz2alj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "szaj.03a", 0x000000, 0x80000, CRC(a3802fe3) SHA1(c983a15ed675b22aebfe6ac55890b4e0b5eb8d48) )
 	ROM_LOAD16_WORD_SWAP( "szaj.04a", 0x080000, 0x80000, CRC(e7ca87c7) SHA1(e44c930b27431dd2b983d93471a440d292e7a8bb) )
 	ROM_LOAD16_WORD_SWAP( "szaj.05a", 0x100000, 0x80000, CRC(c88ebf88) SHA1(e37cf232fc70b9a3254dea99754e288232f04e25) )
@@ -7036,12 +7109,12 @@
 	ROM_LOAD64_WORD( "sza.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sza.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sza.01",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sza.02",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sza.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sza.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -7050,7 +7123,7 @@
 ROM_END
 
 ROM_START( sfz2alh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "szah.03", 0x000000, 0x80000, CRC(06f93d1d) SHA1(495de176ba55b35270fc05f19edf17a0f249ff0e) )
 	ROM_LOAD16_WORD_SWAP( "szah.04", 0x080000, 0x80000, CRC(e62ee914) SHA1(def4f27c1b64be5143234f1f402260adae66cdde) )
 	ROM_LOAD16_WORD_SWAP( "szah.05", 0x100000, 0x80000, CRC(2b7f4b20) SHA1(5511263f5f6e532ee7fe1995f08f16651a1d45a1) )
@@ -7068,12 +7141,12 @@
 	ROM_LOAD64_WORD( "sza.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sza.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sza.01",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sza.02",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sza.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sza.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -7082,7 +7155,7 @@
 ROM_END
 
 ROM_START( sfz2alb )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "szab.03", 0x000000, 0x80000, CRC(cb436eca) SHA1(406bea614429f78c0150c2f5042abc8673a6722e) )
 	ROM_LOAD16_WORD_SWAP( "szab.04", 0x080000, 0x80000, CRC(14534bea) SHA1(8fff2cd9221ef12de9364cc15429b6df6bacc48e) )
 	ROM_LOAD16_WORD_SWAP( "szab.05", 0x100000, 0x80000, CRC(7fb10658) SHA1(f9eba0271d92d6d29156a7b4dd8b1cdb3dd8aa48) )
@@ -7100,12 +7173,12 @@
 	ROM_LOAD64_WORD( "sza.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sza.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sza.01",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sza.02",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sza.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sza.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -7114,7 +7187,7 @@
 ROM_END
 
 ROM_START( sfa3 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3e.03c", 0x000000, 0x80000, CRC(9762b206) SHA1(fc4561ca990dd11ed2c5203540102078b721db2f) )
 	ROM_LOAD16_WORD_SWAP( "sz3e.04c", 0x080000, 0x80000, CRC(5ad3f721) SHA1(fec11cc5f63593f0181eb28ae85ad916686793eb) )
 	ROM_LOAD16_WORD_SWAP( "sz3.05c",  0x100000, 0x80000, CRC(57fd0a40) SHA1(bc2d5f4d57117bbf58b1adb088e00424ef489e92) )
@@ -7134,12 +7207,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3.01",   0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3.02",   0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -7148,7 +7221,7 @@
 ROM_END
 
 ROM_START( sfa3u )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3u.03c", 0x000000, 0x80000, CRC(e007da2e) SHA1(d190ac7ca2c27f11b9b4f96860b226bbea0ee403) )
 	ROM_LOAD16_WORD_SWAP( "sz3u.04c", 0x080000, 0x80000, CRC(5f78f0e7) SHA1(f4df30fd3515fe9f1125f470b96028052c61f57b) )
 	ROM_LOAD16_WORD_SWAP( "sz3.05c",  0x100000, 0x80000, CRC(57fd0a40) SHA1(bc2d5f4d57117bbf58b1adb088e00424ef489e92) )
@@ -7168,12 +7241,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3.01",   0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3.02",   0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -7183,7 +7256,7 @@
 
 
 ROM_START( sfa3ur1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3u.03", 0x000000, 0x80000, CRC(b5984a19) SHA1(e225dd1d3a5d1b94adcfc5f720775e9ba321996e) )
 	ROM_LOAD16_WORD_SWAP( "sz3u.04", 0x080000, 0x80000, CRC(7e8158ba) SHA1(a9984d7c9d02a9ebaf98cfd0dcbcf26e82e904de) )
 	ROM_LOAD16_WORD_SWAP( "sz3.05",  0x100000, 0x80000, CRC(9b21518a) SHA1(5a928307cb90a98a62e7598cb101fb66d62b85f9) )
@@ -7203,12 +7276,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3.01",   0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3.02",   0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -7217,7 +7290,7 @@
 ROM_END
 
 ROM_START( sfa3us )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3-usam_03.6a", 0x000000, 0x80000, CRC(14319e29) SHA1(6de0c08f887d334d720d4c8ba7d5745f5282adfb) )
 	ROM_LOAD16_WORD_SWAP( "sz3-usam_04.7a", 0x080000, 0x80000, CRC(65fbc272) SHA1(d320a3c0dae03ea7c32cd521b99afb0e2d62dfaf) )
 	ROM_LOAD16_WORD_SWAP( "sz3-usam_05.8a",  0x100000, 0x80000, CRC(e93c47d1) SHA1(18c388e55b852ad46b784e0cf3fd4c72e8bb6850) )
@@ -7237,12 +7310,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3-usam_01.1a",   0x00000, 0x08000, CRC(c180947d) SHA1(829c8cf45029676acde369b890ac1b941981f750) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3-usam_02.2a",   0x28000, 0x20000, CRC(9ebc280f) SHA1(33fa0934c046eaae3c841d5be0bbdf7b190ef5e7) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -7251,7 +7324,7 @@
 ROM_END
 
 ROM_START( sfz3j )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3j.03c", 0x000000, 0x80000, CRC(cadf4a51) SHA1(a0511512f55c0befa4a905ceff8c6f5775cf40ba) )
 	ROM_LOAD16_WORD_SWAP( "sz3j.04c", 0x080000, 0x80000, CRC(fcb31228) SHA1(093f40083b5a4e4cae433d5856c48014063fe6ad) )
 	ROM_LOAD16_WORD_SWAP( "sz3.05c",  0x100000, 0x80000, CRC(57fd0a40) SHA1(bc2d5f4d57117bbf58b1adb088e00424ef489e92) )
@@ -7271,12 +7344,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3.01",   0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3.02",   0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -7285,7 +7358,7 @@
 ROM_END
 
 ROM_START( sfz3jr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3j.03a", 0x000000, 0x80000, CRC(6ee0beae) SHA1(243436fb64628f70cd130c7029d365ae97f3f42d) )
 	ROM_LOAD16_WORD_SWAP( "sz3j.04a", 0x080000, 0x80000, CRC(a6e2978d) SHA1(27e350e78aa204670c0ee6c60baddee46a92a584) )
 	ROM_LOAD16_WORD_SWAP( "sz3.05a",  0x100000, 0x80000, CRC(05964b7d) SHA1(ac9fa2c69c712a01647f0572381d875b1eb90886) )
@@ -7305,12 +7378,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3.01",   0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3.02",   0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -7319,7 +7392,7 @@
 ROM_END
 
 ROM_START( sfz3jr2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3j.03", 0x000000, 0x80000, CRC(f7cb4b13) SHA1(5f86d23cf3725d9440200732405b437545ac8dd7) )
 	ROM_LOAD16_WORD_SWAP( "sz3j.04", 0x080000, 0x80000, CRC(0846c29d) SHA1(f2e96b4f6e0187c382411276ff3a485cdc2df289) )
 	ROM_LOAD16_WORD_SWAP( "sz3.05",  0x100000, 0x80000, CRC(9b21518a) SHA1(5a928307cb90a98a62e7598cb101fb66d62b85f9) )
@@ -7339,12 +7412,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3.01",   0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3.02",   0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -7353,7 +7426,7 @@
 ROM_END
 
 ROM_START( sfz3a )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3a.03d", 0x000000, 0x80000, CRC(d7e140d6) SHA1(7eae4dc61432e1aaf73194377f787093379d53a9) )
 	ROM_LOAD16_WORD_SWAP( "sz3a.04d", 0x080000, 0x80000, CRC(e06869a2) SHA1(9442f7dda95d20c5eff549bfdd60b89eea5483a9) )
 	ROM_LOAD16_WORD_SWAP( "sz3.05c",  0x100000, 0x80000, CRC(57fd0a40) SHA1(bc2d5f4d57117bbf58b1adb088e00424ef489e92) )
@@ -7373,12 +7446,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3.01",   0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3.02",   0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -7387,7 +7460,7 @@
 ROM_END
 
 ROM_START( sfz3ar1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3a.03a", 0x000000, 0x80000, CRC(29c681fd) SHA1(5ee4c4e282789e4cdba5a317c7049e8c0d8b774b) )
 	ROM_LOAD16_WORD_SWAP( "sz3a.04",  0x080000, 0x80000, CRC(9ddd1484) SHA1(d484b93d1653f522ee33285e58139167b3214902) )
 	ROM_LOAD16_WORD_SWAP( "sz3.05",   0x100000, 0x80000, CRC(9b21518a) SHA1(5a928307cb90a98a62e7598cb101fb66d62b85f9) )
@@ -7407,12 +7480,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3.01",   0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3.02",   0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -7421,7 +7494,7 @@
 ROM_END
 
 ROM_START( sfa3h )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3h.03c", 0x000000, 0x80000, CRC(b3b563a3) SHA1(27863508fedeb5d85e78b8d64361f0000d00e0a5) )
 	ROM_LOAD16_WORD_SWAP( "sz3h.04c", 0x080000, 0x80000, CRC(47891fec) SHA1(c17421785a0f65edebb6abe54ff161ace4aa67e5) )
 	ROM_LOAD16_WORD_SWAP( "sz3.05c",  0x100000, 0x80000, CRC(57fd0a40) SHA1(bc2d5f4d57117bbf58b1adb088e00424ef489e92) )
@@ -7441,12 +7514,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3.01",   0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3.02",   0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -7455,7 +7528,7 @@
 ROM_END
 
 ROM_START( sfa3hr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3h.03", 0x000000, 0x80000, CRC(4b16cb3e) SHA1(2e1f45c9076ce231a545146d475f410397f20e27) )
 	ROM_LOAD16_WORD_SWAP( "sz3h.04", 0x080000, 0x80000, CRC(88ad2e6a) SHA1(2a1de667ebeffd247ab9ee11687813b3397fc8de) )
 	ROM_LOAD16_WORD_SWAP( "sz3.05",  0x100000, 0x80000, CRC(9b21518a) SHA1(5a928307cb90a98a62e7598cb101fb66d62b85f9) )
@@ -7475,12 +7548,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3.01",   0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3.02",   0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -7489,7 +7562,7 @@
 ROM_END
 
 ROM_START( sfa3b )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3b.03", 0x000000, 0x80000, CRC(046c9b4d) SHA1(aa2b19f2d4a9bab6e273635b43da7538025f9d77) )
 	ROM_LOAD16_WORD_SWAP( "sz3b.04", 0x080000, 0x80000, CRC(da211919) SHA1(bffeca36c9c78168f44e288ba34bb682a1626f8f) )
 	ROM_LOAD16_WORD_SWAP( "sz3.05",  0x100000, 0x80000, CRC(9b21518a) SHA1(5a928307cb90a98a62e7598cb101fb66d62b85f9) )
@@ -7509,12 +7582,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3.01",   0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3.02",   0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -7523,7 +7596,7 @@
 ROM_END
 
 ROM_START( sgemf )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pcfu.03", 0x000000, 0x80000, CRC(ac2e8566) SHA1(5975aae46bded231c0f478f40c7257434ade36b0) )
 	ROM_LOAD16_WORD_SWAP( "pcf.04",  0x080000, 0x80000, CRC(f4314c96) SHA1(c40ed74039bf0096eb3648b7243a8e697638e0a6) )
 	ROM_LOAD16_WORD_SWAP( "pcf.05",  0x100000, 0x80000, CRC(215655f6) SHA1(242c0f4401520f2a3b0deafc3a807b18b987e496) )
@@ -7540,12 +7613,12 @@
 	ROM_LOAD64_WORD( "pcf.18m",   0x1000004, 0x100000, CRC(756c3754) SHA1(be2f709b90222a567f198f851cf07ffb0ad433d7) )
 	ROM_LOAD64_WORD( "pcf.20m",   0x1000006, 0x100000, CRC(9ec9277d) SHA1(b7ceeaca30dfcdf498b61a6961f0aa1a068b8ec4) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pcf.01",   0x00000, 0x08000, CRC(254e5f33) SHA1(c413ec0630b9bdd15e64f42893eba8958a09b573) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pcf.02",   0x28000, 0x20000, CRC(6902f4f9) SHA1(9bfe4ddade3c666076d26a2b545120f6d059fd7c) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pcf.11m",   0x000000, 0x400000, CRC(a5dea005) SHA1(3ae79baf6ff5bd527f82b26f164c7e3c65423ae2) )
 	ROM_LOAD16_WORD_SWAP( "pcf.12m",   0x400000, 0x400000, CRC(4ce235fe) SHA1(795b94557e954cc0e45fd3778b609064d57a34a2) )
 
@@ -7554,7 +7627,7 @@
 ROM_END
 
 ROM_START( pfghtj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pcfj.03", 0x000000, 0x80000, CRC(681da43e) SHA1(1bd4b6b395ac7208c0208b254455276719e98c4b) )
 	ROM_LOAD16_WORD_SWAP( "pcf.04",  0x080000, 0x80000, CRC(f4314c96) SHA1(c40ed74039bf0096eb3648b7243a8e697638e0a6) )
 	ROM_LOAD16_WORD_SWAP( "pcf.05",  0x100000, 0x80000, CRC(215655f6) SHA1(242c0f4401520f2a3b0deafc3a807b18b987e496) )
@@ -7571,12 +7644,12 @@
 	ROM_LOAD64_WORD( "pcf.18m",   0x1000004, 0x100000, CRC(756c3754) SHA1(be2f709b90222a567f198f851cf07ffb0ad433d7) )
 	ROM_LOAD64_WORD( "pcf.20m",   0x1000006, 0x100000, CRC(9ec9277d) SHA1(b7ceeaca30dfcdf498b61a6961f0aa1a068b8ec4) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pcf.01",   0x00000, 0x08000, CRC(254e5f33) SHA1(c413ec0630b9bdd15e64f42893eba8958a09b573) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pcf.02",   0x28000, 0x20000, CRC(6902f4f9) SHA1(9bfe4ddade3c666076d26a2b545120f6d059fd7c) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pcf.11m",   0x000000, 0x400000, CRC(a5dea005) SHA1(3ae79baf6ff5bd527f82b26f164c7e3c65423ae2) )
 	ROM_LOAD16_WORD_SWAP( "pcf.12m",   0x400000, 0x400000, CRC(4ce235fe) SHA1(795b94557e954cc0e45fd3778b609064d57a34a2) )
 
@@ -7585,7 +7658,7 @@
 ROM_END
 
 ROM_START( sgemfa )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pcfa.03", 0x000000, 0x80000, CRC(e17c089a) SHA1(59529957aeb430df48a88414637e67848fdaaaca) )
 	ROM_LOAD16_WORD_SWAP( "pcf.04",  0x080000, 0x80000, CRC(f4314c96) SHA1(c40ed74039bf0096eb3648b7243a8e697638e0a6) )
 	ROM_LOAD16_WORD_SWAP( "pcf.05",  0x100000, 0x80000, CRC(215655f6) SHA1(242c0f4401520f2a3b0deafc3a807b18b987e496) )
@@ -7602,12 +7675,12 @@
 	ROM_LOAD64_WORD( "pcf.18m",   0x1000004, 0x100000, CRC(756c3754) SHA1(be2f709b90222a567f198f851cf07ffb0ad433d7) )
 	ROM_LOAD64_WORD( "pcf.20m",   0x1000006, 0x100000, CRC(9ec9277d) SHA1(b7ceeaca30dfcdf498b61a6961f0aa1a068b8ec4) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pcf.01",   0x00000, 0x08000, CRC(254e5f33) SHA1(c413ec0630b9bdd15e64f42893eba8958a09b573) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pcf.02",   0x28000, 0x20000, CRC(6902f4f9) SHA1(9bfe4ddade3c666076d26a2b545120f6d059fd7c) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pcf.11m",   0x000000, 0x400000, CRC(a5dea005) SHA1(3ae79baf6ff5bd527f82b26f164c7e3c65423ae2) )
 	ROM_LOAD16_WORD_SWAP( "pcf.12m",   0x400000, 0x400000, CRC(4ce235fe) SHA1(795b94557e954cc0e45fd3778b609064d57a34a2) )
 
@@ -7616,7 +7689,7 @@
 ROM_END
 
 ROM_START( sgemfh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pcfh.03", 0x000000, 0x80000, CRC(e9103347) SHA1(7a32a151146a15bf5fb5ed993fee2f616077a58c) )
 	ROM_LOAD16_WORD_SWAP( "pcf.04",  0x080000, 0x80000, CRC(f4314c96) SHA1(c40ed74039bf0096eb3648b7243a8e697638e0a6) )
 	ROM_LOAD16_WORD_SWAP( "pcf.05",  0x100000, 0x80000, CRC(215655f6) SHA1(242c0f4401520f2a3b0deafc3a807b18b987e496) )
@@ -7633,12 +7706,12 @@
 	ROM_LOAD64_WORD( "pcf.18m",   0x1000004, 0x100000, CRC(756c3754) SHA1(be2f709b90222a567f198f851cf07ffb0ad433d7) )
 	ROM_LOAD64_WORD( "pcf.20m",   0x1000006, 0x100000, CRC(9ec9277d) SHA1(b7ceeaca30dfcdf498b61a6961f0aa1a068b8ec4) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pcf.01",   0x00000, 0x08000, CRC(254e5f33) SHA1(c413ec0630b9bdd15e64f42893eba8958a09b573) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pcf.02",   0x28000, 0x20000, CRC(6902f4f9) SHA1(9bfe4ddade3c666076d26a2b545120f6d059fd7c) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pcf.11m",   0x000000, 0x400000, CRC(a5dea005) SHA1(3ae79baf6ff5bd527f82b26f164c7e3c65423ae2) )
 	ROM_LOAD16_WORD_SWAP( "pcf.12m",   0x400000, 0x400000, CRC(4ce235fe) SHA1(795b94557e954cc0e45fd3778b609064d57a34a2) )
 
@@ -7647,7 +7720,7 @@
 ROM_END
 
 ROM_START( spf2t )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pzfe.03", 0x000000, 0x80000, CRC(2af51954) SHA1(51f8797918391e772cf3cc27074ed6ca419806bd) )
 	ROM_LOAD16_WORD_SWAP( "pzf.04",  0x080000, 0x80000, CRC(b80649e2) SHA1(5bfccd656aea7ff82e9a20bb5856f4ab99b5a007) ) // marked pzfe.04 but same as pzf.04
 
@@ -7658,12 +7731,12 @@
 	ROM_LOAD64_WORD( "pzf.18m", 0x800004, 0x100000, CRC(e43aac33) SHA1(d041e0688c3807d3363861a7f216de43b34d846c) )
 	ROM_LOAD64_WORD( "pzf.20m", 0x800006, 0x100000, CRC(7f536ff1) SHA1(905b9d62ef7bef47297c7f4a4dd697aed6df38a5) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pzf.01",   0x00000, 0x08000, CRC(600fb2a3) SHA1(1fab1c2a23bf6ad8309d29ddbbc29435a8aeea13) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pzf.02",   0x28000, 0x20000, CRC(496076e0) SHA1(1ee4e135140afd0e8e03231e570cd77d140f6367) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pzf.11m",   0x000000, 0x200000, CRC(78442743) SHA1(b61190bb586871de6d54af580e3e1d9cc0de0acb) )
 	ROM_LOAD16_WORD_SWAP( "pzf.12m",   0x200000, 0x200000, CRC(399d2c7b) SHA1(e849dea97b8d16540415c0d9bbc4f9f4eb755ec4) )
 
@@ -7672,7 +7745,7 @@
 ROM_END
 
 ROM_START( spf2tu )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pzfu.03a", 0x000000, 0x80000, CRC(346e62ef) SHA1(9db5ea0aac2d459be957f8b6e2e0d18421587d4d) )
 	ROM_LOAD16_WORD_SWAP( "pzf.04",   0x080000, 0x80000, CRC(b80649e2) SHA1(5bfccd656aea7ff82e9a20bb5856f4ab99b5a007) )
 
@@ -7683,12 +7756,12 @@
 	ROM_LOAD64_WORD( "pzf.18m", 0x800004, 0x100000, CRC(e43aac33) SHA1(d041e0688c3807d3363861a7f216de43b34d846c) )
 	ROM_LOAD64_WORD( "pzf.20m", 0x800006, 0x100000, CRC(7f536ff1) SHA1(905b9d62ef7bef47297c7f4a4dd697aed6df38a5) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pzf.01",   0x00000, 0x08000, CRC(600fb2a3) SHA1(1fab1c2a23bf6ad8309d29ddbbc29435a8aeea13) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pzf.02",   0x28000, 0x20000, CRC(496076e0) SHA1(1ee4e135140afd0e8e03231e570cd77d140f6367) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pzf.11m",   0x000000, 0x200000, CRC(78442743) SHA1(b61190bb586871de6d54af580e3e1d9cc0de0acb) )
 	ROM_LOAD16_WORD_SWAP( "pzf.12m",   0x200000, 0x200000, CRC(399d2c7b) SHA1(e849dea97b8d16540415c0d9bbc4f9f4eb755ec4) )
 
@@ -7698,7 +7771,7 @@
 
 
 ROM_START( spf2xj )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pzfj.03a", 0x000000, 0x80000, CRC(2070554a) SHA1(fa818e6bd2e11667345d3d8f2397b60802ef72f9) )
 	ROM_LOAD16_WORD_SWAP( "pzf.04",   0x080000, 0x80000, CRC(b80649e2) SHA1(5bfccd656aea7ff82e9a20bb5856f4ab99b5a007) )
 
@@ -7709,12 +7782,12 @@
 	ROM_LOAD64_WORD( "pzf.18m", 0x800004, 0x100000, CRC(e43aac33) SHA1(d041e0688c3807d3363861a7f216de43b34d846c) )
 	ROM_LOAD64_WORD( "pzf.20m", 0x800006, 0x100000, CRC(7f536ff1) SHA1(905b9d62ef7bef47297c7f4a4dd697aed6df38a5) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pzf.01",   0x00000, 0x08000, CRC(600fb2a3) SHA1(1fab1c2a23bf6ad8309d29ddbbc29435a8aeea13) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pzf.02",   0x28000, 0x20000, CRC(496076e0) SHA1(1ee4e135140afd0e8e03231e570cd77d140f6367) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pzf.11m",   0x000000, 0x200000, CRC(78442743) SHA1(b61190bb586871de6d54af580e3e1d9cc0de0acb) )
 	ROM_LOAD16_WORD_SWAP( "pzf.12m",   0x200000, 0x200000, CRC(399d2c7b) SHA1(e849dea97b8d16540415c0d9bbc4f9f4eb755ec4) )
 
@@ -7723,7 +7796,7 @@
 ROM_END
 
 ROM_START( spf2ta )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pzfa.03",  0x000000, 0x80000, CRC(3cecfa78) SHA1(c315531de87f7dc579f744e84ad2dbf068e61f46) )
 	ROM_LOAD16_WORD_SWAP( "pzf.04",   0x080000, 0x80000, CRC(b80649e2) SHA1(5bfccd656aea7ff82e9a20bb5856f4ab99b5a007) )
 
@@ -7734,12 +7807,12 @@
 	ROM_LOAD64_WORD( "pzf.18m", 0x800004, 0x100000, CRC(e43aac33) SHA1(d041e0688c3807d3363861a7f216de43b34d846c) )
 	ROM_LOAD64_WORD( "pzf.20m", 0x800006, 0x100000, CRC(7f536ff1) SHA1(905b9d62ef7bef47297c7f4a4dd697aed6df38a5) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pzf.01",   0x00000, 0x08000, CRC(600fb2a3) SHA1(1fab1c2a23bf6ad8309d29ddbbc29435a8aeea13) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pzf.02",   0x28000, 0x20000, CRC(496076e0) SHA1(1ee4e135140afd0e8e03231e570cd77d140f6367) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pzf.11m",   0x000000, 0x200000, CRC(78442743) SHA1(b61190bb586871de6d54af580e3e1d9cc0de0acb) )
 	ROM_LOAD16_WORD_SWAP( "pzf.12m",   0x200000, 0x200000, CRC(399d2c7b) SHA1(e849dea97b8d16540415c0d9bbc4f9f4eb755ec4) )
 
@@ -7748,7 +7821,7 @@
 ROM_END
 
 ROM_START( spf2th )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pzfh.03",  0x000000, 0x80000, CRC(20510f2d) SHA1(dcdfc0f6b849499732b76811edb682fea758f530) )
 	ROM_LOAD16_WORD_SWAP( "pzf.04",   0x080000, 0x80000, CRC(b80649e2) SHA1(5bfccd656aea7ff82e9a20bb5856f4ab99b5a007) )
 
@@ -7759,12 +7832,12 @@
 	ROM_LOAD64_WORD( "pzf.18m", 0x800004, 0x100000, CRC(e43aac33) SHA1(d041e0688c3807d3363861a7f216de43b34d846c) )
 	ROM_LOAD64_WORD( "pzf.20m", 0x800006, 0x100000, CRC(7f536ff1) SHA1(905b9d62ef7bef47297c7f4a4dd697aed6df38a5) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pzf.01",   0x00000, 0x08000, CRC(600fb2a3) SHA1(1fab1c2a23bf6ad8309d29ddbbc29435a8aeea13) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pzf.02",   0x28000, 0x20000, CRC(496076e0) SHA1(1ee4e135140afd0e8e03231e570cd77d140f6367) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pzf.11m",   0x000000, 0x200000, CRC(78442743) SHA1(b61190bb586871de6d54af580e3e1d9cc0de0acb) )
 	ROM_LOAD16_WORD_SWAP( "pzf.12m",   0x200000, 0x200000, CRC(399d2c7b) SHA1(e849dea97b8d16540415c0d9bbc4f9f4eb755ec4) )
 
@@ -7773,7 +7846,7 @@
 ROM_END
 
 ROM_START( ssf2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfe-03b", 0x000000, 0x80000, CRC(af654792) SHA1(a8e84154a639c036413f1423aaf2312a5affa55a) )
 	ROM_LOAD16_WORD_SWAP( "ssfe.04",  0x080000, 0x80000, CRC(b082aa67) SHA1(ca26b4bb1947cb30eaf6b61f606b859d18da4c4c) )
 	ROM_LOAD16_WORD_SWAP( "ssfe.05",  0x100000, 0x80000, CRC(02b9c137) SHA1(ba624441e1b4bfb67c71f6a116fe43539eaa4a15) )
@@ -7790,11 +7863,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf-01a",   0x00000, 0x08000, CRC(71fcdfc9) SHA1(c816f47ce10b8e85504638ada9117ec26ddaab77) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -7809,7 +7882,7 @@
 ROM_END
 
 ROM_START( ssf2r1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfe.03",  0x000000, 0x80000, CRC(a597745d) SHA1(5b12e09c14f0ea93b668b97ca2d27a686c85f641) )
 	ROM_LOAD16_WORD_SWAP( "ssfe.04",  0x080000, 0x80000, CRC(b082aa67) SHA1(ca26b4bb1947cb30eaf6b61f606b859d18da4c4c) )
 	ROM_LOAD16_WORD_SWAP( "ssfe.05",  0x100000, 0x80000, CRC(02b9c137) SHA1(ba624441e1b4bfb67c71f6a116fe43539eaa4a15) )
@@ -7826,11 +7899,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -7845,7 +7918,7 @@
 ROM_END
 
 ROM_START( ssf2u )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfu.03a", 0x000000, 0x80000, CRC(72f29c33) SHA1(c24769ca9568d4f6847979929b2a059e57dae6b3) )
 	ROM_LOAD16_WORD_SWAP( "ssfu.04a", 0x080000, 0x80000, CRC(935cea44) SHA1(1360254debf179919def1485b5758f529c94f65a) )
 	ROM_LOAD16_WORD_SWAP( "ssfu.05",  0x100000, 0x80000, CRC(a0acb28a) SHA1(55c0c0ea9b9e6ef8d7c12f888cf42b6418bbf82e) )
@@ -7862,11 +7935,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -7881,7 +7954,7 @@
 ROM_END
 
 ROM_START( ssf2a )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfa.03b", 0x000000, 0x80000, CRC(83a059bf) SHA1(3279a792fb884f856cd5bac59eaae7d9e3be286c) )
 	ROM_LOAD16_WORD_SWAP( "ssfa.04a", 0x080000, 0x80000, CRC(5d873642) SHA1(74e3541ed586454a8b56e331bc9ffdb8d69f7983) )
 	ROM_LOAD16_WORD_SWAP( "ssfa.05",  0x100000, 0x80000, CRC(f8fb4de2) SHA1(e3cde329405d4d59b7c234a30a7c178afb22deef) )
@@ -7898,11 +7971,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -7917,7 +7990,7 @@
 ROM_END
 
 ROM_START( ssf2ar1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfa.03a", 0x000000, 0x80000, CRC(d2a3c520) SHA1(514131f0d8a7c6b5bf68630250e4b1b5983d490d) )
 	ROM_LOAD16_WORD_SWAP( "ssfa.04a", 0x080000, 0x80000, CRC(5d873642) SHA1(74e3541ed586454a8b56e331bc9ffdb8d69f7983) )
 	ROM_LOAD16_WORD_SWAP( "ssfa.05",  0x100000, 0x80000, CRC(f8fb4de2) SHA1(e3cde329405d4d59b7c234a30a7c178afb22deef) )
@@ -7934,11 +8007,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -7953,7 +8026,7 @@
 ROM_END
 
 ROM_START( ssf2j )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfj.03b", 0x000000, 0x80000, CRC(5c2e356d) SHA1(379f1e508778adda4a4087ec52c89b2253265f82) )
 	ROM_LOAD16_WORD_SWAP( "ssfj.04a", 0x080000, 0x80000, CRC(013bd55c) SHA1(2482f823a980d45baeea8009dadae7f996bcdb5d) )
 	ROM_LOAD16_WORD_SWAP( "ssfj.05",  0x100000, 0x80000, CRC(0918d19a) SHA1(c23be61dd193058eb1391d39fbc22fbcf0640ee0) )
@@ -7970,11 +8043,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -7989,7 +8062,7 @@
 ROM_END
 
 ROM_START( ssf2jr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfj.03a", 0x000000, 0x80000, CRC(0bbf1304) SHA1(be93b559ebfcc0fd72cde787c5ea4f50eac52bbf) )
 	ROM_LOAD16_WORD_SWAP( "ssfj.04a", 0x080000, 0x80000, CRC(013bd55c) SHA1(2482f823a980d45baeea8009dadae7f996bcdb5d) )
 	ROM_LOAD16_WORD_SWAP( "ssfj.05",  0x100000, 0x80000, CRC(0918d19a) SHA1(c23be61dd193058eb1391d39fbc22fbcf0640ee0) )
@@ -8006,11 +8079,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -8025,7 +8098,7 @@
 ROM_END
 
 ROM_START( ssf2jr2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfj.03", 0x000000, 0x80000, CRC(7eb0efed) SHA1(c389301cf26cc72ef10c20a7d37223622d05e9ca) )
 	ROM_LOAD16_WORD_SWAP( "ssfj.04", 0x080000, 0x80000, CRC(d7322164) SHA1(b83c8523d152384a3eb9f459685b11c6e77cd6d4) )
 	ROM_LOAD16_WORD_SWAP( "ssfj.05", 0x100000, 0x80000, CRC(0918d19a) SHA1(c23be61dd193058eb1391d39fbc22fbcf0640ee0) )
@@ -8042,11 +8115,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -8061,7 +8134,7 @@
 ROM_END
 
 ROM_START( ssf2h )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfh.03",  0x000000, 0x80000, CRC(b086b355) SHA1(c0ee70fa44081ebf09a72910ce1b733b019aaf71) )
 	ROM_LOAD16_WORD_SWAP( "ssfh.04",  0x080000, 0x80000, CRC(1e629b29) SHA1(1c1043610cae9ea6cb3139a1c14d53a6fcd91d02) )
 	ROM_LOAD16_WORD_SWAP( "ssfh.05",  0x100000, 0x80000, CRC(b5997e10) SHA1(fe9502a5dfc1dfba80d0246056eae5f3b47897a7) )
@@ -8078,11 +8151,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -8097,7 +8170,7 @@
 ROM_END
 
 ROM_START( ssf2tb )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfe.03tc", 0x000000, 0x80000, CRC(496a8409) SHA1(3101689e86ab78c544524e31057478fce336ddaa) )
 	ROM_LOAD16_WORD_SWAP( "ssfe.04tc", 0x080000, 0x80000, CRC(4b45c18b) SHA1(9c7ecb6fee70e317d1005bcadadf59cf11f58050) )
 	ROM_LOAD16_WORD_SWAP( "ssfe.05t",  0x100000, 0x80000, CRC(6a9c6444) SHA1(76ba626136268a48b139f6aacd6eeded94d1354d) )
@@ -8114,11 +8187,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -8133,7 +8206,7 @@
 ROM_END
 
 ROM_START( ssf2tbr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfe.03t", 0x000000, 0x80000, CRC(1e018e34) SHA1(b9ca6655f0fc67a4f047df7ec944c9b4b85ab8ef) )
 	ROM_LOAD16_WORD_SWAP( "ssfe.04t", 0x080000, 0x80000, CRC(ac92efaf) SHA1(340b2b6a60bf3195c0d42e214dcec49f8cc35f35) )
 	ROM_LOAD16_WORD_SWAP( "ssfe.05t", 0x100000, 0x80000, CRC(6a9c6444) SHA1(76ba626136268a48b139f6aacd6eeded94d1354d) )
@@ -8150,11 +8223,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -8169,7 +8242,7 @@
 ROM_END
 
 ROM_START( ssf2tbu )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfu.03t", 0x000000, 0x80000, CRC(4635b35e) SHA1(e4438812c7424d28f1caef9c2e19bc68aba81c43) )
 	ROM_LOAD16_WORD_SWAP( "ssfu.04t", 0x080000, 0x80000, CRC(2630b3dd) SHA1(c5f84fb2e93d3a4dbce6ec33cf6dae3513957837) )
 	ROM_LOAD16_WORD_SWAP( "ssfu.05t", 0x100000, 0x80000, CRC(c0293c97) SHA1(2f322e59364b9c030a3a163dc5b38778e4c7ba49) )
@@ -8186,11 +8259,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -8205,7 +8278,7 @@
 ROM_END
 
 ROM_START( ssf2tbj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssftj.03b", 0x000000, 0x80000, CRC(e78a3433) SHA1(c5a1f209e467f8f5a791b2d2f184e71650c8c9df) )
 	ROM_LOAD16_WORD_SWAP( "ssftj.04t", 0x080000, 0x80000, CRC(b4dc1906) SHA1(b29497c8562d004c6f0393eb61ba80978f4b3aff) )
 	ROM_LOAD16_WORD_SWAP( "ssftj.05",  0x100000, 0x80000, CRC(a7e35fbc) SHA1(c59737f4dbd9ccde30b0a1e2f151a78f162ceafc) )
@@ -8222,11 +8295,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -8241,7 +8314,7 @@
 ROM_END
 
 ROM_START( ssf2tbj1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfj.03t", 0x000000, 0x80000, CRC(980d4450) SHA1(1a7a7000dc11473d06e2bb552c7a506eb0019235) )
 	ROM_LOAD16_WORD_SWAP( "ssfj.04t", 0x080000, 0x80000, CRC(b4dc1906) SHA1(b29497c8562d004c6f0393eb61ba80978f4b3aff) )
 	ROM_LOAD16_WORD_SWAP( "ssfj.05t", 0x100000, 0x80000, CRC(a7e35fbc) SHA1(c59737f4dbd9ccde30b0a1e2f151a78f162ceafc) )
@@ -8258,11 +8331,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -8277,7 +8350,7 @@
 ROM_END
 
 ROM_START( ssf2tba )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfa.03tb", 0x000000, 0x80000, CRC(8de631d2) SHA1(e9249413149c6799faaece09226cdd37906b1a63) )
 	ROM_LOAD16_WORD_SWAP( "ssfa.04ta", 0x080000, 0x80000, CRC(abef3042) SHA1(71062765bd1337780fb347d277ebeca5d7f91c05) )
 	ROM_LOAD16_WORD_SWAP( "ssfa.05t",  0x100000, 0x80000, CRC(edfa018f) SHA1(61f80f3a1674c900df34095601db92d98bb28096) )
@@ -8294,11 +8367,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf-01a",   0x00000, 0x08000, CRC(71fcdfc9) SHA1(c816f47ce10b8e85504638ada9117ec26ddaab77) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -8313,7 +8386,7 @@
 ROM_END
 
 ROM_START( ssf2tbh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfh.03tb", 0x000000, 0x80000, CRC(6db7d28b) SHA1(b37f3287c51564ee0fdab499787b37166d1eb76d) )
 	ROM_LOAD16_WORD_SWAP( "ssfh.04t",  0x080000, 0x80000, CRC(0fe7d895) SHA1(e9603eebc711641684b15d97e1a4e4dcaf5b92ae) )
 	ROM_LOAD16_WORD_SWAP( "ssfh.05t",  0x100000, 0x80000, CRC(41be4f2d) SHA1(e90061bf00cac2050e90a89bc5d1e8b0e4df35e2) )
@@ -8330,11 +8403,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -8349,7 +8422,7 @@
 ROM_END
 
 ROM_START( ssf2t )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfxe.03c", 0x000000, 0x80000, CRC(2fa1f396) SHA1(2aa58309811f34901554b84396556630a22ce9bc) )
 	ROM_LOAD16_WORD_SWAP( "sfxe.04a", 0x080000, 0x80000, CRC(d0bc29c6) SHA1(d9f89bcd79cba26db2100a00dd7bd8ee6ecb75f3) )
 	ROM_LOAD16_WORD_SWAP( "sfxe.05",  0x100000, 0x80000, CRC(65222964) SHA1(025bb708dc5b6365cc7fe60fc3f242511ad8f384) )
@@ -8372,12 +8445,12 @@
 	ROM_LOAD64_WORD( "sfx.25m",   0xc00004, 0x100000, CRC(1ee90208) SHA1(83df1d9953560edddc2951ea426d29fb014e6a8a) )
 	ROM_LOAD64_WORD( "sfx.27m",   0xc00006, 0x100000, CRC(f814400f) SHA1(ad6921af36d0bd5dfb89b1fb53c3ca3fd92d7204) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfx.01",   0x00000, 0x08000, CRC(b47b8835) SHA1(c8b2d50fe3a329bd0592ea160d505155d873dab1) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfx.02",   0x28000, 0x20000, CRC(0022633f) SHA1(cab3afc79da53e3887eb1ccd1f4d19790728e6cd) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfx.11m",   0x000000, 0x200000, CRC(9bdbd476) SHA1(a8520f77f30b97aae36408e0c4ca1ebbde1808a5) )
 	ROM_LOAD16_WORD_SWAP( "sfx.12m",   0x200000, 0x200000, CRC(a05e3aab) SHA1(d4eb9cae66c74e956569fea8b815156fbd420f83) )
 
@@ -8386,7 +8459,7 @@
 ROM_END
 
 ROM_START( ssf2tu )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfxu.03e", 0x000000, 0x80000, CRC(d6ff689e) SHA1(bea1a8aafbbbe9cb0895561a57dead1579361a8e) )
 	ROM_LOAD16_WORD_SWAP( "sfxu.04a", 0x080000, 0x80000, CRC(532b5ffd) SHA1(769a8a9d4e04e291ce7427b89e537bba2258ca82) )
 	ROM_LOAD16_WORD_SWAP( "sfxu.05",  0x100000, 0x80000, CRC(ffa3c6de) SHA1(7cce55a3e07b5ba2e2e37e4c66a52678a1b19a63) )
@@ -8409,12 +8482,12 @@
 	ROM_LOAD64_WORD( "sfx.25m",   0xc00004, 0x100000, CRC(1ee90208) SHA1(83df1d9953560edddc2951ea426d29fb014e6a8a) )
 	ROM_LOAD64_WORD( "sfx.27m",   0xc00006, 0x100000, CRC(f814400f) SHA1(ad6921af36d0bd5dfb89b1fb53c3ca3fd92d7204) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfx.01",   0x00000, 0x08000, CRC(b47b8835) SHA1(c8b2d50fe3a329bd0592ea160d505155d873dab1) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfx.02",   0x28000, 0x20000, CRC(0022633f) SHA1(cab3afc79da53e3887eb1ccd1f4d19790728e6cd) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfx.11m",   0x000000, 0x200000, CRC(9bdbd476) SHA1(a8520f77f30b97aae36408e0c4ca1ebbde1808a5) )
 	ROM_LOAD16_WORD_SWAP( "sfx.12m",   0x200000, 0x200000, CRC(a05e3aab) SHA1(d4eb9cae66c74e956569fea8b815156fbd420f83) )
 
@@ -8423,7 +8496,7 @@
 ROM_END
 
 ROM_START( ssf2tur1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfxu.03c", 0x000000, 0x80000, CRC(86e4a335) SHA1(04db3fd519973aeb7b32be62871e0fb4605946eb) )
 	ROM_LOAD16_WORD_SWAP( "sfxu.04a", 0x080000, 0x80000, CRC(532b5ffd) SHA1(769a8a9d4e04e291ce7427b89e537bba2258ca82) )
 	ROM_LOAD16_WORD_SWAP( "sfxu.05",  0x100000, 0x80000, CRC(ffa3c6de) SHA1(7cce55a3e07b5ba2e2e37e4c66a52678a1b19a63) )
@@ -8446,12 +8519,12 @@
 	ROM_LOAD64_WORD( "sfx.25m",   0xc00004, 0x100000, CRC(1ee90208) SHA1(83df1d9953560edddc2951ea426d29fb014e6a8a) )
 	ROM_LOAD64_WORD( "sfx.27m",   0xc00006, 0x100000, CRC(f814400f) SHA1(ad6921af36d0bd5dfb89b1fb53c3ca3fd92d7204) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfx.01",   0x00000, 0x08000, CRC(b47b8835) SHA1(c8b2d50fe3a329bd0592ea160d505155d873dab1) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfx.02",   0x28000, 0x20000, CRC(0022633f) SHA1(cab3afc79da53e3887eb1ccd1f4d19790728e6cd) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfx.11m",   0x000000, 0x200000, CRC(9bdbd476) SHA1(a8520f77f30b97aae36408e0c4ca1ebbde1808a5) )
 	ROM_LOAD16_WORD_SWAP( "sfx.12m",   0x200000, 0x200000, CRC(a05e3aab) SHA1(d4eb9cae66c74e956569fea8b815156fbd420f83) )
 
@@ -8460,7 +8533,7 @@
 ROM_END
 
 ROM_START( ssf2ta )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfxa.03c", 0x000000, 0x80000, CRC(04b9ff34) SHA1(69feb2c9c03634e6f964dae310d7b72b4c76140d) )
 	ROM_LOAD16_WORD_SWAP( "sfxa.04a", 0x080000, 0x80000, CRC(16ea5f7a) SHA1(08404c6a79b9a36eceb06e0d3e1d747a21fac186) )
 	ROM_LOAD16_WORD_SWAP( "sfxa.05",  0x100000, 0x80000, CRC(53d61f0c) SHA1(b30e666d0dae7b738a76a27d1d68fbb9a630c27c) )
@@ -8483,12 +8556,12 @@
 	ROM_LOAD64_WORD( "sfx.25m",   0xc00004, 0x100000, CRC(1ee90208) SHA1(83df1d9953560edddc2951ea426d29fb014e6a8a) )
 	ROM_LOAD64_WORD( "sfx.27m",   0xc00006, 0x100000, CRC(f814400f) SHA1(ad6921af36d0bd5dfb89b1fb53c3ca3fd92d7204) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfx.01",   0x00000, 0x08000, CRC(b47b8835) SHA1(c8b2d50fe3a329bd0592ea160d505155d873dab1) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfx.02",   0x28000, 0x20000, CRC(0022633f) SHA1(cab3afc79da53e3887eb1ccd1f4d19790728e6cd) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfx.11m",   0x000000, 0x200000, CRC(9bdbd476) SHA1(a8520f77f30b97aae36408e0c4ca1ebbde1808a5) )
 	ROM_LOAD16_WORD_SWAP( "sfx.12m",   0x200000, 0x200000, CRC(a05e3aab) SHA1(d4eb9cae66c74e956569fea8b815156fbd420f83) )
 
@@ -8497,7 +8570,7 @@
 ROM_END
 
 ROM_START( ssf2th )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfxh.03c", 0x000000, 0x80000, CRC(fbe80dfe) SHA1(b9c5f0a0f6ae7839e348c870ac87b16dbb665bd9) )
 	ROM_LOAD16_WORD_SWAP( "sfxh.04a", 0x080000, 0x80000, CRC(ef9dd4b1) SHA1(3c5d76e6ae7db91f9287f341c32e3b7a75e256f6) )
 	ROM_LOAD16_WORD_SWAP( "sfxh.05",  0x100000, 0x80000, CRC(09e56ecc) SHA1(a333a67994ca543826466a17342cfe4be6da0024) )
@@ -8520,12 +8593,12 @@
 	ROM_LOAD64_WORD( "sfx.25m",   0xc00004, 0x100000, CRC(1ee90208) SHA1(83df1d9953560edddc2951ea426d29fb014e6a8a) )
 	ROM_LOAD64_WORD( "sfx.27m",   0xc00006, 0x100000, CRC(f814400f) SHA1(ad6921af36d0bd5dfb89b1fb53c3ca3fd92d7204) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfx.01",   0x00000, 0x08000, CRC(b47b8835) SHA1(c8b2d50fe3a329bd0592ea160d505155d873dab1) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfx.02",   0x28000, 0x20000, CRC(0022633f) SHA1(cab3afc79da53e3887eb1ccd1f4d19790728e6cd) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfx.11m",   0x000000, 0x200000, CRC(9bdbd476) SHA1(a8520f77f30b97aae36408e0c4ca1ebbde1808a5) )
 	ROM_LOAD16_WORD_SWAP( "sfx.12m",   0x200000, 0x200000, CRC(a05e3aab) SHA1(d4eb9cae66c74e956569fea8b815156fbd420f83) )
 
@@ -8534,7 +8607,7 @@
 ROM_END
 
 ROM_START( ssf2xj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfxj.03d", 0x000000, 0x80000, CRC(50b52b37) SHA1(dc0330fcbffbc0077faa20d34a28d6a49b04639e) )
 	ROM_LOAD16_WORD_SWAP( "sfxj.04a", 0x080000, 0x80000, CRC(af7767b4) SHA1(61e7364408bf07c01634913c112b6245acce48ab) )
 	ROM_LOAD16_WORD_SWAP( "sfxj.05",  0x100000, 0x80000, CRC(f4ff18f5) SHA1(aa713c9e1a2eba35bf1c9b40bb262ff7e46b9ce4) )
@@ -8557,12 +8630,12 @@
 	ROM_LOAD64_WORD( "sfx.25m",   0xc00004, 0x100000, CRC(1ee90208) SHA1(83df1d9953560edddc2951ea426d29fb014e6a8a) )
 	ROM_LOAD64_WORD( "sfx.27m",   0xc00006, 0x100000, CRC(f814400f) SHA1(ad6921af36d0bd5dfb89b1fb53c3ca3fd92d7204) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfx.01",   0x00000, 0x08000, CRC(b47b8835) SHA1(c8b2d50fe3a329bd0592ea160d505155d873dab1) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfx.02",   0x28000, 0x20000, CRC(0022633f) SHA1(cab3afc79da53e3887eb1ccd1f4d19790728e6cd) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfx.11m",   0x000000, 0x200000, CRC(9bdbd476) SHA1(a8520f77f30b97aae36408e0c4ca1ebbde1808a5) )
 	ROM_LOAD16_WORD_SWAP( "sfx.12m",   0x200000, 0x200000, CRC(a05e3aab) SHA1(d4eb9cae66c74e956569fea8b815156fbd420f83) )
 
@@ -8572,7 +8645,7 @@
 
 
 ROM_START( ssf2xjr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfxj.03c", 0x000000, 0x80000, CRC(a7417b79) SHA1(189c3ed546bb2844e9fa9fe7e9aacef728bc8939) )
 	ROM_LOAD16_WORD_SWAP( "sfxj.04a", 0x080000, 0x80000, CRC(af7767b4) SHA1(61e7364408bf07c01634913c112b6245acce48ab) )
 	ROM_LOAD16_WORD_SWAP( "sfxj.05",  0x100000, 0x80000, CRC(f4ff18f5) SHA1(aa713c9e1a2eba35bf1c9b40bb262ff7e46b9ce4) )
@@ -8595,12 +8668,12 @@
 	ROM_LOAD64_WORD( "sfx.25m",   0xc00004, 0x100000, CRC(1ee90208) SHA1(83df1d9953560edddc2951ea426d29fb014e6a8a) )
 	ROM_LOAD64_WORD( "sfx.27m",   0xc00006, 0x100000, CRC(f814400f) SHA1(ad6921af36d0bd5dfb89b1fb53c3ca3fd92d7204) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfx.01",   0x00000, 0x08000, CRC(b47b8835) SHA1(c8b2d50fe3a329bd0592ea160d505155d873dab1) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfx.02",   0x28000, 0x20000, CRC(0022633f) SHA1(cab3afc79da53e3887eb1ccd1f4d19790728e6cd) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfx.11m",   0x000000, 0x200000, CRC(9bdbd476) SHA1(a8520f77f30b97aae36408e0c4ca1ebbde1808a5) )
 	ROM_LOAD16_WORD_SWAP( "sfx.12m",   0x200000, 0x200000, CRC(a05e3aab) SHA1(d4eb9cae66c74e956569fea8b815156fbd420f83) )
 
@@ -8610,7 +8683,7 @@
 
 // interesting version, yellow case (rental?), shows OP instead of AM on startup, uses a different (unique) key to the usual Japan set
 ROM_START( ssf2xjr1r )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfxo.03c", 0x000000, 0x80000, CRC(2ba33dc6) SHA1(ab31046c1604eae30e55eb0e03804c98765d578e) )
 	ROM_LOAD16_WORD_SWAP( "sfxo.04a", 0x080000, 0x80000, CRC(ba663dd7) SHA1(46baf0a48e4fd807098aa48e34625964b279a223) )
 	ROM_LOAD16_WORD_SWAP( "sfxo.05",  0x100000, 0x80000, CRC(1321625c) SHA1(af5bce813bc2d8d406c7cb30ba5cb61b17b74efd) )
@@ -8653,12 +8726,12 @@
 	ROM_LOAD64_WORD( "sfx.95",   0xc00006, 0x080000, CRC(86c97869) SHA1(179117e7c887685e322f97a21461eb05de44d1ee) )
 	ROM_LOAD64_WORD( "sfx.96",   0xe00006, 0x080000, CRC(1c0e1989) SHA1(fac63bae9129a656c12e5665dc0eaddc9017821f) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfx.01",   0x00000, 0x08000, CRC(b47b8835) SHA1(c8b2d50fe3a329bd0592ea160d505155d873dab1) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfx.02",   0x28000, 0x20000, CRC(0022633f) SHA1(cab3afc79da53e3887eb1ccd1f4d19790728e6cd) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */ // identical content, different board layout
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples // identical content, different board layout
 	ROM_LOAD16_WORD_SWAP( "ssf.51a",   0x000000, 0x080000, CRC(9eda6954) SHA1(28e007e8dcea127ffd82fe243a4729fa765347d6) )
 	ROM_LOAD16_WORD_SWAP( "ssf.52a",   0x080000, 0x080000, CRC(355f6589) SHA1(86f7243bc8ed22760658779d0f8810b1e1f9cdd6) )
 	ROM_LOAD16_WORD_SWAP( "ssf.53a",   0x100000, 0x080000, CRC(d5d08a05) SHA1(78549077a105384c7b1b609dc2e9e115dea4a220) )
@@ -8673,7 +8746,7 @@
 ROM_END
 
 ROM_START( vhunt2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vh2j.03a", 0x000000, 0x80000, CRC(9ae8f186) SHA1(f4e3a1b6ae823737d3b18561469f206921b48587) )
 	ROM_LOAD16_WORD_SWAP( "vh2j.04a", 0x080000, 0x80000, CRC(e2fabf53) SHA1(78c53f8e984b00245486b751515248879df77437) )
 	ROM_LOAD16_WORD_SWAP( "vh2j.05",  0x100000, 0x80000, CRC(de34f624) SHA1(60bbbd1765e76839b01c38765da2368c5188ec61) )
@@ -8693,12 +8766,12 @@
 	ROM_LOAD64_WORD( "vh2.18m",   0x1000004, 0x400000, CRC(778dc4f6) SHA1(8d0cd1c387b4b6ac7f92bb2e5a25983856328cdc) )
 	ROM_LOAD64_WORD( "vh2.20m",   0x1000006, 0x400000, CRC(605d9d1d) SHA1(99bc27557741527ca678d7b6307164bc04ebedc6) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vh2.01",  0x00000, 0x08000, CRC(67b9f779) SHA1(3994c65f888004b56ea9f478b1feaa81e306347e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vh2.02",  0x28000, 0x20000, CRC(aaf15fcb) SHA1(6f61daa162c835165a8aabaf1d0ea8816fbfbd40) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vh2.11m",  0x000000, 0x400000, CRC(38922efd) SHA1(8cfb36bdce3a524d0a81fec12ca0cba82222fa30) )
 	ROM_LOAD16_WORD_SWAP( "vh2.12m",  0x400000, 0x400000, CRC(6e2430af) SHA1(b475faf943bec4171ba0130f287e1948743ca273) )
 
@@ -8707,7 +8780,7 @@
 ROM_END
 
 ROM_START( vhunt2r1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vh2j.03", 0x000000, 0x80000, CRC(1a5feb13) SHA1(a6dd6af2601e2da14032bcbf17e9f79c7a4ba2db) )
 	ROM_LOAD16_WORD_SWAP( "vh2j.04", 0x080000, 0x80000, CRC(434611a5) SHA1(ee093017405db6c16bfee3fe446bae659c6accc2) )
 	ROM_LOAD16_WORD_SWAP( "vh2j.05", 0x100000, 0x80000, CRC(de34f624) SHA1(60bbbd1765e76839b01c38765da2368c5188ec61) )
@@ -8727,12 +8800,12 @@
 	ROM_LOAD64_WORD( "vh2.18m",   0x1000004, 0x400000, CRC(778dc4f6) SHA1(8d0cd1c387b4b6ac7f92bb2e5a25983856328cdc) )
 	ROM_LOAD64_WORD( "vh2.20m",   0x1000006, 0x400000, CRC(605d9d1d) SHA1(99bc27557741527ca678d7b6307164bc04ebedc6) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vh2.01",  0x00000, 0x08000, CRC(67b9f779) SHA1(3994c65f888004b56ea9f478b1feaa81e306347e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vh2.02",  0x28000, 0x20000, CRC(aaf15fcb) SHA1(6f61daa162c835165a8aabaf1d0ea8816fbfbd40) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vh2.11m",  0x000000, 0x400000, CRC(38922efd) SHA1(8cfb36bdce3a524d0a81fec12ca0cba82222fa30) )
 	ROM_LOAD16_WORD_SWAP( "vh2.12m",  0x400000, 0x400000, CRC(6e2430af) SHA1(b475faf943bec4171ba0130f287e1948743ca273) )
 
@@ -8741,7 +8814,7 @@
 ROM_END
 
 ROM_START( vsav )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vm3e.03d", 0x000000, 0x80000, CRC(f5962a8c) SHA1(e37d48b78186c7c097894d6c17faf7c9333f61eb) )
 	ROM_LOAD16_WORD_SWAP( "vm3e.04d", 0x080000, 0x80000, CRC(21b40ea2) SHA1(6790fa3e618850f518cbd470f44434a71be6f29f) )
 	ROM_LOAD16_WORD_SWAP( "vm3.05a",  0x100000, 0x80000, CRC(4118e00f) SHA1(94ce8abc5ff547667f4c6022d84d0ed4cd062d7e) )
@@ -8761,12 +8834,12 @@
 	ROM_LOAD64_WORD( "vm3.18m",   0x1000004, 0x400000, CRC(df9a9f47) SHA1(ce29ff00cf4b6fdd9b3b1ed87823534f1d364eab) )
 	ROM_LOAD64_WORD( "vm3.20m",   0x1000006, 0x400000, CRC(c22fc3d9) SHA1(df7538c05b03a4ad94d369f8083799979e6fac42) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vm3.01",   0x00000, 0x08000, CRC(f778769b) SHA1(788ce1ad8a322179f634df9e62a31ad776b96762) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vm3.02",   0x28000, 0x20000, CRC(cc09faa1) SHA1(2962ef0ceaf7e7279de3c421ea998763330eb43e) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vm3.11m",   0x000000, 0x400000, CRC(e80e956e) SHA1(74181fca4b764fb3c56ceef2cb4c6fd6c18ec4b6) )
 	ROM_LOAD16_WORD_SWAP( "vm3.12m",   0x400000, 0x400000, CRC(9cd71557) SHA1(7059db25698a0b286314c5961c618f6d2e6f24a1) )
 
@@ -8775,7 +8848,7 @@
 ROM_END
 
 ROM_START( vsavu )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vm3u.03d", 0x000000, 0x80000, CRC(1f295274) SHA1(c926d8af4fccee5104507ee0196b05dcd419ee20) )
 	ROM_LOAD16_WORD_SWAP( "vm3u.04d", 0x080000, 0x80000, CRC(c46adf81) SHA1(85ffb9b3282874d6ce9318a88429666e98f67cea) )
 	ROM_LOAD16_WORD_SWAP( "vm3.05a",  0x100000, 0x80000, CRC(4118e00f) SHA1(94ce8abc5ff547667f4c6022d84d0ed4cd062d7e) )
@@ -8795,12 +8868,12 @@
 	ROM_LOAD64_WORD( "vm3.18m",   0x1000004, 0x400000, CRC(df9a9f47) SHA1(ce29ff00cf4b6fdd9b3b1ed87823534f1d364eab) )
 	ROM_LOAD64_WORD( "vm3.20m",   0x1000006, 0x400000, CRC(c22fc3d9) SHA1(df7538c05b03a4ad94d369f8083799979e6fac42) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vm3.01",   0x00000, 0x08000, CRC(f778769b) SHA1(788ce1ad8a322179f634df9e62a31ad776b96762) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vm3.02",   0x28000, 0x20000, CRC(cc09faa1) SHA1(2962ef0ceaf7e7279de3c421ea998763330eb43e) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vm3.11m",   0x000000, 0x400000, CRC(e80e956e) SHA1(74181fca4b764fb3c56ceef2cb4c6fd6c18ec4b6) )
 	ROM_LOAD16_WORD_SWAP( "vm3.12m",   0x400000, 0x400000, CRC(9cd71557) SHA1(7059db25698a0b286314c5961c618f6d2e6f24a1) )
 
@@ -8809,7 +8882,7 @@
 ROM_END
 
 ROM_START( vsavj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vm3j.03d", 0x000000, 0x80000, CRC(2a2e74a4) SHA1(e9e7bce3c2ad0c9eebcbcd5139979d1fa19187ad) )
 	ROM_LOAD16_WORD_SWAP( "vm3j.04d", 0x080000, 0x80000, CRC(1c2427bc) SHA1(9047ac0ccd875d91a8ceafdf1ccf9d21c4c71644) )
 	ROM_LOAD16_WORD_SWAP( "vm3j.05a", 0x100000, 0x80000, CRC(95ce88d5) SHA1(ba5e64c2551d97a71d2f4d7a78663aede4b722e8) )
@@ -8829,12 +8902,12 @@
 	ROM_LOAD64_WORD( "vm3.18m",   0x1000004, 0x400000, CRC(df9a9f47) SHA1(ce29ff00cf4b6fdd9b3b1ed87823534f1d364eab) )
 	ROM_LOAD64_WORD( "vm3.20m",   0x1000006, 0x400000, CRC(c22fc3d9) SHA1(df7538c05b03a4ad94d369f8083799979e6fac42) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vm3.01",   0x00000, 0x08000, CRC(f778769b) SHA1(788ce1ad8a322179f634df9e62a31ad776b96762) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vm3.02",   0x28000, 0x20000, CRC(cc09faa1) SHA1(2962ef0ceaf7e7279de3c421ea998763330eb43e) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vm3.11m",   0x000000, 0x400000, CRC(e80e956e) SHA1(74181fca4b764fb3c56ceef2cb4c6fd6c18ec4b6) )
 	ROM_LOAD16_WORD_SWAP( "vm3.12m",   0x400000, 0x400000, CRC(9cd71557) SHA1(7059db25698a0b286314c5961c618f6d2e6f24a1) )
 
@@ -8843,7 +8916,7 @@
 ROM_END
 
 ROM_START( vsava )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vm3a.03d", 0x000000, 0x80000, CRC(44c1198f) SHA1(35714b2f6ebeafea93be6467b5b22ea41b9f3826) )
 	ROM_LOAD16_WORD_SWAP( "vm3a.04d", 0x080000, 0x80000, CRC(2218b781) SHA1(5dd28cc1b70b2953fbd4d5fd14abeeb3b83b193e) )
 	ROM_LOAD16_WORD_SWAP( "vm3.05a",  0x100000, 0x80000, CRC(4118e00f) SHA1(94ce8abc5ff547667f4c6022d84d0ed4cd062d7e) )
@@ -8863,12 +8936,12 @@
 	ROM_LOAD64_WORD( "vm3.18m",   0x1000004, 0x400000, CRC(df9a9f47) SHA1(ce29ff00cf4b6fdd9b3b1ed87823534f1d364eab) )
 	ROM_LOAD64_WORD( "vm3.20m",   0x1000006, 0x400000, CRC(c22fc3d9) SHA1(df7538c05b03a4ad94d369f8083799979e6fac42) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vm3.01",   0x00000, 0x08000, CRC(f778769b) SHA1(788ce1ad8a322179f634df9e62a31ad776b96762) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vm3.02",   0x28000, 0x20000, CRC(cc09faa1) SHA1(2962ef0ceaf7e7279de3c421ea998763330eb43e) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vm3.11m",   0x000000, 0x400000, CRC(e80e956e) SHA1(74181fca4b764fb3c56ceef2cb4c6fd6c18ec4b6) )
 	ROM_LOAD16_WORD_SWAP( "vm3.12m",   0x400000, 0x400000, CRC(9cd71557) SHA1(7059db25698a0b286314c5961c618f6d2e6f24a1) )
 
@@ -8877,7 +8950,7 @@
 ROM_END
 
 ROM_START( vsavh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vm3h.03a", 0x000000, 0x80000, CRC(7cc62df8) SHA1(716ad31f0e253868a5b1b89943ddc980f130d5b7) )
 	ROM_LOAD16_WORD_SWAP( "vm3h.04d", 0x080000, 0x80000, CRC(d716f3b5) SHA1(7900440071eafa4d1559b1fa8faefaa0588a65d5) )
 	ROM_LOAD16_WORD_SWAP( "vm3.05a",  0x100000, 0x80000, CRC(4118e00f) SHA1(94ce8abc5ff547667f4c6022d84d0ed4cd062d7e) )
@@ -8897,12 +8970,12 @@
 	ROM_LOAD64_WORD( "vm3.18m",   0x1000004, 0x400000, CRC(df9a9f47) SHA1(ce29ff00cf4b6fdd9b3b1ed87823534f1d364eab) )
 	ROM_LOAD64_WORD( "vm3.20m",   0x1000006, 0x400000, CRC(c22fc3d9) SHA1(df7538c05b03a4ad94d369f8083799979e6fac42) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vm3.01",   0x00000, 0x08000, CRC(f778769b) SHA1(788ce1ad8a322179f634df9e62a31ad776b96762) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vm3.02",   0x28000, 0x20000, CRC(cc09faa1) SHA1(2962ef0ceaf7e7279de3c421ea998763330eb43e) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vm3.11m",   0x000000, 0x400000, CRC(e80e956e) SHA1(74181fca4b764fb3c56ceef2cb4c6fd6c18ec4b6) )
 	ROM_LOAD16_WORD_SWAP( "vm3.12m",   0x400000, 0x400000, CRC(9cd71557) SHA1(7059db25698a0b286314c5961c618f6d2e6f24a1) )
 
@@ -8911,7 +8984,7 @@
 ROM_END
 
 ROM_START( vsavb )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vm3b.03d", 0x000000, 0x080000, CRC(22ffba4b) SHA1(2c214c43115fc0978d5ebb814a19b8ee23faab3f) )
 	ROM_LOAD16_WORD_SWAP( "vm3b.04d", 0x080000, 0x080000, CRC(88624909) SHA1(052c8f49ac3bc3d231cfea38c5bad89c3380834e) )
 	ROM_LOAD16_WORD_SWAP( "vm3.05a",  0x100000, 0x080000, CRC(4118e00f) SHA1(94ce8abc5ff547667f4c6022d84d0ed4cd062d7e) )
@@ -8931,12 +9004,12 @@
 	ROM_LOAD64_WORD( "vm3.18m",   0x1000004, 0x400000, CRC(df9a9f47) SHA1(ce29ff00cf4b6fdd9b3b1ed87823534f1d364eab) )
 	ROM_LOAD64_WORD( "vm3.20m",   0x1000006, 0x400000, CRC(c22fc3d9) SHA1(df7538c05b03a4ad94d369f8083799979e6fac42) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vm3.01",   0x00000, 0x08000, CRC(f778769b) SHA1(788ce1ad8a322179f634df9e62a31ad776b96762) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vm3.02",   0x28000, 0x20000, CRC(cc09faa1) SHA1(2962ef0ceaf7e7279de3c421ea998763330eb43e) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vm3.11m",   0x000000, 0x400000, CRC(e80e956e) SHA1(74181fca4b764fb3c56ceef2cb4c6fd6c18ec4b6) )
 	ROM_LOAD16_WORD_SWAP( "vm3.12m",   0x400000, 0x400000, CRC(9cd71557) SHA1(7059db25698a0b286314c5961c618f6d2e6f24a1) )
 
@@ -8945,7 +9018,7 @@
 ROM_END
 
 ROM_START( vsav2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vs2j.03", 0x000000, 0x80000, CRC(89fd86b4) SHA1(a52f40618d7f12f1df5862ad8e15fea60bef22a2) )
 	ROM_LOAD16_WORD_SWAP( "vs2j.04", 0x080000, 0x80000, CRC(107c091b) SHA1(bf5c2e4339e1a66b3c819900cc9b723a537adf6b) )
 	ROM_LOAD16_WORD_SWAP( "vs2j.05", 0x100000, 0x80000, CRC(61979638) SHA1(4d5625a9a06926c1a42c8f6e3a4c943f17750ec2) )
@@ -8965,12 +9038,12 @@
 	ROM_LOAD64_WORD( "vs2.18m",   0x1000004, 0x400000, CRC(778dc4f6) SHA1(8d0cd1c387b4b6ac7f92bb2e5a25983856328cdc) )
 	ROM_LOAD64_WORD( "vs2.20m",   0x1000006, 0x400000, CRC(605d9d1d) SHA1(99bc27557741527ca678d7b6307164bc04ebedc6) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vs2.01",   0x00000, 0x08000, CRC(35190139) SHA1(07f8e53ea398461de5dcda9814dde7c09faf9f65) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vs2.02",   0x28000, 0x20000, CRC(c32dba09) SHA1(1fe337ff334fab79847f9677ba0e168e93daa1c8) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vs2.11m",   0x000000, 0x400000, CRC(d67e47b7) SHA1(15a3f6779eccb10551ed94edf7e6e406a79b3de7) )
 	ROM_LOAD16_WORD_SWAP( "vs2.12m",   0x400000, 0x400000, CRC(6d020a14) SHA1(e98f862fac1e357c90949768bb2646263d9981a0) )
 
@@ -8979,7 +9052,7 @@
 ROM_END
 
 ROM_START( xmcota )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmne.03f", 0x000000, 0x80000, CRC(5a726d13) SHA1(046d068f1f3c3d2a0b73df5b1f69a6afdde8d030) )
 	ROM_LOAD16_WORD_SWAP( "xmne.04f", 0x080000, 0x80000, CRC(06a83f3a) SHA1(2f30de88fccb104bfd038310483a63de7bee4b94) )
 	ROM_LOAD16_WORD_SWAP( "xmne.05b", 0x100000, 0x80000, CRC(87b0ed0f) SHA1(f4d78fdd9fcf864e909d9a2bb351b49a5f8ec7a0) )
@@ -8999,12 +9072,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9013,7 +9086,7 @@
 ROM_END
 
 ROM_START( xmcotar1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmne.03e", 0x000000, 0x80000, CRC(a9a09b09) SHA1(e316f443d393139894592dbb1b676f3a2385ed14) )
 	ROM_LOAD16_WORD_SWAP( "xmne.04e", 0x080000, 0x80000, CRC(52fa2106) SHA1(6904eef0fb11e44046e160a1c0ff6ea48337f630) )
 	ROM_LOAD16_WORD_SWAP( "xmn.05a",  0x100000, 0x80000, CRC(ac0d7759) SHA1(650d4474b13f16af7910a0f721fcda2ddb2414fd) )
@@ -9033,12 +9106,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9047,7 +9120,7 @@
 ROM_END
 
 ROM_START( xmcotau )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmnu.03e", 0x000000, 0x80000, CRC(0bafeb0e) SHA1(170c819bd7ffafefb9b2a587509bdf2c0415474b) )
 	ROM_LOAD16_WORD_SWAP( "xmnu.04e", 0x080000, 0x80000, CRC(c29bdae3) SHA1(c605a4fd90336459c7b24cd7b2b243eef10f6407) )
 	ROM_LOAD16_WORD_SWAP( "xmn.05a",  0x100000, 0x80000, CRC(ac0d7759) SHA1(650d4474b13f16af7910a0f721fcda2ddb2414fd) )
@@ -9067,12 +9140,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9081,7 +9154,7 @@
 ROM_END
 
 ROM_START( xmcotah )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmnh.03f", 0x000000, 0x80000, CRC(e4b85a90) SHA1(1eaf94ce42438eea45cd5c813f2859abf258dd3a) )
 	ROM_LOAD16_WORD_SWAP( "xmnh.04f", 0x080000, 0x80000, CRC(7dfe1406) SHA1(4ddc0a8947d78ce587220f8188c8a8f00c7372c4) )
 	ROM_LOAD16_WORD_SWAP( "xmnh.05b", 0x100000, 0x80000, CRC(87b0ed0f) SHA1(f4d78fdd9fcf864e909d9a2bb351b49a5f8ec7a0) )
@@ -9101,12 +9174,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9115,7 +9188,7 @@
 ROM_END
 
 ROM_START( xmcotahr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmnh.03d", 0x000000, 0x80000, CRC(63b0a84f) SHA1(4a0d604ff11e68313a0711702803390cb0d2f234) )
 	ROM_LOAD16_WORD_SWAP( "xmnh.04d", 0x080000, 0x80000, CRC(b1b9b727) SHA1(b04ae3b7aab88cbb1a55068343ff9a9806d331a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.05a",  0x100000, 0x80000, CRC(ac0d7759) SHA1(650d4474b13f16af7910a0f721fcda2ddb2414fd) )
@@ -9135,12 +9208,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9149,7 +9222,7 @@
 ROM_END
 
 ROM_START( xmcotaj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmnj.03e", 0x000000, 0x80000, CRC(0df29f5f) SHA1(83993ea90e7a602c3db137d08c008dcd9bee3055) )
 	ROM_LOAD16_WORD_SWAP( "xmnj.04e", 0x080000, 0x80000, CRC(4a65833b) SHA1(cd899674ba6448fb3841247d3f434e82b19c5399) )
 	ROM_LOAD16_WORD_SWAP( "xmn.05a",  0x100000, 0x80000, CRC(ac0d7759) SHA1(650d4474b13f16af7910a0f721fcda2ddb2414fd) )
@@ -9169,12 +9242,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9183,7 +9256,7 @@
 ROM_END
 
 ROM_START( xmcotaj1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmnj.03d", 0x000000, 0x80000, CRC(79086d62) SHA1(d99a48bd40593aa9c1ff1fcbfc40cfe3bc882fc5) )
 	ROM_LOAD16_WORD_SWAP( "xmnj.04d", 0x080000, 0x80000, CRC(38eed613) SHA1(86ecb58bf03adda705a39a9779862fe2c85cadad) )
 	ROM_LOAD16_WORD_SWAP( "xmn.05",   0x100000, 0x80000, CRC(c3ed62a2) SHA1(4e3317d7ca981e33318822103a16e59f4ce20deb) )
@@ -9203,12 +9276,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9217,7 +9290,7 @@
 ROM_END
 
 ROM_START( xmcotaj2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmnj.03b", 0x000000, 0x80000, CRC(c8175fb3) SHA1(ea25bd165f8794324a1e07719312798cf9742924) )
 	ROM_LOAD16_WORD_SWAP( "xmnj.04b", 0x080000, 0x80000, CRC(54b3fba3) SHA1(47eaff5d36a45e4196f87ed3d02e54d5407e7962) )
 	ROM_LOAD16_WORD_SWAP( "xmn.05",   0x100000, 0x80000, CRC(c3ed62a2) SHA1(4e3317d7ca981e33318822103a16e59f4ce20deb) )
@@ -9237,12 +9310,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9251,7 +9324,7 @@
 ROM_END
 
 ROM_START( xmcotaj3 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmnj.03a", 0x000000, 0x80000, CRC(00761611) SHA1(e780dbe1d21a0d5b6981f0395942c9fa59688113) )
 	ROM_LOAD16_WORD_SWAP( "xmnj.04a", 0x080000, 0x80000, CRC(614d3f60) SHA1(2272ae243557562a0bc85d2cd2b37dd876f6902c) )
 	ROM_LOAD16_WORD_SWAP( "xmn.05",   0x100000, 0x80000, CRC(c3ed62a2) SHA1(4e3317d7ca981e33318822103a16e59f4ce20deb) )
@@ -9271,12 +9344,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9285,7 +9358,7 @@
 ROM_END
 
 ROM_START( xmcotajr )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmno.03a", 0x000000, 0x80000, CRC(7ab19acf) SHA1(ca02e58f1d713ee74c6c1515772da0ca26f9deb9) )
 	ROM_LOAD16_WORD_SWAP( "xmno.04a", 0x080000, 0x80000, CRC(7615dd21) SHA1(f393c985ae1c7f378f9184fd2c8530b7494ba06d) )
 	ROM_LOAD16_WORD_SWAP( "xmno.05a", 0x100000, 0x80000, CRC(0303d672) SHA1(4816b5ac6a9bf78665112d54a8f3569d590721b2) )
@@ -9305,12 +9378,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01",   0x00000, 0x08000, CRC(7178336e) SHA1(d94cddcc144336fa3ee2778b3531badcc4646e9d) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02",   0x28000, 0x20000, CRC(0ec58501) SHA1(3af500049f901897086bd35b83ca83f4bbc8b3f6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9319,7 +9392,7 @@
 ROM_END
 
 ROM_START( xmcotaa )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmna.03e", 0x000000, 0x80000, CRC(f1ade6e7) SHA1(b212b6107a7ab01db3a60ccc7e1376fdba6f2e6a) )
 	ROM_LOAD16_WORD_SWAP( "xmna.04e", 0x080000, 0x80000, CRC(b5a8843d) SHA1(e45381725a7356760dc71e027f3b7059e5919621) )
 	ROM_LOAD16_WORD_SWAP( "xmn.05a",  0x100000, 0x80000, CRC(ac0d7759) SHA1(650d4474b13f16af7910a0f721fcda2ddb2414fd) )
@@ -9339,12 +9412,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9353,7 +9426,7 @@
 ROM_END
 
 ROM_START( xmcotaar1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmna.03b", 0x000000, 0x80000, CRC(2280d03f) SHA1(554753ff7abd5b66d2ffede64e4c459f3df42209) )
 	ROM_LOAD16_WORD_SWAP( "xmna.04b", 0x080000, 0x80000, CRC(ebbbf11e) SHA1(7f6c4555330923641310fae2beda1047a1c711b4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.05",   0x100000, 0x80000, CRC(c3ed62a2) SHA1(4e3317d7ca981e33318822103a16e59f4ce20deb) )
@@ -9373,12 +9446,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9387,7 +9460,7 @@
 ROM_END
 
 ROM_START( xmcotaar2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmna.03a", 0x000000, 0x80000, CRC(7df8b27e) SHA1(2f0ce6b10857e04ddaf7a76edf126282c53511b3) )
 	ROM_LOAD16_WORD_SWAP( "xmna.04a", 0x080000, 0x80000, CRC(b44e30a7) SHA1(27b0a8b06aa11673dd145717c6286eb27186cf79) )
 	ROM_LOAD16_WORD_SWAP( "xmn.05",   0x100000, 0x80000, CRC(c3ed62a2) SHA1(4e3317d7ca981e33318822103a16e59f4ce20deb) )
@@ -9407,12 +9480,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9421,7 +9494,7 @@
 ROM_END
 
 ROM_START( xmcotab )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmnb.03c", 0x000000, 0x80000, CRC(ab48bcb0) SHA1(856168752cdd4d248eb43b2794e989a3409dc8b0) )
 	ROM_LOAD16_WORD_SWAP( "xmnb.04c", 0x080000, 0x80000, CRC(8d8fcbb1) SHA1(f98712374006d44e6121abc65ba2c78c5ebf6de5) )
 	ROM_LOAD16_WORD_SWAP( "xmne.05b", 0x100000, 0x80000, CRC(87b0ed0f) SHA1(f4d78fdd9fcf864e909d9a2bb351b49a5f8ec7a0) )
@@ -9441,12 +9514,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -9455,7 +9528,7 @@
 ROM_END
 
 ROM_START( xmvsf )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvse.03f", 0x000000, 0x80000, CRC(db06413f) SHA1(c6d8aa1e43fc541e5b4e938258f27ab9ee30ca33) )
 	ROM_LOAD16_WORD_SWAP( "xvse.04f", 0x080000, 0x80000, CRC(ef015aef) SHA1(d3504cb8c38f720b1f4528157266db60c8c6c075) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9474,12 +9547,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9488,7 +9561,7 @@
 ROM_END
 
 ROM_START( xmvsfr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvse.03d", 0x000000, 0x80000, CRC(5ae5bd3b) SHA1(f687f018008cef24f86f53373c3f5547741a4c5b) )
 	ROM_LOAD16_WORD_SWAP( "xvse.04d", 0x080000, 0x80000, CRC(5eb9c02e) SHA1(25a392913213b98ce1bbd463bf5e5e10729bde0c) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9507,12 +9580,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9521,7 +9594,7 @@
 ROM_END
 
 ROM_START( xmvsfu )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsu.03k", 0x000000, 0x80000, CRC(8739ef61) SHA1(2eb5912d3026bed0f720d28e1bf3a7ceb5b80803) )
 	ROM_LOAD16_WORD_SWAP( "xvsu.04k", 0x080000, 0x80000, CRC(e11d35c1) SHA1(d838199b2767d9f02fa0f103c5d587a4c78c0d21) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9540,12 +9613,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9554,7 +9627,7 @@
 ROM_END
 
 ROM_START( xmvsfur1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsu.03i", 0x000000, 0x80000, CRC(5481155a) SHA1(799a2488684cbead33206498d13261b79624a46e) )
 	ROM_LOAD16_WORD_SWAP( "xvsu.04i", 0x080000, 0x80000, CRC(1e236388) SHA1(329c08103840fadbc4176785c4b24013a7a2b1bc) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9573,12 +9646,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9588,7 +9661,7 @@
 
 
 ROM_START( xmvsfur2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsu.03d", 0x000000, 0x80000, CRC(bd8b152f) SHA1(6b029b7314ce2516c67e5a71508f86aa01d30ab8) )
 	ROM_LOAD16_WORD_SWAP( "xvsu.04d", 0x080000, 0x80000, CRC(7c7d1da3) SHA1(96dd1f83c8f8053177b91ad31c4c051b28dd0208) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9607,12 +9680,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9622,7 +9695,7 @@
 
 
 ROM_START( xmvsfj )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsj.03k", 0x000000, 0x80000, CRC(2a167526) SHA1(779d1be2149b1feb2c5f710ed70b162e11bd0de4) )
 	ROM_LOAD16_WORD_SWAP( "xvsj.04k", 0x080000, 0x80000, CRC(d993436b) SHA1(b3279f4fe3728700adf086bf27133c5a74c6302c) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9641,12 +9714,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9655,7 +9728,7 @@
 ROM_END
 
 ROM_START( xmvsfjr1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsj.03i", 0x000000, 0x80000, CRC(ef24da96) SHA1(8f4a2a626a059bcf36048770153a9ffc85bba304) )
 	ROM_LOAD16_WORD_SWAP( "xvsj.04i", 0x080000, 0x80000, CRC(70a59b35) SHA1(786d9b243373024735848f785503c6aa883b1c2f) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9674,12 +9747,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9688,7 +9761,7 @@
 ROM_END
 
 ROM_START( xmvsfjr2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsj.03d", 0x000000, 0x80000, CRC(beb81de9) SHA1(fce0d43b193a521d026be6508a91be6e2d03f480) )
 	ROM_LOAD16_WORD_SWAP( "xvsj.04d", 0x080000, 0x80000, CRC(23d11271) SHA1(45e4ac52001f0c2b6cd6e07413b5e503c2b90329) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9707,12 +9780,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9721,7 +9794,7 @@
 ROM_END
 
 ROM_START( xmvsfjr3 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsj.03c", 0x000000, 0x80000, CRC(180656a1) SHA1(aec2dfcfe8bcab03a48f749977e6f08fc21558bc) )
 	ROM_LOAD16_WORD_SWAP( "xvsj.04c", 0x080000, 0x80000, CRC(5832811c) SHA1(e900b343241310d4dd1b45f42573e1e90f2dcbda) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05",   0x100000, 0x80000, CRC(030e0e1e) SHA1(164e3023bb1965768448e1bf6c45ff9e0ac964c7) )
@@ -9740,12 +9813,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9754,7 +9827,7 @@
 ROM_END
 
 ROM_START( xmvsfa )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsa.03k", 0x000000, 0x80000, CRC(d0cca7a8) SHA1(70e0dd0725a52208e9e71fed82fba1d851a6bb42) )
 	ROM_LOAD16_WORD_SWAP( "xvsa.04k", 0x080000, 0x80000, CRC(8c8e76fd) SHA1(ac1c8200951131bea0bda417b6bc2f77130b5fdd) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9773,12 +9846,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9787,7 +9860,7 @@
 ROM_END
 
 ROM_START( xmvsfar1 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsa.03",  0x000000, 0x80000, CRC(520054df) SHA1(98fd30aeb4cc9120607434f258a1c00204d75d63) ) /* Missing revision letter */
 	ROM_LOAD16_WORD_SWAP( "xvsa.04",  0x080000, 0x80000, CRC(13086e55) SHA1(0d9a4b2a4278a98423155702c66df3f2e1e8ef56) ) /* Missing revision letter */
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9806,12 +9879,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9820,7 +9893,7 @@
 ROM_END
 
 ROM_START( xmvsfar2 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsa.03e", 0x000000, 0x80000, CRC(9bdde21c) SHA1(56c295d9e908a1496d6a08ff1cd10c87de1d4ff5) )
 	ROM_LOAD16_WORD_SWAP( "xvsa.04e", 0x080000, 0x80000, CRC(33300edf) SHA1(8ec4203c1bc23a6284c47ee873b151da9f072edc) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9839,12 +9912,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9853,7 +9926,7 @@
 ROM_END
 
 ROM_START( xmvsfar3 )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsa.03d", 0x000000, 0x80000, CRC(2b164fd7) SHA1(90eefa309202978c914897f30b2e6caf23fcd9f3) ) /* Came in a Blue cart on Euro MB, maybe Rent??? */
 	ROM_LOAD16_WORD_SWAP( "xvsa.04d", 0x080000, 0x80000, CRC(2d32f039) SHA1(515bdb1ad99106a5b8aa3a94be4fc4ceb31a6711) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9872,12 +9945,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvsa.02",  0x28000, 0x20000, CRC(19272e4c) SHA1(8a4a85cbdfb867a2014af2405cc8214541250b50) ) /* Different sound code than other sets */
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9886,7 +9959,7 @@
 ROM_END
 
 ROM_START( xmvsfh )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsh.03a", 0x000000, 0x80000, CRC(d4fffb04) SHA1(989ed975cfc1318998c2da26f450949bdac41d0c) )
 	ROM_LOAD16_WORD_SWAP( "xvsh.04a", 0x080000, 0x80000, CRC(1b4ea638) SHA1(7523be63c1eef153e47fc8e1c10eb99ab40b94a0) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9905,12 +9978,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9919,7 +9992,7 @@
 ROM_END
 
 ROM_START( xmvsfb )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsb.03h", 0x000000, 0x80000, CRC(05baccca) SHA1(7124e49e2180f77674ae014257a816cd4409d613) )
 	ROM_LOAD16_WORD_SWAP( "xvsb.04h", 0x080000, 0x80000, CRC(e350c755) SHA1(5e615fd4b9954410c05b34151fae70d910340a6c) )
 	ROM_LOAD16_WORD_SWAP( "xvs.05a",  0x100000, 0x80000, CRC(7db6025d) SHA1(2d74f48f83f45359bfaca28ab686625766af12ee) )
@@ -9938,12 +10011,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -9960,10 +10033,10 @@
 
 void cps2_state::init_digital_volume()
 {
-	m_cps2digitalvolumelevel = 39; /* maximum */
+	m_cps2digitalvolumelevel = 39; // maximum
 	m_cps2disabledigitalvolume = 0;
 
-	/* create a timer to update our volume state from the fake switches - read it every 6 frames or so to enable some granularity */
+	// create a timer to update our volume state from the fake switches - read it every 6 frames or so to enable some granularity
 	m_digital_volume_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(cps2_state::cps2_update_digital_volume), this));
 	m_digital_volume_timer->adjust(attotime::from_msec(100), 0, attotime::from_msec(100));
 }
@@ -9972,21 +10045,21 @@
 
 void cps2_state::init_cps2()
 {
-	/* Decrypt the game - see machine/cps2crypt.cpp */
+	// Decrypt the game - see machine/cps2crypt.cpp
 	init_cps2crypt();
 	init_cps2nc();
 }
 
 void cps2_state::init_cps2nc()
 {
-	/* Initialize some video elements */
+	// Initialize some video elements
 	init_cps2_video();
 
 	m_cps2networkpresent = 0;
 
 	init_digital_volume();
 
-	m_maincpu->set_clock_scale(0.7375f); /* RAM access waitstates etc. aren't emulated - slow the CPU to compensate */
+	m_maincpu->set_clock_scale(0.7375f); // RAM access waitstates etc. aren't emulated - slow the CPU to compensate
 }
 
 
@@ -10018,7 +10091,7 @@
 {
 	init_cps2();
 
-	/* the single board games don't have a digital volume switch */
+	// The single board games don't have a digital volume switch
 	m_cps2disabledigitalvolume = 1;
 	m_digital_volume_timer->adjust(attotime::never, 0, attotime::never);
 }
@@ -10033,7 +10106,7 @@
 	m_gigaman2_dummyqsound_ram[offset] = data;
 }
 
-/* rearrange the graphics data into the normal order */
+// rearrange the graphics data into the normal order
 void cps2_state::gigaman2_gfx_reorder()
 {
 	int i;
@@ -10063,7 +10136,7 @@
 
 	memcpy(m_decrypted_opcodes, memregion("maincpu")->base()+0x200000, 0x200000);
 
-	/* no digital volume switches on this? */
+	// No digital volume switches on this?
 	m_digital_volume_timer->adjust(attotime::never, 0, attotime::never);
 }
 
@@ -10088,282 +10161,284 @@
  *
  *************************************/
 
-GAME( 1993, ssf2,       0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (World 931005)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ssf2r1,     ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (World 930911)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ssf2u,      ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (USA 930911)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ssf2a,      ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (Asia 931005)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ssf2ar1,    ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (Asia 930914)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ssf2j,      ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (Japan 931005)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ssf2jr1,    ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (Japan 930911)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ssf2jr2,    ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (Japan 930910)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ssf2h,      ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (Hispanic 930911)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ssf2tb,     ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (World 931119)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) // works, but not in tournament mode
-GAME( 1993, ssf2tbr1,   ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (World 930911)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) // works, but not in tournament mode
-GAME( 1993, ssf2tbu,    ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (USA 930911)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) // works, but not in tournament mode
-GAME( 1993, ssf2tbj,    ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (Japan 931005)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) // works, but not in tournament mode
-GAME( 1993, ssf2tbj1,   ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (Japan 930911)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) // works, but not in tournament mode
-GAME( 1993, ssf2tba,    ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (Asia 931005)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) // works, but not in tournament mode
-GAME( 1993, ssf2tbh,    ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (Hispanic 931005)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )  // works, but not in tournament mode
-GAME( 1993, ecofghtr,   0,        cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "Capcom", "Eco Fighters (World 931203)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ecofghtru,  ecofghtr, cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "Capcom", "Eco Fighters (USA 940215)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ecofghtru1, ecofghtr, cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "Capcom", "Eco Fighters (USA 931203)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, uecology,   ecofghtr, cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "Capcom", "Ultimate Ecology (Japan 931203)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ecofghtra,  ecofghtr, cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "Capcom", "Eco Fighters (Asia 931203)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ecofghtrh,  ecofghtr, cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "Capcom", "Eco Fighters (Hispanic 931203)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ddtod,      0,        cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Euro 940412)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ddtodr1,    ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Euro 940113)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ddtodu,     ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (USA 940125)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ddtodur1,   ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (USA 940113)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ddtodj,     ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Japan 940412)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ddtodjr1,   ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Japan 940125)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ddtodjr2,   ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Japan 940113)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ddtoda,     ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Asia 940412)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ddtodar1,   ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Asia 940113)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ddtodh,     ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Hispanic 940412)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ddtodhr1,   ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Hispanic 940125)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ddtodhr2,   ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Hispanic 940113)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, ssf2t,      0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II Turbo (World 940223)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, ssf2ta,     ssf2t,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II Turbo (Asia 940223)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, ssf2th,     ssf2t,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II Turbo (Hispanic 940223)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, ssf2tu,     ssf2t,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II Turbo (USA 940323)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, ssf2tur1,   ssf2t,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II Turbo (USA 940223)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, ssf2xj,     ssf2t,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II X: Grand Master Challenge (Japan 940311)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, ssf2xjr1,   ssf2t,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II X: Grand Master Challenge (Japan 940223)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ssf2,       0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (World 931005)",                   MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ssf2r1,     ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (World 930911)",                   MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ssf2u,      ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (USA 930911)",                     MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ssf2a,      ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (Asia 931005)",                    MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ssf2ar1,    ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (Asia 930914)",                    MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ssf2j,      ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (Japan 931005)",                   MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ssf2jr1,    ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (Japan 930911)",                   MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ssf2jr2,    ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (Japan 930910)",                   MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ssf2h,      ssf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II: The New Challengers (Hispanic 930911)",                MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ssf2tb,     ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (World 931119)",                 MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) // Works, but not in tournament mode
+GAME( 1993, ssf2tbr1,   ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (World 930911)",                 MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) // Works, but not in tournament mode
+GAME( 1993, ssf2tbu,    ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (USA 930911)",                   MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) // Works, but not in tournament mode
+GAME( 1993, ssf2tbj,    ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (Japan 931005)",                 MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) // Works, but not in tournament mode
+GAME( 1993, ssf2tbj1,   ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (Japan 930911)",                 MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) // Works, but not in tournament mode
+GAME( 1993, ssf2tba,    ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (Asia 931005)",                  MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) // Works, but not in tournament mode
+GAME( 1993, ssf2tbh,    ssf2,     cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "Capcom", "Super Street Fighter II: The Tournament Battle (Hispanic 931005)",              MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN ) // Works, but not in tournament mode
+GAME( 1993, ecofghtr,   0,        cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "Capcom", "Eco Fighters (World 931203)",                                                   MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ecofghtru,  ecofghtr, cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "Capcom", "Eco Fighters (USA 940215)",                                                     MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ecofghtru1, ecofghtr, cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "Capcom", "Eco Fighters (USA 931203)",                                                     MACHINE_SUPPORTS_SAVE )
+GAME( 1993, uecology,   ecofghtr, cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "Capcom", "Ultimate Ecology (Japan 931203)",                                               MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ecofghtra,  ecofghtr, cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "Capcom", "Eco Fighters (Asia 931203)",                                                    MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ecofghtrh,  ecofghtr, cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "Capcom", "Eco Fighters (Hispanic 931203)",                                                MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ddtod,      0,        cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Euro 940412)",                               MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ddtodr1,    ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Euro 940113)",                               MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ddtodu,     ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (USA 940125)",                                MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ddtodur1,   ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (USA 940113)",                                MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ddtodj,     ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Japan 940412)",                              MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ddtodjr1,   ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Japan 940125)",                              MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ddtodjr2,   ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Japan 940113)",                              MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ddtoda,     ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Asia 940412)",                               MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ddtodar1,   ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Asia 940113)",                               MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ddtodh,     ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Hispanic 940412)",                           MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ddtodhr1,   ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Hispanic 940125)",                           MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ddtodhr2,   ddtod,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Tower of Doom (Hispanic 940113)",                           MACHINE_SUPPORTS_SAVE )
+GAME( 1994, ssf2t,      0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II Turbo (World 940223)",                                  MACHINE_SUPPORTS_SAVE )
+GAME( 1994, ssf2ta,     ssf2t,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II Turbo (Asia 940223)",                                   MACHINE_SUPPORTS_SAVE )
+GAME( 1994, ssf2th,     ssf2t,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II Turbo (Hispanic 940223)",                               MACHINE_SUPPORTS_SAVE )
+GAME( 1994, ssf2tu,     ssf2t,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II Turbo (USA 940323)",                                    MACHINE_SUPPORTS_SAVE )
+GAME( 1994, ssf2tur1,   ssf2t,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II Turbo (USA 940223)",                                    MACHINE_SUPPORTS_SAVE )
+GAME( 1994, ssf2xj,     ssf2t,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II X: Grand Master Challenge (Japan 940311)",              MACHINE_SUPPORTS_SAVE )
+GAME( 1994, ssf2xjr1,   ssf2t,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II X: Grand Master Challenge (Japan 940223)",              MACHINE_SUPPORTS_SAVE )
 GAME( 1994, ssf2xjr1r,  ssf2t,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Street Fighter II X: Grand Master Challenge (Japan 940223 rent version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, avsp,       0,        cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Alien vs. Predator (Euro 940520)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, avspu,      avsp,     cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Alien vs. Predator (USA 940520)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, avspj,      avsp,     cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Alien vs. Predator (Japan 940520)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, avspa,      avsp,     cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Alien vs. Predator (Asia 940520)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, avsph,      avsp,     cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Alien vs. Predator (Hispanic 940520)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, dstlk,      0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Darkstalkers: The Night Warriors (Euro 940705)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, dstlku,     dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Darkstalkers: The Night Warriors (USA 940818)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, dstlkur1,   dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Darkstalkers: The Night Warriors (USA 940705)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, dstlka,     dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Darkstalkers: The Night Warriors (Asia 940705)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, dstlkh,     dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Darkstalkers: The Night Warriors (Hispanic 940818)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, vampj,      dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire: The Night Warriors (Japan 940705)", MACHINE_SUPPORTS_SAVE )    // partial update set? Only rom 04 is "B" revision
-GAME( 1994, vampja,     dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire: The Night Warriors (Japan 940705 alt)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, vampjr1,    dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire: The Night Warriors (Japan 940630)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, ringdest,   0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Ring of Destruction: Slammasters II (Euro 940902)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, ringdesta,  ringdest, cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Ring of Destruction: Slammasters II (Asia 940831)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, ringdesth,  ringdest, cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Ring of Destruction: Slammasters II (Hispanic 940902)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, smbomb,     ringdest, cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Muscle Bomber: The International Blowout (Japan 940831)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, smbombr1,   ringdest, cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Muscle Bomber: The International Blowout (Japan 940808)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, armwar,     0,        cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Armored Warriors (Euro 941024)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, armwarr1,   armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Armored Warriors (Euro 941011)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, armwaru,    armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Armored Warriors (USA 941024)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, armwaru1,   armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Armored Warriors (USA 940920)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, pgear,      armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Powered Gear: Strategic Variant Armor Equipment (Japan 941024)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, pgearr1,    armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Powered Gear: Strategic Variant Armor Equipment (Japan 940916)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, armwara,    armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Armored Warriors (Asia 941024)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, armwarar1,  armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Armored Warriors (Asia 940920)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcota,     0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Euro 950331)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotar1,   xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Euro 950105)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotau,    xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (USA 950105)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotab,    xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Brazil 950331)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotah,    xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Hispanic 950331)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotahr1,  xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Hispanic 950105)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotaj,    xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Japan 950105)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotaj1,   xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Japan 941222)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotaj2,   xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Japan 941219)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotaj3,   xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Japan 941217)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotajr,   xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Japan 941208 rent version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotaa,    xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Asia 950105)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotaar1,  xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Asia 941219)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotaar2,  xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Asia 941217)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, nwarr,      0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Night Warriors: Darkstalkers' Revenge (Euro 950316)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, nwarru,     nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Night Warriors: Darkstalkers' Revenge (USA 950406)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, nwarrh,     nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Night Warriors: Darkstalkers' Revenge (Hispanic 950403)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, nwarrb,     nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Night Warriors: Darkstalkers' Revenge (Brazil 950403)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, nwarra,     nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Night Warriors: Darkstalkers' Revenge (Asia 950302)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, vhuntj,     nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Hunter: Darkstalkers' Revenge (Japan 950316)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, vhuntjr1s,  nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Hunter: Darkstalkers' Revenge (Japan 950307 stop version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, vhuntjr1,   nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Hunter: Darkstalkers' Revenge (Japan 950307)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, vhuntjr2,   nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Hunter: Darkstalkers' Revenge (Japan 950302)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, cybots,     0,        cps2, cybots,    cps2_state, init_cps2,     ROT0,   "Capcom", "Cyberbots: Fullmetal Madness (Euro 950424)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, cybotsu,    cybots,   cps2, cybots,    cps2_state, init_cps2,     ROT0,   "Capcom", "Cyberbots: Fullmetal Madness (USA 950424)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, cybotsj,    cybots,   cps2, cybots,    cps2_state, init_cps2,     ROT0,   "Capcom", "Cyberbots: Fullmetal Madness (Japan 950420)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfa,        0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha: Warriors' Dreams (Euro 950727)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfar1,      sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha: Warriors' Dreams (Euro 950718)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfar2,      sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha: Warriors' Dreams (Euro 950627)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfar3,      sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha: Warriors' Dreams (Euro 950605)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfau,       sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha: Warriors' Dreams (USA 950627)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfza,       sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Asia 950627)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfzar1,     sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Asia 950605)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfzj,       sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Japan 950727)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfzjr1,     sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Japan 950627)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfzjr2,     sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Japan 950605)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfzh,       sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Hispanic 950718)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfzhr1,     sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Hispanic 950627)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfzb,       sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Brazil 951109)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfzbr1,     sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Brazil 950727)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, mmancp2u,   megaman,  cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Mega Man: The Power Battle (CPS2, USA 951006, SAMPLE Version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, mmancp2ur1, megaman,  cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Mega Man: The Power Battle (CPS2, USA 950926, SAMPLE Version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, rmancp2j,   megaman,  cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Rockman: The Power Battle (CPS2, Japan 950922)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, msh,        0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Euro 951024)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, mshu,       msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (USA 951024)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, mshj,       msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Japan 951117)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, mshjr1,     msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Japan 951024)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, msha,       msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Asia 951024)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, mshh,       msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Hispanic 951117)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, mshb,       msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Brazil 951117)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, mshbr1,     msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Brazil 951024)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, 19xx,       0,        cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Euro 960104)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, 19xxu,      19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (USA 951207)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, 19xxa,      19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Asia 960104)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, 19xxar1,    19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Asia 951207)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, 19xxj,      19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Japan 960104, yellow case)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, 19xxjr1,    19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Japan 951225)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, 19xxjr2,    19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Japan 951207)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, 19xxh,      19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Hispanic 951218)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, 19xxb,      19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Brazil 951218)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsom,      0,        cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Euro 960619)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsomr1,    ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Euro 960223)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsomr2,    ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Euro 960209)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsomr3,    ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Euro 960208)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsomu,     ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (USA 960619)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsomur1,   ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (USA 960209)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsomj,     ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Japan 960619)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsomjr1,   ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Japan 960206)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsomjr2,   ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Japan 960223)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsoma,     ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Asia 960619)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsomar1,   ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Asia 960208)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsomh,     ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Hispanic 960223)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsomb,     ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Brazil 960223)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfa2,       0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 2 (Euro 960229)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfa2u,      sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 2 (USA 960430)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfa2ur1,    sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 2 (USA 960306)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2j,      sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Japan 960430)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2jr1,    sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Japan 960227)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2a,      sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Asia 960227)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2b,      sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Brazil 960531)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2br1,    sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Brazil 960304)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2h,      sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Hispanic 960304)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2n,      sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Oceania 960229)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2al,     0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 Alpha (Asia 960826)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2alj,    sfz2al,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 Alpha (Japan 960805)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2alh,    sfz2al,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 Alpha (Hispanic 960813)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2alb,    sfz2al,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 Alpha (Brazil 960813)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, spf2t,      0,        cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Puzzle Fighter II Turbo (Euro 960529)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, spf2tu,     spf2t,    cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Puzzle Fighter II Turbo (USA 960620)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, spf2xj,     spf2t,    cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Puzzle Fighter II X (Japan 960531)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, spf2ta,     spf2t,    cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Puzzle Fighter II Turbo (Asia 960529)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, spf2th,     spf2t,    cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Puzzle Fighter II Turbo (Hispanic 960531)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, megaman2,   0,        cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Mega Man 2: The Power Fighters (USA 960708)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, megaman2a,  megaman2, cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Mega Man 2: The Power Fighters (Asia 960708)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, rockman2j,  megaman2, cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Rockman 2: The Power Fighters (Japan 960708)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, megaman2h,  megaman2, cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Mega Man 2: The Power Fighters (Hispanic 960712)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, qndream,    0,        cps2, qndream,   cps2_state, init_cps2,     ROT0,   "Capcom", "Quiz Nanairo Dreams: Nijiirochou no Kiseki (Japan 960826)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsf,      0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Euro 961004)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfr1,    xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Euro 960910)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfu,     xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (USA 961023)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfur1,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (USA 961004)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfur2,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (USA 960910)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfj,     xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Japan 961023)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfjr1,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Japan 961004)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfjr2,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Japan 960910)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfjr3,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Japan 960909)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfa,     xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Asia 961023)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfar1,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Asia 961004)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfar2,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Asia 960919)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfar3,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Asia 960910)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfh,     xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Hispanic 961004)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfb,     xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Brazil 961023)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, batcir,     0,        cps2, cps2_4p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Battle Circuit (Euro 970319)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, batcira,    batcir,   cps2, cps2_4p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Battle Circuit (Asia 970319)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, batcirj,    batcir,   cps2, cps2_4p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Battle Circuit (Japan 970319)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, vsav,       0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior: The Lord of Vampire (Euro 970519)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, vsavu,      vsav,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior: The Lord of Vampire (USA 970519)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, vsavj,      vsav,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior: The Lord of Vampire (Japan 970519)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, vsava,      vsav,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior: The Lord of Vampire (Asia 970519)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, vsavh,      vsav,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior: The Lord of Vampire (Hispanic 970519)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, vsavb,      vsav,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior: The Lord of Vampire (Brazil 970519)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mshvsf,     0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Euro 970625)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mshvsfu,    mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (USA 970827)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mshvsfu1,   mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (USA 970625)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mshvsfj,    mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Japan 970707)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mshvsfj1,   mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Japan 970702)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mshvsfj2,   mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Japan 970625)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mshvsfh,    mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Hispanic 970625)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mshvsfa,    mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Asia 970625)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mshvsfa1,   mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Asia 970620)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mshvsfb,    mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Brazil 970827)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mshvsfb1,   mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Brazil 970625)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, csclub,     0,        cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Capcom Sports Club (Euro 971017)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, csclub1,    csclub,   cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Capcom Sports Club (Euro 970722)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, cscluba,    csclub,   cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Capcom Sports Club (Asia 970722)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, csclubj,    csclub,   cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Capcom Sports Club (Japan 970722)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, csclubjy,   csclub,   cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Capcom Sports Club (Japan 970722, yellow case)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, csclubh,    csclub,   cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Capcom Sports Club (Hispanic 970722)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, sgemf,      0,        cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Gem Fighter Mini Mix (USA 970904)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, pfghtj,     sgemf,    cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Pocket Fighter (Japan 970904)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, sgemfa,     sgemf,    cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Gem Fighter: Mini Mix (Asia 970904)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, sgemfh,     sgemf,    cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Gem Fighter: Mini Mix (Hispanic 970904)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, vhunt2,     0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Hunter 2: Darkstalkers Revenge (Japan 970929)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, vhunt2r1,   vhunt2,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Hunter 2: Darkstalkers Revenge (Japan 970913)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, vsav2,      0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior 2: The Lord of Vampire (Japan 970913)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, mvsc,       0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Euro 980123)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, mvscr1,     mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Euro 980112)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, mvscu,      mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (USA 980123)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, mvscur1,    mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (USA 971222)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, mvscj,      mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Japan 980123)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, mvscjr1,    mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Japan 980112)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, mvscjsing,  mvsc,     cps2, cps2_2p6b, cps2_state, init_singbrd,  ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Japan 980123) (Single PCB)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, mvsca,      mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Asia 980123)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, mvscar1,    mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Asia 980112)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, mvsch,      mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Hispanic 980123)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, mvscb,      mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Brazil 980123)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfa3,       0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 3 (Euro 980904)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfa3u,      sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 3 (USA 980904)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfa3ur1,    sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 3 (USA 980629)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfa3us,     sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 3 (USA 980616, SAMPLE Version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfa3h,      sfa3,     cps2, cps2_2p6bt, cps2_state, init_cps2,    ROT0,   "Capcom", "Street Fighter Alpha 3 (Hispanic 980904)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfa3hr1,    sfa3,     cps2, cps2_2p6bt, cps2_state, init_cps2,    ROT0,   "Capcom", "Street Fighter Alpha 3 (Hispanic 980629)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfa3b,      sfa3,     cps2, cps2_2p6bt, cps2_state, init_cps2,    ROT0,   "Capcom", "Street Fighter Alpha 3 (Brazil 980629)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfz3j,      sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 3 (Japan 980904)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfz3jr1,    sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 3 (Japan 980727)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfz3jr2,    sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 3 (Japan 980629)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfz3a,      sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 3 (Asia 980904)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfz3ar1,    sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 3 (Asia 980701)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, jyangoku,   0,        cps2, cps2_1p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Jyangokushi: Haoh no Saihai (Japan 990527)", MACHINE_SUPPORTS_SAVE )
-GAME( 2004, hsf2,       0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Hyper Street Fighter II: The Anniversary Edition (USA 040202)", MACHINE_SUPPORTS_SAVE )
-GAME( 2004, hsf2a,      hsf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Hyper Street Fighter II: The Anniversary Edition (Asia 040202)", MACHINE_SUPPORTS_SAVE )
-GAME( 2004, hsf2j,      hsf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Hyper Street Fighter II: The Anniversary Edition (Japan 040202)", MACHINE_SUPPORTS_SAVE )
-GAME( 2004, hsf2j1,     hsf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Hyper Street Fighter II: The Anniversary Edition (Japan 031222)", MACHINE_SUPPORTS_SAVE )
-
-/* Games released on CPS-2 hardware by Takumi */
-
-GAME( 1999, gigawing,   0,        cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Takumi (Capcom license)", "Giga Wing (USA 990222)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, gigawingj,  gigawing, cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Takumi (Capcom license)", "Giga Wing (Japan 990223)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, gigawinga,  gigawing, cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Takumi (Capcom license)", "Giga Wing (Asia 990222)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, gigawingh,  gigawing, cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Takumi (Capcom license)", "Giga Wing (Hispanic 990222)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, gigawingb,  gigawing, cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Takumi (Capcom license)", "Giga Wing (Brazil 990222)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, mmatrix,    0,        cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "Takumi (Capcom license)", "Mars Matrix: Hyper Solid Shooting (USA 000412)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, avsp,       0,        cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Alien vs. Predator (Euro 940520)",                                              MACHINE_SUPPORTS_SAVE )
+GAME( 1994, avspu,      avsp,     cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Alien vs. Predator (USA 940520)",                                               MACHINE_SUPPORTS_SAVE )
+GAME( 1994, avspj,      avsp,     cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Alien vs. Predator (Japan 940520)",                                             MACHINE_SUPPORTS_SAVE )
+GAME( 1994, avspa,      avsp,     cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Alien vs. Predator (Asia 940520)",                                              MACHINE_SUPPORTS_SAVE )
+GAME( 1994, avsph,      avsp,     cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Alien vs. Predator (Hispanic 940520)",                                          MACHINE_SUPPORTS_SAVE )
+GAME( 1994, dstlk,      0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Darkstalkers: The Night Warriors (Euro 940705)",                                MACHINE_SUPPORTS_SAVE )
+GAME( 1994, dstlku,     dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Darkstalkers: The Night Warriors (USA 940818)",                                 MACHINE_SUPPORTS_SAVE )
+GAME( 1994, dstlkur1,   dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Darkstalkers: The Night Warriors (USA 940705)",                                 MACHINE_SUPPORTS_SAVE )
+GAME( 1994, dstlka,     dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Darkstalkers: The Night Warriors (Asia 940705)",                                MACHINE_SUPPORTS_SAVE )
+GAME( 1994, dstlkh,     dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Darkstalkers: The Night Warriors (Hispanic 940818)",                            MACHINE_SUPPORTS_SAVE )
+GAME( 1994, vampj,      dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire: The Night Warriors (Japan 940705)",                                    MACHINE_SUPPORTS_SAVE ) // Partial update set? Only rom 04 is "B" revision
+GAME( 1994, vampja,     dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire: The Night Warriors (Japan 940705 alt)",                                MACHINE_SUPPORTS_SAVE )
+GAME( 1994, vampjr1,    dstlk,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire: The Night Warriors (Japan 940630)",                                    MACHINE_SUPPORTS_SAVE )
+GAME( 1994, ringdest,   0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Ring of Destruction: Slammasters II (Euro 940902)",                             MACHINE_SUPPORTS_SAVE )
+GAME( 1994, ringdesta,  ringdest, cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Ring of Destruction: Slammasters II (Asia 940831)",                             MACHINE_SUPPORTS_SAVE )
+GAME( 1994, ringdesth,  ringdest, cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Ring of Destruction: Slammasters II (Hispanic 940902)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1994, ringdestb,  ringdest, cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Ring of Destruction: Slammasters II (Brazil 940902)",                           MACHINE_SUPPORTS_SAVE )
+GAME( 1994, smbomb,     ringdest, cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Muscle Bomber: The International Blowout (Japan 940831)",                 MACHINE_SUPPORTS_SAVE )
+GAME( 1994, smbombr1,   ringdest, cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Muscle Bomber: The International Blowout (Japan 940808)",                 MACHINE_SUPPORTS_SAVE )
+GAME( 1994, armwar,     0,        cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Armored Warriors (Euro 941024)",                                                MACHINE_SUPPORTS_SAVE )
+GAME( 1994, armwarr1,   armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Armored Warriors (Euro 941011)",                                                MACHINE_SUPPORTS_SAVE )
+GAME( 1994, armwaru,    armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Armored Warriors (USA 941024)",                                                 MACHINE_SUPPORTS_SAVE )
+GAME( 1994, armwaru1,   armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Armored Warriors (USA 940920)",                                                 MACHINE_SUPPORTS_SAVE )
+GAME( 1994, pgear,      armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Powered Gear: Strategic Variant Armor Equipment (Japan 941024)",                MACHINE_SUPPORTS_SAVE )
+GAME( 1994, pgearr1,    armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Powered Gear: Strategic Variant Armor Equipment (Japan 940916)",                MACHINE_SUPPORTS_SAVE )
+GAME( 1994, armwara,    armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Armored Warriors (Asia 941024)",                                                MACHINE_SUPPORTS_SAVE )
+GAME( 1994, armwarar1,  armwar,   cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Armored Warriors (Asia 940920)",                                                MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcota,     0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Euro 950331)",                                     MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotar1,   xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Euro 950105)",                                     MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotau,    xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (USA 950105)",                                      MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotab,    xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Brazil 950331)",                                   MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotah,    xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Hispanic 950331)",                                 MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotahr1,  xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Hispanic 950105)",                                 MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotaj,    xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Japan 950105)",                                    MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotaj1,   xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Japan 941222)",                                    MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotaj2,   xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Japan 941219)",                                    MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotaj3,   xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Japan 941217)",                                    MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotajr,   xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Japan 941208 rent version)",                       MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotaa,    xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Asia 950105)",                                     MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotaar1,  xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Asia 941219)",                                     MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotaar2,  xmcota,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men: Children of the Atom (Asia 941217)",                                     MACHINE_SUPPORTS_SAVE )
+GAME( 1995, nwarr,      0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Night Warriors: Darkstalkers' Revenge (Euro 950316)",                           MACHINE_SUPPORTS_SAVE )
+GAME( 1995, nwarru,     nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Night Warriors: Darkstalkers' Revenge (USA 950406)",                            MACHINE_SUPPORTS_SAVE )
+GAME( 1995, nwarrh,     nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Night Warriors: Darkstalkers' Revenge (Hispanic 950403)",                       MACHINE_SUPPORTS_SAVE )
+GAME( 1995, nwarrb,     nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Night Warriors: Darkstalkers' Revenge (Brazil 950403)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1995, nwarra,     nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Night Warriors: Darkstalkers' Revenge (Asia 950302)",                           MACHINE_SUPPORTS_SAVE )
+GAME( 1995, vhuntj,     nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Hunter: Darkstalkers' Revenge (Japan 950316)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1995, vhuntjr1s,  nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Hunter: Darkstalkers' Revenge (Japan 950307 stop version)",             MACHINE_SUPPORTS_SAVE )
+GAME( 1995, vhuntjr1,   nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Hunter: Darkstalkers' Revenge (Japan 950307)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1995, vhuntjr2,   nwarr,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Hunter: Darkstalkers' Revenge (Japan 950302)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1995, cybots,     0,        cps2, cybots,    cps2_state, init_cps2,     ROT0,   "Capcom", "Cyberbots: Fullmetal Madness (Euro 950424)",                                    MACHINE_SUPPORTS_SAVE )
+GAME( 1995, cybotsu,    cybots,   cps2, cybots,    cps2_state, init_cps2,     ROT0,   "Capcom", "Cyberbots: Fullmetal Madness (USA 950424)",                                     MACHINE_SUPPORTS_SAVE )
+GAME( 1995, cybotsj,    cybots,   cps2, cybots,    cps2_state, init_cps2,     ROT0,   "Capcom", "Cyberbots: Fullmetal Madness (Japan 950420)",                                   MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfa,        0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha: Warriors' Dreams (Euro 950727)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfar1,      sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha: Warriors' Dreams (Euro 950718)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfar2,      sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha: Warriors' Dreams (Euro 950627)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfar3,      sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha: Warriors' Dreams (Euro 950605)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfau,       sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha: Warriors' Dreams (USA 950627)",                           MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfza,       sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Asia 950627)",                                             MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfzar1,     sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Asia 950605)",                                             MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfzj,       sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Japan 950727)",                                            MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfzjr1,     sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Japan 950627)",                                            MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfzjr2,     sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Japan 950605)",                                            MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfzh,       sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Hispanic 950718)",                                         MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfzhr1,     sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Hispanic 950627)",                                         MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfzb,       sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Brazil 951109)",                                           MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfzbr1,     sfa,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero (Brazil 950727)",                                           MACHINE_SUPPORTS_SAVE )
+GAME( 1995, mmancp2u,   megaman,  cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Mega Man: The Power Battle (CPS2, USA 951006, SAMPLE Version)",                 MACHINE_SUPPORTS_SAVE )
+GAME( 1995, mmancp2ur1, megaman,  cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Mega Man: The Power Battle (CPS2, USA 950926, SAMPLE Version)",                 MACHINE_SUPPORTS_SAVE )
+GAME( 1995, rmancp2j,   megaman,  cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Rockman: The Power Battle (CPS2, Japan 950922)",                                MACHINE_SUPPORTS_SAVE )
+GAME( 1995, msh,        0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Euro 951024)",                                             MACHINE_SUPPORTS_SAVE )
+GAME( 1995, mshu,       msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (USA 951024)",                                              MACHINE_SUPPORTS_SAVE )
+GAME( 1995, mshj,       msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Japan 951117)",                                            MACHINE_SUPPORTS_SAVE )
+GAME( 1995, mshjr1,     msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Japan 951024)",                                            MACHINE_SUPPORTS_SAVE )
+GAME( 1995, msha,       msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Asia 951024)",                                             MACHINE_SUPPORTS_SAVE )
+GAME( 1995, mshh,       msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Hispanic 951117)",                                         MACHINE_SUPPORTS_SAVE )
+GAME( 1995, mshb,       msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Brazil 951117)",                                           MACHINE_SUPPORTS_SAVE )
+GAME( 1995, mshbr1,     msh,      cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes (Brazil 951024)",                                           MACHINE_SUPPORTS_SAVE )
+GAME( 1996, 19xx,       0,        cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Euro 960104)",                                   MACHINE_SUPPORTS_SAVE )
+GAME( 1996, 19xxu,      19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (USA 951207)",                                    MACHINE_SUPPORTS_SAVE )
+GAME( 1996, 19xxa,      19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Asia 960104)",                                   MACHINE_SUPPORTS_SAVE )
+GAME( 1996, 19xxar1,    19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Asia 951207)",                                   MACHINE_SUPPORTS_SAVE )
+GAME( 1996, 19xxj,      19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Japan 960104, yellow case)",                     MACHINE_SUPPORTS_SAVE )
+GAME( 1996, 19xxjr1,    19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Japan 951225)",                                  MACHINE_SUPPORTS_SAVE )
+GAME( 1996, 19xxjr2,    19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Japan 951207)",                                  MACHINE_SUPPORTS_SAVE )
+GAME( 1996, 19xxh,      19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Hispanic 951218)",                               MACHINE_SUPPORTS_SAVE )
+GAME( 1996, 19xxb,      19xx,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "Capcom", "19XX: The War Against Destiny (Brazil 951218)",                                 MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsom,      0,        cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Euro 960619)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsomr1,    ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Euro 960223)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsomr2,    ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Euro 960209)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsomr3,    ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Euro 960208)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsomu,     ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (USA 960619)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsomur1,   ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (USA 960209)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsomj,     ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Japan 960619)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsomjr1,   ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Japan 960206)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsomjr2,   ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Japan 96022)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsoma,     ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Asia 96061)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsomar1,   ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Asia 960208)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsomh,     ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Hispanic 960223)",                     MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsomb,     ddsom,    cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "Capcom", "Dungeons & Dragons: Shadow over Mystara (Brazil 960223)",                       MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfa2,       0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 2 (Euro 960229)",                                          MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfa2u,      sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 2 (USA 960430)",                                           MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfa2ur1,    sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 2 (USA 960306)",                                           MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2j,      sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Japan 960430)",                                          MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2jr1,    sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Japan 960227)",                                          MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2a,      sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Asia 960227)",                                           MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2b,      sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Brazil 960531)",                                         MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2br1,    sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Brazil 960304)",                                         MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2h,      sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Hispanic 960304)",                                       MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2n,      sfa2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 (Oceania 960229)",                                        MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2al,     0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 Alpha (Asia 960826)",                                     MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2alj,    sfz2al,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 Alpha (Japan 960805)",                                    MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2alh,    sfz2al,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 Alpha (Hispanic 960813)",                                 MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2alb,    sfz2al,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 2 Alpha (Brazil 960813)",                                   MACHINE_SUPPORTS_SAVE )
+GAME( 1996, spf2t,      0,        cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Puzzle Fighter II Turbo (Euro 960529)",                                   MACHINE_SUPPORTS_SAVE )
+GAME( 1996, spf2tu,     spf2t,    cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Puzzle Fighter II Turbo (USA 960620)",                                    MACHINE_SUPPORTS_SAVE )
+GAME( 1996, spf2xj,     spf2t,    cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Puzzle Fighter II X (Japan 960531)",                                      MACHINE_SUPPORTS_SAVE )
+GAME( 1996, spf2ta,     spf2t,    cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Puzzle Fighter II Turbo (Asia 960529)",                                   MACHINE_SUPPORTS_SAVE )
+GAME( 1996, spf2th,     spf2t,    cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Puzzle Fighter II Turbo (Hispanic 960531)",                               MACHINE_SUPPORTS_SAVE )
+GAME( 1996, megaman2,   0,        cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Mega Man 2: The Power Fighters (USA 960708)",                                   MACHINE_SUPPORTS_SAVE )
+GAME( 1996, megaman2a,  megaman2, cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Mega Man 2: The Power Fighters (Asia 960708)",                                  MACHINE_SUPPORTS_SAVE )
+GAME( 1996, rockman2j,  megaman2, cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Rockman 2: The Power Fighters (Japan 960708)",                                  MACHINE_SUPPORTS_SAVE )
+GAME( 1996, megaman2h,  megaman2, cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Mega Man 2: The Power Fighters (Hispanic 960712)",                              MACHINE_SUPPORTS_SAVE )
+GAME( 1996, qndream,    0,        cps2, qndream,   cps2_state, init_cps2,     ROT0,   "Capcom", "Quiz Nanairo Dreams: Nijiirochou no Kiseki (Japan 96086)",                      MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsf,      0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Euro 961004)",                                        MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfr1,    xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Euro 960910)",                                        MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfu,     xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (USA 961023)",                                         MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfur1,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (USA 961004)",                                         MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfur2,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (USA 960910)",                                         MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfj,     xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Japan 961023)",                                       MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfjr1,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Japan 961004)",                                       MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfjr2,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Japan 960910)",                                       MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfjr3,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Japan 960909)",                                       MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfa,     xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Asia 961023)",                                        MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfar1,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Asia 961004)",                                        MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfar2,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Asia 960919)",                                        MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfar3,   xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Asia 960910)",                                        MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfh,     xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Hispanic 961004)",                                    MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfb,     xmvsf,    cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "X-Men Vs. Street Fighter (Brazil 961023)",                                      MACHINE_SUPPORTS_SAVE )
+GAME( 1997, batcir,     0,        cps2, cps2_4p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Battle Circuit (Euro 970319)",                                                  MACHINE_SUPPORTS_SAVE )
+GAME( 1997, batcira,    batcir,   cps2, cps2_4p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Battle Circuit (Asia 970319)",                                                  MACHINE_SUPPORTS_SAVE )
+GAME( 1997, batcirj,    batcir,   cps2, cps2_4p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Battle Circuit (Japan 970319)",                                                 MACHINE_SUPPORTS_SAVE )
+GAME( 1997, vsav,       0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior: The Lord of Vampire (Euro 970519)",                             MACHINE_SUPPORTS_SAVE )
+GAME( 1997, vsavu,      vsav,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior: The Lord of Vampire (USA 970519)",                              MACHINE_SUPPORTS_SAVE )
+GAME( 1997, vsavj,      vsav,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior: The Lord of Vampire (Japan 970519)",                            MACHINE_SUPPORTS_SAVE )
+GAME( 1997, vsava,      vsav,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior: The Lord of Vampire (Asia 970519)",                             MACHINE_SUPPORTS_SAVE )
+GAME( 1997, vsavh,      vsav,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior: The Lord of Vampire (Hispanic 970519)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1997, vsavb,      vsav,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior: The Lord of Vampire (Brazil 970519)",                           MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mshvsf,     0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Euro 970625)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mshvsfu,    mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (USA 970827)",                           MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mshvsfu1,   mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (USA 970625)",                           MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mshvsfj,    mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Japan 970707)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mshvsfj1,   mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Japan 970702)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mshvsfj2,   mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Japan 970625)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mshvsfh,    mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Hispanic 970625)",                      MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mshvsfa,    mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Asia 970625)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mshvsfa1,   mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Asia 970620)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mshvsfb,    mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Brazil 970827)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mshvsfb1,   mshvsf,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Super Heroes Vs. Street Fighter (Brazil 970625)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1997, csclub,     0,        cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Capcom Sports Club (Euro 971017)",                                              MACHINE_SUPPORTS_SAVE )
+GAME( 1997, csclub1,    csclub,   cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Capcom Sports Club (Euro 970722)",                                              MACHINE_SUPPORTS_SAVE )
+GAME( 1997, cscluba,    csclub,   cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Capcom Sports Club (Asia 970722)",                                              MACHINE_SUPPORTS_SAVE )
+GAME( 1997, csclubj,    csclub,   cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Capcom Sports Club (Japan 970722)",                                             MACHINE_SUPPORTS_SAVE )
+GAME( 1997, csclubjy,   csclub,   cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Capcom Sports Club (Japan 970722, yellow case)",                                MACHINE_SUPPORTS_SAVE )
+GAME( 1997, csclubh,    csclub,   cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Capcom Sports Club (Hispanic 970722)",                                          MACHINE_SUPPORTS_SAVE )
+GAME( 1997, sgemf,      0,        cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Gem Fighter Mini Mix (USA 970904)",                                       MACHINE_SUPPORTS_SAVE )
+GAME( 1997, pfghtj,     sgemf,    cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Pocket Fighter (Japan 970904)",                                                 MACHINE_SUPPORTS_SAVE )
+GAME( 1997, sgemfa,     sgemf,    cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Gem Fighter: Mini Mix (Asia 970904)",                                     MACHINE_SUPPORTS_SAVE )
+GAME( 1997, sgemfh,     sgemf,    cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Capcom", "Super Gem Fighter: Mini Mix (Hispanic 970904)",                                 MACHINE_SUPPORTS_SAVE )
+GAME( 1997, vhunt2,     0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Hunter 2: Darkstalkers Revenge (Japan 970929)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1997, vhunt2r1,   vhunt2,   cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Hunter 2: Darkstalkers Revenge (Japan 970913)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1997, vsav2,      0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Vampire Savior 2: The Lord of Vampire (Japan 970913)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1998, mvsc,       0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Euro 980123)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1998, mvscr1,     mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Euro 980112)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1998, mvscu,      mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (USA 980123)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1998, mvscur1,    mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (USA 971222)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1998, mvscj,      mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Japan 980123)",                       MACHINE_SUPPORTS_SAVE )
+GAME( 1998, mvscjr1,    mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Japan 980112)",                       MACHINE_SUPPORTS_SAVE )
+GAME( 1998, mvscjsing,  mvsc,     cps2, cps2_2p6b, cps2_state, init_singbrd,  ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Japan 980123) (Single PCB)",          MACHINE_SUPPORTS_SAVE )
+GAME( 1998, mvsca,      mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Asia 980123)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1998, mvscar1,    mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Asia 980112)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1998, mvsch,      mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Hispanic 980123)",                    MACHINE_SUPPORTS_SAVE )
+GAME( 1998, mvscb,      mvsc,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Marvel Vs. Capcom: Clash of Super Heroes (Brazil 980123)",                      MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfa3,       0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 3 (Euro 980904)",                                          MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfa3u,      sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 3 (USA 980904)",                                           MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfa3ur1,    sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 3 (USA 980629)",                                           MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfa3us,     sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Alpha 3 (USA 980616, SAMPLE Version)",                           MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfa3h,      sfa3,     cps2, cps2_2p6bt, cps2_state, init_cps2,    ROT0,   "Capcom", "Street Fighter Alpha 3 (Hispanic 980904)",                                      MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfa3hr1,    sfa3,     cps2, cps2_2p6bt, cps2_state, init_cps2,    ROT0,   "Capcom", "Street Fighter Alpha 3 (Hispanic 980629)",                                      MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfa3b,      sfa3,     cps2, cps2_2p6bt, cps2_state, init_cps2,    ROT0,   "Capcom", "Street Fighter Alpha 3 (Brazil 980629)",                                        MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfz3j,      sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 3 (Japan 980904)",                                          MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfz3jr1,    sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 3 (Japan 980727)",                                          MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfz3jr2,    sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 3 (Japan 980629)",                                          MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfz3a,      sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 3 (Asia 980904)",                                           MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfz3ar1,    sfa3,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Street Fighter Zero 3 (Asia 980701)",                                           MACHINE_SUPPORTS_SAVE )
+GAME( 1999, jyangoku,   0,        cps2, cps2_1p2b, cps2_state, init_cps2,     ROT0,   "Capcom", "Jyangokushi: Haoh no Saihai (Japan 990527)",                                    MACHINE_SUPPORTS_SAVE )
+GAME( 2004, hsf2,       0,        cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Hyper Street Fighter II: The Anniversary Edition (USA 040202)",                 MACHINE_SUPPORTS_SAVE )
+GAME( 2004, hsf2a,      hsf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Hyper Street Fighter II: The Anniversary Edition (Asia 040202)",                MACHINE_SUPPORTS_SAVE )
+GAME( 2004, hsf2j,      hsf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Hyper Street Fighter II: The Anniversary Edition (Japan 040202)",               MACHINE_SUPPORTS_SAVE )
+GAME( 2004, hsf2j1,     hsf2,     cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "Capcom", "Hyper Street Fighter II: The Anniversary Edition (Japan 031222)",               MACHINE_SUPPORTS_SAVE )
+
+// Games released on CPS-2 hardware by Takumi
+
+GAME( 1999, gigawing,   0,        cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Takumi (Capcom license)", "Giga Wing (USA 990222)",                           MACHINE_SUPPORTS_SAVE )
+GAME( 1999, gigawingj,  gigawing, cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Takumi (Capcom license)", "Giga Wing (Japan 990223)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1999, gigawinga,  gigawing, cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Takumi (Capcom license)", "Giga Wing (Asia 990222)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1999, gigawingh,  gigawing, cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Takumi (Capcom license)", "Giga Wing (Hispanic 990222)",                      MACHINE_SUPPORTS_SAVE )
+GAME( 1999, gigawingb,  gigawing, cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Takumi (Capcom license)", "Giga Wing (Brazil 990222)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 2000, mmatrix,    0,        cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "Takumi (Capcom license)", "Mars Matrix: Hyper Solid Shooting (USA 000412)",   MACHINE_SUPPORTS_SAVE )
 GAME( 2000, mmatrixj,   mmatrix,  cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "Takumi (Capcom license)", "Mars Matrix: Hyper Solid Shooting (Japan 000412)", MACHINE_SUPPORTS_SAVE )
 
-/* Games released on CPS-2 hardware by Mitchell */
+// Games released on CPS-2 hardware by Mitchell
 
-GAME( 2000, mpang,      0,        cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "Mitchell (Capcom license)", "Mighty! Pang (Euro 001010)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, mpangr1,    mpang,    cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "Mitchell (Capcom license)", "Mighty! Pang (Euro 000925)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, mpangu,     mpang,    cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "Mitchell (Capcom license)", "Mighty! Pang (USA 001010)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, mpangj,     mpang,    cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "Mitchell (Capcom license)", "Mighty! Pang (Japan 001011)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, pzloop2,    0,        cps2, pzloop2,   cps2_state, init_pzloop2,  ROT0,   "Mitchell (Capcom license)", "Puzz Loop 2 (Euro 010302)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, pzloop2j,   pzloop2,  cps2, pzloop2,   cps2_state, init_pzloop2,  ROT0,   "Mitchell (Capcom license)", "Puzz Loop 2 (Japan 010226)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, pzloop2jr1, pzloop2,  cps2, pzloop2,   cps2_state, init_pzloop2,  ROT0,   "Mitchell (Capcom license)", "Puzz Loop 2 (Japan 010205)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, mpang,      0,        cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "Mitchell (Capcom license)", "Mighty! Pang (Euro 001010)",           MACHINE_SUPPORTS_SAVE )
+GAME( 2000, mpangr1,    mpang,    cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "Mitchell (Capcom license)", "Mighty! Pang (Euro 000925)",           MACHINE_SUPPORTS_SAVE )
+GAME( 2000, mpangu,     mpang,    cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "Mitchell (Capcom license)", "Mighty! Pang (USA 001010)",            MACHINE_SUPPORTS_SAVE )
+GAME( 2000, mpangj,     mpang,    cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "Mitchell (Capcom license)", "Mighty! Pang (Japan 001011)",          MACHINE_SUPPORTS_SAVE )
+GAME( 2000, mpanga,     mpang,    cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "Mitchell (Capcom license)", "Mighty! Pang (Asia 001010)",           MACHINE_SUPPORTS_SAVE )
+GAME( 2001, pzloop2,    0,        cps2, pzloop2,   cps2_state, init_pzloop2,  ROT0,   "Mitchell (Capcom license)", "Puzz Loop 2 (Euro 010302)",            MACHINE_SUPPORTS_SAVE )
+GAME( 2001, pzloop2j,   pzloop2,  cps2, pzloop2,   cps2_state, init_pzloop2,  ROT0,   "Mitchell (Capcom license)", "Puzz Loop 2 (Japan 010226)",           MACHINE_SUPPORTS_SAVE )
+GAME( 2001, pzloop2jr1, pzloop2,  cps2, pzloop2,   cps2_state, init_pzloop2,  ROT0,   "Mitchell (Capcom license)", "Puzz Loop 2 (Japan 010205)",           MACHINE_SUPPORTS_SAVE )
 GAME( 2001, choko,      0,        cps2, choko,     cps2_state, init_cps2,     ROT0,   "Mitchell (Capcom license)", "Janpai Puzzle Choukou (Japan 010820)", MACHINE_SUPPORTS_SAVE )
 
-/* Games released on CPS-2 hardware by Eighting/Raizing */
+// Games released on CPS-2 hardware by Eighting/Raizing
 
-GAME( 2000, dimahoo,    0,        cps2, cps2_2p3b, cps2_state, init_cps2,     ROT270, "Eighting / Raizing (Capcom license)", "Dimahoo (Euro 000121)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, dimahoou,   dimahoo,  cps2, cps2_2p3b, cps2_state, init_cps2,     ROT270, "Eighting / Raizing (Capcom license)", "Dimahoo (USA 000121)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, dimahoo,    0,        cps2, cps2_2p3b, cps2_state, init_cps2,     ROT270, "Eighting / Raizing (Capcom license)", "Dimahoo (Euro 000121)",                 MACHINE_SUPPORTS_SAVE )
+GAME( 2000, dimahoou,   dimahoo,  cps2, cps2_2p3b, cps2_state, init_cps2,     ROT270, "Eighting / Raizing (Capcom license)", "Dimahoo (USA 000121)",                  MACHINE_SUPPORTS_SAVE )
 GAME( 2000, gmahou,     dimahoo,  cps2, cps2_2p3b, cps2_state, init_cps2,     ROT270, "Eighting / Raizing (Capcom license)", "Great Mahou Daisakusen (Japan 000121)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, 1944,       0,        cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Eighting / Raizing (Capcom license)", "1944: The Loop Master (USA 000620)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, 1944j,      1944,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Eighting / Raizing (Capcom license)", "1944: The Loop Master (Japan 000620)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, 1944,       0,        cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Eighting / Raizing (Capcom license)", "1944: The Loop Master (USA 000620)",    MACHINE_SUPPORTS_SAVE )
+GAME( 2000, 1944j,      1944,     cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "Eighting / Raizing (Capcom license)", "1944: The Loop Master (Japan 000620)",  MACHINE_SUPPORTS_SAVE )
 
-/* Games released on CPS-2 hardware by Cave */
+// Games released on CPS-2 hardware by Cave
 
-GAME( 2001, progear,    0,        cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Cave (Capcom license)", "Progear (USA 010117)", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, progear,    0,        cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Cave (Capcom license)", "Progear (USA 010117)",             MACHINE_SUPPORTS_SAVE )
 GAME( 2001, progearj,   progear,  cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Cave (Capcom license)", "Progear no Arashi (Japan 010117)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, progeara,   progear,  cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Cave (Capcom license)", "Progear (Asia 010117)", MACHINE_SUPPORTS_SAVE )
+GAME( 2001, progeara,   progear,  cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "Cave (Capcom license)", "Progear (Asia 010117)",            MACHINE_SUPPORTS_SAVE )
 
 /*
  ------------------------
@@ -10398,7 +10473,7 @@
 
 
 ROM_START( 1944d )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "nffud.03", 0x000000, 0x80000, CRC(28e8aae4) SHA1(b2ae11bddbf156cbf38eafdc705067bff9256752) )
 	ROM_LOAD16_WORD_SWAP( "nff.04",   0x080000, 0x80000, CRC(dba1c66e) SHA1(4764e77d4da5d19d9acded27df1e1bcba06b0fcf) )
 	ROM_LOAD16_WORD_SWAP( "nffu.05",  0x100000, 0x80000, CRC(ea813eb7) SHA1(34e0175a5f22d08c3538369b4bfd077a7427a128) )
@@ -10416,11 +10491,11 @@
 	ROM_LOAD64_WORD( "nff.18m",   0x1000004, 0x100000, CRC(63ca5988) SHA1(30137fa77573c84bcc24570bccb7dba61ddb413c) )
 	ROM_LOAD64_WORD( "nff.20m",   0x1000006, 0x100000, CRC(21eb8f3b) SHA1(efa69f19a958047dd91a294c88857ed3133fcbef) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "nff.01",   0x00000, 0x08000, CRC(d2e44318) SHA1(33e45f6fe9fed098a4c072b8c39406aef1a949b2) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "nff.11m",   0x000000, 0x400000, CRC(243e4e05) SHA1(83281f7290ac105a3f9a7507cbc11317d45ba706) )
 	ROM_LOAD16_WORD_SWAP( "nff.12m",   0x400000, 0x400000, CRC(4fcf1600) SHA1(36f18c5d92b79433bdf7088b29a244708929d48e) )
 
@@ -10429,7 +10504,7 @@
 ROM_END
 
 ROM_START( 19xxd )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "19xud.03", 0x000000, 0x80000, CRC(f81b60e5) SHA1(6f246ed7779a3a75e7ad7fa8c913c901ea423828) )
 	ROM_LOAD16_WORD_SWAP( "19xud.04", 0x080000, 0x80000, CRC(cc44638c) SHA1(a11df36b98bb59cf64c47bab29721e80d64054ff) )
 	ROM_LOAD16_WORD_SWAP( "19xud.05", 0x100000, 0x80000, CRC(33a168de) SHA1(11e1977cda6269f1a7d6a0f53b73e3094649bd2f) )
@@ -10449,11 +10524,11 @@
 	ROM_LOAD64_WORD( "19x.18m",   0x0800004, 0x200000, CRC(2213e798) SHA1(b1a9d5547f3f6c3ab59e8b761d224793c6ca33cb) )
 	ROM_LOAD64_WORD( "19x.20m",   0x0800006, 0x200000, CRC(ab9d5b96) SHA1(52b755da401fde90c13181b02ab33e5e4b2aa1f7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "19x.01",   0x00000, 0x08000, CRC(ef55195e) SHA1(813f465f2d392f6abeadbf661c54cf51171fa006) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "19x.11m",   0x000000, 0x200000, CRC(d38beef3) SHA1(134e961b926a97cca5e45d3558efb98f6f278e08) )
 	ROM_LOAD16_WORD_SWAP( "19x.12m",   0x200000, 0x200000, CRC(d47c96e2) SHA1(3c1b5563f8e7ee1c450b3592fcb319e928caec3c) )
 
@@ -10462,7 +10537,7 @@
 ROM_END
 
 ROM_START( sfz2ad )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz2ad.03a", 0x000000, 0x80000, CRC(017f8fab) SHA1(5546d935c569464c29999914c697c2a171659f42) )
 	ROM_LOAD16_WORD_SWAP( "sz2ad.04a", 0x080000, 0x80000, CRC(f50e5ea2) SHA1(ec75aa69bd18cdfac4f5783d9c6c3691bb4914c9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.05a",   0x100000, 0x80000, CRC(98e8e992) SHA1(41745b63e6b3888081d189b8315ed3b7526b3d20) )
@@ -10480,12 +10555,12 @@
 	ROM_LOAD64_WORD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -10494,7 +10569,7 @@
 ROM_END
 
 ROM_START( avspd )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "avped.03d", 0x000000, 0x80000, CRC(66aa8aad) SHA1(eb1928393d0dd4cc1a96c00324508f83f36a7622) )
 	ROM_LOAD16_WORD_SWAP( "avped.04d", 0x080000, 0x80000, CRC(579306c2) SHA1(cabee3fdb624e681013a5a57d2a37339b96518fb) )
 	ROM_LOAD16_WORD_SWAP( "avp.05d",   0x100000, 0x80000, CRC(fbfb5d7a) SHA1(5549bc9d780753bc9c10fba82588e5c3d4a2acb2) )
@@ -10513,11 +10588,11 @@
 	ROM_LOAD64_WORD( "avp.18m",   0x0800004, 0x200000, CRC(34fb7232) SHA1(8b1f15bfa758a61e6ad519af24ca774edc70d194) )
 	ROM_LOAD64_WORD( "avp.20m",   0x0800006, 0x200000, CRC(f90baa21) SHA1(20a900819a9d321316e3dfd241210725d7191ecf) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "avp.01",   0x00000, 0x08000, CRC(2d3b4220) SHA1(2b2d04d4282550fa9f6e1ad8528f20d1f2ac02eb) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "avp.11m",   0x000000, 0x200000, CRC(83499817) SHA1(e65b0ebd61ddc748842a9d4d92404b5305307623) )
 	ROM_LOAD16_WORD_SWAP( "avp.12m",   0x200000, 0x200000, CRC(f4110d49) SHA1(f27538776cc1ba8213f19f98728ed8c02508d3ac) )
 
@@ -10526,7 +10601,7 @@
 ROM_END
 
 ROM_START( batcird )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "btced.03", 0x000000, 0x80000, CRC(0737db6d) SHA1(e7f02f568a8013d5abf32e0e7dc120c004adb6c9) )
 	ROM_LOAD16_WORD_SWAP( "btced.04", 0x080000, 0x80000, CRC(ef1a8823) SHA1(9326e031b937af18b98dc3f236caaac632dac66d) )
 	ROM_LOAD16_WORD_SWAP( "btced.05", 0x100000, 0x80000, CRC(20bdbb14) SHA1(fe3a202741ca657b2b67e89050788b67d709a36d) )
@@ -10544,12 +10619,12 @@
 	ROM_LOAD64_WORD( "btc.17m",   0x000004, 0x400000, CRC(b33f4112) SHA1(e501fd921c8bcede69946b029e05d422714c1040) )
 	ROM_LOAD64_WORD( "btc.19m",   0x000006, 0x400000, CRC(a6fcdb7e) SHA1(7a28d5d7aa036d23d97fad17d0cdb8210dc8153a) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "btc.01",   0x00000, 0x08000, CRC(1e194310) SHA1(3b29de0aca9dbca59d6b50fb2509e2a913c6b0af) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "btc.02",   0x28000, 0x20000, CRC(01aeb8e6) SHA1(50a5d1cce0caf7c5143d4904431e8f41e2a57464) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "btc.11m",   0x000000, 0x200000, CRC(c27f2229) SHA1(df2459493af40937b6656a16fad43ff51bed2204) )
 	ROM_LOAD16_WORD_SWAP( "btc.12m",   0x200000, 0x200000, CRC(418a2e33) SHA1(0642ddff2ab9255f154419da24ba644ed63f34ab) )
 
@@ -10558,7 +10633,7 @@
 ROM_END
 
 ROM_START( ddtodd )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "daded.03c", 0x000000, 0x80000, CRC(843330f4) SHA1(3f77876ac5d61b595c22697724a16034b16954af) )
 	ROM_LOAD16_WORD_SWAP( "daded.04c", 0x080000, 0x80000, CRC(306f14fc) SHA1(b684ee72acc3087ada20b2d13202366c3cff1014) )
 	ROM_LOAD16_WORD_SWAP( "daded.05c", 0x100000, 0x80000, CRC(8c6b8328) SHA1(ab5d2c608bd3cdb298a9743d819616bf2df02ddd) )
@@ -10578,11 +10653,11 @@
 	ROM_LOAD64_WORD( "dad.18m",   0x800004, 0x100000, CRC(cef393ef) SHA1(830b33c86cc24776d17ad65fa89a3b16c40446a1) )
 	ROM_LOAD64_WORD( "dad.20m",   0x800006, 0x100000, CRC(8953fe9e) SHA1(f4795beb006335d13e3934aa9760e775eb0bb950) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dad.01",   0x00000, 0x08000, CRC(3f5e2424) SHA1(4aa744576bc6752c43a90a27a816ebd90076b248) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dad.11m",   0x000000, 0x200000, CRC(0c499b67) SHA1(a8ebd8a1cd6dece8344b7cb0439d85843fb97616) )
 	ROM_LOAD16_WORD_SWAP( "dad.12m",   0x200000, 0x200000, CRC(2f0b5a4e) SHA1(8d1ebbb811aa469b0f0d29d719d2b9af28fb63a2) )
 
@@ -10591,7 +10666,7 @@
 ROM_END
 
 ROM_START( ddsomud )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "dd2ud.03g", 0x000000, 0x80000, CRC(816f695a) SHA1(5e590d36c04ceac1b48954c0554a733b4c3a5277) )
 	ROM_LOAD16_WORD_SWAP( "dd2ud.04g", 0x080000, 0x80000, CRC(7cc81c6b) SHA1(2619cb25d5ae62adc5c2292e25c0d33674f5cc13) )
 	ROM_LOAD16_WORD_SWAP( "dd2.05g",   0x100000, 0x80000, CRC(5eb1991c) SHA1(429a60b5396ff4192904867fbe0524268f0edbcb) )
@@ -10614,12 +10689,12 @@
 	ROM_LOAD64_WORD( "dd2.18m",   0x1000004, 0x200000, CRC(acddd149) SHA1(7f50de9b2d1cc733594c642be1804190519caffa) )
 	ROM_LOAD64_WORD( "dd2.20m",   0x1000006, 0x200000, CRC(117fb0c0) SHA1(15c01fa1a71b6469b0e1bde0ce5835c5ff9d938c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "dd2.01",   0x00000, 0x08000, CRC(99d657e5) SHA1(1528dd6b07a0e79951a35c0457c8a9c9770e9c78) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "dd2.02",   0x28000, 0x20000, CRC(117a3824) SHA1(14f3a12170b601c5466c93af9d2f24e0b386b4e4) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "dd2.11m",   0x000000, 0x200000, CRC(98d0c325) SHA1(7406e8d943d77c468eb418c4113261f4ab973bbf) )
 	ROM_LOAD16_WORD_SWAP( "dd2.12m",   0x200000, 0x200000, CRC(5ea2e7fa) SHA1(0e6a9fd007f637adcb2226c902394f07de45e803) )
 
@@ -10628,7 +10703,7 @@
 ROM_END
 
 ROM_START( ecofghtrd )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ueced.03", 0x000000, 0x80000, CRC(ac725d2b) SHA1(f77a37d160aed34319ef810728de88a87bccb7a5) )
 	ROM_LOAD16_WORD_SWAP( "ueced.04", 0x080000, 0x80000, CRC(f800138d) SHA1(a8c05da5d33c338a82fed4f7b59c6ba8c10e8597) )
 	ROM_LOAD16_WORD_SWAP( "ueced.05", 0x100000, 0x80000, CRC(eb6a12f2) SHA1(5253a193a38b566eefbb8644511f283ac4a69850) )
@@ -10644,11 +10719,11 @@
 	ROM_LOAD64_WORD( "uec.18m",   0x800004, 0x100000, CRC(b167ae12) SHA1(48c552d02caad27d680aa51170560794f2a51478) )
 	ROM_LOAD64_WORD( "uec.20m",   0x800006, 0x100000, CRC(1064bdc2) SHA1(c51f75ac8d3f02a771feda0a933314a928555c4e) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "uec.01",   0x00000, 0x08000, CRC(c235bd15) SHA1(feb7cd7db9dc0b9887b33eed9796bb0205fb719d) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "uec.11m",   0x000000, 0x200000, CRC(81b25d39) SHA1(448adfcc7d98873a48c710d857225cdd1580e5c9) )
 	ROM_LOAD16_WORD_SWAP( "uec.12m",   0x200000, 0x200000, CRC(27729e52) SHA1(a55c8159adf766dda70cb047f5ac85ce6bc0a3f3) )
 
@@ -10657,7 +10732,7 @@
 ROM_END
 
 ROM_START( gigawingjd )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ggwjd.03a", 0x000000, 0x80000, CRC(cb1c756e) SHA1(f8b37120b429e14aad6e7d2106f8f8c422f2ce2b) )
 	ROM_LOAD16_WORD_SWAP( "ggwjd.04a", 0x080000, 0x80000, CRC(fa158e04) SHA1(bd0f0351fabe376944c28e327bcf83a8d9229441) )
 	ROM_LOAD16_WORD_SWAP( "ggwjd.05a", 0x100000, 0x80000, CRC(1c5bc4e7) SHA1(7f338cb45686b24b9136dd1e575fd842f9fd0b05) )
@@ -10671,11 +10746,11 @@
 	ROM_LOAD64_WORD( "ggw.17m",   0x000004, 0x400000, CRC(466e0ba4) SHA1(9563455b95d36fafe508290659088b153539cfdf) )
 	ROM_LOAD64_WORD( "ggw.19m",   0x000006, 0x400000, CRC(840c8dea) SHA1(ea04afce17f00b45d3d2cd5140d0dd7ab4bccc00) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ggw.01",   0x00000, 0x08000, CRC(4c6351d5) SHA1(cef81fb7c4b8cb2ef1f8f3c27982aefbcbe38160) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "ggw.11m",   0x000000, 0x400000, CRC(e172acf5) SHA1(d7b0963d66165f3607d887741c5e7ab952bcf2ff) )
 	ROM_LOAD16_WORD_SWAP( "ggw.12m",   0x400000, 0x400000, CRC(4bee4e8f) SHA1(c440b5a38359ec3b8002f39690b79bf78703f5d0) )
 
@@ -10684,7 +10759,7 @@
 ROM_END
 
 ROM_START( gigawingd )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ggwu_d.03", 0x000000, 0x80000, CRC(dde92dfa) SHA1(37b052438663d771c256c6cc61cd3f15c560f1b8) )
 	ROM_LOAD16_WORD_SWAP( "ggwu_d.04", 0x080000, 0x80000, CRC(e0509ae2) SHA1(6962cda86351194fe901edd2b99d9da622c00c36) )
 	ROM_LOAD16_WORD_SWAP( "ggw_d.05", 0x100000, 0x80000, CRC(722d0042) SHA1(8587e42d4781c503bc8871b88d3f85e21659c50e) )
@@ -10698,11 +10773,11 @@
 	ROM_LOAD64_WORD( "ggw.17m",   0x000004, 0x400000, CRC(466e0ba4) SHA1(9563455b95d36fafe508290659088b153539cfdf) )
 	ROM_LOAD64_WORD( "ggw.19m",   0x000006, 0x400000, CRC(840c8dea) SHA1(ea04afce17f00b45d3d2cd5140d0dd7ab4bccc00) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ggw.01",   0x00000, 0x08000, CRC(4c6351d5) SHA1(cef81fb7c4b8cb2ef1f8f3c27982aefbcbe38160) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "ggw.11m",   0x000000, 0x400000, CRC(e172acf5) SHA1(d7b0963d66165f3607d887741c5e7ab952bcf2ff) )
 	ROM_LOAD16_WORD_SWAP( "ggw.12m",   0x400000, 0x400000, CRC(4bee4e8f) SHA1(c440b5a38359ec3b8002f39690b79bf78703f5d0) )
 
@@ -10711,7 +10786,7 @@
 ROM_END
 
 ROM_START( hsf2d )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "hs2ad.03", 0x000000, 0x80000, CRC(0153d371) SHA1(137f89b4ca41346abd8d1ef4a17605f6622b741e) )
 	ROM_LOAD16_WORD_SWAP( "hs2ad.04", 0x080000, 0x80000, CRC(0276b78a) SHA1(3f5502f77eb9889ca4658eb323579e05b35c9868) )
 	ROM_LOAD16_WORD_SWAP( "hs2.05",   0x100000, 0x80000, CRC(dde34a35) SHA1(f5be2d2916db6e86e0886d61d55bddf138273ebc) )
@@ -10730,12 +10805,12 @@
 	ROM_LOAD64_WORD( "hs2.17m",   0x0000004, 0x800000, CRC(adfa7726) SHA1(8d36ec125a8c91abfe5213893d794f8bc11c8acd) )
 	ROM_LOAD64_WORD( "hs2.19m",   0x0000006, 0x800000, CRC(bb3ae322) SHA1(ecd289d7a0fe365fdd7c5527cb17796002beb553) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "hs2.01",   0x00000, 0x08000, CRC(c1a13786) SHA1(c7392c7efb15ea4042e75bd9007e974293d8935d) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "hs2.02",   0x28000, 0x20000, CRC(2d8794aa) SHA1(c634affdc2568020cce6af97b4fa79925d9943f3) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "hs2.11m",   0x000000, 0x800000, CRC(0e15c359) SHA1(176108b0d76d821a849324680aba0cd04b5016c1) )
 
 	ROM_REGION( 0x20, "key", 0 )
@@ -10743,7 +10818,7 @@
 ROM_END
 
 ROM_START( megamn2d )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "rm2ud.03", 0x000000, 0x80000, CRC(d3635f25) SHA1(69a5a44bdc040754efa7fb96a267f8dcc2c5a23f) )
 	ROM_LOAD16_WORD_SWAP( "rm2ud.04", 0x080000, 0x80000, CRC(768a1705) SHA1(9b0f206ef15d72c9d0cb496845353ce7fdf2d25e) )
 	ROM_LOAD16_WORD_SWAP( "rm2.05",  0x100000, 0x80000, CRC(02ee9efc) SHA1(1b80c40389b51a03b930051f232630616c12e6c5) )
@@ -10758,12 +10833,12 @@
 	ROM_LOAD64_WORD( "rm2.18m",   0x800004, 0x200000, CRC(12257251) SHA1(20cb58afda0e6200991277817485340a6a41ae2b) )
 	ROM_LOAD64_WORD( "rm2.20m",   0x800006, 0x200000, CRC(f9b6e786) SHA1(aeb4acff7208e66a35198143fd2478039fdaa3a6) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "rm2.01a",  0x00000, 0x08000, CRC(d18e7859) SHA1(0939fac70042d0b4db5c2fdcef1f79b95febd45e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "rm2.02",   0x28000, 0x20000, CRC(c463ece0) SHA1(5c3e41eb61610b3f8c431206f6672907e3a0bdb0) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "rm2.11m",   0x000000, 0x200000, CRC(2106174d) SHA1(0a35d9ca8ebcad74904b20648d5320f839d6377e) )
 	ROM_LOAD16_WORD_SWAP( "rm2.12m",   0x200000, 0x200000, CRC(546c1636) SHA1(f96b172ab899f2c6ee17a5dd1fb61af9432e3cd2) )
 
@@ -10772,7 +10847,7 @@
 ROM_END
 
 ROM_START( mvscud )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvcud.03d", 0x000000, 0x80000, CRC(75cde3e5) SHA1(5453056da68cdd4675cb585a9c6ae85e073193f5) )
 	ROM_LOAD16_WORD_SWAP( "mvcud.04d", 0x080000, 0x80000, CRC(b32ea484) SHA1(742b35a45eadea3457bfb93808cbba599e9744e3) )
 	ROM_LOAD16_WORD_SWAP( "mvc.05a",   0x100000, 0x80000, CRC(2d8c8e86) SHA1(b07d640a734c5d336054ed05195786224c9a6cd4) )
@@ -10795,12 +10870,12 @@
 	ROM_LOAD64_WORD( "mvc.18m",   0x1000004, 0x400000, CRC(67aaf727) SHA1(e0e69104e31d2c41e18c0d24e9ab962406a7ca9a) )
 	ROM_LOAD64_WORD( "mvc.20m",   0x1000006, 0x400000, CRC(8b0bade8) SHA1(c5732361bb4bf284c4d12a82ac2c5750b1f9d441) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvc.01",   0x00000, 0x08000, CRC(41629e95) SHA1(36925c05b5fdcbe43283a882d021e5360c947061) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvc.02",   0x28000, 0x20000, CRC(963abf6b) SHA1(6b784870e338701cefabbbe4669984b5c4e8a9a5) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvc.11m",   0x000000, 0x400000, CRC(850fe663) SHA1(81e519d05a08855f242ea2e17ee0859b449db895) )
 	ROM_LOAD16_WORD_SWAP( "mvc.12m",   0x400000, 0x400000, CRC(7ccb1896) SHA1(74caadf3282fcc6acffb1bbe3734106f81124121) )
 
@@ -10809,7 +10884,7 @@
 ROM_END
 
 ROM_START( nwarrud )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vphud.03f", 0x000000, 0x80000, CRC(20d4d5a8) SHA1(420396c77a9f77feaba4be2e0faaab995842fb57) )
 	ROM_LOAD16_WORD_SWAP( "vphud.04c", 0x080000, 0x80000, CRC(61be9b42) SHA1(679381f279f51f28fdc4c4dbefabe6139855303b) )
 	ROM_LOAD16_WORD_SWAP( "vphud.05e", 0x100000, 0x80000, CRC(1ba906d8) SHA1(9e1db8af4070c68f25b8fb898e9d29a97f775e4c) )
@@ -10832,12 +10907,12 @@
 	ROM_LOAD64_WORD( "vph.18m",   0x1000004, 0x400000, CRC(64498eed) SHA1(d64e54a9ad1cbb927b7bac2eb16e1487834c5706) )
 	ROM_LOAD64_WORD( "vph.20m",   0x1000006, 0x400000, CRC(17f2433f) SHA1(0cbf8c96f92016fefb4a9c668ce5fd260342d712) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vph.01",   0x00000, 0x08000, CRC(5045dcac) SHA1(fd1a6586fbdd48a707df1fa52309b4cf50e3cc4c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vph.02",   0x28000, 0x20000, CRC(86b60e59) SHA1(197d07ced8b9850729c83fa59b7afc283500bdee) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vph.11m",   0x000000, 0x200000, CRC(e1837d33) SHA1(e3cb69f64767bacbec7286d0b4cd0ce7a0ba13d8) )
 	ROM_LOAD16_WORD_SWAP( "vph.12m",   0x200000, 0x200000, CRC(fbd3cd90) SHA1(4813c25802ad71b77ca04fd8f3a86344f99f0d6a) )
 
@@ -10846,7 +10921,7 @@
 ROM_END
 
 ROM_START( ringdstd )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "smbed.03b", 0x000000, 0x80000, CRC(f6fba4cd) SHA1(aecea7a4c3ed2153017b465b075c7558d914cdc8) )
 	ROM_LOAD16_WORD_SWAP( "smbed.04b", 0x080000, 0x80000, CRC(193bc493) SHA1(d2c6af56d3514c6d392aa3f2ea4778bbe5ef513f) )
 	ROM_LOAD16_WORD_SWAP( "smbed.05b", 0x100000, 0x80000, CRC(168cccbb) SHA1(c3e1695e013f1197f7093aa499482ff8d7f75b5b) )
@@ -10871,12 +10946,12 @@
 	ROM_LOAD64_WORD( "smb.25m",   0x1000004, 0x080000, CRC(82d6c4ec) SHA1(ed8ed02a00f59a048b9891ec2a77720bb6a5e03d) )
 	ROM_LOAD64_WORD( "smb.27m",   0x1000006, 0x080000, CRC(9b48678b) SHA1(4fa300d356c538947983ae85bb5c5cfd1fb835e7) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "smb.01",   0x00000, 0x08000, CRC(0abc229a) SHA1(967f574e6358dfc1b01e6a4a4df1a8f34eb3d814) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "smb.02",   0x28000, 0x20000, CRC(d051679a) SHA1(583c2521a30db1740d95dd94a38751fbeff3aae5) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "smb.11m",   0x000000, 0x200000, CRC(c56935f9) SHA1(ca1705e48e31ddc13505e6297bceca2bec1bb209) )
 	ROM_LOAD16_WORD_SWAP( "smb.12m",   0x200000, 0x200000, CRC(955b0782) SHA1(ee09500e7b44e923126533613bfe26cdabc7ab5f) )
 
@@ -10885,7 +10960,7 @@
 ROM_END
 
 ROM_START( sfad )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfzed.03d", 0x000000, 0x80000, CRC(a1a54827) SHA1(85dd1a6f807af56b63cd2880e6e32794eb11c61e) )
 	ROM_LOAD16_WORD_SWAP( "sfz.04b",   0x080000, 0x80000, CRC(8b73b0e5) SHA1(5318761f615c21395366b5333e75eaaa73ef2073) )
 	ROM_LOAD16_WORD_SWAP( "sfz.05a",   0x100000, 0x80000, CRC(0810544d) SHA1(5f39bda3e7b16508eb58e5a2e0cc58c09cf428ce) )
@@ -10901,12 +10976,12 @@
 	ROM_LOAD64_WORD( "sfz.18m",   0x800004, 0x200000, CRC(41a1e790) SHA1(ce25dad542308691dbe9606b26279bbd59ea4b81) )
 	ROM_LOAD64_WORD( "sfz.20m",   0x800006, 0x200000, CRC(a549df98) SHA1(f054e95df650a891ef56da8bfb31cb2c945a9aed) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfz.01",   0x00000, 0x08000, CRC(ffffec7d) SHA1(75b4aef001b72a0f571b51b2b97803facc1832dd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfz.02",   0x28000, 0x20000, CRC(45f46a08) SHA1(e32dbd27b52ab708278045b5a829376e55a4ca81) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfz.11m",  0x000000, 0x200000, CRC(c4b093cd) SHA1(256526bb693a0b72443f047e060304c9b739acd1) )
 	ROM_LOAD16_WORD_SWAP( "sfz.12m",  0x200000, 0x200000, CRC(8bdbc4b4) SHA1(0e21c9a75a17a7e7dfd8bb51098c2b9dc4c933ec) )
 
@@ -10915,7 +10990,7 @@
 ROM_END
 
 ROM_START( mshud )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mshud.03",0x000000, 0x80000, CRC(c1d8c4c6) SHA1(9d367d23a438fd22edce58ce814a4b3b36e5fc2a) )
 	ROM_LOAD16_WORD_SWAP( "mshud.04",0x080000, 0x80000, CRC(e73dda16) SHA1(f86cd74bdfa82bf0249770694de9419ffc3d3f63) )
 	ROM_LOAD16_WORD_SWAP( "mshud.05",0x100000, 0x80000, CRC(3b493e84) SHA1(875e616270e839218c924e09627bcf79211ee694) )
@@ -10935,12 +11010,12 @@
 	ROM_LOAD64_WORD( "msh.18m",   0x1000004, 0x400000, CRC(4db92d94) SHA1(f1b25ccc0627139ad5b287a8f2ab3b4a2fb8b8e4) )
 	ROM_LOAD64_WORD( "msh.20m",   0x1000006, 0x400000, CRC(a2b0c6c0) SHA1(71016c01c1a706b73cf5b9ac7e384a030c6cf08d) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "msh.01",   0x00000, 0x08000, CRC(c976e6f9) SHA1(281025e5aaf97c0aeddc8bd0f737d092daadad9e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "msh.02",   0x28000, 0x20000, CRC(ce67d0d9) SHA1(324226597cc5a11603f04085fef7715a314ecc05) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "msh.11m",   0x000000, 0x200000, CRC(37ac6d30) SHA1(ec67421fbf4a08a686e76792cb35e9cbf04d022d) )
 	ROM_LOAD16_WORD_SWAP( "msh.12m",   0x200000, 0x200000, CRC(de092570) SHA1(a03d0df901f6ea79685eaed67db65bee14ec29c6) )
 
@@ -10949,7 +11024,7 @@
 ROM_END
 
 ROM_START( sfz2ald )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "szaad.03", 0x000000, 0x80000, CRC(89f9483b) SHA1(5da4f82ddc79d9b5697ba2fea96dcaf460118248) )
 	ROM_LOAD16_WORD_SWAP( "szaad.04", 0x080000, 0x80000, CRC(aef27ae5) SHA1(5877a05e7355195d686a4d0a97062aacbd3277ee) )
 	ROM_LOAD16_WORD_SWAP( "szaa.05",  0x100000, 0x80000, CRC(f053a55e) SHA1(f98a8af5cd33a543a5596d59381f9adafed38854) )
@@ -10970,12 +11045,12 @@
 	ROM_LOAD64_WORD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -10984,7 +11059,7 @@
 ROM_END
 
 ROM_START( sfa3ud )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3ud.03c", 0x000000, 0x80000, CRC(6db8add7) SHA1(f6dc8ed330254acab16e42a8e729bca7713c8dc1) )
 	ROM_LOAD16_WORD_SWAP( "sz3ud.04c", 0x080000, 0x80000, CRC(d9c65a26) SHA1(8293ef112eaa534b58a3b56721af5d2f53fd1576) )
 	ROM_LOAD16_WORD_SWAP( "sz3.05c",   0x100000, 0x80000, CRC(57fd0a40) SHA1(bc2d5f4d57117bbf58b1adb088e00424ef489e92) )
@@ -11007,12 +11082,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3.01",   0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3.02",   0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -11021,7 +11096,7 @@
 ROM_END
 
 ROM_START( spf2xjd )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pzfjd.03a", 0x000000, 0x80000, CRC(5e85ed08) SHA1(8242030daf24d8058368d2e7bfe8199db62966c3) )
 	ROM_LOAD16_WORD_SWAP( "pzf.04",    0x080000, 0x80000, CRC(b80649e2) SHA1(5bfccd656aea7ff82e9a20bb5856f4ab99b5a007) )
 
@@ -11035,12 +11110,12 @@
 	ROM_LOAD64_WORD( "pzf.18m",  0x800004, 0x100000, CRC(e43aac33) SHA1(d041e0688c3807d3363861a7f216de43b34d846c) )
 	ROM_LOAD64_WORD( "pzf.20m",  0x800006, 0x100000, CRC(7f536ff1) SHA1(905b9d62ef7bef47297c7f4a4dd697aed6df38a5) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pzf.01",   0x00000, 0x08000, CRC(600fb2a3) SHA1(1fab1c2a23bf6ad8309d29ddbbc29435a8aeea13) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pzf.02",   0x28000, 0x20000, CRC(496076e0) SHA1(1ee4e135140afd0e8e03231e570cd77d140f6367) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pzf.11m",   0x000000, 0x200000, CRC(78442743) SHA1(b61190bb586871de6d54af580e3e1d9cc0de0acb) )
 	ROM_LOAD16_WORD_SWAP( "pzf.12m",   0x200000, 0x200000, CRC(399d2c7b) SHA1(e849dea97b8d16540415c0d9bbc4f9f4eb755ec4) )
 
@@ -11049,7 +11124,7 @@
 ROM_END
 
 ROM_START( vsavd )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vm3ed.03d", 0x000000, 0x80000, CRC(97d805e3) SHA1(394398fbeb0b375a79cefb48c57d14b330311247) )
 	ROM_LOAD16_WORD_SWAP( "vm3ed.04d", 0x080000, 0x80000, CRC(5e07fdce) SHA1(897d1c10fb0de2a62360d9b43cb78faaa9976eb9) )
 	ROM_LOAD16_WORD_SWAP( "vm3.05a",   0x100000, 0x80000, CRC(4118e00f) SHA1(94ce8abc5ff547667f4c6022d84d0ed4cd062d7e) )
@@ -11072,12 +11147,12 @@
 	ROM_LOAD64_WORD( "vm3.18m",   0x1000004, 0x400000, CRC(df9a9f47) SHA1(ce29ff00cf4b6fdd9b3b1ed87823534f1d364eab) )
 	ROM_LOAD64_WORD( "vm3.20m",   0x1000006, 0x400000, CRC(c22fc3d9) SHA1(df7538c05b03a4ad94d369f8083799979e6fac42) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vm3.01",   0x00000, 0x08000, CRC(f778769b) SHA1(788ce1ad8a322179f634df9e62a31ad776b96762) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vm3.02",   0x28000, 0x20000, CRC(cc09faa1) SHA1(2962ef0ceaf7e7279de3c421ea998763330eb43e) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vm3.11m",   0x000000, 0x400000, CRC(e80e956e) SHA1(74181fca4b764fb3c56ceef2cb4c6fd6c18ec4b6) )
 	ROM_LOAD16_WORD_SWAP( "vm3.12m",   0x400000, 0x400000, CRC(9cd71557) SHA1(7059db25698a0b286314c5961c618f6d2e6f24a1) )
 
@@ -11086,7 +11161,7 @@
 ROM_END
 
 ROM_START( xmcotar1d )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xmned.03e", 0x000000, 0x80000, CRC(bef56003) SHA1(4264f9d7236b00e513664932685b3d93ea636f21) )
 	ROM_LOAD16_WORD_SWAP( "xmned.04e", 0x080000, 0x80000, CRC(b1a21fa6) SHA1(cbb577b180f28e2af5d6518679f3b16967129ef5) )
 	ROM_LOAD16_WORD_SWAP( "xmn.05a",   0x100000, 0x80000, CRC(ac0d7759) SHA1(650d4474b13f16af7910a0f721fcda2ddb2414fd) )
@@ -11109,12 +11184,12 @@
 	ROM_LOAD64_WORD( "xmn.18m",   0x1000004, 0x400000, CRC(015a7c4c) SHA1(cccc95dafd076a1a9fa004710006149c42d058ba) )
 	ROM_LOAD64_WORD( "xmn.20m",   0x1000006, 0x400000, CRC(9dde2758) SHA1(17ba259cad03c7b5d56c0a5eda9ab53521665729) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xmn.01a",  0x00000, 0x08000, CRC(40f479ea) SHA1(f29e15f537675305264ae2138a0a537fb9e2008b) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xmn.02a",  0x28000, 0x20000, CRC(39d9b5ad) SHA1(af502debfd36100d4fc971ed25fdf9d7121d6f18) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xmn.11m",   0x000000, 0x200000, CRC(c848a6bc) SHA1(ac8ac564d3c43225822f8bc330eba9f35b24b0a4) )
 	ROM_LOAD16_WORD_SWAP( "xmn.12m",   0x200000, 0x200000, CRC(729c188f) SHA1(3279774ad8aebbcf0fc779cdfcbe21044dd192ad) )
 
@@ -11123,7 +11198,7 @@
 ROM_END
 
 ROM_START( xmvsfu1d )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "xvsud.03h", 0x000000, 0x80000, CRC(4e2e76b7) SHA1(812ebe4063a1c5d8c86200a51e6ab00e57e02869) )
 	ROM_LOAD16_WORD_SWAP( "xvsud.04h", 0x080000, 0x80000, CRC(290c61a7) SHA1(f0d409048c9d477ee98e6df92febcd4492a291ee) )
 //  ROM_LOAD16_WORD_SWAP( "xvsd.05a",  0x100000, 0x80000, CRC(de347b11) SHA1(297ae207811df9a4973de1df00b2efaa14a0137d) ) // bad dump?
@@ -11147,12 +11222,12 @@
 	ROM_LOAD64_WORD( "xvs.18m",   0x1000004, 0x400000, CRC(b0def86a) SHA1(da3a6705ea7050fc5c2c10d33400ed67be9f455d) )
 	ROM_LOAD64_WORD( "xvs.20m",   0x1000006, 0x400000, CRC(4b40ff9f) SHA1(9a981d442132efff09a27408d74646ba357c7357) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "xvs.01",   0x00000, 0x08000, CRC(3999e93a) SHA1(fefcff8a9a5c83df7655a16187cf9ba3e7efbb25) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "xvs.02",   0x28000, 0x20000, CRC(101bdee9) SHA1(75920e88bf46fcd33a7957777a1d799818ffb0d6) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "xvs.11m",   0x000000, 0x200000, CRC(9cadcdbc) SHA1(64d3bd53b04daec84c9af4aa3ff010867b3d306d) )
 	ROM_LOAD16_WORD_SWAP( "xvs.12m",   0x200000, 0x200000, CRC(7b11e460) SHA1(a581c84acaaf0ce056841c15a6f36889e88be68d) )
 
@@ -11161,7 +11236,7 @@
 ROM_END
 
 ROM_START( dstlku1d )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vamud.03a", 0x000000, 0x80000, CRC(47b7a680) SHA1(ea51d784f1ed49b70aa8addce987a7c09a5c653c) )
 	ROM_LOAD16_WORD_SWAP( "vamud.04a", 0x080000, 0x80000, CRC(3b7a4939) SHA1(020f9768f4d3afb193b1d5a824674f7fb3434369) )
 	ROM_LOAD16_WORD_SWAP( "vamu.05a",  0x100000, 0x80000, CRC(673ed50a) SHA1(7dff27dba1da55a18eb459e4a2d679cf699f2804) )
@@ -11181,12 +11256,12 @@
 	ROM_LOAD64_WORD( "vam.18m",   0x1000004, 0x100000, CRC(3a033625) SHA1(294238f30cba5cf4f8f1de951d54c2077bd95de9) )
 	ROM_LOAD64_WORD( "vam.20m",   0x1000006, 0x100000, CRC(2bff6a89) SHA1(8f4e131e5ce0af48fb89f98026d9f0356c7c301f) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vam.01",   0x00000, 0x08000, CRC(64b685d5) SHA1(6c180e7420db754eca5cad17a40f5a64f5c3bd15) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vam.02",   0x28000, 0x20000, CRC(cf7c97c7) SHA1(109a4b56ecd59be9c3f5869de99d40619bdaef21) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vam.11m",   0x000000, 0x200000, CRC(4a39deb2) SHA1(7e63e615869958db66a4e52a0272afee5a10e446) )
 	ROM_LOAD16_WORD_SWAP( "vam.12m",   0x200000, 0x200000, CRC(1a3e5c03) SHA1(c5a556e125d6c3d68da745b4d56cd7a851f2a23d) )
 
@@ -11195,65 +11270,65 @@
 ROM_END
 
 ROM_START( progearud )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pgau_d.03", 0x000000, 0x80000, CRC(ba22b9c5) SHA1(3bacef465ad137b7d618ad7dbe4a0f29b3422a31) )
 	ROM_LOAD16_WORD_SWAP( "pgau_d.04", 0x080000, 0x80000, CRC(df3927ef) SHA1(2869f3f7c1ae76e9b3ce5c66eed277ee8484aeba) )
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "pga-simm.01c",   0x0000000, 0x200000,  CRC(452f98b0) SHA1(a10e615c32098f6d25becd466da8faa967523a7b) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01d",   0x0000001, 0x200000,  CRC(9e672092) SHA1(fce0b8b43a1c069262f4e3e81c1a04621e232c88) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01a",   0x0000002, 0x200000,  CRC(ae9ddafe) SHA1(afbb26fed6cd0cb5c0099a10d35aeb453318c14d) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01b",   0x0000003, 0x200000,  CRC(94d72d94) SHA1(df6a3fe49c008f73b160eb6f2a44dc371ff73cba) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03c",   0x0000004, 0x200000,  CRC(48a1886d) SHA1(ebf44b42d784924e08a832a7e5f66a887bab244b) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03d",   0x0000005, 0x200000,  CRC(172d7e37) SHA1(0eaedd24cd3fa87b6f35fbd63078d40c493c92d0) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03a",   0x0000006, 0x200000,  CRC(9ee33d98) SHA1(85d1bd31940e35ac8c732165020881a2d65cd6b1) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03b",   0x0000007, 0x200000,  CRC(848dee32) SHA1(c591288e86ad1624d0fe66563808af9fac786e64) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "pga-simm.01c",   0x0000000, 0x200000,  CRC(452f98b0) SHA1(a10e615c32098f6d25becd466da8faa967523a7b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01d",   0x0000001, 0x200000,  CRC(9e672092) SHA1(fce0b8b43a1c069262f4e3e81c1a04621e232c88) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01a",   0x0000002, 0x200000,  CRC(ae9ddafe) SHA1(afbb26fed6cd0cb5c0099a10d35aeb453318c14d) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01b",   0x0000003, 0x200000,  CRC(94d72d94) SHA1(df6a3fe49c008f73b160eb6f2a44dc371ff73cba) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03c",   0x0000004, 0x200000,  CRC(48a1886d) SHA1(ebf44b42d784924e08a832a7e5f66a887bab244b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03d",   0x0000005, 0x200000,  CRC(172d7e37) SHA1(0eaedd24cd3fa87b6f35fbd63078d40c493c92d0) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03a",   0x0000006, 0x200000,  CRC(9ee33d98) SHA1(85d1bd31940e35ac8c732165020881a2d65cd6b1) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03b",   0x0000007, 0x200000,  CRC(848dee32) SHA1(c591288e86ad1624d0fe66563808af9fac786e64) ) // ROM on a SIMM
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pga.01",   0x00000, 0x08000, CRC(bdbfa992) SHA1(7c5496c1daaea6a7ab95c0b25625d325ec3427cc) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "pga-simm.05a",   0x000000, 0x200000, CRC(c0aac80c) SHA1(91784d35d4f7e113529bb5be6081b67094b150ea) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.05b",   0x200000, 0x200000, CRC(37a65d86) SHA1(374d562a4648734f82aa2ddb6d258e870896dd45) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.06a",   0x400000, 0x200000, CRC(d3f1e934) SHA1(5dcea28c873d0d472f5b94e07d97cd77ace2b252) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.06b",   0x600000, 0x200000, CRC(8b39489a) SHA1(fd790efaf37dc2c4c16f657941044e3e2d3c2711) ) // ROM on a simm
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "pga-simm.05a",   0x000000, 0x200000, CRC(c0aac80c) SHA1(91784d35d4f7e113529bb5be6081b67094b150ea) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.05b",   0x200000, 0x200000, CRC(37a65d86) SHA1(374d562a4648734f82aa2ddb6d258e870896dd45) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.06a",   0x400000, 0x200000, CRC(d3f1e934) SHA1(5dcea28c873d0d472f5b94e07d97cd77ace2b252) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.06b",   0x600000, 0x200000, CRC(8b39489a) SHA1(fd790efaf37dc2c4c16f657941044e3e2d3c2711) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "phoenix.key",  0x000000, 0x000014, CRC(2cf772b0) SHA1(eff33c65a4f3862c231f9e4d6fefa7b34398dbf2) )
 ROM_END
 
 ROM_START( progearjd )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pgaj_d.03", 0x000000, 0x80000, CRC(0271f3a3) SHA1(caf5ce19aa3471e65931ebd7ef06693e9fdf11a7) )
 	ROM_LOAD16_WORD_SWAP( "pgaj_d.04", 0x080000, 0x80000, CRC(be4b7799) SHA1(0414922296079ca9380a41bf3c628ce67acec06d) )
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "pga-simm.01c",   0x0000000, 0x200000,  CRC(452f98b0) SHA1(a10e615c32098f6d25becd466da8faa967523a7b) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01d",   0x0000001, 0x200000,  CRC(9e672092) SHA1(fce0b8b43a1c069262f4e3e81c1a04621e232c88) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01a",   0x0000002, 0x200000,  CRC(ae9ddafe) SHA1(afbb26fed6cd0cb5c0099a10d35aeb453318c14d) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.01b",   0x0000003, 0x200000,  CRC(94d72d94) SHA1(df6a3fe49c008f73b160eb6f2a44dc371ff73cba) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03c",   0x0000004, 0x200000,  CRC(48a1886d) SHA1(ebf44b42d784924e08a832a7e5f66a887bab244b) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03d",   0x0000005, 0x200000,  CRC(172d7e37) SHA1(0eaedd24cd3fa87b6f35fbd63078d40c493c92d0) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03a",   0x0000006, 0x200000,  CRC(9ee33d98) SHA1(85d1bd31940e35ac8c732165020881a2d65cd6b1) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pga-simm.03b",   0x0000007, 0x200000,  CRC(848dee32) SHA1(c591288e86ad1624d0fe66563808af9fac786e64) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "pga-simm.01c",   0x0000000, 0x200000,  CRC(452f98b0) SHA1(a10e615c32098f6d25becd466da8faa967523a7b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01d",   0x0000001, 0x200000,  CRC(9e672092) SHA1(fce0b8b43a1c069262f4e3e81c1a04621e232c88) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01a",   0x0000002, 0x200000,  CRC(ae9ddafe) SHA1(afbb26fed6cd0cb5c0099a10d35aeb453318c14d) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.01b",   0x0000003, 0x200000,  CRC(94d72d94) SHA1(df6a3fe49c008f73b160eb6f2a44dc371ff73cba) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03c",   0x0000004, 0x200000,  CRC(48a1886d) SHA1(ebf44b42d784924e08a832a7e5f66a887bab244b) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03d",   0x0000005, 0x200000,  CRC(172d7e37) SHA1(0eaedd24cd3fa87b6f35fbd63078d40c493c92d0) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03a",   0x0000006, 0x200000,  CRC(9ee33d98) SHA1(85d1bd31940e35ac8c732165020881a2d65cd6b1) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pga-simm.03b",   0x0000007, 0x200000,  CRC(848dee32) SHA1(c591288e86ad1624d0fe66563808af9fac786e64) ) // ROM on a SIMM
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pga.01",   0x00000, 0x08000, CRC(bdbfa992) SHA1(7c5496c1daaea6a7ab95c0b25625d325ec3427cc) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "pga-simm.05a",   0x000000, 0x200000, CRC(c0aac80c) SHA1(91784d35d4f7e113529bb5be6081b67094b150ea) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.05b",   0x200000, 0x200000, CRC(37a65d86) SHA1(374d562a4648734f82aa2ddb6d258e870896dd45) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.06a",   0x400000, 0x200000, CRC(d3f1e934) SHA1(5dcea28c873d0d472f5b94e07d97cd77ace2b252) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pga-simm.06b",   0x600000, 0x200000, CRC(8b39489a) SHA1(fd790efaf37dc2c4c16f657941044e3e2d3c2711) ) // ROM on a simm
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "pga-simm.05a",   0x000000, 0x200000, CRC(c0aac80c) SHA1(91784d35d4f7e113529bb5be6081b67094b150ea) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.05b",   0x200000, 0x200000, CRC(37a65d86) SHA1(374d562a4648734f82aa2ddb6d258e870896dd45) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.06a",   0x400000, 0x200000, CRC(d3f1e934) SHA1(5dcea28c873d0d472f5b94e07d97cd77ace2b252) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pga-simm.06b",   0x600000, 0x200000, CRC(8b39489a) SHA1(fd790efaf37dc2c4c16f657941044e3e2d3c2711) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "phoenix.key",  0x000000, 0x000014, CRC(2cf772b0) SHA1(eff33c65a4f3862c231f9e4d6fefa7b34398dbf2) )
 ROM_END
 
 ROM_START( progearjbl )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pgaj_bl.03", 0x000000, 0x80000, CRC(4fef676c) SHA1(f50f32403315f77e115141bbee6a1b9a800821eb) )
 	ROM_LOAD16_WORD_SWAP( "pgaj_bl.04", 0x080000, 0x80000, CRC(a069bd3b) SHA1(6b7e20c883221da9b8eccb4f86017bb93e1fc11f) )
 
@@ -11263,11 +11338,11 @@
 	ROM_LOAD64_WORD( "pga.17m",   0x0000004, 0x400000, CRC(87f22918) SHA1(7f048d66593f385526bd2c669cf6b8ad58d12bbf) )
 	ROM_LOAD64_WORD( "pga.19m",   0x0000006, 0x400000, CRC(65ffb45b) SHA1(9c21187519c1ec95c5a960b2c815ee41ace4fa7e) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pga.01",   0x00000, 0x08000, CRC(bdbfa992) SHA1(7c5496c1daaea6a7ab95c0b25625d325ec3427cc) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pga.11m",   0x000000, 0x400000, CRC(abdd224e) SHA1(3316708e050204eeee91c642a2546fab80984c60) )
 	ROM_LOAD16_WORD_SWAP( "pga.12m",   0x400000, 0x400000, CRC(dac53406) SHA1(53fd271495429a7cbdeecbbc62b322f019f854a5) )
 
@@ -11276,7 +11351,7 @@
 ROM_END
 
 ROM_START( ssf2ud )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfud.03a", 0x000000, 0x80000, CRC(fad5daf8) SHA1(5bed5d5af8dffc54d3b3371274a3905f46384f79) )
 	ROM_LOAD16_WORD_SWAP( "ssfud.04a", 0x080000, 0x80000, CRC(0d31af65) SHA1(7e903e18cb899627fedd8ad92594b75b5d8ee8fd) )
 	ROM_LOAD16_WORD_SWAP( "ssfud.05",  0x100000, 0x80000, CRC(75c651ef) SHA1(8c6f60d3cf10d802190438c403a719bc30ccbeaa) )
@@ -11293,11 +11368,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -11312,7 +11387,7 @@
 ROM_END
 
 ROM_START( ssf2tbd )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "ssfed.3tc", 0x000000, 0x80000, CRC(5d86caf8) SHA1(6209caad6613f0b35002fb13350ae3f81c8c9c5f) )
 	ROM_LOAD16_WORD_SWAP( "ssfed.4tc", 0x080000, 0x80000, CRC(f6e1f98d) SHA1(2d7506fdf12c8ca8766da1458420e0764f159a9b) )
 	ROM_LOAD16_WORD_SWAP( "ssfed.5t",  0x100000, 0x80000, CRC(75c651ef) SHA1(8c6f60d3cf10d802190438c403a719bc30ccbeaa) )
@@ -11329,11 +11404,11 @@
 	ROM_LOAD64_WORD( "ssf.18m",   0x800004, 0x100000, CRC(f5b1b336) SHA1(4b060501e56b9d61294748da5387cdae5280ec4d) )
 	ROM_LOAD64_WORD( "ssf.20m",   0x800006, 0x100000, CRC(459d5c6b) SHA1(32b11ba7a12004aff810d719bff7508204c7b7c0) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "ssf.01",   0x00000, 0x08000, CRC(eb247e8c) SHA1(24296c18d9b1136d69712bf1c9d9d15463041e83) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD( "ssf.q01",  0x000000, 0x080000, CRC(a6f9da5c) SHA1(6d19f83a01bd25b838d5c2871f7964529d926c98) )
 	ROM_LOAD( "ssf.q02",  0x080000, 0x080000, CRC(8c66ae26) SHA1(32a82aee6ed4480e5a990f9af161734c7c0a1403) )
 	ROM_LOAD( "ssf.q03",  0x100000, 0x080000, CRC(695cc2ca) SHA1(c2675f0233608b76de528d2a6ef19846d1348060) )
@@ -11348,7 +11423,7 @@
 ROM_END
 
 ROM_START( ssf2xjr1d )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfxjd.03c", 0x000000, 0x80000, CRC(316de996) SHA1(4036539a554a9ccd8b5fc364dfc4c97f3d5efa96) )
 	ROM_LOAD16_WORD_SWAP( "sfxjd.04a", 0x080000, 0x80000, CRC(9bf3bb2e) SHA1(4bdc6fa585cc67d3b6695f390c95c518cba2bea6) )
 	ROM_LOAD16_WORD_SWAP( "sfxjd.05",  0x100000, 0x80000, CRC(c63358d0) SHA1(dde4d9e9adce4dee02322c0fd71615eed0af62e6) )
@@ -11371,12 +11446,12 @@
 	ROM_LOAD64_WORD( "sfx.25m",   0xc00004, 0x100000, CRC(1ee90208) SHA1(83df1d9953560edddc2951ea426d29fb014e6a8a) )
 	ROM_LOAD64_WORD( "sfx.27m",   0xc00006, 0x100000, CRC(f814400f) SHA1(ad6921af36d0bd5dfb89b1fb53c3ca3fd92d7204) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfx.01",   0x00000, 0x08000, CRC(b47b8835) SHA1(c8b2d50fe3a329bd0592ea160d505155d873dab1) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfx.02",   0x28000, 0x20000, CRC(0022633f) SHA1(cab3afc79da53e3887eb1ccd1f4d19790728e6cd) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfx.11m",   0x000000, 0x200000, CRC(9bdbd476) SHA1(a8520f77f30b97aae36408e0c4ca1ebbde1808a5) )
 	ROM_LOAD16_WORD_SWAP( "sfx.12m",   0x200000, 0x200000, CRC(a05e3aab) SHA1(d4eb9cae66c74e956569fea8b815156fbd420f83) )
 
@@ -11385,7 +11460,7 @@
 ROM_END
 
 ROM_START( ssf2tad )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sfxad.03c", 0x000000, 0x80000, CRC(e3c92ece) SHA1(8b0d6f632f51719c3e13add5d27701578b6ce0d6) )
 	ROM_LOAD16_WORD_SWAP( "sfxad.04a", 0x080000, 0x80000, CRC(9bf3bb2e) SHA1(4bdc6fa585cc67d3b6695f390c95c518cba2bea6) )
 	ROM_LOAD16_WORD_SWAP( "sfxad.05",  0x100000, 0x80000, CRC(c63358d0) SHA1(dde4d9e9adce4dee02322c0fd71615eed0af62e6) )
@@ -11408,12 +11483,12 @@
 	ROM_LOAD64_WORD( "sfx.25m",   0xc00004, 0x100000, CRC(1ee90208) SHA1(83df1d9953560edddc2951ea426d29fb014e6a8a) )
 	ROM_LOAD64_WORD( "sfx.27m",   0xc00006, 0x100000, CRC(f814400f) SHA1(ad6921af36d0bd5dfb89b1fb53c3ca3fd92d7204) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sfx.01",   0x00000, 0x08000, CRC(b47b8835) SHA1(c8b2d50fe3a329bd0592ea160d505155d873dab1) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sfx.02",   0x28000, 0x20000, CRC(0022633f) SHA1(cab3afc79da53e3887eb1ccd1f4d19790728e6cd) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sfx.11m",   0x000000, 0x200000, CRC(9bdbd476) SHA1(a8520f77f30b97aae36408e0c4ca1ebbde1808a5) )
 	ROM_LOAD16_WORD_SWAP( "sfx.12m",   0x200000, 0x200000, CRC(a05e3aab) SHA1(d4eb9cae66c74e956569fea8b815156fbd420f83) )
 
@@ -11422,7 +11497,7 @@
 ROM_END
 
 ROM_START( sgemfd )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pcfud.03",0x000000, 0x80000, CRC(8b83674a) SHA1(053a2cb6aab9aa43f4c0d4ba9f0eb5a964133b28) )
 	ROM_LOAD16_WORD_SWAP( "pcfd.04", 0x080000, 0x80000, CRC(b58f1d03) SHA1(592649956471363967b9920f47bde23da3e9cc2b) )
 	ROM_LOAD16_WORD_SWAP( "pcf.05",  0x100000, 0x80000, CRC(215655f6) SHA1(242c0f4401520f2a3b0deafc3a807b18b987e496) )
@@ -11439,12 +11514,12 @@
 	ROM_LOAD64_WORD( "pcf.18m",   0x1000004, 0x100000, CRC(756c3754) SHA1(be2f709b90222a567f198f851cf07ffb0ad433d7) )
 	ROM_LOAD64_WORD( "pcf.20m",   0x1000006, 0x100000, CRC(9ec9277d) SHA1(b7ceeaca30dfcdf498b61a6961f0aa1a068b8ec4) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pcf.01",   0x00000, 0x08000, CRC(254e5f33) SHA1(c413ec0630b9bdd15e64f42893eba8958a09b573) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pcf.02",   0x28000, 0x20000, CRC(6902f4f9) SHA1(9bfe4ddade3c666076d26a2b545120f6d059fd7c) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pcf.11m",   0x000000, 0x400000, CRC(a5dea005) SHA1(3ae79baf6ff5bd527f82b26f164c7e3c65423ae2) )
 	ROM_LOAD16_WORD_SWAP( "pcf.12m",   0x400000, 0x400000, CRC(4ce235fe) SHA1(795b94557e954cc0e45fd3778b609064d57a34a2) )
 
@@ -11453,7 +11528,7 @@
 ROM_END
 
 ROM_START( armwar1d )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pwged.03b", 0x000000, 0x80000, CRC(496bd483) SHA1(c3a116ea019843aba666a0d7e7bd2975622306e3) )
 	ROM_LOAD16_WORD_SWAP( "pwged.04b", 0x080000, 0x80000, CRC(9bd6a38f) SHA1(da90162b7bff223df59ac362a5f61c580a86d967) )
 	ROM_LOAD16_WORD_SWAP( "pwged.05a", 0x100000, 0x80000, CRC(4c11d30f) SHA1(463ba1845b1239c839e9419cbc6762d52b7918db) )
@@ -11473,12 +11548,12 @@
 	ROM_LOAD64_WORD( "pwg.18m",   0x1000004, 0x100000, CRC(0109c71b) SHA1(eb51284ee0c85ff8f605fe1d166b7aa202be1344) )
 	ROM_LOAD64_WORD( "pwg.20m",   0x1000006, 0x100000, CRC(eb75ffbe) SHA1(e9d1deca60be696ac5bff2017fb5de3525e5239a) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pwg.01",   0x00000, 0x08000, CRC(18a5c0e4) SHA1(bb1353dd74884aaeec9b5f1d0b284d9cad53c0ff) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pwg.02",   0x28000, 0x20000, CRC(c9dfffa6) SHA1(64e71028befe9a2514074be765dd020e1d2ea70b) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pwg.11m",   0x000000, 0x200000, CRC(a78f7433) SHA1(e47ffba7b9dac9d0dda985c5d966194be18260f7) )
 	ROM_LOAD16_WORD_SWAP( "pwg.12m",   0x200000, 0x200000, CRC(77438ed0) SHA1(733ca6c6a792e66e2aa12c5fc06dd459527afe4b) )
 
@@ -11487,7 +11562,7 @@
 ROM_END
 
 ROM_START( dimahoud )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "gmdud.03", 0x000000, 0x80000, CRC(12888435) SHA1(38204359c505ae861341936cd0fd2517411b8995) )
 	ROM_LOAD16_WORD_SWAP( "gmd.04",   0x080000, 0x80000, CRC(37485567) SHA1(643c41fce6057bcaef0e0bedc62914c33d97eeaf) )
 	ROM_LOAD16_WORD_SWAP( "gmd.05",   0x100000, 0x80000, CRC(da269ffb) SHA1(e99b04192030b6006cf67b563f40cea29c1b2e78) )
@@ -11499,12 +11574,12 @@
 	ROM_LOAD64_WORD( "gmd.17m",   0x000004, 0x400000, CRC(16356520) SHA1(058713bef30c1b1d8b7dd0ceaaa57a3ab9751a70) )
 	ROM_LOAD64_WORD( "gmd.19m",   0x000006, 0x400000, CRC(dfc33031) SHA1(a1ceaeddc2a79d5b79f1b107cac2ef6a5e621e77) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "gmd.01",   0x00000, 0x08000, CRC(3f9bc985) SHA1(1616bbee82877b1052a07531066f5009a80706be) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "gmd.02",   0x28000, 0x20000, CRC(3fd39dde) SHA1(6a6e3ef9baa430ee83ab2312aa0221bae4d73dbd) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "gmd.11m",   0x000000, 0x400000, CRC(06a65542) SHA1(a1b3df70c90055a3cd59d0149fd18a74eff5bcc9) )
 	ROM_LOAD16_WORD_SWAP( "gmd.12m",   0x400000, 0x400000, CRC(50bc7a31) SHA1(7283569fc646c39f4c693f14e0ce7ff2ee49111a) )
 
@@ -11513,7 +11588,7 @@
 ROM_END
 
 ROM_START( mmatrixd )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mmxud.03", 0x000000, 0x80000, CRC(36711e60) SHA1(a192e786798f69320761017437ee4d2d47dc80c5) )
 	ROM_LOAD16_WORD_SWAP( "mmxud.04", 0x080000, 0x80000, CRC(4687226f) SHA1(b831582f578eb1e40bce1d1cbf231e4c27f510cd) )
 	ROM_LOAD16_WORD_SWAP( "mmxud.05", 0x100000, 0x80000, CRC(52124398) SHA1(0a18b9d2a7e3335ddf7ff9ac5c5f8298951f8c67) )
@@ -11528,11 +11603,11 @@
 	ROM_LOAD64_WORD( "mmx.18m",   0x1000004, 0x400000, CRC(2562c9d5) SHA1(e7defc3d33db632c4035ae069f2f2332c58afaf5) )
 	ROM_LOAD64_WORD( "mmx.20m",   0x1000006, 0x400000, CRC(583a9687) SHA1(1d0b08b1e88509245db3c2090f0201938fd750b4) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mmx.01",   0x00000, 0x08000, CRC(c57e8171) SHA1(dedb92af1910d38727f816e6f507d25148f31b74) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mmx.11m",   0x000000, 0x400000, CRC(4180b39f) SHA1(cabb1c358eae1bb6cfed07f5b92e4acd38650667) )
 	ROM_LOAD16_WORD_SWAP( "mmx.12m",   0x400000, 0x400000, CRC(95e22a59) SHA1(b3431d170c0a1a0d826ad0af21300b9180e3f114) )
 
@@ -11541,7 +11616,7 @@
 ROM_END
 
 ROM_START( vhunt2d )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vh2j_d.03a", 0x000000, 0x80000, CRC(696e0157) SHA1(a5c8c7e389f76952ce40ce5792eddb185dd76c41) )
 	ROM_LOAD16_WORD_SWAP( "vh2j_d.04a", 0x080000, 0x80000, CRC(ced9bba3) SHA1(ef7be9d39ae93ffde7d940736de9711a24585ef4) )
 	ROM_LOAD16_WORD_SWAP( "vh2j.05",    0x100000, 0x80000, CRC(de34f624) SHA1(60bbbd1765e76839b01c38765da2368c5188ec61) )
@@ -11561,12 +11636,12 @@
 	ROM_LOAD64_WORD( "vh2.18m",   0x1000004, 0x400000, CRC(778dc4f6) SHA1(8d0cd1c387b4b6ac7f92bb2e5a25983856328cdc) )
 	ROM_LOAD64_WORD( "vh2.20m",   0x1000006, 0x400000, CRC(605d9d1d) SHA1(99bc27557741527ca678d7b6307164bc04ebedc6) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vh2.01",  0x00000, 0x08000, CRC(67b9f779) SHA1(3994c65f888004b56ea9f478b1feaa81e306347e) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vh2.02",  0x28000, 0x20000, CRC(aaf15fcb) SHA1(6f61daa162c835165a8aabaf1d0ea8816fbfbd40) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vh2.11m",  0x000000, 0x400000, CRC(38922efd) SHA1(8cfb36bdce3a524d0a81fec12ca0cba82222fa30) )
 	ROM_LOAD16_WORD_SWAP( "vh2.12m",  0x400000, 0x400000, CRC(6e2430af) SHA1(b475faf943bec4171ba0130f287e1948743ca273) )
 
@@ -11575,7 +11650,7 @@
 ROM_END
 
 ROM_START( vsav2d )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "vs2j_d.03", 0x000000, 0x80000, CRC(50865f7b) SHA1(30914bde1caec55847f28167bfb48bc4473a376c) )
 	ROM_LOAD16_WORD_SWAP( "vs2j_d.04", 0x080000, 0x80000, CRC(c3bff0e3) SHA1(5b81dfdc3bf4e78a9d023cd8c753ce0839c0e175) )
 	ROM_LOAD16_WORD_SWAP( "vs2j.05",   0x100000, 0x80000, CRC(61979638) SHA1(4d5625a9a06926c1a42c8f6e3a4c943f17750ec2) )
@@ -11595,12 +11670,12 @@
 	ROM_LOAD64_WORD( "vs2.18m",   0x1000004, 0x400000, CRC(778dc4f6) SHA1(8d0cd1c387b4b6ac7f92bb2e5a25983856328cdc) )
 	ROM_LOAD64_WORD( "vs2.20m",   0x1000006, 0x400000, CRC(605d9d1d) SHA1(99bc27557741527ca678d7b6307164bc04ebedc6) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "vs2.01",   0x00000, 0x08000, CRC(35190139) SHA1(07f8e53ea398461de5dcda9814dde7c09faf9f65) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "vs2.02",   0x28000, 0x20000, CRC(c32dba09) SHA1(1fe337ff334fab79847f9677ba0e168e93daa1c8) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "vs2.11m",   0x000000, 0x400000, CRC(d67e47b7) SHA1(15a3f6779eccb10551ed94edf7e6e406a79b3de7) )
 	ROM_LOAD16_WORD_SWAP( "vs2.12m",   0x400000, 0x400000, CRC(6d020a14) SHA1(e98f862fac1e357c90949768bb2646263d9981a0) )
 
@@ -11609,7 +11684,7 @@
 ROM_END
 
 ROM_START( csclub1d )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "csce_d.03", 0x000000, 0x80000, CRC(5aedc6e6) SHA1(1330959ac96b0c267e81237974ec44ed7189495a) )
 	ROM_LOAD16_WORD_SWAP( "csce_d.04", 0x080000, 0x80000, CRC(a3d9aa25) SHA1(d7a98cf4506c30b321d8c5a0687fa6938740f951) )
 	ROM_LOAD16_WORD_SWAP( "csce_d.05", 0x100000, 0x80000, CRC(0915c9d1) SHA1(071c6bcfb0ed1047f06c2fbe43a0340aef73dc1d) )
@@ -11635,11 +11710,11 @@
 	ROM_LOAD64_WORD( "csc.95",  0xc00006, 0x080000, CRC(4d014297) SHA1(df172a3723793b9955ff1f65e76fe5c20fc37b89) )
 	ROM_LOAD64_WORD( "csc.96",  0xe00006, 0x080000, CRC(6754b1ef) SHA1(ab5d62056b19999ccecd0eeec7b7c5869ca8fea8) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "csc.01",   0x00000, 0x08000, CRC(ee162111) SHA1(ce8d4bd32bb10ee8b0274ba6fcef05a583b39d48) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "csc.51",   0x000000, 0x080000, CRC(5a52afd5) SHA1(ab873ec556933b75be82ba249357cceb01a7a0bd) )
 	ROM_LOAD16_WORD_SWAP( "csc.52",   0x080000, 0x080000, CRC(1408a811) SHA1(1d31e3cd505245b5ff4d3c55d5fa7017c0f1e168) )
 	ROM_LOAD16_WORD_SWAP( "csc.53",   0x100000, 0x080000, CRC(4fb9f57c) SHA1(093e8e3a03b62783a84fe4ae239e9eb46cbfd71e) )
@@ -11654,7 +11729,7 @@
 ROM_END
 
 ROM_START( cybotsud )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "cybu_d.03", 0x000000, 0x80000, CRC(ee7560fb) SHA1(632e057a7b3a61127beee4ed833a39dcec4ccbd5) )
 	ROM_LOAD16_WORD_SWAP( "cybu_d.04", 0x080000, 0x80000, CRC(7e7425a0) SHA1(6368cf5b04271e68b27abecd67d107bbf58976b4) )
 	ROM_LOAD16_WORD_SWAP( "cyb.05",  0x100000, 0x80000, CRC(ec40408e) SHA1(dd611c1708e7ef86e4f7cac4b7b0dff7baaee5ed) )
@@ -11674,12 +11749,12 @@
 	ROM_LOAD64_WORD( "cyb.18m",   0x1000004, 0x400000, CRC(d83e977d) SHA1(e03f4a120c95a2f476ffc8492bca85e0c5cea068) )
 	ROM_LOAD64_WORD( "cyb.20m",   0x1000006, 0x400000, CRC(77cdad5c) SHA1(94d0cc5f05de4bc2d43977d91f887005dc10310c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "cyb.01",   0x00000, 0x08000, CRC(9c0fb079) SHA1(06d260875a76da08d56ea2b2ae277e8c2dbae6e3) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "cyb.02",   0x28000, 0x20000, CRC(51cb0c4e) SHA1(c322957558d8d3e9dad090aebbe485978cbce8f5) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "cyb.11m",   0x000000, 0x200000, CRC(362ccab2) SHA1(28e537067d4846f22657ee37166d18b8f05f4da1) )
 	ROM_LOAD16_WORD_SWAP( "cyb.12m",   0x200000, 0x200000, CRC(7066e9cc) SHA1(eb6a9d4998b3311344d73bae88d661d81609c492) )
 
@@ -11688,7 +11763,7 @@
 ROM_END
 
 ROM_START( cybotsjd )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "cybj_d.03", 0x000000, 0x80000, CRC(9eb34071) SHA1(b9ef1fa79f79bbb821862764c65a65357a79aa91) )
 	ROM_LOAD16_WORD_SWAP( "cybj_d.04", 0x080000, 0x80000, CRC(cf223cd7) SHA1(834833ae68c3f14f1e06c92273fadfe6918cf3c5) )
 	ROM_LOAD16_WORD_SWAP( "cyb.05",  0x100000, 0x80000, CRC(ec40408e) SHA1(dd611c1708e7ef86e4f7cac4b7b0dff7baaee5ed) )
@@ -11708,12 +11783,12 @@
 	ROM_LOAD64_WORD( "cyb.18m",   0x1000004, 0x400000, CRC(d83e977d) SHA1(e03f4a120c95a2f476ffc8492bca85e0c5cea068) )
 	ROM_LOAD64_WORD( "cyb.20m",   0x1000006, 0x400000, CRC(77cdad5c) SHA1(94d0cc5f05de4bc2d43977d91f887005dc10310c) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "cyb.01",   0x00000, 0x08000, CRC(9c0fb079) SHA1(06d260875a76da08d56ea2b2ae277e8c2dbae6e3) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "cyb.02",   0x28000, 0x20000, CRC(51cb0c4e) SHA1(c322957558d8d3e9dad090aebbe485978cbce8f5) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "cyb.11m",   0x000000, 0x200000, CRC(362ccab2) SHA1(28e537067d4846f22657ee37166d18b8f05f4da1) )
 	ROM_LOAD16_WORD_SWAP( "cyb.12m",   0x200000, 0x200000, CRC(7066e9cc) SHA1(eb6a9d4998b3311344d73bae88d661d81609c492) )
 
@@ -11722,7 +11797,7 @@
 ROM_END
 
 ROM_START( mshvsfu1d )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "mvsu_d.03d", 0x000000, 0x80000, CRC(1c88bee3) SHA1(53ab6df85a900b221cabd62948e68d91cf6146e4) )
 	ROM_LOAD16_WORD_SWAP( "mvsu_d.04d", 0x080000, 0x80000, CRC(1e8b2535) SHA1(51ebede487f955e3f838b7906b619830e67fea52) )
 	ROM_LOAD16_WORD_SWAP( "mvs_d.05a",  0x100000, 0x80000, CRC(373856fb) SHA1(777bf7c74110c029c44a363ce79e50c1863950c2) )
@@ -11742,12 +11817,12 @@
 	ROM_LOAD64_WORD( "mvs.18m",   0x1000004, 0x400000, CRC(c1228b35) SHA1(7afdfb552888c79d0fbb30242b3d917b87fad57a) )
 	ROM_LOAD64_WORD( "mvs.20m",   0x1000006, 0x400000, CRC(366cc6c2) SHA1(6f2a789087c8e404c5227b927fa8328c03593243) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "mvs.01",   0x00000, 0x08000, CRC(68252324) SHA1(138ef320ef27956b2ab5591d49a1315b7b0a194c) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "mvs.02",   0x28000, 0x20000, CRC(b34e773d) SHA1(3bcf44bf06c35814cff29d244142db7abe05bd39) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "mvs.11m",   0x000000, 0x400000, CRC(86219770) SHA1(4e5b68d382a5aa37f8b0b6434c53a2b95f5f9a4d) )
 	ROM_LOAD16_WORD_SWAP( "mvs.12m",   0x400000, 0x400000, CRC(f2fd7f68) SHA1(28a30d55d3eaf963006c7cbe7c288099cd3ba536) )
 
@@ -11756,7 +11831,7 @@
 ROM_END
 
 ROM_START( spf2td )
-	ROM_REGION(CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION(CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pzfu_d.03a", 0x000000, 0x80000, CRC(7836b903) SHA1(9a96a9080716a0cc4d13f51490fd850afe4479a7) )
 	ROM_LOAD16_WORD_SWAP( "pzf.04",    0x080000, 0x80000, CRC(b80649e2) SHA1(5bfccd656aea7ff82e9a20bb5856f4ab99b5a007) )
 
@@ -11770,12 +11845,12 @@
 	ROM_LOAD64_WORD( "pzf.18m",  0x800004, 0x100000, CRC(e43aac33) SHA1(d041e0688c3807d3363861a7f216de43b34d846c) )
 	ROM_LOAD64_WORD( "pzf.20m",  0x800006, 0x100000, CRC(7f536ff1) SHA1(905b9d62ef7bef47297c7f4a4dd697aed6df38a5) )
 
-	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION(QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pzf.01",   0x00000, 0x08000, CRC(600fb2a3) SHA1(1fab1c2a23bf6ad8309d29ddbbc29435a8aeea13) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "pzf.02",   0x28000, 0x20000, CRC(496076e0) SHA1(1ee4e135140afd0e8e03231e570cd77d140f6367) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "pzf.11m",   0x000000, 0x200000, CRC(78442743) SHA1(b61190bb586871de6d54af580e3e1d9cc0de0acb) )
 	ROM_LOAD16_WORD_SWAP( "pzf.12m",   0x200000, 0x200000, CRC(399d2c7b) SHA1(e849dea97b8d16540415c0d9bbc4f9f4eb755ec4) )
 
@@ -11784,7 +11859,7 @@
 ROM_END
 
 ROM_START( sfz3jr2d )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz3j_d.03", 0x000000, 0x80000, CRC(b0436151) SHA1(5170390d5d38bb003602d5714d557005bd7218be) )
 	ROM_LOAD16_WORD_SWAP( "sz3j_d.04", 0x080000, 0x80000, CRC(642d8170) SHA1(1a73f6090a384e7399e49e3a13fe02aa284d4775) )
 	ROM_LOAD16_WORD_SWAP( "sz3.05",  0x100000, 0x80000, CRC(9b21518a) SHA1(5a928307cb90a98a62e7598cb101fb66d62b85f9) )
@@ -11804,12 +11879,12 @@
 	ROM_LOAD64_WORD( "sz3.18m",   0x1000004, 0x400000, CRC(40631ed5) SHA1(c18c56822b90a71ca5fbdf3440eb2671011f3d8f) )
 	ROM_LOAD64_WORD( "sz3.20m",   0x1000006, 0x400000, CRC(763409b4) SHA1(af60a5116c1ca9050366a35ea29128921867f3cc) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz3.01",   0x00000, 0x08000, CRC(de810084) SHA1(fd0b969b732921ed8b40c16fbfa30ee09c7a7cbd) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz3.02",   0x28000, 0x20000, CRC(72445dc4) SHA1(14fca7596ac45ba655016eef5b6120f9f9671c23) )
 
-	ROM_REGION( 0x800000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x800000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz3.11m",   0x000000, 0x400000, CRC(1c89eed1) SHA1(649a0b0a3eb72e2e69e9fb1ac51a58b70daa39f3) )
 	ROM_LOAD16_WORD_SWAP( "sz3.12m",   0x400000, 0x400000, CRC(f392b13a) SHA1(fa04ce0370144a49bd1d5acd873eef87b0dc9d15) )
 
@@ -11818,7 +11893,7 @@
 ROM_END
 
 ROM_START( sfz2jd )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "sz2j_d.03a", 0x000000, 0x80000, CRC(b7325df8) SHA1(cd6e242a5681017463102dcb9133d8dcb262f923) )
 	ROM_LOAD16_WORD_SWAP( "sz2j_d.04a", 0x080000, 0x80000, CRC(a1022a3e) SHA1(4806637ddf22169f12d31f959982cb2f11693066) )
 	ROM_LOAD16_WORD_SWAP( "sz2.05a",  0x100000, 0x80000, CRC(98e8e992) SHA1(41745b63e6b3888081d189b8315ed3b7526b3d20) )
@@ -11836,12 +11911,12 @@
 	ROM_LOAD64_WORD( "sz2.18m",   0x1000004, 0x100000, CRC(4bc3c8bc) SHA1(6256963c515bf56f39b6e559afefd653ead56c54) )
 	ROM_LOAD64_WORD( "sz2.20m",   0x1000006, 0x100000, CRC(39e674c0) SHA1(8e771a2d8c2accad0463bccd21d7b23af0c895a1) )
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "sz2.01a",   0x00000, 0x08000, CRC(1bc323cf) SHA1(83fbd6e9b327700dc9f1c59700b7385bc3705749) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 	ROM_LOAD( "sz2.02a",   0x28000, 0x20000, CRC(ba6a5013) SHA1(7814f3e56b69529b9860dd61c3b1e8d700244b03) )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
 	ROM_LOAD16_WORD_SWAP( "sz2.11m",   0x000000, 0x200000, CRC(aa47a601) SHA1(a4d1ee89c84a3b9db06469bb66e85293b5aa9ac9) )
 	ROM_LOAD16_WORD_SWAP( "sz2.12m",   0x200000, 0x200000, CRC(2237bc53) SHA1(96d5693047e4cf1ed10a8ee1905cea267a278e92) )
 
@@ -11850,78 +11925,78 @@
 ROM_END
 
 ROM_START( pzloop2jd )
-	ROM_REGION( CODE_SIZE, "maincpu", 0 )      /* 68000 code */
+	ROM_REGION( CODE_SIZE, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "pl2j_d.03a", 0x000000, 0x80000, CRC(1f5d41c9) SHA1(a205f8c73136d22c127ee547df724e300647c45a) )
 	ROM_LOAD16_WORD_SWAP( "pl2j_d.04a", 0x080000, 0x80000, CRC(60721b73) SHA1(48918d94b8a21c1bb2bd2fc6166cde6bb427d862) )
 	ROM_LOAD16_WORD_SWAP( "pl2j_d.05a", 0x100000, 0x80000, CRC(0c39799f) SHA1(3c16a814a5bbb2b00bd82a01f17e0ca797192c98) )
 	ROM_LOAD16_WORD_SWAP( "pl2j_d.06a", 0x180000, 0x80000, CRC(f3974d76) SHA1(01f8caf5a85d27b24a18a313e459f508ba98a123) )
 
 	ROM_REGION( 0x1000000, "gfx", 0 )
-	ROMX_LOAD( "pl2-simm.01c",   0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.01d",   0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.01a",   0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.01b",   0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03c",   0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03d",   0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03a",   0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
-	ROMX_LOAD( "pl2-simm.03b",   0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) , ROM_GROUPBYTE | ROM_SKIP(7) ) // ROM on a simm
+	ROM_LOAD64_BYTE( "pl2-simm.01c",   0x0000000, 0x200000, CRC(137b13a7) SHA1(a1ca1bc8699ddfc54d5de1b39a9db9a5ac8b12e5) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.01d",   0x0000001, 0x200000, CRC(a2db1507) SHA1(61c84c8d698a846d54a571b5f7b4824e22136db7) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.01a",   0x0000002, 0x200000, CRC(7e80ff8e) SHA1(afcebfa995ace8b8973e75f1589980c5c4535bca) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.01b",   0x0000003, 0x200000, CRC(cd93e6ed) SHA1(e4afce48fe481d8291ed2475d5de446afad65351) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03c",   0x0000004, 0x200000, CRC(0f52bbca) SHA1(e76c29d445062f5e16d06bdc4ab44640ba35aaac) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03d",   0x0000005, 0x200000, CRC(a62712c3) SHA1(2abfe0209e188010a0ae969f0d9eb7d28820b3f2) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03a",   0x0000006, 0x200000, CRC(b60c9f8e) SHA1(40c7985e04463fb2bd59b3bb6aa5897328d37ff3) ) // ROM on a SIMM
+	ROM_LOAD64_BYTE( "pl2-simm.03b",   0x0000007, 0x200000, CRC(83fef284) SHA1(ef4429f54c456d6485a7d642d49dffafef4435fe) ) // ROM on a SIMM
 
-	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) /* 64k for the audio CPU (+banks) */
+	ROM_REGION( QSOUND_SIZE, "audiocpu", 0 ) // 64k for the audio CPU (+banks)
 	ROM_LOAD( "pl2.01",   0x00000, 0x08000, CRC(35697569) SHA1(13718923cffb9ec53cef9e22d8875370b5f3dd74) )
 	ROM_CONTINUE(         0x10000, 0x18000 )
 
-	ROM_REGION( 0x400000, "qsound", 0 ) /* QSound samples */
-	ROM_LOAD16_WORD_SWAP( "pl2-simm.05a",   0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) // ROM on a simm
-	ROM_LOAD16_WORD_SWAP( "pl2-simm.05b",   0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) // ROM on a simm
+	ROM_REGION( 0x400000, "qsound", 0 ) // QSound samples
+	ROM_LOAD16_WORD_SWAP( "pl2-simm.05a",   0x000000, 0x200000, CRC(85d8fbe8) SHA1(c19d5e9084d07e610379b6e1b6be7bdf0b9b7f7f) ) // ROM on a SIMM
+	ROM_LOAD16_WORD_SWAP( "pl2-simm.05b",   0x200000, 0x200000, CRC(1ed62584) SHA1(28411f610f48cca6424a2d53e2a4ac691e826317) ) // ROM on a SIMM
 
 	ROM_REGION( 0x20, "key", 0 )
 	ROM_LOAD( "phoenix.key",  0x000000, 0x000014, CRC(2cf772b0) SHA1(eff33c65a4f3862c231f9e4d6fefa7b34398dbf2) )
 ROM_END
 
 
-GAME( 1993, ddtodd,     ddtod,    dead_cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "bootleg", "Dungeons & Dragons: Tower of Doom (Euro 940412 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ecofghtrd,  ecofghtr, dead_cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "bootleg", "Eco Fighters (World 931203 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ssf2ud,     ssf2,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Super Street Fighter II: The New Challengers (USA 930911 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1993, ssf2tbd,    ssf2,     dead_cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "bootleg", "Super Street Fighter II: The Tournament Battle (World 931119 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
-GAME( 1994, armwar1d,   armwar,   dead_cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Armored Warriors (Euro 941011 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, avspd,      avsp,     dead_cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Alien vs. Predator (Euro 940520 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, dstlku1d,   dstlk,    dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Darkstalkers: The Night Warriors (USA 940705 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, ringdstd,   ringdest, dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Ring of Destruction: Slammasters II (Euro 940902 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, ssf2tad,    ssf2t,    dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Super Street Fighter II Turbo (Asia 940223 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ddtodd,     ddtod,    dead_cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "bootleg", "Dungeons & Dragons: Tower of Doom (Euro 940412 Phoenix Edition) (bootleg)",                  MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ecofghtrd,  ecofghtr, dead_cps2, ecofghtr,  cps2_state, init_ecofghtr, ROT0,   "bootleg", "Eco Fighters (World 931203 Phoenix Edition) (bootleg)",                                      MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ssf2ud,     ssf2,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Super Street Fighter II: The New Challengers (USA 930911 Phoenix Edition) (bootleg)",        MACHINE_SUPPORTS_SAVE )
+GAME( 1993, ssf2tbd,    ssf2,     dead_cps2, cps2_2p6b, cps2_state, init_ssf2tb,   ROT0,   "bootleg", "Super Street Fighter II: The Tournament Battle (World 931119 Phoenix Edition) (bootleg)",    MACHINE_SUPPORTS_SAVE | MACHINE_NODEVICE_LAN )
+GAME( 1994, armwar1d,   armwar,   dead_cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Armored Warriors (Euro 941011 Phoenix Edition) (bootleg)",                                   MACHINE_SUPPORTS_SAVE )
+GAME( 1994, avspd,      avsp,     dead_cps2, cps2_3p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Alien vs. Predator (Euro 940520 Phoenix Edition) (bootleg)",                                 MACHINE_SUPPORTS_SAVE )
+GAME( 1994, dstlku1d,   dstlk,    dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Darkstalkers: The Night Warriors (USA 940705 Phoenix Edition) (bootleg)",                    MACHINE_SUPPORTS_SAVE )
+GAME( 1994, ringdstd,   ringdest, dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Ring of Destruction: Slammasters II (Euro 940902 Phoenix Edition) (bootleg)",                MACHINE_SUPPORTS_SAVE )
+GAME( 1994, ssf2tad,    ssf2t,    dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Super Street Fighter II Turbo (Asia 940223 Phoenix Edition) (bootleg)",                      MACHINE_SUPPORTS_SAVE )
 GAME( 1994, ssf2xjr1d,  ssf2t,    dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Super Street Fighter II X: Grand Master Challenge (Japan 940223 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, xmcotar1d,  xmcota,   dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "X-Men: Children of the Atom (Euro 950105 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, mshud,      msh,      dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Marvel Super Heroes (US 951024 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, cybotsud,   cybots,   dead_cps2, cybots,    cps2_state, init_cps2,     ROT0,   "bootleg", "Cyberbots: Fullmetal Madness (USA 950424 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, cybotsjd,   cybots,   dead_cps2, cybots,    cps2_state, init_cps2,     ROT0,   "bootleg", "Cyberbots: Fullmetal Madness (Japan 950424) (decrypted bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, nwarrud,    nwarr,    dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Night Warriors: Darkstalkers' Revenge (USA 950406 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, sfad,       sfa,      dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Street Fighter Alpha: Warriors' Dreams (Euro 950727 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, 19xxd,      19xx,     dead_cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "bootleg", "19XX: The War Against Destiny (USA 951207 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, ddsomud,    ddsom,    dead_cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "bootleg", "Dungeons & Dragons: Shadow over Mystara (USA 960619 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, gigaman2,   megaman2, gigaman2,  cps2_2p3b, cps2_state, init_gigaman2, ROT0,   "bootleg", "Giga Man 2: The Power Fighters (bootleg of Mega Man 2: The Power Fighters)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // different layer offsets and sound system
-GAME( 1996, megamn2d,   megaman2, dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Mega Man 2: The Power Fighters (USA 960708 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2ad,     sfa2,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Street Fighter Zero 2 (Asia 960227 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2jd,     sfa2,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Street Fighter Zero 2 (Japan 960227 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, spf2td,     spf2t,    dead_cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "bootleg", "Super Puzzle Fighter II Turbo (USA 960620 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, spf2xjd,    spf2t,    dead_cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "bootleg", "Super Puzzle Fighter II X (Japan 960531 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, sfz2ald,    sfz2al,   dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Street Fighter Zero 2 Alpha (Asia 960826 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1996, xmvsfu1d,   xmvsf,    dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "X-Men Vs. Street Fighter (USA 961004 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, batcird,    batcir,   dead_cps2, cps2_4p2b, cps2_state, init_cps2,     ROT0,   "bootleg", "Battle Circuit (Euro 970319 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, csclub1d,   csclub,   dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Capcom Sports Club (Euro 970722 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, mshvsfu1d,  mshvsf,   dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Marvel Super Heroes Vs. Street Fighter (USA 970625 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, sgemfd,     sgemf,    dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Super Gem Fighter Mini Mix (USA 970904 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, vsavd,      vsav,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Vampire Savior: The Lord of Vampire (Euro 970519 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, vhunt2d,    vhunt2,   dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Vampire Hunter 2: Darkstalkers Revenge (Japan 970913 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1997, vsav2d,     vsav2,    dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Vampire Savior 2: The Lord of Vampire (Japan 970913 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, mvscud,     mvsc,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Marvel Vs. Capcom: Clash of Super Heroes (USA 980123 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfa3ud,     sfa3,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Street Fighter Alpha 3 (USA 980904 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1998, sfz3jr2d,   sfa3,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Street Fighter Zero 3 (Japan 980629 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, gigawingd,  gigawing, dead_cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "bootleg", "Giga Wing (USA 990222 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1999, gigawingjd, gigawing, dead_cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "bootleg", "Giga Wing (Japan 990223 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, 1944d,      1944,     dead_cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "bootleg", "1944: The Loop Master (USA 000620 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, dimahoud,   dimahoo,  dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT270, "bootleg", "Dimahoo (USA 000121 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 2000, mmatrixd,   mmatrix,  dead_cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "bootleg", "Mars Matrix: Hyper Solid Shooting (USA 000412 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, progearud,  progear,  dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Progear (USA 010117 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, progearjd,  progear,  dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Progear no Arashi (Japan 010117 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 2001, progearjbl, progear,  dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Progear no Arashi (Japan 010117) (decrypted bootleg)", MACHINE_SUPPORTS_SAVE ) // not an actual phoenix set, but works as one
-GAME( 2001, pzloop2jd,  pzloop2,  dead_cps2, pzloop2,   cps2_state, init_pzloop2,  ROT0,   "Mitchell (Capcom license)", "Puzz Loop 2 (Japan 010226 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 2004, hsf2d,      hsf2,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Hyper Street Fighter II: The Anniversary Edition (Asia 040202 Phoenix Edition) (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, xmcotar1d,  xmcota,   dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "X-Men: Children of the Atom (Euro 950105 Phoenix Edition) (bootleg)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1995, mshud,      msh,      dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Marvel Super Heroes (US 951024 Phoenix Edition) (bootleg)",                                  MACHINE_SUPPORTS_SAVE )
+GAME( 1995, cybotsud,   cybots,   dead_cps2, cybots,    cps2_state, init_cps2,     ROT0,   "bootleg", "Cyberbots: Fullmetal Madness (USA 950424 Phoenix Edition) (bootleg)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1995, cybotsjd,   cybots,   dead_cps2, cybots,    cps2_state, init_cps2,     ROT0,   "bootleg", "Cyberbots: Fullmetal Madness (Japan 950424) (decrypted bootleg)",                            MACHINE_SUPPORTS_SAVE )
+GAME( 1995, nwarrud,    nwarr,    dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Night Warriors: Darkstalkers' Revenge (USA 950406 Phoenix Edition) (bootleg)",               MACHINE_SUPPORTS_SAVE )
+GAME( 1995, sfad,       sfa,      dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Street Fighter Alpha: Warriors' Dreams (Euro 950727 Phoenix Edition) (bootleg)",             MACHINE_SUPPORTS_SAVE )
+GAME( 1996, 19xxd,      19xx,     dead_cps2, cps2_2p2b, cps2_state, init_cps2,     ROT270, "bootleg", "19XX: The War Against Destiny (USA 951207 Phoenix Edition) (bootleg)",                       MACHINE_SUPPORTS_SAVE )
+GAME( 1996, ddsomud,    ddsom,    dead_cps2, cps2_4p4b, cps2_state, init_cps2,     ROT0,   "bootleg", "Dungeons & Dragons: Shadow over Mystara (USA 960619 Phoenix Edition) (bootleg)",             MACHINE_SUPPORTS_SAVE )
+GAME( 1996, gigaman2,   megaman2, gigaman2,  cps2_2p3b, cps2_state, init_gigaman2, ROT0,   "bootleg", "Giga Man 2: The Power Fighters (bootleg of Mega Man 2: The Power Fighters)",                 MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE ) // Different layer offsets and sound system
+GAME( 1996, megamn2d,   megaman2, dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Mega Man 2: The Power Fighters (USA 960708 Phoenix Edition) (bootleg)",                      MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2ad,     sfa2,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Street Fighter Zero 2 (Asia 960227 Phoenix Edition) (bootleg)",                              MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2jd,     sfa2,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Street Fighter Zero 2 (Japan 960227 Phoenix Edition) (bootleg)",                             MACHINE_SUPPORTS_SAVE )
+GAME( 1996, spf2td,     spf2t,    dead_cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "bootleg", "Super Puzzle Fighter II Turbo (USA 960620 Phoenix Edition) (bootleg)",                       MACHINE_SUPPORTS_SAVE )
+GAME( 1996, spf2xjd,    spf2t,    dead_cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "bootleg", "Super Puzzle Fighter II X (Japan 960531 Phoenix Edition) (bootleg)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1996, sfz2ald,    sfz2al,   dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Street Fighter Zero 2 Alpha (Asia 960826 Phoenix Edition) (bootleg)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1996, xmvsfu1d,   xmvsf,    dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "X-Men Vs. Street Fighter (USA 961004 Phoenix Edition) (bootleg)",                            MACHINE_SUPPORTS_SAVE )
+GAME( 1997, batcird,    batcir,   dead_cps2, cps2_4p2b, cps2_state, init_cps2,     ROT0,   "bootleg", "Battle Circuit (Euro 970319 Phoenix Edition) (bootleg)",                                     MACHINE_SUPPORTS_SAVE )
+GAME( 1997, csclub1d,   csclub,   dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Capcom Sports Club (Euro 970722 Phoenix Edition) (bootleg)",                                 MACHINE_SUPPORTS_SAVE )
+GAME( 1997, mshvsfu1d,  mshvsf,   dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Marvel Super Heroes Vs. Street Fighter (USA 970625 Phoenix Edition) (bootleg)",              MACHINE_SUPPORTS_SAVE )
+GAME( 1997, sgemfd,     sgemf,    dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Super Gem Fighter Mini Mix (USA 970904 Phoenix Edition) (bootleg)",                          MACHINE_SUPPORTS_SAVE )
+GAME( 1997, vsavd,      vsav,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Vampire Savior: The Lord of Vampire (Euro 970519 Phoenix Edition) (bootleg)",                MACHINE_SUPPORTS_SAVE )
+GAME( 1997, vhunt2d,    vhunt2,   dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Vampire Hunter 2: Darkstalkers Revenge (Japan 970913 Phoenix Edition) (bootleg)",            MACHINE_SUPPORTS_SAVE )
+GAME( 1997, vsav2d,     vsav2,    dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Vampire Savior 2: The Lord of Vampire (Japan 970913 Phoenix Edition) (bootleg)",             MACHINE_SUPPORTS_SAVE )
+GAME( 1998, mvscud,     mvsc,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Marvel Vs. Capcom: Clash of Super Heroes (USA 980123 Phoenix Edition) (bootleg)",            MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfa3ud,     sfa3,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Street Fighter Alpha 3 (USA 980904 Phoenix Edition) (bootleg)",                              MACHINE_SUPPORTS_SAVE )
+GAME( 1998, sfz3jr2d,   sfa3,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Street Fighter Zero 3 (Japan 980629 Phoenix Edition) (bootleg)",                             MACHINE_SUPPORTS_SAVE )
+GAME( 1999, gigawingd,  gigawing, dead_cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "bootleg", "Giga Wing (USA 990222 Phoenix Edition) (bootleg)",                                           MACHINE_SUPPORTS_SAVE )
+GAME( 1999, gigawingjd, gigawing, dead_cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "bootleg", "Giga Wing (Japan 990223 Phoenix Edition) (bootleg)",                                         MACHINE_SUPPORTS_SAVE )
+GAME( 2000, 1944d,      1944,     dead_cps2, cps2_2p2b, cps2_state, init_cps2,     ROT0,   "bootleg", "1944: The Loop Master (USA 000620 Phoenix Edition) (bootleg)",                               MACHINE_SUPPORTS_SAVE )
+GAME( 2000, dimahoud,   dimahoo,  dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT270, "bootleg", "Dimahoo (USA 000121 Phoenix Edition) (bootleg)",                                             MACHINE_SUPPORTS_SAVE )
+GAME( 2000, mmatrixd,   mmatrix,  dead_cps2, cps2_2p1b, cps2_state, init_cps2,     ROT0,   "bootleg", "Mars Matrix: Hyper Solid Shooting (USA 000412 Phoenix Edition) (bootleg)",                   MACHINE_SUPPORTS_SAVE )
+GAME( 2001, progearud,  progear,  dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Progear (USA 010117 Phoenix Edition) (bootleg)",                                             MACHINE_SUPPORTS_SAVE )
+GAME( 2001, progearjd,  progear,  dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Progear no Arashi (Japan 010117 Phoenix Edition) (bootleg)",                                 MACHINE_SUPPORTS_SAVE )
+GAME( 2001, progearjbl, progear,  dead_cps2, cps2_2p3b, cps2_state, init_cps2,     ROT0,   "bootleg", "Progear no Arashi (Japan 010117) (decrypted bootleg)",                                       MACHINE_SUPPORTS_SAVE ) // Not an actual phoenix set, but works as one
+GAME( 2001, pzloop2jd,  pzloop2,  dead_cps2, pzloop2,   cps2_state, init_pzloop2,  ROT0,   "Mitchell (Capcom license)", "Puzz Loop 2 (Japan 010226 Phoenix Edition) (bootleg)",                     MACHINE_SUPPORTS_SAVE )
+GAME( 2004, hsf2d,      hsf2,     dead_cps2, cps2_2p6b, cps2_state, init_cps2,     ROT0,   "bootleg", "Hyper Street Fighter II: The Anniversary Edition (Asia 040202 Phoenix Edition) (bootleg)",   MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/craft.cpp mame-0.224+dfsg.1/src/mame/drivers/craft.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/craft.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/craft.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,280 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Ryan Holtz
-/**********************************************************************
-
- "Craft" demo platform by Linus Akesson
-
-**********************************************************************/
-
-#include "emu.h"
-#include "cpu/avr8/avr8.h"
-#include "sound/dac.h"
-#include "sound/volt_reg.h"
-#include "screen.h"
-#include "emupal.h"
-#include "speaker.h"
-
-#define MASTER_CLOCK    20000000
-
-#define VISIBLE_CYCLES      480
-#define HSYNC_CYCLES        155
-#define LINE_CYCLES         (VISIBLE_CYCLES + HSYNC_CYCLES)
-#define VISIBLE_LINES       480
-#define VSYNC_LINES         45
-#define LINES_PER_FRAME     (VISIBLE_LINES + VSYNC_LINES)
-#define CYCLES_PER_FRAME    (LINES_PER_FRAME * LINE_CYCLES)
-#define PIXELS_PER_FRAME    (CYCLES_PER_FRAME)
-
-class craft_state : public driver_device
-{
-public:
-	craft_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag)
-		, m_maincpu(*this, "maincpu")
-		, m_screen(*this, "screen")
-		, m_palette(*this, "palette")
-		, m_dac(*this, "dac")
-	{
-	}
-
-	void craft(machine_config &config);
-
-private:
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-
-	void craft_prg_map(address_map &map);
-	void craft_data_map(address_map &map);
-	void craft_io_map(address_map &map);
-
-	uint8_t port_r(offs_t offset);
-	void port_w(offs_t offset, uint8_t data);
-
-	void init_palette(palette_device &palette) const;
-	void video_update();
-	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
-	required_device<avr8_device> m_maincpu;
-	required_device<screen_device> m_screen;
-	required_device<palette_device> m_palette;
-	required_device<dac_byte_interface> m_dac;
-
-	uint32_t m_last_cycles;
-	uint64_t m_frame_start_cycle;
-
-	uint8_t m_port_b;
-	uint8_t m_port_c;
-	uint8_t m_port_d;
-
-	uint8_t m_latched_color;
-	std::unique_ptr<uint8_t[]> m_pixels;
-};
-
-//**************************************************************************
-//  GPIO
-//**************************************************************************
-
-uint8_t craft_state::port_r(offs_t offset)
-{
-	switch (offset)
-	{
-		case 0x00: // Port A
-			break;
-		case 0x01: // Port B
-			return m_port_b;
-		case 0x02: // Port C
-			return m_port_c;
-		case 0x03: // Port D
-			return m_port_d;
-	}
-
-	return 0;
-}
-
-void craft_state::port_w(offs_t offset, uint8_t data)
-{
-	switch (offset)
-	{
-		case AVR8_IO_PORTA:
-			break;
-
-		case AVR8_IO_PORTB:
-		{
-			uint8_t old_port_b = m_port_b;
-			uint8_t pins = data;
-			uint8_t changed = pins ^ old_port_b;
-			if (BIT(changed, 1) && BIT(data, 1))
-			{
-				m_frame_start_cycle = machine().time().as_ticks(MASTER_CLOCK);
-				video_update();
-			}
-			if (BIT(changed, 3))
-			{
-				video_update();
-				m_latched_color = (pins & 0x08) ? (m_port_c & 0x3f) : 0x3f;
-			}
-			m_port_b = data;
-			break;
-		}
-
-		case AVR8_IO_PORTC:
-			video_update();
-			m_port_c = data;
-			m_latched_color = m_port_c;
-			break;
-
-		case AVR8_IO_PORTD:
-			m_port_d = data;
-			m_dac->write((data & 0x02) | ((data & 0xf4) >> 2));
-			break;
-	}
-}
-
-//**************************************************************************
-//  MEMORY
-//**************************************************************************
-
-void craft_state::craft_prg_map(address_map &map)
-{
-	map(0x0000, 0x1fff).rom();
-}
-
-void craft_state::craft_data_map(address_map &map)
-{
-	map(0x0100, 0x04ff).ram();
-}
-
-void craft_state::craft_io_map(address_map &map)
-{
-	map(AVR8_IO_PORTA, AVR8_IO_PORTD).rw(FUNC(craft_state::port_r), FUNC(craft_state::port_w));
-}
-
-//**************************************************************************
-//  VIDEO
-//**************************************************************************
-
-void craft_state::init_palette(palette_device &palette) const
-{
-	for (int i = 0; i < 0x40; i++)
-	{
-		uint8_t r = 0x55 * ((i & 0x30) >> 4);
-		uint8_t g = 0x55 * ((i & 0x0c) >> 2);
-		uint8_t b = 0x55 * (i & 0x03);
-		palette.set_pen_color(i, rgb_t(r, g, b));
-	}
-}
-
-void craft_state::video_update()
-{
-	uint64_t cycles = machine().time().as_ticks(MASTER_CLOCK);
-	uint32_t frame_cycles = (uint32_t)(cycles - m_frame_start_cycle);
-
-	if (m_last_cycles < frame_cycles)
-	{
-		for (uint32_t pixidx = m_last_cycles; pixidx < frame_cycles && pixidx < PIXELS_PER_FRAME; pixidx++)
-		{
-			m_pixels[pixidx] = m_latched_color;
-		}
-	}
-	else
-	{
-		uint32_t end_clear = sizeof(m_pixels) - m_last_cycles;
-		uint32_t start_clear = frame_cycles;
-		end_clear = (end_clear > PIXELS_PER_FRAME) ? (PIXELS_PER_FRAME - m_last_cycles) : end_clear;
-		start_clear = (start_clear > PIXELS_PER_FRAME) ? PIXELS_PER_FRAME : start_clear;
-		if (m_last_cycles < PIXELS_PER_FRAME)
-		{
-			//memset(&m_pixels[0] + m_last_cycles, 0, end_clear);
-		}
-		if (start_clear < PIXELS_PER_FRAME)
-		{
-			//memset(&m_pixels[0], 0, start_clear);
-		}
-	}
-
-	m_last_cycles = frame_cycles;
-}
-
-uint32_t craft_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
-{
-	const pen_t *pens = m_palette->pens();
-	for(int y = 0; y < LINES_PER_FRAME; y++)
-	{
-		uint32_t *dst = &bitmap.pix32(y);
-		uint8_t *src = &m_pixels[y * LINE_CYCLES];
-		for(int x = 0; x < LINE_CYCLES; x++)
-		{
-			*dst++ = pens[*src++];
-		}
-	}
-	return 0;
-}
-
-//**************************************************************************
-//  MACHINE
-//**************************************************************************
-
-static INPUT_PORTS_START( craft )
-INPUT_PORTS_END
-
-void craft_state::machine_start()
-{
-	m_pixels = std::make_unique<uint8_t[]>(PIXELS_PER_FRAME);
-
-	save_item(NAME(m_last_cycles));
-	save_item(NAME(m_frame_start_cycle));
-
-	save_item(NAME(m_port_b));
-	save_item(NAME(m_port_c));
-	save_item(NAME(m_port_d));
-
-	save_item(NAME(m_latched_color));
-	save_pointer(NAME(m_pixels), PIXELS_PER_FRAME);
-}
-
-void craft_state::machine_reset()
-{
-	m_frame_start_cycle = 0;
-	m_last_cycles = 0;
-
-	m_port_b = 0;
-	m_port_c = 0;
-	m_port_d = 0;
-
-	m_latched_color = 0;
-	memset(&m_pixels[0], 0, PIXELS_PER_FRAME);
-}
-
-void craft_state::craft(machine_config &config)
-{
-	/* basic machine hardware */
-	ATMEGA88(config, m_maincpu, MASTER_CLOCK);
-	m_maincpu->set_addrmap(AS_PROGRAM, &craft_state::craft_prg_map);
-	m_maincpu->set_addrmap(AS_DATA, &craft_state::craft_data_map);
-	m_maincpu->set_addrmap(AS_IO, &craft_state::craft_io_map);
-	m_maincpu->set_eeprom_tag("eeprom");
-
-	/* video hardware */
-	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
-	m_screen->set_raw(MASTER_CLOCK, 635, 47, 527, 525, 36, 516);
-	m_screen->set_screen_update(FUNC(craft_state::screen_update));
-
-	PALETTE(config, m_palette, FUNC(craft_state::init_palette), 64);
-
-	/* sound hardware */
-	SPEAKER(config, "avr8").front_center();
-	DAC_6BIT_R2R(config, "dac", 0).add_route(0, "avr8", 0.25); // pd1/pd2/pd4/pd5/pd6/pd7 + 2k(x7) + 1k(x5)
-	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
-	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
-	vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
-}
-
-ROM_START( craft )
-	ROM_REGION( 0x2000, "maincpu", 0 )  /* Main program store */
-	ROM_LOAD( "craft.bin", 0x0000, 0x2000, CRC(2e6f9ad2) SHA1(75e495bf18395d74289ca7ee2649622fc4010457) )
-	ROM_REGION( 0x200, "eeprom", 0 )  /* on-die eeprom */
-	ROM_LOAD( "eeprom.raw", 0x0000, 0x0200, CRC(e18a2af9) SHA1(81fc6f2d391edfd3244870214fac37929af0ac0c) )
-ROM_END
-
-/*   YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY          FULLNAME */
-CONS(2008, craft, 0,      0,      craft,   craft, craft_state, empty_init, "Linus Akesson", "Craft", MACHINE_IMPERFECT_GRAPHICS)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/crshrace.cpp mame-0.224+dfsg.1/src/mame/drivers/crshrace.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/crshrace.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/crshrace.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,7 +7,7 @@
 driver by Nicola Salmoria
 
 Notes:
-- Keep player1 button1&2 pressed while entering service mode to get an
+- Keep player1 button 1 & 2 pressed while entering service mode to get an
   extended menu
 
 
@@ -17,7 +17,7 @@
 
   - There seems to be preliminary support for 3 simultaneous players, but the
     game resets before the race starts if the 3 players don't play against each
-    other ! I can't tell however if it's an ingame or an emulation bug.
+    other! I can't tell however if it's an ingame or an emulation bug.
     To test this, change CRSHRACE_3P_HACK to 1, set the "Reset on P.O.S.T. Error"
     Dip Switch to "No" (because of the ROMS patch), and set the "Maximum Players"
     Dip Switch to "3".
@@ -140,25 +140,26 @@
 #define CRSHRACE_3P_HACK    0
 
 
-void crshrace_state::crshrace_sh_bankswitch_w(uint8_t data)
+void crshrace_state::sh_bankswitch_w(uint8_t data)
 {
 	m_z80bank->set_entry(data & 0x03);
 }
 
 
-void crshrace_state::crshrace_map(address_map &map)
+void crshrace_state::main_map(address_map &map)
 {
 	map(0x000000, 0x07ffff).rom();
 	map(0x300000, 0x3fffff).rom().region("user1", 0);
 	map(0x400000, 0x4fffff).rom().region("user2", 0).mirror(0x100000);
-	map(0xa00000, 0xa0ffff).ram().share("spriteram2");
-	map(0xd00000, 0xd01fff).ram().w(FUNC(crshrace_state::crshrace_videoram1_w)).share("videoram1");
-	map(0xe00000, 0xe01fff).ram().share("spriteram");
+	map(0xa00000, 0xa0ffff).ram().share("spriteram.1");
+	map(0xd00000, 0xd01fff).ram().w(FUNC(crshrace_state::videoram_w<0>)).share(m_videoram[0]);
+	map(0xe00000, 0xe01fff).ram().share("spriteram.0");
 	map(0xfe0000, 0xfeffff).ram();
-	map(0xffc000, 0xffc001).w(FUNC(crshrace_state::crshrace_roz_bank_w));
-	map(0xffd000, 0xffdfff).ram().w(FUNC(crshrace_state::crshrace_videoram2_w)).share("videoram2");
+	map(0xffc001, 0xffc001).w(FUNC(crshrace_state::roz_bank_w));
+	map(0xffd000, 0xffdfff).ram().w(FUNC(crshrace_state::videoram_w<1>)).share(m_videoram[1]);
 	map(0xffe000, 0xffefff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
-	map(0xfff000, 0xfff001).portr("P1").w(FUNC(crshrace_state::crshrace_gfxctrl_w));
+	map(0xfff001, 0xfff001).w(FUNC(crshrace_state::gfxctrl_w));
+	map(0xfff000, 0xfff001).portr("P1");
 	map(0xfff002, 0xfff003).portr("P2");
 	map(0xfff004, 0xfff005).portr("DSW0");
 	map(0xfff006, 0xfff007).portr("DSW2");
@@ -173,13 +174,13 @@
 {
 	map(0x0000, 0x77ff).rom();
 	map(0x7800, 0x7fff).ram();
-	map(0x8000, 0xffff).bankr("bank1");
+	map(0x8000, 0xffff).bankr(m_z80bank);
 }
 
 void crshrace_state::sound_io_map(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0x00, 0x00).w(FUNC(crshrace_state::crshrace_sh_bankswitch_w));
+	map(0x00, 0x00).w(FUNC(crshrace_state::sh_bankswitch_w));
 	map(0x04, 0x04).rw(m_soundlatch, FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::acknowledge_w));
 	map(0x08, 0x0b).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write));
 }
@@ -215,7 +216,7 @@
 	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("DSW0")
-	/* DSW2 : 0xfe1c84 = !(0xfff005) */
+	// DSW2 : 0xfe1c84 = !(0xfff005)
 	PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
 	PORT_DIPSETTING(      0x0001, DEF_STR( Off ) )
 	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
@@ -233,7 +234,7 @@
 	PORT_DIPSETTING(      0x00c0, DEF_STR( Normal ) )
 	PORT_DIPSETTING(      0x0040, DEF_STR( Hard ) )
 	PORT_DIPSETTING(      0x0000, DEF_STR( Hardest ) )
-	/* DSW1 : 0xfe1c83 = !(0xfff004) */
+	// DSW1 : 0xfe1c83 = !(0xfff004)
 	PORT_DIPNAME( 0x0100, 0x0100, "Coin Slot" ) PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(      0x0100, "Same" )
 	PORT_DIPSETTING(      0x0000, "Individual" )
@@ -270,7 +271,7 @@
 	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
 
 	PORT_START("DSW1")
-	/* DSW3 : 0xfe1c85 = !(0xfff00b) */
+	// DSW3 : 0xfe1c85 = !(0xfff00b)
 #if CRSHRACE_3P_HACK
 	PORT_DIPNAME( 0x0001, 0x0001, "Maximum Players" ) PORT_DIPLOCATION("SW3:1")
 	PORT_DIPSETTING(      0x0001, "2" )
@@ -329,10 +330,10 @@
     PORT_DIPSETTING(      0x0e00, "5" )
     PORT_DIPSETTING(      0x0f00, "5" )
 */
-	PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("soundlatch", generic_latch_8_device, pending_r)  /* pending sound command */
+	PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("soundlatch", generic_latch_8_device, pending_r)  // pending sound command
 INPUT_PORTS_END
 
-/* Same as 'crshrace', but additional "unknown" Dip Switch (see notes) */
+// Same as 'crshrace', but additional "unknown" Dip Switch (see notes)
 static INPUT_PORTS_START( crshrace2 )
 	PORT_INCLUDE( crshrace )
 
@@ -380,15 +381,15 @@
 };
 
 static GFXDECODE_START( gfx_crshrace )
-	GFXDECODE_ENTRY( "gfx1", 0, charlayout,     0,  1 )
-	GFXDECODE_ENTRY( "gfx2", 0, tilelayout,   256, 16 )
-	GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 512, 32 )
+	GFXDECODE_ENTRY( "chars",   0, charlayout,     0,  1 )
+	GFXDECODE_ENTRY( "tiles",   0, tilelayout,   256, 16 )
+	GFXDECODE_ENTRY( "sprites", 0, spritelayout, 512, 32 )
 GFXDECODE_END
 
 
 void crshrace_state::machine_start()
 {
-	m_z80bank->configure_entries(0, 4, memregion("audiocpu")->base() + 0x10000, 0x8000);
+	m_z80bank->configure_entries(0, 4, memregion("audiocpu")->base(), 0x8000);
 
 	save_item(NAME(m_roz_bank));
 	save_item(NAME(m_gfxctrl));
@@ -404,41 +405,41 @@
 
 void crshrace_state::crshrace(machine_config &config)
 {
-	/* basic machine hardware */
-	M68000(config, m_maincpu, 16000000);    /* 16 MHz ??? */
-	m_maincpu->set_addrmap(AS_PROGRAM, &crshrace_state::crshrace_map);
+	// basic machine hardware
+	M68000(config, m_maincpu, 16000000);    // 16 MHz ???
+	m_maincpu->set_addrmap(AS_PROGRAM, &crshrace_state::main_map);
 	m_maincpu->set_vblank_int("screen", FUNC(crshrace_state::irq1_line_hold));
 
-	Z80(config, m_audiocpu, 4000000);   /* 4 MHz ??? */
+	Z80(config, m_audiocpu, 4000000);   // 4 MHz ???
 	m_audiocpu->set_addrmap(AS_PROGRAM, &crshrace_state::sound_map);
 	m_audiocpu->set_addrmap(AS_IO, &crshrace_state::sound_io_map);
 
-	/* video hardware */
+	// video hardware
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(60);
 	screen.set_size(64*8, 32*8);
 	screen.set_visarea(0*8, 40*8-1, 0*8, 28*8-1);
-	screen.set_screen_update(FUNC(crshrace_state::screen_update_crshrace));
-	screen.screen_vblank().set(m_spriteram, FUNC(buffered_spriteram16_device::vblank_copy_rising));
-	screen.screen_vblank().append(m_spriteram2, FUNC(buffered_spriteram16_device::vblank_copy_rising));
+	screen.set_screen_update(FUNC(crshrace_state::screen_update));
+	screen.screen_vblank().set(m_spriteram[0], FUNC(buffered_spriteram16_device::vblank_copy_rising));
+	screen.screen_vblank().append(m_spriteram[1], FUNC(buffered_spriteram16_device::vblank_copy_rising));
 	screen.set_palette(m_palette);
 
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_crshrace);
 	PALETTE(config, m_palette).set_format(palette_device::xGBR_555, 2048);
 
 	VSYSTEM_SPR(config, m_spr, 0);
-	m_spr->set_tile_indirect_cb(FUNC(crshrace_state::crshrace_tile_callback));
+	m_spr->set_tile_indirect_cb(FUNC(crshrace_state::tile_callback));
 	m_spr->set_gfx_region(2);
 	m_spr->set_gfxdecode_tag(m_gfxdecode);
 
-	BUFFERED_SPRITERAM16(config, m_spriteram);
-	BUFFERED_SPRITERAM16(config, m_spriteram2);
+	BUFFERED_SPRITERAM16(config, m_spriteram[0]);
+	BUFFERED_SPRITERAM16(config, m_spriteram[1]);
 
 	K053936(config, m_k053936, 0);
 	m_k053936->set_wrap(1);
 	m_k053936->set_offsets(-48, -21);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
 
@@ -456,78 +457,76 @@
 
 
 ROM_START( crshrace )
-	ROM_REGION( 0x80000, "maincpu", 0 ) /* 68000 code */
+	ROM_REGION( 0x80000, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "1",            0x000000, 0x80000, CRC(21e34fb7) SHA1(be47b4a9bce2d6ce0a127dffe032c61547b2a3c0) )
 
-	ROM_REGION16_BE( 0x100000, "user1", 0 )  /* extra ROM */
+	ROM_REGION16_BE( 0x100000, "user1", 0 )  // extra ROM
 	ROM_LOAD16_WORD_SWAP( "w21",          0x000000, 0x100000, CRC(a5df7325) SHA1(614095a086164af5b5e73245744411187d81deec) )
 
-	ROM_REGION16_BE( 0x100000, "user2", 0 )  /* extra ROM */
+	ROM_REGION16_BE( 0x100000, "user2", 0 )  // extra ROM
 	ROM_LOAD16_WORD_SWAP( "w22",          0x000000, 0x100000, CRC(fc9d666d) SHA1(45aafcce82b668f93e51b5e4d092b1d0077e5192) )
 
-	ROM_REGION( 0x30000, "audiocpu", 0 )    /* 64k for the audio CPU + banks */
+	ROM_REGION( 0x20000, "audiocpu", 0 )    // 64k for the audio CPU + banks
 	ROM_LOAD( "2",            0x00000, 0x20000, CRC(e70a900f) SHA1(edfe5df2dab5a7dccebe1a6f978144bcd516ab03) )
-	ROM_RELOAD(               0x10000, 0x20000 )
 
-	ROM_REGION( 0x100000, "gfx1", 0 )
+	ROM_REGION( 0x100000, "chars", 0 )
 	ROM_LOAD( "h895",         0x000000, 0x100000, CRC(36ad93c3) SHA1(f68f229dd1a1f8bfd3b8f73b6627f5f00f809d34) )
 
-	ROM_REGION( 0x400000, "gfx2", 0 )
+	ROM_REGION( 0x400000, "tiles", 0 )
 	ROM_LOAD( "w18",          0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) )
 	ROM_LOAD( "w19",          0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) )
 	ROM_LOAD( "w20",          0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) )
-	/* 300000-3fffff empty */
+	// 300000-3fffff empty
 
-	ROM_REGION( 0x400000, "gfx3", 0 )
+	ROM_REGION( 0x400000, "sprites", 0 )
 	ROM_LOAD( "h897",         0x000000, 0x200000, CRC(e3230128) SHA1(758c65f113481cf25bf0359deecd6736a7c9ee7e) )
 	ROM_LOAD( "h896",         0x200000, 0x200000, CRC(fff60233) SHA1(56b4b708883a80761dc5f9184780477d72b80351) )
 
-	ROM_REGION( 0x100000, "ymsnd.deltat", 0 ) /* sound samples */
+	ROM_REGION( 0x100000, "ymsnd.deltat", 0 ) // sound samples
 	ROM_LOAD( "h894",         0x000000, 0x100000, CRC(d53300c1) SHA1(4c3ff7d3156791cb960c28845a5f1906605bce55) )
 
-	ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */
+	ROM_REGION( 0x100000, "ymsnd", 0 ) // sound samples
 	ROM_LOAD( "h893",         0x000000, 0x100000, CRC(32513b63) SHA1(c4ede4aaa2611cedb53d47448422a1926acf3052) )
 ROM_END
 
 ROM_START( crshrace2 )
-	ROM_REGION( 0x80000, "maincpu", 0 ) /* 68000 code */
+	ROM_REGION( 0x80000, "maincpu", 0 ) // 68000 code
 	ROM_LOAD16_WORD_SWAP( "01-ic10.bin",  0x000000, 0x80000, CRC(b284aacd) SHA1(f0ef279cdec30eb32e8aa8cdd51e289b70f2d6f5) )
 
-	ROM_REGION16_BE( 0x100000, "user1", 0 )  /* extra ROM */
+	ROM_REGION16_BE( 0x100000, "user1", 0 )  // extra ROM
 	ROM_LOAD16_WORD_SWAP( "w21",          0x000000, 0x100000, CRC(a5df7325) SHA1(614095a086164af5b5e73245744411187d81deec) )    // IC14.BIN
 
-	ROM_REGION16_BE( 0x100000, "user2", 0 )  /* extra ROM */
+	ROM_REGION16_BE( 0x100000, "user2", 0 )  // extra ROM
 	ROM_LOAD16_WORD_SWAP( "w22",          0x000000, 0x100000, CRC(fc9d666d) SHA1(45aafcce82b668f93e51b5e4d092b1d0077e5192) )    // IC13.BIN
 
-	ROM_REGION( 0x30000, "audiocpu", 0 )    /* 64k for the audio CPU + banks */
+	ROM_REGION( 0x20000, "audiocpu", 0 )    // 64k for the audio CPU + banks
 	ROM_LOAD( "2",            0x00000, 0x20000, CRC(e70a900f) SHA1(edfe5df2dab5a7dccebe1a6f978144bcd516ab03) )  // 02-IC58.BIN
-	ROM_RELOAD(               0x10000, 0x20000 )
 
-	ROM_REGION( 0x100000, "gfx1", 0 )
+	ROM_REGION( 0x100000, "chars", 0 )
 	ROM_LOAD( "h895",         0x000000, 0x100000, CRC(36ad93c3) SHA1(f68f229dd1a1f8bfd3b8f73b6627f5f00f809d34) )    // IC50.BIN
 
-	ROM_REGION( 0x400000, "gfx2", 0 )
+	ROM_REGION( 0x400000, "tiles", 0 )
 	ROM_LOAD( "w18",          0x000000, 0x100000, CRC(b15df90d) SHA1(56e38e6c40a02553b6b8c5282aa8f16b20779ebf) )    // ROM-A.BIN
 	ROM_LOAD( "w19",          0x100000, 0x100000, CRC(28326b93) SHA1(997e9b250b984b012ce1d165add59c741fb18171) )    // ROM-B.BIN
 	ROM_LOAD( "w20",          0x200000, 0x100000, CRC(d4056ad1) SHA1(4b45b14aa0766d7aef72f060e1cd28d67690d5fe) )    // ROM-C.BIN
-	/* 300000-3fffff empty */
+	// 300000-3fffff empty
 
-	ROM_REGION( 0x400000, "gfx3", 0 )
+	ROM_REGION( 0x400000, "sprites", 0 )
 	ROM_LOAD( "h897",         0x000000, 0x200000, CRC(e3230128) SHA1(758c65f113481cf25bf0359deecd6736a7c9ee7e) )    // IC29.BIN
 	ROM_LOAD( "h896",         0x200000, 0x200000, CRC(fff60233) SHA1(56b4b708883a80761dc5f9184780477d72b80351) )    // IC75.BIN
 
-	ROM_REGION( 0x100000, "ymsnd.deltat", 0 ) /* sound samples */
+	ROM_REGION( 0x100000, "ymsnd.deltat", 0 ) // sound samples
 	ROM_LOAD( "h894",         0x000000, 0x100000, CRC(d53300c1) SHA1(4c3ff7d3156791cb960c28845a5f1906605bce55) )    // IC73.BIN
 
-	ROM_REGION( 0x100000, "ymsnd", 0 ) /* sound samples */
+	ROM_REGION( 0x100000, "ymsnd", 0 ) // sound samples
 	ROM_LOAD( "h893",         0x000000, 0x100000, CRC(32513b63) SHA1(c4ede4aaa2611cedb53d47448422a1926acf3052) )    // IC69.BIN
 ROM_END
 
 
 #ifdef UNUSED_FUNCTION
-void crshrace_state::crshrace_patch_code( uint16_t offset )
+void crshrace_state::patch_code(uint16_t offset)
 {
-	/* A hack which shows 3 player mode in code which is disabled */
+	// A hack which shows 3 player mode in code which is disabled
 	uint16_t *RAM = (uint16_t *)memregion("maincpu")->base();
 	RAM[(offset + 0)/2] = 0x4e71;
 	RAM[(offset + 2)/2] = 0x4e71;
@@ -539,14 +538,14 @@
 void crshrace_state::init_crshrace()
 {
 	#if CRSHRACE_3P_HACK
-	crshrace_patch_code(0x003778);
+	patch_code(0x003778);
 	#endif
 }
 
 void crshrace_state::init_crshrace2()
 {
 	#if CRSHRACE_3P_HACK
-	crshrace_patch_code(0x003796);
+	patch_code(0x003796);
 	#endif
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cv1k.cpp mame-0.224+dfsg.1/src/mame/drivers/cv1k.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cv1k.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cv1k.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -180,7 +180,6 @@
 #include "video/epic12.h"
 
 #include "emupal.h"
-#include "profiler.h"
 #include "screen.h"
 #include "speaker.h"
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cxg_ch2001.cpp mame-0.224+dfsg.1/src/mame/drivers/cxg_ch2001.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cxg_ch2001.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cxg_ch2001.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,7 +3,8 @@
 // thanks-to:Berger
 /******************************************************************************
 
-CXG Chess 2001, also sold by Hanimex as HCG 1900 and by CGL as Computachess Champion.
+CXG Chess 2001, also sold by Hanimex as Computachess (model HCG 1900),
+and by CGL as Computachess Champion.
 CXG Chess 3000 is assumed to be on similar hardware as this.
 
 The chess engine is by Richard Lang, based on Cyrus.
@@ -74,16 +75,12 @@
 	void leds_w(u8 data);
 	u8 input_r();
 
-	u16 m_inp_mux;
-	int m_dac_data;
+	u16 m_inp_mux = 0;
+	int m_dac_data = 0;
 };
 
 void ch2001_state::machine_start()
 {
-	// zerofill
-	m_inp_mux = 0;
-	m_dac_data = 0;
-
 	// register for savestates
 	save_item(NAME(m_inp_mux));
 	save_item(NAME(m_dac_data));
@@ -188,7 +185,7 @@
 	Z80(config, m_maincpu, 8_MHz_XTAL/2);
 	m_maincpu->set_addrmap(AS_PROGRAM, &ch2001_state::main_map);
 
-	const attotime irq_period = attotime::from_hz(533); // theoretical frequency from 555 timer (20nF, 100K+33K, 1K2), measurement was 568Hz
+	const attotime irq_period = attotime::from_hz(568); // 555 timer (20nF, 100K+33K, 1K2), measured 568Hz
 	TIMER(config, m_irq_on).configure_periodic(FUNC(ch2001_state::irq_on<INPUT_LINE_IRQ0>), irq_period);
 	m_irq_on->set_start_delay(irq_period - attotime::from_nsec(16600)); // active for 16.6us
 	TIMER(config, "irq_off").configure_periodic(FUNC(ch2001_state::irq_off<INPUT_LINE_IRQ0>), irq_period);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/cxg_dominator.cpp mame-0.224+dfsg.1/src/mame/drivers/cxg_dominator.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/cxg_dominator.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/cxg_dominator.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -204,8 +204,8 @@
 	R65C02(config, m_maincpu, 4_MHz_XTAL);
 	m_maincpu->set_addrmap(AS_PROGRAM, &dominator_state::main_map);
 
-	const attotime irq_period = attotime::from_hz(4_MHz_XTAL / 0x2000); // from 4020
-	m_maincpu->set_periodic_int(FUNC(dominator_state::nmi_line_pulse), irq_period);
+	const attotime nmi_period = attotime::from_hz(4_MHz_XTAL / 0x2000); // from 4020
+	m_maincpu->set_periodic_int(FUNC(dominator_state::nmi_line_pulse), nmi_period);
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/dai.cpp mame-0.224+dfsg.1/src/mame/drivers/dai.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/dai.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/dai.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -63,26 +63,21 @@
 #include "emu.h"
 #include "includes/dai.h"
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
-/* I/O ports */
-void dai_state::dai_io(address_map &map)
-{
-}
 
 /* memory w/r functions */
-void dai_state::dai_mem(address_map &map)
+void dai_state::mem_map(address_map &map)
 {
-	map(0x0000, 0xbfff).bankrw("bank1");
-	map(0xc000, 0xdfff).rom();
+	map(0x0000, 0xbfff).ram().share("mainram");
+	map(0xc000, 0xdfff).rom().region("maincpu",0);
 	map(0xe000, 0xefff).bankr("bank2");
-	map(0xf000, 0xf7ff).w(FUNC(dai_state::dai_stack_interrupt_circuit_w));
+	map(0xf000, 0xf7ff).w(FUNC(dai_state::stack_interrupt_circuit_w));
 	map(0xf800, 0xf8ff).ram();
-	map(0xfb00, 0xfbff).rw(FUNC(dai_state::dai_amd9511_r), FUNC(dai_state::dai_amd9511_w));
-	map(0xfc00, 0xfcff).rw(FUNC(dai_state::dai_pit_r), FUNC(dai_state::dai_pit_w)); // .rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
-	map(0xfd00, 0xfdff).rw(FUNC(dai_state::dai_io_discrete_devices_r), FUNC(dai_state::dai_io_discrete_devices_w));
-	map(0xfe00, 0xfeff).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0xfb00, 0xfbff).rw(FUNC(dai_state::amd9511_r), FUNC(dai_state::amd9511_w));
+	map(0xfc00, 0xfcff).rw(FUNC(dai_state::pit_r), FUNC(dai_state::pit_w)); // .rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+	map(0xfd00, 0xfdff).rw(FUNC(dai_state::io_discrete_devices_r), FUNC(dai_state::io_discrete_devices_w));
+	map(0xfe00, 0xfeff).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write));
 	map(0xff00, 0xff0f).mirror(0xf0).m(m_tms5501, FUNC(tms5501_device::io_map));
 }
 
@@ -183,7 +178,7 @@
 };
 
 static GFXDECODE_START( gfx_dai )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, dai_charlayout, 0, 8 )
+	GFXDECODE_ENTRY( "chargen", 0x0000, dai_charlayout, 0, 8 )
 GFXDECODE_END
 
 /* machine definition */
@@ -191,8 +186,7 @@
 {
 	/* basic machine hardware */
 	I8080(config, m_maincpu, 2000000);
-	m_maincpu->set_addrmap(AS_PROGRAM, &dai_state::dai_mem);
-	m_maincpu->set_addrmap(AS_IO, &dai_state::dai_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &dai_state::mem_map);
 	m_maincpu->set_irq_acknowledge_callback(FUNC(dai_state::int_ack));
 	config.set_maximum_quantum(attotime::from_hz(60));
 
@@ -204,7 +198,7 @@
 	m_pit->set_clk<2>(2000000);
 	m_pit->out_handler<2>().set(m_sound, FUNC(dai_sound_device::set_input_ch2));
 
-	I8255(config, "ppi8255");
+	I8255(config, "ppi");
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -212,7 +206,7 @@
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	screen.set_size(1056, 542);
 	screen.set_visarea(0, 1056-1, 0, 302-1);
-	screen.set_screen_update(FUNC(dai_state::screen_update_dai));
+	screen.set_screen_update(FUNC(dai_state::screen_update));
 	screen.set_palette(m_palette);
 
 	GFXDECODE(config, "gfxdecode", m_palette, gfx_dai);
@@ -234,11 +228,8 @@
 	/* tms5501 */
 	TMS5501(config, m_tms5501, 2000000);
 	m_tms5501->int_callback().set_inputline("maincpu", I8085_INTR_LINE);
-	m_tms5501->xi_callback().set(FUNC(dai_state::dai_keyboard_r));
-	m_tms5501->xo_callback().set(FUNC(dai_state::dai_keyboard_w));
-
-	/* internal ram */
-	RAM(config, RAM_TAG).set_default_size("48K");
+	m_tms5501->xi_callback().set(FUNC(dai_state::keyboard_r));
+	m_tms5501->xo_callback().set(FUNC(dai_state::keyboard_w));
 
 	/* software lists */
 	SOFTWARE_LIST(config, "cass_list").set_original("dai_cass");
@@ -246,15 +237,16 @@
 
 
 ROM_START(dai)
-	ROM_REGION(0x14000,"maincpu",0)
-	ROM_LOAD("dai.bin", 0xc000, 0x2000, CRC(ca71a7d5) SHA1(6bbe2336c717354beab2ae201debeb4fd055bdcb))
-	ROM_LOAD("dai00.bin", 0x10000, 0x1000, CRC(fa7d39ac) SHA1(3d1824a1f273882f934249ef3cb1b38ef99de7b9))
-	ROM_LOAD("dai01.bin", 0x11000, 0x1000, CRC(cb5809f2) SHA1(523656f0a9d98888cd3e2bd66886c589e9ae75b4))
-	ROM_LOAD("dai02.bin", 0x12000, 0x1000, CRC(03f72d4a) SHA1(573d65dc82321970dcaf81d7638a02252ea18a7a))
-	ROM_LOAD("dai03.bin", 0x13000, 0x1000, CRC(c475c96f) SHA1(96fc3cc4b8a2873f0d044bd8033d1e7b7197dd97))
-	ROM_REGION(0x2000, "gfx1",0)
+	ROM_REGION(0x6000,"maincpu",0)
+	ROM_LOAD("dai.bin",   0x0000, 0x2000, CRC(ca71a7d5) SHA1(6bbe2336c717354beab2ae201debeb4fd055bdcb))
+	ROM_LOAD("dai00.bin", 0x2000, 0x1000, CRC(fa7d39ac) SHA1(3d1824a1f273882f934249ef3cb1b38ef99de7b9))
+	ROM_LOAD("dai01.bin", 0x3000, 0x1000, CRC(cb5809f2) SHA1(523656f0a9d98888cd3e2bd66886c589e9ae75b4))
+	ROM_LOAD("dai02.bin", 0x4000, 0x1000, CRC(03f72d4a) SHA1(573d65dc82321970dcaf81d7638a02252ea18a7a))
+	ROM_LOAD("dai03.bin", 0x5000, 0x1000, CRC(c475c96f) SHA1(96fc3cc4b8a2873f0d044bd8033d1e7b7197dd97))
+
+	ROM_REGION(0x2000, "chargen",0)
 	ROM_LOAD ("nch.bin", 0x0000, 0x1000, CRC(a9f5b30b) SHA1(24119b2984ab4e50dc0dabae1065ff6d6c1f237d))
 ROM_END
 
 /*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS      INIT        COMPANY                            FULLNAME */
-COMP( 1978, dai,  0,      0,      dai,     dai,   dai_state, empty_init, "Data Applications International", "DAI Personal Computer", 0)
+COMP( 1978, dai,  0,      0,      dai,     dai,   dai_state, empty_init, "Data Applications International", "DAI Personal Computer", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/dblewing.cpp mame-0.224+dfsg.1/src/mame/drivers/dblewing.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/dblewing.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/dblewing.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -423,13 +423,43 @@
 	ROM_REGION( 0x40000, "oki", 0 ) /* Oki samples */
 	ROM_LOAD( "kp_03-.16h",   0x000000, 0x020000, CRC(5d7f930d) SHA1(ad23aa804ea3ccbd7630ade9b53fc3ea2718a6ec) )
 	ROM_RELOAD(               0x020000, 0x020000 )
+
+	ROM_REGION( 0x600, "plds", 0 )
+	ROM_LOAD( "pal16l8-vg-00.1f",  0x000, 0x117, CRC(8c2849e5) SHA1(72c5142dd78ea7d009229bad9f1a5651eec1e858) )
+	ROM_LOAD( "pal16l8-vg-01.1h",  0x200, 0x117, CRC(04b0bab6) SHA1(6b1ad69506b385eeeac6cb952e166304bf6fbb40) )
+	ROM_LOAD( "pal16r8-vg-02.11b", 0x400, 0x117, NO_DUMP )
+ROM_END
+
+ROM_START( dblewinga )
+	ROM_REGION( 0x80000, "maincpu", 0 ) /* DE102 code (encrypted) */
+	ROM_LOAD16_BYTE( "2.3d",    0x000001, 0x040000, CRC(1e6b0653) SHA1(000fbf8bb07688fe1dd16fe8f33c376871f1860f) )
+	ROM_LOAD16_BYTE( "1.5d",    0x000000, 0x040000, CRC(4d537dc9) SHA1(9149e6de11ed9aa1db58c72e4ba6b2b309c6978b) )
+
+	ROM_REGION( 0x10000, "audiocpu", 0 ) // sound cpu
+	ROM_LOAD( "kp_02-.10h",   0x000000, 0x010000, CRC(def035fa) SHA1(fd50314e5c94c25df109ee52c0ce701b0ff2140c) )
+
+	ROM_REGION( 0x100000, "gfx1", 0 )
+	ROM_LOAD( "mbe-02.8h",    0x000000, 0x100000, CRC(5a6d3ac5) SHA1(738bb833e2c5d929ac75fe4e69ee0af88197d8a6) )
+
+	ROM_REGION( 0x200000, "gfx2", 0 )
+	ROM_LOAD( "mbe-00.14a",   0x000000, 0x100000, CRC(e33f5c93) SHA1(720904b54d02dace2310ac6bd07d5ed4bc4fd69c) )
+	ROM_LOAD( "mbe-01.16a",   0x100000, 0x100000, CRC(ef452ad7) SHA1(7fe49123b5c2778e46104eaa3a2104ce09e05705) )
+
+	ROM_REGION( 0x40000, "oki", 0 ) /* Oki samples */
+	ROM_LOAD( "kp_03-.16h",   0x000000, 0x020000, CRC(5d7f930d) SHA1(ad23aa804ea3ccbd7630ade9b53fc3ea2718a6ec) )
+	ROM_RELOAD(               0x020000, 0x020000 )
+
+	ROM_REGION( 0x600, "plds", 0 )
+	ROM_LOAD( "pal16l8-vg-00.1f",  0x000, 0x117, CRC(8c2849e5) SHA1(72c5142dd78ea7d009229bad9f1a5651eec1e858) )
+	ROM_LOAD( "pal16l8-vg-01.1h",  0x200, 0x117, CRC(04b0bab6) SHA1(6b1ad69506b385eeeac6cb952e166304bf6fbb40) )
+	ROM_LOAD( "pal16r8-vg-02.11b", 0x400, 0x117, NO_DUMP )
 ROM_END
 
 /*
 The most noticeable difference with the set below is that it doesn't use checkpoints, but respawns you when you die.
 Checkpoints were more common in Japan, so this is likely to be an export version.
 */
-ROM_START( dblewinga )
+ROM_START( dblewingb )
 	ROM_REGION( 0x80000, "maincpu", 0 ) /* DE102 code (encrypted) */
 	ROM_LOAD16_BYTE( "17.3d",    0x000001, 0x040000, CRC(3a7ba822) SHA1(726db048ae3ab45cca45f631ad1f04b5cbc7f741) )
 	ROM_LOAD16_BYTE( "18.5d",    0x000000, 0x040000, CRC(e5f5f004) SHA1(4bd40ef88027554a0328df1cf6f1c9c975a7a73f) )
@@ -447,6 +477,11 @@
 	ROM_REGION( 0x40000, "oki", 0 ) /* Oki samples */
 	ROM_LOAD( "kp_03-.16h",   0x000000, 0x020000, CRC(5d7f930d) SHA1(ad23aa804ea3ccbd7630ade9b53fc3ea2718a6ec) )
 	ROM_RELOAD(               0x020000, 0x020000 )
+
+	ROM_REGION( 0x600, "plds", 0 )
+	ROM_LOAD( "pal16l8-vg-00.1f",  0x000, 0x117, CRC(8c2849e5) SHA1(72c5142dd78ea7d009229bad9f1a5651eec1e858) )
+	ROM_LOAD( "pal16l8-vg-01.1h",  0x200, 0x117, CRC(04b0bab6) SHA1(6b1ad69506b385eeeac6cb952e166304bf6fbb40) )
+	ROM_LOAD( "pal16r8-vg-02.11b", 0x400, 0x117, NO_DUMP )
 ROM_END
 
 void dblewing_state::init_dblewing()
@@ -458,5 +493,6 @@
 }
 
 
-GAME( 1993, dblewing,  0,        dblewing, dblewing, dblewing_state, init_dblewing, ROT90, "Mitchell", "Double Wings", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, dblewinga, dblewing, dblewing, dblewing, dblewing_state, init_dblewing, ROT90, "Mitchell", "Double Wings (Asia)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, dblewing,  0,        dblewing, dblewing, dblewing_state, init_dblewing, ROT90, "Mitchell", "Double Wings (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, dblewinga, dblewing, dblewing, dblewing, dblewing_state, init_dblewing, ROT90, "Mitchell", "Double Wings (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, dblewingb, dblewing, dblewing, dblewing, dblewing_state, init_dblewing, ROT90, "Mitchell", "Double Wings (Asia)",  MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/dct11em.cpp mame-0.224+dfsg.1/src/mame/drivers/dct11em.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/dct11em.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/dct11em.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,17 +1,31 @@
 // license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
+// copyright-holders:Miodrag Milanovic,Robbbert
 /***************************************************************************
 
-        DEC DCT11-EM
+DEC DCT11-EM (Evaluation Module)
+
+2010-12-03 Skeleton driver.
+
+System currently works, but with some hacks to replace the unemulated DC319
+DLART (Digital Link Asynchronous Receiver/Transmitter).
+
+
+TODO:
+- user LED (it's there but it doesn't work)
+- DLART device to be emulated
+- hookups between DLART (and its DL terminal), UART and remaining interrupts
 
-        03/12/2010 Skeleton driver.
 
 ****************************************************************************/
 
 #include "emu.h"
 #include "cpu/t11/t11.h"
-#include "emupal.h"
-#include "screen.h"
+#include "machine/i8251.h"
+#include "machine/i8255.h"
+#include "bus/rs232/rs232.h"
+#include "machine/clock.h"
+#include "machine/terminal.h"
+#include "dct11em.lh"
 
 
 class dct11em_state : public driver_device
@@ -20,77 +34,280 @@
 	dct11em_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
+		, m_ppi(*this, "ppi")
+		, m_uart(*this, "uart")
+		, m_terminal(*this, "terminal")
+		, m_io_keyboard(*this, "X%u", 0U)
+		, m_digits(*this, "digit%d", 0U)
 	{ }
 
 	void dct11em(machine_config &config);
+	DECLARE_INPUT_CHANGED_MEMBER(halt_button);
+	DECLARE_INPUT_CHANGED_MEMBER(int_button);
 
 private:
-	virtual void machine_reset() override;
-	virtual void video_start() override;
+	void machine_reset() override;
+	void machine_start() override;
 
-	void dct11em_mem(address_map &map);
+	void porta_w(u8);
+	void portc_w(u8);
+	u8 portc_r();
+	void irq_encoder(u8, bool);
+	u8 dlart_r(offs_t);
+	void dlart_w(offs_t, u8);
+	void kbd_put(u8 data);
+
+	u8 m_term_data;
+	u8 m_seg_lower;
+	u8 m_seg_upper;
+	u8 m_portc;
+	u16 m_irqs;
+	bool m_dlart_maintmode;
 
-	uint32_t screen_update_dct11em(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	void mem_map(address_map &map);
 
 	required_device<t11_device> m_maincpu;
+	required_device<i8255_device> m_ppi;
+	required_device<i8251_device> m_uart;
+	required_device<generic_terminal_device> m_terminal;
+	required_ioport_array<5> m_io_keyboard;
+	output_finder<12> m_digits;
 };
 
-void dct11em_state::dct11em_mem(address_map &map)
+void dct11em_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0x0fff).ram();  // RAM
-	map(0x2000, 0x2fff).ram();  // Optional RAM
-	map(0xa000, 0xdfff).rom();  // RAM
+	map(0x0000, 0x0fff).ram();   // 2x 6116
+	map(0x1000, 0x1fff).noprw(); // the ram test reads/writes here even though there's no ram
+	map(0x2000, 0x2fff).ram();   // expansion sockets, 2x 6116
+	map(0xa000, 0xdfff).rom();
+	map(0xff20, 0xff27).nopr().lw8(NAME([this] (offs_t offset, u8 data) { m_ppi->write(offset>>1, data); }));
+	map(0xff28, 0xff2b).nopr().lw8(NAME([this] (offs_t offset, u8 data) { m_uart->write(offset>>1, data); }));
+	map(0xff60, 0xff67).lr8(NAME([this] (offs_t offset) { return m_ppi->read(offset>>1); }));
+	map(0xff68, 0xff6b).lr8(NAME([this] (offs_t offset) { return m_uart->read(offset>>1); }));
+	//map(0xff70, 0xff7f).   // DC319 DLART unemulated device - uart to terminal
+	map(0xff70, 0xff7f).rw(FUNC(dct11em_state::dlart_r), FUNC(dct11em_state::dlart_w));
 }
 
-/* Input ports */
-static INPUT_PORTS_START( dct11em )
-INPUT_PORTS_END
+// dummy routines to pass the DLART test and to talk to the ascii terminal
+u8 dct11em_state::dlart_r(offs_t offset)
+{
+	offset >>= 1;
+	switch (offset)
+	{
+		case 0:
+			if (m_term_data)
+				return 0xff;
+			else
+				return 0xfd;
+		case 1:
+			{
+				u8 ret = m_term_data;
+				irq_encoder(3, 0); // Release IRQ3
+				m_term_data = 0;
+				return ret;
+			}
+		default:
+			return 0xfd;
+	}
+}
+
+void dct11em_state::dlart_w(offs_t offset, u8 data)
+{
+	offset >>= 1;
+	switch (offset)
+	{
+		case 3:
+			if (m_dlart_maintmode)
+				m_term_data = data;
+			else
+				m_terminal->write(data);
+			break;
+		case 2:
+			m_dlart_maintmode = BIT(data, 4);
+			break;
+		default:
+			break;
+	}
+}
+
+void dct11em_state::porta_w(u8 data)
+{
+	m_seg_lower = data;
+	if (BIT(m_portc, 3))
+		m_seg_upper = data;
+}
+
+void dct11em_state::portc_w(u8 data)
+{
+	data &= 15;
+	m_portc = data;
+	if (BIT(data, 3))
+	{
+		m_seg_upper = m_seg_lower;
+		irq_encoder(10, 0); // Release IRQ10
+	}
+	if (data < 6)
+	{
+		m_digits[data] = m_seg_lower;
+		m_digits[data+6] = m_seg_upper;
+	}
+	output().set_value("led0", (data!=9));
+}
 
+u8 dct11em_state::portc_r()
+{
+	if (m_portc < 5)
+		return m_io_keyboard[m_portc]->read();
+	else
+		return 0;
+}
+
+/*
+ * interrupts (p. 101)
+ *
+ * IRQ  CPx  Pri Vec Device
+ * ---  ---  --- --- ------
+ * 15   LLLL 7   140 DLART receiver break
+ * 11   LHLL 6   100 External interrupt
+ * 10   LHLH 6   104 Keypad/LED scanning
+ * 7    HLLL 5   120 8251 receiver
+ * 6    HLLH 5   124 8251 transmitter
+ * 3    HHLL 4   060 DLART receiver
+ * 2    HHLH 4   064 DLART transmitter */
+ void dct11em_state::irq_encoder(u8 irq, bool state)
+{
+	if (state)
+		m_irqs |= (1 << irq);
+	else
+		m_irqs &= ~(1 << irq);
+
+	int i;
+	for (i = 15; i > 0; i--)
+		if (BIT(m_irqs, i))
+			break;
+
+	m_maincpu->set_input_line(t11_device::CP3_LINE, BIT(i, 3) ? ASSERT_LINE : CLEAR_LINE);
+	m_maincpu->set_input_line(t11_device::CP2_LINE, BIT(i, 2) ? ASSERT_LINE : CLEAR_LINE);
+	m_maincpu->set_input_line(t11_device::CP1_LINE, BIT(i, 1) ? ASSERT_LINE : CLEAR_LINE);
+	m_maincpu->set_input_line(t11_device::CP0_LINE, BIT(i, 0) ? ASSERT_LINE : CLEAR_LINE);
+}
 
 void dct11em_state::machine_reset()
 {
+	m_irqs = 0;
 }
 
-void dct11em_state::video_start()
+void dct11em_state::machine_start()
 {
+	m_digits.resolve();
+	save_item(NAME(m_seg_lower));
+	save_item(NAME(m_seg_upper));
+	save_item(NAME(m_portc));
+	save_item(NAME(m_irqs));
+	save_item(NAME(m_term_data));
+	save_item(NAME(m_dlart_maintmode));
 }
 
-uint32_t dct11em_state::screen_update_dct11em(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+
+/* Input ports */
+static INPUT_PORTS_START( dct11em )
+	PORT_START("X0")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("CLR")       PORT_CODE(KEYCODE_SPACE)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("1/GOLED")   PORT_CODE(KEYCODE_1) // Go with LEDs
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("4/PROTEC")  PORT_CODE(KEYCODE_4) // Release protection
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("7/PC")      PORT_CODE(KEYCODE_7)
+	PORT_START("X1")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("0/CANCEL")  PORT_CODE(KEYCODE_0) // Cancel breakpoints
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("2/CONSOL")  PORT_CODE(KEYCODE_2) // Start console
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("5")         PORT_CODE(KEYCODE_5)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("8/PS")      PORT_CODE(KEYCODE_8)
+	PORT_START("X2")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("EXA/ENTER") PORT_CODE(KEYCODE_ENTER)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("3/BAUD")    PORT_CODE(KEYCODE_3) // Set baud rates
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("6/SP")      PORT_CODE(KEYCODE_6)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("9/WP")      PORT_CODE(KEYCODE_9)
+	PORT_START("X3")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("ADV")       PORT_CODE(KEYCODE_UP)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("BAC")       PORT_CODE(KEYCODE_DOWN)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("REG")       PORT_CODE(KEYCODE_R)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("ADR")       PORT_CODE(KEYCODE_MINUS) // Address
+	PORT_START("X4")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("SST")       PORT_CODE(KEYCODE_S) // Single-step
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("GO")        PORT_CODE(KEYCODE_X)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("BPT")       PORT_CODE(KEYCODE_B) // Breakpoint
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("FNC")       PORT_CODE(KEYCODE_LALT) // Function
+	PORT_START("X5")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("HALT")      PORT_CODE(KEYCODE_H) PORT_CHANGED_MEMBER(DEVICE_SELF, dct11em_state, halt_button, 0)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("INT")       PORT_CODE(KEYCODE_I) PORT_CHANGED_MEMBER(DEVICE_SELF, dct11em_state, int_button, 0)
+INPUT_PORTS_END
+
+INPUT_CHANGED_MEMBER(dct11em_state::halt_button)
+{
+	m_maincpu->set_input_line(t11_device::HLT_LINE, newval ? ASSERT_LINE : CLEAR_LINE);
+}
+
+INPUT_CHANGED_MEMBER(dct11em_state::int_button)
 {
-	return 0;
+	m_maincpu->set_input_line(t11_device::PF_LINE, newval ? ASSERT_LINE : CLEAR_LINE);
 }
 
+void dct11em_state::kbd_put(u8 data)
+{
+	m_term_data = data;
+	irq_encoder(3, 1); // Assert IRQ3
+}
 
 void dct11em_state::dct11em(machine_config &config)
 {
 	/* basic machine hardware */
-	T11(config, m_maincpu, 7500000); // 7.5MHz XTAL
+	T11(config, m_maincpu, 7'500'000); // 7.5MHz XTAL
 	m_maincpu->set_initial_mode(0x1403);  /* according to specs */
-	m_maincpu->set_addrmap(AS_PROGRAM, &dct11em_state::dct11em_mem);
+	m_maincpu->set_addrmap(AS_PROGRAM, &dct11em_state::mem_map);
+
+	config.set_default_layout(layout_dct11em);
 
-	/* video hardware */
-	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(50);
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
-	screen.set_size(640, 480);
-	screen.set_visarea(0, 640-1, 0, 480-1);
-	screen.set_screen_update(FUNC(dct11em_state::screen_update_dct11em));
-	screen.set_palette("palette");
+	I8255(config, m_ppi);
+	m_ppi->out_pa_callback().set(FUNC(dct11em_state::porta_w));  // segments
+	// port B - expansion interface
+	m_ppi->in_pc_callback().set(FUNC(dct11em_state::portc_r));   // keyboard
+	m_ppi->out_pc_callback().set(FUNC(dct11em_state::portc_w));  // digits
+
+	I8251(config, m_uart, 2'457'600 / 8);
+	m_uart->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
+	m_uart->dtr_handler().set("rs232", FUNC(rs232_port_device::write_dtr));
+	m_uart->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
+	m_uart->rxrdy_handler().set([this] (bool state) { irq_encoder(7, state); });
+	m_uart->txrdy_handler().set([this] (bool state) { irq_encoder(6, state); });
+
+	clock_device &inta_clock(CLOCK(config, "inta_clock", 614'400 / 768)); // 800Hz, from DLART pin 25
+	inta_clock.signal_handler().set([this] (bool state) { if (state) irq_encoder(10, 1); }); // Assert IRQ10
+
+	//clock_device &dlart_clock(CLOCK(config, "dlart_clock", 2'457'600 / 4)); --> to DLART CLK pin 32
+
+	clock_device &uart_clock(CLOCK(config, "uart_clock", 2'457'600 / 32));   // from DLART pin 34
+	uart_clock.signal_handler().set(m_uart, FUNC(i8251_device::write_txc));
+	uart_clock.signal_handler().append(m_uart, FUNC(i8251_device::write_rxc));
+
+	rs232_port_device &rs232(RS232_PORT(config, "rs232", default_rs232_devices, nullptr)); // connection to host mainframe, does nothing for us
+	rs232.rxd_handler().set(m_uart, FUNC(i8251_device::write_rxd));
+	rs232.dsr_handler().set(m_uart, FUNC(i8251_device::write_dsr));
+	rs232.cts_handler().set(m_uart, FUNC(i8251_device::write_cts));
 
-	PALETTE(config, "palette", palette_device::MONOCHROME);
+	GENERIC_TERMINAL(config, m_terminal, 0); // Main terminal for now
+	m_terminal->set_keyboard_callback(FUNC(dct11em_state::kbd_put));
 }
 
 /* ROM definition */
 ROM_START( dct11em )
 	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
 	// Highest address line inverted
-	ROM_LOAD16_BYTE( "23-213e4.bin", 0x8000, 0x2000, CRC(bdd82f39) SHA1(347deeff77596b67eee27a39a9c40075fcf5c10d))
-	ROM_LOAD16_BYTE( "23-214e4.bin", 0x8001, 0x2000, CRC(b523dae8) SHA1(cd1a64a2bce9730f7a9177d391663919c7f56073))
+	ROM_LOAD16_BYTE( "23-213e4.e53", 0x8000, 0x2000, CRC(bdd82f39) SHA1(347deeff77596b67eee27a39a9c40075fcf5c10d))
+	ROM_LOAD16_BYTE( "23-214e4.e45", 0x8001, 0x2000, CRC(b523dae8) SHA1(cd1a64a2bce9730f7a9177d391663919c7f56073))
 	ROM_COPY("maincpu", 0x8000, 0xc000, 0x2000)
 ROM_END
 
 /* Driver */
 
 /*    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY                          FULLNAME    FLAGS */
-COMP( 1983, dct11em, 0,      0,      dct11em, dct11em, dct11em_state, empty_init, "Digital Equipment Corporation", "DCT11-EM", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1983, dct11em, 0,      0,      dct11em, dct11em, dct11em_state, empty_init, "Digital Equipment Corporation", "DCT11-EM", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ddenlovr.cpp mame-0.224+dfsg.1/src/mame/drivers/ddenlovr.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ddenlovr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ddenlovr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -254,10 +254,8 @@
 	DECLARE_WRITE_LINE_MEMBER(ddenlovr_irq);
 	DECLARE_WRITE_LINE_MEMBER(mmpanic_irq);
 	DECLARE_WRITE_LINE_MEMBER(mmpanic_rtc_irq);
-	DECLARE_WRITE_LINE_MEMBER(hanakanz_irq);
 	DECLARE_WRITE_LINE_MEMBER(funkyfig_sound_irq);
 	DECLARE_WRITE_LINE_MEMBER(mjflove_irq);
-	DECLARE_WRITE_LINE_MEMBER(hanakanz_rtc_irq);
 	DECLARE_WRITE_LINE_MEMBER(mjflove_rtc_irq);
 
 	void ddenlovr_bgcolor_w(uint8_t data);
@@ -5294,8 +5292,8 @@
 	PORT_DIPSETTING(    0x10, "3" )
 	PORT_DIPSETTING(    0x0c, "4" )
 	PORT_DIPSETTING(    0x08, "5" )
-//  PORT_DIPSETTING(    0x04, "5" )
-//  PORT_DIPSETTING(    0x00, "5" )
+	PORT_DIPSETTING(    0x04, "5 (duplicate 1)" )
+	PORT_DIPSETTING(    0x00, "5 (duplicate 2)" )
 	PORT_DIPNAME( 0x20, 0x20, "Linked Cabinets" )
 	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
@@ -5378,79 +5376,69 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("6") PORT_CODE(KEYCODE_6_PAD)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
+	// dipswitches are 2 banks of 10
 	PORT_START("DSW1")
-	PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) )
+	PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coinage ) ) PORT_DIPLOCATION("DSWA:1,2")
 	PORT_DIPSETTING(    0x00, DEF_STR( 3C_1C ) )
 	PORT_DIPSETTING(    0x02, DEF_STR( 2C_1C ) )
 	PORT_DIPSETTING(    0x03, DEF_STR( 1C_1C ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( 1C_2C ) )
-	PORT_DIPNAME( 0x04, 0x04, "Unknown 1-2" )
-	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x08, "Unknown 1-3" )
-	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x10, "Unknown 1-4" )
-	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0xe0, 0x80, "Difficulty?" )
-	PORT_DIPSETTING(    0xe0, "0" )
-	PORT_DIPSETTING(    0xc0, "1" )
-	PORT_DIPSETTING(    0xa0, "2" )
-	PORT_DIPSETTING(    0x80, "3" )
-	PORT_DIPSETTING(    0x60, "4" )
-	PORT_DIPSETTING(    0x40, "5" )
-	PORT_DIPSETTING(    0x20, "6" )
-	PORT_DIPSETTING(    0x00, "7" )
+	PORT_DIPNAME( 0x1c, 0x1c, "Difficulty" ) PORT_DIPLOCATION("DSWA:3,4,5") // manual lists 6 valid settings
+	PORT_DIPSETTING(    0x08, "Level 1" )
+	PORT_DIPSETTING(    0x18, "Level 2" )
+	PORT_DIPSETTING(    0x14, "Level 3" )
+	PORT_DIPSETTING(    0x1c, "Level 4" )
+	PORT_DIPSETTING(    0x0c, "Level 5" )
+	PORT_DIPSETTING(    0x04, "Level 6" )
+	PORT_DIPSETTING(    0x00, "unknown Level (00)" )
+	PORT_DIPSETTING(    0x10, "unknown Level (10)" )
+	PORT_DIPNAME( 0xe0, 0xe0, "Game Hit Probability" ) PORT_DIPLOCATION("DSWA:6,7,8") // manual lists 6 valid settings
+	PORT_DIPSETTING(    0x40, "1/15" )
+	PORT_DIPSETTING(    0x60, "1/10" )
+	PORT_DIPSETTING(    0x80, "1/7" )
+	PORT_DIPSETTING(    0xe0, "1/5" )
+	PORT_DIPSETTING(    0xa0, "1/4" )
+	PORT_DIPSETTING(    0xc0, "1/3" )
+	PORT_DIPSETTING(    0x00, "unknown Probability (00)" )
+	PORT_DIPSETTING(    0x20, "unknown Probability (20)" )
 
 	PORT_START("DSW2")
-	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) )
+	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("DSWB:1")
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) )
+	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("DSWB:2")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x04, "Unknown 2-2*" )
-	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x18, 0x18, "Unknown 2-3&4" ) // used ?
-//  PORT_DIPSETTING(    0x10, "0" )
-	PORT_DIPSETTING(    0x00, "0" )
-	PORT_DIPSETTING(    0x18, "1" )
-	PORT_DIPSETTING(    0x08, "2" )
-	PORT_DIPNAME( 0x20, 0x20, "Unknown 2-5" )
+	PORT_DIPNAME( 0x04, 0x04, "Attract Sound Type" ) PORT_DIPLOCATION("DSWB:3")
+	PORT_DIPSETTING(    0x04, "Type 1" )
+	PORT_DIPSETTING(    0x00, "Type 2" )
+	PORT_DIPNAME( 0x18, 0x18, "Bonus Game Type" ) PORT_DIPLOCATION("DSWB:4,5")
+	PORT_DIPSETTING(    0x18, "Type 1" )
+	PORT_DIPSETTING(    0x10, "Type 2" )
+	PORT_DIPSETTING(    0x08, "Without" )
+	PORT_DIPSETTING(    0x00, "Type 2 (duplicate)" )
+	PORT_DIPNAME( 0x20, 0x20, "Unknown B-6 (debug?)" ) PORT_DIPLOCATION("DSWB:6") // manual lists 'unused, should remain OFF'
 	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x00, "Pirate Fight" )
+	PORT_DIPNAME( 0x40, 0x40, "Pirate Fight (debug?)" ) PORT_DIPLOCATION("DSWB:7") // manual lists 'unused, should remain OFF'
 	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, "Taito Copyright" )
+	PORT_DIPNAME( 0x80, 0x80, "Taito Copyright (debug?)" ) PORT_DIPLOCATION("DSWB:8") // manual lists 'unused, should remain OFF'
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
 
 	PORT_START("DSW3")
-	PORT_DIPNAME( 0x01, 0x01, "Unknown 3-0*" )
+	PORT_DIPNAME( 0x01, 0x01, "Unknown A-9 (debug?)" )  PORT_DIPLOCATION("DSWA:9") // manual lists 'unused, MUST remain OFF'
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, "Tickets" )
+	PORT_DIPNAME( 0x02, 0x02, "Tickets" )   PORT_DIPLOCATION("DSWA:10")
 	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x04, "Unknown 3-2*" )
+	PORT_DIPNAME( 0x04, 0x04, "Unknown B-9 (debug?)" )  PORT_DIPLOCATION("DSWB:9")  // manual lists 'unused, should remain OFF'
 	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_SERVICE( 0x08, IP_ACTIVE_LOW )
-	PORT_DIPNAME( 0x10, 0x10, "Unknown 3-4" )
-	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, "Unknown 3-5" )
-	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, "Unknown 3-6" )
-	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, "Unknown 3-7" )
-	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_SERVICE( 0x08, IP_ACTIVE_LOW )             PORT_DIPLOCATION("DSWB:10")
+	PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
 INPUT_PORTS_END
 
 
@@ -10002,38 +9990,10 @@
     0xe2 is from the 6242RTC
  */
 
-WRITE_LINE_MEMBER(ddenlovr_state::hanakanz_irq)
-{
-	if (!state)
-		return;
-
-	/* I haven't found a irq ack register, so I need this kludge to
-	   make sure I don't lose any interrupt generated by the blitter,
-	   otherwise quizchq would lock up. */
-	//if (downcast<cpu_device *>(m_maincpu)->input_state(0))
-	//  return;
-
-	m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xe0); // Z80
-}
-
-WRITE_LINE_MEMBER(ddenlovr_state::hanakanz_rtc_irq)
-{
-	if (!state)
-		return;
-
-	/* I haven't found a irq ack register, so I need this kludge to
-	   make sure I don't lose any interrupt generated by the blitter,
-	   otherwise quizchq would lock up. */
-	//if (downcast<cpu_device *>(drvm_maincpu)->input_state(0))
-	//  return;
-
-	m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xe2); // Z80
-}
-
 void ddenlovr_state::hanakanz(machine_config &config)
 {
 	/* basic machine hardware */
-	KL5C80A12(config, m_maincpu, 8000000); // KL5C80A12
+	KL5C80A12(config, m_maincpu, 20'000'000); // KL5C80A12
 	m_maincpu->set_addrmap(AS_PROGRAM, &ddenlovr_state::hanakanz_map);
 	m_maincpu->set_addrmap(AS_IO, &ddenlovr_state::hanakanz_portmap);
 
@@ -10048,7 +10008,7 @@
 	m_screen->set_visarea(0, 336-1, 5, 256-11-1);
 	m_screen->set_screen_update(FUNC(ddenlovr_state::screen_update_ddenlovr));
 	m_screen->set_video_attributes(VIDEO_ALWAYS_UPDATE);
-	m_screen->screen_vblank().set(FUNC(ddenlovr_state::hanakanz_irq));
+	m_screen->screen_vblank().set("maincpu:kp69", FUNC(kp69_device::ir_w<0>));
 
 	PALETTE(config, m_palette, palette_device::BLACK).set_entries(0x200);
 
@@ -10064,7 +10024,7 @@
 
 	/* devices */
 	msm6242_device &rtc(MSM6242(config, "rtc", XTAL(32'768)));
-	rtc.out_int_handler().set(FUNC(ddenlovr_state::hanakanz_rtc_irq));
+	rtc.out_int_handler().set("maincpu:kp69", FUNC(kp69_device::ir_w<1>));
 }
 
 void ddenlovr_state::hkagerou(machine_config &config)
@@ -10078,7 +10038,7 @@
 void ddenlovr_state::kotbinyo(machine_config &config)
 {
 	/* basic machine hardware */
-	KL5C80A12(config, m_maincpu, XTAL(20'000'000) / 2); // !! KL5C80A12CFP @ 10MHz? (actually 4 times faster than Z80) !!
+	KL5C80A12(config, m_maincpu, XTAL(20'000'000)); // !! KL5C80A12CFP @ 10MHz? (actually 4 times faster than Z80) !!
 	m_maincpu->set_addrmap(AS_PROGRAM, &ddenlovr_state::hanakanz_map);
 	m_maincpu->set_addrmap(AS_IO, &ddenlovr_state::kotbinyo_portmap);
 
@@ -10093,7 +10053,7 @@
 	m_screen->set_visarea(0, 336-1-1, 1+4, 256-15-1+4);
 	m_screen->set_screen_update(FUNC(ddenlovr_state::screen_update_ddenlovr));
 	m_screen->set_video_attributes(VIDEO_ALWAYS_UPDATE);
-	m_screen->screen_vblank().set(FUNC(ddenlovr_state::hanakanz_irq));
+	m_screen->screen_vblank().set("maincpu:kp69", FUNC(kp69_device::ir_w<0>));
 
 	PALETTE(config, m_palette, palette_device::BLACK).set_entries(0x200);
 
@@ -10108,7 +10068,7 @@
 	m_oki->add_route(ALL_OUTPUTS, "mono", 0.80);
 
 	/* devices */
-//  MSM6242(config, "rtc", XTAL(32'768)).out_int_handler().set(FUNC(ddenlovr_state::hanakanz_rtc_irq));
+//  MSM6242(config, "rtc", XTAL(32'768)).out_int_handler().set("maincpu:kp69", FUNC(kp69_device::ir_w<1>));
 }
 
 void ddenlovr_state::kotbinsp(machine_config &config)
@@ -10481,7 +10441,7 @@
 void ddenlovr_state::jongtei(machine_config &config)
 {
 	/* basic machine hardware */
-	KL5C80A12(config, m_maincpu, XTAL(20'000'000) / 2); // KL5C80A12
+	KL5C80A12(config, m_maincpu, XTAL(20'000'000)); // KL5C80A12
 	m_maincpu->set_addrmap(AS_PROGRAM, &ddenlovr_state::hanakanz_map);
 	m_maincpu->set_addrmap(AS_IO, &ddenlovr_state::jongtei_portmap);
 
@@ -10496,7 +10456,7 @@
 	m_screen->set_visarea(0, 336-1, 5, 256-11-1);
 	m_screen->set_screen_update(FUNC(ddenlovr_state::screen_update_ddenlovr));
 	m_screen->set_video_attributes(VIDEO_ALWAYS_UPDATE);
-	m_screen->screen_vblank().set(FUNC(ddenlovr_state::hanakanz_irq));
+	m_screen->screen_vblank().set("maincpu:kp69", FUNC(kp69_device::ir_w<0>));
 
 	PALETTE(config, m_palette, palette_device::BLACK).set_entries(0x200);
 
@@ -10512,7 +10472,7 @@
 	OKIM6295(config, m_oki, XTAL(28'636'363) / 28, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 0.80);
 
 	/* devices */
-	MSM6242(config, "rtc", XTAL(32'768)).out_int_handler().set(FUNC(ddenlovr_state::hanakanz_rtc_irq));
+	MSM6242(config, "rtc", XTAL(32'768)).out_int_handler().set("maincpu:kp69", FUNC(kp69_device::ir_w<1>));
 }
 
 void ddenlovr_state::mjgnight(machine_config &config)
@@ -10695,7 +10655,7 @@
 void ddenlovr_state::daimyojn(machine_config &config)
 {
 	/* basic machine hardware */
-	Z80(config, m_maincpu, XTAL(20'000'000) / 2);
+	KL5C80A12(config, m_maincpu, XTAL(20'000'000));
 	m_maincpu->set_addrmap(AS_PROGRAM, &ddenlovr_state::hanakanz_map);
 	m_maincpu->set_addrmap(AS_IO, &ddenlovr_state::daimyojn_portmap);
 
@@ -10710,7 +10670,7 @@
 	m_screen->set_visarea(0, 336-1-1, 1, 256-15-1);
 	m_screen->set_screen_update(FUNC(ddenlovr_state::screen_update_ddenlovr));
 	m_screen->set_video_attributes(VIDEO_ALWAYS_UPDATE);
-	m_screen->screen_vblank().set(FUNC(ddenlovr_state::hanakanz_irq));
+	m_screen->screen_vblank().set("maincpu:kp69", FUNC(kp69_device::ir_w<0>));
 
 	PALETTE(config, m_palette, palette_device::BLACK).set_entries(0x200);
 
@@ -10724,7 +10684,7 @@
 	OKIM6295(config, m_oki, XTAL(28'636'363) / 28, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 0.80);
 
 	/* devices */
-	MSM6242(config, "rtc", XTAL(32'768)).out_int_handler().set(FUNC(ddenlovr_state::hanakanz_rtc_irq));
+	MSM6242(config, "rtc", XTAL(32'768)).out_int_handler().set("maincpu:kp69", FUNC(kp69_device::ir_w<1>));
 }
 
 
@@ -13025,50 +12985,82 @@
 ROM_END
 
 GAME( 1992, htengoku,  0,        htengoku,  htengoku, ddenlovr_state, empty_init,    ROT180, "Dynax",                                     "Hanafuda Hana Tengoku [BET] (Japan)",                                   0)
+
 GAME( 1992, mmpanic,   0,        mmpanic,   mmpanic,  ddenlovr_state, empty_init,    ROT0, "Nakanihon / East Technology (Taito license)", "Monkey Mole Panic (USA)",                                         MACHINE_NO_COCKTAIL  )
+// "Waiwai Animal Land" (without the Jr.) should be the original Japanese version of Monkey Mole Panic
+
 GAME( 1993, mjmyorn2,  0,        mjmyornt,  mjmyorn2, ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Mahjong The Mysterious Orient Part 2 ~ Exotic Dream ~ [BET] (Japan, v1.00)",             MACHINE_NO_COCKTAIL  ) // no copyright warning, assume Japan from game strings
 GAME( 1992, mjmyornt,  mjmyorn2, mjmyornt,  mjmyornt, ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Mahjong The Mysterious Orient [BET] (Japan, v1.00)",                     MACHINE_NO_COCKTAIL  ) // no copyright warning, assume Japan from game strings
+
 GAME( 1993, funkyfig,  0,        funkyfig,  funkyfig, ddenlovr_state, empty_init,    ROT0, "Nakanihon / East Technology (Taito license)", "The First Funky Fighter (USA, Canada, Mexico / Japan, set 1)",    MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_GRAPHICS ) // scrolling, priority?
 GAME( 1993, funkyfiga, funkyfig, funkyfig,  funkyfig, ddenlovr_state, empty_init,    ROT0, "Nakanihon / East Technology (Taito license)", "The First Funky Fighter (USA, Canada, Mexico / Japan, set 2)",    MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_GRAPHICS ) // ""
+
 GAME( 1993, quizchq,   0,        quizchq,   quizchq,  ddenlovr_state, empty_init,    ROT0, "Nakanihon",                                   "Quiz Channel Question (Japan, Ver 1.00)",                        MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 GAME( 1993, quizchql,  quizchq,  quizchq,   quizchq,  ddenlovr_state, empty_init,    ROT0, "Nakanihon (Laxan license)",                   "Quiz Channel Question (Taiwan?, Ver 1.23)",                      MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
 GAME( 1993, animaljr,  0,        mmpanic,   animaljr, ddenlovr_state, empty_init,    ROT0, "Nakanihon / East Technology (Taito license)", "Exciting Animal Land Jr. (USA, Canada, Mexico)",                                  MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_SOUND )
 GAME( 1993, animaljrs, animaljr, mmpanic,   animaljr, ddenlovr_state, empty_init,    ROT0, "Nakanihon / East Technology (Taito license)", "Animalandia Jr. (Spanish)",                                       MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_SOUND )
 GAME( 1993, animaljrj, animaljr, mmpanic,   animaljr, ddenlovr_state, empty_init,    ROT0, "Nakanihon / East Technology (Taito license)", "Waiwai Animal Land Jr. (Japan)",                                  MACHINE_NO_COCKTAIL  )
+
 GAME( 1994, mjmyster,  0,        mjmyster,  mjmyster, ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Mahjong The Mysterious World [BET] (Japan, set 1)",                            MACHINE_NO_COCKTAIL  )
 GAME( 1994, mjmywrld,  mjmyster, mjmywrld,  mjmyster, ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Mahjong The Mysterious World [BET] (Japan, set 2)",                            MACHINE_NO_COCKTAIL  )
+
 GAME( 1994, hginga,    0,        hginga,    hginga,   ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Hanafuda Hana Ginga [BET] (Japan)",                               MACHINE_NO_COCKTAIL  )
+
 GAME( 1994, mjmyuniv,  0,        mjmyuniv,  mjmyster, ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Mahjong The Mysterious Universe [BET] (Japan, D85)",              MACHINE_NO_COCKTAIL  )
+
 GAME( 1994, quiz365,   0,        quiz365,   quiz365,  ddenlovr_state, empty_init,    ROT0, "Nakanihon",                                   "Quiz 365 (Japan)",                                                MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION )
 GAME( 1994, quiz365t,  quiz365,  quiz365,   quiz365,  ddenlovr_state, empty_init,    ROT0, "Nakanihon / Taito",                           "Quiz 365 (Hong Kong & Taiwan)",                                   MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_GRAPHICS | MACHINE_UNEMULATED_PROTECTION )
+
 GAME( 1994, rongrong,  0,        rongrong,  rongrong, ddenlovr_state, init_rongrong, ROT0, "Nakanihon (Activision license)",              "Puzzle Game Rong Rong (Europe)",                                  MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_COLORS )
 GAME( 1994, rongrongj, rongrong, rongrong,  rongrong, ddenlovr_state, init_rongrong, ROT0, "Nakanihon (Activision license)",              "Puzzle Game Rong Rong (Japan)",                                   MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_COLORS )
 GAME( 1994, rongrongg, rongrong, rongrong,  rongrong, ddenlovr_state, init_rongrong, ROT0, "Nakanihon (Activision license)",              "Puzzle Game Rong Rong (Germany)",                                 MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_COLORS )
+
 GAME( 1994, hparadis,  0,        hparadis,  hparadis, ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Super Hana Paradise (Japan)",                                     MACHINE_NO_COCKTAIL  )
+
 GAME( 1995, hgokou,    0,        hgokou,    hgokou,   ddenlovr_state, empty_init,    ROT0, "Dynax (Alba license)",                        "Hanafuda Hana Gokou [BET] (Japan)",                                     MACHINE_NO_COCKTAIL  )
 GAME( 1995, hgokbang,  hgokou,   hgokbang,  hgokou,   ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Hanafuda Hana Gokou Bangaihen [BET] (Japan)",                           MACHINE_NO_COCKTAIL  )
+
 GAME( 1995, mjdchuka,  0,        mjchuuka,  mjchuuka, ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Mahjong The Dai Chuuka Ken [BET] (China, D111)",                        MACHINE_NO_COCKTAIL  )
+
 GAME( 1995, mjschuka,  0,        mjschuka,  mjschuka, ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Mahjong Super Dai Chuuka Ken [BET] (Japan, D115)",                      MACHINE_NO_COCKTAIL  )
+
 GAME( 1995, nettoqc,   0,        nettoqc,   nettoqc,  ddenlovr_state, empty_init,    ROT0, "Nakanihon",                                   "Nettoh Quiz Champion (Japan)",                                    MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_COLORS )
 GAME( 1995, ultrchmp,  nettoqc,  ultrchmp,  ultrchmp, ddenlovr_state, empty_init,    ROT0, "Nakanihon",                                   "Se Gye Hweng Dan Ultra Champion (Korea)",                         MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_COLORS )
 GAME( 1995, ultrchmph, nettoqc,  ultrchmp,  ultrchmp, ddenlovr_state, empty_init,    ROT0, "Nakanihon",                                   "Cheng Ba Shi Jie - Chao Shi Kong Guan Jun (Taiwan)",              MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_COLORS )
+
 GAME( 1995, ddenlovj,  0,        ddenlovj,  ddenlovj, ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Don Den Lover Vol. 1 - Shiro Kuro Tsukeyo! (Japan)",              MACHINE_NO_COCKTAIL  )
 GAME( 1995, ddenlovrk, ddenlovj, ddenlovrk, ddenlovr, ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Don Den Lover Vol. 1 - Heukbaeg-euro Jeonghaja (Korea)",          MACHINE_NO_COCKTAIL  )
 GAME( 1995, ddenlovrb, ddenlovj, ddenlovr,  ddenlovr, ddenlovr_state, empty_init,    ROT0, "bootleg",                                     "Don Den Lover Vol. 1 - Heukbaeg-euro Jeonghaja (Korea, bootleg)", MACHINE_NO_COCKTAIL  )
 GAME( 1996, ddenlovr,  ddenlovj, ddenlovr,  ddenlovr, ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Don Den Lover Vol. 1 (Hong Kong)",                                MACHINE_NO_COCKTAIL  )
+
 GAME( 1996, hanakanz,  0,        hanakanz,  hanakanz, ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Hana Kanzashi (Japan)",                                           MACHINE_NO_COCKTAIL  )
 GAME( 1997, kotbinyo,  hanakanz, kotbinyo,  kotbinyo, ddenlovr_state, empty_init,    ROT0, "Dynax / Shinwhajin",                          "Kkot Bi Nyo (Korea)",                                             MACHINE_NO_COCKTAIL  )
+
 GAME( 1997, kotbinsp,  0,        kotbinsp,  kotbinsp, ddenlovr_state, empty_init,    ROT0, "Dynax / Shinwhajin",                          "Kkot Bi Nyo Special (Korea)",                                     MACHINE_NO_COCKTAIL  )
+
 GAME( 1996, akamaru,   0,        akamaru,   akamaru,  ddenlovr_state, empty_init,    ROT0, "Dynax (Nakanihon license)",                   "Panel & Variety Akamaru Q Jousyou Dont-R",                        MACHINE_NO_COCKTAIL  )
+
 GAME( 1996, janshinp,  0,        janshinp,  janshinp, ddenlovr_state, empty_init,    ROT0, "Dynax / Sigma",                               "Mahjong Janshin Plus [BET] (Japan)",                                    MACHINE_NO_COCKTAIL  )
+
 GAME( 1996, dtoyoken,  0,        dtoyoken,  dtoyoken, ddenlovr_state, empty_init,    ROT0, "Dynax / Sigma",                               "Mahjong Dai Touyouken [BET] (Japan)",                                   MACHINE_NO_COCKTAIL  )
+
 GAME( 1996, sryudens,  0,        sryudens,  sryudens, ddenlovr_state, empty_init,    ROT0, "Dynax / Face",                                "Mahjong Seiryu Densetsu [BET] (Japan, NM502)",                          MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_GRAPHICS )
+
 GAME( 1996, seljan2,   0,        seljan2,   seljan2,  ddenlovr_state, empty_init,    ROT0, "Dynax / Face",                                "Return Of Sel Jan II [BET] (Japan, NM557)",                             MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_GRAPHICS )
+
 GAME( 1996, mjflove,   0,        mjflove,   mjflove,  ddenlovr_state, empty_init,    ROT0, "Nakanihon",                                   "Mahjong Fantasic Love (Japan)",                                   MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_GRAPHICS )
+
 GAME( 1997, hkagerou,  0,        hkagerou,  hkagerou, ddenlovr_state, empty_init,    ROT0, "Nakanihon / Dynax",                           "Hana Kagerou [BET] (Japan)",                                      MACHINE_NO_COCKTAIL  )
+
 GAME( 1998, mjchuuka,  0,        mjchuuka,  mjchuuka, ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Mahjong Chuukanejyo [BET] (China)",                                     MACHINE_NO_COCKTAIL  )
+
 GAME( 1998, mjreach1,  0,        mjreach1,  mjreach1, ddenlovr_state, empty_init,    ROT0, "Nihon System",                                "Mahjong Reach Ippatsu [BET] (Japan)",                                   MACHINE_NO_COCKTAIL  )
+
 GAME( 1999, jongtei,   0,        jongtei,   jongtei,  ddenlovr_state, empty_init,    ROT0, "Dynax",                                       "Mahjong Jong-Tei [BET] (Japan, NM532-01)",                              MACHINE_NO_COCKTAIL  )
+
 GAME( 2000, mjgnight,  0,        mjgnight,  mjgnight, ddenlovr_state, empty_init,    ROT0, "Techno-Top",                                  "Mahjong Gorgeous Night [BET] (Japan, TSM003-01)",                       MACHINE_NO_COCKTAIL  )
+
 GAME( 2002, daimyojn,  0,        daimyojn,  daimyojn, ddenlovr_state, empty_init,    ROT0, "Dynax / Techno-Top / Techno-Planning",        "Mahjong Daimyojin [BET] (Japan, T017-PB-00)",                           MACHINE_NO_COCKTAIL  )
+
 GAME( 2004, momotaro,  0,        daimyojn,  daimyojn, ddenlovr_state, init_momotaro, ROT0, "Techno-Top",                                  "Mahjong Momotarou [BET] (Japan, T027-RB-01)",                             MACHINE_NO_COCKTAIL  | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NOT_WORKING )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ddragon.cpp mame-0.224+dfsg.1/src/mame/drivers/ddragon.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ddragon.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ddragon.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -59,6 +59,7 @@
 #include "cpu/m6800/m6801.h"
 #include "cpu/m6809/m6809.h"
 #include "cpu/z80/z80.h"
+#include "sound/2203intf.h"
 #include "sound/okim6295.h"
 #include "sound/ym2151.h"
 
@@ -559,6 +560,11 @@
 	map(0xc000, 0xffff).rom();
 }
 
+void ddragon_state::sub_6809_map(address_map &map) // TODO: everything
+{
+	map(0x8000, 0xffff).rom().region("sub", 0);
+}
+
 void ddragon_state::ddragonba_sub_map(address_map &map)
 {
 	map(0x0100, 0x0fff).ram();
@@ -591,6 +597,12 @@
 	map(0x8000, 0xffff).rom();
 }
 
+void ddragon_state::ddragon6809_sound_map(address_map &map) // TODO: everything
+{
+	// 2x YM2203, 2xMSM5205
+	map(0x8000, 0xffff).rom();
+}
+
 void ddragon_state::dd2_sound_map(address_map &map)
 {
 	map(0x0000, 0x7fff).rom();
@@ -1013,18 +1025,29 @@
 }
 
 
+/*
+3x EF68B09EP (main)
+2x YM2203C (sound)
+2x OKI M5202 (sound)
+2x Y3014B (sound)
+2x LM324N (sound)
+1x TDA2003 (sound)
+1x oscillator 20.000 near sound section
+1x oscillator 24.575 (24.000 on another PCB) near main and sub CPU
+1x orange resonator CSB445E (CSB500E on another PCB)
+*/
 void ddragon_state::ddragon6809(machine_config &config)
 {
 	/* basic machine hardware */
-	MC6809E(config, m_maincpu, MAIN_CLOCK / 8);     /* 1.5 MHz */
+	MC6809E(config, m_maincpu, 24_MHz_XTAL / 16); // divisor not verified
 	m_maincpu->set_addrmap(AS_PROGRAM, &ddragon_state::ddragon_map);
 	TIMER(config, "scantimer").configure_scanline(FUNC(ddragon_state::ddragon_scanline), "screen", 0, 1);
 
-	MC6809E(config, m_subcpu, MAIN_CLOCK / 8);      /* 1.5 Mhz */
-	m_subcpu->set_addrmap(AS_PROGRAM, &ddragon_state::sub_6309_map); // wrong
+	MC6809E(config, m_subcpu, 24_MHz_XTAL / 16); // divisor not verified
+	m_subcpu->set_addrmap(AS_PROGRAM, &ddragon_state::sub_6809_map);
 
-	MC6809E(config, m_soundcpu, MAIN_CLOCK / 8);    /* 1.5 MHz */
-	m_soundcpu->set_addrmap(AS_PROGRAM, &ddragon_state::sound_map);
+	MC6809E(config, m_soundcpu, 20_MHz_XTAL / 12); // divisor not verified
+	m_soundcpu->set_addrmap(AS_PROGRAM, &ddragon_state::ddragon6809_sound_map);
 
 	config.set_maximum_quantum(attotime::from_hz(60000)); /* heavy interleaving to sync up sprite<->main CPUs */
 
@@ -1048,17 +1071,18 @@
 	GENERIC_LATCH_8(config, m_soundlatch);
 	m_soundlatch->data_pending_callback().set_inputline(m_soundcpu, M6809_IRQ_LINE);
 
-	ym2151_device &fmsnd(YM2151(config, "fmsnd", SOUND_CLOCK));
-	fmsnd.irq_handler().set_inputline(m_soundcpu, M6809_FIRQ_LINE);
-	fmsnd.add_route(0, "mono", 0.60);
-	fmsnd.add_route(1, "mono", 0.60);
+	ym2203_device &ym1(YM2203(config, "ym1", 20_MHz_XTAL / 6)); // divisor not verified
+	ym1.add_route(ALL_OUTPUTS, "mono", 0.60);
+
+	ym2203_device &ym2(YM2203(config, "ym2", 20_MHz_XTAL / 6)); // divisor not verified
+	ym2.add_route(ALL_OUTPUTS, "mono", 0.60);
 
-	MSM5205(config, m_adpcm[0], MAIN_CLOCK/32);
+	MSM5205(config, m_adpcm[0], 500_kHz_XTAL);
 	m_adpcm[0]->vck_legacy_callback().set(FUNC(ddragon_state::dd_adpcm_int_1));   /* interrupt function */
 	m_adpcm[0]->set_prescaler_selector(msm5205_device::S48_4B);  /* 8kHz */
 	m_adpcm[0]->add_route(ALL_OUTPUTS, "mono", 0.50);
 
-	MSM5205(config, m_adpcm[1], MAIN_CLOCK/32);
+	MSM5205(config, m_adpcm[1], 500_kHz_XTAL);
 	m_adpcm[1]->vck_legacy_callback().set(FUNC(ddragon_state::dd_adpcm_int_2));   /* interrupt function */
 	m_adpcm[1]->set_prescaler_selector(msm5205_device::S48_4B);  /* 8kHz */
 	m_adpcm[1]->add_route(ALL_OUTPUTS, "mono", 0.50);
@@ -1539,16 +1563,16 @@
  */
 ROM_START( ddragon6809 )
 	ROM_REGION( 0x30000, "maincpu", 0 ) /* 64k for code + bankswitched memory */
-	ROM_LOAD( "6809_16.bin",   0x08000, 0x08000, CRC(f4c72690) SHA1(c70d032355acf3f7f6586b6e57a94f80e099bf1a) )
-	ROM_LOAD( "6809_17.bin",   0x10000, 0x08000, CRC(6489d637) SHA1(fd17fd870e9386a3e3bdd56c8d731c73d8c70b88) ) /* banked at 0x4000-0x8000 */
+	ROM_LOAD( "6809_20.bin",   0x08000, 0x08000, CRC(67e3b4f1) SHA1(4945d76b0694299f2f4739ebfba98da6d96fe4cb) )
+	ROM_LOAD( "6809_19.bin",   0x10000, 0x08000, CRC(090e2baf) SHA1(29b775c59c7a4d30a33e3d10e736cd1a83baf3bb) ) /* banked at 0x4000-0x8000 */
 	ROM_LOAD( "6809_18.bin",   0x18000, 0x08000, CRC(154d50c4) SHA1(4ffdd29406b6c6b552344f820f83715b1c7727d1) ) /* banked at 0x4000-0x8000 */
-	ROM_LOAD( "6809_19.bin",   0x20000, 0x08000, CRC(090e2baf) SHA1(29b775c59c7a4d30a33e3d10e736cd1a83baf3bb) ) /* banked at 0x4000-0x8000 */
+	ROM_LOAD( "6809_17.bin",   0x20000, 0x08000, CRC(6489d637) SHA1(fd17fd870e9386a3e3bdd56c8d731c73d8c70b88) ) /* banked at 0x4000-0x8000 */
 
-	ROM_REGION( 0x10000, "sub", 0 ) /* sprite cpu */
-	ROM_LOAD( "6809_20.bin",   0x8000, 0x8000, CRC(67e3b4f1) SHA1(4945d76b0694299f2f4739ebfba98da6d96fe4cb) )
+	ROM_REGION( 0x8000, "sub", 0 ) /* sprite cpu */
+	ROM_LOAD( "21.bin",      0x00000, 0x08000, CRC(4437fc51) SHA1(fffcf2bec50d0b79861904b4abc607206b7794e6) )
 
 	ROM_REGION( 0x10000, "soundcpu", 0 ) /* audio cpu */
-	ROM_LOAD( "21.bin",      0x08000, 0x08000, CRC(4437fc51) SHA1(fffcf2bec50d0b79861904b4abc607206b7794e6) )
+	ROM_LOAD( "6809_16.bin",   0x08000, 0x08000, CRC(f4c72690) SHA1(c70d032355acf3f7f6586b6e57a94f80e099bf1a) )
 
 	/* all the gfx roms are scrambled on this set */
 	ROM_REGION( 0x08000, "gfx1", ROMREGION_ERASEFF )
@@ -1625,8 +1649,8 @@
 	ROM_LOAD( "18.7h",   0x18000, 0x08000, CRC(154d50c4) SHA1(4ffdd29406b6c6b552344f820f83715b1c7727d1) ) /* banked at 0x4000-0x8000 */
 	ROM_LOAD( "17.7j",   0x20000, 0x08000, CRC(4052f37a) SHA1(9444a30ce32a2d35c601324d79c0ba602be4f288) ) /* banked at 0x4000-0x8000 */
 
-	ROM_REGION( 0x10000, "sub", 0 ) /* sprite cpu */
-	ROM_LOAD( "21.7d",   0x08000, 0x8000, CRC(4437fc51) SHA1(fffcf2bec50d0b79861904b4abc607206b7794e6) )
+	ROM_REGION( 0x8000, "sub", 0 ) /* sprite cpu */
+	ROM_LOAD( "21.7d",   0x00000, 0x8000, CRC(4437fc51) SHA1(fffcf2bec50d0b79861904b4abc607206b7794e6) )
 
 	ROM_REGION( 0x10000, "soundcpu", 0 ) /* audio cpu */
 	ROM_LOAD( "16.7n",   0x08000, 0x08000, CRC(f4c72690) SHA1(c70d032355acf3f7f6586b6e57a94f80e099bf1a) )
@@ -1639,7 +1663,7 @@
 
 	ROM_REGION( 0x80000, "gfx2", 0 )
 	ROM_LOAD( "1.1t",         0x00000, 0x10000, CRC(5e810a6d) SHA1(5eba3e982b271bc284ca333429cd0b3759c9c8d1) )
-	ROM_LOAD( "1.1r",         0x10000, 0x10000, CRC(7300b785) SHA1(6d3b72bd7208e2bd790517a753c9d5192c88d20f) )
+	ROM_LOAD( "2.1r",         0x10000, 0x10000, CRC(7300b785) SHA1(6d3b72bd7208e2bd790517a753c9d5192c88d20f) )
 	ROM_LOAD( "3.1q",         0x20000, 0x10000, CRC(19405de8) SHA1(ac1aa40478b92af5ccdde89812be78b7c9f7d20d) )
 	ROM_LOAD( "4.1p",         0x30000, 0x10000, CRC(4b10defd) SHA1(fb43eba7c8a7f77f0fdd6253d51b40b0e64598f5) )
 	ROM_LOAD( "5.1n",         0x40000, 0x10000, CRC(5b1bb493) SHA1(dd947d7d381af5952acece4b2cefc9fc4847ec68) )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/de_3b.cpp mame-0.224+dfsg.1/src/mame/drivers/de_3b.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/de_3b.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/de_3b.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -522,8 +522,8 @@
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("baycpud.400", 0x0000, 0x10000, CRC(45019616) SHA1(5a1e04cdfa00f179f010c09fae52d090553cd82e))
 	ROM_REGION(0x01000000, "cpu3", 0)
-	ROM_LOAD16_BYTE("bayrom0d.400", 0x00000000, 0x00080000, CRC(3f195829) SHA1(a10a1b7f125f239b0eff87ee6667c8250b7ffc87))
-	ROM_LOAD16_BYTE("bayrom3d.400", 0x00000001, 0x00080000, CRC(ae3d8585) SHA1(28b38ebc2755ffb3859f8091a9bf50d868794a3e))
+	ROM_LOAD16_BYTE("bayrom0a.400", 0x00000000, 0x00080000, CRC(43d615c6) SHA1(7c843b6d5215305b02a55c9fa1d62375ef0766ea))
+	ROM_LOAD16_BYTE("bayrom3a.400", 0x00000001, 0x00080000, CRC(41bcb66b) SHA1(e6f0a9236e14c2e919881ca1ffe3356aaa121730))
 	ROM_REGION(0x010000, "soundcpu", 0)
 	ROM_LOAD("bayw.u7", 0x0000, 0x10000, CRC(90d6d8a8) SHA1(482c5643453f21a078257aa13398845ef19cab3c))
 	ROM_REGION(0x1000000, "bsmt", 0)
@@ -533,7 +533,7 @@
 
 ROM_START(bay_e400)
 	ROM_REGION(0x10000, "maincpu", 0)
-	ROM_LOAD("baycpua2.400", 0x0000, 0x10000, CRC(07b77fe2) SHA1(4f81a5b3d821907e06d6b547117ad39c238a900c))
+	ROM_LOAD("baycpue.400", 0x0000, 0x10000, CRC(07b77fe2) SHA1(4f81a5b3d821907e06d6b547117ad39c238a900c))
 	ROM_REGION(0x01000000, "cpu3", 0)
 	ROM_LOAD16_BYTE("bayrom0a.400", 0x00000000, 0x00080000, CRC(43d615c6) SHA1(7c843b6d5215305b02a55c9fa1d62375ef0766ea))
 	ROM_LOAD16_BYTE("bayrom3a.400", 0x00000001, 0x00080000, CRC(41bcb66b) SHA1(e6f0a9236e14c2e919881ca1ffe3356aaa121730))
@@ -549,8 +549,21 @@
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("baycpud.300", 0x0000, 0x10000, CRC(c160f045) SHA1(d1f75d5ba292b25278539b01e0f4908276d34e34))
 	ROM_REGION(0x01000000, "cpu3", 0)
-	ROM_LOAD16_BYTE("bayrom0d.300", 0x00000000, 0x00080000, CRC(3f195829) SHA1(a10a1b7f125f239b0eff87ee6667c8250b7ffc87))
-	ROM_LOAD16_BYTE("bayrom3d.300", 0x00000001, 0x00080000, CRC(ae3d8585) SHA1(28b38ebc2755ffb3859f8091a9bf50d868794a3e))
+	ROM_LOAD16_BYTE("bayrom0a.300", 0x00000000, 0x00080000, CRC(3f195829) SHA1(a10a1b7f125f239b0eff87ee6667c8250b7ffc87))
+	ROM_LOAD16_BYTE("bayrom3a.300", 0x00000001, 0x00080000, CRC(ae3d8585) SHA1(28b38ebc2755ffb3859f8091a9bf50d868794a3e))
+	ROM_REGION(0x010000, "soundcpu", 0)
+	ROM_LOAD("bayw.u7", 0x0000, 0x10000, CRC(90d6d8a8) SHA1(482c5643453f21a078257aa13398845ef19cab3c))
+	ROM_REGION(0x1000000, "bsmt", 0)
+	ROM_LOAD("bayw.u17", 0x000000, 0x80000, CRC(b20fde56) SHA1(2f2db49245e4a6a8251cbe896b2437fcec88d42d))
+	ROM_LOAD("bayw.u21", 0x080000, 0x80000, CRC(b7598881) SHA1(19d1dde1cb6634a7c7b5cdb4fa01cd09cc7d7777))
+ROM_END
+
+ROM_START(bay_f201)
+	ROM_REGION(0x10000, "maincpu", 0)
+	ROM_LOAD("baycpuf.201", 0x0000, 0x10000, CRC(d2fddeaa) SHA1(839baca46823dc72a7ef1421764815f69f0e7084))
+	ROM_REGION(0x01000000, "cpu3", 0)
+	ROM_LOAD16_BYTE("bayrom0f.200", 0x00000000, 0x00080000, CRC(6dc898b6) SHA1(087b043acf64b2a16c8e4c879b90dbea1d79c614))
+	ROM_LOAD16_BYTE("bayrom3f.200", 0x00000001, 0x00080000, CRC(9db1b94e) SHA1(056c1a0fd1c99c1c9426f2e2cdd68f4bbaa89d81))
 	ROM_REGION(0x010000, "soundcpu", 0)
 	ROM_LOAD("bayw.u7", 0x0000, 0x10000, CRC(90d6d8a8) SHA1(482c5643453f21a078257aa13398845ef19cab3c))
 	ROM_REGION(0x1000000, "bsmt", 0)
@@ -700,6 +713,7 @@
 GAME(1995,  bay_d300, baywatch,de_3b,  de_3b, de_3b_state, init_de_3b, ROT0, "Sega",      "Baywatch (3.00 Dutch)",                 MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1995,  bay_d400, baywatch,de_3b,  de_3b, de_3b_state, init_de_3b, ROT0, "Sega",      "Baywatch (4.00 English)",               MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1995,  bay_e400, baywatch,de_3b,  de_3b, de_3b_state, init_de_3b, ROT0, "Sega",      "Baywatch (4.00 Dutch)",                 MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1995,  bay_f201, baywatch,de_3b,  de_3b, de_3b_state, init_de_3b, ROT0, "Sega",      "Baywatch (2.01 French)",                MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1994,  frankst,  0,       de_3b,  de_3b, de_3b_state, init_de_3b, ROT0, "Sega",      "Mary Shelley's Frankenstein",           MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1995,  frankstg, frankst, de_3b,  de_3b, de_3b_state, init_de_3b, ROT0, "Sega",      "Mary Shelley's Frankenstein (Germany)", MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1994,  mav_402,  0,       de_3b,  de_3b, de_3b_state, init_de_3b, ROT0, "Sega",      "Maverick (Display Rev. 4.02)",          MACHINE_IS_SKELETON_MECHANICAL)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/de_3.cpp mame-0.224+dfsg.1/src/mame/drivers/de_3.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/de_3.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/de_3.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -810,6 +810,32 @@
 	ROM_LOAD("lahsnd.u21", 0x080000, 0x40000, CRC(4571dc2e) SHA1(a1068cb080c30dbc07d164eddfc5dfd0afd52d3b))
 ROM_END
 
+ROM_START(lah_107)
+	ROM_REGION(0x10000, "maincpu", 0)
+	ROM_LOAD("lah_c5_a107.rom", 0x0000, 0x10000, CRC(f777fc1b) SHA1(a1a645df907e1e88123113823d3edf12c4e1e5df))
+	ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF)
+	ROM_REGION(0x80000, "gfx3", 0)
+	ROM_LOAD("lahdispa.106", 0x00000, 0x80000, CRC(ca6cfec5) SHA1(5e2081387d76bed17c14120cd347d6aaf435276b))
+	ROM_REGION(0x010000, "soundcpu", 0)
+	ROM_LOAD("lahsnd.u7", 0x0000, 0x10000, CRC(0279c45b) SHA1(14daf6b711d1936352209e90240f51812ebe76e0))
+	ROM_REGION(0x1000000, "bsmt", 0)
+	ROM_LOAD("lahsnd.u17", 0x000000, 0x80000, CRC(d0c15fa6) SHA1(5dcd13b578fa53c82353cda5aa774ca216c5ddfe))
+	ROM_LOAD("lahsnd.u21", 0x080000, 0x40000, CRC(4571dc2e) SHA1(a1068cb080c30dbc07d164eddfc5dfd0afd52d3b))
+ROM_END
+
+ROM_START(lah_f104)
+	ROM_REGION(0x10000, "maincpu", 0)
+	ROM_LOAD("lahcpua.104", 0x0000, 0x10000, CRC(49b9e5e9) SHA1(cf6198e4c93ce839dc6e5231090d4ca56e9bdea2))
+	ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF)
+	ROM_REGION(0x80000, "gfx3", 0)
+	ROM_LOAD("lahdispf.101", 0x00000, 0x80000, CRC(826a0a8b) SHA1(daad062edd8b6f468991d941e40d86711f8505df))
+	ROM_REGION(0x010000, "soundcpu", 0)
+	ROM_LOAD("lahsnd.u7", 0x0000, 0x10000, CRC(0279c45b) SHA1(14daf6b711d1936352209e90240f51812ebe76e0))
+	ROM_REGION(0x1000000, "bsmt", 0)
+	ROM_LOAD("lahsnd.u17", 0x000000, 0x80000, CRC(d0c15fa6) SHA1(5dcd13b578fa53c82353cda5aa774ca216c5ddfe))
+	ROM_LOAD("lahsnd.u21", 0x080000, 0x40000, CRC(4571dc2e) SHA1(a1068cb080c30dbc07d164eddfc5dfd0afd52d3b))
+ROM_END
+
 /*----------------------------------------------------------------
 / Lethal Weapon 3 - CPU Rev 3 /DMD  Type 2 512K Rom - 64K CPU Rom
 /---------------------------------------------------------------*/
@@ -898,6 +924,23 @@
 ROM_END
 
 /*-------------------------------------------------------------
+/ Michael Jordan - CPU Rev 3 / DMD Type 2 512K Rom - 64K CPU Rom
+/------------------------------------------------------------*/
+
+ROM_START(mj_130)
+	ROM_REGION(0x10000, "maincpu", 0)
+	ROM_LOAD("mjcpuc5.bin", 0x0000, 0x10000, CRC(311ab1d1) SHA1(062b02aab851f9f2ca64c24b8faa7dd293cacd22))
+	ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF)
+	ROM_REGION(0x80000, "gfx3", 0)
+	ROM_LOAD("mjdsp0.bin", 0x00000, 0x80000, CRC(1e2f27e8) SHA1(bfc567d6d3a7cecf7623ceb383350c78c14baef3))
+	ROM_REGION(0x010000, "soundcpu", 0)
+	ROM_LOAD("mjsndu7.bin", 0x0000, 0x10000, CRC(a32237f5) SHA1(0fc106429af320c4a30a99c67b45f44cb9a45644))
+	ROM_REGION(0x1000000, "bsmt", 0)
+	ROM_LOAD("mjsndu17.bin", 0x000000, 0x80000, CRC(8b11d7b9) SHA1(bb84b1650b253a433e947137256e4bc34a6ceac4))
+	ROM_LOAD("mjsndu21.bin", 0x080000, 0x80000, CRC(addfe20e) SHA1(3a6862640f81493da1beddca11011090d8b7cab0))
+ROM_END
+
+/*-------------------------------------------------------------
 / Star Trek - CPU Rev 3 /DMD Type 1 128K Rom - 64K CPU Rom
 /------------------------------------------------------------*/
 ROM_START(trek_201)
@@ -1356,12 +1399,15 @@
 GAME(1993,  lah_l108,  lah_112,  de_3_dmd2, de_3, de_3_state, empty_init, ROT0, "Data East",    "Last Action Hero (1.08 Spain)",    MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1993,  lah_110,   lah_112,  de_3_dmd2, de_3, de_3_state, empty_init, ROT0, "Data East",    "Last Action Hero (1.10)",          MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1993,  lah_106c,  lah_112,  de_3_dmd2, de_3, de_3_state, empty_init, ROT0, "Data East",    "Last Action Hero (1.06 Canada)",   MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993,  lah_107,   lah_112,  de_3_dmd2, de_3, de_3_state, empty_init, ROT0, "Data East",    "Last Action Hero (1.07)",          MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1993,  lah_f104,  lah_112,  de_3_dmd2, de_3, de_3_state, empty_init, ROT0, "Data East",    "Last Action Hero (1.04 France)",   MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1992,  lw3_208,   0,        de_3_dmd2, de_3, de_3_state, empty_init, ROT0, "Data East",    "Lethal Weapon 3 (2.08)",           MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1992,  lw3_207,   lw3_208,  de_3_dmd2, de_3, de_3_state, empty_init, ROT0, "Data East",    "Lethal Weapon 3 (2.07)",           MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1992,  lw3_207c,  lw3_208,  de_3_dmd2, de_3, de_3_state, empty_init, ROT0, "Data East",    "Lethal Weapon 3 (2.07 Canada)",    MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1992,  lw3_205,   lw3_208,  de_3_dmd2, de_3, de_3_state, empty_init, ROT0, "Data East",    "Lethal Weapon 3 (2.05)",           MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1992,  lw3_203,   lw3_208,  de_3_dmd2, de_3, de_3_state, empty_init, ROT0, "Data East",    "Lethal Weapon 3 (2.03)",           MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1992,  lw3_200,   lw3_208,  de_3_dmd2, de_3, de_3_state, empty_init, ROT0, "Data East",    "Lethal Weapon 3 (2.00)",           MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992,  mj_130,    0,        de_3_dmd2, de_3, de_3_state, empty_init, ROT0, "Data East",    "Michael Jordan (1.30)",            MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1992,  trek_201,  0,        de_3_dmd1, de_3, de_3_state, empty_init, ROT0, "Data East",    "Star Trek 25th Anniversary (2.01)",                MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1992,  trek_200,  trek_201, de_3_dmd1, de_3, de_3_state, empty_init, ROT0, "Data East",    "Star Trek 25th Anniversary (2.00)",                MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1992,  trek_120,  trek_201, de_3_dmd1, de_3, de_3_state, empty_init, ROT0, "Data East",    "Star Trek 25th Anniversary (1.20)",                MACHINE_IS_SKELETON_MECHANICAL)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/debut.cpp mame-0.224+dfsg.1/src/mame/drivers/debut.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/debut.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/debut.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -209,17 +209,17 @@
 
 static INPUT_PORTS_START( debutm )
 	PORT_START("IN.0")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_A) PORT_NAME("АН (Analysis)")
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_F) PORT_NAME("ХОД (Force Move)")
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_1) PORT_NAME("ИНТ (Switch 1P/2P)")
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_M) PORT_NAME("ПОЗ (Position Mode)")
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_S) PORT_NAME("ВФ (Select Piece)")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_B) PORT_NAME("ВП (Take Back)")
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_L) PORT_NAME("УР (Level)")
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_E) PORT_NAME("ВВ (Enter Position)")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_A) PORT_NAME(u8"АН (Analysis)")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_F) PORT_NAME(u8"ХОД (Force Move)")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_1) PORT_NAME(u8"ИНТ (Switch 1P/2P)")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_M) PORT_NAME(u8"ПОЗ (Position Mode)")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_S) PORT_NAME(u8"ВФ (Select Piece)")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_B) PORT_NAME(u8"ВП (Take Back)")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_L) PORT_NAME(u8"УР (Level)")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_E) PORT_NAME(u8"ВВ (Enter Position)")
 
 	PORT_START("RESET")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_R) PORT_CHANGED_MEMBER(DEVICE_SELF, debut_state, reset_button, 0) PORT_NAME("СБ (Reset)")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_R) PORT_CHANGED_MEMBER(DEVICE_SELF, debut_state, reset_button, 0) PORT_NAME(u8"СБ (Reset)")
 INPUT_PORTS_END
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/dec8.cpp mame-0.224+dfsg.1/src/mame/drivers/dec8.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/dec8.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/dec8.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3217,8 +3217,7 @@
 
 	ROM_REGION( 0x1000, "mcu", 0 )    /* i8751 microcontroller */
 	// 017F: B4 4C 0D : cjne  a,#$4C,$018F   (ID code 0x4c = World version)
-	// 3 bytes (always bit 0x08 set incorrectly) had to be hand fixed, hence 'BAD_DUMP'
-	ROM_LOAD( "id8751h.mcu", 0x0000, 0x1000, BAD_DUMP CRC(c0266263) SHA1(27ac6fa4af7195f04249c04dec168ab82158704e) ) // dx-8.19a ?
+	ROM_LOAD( "dx-8.19a", 0x0000, 0x1000, CRC(c0266263) SHA1(27ac6fa4af7195f04249c04dec168ab82158704e) )
 
 	ROM_REGION( 0x08000, "gfx1", 0 )    /* characters */
 	ROM_LOAD( "dx00.3d",  0x00000, 0x08000, CRC(f01ef985) SHA1(d5b823bd7c0efcf3137f8643c5d99a260bed5675) )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/destroyr.cpp mame-0.224+dfsg.1/src/mame/drivers/destroyr.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/destroyr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/destroyr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -5,9 +5,6 @@
 Atari Destroyer Driver
 
 TODO:
-- discrete sound
-- accurate implementation of scanline counter as documented in schematics,
-  generate irqs from there, and refresh rate 15750/262 (~60.1) instead of 60
 - missing language roms means DIP switches related to these do not function
 
 ***************************************************************************/
@@ -15,9 +12,15 @@
 #include "emu.h"
 #include "cpu/m6800/m6800.h"
 #include "machine/74259.h"
+#include "machine/timer.h"
 #include "machine/watchdog.h"
 #include "emupal.h"
 #include "screen.h"
+#include "speaker.h"
+#include "machine/netlist.h"
+
+#include "netlist/nl_setup.h"
+#include "audio/nl_destroyr.h"
 
 #include "destroyr.lh"
 
@@ -25,27 +28,40 @@
 class destroyr_state : public driver_device
 {
 public:
-	destroyr_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_watchdog(*this, "watchdog"),
-		m_gfxdecode(*this, "gfxdecode"),
-		m_screen(*this, "screen"),
-		m_palette(*this, "palette"),
-		m_alpha_num_ram(*this, "alpha_nuram"),
-		m_major_obj_ram(*this, "major_obj_ram"),
-		m_minor_obj_ram(*this, "minor_obj_ram")
+	destroyr_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_watchdog(*this, "watchdog")
+		, m_gfxdecode(*this, "gfxdecode")
+		, m_screen(*this, "screen")
+		, m_palette(*this, "palette")
+		, m_inputs(*this, "IN%u", 0U)
+		, m_paddle(*this, "PADDLE")
+		, m_alpha_num_ram(*this, "alpha_nuram")
+		, m_major_obj_ram(*this, "major_obj_ram")
+		, m_minor_obj_ram(*this, "minor_obj_ram")
+		, m_sound_motor_speed(*this, "sound_nl:motor_speed")
+		, m_sound_noise(*this, "sound_nl:noise")
+		, m_sound_attract(*this, "sound_nl:attract")
+		, m_sound_songate(*this, "sound_nl:songate")
+		, m_sound_launch(*this, "sound_nl:launch")
+		, m_sound_explo(*this, "sound_nl:explo")
+		, m_sound_sonlat(*this, "sound_nl:sonlat")
+		, m_sound_hexplo(*this, "sound_nl:hexplo")
+		, m_sound_lexplo(*this, "sound_nl:lexplo")
 	{ }
 
 	void destroyr(machine_config &config);
 
 private:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
-	enum
-	{
-		TIMER_DESTROYR_DIAL,
-		TIMER_DESTROYR_FRAME
-	};
+	static const device_timer_id TIMER_DIAL = 0;
+	static const device_timer_id TIMER_FRAME = 1;
+
+	void main_map(address_map &map);
 
 	void misc_w(uint8_t data);
 	void cursor_load_w(uint8_t data);
@@ -53,17 +69,13 @@
 	uint8_t input_r(offs_t offset);
 	uint8_t scanline_r();
 
-	void destroyr_palette(palette_device &palette) const;
+	void palette_init(palette_device &palette) const;
 
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	TIMER_CALLBACK_MEMBER(dial_callback);
 	TIMER_CALLBACK_MEMBER(frame_callback);
-
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
-	void destroyr_map(address_map &map);
+	TIMER_DEVICE_CALLBACK_MEMBER(scanline_irq);
 
 	/* devices */
 	required_device<cpu_device> m_maincpu;
@@ -71,12 +83,25 @@
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_device<screen_device> m_screen;
 	required_device<palette_device> m_palette;
+	required_ioport_array<3> m_inputs;
+	required_ioport m_paddle;
 
 	/* memory pointers */
 	required_shared_ptr<uint8_t> m_alpha_num_ram;
 	required_shared_ptr<uint8_t> m_major_obj_ram;
 	required_shared_ptr<uint8_t> m_minor_obj_ram;
 
+	/* audio triggers */
+	required_device<netlist_mame_logic_input_device> m_sound_motor_speed;
+	required_device<netlist_mame_logic_input_device> m_sound_noise;
+	required_device<netlist_mame_logic_input_device> m_sound_attract;
+	required_device<netlist_mame_logic_input_device> m_sound_songate;
+	required_device<netlist_mame_logic_input_device> m_sound_launch;
+	required_device<netlist_mame_logic_input_device> m_sound_explo;
+	required_device<netlist_mame_logic_input_device> m_sound_sonlat;
+	required_device<netlist_mame_logic_input_device> m_sound_hexplo;
+	required_device<netlist_mame_logic_input_device> m_sound_lexplo;
+
 	/* video-related */
 	int            m_cursor;
 	int            m_wavemod;
@@ -85,8 +110,6 @@
 	int            m_potmask[2];
 	int            m_potsense[2];
 	int            m_attract;
-	int            m_motor_speed;
-	int            m_noise;
 	emu_timer      *m_dial_timer;
 	emu_timer      *m_frame_timer;
 };
@@ -94,12 +117,10 @@
 
 uint32_t destroyr_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	int i, j;
-
 	bitmap.fill(0, cliprect);
 
 	/* draw major objects */
-	for (i = 0; i < 16; i++)
+	for (int i = 0; i < 16; i++)
 	{
 		int attr = m_major_obj_ram[2 * i + 0] ^ 0xff;
 		int horz = m_major_obj_ram[2 * i + 1];
@@ -123,9 +144,9 @@
 	}
 
 	/* draw alpha numerics */
-	for (i = 0; i < 8; i++)
+	for (int i = 0; i < 8; i++)
 	{
-		for (j = 0; j < 32; j++)
+		for (int j = 0; j < 32; j++)
 		{
 			int num = m_alpha_num_ram[32 * i + j];
 
@@ -134,7 +155,7 @@
 	}
 
 	/* draw minor objects */
-	for (i = 0; i < 2; i++)
+	for (int i = 0; i < 2; i++)
 	{
 		int num = i << 4 | (m_minor_obj_ram[i + 0] & 0xf);
 		int horz = 256 - m_minor_obj_ram[i + 2];
@@ -144,13 +165,13 @@
 	}
 
 	/* draw waves */
-	for (i = 0; i < 4; i++)
+	for (int i = 0; i < 4; i++)
 	{
 		m_gfxdecode->gfx(3)->transpen(bitmap,cliprect, m_wavemod ? 1 : 0, 0, 0, 0, 64 * i, 0x4e, 0);
 	}
 
 	/* draw cursor */
-	for (i = 0; i < 256; i++)
+	for (int i = 0; i < 256; i++)
 	{
 		if (i & 4)
 			bitmap.pix16(m_cursor ^ 0xff, i) = 7;
@@ -163,10 +184,10 @@
 {
 	switch (id)
 	{
-	case TIMER_DESTROYR_DIAL:
+	case TIMER_DIAL:
 		dial_callback(ptr, param);
 		break;
-	case TIMER_DESTROYR_FRAME:
+	case TIMER_FRAME:
 		frame_callback(ptr, param);
 		break;
 	default:
@@ -201,11 +222,18 @@
 	m_potsense[1] = 0;
 
 	/* PCB supports two dials, but cab has only got one */
-	m_dial_timer->adjust(m_screen->time_until_pos(ioport("PADDLE")->read()));
+	m_dial_timer->adjust(m_screen->time_until_pos(m_paddle->read()));
 	m_frame_timer->adjust(m_screen->time_until_pos(0));
 }
 
 
+TIMER_DEVICE_CALLBACK_MEMBER(destroyr_state::scanline_irq)
+{
+	// 16V clocks LS74 flip-flop with D = 32V and /Q output connected to /IRQ on 6800
+	m_maincpu->set_input_line(M6800_IRQ_LINE, BIT(param, 5) ? ASSERT_LINE : CLEAR_LINE);
+}
+
+
 void destroyr_state::machine_reset()
 {
 	m_frame_timer->adjust(m_screen->time_until_pos(0));
@@ -217,20 +245,19 @@
 	m_potsense[0] = 0;
 	m_potsense[1] = 0;
 	m_attract = 0;
-	m_motor_speed = 0;
-	m_noise = 0;
 }
 
 
 void destroyr_state::misc_w(uint8_t data)
 {
 	/* bits 0 to 2 connect to the sound circuits */
-	m_attract = data & 0x01;
-	m_noise = data & 0x02;
-	m_motor_speed = data & 0x04;
-	m_potmask[0] = data & 0x08;
-	m_wavemod = data & 0x10;
-	m_potmask[1] = data & 0x20;
+	m_attract = BIT(data, 0);
+	m_sound_attract->write(m_attract);
+	m_sound_noise->write(BIT(data, 1));
+	m_sound_motor_speed->write(BIT(data, 2));
+	m_potmask[0] = BIT(data, 3);
+	m_wavemod = BIT(data, 4);
+	m_potmask[1] = BIT(data, 5);
 
 	machine().bookkeeping().coin_lockout_w(0, !m_attract);
 	machine().bookkeeping().coin_lockout_w(1, !m_attract);
@@ -246,7 +273,7 @@
 
 void destroyr_state::interrupt_ack_w(uint8_t data)
 {
-	m_maincpu->set_input_line(0, CLEAR_LINE);
+	m_maincpu->set_input_line(M6800_IRQ_LINE, CLEAR_LINE);
 }
 
 
@@ -254,18 +281,14 @@
 {
 	if (offset & 1)
 	{
-		return ioport("IN1")->read();
+		return m_inputs[1]->read();
 	}
 
 	else
 	{
-		uint8_t ret = ioport("IN0")->read();
-
-		if (m_potsense[0] && m_potmask[0])
-			ret |= 4;
-		if (m_potsense[1] && m_potmask[1])
-			ret |= 8;
-
+		uint8_t ret = m_inputs[0]->read();
+		ret |= (m_potsense[0] && m_potmask[0]) ? (1 << 2) : 0;
+		ret |= (m_potsense[1] && m_potmask[1]) ? (1 << 3) : 0;
 		return ret;
 	}
 }
@@ -277,7 +300,7 @@
 }
 
 
-void destroyr_state::destroyr_map(address_map &map)
+void destroyr_state::main_map(address_map &map)
 {
 	map.global_mask(0x7fff);
 	map(0x0000, 0x00ff).mirror(0xf00).ram();
@@ -438,7 +461,7 @@
 GFXDECODE_END
 
 
-void destroyr_state::destroyr_palette(palette_device &palette) const
+void destroyr_state::palette_init(palette_device &palette) const
 {
 	palette.set_pen_color(0, rgb_t(0x00, 0x00, 0x00));   // major objects
 	palette.set_pen_color(1, rgb_t(0x50, 0x50, 0x50));
@@ -453,14 +476,12 @@
 
 void destroyr_state::machine_start()
 {
-	m_dial_timer = timer_alloc(TIMER_DESTROYR_DIAL);
-	m_frame_timer = timer_alloc(TIMER_DESTROYR_FRAME);
+	m_dial_timer = timer_alloc(TIMER_DIAL);
+	m_frame_timer = timer_alloc(TIMER_FRAME);
 
 	save_item(NAME(m_cursor));
 	save_item(NAME(m_wavemod));
 	save_item(NAME(m_attract));
-	save_item(NAME(m_motor_speed));
-	save_item(NAME(m_noise));
 	save_item(NAME(m_potmask));
 	save_item(NAME(m_potsense));
 }
@@ -468,34 +489,50 @@
 void destroyr_state::destroyr(machine_config &config)
 {
 	/* basic machine hardware */
-	M6800(config, m_maincpu, XTAL(12'096'000) / 16);
-	m_maincpu->set_addrmap(AS_PROGRAM, &destroyr_state::destroyr_map);
-	m_maincpu->set_periodic_int(FUNC(destroyr_state::irq0_line_assert), attotime::from_hz(4*60));
+	M6800(config, m_maincpu, 12.096_MHz_XTAL / 16);
+	m_maincpu->set_addrmap(AS_PROGRAM, &destroyr_state::main_map);
+
+	TIMER(config, "scantimer").configure_scanline(FUNC(destroyr_state::scanline_irq), m_screen, 16, 32);
 
 	f9334_device &outlatch(F9334(config, "outlatch")); // F8
 	outlatch.q_out_cb<0>().set_output("led0").invert(); // LED 1
 	outlatch.q_out_cb<1>().set_output("led1").invert(); // LED 2 (no second LED present on cab)
-	// Q2 => songate
-	// Q3 => launch
-	// Q4 => explosion
-	// Q5 => sonar
-	// Q6 => high explosion
-	// Q7 => low explosion
+	outlatch.q_out_cb<2>().set(m_sound_songate, FUNC(netlist_mame_logic_input_device::write));
+	outlatch.q_out_cb<3>().set(m_sound_launch, FUNC(netlist_mame_logic_input_device::write));
+	outlatch.q_out_cb<4>().set(m_sound_explo, FUNC(netlist_mame_logic_input_device::write));
+	outlatch.q_out_cb<5>().set(m_sound_sonlat, FUNC(netlist_mame_logic_input_device::write));
+	outlatch.q_out_cb<6>().set(m_sound_hexplo, FUNC(netlist_mame_logic_input_device::write));
+	outlatch.q_out_cb<7>().set(m_sound_lexplo, FUNC(netlist_mame_logic_input_device::write));
 
 	WATCHDOG_TIMER(config, m_watchdog);
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
-	m_screen->set_refresh_hz(60);
-	m_screen->set_size(256, 262);
-	m_screen->set_visarea(0, 255, 0, 239);
+	m_screen->set_raw(12.096_MHz_XTAL / 2, 384, 0, 256, 263, 0, 240);
 	m_screen->set_screen_update(FUNC(destroyr_state::screen_update));
 	m_screen->set_palette(m_palette);
 
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_destroyr);
-	PALETTE(config, m_palette, FUNC(destroyr_state::destroyr_palette), 8);
+	PALETTE(config, m_palette, FUNC(destroyr_state::palette_init), 8);
 
 	/* sound hardware */
+	SPEAKER(config, "mono").front_center();
+
+	NETLIST_SOUND(config, "sound_nl", 48000)
+		.set_source(NETLIST_NAME(destroyr))
+		.add_route(ALL_OUTPUTS, "mono", 1.0);
+
+	NETLIST_LOGIC_INPUT(config, "sound_nl:motor_speed", "MOTOR_SPEED.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:noise", "NOISE.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:attract", "ATTRACT.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:songate", "SONGATE.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:launch", "LAUNCH.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:explo", "EXPLO.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:sonlat", "SONLAT.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:hexplo", "HE.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:lexplo", "LE.IN", 0);
+
+	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "OUTPUT").set_mult_offset(32767.0, 0.0);
 }
 
 
@@ -518,7 +555,7 @@
 	ROM_REGION( 0x0020, "gfx4", 0 )     /* waves */
 	ROM_LOAD( "030136-01.k2", 0x0000, 0x0020, CRC(532c11b1) SHA1(18ab5369a3f2cfcc9a44f38fa8649524bea5b203) )
 
-	ROM_REGION( 0x0100, "user1", 0 )    /* sync (used for vsync/vblank signals, not hooked up yet) */
+	ROM_REGION( 0x0100, "syncprom", 0 )    /* used for vsync/vblank signals */
 	ROM_LOAD( "030131-01.m1", 0x0000, 0x0100, CRC(b8094b4c) SHA1(82dc6799a19984f3b204ee3aeeb007e55afc8be3) )
 ROM_END
 
@@ -544,10 +581,10 @@
 	ROM_REGION( 0x0020, "gfx4", 0 )     /* waves */
 	ROM_LOAD( "030136-01.k2", 0x0000, 0x0020, CRC(532c11b1) SHA1(18ab5369a3f2cfcc9a44f38fa8649524bea5b203) )
 
-	ROM_REGION( 0x0100, "user1", 0 )    /* sync (used for vsync/vblank signals, not hooked up yet) */
+	ROM_REGION( 0x0100, "syncprom", 0 )    /* used for vsync/vblank signals */
 	ROM_LOAD( "030131-01.m1", 0x0000, 0x0100, CRC(b8094b4c) SHA1(82dc6799a19984f3b204ee3aeeb007e55afc8be3) )
 ROM_END
 
 
-GAMEL( 1977, destroyr,  0,        destroyr, destroyr, destroyr_state, empty_init, ORIENTATION_FLIP_X, "Atari", "Destroyer (version O2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_destroyr )
-GAMEL( 1977, destroyr1, destroyr, destroyr, destroyr, destroyr_state, empty_init, ORIENTATION_FLIP_X, "Atari", "Destroyer (version O1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_destroyr )
+GAMEL( 1977, destroyr,  0,        destroyr, destroyr, destroyr_state, empty_init, ORIENTATION_FLIP_X, "Atari", "Destroyer (version O2)", MACHINE_SUPPORTS_SAVE, layout_destroyr )
+GAMEL( 1977, destroyr1, destroyr, destroyr, destroyr, destroyr_state, empty_init, ORIENTATION_FLIP_X, "Atari", "Destroyer (version O1)", MACHINE_SUPPORTS_SAVE, layout_destroyr )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/dmax8000.cpp mame-0.224+dfsg.1/src/mame/drivers/dmax8000.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/dmax8000.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/dmax8000.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -44,6 +44,7 @@
 		, m_maincpu(*this, "maincpu")
 		, m_rom(*this, "maincpu")
 		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
 		, m_fdc(*this, "fdc")
 		, m_floppy0(*this, "fdc:0")
 	{ }
@@ -62,10 +63,10 @@
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
 
-	bool m_rom_in_map;
 	required_device<cpu_device> m_maincpu;
 	required_region_ptr<u8> m_rom;
 	required_shared_ptr<u8> m_ram;
+	required_memory_bank    m_bank1;
 	required_device<fd1793_device> m_fdc;
 	required_device<floppy_connector> m_floppy0;
 };
@@ -102,13 +103,13 @@
 
 void dmax8000_state::port40_w(u8 data)
 {
-	m_rom_in_map = BIT(~data, 0);
+	m_bank1->set_entry(BIT(~data, 0));
 }
 
 void dmax8000_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x0fff).ram().share("mainram").lr8(NAME([this] (offs_t offset) { if(m_rom_in_map) return m_rom[offset]; else return m_ram[offset]; }));
-	map(0x1000, 0xffff).ram();
+	map(0x0000, 0xffff).ram().share("mainram");
+	map(0x0000, 0x0fff).bankr("bank1");
 }
 
 void dmax8000_state::io_map(address_map &map)
@@ -135,13 +136,14 @@
 
 void dmax8000_state::machine_reset()
 {
-	m_rom_in_map = 1;
+	m_bank1->set_entry(1);
 	m_maincpu->set_input_line_vector(0, 0xee); // Z80 - fdc vector
 }
 
 void dmax8000_state::machine_start()
 {
-	save_item(NAME(m_rom_in_map));
+	m_bank1->configure_entry(0, m_ram);
+	m_bank1->configure_entry(1, m_rom);
 }
 
 static void floppies(device_slot_interface &device)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/dms5000.cpp mame-0.224+dfsg.1/src/mame/drivers/dms5000.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/dms5000.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/dms5000.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,9 +2,9 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        Digital Microsystems DMS-5000
+Digital Microsystems DMS-5000
 
-        11/01/2010 Skeleton driver.
+2010-01-11 Skeleton driver.
 
 ****************************************************************************/
 
@@ -30,11 +30,9 @@
 private:
 	uint8_t status_r(offs_t offset);
 	void brightness_w(uint8_t data);
-	virtual void machine_reset() override;
-	virtual void video_start() override;
 	uint32_t screen_update_dms5000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void dms5000_io(address_map &map);
-	void dms5000_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 
 	required_device<cpu_device> m_maincpu;
 	required_device<screen_device> m_screen;
@@ -60,15 +58,15 @@
 {
 }
 
-void dms5000_state::dms5000_mem(address_map &map)
+void dms5000_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x00000, 0x1ffff).ram();
 	map(0x40000, 0x4ffff).ram();
-	map(0xfc000, 0xfffff).rom().region("user1", 0);
+	map(0xfc000, 0xfffff).rom().region("maincpu", 0);
 }
 
-void dms5000_state::dms5000_io(address_map &map)
+void dms5000_state::io_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x20, 0x2f).r(FUNC(dms5000_state::status_r)).umask16(0xff00);
@@ -81,14 +79,6 @@
 INPUT_PORTS_END
 
 
-void dms5000_state::machine_reset()
-{
-}
-
-void dms5000_state::video_start()
-{
-}
-
 uint32_t dms5000_state::screen_update_dms5000(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	return 0;
@@ -98,8 +88,8 @@
 {
 	/* basic machine hardware */
 	I8086(config, m_maincpu, XTAL(9'830'400));
-	m_maincpu->set_addrmap(AS_PROGRAM, &dms5000_state::dms5000_mem);
-	m_maincpu->set_addrmap(AS_IO, &dms5000_state::dms5000_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &dms5000_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &dms5000_state::io_map);
 
 	LS259(config, "cntlatch", 0); // V34
 
@@ -117,7 +107,7 @@
 
 /* ROM definition */
 ROM_START( dms5000 )
-	ROM_REGION16_LE( 0x4000, "user1", ROMREGION_ERASEFF )
+	ROM_REGION16_LE( 0x4000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "dms-5000_54-8673o.bin", 0x0001, 0x2000, CRC(dce9823e) SHA1(d36ab87d2e6f5e9f02d59a6a7724ad3ce2428a2f))
 	ROM_LOAD16_BYTE( "dms-5000_54-8672e.bin", 0x0000, 0x2000, CRC(94d64c06) SHA1(be5a53da7bb29a5fa9ac31efe550d5d6ff8b77cd))
 ROM_END
@@ -125,4 +115,4 @@
 /* Driver */
 
 /*    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY                 FULLNAME    FLAGS */
-COMP( 1982, dms5000, 0,      0,      dms5000, dms5000, dms5000_state, empty_init, "Digital Microsystems", "DMS-5000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1982, dms5000, 0,      0,      dms5000, dms5000, dms5000_state, empty_init, "Digital Microsystems", "DMS-5000", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/dooyong.cpp mame-0.224+dfsg.1/src/mame/drivers/dooyong.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/dooyong.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/dooyong.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1260,6 +1260,12 @@
 	PORT_DIPNAME( 0x40, 0x40, "Girl Show Point" )       PORT_DIPLOCATION("SWB:7")
 	PORT_DIPSETTING(    0x40, "Other Country" )
 	PORT_DIPSETTING(    0x00, DEF_STR( Asia ) )
+
+	PORT_MODIFY("P1")
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
+
+	PORT_MODIFY("P2")
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
 INPUT_PORTS_END
 
 INPUT_PORTS_START( primella )
@@ -1434,13 +1440,13 @@
 	return 0;
 }
 
+
 /***************************************************************************
 
     Machine driver(s)
 
 ***************************************************************************/
 
-
 void dooyong_z80_ym2203_state::sound_2203(machine_config &config)
 {
 	INPUT_MERGER_ANY_HIGH(config, "soundirq").output_handler().set_inputline(m_audiocpu, 0);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/dpb7000.cpp mame-0.224+dfsg.1/src/mame/drivers/dpb7000.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/dpb7000.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/dpb7000.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -45,7 +45,7 @@
 #define LOG_ALL             (LOG_UNKNOWN | LOG_CSR | LOG_CTRLBUS | LOG_SYS_CTRL | LOG_FDC_CTRL | LOG_FDC_PORT | LOG_FDC_CMD | LOG_FDC_MECH | LOG_BRUSH_ADDR | \
 							 LOG_STORE_ADDR | LOG_COMBINER | LOG_SIZE_CARD | LOG_FILTER_CARD)
 
-#define VERBOSE             (LOG_ALL &~ LOG_FDC_CTRL)
+#define VERBOSE             (0)//(LOG_ALL &~ LOG_FDC_CTRL)
 #include "logmacro.h"
 
 class dpb7000_state : public driver_device
@@ -143,6 +143,11 @@
 	void diskseq_y_w(uint16_t data);
 	void diskseq_tick();
 
+	void advance_line_count();
+	void toggle_line_clock();
+	void process_sample();
+	void process_byte_from_disc(uint8_t data_byte);
+
 	required_device<m68000_base_device> m_maincpu;
 	required_device_array<acia6850_device, 3> m_acia;
 	required_device<input_merger_device> m_p_int;
@@ -171,6 +176,7 @@
 	uint8_t m_fdd_ctrl;
 	uint8_t m_fdd_port1;
 	uint8_t m_fdd_track;
+	uint8_t m_fdd_side;
 	fdc_pll_t m_fdd_pll;
 
 	required_device<floppy_connector> m_floppy0;
@@ -232,7 +238,8 @@
 	uint8_t m_diskseq_ed_cnt;           // ED
 	uint8_t m_diskseq_head_cnt;         // EC
 	uint16_t m_diskseq_cyl_from_cpu;    // AE/BH
-	uint16_t m_diskseq_cmd_from_cpu;    // DD/CC
+	uint16_t m_diskseq_cmd_word_from_cpu; // DD/CC
+	uint8_t m_diskseq_cmd;
 	uint8_t m_diskseq_cyl_to_ctrl;
 	uint8_t m_diskseq_cmd_to_ctrl;
 	uint8_t m_diskseq_status_in;        // CG
@@ -253,6 +260,9 @@
 	uint16_t m_cursor_size_y;
 
 	// Brush Address Card
+	uint8_t m_line_clock;
+	uint16_t m_line_count;
+	uint16_t m_line_length;
 	uint16_t m_brush_addr_func;
 	uint8_t m_bif;
 	uint8_t m_bixos;
@@ -303,6 +313,9 @@
 	uint8_t *m_filter_mult;
 	uint8_t m_filter_acbc[16];
 	uint8_t m_filter_abbb[16];
+	uint8_t m_incoming_lum;
+	uint8_t m_incoming_chr;
+	bool m_buffer_lum;
 
 	// Size Card
 	required_device<am2901b_device> m_size_yl;
@@ -488,7 +501,8 @@
 	save_item(NAME(m_diskseq_ed_cnt));
 	save_item(NAME(m_diskseq_head_cnt));
 	save_item(NAME(m_diskseq_cyl_from_cpu));
-	save_item(NAME(m_diskseq_cmd_from_cpu));
+	save_item(NAME(m_diskseq_cmd_word_from_cpu));
+	save_item(NAME(m_diskseq_cmd));
 	save_item(NAME(m_diskseq_cyl_to_ctrl));
 	save_item(NAME(m_diskseq_cmd_to_ctrl));
 	save_item(NAME(m_diskseq_status_in));
@@ -506,6 +520,7 @@
 	save_item(NAME(m_fdd_ctrl));
 	save_item(NAME(m_fdd_port1));
 	save_item(NAME(m_fdd_track));
+	save_item(NAME(m_fdd_side));
 
 	// Disc Data Buffer Card
 	save_item(NAME(m_diskbuf_ram_addr));
@@ -519,6 +534,9 @@
 	save_item(NAME(m_cursor_size_y));
 
 	// Brush Address Card
+	save_item(NAME(m_line_clock));
+	save_item(NAME(m_line_count));
+	save_item(NAME(m_line_length));
 	save_item(NAME(m_brush_addr_func));
 	save_item(NAME(m_bif));
 	save_item(NAME(m_bixos));
@@ -585,6 +603,9 @@
 	m_filter_mult = m_filter_multprom->base();
 	save_item(NAME(m_filter_acbc));
 	save_item(NAME(m_filter_abbb));
+	save_item(NAME(m_incoming_lum));
+	save_item(NAME(m_incoming_chr));
+	save_item(NAME(m_buffer_lum));
 
 	m_yuv_lut = std::make_unique<uint32_t[]>(0x1000000);
 	for (uint16_t u = 0; u < 256; u++)
@@ -623,11 +644,12 @@
 	m_diskseq_ed_cnt = 0;
 	m_diskseq_head_cnt = 0;
 	m_diskseq_cyl_from_cpu = 0;
-	m_diskseq_cmd_from_cpu = 0;
+	m_diskseq_cmd_word_from_cpu = 0;
+	m_diskseq_cmd = 0;
 	m_diskseq_cyl_to_ctrl = 0;
 	m_diskseq_cmd_to_ctrl = 0;
 	m_diskseq_status_in = 0;
-	m_diskseq_status_out = 0xff;
+	m_diskseq_status_out = 0xf9;
 	memset(m_diskseq_ucode_latch, 0, 7);
 	memset(m_diskseq_cc_inputs, 0, 4);
 	m_diskseq_cyl_read_pending = false;
@@ -641,6 +663,7 @@
 	m_fdd_ctrl = 0;
 	m_fdd_port1 = 0;
 	m_fdd_track = 20;
+	m_fdd_side = 0;
 	m_fdd_pll.set_clock(attotime::from_hz(1000000));
 	m_fdd_pll.reset(machine().time());
 	m_floppy = nullptr;
@@ -657,6 +680,9 @@
 	m_cursor_size_y = 0;
 
 	// Brush Address Card
+	m_line_clock = 0;
+	m_line_count = 0;
+	m_line_length = 0;
 	m_brush_addr_func = 0;
 	m_bif = 0;
 	m_bixos = 0;
@@ -708,6 +734,9 @@
 	// Filter Card
 	memset(m_filter_acbc, 0, 16);
 	memset(m_filter_abbb, 0, 16);
+	m_incoming_lum = 0;
+	m_incoming_chr = 0;
+	m_buffer_lum = true;
 
 	// Size Card
 	m_size_h = 0;
@@ -812,9 +841,9 @@
 
 	m_diskseq_cc_inputs[2] |= BIT(m_diskseq_status_in, DSEQ_STATUS_RAM_ADDR_OVFLO_BIT);
 	// C17..C19 tied low
-	m_diskseq_cc_inputs[2] |= ~(m_diskseq_cmd_from_cpu & 0xf) << 4;
+	m_diskseq_cc_inputs[2] |= ~(m_diskseq_cmd_word_from_cpu & 0xf) << 4;
 
-	m_diskseq_cc_inputs[3] = ~(m_diskseq_cmd_from_cpu >> 4) & 0xff;
+	m_diskseq_cc_inputs[3] = ~(m_diskseq_cmd_word_from_cpu >> 4) & 0xff;
 
 	// S15, S16: Select which bank of 8 lines is treated as /CC input to Am2910
 	const uint8_t fx_bank_sel = (BIT(m_diskseq_ucode_latch[2], 0) << 1) | BIT(m_diskseq_ucode_latch[1], 7);
@@ -981,7 +1010,7 @@
 		ret = m_diskseq_status_out;
 		//req_b_w(0);
 		break;
-	case 0x7:
+	case 7:
 		ret = m_diskbuf_ram[m_diskbuf_ram_addr];
 		LOGMASKED(LOG_CTRLBUS, "%s: CPU read from Control Bus, Disc Data Buffer Card RAM read: %04x = %02x\n", machine().describe_context(), m_diskbuf_ram_addr, ret);
 		m_diskbuf_ram_addr++;
@@ -1097,6 +1126,8 @@
 	case 1: // Brush Store Read
 		break;
 	case 2: // Brush Store Write
+		m_bxlen_counter = m_bxlen;
+		m_bylen_counter = m_bylen;
 		break;
 	case 3: // Framestore Read
 		break;
@@ -1131,24 +1162,39 @@
 		{
 			if (!BIT(data, 5 + i) && m_cxpos[i] < 800 && m_cypos[i] < 768)
 			{
-				uint16_t bxlen = (((m_bxlen << 3) | (m_bixos & 7)) >> (m_bif & 3)) & 0xfff;
-				uint16_t bylen = (((m_bylen << 3) | (m_biyos & 7)) >> ((m_bif >> 2) & 3)) & 0xfff;
-				for (uint16_t y = m_cypos[i], by = bylen; by != 0x1000 && y < 768; by++, y++)
+				uint16_t bxlen = m_bxlen;//(((m_bxlen << 3) | (m_bixos & 7)) >> (m_bif & 3)) & 0xfff;
+				uint16_t bylen = m_bylen;//(((m_bylen << 3) | (m_biyos & 7)) >> ((m_bif >> 2) & 3)) & 0xfff;
+				for (uint16_t y = m_cypos[i], bly = bylen; bly != 0x1000 && y < 768; bly++, y++)
 				{
 					uint8_t *lum = &m_framestore_lum[i][y * 800];
 					uint8_t *chr = &m_framestore_chr[i][y * 800];
-					for (uint16_t x = m_cxpos[i], bx = bxlen; bx != 0x1000 && x < 800; bx++, x++)
+					for (uint16_t x = m_cxpos[i], blx = bxlen; blx != 0x1000 && x < 800; blx++, x++)
 					{
 						if (BIT(data, 13)) // Fixed Colour Select
 						{
-							uint8_t y = 0x00;
-							uint8_t u = 0x80;
-							uint8_t v = 0x80;
+							uint8_t y = m_bs_y_latch;
+							uint8_t u = m_bs_u_latch;
+							uint8_t v = m_bs_v_latch;
 							if (!BIT(data, 12)) // Brush Zero
 							{
-								y = m_bs_y_latch;
-								u = m_bs_u_latch;
-								v = m_bs_v_latch;
+								y = 0x00;
+								u = 0x80;
+								v = 0x80;
+							}
+							else if (!BIT(data, 9))
+							{
+								uint16_t bx = ((((blx - bxlen) << 3) | (m_bixos & 7)) >> (3 - (m_bif & 3))) & 0xfff;
+								uint16_t by = ((((bly - bylen) << 3) | (m_biyos & 7)) >> ((3 - (m_bif >> 2)) & 3)) & 0xfff;
+
+								// TODO: Actual Brush Processor functionality
+								uint16_t lum_sum = lum[x] + m_brushstore_lum[by * 256 + bx];
+								uint16_t chr_sum = chr[x] + m_brushstore_chr[by * 256 + bx];
+								y = lum_sum > 0xff ? 0xff : (uint16_t)lum_sum;
+								uint8_t chr_clamped = chr_sum > 0xff ? 0xff : (uint16_t)chr_sum;
+								if (m_cxpos[i] & 1)
+									v = chr_clamped;
+								else
+									u = chr_clamped;
 							}
 							lum[x] = y;
 							chr[x] = (m_cxpos[i] & 1) ? v : u;
@@ -1216,6 +1262,7 @@
 			uint16_t old_cyl = m_diskseq_cyl_from_cpu;
 			m_diskseq_cyl_from_cpu = data & 0x3ff;
 			LOGMASKED(LOG_CTRLBUS, "%s: CPU write to Control Bus, Disk Sequencer Card, Cylinder Number: %04x\n", machine().describe_context(), m_diskseq_cyl_from_cpu);
+			//printf("Cylinder %d\n", m_diskseq_cyl_from_cpu);
 			if (old_cyl != m_diskseq_cyl_from_cpu && m_diskseq_cyl_from_cpu < 78 && m_floppy != nullptr)
 			{
 				if (m_diskseq_cyl_from_cpu < old_cyl)
@@ -1248,87 +1295,78 @@
 		}
 		else if (hi_nybble == 2)
 		{
-			m_diskseq_cmd_from_cpu = data & 0xfff;
+			m_diskseq_cmd_word_from_cpu = data & 0xfff;
+			m_diskseq_cmd = (data >> 8) & 0xf;
 			req_b_w(0); // Flag ourselves as in-use
 			LOGMASKED(LOG_CTRLBUS, "%s: CPU write to Control Bus, Disk Sequencer Card, Command: %x (%04x)\n", machine().describe_context(), (data >> 8) & 0xf, data);
 			LOGMASKED(LOG_CTRLBUS, "%s                                                    Head: %x\n", machine().describe_context(), data & 0xf);
 			LOGMASKED(LOG_CTRLBUS, "%s                                                   Drive: %x\n", machine().describe_context(), (data >> 5) & 7);
-			switch ((data >> 8) & 0xf)
+			switch (m_diskseq_cmd)
 			{
 			case 1:
-				LOGMASKED(LOG_CTRLBUS, "%s: Disk Sequencer Card Command: Unknown command nybble 1\n", machine().describe_context());
+			case 5:
+			case 9:
+			case 13:
+				LOGMASKED(LOG_CTRLBUS, "%s: Disk Sequencer Card Command: No command\n", machine().describe_context());
 				req_b_w(1);
 				//m_diskseq_complete_clk->adjust(attotime::from_msec(1));
 				break;
 			case 0:
-				LOGMASKED(LOG_CTRLBUS, "%s: Disk Sequencer Card Command: Read (floppy?) track to RAM buffer?\n", machine().describe_context());
+				LOGMASKED(LOG_CTRLBUS, "%s: Disk Sequencer Card Command: Read track to buffer RAM\n", machine().describe_context());
 				if (!BIT(m_diskseq_status_out, 3))
 				{
 					m_diskseq_cyl_read_pending = true;
+					m_fdd_side = 0;
+				}
+				break;
+			case 2:
+				LOGMASKED(LOG_CTRLBUS, "%s: Disk Sequencer Card Command: Read track, stride 2, to buffer RAM\n", machine().describe_context());
+				if (!BIT(m_diskseq_status_out, 3))
+				{
+					m_diskseq_cyl_read_pending = true;
+					m_fdd_side = 0;
 				}
 				break;
-			case 6:
 			case 4:
-			{
-				//req_b_w(1);
-				m_diskseq_cyl_read_pending = true;
-				LOGMASKED(LOG_CTRLBUS, "%s: Disk Sequencer Card Command: %s track read to Brush Store (ignored for now)\n", machine().describe_context(),
-					((data >> 8) & 0xf) == 6 ? "Initiate" : "Continue");
-				/*if (((data >> 8) & 0xf) == 6)
+				LOGMASKED(LOG_CTRLBUS, "%s: Disk Sequencer Card Command: Read Track\n", machine().describe_context());
+				if (!BIT(m_diskseq_status_out, 3))
 				{
-				    m_size_h = 0;
-				    m_size_v = 0;
+					m_diskbuf_data_count = 0x2700;
+					m_line_count = 0;
+					m_line_clock = 0;
+					m_diskseq_cyl_read_pending = true;
+					m_fdd_side = 0;
 				}
-				uint16_t disc_buffer_addr = 0;
-				uint16_t bx = m_bxlen_counter - m_bxlen;
-				uint16_t by = m_bylen_counter - m_bylen;
-				while (m_diskbuf_data_count > 0 && m_bylen_counter < 0x1000)
+				break;
+			case 6:
+				LOGMASKED(LOG_CTRLBUS, "%s: Disk Sequencer Card Command: Disc Clear, Read Track\n", machine().describe_context());
+				if (!BIT(m_diskseq_status_out, 3))
 				{
-				    uint8_t hv = (m_size_h << 4) | m_size_v;
-				    uint8_t hv_permuted = bitswap<8>(hv,4,6,0,2,5,7,1,3);
-
-				    if (BIT(m_brush_addr_func, 7)) // Luma Enable
-				    {
-				        //printf("%02x ", m_diskbuf_ram[disc_buffer_addr]);
-				        m_brushstore_lum[by * 256 + hv_permuted] = m_diskbuf_ram[disc_buffer_addr];
-				    }
-
-				    disc_buffer_addr++;
-				    m_diskbuf_data_count--;
-
-				    if (BIT(m_brush_addr_func, 8)) // Chroma Enable
-				    {
-				        m_brushstore_chr[by * 256 + hv_permuted] = m_diskbuf_ram[disc_buffer_addr];
-				    }
-
-				    disc_buffer_addr++;
-				    m_diskbuf_data_count--;
-
-				    m_size_h++;
-				    if (m_size_h == 16)
-				    {
-				        m_size_h = 0;
-				        m_size_v++;
-				        if (m_size_v == 16)
-				        {
-				            m_size_v = 0;
-				        }
-				    }
-
-				    bx++;
-				    m_bxlen_counter++;
-				    if (m_bxlen_counter == 0x1000)
-				    {
-				        bx = 0;
-				        by++;
-				        m_bxlen_counter = m_bxlen;
-				        m_bylen_counter++;
-				        //printf("\n");
-				    }
-				}*/
-				m_diskseq_complete_clk->adjust(attotime::from_msec(1));
+					m_diskbuf_data_count = 0x2700;
+					m_diskseq_cyl_read_pending = true;
+					m_fdd_side = 0;
+				}
+				break;
+			case 8:
+				LOGMASKED(LOG_CTRLBUS, "%s: Disk Sequencer Card Command: Write Track from Buffer RAM (not yet implemented)\n", machine().describe_context());
+				req_b_w(1);
+				//m_diskseq_complete_clk->adjust(attotime::from_msec(1));
+				break;
+			case 10:
+				LOGMASKED(LOG_CTRLBUS, "%s: Disk Sequencer Card Command: Write Track, stride 2, from Buffer RAM (not yet implemented)\n", machine().describe_context());
+				req_b_w(1);
+				//m_diskseq_complete_clk->adjust(attotime::from_msec(1));
+				break;
+			case 12:
+				LOGMASKED(LOG_CTRLBUS, "%s: Disk Sequencer Card Command: Write Track (not yet implemented)\n", machine().describe_context());
+				req_b_w(1);
+				//m_diskseq_complete_clk->adjust(attotime::from_msec(1));
+				break;
+			case 14:
+				LOGMASKED(LOG_CTRLBUS, "%s: Disk Sequencer Card Command: Disc Clear, Write Track (not yet implemented)\n", machine().describe_context());
+				req_b_w(1);
+				//m_diskseq_complete_clk->adjust(attotime::from_msec(1));
 				break;
-			}
 			default:
 				LOGMASKED(LOG_CTRLBUS, "%s: Unknown Disk Sequencer Card command.\n", machine().describe_context());
 				m_diskseq_complete_clk->adjust(attotime::from_msec(1));
@@ -1496,7 +1534,7 @@
 	const uint16_t ctrl = m_sys_ctrl &~ SYSCTRL_AUTO_START;
 	const uint16_t auto_start = m_auto_start->read() ? SYSCTRL_AUTO_START : 0;
 	const uint16_t ret = ctrl | auto_start;
-	LOGMASKED(LOG_SYS_CTRL, "%s: CPU read from System Control: %04x\n", machine().describe_context(), ret);
+	//LOGMASKED(LOG_SYS_CTRL, "%s: CPU read from System Control: %04x\n", machine().describe_context(), ret);
 	return ret;
 }
 
@@ -1528,82 +1566,182 @@
 	return ret;
 }
 
+void dpb7000_state::advance_line_count()
+{
+	m_line_length = 0;
+	m_line_count++;
+	toggle_line_clock();
+}
+
+void dpb7000_state::toggle_line_clock()
+{
+	m_line_clock ^= 1;
+}
+
+void dpb7000_state::process_sample()
+{
+	const uint16_t x = (m_bxlen_counter - m_bxlen);
+	const uint16_t y = (m_bylen_counter - m_bylen);
+	//printf("Processing sample %d,%d (%04x:%04x, %04x:%04x) LC:%d\n", x, y, m_bxlen_counter, m_bxlen, m_bylen_counter, m_bylen, m_line_count);
+	if (BIT(m_brush_addr_func, 7))
+		m_brushstore_lum[y * 256 + x] = m_incoming_lum;
+	if (BIT(m_brush_addr_func, 8))
+		m_brushstore_chr[y * 256 + x] = m_incoming_chr;
+
+	m_bxlen_counter++;
+	if (m_bxlen_counter == 0x1000)
+	{
+		m_bxlen_counter = m_bxlen;
+		m_bylen_counter++;
+		if (m_bylen_counter == 0x1000)
+		{
+			m_diskseq_cyl_read_pending = false;
+		}
+	}
+}
+
+void dpb7000_state::process_byte_from_disc(uint8_t data_byte)
+{
+	if (m_buffer_lum)
+	{
+		m_incoming_lum = data_byte;
+	}
+	else
+	{
+		m_incoming_chr = data_byte;
+		process_sample();
+	}
+
+	m_buffer_lum = !m_buffer_lum;
+	m_line_length++;
+	if (m_line_length == 0x300)
+	{
+		advance_line_count();
+	}
+}
+
 void dpb7000_state::fdd_index_callback(floppy_image_device *floppy, int state)
 {
-	if (!state && m_diskseq_cyl_read_pending && m_floppy)
+	if (!state && m_diskseq_cyl_read_pending && m_floppy && m_fdd_side < 2)
 	{
+		//printf("Cylinder read is pending, index just passed by, we have a floppy. Let's go.\n");
 		m_fdd_pll.read_reset(machine().time());
 
 		static const uint16_t PREGAP_MARK = 0xaaaa;
 		static const uint16_t SYNC_MARK = 0x9125;
 
-		m_floppy->ss_w(0);
+		m_floppy->ss_w(m_fdd_side);
 
-		for (int side = 0; side < 2; side++)
+		bool seen_pregap = false;
+		bool in_track = false;
+		int curr_bit = -1;
+		uint16_t curr_window = 0;
+		uint16_t bit_idx = 0;
+
+		//printf("Side %d, not seen pregap, not in the track, no current bit, no current window, no bit index.\n", m_fdd_side);
+		attotime tm = machine().time();
+		attotime limit = machine().time() + attotime::from_ticks(1, 6); // One revolution at 360rpm on a Shugart SA850
+		do
 		{
-			bool seen_pregap = false;
-			bool in_track = false;
-			int curr_bit = -1;
-			uint16_t curr_window = 0;
-			uint16_t bit_idx = 0;
-
-			attotime tm = machine().time();
-			attotime limit = machine().time() + attotime::from_ticks(1, 6); // One revolution at 360rpm on a Shugart SA850
-			do
+			curr_bit = m_fdd_pll.get_next_bit(tm, m_floppy, limit);
+			if (curr_bit < 0)
 			{
-				curr_bit = m_fdd_pll.get_next_bit(tm, m_floppy, limit);
-				if (curr_bit < 0)
+				LOGMASKED(LOG_FDC_MECH, "Warning: Unable to retrieve full track %d side %d, curr_bit returned -1\n", m_floppy->get_cyl(), m_fdd_side);
+			}
+			else
+			{
+				curr_window <<= 1;
+				curr_window |= curr_bit;
+				bit_idx++;
+
+				if (!seen_pregap && curr_window == PREGAP_MARK)
 				{
-					LOGMASKED(LOG_FDC_MECH, "Warning: Unable to retrieve full track %d side %d!\n", m_floppy->get_cyl(), side);
+					seen_pregap = true;
+					//printf("\nFound pregap area.\n");
+					bit_idx = 0;
+					curr_window = 0;
 				}
-				else
+				else if (seen_pregap && !in_track && curr_window == SYNC_MARK)
 				{
-					curr_window <<= 1;
-					curr_window |= curr_bit;
-					bit_idx++;
-					//if ((bit_idx % 8) == 0)
-					//{
-					//  printf("%02x ", (uint8_t)curr_window);
-					//}
-
-					if (!seen_pregap && curr_window == PREGAP_MARK)
-					{
-						seen_pregap = true;
-						//printf("\nFound pregap area.\n");
-						bit_idx = 0;
-						curr_window = 0;
-					}
-					else if (seen_pregap && !in_track && curr_window == SYNC_MARK)
-					{
-						in_track = true;
-						//printf("\nOh hi, mark.\n");
-						bit_idx = 0;
-						curr_window = 0;
-					}
-					else if (seen_pregap && in_track && bit_idx == 16)
+					in_track = true;
+					//printf("\nOh hi, mark.\n");
+					bit_idx = 0;
+					curr_window = 0;
+				}
+				else if (seen_pregap && in_track && bit_idx == 16)
+				{
+					uint8_t data_byte = (uint8_t)bitswap<16>((uint16_t)curr_window, 15, 13, 11, 9, 7, 5, 3, 1, 14, 12, 10, 8, 6, 4, 2, 0);
+					//printf("%02x ", data_byte);
+					switch (m_diskseq_cmd)
 					{
-						uint8_t data_byte = (uint8_t)bitswap<16>((uint16_t)curr_window, 15, 13, 11, 9, 7, 5, 3, 1, 14, 12, 10, 8, 6, 4, 2, 0);
-						m_diskbuf_ram[m_diskbuf_ram_addr] = data_byte;
-						m_diskbuf_ram_addr++;
-						if (m_diskbuf_ram_addr >= 0x2700 && side == 0)
+					case 4: // Read Track
+					case 6: // Disc Clear, Read Track
+						m_diskbuf_data_count--;
+						process_byte_from_disc(data_byte);
+						if (!m_diskseq_cyl_read_pending)
+						{
+							curr_bit = -1;
+							m_fdd_side = 2;
+							//printf("\nThe whole world has betrayed me!\n");
+						}
+						else if (m_fdd_side == 0 && m_diskbuf_data_count == 0)
 						{
-							// If we've read the side 0 portion of the cylinder, yield out and begin processing side 1
 							curr_bit = -1;
 							m_floppy->ss_w(1);
+							m_fdd_side++;
+							m_diskbuf_data_count = 0x2400;
 							//printf("\nCatch you on the flip side!\n");
 						}
-						else if(m_diskbuf_ram_addr >= 0x4b00 && side == 1)
+						else if (m_fdd_side == 1 && m_diskbuf_data_count == 0)
+						{
+							curr_bit = -1;
+							m_fdd_side++;
+							//printf("\nYou're my favorite customer.\n");
+						}
+						break;
+					case 0: // Read Track to Buffer RAM
+					case 2: // Read Track, stride 2, to Buffer RAM
+						if (BIT(m_diskseq_cmd, 1))
+						{
+							if (!BIT(m_diskbuf_ram_addr, 0))
+							{
+								m_diskbuf_ram[m_diskbuf_ram_addr >> 1] = data_byte;
+							}
+							m_diskbuf_ram_addr++;
+						}
+						else
+						{
+							m_diskbuf_ram[m_diskbuf_ram_addr] = data_byte;
+							m_diskbuf_ram_addr++;
+						}
+
+						if (m_diskbuf_ram_addr >= 0x2700 && m_fdd_side == 0)
+						{
+							// If we've read the side 0 portion of the cylinder, yield out and wait for the next index pulse
+							curr_bit = -1;
+							m_floppy->ss_w(1);
+							m_fdd_side++;
+							//printf("\nCatch you on the flip side!\n");
+						}
+						else if(m_diskbuf_ram_addr >= 0x4B00 && m_fdd_side == 1)
 						{
 							// If we've read the side 1 portion of the cylinder, yield out, we're done
 							curr_bit = -1;
+							m_fdd_side++;
 							//printf("\nYou're my favorite customer.\n");
 						}
-						bit_idx = 0;
-						curr_window = 0;
+						break;
 					}
+					bit_idx = 0;
+					curr_window = 0;
 				}
-			} while (curr_bit != -1);
-		}
+			}
+		} while (curr_bit != -1);
+		//printf("\n");
+	}
+
+	if (m_fdd_side == 2)
+	{
 		m_diskseq_cyl_read_pending = false;
 		req_b_w(1);
 	}
@@ -1642,7 +1780,7 @@
 
 		if (m_fdd_track == 0)
 		{
-			m_fdd_ctrl |= 0x04;
+			m_fdd_ctrl |= 0x04; // On Cylinder
 		}
 		else
 		{
@@ -1654,10 +1792,11 @@
 		m_fdd_ctrl &= ~0x04;
 	}
 
+	// C5 D READY
 	if (BIT(m_fdd_port1, 7))
-		m_diskseq_status_out &= ~0x08;
+		m_diskseq_status_out &= ~(1 << 3);
 	else
-		m_diskseq_status_out |= 0x08;
+		m_diskseq_status_out |= (1 << 3);
 }
 
 void dpb7000_state::fddcpu_p2_w(uint8_t data)
@@ -1731,7 +1870,7 @@
 			uint8_t *src_lum = &m_brushstore_lum[(py - 512) * 256];
 			uint8_t *src_chr = &m_brushstore_chr[(py - 512) * 256];
 			uint32_t *dst = &bitmap.pix32(py);
-			for (int px = 0; px < 256; px++)
+			for (int px = 0; px < 256; px += 2)
 			{
 				const uint32_t u = *src_chr++ << 16;
 				const uint32_t v = *src_chr++ << 8;
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/dps1.cpp mame-0.224+dfsg.1/src/mame/drivers/dps1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/dps1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/dps1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -31,6 +31,7 @@
 		, m_maincpu(*this, "maincpu")
 		, m_rom(*this, "maincpu")
 		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
 		, m_fdc(*this, "fdc")
 		, m_floppy0(*this, "fdc:0")
 		//, m_floppy1(*this, "fdc:1")
@@ -54,12 +55,12 @@
 
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
-	bool m_rom_in_map;
 	bool m_dma_dir;
 	u16 m_dma_adr;
 	required_device<cpu_device> m_maincpu;
 	required_region_ptr<u8> m_rom;
 	required_shared_ptr<u8> m_ram;
+	required_memory_bank    m_bank1;
 	required_device<upd765_family_device> m_fdc;
 	required_device<floppy_connector> m_floppy0;
 	//required_device<floppy_connector> m_floppy1;
@@ -67,8 +68,8 @@
 
 void dps1_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x03ff).ram().share("mainram").lr8(NAME([this] (offs_t offset) { if(m_rom_in_map) return m_rom[offset]; else return m_ram[offset]; }));
-	map(0x0400, 0xffff).ram();
+	map(0x0000, 0xffff).ram().share("mainram");
+	map(0x0000, 0x03ff).bankr("bank1");
 }
 
 void dps1_state::io_map(address_map &map)
@@ -113,7 +114,7 @@
 // enable eprom
 void dps1_state::portb6_w(u8 data)
 {
-	m_rom_in_map = true;
+	m_bank1->set_entry(1);
 }
 
 // set A16-23
@@ -136,7 +137,7 @@
 // disable eprom
 void dps1_state::portbe_w(u8 data)
 {
-	m_rom_in_map = false;
+	m_bank1->set_entry(0);
 }
 
 // read 8 front-panel switches
@@ -173,14 +174,15 @@
 
 void dps1_state::machine_start()
 {
-	save_item(NAME(m_rom_in_map));
+	m_bank1->configure_entry(0, m_ram);
+	m_bank1->configure_entry(1, m_rom);
 	save_item(NAME(m_dma_dir));
 	save_item(NAME(m_dma_adr));
 }
 
 void dps1_state::machine_reset()
 {
-	m_rom_in_map = true;
+	m_bank1->set_entry(1);
 	// set fdc for 8 inch floppies
 	m_fdc->set_rate(500000);
 	// turn on the motor
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/dragon.cpp mame-0.224+dfsg.1/src/mame/drivers/dragon.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/dragon.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/dragon.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -193,12 +193,12 @@
 	PORT_INCLUDE(dragon200e_keyboard)
 	PORT_INCLUDE(coco_joystick)
 	PORT_INCLUDE(coco_analog_control)
-INPUT_PORTS_END
 
-MC6847_GET_CHARROM_MEMBER( dragon200e_state::char_rom_r )
-{
-	return m_char_rom->base()[(ch * 12 + line) & 0xfff];
-}
+	PORT_START("LK1")
+	PORT_CONFNAME(0x01, 0x01, "Inverse Video")
+	PORT_CONFSETTING(0x00, "Inverse")
+	PORT_CONFSETTING(0x01, "Normal")
+INPUT_PORTS_END
 
 void dragon_cart(device_slot_interface &device)
 {
@@ -379,6 +379,7 @@
 	dragon64(config);
 	// video hardware
 	m_vdg->set_get_char_rom(FUNC(dragon200e_state::char_rom_r));
+	m_vdg->input_callback().set(FUNC(dragon200e_state::sam_read));
 }
 
 void d64plus_state::d64plus(machine_config &config)
@@ -542,7 +543,7 @@
 COMP( 1983, dragon64,   dragon32, 0,      dragon64,   dragon,     dragon64_state,     empty_init, "Dragon Data Ltd",              "Dragon 64",                      0 )
 COMP( 19??, dragon64h,  dragon32, 0,      dragon64h,  dragon,     dragon64_state,     empty_init, "Dragon Data Ltd",              "Dragon 64 (HD6309E CPU)",        MACHINE_UNOFFICIAL )
 COMP( 1985, dragon200,  dragon32, 0,      dragon64,   dragon,     dragon64_state,     empty_init, "Eurohard S.A.",                "Dragon 200",                     0 )
-COMP( 1985, dragon200e, dragon32, 0,      dragon200e, dragon200e, dragon200e_state,   empty_init, "Eurohard S.A.",                "Dragon 200-E",                   MACHINE_NOT_WORKING )
+COMP( 1985, dragon200e, dragon32, 0,      dragon200e, dragon200e, dragon200e_state,   empty_init, "Eurohard S.A.",                "Dragon 200-E",                   0 )
 COMP( 1985, d64plus,    dragon32, 0,      d64plus,    dragon,     d64plus_state,      empty_init, "Dragon Data Ltd / Compusense", "Dragon 64 Plus",                 0 )
 COMP( 1983, tanodr64,   dragon32, 0,      tanodr64,   dragon,     dragon64_state,     empty_init, "Dragon Data Ltd / Tano Ltd",   "Tano Dragon 64 (NTSC)",          0 )
 COMP( 19??, tanodr64h,  dragon32, 0,      tanodr64h,  dragon,     dragon64_state,     empty_init, "Dragon Data Ltd / Tano Ltd",   "Tano Dragon 64 (NTSC; HD6309E)", MACHINE_UNOFFICIAL )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/drdmania.cpp mame-0.224+dfsg.1/src/mame/drivers/drdmania.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/drdmania.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/drdmania.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4,14 +4,14 @@
 
     Skeleton driver for Sleic Dardomania darts machines
     This game has a monitor to select the game type.
-    PCB is marked SLEIC and DIANA'94
+    PCB is marked "SLEIC", "DIANA'94" and "13/94".
 
     Hardware overview:
-    Main CPU: Z0840006PSC
-    Sound: AY-3-8910
-    Other: MK48Z02B-20
-    OSCs: 18.432 MHz
-    Dips: 1 x 6 dips banks
+    -Main CPU: Z0840006PSC
+    -Sound: AY-3-8910
+    -Other: MK48Z02B-20
+    -OSCs: 18.432 MHz
+    -Dips: 1 x 6 dips banks
 
 *******************************************************************************/
 
@@ -58,9 +58,9 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &drdmania_state::mem_map);
 	m_maincpu->set_addrmap(AS_IO, &drdmania_state::io_map);
 
-	//NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
+	//NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // MK48Z02B-20
 
-	// SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+	//SCREEN(config, "screen", SCREEN_TYPE_RASTER);
 
 	SPEAKER(config, "mono").front_center();
 
@@ -78,7 +78,7 @@
 	ROM_LOAD( "dardomania_dmp05_v2.1.ic10", 0x18000, 0x8000, CRC(e24f2a02) SHA1(16f3a9c80b3d60c66b070521a90c958b0fc690e7) ) // 1ST AND 2ND HALF IDENTICAL
 
 	ROM_REGION(0x20, "proms", 0)
-	ROM_LOAD( "n82s123n.ic49", 0x00, 0x20, NO_DUMP )
+	ROM_LOAD( "n82s123n.ic49", 0x00, 0x20, CRC(dcbd2352) SHA1(ce72e84129ed1b455aaf648e1dfaa4333e7e7628) )
 ROM_END
 
-GAME(199?, drdmania, 0, drdmania, drdmania, drdmania_state, empty_init, ROT0, "Sleic", "Dardomania (v2.1)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1994, drdmania, 0, drdmania, drdmania, drdmania_state, empty_init, ROT0, "Sleic", "Dardomania (v2.1)", MACHINE_IS_SKELETON_MECHANICAL)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/dsb46.cpp mame-0.224+dfsg.1/src/mame/drivers/dsb46.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/dsb46.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/dsb46.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -42,6 +42,7 @@
 		, m_maincpu(*this, "maincpu")
 		, m_rom(*this, "maincpu")
 		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
 	{ }
 
 	void dsb46(machine_config &config);
@@ -52,16 +53,16 @@
 	void port1a_w(u8 data);
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
-	bool m_rom_in_map;
 	required_device<z80_device> m_maincpu;
 	required_region_ptr<u8> m_rom;
 	required_shared_ptr<u8> m_ram;
+	required_memory_bank    m_bank1;
 };
 
 void dsb46_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x07ff).ram().share("mainram").lr8(NAME([this] (offs_t offset) { if(m_rom_in_map) return m_rom[offset]; else return m_ram[offset]; }));
-	map(0x0800, 0xffff).ram();
+	map(0x0000, 0xffff).ram().share("mainram");
+	map(0x0000, 0x07ff).bankr("bank1");
 }
 
 void dsb46_state::io_map(address_map &map)
@@ -83,17 +84,18 @@
 
 void dsb46_state::machine_start()
 {
-	save_item(NAME(m_rom_in_map));
+	m_bank1->configure_entry(0, m_ram);
+	m_bank1->configure_entry(1, m_rom);
 }
 
 void dsb46_state::machine_reset()
 {
-	m_rom_in_map = true;
+	m_bank1->set_entry(1);
 }
 
 void dsb46_state::port1a_w(u8 data)
 {
-	m_rom_in_map = BIT(~data, 0);
+	m_bank1->set_entry(BIT(~data, 0));
 }
 
 static const z80_daisy_config daisy_chain[] =
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ec65.cpp mame-0.224+dfsg.1/src/mame/drivers/ec65.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ec65.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ec65.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,12 +1,26 @@
 // license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic, Robbbert
-/***************************************************************************
+/********************************************************************************
 
 EC-65 (also known as Octopus)
 
 2009-07-16 Initial driver.
 
-****************************************************************************/
+No sound. Storage is floppy disk. No software has been found.
+Modules are constructed on separate eurocards and plug into a common backplane.
+
+EC65 -  Disk controller module uses 6821 and 6850. Needs to be emulated.
+        When done, .b to boot disk
+
+EC65K - To be developed from scratch. Similar design to EC65, but 6522
+        replaced with 6821. Contains extra RTC. Particulars of video and
+        universal FDC not known.
+      - Extra 256KB card
+      - Extra Z80 card with ROM, 2x PIA, 64 or 256KB RAM, for CP/M use.
+      - Currently runs into the weeds soon after start, at F070
+
+
+********************************************************************************/
 
 #include "emu.h"
 #include "cpu/m6502/m6502.h"
@@ -17,68 +31,82 @@
 #include "machine/mos6551.h"
 #include "machine/6850acia.h"
 #include "machine/keyboard.h"
+#include "machine/mc146818.h"
 #include "emupal.h"
 #include "screen.h"
 
-#define PIA6821_TAG "pia6821"
-#define ACIA6850_TAG "acia6850"
-#define ACIA6551_TAG "acia6551"
-#define VIA6522_0_TAG "via6522_0"
-#define VIA6522_1_TAG "via6522_1"
-#define MC6845_TAG "mc6845"
-#define KEYBOARD_TAG "keyboard"
 
-class ec65_state : public driver_device
+class ec65_common : public driver_device
 {
 public:
-	ec65_state(const machine_config &mconfig, device_type type, const char *tag)
+	ec65_common(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-		, m_via_0(*this, VIA6522_0_TAG)
-		, m_via_1(*this, VIA6522_1_TAG)
-		, m_p_videoram(*this, "videoram")
+		, m_vram(*this, "videoram")
 		, m_p_chargen(*this, "chargen")
 		, m_maincpu(*this, "maincpu")
 		, m_palette(*this, "palette")
-	{
-	}
+	{ }
 
-	void kbd_put(u8 data);
 	MC6845_UPDATE_ROW(crtc_update_row);
 
-	void ec65(machine_config &config);
-private:
-	virtual void machine_reset() override;
-	void ec65_mem(address_map &map);
-	required_device<via6522_device> m_via_0;
-	required_device<via6522_device> m_via_1;
-	required_shared_ptr<uint8_t> m_p_videoram;
+protected:
+	required_shared_ptr<u8> m_vram;
 	required_region_ptr<u8> m_p_chargen;
 	required_device<cpu_device> m_maincpu;
 	required_device<palette_device> m_palette;
+
+};
+
+class ec65_state : public ec65_common
+{
+public:
+	ec65_state(const machine_config &mconfig, device_type type, const char *tag)
+		: ec65_common(mconfig, type, tag)
+		, m_via0(*this, "via0")
+		, m_via1(*this, "via1")
+	{ }
+
+	void ec65(machine_config &config);
+
+private:
+	void machine_reset() override;
+	void ec65_mem(address_map &map);
+	void kbd_put(u8 data);
+	required_device<via6522_device> m_via0;
+	required_device<via6522_device> m_via1;
 };
 
-class ec65k_state : public driver_device
+class ec65k_state : public ec65_common
 {
 public:
 	ec65k_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag)
-	{
-	}
+		: ec65_common(mconfig, type, tag)
+		, m_rtc(*this, "rtc")
+		, m_pia0(*this, "pia0")
+		, m_pia1(*this, "pia1")
+	{ }
+
 	void ec65k(machine_config &config);
+
+private:
 	void ec65k_mem(address_map &map);
+	void kbd_put(u8 data);
+	required_device<mc146818_device> m_rtc;
+	required_device<pia6821_device> m_pia0;
+	required_device<pia6821_device> m_pia1;
 };
 
 void ec65_state::ec65_mem(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x0000, 0xdfff).ram();
-	map(0xe000, 0xe003).rw(PIA6821_TAG, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
-	map(0xe010, 0xe011).rw(ACIA6850_TAG, FUNC(acia6850_device::read), FUNC(acia6850_device::write));
-	map(0xe100, 0xe10f).m(m_via_0, FUNC(via6522_device::map));
-	map(0xe110, 0xe11f).m(m_via_1, FUNC(via6522_device::map));
-	map(0xe130, 0xe133).rw(ACIA6551_TAG, FUNC(mos6551_device::read), FUNC(mos6551_device::write));
-	map(0xe140, 0xe140).w(MC6845_TAG, FUNC(mc6845_device::address_w));
-	map(0xe141, 0xe141).rw(MC6845_TAG, FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
+	map(0xe000, 0xe003).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // FDC card
+	map(0xe010, 0xe011).rw("fdc", FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // FDC card
+	map(0xe100, 0xe10f).m(m_via0, FUNC(via6522_device::map));
+	map(0xe110, 0xe11f).m(m_via1, FUNC(via6522_device::map));
+	map(0xe130, 0xe133).rw("uart", FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+	map(0xe140, 0xe140).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w));
+	map(0xe141, 0xe141).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 	map(0xe400, 0xe7ff).ram(); // 1KB on-board RAM
 	map(0xe800, 0xefff).ram().share("videoram");
 	map(0xf000, 0xffff).rom().region("maincpu",0);
@@ -87,9 +115,22 @@
 void ec65k_state::ec65k_mem(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0xe7ff).ram();
-	map(0xe800, 0xefff).ram().share("videoram");
-	map(0xf000, 0xffff).rom().region("maincpu",0);
+	map(0x000000, 0x00dfff).ram();   // D000-DFFF = System RAM
+	map(0x00e000, 0x00e003).rw("pia", FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // old FDC card
+	map(0x00e010, 0x00e011).rw("fdc", FUNC(acia6850_device::read), FUNC(acia6850_device::write)); // old FDC card
+	//map(0x00e150,             colorator CRTC (no info)
+	//map(0x00e280,             basicode interface (no info)
+	//map(0x00e300,             Z80 board
+	map(0x00e400, 0x00e403).rw(m_pia0, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); //  PIA0 porta=keyboard; portb=parallel port
+	map(0x00e410, 0x00e413).rw("uart", FUNC(mos6551_device::read), FUNC(mos6551_device::write));
+	map(0x00e420, 0x00e423).rw(m_pia1, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); //  PIA1 porta=centronics control; portb=centronics data
+	map(0x00e430, 0x00e430).lw8(NAME([this] (u8 data) { m_rtc->write(0, data); }));  //  RTC 146818 - has battery backup
+	map(0x00e431, 0x00e431).lr8(NAME([this] () { return m_rtc->read(1); }));
+	map(0x00e431, 0x00e431).lw8(NAME([this] (u8 data) { m_rtc->write(1, data); }));
+	//map(0x00e500, 0x00e5ff)   universal disk controller (no info)
+	map(0x00e800, 0x00efff).ram().share("videoram");
+	map(0x00f000, 0x00ffff).rom().region("maincpu",0);
+	map(0x010000, 0x0fffff).ram();
 }
 
 /* Input ports */
@@ -100,29 +141,39 @@
 {
 	if (data)
 	{
-		m_via_0->write_pa(data);
-		m_via_0->write_ca1(1);
-		m_via_0->write_ca1(0);
+		m_via0->write_pa(data);
+		m_via0->write_ca1(1);
+		m_via0->write_ca1(0);
+	}
+}
+
+void ec65k_state::kbd_put(u8 data)
+{
+	if (data)
+	{
+		m_pia0->porta_w(data);
+		m_pia0->ca1_w(1);
+		m_pia0->ca1_w(0);
 	}
 }
 
 void ec65_state::machine_reset()
 {
-	m_via_1->write_pb(0xff);
+	m_via1->write_pb(0xff);
 }
 
-MC6845_UPDATE_ROW( ec65_state::crtc_update_row )
+MC6845_UPDATE_ROW( ec65_common::crtc_update_row )
 {
 	const rgb_t *palette = m_palette->palette()->entry_list_raw();
-	uint8_t chr,gfx,inv;
-	uint16_t mem,x;
-	uint32_t *p = &bitmap.pix32(y);
+	u8 chr,gfx,inv;
+	u16 mem,x;
+	u32 *p = &bitmap.pix32(y);
 
 	for (x = 0; x < x_count; x++)
 	{
 		inv = (x == cursor_x) ? 0xff : 0;
 		mem = (ma + x) & 0x7ff;
-		chr = m_p_videoram[mem];
+		chr = m_vram[mem];
 
 		/* get pattern of pixels for that character scanline */
 		gfx = m_p_chargen[(chr<<4) | (ra & 0x0f)] ^ inv;
@@ -169,30 +220,29 @@
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	screen.set_size(640, 200);
 	screen.set_visarea_full();
-	screen.set_screen_update(MC6845_TAG, FUNC(mc6845_device::screen_update));
+	screen.set_screen_update("crtc", FUNC(mc6845_device::screen_update));
 
 	GFXDECODE(config, "gfxdecode", m_palette, gfx_ec65);
 	PALETTE(config, "palette", palette_device::MONOCHROME);
 
-	mc6845_device &crtc(MC6845(config, MC6845_TAG, XTAL(16'000'000) / 8));
+	mc6845_device &crtc(MC6845(config, "crtc", XTAL(16'000'000) / 8));
 	crtc.set_screen("screen");
 	crtc.set_show_border_area(false);
 	crtc.set_char_width(8); /*?*/
 	crtc.set_update_row_callback(FUNC(ec65_state::crtc_update_row));
 
 	/* devices */
-	PIA6821(config, PIA6821_TAG, 0);
+	ACIA6850(config, "fdc", 0); // used as a FDC on separate card
+	PIA6821(config, "pia", 0);   // assists 6850
 
-	ACIA6850(config, ACIA6850_TAG, 0);
+	VIA6522(config, m_via0, XTAL(4'000'000) / 4);
 
-	VIA6522(config, m_via_0, XTAL(4'000'000) / 4);
+	VIA6522(config, m_via1, XTAL(4'000'000) / 4);
 
-	VIA6522(config, m_via_1, XTAL(4'000'000) / 4);
+	mos6551_device &uart(MOS6551(config, "uart", 0));
+	uart.set_xtal(XTAL(1'843'200));
 
-	mos6551_device &acia(MOS6551(config, ACIA6551_TAG, 0));
-	acia.set_xtal(XTAL(1'843'200));
-
-	generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, KEYBOARD_TAG, 0));
+	generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
 	keyboard.set_keyboard_callback(FUNC(ec65_state::kbd_put));
 }
 
@@ -208,15 +258,32 @@
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	screen.set_size(640, 200);
 	screen.set_visarea_full();
-	screen.set_screen_update(MC6845_TAG, FUNC(mc6845_device::screen_update));
+	screen.set_screen_update("crtc", FUNC(mc6845_device::screen_update));
 
 	GFXDECODE(config, "gfxdecode", "palette", gfx_ec65);
 	PALETTE(config, "palette", palette_device::MONOCHROME);
 
-	mc6845_device &crtc(MC6845(config, MC6845_TAG, XTAL(16'000'000) / 8));
+	mc6845_device &crtc(MC6845(config, "crtc", XTAL(16'000'000) / 8));
 	crtc.set_screen("screen");
 	crtc.set_show_border_area(false);
 	crtc.set_char_width(8); /*?*/
+	crtc.set_update_row_callback(FUNC(ec65k_state::crtc_update_row));
+
+	/* devices */
+	ACIA6850(config, "fdc", 0); // used as a FDC on separate card
+	PIA6821(config, "pia", 0);   // assists 6850
+
+	MC146818(config, m_rtc, 32.768_kHz_XTAL);
+	//m_rtc->irq().set(FUNC(micronic_state::mc146818_irq));   Connects to common irq line used by below PIAs and UART
+
+	PIA6821(config, m_pia0, 0);
+	PIA6821(config, m_pia1, 0);
+
+	mos6551_device &uart(MOS6551(config, "uart", 0));
+	uart.set_xtal(XTAL(1'843'200));
+
+	generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
+	keyboard.set_keyboard_callback(FUNC(ec65k_state::kbd_put));
 }
 
 /* ROM definition */
@@ -233,10 +300,10 @@
 	ROM_LOAD( "ec65k.ic19",  0x0000, 0x1000, CRC(5e5a890a) SHA1(daa006f2179fd156833e11c73b37881cafe5dede))
 
 	ROM_REGION( 0x1000, "chargen", 0 )
-	ROM_LOAD( "chargen.ic19", 0x0000, 0x1000, CRC(9b56a28d) SHA1(41c04fd9fb542c50287bc0e366358a61fc4b0cd4)) // Located on VDU card, suspect bad dump
+	ROM_LOAD( "chargen.ic19", 0x0000, 0x1000, CRC(9b56a28d) SHA1(41c04fd9fb542c50287bc0e366358a61fc4b0cd4)) // Located on VDU card
 ROM_END
 /* Driver */
 
-/*    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY                FULLNAME  FLAGS */
-COMP( 1985, ec65,  0,      0,      ec65,    ec65,  ec65_state,  empty_init, "Elektor Electronics", "EC-65",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
-COMP( 1985, ec65k, ec65,   0,      ec65k,   ec65,  ec65k_state, empty_init, "Elektor Electronics", "EC-65K", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+/*    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY    FULLNAME  FLAGS */
+COMP( 1985, ec65,  0,      0,      ec65,    ec65,  ec65_state,  empty_init, "Elektor", "EC-65",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+COMP( 1986, ec65k, ec65,   0,      ec65k,   ec65,  ec65k_state, empty_init, "Elektor", "EC-65K", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/electron.cpp mame-0.224+dfsg.1/src/mame/drivers/electron.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/electron.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/electron.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -94,21 +94,13 @@
 #include "softlist.h"
 #include "speaker.h"
 
-static const rgb_t electron_palette[8]=
-{
-	rgb_t(0x0ff,0x0ff,0x0ff),
-	rgb_t(0x000,0x0ff,0x0ff),
-	rgb_t(0x0ff,0x000,0x0ff),
-	rgb_t(0x000,0x000,0x0ff),
-	rgb_t(0x0ff,0x0ff,0x000),
-	rgb_t(0x000,0x0ff,0x000),
-	rgb_t(0x0ff,0x000,0x000),
-	rgb_t(0x000,0x000,0x000)
-};
 
 void electron_state::electron_colours(palette_device &palette) const
 {
-	palette.set_pen_colors(0, electron_palette);
+	for (int i = 0; i < palette.entries(); i++)
+	{
+		palette.set_pen_color(i ^ 7, rgb_t(pal1bit(i >> 0), pal1bit(i >> 1), pal1bit(i >> 2)));
+	}
 }
 
 void electron_state::electron_mem(address_map &map)
@@ -137,91 +129,91 @@
 
 static INPUT_PORTS_START( electron )
 	PORT_START("LINE.0")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("\xE2\x86\x92 | \\") PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CHAR('|') PORT_CHAR('\\') // on the real keyboard, this would be on the 1st row, the 3rd key after 0
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("COPY") PORT_CODE(KEYCODE_END)  PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_CHAR('[') PORT_CHAR(']')
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(u8"\u2192 | \\") PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CHAR('|') PORT_CHAR('\\') // on the real keyboard, this would be on the 1st row, the 3rd key after 0
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("COPY") PORT_CODE(KEYCODE_END)  PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_CHAR('[') PORT_CHAR(']')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')
 
 	PORT_START("LINE.1")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("\xE2\x86\x90 ^ ~") PORT_CODE(KEYCODE_EQUALS) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_CHAR('^') PORT_CHAR('~')
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("\xE2\x86\x93 _ }") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CHAR('_') PORT_CHAR('}')
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RETURN") PORT_CODE(KEYCODE_ENTER)     PORT_CHAR(13)
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("DELETE") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(u8"\u2190 ^ ~") PORT_CODE(KEYCODE_EQUALS) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_CHAR('^') PORT_CHAR('~')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(u8"\u2193 _ }") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CHAR('_') PORT_CHAR('}')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RETURN") PORT_CODE(KEYCODE_ENTER)     PORT_CHAR(13)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("DELETE") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
 
 	PORT_START("LINE.2")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)      PORT_CHAR('-') PORT_CHAR('=')
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("\xE2\x86\x91 \xC2\xA3 {") PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR(UCHAR_MAMEKEY(UP)) PORT_CHAR(0xA3) PORT_CHAR('{')
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR(':') PORT_CHAR('*')
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)      PORT_CHAR('-') PORT_CHAR('=')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(u8"\u2191 £ {") PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR(UCHAR_MAMEKEY(UP)) PORT_CHAR(0xA3) PORT_CHAR('{')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR(':') PORT_CHAR('*')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
 
 	PORT_START("LINE.3")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)          PORT_CHAR('0') PORT_CHAR('@')
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_P)          PORT_CHAR('p') PORT_CHAR('P')
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)      PORT_CHAR(';') PORT_CHAR('+')
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('/') PORT_CHAR('?')
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)          PORT_CHAR('0') PORT_CHAR('@')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_P)          PORT_CHAR('p') PORT_CHAR('P')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)      PORT_CHAR(';') PORT_CHAR('+')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('/') PORT_CHAR('?')
 
 	PORT_START("LINE.4")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)          PORT_CHAR('9') PORT_CHAR(')')
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_O)          PORT_CHAR('o') PORT_CHAR('O')
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_L)          PORT_CHAR('l') PORT_CHAR('L')
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)       PORT_CHAR('.') PORT_CHAR('>')
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)          PORT_CHAR('9') PORT_CHAR(')')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_O)          PORT_CHAR('o') PORT_CHAR('O')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_L)          PORT_CHAR('l') PORT_CHAR('L')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)       PORT_CHAR('.') PORT_CHAR('>')
 
 	PORT_START("LINE.5")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)          PORT_CHAR('8') PORT_CHAR('(')
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_I)          PORT_CHAR('i') PORT_CHAR('I')
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_K)          PORT_CHAR('k') PORT_CHAR('K')
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(',') PORT_CHAR('<')
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)          PORT_CHAR('8') PORT_CHAR('(')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_I)          PORT_CHAR('i') PORT_CHAR('I')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_K)          PORT_CHAR('k') PORT_CHAR('K')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(',') PORT_CHAR('<')
 
 	PORT_START("LINE.6")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)          PORT_CHAR('7') PORT_CHAR('\'')
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_U)          PORT_CHAR('u') PORT_CHAR('U')
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_J)          PORT_CHAR('j') PORT_CHAR('J')
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)          PORT_CHAR('m') PORT_CHAR('M')
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)          PORT_CHAR('7') PORT_CHAR('\'')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_U)          PORT_CHAR('u') PORT_CHAR('U')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_J)          PORT_CHAR('j') PORT_CHAR('J')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)          PORT_CHAR('m') PORT_CHAR('M')
 
 	PORT_START("LINE.7")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)          PORT_CHAR('6') PORT_CHAR('&')
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)          PORT_CHAR('y') PORT_CHAR('Y')
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_H)          PORT_CHAR('h') PORT_CHAR('H')
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)          PORT_CHAR('n') PORT_CHAR('N')
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)          PORT_CHAR('6') PORT_CHAR('&')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)          PORT_CHAR('y') PORT_CHAR('Y')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_H)          PORT_CHAR('h') PORT_CHAR('H')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)          PORT_CHAR('n') PORT_CHAR('N')
 
 	PORT_START("LINE.8")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)          PORT_CHAR('5') PORT_CHAR('%')
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_T)          PORT_CHAR('t') PORT_CHAR('T')
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_G)          PORT_CHAR('g') PORT_CHAR('G')
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)          PORT_CHAR('b') PORT_CHAR('B')
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)          PORT_CHAR('5') PORT_CHAR('%')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_T)          PORT_CHAR('t') PORT_CHAR('T')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_G)          PORT_CHAR('g') PORT_CHAR('G')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)          PORT_CHAR('b') PORT_CHAR('B')
 
 	PORT_START("LINE.9")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)          PORT_CHAR('4') PORT_CHAR('$')
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_R)          PORT_CHAR('r') PORT_CHAR('R')
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)          PORT_CHAR('f') PORT_CHAR('F')
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)          PORT_CHAR('v') PORT_CHAR('V')
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)          PORT_CHAR('4') PORT_CHAR('$')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_R)          PORT_CHAR('r') PORT_CHAR('R')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)          PORT_CHAR('f') PORT_CHAR('F')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)          PORT_CHAR('v') PORT_CHAR('V')
 
 	PORT_START("LINE.10")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)          PORT_CHAR('3') PORT_CHAR('#')
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_E)          PORT_CHAR('e') PORT_CHAR('E')
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_D)          PORT_CHAR('d') PORT_CHAR('D')
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)          PORT_CHAR('c') PORT_CHAR('C')
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)          PORT_CHAR('3') PORT_CHAR('#')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_E)          PORT_CHAR('e') PORT_CHAR('E')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_D)          PORT_CHAR('d') PORT_CHAR('D')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)          PORT_CHAR('c') PORT_CHAR('C')
 
 	PORT_START("LINE.11")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)          PORT_CHAR('2') PORT_CHAR('"')
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)          PORT_CHAR('w') PORT_CHAR('W')
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)          PORT_CHAR('s') PORT_CHAR('S')
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)          PORT_CHAR('x') PORT_CHAR('X')
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)          PORT_CHAR('2') PORT_CHAR('"')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)          PORT_CHAR('w') PORT_CHAR('W')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)          PORT_CHAR('s') PORT_CHAR('S')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)          PORT_CHAR('x') PORT_CHAR('X')
 
 	PORT_START("LINE.12")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)          PORT_CHAR('1') PORT_CHAR('!')
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)          PORT_CHAR('q') PORT_CHAR('Q')
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)          PORT_CHAR('a') PORT_CHAR('A')
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)          PORT_CHAR('z') PORT_CHAR('Z')
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)          PORT_CHAR('1') PORT_CHAR('!')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)          PORT_CHAR('q') PORT_CHAR('Q')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)          PORT_CHAR('a') PORT_CHAR('A')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)          PORT_CHAR('z') PORT_CHAR('Z')
 
 	PORT_START("LINE.13")
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("ESCAPE") PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC))
-	PORT_BIT(0x02,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("FUNC") PORT_CODE(KEYCODE_TAB) PORT_CHAR(UCHAR_MAMEKEY(LALT))
-	PORT_BIT(0x04,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
-	PORT_BIT(0x08,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_RSHIFT) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("ESCAPE") PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC))
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("FUNC") PORT_CODE(KEYCODE_TAB) PORT_CHAR(UCHAR_MAMEKEY(LALT))
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_RSHIFT) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
 
 	PORT_START("BRK")       /* BREAK */
-	PORT_BIT(0x01,  IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("BREAK") PORT_CODE(KEYCODE_F12) PORT_CHAR(UCHAR_MAMEKEY(F12)) PORT_CHANGED_MEMBER(DEVICE_SELF, electron_state, trigger_reset, 0)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("BREAK") PORT_CODE(KEYCODE_F12) PORT_CHAR(UCHAR_MAMEKEY(F12)) PORT_CHANGED_MEMBER(DEVICE_SELF, electron_state, trigger_reset, 0)
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( electron64 )
@@ -250,6 +242,11 @@
 	PORT_DIPSETTING(0x0e, "14&15")
 INPUT_PORTS_END
 
+void electron_state::plus3_default(device_t* device)
+{
+	device->subdevice<electron_expansion_slot_device>("exp")->set_default_option("plus1");
+}
+
 void electron_state::electron(machine_config &config)
 {
 	M6502(config, m_maincpu, 16_MHz_XTAL / 8);
@@ -259,7 +256,7 @@
 
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
 	m_screen->set_raw(16_MHz_XTAL, 1024, 0, 640, 312, 0, 256);
-	//m_screen->set_raw(16_MHz_XTAL, 1024, 264, 264 + 640, 312, 31, 31 + 256)
+	//m_screen->set_raw(16_MHz_XTAL, 1024, 264, 264 + 640, 312, 28, 28 + 256)
 	m_screen->set_screen_update(FUNC(electron_state::screen_update_electron));
 	m_screen->set_video_attributes(VIDEO_UPDATE_SCANLINE);
 	m_screen->set_palette("palette");
@@ -278,6 +275,7 @@
 
 	/* expansion port */
 	ELECTRON_EXPANSION_SLOT(config, m_exp, 16_MHz_XTAL, electron_expansion_devices, "plus3");
+	m_exp->set_option_machine_config("plus3", plus3_default);
 	m_exp->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<1>));
 	m_exp->nmi_handler().set_inputline(m_maincpu, M6502_NMI_LINE);
 
@@ -344,32 +342,27 @@
 
 
 ROM_START(electron)
-	ROM_REGION( 0x4000, "mos", 0 )
-	ROM_LOAD( "b02_acornos-1.rom", 0x0000, 0x4000, CRC(a0c2cf43) SHA1(a27ce645472cc5497690e4bfab43710efbb0792d) )
-	ROM_REGION( 0x4000, "basic", 0 )
-	ROM_LOAD( "basic.rom", 0x0000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281) )
+	ROM_REGION( 0x8000, "mos", 0 )
+	ROM_LOAD( "os_basic.ic2", 0x0000, 0x8000, CRC(b997f9cb) SHA1(4a66c83aba07d0a8e76ed8a5545af04e11c19fdc) )
 ROM_END
 
 ROM_START(electront)
-	ROM_REGION( 0x4000, "mos",  0 )
+	ROM_REGION( 0x8000, "mos",  0 )
 	/* Serial 06-ALA01-0000087 from Centre for Computing History */
-	ROM_LOAD( "elk_036.rom", 0x0000, 0x4000, CRC(dd1a99c3) SHA1(87ee1b14895e476909dd002d5ca2346a3a5f3f57) )
-	ROM_REGION( 0x4000, "basic", 0 )
 	ROM_LOAD( "basic.rom", 0x0000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281) )
+	ROM_LOAD( "elk_036.rom", 0x4000, 0x4000, CRC(dd1a99c3) SHA1(87ee1b14895e476909dd002d5ca2346a3a5f3f57) )
 ROM_END
 
 ROM_START(electron64)
-	ROM_REGION( 0x4000, "mos", 0 )
-	ROM_LOAD( "os_300.rom", 0x0000, 0x4000, CRC(f80a0cea) SHA1(165e42ff4164a842e56f08ebd420d5027af99fdd) )
-	ROM_REGION( 0x4000, "basic", 0 )
+	ROM_REGION( 0x8000, "mos", 0 )
 	ROM_LOAD( "basic.rom", 0x0000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281) )
+	ROM_LOAD( "os_300.rom", 0x4000, 0x4000, CRC(f80a0cea) SHA1(165e42ff4164a842e56f08ebd420d5027af99fdd) )
 ROM_END
 
 ROM_START(electronsp)
-	ROM_REGION( 0x4000, "mos", 0 )
-	ROM_LOAD( "os_310.rom", 0x0000, 0x4000, CRC(8b7a9003) SHA1(6d4e2f8ddc1d829b14206d2747749c4c24789568) )
-	ROM_REGION( 0x4000, "basic", 0 )
+	ROM_REGION( 0x8000, "mos", 0 )
 	ROM_LOAD( "basic.rom", 0x0000, 0x4000, CRC(79434781) SHA1(4a7393f3a45ea309f744441c16723e2ef447a281) )
+	ROM_LOAD( "os_310.rom", 0x4000, 0x4000, CRC(8b7a9003) SHA1(6d4e2f8ddc1d829b14206d2747749c4c24789568) )
 	ROM_REGION( 0x8000, "sp64", 0 )
 	ROM_SYSTEM_BIOS( 0, "101_2", "v1.01 (2x16K)" )
 	ROMX_LOAD( "sp64_101_1.rom", 0x0000, 0x4000, CRC(07e2c5d6) SHA1(837e3382c376e3cc1ae42f1ca51158657ef2fd73), ROM_BIOS(0) )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/elekscmp.cpp mame-0.224+dfsg.1/src/mame/drivers/elekscmp.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/elekscmp.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/elekscmp.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -227,5 +227,5 @@
 
 /* Driver */
 
-/*    YEAR  NAME      PARENT  COMPAT  MACHINE   INPUT     CLASS           INIT        COMPANY                FULLNAME         FLAGS */
-COMP( 1977, elekscmp, 0,      0,      elekscmp, elekscmp, elekscmp_state, empty_init, "Elektor Electronics", "Elektor SC/MP", MACHINE_SUPPORTS_SAVE )
+/*    YEAR  NAME      PARENT  COMPAT  MACHINE   INPUT     CLASS           INIT        COMPANY    FULLNAME         FLAGS */
+COMP( 1977, elekscmp, 0,      0,      elekscmp, elekscmp, elekscmp_state, empty_init, "Elektor", "Elektor SC/MP", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/emu3.cpp mame-0.224+dfsg.1/src/mame/drivers/emu3.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/emu3.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/emu3.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -22,15 +22,17 @@
 	}
 
 	void emu3(machine_config &config);
+	void emax2(machine_config &config);
 
 private:
-	void mem_map(address_map &map);
+	void emu3_map(address_map &map);
+	void emax2_map(address_map &map);
 
 	required_device<cpu_device> m_maincpu;
 };
 
 
-void emu3_state::mem_map(address_map &map)
+void emu3_state::emu3_map(address_map &map)
 {
 	map(0x000000, 0x007fff).rom().region("bootprom", 0);
 	map(0x008000, 0x027fff).ram();
@@ -41,14 +43,22 @@
 	map(0x400000, 0xbfffff).ram();
 }
 
+void emu3_state::emax2_map(address_map &map)
+{
+	map(0x000000, 0x003fff).rom().region("bootprom", 0);
+}
+
 
 static INPUT_PORTS_START(emu3)
 INPUT_PORTS_END
 
+static INPUT_PORTS_START(emax2)
+INPUT_PORTS_END
+
 void emu3_state::emu3(machine_config &config)
 {
 	NS32016(config, m_maincpu, 20_MHz_XTAL / 2); // 32016-10 CPU + 32001-10 TCU
-	m_maincpu->set_addrmap(AS_PROGRAM, &emu3_state::mem_map);
+	m_maincpu->set_addrmap(AS_PROGRAM, &emu3_state::emu3_map);
 
 	//NS32081(config, "fpu", 20_MHz_XTAL / 2);
 
@@ -65,6 +75,14 @@
 	SCC85230(config, "uart", 16_MHz_XTAL / 4);
 }
 
+void emu3_state::emax2(machine_config &config)
+{
+	NS32016(config, m_maincpu, 20_MHz_XTAL / 2); // NS32CG16V-10 (EMAX I uses a NS32008D-8)
+	m_maincpu->set_addrmap(AS_PROGRAM, &emu3_state::emax2_map);
+
+	// TODO: add NMC93C06N EEPROM & other unknown peripherals
+}
+
 ROM_START(emu3)
 	ROM_REGION16_LE(0x8000, "bootprom", 0)
 	ROM_LOAD16_BYTE("e3-lsboot_ip381a_emu_systems_4088.ic3", 0x0000, 0x4000, CRC(34e5283f) SHA1(902c2a9a2b37b34331fb57d45b88ffabc1f12a53)) // 27128B
@@ -74,4 +92,11 @@
 	ROM_LOAD("im368.ic31", 0x000, 0xc00, NO_DUMP)
 ROM_END
 
+ROM_START(emax2)
+	ROM_REGION16_LE(0x4000, "bootprom", 0)
+	ROM_LOAD16_BYTE("ip43aemu_3891.ic20", 0x0000, 0x2000, CRC(51fdccb8) SHA1(0cab6540ed5d03ba202569b8730e0ec6dce1a477)) // Am27C64-250DC
+	ROM_LOAD16_BYTE("ip43bemu_4291.ic19", 0x0001, 0x2000, CRC(810160b3) SHA1(6f490f9014bc221e047ccd77428b002d0a3c3168)) // Am27C64-250DC
+ROM_END
+
 SYST(1987, emu3, 0, 0, emu3, emu3, emu3_state, empty_init, "E-mu Systems", "Emulator Three Digital Sound Production System", MACHINE_IS_SKELETON)
+SYST(1989, emax2, 0, 0, emax2, emax2, emu3_state, empty_init, "E-mu Systems", "EMAX II 16-Bit Digital Sound System", MACHINE_IS_SKELETON)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/emu68k.cpp mame-0.224+dfsg.1/src/mame/drivers/emu68k.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/emu68k.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/emu68k.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,243 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/***********************************************************************************************************************************
+
+    Skeleton driver for E-mu Proteus and other MC68000-based synthesizer modules.
+
+***********************************************************************************************************************************/
+
+#include "emu.h"
+#include "cpu/m68000/m68000.h"
+#include "machine/mc68901.h"
+#include "video/hd44780.h"
+#include "emupal.h"
+#include "screen.h"
+
+class emu68k_state : public driver_device
+{
+public:
+	emu68k_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_mfp(*this, "mfp")
+	{
+	}
+
+	void proteus1(machine_config &config);
+	void vintkeys(machine_config &config);
+	void phatt(machine_config &config);
+	void proteusxr(machine_config &config);
+
+protected:
+	virtual void machine_start() override;
+
+private:
+	void add_lcd(machine_config &config);
+
+	HD44780_PIXEL_UPDATE(lcd_pixel_update);
+	void palette_init(palette_device &palette);
+
+	void proteus1_map(address_map &map);
+	void proteusxr_map(address_map &map);
+	void vintkeys_map(address_map &map);
+	void phatt_map(address_map &map);
+	void fc7_map(address_map &map);
+
+	required_device<m68000_base_device> m_maincpu;
+	required_device<mc68901_device> m_mfp;
+};
+
+void emu68k_state::machine_start()
+{
+}
+
+HD44780_PIXEL_UPDATE(emu68k_state::lcd_pixel_update)
+{
+	if (x < 5 && y < 8 && line < 2 && pos < 16)
+		bitmap.pix16(line * 8 + y, pos * 6 + x) = state;
+}
+
+
+void emu68k_state::proteus1_map(address_map &map)
+{
+	map(0x000000, 0x01ffff).rom().region("program", 0);
+	map(0x600080, 0x600083).rw("lcdc", FUNC(hd44780_device::read), FUNC(hd44780_device::write)).umask16(0x00ff);
+	map(0x600100, 0x60012f).rw(m_mfp, FUNC(mc68901_device::read), FUNC(mc68901_device::write)).umask16(0x00ff);
+	map(0x800000, 0x8003ff).writeonly(); // ???
+	map(0xffc000, 0xffffff).ram();
+}
+
+void emu68k_state::proteusxr_map(address_map &map)
+{
+	map(0x000000, 0x01ffff).rom().region("program", 0);
+	map(0x400000, 0x400001).nopw(); // ???
+	map(0x700000, 0x700003).rw("lcdc", FUNC(hd44780_device::read), FUNC(hd44780_device::write)).umask16(0x00ff);
+	map(0x800000, 0x8003ff).writeonly(); // ???
+	map(0x900000, 0x90002f).rw(m_mfp, FUNC(mc68901_device::read), FUNC(mc68901_device::write)).umask16(0x00ff);
+	map(0xa00000, 0xa00001).nopr(); // watchdog?
+	map(0xb00000, 0xb00001).nopw(); // ???
+	map(0xffc000, 0xffffff).ram();
+}
+
+void emu68k_state::vintkeys_map(address_map &map)
+{
+	map(0x000000, 0x03ffff).rom().region("program", 0);
+	map(0x600080, 0x600083).rw("lcdc", FUNC(hd44780_device::read), FUNC(hd44780_device::write)).umask16(0x00ff);
+	map(0x600100, 0x60012f).rw(m_mfp, FUNC(mc68901_device::read), FUNC(mc68901_device::write)).umask16(0x00ff);
+	map(0x800000, 0x8003ff).writeonly(); // ???
+	map(0xffc000, 0xffffff).ram();
+}
+
+void emu68k_state::phatt_map(address_map &map)
+{
+	map(0x000000, 0x07ffff).rom().region("program", 0);
+	map(0x600080, 0x600083).rw("lcdc", FUNC(hd44780_device::read), FUNC(hd44780_device::write)).umask16(0x00ff);
+	map(0x600100, 0x60012f).rw(m_mfp, FUNC(mc68901_device::read), FUNC(mc68901_device::write)).umask16(0x00ff);
+	map(0x800000, 0x8003ff).writeonly(); // ???
+	map(0xffc000, 0xffffff).ram();
+}
+
+void emu68k_state::fc7_map(address_map &map)
+{
+	map(0xfffff3, 0xfffff3).r(m_mfp, FUNC(mc68901_device::get_vector));
+}
+
+
+static INPUT_PORTS_START(proteus1)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START(procuss)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START(vintkeys)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START(orbit9090)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START(phatt)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START(carnaval)
+INPUT_PORTS_END
+
+void emu68k_state::palette_init(palette_device &palette)
+{
+	palette.set_pen_color(0, rgb_t(131, 136, 139));
+	palette.set_pen_color(1, rgb_t( 92,  83,  88));
+}
+
+void emu68k_state::add_lcd(machine_config &config)
+{
+	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_LCD));
+	screen.set_refresh_hz(60);
+	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
+	screen.set_screen_update("lcdc", FUNC(hd44780_device::screen_update));
+	screen.set_size(6*16, 8*2);
+	screen.set_visarea_full();
+	screen.set_palette("palette");
+
+	PALETTE(config, "palette", FUNC(emu68k_state::palette_init), 2);
+
+	hd44780_device &lcdc(HD44780(config, "lcdc", 0));
+	lcdc.set_lcd_size(2, 16);
+	lcdc.set_pixel_update_cb(FUNC(emu68k_state::lcd_pixel_update));
+}
+
+void emu68k_state::proteus1(machine_config &config)
+{
+	M68000(config, m_maincpu, 10'000'000);
+	m_maincpu->set_addrmap(AS_PROGRAM, &emu68k_state::proteus1_map);
+	m_maincpu->set_addrmap(m68000_base_device::AS_CPU_SPACE, &emu68k_state::fc7_map);
+
+	MC68901(config, m_mfp, 10'000'000); // FIXME: not the right type at all
+	m_mfp->set_timer_clock(2'500'000);
+	m_mfp->out_irq_cb().set_inputline(m_maincpu, M68K_IRQ_1); // TODO: verify level
+
+	add_lcd(config);
+}
+
+void emu68k_state::vintkeys(machine_config &config)
+{
+	proteus1(config);
+	m_maincpu->set_addrmap(AS_PROGRAM, &emu68k_state::vintkeys_map);
+}
+
+void emu68k_state::phatt(machine_config &config)
+{
+	proteus1(config);
+	m_maincpu->set_addrmap(AS_PROGRAM, &emu68k_state::phatt_map);
+}
+
+void emu68k_state::proteusxr(machine_config &config)
+{
+	M68000(config, m_maincpu, 40_MHz_XTAL / 4); // MC68000P10
+	m_maincpu->set_addrmap(AS_PROGRAM, &emu68k_state::proteusxr_map);
+	m_maincpu->set_addrmap(m68000_base_device::AS_CPU_SPACE, &emu68k_state::fc7_map);
+
+	// TODO: NVRAM = 2x CXK5864BP-12L + DS1210 + battery?
+
+	MC68901(config, m_mfp, 40_MHz_XTAL / 4); // MC68901P
+	m_mfp->set_timer_clock(40_MHz_XTAL / 16); // TODO: determine divider
+	m_mfp->out_irq_cb().set_inputline(m_maincpu, M68K_IRQ_1); // TODO: verify level
+
+	add_lcd(config);
+}
+
+// TODO: all of these have sample ROMs as well (none currently dumped)
+
+ROM_START(proteus1)
+	ROM_REGION16_BE(0x20000, "program", 0)
+	ROM_LOAD16_BYTE("e-mu proteus 1 msb 2.05.bin", 0x00000, 0x10000, CRC(6a84ac60) SHA1(0b0b3689678522c26087919a2387ed184391d3f4)) // 27C512
+	ROM_LOAD16_BYTE("e-mu proteus 1 lsb 2.05.bin", 0x00001, 0x10000, CRC(3ae786b4) SHA1(b9ad95a5cab86f2d316af34e6cb1b2873c58a9b5)) // 27C512
+ROM_END
+
+ROM_START(proteusxr)
+	ROM_REGION16_BE(0x20000, "program", 0)
+	ROM_LOAD16_BYTE("ip441c_emu__5089.ic38", 0x00000, 0x10000, CRC(01f11633) SHA1(a0612007b22c8e06c803ee5a5bad98e3f2bc4421)) // NMC27C512AN
+	ROM_LOAD16_BYTE("ip442c_emu__5089.ic37", 0x00001, 0x10000, CRC(e8154a65) SHA1(1ec834712dc9ea4f4f01090b2fd5e558c1f08208)) // NMC27C512AN
+ROM_END
+
+ROM_START(procuss)
+	ROM_REGION16_BE(0x20000, "program", 0) // v1.01
+	ROM_LOAD16_BYTE("ip516aemu9115.bin", 0x00000, 0x10000, CRC(8c0be608) SHA1(54d5629e4adebd72d5d5924941be3e6319d20427))
+	ROM_LOAD16_BYTE("ip517aemu9115.bin", 0x00001, 0x10000, CRC(cb2e454b) SHA1(b142285b998829ec8b3c6ce98eb94d9d4964aff6))
+ROM_END
+
+ROM_START(vintkeys)
+	ROM_REGION16_BE(0x40000, "program", 0) // v1.03
+	ROM_LOAD16_BYTE("vintage_keys_msb.bin", 0x00000, 0x20000, CRC(8ac3123f) SHA1(29180ea26c3de326af0f789a2d7a85face528d1a))
+	ROM_LOAD16_BYTE("vintage_keys_lsb.bin", 0x00001, 0x20000, CRC(032e4064) SHA1(f59841eda06e2f348f50887d5bf10aef3a027346))
+ROM_END
+
+ROM_START(orbit9090)
+	// These may or may not need to be split into separate sets
+	ROM_REGION16_BE(0x80000, "program", 0)
+	ROM_SYSTEM_BIOS(0, "v2", "v2.00") // Original chips are STMicro M27C2001-12F1
+	ROMX_LOAD("orbit-2.00-msb.bin", 0x00000, 0x40000, CRC(6bda893e) SHA1(0ff01a46ba49fd49b8d85edcc9ac141009f73ebe), ROM_BIOS(0) | ROM_SKIP(1))
+	ROMX_LOAD("orbit-2.00-lsb.bin", 0x00001, 0x40000, CRC(95ef87f6) SHA1(c0dde419e9b93aa9f4d5b48c9b9bd039a33d2413), ROM_BIOS(0) | ROM_SKIP(1))
+	ROM_SYSTEM_BIOS(1, "v1", "v1.00") // Original chips are TMS27C010A-15; "©EMU'96"
+	ROMX_LOAD("mip840a__1496.bin", 0x00000, 0x20000, CRC(f60cde2a) SHA1(6762c1e0aa5044e504799041f960d037a600cb62), ROM_BIOS(1) | ROM_SKIP(1))
+	ROMX_LOAD("lip839a__1496.bin", 0x00001, 0x20000, CRC(5f16e6db) SHA1(e820bf6ce61256f191c063d4193ed4602c500065), ROM_BIOS(1) | ROM_SKIP(1))
+ROM_END
+
+ROM_START(phatt)
+	ROM_REGION16_BE(0x80000, "program", 0)
+	ROM_LOAD16_BYTE("e-mu planet phatt msb 1.01.bin", 0x00000, 0x40000, CRC(4db960c2) SHA1(1af53bd85ca7fb06709981ce3915cb46e8785cc2)) // 27C2001
+	ROM_LOAD16_BYTE("e-mu planet phatt lsb 1.01.bin", 0x00001, 0x40000, CRC(0b2deb2b) SHA1(7715ac34f5eb9d27337eb77e62b66da8c3e80950)) // 27C2001
+ROM_END
+
+ROM_START(carnaval)
+	ROM_REGION16_BE(0x80000, "program", 0)
+	// Original chips are STMicro M27C2001-12F1
+	ROM_LOAD16_BYTE("carnaval-1.00-msb.bin", 0x00000, 0x40000, CRC(962b3d2b) SHA1(e4668306e21fef8b0b696f08bed7c6e66941c8b2))
+	ROM_LOAD16_BYTE("carnaval-1.00-lsb.bin", 0x00001, 0x40000, CRC(95506a6f) SHA1(1f6f2cce4fac36f4daa22bded1013f3dd0ca72db))
+ROM_END
+
+SYST(1989, proteus1,  0, 0, proteus1,  proteus1,  emu68k_state, empty_init, "E-mu Systems", "Proteus/1 16-Bit Multi-Timbral Digital Sound Module", MACHINE_IS_SKELETON)
+SYST(1989, proteusxr, 0, 0, proteusxr, proteus1,  emu68k_state, empty_init, "E-mu Systems", "Proteus/1 XR 16-Bit Multi-Timbral Digital Sound Module", MACHINE_IS_SKELETON)
+SYST(1991, procuss,   0, 0, proteusxr, procuss,   emu68k_state, empty_init, "E-mu Systems", "Pro/Cussion Maximum Percussion Module", MACHINE_IS_SKELETON)
+SYST(1993, vintkeys,  0, 0, vintkeys,  vintkeys,  emu68k_state, empty_init, "E-mu Systems", "Vintage Keys Classic Analog Keyboards", MACHINE_IS_SKELETON)
+SYST(1996, orbit9090, 0, 0, phatt,     orbit9090, emu68k_state, empty_init, "E-mu Systems", "Orbit 9090 - The Dance Planet", MACHINE_IS_SKELETON)
+SYST(1997, phatt,     0, 0, phatt,     phatt,     emu68k_state, empty_init, "E-mu Systems", "Planet Phatt - The Swing System", MACHINE_IS_SKELETON)
+SYST(1997, carnaval,  0, 0, phatt,     carnaval,  emu68k_state, empty_init, "E-mu Systems", "Carnaval - Jugando con Fuego", MACHINE_IS_SKELETON)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/epos.cpp mame-0.224+dfsg.1/src/mame/drivers/epos.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/epos.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/epos.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -56,7 +56,7 @@
 	else
 		m_counter = (m_counter - 1) & 0x03;
 
-//  logerror("PC %08x: ctr=%04x\n",m_maincpu->pc(), m_counter);
+	//logerror("PC %08x: ctr=%04x\n",m_maincpu->pc(), m_counter);
 
 	membank("bank1")->set_entry(m_counter);
 
@@ -85,6 +85,7 @@
 	map(0x8000, 0xffff).ram().share("videoram");
 }
 
+
 /*************************************
  *
  *  Main CPU port handlers
@@ -149,6 +150,7 @@
 	m_ay_porta_multiplex = BIT(data, 6);
 }
 
+
 /*************************************
  *
  *  Port definitions
@@ -160,11 +162,9 @@
    the processor if an unexpected value is read. */
 
 static INPUT_PORTS_START( megadon )
+	// There are odd port mappings (old=new)
+	// 02=10, 04=40, 08=02, 10=20, 20=04, 40=08
 	PORT_START("DSW")
-
-// There are odd port mappings (old=new)
-// 02=10, 04=40, 08=02, 10=20, 20=04, 40=08
-
 	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, DEF_STR( 1C_1C ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( 1C_2C ) )
@@ -212,11 +212,9 @@
 
 
 static INPUT_PORTS_START( suprglob )
+	// There are odd port mappings (old=new)
+	// 02=10, 04=40, 08=20, 10=02, 20=04, 40=08
 	PORT_START("DSW")
-
-// There are odd port mappings (old=new)
-// 02=10, 04=40, 08=20, 10=02, 20=04, 40=08
-
 	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, DEF_STR( 1C_1C ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( 1C_2C ) )
@@ -267,11 +265,9 @@
 
 
 static INPUT_PORTS_START( igmo )
+	// There are odd port mappings (old=new)
+	// 02=10, 04=40, 08=20, 10=02, 20=04, 40=08
 	PORT_START("DSW")
-
-// There are odd port mappings (old=new)
-// 02=10, 04=40, 08=20, 10=02, 20=04, 40=08
-
 	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, DEF_STR( 1C_1C ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( 1C_2C ) )
@@ -320,12 +316,11 @@
 
 
 static INPUT_PORTS_START( catapult )
-	PORT_INCLUDE(igmo)
-		PORT_MODIFY("DSW")
-
-// There are odd port mappings (old=new)
-// 02=08, 04=20, 08=40, 10=02, 20=10, 40=04
+	PORT_INCLUDE( igmo )
 
+	// There are odd port mappings (old=new)
+	// 02=08, 04=20, 08=40, 10=02, 20=10, 40=04
+	PORT_MODIFY("DSW")
 	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, DEF_STR( 1C_1C ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( 1C_2C ) )
@@ -351,11 +346,9 @@
 
 
 static INPUT_PORTS_START( eeekk )
+	// There are odd port mappings (old=new)
+	// 02=10, 04=40, 08=02, 10=20, 20=04, 40=08
 	PORT_START("DSW")
-
-// There are odd port mappings (old=new)
-// 02=10, 04=40, 08=02, 10=20, 20=04, 40=08
-
 	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Coinage ) ) PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, DEF_STR( 1C_1C ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( 1C_2C ) )
@@ -456,7 +449,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( beastf )
-	PORT_INCLUDE(dealer)
+	PORT_INCLUDE( dealer )
 
 	PORT_MODIFY("INPUTS")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_4WAY
@@ -477,6 +470,7 @@
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
 INPUT_PORTS_END
 
+
 /*************************************
  *
  *  Machine drivers
@@ -682,17 +676,17 @@
 
 ROM_START( igmo )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "igmo-u10.732",   0x0000, 0x1000, CRC(a9f691a4) SHA1(e3f2dc41bd8760fc52e99b7e9faa12c7cf51ffe0) )
-	ROM_LOAD( "igmo-u9.732",    0x1000, 0x1000, CRC(3c133c97) SHA1(002b5aff6b947b6a9cbabeed5be798c1ddf2bda1) )
-	ROM_LOAD( "igmo-u8.732",    0x2000, 0x1000, CRC(5692f8d8) SHA1(6ab50775dff49330a85fbfb2d4d4c3a2e54df3d1) )
-	ROM_LOAD( "igmo-u7.732",    0x3000, 0x1000, CRC(630ae2ed) SHA1(0c293b6192e703b16ed20c277c706ae90773f477) )
-	ROM_LOAD( "igmo-u6.732",    0x4000, 0x1000, CRC(d3f20e1d) SHA1(c0e0b542ac020adc085ec90c2462c6544098447e) )
-	ROM_LOAD( "igmo-u5.732",    0x5000, 0x1000, CRC(e26bb391) SHA1(ba0e44c02fbb36e18e0d779d46bb992e6aba6cf1) )
-	ROM_LOAD( "igmo-u4.732",    0x6000, 0x1000, CRC(762a4417) SHA1(7fed5221950e3e1ce41c0b4ded44597a242a0177) )
-	ROM_LOAD( "igmo-u11.716",   0x7000, 0x0800, CRC(8c675837) SHA1(2725729693960b53ea01ebffa0a81df2cd425890) )
+	ROM_LOAD( "u10_igmo_i05134.u10", 0x0000, 0x1000, CRC(a9f691a4) SHA1(e3f2dc41bd8760fc52e99b7e9faa12c7cf51ffe0) )
+	ROM_LOAD( "u9_igmo_i05134.u9",   0x1000, 0x1000, CRC(3c133c97) SHA1(002b5aff6b947b6a9cbabeed5be798c1ddf2bda1) )
+	ROM_LOAD( "u8_igmo_i05134.u8",   0x2000, 0x1000, CRC(5692f8d8) SHA1(6ab50775dff49330a85fbfb2d4d4c3a2e54df3d1) )
+	ROM_LOAD( "u7_igmo_i05134.u7",   0x3000, 0x1000, CRC(630ae2ed) SHA1(0c293b6192e703b16ed20c277c706ae90773f477) )
+	ROM_LOAD( "u6_igmo_i05134.u6",   0x4000, 0x1000, CRC(d3f20e1d) SHA1(c0e0b542ac020adc085ec90c2462c6544098447e) )
+	ROM_LOAD( "u5_igmo_i05134.u5",   0x5000, 0x1000, CRC(e26bb391) SHA1(ba0e44c02fbb36e18e0d779d46bb992e6aba6cf1) )
+	ROM_LOAD( "u4_igmo_i05134.u4",   0x6000, 0x1000, CRC(762a4417) SHA1(7fed5221950e3e1ce41c0b4ded44597a242a0177) )
+	ROM_LOAD( "u11_igmo_i05134.u11", 0x7000, 0x0800, CRC(8c675837) SHA1(2725729693960b53ea01ebffa0a81df2cd425890) )
 
 	ROM_REGION( 0x0020, "proms", 0 )
-	ROM_LOAD( "82s123.u66",     0x0000, 0x0020, NO_DUMP )   /* missing */
+	ROM_LOAD( "82s123.u66",          0x0000, 0x0020, CRC(1ba03ffe) SHA1(f5692c06ae6d20c010430c8d08f5c60e78d36dc9) )
 ROM_END
 
 
@@ -708,7 +702,7 @@
 	ROM_LOAD( "u11_e12063.u11", 0x7000, 0x0800, CRC(417faff0) SHA1(7965155ee32694ea9a10245db73d8beef229408c) )
 
 	ROM_REGION( 0x0020, "proms", 0 )
-	ROM_LOAD( "74s288.u66", 0x0000, 0x0020, CRC(f2078c38) SHA1(7bfd49932a6fd8840514b7af93a64cedb248122d) )
+	ROM_LOAD( "74s288.u66",     0x0000, 0x0020, CRC(f2078c38) SHA1(7bfd49932a6fd8840514b7af93a64cedb248122d) )
 ROM_END
 
 
@@ -858,7 +852,7 @@
 GAME( 1983, theglob,  suprglob, epos,   suprglob, epos_state, empty_init, ROT270, "Epos Corporation", "The Glob",           MACHINE_SUPPORTS_SAVE )
 GAME( 1983, theglob2, suprglob, epos,   suprglob, epos_state, empty_init, ROT270, "Epos Corporation", "The Glob (earlier)", MACHINE_SUPPORTS_SAVE )
 GAME( 1983, theglob3, suprglob, epos,   suprglob, epos_state, empty_init, ROT270, "Epos Corporation", "The Glob (set 3)",   MACHINE_SUPPORTS_SAVE )
-GAME( 1984, igmo,     0,        epos,   igmo,     epos_state, empty_init, ROT270, "Epos Corporation", "IGMO",               MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, igmo,     0,        epos,   igmo,     epos_state, empty_init, ROT270, "Epos Corporation", "IGMO",               MACHINE_SUPPORTS_SAVE )
 GAME( 1983, eeekk,    0,        epos,   eeekk,    epos_state, empty_init, ROT270, "Epos Corporation", "Eeekk!",             MACHINE_SUPPORTS_SAVE )
 
 /* EPOS TRISTAR 9000 PCB based */
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/eprom.cpp mame-0.224+dfsg.1/src/mame/drivers/eprom.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/eprom.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/eprom.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -44,11 +44,8 @@
 void eprom_state::video_int_ack_w(uint16_t data)
 {
 	m_maincpu->set_input_line(M68K_IRQ_4, CLEAR_LINE);
-}
-
-void eprom_state::video_int_ack_extra_w(uint16_t data)
-{
-	m_extra->set_input_line(M68K_IRQ_4, CLEAR_LINE);
+	if (m_extra.found())
+		m_extra->set_input_line(M68K_IRQ_4, CLEAR_LINE);
 }
 
 void eprom_state::machine_start()
@@ -198,7 +195,7 @@
 	map(0x260010, 0x26001f).portr("260010");
 	map(0x260020, 0x260027).mirror(0x8).r(FUNC(eprom_state::adc_r)).umask16(0x00ff);
 	map(0x260031, 0x260031).r(m_jsa, FUNC(atari_jsa_base_device::main_response_r));
-	map(0x360000, 0x360001).w(FUNC(eprom_state::video_int_ack_extra_w));
+	map(0x360000, 0x360001).w(FUNC(eprom_state::video_int_ack_w));
 	map(0x360011, 0x360011).w(FUNC(eprom_state::eprom_latch_w));
 	map(0x360020, 0x360021).w(m_jsa, FUNC(atari_jsa_base_device::sound_reset_w));
 	map(0x360031, 0x360031).w(m_jsa, FUNC(atari_jsa_base_device::main_command_w));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/equites.cpp mame-0.224+dfsg.1/src/mame/drivers/equites.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/equites.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/equites.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -415,7 +415,7 @@
 void gekisou_state::gekisou_unknown_bit_w(offs_t offset, uint16_t data)
 {
 	// data bit is A17 (offset)
-	m_gekisou_unknown_bit = (offset == 0) ? 0 : 1;;
+	m_gekisou_unknown_bit = (offset == 0) ? 0 : 1;
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/esqmr.cpp mame-0.224+dfsg.1/src/mame/drivers/esqmr.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/esqmr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/esqmr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -334,8 +334,12 @@
 ROM_START( mrrack )
 	// 68340 main MCU
 	ROM_REGION(0x100000, "maincpu", 0)
-	ROM_LOAD16_BYTE( "mr_r_ec51_lo_1.50.u36", 0x000001, 0x080000, CRC(b29988a1) SHA1(986c2def11de27fa2b9be55ac32f7fec0c414bca) )
-	ROM_LOAD16_BYTE( "mr_r_9dac_up_1.50.u35", 0x000000, 0x080000, CRC(71511692) SHA1(54744f16f1db1ac5abb2f70b6e04aebf1e0e029d) )
+	ROM_SYSTEM_BIOS(0, "v153", "Version 1.53")
+	ROMX_LOAD( "ensoniq_mr_rack_1.53_lo_46a3.u36", 0x000001, 0x080000, CRC(0dba5bef) SHA1(6f64ec7547ea1fc72b42e2679379cd63cbbfc25e), ROM_BIOS(0) | ROM_SKIP(1) )
+	ROMX_LOAD( "ensoniq_mr_rack_1.53_hi_f320.u35", 0x000000, 0x080000, CRC(cb045660) SHA1(53d0f27e9f897c979c26a365bdfaf8911fb6f4d4), ROM_BIOS(0) | ROM_SKIP(1) )
+	ROM_SYSTEM_BIOS(1, "v150", "Version 1.50")
+	ROMX_LOAD( "mr_r_ec51_lo_1.50.u36", 0x000001, 0x080000, CRC(b29988a1) SHA1(986c2def11de27fa2b9be55ac32f7fec0c414bca), ROM_BIOS(1) | ROM_SKIP(1) )
+	ROMX_LOAD( "mr_r_9dac_up_1.50.u35", 0x000000, 0x080000, CRC(71511692) SHA1(54744f16f1db1ac5abb2f70b6e04aebf1e0e029d), ROM_BIOS(1) | ROM_SKIP(1) )
 
 	// 68705 display/front panel MCU
 	ROM_REGION(0x2000, "mcu", 0)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/exidy.cpp mame-0.224+dfsg.1/src/mame/drivers/exidy.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/exidy.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/exidy.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -999,38 +999,42 @@
 
 ROM_START( targ )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "hrl10a-1", 0x1800, 0x0800, CRC(969744e1) SHA1(e123bdb02b3b5f6a59c1e7c9ef557fe6bb19c62c) )
-	ROM_LOAD( "hrl9a-1",  0x2000, 0x0800, CRC(a177a72d) SHA1(0e705e3e32021e55af4414fa0e2ccbc4980ee848) )
-	ROM_LOAD( "hrl8a-1",  0x2800, 0x0800, CRC(6e6928a5) SHA1(10c725b27225ac5aad8639b081df68dd61522cf2) )
-	ROM_LOAD( "hrl7a-1",  0x3000, 0x0800, CRC(e2f37f93) SHA1(b66743c296d3d4caba3bcbe6aa68cd6edd414816) )
-	ROM_LOAD( "hrl6a-1",  0x3800, 0x0800, CRC(a60a1bfc) SHA1(17c0e67e1a0b263b57d70a148cc5d5099fecbb40) )
+	ROM_LOAD( "hrl_10a1.10a", 0x1800, 0x0800, CRC(969744e1) SHA1(e123bdb02b3b5f6a59c1e7c9ef557fe6bb19c62c) )
+	ROM_LOAD( "hrl_9a1.9a",   0x2000, 0x0800, CRC(a177a72d) SHA1(0e705e3e32021e55af4414fa0e2ccbc4980ee848) )
+	ROM_LOAD( "hrl_8a1.8a",   0x2800, 0x0800, CRC(6e6928a5) SHA1(10c725b27225ac5aad8639b081df68dd61522cf2) )
+	ROM_LOAD( "hrl_7a4.7a",   0x3000, 0x0800, CRC(e2f37f93) SHA1(b66743c296d3d4caba3bcbe6aa68cd6edd414816) )
+	ROM_LOAD( "hrl_6a3.6a",   0x3800, 0x0800, CRC(a60a1bfc) SHA1(17c0e67e1a0b263b57d70a148cc5d5099fecbb40) )
 
 	ROM_REGION( 0x0400, "gfx1", 0 )
-	ROM_LOAD( "hrl11d-1", 0x0000, 0x0400, CRC(9f03513e) SHA1(aa4763e49df65e5686a96431543580b8d8285893) )
+	ROM_LOAD( "hrl_11d-1.11d", 0x0000, 0x0400, CRC(9f03513e) SHA1(aa4763e49df65e5686a96431543580b8d8285893) )
 
 	ROM_REGION( 0x0140, "proms", 0 )
-	ROM_LOAD( "hrl5c-1",  0x0000, 0x0100, CRC(a24290d0) SHA1(5f2888d168de874021b51c5d19a62fb8165e4454) )    /* address decoder */
-	ROM_LOAD( "stl6d-1",  0x0100, 0x0020, CRC(e26f9053) SHA1(eec35b6aa2c2d305418306bf4a1754a0583f109f) )    /* unknown */
-	ROM_LOAD( "hrl14h-1", 0x0120, 0x0020, CRC(f76b4fcf) SHA1(197e0cc508ffeb5cefa4046bdfb158939d598225) )    /* unknown */
+	ROM_LOAD( "hrl_5c-1.5c",   0x0000, 0x0100, CRC(a24290d0) SHA1(5f2888d168de874021b51c5d19a62fb8165e4454) ) // IM5623CJE (N82S129 compatible) BPROM - address decoder
+	ROM_LOAD( "stl_6d-1.6d",   0x0100, 0x0020, CRC(e26f9053) SHA1(eec35b6aa2c2d305418306bf4a1754a0583f109f) ) // IM5610CPE (N82S123 compatible) BPROM - video RAM control
+	ROM_LOAD( "hrl_14h-1.14h", 0x0120, 0x0020, CRC(f76b4fcf) SHA1(197e0cc508ffeb5cefa4046bdfb158939d598225) ) // IM5610CPE (N82S123 compatible) BPROM - sprite control
 
 	ROM_REGION( 0x0020, "targ", 0 )
-	ROM_LOAD( "hra2b-1",  0x0000, 0x0020, CRC(38e8024b) SHA1(adf1c1770695f7614c95eceb803f662c5b096a76) )    /* unknown */
+	ROM_LOAD( "hra2b-1",  0x0000, 0x0020, CRC(38e8024b) SHA1(adf1c1770695f7614c95eceb803f662c5b096a76) )    // sound "program" (tone frequencies)
 ROM_END
 
-
 ROM_START( targc )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "ctl.10a",  0x1800, 0x0800, CRC(058b3983) SHA1(8079667613c9273e95131c3c68cd92ce34c18148) )
-	ROM_LOAD( "ctl.9a1",  0x2000, 0x0800, CRC(3ac44b6b) SHA1(8261ee7ee1c3cb05b2549464086bf6df09685743) )
-	ROM_LOAD( "ctl.8a1",  0x2800, 0x0800, CRC(5c470021) SHA1(3638fc6827640857848cd649f10c1493025014de) )
-	ROM_LOAD( "ctl.7a1",  0x3000, 0x0800, CRC(c774fd9b) SHA1(46272a64ad5cda0ff5ef3e9eeedefc555100a71a) )
-	ROM_LOAD( "ctl.6a1",  0x3800, 0x0800, CRC(3d020439) SHA1(ebde4c851c9ecc310f110c7643a80275d97dc02c) )
+	ROM_LOAD( "358_ctl_10a-1_tsv_11-10-80.10a", 0x1800, 0x0800, CRC(058b3983) SHA1(8079667613c9273e95131c3c68cd92ce34c18148) ) // hand written label:  358   CTL   10A-1   TSV   11/10/80
+	ROM_LOAD( "358_ctl_9a-1_tsv_11-10-80.9a",   0x2000, 0x0800, CRC(3ac44b6b) SHA1(8261ee7ee1c3cb05b2549464086bf6df09685743) ) // hand written label:  358   CTL   9A-1   TSV   11/10/80
+	ROM_LOAD( "358_ctl_8a-1_tsv_11-10-80.8a",   0x2800, 0x0800, CRC(5c470021) SHA1(3638fc6827640857848cd649f10c1493025014de) ) // hand written label:  358   CTL   8A-1   TSV   11/10/80
+	ROM_LOAD( "358_ctl_7a-1_tsv_11-10-80.7a",   0x3000, 0x0800, CRC(c774fd9b) SHA1(46272a64ad5cda0ff5ef3e9eeedefc555100a71a) ) // hand written label:  358   CTL   7A-1   TSV   11/10/80
+	ROM_LOAD( "358_ctl_6a-1_tsv_11-10-80.6a",   0x3800, 0x0800, CRC(3d020439) SHA1(ebde4c851c9ecc310f110c7643a80275d97dc02c) ) // hand written label:  358   CTL   6A-1   TSV   11/10/80
 
 	ROM_REGION( 0x0400, "gfx1", 0 )
-	ROM_LOAD( "hrl11d-1", 0x0000, 0x0400, CRC(9f03513e) SHA1(aa4763e49df65e5686a96431543580b8d8285893) )
+	ROM_LOAD( "hrl_11d-1.11d", 0x0000, 0x0400, CRC(9f03513e) SHA1(aa4763e49df65e5686a96431543580b8d8285893) )
+
+	ROM_REGION( 0x0140, "proms", 0 )
+	ROM_LOAD( "hrl_5c-1.5c",   0x0000, 0x0100, CRC(a24290d0) SHA1(5f2888d168de874021b51c5d19a62fb8165e4454) ) // IM5623CJE (N82S129 compatible) BPROM - address decoder
+	ROM_LOAD( "stl_6d-1.6d",   0x0100, 0x0020, CRC(e26f9053) SHA1(eec35b6aa2c2d305418306bf4a1754a0583f109f) ) // IM5610CPE (N82S123 compatible) BPROM - video RAM control
+	ROM_LOAD( "hrl_14h-1.14h", 0x0120, 0x0020, CRC(f76b4fcf) SHA1(197e0cc508ffeb5cefa4046bdfb158939d598225) ) // IM5610CPE (N82S123 compatible) BPROM - sprite control
 
 	ROM_REGION( 0x0020, "targ", 0 )
-	ROM_LOAD( "hra2b-1",  0x0000, 0x0020, CRC(38e8024b) SHA1(adf1c1770695f7614c95eceb803f662c5b096a76) )    /* unknown */
+	ROM_LOAD( "hra2b-1",  0x0000, 0x0020, CRC(38e8024b) SHA1(adf1c1770695f7614c95eceb803f662c5b096a76) )    // sound "program" (tone frequencies)
 ROM_END
 
 
@@ -1053,7 +1057,6 @@
 	ROM_LOAD( "hrl14h-1", 0x0120, 0x0020, BAD_DUMP CRC(f76b4fcf) SHA1(197e0cc508ffeb5cefa4046bdfb158939d598225) ) // 6331 according to the Spectar manual
 ROM_END
 
-
 ROM_START( spectar1 )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "spl12a1",  0x0800, 0x0800, CRC(7002efb4) SHA1(fbb19ccd2aee49b78606eadcbef94e842e1be905) )
@@ -1184,29 +1187,28 @@
 ROM_END
 
 
-
 ROM_START( mtrap )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "mtl11a.bin",  0xa000, 0x1000, CRC(bd6c3eb5) SHA1(248956374222a09caa5b8c8fa842e9286d8e1c5d) )
-	ROM_LOAD( "mtl10a.bin",  0xb000, 0x1000, CRC(75b0593e) SHA1(48ce5382905f7c52929a95267d65fd0d3f0dcc92) )
-	ROM_LOAD( "mtl9a.bin",   0xc000, 0x1000, CRC(28dd20ff) SHA1(8ac44ec27ac25209c8b49da4c6b423917ed8907e) )
-	ROM_LOAD( "mtl8a.bin",   0xd000, 0x1000, CRC(cc09f7a4) SHA1(e806dc0e10b909b61e347f3e28eb024f3b3a9702) )
-	ROM_LOAD( "mtl7a.bin",   0xe000, 0x1000, CRC(caafbb6d) SHA1(96823ac4e49f192121c53f70382a20f7c52e290b) )
-	ROM_LOAD( "mtl6a.bin",   0xf000, 0x1000, CRC(d85e52ca) SHA1(51296247e365a468fe9458b722bbdbbeeed59fa0) )
+	ROM_LOAD( "mtl-5_11a.11a", 0xa000, 0x1000, CRC(bd6c3eb5) SHA1(248956374222a09caa5b8c8fa842e9286d8e1c5d) )
+	ROM_LOAD( "mtl-5_10a.10a", 0xb000, 0x1000, CRC(75b0593e) SHA1(48ce5382905f7c52929a95267d65fd0d3f0dcc92) )
+	ROM_LOAD( "mtl-5_9a.9a",   0xc000, 0x1000, CRC(28dd20ff) SHA1(8ac44ec27ac25209c8b49da4c6b423917ed8907e) )
+	ROM_LOAD( "mtl-5_8a.8a",   0xd000, 0x1000, CRC(cc09f7a4) SHA1(e806dc0e10b909b61e347f3e28eb024f3b3a9702) )
+	ROM_LOAD( "mtl-5_7a.7a",   0xe000, 0x1000, CRC(caafbb6d) SHA1(96823ac4e49f192121c53f70382a20f7c52e290b) )
+	ROM_LOAD( "mtl-5_6a.6a",   0xf000, 0x1000, CRC(d85e52ca) SHA1(51296247e365a468fe9458b722bbdbbeeed59fa0) )
 
 	ROM_REGION( 0x8000, "soundbd:audiocpu", 0 )
-	ROM_LOAD( "mta5a.bin",   0x6800, 0x0800, CRC(dbe4ec02) SHA1(34e965428dbb4b9c558927bb80d19cb550b53228) )
-	ROM_LOAD( "mta6a.bin",   0x7000, 0x0800, CRC(c00f0c05) SHA1(398b0bc2a7e54b1e2326ed067bf6bb15cc52ed39) )
-	ROM_LOAD( "mta7a.bin",   0x7800, 0x0800, CRC(f3f16ca7) SHA1(3928c5da246c43036a7b4cbb140a1734d5f1fb03) )
+	ROM_LOAD( "mta_5a.5a", 0x6800, 0x0800, CRC(dbe4ec02) SHA1(34e965428dbb4b9c558927bb80d19cb550b53228) )
+	ROM_LOAD( "mta_6a.6a", 0x7000, 0x0800, CRC(c00f0c05) SHA1(398b0bc2a7e54b1e2326ed067bf6bb15cc52ed39) )
+	ROM_LOAD( "mta_7a.7a", 0x7800, 0x0800, CRC(f3f16ca7) SHA1(3928c5da246c43036a7b4cbb140a1734d5f1fb03) )
 
 	ROM_REGION( 0x4000, "soundbd:cvsdcpu", 0 ) /* 16k for digital sound processor */
-	ROM_LOAD( "mta2a.bin",   0x0000, 0x1000, CRC(13db8ed3) SHA1(939352323bdcd7df25db5eb2e30f269bcaebe6af) )
-	ROM_LOAD( "mta3a.bin",   0x1000, 0x1000, CRC(31bdfe5c) SHA1(b10bfe9e56dd617c5b4cd8b5bfec9c7f537b1086) )
-	ROM_LOAD( "mta4a.bin",   0x2000, 0x1000, CRC(1502d0e8) SHA1(8ef51ad4601299016f1821a5c65bec0199dd5474) )
-	ROM_LOAD( "mta1a.bin",   0x3000, 0x1000, CRC(658482a6) SHA1(c0d770fbeaa7cb3e0eef47d8caa0f8a78841692e) )
+	ROM_LOAD( "mta_2a.2a", 0x0000, 0x1000, CRC(13db8ed3) SHA1(939352323bdcd7df25db5eb2e30f269bcaebe6af) )
+	ROM_LOAD( "mta_3a.3a", 0x1000, 0x1000, CRC(31bdfe5c) SHA1(b10bfe9e56dd617c5b4cd8b5bfec9c7f537b1086) )
+	ROM_LOAD( "mta_4a.4a", 0x2000, 0x1000, CRC(1502d0e8) SHA1(8ef51ad4601299016f1821a5c65bec0199dd5474) )
+	ROM_LOAD( "mta_1a.1a", 0x3000, 0x1000, CRC(658482a6) SHA1(c0d770fbeaa7cb3e0eef47d8caa0f8a78841692e) )
 
 	ROM_REGION( 0x0800, "gfx1", 0 )
-	ROM_LOAD( "mtl11d.bin",  0x0000, 0x0800, CRC(c6e4d339) SHA1(b091923e4d52e93d7c567afba217a10b2a3735fc) )
+	ROM_LOAD( "mtl_11d.11d", 0x0000, 0x0800, CRC(c6e4d339) SHA1(b091923e4d52e93d7c567afba217a10b2a3735fc) )
 
 	ROM_REGION( 0x140, "proms", 0 ) // h14 taken from bootleg, very likely same and matches teetert, but marked bad dump until verification - same note applies to mtrap clone sets
 	ROM_LOAD( "74s288.h14", 0x0000, 0x0020, BAD_DUMP CRC(f76b4fcf) SHA1(197e0cc508ffeb5cefa4046bdfb158939d598225) ) // 6331 according to the Mouse Trap manual
@@ -1214,29 +1216,28 @@
 	ROM_LOAD( "74s288.d6",  0x0120, 0x0020, CRC(e26f9053) SHA1(eec35b6aa2c2d305418306bf4a1754a0583f109f) ) // 6331 according to the Mouse Trap manual
 ROM_END
 
-
-ROM_START( mtrap2 )
+ROM_START( mtrap4 )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "mtl-2.11a",   0xa000, 0x1000, CRC(a8cc3a18) SHA1(09fa9eff5ae5cb923d6e9137ba9a4b6944acffb2) )
-	ROM_LOAD( "mtl-2.10a",   0xb000, 0x1000, CRC(e26b074c) SHA1(e8882edc818860d887c08e8083a40c4717412b2f) )
-	ROM_LOAD( "mtl-2.9a",    0xc000, 0x1000, CRC(845394f6) SHA1(a150a6f00465abb787d8d46a2e32d8985364554e) )
-	ROM_LOAD( "mtl-2.8a",    0xd000, 0x1000, CRC(854d2d50) SHA1(4213999acbc03ee8300b2fcf86349cd7450adae5) )
-	ROM_LOAD( "mtl-2.7a",    0xe000, 0x1000, CRC(3d235f95) SHA1(57031d9784c55853dcf6e396ee685d8dd0d3ef87) )
-	ROM_LOAD( "mtl-2.6a",    0xf000, 0x1000, CRC(7ed7632a) SHA1(6800d3c1b901808373d3edd2a3fcf699f93d7daf) )
+	ROM_LOAD( "mtl-4_11a.11a", 0xa000, 0x1000, CRC(2879cb8d) SHA1(738bd3cd968fd733adcfe0fb5efdb2e2fcfb344e) )
+	ROM_LOAD( "mtl-4_10a.10a", 0xb000, 0x1000, CRC(d7378af9) SHA1(44c8ba4c84f51306e5bdd64e6c255d1c1018db72) )
+	ROM_LOAD( "mtl-4_9a.9a",   0xc000, 0x1000, CRC(be667e64) SHA1(c5f686e3c403691f14992354af690dc89e1722f7) )
+	ROM_LOAD( "mtl-4_8a.8a",   0xd000, 0x1000, CRC(de0442f8) SHA1(61774921adf016b3a2ae18baa79af60dca2d9e45) )
+	ROM_LOAD( "mtl-4_7a.7a",   0xe000, 0x1000, CRC(cdf8c6a8) SHA1(932ae9c0ea5700bd79862efa94742136d8e15641) )
+	ROM_LOAD( "mtl-4_6a.6a",   0xf000, 0x1000, CRC(77d3f2e6) SHA1(2c21dd7ee326ccb41d3c64eec90a19198382edea) )
 
 	ROM_REGION( 0x8000, "soundbd:audiocpu", 0 )
-	ROM_LOAD( "mta5a.bin",   0x6800, 0x0800, CRC(dbe4ec02) SHA1(34e965428dbb4b9c558927bb80d19cb550b53228) )
-	ROM_LOAD( "mta6a.bin",   0x7000, 0x0800, CRC(c00f0c05) SHA1(398b0bc2a7e54b1e2326ed067bf6bb15cc52ed39) )
-	ROM_LOAD( "mta7a.bin",   0x7800, 0x0800, CRC(f3f16ca7) SHA1(3928c5da246c43036a7b4cbb140a1734d5f1fb03) )
+	ROM_LOAD( "mta_5a.5a", 0x6800, 0x0800, CRC(dbe4ec02) SHA1(34e965428dbb4b9c558927bb80d19cb550b53228) )
+	ROM_LOAD( "mta_6a.6a", 0x7000, 0x0800, CRC(c00f0c05) SHA1(398b0bc2a7e54b1e2326ed067bf6bb15cc52ed39) )
+	ROM_LOAD( "mta_7a.7a", 0x7800, 0x0800, CRC(f3f16ca7) SHA1(3928c5da246c43036a7b4cbb140a1734d5f1fb03) )
 
 	ROM_REGION( 0x4000, "soundbd:cvsdcpu", 0 ) /* 16k for digital sound processor */
-	ROM_LOAD( "mta2a.bin",   0x0000, 0x1000, CRC(13db8ed3) SHA1(939352323bdcd7df25db5eb2e30f269bcaebe6af) )
-	ROM_LOAD( "mta3a.bin",   0x1000, 0x1000, CRC(31bdfe5c) SHA1(b10bfe9e56dd617c5b4cd8b5bfec9c7f537b1086) )
-	ROM_LOAD( "mta4a.bin",   0x2000, 0x1000, CRC(1502d0e8) SHA1(8ef51ad4601299016f1821a5c65bec0199dd5474) )
-	ROM_LOAD( "mta1a.bin",   0x3000, 0x1000, CRC(658482a6) SHA1(c0d770fbeaa7cb3e0eef47d8caa0f8a78841692e) )
+	ROM_LOAD( "mta_2a.2a", 0x0000, 0x1000, CRC(13db8ed3) SHA1(939352323bdcd7df25db5eb2e30f269bcaebe6af) )
+	ROM_LOAD( "mta_3a.3a", 0x1000, 0x1000, CRC(31bdfe5c) SHA1(b10bfe9e56dd617c5b4cd8b5bfec9c7f537b1086) )
+	ROM_LOAD( "mta_4a.4a", 0x2000, 0x1000, CRC(1502d0e8) SHA1(8ef51ad4601299016f1821a5c65bec0199dd5474) )
+	ROM_LOAD( "mta_1a.1a", 0x3000, 0x1000, CRC(658482a6) SHA1(c0d770fbeaa7cb3e0eef47d8caa0f8a78841692e) )
 
 	ROM_REGION( 0x0800, "gfx1", 0 )
-	ROM_LOAD( "mtl11d.bin",  0x0000, 0x0800, CRC(c6e4d339) SHA1(b091923e4d52e93d7c567afba217a10b2a3735fc) )
+	ROM_LOAD( "mtl_11d.11d", 0x0000, 0x0800, CRC(c6e4d339) SHA1(b091923e4d52e93d7c567afba217a10b2a3735fc) )
 
 	ROM_REGION( 0x140, "proms", 0 )
 	ROM_LOAD( "74s288.h14", 0x0000, 0x0020, BAD_DUMP CRC(f76b4fcf) SHA1(197e0cc508ffeb5cefa4046bdfb158939d598225) ) // 6331 according to the Mouse Trap manual
@@ -1244,29 +1245,28 @@
 	ROM_LOAD( "74s288.d6",  0x0120, 0x0020, CRC(e26f9053) SHA1(eec35b6aa2c2d305418306bf4a1754a0583f109f) ) // 6331 according to the Mouse Trap manual
 ROM_END
 
-
 ROM_START( mtrap3 )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "mtl-3.11a",   0xa000, 0x1000, CRC(4091be6e) SHA1(a4432f4588915276583f4b2e8db527fd24eb4291) )
-	ROM_LOAD( "mtl-3.10a",   0xb000, 0x1000, CRC(38250c2f) SHA1(b70a2a1d423ba90ca873cc43db40422abee07718) )
-	ROM_LOAD( "mtl-3.9a",    0xc000, 0x1000, CRC(2eec988e) SHA1(52167dabd672d16d454df746fb2c83c9e4253624) )
-	ROM_LOAD( "mtl-3.8a",    0xd000, 0x1000, CRC(744b4b1c) SHA1(94955d0703559d668988cb7045f835f955e5dd8a) )
-	ROM_LOAD( "mtl-3.7a",    0xe000, 0x1000, CRC(ea8ec479) SHA1(785557a242d9343c83cdc403b1f726cbea9d230f) )
-	ROM_LOAD( "mtl-3.6a",    0xf000, 0x1000, CRC(d72ba72d) SHA1(4c5b311bc7ecfc6133bc09e586635844e2f1d6a9) )
+	ROM_LOAD( "mtl-3_11a.11a", 0xa000, 0x1000, CRC(4091be6e) SHA1(a4432f4588915276583f4b2e8db527fd24eb4291) )
+	ROM_LOAD( "mtl-3_10a.10a", 0xb000, 0x1000, CRC(38250c2f) SHA1(b70a2a1d423ba90ca873cc43db40422abee07718) )
+	ROM_LOAD( "mtl-3_9a.9a",   0xc000, 0x1000, CRC(2eec988e) SHA1(52167dabd672d16d454df746fb2c83c9e4253624) )
+	ROM_LOAD( "mtl-3_8a.8a",   0xd000, 0x1000, CRC(744b4b1c) SHA1(94955d0703559d668988cb7045f835f955e5dd8a) )
+	ROM_LOAD( "mtl-3_7a.7a",   0xe000, 0x1000, CRC(ea8ec479) SHA1(785557a242d9343c83cdc403b1f726cbea9d230f) )
+	ROM_LOAD( "mtl-3_6a.6a",   0xf000, 0x1000, CRC(d72ba72d) SHA1(4c5b311bc7ecfc6133bc09e586635844e2f1d6a9) )
 
 	ROM_REGION( 0x8000, "soundbd:audiocpu", 0 )
-	ROM_LOAD( "mta5a.bin",   0x6800, 0x0800, CRC(dbe4ec02) SHA1(34e965428dbb4b9c558927bb80d19cb550b53228) )
-	ROM_LOAD( "mta6a.bin",   0x7000, 0x0800, CRC(c00f0c05) SHA1(398b0bc2a7e54b1e2326ed067bf6bb15cc52ed39) )
-	ROM_LOAD( "mta7a.bin",   0x7800, 0x0800, CRC(f3f16ca7) SHA1(3928c5da246c43036a7b4cbb140a1734d5f1fb03) )
+	ROM_LOAD( "mta_5a.5a", 0x6800, 0x0800, CRC(dbe4ec02) SHA1(34e965428dbb4b9c558927bb80d19cb550b53228) )
+	ROM_LOAD( "mta_6a.6a", 0x7000, 0x0800, CRC(c00f0c05) SHA1(398b0bc2a7e54b1e2326ed067bf6bb15cc52ed39) )
+	ROM_LOAD( "mta_7a.7a", 0x7800, 0x0800, CRC(f3f16ca7) SHA1(3928c5da246c43036a7b4cbb140a1734d5f1fb03) )
 
 	ROM_REGION( 0x4000, "soundbd:cvsdcpu", 0 ) /* 16k for digital sound processor */
-	ROM_LOAD( "mta2a.bin",   0x0000, 0x1000, CRC(13db8ed3) SHA1(939352323bdcd7df25db5eb2e30f269bcaebe6af) )
-	ROM_LOAD( "mta3a.bin",   0x1000, 0x1000, CRC(31bdfe5c) SHA1(b10bfe9e56dd617c5b4cd8b5bfec9c7f537b1086) )
-	ROM_LOAD( "mta4a.bin",   0x2000, 0x1000, CRC(1502d0e8) SHA1(8ef51ad4601299016f1821a5c65bec0199dd5474) )
-	ROM_LOAD( "mta1a.bin",   0x3000, 0x1000, CRC(658482a6) SHA1(c0d770fbeaa7cb3e0eef47d8caa0f8a78841692e) )
+	ROM_LOAD( "mta_2a.2a", 0x0000, 0x1000, CRC(13db8ed3) SHA1(939352323bdcd7df25db5eb2e30f269bcaebe6af) )
+	ROM_LOAD( "mta_3a.3a", 0x1000, 0x1000, CRC(31bdfe5c) SHA1(b10bfe9e56dd617c5b4cd8b5bfec9c7f537b1086) )
+	ROM_LOAD( "mta_4a.4a", 0x2000, 0x1000, CRC(1502d0e8) SHA1(8ef51ad4601299016f1821a5c65bec0199dd5474) )
+	ROM_LOAD( "mta_1a.1a", 0x3000, 0x1000, CRC(658482a6) SHA1(c0d770fbeaa7cb3e0eef47d8caa0f8a78841692e) )
 
 	ROM_REGION( 0x0800, "gfx1", 0 )
-	ROM_LOAD( "mtl11d.bin",  0x0000, 0x0800, CRC(c6e4d339) SHA1(b091923e4d52e93d7c567afba217a10b2a3735fc) )
+	ROM_LOAD( "mtl_11d.11d", 0x0000, 0x0800, CRC(c6e4d339) SHA1(b091923e4d52e93d7c567afba217a10b2a3735fc) )
 
 	ROM_REGION( 0x140, "proms", 0 )
 	ROM_LOAD( "74s288.h14", 0x0000, 0x0020, BAD_DUMP CRC(f76b4fcf) SHA1(197e0cc508ffeb5cefa4046bdfb158939d598225) ) // 6331 according to the Mouse Trap manual
@@ -1274,29 +1274,28 @@
 	ROM_LOAD( "74s288.d6",  0x0120, 0x0020, CRC(e26f9053) SHA1(eec35b6aa2c2d305418306bf4a1754a0583f109f) ) // 6331 according to the Mouse Trap manual
 ROM_END
 
-
-ROM_START( mtrap4 )
+ROM_START( mtrap2 )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "mta411a.bin",  0xa000, 0x1000, CRC(2879cb8d) SHA1(738bd3cd968fd733adcfe0fb5efdb2e2fcfb344e) )
-	ROM_LOAD( "mta410a.bin",  0xb000, 0x1000, CRC(d7378af9) SHA1(44c8ba4c84f51306e5bdd64e6c255d1c1018db72) )
-	ROM_LOAD( "mta49.bin",    0xc000, 0x1000, CRC(be667e64) SHA1(c5f686e3c403691f14992354af690dc89e1722f7) )
-	ROM_LOAD( "mta48a.bin",   0xd000, 0x1000, CRC(de0442f8) SHA1(61774921adf016b3a2ae18baa79af60dca2d9e45) )
-	ROM_LOAD( "mta47a.bin",   0xe000, 0x1000, CRC(cdf8c6a8) SHA1(932ae9c0ea5700bd79862efa94742136d8e15641) )
-	ROM_LOAD( "mta46a.bin",   0xf000, 0x1000, CRC(77d3f2e6) SHA1(2c21dd7ee326ccb41d3c64eec90a19198382edea) )
+	ROM_LOAD( "mtl-2_11a.11a", 0xa000, 0x1000, CRC(a8cc3a18) SHA1(09fa9eff5ae5cb923d6e9137ba9a4b6944acffb2) )
+	ROM_LOAD( "mtl-2_10a.10a", 0xb000, 0x1000, CRC(e26b074c) SHA1(e8882edc818860d887c08e8083a40c4717412b2f) )
+	ROM_LOAD( "mtl-2_9a.9a",   0xc000, 0x1000, CRC(845394f6) SHA1(a150a6f00465abb787d8d46a2e32d8985364554e) )
+	ROM_LOAD( "mtl-2_8a.8a",   0xd000, 0x1000, CRC(854d2d50) SHA1(4213999acbc03ee8300b2fcf86349cd7450adae5) )
+	ROM_LOAD( "mtl-2_7a.7a",   0xe000, 0x1000, CRC(3d235f95) SHA1(57031d9784c55853dcf6e396ee685d8dd0d3ef87) )
+	ROM_LOAD( "mtl-2_6a.6a",   0xf000, 0x1000, CRC(7ed7632a) SHA1(6800d3c1b901808373d3edd2a3fcf699f93d7daf) )
 
 	ROM_REGION( 0x8000, "soundbd:audiocpu", 0 )
-	ROM_LOAD( "mta5a.bin",    0x6800, 0x0800, CRC(dbe4ec02) SHA1(34e965428dbb4b9c558927bb80d19cb550b53228) )
-	ROM_LOAD( "mta6a.bin",    0x7000, 0x0800, CRC(c00f0c05) SHA1(398b0bc2a7e54b1e2326ed067bf6bb15cc52ed39) )
-	ROM_LOAD( "mta7a.bin",    0x7800, 0x0800, CRC(f3f16ca7) SHA1(3928c5da246c43036a7b4cbb140a1734d5f1fb03) )
+	ROM_LOAD( "mta_5a.5a", 0x6800, 0x0800, CRC(dbe4ec02) SHA1(34e965428dbb4b9c558927bb80d19cb550b53228) )
+	ROM_LOAD( "mta_6a.6a", 0x7000, 0x0800, CRC(c00f0c05) SHA1(398b0bc2a7e54b1e2326ed067bf6bb15cc52ed39) )
+	ROM_LOAD( "mta_7a.7a", 0x7800, 0x0800, CRC(f3f16ca7) SHA1(3928c5da246c43036a7b4cbb140a1734d5f1fb03) )
 
 	ROM_REGION( 0x4000, "soundbd:cvsdcpu", 0 ) /* 16k for digital sound processor */
-	ROM_LOAD( "mta2a.bin",    0x0000,0x1000,CRC(13db8ed3) SHA1(939352323bdcd7df25db5eb2e30f269bcaebe6af) )
-	ROM_LOAD( "mta3a.bin",    0x1000,0x1000,CRC(31bdfe5c) SHA1(b10bfe9e56dd617c5b4cd8b5bfec9c7f537b1086) )
-	ROM_LOAD( "mta4a.bin",    0x2000,0x1000,CRC(1502d0e8) SHA1(8ef51ad4601299016f1821a5c65bec0199dd5474) )
-	ROM_LOAD( "mta1a.bin",    0x3000,0x1000,CRC(658482a6) SHA1(c0d770fbeaa7cb3e0eef47d8caa0f8a78841692e) )
+	ROM_LOAD( "mta_2a.2a", 0x0000, 0x1000, CRC(13db8ed3) SHA1(939352323bdcd7df25db5eb2e30f269bcaebe6af) )
+	ROM_LOAD( "mta_3a.3a", 0x1000, 0x1000, CRC(31bdfe5c) SHA1(b10bfe9e56dd617c5b4cd8b5bfec9c7f537b1086) )
+	ROM_LOAD( "mta_4a.4a", 0x2000, 0x1000, CRC(1502d0e8) SHA1(8ef51ad4601299016f1821a5c65bec0199dd5474) )
+	ROM_LOAD( "mta_1a.1a", 0x3000, 0x1000, CRC(658482a6) SHA1(c0d770fbeaa7cb3e0eef47d8caa0f8a78841692e) )
 
 	ROM_REGION( 0x0800, "gfx1", 0 )
-	ROM_LOAD( "mtl11d.bin",   0x0000, 0x0800, CRC(c6e4d339) SHA1(b091923e4d52e93d7c567afba217a10b2a3735fc) )
+	ROM_LOAD( "mtl_11d.11d", 0x0000, 0x0800, CRC(c6e4d339) SHA1(b091923e4d52e93d7c567afba217a10b2a3735fc) )
 
 	ROM_REGION( 0x140, "proms", 0 )
 	ROM_LOAD( "74s288.h14", 0x0000, 0x0020, BAD_DUMP CRC(f76b4fcf) SHA1(197e0cc508ffeb5cefa4046bdfb158939d598225) ) // 6331 according to the Mouse Trap manual
@@ -1317,10 +1316,10 @@
 	ROM_LOAD( "2564.j10",     0x6000, 0x2000, CRC(d4160aa8) SHA1(d3bae8fa54e71c397ec60f998a012e088588a2e4) )
 
 	ROM_REGION( 0x4000, "soundbd:cvsdcpu", 0 ) /* 16k for digital sound processor */
-	ROM_LOAD( "mta2a.bin",    0x0000,0x1000,CRC(13db8ed3) SHA1(939352323bdcd7df25db5eb2e30f269bcaebe6af) )
-	ROM_LOAD( "mta3a.bin",    0x1000,0x1000,CRC(31bdfe5c) SHA1(b10bfe9e56dd617c5b4cd8b5bfec9c7f537b1086) )
-	ROM_LOAD( "mta4a.bin",    0x2000,0x1000,CRC(1502d0e8) SHA1(8ef51ad4601299016f1821a5c65bec0199dd5474) )
-	ROM_LOAD( "mta1a.bin",    0x3000,0x1000,CRC(658482a6) SHA1(c0d770fbeaa7cb3e0eef47d8caa0f8a78841692e) )
+	ROM_LOAD( "mta_2a.2a", 0x0000, 0x1000, CRC(13db8ed3) SHA1(939352323bdcd7df25db5eb2e30f269bcaebe6af) )
+	ROM_LOAD( "mta_3a.3a", 0x1000, 0x1000, CRC(31bdfe5c) SHA1(b10bfe9e56dd617c5b4cd8b5bfec9c7f537b1086) )
+	ROM_LOAD( "mta_4a.4a", 0x2000, 0x1000, CRC(1502d0e8) SHA1(8ef51ad4601299016f1821a5c65bec0199dd5474) )
+	ROM_LOAD( "mta_1a.1a", 0x3000, 0x1000, CRC(658482a6) SHA1(c0d770fbeaa7cb3e0eef47d8caa0f8a78841692e) )
 
 	ROM_REGION( 0x0800, "gfx1", 0 )
 	ROM_LOAD( "2516.j6",   0x0000, 0x0800, CRC(c6e4d339) SHA1(b091923e4d52e93d7c567afba217a10b2a3735fc) )
@@ -1337,7 +1336,6 @@
 piggyback PCB is marked: "LC" (it's Italian for "Lato Componenti" = Component Side)
 piggyback PCB fits into main PCB @ 8l
 */
-
 ROM_START( mtrapb2 )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "ms11.2p",   0xa000, 0x1000, CRC(2879cb8d) SHA1(738bd3cd968fd733adcfe0fb5efdb2e2fcfb344e) )
@@ -1348,16 +1346,16 @@
 	ROM_LOAD( "ms6.2f",    0xf000, 0x1000, CRC(77d3f2e6) SHA1(2c21dd7ee326ccb41d3c64eec90a19198382edea) )
 
 	ROM_REGION( 0x8000, "soundbd:audiocpu", 0 )
-	ROM_LOAD( "ms1a.10j",  0x6000, 0x2000, CRC(d4160aa8) SHA1(d3bae8fa54e71c397ec60f998a012e088588a2e4) )
+	ROM_LOAD( "ms1a.10j", 0x6000, 0x2000, CRC(d4160aa8) SHA1(d3bae8fa54e71c397ec60f998a012e088588a2e4) )
 
 	ROM_REGION( 0x4000, "soundbd:cvsdcpu", 0 ) /* 16k for digital sound processor */
-	ROM_LOAD( "ms2a.8d",   0x0000,0x1000,CRC(13db8ed3) SHA1(939352323bdcd7df25db5eb2e30f269bcaebe6af) )
-	ROM_LOAD( "ms3a.8e",   0x1000,0x1000,CRC(31bdfe5c) SHA1(b10bfe9e56dd617c5b4cd8b5bfec9c7f537b1086) )
-	ROM_LOAD( "ms4a.8f",   0x2000,0x1000,CRC(1502d0e8) SHA1(8ef51ad4601299016f1821a5c65bec0199dd5474) )
-	ROM_LOAD( "ms5a.8h",   0x3000,0x1000,CRC(658482a6) SHA1(c0d770fbeaa7cb3e0eef47d8caa0f8a78841692e) )
+	ROM_LOAD( "ms2a.8d", 0x0000, 0x1000, CRC(13db8ed3) SHA1(939352323bdcd7df25db5eb2e30f269bcaebe6af) )
+	ROM_LOAD( "ms3a.8e", 0x1000, 0x1000, CRC(31bdfe5c) SHA1(b10bfe9e56dd617c5b4cd8b5bfec9c7f537b1086) )
+	ROM_LOAD( "ms4a.8f", 0x2000, 0x1000, CRC(1502d0e8) SHA1(8ef51ad4601299016f1821a5c65bec0199dd5474) )
+	ROM_LOAD( "ms5a.8h", 0x3000, 0x1000, CRC(658482a6) SHA1(c0d770fbeaa7cb3e0eef47d8caa0f8a78841692e) )
 
 	ROM_REGION( 0x0800, "gfx1", 0 )
-	ROM_LOAD( "ms11d.6j",  0x0000, 0x0800, CRC(c6e4d339) SHA1(b091923e4d52e93d7c567afba217a10b2a3735fc) )
+	ROM_LOAD( "ms11d.6j", 0x0000, 0x0800, CRC(c6e4d339) SHA1(b091923e4d52e93d7c567afba217a10b2a3735fc) )
 
 	ROM_REGION( 0x140, "proms", 0 )
 	ROM_LOAD( "74s288.6c", 0x0000, 0x0020, CRC(f76b4fcf) SHA1(197e0cc508ffeb5cefa4046bdfb158939d598225) )
@@ -1365,6 +1363,7 @@
 	ROM_LOAD( "74s288.3d", 0x0120, 0x0020, CRC(e26f9053) SHA1(eec35b6aa2c2d305418306bf4a1754a0583f109f) )
 ROM_END
 
+
 ROM_START( venture )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "13a-cpu", 0x8000, 0x1000, CRC(f4e4d991) SHA1(6683c1552b56b20f2296e461aff697af73563792) )
@@ -1377,14 +1376,15 @@
 	ROM_LOAD( "6a-cpu",  0xf000, 0x1000, CRC(7b78cf49) SHA1(1d484172465d3db6c4fc3733aa2b409e3a2e228f) )
 
 	ROM_REGION( 0x8000, "soundbd:audiocpu", 0 )
-	ROM_LOAD( "3a-ac",   0x5800, 0x0800, CRC(4ea1c3d9) SHA1(d0c99c9d5b887d717c68e8745906ae4e65aec6ad) )
-	ROM_LOAD( "4a-ac",   0x6000, 0x0800, CRC(5154c39e) SHA1(e6f011630eb1aa4116a0e5824ad6b65c1be2455f) )
-	ROM_LOAD( "5a-ac",   0x6800, 0x0800, CRC(1e1e3916) SHA1(867e586583e07cd01e0e852f6ea52a040995725d) )
-	ROM_LOAD( "6a-ac",   0x7000, 0x0800, CRC(80f3357a) SHA1(f1ee638251e8676a526e6367c11866b1d52f5910) )
-	ROM_LOAD( "7a-ac",   0x7800, 0x0800, CRC(466addc7) SHA1(0230b5365d6aeee3ca47666a9eadee4141de125b) )
+	ROM_LOAD( "vea_3a-3.3a", 0x5800, 0x0800, CRC(4ea1c3d9) SHA1(d0c99c9d5b887d717c68e8745906ae4e65aec6ad) )
+	ROM_LOAD( "vea_4a-3.4a", 0x6000, 0x0800, CRC(5154c39e) SHA1(e6f011630eb1aa4116a0e5824ad6b65c1be2455f) )
+	ROM_LOAD( "vea_5a-3.5a", 0x6800, 0x0800, CRC(1e1e3916) SHA1(867e586583e07cd01e0e852f6ea52a040995725d) )
+	ROM_LOAD( "vea_6a-3.6a", 0x7000, 0x0800, CRC(80f3357a) SHA1(f1ee638251e8676a526e6367c11866b1d52f5910) )
+	ROM_LOAD( "vea_7a-3.7a", 0x7800, 0x0800, CRC(466addc7) SHA1(0230b5365d6aeee3ca47666a9eadee4141de125b) )
 
 	ROM_REGION( 0x0800, "gfx1", 0 )
-	ROM_LOAD( "11d-cpu", 0x0000, 0x0800, CRC(b4bb2503) SHA1(67303603b7c5e6301e976ef19f81c7519648b179) )
+//  ROM_LOAD( "11d-cpu", 0x0000, 0x0800, BAD_DUMP CRC(b4bb2503) SHA1(67303603b7c5e6301e976ef19f81c7519648b179) ) // bytes 0x536 & 0x537 have the high bit set (IE:0x80 instead of 0x00 in vel_11d-2.11d)
+	ROM_LOAD( "vel_11d-2.11d", 0x0000, 0x0800, CRC(ea6fd981) SHA1(46b1658e1607423d5a073f14097c2a48d59057c0) )
 
 	ROM_REGION( 0x140, "proms", 0 )
 	ROM_LOAD( "hrl14h 1.h14", 0x0000, 0x0020, CRC(f76b4fcf) SHA1(197e0cc508ffeb5cefa4046bdfb158939d598225) )
@@ -1392,27 +1392,26 @@
 	ROM_LOAD( "hrl6d 1.d6",   0x0120, 0x0020, CRC(e26f9053) SHA1(eec35b6aa2c2d305418306bf4a1754a0583f109f) )
 ROM_END
 
-
-ROM_START( venture2 )
+ROM_START( venture5a )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "vent_a13.cpu", 0x8000, 0x1000, CRC(4c833f99) SHA1(1ff4eafe48b9f0ab8a123659d78c3dfa0bf56d7d) )
-	ROM_LOAD( "vent_a12.cpu", 0x9000, 0x1000, CRC(8163cefc) SHA1(7061819dd1105e8368c045dad2effae62d124539) )
-	ROM_LOAD( "vent_a11.cpu", 0xa000, 0x1000, CRC(324a5054) SHA1(f845ff2f717ea627891e0dc9d6e66f690c0843d8) )
-	ROM_LOAD( "vent_a10.cpu", 0xb000, 0x1000, CRC(24358203) SHA1(10c3ea83a892d6fd2751e590afe45bffa65bd6e0) )
-	ROM_LOAD( "vent_a9.cpu",  0xc000, 0x1000, CRC(04428165) SHA1(6d8d860ce1f805ba2eb315f47c8660799256e921) )
-	ROM_LOAD( "vent_a8.cpu",  0xd000, 0x1000, CRC(4c1a702a) SHA1(7f6a68d3cfdd885108eebb7ea76b3c2ce6070b18) )
-	ROM_LOAD( "vent_a7.cpu",  0xe000, 0x1000, CRC(1aab27c2) SHA1(66c7274dbb8bda3c78cc61d96a6cb1a9b29939b5) )
-	ROM_LOAD( "vent_a6.cpu",  0xf000, 0x1000, CRC(767bdd71) SHA1(334a903e05fc86186f90aa2d9ce3b0d367d7e516) )
-
-	ROM_REGION( 0x8000, "soundbd:audiocpu", 0 )
-	ROM_LOAD( "3a-ac",        0x5800, 0x0800, CRC(4ea1c3d9) SHA1(d0c99c9d5b887d717c68e8745906ae4e65aec6ad) )
-	ROM_LOAD( "4a-ac",        0x6000, 0x0800, CRC(5154c39e) SHA1(e6f011630eb1aa4116a0e5824ad6b65c1be2455f) )
-	ROM_LOAD( "5a-ac",        0x6800, 0x0800, CRC(1e1e3916) SHA1(867e586583e07cd01e0e852f6ea52a040995725d) )
-	ROM_LOAD( "6a-ac",        0x7000, 0x0800, CRC(80f3357a) SHA1(f1ee638251e8676a526e6367c11866b1d52f5910) )
-	ROM_LOAD( "7a-ac",        0x7800, 0x0800, CRC(466addc7) SHA1(0230b5365d6aeee3ca47666a9eadee4141de125b) )
+	ROM_LOAD( "vel_13a-57e.a13", 0x8000, 0x1000, CRC(4c833f99) SHA1(1ff4eafe48b9f0ab8a123659d78c3dfa0bf56d7d) )
+	ROM_LOAD( "vel_12a-5.a12",   0x9000, 0x1000, CRC(8163cefc) SHA1(7061819dd1105e8368c045dad2effae62d124539) )
+	ROM_LOAD( "vel_11a-5.a11",   0xa000, 0x1000, CRC(324a5054) SHA1(f845ff2f717ea627891e0dc9d6e66f690c0843d8) )
+	ROM_LOAD( "vel_10a-5.a10",   0xb000, 0x1000, CRC(24358203) SHA1(10c3ea83a892d6fd2751e590afe45bffa65bd6e0) )
+	ROM_LOAD( "vel_9a-5.a9",     0xc000, 0x1000, CRC(04428165) SHA1(6d8d860ce1f805ba2eb315f47c8660799256e921) )
+	ROM_LOAD( "vel_8a-5.a8",     0xd000, 0x1000, CRC(4c1a702a) SHA1(7f6a68d3cfdd885108eebb7ea76b3c2ce6070b18) )
+	ROM_LOAD( "vel_7a-5.a7",     0xe000, 0x1000, CRC(1aab27c2) SHA1(66c7274dbb8bda3c78cc61d96a6cb1a9b29939b5) )
+	ROM_LOAD( "vel_6a-5.a6",     0xf000, 0x1000, CRC(767bdd71) SHA1(334a903e05fc86186f90aa2d9ce3b0d367d7e516) )
+
+	ROM_REGION( 0x8000, "soundbd:audiocpu", 0 )
+	ROM_LOAD( "vea_3a-3.3a", 0x5800, 0x0800, CRC(4ea1c3d9) SHA1(d0c99c9d5b887d717c68e8745906ae4e65aec6ad) )
+	ROM_LOAD( "vea_4a-3.4a", 0x6000, 0x0800, CRC(5154c39e) SHA1(e6f011630eb1aa4116a0e5824ad6b65c1be2455f) )
+	ROM_LOAD( "vea_5a-3.5a", 0x6800, 0x0800, CRC(1e1e3916) SHA1(867e586583e07cd01e0e852f6ea52a040995725d) )
+	ROM_LOAD( "vea_6a-3.6a", 0x7000, 0x0800, CRC(80f3357a) SHA1(f1ee638251e8676a526e6367c11866b1d52f5910) )
+	ROM_LOAD( "vea_7a-3.7a", 0x7800, 0x0800, CRC(466addc7) SHA1(0230b5365d6aeee3ca47666a9eadee4141de125b) )
 
 	ROM_REGION( 0x0800, "gfx1", 0 )
-	ROM_LOAD( "11d-cpu",      0x0000, 0x0800, CRC(b4bb2503) SHA1(67303603b7c5e6301e976ef19f81c7519648b179) )
+	ROM_LOAD( "vel_11d-2.11d", 0x0000, 0x0800, CRC(ea6fd981) SHA1(46b1658e1607423d5a073f14097c2a48d59057c0) )
 
 	ROM_REGION( 0x140, "proms", 0 )
 	ROM_LOAD( "hrl14h 1.h14", 0x0000, 0x0020, CRC(f76b4fcf) SHA1(197e0cc508ffeb5cefa4046bdfb158939d598225) )
@@ -1420,27 +1419,26 @@
 	ROM_LOAD( "hrl6d 1.d6",   0x0120, 0x0020, CRC(e26f9053) SHA1(eec35b6aa2c2d305418306bf4a1754a0583f109f) )
 ROM_END
 
-
 ROM_START( venture4 )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "vel13a-4", 0x8000, 0x1000, CRC(1c5448f9) SHA1(59d3ca2a2d7048f5f7bd23fa5d9c9a2cc0734cb8) )
-	ROM_LOAD( "vel12a-4", 0x9000, 0x1000, CRC(e62491cc) SHA1(a98b6c6e60d83fd4591d0de145a99c5e4576121a) )
-	ROM_LOAD( "vel11a-4", 0xa000, 0x1000, CRC(e91faeaf) SHA1(ce50a9f1016671282d16f2d0ad3553598e0c7e89) )
-	ROM_LOAD( "vel10a-4", 0xb000, 0x1000, CRC(da3a2991) SHA1(2b5175b0f3642e735b6d87fbd5b75118cf6b7faa) )
-	ROM_LOAD( "vel9a-4",  0xc000, 0x1000, CRC(d1887b11) SHA1(40ed1e1bdcb95d6e317cb5e4fb8572a314b3fbf8) )
-	ROM_LOAD( "vel8a-4",  0xd000, 0x1000, CRC(8e8153fc) SHA1(409cf0ed39ef04c1e9359f0499d7cba3aed8f36e) )
-	ROM_LOAD( "vel7a-4",  0xe000, 0x1000, CRC(0a091701) SHA1(ffdea1d60371779d0c28fb3c6111639cace79dad) )
-	ROM_LOAD( "vel6a-4",  0xf000, 0x1000, CRC(7b165f67) SHA1(4109797bcfd33c870234930790e3cecaaf90b706) )
-
-	ROM_REGION( 0x8000, "soundbd:audiocpu", 0 )
-	ROM_LOAD( "vea3a-2",  0x5800, 0x0800, CRC(83b8836f) SHA1(ec0e2de62caea61ceff56e924449213997bff8cd) )
-	ROM_LOAD( "4a-ac",    0x6000, 0x0800, CRC(5154c39e) SHA1(e6f011630eb1aa4116a0e5824ad6b65c1be2455f) )
-	ROM_LOAD( "5a-ac",    0x6800, 0x0800, CRC(1e1e3916) SHA1(867e586583e07cd01e0e852f6ea52a040995725d) )
-	ROM_LOAD( "6a-ac",    0x7000, 0x0800, CRC(80f3357a) SHA1(f1ee638251e8676a526e6367c11866b1d52f5910) )
-	ROM_LOAD( "7a-ac",    0x7800, 0x0800, CRC(466addc7) SHA1(0230b5365d6aeee3ca47666a9eadee4141de125b) )
+	ROM_LOAD( "vel_13a-4.13a", 0x8000, 0x1000, CRC(1c5448f9) SHA1(59d3ca2a2d7048f5f7bd23fa5d9c9a2cc0734cb8) )
+	ROM_LOAD( "vel_12a-4.12a", 0x9000, 0x1000, CRC(e62491cc) SHA1(a98b6c6e60d83fd4591d0de145a99c5e4576121a) )
+	ROM_LOAD( "vel_11a-4.11a", 0xa000, 0x1000, CRC(e91faeaf) SHA1(ce50a9f1016671282d16f2d0ad3553598e0c7e89) )
+	ROM_LOAD( "vel_10a-4.10a", 0xb000, 0x1000, CRC(da3a2991) SHA1(2b5175b0f3642e735b6d87fbd5b75118cf6b7faa) )
+	ROM_LOAD( "vel_9a-4.a9",   0xc000, 0x1000, CRC(d1887b11) SHA1(40ed1e1bdcb95d6e317cb5e4fb8572a314b3fbf8) )
+	ROM_LOAD( "vel_8a-4.a8",   0xd000, 0x1000, CRC(8e8153fc) SHA1(409cf0ed39ef04c1e9359f0499d7cba3aed8f36e) )
+	ROM_LOAD( "vel_7a-4.a7",   0xe000, 0x1000, CRC(0a091701) SHA1(ffdea1d60371779d0c28fb3c6111639cace79dad) )
+	ROM_LOAD( "vel_6a-4.a6",   0xf000, 0x1000, CRC(7b165f67) SHA1(4109797bcfd33c870234930790e3cecaaf90b706) )
+
+	ROM_REGION( 0x8000, "soundbd:audiocpu", 0 )
+	ROM_LOAD( "vea_3a-2.3a", 0x5800, 0x0800, CRC(83b8836f) SHA1(ec0e2de62caea61ceff56e924449213997bff8cd) )
+	ROM_LOAD( "vea_3a-2.4a", 0x6000, 0x0800, CRC(5154c39e) SHA1(e6f011630eb1aa4116a0e5824ad6b65c1be2455f) ) // here down, same data as the "-3" revision listed above
+	ROM_LOAD( "vea_3a-2.5a", 0x6800, 0x0800, CRC(1e1e3916) SHA1(867e586583e07cd01e0e852f6ea52a040995725d) )
+	ROM_LOAD( "vea_3a-2.6a", 0x7000, 0x0800, CRC(80f3357a) SHA1(f1ee638251e8676a526e6367c11866b1d52f5910) )
+	ROM_LOAD( "vea_3a-2.7a", 0x7800, 0x0800, CRC(466addc7) SHA1(0230b5365d6aeee3ca47666a9eadee4141de125b) )
 
 	ROM_REGION( 0x0800, "gfx1", 0 )
-	ROM_LOAD( "vel11d-2", 0x0000, 0x0800, CRC(ea6fd981) SHA1(46b1658e1607423d5a073f14097c2a48d59057c0) )
+	ROM_LOAD( "vel_11d-2.11d", 0x0000, 0x0800, CRC(ea6fd981) SHA1(46b1658e1607423d5a073f14097c2a48d59057c0) )
 
 	ROM_REGION( 0x140, "proms", 0 )
 	ROM_LOAD( "hrl14h 1.h14", 0x0000, 0x0020, CRC(f76b4fcf) SHA1(197e0cc508ffeb5cefa4046bdfb158939d598225) )
@@ -1448,8 +1446,7 @@
 	ROM_LOAD( "hrl6d 1.d6",   0x0120, 0x0020, CRC(e26f9053) SHA1(eec35b6aa2c2d305418306bf4a1754a0583f109f) )
 ROM_END
 
-
-ROM_START( venture2b )
+ROM_START( venture5b )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "d2732.2s", 0x8000, 0x1000, CRC(87d69fe9) SHA1(d5ccf71af478873f32e23530a62515327f39f672) ) // only unique program ROM
 	ROM_LOAD( "d2732.2r", 0x9000, 0x1000, CRC(8163cefc) SHA1(7061819dd1105e8368c045dad2effae62d124539) )
@@ -1461,11 +1458,11 @@
 	ROM_LOAD( "d2732.2f", 0xf000, 0x1000, CRC(767bdd71) SHA1(334a903e05fc86186f90aa2d9ce3b0d367d7e516) )
 
 	ROM_REGION( 0x8000, "soundbd:audiocpu", 0 )
-	ROM_LOAD( "tms2516.10f",  0x5800, 0x0800, CRC(4ea1c3d9) SHA1(d0c99c9d5b887d717c68e8745906ae4e65aec6ad) )
-	ROM_LOAD( "tms2564.10j",  0x6000, 0x2000, CRC(da9d8588) SHA1(b2e6509748059fc317af56d66396427c5ca78748) ) // bigger ROM, but contents identical to venture2
+	ROM_LOAD( "tms2516.10f", 0x5800, 0x0800, CRC(4ea1c3d9) SHA1(d0c99c9d5b887d717c68e8745906ae4e65aec6ad) ) // == vea_3a-3.3a
+	ROM_LOAD( "tms2564.10j", 0x6000, 0x2000, CRC(da9d8588) SHA1(b2e6509748059fc317af56d66396427c5ca78748) ) // bigger ROM, but contents identical to venture5a
 
 	ROM_REGION( 0x0800, "gfx1", 0 )
-	ROM_LOAD( "tms2516.6j",      0x0000, 0x0800, CRC(ea6fd981) SHA1(46b1658e1607423d5a073f14097c2a48d59057c0) ) // GFX ROM matches venture4, instead
+	ROM_LOAD( "tms2516.6j", 0x0000, 0x0800, CRC(ea6fd981) SHA1(46b1658e1607423d5a073f14097c2a48d59057c0) ) // == vel_11d-2.11d
 
 	ROM_REGION( 0x140, "proms", 0 ) // only 2 PROMs
 	ROM_LOAD( "sn74s288n.6c", 0x0000, 0x0020, CRC(f76b4fcf) SHA1(197e0cc508ffeb5cefa4046bdfb158939d598225) )
@@ -1475,43 +1472,51 @@
 
 ROM_START( pepper2 )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "main_12a", 0x9000, 0x1000, CRC(33db4737) SHA1(d8f7a5d340ddbc4d06d403c3bff0102ce637d24e) )
-	ROM_LOAD( "main_11a", 0xa000, 0x1000, CRC(a1f43b1f) SHA1(a669f2ef55d9a0617110f65863822fdcaf153511) )
-	ROM_LOAD( "main_10a", 0xb000, 0x1000, CRC(4d7d7786) SHA1(ea1390b887404a67ea556720219e81007b954a7d) )
-	ROM_LOAD( "main_9a",  0xc000, 0x1000, CRC(b3362298) SHA1(7adad138ec5f94caa39f9c0fabece538d5db4913) )
-	ROM_LOAD( "main_8a",  0xd000, 0x1000, CRC(64d106ed) SHA1(49646a97def9e1793cac6ee0044f68232b294e4f) )
-	ROM_LOAD( "main_7a",  0xe000, 0x1000, CRC(b1c6f07c) SHA1(53d07211d014336bb43671c51f4190c6515e9cde) )
-	ROM_LOAD( "main_6a",  0xf000, 0x1000, CRC(515b1046) SHA1(bdcccd4e415c00ee8e5ec185597df75ecafe7d3d) )
+	ROM_LOAD( "p2l-8_12a.12a", 0x9000, 0x1000, CRC(33db4737) SHA1(d8f7a5d340ddbc4d06d403c3bff0102ce637d24e) )
+	ROM_LOAD( "p2l-8_11a.11a", 0xa000, 0x1000, CRC(a1f43b1f) SHA1(a669f2ef55d9a0617110f65863822fdcaf153511) )
+	ROM_LOAD( "p2l-8_10a.10a", 0xb000, 0x1000, CRC(4d7d7786) SHA1(ea1390b887404a67ea556720219e81007b954a7d) )
+	ROM_LOAD( "p2l-8_9a.9a",   0xc000, 0x1000, CRC(b3362298) SHA1(7adad138ec5f94caa39f9c0fabece538d5db4913) )
+	ROM_LOAD( "p2l-8_8a.8a",   0xd000, 0x1000, CRC(64d106ed) SHA1(49646a97def9e1793cac6ee0044f68232b294e4f) )
+	ROM_LOAD( "p2l-8_7a.7a",   0xe000, 0x1000, CRC(b1c6f07c) SHA1(53d07211d014336bb43671c51f4190c6515e9cde) )
+	ROM_LOAD( "p2l-8_6a.6a",   0xf000, 0x1000, CRC(515b1046) SHA1(bdcccd4e415c00ee8e5ec185597df75ecafe7d3d) )
 
 	ROM_REGION( 0x8000, "soundbd:audiocpu", 0 )
-	ROM_LOAD( "audio_5a", 0x6800, 0x0800, CRC(90e3c781) SHA1(d51a9e011167a132e8af9f4b1201600a58e86b62) )
-	ROM_LOAD( "audio_6a", 0x7000, 0x0800, CRC(dd343e34) SHA1(4ec55bb73d6afbd167fa91d2606d1d55a15b5c39) )
-	ROM_LOAD( "audio_7a", 0x7800, 0x0800, CRC(e02b4356) SHA1(9891e14d84221c1d6f2d15a29813eb41024290ca) )
+	ROM_LOAD( "p2a_5a.5a", 0x6800, 0x0800, CRC(90e3c781) SHA1(d51a9e011167a132e8af9f4b1201600a58e86b62) ) // unknown revision
+	ROM_LOAD( "p2a_6a.6a", 0x7000, 0x0800, CRC(dd343e34) SHA1(4ec55bb73d6afbd167fa91d2606d1d55a15b5c39) )
+	ROM_LOAD( "p2a_7a.7a", 0x7800, 0x0800, CRC(e02b4356) SHA1(9891e14d84221c1d6f2d15a29813eb41024290ca) )
 
 	ROM_REGION( 0x0800, "gfx1", 0 )
-	ROM_LOAD( "main_11d", 0x0000, 0x0800, CRC(b25160cd) SHA1(3d768552960a3a660891dcb85da6a5c382b33991) )
-ROM_END
+	ROM_LOAD( "p2l-1_11d.11d", 0x0000, 0x0800, CRC(b25160cd) SHA1(3d768552960a3a660891dcb85da6a5c382b33991) )
 
+	ROM_REGION( 0x120, "proms", 0 )
+	ROM_LOAD( "p2l5c-1.c5",   0x0000, 0x0100, NO_DUMP )
+	ROM_LOAD( "p2l6d-1.d6",   0x0100, 0x0020, NO_DUMP )
+ROM_END
 
 ROM_START( pepper27 )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "p2l12ar7.bin", 0x9000, 0x1000, CRC(b3bc51cd) SHA1(12475ac5784bb2ab6887476ee8166c3585864cd6) )
-	ROM_LOAD( "p2l11ar7.bin", 0xa000, 0x1000, CRC(c8b834cd) SHA1(28b4de322de845effaa1d2fc6c9f129145965b8a) )
-	ROM_LOAD( "p2l10ar7.bin", 0xb000, 0x1000, CRC(c3e864a2) SHA1(cfc769b34d181724a5826d3a1bb3313ef5fbbd62) )
-	ROM_LOAD( "p2l9ar7.bin",  0xc000, 0x1000, CRC(451003b2) SHA1(87b9aecfcf861b3d812f0e3c23b40c98c198e933) )
-	ROM_LOAD( "p2l8ar7.bin",  0xd000, 0x1000, CRC(c666cafb) SHA1(5783fcfeeb651c850a1d9676e97a6beaafb06c6e) )
-	ROM_LOAD( "p2l7ar7.bin",  0xe000, 0x1000, CRC(ac1282ef) SHA1(34023d8a01c1f26ec8268d7387660d6f7e875014) )
-	ROM_LOAD( "p2l6ar7.bin",  0xf000, 0x1000, CRC(db8dd4fc) SHA1(9ae00f8d1a19280670dc65a20cf9cc4e7f1cc973) )
+	ROM_LOAD( "p2l-7_12a.12a", 0x9000, 0x1000, CRC(b3bc51cd) SHA1(12475ac5784bb2ab6887476ee8166c3585864cd6) )
+	ROM_LOAD( "p2l-7_11a.11a", 0xa000, 0x1000, CRC(c8b834cd) SHA1(28b4de322de845effaa1d2fc6c9f129145965b8a) )
+	ROM_LOAD( "p2l-7_10a.10a", 0xb000, 0x1000, CRC(c3e864a2) SHA1(cfc769b34d181724a5826d3a1bb3313ef5fbbd62) )
+	ROM_LOAD( "p2l-7_9a.9a",   0xc000, 0x1000, CRC(451003b2) SHA1(87b9aecfcf861b3d812f0e3c23b40c98c198e933) )
+	ROM_LOAD( "p2l-7_8a.8a",   0xd000, 0x1000, CRC(c666cafb) SHA1(5783fcfeeb651c850a1d9676e97a6beaafb06c6e) )
+	ROM_LOAD( "p2l-7_7a.7a",   0xe000, 0x1000, CRC(ac1282ef) SHA1(34023d8a01c1f26ec8268d7387660d6f7e875014) )
+	ROM_LOAD( "p2l-7_6a.6a",   0xf000, 0x1000, CRC(db8dd4fc) SHA1(9ae00f8d1a19280670dc65a20cf9cc4e7f1cc973) )
 
 	ROM_REGION( 0x8000, "soundbd:audiocpu", 0 )
-	ROM_LOAD( "audio_5a", 0x6800, 0x0800, CRC(90e3c781) SHA1(d51a9e011167a132e8af9f4b1201600a58e86b62) )
-	ROM_LOAD( "audio_6a", 0x7000, 0x0800, CRC(dd343e34) SHA1(4ec55bb73d6afbd167fa91d2606d1d55a15b5c39) )
-	ROM_LOAD( "audio_7a", 0x7800, 0x0800, CRC(e02b4356) SHA1(9891e14d84221c1d6f2d15a29813eb41024290ca) )
+	ROM_LOAD( "p2a_5a.5a", 0x6800, 0x0800, CRC(90e3c781) SHA1(d51a9e011167a132e8af9f4b1201600a58e86b62) ) // unknown revision
+	ROM_LOAD( "p2a_6a.6a", 0x7000, 0x0800, CRC(dd343e34) SHA1(4ec55bb73d6afbd167fa91d2606d1d55a15b5c39) )
+	ROM_LOAD( "p2a_7a.7a", 0x7800, 0x0800, CRC(e02b4356) SHA1(9891e14d84221c1d6f2d15a29813eb41024290ca) )
 
 	ROM_REGION( 0x0800, "gfx1", 0 )
-	ROM_LOAD( "main_11d", 0x0000, 0x0800, CRC(b25160cd) SHA1(3d768552960a3a660891dcb85da6a5c382b33991) )
+	ROM_LOAD( "p2l-1_11d.11d", 0x0000, 0x0800, CRC(b25160cd) SHA1(3d768552960a3a660891dcb85da6a5c382b33991) )
+
+	ROM_REGION( 0x120, "proms", 0 )
+	ROM_LOAD( "p2l5c-1.c5",   0x0000, 0x0100, NO_DUMP )
+	ROM_LOAD( "p2l6d-1.d6",   0x0100, 0x0020, NO_DUMP )
 ROM_END
 
+
 ROM_START( hardhat )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "hhl-2.11a", 0xa000, 0x1000, CRC(7623deea) SHA1(3c47c0439c80e66536af42c5ee4e522fea5f8374) )
@@ -1786,16 +1791,16 @@
 GAME( 1980, phantom,   spectar, rallys,   phantoma,  exidy_state, init_phantoma, ROT0, "bootleg (Proel)", "Phantom (bootleg of Spectar)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 
 GAME( 1981, mtrap,     0,       mtrap,    mtrap,     exidy_state, init_mtrap,    ROT0, "Exidy",   "Mouse Trap (version 5)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, mtrap2,    mtrap,   mtrap,    mtrap,     exidy_state, init_mtrap,    ROT0, "Exidy",   "Mouse Trap (version 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, mtrap3,    mtrap,   mtrap,    mtrap,     exidy_state, init_mtrap,    ROT0, "Exidy",   "Mouse Trap (version 3)", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, mtrap4,    mtrap,   mtrap,    mtrap,     exidy_state, init_mtrap,    ROT0, "Exidy",   "Mouse Trap (version 4)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, mtrap3,    mtrap,   mtrap,    mtrap,     exidy_state, init_mtrap,    ROT0, "Exidy",   "Mouse Trap (version 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, mtrap2,    mtrap,   mtrap,    mtrap,     exidy_state, init_mtrap,    ROT0, "Exidy",   "Mouse Trap (version 2)", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, mtrapb,    mtrap,   mtrap,    mtrap,     exidy_state, init_mtrap,    ROT0, "bootleg", "Mouse Trap (bootleg)", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, mtrapb2,   mtrap,   mtrap,    mtrap,     exidy_state, init_mtrap,    ROT0, "bootleg", "Mouse Trap (version 4, bootleg)", MACHINE_SUPPORTS_SAVE )
 
 GAME( 1981, venture,   0,       venture,  venture,   exidy_state, init_venture,  ROT0, "Exidy",   "Venture (version 5 set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, venture2,  venture, venture,  venture,   exidy_state, init_venture,  ROT0, "Exidy",   "Venture (version 5 set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, venture5a, venture, venture,  venture,   exidy_state, init_venture,  ROT0, "Exidy",   "Venture (version 5 set 2)", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, venture4,  venture, venture,  venture,   exidy_state, init_venture,  ROT0, "Exidy",   "Venture (version 4)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, venture2b, venture, venture,  venture,   exidy_state, init_venture,  ROT0, "bootleg", "Venture (version 5 set 2, bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, venture5b, venture, venture,  venture,   exidy_state, init_venture,  ROT0, "bootleg", "Venture (version 5 set 2, bootleg)", MACHINE_SUPPORTS_SAVE )
 
 GAME( 1982, teetert,   0,       teetert,  teetert,   exidy_state, init_teetert,  ROT0, "Exidy",   "Teeter Torture (prototype)", MACHINE_SUPPORTS_SAVE )
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/exidyttl.cpp mame-0.224+dfsg.1/src/mame/drivers/exidyttl.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/exidyttl.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/exidyttl.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,7 +7,7 @@
  Alley Rally (1976/10) (AR-1A)
  Attack (1977/02)
  Death Race (1976/04)
- Destruction Derby (1976/01)
+ Destruction Derby (1976/01) (DD-2A)
  Hockey / Tennis (Thumper Bumper?) (1974/03)
  Score (1977/07)
  Spiders From Space (1976)
@@ -53,6 +53,7 @@
 
 	void attack(machine_config &config);
 	void deathrac(machine_config &config);
+	void destdrby(machine_config &config);
 
 private:
 	// devices
@@ -110,7 +111,7 @@
 	m_video->set_threshold(0.30);
 }
 
-void exidyttl_state::deathrac(machine_config &config)
+void exidyttl_state::destdrby(machine_config &config)
 {
 	/* basic machine hardware */
 	NETLIST_CPU(config, m_maincpu, netlist::config::DEFAULT_CLOCK()).set_source(netlist_attack);
@@ -125,6 +126,10 @@
 	m_video->set_threshold(0.30);
 }
 
+void exidyttl_state::deathrac(machine_config& config)
+{
+	destdrby(config);
+}
 
 /***************************************************************************
 
@@ -157,6 +162,58 @@
 	ROM_LOAD( "attack__set2.k6",     0x0000, 0x0200, CRC(ba5115b3) SHA1(1679b07e8a9376789c9cf15fe16e97003e9267be) )
 ROM_END
 
+/***********
+
+ Exidy Destruction Derby 1976
+
+ Drawing Name
+ ------------
+ 82S123-34.E7 32x8    Right Drone
+ 82S129-91.J10    256x4
+
+ 82S123-34.R7 32x8    Left Drone
+ 82S129-91.V10    256x4
+
+ 82S129-92.V5     P1 (left car)
+ 82S123-35.T7
+
+ 82S129-92.J5     P2 (right car)
+ 82S123-35.G7
+
+ 82S129-93.M11        Image Generation
+ 82S129-94.L11
+ 82S129-95.K11
+ 82S129-96.J11
+
+ 82S123-33.P14        Score & Timer
+
+ 82S123-31.A11        Timing / Sync
+ 82S123-32.C12
+
+***********/
+
+
+ROM_START( destdrby )
+	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
+
+	ROM_REGION( 0x0400, "roms", ROMREGION_ERASE00)
+	ROM_LOAD( "82s123-31.a11", 0x0000, 0x0020, CRC(f304a1fb) SHA1(0f029274bb99723ebcc271d761e1500ca50b2738) )
+	ROM_LOAD( "82s123-32.c12", 0x0000, 0x0020, CRC(f8dbd779) SHA1(55bdaf9eb1ba6185e20512c4874ebb625861508e) )
+	ROM_LOAD( "82s123-33.p14", 0x0000, 0x0020, CRC(2e83bf80) SHA1(02fcc1e879c06759a21ef4f004fe7aa790814112) )
+	ROM_LOAD( "82s123-34.e7",  0x0000, 0x0020, CRC(e9af4217) SHA1(813e126b1263e13f1684d700c5c4bec34d063b38) )
+	ROM_LOAD( "82s123-35.g7",  0x0000, 0x0020, CRC(5ed8cdd2) SHA1(d193d819ad634c43d648ce49073799b4df6dfd2f) )
+	ROM_LOAD( "82s123-34.r7",  0x0000, 0x0020, CRC(e9af4217) SHA1(813e126b1263e13f1684d700c5c4bec34d063b38) )
+	ROM_LOAD( "82s123-35.t7",  0x0000, 0x0020, CRC(5ed8cdd2) SHA1(d193d819ad634c43d648ce49073799b4df6dfd2f) )
+
+	ROM_LOAD( "82s129-91.j10", 0x0000, 0x0100, CRC(c3823f0b) SHA1(42fe8c1e0f54b3f968a630dd564a8941410c5d86) )
+	ROM_LOAD( "82s129-91.v10", 0x0000, 0x0100, CRC(c3823f0b) SHA1(42fe8c1e0f54b3f968a630dd564a8941410c5d86) )
+	ROM_LOAD( "82s129-92.j5",  0x0000, 0x0100, CRC(82d7d25f) SHA1(d4b3a6655f91647545d493c2ff996daa66df0395) )
+	ROM_LOAD( "82s129-92.v5",  0x0000, 0x0100, CRC(82d7d25f) SHA1(d4b3a6655f91647545d493c2ff996daa66df0395) )
+	ROM_LOAD( "82s129-93.m11", 0x0000, 0x0100, CRC(9f65c1df) SHA1(e367cc418b34005198f9b958592573986d37274a) )
+	ROM_LOAD( "82s129-94.l11", 0x0000, 0x0100, CRC(5e27fc7c) SHA1(bae31e7f0ff7a5ebfe4a12fc537249ee24a4cf4b) )
+	ROM_LOAD( "82s129-95.k11", 0x0000, 0x0100, CRC(93dc096c) SHA1(b89a478ef731024eb24a79f9e82a5ef779e8e3d0) )
+	ROM_LOAD( "82s129-96.j11", 0x0000, 0x0100, CRC(ddbb0cc7) SHA1(6f169566cb09c78090cec2e375013c0eb2656890) )
+ROM_END
 
 /***********
 
@@ -193,46 +250,29 @@
 	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
 
 	ROM_REGION( 0x0400, "roms", ROMREGION_ERASE00 )
-	ROM_LOAD( "6301-100.j11",   0x0000, 0x0100, CRC(d751bd57) SHA1(a6208af40661bf3cd50363d2ece38cd3b9f6a7a0) )
-	ROM_LOAD( "6301-91.j10",    0x0000, 0x0100, CRC(c3823f0b) SHA1(42fe8c1e0f54b3f968a630dd564a8941410c5d86) )
-	ROM_LOAD( "6301-91.v10",    0x0000, 0x0100, CRC(c3823f0b) SHA1(42fe8c1e0f54b3f968a630dd564a8941410c5d86) )
-	ROM_LOAD( "6301-92.j5",     0x0000, 0x0100, CRC(82d7d25f) SHA1(d4b3a6655f91647545d493c2ff996daa66df0395) )
-	ROM_LOAD( "6301-92.v5",     0x0000, 0x0100, CRC(82d7d25f) SHA1(d4b3a6655f91647545d493c2ff996daa66df0395) )
-	ROM_LOAD( "6301-97.m11",    0x0000, 0x0100, CRC(2b02444f) SHA1(e1fc01f7271109515438542a223efc0042f794a5) )
-	ROM_LOAD( "6301-98.l11",    0x0000, 0x0100, CRC(0bdaf1eb) SHA1(67976e73bfdc4d42a520212d020dd52d51667674) )
-	ROM_LOAD( "6301-99.k11",    0x0000, 0x0100, CRC(34763c8f) SHA1(2012ace666e8b82a89a0c15511ee80173d9700bc) )
-
-	ROM_LOAD( "6331-31.a11",    0x0000, 0x0020, CRC(f304a1fb) SHA1(0f029274bb99723ebcc271d761e1500ca50b2738) )
-	ROM_LOAD( "6331-32.c12",    0x0000, 0x0020, CRC(f8dbd779) SHA1(55bdaf9eb1ba6185e20512c4874ebb625861508e) )
-	ROM_LOAD( "6331-33.p14",    0x0000, 0x0020, CRC(2e83bf80) SHA1(02fcc1e879c06759a21ef4f004fe7aa790814112) )
-	ROM_LOAD( "6331-36.e7",     0x0000, 0x0020, CRC(1358c8d5) SHA1(2fa1041f30f3a6775393714a65c416738b06b330) )
-	ROM_LOAD( "6331-36.g7",     0x0000, 0x0020, CRC(15e00a2a) SHA1(cd43d227a34e5444ed9d8a4acf5497df9c789c73) )
-	ROM_LOAD( "6331-36.r7",     0x0000, 0x0020, CRC(1358c8d5) SHA1(2fa1041f30f3a6775393714a65c416738b06b330) )
-	ROM_LOAD( "6331-36.t7",     0x0000, 0x0020, CRC(15e00a2a) SHA1(cd43d227a34e5444ed9d8a4acf5497df9c789c73) )
+	ROM_LOAD( "6331-31.a11", 0x0000, 0x0020, CRC(f304a1fb) SHA1(0f029274bb99723ebcc271d761e1500ca50b2738) )
+	ROM_LOAD( "6331-32.c12", 0x0000, 0x0020, CRC(f8dbd779) SHA1(55bdaf9eb1ba6185e20512c4874ebb625861508e) )
+	ROM_LOAD( "6331-33.p14", 0x0000, 0x0020, CRC(2e83bf80) SHA1(02fcc1e879c06759a21ef4f004fe7aa790814112) )
+	// Note: Image for 36 has all zeros in the second half, which is unused.
+	// Other roms in this series (34,35) all have duplicate content in the second half
+	ROM_LOAD( "6331-36.e7",  0x0000, 0x0020, CRC(bb743b79) SHA1(8eb73782bcea7dbba7b75db32307e562248691bb) )
+	ROM_LOAD( "6331-35.g7",  0x0000, 0x0020, CRC(5ed8cdd2) SHA1(d193d819ad634c43d648ce49073799b4df6dfd2f) )
+	ROM_LOAD( "6331-36.r7",  0x0000, 0x0020, CRC(bb743b79) SHA1(8eb73782bcea7dbba7b75db32307e562248691bb) )
+	ROM_LOAD( "6331-35.t7",  0x0000, 0x0020, CRC(5ed8cdd2) SHA1(d193d819ad634c43d648ce49073799b4df6dfd2f) )
+
+	ROM_LOAD( "6301-91.j10",  0x0000, 0x0100, CRC(c3823f0b) SHA1(42fe8c1e0f54b3f968a630dd564a8941410c5d86) )
+	ROM_LOAD( "6301-91.v10",  0x0000, 0x0100, CRC(c3823f0b) SHA1(42fe8c1e0f54b3f968a630dd564a8941410c5d86) )
+	ROM_LOAD( "6301-92.j5",   0x0000, 0x0100, CRC(82d7d25f) SHA1(d4b3a6655f91647545d493c2ff996daa66df0395) )
+	ROM_LOAD( "6301-92.v5",   0x0000, 0x0100, CRC(82d7d25f) SHA1(d4b3a6655f91647545d493c2ff996daa66df0395) )
+	ROM_LOAD( "6301-97.m11",  0x0000, 0x0100, CRC(2b02444f) SHA1(e1fc01f7271109515438542a223efc0042f794a5) )
+	ROM_LOAD( "6301-98.l11",  0x0000, 0x0100, CRC(0bdaf1eb) SHA1(67976e73bfdc4d42a520212d020dd52d51667674) )
+	ROM_LOAD( "6301-99.k11",  0x0000, 0x0100, CRC(34763c8f) SHA1(2012ace666e8b82a89a0c15511ee80173d9700bc) )
+	ROM_LOAD( "6301-100.j11", 0x0000, 0x0100, CRC(d751bd57) SHA1(a6208af40661bf3cd50363d2ece38cd3b9f6a7a0) )
 ROM_END
 
-ROM_START( rhunting )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
-
-	ROM_REGION( 0x0400, "roms", ROMREGION_ERASE00 )
-	ROM_LOAD( "6301-1.j11",     0x0000, 0x0100, CRC(d751bd57) SHA1(a6208af40661bf3cd50363d2ece38cd3b9f6a7a0) )
-	ROM_LOAD( "93427.j10",      0x0000, 0x0100, CRC(c3823f0b) SHA1(42fe8c1e0f54b3f968a630dd564a8941410c5d86) )
-	ROM_LOAD( "6301-1.v5",      0x0000, 0x0100, CRC(82d7d25f) SHA1(d4b3a6655f91647545d493c2ff996daa66df0395) )
-	ROM_LOAD( "6301-1.m11",     0x0000, 0x0100, CRC(2b02444f) SHA1(e1fc01f7271109515438542a223efc0042f794a5) )
-	ROM_LOAD( "6301-1.l11",     0x0000, 0x0100, CRC(0bdaf1eb) SHA1(67976e73bfdc4d42a520212d020dd52d51667674) )
-	ROM_LOAD( "6301-1.k11",     0x0000, 0x0100, CRC(34763c8f) SHA1(2012ace666e8b82a89a0c15511ee80173d9700bc) )
-
-	ROM_LOAD( "6331-1.a11",     0x0000, 0x0020, CRC(f304a1fb) SHA1(0f029274bb99723ebcc271d761e1500ca50b2738) )
-	ROM_LOAD( "6331-1.c12",     0x0000, 0x0020, CRC(f8dbd779) SHA1(55bdaf9eb1ba6185e20512c4874ebb625861508e) )
-	ROM_LOAD( "6331-1.p14",     0x0000, 0x0020, CRC(2e83bf80) SHA1(02fcc1e879c06759a21ef4f004fe7aa790814112) )
-	ROM_LOAD( "6331-1.e7",      0x0000, 0x0020, CRC(bb743b79) SHA1(8eb73782bcea7dbba7b75db32307e562248691bb) )
-	ROM_LOAD( "6331-1.g7",      0x0000, 0x0020, CRC(5ed8cdd2) SHA1(d193d819ad634c43d648ce49073799b4df6dfd2f) )
-	ROM_LOAD( "6331-1.r7",      0x0000, 0x0020, CRC(bb743b79) SHA1(8eb73782bcea7dbba7b75db32307e562248691bb) )
-	ROM_LOAD( "6331-1.t7",      0x0000, 0x0020, CRC(5ed8cdd2) SHA1(d193d819ad634c43d648ce49073799b4df6dfd2f) )
-ROM_END
-
-
-GAME( 1977, attckexd,  0,        attack,   0, exidyttl_state, empty_init, ROT0, "Exidy", "Attack (set 1) [TTL]", MACHINE_IS_SKELETON )
-GAME( 1977, attckexd2, attckexd, attack,   0, exidyttl_state, empty_init, ROT0, "Exidy", "Attack (set 2) [TTL]", MACHINE_IS_SKELETON )
-GAME( 1976, deathrac,  0,        deathrac, 0, exidyttl_state, empty_init, ROT0, "Exidy", "Death Race [TTL]",     MACHINE_IS_SKELETON )
+#define rom_rhunting rom_deathrac
+GAME( 1977, attckexd,  0,        attack,   0, exidyttl_state, empty_init, ROT0, "Exidy", "Attack (set 1) [TTL]",    MACHINE_IS_SKELETON )
+GAME( 1977, attckexd2, attckexd, attack,   0, exidyttl_state, empty_init, ROT0, "Exidy", "Attack (set 2) [TTL]",    MACHINE_IS_SKELETON )
+GAME( 1976, deathrac,  0,        deathrac, 0, exidyttl_state, empty_init, ROT0, "Exidy", "Death Race [TTL]",        MACHINE_IS_SKELETON )
+GAME( 1976, destdrby,  0,        destdrby, 0, exidyttl_state, empty_init, ROT0, "Exidy", "Destruction Derby [TTL]", MACHINE_IS_SKELETON)
 GAME( 1976, rhunting,  deathrac, deathrac, 0, exidyttl_state, empty_init, ROT0, "bootleg", "Robot Hunting (bootleg of Death Race) [TTL]",MACHINE_IS_SKELETON )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/exorciser.cpp mame-0.224+dfsg.1/src/mame/drivers/exorciser.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/exorciser.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/exorciser.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,828 @@
+// license:BSD-3-Clause
+// copyright-holders:68bit
+/***************************************************************************
+
+Motorola M6800 EXORciser I (M68SDT)
+
+Note The EXORciser II (M68SDT II) was distinctly different, using dual 64k
+address maps (a user map and a supervisor map) and other improvements, and
+used EXBUG 2.
+
+To boot MDOS using the ROM disk boot press 'X' until the EXBUG prompt is seen,
+and then enter "MAID" without a LF or CR, and then at the "*" prompt enter
+E800;G without a LF or CR.
+
+EXBUG 1.1 and 1.2 commands:
+X
+  General escape command, exits to the prompt.
+MAID
+  Switches to the MAID (Motorola Active Interface Debug) mode.
+LOAD
+  Load S19 format binary object tapes. At the "SGL/CONT" prompt press S to
+  load a single program, or press C to load multiple programs and the abort
+  button when finished, or press X to abort.
+VERF
+  Verifies memory from tape data. At the "SGL/CONT" prompt press S to verify a
+  single program, or press C to verify multiple programs and the abort button
+  when finished, or press X to abort.
+SRCH
+  Searches for a S0 header and prints it and prompts CONT/LOAD/VERF and then
+  press C to continue searching, or press L to switch to the LOAD function, or
+  press V to switch to the VERF function, or press X to abort.
+PNCH
+  Prompts for a begin and an end address and then for a header of 6 characters
+  and then prints "EXEC" and waits for Y and then outputs the memory range in
+  S19 format, or press X to abort.
+PRNT
+  Prints a memory dump. Prompts for a begin and an end address then prints
+  "EXEC" and waits for Y and then dumps the memory in a readable format, or
+  press X to abort.
+TERM (EXBUG 1.2 extension)
+  Prompts for a 15 bit hex number which is used as a terminal output delay
+  between characters.
+S10.
+S30.
+S120
+S240 (EXBUG 1.2 extension)
+  Select different communication protocols for the tape drive.
+
+
+MAID (Motorola Active Interface Debug) mode has a '*' prompt and the
+following commands:
+X
+  General escape command, exits the command or MAID mode.
+xxxx/
+  Memory examine and change.
+    xx LF   - enter new value, and advance to the next address
+    LF      - advance to the next address
+    ^       - previous address
+    xxxx;O  - calculate a branch offset from the current to the given address
+              printing INVL if out of range.
+$R
+  Register display and change. LF advances to the next register.
+xxxx;V
+  Insert a software breakpoint at the given address, up to 8 breakpoints.
+  These are stored starting at address $ff4f.
+$V
+  Prints the address of the 8 breakpoints.
+xxxx;U
+  Removes the software breakpoint at the given address.
+;U
+  Removes all software breakpoints.
+$M
+  Prints the current search mask and prompts for a new search mask and address
+  range for use by the ;W search command.
+xx;W
+  Searches the memory range set by the $M command for a byte matching the
+  given xx masked with the mask set by the $M command, printing all
+  matches. The test is (byte^xx) & mask == 0.
+$T
+  Prompts for an end address, to trace this address when code is next run.
+;T
+  Deactivates the trace end address set by the $T command.
+$S
+  Prompts for a stop address, which it sets and activates. This is a hardware
+  breakpoint that activates when the address is touched.
+;S
+  Deactivates the stop address, as set by the $S command.
+;G
+  Execute the user's program from the auto start memory location.
+xxxx;G
+  Execute the user's program from the given address.
+;P
+  Continue executing from the current program counter address.
+nn;P
+  Continue executing from the current program counter address, skipping the
+  given number of software breakpoints. This does not appear to be reliable
+  at least not in the emulator?
+N
+  Trace one instruction.
+;N
+xxxx;N
+  Trace the next instruction or the given number of instructions.
+#nnnnn=
+  Converts the given decimal number to hex.
+#@nnn=
+  Converts the given octal number to hex.
+#$xxxx=
+  Converts the given hex number to decimal.
+
+
+For all tape formats the PNCH command sends code 0x12, aka DC2, to start tape
+recording and code 0x14, aka DC4, to stop tape recording. For tape format
+S120, the codes 0x10, 0x30, 0x12 are sent to start tape recording, and the
+codes 0x14, 0x10, 0x39 are sent to stop tape recording.
+
+For tape formats S10 and S30 the ACIA RTS line is used for tape motor control
+when reading from the tape, but not when writing to the tape, and the code
+0x11, aka DC1, is sent to start tape playback, and the code 0x13, aka DC3, is
+sent to stop tape playback.
+
+For tape format S120, the ACIA RTS line is not used for tape motor control,
+rather the codes 0x10, 0x37 are sent to start playback from the tape, and the
+code 0x13 is sent to stop playback.
+
+References:
+
+"M6800 EXORciser User's Guide.", second edition, Motorola, 1975.
+
+****************************************************************************/
+
+#include "emu.h"
+#include "cpu/m6800/m6800.h"
+#include "machine/bankdev.h"
+#include "machine/input_merger.h"
+#include "machine/6821pia.h"
+#include "machine/6850acia.h"
+#include "machine/mc14411.h"
+#include "machine/m68sfdc.h"
+
+#include "bus/rs232/rs232.h"
+#include "imagedev/printer.h"
+
+#include "formats/mdos_dsk.h"
+
+class exorciser_state : public driver_device
+{
+public:
+	exorciser_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_bankdev(*this, "bankdev")
+		, m_mainirq(*this, "mainirq")
+		, m_mainnmi(*this, "mainnmi")
+		, m_maincpu_clock(*this, "MAINCPU_CLOCK")
+		, m_abort_key(*this, "ABORT_KEY")
+		, m_pia_dbg(*this, "pia_dbg")
+		, m_acia(*this, "acia")
+		, m_brg(*this, "brg")
+		, m_rs232_baud(*this, "RS232_BAUD")
+		, m_rs232_config(*this, "RS232_CONFIG")
+		, m_pia_lpt(*this, "pia_lpt")
+		, m_printer(*this, "printer")
+		, m_acia_prn(*this, "acia_prn")
+		, m_fdc(*this, "fdc")
+		, m_floppy0(*this, "floppy0")
+		, m_floppy1(*this, "floppy1")
+		, m_floppy2(*this, "floppy2")
+		, m_floppy3(*this, "floppy3")
+	{ }
+
+	enum
+	{
+		TIMER_TRACE,
+	};
+
+	void exorciser(machine_config &config);
+
+	DECLARE_INPUT_CHANGED_MEMBER(maincpu_clock_change);
+	DECLARE_WRITE_LINE_MEMBER(abort_key_w);
+
+protected:
+	virtual void machine_reset() override;
+	virtual void machine_start() override;
+
+private:
+	void dbg_map(address_map &map);
+	void mem_map(address_map &map);
+
+	DECLARE_WRITE_LINE_MEMBER(irq_line_w);
+	u8 m_irq;
+	address_space *m_banked_space;
+	u8 main_r(offs_t offset);
+	void main_w(offs_t offset, u8 data);
+	u8 prom_r(offs_t offset);
+
+	required_device<m6800_cpu_device> m_maincpu;
+	required_device<address_map_bank_device> m_bankdev;
+	required_device<input_merger_device> m_mainirq;
+	required_device<input_merger_device> m_mainnmi;
+	required_ioport m_maincpu_clock;
+	required_ioport m_abort_key;
+	required_device<pia6821_device> m_pia_dbg;
+	required_device<acia6850_device> m_acia;
+	required_device<mc14411_device> m_brg;
+	required_ioport m_rs232_baud;
+	required_ioport m_rs232_config;
+	required_device<pia6821_device> m_pia_lpt;
+	required_device<printer_image_device> m_printer;
+	required_device<acia6850_device> m_acia_prn;
+	required_device<m68sfdc_device> m_fdc;
+
+	// RS232 bit rate generator clocks
+	DECLARE_WRITE_LINE_MEMBER(write_f1_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f3_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f5_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f7_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f8_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f9_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f11_clock);
+	DECLARE_WRITE_LINE_MEMBER(write_f13_clock);
+
+	u8 m_restart_count;
+
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+	void pia_dbg_pa_w(u8 data);
+	DECLARE_READ_LINE_MEMBER(pia_dbg_ca1_r);
+	void pia_dbg_pb_w(u8 data);
+	DECLARE_WRITE_LINE_MEMBER(pia_dbg_ca2_w);
+	DECLARE_WRITE_LINE_MEMBER(pia_dbg_cb2_w);
+	u16 m_stop_address;
+	u8 m_stop_enabled;
+
+	void pia_lpt_pa_w(u8 data);
+	int pia_lpt_ca1_r();
+	void pia_lpt_ca2_w(int state);
+	uint8_t pia_lpt_pb_r();
+	uint8_t m_printer_data;
+	uint8_t m_printer_data_ready;
+
+	static void exorciser_rs232_devices(device_slot_interface &device);
+
+	DECLARE_FLOPPY_FORMATS(floppy_formats);
+	required_device<floppy_connector> m_floppy0;
+	required_device<floppy_connector> m_floppy1;
+	required_device<floppy_connector> m_floppy2;
+	required_device<floppy_connector> m_floppy3;
+};
+
+void exorciser_state::dbg_map(address_map &map)
+{
+	map(0x0000, 0xffff).rw(FUNC(exorciser_state::main_r), FUNC(exorciser_state::main_w));
+}
+
+void exorciser_state::mem_map(address_map &map)
+{
+	// User RAM
+	map(0x0000, 0xe800).ram();
+
+	// Disk driver code.
+	map(0xe800, 0xebff).rom().region("68fdc2", 0);
+
+	// Disk driver unit
+	map(0xec00, 0xec07).rw(m_fdc, FUNC(m68sfdc_device::read), FUNC(m68sfdc_device::write));
+
+	// Line printer
+	map(0xec10, 0xec13).rw(m_pia_lpt, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+
+	// Serial printer.
+	map(0xec26, 0xec27).rw(m_acia_prn, FUNC(acia6850_device::read), FUNC(acia6850_device::write));
+
+	// EXBUG
+	map(0xf000, 0xfbff).rom().region("exbug", 0);
+
+	map(0xfcf4, 0xfcf5).mirror(0x0002).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write));
+	map(0xfcf8, 0xfcfb).rw(m_pia_dbg, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+
+	// Small PROM with the restart vector and ACIA settings.
+	map(0xfcfc, 0xfcff).r(FUNC(exorciser_state::prom_r));
+
+	// EXBUG RAM
+	map(0xff00, 0xffff).ram();
+}
+
+/* Input ports */
+static INPUT_PORTS_START( exorciser )
+
+	PORT_START("ABORT_KEY")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("Abort") PORT_WRITE_LINE_DEVICE_MEMBER(DEVICE_SELF, exorciser_state, abort_key_w)
+
+	// The EXORciser I supported 1MHz, and the EXORciser II also supported
+	// 1.5 and 2.0MHz.
+	PORT_START("MAINCPU_CLOCK")
+	PORT_CONFNAME(0xffffff, 1000000, "CPU clock") PORT_CHANGED_MEMBER(DEVICE_SELF, exorciser_state, maincpu_clock_change, 0)
+	PORT_CONFSETTING(1000000, "1.0 MHz")
+	PORT_CONFSETTING(2000000, "1.5 MHz")
+	PORT_CONFSETTING(4000000, "2.0 MHz")
+
+	PORT_START("RS232_BAUD")
+	PORT_CONFNAME(0xff, 1, "RS232 Baud Rate")
+	PORT_CONFSETTING(0x80, "110")
+	PORT_CONFSETTING(0x40, "150")
+	PORT_CONFSETTING(0x20, "300")
+	PORT_CONFSETTING(0x10, "600")
+	PORT_CONFSETTING(0x08, "1200")
+	PORT_CONFSETTING(0x04, "2400")
+	PORT_CONFSETTING(0x02, "4800")
+	PORT_CONFSETTING(0x01, "9600")
+
+	PORT_START("RS232_CONFIG")
+	PORT_CONFNAME(0x7F, 0x75, "RS232 Config")
+	PORT_CONFSETTING(0x61, "7 data bits, 2 stop bits, even parity")
+	PORT_CONFSETTING(0x65, "7 data bits, 2 stop bits, odd parity")
+	PORT_CONFSETTING(0x69, "7 data bits, 1 stop bits, even parity")
+	PORT_CONFSETTING(0x6d, "7 data bits, 1 stop bits, odd parity")
+	PORT_CONFSETTING(0x71, "8 data bits, 2 stop bits, no parity")
+	PORT_CONFSETTING(0x75, "8 data bits, 1 stop bit, no parity")
+	PORT_CONFSETTING(0x79, "8 data bits, 1 stop bit, even parity")
+	PORT_CONFSETTING(0x7d, "8 data bits, 1 stop bit, odd parity")
+
+INPUT_PORTS_END
+
+INPUT_CHANGED_MEMBER(exorciser_state::maincpu_clock_change)
+{
+	m_maincpu->set_clock(newval);
+}
+
+
+WRITE_LINE_MEMBER(exorciser_state::write_f1_clock)
+{
+	if (BIT(m_rs232_baud->read(), 0))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+
+	m_acia_prn->write_txc(state);
+	m_acia_prn->write_rxc(state);
+}
+
+WRITE_LINE_MEMBER(exorciser_state::write_f3_clock)
+{
+	if (BIT(m_rs232_baud->read(), 1))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorciser_state::write_f5_clock)
+{
+	if (BIT(m_rs232_baud->read(), 2))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorciser_state::write_f7_clock)
+{
+	if (BIT(m_rs232_baud->read(), 3))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorciser_state::write_f8_clock)
+{
+	if (BIT(m_rs232_baud->read(), 4))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorciser_state::write_f9_clock)
+{
+	if (BIT(m_rs232_baud->read(), 5))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorciser_state::write_f11_clock)
+{
+	if (BIT(m_rs232_baud->read(), 6))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+WRITE_LINE_MEMBER(exorciser_state::write_f13_clock)
+{
+	if (BIT(m_rs232_baud->read(), 7))
+	{
+		m_acia->write_txc(state);
+		m_acia->write_rxc(state);
+	}
+}
+
+u8 exorciser_state::main_r(offs_t offset)
+{
+	if (offset == m_stop_address && m_stop_enabled &&
+		!machine().side_effects_disabled())
+	{
+		m_pia_dbg->cb1_w(CLEAR_LINE);
+		m_pia_dbg->cb1_w(ASSERT_LINE);
+		m_pia_dbg->cb1_w(CLEAR_LINE);
+		// The PIA does not connect to the NMI, rather
+		// this triggers some logic that triggers the NMI.
+		// The stop-on-address works with just this.
+		// TODO This logic might have some delay etc?
+		m_mainnmi->in_w<0>(1);
+		m_mainnmi->in_w<0>(0);
+	}
+	if (offset < 0xfffc)
+		return m_banked_space->read_byte(offset);
+	else if (m_restart_count < 2)
+	{
+		// The MAME debugger appears to read here on reset to
+		// initialize the PC, so it is not possible to distinguish a
+		// normal and debug read, so disable this path after the first
+		// two reads irrespective of side effects being enabled.
+		m_restart_count++;
+		if (offset == 0xfffe)
+			return 0xf0;
+		if (offset == 0xffff)
+			return 0x00;
+		return 0;
+	}
+	return m_banked_space->read_byte(offset);
+}
+
+void exorciser_state::main_w(offs_t offset, u8 data)
+{
+	m_banked_space->write_byte(offset, data);
+}
+
+
+// The PROM occupies four addresses 0xfcfc to 0xfcff, decoding A0 and A1. It is
+// used to supply the restart address, the first two reads which will be from
+// 0xfffe and 0xffff are redirected to this PROM.
+//
+// The EXBUG firmware reads 0xfcfd to obtain some ACIA configuation bits. EXBUG
+// 1.1 masks out all bits except 0x75, and EXBUG 1.2 masks out all bits except
+// 0x7f.
+//
+// The A2 input comes from a circuit that selects the number of stop bits,
+// however this might have only been effective at 150 baud. These are config
+// options here, as if that small PROM was configured to the desired serial
+// protocol settings. Since EXBUG 1.1 masks more of these bits is has less
+// effective options.
+//
+// Input A3 is connected to the /IRQ line and has the effect of setting high
+// bits in the byte read from 0xfcfd to allow probing of the /IRQ line. This
+// feature does not appear to be used by EXBUG.
+//
+// Input A4 is a static level selectable via jumpers and when clear all reads
+// from 0xfcfc to 0xfcff appear to return zero in the default PROM.
+u8 exorciser_state::prom_r(offs_t offset)
+{
+	switch (offset)
+	{
+	case 0:
+		return 0;
+	case 1: {
+		u8 byte = m_rs232_config->read();;
+		if (!m_irq)
+			byte |= 0xf0;
+		return byte;
+	}
+	case 2:
+		// Restart vector
+		return 0xf0;
+	case 3:
+		return 0x00;
+	}
+
+	return 0;
+}
+
+
+void exorciser_state::pia_dbg_pa_w(u8 data)
+{
+	m_stop_address = (m_stop_address & 0xff00) | data;
+}
+
+WRITE_LINE_MEMBER(exorciser_state::abort_key_w)
+{
+	m_pia_dbg->ca1_w(!state);
+	m_mainnmi->input_merger_device::in_w<2>(state);
+}
+
+READ_LINE_MEMBER(exorciser_state::pia_dbg_ca1_r)
+{
+	return !m_abort_key->read();
+}
+
+void exorciser_state::pia_dbg_pb_w(u8 data)
+{
+	m_stop_address = (m_stop_address & 0x00ff) | (data << 8);
+}
+
+WRITE_LINE_MEMBER(exorciser_state::pia_dbg_ca2_w)
+{
+	m_stop_enabled = !state;
+}
+
+
+void exorciser_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	switch (id)
+	{
+	case TIMER_TRACE:
+		m_mainnmi->input_merger_device::in_w<1>(ASSERT_LINE);
+		break;
+	default:
+		throw emu_fatalerror("Unknown id in exorciser_state::device_timer");
+	}
+}
+
+// Note the trace timer delay is actually 11 cycles, but is stretched to 16
+// cycles here to get it working. This is necessary because of inaccurate
+// cycle timing in the 6800 emulation, so change the delay to 11 cycles when
+// the cycle emulation is more accurate.
+WRITE_LINE_MEMBER(exorciser_state::pia_dbg_cb2_w)
+{
+	if (state)
+	{
+		// The trace timer needs to scale with the CPU clock.
+		uint32_t maincpu_clock = m_maincpu_clock->read();
+		if (!maincpu_clock)
+			maincpu_clock = 10000000;
+
+		timer_set(attotime::from_ticks(16, maincpu_clock), TIMER_TRACE);
+	}
+	else
+		m_mainnmi->input_merger_device::in_w<1>(CLEAR_LINE);
+}
+
+
+
+void exorciser_state::pia_lpt_pa_w(u8 data)
+{
+	// External parallel printer data output.
+	m_printer_data = data;
+}
+
+int exorciser_state::pia_lpt_ca1_r()
+{
+	// External parallel printer busy input.
+	return 0;
+}
+
+void exorciser_state::pia_lpt_ca2_w(int state)
+{
+	// External parallel printer data ready.
+
+	// Trigger on the falling edge.
+	if (m_printer_data_ready == 1 && state == 0)
+	{
+		m_printer->output(m_printer_data);
+		// Toggle the printer busy line as the software waits for a
+		// low to high transition.
+		m_pia_lpt->ca1_w(CLEAR_LINE);
+		m_pia_lpt->ca1_w(ASSERT_LINE);
+		m_pia_lpt->ca1_w(CLEAR_LINE);
+	}
+	m_printer_data_ready = state;
+}
+
+
+uint8_t exorciser_state::pia_lpt_pb_r()
+{
+	// The printer driver expects the low two bits to be 01 for a printer
+	// attempt to succeed.
+	return 1;
+}
+
+
+FLOPPY_FORMATS_MEMBER( exorciser_state::floppy_formats )
+	FLOPPY_MFI_FORMAT,
+	FLOPPY_MDOS_FORMAT
+FLOPPY_FORMATS_END
+
+
+static void mdos_floppies(device_slot_interface &device)
+{
+	device.option_add("8sssd",  FLOPPY_8_SSSD);       // 77 trks ss sd 8"
+	device.option_add("8dssd",  FLOPPY_8_DSSD);       // 77 trks ds sd 8"
+}
+
+
+WRITE_LINE_MEMBER(exorciser_state::irq_line_w)
+{
+	m_maincpu->set_input_line(M6800_IRQ_LINE, state);
+	m_irq = state;
+}
+
+void exorciser_state::machine_reset()
+{
+	uint32_t maincpu_clock = m_maincpu_clock->read();
+	if (maincpu_clock)
+		m_maincpu->set_clock(maincpu_clock);
+
+	m_brg->rsa_w(0);
+	m_brg->rsb_w(1);
+
+	m_restart_count = 0;
+
+	m_fdc->set_floppies_4(m_floppy0, m_floppy1, m_floppy2, m_floppy3);
+
+	m_irq = 1;
+	m_stop_address = 0x0000;
+	m_stop_enabled = 0;
+
+	m_printer_data = 0;
+	m_printer_data_ready = 1;
+	m_pia_lpt->ca1_w(CLEAR_LINE);
+
+}
+
+void exorciser_state::machine_start()
+{
+	m_banked_space = &subdevice<address_map_bank_device>("bankdev")->space(AS_PROGRAM);
+
+	save_item(NAME(m_restart_count));
+	save_item(NAME(m_irq));
+	save_item(NAME(m_stop_address));
+	save_item(NAME(m_stop_enabled));
+	save_item(NAME(m_printer_data));
+	save_item(NAME(m_printer_data_ready));
+}
+
+static DEVICE_INPUT_DEFAULTS_START(exorterm)
+	DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_9600)
+	DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_9600)
+	DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1)
+	DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8)
+	DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE)
+	DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1)
+DEVICE_INPUT_DEFAULTS_END
+
+static DEVICE_INPUT_DEFAULTS_START(printer)
+	DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_9600)
+	DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_9600)
+	DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1)
+	DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8)
+	DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_NONE)
+	DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1)
+DEVICE_INPUT_DEFAULTS_END
+
+#include "bus/rs232/exorterm.h"
+#include "bus/rs232/null_modem.h"
+#include "bus/rs232/pty.h"
+#include "bus/rs232/terminal.h"
+
+void exorciser_state::exorciser_rs232_devices(device_slot_interface &device)
+{
+	device.option_add("exorterm155", SERIAL_TERMINAL_EXORTERM155);
+	device.option_add("null_modem", NULL_MODEM);
+	device.option_add("terminal", SERIAL_TERMINAL);
+	device.option_add("pty", PSEUDO_TERMINAL);
+}
+
+void exorciser_state::exorciser(machine_config &config)
+{
+	/* basic machine hardware */
+	M6800(config, m_maincpu, 10000000);
+	m_maincpu->set_addrmap(AS_PROGRAM, &exorciser_state::dbg_map);
+
+	ADDRESS_MAP_BANK(config, m_bankdev, 0);
+	m_bankdev->set_endianness(ENDIANNESS_BIG);
+	m_bankdev->set_data_width(8);
+	m_bankdev->set_addr_width(16);
+	m_bankdev->set_addrmap(AS_PROGRAM, &exorciser_state::mem_map);
+
+	INPUT_MERGER_ANY_HIGH(config, m_mainirq).output_handler().set(FUNC(exorciser_state::irq_line_w));
+	INPUT_MERGER_ANY_HIGH(config, m_mainnmi).output_handler().set_inputline(m_maincpu, INPUT_LINE_NMI);
+
+	MC14411(config, m_brg, XTAL(1'843'200));
+	m_brg->out_f<1>().set(FUNC(exorciser_state::write_f1_clock));
+	m_brg->out_f<3>().set(FUNC(exorciser_state::write_f3_clock));
+	m_brg->out_f<7>().set(FUNC(exorciser_state::write_f7_clock));
+	m_brg->out_f<8>().set(FUNC(exorciser_state::write_f8_clock));
+	m_brg->out_f<9>().set(FUNC(exorciser_state::write_f9_clock));
+	m_brg->out_f<13>().set(FUNC(exorciser_state::write_f13_clock));
+
+	ACIA6850(config, m_acia, 0);
+	m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
+	m_acia->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
+
+	rs232_port_device &rs232(RS232_PORT(config, "rs232", exorciser_state::exorciser_rs232_devices, "exorterm155"));
+	rs232.rxd_handler().set(m_acia, FUNC(acia6850_device::write_rxd));
+	rs232.set_option_device_input_defaults("exorterm155", DEVICE_INPUT_DEFAULTS_NAME(exorterm));
+
+	PIA6821(config, m_pia_dbg, 0);
+	m_pia_dbg->writepa_handler().set(FUNC(exorciser_state::pia_dbg_pa_w));
+	m_pia_dbg->readca1_handler().set(FUNC(exorciser_state::pia_dbg_ca1_r));
+	m_pia_dbg->writepb_handler().set(FUNC(exorciser_state::pia_dbg_pb_w));
+	m_pia_dbg->ca2_handler().set(FUNC(exorciser_state::pia_dbg_ca2_w));
+	m_pia_dbg->cb2_handler().set(FUNC(exorciser_state::pia_dbg_cb2_w));
+
+	// MEX68PI Parallel printer port
+	PIA6821(config, m_pia_lpt, 0);
+	m_pia_lpt->writepa_handler().set(FUNC(exorciser_state::pia_lpt_pa_w));
+	m_pia_lpt->readca1_handler().set(FUNC(exorciser_state::pia_lpt_ca1_r));
+	m_pia_lpt->ca2_handler().set(FUNC(exorciser_state::pia_lpt_ca2_w));
+	m_pia_lpt->readpb_handler().set(FUNC(exorciser_state::pia_lpt_pb_r));
+
+	PRINTER(config, m_printer, 0);
+
+	// MEX6850? Serial printer port
+	ACIA6850(config, m_acia_prn, 0);
+	m_acia_prn->txd_handler().set("rs232_prn", FUNC(rs232_port_device::write_txd));
+
+	rs232_port_device &rs232_prn(RS232_PORT(config, "rs232_prn", default_rs232_devices, "printer"));
+	rs232_prn.rxd_handler().set(m_acia_prn, FUNC(acia6850_device::write_rxd));
+	rs232_prn.set_option_device_input_defaults("printer", DEVICE_INPUT_DEFAULTS_NAME(printer));
+
+	M68SFDC(config, m_fdc, 0);
+	m_fdc->irq_handler().set(m_mainirq, FUNC(input_merger_device::in_w<0>));
+	m_fdc->nmi_handler().set(m_mainnmi, FUNC(input_merger_device::in_w<3>));
+
+	FLOPPY_CONNECTOR(config, m_floppy0, mdos_floppies, "8dssd", exorciser_state::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, m_floppy1, mdos_floppies, "8dssd", exorciser_state::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, m_floppy2, mdos_floppies, "8dssd", exorciser_state::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, m_floppy3, mdos_floppies, "8dssd", exorciser_state::floppy_formats).enable_sound(true);
+
+}
+
+/* ROM definition */
+ROM_START( exorciser )
+	ROM_REGION( 0x0400, "68fdc2", 0 )
+	// Later MDOS versions support four double sided disk drives, but these
+	// ROMs only support two singled sided disk drives. These ROMs are hard
+	// coded for 26 sectors per track and up to 2002 sectors fill in the 77
+	// tracks. Both these ROM versions appear to have largely compatible
+	// entry points. The MDOS equate file calls this the Disk EROM.
+	//
+	// Various MDOS commands, such a 'format' and 'dosgen' probe this ROM
+	// at 0xebfe and 0xebff and use the contents to select between
+	// operating modes and features. There are clearly some ROMs supported
+	// by MDOS that are not represented here. If 0xebff has 'E' then the
+	// MDOS FORMAT command errors out. If 0xebff has 'C' then the 'write
+	// enabled' input is interpreted as being an active low write protect
+	// input, otherwise it is interpreted as being an active low write
+	// enabled input. If 0xebff has 'C' or 0xebfe has 0x11 or 0x12 then
+	// disks are formatted single sided otherwise PA5 is consulted.
+	//
+	// The MDOS code, such as DOSGEN, expects the byte at $000d to have bit
+	// 7 set for single sided and clear for double sided disks, yet these
+	// ROMs clear this bit. For DOSGEN this can be worked around with these
+	// ROMs by locking out the sectors that would have been allocated
+	// beyond the single sided disk extent, so lock out 0x7d0 to 0xfa0. The
+	// FORMAT command does not look at this bit so is not affected by this
+	// issue. Clearly neither of these ROMs was intended to work cleanly
+	// with MDOS 3 even using single sided disks.
+	//
+	// So it would be great if a ROM can be found that supports double
+	// sided disks, but if not then there appears to be enough known to
+	// write a ROM to work with MDOS. The ROM is tightly written already,
+	// and it is not clear how well double sided support was implemented,
+	// but the ROM accepts logical sector numbers and to work with both
+	// single and double sided disks it may need to firstly try a double
+	// sided operation and if that fails then to fall back to try a single
+	// sided operation and to set the 0x000d flag appropriately. Note that
+	// the FORMAT command does not bother to set the 'side' in the address
+	// marks, so the ROM should ignore that or expect it to be
+	// zero. Support also needs to be added for four drives which is just a
+	// matter of setting the 'select 2' output based on bit 1 of 0x0000 and
+	// updating the bounds check.
+	//
+	// The code compression techniques used in this disk driver code are
+	// edifying, generally reusing code well. For example, flags are used
+	// to make subtle changes in code paths to reuse many paths. Test or
+	// comparison instructions are used to probe I/O addresses without
+	// destroying an accumulator to reduce register pressure.
+	//
+	// Good use is made of instructions with overlapping
+	// interpretations. For example, placing small instructions in the
+	// operands of other instructions where they become effectively a NOP
+	// and this saves on branching. Two byte instructions such as loading
+	// an accumulator are placed in the 16 bit immediate argument of a
+	// three byte instruction, or one byte instructions such as a shift or
+	// rotate are placed in the immediate argument of a two byte
+	// instruction.
+	//
+	// This version supports two single sided disk drives. The use of the
+	// 'step' and 'direction' lines is conventional. It interprets a high
+	// on the 'write enabled' input as an active low write protected
+	// input. It drives a serial printer using a 6850 ACIA at $ec26-ec27,
+	// which is configured for 8 bits, no parity, and 1 stop bit, and
+	// clocked at 9600 baud here, and it supports XON-XOFF software flow
+	// control. The last byte of this ROM has been patched from 0x00 to
+	// 0x43 to work with the MDOS feature detection code.
+	//
+	ROM_LOAD("diskeromv2.bin", 0x0000, 0x0400, CRC(09b1e724) SHA1(59b54ded1f9a7266c1f12da37f700b4b478b84bc))
+
+	// This version supports two single sided disk drives. It toggles the
+	// 'step' line low to step towards track 0 and toggles the 'direction'
+	// line low to step away from track 0. It interprets a high on the
+	// 'write enabled' input as an active low write enabled input rather
+	// than an active low write protected input. It drives a parallel
+	// printer using a 6821 PIA at $ec10-ex13. The last two bytes of this
+	// PROM are 0x07 and 0x50 ('P') - these codes are probed by some MDOS
+	// commands to select different operation and features.
+	//ROM_LOAD("diskeromv1.bin", 0x0000, 0x0400, CRC(87bf9b0d) SHA1(dbcce885d21b418a08812234d1581ac101f32536))
+
+	ROM_REGION( 0x0c00, "exbug", 0 )
+	// EXBUG 1.2 adds support for the 'S240' command another punch tape
+	// protocol, and a 'TERM' command which accepts a 15 bit hex number as
+	// a terminal output delay between characters.
+	ROM_DEFAULT_BIOS("exbug12")
+	ROM_SYSTEM_BIOS(0, "exbug12", "EXBUG version 1.2")
+	ROMX_LOAD("exbug12.bin", 0x0000, 0x0c00, CRC(c002759b) SHA1(0f63d75148e82fb0b9ce7d64b91464523937e0b7), ROM_BIOS(0))
+	ROM_SYSTEM_BIOS(1, "exbug11", "EXBUG version 1.1")
+	ROMX_LOAD("exbug11.bin", 0x0000, 0x0c00, CRC(5a5db110) SHA1(14f3e14ed809f9ec30b8189e5506ed911127de34), ROM_BIOS(1))
+
+ROM_END
+
+/* Driver */
+
+//    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY                                     FULLNAME      FLAGS
+COMP( 1975, exorciser,  0,      0,      exorciser,   exorciser, exorciser_state, empty_init, "Motorola", "M6800 EXORciser (M68SDT)", MACHINE_NO_SOUND_HW )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/exorterm.cpp mame-0.224+dfsg.1/src/mame/drivers/exorterm.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/exorterm.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/exorterm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,58 @@
+// license:BSD-3-Clause
+// copyright-holders: 68bit
+/****************************************************************************
+
+    Stand alone front end for the Motorola EXORterm 155 (M68SDS)
+
+****************************************************************************/
+
+#include "emu.h"
+#include "machine/exorterm.h"
+#include "bus/rs232/rs232.h"
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class exorterm155_state : public driver_device
+{
+public:
+	exorterm155_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_exorterm155(*this, "exorterm155")
+		, m_host(*this, "host")
+	{ }
+
+	void exorterm155(machine_config &config);
+
+private:
+	required_device<exorterm155_device> m_exorterm155;
+	required_device<rs232_port_device> m_host;
+};
+
+void exorterm155_state::exorterm155(machine_config &config)
+{
+	EXORTERM155(config, m_exorterm155, 0);
+
+	RS232_PORT(config, m_host, default_rs232_devices, nullptr);
+	m_host->dcd_handler().set(m_exorterm155, FUNC(exorterm155_device::rs232_conn_dcd_w));
+	m_host->dsr_handler().set(m_exorterm155, FUNC(exorterm155_device::rs232_conn_dsr_w));
+	m_host->ri_handler().set(m_exorterm155, FUNC(exorterm155_device::rs232_conn_ri_w));
+	m_host->cts_handler().set(m_exorterm155, FUNC(exorterm155_device::rs232_conn_cts_w));
+	m_host->rxd_handler().set(m_exorterm155, FUNC(exorterm155_device::rs232_conn_rxd_w));
+
+	m_exorterm155->rs232_conn_txd_handler().set(m_host, FUNC(rs232_port_device::write_txd));
+	m_exorterm155->rs232_conn_dtr_handler().set(m_host, FUNC(rs232_port_device::write_dtr));
+	m_exorterm155->rs232_conn_rts_handler().set(m_host, FUNC(rs232_port_device::write_rts));
+}
+
+
+ROM_START(exorterm155)
+ROM_END
+
+//**************************************************************************
+//  SYSTEM DRIVERS
+//**************************************************************************
+
+//    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS         INIT        COMPANY  FULLNAME    FLAGS
+COMP( 1979, exorterm155,  0,      0,      exorterm155,  0,  exorterm155_state,  empty_init, "Motorola",  "EXORterm 155",  MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/fidel_cc1.cpp mame-0.224+dfsg.1/src/mame/drivers/fidel_cc1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/fidel_cc1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/fidel_cc1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4,11 +4,9 @@
 /******************************************************************************
 
 Fidelity's 1st generation chess computers:
-- *Chess Challenger
+- Chess Challenger
 - Chess Challenger (upgraded version) - more commonly known as CC3
-- *Chess Challenger (model UCC10) - more commonly known as CC10 ver. C
-
-* denotes not dumped (actually CC1 is dumped, but with half of the contents missing)
+- Chess Challenger (model UCC10) - more commonly known as CC10 ver. C
 
 The first generation of chesscomputers didn't have an electronic chessboard.
 Some of them required a separate chessboard, others had a small chessboard
@@ -22,7 +20,7 @@
 
 That being said, it's probably a better idea to use a real chessboard.
 
-*******************************************************************************
+===============================================================================
 
 Chess Challenger (1)
 --------------------
@@ -40,15 +38,15 @@
 - NEC 8080AF @ 2MHz(18MHz XTAL through a 8224)
 - Everything goes via a NEC B8228, its special features are unused.
 - NEC 2316A ROM(2KB), 4*2101AL RAM(0.5KB total)
-- 8255C for I/O, 4*7seg display + 2 extra leds, 12-key keypad
+- 8255C for I/O, 4*7seg display + 2 extra leds, 12-key keypad, no sound
 
 Chess Challenger (upgraded version) released a few months later is on the same
 hardware, but with double the ROM size, and they corrected the reversed chess
 notation. It was also offered as an upgrade to CC1. PCB label P179 C-3 9.77.
 
 Chess Challenger (model UCC10) is on nearly the same PCB too, same label as CC3,
-with a small daughterboard for 8KB ROM. Again, it was also offered as an upgrade
-to CC1, or CC3.
+with an 8KB ROM on a small daughterboard(P-410A 4 12 79). Again, it was also
+offered as an upgrade to CC1, or CC3.
 
 Note that although these 2 newer versions are known as "Chess Challenger 3" and
 "Chess Challeger 10 C" nowadays, those are not the official titles. CC3 simply
@@ -69,6 +67,7 @@
 // internal artwork
 #include "fidel_cc1.lh" // clickable
 #include "fidel_cc3.lh" // clickable
+#include "fidel_cc10c.lh" // clickable
 
 
 namespace {
@@ -91,6 +90,7 @@
 	// machine configs
 	void cc1(machine_config &config);
 	void cc3(machine_config &config);
+	void cc10c(machine_config &config);
 
 protected:
 	virtual void machine_start() override;
@@ -106,6 +106,7 @@
 	// address maps
 	void main_map(address_map &map);
 	void main_io(address_map &map);
+	void cc10c_map(address_map &map);
 
 	// I/O handlers
 	void update_display();
@@ -113,16 +114,12 @@
 	void ppi_portb_w(u8 data);
 	void ppi_portc_w(u8 data);
 
-	u8 m_led_select;
-	u8 m_7seg_data;
+	u8 m_led_select = 0;
+	u8 m_7seg_data = 0;
 };
 
 void cc1_state::machine_start()
 {
-	// zerofill
-	m_led_select = 0;
-	m_7seg_data = 0;
-
 	// register for savestates
 	save_item(NAME(m_led_select));
 	save_item(NAME(m_7seg_data));
@@ -147,6 +144,7 @@
 	// 74148(priority encoder) I0-I7: inputs
 	// d0-d2: 74148 S0-S2, d3: 74148 GS
 	u8 data = count_leading_zeros(m_inputs[0]->read()) - 24;
+	if (data == 8) data = 0xf;
 
 	// d5-d7: more inputs (direct)
 	data |= ~m_inputs[1]->read() << 5 & 0xe0;
@@ -193,6 +191,14 @@
 	map(0x00, 0x03).mirror(0x04).rw(m_ppi8255, FUNC(i8255_device::read), FUNC(i8255_device::write));
 }
 
+void cc1_state::cc10c_map(address_map &map)
+{
+	map.global_mask(0x3fff);
+	map(0x0000, 0x0fff).rom();
+	map(0x1000, 0x11ff).mirror(0x2e00).ram();
+	map(0x2000, 0x2fff).rom();
+}
+
 
 
 /******************************************************************************
@@ -233,6 +239,13 @@
 	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("A1") PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD) PORT_CODE(KEYCODE_A)
 INPUT_PORTS_END
 
+static INPUT_PORTS_START( cc10c )
+	PORT_INCLUDE( cc3 )
+
+	PORT_MODIFY("IN.1")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_NAME("DM / PB") PORT_CODE(KEYCODE_M)
+INPUT_PORTS_END
+
 
 
 /******************************************************************************
@@ -267,6 +280,16 @@
 	config.set_default_layout(layout_fidel_cc3);
 }
 
+void cc1_state::cc10c(machine_config &config)
+{
+	cc1(config);
+
+	/* basic machine hardware */
+	m_maincpu->set_addrmap(AS_PROGRAM, &cc1_state::cc10c_map);
+
+	config.set_default_layout(layout_fidel_cc10c);
+}
+
 
 
 /******************************************************************************
@@ -274,13 +297,19 @@
 ******************************************************************************/
 
 ROM_START( cc1 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "d2316ac_011", 0x0000, 0x0800, BAD_DUMP CRC(e27f9816) SHA1(ad9881b3bf8341829a27e86de27805fc2ccb5f7d) ) // A4 line was broken
+	ROM_REGION(0x10000, "maincpu", ROMREGION_ERASEFF)
+	ROM_LOAD("d2316ac_011", 0x0000, 0x0800, CRC(4af38ed6) SHA1(3f07691266196f3aa5c440a40bfe4802303e7c07) )
 ROM_END
 
 ROM_START( cc3 )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "d2332c_011", 0x0000, 0x1000, CRC(51cf4682) SHA1(197374c633a0bf1a9b7ea51a72dc2b89a6c9c508) )
+	ROM_REGION(0x10000, "maincpu", 0)
+	ROM_LOAD("d2332c_011", 0x0000, 0x1000, CRC(51cf4682) SHA1(197374c633a0bf1a9b7ea51a72dc2b89a6c9c508) )
+ROM_END
+
+ROM_START( cc10c )
+	ROM_REGION(0x10000, "maincpu", 0)
+	ROM_LOAD("k95069-922_ucc_10", 0x0000, 0x1000, CRC(2232c1c4) SHA1(fd282ba7ce7ac28834c860cec2cca398aec1b3f3) )
+	ROM_CONTINUE(                 0x2000, 0x1000 )
 ROM_END
 
 } // anonymous namespace
@@ -291,6 +320,7 @@
     Drivers
 ******************************************************************************/
 
-//    YEAR  NAME  PARENT CMP MACHINE  INPUT  STATE      INIT        COMPANY, FULLNAME, FLAGS
-CONS( 1977, cc1,  0,      0, cc1,     cc1,   cc1_state, empty_init, "Fidelity Electronics", "Chess Challenger", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NO_SOUND_HW | MACHINE_NOT_WORKING )
-CONS( 1977, cc3,  0,      0, cc3,     cc3,   cc1_state, empty_init, "Fidelity Electronics", "Chess Challenger (upgraded version, 3 levels)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NO_SOUND_HW ) // aka Chess Challenger 3
+//    YEAR  NAME   PARENT CMP MACHINE  INPUT  STATE      INIT        COMPANY, FULLNAME, FLAGS
+CONS( 1977, cc1,   0,      0, cc1,     cc1,   cc1_state, empty_init, "Fidelity Electronics", "Chess Challenger", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NO_SOUND_HW )
+CONS( 1977, cc3,   0,      0, cc3,     cc3,   cc1_state, empty_init, "Fidelity Electronics", "Chess Challenger (upgraded version, 3 levels)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NO_SOUND_HW ) // aka Chess Challenger 3
+CONS( 1979, cc10c, 0,      0, cc10c,   cc10c, cc1_state, empty_init, "Fidelity Electronics", "Chess Challenger (model UCC10, 10 levels)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_NO_SOUND_HW ) // aka Chess Challenger 10 C
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/fidel_csc.cpp mame-0.224+dfsg.1/src/mame/drivers/fidel_csc.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/fidel_csc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/fidel_csc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,6 +12,8 @@
 TODO:
 - dump/add original csce
 - hook up csce I/O properly, it doesn't have PIAs
+- IRQ Tlow duration, on csc it was measured and turned out to be 73.425us
+  but that's too long csce and super9cc
 
 *******************************************************************************
 
@@ -25,17 +27,17 @@
 0800-0FFF: 1K of RAM (note: mirrored twice)
 1000-17FF: PIA 1 (display, TSI speech chip)
 1800-1FFF: PIA 0 (keypad, LEDs)
-2000-3FFF: 101-64019 ROM*
+2000-3FFF: 101-64019 or 101-1025A04 ROM*
 4000-7FFF: mirror of 0000-3FFF
 8000-9FFF: not used
-A000-BFFF: 101-1025A03 ROM
+A000-BFFF: 101-1025A03 ROM (A12 tied high)
 C000-DFFF: 101-1025A02 ROM
 E000-FDFF: 101-1025A01 ROM
-FE00-FFFF: 512 byte 74S474 PROM
+FE00-FFFF: 512 byte 74S474 or N82S141N PROM
 
 *: 101-64019 is also used on the VSC(fidel_vsc.cpp). It contains the opening book
 and "64 greatest games", as well as some Z80 code. Obviously the latter is unused
-on the CSC.
+on the CSC. Also seen with 101-1025A04 label, same ROM contents.
 
 CPU is a 6502 running at 1.95MHz (3.9MHz resonator, divided by 2)
 
@@ -516,7 +518,8 @@
 	map(0x1000, 0x1003).mirror(0x47fc).rw(m_pia[1], FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 	map(0x1800, 0x1803).mirror(0x47fc).rw(m_pia[0], FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 	map(0x2000, 0x3fff).mirror(0x4000).rom();
-	map(0xa000, 0xffff).rom();
+	map(0xa000, 0xafff).mirror(0x1000).rom();
+	map(0xc000, 0xffff).rom();
 }
 
 void csc_state::su9_map(address_map &map)
@@ -719,7 +722,8 @@
 ROM_START( csc )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD("101-64019",   0x2000, 0x2000, CRC(08a3577c) SHA1(69fe379d21a9d4b57c84c3832d7b3e7431eec341) )
-	ROM_LOAD("101-1025a03", 0xa000, 0x2000, CRC(63982c07) SHA1(5ed4356323d5c80df216da55994abe94ba4aa94c) )
+	ROM_LOAD("101-1025a03", 0xa000, 0x1000, CRC(63982c07) SHA1(5ed4356323d5c80df216da55994abe94ba4aa94c) )
+	ROM_CONTINUE(           0xa000, 0x1000 ) // 1st half empty
 	ROM_LOAD("101-1025a02", 0xc000, 0x2000, CRC(9e6e7c69) SHA1(4f1ed9141b6596f4d2b1217d7a4ba48229f3f1b0) )
 	ROM_LOAD("101-1025a01", 0xe000, 0x2000, CRC(57f068c3) SHA1(7d2ac4b9a2fba19556782863bdd89e2d2d94e97b) )
 	ROM_LOAD("74s474",      0xfe00, 0x0200, CRC(4511ba31) SHA1(e275b1739f8c3aa445cccb6a2b597475f507e456) )
@@ -822,7 +826,7 @@
 
 //    YEAR  NAME      PARENT CMP MACHINE  INPUT  STATE      INIT        COMPANY, FULLNAME, FLAGS
 CONS( 1981, csc,      0,      0, csc,      csc,  csc_state, empty_init, "Fidelity Electronics", "Champion Sensory Chess Challenger", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1981, csce,     0,      0, csce,     csc,  csc_state, empty_init, "Fidelity Electronics", "Elite Champion Challenger (Travemuende version)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1981, csce,     0,      0, csce,     csc,  csc_state, empty_init, "Fidelity Electronics", u8"Elite Champion Challenger (Travemünde version)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 
 CONS( 1983, super9cc, 0,      0, su9,      su9,  su9_state, empty_init, "Fidelity Electronics", "Super \"9\" Sensory Chess Challenger", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/fidel_elite.cpp mame-0.224+dfsg.1/src/mame/drivers/fidel_elite.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/fidel_elite.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/fidel_elite.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,7 +10,7 @@
 - add feas (original program)
 
 BTANB:
-- feasglaa locks up at boot if it was powered off in the middle of the game.
+- feasglab locks up at boot if it was powered off in the middle of the game.
   To resolve this, hold the Game Control button while booting to clear nvram.
   The ROM dump was verified from 2 chesscomputers.
 
@@ -35,6 +35,7 @@
 
 *In West Germany, some distributors released it with overclocked CPUs,
 advertised as 3.2, 3.6, or 4MHz. Unmodified EAS PCB photos show only a 3MHz XTAL.
+Though model EAS-C(Glasgow) had a 4MHz XTAL
 
 A condensator/battery keeps RAM contents alive for a while when powered off.
 Note that EAS doesn't have a "new game" button, it is done through game options:
@@ -108,9 +109,14 @@
 	// machine configs
 	void pc(machine_config &config);
 	void eas(machine_config &config);
+	void easc(machine_config &config);
+
+	DECLARE_INPUT_CHANGED_MEMBER(switch_cpu_freq) { set_cpu_freq(); }
 
 protected:
 	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	void set_cpu_freq();
 
 	// devices/pointers
 	required_device<timer_device> m_irq_on;
@@ -166,6 +172,20 @@
 	save_item(NAME(m_speech_bank));
 }
 
+void elite_state::machine_reset()
+{
+	set_cpu_freq();
+	fidel_clockdiv_state::machine_reset();
+}
+
+void elite_state::set_cpu_freq()
+{
+	// known official CPU speeds: 3MHz(EAS/EWC?), 3.57MHz(PC/Privat), 4MHz(PC/EAS-C)
+	u8 inp = ioport("FAKE")->read();
+	m_maincpu->set_unscaled_clock((inp & 2) ? 4_MHz_XTAL : ((inp & 1) ? 3.579545_MHz_XTAL : 3_MHz_XTAL));
+	div_refresh();
+}
+
 // EAG
 
 class eag_state : public elite_state
@@ -183,6 +203,9 @@
 
 	void init_eag2100();
 
+protected:
+	virtual void machine_reset() override;
+
 private:
 	// address maps
 	void eag_map(address_map &map);
@@ -194,6 +217,13 @@
 	m_rombank->configure_entries(0, 4, memregion("rombank")->base(), 0x2000);
 }
 
+void eag_state::machine_reset()
+{
+	fidel_clockdiv_state::machine_reset();
+	if (m_rombank != nullptr)
+		m_rombank->set_entry(0);
+}
+
 
 
 /******************************************************************************
@@ -381,11 +411,27 @@
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_M) PORT_NAME("DM")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_DEL) PORT_NAME("CL")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_V) PORT_NAME("RV")
+
+	PORT_START("FAKE")
+	PORT_CONFNAME( 0x03, 0x00, "CPU Frequency" ) PORT_CHANGED_MEMBER(DEVICE_SELF, elite_state, switch_cpu_freq, 0) // factory set
+	PORT_CONFSETTING(    0x00, "3MHz (original)" )
+	PORT_CONFSETTING(    0x01, "3.57MHz (Privat)" )
+	PORT_CONFSETTING(    0x02, "4MHz (Glasgow)" )
 INPUT_PORTS_END
 
-static INPUT_PORTS_START( pc )
+static INPUT_PORTS_START( easc )
 	PORT_INCLUDE( eas )
 
+	PORT_MODIFY("FAKE") // default to 4MHz
+	PORT_CONFNAME( 0x03, 0x02, "CPU Frequency" ) PORT_CHANGED_MEMBER(DEVICE_SELF, elite_state, switch_cpu_freq, 0) // factory set
+	PORT_CONFSETTING(    0x00, "3MHz (original)" )
+	PORT_CONFSETTING(    0x01, "3.57MHz (Privat)" )
+	PORT_CONFSETTING(    0x02, "4MHz (Glasgow)" )
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( pc )
+	PORT_INCLUDE( easc )
+
 	PORT_MODIFY("IN.0")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_R) PORT_NAME("Reset") // led display still says - G C -
 INPUT_PORTS_END
@@ -450,12 +496,11 @@
 	SOFTWARE_LIST(config, "cart_list").set_original("fidel_scc");
 }
 
-void elite_state::eas(machine_config &config)
+void elite_state::easc(machine_config &config)
 {
 	pc(config);
 
 	/* basic machine hardware */
-	m_maincpu->set_clock(3_MHz_XTAL);
 	m_mainmap->set_addrmap(AS_PROGRAM, &elite_state::eas_map);
 
 	I8255(config, m_ppi8255); // port B: input, port A & C: output
@@ -471,6 +516,12 @@
 	config.set_default_layout(layout_fidel_eas);
 }
 
+void elite_state::eas(machine_config &config)
+{
+	easc(config);
+	m_maincpu->set_clock(3_MHz_XTAL);
+}
+
 void eag_state::eag(machine_config &config)
 {
 	eas(config);
@@ -568,7 +619,43 @@
 	ROMX_LOAD("101-64106", 0x0000, 0x2000, CRC(8766e128) SHA1(78c7413bf240159720b131ab70bfbdf4e86eb1e9), ROM_BIOS(3) )
 ROM_END
 
-ROM_START( feasglaa )
+ROM_START( feasglaa ) // model EAS-C
+	ROM_REGION( 0x10000, "mainmap", 0 )
+	ROM_LOAD("orange", 0x8000, 0x0800, CRC(32784e2d) SHA1(dae060a5c49cc1993a78db293cd80464adfd892d) )
+	ROM_CONTINUE( 0x9000, 0x0800 )
+	ROM_CONTINUE( 0x8800, 0x0800 )
+	ROM_CONTINUE( 0x9800, 0x0800 )
+	ROM_LOAD("black", 0xc000, 0x0800, CRC(3f0b01b6) SHA1(fe8d214f1678e000ba945e2f6dc3438af97c6f33) ) // only 2 bytes different
+	ROM_CONTINUE( 0xd000, 0x0800 )
+	ROM_CONTINUE( 0xc800, 0x0800 )
+	ROM_CONTINUE( 0xd800, 0x0800 )
+	ROM_LOAD("green", 0xe000, 0x0800, CRC(62a5305a) SHA1(a361bd9a54b903d7b0fbacabe55ea5ccbbc1dc51) )
+	ROM_CONTINUE( 0xf000, 0x0800 )
+	ROM_CONTINUE( 0xe800, 0x0800 )
+	ROM_CONTINUE( 0xf800, 0x0800 )
+
+	// speech ROM
+	ROM_DEFAULT_BIOS("en")
+	ROM_SYSTEM_BIOS(0, "en", "English")
+	ROM_SYSTEM_BIOS(1, "de", "German")
+	ROM_SYSTEM_BIOS(2, "fr", "French")
+	ROM_SYSTEM_BIOS(3, "sp", "Spanish")
+
+	ROM_REGION( 1, "language", 0 )
+	ROMX_FILL(0, 1, 3, ROM_BIOS(0) )
+	ROMX_FILL(0, 1, 2, ROM_BIOS(1) )
+	ROMX_FILL(0, 1, 1, ROM_BIOS(2) )
+	ROMX_FILL(0, 1, 0, ROM_BIOS(3) )
+
+	ROM_REGION( 0x2000, "speech", 0 )
+	ROMX_LOAD("101-32107", 0x0000, 0x1000, CRC(f35784f9) SHA1(348e54a7fa1e8091f89ac656b4da22f28ca2e44d), ROM_BIOS(0) )
+	ROM_RELOAD(            0x1000, 0x1000)
+	ROMX_LOAD("101-64101", 0x0000, 0x2000, CRC(6c85e310) SHA1(20d1d6543c1e6a1f04184a2df2a468f33faec3ff), ROM_BIOS(1) )
+	ROMX_LOAD("101-64105", 0x0000, 0x2000, CRC(fe8c5c18) SHA1(2b64279ab3747ee81c86963c13e78321c6cfa3a3), ROM_BIOS(2) )
+	ROMX_LOAD("101-64106", 0x0000, 0x2000, CRC(8766e128) SHA1(78c7413bf240159720b131ab70bfbdf4e86eb1e9), ROM_BIOS(3) )
+ROM_END
+
+ROM_START( feasglab )
 	ROM_REGION( 0x10000, "mainmap", 0 )
 	ROM_LOAD("6a", 0x8000, 0x0800, CRC(2fdddb4f) SHA1(6da0a328a45462f285ae6a0756f97c5a43148f97) )
 	ROM_CONTINUE( 0x9000, 0x0800 )
@@ -759,8 +846,9 @@
 
 //    YEAR  NAME       PARENT CMP MACHINE   INPUT  STATE        INIT          COMPANY, FULLNAME, FLAGS
 CONS( 1983, feasbu,    0,      0, eas,      eas,   elite_state, empty_init,   "Fidelity Electronics", "Elite A/S Challenger (Budapest program)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_TIMING )
-CONS( 1984, feasgla,   feasbu, 0, eas,      eas,   elite_state, empty_init,   "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_TIMING )
-CONS( 1984, feasglaa,  feasbu, 0, eas,      eas,   elite_state, empty_init,   "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_TIMING )
+CONS( 1984, feasgla,   feasbu, 0, easc,     easc,  elite_state, empty_init,   "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_TIMING )
+CONS( 1984, feasglaa,  feasbu, 0, easc,     easc,  elite_state, empty_init,   "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_TIMING )
+CONS( 1984, feasglab,  feasbu, 0, easc,     easc,  elite_state, empty_init,   "Fidelity Electronics", "Elite A/S Challenger (Glasgow program, set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_TIMING )
 
 CONS( 1982, fpres,     0,      0, pc,       pc,    elite_state, empty_init,   "Fidelity Electronics", "Prestige Challenger (original program)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_TIMING )
 CONS( 1983, fpresbu,   fpres,  0, pc,       pc,    elite_state, empty_init,   "Fidelity Electronics", "Prestige Challenger (Budapest program)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_TIMING )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/fidel_sc9.cpp mame-0.224+dfsg.1/src/mame/drivers/fidel_sc9.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/fidel_sc9.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/fidel_sc9.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -26,7 +26,8 @@
 - CB9: Challenger Book Openings 1 - 8KB (label not known)
 - CB16: Challenger Book Openings 2 - 8+8KB 101-1042A01,02
 - *CG64: 64 Greatest Games
-- *EOA-EOE: Challenger Book Openings - Chess Encyclopedia A-E (5 modules)
+- *EOA-EOE: Challenger Book Openings: Chess Encyclopedia Volume A-E (5 modules)
+- *TDF: Challenger Book Openings: Tarrasch Defense to the Queen's Gambit
 
 The edge connector has D0-D7, A0-A13, 2 chip select lines, read/write lines, IRQ line.
 IRQ and write strobe are unused. Maximum known size is 16KB.
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/fidel_vcc.cpp mame-0.224+dfsg.1/src/mame/drivers/fidel_vcc.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/fidel_vcc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/fidel_vcc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -159,20 +159,14 @@
 	u8 ppi_portc_r();
 	void ppi_portc_w(u8 data);
 
-	u8 m_led_select;
-	u8 m_7seg_data;
-	u8 m_inp_mux;
-	u8 m_speech_bank;
+	u8 m_led_select = 0;
+	u8 m_7seg_data = 0;
+	u8 m_inp_mux = 0;
+	u8 m_speech_bank = 0;
 };
 
 void vcc_state::machine_start()
 {
-	// zerofill
-	m_led_select = 0;
-	m_7seg_data = 0;
-	m_inp_mux = 0;
-	m_speech_bank = 0;
-
 	// register for savestates
 	save_item(NAME(m_led_select));
 	save_item(NAME(m_7seg_data));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/fidel_vsc.cpp mame-0.224+dfsg.1/src/mame/drivers/fidel_vsc.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/fidel_vsc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/fidel_vsc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -169,7 +169,7 @@
 	vsc_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_irq_on(*this, "irq_on"),
+		m_nmi_on(*this, "nmi_on"),
 		m_z80pio(*this, "z80pio"),
 		m_ppi8255(*this, "ppi8255"),
 		m_board(*this, "board"),
@@ -189,7 +189,7 @@
 private:
 	// devices/pointers
 	required_device<cpu_device> m_maincpu;
-	required_device<timer_device> m_irq_on;
+	required_device<timer_device> m_nmi_on;
 	required_device<z80pio_device> m_z80pio;
 	required_device<i8255_device> m_ppi8255;
 	required_device<sensorboard_device> m_board;
@@ -206,8 +206,8 @@
 	void main_io_trampoline_w(offs_t offset, u8 data);
 
 	// periodic interrupts
-	template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_on) { m_maincpu->set_input_line(Line, ASSERT_LINE); }
-	template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(irq_off) { m_maincpu->set_input_line(Line, CLEAR_LINE); }
+	template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(nmi_on) { m_maincpu->set_input_line(Line, ASSERT_LINE); }
+	template<int Line> TIMER_DEVICE_CALLBACK_MEMBER(nmi_off) { m_maincpu->set_input_line(Line, CLEAR_LINE); }
 
 	// I/O handlers
 	void update_display();
@@ -426,10 +426,10 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &vsc_state::main_map);
 	m_maincpu->set_addrmap(AS_IO, &vsc_state::main_io);
 
-	const attotime irq_period = attotime::from_hz(600); // 555 timer, ideal frequency is 600Hz (measurement was 587Hz)
-	TIMER(config, m_irq_on).configure_periodic(FUNC(vsc_state::irq_on<INPUT_LINE_NMI>), irq_period);
-	m_irq_on->set_start_delay(irq_period - attotime::from_usec(845)); // active for 0.845ms (approx half)
-	TIMER(config, "irq_off").configure_periodic(FUNC(vsc_state::irq_off<INPUT_LINE_NMI>), irq_period);
+	const attotime nmi_period = attotime::from_hz(600); // 555 timer, ideal frequency is 600Hz (measurement was 587Hz)
+	TIMER(config, m_nmi_on).configure_periodic(FUNC(vsc_state::nmi_on<INPUT_LINE_NMI>), nmi_period);
+	m_nmi_on->set_start_delay(nmi_period - attotime::from_usec(845)); // active for 0.845ms (approx half)
+	TIMER(config, "nmi_off").configure_periodic(FUNC(vsc_state::nmi_off<INPUT_LINE_NMI>), nmi_period);
 
 	I8255(config, m_ppi8255);
 	m_ppi8255->out_pa_callback().set(FUNC(vsc_state::ppi_porta_w));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/fk1.cpp mame-0.224+dfsg.1/src/mame/drivers/fk1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/fk1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/fk1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,9 +2,9 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        FK-1
+FK-1
 
-        12/05/2009 Skeleton driver.
+2009-05-12 Skeleton driver.
 
 ****************************************************************************/
 
@@ -22,52 +22,61 @@
 class fk1_state : public driver_device
 {
 public:
-	fk1_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_ram(*this, RAM_TAG)
+	fk1_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_rom(*this, "maincpu")
+		, m_ram(*this, RAM_TAG)
+		, m_bankr(*this, "bankr1")
+		, m_bankw(*this, "bankw1")
+		, m_bank2(*this, "bank2")
 	{ }
 
 	void fk1(machine_config &config);
 
 private:
-	required_device<cpu_device> m_maincpu;
-	required_device<ram_device> m_ram;
-
-	void fk1_ppi_1_a_w(uint8_t data);
-	void fk1_ppi_1_b_w(uint8_t data);
-	void fk1_ppi_1_c_w(uint8_t data);
-	uint8_t fk1_ppi_1_a_r();
-	uint8_t fk1_ppi_1_b_r();
-	uint8_t fk1_ppi_1_c_r();
-	void fk1_ppi_2_a_w(uint8_t data);
-	void fk1_ppi_2_c_w(uint8_t data);
-	uint8_t fk1_ppi_2_b_r();
-	uint8_t fk1_ppi_2_c_r();
-	void fk1_ppi_3_a_w(uint8_t data);
-	void fk1_ppi_3_b_w(uint8_t data);
-	void fk1_ppi_3_c_w(uint8_t data);
-	uint8_t fk1_ppi_3_a_r();
-	uint8_t fk1_ppi_3_b_r();
-	uint8_t fk1_ppi_3_c_r();
-	DECLARE_WRITE_LINE_MEMBER(fk1_pit_out0);
-	DECLARE_WRITE_LINE_MEMBER(fk1_pit_out1);
-	DECLARE_WRITE_LINE_MEMBER(fk1_pit_out2);
-	void fk1_intr_w(uint8_t data);
-	uint8_t fk1_bank_ram_r();
-	uint8_t fk1_bank_rom_r();
-	void fk1_disk_w(uint8_t data);
-	uint8_t fk1_mouse_r();
-	void fk1_reset_int_w(uint8_t data);
+	void ppi1_a_w(uint8_t data);
+	void ppi1_b_w(uint8_t data);
+	void ppi1_c_w(uint8_t data);
+	uint8_t ppi1_a_r();
+	uint8_t ppi1_b_r();
+	uint8_t ppi1_c_r();
+	void ppi2_a_w(uint8_t data);
+	void ppi2_c_w(uint8_t data);
+	uint8_t ppi2_b_r();
+	uint8_t ppi2_c_r();
+	void ppi3_a_w(uint8_t data);
+	void ppi3_b_w(uint8_t data);
+	void ppi3_c_w(uint8_t data);
+	uint8_t ppi3_a_r();
+	uint8_t ppi3_b_r();
+	uint8_t ppi3_c_r();
+	DECLARE_WRITE_LINE_MEMBER(pit_out0);
+	DECLARE_WRITE_LINE_MEMBER(pit_out1);
+	DECLARE_WRITE_LINE_MEMBER(pit_out2);
+	void intr_w(uint8_t data);
+	uint8_t bank_ram_r();
+	uint8_t bank_rom_r();
+	void disk_w(uint8_t data);
+	uint8_t mouse_r();
+	void reset_int_w(uint8_t data);
 	uint8_t m_video_rol;
 	uint8_t m_int_vector;
-	virtual void machine_reset() override;
+	void machine_start() override;
+	void machine_reset() override;
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	TIMER_DEVICE_CALLBACK_MEMBER(keyboard_callback);
 	TIMER_DEVICE_CALLBACK_MEMBER(vsync_callback);
-	IRQ_CALLBACK_MEMBER(fk1_irq_callback);
-	void fk1_io(address_map &map);
-	void fk1_mem(address_map &map);
+	IRQ_CALLBACK_MEMBER(irq_callback);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
+
+	required_device<cpu_device> m_maincpu;
+	required_region_ptr<u8> m_rom;
+	required_device<ram_device> m_ram;
+	required_memory_bank    m_bankr;
+	required_memory_bank    m_bankw;
+	required_memory_bank    m_bank2;
 };
 
 
@@ -91,34 +100,34 @@
         2 - INTE keyboard
  */
 
-void fk1_state::fk1_ppi_1_a_w(uint8_t data)
+void fk1_state::ppi1_a_w(uint8_t data)
 {
 //  logerror("fk1_ppi_1_a_w %02x\n",data);
 }
 
-void fk1_state::fk1_ppi_1_b_w(uint8_t data)
+void fk1_state::ppi1_b_w(uint8_t data)
 {
 //  logerror("fk1_ppi_1_b_w %02x\n",data);
 }
 
-void fk1_state::fk1_ppi_1_c_w(uint8_t data)
+void fk1_state::ppi1_c_w(uint8_t data)
 {
 	//logerror("fk1_ppi_1_c_w %02x\n",data);
 }
 
-uint8_t fk1_state::fk1_ppi_1_a_r()
+uint8_t fk1_state::ppi1_a_r()
 {
 	//logerror("fk1_ppi_1_a_r\n");
 	return 0xff;
 }
 
-uint8_t fk1_state::fk1_ppi_1_b_r()
+uint8_t fk1_state::ppi1_b_r()
 {
 //  logerror("fk1_ppi_1_b_r\n");
 	return 0;
 }
 
-uint8_t fk1_state::fk1_ppi_1_c_r()
+uint8_t fk1_state::ppi1_c_r()
 {
 //  logerror("fk1_ppi_1_c_r\n");
 	return 0;
@@ -145,23 +154,23 @@
         2 - INTE B - writing data
 */
 
-void fk1_state::fk1_ppi_2_a_w(uint8_t data)
+void fk1_state::ppi2_a_w(uint8_t data)
 {
 //  logerror("write to disk %02x\n",data);
 }
 
-void fk1_state::fk1_ppi_2_c_w(uint8_t data)
+void fk1_state::ppi2_c_w(uint8_t data)
 {
 //  logerror("fk1_ppi_2_c_w %02x\n",data);
 }
 
-uint8_t fk1_state::fk1_ppi_2_b_r()
+uint8_t fk1_state::ppi2_b_r()
 {
 //  logerror("read from disk\n");
 	return 0;
 }
 
-uint8_t fk1_state::fk1_ppi_2_c_r()
+uint8_t fk1_state::ppi2_c_r()
 {
 //  logerror("fk1_ppi_2_c_r\n");
 	return 0;
@@ -193,51 +202,51 @@
     0 - STEP, move disk (0 1 .. 0.).
 
 */
-void fk1_state::fk1_ppi_3_a_w(uint8_t data)
+void fk1_state::ppi3_a_w(uint8_t data)
 {
 //  logerror("fk1_ppi_3_a_w %02x\n",data);
 }
 
-void fk1_state::fk1_ppi_3_b_w(uint8_t data)
+void fk1_state::ppi3_b_w(uint8_t data)
 {
 	m_video_rol = data;
 }
 
-void fk1_state::fk1_ppi_3_c_w(uint8_t data)
+void fk1_state::ppi3_c_w(uint8_t data)
 {
 //  logerror("fk1_ppi_3_c_w %02x\n",data);
 }
 
-uint8_t fk1_state::fk1_ppi_3_a_r()
+uint8_t fk1_state::ppi3_a_r()
 {
 //  logerror("fk1_ppi_3_a_r\n");
 	return 0;
 }
 
-uint8_t fk1_state::fk1_ppi_3_b_r()
+uint8_t fk1_state::ppi3_b_r()
 {
 	return m_video_rol;
 }
 
-uint8_t fk1_state::fk1_ppi_3_c_r()
+uint8_t fk1_state::ppi3_c_r()
 {
 //  logerror("fk1_ppi_3_c_r\n");
 	return 0;
 }
 
-WRITE_LINE_MEMBER( fk1_state::fk1_pit_out0 )
+WRITE_LINE_MEMBER( fk1_state::pit_out0 )
 {
 	// System time
 	logerror("WRITE_LINE_MEMBER(fk1_pit_out0)\n");
 }
 
-WRITE_LINE_MEMBER( fk1_state::fk1_pit_out1 )
+WRITE_LINE_MEMBER( fk1_state::pit_out1 )
 {
 	// Timeout for disk operation
 	logerror("WRITE_LINE_MEMBER(fk1_pit_out1)\n");
 }
 
-WRITE_LINE_MEMBER( fk1_state::fk1_pit_out2 )
+WRITE_LINE_MEMBER( fk1_state::pit_out2 )
 {
 	// Overflow for disk operations
 	logerror("WRITE_LINE_MEMBER(fk1_pit_out2)\n");
@@ -250,28 +259,22 @@
     8 any interruption allowed.
 */
 
-void fk1_state::fk1_intr_w(uint8_t data)
+void fk1_state::intr_w(uint8_t data)
 {
 	logerror("fk1_intr_w %02x\n",data);
 }
 
-uint8_t fk1_state::fk1_bank_ram_r()
+uint8_t fk1_state::bank_ram_r()
 {
-	address_space &space_mem = m_maincpu->space(AS_PROGRAM);
-	uint8_t *ram = m_ram->pointer();
-
-	space_mem.install_write_bank(0x0000, 0x3fff, "bank1");
-	membank("bank1")->set_base(ram);
-	membank("bank2")->set_base(ram + 0x4000);
+	m_bankr->set_entry(0);
+	m_bank2->set_entry(0);
 	return 0;
 }
 
-uint8_t fk1_state::fk1_bank_rom_r()
+uint8_t fk1_state::bank_rom_r()
 {
-	address_space &space_mem = m_maincpu->space(AS_PROGRAM);
-	space_mem.unmap_write(0x0000, 0x3fff);
-	membank("bank1")->set_base(memregion("maincpu")->base());
-	membank("bank2")->set_base(m_ram->pointer() + 0x10000);
+	m_bankr->set_entry(1);
+	m_bank2->set_entry(1);
 	return 0;
 }
 
@@ -284,7 +287,7 @@
     Functions are allowed in one.
 */
 
-void fk1_state::fk1_disk_w(uint8_t data)
+void fk1_state::disk_w(uint8_t data)
 {
 //  logerror("fk1_disk_w %02x\n",data);
 }
@@ -299,7 +302,7 @@
 0 - / AX, X-axis
 */
 
-uint8_t fk1_state::fk1_mouse_r()
+uint8_t fk1_state::mouse_r()
 {
 //  logerror("fk1_mouse_r\n");
 	return 0;
@@ -307,31 +310,31 @@
 
 /*Write to port 70 resets the interrupt from the system clock of 50 Hz. */
 
-void fk1_state::fk1_reset_int_w(uint8_t data)
+void fk1_state::reset_int_w(uint8_t data)
 {
 	logerror("fk1_reset_int_w\n");
 }
 
-void fk1_state::fk1_mem(address_map &map)
+void fk1_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x3fff).bankrw("bank1");
+	map(0x0000, 0x3fff).bankr("bankr1").bankw("bankw1");
 	map(0x4000, 0x7fff).bankrw("bank2");
-	map(0x8000, 0xbfff).bankrw("bank3");
-	map(0xc000, 0xffff).bankrw("bank4");
+	map(0x8000, 0xbfff).ram();
+	map(0xc000, 0xffff).ram();
 }
 
-void fk1_state::fk1_io(address_map &map)
+void fk1_state::io_map(address_map &map)
 {
 	map.global_mask(0xff);
 	map.unmap_value_high();
-	map(0x00, 0x03).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0x10, 0x13).rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
-	map(0x20, 0x23).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0x30, 0x30).rw(FUNC(fk1_state::fk1_bank_ram_r), FUNC(fk1_state::fk1_intr_w));
+	map(0x00, 0x03).rw("ppi1", FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0x10, 0x13).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+	map(0x20, 0x23).rw("ppi2", FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0x30, 0x30).rw(FUNC(fk1_state::bank_ram_r), FUNC(fk1_state::intr_w));
 	map(0x40, 0x41).rw("uart", FUNC(i8251_device::read), FUNC(i8251_device::write));
-	map(0x50, 0x50).rw(FUNC(fk1_state::fk1_bank_rom_r), FUNC(fk1_state::fk1_disk_w));
-	map(0x60, 0x63).rw("ppi8255_3", FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0x70, 0x70).rw(FUNC(fk1_state::fk1_mouse_r), FUNC(fk1_state::fk1_reset_int_w));
+	map(0x50, 0x50).rw(FUNC(fk1_state::bank_rom_r), FUNC(fk1_state::disk_w));
+	map(0x60, 0x63).rw("ppi3", FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0x70, 0x70).rw(FUNC(fk1_state::mouse_r), FUNC(fk1_state::reset_int_w));
 }
 
 /* Input ports */
@@ -367,7 +370,7 @@
 0 ? PRINTER
 */
 
-IRQ_CALLBACK_MEMBER(fk1_state::fk1_irq_callback)
+IRQ_CALLBACK_MEMBER(fk1_state::irq_callback)
 {
 	logerror("IRQ %02x\n", m_int_vector*2);
 	return m_int_vector * 2;
@@ -380,16 +383,23 @@
 }
 
 
-void fk1_state::machine_reset()
+void fk1_state::machine_start()
 {
-	address_space &space = m_maincpu->space(AS_PROGRAM);
-	uint8_t *ram = m_ram->pointer();
+	save_item(NAME(m_video_rol));
+	save_item(NAME(m_int_vector));
+	u8 *r = m_ram->pointer();
+	m_bankr->configure_entry(0, r);
+	m_bankr->configure_entry(1, m_rom);
+	m_bankw->configure_entry(0, r);
+	m_bank2->configure_entry(0, r+0x4000);
+	m_bank2->configure_entry(1, r+0x8000);
+}
 
-	space.unmap_write(0x0000, 0x3fff);
-	membank("bank1")->set_base(memregion("maincpu")->base()); // ROM
-	membank("bank2")->set_base(ram + 0x10000); // VRAM
-	membank("bank3")->set_base(ram + 0x8000);
-	membank("bank4")->set_base(ram + 0xc000);
+void fk1_state::machine_reset()
+{
+	m_bankr->set_entry(1);
+	m_bankw->set_entry(0);
+	m_bank2->set_entry(1);
 }
 
 uint32_t fk1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
@@ -402,11 +412,9 @@
 	{
 		for (y = 0; y < 256; y++)
 		{
-			code = ram[x * 0x100 + ((y + m_video_rol) & 0xff) + 0x10000];
+			code = ram[x * 0x100 + ((y + m_video_rol) & 0xff) + 0x8000];
 			for (b = 0; b < 8; b++)
-			{
 				bitmap.pix16(y, x*8+b) =  ((code << b) & 0x80) ? 1 : 0;
-			}
 		}
 	}
 	return 0;
@@ -416,9 +424,9 @@
 {
 	/* basic machine hardware */
 	Z80(config, m_maincpu, XTAL(8'000'000) / 2);
-	m_maincpu->set_addrmap(AS_PROGRAM, &fk1_state::fk1_mem);
-	m_maincpu->set_addrmap(AS_IO, &fk1_state::fk1_io);
-	m_maincpu->set_irq_acknowledge_callback(FUNC(fk1_state::fk1_irq_callback));
+	m_maincpu->set_addrmap(AS_PROGRAM, &fk1_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &fk1_state::io_map);
+	m_maincpu->set_irq_acknowledge_callback(FUNC(fk1_state::irq_callback));
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER, rgb_t::green()));
@@ -431,49 +439,49 @@
 
 	PALETTE(config, "palette", palette_device::MONOCHROME);
 
-	pit8253_device &pit8253(PIT8253(config, "pit8253", 0));
+	pit8253_device &pit8253(PIT8253(config, "pit", 0));
 	pit8253.set_clk<0>(50);
-	pit8253.out_handler<0>().set(FUNC(fk1_state::fk1_pit_out0));
+	pit8253.out_handler<0>().set(FUNC(fk1_state::pit_out0));
 	pit8253.set_clk<1>(1000000);
-	pit8253.out_handler<1>().set(FUNC(fk1_state::fk1_pit_out1));
+	pit8253.out_handler<1>().set(FUNC(fk1_state::pit_out1));
 	pit8253.set_clk<2>(0);
-	pit8253.out_handler<2>().set(FUNC(fk1_state::fk1_pit_out2));
+	pit8253.out_handler<2>().set(FUNC(fk1_state::pit_out2));
 
-	i8255_device &ppi1(I8255(config, "ppi8255_1"));
-	ppi1.in_pa_callback().set(FUNC(fk1_state::fk1_ppi_1_a_r));
-	ppi1.out_pa_callback().set(FUNC(fk1_state::fk1_ppi_1_a_w));
-	ppi1.in_pb_callback().set(FUNC(fk1_state::fk1_ppi_1_b_r));
-	ppi1.out_pb_callback().set(FUNC(fk1_state::fk1_ppi_1_b_w));
-	ppi1.in_pc_callback().set(FUNC(fk1_state::fk1_ppi_1_c_r));
-	ppi1.out_pc_callback().set(FUNC(fk1_state::fk1_ppi_1_c_w));
-
-	i8255_device &ppi2(I8255(config, "ppi8255_2"));
-	ppi2.out_pa_callback().set(FUNC(fk1_state::fk1_ppi_2_a_w));
-	ppi2.in_pb_callback().set(FUNC(fk1_state::fk1_ppi_2_b_r));
-	ppi2.in_pc_callback().set(FUNC(fk1_state::fk1_ppi_2_c_r));
-	ppi2.out_pc_callback().set(FUNC(fk1_state::fk1_ppi_2_c_w));
-
-	i8255_device &ppi3(I8255(config, "ppi8255_3"));
-	ppi3.in_pa_callback().set(FUNC(fk1_state::fk1_ppi_3_a_r));
-	ppi3.out_pa_callback().set(FUNC(fk1_state::fk1_ppi_3_a_w));
-	ppi3.in_pb_callback().set(FUNC(fk1_state::fk1_ppi_3_b_r));
-	ppi3.out_pb_callback().set(FUNC(fk1_state::fk1_ppi_3_b_w));
-	ppi3.in_pc_callback().set(FUNC(fk1_state::fk1_ppi_3_c_r));
-	ppi3.out_pc_callback().set(FUNC(fk1_state::fk1_ppi_3_c_w));
+	i8255_device &ppi1(I8255(config, "ppi1"));
+	ppi1.in_pa_callback().set(FUNC(fk1_state::ppi1_a_r));
+	ppi1.out_pa_callback().set(FUNC(fk1_state::ppi1_a_w));
+	ppi1.in_pb_callback().set(FUNC(fk1_state::ppi1_b_r));
+	ppi1.out_pb_callback().set(FUNC(fk1_state::ppi1_b_w));
+	ppi1.in_pc_callback().set(FUNC(fk1_state::ppi1_c_r));
+	ppi1.out_pc_callback().set(FUNC(fk1_state::ppi1_c_w));
+
+	i8255_device &ppi2(I8255(config, "ppi2"));
+	ppi2.out_pa_callback().set(FUNC(fk1_state::ppi2_a_w));
+	ppi2.in_pb_callback().set(FUNC(fk1_state::ppi2_b_r));
+	ppi2.in_pc_callback().set(FUNC(fk1_state::ppi2_c_r));
+	ppi2.out_pc_callback().set(FUNC(fk1_state::ppi2_c_w));
+
+	i8255_device &ppi3(I8255(config, "ppi3"));
+	ppi3.in_pa_callback().set(FUNC(fk1_state::ppi3_a_r));
+	ppi3.out_pa_callback().set(FUNC(fk1_state::ppi3_a_w));
+	ppi3.in_pb_callback().set(FUNC(fk1_state::ppi3_b_r));
+	ppi3.out_pb_callback().set(FUNC(fk1_state::ppi3_b_w));
+	ppi3.in_pc_callback().set(FUNC(fk1_state::ppi3_c_r));
+	ppi3.out_pc_callback().set(FUNC(fk1_state::ppi3_c_w));
 
 	/* uart */
 	I8251(config, "uart", 0);
 
 	/* internal ram */
-	RAM(config, RAM_TAG).set_default_size("80K"); // 64 + 16
+	RAM(config, RAM_TAG).set_default_size("48K");  // 32 for banks1,2 + 16 for vram
 
-	TIMER(config, "keyboard_timer").configure_periodic(FUNC(fk1_state::keyboard_callback), attotime::from_hz(24000));
+	TIMER(config, "keyboard_timer").configure_periodic(FUNC(fk1_state::keyboard_callback), attotime::from_hz(300));
 	TIMER(config, "vsync_timer").configure_periodic(FUNC(fk1_state::vsync_callback), attotime::from_hz(50));
 }
 
 /* ROM definition */
 ROM_START( fk1 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
 	ROM_SYSTEM_BIOS( 0, "orig", "Original BIOS" )
 	ROMX_LOAD( "fk1.u65",      0x0000, 0x0800, CRC(145561f8) SHA1(a4eb17d773e51b34620c508b6cebcb4531ae99c2), ROM_BIOS(0))
 	ROM_SYSTEM_BIOS( 1, "diag", "Diag BIOS" )
@@ -483,4 +491,4 @@
 /* Driver */
 
 //    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS      INIT        COMPANY                  FULLNAME  FLAGS
-COMP( 1989, fk1,  0,      0,      fk1,     fk1,   fk1_state, empty_init, "Statni statek Klicany", "FK-1",   MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1989, fk1,  0,      0,      fk1,     fk1,   fk1_state, empty_init, "Statni statek Klicany", "FK-1",   MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/flyball.cpp mame-0.224+dfsg.1/src/mame/drivers/flyball.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/flyball.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/flyball.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Stefan Jokisch
+// copyright-holders:Stefan Jokisch, Ivan Vangelista, Ryan Holtz
 /***************************************************************************
 
 Atari Flyball Driver
@@ -11,11 +11,6 @@
     MADE IN USA
     PAT NO 3793483
 
-
-TODO:
-- discrete sound
-- accurate video timing
-
 ***************************************************************************/
 
 #include "emu.h"
@@ -23,7 +18,12 @@
 #include "machine/74259.h"
 #include "emupal.h"
 #include "screen.h"
+#include "speaker.h"
 #include "tilemap.h"
+#include "machine/netlist.h"
+
+#include "netlist/nl_setup.h"
+#include "audio/nl_flyball.h"
 
 static constexpr XTAL MASTER_CLOCK  = 12.096_MHz_XTAL;
 static constexpr XTAL PIXEL_CLOCK   = MASTER_CLOCK / 2;
@@ -39,6 +39,11 @@
 		m_screen(*this, "screen"),
 		m_palette(*this, "palette"),
 		m_outlatch(*this, "outlatch"),
+		m_bat_sound(*this, "sound_nl:bat_sound"),
+		m_footstep(*this, "sound_nl:footstep"),
+		m_crowd_sl(*this, "sound_nl:crowd_sl"),
+		m_crowd_on(*this, "sound_nl:crowd_on"),
+		m_crowd_vl(*this, "sound_nl:crowd_vl"),
 		m_playfield_ram(*this, "playfield_ram"),
 		m_lamp(*this, "lamp0")
 	{ }
@@ -87,6 +92,11 @@
 	required_device<screen_device> m_screen;
 	required_device<palette_device> m_palette;
 	required_device<f9334_device> m_outlatch;
+	required_device<netlist_mame_logic_input_device> m_bat_sound;
+	required_device<netlist_mame_logic_input_device> m_footstep;
+	required_device<netlist_mame_logic_input_device> m_crowd_sl;
+	required_device<netlist_mame_logic_input_device> m_crowd_on;
+	required_device<netlist_mame_logic_input_device> m_crowd_vl;
 
 	/* memory pointers */
 	required_shared_ptr<uint8_t> m_playfield_ram;
@@ -317,7 +327,7 @@
 	map(0x0900, 0x0900).w(FUNC(flyball_state::potmask_w));
 	map(0x0a00, 0x0a07).w(FUNC(flyball_state::misc_w));
 	map(0x0b00, 0x0b00).r(FUNC(flyball_state::input_r));
-	map(0x0d00, 0x0eff).writeonly().share("playfield_ram");
+	map(0x0d00, 0x0eff).writeonly().share("playfield_ram").nopr();
 	map(0x1000, 0x1fff).rom().region("maincpu", 0);
 }
 
@@ -358,6 +368,12 @@
 	PORT_START("IN1") /* IN5 */
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
 	PORT_BIT( 0xFE, IP_ACTIVE_LOW, IPT_UNUSED )
+
+	PORT_START("BAT_VOL")
+	PORT_ADJUSTER( 50, "Bat Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "bat_volume")
+
+	PORT_START("MAIN_VOL")
+	PORT_ADJUSTER( 50, "Main Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "main_volume")
 INPUT_PORTS_END
 
 
@@ -467,18 +483,16 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &flyball_state::flyball_map);
 
 	F9334(config, m_outlatch); // F7
-	m_outlatch->q_out_cb<2>().set_nop(); // bat hit
-	m_outlatch->q_out_cb<3>().set_nop(); // crowd soft-loud
-	m_outlatch->q_out_cb<4>().set_nop(); // crowd off-on
-	m_outlatch->q_out_cb<5>().set_nop(); // footstep off-on
-	m_outlatch->q_out_cb<6>().set_nop(); // crowd very loud
+	m_outlatch->q_out_cb<2>().set(m_bat_sound, FUNC(netlist_mame_logic_input_device::write));
+	m_outlatch->q_out_cb<3>().set(m_crowd_sl, FUNC(netlist_mame_logic_input_device::write));
+	m_outlatch->q_out_cb<4>().set(m_crowd_on, FUNC(netlist_mame_logic_input_device::write));
+	m_outlatch->q_out_cb<5>().set(m_footstep, FUNC(netlist_mame_logic_input_device::write));
+	m_outlatch->q_out_cb<6>().set(m_crowd_vl, FUNC(netlist_mame_logic_input_device::write));
 	m_outlatch->q_out_cb<7>().set(FUNC(flyball_state::lamp_w)); // 1 player lamp
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
-	m_screen->set_refresh_hz(60);
-	m_screen->set_size(256, 262);
-	m_screen->set_visarea(0, 255, 0, 239);
+	m_screen->set_raw(PIXEL_CLOCK, 384, 0, 256, 262, 0, 240);
 	m_screen->set_screen_update(FUNC(flyball_state::screen_update));
 	m_screen->set_palette(m_palette);
 	m_screen->screen_vblank().set_inputline(m_maincpu, INPUT_LINE_NMI);
@@ -487,6 +501,21 @@
 	PALETTE(config, m_palette, FUNC(flyball_state::flyball_palette), 4);
 
 	/* sound hardware */
+	SPEAKER(config, "mono").front_center();
+
+	NETLIST_SOUND(config, "sound_nl", 48000)
+		.set_source(NETLIST_NAME(flyball))
+		.add_route(ALL_OUTPUTS, "mono", 1.0);
+
+	NETLIST_LOGIC_INPUT(config, "sound_nl:bat_sound", "BAT_SOUND.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:footstep", "FOOTSTEP.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:crowd_sl", "CROWD_SL.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:crowd_on", "CROWD_ON.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:crowd_vl", "CROWD_VL.IN", 0);
+	NETLIST_ANALOG_INPUT(config, "sound_nl:bat_volume", "R75.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:main_volume", "R95.DIAL");
+
+	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "OUTPUT").set_mult_offset(32767.0 / 0.13, -(32767.0 / 0.13) * 0.78);
 }
 
 
@@ -547,5 +576,5 @@
  *
  *************************************/
 
-GAME( 1976, flyball,  0,       flyball, flyball, flyball_state, empty_init, 0, "Atari", "Flyball (rev 2)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1976, flyball1, flyball, flyball, flyball, flyball_state, empty_init, 0, "Atari", "Flyball (rev 1)", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1976, flyball,  0,       flyball, flyball, flyball_state, empty_init, 0, "Atari", "Flyball (rev 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1976, flyball1, flyball, flyball, flyball, flyball_state, empty_init, 0, "Atari", "Flyball (rev 1)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/funtech.cpp mame-0.224+dfsg.1/src/mame/drivers/funtech.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/funtech.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/funtech.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -64,7 +64,7 @@
 	required_device<cpu_device> m_maincpu;
 	required_device<ticket_dispenser_device> m_hopper;
 	required_device<gfxdecode_device> m_gfxdecode;
-	output_finder<8> m_lamps;
+	output_finder<6> m_lamps;
 
 	uint8_t m_vreg;
 
@@ -225,37 +225,30 @@
 
 void fun_tech_corp_state::lamps_w(uint8_t data)
 {
-	for (int i = 0; i < 8; i++)
+	for (int i = 0; i < 6; i++)
 		m_lamps[i] = BIT(data, i);
+
+	// bit 6 (0x40) is set when displaying a hand in poker, but there are only six lamp outputs
+	// bit 7 (0x80) is always set
 }
 
 void fun_tech_corp_state::coins_w(uint8_t data)
 {
-	if (data & 0x01) printf("coins_w %02x\n", data);
-
-	// 80 = hopper motor?
-	m_hopper->motor_w(BIT(data, 7));
-
-	// 40 = ? sometimes
-
-	// 20 = coin 3 counter
-	machine().bookkeeping().coin_counter_w(2, data & 0x20 );
-
-	// 10 = coin 2 counter
-	machine().bookkeeping().coin_counter_w(1, data & 0x10 );
-
-	// 08 = coin 4 counter
-	machine().bookkeeping().coin_counter_w(3, data & 0x08 );
+	if (data & 0x01) logerror("coins_w %02x\n", data);
 
-	// 04 = coin 1 counter
-	machine().bookkeeping().coin_counter_w(0, data & 0x04 );
+	machine().bookkeeping().coin_counter_w(4, BIT(data, 1)); // COUNTER HOPPER
+	machine().bookkeeping().coin_counter_w(0, BIT(data, 2)); // COUNTER A (coin A)
+	machine().bookkeeping().coin_counter_w(1, BIT(data, 3)); // COUNTER B (keyin B)
+	machine().bookkeeping().coin_counter_w(2, BIT(data, 4)); // COUNTER C (coin C)
+	machine().bookkeeping().coin_counter_w(3, BIT(data, 5)); // COUNTER D (coin D)
+	machine().bookkeeping().coin_counter_w(5, BIT(data, 6)); // COUNTER CREDIT OUT
 
-	// 02 = used when hopper is used (coin out counter?)
+	m_hopper->motor_w(BIT(data, 7));
 }
 
 void fun_tech_corp_state::vreg_w(uint8_t data)
 {
-	if (data & 0xb2) printf("vreg_w %02x\n", data);
+	if (data & 0xb2) logerror("vreg_w %02x\n", data);
 
 	// -x-- rr-t
 	// t = text tile bank
@@ -280,11 +273,10 @@
 
 	map(0x04, 0x04).portr("IN0");
 	map(0x05, 0x05).portr("IN1");
-	map(0x06, 0x06).portr("DSW1");
-	map(0x07, 0x07).portr("DSW2");
-
-	map(0x10, 0x10).portr("IN4");
+	map(0x06, 0x06).portr("DSW4");
+	map(0x07, 0x07).portr("DSW3");
 
+	map(0x10, 0x10).r("aysnd", FUNC(ay8910_device::data_r));
 	map(0x11, 0x11).w("aysnd", FUNC(ay8910_device::data_w));
 	map(0x12, 0x12).w("aysnd", FUNC(ay8910_device::address_w));
 }
@@ -292,108 +284,129 @@
 static INPUT_PORTS_START( funtech )
 	PORT_START("IN0")
 	// the buttons are all multi-purpose as it's a 2-in-1.
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold 5, Bet")
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 )
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold 1, Take, Odds, Stop 1")
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Hold 4, Double")
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold 3, Small, Stop 3")
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold 2, Big, Stop 2")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_POKER_HOLD5 )   PORT_NAME("Hold 5, Bet")
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )         PORT_NAME("Coin A")
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )         PORT_NAME("Coin C")
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN4 )         PORT_NAME("Coin D")
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_HOLD1 )   PORT_NAME("Hold 1, Take Score, Odds, Left Stop") // shows odds in 8-liner game
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_POKER_HOLD4 )   PORT_NAME("Hold 4, Double-Up") // manual suggests this shows odds, but it doesn't
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_POKER_HOLD3 )   PORT_NAME("Hold 3, Small, Right Stop")
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_POKER_HOLD2 )   PORT_NAME("Hold 2, Big, Center Stop")
 
 	PORT_START("IN1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("hopper", ticket_dispenser_device, line_r)
-	PORT_DIPNAME( 0x08, 0x08, "IN1-08" ) // some kind of key-out? reduces credits to 0
-	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_KEYOUT ) PORT_NAME("Credit Out")
 	PORT_DIPNAME( 0x10, 0x10, "IN1-10" ) // prevents start from working in the poker game at least
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_SERVICE_NO_TOGGLE(   0x20, IP_ACTIVE_LOW )
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN4 ) // note?
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 )        PORT_NAME("Start, All Stop")
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN )  PORT_NAME("Keyin B")
 
-	// the board contains 4 banks of 8 dipswitches, the code does not appear to read that many.
+	// the board contains 4 banks of 8 dipswitches
 	PORT_START("DSW1")
-	PORT_DIPNAME( 0x01, 0x01, "Reel Speed" )
+	PORT_DIPNAME( 0x03, 0x03, "Hopper Limit" )                PORT_DIPLOCATION("NO. 1:1,2")
+	PORT_DIPSETTING(    0x00, "300" )
+	PORT_DIPSETTING(    0x02, "500" )
+	PORT_DIPSETTING(    0x01, "1000" )
+	PORT_DIPSETTING(    0x03, "Unlimited" )
+	PORT_DIPNAME( 0x1c, 0x1c, "Credit Limit" )                PORT_DIPLOCATION("NO. 1:3,4,5")
+	PORT_DIPSETTING(    0x00, "5,000" )
+	PORT_DIPSETTING(    0x10, "10,000" )
+	PORT_DIPSETTING(    0x08, "20,000" )
+	PORT_DIPSETTING(    0x18, "30,000" )
+	PORT_DIPSETTING(    0x04, "40,000" )
+	PORT_DIPSETTING(    0x14, "50,000" )
+	PORT_DIPSETTING(    0x0c, "100,000" )
+	PORT_DIPSETTING(    0x1c, "Unlimited" )
+	PORT_DIPNAME( 0x20, 0x20, "Credit Limit Display" )        PORT_DIPLOCATION("NO. 1:6")
+	PORT_DIPSETTING(    0x20, "Not Displayed" )
+	PORT_DIPSETTING(    0x00, "Displayed" )
+	PORT_DIPNAME( 0xc0, 0xc0, "Coin A Rate" )                 PORT_DIPLOCATION("NO. 1:7,8")
+	PORT_DIPSETTING(    0xc0, DEF_STR( 1C_1C ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( 1C_5C ) )
+	PORT_DIPSETTING(    0x00, "1 Coin/10 Credits" )
+
+	PORT_START("DSW2")
+	PORT_DIPNAME( 0x07, 0x07, "Keyin B Rate" )                PORT_DIPLOCATION("NO. 2:1,2,3")
+	PORT_DIPSETTING(    0x00, DEF_STR( 1C_1C ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( 1C_5C ) )
+	PORT_DIPSETTING(    0x06, "1 Coin/10 Credits" )
+	PORT_DIPSETTING(    0x01, "1 Coin/20 Credits" )
+	PORT_DIPSETTING(    0x05, "1 Coin/25 Credits" )
+	PORT_DIPSETTING(    0x03, "1 Coin/50 Credits" )
+	PORT_DIPSETTING(    0x07, "1 Coin/100 Credits" )
+	PORT_DIPNAME( 0x18, 0x18, "Coin C Rate" )                 PORT_DIPLOCATION("NO. 2:4,5")
+	PORT_DIPSETTING(    0x00, DEF_STR( 1C_1C ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( 1C_5C ) )
+	PORT_DIPSETTING(    0x18, "1 Coin/10 Credits" )
+	PORT_DIPNAME( 0xe0, 0xe0, "Coin D Rate" )                 PORT_DIPLOCATION("NO. 2:6,7,8")
+	PORT_DIPSETTING(    0x00, DEF_STR( 5C_1C) )
+	PORT_DIPSETTING(    0x80, DEF_STR( 2C_1C ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( 1C_1C ) )
+	PORT_DIPSETTING(    0xc0, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( 1C_5C ) )
+	PORT_DIPSETTING(    0xa0, "1 Coin/10 Credits" )
+	PORT_DIPSETTING(    0x60, "1 Coin/25 Credits" )
+	PORT_DIPSETTING(    0xe0, "1 Coin/50 Credits" )
+
+	PORT_START("DSW3")
+	PORT_DIPNAME( 0x0f, 0x0f, "Main Game Pay Rate" )          PORT_DIPLOCATION("NO. 3:1,2,3,4")
+	PORT_DIPSETTING(    0x00, "50%" )
+	PORT_DIPSETTING(    0x08, "53%" )
+	PORT_DIPSETTING(    0x04, "56%" )
+	PORT_DIPSETTING(    0x0c, "59%" )
+	PORT_DIPSETTING(    0x02, "62%" )
+	PORT_DIPSETTING(    0x0a, "65%" )
+	PORT_DIPSETTING(    0x06, "68%" )
+	PORT_DIPSETTING(    0x0e, "71%" )
+	PORT_DIPSETTING(    0x01, "74%" )
+	PORT_DIPSETTING(    0x09, "77%" )
+	PORT_DIPSETTING(    0x05, "80%" )
+	PORT_DIPSETTING(    0x0d, "83%" )
+	PORT_DIPSETTING(    0x03, "86%" )
+	PORT_DIPSETTING(    0x0b, "89%" )
+	PORT_DIPSETTING(    0x07, "92%" )
+	PORT_DIPSETTING(    0x0f, "95%" )
+	PORT_DIPNAME( 0x10, 0x10, "Double Up Game" )              PORT_DIPLOCATION("NO. 3:5")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x20, "Double Up Pay Rate" )          PORT_DIPLOCATION("NO. 3:6")
+	PORT_DIPSETTING(    0x00, "80%" )
+	PORT_DIPSETTING(    0x20, "90%" )
+	PORT_DIPNAME( 0x40, 0x40, "Double Up 7 Player Value" )    PORT_DIPLOCATION("NO. 3:7")
+	PORT_DIPSETTING(    0x40, "Loss" )
+	PORT_DIPSETTING(    0x00, "Draw" )
+	PORT_DIPNAME( 0x80, 0x80, "Double Up Girl Display" )      PORT_DIPLOCATION("NO. 3:8") // if set to No girl remains clothed when winning
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( Yes ) )
+
+	PORT_START("DSW4")
+	PORT_DIPNAME( 0x01, 0x01, "Reel Speed" )                  PORT_DIPLOCATION("NO. 4:1")
 	PORT_DIPSETTING(    0x01, "Low" )
 	PORT_DIPSETTING(    0x00, "High" )
-	PORT_DIPNAME( 0x06, 0x06, "Max Bet" )
+	PORT_DIPNAME( 0x06, 0x06, "Max Bet" )                     PORT_DIPLOCATION("NO. 4:2,3")
 	PORT_DIPSETTING(    0x00, "8" )
 	PORT_DIPSETTING(    0x04, "16" )
 	PORT_DIPSETTING(    0x02, "32" )
 	PORT_DIPSETTING(    0x06, "64" )
-	PORT_DIPNAME( 0x08, 0x08, "Min Bet for Bonus" )
+	PORT_DIPNAME( 0x08, 0x08, "Min Bet for Any Bonus" )       PORT_DIPLOCATION("NO. 4:4")
 	PORT_DIPSETTING(    0x00, "8" )
 	PORT_DIPSETTING(    0x08, "16" )
-	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) ) // unused?
-	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) ) // unused?
-	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) // unused?
-	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) // unused?
-	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-
-	PORT_START("DSW2")
-	PORT_DIPNAME( 0x0f, 0x0f, "Main Game Percent" )
-	PORT_DIPSETTING(    0x00, "50" )
-	PORT_DIPSETTING(    0x08, "53" )
-	PORT_DIPSETTING(    0x04, "56" )
-	PORT_DIPSETTING(    0x0c, "59" )
-	PORT_DIPSETTING(    0x02, "62" )
-	PORT_DIPSETTING(    0x0a, "65" )
-	PORT_DIPSETTING(    0x06, "68" )
-	PORT_DIPSETTING(    0x0e, "71" )
-	PORT_DIPSETTING(    0x01, "74" )
-	PORT_DIPSETTING(    0x09, "77" )
-	PORT_DIPSETTING(    0x05, "80" )
-	PORT_DIPSETTING(    0x0d, "83" )
-	PORT_DIPSETTING(    0x03, "86" )
-	PORT_DIPSETTING(    0x0b, "89" )
-	PORT_DIPSETTING(    0x07, "92" )
-	PORT_DIPSETTING(    0x0f, "95" )
-	PORT_DIPNAME( 0x10, 0x10, "Double Up Game Enable" )
-	PORT_DIPSETTING(    0x00, "Disabled" )
-	PORT_DIPSETTING(    0x10, "Enabled" )
-	PORT_DIPNAME( 0x20, 0x20, "Double Up Percent" )
-	PORT_DIPSETTING(    0x00, "80" )
-	PORT_DIPSETTING(    0x20, "90" )
-	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) ) // unused?
+	PORT_DIPNAME( 0x30, 0x30, "Bonus Games Entry Condition" ) PORT_DIPLOCATION("NO. 4:5,6")
+	PORT_DIPSETTING(    0x00, "1-3-1-5-1" )
+	PORT_DIPSETTING(    0x20, "1-4-1-6-1" )
+	PORT_DIPSETTING(    0x10, "1-5-1-7-1" )
+	PORT_DIPSETTING(    0x30, "1-6-1-8-1" )
+	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unused ) )             PORT_DIPLOCATION("NO. 4:7") // unused according to manual
 	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) ) // unused?
-	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-
-	PORT_START("IN4") // the dipswitch screen doesn't list these, maybe determined by the hopper?
-	PORT_DIPNAME( 0x07, 0x07, "Coin 4 Value" )
-	PORT_DIPSETTING(    0x00, "1" )
-	PORT_DIPSETTING(    0x04, "2" )
-	PORT_DIPSETTING(    0x02, "5" )
-	PORT_DIPSETTING(    0x06, "10" )
-	PORT_DIPSETTING(    0x01, "20" )
-	PORT_DIPSETTING(    0x05, "25" )
-	PORT_DIPSETTING(    0x03, "50" )
-	PORT_DIPSETTING(    0x07, "100" )
-	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x60, 0x00, "Payout Value" )
-	PORT_DIPSETTING(    0x00, "1" )
-	PORT_DIPSETTING(    0x40, "2" )
-	PORT_DIPSETTING(    0x20, "10" )
-	PORT_DIPSETTING(    0x60, "50" )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
+	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) )             PORT_DIPLOCATION("NO. 4:8") // unused according to manual
 	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 INPUT_PORTS_END
@@ -466,7 +479,10 @@
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
 
-	AY8910(config, "aysnd", 1500000).add_route(ALL_OUTPUTS, "mono", 1.00); /* M5255, ? MHz */
+	ay8910_device &aysnd(AY8910(config, "aysnd", 1500000)); /* M5255, ? MHz */
+	aysnd.port_a_read_callback().set_ioport("DSW1");
+	aysnd.port_b_read_callback().set_ioport("DSW2");
+	aysnd.add_route(ALL_OUTPUTS, "mono", 1.00);
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/funworld.cpp mame-0.224+dfsg.1/src/mame/drivers/funworld.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/funworld.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/funworld.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -5,9 +5,10 @@
   Fun World / TAB / Impera
   Series 7000 hardware.
 
-  65C02 + 2x PIAs + M6845 CRTC + AY8910
+  65C02/65SC02 + 2x 6821 PIAs + 6845 CRTC + AY-3-8910.
+  From raw, to different ways of encryption. Even through custom CPUs.
 
-  Also from Amatic, CMC, Dino4 encrypted, and Leopard 4.
+  Also from Amatic, CMC, Dino4 (encrypted), and Leopard 4.
 
   Driver by Roberto Fresca.
   Based on a preliminary work of Curt Coder & Peter Trauner.
@@ -71,7 +72,6 @@
   * Royal Card Professional 2.0,                                Digital Dreams,     1993.
   * Royal Card / Royal Jackpot (with a third draw)(encrypted),  TAB / Video Klein,  1991
   * Witch Royal (Export version 2.1),                           Video Klein,        199?.
-  * Royal Card (Italian, Dino 4 hardware, encrypted),           unknown,            1998.
   * Lucky Lady (3x3 deal),                                      TAB Austria,        1991.
   * Lucky Lady (4x1 aces),                                      TAB Austria,        1991.
   * Magic Card II (Bulgarian),                                  Impera,             1996.
@@ -82,10 +82,14 @@
   * Royal Vegas Joker Card (Fast deal),                         Soft Design,        1993.
   * Royal Vegas Joker Card (Fast deal, english gfx),            Soft Design,        1993.
   * Royal Vegas Joker Card (Fast deal, Mile),                   Mile,               1993.
-  * Jolly Joker (98bet, set 1).                                 Impera,             198?.
-  * Jolly Joker (98bet, set 2).                                 Impera,             198?.
-  * Jolly Joker (40bet, croatian hack),                         Impera,             198?.
-  * Jolly Joker (Apple Time),                                   Apple Time,         198?.
+  * Jolly Joker (original, interleaved GFX).                    Impera,             199?.
+  * Jolly Joker (original, different encoded GFX).              Impera,             199?.
+  * Jolly Joker (Solid State module in suicide board).          Impera,             199?.
+  * Jolly Joker (98bet, set 1).                                 Impera,             199?.
+  * Jolly Joker (98bet, set 2).                                 Impera,             199?.
+  * Jolly Joker (40bet, higher paytable),                       Impera,             1985.
+  * Jolly Joker (40bet, lower paytable),                        Impera,             1985.
+  * Jolly Joker (Apple Time),                                   Apple Time,         199?.
   * Multi Win (Ver.0167, encrypted),                            Fun World,          1992.
   * Power Card (Ver 0263, encrypted),                           Fun World,          1993.
   * Mega Card (Ver.0210, encrypted),                            Fun World,          1993.
@@ -96,7 +100,9 @@
   * Jolly Card (Italian, blue TAB board, encrypted),            bootleg,            199?.
   * Jolly Card (Italian, encrypted bootleg, set 1),             bootleg,            1990.
   * Jolly Card (Italian, encrypted bootleg, set 2),             bootleg,            1993.
+  * Jolly Card (Italian, encrypted bootleg, set 3),             bootleg,            1993.
   * Pool 10 (Italian, Dino 4 hardware, encrypted),              C.M.C.,             1997.
+  * Royal Card (Italian, Dino 4 hardware, encrypted),           unknown,            1998.
   * China Town (Ver 1B, Dino4 HW),                              unknown,            1998.
   * Royal Card (Italian, Dino 4 hardware, encrypted),           TAB Austria,        1998.
   * Mongolfier New (Italian),                                   unknown,            199?.
@@ -110,10 +116,17 @@
   * Unknown Fun World A7-11 game 2,                             Fun World,          1985.
   * Unknown Fun World A0-1 game,                                Fun World,          1991.
   * Joker Card / Multi Card (Epoxy brick CPU),                  Fun World,          1991.
+  * Gratis Poker (V.204, set 1),                                Mega Soft,          1995.
+  * Gratis Poker (V.204, set 2),                                Mega Soft,          1995.
+  * Gkoulit (encrypted GFX),                                    JK Amusement,       1995.
+  * Reflex Cards (English, serial protected),                   TAB Austria,        1999.
   * Royal Card (stealth with NES multigame),                    bootleg,            1991.
   * Royal Card (stealth with MSX multigame),                    bootleg,            1991.
 
 
+  Supported games: 104
+
+
 *****************************************************************************************
 
   The hardware is generally composed by:
@@ -171,11 +184,12 @@
 
   - Encryption.
 
-      A) Encrypted CPU. At least two Fun World boards have custom encrypted CPUs:
+      A) Encrypted CPU. At least five Fun World boards have custom encrypted CPUs:
 
-          - Joker Card from Vesely Svet use a custom unknown CPU and use encrypted prg roms.
+          - Joker Card from Vesely Svet, Mega Card, Power Card and Multi Win,
+             use custom unknown CPUs and also encrypted/scrambled prg roms.
           - Royal Card (slovak, encrypted) from Evona Electronic seems to use a block
-            with CPU + extras (ICs, TTL, etc) to manage the encryption.
+             with CPU + extras (ICs, TTL, etc) to manage the encryption.
 
       B) General encryption. Managed through hardware:
 
@@ -351,6 +365,8 @@
 
   * Joker Card 300 (Ver.A267BC, encrypted).
   * Multi Win (Fun World)
+  * Power Card (Fun World)
+  * Mega Card (Fun World)
 
   These sets seems to run in the same modified hardware. They are highly encrypted.
 
@@ -618,16 +634,12 @@
 
   *** TO DO ***
 
-  - Figure out the royalcdc encryption.
   - Figure out the remaining PIA connections for almost all games.
   - Reverse-engineering the boot code of Jolly Card Professional 2.0,
      and Royal Card Professional 2.0 to get the proper codes to boot.
   - Analyze the unknown writes to $2000/$4000 in some games.
   - Check for the reads to the ay8910 output ports in some games.
   - Implement the MCU in monglfir and soccernw.
-  - Check for a possible bug in the royalcrdf decryption scheme, that
-    doesn't cover the BRK instruction properly, changing the next value
-    on the fly turning a NOP into a PLA, messing the Stack Pointer.
 
 
 ****************************************************************************************/
@@ -671,17 +683,17 @@
     -x-- ----   Hopper Motor (inverted).
     x--- ----   HOLD4 lamp.
 */
-	m_lamps[0] = BIT(~data, 1);  /* Hold1 (inverted) */
-	m_lamps[2] = BIT(~data, 1);  /* Hold3 (inverted, see pinouts) */
+	m_lamps[0] = BIT(~data, 1); // Hold1 (inverted)
+	m_lamps[2] = BIT(~data, 1); // Hold3 (inverted, see pinouts)
 
-	m_lamps[1] = BIT(~data, 3);  /* Hold2 / Low (inverted) */
-	m_lamps[3] = BIT(data, 7);      /* Hold4 / High */
-	m_lamps[5] = BIT(~data, 5);  /* Cancel / Collect (inverted) */
+	m_lamps[1] = BIT(~data, 3); // Hold2 / Low (inverted)
+	m_lamps[3] = BIT(data, 7);  // Hold4 / High
+	m_lamps[5] = BIT(~data, 5); // Cancel / Collect (inverted)
 
-	machine().bookkeeping().coin_counter_w(0, data & 0x01);  /* Credit In counter */
-	machine().bookkeeping().coin_counter_w(7, data & 0x04);  /* Credit Out counter, mapped as coin 8 */
+	machine().bookkeeping().coin_counter_w(0, data & 0x01); // Credit In counter
+	machine().bookkeeping().coin_counter_w(7, data & 0x04); // Credit Out counter, mapped as coin 8
 
-	m_lamps[7] = BIT(~data, 6);      /* Hopper Motor (inverted) */
+	m_lamps[7] = BIT(~data, 6);     // Hopper Motor (inverted)
 
 //  popmessage("Lamps A: %02X", (data ^ 0xff));
 }
@@ -695,17 +707,17 @@
     ---- -x--   Unknown (inverted).
     xxxx x---   Unknown.
 */
-	m_lamps[4] = BIT(data, 0);      /* Hold5 / Bet */
-	m_lamps[6] = BIT(data, 1);      /* Start / Deal / Draw */
+	m_lamps[4] = BIT(data, 0);  // Hold5 / Bet
+	m_lamps[6] = BIT(data, 1);  // Start / Deal / Draw
 
 //  popmessage("Lamps B: %02X", data);
 }
 
 WRITE_LINE_MEMBER(funworld_state::pia1_ca2_w)
 {
-/* TAB and Impera games are writing 0x01 constantly, and 0x00 with each screen change.
-   This line is tied to sort of reset circuitery.
-*/
+// TAB and Impera games are writing 0x01 constantly, and 0x00 with each screen change.
+// This line is tied to some sort of reset circuitery.
+
 //  popmessage("PIA1 CA2: %02X", state);
 }
 
@@ -777,9 +789,9 @@
 	map(0x0c00, 0x0c01).w("ay8910", FUNC(ay8910_device::address_data_w));
 	map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x0e01, 0x0e01).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
-	map(0x2c00, 0x2cff).ram(); /* range for protection */
-	map(0x3600, 0x36ff).ram(); /* some games use $3603-05 range for protection */
-	map(0x3c00, 0x3cff).ram(); /* range for protection */
+	map(0x2c00, 0x2cff).ram();  // range for protection
+	map(0x3600, 0x36ff).ram();  // some games use $3603-05 range for protection
+	map(0x3c00, 0x3cff).ram();  // range for protection
 	map(0x4000, 0x4fff).ram().w(FUNC(funworld_state::funworld_videoram_w)).share("videoram");
 	map(0x5000, 0x5fff).ram().w(FUNC(funworld_state::funworld_colorram_w)).share("colorram");
 	map(0x6000, 0xffff).rom();
@@ -794,9 +806,9 @@
 	map(0x0c00, 0x0c01).w("ay8910", FUNC(ay8910_device::address_data_w));
 	map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x0e01, 0x0e01).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
-	map(0x2000, 0x2000).nopr(); /* some unknown reads */
-	map(0x3e00, 0x3fff).ram(); /* some games use $3e03-05 range for protection */
-	map(0x4000, 0x5fff).rom(); /* used by rcdino4 (dino4 hw ) */
+	map(0x2000, 0x2000).nopr(); // some unknown reads
+	map(0x3e00, 0x3fff).ram();  // some games use $3e03-05 range for protection
+	map(0x4000, 0x5fff).rom();  // used by rcdino4 (dino4 hw )
 	map(0x6000, 0x6fff).ram().w(FUNC(funworld_state::funworld_videoram_w)).share("videoram");
 	map(0x7000, 0x7fff).ram().w(FUNC(funworld_state::funworld_colorram_w)).share("colorram");
 	map(0x8000, 0xffff).rom();
@@ -982,6 +994,21 @@
 }
 
 
+void funworld_state::gratispk_map(address_map &map)
+{
+	map(0x0000, 0x07ff).ram().share("nvram");
+	map(0x0800, 0x0803).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0x0a00, 0x0a03).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0x0c00, 0x0c00).r("ay8910", FUNC(ay8910_device::data_r));
+	map(0x0c00, 0x0c01).w("ay8910", FUNC(ay8910_device::address_data_w));
+	map(0x0e00, 0x0e00).w("crtc", FUNC(mc6845_device::address_w));
+	map(0x0e01, 0x0e01).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
+	map(0x4000, 0x4fff).ram().w(FUNC(funworld_state::funworld_videoram_w)).share("videoram");
+	map(0x5000, 0x5fff).ram().w(FUNC(funworld_state::funworld_colorram_w)).share("colorram");
+	map(0x6000, 0xffff).rom();
+}
+
+
 /*************************
 *      Input ports       *
 *************************/
@@ -1034,14 +1061,14 @@
 	PORT_DIPSETTING(    0x00, "Dattl Insert" )
 	PORT_DIPSETTING(    0x10, "TAB Insert" )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )        /* also enable Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x00, "Hold" )              PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
 	PORT_DIPSETTING(    0x40, "No Auto Hold" )
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x80, "Payout" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -1083,7 +1110,7 @@
 	PORT_DIPNAME( 0x01, 0x01, "State" )             PORT_DIPLOCATION("SW1:8")
 	PORT_DIPSETTING(    0x00, "Keyboard Test" )
 	PORT_DIPSETTING(    0x01, "Play" )
-	PORT_DIPNAME( 0x02, 0x00, "Remote Value" )          PORT_DIPLOCATION("SW1:7")
+	PORT_DIPNAME( 0x02, 0x00, "Remote Value" )      PORT_DIPLOCATION("SW1:7")
 	PORT_DIPSETTING(    0x00, "10 Points/Pulse" )
 	PORT_DIPSETTING(    0x02, "100 Points/Pulse" )
 	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:6")
@@ -1096,14 +1123,14 @@
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )        /* also enable Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x00, "Hold" )              PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
 	PORT_DIPSETTING(    0x40, "No Auto Hold" )
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x80, "Payout" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -1157,14 +1184,14 @@
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )        /* also enable Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x00, "Hold" )              PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
 	PORT_DIPSETTING(    0x40, "No Auto Hold" )
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x80, "Payout" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -1206,7 +1233,7 @@
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:8")
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x00, "Remote Value" )          PORT_DIPLOCATION("SW1:7")
+	PORT_DIPNAME( 0x02, 0x00, "Remote Value" )      PORT_DIPLOCATION("SW1:7")
 	PORT_DIPSETTING(    0x00, "10 Points/Pulse" )
 	PORT_DIPSETTING(    0x02, "100 Points/Pulse" )
 	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:6")
@@ -1219,14 +1246,14 @@
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )    /* also enables Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x00, "Auto Hold" )         PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )   /* when is ON, allow the player to activate/deactivate the autohold through CANCEL button */
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )       // when is ON, allows the player to activate/deactivate the autohold through CANCEL button
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x80, "Payout" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -1281,11 +1308,11 @@
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )    /* also enables Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x00, "Auto Hold" )         PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( On ) )   /* when is ON, allow the player to activate/deactivate the autohold through CANCEL button */
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )       // when is ON, allows the player to activate/deactivate the autohold through CANCEL button
 	PORT_DIPNAME( 0x80, 0x00, "Payout" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -1340,7 +1367,7 @@
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )        /* also enable Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x00, "Hold" )              PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
@@ -1383,9 +1410,9 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("DSW")
-/*  DIP switch 8 should be left ON by default (all remaining ones in OFF)
-    to allow initialization. You can change settings later, after the boot.
-*/
+//  DIP switch 8 should be left ON by default (all remaining ones in OFF)
+//  to allow initialization. You can change settings later, after the boot.
+
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:8")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
@@ -1408,8 +1435,8 @@
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
 	PORT_DIPSETTING(    0x40, "No Auto Hold" )
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x00, "Payout" )    PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -1448,9 +1475,9 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("DSW")
-/*  DIP switch 8 should be left ON by default (all remaining ones in OFF)
-    to allow initialization. You can change settings later, after the boot.
-*/
+//  DIP switch 8 should be left ON by default (all remaining ones in OFF)
+//  to allow initialization. You can change settings later, after the boot.
+
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:8")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
@@ -1473,8 +1500,8 @@
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
 	PORT_DIPSETTING(    0x40, "No Auto Hold" )
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x00, "Payout" )    PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -1516,7 +1543,7 @@
 	PORT_DIPNAME( 0x01, 0x01, "State" )             PORT_DIPLOCATION("SW1:8")
 	PORT_DIPSETTING(    0x00, "Keyboard Test" )
 	PORT_DIPSETTING(    0x01, "Play" )
-	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:7")   /* remote credits settings are always 10 points/pulse */
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:7")   // remote credits settings are always 10 points/pulse
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
 	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Coin_B ) )   PORT_DIPLOCATION("SW1:6")
@@ -1535,8 +1562,8 @@
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
 	PORT_DIPSETTING(    0x40, "No Auto Hold" )
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x00, "Payout" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -1578,7 +1605,7 @@
 	PORT_DIPNAME( 0x01, 0x01, "State" )             PORT_DIPLOCATION("SW1:8")
 	PORT_DIPSETTING(    0x00, "Keyboard Test" )
 	PORT_DIPSETTING(    0x01, "Play" )
-	PORT_DIPNAME( 0x02, 0x02, "Remote Value" )          PORT_DIPLOCATION("SW1:7")   /* listed as 'Coin-C' in some sources */
+	PORT_DIPNAME( 0x02, 0x02, "Remote Value" )          PORT_DIPLOCATION("SW1:7")   // listed as 'Coin-C' in some sources
 	PORT_DIPSETTING(    0x00, "10 Points/Pulse" )
 	PORT_DIPSETTING(    0x02, "100 Points/Pulse" )
 	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Coin_B ) )   PORT_DIPLOCATION("SW1:6")
@@ -1591,14 +1618,14 @@
 	PORT_DIPSETTING(    0x00, "Dattl Insert" )
 	PORT_DIPSETTING(    0x10, "TAB Insert" )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )        /* also enable Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x00, "Hold" )              PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
 	PORT_DIPSETTING(    0x40, "No Auto Hold" )
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x80, "Payout" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -1653,14 +1680,14 @@
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )        /* also enable Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x40, "Hold" )              PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
 	PORT_DIPSETTING(    0x40, "No Auto Hold" )
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x80, "Payout" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -1755,7 +1782,7 @@
 
 static INPUT_PORTS_START( cuoreuno )
 	PORT_START("IN0")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )    /* no remote credits */
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )        // no remote credits
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD1 )    PORT_NAME("Stop 1 / Switch Bet (1-Max)")
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_CANCEL )   PORT_NAME("Clear / Bet / Prendi (Take)")
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )         PORT_NAME("Start / Gioca (Play)")
@@ -1806,8 +1833,8 @@
 	PORT_DIPSETTING(    0x40, "Manual - Tickets" )
 	PORT_DIPSETTING(    0x60, "Manual - User Choice 2" )
 
-	/* the following one (1st DSW) seems to be disconnected
-	to avoid the use of remote credits or direct payout */
+//  the following one (1st DSW) seems to be disconnected
+//  to avoid the use of remote credits or direct payout
 	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unused ) )           PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
@@ -1816,7 +1843,7 @@
 
 static INPUT_PORTS_START( pool10 )
 	PORT_START("IN0")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )    /* no remote credits */
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )        // no remote credits
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD1 )    PORT_NAME("Stop 1 / Switch Bet (1-Max)")
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_CANCEL )   PORT_NAME("Clear / Bet / Prendi (Take)")
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )         PORT_NAME("Start / Gioca (Play)")
@@ -1867,7 +1894,7 @@
 	PORT_DIPSETTING(    0x40, "Manual - Tickets" )
 	PORT_DIPSETTING(    0x60, "Manual - User Choice 2" )
 
-	/* direct payout without play Super Game */
+//  direct payout without play Super Game
 	PORT_DIPNAME( 0x80, 0x80, "Direct Payout (tickets)" )   PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
@@ -1876,7 +1903,7 @@
 
 static INPUT_PORTS_START( lunapark )
 	PORT_START("IN0")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )    /* no remote credits */
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )        // no remote credits
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD1 )    PORT_NAME("Stop 1 / Switch Bet (1-Max)")
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_CANCEL )   PORT_NAME("Clear / Bet / Prendi (Take)")
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )         PORT_NAME("Start / Gioca (Play)")
@@ -1928,13 +1955,13 @@
 	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 
-	/* the following one seems to be disconnected
-	to avoid the use of remote credits or direct payout */
+//  the following one seems to be disconnected
+//  to avoid the use of remote credits or direct payout
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 
-	/* the following one is connected to 1st DSW and is meant
-	for switch between different programs stored in different
-	halves of the program ROM */
+//  the following one is connected to 1st DSW and is meant
+//  for switch between different programs stored in different
+//  halves of the program ROM
 	PORT_START("SELDSW")
 	PORT_DIPNAME( 0x01, 0x00, "Game Selector" )           PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "PROGRAM 1, (5 TIRI LIRE 500, ABILITA VINTE)" )
@@ -1990,15 +2017,14 @@
 	PORT_DIPSETTING(    0x00, "disabled" )
 	PORT_DIPSETTING(    0x10, "enabled" )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )        /* also enable Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x40, "Hold" )              PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
 	PORT_DIPSETTING(    0x40, "No Auto Hold" )
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
-
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x00, "Payout" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -2053,14 +2079,14 @@
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )        /* also enable Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x00, "Hold" )              PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
 	PORT_DIPSETTING(    0x40, "No Auto Hold" )
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x00, "Payout" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -2115,14 +2141,14 @@
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )        /* also enable Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x00, "Hold" )              PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
 	PORT_DIPSETTING(    0x40, "No Auto Hold" )
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x80, "Payout" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -2177,14 +2203,14 @@
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )        /* also enable Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x00, "Hold" )              PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
 	PORT_DIPSETTING(    0x40, "No Auto Hold" )
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x80, "Payout" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -2239,14 +2265,14 @@
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )        /* also enable Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x00, "Hold" )              PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
 	PORT_DIPSETTING(    0x40, "No Auto Hold" )
 
-	/* after nvram init, set the following one to 'manual'
-	to allow the remote credits mode to work */
+//  after nvram init, set the following one to 'manual'
+//  to allow the remote credits mode to work
 	PORT_DIPNAME( 0x80, 0x00, "Payout" )            PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Hopper" )
 	PORT_DIPSETTING(    0x80, "Manual Payout SW" )
@@ -2532,7 +2558,7 @@
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x20, 0x00, "Joker" )             PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x00, "With Joker" )        /* also enable Five of a Kind */
+	PORT_DIPSETTING(    0x00, "With Joker" )        // also enables Five of a Kind
 	PORT_DIPSETTING(    0x20, "Without Joker" )
 	PORT_DIPNAME( 0x40, 0x00, "Hold" )              PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x00, "Auto Hold" )
@@ -2630,7 +2656,7 @@
 
 static INPUT_PORTS_START( chinatow )
 	PORT_START("IN0")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )    /* no remote credits */
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )        // no remote credits
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD1 )    PORT_NAME("Stop 1 / Switch Bet (1-Max)")
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_CANCEL )   PORT_NAME("Clear / Bet / Prendi (Take)")
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )         PORT_NAME("Start / Gioca (Play) / Gmable")
@@ -2687,7 +2713,7 @@
 
 static INPUT_PORTS_START( rcdino4 )
 	PORT_START("IN0")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )    /* no remote credits */
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )        // no remote credits
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD1 )    PORT_NAME("Stop 1")
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_CANCEL )   PORT_NAME("Clear / Bet")
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )         PORT_NAME("Start")
@@ -2744,7 +2770,7 @@
 
 static INPUT_PORTS_START( royal )
 	PORT_START("IN0")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )    /* no remote credits */
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )        // no remote credits
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD1 )    PORT_NAME("Stop 1 / Switch Bet (1-Max)")
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_CANCEL )   PORT_NAME("Clear / Bet / Prendi (Take)")
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )         PORT_NAME("Start / Gioca (Play)")
@@ -2894,11 +2920,11 @@
    in the first and second half of the bipolar PROM.
 */
 
-static GFXDECODE_START( gfx_fw1stpal )  /* Adressing the first half of the palette */
+static GFXDECODE_START( gfx_fw1stpal )  // Adressing the first half of the palette
 	GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 16 )
 GFXDECODE_END
 
-static GFXDECODE_START( gfx_fw2ndpal )  /* Adressing the second half of the palette */
+static GFXDECODE_START( gfx_fw2ndpal )  // Adressing the second half of the palette
 	GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0x100, 16 )
 GFXDECODE_END
 
@@ -2965,7 +2991,8 @@
 
 */
 
-/* these ports are set to output anyway, but this quietens the log */
+
+// these ports are set to output anyway, but this quietens the log
 uint8_t funworld_state::funquiz_ay8910_a_r()
 {
 	return 0x00;
@@ -2976,6 +3003,7 @@
 	return 0x00;
 }
 
+
 /********************************
 *     Machine Start & Reset     *
 ********************************/
@@ -2995,14 +3023,15 @@
 	membank("bank1")->set_entry(seldsw);
 }
 
+
 /**************************
 *     Machine Drivers     *
 **************************/
 
 void funworld_state::fw1stpal(machine_config &config)
 {
-	/* basic machine hardware */
-	M65SC02(config, m_maincpu, CPU_CLOCK);    /* 2MHz */
+	// basic machine hardware
+	M65SC02(config, m_maincpu, CPU_CLOCK);  // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &funworld_state::funworld_map);
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
@@ -3016,31 +3045,31 @@
 	pia1.readpb_handler().set_ioport("DSW");
 	pia1.ca2_handler().set(FUNC(funworld_state::pia1_ca2_w));
 
-	/* video hardware */
+	// video hardware
 
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(60);
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
-	screen.set_size((124+1)*4, (30+1)*8);               /* Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1) */
-	screen.set_visarea(0*4, 96*4-1, 0*8, 29*8-1);  /* Taken from MC6845 init, registers 01 & 06 */
+	screen.set_size((124+1)*4, (30+1)*8);           // Taken from MC6845 init, registers 00 & 04. Normally programmed with (value-1)
+	screen.set_visarea(0*4, 96*4-1, 0*8, 29*8-1);   // Taken from MC6845 init, registers 01 & 06
 	screen.set_screen_update(FUNC(funworld_state::screen_update_funworld));
 
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_fw1stpal);
 	PALETTE(config, m_palette, FUNC(funworld_state::funworld_palette), 0x200);
 
-	mc6845_device &crtc(MC6845(config, "crtc", CRTC_CLOCK));    /* 2MHz, verified on jollycrd & royalcrd */
+	mc6845_device &crtc(MC6845(config, "crtc", CRTC_CLOCK));    // 2 MHz, verified on jollycrd & royalcrd
 	crtc.set_screen("screen");
 	crtc.set_show_border_area(false);
 	crtc.set_char_width(4);
 	crtc.out_vsync_callback().set_inputline(m_maincpu, INPUT_LINE_NMI);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 
-	ay8910_device &ay8910(AY8910(config, "ay8910", SND_CLOCK));    /* 2MHz */
+	ay8910_device &ay8910(AY8910(config, "ay8910", SND_CLOCK)); // 2 MHz.
 	ay8910.port_a_write_callback().set(FUNC(funworld_state::funworld_lamp_a_w));
 	ay8910.port_b_write_callback().set(FUNC(funworld_state::funworld_lamp_b_w));
-	ay8910.add_route(ALL_OUTPUTS, "mono", 2.5);  /* analyzed to avoid clips */
+	ay8910.add_route(ALL_OUTPUTS, "mono", 2.5); // analyzed to avoid clips
 }
 
 
@@ -3048,7 +3077,7 @@
 {
 	fw1stpal(config);
 
-	R65C02(config.replace(), m_maincpu, CPU_CLOCK); /* 2MHz */
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK); // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &funworld_state::funworld_map);
 
 	m_gfxdecode->set_info(gfx_fw2ndpal);
@@ -3061,7 +3090,7 @@
 	fw1stpal(config);  // gray background.
 //  fw2ndpal(config);  // blue background.
 
-	R65C02(config.replace(), m_maincpu, CPU_CLOCK); /* 2MHz */
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK); // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &funworld_state::funquiz_map);
 
 	subdevice<ay8910_device>("ay8910")->port_a_read_callback().set(FUNC(funworld_state::funquiz_ay8910_a_r));
@@ -3073,15 +3102,15 @@
 {
 	fw1stpal(config);
 
-	R65C02(config.replace(), m_maincpu, CPU_CLOCK); /* 2MHz */
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK); // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &magicrd2_state::magicrd2_map);
 
 	subdevice<mc6845_device>("crtc")->set_visarea_adjust(0, -56, 0, 0);
 
-	ay8910_device &ay8910(AY8910(config.replace(), "ay8910", SND_CLOCK));    /* 2MHz */
+	ay8910_device &ay8910(AY8910(config.replace(), "ay8910", SND_CLOCK));   // 2 MHz.
 	ay8910.port_a_write_callback().set(FUNC(magicrd2_state::funworld_lamp_a_w));
 	ay8910.port_b_write_callback().set(FUNC(magicrd2_state::funworld_lamp_b_w));
-	ay8910.add_route(ALL_OUTPUTS, "mono", 1.5);  /* analyzed to avoid clips */
+	ay8910.add_route(ALL_OUTPUTS, "mono", 1.5); // analyzed to avoid clips
 }
 
 
@@ -3089,7 +3118,7 @@
 {
 	fw1stpal(config);
 
-	R65C02(config.replace(), m_maincpu, CPU_CLOCK); /* (G65SC02P in pro version) 2MHz */
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK); // (G65SC02P in pro version) 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &funworld_state::magicrd2_map);
 }
 
@@ -3098,7 +3127,7 @@
 {
 	fw2ndpal(config);
 
-	R65C02(config.replace(), m_maincpu, CPU_CLOCK); /* 2MHz */
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK); // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &funworld_state::magicrd2_map);
 }
 
@@ -3107,7 +3136,7 @@
 {
 	fw1stpal(config);
 
-	R65C02(config.replace(), m_maincpu, CPU_CLOCK); /* 2MHz */
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK); // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &funworld_state::cuoreuno_map);
 }
 
@@ -3116,13 +3145,13 @@
 {
 	fw1stpal(config);
 
-	R65C02(config.replace(), m_maincpu, CPU_CLOCK); /* 2MHz */
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK); // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &funworld_state::saloon_map);
 
 	config.device_remove("pia0");
 	config.device_remove("pia1");
 
-	/* Serial Memory */
+	// Serial Memory
 	I2C_24C02(config, "i2cmem", 0).set_e0(1); // ? or maybe 2nd half of 24C04?
 }
 
@@ -3131,7 +3160,7 @@
 {
 	fw1stpal(config);
 
-	R65C02(config.replace(), m_maincpu, CPU_CLOCK); /* 2MHz */
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK); // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &funworld_state::witchryl_map);
 }
 
@@ -3140,7 +3169,7 @@
 {
 	fw1stpal(config);
 
-	R65C02(config.replace(), m_maincpu, CPU_CLOCK); /* 2MHz */
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK); // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &lunapark_state::lunapark_map);  // mirrored video RAM (4000/5000 to 6000/7000).
 }
 
@@ -3149,7 +3178,7 @@
 {
 	fw2ndpal(config);
 
-	R65C02(config.replace(), m_maincpu, CPU_CLOCK); /* 2MHz */
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK); // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &chinatow_state::chinatow_map);
 }
 
@@ -3157,7 +3186,7 @@
 {
 	fw1stpal(config);
 
-	R65C02(config.replace(), m_maincpu, CPU_CLOCK); /* 2MHz */
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK); // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &chinatow_state::chinatow_map);
 }
 
@@ -3166,7 +3195,7 @@
 {
 	fw1stpal(config);
 
-	M65SC02(config.replace(), m_maincpu, CPU_CLOCK); /* 2MHz */
+	M65SC02(config.replace(), m_maincpu, CPU_CLOCK);    // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &intergames_state::intergames_map);
 	//m_maincpu->set_periodic_int(FUNC(intergames_state::nmi_line_pulse), attotime::from_hz(60));
 
@@ -3178,7 +3207,7 @@
 {
 	fw1stpal(config);
 
-	R65C02(config.replace(), m_maincpu, CPU_CLOCK); /* 2MHz */
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK); // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &funworld_state::fw_brick_map);
 
 	NVRAM(config, "nvram1", nvram_device::DEFAULT_ALL_0);
@@ -3189,12 +3218,22 @@
 {
 	fw2ndpal(config);
 
-	R65C02(config.replace(), m_maincpu, CPU_CLOCK); /* 2MHz */
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK); // 2 MHz.
 	m_maincpu->set_addrmap(AS_PROGRAM, &funworld_state::fw_brick_map);
 
 	NVRAM(config, "nvram1", nvram_device::DEFAULT_ALL_0);
 }
 
+
+void funworld_state::gratispk(machine_config &config)
+{
+//  fw1stpal(config);  // card deck wrong colors.
+	fw2ndpal(config);  // correct palette
+
+	m_maincpu->set_addrmap(AS_PROGRAM, &funworld_state::gratispk_map);
+}
+
+
 uint8_t royalcrdf_state::royalcrdf_opcode_r(offs_t offset)
 {
 	// address-based data bitswap; 4 address bits are involved, but only
@@ -3208,39 +3247,39 @@
 	// 1-bit-to-1-bit bitswaps; furthermore, in both sets one of the
 	// bitswaps is equal to the one applied to all the data (but notice
 	// that, in those cases, we are applying it twice to opcodes here)
-	constexpr std::array<std::array<int,4>,16> bs{{ // bitswaps for data bits 1,2,5 & 7, in that order
-		{ 1,5,2,7 },
-		{ 1,5,2,7 },
-		{ 5,1,7,2 },
-		{ 7,2,5,1 },
-		{ 1,5,2,7 },
-		{ 1,5,2,7 },
-		{ 5,2,1,7 },
-		{ 7,2,5,1 },
-		{ 1,5,2,7 },
-		{ 1,5,2,7 },
-		{ 5,1,7,2 },
-		{ 1,7,5,2 },
-		{ 1,5,2,7 },
-		{ 1,5,2,7 },
-		{ 5,2,1,7 },
-		{ 1,7,5,2 }
+	constexpr std::array<std::array<int, 4>, 16> bs{{ // bitswaps for data bits 1, 2, 5 & 7, in that order
+		{ 1, 5, 2, 7 },
+		{ 1, 5, 2, 7 },
+		{ 5, 1, 7, 2 },
+		{ 7, 2, 5, 1 },
+		{ 1, 5, 2, 7 },
+		{ 1, 5, 2, 7 },
+		{ 5, 2, 1, 7 },
+		{ 7, 2, 5, 1 },
+		{ 1, 5, 2, 7 },
+		{ 1, 5, 2, 7 },
+		{ 5, 1, 7, 2 },
+		{ 1, 7, 5, 2 },
+		{ 1, 5, 2, 7 },
+		{ 1, 5, 2, 7 },
+		{ 5, 2, 1, 7 },
+		{ 1, 7, 5, 2 }
 	}};
 
 	// xor masks, dependent on the same address bits than the bitswaps,
 	// and with the same 5-values structure
-	constexpr std::array<uint8_t,16> xm {
+	constexpr std::array<uint8_t, 16> xm {
 		0x02, 0x02, 0xa6, 0x82, 0x02, 0x02, 0x06, 0x82, 0x02, 0x02, 0xa6, 0x00, 0x02, 0x02, 0x06, 0x00
 	};
 
 	uint8_t data {_maincpu->space(AS_PROGRAM).read_byte(offset)};
 
-	if(offset<0x800)
-		data = bitswap<8>(data^0x22,2,6,7,4,3,1,5,0);
+	if(offset < 0x800)
+		data = bitswap<8>(data ^ 0x22, 2, 6, 7, 4, 3, 1, 5, 0);
 
-	unsigned idx {bitswap<4>(offset, 8,5,2,1)};
+	unsigned idx {bitswap<4>(offset, 8, 5, 2, 1)};
 
-	return bitswap<8>(data, bs[idx][3],6,bs[idx][2],4,3,bs[idx][1],bs[idx][0],0) ^ xm[idx];
+	return bitswap<8>(data, bs[idx][3], 6, bs[idx][2], 4, 3, bs[idx][1], bs[idx][0], 0) ^ xm[idx];
 }
 
 void royalcrdf_state::royalcrdf_opcodes_map(address_map &map)
@@ -3253,15 +3292,15 @@
 	uint8_t *ROM = memregion("maincpu")->base();
 	for (int x = 0x8000; x < 0x10000; x++)
 	{
-		ROM[x] = bitswap<8>(ROM[x]^0x22,2,6,7,4,3,1,5,0);
+		ROM[x] = bitswap<8>(ROM[x] ^ 0x22, 2, 6, 7, 4, 3, 1, 5, 0);
 	}
 
 /*  Temporary hack to modify the value that ends to be a NOP,
     after the BRK, and balanced checksums. Will be removed once
     found a workaround in the decryption routines.
 */
-	ROM[0x802d]=0xa2;  // checksum.
-	ROM[0xbc4e]=0x68;  // future NOP after BRK.
+	ROM[0x802d] = 0xa2;  // checksum.
+	ROM[0xbc4e] = 0x68;  // future NOP after BRK.
 }
 
 void royalcrdf_state::royalcrdf(machine_config &config)
@@ -3283,19 +3322,19 @@
 	// one of the address bits don't have effect on the bitswap, just on the xor;
 	// again, we have just five different bitswaps, and the hardware is probably using
 	// passive logic on the address bits to do the selection
-	constexpr std::array<std::array<int,5>,8> bs{{ // bitswaps for data bits 0,2,4,5 & 7, in that order
-		{ 5,2,4,0,7 },
-		{ 4,0,2,7,5 },
-		{ 7,4,5,2,0 },
-		{ 4,0,2,7,5 },
-		{ 2,7,0,5,4 },
-		{ 4,0,2,7,5 },
-		{ 0,5,7,4,2 },
-		{ 4,0,2,7,5 }
+	constexpr std::array<std::array<int, 5>, 8> bs{{ // bitswaps for data bits 0, 2, 4, 5 & 7, in that order
+		{ 5, 2, 4, 0, 7 },
+		{ 4, 0, 2, 7, 5 },
+		{ 7, 4, 5, 2, 0 },
+		{ 4, 0, 2, 7, 5 },
+		{ 2, 7, 0, 5, 4 },
+		{ 4, 0, 2, 7, 5 },
+		{ 0, 5, 7, 4, 2 },
+		{ 4, 0, 2, 7, 5 }
 	}};
 
 	// xor masks
-	constexpr std::array<uint8_t,16> xm {
+	constexpr std::array<uint8_t, 16> xm {
 		0x00, 0x00, 0x10, 0x00, 0x20, 0x00, 0x30, 0x00, 0x00, 0xb5, 0x10, 0xb5, 0x20, 0xb5, 0x30, 0xb5
 	};
 
@@ -3315,7 +3354,7 @@
 	uint8_t *ROM = memregion("maincpu")->base();
 	for (int x = 0x4000; x < 0x10000; x++)
 	{
-		ROM[x] = bitswap<8>(ROM[x]^0x91,5,6,7,2,3,0,1,4);
+		ROM[x] = bitswap<8>(ROM[x] ^ 0x91, 5, 6, 7, 2, 3, 0, 1, 4);
 	}
 }
 
@@ -3355,7 +3394,7 @@
 
 	constexpr uint8_t UNKN {0xfc};
 
-	constexpr std::array<std::array<uint8_t,256>,4> decryption_tables{{
+	constexpr std::array<std::array<uint8_t, 256>, 4> decryption_tables{{
 		//  _0    _1    _2    _3    _4    _5    _6    _7    _8    _9    _a    _b    _c    _d    _e    _f
 		{ 0xe8, 0x29, UNKN, UNKN, 0x85, UNKN, 0x18, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, 0xd5,  // 0_
 		  UNKN, UNKN, 0xa6, 0x4c, UNKN, UNKN, 0x84, UNKN, UNKN, UNKN, 0x69, UNKN, 0x91, 0x38, 0xa8, UNKN,  // 1_
@@ -3430,7 +3469,7 @@
 	}};
 
 	uint8_t data {_maincpu->space(AS_PROGRAM).read_byte(offset)};
-	return decryption_tables[offset&3][data];
+	return decryption_tables[offset & 3][data];
 }
 
 void powercrd_state::powercrd_opcodes_map(address_map &map)
@@ -3470,7 +3509,7 @@
 
 	constexpr uint8_t UNKN {0xfc};
 
-	constexpr std::array<std::array<uint8_t,256>,4> decryption_tables{{
+	constexpr std::array<std::array<uint8_t, 256>, 4> decryption_tables{{
 		//  _0    _1    _2    _3    _4    _5    _6    _7    _8    _9    _a    _b    _c    _d    _e    _f
 		{ UNKN, 0x6c, UNKN, UNKN, UNKN, 0xfa, 0x38, UNKN, UNKN, 0x4c, 0xd8, UNKN, 0xe8, UNKN, 0xc5, UNKN,  // 0_
 		  UNKN, 0xa6, 0x91, UNKN, UNKN, UNKN, UNKN, 0x58, 0xa0, 0xe0, 0xb9, 0x4e, UNKN, UNKN, UNKN, 0x78,  // 1_
@@ -3545,7 +3584,7 @@
 	}};
 
 	uint8_t data {_maincpu->space(AS_PROGRAM).read_byte(offset)};
-	return decryption_tables[offset&3][data];
+	return decryption_tables[offset & 3][data];
 }
 
 void megacard_state::megacard_opcodes_map(address_map &map)
@@ -3619,7 +3658,7 @@
 
 	constexpr uint8_t UNKN {0xfc};
 
-	constexpr std::array<std::array<uint8_t,256>,4> decryption_tables{{
+	constexpr std::array<std::array<uint8_t, 256>, 4> decryption_tables{{
 		//  _0    _1    _2    _3    _4    _5    _6    _7    _8    _9    _a    _b    _c    _d    _e    _f
 		{ UNKN, UNKN, UNKN, 0x3d, 0xe0, UNKN, UNKN, 0xb0, UNKN, 0xa0, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN,  // 0_
 		  UNKN, UNKN, 0x4a, 0x65, 0x18, 0x64, 0xad, UNKN, 0x90, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN, UNKN,  // 1_
@@ -3694,7 +3733,7 @@
 	}};
 
 	uint8_t data {_maincpu->space(AS_PROGRAM).read_byte(offset)};
-	return decryption_tables[offset&3][data];
+	return decryption_tables[offset & 3][data];
 }
 
 void jokercrd_state::jokercrd_opcodes_map(address_map &map)
@@ -3792,7 +3831,7 @@
 	ROM_LOAD( "jolycard.ch2", 0x0000, 0x8000, CRC(c512b103) SHA1(1f4e78e97855afaf0332fb75e1b5571aafd01c29) )
 	ROM_LOAD( "jolycard.ch1", 0x8000, 0x8000, CRC(0f24f39d) SHA1(ac1f6a8a4a2a37cbc0d45c15187b33c25371bffb) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jollycrd_nvram.bin", 0x0000, 0x0800, CRC(8f0a86c9) SHA1(467bd4f601ac6aa818c036f1269c2d43d27854f6) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -3828,13 +3867,13 @@
 	ROM_LOAD( "tab3.bin", 0x0000, 0x8000, CRC(c512b103) SHA1(1f4e78e97855afaf0332fb75e1b5571aafd01c29) )
 	ROM_LOAD( "tab2.bin", 0x8000, 0x8000, CRC(0f24f39d) SHA1(ac1f6a8a4a2a37cbc0d45c15187b33c25371bffb) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* Default NVRAM. The game doesn't work without it */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM. the game doesn't work without it
 	ROM_LOAD( "jollycrda_nvram.bin", 0x0000, 0x0800, CRC(5cbb4d8f) SHA1(da5edbef20bb4f0c634939389b3a9744c5743641) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "jop.bin", 0x0000, 0x0200, CRC(5ebc5659) SHA1(8d59011a181399682ab6e8ed14f83101e9bfa0c6) )
 
-	ROM_REGION( 0x0200, "plds", 0 )    /* Cracked PLD */
+	ROM_REGION( 0x0200, "plds", 0 ) // cracked PLD
 	ROM_LOAD( "tab1.0_gal16v8s.bin", 0x0000, 0x0117, CRC(574f9a48) SHA1(bb5e2e86da85130d92f61cc57038a844950f443e) )
 ROM_END
 
@@ -3847,7 +3886,7 @@
 	ROM_LOAD( "jolycard.ch2", 0x0000, 0x8000, CRC(c512b103) SHA1(1f4e78e97855afaf0332fb75e1b5571aafd01c29) )
 	ROM_LOAD( "jolycard.ch1", 0x8000, 0x8000, CRC(0f24f39d) SHA1(ac1f6a8a4a2a37cbc0d45c15187b33c25371bffb) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolyc3x3_nvram.bin", 0x0000, 0x0800, CRC(727c70cf) SHA1(3639b0891514064e21ebdb280791cc9c8f5ba481) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -3912,18 +3951,20 @@
 */
 
 ROM_START( jolycmzs )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* MZS Tech */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // MZS Tech
 	ROM_LOAD( "mzstech.bin", 0x8000, 0x8000, CRC(cebd1e56) SHA1(24d88b3383cecf3829556d75460053663aab4ef1) )
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "jolycard.ch2", 0x0000, 0x8000, CRC(c512b103) SHA1(1f4e78e97855afaf0332fb75e1b5571aafd01c29) )
 	ROM_LOAD( "jolycard.ch1", 0x8000, 0x8000, CRC(0f24f39d) SHA1(ac1f6a8a4a2a37cbc0d45c15187b33c25371bffb) )
 
-/*  Load a default eeprom, otherwise an annoying password system should be inserted with
-    inputs correlated to a code that pops up on the screen.
-    This code should be inserted into a PC-DOS program, that program is nowhere to be found right now.
+/*  Load a default NVRAM, otherwise an annoying password system appears
+    generating a code that needs to be parsed by a PC-DOS program, that
+    is currently missing and never would appear. This program is supossed
+    to give back an hexa code to feed in the game through a combination
+    of inputs.
 */
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolycmzs_nvram.bin", 0x0000, 0x0800, CRC(828ffeef) SHA1(6a52282231f1944ba79049f267a9c1941373aea2) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -3931,18 +3972,20 @@
 ROM_END
 
 ROM_START( jolyc980 )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Spale Soft */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Spale Soft
 	ROM_LOAD( "j980.bin", 0x8000, 0x8000, CRC(48249fff) SHA1(390cd0eb3399446a66363dc6760458170e1970fd) )
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "jolycard.ch2", 0x0000, 0x8000, CRC(c512b103) SHA1(1f4e78e97855afaf0332fb75e1b5571aafd01c29) )
 	ROM_LOAD( "jolycard.ch1", 0x8000, 0x8000, CRC(0f24f39d) SHA1(ac1f6a8a4a2a37cbc0d45c15187b33c25371bffb) )
 
-/*  Load a default eeprom, otherwise an annoying password system should be inserted with
-    inputs correlated to a code that pops up on the screen.
-    This code should be inserted into a PC-DOS program, that program is nowhere to be found right now.
+/*  Load a default NVRAM, otherwise an annoying password system appears
+    generating a code that needs to be parsed by a PC-DOS program, that
+    is currently missing and never would appear. This program is supossed
+    to give back an hexa code to feed in the game through a combination
+    of inputs.
 */
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolyc980_nvram.bin", 0x0000, 0x0800, CRC(ef2c89c7) SHA1(a286001e205dcd16d914e07ba2b7c820335ab9c2) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -3950,7 +3993,7 @@
 ROM_END
 
 
-ROM_START( jolycdev )   /* Jolly Card (lipa) from Evona */
+ROM_START( jolycdev )   // Jolly Card (lipa) from Evona
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "lipa.bin", 0x8000, 0x8000, CRC(62657c98) SHA1(237466dde26540c119c631c75f51c87ea59d1a91) )
 
@@ -3958,7 +4001,7 @@
 	ROM_LOAD( "jollyb.bin", 0x0000, 0x8000, CRC(c512b103) SHA1(1f4e78e97855afaf0332fb75e1b5571aafd01c29) )
 	ROM_LOAD( "jollya.bin", 0x8000, 0x8000, CRC(0f24f39d) SHA1(ac1f6a8a4a2a37cbc0d45c15187b33c25371bffb) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolycdev_nvram.bin", 0x0000, 0x0800, CRC(ae2c2fb8) SHA1(912d673ea8e26ff62520a7b86e702e5260cff4c0) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -3987,7 +4030,7 @@
     Only remote credits, as can be seen in test mode.
 */
 
-ROM_START( jolyccra )   /* Jolly Card (croatian, set 1) */
+ROM_START( jolyccra )   // Jolly Card (Croatian, set 1)
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "jollyc.bin", 0x8000, 0x8000, CRC(8926d99d) SHA1(dd5d1ac03d30d823dfcfe1349328ecb7afbc37fa) )
 
@@ -3995,7 +4038,7 @@
 	ROM_LOAD( "jollyb.bin", 0x0000, 0x8000, CRC(c512b103) SHA1(1f4e78e97855afaf0332fb75e1b5571aafd01c29) )
 	ROM_LOAD( "jollya.bin", 0x8000, 0x8000, CRC(0f24f39d) SHA1(ac1f6a8a4a2a37cbc0d45c15187b33c25371bffb) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolyccra_nvram.bin", 0x0000, 0x0800, CRC(478ab0a9) SHA1(8c5160d2ac8d4a9db0ae1e478d3bb1513a04544f) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -4003,7 +4046,7 @@
 ROM_END
 
 
-ROM_START( jolyccrb )   /* Jolly Card (croatian, set 2) */
+ROM_START( jolyccrb )   // Jolly Card (Croatian, set 2)
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "jollypkr.003", 0x8000, 0x8000, CRC(ea7340b4) SHA1(7dd468f28a488a4781521809d06db1d7917048ad) )
 
@@ -4011,7 +4054,7 @@
 	ROM_LOAD( "jolycard.ch2", 0x0000, 0x8000, CRC(c512b103) SHA1(1f4e78e97855afaf0332fb75e1b5571aafd01c29) )
 	ROM_LOAD( "jolycard.ch1", 0x8000, 0x8000, CRC(0f24f39d) SHA1(ac1f6a8a4a2a37cbc0d45c15187b33c25371bffb) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolyccrb_nvram.bin", 0x0000, 0x0800, CRC(c1d49c88) SHA1(27ffdedfc7f09ff11c3b2537db3681473b776074) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -4041,7 +4084,7 @@
     - 1x trimmer (volume)(missing)
 */
 
-ROM_START( jolycdit )   /* blue TAB PCB, encrypted graphics */
+ROM_START( jolycdit )   // blue TAB PCB, encrypted graphics
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "jn.bin", 0x8000, 0x8000, CRC(6ae00ed0) SHA1(5921c2882aeb5eadd0e04a477fa505ad35e9d98c) )
 
@@ -4049,7 +4092,7 @@
 	ROM_LOAD( "2.bin", 0x0000, 0x8000, CRC(46805150) SHA1(63687ac44f6ace6d8924b2629536bcc7d3979ed2) )
 	ROM_LOAD( "1.bin", 0x8000, 0x8000, CRC(43bcb2df) SHA1(5022bc3a0b852a7cd433e25c3c90a720e6328261) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolycdit_nvram.bin", 0x0000, 0x0800, CRC(c55c6706) SHA1(a38ae926f057fb47e48ca841b2d097fc4fd06416) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -4061,7 +4104,7 @@
 
 
 /*
-    Jolly Card (italian encrypted bootleg)
+    Jolly Card (Italian encrypted bootleg)
     --------------------------------------
 
     - 1x UM6845P
@@ -4091,7 +4134,7 @@
     Only remote credits, as can be seen in test mode.
 */
 
-ROM_START( jolycdib )   /* bootleg PCB, encrypted graphics */
+ROM_START( jolycdib )   // bootleg PCB, encrypted graphics
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "3.bin", 0x8000, 0x8000, CRC(c76fdc79) SHA1(fc75c274d64fa9c99a546d424f38e79f1acf2576) )
 
@@ -4099,7 +4142,7 @@
 	ROM_LOAD( "2.bin", 0x0000, 0x8000, CRC(46805150) SHA1(63687ac44f6ace6d8924b2629536bcc7d3979ed2) ) // sldh
 	ROM_LOAD( "1.bin", 0x8000, 0x8000, CRC(43bcb2df) SHA1(5022bc3a0b852a7cd433e25c3c90a720e6328261) ) // sldh
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolycdib_nvram.bin", 0x0000, 0x0800, CRC(038a71fe) SHA1(99d3befbee8f9f86ce7f074de7f16fb25053c077) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -4111,7 +4154,7 @@
 
 
 /*
-    Jolly Card (italian encrypted bootleg, set 2)
+    Jolly Card (Italian encrypted bootleg, set 2)
     ---------------------------------------------
 
     This program works in both 'normal' and 'remote' modes,
@@ -4125,18 +4168,18 @@
     buttons.
 */
 
-ROM_START( jolycdic )   /* another bootleg PCB, encrypted graphics */
+ROM_START( jolycdic )   // another bootleg PCB, encrypted graphics
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "3ss.bin", 0x8000, 0x8000, CRC(3d7cde61) SHA1(6154878491f4d2f1ea035d18cdf43154c550d509) )
-	ROM_IGNORE(                  0x8000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                  0x8000 )   // Identical halves. Discarding 2nd half
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "2.bin", 0x0000, 0x8000, CRC(32c24495) SHA1(0d78c4d2743401b5ec9919d09814064eeac8023f) ) // sldh
-	ROM_IGNORE(                0x8000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                0x8000 ) // Identical halves. Discarding 2nd half
 	ROM_LOAD( "1.bin", 0x8000, 0x8000, CRC(91093176) SHA1(b889c617f94161933c35c324c7d84fec182953d8) ) // sldh
-	ROM_IGNORE(                0x8000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                0x8000 ) // Identical halves. Discarding 2nd half
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolycdic_nvram.bin", 0x0000, 0x0800, CRC(47a5890b) SHA1(6a6531fe5e8f6c1b5a9aac314b2cce6a0129f6da) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -4146,6 +4189,44 @@
 	ROM_LOAD( "gal16v8b.bin", 0x0000, 0x0117, NO_DUMP ) // sldh
 ROM_END
 
+/*
+  Jolly Card (Italian encrypted bootleg, set 3)
+  ---------------------------------------------
+
+  Running in a Cleco bootleg board.
+  Encrypted GFX.
+
+  Differences: 1 byte.
+
+         jolycdib     jolycdic
+
+  C1D6:    0x60         0x10
+
+  C1E5:  lda #$60     lda #$10
+  C1E7:  sta $0000    sta $0000
+  C1EA:  sta $0003    sta $0003
+  C1ED:  sta $07f8    sta $07f8
+
+*/
+ROM_START( jolycdii )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "145-3.bin", 0x8000, 0x8000, CRC(812f88f1) SHA1(d387b7e4818dc6f5f2b6161a623c6e4f1eeedf2a) )
+
+	ROM_REGION( 0x10000, "gfx1", 0 )
+	ROM_LOAD( "145-2.bin", 0x0000, 0x8000, CRC(46805150) SHA1(63687ac44f6ace6d8924b2629536bcc7d3979ed2) )
+	ROM_LOAD( "145-1.bin", 0x8000, 0x8000, CRC(43bcb2df) SHA1(5022bc3a0b852a7cd433e25c3c90a720e6328261) )
+
+	ROM_REGION( 0x0800, "nvram", 0 )    // Default NVRAM
+	ROM_LOAD( "jolycdii_nvram.bin", 0x0000, 0x0800, CRC(c2a138ad) SHA1(463fed8b495fa5286513f52fa09cf97f29e5f40e) )
+
+	ROM_REGION( 0x0800, "proms", 0 )    // Not a bipolar PROM. Just a replacement.
+	ROM_LOAD( "ws57c291_d27hc65d.bin", 0x0000, 0x0200, CRC(d96f3760) SHA1(07e80baf9c6c08171195b7810261e043197a9c3c) )
+	ROM_IGNORE(                                0x0600 ) // empty
+
+	ROM_REGION( 0x0200, "plds", 0 )
+	ROM_LOAD( "gal16v8b.bin", 0x0000, 0x0117, NO_DUMP )
+ROM_END
+
 
 /* Jolly Card Italian bootleg...
 
@@ -4186,17 +4267,17 @@
    1x Unknown POT between two caps, maybe for sound amp stage.
 
 */
-ROM_START( jolycdid )   /* Altera EP910PC CPLD */
+ROM_START( jolycdid )   // Altera EP910PC CPLD
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "5.cpu", 0x8000, 0x8000, CRC(56158851) SHA1(abf1daad1198dcc017352742e3c00d57e8955bd4) )
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "7.bin", 0x0000, 0x8000, CRC(a4452751) SHA1(a0b32a8801ebaee7ede7873b244f1a424433fe94) )
-	ROM_CONTINUE( 0x0000, 0x8000) /* Discarding 1nd half 1ST AND 2ND HALF IDENTICAL*/
+	ROM_CONTINUE( 0x0000, 0x8000)   // Discarding 1nd half. 1ST AND 2ND HALF IDENTICAL
 	ROM_LOAD( "6.bin", 0x8000, 0x8000, CRC(8b64d4c6) SHA1(8106cba31cd3fbda0855e6070182d248e3d52495) )
-	ROM_CONTINUE( 0x8000, 0x8000) /* Discarding 1nd half 1ST AND 2ND HALF IDENTICAL*/
+	ROM_CONTINUE( 0x8000, 0x8000)   // Discarding 1nd half. 1ST AND 2ND HALF IDENTICAL
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolycdid_nvram.bin", 0x0000, 0x0800, CRC(6eb66015) SHA1(39490cf5d404c9e9fb58439f6d9876a3e9b29ba0) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -4216,7 +4297,7 @@
    used by another program.
 
 */
-ROM_START( jolycdie )   /* Bootleg PCB, NON encrypted graphics */
+ROM_START( jolycdie )   // Bootleg PCB, NON encrypted graphics
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "aic.cpu", 0x8000, 0x8000, CRC(56158851) SHA1(abf1daad1198dcc017352742e3c00d57e8955bd4) )
 
@@ -4224,7 +4305,7 @@
 	ROM_LOAD( "c.bin", 0x0000, 0x8000, CRC(eff5362c) SHA1(1c9a48866dc5ee37fad6d68465f326d243c821c3) )
 	ROM_LOAD( "b.bin", 0x8000, 0x8000, CRC(98309e14) SHA1(0d3e3766768fafc728a08668ad693f950d1fabab) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolycdie_nvram.bin", 0x0000, 0x0800, CRC(1b2fba44) SHA1(be5c956517072581edaebe9ae440a542964c8490) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -4240,15 +4321,15 @@
    5 & 6 are coins.
    W is payout.
 */
-ROM_START( jolycdif )   /* Altera EP910PC CPLD */
+ROM_START( jolycdif )   // Altera EP910PC CPLD
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "1.bin", 0x8000, 0x8000, CRC(80983f6a) SHA1(222ce5d4800887de92a73decbad31e96f8da3b4a) )
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "2.bin", 0x0000, 0x8000, CRC(a4452751) SHA1(a0b32a8801ebaee7ede7873b244f1a424433fe94) )
-	ROM_CONTINUE( 0x0000, 0x8000) /* Discarding 1nd half 1ST AND 2ND HALF IDENTICAL*/
+	ROM_CONTINUE( 0x0000, 0x8000)   // Discarding 1nd half. 1ST AND 2ND HALF IDENTICAL
 	ROM_LOAD( "3.bin", 0x8000, 0x8000, CRC(2856c82d) SHA1(7ce835bc2246ffede180cff0d8d0d4528afcc297) )
-	ROM_CONTINUE( 0x8000, 0x8000) /* Discarding 1nd half 1ST AND 2ND HALF IDENTICAL*/
+	ROM_CONTINUE( 0x8000, 0x8000)   // Discarding 1nd half. 1ST AND 2ND HALF IDENTICAL
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "82s147.bin", 0x0000, 0x0200, CRC(5ebc5659) SHA1(8d59011a181399682ab6e8ed14f83101e9bfa0c6) ) // proper dump
@@ -4309,9 +4390,9 @@
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "3.bin", 0x0000, 0x8000, CRC(a4452751) SHA1(a0b32a8801ebaee7ede7873b244f1a424433fe94) )
-	ROM_CONTINUE( 0x0000, 0x8000) /* Discarding 1nd half 1ST AND 2ND HALF IDENTICAL*/
+	ROM_CONTINUE( 0x0000, 0x8000)   // Discarding 1nd half. 1ST AND 2ND HALF IDENTICAL
 	ROM_LOAD( "2.bin", 0x8000, 0x8000, CRC(8b64d4c6) SHA1(8106cba31cd3fbda0855e6070182d248e3d52495) )
-	ROM_CONTINUE( 0x8000, 0x8000) /* Discarding 1nd half 1ST AND 2ND HALF IDENTICAL*/
+	ROM_CONTINUE( 0x8000, 0x8000)   // Discarding 1nd half. 1ST AND 2ND HALF IDENTICAL
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "dm74s472n.bin", 0x0000, 0x0200, CRC(5ebc5659) SHA1(8d59011a181399682ab6e8ed14f83101e9bfa0c6) )
@@ -4320,11 +4401,11 @@
 	ROM_LOAD( "ep910.bin",           0x0000, 0x0884, CRC(aa62207e) SHA1(a2e51cf3617d07ff1ce42ee1d56e1c17b6fe71de) )
 	ROM_LOAD( "pal16v8h-25pc-4.bin", 0x0900, 0x0117, CRC(df5be97d) SHA1(8cd63d49ab7020cdec07c1198413dc7d93e90d35) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolycdih_nvram.bin", 0x0000, 0x0800, CRC(02b3b335) SHA1(207a1289e4298d942e4806adf8ffb87e0b9b4e58) )
 ROM_END
 
-ROM_START( sjcd2kx3 )   /* Super Joly 2000 3x */
+ROM_START( sjcd2kx3 )   // Super Joly 2000 3x
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "sj3.bin", 0x8000, 0x8000, CRC(c530b518) SHA1(36934d8e1e2cb2f71eb44a05b86ec970c9f398cd) )
 
@@ -4332,7 +4413,7 @@
 	ROM_LOAD( "sj2.bin", 0x0000, 0x8000, CRC(d7253325) SHA1(ad40e662519da9b11f77690b7d41c5007f74e280) )
 	ROM_LOAD( "sj1.bin", 0x8000, 0x8000, CRC(82741749) SHA1(d0bf3073dff9ba1c4913fd754f965951e9cb5b03) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "sjcd2kx3_nvram.bin", 0x0000, 0x0800, CRC(1141368b) SHA1(b4af2d59b5e8115440e1219a621cfd2fb8c2c978) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -4498,7 +4579,7 @@
 	ROM_LOAD( "poker4.003", 0x0000, 0x8000, CRC(8c33a15f) SHA1(a1c8451c99a23eeffaedb21d1a1b69f54629f8ab) )
 	ROM_LOAD( "poker4.002", 0x8000, 0x8000, CRC(5f4e12d8) SHA1(014b2364879faaf4922cdb82ee07692389f20c2d) )
 
-	ROM_REGION( 0x0200, "proms", 0 )    /* using joker card palette till a correct dump appear */
+	ROM_REGION( 0x0200, "proms", 0 )    // using joker card palette till a correct dump appear
 	ROM_LOAD( "jokercrd_prom.bin", 0x0000, 0x0200, BAD_DUMP CRC(e59fc06e) SHA1(88a3bb89f020fe2b20f768ca010a082e0b974831) )
 ROM_END
 
@@ -4511,7 +4592,7 @@
 	ROM_LOAD( "poker4.003", 0x0000, 0x8000, CRC(8c33a15f) SHA1(a1c8451c99a23eeffaedb21d1a1b69f54629f8ab) )
 	ROM_LOAD( "poker4.002", 0x8000, 0x8000, CRC(5f4e12d8) SHA1(014b2364879faaf4922cdb82ee07692389f20c2d) )
 
-	ROM_REGION( 0x0200, "proms", 0 )    /* using joker card palette till a correct dump appear */
+	ROM_REGION( 0x0200, "proms", 0 )    // using joker card palette till a correct dump appear
 	ROM_LOAD( "jokercrd_prom.bin", 0x0000, 0x0200, BAD_DUMP CRC(e59fc06e) SHA1(88a3bb89f020fe2b20f768ca010a082e0b974831) )
 ROM_END
 
@@ -4546,16 +4627,16 @@
 	ROM_LOAD( "cuore1b.u21", 0x0000, 0x8000, CRC(14eca2b8) SHA1(35cba415800c6cd3e6ed9946057f33510ad2bfc9) )
 	ROM_LOAD( "cuore1c.u22", 0x8000, 0x8000, CRC(253fac84) SHA1(1ad104ab8e8d73df6397a840a4b26565b245d7a3) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "cuoreuno_nvram.bin", 0x0000, 0x0800, CRC(b5a1bf25) SHA1(c2996a28c080debf10ab7a7dc47c305aed172a83) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "am27s29_cu.bin",    0x0000, 0x0200, CRC(7ea61749) SHA1(3167acd79f9bda2078c2af3e049ad6abf160aeae) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce16v8h_cu.u5",  0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "palce20v8h_cu.u22", 0x0200, 0x0157, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "palce20v8h_cu.u23", 0x0400, 0x0157, NO_DUMP ) /* PAL is read protected */
+	ROM_LOAD( "palce16v8h_cu.u5",  0x0000, 0x0117, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "palce20v8h_cu.u22", 0x0200, 0x0157, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "palce20v8h_cu.u23", 0x0400, 0x0157, NO_DUMP )    // PLD is read protected
 ROM_END
 
 
@@ -4586,24 +4667,24 @@
 ROM_START( elephfam )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "eleph_a.u2",  0x8000, 0x8000, CRC(8392b842) SHA1(74c850c734ca8174167b2f826b9b1ac902669392) )
-	ROM_IGNORE(                      0x8000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                      0x8000 )   // Identical halves. Discarding 2nd half
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "eleph_b.u21", 0x0000, 0x8000, CRC(e3612670) SHA1(beb65f7d2bd6d7bc68cfd876af51910cf6417bd0) )
-	ROM_IGNORE(                      0x8000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                      0x8000 )   // Identical halves. Discarding 2nd half
 	ROM_LOAD( "eleph_c.u22", 0x8000, 0x8000, CRC(4b909bf3) SHA1(a822b12126bc58af6d3f999ab2117370015a039b) )
-	ROM_IGNORE(                      0x8000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                      0x8000 )   // Identical halves. Discarding 2nd half
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "elephfam_nvram.bin", 0x0000, 0x0800, CRC(fb9b1100) SHA1(cf15ce55042f1c4399fec480c2f862622905a8b5) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "am27s29_ef.u25",    0x0000, 0x0200, CRC(bca8b82a) SHA1(4aa19f5ecd9953bf8792dceb075a746f77c01cfc) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce16v8h_ef.u5",  0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "palce20v8h_ef.u22", 0x0200, 0x0157, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "palce20v8h_ef.u23", 0x0400, 0x0157, NO_DUMP ) /* PAL is read protected */
+	ROM_LOAD( "palce16v8h_ef.u5",  0x0000, 0x0117, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "palce20v8h_ef.u22", 0x0200, 0x0157, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "palce20v8h_ef.u23", 0x0400, 0x0157, NO_DUMP )    // PLD is read protected
 ROM_END
 
 
@@ -4615,16 +4696,16 @@
 	ROM_LOAD( "elephb.u21", 0x0000, 0x8000, CRC(3c60549c) SHA1(c839b3ea415a877e5eac04e0522c342cce8d6e64) )
 	ROM_LOAD( "elephc.u20", 0x8000, 0x8000, CRC(448ba955) SHA1(2785cbc8cd42a7dda85bd8b81d5fbec01a1ba0bd) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "elephfmb_nvram.bin", 0x0000, 0x0800, CRC(13a0cfea) SHA1(9c8ce509ef1076e88ea853347b64c5591bc2e18c) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "am27s29_ef.u25",    0x0000, 0x0200, CRC(bca8b82a) SHA1(4aa19f5ecd9953bf8792dceb075a746f77c01cfc) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce16v8h_ef.u5",  0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "palce20v8h_ef.u22", 0x0200, 0x0157, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "palce20v8h_ef.u23", 0x0400, 0x0157, NO_DUMP ) /* PAL is read protected */
+	ROM_LOAD( "palce16v8h_ef.u5",  0x0000, 0x0117, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "palce20v8h_ef.u22", 0x0200, 0x0157, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "palce20v8h_ef.u23", 0x0400, 0x0157, NO_DUMP )    // PLD is read protected
 ROM_END
 
 
@@ -4734,16 +4815,16 @@
 	ROM_LOAD( "2.u21", 0x0000, 0x8000, CRC(99c8c074) SHA1(f8082b08e895cbcd028a2b7cd961a7a2c8b2762c) )
 	ROM_LOAD( "1.u20", 0x8000, 0x8000, CRC(9abedd0c) SHA1(f184a82e8ec2387069d631bcb77e890acd44b3f5) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "pool10_nvram.bin",  0x0000, 0x0800, CRC(2f2fab43) SHA1(f815b70c171bad99fa6a60c256e4fdc85dd6b290) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "n82s147an_p10.u25", 0x0000, 0x0200, CRC(1de03d14) SHA1(d8eda20865c1d885a428931f4380032e103b252c) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce16v8h_p10.u5", 0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "gal20v8b_p10.u22",  0x0200, 0x0157, NO_DUMP ) /* GAL is read protected */
-	ROM_LOAD( "gal20v8b_p10.u23",  0x0400, 0x0157, NO_DUMP ) /* GAL is read protected */
+	ROM_LOAD( "palce16v8h_p10.u5", 0x0000, 0x0117, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "gal20v8b_p10.u22",  0x0200, 0x0157, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "gal20v8b_p10.u23",  0x0400, 0x0157, NO_DUMP )    // PLD is read protected
 ROM_END
 
 
@@ -4754,28 +4835,28 @@
   u20.bin   1ST AND 2ND HALF IDENTICAL
   u21.bin   1ST AND 2ND HALF IDENTICAL
 */
-	ROM_START( pool10b )    /* this set should be the parent */
+	ROM_START( pool10b )    // 1st set nominated for parent
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "u2.bin", 0x8000, 0x8000, CRC(64fee38e) SHA1(8a624a0b6eb4a3ba09e5b396dc5a01994dfdf294) )
-	ROM_IGNORE(                 0x8000 )    /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                 0x8000 )    // Identical halves. Discarding 2nd half
 
-	/* GFX ROMs are the same of pool10, but double sized with identical halves. */
+//  GFX ROMs are the same of pool10, but double sized with identical halves.
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "u21.bin", 0x0000, 0x8000, CRC(581c4878) SHA1(5ae61af090feea1745e22f46b33b2c01e6013fbe) )
-	ROM_IGNORE(                  0x8000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                  0x8000 )   // Identical halves. Discarding 2nd half
 	ROM_LOAD( "u20.bin", 0x8000, 0x8000, CRC(3bdf1106) SHA1(fa21cbd49bb27ea4a784cf4e4b3fbd52650a285b) )
-	ROM_IGNORE(                  0x8000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                  0x8000 )   // Identical halves. Discarding 2nd half
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "pool10b_nvram.bin",   0x0000, 0x0800, CRC(d9f35299) SHA1(2c3608bc9c322a9cc86f74d8fa2f660804a8cf3c) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "n82s147an_p10.u25",   0x0000, 0x0200, CRC(1de03d14) SHA1(d8eda20865c1d885a428931f4380032e103b252c) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce16v8h_p10b.u5",  0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "palce20v8h_p10b.u22", 0x0200, 0x0157, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "palce20v8h_p10b.u23", 0x0400, 0x0157, NO_DUMP ) /* PAL is read protected */
+	ROM_LOAD( "palce16v8h_p10b.u5",  0x0000, 0x0117, NO_DUMP )  // PLD is read protected
+	ROM_LOAD( "palce20v8h_p10b.u22", 0x0200, 0x0157, NO_DUMP )  // PLD is read protected
+	ROM_LOAD( "palce20v8h_p10b.u23", 0x0400, 0x0157, NO_DUMP )  // PLD is read protected
 ROM_END
 
 
@@ -4787,16 +4868,16 @@
 	ROM_LOAD( "b.u21", 0x0000, 0x8000, CRC(99c8c074) SHA1(f8082b08e895cbcd028a2b7cd961a7a2c8b2762c) )
 	ROM_LOAD( "c.u20", 0x8000, 0x8000, CRC(9abedd0c) SHA1(f184a82e8ec2387069d631bcb77e890acd44b3f5) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "pool10c_nvram.bin", 0x0000, 0x0800, CRC(396aefed) SHA1(066b87ff054dfb37f733a812ad0dc1b1bd2478e6) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "n82s147an_p10.u25", 0x0000, 0x0200, CRC(1de03d14) SHA1(d8eda20865c1d885a428931f4380032e103b252c) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce16v8h_p10.u5", 0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "gal20v8b_p10.u22",  0x0200, 0x0157, NO_DUMP ) /* GAL is read protected */
-	ROM_LOAD( "gal20v8b_p10.u23",  0x0400, 0x0157, NO_DUMP ) /* GAL is read protected */
+	ROM_LOAD( "palce16v8h_p10.u5", 0x0000, 0x0117, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "gal20v8b_p10.u22",  0x0200, 0x0157, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "gal20v8b_p10.u23",  0x0400, 0x0157, NO_DUMP )    // PLD is read protected
 ROM_END
 
 
@@ -4808,22 +4889,22 @@
 	ROM_START( pool10d )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "3.50.u2", 0x8000, 0x8000, CRC(4c68e1f4) SHA1(bbab63a18e0c041ce519daa32e12dd1b6a672dce) )
-	ROM_IGNORE(                  0x8000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                  0x8000 )   // Identical halves. Discarding 2nd half
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "2.u21", 0x0000, 0x8000, CRC(99c8c074) SHA1(f8082b08e895cbcd028a2b7cd961a7a2c8b2762c) ) // sldh
 	ROM_LOAD( "1.u20", 0x8000, 0x8000, CRC(9abedd0c) SHA1(f184a82e8ec2387069d631bcb77e890acd44b3f5) ) // sldh
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "pool10d_nvram.bin", 0x0000, 0x0800, CRC(6b5984a0) SHA1(156a94e74e33b1a15222cffff9b62e65f6f5f2f5) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "n82s147an_p10.u25", 0x0000, 0x0200, CRC(1de03d14) SHA1(d8eda20865c1d885a428931f4380032e103b252c) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce16v8h_p10.u5", 0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "gal20v8b_p10.u22",  0x0200, 0x0157, NO_DUMP ) /* GAL is read protected */
-	ROM_LOAD( "gal20v8b_p10.u23",  0x0400, 0x0157, NO_DUMP ) /* GAL is read protected */
+	ROM_LOAD( "palce16v8h_p10.u5", 0x0000, 0x0117, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "gal20v8b_p10.u22",  0x0200, 0x0157, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "gal20v8b_p10.u23",  0x0400, 0x0157, NO_DUMP )    // PLD is read protected
 ROM_END
 
 
@@ -4911,23 +4992,19 @@
 	ROM_LOAD( "2.u21", 0x0000, 0x8000, CRC(a0d54044) SHA1(c7be1f12f72095daee32ae41c3554d8ab4f99245) ) // sldh
 	ROM_LOAD( "1.u20", 0x8000, 0x8000, CRC(55c9fcc8) SHA1(224bdf63ed345b1def4852af3b33f07790fbf123) ) // sldh
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "pool10e_nvram.bin", 0x0000, 0x0800, CRC(e20f9a14) SHA1(617ca53263a971c9f835a95737a66fac5b99780f) )
 
-	ROM_REGION( 0x0200, "proms", 0 )    /* Same as Pool 10, but the 1st half duplicated to cover any PLD addressing */
+	ROM_REGION( 0x0200, "proms", 0 )    // Same as Pool 10, but the 1st half duplicated to cover any PLD addressing
 	ROM_LOAD( "am27s29.u25", 0x0000, 0x0200, CRC(2c315cbf) SHA1(f3f91329f2b8388decf26a050f8fb7da38694218) )
 
 	ROM_REGION( 0x3000, "plds", 0 )
-	  ROM_LOAD( "palce16v8h.u5",  0x0000, 0x0892, BAD_DUMP CRC(123d539a) SHA1(cccf0cbae3175b091a998eedf4aa44a55b679400) ) /* read protected */
-	  ROM_LOAD( "palce20v8h.u22", 0x1000, 0x0a92, BAD_DUMP CRC(ba2a021f) SHA1(e9c5970f80c7446c91282d53cfe97c92353dce7d) ) /* read protected */
-	  ROM_LOAD( "palce20v8h.u23", 0x2000, 0x0a92, BAD_DUMP CRC(ba2a021f) SHA1(e9c5970f80c7446c91282d53cfe97c92353dce7d) ) /* read protected */
+	  ROM_LOAD( "palce16v8h.u5",  0x0000, 0x0892, BAD_DUMP CRC(123d539a) SHA1(cccf0cbae3175b091a998eedf4aa44a55b679400) )   // read protected
+	  ROM_LOAD( "palce20v8h.u22", 0x1000, 0x0a92, BAD_DUMP CRC(ba2a021f) SHA1(e9c5970f80c7446c91282d53cfe97c92353dce7d) )   // read protected
+	  ROM_LOAD( "palce20v8h.u23", 0x2000, 0x0a92, BAD_DUMP CRC(ba2a021f) SHA1(e9c5970f80c7446c91282d53cfe97c92353dce7d) )   // read protected
 ROM_END
 
 
-/*
-
-*/
-
 ROM_START( pool10f )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "cmc-pool10+a+.u2", 0x8000, 0x8000, CRC(e8087fb8) SHA1(c012a81f561978bd97708a52f656e7b13e41a3e2) ) // sldh
@@ -4936,20 +5013,20 @@
 	ROM_LOAD( "cmc-pool10-b.u21", 0x0000, 0x8000, CRC(99c8c074) SHA1(f8082b08e895cbcd028a2b7cd961a7a2c8b2762c) )
 	ROM_LOAD( "cmc-pool10-c.u20", 0x8000, 0x8000, CRC(9abedd0c) SHA1(f184a82e8ec2387069d631bcb77e890acd44b3f5) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "pool10f_nvram.bin", 0x0000, 0x0800, CRC(75dd3562) SHA1(a359cada144e7c90946649f5dd0998d0ee48f4d2) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "27s29.u25", 0x0000, 0x0200, CRC(1de03d14) SHA1(d8eda20865c1d885a428931f4380032e103b252c) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce16v8h_p10.u5", 0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "gal20v8b_p10.u22",  0x0200, 0x0157, NO_DUMP ) /* GAL is read protected */
-	ROM_LOAD( "gal20v8b_p10.u23",  0x0400, 0x0157, NO_DUMP ) /* GAL is read protected */
+	ROM_LOAD( "palce16v8h_p10.u5", 0x0000, 0x0117, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "gal20v8b_p10.u22",  0x0200, 0x0157, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "gal20v8b_p10.u23",  0x0400, 0x0157, NO_DUMP )    // PLD is read protected
 ROM_END
 
 
-ROM_START( pool10g )    /* this set should be the parent */
+ROM_START( pool10g )    // 2nd set nominated for parent
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "3.u2", 0x8000, 0x8000, CRC(7b537ce6) SHA1(b221d08c53b9e14178335632420e78070b9cfb27) )
 
@@ -4957,7 +5034,7 @@
 	ROM_LOAD( "2.u21", 0x0000, 0x8000, CRC(99c8c074) SHA1(f8082b08e895cbcd028a2b7cd961a7a2c8b2762c) )
 	ROM_LOAD( "1.u20", 0x8000, 0x8000, CRC(9abedd0c) SHA1(f184a82e8ec2387069d631bcb77e890acd44b3f5) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "pool10h_nvram.bin",   0x0000, 0x0800, CRC(3ec39472) SHA1(aa2bb5abd16557560a19842929ad7dab852abbbf) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -4973,7 +5050,7 @@
 	ROM_LOAD( "cmc-pool10+b+.u21", 0x0000, 0x8000, CRC(99c8c074) SHA1(f8082b08e895cbcd028a2b7cd961a7a2c8b2762c) )
 	ROM_LOAD( "cmc-pool10+c+.u20", 0x8000, 0x8000, CRC(9abedd0c) SHA1(f184a82e8ec2387069d631bcb77e890acd44b3f5) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "pool10i_nvram.bin",  0x0000, 0x0800, CRC(e93dee30) SHA1(195525e95a3bdc1b002b12fd27bc31c63d7a9276) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -4984,15 +5061,15 @@
 ROM_START( pool10i )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "a.u2", 0x8000, 0x8000, CRC(566bc05d) SHA1(eec88c8ba6cb664f38ebf8b71f99b4e7d04a9601) ) // sldh
-	ROM_IGNORE(                 0x8000 )    /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                 0x8000 )    // Identical halves. Discarding 2nd half
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "b.u21", 0x0000, 0x8000, CRC(581c4878) SHA1(5ae61af090feea1745e22f46b33b2c01e6013fbe) ) // sldh
-	ROM_IGNORE(                0x8000 )    /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                0x8000 )     // Identical halves. Discarding 2nd half
 	ROM_LOAD( "c.u20", 0x8000, 0x8000, CRC(3bdf1106) SHA1(fa21cbd49bb27ea4a784cf4e4b3fbd52650a285b) ) // sldh
-	ROM_IGNORE(                0x8000 )    /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                0x8000 )     // Identical halves. Discarding 2nd half
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "pool10l_nvram.bin",  0x0000, 0x0800, CRC(89cbee4b) SHA1(ff8031a96ee40e1e62abbae7a0b3d9dc2122759f) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5007,7 +5084,7 @@
 	ROM_LOAD( "cmcpool10.u21", 0x0000, 0x8000, CRC(99c8c074) SHA1(f8082b08e895cbcd028a2b7cd961a7a2c8b2762c) )
 	ROM_LOAD( "cmcpool10.u20", 0x8000, 0x8000, CRC(9abedd0c) SHA1(f184a82e8ec2387069d631bcb77e890acd44b3f5) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "pool10j_nvram.bin",  0x0000, 0x0800, CRC(48684b02) SHA1(6f2fbd0e2621e31b881edd8056ff93ee78f331ab) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5061,16 +5138,16 @@
 	ROM_LOAD( "cmcpool10-b.u21", 0x0000, 0x8000, CRC(99c8c074) SHA1(f8082b08e895cbcd028a2b7cd961a7a2c8b2762c) )
 	ROM_LOAD( "biliard-c.u20",   0x8000, 0x8000, CRC(b15d10ec) SHA1(9b0f32ff791063cfb2d8339a4e8041e034e73eb7) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "biliard_nvram.bin",  0x0000, 0x0800, CRC(2f2fab43) SHA1(f815b70c171bad99fa6a60c256e4fdc85dd6b290) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "am27s29pc.u25", 0x0000, 0x0200, CRC(1de03d14) SHA1(d8eda20865c1d885a428931f4380032e103b252c) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce16v8h-25pc-4.u5", 0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "gal20v8a-25lp.u22",  0x0200, 0x0157, NO_DUMP ) /* GAL is read protected */
-	ROM_LOAD( "gal20v8a-25lp.u23",  0x0400, 0x0157, NO_DUMP ) /* GAL is read protected */
+	ROM_LOAD( "palce16v8h-25pc-4.u5", 0x0000, 0x0117, NO_DUMP ) // PLD is read protected
+	ROM_LOAD( "gal20v8a-25lp.u22",  0x0200, 0x0157, NO_DUMP )   // PLD is read protected
+	ROM_LOAD( "gal20v8a-25lp.u23",  0x0400, 0x0157, NO_DUMP )   // PLD is read protected
 ROM_END
 
 
@@ -5079,18 +5156,18 @@
   This one seems to run in royalcd1 hardware.
 */
 
-ROM_START( royal )    /* brute hack of pool 10 */
+ROM_START( royal )  // brute hack of pool 10
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "3.u2", 0x8000, 0x8000, CRC(d4f36273) SHA1(2049257ea9ee52fde9cabfe40e809e00526a960e) ) // sldh
 
-	/* GFX ROMs are the same of pool10, but double sized with identical halves. */
+//  GFX ROMs are the same of pool10, but double sized with identical halves.
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "2.u21", 0x0000, 0x8000, CRC(439eec10) SHA1(500139c16a883f0a5b0b8d91f4f067ba428d2d11) ) // sldh
-	ROM_IGNORE(                0x8000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                0x8000 ) // Identical halves. Discarding 2nd half
 	ROM_LOAD( "1.u20", 0x8000, 0x8000, CRC(9b59e72d) SHA1(96217272ce5abb78ff45ff116a5d921c57717ed9) ) // sldh
-	ROM_IGNORE(                0x8000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                0x8000 ) // Identical halves. Discarding 2nd half
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "royal_nvram.bin",   0x0000, 0x0800, CRC(9df190d5) SHA1(4be0f5c6f89f822568e45e0e8457cf51ced2dcfe) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5127,16 +5204,16 @@
 	ROM_LOAD( "tortu.b.u21", 0x0000, 0x8000, CRC(e7b18584) SHA1(fa1c367469d4ced5d7c83c15a25ec5fd6afcca10) )
 	ROM_LOAD( "tortu.c.u20", 0x8000, 0x8000, CRC(3cda6f73) SHA1(b4f3d2d3c652ebf6973358ae33b7808de5939acd) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "tortufam_nvram.bin", 0x0000, 0x0800, CRC(e5a08b1b) SHA1(6575ed3ec66ef0e42129225fe1679519e5e1c946) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "am27s29pc_tf.u25", 0x0000, 0x0200, CRC(c6d433fb) SHA1(065de832bbe8765eb0aacc2029e587a4f5362f8a) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce20v8h_tf.u5",  0x0000, 0x0157, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "palce20v8h_tf.u22", 0x0200, 0x0157, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "palce20v8h_tf.u23", 0x0400, 0x0157, NO_DUMP ) /* PAL is read protected */
+	ROM_LOAD( "palce20v8h_tf.u5",  0x0000, 0x0157, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "palce20v8h_tf.u22", 0x0200, 0x0157, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "palce20v8h_tf.u23", 0x0400, 0x0157, NO_DUMP )    // PLD is read protected
 ROM_END
 
 
@@ -5148,16 +5225,16 @@
 	ROM_LOAD( "potg.b.u21", 0x0000, 0x8000, CRC(32fc1d4f) SHA1(cc533a44498338bc0cbb7c7b9c42559ce7ff1337) )
 	ROM_LOAD( "potg.c.u20", 0x8000, 0x8000, CRC(0331eb42) SHA1(a8e838d644fc6d93a9632070b305e44e4242ce94) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "potgame_nvram.bin",  0x0000, 0x0800, CRC(2b07fb37) SHA1(9cbd3d8fb076d683a7853b3dd8a39a27f1c8872b) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "am27s29_pot.u25",    0x0000, 0x0200, CRC(a221f151) SHA1(270c57c9b7de912b136686bc6720eb8f12dbb805) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce16v8h_pot.u5",  0x0000, 0x0157, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "palce20v8h_pot.u22", 0x0200, 0x0157, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "palce20v8h_pot.u23", 0x0400, 0x0157, NO_DUMP ) /* PAL is read protected */
+	ROM_LOAD( "palce16v8h_pot.u5",  0x0000, 0x0157, NO_DUMP )   // PLD is read protected
+	ROM_LOAD( "palce20v8h_pot.u22", 0x0200, 0x0157, NO_DUMP )   // PLD is read protected
+	ROM_LOAD( "palce20v8h_pot.u23", 0x0400, 0x0157, NO_DUMP )   // PLD is read protected
 ROM_END
 
 
@@ -5169,16 +5246,16 @@
 	ROM_LOAD( "boat_2.bin", 0x0000, 0x8000, CRC(a6b36c3f) SHA1(90b12d9552ad5dbf11a30fc7451da1f3e6763cc3) )
 	ROM_LOAD( "boat_1.bin", 0x8000, 0x8000, CRC(61fd8c19) SHA1(eb8fd8bd7de38a6c8a435e9e36daf699162138a5) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "bottle10_nvram.bin", 0x0000, 0x0800, CRC(82927c53) SHA1(8cde91588cb53fefc84f0b14fc5c0b26a3a445eb) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "n82s147an_p10.u25", 0x0000, 0x0200, CRC(1de03d14) SHA1(d8eda20865c1d885a428931f4380032e103b252c) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce16v8h_p10.u5", 0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "gal20v8b_p10.u22",  0x0200, 0x0157, NO_DUMP ) /* GAL is read protected */
-	ROM_LOAD( "gal20v8b_p10.u23",  0x0400, 0x0157, NO_DUMP ) /* GAL is read protected */
+	ROM_LOAD( "palce16v8h_p10.u5", 0x0000, 0x0117, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "gal20v8b_p10.u22",  0x0200, 0x0157, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "gal20v8b_p10.u23",  0x0400, 0x0157, NO_DUMP )    // PLD is read protected
 ROM_END
 
 
@@ -5190,16 +5267,16 @@
 	ROM_LOAD( "2.u21", 0x0000, 0x8000, CRC(9395c15b) SHA1(e4caefc6f55b07f5c4370a3b8652fa93e08987ce) )
 	ROM_LOAD( "1.u20", 0x8000, 0x8000, CRC(61fd8c19) SHA1(eb8fd8bd7de38a6c8a435e9e36daf699162138a5) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "bottl10b_nvram.bin", 0x0000, 0x0800, CRC(59976182) SHA1(f8d26169e86444607bc5a6649f41e7f5c05ddbb4) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "n82s147an_p10.u25", 0x0000, 0x0200, CRC(1de03d14) SHA1(d8eda20865c1d885a428931f4380032e103b252c) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce16v8h_p10.u5", 0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "gal20v8b_p10.u22",  0x0200, 0x0157, NO_DUMP ) /* GAL is read protected */
-	ROM_LOAD( "gal20v8b_p10.u23",  0x0400, 0x0157, NO_DUMP ) /* GAL is read protected */
+	ROM_LOAD( "palce16v8h_p10.u5", 0x0000, 0x0117, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "gal20v8b_p10.u22",  0x0200, 0x0157, NO_DUMP )    // PLD is read protected
+	ROM_LOAD( "gal20v8b_p10.u23",  0x0400, 0x0157, NO_DUMP )    // PLD is read protected
 ROM_END
 
 /*
@@ -5231,18 +5308,18 @@
   were changed to match the second program.
 
 */
-/* The following two have mirrored video RAM 4000/5000 to 6000/7000. */
+// The following two have mirrored video RAM 4000/5000 to 6000/7000.
 ROM_START( lunapark )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Two different programs. Selectable through a DIP switch */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Two different programs. Selectable through a DIP switch
 	ROM_LOAD( "lunapark-425-95n003.u2", 0x0000, 0x10000, CRC(b3a620ee) SHA1(67b3498edf7b536e22c4d97c1f6ad5a71521e68f) )
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "lunapark-425-95n002.u21", 0x0000, 0x8000, CRC(2bededb7) SHA1(b8d7e6fe307d347d762adf35d361ade620aab37b) )
-	ROM_CONTINUE(                        0x0000, 0x8000)    /* Discarding 1nd half 0xff filled*/
+	ROM_CONTINUE(                        0x0000, 0x8000)    // Discarding 1nd half 0xff filled
 	ROM_LOAD( "lunapark-425-95n001.u20", 0x8000, 0x8000, CRC(7d91ce1f) SHA1(7e9bfad76f305d5787faffe3a07b218beb37fda8) )
-	ROM_CONTINUE(                        0x8000, 0x8000)    /* Discarding 1nd half 0xff filled*/
+	ROM_CONTINUE(                        0x8000, 0x8000)    // Discarding 1nd half 0xff filled
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "lunapark_nvram.bin", 0x0000, 0x0800, CRC(f99e749b) SHA1(fafd4205dfaacb4c21215af6997d06ab419c9281) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5250,23 +5327,23 @@
 ROM_END
 
 ROM_START( lunaparkb )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Two different programs. Selectable through a DIP switch */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Two different programs. Selectable through a DIP switch
 	ROM_LOAD( "lunapark-number-03_lunaparkb.u2", 0x0000, 0x10000, CRC(cb819bb7) SHA1(c7fb25eab093de2f644445a713d99ee8024d8499) )
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
-	ROM_LOAD( "27512.u21", 0x0000, 0x8000, CRC(d64ac315) SHA1(c67d9e67a988036844efd4f980d47a90c022ba18) )   /* only the first 2 bytes different */
-	ROM_CONTINUE(          0x0000, 0x8000)  /* Discarding 1nd half 0xff filled*/
+	ROM_LOAD( "27512.u21", 0x0000, 0x8000, CRC(d64ac315) SHA1(c67d9e67a988036844efd4f980d47a90c022ba18) )   // only the first 2 bytes different
+	ROM_CONTINUE(          0x0000, 0x8000)  // Discarding 1nd half 0xff filled
 	ROM_LOAD( "27512.u20", 0x8000, 0x8000, CRC(7d91ce1f) SHA1(7e9bfad76f305d5787faffe3a07b218beb37fda8 ) )
-	ROM_CONTINUE(          0x8000, 0x8000)  /* Discarding 1nd half 0xff filled*/
+	ROM_CONTINUE(          0x8000, 0x8000)  // Discarding 1nd half 0xff filled
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "lunaparkb_nvram.bin", 0x0000, 0x0800, CRC(f99e749b) SHA1(fafd4205dfaacb4c21215af6997d06ab419c9281) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "82s147.u25", 0x0000, 0x0200, CRC(ddb74d72) SHA1(3d5dda3a935a3100cb86017f103b855d6449f73a) )
 ROM_END
 
-/* This one hasn't mirrored video RAM, so could run in regular Cuore 1 hardware */
+//  This one hasn't mirrored video RAM, so could run in regular Cuore 1 hardware
 ROM_START( lunaparkc )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "lunapark-number-03_lunaparkc.u2", 0x8000, 0x8000, CRC(fdbe49c3) SHA1(a2b14a6998d5a27fba7bc360a15f17a48c91194f) )
@@ -5275,7 +5352,7 @@
 	ROM_LOAD( "lunapark-number-01.u21", 0x0000, 0x8000, CRC(ee057944) SHA1(31b76dcadf1dd5aacac1dfed0c7c9f7190797ead) )
 	ROM_LOAD( "lunapark-number-02.u20", 0x8000, 0x8000, CRC(b8795aec) SHA1(5db2e64657dee7742eb9d11e65d29c83a93332b7) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "lunaparkc_nvram.bin", 0x0000, 0x0800, CRC(005b70fc) SHA1(682c2315b4fafb6255db989f0d49255fd8d7a1a9) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5294,7 +5371,7 @@
 	ROM_LOAD( "425-1995-number-02.u21", 0x0000, 0x8000, CRC(1eaf1bd9) SHA1(eb392f4a8864c59c7792f905f165f543087cb4a0) )
 	ROM_LOAD( "425-1995-number-01.u20", 0x8000, 0x8000, CRC(d3972c19) SHA1(a84ae765eeae1f9d443b0c4941b6f93dcc540f8c) )
 
-	ROM_REGION( 0x0800, "nvram", 0 ) /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "crystal_nvram.bin", 0x0000, 0x0800, CRC(21a712ee) SHA1(259d83b8268a93f96b53580562e9c6e835f7473e) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5322,7 +5399,7 @@
 	ROM_LOAD( "3.bin", 0x0000, 0x8000, CRC(c46d804f) SHA1(b089821c7dae6714b49401d787f8bed859815763) )
 	ROM_LOAD( "2.bin", 0x8000, 0x8000, CRC(41f7a0b3) SHA1(9aff2b8832d2a4f868daa9849a0bfe5e44f88fc0) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "royalcrd_nvram.bin", 0x0000, 0x0800, CRC(1c775f61) SHA1(c810421eaa31a72e3f2fe9a1d82858e7cc2f6b93) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5347,7 +5424,7 @@
 	ROM_LOAD( "r.2", 0x8000, 0x8000, CRC(8a66f22c) SHA1(67d6e8f8f5a0fd979dc498ba2cc67cf707ccdf95) )
 	ROM_IGNORE(              0x8000)
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "royalcrda_nvram.bin", 0x0000, 0x0800, CRC(c42dbad4) SHA1(b38552192e3f5f6bc2a4b92bddd2f95ac17ecc8c) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5370,7 +5447,7 @@
 	ROM_LOAD( "rc_3_pl.bin", 0x0000, 0x8000, CRC(85e77661) SHA1(7d7a765c1bfcfeb9eb91d2519b22d734f20eab24) )
 	ROM_LOAD( "rc_2_pl.bin", 0x8000, 0x8000, CRC(41f7a0b3) SHA1(9aff2b8832d2a4f868daa9849a0bfe5e44f88fc0) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "royalcrdb_nvram.bin", 0x0000, 0x0800, CRC(19bb3dea) SHA1(0965fbcec48ded99c5f6793efffb1d9329cc00eb) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5445,15 +5522,15 @@
 	ROM_LOAD( "2.bin", 0x0000, 0x8000, CRC(85e77661) SHA1(7d7a765c1bfcfeb9eb91d2519b22d734f20eab24) ) // sldh
 	ROM_LOAD( "1.bin", 0x8000, 0x8000, CRC(41f7a0b3) SHA1(9aff2b8832d2a4f868daa9849a0bfe5e44f88fc0) ) // sldh
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "royalcrdd_nvram.bin", 0x0000, 0x0800, CRC(335bfa5a) SHA1(7e9cbb502f450c515ea03ffcf4b7fbae60af4e73) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "n82s147.bin", 0x0000, 0x0200, CRC(8bc86f48) SHA1(4c677ab9314a1f571e35104b22659e6811aeb194) )
 
 	ROM_REGION( 0x0600, "plds", 0 )
-	ROM_LOAD( "palce16v8h-4.bin", 0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
-	ROM_LOAD( "1-peel18cv8.bin",  0x0200, 0x0155, NO_DUMP ) /* PEEL is read protected */
+	ROM_LOAD( "palce16v8h-4.bin", 0x0000, 0x0117, NO_DUMP ) // PLD is read protected
+	ROM_LOAD( "1-peel18cv8.bin",  0x0200, 0x0155, NO_DUMP ) // PLD is read protected
 	ROM_LOAD( "2-peel18cv8.bin",  0x0400, 0x0155, CRC(8fdafd55) SHA1(fbb187ba682111648ea1586f400990cb81a3077a) )
 ROM_END
 
@@ -5477,24 +5554,24 @@
     - 1x trimmer (volume)
 */
 
-ROM_START( royalcrde ) /* both halves have different programs. we're using the 2nd one */
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* 1st half prg is testing RAM in offset $8600-$BF00...?? */
+ROM_START( royalcrde )  // both halves have different programs. we're using the 2nd one.
+	ROM_REGION( 0x10000, "maincpu", 0 ) // 1st half prg is testing RAM in offset $8600-$BF00...??
 	ROM_LOAD( "rc.bin", 0x0000, 0x10000, CRC(8a9a6dd6) SHA1(04c3f9f17d5404ac1414c51ef8f930df54530e72) )
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "2a.bin", 0x0000, 0x8000, CRC(3af71cf8) SHA1(3a0ce0d0abebf386573c5936545dada1d3558e55) )
-	ROM_IGNORE(                 0x8000 )    /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                 0x8000 )    // Identical halves. Discarding 2nd half
 	ROM_LOAD( "1a.bin", 0x8000, 0x8000, CRC(8a66f22c) SHA1(67d6e8f8f5a0fd979dc498ba2cc67cf707ccdf95) )
-	ROM_IGNORE(                 0x8000 )    /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                 0x8000 )    // Identical halves. Discarding 2nd half
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "royalcrde_nvram.bin", 0x0000, 0x0800, CRC(3b03440f) SHA1(49e51b8c9e1404d39c479a2d0619aab43f1a6529) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "n82s147.bin", 0x0000, 0x0200, CRC(8bc86f48) SHA1(4c677ab9314a1f571e35104b22659e6811aeb194) )
 
 	ROM_REGION( 0x0200, "plds", 0 )
-	ROM_LOAD( "palce16v8h-4.bin", 0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
+	ROM_LOAD( "palce16v8h-4.bin", 0x0000, 0x0117, NO_DUMP ) // PLD is read protected
 ROM_END
 
 
@@ -5517,7 +5594,7 @@
 	ROM_REGION( 0x0800, "nvram", 0 )
 	ROM_LOAD( "royalcrdt_nv.bin",  0x0000, 0x0800, CRC(67a6e68b) SHA1(d7ab01c4d9bd4fe58b5d0f4a945c00c5c4906008) )
 
-	ROM_REGION( 0x0200, "plds", 0 ) /* Device type is 16L8 */
+	ROM_REGION( 0x0200, "plds", 0 ) // Device type is 16L8
 	ROM_LOAD( "tab01_3.bin",    0x0000, 0x0104, CRC(a13a7a0a) SHA1(28e918ece4dcfa3883d2439c226b2f125d43f386) )
 ROM_END
 
@@ -5566,7 +5643,7 @@
 ROM_END
 
 
-ROM_START( royalcrdg )   /* CMC C1030 PCB, EP910EC-30 CPLD, NON encrypted graphics */
+ROM_START( royalcrdg )  // CMC C1030 PCB, EP910EC-30 CPLD, NON encrypted graphics
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "3.cpu", 0x8000, 0x8000, CRC(829a6a1d) SHA1(b7064e4d60e33d0875eb73525230ea3b99f10542) )
 
@@ -5574,7 +5651,7 @@
 	ROM_LOAD( "2.bin", 0x0000, 0x8000, CRC(85e77661) SHA1(7d7a765c1bfcfeb9eb91d2519b22d734f20eab24) ) // sldh
 	ROM_LOAD( "1.bin", 0x8000, 0x8000, CRC(41f7a0b3) SHA1(9aff2b8832d2a4f868daa9849a0bfe5e44f88fc0) ) // sldh
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "royalcrdg_nvram.bin", 0x0000, 0x0800, CRC(853c7da9) SHA1(e275b22a9f470672bfc71425fcc44f547ba38b6d) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5596,7 +5673,7 @@
 	ROM_LOAD( "145-2.bin", 0x0000, 0x8000, CRC(85e77661) SHA1(7d7a765c1bfcfeb9eb91d2519b22d734f20eab24) )
 	ROM_LOAD( "145-1.bin", 0x8000, 0x8000, CRC(41f7a0b3) SHA1(9aff2b8832d2a4f868daa9849a0bfe5e44f88fc0) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "royalcrdh_nvram.bin", 0x0000, 0x0800, CRC(7757d73a) SHA1(997bfbd847d1d21777694331be92a1a5e79e4faf) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5630,7 +5707,7 @@
   1x battery (missing)
 
 */
-ROM_START( royalcdfr )   /* Seems bootleg PCB, non encrypted graphics */
+ROM_START( royalcdfr )  // Seems bootleg PCB, non encrypted graphics
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "3.bin", 0x8000, 0x8000, CRC(69b944c1) SHA1(6ef76bff01f20376117dd7f67e5890eca754fcfb) ) // sldh
 
@@ -5638,7 +5715,7 @@
 	ROM_LOAD( "2.bin", 0x0000, 0x8000, CRC(85e77661) SHA1(7d7a765c1bfcfeb9eb91d2519b22d734f20eab24) ) // sldh
 	ROM_LOAD( "1.bin", 0x8000, 0x8000, CRC(41f7a0b3) SHA1(9aff2b8832d2a4f868daa9849a0bfe5e44f88fc0) ) // sldh
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "royalcdfr_nvram.bin", 0x0000, 0x0800, CRC(bda344d4) SHA1(7793d289147bf03c0d8256d4023252c9677ac8ff) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5657,7 +5734,7 @@
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "n82s147a.bin",     0x0000, 0x0200, CRC(8bc86f48) SHA1(4c677ab9314a1f571e35104b22659e6811aeb194) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "royalcrdp_nvram.bin", 0x0000, 0x0800, BAD_DUMP CRC(553f8c66) SHA1(d2c21786d715f81c537d860d8515fda6d766f630) )
 
 	ROM_REGION( 0x0200, "plds", 0 )
@@ -5690,7 +5767,7 @@
 	ROM_REGION( 0x0800, "nvram", 0 )
 	ROM_LOAD( "royaljp_nvram.bin",  0x0000, 0x0800, CRC(48e51e2a) SHA1(b81a1741eef299384d4fa98a534099b2c0332074) )
 
-	ROM_REGION( 0x0600, "plds", 0 ) /* There are 3 GALs */
+	ROM_REGION( 0x0600, "plds", 0 ) // There are 3 GALs
 	ROM_LOAD( "gal20v8b.bin",    0x0000, 0x0157,   NO_DUMP )
 	ROM_LOAD( "gal20v8a.bin",    0x0200, 0x0157,   NO_DUMP )
 	ROM_LOAD( "gal16v8d.bin",    0x0400, 0x0117,   NO_DUMP )
@@ -5707,7 +5784,7 @@
 	ROM_LOAD( "l2.bin", 0x0000, 0x8000, CRC(8ca90a8f) SHA1(bc3db3f8c097f89eff488e3aca39bf24ff2b5cff) )
 	ROM_LOAD( "l1.bin", 0x8000, 0x8000, CRC(beadc35c) SHA1(8a6a5954a827def8c4c3b904d8ee58a4bde53d85) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "lluck3x3_nvram.bin", 0x0000, 0x0800, CRC(2fe79cff) SHA1(7839c04336b7702c7bdcd2b6917a353f4376f824) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5723,7 +5800,7 @@
 	ROM_LOAD( "l2.bin", 0x0000, 0x8000, CRC(8ca90a8f) SHA1(bc3db3f8c097f89eff488e3aca39bf24ff2b5cff) )
 	ROM_LOAD( "l1.bin", 0x8000, 0x8000, CRC(beadc35c) SHA1(8a6a5954a827def8c4c3b904d8ee58a4bde53d85) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "lluck4x1_nvram.bin", 0x0000, 0x0800, CRC(05d2d7b8) SHA1(1188b2b4835cadd95b1e9160c2948a2e3457afd2) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5760,28 +5837,28 @@
 
 */
 
-ROM_START( magicrd2 )   /* Impera... but seems Bulgarian hack, just for copyright */
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* magicard.004 has extra code, and 2 different NVRAM contents harcoded */
+ROM_START( magicrd2 )   // Impera... but seems Bulgarian hack, just for copyright
+	ROM_REGION( 0x10000, "maincpu", 0 ) // magicard.004 has extra code, and 2 different NVRAM contents harcoded
 	ROM_LOAD( "magicard.004", 0x0000, 0x8000,  CRC(f6e948b8) SHA1(7d5983015a508ab135ccbf69b7f3c526c229e3ef) )
-	ROM_LOAD( "magicard.01",  0x8000, 0x8000,  CRC(c94767d4) SHA1(171ac946bdf2575f9e4a31e534a8e641597af519) ) /* 1st and 2nd half identical */
-	ROM_IGNORE(                       0x8000 )  /* Identical halves. Discarding 2nd half */
+	ROM_LOAD( "magicard.01",  0x8000, 0x8000,  CRC(c94767d4) SHA1(171ac946bdf2575f9e4a31e534a8e641597af519) )   // 1st and 2nd half identical
+	ROM_IGNORE(                       0x8000 )  // Identical halves. Discarding 2nd half
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "mc2gr2.bin",   0x0000, 0x8000, CRC(733da697) SHA1(45122c64d5a371ec91cecc67b7faf179078e714d) )
 	ROM_LOAD( "mc2gr1.bin",   0x8000, 0x8000, CRC(2406b8d2) SHA1(e9d7a25562fd5adee351d7ef6ba02fff6aab021a) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "magicrd2_nvram.bin", 0x0000, 0x0800, CRC(343b3162) SHA1(1524959dbbc0c6d7c5c3a4a6b20976382cfbe88f) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "mc2-82s147.bin", 0x0000, 0x0200, CRC(aa91cc35) SHA1(79f9a755441500e618c4183f524f969fffd44100) )
 
 	ROM_REGION( 0x0200, "plds", 0 )
-	ROM_LOAD( "gal16v8uni.bin", 0x0000, 0x0117, CRC(b81d7e0a) SHA1(7fef0b2bcea931a830d38ae0f1102434cf281d2d) )  /* Universal GAL */
+	ROM_LOAD( "gal16v8uni.bin", 0x0000, 0x0117, CRC(b81d7e0a) SHA1(7fef0b2bcea931a830d38ae0f1102434cf281d2d) )  // Universal GAL
 ROM_END
 
 
-ROM_START( magicrd2a )  /* Nov (new). Imatic Yugoslavian hack for green TAB or Impera boards */
+ROM_START( magicrd2a )  // Nov (new). Imatic Yugoslavian hack for green TAB or Impera boards
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "m3_nov.bin", 0x8000, 0x8000,  CRC(ee5468e6) SHA1(f859adbad30e561fca86e60ff5b2e666d8bf4071) )
 
@@ -5789,7 +5866,7 @@
 	ROM_LOAD( "m2_nov.bin",   0x0000, 0x8000, CRC(684d71f2) SHA1(e4522844a0406b3e83fa723508a7c05dd21e7fb6) )
 	ROM_LOAD( "m1_nov.bin",   0x8000, 0x8000, CRC(96151034) SHA1(3107d353705c6240a71faf308e11c45a87d95cf4) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM (passed protection) */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM (passed protection)
 	ROM_LOAD( "mc2_nvram.bin", 0x0000, 0x0800, CRC(2070d63d) SHA1(86c72a2e81651b0138d8551a0cfcd07176f8e7d2) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5800,16 +5877,15 @@
 ROM_END
 
 
-ROM_START( magicrd2b )  /* Imatic Yugoslavian hack for green TAB or Impera boards */
+ROM_START( magicrd2b )  // Imatic Yugoslavian hack for green TAB or Impera boards
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "mc2prgv1.bin", 0x8000, 0x8000,  CRC(7f759b70) SHA1(23a1a6e8eda57c4a90c51a970302f9a7bf590083) )
-//  ROM_LOAD( "mc2prgv2.bin", 0x8000, 0x8000,  CRC(b0ed6b40) SHA1(7167e67608f1b0b1cd956c838dacc1310861cb4a) )   // there are also pcbs with this program
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "mc2gr2.bin",   0x0000, 0x8000, CRC(733da697) SHA1(45122c64d5a371ec91cecc67b7faf179078e714d) )
 	ROM_LOAD( "mc2gr1.bin",   0x8000, 0x8000, CRC(2406b8d2) SHA1(e9d7a25562fd5adee351d7ef6ba02fff6aab021a) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM (passed protection) */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM (passed protection)
 	ROM_LOAD( "mc2_v1-v2_nvram.bin", 0x0000, 0x0800, BAD_DUMP CRC(f88c493d) SHA1(8a5352b46ab68164cd7adaaad6f15f04327b7451) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5820,16 +5896,15 @@
 ROM_END
 
 
-ROM_START( magicrd2c )  /* Imatic Yugoslavian hack for blue TAB board (encrypted)*/
+ROM_START( magicrd2c )  // Imatic Yugoslavian hack for blue TAB board (encrypted)
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "mc2prgv2.bin", 0x8000, 0x8000,  CRC(b0ed6b40) SHA1(7167e67608f1b0b1cd956c838dacc1310861cb4a) )
-//  ROM_LOAD( "mc2prgv1.bin", 0x8000, 0x8000,  CRC(7f759b70) SHA1(23a1a6e8eda57c4a90c51a970302f9a7bf590083) )   // there are also pcbs with this program
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "mc2gr1b.bin",  0x0000, 0x8000, CRC(ce2629a7) SHA1(84767ed5da8dcee44a210255537e10372bcc264b) )
 	ROM_LOAD( "mc2gr2b.bin",  0x8000, 0x8000, CRC(d2bf8bde) SHA1(975b8f43a0396c09e357b96d5ae7381b12152b9e) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM (passed protection) */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM (passed protection)
 	ROM_LOAD( "mc2_v1-v2_nvram.bin", 0x0000, 0x0800, BAD_DUMP CRC(f88c493d) SHA1(8a5352b46ab68164cd7adaaad6f15f04327b7451) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5851,10 +5926,10 @@
 	ROM_LOAD( "v2.bin", 0x0000, 0x8000, CRC(af7ab460) SHA1(01ea400424152c09c10eb83a1bd569019969ccb7) )
 	ROM_LOAD( "v1.bin", 0x8000, 0x8000, CRC(23e0d1c6) SHA1(98967b14d3264c444a1dfbd15c57cde70f41f09d) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "vegasslw_nvram.bin", 0x0000, 0x0800, CRC(1aa043e3) SHA1(c93d071effb2f2fe95e9dc751174c2c765595f74) )
 
-	ROM_REGION( 0x0200, "proms", 0 )    /* PLD address the 2nd half */
+	ROM_REGION( 0x0200, "proms", 0 )    // PLD address the 2nd half
 	ROM_LOAD( "jokercrd_prom.bin", 0x0000, 0x0200, CRC(e59fc06e) SHA1(88a3bb89f020fe2b20f768ca010a082e0b974831) )
 ROM_END
 
@@ -5867,39 +5942,39 @@
 	ROM_LOAD( "v2.bin", 0x0000, 0x8000, CRC(af7ab460) SHA1(01ea400424152c09c10eb83a1bd569019969ccb7) )
 	ROM_LOAD( "v1.bin", 0x8000, 0x8000, CRC(23e0d1c6) SHA1(98967b14d3264c444a1dfbd15c57cde70f41f09d) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "vegasfst_nvram.bin", 0x0000, 0x0800, CRC(5034de7a) SHA1(ab2077a49d94676531c73ad8d8ce9548bbfa2b81) )
 
-	ROM_REGION( 0x0200, "proms", 0 )    /* PLD address the 2nd half */
+	ROM_REGION( 0x0200, "proms", 0 )    // PLD address the 2nd half
 	ROM_LOAD( "jokercrd_prom.bin", 0x0000, 0x0200, CRC(e59fc06e) SHA1(88a3bb89f020fe2b20f768ca010a082e0b974831) )
 ROM_END
 
 
-ROM_START( vegasfte )   /* Royal Vegas Joker Card (fast deal, english gfx) */
+ROM_START( vegasfte )   // Royal Vegas Joker Card (fast deal, english gfx)
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "ch3.bin", 0x8000, 0x8000, CRC(87dfb28d) SHA1(9a06e695e59722b6c97e5a9fd2c8b238661e5a4a) )
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "ch2.bin", 0x0000, 0x8000, CRC(af7ab460) SHA1(01ea400424152c09c10eb83a1bd569019969ccb7) )
-	ROM_LOAD( "ch1.bin", 0x8000, 0x8000, CRC(0a3679c0) SHA1(ce8a067e1a2eccf9fabb16733ef3a14e0e8129e5) ) /* X & Y in txt layer */
+	ROM_LOAD( "ch1.bin", 0x8000, 0x8000, CRC(0a3679c0) SHA1(ce8a067e1a2eccf9fabb16733ef3a14e0e8129e5) ) // X & Y in txt layer
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "vegasfte_nvram.bin", 0x0000, 0x0800, CRC(166c6055) SHA1(db2143a2a3adc92578bd3707391d2f5030cc6a6f) )
 
-	ROM_REGION( 0x0200, "proms", 0 )    /* PLD address the 2nd half */
+	ROM_REGION( 0x0200, "proms", 0 )    // PLD address the 2nd half
 	ROM_LOAD( "jokercrd_prom.bin", 0x0000, 0x0200, CRC(e59fc06e) SHA1(88a3bb89f020fe2b20f768ca010a082e0b974831) )
 ROM_END
 
 
 ROM_START( vegasmil )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Mile */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Mile
 	ROM_LOAD( "mile.bin", 0x8000, 0x8000, CRC(ef7e02e2) SHA1(7432b0e723dc528901c422ab1d7d01fd1bc1eb20) )
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "v2.bin", 0x0000, 0x8000, CRC(af7ab460) SHA1(01ea400424152c09c10eb83a1bd569019969ccb7) )
 	ROM_LOAD( "v1.bin", 0x8000, 0x8000, CRC(23e0d1c6) SHA1(98967b14d3264c444a1dfbd15c57cde70f41f09d) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "vegasmil_nvram.bin", 0x0000, 0x0800, CRC(d2608e5f) SHA1(ac936df71dbc0bfb811a3ba3c91444a2a3e7b036) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -5991,7 +6066,7 @@
 
 */
 
-ROM_START( jolyjokr )   /* Jolly Joker (98bet, set 1) */
+ROM_START( jolyjokr )   // Jolly Joker (98bet, set 1)
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "impera3orig.bin", 0x8000, 0x8000, CRC(ceb3a0d5) SHA1(25efae9f225abddfa663e6abcc91801996e5b0ea) )
 
@@ -5999,7 +6074,7 @@
 	ROM_LOAD( "impera2.bin", 0x0000, 0x8000, CRC(f0fa5941) SHA1(1fcade31ed6893ffcfd4efe97dfaaa31d24283ec) )
 	ROM_LOAD( "impera1.bin", 0x8000, 0x8000, CRC(c3ab44dd) SHA1(e46c0fd94da561f57033647f1703fa135777ece5) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolyjokr_nvram.bin", 0x0000, 0x0800, CRC(f33e66ed) SHA1(7a4b9a1b2f976d5d26f54915a213d5ac5eca0a42) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -6007,7 +6082,7 @@
 ROM_END
 
 
-ROM_START( jolyjokra )  /* Jolly Joker (98bet, set 2) */
+ROM_START( jolyjokra )  // Jolly Joker (98bet, set 2)
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "impera50.bin", 0x8000, 0x8000, CRC(7effc044) SHA1(961438e7fb8222296fb959b510cdf646e4ac3226) )
 
@@ -6015,7 +6090,7 @@
 	ROM_LOAD( "impera2.bin", 0x0000, 0x8000, CRC(f0fa5941) SHA1(1fcade31ed6893ffcfd4efe97dfaaa31d24283ec) )
 	ROM_LOAD( "impera1.bin", 0x8000, 0x8000, CRC(c3ab44dd) SHA1(e46c0fd94da561f57033647f1703fa135777ece5) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolyjokra_nvram.bin", 0x0000, 0x0800, CRC(ed43693c) SHA1(d4aa4e539ab12c97bc9b9b1077997195a11d782b) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -6024,34 +6099,80 @@
 
 
 /*
-    Jolly Joker (40bet, croatian hack)
+  Jolly Joker (40bet)
 
-    am27s29_ic40.bin     1ST AND 2ND HALF IDENTICAL
-    ic25.bin             1ST AND 2ND HALF IDENTICAL
-    ic26.bin             1ST AND 2ND HALF IDENTICAL
-
-    These graphics ROMs have enough data to fix the bitrotten graphics from the other Jolly Joker sets.
-    impera1.bin ---> bits 7 & 6
-    impera2.bin ---> bits 7 & 0
-
-    Two slightly different programs. One in each half.
-    Both have Min Bet (5), Max Bet (40).
-    Surely selectable through a PLD.
-
-*/
-ROM_START( jolyjokrb )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Two slightly different programs. Using the 1st one...*/
-	ROM_LOAD( "unbekannt.bin", 0x8000, 0x8000, CRC(327fa3d7) SHA1(2435aada2377b2f8f01d059a7aba9bc7a8993537) )   /* 1st prg */
-	ROM_IGNORE(                        0x8000 ) /* Using the 1st program. Discarding 2nd half */
-//  ROM_LOAD( "unbekannt.bin", 0x0000, 0x10000, CRC(327fa3d7) SHA1(2435aada2377b2f8f01d059a7aba9bc7a8993537) )  /* 2nd prg */
+  am27s29_ic40.bin     1ST AND 2ND HALF IDENTICAL
+  ic25.bin             1ST AND 2ND HALF IDENTICAL
+  ic26.bin             1ST AND 2ND HALF IDENTICAL
+
+  These graphics ROMs have enough data to fix the bitrotten graphics from the other Jolly Joker sets.
+  impera1.bin ---> bits 7 & 6
+  impera2.bin ---> bits 7 & 0
+
+  Two slightly different programs. One in each half.
+  Both have Min Bet (5), Max Bet (40).
+  Surely selectable through a PLD.
+
+  This is clearly the paytable. Here the differences...
+
+  offset:     C9CF C9D0 C9D1 C9D2 C9D3 C9D4 C9D5 C9D6 C9D7 C9D8 C9D9 C9DA C9DB C9DC C9DD C9DE C9DF C9E0 C9E1 C9E2
+  program #1  0x01 0x00 0x02 0x00 0x03 0x00 0x05 0x00 0x07 0x00 0x10 0x00 0x40 0x00 0x00 0x01 0x00 0x05 0x00 0x11
+  program #2  0x01 0x00 0x02 0x00 0x03 0x00 0x05 0x00 0x07 0x00 0x10 0x00 0x40 0x00 0x00 0x01 0x50 0x02 0x00 0x03
+                                                                                              ^^^^ ^^^^      ^^^^
+
+  offset:     C9E3 C9E4 C9E5 C9E6 C9E7 C9E8 C9E9 C9EA C9EB C9EC C9ED C9EE C9EF C9F0 C9F1 C9F2 C9F3 C9F4 C9F5 C9F6
+  program #1  0x01 0x00 0x02 0x00 0x03 0x00 0x05 0x00 0x07 0x00 0x10 0x00 0x40 0x00 0x00 0x01 0x00 0x05 0x00 0x11
+  program #2  0x01 0x00 0x02 0x00 0x03 0x00 0x05 0x00 0x07 0x00 0x10 0x00 0x40 0x00 0x00 0x01 0x50 0x02 0x00 0x03
+                                                                                              ^^^^ ^^^^      ^^^^
+  This change the paytable to the following values:
+
+    Program #1                  Program #2
+
+    Five of a Kind  1100        Five of a Kind   300
+    Royak Flush      500        Royak Flush      250
+    Street Flush     100        Street Flush     100
+    Poker             40        Poker             40
+    Full House        10        Full House        10
+    Farbe              7        Farbe              7
+    Strasse            5        Strasse            5
+    Drilling           3        Drilling           3
+    2 Paare            2        2 Paare            2
+    Hohes Paar         1        Hohes Paar         1
+
+  Will split in two different sets, since these programs were made to use as different
+  game variations, and aren't user selectable.
+
+*/
+ROM_START( jolyjokrb1 )
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Two different paytable programs. Using the 1st one (higher paytable)
+	ROM_LOAD( "unbekannt.bin", 0x8000, 0x8000, CRC(327fa3d7) SHA1(2435aada2377b2f8f01d059a7aba9bc7a8993537) )
+	ROM_IGNORE(                        0x8000 ) // Using the 1st program. Discarding 2nd half
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "ic26.bin", 0x0000, 0x8000, CRC(3e45dfc6) SHA1(8fd0b0cc00cdd96244ae7e7a91f6613b1c144ee0) )
-	ROM_IGNORE(                   0x8000 )  /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                   0x8000 )  // Identical halves. Discarding 2nd half
 	ROM_LOAD( "ic25.bin", 0x8000, 0x8000, CRC(1bd067af) SHA1(9436fe085ba63c00a12ea80903470a84535e3dc1) )
-	ROM_IGNORE(                   0x8000 )  /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                   0x8000 )  // Identical halves. Discarding 2nd half
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
+	ROM_LOAD( "jolyjokrb_nvram.bin", 0x0000, 0x0800, CRC(17007bb5) SHA1(72e08096293ce4fbde205a63b5ecd9641dbee017) )
+
+	ROM_REGION( 0x0200, "proms", 0 )
+	ROM_LOAD( "am27s29_ic40.bin",    0x0000, 0x0200, CRC(0b671bba) SHA1(92d512e02b50f98b7bc5a60deee4fee722656c4f) )
+ROM_END
+
+ROM_START( jolyjokrb2 )
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Two different paytable programs. Using the 2nd one (lower paytable)
+	ROM_LOAD( "unbekannt.bin", 0x8000, 0x8000, CRC(327fa3d7) SHA1(2435aada2377b2f8f01d059a7aba9bc7a8993537) )
+	ROM_CONTINUE(              0x8000, 0x8000)  // overlapping with the 2nd program.
+
+	ROM_REGION( 0x10000, "gfx1", 0 )
+	ROM_LOAD( "ic26.bin", 0x0000, 0x8000, CRC(3e45dfc6) SHA1(8fd0b0cc00cdd96244ae7e7a91f6613b1c144ee0) )
+	ROM_IGNORE(                   0x8000 )  // Identical halves. Discarding 2nd half
+	ROM_LOAD( "ic25.bin", 0x8000, 0x8000, CRC(1bd067af) SHA1(9436fe085ba63c00a12ea80903470a84535e3dc1) )
+	ROM_IGNORE(                   0x8000 )  // Identical halves. Discarding 2nd half
+
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "jolyjokrb_nvram.bin", 0x0000, 0x0800, CRC(17007bb5) SHA1(72e08096293ce4fbde205a63b5ecd9641dbee017) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -6076,10 +6197,103 @@
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "tbp28s42.bin", 0x0000, 0x0200, CRC(0b671bba) SHA1(92d512e02b50f98b7bc5a60deee4fee722656c4f) )
 
-	ROM_REGION( 0x0200, "plds", 0 )    /* Cracked PLD */
+	ROM_REGION( 0x0200, "plds", 0 ) // cracked PLD
 	ROM_LOAD( "jjpal.bin", 0x0000, 0x0117, CRC(3b084c34) SHA1(5d186b70317ef871c9a426eb420b66efcbd918de) )
 ROM_END
 
+/*
+  Jolly Joker
+  Impera.
+
+  The following two sets have the same program
+  but different graphics system.
+
+  Both sets have graphics ROMs data interleaved
+  inside the second half of a 16bit 27C210 EPROM.
+  The second set has some 8bits data in the first half.
+  Not clear if it's for obfuscation or just are the missing
+  logo graphics tiles.
+
+  The program looks original. The former sets programs
+  have differents offsets patched and moved blocks respect
+  this new program.
+
+  Didn't set as parent due to the fact that seems older.
+  Maybe being more original and less patched should be set
+  as parent.
+
+*/
+ROM_START( jolyjokro )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "impera1.bin", 0x0000, 0x10000, CRC(3cad9fcf) SHA1(09f23ae8c04e6b461e17a8b3978fe44566ffc3aa) )
+
+	ROM_REGION( 0x10000, "gfxpool", 0 )
+	ROM_LOAD( "impera2.bin", 0x0000, 0x10000, CRC(aa86dba6) SHA1(fe189dde83bd855f4a0b34b20c161a9addc15017) )
+	ROM_CONTINUE(            0x0000, 0x10000)   // discarding 1nd empty half (0000-ffff)
+
+	ROM_REGION( 0x10000, "gfx1", 0 )
+	ROM_FILL(              0x0000, 0x10000, 0xff)   // deinterleaved GFX data will be placed here
+
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
+	ROM_LOAD( "jolyjokro_nvram.bin", 0x0000, 0x0800, CRC(1f69e567) SHA1(86695ca6f9f93c6badd092410611d8061edf8efa) )
+
+	ROM_REGION( 0x0200, "proms", 0 )    // PLD address the 2nd half
+	ROM_LOAD( "1_impera_color_ii.bin", 0x0000, 0x0200, CRC(9d62f9f5) SHA1(68300c25c7eaa13a3fdbf91ab0711d0bc530543d) )
+ROM_END
+
+ROM_START( jolyjokrp )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "impera1.bin", 0x0000, 0x10000, CRC(3cad9fcf) SHA1(09f23ae8c04e6b461e17a8b3978fe44566ffc3aa) )
+
+	ROM_REGION( 0x10000, "gfxpool", 0 )
+	ROM_LOAD( "9c_1ff1.bin", 0x00000, 0x10000, CRC(4b8f0821) SHA1(0821eed07f5e98b66d87a3079756dad72ffe9665) )
+	ROM_CONTINUE(            0x00000, 0x10000)  // discarding 1nd half (0000-ffff), but has some data. leftover?
+
+	ROM_REGION( 0x10000, "gfx1", 0 )
+	ROM_FILL(              0x0000, 0x10000, 0xff)   // deinterleaved GFX data will be placed here
+
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
+	ROM_LOAD( "jolyjokrp_nvram.bin", 0x0000, 0x0800, CRC(c8706e75) SHA1(421420b1ee82615faf290d1204342cdde776ffaf) )
+
+	ROM_REGION( 0x0200, "proms", 0 )    // PLD address the 2nd half
+	ROM_LOAD( "impera_color_ii.bin", 0x0000, 0x0200, CRC(9d62f9f5) SHA1(68300c25c7eaa13a3fdbf91ab0711d0bc530543d) )
+ROM_END
+
+/*
+  Jolly Joker
+  Impera.
+
+  This hardware has a daughterboard that seems a solid state replacement
+  for the suicide modules of funworld boards.
+
+  It's just a theory, but the main battery is routed to the daughterboard
+  connectors, when this module has not suicide program inside a RAM.
+
+  Module contents:
+
+  1x Rockwell R65C02P2 Mexico.
+  1x 27c512 EPROM stickered 'IMPERA1'.
+  1x PAL16L8A2NC.
+  1x 74HC241N.
+  1x 74LS245N.
+  1x 74LS139N.
+
+*/
+ROM_START( jolyjokrm )  // Jolly Joker (Solid State module in suicide board)
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "impera1.bin", 0x0000, 0x10000, CRC(3cad9fcf) SHA1(09f23ae8c04e6b461e17a8b3978fe44566ffc3aa) )
+
+	ROM_REGION( 0x10000, "gfx1", 0 )
+	ROM_LOAD( "02.bin", 0x0000, 0x8000, CRC(f0fa5941) SHA1(1fcade31ed6893ffcfd4efe97dfaaa31d24283ec) )
+	ROM_LOAD( "01.bin", 0x8000, 0x8000, CRC(c3ab44dd) SHA1(e46c0fd94da561f57033647f1703fa135777ece5) )
+
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
+	ROM_LOAD( "jolyjokrm_nvram.bin", 0x0000, 0x0800, CRC(f33e66ed) SHA1(7a4b9a1b2f976d5d26f54915a213d5ac5eca0a42) )
+
+	ROM_REGION( 0x0200, "proms", 0 )
+	ROM_LOAD( "63s481.bin", 0x0000, 0x0200, CRC(1f974802) SHA1(c9d4d72edef3c03b0c6e1a0ffc0b82f6d213d29c) )
+ROM_END
+
 
 /******************************** Other sets ************************************/
 
@@ -6101,7 +6315,7 @@
 	ROM_LOAD( "multiwin1.bin",  0x8000, 0x8000, CRC(97589aa6) SHA1(2486116637bd906cb3b32acd86fc861c48a0475e) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
-	ROM_LOAD( "multi_prom.bin", 0x0000, 0x0200, BAD_DUMP CRC(e59fc06e) SHA1(88a3bb89f020fe2b20f768ca010a082e0b974831) ) /* using the joker card one */
+	ROM_LOAD( "multi_prom.bin", 0x0000, 0x0200, BAD_DUMP CRC(e59fc06e) SHA1(88a3bb89f020fe2b20f768ca010a082e0b974831) ) // using the joker card one
 ROM_END
 
 
@@ -6199,12 +6413,12 @@
 
 */
 ROM_START( powercrd )
-	ROM_REGION( 0x10000, "maincpu", 0 )  /* need proper decryption */
-	ROM_LOAD( "263a1.bin",  0x8000, 0x8000, CRC(9e5e477d) SHA1(428464a64bea8cb478bc8033859baa47d7de0297) )  /* just the 2nd half */
-	ROM_LOAD( "263a2.bin",  0x0000, 0x8000, CRC(11b1a13f) SHA1(766c1a45c238467d6a292795f5a159187966ceec) )  /* just the 2nd half */
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "263a1.bin",  0x8000, 0x8000, CRC(9e5e477d) SHA1(428464a64bea8cb478bc8033859baa47d7de0297) )  // just the 2nd half
+	ROM_LOAD( "263a2.bin",  0x0000, 0x8000, CRC(11b1a13f) SHA1(766c1a45c238467d6a292795f5a159187966ceec) )  // just the 2nd half
 
-	ROM_REGION( 0x0800, "decode", 0 )  /* from the CY7C291A inside of the custom CPU */
-	ROM_LOAD( "powercrd_cy7c291a.bin",  0x0000, 0x0800, CRC(f1d8f35d) SHA1(2b5f9222a81a627d43fd8448385f85c71c24b914) )  /* new dump */
+	ROM_REGION( 0x0800, "decode", 0 )   // from the CY7C291A inside of the custom CPU
+	ROM_LOAD( "powercrd_cy7c291a.bin",  0x0000, 0x0800, CRC(f1d8f35d) SHA1(2b5f9222a81a627d43fd8448385f85c71c24b914) )
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "power_c_zg2.ic11",   0x0000, 0x8000, CRC(108380bb) SHA1(922beffe3c06f391239125e6f4ccc86ec6980c45) )
@@ -6333,15 +6547,15 @@
 */
 
 ROM_START( megacard )
-	ROM_REGION( 0x10000, "maincpu", 0 )  /* need proper decryption */
-	ROM_LOAD( "mega_mc3_210-f-1.ic37",  0x8000, 0x8000, CRC(747f5ed1) SHA1(06757bb6a792dca93978b17b54c28e413e3720b1) )  /* just the 2nd half */
-	ROM_LOAD( "mega_mc3_210-f-2.ic41",  0x0000, 0x8000, CRC(373094d2) SHA1(8aed2502e89b0e7522e88f351ac256f1afad7ee8) )  /* just the 2nd half */
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mega_mc3_210-f-1.ic37",  0x8000, 0x8000, CRC(747f5ed1) SHA1(06757bb6a792dca93978b17b54c28e413e3720b1) )  // just the 2nd half
+	ROM_LOAD( "mega_mc3_210-f-2.ic41",  0x0000, 0x8000, CRC(373094d2) SHA1(8aed2502e89b0e7522e88f351ac256f1afad7ee8) )  // just the 2nd half
 
-	ROM_REGION( 0x0300, "die_65sc02", 0 )  /* from the 65SC02 die inside of the custom CPU */
+	ROM_REGION( 0x0300, "die_65sc02", 0 )   // from the 65SC02 die inside of the custom CPU
 	ROM_LOAD( "gteu65decoderom.bin",   0x0000, 0x02f1, CRC(089af0c6) SHA1(0f46a73a7859a694a07ebe74d476fae80e57e329) )
 
-	ROM_REGION( 0x0800, "decode", 0 )  /* from the CY7C291A inside of the custom CPU */
-	ROM_LOAD( "megacard_cy7291a.bin",  0x0000, 0x0800, CRC(596f01ac) SHA1(a8606a1dd385fbb46b1a96f11a759fa6580803d8) )  /* new dump */
+	ROM_REGION( 0x0800, "decode", 0 )   // from the CY7C291A inside of the custom CPU
+	ROM_LOAD( "megacard_cy7291a.bin",  0x0000, 0x0800, CRC(596f01ac) SHA1(a8606a1dd385fbb46b1a96f11a759fa6580803d8) )
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "mega_zg2.ic11",   0x0000, 0x8000, CRC(0993d380) SHA1(e5e2386948fba2fb6b79339af27bd1d0f1e198ca) )
@@ -6367,9 +6581,9 @@
   Unfortunatelly, the graphics ROM vesely_zg_1.ic10 has address 8 line (leg 25) shorted.
   Seems that the protection diode was blown due to a bad handling.
 
-  With forensics technics, a special device was constructed to process the faulty ROM
-  and try to read the contents. Fortunatelly after all these efforts, we got
-  a perfect and complete dump.
+  With forensics techniques, a special device was constructed to process
+  the faulty ROM and try to read the contents. Fortunatelly after all these
+  efforts, we got a perfect and complete dump.
 
 
   Specs:
@@ -6424,9 +6638,9 @@
 ROM_START( jokercrd )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "ic41.bin",   0x4000,  0x4000, CRC(d36188b3) SHA1(3fb848fabbbde9fbb70875b3dfef62bfb3a8cbcb) )
-	ROM_IGNORE(                      0x4000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                      0x4000 )   // Identical halves. Discarding 2nd half
 	ROM_LOAD( "ic37.bin",   0xc000,  0x4000, CRC(8e0d70c4) SHA1(018f92631acbe98e5826a41698f0e07b4b46cd71) )
-	ROM_IGNORE(                      0x4000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                      0x4000 )   // Identical halves. Discarding 2nd half
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "vesely_zg_2.ic11", 0x0000, 0x8000, CRC(21d05a57) SHA1(156c18ec31b08e4c4af6f73b49cb5d5c68d1670f) )
@@ -6468,25 +6682,25 @@
 ROM_START( mongolnw )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "prgteov.2.3m.u16", 0x8000, 0x8000, CRC(996b851a) SHA1(ef4e3d036ca10b33c83749024d04c4d4c09feeb7) )
-	ROM_IGNORE(                           0x8000 )  /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                           0x8000 )  // Identical halves. Discarding 2nd half
 
-	ROM_REGION( 0x10000, "cpu1", 0 ) /* TSC87C52-16CB MCU Code */
+	ROM_REGION( 0x10000, "cpu1", 0 )    // TSC87C52-16CB MCU Code
 	ROM_LOAD( "tsc87c52-mf.u40", 0x0000, 0x02000 , CRC(ae22e778) SHA1(0897e05967d68d7f23489e98717663e3a3176070) )
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "mong.rc.b2.u3", 0x0000, 0x8000, CRC(5e019b73) SHA1(63a544dccb9589e5a6b938e604c09d4d8fc060fc) )
-	ROM_IGNORE(                        0x8000 ) /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                        0x8000 ) // Identical halves. Discarding 2nd half
 	ROM_LOAD( "mong.rc.c1.u2", 0x8000, 0x8000, CRC(e3fc24c4) SHA1(ea4e67ace63b55a76365f7e11a67c7d420a52dd7) )
-	ROM_IGNORE(                        0x8000 ) /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                        0x8000 ) // Identical halves. Discarding 2nd half
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "mongolnw_nvram.bin", 0x0000, 0x0800, CRC(700531fa) SHA1(a8bcf86df6bd06d2ee54b4898dd7822060b81dba) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "am27s29pc_mf.u24", 0x0000, 0x0200, CRC(da9181af) SHA1(1b30d992f3b2a4b3bd81e3f99632311988e2e8d1) )
 
 	ROM_REGION( 0x0200, "plds", 0 )
-	ROM_LOAD( "palce16v8h_mf.u5", 0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
+	ROM_LOAD( "palce16v8h_mf.u5", 0x0000, 0x0117, NO_DUMP ) // PLD is read protected
 ROM_END
 
 
@@ -6528,25 +6742,25 @@
 ROM_START( soccernw )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "prgteo2gv2.3.u16", 0x8000, 0x8000, CRC(c61d1937) SHA1(c516f13a108da60b7ccee338b63a025009ef9099) )
-	ROM_IGNORE(                           0x8000 )  /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                           0x8000 )  // Identical halves. Discarding 2nd half
 
-	ROM_REGION( 0x10000, "cpu1", 0 ) /* TSC87C52-16CB MCU Code */
+	ROM_REGION( 0x10000, "cpu1", 0 )    // TSC87C52-16CB MCU Code
 	ROM_LOAD( "tsc87c52-sn.u40", 0x0000, 0x02000 , CRC(af0bd35b) SHA1(c6613a7bcdec2fd6060d6dcf639654568de87e75) )
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "soccer2.u3", 0x0000, 0x8000, CRC(db09b5bb) SHA1(a12bf2938f5482ea5ebc0db6fd6594e1beb97017) )
-	ROM_IGNORE(                     0x8000 )    /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                     0x8000 )    // Identical halves. Discarding 2nd half
 	ROM_LOAD( "soccer1.u2", 0x8000, 0x8000, CRC(564cc467) SHA1(8f90c4bacd97484623666b25dae77e628908e243) )
-	ROM_IGNORE(                     0x8000 )    /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                     0x8000 )    // Identical halves. Discarding 2nd half
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "soccernw_nvram.bin", 0x0000, 0x0800, CRC(607247bd) SHA1(06bbed08166d8930f14e1f41843ac7faeded263d) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "am27s29pc_sn.u24", 0x0000, 0x0200, CRC(d02894fc) SHA1(adcdc912cc0b7a7f67b122fa94fca921c957b282) )
 
 	ROM_REGION( 0x0200, "plds", 0 )
-	ROM_LOAD( "palce16v8h_sn.u5", 0x0000, 0x0117, NO_DUMP ) /* PAL is read protected */
+	ROM_LOAD( "palce16v8h_sn.u5", 0x0000, 0x0117, NO_DUMP ) // PLD is read protected
 ROM_END
 
 
@@ -6670,7 +6884,7 @@
   --+-----------------------------------------------------------------------
 
 */
-ROM_START( funquiz )    /* Fun World Quiz */
+ROM_START( funquiz )    // Fun World Quiz
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "kqu_6.bin", 0xc000, 0x4000, CRC(50f0e586) SHA1(85ce5b95283113e2ac94fd882c57ce1b26135ed0) )
 
@@ -6680,31 +6894,31 @@
 	ROM_FILL(              0x8000, 0x4000, 0xff)
 	ROM_LOAD( "q_2.bin",   0xc000, 0x4000, CRC(ce07c6e1) SHA1(6b77a9198e29c195d983b856e8826e8174945321) )
 
-	/* One unpopulated questions socket... Maybe sport_1 is missing */
+//  One unpopulated questions socket... Maybe sport_1 is missing
 	ROM_REGION( 0x100000, "questions", ROMREGION_ERASEFF )
 
-	/* 01 - Allgemein */
+	// 01 - Allgemein
 	ROM_LOAD( "allg_1.bin",  0x00000, 0x8000, CRC(1351cf56) SHA1(50e89c3e6d256bcf7f1d3c0dbef935e4e8561096) )
 	ROM_LOAD( "allg_2.bin",  0x08000, 0x8000, CRC(021492a4) SHA1(b59e1303f17c9e5af05a808118ae729205690bb2) )
 	ROM_LOAD( "allg_3.bin",  0x10000, 0x8000, CRC(de8e055f) SHA1(593fce143ee5994087bbac8b51ac7e2d02e8701c) )
 	ROM_LOAD( "allg_4.bin",  0x18000, 0x8000, CRC(5c87177a) SHA1(a8a8318165008cb3295e25d4b4d38146f44a32fc) ) // this one has the category in the rom in ALL caps, is it official?
 	ROM_LOAD( "allg_5.bin",  0x20000, 0x8000, CRC(83056686) SHA1(00f14ded371751d54a391bf583d940b32ddeae58) )
 
-	/* 02 - Geschichte */
+	// 02 - Geschichte
 	ROM_LOAD( "gesch_1.bin", 0x28000, 0x8000, CRC(6f785938) SHA1(1e3df7c262d8cb7d7981c9d424d4c1361fe55b50) )
 	ROM_LOAD( "gesch_2.bin", 0x30000, 0x8000, CRC(3363c0ba) SHA1(f1a2a86e6abc73dd9312fa744b6929fae138e219) )
 
-	/* 03 - Geographie */
+	// 03 - Geographie
 	ROM_LOAD( "geo_1.bin",   0x38000, 0x8000, CRC(504da831) SHA1(4bef7bed4d300400c094cb30e9af55d3c6f47c29) )
 	ROM_LOAD( "geo_2.bin",   0x40000, 0x8000, CRC(7c563119) SHA1(9f3ae3ba3e4f60d9ea4b5c95aa5aaada8bb446a3) )
 
-	/* 04 - Technik */
+	// 04 - Technik
 	ROM_LOAD( "tech_1.bin",  0x48000, 0x8000, CRC(cf5b9edc) SHA1(f1085c9915d21c4da581d06c9568d2bb47d467ed) )
 
-	/* 05 - Sport */
+	// 05 - Sport
 	ROM_LOAD( "sport_2.bin", 0x50000, 0x8000, CRC(7accde63) SHA1(75ec3a02368d3a07d48ef9a9ff4ca7f8cf7798e2) )
 
-	/* 07 - Pop */
+	// 07 - Pop
 	ROM_LOAD( "pop_1.bin",   0x58000, 0x8000, CRC(5c74781e) SHA1(0a50a706fd397bb220e31f1a7adaa4204b242888) )
 	ROM_LOAD( "pop_2.bin",   0x60000, 0x8000, CRC(10103648) SHA1(6fdc1aa4dcc8919e46def1c19adc2b9686c0f72d) )
 
@@ -6733,29 +6947,29 @@
 
 	ROM_REGION( 0x100000, "questions", ROMREGION_ERASEFF )
 
-	/* 01 - Allgemein */
+	// 01 - Allgemein
 	ROM_LOAD( "allg1.bin",   0x00000, 0x8000, CRC(1351cf56) SHA1(50e89c3e6d256bcf7f1d3c0dbef935e4e8561096) )
 	ROM_LOAD( "allg2.bin",   0x08000, 0x8000, CRC(021492a4) SHA1(b59e1303f17c9e5af05a808118ae729205690bb2) )
 	ROM_LOAD( "allg3.bin",   0x10000, 0x8000, CRC(4eb29de3) SHA1(5c5d47959c06261ab51fc4e821bff0fe41ac9176) )
 	ROM_LOAD( "allg4.bin",   0x18000, 0x8000, CRC(5c87177a) SHA1(a8a8318165008cb3295e25d4b4d38146f44a32fc) )
 	ROM_LOAD( "allg5.bin",   0x20000, 0x8000, CRC(83056686) SHA1(00f14ded371751d54a391bf583d940b32ddeae58) )
 
-	/* 02 - Technik */
+	// 02 - Technik
 	ROM_LOAD( "tech1.bin",   0x28000, 0x8000, CRC(cf5b9edc) SHA1(f1085c9915d21c4da581d06c9568d2bb47d467ed) )
 
-	/* 03 - Sport */
+	// 03 - Sport
 	ROM_LOAD( "sp1.bin",     0x30000, 0x8000, CRC(20fb1261) SHA1(ad029f1a2b19365543c77fcd1103f6c5783c9f68) )
 	ROM_LOAD( "sp2.bin",     0x38000, 0x8000, CRC(1988f5b7) SHA1(969ae64796e432c04862cb8c159e419a4793e9f0) )
 
-	/* 04 - Film - Unterhaltung */
+	// 04 - Film - Unterhaltung
 	ROM_LOAD( "unterh1.bin", 0x40000, 0x8000, CRC(996e7adc) SHA1(7b271cdb6ef555d31c2b17c6104bd30cd2eabcb3) )
 
-	/* 05 - Geographie */
+	// 05 - Geographie
 	ROM_LOAD( "geo1.bin",   0x48000, 0x8000, CRC(504da831) SHA1(4bef7bed4d300400c094cb30e9af55d3c6f47c29) )
 	ROM_LOAD( "geo2.bin",   0x50000, 0x8000, CRC(7c563119) SHA1(9f3ae3ba3e4f60d9ea4b5c95aa5aaada8bb446a3) )
 	ROM_LOAD( "geo3.bin",   0x58000, 0x8000, CRC(7c563119) SHA1(9f3ae3ba3e4f60d9ea4b5c95aa5aaada8bb446a3) )
 
-	/* 06 - Pop */
+	// 06 - Pop
 	ROM_LOAD( "pop_1.bin",   0x60000, 0x8000, CRC(5c74781e) SHA1(0a50a706fd397bb220e31f1a7adaa4204b242888) )
 	ROM_LOAD( "pop_2.bin",   0x68000, 0x8000, CRC(10103648) SHA1(6fdc1aa4dcc8919e46def1c19adc2b9686c0f72d) )
 
@@ -6781,29 +6995,29 @@
 
 	ROM_REGION( 0x100000, "questions", ROMREGION_ERASEFF )
 
-	/* 01 - Allgemein */
+	// 01 - Allgemein
 	ROM_LOAD( "allg1.bin",  0x00000, 0x8000, CRC(1351cf56) SHA1(50e89c3e6d256bcf7f1d3c0dbef935e4e8561096) )
 	ROM_LOAD( "allg2.bin",  0x08000, 0x8000, CRC(021492a4) SHA1(b59e1303f17c9e5af05a808118ae729205690bb2) )
 	ROM_LOAD( "allg3.bin",  0x10000, 0x8000, CRC(de8e055f) SHA1(593fce143ee5994087bbac8b51ac7e2d02e8701c) )
 	ROM_LOAD( "allg4.bin",  0x18000, 0x8000, CRC(5c87177a) SHA1(a8a8318165008cb3295e25d4b4d38146f44a32fc) )
 	ROM_LOAD( "allg5.bin",  0x20000, 0x8000, CRC(83056686) SHA1(00f14ded371751d54a391bf583d940b32ddeae58) )
 
-	/* 02 - Technik */
+	// 02 - Technik
 	ROM_LOAD( "tech1.bin",  0x28000, 0x8000, CRC(cf5b9edc) SHA1(f1085c9915d21c4da581d06c9568d2bb47d467ed) )
 
-	/* 03 - Sport */
+	// 03 - Sport
 	ROM_LOAD( "sport1.bin", 0x30000, 0x8000, CRC(b351c745) SHA1(3b64d8e935eb4cd5bdf82934983b3ffab465257a) )
 	ROM_LOAD( "sport2.bin", 0x38000, 0x8000, CRC(7accde63) SHA1(75ec3a02368d3a07d48ef9a9ff4ca7f8cf7798e2) )
 
-	/* 04 - Film - Unterhaltung */
+	// 04 - Film - Unterhaltung
 	ROM_LOAD( "unt1.bin",   0x40000, 0x8000, CRC(996e7adc) SHA1(7b271cdb6ef555d31c2b17c6104bd30cd2eabcb3) )
 
-	/* 05 - Geographie */
+	// 05 - Geographie
 	ROM_LOAD( "geo1.bin",   0x48000, 0x8000, CRC(504da831) SHA1(4bef7bed4d300400c094cb30e9af55d3c6f47c29) )
 	ROM_LOAD( "geo2.bin",   0x50000, 0x8000, CRC(7c563119) SHA1(9f3ae3ba3e4f60d9ea4b5c95aa5aaada8bb446a3) )
 	ROM_LOAD( "geo3.bin",   0x58000, 0x8000, CRC(7c563119) SHA1(9f3ae3ba3e4f60d9ea4b5c95aa5aaada8bb446a3) )
 
-	/* 06 - Pop */
+	// 06 - Pop
 	ROM_LOAD( "pop1.bin",   0x60000, 0x8000, CRC(5c74781e) SHA1(0a50a706fd397bb220e31f1a7adaa4204b242888) )
 	ROM_LOAD( "pop2.bin",   0x68000, 0x8000, CRC(10103648) SHA1(6fdc1aa4dcc8919e46def1c19adc2b9686c0f72d) )
 
@@ -6827,11 +7041,11 @@
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "2.u11", 0x0000, 0x8000, CRC(7edc8f44) SHA1(cabad613fa8a72dc12587d19a72bc9c6861486bd) )
-	ROM_IGNORE(                0x8000 ) /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                0x8000 ) // Identical halves. Discarding 2nd half
 	ROM_LOAD( "3.u4",  0x8000, 0x8000, CRC(5e4a0d59) SHA1(08eb9b1a617a7b2e6f87377819dba07082cf38b4) )
-	ROM_IGNORE(                0x8000 ) /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                0x8000 ) // Identical halves. Discarding 2nd half
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "witchryl_nvram.bin", 0x0000, 0x0800, CRC(98366bed) SHA1(279a5ce4639b8b2ac29146b32512615253c45991) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -6848,7 +7062,7 @@
 
 */
 
-ROM_START( novoplay )   /* Similar to Royal Vegas Joker Card */
+ROM_START( novoplay )   // Similar to Royal Vegas Joker Card
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "np1_run.bin", 0x8000, 0x8000, CRC(4078d695) SHA1(d0e39064250733968044aec216040fe62fecc880) )
 
@@ -6856,10 +7070,10 @@
 	ROM_LOAD( "np1_ch2.bin", 0x0000, 0x8000, CRC(188d6fad) SHA1(3bc9bab24d8c7beed0c5f491c19a004ca7d719a1) )
 	ROM_LOAD( "np1_ch1.bin", 0x8000, 0x8000, CRC(fdc3bd67) SHA1(0ec2d5e0b1937849934f98e253e18887af0331e8) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "novoplay_nvram.bin", 0x0000, 0x0800, CRC(92019972) SHA1(e6d1e231cd2ce27e718ed9482dbe9ddc8612eb67) )
 
-	ROM_REGION( 0x0200, "proms", 0 )    /* PLD address the 2nd half */
+	ROM_REGION( 0x0200, "proms", 0 )    // PLD address the 2nd half
 	ROM_LOAD( "np1_27s29.bin", 0x0000, 0x0200, CRC(8992aa4d) SHA1(5a0649bff66e7cab1bcbadcdfc74c77a747cc58f) )
 ROM_END
 
@@ -6879,7 +7093,7 @@
 
 */
 
-ROM_START( jolycdsp )   /* Encrypted program in a module. Blue TAB PCB encrypted graphics */
+ROM_START( jolycdsp )   // Encrypted program in a module. Blue TAB PCB encrypted graphics
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "ct3.bin", 0x8000, 0x8000, CRC(0c9cbae6) SHA1(4f834370229797cac302a5185ed1e77ef2b7cabb) )
 
@@ -6887,10 +7101,10 @@
 	ROM_LOAD( "ct2.bin", 0x0000, 0x8000, CRC(7569e719) SHA1(f96e1e72bc13d1888f3868f8d404fd3db94db7b2) )
 	ROM_LOAD( "ct1.bin", 0x8000, 0x8000, CRC(8f438635) SHA1(3200e20f4b28173cc2a68d0f87969627570418dc) )
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "ctunk_nvram.bin", 0x0000, 0x0800, CRC(c55c6706) SHA1(a38ae926f057fb47e48ca841b2d097fc4fd06416) )
 
-	ROM_REGION( 0x0200, "proms", 0 )    /* Borrowed from the parent set */
+	ROM_REGION( 0x0200, "proms", 0 )    // Borrowed from the parent set
 	ROM_LOAD( "82s147.bin", 0x0000, 0x0200, CRC(5ebc5659) SHA1(8d59011a181399682ab6e8ed14f83101e9bfa0c6) )
 ROM_END
 
@@ -6923,11 +7137,11 @@
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "m27c512.u2",  0x0000, 0x8000, CRC(915f1e59) SHA1(2eb2a7acca50318eb1775b01a00b1d3c74e1522c) )
-	ROM_IGNORE(                      0x8000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                      0x8000 )   // Identical halves. Discarding 2nd half
 	ROM_LOAD( "m27c512.u20", 0x8000, 0x8000, CRC(86e55f5a) SHA1(be71301b6887e8cc5924864d0f97b54e0668875e) )
-	ROM_IGNORE(                      0x8000 )   /* Identical halves. Discarding 2nd half */
+	ROM_IGNORE(                      0x8000 )   // Identical halves. Discarding 2nd half
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "rcdino4_nvram.bin", 0x0000, 0x0800, CRC(a2dc069e) SHA1(23e296cc0cc0c6f0c34eccffff8c78d2cef2dbae) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -6950,11 +7164,11 @@
 
 	ROM_REGION( 0x10000, "gfx1", 0 )
 	ROM_LOAD( "27c512.u2",  0x0000, 0x8000, CRC(6ace221f) SHA1(d35a6621d9d9231a844d7043da78035855ebf572) )
-	ROM_CONTINUE(           0x0000, 0x8000) /* Discarding 1nd half 0xff filled*/
+	ROM_CONTINUE(           0x0000, 0x8000) // Discarding 1nd half 0xff filled
 	ROM_LOAD( "27c512.u20", 0x8000, 0x8000, CRC(efb7f1ec) SHA1(260005526fc9b4087ca03f7cc585e40b6fa007fb) )
-	ROM_CONTINUE(           0x8000, 0x8000) /* Discarding 1nd half 0xff filled*/
+	ROM_CONTINUE(           0x8000, 0x8000) // Discarding 1nd half 0xff filled
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
 	ROM_LOAD( "chinatow_nvram.bin", 0x0000, 0x0800, CRC(eef4c5e7) SHA1(a2d9a9f617d35ccb99236114e5ce3257ad572f49) )
 
 	ROM_REGION( 0x0200, "proms", 0 )
@@ -7104,7 +7318,7 @@
 	ROM_REGION( 0x0200, "proms", 0 )
 	ROM_LOAD( "m3-7649a-5.bin", 0x0000, 0x0200, CRC(f990a9ae) SHA1(f7133798b5f20dd5b8dbe5d1a6876341710d93a8) )
 
-	ROM_REGION( 0x0200, "plds", 0 )    /* Cracked PLD */
+	ROM_REGION( 0x0200, "plds", 0 ) // cracked PLD
 	ROM_LOAD( "pal16l8acn_block.bin", 0x0000, 0x0117, CRC(fcda7872) SHA1(60acdb968e6229a8f71c2e29d22e132906a65bd5) )
 ROM_END
 
@@ -7184,6 +7398,110 @@
 ROM_END
 
 
+/*
+  Gratis Poker
+  Stmk
+  Version: 004
+  29. Sept.  95
+
+*/
+ROM_START( gratispk )   // Gratis Poker (V.204, Set 1)
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "gratis_poker_club_ver_204.bin", 0x8000, 0x8000, CRC(e53da78e) SHA1(6b87af4d66082f1a18e9e00a41df2484f5373cc7) )
+
+	ROM_REGION( 0x10000, "gfx1", 0 )
+	ROM_LOAD( "3.bin", 0x0000, 0x8000, CRC(daec20c7) SHA1(340bdb7749a7d898e96db5a470821cfe7216ea57) )
+	ROM_IGNORE(                 0x8000 )    // Identical halves. Discarding 2nd half
+	ROM_LOAD( "2.bin", 0x8000, 0x8000, CRC(112c5f33) SHA1(fffaa247a97f9bde7374cc80ab0bb9fb71bcc4b6) )
+	ROM_IGNORE(                 0x8000 )    // Identical halves. Discarding 2nd half
+
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
+	ROM_LOAD( "gratispk_nvram.bin", 0x0000, 0x0800, CRC(8fcad62f) SHA1(85def713ed5b9bbdbf0d077a38f779d6f4329a1c) )
+
+	ROM_REGION( 0x0200, "proms", 0 )
+	ROM_LOAD( "tbp28s42n.bin", 0x0000, 0x0200, CRC(e92f74e0) SHA1(dfc4a9d140d21b990f769c10802c4d2c33dd4132) )
+ROM_END
+
+ROM_START( gratispka )  // Gratis Poker (V.204, Set 2)
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "35g_ver_204.bin", 0x8000, 0x8000, CRC(e53da78e) SHA1(6b87af4d66082f1a18e9e00a41df2484f5373cc7) )
+
+	ROM_REGION( 0x10000, "gfx1", 0 )
+	ROM_LOAD( "3.bin", 0x0000, 0x8000, CRC(4f077fa3) SHA1(d65005b7111b77ac7c3707bd12bc376506d9477b) )
+	ROM_LOAD( "2.bin", 0x8000, 0x8000, CRC(0f3711b0) SHA1(ce874dbfc2d7171cff2be41d4a44fe8194526ef7) )
+
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
+	ROM_LOAD( "gratispk_nvram.bin", 0x0000, 0x0800, CRC(8fcad62f) SHA1(85def713ed5b9bbdbf0d077a38f779d6f4329a1c) )
+
+	ROM_REGION( 0x0200, "proms", 0 )
+	ROM_LOAD( "tbp28s42n.bin", 0x0000, 0x0200, CRC(e92f74e0) SHA1(dfc4a9d140d21b990f769c10802c4d2c33dd4132) )
+ROM_END
+
+
+/*
+  Γκούλιτ
+  Nkoúlit
+  Gullit
+
+  Greek hack of Royal Card.
+
+*/
+ROM_START( nkoulit )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "27c256-3.bin", 0x8000, 0x8000, CRC(3f4f671d) SHA1(0aa87f813567f7a537315bf3d452343e5a449e13) )
+
+	ROM_REGION( 0x10000, "gfx1", 0 )
+	ROM_LOAD( "27c256-2.bin", 0x0000, 0x8000, CRC(4a9ea5ad) SHA1(50504544265646e12ce769a1fd40d7afeae8b8d3) )
+	ROM_LOAD( "27c256-1.bin", 0x8000, 0x8000, CRC(7b3a6d1a) SHA1(b7f2e534ad4467cd0a9d86019be8110caf45c024) )
+
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
+	ROM_LOAD( "nkoulit_nvram.bin", 0x0000, 0x0800, CRC(73584f67) SHA1(4aab0d4fe846592e1cbc8b3c2411ddc1bf79fd95) )
+
+	ROM_REGION( 0x0200, "proms", 0 )
+	ROM_LOAD( "am27s29pc.bin", 0x0000, 0x0200, CRC(8bc86f48) SHA1(4c677ab9314a1f571e35104b22659e6811aeb194) )
+ROM_END
+
+
+/*
+  Reflex Cards (English)
+  Need special NVRAM to boot.
+
+  Without the factory NVRAM, you can generate one.
+  The attract works, and allow coin up. When you start a game,
+  a serial number entering screen appears. You must to match
+  the secret number to continue:
+
+    Serial: 00000000
+       Key: FFFFFFFF
+
+  The real serial number isn't shown. Just zeroes as mask.
+  You must to enter digit by digit using the HOLD buttons,
+  then turn the machine off, and on. (you can reset in MAME).
+
+  If you entered the correct number, the game continues,
+  otherwise you'll be stuck forever.
+
+  The code and NVRAM were reversed to find the serial number
+  and key offsets and the way they are stored, to construct
+  a working default NVRAM.
+
+*/
+ROM_START( reflexcrd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "bonus_2_27c256-1.bin", 0x8000, 0x8000, CRC(8fbcf0b9) SHA1(3a45c09fbec3e4ecce24ac2562a68b453755886f) )
+
+	ROM_REGION( 0x10000, "gfx1", 0 )
+	ROM_LOAD( "27c256-2.bin", 0x0000, 0x8000, CRC(05fe86fc) SHA1(a58ab5d107936f7d462f8f748bb6ac27bd77429b) )
+	ROM_LOAD( "27c256-3.bin", 0x8000, 0x8000, CRC(1617ed13) SHA1(312065406ce1d1d7c4ad566e2b13268f7eb524bb) )
+
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM
+	ROM_LOAD( "reflexcrd_nvram.bin", 0x0000, 0x0800, CRC(c2c69e5b) SHA1(e4abbf09abc044ba17e542cc8e1cfa16ee7cf776) )
+
+	ROM_REGION( 0x0200, "proms", 0 )
+	ROM_LOAD( "bipolar_prom.bin", 0x0000, 0x0200, CRC(8bc86f48) SHA1(4c677ab9314a1f571e35104b22659e6811aeb194) )
+ROM_END
+
+
 /**************************
 *  Driver Initialization  *
 **************************/
@@ -7215,13 +7533,13 @@
 
 	for (x=0x0000; x < 0x10000; x++)
 	{
-		na = src[x] & 0xf0;     /* nibble A */
-		nb = src[x] << 4;       /* nibble B */
+		na = src[x] & 0xf0;     // nibble A
+		nb = src[x] << 4;       // nibble B
 
-			nad = (na ^ (na >> 1)) << 1;            /* nibble A decrypted */
-			nbd = ((nb ^ (nb >> 1)) >> 3) & 0x0f;   /* nibble B decrypted */
+			nad = (na ^ (na >> 1)) << 1;            // nibble A decrypted
+			nbd = ((nb ^ (nb >> 1)) >> 3) & 0x0f;   // nibble B decrypted
 
-		src[x] = nad + nbd;     /* decrypted byte */
+		src[x] = nad + nbd;     // decrypted byte
 	}
 }
 
@@ -7249,20 +7567,20 @@
 
 void magicrd2_state::init_magicd2c()
 {
-	/*** same as blue TAB PCB, with the magicd2a patch ***/
+//  *** same as blue TAB PCB, with the magicd2a patch ***
 	int x, na, nb, nad, nbd;
 	uint8_t *src = memregion( "gfx1" )->base();
 	uint8_t *ROM = memregion("maincpu")->base();
 
 	for (x=0x0000; x < 0x10000; x++)
 	{
-		na = src[x] & 0xf0;     /* nibble A */
-		nb = src[x] << 4;       /* nibble B */
+		na = src[x] & 0xf0;     // nibble A
+		nb = src[x] << 4;       // nibble B
 
-			nad = (na ^ (na >> 1)) << 1;            /* nibble A decrypted */
-			nbd = ((nb ^ (nb >> 1)) >> 3) & 0x0f;   /* nibble B decrypted */
+			nad = (na ^ (na >> 1)) << 1;            // nibble A decrypted
+			nbd = ((nb ^ (nb >> 1)) >> 3) & 0x0f;   // nibble B decrypted
 
-		src[x] = nad + nbd;     /* decrypted byte */
+		src[x] = nad + nbd;     // decrypted byte
 	}
 
 	ROM[0xc1c6] = 0x92;
@@ -7271,26 +7589,26 @@
 
 void funworld_state::init_mongolnw()
 {
-	/* temporary patch to avoid hardware errors for debug purposes */
+//  temporary patch to avoid hardware errors for debug purposes
 	uint8_t *ROM = memregion("maincpu")->base();
 
 	ROM[0x9115] = 0xa5;
 
-	/* prevents one test from triggering hardware error */
+//  prevents one test from triggering hardware error
 	ROM[0xb8f3] = 0xff;
 }
 
 
 void funworld_state::init_soccernw()
 {
-/* temporary patch to avoid hardware errors for debug purposes */
+//  temporary patch to avoid hardware errors for debug purposes
 	uint8_t *ROM = memregion("maincpu")->base();
 
 	ROM[0x80b2] = 0xa9;
 	ROM[0x80b3] = 0x00;
 	ROM[0x9115] = 0xa5;
 
-/* prevent one test from triggering hardware error */
+//  prevents one test from triggering hardware error
 	ROM[0xb8f3] = 0xff;
 }
 
@@ -7334,7 +7652,7 @@
 	*   Program ROM decryption   *
 	*****************************/
 
-	/* data lines swap: 76543210 -> 76543012 */
+	// data lines swap: 76543210 -> 76543012
 
 	for (int i = start; i < size; i++)
 	{
@@ -7345,7 +7663,7 @@
 		std::vector<uint8_t> buffer(size);
 		memcpy(&buffer[0], rom, size);
 
-		/* address lines swap: fedcba9876543210 -> fedcba9820134567 */
+		// address lines swap: fedcba9876543210 -> fedcba9820134567
 
 		for (int i = start; i < size; i++)
 		{
@@ -7364,7 +7682,7 @@
 		std::vector<uint8_t> buffer(sizeg);
 		memcpy(&buffer[0], gfxrom, sizeg);
 
-		/* address lines swap: fedcba9876543210 -> fedcb67584a39012 */
+		// address lines swap: fedcba9876543210 -> fedcb67584a39012
 
 		for (int i = 0; i < sizeg; i++)
 		{
@@ -7378,7 +7696,7 @@
 	*   Color PROM decryption   *
 	****************************/
 
-	/* data lines swap: 76543210 -> 23546710 */
+	// data lines swap: 76543210 -> 23546710
 
 	{
 		std::vector<uint8_t> buffer;
@@ -7387,7 +7705,7 @@
 			buffer.push_back(bitswap<8>(prom[i], 2, 3, 5, 4, 6, 7, 1, 0));
 		}
 
-		/* address lines swap: fedcba9876543210 -> fedcba9487652013 */
+		// address lines swap: fedcba9876543210 -> fedcba9487652013
 		for (int i = 0; i < sizep; i++)
 		{
 			int a = bitswap<16>(i, 15, 14, 13, 12, 11, 10, 9, 4, 8, 7, 6, 5, 2, 0, 1, 3);
@@ -7433,7 +7751,7 @@
 	*   Program ROM decryption   *
 	*****************************/
 
-	/* data lines swap: 76543210 -> 76543120 */
+	// data lines swap: 76543210 -> 76543120
 
 	for (int i = start; i < size; i++)
 	{
@@ -7444,7 +7762,7 @@
 		std::vector<uint8_t> buffer(size);
 		memcpy(&buffer[0], rom, size);
 
-		/* address lines swap: fedcba9876543210 -> fedcba9867543210 */
+		// address lines swap: fedcba9876543210 -> fedcba9867543210
 		for (int i = start; i < size; i++)
 		{
 			int a = bitswap<16>(i, 15, 13, 14, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0);
@@ -7461,7 +7779,7 @@
 		std::vector<uint8_t> buffer(sizeg);
 		memcpy(&buffer[0], gfxrom, sizeg);
 
-		/* address lines swap: fedcba9876543210 -> fedcb67584a39012 */
+		// address lines swap: fedcba9876543210 -> fedcb67584a39012
 
 		for (int i = 0; i < sizeg; i++)
 		{
@@ -7488,7 +7806,7 @@
 	*   Program ROM decryption   *
 	*****************************/
 
-	/* data lines swap: 76543210 -> 56734012 */
+	// data lines swap: 76543210 -> 56734012
 
 	for (int i = start; i < size; i++)
 	{
@@ -7507,13 +7825,13 @@
 	//uint8_t *ROM = memregion("maincpu")->base();
 	for (int x = 0x0000; x < 0x10000; x++)
 	{
-		int na = src[x] & 0xf0;     /* nibble A */
-		int nb = src[x] << 4;       /* nibble B */
+		int na = src[x] & 0xf0;     // nibble A
+		int nb = src[x] << 4;       // nibble B
 
-		int nad = (na ^ (na >> 1)) << 1;            /* nibble A decrypted */
-		int nbd = ((nb ^ (nb >> 1)) >> 3) & 0x0f;   /* nibble B decrypted */
+		int nad = (na ^ (na >> 1)) << 1;            // nibble A decrypted
+		int nbd = ((nb ^ (nb >> 1)) >> 3) & 0x0f;   // nibble B decrypted
 
-		src[x] = nad + nbd;     /* decrypted byte */
+		src[x] = nad + nbd;         // decrypted byte
 	}
 }
 
@@ -7524,7 +7842,7 @@
 	*   Program ROM decryption   *
 	*****************************/
 
-	/* data lines swap: 76543210 -> 76543120 */
+	// data lines swap: 76543210 -> 76543120
 	{
 		std::vector<uint8_t> buffer;
 		for (int i = 0; i < size; i++)
@@ -7532,7 +7850,7 @@
 			buffer.push_back(bitswap<8>(rom[i], 7, 6, 5, 4, 3, 1, 2, 0));
 		}
 
-		/* address lines swap: fedcba9876543210 -> fedcba9867543210 */
+		// address lines swap: fedcba9876543210 -> fedcba9867543210
 
 		for (int i = 0; i < size; i++)
 		{
@@ -7550,7 +7868,7 @@
 		std::vector<uint8_t> buffer(sizeg);
 		memcpy(&buffer[0], gfxrom, sizeg);
 
-		/* address lines swap: fedcba9876543210 -> fedcb67584a39012 */
+		// address lines swap: fedcba9876543210 -> fedcb67584a39012
 
 		for (int i = 0; i < sizeg; i++)
 		{
@@ -7559,7 +7877,7 @@
 		}
 	}
 
-	/* d4-d5 data lines swap, plus a XOR with 0x81, implemented in two steps for an easy view */
+	// d4-d5 data lines swap, plus a XOR with 0x81, implemented in two steps for an easy view
 
 	for (int x = 0x0000; x < 0x10000; x++)
 	{
@@ -7573,7 +7891,7 @@
 
 static uint8_t rcdino4_add[] =
 {
-/*      0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f*/
+//      0  1  2  3  4  5  6  7  8  9  a  b  c  d  e  f
 /*0*/   1, 9, 9, 9, 9, 2, 9, 9, 1, 2, 1, 9, 9, 3, 9, 9,
 /*1*/   2, 2, 9, 9, 9, 9, 9, 9, 1, 9, 1, 9, 9, 9, 9, 9,
 /*2*/   3, 9, 9, 9, 9, 2, 2, 9, 1, 2, 1, 9, 9, 3, 3, 9,
@@ -7594,65 +7912,65 @@
 
 static uint8_t rcdino4_keys40[] =
 {
-/*  40    41    42    43    44    45    46    47    48    49    4a    4b    4c    4d*/
+//   40    41    42    43    44    45    46    47    48    49    4a    4b    4c    4d
 	0x36, 0x54, 0x47, 0x6b, 0xce, 0x95, 0xa2, 0x66, 0x3a, 0x46, 0x53, 0xd7, 0xc4, 0xa4,
-/*  4e    4f*/
+//   4e    4f
 	0x00, 0x00,
-/*  50*/
+//   50
 	0x56
 };
 
 static uint8_t rcdino4_keys80[] =
 {
-/*  81    82    83    84    85 */
+//   81    82    83    84    85
 	0xb8, 0x32, 0x1c, 0x23, 0xe2,
-/*  86    87    88    89    8a    8b    8c    8d    8e    8f    90    91*/
+//   86    87    88    89    8a    8b    8c    8d    8e    8f    90    91
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*  92    93    94    95    96    97 */
+//   92    93    94    95    96    97
 	0x4c, 0x00, 0x3d, 0x00, 0xd9, 0x16,
-/*  98    99    9a    9b    9c    9d    9e    9f    a0    a1    a2    a3*/
+//   98    99    9a    9b    9c    9d    9e    9f    a0    a1    a2    a3
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*  a4    a5    a6*/
+//   a4    a5    a6
 	0x5e, 0x73, 0x69,
-/*  a7    a8    a9*/
+//   a7    a8    a9
 	0x00, 0x00, 0x00,
-/*  aa*/
+//   aa
 	0xa6,
-/*  ab    ac    ad    ae    af*/
+//   ab    ac    ad    ae    af
 	0x00, 0x00, 0x00, 0x00, 0x00,
-/*  b0    b1*/
+//   b0    b1
 	0xc3, 0x40,
-/*  b2    b3    b4    b5    b6    b7    b8    b9    ba    bb    bc    bd    be    bf    c0    c1    c2*/
+//   b2    b3    b4    b5    b6    b7    b8    b9    ba    bb    bc    bd    be    bf    c0    c1    c2
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*  c3    c4    c5*/
+//   c3    c4    c5
 	0x92, 0xb7, 0x24,
-/*  c6    c7    c8    c9*/
+//   c6    c7    c8    c9
 	0x00, 0x00, 0x00, 0x00,
-/*  ca*/
+//   ca
 	0x62,
-/*  cb    cc    cd    ce    cf*/
+//   cb    cc    cd    ce    cf
 	0x00, 0x00, 0x00, 0x00, 0x00,
-/*  d0*/
+//   d0
 	0x84,
-/*  d1*/
+//   d1
 	0x00,
-/*  d2*/
+//   d2
 	0xaa,
-/*  d3    d4    d5*/
+//   d3    d4    d5
 	0x00, 0x00, 0x00,
-/*  d6*/
+//   d6
 	0xea,
-/*  d7    d8    d9    da    db    dc    dd    de    df*/
+//   d7    d8    d9    da    db    dc    dd    de    df
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*  e0*/
+//   e0
 	0x17,
-/*  e1    e2    e3*/
+//   e1    e2    e3
 	0x00, 0x00, 0x00,
-/*  e4*/
+//   e4
 	0xc0,
-/*  e5    e6    e7    e8    e9    ea    eb    ec    ed    ee    ef    f0    f1    f2    f3    f4    f5    f6    f7*/
+//   e5    e6    e7    e8    e9    ea    eb    ec    ed    ee    ef    f0    f1    f2    f3    f4    f5    f6    f7
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-/*  f8    f9    fa    fb    fc    fd    fe*/
+//   f8    f9    fa    fb    fc    fd    fe
 	0x06, 0x1e, 0x28, 0x5a, 0xcf, 0x79, 0x11
 };
 
@@ -7712,40 +8030,40 @@
 			int add = rcdino4_add[c];
 
 			if (((i == 0x81)
-				&& (j >= 0xa3) && (j <= 0xb1) /* text string */
+				&& (j >= 0xa3) && (j <= 0xb1)   // text string
 				)
 				|| ((i == 0x82)
-				&& (j >= 0x35) && (j <= 0x53) /* table of addresses */
+				&& (j >= 0x35) && (j <= 0x53)   // table of addresses
 				)
 				|| ((i == 0x85)
-				&& (j >= 0x7e) && (j <= 0x8d) /* '0'-'9', 'A'-'F' */
+				&& (j >= 0x7e) && (j <= 0x8d)   // '0'-'9', 'A'-'F'
 				)
 				|| ((i == 0x94)
-				&& (((j >= 0x4a) && (j <= 0x86)) /* zeroes */
-				|| ((j >= 0xbf) && (j <= 0xc1)) /* set of masks */
+				&& (((j >= 0x4a) && (j <= 0x86))    // zeroes
+				|| ((j >= 0xbf) && (j <= 0xc1))     // set of masks */
 					)
 				)
 				|| ((i == 0x96)
-				&& (j >= 0x39) && (j <= 0x3e) /* set of masks */
+				&& (j >= 0x39) && (j <= 0x3e)   // set of masks
 				)
 				|| ((i == 0xa6)
-				&& (j >= 0x30) && (j <= 0x32) /* set of masks */
+				&& (j >= 0x30) && (j <= 0x32)   // set of masks
 				)
 				|| ((i == 0xaa)
-				&& (j >= 0xf2) /* table of addresses */
+				&& (j >= 0xf2)  // table of addresses
 				)
 				|| ((i == 0xc3)
-				&& (j >= 0x70) && (j <= 0xaf) /* set of masks */
+				&& (j >= 0x70) && (j <= 0xaf)   // set of masks
 				)
 				|| ((i == 0xc4)
-				&& (j >= 0xdc) /* zeroes and things */
+				&& (j >= 0xdc)  // zeroes and things
 				)
 				|| ((i == 0xd0)
-				&& (j >= 0xd2) /* text and zeroes */
+				&& (j >= 0xd2)  // text and zeroes
 				)
 				|| ((i == 0xd2)
-				&& ((j <= 0x2f) /* text and zeroes */
-				|| ((j >= 0x84) && (j <= 0xaf)) /* text and zeroes */
+				&& ((j <= 0x2f) // text and zeroes
+				|| ((j >= 0x84) && (j <= 0xaf)) // text and zeroes
 					)
 				)
 				|| (add == 9)
@@ -7776,7 +8094,7 @@
 			|| (i == 0xf8)
 			)
 		{
-			j = 0; /* re-align offset after skipping some pages */
+			j = 0;  // re-align offset after skipping some pages
 		}
 	}
 	while (1);
@@ -7840,132 +8158,173 @@
 }
 
 
+void funworld_state::init_impera16()
+/*****************************************************
+
+  Routines to deinterleave the Impera GFX stored
+  in 16 bit EPROMS, on 8 bit systems.
+
+  Regular GFX ROMs for this system, are interleaved
+  in a big 27C210 ROM.
+
+******************************************************/
+{
+	uint8_t *gfx16rom = memregion("gfxpool")->base();
+	int size = memregion("gfxpool")->bytes();
+
+	uint8_t *gfx8rom = memregion("gfx1")->base();
+	int sizeg = memregion("gfx1")->bytes();
+
+	/*****************************
+	*    Deinterleaving GFX      *
+	*****************************/
+
+	int j = 0;
+
+	for (int i = 0; i < size; i += 2)
+	{
+		gfx8rom[j] = gfx16rom[i];
+		gfx8rom[j + (sizeg / 2)] = gfx16rom[i + 1];
+		j++;
+	}
+}
+
+
 /**********************************************
 *                Game Drivers                 *
 **********************************************/
 
-/*     YEAR  NAME       PARENT    MACHINE   INPUT      STATE           INIT           ROT    COMPANY            FULLNAME                                          FLAGS                    LAYOUT */
+//     YEAR  NAME        PARENT    MACHINE   INPUT      STATE           INIT           ROT    COMPANY              FULLNAME                                          FLAGS                    LAYOUT
 
 // Jolly Card based...
-GAMEL( 1985, jollycrd,  0,        fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Jolly Card (German, set 1)",                      0,                       layout_jollycrd )
-GAMEL( 1985, jollycrda, jollycrd, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Jolly Card (German, set 2)",                      0,                       layout_jollycrd )
-GAMEL( 1985, jolyc3x3,  jollycrd, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Jolly Card (3x3 deal)",                           0,                       layout_jollycrd )
-GAMEL( 1993, jolycmzs,  jollycrd, cuoreuno, jolyc980,  funworld_state, empty_init,    ROT0, "MZS Tech",        "Jolly Card Professional 2.0 (MZS Tech)",          0,                       layout_jollycrd )
-GAMEL( 2000, jolyc980,  jollycrd, cuoreuno, jolyc980,  funworld_state, empty_init,    ROT0, "Spale Soft",      "Jolly Card Professional 2.0 (Spale Soft)",        0,                       layout_jollycrd )
-GAMEL( 1998, jolycdev,  jollycrd, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "TAB Austria / Evona Electronic", "Jolly Card (Evona Electronic)",    0,                       layout_jollycrd )
-GAMEL( 1985, jolyccra,  jollycrd, cuoreuno, jolycdcr,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Jolly Card (Croatian, set 1)",                    0,                       layout_jollycrd )
-GAMEL( 1993, jolyccrb,  jollycrd, cuoreuno, jolycdcr,  funworld_state, empty_init,    ROT0, "Soft Design",     "Jolly Card (Croatian, set 2)",                    0,                       layout_jollycrd )
-GAMEL( 1985, sjcd2kx3,  jollycrd, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "M.P.",            "Super Joly 2000 - 3x",                            0,                       layout_jollycrd )
-GAMEL( 1986, jolycdab,  jollycrd, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "Inter Games",     "Jolly Card (German, Fun World, bootleg)",         0,                       layout_jollycrd )
-GAMEL( 1992, jolycdsp,  jollycrd, cuoreuno, jolycdit,  funworld_state, init_ctunk,    ROT0, "TAB Austria",     "Jolly Card (Spanish, blue TAB board, encrypted)", 0,                       layout_royalcrd )
-GAMEL( 1990, jolycdid,  jollycrd, cuoreuno, jolycdcr,  funworld_state, empty_init,    ROT0, "bootleg",         "Jolly Card (Italian, different colors, set 1)",   0,                       layout_jollycrd ) // italian, CPLD, different colors.
-GAMEL( 1990, jolycdie,  jollycrd, cuoreuno, jolycdib,  funworld_state, empty_init,    ROT0, "bootleg",         "Jolly Card (Italian, different colors, set 2)",   0,                       layout_jollycrd ) // not from TAB blue PCB.
-GAMEL( 1990, jolycdif,  jollycrd, cuoreuno, jolycdib,  funworld_state, empty_init,    ROT0, "bootleg",         "Jolly Card (Italian, bootleg, set 1)",            0,                       layout_jollycrd ) // italian, CPLD. doesn't need nvram init.
-GAMEL( 1993, jolycdig,  jollycrd, cuoreuno, jolycdib,  funworld_state, init_jolycdig, ROT0, "bootleg",         "Jolly Card (Italian, bootleg, set 2)",            0,                       layout_jollycrd ) // italian, CPLD. needs nvram.
-GAMEL( 1990, jolycdih,  jollycrd, cuoreuno, jolycdib,  funworld_state, empty_init,    ROT0, "bootleg",         "Jolly Card (Italian, bootleg, set 3)",            0,                       layout_jollycrd )
+GAMEL( 1985, jollycrd,   0,        fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Jolly Card (German, set 1)",                      0,                       layout_jollycrd )
+GAMEL( 1985, jollycrda,  jollycrd, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Jolly Card (German, set 2)",                      0,                       layout_jollycrd )
+GAMEL( 1985, jolyc3x3,   jollycrd, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Jolly Card (3x3 deal)",                           0,                       layout_jollycrd )
+GAMEL( 1993, jolycmzs,   jollycrd, cuoreuno, jolyc980,  funworld_state, empty_init,    ROT0, "MZS Tech",          "Jolly Card Professional 2.0 (MZS Tech)",          0,                       layout_jollycrd )
+GAMEL( 2000, jolyc980,   jollycrd, cuoreuno, jolyc980,  funworld_state, empty_init,    ROT0, "Spale Soft",        "Jolly Card Professional 2.0 (Spale Soft)",        0,                       layout_jollycrd )
+GAMEL( 1998, jolycdev,   jollycrd, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "TAB Austria / Evona Electronic", "Jolly Card (Evona Electronic)",      0,                       layout_jollycrd )
+GAMEL( 1985, jolyccra,   jollycrd, cuoreuno, jolycdcr,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Jolly Card (Croatian, set 1)",                    0,                       layout_jollycrd )
+GAMEL( 1993, jolyccrb,   jollycrd, cuoreuno, jolycdcr,  funworld_state, empty_init,    ROT0, "Soft Design",       "Jolly Card (Croatian, set 2)",                    0,                       layout_jollycrd )
+GAMEL( 1985, sjcd2kx3,   jollycrd, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "M.P.",              "Super Joly 2000 - 3x",                            0,                       layout_jollycrd )
+GAMEL( 1986, jolycdab,   jollycrd, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "Inter Games",       "Jolly Card (German, Fun World, bootleg)",         0,                       layout_jollycrd )
+GAMEL( 1992, jolycdsp,   jollycrd, cuoreuno, jolycdit,  funworld_state, init_ctunk,    ROT0, "TAB Austria",       "Jolly Card (Spanish, blue TAB board, encrypted)", 0,                       layout_royalcrd )
+GAMEL( 1990, jolycdid,   jollycrd, cuoreuno, jolycdcr,  funworld_state, empty_init,    ROT0, "bootleg",           "Jolly Card (Italian, different colors, set 1)",   0,                       layout_jollycrd ) // italian, CPLD, different colors.
+GAMEL( 1990, jolycdie,   jollycrd, cuoreuno, jolycdib,  funworld_state, empty_init,    ROT0, "bootleg",           "Jolly Card (Italian, different colors, set 2)",   0,                       layout_jollycrd ) // not from TAB blue PCB.
+GAMEL( 1990, jolycdif,   jollycrd, cuoreuno, jolycdib,  funworld_state, empty_init,    ROT0, "bootleg",           "Jolly Card (Italian, bootleg, set 1)",            0,                       layout_jollycrd ) // italian, CPLD. doesn't need nvram init.
+GAMEL( 1993, jolycdig,   jollycrd, cuoreuno, jolycdib,  funworld_state, init_jolycdig, ROT0, "bootleg",           "Jolly Card (Italian, bootleg, set 2)",            0,                       layout_jollycrd ) // italian, CPLD. needs nvram.
+GAMEL( 1990, jolycdih,   jollycrd, cuoreuno, jolycdib,  funworld_state, empty_init,    ROT0, "bootleg",           "Jolly Card (Italian, bootleg, set 3)",            0,                       layout_jollycrd )
 
 // Bonus Card based...
-GAMEL( 1986, bonuscrd,  0,        fw2ndpal, bonuscrd,  funworld_state, empty_init,    ROT0, "Fun World",       "Bonus Card (German)",                             MACHINE_IMPERFECT_COLORS, layout_bonuscrd ) // use fw1stpal machine for green background
-GAMEL( 1986, bonuscrda, bonuscrd, fw2ndpal, bonuscrd,  funworld_state, empty_init,    ROT0, "Fun World",       "Bonus Card (German, ATG Electronic hack)",        MACHINE_IMPERFECT_COLORS, layout_bonuscrd ) // use fw1stpal machine for green background
-GAMEL( 1986, bigdeal,   bonuscrd, fw2ndpal, bigdeal,   funworld_state, empty_init,    ROT0, "Fun World",       "Big Deal (Hungarian, set 1)",                     MACHINE_IMPERFECT_COLORS, layout_bonuscrd )
-GAMEL( 1986, bigdealb,  bonuscrd, fw2ndpal, bigdeal,   funworld_state, empty_init,    ROT0, "Fun World",       "Big Deal (Hungarian, set 2)",                     MACHINE_IMPERFECT_COLORS, layout_bonuscrd )
+GAMEL( 1986, bonuscrd,   0,        fw2ndpal, bonuscrd,  funworld_state, empty_init,    ROT0, "Fun World",         "Bonus Card (German)",                             MACHINE_IMPERFECT_COLORS, layout_bonuscrd ) // use fw1stpal machine for green background
+GAMEL( 1986, bonuscrda,  bonuscrd, fw2ndpal, bonuscrd,  funworld_state, empty_init,    ROT0, "Fun World",         "Bonus Card (German, ATG Electronic hack)",        MACHINE_IMPERFECT_COLORS, layout_bonuscrd ) // use fw1stpal machine for green background
+GAMEL( 1986, bigdeal,    bonuscrd, fw2ndpal, bigdeal,   funworld_state, empty_init,    ROT0, "Fun World",         "Big Deal (Hungarian, set 1)",                     MACHINE_IMPERFECT_COLORS, layout_bonuscrd )
+GAMEL( 1986, bigdealb,   bonuscrd, fw2ndpal, bigdeal,   funworld_state, empty_init,    ROT0, "Fun World",         "Big Deal (Hungarian, set 2)",                     MACHINE_IMPERFECT_COLORS, layout_bonuscrd )
 
 // CMC Italian jamma PCB's...
-GAMEL( 1996, cuoreuno,  0,        cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",          "Cuore 1 (Italian)",                               0,                       layout_jollycrd )
-GAMEL( 1997, elephfam,  0,        cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",          "Elephant Family (Italian, new)",                  0,                       layout_jollycrd )
-GAMEL( 1996, elephfmb,  elephfam, cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",          "Elephant Family (Italian, old)",                  0,                       layout_jollycrd )
-GAMEL( 1996, pool10,    0,        cuoreuno, pool10,    funworld_state, empty_init,    ROT0, "C.M.C.",          "Pool 10 (Italian, set 1)",                        0,                       layout_jollycrd )
-GAMEL( 1996, pool10b,   pool10,   cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",          "Pool 10 (Italian, set 2)",                        0,                       layout_jollycrd )
-GAMEL( 1996, pool10c,   pool10,   cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",          "Pool 10 (Italian, set 3)",                        0,                       layout_jollycrd )
-GAMEL( 1997, pool10d,   pool10,   cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",          "Pool 10 (Italian, set 4)",                        0,                       layout_jollycrd )
-GAMEL( 1997, pool10f,   pool10,   cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",          "Pool 10 (Italian, set 5)",                        0,                       layout_jollycrd )
-GAMEL( 1996, pool10g,   pool10,   cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",          "Pool 10 (Italian, set 6)",                        0,                       layout_jollycrd )
-GAMEL( 1996, pool10h,   pool10,   cuoreuno, pool10,    funworld_state, empty_init,    ROT0, "C.M.C.",          "Pool 10 (Italian, set 7)",                        0,                       layout_jollycrd )
-GAMEL( 1997, pool10i,   pool10,   cuoreuno, pool10,    funworld_state, empty_init,    ROT0, "C.M.C.",          "Pool 10 (Italian, set 8)",                        0,                       layout_jollycrd )
-GAMEL( 1996, pool10j,   pool10,   cuoreuno, pool10,    funworld_state, empty_init,    ROT0, "bootleg (R.B.)",  "Pool 10 (Italian, set 9)",                        0,                       layout_jollycrd )
-GAMEL( 1998, biliard,   pool10,   cuoreuno, pool10,    funworld_state, empty_init,    ROT0, "bootleg",         "New Biliard 98 (Pool 10 hack)",                   0,                       layout_jollycrd )
-GAMEL( 2001, royal,     pool10,   royalcd1, royal,     funworld_state, empty_init,    ROT0, "<unknown>",       "Royal (Pool 10 hack)",                            0,                       layout_jollycrd )
-GAMEL( 1997, tortufam,  0,        cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",          "Tortuga Family (Italian)",                        0,                       layout_jollycrd )
-GAMEL( 1996, potgame,   0,        cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",          "Pot Game (Italian)",                              0,                       layout_jollycrd )
-GAMEL( 1996, bottle10,  0,        cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",          "Bottle 10 (Italian, set 1)",                      0,                       layout_jollycrd )
-GAMEL( 1996, bottl10b,  bottle10, cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",          "Bottle 10 (Italian, set 2)",                      0,                       layout_jollycrd )
-GAMEL( 1998, lunapark,  0,        lunapark, lunapark,  lunapark_state, empty_init,    ROT0, "<unknown>",       "Luna Park (set 1, dual program)",                 0,                       layout_jollycrd ) // mirrored video RAM (4000/5000 to 6000/7000).
-GAMEL( 1998, lunaparkb, lunapark, lunapark, lunapark,  lunapark_state, empty_init,    ROT0, "<unknown>",       "Luna Park (set 2, dual program)",                 0,                       layout_jollycrd ) // mirrored video RAM (4000/5000 to 6000/7000).
-GAMEL( 1998, lunaparkc, lunapark, cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "<unknown>",       "Luna Park (set 3)",                               0,                       layout_jollycrd ) // regular video RAM 6000/7000.
-GAMEL( 1998, crystal,   0,        cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "J.C.D. srl",      "Crystal Colours (CMC hardware)",                  0,                       layout_jollycrd )
+GAMEL( 1996, cuoreuno,   0,        cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",            "Cuore 1 (Italian)",                               0,                       layout_jollycrd )
+GAMEL( 1997, elephfam,   0,        cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",            "Elephant Family (Italian, new)",                  0,                       layout_jollycrd )
+GAMEL( 1996, elephfmb,   elephfam, cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",            "Elephant Family (Italian, old)",                  0,                       layout_jollycrd )
+GAMEL( 1996, pool10,     0,        cuoreuno, pool10,    funworld_state, empty_init,    ROT0, "C.M.C.",            "Pool 10 (Italian, set 1)",                        0,                       layout_jollycrd )
+GAMEL( 1996, pool10b,    pool10,   cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",            "Pool 10 (Italian, set 2)",                        0,                       layout_jollycrd )
+GAMEL( 1996, pool10c,    pool10,   cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",            "Pool 10 (Italian, set 3)",                        0,                       layout_jollycrd )
+GAMEL( 1997, pool10d,    pool10,   cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",            "Pool 10 (Italian, set 4)",                        0,                       layout_jollycrd )
+GAMEL( 1997, pool10f,    pool10,   cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",            "Pool 10 (Italian, set 5)",                        0,                       layout_jollycrd )
+GAMEL( 1996, pool10g,    pool10,   cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",            "Pool 10 (Italian, set 6)",                        0,                       layout_jollycrd )
+GAMEL( 1996, pool10h,    pool10,   cuoreuno, pool10,    funworld_state, empty_init,    ROT0, "C.M.C.",            "Pool 10 (Italian, set 7)",                        0,                       layout_jollycrd )
+GAMEL( 1997, pool10i,    pool10,   cuoreuno, pool10,    funworld_state, empty_init,    ROT0, "C.M.C.",            "Pool 10 (Italian, set 8)",                        0,                       layout_jollycrd )
+GAMEL( 1996, pool10j,    pool10,   cuoreuno, pool10,    funworld_state, empty_init,    ROT0, "bootleg (R.B.)",    "Pool 10 (Italian, set 9)",                        0,                       layout_jollycrd )
+GAMEL( 1998, biliard,    pool10,   cuoreuno, pool10,    funworld_state, empty_init,    ROT0, "bootleg",           "New Biliard 98 (Pool 10 hack)",                   0,                       layout_jollycrd )
+GAMEL( 2001, royal,      pool10,   royalcd1, royal,     funworld_state, empty_init,    ROT0, "<unknown>",         "Royal (Pool 10 hack)",                            0,                       layout_jollycrd )
+GAMEL( 1997, tortufam,   0,        cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",            "Tortuga Family (Italian)",                        0,                       layout_jollycrd )
+GAMEL( 1996, potgame,    0,        cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",            "Pot Game (Italian)",                              0,                       layout_jollycrd )
+GAMEL( 1996, bottle10,   0,        cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",            "Bottle 10 (Italian, set 1)",                      0,                       layout_jollycrd )
+GAMEL( 1996, bottl10b,   bottle10, cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "C.M.C.",            "Bottle 10 (Italian, set 2)",                      0,                       layout_jollycrd )
+GAMEL( 1998, lunapark,   0,        lunapark, lunapark,  lunapark_state, empty_init,    ROT0, "<unknown>",         "Luna Park (set 1, dual program)",                 0,                       layout_jollycrd ) // mirrored video RAM (4000/5000 to 6000/7000).
+GAMEL( 1998, lunaparkb,  lunapark, lunapark, lunapark,  lunapark_state, empty_init,    ROT0, "<unknown>",         "Luna Park (set 2, dual program)",                 0,                       layout_jollycrd ) // mirrored video RAM (4000/5000 to 6000/7000).
+GAMEL( 1998, lunaparkc,  lunapark, cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "<unknown>",         "Luna Park (set 3)",                               0,                       layout_jollycrd ) // regular video RAM 6000/7000.
+GAMEL( 1998, crystal,    0,        cuoreuno, cuoreuno,  funworld_state, empty_init,    ROT0, "J.C.D. srl",        "Crystal Colours (CMC hardware)",                  0,                       layout_jollycrd )
 
 // Royal Card based...
-GAMEL( 1991, royalcrd,  0,        royalcd2, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Royal Card (German, set 1)",                      0,                       layout_jollycrd )
-GAMEL( 1991, royalcrda, royalcrd, royalcd2, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Royal Card (German, set 2)",                      0,                       layout_jollycrd )
-GAMEL( 1991, royalcrdb, royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Royal Card (German/Polish, set 3)",               0,                       layout_jollycrd )
-GAMEL( 1991, royalcrdc, royalcrd, royalcd2, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Royal Card (German, set 4)",                      0,                       layout_jollycrd )
-GAMEL( 1991, royalcrdd, royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Royal Card (German, set 5)",                      0,                       layout_royalcrd )
-GAMEL( 1991, royalcrde, royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Royal Card (German, set 6)",                      0,                       layout_jollycrd )
-GAMEL( 1991, royalcrdt, royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Royal Card (TAB original)",                       0,                       layout_jollycrd )
-GAMEL( 1990, royalcrdg, royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "bootleg",         "Royal Card (German, set 7, CMC C1030 HW)",        0,                       layout_jollycrd ) // big CPLD
-GAMEL( 1991, royalcrdh, royalcrd, royalcd2, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Royal Card (German, set 8)",                      0,                       layout_jollycrd )
-GAMEL( 1991, royalcdfr, royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Royal Card (French)",                             0,                       layout_jollycrd )
-GAME(  1993, royalcrdp, royalcrd, cuoreuno, royalcrd,  funworld_state, empty_init,    ROT0, "Digital Dreams",  "Royal Card v2.0 Professional",                    0 )
-GAMEL( 199?, royaljp,   royalcrd, royalcd1, royaljp,   funworld_state, init_tabblue,  ROT0, "TAB / Video Klein","Royal Card / Royal Jackpot (with a third draw)(encrypted)", 0,            layout_jollycrd )
-GAMEL( 199?, witchryl,  0,        witchryl, witchryl,  funworld_state, empty_init,    ROT0, "Video Klein",     "Witch Royal (Export version 2.1)",                0,                       layout_jollycrd )
+GAMEL( 1991, royalcrd,   0,        royalcd2, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Royal Card (German, set 1)",                      0,                       layout_jollycrd )
+GAMEL( 1991, royalcrda,  royalcrd, royalcd2, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Royal Card (German, set 2)",                      0,                       layout_jollycrd )
+GAMEL( 1991, royalcrdb,  royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Royal Card (German/Polish, set 3)",               0,                       layout_jollycrd )
+GAMEL( 1991, royalcrdc,  royalcrd, royalcd2, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Royal Card (German, set 4)",                      0,                       layout_jollycrd )
+GAMEL( 1991, royalcrdd,  royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Royal Card (German, set 5)",                      0,                       layout_royalcrd )
+GAMEL( 1991, royalcrde,  royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Royal Card (German, set 6)",                      0,                       layout_jollycrd )
+GAMEL( 1991, royalcrdt,  royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Royal Card (TAB original)",                       0,                       layout_jollycrd )
+GAMEL( 1990, royalcrdg,  royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "bootleg",           "Royal Card (German, set 7, CMC C1030 HW)",        0,                       layout_jollycrd ) // big CPLD
+GAMEL( 1991, royalcrdh,  royalcrd, royalcd2, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Royal Card (German, set 8)",                      0,                       layout_jollycrd )
+GAMEL( 1991, royalcdfr,  royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Royal Card (French)",                             0,                       layout_jollycrd )
+GAME(  1993, royalcrdp,  royalcrd, cuoreuno, royalcrd,  funworld_state, empty_init,    ROT0, "Digital Dreams",    "Royal Card v2.0 Professional",                    0 )
+GAMEL( 199?, royaljp,    royalcrd, royalcd1, royaljp,   funworld_state, init_tabblue,  ROT0, "TAB / Video Klein", "Royal Card / Royal Jackpot (with a third draw)(encrypted)", 0,             layout_jollycrd )
+GAMEL( 199?, witchryl,   0,        witchryl, witchryl,  funworld_state, empty_init,    ROT0, "Video Klein",       "Witch Royal (Export version 2.1)",                0,                       layout_jollycrd )
 
 // Lucky Lady based...
-GAMEL( 1991, lluck3x3,  royalcrd, cuoreuno, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Lucky Lady (3x3 deal)",                           0,                       layout_jollycrd )
-GAMEL( 1991, lluck4x1,  royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",     "Lucky Lady (4x1 aces)",                           0,                       layout_jollycrd )
+GAMEL( 1991, lluck3x3,   royalcrd, cuoreuno, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Lucky Lady (3x3 deal)",                           0,                       layout_jollycrd )
+GAMEL( 1991, lluck4x1,   royalcrd, royalcd1, royalcrd,  funworld_state, empty_init,    ROT0, "TAB Austria",       "Lucky Lady (4x1 aces)",                           0,                       layout_jollycrd )
 
 // Magic Card 2 based...
-GAMEL( 1996, magicrd2,  0,        magicrd2, magicrd2,  magicrd2_state, empty_init,    ROT0, "Impera",          "Magic Card II (Bulgarian)",                       0,                       layout_jollycrd )
-GAMEL( 1996, magicrd2a, magicrd2, magicrd2, magicrd2,  magicrd2_state, empty_init,    ROT0, "Impera",          "Magic Card II (Nov, Yugoslavian)",                0,                       layout_jollycrd )
-GAME(  1996, magicrd2b, magicrd2, magicrd2, magicrd2,  magicrd2_state, init_magicd2b, ROT0, "Impera",          "Magic Card II (green TAB or Impera board)",       0 )
-GAME(  1996, magicrd2c, magicrd2, magicrd2, magicrd2,  magicrd2_state, init_magicd2c, ROT0, "Impera",          "Magic Card II (blue TAB board, encrypted)",       0 )
+GAMEL( 1996, magicrd2,   0,        magicrd2, magicrd2,  magicrd2_state, empty_init,    ROT0, "Impera",            "Magic Card II (Bulgarian)",                       0,                       layout_jollycrd )
+GAMEL( 1996, magicrd2a,  magicrd2, magicrd2, magicrd2,  magicrd2_state, empty_init,    ROT0, "Impera",            "Magic Card II (Nov, Yugoslavian)",                0,                       layout_jollycrd )
+GAME(  1996, magicrd2b,  magicrd2, magicrd2, magicrd2,  magicrd2_state, init_magicd2b, ROT0, "Impera",            "Magic Card II (green TAB or Impera board)",       0 )
+GAME(  1996, magicrd2c,  magicrd2, magicrd2, magicrd2,  magicrd2_state, init_magicd2c, ROT0, "Impera",            "Magic Card II (blue TAB board, encrypted)",       0 )
 
 // Joker Card based...
-GAMEL( 1993, vegasslw,  0,        fw2ndpal, vegasslw,  funworld_state, empty_init,    ROT0, "Fun World",       "Royal Vegas Joker Card (slow deal)",              0,                       layout_jollycrd )
-GAMEL( 1993, vegasfst,  vegasslw, fw2ndpal, vegasfst,  funworld_state, empty_init,    ROT0, "Soft Design",     "Royal Vegas Joker Card (fast deal)",              0,                       layout_jollycrd )
-GAMEL( 1993, vegasfte,  vegasslw, fw2ndpal, vegasfte,  funworld_state, empty_init,    ROT0, "Soft Design",     "Royal Vegas Joker Card (fast deal, English gfx)", 0,                       layout_jollycrd )
-GAMEL( 1993, vegasmil,  vegasslw, fw2ndpal, vegasmil,  funworld_state, empty_init,    ROT0, "Mile",            "Royal Vegas Joker Card (fast deal, Mile)",        0,                       layout_jollycrd )
+GAMEL( 1993, vegasslw,   0,        fw2ndpal, vegasslw,  funworld_state, empty_init,    ROT0, "Fun World",         "Royal Vegas Joker Card (slow deal)",              0,                       layout_jollycrd )
+GAMEL( 1993, vegasfst,   vegasslw, fw2ndpal, vegasfst,  funworld_state, empty_init,    ROT0, "Soft Design",       "Royal Vegas Joker Card (fast deal)",              0,                       layout_jollycrd )
+GAMEL( 1993, vegasfte,   vegasslw, fw2ndpal, vegasfte,  funworld_state, empty_init,    ROT0, "Soft Design",       "Royal Vegas Joker Card (fast deal, English gfx)", 0,                       layout_jollycrd )
+GAMEL( 1993, vegasmil,   vegasslw, fw2ndpal, vegasmil,  funworld_state, empty_init,    ROT0, "Mile",              "Royal Vegas Joker Card (fast deal, Mile)",        0,                       layout_jollycrd )
 
 // Jolly Joker based...
-GAMEL( 198?, jolyjokr,  0,        fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "Impera",          "Jolly Joker (98bet, set 1)",                      0,                       layout_jollycrd )
-GAMEL( 198?, jolyjokra, jolyjokr, fw1stpal, jolyjokra, funworld_state, empty_init,    ROT0, "Impera",          "Jolly Joker (98bet, set 2)",                      0,                       layout_jollycrd )
-GAMEL( 198?, jolyjokrb, jolyjokr, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "Impera",          "Jolly Joker (40bet, Croatian hack)",              0,                       layout_jollycrd )
-GAMEL( 198?, jolyjokrc, jolyjokr, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "Apple Time",      "Jolly Joker (Apple Time)",                        MACHINE_NOT_WORKING,     layout_jollycrd ) // bad program ROM...
+GAMEL( 199?, jolyjokr,   0,        fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "Impera",            "Jolly Joker (98bet, set 1)",                      0,                       layout_jollycrd )
+GAMEL( 199?, jolyjokra,  jolyjokr, fw1stpal, jolyjokra, funworld_state, empty_init,    ROT0, "Impera",            "Jolly Joker (98bet, set 2)",                      0,                       layout_jollycrd )
+GAMEL( 199?, jolyjokrb1, jolyjokr, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "Impera",            "Jolly Joker (40bet, higher paytable)",            0,                       layout_jollycrd )
+GAMEL( 199?, jolyjokrb2, jolyjokr, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "Impera",            "Jolly Joker (40bet, lower paytable)",             0,                       layout_jollycrd )
+GAMEL( 199?, jolyjokrc,  jolyjokr, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "Apple Time",        "Jolly Joker (Apple Time)",                        MACHINE_NOT_WORKING,     layout_jollycrd )  // bad program ROM...
+GAMEL( 199?, jolyjokro,  jolyjokr, fw2ndpal, funworld,  funworld_state, init_impera16, ROT0, "Impera",            "Jolly Joker (original program, interleaved GFX, Impera logo)",  0,         layout_jollycrd )
+GAMEL( 199?, jolyjokrp,  jolyjokr, fw2ndpal, funworld,  funworld_state, init_impera16, ROT0, "Impera",            "Jolly Joker (original program, interleaved GFX, no logo)",      0,         layout_jollycrd )
+GAMEL( 199?, jolyjokrm,  jolyjokr, fw1stpal, funworld,  funworld_state, empty_init,    ROT0, "Impera",            "Jolly Joker (Solid State module in suicide board)", 0,                     layout_jollycrd )
 
 // Encrypted games...
-GAME(  1992, multiwin,  0,        multiwin, funworld,  multiwin_state, driver_init,   ROT0, "Fun World",       "Multi Win (Ver.0167, encrypted)",                 0 )
-GAME(  1993, powercrd,  0,        powercrd, funworld,  powercrd_state, empty_init,    ROT0, "Fun World",       "Power Card (Ver 0263, encrypted)",                0 ) // clone of Bonus Card.
-GAME(  1993, megacard,  0,        megacard, funworld,  megacard_state, empty_init,    ROT0, "Fun World",       "Mega Card (Ver.0210, encrypted)",                 0 )
-GAME(  1993, jokercrd,  0,        jokercrd, funworld,  jokercrd_state, empty_init,    ROT0, "Amatic Trading",  "Joker Card 300 (Ver.A267BC, encrypted)",          0 )
-GAME(  1991, royalcrdf, royalcrd, royalcrdf,royalcrdf, royalcrdf_state,driver_init,   ROT0, "Evona Electronic","Royal Card (Evona, Polish, encrypted)",           0 )
-GAME(  198?, saloon,    0,        saloon,   saloon,    funworld_state, init_saloon,   ROT0, "<unknown>",       "Saloon (French, encrypted)",                      0 )
-GAME(  198?, nevadafw,  0,        saloon,   saloon,    funworld_state, init_saloon,   ROT0, "<unknown>",       "Nevada (French, encrypted)",                      0 )
+GAME(  1992, multiwin,   0,        multiwin, funworld,  multiwin_state, driver_init,   ROT0, "Fun World",         "Multi Win (Ver.0167, encrypted)",                 0 )
+GAME(  1993, powercrd,   0,        powercrd, funworld,  powercrd_state, empty_init,    ROT0, "Fun World",         "Power Card (Ver 0263, encrypted)",                0 ) // clone of Bonus Card.
+GAME(  1993, megacard,   0,        megacard, funworld,  megacard_state, empty_init,    ROT0, "Fun World",         "Mega Card (Ver.0210, encrypted)",                 0 )
+GAME(  1993, jokercrd,   0,        jokercrd, funworld,  jokercrd_state, empty_init,    ROT0, "Amatic Trading",    "Joker Card 300 (Ver.A267BC, encrypted)",          0 )
+GAME(  1991, royalcrdf,  royalcrd, royalcrdf,royalcrdf, royalcrdf_state,driver_init,   ROT0, "Evona Electronic",  "Royal Card (Evona, Polish, encrypted)",           0 )
+GAME(  198?, saloon,     0,        saloon,   saloon,    funworld_state, init_saloon,   ROT0, "<unknown>",         "Saloon (French, encrypted)",                      0 )
+GAME(  198?, nevadafw,   0,        saloon,   saloon,    funworld_state, init_saloon,   ROT0, "<unknown>",         "Nevada (French, encrypted)",                      0 )
 
 // Encrypted TAB blue PCB...
-GAMEL( 199?, jolycdit,  jollycrd, cuoreuno, jolycdit,  funworld_state, init_tabblue,  ROT0, "bootleg",         "Jolly Card (Italian, blue TAB board, encrypted)", 0,                       layout_royalcrd )
-GAMEL( 1990, jolycdib,  jollycrd, cuoreuno, jolycdib,  funworld_state, init_tabblue,  ROT0, "bootleg",         "Jolly Card (Italian, encrypted bootleg, set 1)",  0,                       layout_jollycrd ) // not a real TAB blue PCB
-GAMEL( 1993, jolycdic,  jollycrd, cuoreuno, jolycdic,  funworld_state, init_tabblue,  ROT0, "bootleg",         "Jolly Card (Italian, encrypted bootleg, set 2)",  0,                       layout_jollycrd ) // not a real TAB blue PCB
+GAMEL( 199?, jolycdit,   jollycrd, cuoreuno, jolycdit,  funworld_state, init_tabblue,  ROT0, "bootleg",           "Jolly Card (Italian, blue TAB board, encrypted)", 0,                       layout_royalcrd )
+GAMEL( 1990, jolycdib,   jollycrd, cuoreuno, jolycdib,  funworld_state, init_tabblue,  ROT0, "bootleg",           "Jolly Card (Italian, encrypted bootleg, set 1)",  0,                       layout_jollycrd ) // not a real TAB blue PCB
+GAMEL( 1993, jolycdic,   jollycrd, cuoreuno, jolycdic,  funworld_state, init_tabblue,  ROT0, "bootleg",           "Jolly Card (Italian, encrypted bootleg, set 2)",  0,                       layout_jollycrd ) // not a real TAB blue PCB
+GAMEL( 1993, jolycdii,   jollycrd, cuoreuno, jolycdib,  funworld_state, init_tabblue,  ROT0, "bootleg (Cleco)",   "Jolly Card (Italian, encrypted bootleg, set 3)",  0,                       layout_jollycrd ) // Cleco bootleg PCB
 
 // Dino 4 encrypted hardware...
-GAMEL( 1997, pool10e,   pool10,   cuoreuno, cuoreuno,  funworld_state, init_dino4,    ROT0, "C.M.C.",          "Pool 10 (Italian, Dino 4 hardware, encrypted)",   0,                       layout_jollycrd )
-GAME(  1998, rcdino4,   0,        rcdino4,  rcdino4,   chinatow_state, init_rcdino4,  ROT0, "<unknown>",       "Royal Card (Italian, Dino 4 hardware, encrypted)",0 )
-GAMEL( 1998, chinatow,  0,        chinatow, chinatow,  chinatow_state, init_rcdinch,  ROT0, "<unknown>",       "China Town (Ver 1B, Dino4 HW)",                   0,                       layout_jollycrd )
+GAMEL( 1997, pool10e,    pool10,   cuoreuno, cuoreuno,  funworld_state, init_dino4,    ROT0, "C.M.C.",            "Pool 10 (Italian, Dino 4 hardware, encrypted)",   0,                       layout_jollycrd )
+GAME(  1998, rcdino4,    0,        rcdino4,  rcdino4,   chinatow_state, init_rcdino4,  ROT0, "<unknown>",         "Royal Card (Italian, Dino 4 hardware, encrypted)",0 )
+GAMEL( 1998, chinatow,   0,        chinatow, chinatow,  chinatow_state, init_rcdinch,  ROT0, "<unknown>",         "China Town (Ver 1B, Dino4 HW)",                   0,                       layout_jollycrd )
 
 // MCU based games...
-GAME(  199?, mongolnw,  0,        royalcd1, royalcrd,  funworld_state, init_mongolnw, ROT0, "<unknown>",       "Mongolfier New (Italian)",                        MACHINE_UNEMULATED_PROTECTION )
-GAME(  199?, soccernw,  0,        royalcd1, royalcrd,  funworld_state, init_soccernw, ROT0, "<unknown>",       "Soccer New (Italian)",                            MACHINE_UNEMULATED_PROTECTION )
+GAME(  199?, mongolnw,   0,        royalcd1, royalcrd,  funworld_state, init_mongolnw, ROT0, "<unknown>",         "Mongolfier New (Italian)",                        MACHINE_UNEMULATED_PROTECTION )
+GAME(  199?, soccernw,   0,        royalcd1, royalcrd,  funworld_state, init_soccernw, ROT0, "<unknown>",         "Soccer New (Italian)",                            MACHINE_UNEMULATED_PROTECTION )
 
 // Quiz games...
-GAME(  199?, funquiz,   0,        funquiz,  funquiz,   funworld_state, empty_init,    ROT0, "Fun World",       "Fun World Quiz (German)",                         0 )
-GAME(  1990, funquiza,  0,        funquiz,  funquiza,  funworld_state, empty_init,    ROT0, "Fun World",       "Fun World Quiz (German, 12-11-1990)",             0 )
-GAME(  1990, funquizb,  0,        funquiz,  funquiza,  funworld_state, empty_init,    ROT0, "Fun World",       "Fun World Quiz (German, 27-04-1990)",             0 )
+GAME(  199?, funquiz,    0,        funquiz,  funquiz,   funworld_state, empty_init,    ROT0, "Fun World",         "Fun World Quiz (German)",                         0 )
+GAME(  1990, funquiza,   0,        funquiz,  funquiza,  funworld_state, empty_init,    ROT0, "Fun World",         "Fun World Quiz (German, 12-11-1990)",             0 )
+GAME(  1990, funquizb,   0,        funquiz,  funquiza,  funworld_state, empty_init,    ROT0, "Fun World",         "Fun World Quiz (German, 27-04-1990)",             0 )
 
 // Other games...
-GAMEL( 1986, novoplay,  0,        fw2ndpal, novoplay,    funworld_state, empty_init,   ROT0, "Admiral/Novomatic","Novo Play Multi Card / Club Card",              0,                       layout_novoplay )
-GAME(  1991, intrgmes,  0,        intrgmes, intrgmes,    intergames_state, empty_init, ROT0, "Inter Games",     "Joker Card (Inter Games)",                       0 )
-GAMEL( 1985, fw_a7_11,  0,        fw_brick_2, fw_brick1, funworld_state, empty_init,   ROT0, "Fun World",       "unknown Fun World A7-11 game 1",                 MACHINE_NOT_WORKING,     layout_jollycrd )
-GAMEL( 1985, fw_a7_11a, fw_a7_11, fw_brick_2, fw_brick1, funworld_state, empty_init,   ROT0, "Fun World",       "unknown Fun World A7-11 game 2",                 MACHINE_NOT_WORKING,     layout_jollycrd )
-GAMEL( 1991, fw_a0_1,   0,        fw_brick_2, fw_brick1, funworld_state, empty_init,   ROT0, "Fun World",       "unknown Fun World A0-1 game",                    MACHINE_NOT_WORKING,     layout_jollycrd )
-GAMEL( 1991, jokcrdep,  0,        fw_brick_2, fw_brick1, funworld_state, empty_init,   ROT0, "Fun World",       "Joker Card / Multi Card (Epoxy brick CPU)",      MACHINE_NOT_WORKING,     layout_jollycrd )
+GAMEL( 1986, novoplay,   0,        fw2ndpal,   novoplay,  funworld_state,   empty_init,   ROT0, "Admiral/Novomatic", "Novo Play Multi Card / Club Card",             0,                       layout_novoplay )
+GAME(  1991, intrgmes,   0,        intrgmes,   intrgmes,  intergames_state, empty_init,   ROT0, "Inter Games",       "Joker Card (Inter Games)",                     0 )
+GAMEL( 1985, fw_a7_11,   0,        fw_brick_2, fw_brick1, funworld_state,   empty_init,   ROT0, "Fun World",         "unknown Fun World A7-11 game 1",               MACHINE_NOT_WORKING,     layout_jollycrd )
+GAMEL( 1985, fw_a7_11a,  fw_a7_11, fw_brick_2, fw_brick1, funworld_state,   empty_init,   ROT0, "Fun World",         "unknown Fun World A7-11 game 2",               MACHINE_NOT_WORKING,     layout_jollycrd )
+GAMEL( 1991, fw_a0_1,    0,        fw_brick_2, fw_brick1, funworld_state,   empty_init,   ROT0, "Fun World",         "unknown Fun World A0-1 game",                  MACHINE_NOT_WORKING,     layout_jollycrd )
+GAMEL( 1991, jokcrdep,   0,        fw_brick_2, fw_brick1, funworld_state,   empty_init,   ROT0, "Fun World",         "Joker Card / Multi Card (Epoxy brick CPU)",    MACHINE_NOT_WORKING,     layout_jollycrd )
+GAMEL( 199?, gratispk,   0,        gratispk,   funworld,  funworld_state,   empty_init,   ROT0, "Mega Soft",         "Gratis Poker (V.204, set 1)",                  0,                       layout_jollycrd )
+GAMEL( 199?, gratispka,  gratispk, gratispk,   funworld,  funworld_state,   empty_init,   ROT0, "Mega Soft",         "Gratis Poker (V.204, set 2)",                  0,                       layout_jollycrd )
+GAMEL( 1995, nkoulit,    royalcrd, royalcd1,   royalcrd,  funworld_state,   init_tabblue, ROT0, "JK Amusement",      "Gkoulit (encrypted GFX)",                      0,                       layout_jollycrd )
+GAMEL( 1999, reflexcrd,  royalcrd, royalcd1,   royalcrd,  funworld_state,   empty_init,   ROT0, "TAB Austria",       "Reflex Cards (English, serial protected)",     0,                       layout_jollycrd )
 
 // These are 2-in-1 stealth boards, they can run the Poker game, or, using completely separate hardware on the same PCB, a NES / MSX Multigames!
 GAMEL( 1991, royalcrd_nes,  royalcrd, royalcd2, royalcrd, funworld_state, empty_init, ROT0, "bootleg",         "Royal Card (stealth with NES multigame)",         MACHINE_NOT_WORKING,     layout_jollycrd )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/gaelcof3.cpp mame-0.224+dfsg.1/src/mame/drivers/gaelcof3.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/gaelcof3.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/gaelcof3.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,127 @@
+// license:BSD-3-Clause
+// copyright-holders:
+/*
+  Gaelco 'Futbol-3' hardware for kiddie rides
+
+  The PCB is very compact and has few components. The main ones are:
+
+  PIC16C56 as main CPU
+  OKI M6295 for sound
+  1 bank of 6 dips
+
+  Gaelco FUTBOL-3 PCB
+  _____________________________________________________
+  |JP1  JP2         __________                        |
+  | __   ___        |ULN2803A_|                       |
+  || |  |  |        ___________                       |
+  || |  |  |        |MC74HCT273A                      |
+  ||_|  |  |        _________   _________             |
+  |JP3  |  |        |TLP504A_| |TLP504A_|             |
+  | __  |  |        __________                        |
+  || |  |  |        |PIC16C56|                        |
+  ||_|  |  |                                          |
+  | ___ |__|   ___ <-SN74LS365AN                      |
+  | VOL        |  |   ______    ___________________   |
+  |  _______   |  |  | OKI |   |ROM U1             |  |
+  | |DIPSx6|   |  |  |6295_|   |___________________|  |
+  |            |__|                                   |
+  |___________________________________________________|
+
+  JP1 = 10 pin [+5V, GND, DAT, CLK, ENA, PU1, PU2, PU3, PU4, GND]
+  JP2 = 14 pin [12VA, 12VA, +5V, ALT, CON, BOM, MOT, N/U, BOM, POT, ALT, 12V, GND, GND]
+  JP3 =  5 pin [PU5, PU6, PU7, PU8, GND]
+
+  The PCBs were inside two "Coche de Bomberos" kiddie rides from CMC Cresmatic (https://www.recreativas.org/coche-de-bomberos-6022-cresmatic).
+  Anyway, the hardware is generic enough to serve any basic kiddie ride.
+
+  The only dumped ROM on the PCB is the Oki sound samples. There are three different versions dumped (from different machines):
+     -"Susanita" - Based on the song composed by Rafael Pérez Botija.
+     -"El auto feo" - Based on the song composed by Enrique Fischer 'Pipo Pescador'.
+     -"Hola Don Pepito" - Based on the song composed by Ramón del Rivero.
+*/
+
+#include "emu.h"
+#include "cpu/pic16c5x/pic16c5x.h"
+#include "sound/okim6295.h"
+#include "speaker.h"
+
+
+class gaelcof3_state : public driver_device
+{
+public:
+	gaelcof3_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu")
+	{ }
+
+	void gaelcof3(machine_config &config);
+
+private:
+	required_device<cpu_device>     m_maincpu;
+};
+
+
+static INPUT_PORTS_START( gaelcof3 )
+	PORT_START("IN0")
+	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+	PORT_START("DSW1") // only 6 switches
+	PORT_DIPNAME( 0x01, 0x01, "DSW1-1" )        PORT_DIPLOCATION("SW1:1")
+	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x02, "DSW1-2" )        PORT_DIPLOCATION("SW1:2")
+	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x04, "DSW1-3" )        PORT_DIPLOCATION("SW1:3")
+	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x08, "DSW1-4" )        PORT_DIPLOCATION("SW1:4")
+	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x10, "DSW1-5" )        PORT_DIPLOCATION("SW1:5")
+	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x20, "DSW1-6" )        PORT_DIPLOCATION("SW1:6")
+	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_BIT( 0xc0, IP_ACTIVE_LOW, IPT_UNKNOWN )
+INPUT_PORTS_END
+
+
+void gaelcof3_state::gaelcof3(machine_config &config)
+{
+	PIC16C56(config, m_maincpu, 4000000); // clock not confirmed
+
+	SPEAKER(config, "mono").front_center();
+
+	OKIM6295(config, "oki", 1000000, okim6295_device::PIN7_HIGH).add_route(ALL_OUTPUTS, "mono", 1.0); // clock and pin not confirmed
+}
+
+
+ROM_START( autopapa )
+	ROM_REGION( 0x800, "maincpu", 0 )
+	ROM_LOAD( "pic16c56.u3", 0x000, 0x800, NO_DUMP )
+
+	ROM_REGION( 0x40000, "oki", 0 )
+	ROM_LOAD( "autopapa.u1", 0x00000, 0x40000, CRC(a3e5607e) SHA1(24a9c79edec7b2f7f64b622240f2ad8f3ffa29ca) )
+ROM_END
+
+ROM_START( donpepito )
+	ROM_REGION( 0x800, "maincpu", 0 )
+	ROM_LOAD( "pic16c56.u3", 0x000, 0x800, NO_DUMP )
+
+	ROM_REGION( 0x40000, "oki", 0 )
+	ROM_LOAD( "don_pepito.u1", 0x00000, 0x40000, CRC(574fcd14) SHA1(a23f1eb6d2cef5aa07df3a553fe1d33803648f43) )
+ROM_END
+
+ROM_START( susanita )
+	ROM_REGION( 0x800, "maincpu", 0 )
+	ROM_LOAD( "pic16c56.u3", 0x000, 0x800, NO_DUMP )
+
+	ROM_REGION( 0x40000, "oki", 0 )
+	ROM_LOAD( "susanita.u1", 0x00000, 0x40000, CRC(766868cb) SHA1(eb42dc46b865bc448052d9d67c840e51c49ce49a) )
+ROM_END
+
+GAME( 199?, autopapa,  0, gaelcof3, gaelcof3, gaelcof3_state, empty_init, ROT0, "Gaelco", "El auto feo",     MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, donpepito, 0, gaelcof3, gaelcof3, gaelcof3_state, empty_init, ROT0, "Gaelco", "Hola Don Pepito", MACHINE_IS_SKELETON_MECHANICAL )
+GAME( 199?, susanita,  0, gaelcof3, gaelcof3, gaelcof3_state, empty_init, ROT0, "Gaelco", "Susanita",        MACHINE_IS_SKELETON_MECHANICAL )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/gaiden.cpp mame-0.224+dfsg.1/src/mame/drivers/gaiden.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/gaiden.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/gaiden.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1048,30 +1048,26 @@
 	ROM_LOAD( "gaiden_5.7a",     0x000000, 0x10000, CRC(8d4035f7) SHA1(3473456cdd24e312e3073586d7e8f24eb71bbea1) )  /* 8x8 tiles */
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "14.3a",       0x000000, 0x20000, CRC(1ecfddaa) SHA1(e71d60ae1a98fe8512498f91cce01c16be9f0871) )
-	ROM_LOAD( "15.3b",       0x020000, 0x20000, CRC(1291a696) SHA1(023b05260214adc39bdba81d5e2aa246b6d74a6a) )
-	ROM_LOAD( "16.1a",       0x040000, 0x20000, CRC(140b47ca) SHA1(6ffd9b7116658a46a124f9085602d88aa143d829) )
-	ROM_LOAD( "17.1b",       0x060000, 0x20000, CRC(7638cccb) SHA1(780d47d3aa248346e0e7abc6e6284542e7392919) )
+	ROM_LOAD( "14.3a", 0x000000, 0x20000, CRC(1ecfddaa) SHA1(e71d60ae1a98fe8512498f91cce01c16be9f0871) )
+	ROM_LOAD( "15.3b", 0x020000, 0x20000, CRC(1291a696) SHA1(023b05260214adc39bdba81d5e2aa246b6d74a6a) )
+	ROM_LOAD( "16.1a", 0x040000, 0x20000, CRC(140b47ca) SHA1(6ffd9b7116658a46a124f9085602d88aa143d829) )
+	ROM_LOAD( "17.1b", 0x060000, 0x20000, CRC(7638cccb) SHA1(780d47d3aa248346e0e7abc6e6284542e7392919) )
 
 	ROM_REGION( 0x080000, "gfx3", 0 )
-	ROM_LOAD( "18.6a",       0x000000, 0x20000, CRC(3fadafd6) SHA1(0cb5387a354c631d5c6aca8f77ecbbc0d175a574) )
-	ROM_LOAD( "19.6b",       0x020000, 0x20000, CRC(ddae9d5b) SHA1(108b202ae7ae124a32400a0a404c7d2b614c60bd) )
-	ROM_LOAD( "20.4b",       0x040000, 0x20000, CRC(08cf7a93) SHA1(fd3278c3fb3ef30ed03c8a95656d86ba82a163d8) )
-	ROM_LOAD( "21.4b",       0x060000, 0x20000, CRC(1ac892f5) SHA1(28364266ca9d1955fb7953f5c2d6f35e114beec6) )
-
-	ROM_REGION( 0x100000, "gfx4", 0 )
-	/* Should all these roms be 0x10000 bytes on this board? */
-	ROM_LOAD16_BYTE( "6.3m",           0x000000, 0x20000, CRC(e7ccdf9f) SHA1(80ffcefc95660471124898a9c2bee55df36bda13) )   /* sprites A1 */
-	ROM_LOAD16_BYTE( "8.3n",           0x040000, 0x20000, CRC(7ef7f880) SHA1(26ba9a76adce24beea3cffa1cb95aeafe6f82f96) )   /* sprites B1 */
-	ROM_LOAD16_BYTE( "10.3r",          0x080000, 0x20000, CRC(a6451dec) SHA1(553e7a1453b59055fa0b10ca04125543d9f8987c) )   /* sprites C1 */
-	ROM_LOAD16_BYTE( "shadoww_12a.xx", 0x0c0000, 0x10000, CRC(9bb07731) SHA1(b799b1958dc9b84797fdab2591e33bd5d28884a3) )   /* sprites D1 */
-	ROM_LOAD16_BYTE( "shadoww_12b.xx", 0x0e0000, 0x10000, CRC(a4a950a2) SHA1(9766b5e88edd16554e59179a37cca49d29f83367) )   /* sprites D1 */
-
-	ROM_LOAD16_BYTE( "7.1m",           0x000001, 0x20000, CRC(016bec95) SHA1(6a6757c52ca9a2398ea43d1af4a8d5adde6f4cd2) )   /* sprites A2 */
-	ROM_LOAD16_BYTE( "9.1n",           0x040001, 0x20000, CRC(6e9b7fd3) SHA1(c86ff61844fc94c02625bb812b9062d0649c8fdf) )   /* sprites B2 */
-	ROM_LOAD16_BYTE( "11.1r",          0x080001, 0x20000, CRC(7fbfdf5e) SHA1(ab67b72dcadb5f2236d29de751de5bf890a9e423) )   /* sprites C2 */
-	ROM_LOAD16_BYTE( "shadoww_13a.xx", 0x0c0001, 0x10000, CRC(996d2fa5) SHA1(a32526949af3635914927ebbbe684c3de9562a9d) )   /* sprites D2 */
-	ROM_LOAD16_BYTE( "shadoww_13b.xx", 0x0e0001, 0x10000, CRC(b8df8a34) SHA1(6810f7961052a983b8c78b42d550038051012c6d) )   /* sprites D2 */
+	ROM_LOAD( "18.6a", 0x000000, 0x20000, CRC(3fadafd6) SHA1(0cb5387a354c631d5c6aca8f77ecbbc0d175a574) )
+	ROM_LOAD( "19.6b", 0x020000, 0x20000, CRC(ddae9d5b) SHA1(108b202ae7ae124a32400a0a404c7d2b614c60bd) )
+	ROM_LOAD( "20.4b", 0x040000, 0x20000, CRC(08cf7a93) SHA1(fd3278c3fb3ef30ed03c8a95656d86ba82a163d8) )
+	ROM_LOAD( "21.4b", 0x060000, 0x20000, CRC(1ac892f5) SHA1(28364266ca9d1955fb7953f5c2d6f35e114beec6) )
+
+	ROM_REGION( 0x100000, "gfx4", 0 ) // sprite roms also seen on daughterboard "4M512" with 16 0x10000-sized roms
+	ROM_LOAD16_BYTE( "6.3m",  0x000000, 0x20000, CRC(e7ccdf9f) SHA1(80ffcefc95660471124898a9c2bee55df36bda13) ) /* sprites A1 */
+	ROM_LOAD16_BYTE( "7.1m",  0x000001, 0x20000, CRC(016bec95) SHA1(6a6757c52ca9a2398ea43d1af4a8d5adde6f4cd2) ) /* sprites A2 */
+	ROM_LOAD16_BYTE( "8.3n",  0x040000, 0x20000, CRC(7ef7f880) SHA1(26ba9a76adce24beea3cffa1cb95aeafe6f82f96) ) /* sprites B1 */
+	ROM_LOAD16_BYTE( "9.1n",  0x040001, 0x20000, CRC(6e9b7fd3) SHA1(c86ff61844fc94c02625bb812b9062d0649c8fdf) ) /* sprites B2 */
+	ROM_LOAD16_BYTE( "10.3r", 0x080000, 0x20000, CRC(a6451dec) SHA1(553e7a1453b59055fa0b10ca04125543d9f8987c) ) /* sprites C1 */
+	ROM_LOAD16_BYTE( "11.1r", 0x080001, 0x20000, CRC(7fbfdf5e) SHA1(ab67b72dcadb5f2236d29de751de5bf890a9e423) ) /* sprites C2 */
+	ROM_LOAD16_BYTE( "12.3s", 0x0c0000, 0x20000, CRC(94a836d8) SHA1(55658f4c6cf6aadc4369b943705f5734396b2e43) ) /* sprites D1 */
+	ROM_LOAD16_BYTE( "13.1s", 0x0c0001, 0x20000, CRC(e9caea3b) SHA1(39ef300e7dfd9469f04127d5a06dceb0b7e357f8) ) /* sprites D2 */
 
 	ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
 	ROM_LOAD( "4.4a",     0x0000, 0x20000, CRC(b0e0faf9) SHA1(2275d2ef5eee356ccf80b9e9644d16fc30a4d107) ) /* samples */
@@ -1089,30 +1085,26 @@
 	ROM_LOAD( "gaiden_5.7a",     0x000000, 0x10000, CRC(8d4035f7) SHA1(3473456cdd24e312e3073586d7e8f24eb71bbea1) )  /* 8x8 tiles */
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "14.3a",       0x000000, 0x20000, CRC(1ecfddaa) SHA1(e71d60ae1a98fe8512498f91cce01c16be9f0871) )
-	ROM_LOAD( "15.3b",       0x020000, 0x20000, CRC(1291a696) SHA1(023b05260214adc39bdba81d5e2aa246b6d74a6a) )
-	ROM_LOAD( "16.1a",       0x040000, 0x20000, CRC(140b47ca) SHA1(6ffd9b7116658a46a124f9085602d88aa143d829) )
-	ROM_LOAD( "17.1b",       0x060000, 0x20000, CRC(7638cccb) SHA1(780d47d3aa248346e0e7abc6e6284542e7392919) )
+	ROM_LOAD( "14.3a", 0x000000, 0x20000, CRC(1ecfddaa) SHA1(e71d60ae1a98fe8512498f91cce01c16be9f0871) )
+	ROM_LOAD( "15.3b", 0x020000, 0x20000, CRC(1291a696) SHA1(023b05260214adc39bdba81d5e2aa246b6d74a6a) )
+	ROM_LOAD( "16.1a", 0x040000, 0x20000, CRC(140b47ca) SHA1(6ffd9b7116658a46a124f9085602d88aa143d829) )
+	ROM_LOAD( "17.1b", 0x060000, 0x20000, CRC(7638cccb) SHA1(780d47d3aa248346e0e7abc6e6284542e7392919) )
 
 	ROM_REGION( 0x080000, "gfx3", 0 )
-	ROM_LOAD( "18.6a",       0x000000, 0x20000, CRC(3fadafd6) SHA1(0cb5387a354c631d5c6aca8f77ecbbc0d175a574) )
-	ROM_LOAD( "19.6b",       0x020000, 0x20000, CRC(ddae9d5b) SHA1(108b202ae7ae124a32400a0a404c7d2b614c60bd) )
-	ROM_LOAD( "20.4b",       0x040000, 0x20000, CRC(08cf7a93) SHA1(fd3278c3fb3ef30ed03c8a95656d86ba82a163d8) )
-	ROM_LOAD( "21.4b",       0x060000, 0x20000, CRC(1ac892f5) SHA1(28364266ca9d1955fb7953f5c2d6f35e114beec6) )
-
-	ROM_REGION( 0x100000, "gfx4", 0 )
-	/* Should all these roms be 0x10000 bytes on this board? */
-	ROM_LOAD16_BYTE( "6.3m",           0x000000, 0x20000, CRC(e7ccdf9f) SHA1(80ffcefc95660471124898a9c2bee55df36bda13) )   /* sprites A1 */
-	ROM_LOAD16_BYTE( "8.3n",           0x040000, 0x20000, CRC(7ef7f880) SHA1(26ba9a76adce24beea3cffa1cb95aeafe6f82f96) )   /* sprites B1 */
-	ROM_LOAD16_BYTE( "10.3r",          0x080000, 0x20000, CRC(a6451dec) SHA1(553e7a1453b59055fa0b10ca04125543d9f8987c) )   /* sprites C1 */
-	ROM_LOAD16_BYTE( "shadoww_12a.xx", 0x0c0000, 0x10000, CRC(9bb07731) SHA1(b799b1958dc9b84797fdab2591e33bd5d28884a3) )   /* sprites D1 */
-	ROM_LOAD16_BYTE( "shadoww_12b.xx", 0x0e0000, 0x10000, CRC(a4a950a2) SHA1(9766b5e88edd16554e59179a37cca49d29f83367) )   /* sprites D1 */
-
-	ROM_LOAD16_BYTE( "7.1m",           0x000001, 0x20000, CRC(016bec95) SHA1(6a6757c52ca9a2398ea43d1af4a8d5adde6f4cd2) )   /* sprites A2 */
-	ROM_LOAD16_BYTE( "9.1n",           0x040001, 0x20000, CRC(6e9b7fd3) SHA1(c86ff61844fc94c02625bb812b9062d0649c8fdf) )   /* sprites B2 */
-	ROM_LOAD16_BYTE( "11.1r",          0x080001, 0x20000, CRC(7fbfdf5e) SHA1(ab67b72dcadb5f2236d29de751de5bf890a9e423) )   /* sprites C2 */
-	ROM_LOAD16_BYTE( "shadoww_13a.xx", 0x0c0001, 0x10000, CRC(996d2fa5) SHA1(a32526949af3635914927ebbbe684c3de9562a9d) )   /* sprites D2 */
-	ROM_LOAD16_BYTE( "shadoww_13b.xx", 0x0e0001, 0x10000, CRC(b8df8a34) SHA1(6810f7961052a983b8c78b42d550038051012c6d) )   /* sprites D2 */
+	ROM_LOAD( "18.6a", 0x000000, 0x20000, CRC(3fadafd6) SHA1(0cb5387a354c631d5c6aca8f77ecbbc0d175a574) )
+	ROM_LOAD( "19.6b", 0x020000, 0x20000, CRC(ddae9d5b) SHA1(108b202ae7ae124a32400a0a404c7d2b614c60bd) )
+	ROM_LOAD( "20.4b", 0x040000, 0x20000, CRC(08cf7a93) SHA1(fd3278c3fb3ef30ed03c8a95656d86ba82a163d8) )
+	ROM_LOAD( "21.4b", 0x060000, 0x20000, CRC(1ac892f5) SHA1(28364266ca9d1955fb7953f5c2d6f35e114beec6) )
+
+	ROM_REGION( 0x100000, "gfx4", 0 ) // sprite roms also seen on daughterboard "4M512" with 16 0x10000-sized roms
+	ROM_LOAD16_BYTE( "6.3m",  0x000000, 0x20000, CRC(e7ccdf9f) SHA1(80ffcefc95660471124898a9c2bee55df36bda13) ) /* sprites A1 */
+	ROM_LOAD16_BYTE( "7.1m",  0x000001, 0x20000, CRC(016bec95) SHA1(6a6757c52ca9a2398ea43d1af4a8d5adde6f4cd2) ) /* sprites A2 */
+	ROM_LOAD16_BYTE( "8.3n",  0x040000, 0x20000, CRC(7ef7f880) SHA1(26ba9a76adce24beea3cffa1cb95aeafe6f82f96) ) /* sprites B1 */
+	ROM_LOAD16_BYTE( "9.1n",  0x040001, 0x20000, CRC(6e9b7fd3) SHA1(c86ff61844fc94c02625bb812b9062d0649c8fdf) ) /* sprites B2 */
+	ROM_LOAD16_BYTE( "10.3r", 0x080000, 0x20000, CRC(a6451dec) SHA1(553e7a1453b59055fa0b10ca04125543d9f8987c) ) /* sprites C1 */
+	ROM_LOAD16_BYTE( "11.1r", 0x080001, 0x20000, CRC(7fbfdf5e) SHA1(ab67b72dcadb5f2236d29de751de5bf890a9e423) ) /* sprites C2 */
+	ROM_LOAD16_BYTE( "12.3s", 0x0c0000, 0x20000, CRC(94a836d8) SHA1(55658f4c6cf6aadc4369b943705f5734396b2e43) ) /* sprites D1 */
+	ROM_LOAD16_BYTE( "13.1s", 0x0c0001, 0x20000, CRC(e9caea3b) SHA1(39ef300e7dfd9469f04127d5a06dceb0b7e357f8) ) /* sprites D2 */
 
 	ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
 	ROM_LOAD( "4.4a",     0x0000, 0x20000, CRC(b0e0faf9) SHA1(2275d2ef5eee356ccf80b9e9644d16fc30a4d107) ) /* samples */
@@ -1130,27 +1122,26 @@
 	ROM_LOAD( "gaiden_5.7a",     0x000000, 0x10000, CRC(8d4035f7) SHA1(3473456cdd24e312e3073586d7e8f24eb71bbea1) )  /* 8x8 tiles */
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "14.3a",       0x000000, 0x20000, CRC(1ecfddaa) SHA1(e71d60ae1a98fe8512498f91cce01c16be9f0871) )
-	ROM_LOAD( "15.3b",       0x020000, 0x20000, CRC(1291a696) SHA1(023b05260214adc39bdba81d5e2aa246b6d74a6a) )
-	ROM_LOAD( "16.1a",       0x040000, 0x20000, CRC(140b47ca) SHA1(6ffd9b7116658a46a124f9085602d88aa143d829) )
-	ROM_LOAD( "17.1b",       0x060000, 0x20000, CRC(7638cccb) SHA1(780d47d3aa248346e0e7abc6e6284542e7392919) )
+	ROM_LOAD( "14.3a", 0x000000, 0x20000, CRC(1ecfddaa) SHA1(e71d60ae1a98fe8512498f91cce01c16be9f0871) )
+	ROM_LOAD( "15.3b", 0x020000, 0x20000, CRC(1291a696) SHA1(023b05260214adc39bdba81d5e2aa246b6d74a6a) )
+	ROM_LOAD( "16.1a", 0x040000, 0x20000, CRC(140b47ca) SHA1(6ffd9b7116658a46a124f9085602d88aa143d829) )
+	ROM_LOAD( "17.1b", 0x060000, 0x20000, CRC(7638cccb) SHA1(780d47d3aa248346e0e7abc6e6284542e7392919) )
 
 	ROM_REGION( 0x080000, "gfx3", 0 )
-	ROM_LOAD( "18.6a",       0x000000, 0x20000, CRC(3fadafd6) SHA1(0cb5387a354c631d5c6aca8f77ecbbc0d175a574) )
-	ROM_LOAD( "19.6b",       0x020000, 0x20000, CRC(ddae9d5b) SHA1(108b202ae7ae124a32400a0a404c7d2b614c60bd) )
-	ROM_LOAD( "20.4b",       0x040000, 0x20000, CRC(08cf7a93) SHA1(fd3278c3fb3ef30ed03c8a95656d86ba82a163d8) )
-	ROM_LOAD( "21.4b",       0x060000, 0x20000, CRC(1ac892f5) SHA1(28364266ca9d1955fb7953f5c2d6f35e114beec6) )
-
-	ROM_REGION( 0x100000, "gfx4", 0 )
-	ROM_LOAD16_BYTE( "6.3m",         0x000000, 0x20000, CRC(e7ccdf9f) SHA1(80ffcefc95660471124898a9c2bee55df36bda13) ) /* sprites A1 */
-	ROM_LOAD16_BYTE( "8.3n",         0x040000, 0x20000, CRC(7ef7f880) SHA1(26ba9a76adce24beea3cffa1cb95aeafe6f82f96) ) /* sprites B1 */
-	ROM_LOAD16_BYTE( "10.3r",        0x080000, 0x20000, CRC(a6451dec) SHA1(553e7a1453b59055fa0b10ca04125543d9f8987c) ) /* sprites C1 */
-	ROM_LOAD16_BYTE( "gaiden_12.3s", 0x0c0000, 0x20000, CRC(90f1e13a) SHA1(3fe9fe62aa9e92c871c791a3b11f96c9a48099a9) ) /* sprites D1 */
-
-	ROM_LOAD16_BYTE( "7.1m",         0x000001, 0x20000, CRC(016bec95) SHA1(6a6757c52ca9a2398ea43d1af4a8d5adde6f4cd2) ) /* sprites A2 */
-	ROM_LOAD16_BYTE( "9.1n",         0x040001, 0x20000, CRC(6e9b7fd3) SHA1(c86ff61844fc94c02625bb812b9062d0649c8fdf) ) /* sprites B2 */
-	ROM_LOAD16_BYTE( "11.1r",        0x080001, 0x20000, CRC(7fbfdf5e) SHA1(ab67b72dcadb5f2236d29de751de5bf890a9e423) ) /* sprites C2 */
-	ROM_LOAD16_BYTE( "gaiden_13.1s", 0x0c0001, 0x20000, CRC(7d9f5c5e) SHA1(200102532ea9a88c7c708e03f8893c46dff827d1) ) /* sprites D2 */
+	ROM_LOAD( "18.6a", 0x000000, 0x20000, CRC(3fadafd6) SHA1(0cb5387a354c631d5c6aca8f77ecbbc0d175a574) )
+	ROM_LOAD( "19.6b", 0x020000, 0x20000, CRC(ddae9d5b) SHA1(108b202ae7ae124a32400a0a404c7d2b614c60bd) )
+	ROM_LOAD( "20.4b", 0x040000, 0x20000, CRC(08cf7a93) SHA1(fd3278c3fb3ef30ed03c8a95656d86ba82a163d8) )
+	ROM_LOAD( "21.4b", 0x060000, 0x20000, CRC(1ac892f5) SHA1(28364266ca9d1955fb7953f5c2d6f35e114beec6) )
+
+	ROM_REGION( 0x100000, "gfx4", 0 ) // sprite roms also seen on daughterboard "4M512" with 16 0x10000-sized roms
+	ROM_LOAD16_BYTE( "6.3m",  0x000000, 0x20000, CRC(e7ccdf9f) SHA1(80ffcefc95660471124898a9c2bee55df36bda13) ) /* sprites A1 */
+	ROM_LOAD16_BYTE( "7.1m",  0x000001, 0x20000, CRC(016bec95) SHA1(6a6757c52ca9a2398ea43d1af4a8d5adde6f4cd2) ) /* sprites A2 */
+	ROM_LOAD16_BYTE( "8.3n",  0x040000, 0x20000, CRC(7ef7f880) SHA1(26ba9a76adce24beea3cffa1cb95aeafe6f82f96) ) /* sprites B1 */
+	ROM_LOAD16_BYTE( "9.1n",  0x040001, 0x20000, CRC(6e9b7fd3) SHA1(c86ff61844fc94c02625bb812b9062d0649c8fdf) ) /* sprites B2 */
+	ROM_LOAD16_BYTE( "10.3r", 0x080000, 0x20000, CRC(a6451dec) SHA1(553e7a1453b59055fa0b10ca04125543d9f8987c) ) /* sprites C1 */
+	ROM_LOAD16_BYTE( "11.1r", 0x080001, 0x20000, CRC(7fbfdf5e) SHA1(ab67b72dcadb5f2236d29de751de5bf890a9e423) ) /* sprites C2 */
+	ROM_LOAD16_BYTE( "12.3s", 0x0c0000, 0x20000, CRC(90f1e13a) SHA1(3fe9fe62aa9e92c871c791a3b11f96c9a48099a9) ) /* sprites D1 */
+	ROM_LOAD16_BYTE( "13.1s", 0x0c0001, 0x20000, CRC(7d9f5c5e) SHA1(200102532ea9a88c7c708e03f8893c46dff827d1) ) /* sprites D2 */
 
 	ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
 	ROM_LOAD( "4.4a",     0x0000, 0x20000, CRC(b0e0faf9) SHA1(2275d2ef5eee356ccf80b9e9644d16fc30a4d107) ) /* samples */
@@ -1168,30 +1159,26 @@
 	ROM_LOAD( "hn27512p.7a",   0x000000, 0x10000, CRC(765e7baa) SHA1(4d0a50f091b284739b6d9a8ceb4f81999da445fc) )    /* 8x8 tiles */
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "14.3a",       0x000000, 0x20000, CRC(1ecfddaa) SHA1(e71d60ae1a98fe8512498f91cce01c16be9f0871) )
-	ROM_LOAD( "15.3b",       0x020000, 0x20000, CRC(1291a696) SHA1(023b05260214adc39bdba81d5e2aa246b6d74a6a) )
-	ROM_LOAD( "16.1a",       0x040000, 0x20000, CRC(140b47ca) SHA1(6ffd9b7116658a46a124f9085602d88aa143d829) )
-	ROM_LOAD( "17.1b",       0x060000, 0x20000, CRC(7638cccb) SHA1(780d47d3aa248346e0e7abc6e6284542e7392919) )
+	ROM_LOAD( "14.3a", 0x000000, 0x20000, CRC(1ecfddaa) SHA1(e71d60ae1a98fe8512498f91cce01c16be9f0871) )
+	ROM_LOAD( "15.3b", 0x020000, 0x20000, CRC(1291a696) SHA1(023b05260214adc39bdba81d5e2aa246b6d74a6a) )
+	ROM_LOAD( "16.1a", 0x040000, 0x20000, CRC(140b47ca) SHA1(6ffd9b7116658a46a124f9085602d88aa143d829) )
+	ROM_LOAD( "17.1b", 0x060000, 0x20000, CRC(7638cccb) SHA1(780d47d3aa248346e0e7abc6e6284542e7392919) )
 
 	ROM_REGION( 0x080000, "gfx3", 0 )
-	ROM_LOAD( "18.6a",       0x000000, 0x20000, CRC(3fadafd6) SHA1(0cb5387a354c631d5c6aca8f77ecbbc0d175a574) )
-	ROM_LOAD( "19.6b",       0x020000, 0x20000, CRC(ddae9d5b) SHA1(108b202ae7ae124a32400a0a404c7d2b614c60bd) )
-	ROM_LOAD( "20.4b",       0x040000, 0x20000, CRC(08cf7a93) SHA1(fd3278c3fb3ef30ed03c8a95656d86ba82a163d8) )
-	ROM_LOAD( "21.4b",       0x060000, 0x20000, CRC(1ac892f5) SHA1(28364266ca9d1955fb7953f5c2d6f35e114beec6) )
-
-	ROM_REGION( 0x100000, "gfx4", 0 )
-	/* Should all these roms be 0x10000 bytes on this board? */
-	ROM_LOAD16_BYTE( "6.3m",            0x000000, 0x20000, CRC(e7ccdf9f) SHA1(80ffcefc95660471124898a9c2bee55df36bda13) )  /* sprites A1 */
-	ROM_LOAD16_BYTE( "8.3n",            0x040000, 0x20000, CRC(7ef7f880) SHA1(26ba9a76adce24beea3cffa1cb95aeafe6f82f96) )  /* sprites B1 */
-	ROM_LOAD16_BYTE( "10.3r",           0x080000, 0x20000, CRC(a6451dec) SHA1(553e7a1453b59055fa0b10ca04125543d9f8987c) )  /* sprites C1 */
-	ROM_LOAD16_BYTE( "shadoww_12a.xx",  0x0c0000, 0x10000, CRC(9bb07731) SHA1(b799b1958dc9b84797fdab2591e33bd5d28884a3) )  /* sprites D1 */
-	ROM_LOAD16_BYTE( "ryukendn_12b.xx", 0x0e0000, 0x10000, CRC(1773628a) SHA1(e7eacc880f2a4174f17b263bedf8c1bc64007dbd) )  /* sprites D1 */
-
-	ROM_LOAD16_BYTE( "7.1m",            0x000001, 0x20000, CRC(016bec95) SHA1(6a6757c52ca9a2398ea43d1af4a8d5adde6f4cd2) )  /* sprites A2 */
-	ROM_LOAD16_BYTE( "9.1n",            0x040001, 0x20000, CRC(6e9b7fd3) SHA1(c86ff61844fc94c02625bb812b9062d0649c8fdf) )  /* sprites B2 */
-	ROM_LOAD16_BYTE( "11.1r",           0x080001, 0x20000, CRC(7fbfdf5e) SHA1(ab67b72dcadb5f2236d29de751de5bf890a9e423) )  /* sprites C2 */
-	ROM_LOAD16_BYTE( "shadoww_13a.xx",  0x0c0001, 0x10000, CRC(996d2fa5) SHA1(a32526949af3635914927ebbbe684c3de9562a9d) )  /* sprites D2 */
-	ROM_LOAD16_BYTE( "ryukendn_13b.xx", 0x0e0001, 0x10000, CRC(1f43c507) SHA1(29f655442c16677855073284c7ab41059c99c497) )  /* sprites D2 */
+	ROM_LOAD( "18.6a", 0x000000, 0x20000, CRC(3fadafd6) SHA1(0cb5387a354c631d5c6aca8f77ecbbc0d175a574) )
+	ROM_LOAD( "19.6b", 0x020000, 0x20000, CRC(ddae9d5b) SHA1(108b202ae7ae124a32400a0a404c7d2b614c60bd) )
+	ROM_LOAD( "20.4b", 0x040000, 0x20000, CRC(08cf7a93) SHA1(fd3278c3fb3ef30ed03c8a95656d86ba82a163d8) )
+	ROM_LOAD( "21.4b", 0x060000, 0x20000, CRC(1ac892f5) SHA1(28364266ca9d1955fb7953f5c2d6f35e114beec6) )
+
+	ROM_REGION( 0x100000, "gfx4", 0 ) // sprite roms also seen on daughterboard "4M512" with 16 0x10000-sized roms
+	ROM_LOAD16_BYTE( "6.3m",  0x000000, 0x20000, CRC(e7ccdf9f) SHA1(80ffcefc95660471124898a9c2bee55df36bda13) ) /* sprites A1 */
+	ROM_LOAD16_BYTE( "7.1m",  0x000001, 0x20000, CRC(016bec95) SHA1(6a6757c52ca9a2398ea43d1af4a8d5adde6f4cd2) ) /* sprites A2 */
+	ROM_LOAD16_BYTE( "8.3n",  0x040000, 0x20000, CRC(7ef7f880) SHA1(26ba9a76adce24beea3cffa1cb95aeafe6f82f96) ) /* sprites B1 */
+	ROM_LOAD16_BYTE( "9.1n",  0x040001, 0x20000, CRC(6e9b7fd3) SHA1(c86ff61844fc94c02625bb812b9062d0649c8fdf) ) /* sprites B2 */
+	ROM_LOAD16_BYTE( "10.3r", 0x080000, 0x20000, CRC(a6451dec) SHA1(553e7a1453b59055fa0b10ca04125543d9f8987c) ) /* sprites C1 */
+	ROM_LOAD16_BYTE( "11.1r", 0x080001, 0x20000, CRC(7fbfdf5e) SHA1(ab67b72dcadb5f2236d29de751de5bf890a9e423) ) /* sprites C2 */
+	ROM_LOAD16_BYTE( "12.3s", 0x0c0000, 0x20000, CRC(277204f0) SHA1(918e05f10959f2b50c16b6e0dc62e3076c99250e) ) /* sprites D1 */
+	ROM_LOAD16_BYTE( "13.1s", 0x0c0001, 0x20000, CRC(4e56a508) SHA1(f89a6037e602b26d6ce11859e0b43a602b50d985) ) /* sprites D2 */
 
 	ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
 	ROM_LOAD( "4.4a",     0x0000, 0x20000, CRC(b0e0faf9) SHA1(2275d2ef5eee356ccf80b9e9644d16fc30a4d107) ) /* samples */
@@ -1219,27 +1206,26 @@
 	ROM_LOAD( "hn27512p.7a",   0x000000, 0x10000, CRC(765e7baa) SHA1(4d0a50f091b284739b6d9a8ceb4f81999da445fc) )    /* 8x8 tiles */
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "14.3a",       0x000000, 0x20000, CRC(1ecfddaa) SHA1(e71d60ae1a98fe8512498f91cce01c16be9f0871) )
-	ROM_LOAD( "15.3b",       0x020000, 0x20000, CRC(1291a696) SHA1(023b05260214adc39bdba81d5e2aa246b6d74a6a) )
-	ROM_LOAD( "16.1a",       0x040000, 0x20000, CRC(140b47ca) SHA1(6ffd9b7116658a46a124f9085602d88aa143d829) )
-	ROM_LOAD( "17.1b",       0x060000, 0x20000, CRC(7638cccb) SHA1(780d47d3aa248346e0e7abc6e6284542e7392919) )
+	ROM_LOAD( "14.3a", 0x000000, 0x20000, CRC(1ecfddaa) SHA1(e71d60ae1a98fe8512498f91cce01c16be9f0871) )
+	ROM_LOAD( "15.3b", 0x020000, 0x20000, CRC(1291a696) SHA1(023b05260214adc39bdba81d5e2aa246b6d74a6a) )
+	ROM_LOAD( "16.1a", 0x040000, 0x20000, CRC(140b47ca) SHA1(6ffd9b7116658a46a124f9085602d88aa143d829) )
+	ROM_LOAD( "17.1b", 0x060000, 0x20000, CRC(7638cccb) SHA1(780d47d3aa248346e0e7abc6e6284542e7392919) )
 
 	ROM_REGION( 0x080000, "gfx3", 0 )
-	ROM_LOAD( "18.6a",       0x000000, 0x20000, CRC(3fadafd6) SHA1(0cb5387a354c631d5c6aca8f77ecbbc0d175a574) )
-	ROM_LOAD( "19.6b",       0x020000, 0x20000, CRC(ddae9d5b) SHA1(108b202ae7ae124a32400a0a404c7d2b614c60bd) )
-	ROM_LOAD( "20.4b",       0x040000, 0x20000, CRC(08cf7a93) SHA1(fd3278c3fb3ef30ed03c8a95656d86ba82a163d8) )
-	ROM_LOAD( "21.4b",       0x060000, 0x20000, CRC(1ac892f5) SHA1(28364266ca9d1955fb7953f5c2d6f35e114beec6) )
-
-	ROM_REGION( 0x100000, "gfx4", 0 )
-	ROM_LOAD16_BYTE( "6.3m",     0x000000, 0x20000, CRC(e7ccdf9f) SHA1(80ffcefc95660471124898a9c2bee55df36bda13) ) /* sprites A1 */
-	ROM_LOAD16_BYTE( "8.3n",     0x040000, 0x20000, CRC(7ef7f880) SHA1(26ba9a76adce24beea3cffa1cb95aeafe6f82f96) ) /* sprites B1 */
-	ROM_LOAD16_BYTE( "10.3r",    0x080000, 0x20000, CRC(a6451dec) SHA1(553e7a1453b59055fa0b10ca04125543d9f8987c) ) /* sprites C1 */
-	ROM_LOAD16_BYTE( "12.3s",    0x0c0000, 0x20000, CRC(277204f0) SHA1(918e05f10959f2b50c16b6e0dc62e3076c99250e) ) /* sprites D1 */
-
-	ROM_LOAD16_BYTE( "7.1m",     0x000001, 0x20000, CRC(016bec95) SHA1(6a6757c52ca9a2398ea43d1af4a8d5adde6f4cd2) ) /* sprites A2 */
-	ROM_LOAD16_BYTE( "9.1n",     0x040001, 0x20000, CRC(6e9b7fd3) SHA1(c86ff61844fc94c02625bb812b9062d0649c8fdf) ) /* sprites B2 */
-	ROM_LOAD16_BYTE( "11.1r",    0x080001, 0x20000, CRC(7fbfdf5e) SHA1(ab67b72dcadb5f2236d29de751de5bf890a9e423) ) /* sprites C2 */
-	ROM_LOAD16_BYTE( "13.1s",    0x0c0001, 0x20000, CRC(4e56a508) SHA1(f89a6037e602b26d6ce11859e0b43a602b50d985) ) /* sprites D2 */
+	ROM_LOAD( "18.6a", 0x000000, 0x20000, CRC(3fadafd6) SHA1(0cb5387a354c631d5c6aca8f77ecbbc0d175a574) )
+	ROM_LOAD( "19.6b", 0x020000, 0x20000, CRC(ddae9d5b) SHA1(108b202ae7ae124a32400a0a404c7d2b614c60bd) )
+	ROM_LOAD( "20.4b", 0x040000, 0x20000, CRC(08cf7a93) SHA1(fd3278c3fb3ef30ed03c8a95656d86ba82a163d8) )
+	ROM_LOAD( "21.4b", 0x060000, 0x20000, CRC(1ac892f5) SHA1(28364266ca9d1955fb7953f5c2d6f35e114beec6) )
+
+	ROM_REGION( 0x100000, "gfx4", 0 ) // sprite roms also seen on daughterboard "4M512" with 16 0x10000-sized roms
+	ROM_LOAD16_BYTE( "6.3m",  0x000000, 0x20000, CRC(e7ccdf9f) SHA1(80ffcefc95660471124898a9c2bee55df36bda13) ) /* sprites A1 */
+	ROM_LOAD16_BYTE( "7.1m",  0x000001, 0x20000, CRC(016bec95) SHA1(6a6757c52ca9a2398ea43d1af4a8d5adde6f4cd2) ) /* sprites A2 */
+	ROM_LOAD16_BYTE( "8.3n",  0x040000, 0x20000, CRC(7ef7f880) SHA1(26ba9a76adce24beea3cffa1cb95aeafe6f82f96) ) /* sprites B1 */
+	ROM_LOAD16_BYTE( "9.1n",  0x040001, 0x20000, CRC(6e9b7fd3) SHA1(c86ff61844fc94c02625bb812b9062d0649c8fdf) ) /* sprites B2 */
+	ROM_LOAD16_BYTE( "10.3r", 0x080000, 0x20000, CRC(a6451dec) SHA1(553e7a1453b59055fa0b10ca04125543d9f8987c) ) /* sprites C1 */
+	ROM_LOAD16_BYTE( "11.1r", 0x080001, 0x20000, CRC(7fbfdf5e) SHA1(ab67b72dcadb5f2236d29de751de5bf890a9e423) ) /* sprites C2 */
+	ROM_LOAD16_BYTE( "12.3s", 0x0c0000, 0x20000, CRC(277204f0) SHA1(918e05f10959f2b50c16b6e0dc62e3076c99250e) ) /* sprites D1 */
+	ROM_LOAD16_BYTE( "13.1s", 0x0c0001, 0x20000, CRC(4e56a508) SHA1(f89a6037e602b26d6ce11859e0b43a602b50d985) ) /* sprites D2 */
 
 	ROM_REGION( 0x40000, "oki", 0 ) /* 128k for ADPCM samples - sound chip is OKIM6295 */
 	ROM_LOAD( "4.4a",     0x0000, 0x20000, CRC(b0e0faf9) SHA1(2275d2ef5eee356ccf80b9e9644d16fc30a4d107) ) /* samples */
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/galaga.cpp mame-0.224+dfsg.1/src/mame/drivers/galaga.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/galaga.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/galaga.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -592,16 +592,16 @@
 
 - bosco: there appears to be a bug in the code at 0BB1, which handles communication
   with the 06XX custom chip. First it saves in A' the command to write, then if a
-  transfer is still in progress it jups to 0BC1, does other things, then restores
+  transfer is still in progress it jumps to 0BC1, does other things, then restores
   the command from A' and stores it in RAM. At that point (0BE1) it checks again if
-  a transfer is in progress. If the trasnfer has terminated, it jumps to 0BEB, which
+  a transfer is in progress. If the transfer has terminated, it jumps to 0BEB, which
   restores the command from RAM, and jumps back to 0BBA to send the command. However,
   the instruction at 0BBA is ex af,af', so the command is overwritten with garbage.
   There's also an exx at 0BBB which seems unnecessary but that's harmless.
   Anyway, what this bug means is that we must make sure that the 06XX generates NMIs
   quickly enough to ensure that 0BB1 is usually not called with a transfer still is
-    progress. It doesn't seem possible to prevent it altogether though, so we can only
-    hope that the transfer doesn't terminate in the middle of the function.
+  progress. It doesn't seem possible to prevent it altogether though, so we can only
+  hope that the transfer doesn't terminate in the middle of the function.
 
 - bosco: we have two dumps of the sound shape ROM, "prom.1d" and "bosco.spr". Music
   changes a lot from one version to the other.
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/galaxian.cpp mame-0.224+dfsg.1/src/mame/drivers/galaxian.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/galaxian.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/galaxian.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -8351,7 +8351,7 @@
 	ROM_LOAD( "6l.bpr",       0x0000, 0x0020, CRC(c3ac9467) SHA1(f382ad5a34d282056c78a5ec00c30ec43772bae2) )
 ROM_END
 
-/* Marti Colls (Falgas) bootleg */
+// Marti Colls (Falgas) bootleg
 ROM_START( zerotimemc )
 	ROM_REGION( 0x4000, "maincpu", 0 )
 	ROM_LOAD( "4_7k.bin", 0x0000, 0x0800, CRC(ac64aabe) SHA1(1cd834bf8b387428639dffd5e4b0ee72fa8aafdf) )
@@ -8366,9 +8366,42 @@
 
 	/* Not dumped on the Marti Colls PCB, taken from the parent set */
 	ROM_REGION( 0x0020, "proms", 0 )
-	ROM_LOAD( "6l.bpr",       0x0000, 0x0020, CRC(c3ac9467) SHA1(f382ad5a34d282056c78a5ec00c30ec43772bae2) )
+	ROM_LOAD( "6l.bpr",    0x0000, 0x0020, CRC(c3ac9467) SHA1(f382ad5a34d282056c78a5ec00c30ec43772bae2) )
 ROM_END
 
+// Unknown manufacturer / bootleger
+ROM_START( zerotimeu )
+	ROM_REGION( 0x4000, "maincpu", 0 )
+	ROM_LOAD( "1.bin", 0x0000, 0x0800, CRC(ac64aabe) SHA1(1cd834bf8b387428639dffd5e4b0ee72fa8aafdf) )
+	ROM_LOAD( "2.bin", 0x0800, 0x0800, CRC(a433067e) SHA1(1aed1a2153c4a32a9996fc709e544f2063885599) )
+	ROM_LOAD( "3.bin", 0x1000, 0x0800, CRC(aaf038d4) SHA1(2d070fe7c4e9b26092f0f12a9db3392f7d8a65f1) )
+	ROM_LOAD( "4.bin", 0x1800, 0x0800, CRC(786d690a) SHA1(50c5c07941006e3b71afbf057d27daa2f2274925) )
+	ROM_LOAD( "5.bin", 0x2000, 0x0800, CRC(af9260d7) SHA1(955e466a8989993351dc69d73ca322c1c9af7b63) )
+
+	ROM_REGION( 0x1000, "gfx1", 0 )
+	ROM_LOAD( "hj.bin", 0x0000, 0x0800, CRC(84decf98) SHA1(2e565cb6057b1816a6b4541e6dfadd3c3762fa36) )
+	ROM_LOAD( "kl.bin", 0x0800, 0x0800, CRC(18df5c90) SHA1(6d6151c95c4f0da24e21934a360a40c5526f0be2) )
+
+	ROM_REGION( 0x0020, "proms", 0 )
+	ROM_LOAD( "82s123.bin", 0x0000, 0x0020, CRC(c3ac9467) SHA1(f382ad5a34d282056c78a5ec00c30ec43772bae2) )
+ROM_END
+
+// Cirsa bootleg
+ROM_START( galaxcirsa )
+	ROM_REGION( 0x4000, "maincpu", 0 )
+	ROM_LOAD( "cirsagal.1", 0x0000, 0x0800, CRC(ac64aabe) SHA1(1cd834bf8b387428639dffd5e4b0ee72fa8aafdf) )
+	ROM_LOAD( "cirsagal.2", 0x0800, 0x0800, CRC(a433067e) SHA1(1aed1a2153c4a32a9996fc709e544f2063885599) )
+	ROM_LOAD( "cirsagal.3", 0x1000, 0x0800, CRC(7c86fc8a) SHA1(ea7e16cfd765fb992bd476796e2e3a5f87e8360c) )
+	ROM_LOAD( "cirsagal.4", 0x1800, 0x0800, CRC(786d690a) SHA1(50c5c07941006e3b71afbf057d27daa2f2274925) )
+	ROM_LOAD( "cirsagal.5", 0x2000, 0x0800, CRC(863a688f) SHA1(fa1f92476e10af9a63290ed30359bc88e7721528) )
+
+	ROM_REGION( 0x1000, "gfx1", 0 )
+	ROM_LOAD( "cirsagal.h", 0x0000, 0x0800, CRC(6babd14e) SHA1(c8601803bc74c1089f767c4672376d4788dc4f49) )
+	ROM_LOAD( "cirsagal.i", 0x0800, 0x0800, CRC(0997e81b) SHA1(a5c6b2b59f7a807b44e5d49c54c42d1abf2fc71a) )
+
+	ROM_REGION( 0x0020, "proms", 0 )
+	ROM_LOAD( "6113_1.bin", 0x0000, 0x0020, CRC(c3ac9467) SHA1(f382ad5a34d282056c78a5ec00c30ec43772bae2) )
+ROM_END
 
 ROM_START( starfght )
 	ROM_REGION( 0x4000, "maincpu", 0 )
@@ -10274,35 +10307,8 @@
 	ROM_REGION( 0x8000, "maincpu", 0 )
 	ROM_LOAD( "sirio2_1.bin",      0x0000, 0x0800, CRC(1e6a4b49) SHA1(6f71f10e73b7a385cd455e74129544cd58932781) )
 	ROM_LOAD( "sirio2_2.bin",      0x0800, 0x0800, CRC(0b316f33) SHA1(687cbc9b1a7b9ead836a074f8418b1fe96b9e1bf) )
-	ROM_LOAD( "sirio2_3.bin",      0x1000, 0x0800, CRC(716eaa10) SHA1(780fc785e6651f19dc1a0ccf48cf9485d6562a71) ) //  = 929 smooncrs Super Moon Cresta
-	ROM_LOAD( "sirio2_4.bin",      0x1800, 0x0800, CRC(092ab94b) SHA1(5a71aeead0968b660e6fb42e57564bd267cc8ba6) )
-	ROM_LOAD( "sirio2_5.bin",      0x2000, 0x0800, CRC(413a836a) SHA1(64c95b8ad78e19b718a68fdbd03c72ee0603396d) )
-	ROM_LOAD( "sirio2_6.bin",      0x2800, 0x0800, CRC(2a9c3f13) SHA1(a3b1c9e11a18fdf94517457f80b3a87a6c2c96e6) )
-	ROM_LOAD( "sirio2_7.bin",      0x3000, 0x0800, CRC(eafd4d02) SHA1(b75ed5358646d8a377ccd1f282136e638aaa9d0c) )
-	ROM_LOAD( "sirio2_8.bin",      0x3800, 0x0800, CRC(6e614bd6) SHA1(52da7f6ae444352c035c1bf29f380812ccd535de) )
-
-	ROM_REGION( 0x2000, "gfx1", 0 )
-	ROM_LOAD( "sirio2_f2.bin",     0x0000, 0x0800, CRC(528da705) SHA1(d726ee18b79774c982f88afb2a508eb5d5783193) ) // == 1h_1_10.bin
-	ROM_LOAD( "sirio2_f4.bin",     0x0800, 0x0200, CRC(8acfabb9) SHA1(c212be2aa158161365f712e7a5a25f27bf6412f3) )
-	ROM_CONTINUE(                  0x0c00, 0x0200 )  // this version of the gfx ROMs has two
-	ROM_CONTINUE(                  0x0a00, 0x0200 )  // groups of 16 sprites swapped
-	ROM_CONTINUE(                  0x0e00, 0x0200 )
-	ROM_LOAD( "sirio2_f1.bin",     0x1000, 0x0800, CRC(4e79ff6b) SHA1(f72386a3766a7fcc7b4b8cedfa58b8d57f911f6f) ) // == 1k_1_11.bin
-	ROM_LOAD( "sirio2_f3.bin",     0x1800, 0x0200, CRC(e0edccbd) SHA1(0839a4c9b6e863d12253ae8e1732e80e08702228) ) // == 11.chr
-	ROM_CONTINUE(                  0x1c00, 0x0200 )
-	ROM_CONTINUE(                  0x1a00, 0x0200 )
-	ROM_CONTINUE(                  0x1e00, 0x0200 )
-
-	ROM_REGION( 0x0020, "proms", 0 )
-	ROM_LOAD( "sirio2_im5610.bin", 0x0000, 0x0020, CRC(6a0c7d87) SHA1(140335d85c67c75b65689d4e76d29863c209cf32) ) // Compatible with 82s123 PROM
-ROM_END
-
-ROM_START( sirio2a )
-	ROM_REGION( 0x8000, "maincpu", 0 )
-	ROM_LOAD( "sirio2_1.bin",      0x0000, 0x0800, CRC(1e6a4b49) SHA1(6f71f10e73b7a385cd455e74129544cd58932781) )
-	ROM_LOAD( "sirio2_2.bin",      0x0800, 0x0800, CRC(0b316f33) SHA1(687cbc9b1a7b9ead836a074f8418b1fe96b9e1bf) )
 	ROM_LOAD( "sirio2_3.bin",      0x1000, 0x0800, CRC(716eaa10) SHA1(780fc785e6651f19dc1a0ccf48cf9485d6562a71) )
-	ROM_LOAD( "sirio2b_4.bin",     0x1800, 0x0800, CRC(73d0b1f2) SHA1(102f609f586206d28b3a61c43fd243715866dd18) )
+	ROM_LOAD( "sirio2_4.bin",      0x1800, 0x0800, CRC(73d0b1f2) SHA1(102f609f586206d28b3a61c43fd243715866dd18) )
 	ROM_LOAD( "sirio2_5.bin",      0x2000, 0x0800, CRC(413a836a) SHA1(64c95b8ad78e19b718a68fdbd03c72ee0603396d) )
 	ROM_LOAD( "sirio2_6.bin",      0x2800, 0x0800, CRC(2a9c3f13) SHA1(a3b1c9e11a18fdf94517457f80b3a87a6c2c96e6) )
 	ROM_LOAD( "sirio2_7.bin",      0x3000, 0x0800, CRC(eafd4d02) SHA1(b75ed5358646d8a377ccd1f282136e638aaa9d0c) )
@@ -10310,18 +10316,18 @@
 
 	ROM_REGION( 0x2000, "gfx1", 0 )
 	ROM_LOAD( "sirio2_f2.bin",     0x0000, 0x0800, CRC(528da705) SHA1(d726ee18b79774c982f88afb2a508eb5d5783193) )
-	ROM_LOAD( "sirio2_f4b.bin",    0x0800, 0x0200, CRC(5a4b17ea) SHA1(8a879dc34fdecc8a121c4a87abb981212fb05945) )
-	ROM_CONTINUE(                  0x0c00, 0x0200 )  // this version of the gfx ROMs has two
+	ROM_LOAD( "sirio2_f4.bin",     0x0800, 0x0200, CRC(5a4b17ea) SHA1(8a879dc34fdecc8a121c4a87abb981212fb05945) )
+	ROM_CONTINUE(                  0x0c00, 0x0200 )  // this version of the GFX ROMs has two
 	ROM_CONTINUE(                  0x0a00, 0x0200 )  // groups of 16 sprites swapped
 	ROM_CONTINUE(                  0x0e00, 0x0200 )
-	ROM_LOAD( "sirio2_f1b.bin",    0x1000, 0x0800, CRC(b3a10228) SHA1(d7051f9b8c4f76048b6de7f1705e605c7ec467f3) )
+	ROM_LOAD( "sirio2_f1.bin",     0x1000, 0x0800, CRC(4e79ff6b) SHA1(f72386a3766a7fcc7b4b8cedfa58b8d57f911f6f) )
 	ROM_LOAD( "sirio2_f3.bin",     0x1800, 0x0200, CRC(e0edccbd) SHA1(0839a4c9b6e863d12253ae8e1732e80e08702228) )
 	ROM_CONTINUE(                  0x1c00, 0x0200 )
 	ROM_CONTINUE(                  0x1a00, 0x0200 )
 	ROM_CONTINUE(                  0x1e00, 0x0200 )
 
 	ROM_REGION( 0x0020, "proms", 0 )
-	ROM_LOAD( "sirio2_im5610.bin", 0x0000, 0x0020, CRC(6a0c7d87) SHA1(140335d85c67c75b65689d4e76d29863c209cf32) ) // Readed as 82s123
+	ROM_LOAD( "sirio2_im5610.bin", 0x0000, 0x0020, CRC(6a0c7d87) SHA1(140335d85c67c75b65689d4e76d29863c209cf32) ) // Compatible with 82s123 PROM
 ROM_END
 
 ROM_START( ataqandr )
@@ -11919,6 +11925,29 @@
 	ROM_LOAD( "c01s.6e",      0x0000, 0x0020, BAD_DUMP CRC(4e3caeab) SHA1(a25083c3e36d28afdefe4af6e6d4f3155e303625) )
 ROM_END
 
+ROM_START( spctrek ) // Two PCBs, one labeled MU-1 and the other probably MU-2 (partially covered with a sticker, not readable)
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "7301.bin", 0x0000, 0x0800, CRC(65cc2c6d) SHA1(75f6317da58ac0ef42c63fc8a641135036c2082c) ) // only different ROM from scrambp (4 bytes at 0x134-x137 and BURROS instead of KONAMI)
+	ROM_LOAD( "7202.bin", 0x0800, 0x0800, CRC(66ebc070) SHA1(ada52d7880185d1ac3a39c94896d5127ea05b14a) )
+	ROM_LOAD( "7103.bin", 0x1000, 0x0800, CRC(317548fd) SHA1(687c309d476cd5fc830d90e9e6293d1dcab96df7) )
+	ROM_LOAD( "t4.bin",   0x1800, 0x0800, CRC(dd380a22) SHA1(125e713a58cc5f2c1e38f67dad29f8c985ce5a8b) )
+	ROM_LOAD( "7105.bin", 0x2000, 0x0800, CRC(fa4f1a70) SHA1(9d797eaab0f19a2ed003f782716719c9d752bd56) )
+	ROM_LOAD( "t6.bin",   0x2800, 0x0800, CRC(9fd96374) SHA1(c8456dd8a012353a023a2d3fa5d508e49c36ace8) )
+	ROM_LOAD( "t7.bin",   0x3000, 0x0800, CRC(88ac07a0) SHA1(c57061db5984b472039356bf84a050b5b66e3813) )
+	ROM_LOAD( "7108.bin", 0x3800, 0x0800, CRC(d20088ee) SHA1(4b2deb64f1185780e5b6d1527ed5f691591b9ea0) )
+
+	ROM_REGION( 0x10000, "audiocpu", 0 )
+	ROM_LOAD( "s1.bin",   0x0000, 0x0800, CRC(be037cf6) SHA1(f28e5ead496e70beaada24775aa58bd5d75f2d25) )
+	ROM_LOAD( "s2.bin",   0x0800, 0x0800, CRC(de7912da) SHA1(8558b4eff5d7e63029b325edef9914feda5834c3) )
+	ROM_LOAD( "s3.bin",   0x1000, 0x0800, CRC(ba2fa933) SHA1(1f976d8595706730e29f93027e7ab4620075c078) )
+
+	ROM_REGION( 0x1000, "gfx1", 0 )
+	ROM_LOAD( "t9.bin",   0x0000, 0x0800, CRC(4708845b) SHA1(a8b1ad19a95a9d35050a2ab7194cc96fc5afcdc9) )
+	ROM_LOAD( "10.bin",   0x0800, 0x0800, CRC(11fd2887) SHA1(69844e48bb4d372cac7ae83c953df573c7ecbb7f) )
+
+	ROM_REGION( 0x0020, "proms", 0 ) // not dumped for this set, probably same as others
+	ROM_LOAD( "c01s.6e",  0x0000, 0x0020, BAD_DUMP CRC(4e3caeab) SHA1(a25083c3e36d28afdefe4af6e6d4f3155e303625) )
+ROM_END
 
 ROM_START( scrambp )
 	ROM_REGION( 0x10000, "maincpu", 0 )
@@ -13093,6 +13122,8 @@
 GAME( 1979, galaktron,   galaxian, galaxian,   zerotime,   galaxian_state, init_galaxian,   ROT90,  "bootleg (Petaco S.A.)",                      "Galaktron (Petaco S.A.)",                                                                      MACHINE_SUPPORTS_SAVE )
 GAME( 1979, zerotimed,   galaxian, galaxian,   zerotime,   galaxian_state, init_galaxian,   ROT90,  "bootleg (Datamat)",                          "Zero Time (Datamat)",                                                                          MACHINE_SUPPORTS_SAVE ) // a 1994 bootleg of the Petaco bootleg
 GAME( 1979, zerotimemc,  galaxian, galaxian,   zerotime,   galaxian_state, init_galaxian,   ROT90,  "bootleg (Marti Colls)",                      "Zero Time (Marti Colls)",                                                                      MACHINE_SUPPORTS_SAVE )
+GAME( 1979, zerotimeu,   galaxian, galaxian,   zerotime,   galaxian_state, init_galaxian,   ROT90,  "bootleg",                                    "Zero Time (Spanish bootleg)",                                                                  MACHINE_SUPPORTS_SAVE )
+GAME( 1979, galaxcirsa,  galaxian, galaxian,   zerotime,   galaxian_state, init_galaxian,   ROT90,  "bootleg (Cirsa)",                            "Galaxian (Cirsa Spanish bootleg)",                                                             MACHINE_SUPPORTS_SAVE )
 GAME( 1979, starfght,    galaxian, galaxian,   swarm,      galaxian_state, init_galaxian,   ROT90,  "bootleg (Jeutel)",                           "Star Fighter",                                                                                 MACHINE_SUPPORTS_SAVE )
 GAME( 1979, galaxbsf,    galaxian, galaxian,   galaxian,   galaxian_state, init_galaxian,   ROT90,  "bootleg",                                    "Galaxian (bootleg, set 1)",                                                                    MACHINE_SUPPORTS_SAVE )
 GAME( 1979, galaxianbl,  galaxian, galaxian,   galaxianbl, galaxian_state, init_galaxian,   ROT90,  "bootleg",                                    "Galaxian (bootleg, set 2)",                                                                    MACHINE_SUPPORTS_SAVE )
@@ -13229,8 +13260,7 @@
 GAME( 1980?,smooncrs,    mooncrst, mooncrst,   smooncrs,   galaxian_state, init_mooncrsu,   ROT90,  "bootleg (Gremlin)",            "Super Moon Cresta (Gremlin, bootleg)",                       MACHINE_SUPPORTS_SAVE ) // Probably a bootleg, still has the 'POR' text in the bottom right corner that the Sonic version has?!
 GAME( 1980, mooncrstso,  mooncrst, mooncrst,   mooncptc,   galaxian_state, init_mooncrsu,   ROT90,  "bootleg (Sonic)",              "Moon Cresta (SegaSA / Sonic)",                               MACHINE_SUPPORTS_SAVE )
 GAME( 1980?,mooncptc,    mooncrst, mooncrst,   mooncptc,   galaxian_state, init_mooncrsu,   ROT90,  "bootleg (Petaco S.A.)",        "Moon Cresta (Petaco S.A. Spanish bootleg)",                  MACHINE_SUPPORTS_SAVE )
-GAME( 1980?,sirio2,      mooncrst, mooncrst,   mooncptc,   galaxian_state, init_mooncrsu,   ROT90,  "bootleg (Calfesa S.L.)",       "Sirio II (Calfesa S.L. Spanish Moon Cresta bootleg, set 1)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE) // Ship explodes when starting a game, the game resets on each demo loop, behaviour on the demo seems wrong, as the ships explodes after a good assemble
-GAME( 1980?,sirio2a,     mooncrst, mooncrst,   mooncptc,   galaxian_state, init_mooncrsu,   ROT90,  "bootleg (Calfesa S.L.)",       "Sirio II (Calfesa S.L. Spanish Moon Cresta bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1980?,sirio2,      mooncrst, mooncrst,   mooncptc,   galaxian_state, init_mooncrsu,   ROT90,  "bootleg (Calfesa S.L.)",       "Sirio II (Calfesa S.L. Spanish Moon Cresta bootleg)",         MACHINE_SUPPORTS_SAVE )
 GAME( 1980?,ataqandr,    mooncrst, mooncrst,   mooncptc,   galaxian_state, init_mooncrsu,   ROT90,  "bootleg (FAR S.A.)",           "Ataque Androide - Moon Cresta (FAR S.A. Spanish bootleg)",   MACHINE_SUPPORTS_SAVE )
 // There may be an alternate version called "Star Crest" according to flyers; is it the same?
 GAME( 1980?,sstarcrs,    mooncrst, mooncrst,   mooncrsg,   galaxian_state, init_mooncrsu,   ROT90,  "bootleg (Taito do Brasil)",    "Super Star Crest",                                       MACHINE_SUPPORTS_SAVE )
@@ -13337,22 +13367,23 @@
 GAME( 1981, theendss,    theend,   theend,     theend,     galaxian_state, init_theend,     ROT90,  "bootleg (Sonic)",                    "The End (SegaSA / Sonic)",      MACHINE_SUPPORTS_SAVE )
 GAME( 1981, takeoff,     theend,   takeoff,    explorer,   galaxian_state, init_explorer,   ROT90,  "bootleg (Sidam)",                    "Take Off (bootleg of The End)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // colors likely need bitswap<8> somewhere; needs different sound timer. reference: https://www.youtube.com/watch?v=iPYX3yJORTE
 
-GAME( 1981, scramble,    0,        scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "Konami",                             "Scramble",                                               MACHINE_SUPPORTS_SAVE )
-GAME( 1981, scrambles,   scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "Konami (Stern Electronics license)", "Scramble (Stern Electronics set 1)",                     MACHINE_SUPPORTS_SAVE )
-GAME( 1981, scrambles2,  scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "Konami (Stern Electronics license)", "Scramble (Stern Electronics set 2)",                     MACHINE_SUPPORTS_SAVE )
-GAME( 1981, strfbomb,    scramble, scramble,   strfbomb,   galaxian_state, init_scramble,   ROT90,  "bootleg (Omni)",                     "Strafe Bomb (bootleg of Scramble)",                      MACHINE_SUPPORTS_SAVE )
-GAME( 1981, explorer,    scramble, explorer,   explorer,   galaxian_state, init_explorer,   ROT90,  "bootleg (Sidam)",                    "Explorer (bootleg of Scramble)",                         MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // needs different sound timer
-GAME( 1981, scramblebf,  scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Karateco)",                 "Scramble (Karateco, French bootleg)",                    MACHINE_SUPPORTS_SAVE )
-GAME( 1981, scrambp,     scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Billport S.A.)",            "Impacto (Billport S.A., Spanish bootleg of Scramble)",   MACHINE_SUPPORTS_SAVE ) // similar to the Karateco set above
-GAME( 1981, scramce,     scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Centromatic S.A.)",         "Scramble (Centromatic S.A., Spanish bootleg)",           MACHINE_SUPPORTS_SAVE ) // similar to above
-GAME( 1981, scrampt,     scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Petaco S.A.)",              "Scramble (Petaco S.A., Spanish bootleg)",                MACHINE_SUPPORTS_SAVE ) // ^^
-GAME( 1981, scramrf,     scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Recreativos Franco)",       "Scramble (Recreativos Franco, Spanish bootleg)",         MACHINE_SUPPORTS_SAVE )
-GAME( 1981, offensiv,    scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Video Dens)",               "Offensive (Spanish bootleg of Scramble)",                MACHINE_SUPPORTS_SAVE )
-GAME( 1981, ncentury,    scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Petaco S.A.)",              "New Century (Spanish bootleg of Scramble)",              MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // irq isn't enabled correctly
-GAME( 1981, scrammr,     scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Model Racing)",             "Scramble (Model Racing, Italian bootleg)",               MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // irq isn't enabled correctly
-GAME( 1981, scramblebb,  scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg?",                           "Scramble (bootleg?)",                                    MACHINE_SUPPORTS_SAVE )
-GAME( 1981, kamikazesp,  scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Euromatic S.A.)",           "Kamikaze (Euromatic S.A., Spanish bootleg of Scramble)", MACHINE_SUPPORTS_SAVE )
-GAME( 198?, bomber,      scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Alca)",                     "Bomber (bootleg of Scramble)",                           MACHINE_SUPPORTS_SAVE )
+GAME( 1981, scramble,    0,        scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "Konami",                             "Scramble",                                                  MACHINE_SUPPORTS_SAVE )
+GAME( 1981, scrambles,   scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "Konami (Stern Electronics license)", "Scramble (Stern Electronics set 1)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1981, scrambles2,  scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "Konami (Stern Electronics license)", "Scramble (Stern Electronics set 2)",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1981, strfbomb,    scramble, scramble,   strfbomb,   galaxian_state, init_scramble,   ROT90,  "bootleg (Omni)",                     "Strafe Bomb (bootleg of Scramble)",                         MACHINE_SUPPORTS_SAVE )
+GAME( 1981, explorer,    scramble, explorer,   explorer,   galaxian_state, init_explorer,   ROT90,  "bootleg (Sidam)",                    "Explorer (bootleg of Scramble)",                            MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // needs different sound timer
+GAME( 1981, scramblebf,  scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Karateco)",                 "Scramble (Karateco, French bootleg)",                       MACHINE_SUPPORTS_SAVE )
+GAME( 1981, scrambp,     scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Billport S.A.)",            "Impacto (Billport S.A., Spanish bootleg of Scramble)",      MACHINE_SUPPORTS_SAVE ) // similar to the Karateco set above
+GAME( 1981, spctrek,     scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Video Game S.A.)",          "Space Trek (Video Game S.A., Spanish bootleg of Scramble)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, scramce,     scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Centromatic S.A.)",         "Scramble (Centromatic S.A., Spanish bootleg)",              MACHINE_SUPPORTS_SAVE ) // similar to above
+GAME( 1981, scrampt,     scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Petaco S.A.)",              "Scramble (Petaco S.A., Spanish bootleg)",                   MACHINE_SUPPORTS_SAVE ) // ^^
+GAME( 1981, scramrf,     scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Recreativos Franco)",       "Scramble (Recreativos Franco, Spanish bootleg)",            MACHINE_SUPPORTS_SAVE )
+GAME( 1981, offensiv,    scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Video Dens)",               "Offensive (Spanish bootleg of Scramble)",                   MACHINE_SUPPORTS_SAVE )
+GAME( 1981, ncentury,    scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Petaco S.A.)",              "New Century (Spanish bootleg of Scramble)",                 MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // irq isn't enabled correctly
+GAME( 1981, scrammr,     scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Model Racing)",             "Scramble (Model Racing, Italian bootleg)",                  MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // irq isn't enabled correctly
+GAME( 1981, scramblebb,  scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg?",                           "Scramble (bootleg?)",                                       MACHINE_SUPPORTS_SAVE )
+GAME( 1981, kamikazesp,  scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Euromatic S.A.)",           "Kamikaze (Euromatic S.A., Spanish bootleg of Scramble)",    MACHINE_SUPPORTS_SAVE )
+GAME( 198?, bomber,      scramble, scramble,   scramble,   galaxian_state, init_scramble,   ROT90,  "bootleg (Alca)",                     "Bomber (bootleg of Scramble)",                              MACHINE_SUPPORTS_SAVE )
 
 GAME( 1981, atlantis,    0,        theend,     atlantis,   galaxian_state, init_atlantis,   ROT90,  "Comsoft", "Battle of Atlantis (set 1)", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, atlantis2,   atlantis, theend,     atlantis,   galaxian_state, init_atlantis,   ROT90,  "Comsoft", "Battle of Atlantis (set 2)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/galaxy.cpp mame-0.224+dfsg.1/src/mame/drivers/galaxy.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/galaxy.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/galaxy.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -21,6 +21,10 @@
 03/01/2001 Snapshot loading added.
 01/01/2001 Preliminary driver.
 
+ToDo:
+- pacmanp not showing its hi-res graphics - get black screen
+- is the hack in the video still needed? commenting it out made no difference.
+
 ***************************************************************************/
 
 #include "emu.h"
@@ -28,13 +32,8 @@
 
 #include "cpu/z80/z80.h"
 #include "formats/gtp_cas.h"
-#include "imagedev/cassette.h"
-#include "imagedev/snapquik.h"
-#include "machine/ram.h"
 #include "sound/ay8910.h"
 #include "emupal.h"
-#include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
 
@@ -49,19 +48,21 @@
 
 void galaxy_state::galaxy_mem(address_map &map)
 {
-	map(0x0000, 0x0fff).rom();
-	map(0x2000, 0x2037).mirror(0x07c0).r(FUNC(galaxy_state::galaxy_keyboard_r));
-	map(0x2038, 0x203f).mirror(0x07c0).w(FUNC(galaxy_state::galaxy_latch_w));
+	map(0x0000, 0x1fff).rom();
+	map(0x2000, 0x2037).mirror(0x07c0).r(FUNC(galaxy_state::keyboard_r));
+	map(0x2038, 0x203f).mirror(0x07c0).w(FUNC(galaxy_state::latch_w));
+	// see init_galaxy for ram placement
 }
 
 void galaxy_state::galaxyp_mem(address_map &map)
 {
 	map(0x0000, 0x0fff).rom(); // ROM A
 	map(0x1000, 0x1fff).rom(); // ROM B
-	map(0x2000, 0x2037).mirror(0x07c0).r(FUNC(galaxy_state::galaxy_keyboard_r));
-	map(0x2038, 0x203f).mirror(0x07c0).w(FUNC(galaxy_state::galaxy_latch_w));
-	map(0xe000, 0xefff).rom(); // ROM C
-	map(0xf000, 0xffff).rom(); // ROM D
+	map(0x2000, 0x2037).mirror(0x07c0).r(FUNC(galaxy_state::keyboard_r));
+	map(0x2038, 0x203f).mirror(0x07c0).w(FUNC(galaxy_state::latch_w));
+	map(0x2800, 0xdfff).ram();
+	map(0xe000, 0xefff).rom().region("maincpu",0x2000); // ROM C
+	map(0xf000, 0xffff).rom().region("maincpu",0x3000); // ROM D
 }
 
 /* 2008-05 FP:
@@ -70,7 +71,7 @@
 - "Break" is mapped to 'F1'
 - "Repeat" is mapped to 'F2'                           */
 
-static INPUT_PORTS_START (galaxy_common)
+static INPUT_PORTS_START (galaxy)
 	PORT_START("LINE0")
 		PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
 		PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)       PORT_CHAR('A')
@@ -140,24 +141,12 @@
 		PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
 		PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
 		PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
-INPUT_PORTS_END
-
-static INPUT_PORTS_START( galaxy )
-	PORT_INCLUDE( galaxy_common )
-	PORT_START("ROM2")
-		PORT_CONFNAME(0x01, 0x01, "ROM 2")
-			PORT_CONFSETTING(0x01, "Installed")
-			PORT_CONFSETTING(0x00, "Not installed")
-INPUT_PORTS_END
 
-static INPUT_PORTS_START( galaxyp )
-	PORT_INCLUDE( galaxy_common )
+	PORT_START("LINE7")
 INPUT_PORTS_END
 
-#define XTAL 6144000
-
 /* F4 Character Displayer */
-static const gfx_layout galaxy_charlayout =
+static const gfx_layout charlayout =
 {
 	8, 16,                  /* 8 x 16 characters */
 	128,                    /* 128 characters */
@@ -171,19 +160,17 @@
 };
 
 static GFXDECODE_START( gfx_galaxy )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, galaxy_charlayout, 0, 1 )
+	GFXDECODE_ENTRY( "chargen", 0x0000, charlayout, 0, 1 )
 GFXDECODE_END
 
 
 void galaxy_state::galaxy(machine_config &config)
 {
 	/* basic machine hardware */
-	Z80(config, m_maincpu, XTAL / 2);
+	Z80(config, m_maincpu, 6'144'000 / 2);
 	m_maincpu->set_addrmap(AS_PROGRAM, &galaxy_state::galaxy_mem);
-	m_maincpu->set_vblank_int("screen", FUNC(galaxy_state::galaxy_interrupt));
-	m_maincpu->set_irq_acknowledge_callback(FUNC(galaxy_state::galaxy_irq_callback));
-
-	MCFG_MACHINE_RESET_OVERRIDE(galaxy_state, galaxy )
+	m_maincpu->set_vblank_int("screen", FUNC(galaxy_state::irq0_line_hold));
+	m_maincpu->set_irq_acknowledge_callback(FUNC(galaxy_state::irq_callback));
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
@@ -191,7 +178,7 @@
 	m_screen->set_palette("palette");
 	m_screen->set_size(384, 212);
 	m_screen->set_visarea(0, 384-1, 0, 208-1);
-	m_screen->set_screen_update(FUNC(galaxy_state::screen_update_galaxy));
+	m_screen->set_screen_update(FUNC(galaxy_state::screen_update));
 
 	GFXDECODE(config, "gfxdecode", "palette", gfx_galaxy);
 	PALETTE(config, "palette", palette_device::MONOCHROME);
@@ -216,13 +203,11 @@
 void galaxy_state::galaxyp(machine_config &config)
 {
 	/* basic machine hardware */
-	Z80(config, m_maincpu, XTAL / 2);
+	Z80(config, m_maincpu, 6'144'000 / 2);
 	m_maincpu->set_addrmap(AS_PROGRAM, &galaxy_state::galaxyp_mem);
 	m_maincpu->set_addrmap(AS_IO, &galaxy_state::galaxyp_io);
-	m_maincpu->set_vblank_int("screen", FUNC(galaxy_state::galaxy_interrupt));
-	m_maincpu->set_irq_acknowledge_callback(FUNC(galaxy_state::galaxy_irq_callback));
-
-	MCFG_MACHINE_RESET_OVERRIDE(galaxy_state, galaxyp )
+	m_maincpu->set_vblank_int("screen", FUNC(galaxy_state::irq0_line_hold));
+	m_maincpu->set_irq_acknowledge_callback(FUNC(galaxy_state::irq_callback));
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
@@ -230,17 +215,18 @@
 	m_screen->set_palette("palette");
 	m_screen->set_size(384, 208);
 	m_screen->set_visarea(0, 384-1, 0, 208-1);
-	m_screen->set_screen_update(FUNC(galaxy_state::screen_update_galaxy));
+	m_screen->set_screen_update(FUNC(galaxy_state::screen_update));
 
+	GFXDECODE(config, "gfxdecode", "palette", gfx_galaxy);
 	PALETTE(config, "palette", palette_device::MONOCHROME);
 
-
 	/* snapshot */
 	SNAPSHOT(config, "snapshot", "gal").set_load_callback(FUNC(galaxy_state::snapshot_cb));
 
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
-	AY8910(config, "ay8910", XTAL/4); // FIXME: really no output routes for this AY?
+	ay8910_device &ay(AY8910(config, "ay8910", 6'144'000 / 4));
+	ay.add_route(ALL_OUTPUTS, "mono", 0.50);
 
 	CASSETTE(config, m_cassette);
 	m_cassette->set_formats(gtp_cassette_formats);
@@ -249,28 +235,27 @@
 	m_cassette->set_interface("galaxy_cass");
 
 	SOFTWARE_LIST(config, "cass_list").set_original("galaxy");
-
-	/* internal ram */
-	RAM(config, RAM_TAG).set_default_size("38K");
 }
 
 ROM_START (galaxy)
-	ROM_REGION (0x10000, "maincpu", ROMREGION_ERASEFF)
-	ROM_LOAD ("galrom1.bin", 0x0000, 0x1000, CRC(dc970a32) SHA1(dfc92163654a756b70f5a446daf49d7534f4c739))
-	ROM_LOAD_OPTIONAL ("galrom2.bin", 0x1000, 0x1000, CRC(5dc5a100) SHA1(5d5ab4313a2d0effe7572bb129193b64cab002c1))
-	ROM_REGION(0x0800, "gfx1",0)
-	ROM_LOAD ("galchr.bin", 0x0000, 0x0800, CRC(5c3b5bb5) SHA1(19429a61dc5e55ddec3242a8f695e06dd7961f88))
+	ROM_REGION( 0x2000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "galrom1.dd8", 0x0000, 0x1000, CRC(dc970a32) SHA1(dfc92163654a756b70f5a446daf49d7534f4c739) )
+	ROM_LOAD( "galrom2.dd9", 0x1000, 0x1000, CRC(5dc5a100) SHA1(5d5ab4313a2d0effe7572bb129193b64cab002c1) )
+
+	ROM_REGION( 0x0800, "chargen", 0 )
+	ROM_LOAD( "galchr.dd3",  0x0000, 0x0800, CRC(5c3b5bb5) SHA1(19429a61dc5e55ddec3242a8f695e06dd7961f88) )
 ROM_END
 
 ROM_START (galaxyp)
-	ROM_REGION (0x10000, "maincpu", ROMREGION_ERASEFF)
-	ROM_LOAD ("galrom1.bin", 0x0000, 0x1000, CRC(dc970a32) SHA1(dfc92163654a756b70f5a446daf49d7534f4c739))
-	ROM_LOAD ("galrom2.bin", 0x1000, 0x1000, CRC(5dc5a100) SHA1(5d5ab4313a2d0effe7572bb129193b64cab002c1))
-	ROM_LOAD ("galplus.bin", 0xe000, 0x1000, CRC(d4cfab14) SHA1(b507b9026844eeb757547679907394aa42055eee))
-	ROM_REGION(0x0800, "gfx1",0)
-	ROM_LOAD ("galchr.bin", 0x0000, 0x0800, CRC(5c3b5bb5) SHA1(19429a61dc5e55ddec3242a8f695e06dd7961f88))
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "galrom1.bin", 0x0000, 0x1000, CRC(dc970a32) SHA1(dfc92163654a756b70f5a446daf49d7534f4c739) )
+	ROM_LOAD( "galrom2.bin", 0x1000, 0x1000, CRC(5dc5a100) SHA1(5d5ab4313a2d0effe7572bb129193b64cab002c1) )
+	ROM_LOAD( "galplus.bin", 0x2000, 0x1000, CRC(d4cfab14) SHA1(b507b9026844eeb757547679907394aa42055eee) )
+
+	ROM_REGION( 0x0800, "chargen", 0 )
+	ROM_LOAD( "galchr.dd3",  0x0000, 0x0800, CRC(5c3b5bb5) SHA1(19429a61dc5e55ddec3242a8f695e06dd7961f88) )
 ROM_END
 
 /*    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS         INIT          COMPANY                                   FULLNAME */
-COMP( 1983, galaxy,  0,      0,      galaxy,  galaxy,  galaxy_state, init_galaxy,  "Voja Antonic / Elektronika inzenjering", "Galaksija",      0)
-COMP( 1985, galaxyp, galaxy, 0,      galaxyp, galaxyp, galaxy_state, init_galaxyp, "Nenad Dunjic",                           "Galaksija plus", 0)
+COMP( 1983, galaxy,  0,      0,      galaxy,  galaxy,  galaxy_state, init_galaxy,  "Voja Antonic / Elektronika inzenjering", "Galaksija",      MACHINE_SUPPORTS_SAVE )
+COMP( 1985, galaxyp, galaxy, 0,      galaxyp, galaxy,  galaxy_state, init_galaxyp, "Nenad Dunjic",                           "Galaksija plus", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/galeb.cpp mame-0.224+dfsg.1/src/mame/drivers/galeb.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/galeb.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/galeb.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,82 +2,183 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        Galeb driver by Miodrag Milanovic
+Galeb driver by Miodrag Milanovic
 
-        01/03/2008 Updated to work with latest SVN code
-        23/02/2008 Sound support added.
-        22/02/2008 Preliminary driver.
-
-        Driver is based on work of Josip Perusanec
+2008-02-22 Preliminary driver.
+2008-02-23 Sound support added.
+2008-03-01 Updated to work with latest SVN code
+
+Driver is based on work of Josip Perusanec.
+
+Galeb (seagull) based on the OSI UK101. Due to its expense it is quite rare.
+It was succeeded by the Orao (eagle).
+
+All commands in Monitor and in Basic must be in UPPERCASE. So, the very first
+thing to do is to press ^A to enter caps mode.
+
+Commands:
+A nnnn           Mini-assembler
+B
+C aaaabbbb       show checksum of memory from a to b
+E aaaabbbb       Hex dump from a to b
+F aaaabbbbcc     Fill memory from a to b with c
+L                Load tape
+M nnnn           Modify memory starting at byte nnnn (enter to escape)
+P
+Q ccccaaaabbbb   Copy memory range a to b, over to c
+R
+S
+T
+U nnnn           Go to nnnn
+X nnnn           disassemble
+$
+^A               caps lock
+^B               Start Basic
+^G               keyclick
+^L               clear screen
+Alt\
+
+
+Cassette:
+- Unable to locate a schematic, but it appears that a 6850 is the uart.
+  The UK101 used a 6850 and Kansas City tape encoding, and so it is assumed
+  that this computer is the same.
+
+Screen:
+- The T command can cause the system to expand the video to 4k
+  instead of 1k. Therefore the writing goes off the bottom and doesn't scroll.
+  It is not known if this is intentional, or a bug. The video routine has been
+  modified to cope, in case it's a real feature. (T 0000 0022 is an example)
+
+ToDo:
+- BASIC SAVE command is weird... need instructions
+- Therefore, cassette is considered to be not working.
 
 ****************************************************************************/
 
 
 #include "emu.h"
-#include "includes/galeb.h"
-
 #include "cpu/m6502/m6502.h"
+#include "machine/clock.h"
 #include "sound/volt_reg.h"
 #include "screen.h"
 #include "speaker.h"
+#include "machine/6850acia.h"
+#include "machine/timer.h"
+#include "imagedev/cassette.h"
+#include "sound/dac.h"
+#include "emupal.h"
+
+class galeb_state : public driver_device
+{
+public:
+	galeb_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_ram(*this, "mainram")
+		, m_vram(*this, "videoram")
+		, m_maincpu(*this, "maincpu")
+		, m_gfxdecode(*this, "gfxdecode")
+		, m_palette(*this, "palette")
+		, m_io_keyboard(*this, "LINE%u", 0U)
+		, m_cass(*this, "cassette")
+		, m_acia(*this, "acia")
+		, m_dac(*this, "dac")
+	{ }
+
+	void galeb(machine_config &config);
+
+private:
+	TIMER_DEVICE_CALLBACK_MEMBER(kansas_w);
+	TIMER_DEVICE_CALLBACK_MEMBER(kansas_r);
+	void dac_w(u8 data);
+	u8 keyboard_r(offs_t offset);
+	u32 screen_update_galeb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	u8 m_cass_data[4];
+	bool m_cassbit;
+	bool m_cassold;
+	required_shared_ptr<u8> m_ram;
+	required_shared_ptr<u8> m_vram;
+	required_device<cpu_device> m_maincpu;
+	required_device<gfxdecode_device> m_gfxdecode;
+	required_device<palette_device> m_palette;
+	required_ioport_array<8> m_io_keyboard;
+	required_device<cassette_image_device> m_cass;
+	required_device<acia6850_device> m_acia;
+	required_device<dac_1bit_device> m_dac;
 
+	void mem_map(address_map &map);
 
-static GFXDECODE_START( gfx_galeb )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, galeb_charlayout, 0, 1 )
-GFXDECODE_END
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
+	bool m_dac_state;
+};
 
 void galeb_state::machine_start()
 {
 	save_item(NAME(m_dac_state));
+	save_item(NAME(m_cass_data));
+	save_item(NAME(m_cassbit));
+	save_item(NAME(m_cassold));
+}
 
+void galeb_state::machine_reset()
+{
+	m_dac_state = 0;
 	m_dac->write(m_dac_state);
 }
 
 void galeb_state::dac_w(uint8_t data)
 {
-	m_dac_state = !m_dac_state;
+	m_dac_state ^= 1;
 	m_dac->write(m_dac_state);
 }
 
-uint8_t galeb_state::keyboard_r(offs_t offset)
+u8 galeb_state::keyboard_r(offs_t offset)
 {
-	return m_keyboard[offset]->read();
+	return m_io_keyboard[offset]->read();
 }
 
-uint8_t galeb_state::tape_status_r()
+TIMER_DEVICE_CALLBACK_MEMBER( galeb_state::kansas_w )
 {
-	int status = 0;
-	status |= 2; /// send ready
-	status |= 1; /// receive ready
-	return status;
-}
+	m_cass_data[3]++;
 
-void galeb_state::tape_data_w(uint8_t data)
-{
-	logerror("tape_data_w %02x\n", data);
+	if (m_cassbit != m_cassold)
+	{
+		m_cass_data[3] = 0;
+		m_cassold = m_cassbit;
+	}
+
+	if (m_cassbit)
+		m_cass->output(BIT(m_cass_data[3], 0) ? -1.0 : +1.0); // 2400Hz
+	else
+		m_cass->output(BIT(m_cass_data[3], 1) ? -1.0 : +1.0); // 1200Hz
 }
 
-uint8_t galeb_state::tape_data_r()
+TIMER_DEVICE_CALLBACK_MEMBER( galeb_state::kansas_r)
 {
-	logerror("tape_data_r (press escape to cancel load)\n");
-	return 0x00;
+	/* cassette - turn 1200/2400Hz to a bit */
+	m_cass_data[1]++;
+	u8 cass_ws = (m_cass->input() > +0.03) ? 1 : 0;
+
+	if (cass_ws != m_cass_data[0])
+	{
+		m_cass_data[0] = cass_ws;
+		m_acia->write_rxd((m_cass_data[1] < 12) ? 1 : 0);
+		m_cass_data[1] = 0;
+	}
 }
 
+
 /* Address maps */
-void galeb_state::galeb_mem(address_map &map)
+void galeb_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x1fff).ram();  // RAM
+	map(0x0000, 0x1fff).ram().share("mainram");
+	map(0xb000, 0xbfdf).ram().share("videoram");
 	map(0xbfe0, 0xbfe7).r(FUNC(galeb_state::keyboard_r));
 	map(0xbfe0, 0xbfe0).w(FUNC(galeb_state::dac_w));
-	map(0xbffe, 0xbffe).r(FUNC(galeb_state::tape_status_r));
-	map(0xbfff, 0xbfff).rw(FUNC(galeb_state::tape_data_r), FUNC(galeb_state::tape_data_w));
-	map(0xb000, 0xb3ff).ram().share("video_ram"); // video ram
-	map(0xc000, 0xc7ff).rom();  // BASIC 01 ROM
-	map(0xc800, 0xcfff).rom();  // BASIC 02 ROM
-	map(0xd000, 0xd7ff).rom();  // BASIC 03 ROM
-	map(0xd800, 0xdfff).rom();  // BASIC 04 ROM
-	map(0xf000, 0xf7ff).rom();  // Monitor ROM
-	map(0xf800, 0xffff).rom();  // System ROM
+	map(0xbffe, 0xbfff).rw(m_acia, FUNC(acia6850_device::read), FUNC(acia6850_device::write));
+	map(0xc000, 0xffff).rom().region("maincpu",0);
 }
 
 /* Input ports */
@@ -163,12 +264,46 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
 INPUT_PORTS_END
 
+const gfx_layout charlayout =
+{
+	8, 8,               /* 8x8 characters */
+	256,                /* 256 characters */
+	1,                /* 1 bits per pixel */
+	{0},                /* no bitplanes; 1 bit per pixel */
+	{7, 6, 5, 4, 3, 2, 1, 0},
+	{0 * 8, 1 * 8, 2 * 8, 3 * 8, 4 * 8, 5 * 8, 6 * 8, 7 * 8},
+	8*8                 /* size of one char */
+};
+
+static GFXDECODE_START( gfx_galeb )
+	GFXDECODE_ENTRY( "chargen", 0x0000, charlayout, 0, 1 )
+GFXDECODE_END
+
+u32 galeb_state::screen_update_galeb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	u16 ma = (m_ram[0xff]*256+m_ram[0xfe]) & 0xfff;
+	if (ma < 0x400)
+		ma = 15;
+	else
+		ma -= 0x3bb;
+
+	for(u8 y = 0; y < 16; y++ )
+	{
+		for(u8 x = 0; x < 48; x++ )
+		{
+			u8 code = m_vram[ma + x + y*64];
+			m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,  code , 0, 0, 0, x*8,y*8);
+		}
+	}
+	return 0;
+}
+
 /* Machine driver */
 void galeb_state::galeb(machine_config &config)
 {
 	/* basic machine hardware */
 	M6502(config, m_maincpu, 1000000);
-	m_maincpu->set_addrmap(AS_PROGRAM, &galeb_state::galeb_mem);
+	m_maincpu->set_addrmap(AS_PROGRAM, &galeb_state::mem_map);
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -184,26 +319,43 @@
 	PALETTE(config, m_palette, palette_device::MONOCHROME);
 
 	/* audio hardware */
-	SPEAKER(config, "speaker").front_center();
-	DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.0625); // unknown DAC
+	SPEAKER(config, "mono").front_center();
+	DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "mono", 0.0625); // unknown DAC
 	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
 	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
+
+	clock_device &acia_clock(CLOCK(config, "acia_clock", 4'800)); // 300 baud x 16(divider) = 4800
+	acia_clock.signal_handler().set(m_acia, FUNC(acia6850_device::write_txc));
+	acia_clock.signal_handler().append(m_acia, FUNC(acia6850_device::write_rxc));
+
+	ACIA6850(config, m_acia, 0);
+	m_acia->txd_handler().set([this] (bool state) { m_cassbit = state; });
+
+	/* cassette */
+	CASSETTE(config, m_cass);
+	m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
+	TIMER(config, "kansas_w").configure_periodic(FUNC(galeb_state::kansas_w), attotime::from_hz(4800)); // cass write
+	TIMER(config, "kansas_r").configure_periodic(FUNC(galeb_state::kansas_r), attotime::from_hz(40000)); // cass read
 }
 
 /* ROM definition */
 ROM_START( galeb )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "bas01.rom", 0xc000, 0x0800, CRC(9b19ed58) SHA1(ebfc27af8dbabfb233f9888e6a0a0dfc87ae1691) )
-	ROM_LOAD( "bas02.rom", 0xc800, 0x0800, CRC(3f320a84) SHA1(4ea082b4269dca6152426b1f720c7508122d3cb7) )
-	ROM_LOAD( "bas03.rom", 0xd000, 0x0800, CRC(f122ad10) SHA1(3c7c1dd67268230d179a00b0f8b35be80c2b7035) )
-	ROM_LOAD( "bas04.rom", 0xd800, 0x0800, CRC(b5372a83) SHA1(f93b73d98b943c6791f46617418fb5e4238d75bd) )
-	ROM_LOAD( "exmd.rom",  0xf000, 0x0800, CRC(1bcb1375) SHA1(fda3361d238720a3d309644093da9832d5aff661) )
-	ROM_LOAD( "makbug.rom",0xf800, 0x0800, CRC(91e38e79) SHA1(2b6439a09a470cda9c81b9d453c6380b99716989) )
-	ROM_REGION(0x0800, "gfx1",0)
-	ROM_LOAD ("chrgen.bin", 0x0000, 0x0800, CRC(409a800e) SHA1(0efe429dd6c0568032636e691d9865a623afeb55))
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
+	// BASIC ROMS
+	ROM_LOAD( "bas01.rom",   0x0000, 0x0800, CRC(9b19ed58) SHA1(ebfc27af8dbabfb233f9888e6a0a0dfc87ae1691) )
+	ROM_LOAD( "bas02.rom",   0x0800, 0x0800, CRC(3f320a84) SHA1(4ea082b4269dca6152426b1f720c7508122d3cb7) )
+	ROM_LOAD( "bas03.rom",   0x1000, 0x0800, CRC(f122ad10) SHA1(3c7c1dd67268230d179a00b0f8b35be80c2b7035) )
+	ROM_LOAD( "bas04.rom",   0x1800, 0x0800, CRC(b5372a83) SHA1(f93b73d98b943c6791f46617418fb5e4238d75bd) )
+	// MONITOR
+	ROM_LOAD( "exmd.rom",    0x3000, 0x0800, CRC(1bcb1375) SHA1(fda3361d238720a3d309644093da9832d5aff661) )
+	// SYSTEM
+	ROM_LOAD( "makbug.rom",  0x3800, 0x0800, CRC(91e38e79) SHA1(2b6439a09a470cda9c81b9d453c6380b99716989) )
+
+	ROM_REGION(0x0800, "chargen",0)
+	ROM_LOAD ("chrgen.bin",  0x0000, 0x0800, CRC(409a800e) SHA1(0efe429dd6c0568032636e691d9865a623afeb55) )
 ROM_END
 
 /* Driver */
 
 //    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY         FULLNAME  FLAGS
-COMP( 1981, galeb, 0,      0,      galeb,   galeb, galeb_state, empty_init, "PEL Varazdin", "Galeb",  0 )
+COMP( 1981, galeb, 0,      0,      galeb,   galeb, galeb_state, empty_init, "PEL Varazdin", "Galeb",  MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/galpanic_ms.cpp mame-0.224+dfsg.1/src/mame/drivers/galpanic_ms.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/galpanic_ms.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/galpanic_ms.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -18,6 +18,9 @@
     MOD51/3 - Sprite board (ROM sockets used for plug in board below)
     COMP AEREO MOD/5-1 (MODULAR SYSTEM 2) - Sprite ROM board, plugs into above, 24 sprite ROMs
     MOD 4/3 - Tilemap board, has logic + 4 tilemap ROMs, long thin sub-board (CAR-0484/1 SOLD) with no chips, just routing along one edge
+
+
+    -- does the sound board have a MSM5205 or not?
 */
 
 
@@ -26,7 +29,12 @@
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
-
+#include "tilemap.h"
+#include "cpu/z80/z80.h"
+#include "sound/2203intf.h"
+#include "machine/gen_latch.h"
+#include "machine/bankdev.h"
+#include "sound/msm5205.h"
 
 class galspanic_ms_state : public driver_device
 {
@@ -34,27 +42,48 @@
 	galspanic_ms_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
+		m_soundcpu(*this, "soundcpu"),
+		m_ym1(*this, "ym1"),
+		m_ym2(*this, "ym2"),
 		m_palette(*this, "palette"),
 		m_screen(*this, "screen"),
 		m_paletteram(*this, "palette"),
+		m_spriteram(*this, "spriteram"),
 		m_fg_ind8_pixram(*this, "fg_ind8ram"),
 		m_bg_rgb555_pixram(*this, "bg_rgb555ram"),
-		m_gfxdecode(*this, "gfxdecode")
+		m_videoram2(*this, "videoram2"),
+		m_scrollram(*this, "scrollram"),
+		m_gfxdecode(*this, "gfxdecode"),
+		m_msm(*this, "msm"),
+		m_soundrom(*this, "soundrom"),
+		m_soundlatch(*this, "soundlatch")
 	{ }
 
 	void newquiz(machine_config &config);
+	void init_galpanicms();
 
 private:
 	required_device<cpu_device> m_maincpu;
+	required_device<cpu_device> m_soundcpu;
+	required_device<ym2203_device> m_ym1;
+	required_device<ym2203_device> m_ym2;
 	required_device<palette_device> m_palette;
 	required_device<screen_device> m_screen;
 
 	required_shared_ptr<uint16_t> m_paletteram;
+	required_shared_ptr<uint16_t> m_spriteram;
 	required_shared_ptr<uint16_t> m_fg_ind8_pixram;
 	required_shared_ptr<uint16_t> m_bg_rgb555_pixram;
+	required_shared_ptr<uint16_t> m_videoram2;
+	required_shared_ptr<uint16_t> m_scrollram;
 	required_device<gfxdecode_device> m_gfxdecode;
+	required_device<msm5205_device> m_msm;
+	required_device<address_map_bank_device> m_soundrom;
+	required_device<generic_latch_8_device> m_soundlatch;
 
 	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	virtual void video_start() override;
 	void galspanic_ms_palette(palette_device &palette) const;
 
 	uint32_t screen_update_backgrounds(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -63,14 +92,60 @@
 	// comad
 	uint16_t comad_timer_r();
 	void newquiz_map(address_map &map);
+	void sound_map(address_map &map);
+	void soundrom_map(address_map &map);
+
+	uint8_t unk_r()
+	{
+		return machine().rand();
+	}
 
+	uint16_t vram2_r(offs_t offset, uint16_t mem_mask);
+	void vram2_w(offs_t offset, uint16_t data, uint16_t mem_mask);
+
+	TILE_GET_INFO_MEMBER(get_tile_info_tilemap2);
+
+	tilemap_t *m_bg_tilemap2;
+
+	DECLARE_WRITE_LINE_MEMBER(splash_msm5205_int);
+	void splash_adpcm_data_w(uint8_t data);
+	void splash_adpcm_control_w(uint8_t data);
+	int m_adpcm_data;
+
+	void descramble_16x16tiles(uint8_t* src, int len);
 };
 
+TILE_GET_INFO_MEMBER(galspanic_ms_state::get_tile_info_tilemap2)
+{
+	int tile = m_videoram2[tile_index*2];
+
+	//int attr = m_videoram2[(tile_index*2)+1] & 0xff;
+	//int fx = (m_videoram2[(tile_index*2)+1] & 0xc0)>>6;
+
+	int col = (tile & 0xf000)>>12;
+	tile &= 0x0fff;
+
+	tileinfo.set(1,tile,col,0);
+}
+
+uint16_t galspanic_ms_state::vram2_r(offs_t offset, uint16_t mem_mask)
+{
+	return m_videoram2[offset];
+}
+
+void galspanic_ms_state::vram2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	COMBINE_DATA(&m_videoram2[offset]);
+	m_bg_tilemap2->mark_tile_dirty(offset/2);
+}
+
+
 uint16_t galspanic_ms_state::comad_timer_r()
 {
 	return (m_screen->vpos() & 0x07) << 8;
 }
 
+// lots of bad / leftover reads/writes from the original code in here
 void galspanic_ms_state::newquiz_map(address_map &map)
 {
 	map(0x000000, 0x03ffff).rom();
@@ -80,25 +155,38 @@
 	map(0x500000, 0x51ffff).ram().share("fg_ind8ram");
 	map(0x520000, 0x53ffff).ram().share("bg_rgb555ram");
 
-	map(0x584000, 0x587fff).ram(); // was view2 tilemaps (moved from 0x580000 on original) presumably still 'gfx3' tiles tho
+	map(0x581000, 0x581fff).ram();
+	map(0x584000, 0x5847ff).rw(FUNC(galspanic_ms_state::vram2_r), FUNC(galspanic_ms_state::vram2_w)).share("videoram2"); // was view2 tilemaps (moved from 0x580000 on original) presumably still 'bgtile' tiles tho
+	map(0x584800, 0x584fff).ram().share("scrollram");
+	map(0x585000, 0x58ffff).ram();
 
 	map(0x600000, 0x600fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
 
 	map(0x680000, 0x68001f).ram(); // was view2 tilemap regs
 
-	map(0x700000, 0x700fff).ram().share("spriteram"); // original spriteram? - drawing from here results in corrupt / missing sprites
+	map(0x700000, 0x700fff).ram().share("oldspriteram"); // original spriteram? - drawing from here results in corrupt / missing sprites
 
-	map(0x704000, 0x7047ff).ram().share("boot_spriteram"); // bootleg uses this instead?
+	map(0x704000, 0x7047ff).ram().share("spriteram"); // bootleg uses this instead?
+
+	map(0x780000, 0x78001f).ram();
 
 	map(0x800000, 0x800001).portr("DSW1");
 	map(0x800002, 0x800003).portr("DSW2");
 	map(0x800004, 0x800005).portr("SYSTEM");
 
-	map(0x80000e, 0x80000f).r(FUNC(galspanic_ms_state::comad_timer_r));
+	map(0x80000e, 0x80000f).r(FUNC(galspanic_ms_state::comad_timer_r)).w(m_soundlatch, FUNC(generic_latch_8_device::write));
+
+	map(0x840000, 0x840001).ram();
+
+	map(0x900000, 0x900001).ram();
+
+	map(0xa00000, 0xa00001).ram();
 
 	map(0xb00000, 0xbfffff).rom().region("user1", 0); // reads girl data here
 
 	map(0xc80000, 0xc8ffff).ram();
+
+	map(0xe00012, 0xe00013).ram();
 }
 
 
@@ -106,6 +194,68 @@
 {
 }
 
+
+void galspanic_ms_state::machine_reset()
+{
+	m_soundrom->set_bank(2);
+}
+
+void galspanic_ms_state::splash_adpcm_data_w(uint8_t data)
+{
+	m_adpcm_data = data;
+}
+
+void galspanic_ms_state::splash_adpcm_control_w(uint8_t data)
+{
+	m_msm->reset_w(BIT(data, 7));
+
+	int bank = data & 0x7f;
+
+	if ((bank != 0x02) &&
+		(bank != 0x04) && (bank != 0x05) && (bank != 0x06) && (bank != 0x07) &&
+		(bank != 0x0c) && (bank != 0x0d) && (bank != 0x0e) && (bank != 0x0f))
+	{
+		logerror("splash_adpcm_control_w %02x\n", data);
+	}
+
+	m_soundrom->set_bank(bank & 0xf);
+}
+
+WRITE_LINE_MEMBER(galspanic_ms_state::splash_msm5205_int)
+{
+	m_msm->data_w(m_adpcm_data >> 4);
+	m_adpcm_data = (m_adpcm_data << 4) & 0xf0;
+}
+void galspanic_ms_state::sound_map(address_map &map)
+{
+	map(0x0000, 0x7fff).rom();
+	map(0x8000, 0x8fff).ram();
+	map(0x9000, 0x97ff).ram().mirror(0x0800);
+
+
+	map(0xc000, 0xc000).nopw();
+
+	//map(0x8000, 0xbfff).m(m_soundrom, FUNC(address_map_bank_device::amap8));
+
+//  map(0xe000, 0xe000).w(FUNC(galspanic_ms_state::splash_adpcm_control_w));
+//  map(0xe400, 0xe400).w(FUNC(galspanic_ms_state::splash_adpcm_data_w));
+
+	map(0xa000, 0xa001).rw(m_ym1, FUNC(ym2203_device::read), FUNC(ym2203_device::write)).mirror(0x0008);
+	map(0xa002, 0xa003).rw(m_ym2, FUNC(ym2203_device::read), FUNC(ym2203_device::write)).mirror(0x0008);
+}
+
+void galspanic_ms_state::soundrom_map(address_map &map)
+{
+	map(0x00000, 0x3ffff).rom().region("soundcpu", 0x000000);
+}
+
+
+void galspanic_ms_state::video_start()
+{
+	m_bg_tilemap2 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(galspanic_ms_state::get_tile_info_tilemap2)), TILEMAP_SCAN_ROWS,  16,  16, 32, 16);
+	m_bg_tilemap2->set_transparent_pen(15);
+}
+
 void galspanic_ms_state::galspanic_ms_palette(palette_device &palette) const
 {
 	// first 2048 colors are dynamic
@@ -127,7 +277,7 @@
 		{
 			uint16_t dat = (m_bg_rgb555_pixram[count] & 0xfffe)>>1;
 			dat += 2048;
-			dest[x] = dat;
+			dest[(x-1)&0xff] = dat;
 			count++;
 		}
 	}
@@ -154,8 +304,42 @@
 uint32_t galspanic_ms_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	screen_update_backgrounds(screen, bitmap, cliprect);
-//  m_kaneko_spr->render_sprites(cliprect, m_spriteram, m_spriteram.bytes());
-//  m_kaneko_spr->copybitmap(bitmap, cliprect, screen.priority());
+
+	m_bg_tilemap2->set_scrollx(0, 64+m_scrollram[0x400/2]);
+	m_bg_tilemap2->set_scrolly(0, 48-m_scrollram[0x402/2]);
+
+	m_bg_tilemap2->draw(screen, bitmap, cliprect, 0, 0);
+
+	// TODO, convert to device, share between Modualar System games
+	const int NUM_SPRITES = 0x200;
+	const int X_EXTRA_OFFSET = 240;
+
+	for (int i = NUM_SPRITES-2; i >= 0; i-=2)
+	{
+		gfx_element *gfx = m_gfxdecode->gfx(0);
+
+		uint16_t attr0 = m_spriteram[i + 0];
+		uint16_t attr1 = m_spriteram[i + 1];
+
+		uint16_t attr2 = m_spriteram[i + NUM_SPRITES];
+		//uint16_t attr3 = m_spriteram[i + NUM_SPRITES + 1]; // unused?
+
+		int ypos = attr0 & 0x00ff;
+		int xpos = (attr1 & 0xff00)>>8;
+		xpos |= (attr2 & 0x8000) ? 0x100 : 0x000;
+
+		ypos = (0xff - ypos);
+
+		int tile = (attr0 & 0xff00) >> 8;
+		tile |= (attr1 & 0x003f) << 8;
+
+		int flipx = 0; // different
+		int flipy = (attr2 & 0x4000);
+
+		gfx->transpen(bitmap,cliprect,tile,(attr2&0x0f00)>>8,flipx,flipy,xpos-16-X_EXTRA_OFFSET,ypos-14,15);
+	}
+
+
 	return 0;
 }
 
@@ -249,8 +433,8 @@
 };
 
 static GFXDECODE_START( gfx_galspanic_ms )
-	GFXDECODE_ENTRY( "kan_spr", 0, tiles16x16x4_layout, 0, 16 )
-	GFXDECODE_ENTRY( "gfx3", 0, tiles16x16x4_layout, 0, 16 )
+	GFXDECODE_ENTRY( "kan_spr", 0, tiles16x16x4_layout, 0x100, 16 )
+	GFXDECODE_ENTRY( "bgtile", 0, tiles16x16x4_layout, 0x400, 16 )
 GFXDECODE_END
 
 
@@ -276,21 +460,30 @@
 
 	GFXDECODE(config, m_gfxdecode, "palette", gfx_galspanic_ms);
 
-// does not use original video hardware, will implement different hardware in driver instead
-//  KANEKO_TMAP(config, m_view2);
-//  m_view2->set_colbase(0x400);
-//  m_view2->set_offset(0x5b, 0x8, 256, 224);
-//  m_view2->set_palette(m_palette);
-//  m_view2->set_tile_callback(kaneko_view2_tilemap_device::view2_cb_delegate(FUNC(galspanic_ms_state::tile_callback), this));
-
-//  KANEKO_VU002_SPRITE(config, m_kaneko_spr);
-//  m_kaneko_spr->set_priorities(8,8,8,8); // above all (not verified)
-//  m_kaneko_spr->set_offsets(0, -0x40);
-//  m_kaneko_spr->set_palette(m_palette);
-//  m_kaneko_spr->set_color_base(0x100);
-
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
+
+	Z80(config, m_soundcpu, 16_MHz_XTAL/4);
+	m_soundcpu->set_addrmap(AS_PROGRAM, &galspanic_ms_state::sound_map);
+//  m_soundcpu->set_periodic_int(FUNC(galspanic_ms_state::nmi_line_pulse), attotime::from_hz(60*64)); // no NMI here, just retn
+
+	ADDRESS_MAP_BANK(config, m_soundrom).set_map(&galspanic_ms_state::soundrom_map).set_options(ENDIANNESS_LITTLE, 8, 18, 0x4000);
+
+	GENERIC_LATCH_8(config, m_soundlatch);
+	//m_soundlatch->data_pending_callback().set_inputline(m_soundcpu, INPUT_LINE_IRQ0);
+
+	YM2203(config, m_ym1, XTAL(20'000'000)/16).add_route(ALL_OUTPUTS, "mono", 0.40);
+	m_ym1->port_a_read_callback().set(FUNC(galspanic_ms_state::unk_r));
+	m_ym1->port_b_read_callback().set(FUNC(galspanic_ms_state::unk_r));
+
+	YM2203(config, m_ym2, XTAL(20'000'000)/16).add_route(ALL_OUTPUTS, "mono", 0.40);
+	m_ym2->port_a_read_callback().set(FUNC(galspanic_ms_state::unk_r));
+	m_ym2->port_b_read_callback().set(FUNC(galspanic_ms_state::unk_r));
+
+	MSM5205(config, m_msm, XTAL(384'000));
+	m_msm->vck_legacy_callback().set(FUNC(galspanic_ms_state::splash_msm5205_int));
+	m_msm->set_prescaler_selector(msm5205_device::S48_4B);
+	m_msm->add_route(ALL_OUTPUTS, "mono", 0.80);
 }
 
 
@@ -299,7 +492,7 @@
 	ROM_LOAD16_BYTE( "cpu_ic17.bin",  0x000000, 0x80000, CRC(c65104e1) SHA1(189dde2a34b949bd1763d8ee0d74c86fead549b9) ) // AM27C040
 	ROM_LOAD16_BYTE( "cpu_ic8.bin",   0x000001, 0x20000, CRC(e2e201e5) SHA1(2a8257f66139178af951d701fd263144aacf2808) ) // AM27C010
 
-	ROM_REGION( 0x10000, "soundcpu", 0 ) // Z80 code
+	ROM_REGION( 0x40000, "soundcpu", 0 ) // Z80 code
 	ROM_LOAD( "snd_1.ic12", 0x000000, 0x10000, CRC(409e9233) SHA1(f13de7ddc00857c889250621ebccdae1b494cfd0) ) // TMS27C512
 
 	ROM_REGION16_BE( 0x100000, "userx", ROMREGION_ERASEFF ) // 68000 data @ 0x200000
@@ -310,7 +503,7 @@
 	ROM_LOAD16_BYTE( "cpu_ic26.bin", 0x080000, 0x40000, CRC(c7e2135b) SHA1(8cf0c21c9b64e48da458bc29cfb15e1a5189c551) ) //  D27C020
 	ROM_LOAD16_BYTE( "cpu_ic25.bin", 0x080001, 0x40000, CRC(406c2e3e) SHA1(ae229f01bdf0dea72a89c63b60f513a338fd8061) ) // AM27C020
 
-	ROM_REGION( 0x200000, "kan_spr", ROMREGION_ERASEFF ) // sprites (seems to be the same as Gals Panic but alt ROM arrangement / decoding)
+	ROM_REGION( 0x200000, "kan_spr", ROMREGION_ERASEFF | ROMREGION_INVERT ) // sprites (seems to be the same as Gals Panic but alt ROM arrangement / decoding)
 	ROM_LOAD32_BYTE( "5_gp_501.ic1",         0x000003, 0x010000, CRC(55ce19e8) SHA1(6aee3a43c731f017427b9316a6d2a536d7d44d35) ) // all TMS27C512
 	ROM_LOAD32_BYTE( "5_gp_510.ic10",        0x000002, 0x010000, CRC(95cfabc0) SHA1(36708945b4a7c153e67c5f8d8a8a71e7b6cb0ca3) )
 	ROM_LOAD32_BYTE( "5_gp_516.ic16",        0x000001, 0x010000, CRC(93c82aa3) SHA1(70d9beda4e2a93f89d2f0589c9fdbdb2ba4c7d7a) )
@@ -341,7 +534,7 @@
 	ROM_LOAD32_BYTE( "5_gp_521.ic21",        0x140001, 0x010000, CRC(00ed84f5) SHA1(d3704a0a0e0b3f0f6509f3ab80a7203794b61cca) )
 	ROM_LOAD32_BYTE( "5_gp_527.ic27",        0x140000, 0x010000, CRC(689a8fae) SHA1(b16c33f02966aff3796b9dc528d3c2ca08ae49b1) )
 
-	ROM_REGION( 0x40000, "gfx3", 0 ) // tilemap (less data than the encrypted layer on Gals Panic, probably no animation?)
+	ROM_REGION( 0x40000, "bgtile", ROMREGION_INVERT ) // tilemap (less data than the encrypted layer on Gals Panic, probably no animation?)
 	ROM_LOAD32_BYTE( "4_gp_401.ic17",        0x000003, 0x010000, CRC(cd7060f6) SHA1(c548b0ccdff0ae33a2b6eef3bf49d18bd0935321) ) // MC27C512AQ
 	ROM_LOAD32_BYTE( "4_gp_402.ic16",        0x000002, 0x010000, CRC(c4627916) SHA1(9d30251a3a7ac0198f89c797ae59285870d21033) ) // MC27C512AQ
 	ROM_LOAD32_BYTE( "4_gp_403.ic15",        0x000001, 0x010000, CRC(35d2bce4) SHA1(050e7adad47ea10a59761e59d8d4aee11960b0db) ) // MC27C512AQ
@@ -368,5 +561,26 @@
 	ROM_LOAD( "cpu_647_gal16v8.ic7", 0, 1, NO_DUMP )
 ROM_END
 
+// reorganize graphics into something we can decode with a single pass
+void galspanic_ms_state::descramble_16x16tiles(uint8_t* src, int len)
+{
+	std::vector<uint8_t> buffer(len);
+	{
+		for (int i = 0; i < len; i++)
+		{
+			int j = bitswap<20>(i, 19,18,17,16,15,12,11,10,9,8,7,6,5,14,13,4,3,2,1,0);
+			buffer[j] = src[i];
+		}
+
+		std::copy(buffer.begin(), buffer.end(), &src[0]);
+	}
+}
+
+void galspanic_ms_state::init_galpanicms()
+{
+	descramble_16x16tiles(memregion("bgtile")->base(), memregion("bgtile")->bytes());
+}
+
+
 
-GAME( 1991, galpanicms,  galsnew,  newquiz,  newquiz,  galspanic_ms_state, empty_init, ROT90, "bootleg (Kaenko)", "New Quiz (Modular System bootleg)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 1991, galpanicms,  galsnew,  newquiz,  newquiz,  galspanic_ms_state, init_galpanicms, ROT90, "bootleg (Kaenko)", "New Quiz (Modular System bootleg of Gals Panic)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/gameking.cpp mame-0.224+dfsg.1/src/mame/drivers/gameking.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/gameking.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/gameking.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -6,14 +6,14 @@
 
   Thanks to Deathadder, Judge, Porchy, Klaus Sommer, James Brolly & Brian Provinciano
 
-  hopefully my work (reverse engineerung, cartridge+bios backup, emulation) will be honored in future
+  hopefully my work (reverse engineering, cartridge+bios backup, emulation) will be honored in future
   and my name will not be removed entirely, especially by simple code rewrites of working emulation
 
   flashcard, handheld, programmer, assembler ready to do some test on real hardware
 
   todo:
   !back up gameking3 bios so emulation of gameking3 gets possible; my gameking bios backup solution should work
-  (improove emulation)
+  (improve emulation)
   (add audio)
 
   use gameking3 cartridge to get illegal cartridge scroller
@@ -23,9 +23,12 @@
 #include "cpu/m6502/st2204.h"
 #include "bus/generic/slot.h"
 #include "bus/generic/carts.h"
+#include "sound/dac.h"
+#include "sound/volt_reg.h"
 #include "emupal.h"
 #include "screen.h"
 #include "softlist.h"
+#include "speaker.h"
 
 
 class gameking_state : public driver_device
@@ -239,7 +242,7 @@
 TIMER_CALLBACK_MEMBER(gameking_state::gameking_timer)
 {
 	m_maincpu->set_state_int(st2xxx_device::ST_IREQ,
-		m_maincpu->state_int(st2xxx_device::ST_IREQ) | (0x012 & m_maincpu->state_int(st2xxx_device::ST_IENA)));
+		m_maincpu->state_int(st2xxx_device::ST_IREQ) | (0x010 & m_maincpu->state_int(st2xxx_device::ST_IENA)));
 	timer1->enable(false);
 	timer2->enable(true);
 	timer2->reset(m_maincpu->cycles_to_attotime(10/*?*/));
@@ -281,12 +284,13 @@
 void gameking_state::gameking(machine_config &config)
 {
 	/* basic machine hardware */
-	st2xxx_device &maincpu(ST2204(config, m_maincpu, 6000000));
+	st2204_device &maincpu(ST2204(config, m_maincpu, 6000000));
 	maincpu.set_addrmap(AS_DATA, &gameking_state::gameking_mem);
 	maincpu.in_pa_callback().set(FUNC(gameking_state::input_r));
 	maincpu.in_pb_callback().set(FUNC(gameking_state::input2_r));
 	maincpu.out_pc_callback().set(FUNC(gameking_state::timer_w)); // wrong
 	maincpu.in_pl_callback().set_constant(6); // bios protection endless loop
+	maincpu.dac_callback().set("dac", FUNC(dac_byte_interface::write));
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_LCD));
@@ -298,6 +302,14 @@
 
 	PALETTE(config, m_palette, FUNC(gameking_state::gameking_palette), ARRAY_LENGTH(gameking_pens));
 
+	/* sound hardware */
+	SPEAKER(config, "speaker").front_center();
+
+	DAC_8BIT_R2R_TWOS_COMPLEMENT(config, "dac", 0).add_route(0, "speaker", 1.0);
+	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
+	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
+	vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
+
 	/* cartridge */
 	GENERIC_CARTSLOT(config, "cartslot", generic_plain_slot, "gameking_cart", "bin").set_device_load(FUNC(gameking_state::cart_load));
 }
@@ -338,9 +350,9 @@
 	ROM_LOAD("gm220.bin", 0x00000, 0x80000, CRC(1dc43bd5) SHA1(f9dcd3cb76bb7cb10565a1acb070ab375c082b4c) )
 ROM_END
 
-CONS( 2003, gameking, 0, 0, gameking1, gameking, gameking_state, init_gameking, "TimeTop", "GameKing GM-218", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+CONS( 2003, gameking, 0, 0, gameking1, gameking, gameking_state, init_gameking, "TimeTop", "GameKing GM-218", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
 // the GameKing 2 (GM-219) is probably identical HW
 
-CONS( 2003, gamekin3, 0, 0, gameking3, gameking3, gameking_state, init_gameking, "TimeTop", "GameKing 3",      MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+CONS( 2003, gamekin3, 0, 0, gameking3, gameking3, gameking_state, init_gameking, "TimeTop", "GameKing 3",      MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
 // gameking 3: similiar cartridges, accepts gameking cartridges, gameking3 cartridges not working on gameking (illegal cartridge scroller)
 // my gameking bios backup solution might work on it
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/gamemachine.cpp mame-0.224+dfsg.1/src/mame/drivers/gamemachine.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/gamemachine.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/gamemachine.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -214,11 +214,11 @@
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_SLASH) PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_NAME("9")
 
 	PORT_START("IN.1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_L) PORT_CODE(KEYCODE_SLASH_PAD) PORT_CODE(KEYCODE_LEFT) PORT_NAME(UTF8_DIVIDE)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_L) PORT_CODE(KEYCODE_SLASH_PAD) PORT_CODE(KEYCODE_LEFT) PORT_NAME(u8"÷")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_STOP) PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_8_PAD) PORT_NAME("8")
 
 	PORT_START("IN.2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_K) PORT_CODE(KEYCODE_ASTERISK) PORT_CODE(KEYCODE_UP) PORT_NAME(UTF8_MULTIPLY)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_K) PORT_CODE(KEYCODE_ASTERISK) PORT_CODE(KEYCODE_UP) PORT_NAME(u8"×")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_COMMA) PORT_CODE(KEYCODE_7) PORT_CODE(KEYCODE_7_PAD) PORT_CODE(KEYCODE_DOWN) PORT_NAME("7")
 
 	PORT_START("IN.3")
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/generalplus_gpl16250_nand.cpp mame-0.224+dfsg.1/src/mame/drivers/generalplus_gpl16250_nand.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/generalplus_gpl16250_nand.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/generalplus_gpl16250_nand.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -458,6 +458,15 @@
 	ROM_LOAD( "wlsair60.nand", 0x0000, 0x8400000, CRC(eec23b97) SHA1(1bb88290cf54579a5bb51c08a02d793cd4d79f7a) )
 ROM_END
 
+ROM_START( kiugames )
+	ROM_REGION16_BE( 0x40000, "maincpu:internal", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "internal.rom", 0x00000, 0x40000, NO_DUMP ) // used as bootstrap only
+
+	ROM_REGION( 0x21000000, "nandrom", ROMREGION_ERASE00 )
+	ROM_LOAD( "hy27084g2m.u2", 0x0000, 0x21000000, CRC(65cc3864) SHA1(b759ec9816fe98a33ee7d5e12e5492f0160c5b31) )
+ROM_END
+
+
 ROM_START( jak_gtg )
 	ROM_REGION16_BE( 0x40000, "maincpu:internal", ROMREGION_ERASE00 )
 	ROM_LOAD16_WORD_SWAP( "internal.rom", 0x00000, 0x40000, NO_DUMP ) // used as bootstrap only
@@ -546,6 +555,23 @@
 ROM_END
 
 
+ROM_START( jak_hsmg2 )
+	ROM_REGION16_BE( 0x40000, "maincpu:internal", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "internal.rom", 0x00000, 0x40000, NO_DUMP ) // used as bootstrap only
+
+	ROM_REGION( 0x4200000, "nandrom", ROMREGION_ERASE00 )
+	ROM_LOAD( "hsm_as_hy27ys08121a_9876.bin", 0x0000, 0x4200000, CRC(4da61056) SHA1(d6c529a6df2703dd55b864e9d7c655203206f8b6) )
+ROM_END
+
+ROM_START( jak_hmg2 )
+	ROM_REGION16_BE( 0x40000, "maincpu:internal", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "internal.rom", 0x00000, 0x40000, NO_DUMP ) // used as bootstrap only
+
+	ROM_REGION( 0x4200000, "nandrom", ROMREGION_ERASE00 )
+	ROM_LOAD( "hm_as_hy27us08121a_9876_fixed.bin", 0x0000, 0x4200000, BAD_DUMP CRC(ba97fcd6) SHA1(c02a6878910b1312009b21220d51d7c1c3adb767) ) // 4 blocks had to be fixed using data from jak_hmhsm
+ROM_END
+
+
 ROM_START( jak_umdf )
 	ROM_REGION16_BE( 0x40000, "maincpu:internal", ROMREGION_ERASE00 )
 	ROM_LOAD16_WORD_SWAP( "internal.rom", 0x00000, 0x40000, NO_DUMP ) // used as bootstrap only
@@ -712,7 +738,7 @@
 		*/
 
 		// probably more bytes are used
-		int dest = m_strippedrom[0x15] << 8;
+		int dest = m_strippedrom[0x15] << 8 | (m_strippedrom[0x16] << 16);
 
 		// copy a block of code from the NAND to RAM
 		for (int i = 0; i < m_initial_copy_words; i++)
@@ -722,19 +748,72 @@
 			mem.write_word(dest + i, word);
 		}
 
-		// these vectors must either directly point to RAM, or at least redirect there after some code
+		/* these vectors must either directly point to RAM, or at least redirect there after some code
+
+		   kiugames has the startup code copied to 20xxx which is outside the scope of a 16-bit vector
+		   so these must trampoline (although 20xxx currently isn't handled as RAM, so that needs more
+		   thought anyway
+		*/
 		uint16_t* internal = (uint16_t*)memregion("maincpu:internal")->base();
-		internal[0x7ff5] = m_vectorbase + 0x0a;
-		internal[0x7ff6] = m_vectorbase + 0x0c;
-		internal[0x7ff7] = dest + 0x20; // point boot vector at code in RAM (probably in reality points to internal code that copies the first block)
-		internal[0x7ff8] = m_vectorbase + 0x10;
-		internal[0x7ff9] = m_vectorbase + 0x12;
-		internal[0x7ffa] = m_vectorbase + 0x14;
-		internal[0x7ffb] = m_vectorbase + 0x16;
-		internal[0x7ffc] = m_vectorbase + 0x18;
-		internal[0x7ffd] = m_vectorbase + 0x1a;
-		internal[0x7ffe] = m_vectorbase + 0x1c;
-		internal[0x7fff] = m_vectorbase + 0x1e;
+
+		int addr;
+		addr = (m_vectorbase + 0x0a) & 0x000fffff;
+		internal[0x7f00] = 0xfe80 | (addr >> 16);
+		internal[0x7f01] = (addr & 0xffff);
+
+		addr = (m_vectorbase + 0x0c) & 0x000fffff;
+		internal[0x7f02] = 0xfe80 | (addr >> 16);
+		internal[0x7f03] = (addr & 0xffff);
+
+		addr = (dest + 0x20) & 0x000fffff; // point boot vector at code in RAM (probably in reality points to internal code that copies the first block)
+		internal[0x7f04] = 0xfe80 | (addr >> 16);
+		internal[0x7f05] = (addr & 0xffff);
+
+		addr = (m_vectorbase + 0x10) & 0x000fffff;
+		internal[0x7f06] = 0xfe80 | (addr >> 16);
+		internal[0x7f07] = (addr & 0xffff);
+
+		addr = (m_vectorbase + 0x12) & 0x000fffff;
+		internal[0x7f08] = 0xfe80 | (addr >> 16);
+		internal[0x7f09] = (addr & 0xffff);
+
+		addr = (m_vectorbase + 0x14) & 0x000fffff;
+		internal[0x7f0a] = 0xfe80 | (addr >> 16);
+		internal[0x7f0b] = (addr & 0xffff);
+
+		addr = (m_vectorbase + 0x16) & 0x000fffff;
+		internal[0x7f0c] = 0xfe80 | (addr >> 16);
+		internal[0x7f0d] = (addr & 0xffff);
+
+		addr = (m_vectorbase + 0x18) & 0x000fffff;
+		internal[0x7f0e] = 0xfe80 | (addr >> 16);
+		internal[0x7f0f] = (addr & 0xffff);
+
+		addr = (m_vectorbase + 0x1a) & 0x000fffff;
+		internal[0x7f10] = 0xfe80 | (addr >> 16);
+		internal[0x7f11] = (addr & 0xffff);
+
+		addr = (m_vectorbase + 0x1c) & 0x000fffff;
+		internal[0x7f12] = 0xfe80 | (addr >> 16);
+		internal[0x7f13] = (addr & 0xffff);
+
+		addr = (m_vectorbase + 0x1e) & 0x000fffff;
+		internal[0x7f14] = 0xfe80 | (addr >> 16);
+		internal[0x7f15] = (addr & 0xffff);
+
+
+		internal[0x7ff5] = 0xff00;
+
+		internal[0x7ff6] = 0xff02;
+		internal[0x7ff7] = 0xff04;
+		internal[0x7ff8] = 0xff06;
+		internal[0x7ff9] = 0xff08;
+		internal[0x7ffa] = 0xff0a;
+		internal[0x7ffb] = 0xff0c;
+		internal[0x7ffc] = 0xff0e;
+		internal[0x7ffd] = 0xff10;
+		internal[0x7ffe] = 0xff12;
+		internal[0x7fff] = 0xff14;
 	}
 
 	m_maincpu->reset(); // reset CPU so vector gets read etc.
@@ -778,6 +857,13 @@
 	m_initial_copy_words = 0x2800;
 }
 
+void generalplus_gpac800_game_state::nand_kiugames()
+{
+	nand_init840();
+	m_initial_copy_words = 0x10000;
+}
+
+
 void generalplus_gpac800_game_state::nand_vbaby()
 {
 	nand_init840();
@@ -807,16 +893,19 @@
 
 // NAND dumps w/ internal bootstrap (and u'nSP 2.0 extended opcodes)  (have gpnandnand strings)
 // the JAKKS ones seem to be known as 'Generalplus GPAC800' hardware
-CONS(2010, wlsair60,   0, 0, generalplus_gpac800,       jak_car2, generalplus_gpac800_game_state,       nand_wlsair60,      "Jungle Soft / Kids Station Toys Inc",      "Wireless Air 60",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
+CONS(2010, wlsair60,   0, 0, generalplus_gpac800,       jak_car2, generalplus_gpac800_game_state,       nand_wlsair60,      "Jungle Soft / Kids Station Toys Inc",      "Wireless Air 60",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING) // some of th games seem to be based on ones found in the 'Millennium Arcade' multigames (WinFun related) so might have the same external timer check
 CONS(200?, beambox,    0, 0, generalplus_gpac800,       jak_car2, generalplus_gpac800_game_state,       nand_beambox,       "Hasbro",                                   "Playskool Heroes Transformers Rescue Bots Beam Box (Spain)",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
 CONS(200?, mgtfit,     0, 0, generalplus_gpac800,       jak_car2, generalplus_gpac800_game_state,       nand_wlsair60,      "MGT",                                      "Fitness Konsole (NC1470)",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING) // probably has other names in English too? menus don't appear to be in German
 CONS(200?, vbaby,      0, 0, generalplus_gpac800_vbaby, jak_car2, generalplus_gpac800_vbaby_game_state, nand_vbaby,         "VTech",                                    "V.Baby", MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
+CONS(200?, kiugames,   0, 0, generalplus_gpac800,       jak_car2, generalplus_gpac800_game_state,       nand_kiugames,      "VideoJet",                                 "Kiu Games",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING) // probably has other names in English too? menus don't appear to be in German
 
 CONS(200?, jak_gtg,    0, 0, generalplus_gpac800,       jak_gtg,  generalplus_gpac800_game_state,       nand_init210,       "JAKKS Pacific Inc / HotGen Ltd",           "Golden Tee Golf (JAKKS Pacific TV Game)",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
 CONS(200?, jak_car2,   0, 0, generalplus_gpac800,       jak_car2, generalplus_gpac800_game_state,       nand_init210,       "JAKKS Pacific Inc / HotGen Ltd",           "Cars 2 (JAKKS Pacific TV Game)",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
 CONS(2010, jak_tsm,    0, 0, generalplus_gpac800,       jak_car2, generalplus_gpac800_game_state,       nand_tsm,           "JAKKS Pacific Inc / Schell Games",         "Toy Story Mania (JAKKS Pacific TV Game)",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
 CONS(2009, jak_sspop,  0, 0, generalplus_gpac800,       jak_hsm,  generalplus_gpac800_game_state,       nand_init210_32mb,  "JAKKS Pacific Inc / HotGen Ltd",           "Sing Scene Pop (JAKKS Pacific TV Game)",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
-CONS(2008, jak_hmhsm,  0, 0, generalplus_gpac800,       jak_hsm,  generalplus_gpac800_game_state,       nand_init210_32mb,  "JAKKS Pacific Inc / HotGen Ltd",           "Hannah Montana G2 Deluxe / High School Musical G2 Deluxe 2-in-1 (JAKKS Pacific TV Game)",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
+CONS(2008, jak_hmg2,   0, 0, generalplus_gpac800,       jak_hsm,  generalplus_gpac800_game_state,       nand_init210_32mb,  "JAKKS Pacific Inc / HotGen Ltd",           "Hannah Montana G2 Deluxe - All in One (JAKKS Pacific TV Game)",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING) // Jul 9 2008 11:50:08
+CONS(2008, jak_hsmg2,  0, 0, generalplus_gpac800,       jak_hsm,  generalplus_gpac800_game_state,       nand_init210_32mb,  "JAKKS Pacific Inc / HotGen Ltd",           "High School Musical G2 Deluxe - All in One (JAKKS Pacific TV Game)",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING) // Jun 25 2008 14:53:14
+CONS(2008, jak_hmhsm,  0, 0, generalplus_gpac800,       jak_hsm,  generalplus_gpac800_game_state,       nand_init210_32mb,  "JAKKS Pacific Inc / HotGen Ltd",           "Hannah Montana G2 Deluxe / High School Musical G2 Deluxe - Two in One (JAKKS Pacific TV Game)",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING) // Sep 12 2008 18:48:14 (Menu/HM) / Sep 12 2008 18:50:45 (HSM)
 CONS(2008, jak_umdf,   0, 0, generalplus_gpac800,       jak_hsm,  generalplus_gpac800_game_state,       nand_init210_32mb,  "JAKKS Pacific Inc / Handheld Games",       "Ultimotion - Disney Fairies Sleeping Beauty & TinkerBell (JAKKS Pacific TV Game)",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING)
 // Ultimotion Swing Zone is SPG29xx instead
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/generalplus_gpl16250_rom.cpp mame-0.224+dfsg.1/src/mame/drivers/generalplus_gpl16250_rom.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/generalplus_gpl16250_rom.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/generalplus_gpl16250_rom.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -396,16 +396,24 @@
 	//ROM_LOAD16_WORD_SWAP( "internal.rom", 0x00000, 0x40000, NO_DUMP )
 
 	ROM_REGION( 0x8000000, "maincpu", ROMREGION_ERASE00 )
-	ROM_LOAD16_WORD_SWAP( "u1g-2a.u2", 0x0000000, 0x8000000, BAD_DUMP CRC(0fd769a1) SHA1(df19402bcd20075483d63fb98fb3fa42bd33ccfd) ) // several sections of ROM appear to be erased, and fails ROM test, some games have missing graphics pulling from those areas, others crash due to missing code
+	ROM_LOAD16_WORD_SWAP( "taikee220.bin", 0x0000000, 0x8000000, CRC(02881534) SHA1(a0e0c9cfa3a6b1c6107f06abd3268b82bd663d06) )
 ROM_END
 
 
+ROM_START( imgame )
+	//ROM_REGION16_BE( 0x40000, "maincpu:internal", ROMREGION_ERASE00 ) // not on this model? (or at least not this size, as CS base is different)
+	//ROM_LOAD16_WORD_SWAP( "internal.rom", 0x00000, 0x40000, NO_DUMP )
+
+	ROM_REGION( 0x8000000, "maincpu", ROMREGION_ERASE00 ) // the 2nd half of this ROM required multiple attempts to get a matching dump, so could be suspect, might also be unused as this only has 120 games
+	ROM_LOAD16_WORD_SWAP( "imgame.bin", 0x0000000, 0x8000000, CRC(6fba9021) SHA1(852f4c0aaed682aa8ff5b8cd52313ea2d3d920a1))
+ROM_END
+
 ROM_START( myac220 )
 	//ROM_REGION16_BE( 0x40000, "maincpu:internal", ROMREGION_ERASE00 ) // not on this model? (or at least not this size, as CS base is different)
 	//ROM_LOAD16_WORD_SWAP( "internal.rom", 0x00000, 0x40000, NO_DUMP )
 
 	ROM_REGION( 0x8000000, "maincpu", ROMREGION_ERASE00 )
-	ROM_LOAD16_WORD_SWAP( "myarcadegogamerportable.bin", 0x0000000, 0x8000000, BAD_DUMP CRC(c929a2fa) SHA1(e99007ccc45a268267b4ea0efaf22e3117f5a6bd) ) // again several sections seemed to be erased, was repaired with data from tkmag220, likely good but should be verified
+	ROM_LOAD16_WORD_SWAP( "myarcadegogamerportable.bin", 0x0000000, 0x8000000, BAD_DUMP CRC(c929a2fa) SHA1(e99007ccc45a268267b4ea0efaf22e3117f5a6bd) ) // several sections seemed to be erased, was repaired with data from tkmag220, likely good but should be verified
 ROM_END
 
 void tkmag220_game_state::tkmag220(machine_config &config)
@@ -468,14 +476,16 @@
 CONS(2009, smartfp,   0,       0, base, smartfp,  gcm394_game_state, empty_init, "Fisher-Price", "Fun 2 Learn Smart Fit Park (UK)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
 CONS(2009, smartfps,  smartfp, 0, base, smartfp,  gcm394_game_state, empty_init, "Fisher-Price", "Fun 2 Learn Smart Fit Park (Spain)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
 
-// This is a port of the 'Family Sport' games to GPL16250 type hardware, but it doesn't seem to use any unSP 2.0 instructions.
+// These are ports of the 'Family Sport' games to GPL16250 type hardware, but they don't seem to use many unSP 2.0 instructions.
 // The menu style is close to 'm505neo' but the game selection is closer to 'dnv200fs' (but without the Sports titles removed, and with a few other extras not found on that unit)
-// do "go A1595" then "r1 = 0" in debugger to show menu, controls not yet working (which might be why it drops to test mode by default) will need banking hookup later.
-// This could be useful for figuring out how the sound registers have been remapped when compared to spg2xx
 CONS(201?, tkmag220,  0,       0, tkmag220, tkmag220, tkmag220_game_state,  empty_init,      "TaiKee",         "Mini Arcade Games Console (Family Sport 220-in-1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
 // DGUN-2891 or DGUN-2864 ? both look the same, no indication on unboxed unit?
 CONS(201?, myac220,   0,       0, tkmag220, tkmag220, tkmag220_game_state,  empty_init,      "dreamGEAR",      "My Arcade Go Gamer Portable (Family Sport 220-in-1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
 
+// 2012 date from manual
+CONS(2012, imgame,    0,       0, tkmag220, tkmag220, tkmag220_game_state,  empty_init,      "I'm Game",      "I'm Game! GP120 (Family Sport 120-in-1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+// a 180 game Family Sport I'm Game! also exists (and some Famiclones)
+
 // die on this one is 'GCM420'
 CONS(2013, gormiti,   0, 0, base, gormiti,  gormiti_game_state, empty_init, "Giochi Preziosi", "Gormiti Game Arena (Spain)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND)
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/generalplus_gpl32612.cpp mame-0.224+dfsg.1/src/mame/drivers/generalplus_gpl32612.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/generalplus_gpl32612.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/generalplus_gpl32612.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -109,6 +109,12 @@
 	ROM_LOAD( "dcheroportal_mx30lf1g08aa_c2f1.bin", 0x000000, 0x8400000, CRC(576a3005) SHA1(6cd9edc4def707aede3f82a21c87269d2a6bc870) )
 ROM_END
 
+ROM_START( jak_prhp )
+	ROM_REGION( 0x8400000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "mx30lf1g08aa.u2", 0x000000, 0x8400000, CRC(4ccd7e53) SHA1(decbd424f088d180776a817c80b147d6a887e5c1) )
+ROM_END
+
+
 void generalplus_gpl32612_game_state::nand_init(int blocksize, int blocksize_stripped)
 {
 	uint8_t* rom = memregion("maincpu")->base();
@@ -154,5 +160,5 @@
 CONS( 200?, jak_swbstrik,    0,       0,      gpl32612, gpl32612, generalplus_gpl32612_game_state, nand_init840, "JAKKS Pacific Inc", "Star Wars Blaster Strike", MACHINE_IS_SKELETON )
 CONS( 200?, jak_tmnthp,      0,       0,      gpl32612, gpl32612, generalplus_gpl32612_game_state, nand_init840, "JAKKS Pacific Inc", "Teenage Mutant Ninja Turtles Hero Portal", MACHINE_IS_SKELETON )
 CONS( 200?, jak_ddhp,        0,       0,      gpl32612, gpl32612, generalplus_gpl32612_game_state, nand_init840, "JAKKS Pacific Inc", "DreamWorks Dragons Hero Portal", MACHINE_IS_SKELETON )
-// Hero Portal Power Rangers
+CONS( 200?, jak_prhp,        0,       0,      gpl32612, gpl32612, generalplus_gpl32612_game_state, nand_init840, "JAKKS Pacific Inc", "Power Rangers Super Megaforce Hero Portal", MACHINE_IS_SKELETON ) // from a PAL unit (probably not region specific)
 CONS( 200?, jak_dchp,        0,       0,      gpl32612, gpl32612, generalplus_gpl32612_game_state, nand_init840, "JAKKS Pacific Inc", "DC Super Heroes The Watchtower Hero Portal", MACHINE_IS_SKELETON )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/generalplus_gpl_unknown.cpp mame-0.224+dfsg.1/src/mame/drivers/generalplus_gpl_unknown.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/generalplus_gpl_unknown.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/generalplus_gpl_unknown.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,618 @@
+// license:BSD-3-Clause
+// copyright-holders:David Haywood
+
+// these contain the similar game selections to the games in unk6502_st2xxx.cpp but on updated hardware
+
+// These use SPI ROMs and unSP2.0 instructions, so will be GeneralPlus branded parts, not SunPlus
+// possibly the framebuffer based video ones rather than the ones with tile layers
+
+/*
+
+for pcp8728 long jumps are done indirect via a call to RAM
+
+990c 20ec       r4 = 20ec
+d9dd            [1d] = r4
+990c 0007       r4 = 0007
+d9de            [1e] = r4
+fe80 28f7       goto 0028f7
+
+the code to handle this is copied in at startup.
+
+Almost all function calls in the game are handled via a call to RAM which copies data inline from SPI for execution
+these calls manage their own stack, and copying back the caller function on return etc.
+
+The largest function in RAM at any one time is ~0x600 bytes.
+
+This appears to be incredibly inefficient but the system can't execute directly from SPI ROM, and doesn't have any
+RAM outside of the small area internal to the Sunplus SoC
+
+Graphics likewise appear to be loaded pixel by pixel from the SPI to framebuffer every single time there is a draw
+call.  Sound is almost certainly handled in the same way.
+
+There is a missing internal ROM that acts as bootstrap and provides some basic functions.  It is at least 0x1000
+words in size, with the lowest call being to 0xf000.  It is potentially larger than this.
+
+The internal ROM will also need to provide trampolining for the interrupts, there is a single pointer near the
+start of the SPI ROM '02000A: 0041 0002' which points to 20041 (assuming you map the SPI ROM base as word address
+0x20000, so that the calls to get code align with ROM addresses)
+
+The function pointed to for the interrupt has the same form of the other functions that get loaded into RAM via
+calls to functions in the RAM area.
+
+--------------------------------------------------------
+
+BIOS (internal ROM) calls:
+
+0xf000 - copy dword from SPI using provided pointer
+
+0xf56f - unknown, after some time, done with PC = f56f, only in one place
+
+0xf58f - unknown, soon after startup (only 1 call)
+
+00f7a0 - unknown - 3 calls
+
+0xf931 - unknown, just one call
+
+00fa1d - unknown, just one call
+
+0xfb26 - unknown, after some time (done with pc = fb26 and calls)
+
+0xfb4f - unknown, just one call
+
+0xfbbf - unknown, 3 calls
+
+code currently goes off the rails after some of these unhandled calls (one to f56f?)
+
+--
+
+use 'go 2938' to get to the inline code these load on the fly
+
+the first piece of code copied appears to attempt to checksum the internal BIOS!
+
+*/
+
+#include "emu.h"
+
+#include "cpu/unsp/unsp.h"
+
+#include "emupal.h"
+#include "screen.h"
+#include "speaker.h"
+
+
+class pcp8718_state : public driver_device
+{
+public:
+	pcp8718_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu"),
+		m_mainram(*this, "mainram"),
+		m_palette(*this, "palette"),
+		m_screen(*this, "screen"),
+		m_spirom(*this, "spi")
+	{ }
+
+	void pcp8718(machine_config &config);
+
+	void spi_init();
+
+private:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+	required_device<unsp_20_device> m_maincpu;
+	required_shared_ptr<uint16_t> m_mainram;
+
+	required_device<palette_device> m_palette;
+	required_device<screen_device> m_screen;
+
+	void map(address_map &map);
+
+	uint16_t simulate_f000_r(offs_t offset);
+
+	uint16_t ramcall_2060_logger_r();
+	uint16_t ramcall_2189_logger_r();
+
+	uint16_t ramcall_2434_logger_r();
+
+	uint16_t ramcall_2829_logger_r();
+	uint16_t ramcall_287a_logger_r();
+	uint16_t ramcall_28f7_logger_r();
+	uint16_t ramcall_2079_logger_r();
+
+
+	required_region_ptr<uint8_t> m_spirom;
+
+	uint16_t unk_7abf_r();
+	uint16_t unk_7860_r();
+
+	void unk_7868_w(uint16_t data);
+
+	uint16_t spi_misc_control_r();
+	uint16_t spi_rx_fifo_r();
+	void spi_tx_fifo_w(uint16_t data);
+
+	void spi_control_w(uint16_t data);
+
+
+	void spi_process_tx_data(uint8_t data);
+	uint8_t spi_process_rx();
+	uint8_t spi_rx();
+
+	uint8_t m_rx_fifo[4]; // actually 8 bytes? or 8 half-bytes?
+
+	uint32_t m_spiaddress;
+
+	enum spistate : const int
+	{
+	   SPI_STATE_READY = 0,
+	   SPI_STATE_WAITING_HIGH_ADDR = 1,
+	   SPI_STATE_WAITING_MID_ADDR = 2,
+	   SPI_STATE_WAITING_LOW_ADDR = 3,
+	   // probably not
+	   SPI_STATE_WAITING_DUMMY1_ADDR = 4,
+	   SPI_STATE_WAITING_DUMMY2_ADDR = 5,
+	   SPI_STATE_READING = 6
+
+	};
+
+	spistate m_spistate;
+
+};
+
+uint32_t pcp8718_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	m_mainram[0x12] |= 0x8000; // some code waits on this, what is it?
+	m_mainram[0x09] &= 0xfff0; // should be cleared by IRQ?
+	return 0;
+}
+
+
+
+
+void pcp8718_state::machine_start()
+{
+}
+
+static INPUT_PORTS_START( pcp8718 )
+INPUT_PORTS_END
+
+uint16_t pcp8718_state::unk_7abf_r()
+{
+	return 0x0001;
+}
+
+uint16_t pcp8718_state::unk_7860_r()
+{
+	return machine().rand() & 0x8;
+}
+
+
+uint16_t pcp8718_state::spi_misc_control_r()
+{
+	logerror("%06x: spi_misc_control_r\n", machine().describe_context());
+	return 0x0000;
+}
+
+
+uint16_t pcp8718_state::spi_rx_fifo_r()
+{
+	logerror("%06x: spi_rx_fifo_r\n", machine().describe_context());
+	return spi_rx();
+}
+
+void pcp8718_state::spi_process_tx_data(uint8_t data)
+{
+	logerror("transmitting %02x\n", data);
+
+	switch (m_spistate)
+	{
+	case SPI_STATE_READY:
+	{
+		if (data == 0x03)
+		{
+			logerror("set to read mode (need address) %02x\n", data);
+			m_spistate = SPI_STATE_WAITING_HIGH_ADDR;
+		}
+		else
+		{
+			logerror("invalid state request %02x\n", data);
+		}
+		break;
+	}
+
+	case SPI_STATE_WAITING_HIGH_ADDR:
+	{
+		m_spiaddress = (m_spiaddress & 0xff00ffff) | data << 16;
+		logerror("set to high address %02x address is now %08x\n", data, m_spiaddress);
+		m_spistate = SPI_STATE_WAITING_MID_ADDR;
+		break;
+	}
+
+	case SPI_STATE_WAITING_MID_ADDR:
+	{
+		m_spiaddress = (m_spiaddress & 0xffff00ff) | data << 8;
+		logerror("set to mid address %02x address is now %08x\n", data, m_spiaddress);
+		m_spistate = SPI_STATE_WAITING_LOW_ADDR;
+		break;
+	}
+
+	case SPI_STATE_WAITING_LOW_ADDR:
+	{
+		m_spiaddress = (m_spiaddress & 0xffffff00) | data;
+		logerror("set to low address %02x address is now %08x\n", data, m_spiaddress);
+		m_spistate = SPI_STATE_READING;
+		break;
+	}
+
+	case SPI_STATE_READING:
+	{
+		// writes when in read mode clock in data?
+		logerror("write while in read mode (clock data?)\n", data, m_spiaddress);
+		break;
+	}
+
+	case SPI_STATE_WAITING_DUMMY1_ADDR:
+	{
+		m_spistate = SPI_STATE_WAITING_DUMMY2_ADDR;
+		break;
+	}
+
+	case SPI_STATE_WAITING_DUMMY2_ADDR:
+	{
+	//  m_spistate = SPI_STATE_READY;
+		break;
+	}
+	}
+}
+
+uint8_t pcp8718_state::spi_process_rx()
+{
+
+	switch (m_spistate)
+	{
+	case SPI_STATE_READING:
+	{
+		uint8_t dat = m_spirom[m_spiaddress & 0x3fffff];
+
+		// hack internal BIOS checksum check
+		if (m_spiaddress == ((0x49d13 - 0x20000) * 2)+1)
+			if (dat == 0x4e)
+				dat = 0x5e;
+
+		logerror("reading SPI %02x from SPI Address %08x (adjusted word offset %08x)\n", dat, m_spiaddress, (m_spiaddress/2)+0x20000);
+		m_spiaddress++;
+		return dat;
+	}
+
+	default:
+	{
+		logerror("reading FIFO in unknown state\n");
+		return 0x00;
+	}
+	}
+
+	return 0x00;
+}
+
+
+uint8_t pcp8718_state::spi_rx()
+{
+	uint8_t ret = m_rx_fifo[0];
+
+	m_rx_fifo[0] = m_rx_fifo[1];
+	m_rx_fifo[1] = m_rx_fifo[2];
+	m_rx_fifo[2] = m_rx_fifo[3];
+	m_rx_fifo[3] = spi_process_rx();
+
+	return ret;
+}
+
+
+void pcp8718_state::spi_tx_fifo_w(uint16_t data)
+{
+	data &= 0x00ff;
+	logerror("%06x: spi_tx_fifo_w %02x\n", machine().describe_context(), data);
+
+	spi_process_tx_data(data);
+}
+
+// this is probably 'port b' but when SPI is enabled some points of this can become SPI control pins
+// it's accessed after each large data transfer, probably to reset the SPI into 'ready for command' state?
+void pcp8718_state::unk_7868_w(uint16_t data)
+{
+	logerror("%06x: unk_7868_w %02x (Port B + SPI reset?)\n", machine().describe_context(), data);
+
+	for (int i = 0; i < 4; i++)
+		m_rx_fifo[i] = 0xff;
+
+	m_spistate = SPI_STATE_READY;
+
+}
+
+
+void pcp8718_state::spi_control_w(uint16_t data)
+{
+	logerror("%06x: spi_control_w %04x\n", machine().describe_context(), data);
+}
+
+void pcp8718_state::map(address_map &map)
+{
+	// there are calls to 01xxx and 02xxx regions
+	// (RAM populated by internal ROM?, TODO: check to make sure code copied there isn't from SPI ROM like the GPL16250 bootstrap
+	//  does from NAND, it doesn't seem to have a header in the same format at least)
+	map(0x000000, 0x006fff).ram().share("mainram");
+	map(0x007000, 0x0077ff).ram(); // might be registers, but the call stubs for RAM calls explicitly use addresses in here for private stack so that previous snippets can be restored?
+
+	map(0x007860, 0x007860).r(FUNC(pcp8718_state::unk_7860_r));
+
+	map(0x007868, 0x007868).w(FUNC(pcp8718_state::unk_7868_w));
+
+	map(0x007940, 0x007940).w(FUNC(pcp8718_state::spi_control_w));
+	// 7941 SPI Transmit Status
+	map(0x007942, 0x007942).w(FUNC(pcp8718_state::spi_tx_fifo_w));
+	// 7943 SPI Receive Status
+	map(0x007944, 0x007944).r(FUNC(pcp8718_state::spi_rx_fifo_r));
+	map(0x007945, 0x007945).r(FUNC(pcp8718_state::spi_misc_control_r));
+
+	map(0x007abf, 0x007abf).r(FUNC(pcp8718_state::unk_7abf_r));
+
+
+	// registers at 7xxx are similar to GPL16250, but not identical? (different video system?)
+
+	// there are calls to 0x0f000 (internal ROM?)
+	map(0x00f000, 0x00ffff).rom().region("maincpu", 0x00000);
+}
+
+
+
+uint16_t pcp8718_state::simulate_f000_r(offs_t offset)
+{
+	if (!machine().side_effects_disabled())
+	{
+		uint16_t pc = m_maincpu->state_int(UNSP_PC);
+		uint16_t sr = m_maincpu->state_int(UNSP_SR);
+		int realpc = (pc | (sr << 16)) & 0x003fffff;
+
+		if ((offset + 0xf000) == (realpc))
+		{
+			if (realpc == 0xf000)
+			{
+				address_space& mem = m_maincpu->space(AS_PROGRAM);
+
+				uint32_t source = (mem.read_word(0x001e) << 16) | mem.read_word(0x001d);
+
+				if (source >= 0x20000)
+				{
+					uint16_t data = m_spirom[((source - 0x20000) * 2) + 0] | (m_spirom[((source - 0x20000) * 2) + 1] << 8);
+					uint16_t data2 = m_spirom[((source - 0x20000) * 2) + 2] | (m_spirom[((source - 0x20000) * 2) + 3] << 8);
+
+					logerror("call to 0xf000 - copying from %08x to 04/05\n", source); // some code only uses 04, but other code copies pointers and expects results in 04 and 05
+
+					mem.write_word(0x0004, data);
+					mem.write_word(0x0005, data2);
+				}
+
+				return 0x9a90; // retf
+			}
+			else if (realpc == 0xf58f)
+			{
+				logerror("call to 0xf58f - unknown function\n");
+				return 0x9a90; // retf
+			}
+			else if (realpc == 0xfb26) // done with a call, and also a pc =
+			{
+				logerror("call to 0xfb26 - unknown function\n");
+				return 0x9a90; // retf
+			}
+			else if (realpc == 0xf56f) // done with a pc =
+			{
+				logerror("call to 0xf56f - unknown function\n");
+				return 0x9a90; // retf
+			}
+			else
+			{
+				fatalerror("simulate_f000_r unhandled BIOS simulation offset %04x\n", offset);
+			}
+
+		}
+		else
+		{
+			logerror("simulate_f000_r reading BIOS area (for checksum?) %04x\n", offset);
+		}
+	}
+	return 0x0000;
+}
+
+uint16_t pcp8718_state::ramcall_2060_logger_r()
+{
+	if (!machine().side_effects_disabled())
+	{
+		logerror("call to 0x2060 in RAM (set SPI to read mode, set address, do dummy FIFO reads)\n");
+	}
+	return m_mainram[0x2060];
+}
+
+uint16_t pcp8718_state::ramcall_2189_logger_r()
+{
+	if (!machine().side_effects_disabled())
+	{
+		logerror("call to 0x2189 in RAM (unknown)\n");
+	}
+	return m_mainram[0x2189];
+}
+
+
+uint16_t pcp8718_state::ramcall_2829_logger_r()
+{
+	// this in turn calls 28f7 but has restore logic too
+	if (!machine().side_effects_disabled())
+	{
+		logerror("call to 0x2829 in RAM (load+call function from SPI address %08x)\n", (m_mainram[0x1e] << 16) | m_mainram[0x1d]);
+	}
+	return m_mainram[0x2829];
+}
+
+
+
+
+uint16_t pcp8718_state::ramcall_287a_logger_r()
+{
+	if (!machine().side_effects_disabled())
+	{
+		logerror("call to 0x287a in RAM (unknown)\n");
+	}
+	return m_mainram[0x287a];
+}
+
+uint16_t pcp8718_state::ramcall_28f7_logger_r()
+{
+	if (!machine().side_effects_disabled())
+	{
+		// no  restore logic?
+		logerror("call to 0x28f7 in RAM (load+GO TO function from SPI address %08x)\n", (m_mainram[0x1e] << 16) | m_mainram[0x1d]);
+	}
+	return m_mainram[0x28f7];
+}
+
+uint16_t pcp8718_state::ramcall_2079_logger_r()
+{
+	if (!machine().side_effects_disabled())
+	{
+		logerror("call to 0x2079 in RAM (maybe drawing related?)\n"); // called in the 'dummy' loop that doesn't actually draw? and other places? as well as after the actual draw command below in the real loop
+	}
+	return m_mainram[0x2079];
+}
+
+uint16_t pcp8718_state::ramcall_2434_logger_r()
+{
+	if (!machine().side_effects_disabled())
+	{
+		logerror("call to 0x2434 in RAM (drawing related?)\n"); // [1d] as the tile / sprite number, [1e] as xpos, [1f] as ypos, [20] as 0. [21] as ff in some title drawing calls
+	}
+	return m_mainram[0x2434];
+}
+
+
+
+void pcp8718_state::machine_reset()
+{
+	// this looks like it might actually be part of the IRQ handler (increase counter at 00 at the very start) rather than where we should end up after startup
+	// it also looks like (from the pc = 2xxx opcodes) that maybe this code should be being executed in RAM as those don't give correct offsets in the data segment.
+	m_maincpu->set_state_int(UNSP_PC, 0x4000);
+	m_maincpu->set_state_int(UNSP_SR, 0x0000);
+
+	//uint16_t* ROM = (uint16_t*)memregion("maincpu")->base();
+	//ROM[0x0000] = 0x9a90; // retf from internal ROM call to 0xf000 (unknown purpose)
+
+	// there doesn't appear to be any code to set the SP, so it must be done by the internal ROM
+	m_maincpu->set_state_int(UNSP_SP, 0x5fff);
+
+	m_maincpu->space(AS_PROGRAM).install_read_handler(0xf000, 0xffff, read16sm_delegate(*this, FUNC(pcp8718_state::simulate_f000_r)));
+
+	m_maincpu->space(AS_PROGRAM).install_read_handler(0x2060, 0x2060, read16smo_delegate(*this, FUNC(pcp8718_state::ramcall_2060_logger_r)));
+
+	m_maincpu->space(AS_PROGRAM).install_read_handler(0x2079, 0x2079, read16smo_delegate(*this, FUNC(pcp8718_state::ramcall_2079_logger_r)));
+
+	m_maincpu->space(AS_PROGRAM).install_read_handler(0x2189, 0x2189, read16smo_delegate(*this, FUNC(pcp8718_state::ramcall_2189_logger_r)));
+
+	m_maincpu->space(AS_PROGRAM).install_read_handler(0x2434, 0x2434, read16smo_delegate(*this, FUNC(pcp8718_state::ramcall_2434_logger_r)));
+
+	m_maincpu->space(AS_PROGRAM).install_read_handler(0x2829, 0x2829, read16smo_delegate(*this, FUNC(pcp8718_state::ramcall_2829_logger_r)));
+
+	m_maincpu->space(AS_PROGRAM).install_read_handler(0x287a, 0x287a, read16smo_delegate(*this, FUNC(pcp8718_state::ramcall_287a_logger_r)));
+
+	m_maincpu->space(AS_PROGRAM).install_read_handler(0x28f7, 0x28f7, read16smo_delegate(*this, FUNC(pcp8718_state::ramcall_28f7_logger_r)));
+
+	m_spistate = SPI_STATE_READY;
+	m_spiaddress = 0;
+
+}
+
+
+void pcp8718_state::pcp8718(machine_config &config)
+{
+
+	UNSP_20(config, m_maincpu, 20000000); // unknown CPU, unsp20 based
+	m_maincpu->set_addrmap(AS_PROGRAM, &pcp8718_state::map);
+
+	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+	m_screen->set_refresh_hz(60);
+	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0));
+	m_screen->set_size(64*8, 32*8);
+	m_screen->set_visarea(0*8, 40*8-1, 0*8, 30*8-1);
+	m_screen->set_screen_update(FUNC(pcp8718_state::screen_update));
+	m_screen->set_palette(m_palette);
+
+	PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x200);
+}
+
+// pcp8718 and pcp8728 both contain user data (player name?) and will need to be factory defaulted once they work
+// the ROM code is slightly different between them
+
+ROM_START( pcp8718 )
+	ROM_REGION( 0x2000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD16_WORD_SWAP( "internal.rom", 0x000000, 0x2000, NO_DUMP ) // exact size unknown
+
+	ROM_REGION( 0x800000, "spi", ROMREGION_ERASEFF )
+	//ROM_LOAD16_WORD_SWAP( "8718_en25f32.bin", 0x000000, 0x400000, CRC(cc138db4) SHA1(379af3d94ae840f52c06416d6cf32e25923af5ae) ) // bad dump, some blocks are corrupt
+	ROM_LOAD( "eyecare_25q32av1g_ef4016.bin", 0x000000, 0x400000, CRC(58415e10) SHA1(b1adcc03f2ad8d741544204671677740e904ce1a) )
+ROM_END
+
+ROM_START( pcp8728 )
+	ROM_REGION( 0x2000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD16_WORD_SWAP( "internal.rom", 0x000000, 0x2000, NO_DUMP ) // exact size unknown
+
+	ROM_REGION( 0x800000, "spi", ROMREGION_ERASEFF )
+	ROM_LOAD( "pcp 8728 788 in 1.bin", 0x000000, 0x400000, CRC(60115f21) SHA1(e15c39f11e442a76fae3823b6d510178f6166926) )
+ROM_END
+
+ROM_START( unkunsp )
+	ROM_REGION( 0x2000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD16_WORD_SWAP( "internal.rom", 0x000000, 0x2000, NO_DUMP ) // exact size unknown
+
+	ROM_REGION( 0x800000, "spi", ROMREGION_ERASEFF )
+	ROM_LOAD( "fm25q16a.bin", 0x000000, 0x200000, CRC(aeb472ac) SHA1(500c24b725f6d3308ef8cbdf4259f5be556c7c92) )
+ROM_END
+
+
+void pcp8718_state::spi_init()
+{
+	uint8_t* rom = memregion("spi")->base();
+
+	uint32_t start = rom[0] | (rom[1] << 8) | (rom[2] << 16) | (rom[3] << 24);
+	uint32_t end =   rom[4] | (rom[5] << 8) | (rom[2] << 16) | (rom[3] << 24);
+
+
+	logerror("start: %08x\n", start);
+	logerror("end: %08x\n", end);
+
+	int writebase = 0x4000;
+
+	if (start > end)
+	{
+		logerror("invalid initial copy?\n");
+		return;
+	}
+	else
+	{
+		start -= 0x20000;
+		end -= 0x20000;
+
+		for (int i = start*2; i <= end*2; i+=2)
+		{
+			uint16_t dat = rom[i] | (rom[i+1] << 8);
+			m_mainram[writebase++] = dat;
+		}
+	}
+
+}
+
+
+CONS( 200?, pcp8718,      0,       0,      pcp8718,   pcp8718, pcp8718_state, spi_init, "PCP", "PCP 8718 - HD 360 Degrees Rocker Palm Eyecare Console - 788 in 1", MACHINE_IS_SKELETON )
+CONS( 200?, pcp8728,      0,       0,      pcp8718,   pcp8718, pcp8718_state, spi_init, "PCP", "PCP 8728 - 788 in 1", MACHINE_IS_SKELETON ) // what name was this sold under?
+
+// maybe different hardware, first 0x2000 bytes in ROM is blank, so bootstrap pointers aren't there at least
+CONS( 200?, unkunsp,      0,       0,      pcp8718,   pcp8718, pcp8718_state, empty_init, "<unknown>", "unknown unSP-based handheld", MACHINE_IS_SKELETON )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/geniusjr.cpp mame-0.224+dfsg.1/src/mame/drivers/geniusjr.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/geniusjr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/geniusjr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,8 +7,6 @@
 CPU is 68HC05 derived?
 
 Other known undumped international versions:
-- Genius 4000 (French version of Genius Leader 4000)
-- Genius 5000 (French version of Genius Leader 5000)
 - Genius PRO (French version of Genius Leader Select)
 - Pitagorín Plus (Spanish version of Genius Junior Redstar 3)
 - PreComputer Notebook (alternate English version of Genius Leader Notebook)
@@ -25,6 +23,7 @@
 - Genius Einstein (French version of Genius Leader Action)
 - Genius Explorations (French version; German version unknown)
 - Genius Junior Profi 2
+- Genius Junior Profi 3
 - Genius Leader Action
 - Genius Leader Notebook Plus
 - Genius Master Notebook MM
@@ -36,9 +35,12 @@
 - Smart Start Future (alternate English version of Genius Junior Profi 2)
 - Talking Einstein (English version of Genius Leader Action)
 - Talking Whiz-Kid Explorer (alternate English version of Genius Leader Action)
+- Talking Whiz-Kid Honors (alternate English version of Genius Junior Notebook Plus)
 - Talking Whiz-Kid Laptop (English version of Genius Junior Profi 2)
+- Talking Whiz-Kid Lessons (English version of Genius Master Power Maus)
 - Talking Whiz-Kid Major Mouse (alternate English version of Genius Explorations)
 - Talking Whiz-Kid Notebook 2000 (English version of Genius Master Notebook MM)
+- Talking Whiz-Kid Notebook 3000 (alternate English version of Genius Master Notebook MM)
 - Talking Whiz-Kid Power Mouse Deluxe (English version of Genius Explorations)
 
 */
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/gigatron.cpp mame-0.224+dfsg.1/src/mame/drivers/gigatron.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/gigatron.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/gigatron.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,127 +1,269 @@
-// license:BSD-3-Clause
+// license:BSD-2-Clause
 // copyright-holders:Sterophonick, Phil Thomas
 /***************************************************************************
 
-   Skeleton driver for Gigatron TTL Microcomputer
-   Driver by Sterophonick
+    Driver for Gigatron TTL Microcomputer by Sterophonick
 
-***************************************************************************/
+    Based on Gigatron.js by Phil Thomas
+    https://github.com/PhilThomas/gigatron
 
-//There is a pre-existing emulator here https://github.com/PhilThomas/gigatron
-//It's just a matter of translating it to MAME.
+***************************************************************************/
 
 #include "emu.h"
 #include "cpu/gigatron/gigatron.h"
 #include "screen.h"
+#include "sound/dac.h"
+#include "sound/volt_reg.h"
 #include "speaker.h"
 
+#include "gigatron.lh"
+
 #define MAIN_CLOCK 6250000
+#define VSYNC      0x80
+#define HSYNC      0x40
+
+/***************************************************************************
+
+    TODO
+
+    Hook up a quikload for loading .gt1 files
+    HLE the keyboard and Pluggy McPlugface
+
+***************************************************************************/
+
+
+//**************************************************************************
+//  Driver Definition
+//**************************************************************************
 
 class gigatron_state : public driver_device
 {
 public:
 	gigatron_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_io_inputs(*this, "GAMEPAD")
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_dac(*this, "dac")
+		, m_screen(*this, "screen")
+		, m_io_inputs(*this, "GAMEPAD")
+		, m_blinken1(*this, "blinken1")
+		, m_blinken2(*this, "blinken2")
+		, m_blinken3(*this, "blinken3")
+		, m_blinken4(*this, "blinken4")
 	{
 	}
 
 	void gigatron(machine_config &config);
 
-
 private:
 
 	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
+	virtual void video_start() override;
+	virtual void video_reset() override;
 
 	void prog_map(address_map &map);
 	void data_map(address_map &map);
 
-	uint16_t lights_changed;
+	uint8_t m_lights; //blinkenlights
 
-	uint8_t gigatron_random()
-	{
-		return machine().rand() & 0xff;
-	}
+	//Video Generation stuff
+	uint8_t m_out;
+	int16_t m_row;
+	int16_t m_col;
+	uint8_t m_pixel;
 
-	void blinkenlights(uint8_t data);
+	uint8_t m_dacoutput;
+
+	void port_outx(uint8_t data);
+	void port_out(uint8_t data);
+
+	std::unique_ptr<bitmap_rgb32> m_bitmap_render;
 
 	required_device<gigatron_cpu_device> m_maincpu;
+	required_device<dac_byte_interface> m_dac;
+	required_device<screen_device> m_screen;
 	required_ioport m_io_inputs;
+
+	output_finder<> m_blinken1;
+	output_finder<> m_blinken2;
+	output_finder<> m_blinken3;
+	output_finder<> m_blinken4;
 };
 
+//**************************************************************************
+//  Video
+//**************************************************************************
+
+void gigatron_state::video_start()
+{
+	m_bitmap_render = std::make_unique<bitmap_rgb32>(640, 480);
+}
+
+void gigatron_state::video_reset()
+{
+	uint32_t *dest = &m_bitmap_render->pix32(0, 0);
+	for(uint32_t i = 0; i < 640*480; i++)
+		*dest++ = 0;
+}
+
+void gigatron_state::port_out(uint8_t data)
+{
+	m_pixel = data;
+	uint8_t out = m_pixel;
+	uint8_t falling = m_out & ~out;
+
+	if (falling & VSYNC)
+	{
+		m_row = -36;
+		m_pixel = 0;
+	}
+
+	if (falling & HSYNC)
+	{
+		m_col = -4;
+		m_row++;
+	}
+
+	m_out = out;
+
+	if ((out & (VSYNC | HSYNC)) != (VSYNC | HSYNC))
+	{
+		return;
+	}
+
+	if((m_row >= 0 && m_row < 480) && (m_col >= 0 && m_col < 640))
+	{
+		uint8_t r = (out << 6) & 0xC0;
+		uint8_t g = (out << 4) & 0xC0;
+		uint8_t b = (out << 2) & 0xC0;
+		uint32_t *dest = &m_bitmap_render->pix32(m_row, m_col);
+		for(uint8_t i = 0; i < 4; i++)
+			*dest++ = b|(g<<8)|(r<<16);
+	}
+	m_col += 4;
+}
+
+//6-bit color, VGA
 uint32_t gigatron_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
+	copybitmap(bitmap, *m_bitmap_render, 0, 0, 0, 0, cliprect);
+	video_reset();
+
+	m_blinken1 = (m_lights >> 3) & 1;
+	m_blinken2 = (m_lights >> 2) & 1;
+	m_blinken3 = (m_lights >> 1) & 1;
+	m_blinken4 = (m_lights >> 0) & 1;
 	return 0;
 }
 
+//**************************************************************************
+//  Memory Map
+//**************************************************************************
+
 void gigatron_state::prog_map(address_map &map)
 {
-	map(0x0000, 0x3fff).rom().region("maincpu", 0);
+	map(0x0000, 0xffff).rom().region("maincpu", 0);
 }
 
 void gigatron_state::data_map(address_map &map)
 {
-	map(0x0000, 0x7fff).ram();
+	map(0x0000, 0xffff).ram();
 }
 
+//**************************************************************************
+//  Machine
+//**************************************************************************
+
+static INPUT_PORTS_START(gigatron)
+	PORT_START("GAMEPAD")
+	PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+	PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+	PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+	PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+	PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_START ) PORT_PLAYER(1) // START
+	PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_SELECT ) PORT_PLAYER(1)    // SELECT
+	PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("B Button") PORT_PLAYER(1)    // B Button
+	PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("A Button") PORT_PLAYER(1)    // A Button
+INPUT_PORTS_END
+
 void gigatron_state::machine_start()
 {
+	//blinkenlights
+	m_blinken1.resolve();
+	m_blinken2.resolve();
+	m_blinken3.resolve();
+	m_blinken4.resolve();
+
+	//Savestate stuff
+	save_item(NAME(m_lights));
+	save_item(NAME(m_out));
+	save_item(NAME(m_row));
+	save_item(NAME(m_col));
+	save_item(NAME(m_pixel));
+	save_item(NAME(m_dacoutput));
 }
 
 void gigatron_state::machine_reset()
 {
+	m_dacoutput = 0;
+	m_dac->write(0);
+	m_lights = 0;
+	m_out = 0;
+	m_row = 0;
+	m_col = 0;
+	m_pixel = 0;
 }
 
-void gigatron_state::blinkenlights(uint8_t data)
+void gigatron_state::port_outx(uint8_t data)
 {
-	uint16_t light = data & 0xF;
-	lights_changed ^= light;
-}
+	//Write sound to DAC
+	m_dacoutput = (data & 0xF0) >> 4;
+	m_dac->write(m_dacoutput);
 
-static INPUT_PORTS_START(gigatron)
-	PORT_START("GAMEPAD")
-	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
-	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
-	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_START ) PORT_PLAYER(1) // START
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SELECT ) PORT_PLAYER(1)    // SELECT
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("B Button") PORT_PLAYER(1)    // B Button
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("A Button") PORT_PLAYER(1)    // A Button
-INPUT_PORTS_END
+	//Blinkenlights
+	m_lights = data & 0xF;
+}
 
 void gigatron_state::gigatron(machine_config &config)
 {
+	config.set_default_layout(layout_gigatron);
+
 	GTRON(config, m_maincpu, MAIN_CLOCK);
 	m_maincpu->set_addrmap(AS_PROGRAM, &gigatron_state::prog_map);
 	m_maincpu->set_addrmap(AS_DATA, &gigatron_state::data_map);
-	m_maincpu->outx_cb().set(FUNC(gigatron_state::blinkenlights));
+	m_maincpu->outx_cb().set(FUNC(gigatron_state::port_outx));
+	m_maincpu->out_cb().set(FUNC(gigatron_state::port_out));
+	m_maincpu->ir_cb().set_ioport("GAMEPAD").invert();
 
 	/* video hardware */
-	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(59.98);
-	screen.set_size(640, 480);
-	screen.set_visarea(0, 640-1, 0, 480-1);
-	screen.set_screen_update(FUNC(gigatron_state::screen_update));
+	screen_device &m_screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
+	m_screen.set_refresh_hz(59.98);
+	m_screen.set_size(640, 480);
+	m_screen.set_visarea(0, 640-1, 0, 480-1);
+	m_screen.set_screen_update(FUNC(gigatron_state::screen_update));
 
 	/* sound hardware */
-	//SPEAKER(config, "mono").front_center();
+	SPEAKER(config, "speaker").front_center();
+	DAC_4BIT_R2R(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.5);
+	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
+	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
+	vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
 }
 
 ROM_START( gigatron )
 	ROM_REGION( 0x20000, "maincpu", 0 )
-	ROM_SYSTEM_BIOS(0, "v4", "Gigatron ROM V4")
-	ROMX_LOAD( "gigrom4.rom",  0x0000, 0x20000, CRC(78995109) SHA1(2395fc48e64099836111f5aeca39ddbf4650ea4e),ROM_BIOS(0))
-	ROM_SYSTEM_BIOS(1, "v3", "Gigatron ROM V3")
-	ROMX_LOAD( "gigrom3.rom",  0x0000, 0x20000, CRC(1536efbe) SHA1(959268069e761a01d620396eedb9abc1ee63c421),ROM_BIOS(1))
-	ROM_SYSTEM_BIOS(2, "v2", "Gigatron ROM V2")
-	ROMX_LOAD( "gigrom2.rom",  0x0000, 0x20000, CRC(b4a3d936) SHA1(c93f417d589144b912c79f85b9e942d66242c2c3),ROM_BIOS(2))
-	ROM_SYSTEM_BIOS(3, "v1", "Gigatron ROM V1")
-	ROMX_LOAD( "gigrom1.rom",  0x0000, 0x20000, CRC(8ea5a2af) SHA1(e5758d5cc467c3476bd8f992fd45dfcdf06d0430),ROM_BIOS(3))
+	ROM_SYSTEM_BIOS(0, "v5a", "Gigatron ROM v5a")
+	ROMX_LOAD( "gigrom5a.rom",  0x0000, 0x20000, CRC(DCC071A6) SHA1(F82059BA0227FF48E4C687B90C8445DA30213EE2),ROM_BIOS(0))
+	ROM_SYSTEM_BIOS(1, "v4", "Gigatron ROM v4")
+	ROMX_LOAD( "gigrom4.rom",  0x0000, 0x20000, CRC(78995109) SHA1(2395fc48e64099836111f5aeca39ddbf4650ea4e),ROM_BIOS(1))
+	ROM_SYSTEM_BIOS(2, "v3", "Gigatron ROM v3")
+	ROMX_LOAD( "gigrom3.rom",  0x0000, 0x20000, CRC(1536efbe) SHA1(959268069e761a01d620396eedb9abc1ee63c421),ROM_BIOS(2))
+	ROM_SYSTEM_BIOS(3, "v2", "Gigatron ROM v2")
+	ROMX_LOAD( "gigrom2.rom",  0x0000, 0x20000, CRC(b4a3d936) SHA1(c93f417d589144b912c79f85b9e942d66242c2c3),ROM_BIOS(3))
+	ROM_SYSTEM_BIOS(4, "v1", "Gigatron ROM v1")
+	ROMX_LOAD( "gigrom1.rom",  0x0000, 0x20000, CRC(8ea5a2af) SHA1(e5758d5cc467c3476bd8f992fd45dfcdf06d0430),ROM_BIOS(4))
 ROM_END
 
-COMP(2018, gigatron, 0, 0, gigatron, gigatron, gigatron_state, empty_init, "Marcel van Kervinck", "Gigatron TTL Microcomputer", MACHINE_IS_SKELETON)
+COMP(2018, gigatron, 0, 0, gigatron, gigatron, gigatron_state, empty_init, "Marcel van Kervinck / Walter Belgers", "Gigatron TTL Microcomputer", MACHINE_SUPPORTS_SAVE)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/gimix.cpp mame-0.224+dfsg.1/src/mame/drivers/gimix.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/gimix.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/gimix.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -755,10 +755,10 @@
 	m_fdc->intrq_wr_callback().set(FUNC(gimix_state::fdc_irq_w));
 	m_fdc->drq_wr_callback().set(FUNC(gimix_state::fdc_drq_w));
 	m_fdc->set_force_ready(true);
-	FLOPPY_CONNECTOR(config, "fdc:0", gimix_floppies, "525hd", gimix_state::floppy_formats).enable_sound(true);;
-	FLOPPY_CONNECTOR(config, "fdc:1", gimix_floppies, "525hd", gimix_state::floppy_formats).enable_sound(true);;
-	FLOPPY_CONNECTOR(config, "fdc:2", gimix_floppies, "525hd", gimix_state::floppy_formats).enable_sound(true);;
-	FLOPPY_CONNECTOR(config, "fdc:3", gimix_floppies, "525hd", gimix_state::floppy_formats).enable_sound(true);;
+	FLOPPY_CONNECTOR(config, "fdc:0", gimix_floppies, "525hd", gimix_state::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:1", gimix_floppies, "525hd", gimix_state::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:2", gimix_floppies, "525hd", gimix_state::floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:3", gimix_floppies, "525hd", gimix_state::floppy_formats).enable_sound(true);
 
 	/* parallel ports */
 	pia6821_device &pia1(PIA6821(config, "pia1", 2'000'000));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/gkigt.cpp mame-0.224+dfsg.1/src/mame/drivers/gkigt.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/gkigt.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/gkigt.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:David Haywood
+// copyright-holders:David Haywood, R. Belmont, Angelo Salese, Dirk Best
 /*
 
 TODO:
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/gladiatr.cpp mame-0.224+dfsg.1/src/mame/drivers/gladiatr.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/gladiatr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/gladiatr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -610,7 +610,7 @@
 MACHINE_RESET_MEMBER(ppking_state, ppking)
 {
 	// yes, it expects to read DSW1 without sending commands first ...
-	m_mcu[0].rxd = (ioport("DSW1")->read() & 0x1f) << 2;;
+	m_mcu[0].rxd = (ioport("DSW1")->read() & 0x1f) << 2;
 	m_mcu[0].rst = 0;
 	m_mcu[0].state = 0;
 }
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/glcx.cpp mame-0.224+dfsg.1/src/mame/drivers/glcx.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/glcx.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/glcx.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -6,6 +6,9 @@
 
 /*
 
+Other known undumped international versions:
+- Genius Pro 2000 (French version of Genius Tabletop Black Magic CX)
+
 Leader 8008 CX (German version)
 
 +---+-----------+-----+-----------------------+-----+-----+-----+
@@ -39,7 +42,7 @@
 
 CPU = epoxy blob
 GM76U8128CLFW85 = LGS / Hynix 131,072 WORDS x 8 BIT CMOS SRAM
-TMP47C241MG = TCLS-47 series 4-bit CPU with 2048x8 internal ROM
+TMP47C241MG = TLCS-47 series 4-bit CPU with 2048x8 internal ROM
 
 */
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/gnat10.cpp mame-0.224+dfsg.1/src/mame/drivers/gnat10.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/gnat10.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/gnat10.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,11 +10,26 @@
 ****************************************************************************/
 
 #include "emu.h"
+//#include "bus/ieee488/ieee488.h"
+//#include "bus/rs232/rs232.h"
+//#include "machine/tms9914.h"
 #include "cpu/z80/z80.h"
+#include "cpu/i8085/i8085.h"
 #include "imagedev/floppy.h"
+//#include "machine/am9511.h"
+//#include "machine/am9517a.h"
+//#include "machine/i8155.h"
+//#include "machine/i8251.h"
 #include "machine/com8116.h"
+//#include "machine/mm58167.h"
+//#include "machine/tms9914.h"
 #include "machine/wd_fdc.h"
+//#include "machine/z80ctc.h"
+//#include "machine/z80pio.h"
 #include "machine/z80sio.h"
+//#include "video/mc6845.h"
+//#include "screen.h"
+//#include "speaker.h"
 
 class gnat10_state : public driver_device
 {
@@ -28,6 +43,7 @@
 		, m_monitor(*this, "monitor")
 		, m_ram(*this, "ram")
 		, m_ram_on(false)
+		, m_prom_disable(false)
 	{
 	}
 
@@ -38,14 +54,17 @@
 	virtual void machine_reset() override;
 
 private:
-	u8 ram_r(offs_t offset);
+	u8 mem_r(offs_t offset);
 	u8 floppy_status_r();
 	void floppy_latch_w(u8 data);
+	u8 rtc_r(offs_t offset);
+	void rtc_w(offs_t offset, u8 data);
 	void baud0_w(u8 data);
 	void baud1_w(u8 data);
 
 	void mem_map(address_map &map);
 	void io_map(address_map &map);
+	void video_map(address_map &map);
 
 	required_device<cpu_device> m_maincpu;
 	required_device<fd1793_device> m_fdc;
@@ -55,11 +74,13 @@
 	required_shared_ptr<u8> m_ram;
 
 	bool m_ram_on;
+	bool m_prom_disable;
 };
 
 void gnat10_state::machine_start()
 {
 	save_item(NAME(m_ram_on));
+	save_item(NAME(m_prom_disable));
 }
 
 void gnat10_state::machine_reset()
@@ -69,9 +90,9 @@
 }
 
 
-u8 gnat10_state::ram_r(offs_t offset)
+u8 gnat10_state::mem_r(offs_t offset)
 {
-	if (m_ram_on)
+	if (m_ram_on && (m_prom_disable || offset < 0xf800))
 		return m_ram[offset];
 	else
 		return m_monitor[offset & 0x07ff];
@@ -79,6 +100,10 @@
 
 u8 gnat10_state::floppy_status_r()
 {
+	if (!machine().side_effects_disabled())
+	{
+		// TODO: this also forces the motor on (it turns off on a timeout)
+	}
 	return m_fdc->drq_r() << 7 | m_fdc->intrq_r();
 }
 
@@ -93,9 +118,21 @@
 	if (floppy != nullptr)
 		floppy->ss_w(BIT(data, 5));
 
+	m_prom_disable = BIT(data, 6);
+
 	m_fdc->mr_w(BIT(data, 7));
 }
 
+u8 gnat10_state::rtc_r(offs_t offset)
+{
+	return 0; //m_rtc->read(offset ^ 0x10);
+}
+
+void gnat10_state::rtc_w(offs_t offset, u8 data)
+{
+	//m_rtc->write(offset ^ 0x10, data);
+}
+
 void gnat10_state::baud0_w(u8 data)
 {
 	m_brg->str_w(data & 0x0f);
@@ -109,19 +146,42 @@
 
 void gnat10_state::mem_map(address_map &map)
 {
-	map(0x0000, 0xf7ff).r(FUNC(gnat10_state::ram_r)).writeonly().share("ram");
-	map(0xf800, 0xffff).rom().region("monitor", 0);
+	map(0x0000, 0xffff).r(FUNC(gnat10_state::mem_r)).writeonly().share("ram");
 }
 
 void gnat10_state::io_map(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0x60, 0x63).rw("sio1", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
-	map(0x70, 0x73).rw("sio0", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
-	map(0x80, 0x83).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write));
-	map(0xa0, 0xa0).rw(FUNC(gnat10_state::floppy_status_r), FUNC(gnat10_state::floppy_latch_w));
-	map(0xd0, 0xd0).w(FUNC(gnat10_state::baud0_w));
-	map(0xe0, 0xe0).w(FUNC(gnat10_state::baud1_w));
+	//map(0x00, 0x0f).rw("dmac", FUNC(am9517a_device::read), FUNC(am9517a_device::write));
+	//map(0x10, 0x11).mirror(0xe).rw("apu", FUNC(am9511_device::read), FUNC(am9511_device::write));
+	//map(0x20, 0x23).mirror(0xc).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
+	//map(0x30, 0x3f).rw("488c", FUNC(tms9914_device::read), FUNC(tms9914_device::write));
+	//map(0x40, 0x40).mirror(0xf).rw(FUNC(gnat10_state::pdma1_r), FUNC(gnat10_state::pdma1_w));
+	//map(0x50, 0x53).mirror(0xc).rw("pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
+	map(0x60, 0x63).mirror(0xc).rw("sio1", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
+	map(0x70, 0x73).mirror(0xc).rw("sio0", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
+	map(0x80, 0x83).mirror(0xc).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write));
+	//map(0x90, 0x90).mirror(0xf).rw(FUNC(gnat10_state::pdma0_r), FUNC(gnat10_state::pdma0_w));
+	map(0xa0, 0xa0).mirror(0xf).rw(FUNC(gnat10_state::floppy_status_r), FUNC(gnat10_state::floppy_latch_w));
+	map(0xb0, 0xcf).rw(FUNC(gnat10_state::rtc_r), FUNC(gnat10_state::rtc_w));
+	map(0xd0, 0xd0).mirror(0xf).w(FUNC(gnat10_state::baud0_w));
+	map(0xe0, 0xe0).mirror(0xf).w(FUNC(gnat10_state::baud1_w));
+	//map(0xf0, 0xf0).r(?); // undocumented switches?
+}
+
+void gnat10_state::video_map(address_map &map)
+{
+	map.global_mask(0x7fff);
+	map(0x0000, 0x07ff).mirror(0x800).rom().region("videocpu", 0);
+	map(0x1000, 0x13ff).mirror(0xc00).ram();
+	map(0x2000, 0x27ff).mirror(0x800).ram().share("vram");
+	//map(0x3000, 0x3000).mirror(0xfff).w(FUNC(gnat10_state::reset_out_w));
+	//map(0x4000, 0x40ff).mirror(0x700).rw("videopio", FUNC(i8155_device::memory_r), FUNC(i8155_device::memory_w));
+	//map(0x4800, 0x4807).mirror(0x7f8).rw("videopio", FUNC(i8155_device::io_r), FUNC(i8155_device::io_w));
+	//map(0x5000, 0x5001).mirror(0xffe).rw("videosio", FUNC(i8251_device::read), FUNC(i8251_device::write));
+	//map(0x6000, 0x6000).mirror(0xfff).w(FUNC(gnat10_state::bell_w));
+	//map(0x7000, 0x7000).mirror(0xffe).w("crtc", FUNC(mc6845_device::address_w));
+	//map(0x7001, 0x7001).mirror(0xffe).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 }
 
 
@@ -146,19 +206,31 @@
 	FLOPPY_CONNECTOR(config, m_floppy[0], gnat_floppies, "525qd", floppy_image_device::default_floppy_formats);
 	FLOPPY_CONNECTOR(config, m_floppy[1], gnat_floppies, "525qd", floppy_image_device::default_floppy_formats);
 
-	COM5016_5(config, m_brg, 4.9152_MHz_XTAL); // specific type unknown
+	COM5016_5(config, m_brg, 4.9152_MHz_XTAL); // BR1941-5
 	m_brg->fr_handler().set("sio0", FUNC(z80sio_device::rxca_w));
 	m_brg->fr_handler().append("sio0", FUNC(z80sio_device::txca_w));
 	m_brg->fr_handler().append("sio1", FUNC(z80sio_device::rxca_w));
 	m_brg->fr_handler().append("sio1", FUNC(z80sio_device::txca_w));
 	m_brg->ft_handler().set("sio1", FUNC(z80sio_device::rxtxcb_w));
 
-	// TODO: video screen, peripheral ports
+	// TODO: DMAC, peripheral ports
+
+	i8085a_cpu_device &videocpu(I8085A(config, "videocpu", 18.432_MHz_XTAL / 4));
+	videocpu.set_addrmap(AS_PROGRAM, &gnat10_state::video_map);
+	videocpu.set_disable();
+
+	// TODO: 8155, 8251A, 6845, video screen
 }
 
 ROM_START(gnat10)
 	ROM_REGION(0x800, "monitor", 0)
 	ROM_LOAD("gnat-507", 0x000, 0x800, CRC(72baa750) SHA1(7b78324b90b8c6f78c88a7dde8d53ea612ea1f7f)) // LF patched back to CR/LF in four instances
+
+	ROM_REGION(0x800, "videocpu", 0)
+	ROM_LOAD("videocpu.bin", 0x000, 0x800, NO_DUMP) // TMS2716 or TMS2732
+
+	ROM_REGION(0x800, "chargen", 0)
+	ROM_LOAD("chargen.bin", 0x000, 0x800, NO_DUMP) // TMS2716 or TMS2732
 ROM_END
 
 COMP(1980, gnat10, 0, 0, gnat10, gnat10, gnat10_state, empty_init, "GNAT Computers", "GNAT System 10", MACHINE_IS_SKELETON)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/goldart.cpp mame-0.224+dfsg.1/src/mame/drivers/goldart.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/goldart.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/goldart.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -117,7 +117,7 @@
 
 			count++;
 
-			dstptr_bitmap[x*2] = ((data&0xf0)>>4)  | (data2 & 0xf0);;
+			dstptr_bitmap[x*2] = ((data&0xf0)>>4)  | (data2 & 0xf0);
 			dstptr_bitmap[(x*2)+1] = (data&0x0f) | ((data2 & 0x0f)<<4);
 		}
 	}
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/goldnpkr.cpp mame-0.224+dfsg.1/src/mame/drivers/goldnpkr.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/goldnpkr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/goldnpkr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -28,6 +28,7 @@
   * Jack Potten's Poker (set 10, ICP-1 PCB),          198?, Bootleg.
   * Jack Potten's Poker (set 11, German, W.W.),       198?, Bootleg.
   * Jack Potten's Poker (set 12, no Double-Up),       198?, Bootleg.
+  * Jack Potten's Poker (set 13, ICP-1 PCB),          198?, Bootleg.
   * Jack Potten's Poker (NGold, set 1),               198?, Unknown.
   * Jack Potten's Poker (NGold, set 2),               198?, Unknown.
   * Jack Potten's Poker (NGold, set 3),               198?, Unknown.
@@ -70,8 +71,10 @@
   * Witch Card (Falcon, enhanced sound),              199?, Falcon.
   * Witch Card (German, WC3050, set 2 ),              1994, Proma.
   * Witch Card (German, WC3050, 27-4-94),             1994, Proma.
+  * Witch Card (ICP-1, encrypted),                    199?, Unknown.
   * Witch Game (Video Klein, set 1),                  1991, Video Klein.
   * Witch Game (Video Klein, set 2),                  1991, Video Klein.
+  * Joker Card (witch game),                          199?, Unknown.
   * Jolli Witch (Export, 6T/12T ver 1.57D),           1994, Video Klein?.
   * Wild Witch (Export, 6T/12T ver 1.57-SP),          1992-2001, Video Klein.
   * Wild Witch (Export, 6T/12T ver 1.57-TE),          1992-2001, Video Klein.
@@ -132,7 +135,8 @@
   * Genie (ICP-1, set 1),                             198?, Video Fun Games Ltd.
   * Genie (ICP-1, set 2),                             198?, Unknown.
   * Silver Game,                                      1983, Unknown.
-  * Super Double (French),                            198?, Karateco.
+  * Silver Game,                                      1983, Unknown.
+  * Bonus Poker,                                      1984, Galanthis Inc.
   * "Unknown French poker game",                      198?, Unknown.
   * "Unknown encrypted poker game",                   198?, Unknown.
   * "Unknown Sisteme France Poker",                   198?, Sisteme France.
@@ -140,8 +144,7 @@
   * Bonne Chance! (Golden Poker prequel HW, set 2),   198?, Unknown.
   * Mundial/Mondial (Italian/French),                 1987, Unknown.
   * Super 98 (3-hands, ICP-1),                        199?, Unknown.
-  * unknown animal-themed game (bottom),              199?, Unknown.
-  * unknown animal-themed game (top),                 199?, Unknown.
+  * unknown rocket/animal-themed poker,               199?, Unknown.
   * Mega Double Poker (conversion kit, set 1),        1990, Blitz System Inc.
   * Mega Double Poker (conversion kit, set 2),        1990, Blitz System Inc.
 
@@ -149,11 +152,11 @@
 
 
   I think "Diamond Poker Double Up" from Bonanza Enterprises should run on this hardware too.
-  http://www.arcadeflyers.com/?page=thumbs&id=4539
+  https://flyers.arcade-museum.com/?page=thumbs&db=videodb&id=4539
 
   Big-Boy and Mini-Boy are different sized cabinets for Bonanza Enterprises games.
-  http://www.arcadeflyers.com/?page=thumbs&id=4616
-  http://www.arcadeflyers.com/?page=thumbs&id=4274
+  https://flyers.arcade-museum.com/?page=thumbs&db=videodb&id=4616
+  https://flyers.arcade-museum.com/?page=thumbs&db=videodb&id=4274
 
 
   Preliminary Notes (pmpoker):
@@ -483,14 +486,31 @@
   2 or 3 deals per hand. It's running in a ICP-1 PCB.
 
   Entering the service mode (key 0), you can enter to a submenu for settings pressing
-  DEAL (key 2). Use HOLD keys (keys ZXCVB) to navigate through the menu and change
+  DEAL (key 2):
+
+    Win Limit (0-9 the first time, then 3-9)
+    Payout Limit (0-2)
+    Double Odds % (0-9)
+    Payout % (0-9)
+    Hard Setting (0-4)
+    Note Value (fixed in 5)
+
+    Bonus (0 to 10000, step x100)
+    (if you rech 10000, settings exits and go to game. You can't change bonus anymore.
+
+  Use HOLD keys (keys ZXCVB) to navigate through the menu and change
   the values. Press CANCEL to exit the settings menu.
 
+  ** NOTE **
+  2-3 deals, turbo mode, bonus and royal flush could be set through DIP switches.
+
+
   Program is currently not working because seems to fill some zeropage registers and
   check for existent values and changes... Maybe an external device is writting them.
   This is NVRAM zone, so some values could be previously harcoded.
 
-  Also seems to expect some inputs combination entered to boot.
+  Also seems to manipulate the stack pointer expecting different values, and some inputs
+  combination entered to boot.
 
   To run...
   1) Start the game.
@@ -512,6 +532,13 @@
   fully working.
 
 
+  For now will patch the dead end to get it working.
+  e9f4: jmp $ea56 ---> death
+  e9f7: jmp $cec6 ---> works
+
+  The game needs ~25 seconds to check all the things to start.
+
+
 ************************************************************************************
 
 
@@ -1330,6 +1357,7 @@
 	void wcrdxtnd(machine_config &config);
 	void super21p(machine_config &config);
 	void caspoker(machine_config &config);
+	void icp_ext(machine_config &config);
 
 	void init_vkdlswwh();
 	void init_icp1db();
@@ -1352,6 +1380,7 @@
 	void init_vkdlswwv();
 	void init_bchancep();
 	void init_bonuspkr();
+	void init_super98();
 
 	uint8_t pottnpkr_mux_port_r();
 	void lamps_a_w(uint8_t data);
@@ -1418,6 +1447,7 @@
 	void witchcrd_falcon_map(address_map &map);
 	void witchcrd_map(address_map &map);
 	void super21p_map(address_map &map);
+	void icp_ext_map(address_map &map);
 
 	required_shared_ptr<uint8_t> m_videoram;
 	required_shared_ptr<uint8_t> m_colorram;
@@ -1492,8 +1522,8 @@
 
 	int attr = m_colorram[tile_index];
 	int code = ((attr & 1) << 8) | m_videoram[tile_index];
-	int bank = (attr & 0x02) >> 1;  /* bit 1 switch the gfx banks */
-	int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 for color */
+	int bank = (attr & 0x02) >> 1;      // bit 1 switch the gfx banks
+	int color = (attr & 0x3c) >> 2;     // bits 2-3-4-5 for color
 
 	tileinfo.set(bank, code, color, 0);
 }
@@ -1510,8 +1540,8 @@
 
 	int attr = m_colorram[tile_index];
 	int code = ((attr & 1) << 8) | m_videoram[tile_index];
-	int bank = (attr & 0x03) + ((attr & 0xc0) >> 4);    /* bits 0, 1, 6 & 7 switch the gfx banks */
-	int color = (attr & 0x3c) >> 2; /* bits 2-3-4-5 for color */
+	int bank = (attr & 0x03) + ((attr & 0xc0) >> 4);    // bits 0, 1, 6 & 7 switch the gfx banks
+	int color = (attr & 0x3c) >> 2;                     // bits 2-3-4-5 for color
 
 	tileinfo.set(bank, code, color, 0);
 }
@@ -1742,16 +1772,16 @@
 */
 uint8_t goldnpkr_state::goldnpkr_mux_port_r()
 {
-	switch( m_mux_data & 0xf0 )     /* bits 4-7 */
+	switch( m_mux_data & 0xf0 )     // bits 4-7
 	{
-		/* normal selector writes 7F-BF-DF-EF */
+		// normal selector writes 7F-BF-DF-EF
 		case 0x10: return ioport("IN0-0")->read();
 		case 0x20: return ioport("IN0-1")->read();
 		case 0x40: return ioport("IN0-2")->read();
 		case 0x80: return ioport("IN0-3")->read();
 
-		/* royale selector writes 3F-2F-1F-0F.
-		   worth to split a whole machine driver just for this? */
+		// royale selector writes 3F-2F-1F-0F.
+		// worth to split a whole machine driver just for this?
 		case 0xc0: return ioport("IN0-3")->read();
 		case 0xd0: return ioport("IN0-2")->read();
 		case 0xe0: return ioport("IN0-1")->read();
@@ -1762,9 +1792,9 @@
 
 uint8_t goldnpkr_state::pottnpkr_mux_port_r()
 {
-	uint8_t pa_0_4 = 0xff, pa_7;  /* Temporary place holder for bits 0 to 4 & 7 */
+	uint8_t pa_0_4 = 0xff, pa_7;    // temporary placeholder for bits 0 to 4 & 7
 
-	switch( m_mux_data & 0xf0 )     /* bits 4-7 */
+	switch( m_mux_data & 0xf0 )     // bits 4-7
 	{
 		case 0x10: return ioport("IN0-0")->read();
 		case 0x20: return ioport("IN0-1")->read();
@@ -1772,7 +1802,7 @@
 		case 0x80: return ioport("IN0-3")->read();
 	}
 
-	pa_7 = (m_pia0_PA_data >> 7) & 1;   /* To do: bit PA5 to pin CB1 */
+	pa_7 = (m_pia0_PA_data >> 7) & 1;   // to do: bit PA5 to pin CB1
 
 	return ( (pa_0_4 & 0x3f) | (pa_7 << 6) | (pa_7 << 7) ) ;
 }
@@ -1780,7 +1810,7 @@
 void goldnpkr_state::mux_w(uint8_t data)
 {
 	//logerror("mux_w: %2x\n",data);
-	m_mux_data = data ^ 0xff;   /* inverted */
+	m_mux_data = data ^ 0xff;   // inverted
 }
 
 void goldnpkr_state::mux_port_w(uint8_t data)
@@ -1789,7 +1819,7 @@
 }
 
 
-/* Demuxing ay8910 data/address from Falcon board, PIA portA out */
+// demuxing ay8910 data/address from Falcon board, PIA portA out
 
 uint8_t goldnpkr_state::ay8910_data_r()
 {
@@ -1876,23 +1906,23 @@
 */
 	data = data ^ 0xff;
 
-	m_lamps[0] = BIT(data, 0);    /* Lamp 0 */
-	m_lamps[1] = BIT(data, 1);    /* Lamp 1 */
-	m_lamps[2] = BIT(data, 2);    /* Lamp 2 */
-	m_lamps[3] = BIT(data, 3);    /* Lamp 3 */
-	m_lamps[4] = BIT(data, 4);    /* Lamp 4 */
-
-	machine().bookkeeping().coin_counter_w(0, data & 0x40);  /* counter1 */
-	machine().bookkeeping().coin_counter_w(1, data & 0x80);  /* counter2 */
-	machine().bookkeeping().coin_counter_w(2, data & 0x20);  /* counter3 */
+	m_lamps[0] = BIT(data, 0);  // lamp 0
+	m_lamps[1] = BIT(data, 1);  // lamp 1
+	m_lamps[2] = BIT(data, 2);  // lamp 2
+	m_lamps[3] = BIT(data, 3);  // lamp 3
+	m_lamps[4] = BIT(data, 4);  // lamp 4
+
+	machine().bookkeeping().coin_counter_w(0, data & 0x40);  // counter 1
+	machine().bookkeeping().coin_counter_w(1, data & 0x80);  // counter 2
+	machine().bookkeeping().coin_counter_w(2, data & 0x20);  // counter 3
 }
 
 void goldnpkr_state::sound_w(uint8_t data)
 {
-	/* 555 voltage controlled */
+	// 555 voltage controlled
 	logerror("Sound Data: %2x\n",data & 0x0f);
 
-	/* discrete sound is connected to PIA1, portA: bits 0-3 */
+	// discrete sound is connected to PIA1, portA: bits 0-3
 	m_discrete->write(NODE_01, data >> 3 & 0x01);
 	m_discrete->write(NODE_10, data & 0x07);
 }
@@ -1946,14 +1976,14 @@
 void goldnpkr_state::goldnpkr_map(address_map &map)
 {
 	map.global_mask(0x7fff);
-	map(0x0000, 0x07ff).ram().share("nvram");   /* battery backed RAM */
+	map(0x0000, 0x07ff).ram().share("nvram");   // battery backed RAM
 	map(0x0800, 0x0800).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 	map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 	map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 	map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram");
 	map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram");
-	map(0x2000, 0x7fff).rom(); /* superdbl uses 0x2000..0x3fff address space */
+	map(0x2000, 0x7fff).rom();  // superdbl uses 0x2000..0x3fff address space
 }
 
 void goldnpkr_state::witchcdj_map(address_map &map)
@@ -1966,7 +1996,7 @@
 void goldnpkr_state::pottnpkr_map(address_map &map)
 {
 	map.global_mask(0x3fff);
-	map(0x0000, 0x07ff).ram().share("nvram");   /* battery backed RAM */
+	map(0x0000, 0x07ff).ram().share("nvram");   // battery backed RAM
 	map(0x0800, 0x0800).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 	map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
@@ -1979,7 +2009,7 @@
 void goldnpkr_state::witchcrd_map(address_map &map)
 {
 	map.global_mask(0x7fff);
-	map(0x0000, 0x07ff).ram().share("nvram");   /* battery backed RAM */
+	map(0x0000, 0x07ff).ram().share("nvram");   // battery backed RAM
 	map(0x0800, 0x0800).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 	map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
@@ -1987,7 +2017,7 @@
 	map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram");
 	map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram");
 	map(0x2000, 0x2000).portr("SW2");
-//  map(0x2108, 0x210b).noprw(); /* unknown 40-pin device */
+//  map(0x2108, 0x210b).noprw(); // unknown 40-pin device
 	map(0x2800, 0x2fff).ram();
 	map(0x4000, 0x7fff).rom();
 }
@@ -2007,7 +2037,7 @@
 void goldnpkr_state::witchcrd_falcon_map(address_map &map)
 {
 	map.global_mask(0x7fff);
-	map(0x0000, 0x07ff).ram().share("nvram");   /* battery backed RAM */
+	map(0x0000, 0x07ff).ram().share("nvram");   // battery backed RAM
 	map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 	map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 	map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram");
@@ -2020,7 +2050,7 @@
 
 void goldnpkr_state::wildcard_map(address_map &map)
 {
-	map(0x0000, 0x07ff).ram().share("nvram");   /* battery backed RAM */
+	map(0x0000, 0x07ff).ram().share("nvram");   // battery backed RAM
 	map(0x0800, 0x0800).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 	map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
@@ -2028,21 +2058,18 @@
 	map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram");
 	map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram");
 	map(0x2000, 0x2000).portr("SW2");
-	map(0x2200, 0x27ff).rom(); /* for VK set */
-	map(0x2800, 0x2fff).ram(); /* for VK set */
-	map(0x3000, 0xffff).rom(); /* for VK set. bootleg starts from 4000 */
+	map(0x2200, 0x27ff).rom();  // for VK set
+	map(0x2800, 0x2fff).ram();  // for VK set
+	map(0x3000, 0xffff).rom();  // for VK set. bootleg starts from 4000
 }
 
 /*
   Video Klein extended hardware
-
   Extended graphics plus DS1210 + RAM
-
 */
-
 void goldnpkr_state::wcrdxtnd_map(address_map &map)
 {
-	map(0x0000, 0x07ff).ram(); //.share("nvram"); /* battery backed RAM */
+	map(0x0000, 0x07ff).ram(); //.share("nvram"); // battery backed RAM
 	map(0x0800, 0x0800).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 	map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
@@ -2050,9 +2077,9 @@
 	map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram");
 	map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram");
 	map(0x2000, 0x2000).portr("SW2");
-	map(0x2200, 0x27ff).rom(); /* for VK hardware */
-	map(0x2800, 0x2fff).ram().share("nvram");   /* Dallas ds1210 + battery backed RAM */
-	map(0x3000, 0xffff).rom(); /* for VK hardware. bootleg starts from 4000 */
+	map(0x2200, 0x27ff).rom();  // for VK hardware
+	map(0x2800, 0x2fff).ram().share("nvram");   // Dallas ds1210 + battery backed RAM
+	map(0x3000, 0xffff).rom();  // for VK hardware. bootleg starts from 4000
 }
 
 /*
@@ -2064,7 +2091,7 @@
 void goldnpkr_state::wildcrdb_map(address_map &map)
 {
 	map.global_mask(0x7fff);
-	map(0x0000, 0x07ff).ram().share("nvram");   /* battery backed RAM */
+	map(0x0000, 0x07ff).ram().share("nvram");   // battery backed RAM
 	map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 	map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 	map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram");
@@ -2100,7 +2127,7 @@
 void goldnpkr_state::genie_map(address_map &map)
 {
 	map.global_mask(0x3fff);
-	map(0x0000, 0x07ff).ram().share("nvram");   /* battery backed RAM */
+	map(0x0000, 0x07ff).ram().share("nvram");   // battery backed RAM
 	map(0x0800, 0x0800).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 	map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
@@ -2114,7 +2141,7 @@
 void goldnpkr_state::mondial_map(address_map &map)
 {
 	map.global_mask(0x7fff);
-	map(0x0000, 0x07ff).ram().share("nvram");   /* battery backed RAM */
+	map(0x0000, 0x07ff).ram().share("nvram");   // battery backed RAM
 	map(0x0800, 0x0800).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 	map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
@@ -2127,7 +2154,7 @@
 void goldnpkr_state::bchancep_map(address_map &map)
 {
 	map.global_mask(0x7fff);
-	map(0x0000, 0x07ff).ram().share("nvram");   /* battery backed RAM */
+	map(0x0000, 0x07ff).ram().share("nvram");   // battery backed RAM
 	map(0x0800, 0x0800).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 	map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
@@ -2139,7 +2166,7 @@
 
 void goldnpkr_state::super21p_map(address_map &map)
 {
-	map(0x0000, 0x07ff).ram().share("nvram");   /* battery backed RAM */
+	map(0x0000, 0x07ff).ram().share("nvram");   // battery backed RAM
 	map(0x0800, 0x0800).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 	map(0x0804, 0x0807).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
@@ -2151,13 +2178,27 @@
 	map(0x8000, 0xffff).rom();
 }
 
+void goldnpkr_state::icp_ext_map(address_map &map)
+{
+	map.global_mask(0x7fff);
+	map(0x0000, 0x07ff).ram().share("nvram");   // battery backed RAM
+	map(0x0800, 0x0800).w("crtc", FUNC(mc6845_device::address_w));
+	map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
+	map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0x0848, 0x084b).rw("pia1", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0x1000, 0x13ff).ram().w(FUNC(goldnpkr_state::goldnpkr_videoram_w)).share("videoram");
+	map(0x1800, 0x1bff).ram().w(FUNC(goldnpkr_state::goldnpkr_colorram_w)).share("colorram");
+	map(0x2000, 0x3fff).rom();
+	map(0x6000, 0x7fff).rom();
+}
+
 
 /*********************************************
 *                Input Ports                 *
 *********************************************/
 
 static INPUT_PORTS_START( goldnpkr )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Meters")
@@ -2190,7 +2231,7 @@
 
 	PORT_START("IN0-3")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Learn Mode") PORT_CODE(KEYCODE_F2)
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("D-31") PORT_CODE(KEYCODE_E) /* O.A.R? (D-31 in schematics) */
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("D-31") PORT_CODE(KEYCODE_E)     // O.A.R? (D-31 in schematics)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )   PORT_IMPULSE(3) PORT_NAME("Coupon (Note In)")
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )   PORT_IMPULSE(3) PORT_NAME("Coin In")
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN3 )   PORT_NAME("Weight (Coupon In)")
@@ -2199,7 +2240,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2210,16 +2251,16 @@
 	PORT_DIPNAME( 0x20, 0x00, "50hz/60hz" )         PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x20, "50hz" )
 	PORT_DIPSETTING(    0x00, "60hz" )
-	PORT_DIPNAME( 0x40, 0x00, "Payout Mode" )       PORT_DIPLOCATION("SW1:3")   /* listed in the manual as "Play Mode" */
-	PORT_DIPSETTING(    0x40, "Manual" )            /*  listed in the manual as "Out Play" */
-	PORT_DIPSETTING(    0x00, "Auto" )              /*  listed in the manual as "Credit Play" */
+	PORT_DIPNAME( 0x40, 0x00, "Payout Mode" )       PORT_DIPLOCATION("SW1:3")   // listed in the manual as "Play Mode"
+	PORT_DIPSETTING(    0x40, "Manual" )            //  listed in the manual as "Out Play"
+	PORT_DIPSETTING(    0x00, "Auto" )              //  listed in the manual as "Credit Play"
 	PORT_DIPNAME( 0x80, 0x00, "Royal Flush" )       PORT_DIPLOCATION("SW1:4")
 	PORT_DIPSETTING(    0x80, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( pmpoker )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Meters")
@@ -2288,7 +2329,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( pottnpkr )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Meters")
@@ -2330,7 +2371,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
@@ -2349,17 +2390,17 @@
 	PORT_DIPNAME( 0x20, 0x00, "50hz/60hz" )         PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x20, "50hz" )
 	PORT_DIPSETTING(    0x00, "60hz" )
-	/* listed in the manual as "Play Mode" */
+	// listed in the manual as "Play Mode"
 	PORT_DIPNAME( 0x40, 0x00, "Payout Mode" )       PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x40, "Manual" )            /*  listed in the manual as "Out Play" */
-	PORT_DIPSETTING(    0x00, "Auto" )              /*  listed in the manual as "Credit Play" */
+	PORT_DIPSETTING(    0x40, "Manual" )            //  listed in the manual as "Out Play"
+	PORT_DIPSETTING(    0x00, "Auto" )              //  listed in the manual as "Credit Play"
 	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:4")
 	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( potnpkra )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(3) PORT_NAME("Coin 1")
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Meters")
@@ -2427,8 +2468,69 @@
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 INPUT_PORTS_END
 
+static INPUT_PORTS_START( animpkr )
+	// Multiplexed - 4x5bits
+	PORT_START("IN0-0")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(3) PORT_NAME("Coin 1 + Start")
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Meters")
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_GAMBLE_D_UP )
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_DEAL ) PORT_NAME("Deal / Draw")
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_CANCEL )
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER )   PORT_NAME("IN0-0 80") PORT_CODE(KEYCODE_G)
+
+	PORT_START("IN0-1")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_IMPULSE(3) PORT_NAME("Manual Collect") PORT_CODE(KEYCODE_Q)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Payout") PORT_CODE(KEYCODE_W)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_GAMBLE_TAKE )
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_HIGH ) PORT_NAME("Big")
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_GAMBLE_LOW ) PORT_NAME("Small")
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
+
+	PORT_START("IN0-2")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_POKER_HOLD1 )
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD2 )
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_HOLD3 )
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_POKER_HOLD4 )
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_HOLD5 )
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
+
+	PORT_START("IN0-3")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Settings") PORT_CODE(KEYCODE_F2)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER )   PORT_NAME("IN0-3 02") PORT_CODE(KEYCODE_D)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )   PORT_NAME("Coin 2")
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_BET )
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER )   PORT_NAME("IN0-3 10") PORT_CODE(KEYCODE_F)
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
+
+	PORT_START("SW1")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_DIPNAME( 0x10, 0x00, "High Pair (11-13)" )     PORT_DIPLOCATION("SW1:1")
+	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x00, "50hz/60hz" )             PORT_DIPLOCATION("SW1:2")
+	PORT_DIPSETTING(    0x20, "50hz" )
+	PORT_DIPSETTING(    0x00, "60hz" )
+	PORT_DIPNAME( 0x40, 0x00, "Payout Mode" )           PORT_DIPLOCATION("SW1:3")
+	PORT_DIPSETTING(    0x40, "Manual" )
+	PORT_DIPSETTING(    0x00, "Auto" )
+	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )      PORT_DIPLOCATION("SW1:4")
+	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+INPUT_PORTS_END
+
 static INPUT_PORTS_START( potnpkrc )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_INCLUDE( potnpkra )
 
 	PORT_MODIFY("SW1")
@@ -2441,7 +2543,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( ngold)
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Meters")
@@ -2483,7 +2585,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
@@ -2496,23 +2598,23 @@
 	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
 	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x00, "Minimal Hand" )  PORT_DIPLOCATION("SW1:1")
+	PORT_DIPNAME( 0x10, 0x00, "Minimal Hand" )      PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Pair of Aces" )
 	PORT_DIPSETTING(    0x10, "Double Pair" )
 	PORT_DIPNAME( 0x20, 0x00, "50hz/60hz" )         PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x20, "50hz" )
 	PORT_DIPSETTING(    0x00, "60hz" )
-	/* listed in the manual as "Play Mode" */
+	// listed in the manual as "Play Mode"
 	PORT_DIPNAME( 0x40, 0x00, "Payout Mode" )       PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x40, "Manual" )            /*  listed in the manual as "Out Play" */
-	PORT_DIPSETTING(    0x00, "Auto" )              /*  listed in the manual as "Credit Play" */
+	PORT_DIPSETTING(    0x40, "Manual" )            //  listed in the manual as "Out Play"
+	PORT_DIPSETTING(    0x00, "Auto" )              //  listed in the manual as "Credit Play"
 	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:4")
 	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( ngoldb)   // only coinage changes against ngold...
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Meters")
@@ -2554,7 +2656,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
@@ -2567,23 +2669,23 @@
 	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )
 	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x00, "Minimal Hand" )  PORT_DIPLOCATION("SW1:1")
+	PORT_DIPNAME( 0x10, 0x00, "Minimal Hand" )      PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x00, "Pair of Aces" )
 	PORT_DIPSETTING(    0x10, "Double Pair" )
 	PORT_DIPNAME( 0x20, 0x00, "50hz/60hz" )         PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x20, "50hz" )
 	PORT_DIPSETTING(    0x00, "60hz" )
-	/* listed in the manual as "Play Mode" */
+	// listed in the manual as "Play Mode"
 	PORT_DIPNAME( 0x40, 0x00, "Payout Mode" )       PORT_DIPLOCATION("SW1:3")
-	PORT_DIPSETTING(    0x40, "Manual" )            /*  listed in the manual as "Out Play" */
-	PORT_DIPSETTING(    0x00, "Auto" )              /*  listed in the manual as "Credit Play" */
+	PORT_DIPSETTING(    0x40, "Manual" )            //  listed in the manual as "Out Play"
+	PORT_DIPSETTING(    0x00, "Auto" )              //  listed in the manual as "Credit Play"
 	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:4")
 	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( goodluck )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_INCLUDE( goldnpkr )
 
 	PORT_MODIFY("IN0-1")
@@ -2601,7 +2703,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_MODIFY("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:4")
 	PORT_DIPSETTING(    0x80, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
@@ -2634,7 +2736,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( witchcrd )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_INCLUDE( goldnpkr )
 
 	PORT_MODIFY("IN0-1")
@@ -2661,10 +2763,10 @@
     switches 1+2+5+6 = OFF
     switches 7+8 = ON
 */
-	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:1")   /* OFF by default */
+	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:1")   // OFF by default
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:2")   /* OFF by default */
+	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:2")   // OFF by default
 	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x0c, 0x04, "Percentage" )        PORT_DIPLOCATION("SW1:3,4")
@@ -2672,29 +2774,29 @@
 	PORT_DIPSETTING(    0x04, "50%" )
 	PORT_DIPSETTING(    0x08, "60%" )
 	PORT_DIPSETTING(    0x00, "70%" )
-	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:5")   /* OFF by default */
+	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:5")   // OFF by default
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:6")   /* OFF by default */
+	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:6")   // OFF by default
 	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:7")   /* ON by default */
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:7")   // ON by default
 	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:8")   /* ON by default */
+	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:8")   // ON by default
 	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 
 	PORT_START("SW2")
 	PORT_DIPNAME( 0x03, 0x01, "Max Bet" )           PORT_DIPLOCATION("SW2:1,2")
-	PORT_DIPSETTING(    0x03, "10" )    /* OFF-OFF */
-	PORT_DIPSETTING(    0x02, "20" )    /* ON-OFF */
-	PORT_DIPSETTING(    0x01, "50" )    /* OFF-ON */
-	PORT_DIPSETTING(    0x00, "100" )   /* ON-ON */
-	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW2:3")   /* no connected (OFF) */
+	PORT_DIPSETTING(    0x03, "10" )    // OFF-OFF
+	PORT_DIPSETTING(    0x02, "20" )    // ON-OFF
+	PORT_DIPSETTING(    0x01, "50" )    // OFF-ON
+	PORT_DIPSETTING(    0x00, "100" )   // ON-ON
+	PORT_DIPNAME( 0x04, 0x04, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW2:3")   // no connected (OFF)
 	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW2:4")   /* no connected (OFF) */
+	PORT_DIPNAME( 0x08, 0x08, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW2:4")   // no connected (OFF)
 	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x10, 0x00, "Minimal Hand" )      PORT_DIPLOCATION("SW2:5")
@@ -2712,7 +2814,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( witchcda )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_NAME("Apuesta (Bet)")
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Contabilidad (Bookkeeping)")
@@ -2754,7 +2856,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2769,7 +2871,7 @@
 	PORT_DIPSETTING(    0x40, "Manual" )
 	PORT_DIPSETTING(    0x00, "Auto" )
 	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Coinage ) )      PORT_DIPLOCATION("SW1:4")
-	/* Note In is always 1 Note - 10 Credits */
+	// Note In is always: 1 Note - 10 Credits
 	PORT_DIPSETTING(    0x00, "1 Coin - 1 Credit / 1 Note - 10 Credits" )
 	PORT_DIPSETTING(    0x80, "1 Coin - 5 Credits / 1 Note - 10 Credits" )
 
@@ -2801,11 +2903,11 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( witchcdc )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_INCLUDE( witchcrd )
 
 	PORT_MODIFY("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2820,7 +2922,7 @@
 	PORT_DIPSETTING(    0x40, "Manual" )
 	PORT_DIPSETTING(    0x00, "Auto" )
 	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Coinage ) )      PORT_DIPLOCATION("SW1:4")
-	/* Note In is always 1 Note - 10 Credits */
+	// Note In is always: 1 Note - 10 Credits
 	PORT_DIPSETTING(    0x00, "1 Coin - 1 Credit / 1 Note - 10 Credits" )
 	PORT_DIPSETTING(    0x80, "1 Coin - 5 Credits / 1 Note - 10 Credits" )
 
@@ -2852,7 +2954,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( witchcdd )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_INCLUDE( witchcrd )
 
 	PORT_MODIFY("IN0-1")
@@ -2878,13 +2980,13 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_0_PAD) PORT_NAME("IN0-3-8") //IPT_UNKNOWN )
 
 	PORT_MODIFY("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
-	/* even when the following one is forced to OFF,
-	turned ON behaves like "Jacks and Better" */
+	// even when the following one is forced to OFF,
+	// turned ON behaves like "Jacks and Better"
 	PORT_DIPNAME( 0x10, 0x10, "SW 1 (always to OFF)")
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
@@ -2926,7 +3028,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( witchjol )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_INCLUDE( witchcrd )
 
 	PORT_MODIFY("IN0-1")
@@ -2952,7 +3054,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_0_PAD) PORT_NAME("IN0-3-8") //IPT_UNKNOWN )
 
 	PORT_MODIFY("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -2997,10 +3099,10 @@
 */
 	PORT_MODIFY("SW2")
 	PORT_DIPNAME( 0x03, 0x00, "Max Bet" )           PORT_DIPLOCATION("SW2:1,2")
-	PORT_DIPSETTING(    0x03, "10" )    /* OFF-OFF */
-	PORT_DIPSETTING(    0x02, "20" )    /* ON-OFF */
-	PORT_DIPSETTING(    0x01, "50" )    /* OFF-ON */
-	PORT_DIPSETTING(    0x00, "100" )   /* ON-ON */
+	PORT_DIPSETTING(    0x03, "10" )    // OFF-OFF
+	PORT_DIPSETTING(    0x02, "20" )    // ON-OFF
+	PORT_DIPSETTING(    0x01, "50" )    // OFF-ON
+	PORT_DIPSETTING(    0x00, "100" )   // ON-ON
 	PORT_DIPNAME( 0x04, 0x04, "Game Type" )         PORT_DIPLOCATION("SW2:3")
 	PORT_DIPSETTING(    0x04, "Jolli Witch" )
 	PORT_DIPSETTING(    0x00, "Witch Card" )
@@ -3019,7 +3121,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( witchcdf )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_INCLUDE( witchcrd )
 
 	PORT_MODIFY("IN0-1")
@@ -3045,7 +3147,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_0_PAD) PORT_NAME("IN0-3-8") //IPT_UNKNOWN )
 
 	PORT_MODIFY("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -3091,7 +3193,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( wldwitch )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )  PORT_NAME("Bet (Setzen)")
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Bookkeeping / Test")
@@ -3151,10 +3253,10 @@
  _______________________________
 
 */
-	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:1")   /* OFF by default */
+	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:1")   // OFF by default
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:2")   /* OFF by default */
+	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:2")   // OFF by default
 	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x0c, 0x04, "Percentage" )        PORT_DIPLOCATION("SW1:3,4")
@@ -3162,16 +3264,16 @@
 	PORT_DIPSETTING(    0x04, "50%" )
 	PORT_DIPSETTING(    0x08, "60%" )
 	PORT_DIPSETTING(    0x00, "70%" )
-	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:5")   /* OFF by default */
+	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:5")   // OFF by default
 	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:6")   /* OFF by default */
+	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:6")   // OFF by default
 	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:7")   /* OFF by default */
+	PORT_DIPNAME( 0x40, 0x40, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:7")   // OFF by default
 	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:8")   /* OFF by default */
+	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:8")   // OFF by default
 	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 
@@ -3205,10 +3307,10 @@
     --------------------------------------------
 */
 	PORT_DIPNAME( 0x03, 0x01, "Max Bet" )           PORT_DIPLOCATION("SW2:1,2")
-	PORT_DIPSETTING(    0x03, "10" )    /* OFF-OFF */
-	PORT_DIPSETTING(    0x02, "20" )    /* ON-OFF */
-	PORT_DIPSETTING(    0x01, "50" )    /* OFF-ON */
-	PORT_DIPSETTING(    0x00, "100" )   /* ON-ON */
+	PORT_DIPSETTING(    0x03, "10" )    // OFF-OFF
+	PORT_DIPSETTING(    0x02, "20" )    // ON-OFF
+	PORT_DIPSETTING(    0x01, "50" )    // OFF-ON
+	PORT_DIPSETTING(    0x00, "100" )   // ON-ON
 	PORT_DIPNAME( 0x04, 0x04, "Game Type" )         PORT_DIPLOCATION("SW2:3")
 	PORT_DIPSETTING(    0x04, "Wild Witch" )
 	PORT_DIPSETTING(    0x00, "Witch Game" )
@@ -3230,7 +3332,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( wupndown )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )  PORT_NAME("Bet (Setzen)")
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Bookkeeping / Test")
@@ -3325,7 +3427,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( wstrike )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )  PORT_NAME("Bet (Setzen)")
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Bookkeeping / Test")
@@ -3422,7 +3524,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( wtchjack )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )  PORT_NAME("Bet (Setzen)")
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Bookkeeping / Test")
@@ -3517,7 +3619,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( sloco93 )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_INCLUDE( witchcda )
 
 	PORT_MODIFY("IN0-1")
@@ -3525,7 +3627,7 @@
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_GAMBLE_LOW ) PORT_NAME("Rojo (Red)") PORT_CODE(KEYCODE_S)
 
 	PORT_MODIFY("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -3545,7 +3647,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( bsuerte )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET ) PORT_NAME("Apostar (Bet)")
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Contabilidad (Meters)")
@@ -3587,7 +3689,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -3598,7 +3700,7 @@
 	PORT_DIPNAME( 0x20, 0x00, "50hz/60hz" )         PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x20, "50hz" )
 	PORT_DIPSETTING(    0x00, "60hz" )
-	PORT_DIPNAME( 0x40, 0x00, "Modo de Pago" )      PORT_DIPLOCATION("SW1:3")   /* left as 'auto' */
+	PORT_DIPNAME( 0x40, 0x00, "Modo de Pago" )      PORT_DIPLOCATION("SW1:3")   // left as 'auto'
 	PORT_DIPSETTING(    0x40, "Manual" )
 	PORT_DIPSETTING(    0x00, "Auto" )
 	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )  PORT_DIPLOCATION("SW1:4")
@@ -3633,18 +3735,18 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( bsuertew )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_INCLUDE( bsuerte )
 
 	PORT_MODIFY("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_DIPNAME( 0x20, 0x00, "Creditos Ganados" )  PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x20, "Show" )
 	PORT_DIPSETTING(    0x00, "Hide" )
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( poker91 )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_INCLUDE( bsuerte )
 
 	PORT_MODIFY("IN0-1")
@@ -3659,14 +3761,14 @@
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_HOLD5 ) PORT_NAME("Switch Card 5")
 
 	PORT_MODIFY("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_DIPNAME( 0x20, 0x20, "Contador de Acumulados" )    PORT_DIPLOCATION("SW1:2")
 	PORT_DIPSETTING(    0x20, "Muestra" )
 	PORT_DIPSETTING(    0x00, "Oculta" )
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( wildcard )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )   PORT_NAME("Bet")
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK )  PORT_NAME("Meters/Settings")
@@ -3708,7 +3810,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -3754,7 +3856,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( genie )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )   PORT_CODE(KEYCODE_1)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK )  PORT_NAME("Bookkeeping")
@@ -3796,7 +3898,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unused ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
@@ -3824,7 +3926,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( caspoker )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Bookkeeping")
@@ -3893,7 +3995,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( mondial )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK )
@@ -3935,7 +4037,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -3963,7 +4065,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( videtron )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK )
@@ -4006,7 +4108,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -4026,7 +4128,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( super98 )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_INCLUDE( bsuerte )
 
 	PORT_MODIFY("IN0-0")
@@ -4070,7 +4172,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_MODIFY("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -4081,17 +4183,17 @@
 	PORT_DIPNAME( 0x20, 0x00, "Turbo" )
 	PORT_DIPSETTING(    0x20, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
-	PORT_DIPNAME( 0x40, 0x40, "Bonus" )
+	PORT_DIPNAME( 0x40, 0x00, "Bonus" )
 	PORT_DIPSETTING(    0x40, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
-	PORT_DIPNAME( 0x80, 0x80, "Royal Flush" )
+	PORT_DIPNAME( 0x80, 0x00, "Royal Flush" )
 	PORT_DIPSETTING(    0x80, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
 INPUT_PORTS_END
 
 
 static INPUT_PORTS_START( geniea )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_INCLUDE( bsuerte )
 
 	PORT_MODIFY("IN0-0")
@@ -4135,7 +4237,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_MODIFY("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -4156,7 +4258,7 @@
 
 
 static INPUT_PORTS_START( bsuertev )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_INCLUDE( bsuerte )
 
 	PORT_MODIFY("IN0-0")
@@ -4200,7 +4302,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_MODIFY("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -4221,7 +4323,7 @@
 
 
 static INPUT_PORTS_START( bonuspkr )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK ) PORT_NAME("Meters")
@@ -4263,7 +4365,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -4284,7 +4386,7 @@
 
 
 static INPUT_PORTS_START( super21p )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )   PORT_NAME("Bet")
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK )  PORT_NAME("Meters")
@@ -4481,21 +4583,17 @@
 
 static const discrete_dac_r1_ladder dac_goldnpkr_ladder =
 {
-	3,                                  /* size of ladder */
-	{RES_K(30), RES_K(15), RES_K(7.5)}, /* elements */
+	3,                                  // size of ladder
+	{RES_K(30), RES_K(15), RES_K(7.5)}, // elements
 
 /*  external vBias doesn't seems to be accurate.
     using the 555 internal values sound better.
 */
-	5,                                  /* voltage Bias resistor is tied to */
-	RES_K(5),                           /* additional resistor tied to vBias */
-	RES_K(10),                          /* resistor tied to ground */
-
-	CAP_U(4.7)                          /* filtering cap tied to ground */
-
-//  12,                                 /* voltage Bias resistor is tied to */
-//  RES_K(330),                         /* additional resistor tied to vBias */
-//  0,                                  /* resistor tied to ground */
+	5,                                  // voltage Bias resistor is tied to
+	RES_K(5),                           // additional resistor tied to vBias
+	RES_K(10),                          // resistor tied to ground
+
+	CAP_U(4.7)                          // filtering cap tied to ground
 };
 
 static DISCRETE_SOUND_START( goldnpkr_discrete )
@@ -4507,8 +4605,8 @@
     ....x... --> enable/disable.
 
 */
-	DISCRETE_INPUT_NOT   (NODE_01)      /* bit 3 - enable/disable */
-	DISCRETE_INPUT_DATA  (NODE_10)      /* bits 0-2  - sound data */
+	DISCRETE_INPUT_NOT   (NODE_01)      // bit 3: enable/disable
+	DISCRETE_INPUT_DATA  (NODE_10)      // bits 0-2: sound data
 
 	DISCRETE_DAC_R1(NODE_20, NODE_10, 5, &dac_goldnpkr_ladder)
 
@@ -4548,17 +4646,17 @@
 
 static const discrete_dac_r1_ladder dac_pottnpkr_ladder =
 {
-	3,                                  /* size of ladder */
-	{RES_K(33), RES_K(18), RES_K(10)},  /* elements */
+	3,                                  // size of ladder
+	{RES_K(33), RES_K(18), RES_K(10)},  // elements
 
 /*  external vBias doesn't seems to be accurate.
     using the 555 internal values sound better.
 */
-	5,                                  /* voltage Bias resistor is tied to */
-	RES_K(5),                           /* additional resistor tied to vBias */
-	RES_K(10),                          /* resistor tied to ground */
+	5,                                  // voltage Bias resistor is tied to
+	RES_K(5),                           // additional resistor tied to vBias
+	RES_K(10),                          // resistor tied to ground
 
-	0                                   /* no filtering cap tied to ground */
+	0                                   // no filtering cap tied to ground
 };
 
 static DISCRETE_SOUND_START( pottnpkr_discrete )
@@ -4570,8 +4668,8 @@
     ....x... --> enable/disable.
 
 */
-	DISCRETE_INPUT_NOT   (NODE_01)      /* bit 3 - enable/disable */
-	DISCRETE_INPUT_DATA  (NODE_10)      /* bits 0-2  - sound data */
+	DISCRETE_INPUT_NOT   (NODE_01)      // bit 3: enable/disable
+	DISCRETE_INPUT_DATA  (NODE_10)      // bits 0-2: sound data
 
 	DISCRETE_DAC_R1(NODE_20, NODE_10, 5, &dac_pottnpkr_ladder)
 
@@ -4607,7 +4705,7 @@
 
 void goldnpkr_state::goldnpkr_base(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	M6502(config, m_maincpu, CPU_CLOCK);
 	m_maincpu->set_addrmap(AS_PROGRAM, &goldnpkr_state::goldnpkr_map);
 
@@ -4622,15 +4720,15 @@
 	m_pia[1]->writepa_handler().set(FUNC(goldnpkr_state::sound_w));
 	m_pia[1]->writepb_handler().set(FUNC(goldnpkr_state::mux_w));
 
-	/* video hardware */
+	// video hardware
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(60);
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
-	screen.set_size((39+1)*8, (31+1)*8);          /* From MC6845 init, registers 00 & 04 (programmed with value-1). */
-	screen.set_visarea(0*8, 32*8-1, 0*8, 29*8-1); /* From MC6845 init, registers 01 & 06. */
+	screen.set_size((39+1)*8, (31+1)*8);          // From MC6845 init, registers 00 & 04 (programmed with value-1).
+	screen.set_visarea(0*8, 32*8-1, 0*8, 29*8-1); // From MC6845 init, registers 01 & 06.
 	screen.set_screen_update(FUNC(goldnpkr_state::screen_update_goldnpkr));
 
-	mc6845_device &crtc(MC6845(config, "crtc", CPU_CLOCK)); /* 68B45 or 6845s @ CPU clock */
+	mc6845_device &crtc(MC6845(config, "crtc", CPU_CLOCK)); // 68B45 or 6845s @ CPU clock
 	crtc.set_screen("screen");
 	crtc.set_show_border_area(false);
 	crtc.set_char_width(8);
@@ -4644,7 +4742,7 @@
 {
 	goldnpkr_base(config);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	DISCRETE(config, m_discrete, goldnpkr_discrete).add_route(ALL_OUTPUTS, "mono", 1.0);
 }
@@ -4653,13 +4751,29 @@
 {
 	goldnpkr_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &goldnpkr_state::pottnpkr_map);
 
 	m_pia[0]->readpa_handler().set(FUNC(goldnpkr_state::pottnpkr_mux_port_r));
 	m_pia[0]->writepa_handler().set(FUNC(goldnpkr_state::mux_port_w));
 
-	/* sound hardware */
+	// sound hardware
+	SPEAKER(config, "mono").front_center();
+	DISCRETE(config, m_discrete, pottnpkr_discrete).add_route(ALL_OUTPUTS, "mono", 1.0);
+}
+
+void goldnpkr_state::icp_ext(machine_config &config)
+{
+	goldnpkr_base(config);
+	R65C02(config.replace(), m_maincpu, CPU_CLOCK);
+
+	// basic machine hardware
+	m_maincpu->set_addrmap(AS_PROGRAM, &goldnpkr_state::icp_ext_map);
+
+	m_pia[0]->readpa_handler().set(FUNC(goldnpkr_state::pottnpkr_mux_port_r));
+	m_pia[0]->writepa_handler().set(FUNC(goldnpkr_state::mux_port_w));
+
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	DISCRETE(config, m_discrete, pottnpkr_discrete).add_route(ALL_OUTPUTS, "mono", 1.0);
 }
@@ -4668,16 +4782,16 @@
 {
 	goldnpkr_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &goldnpkr_state::witchcrd_map);
 
 	m_pia[0]->readpa_handler().set(FUNC(goldnpkr_state::pottnpkr_mux_port_r));
 	m_pia[0]->writepa_handler().set(FUNC(goldnpkr_state::mux_port_w));
 
-	/* video hardware */
+	// video hardware
 	m_palette->set_init(FUNC(goldnpkr_state::witchcrd_palette));
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	DISCRETE(config, "discrete", goldnpkr_discrete).add_route(ALL_OUTPUTS, "mono", 1.0);
 }
@@ -4693,7 +4807,7 @@
 {
 	goldnpkr_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &goldnpkr_state::witchcrd_falcon_map);
 
 	m_pia[0]->writepa_handler().set(FUNC(goldnpkr_state::mux_port_w));
@@ -4701,19 +4815,19 @@
 	m_pia[1]->readpa_handler().set(FUNC(goldnpkr_state::ay8910_data_r));
 	m_pia[1]->writepa_handler().set(FUNC(goldnpkr_state::ay8910_data_w));
 
-	/* video hardware */
+	// video hardware
 	m_palette->set_init(FUNC(goldnpkr_state::witchcrd_palette));
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
-	AY8910(config, m_ay8910, MASTER_CLOCK/4).add_route(ALL_OUTPUTS, "mono", 1.00);    /* guess, seems ok */
+	AY8910(config, m_ay8910, MASTER_CLOCK/4).add_route(ALL_OUTPUTS, "mono", 1.00);    // guess, seems ok
 }
 
 void goldnpkr_state::super21p(machine_config &config)
 {
 	goldnpkr_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &goldnpkr_state::super21p_map);
 
 	m_pia[0]->writepa_handler().set(FUNC(goldnpkr_state::mux_port_w));
@@ -4721,13 +4835,13 @@
 	m_pia[1]->readpa_handler().set(FUNC(goldnpkr_state::ay8910_data_r));
 	m_pia[1]->writepa_handler().set(FUNC(goldnpkr_state::ay8910_data_w));
 
-	/* video hardware */
+	// video hardware
 	MCFG_VIDEO_START_OVERRIDE(goldnpkr_state, super21p)
 	m_gfxdecode->set_info(gfx_super21p);
 
 	PALETTE(config.replace(), m_palette, FUNC(goldnpkr_state::super21p_palette), 1024);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	AY8910(config, m_ay8910, MASTER_CLOCK/4).add_route(ALL_OUTPUTS, "mono", 1.00);  // guess, seems ok
 	m_ay8910->port_a_read_callback().set_ioport("SW1");
@@ -4738,18 +4852,18 @@
 {
 	goldnpkr_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &goldnpkr_state::wildcard_map);
 
 	m_pia[0]->readpa_handler().set(FUNC(goldnpkr_state::pottnpkr_mux_port_r));
 	m_pia[0]->writepa_handler().set(FUNC(goldnpkr_state::mux_port_w));
 
-	/* video hardware */
+	// video hardware
 //  m_gfxdecode->set_info(gfx_wildcard);
 	m_palette->set_init(FUNC(goldnpkr_state::witchcrd_palette));
 //  MCFG_VIDEO_START_OVERRIDE(goldnpkr_state,wildcard)
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	DISCRETE(config, m_discrete, goldnpkr_discrete).add_route(ALL_OUTPUTS, "mono", 1.0);
 }
@@ -4758,18 +4872,18 @@
 {
 	goldnpkr_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &goldnpkr_state::wcrdxtnd_map);
 
 	m_pia[0]->readpa_handler().set(FUNC(goldnpkr_state::pottnpkr_mux_port_r));
 	m_pia[0]->writepa_handler().set(FUNC(goldnpkr_state::mux_port_w));
 
-	/* video hardware */
+	// video hardware
 	m_gfxdecode->set_info(gfx_wcrdxtnd);
 	m_palette->set_init(FUNC(goldnpkr_state::wcrdxtnd_palette));
 	MCFG_VIDEO_START_OVERRIDE(goldnpkr_state, wcrdxtnd)
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	DISCRETE(config, m_discrete, goldnpkr_discrete).add_route(ALL_OUTPUTS, "mono", 1.0);
 }
@@ -4778,10 +4892,10 @@
 {
 	goldnpkr_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &goldnpkr_state::wildcrdb_map);
 
-	z80_device &mcu(Z80(config, "mcu", MASTER_CLOCK/4));    /* guess */
+	z80_device &mcu(Z80(config, "mcu", MASTER_CLOCK/4));    // guess
 	mcu.set_addrmap(AS_PROGRAM, &goldnpkr_state::wildcrdb_mcu_map);
 	mcu.set_addrmap(AS_IO, &goldnpkr_state::wildcrdb_mcu_io_map);
 
@@ -4790,30 +4904,30 @@
 	m_pia[1]->readpa_handler().set(FUNC(goldnpkr_state::ay8910_data_r));
 	m_pia[1]->writepa_handler().set(FUNC(goldnpkr_state::ay8910_data_w));
 
-	/* video hardware */
+	// video hardware
 //  m_gfxdecode->set_info(gfx_wildcard);
 	m_palette->set_init(FUNC(goldnpkr_state::witchcrd_palette));
 //  MCFG_VIDEO_START_OVERRIDE(goldnpkr_state,wildcard)
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
-	AY8910(config, m_ay8910, MASTER_CLOCK/4).add_route(ALL_OUTPUTS, "mono", 1.00);    /* guess, seems ok */
+	AY8910(config, m_ay8910, MASTER_CLOCK/4).add_route(ALL_OUTPUTS, "mono", 1.00);    // guess, seems ok
 }
 
 void goldnpkr_state::genie(machine_config &config)
 {
 	goldnpkr_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &goldnpkr_state::genie_map);
 
 	m_pia[0]->readpa_handler().set(FUNC(goldnpkr_state::pottnpkr_mux_port_r));
 	m_pia[0]->writepa_handler().set(FUNC(goldnpkr_state::mux_port_w));
 
-	/* video hardware */
+	// video hardware
 	m_palette->set_init(FUNC(goldnpkr_state::witchcrd_palette));
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	DISCRETE(config, m_discrete, goldnpkr_discrete).add_route(ALL_OUTPUTS, "mono", 1.0);
 }
@@ -4822,16 +4936,16 @@
 {
 	goldnpkr_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &goldnpkr_state::goldnpkr_map);
 
 //  m_pia[0]->readpa_handler().set(FUNC(goldnpkr_state::pottnpkr_mux_port_r));
 //  m_pia[0]->writepa_handler().set(FUNC(goldnpkr_state::mux_port_w));
 
-	/* video hardware */
+	// video hardware
 	m_palette->set_init(FUNC(goldnpkr_state::witchcrd_palette));
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	DISCRETE(config, m_discrete, goldnpkr_discrete).add_route(ALL_OUTPUTS, "mono", 1.0);
 }
@@ -4840,13 +4954,13 @@
 {
 	goldnpkr_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &goldnpkr_state::mondial_map);
 
 	MCFG_MACHINE_START_OVERRIDE(goldnpkr_state, mondial)
 	MCFG_MACHINE_RESET_OVERRIDE(goldnpkr_state, mondial)
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	DISCRETE(config, m_discrete, goldnpkr_discrete).add_route(ALL_OUTPUTS, "mono", 1.0);
 }
@@ -4855,7 +4969,7 @@
 {
 	goldnpkr_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &goldnpkr_state::bchancep_map);
 
 	m_pia[0]->readpa_handler().set(FUNC(goldnpkr_state::pia0_a_r));
@@ -4868,7 +4982,7 @@
 	m_pia[1]->writepa_handler().set(FUNC(goldnpkr_state::pia1_a_w));
 	m_pia[1]->writepb_handler().set(FUNC(goldnpkr_state::pia1_b_w));
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	DISCRETE(config, m_discrete, pottnpkr_discrete).add_route(ALL_OUTPUTS, "mono", 1.0);
 }
@@ -4883,7 +4997,7 @@
 
 	m_gfxdecode->set_info(gfx_caspoker);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	DISCRETE(config, m_discrete, goldnpkr_discrete).add_route(ALL_OUTPUTS, "mono", 1.0);
 }
@@ -4930,7 +5044,7 @@
 
 void blitz_state::megadpkr_map(address_map &map)
 {
-	map(0x0000, 0x07ff).ram(); //.share("nvram");   /* battery backed RAM */
+	map(0x0000, 0x07ff).ram(); //.share("nvram");   // battery backed RAM
 	map(0x0800, 0x0800).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x0801, 0x0801).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 	map(0x0844, 0x0847).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
@@ -4958,7 +5072,7 @@
 
 
 static INPUT_PORTS_START( megadpkr )
-	/* Multiplexed - 4x5bits */
+	// Multiplexed - 4x5bits
 	PORT_START("IN0-0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_POKER_BET )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_BOOK )
@@ -4992,7 +5106,7 @@
 	PORT_BIT( 0xe0, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("SW1")
-	/* only bits 4-7 are connected here and were routed to SW1 1-4 */
+	// only bits 4-7 are connected here and were routed to SW1 1-4
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -5014,13 +5128,13 @@
 
 void blitz_state::megadpkr(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	M6502(config, m_maincpu, CPU_CLOCK);
 	m_maincpu->set_addrmap(AS_PROGRAM, &blitz_state::megadpkr_map);
 
 	ADDRESS_MAP_BANK(config, "bankdev").set_map(&blitz_state::megadpkr_banked_map).set_data_width(8).set_addr_width(16).set_stride(0x4000);
 
-	M68705P5(config, m_mcu, CPU_CLOCK); /* unknown */
+	M68705P5(config, m_mcu, CPU_CLOCK); // unknown
 	m_mcu->portb_w().set(FUNC(blitz_state::mcu_portb_w));
 	m_mcu->portc_w().set(FUNC(blitz_state::mcu_portc_w));
 
@@ -5035,7 +5149,7 @@
 	m_pia[1]->writepa_handler().set(FUNC(goldnpkr_state::sound_w));
 	m_pia[1]->writepb_handler().set(FUNC(goldnpkr_state::mux_w));
 
-	/* video hardware */
+	// video hardware
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(60);
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
@@ -5052,7 +5166,7 @@
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_goldnpkr);
 	PALETTE(config, m_palette, FUNC(blitz_state::witchcrd_palette), 256);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	DISCRETE(config, m_discrete, goldnpkr_discrete).add_route(ALL_OUTPUTS, "mono", 1.0);
 }
@@ -5079,13 +5193,13 @@
 	ROM_LOAD( "ups39_12a.bin",  0x0000, 0x8000, CRC(216b45fb) SHA1(fbfcd98cc39b2e791cceb845b166ff697f584add) )
 
 	ROM_REGION( 0x6000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x4000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38_5a.bin", 0x4000, 0x2000, CRC(32705e1d) SHA1(84f9305af38179985e0224ae2ea54c01dfef6e12) )    /* text layer */
+	ROM_FILL(               0x0000, 0x4000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38_5a.bin", 0x4000, 0x2000, CRC(32705e1d) SHA1(84f9305af38179985e0224ae2ea54c01dfef6e12) )    // char ROM
 
 	ROM_REGION( 0x6000, "gfx2", 0 )
-	ROM_LOAD( "u43_2a.bin", 0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "u40_4a.bin", 0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) )    /* cards deck gfx, bitplane2 */
-	ROM_COPY( "gfx1",   0x4800, 0x4000, 0x0800 )    /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */
+	ROM_LOAD( "u43_2a.bin", 0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "u40_4a.bin", 0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) )    // cards deck gfx, bitplane2
+	ROM_COPY( "gfx1",   0x4800, 0x4000, 0x0800 )    // cards deck gfx, bitplane3. found in the 2nd quarter of the char rom
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "tbp24s10n.7d",       0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -5101,13 +5215,13 @@
 	ROM_LOAD( "ups31h.12a", 0x0000, 0x8000, CRC(bee5b07a) SHA1(5da60292ecbbedd963c273eac2a1fb88ad66ada8) )
 
 	ROM_REGION( 0x6000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x4000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38_5a.bin", 0x4000, 0x2000, CRC(32705e1d) SHA1(84f9305af38179985e0224ae2ea54c01dfef6e12) )    /* text layer */
+	ROM_FILL(               0x0000, 0x4000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38_5a.bin", 0x4000, 0x2000, CRC(32705e1d) SHA1(84f9305af38179985e0224ae2ea54c01dfef6e12) )    // char ROM
 
 	ROM_REGION( 0x6000, "gfx2", 0 )
-	ROM_LOAD( "u43_2a.bin", 0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "u40_4a.bin", 0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) )    /* cards deck gfx, bitplane2 */
-	ROM_COPY( "gfx1",   0x4800, 0x4000, 0x0800 )    /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */
+	ROM_LOAD( "u43_2a.bin", 0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "u40_4a.bin", 0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) )    // cards deck gfx, bitplane2
+	ROM_COPY( "gfx1",   0x4800, 0x4000, 0x0800 )    // cards deck gfx, bitplane3. found in the 2nd quarter of the char rom
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "tbp24s10n.7d",       0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -5150,32 +5264,32 @@
 	ROM_LOAD( "5.bin", 0x6000, 0x2000, CRC(395fbc5c) SHA1(f742d7a9312828997a4323ac2b957048687fbed2) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(          0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "3.bin", 0x2000, 0x0800, CRC(23e83e89) SHA1(0c6352d46e3dfe176b0e970dd163e2bc01246890) )    /* text layer */
+	ROM_FILL(          0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "3.bin", 0x2000, 0x0800, CRC(23e83e89) SHA1(0c6352d46e3dfe176b0e970dd163e2bc01246890) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "0.bin", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "1.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "2.bin", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "0.bin", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "1.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "2.bin", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "82s129.bin", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
 ROM_END
 
 ROM_START( videtron2 )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* different from videtron */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // different from videtron
 	ROM_LOAD( "4.bin", 0x5000, 0x1000, CRC(4a7dab42) SHA1(7fcdab985b783d90879a99b2a53a6814ca4278eb) ) // sldh
 	ROM_LOAD( "5.bin", 0x6000, 0x1000, CRC(c70e8127) SHA1(7db2d4a29cba7c336f254393955fad71f30a539a) ) // sldh
 	ROM_LOAD( "6.bin", 0x7000, 0x1000, CRC(490c7304) SHA1(1a6c6112571fd0e35b640ed58f66582a2d99c58b) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(          0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "3.bin", 0x2000, 0x0800, CRC(23e83e89) SHA1(0c6352d46e3dfe176b0e970dd163e2bc01246890) )    /* text layer */
+	ROM_FILL(          0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "3.bin", 0x2000, 0x0800, CRC(23e83e89) SHA1(0c6352d46e3dfe176b0e970dd163e2bc01246890) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "0.bin", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "1.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "2.bin", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "0.bin", 0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "1.bin", 0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "2.bin", 0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "82s129.bin", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -5190,16 +5304,16 @@
 	ROM_LOAD( "poker_videotron.prg", 0x4000, 0x2000, CRC(38494ffb) SHA1(defa03546fd21d854c2d2413e6e2bf575d0518d7) )
 	ROM_LOAD( "videotron_poker.prg", 0x6000, 0x2000, CRC(960dcb61) SHA1(a7da40383b0149d21156b461c144d345603d747a) )
 
-	ROM_REGION( 0x3000, "gfx1", 0 ) /* taken from videtron */
-	ROM_FILL(          0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "3.bin", 0x2000, 0x0800, BAD_DUMP CRC(23e83e89) SHA1(0c6352d46e3dfe176b0e970dd163e2bc01246890) )    /* text layer */
-
-	ROM_REGION( 0x1800, "gfx2", 0 ) /* taken from videtron */
-	ROM_LOAD( "0.bin", 0x0000, 0x0800, BAD_DUMP CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "1.bin", 0x0800, 0x0800, BAD_DUMP CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "2.bin", 0x1000, 0x0800, BAD_DUMP CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_REGION( 0x3000, "gfx1", 0 ) // taken from videtron
+	ROM_FILL(          0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "3.bin", 0x2000, 0x0800, BAD_DUMP CRC(23e83e89) SHA1(0c6352d46e3dfe176b0e970dd163e2bc01246890) )    // char ROM
+
+	ROM_REGION( 0x1800, "gfx2", 0 ) // taken from videtron
+	ROM_LOAD( "0.bin", 0x0000, 0x0800, BAD_DUMP CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "1.bin", 0x0800, 0x0800, BAD_DUMP CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "2.bin", 0x1000, 0x0800, BAD_DUMP CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
-	ROM_REGION( 0x0100, "proms", 0 )    /* taken from videtron */
+	ROM_REGION( 0x0100, "proms", 0 )    // taken from videtron
 	ROM_LOAD( "82s129.bin", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
 ROM_END
 
@@ -5213,37 +5327,37 @@
 
     RB confirmed the dump. There are other games with double sized roms and identical halves.
 */
-ROM_START( pottnpkr )   /* Golden Poker style game. Code is intended to start at $6000 */
+ROM_START( pottnpkr )   // golden poker style game. code is intended to start at $6000. is potten's poker the real name?
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "ic13_3.bin", 0x2000, 0x1000, CRC(23c975cd) SHA1(1d32a9ba3aa996287a823558b9d610ab879a29e8) )
 	ROM_LOAD( "ic14_4.bin", 0x3000, 0x1000, CRC(86a03aab) SHA1(0c4e8699b9fc9943de1fa0a364e043b3878636dc) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "ic7_0.bin",  0x2000, 0x1000, CRC(1090e7f0) SHA1(26a7fc8853debb9a759811d7fee39410614c3895) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "ic7_0.bin",  0x2000, 0x1000, CRC(1090e7f0) SHA1(26a7fc8853debb9a759811d7fee39410614c3895) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "ic2_7.bin",  0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "ic3_8.bin",  0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "ic5_9.bin",  0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "ic2_7.bin",  0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "ic3_8.bin",  0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "ic5_9.bin",  0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "tbp24s10n.7d",       0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
 ROM_END
 
-ROM_START( potnpkra )    /* a Coinmaster game?... seems to be a hack */
+ROM_START( potnpkra )    // a coinmaster game?... seems to be a hack
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "vp-5.bin",   0x2000, 0x1000, CRC(1443d0ff) SHA1(36625d24d9a871cc8c03bdeda983982ba301b385) )
 	ROM_LOAD( "vp-6.bin",   0x3000, 0x1000, CRC(94f82fc1) SHA1(ce95fc429f5389eea45fec877bac992fa7ba2b3c) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "vp-4.bin",   0x1000, 0x0800, CRC(2c53493f) SHA1(9e71db51499294bb4b16e7d8013e5daf6f1f9d18) )    /* text layer */
+	ROM_FILL(               0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "vp-4.bin",   0x1000, 0x0800, CRC(2c53493f) SHA1(9e71db51499294bb4b16e7d8013e5daf6f1f9d18) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "vp-1.bin",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "vp-2.bin",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "vp-3.bin",   0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "vp-1.bin",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "vp-2.bin",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "vp-3.bin",   0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -5266,13 +5380,13 @@
 	ROM_LOAD( "517.17a",    0x3000, 0x1000, CRC(75a72877) SHA1(9df8fd2c98526d20aa0fa056a7b71b5c5fb5206b) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "517.8a",     0x1000, 0x0800, CRC(2c53493f) SHA1(9e71db51499294bb4b16e7d8013e5daf6f1f9d18) )    /* text layer */
+	ROM_FILL(               0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "517.8a",     0x1000, 0x0800, CRC(2c53493f) SHA1(9e71db51499294bb4b16e7d8013e5daf6f1f9d18) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "517.4a",     0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "517.6a",     0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "517.7a",     0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "517.4a",     0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "517.6a",     0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "517.7a",     0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "517_mb7052.9c",  0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -5296,13 +5410,13 @@
 	ROM_LOAD( "pottpok6.bin",   0x3000, 0x1000, CRC(53237873) SHA1(b640cb3db2513784c8d2d8983a17352276c11e07) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(                   0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "pottpok1.bin",   0x1000, 0x0800, CRC(2c53493f) SHA1(9e71db51499294bb4b16e7d8013e5daf6f1f9d18) )    /* text layer */
+	ROM_FILL(                   0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "pottpok1.bin",   0x1000, 0x0800, CRC(2c53493f) SHA1(9e71db51499294bb4b16e7d8013e5daf6f1f9d18) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "pottpok4.bin",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "pottpok3.bin",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "pottpok2.bin",   0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "pottpok4.bin",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "pottpok3.bin",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "pottpok2.bin",   0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -5314,13 +5428,13 @@
 	ROM_LOAD( "pot6.bin",   0x3000, 0x1000, CRC(53237873) SHA1(b640cb3db2513784c8d2d8983a17352276c11e07) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "pot34.bin",  0x2000, 0x1000, CRC(52fd35d2) SHA1(ad8bf8c222ceb2e9b3b6d9033866867f1977c65f) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "pot34.bin",  0x2000, 0x1000, CRC(52fd35d2) SHA1(ad8bf8c222ceb2e9b3b6d9033866867f1977c65f) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "pot1.bin",   0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "pot2.bin",   0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )    /* cards deck gfx, bitplane2 */
-	ROM_COPY( "gfx1",       0x2800, 0x2000, 0x0800 )    /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */
+	ROM_LOAD( "pot1.bin",   0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "pot2.bin",   0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )    // cards deck gfx, bitplane2
+	ROM_COPY( "gfx1",       0x2800, 0x2000, 0x0800 )    // cards deck gfx, bitplane3. found in the 2nd quarter of the char rom
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -5332,16 +5446,16 @@
 	ROM_LOAD( "g_luck_b.bin",   0x3000, 0x1000, CRC(7e848e5e) SHA1(45461cfcce06f6240562761d26ba7fdb7ef4986b) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "ic7_0.bin",  0x2000, 0x1000, CRC(1090e7f0) SHA1(26a7fc8853debb9a759811d7fee39410614c3895) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "ic7_0.bin",  0x2000, 0x1000, CRC(1090e7f0) SHA1(26a7fc8853debb9a759811d7fee39410614c3895) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "ic2_7.bin",  0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "ic3_8.bin",  0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "ic5_9.bin",  0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "ic2_7.bin",  0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "ic3_8.bin",  0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "ic5_9.bin",  0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "tbp24s10n.7d",       0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "tbp24s10n.7d",       0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 /*
@@ -5361,16 +5475,16 @@
 	ROM_LOAD( "prg.bin",    0x4000, 0x4000, CRC(d7a932a2) SHA1(c940ea90378a631c217a09c4a9e73c382acaa48d) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "3.bin",  0x2000, 0x0800, CRC(23e83e89) SHA1(0c6352d46e3dfe176b0e970dd163e2bc01246890) )    /* text layer */
+	ROM_FILL(           0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "3.bin",  0x2000, 0x0800, CRC(23e83e89) SHA1(0c6352d46e3dfe176b0e970dd163e2bc01246890) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "0.bin",  0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "1.bin",  0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "2.bin",  0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "0.bin",  0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "1.bin",  0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "2.bin",  0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",  0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",  0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 /* Unknown australian hard to dump set
@@ -5382,16 +5496,16 @@
 	ROM_LOAD( "unknown.17a", 0x3000, 0x1000, CRC(1a9cfbf9) SHA1(47b3767dbcb016ae9ba4437d8f2790681553a5b0) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "unknown1.bin",  0x1000, 0x0800, CRC(2c53493f) SHA1(9e71db51499294bb4b16e7d8013e5daf6f1f9d18) )    /* char ROM */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "unknown1.bin",  0x1000, 0x0800, CRC(2c53493f) SHA1(9e71db51499294bb4b16e7d8013e5daf6f1f9d18) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "unknown2.bin",  0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "unknown3.bin",  0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "unknown4.bin",  0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3. need to be redumped */
+	ROM_LOAD( "unknown2.bin",  0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "unknown3.bin",  0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "unknown4.bin",  0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3. need to be redumped
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "bprom.bin",    0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "bprom.bin",    0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 /* Unknown australian set
@@ -5402,24 +5516,24 @@
 	ROM_LOAD( "unk_2732.15a", 0x2000, 0x1000, CRC(441ad1b2) SHA1(248b8e03723989c7766b50858c9a5d0abbb5e055) )
 	ROM_LOAD( "unk_2732.17a", 0x3000, 0x1000, CRC(9d72e145) SHA1(526d88c70e03bcff18072436ca3d498a0bb39913) )
 
-	/* Backcard logo is different, showing 'FR'. The rest matches the common char gfx */
+	// Backcard logo is different, showing 'FR'. The rest matches the common char gfx
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(                  0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "unk_2716.8a",   0x1000, 0x0800, CRC(a138afa6) SHA1(80c6d11086f78e36dfc01c15b23e70667fcf17fc) )    /* char ROM */
+	ROM_FILL(                  0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "unk_2716.8a",   0x1000, 0x0800, CRC(a138afa6) SHA1(80c6d11086f78e36dfc01c15b23e70667fcf17fc) )    // char ROM
 
-	/* Backplane at 5a has two bits different against the common cards gfx
-	   Offsets 0x380 and 0x400, bit0 is set to 0 */
+	// Backplane at 5a has two bits different against the common cards gfx.
+	// Offsets 0x380 and 0x400, bit0 is set to 0
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "unk_2716.4a",  0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "unk_2716.5a",  0x0800, 0x0800, CRC(daf38d03) SHA1(6b518494688756ad7b753fdec46b6392c4a9ebbe) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "unk_2716.7a",  0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "unk_2716.4a",  0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "unk_2716.5a",  0x0800, 0x0800, CRC(daf38d03) SHA1(6b518494688756ad7b753fdec46b6392c4a9ebbe) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "unk_2716.7a",  0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "bprom.bin",    0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "bprom.bin",    0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 /* Potten's Poker bootleg set
-   PCB ICP-1 (no encrypted).
+   PCB ICP-1 (unencrypted).
 
   1x R6502P
   2x MC6821P
@@ -5433,16 +5547,16 @@
 	ROM_LOAD( "8.17a",   0x3000, 0x1000, CRC(3cb1031d) SHA1(bb814577f79f26789752ec29d7ae17ddae822222) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4.8a",   0x1000, 0x0800, CRC(17d0d174) SHA1(ecf507439b6df950052e65ec014830f0287b98b9) )    /* char ROM */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4.8a",   0x1000, 0x0800, CRC(17d0d174) SHA1(ecf507439b6df950052e65ec014830f0287b98b9) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "1.4a",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "2.6a",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "3.7a",   0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "1.4a",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "2.6a",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "3.7a",   0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "prom.9c",    0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump OK */
+	ROM_LOAD( "prom.9c",    0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump OK
 ROM_END
 
 /*
@@ -5459,7 +5573,7 @@
 	ROM_LOAD( "pok7.a14",  0x7000, 0x1000, CRC(38d92f95) SHA1(9523ef5fae57ad7cdd3fe52667a9670fdca8aa75) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(                0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
+	ROM_FILL(                0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
 	ROM_LOAD( "pok4_ww.a7",  0x1000, 0x0800, CRC(5cafb3a9) SHA1(efec24d4dd1f83f40a1b7ec66bc6bf36c4b1e541) )  // text chars
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
@@ -5503,22 +5617,43 @@
 	ROM_LOAD( "n82s129n.d7",  0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )  // color PROM
 ROM_END
 
+/* Potten's Poker bootleg set
+   PCB ICP-1 (unencrypted).
+*/
+ROM_START( potnpkrl )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "unknown.16a",  0x2000, 0x1000, CRC(2ed4f11f) SHA1(5900ace86929584d49efd055c748d5dd110cf9c0) )
+	ROM_LOAD( "unknown.17a",  0x3000, 0x1000, CRC(f0992aa3) SHA1(90377024b19b7ca60baa99a6c8ea96cf625d21b4) )
+
+	ROM_REGION( 0x1800, "gfx1", 0 )
+	ROM_FILL(                 0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "unknown.9a",   0x1000, 0x0800, CRC(2c53493f) SHA1(9e71db51499294bb4b16e7d8013e5daf6f1f9d18) )    // char ROM
+
+	ROM_REGION( 0x1800, "gfx2", 0 )
+	ROM_LOAD( "unknown.4a",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "unknown.6a",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "unknown.7a",   0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
+
+	ROM_REGION( 0x0100, "proms", 0 )
+	ROM_LOAD( "82s129.9c",    0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
+ROM_END
+
 
 ROM_START( goodluck )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "goodluck_glh6b.bin", 0x0000, 0x8000, CRC(2cfa4a2c) SHA1(720e2900f3a0ef2632aa201a63b5eba0570e6aa3) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4.bin",  0x2000, 0x1000, CRC(41924d13) SHA1(8ab69b6efdc20858960fa5df669470ba90b5f8d7) )    /* text layer */
+	ROM_FILL(           0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4.bin",  0x2000, 0x1000, CRC(41924d13) SHA1(8ab69b6efdc20858960fa5df669470ba90b5f8d7) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",  0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",  0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 
@@ -5540,16 +5675,16 @@
 	ROM_LOAD( "ngold_2a.17a",   0x3000, 0x1000, CRC(9d07f0fc) SHA1(493b2e778342e1d6b7753902b714c5478bd22bd5) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4.8a",   0x1000, 0x0800, CRC(f54c6f43) SHA1(fe66542b95259c10f7954d52d1bd5747ce99df42) )    /* char ROM */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4.8a",   0x1000, 0x0800, CRC(f54c6f43) SHA1(fe66542b95259c10f7954d52d1bd5747ce99df42) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "1.4a",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "2.5a",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "3.7a",   0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "1.4a",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "2.5a",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "3.7a",   0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "n82s129n.9c",    0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "n82s129n.9c",    0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( ngolda )
@@ -5558,16 +5693,16 @@
 	ROM_LOAD( "2a.bin", 0x3000, 0x1000, CRC(9d07f0fc) SHA1(493b2e778342e1d6b7753902b714c5478bd22bd5) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4.8a",   0x1000, 0x0800, CRC(f54c6f43) SHA1(fe66542b95259c10f7954d52d1bd5747ce99df42) )    /* char ROM */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4.8a",   0x1000, 0x0800, CRC(f54c6f43) SHA1(fe66542b95259c10f7954d52d1bd5747ce99df42) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "1.4a",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "2.5a",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "3.7a",   0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "1.4a",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "2.5a",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "3.7a",   0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "n82s129n.9c",    0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "n82s129n.9c",    0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( ngoldb )
@@ -5576,16 +5711,16 @@
 	ROM_LOAD( "pkr_2.bin",  0x3000, 0x1000, CRC(de03a57d) SHA1(db696a892497ead7aa4ed2c600ba819c3b41a082) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "0.bin",  0x1000, 0x0800, CRC(f54c6f43) SHA1(fe66542b95259c10f7954d52d1bd5747ce99df42) )    /* char ROM */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "0.bin",  0x1000, 0x0800, CRC(f54c6f43) SHA1(fe66542b95259c10f7954d52d1bd5747ce99df42) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "8.bin",  0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "9.bin",  0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "8.bin",  0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "9.bin",  0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "n82s129n.9c",    0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "n82s129n.9c",    0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 
@@ -5598,20 +5733,20 @@
     balanced at $7ff8.
 */
 ROM_START( bsuerte )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bs_chica.256: good BS set... (checksum) */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bs_chica.256: good BS set... (checksum)
 	ROM_LOAD( "bs_chica.256",   0x0000, 0x8000, CRC(2e92b72b) SHA1(6c90fb265f2cb7ec40ddb0553b5b7fedfa89339c) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuertea )
@@ -5619,33 +5754,33 @@
 	ROM_LOAD( "ups39_12a.bin",  0x0000, 0x8000, CRC(e6b661b7) SHA1(b265f6814a168034d24bc1c25f67ece131281bc2) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuerteb )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bsrapida.128: Buena Suerte! red title, from Cordoba" */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bsrapida.128: Buena Suerte! red title, from Cordoba"
 	ROM_LOAD( "bsrapida.128",   0x4000, 0x4000, CRC(a2c633fa) SHA1(7cda3f56e6bd8e6bfc36a68c16d2e63d76d4dac3) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuertec )
@@ -5653,186 +5788,186 @@
 	ROM_LOAD( "x10d4esp.16c",   0x0000, 0x8000, CRC(0606bab4) SHA1(624b0cef1a23a4e7ba2d2d256f30f73b1e455fa7) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuerted )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* set seen nowadays, based on bsuertec */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // set seen nowadays, based on bsuertec
 	ROM_LOAD( "x10d4fix.bin",   0x0000, 0x8000, CRC(c5ecc419) SHA1(5538a1336b877d1780d9a0c5595b02e9b22ee17d) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuertee )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* source program for other mods  */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // source program for other mods
 	ROM_LOAD( "x10bb26.bin",    0x0000, 0x8000, CRC(57011385) SHA1(3cbfdb8dd261aa8ce27441326f0916640b13b67a) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuertef )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* add its own logo ($0000-$4000) in the cards-back */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // add its own logo ($0000-$4000) in the cards-back
 	ROM_LOAD( "bscat.256",  0x0000, 0x8000, CRC(944accd3) SHA1(f1ed149b9dafe9cdf3745b9344f2ce1814027005) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuerteg )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* based on witchcrd (winning counter, no lamps, only 9 settings parameters) */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // based on witchcrd (winning counter, no lamps, only 9 settings parameters)
 	ROM_LOAD( "bsjc.256",   0x0000, 0x8000, CRC(3a824d96) SHA1(1eb2b4630be10131416ff84213aa858a072896ac) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuerteh )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* based on witchcrd (winning counter, no lamps, only 9 settings parameters) */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // based on witchcrd (winning counter, no lamps, only 9 settings parameters)
 	ROM_LOAD( "jc603d.256", 0x0000, 0x8000, CRC(25df69e5) SHA1(54d2798437b61bd0e1919fb62daf24ed9df42678) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuertei )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* mcs: Buena Suerte! (ind arg, Cordoba) */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // mcs: Buena Suerte! (ind arg, Cordoba)
 	ROM_LOAD( "mcs.256",    0x0000, 0x8000, CRC(5c944e9d) SHA1(e394f8a32f4ebe622c0d0c30db5cb9d6d70b2126) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuertej )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bsgemini: BS hack by SUSILU, bad texts, and need proper chars */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bsgemini: BS hack by SUSILU, bad texts, and need proper chars
 	ROM_LOAD( "bsgemini.256",   0x0000, 0x8000, CRC(883f94d0) SHA1(30ff337ed2f454f74dfa354c14a8ab422284d279) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuertek )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bsindarg: Buena Suerte! (ind arg, Cordoba, set 2)*/
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bsindarg: Buena Suerte! (ind arg, Cordoba, set 2)
 	ROM_LOAD( "bsindarg.128",   0x4000, 0x4000, CRC(a9aaff1a) SHA1(13c9fbd0e9a04f42ded4dda0bb8a850de65cc671) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuertel )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bslacer128: Buena Suerte! (portugues), English settings */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bslacer128: Buena Suerte! (portugues), English settings
 	ROM_LOAD( "bslacer.128",    0x4000, 0x4000, CRC(edc254f4) SHA1(20e5543e59bfd67a0afec7cbeeb7000f6bba6c69) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuertem )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bslacer128: Buena Suerte! (portugues), English settings, set 2*/
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bslacer128: Buena Suerte! (portugues), English settings, set 2
 	ROM_LOAD( "bslacer.256",    0x0000, 0x8000, CRC(9f8a899a) SHA1(a1f3d0635b309d4734289b7ff48eceda69dfd3d0) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 /*
@@ -5950,122 +6085,122 @@
 
 
 ROM_START( bsuerteo )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bs_x10.256: BS normal, fast, set 2*/
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bs_x10.256: BS normal, fast, set 2
 	ROM_LOAD( "bs_x10.256", 0x0000, 0x8000, CRC(ad3427a6) SHA1(d0a954c86c0a4354b5cea4140b8da7a10f66337a) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuertep )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bs_p.128: another common BS set */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bs_p.128: another common BS set
 	ROM_LOAD( "bs_p.128",   0x4000, 0x4000, CRC(9503cfef) SHA1(f3246621bb9dff3d357d4c99f7075509899ed05f) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuerteq )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bs_r4.128: BS portunhol, white title */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bs_r4.128: BS portunhol, white title
 	ROM_LOAD( "bs_r4.128",  0x4000, 0x4000, CRC(22841e2f) SHA1(d547aa6ddb82aff0d87eeb9bae67281d22dc50d5) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuerter )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bs_100.128: BS with 1-100 bet (only allow 50) */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bs_100.128: BS with 1-100 bet (only allow 50)
 	ROM_LOAD( "bs_100.128", 0x4000, 0x4000, CRC(1d3104e5) SHA1(9c0f00725270aa4d28b5a539431311bdca2f864a) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuertes )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bs_50.128: BS, normal set */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bs_50.128: BS, normal set
 	ROM_LOAD( "bs_50.128",  0x4000, 0x4000, CRC(8c2e43ca) SHA1(3e3f0848964f4ee6f47ddcf2220ebd06d771eebf) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuertet )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bs_c.128: BS portunhol, with typos (Halta) */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bs_c.128: BS portunhol, with typos (Halta)
 	ROM_LOAD( "bs_c.128",   0x4000, 0x4000, CRC(8b605bdf) SHA1(a933149999937f44cb62a3b34ab55ac4b5a50f72) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( bsuerteu )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bs_origi.bin: BS portunhol, with typos (Halta & Fixa) */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bs_origi.bin: BS portunhol, with typos (Halta & Fixa)
 	ROM_LOAD( "bs_origi.bin",   0x0000, 0x8000, CRC(63a1ba65) SHA1(2354461ec7ad75f7ff2699e89d40517463157aaa) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "u38.bin",    0x2000, 0x1000, CRC(0a159dfa) SHA1(0a9c8e6177b36831b365917a10042aac3383983d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 /*
@@ -6124,21 +6259,21 @@
 */
 	ROM_START( witchcrd )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "epoxy_27128.bin",    0x4000, 0x4000, CRC(48186272) SHA1(d211bfa89404a292e6d0f0169ed11e1e74a361d9) )  /* epoxy block program ROM */
+	ROM_LOAD( "epoxy_27128.bin",    0x4000, 0x4000, CRC(48186272) SHA1(d211bfa89404a292e6d0f0169ed11e1e74a361d9) )  // epoxy block program ROM
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "wc4.7a", 0x2000, 0x0800, CRC(6a392b10) SHA1(9f36ae2e5a9a8741c6687e9c875d7b45999d9d6d) )    /* text layer */
-	ROM_LOAD( "wc4.7a", 0x2800, 0x0800, CRC(6a392b10) SHA1(9f36ae2e5a9a8741c6687e9c875d7b45999d9d6d) )    /* text layer */
+	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "wc4.7a", 0x2000, 0x0800, CRC(6a392b10) SHA1(9f36ae2e5a9a8741c6687e9c875d7b45999d9d6d) )    // char ROM
+	ROM_LOAD( "wc4.7a", 0x2800, 0x0800, CRC(6a392b10) SHA1(9f36ae2e5a9a8741c6687e9c875d7b45999d9d6d) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "wc1.2a", 0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "wc2.4a", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "wc3.5a", 0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "wc1.2a", 0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "wc2.4a", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "wc3.5a", 0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0200, "proms", 0 )
-	ROM_LOAD( "82s129.7d",          0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */
-	ROM_LOAD( "epoxy_82s129.bin",   0x0100, 0x0100, CRC(f0c012b1) SHA1(5502977404172e8c5b9fbf305581a406668ad1d9) ) /* original epoxy block PROM */
+	ROM_LOAD( "82s129.7d",          0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // original PCB PROM
+	ROM_LOAD( "epoxy_82s129.bin",   0x0100, 0x0100, CRC(f0c012b1) SHA1(5502977404172e8c5b9fbf305581a406668ad1d9) ) // original epoxy block PROM
 ROM_END
 
 /*  Witch Card (Spanish, set 1)
@@ -6149,16 +6284,16 @@
 	ROM_LOAD( "w_card.256", 0x0000, 0x8000, CRC(63a471f8) SHA1(96a2140e2da0050e7865a6662f707cf024130832) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "bs_4_wcspa.032", 0x2000, 0x1000, CRC(4e520c7a) SHA1(1de3ac4a150160c15f453b0d3f9d3cd3178bfedd) )    /* text layer */
+	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "bs_4_wcspa.032", 0x2000, 0x1000, CRC(4e520c7a) SHA1(1de3ac4a150160c15f453b0d3f9d3cd3178bfedd) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 /*  Witch Card (Spanish, set 2)
@@ -6169,16 +6304,16 @@
 	ROM_LOAD( "w_card.128", 0x4000, 0x4000, CRC(11ecac96) SHA1(717709b31f3dfa09be321c14fbf0e95d492ad2f2) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "bs_4_wcspa.032", 0x2000, 0x1000, CRC(4e520c7a) SHA1(1de3ac4a150160c15f453b0d3f9d3cd3178bfedd) )    /* text layer */
+	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "bs_4_wcspa.032", 0x2000, 0x1000, CRC(4e520c7a) SHA1(1de3ac4a150160c15f453b0d3f9d3cd3178bfedd) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 /*  Witch Card (English, no witch game)
@@ -6189,16 +6324,16 @@
 	ROM_LOAD( "wc_sbruj.256",   0x0000, 0x8000, CRC(5689ae41) SHA1(c7a624ec881204137489b147ce66cc9a9900650a) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "bs_4_wc.032",    0x2000, 0x1000, CRC(41924d13) SHA1(8ab69b6efdc20858960fa5df669470ba90b5f8d7) )    /* text layer */
+	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "bs_4_wc.032",    0x2000, 0x1000, CRC(41924d13) SHA1(8ab69b6efdc20858960fa5df669470ba90b5f8d7) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 /***************************************
@@ -6215,13 +6350,13 @@
 	ROM_LOAD( "12a.bin",    0x0000, 0x8000, CRC(a5c1186a) SHA1(b6c662bf489fbcccc3063ce55c957e630ba96ccb) )
 
 	ROM_REGION( 0x6000, "gfx1", 0 )
-	ROM_FILL(                   0x0000, 0x4000, 0x00000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "ce-3-tvg.bin",   0x4000, 0x2000, CRC(54b51497) SHA1(8c3a74377fde8c7c5a6b277a9c1e717e6bdd98f8) )    /* text layer */
+	ROM_FILL(                   0x0000, 0x4000, 0x00000 ) // filling the R-G bitplanes
+	ROM_LOAD( "ce-3-tvg.bin",   0x4000, 0x2000, CRC(54b51497) SHA1(8c3a74377fde8c7c5a6b277a9c1e717e6bdd98f8) )    // char ROM
 
 	ROM_REGION( 0x6000, "gfx2", 0 )
-	ROM_LOAD( "ce-1-tvg.bin",   0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "ce-2-tvg.bin",   0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) )    /* cards deck gfx, bitplane2 */
-	ROM_COPY( "gfx1",   0x4800, 0x4000, 0x0800 )    /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */
+	ROM_LOAD( "ce-1-tvg.bin",   0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "ce-2-tvg.bin",   0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) )    // cards deck gfx, bitplane2
+	ROM_COPY( "gfx1",   0x4800, 0x4000, 0x0800 )    // cards deck gfx, bitplane3. found in the 2nd quarter of the char rom
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "tbp24s10n.7d",   0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -6233,7 +6368,7 @@
 */
 	ROM_START( witchcde )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "27128_epoxy.bin",    0x4000, 0x4000, CRC(48186272) SHA1(d211bfa89404a292e6d0f0169ed11e1e74a361d9) )  /* epoxy block program ROM */
+	ROM_LOAD( "27128_epoxy.bin",    0x4000, 0x4000, CRC(48186272) SHA1(d211bfa89404a292e6d0f0169ed11e1e74a361d9) )  // epoxy block program ROM
 
 	ROM_REGION( 0x4000, "temp", 0 )
 	ROM_LOAD( "wc1.a2", 0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) )
@@ -6242,17 +6377,17 @@
 	ROM_LOAD( "wc4.a7", 0x3000, 0x1000, CRC(d3694522) SHA1(0f66ff2dd5c7ac9bf91fa9f48eb9f356572e814c) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(                   0x0000, 0x1000, 0x00000 ) /* filling the R-G bitplanes */
-	ROM_COPY( "temp",   0x3800, 0x1000, 0x0800 )    /* 0800-0fff of wc4.a7 - charset */
+	ROM_FILL(                   0x0000, 0x1000, 0x00000 ) // filling the R-G bitplanes
+	ROM_COPY( "temp",   0x3800, 0x1000, 0x0800 )    // 0800-0fff of wc4.a7 - charset
 
-	ROM_REGION( 0x1800, "gfx2", 0 ) /* 2nd half of each ROM */
-	ROM_COPY( "temp",   0x0800, 0x0000, 0x0800 )    /* 0800-0fff of wc1.a2 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x1800, 0x0800, 0x0800 )    /* 0800-0fff of wc2.a4 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x2800, 0x1000, 0x0800 )    /* 0800-0fff of wc3.a5 - regular cards gfx, bitplane 3 */
+	ROM_REGION( 0x1800, "gfx2", 0 ) // 2nd half of each ROM
+	ROM_COPY( "temp",   0x0800, 0x0000, 0x0800 )    // 0800-0fff of wc1.a2 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x1800, 0x0800, 0x0800 )    // 0800-0fff of wc2.a4 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x2800, 0x1000, 0x0800 )    // 0800-0fff of wc3.a5 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x0200, "proms", 0 )
-	ROM_LOAD( "24s10.bin",          0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */
-	ROM_LOAD( "24s10_epoxy.bin",    0x0100, 0x0100, CRC(ddfd7034) SHA1(78dee69ab4ba759485ee7f00446c2d86f08cc50f) ) /* original epoxy block PROM */
+	ROM_LOAD( "24s10.bin",          0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // original PCB PROM
+	ROM_LOAD( "24s10_epoxy.bin",    0x0100, 0x0100, CRC(ddfd7034) SHA1(78dee69ab4ba759485ee7f00446c2d86f08cc50f) ) // original epoxy block PROM
 ROM_END
 
 /*  Witch Card (English, witch game, lights)
@@ -6268,13 +6403,13 @@
 	ROM_LOAD( "@27.bin",    0x7000, 0x1000, CRC(e6f9c973) SHA1(f209d13d1565160bc2c05c6c4fce73d14a9a56ab) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "@14.bin",    0x2000, 0x1000, CRC(19b68bec) SHA1(b8ef17ba5545e2f104cd2783e5f1c97c400fcbbc) )    /* text layer */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "@14.bin",    0x2000, 0x1000, CRC(19b68bec) SHA1(b8ef17ba5545e2f104cd2783e5f1c97c400fcbbc) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "11.bin", 0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "12.bin", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "13.bin", 0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "11.bin", 0x0000, 0x1000, CRC(b5a1f5a3) SHA1(a34aaaab5443c6962177a5dd35002bd09d0d2772) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "12.bin", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "13.bin", 0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wc_bprom.bin",   0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -6299,18 +6434,18 @@
 	ROM_LOAD( "8.b13",  0x7000, 0x1000, CRC(6bb0059e) SHA1(c5f515b692c3353323aff77f087bf0a92a8d99cf) )
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "3.b5",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_FILL(           0x0800, 0x0800, 0x00000 ) /* filling the bitplane */
-	ROM_LOAD( "2.b3",   0x1000, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_FILL(           0x1800, 0x0800, 0x00000 ) /* filling the bitplane */
-	ROM_LOAD( "1.b1",   0x2000, 0x1000, CRC(8a17d1a7) SHA1(488e4eae287b05923bd6b378574e91cfe49d8c24) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "3.b5",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_FILL(           0x0800, 0x0800, 0x00000 ) // filling the bitplane
+	ROM_LOAD( "2.b3",   0x1000, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_FILL(           0x1800, 0x0800, 0x00000 ) // filling the bitplane
+	ROM_LOAD( "1.b1",   0x2000, 0x1000, CRC(8a17d1a7) SHA1(488e4eae287b05923bd6b378574e91cfe49d8c24) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x2000, 0x00000 ) /* filling the R-G bitplanes */
-	ROM_COPY( "gfx2",   0x2800, 0x2000, 0x0800 )    /* srctag, srcoffs, offset, length */
+	ROM_FILL(           0x0000, 0x2000, 0x00000 )   // filling the R-G bitplanes
+	ROM_COPY( "gfx2",   0x2800, 0x2000, 0x0800 )    // srctag, srcoffs, offset, length
 
 	ROM_REGION( 0x0100, "proms", 0 )
-//  ROM_LOAD( "82s129.7d",          0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */
+//  ROM_LOAD( "82s129.7d",          0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // original PCB PROM
 	ROM_LOAD( "tbp24s10n.d2",   0x0000, 0x0100, BAD_DUMP CRC(3db3b9e0) SHA1(c956493d5d754665d214b416e6a473d73c22716c) )
 ROM_END
 
@@ -6328,13 +6463,13 @@
 	ROM_LOAD( "prog3000.a12",   0x0000, 0x8000, CRC(a5c1186a) SHA1(b6c662bf489fbcccc3063ce55c957e630ba96ccb) )
 
 	ROM_REGION( 0x6000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x4000, 0x00000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "wc3050.a5",  0x4000, 0x2000, CRC(6f35b9c4) SHA1(df86687164f18f2bfe71e73cccd28fe4117e748c) )    /* text layer, alt gfx */
+	ROM_FILL(               0x0000, 0x4000, 0x00000 ) // filling the R-G bitplanes
+	ROM_LOAD( "wc3050.a5",  0x4000, 0x2000, CRC(6f35b9c4) SHA1(df86687164f18f2bfe71e73cccd28fe4117e748c) )    // char ROM, alt gfx
 
 	ROM_REGION( 0x6000, "gfx2", 0 )
-	ROM_LOAD( "wc1.a2", 0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) )    /* cards deck gfx, bitplane1 */ // sldh
-	ROM_LOAD( "wc1.a4", 0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) )    /* cards deck gfx, bitplane2 */ // sldh
-	ROM_COPY( "gfx1",   0x4800, 0x4000, 0x0800 )    /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */
+	ROM_LOAD( "wc1.a2", 0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) )    // cards deck gfx, bitplane1 // sldh
+	ROM_LOAD( "wc1.a4", 0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) )    // cards deck gfx, bitplane2 // sldh
+	ROM_COPY( "gfx1",   0x4800, 0x4000, 0x0800 )    // cards deck gfx, bitplane3. found in the 2nd quarter of the char rom
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "tbp24s10n.7d",   0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -6377,13 +6512,13 @@
 	ROM_LOAD( "04.a12", 0x0000, 0x8000, CRC(0f662e02) SHA1(71d7344f63c11082beb4fb4eeb20b04780a9b14c) )
 
 	ROM_REGION( 0x6000, "gfx1", 0 )
-	ROM_FILL(                   0x0000, 0x4000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "03.a5",  0x4000, 0x2000, CRC(f181e5aa) SHA1(44a7696bd223effbc7542142a0c3c623c628071d) )    /* text layer */
+	ROM_FILL(                   0x0000, 0x4000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "03.a5",  0x4000, 0x2000, CRC(f181e5aa) SHA1(44a7696bd223effbc7542142a0c3c623c628071d) )    // char ROM
 
 	ROM_REGION( 0x6000, "gfx2", 0 )
-	ROM_LOAD( "01.a2",  0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "02.a4",  0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) )    /* cards deck gfx, bitplane2 */
-	ROM_COPY( "gfx1",   0x4800, 0x4000, 0x0800 )    /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */
+	ROM_LOAD( "01.a2",  0x0000, 0x2000, CRC(10b34856) SHA1(52e4cc81b36b4c807b1d4471c0f7bea66108d3fd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "02.a4",  0x2000, 0x2000, CRC(5fc965ef) SHA1(d9ecd7e9b4915750400e76ca604bec8152df1fe4) )    // cards deck gfx, bitplane2
+	ROM_COPY( "gfx1",   0x4800, 0x4000, 0x0800 )    // cards deck gfx, bitplane3. found in the 2nd quarter of the char rom
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "27s21.d7",   0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -6398,19 +6533,19 @@
 
 ******************************************/
 ROM_START( witchgme )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Video Klein */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Video Klein
 	ROM_LOAD( "hn58c256p.box12t1",  0x0000, 0x8000, CRC(26c334cb) SHA1(d8368835c88668f09560f6096148a6e528806f65) )
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "1.2a",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )  /* cards deck gfx, bitplane1 */
-	ROM_FILL(           0x0800, 0x0800, 0x0000 ) /* filling the bitplane */
-	ROM_LOAD( "2.4a",   0x1000, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )  /* cards deck gfx, bitplane2 */
-	ROM_FILL(           0x1800, 0x0800, 0x0000 ) /* filling the bitplane */
-	ROM_LOAD( "3.5a",   0x2000, 0x1000, CRC(8a17d1a7) SHA1(488e4eae287b05923bd6b378574e91cfe49d8c24) )  /* text layer */
+	ROM_LOAD( "1.2a",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )  // cards deck gfx, bitplane1
+	ROM_FILL(           0x0800, 0x0800, 0x0000 ) // filling the bitplane
+	ROM_LOAD( "2.4a",   0x1000, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )  // cards deck gfx, bitplane2
+	ROM_FILL(           0x1800, 0x0800, 0x0000 ) // filling the bitplane
+	ROM_LOAD( "3.5a",   0x2000, 0x1000, CRC(8a17d1a7) SHA1(488e4eae287b05923bd6b378574e91cfe49d8c24) )  // char ROM
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_COPY( "gfx2",   0x2800, 0x2000, 0x0800 )    /* srctag, srcoffs, offset, length */
+	ROM_FILL(           0x0000, 0x2000, 0x0000 )    // filling the R-G bitplanes
+	ROM_COPY( "gfx2",   0x2800, 0x2000, 0x0800 )    // srctag, srcoffs, offset, length
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "n82s137f.box",   0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -6425,21 +6560,21 @@
 */
 	ROM_START( witchcdk )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "wc_epoxy.bin",   0x0000, 0x8000, CRC(33f1acd9) SHA1(2facb3d807b5b2a2978e567d0c1106c0a027621a) )  /* epoxy block program ROM */
+	ROM_LOAD( "wc_epoxy.bin",   0x0000, 0x8000, CRC(33f1acd9) SHA1(2facb3d807b5b2a2978e567d0c1106c0a027621a) )  // epoxy block program ROM
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(            0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "wc4.7a",  0x2000, 0x1000, BAD_DUMP CRC(3bf07c44) SHA1(f6e859b142b7d4585b89ca609d8bc85c84fe2b09) )    /* text chars, corrupt */ // sldh
-	ROM_COPY( "gfx1",    0x2800, 0x2000, 0x0800 )   /* srctag, srcoffs, offset, length */
+	ROM_FILL(            0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "wc4.7a",  0x2000, 0x1000, BAD_DUMP CRC(3bf07c44) SHA1(f6e859b142b7d4585b89ca609d8bc85c84fe2b09) )    // chars ROM, corrupt // sldh
+	ROM_COPY( "gfx1",    0x2800, 0x2000, 0x0800 )   // srctag, srcoffs, offset, length
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "wc1.2a", 0x0000, 0x1000, CRC(f59c6fd2) SHA1(bea4b6043728311ca9fff36e2d7e24254af5b97a) )    /* cards deck gfx, bitplane1 */ // sldh
-	ROM_LOAD( "wc2.4a", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "wc3.5a", 0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "wc1.2a", 0x0000, 0x1000, CRC(f59c6fd2) SHA1(bea4b6043728311ca9fff36e2d7e24254af5b97a) )    // cards deck gfx, bitplane1 // sldh
+	ROM_LOAD( "wc2.4a", 0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "wc3.5a", 0x2000, 0x1000, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0600, "proms", 0 )
-	ROM_LOAD( "24s10.bin",          0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* original PCB PROM */
-	ROM_LOAD( "82s137_epoxy.bin",   0x0100, 0x0400, CRC(4ae3ecf5) SHA1(e1e540ae13e7ce5ac6391f325160ec997ea6cc2f) ) /* original epoxy block PROM */
+	ROM_LOAD( "24s10.bin",          0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // original PCB PROM
+	ROM_LOAD( "82s137_epoxy.bin",   0x0100, 0x0400, CRC(4ae3ecf5) SHA1(e1e540ae13e7ce5ac6391f325160ec997ea6cc2f) ) // original epoxy block PROM
 ROM_END
 
 
@@ -6494,7 +6629,7 @@
 ************************************/
 
 ROM_START( witchjol )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* inside epoxy block with the CPU */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // inside epoxy block with the CPU
 	ROM_LOAD( "27c256.bin", 0x8000, 0x8000, CRC(14f05e3b) SHA1(83578f6a82b0974dd0325903926b2fd0d8e5c236) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -6503,83 +6638,83 @@
 	ROM_LOAD( "i.2a",   0x08000, 0x2000, CRC(d467f6e2) SHA1(6aaf4cdfb76f5efeeee45635fea120711483648e) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of iii.5a - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of iii.5a - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of i.2a - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of ii.4a - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of iii.5a - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of i.2a - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of ii.4a - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of iii.5a - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of i.2a - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of ii.4a - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of iii.5a - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of i.2a - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of ii.4a - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of iii.5a - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of i.2a - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of ii.4a - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of iii.5a - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of i.2a - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of ii.4a - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of iii.5a - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of i.2a - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of ii.4a - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of iii.5a - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of i.2a - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of ii.4a - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of iii.5a - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of i.2a - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of ii.4a - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of iii.5a - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of i.2a - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of ii.4a - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of iii.5a - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of i.2a - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of ii.4a - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of iii.5a - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of i.2a - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of ii.4a - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of iii.5a - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of i.2a - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of ii.4a - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of iii.5a - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of i.2a - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of ii.4a - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of iii.5a - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of i.2a - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of ii.4a - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of iii.5a - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of i.2a - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of ii.4a - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of iii.5a - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of i.2a - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of ii.4a - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of iii.5a - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of i.2a - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of ii.4a - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of iii.5a - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of i.2a - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of ii.4a - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of iii.5a - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of i.2a - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of ii.4a - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of iii.5a - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of i.2a - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of ii.4a - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of iii.5a - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of i.2a - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of ii.4a - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of iii.5a - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of i.2a - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of ii.4a - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of iii.5a - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of i.2a - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of ii.4a - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of iii.5a - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of i.2a - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of ii.4a - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of iii.5a - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of i.2a - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of ii.4a - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of iii.5a - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of i.2a - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of ii.4a - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of iii.5a - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of i.2a - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of ii.4a - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of iii.5a - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of i.2a - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of ii.4a - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of iii.5a - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of i.2a - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of ii.4a - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of iii.5a - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "witchjol_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -6599,7 +6734,7 @@
 ****************************************************/
 
 ROM_START( wldwitch )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 184A, 2001-09-12 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 184A, 2001-09-12
 	ROM_LOAD( "ww184a.bin", 0x8000, 0x8000, CRC(f45edc9b) SHA1(9a7400a84b685b84081d424d6da096632b845de8) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -6608,83 +6743,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -6695,7 +6830,7 @@
 
 
 ROM_START( wldwitcha )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 157-SP, 1992-12-25 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 157-SP, 1992-12-25
 	ROM_LOAD( "ww157-sp.bin",   0x8000, 0x8000, CRC(34396a51) SHA1(823e817a01fab49deacf8af474e31732b96a15d1) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -6704,83 +6839,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )         // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -6791,7 +6926,7 @@
 
 
 ROM_START( wldwitchb )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 157-TE, 1992-12-25 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 157-TE, 1992-12-25
 	ROM_LOAD( "ww157-te.bin",   0x8000, 0x8000, CRC(9bf25a7c) SHA1(a78f946403254a30d9afa3c43ca42dfc02edd8fb) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -6800,83 +6935,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )         // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -6887,7 +7022,7 @@
 
 
 ROM_START( wldwitchc )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 162A, 1994-04-26 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 162A, 1994-04-26
 	ROM_LOAD( "ww162a.bin", 0x8000, 0x8000, CRC(59765e59) SHA1(474119fe179e0950b082fff8b014ceae8c82b44b) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -6896,83 +7031,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -6983,7 +7118,7 @@
 
 
 ROM_START( wldwitchd )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 162B, 1994-04-26 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 162B, 1994-04-26
 	ROM_LOAD( "ww162b.bin", 0x8000, 0x8000, CRC(a60e0f28) SHA1(88e41b9cfe76e2c70d0ebfb73801478412cd4ba4) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -6992,83 +7127,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -7079,7 +7214,7 @@
 
 
 ROM_START( wldwitche )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 162A-F, 1994-04-26 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 162A-F, 1994-04-26
 	ROM_LOAD( "ww162a-f.bin",   0x8000, 0x8000, CRC(1aba84c1) SHA1(a825bd6312385c5a1768e8156fd7dad770926564) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -7088,83 +7223,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -7175,7 +7310,7 @@
 
 
 ROM_START( wldwitchf )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 162A alt, 1994-11-03 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 162A alt, 1994-11-03
 	ROM_LOAD( "ww162a-alt.bin", 0x8000, 0x8000, CRC(0a8175b9) SHA1(23b300397491140a03de43140d0a05f154e90eab) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -7184,83 +7319,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -7271,7 +7406,7 @@
 
 
 ROM_START( wldwitchg )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 162B alt, 1994-11-03 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 162B alt, 1994-11-03
 	ROM_LOAD( "ww162b-alt.bin", 0x8000, 0x8000, CRC(f5f924c8) SHA1(a49ae2c8c3f3ec9fd1727564220aa1e8da633774) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -7280,83 +7415,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -7367,7 +7502,7 @@
 
 
 ROM_START( wldwitchh )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 165A, 1995-11-16 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 165A, 1995-11-16
 	ROM_LOAD( "ww165a.bin", 0x8000, 0x8000, CRC(9119add6) SHA1(fcf13831d968498d09daec993924a08ffefb80c8) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -7376,83 +7511,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -7463,7 +7598,7 @@
 
 
 ROM_START( wldwitchi )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 165A-S, 1996-03-26 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 165A-S, 1996-03-26
 	ROM_LOAD( "ww165a-s.bin",   0x8000, 0x8000, CRC(c5827a07) SHA1(474d6a715c230d3a1e19f9d4850eb52443cd975f) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -7472,83 +7607,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -7559,7 +7694,7 @@
 
 
 ROM_START( wldwitchj )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 165A-S alt, 1996-05-26 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 165A-S alt, 1996-05-26
 	ROM_LOAD( "wn165a-s-alt.bin",   0x8000, 0x8000, CRC(8b01bb4b) SHA1(bd42ce4ce46561ce2e094130710a55a122c5cc3e) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -7568,83 +7703,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -7655,7 +7790,7 @@
 
 
 ROM_START( wldwitchk )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 165A-N, 1996-05-29 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 165A-N, 1996-05-29
 	ROM_LOAD( "wn165a-n.bin",   0x8000, 0x8000, CRC(df9a6c9a) SHA1(07a09ad77b1e5b88b065e4c1ddaa201e7f904888) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -7664,83 +7799,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -7751,7 +7886,7 @@
 
 
 ROM_START( wldwitchl )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 170A-beta, 1996-06-25 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 170A-beta, 1996-06-25
 	ROM_LOAD( "ww170a-beta.bin",    0x8000, 0x8000, CRC(32dbaa23) SHA1(5f5b0b7ad56abe20a2b9b3670b98a4741ea8aaab) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -7760,83 +7895,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -7847,7 +7982,7 @@
 
 
 ROM_START( wldwitchm )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 170A, 1996-09-30 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 170A, 1996-09-30
 	ROM_LOAD( "ww170a.bin", 0x8000, 0x8000, CRC(1d976e56) SHA1(c03014f3b0e682cd0f025363108b5aa410c2b54b) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -7856,83 +7991,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -7943,7 +8078,7 @@
 
 
 ROM_START( wldwitchn )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 170A alt, 1997-06-11 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 170A alt, 1997-06-11
 	ROM_LOAD( "ww170a-alt.bin", 0x8000, 0x8000, CRC(4266b71c) SHA1(c0fd545ae629f3456c447b3b695caeec42521a71) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -7952,83 +8087,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -8039,7 +8174,7 @@
 
 
 ROM_START( wldwitcho )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 174A-SP-BELG, 1998-05-11 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 174A-SP-BELG, 1998-05-11
 	ROM_LOAD( "ww174a-sp-belg.bin", 0x8000, 0x8000, CRC(d490c676) SHA1(9403bcc003c9b48b25857bd142a73c8d23c5f5b5) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -8048,83 +8183,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -8135,7 +8270,7 @@
 
 
 ROM_START( wldwitchp )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 174A, 1998-09-20 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 174A, 1998-09-20
 	ROM_LOAD( "ww174a.bin", 0x8000, 0x8000, CRC(d4129f5a) SHA1(139c4b6f5972b5d7c549b27b114a81fd2de178c3) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -8144,83 +8279,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -8231,7 +8366,7 @@
 
 
 ROM_START( wldwitchq )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 174A alt, box, 1998-09-25 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 174A alt, box, 1998-09-25
 	ROM_LOAD( "wn174a_hn58c256p_box.bin",   0x8000, 0x8000, CRC(1de736a7) SHA1(e714a97999555fe0107390c8c9c2c3c1e822809a) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -8240,83 +8375,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -8327,7 +8462,7 @@
 
 
 ROM_START( wldwitchr )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 175A-E, 1999-01-11 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 175A-E, 1999-01-11
 	ROM_LOAD( "ww175a-e.bin",   0x8000, 0x8000, CRC(6fcb5732) SHA1(a5a62f35b775230c62ca55ed4497e8cb9e17c17d) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -8336,83 +8471,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -8423,7 +8558,7 @@
 
 
 ROM_START( wldwitchs )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 176A, 1999-??-?? */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 176A, 1999-??-??
 	ROM_LOAD( "ww176a.bin", 0x8000, 0x8000, CRC(509d0355) SHA1(62922423f868563acaa3eb637f8edb2755a5fcf6) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -8432,83 +8567,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -8519,7 +8654,7 @@
 
 
 ROM_START( wldwitcht )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 177A, 1999-??-?? */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 177A, 1999-??-??
 	ROM_LOAD( "ww177a.bin", 0x8000, 0x8000, CRC(c6761e20) SHA1(2bda4218c46c9fbc5719f7d3ade225faeec43d33) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -8528,83 +8663,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -8615,7 +8750,7 @@
 
 
 ROM_START( wldwitchu )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 179A, 2000-05-10 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 179A, 2000-05-10
 	ROM_LOAD( "ww179a.bin", 0x8000, 0x8000, CRC(ffcb48c0) SHA1(829c81b8c057a2fa95b8656d77c93899bae5c892) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -8624,83 +8759,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -8711,7 +8846,7 @@
 
 
 ROM_START( wldwitchv )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Ver 183A, 2001-06-13 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Ver 183A, 2001-06-13
 	ROM_LOAD( "ww183a.bin", 0x8000, 0x8000, CRC(2929b9b2) SHA1(3afe58b5619e818911ee142edce6a5a1468a1f97) )
 
 	ROM_REGION( 0x18000, "temp", 0 )
@@ -8720,83 +8855,83 @@
 	ROM_LOAD( "01.a1",  0x08000, 0x8000, CRC(6d644987) SHA1(26243abe051f3266e2d1743ec599d4e8bbb692e4) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of 03.a3 - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of 03.a3 - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of 01.a1 - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of 02.a2 - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of 03.a3 - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of 01.a1 - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of 02.a2 - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of 03.a3 - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of 01.a1 - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of 02.a2 - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of 03.a3 - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of 01.a1 - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of 02.a2 - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of 03.a3 - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of 01.a1 - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of 02.a2 - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of 03.a3 - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of 01.a1 - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of 02.a2 - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of 03.a3 - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wldwitch_tbp.bin",   0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -8816,7 +8951,7 @@
 
 ************************************************/
 
-ROM_START( wupndown )   /* Witch Up & Down (Export, 6T/12T ver 1.02) */
+ROM_START( wupndown )   // Witch Up & Down (Export, 6T/12T ver 1.02)
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "updown_19981024.bin",    0x8000, 0x8000, CRC(cea0dcbd) SHA1(732ec0c60529f4a4a6c3d7a9bfcab741f3cb4787) )
 
@@ -8826,90 +8961,90 @@
 	ROM_LOAD( "updown3.bin",    0x10000, 0x8000, CRC(905c3224) SHA1(6356f2bd8a1f8952b186dc6f9ed1705d1e918a64) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of updown1.bin - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of updown1.bin - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of updown2.bin - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of updown3.bin - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of updown1.bin - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of updown2.bin - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of updown3.bin - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of updown1.bin - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of updown2.bin - upper-left box tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of updown3.bin - upper-left box tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of updown1.bin - upper-left box tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of updown2.bin - upper-left box tiles, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of updown3.bin - upper-left box tiles, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of updown1.bin - upper-left box tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of updown2.bin - giant 'Video Klein' logo tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of updown3.bin - giant 'Video Klein' logo tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of updown1.bin - giant 'Video Klein' logo tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of updown2.bin - giant 'Video Klein' logo tiles, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of updown3.bin - giant 'Video Klein' logo tiles, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of updown1.bin - giant 'Video Klein' logo tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of updown2.bin - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of updown3.bin - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of updown1.bin - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of updown2.bin - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of updown3.bin - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of updown1.bin - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of updown2.bin - 'Up & Down' logo tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of updown3.bin - 'Up & Down' logo tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of updown1.bin - 'Up & Down' logo tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of updown2.bin - 'Up & Down' logo tiles, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of updown3.bin - 'Up & Down' logo tiles, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of updown1.bin - 'Up & Down' logo tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of updown2.bin - D-UP ladder tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of updown3.bin - D-UP ladder tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of updown1.bin - D-UP ladder tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of updown2.bin - D-UP ladder tiles, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of updown3.bin - D-UP ladder tiles, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of updown1.bin - D-UP ladder tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "updown_tbp.bin", 0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wupndowna )  /* Witch Up & Down (Export, 6T/12T ver 0.99, set 1) */
+ROM_START( wupndowna )  // Witch Up & Down (Export, 6T/12T ver 0.99, set 1)
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "updown_19980409.bin",    0x8000, 0x8000, CRC(f0f0da16) SHA1(06d89881347d9bf2a09734ec4d405ff1c9fea0a8) )
 
@@ -8919,90 +9054,90 @@
 	ROM_LOAD( "updown3.bin",    0x10000, 0x8000, CRC(905c3224) SHA1(6356f2bd8a1f8952b186dc6f9ed1705d1e918a64) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of updown1.bin - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of updown1.bin - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of updown2.bin - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of updown3.bin - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of updown1.bin - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of updown2.bin - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of updown3.bin - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of updown1.bin - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of updown2.bin - upper-left box tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of updown3.bin - upper-left box tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of updown1.bin - upper-left box tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of updown2.bin - upper-left box tiles, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of updown3.bin - upper-left box tiles, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of updown1.bin - upper-left box tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of updown2.bin - giant 'Video Klein' logo tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of updown3.bin - giant 'Video Klein' logo tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of updown1.bin - giant 'Video Klein' logo tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of updown2.bin - giant 'Video Klein' logo tiles, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of updown3.bin - giant 'Video Klein' logo tiles, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of updown1.bin - giant 'Video Klein' logo tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of updown2.bin - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of updown3.bin - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of updown1.bin - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of updown2.bin - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of updown3.bin - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of updown1.bin - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of updown2.bin - 'Up & Down' logo tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of updown3.bin - 'Up & Down' logo tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of updown1.bin - 'Up & Down' logo tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of updown2.bin - 'Up & Down' logo tiles, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of updown3.bin - 'Up & Down' logo tiles, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of updown1.bin - 'Up & Down' logo tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of updown2.bin - D-UP ladder tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of updown3.bin - D-UP ladder tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of updown1.bin - D-UP ladder tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of updown2.bin - D-UP ladder tiles, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of updown3.bin - D-UP ladder tiles, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of updown1.bin - D-UP ladder tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "updown_tbp.bin", 0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wupndownb )  /* Witch Up & Down (Export, 6T/12T ver 0.99, set 2) */
+ROM_START( wupndownb )  // Witch Up & Down (Export, 6T/12T ver 0.99, set 2)
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x5099.bin",   0x8000, 0x8000, CRC(b0e9ac64) SHA1(31496ddea75cf9512661f049ddab50ebdb518a44) )
 
@@ -9012,90 +9147,90 @@
 	ROM_LOAD( "updown3.bin",    0x10000, 0x8000, CRC(905c3224) SHA1(6356f2bd8a1f8952b186dc6f9ed1705d1e918a64) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of updown1.bin - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of updown1.bin - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of updown2.bin - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of updown3.bin - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of updown1.bin - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of updown2.bin - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of updown3.bin - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of updown1.bin - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of updown2.bin - upper-left box tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of updown3.bin - upper-left box tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of updown1.bin - upper-left box tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of updown2.bin - upper-left box tiles, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of updown3.bin - upper-left box tiles, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of updown1.bin - upper-left box tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of updown2.bin - giant 'Video Klein' logo tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of updown3.bin - giant 'Video Klein' logo tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of updown1.bin - giant 'Video Klein' logo tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of updown2.bin - giant 'Video Klein' logo tiles, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of updown3.bin - giant 'Video Klein' logo tiles, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of updown1.bin - giant 'Video Klein' logo tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of updown2.bin - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of updown3.bin - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of updown1.bin - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of updown2.bin - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of updown3.bin - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of updown1.bin - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of updown2.bin - 'Up & Down' logo tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of updown3.bin - 'Up & Down' logo tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of updown1.bin - 'Up & Down' logo tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of updown2.bin - 'Up & Down' logo tiles, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of updown3.bin - 'Up & Down' logo tiles, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of updown1.bin - 'Up & Down' logo tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of updown2.bin - D-UP ladder tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of updown3.bin - D-UP ladder tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of updown1.bin - D-UP ladder tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of updown2.bin - D-UP ladder tiles, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of updown3.bin - D-UP ladder tiles, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of updown1.bin - D-UP ladder tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "updown_tbp.bin", 0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wupndownc )  /* Witch Up & Down (Export, 6T/12T ver 0.99, set 3) */
+ROM_START( wupndownc )  // Witch Up & Down (Export, 6T/12T ver 0.99, set 3)
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x5099alt.bin",    0x8000, 0x8000, CRC(2355afbd) SHA1(f511375ca12dc71497601ca5b0a74deb0977d85e) )
 
@@ -9105,90 +9240,90 @@
 	ROM_LOAD( "updown3.bin",    0x10000, 0x8000, CRC(905c3224) SHA1(6356f2bd8a1f8952b186dc6f9ed1705d1e918a64) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of updown1.bin - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of updown1.bin - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of updown2.bin - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of updown3.bin - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of updown1.bin - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of updown2.bin - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of updown3.bin - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of updown1.bin - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of updown2.bin - upper-left box tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of updown3.bin - upper-left box tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of updown1.bin - upper-left box tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of updown2.bin - upper-left box tiles, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of updown3.bin - upper-left box tiles, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of updown1.bin - upper-left box tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of updown2.bin - giant 'Video Klein' logo tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of updown3.bin - giant 'Video Klein' logo tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of updown1.bin - giant 'Video Klein' logo tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of updown2.bin - giant 'Video Klein' logo tiles, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of updown3.bin - giant 'Video Klein' logo tiles, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of updown1.bin - giant 'Video Klein' logo tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of updown2.bin - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of updown3.bin - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of updown1.bin - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of updown2.bin - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of updown3.bin - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of updown1.bin - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of updown2.bin - 'Up & Down' logo tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of updown3.bin - 'Up & Down' logo tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of updown1.bin - 'Up & Down' logo tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of updown2.bin - 'Up & Down' logo tiles, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of updown3.bin - 'Up & Down' logo tiles, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of updown1.bin - 'Up & Down' logo tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of updown2.bin - D-UP ladder tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of updown3.bin - D-UP ladder tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of updown1.bin - D-UP ladder tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of updown2.bin - D-UP ladder tiles, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of updown3.bin - D-UP ladder tiles, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of updown1.bin - D-UP ladder tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "updown_tbp.bin", 0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wupndownd )  /* Witch Up & Down (Export, 6T/12T ver 0.99T) */
+ROM_START( wupndownd )  // Witch Up & Down (Export, 6T/12T ver 0.99T)
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x5099t.bin",  0x8000, 0x8000, CRC(a722c659) SHA1(41f43133992b012754577d788745ff8223d88077) )
 
@@ -9198,83 +9333,83 @@
 	ROM_LOAD( "updown3.bin",    0x10000, 0x8000, CRC(905c3224) SHA1(6356f2bd8a1f8952b186dc6f9ed1705d1e918a64) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of updown1.bin - char rom, bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of updown1.bin - char rom, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of updown2.bin - regular cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of updown3.bin - regular cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of updown1.bin - regular cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of updown2.bin - regular cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of updown3.bin - regular cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of updown1.bin - regular cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of updown2.bin - upper-left box tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of updown3.bin - upper-left box tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of updown1.bin - upper-left box tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of updown2.bin - upper-left box tiles, bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of updown3.bin - upper-left box tiles, bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of updown1.bin - upper-left box tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of updown2.bin - giant 'Video Klein' logo tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of updown3.bin - giant 'Video Klein' logo tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of updown1.bin - giant 'Video Klein' logo tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of updown2.bin - giant 'Video Klein' logo tiles, bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of updown3.bin - giant 'Video Klein' logo tiles, bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of updown1.bin - giant 'Video Klein' logo tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of updown2.bin - extended cards gfx, bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of updown3.bin - extended cards gfx, bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of updown1.bin - extended cards gfx, bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of updown2.bin - extended cards gfx, bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of updown3.bin - extended cards gfx, bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of updown1.bin - extended cards gfx, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of updown2.bin - 'Up & Down' logo tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of updown3.bin - 'Up & Down' logo tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of updown1.bin - 'Up & Down' logo tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of updown2.bin - 'Up & Down' logo tiles, bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of updown3.bin - 'Up & Down' logo tiles, bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of updown1.bin - 'Up & Down' logo tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of updown2.bin - D-UP ladder tiles, bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of updown3.bin - D-UP ladder tiles, bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of updown1.bin - D-UP ladder tiles, bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of updown2.bin - D-UP ladder tiles, bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of updown3.bin - D-UP ladder tiles, bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of updown1.bin - D-UP ladder tiles, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of updown2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of updown3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of updown1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of updown2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of updown3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of updown1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "updown_tbp.bin", 0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -9290,7 +9425,7 @@
 
 *********************************************/
 
-ROM_START( wstrike )    /* Witch Strike (Export, 6T/12T ver 1.01A) */
+ROM_START( wstrike )    // Witch Strike (Export, 6T/12T ver 1.01A)
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wstrike_101a.bin",   0x8000, 0x8000, CRC(1e5a1c5c) SHA1(f6dcfae0f860196983378327864a9271e7d0b21f) )
 
@@ -9300,90 +9435,90 @@
 	ROM_LOAD( "wsrom3.bin", 0x10000, 0x8000, CRC(62692e92) SHA1(534a64abba4dabefa2fa1d2dfed0dc8a00d95156) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of wsrom1.bin - char rom (placed ok), bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of wsrom1.bin - char rom (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of wsrom2.bin - regular pin gfx (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of wsrom3.bin - regular pin gfx (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of wsrom1.bin - regular pin gfx (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of wsrom2.bin - regular pin gfx (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of wsrom3.bin - regular pin gfx (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of wsrom1.bin - regular pin gfx (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of wsrom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of wsrom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of wsrom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of wsrom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of wsrom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of wsrom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of wsrom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of wsrom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of wsrom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of wsrom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of wsrom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of wsrom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of wsrom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of wsrom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of wsrom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of wsrom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of wsrom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of wsrom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of wsrom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of wsrom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of wsrom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of wsrom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of wsrom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of wsrom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of wsrom2.bin - garbage (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of wsrom3.bin - garbage (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of wsrom1.bin - garbage (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of wsrom2.bin - garbage (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of wsrom3.bin - garbage (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of wsrom1.bin - garbage (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wstrike_tbp.bin",    0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wstrikea )   /* Witch Strike (Export, 6T/12T ver 1.01B) */
+ROM_START( wstrikea )   // Witch Strike (Export, 6T/12T ver 1.01B)
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wstrike_101b.bin",   0x8000, 0x8000, CRC(52be1662) SHA1(42c9377b3af54d5e9373b17884ae8f841edc34de) )
 
@@ -9393,83 +9528,83 @@
 	ROM_LOAD( "wsrom3.bin", 0x10000, 0x8000, CRC(62692e92) SHA1(534a64abba4dabefa2fa1d2dfed0dc8a00d95156) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of wsrom1.bin - char rom (placed ok), bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of wsrom1.bin - char rom (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of wsrom2.bin - regular pin gfx (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of wsrom3.bin - regular pin gfx (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of wsrom1.bin - regular pin gfx (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of wsrom2.bin - regular pin gfx (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of wsrom3.bin - regular pin gfx (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of wsrom1.bin - regular pin gfx (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of wsrom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of wsrom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of wsrom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of wsrom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of wsrom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of wsrom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of wsrom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of wsrom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of wsrom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of wsrom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of wsrom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of wsrom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of wsrom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of wsrom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of wsrom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of wsrom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of wsrom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of wsrom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of wsrom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of wsrom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of wsrom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of wsrom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of wsrom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of wsrom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of wsrom2.bin - garbage (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of wsrom3.bin - garbage (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of wsrom1.bin - garbage (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of wsrom2.bin - garbage (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of wsrom3.bin - garbage (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of wsrom1.bin - garbage (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of wsrom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of wsrom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of wsrom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of wsrom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of wsrom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of wsrom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wstrike_tbp.bin",    0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -9483,7 +9618,7 @@
 
 *********************************************/
 
-ROM_START( wtchjack )   /* Witch Jack 0.87-89 / 1996-10-08, GFX OK */
+ROM_START( wtchjack )   // Witch Jack 0.87-89 / 1996-10-08, GFX OK
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x5089.bin",   0x8000, 0x8000, CRC(91e37ca4) SHA1(abce8447550165547cd3c89dffb41c5394a2c901) )
 
@@ -9493,90 +9628,90 @@
 	ROM_LOAD( "wj5x5_3zs.bin",  0x10000, 0x8000, CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wjack_tbp.bin",  0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wtchjacka )  /* Witch Jack 0.87-88 / 1996-10-02, GFX OK */
+ROM_START( wtchjacka )  // Witch Jack 0.87-88 / 1996-10-02, GFX OK
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x5088.bin",   0x8000, 0x8000, CRC(08143537) SHA1(ef16531bcf955daded1be406dd3f61f37070298c) )
 
@@ -9586,90 +9721,90 @@
 	ROM_LOAD( "wj5x5_3zs.bin",  0x10000, 0x8000, CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wjack_tbp.bin",  0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wtchjackb )  /* Witch Jack 0.87 / 1996-07-16, GFX OK */
+ROM_START( wtchjackb )  // Witch Jack 0.87 / 1996-07-16, GFX OK
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x5087.bin",   0x8000, 0x8000, CRC(b027d8a5) SHA1(f06b92cc7aacadca1b8c98bda19efa670596891c) )
 
@@ -9679,90 +9814,90 @@
 	ROM_LOAD( "wj5x5_3zs.bin",  0x10000, 0x8000, CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wjack_tbp.bin",  0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wtchjackc )  /* Witch Jack 0.70S / 1996-03-26 */
+ROM_START( wtchjackc )  // Witch Jack 0.70S / 1996-03-26
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x570s.bin",   0x8000, 0x8000, CRC(294e3ac6) SHA1(e58c38ae341dcb48572f8852ec858ef8433c6f95) )
 
@@ -9772,90 +9907,90 @@
 	ROM_LOAD( "wj5x5_3zs.bin",  0x10000, 0x8000, BAD_DUMP CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wjack_tbp.bin",  0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wtchjackd )  /* Witch Jack 0.70P / 1996-03-26 */
+ROM_START( wtchjackd )  // Witch Jack 0.70P / 1996-03-26
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x570p.bin",   0x8000, 0x8000, CRC(d77d8119) SHA1(c8999e3c55257750f27f1683f5b416e8e4e4297d) )
 
@@ -9865,90 +10000,90 @@
 	ROM_LOAD( "wj5x5_3zs.bin",  0x10000, 0x8000, BAD_DUMP CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wjack_tbp.bin",  0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wtchjacke )  /* Witch Jack 0.65 / 1995-10-19 */
+ROM_START( wtchjacke )  // Witch Jack 0.65 / 1995-10-19
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x565p.bin",   0x8000, 0x8000, CRC(20c23876) SHA1(ca2309766a68ba280d71b3b62e00d38d70b8536a) )
 
@@ -9958,90 +10093,90 @@
 	ROM_LOAD( "wj5x5_3zs.bin",  0x10000, 0x8000, BAD_DUMP CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wjack_tbp.bin",  0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wtchjackf )  /* Witch Jack 0.64 / 1995-09-13 */
+ROM_START( wtchjackf )  // Witch Jack 0.64 / 1995-09-13
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x564p.bin",   0x8000, 0x8000, CRC(7ee61b69) SHA1(313b750a7949f4d08cdf79c068d01ed91fc66dce) )
 
@@ -10051,90 +10186,90 @@
 	ROM_LOAD( "wj5x5_3zs.bin",  0x10000, 0x8000, BAD_DUMP CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wjack_tbp.bin",  0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wtchjackg )  /* Witch Jack 0.62 / 1995-08-02 */
+ROM_START( wtchjackg )  // Witch Jack 0.62 / 1995-08-02
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x563.bin",    0x8000, 0x8000, CRC(55e74382) SHA1(af0a890c55db36e8a2f847ea103858cc7b7115be) )  //
 
@@ -10144,90 +10279,90 @@
 	ROM_LOAD( "wj5x5_3zs.bin",  0x10000, 0x8000, BAD_DUMP CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wjack_tbp.bin",  0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wtchjackh )  /* Witch Jack 0.40T / 1995-02-27, Not Working */
+ROM_START( wtchjackh )  // Witch Jack 0.40T / 1995-02-27, Not Working
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x5t40.bin",   0x8000, 0x8000, CRC(a3a4f1d3) SHA1(16dcaf880134f10152703cb3ca81dfcbe48bff8b) )
 
@@ -10237,90 +10372,90 @@
 	ROM_LOAD( "wj5x5_3zs.bin",  0x10000, 0x8000, BAD_DUMP CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wjack_tbp.bin",  0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wtchjacki )  /* Witch Jack 0.40 / 1995-02-27 */
+ROM_START( wtchjacki )  // Witch Jack 0.40 / 1995-02-27
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x5040.bin",   0x8000, 0x8000, CRC(2f0f1d7a) SHA1(048d0641a4e03a77f4964898ad2c224cb487aa36) )
 
@@ -10330,90 +10465,90 @@
 	ROM_LOAD( "wj5x5_3zs.bin",  0x10000, 0x8000, BAD_DUMP CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wjack_tbp.bin",  0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
 ROM_END
 
 
-ROM_START( wtchjackj )  /* Witch Jackpot 0.25 / 1994-11-24 */
+ROM_START( wtchjackj )  // Witch Jackpot 0.25 / 1994-11-24
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "wj5x5015.bin",   0x8000, 0x8000, CRC(bc0e6b78) SHA1(29482035f6122385447009abd695ed52fc669158) )
 
@@ -10423,83 +10558,83 @@
 	ROM_LOAD( "wj5x5_3zs.bin",  0x10000, 0x8000, BAD_DUMP CRC(708e1d7f) SHA1(518312fd0bc24d7895eae0cfa9dbad99e1adf67c) )
 
 	ROM_REGION( 0x1800, "gfx0", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // 0000-07ff of rom1.bin - char rom (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   /* 0800-0fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   /* 0800-0fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   /* 1000-17ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x08800, 0x0000, 0x0800 )   // 0800-0fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x10800, 0x0800, 0x0800 )   // 0800-0fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x01000, 0x1000, 0x0800 )   // 1000-17ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   /* 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   /* 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   /* 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x08000, 0x0000, 0x0800 )   // 0000-07ff of rom2.bin - regular pin gfx (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x10000, 0x0800, 0x0800 )   // 0000-07ff of rom3.bin - regular pin gfx (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x00800, 0x1000, 0x0800 )   // 0800-0fff of rom1.bin - regular pin gfx (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx3", 0 )
-	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   /* 4000-47ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   /* 4000-47ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   /* 4800-4fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0c000, 0x0000, 0x0800 )   // 4000-47ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x14000, 0x0800, 0x0800 )   // 4000-47ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x04800, 0x1000, 0x0800 )   // 4800-4fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx4", 0 )
-	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   /* 1800-1fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   /* 1800-1fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x09800, 0x0000, 0x0800 )   // 1800-1fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x11800, 0x0800, 0x0800 )   // 1800-1fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x02000, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx5", 0 )
-	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   /* 2800-2fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   /* 2800-2fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   /* 3000-37ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0a800, 0x0000, 0x0800 )   // 2800-2fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x12800, 0x0800, 0x0800 )   // 2800-2fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x03000, 0x1000, 0x0800 )   // 3000-37ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx6", 0 )
-	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   /* 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   /* 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   /* 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0a000, 0x0000, 0x0800 )   // 2000-27ff of rom2.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x12000, 0x0800, 0x0800 )   // 2000-27ff of rom3.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x02800, 0x1000, 0x0800 )   // 2800-2fff of rom1.bin - 'Video Klein' logo lower tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx7", 0 )
-	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   /* 6800-6fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   /* 6800-6fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   /* 7000-77ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e800, 0x0000, 0x0800 )   // 6800-6fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16800, 0x0800, 0x0800 )   // 6800-6fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07000, 0x1000, 0x0800 )   // 7000-77ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx8", 0 )
-	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   /* 3800-3fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   /* 3800-3fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0b800, 0x0000, 0x0800 )   // 3800-3fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x13800, 0x0800, 0x0800 )   // 3800-3fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x04000, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx9", 0 )
-	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   /* 4800-4fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   /* 4800-4fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   /* 4000-47ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0c800, 0x0000, 0x0800 )   // 4800-4fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x14800, 0x0800, 0x0800 )   // 4800-4fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x05000, 0x1000, 0x0800 )   // 4000-47ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx10", 0 )
-	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   /* 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   /* 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   /* 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x09000, 0x0000, 0x0800 )   // 1000-17ff of rom2.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x11000, 0x0800, 0x0800 )   // 1000-17ff of rom3.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x01800, 0x1000, 0x0800 )   // 1800-1fff of rom1.bin - extended pin gfx and logo upper tiles (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx11", 0 )
-	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   /* 5000-57ff of rom2.bin - empty (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   /* 5000-57ff of rom3.bin - empty (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   /* 5800-5fff of rom1.bin - empty (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0d000, 0x0000, 0x0800 )   // 5000-57ff of rom2.bin - empty (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x15000, 0x0800, 0x0800 )   // 5000-57ff of rom3.bin - empty (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x05800, 0x1000, 0x0800 )   // 5800-5fff of rom1.bin - empty (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx12", 0 )
-	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   /* 5800-5fff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   /* 5800-5fff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   /* 6000-67ff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0d800, 0x0000, 0x0800 )   // 5800-5fff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x15800, 0x0800, 0x0800 )   // 5800-5fff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06000, 0x1000, 0x0800 )   // 6000-67ff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx13", 0 )
-	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   /* 6000-67ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   /* 6000-67ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   /* 6800-6fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0e000, 0x0000, 0x0800 )   // 6000-67ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x16000, 0x0800, 0x0800 )   // 6000-67ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x06800, 0x1000, 0x0800 )   // 6800-6fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x1800, "gfx14", 0 )
-	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   /* 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1 */
-	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   /* 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2 */
-	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   /* 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3 */
+	ROM_COPY( "temp",   0x0b000, 0x0000, 0x0800 )   // 3000-37ff of rom2.bin - garbage (placed ok), bitplane 1
+	ROM_COPY( "temp",   0x13000, 0x0800, 0x0800 )   // 3000-37ff of rom3.bin - garbage (placed ok), bitplane 2
+	ROM_COPY( "temp",   0x03800, 0x1000, 0x0800 )   // 3800-3fff of rom1.bin - garbage (placed ok), bitplane 3
 
 	ROM_REGION( 0x1800, "gfx15", 0 )
-	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   /* 7000-77ff of rom2.bin - empty, bitplane 1 */
-	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   /* 7000-77ff of rom3.bin - empty, bitplane 2 */
-	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   /* 7800-7fff of rom1.bin - empty, bitplane 3 */
+	ROM_COPY( "temp",   0x0f000, 0x0000, 0x0800 )   // 7000-77ff of rom2.bin - empty, bitplane 1
+	ROM_COPY( "temp",   0x17000, 0x0800, 0x0800 )   // 7000-77ff of rom3.bin - empty, bitplane 2
+	ROM_COPY( "temp",   0x07800, 0x1000, 0x0800 )   // 7800-7fff of rom1.bin - empty, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "wjack_tbp.bin",  0x0000, 0x0100, BAD_DUMP CRC(ed15125b) SHA1(56fc00f2ce4ebe9cee73a45b142c33c00432b66b) )
@@ -10525,22 +10660,22 @@
 
 **********************************************/
 ROM_START( falcnwld )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Falcons Wild */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Falcons Wild
 	ROM_LOAD( "nosticker.12a",  0x0000, 0x10000, CRC(54ae4a8a) SHA1(0507098b53d807059b78ec098203d095d19028f8) )
 
 	ROM_REGION( 0x6000, "temp", 0 )
-	ROM_LOAD( "fw1.2a", 0x0000, 0x2000, CRC(d5a58098) SHA1(9c8860949b0adcd20222e9b3e3e8e7e864e8f39f) )  /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "fw2.4a", 0x2000, 0x2000, CRC(b28b7759) SHA1(513229cee451f59f824b7a64932679f91fbb324d) )  /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "fw3.5a", 0x4000, 0x2000, BAD_DUMP CRC(98edfc82) SHA1(e3dd597245b55c3bc6ea86acf80ee024ca28f564) )  /* text layer + cards deck gfx, bitplane3 */
+	ROM_LOAD( "fw1.2a", 0x0000, 0x2000, CRC(d5a58098) SHA1(9c8860949b0adcd20222e9b3e3e8e7e864e8f39f) )  // cards deck gfx, bitplane1
+	ROM_LOAD( "fw2.4a", 0x2000, 0x2000, CRC(b28b7759) SHA1(513229cee451f59f824b7a64932679f91fbb324d) )  // cards deck gfx, bitplane2
+	ROM_LOAD( "fw3.5a", 0x4000, 0x2000, BAD_DUMP CRC(98edfc82) SHA1(e3dd597245b55c3bc6ea86acf80ee024ca28f564) )  // chars + cards deck gfx, bitplane3
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )         /* filling bitplanes */
-	ROM_COPY( "temp",   0x4000, 0x1000, 0x0800 )    /* first quarter of fw3.5a */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x4000, 0x1000, 0x0800 )    // first quarter of fw3.5a
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x0000, 0x0000, 0x0800 )    /* first quarter of fw1.2a */
-	ROM_COPY( "temp",   0x2000, 0x0800, 0x0800 )    /* first quarter of fw2.4a */
-	ROM_COPY( "temp",   0x4800, 0x1000, 0x0800 )    /* second quarter of fw3.5a */
+	ROM_COPY( "temp",   0x0000, 0x0000, 0x0800 )    // first quarter of fw1.2a
+	ROM_COPY( "temp",   0x2000, 0x0800, 0x0800 )    // first quarter of fw2.4a
+	ROM_COPY( "temp",   0x4800, 0x1000, 0x0800 )    // second quarter of fw3.5a
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "dm74s287n.7d",   0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -10555,38 +10690,38 @@
 
 ************************************/
 ROM_START( falcnwlda )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Falcons Wild, Video Klein */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Falcons Wild, Video Klein
 	ROM_LOAD( "nmc27c256.box",  0x0000, 0x8000, CRC(a0072c55) SHA1(27b84a896ff06a423450d8f0851f42f3e8ec5466) )
 	ROM_RELOAD(                 0x8000, 0x8000 )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 ) /* filling bitplanes */
-	ROM_LOAD( "fw4.7a", 0x1000, 0x0800, CRC(f0517b0d) SHA1(474bcf429f2539ff1f3d7d32d259c5973ccb0234) )  /* chars gfx */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 ) // filling bitplanes
+	ROM_LOAD( "fw4.7a", 0x1000, 0x0800, CRC(f0517b0d) SHA1(474bcf429f2539ff1f3d7d32d259c5973ccb0234) )  // chars gfx
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "fw1.2a", 0x0000, 0x0800, BAD_DUMP CRC(229cedde) SHA1(5b6d0b900714924c7a2390151ee65f36bdb02e8b) )  /* cards deck gfx, bitplane1 */ // sldh
+	ROM_LOAD( "fw1.2a", 0x0000, 0x0800, BAD_DUMP CRC(229cedde) SHA1(5b6d0b900714924c7a2390151ee65f36bdb02e8b) )  // cards deck gfx, bitplane1 // sldh
 	ROM_IGNORE(                 0x0800)
-	ROM_LOAD( "fw2.4a", 0x0800, 0x0800, BAD_DUMP CRC(9ad3c578) SHA1(a69385a807e3270d90040c44721bfff21e95706a) )  /* cards deck gfx, bitplane2 */ // sldh
-	ROM_LOAD( "fw3.5a", 0x1000, 0x0800, BAD_DUMP CRC(87abebe5) SHA1(5950082b563718476576dbc9f45439019209493e) )  /* cards deck gfx, bitplane3 */ // sldh
+	ROM_LOAD( "fw2.4a", 0x0800, 0x0800, BAD_DUMP CRC(9ad3c578) SHA1(a69385a807e3270d90040c44721bfff21e95706a) )  // cards deck gfx, bitplane2 // sldh
+	ROM_LOAD( "fw3.5a", 0x1000, 0x0800, BAD_DUMP CRC(87abebe5) SHA1(5950082b563718476576dbc9f45439019209493e) )  // cards deck gfx, bitplane3 // sldh
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "n82s137f.box",   0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
 ROM_END
 
 ROM_START( falcnwldb )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* World Wide Poker / 1992-11-04 */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // World Wide Poker / 1992-11-04
 	ROM_LOAD( "fw12t1_19921104.bin",    0x0000, 0x8000, CRC(8b4f8cac) SHA1(e3bcbadaa157db48a41369a3fcdba536f8ca679e) )
 	ROM_RELOAD(                         0x8000, 0x8000 )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 ) /* filling bitplanes */
-	ROM_LOAD( "fw4.7a", 0x1000, 0x0800, CRC(f0517b0d) SHA1(474bcf429f2539ff1f3d7d32d259c5973ccb0234) )  /* chars gfx */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 ) // filling bitplanes
+	ROM_LOAD( "fw4.7a", 0x1000, 0x0800, CRC(f0517b0d) SHA1(474bcf429f2539ff1f3d7d32d259c5973ccb0234) )  // chars gfx
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "fw1.2a", 0x0000, 0x0800, BAD_DUMP CRC(229cedde) SHA1(5b6d0b900714924c7a2390151ee65f36bdb02e8b) )  /* cards deck gfx, bitplane1 */ // sldh
+	ROM_LOAD( "fw1.2a", 0x0000, 0x0800, BAD_DUMP CRC(229cedde) SHA1(5b6d0b900714924c7a2390151ee65f36bdb02e8b) )  // cards deck gfx, bitplane1 // sldh
 	ROM_IGNORE(                 0x0800)
-	ROM_LOAD( "fw2.4a", 0x0800, 0x0800, BAD_DUMP CRC(9ad3c578) SHA1(a69385a807e3270d90040c44721bfff21e95706a) )  /* cards deck gfx, bitplane2 */ // sldh
-	ROM_LOAD( "fw3.5a", 0x1000, 0x0800, BAD_DUMP CRC(87abebe5) SHA1(5950082b563718476576dbc9f45439019209493e) )  /* cards deck gfx, bitplane3 */ // sldh
+	ROM_LOAD( "fw2.4a", 0x0800, 0x0800, BAD_DUMP CRC(9ad3c578) SHA1(a69385a807e3270d90040c44721bfff21e95706a) )  // cards deck gfx, bitplane2 // sldh
+	ROM_LOAD( "fw3.5a", 0x1000, 0x0800, BAD_DUMP CRC(87abebe5) SHA1(5950082b563718476576dbc9f45439019209493e) )  // cards deck gfx, bitplane3 // sldh
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "n82s137f.box",   0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -10608,7 +10743,7 @@
 
 ***********************************************/
 ROM_START( falcnwldc )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* Falcons Wild, Falcon original */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // Falcons Wild, Falcon original
 //  ROM_LOAD( "nosticker.12a",  0x0000, 0x10000, CRC(54ae4a8a) SHA1(0507098b53d807059b78ec098203d095d19028f8) )
 	ROM_LOAD( "4.b6",           0x3000, 0x1000, CRC(88684a8f) SHA1(5ffa0808b502e93ddcb8f13929008aec2836a773) )
 	ROM_LOAD( "5.b8",           0x4000, 0x1000, CRC(aa5de05c) SHA1(98559b35c7c31a41b1818a6e60ec82f43a5d1b4a) )
@@ -10625,13 +10760,13 @@
 	ROM_LOAD( "3.b4",   0x1800, 0x0800, CRC(d9246780) SHA1(4ceb24131ec6208b742ba80373201aa53c50732d) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 )    /* filling bitplanes */
-	ROM_COPY( "temp",   0x0800, 0x1000, 0x0800 )    /* second half of 1.b1 */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 )    // filling bitplanes
+	ROM_COPY( "temp",   0x0800, 0x1000, 0x0800 )    // second half of 1.b1
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "temp",   0x1800, 0x0000, 0x0800 )    /* first half of 3.b4 */
-	ROM_COPY( "temp",   0x1000, 0x0800, 0x0800 )    /* whole 2.b3 */
-	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    /* first half of 1.b1 */
+	ROM_COPY( "temp",   0x1800, 0x0000, 0x0800 )    // first half of 3.b4
+	ROM_COPY( "temp",   0x1000, 0x0800, 0x0800 )    // whole 2.b3
+	ROM_COPY( "temp",   0x0000, 0x1000, 0x0800 )    // first half of 1.b1
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "falcon_1.bin",   0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -10648,16 +10783,16 @@
 	ROM_LOAD( "2-7.bin",    0x7000, 0x1000, CRC(a9ab972e) SHA1(477441b7ff3acae3a5d5a3e4c2a428e0b3121534) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "1-4.bin",    0x1000, 0x0800, CRC(62b9f90d) SHA1(39c61a01225027572fdb75543bb6a78ed74bb2fb) )    /* text layer */
+	ROM_FILL(               0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "1-4.bin",    0x1000, 0x0800, CRC(62b9f90d) SHA1(39c61a01225027572fdb75543bb6a78ed74bb2fb) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "1-1.bin",    0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "1-2.bin",    0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "1-3.bin",    0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "1-1.bin",    0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "1-2.bin",    0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "1-3.bin",    0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "tbp24sa10.bin",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump confirmed OK */
+	ROM_LOAD( "tbp24sa10.bin",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump confirmed OK
 ROM_END
 
 /***************************************************************
@@ -10744,7 +10879,7 @@
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
 	ROM_FILL(               0x0000, 0x1000, 0x0000 )  // filling the R-G bitplanes...
-	ROM_LOAD( "054.bin",    0x1000, 0x0800, CRC(7b401a09) SHA1(affb90a52761c36be7c67f7606f3f982f6dc724e) )  // text chars
+	ROM_LOAD( "054.bin",    0x1000, 0x0800, CRC(7b401a09) SHA1(affb90a52761c36be7c67f7606f3f982f6dc724e) )  // chars ROM
 	ROM_IGNORE(                     0x0800)  // identical halves, discarding the 2nd half
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
@@ -10780,7 +10915,7 @@
 
 	ROM_REGION( 0x1800, "gfx1", 0 )  // borrowed from parent set.
 	ROM_FILL(               0x0000, 0x1000, 0x0000 )  // filling the R-G bitplanes
-	ROM_LOAD( "054.bin",    0x1000, 0x0800, BAD_DUMP CRC(7b401a09) SHA1(affb90a52761c36be7c67f7606f3f982f6dc724e) )  // text chars
+	ROM_LOAD( "054.bin",    0x1000, 0x0800, BAD_DUMP CRC(7b401a09) SHA1(affb90a52761c36be7c67f7606f3f982f6dc724e) )  // chars ROM
 	ROM_IGNORE(                     0x0800)  // identical halves, discarding the 2nd half
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
@@ -10816,7 +10951,7 @@
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
 	ROM_FILL(                    0x0000, 0x1000, 0x0000 )  // filling the R-G bitplanes
-	ROM_LOAD( "poke_5.4_x.bin",  0x1000, 0x0800, CRC(ca9182b1) SHA1(4c440eb53a46c4f751cf8807cbe3187ad9dbc214) )  // text chars
+	ROM_LOAD( "poke_5.4_x.bin",  0x1000, 0x0800, CRC(ca9182b1) SHA1(4c440eb53a46c4f751cf8807cbe3187ad9dbc214) )  // chars ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
 	ROM_LOAD( "bp_c1.bin",  0x0000, 0x0800, CRC(89a8c5f9) SHA1(e3aab20b2a962778a221ab96c691c37fad5b6877) )  // cards deck gfx, bitplane 1
@@ -10836,16 +10971,16 @@
 	ROM_LOAD( "royalex.bin",    0x4000, 0x4000, CRC(ef370617) SHA1(0fc5679e9787aeea3bc592b36efcaa20e859f912) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "royalechr.bin",  0x2000, 0x1000, CRC(b1f2cbb8) SHA1(8f4930038f2e21ca90b213c35b45ed14d8fad6fb) )    /* text layer */
+	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "royalechr.bin",  0x2000, 0x1000, CRC(b1f2cbb8) SHA1(8f4930038f2e21ca90b213c35b45ed14d8fad6fb) )    // chars ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "royale3.bin",    0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "royale2.bin",    0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "royale1.bin",    0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "royale3.bin",    0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "royale2.bin",    0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "royale1.bin",    0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( royalea )
@@ -10853,16 +10988,16 @@
 	ROM_LOAD( "royal.256",  0x0000, 0x8000, CRC(9d7fdb79) SHA1(05cae00bca0f6ae696c69f531cb0fa2104ff696a) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "royalechr.bin",  0x2000, 0x1000, CRC(b1f2cbb8) SHA1(8f4930038f2e21ca90b213c35b45ed14d8fad6fb) )    /* text layer */
+	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "royalechr.bin",  0x2000, 0x1000, CRC(b1f2cbb8) SHA1(8f4930038f2e21ca90b213c35b45ed14d8fad6fb) )    // chars ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "royale3.bin",    0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "royale2.bin",    0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "royale1.bin",    0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "royale3.bin",    0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "royale2.bin",    0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "royale1.bin",    0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 
@@ -10871,16 +11006,16 @@
 	ROM_LOAD( "locoloco.128",   0x4000, 0x4000, CRC(f626a770) SHA1(afbd33b3f65b8a781c716a3d6e5447aa817d856c) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "confloco.032",   0x2000, 0x1000, CRC(b86f219c) SHA1(3f655a96bcf597a271a4eaaa0acbf8dd70fcdae9) )    /* text layer */
+	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "confloco.032",   0x2000, 0x1000, CRC(b86f219c) SHA1(3f655a96bcf597a271a4eaaa0acbf8dd70fcdae9) )    // chars ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( sloco93a )
@@ -10888,16 +11023,16 @@
 	ROM_LOAD( "locoloco.256",   0x0000, 0x8000, CRC(ab037b0b) SHA1(16f811daaed5bf7b72549db85755c5274dfee310) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "confloco.032",   0x2000, 0x1000, CRC(b86f219c) SHA1(3f655a96bcf597a271a4eaaa0acbf8dd70fcdae9) )    /* text layer */
+	ROM_FILL(                   0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "confloco.032",   0x2000, 0x1000, CRC(b86f219c) SHA1(3f655a96bcf597a271a4eaaa0acbf8dd70fcdae9) )    // chars ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 /*
@@ -10907,20 +11042,20 @@
     balanced at $7ff8.
 */
 ROM_START( maverik )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* maverik: Maverik (ind arg, fixed, changed logo) */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // maverik: Maverik (ind arg, fixed, changed logo)
 	ROM_LOAD( "maverik.bin",    0x0000, 0x8000, CRC(65a986e9) SHA1(2e825d3fb2346036357af0e12d3a75b5ef6cfd0d) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    /* text layer */
+	ROM_FILL(           0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    // chars ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 /*****************************
@@ -10929,105 +11064,105 @@
 
  ****************************/
 ROM_START( brasil86 )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil86.128: Brasil 86, BS clone. */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // brasil86.128: Brasil 86, BS clone.
 	ROM_LOAD( "brasil86.128",   0x4000, 0x4000, CRC(0e88b434) SHA1(80f921c277f4253c29ee80e9cfb046ade1f66300) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    /* text layer */
+	ROM_FILL(           0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    // chars ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( brasil87 )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil87.128: Brasil 87, BS clone. */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // brasil87.128: Brasil 87, BS clone.
 	ROM_LOAD( "brasil87.128",   0x4000, 0x4000, CRC(6cfdaea9) SHA1(0704e61c1c573e99e130c22787b529ac5544c631) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    /* text layer */
+	ROM_FILL(           0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    // chars ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( brasil89 )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil89.128: Brasil 89, BS clone. */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // brasil89.128: Brasil 89, BS clone.
 	ROM_LOAD( "brasil89.128",   0x4000, 0x4000, CRC(9030e0db) SHA1(d073ed0ddd3e5df6a3387e10e05ca34bc491eb35) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    /* text layer */
+	ROM_FILL(           0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    // chars ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( brasil89a )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil89a.128: Brasil 89a, BS clone. */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // brasil89a.128: Brasil 89a, BS clone.
 	ROM_LOAD( "brasil89a.128",  0x4000, 0x4000, CRC(41a93a99) SHA1(70eeaddbdd9d3a587d1330b81d21d881ab0a8c91) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    /* text layer */
+	ROM_FILL(           0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    // chars ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( brasil93 )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* brasil93.128: Brasil 93, BS clone. No lights */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // brasil93.128: Brasil 93, BS clone. No lights
 	ROM_LOAD( "brasil93.128",   0x4000, 0x4000, CRC(cc25909f) SHA1(635184022bcb8936c396cb9fcfa6367fcae906fb) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    /* text layer */
+	ROM_FILL(           0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    // chars ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 ROM_START( poker91 )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* bs_pok91.bin: Poker 91. Based on witchcrd */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // bs_pok91.bin: Poker 91. Based on witchcrd
 	ROM_LOAD( "bs_pok91.bin",   0x0000, 0x8000, CRC(90c88b45) SHA1(9b5842075ece5f96a6869d7a8c874dee2b2abde2) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    /* text layer */
+	ROM_FILL(           0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4s.bin", 0x2000, 0x1000, CRC(0ac197eb) SHA1(fdf2b134c662f3c4d4a19d93a82d130ba643ace8) )    // chars ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "7.bin",  0x0000, 0x1000, CRC(28ecfaea) SHA1(19d73ed0fdb5a873447b46e250ad6e71abe257cd) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "6.bin",  0x1000, 0x1000, CRC(eeec8862) SHA1(ae03aba1bd43c3ffd140f76770fc1c8cf89ea115) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "5.bin",  0x2000, 0x1000, CRC(2712f297) SHA1(d3cc1469d07c3febbbe4a645cd6bdb57e09cf504) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "82s129.9c",      0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 
@@ -11064,18 +11199,18 @@
 	ROM_LOAD( "3m.17a", 0x3000, 0x1000, CRC(9d67f5c9) SHA1(d3bc13ce07a7b1713544756d7723dd0bcd59cd1a) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4.8a",   0x1000, 0x0800, CRC(1cdd1db9) SHA1(1940c6654b4a892abc3e4557666d341f407ac54f) )  /* chars gfx */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4.8a",   0x1000, 0x0800, CRC(1cdd1db9) SHA1(1940c6654b4a892abc3e4557666d341f407ac54f) )  // chars gfx
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "1.4a",   0x0000, 0x0800, CRC(40c52b9d) SHA1(64145bd2aa19b584fa56022303dc595320952c24) )  /* tiles, bitplane1 */
-	ROM_LOAD( "2.6a",   0x0800, 0x0800, CRC(b0b61ffa) SHA1(d0a01027bd6acd7c72eb5bbdb37d6dd97df8aced) )  /* tiles, bitplane2 */
-	ROM_LOAD( "3.7a",   0x1000, 0x0800, CRC(151e4af7) SHA1(a44feaa69a00a6db31c018267b8b67a248e7c66e) )  /* tiles, bitplane3 */
+	ROM_LOAD( "1.4a",   0x0000, 0x0800, CRC(40c52b9d) SHA1(64145bd2aa19b584fa56022303dc595320952c24) )  // tiles, bitplane1
+	ROM_LOAD( "2.6a",   0x0800, 0x0800, CRC(b0b61ffa) SHA1(d0a01027bd6acd7c72eb5bbdb37d6dd97df8aced) )  // tiles, bitplane2
+	ROM_LOAD( "3.7a",   0x1000, 0x0800, CRC(151e4af7) SHA1(a44feaa69a00a6db31c018267b8b67a248e7c66e) )  // tiles, bitplane3
 
-	ROM_REGION( 0x0800, "nvram", 0 )    /* default NVRAM, otherwise the game isn't stable */
+	ROM_REGION( 0x0800, "nvram", 0 )    // default NVRAM, otherwise the game isn't stable
 	ROM_LOAD( "genie_nvram.bin", 0x0000, 0x0800, CRC(1b062ae7) SHA1(9d01635f3968d4b91b4a5d9fadfaf6edd0dea7ba) )
 
-	ROM_REGION( 0x0100, "proms", 0 )    /* using original golden poker color prom */
+	ROM_REGION( 0x0100, "proms", 0 )    // using original golden poker color prom
 	ROM_LOAD( "n82s129.9c", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
 ROM_END
 
@@ -11088,15 +11223,15 @@
 	ROM_LOAD( "2732.15a", 0x7000, 0x1000, CRC(7137aa06) SHA1(1a2af7dfe41e54fc9c3b4e641319d1a504e84a18) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "2732.9a",    0x2000, 0x1000, BAD_DUMP CRC(ffb7bca3) SHA1(b58175c0342f963cb42a04195e296db952e071b6) )    /* chars + bitplane3 */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "2732.9a",    0x2000, 0x1000, BAD_DUMP CRC(ffb7bca3) SHA1(b58175c0342f963cb42a04195e296db952e071b6) )    // chars + bitplane3
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "2716.4a",   0x0000, 0x0800, CRC(40c52b9d) SHA1(64145bd2aa19b584fa56022303dc595320952c24) )  /* tiles, bitplane1 */
-	ROM_LOAD( "2716.6a",   0x0800, 0x0800, CRC(b0b61ffa) SHA1(d0a01027bd6acd7c72eb5bbdb37d6dd97df8aced) )  /* tiles, bitplane2 */
-	ROM_COPY( "gfx1",      0x2800, 0x1000, 0x0800 )    /* cards deck gfx, bitplane3. found in the 2nd quarter of the text layer rom */
+	ROM_LOAD( "2716.4a",   0x0000, 0x0800, CRC(40c52b9d) SHA1(64145bd2aa19b584fa56022303dc595320952c24) )  // tiles, bitplane1
+	ROM_LOAD( "2716.6a",   0x0800, 0x0800, CRC(b0b61ffa) SHA1(d0a01027bd6acd7c72eb5bbdb37d6dd97df8aced) )  // tiles, bitplane2
+	ROM_COPY( "gfx1",      0x2800, 0x1000, 0x0800 )    // cards deck gfx, bitplane3. found in the 2nd quarter of the chars rom
 
-	ROM_REGION( 0x0100, "proms", 0 )    /* using original golden poker color prom */
+	ROM_REGION( 0x0100, "proms", 0 )    // using original golden poker color prom
 	ROM_LOAD( "n82s129.9c", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
 ROM_END
 
@@ -11126,13 +11261,13 @@
 	ROM_LOAD( "55", 0x6000, 0x2000, CRC(aad57b3c) SHA1(9508026c1a7b227a70d89ad2f7245e75a615b932) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "13",     0x2000, 0x1000, CRC(98b8cb4f) SHA1(420ea544a41e24478a8eb1c7076f4569607d0379) )    /* text layer */
+	ROM_FILL(           0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "13",     0x2000, 0x1000, CRC(98b8cb4f) SHA1(420ea544a41e24478a8eb1c7076f4569607d0379) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "11",     0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "12",     0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_COPY( "gfx1",   0x2800, 0x1000, 0x0800 )    /* cards deck gfx, bitplane3. found in the 2nd half of the char rom */
+	ROM_LOAD( "11",     0x0000, 0x0800, CRC(1f41c541) SHA1(00df5079193f78db0617a6b8a613d8a0616fc8e9) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "12",     0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_COPY( "gfx1",   0x2800, 0x1000, 0x0800 )    // cards deck gfx, bitplane3. found in the 2nd half of the char rom
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "s287",       0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -11157,16 +11292,16 @@
 	ROM_LOAD( "8",    0x3000, 0x1000, CRC(157332c2) SHA1(3c66200c49641b9d876c5fa134dd2f0e80136beb) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(                 0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4",    0x1000, 0x0800, CRC(1e1d4e33) SHA1(22831984489fdf712ca616c1af3c874a5b12b522) )    /* text layer */
+	ROM_FILL(                 0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4",    0x1000, 0x0800, CRC(1e1d4e33) SHA1(22831984489fdf712ca616c1af3c874a5b12b522) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "1",    0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "2",    0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "3",    0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "1",    0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "2",    0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "3",    0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "tbp24sa10n.7d",      0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "tbp24sa10n.7d",      0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 /****************************************************
@@ -11187,13 +11322,13 @@
 	ROM_LOAD( "unknown.17a",    0x3000, 0x1000, NO_DUMP )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "4.8a",   0x1000, 0x0800, CRC(1e1d4e33) SHA1(22831984489fdf712ca616c1af3c874a5b12b522) )    /* char ROM (cracked title) */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "4.8a",   0x1000, 0x0800, CRC(1e1d4e33) SHA1(22831984489fdf712ca616c1af3c874a5b12b522) )    // char ROM (cracked title)
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "1.4a",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "2.6a",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "3.7a",   0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "1.4a",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "2.6a",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "3.7a",   0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "s287.8c",    0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -11218,14 +11353,14 @@
 	ROM_LOAD( "b",  0x7000, 0x1000, CRC(8627fba5) SHA1(b94665f0bf425ff71f78c1258f910323c2a948f0) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "a.8a",   0x1000, 0x0800, CRC(c70a3e49) SHA1(eb2f15b344f4dec5f05701415848c854bb27aaa3) )    /* char ROM (cracked title) */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "a.8a",   0x1000, 0x0800, CRC(c70a3e49) SHA1(eb2f15b344f4dec5f05701415848c854bb27aaa3) )    // chars ROM (cracked title)
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "1.4a",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "2.6a",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "3.7a",   0x1000, 0x0800, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) )    /* cards deck gfx, bitplane3 */
-	ROM_IGNORE(                 0x0800) /* identical halves */
+	ROM_LOAD( "1.4a",   0x0000, 0x0800, CRC(f2f94661) SHA1(f37f7c0dff680fd02897dae64e13e297d0fdb3e7) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "2.6a",   0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "3.7a",   0x1000, 0x0800, CRC(232374f3) SHA1(b75907edbf769b8c46fb1ebdb301c325c556e6c2) )    // cards deck gfx, bitplane3
+	ROM_IGNORE(                 0x0800) // identical halves
 
 	ROM_REGION( 0x0800, "nvram", 0 )  // default NVRAM, otherwise the game is not working
 	ROM_LOAD( "witchcdj_nvram.bin", 0x0000, 0x0800, CRC(39766c6a) SHA1(9de4c5886d1ee12898f7d3b0224ab99d49e5e43d) )
@@ -11249,11 +11384,11 @@
             5f63
 
 */
-ROM_START( bchancep )   /* Bonne Chance! with PIAs 6821 */
+ROM_START( bchancep )   // Bonne Chance! with PIAs 6821
 	ROM_REGION( 0x3000, "gfx", 0 )
-	ROM_LOAD( "84.bin",  0x0000, 0x1000, CRC(31f8104e) SHA1(b99f79019517ca90c48e9f303f41256d68faea91) )     /* cards deck gfx bitplane 3, identical halves */
-	ROM_LOAD( "85.bin",  0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )     /* cards deck gfx bitplane 2, identical halves */
-	ROM_LOAD( "87.bin",  0x2000, 0x1000, CRC(79c3578a) SHA1(9f25749f59385e6b80684ba9d4b218eb2a546e8c) )     /* 1st half text layer, 2nd half cards deck gfx bitplane 1 */
+	ROM_LOAD( "84.bin",  0x0000, 0x1000, CRC(31f8104e) SHA1(b99f79019517ca90c48e9f303f41256d68faea91) )     // cards deck gfx bitplane 3, identical halves
+	ROM_LOAD( "85.bin",  0x1000, 0x1000, CRC(40e426af) SHA1(7e7cb30dafc96bcb87a05d3e0ef5c2d426ed6a74) )     // cards deck gfx bitplane 2, identical halves
+	ROM_LOAD( "87.bin",  0x2000, 0x1000, CRC(79c3578a) SHA1(9f25749f59385e6b80684ba9d4b218eb2a546e8c) )     // 1st half text layer, 2nd half cards deck gfx bitplane 1
 
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "88.bin",  0x5000, 0x1000, CRC(c617b037) SHA1(55b58496d12dc8bcaa252e8ee847dbcb7d2c417d) )
@@ -11262,13 +11397,13 @@
 //  ROM_LOAD( "ups39_12a.bin",  0x0000, 0x8000, CRC(216b45fb) SHA1(fbfcd98cc39b2e791cceb845b166ff697f584add) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(            0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_COPY( "gfx",     0x2000, 0x1000, 0x0800 )                                                           /* text layer and cards logo */
+	ROM_FILL(            0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_COPY( "gfx",     0x2000, 0x1000, 0x0800 )                                                           // chars and cards logo
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "gfx",     0x0000, 0x0000, 0x0800 )                                                           /* cards deck gfx, bitplane 1 */
-	ROM_COPY( "gfx",     0x1000, 0x0800, 0x0800 )                                                           /* cards deck gfx, bitplane 2 */
-	ROM_COPY( "gfx",     0x2800, 0x1000, 0x0800 )                                                           /* cards deck gfx, bitplane 3 */
+	ROM_COPY( "gfx",     0x0000, 0x0000, 0x0800 )                                                           // cards deck gfx, bitplane 1
+	ROM_COPY( "gfx",     0x1000, 0x0800, 0x0800 )                                                           // cards deck gfx, bitplane 2
+	ROM_COPY( "gfx",     0x2800, 0x1000, 0x0800 )                                                           // cards deck gfx, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "bchancep_bp.bin", 0x0000, 0x0100, CRC(70fe1582) SHA1(118c743d445a37ad760e4163b61c3c562d7adda6) )
@@ -11279,13 +11414,13 @@
 	ROM_LOAD( "pok4-5.014",  0x4000, 0x4000, CRC(92f1f515) SHA1(f79ab453458f71d7e62e895d04a2d6161dbf2aad) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(           0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "pok3.014",  0x1000, 0x0800, CRC(fb00e263) SHA1(879660bc3a3eb3d41f80741b157cdefaa7bd9a18) )    /* char ROM, different cardback logo */
+	ROM_FILL(           0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "pok3.014",  0x1000, 0x0800, CRC(fb00e263) SHA1(879660bc3a3eb3d41f80741b157cdefaa7bd9a18) )    // chars ROM, different cardback logo
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "pok0.014",  0x0000, 0x0800, CRC(124f131f) SHA1(35b18d1d6b0146ecc5b52f3222a270c6b868742a) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "pok1.014",  0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "pok2.014",  0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "pok0.014",  0x0000, 0x0800, CRC(124f131f) SHA1(35b18d1d6b0146ecc5b52f3222a270c6b868742a) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "pok1.014",  0x0800, 0x0800, CRC(6bbb1e2d) SHA1(51ee282219bf84218886ad11a24bc6a8e7337527) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "pok2.014",  0x1000, 0x0800, CRC(6e3e9b1d) SHA1(14eb8d14ce16719a6ad7d13db01e47c8f05955f0) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "82s129.bin", 0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -11323,7 +11458,7 @@
 
 */
 ROM_START( pokermon )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* 2 programs, selectable via DIP switch */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // 2 programs, selectable via DIP switch
 	ROM_LOAD( "mbv_bi.bin",      0x0000, 0x8000, CRC(da00e08a) SHA1(98e52915178e29ab3ae674e6b895da14626d3dd8) )
 
 	ROM_REGION( 0x18000, "gfx", 0 )
@@ -11332,20 +11467,20 @@
 	ROM_LOAD( "3m.bin",  0x10000, 0x8000, CRC(b2237068) SHA1(ece4f089776bbd5224c63c6a41a2e86a5e89d0c5) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(                 0x0000, 0x1000, 0x0000 )   /* filling the R-G bitplanes */
-	ROM_COPY( "gfx", 0x14800, 0x1000, 0x0800 )      /* text, numbers and soccer ball tiles */
+	ROM_FILL(                 0x0000, 0x1000, 0x0000 )   // filling the R-G bitplanes
+	ROM_COPY( "gfx", 0x14800, 0x1000, 0x0800 )      // chars, numbers and soccer ball tiles
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "gfx", 0x0000, 0x0000, 0x0800 )  /* soccer player gfx, bitplane 1 */
-	ROM_COPY( "gfx", 0x08000, 0x0800, 0x0800 )  /* soccer player gfx, bitplane 2 */
-	ROM_COPY( "gfx", 0x12000, 0x1000, 0x0800 )  /* soccer player gfx, bitplane 3 */
+	ROM_COPY( "gfx", 0x0000, 0x0000, 0x0800 )   // soccer player gfx, bitplane 1
+	ROM_COPY( "gfx", 0x08000, 0x0800, 0x0800 )  // soccer player gfx, bitplane 2
+	ROM_COPY( "gfx", 0x12000, 0x1000, 0x0800 )  // soccer player gfx, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "mb.bin",  0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
 ROM_END
 
 ROM_START( pokersis )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* seems  to contains 4 selectable programs, but vectors lack of sense */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // seems  to contains 4 selectable programs, but vectors lack of sense
 	ROM_LOAD( "gsub1.bin",      0x0000, 0x10000, CRC(d585dd64) SHA1(acc371aa8c6c9d1ae784e62eae9c90fd05fad0fc) )
 
 	ROM_REGION( 0x18000, "gfx", 0 )
@@ -11354,13 +11489,13 @@
 	ROM_LOAD( "gs3.bin",  0x10000, 0x8000, CRC(12c37991) SHA1(e63a0504e697daddcdfcf90b2a136c4180a431a7) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(                 0x0000, 0x1000, 0x0000 )   /* filling the R-G bitplanes */
-	ROM_COPY( "gfx", 0x14800, 0x1000, 0x0800 )      /* text and suppossed 1bpp gfx */
+	ROM_FILL(                 0x0000, 0x1000, 0x0000 )   // filling the R-G bitplanes
+	ROM_COPY( "gfx", 0x14800, 0x1000, 0x0800 )      // text and suppossed 1bpp gfx
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_COPY( "gfx", 0x04000, 0x0000, 0x0800 )  /* cards gfx, bitplane 1 */
-	ROM_COPY( "gfx", 0x0c000, 0x0800, 0x0800 )  /* cards gfx, bitplane 2 */
-	ROM_COPY( "gfx", 0x14000, 0x1000, 0x0800 )  /* cards gfx, bitplane 3 */
+	ROM_COPY( "gfx", 0x04000, 0x0000, 0x0800 )  // cards gfx, bitplane 1
+	ROM_COPY( "gfx", 0x0c000, 0x0800, 0x0800 )  // cards gfx, bitplane 2
+	ROM_COPY( "gfx", 0x14000, 0x1000, 0x0800 )  // cards gfx, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "n82s129n.bin",  0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -11378,33 +11513,40 @@
 	ROM_LOAD( "27c256.17a",   0x0000, 0x8000, CRC(dfa319c5) SHA1(e1b2ef40350ee1f40272604cbe33b245210de003) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "2732.9a",    0x2000, 0x1000, CRC(9a478c39) SHA1(614171fa3184f6ceb663d5650d05fac4d4025c9f) )    /* char ROM */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "2732.9a",    0x2000, 0x1000, CRC(9a478c39) SHA1(614171fa3184f6ceb663d5650d05fac4d4025c9f) )    // char ROM
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "2732.4a",  0x0000, 0x1000, CRC(733b72f0) SHA1(b9255b9de24d9bd7277b18d8d1e12c7cdd3813fb) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "2732.6a",  0x1000, 0x1000, CRC(02595bcf) SHA1(5d01baed66152cca4b7a14fdfee83f31304e3be3) )    /* cards deck gfx, bitplane2 */
-	ROM_LOAD( "2732.7a",  0x2000, 0x1000, CRC(42072981) SHA1(1cfbbfe33afc6f147ce5828d96455f5aeb090cd3) )    /* cards deck gfx, bitplane3 */
+	ROM_LOAD( "2732.4a",  0x0000, 0x1000, CRC(733b72f0) SHA1(b9255b9de24d9bd7277b18d8d1e12c7cdd3813fb) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "2732.6a",  0x1000, 0x1000, CRC(02595bcf) SHA1(5d01baed66152cca4b7a14fdfee83f31304e3be3) )    // cards deck gfx, bitplane2
+	ROM_LOAD( "2732.7a",  0x2000, 0x1000, CRC(42072981) SHA1(1cfbbfe33afc6f147ce5828d96455f5aeb090cd3) )    // cards deck gfx, bitplane3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "bipolar_prom.bin",  0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "bipolar_prom.bin",  0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) // PROM dump needed
 ROM_END
 
 /*-------------------------------------------------------------------------
 
-   Unknown animals themed banked game.
+  Unknown rocket/animals themed banked game.
 
-   It has 4 character's tiles:
-   A pig, a duck, a donkey, and a mouse.
-   Duck and mouse are very close to Disney's characters
-   Donald Duck and Mickey Mouse.
-
-   The PCB has a lot of wire-hacks doing a weird banking,
-   and other unknown things (maybe addressing scramble).
-   These hacks need to be documented.
+  The game looks like a poker game using rockets instead of cards.
 
-   Bottom and Top programs ROMs are soldered one over the other, and a wire
-   hack enable/disable each set through the CE pin.
+  But the game also has graphics tiles for 4 characters:
+
+  - pig
+  - duck
+  - donkey
+  - mouse
+
+  Duck and mouse are very close to Disney's characters Donald Duck
+  and Mickey Mouse.
+
+  The PCB has a lot of wire-hacks doing a weird banking,
+  and other unknown things (maybe addressing scramble).
+  These hacks need to be documented.
+
+  Bottom and Top programs ROMs are soldered one over the other, and a wire
+  hack enable/disable each set through the CE pin.
 
 ---------------------------------------------------------------------------
 
@@ -11442,36 +11584,20 @@
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "2732_bottom.15a",  0x2000, 0x1000, CRC(036f7639) SHA1(7d548dd71692fcde41c260a4a59ccdfa2aa5b07e) )
 	ROM_LOAD( "2732_bottom.17a",  0x3000, 0x1000, CRC(92c19e72) SHA1(034d077ede5608160ba882227e981751a5dde26d) )
+	ROM_LOAD( "2732_top.15a",     0x6000, 0x1000, CRC(ef6b36ff) SHA1(2ca520502ce32c4327f9bcc85d5c7b6e2f22eeb5) )
+	ROM_LOAD( "2732_top.17a",     0x7000, 0x1000, CRC(13fae924) SHA1(c1c92fdb6e7036e6d9349c9b017e9daf3577345b) )
 
 	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(             0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "2716.8a",  0x1000, 0x0800, CRC(21c9c7f1) SHA1(daa0eddd4f4a9eec0cff3aebe884792adf830238) )    /* char ROM */
-
-	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "2716.4a",  0x0000, 0x0800, CRC(0b7f11a2) SHA1(c5e347a377e307d12b2b2d2edf7c48be21ef5cdb) )    /* characters gfx, bitplane1 */
-	ROM_LOAD( "2716.5a",  0x0800, 0x0800, CRC(0b2c3c25) SHA1(c69b15c1cea9abc437b12211bc4087d4d5baf084) )    /* characters gfx, bitplane2 */
-	ROM_LOAD( "2716.7a",  0x1000, 0x0800, CRC(c48d17b0) SHA1(7c446339ab3aaa49004780fa90a3624b5a382cb1) )    /* characters gfx, bitplane3 */
-
-	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "bprom.bin", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
-ROM_END
-
-ROM_START( animpkra )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "2732_top.15a",  0x2000, 0x1000, CRC(ef6b36ff) SHA1(2ca520502ce32c4327f9bcc85d5c7b6e2f22eeb5) )
-	ROM_LOAD( "2732_top.17a",  0x3000, 0x1000, CRC(13fae924) SHA1(c1c92fdb6e7036e6d9349c9b017e9daf3577345b) )
-
-	ROM_REGION( 0x1800, "gfx1", 0 )
-	ROM_FILL(             0x0000, 0x1000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "2716.8a",  0x1000, 0x0800, CRC(21c9c7f1) SHA1(daa0eddd4f4a9eec0cff3aebe884792adf830238) )    /* char ROM */
+	ROM_FILL(             0x0000, 0x1000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "2716.8a",  0x1000, 0x0800, CRC(21c9c7f1) SHA1(daa0eddd4f4a9eec0cff3aebe884792adf830238) )    // char ROM
 
 	ROM_REGION( 0x1800, "gfx2", 0 )
-	ROM_LOAD( "2716.4a",  0x0000, 0x0800, CRC(0b7f11a2) SHA1(c5e347a377e307d12b2b2d2edf7c48be21ef5cdb) )    /* characters gfx, bitplane1 */
-	ROM_LOAD( "2716.5a",  0x0800, 0x0800, CRC(0b2c3c25) SHA1(c69b15c1cea9abc437b12211bc4087d4d5baf084) )    /* characters gfx, bitplane2 */
-	ROM_LOAD( "2716.7a",  0x1000, 0x0800, CRC(c48d17b0) SHA1(7c446339ab3aaa49004780fa90a3624b5a382cb1) )    /* characters gfx, bitplane3 */
+	ROM_LOAD( "2716.4a",  0x0000, 0x0800, CRC(0b7f11a2) SHA1(c5e347a377e307d12b2b2d2edf7c48be21ef5cdb) )    // characters gfx, bitplane 1
+	ROM_LOAD( "2716.5a",  0x0800, 0x0800, CRC(0b2c3c25) SHA1(c69b15c1cea9abc437b12211bc4087d4d5baf084) )    // characters gfx, bitplane 2
+	ROM_LOAD( "2716.7a",  0x1000, 0x0800, CRC(c48d17b0) SHA1(7c446339ab3aaa49004780fa90a3624b5a382cb1) )    // characters gfx, bitplane 3
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "bprom.bin", 0x0000, 0x0100, BAD_DUMP CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) ) /* PROM dump needed */
+	ROM_LOAD( "bprom.bin", 0x0000, 0x0100, BAD_DUMP CRC(dc4c4728) SHA1(6c779cd32d5b8d659f971b30f63267d81ad57afb) ) // PROM dump needed
 ROM_END
 
 
@@ -11485,23 +11611,23 @@
 ******************************************/
 
 ROM_START( megadpkr )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* program ROM */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // program ROM
 	ROM_LOAD( "mega-2.u2",  0x8000, 0x8000, CRC(2b133b92) SHA1(97bc21c42897cfd13c0247e239aebb18f73cde91) )
 
-	ROM_REGION( 0x8000, "cpubank", 0 ) /* banked through MCU */
+	ROM_REGION( 0x8000, "cpubank", 0 ) // banked through MCU
 	ROM_LOAD( "mega-3.u3",  0x0000, 0x8000, CRC(ff0a46c6) SHA1(df053c323c0e2dd0e41e22286d38e889bfda3aa5) )
 
-	ROM_REGION( 0x0800, "mcu", 0 )  /* 68705P5 microcontroller */
+	ROM_REGION( 0x0800, "mcu", 0 )  // 68705P5 microcontroller
 	ROM_LOAD( "mega-1.u11",  0x0000, 0x0800, CRC(621a7971) SHA1(49121f7b0d428a825ccd219622dcc4abe3572968) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x000000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "car1.5a",    0x2000, 0x1000, CRC(29e244d2) SHA1(c309a5ee6922bf2752d218c134edb3ef5f808afa) )    /* text chars / cards deck gfx, bitplane3 */
+	ROM_FILL(               0x0000, 0x2000, 0x000000 ) // filling the R-G bitplanes
+	ROM_LOAD( "car1.5a",    0x2000, 0x1000, CRC(29e244d2) SHA1(c309a5ee6922bf2752d218c134edb3ef5f808afa) )    // chars / cards deck gfx, bitplane 3
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "car3.2a",    0x0000, 0x1000, CRC(819c06c4) SHA1(45b874554fb487173acf12daa4ff99e49e335362) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "car2.4a",    0x1000, 0x1000, CRC(41eec680) SHA1(3723f66e1def3908f2e6ba2989def229d9846b02) )    /* cards deck gfx, bitplane2 */
-	ROM_COPY( "gfx1",   0x2800, 0x2000, 0x0800 )    /* cards deck gfx, bitplane3. found in the 2nd quarter of the chars rom */
+	ROM_LOAD( "car3.2a",    0x0000, 0x1000, CRC(819c06c4) SHA1(45b874554fb487173acf12daa4ff99e49e335362) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "car2.4a",    0x1000, 0x1000, CRC(41eec680) SHA1(3723f66e1def3908f2e6ba2989def229d9846b02) )    // cards deck gfx, bitplane2
+	ROM_COPY( "gfx1",   0x2800, 0x2000, 0x0800 )    // cards deck gfx, bitplane3. found in the 2nd quarter of the chars rom
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "m3-7611-5.7d",   0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -11533,23 +11659,23 @@
 */
 
 ROM_START( megadpkrb )
-	ROM_REGION( 0x10000, "maincpu", 0 ) /* program ROM */
+	ROM_REGION( 0x10000, "maincpu", 0 ) // program ROM
 	ROM_LOAD( "u2.bin", 0x8000, 0x8000, CRC(0efdf472) SHA1(4b1ae10427c2ae8d7cbbe525a6b30973372d4420) )
 
-	ROM_REGION( 0x8000, "cpubank", 0 ) /* banked through MCU */
+	ROM_REGION( 0x8000, "cpubank", 0 ) // banked through MCU
 	ROM_LOAD( "u3.bin", 0x0000, 0x8000, CRC(c973e345) SHA1(aae9da8cbaf0cf07086e5acacf9052e49fbdd896) )
 
-	ROM_REGION( 0x0800, "mcu", 0 )  /* 68705P5 microcontroller - might not be for this set */
+	ROM_REGION( 0x0800, "mcu", 0 )  // 68705P5 microcontroller - might not be for this set
 	ROM_LOAD( "mega-1.u11",  0x0000, 0x0800, CRC(621a7971) SHA1(49121f7b0d428a825ccd219622dcc4abe3572968) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
-	ROM_FILL(               0x0000, 0x2000, 0x0000 ) /* filling the R-G bitplanes */
-	ROM_LOAD( "car1_5a.bin",    0x2000, 0x1000, CRC(29e244d2) SHA1(c309a5ee6922bf2752d218c134edb3ef5f808afa) )    /* text chars / cards deck gfx, bitplane3 */
+	ROM_FILL(               0x0000, 0x2000, 0x0000 ) // filling the R-G bitplanes
+	ROM_LOAD( "car1_5a.bin",    0x2000, 0x1000, CRC(29e244d2) SHA1(c309a5ee6922bf2752d218c134edb3ef5f808afa) )    // chars / cards deck gfx, bitplane 3
 
 	ROM_REGION( 0x3000, "gfx2", 0 )
-	ROM_LOAD( "car3_2a.bin",    0x0000, 0x1000, CRC(819c06c4) SHA1(45b874554fb487173acf12daa4ff99e49e335362) )    /* cards deck gfx, bitplane1 */
-	ROM_LOAD( "car2_4a.bin",    0x1000, 0x1000, CRC(41eec680) SHA1(3723f66e1def3908f2e6ba2989def229d9846b02) )    /* cards deck gfx, bitplane2 */
-	ROM_COPY( "gfx1",   0x2800, 0x2000, 0x0800 )    /* cards deck gfx, bitplane3. found in the 2nd quarter of the chars rom */
+	ROM_LOAD( "car3_2a.bin",    0x0000, 0x1000, CRC(819c06c4) SHA1(45b874554fb487173acf12daa4ff99e49e335362) )    // cards deck gfx, bitplane1
+	ROM_LOAD( "car2_4a.bin",    0x1000, 0x1000, CRC(41eec680) SHA1(3723f66e1def3908f2e6ba2989def229d9846b02) )    // cards deck gfx, bitplane2
+	ROM_COPY( "gfx1",   0x2800, 0x2000, 0x0800 )    // cards deck gfx, bitplane 3. found in the 2nd quarter of the chars rom
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "m3-7611-5.7d",   0x0000, 0x0100, CRC(7f31066b) SHA1(15420780ec6b2870fc4539ec3afe4f0c58eedf12) )
@@ -11682,7 +11808,7 @@
 
 void goldnpkr_state::init_flcnw()
 {
-	/* Attempt to decrypt the MCU program (we're sooo close!) */
+	// Attempt to decrypt the MCU program (we're sooo close!)
 
 	uint8_t *ROM = memregion("mcu")->base();
 	int size = memregion("mcu")->bytes();
@@ -11990,7 +12116,7 @@
 
 void goldnpkr_state::init_bchancep()
 {
-	/* Attempt to invert the color data from the bipolar PROM */
+	// Attempt to invert the color data from the bipolar PROM
 
 	uint8_t *ROM = memregion("proms")->base();
 	int size = memregion("proms")->bytes();
@@ -12000,6 +12126,7 @@
 	{
 		ROM[i] = ROM[i] ^ 0x0f;
 	}
+
 	m_palette->update();
 }
 
@@ -12041,11 +12168,37 @@
 }
 
 
+/*
+  Super 98 protection.
+
+  Code checks for different things on NVRAM space.
+  There are involved zeropage registers, inputs
+  combinations, and stack pointer handling.
+
+  The game takes 25 seconds to do all the checks.
+
+  E9F4: jmp $EA56   ; infinite loop / dead end.
+  E9F7: jmp $CEC6   ; the game continue executing...
+
+*/
+
+void goldnpkr_state::init_super98()
+{
+//  NOPing the deadly call for now.
+
+	uint8_t *ROM = memregion("maincpu")->base();
+
+	ROM[0x69f4] = 0xea;
+	ROM[0x69f5] = 0xea;
+	ROM[0x69f6] = 0xea;
+}
+
+
 /*********************************************
 *                Game Drivers                *
 *********************************************/
 
-//     YEAR  NAME       PARENT    MACHINE   INPUT     STATE           INIT      ROT     COMPANY                     FULLNAME                                      FLAGS             LAYOUT
+//     YEAR  NAME       PARENT    MACHINE   INPUT     STATE           INIT           ROT      COMPANY                     FULLNAME                                     FLAGS             LAYOUT
 GAMEL( 1981, goldnpkr,  0,        goldnpkr, goldnpkr, goldnpkr_state, empty_init,    ROT0,   "Bonanza Enterprises, Ltd", "Golden Poker Double Up (Big Boy)",           0,                layout_goldnpkr )
 GAMEL( 1981, goldnpkb,  goldnpkr, goldnpkr, goldnpkr, goldnpkr_state, empty_init,    ROT0,   "Bonanza Enterprises, Ltd", "Golden Poker Double Up (Mini Boy)",          0,                layout_goldnpkr )
 GAMEL( 198?, goldnpkc,  goldnpkr, goldnpkr, goldnpkr, goldnpkr_state, empty_init,    ROT0,   "bootleg",                  "Golden Poker Double Up (bootleg)",           0,                layout_goldnpkr )
@@ -12066,6 +12219,7 @@
 GAMEL( 198?, potnpkri,  pottnpkr, pottnpkr, goldnpkr, goldnpkr_state, empty_init,    ROT0,   "bootleg",                  "Jack Potten's Poker (set 10, ICP-1 PCB)",    0,                layout_goldnpkr )  // unencrypted IPC-1 PCB.
 GAMEL( 198?, potnpkrj,  pottnpkr, goldnpkr, goldnpkr, goldnpkr_state, empty_init,    ROT0,   "bootleg",                  "Jack Potten's Poker (set 11, German, W.W.)", 0,                layout_goldnpkr )
 GAMEL( 198?, potnpkrk,  pottnpkr, goldnpkr, goldnpkr, goldnpkr_state, empty_init,    ROT0,   "bootleg",                  "Jack Potten's Poker (set 12, no Double-Up)", 0,                layout_goldnpkr )
+GAMEL( 198?, potnpkrl,  pottnpkr, pottnpkr, potnpkra, goldnpkr_state, empty_init,    ROT0,   "<unknown>",                "Jack Potten's Poker (set 13, ICP-1 PCB)",    0,                layout_goldnpkr )  // unencrypted IPC-1 PCB.
 GAMEL( 198?, ngold,     pottnpkr, pottnpkr, ngold,    goldnpkr_state, empty_init,    ROT0,   "<unknown>",                "Jack Potten's Poker (NGold, set 1)",         0,                layout_goldnpkr )
 GAMEL( 198?, ngolda,    pottnpkr, pottnpkr, ngold,    goldnpkr_state, empty_init,    ROT0,   "<unknown>",                "Jack Potten's Poker (NGold, set 2)",         0,                layout_goldnpkr )
 GAMEL( 198?, ngoldb,    pottnpkr, pottnpkr, ngoldb,   goldnpkr_state, empty_init,    ROT0,   "<unknown>",                "Jack Potten's Poker (NGold, set 3)",         0,                layout_goldnpkr )
@@ -12121,50 +12275,50 @@
 
 GAMEL( 1994, witchjol,  0,        wcrdxtnd, witchjol, goldnpkr_state, init_vkdlsa,   ROT0,   "Video Klein",              "Jolli Witch (Export, 6T/12T ver 1.57D)",     0,                   layout_goldnpkr )
 
-GAMEL( 2001, wldwitch,  0,        wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlsww,  ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.84A)",       0,                   layout_goldnpkr )  /* Ver 184A, 2001-09-12 */
-GAMEL( 1992, wldwitcha, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwa, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.57-SP)",     0,                   layout_goldnpkr )  /* Ver 157-SP, 1992-12-25 */
-GAMEL( 1992, wldwitchb, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.57-TE)",     MACHINE_NOT_WORKING, layout_goldnpkr )  /* Ver 157-TE, 1992-12-25 */
-GAMEL( 1994, wldwitchc, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwc, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62A)",       0,                   layout_goldnpkr )  /* Ver 162A, 1994-04-26 */
-GAMEL( 1994, wldwitchd, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwd, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62B)",       0,                   layout_goldnpkr )  /* Ver 162B, 1994-04-26 */
-GAMEL( 1994, wldwitche, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62A-F)",     MACHINE_NOT_WORKING, layout_goldnpkr )  /* Ver 162A-F, 1994-04-26 */
-GAMEL( 1994, wldwitchf, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwc, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62A alt)",   0,                   layout_goldnpkr )  /* Ver 162A alt, 1994-11-03 */
-GAMEL( 1994, wldwitchg, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwd, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62B alt)",   0,                   layout_goldnpkr )  /* Ver 162B alt, 1994-11-03 */
-GAMEL( 1995, wldwitchh, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A)",       0,                   layout_goldnpkr )  /* Ver 165A, 1995-11-16 */
-GAMEL( 1996, wldwitchi, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A-S)",     0,                   layout_goldnpkr )  /* Ver 165A-S (Fast Deal), 1996-03-26 */
-GAMEL( 1996, wldwitchj, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A-S alt)", 0,                   layout_goldnpkr )  /* Ver 165A-S alt (Fast Deal), 1996-05-26 */
-GAMEL( 1996, wldwitchk, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A-N)",     0,                   layout_goldnpkr )  /* Ver 165A-N, 1996-05-29 */
-GAMEL( 1996, wldwitchl, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwl, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.70A beta)",  0,                   layout_goldnpkr )  /* Ver 170A-beta, 1996-06-25 */
-GAMEL( 1996, wldwitchm, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwl, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.70A)",       0,                   layout_goldnpkr )  /* Ver 170A, 1996-09-30 */
-GAMEL( 1997, wldwitchn, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwl, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.70A alt)",   0,                   layout_goldnpkr )  /* Ver 170A alt, 1997-06-11 */
-GAMEL( 1998, wldwitcho, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwo, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.74A-SP-BELG)", 0,                 layout_goldnpkr )  /* Ver 174A-SP-BELG (no D-UP, no payout), 1998-05-11 */
-GAMEL( 1998, wldwitchp, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwp, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.74A)",       0,                   layout_goldnpkr )  /* Ver 174A (no D-UP, no payout), 1998-09-20 */
-GAMEL( 1998, wldwitchq, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlsb,   ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.74A alt)",   0,                   layout_goldnpkr )  /* Ver 174A alt, box, 1998-09-25 */
-GAMEL( 1999, wldwitchr, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwr, ROT0,   "Video Klein",              "Wild Witch (Export, 6B/12B ver 1.75A-E English)", 0,               layout_goldnpkr )  /* Ver 175A-E (English), 1999-01-11 */
-GAMEL( 1999, wldwitchs, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswws, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.76A)",       0,                   layout_goldnpkr )  /* Ver 176A, 1999-??-?? */
-GAMEL( 1999, wldwitcht, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwt, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.77A)",       0,                   layout_goldnpkr )  /* Ver 177A, 1999-??-?? */
-GAMEL( 2000, wldwitchu, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwu, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.79A)",       0,                   layout_goldnpkr )  /* Ver 179A, 2000-05-10 */
-GAMEL( 2001, wldwitchv, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwv, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.83A)",       0,                   layout_goldnpkr )  /* Ver 183A, 2001-06-13 */
-
-GAMEL( 1998, wupndown,  0,        wcrdxtnd, wupndown, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Up & Down (Export, 6T/12T ver 1.02)",        0,           layout_upndown )    /* Ver 1.02, 1998-10-26 */
-GAMEL( 1998, wupndowna, wupndown, wcrdxtnd, wupndown, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Up & Down (Export, 6T/12T ver 0.99, set 1)", 0,           layout_upndown )    /* Ver 0.99, 1998-04-09 */
-GAMEL( 1998, wupndownb, wupndown, wcrdxtnd, wupndown, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Up & Down (Export, 6T/12T ver 0.99, set 2)", 0,           layout_upndown )    /* Ver 0.99, 1998-03-23 */
-GAMEL( 1998, wupndownc, wupndown, wcrdxtnd, wupndown, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Up & Down (Export, 6T/12T ver 0.99, set 3)", 0,           layout_upndown )    /* Ver 0.99 alt, 1998-05-11 */
-GAMEL( 1998, wupndownd, wupndown, wcrdxtnd, wupndown, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Up & Down (Export, 6T/12T ver 0.99T)",       0,           layout_upndown )    /* Ver 0.99T, 1998-03-23 */
+GAMEL( 2001, wldwitch,  0,        wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlsww,  ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.84A)",       0,                   layout_goldnpkr )  // Ver 184A, 2001-09-12
+GAMEL( 1992, wldwitcha, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwa, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.57-SP)",     0,                   layout_goldnpkr )  // Ver 157-SP, 1992-12-25
+GAMEL( 1992, wldwitchb, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.57-TE)",     MACHINE_NOT_WORKING, layout_goldnpkr )  // Ver 157-TE, 1992-12-25
+GAMEL( 1994, wldwitchc, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwc, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62A)",       0,                   layout_goldnpkr )  // Ver 162A, 1994-04-26
+GAMEL( 1994, wldwitchd, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwd, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62B)",       0,                   layout_goldnpkr )  // Ver 162B, 1994-04-26
+GAMEL( 1994, wldwitche, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62A-F)",     MACHINE_NOT_WORKING, layout_goldnpkr )  // Ver 162A-F, 1994-04-26
+GAMEL( 1994, wldwitchf, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwc, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62A alt)",   0,                   layout_goldnpkr )  // Ver 162A alt, 1994-11-03
+GAMEL( 1994, wldwitchg, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwd, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.62B alt)",   0,                   layout_goldnpkr )  // Ver 162B alt, 1994-11-03
+GAMEL( 1995, wldwitchh, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A)",       0,                   layout_goldnpkr )  // Ver 165A, 1995-11-16
+GAMEL( 1996, wldwitchi, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A-S)",     0,                   layout_goldnpkr )  // Ver 165A-S (Fast Deal), 1996-03-26
+GAMEL( 1996, wldwitchj, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A-S alt)", 0,                   layout_goldnpkr )  // Ver 165A-S alt (Fast Deal), 1996-05-26
+GAMEL( 1996, wldwitchk, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwh, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.65A-N)",     0,                   layout_goldnpkr )  // Ver 165A-N, 1996-05-29
+GAMEL( 1996, wldwitchl, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwl, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.70A beta)",  0,                   layout_goldnpkr )  // Ver 170A-beta, 1996-06-25
+GAMEL( 1996, wldwitchm, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwl, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.70A)",       0,                   layout_goldnpkr )  // Ver 170A, 1996-09-30
+GAMEL( 1997, wldwitchn, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwl, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.70A alt)",   0,                   layout_goldnpkr )  // Ver 170A alt, 1997-06-11
+GAMEL( 1998, wldwitcho, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwo, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.74A-SP-BELG)", 0,                 layout_goldnpkr )  // Ver 174A-SP-BELG (no D-UP, no payout), 1998-05-11
+GAMEL( 1998, wldwitchp, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwp, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.74A)",       0,                   layout_goldnpkr )  // Ver 174A (no D-UP, no payout), 1998-09-20
+GAMEL( 1998, wldwitchq, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlsb,   ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.74A alt)",   0,                   layout_goldnpkr )  // Ver 174A alt, box, 1998-09-25
+GAMEL( 1999, wldwitchr, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwr, ROT0,   "Video Klein",              "Wild Witch (Export, 6B/12B ver 1.75A-E English)", 0,               layout_goldnpkr )  // Ver 175A-E (English), 1999-01-11
+GAMEL( 1999, wldwitchs, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswws, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.76A)",       0,                   layout_goldnpkr )  // Ver 176A, 1999-??-??
+GAMEL( 1999, wldwitcht, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwt, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.77A)",       0,                   layout_goldnpkr )  // Ver 177A, 1999-??-??
+GAMEL( 2000, wldwitchu, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwu, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.79A)",       0,                   layout_goldnpkr )  // Ver 179A, 2000-05-10
+GAMEL( 2001, wldwitchv, wldwitch, wcrdxtnd, wldwitch, goldnpkr_state, init_vkdlswwv, ROT0,   "Video Klein",              "Wild Witch (Export, 6T/12T ver 1.83A)",       0,                   layout_goldnpkr )  // Ver 183A, 2001-06-13
+
+GAMEL( 1998, wupndown,  0,        wcrdxtnd, wupndown, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Up & Down (Export, 6T/12T ver 1.02)",        0,           layout_upndown )    // Ver 1.02, 1998-10-26
+GAMEL( 1998, wupndowna, wupndown, wcrdxtnd, wupndown, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Up & Down (Export, 6T/12T ver 0.99, set 1)", 0,           layout_upndown )    // Ver 0.99, 1998-04-09
+GAMEL( 1998, wupndownb, wupndown, wcrdxtnd, wupndown, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Up & Down (Export, 6T/12T ver 0.99, set 2)", 0,           layout_upndown )    // Ver 0.99, 1998-03-23
+GAMEL( 1998, wupndownc, wupndown, wcrdxtnd, wupndown, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Up & Down (Export, 6T/12T ver 0.99, set 3)", 0,           layout_upndown )    // Ver 0.99 alt, 1998-05-11
+GAMEL( 1998, wupndownd, wupndown, wcrdxtnd, wupndown, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Up & Down (Export, 6T/12T ver 0.99T)",       0,           layout_upndown )    // Ver 0.99T, 1998-03-23
 
 GAMEL( 1992, wstrike,   0,        wcrdxtnd, wstrike,  goldnpkr_state, init_wstrike,  ROT0,   "Video Klein",              "Witch Strike (Export, 6T/12T ver 1.01A)",     0,                layout_goldnpkr )
 GAMEL( 1992, wstrikea,  wstrike,  wcrdxtnd, wstrike,  goldnpkr_state, init_wstrike,  ROT0,   "Video Klein",              "Witch Strike (Export, 6T/12T ver 1.01B)",     0,                layout_goldnpkr )
 
-GAMEL( 1996, wtchjack,  0,        wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.87-89)", 0,                          layout_goldnpkr )    /* Ver 0.87-89 / 1996-10-08 GFX OK */
-GAMEL( 1996, wtchjacka, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.87-88)", 0,                          layout_goldnpkr )    /* Ver 0.87-88 / 1996-10-02, GFX OK */
-GAMEL( 1996, wtchjackb, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.87)",    0,                          layout_goldnpkr )    /* Ver 0.87 / 1996-07-16, GFX OK */
-GAMEL( 1996, wtchjackc, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.70S)",   MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    /* Ver 0.70S / 1996-03-26 */
-GAMEL( 1996, wtchjackd, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.70P)",   MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    /* Ver 0.70P / 1996-03-26 */
-GAMEL( 1995, wtchjacke, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.65)",    MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    /* Ver 0.65 / 1995-10-19 */
-GAMEL( 1995, wtchjackf, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.64)",    MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    /* Ver 0.64 / 1995-09-13 */
-GAMEL( 1995, wtchjackg, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.62)",    MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    /* Ver 0.62 / 1995-08-02 */
-GAMEL( 1995, wtchjackh, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.40T)",   MACHINE_NOT_WORKING,        layout_goldnpkr )    /* Ver 0.40T / 1995-02-27 */
-GAMEL( 1995, wtchjacki, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.40)",    MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    /* Ver 0.40 / 1995-02-27 */
-GAMEL( 1994, wtchjackj, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jackpot (Export, 6T/12T ver 0.25)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    /* Ver 0.25 / 1994-11-24 */
+GAMEL( 1996, wtchjack,  0,        wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.87-89)", 0,                          layout_goldnpkr )    // Ver 0.87-89 / 1996-10-08 GFX OK
+GAMEL( 1996, wtchjacka, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.87-88)", 0,                          layout_goldnpkr )    // Ver 0.87-88 / 1996-10-02, GFX OK
+GAMEL( 1996, wtchjackb, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.87)",    0,                          layout_goldnpkr )    // Ver 0.87 / 1996-07-16, GFX OK
+GAMEL( 1996, wtchjackc, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.70S)",   MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    // Ver 0.70S / 1996-03-26
+GAMEL( 1996, wtchjackd, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.70P)",   MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    // Ver 0.70P / 1996-03-26
+GAMEL( 1995, wtchjacke, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.65)",    MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    // Ver 0.65 / 1995-10-19
+GAMEL( 1995, wtchjackf, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.64)",    MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    // Ver 0.64 / 1995-09-13
+GAMEL( 1995, wtchjackg, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.62)",    MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    // Ver 0.62 / 1995-08-02
+GAMEL( 1995, wtchjackh, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.40T)",   MACHINE_NOT_WORKING,        layout_goldnpkr )    // Ver 0.40T / 1995-02-27
+GAMEL( 1995, wtchjacki, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jack (Export, 6T/12T ver 0.40)",    MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    // Ver 0.40 / 1995-02-27
+GAMEL( 1994, wtchjackj, wtchjack, wcrdxtnd, wtchjack, goldnpkr_state, empty_init,    ROT0,   "Video Klein",              "Witch Jackpot (Export, 6T/12T ver 0.25)", MACHINE_IMPERFECT_GRAPHICS, layout_goldnpkr )    // Ver 0.25 / 1994-11-24
 
 /*************************************** OTHER SETS ***************************************/
 
@@ -12196,11 +12350,10 @@
 GAMEL( 198?, bchancep,  0,        bchancep, goldnpkr, goldnpkr_state, init_bchancep, ROT0,   "<unknown>",                "Bonne Chance! (Golden Poker prequel HW, set 1)", MACHINE_NOT_WORKING, layout_goldnpkr )
 GAMEL( 198?, bchanceq,  0,        goldnpkr, goldnpkr, goldnpkr_state, empty_init,    ROT0,   "<unknown>",                "Bonne Chance! (Golden Poker prequel HW, set 2)", MACHINE_NOT_WORKING, layout_goldnpkr )
 
-GAME(  1987, pokermon,  0,        mondial,  mondial,  goldnpkr_state, empty_init,    ROT0,   "<unknown>",                "Mundial/Mondial (Italian/French)",        0 )                  // banked selectable program
-GAME(  1998, super98,   bsuerte,  witchcrd, super98,  goldnpkr_state, empty_init,    ROT0,   "<unknown>",                "Super 98 (3-hands, ICP-1)",               MACHINE_NOT_WORKING )  // program checks zeropage registers for changes...
+GAME(  1987, pokermon,  0,        mondial,  mondial,  goldnpkr_state, empty_init,    ROT0,   "<unknown>",                "Mundial/Mondial (Italian/French)",        0 )  // banked selectable program.
+GAME(  1998, super98,   bsuerte,  witchcrd, super98,  goldnpkr_state, init_super98,  ROT0,   "<unknown>",                "Super 98 (3-hands, ICP-1)",               0 )  // complex protection. see notes.
 
-GAME(  198?, animpkr,   0,        pottnpkr, goldnpkr, goldnpkr_state, empty_init,    ROT0,   "<unknown>",                "unknown animal-themed game (bottom)",     MACHINE_NOT_WORKING )  // banked selectable program (bottom).
-GAME(  198?, animpkra,  animpkr,  pottnpkr, goldnpkr, goldnpkr_state, empty_init,    ROT0,   "<unknown>",                "unknown animal-themed game (top)",        MACHINE_NOT_WORKING )  // banked selectable program (top).
+GAME(  198?, animpkr,   0,        icp_ext,  animpkr,  goldnpkr_state, empty_init,    ROT0,   "<unknown>",                "unknown rocket/animal-themed poker",      MACHINE_IMPERFECT_COLORS )  // banked program. how to switch gfx?
 
 GAME(  1990, megadpkr,  0,        megadpkr, megadpkr, blitz_state,    empty_init,    ROT0,   "Blitz System",             "Mega Double Poker (conversion kit, version 2.3 MD)", 0 )
 GAME(  1990, megadpkrb, megadpkr, megadpkr, megadpkr, blitz_state,    empty_init,    ROT0,   "Blitz System",             "Mega Double Poker (conversion kit, version 2.1 MD)", 0 ) // may need an extra reset to work the first time
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/goldstar.cpp mame-0.224+dfsg.1/src/mame/drivers/goldstar.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/goldstar.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/goldstar.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2212,7 +2212,7 @@
 
 	PORT_INCLUDE( cmv4_dsw5 )
 	PORT_MODIFY("DSW5")
-	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )              PORT_DIPLOCATION("DSW5:1")  /* normally Display of Doll On Demo, but no whores in this set */
+	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )              PORT_DIPLOCATION("DSW5:1")  /* normally Display of Doll On Demo, but no ladies in this set */
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	/* Coin In Limit OK */
@@ -2223,7 +2223,7 @@
 	PORT_DIPNAME( 0x40, 0x40, "Skill Stop" )                    PORT_DIPLOCATION("DSW5:7")  /* OK */
 	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )              PORT_DIPLOCATION("DSW5:8")  /* normally Test Mode For Disp. Of Doll, but no whores in this set */
+	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )              PORT_DIPLOCATION("DSW5:8")  /* normally Test Mode For Disp. Of Doll, but no ladies in this set */
 	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 INPUT_PORTS_END
@@ -11242,6 +11242,138 @@
 ROM_END
 
 
+/*
+  Cherry Master.
+
+  The EPROMS devices only hold the second half of the needed program and regular tiles data.
+  EPROMS are NMC27CP128Q that are sized 0x4000, when the real data should be 0x8000 for each position.
+
+  *EDIT*
+  Even when the NMC27CP128Q datasheet says that these devices are 128 Kbits (16k x8), we redumped
+  them as 27c256, and got perfect complete 32k x8 dumps.
+
+  This is very weird, since the datasheet diagram clearly shows that this device lacks of A14 line.
+
+  So... The National NMC27CP128Q devices could hold twice the specified size, or these on the board
+  are just fake devices for protection purposes.
+
+*/
+ROM_START( cmasteri )
+	ROM_REGION( 0x10000, "maincpu", 0 ) // 32k x 8 data coming from a real NMC27CP128Q
+	ROM_LOAD( "9.u81",  0x0000,  0x1000, CRC(2738eb55) SHA1(95e420544f36e4ce6358f14fee7a6b7ecd4cc568) )
+	ROM_CONTINUE(0x4000,0x1000)
+	ROM_CONTINUE(0x3000,0x1000)
+	ROM_CONTINUE(0x7000,0x1000)
+	ROM_CONTINUE(0x1000,0x1000)
+	ROM_CONTINUE(0x6000,0x1000)
+	ROM_CONTINUE(0x2000,0x1000)
+	ROM_CONTINUE(0x5000,0x1000)
+
+	ROM_REGION( 0x18000, "gfx1", 0 )    // 32k x 8 data coming from real NMC27CP128Q devices
+	ROM_LOAD( "7.u16", 0x00000,  0x8000, CRC(19cc1d67) SHA1(47487f9362bfb36a32100ed772960628844462bf) )
+	ROM_LOAD( "6.u11", 0x08000,  0x8000, CRC(63b3df4e) SHA1(9bacd23da598805ec18ec5ad15cab95d71eb9262) )
+	ROM_LOAD( "5.u4",  0x10000,  0x8000, CRC(e39fff9c) SHA1(22fdc517fa478441622c6245cecb5728c5595757) )
+
+	ROM_REGION( 0x8000, "gfx2", 0 )
+	ROM_LOAD( "4.u15",  0x0000,  0x2000, CRC(8607ffd9) SHA1(9bc94715554aa2473ae2ed249a47f29c7886b3dc) )
+	ROM_LOAD( "3.u10",  0x2000,  0x2000, CRC(c32367be) SHA1(ff217021b9c58e23b2226f8b0a7f5da966225715) )
+	ROM_LOAD( "2.u14",  0x4000,  0x2000, CRC(6dfcb188) SHA1(22430429c798954d9d979e62699b58feae7fdbf4) )
+	ROM_LOAD( "1.u9",   0x6000,  0x2000, CRC(9678ead2) SHA1(e80aefa98b2363fe9e6b2415762695ace272e4d3) )
+
+	ROM_REGION( 0x10000, "user1", 0 )
+	ROM_LOAD( "8.u58",  0x0000, 0x10000, CRC(e92443d3) SHA1(4b6ca4521841610054165f085ae05510e77af191) )
+
+	ROM_REGION( 0x200, "proms", 0 )
+	ROM_LOAD( "74s287.u84", 0x0000, 0x0100, CRC(0489b760) SHA1(78f8632b17a76335183c5c204cdec856988368b0) )
+	ROM_LOAD( "74s287.u79", 0x0100, 0x0100, CRC(21eb5b19) SHA1(9b8425bdb97f11f4855c998c7792c3291fd07470) )
+
+	ROM_REGION( 0x100, "proms2", 0 )
+	ROM_LOAD( "74s287.u46", 0x0000, 0x0100, CRC(50ec383b) SHA1(ae95b92bd3946b40134bcdc22708d5c6b0f4c23e) )
+ROM_END
+
+
+/*
+  Cherry Master.
+  CM-1 v1.01
+
+  These sets were modified to use different inputs to stop all reels.
+
+  cmasterj uses BET to stop all.
+  (this set needs to press stop as soon as the spin starts)
+
+  cmasterk uses TAKE to stop all.
+
+  Should be other changes since there are program blocks moved/modded,
+  but these are unknown.
+
+*/
+ROM_START( cmasterj )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mb1_hold__bet_all_stop.bin", 0x0000, 0x1000, CRC(5f168417) SHA1(7ba7fed94ce7211fa8cf6c2abe8dea4b44a22aee) )
+	ROM_CONTINUE(0x4000,0x1000)
+	ROM_CONTINUE(0x3000,0x1000)
+	ROM_CONTINUE(0x7000,0x1000)
+	ROM_CONTINUE(0x1000,0x1000)
+	ROM_CONTINUE(0x6000,0x1000)
+	ROM_CONTINUE(0x2000,0x1000)
+	ROM_CONTINUE(0x5000,0x1000)
+
+	ROM_REGION( 0x18000, "gfx1", 0 )
+	ROM_LOAD( "7.u16", 0x00000, 0x8000, CRC(19cc1d67) SHA1(47487f9362bfb36a32100ed772960628844462bf) )
+	ROM_LOAD( "6.u11", 0x08000, 0x8000, CRC(63b3df4e) SHA1(9bacd23da598805ec18ec5ad15cab95d71eb9262) )
+	ROM_LOAD( "5.u4",  0x10000, 0x8000, CRC(e39fff9c) SHA1(22fdc517fa478441622c6245cecb5728c5595757) )
+
+	ROM_REGION( 0x8000, "gfx2", 0 )
+	ROM_LOAD( "4.u15",  0x0000, 0x2000, CRC(8607ffd9) SHA1(9bc94715554aa2473ae2ed249a47f29c7886b3dc) )
+	ROM_LOAD( "3.u10",  0x2000, 0x2000, CRC(c32367be) SHA1(ff217021b9c58e23b2226f8b0a7f5da966225715) )
+	ROM_LOAD( "2.u14",  0x4000, 0x2000, CRC(6dfcb188) SHA1(22430429c798954d9d979e62699b58feae7fdbf4) )
+	ROM_LOAD( "1.u9",   0x6000, 0x2000, CRC(9678ead2) SHA1(e80aefa98b2363fe9e6b2415762695ace272e4d3) )
+
+	ROM_REGION( 0x10000, "user1", 0 )
+	ROM_LOAD( "8.u58",  0x0000, 0x10000, CRC(e92443d3) SHA1(4b6ca4521841610054165f085ae05510e77af191) )
+
+	ROM_REGION( 0x200, "proms", 0 )
+	ROM_LOAD( "prom1.u84", 0x0000, 0x0100, CRC(0489b760) SHA1(78f8632b17a76335183c5c204cdec856988368b0) )
+	ROM_LOAD( "prom2.u79", 0x0100, 0x0100, CRC(21eb5b19) SHA1(9b8425bdb97f11f4855c998c7792c3291fd07470) )
+
+	ROM_REGION( 0x100, "proms2", 0 )
+	ROM_LOAD( "prom3.u46", 0x0000, 0x0100, CRC(50ec383b) SHA1(ae95b92bd3946b40134bcdc22708d5c6b0f4c23e) )
+ROM_END
+
+ROM_START( cmasterk )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mb1_hold__take_all_stop.bin", 0x0000, 0x1000, CRC(4ffc137f) SHA1(0f080241fa9ded561324b0c602f80159f4683387) )
+	ROM_CONTINUE(0x4000,0x1000)
+	ROM_CONTINUE(0x3000,0x1000)
+	ROM_CONTINUE(0x7000,0x1000)
+	ROM_CONTINUE(0x1000,0x1000)
+	ROM_CONTINUE(0x6000,0x1000)
+	ROM_CONTINUE(0x2000,0x1000)
+	ROM_CONTINUE(0x5000,0x1000)
+
+	ROM_REGION( 0x18000, "gfx1", 0 )
+	ROM_LOAD( "7.u16", 0x00000, 0x8000, CRC(19cc1d67) SHA1(47487f9362bfb36a32100ed772960628844462bf) )
+	ROM_LOAD( "6.u11", 0x08000, 0x8000, CRC(63b3df4e) SHA1(9bacd23da598805ec18ec5ad15cab95d71eb9262) )
+	ROM_LOAD( "5.u4",  0x10000, 0x8000, CRC(e39fff9c) SHA1(22fdc517fa478441622c6245cecb5728c5595757) )
+
+	ROM_REGION( 0x8000, "gfx2", 0 )
+	ROM_LOAD( "4.u15",  0x0000, 0x2000, CRC(8607ffd9) SHA1(9bc94715554aa2473ae2ed249a47f29c7886b3dc) )
+	ROM_LOAD( "3.u10",  0x2000, 0x2000, CRC(c32367be) SHA1(ff217021b9c58e23b2226f8b0a7f5da966225715) )
+	ROM_LOAD( "2.u14",  0x4000, 0x2000, CRC(6dfcb188) SHA1(22430429c798954d9d979e62699b58feae7fdbf4) )
+	ROM_LOAD( "1.u9",   0x6000, 0x2000, CRC(9678ead2) SHA1(e80aefa98b2363fe9e6b2415762695ace272e4d3) )
+
+	ROM_REGION( 0x10000, "user1", 0 )
+	ROM_LOAD( "8.u58",  0x0000, 0x10000, CRC(e92443d3) SHA1(4b6ca4521841610054165f085ae05510e77af191) )
+
+	ROM_REGION( 0x200, "proms", 0 )
+	ROM_LOAD( "prom1.u84", 0x0000, 0x0100, CRC(0489b760) SHA1(78f8632b17a76335183c5c204cdec856988368b0) )
+	ROM_LOAD( "prom2.u79", 0x0100, 0x0100, CRC(21eb5b19) SHA1(9b8425bdb97f11f4855c998c7792c3291fd07470) )
+
+	ROM_REGION( 0x100, "proms2", 0 )
+	ROM_LOAD( "prom3.u46", 0x0000, 0x0100, CRC(50ec383b) SHA1(ae95b92bd3946b40134bcdc22708d5c6b0f4c23e) )
+ROM_END
+
+
 ROM_START( cmast99 )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "cm99-041-8.u81", 0x0000, 0x1000, CRC(5fb0800e) SHA1(14d316b7b89340c5b5c9fdd0b43d5810513b74d6) )
@@ -12278,6 +12410,35 @@
 	ROM_LOAD( "tbp18s030n.d12", 0x0000, 0x0020, BAD_DUMP CRC(6df3f972) SHA1(0096a7f7452b70cac6c0752cb62e24b643015b5c) )
 ROM_END
 
+ROM_START( lucky8l )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "w4_9.b14",  0x0000, 0x8000, CRC(4549e31f) SHA1(16d9537c25478ace4f002ef2784acf89038faa7f) ) // label should be w4(9) - same format for ROMs below
+
+	ROM_REGION( 0x18000, "gfx1", 0 )
+	ROM_LOAD( "w4_5.h7",  0x00000, 0x8000, CRC(994a9894) SHA1(4063c2c5e111f24a85df1665fd3f9fbb20fda4da) )
+	ROM_LOAD( "w4_6.h8",  0x08000, 0x8000, CRC(80888d64) SHA1(91ec96709df77c534d381e391839984a88aeb1e0) )
+	ROM_LOAD( "w4_7.h10", 0x10000, 0x8000, CRC(255d5860) SHA1(f171fde3d542594132b38b44300f750d45fb67a2) )
+
+	ROM_REGION( 0x8000, "gfx2", 0 )
+	ROM_LOAD( "w4_1.h1",  0x0000, 0x2000, CRC(b45f41e2) SHA1(890c94c802f5ada97bc73f5a7a09e69c3207966c) )
+	ROM_LOAD( "w4_2.h3",  0x2000, 0x2000, CRC(0463413a) SHA1(061b8335fdd44767e8c1832f5b5101276ad0f689) )
+	ROM_LOAD( "w4_3.h4",  0x4000, 0x2000, CRC(6be213c8) SHA1(bf5a002961b0827581cbab4249321ae5b51316f0) )
+	ROM_LOAD( "w4_4.h6",  0x6000, 0x2000, CRC(0a25964b) SHA1(d41eda201bb01229fb6e2ff437196dd65eebe577) )
+
+	ROM_REGION( 0x2000, "proms", 0 )
+	ROM_LOAD( "w4.g14", 0x0000, 0x2000, CRC(27f533be) SHA1(bffa6adecf814f4d4675907905960aad0de42969) ) // 57C49B-35, had its own little circuit board to convert it to fit in a 16 pin IC - silkscreend T82S129
+	ROM_COPY( "proms",  0x1800, 0x0000, 0x0100 )
+
+	ROM_REGION( 0x117, "proms2", 0 )
+	ROM_LOAD( "w4.d13", 0x0000, 0x0117, CRC(37173040) SHA1(bc561cf7cb11c3a1b2677b14779ce2957e3b778d) ) // GAL16V8D
+
+	ROM_REGION( 0x2000, "unkprom", 0 )
+	ROM_LOAD( "w4.f3",   0x0000, 0x2000, CRC(439022fd) SHA1(3b7ff474cb1eb45f14c9587a510446cafdf17d58) ) // 57C49B-35, had its own little circuit board to convert it to fit in a 16 pin IC - silkscreend T82S129
+	ROM_COPY( "unkprom", 0x1800, 0x0000, 0x0100 )
+
+	ROM_REGION( 0x117, "unkprom2", 0 )
+	ROM_LOAD( "w4.d12", 0x0000, 0x0117, CRC(41b55fb0) SHA1(f31a31dc2c0789d08957785e8c8f804690133450) ) // GAL16V8D
+ROM_END
 
 /*
   New Lucky 8 Lines / New Super 8 Lines.
@@ -15690,6 +15851,40 @@
 	ROM_LOAD( "chu1920.bin", 0x0000, 0x0100, BAD_DUMP CRC(71b0e11d) SHA1(1d2a2a31d8571f580c0cb7f4833823841072b31f) )
 ROM_END
 
+ROM_START( noved )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "w27c512 winbond eeprom u53.bin", 0x02000, 0x1000, CRC(46b91997) SHA1(8edd36c25cf3a8a77b170a3c7fca14d57c7a7e4c) ) // ok
+	ROM_CONTINUE(0x6000, 0x1000)
+	ROM_CONTINUE(0x4000, 0x1000)
+	ROM_CONTINUE(0x0000, 0x1000)
+	ROM_CONTINUE(0x5000, 0x1000)
+	ROM_CONTINUE(0x3000, 0x1000)
+	ROM_CONTINUE(0x7000, 0x1000)
+	ROM_CONTINUE(0x1000, 0x1000)
+	ROM_CONTINUE(0x8000, 0x8000)
+
+	ROM_REGION( 0x10000, "user1", ROMREGION_ERASEFF )
+
+	ROM_REGION( 0x18000, "gfx1", 0 )
+	ROM_LOAD( "w29c020 winbond flash u20.bin", 0x10000, 0x08000, CRC(ad4faff8) SHA1(1ab37486c1cc7f961959cf5a0a3e8daba89f68e9) ) // 1ST AND 2ND HALF IDENTICAL
+	ROM_CONTINUE( 0x10000, 0x8000 ) // identical to the above 0x8000
+	ROM_CONTINUE( 0x08000, 0x8000 )
+	ROM_CONTINUE( 0x00000, 0x8000 )
+	ROM_IGNORE(           0x20000 )
+
+	ROM_REGION( 0x8000, "gfx2", 0 )
+	ROM_LOAD( "w27c512 winbond eeprom u27.bin", 0x00000, 0x08000, CRC(8a98dfab) SHA1(3c850d1a212295aef5922547c11712a59c1ba5f8) ) // 1ST AND 2ND HALF IDENTICAL
+	ROM_IGNORE( 0x8000 )
+
+	// taken from new fruit bonus '96, might be wrong
+	ROM_REGION( 0x200, "proms", 0 ) // palette
+	ROM_LOAD( "chu19.bin", 0x0000, 0x0100, BAD_DUMP CRC(fafc43ad) SHA1(e94592b83f19e5f9b6205473c1e06b36405ebfc2) )
+	ROM_LOAD( "chu20.bin", 0x0100, 0x0100, BAD_DUMP CRC(05224f73) SHA1(051c3ee9c63f5436e4f6c355fc308f37910a88ef) )
+
+	ROM_REGION( 0x100, "proms2", 0 ) // colours again?
+	ROM_LOAD( "w27c512 winbond eeprom u57.bin", 0x00000, 0x100, CRC(84256478) SHA1(90c1abe26487682712d4514b113311400bf37ff3) ) // BADADDR        --------xxxxxxxx
+	ROM_IGNORE( 0x0ff00 )
+ROM_END
 
 ROM_START( nfm )
 	ROM_REGION( 0x10000, "maincpu", 0 )
@@ -18370,6 +18565,20 @@
 	}
 }
 
+void wingco_state::init_lucky8l()
+{
+	// rearrange the 57C49B-35 contents to what MAME expects
+	uint8_t *proms = memregion("proms")->base();
+
+	for (uint8_t i = 0; i < 0x80; i++)
+	{
+		uint8_t bits74 = proms[i] >> 4;
+		uint8_t bits30 = proms[i] & 0x0f;
+		proms[i] = bits30;
+		proms[i + 0x100] = bits74;
+	}
+}
+
 void wingco_state::init_super972()
 {
 	uint8_t *rom = memregion("maincpu")->base();
@@ -18378,7 +18587,7 @@
 		m_decrypted_opcodes[i] = rom [i];
 
 	for (int i = 0xc000; i < 0xe000; i++)
-		m_decrypted_opcodes[i] = bitswap<8>(m_decrypted_opcodes[i], 7, 4, 5, 6, 3, 0, 1, 2);;
+		m_decrypted_opcodes[i] = bitswap<8>(m_decrypted_opcodes[i], 7, 4, 5, 6, 3, 0, 1, 2);
 
 	for (int i = 0xc000; i < 0xe000; i++)
 		rom[i] = bitswap<8>(rom[i], 7, 2, 5, 0, 3, 6, 1, 4);
@@ -19131,6 +19340,9 @@
 GAMEL( 1991, cmasterf,  cmaster,  cm,       cmasterb, cmaster_state,  init_cmv4,      ROT0, "Dyna",              "Cherry Master I (ver.1.01, set 7)",           0,                 layout_cmasterb )
 GAMEL( 1991, cmasterg,  cmaster,  cm,       cmasterg, cmaster_state,  init_cmv4,      ROT0, "Dyna",              "Cherry Master I (ver.1.01, set 8, V4-B-)",    0,                 layout_cmasterb )
 GAMEL( 1991, cmasterh,  cmaster,  cm,       cmasterh, cmaster_state,  init_cmv4,      ROT0, "Dyna",              "Cherry Master I (ver.1.10)",                  0,                 layout_cmasterb )
+GAMEL( 1991, cmasteri,  cmaster,  cm,       cmasterb, cmaster_state,  init_cmv4,      ROT0, "Dyna",              "Cherry Master I (ver.1.01, set 9)",           0,                 layout_cmasterb ) // NMC27CP128Q being 32k x8 instead of 16k x8...
+GAMEL( 1991, cmasterj,  cmaster,  cm,       cmasterb, cmaster_state,  init_cmv4,      ROT0, "Dyna",              "Cherry Master I (ver.1.01, set 10, BET stops all)",  0,          layout_cmasterb )
+GAMEL( 1991, cmasterk,  cmaster,  cm,       cmasterb, cmaster_state,  init_cmv4,      ROT0, "Dyna",              "Cherry Master I (ver.1.01, set 11, TAKE stops all)", 0,          layout_cmasterb )
 GAMEL( 199?, super7,    cmaster,  cm,       cmaster,  cmaster_state,  init_super7,    ROT0, "bootleg",           "Super Seven",                                 MACHINE_NOT_WORKING, layout_cmasterb )
 GAME ( 199?, wcat3a,    wcat3,    chryangl, cmaster,  cmaster_state,  init_wcat3a,    ROT0, "E.A.I.",            "Wild Cat 3 (CMV4 hardware)",                  MACHINE_NOT_WORKING ) // does not boot. Wrong decryption, wrong machine or wrong what?
 
@@ -19166,6 +19378,7 @@
 GAMEL( 1989, lucky8i,   lucky8,   lucky8,   lucky8,   wingco_state,   empty_init,     ROT0, "Eagle/Wing",        "New Lucky 8 Lines (set 9, W-4, Eagle, licensed by Wing)",  0,                     layout_lucky8 )    // 2 control sets...
 GAMEL( 199?, lucky8j,   lucky8,   lucky8,   lucky8,   wingco_state,   empty_init,     ROT0, "<unknown>",         "New Lucky 8 Lines Crown Turbo (Hack)",                     MACHINE_NOT_WORKING,   layout_lucky8 )    // 2 control sets...
 GAMEL( 1989, lucky8k,   lucky8,   lucky8k,  lucky8,   wingco_state,   empty_init,     ROT0, "Wing Co., Ltd.",    "New Lucky 8 Lines (set 10, W-4, encrypted NEC D315-5136)", 0,                     layout_lucky8 )    // 2 control sets...
+GAMEL( 1989, lucky8l,   lucky8,   lucky8,   lucky8,   wingco_state,   init_lucky8l,   ROT0, "Wing Co., Ltd.",    "New Lucky 8 Lines (set 11, W-4)",                          MACHINE_WRONG_COLORS,  layout_lucky8 )    // uses a strange mix of PLDs and PROMs for colors
 GAMEL( 198?, ns8lines,  0,        lucky8,   lucky8b,  wingco_state,   empty_init,     ROT0, "<unknown>",         "New Lucky 8 Lines / New Super 8 Lines (W-4)",              0,                     layout_lucky8p1 )  // only 1 control set...
 GAMEL( 1985, ns8linesa, ns8lines, lucky8,   lucky8b,  wingco_state,   empty_init,     ROT0, "Yamate (bootleg)",  "New Lucky 8 Lines / New Super 8 Lines (W-4, Lucky97 HW)",  0,                     layout_lucky8p1 )  // only 1 control set...
 GAMEL( 198?, ns8linew,  ns8lines, lucky8,   ns8linew, wingco_state,   empty_init,     ROT0, "<unknown>",         "New Lucky 8 Lines / New Super 8 Lines (F-5, Witch Bonus)", 0,                     layout_lucky8 )    // 2 control sets...
@@ -19268,13 +19481,14 @@
 /* these all appear to be graphic hacks of 'New Fruit Bonus '96', they can run with the same program rom
    some sets are messy and appear to have mismatched graphic roms, they need to be sorted out properly
 */
-/*    YEAR  NAME       PARENT    MACHINE   INPUT      STATE           INIT            ROT    COMPANY    FULLNAME                                                                   FLAGS  */
-GAME( 1996, nfb96se,   nfb96,    amcoe2,   nfb96bl,   cmaster_state,  empty_init,     ROT0, "bootleg", "New Fruit Bonus '96 Special Edition (bootleg set 1, v97-3.3c Portuguese)", 0 )
-GAME( 1996, nfb96sea,  nfb96,    amcoe2,   nfb96bl,   cmaster_state,  init_nfb96sea,  ROT0, "bootleg", "New Fruit Bonus '96 Special Edition (bootleg set 2, v97-3.3c English)",    MACHINE_WRONG_COLORS ) // encrypted program
-GAME( 1996, nfb96seb,  nfb96,    amcoe2,   nfb96bl,   cmaster_state,  empty_init,     ROT0, "bootleg", "New Fruit Bonus '96 Special Edition (bootleg set 3, v97-3.3c Portuguese)", MACHINE_WRONG_COLORS )
-GAME( 1996, nfb96sec,  nfb96,    amcoe2,   nfb96bl,   cmaster_state,  empty_init,     ROT0, "bootleg", "New Fruit Bonus '96 Special Edition (bootleg set 4, v97-3.3c English)",    MACHINE_WRONG_COLORS )
-GAME( 2002, carb2002,  nfb96,    amcoe2,   nfb96bl,   cmaster_state,  empty_init,     ROT0, "bootleg", "Carriage Bonus 2002 (bootleg)",                                            MACHINE_WRONG_COLORS )
-GAME( 2003, carb2003,  nfb96,    amcoe2,   nfb96bl,   cmaster_state,  empty_init,     ROT0, "bootleg", "Carriage Bonus 2003 (bootleg)",                                            MACHINE_WRONG_COLORS )
+/*    YEAR  NAME       PARENT    MACHINE   INPUT      STATE           INIT            ROT   COMPANY          FULLNAME                                                                    FLAGS  */
+GAME( 1996, nfb96se,   nfb96,    amcoe2,   nfb96bl,   cmaster_state,  empty_init,     ROT0, "bootleg",       "New Fruit Bonus '96 Special Edition (bootleg set 1, v97-3.3c Portuguese)", 0 )
+GAME( 1996, nfb96sea,  nfb96,    amcoe2,   nfb96bl,   cmaster_state,  init_nfb96sea,  ROT0, "bootleg",       "New Fruit Bonus '96 Special Edition (bootleg set 2, v97-3.3c English)",    MACHINE_WRONG_COLORS ) // encrypted program
+GAME( 1996, nfb96seb,  nfb96,    amcoe2,   nfb96bl,   cmaster_state,  empty_init,     ROT0, "bootleg",       "New Fruit Bonus '96 Special Edition (bootleg set 3, v97-3.3c Portuguese)", MACHINE_WRONG_COLORS )
+GAME( 1996, nfb96sec,  nfb96,    amcoe2,   nfb96bl,   cmaster_state,  empty_init,     ROT0, "bootleg",       "New Fruit Bonus '96 Special Edition (bootleg set 4, v97-3.3c English)",    MACHINE_WRONG_COLORS )
+GAME( 2002, carb2002,  nfb96,    amcoe2,   nfb96bl,   cmaster_state,  empty_init,     ROT0, "bootleg",       "Carriage Bonus 2002 (bootleg)",                                            MACHINE_WRONG_COLORS )
+GAME( 2003, carb2003,  nfb96,    amcoe2,   nfb96bl,   cmaster_state,  empty_init,     ROT0, "bootleg",       "Carriage Bonus 2003 (bootleg)",                                            MACHINE_WRONG_COLORS )
+GAME( 2006, noved,     nfb96,    amcoe2,   nfb96bl,   cmaster_state,  empty_init,     ROT0, "bootleg (Kon)", "Nove Diamante (bootleg)",                                                  MACHINE_NOT_WORKING ) // needs correct gfx2 region decode, controls, etc
 
 GAME( 2003, nfm,       0,        nfm,      nfm,       cmaster_state,  empty_init,     ROT0, "Ming-Yang Electronic", "New Fruit Machine (Ming-Yang Electronic, vFB02-07A)",         MACHINE_NOT_WORKING ) // vFB02-07A "Copyright By Ms. Liu Orchis 2003/03/06", needs correct PROM and USER1 regions decode
 GAME( 2003, nfma,      nfm,      nfm,      nfm,       cmaster_state,  empty_init,     ROT0, "Ming-Yang Electronic", "New Fruit Machine (Ming-Yang Electronic, vFB02-01A)",         MACHINE_NOT_WORKING ) // vFB02-01A "Copyright By Ms. Liu Orchis 2003/03/06", needs correct PROM and USER1 regions decode
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/gotcha.cpp mame-0.224+dfsg.1/src/mame/drivers/gotcha.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/gotcha.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/gotcha.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -8,12 +8,10 @@
 
 TODO:
 - Find out what the "Explane Type" dip switch actually does.
-- Should use the artwork system to show the lamp state: there are 12 lamps, one
-  for every button, and they are used a lot during the game (see gotcha_lamps_w).
 - Unknown writes to 0x30000c. It changes for some levels, it's probably
   gfx related but since everything seems fine I've no idea what it might do.
-- Unknown sound writes at C00F; also, there's an NMI handler that would
-  read from C00F.
+- Unknown sound writes at c00f; also, there's an NMI handler that would
+  read from c00f.
 - Sound samples were getting chopped; I fixed this by changing sound/adpcm.cpp to
   disregard requests to play new samples until the previous one is finished*.
 
@@ -75,7 +73,7 @@
 #include "gotcha.lh"
 
 
-void gotcha_state::gotcha_lamps_w(uint16_t data)
+void gotcha_state::lamps_w(uint16_t data)
 {
 	for (int p = 0; p < 3; p++)
 	{
@@ -86,30 +84,30 @@
 	}
 }
 
-void gotcha_state::gotcha_oki_bank_w(uint8_t data)
+void gotcha_state::oki_bank_w(uint8_t data)
 {
 	m_oki->set_rom_bank(!BIT(data, 0));
 }
 
 
-void gotcha_state::gotcha_map(address_map &map)
+void gotcha_state::main_map(address_map &map)
 {
 	map(0x000000, 0x07ffff).rom();
 	map(0x100001, 0x100001).w("soundlatch", FUNC(generic_latch_8_device::write));
-	map(0x100002, 0x100003).w(FUNC(gotcha_state::gotcha_lamps_w));
-	map(0x100004, 0x100004).w(FUNC(gotcha_state::gotcha_oki_bank_w));
+	map(0x100002, 0x100003).w(FUNC(gotcha_state::lamps_w));
+	map(0x100004, 0x100004).w(FUNC(gotcha_state::oki_bank_w));
 	map(0x120000, 0x12ffff).ram();
 	map(0x140000, 0x1405ff).ram().w("palette", FUNC(palette_device::write16)).share("palette");
-	map(0x160000, 0x1607ff).ram().share("spriteram");
+	map(0x160000, 0x1607ff).ram().share(m_spriteram);
 	map(0x180000, 0x180001).portr("INPUTS");
 	map(0x180002, 0x180003).portr("SYSTEM");
 	map(0x180004, 0x180005).portr("DSW");
-	map(0x300000, 0x300001).w(FUNC(gotcha_state::gotcha_gfxbank_select_w));
-	map(0x300002, 0x300009).w(FUNC(gotcha_state::gotcha_scroll_w));
-//  { 0x30000c, 0x30000d,
-	map(0x30000e, 0x30000f).w(FUNC(gotcha_state::gotcha_gfxbank_w));
-	map(0x320000, 0x320fff).w(FUNC(gotcha_state::gotcha_fgvideoram_w)).share("fgvideoram");
-	map(0x322000, 0x322fff).w(FUNC(gotcha_state::gotcha_bgvideoram_w)).share("bgvideoram");
+	map(0x300000, 0x300000).w(FUNC(gotcha_state::gfxbank_select_w));
+	map(0x300002, 0x300009).w(FUNC(gotcha_state::scroll_w));
+//  map(0x30000c, 0x30000d).
+	map(0x30000e, 0x30000e).w(FUNC(gotcha_state::gfxbank_w));
+	map(0x320000, 0x320fff).w(FUNC(gotcha_state::fgvideoram_w)).share(m_fgvideoram);
+	map(0x322000, 0x322fff).w(FUNC(gotcha_state::bgvideoram_w)).share(m_bgvideoram);
 }
 
 
@@ -229,8 +227,8 @@
 };
 
 static GFXDECODE_START( gfx_gotcha )
-	GFXDECODE_ENTRY( "gfx1", 0, tilelayout,   0x100, 32 )
-	GFXDECODE_ENTRY( "gfx2", 0, spritelayout, 0x000, 16 )
+	GFXDECODE_ENTRY( "tiles", 0, tilelayout, 0x100, 32 )
+	GFXDECODE_ENTRY( "sprites", 0, spritelayout, 0x000, 16 )
 GFXDECODE_END
 
 
@@ -249,9 +247,7 @@
 
 void gotcha_state::machine_reset()
 {
-	int i;
-
-	for (i = 0; i < 4; i++)
+	for (int i = 0; i < 4; i++)
 	{
 		m_gfxbank[i] = 0;
 		m_scroll[i] = 0;
@@ -262,20 +258,20 @@
 
 void gotcha_state::gotcha(machine_config &config)
 {
-	/* basic machine hardware */
-	M68000(config, m_maincpu, 14.318181_MHz_XTAL);    /* 14.31818 MHz */
-	m_maincpu->set_addrmap(AS_PROGRAM, &gotcha_state::gotcha_map);
+	// basic machine hardware
+	M68000(config, m_maincpu, 14.318181_MHz_XTAL);
+	m_maincpu->set_addrmap(AS_PROGRAM, &gotcha_state::main_map);
 
-	Z80(config, m_audiocpu, 6_MHz_XTAL);   /* 6 MHz */
+	Z80(config, m_audiocpu, 6_MHz_XTAL);
 	m_audiocpu->set_addrmap(AS_PROGRAM, &gotcha_state::sound_map);
 
-	/* video hardware */
+	// video hardware
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(55);
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
 	screen.set_size(40*8, 32*8);
 	screen.set_visarea(0*8, 40*8-1, 1*8, 31*8-1);
-	screen.set_screen_update(FUNC(gotcha_state::screen_update_gotcha));
+	screen.set_screen_update(FUNC(gotcha_state::screen_update));
 	screen.set_palette("palette");
 	screen.screen_vblank().set_inputline(m_maincpu, M68K_IRQ_6, HOLD_LINE);
 	screen.screen_vblank().append_inputline(m_audiocpu, INPUT_LINE_NMI); // ?
@@ -289,7 +285,7 @@
 	m_sprgen->set_offsets(5, -1); // aligned to 2nd instruction screen in attract
 	m_sprgen->set_gfxdecode_tag(m_gfxdecode);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 
 	GENERIC_LATCH_8(config, "soundlatch");
@@ -318,7 +314,7 @@
 	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "gotcha_u.z02", 0x0000, 0x10000, CRC(f4f6e16b) SHA1(a360c571bee7391c66e98e5e111e78ac9732390e) )
 
-	ROM_REGION( 0x200000, "gfx1", 0 )
+	ROM_REGION( 0x200000, "tiles", 0 )
 	ROM_LOAD( "gotcha-u.42a", 0x000000, 0x20000, CRC(4ea822f0) SHA1(5b25d4c80138d9a0f3d481fa0c2f3665772bc0c8) )
 	ROM_CONTINUE(             0x100000, 0x20000 )
 	ROM_CONTINUE(             0x020000, 0x20000 )
@@ -336,7 +332,7 @@
 	ROM_CONTINUE(             0x0e0000, 0x20000 )
 	ROM_CONTINUE(             0x1e0000, 0x20000 )
 
-	ROM_REGION( 0x200000, "gfx2", 0 )
+	ROM_REGION( 0x200000, "sprites", 0 )
 	ROM_LOAD( "gotcha.u56",   0x000000, 0x80000, CRC(85f6a062) SHA1(77d1c9c8394af0c487fa6d657ae740eae940682a) )
 	ROM_LOAD( "gotcha.u55",   0x080000, 0x80000, CRC(426b4e48) SHA1(91e79c9fd1f9cf84df8e1d6b67780d1cacd4a0f2) )
 	ROM_LOAD( "gotcha.u54",   0x100000, 0x80000, CRC(903e05a4) SHA1(4fb675958f4dc057f8da7edff1f6680482bdc5dd) )
@@ -354,7 +350,7 @@
 	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "uz02", 0x00000, 0x10000, CRC(f4f6e16b) SHA1(a360c571bee7391c66e98e5e111e78ac9732390e) )
 
-	ROM_REGION( 0x200000, "gfx1", 0 )
+	ROM_REGION( 0x200000, "tiles", 0 )
 	ROM_LOAD( "u42a",         0x000000, 0x20000, CRC(f0b521d1) SHA1(fe44bfa13818eee08d112c2f75e14bfd67bbefbf) )
 	ROM_CONTINUE(             0x100000, 0x20000 )
 	ROM_CONTINUE(             0x020000, 0x20000 )
@@ -372,7 +368,7 @@
 	ROM_CONTINUE(             0x0e0000, 0x20000 )
 	ROM_CONTINUE(             0x1e0000, 0x20000 )
 
-	ROM_REGION( 0x200000, "gfx2", 0 )
+	ROM_REGION( 0x200000, "sprites", 0 )
 	ROM_LOAD( "u56", 0x000000, 0x80000, CRC(160e46b3) SHA1(e2bec3388d41afb9f1025d66c15fcc6ca4d40703) )
 	ROM_LOAD( "u55", 0x080000, 0x80000, CRC(7351b61c) SHA1(2ef3011a7a1ff253f45186e46cfdce5f4ef17322) )
 	ROM_LOAD( "u54", 0x100000, 0x80000, CRC(a3d8c5ef) SHA1(f59874844934f3ce76a49e4a9618510537378387) )
@@ -390,7 +386,7 @@
 	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "uz02", 0x00000, 0x10000, CRC(f4f6e16b) SHA1(a360c571bee7391c66e98e5e111e78ac9732390e) )
 
-	ROM_REGION( 0x200000, "gfx1", 0 )
+	ROM_REGION( 0x200000, "tiles", 0 )
 	ROM_LOAD( "u42a",         0x000000, 0x20000, CRC(f0b521d1) SHA1(fe44bfa13818eee08d112c2f75e14bfd67bbefbf) )
 	ROM_CONTINUE(             0x100000, 0x20000 )
 	ROM_CONTINUE(             0x020000, 0x20000 )
@@ -408,7 +404,7 @@
 	ROM_CONTINUE(             0x0e0000, 0x20000 )
 	ROM_CONTINUE(             0x1e0000, 0x20000 )
 
-	ROM_REGION( 0x200000, "gfx2", 0 )
+	ROM_REGION( 0x200000, "sprites", 0 )
 	ROM_LOAD( "u56", 0x000000, 0x80000, CRC(160e46b3) SHA1(e2bec3388d41afb9f1025d66c15fcc6ca4d40703) )
 	ROM_LOAD( "u55", 0x080000, 0x80000, CRC(7351b61c) SHA1(2ef3011a7a1ff253f45186e46cfdce5f4ef17322) )
 	ROM_LOAD( "u54", 0x100000, 0x80000, CRC(a3d8c5ef) SHA1(f59874844934f3ce76a49e4a9618510537378387) )
@@ -418,6 +414,6 @@
 	ROM_LOAD( "uz11", 0x00000, 0x80000, CRC(3d96274c) SHA1(c7a670af86194c370bf8fb30afbe027ab78a0227) )
 ROM_END
 
-GAMEL( 1997, gotcha,   0,      gotcha, gotcha, gotcha_state, empty_init, ROT0, "Dongsung / Para", "Got-cha Mini Game Festival",                   MACHINE_SUPPORTS_SAVE, layout_gotcha )
+GAMEL( 1997, gotcha,   0,      gotcha, gotcha, gotcha_state, empty_init, ROT0, "Dongsung / Para", "Got-cha Mini Game Festival",                          MACHINE_SUPPORTS_SAVE, layout_gotcha )
 GAMEL( 1997, ppchamp,  gotcha, gotcha, gotcha, gotcha_state, empty_init, ROT0, "Dongsung / Para", "Pasha Pasha Champ Mini Game Festival (Korea, set 1)", MACHINE_SUPPORTS_SAVE, layout_gotcha )
 GAMEL( 1997, ppchampa, gotcha, gotcha, gotcha, gotcha_state, empty_init, ROT0, "Dongsung / Para", "Pasha Pasha Champ Mini Game Festival (Korea, set 2)", MACHINE_SUPPORTS_SAVE, layout_gotcha )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/gticlub.cpp mame-0.224+dfsg.1/src/mame/drivers/gticlub.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/gticlub.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/gticlub.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -461,7 +461,7 @@
 	{
 		case 0:
 		case 1:
-			m_pcb_digit[offset] = bitswap<8>(~data,7,0,1,2,3,4,5,6) & 0x7f;
+			m_pcb_digit[offset] = bitswap<7>(~data,0,1,2,3,4,5,6);
 			break;
 
 		case 3:
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/guab.cpp mame-0.224+dfsg.1/src/mame/drivers/guab.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/guab.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/guab.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -18,14 +18,9 @@
         * Treasure Trail?
 
     Known issues:
-        * Neither game registers coins and I can't find where the credit
-          count gets updated in the code. Each game requires a unique
-          security PAL - maybe this is related? I'm poking the coin values
-          directly into RAM for now.
-        * Game hangs when nothing is connected to the first ACIA when
-          you try to 'collect' cash
+        * Coin data has to go through the datalogger to be counted
         * Verify WD FDC type
-        * Hook up ACIA properly
+        * Hook up ACIA properly, clocks etc.
         * Hook up watchdog NMI
         * Verify clocks
         * Use real video timings
@@ -33,24 +28,21 @@
 
     Notes:
         * Toggle both 'Back door' and 'Key switch' to enter test mode
+        * Opening the back door will disable coinup
         * Video hardware seems to match JPM System 5
         * IRQ 1 inits the PPIs, IRQ 2 does nothing
-        * Values send to the first ACIA serial port:
-          - Game ID: "JPMNA305v.." (guab) or "..JPMNN101}" (tenup)
-          - Coin 1-4: 1-4
-          - Game start: /
-          - Collect: D
 
 ***************************************************************************/
 
 #include "emu.h"
 
 #include "cpu/m68000/m68000.h"
-#include "bus/rs232/rs232.h"
 #include "formats/guab_dsk.h"
 #include "imagedev/floppy.h"
 #include "machine/6840ptm.h"
 #include "machine/6850acia.h"
+#include "machine/bacta_datalogger.h"
+
 #include "machine/clock.h"
 #include "machine/i8255.h"
 #include "machine/wd_fdc.h"
@@ -87,8 +79,6 @@
 
 	void guab(machine_config &config);
 
-	DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
-
 protected:
 	virtual void machine_start() override;
 
@@ -110,7 +100,6 @@
 	uint8_t watchdog_r();
 	void watchdog_w(uint8_t data);
 
-
 	DECLARE_FLOPPY_FORMATS(floppy_formats);
 
 	void guab_map(address_map &map);
@@ -147,6 +136,7 @@
 	map(0x0c00e0, 0x0c00e7).rw(m_fdc, FUNC(wd1773_device::read), FUNC(wd1773_device::write)).umask16(0x00ff);
 	map(0x080000, 0x080fff).ram();
 	map(0x100001, 0x100001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w));
+	map(0x100002, 0x100003).nopr(); // uses a clr instruction on address which generates a dummy read
 	map(0x100003, 0x100003).w("ef9369", FUNC(ef9369_device::address_w));
 	map(0x800000, 0xb0ffff).rw(FUNC(guab_state::tms34061_r), FUNC(guab_state::tms34061_w));
 	map(0xb10000, 0xb1ffff).ram();
@@ -161,8 +151,8 @@
 
 static INPUT_PORTS_START( guab )
 	PORT_START("IN0")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )   PORT_NAME("50p") PORT_CHANGED_MEMBER(DEVICE_SELF, guab_state,coin_inserted, 50)
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 )   PORT_NAME("100p") PORT_CHANGED_MEMBER(DEVICE_SELF, guab_state,coin_inserted, 100)
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )   PORT_NAME("50p")
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 )   PORT_NAME("100p")
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Back door") PORT_CODE(KEYCODE_R) PORT_TOGGLE
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Cash door") PORT_CODE(KEYCODE_T) PORT_TOGGLE
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Key switch") PORT_CODE(KEYCODE_Y) PORT_TOGGLE
@@ -187,14 +177,14 @@
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("C")
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("D")
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )   PORT_NAME("10p") PORT_CHANGED_MEMBER(DEVICE_SELF, guab_state,coin_inserted, 10)
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )   PORT_NAME("20p") PORT_CHANGED_MEMBER(DEVICE_SELF, guab_state,coin_inserted, 20)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )   PORT_NAME("10p")
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )   PORT_NAME("20p")
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( tenup )
 	PORT_START("IN0")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )   PORT_NAME("50p") PORT_CHANGED_MEMBER(DEVICE_SELF, guab_state,coin_inserted, 50)
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 )   PORT_NAME("100p") PORT_CHANGED_MEMBER(DEVICE_SELF, guab_state,coin_inserted, 100)
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN3 )   PORT_NAME("50p")
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN4 )   PORT_NAME("100p")
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Back door") PORT_CODE(KEYCODE_R) PORT_TOGGLE
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Cash door") PORT_CODE(KEYCODE_T) PORT_TOGGLE
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Key switch") PORT_CODE(KEYCODE_Y) PORT_TOGGLE
@@ -219,8 +209,8 @@
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("A")
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("B")
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("C")
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )   PORT_NAME("10p")  PORT_CHANGED_MEMBER(DEVICE_SELF, guab_state,coin_inserted, 10)
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )   PORT_NAME("20p")  PORT_CHANGED_MEMBER(DEVICE_SELF, guab_state,coin_inserted, 20)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )   PORT_NAME("10p")
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )   PORT_NAME("20p")
 INPUT_PORTS_END
 
 
@@ -349,20 +339,6 @@
 //**************************************************************************
 //  INPUTS/OUTPUTS
 //**************************************************************************
-
-INPUT_CHANGED_MEMBER( guab_state::coin_inserted )
-{
-	if (newval == 0)
-	{
-		uint32_t credit;
-		address_space &space = m_maincpu->space(AS_PROGRAM);
-
-		/* Get the current credit value and add the new coin value */
-		credit = space.read_dword(0x8002c) + param;
-		space.write_dword(0x8002c, credit);
-	}
-}
-
 void guab_state::output1_w(uint8_t data)
 {
 	m_leds[0] = BIT(data, 0); // cash in (ten up: cash in)
@@ -435,15 +411,6 @@
 	m_leds[47] = BIT(data, 7);
 }
 
-static DEVICE_INPUT_DEFAULTS_START( acia_1_rs232_defaults )
-	DEVICE_INPUT_DEFAULTS("RS232_TXBAUD", 0xff, RS232_BAUD_9600)
-	DEVICE_INPUT_DEFAULTS("RS232_RXBAUD", 0xff, RS232_BAUD_9600)
-	DEVICE_INPUT_DEFAULTS("RS232_STARTBITS", 0xff, RS232_STARTBITS_1)
-	DEVICE_INPUT_DEFAULTS("RS232_DATABITS", 0xff, RS232_DATABITS_8)
-	DEVICE_INPUT_DEFAULTS("RS232_PARITY", 0xff, RS232_PARITY_ODD)
-	DEVICE_INPUT_DEFAULTS("RS232_STOPBITS", 0xff, RS232_STOPBITS_1)
-DEVICE_INPUT_DEFAULTS_END
-
 
 //**************************************************************************
 //  AUDIO
@@ -494,6 +461,7 @@
 	screen.set_screen_update(FUNC(guab_state::screen_update_guab));
 	screen.set_palette(m_palette);
 
+
 	PALETTE(config, m_palette).set_entries(ef9369_device::NUMCOLORS);
 
 	EF9369(config, "ef9369").set_color_update_callback(FUNC(guab_state::ef9369_color_update));
@@ -536,17 +504,15 @@
 	ppi4.in_pc_callback().set(FUNC(guab_state::watchdog_r));
 	ppi4.out_pc_callback().set(FUNC(guab_state::watchdog_w));
 
+	bacta_datalogger_device &bacta(BACTA_DATALOGGER(config, "bacta", 0));
+
 	acia6850_device &acia1(ACIA6850(config, "acia6850_1", 0));
-	acia1.txd_handler().set("rs232_1", FUNC(rs232_port_device::write_txd));
-	acia1.rts_handler().set("rs232_1", FUNC(rs232_port_device::write_rts));
+	acia1.txd_handler().set("bacta", FUNC(bacta_datalogger_device::write_txd));
 	acia1.irq_handler().set_inputline("maincpu", 4);
 
-	rs232_port_device &rs232(RS232_PORT(config, "rs232_1", default_rs232_devices, nullptr));
-	rs232.rxd_handler().set("acia6850_1", FUNC(acia6850_device::write_rxd));
-	rs232.cts_handler().set("acia6850_1", FUNC(acia6850_device::write_cts));
-	rs232.set_option_device_input_defaults("keyboard", DEVICE_INPUT_DEFAULTS_NAME(acia_1_rs232_defaults));
+	bacta.rxd_handler().set("acia6850_1", FUNC(acia6850_device::write_rxd));
 
-	clock_device &acia_clock(CLOCK(config, "acia_clock", 153600)); // source? the ptm doesn't seem to output any common baud values
+	clock_device &acia_clock(CLOCK(config, "acia_clock", 19200)); // source? the ptm doesn't seem to output any common baud values
 	acia_clock.signal_handler().set("acia6850_1", FUNC(acia6850_device::write_txc));
 	acia_clock.signal_handler().append("acia6850_1", FUNC(acia6850_device::write_rxc));
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/harddriv.cpp mame-0.224+dfsg.1/src/mame/drivers/harddriv.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/harddriv.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/harddriv.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4058,6 +4058,57 @@
 	ROM_LOAD( "racedrivc.210e",  0x000000, 0x000800, CRC(2e843742) SHA1(bc73ab0270cdf45aaa1a19703e8c3aa916578ef0) )
 ROM_END
 
+ROM_START( racedrivcp ) // This came from a factory RD compact cabinet. There's a "Property of Pepsi-cola" label inside the coin door. Most notable difference is it has selectable multi-screen settings available in the test mode. So you could build your own compact Panorama theoretically.
+	ROM_REGION( 0x100000, "mainpcb:maincpu", 0 )        // 1MB for 68000 code
+	ROM_LOAD16_BYTE( "msync_gsp_tst_hi_1902_9-13-90.200r", 0x000000, 0x010000, CRC(57f1b268) SHA1(a32f32819ca31356cd3fa4bd0d048cde853c64db) ) // all of these had hand written labels
+	ROM_LOAD16_BYTE( "msync_gsp_tst_lo_f201_9-13-90.210r", 0x000001, 0x010000, BAD_DUMP CRC(89cdb7fa) SHA1(e30113e88a4cc35bda195bc9a17570d9e717a689) ) // bad according to test mode. checksum does not match written label
+	ROM_LOAD16_BYTE( "ms_drive_0_hi_8204_10-17-90.200s",   0x020000, 0x010000, CRC(49dcb1e7) SHA1(ab4d972096c0bfed506536f3591b2950162cd798) )
+	ROM_LOAD16_BYTE( "ms_drive_0_lo_a203_10-17-90.210s",   0x020001, 0x010000, CRC(9d9987cf) SHA1(44cba81764d6814af9cc8ead8789ebfe94fd0cde) )
+	ROM_LOAD16_BYTE( "ms_drive_1_hi_9206_10-17-90.200t",   0x040000, 0x010000, CRC(7d93ffc2) SHA1(08d424afb8eb7b957c5855c26586492da6dc7ffa) )
+	ROM_LOAD16_BYTE( "ms_drive_1_lo_0005_10-17-90.210t",   0x040001, 0x010000, CRC(f8cc3105) SHA1(2d507d1f429c5a9b4b1b0120a6c0b679d1303039) )
+	ROM_LOAD16_BYTE( "ms_pics_0_hi_0733_10-3-90.200u",     0x060000, 0x010000, CRC(7932e194) SHA1(610945c56246c2b6172a4810631eddb3d77155e1) )
+	ROM_LOAD16_BYTE( "ms_pics_0_lo_c135_10-3-90.210u",     0x060001, 0x010000, CRC(42e017d7) SHA1(806a251d7b762e28fa1c8168d3c6180e21f832f7) )
+	ROM_LOAD16_BYTE( "ms_pics_1_hi_fd58_10-3-90.200v",     0x080000, 0x010000, CRC(8d3ebb56) SHA1(81e05db3d909f402bd38ccb34c468da41c9dcba5) )
+	ROM_LOAD16_BYTE( "ms_pics_1_lo_6de3_10-3-90.210v",     0x080001, 0x010000, CRC(1b5a8606) SHA1(cfa67de495c11a1fdc4ffca389930f1e27ba5ff4) )
+	ROM_LOAD16_BYTE( "136077-1012.200w",                   0x0a0000, 0x010000, CRC(9a78b952) SHA1(53270d4d8c28579ebda477a63c034f6d1b9e5a58) ) // hand written label stating it's 136077-1012
+	ROM_LOAD16_BYTE( "136077-1011.210w",                   0x0a0001, 0x010000, CRC(c5cd5491) SHA1(ede5a3bb888342032d6758b0fb149451b6543d8b) ) // hand written label stating it's 136077-1011
+	ROM_LOAD16_BYTE( "136077-1014.200x",                   0x0c0000, 0x010000, CRC(a872792a) SHA1(9269e397567940013e5f46cadfe2bad2ca1a2bc4) ) // missing label but == 136077-1014.200x
+	ROM_LOAD16_BYTE( "136077-1013.210x",                   0x0c0001, 0x010000, CRC(ca7b3e53) SHA1(cdb3a6360893fd3dd2947c050dca8a4dfaa9ced9) ) // missing label but == 136077-1013.210x
+	ROM_LOAD16_BYTE( "mscoproc_hi_09dc_9-13-90.200y",      0x0e0000, 0x010000, CRC(7188964e) SHA1(55f1fb60e20c9ce618af27197ed1174fee875c5e) )
+	ROM_LOAD16_BYTE( "mscoproc_lo_9081_9-13-90.210y",      0x0e0001, 0x010000, CRC(19eecfad) SHA1(53c72fe2d868fadeda2066df5067e97382a0750a) )
+
+	ROM_REGION( 0x2000, "mainpcb:asic65:asic65cpu", 0 )   // ASIC65 TMS32015 code
+	ROM_LOAD( "136077-1027.30j", 0x00000, 0x02000, NO_DUMP )
+
+	ROM_REGION( 0x20000, "mainpcb:harddriv_sound:soundcpu", 0 )        // 2*64k for audio 68000 code
+	ROM_LOAD16_BYTE( "136077-1032.70n", 0x000000, 0x008000, CRC(fbc903a6) SHA1(047240a5192918ced52d90b0555ba2e19a26329e) )
+	ROM_LOAD16_BYTE( "136077-1033.45n", 0x000001, 0x008000, CRC(e032ca7c) SHA1(a80c980c8e58cf8cada72140e42a3cd1ea987b3d) )
+
+	ROM_REGION16_BE( 0x60000, "mainpcb:user1", 0 )  // 384k for ADSP object ROM
+	ROM_LOAD16_BYTE( "136077-1021.10h", 0x000000, 0x010000, CRC(9831fe73) SHA1(5215ee89a0014399b7d829e443b16590a4679844) )
+	ROM_LOAD16_BYTE( "136077-1023.10k", 0x000001, 0x010000, CRC(74bf0e0e) SHA1(a3d91ecf13c3619e073324517a4a5afaae831982) )
+	ROM_LOAD16_BYTE( "136077-1022.10j", 0x020000, 0x010000, CRC(c0393c31) SHA1(31726c01eb0d4650936908c90d45161197b7efba) )
+	ROM_LOAD16_BYTE( "136077-1024.10l", 0x020001, 0x010000, CRC(1e2fb25f) SHA1(4940091bbad6144bce091d2737191d266d4b0310) )
+
+	ROM_REGION16_BE( 0x50000, "mainpcb:user3", 0 )  // 256k for DSK ROMs + 64k for RAM
+	ROM_LOAD16_BYTE( "msync_univ_7cd2_dsk_10-3-90_hi_e30.30e", 0x000000, 0x010000, CRC(410582d6) SHA1(769563ae271e47cbee20d796b0b895dd63af3b41) ) // hand written label
+	ROM_LOAD16_BYTE( "msync_univ_2889_dsk_10-3-90_lo_e10.10e", 0x000001, 0x010000, CRC(806c82d4) SHA1(75bd650dce52eae3a95d21d904a651582cfe86b6) ) // hand written label
+	ROM_LOAD16_BYTE( "136077-1028.30f", 0x020000, 0x010000, CRC(4ea8148a) SHA1(19408b0e08f7b4c50d0428e61d1f3d710d4a782c) ) // does this go here?
+	ROM_LOAD16_BYTE( "136077-1029.10f", 0x020001, 0x010000, CRC(f7eeb42d) SHA1(e3127a2c354a80517c6e804f9092f1450ab5c4b3) ) // "
+
+	ROM_REGION( 0x50000, "mainpcb:harddriv_sound:serialroms", 0 )      // 10*128k for audio serial ROMs
+	ROM_LOAD( "136052-1123.65a", 0x000000, 0x010000, CRC(a88411dc) SHA1(1fd53c7eadffa163d5423df2f8338757e58d5f2e) )
+	ROM_LOAD( "136052-1124.55a", 0x010000, 0x010000, CRC(071a4309) SHA1(c623bd51d6a4a56503fbf138138854d6a30b11d6) )
+	ROM_LOAD( "136052-3125.45a", 0x020000, 0x010000, CRC(856548ff) SHA1(e8a17b274185c5e4ecf5f9f1c211e18b3ef2456d) )
+	ROM_LOAD( "136052-1126.30a", 0x030000, 0x010000, CRC(f46ef09c) SHA1(ba62f73ee3b33d8f26b430ffa468f8792dca23de) )
+	ROM_LOAD( "136077-1017.45c", 0x040000, 0x010000, CRC(e93129a3) SHA1(1221b08c8efbfd8cf6bfbfd956545f10bef48663) )
+
+	ROM_REGION( 0x800, "mainpcb:200e", 0 )
+	ROM_LOAD( "racedrivc.200e",  0x000000, 0x000800, CRC(2c0f7715) SHA1(79cf3a6cd48fc4a86cd94e823243fc0cd4bffa57) )
+
+	ROM_REGION( 0x800, "mainpcb:210e", 0 )
+	ROM_LOAD( "racedrivc.210e",  0x000000, 0x000800, CRC(2e843742) SHA1(bc73ab0270cdf45aaa1a19703e8c3aa916578ef0) )
+ROM_END
 
 /*
 
@@ -5305,14 +5356,15 @@
 GAME(  1990, racedrivb1,  racedriv, racedrivb1_machine, racedriv,  harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (cockpit, British, rev 1)", 0 )
 GAME(  1990, racedrivg1,  racedriv, racedrivb1_machine, racedriv,  harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (cockpit, German, rev 2)", 0 )
 
-GAME(  1990, racedrivc,   racedriv, racedrivc_machine,  racedrivc, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (compact, rev 5)", 0 )
+GAME(  1990, racedrivc,   racedriv, racedrivc_machine,  racedrivc, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (compact, rev 5)", 0 ) // Hard Drivin' / Race Drivin' self test version 1.9 in test mode
 GAME(  1990, racedrivcb,  racedriv, racedrivc_machine,  racedrivc, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (compact, British, rev 5)", 0 )
 GAME(  1990, racedrivcg,  racedriv, racedrivc_machine,  racedrivc, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (compact, German, rev 5)", 0 )
-GAME(  1990, racedrivc4,  racedriv, racedrivc_machine,  racedrivc, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (compact, rev 4)", 0 )
+GAME(  1990, racedrivc4,  racedriv, racedrivc_machine,  racedrivc, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (compact, rev 4)", 0 ) // Hard Drivin' / Race Drivin' self test version 1.8 in test mode
 GAME(  1990, racedrivcb4, racedriv, racedrivc_machine,  racedrivc, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (compact, British, rev 4)", 0 )
 GAME(  1990, racedrivcg4, racedriv, racedrivc_machine,  racedrivc, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (compact, German, rev 4)", 0 )
-GAME(  1990, racedrivc2,  racedriv, racedrivc1_machine, racedrivc, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (compact, rev 2)", 0 )
-GAME(  1990, racedrivc1,  racedriv, racedrivc1_machine, racedrivc, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (compact, rev 1)", 0 )
+GAME(  1990, racedrivc2,  racedriv, racedrivc1_machine, racedrivc, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (compact, rev 2)", 0 ) // Hard Drivin' / Race Drivin' self test version 1.7 in test mode
+GAME(  1990, racedrivc1,  racedriv, racedrivc1_machine, racedrivc, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (compact, rev 1)", 0 ) // Hard Drivin' / Race Drivin' self test version 1.6 in test mode
+GAME(  1990, racedrivcp,  racedriv, racedrivc1_machine, racedrivc, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' (compact, prototype)", 0 ) // Race Drivin' version 1.5 in test mode
 
 GAMEL( 1990, racedrivpan, racedriv, racedriv_panorama_machine, racedriv_pan, harddriv_new_state, empty_init, ROT0, "Atari Games", "Race Drivin' Panorama (prototype, rev 2.1)", 0, layout_racedrivpan )
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/hec2hrp.cpp mame-0.224+dfsg.1/src/mame/drivers/hec2hrp.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/hec2hrp.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/hec2hrp.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -11,20 +11,31 @@
         Hector 1
         Interact
 
-    These machines can load and run cassettes for the interact / hector1.
+The first model (Interact)was made by Interact Electronics Inc of Ann Arbor,
+Michigan. However, just after launch, the company collapsed. The liquidator,
+Protecto, sold some and MicroVideo sold the rest. MicroVideo continued to
+develop but went under 2 years later. Meanwhile, the French company
+Lambda Systems sold a clone called the Victor Lambda. But, like the
+Americans, Lambda Systems also collapsed. Another French company,
+Micronique, purchased all remaining stock and intellectual rights
+from Lambda Systems, Microvideo and Interact, and the computer becomes
+wholly French. The computer has a name change, becoming the Hector.
+This in turn gets upgraded (2HR, HRX, MX). The line is finally
+retired in about 1985.
+
+These machines can load and run cassettes for the interact / hector1.
     hec2hr - press 2 then 1
     hec2hrp - press 2 then 1
-    hec2hrx - press 5 then 1
-    hec2mx40 - press 5 then 1
-    hec2mx80 - not compatible
     victor - press R then L
 
-        12/05/2009 Skeleton driver - Micko : mmicko@gmail.com
-        31/06/2009 Video - Robbbert
+These machines will load the cassette but the keys don't work
+    hec2hrx, hec2mx40, hec2mdhrx - press 5 then 1
 
-        29/10/2009 Update skeleton to functional machine
-                    by yo_fr            (jj.stac @ aliceadsl.fr)
+This machine not compatible
+    hec2mx80
 
+2009-05-12 Skeleton driver - Micko : mmicko@gmail.com
+2009-10-29 Update skeleton to functional machine by yo_fr (jj.stac @ aliceadsl.fr)
                 => add Keyboard,
                 => add color,
                 => add cassette,
@@ -33,19 +44,19 @@
                 => add BR/HR switching
                 => add bank switch for HRX
                 => add device MX80c and bank switching for the ROM
-    Importante note : Keyboard emulation code obtained from
+    Important note : Keyboard emulation code obtained from
                     DChector project : http://dchector.free.fr/ made by DanielCoulom
                     (thanks Daniel)
-        03/01/2010 Update and cleanup  by yo_fr       (jj.stac@aliceadsl.fr)
+2010-01-03 Update and cleanup  by yo_fr       (jj.stac@aliceadsl.fr)
                 => add the port mapping for keyboard
-        20/11/2010 : synchronization between uPD765 and Z80 are now OK, CP/M running! JJStacino
-        11/11/2011 : add minidisk (3.5") support  JJStacino
+2010-11-20 : synchronization between uPD765 and Z80 are now OK, CP/M running! JJStacino
+2011-11-11 : add minidisk (3.5") support  JJStacino
 
-        for more information about these machines, see the DChector project : http://dchector.free.fr/ made by DanielCoulom
+        For more information about these machines, see the DChector project : http://dchector.free.fr/ made by DanielCoulom
         (thanks to Daniel) and Yves site : http://hectorvictor.free.fr/ (thanks too Yves!)
 
-    TODO :  Add cartridge functionality
-            Adjust the one-shot and A/D timing (sn76477)
+TODO :  Add cartridge functionality
+        Adjust the one-shot and A/D timing (sn76477)
 
 ****************************************************************************/
 /* Joystick 1 :
@@ -75,101 +86,59 @@
 #include "includes/hec2hrp.h"
 
 #include "cpu/z80/z80.h"
-#include "imagedev/cassette.h"
-#include "imagedev/printer.h"
-#include "sound/discrete.h"  /* for 1 Bit sound*/
-
+#include "cpu/i8085/i8085.h"
 #include "screen.h"
 #include "speaker.h"
-
 #include "formats/hect_dsk.h"
 #include "formats/hect_tap.h"
 #include "formats/hector_minidisc.h"
 
 
-void hec2hrp_state::hecdisc2_mem(address_map &map)
-{
-	map.unmap_value_high();
-
-	map(0x0000, 0x3fff).bankrw("bank3"); /* ROM at start up, RAM later */
-	map(0x4000, 0xffff).ram();
-}
-
-void hec2hrp_state::hecdisc2_io(address_map &map)
+void hec2hrp_state::interact_mem(address_map &map)
 {
 	map.unmap_value_high();
-	map.global_mask(0xff);
-	// ROM page handling
-	map(0x000, 0x00f).rw(FUNC(hec2hrp_state::disc2_io00_port_r), FUNC(hec2hrp_state::disc2_io00_port_w));
-	// RS232 - 8251 comms handling
-	map(0x020, 0x02f).rw(FUNC(hec2hrp_state::disc2_io20_port_r), FUNC(hec2hrp_state::disc2_io20_port_w));
-	// Hector comms handling
-	map(0x030, 0x03f).rw(FUNC(hec2hrp_state::disc2_io30_port_r), FUNC(hec2hrp_state::disc2_io30_port_w));
-	map(0x040, 0x04f).rw(FUNC(hec2hrp_state::disc2_io40_port_r), FUNC(hec2hrp_state::disc2_io40_port_w));
-	map(0x050, 0x05f).rw(FUNC(hec2hrp_state::disc2_io50_port_r), FUNC(hec2hrp_state::disc2_io50_port_w));
-	// uPD765 link
-	map(0x060, 0x061).m(m_upd_fdc, FUNC(upd765a_device::map));
-	map(0x070, 0x070).mirror(0x00f).rw(m_upd_fdc, FUNC(upd765a_device::dma_r), FUNC(upd765a_device::dma_w));
+	/* Main ROM page*/
+	map(0x0000, 0x3fff).rom();
+	map(0x1000, 0x1000).w(FUNC(hec2hrp_state::color_a_w));  /* Color c0/c1*/
+	map(0x1800, 0x1800).w(FUNC(hec2hrp_state::color_b_w));  /* Color c2/c3*/
+	map(0x2000, 0x2003).w(FUNC(hec2hrp_state::sn_2000_w));  /* Sound*/
+	map(0x2800, 0x2803).w(FUNC(hec2hrp_state::sn_2800_w));  /* Sound*/
+	map(0x3000, 0x3000).rw(FUNC(hec2hrp_state::cassette_r), FUNC(hec2hrp_state::sn_3000_w));/* Write necessary*/
+	map(0x3800, 0x3807).rw(FUNC(hec2hrp_state::keyboard_r), FUNC(hec2hrp_state::keyboard_w));  /* Keyboard*/
+	map(0x4000, 0x49ff).ram().share("videoram");
+	map(0x4A00, 0xffff).ram();
 }
 
 void hec2hrp_state::hec2hrp_mem(address_map &map)
 {
 	map.unmap_value_high();
-	/* Main ROM page*/
-	map(0x0000, 0x3fff).rom();
-
-	/* Hardware address mapping */
-	map(0x0800, 0x0808).w(FUNC(hec2hrp_state::switch_bank_w));/* Bank handling */
-	map(0x1000, 0x1000).w(FUNC(hec2hrp_state::color_a_w));  /* Color c0/c1 */
-	map(0x1800, 0x1800).w(FUNC(hec2hrp_state::color_b_w));  /* Color c2/c3 */
-	map(0x2000, 0x2003).w(FUNC(hec2hrp_state::sn_2000_w));  /* Sound */
-	map(0x2800, 0x2803).w(FUNC(hec2hrp_state::sn_2800_w));  /* Sound */
-	map(0x3000, 0x3000).rw(FUNC(hec2hrp_state::cassette_r), FUNC(hec2hrp_state::sn_3000_w));  /* Write necessary */
-	map(0x3800, 0x3807).rw(FUNC(hec2hrp_state::keyboard_r), FUNC(hec2hrp_state::keyboard_w)); /* Keyboard */
-
-	/* Video br mapping */
-	map(0x4000, 0x49ff).ram().share("videoram");
-	/* contiguous RAM */
-	map(0x4A00, 0xbfff).ram();
-	/* from 0xC000 to 0xFFFF => Bank Ram for video and data */
-	map(0xc000, 0xffff).ram().share("hector_videoram");
+	interact_mem(map);
+	map(0x0800, 0x0808).w(FUNC(hec2hrp_state::switch_bank_w));   // bank management
+	map(0xc000, 0xffff).ram().share("hector_videoram");    /* => Bank Ram for video and data */
 }
 
 void hec2hrp_state::hec2hrx_mem(address_map &map)
 {
 	map.unmap_value_high();
-	/* Main ROM page*/
-	map(0x0000, 0x3fff).bankr("bank2");
-
-	/* Hardware address mapping*/
-	map(0x0800, 0x0808).w(FUNC(hec2hrp_state::switch_bank_w));/* Bank handling */
-	map(0x1000, 0x1000).w(FUNC(hec2hrp_state::color_a_w));  /* Color c0/c1 */
-	map(0x1800, 0x1800).w(FUNC(hec2hrp_state::color_b_w));  /* Color c2/c3 */
-	map(0x2000, 0x2003).w(FUNC(hec2hrp_state::sn_2000_w));  /* Sound */
-	map(0x2800, 0x2803).w(FUNC(hec2hrp_state::sn_2800_w));  /* Sound */
-	map(0x3000, 0x3000).rw(FUNC(hec2hrp_state::cassette_r), FUNC(hec2hrp_state::sn_3000_w));  /* Write necessary */
-	map(0x3800, 0x3807).rw(FUNC(hec2hrp_state::keyboard_r), FUNC(hec2hrp_state::keyboard_w)); /* Keyboard */
-
-	/* Video br mapping */
-	map(0x4000, 0x49ff).ram().share("videoram");
-	/* contiguous RAM */
-	map(0x4A00, 0xbfff).ram();
-	/* from 0xC000 to 0xFFFF => Bank Ram for video and data */
-	map(0xc000, 0xffff).bankrw("bank1").share("hector_videoram");
+	hec2hrp_mem(map);
+	map(0x0000, 0x3fff).bankr("bank2"); /* Main ROM page*/
+	map(0x3000, 0x3000).rw(FUNC(hec2hrp_state::cassette_r), FUNC(hec2hrp_state::sn_3000_w));/* Write necessary*/
+	map(0x3800, 0x3807).rw(FUNC(hec2hrp_state::keyboard_r), FUNC(hec2hrp_state::keyboard_w));  /* Keyboard*/
+	map(0xc000, 0xffff).bankrw("bank1").share("hector_videoram");  /* => Bank Ram for video and data */
 }
 
 void hec2hrp_state::hec2hrp_io(address_map &map)
 {
 	map.unmap_value_high();
 	map.global_mask(0xff);
-	map(0x000, 0x0ff).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w));
+	map(0x00, 0xff).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w));
 }
 
 void hec2hrp_state::hec2hrx_io(address_map &map)
 {
 	map.unmap_value_high();
 	map.global_mask(0xff);
-	map(0x0f0, 0x0ff).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w));
+	map(0xf0, 0xff).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w));
 }
 
 void hec2hrp_state::hec2mdhrx_io(address_map &map)
@@ -180,27 +149,54 @@
 	// Minidisc commands and changing the rom page */
 	map(0x04, 0x07).rw(m_minidisc_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write));
 	map(0x08, 0x08).w(FUNC(hec2hrp_state::minidisc_control_w));
-	map(0x0f0, 0x0ff).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w));
+	map(0xf0, 0xff).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w));
 }
 
 void hec2hrp_state::hec2mx40_io(address_map &map)
 {
 	map.unmap_value_high();
 	map.global_mask(0xff);
-	map(0x000, 0x0ef).w(FUNC(hec2hrp_state::mx40_io_port_w));
-	map(0x0f0, 0x0f3).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w));
+	map(0x00, 0xef).w(FUNC(hec2hrp_state::mx40_io_port_w));
+	map(0xf0, 0xf3).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w));
 }
 
 void hec2hrp_state::hec2mx80_io(address_map &map)
 {
 	map.unmap_value_high();
 	map.global_mask(0xff);
-	map(0x000, 0x0ef).w(FUNC(hec2hrp_state::mx80_io_port_w));
-	map(0x0f0, 0x0f3).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w));
+	map(0x00, 0xef).w(FUNC(hec2hrp_state::mx80_io_port_w));
+	map(0xf0, 0xf3).rw(FUNC(hec2hrp_state::io_8255_r), FUNC(hec2hrp_state::io_8255_w));
 
 
 }
 
+// 2nd cpu
+void hec2hrp_state::hecdisc2_mem(address_map &map)
+{
+	map.unmap_value_high();
+
+	map(0x0000, 0x3fff).bankrw("bank3"); /* ROM at start up, RAM later */
+	map(0x4000, 0xffff).ram();
+}
+
+void hec2hrp_state::hecdisc2_io(address_map &map)
+{
+	map.unmap_value_high();
+	map.global_mask(0xff);
+	// ROM page handling
+	map(0x00, 0x0f).rw(FUNC(hec2hrp_state::disc2_io00_port_r), FUNC(hec2hrp_state::disc2_io00_port_w));
+	// RS232 - 8251 comms handling
+	map(0x20, 0x2f).rw(FUNC(hec2hrp_state::disc2_io20_port_r), FUNC(hec2hrp_state::disc2_io20_port_w));
+	// Hector comms handling
+	map(0x30, 0x3f).rw(FUNC(hec2hrp_state::disc2_io30_port_r), FUNC(hec2hrp_state::disc2_io30_port_w));
+	map(0x40, 0x4f).rw(FUNC(hec2hrp_state::disc2_io40_port_r), FUNC(hec2hrp_state::disc2_io40_port_w));
+	map(0x50, 0x5f).rw(FUNC(hec2hrp_state::disc2_io50_port_r), FUNC(hec2hrp_state::disc2_io50_port_w));
+	// uPD765 link
+	map(0x60, 0x61).m(m_upd_fdc, FUNC(upd765a_device::map));
+	map(0x70, 0x70).mirror(0x0f).rw(m_upd_fdc, FUNC(upd765a_device::dma_r), FUNC(upd765a_device::dma_w));
+}
+
+
 /* Input ports */
 static INPUT_PORTS_START( hec2hrp )
 	/* keyboard input */
@@ -292,6 +288,11 @@
 		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
 INPUT_PORTS_END
 
+MACHINE_RESET_MEMBER(hec2hrp_state,interact)
+{
+	hector_reset(0, 0);
+}
+
 MACHINE_START_MEMBER(hec2hrp_state,hec2hrp)
 {
 	hector_init();
@@ -305,30 +306,30 @@
 
 MACHINE_START_MEMBER(hec2hrp_state,hec2hrx)
 {
-	uint8_t *RAM   = memregion("maincpu")->base();
+	uint8_t *r = m_ram->pointer();
 	//Patch rom possible !
-	//RAMD2[0xff6b] = 0x0ff; // force verbose mode
+	//RAMD2[0xff6b] = 0xff; // force verbose mode
 
 	// Memory install for bank switching
-	membank("bank1")->configure_entry(HECTOR_BANK_PROG , &RAM[0xc000]   );
-	membank("bank1")->configure_entry(HECTOR_BANK_VIDEO, m_hector_videoram_hrx); // Video RAM
+	m_bank[1]->configure_entry(HECTOR_BANK_PROG, r+0x10000);
+	m_bank[1]->configure_entry(HECTOR_BANK_VIDEO, m_hector_videoram_hrx); // Video RAM
 
 	// Set bank HECTOR_BANK_PROG as basic bank
-	membank("bank1")->set_entry(HECTOR_BANK_PROG);
+	m_bank[1]->set_entry(HECTOR_BANK_PROG);
 
 	// MX-specific
-	membank("bank2")->configure_entry(HECTORMX_BANK_PAGE0 , &RAM[0x0000]);
-	membank("bank2")->configure_entry(HECTORMX_BANK_PAGE1 , memregion("page1")->base() ); // ROM page 1
-	membank("bank2")->configure_entry(HECTORMX_BANK_PAGE2 , memregion("page2")->base() ); // ROM page 2
-	membank("bank2")->set_entry(HECTORMX_BANK_PAGE0);
+	m_bank[2]->configure_entry(HECTORMX_BANK_PAGE0, m_rom);
+	m_bank[2]->configure_entry(HECTORMX_BANK_PAGE1, memregion("page1")->base() ); // ROM page 1
+	m_bank[2]->configure_entry(HECTORMX_BANK_PAGE2, memregion("page2")->base() ); // ROM page 2
+	m_bank[2]->set_entry(HECTORMX_BANK_PAGE0);
 
 	// Disk II-specific
-	membank("bank3")->configure_entry(DISCII_BANK_ROM , memregion("rom_disc2")->base() ); // ROM
-	membank("bank3")->configure_entry(DISCII_BANK_RAM , memregion("disc2mem" )->base() ); // RAM
-	membank("bank3")->set_entry(DISCII_BANK_ROM);
+	m_bank[3]->configure_entry(DISCII_BANK_ROM, memregion("rom_disc2")->base() ); // ROM
+	m_bank[3]->configure_entry(DISCII_BANK_RAM, r); // RAM
+	m_bank[3]->set_entry(DISCII_BANK_ROM);
 
 	// As video HR ram is in bank, use external memory
-	m_hector_videoram.set_target(m_hector_videoram_hrx,m_hector_videoram.bytes());
+	m_hector_vram.set_target(m_hector_videoram_hrx,m_hector_vram.bytes());
 
 	hector_init();
 }
@@ -337,23 +338,23 @@
 /*****************************************************************************/
 //minidisc
 {
-	uint8_t *RAM   = memregion("maincpu")->base();
+	uint8_t *r = m_ram->pointer();
 
 	// Memory install for bank switching
-	membank("bank1")->configure_entry(HECTOR_BANK_PROG, &RAM[0xc000]);
-	membank("bank1")->configure_entry(HECTOR_BANK_VIDEO, m_hector_videoram_hrx); // Video RAM
+	m_bank[1]->configure_entry(HECTOR_BANK_PROG, r+0x10000);
+	m_bank[1]->configure_entry(HECTOR_BANK_VIDEO, m_hector_videoram_hrx); // Video RAM
 
 	// Set HECTOR_BANK_PROG as basic bank
-	membank("bank1")->set_entry(HECTOR_BANK_PROG);
+	m_bank[1]->set_entry(HECTOR_BANK_PROG);
 	//Here, bank 5 is not used for the language switch but for the floppy ROM
 
 	// Mini disk-specific
-	membank("bank2")->configure_entry(HECTOR_BANK_BASE, &RAM[0x0000]); // ROM base page
-	membank("bank2")->configure_entry(HECTOR_BANK_DISC, memregion("page2")->base() ); // ROM mini disc page
-	membank("bank2")->set_entry(HECTOR_BANK_BASE);
+	m_bank[2]->configure_entry(HECTOR_BANK_BASE, m_rom); // ROM base page
+	m_bank[2]->configure_entry(HECTOR_BANK_DISC, memregion("page2")->base() ); // ROM mini disc page
+	m_bank[2]->set_entry(HECTOR_BANK_BASE);
 
 	// As video HR ram is in bank, use external memory
-	m_hector_videoram.set_target(m_hector_videoram_hrx,m_hector_videoram.bytes());
+	m_hector_vram.set_target(m_hector_videoram_hrx,m_hector_vram.bytes());
 
 	hector_init();
 }
@@ -361,11 +362,11 @@
 MACHINE_RESET_MEMBER(hec2hrp_state,hec2hrx)
 {
 	// Hector Memory
-	membank("bank1")->set_entry(HECTOR_BANK_PROG);
-	membank("bank2")->set_entry(HECTORMX_BANK_PAGE0);
+	m_bank[1]->set_entry(HECTOR_BANK_PROG);
+	m_bank[2]->set_entry(HECTORMX_BANK_PAGE0);
 
 	// DISK II Memory
-	membank("bank3")->set_entry(DISCII_BANK_ROM);
+	m_bank[3]->set_entry(DISCII_BANK_ROM);
 
 	hector_reset(1, 1);
 	hector_disc2_reset();
@@ -375,82 +376,72 @@
 MACHINE_RESET_MEMBER(hec2hrp_state,hec2mdhrx)
 {
 	// Hector Memory
-	membank("bank1")->set_entry(HECTOR_BANK_PROG);
-	membank("bank2")->set_entry(HECTORMX_BANK_PAGE0);
+	m_bank[1]->set_entry(HECTOR_BANK_PROG);
+	m_bank[2]->set_entry(HECTORMX_BANK_PAGE0);
 
 	hector_reset(1, 0);
 }
 
-// mini disk interface
-
-FLOPPY_FORMATS_MEMBER( hec2hrp_state::minidisc_formats )
-	FLOPPY_HMD_FORMAT
-FLOPPY_FORMATS_END
-
-static void minidisc_floppies(device_slot_interface &device)
-{
-	device.option_add("dd", FLOPPY_35_DD);
-}
-
-
-void hec2hrp_state::hec2hr(machine_config &config)
+void hec2hrp_state::interact_common(machine_config &config)
 {
-	Z80(config, m_maincpu, 5_MHz_XTAL);
-	m_maincpu->set_addrmap(AS_PROGRAM, &hec2hrp_state::hec2hrp_mem);
-	m_maincpu->set_addrmap(AS_IO, &hec2hrp_state::hec2hrp_io);
-	m_maincpu->set_periodic_int(FUNC(hec2hrp_state::irq0_line_hold), attotime::from_hz(50)); /*  put on the Z80 irq in Hz*/
-
-	MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrp)
+	MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,interact)
 	MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrp)
 
+	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(50);
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(400)); /* 2500 not accurate */
-	screen.set_size(512, 230);
-	screen.set_visarea(0, 243, 0, 227);
-	screen.set_screen_update(FUNC(hec2hrp_state::screen_update_hec2hrp));
+	screen.set_refresh_hz(60);
+	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
+	screen.set_size(256, 79);
+	screen.set_visarea(0, 112, 0, 77);
+	screen.set_screen_update(FUNC(hec2hrp_state::screen_update_interact));
 	screen.set_palette(m_palette);
 
-	PALETTE(config, m_palette).set_entries(16);
-	MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp)
+	PALETTE(config, m_palette, FUNC(hec2hrp_state::init_palette), 16);  /* 8 colours, but only 4 at a time*/
 
 	hector_audio(config);
 
 	CASSETTE(config, m_cassette);
 	m_cassette->set_formats(hector_cassette_formats);
 	m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
+	m_cassette->set_interface("interact_cass");
 
+	SOFTWARE_LIST(config, "cass_list").set_original("interact");
+
+	/* printer */
 	PRINTER(config, m_printer, 0);
 }
 
-void hec2hrp_state::hec2hrp(machine_config &config)
+void hec2hrp_state::interact(machine_config &config)
 {
-	Z80(config, m_maincpu, 5_MHz_XTAL);
-	m_maincpu->set_addrmap(AS_PROGRAM, &hec2hrp_state::hec2hrp_mem);
-	m_maincpu->set_addrmap(AS_IO, &hec2hrp_state::hec2hrp_io);
-	m_maincpu->set_periodic_int(FUNC(hec2hrp_state::irq0_line_hold), attotime::from_hz(50)); /*  put on the Z80 irq in Hz*/
+	/* basic machine hardware */
+	I8080(config, m_maincpu, XTAL(2'000'000));
+	m_maincpu->set_addrmap(AS_PROGRAM, &hec2hrp_state::interact_mem);
+	m_maincpu->set_periodic_int(FUNC(hec2hrp_state::irq0_line_hold), attotime::from_hz(50));
 
-	MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrp)
-	MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrp)
+	interact_common(config);
+}
 
-	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(50);
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(400)); /* 2500 not accurate */
-	screen.set_size(512, 230);
-	screen.set_visarea(0, 243, 0, 227);
-	screen.set_screen_update(FUNC(hec2hrp_state::screen_update_hec2hrp));
-	screen.set_palette(m_palette);
+void hec2hrp_state::hector1(machine_config &config)
+{
+	/* basic machine hardware */
+	Z80(config, m_maincpu, XTAL(1'750'000));
+	m_maincpu->set_addrmap(AS_PROGRAM, &hec2hrp_state::interact_mem);
+	m_maincpu->set_periodic_int(FUNC(hec2hrp_state::irq0_line_hold), attotime::from_hz(50));
 
-	PALETTE(config, m_palette).set_entries(16);
-	MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp)
+	interact_common(config);
+}
 
-	hector_audio(config);
 
-	CASSETTE(config, m_cassette);
-	m_cassette->set_formats(hector_cassette_formats);
-	m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
+// mini disk interface
 
-	PRINTER(config, m_printer, 0);
+FLOPPY_FORMATS_MEMBER( hec2hrp_state::minidisc_formats )
+	FLOPPY_HMD_FORMAT
+FLOPPY_FORMATS_END
+
+static void minidisc_floppies(device_slot_interface &device)
+{
+	device.option_add("dd", FLOPPY_35_DD);
 }
 
 static void hector_floppies(device_slot_interface &device)
@@ -458,26 +449,16 @@
 	device.option_add("525hd", FLOPPY_525_HD);
 }
 
-void hec2hrp_state::hec2mx40(machine_config &config)
+
+void hec2hrp_state::hec2hr(machine_config &config)
 {
 	Z80(config, m_maincpu, 5_MHz_XTAL);
-	m_maincpu->set_addrmap(AS_PROGRAM, &hec2hrp_state::hec2hrx_mem);
-	m_maincpu->set_addrmap(AS_IO, &hec2hrp_state::hec2mx40_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &hec2hrp_state::hec2hrp_mem);
+	m_maincpu->set_addrmap(AS_IO, &hec2hrp_state::hec2hrp_io);
 	m_maincpu->set_periodic_int(FUNC(hec2hrp_state::irq0_line_hold), attotime::from_hz(50)); /*  put on the Z80 irq in Hz*/
 
-	Z80(config, m_disc2cpu, 4_MHz_XTAL);
-	m_disc2cpu->set_addrmap(AS_PROGRAM, &hec2hrp_state::hecdisc2_mem);
-	m_disc2cpu->set_addrmap(AS_IO, &hec2hrp_state::hecdisc2_io);
-
-	UPD765A(config, m_upd_fdc, 8'000'000, false, true);
-	m_upd_fdc->intrq_wr_callback().set(FUNC(hec2hrp_state::disc2_fdc_interrupt));
-	m_upd_fdc->drq_wr_callback().set(FUNC(hec2hrp_state::disc2_fdc_dma_irq));
-
-	FLOPPY_CONNECTOR(config, m_upd_connector[0], hector_floppies, "525hd", floppy_image_device::default_floppy_formats);
-	FLOPPY_CONNECTOR(config, m_upd_connector[1], hector_floppies, "525hd", floppy_image_device::default_floppy_formats);
-
-	MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrx)
-	MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx)
+	MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrp)
+	MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrp)
 
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(50);
@@ -487,28 +468,29 @@
 	screen.set_screen_update(FUNC(hec2hrp_state::screen_update_hec2hrp));
 	screen.set_palette(m_palette);
 
-	PALETTE(config, m_palette).set_entries(16);
-	MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp)
+	PALETTE(config, m_palette, FUNC(hec2hrp_state::init_palette), 16);  /* 8 colours, but only 4 at a time*/
 
 	hector_audio(config);
 
 	CASSETTE(config, m_cassette);
 	m_cassette->set_formats(hector_cassette_formats);
 	m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
+	m_cassette->set_interface("interact_cass");
 
 	PRINTER(config, m_printer, 0);
-}
 
+	/* internal ram */
+	RAM(config, RAM_TAG).set_default_size("80K").set_default_value(0x00);
+
+	SOFTWARE_LIST(config, "cass_list").set_original("interact");
+}
 
 void hec2hrp_state::hec2hrx(machine_config &config)
 {
-	Z80(config, m_maincpu, 5_MHz_XTAL);
+	hec2hr(config);
 	m_maincpu->set_addrmap(AS_PROGRAM, &hec2hrp_state::hec2hrx_mem);
 	m_maincpu->set_addrmap(AS_IO, &hec2hrp_state::hec2hrx_io);
-	m_maincpu->set_periodic_int(FUNC(hec2hrp_state::irq0_line_hold), attotime::from_hz(50)); /*  put on the Z80 irq in Hz*/
-
-	MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrx)
-	MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx)
 
 	Z80(config, m_disc2cpu, 4_MHz_XTAL);
 	m_disc2cpu->set_addrmap(AS_PROGRAM, &hec2hrp_state::hecdisc2_mem);
@@ -518,143 +500,91 @@
 	m_upd_fdc->intrq_wr_callback().set(FUNC(hec2hrp_state::disc2_fdc_interrupt));
 	m_upd_fdc->drq_wr_callback().set(FUNC(hec2hrp_state::disc2_fdc_dma_irq));
 
-	FLOPPY_CONNECTOR(config, m_upd_connector[0], hector_floppies, "525hd", floppy_image_device::default_floppy_formats);
-	FLOPPY_CONNECTOR(config, m_upd_connector[1], hector_floppies, "525hd", floppy_image_device::default_floppy_formats);
-
-	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(50);
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(400)); /* 2500 not accurate */
-	screen.set_size(512, 230);
-	screen.set_visarea(0, 243, 0, 227);
-	screen.set_screen_update(FUNC(hec2hrp_state::screen_update_hec2hrp));
-	screen.set_palette(m_palette);
-
-	PALETTE(config, m_palette).set_entries(16);
-	MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp)
+	FLOPPY_CONNECTOR(config, m_upd_connector[0], hector_floppies, "525hd", floppy_image_device::default_floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, m_upd_connector[1], hector_floppies, "525hd", floppy_image_device::default_floppy_formats).enable_sound(true);
 
-	hector_audio(config);
+	MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrx)
+	MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx)
+}
 
-	CASSETTE(config, m_cassette);
-	m_cassette->set_formats(hector_cassette_formats);
-	m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
+void hec2hrp_state::hec2mx40(machine_config &config)
+{
+	hec2hrx(config);
+	m_maincpu->set_addrmap(AS_IO, &hec2hrp_state::hec2mx40_io);
+}
 
-	PRINTER(config, m_printer, 0);
+void hec2hrp_state::hec2mx80(machine_config &config)
+{
+	hec2hrx(config);
+	m_maincpu->set_addrmap(AS_IO, &hec2hrp_state::hec2mx80_io);
 }
 
 void hec2hrp_state::hec2mdhrx(machine_config &config)
 {
-	Z80(config, m_maincpu, 5_MHz_XTAL);
+	hec2hr(config);
 	m_maincpu->set_addrmap(AS_PROGRAM, &hec2hrp_state::hec2hrx_mem);
 	m_maincpu->set_addrmap(AS_IO, &hec2hrp_state::hec2mdhrx_io);
-	m_maincpu->set_periodic_int(FUNC(hec2hrp_state::irq0_line_hold), attotime::from_hz(50)); /*  put on the Z80 irq in Hz*/
 
 	MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2mdhrx)
 	MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2mdhrx)
 
 	/* 3.5" ("mini") disc */
 	FD1793(config, m_minidisc_fdc, 1_MHz_XTAL);
-	FLOPPY_CONNECTOR(config, "wd179x:0", minidisc_floppies, "dd", hec2hrp_state::minidisc_formats);
-
-	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(50);
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(400)); /* 2500 not accurate */
-	screen.set_size(512, 230);
-	screen.set_visarea(0, 243, 0, 227);
-	screen.set_screen_update(FUNC(hec2hrp_state::screen_update_hec2hrp));
-	screen.set_palette(m_palette);
-
-	PALETTE(config, m_palette).set_entries(16);
-	MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp)
-
-	hector_audio(config);
-
-	CASSETTE(config, m_cassette);
-	m_cassette->set_formats(hector_cassette_formats);
-	m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
-
-	PRINTER(config, m_printer, 0);
+	FLOPPY_CONNECTOR(config, "wd179x:0", minidisc_floppies, "dd", hec2hrp_state::minidisc_formats).enable_sound(true);
 }
 
 
-void hec2hrp_state::hec2mx80(machine_config &config)
-{
-	Z80(config, m_maincpu, 5_MHz_XTAL);
-	m_maincpu->set_addrmap(AS_PROGRAM, &hec2hrp_state::hec2hrx_mem);
-	m_maincpu->set_addrmap(AS_IO, &hec2hrp_state::hec2mx80_io);
-	m_maincpu->set_periodic_int(FUNC(hec2hrp_state::irq0_line_hold), attotime::from_hz(50)); /*  put on the Z80 irq in Hz*/
-
-	MCFG_MACHINE_RESET_OVERRIDE(hec2hrp_state,hec2hrx)
-	MCFG_MACHINE_START_OVERRIDE(hec2hrp_state,hec2hrx)
-
-	Z80(config, m_disc2cpu, 4_MHz_XTAL);
-	m_disc2cpu->set_addrmap(AS_PROGRAM, &hec2hrp_state::hecdisc2_mem);
-	m_disc2cpu->set_addrmap(AS_IO, &hec2hrp_state::hecdisc2_io);
-
-	UPD765A(config, m_upd_fdc, 8'000'000, false, true);
-	m_upd_fdc->intrq_wr_callback().set(FUNC(hec2hrp_state::disc2_fdc_interrupt));
-	m_upd_fdc->drq_wr_callback().set(FUNC(hec2hrp_state::disc2_fdc_dma_irq));
-
-	FLOPPY_CONNECTOR(config, m_upd_connector[0], hector_floppies, "525hd", floppy_image_device::default_floppy_formats);
-	FLOPPY_CONNECTOR(config, m_upd_connector[1], hector_floppies, "525hd", floppy_image_device::default_floppy_formats);
-
-	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(50);
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(400)); /* 2500 not accurate */
-	screen.set_size(512, 230);
-	screen.set_visarea(0, 243, 0, 227);
-	screen.set_screen_update(FUNC(hec2hrp_state::screen_update_hec2hrp));
-	screen.set_palette(m_palette);
-
-	PALETTE(config, m_palette).set_entries(16);
-	MCFG_VIDEO_START_OVERRIDE(hec2hrp_state,hec2hrp)
-
-	hector_audio(config);
-
-	CASSETTE(config, m_cassette);
-	m_cassette->set_formats(hector_cassette_formats);
-	m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
+ROM_START( interact )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "interact.rom", 0x0000, 0x0800, CRC(1aa50444) SHA1(405806c97378abcf7c7b0d549430c78c7fc60ba2))
+	// cartridge space 0800-0FFF, first byte must be 00.
+ROM_END
 
-	PRINTER(config, m_printer, 0);
-}
+ROM_START( hector1 )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "hector1.rom",  0x0000, 0x1000, CRC(3be6628b) SHA1(1c106d6732bed743d8283d39e5b8248271f18c42))
+ROM_END
 
 ROM_START( hec2hr )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
 	ROM_LOAD( "2hr.bin", 0x0000, 0x1000, CRC(84b9e672) SHA1(8c8b089166122eee565addaed10f84c5ce6d849b))
+	// option roms
 	ROM_REGION( 0x4000, "page1", ROMREGION_ERASEFF )
 	ROM_REGION( 0x4000, "page2", ROMREGION_ERASEFF )
 ROM_END
 
 ROM_START( victor )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
 	ROM_LOAD( "victor.rom",  0x0000, 0x1000, CRC(d1e9508f) SHA1(d0f1bdcd39917fafc8859223ab38eee2a7dc85ff))
+	// option roms
 	ROM_REGION( 0x4000, "page1", ROMREGION_ERASEFF )
 	ROM_REGION( 0x4000, "page2", ROMREGION_ERASEFF )
 ROM_END
 
 ROM_START( hec2hrp )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
 	ROM_LOAD( "hector2hrp.rom", 0x0000, 0x4000, CRC(983f52e4) SHA1(71695941d689827356042ee52ffe55ce7e6b8ecd))
+	// option roms
 	ROM_REGION( 0x4000, "page1", ROMREGION_ERASEFF )
 	ROM_REGION( 0x4000, "page2", ROMREGION_ERASEFF )
-	ROM_REGION( 0x10000, "disc2cpu", ROMREGION_ERASEFF )
+	// 2nd cpu
 	ROM_REGION( 0x04000, "rom_disc2", ROMREGION_ERASEFF )
 ROM_END
 
 ROM_START( hec2hrx )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
 	ROM_LOAD( "hector2hrx.rom", 0x0000, 0x4000, CRC(f047c521) SHA1(744336b2acc76acd7c245b562bdc96dca155b066))
+	// option roms
 	ROM_REGION( 0x4000, "page1", ROMREGION_ERASEFF )
 	ROM_REGION( 0x4000, "page2", ROMREGION_ERASEFF )
-	ROM_REGION( 0x10000, "disc2cpu", ROMREGION_ERASEFF )
-
+	// 2nd cpu
 	ROM_REGION( 0x04000, "rom_disc2", ROMREGION_ERASEFF )
 	ROM_LOAD( "d800k.bin" , 0x0000,0x1000, CRC(831bd584) SHA1(9782ee58f570042608d9d568b2c3fc4c6d87d8b9))
-	ROM_REGION( 0x10000,  "disc2mem", ROMREGION_ERASE00 )
 ROM_END
 
 // minidisc
 ROM_START( hec2mdhrx )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
 	ROM_LOAD( "mdic1.bin" , 0x0000,0x2000, CRC(ddda1065) SHA1(e7bba14a72605238d2f8299da029b8320a563254))
 	ROM_LOAD( "mdicmb.bin" , 0x2000,0x2000, CRC(d8090747) SHA1(f2925b68002307562e2ea5e36b740e5458f0f0eb))
 
@@ -665,40 +595,42 @@
 ROM_END
 
 ROM_START( hec2mx80 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
 	ROM_LOAD( "mx80c_page0.rom" , 0x0000,0x4000, CRC(a75945cf) SHA1(542391e482271be0997b069cf13c8b5dae28feec))
+	// option roms
 	ROM_REGION( 0x4000, "page1", ROMREGION_ERASEFF )
 	ROM_LOAD( "mx80c_page1.rom", 0x0000, 0x4000, CRC(4615f57c) SHA1(5de291bf3ae0320915133b99f1a088cb56c41658))
 	ROM_REGION( 0x4000, "page2", ROMREGION_ERASEFF )
 	ROM_LOAD( "mx80c_page2.rom" , 0x0000,0x4000, CRC(2d5d975e) SHA1(48307132e0f3fad0262859bb8142d108f694a436))
-
+	// 2nd cpu
 	ROM_REGION( 0x04000, "rom_disc2", ROMREGION_ERASEFF )
 	ROM_LOAD( "d800k.bin" , 0x0000,0x1000, CRC(831bd584) SHA1(9782ee58f570042608d9d568b2c3fc4c6d87d8b9))
-	ROM_REGION( 0x10000,  "disc2mem", ROMREGION_ERASE00 )
 ROM_END
 
 ROM_START( hec2mx40 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
 	ROM_LOAD( "mx40c_page0.rom" , 0x0000,0x4000, CRC(9bb5566d) SHA1(0c8c2e396ec8eb995d2b621abe06b6968ca5d0aa))
+	// option roms
 	ROM_REGION( 0x4000, "page1", ROMREGION_ERASEFF )
 	ROM_LOAD( "mx40c_page1.rom", 0x0000, 0x4000, CRC(192a76fa) SHA1(062aa6df0b554b85774d4b5edeea8496a4baca35))
 	ROM_REGION( 0x4000, "page2", ROMREGION_ERASEFF )
 	ROM_LOAD( "mx40c_page2.rom" , 0x0000,0x4000, CRC(ef1b2654) SHA1(66624ea040cb7ede4720ad2eca0738d0d3bad89a))
-
+	// 2nd cpu
 	ROM_REGION( 0x04000, "rom_disc2", ROMREGION_ERASEFF )
 //  ROM_LOAD( "d360k.bin" , 0x0000,0x4000, CRC(2454eacb) SHA1(dc0d5a7d5891a7e422d9d142a2419527bb15dfd5))
 	ROM_LOAD( "d800k.bin" , 0x0000,0x1000, CRC(831bd584) SHA1(9782ee58f570042608d9d568b2c3fc4c6d87d8b9))
 //  ROM_LOAD( "d200k.bin" , 0x0000,0x4000, CRC(e2801377) SHA1(0926df5b417ecd8013e35c71b76780c5a25c1cbf))
-	ROM_REGION( 0x10000,  "disc2mem", ROMREGION_ERASE00 )
 ROM_END
 
 /* Driver */
 
-/*  YEAR   NAME       PARENT   COMPAT    MACHINE    INPUT    CLASS          INIT        COMPANY       FULLNAME                  FLAGS */
-COMP(1983, hec2hrp,   0,       interact, hec2hrp,   hec2hrp, hec2hrp_state, empty_init, "Micronique", "Hector 2HR+",            MACHINE_IMPERFECT_SOUND)
-COMP(1980, victor,    hec2hrp, 0,        hec2hrp,   hec2hrp, hec2hrp_state, empty_init, "Micronique", "Victor",                 MACHINE_IMPERFECT_SOUND)
-COMP(1983, hec2hr,    hec2hrp, 0,        hec2hr,    hec2hrp, hec2hrp_state, empty_init, "Micronique", "Hector 2HR",             MACHINE_IMPERFECT_SOUND)
-COMP(1984, hec2hrx,   hec2hrp, 0,        hec2hrx,   hec2hrp, hec2hrp_state, empty_init, "Micronique", "Hector HRX + Disc2",     MACHINE_IMPERFECT_SOUND)
-COMP(1985, hec2mdhrx, hec2hrp, 0,        hec2mdhrx, hec2hrp, hec2hrp_state, empty_init, "Micronique", "Hector HRX + mini Disc", MACHINE_IMPERFECT_SOUND)
-COMP(1985, hec2mx80,  hec2hrp, 0,        hec2mx80,  hec2hrp, hec2hrp_state, empty_init, "Micronique", "Hector MX 80c + Disc2",  MACHINE_IMPERFECT_SOUND)
-COMP(1985, hec2mx40,  hec2hrp, 0,        hec2mx40,  hec2hrp, hec2hrp_state, empty_init, "Micronique", "Hector MX 40c + Disc2",  MACHINE_IMPERFECT_SOUND)
+/*  YEAR   NAME       PARENT    COMPAT    MACHINE    INPUT    CLASS           INIT            COMPANY        FULLNAME                  FLAGS */
+COMP(1979, interact,  0,        0,        interact,  hec2hrp, hec2hrp_state,  init_interact, "Interact Electronics",   "Interact Family Computer", MACHINE_IMPERFECT_SOUND)
+COMP(1983, hector1,   interact, 0,        hector1,   hec2hrp, hec2hrp_state,  init_interact, "Micronique", "Hector 1",               MACHINE_IMPERFECT_SOUND)
+COMP(1983, hec2hrp,   0,        interact, hec2hr,    hec2hrp, hec2hrp_state,  init_interact, "Micronique", "Hector 2HR+",            MACHINE_IMPERFECT_SOUND)
+COMP(1980, victor,    hec2hrp,  0,        hec2hr,    hec2hrp, hec2hrp_state,  init_victor,   "Micronique", "Victor",                 MACHINE_IMPERFECT_SOUND)
+COMP(1983, hec2hr,    hec2hrp,  0,        hec2hr,    hec2hrp, hec2hrp_state,  init_victor,   "Micronique", "Hector 2HR",             MACHINE_IMPERFECT_SOUND)
+COMP(1984, hec2hrx,   hec2hrp,  0,        hec2hrx,   hec2hrp, hec2hrp_state,  init_hrx,      "Micronique", "Hector HRX + Disc2",     MACHINE_IMPERFECT_SOUND)
+COMP(1985, hec2mdhrx, hec2hrp,  0,        hec2mdhrx, hec2hrp, hec2hrp_state,  init_mdhrx,    "Micronique", "Hector HRX + mini Disc", MACHINE_IMPERFECT_SOUND)
+COMP(1985, hec2mx80,  hec2hrp,  0,        hec2mx80,  hec2hrp, hec2hrp_state,  init_mx40,     "Micronique", "Hector MX 80c + Disc2",  MACHINE_IMPERFECT_SOUND)
+COMP(1985, hec2mx40,  hec2hrp,  0,        hec2mx40,  hec2hrp, hec2hrp_state,  init_mx40,     "Micronique", "Hector MX 40c + Disc2",  MACHINE_IMPERFECT_SOUND)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/hh_hmcs40.cpp mame-0.224+dfsg.1/src/mame/drivers/hh_hmcs40.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/hh_hmcs40.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/hh_hmcs40.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -79,8 +79,7 @@
  *A86     HD44820  1983, Chess King Pocket Micro
  *B63     HD44820  1985, CXG Pocket Chess (12 buttons)
 
- *A13     HD44840  1982, CXG Computachess II
- *A14     HD44840  1982, CXG Advanced Portachess
+ *A14     HD44840  1982, CXG Computachess II / Advanced Portachess
 
  *B55     HD44860  1987, Saitek Pro Bridge 100
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/hh_sm510.cpp mame-0.224+dfsg.1/src/mame/drivers/hh_sm510.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/hh_sm510.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/hh_sm510.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -29,10 +29,10 @@
 - Currently there is no accurate way to dump the SM511/SM512 melody ROM
   electronically. For the ones that weren't decapped, they were read by
   playing back all melody data and reconstructing it to ROM. Visual(decap)
-  verification is wanted for: gnw_bfightn, gnw_bjack, gnw_bsweep, gnw_climbern,
-  gnw_dkcirc, gnw_dkjrp, gnw_dkong3, gnw_gcliff, gnw_mariocmt, gnw_mariotj,
-  gnw_mbaway, gnw_mmousep, gnw_pinball, gnw_popeyep, gnw_sbuster, gnw_snoopyp,
-  gnw_zelda
+  verification is wanted for: bassmate, gnw_bfightn, gnw_bjack, gnw_bsweep,
+  gnw_climbern, gnw_dkcirc, gnw_dkhockey, gnw_dkjrp, gnw_dkong3, gnw_gcliff,
+  gnw_mariocmt, gnw_mariotj, gnw_mbaway, gnw_mmousep, gnw_pinball, gnw_popeyep,
+  gnw_sbuster, gnw_snoopyp, gnw_zelda
 
 ****************************************************************************
 
@@ -105,7 +105,7 @@
 UD-202    sc   SM510   Crab Grab
 BX-301    mvs  SM511   Boxing (aka Punch Out)
 AK-302    mvs  SM511   Donkey Kong 3
-HK-303*   mvs  SM511?  Donkey Kong Hockey
+HK-303    mvs  SM511   Donkey Kong Hockey
 YM-801    cs   SM511   Super Mario Bros. (assume same ROM as nws version)
 DR-802    cs   SM511   Climber            "
 BF-803    cs   SM511   Balloon Fight      "
@@ -4115,7 +4115,7 @@
 
 // config
 
-static INPUT_PORTS_START( gnw_boxing )
+static INPUT_PORTS_START( microvs_shared )
 	PORT_START("IN.0") // S1
 	PORT_BIT( 0x0b, IP_ACTIVE_HIGH, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_CHANGED_CB(input_changed) PORT_PLAYER(2)
@@ -4152,6 +4152,10 @@
 
 	PORT_START("ACL")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_CB(acl_button) PORT_NAME("ACL")
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( gnw_boxing )
+	PORT_INCLUDE( microvs_shared )
 
 	PORT_START("BA")
 	PORT_CONFNAME( 0x01, 0x01, "P2 Decrease Health (Cheat)") // factory test, unpopulated on PCB
@@ -4189,6 +4193,7 @@
 /***************************************************************************
 
   Nintendo Micro Vs. System: Donkey Kong 3 (model AK-302)
+  * PCB label AK-302M
   * Sharp SM511 label AK-302 299D (no decap)
   * wide lcd screen with custom segments, 1-bit sound
 
@@ -4207,65 +4212,166 @@
 // config
 
 static INPUT_PORTS_START( gnw_dkong3 )
-	PORT_START("IN.0") // S1
-	PORT_BIT( 0x0b, IP_ACTIVE_HIGH, IPT_UNUSED )
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_CHANGED_CB(input_changed) PORT_PLAYER(2) // Spray
+	PORT_INCLUDE( microvs_shared )
 
-	PORT_START("IN.1") // S2
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_CHANGED_CB(input_changed) // Spray
-	PORT_BIT( 0x0e, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("B")
+	PORT_CONFNAME( 0x01, 0x01, "P1 Infinite Lives (Cheat)") // factory test, unpopulated on PCB
+	PORT_CONFSETTING(    0x01, DEF_STR( Off ) )
+	PORT_CONFSETTING(    0x00, DEF_STR( On ) )
+INPUT_PORTS_END
 
-	PORT_START("IN.2") // S3
-	PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED )
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_CHANGED_CB(input_changed) PORT_PLAYER(2)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_CHANGED_CB(input_changed) PORT_PLAYER(2)
+void gnw_dkong3_state::gnw_dkong3(machine_config &config)
+{
+	sm511_common(config, 1920, 563);
+}
 
-	PORT_START("IN.3") // S4
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_CHANGED_CB(input_changed)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_CHANGED_CB(input_changed)
-	PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
+// roms
 
-	PORT_START("IN.4") // S5
-	PORT_BIT( 0x03, IP_ACTIVE_HIGH, IPT_UNUSED )
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_CHANGED_CB(input_changed) PORT_PLAYER(2)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_CHANGED_CB(input_changed) PORT_PLAYER(2)
+ROM_START( gnw_dkong3 )
+	ROM_REGION( 0x1000, "maincpu", 0 )
+	ROM_LOAD( "ak-302.program", 0x0000, 0x1000, CRC(ed59c15e) SHA1(94f6ce23677d2150c9f86c4b1954f5f531693b21) )
 
-	PORT_START("IN.5") // S6
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_CHANGED_CB(input_changed)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_CHANGED_CB(input_changed)
+	ROM_REGION( 0x100, "maincpu:melody", 0 )
+	ROM_LOAD( "ak-302.melody", 0x000, 0x100, BAD_DUMP CRC(8b8f3d55) SHA1(54ebdeff4dd56a8bc2cd39bca1deada14bb90cce) ) // decap needed for verification
+
+	ROM_REGION( 292480, "screen", 0)
+	ROM_LOAD( "gnw_dkong3.svg", 0, 292480, CRC(980d2486) SHA1(8578bdf4a3814401d9a79867252ee09ed7df253c) )
+ROM_END
+
+
+
+
+
+/***************************************************************************
+
+  Nintendo Micro Vs. System: Donkey Kong Hockey (model HK-303)
+  * PCB label HK-303M
+  * Sharp SM511 label HK-303 57XD (no decap)
+  * wide lcd screen with custom segments, 1-bit sound
+
+***************************************************************************/
+
+class gnw_dkhockey_state : public hh_sm510_state
+{
+public:
+	gnw_dkhockey_state(const machine_config &mconfig, device_type type, const char *tag) :
+		hh_sm510_state(mconfig, type, tag)
+	{ }
+
+	void gnw_dkhockey(machine_config &config);
+};
+
+// config
+
+static INPUT_PORTS_START( gnw_dkhockey )
+	PORT_INCLUDE( microvs_shared )
+
+	PORT_START("BA")
+	PORT_CONFNAME( 0x01, 0x01, "Any Goal Scores 10 Points (Cheat)") // factory test, unpopulated on PCB
+	PORT_CONFSETTING(    0x01, DEF_STR( Off ) )
+	PORT_CONFSETTING(    0x00, DEF_STR( On ) )
+
+	PORT_START("B")
+	PORT_CONFNAME( 0x01, 0x01, "P2 Goals Scores No Points (Cheat)") // "
+	PORT_CONFSETTING(    0x01, DEF_STR( Off ) )
+	PORT_CONFSETTING(    0x00, DEF_STR( On ) )
+INPUT_PORTS_END
+
+void gnw_dkhockey_state::gnw_dkhockey(machine_config &config)
+{
+	sm511_common(config, 1920, 579);
+}
+
+// roms
+
+ROM_START( gnw_dkhockey )
+	ROM_REGION( 0x1000, "maincpu", 0 )
+	ROM_LOAD( "hk-303.program", 0x0000, 0x1000, CRC(dc73eec7) SHA1(daaca286de326321335fd26d9b435b444787f609) )
+
+	ROM_REGION( 0x100, "maincpu:melody", 0 )
+	ROM_LOAD( "hk-303.melody", 0x000, 0x100, BAD_DUMP CRC(3f61032c) SHA1(b0fd9077fb5e59ca2787c828c78c35116c48c245) ) // decap needed for verification
+
+	ROM_REGION( 263239, "screen", 0)
+	ROM_LOAD( "gnw_dkhockey.svg", 0, 263239, CRC(3a576c12) SHA1(9a7ca67c35fcfb5858227f3ef2a6027c877c64d3) )
+ROM_END
+
+
+
+
+
+/***************************************************************************
+
+  Telko Bassmate Computer (model BM-501)
+  * PCB label BM-501
+  * Sharp SM511 label BM-501 556AA (no decap)
+  * vertical dual lcd screens with custom segments, 1-bit sound
+
+  The Bassmate Computer was produced for Telko by Nintendo as an OEM product
+  and sold under different brands, i.e. Telko, KMV and Probe 2000.
+
+  The hardware is identical as G&W Multi Screen, but it's not part of the game
+  series.
+
+***************************************************************************/
+
+class bassmate_state : public hh_sm510_state
+{
+public:
+	bassmate_state(const machine_config &mconfig, device_type type, const char *tag) :
+		hh_sm510_state(mconfig, type, tag)
+	{ }
+
+	void bassmate(machine_config &config);
+};
+
+// config
+
+static INPUT_PORTS_START( bassmate )
+	PORT_START("IN.0") // S1
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_CHANGED_CB(input_changed) PORT_NAME("Compute")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE2 ) PORT_CHANGED_CB(input_changed) PORT_NAME("Alarm")
 	PORT_BIT( 0x0c, IP_ACTIVE_HIGH, IPT_UNUSED )
 
-	PORT_START("IN.6") // S7
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SELECT ) PORT_CHANGED_CB(input_changed) PORT_NAME("Time")
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_CHANGED_CB(input_changed) PORT_NAME("Game B")
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START1 ) PORT_CHANGED_CB(input_changed) PORT_NAME("Game A")
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_SERVICE2 ) PORT_CHANGED_CB(input_changed) PORT_NAME("Alarm")
+	PORT_START("IN.1") // S2
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_CHANGED_CB(input_changed) PORT_NAME("Wind")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_CHANGED_CB(input_changed) PORT_NAME("Cover")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_CHANGED_CB(input_changed) PORT_NAME("Time of Day")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_CHANGED_CB(input_changed) PORT_NAME("Water Temp F")
+
+	PORT_START("IN.2") // S3
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_CHANGED_CB(input_changed) PORT_NAME("Water Clarity")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_CHANGED_CB(input_changed) PORT_NAME("Structure")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_CHANGED_CB(input_changed) PORT_NAME("Water Depth(ft)")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_CHANGED_CB(input_changed) PORT_NAME("Season")
 
 	PORT_START("ACL")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_CB(acl_button) PORT_NAME("ACL")
 
-	PORT_START("B")
-	PORT_CONFNAME( 0x01, 0x01, "P1 Infinite Health (Cheat)") // "
+	PORT_START("BA")
+	PORT_CONFNAME( 0x01, 0x01, "Skip Compute Animation (Cheat)") // factory test, unpopulated on PCB
 	PORT_CONFSETTING(    0x01, DEF_STR( Off ) )
 	PORT_CONFSETTING(    0x00, DEF_STR( On ) )
 INPUT_PORTS_END
 
-void gnw_dkong3_state::gnw_dkong3(machine_config &config)
+void bassmate_state::bassmate(machine_config &config)
 {
-	sm511_common(config, 1920, 563);
+	sm511_dualv(config, 1920/2, 1253/2, 1920/2, 1273/2);
 }
 
 // roms
 
-ROM_START( gnw_dkong3 )
+ROM_START( bassmate )
 	ROM_REGION( 0x1000, "maincpu", 0 )
-	ROM_LOAD( "ak-302.program", 0x0000, 0x1000, CRC(ed59c15e) SHA1(94f6ce23677d2150c9f86c4b1954f5f531693b21) )
+	ROM_LOAD( "bm-501.program", 0x0000, 0x1000, CRC(9bdd0501) SHA1(986b3b84184a987ae383c325700df21d8915f0e2) )
 
 	ROM_REGION( 0x100, "maincpu:melody", 0 )
-	ROM_LOAD( "ak-302.melody", 0x000, 0x100, BAD_DUMP CRC(8b8f3d55) SHA1(54ebdeff4dd56a8bc2cd39bca1deada14bb90cce) ) // decap needed for verification
+	ROM_LOAD( "bm-501.melody", 0x000, 0x100, BAD_DUMP CRC(fbe15600) SHA1(8be64792fffe5b8913a55b9b2624dd57dc238be7) ) // decap needed for verification
 
-	ROM_REGION( 292480, "screen", 0)
-	ROM_LOAD( "gnw_dkong3.svg", 0, 292480, CRC(980d2486) SHA1(8578bdf4a3814401d9a79867252ee09ed7df253c) )
+	ROM_REGION( 42305, "screen_top", 0)
+	ROM_LOAD( "bassmate_top.svg", 0, 42305, CRC(0cc056fe) SHA1(4d0e5b115adf513f5b3148ca7e39e0acbafd925c) )
+
+	ROM_REGION( 19775, "screen_bottom", 0)
+	ROM_LOAD( "bassmate_bottom.svg", 0, 19775, CRC(9561d52d) SHA1(903ef3944810c0efdc02f46a619891c1ef17c483) )
 ROM_END
 
 
@@ -9234,149 +9340,153 @@
 //    YEAR  NAME         PARENT   COMP  MACHINE      INPUT        CLASS              INIT        COMPANY, FULLNAME, FLAGS
 
 // Nintendo G&W: Silver/Gold (initial series is uncategorized, "Silver" was made up later)
-CONS( 1980, gnw_ball,    0,          0, gnw_ball,    gnw_ball,    gnw_ball_state,    empty_init, "Nintendo", "Game & Watch: Ball", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, gnw_flagman, 0,          0, gnw_flagman, gnw_flagman, gnw_flagman_state, empty_init, "Nintendo", "Game & Watch: Flagman", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, gnw_vermin,  0,          0, gnw_vermin,  gnw_vermin,  gnw_vermin_state,  empty_init, "Nintendo", "Game & Watch: Vermin", MACHINE_SUPPORTS_SAVE )
-CONS( 1980, gnw_fires,   0,          0, gnw_fires,   gnw_fires,   gnw_fires_state,   empty_init, "Nintendo", "Game & Watch: Fire (Silver)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1980, gnw_judge,   0,          0, gnw_judge,   gnw_judge,   gnw_judge_state,   empty_init, "Nintendo", "Game & Watch: Judge (green version)", MACHINE_SUPPORTS_SAVE )
-CONS( 1981, gnw_manholeg,0,          0, gnw_manholeg,gnw_manholeg,gnw_manholeg_state,empty_init, "Nintendo", "Game & Watch: Manhole (Gold)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1981, gnw_helmet,  0,          0, gnw_helmet,  gnw_helmet,  gnw_helmet_state,  empty_init, "Nintendo", "Game & Watch: Helmet (CN-17 version)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1981, gnw_lion,    0,          0, gnw_lion,    gnw_lion,    gnw_lion_state,    empty_init, "Nintendo", "Game & Watch: Lion", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1980, gnw_ball,     0,           0, gnw_ball,     gnw_ball,     gnw_ball_state,     empty_init, "Nintendo", "Game & Watch: Ball", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, gnw_flagman,  0,           0, gnw_flagman,  gnw_flagman,  gnw_flagman_state,  empty_init, "Nintendo", "Game & Watch: Flagman", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, gnw_vermin,   0,           0, gnw_vermin,   gnw_vermin,   gnw_vermin_state,   empty_init, "Nintendo", "Game & Watch: Vermin", MACHINE_SUPPORTS_SAVE )
+CONS( 1980, gnw_fires,    0,           0, gnw_fires,    gnw_fires,    gnw_fires_state,    empty_init, "Nintendo", "Game & Watch: Fire (Silver)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1980, gnw_judge,    0,           0, gnw_judge,    gnw_judge,    gnw_judge_state,    empty_init, "Nintendo", "Game & Watch: Judge (green version)", MACHINE_SUPPORTS_SAVE )
+CONS( 1981, gnw_manholeg, 0,           0, gnw_manholeg, gnw_manholeg, gnw_manholeg_state, empty_init, "Nintendo", "Game & Watch: Manhole (Gold)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1981, gnw_helmet,   0,           0, gnw_helmet,   gnw_helmet,   gnw_helmet_state,   empty_init, "Nintendo", "Game & Watch: Helmet (CN-17 version)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1981, gnw_lion,     0,           0, gnw_lion,     gnw_lion,     gnw_lion_state,     empty_init, "Nintendo", "Game & Watch: Lion", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
 
 // Nintendo G&W: Wide Screen
-CONS( 1981, gnw_pchute,  0,          0, gnw_pchute,  gnw_pchute,  gnw_pchute_state,  empty_init, "Nintendo", "Game & Watch: Parachute", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1981, gnw_octopus, 0,          0, gnw_octopus, gnw_octopus, gnw_octopus_state, empty_init, "Nintendo", "Game & Watch: Octopus", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1981, gnw_popeye,  0,          0, gnw_popeye,  gnw_popeye,  gnw_popeye_state,  empty_init, "Nintendo", "Game & Watch: Popeye (Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1981, gnw_chef,    0,          0, gnw_chef,    gnw_chef,    gnw_chef_state,    empty_init, "Nintendo", "Game & Watch: Chef", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, merrycook,   gnw_chef,   0, merrycook,   gnw_chef,    gnw_chef_state,    empty_init, "Elektronika", "Merry Cook", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1981, gnw_mmouse,  0,          0, gnw_mmouse,  gnw_mmouse,  gnw_mmouse_state,  empty_init, "Nintendo", "Game & Watch: Mickey Mouse (Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1981, gnw_egg,     gnw_mmouse, 0, gnw_egg,     gnw_mmouse,  gnw_mmouse_state,  empty_init, "Nintendo", "Game & Watch: Egg", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1984, nupogodi,    gnw_mmouse, 0, nupogodi,    gnw_mmouse,  gnw_mmouse_state,  empty_init, "Elektronika", "Nu, pogodi!", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, exospace,    gnw_mmouse, 0, exospace,    exospace,    gnw_mmouse_state,  empty_init, "Elektronika", "Explorers of Space", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1981, gnw_fire,    0,          0, gnw_fire,    gnw_fire,    gnw_fire_state,    empty_init, "Nintendo", "Game & Watch: Fire (Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, spacebridge, gnw_fire,   0, spacebridge, gnw_fire,    gnw_fire_state,    empty_init, "Elektronika", "Space Bridge", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1982, gnw_tbridge, 0,          0, gnw_tbridge, gnw_tbridge, gnw_tbridge_state, empty_init, "Nintendo", "Game & Watch: Turtle Bridge", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1982, gnw_fireatk, 0,          0, gnw_fireatk, gnw_fireatk, gnw_fireatk_state, empty_init, "Nintendo", "Game & Watch: Fire Attack", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1982, gnw_stennis, 0,          0, gnw_stennis, gnw_stennis, gnw_stennis_state, empty_init, "Nintendo", "Game & Watch: Snoopy Tennis", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1981, gnw_pchute,   0,           0, gnw_pchute,   gnw_pchute,   gnw_pchute_state,   empty_init, "Nintendo", "Game & Watch: Parachute", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1981, gnw_octopus,  0,           0, gnw_octopus,  gnw_octopus,  gnw_octopus_state,  empty_init, "Nintendo", "Game & Watch: Octopus", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1981, gnw_popeye,   0,           0, gnw_popeye,   gnw_popeye,   gnw_popeye_state,   empty_init, "Nintendo", "Game & Watch: Popeye (Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1981, gnw_chef,     0,           0, gnw_chef,     gnw_chef,     gnw_chef_state,     empty_init, "Nintendo", "Game & Watch: Chef", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, merrycook,    gnw_chef,    0, merrycook,    gnw_chef,     gnw_chef_state,     empty_init, "Elektronika", "Merry Cook", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1981, gnw_mmouse,   0,           0, gnw_mmouse,   gnw_mmouse,   gnw_mmouse_state,   empty_init, "Nintendo", "Game & Watch: Mickey Mouse (Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1981, gnw_egg,      gnw_mmouse,  0, gnw_egg,      gnw_mmouse,   gnw_mmouse_state,   empty_init, "Nintendo", "Game & Watch: Egg", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1984, nupogodi,     gnw_mmouse,  0, nupogodi,     gnw_mmouse,   gnw_mmouse_state,   empty_init, "Elektronika", "Nu, pogodi!", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, exospace,     gnw_mmouse,  0, exospace,     exospace,     gnw_mmouse_state,   empty_init, "Elektronika", "Explorers of Space", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1981, gnw_fire,     0,           0, gnw_fire,     gnw_fire,     gnw_fire_state,     empty_init, "Nintendo", "Game & Watch: Fire (Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, spacebridge,  gnw_fire,    0, spacebridge,  gnw_fire,     gnw_fire_state,     empty_init, "Elektronika", "Space Bridge", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1982, gnw_tbridge,  0,           0, gnw_tbridge,  gnw_tbridge,  gnw_tbridge_state,  empty_init, "Nintendo", "Game & Watch: Turtle Bridge", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1982, gnw_fireatk,  0,           0, gnw_fireatk,  gnw_fireatk,  gnw_fireatk_state,  empty_init, "Nintendo", "Game & Watch: Fire Attack", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1982, gnw_stennis,  0,           0, gnw_stennis,  gnw_stennis,  gnw_stennis_state,  empty_init, "Nintendo", "Game & Watch: Snoopy Tennis", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
 
 // Nintendo G&W: Multi Screen
-CONS( 1982, gnw_opanic,  0,          0, gnw_opanic,  gnw_opanic,  gnw_opanic_state,  empty_init, "Nintendo", "Game & Watch: Oil Panic", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1982, gnw_dkong,   0,          0, gnw_dkong,   gnw_dkong,   gnw_dkong_state,   empty_init, "Nintendo", "Game & Watch: Donkey Kong", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1982, gnw_mickdon, 0,          0, gnw_mickdon, gnw_mickdon, gnw_mickdon_state, empty_init, "Nintendo", "Game & Watch: Mickey & Donald", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1982, gnw_ghouse,  0,          0, gnw_ghouse,  gnw_ghouse,  gnw_ghouse_state,  empty_init, "Nintendo", "Game & Watch: Green House", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1983, gnw_dkong2,  0,          0, gnw_dkong2,  gnw_dkong2,  gnw_dkong2_state,  empty_init, "Nintendo", "Game & Watch: Donkey Kong II", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1983, gnw_mario,   0,          0, gnw_mario,   gnw_mario,   gnw_mario_state,   empty_init, "Nintendo", "Game & Watch: Mario Bros.", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1983, gnw_rshower, 0,          0, gnw_rshower, gnw_rshower, gnw_rshower_state, empty_init, "Nintendo", "Game & Watch: Rain Shower", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1983, gnw_lboat,   0,          0, gnw_lboat,   gnw_lboat,   gnw_lboat_state,   empty_init, "Nintendo", "Game & Watch: Life Boat", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1983, gnw_pinball, 0,          0, gnw_pinball, gnw_pinball, gnw_pinball_state, empty_init, "Nintendo", "Game & Watch: Pinball", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1985, gnw_bjack,   0,          0, gnw_bjack,   gnw_bjack,   gnw_bjack_state,   empty_init, "Nintendo", "Game & Watch: Black Jack", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1986, gnw_squish,  0,          0, gnw_squish,  gnw_squish,  gnw_squish_state,  empty_init, "Nintendo", "Game & Watch: Squish", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1987, gnw_bsweep,  0,          0, gnw_bsweep,  gnw_bsweep,  gnw_bsweep_state,  empty_init, "Nintendo", "Game & Watch: Bomb Sweeper", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1988, gnw_sbuster, 0,          0, gnw_sbuster, gnw_sbuster, gnw_sbuster_state, empty_init, "Nintendo", "Game & Watch: Safe Buster", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1988, gnw_gcliff,  0,          0, gnw_gcliff,  gnw_gcliff,  gnw_gcliff_state,  empty_init, "Nintendo", "Game & Watch: Gold Cliff", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, gnw_zelda,   0,          0, gnw_zelda,   gnw_zelda,   gnw_zelda_state,   empty_init, "Nintendo", "Game & Watch: Zelda", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1982, gnw_opanic,   0,           0, gnw_opanic,   gnw_opanic,   gnw_opanic_state,   empty_init, "Nintendo", "Game & Watch: Oil Panic", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1982, gnw_dkong,    0,           0, gnw_dkong,    gnw_dkong,    gnw_dkong_state,    empty_init, "Nintendo", "Game & Watch: Donkey Kong", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1982, gnw_mickdon,  0,           0, gnw_mickdon,  gnw_mickdon,  gnw_mickdon_state,  empty_init, "Nintendo", "Game & Watch: Mickey & Donald", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1982, gnw_ghouse,   0,           0, gnw_ghouse,   gnw_ghouse,   gnw_ghouse_state,   empty_init, "Nintendo", "Game & Watch: Green House", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, gnw_dkong2,   0,           0, gnw_dkong2,   gnw_dkong2,   gnw_dkong2_state,   empty_init, "Nintendo", "Game & Watch: Donkey Kong II", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, gnw_mario,    0,           0, gnw_mario,    gnw_mario,    gnw_mario_state,    empty_init, "Nintendo", "Game & Watch: Mario Bros.", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, gnw_rshower,  0,           0, gnw_rshower,  gnw_rshower,  gnw_rshower_state,  empty_init, "Nintendo", "Game & Watch: Rain Shower", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, gnw_lboat,    0,           0, gnw_lboat,    gnw_lboat,    gnw_lboat_state,    empty_init, "Nintendo", "Game & Watch: Life Boat", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, gnw_pinball,  0,           0, gnw_pinball,  gnw_pinball,  gnw_pinball_state,  empty_init, "Nintendo", "Game & Watch: Pinball", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1985, gnw_bjack,    0,           0, gnw_bjack,    gnw_bjack,    gnw_bjack_state,    empty_init, "Nintendo", "Game & Watch: Black Jack", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1986, gnw_squish,   0,           0, gnw_squish,   gnw_squish,   gnw_squish_state,   empty_init, "Nintendo", "Game & Watch: Squish", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1987, gnw_bsweep,   0,           0, gnw_bsweep,   gnw_bsweep,   gnw_bsweep_state,   empty_init, "Nintendo", "Game & Watch: Bomb Sweeper", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1988, gnw_sbuster,  0,           0, gnw_sbuster,  gnw_sbuster,  gnw_sbuster_state,  empty_init, "Nintendo", "Game & Watch: Safe Buster", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1988, gnw_gcliff,   0,           0, gnw_gcliff,   gnw_gcliff,   gnw_gcliff_state,   empty_init, "Nintendo", "Game & Watch: Gold Cliff", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, gnw_zelda,    0,           0, gnw_zelda,    gnw_zelda,    gnw_zelda_state,    empty_init, "Nintendo", "Game & Watch: Zelda", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
 
 // Nintendo G&W: New Wide Screen / Crystal Screen
-CONS( 1982, gnw_dkjr,    0,          0, gnw_dkjr,    gnw_dkjr,    gnw_dkjr_state,    empty_init, "Nintendo", "Game & Watch: Donkey Kong Jr. (New Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1983, gnw_mariocm, 0,          0, gnw_mariocm, gnw_mariocm, gnw_mariocm_state, empty_init, "Nintendo", "Game & Watch: Mario's Cement Factory (New Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1983, gnw_manhole, 0,          0, gnw_manhole, gnw_manhole, gnw_manhole_state, empty_init, "Nintendo", "Game & Watch: Manhole (New Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1985, gnw_tfish,   0,          0, gnw_tfish,   gnw_tfish,   gnw_tfish_state,   empty_init, "Nintendo", "Game & Watch: Tropical Fish", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1986, gnw_smb,     0,          0, gnw_smb,     gnw_smb,     gnw_smb_state,     empty_init, "Nintendo", "Game & Watch: Super Mario Bros. (Crystal Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1988, gnw_smbn,    gnw_smb,    0, gnw_smbn,    gnw_smb,     gnw_smb_state,     empty_init, "Nintendo", "Game & Watch: Super Mario Bros. (New Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1986, gnw_climber, 0,          0, gnw_climber, gnw_climber, gnw_climber_state, empty_init, "Nintendo", "Game & Watch: Climber (Crystal Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1988, gnw_climbern,gnw_climber,0, gnw_climbern,gnw_climber, gnw_climber_state, empty_init, "Nintendo", "Game & Watch: Climber (New Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1986, gnw_bfight,  0,          0, gnw_bfight,  gnw_bfight,  gnw_bfight_state,  empty_init, "Nintendo", "Game & Watch: Balloon Fight (Crystal Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1988, gnw_bfightn, gnw_bfight, 0, gnw_bfightn, gnw_bfight,  gnw_bfight_state,  empty_init, "Nintendo", "Game & Watch: Balloon Fight (New Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1991, gnw_mariotj, 0,          0, gnw_mariotj, gnw_mariotj, gnw_mariotj_state, empty_init, "Nintendo", "Game & Watch: Mario The Juggler", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1982, gnw_dkjr,     0,           0, gnw_dkjr,     gnw_dkjr,     gnw_dkjr_state,     empty_init, "Nintendo", "Game & Watch: Donkey Kong Jr. (New Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, gnw_mariocm,  0,           0, gnw_mariocm,  gnw_mariocm,  gnw_mariocm_state,  empty_init, "Nintendo", "Game & Watch: Mario's Cement Factory (New Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, gnw_manhole,  0,           0, gnw_manhole,  gnw_manhole,  gnw_manhole_state,  empty_init, "Nintendo", "Game & Watch: Manhole (New Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1985, gnw_tfish,    0,           0, gnw_tfish,    gnw_tfish,    gnw_tfish_state,    empty_init, "Nintendo", "Game & Watch: Tropical Fish", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1986, gnw_smb,      0,           0, gnw_smb,      gnw_smb,      gnw_smb_state,      empty_init, "Nintendo", "Game & Watch: Super Mario Bros. (Crystal Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1988, gnw_smbn,     gnw_smb,     0, gnw_smbn,     gnw_smb,      gnw_smb_state,      empty_init, "Nintendo", "Game & Watch: Super Mario Bros. (New Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1986, gnw_climber,  0,           0, gnw_climber,  gnw_climber,  gnw_climber_state,  empty_init, "Nintendo", "Game & Watch: Climber (Crystal Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1988, gnw_climbern, gnw_climber, 0, gnw_climbern, gnw_climber,  gnw_climber_state,  empty_init, "Nintendo", "Game & Watch: Climber (New Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1986, gnw_bfight,   0,           0, gnw_bfight,   gnw_bfight,   gnw_bfight_state,   empty_init, "Nintendo", "Game & Watch: Balloon Fight (Crystal Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1988, gnw_bfightn,  gnw_bfight,  0, gnw_bfightn,  gnw_bfight,   gnw_bfight_state,   empty_init, "Nintendo", "Game & Watch: Balloon Fight (New Wide Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1991, gnw_mariotj,  0,           0, gnw_mariotj,  gnw_mariotj,  gnw_mariotj_state,  empty_init, "Nintendo", "Game & Watch: Mario The Juggler", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
 
 // Nintendo G&W: Table Top / Panorama Screen (the first Table Top releases in Japan were called "Color Screen")
-CONS( 1983, gnw_mariocmt,0,          0, gnw_mariocmt,gnw_mariocmt,gnw_mariocmt_state,empty_init, "Nintendo", "Game & Watch: Mario's Cement Factory (Table Top)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1983, gnw_snoopyp, 0,          0, gnw_snoopyp, gnw_snoopyp, gnw_snoopyp_state, empty_init, "Nintendo", "Game & Watch: Snoopy (Panorama Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1983, gnw_popeyep, 0,          0, gnw_popeyep, gnw_popeyep, gnw_popeyep_state, empty_init, "Nintendo", "Game & Watch: Popeye (Panorama Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1983, gnw_dkjrp,   0,          0, gnw_dkjrp,   gnw_dkjrp,   gnw_dkjrp_state,   empty_init, "Nintendo", "Game & Watch: Donkey Kong Jr. (Panorama Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1983, gnw_mbaway,  0,          0, gnw_mbaway,  gnw_mbaway,  gnw_mbaway_state,  empty_init, "Nintendo", "Game & Watch: Mario's Bombs Away", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1984, gnw_mmousep, 0,          0, gnw_mmousep, gnw_mmousep, gnw_mmousep_state, empty_init, "Nintendo", "Game & Watch: Mickey Mouse (Panorama Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1984, gnw_dkcirc,  gnw_mmousep,0, gnw_dkcirc,  gnw_mmousep, gnw_mmousep_state, empty_init, "Nintendo", "Game & Watch: Donkey Kong Circus", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, gnw_mariocmt, 0,           0, gnw_mariocmt, gnw_mariocmt, gnw_mariocmt_state, empty_init, "Nintendo", "Game & Watch: Mario's Cement Factory (Table Top)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, gnw_snoopyp,  0,           0, gnw_snoopyp,  gnw_snoopyp,  gnw_snoopyp_state,  empty_init, "Nintendo", "Game & Watch: Snoopy (Panorama Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, gnw_popeyep,  0,           0, gnw_popeyep,  gnw_popeyep,  gnw_popeyep_state,  empty_init, "Nintendo", "Game & Watch: Popeye (Panorama Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, gnw_dkjrp,    0,           0, gnw_dkjrp,    gnw_dkjrp,    gnw_dkjrp_state,    empty_init, "Nintendo", "Game & Watch: Donkey Kong Jr. (Panorama Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, gnw_mbaway,   0,           0, gnw_mbaway,   gnw_mbaway,   gnw_mbaway_state,   empty_init, "Nintendo", "Game & Watch: Mario's Bombs Away", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1984, gnw_mmousep,  0,           0, gnw_mmousep,  gnw_mmousep,  gnw_mmousep_state,  empty_init, "Nintendo", "Game & Watch: Mickey Mouse (Panorama Screen)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1984, gnw_dkcirc,   gnw_mmousep, 0, gnw_dkcirc,   gnw_mmousep,  gnw_mmousep_state,  empty_init, "Nintendo", "Game & Watch: Donkey Kong Circus", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
 
 // Nintendo G&W: Super Color
-CONS( 1984, gnw_ssparky, 0,          0, gnw_ssparky, gnw_ssparky, gnw_ssparky_state, empty_init, "Nintendo", "Game & Watch: Spitball Sparky", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1984, gnw_cgrab,   0,          0, gnw_cgrab,   gnw_cgrab,   gnw_cgrab_state,   empty_init, "Nintendo", "Game & Watch: Crab Grab", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1984, gnw_ssparky,  0,           0, gnw_ssparky,  gnw_ssparky,  gnw_ssparky_state,  empty_init, "Nintendo", "Game & Watch: Spitball Sparky", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1984, gnw_cgrab,    0,           0, gnw_cgrab,    gnw_cgrab,    gnw_cgrab_state,    empty_init, "Nintendo", "Game & Watch: Crab Grab", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
 
 // Nintendo G&W: Micro Vs. System (actually, no official Game & Watch logo anywhere)
-CONS( 1984, gnw_boxing,  0,          0, gnw_boxing,  gnw_boxing,  gnw_boxing_state,  empty_init, "Nintendo", "Micro Vs. System: Boxing", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1984, gnw_dkong3,  0,          0, gnw_dkong3,  gnw_dkong3,  gnw_dkong3_state,  empty_init, "Nintendo", "Micro Vs. System: Donkey Kong 3", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1984, gnw_boxing,   0,           0, gnw_boxing,   gnw_boxing,   gnw_boxing_state,   empty_init, "Nintendo", "Micro Vs. System: Boxing", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1984, gnw_dkong3,   0,           0, gnw_dkong3,   gnw_dkong3,   gnw_dkong3_state,   empty_init, "Nintendo", "Micro Vs. System: Donkey Kong 3", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1984, gnw_dkhockey, 0,           0, gnw_dkhockey, gnw_dkhockey, gnw_dkhockey_state, empty_init, "Nintendo", "Micro Vs. System: Donkey Kong Hockey", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+
+// Nintendo G&W hardware licensed to other companies (not part of G&W series)
+CONS( 1984, bassmate,     0,           0, bassmate,     bassmate,     bassmate_state,     empty_init, "Telko / Nintendo", "Bassmate Computer", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
 
 // Konami
-CONS( 1989, kdribble,    0,          0, kdribble,    kdribble,    kdribble_state,    empty_init, "Konami", "Double Dribble (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, ktopgun,     0,          0, ktopgun,     ktopgun,     ktopgun_state,     empty_init, "Konami", "Top Gun (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, kcontra,     0,          0, kcontra,     kcontra,     kcontra_state,     empty_init, "Konami", "Contra (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, ktmnt,       0,          0, ktmnt,       ktmnt,       ktmnt_state,       empty_init, "Konami", "Teenage Mutant Ninja Turtles (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, kgradius,    0,          0, kgradius,    kgradius,    kgradius_state,    empty_init, "Konami", "Gradius (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, kloneran,    0,          0, kloneran,    kloneran,    kloneran_state,    empty_init, "Konami", "Lone Ranger (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, kblades,     0,          0, kblades,     kblades,     kblades_state,     empty_init, "Konami", "Blades of Steel (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, knfl,        0,          0, knfl,        knfl,        knfl_state,        empty_init, "Konami", "NFL Football (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, kbilly,      0,          0, kbilly,      kbilly,      kbilly_state,      empty_init, "Konami", "The Adventures of Bayou Billy (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1991, kbucky,      0,          0, kbucky,      kbucky,      kbucky_state,      empty_init, "Konami", "Bucky O'Hare (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1991, kgarfld,     0,          0, kgarfld,     kgarfld,     kgarfld_state,     empty_init, "Konami", "Garfield (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, kdribble,     0,           0, kdribble,     kdribble,     kdribble_state,     empty_init, "Konami", "Double Dribble (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, ktopgun,      0,           0, ktopgun,      ktopgun,      ktopgun_state,      empty_init, "Konami", "Top Gun (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, kcontra,      0,           0, kcontra,      kcontra,      kcontra_state,      empty_init, "Konami", "Contra (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, ktmnt,        0,           0, ktmnt,        ktmnt,        ktmnt_state,        empty_init, "Konami", "Teenage Mutant Ninja Turtles (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, kgradius,     0,           0, kgradius,     kgradius,     kgradius_state,     empty_init, "Konami", "Gradius (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, kloneran,     0,           0, kloneran,     kloneran,     kloneran_state,     empty_init, "Konami", "Lone Ranger (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, kblades,      0,           0, kblades,      kblades,      kblades_state,      empty_init, "Konami", "Blades of Steel (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, knfl,         0,           0, knfl,         knfl,         knfl_state,         empty_init, "Konami", "NFL Football (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, kbilly,       0,           0, kbilly,       kbilly,       kbilly_state,       empty_init, "Konami", "The Adventures of Bayou Billy (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1991, kbucky,       0,           0, kbucky,       kbucky,       kbucky_state,       empty_init, "Konami", "Bucky O'Hare (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1991, kgarfld,      0,           0, kgarfld,      kgarfld,      kgarfld_state,      empty_init, "Konami", "Garfield (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
 
 // Tiger 7-xxx/78-xxx models
-CONS( 1989, tgaunt,      0,          0, tgaunt,      tgaunt,      tgaunt_state,      empty_init, "Tiger Electronics (licensed from Tengen)", "Gauntlet (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1991, trobhood,    tgaunt,     0, trobhood,    trobhood,    tgaunt_state,      empty_init, "Tiger Electronics", "Robin Hood (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, tddragon,    0,          0, tddragon,    tddragon,    tddragon_state,    empty_init, "Tiger Electronics (licensed from Technos/Tradewest)", "Double Dragon (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, tkarnov,     0,          0, tkarnov,     tkarnov,     tkarnov_state,     empty_init, "Tiger Electronics (licensed from Data East)", "Karnov (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, tvindictr,   0,          0, tvindictr,   tvindictr,   tvindictr_state,   empty_init, "Tiger Electronics (licensed from Tengen)", "Vindicators (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, tgaiden,     0,          0, tgaiden,     tgaiden,     tgaiden_state,     empty_init, "Tiger Electronics (licensed from Tecmo)", "Ninja Gaiden (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1989, tbatman,     0,          0, tbatman,     tbatman,     tbatman_state,     empty_init, "Tiger Electronics", "Batman (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1990, tsharr2,     0,          0, tsharr2,     tsharr2,     tsharr2_state,     empty_init, "Tiger Electronics (licensed from Sega)", "Space Harrier II (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1990, tstrider,    0,          0, tstrider,    tstrider,    tstrider_state,    empty_init, "Tiger Electronics (licensed from Capcom)", "Strider (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1990, tgoldnaxe,   0,          0, tgoldnaxe,   tgoldnaxe,   tgoldnaxe_state,   empty_init, "Tiger Electronics (licensed from Sega)", "Golden Axe (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1990, trobocop2,   0,          0, trobocop2,   trobocop2,   trobocop2_state,   empty_init, "Tiger Electronics", "Robocop 2 (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1991, trockteer,   trobocop2,  0, trockteer,   trockteer,   trobocop2_state,   empty_init, "Tiger Electronics", "The Rocketeer (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1990, taltbeast,   0,          0, taltbeast,   taltbeast,   taltbeast_state,   empty_init, "Tiger Electronics (licensed from Sega)", "Altered Beast (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1990, tsf2010,     0,          0, tsf2010,     tsf2010,     tsf2010_state,     empty_init, "Tiger Electronics (licensed from Capcom)", "Street Fighter 2010 - The Final Fight (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1991, tswampt,     0,          0, tswampt,     tswampt,     tswampt_state,     empty_init, "Tiger Electronics", "Swamp Thing (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1991, tspidman,    0,          0, tspidman,    tspidman,    tspidman_state,    empty_init, "Tiger Electronics", "Spider-Man (handheld, Tiger 1991 version)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1991, txmen,       0,          0, txmen,       txmen,       txmen_state,       empty_init, "Tiger Electronics", "X-Men (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1991, tddragon3,   0,          0, tddragon3,   tddragon3,   tddragon3_state,   empty_init, "Tiger Electronics (licensed from Technos)", "Double Dragon 3 - The Rosetta Stone (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1991, tflash,      0,          0, tflash,      tflash,      tflash_state,      empty_init, "Tiger Electronics", "The Flash (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1991, tmchammer,   0,          0, tmchammer,   tmchammer,   tmchammer_state,   empty_init, "Tiger Electronics", "MC Hammer: U Can't Touch This (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1991, tbtoads,     0,          0, tbtoads,     tbtoads,     tbtoads_state,     empty_init, "Tiger Electronics (licensed from Rare/Tradewest)", "Battletoads (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1991, thook,       0,          0, thook,       thook,       thook_state,       empty_init, "Tiger Electronics", "Hook (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1992, tbttf,       0,          0, tbttf,       tbttf,       tbttf_state,       empty_init, "Tiger Electronics", "Back to the Future (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1992, taddams,     0,          0, taddams,     taddams,     taddams_state,     empty_init, "Tiger Electronics", "The Addams Family (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1992, thalone,     0,          0, thalone,     thalone,     thalone_state,     empty_init, "Tiger Electronics", "Home Alone (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1993, txmenpx,     0,          0, txmenpx,     txmenpx,     txmenpx_state,     empty_init, "Tiger Electronics", "X-Men - Project X (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1992, thalone2,    0,          0, thalone2,    thalone2,    thalone2_state,    empty_init, "Tiger Electronics", "Home Alone 2 - Lost in New York (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1992, tsonic,      0,          0, tsonic,      tsonic,      tsonic_state,      empty_init, "Tiger Electronics (licensed from Sega)", "Sonic The Hedgehog (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1992, trobocop3,   0,          0, trobocop3,   trobocop3,   trobocop3_state,   empty_init, "Tiger Electronics", "Robocop 3 (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1993, tdummies,    0,          0, tdummies,    tdummies,    tdummies_state,    empty_init, "Tiger Electronics", "The Incredible Crash Dummies (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1993, tsfight2,    0,          0, tsfight2,    tsfight2,    tsfight2_state,    empty_init, "Tiger Electronics (licensed from Capcom)", "Street Fighter II (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1992, twworld,     0,          0, twworld,     twworld,     twworld_state,     empty_init, "Tiger Electronics", "Wayne's World (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1993, tjpark,      0,          0, tjpark,      tjpark,      tjpark_state,      empty_init, "Tiger Electronics", "Jurassic Park (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1993, tsonic2,     0,          0, tsonic2,     tsonic2,     tsonic2_state,     empty_init, "Tiger Electronics (licensed from Sega)", "Sonic The Hedgehog 2 (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1993, tsddragon,   0,          0, tsddragon,   tsddragon,   tsddragon_state,   empty_init, "Tiger Electronics (licensed from Technos)", "Super Double Dragon (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1993, tdennis,     0,          0, tdennis,     tdennis,     tdennis_state,     empty_init, "Tiger Electronics", "Dennis the Menace (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1993, tnmarebc,    0,          0, tnmarebc,    tnmarebc,    tnmarebc_state,    empty_init, "Tiger Electronics", "Nightmare Before Christmas (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) // note: title has no "The"
-CONS( 1993, ttransf2,    0,          0, ttransf2,    ttransf2,    ttransf2_state,    empty_init, "Tiger Electronics", "Transformers - Generation 2 (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1994, topaliens,   0,          0, topaliens,   topaliens,   topaliens_state,   empty_init, "Tiger Electronics", "Operation: Aliens (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1993, tmkombat,    0,          0, tmkombat,    tmkombat,    tmkombat_state,    empty_init, "Tiger Electronics (licensed from Midway)", "Mortal Kombat (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1994, tshadow,     0,          0, tshadow,     tshadow,     tshadow_state,     empty_init, "Tiger Electronics", "The Shadow (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1994, tskelwarr,   0,          0, tskelwarr,   tskelwarr,   tskelwarr_state,   empty_init, "Tiger Electronics", "Skeleton Warriors - The Dark Crusade (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1995, tbatfor,     0,          0, tbatfor,     tbatfor,     tbatfor_state,     empty_init, "Tiger Electronics", "Batman Forever - Double Dose of Doom (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1995, tjdredd,     0,          0, tjdredd,     tjdredd,     tjdredd_state,     empty_init, "Tiger Electronics", "Judge Dredd (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1995, tapollo13,   0,          0, tapollo13,   tapollo13,   tapollo13_state,   empty_init, "Tiger Electronics", "Apollo 13 (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1995, tgoldeye,    0,          0, tgoldeye,    tgoldeye,    tgoldeye_state,    empty_init, "Tiger Electronics", "007: GoldenEye (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1996, tkazaam,     0,          0, tkazaam,     tkazaam,     tkazaam_state,     empty_init, "Tiger Electronics", "Kazaam (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1996, tsjam,       0,          0, tsjam,       tsjam,       tsjam_state,       empty_init, "Tiger Electronics", "Space Jam (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1996, tinday,      0,          0, tinday,      tinday,      tinday_state,      empty_init, "Tiger Electronics", "Independence Day (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, tgaunt,       0,           0, tgaunt,       tgaunt,       tgaunt_state,       empty_init, "Tiger Electronics (licensed from Tengen)", "Gauntlet (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1991, trobhood,     tgaunt,      0, trobhood,     trobhood,     tgaunt_state,       empty_init, "Tiger Electronics", "Robin Hood (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, tddragon,     0,           0, tddragon,     tddragon,     tddragon_state,     empty_init, "Tiger Electronics (licensed from Technos/Tradewest)", "Double Dragon (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, tkarnov,      0,           0, tkarnov,      tkarnov,      tkarnov_state,      empty_init, "Tiger Electronics (licensed from Data East)", "Karnov (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, tvindictr,    0,           0, tvindictr,    tvindictr,    tvindictr_state,    empty_init, "Tiger Electronics (licensed from Tengen)", "Vindicators (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, tgaiden,      0,           0, tgaiden,      tgaiden,      tgaiden_state,      empty_init, "Tiger Electronics (licensed from Tecmo)", "Ninja Gaiden (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1989, tbatman,      0,           0, tbatman,      tbatman,      tbatman_state,      empty_init, "Tiger Electronics", "Batman (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1990, tsharr2,      0,           0, tsharr2,      tsharr2,      tsharr2_state,      empty_init, "Tiger Electronics (licensed from Sega)", "Space Harrier II (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1990, tstrider,     0,           0, tstrider,     tstrider,     tstrider_state,     empty_init, "Tiger Electronics (licensed from Capcom)", "Strider (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1990, tgoldnaxe,    0,           0, tgoldnaxe,    tgoldnaxe,    tgoldnaxe_state,    empty_init, "Tiger Electronics (licensed from Sega)", "Golden Axe (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1990, trobocop2,    0,           0, trobocop2,    trobocop2,    trobocop2_state,    empty_init, "Tiger Electronics", "Robocop 2 (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1991, trockteer,    trobocop2,   0, trockteer,    trockteer,    trobocop2_state,    empty_init, "Tiger Electronics", "The Rocketeer (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1990, taltbeast,    0,           0, taltbeast,    taltbeast,    taltbeast_state,    empty_init, "Tiger Electronics (licensed from Sega)", "Altered Beast (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1990, tsf2010,      0,           0, tsf2010,      tsf2010,      tsf2010_state,      empty_init, "Tiger Electronics (licensed from Capcom)", "Street Fighter 2010 - The Final Fight (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1991, tswampt,      0,           0, tswampt,      tswampt,      tswampt_state,      empty_init, "Tiger Electronics", "Swamp Thing (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1991, tspidman,     0,           0, tspidman,     tspidman,     tspidman_state,     empty_init, "Tiger Electronics", "Spider-Man (handheld, Tiger 1991 version)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1991, txmen,        0,           0, txmen,        txmen,        txmen_state,        empty_init, "Tiger Electronics", "X-Men (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1991, tddragon3,    0,           0, tddragon3,    tddragon3,    tddragon3_state,    empty_init, "Tiger Electronics (licensed from Technos)", "Double Dragon 3 - The Rosetta Stone (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1991, tflash,       0,           0, tflash,       tflash,       tflash_state,       empty_init, "Tiger Electronics", "The Flash (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1991, tmchammer,    0,           0, tmchammer,    tmchammer,    tmchammer_state,    empty_init, "Tiger Electronics", "MC Hammer: U Can't Touch This (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1991, tbtoads,      0,           0, tbtoads,      tbtoads,      tbtoads_state,      empty_init, "Tiger Electronics (licensed from Rare/Tradewest)", "Battletoads (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1991, thook,        0,           0, thook,        thook,        thook_state,        empty_init, "Tiger Electronics", "Hook (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1992, tbttf,        0,           0, tbttf,        tbttf,        tbttf_state,        empty_init, "Tiger Electronics", "Back to the Future (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1992, taddams,      0,           0, taddams,      taddams,      taddams_state,      empty_init, "Tiger Electronics", "The Addams Family (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1992, thalone,      0,           0, thalone,      thalone,      thalone_state,      empty_init, "Tiger Electronics", "Home Alone (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1993, txmenpx,      0,           0, txmenpx,      txmenpx,      txmenpx_state,      empty_init, "Tiger Electronics", "X-Men - Project X (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1992, thalone2,     0,           0, thalone2,     thalone2,     thalone2_state,     empty_init, "Tiger Electronics", "Home Alone 2 - Lost in New York (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1992, tsonic,       0,           0, tsonic,       tsonic,       tsonic_state,       empty_init, "Tiger Electronics (licensed from Sega)", "Sonic The Hedgehog (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1992, trobocop3,    0,           0, trobocop3,    trobocop3,    trobocop3_state,    empty_init, "Tiger Electronics", "Robocop 3 (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1993, tdummies,     0,           0, tdummies,     tdummies,     tdummies_state,     empty_init, "Tiger Electronics", "The Incredible Crash Dummies (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1993, tsfight2,     0,           0, tsfight2,     tsfight2,     tsfight2_state,     empty_init, "Tiger Electronics (licensed from Capcom)", "Street Fighter II (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1992, twworld,      0,           0, twworld,      twworld,      twworld_state,      empty_init, "Tiger Electronics", "Wayne's World (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1993, tjpark,       0,           0, tjpark,       tjpark,       tjpark_state,       empty_init, "Tiger Electronics", "Jurassic Park (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1993, tsonic2,      0,           0, tsonic2,      tsonic2,      tsonic2_state,      empty_init, "Tiger Electronics (licensed from Sega)", "Sonic The Hedgehog 2 (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1993, tsddragon,    0,           0, tsddragon,    tsddragon,    tsddragon_state,    empty_init, "Tiger Electronics (licensed from Technos)", "Super Double Dragon (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1993, tdennis,      0,           0, tdennis,      tdennis,      tdennis_state,      empty_init, "Tiger Electronics", "Dennis the Menace (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1993, tnmarebc,     0,           0, tnmarebc,     tnmarebc,     tnmarebc_state,     empty_init, "Tiger Electronics", "Nightmare Before Christmas (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK ) // note: title has no "The"
+CONS( 1993, ttransf2,     0,           0, ttransf2,     ttransf2,     ttransf2_state,     empty_init, "Tiger Electronics", "Transformers - Generation 2 (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1994, topaliens,    0,           0, topaliens,    topaliens,    topaliens_state,    empty_init, "Tiger Electronics", "Operation: Aliens (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1993, tmkombat,     0,           0, tmkombat,     tmkombat,     tmkombat_state,     empty_init, "Tiger Electronics (licensed from Midway)", "Mortal Kombat (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1994, tshadow,      0,           0, tshadow,      tshadow,      tshadow_state,      empty_init, "Tiger Electronics", "The Shadow (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1994, tskelwarr,    0,           0, tskelwarr,    tskelwarr,    tskelwarr_state,    empty_init, "Tiger Electronics", "Skeleton Warriors - The Dark Crusade (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1995, tbatfor,      0,           0, tbatfor,      tbatfor,      tbatfor_state,      empty_init, "Tiger Electronics", "Batman Forever - Double Dose of Doom (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1995, tjdredd,      0,           0, tjdredd,      tjdredd,      tjdredd_state,      empty_init, "Tiger Electronics", "Judge Dredd (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1995, tapollo13,    0,           0, tapollo13,    tapollo13,    tapollo13_state,    empty_init, "Tiger Electronics", "Apollo 13 (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1995, tgoldeye,     0,           0, tgoldeye,     tgoldeye,     tgoldeye_state,     empty_init, "Tiger Electronics", "007: GoldenEye (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1996, tkazaam,      0,           0, tkazaam,      tkazaam,      tkazaam_state,      empty_init, "Tiger Electronics", "Kazaam (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1996, tsjam,        0,           0, tsjam,        tsjam,        tsjam_state,        empty_init, "Tiger Electronics", "Space Jam (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1996, tinday,       0,           0, tinday,       tinday,       tinday_state,       empty_init, "Tiger Electronics", "Independence Day (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
 
 // Tiger 72-xxx models
-CONS( 1992, tbatmana,    0,          0, tbatmana,    tbatmana,    tbatmana_state,    empty_init, "Tiger Electronics", "Batman: The Animated Series (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1992, tbatmana,     0,           0, tbatmana,     tbatmana,     tbatmana_state,     empty_init, "Tiger Electronics", "Batman: The Animated Series (handheld)", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
 
 // Tronica
-CONS( 1983, trshutvoy,   0,          0, trshutvoy,   trshutvoy,   trshutvoy_state,   empty_init, "Tronica", "Shuttle Voyage", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1983, tigarden,    trshutvoy,  0, tigarden,    trshutvoy,   trshutvoy_state,   empty_init, "Tronica", "Thief in Garden", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
-CONS( 1982, trsrescue,   0,          0, trsrescue,   trsrescue,   trsrescue_state,   empty_init, "Tronica", "Space Rescue", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, trshutvoy,    0,           0, trshutvoy,    trshutvoy,    trshutvoy_state,    empty_init, "Tronica", "Shuttle Voyage", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1983, tigarden,     trshutvoy,   0, tigarden,     trshutvoy,    trshutvoy_state,    empty_init, "Tronica", "Thief in Garden", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
+CONS( 1982, trsrescue,    0,           0, trsrescue,    trsrescue,    trsrescue_state,    empty_init, "Tronica", "Space Rescue", MACHINE_SUPPORTS_SAVE | MACHINE_REQUIRES_ARTWORK )
 
 // misc
-CONS( 1989, nummunch,    0,          0, nummunch,    nummunch,    nummunch_state,    empty_init, "VTech", "Electronic Number Muncher", MACHINE_SUPPORTS_SAVE )
+CONS( 1989, nummunch,     0,           0, nummunch,     nummunch,     nummunch_state,     empty_init, "VTech", "Electronic Number Muncher", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/hng64.cpp mame-0.224+dfsg.1/src/mame/drivers/hng64.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/hng64.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/hng64.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1770,9 +1770,6 @@
 	m_maincpu->add_fastram(0x04000000, 0x05ffffff, true,  m_cart);
 	m_maincpu->add_fastram(0x1fc00000, 0x1fc7ffff, true,  m_rombase);
 
-	m_comm_rom = memregion("user2")->base();
-	m_comm_ram = std::make_unique<uint8_t[]>(0x10000);
-
 	for (int i = 0; i < 0x38 / 4; i++)
 	{
 		m_videoregs[i] = 0xdeadbeef;
@@ -2195,7 +2192,7 @@
 	hng64(config);
 
 	hng64_lamps_device &lamps(HNG64_LAMPS(config, m_lamps, 0));
-	lamps.lamps6_out_cb().set(FUNC(hng64_state::hng64_shoot_lamps6_w)); // start lamps (some misisng?!)
+	lamps.lamps6_out_cb().set(FUNC(hng64_state::hng64_shoot_lamps6_w)); // start lamps (some missing?!)
 	lamps.lamps7_out_cb().set(FUNC(hng64_state::hng64_shoot_lamps7_w)); // gun lamps
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/homelab.cpp mame-0.224+dfsg.1/src/mame/drivers/homelab.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/homelab.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/homelab.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -16,6 +16,8 @@
     - homelab2 - cassette to fix.
                  Note that rom code 0x40-48 is meaningless garbage,
                  had to patch to stop it crashing. Need a new dump.
+               - The speaker code is wrong, but it's the only way to
+                 get any sound. Needs to be looked at again.
     - homelab3/4 - Need a dump of the TM188 prom.
                  cassette to fix.
                  up to 64k ram can be fitted. schematic only shows 16k.
@@ -35,9 +37,9 @@
 #include "cpu/z80/z80.h"
 #include "imagedev/cassette.h"
 #include "imagedev/snapquik.h"
-#include "sound/dac.h"
 #include "sound/mea8000.h"
-#include "sound/volt_reg.h"
+#include "sound/spkrdev.h"
+#include "machine/timer.h"
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
@@ -50,8 +52,9 @@
 	homelab_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
+		, m_bank1(*this, "bank1")
 		, m_p_chargen(*this, "chargen")
-		, m_dac(*this, "dac")
+		, m_speaker(*this, "speaker")
 		, m_cass(*this, "cassette")
 		, m_io_keyboard(*this, "X%d", 0)
 	{ }
@@ -63,8 +66,9 @@
 	u8 m_rows;
 	u8 m_cols;
 	required_device<cpu_device> m_maincpu;
+	required_memory_bank    m_bank1;
 	required_region_ptr<u8> m_p_chargen;
-	required_device<dac_bit_interface> m_dac;
+	required_device<speaker_sound_device> m_speaker;
 	required_device<cassette_image_device> m_cass;
 	required_ioport_array<16> m_io_keyboard;
 };
@@ -82,10 +86,13 @@
 	void machine_start() override;
 	INTERRUPT_GEN_MEMBER(homelab_frame);
 	void homelab2_mem(address_map &map);
-	u8 key_r(offs_t offset);
-	void cass_w(offs_t offset, u8 data);
 	u8 cass2_r();
 	bool m_nmi;
+	bool m_spr_bit;
+	u8 mem3800_r();
+	u8 mem3a00_r(offs_t);
+	void mem3c00_w(offs_t, u8);
+	void mem3e00_w(offs_t, u8);
 };
 
 class homelab3_state : public homelab_state
@@ -102,7 +109,6 @@
 private:
 	u8 exxx_r(offs_t offset);
 	std::unique_ptr<u8[]> m_ram;
-	bool m_ramhere;
 	void port7f_w(u8 data);
 	void portff_w(u8 data);
 	void machine_start() override;
@@ -120,57 +126,58 @@
 		m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
 }
 
-u8 homelab2_state::key_r(offs_t offset) // offset 27F-2FE
+u8 homelab2_state::mem3800_r()
 {
-	if (offset == 0x38) // 0x3838
-	{
-		m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
-		return 0;
-	}
+	return m_io_keyboard[15]->read();  // reset key
+}
 
+u8 homelab2_state::mem3a00_r(offs_t offset)
+{
 	u8 i,data = 0xff;
 
 	for (i=0; i<8; i++)
-	{
 		if (!BIT(offset, i))
-		{
 			data &= m_io_keyboard[i]->read();
-		}
-	}
 
 	return data;
 }
 
-u8 homelab2_state::cass2_r()
+void homelab2_state::mem3c00_w(offs_t offset, u8 data)
 {
-	return (m_cass->input() > 0.03) ? 0xff : 0;
+	m_spr_bit ^= 1;
+	m_speaker->level_w(m_spr_bit? -1.0 : +1.0);
+	m_cass->output(m_spr_bit ? -1.0 : +1.0);
 }
 
-void homelab2_state::cass_w(offs_t offset, u8 data)
+void homelab2_state::mem3e00_w(offs_t offset, u8 data)
 {
-	if (offset == 0x73f) // 0x3f3f
+	if (BIT(offset, 8))
+	{
+		m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
 		m_nmi = true;
+	}
 	else
-	if (offset == 0x63e) // 0x3e3e
 		m_nmi = false;
-	else
-	if (offset == 0x400) // 0x3c00
-		m_cass->output(BIT(data, 0) ? -1.0 : +1.0); // FIXME
+}
+
+u8 homelab2_state::cass2_r()
+{
+	return (m_cass->input() > 0.03) ? 0x37 : 0;
 }
 
 void homelab3_state::machine_reset()
 {
-	m_ramhere = true;
+	m_bank1->set_entry(1);
 }
 
 void homelab3_state::port7f_w(u8 data)
 {
-	m_ramhere = true;
+	m_bank1->set_entry(1);
 }
 
 void homelab3_state::portff_w(u8 data)
 {
-	m_ramhere = false;
+	m_bank1->set_entry(0);
 }
 
 READ_LINE_MEMBER( homelab3_state::cass3_r )
@@ -191,21 +198,20 @@
 	else
 	if (offset == 0x80)
 	{
-		m_dac->write(0);
+		m_speaker->level_w(0);
 		m_cass->output(-1.0);
 	}
 	else
 	if (offset == 0x02)
 	{
-		m_dac->write(1);
+		m_speaker->level_w(1);
 		m_cass->output(+1.0);
 	}
 
 	u8 data = 0xff;
 	if (offset < 0x10)
-	{
 		data = m_io_keyboard[offset]->read();
-	}
+
 	return data;
 }
 
@@ -220,10 +226,13 @@
 	map(0x2000, 0x27ff).rom();  // ROM 5
 	map(0x2800, 0x2fff).rom();  // ROM 6
 	map(0x3000, 0x37ff).rom();  // Empty
-	map(0x3800, 0x3fff).rw(FUNC(homelab2_state::key_r), FUNC(homelab2_state::cass_w));
+	map(0x3800, 0x39ff).r(FUNC(homelab2_state::mem3800_r));
+	map(0x3a00, 0x3bff).r(FUNC(homelab2_state::mem3a00_r));
+	map(0x3c00, 0x3dff).w(FUNC(homelab2_state::mem3c00_w));
+	map(0x3e00, 0x3fff).w(FUNC(homelab2_state::mem3e00_w));
 	map(0x4000, 0x7fff).ram();
-	map(0xc000, 0xc3ff).lr8(NAME([this] (offs_t offset) { return m_vram[offset]; })).lw8(NAME([this] (offs_t offset, u8 data) { m_vram[offset]=data; }));
-	map(0xe000, 0xe0ff).r(FUNC(homelab2_state::cass2_r));
+	map(0xc000, 0xc3ff).mirror(0xc00).bankrw("bank1");
+	map(0xe000, 0xffff).r(FUNC(homelab2_state::cass2_r));
 }
 
 void homelab3_state::homelab3_mem(address_map &map)
@@ -231,8 +240,7 @@
 	map(0x0000, 0x3fff).rom();
 	map(0x4000, 0xcfff).ram();
 	map(0xe800, 0xefff).r(FUNC(homelab3_state::exxx_r));
-	map(0xf800, 0xffff).lr8(NAME([this] (offs_t offset) { if(m_ramhere) return m_ram[offset]; else return m_vram[offset]; }))
-					   .lw8(NAME([this] (offs_t offset, u8 data) { if(m_ramhere) m_ram[offset]=data; else m_vram[offset]=data; }));
+	map(0xf800, 0xffff).bankrw("bank1");
 }
 
 void homelab3_state::homelab3_io(address_map &map)
@@ -262,7 +270,7 @@
 /* Input ports */
 static INPUT_PORTS_START( homelab2 )
 	PORT_START("X0")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Left Shift")  PORT_CODE(KEYCODE_LSHIFT) //PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Left Shift")  PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
 	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Right Shift") PORT_CODE(KEYCODE_RSHIFT)
 	PORT_BIT(0xfc, IP_ACTIVE_LOW, IPT_UNUSED)
 
@@ -351,7 +359,8 @@
 	PORT_START("X14")
 	PORT_BIT(0xFF, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("X15")
-	PORT_BIT(0xFF, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Reset") PORT_CODE(KEYCODE_F3)
+	PORT_BIT(0xFE, IP_ACTIVE_HIGH, IPT_UNUSED)
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( homelab3 ) // F4 to F8 are foreign characters
@@ -371,7 +380,7 @@
 
 	PORT_START("X2")
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_CUSTOM)   PORT_VBLANK("screen")
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Left Shift")  PORT_CODE(KEYCODE_LSHIFT)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Left Shift")  PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Right Shift") PORT_CODE(KEYCODE_RSHIFT)
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("ALT") PORT_CODE(KEYCODE_CAPSLOCK)
 	PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -484,7 +493,7 @@
 
 	PORT_START("X2")
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_CUSTOM)   PORT_VBLANK("screen")
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Left Shift")  PORT_CODE(KEYCODE_LSHIFT)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Left Shift")  PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Right Shift") PORT_CODE(KEYCODE_RSHIFT)
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("ALT") PORT_CODE(KEYCODE_CAPSLOCK)
 	PORT_BIT(0xf0, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -583,23 +592,27 @@
 void homelab2_state::machine_start()
 {
 	save_item(NAME(m_nmi));
+	save_item(NAME(m_spr_bit));
 	save_item(NAME(m_rows));
 	save_item(NAME(m_cols));
 	m_vram = make_unique_clear<u8[]>(0x800);
 	save_pointer(NAME(m_vram), 0x800);
+	m_bank1->configure_entry(0, m_vram.get());
+	m_bank1->set_entry(0);
 	m_rows = 25;
 	m_cols = 40;
 }
 
 void homelab3_state::machine_start()
 {
-	save_item(NAME(m_ramhere));
 	save_item(NAME(m_rows));
 	save_item(NAME(m_cols));
 	m_vram = make_unique_clear<u8[]>(0x800);
 	save_pointer(NAME(m_vram), 0x800);
 	m_ram = make_unique_clear<u8[]>(0x800);
 	save_pointer(NAME(m_ram), 0x800);
+	m_bank1->configure_entry(0, m_vram.get());
+	m_bank1->configure_entry(1, m_ram.get());
 	m_rows = 32;
 	m_cols = 64;
 }
@@ -765,13 +778,11 @@
 	PALETTE(config, "palette", palette_device::MONOCHROME);
 
 	/* sound hardware */
-	SPEAKER(config, "speaker").front_center();
-	DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.5);
-	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
-	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
+	SPEAKER(config, "mono").front_center();
+	SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
 
 	CASSETTE(config, m_cass);
-	m_cass->add_route(ALL_OUTPUTS, "speaker", 0.05);
+	m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
 
 	QUICKLOAD(config, "quickload", "htp", attotime::from_seconds(2)).set_load_callback(FUNC(homelab2_state::quickload_cb));
 }
@@ -796,13 +807,12 @@
 	PALETTE(config, "palette", palette_device::MONOCHROME);
 
 	/* sound hardware */
-	SPEAKER(config, "speaker").front_center();
-	DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.5);
-	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
-	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
+	SPEAKER(config, "mono").front_center();
+	SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
 
 	CASSETTE(config, m_cass);
-	m_cass->add_route(ALL_OUTPUTS, "speaker", 0.05);
+	m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
+
 	QUICKLOAD(config, "quickload", "htp", attotime::from_seconds(2)).set_load_callback(FUNC(homelab3_state::quickload_cb));
 }
 
@@ -811,7 +821,7 @@
 	homelab3(config);
 	m_maincpu->set_addrmap(AS_PROGRAM, &homelab3_state::brailab4_mem);
 	m_maincpu->set_addrmap(AS_IO, &homelab3_state::brailab4_io);
-	MEA8000(config, "mea8000", 3840000).add_route(ALL_OUTPUTS, "speaker", 1.0);
+	MEA8000(config, "mea8000", 3840000).add_route(ALL_OUTPUTS, "mono", 1.0);
 }
 
 
@@ -819,52 +829,61 @@
 
 ROM_START( homelab2 )
 	ROM_REGION( 0x3800, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "hl2_1.rom", 0x0000, 0x0800, BAD_DUMP CRC(205365f7) SHA1(da93b65befd83513dc762663b234227ba804124d))
-	ROM_LOAD( "hl2_2.rom", 0x0800, 0x0800, CRC(696af3c1) SHA1(b53bc6ae2b75975618fc90e7181fa5d21409fce1))
-	ROM_LOAD( "hl2_3.rom", 0x1000, 0x0800, CRC(69e57e8c) SHA1(e98510abb715dbf513e1b29fb6b09ab54e9483b7))
-	ROM_LOAD( "hl2_4.rom", 0x1800, 0x0800, CRC(97cbbe74) SHA1(34f0bad41302b059322018abc3d1c2336ecfbea8))
-	ROM_LOAD( "hl2_m.rom", 0x2000, 0x0800, CRC(10040235) SHA1(e121dfb97cc8ea99193a9396a9f7af08585e0ff0) )
+	ROM_LOAD( "hl2_1.ic2", 0x0000, 0x0800, BAD_DUMP CRC(205365f7) SHA1(da93b65befd83513dc762663b234227ba804124d))
+	ROM_LOAD( "hl2_2.ic3", 0x0800, 0x0800, CRC(696af3c1) SHA1(b53bc6ae2b75975618fc90e7181fa5d21409fce1))
+	ROM_LOAD( "hl2_3.ic4", 0x1000, 0x0800, CRC(69e57e8c) SHA1(e98510abb715dbf513e1b29fb6b09ab54e9483b7))
+	ROM_LOAD( "hl2_4.ic5", 0x1800, 0x0800, CRC(97cbbe74) SHA1(34f0bad41302b059322018abc3d1c2336ecfbea8))
+	ROM_LOAD( "hl2_m.ic6", 0x2000, 0x0800, CRC(10040235) SHA1(e121dfb97cc8ea99193a9396a9f7af08585e0ff0) )
 	ROM_FILL(0x46, 1, 0x18) // fix bad code
 	ROM_FILL(0x47, 1, 0x0E)
 
 	ROM_REGION( 0x0800, "chargen", 0 )
-	ROM_LOAD( "hl2.chr",   0x0000, 0x0800, CRC(2e669d40) SHA1(639dd82ed29985dc69830aca3b904b6acc8fe54a))
+	ROM_LOAD( "hl2.ic33",  0x0000, 0x0800, CRC(2e669d40) SHA1(639dd82ed29985dc69830aca3b904b6acc8fe54a))
 	// found on net, looks like bad dump
 	//ROM_LOAD_OPTIONAL( "hl2_ch.rom", 0x0800, 0x1000, CRC(6a5c915a) SHA1(7e4e966358556c6aabae992f4c2b292b6aab59bd) )
 ROM_END
 
 ROM_START( homelab3 )
 	ROM_REGION( 0x4000, "maincpu", 0 )
-	ROM_LOAD( "hl3_1.rom", 0x0000, 0x1000, CRC(6b90a8ea) SHA1(8ac40ca889b8c26cdf74ca309fbafd70dcfdfbec))
-	ROM_LOAD( "hl3_2.rom", 0x1000, 0x1000, CRC(bcac3c24) SHA1(aff371d17f61cb60c464998e092f04d5d85c4d52))
-	ROM_LOAD( "hl3_3.rom", 0x2000, 0x1000, CRC(ab1b4ab0) SHA1(ad74c7793f5dc22061a88ef31d3407267ad08719))
-	ROM_LOAD( "hl3_4.rom", 0x3000, 0x1000, CRC(bf67eff9) SHA1(2ef5d46f359616e7d0e5a124df528de44f0e850b))
+	ROM_LOAD( "hl3_1.ic1", 0x0000, 0x1000, CRC(6b90a8ea) SHA1(8ac40ca889b8c26cdf74ca309fbafd70dcfdfbec) )
+	ROM_LOAD( "hl3_2.ic2", 0x1000, 0x1000, CRC(bcac3c24) SHA1(aff371d17f61cb60c464998e092f04d5d85c4d52) )
+	ROM_LOAD( "hl3_3.ic3", 0x2000, 0x1000, CRC(ab1b4ab0) SHA1(ad74c7793f5dc22061a88ef31d3407267ad08719) )
+	ROM_LOAD( "hl3_4.ic4", 0x3000, 0x1000, CRC(bf67eff9) SHA1(2ef5d46f359616e7d0e5a124df528de44f0e850b) )
 
 	ROM_REGION( 0x0800, "chargen", 0 )
-	ROM_LOAD( "hl3.chr",   0x0000, 0x0800, CRC(f58ee39b) SHA1(49399c42d60a11b218a225856da86a9f3975a78a))
+	ROM_LOAD( "hl3.ic21",  0x0000, 0x0800, CRC(f58ee39b) SHA1(49399c42d60a11b218a225856da86a9f3975a78a) )
+
+	ROM_REGION( 0x0040, "proms", 0 )
+	ROM_LOAD( "tm188.ic7", 0x0000, 0x0040, NO_DUMP )
 ROM_END
 
 ROM_START( homelab4 )
 	ROM_REGION( 0x4000, "maincpu", 0 )
-	ROM_LOAD( "hl4_1.rom", 0x0000, 0x1000, CRC(a549b2d4) SHA1(90fc5595da8431616aee56eb5143b9f04281e798))
-	ROM_LOAD( "hl4_2.rom", 0x1000, 0x1000, CRC(151d33e8) SHA1(d32004bc1553f802b9d3266709552f7d5315fe44))
-	ROM_LOAD( "hl4_3.rom", 0x2000, 0x1000, CRC(39571ab1) SHA1(8470cff2e3442101e6a0bc655358b3a6fc1ef944))
-	ROM_LOAD( "hl4_4.rom", 0x3000, 0x1000, CRC(f4b77ca2) SHA1(ffbdb3c1819c7357e2a0fc6317c111a8a7ecfcd5))
+	ROM_LOAD( "hl4_1.ic1", 0x0000, 0x1000, CRC(a549b2d4) SHA1(90fc5595da8431616aee56eb5143b9f04281e798) )
+	ROM_LOAD( "hl4_2.ic2", 0x1000, 0x1000, CRC(151d33e8) SHA1(d32004bc1553f802b9d3266709552f7d5315fe44) )
+	ROM_LOAD( "hl4_3.ic3", 0x2000, 0x1000, CRC(39571ab1) SHA1(8470cff2e3442101e6a0bc655358b3a6fc1ef944) )
+	ROM_LOAD( "hl4_4.ic4", 0x3000, 0x1000, CRC(f4b77ca2) SHA1(ffbdb3c1819c7357e2a0fc6317c111a8a7ecfcd5) )
 
 	ROM_REGION( 0x0800, "chargen",0 )
-	ROM_LOAD( "hl4.chr",   0x0000, 0x0800, CRC(f58ee39b) SHA1(49399c42d60a11b218a225856da86a9f3975a78a))
+	ROM_LOAD( "hl4.ic21",  0x0000, 0x0800, CRC(f58ee39b) SHA1(49399c42d60a11b218a225856da86a9f3975a78a) )
+
+	ROM_REGION( 0x0040, "proms", 0 )
+	ROM_LOAD( "tm188.ic7", 0x0000, 0x0040, NO_DUMP )
 ROM_END
 
 ROM_START( brailab4 )
 	ROM_REGION( 0x5000, "maincpu", 0 )
-	ROM_LOAD( "brl1.rom",  0x0000, 0x1000, CRC(02323403) SHA1(3a2e853e0a39e05a04a8db58e1a76de1eda579c9))
-	ROM_LOAD( "brl2.rom",  0x1000, 0x1000, CRC(36173fbc) SHA1(1c01398e16a1cbe4103e1be769347ceae873e090))
-	ROM_LOAD( "brl3.rom",  0x2000, 0x1000, CRC(d3cdd108) SHA1(1a24e6c5f9c370ff6cb25045cb9d95e664467eb5))
-	ROM_LOAD( "brl4.rom",  0x3000, 0x1000, CRC(d4047885) SHA1(00fe40c4c2c64a49bb429fb2b27cc7e0d0025a85))
-	ROM_LOAD( "brl5.rom",  0x4000, 0x1000, CRC(8a76be04) SHA1(4b683b9be23b47117901fe874072eb7aa481e4ff))
+	ROM_LOAD( "brl1.ic1",  0x0000, 0x1000, CRC(02323403) SHA1(3a2e853e0a39e05a04a8db58e1a76de1eda579c9) )
+	ROM_LOAD( "brl2.ic2",  0x1000, 0x1000, CRC(36173fbc) SHA1(1c01398e16a1cbe4103e1be769347ceae873e090) )
+	ROM_LOAD( "brl3.ic3",  0x2000, 0x1000, CRC(d3cdd108) SHA1(1a24e6c5f9c370ff6cb25045cb9d95e664467eb5) )
+	ROM_LOAD( "brl4.ic4",  0x3000, 0x1000, CRC(d4047885) SHA1(00fe40c4c2c64a49bb429fb2b27cc7e0d0025a85) )
+	ROM_LOAD( "brl5.rom",  0x4000, 0x1000, CRC(8a76be04) SHA1(4b683b9be23b47117901fe874072eb7aa481e4ff) )
 
 	ROM_REGION( 0x0800, "chargen", 0 )
-	ROM_LOAD( "hl4.chr",   0x0000, 0x0800, CRC(f58ee39b) SHA1(49399c42d60a11b218a225856da86a9f3975a78a))
+	ROM_LOAD( "hl4.ic21",  0x0000, 0x0800, CRC(f58ee39b) SHA1(49399c42d60a11b218a225856da86a9f3975a78a) )
+
+	ROM_REGION( 0x0040, "proms", 0 )
+	ROM_LOAD( "tm188.ic7", 0x0000, 0x0040, NO_DUMP )
 
 	// these roms were found on the net, to be investigated
 	ROM_REGION( 0x5020, "user1", 0 )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/homez80.cpp mame-0.224+dfsg.1/src/mame/drivers/homez80.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/homez80.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/homez80.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -32,72 +32,68 @@
 	homez80_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_p_videoram(*this, "videoram")
+		, m_vram(*this, "videoram")
 		, m_p_chargen(*this, "chargen")
+		, m_io_keyboard(*this, "X%u", 0U)
 	{ }
 
 	void homez80(machine_config &config);
 
 private:
 
-	uint8_t homez80_keyboard_r(offs_t offset);
+	u8 homez80_keyboard_r(offs_t offset);
 	INTERRUPT_GEN_MEMBER(homez80_interrupt);
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void homez80_io(address_map &map);
-	void homez80_mem(address_map &map);
+	void mem_map(address_map &map);
 
 	bool m_irq;
-	virtual void machine_reset() override;
+	void machine_reset() override;
+	void machine_start() override;
 	required_device<cpu_device> m_maincpu;
-	required_shared_ptr<uint8_t> m_p_videoram;
+	required_shared_ptr<u8> m_vram;
 	required_region_ptr<u8> m_p_chargen;
+	required_ioport_array<16> m_io_keyboard;
 };
 
 
-uint8_t homez80_state::homez80_keyboard_r(offs_t offset)
+u8 homez80_state::homez80_keyboard_r(offs_t offset)
 {
-	char kbdrow[8];
-	sprintf(kbdrow,"LINE%d",offset);
-	return ioport(kbdrow)->read();
+	return m_io_keyboard[offset]->read();
 }
 
-void homez80_state::homez80_mem(address_map &map)
+void homez80_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0x0fff).rom();  // Monitor
-	map(0x2000, 0x23ff).ram().share("videoram"); // Video RAM
-	map(0x7020, 0x702f).r(FUNC(homez80_state::homez80_keyboard_r));
-	map(0x8000, 0xffff).ram();  // 32 K RAM
+	map(0x0000, 0x0fff).rom();    // 27C256 (A12,13,14 tied high)
+	map(0x2000, 0x23ff).mirror(0x0c00).ram().share("videoram");   // IC13, UM61256 (A10-14 tied low)
+	map(0x7000, 0x700f).mirror(0x0ff0).r(FUNC(homez80_state::homez80_keyboard_r));
+	map(0x8000, 0xffff).ram();    // 61256 (32K)
 }
 
-void homez80_state::homez80_io(address_map &map)
-{
-	map.unmap_value_high();
-}
 
 /* Input ports */
 INPUT_PORTS_START( homez80 )
-	PORT_START("LINE0")
+	PORT_START("X0")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC)
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB) PORT_CHAR(9)
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC) PORT_CHAR(27)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)
-	PORT_START("LINE1")
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')
+	PORT_START("X1") // anything on this row is treated as Shift
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE // crude, just another shift key
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT)
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RSHIFT)
 		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
-	PORT_START("LINE2")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL)
+	PORT_START("X2")
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) // not working
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -105,70 +101,70 @@
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
-	PORT_START("LINE3")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F1)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CAPSLOCK)
+	PORT_START("X3")
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1))
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('@')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)
-	PORT_START("LINE4")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F2)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F3)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F4)
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')
+	PORT_START("X4")
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2))
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3))
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4))
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D)
-	PORT_START("LINE5")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)
-	PORT_START("LINE6")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J)
-	PORT_START("LINE7")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F8)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F7)
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')
+	PORT_START("X5")
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')
+	PORT_START("X6")
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('^')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('&')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N')
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M')
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')
+	PORT_START("X7")
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8))
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR('(')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7))
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L)
-	PORT_START("LINE8")
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
+	PORT_START("X8")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SCRLOCK)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_PRTSCR)
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SCRLOCK) // nothing
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_PRTSCR)  // nothing
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LALT) PORT_CODE(KEYCODE_RALT)
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LALT) PORT_CODE(KEYCODE_RALT) // nothing
 		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
-	PORT_START("LINE9")
+	PORT_START("X9")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_PLUS_PAD)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_PAUSE)
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_PAUSE) // nothing
 		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
-	PORT_START("LINE10")
+	PORT_START("X10")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -177,7 +173,7 @@
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS_PAD)
 		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ASTERISK)
 		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3_PAD)
-	PORT_START("LINE11")
+	PORT_START("X11")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -186,7 +182,7 @@
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH_PAD)
 		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2_PAD)
-	PORT_START("LINE12")
+	PORT_START("X12")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7_PAD)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -195,32 +191,32 @@
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1_PAD)
-	PORT_START("LINE13")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)
-	PORT_START("LINE14")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F6)
+	PORT_START("X13")
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') // '_' not supported
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(')')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('[') PORT_CHAR('{')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(39) PORT_CHAR(34)
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') // '|' not supported
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR(':')
+	PORT_START("X14")
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=') PORT_CHAR('+')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('*')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6))
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K)
-	PORT_START("LINE15")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F9)
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')
+	PORT_START("X15")
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F9) PORT_CHAR(UCHAR_MAMEKEY(F9))
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F10)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F5)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER)
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F10) PORT_CHAR(UCHAR_MAMEKEY(F10))
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5))
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(32)
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
 		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
 INPUT_PORTS_END
 
@@ -230,10 +226,15 @@
 	m_irq = 0;
 }
 
-uint32_t homez80_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+void homez80_state::machine_start()
+{
+	save_item(NAME(m_irq));
+}
+
+u32 homez80_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	uint8_t y,ra,chr,gfx;
-	uint16_t sy=0,ma=0,x;
+	u8 y,ra,chr,gfx;
+	u16 sy=0,ma=0,x;
 
 	for (y = 0; y < 32; y++)
 	{
@@ -243,7 +244,7 @@
 
 			for (x = ma; x < ma+32; x++)
 			{
-				chr = m_p_videoram[x];
+				chr = m_vram[x];
 
 				/* get pattern of pixels for that character scanline */
 				gfx = m_p_chargen[ (chr<<3) | ra];
@@ -265,7 +266,7 @@
 }
 
 
-const gfx_layout homez80_charlayout =
+const gfx_layout charlayout =
 {
 	8, 8,               /* 8x8 characters */
 	256,                /* 256 characters */
@@ -277,7 +278,7 @@
 };
 
 static GFXDECODE_START( gfx_homez80 )
-	GFXDECODE_ENTRY( "chargen", 0x0000, homez80_charlayout, 0, 1 )
+	GFXDECODE_ENTRY( "chargen", 0x0000, charlayout, 0, 1 )
 GFXDECODE_END
 
 
@@ -291,8 +292,7 @@
 {
 	/* basic machine hardware */
 	Z80(config, m_maincpu, XTAL(8'000'000) / 2);
-	m_maincpu->set_addrmap(AS_PROGRAM, &homez80_state::homez80_mem);
-	m_maincpu->set_addrmap(AS_IO, &homez80_state::homez80_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &homez80_state::mem_map);
 	m_maincpu->set_periodic_int(FUNC(homez80_state::homez80_interrupt), attotime::from_hz(50));
 
 	/* video hardware */
@@ -310,14 +310,14 @@
 
 /* ROM definition */
 ROM_START( homez80 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x1000, "maincpu", 0 )
 	ROM_LOAD( "sysrom.bin",  0x0000, 0x1000, CRC(37ca7545) SHA1(3f597d7e45b1ab211d5bd4a99abb21915723c357) )
 
 	ROM_REGION(0x0800, "chargen",0)
-	ROM_LOAD( "chargen.bin", 0x0000, 0x0800, CRC(93243be3) SHA1(718efc06c131843c15383e50af23f3a5cf44dd9b) )
+	ROM_LOAD( "chargen.ic12", 0x0000, 0x0800, CRC(93243be3) SHA1(718efc06c131843c15383e50af23f3a5cf44dd9b) ) // 27C256, A11/12/13/14 tied low.
 ROM_END
 
 /* Driver */
 
 /*    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY             FULLNAME                 FLAGS */
-COMP( 2008, homez80, 0,      0,      homez80, homez80, homez80_state, empty_init, "Kun-Szabo Marton", "Homebrew Z80 Computer", MACHINE_NO_SOUND_HW)
+COMP( 2008, homez80, 0,      0,      homez80, homez80, homez80_state, empty_init, "Kun-Szabo Marton", "Homebrew Z80 Computer", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/hp9k_3xx.cpp mame-0.224+dfsg.1/src/mame/drivers/hp9k_3xx.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/hp9k_3xx.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/hp9k_3xx.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -331,6 +331,8 @@
 	ptm.irq_callback().set_inputline("maincpu", M68K_IRQ_6);
 
 	SOFTWARE_LIST(config, "flop_list").set_original("hp9k3xx_flop");
+	SOFTWARE_LIST(config, "cdrom_list").set_original("hp9k3xx_cdrom");
+	SOFTWARE_LIST(config, "hdd_list").set_original("hp9k3xx_hdd");
 	config.set_default_layout(layout_hp9k_3xx);
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/hp_ipc.cpp mame-0.224+dfsg.1/src/mame/drivers/hp_ipc.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/hp_ipc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/hp_ipc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -11,12 +11,11 @@
 - keyboard: NMI generation
 - RTC chip: proper month, day (possibly a different chip, 82167)
 - HP-IL printer
-- sound (needs dump of COP452)
 
 QA
 + diagnstc.td0: display test
 - diagnstc.td0: complete keyboard test [second connector not implemented]
-- diagnstc.td0: speaker test
++ diagnstc.td0: speaker test
 - diagnstc.td0: printer test
 + diagnstc.td0: auto: floppy disc test
 + diagnstc.td0: auto: ram test
@@ -370,6 +369,12 @@
 #include "video/hp1ll3.h"
 #include "machine/tms9914.h"
 #include "bus/ieee488/ieee488.h"
+#include "machine/cop452.h"
+#include "speaker.h"
+#include "sound/dac.h"
+#include "sound/volt_reg.h"
+#include "machine/input_merger.h"
+#include "bus/hp_ipc_io/hp_ipc_io.h"
 
 #include "emupal.h"
 #include "screen.h"
@@ -386,6 +391,14 @@
 		, m_ram(*this, RAM_TAG)
 		, m_gpu(*this , "gpu")
 		, m_screen(*this, "screen")
+		, m_spkr(*this , "spkr")
+		, m_dac(*this , "dac")
+		, m_irq3_merger(*this , "merge_irq3")
+		, m_irq4_merger(*this , "merge_irq4")
+		, m_irq5_merger(*this , "merge_irq5")
+		, m_irq6_merger(*this , "merge_irq6")
+		, m_io_slot_a(*this , "slot_a")
+		, m_io_slot_b(*this , "slot_b")
 	{ }
 
 	void hp_ipc_base(machine_config &config);
@@ -404,6 +417,7 @@
 	void ram_w(offs_t offset, uint16_t data, uint16_t mem_mask);
 	uint16_t trap_r(offs_t offset, uint16_t mem_mask);
 	void trap_w(offs_t offset, uint16_t data, uint16_t mem_mask);
+	void spkr_w(offs_t offset, uint16_t data);
 
 	uint8_t floppy_id_r();
 	void floppy_id_w(uint8_t data);
@@ -431,6 +445,14 @@
 	required_device<ram_device> m_ram;
 	required_device<hp1ll3_device> m_gpu;
 	required_device<screen_device> m_screen;
+	required_device<cop452_device> m_spkr;
+	required_device<dac_1bit_device> m_dac;
+	required_device<input_merger_any_high_device> m_irq3_merger;
+	required_device<input_merger_any_high_device> m_irq4_merger;
+	required_device<input_merger_any_high_device> m_irq5_merger;
+	required_device<input_merger_any_high_device> m_irq6_merger;
+	required_device<hp_ipc_io_slot_device> m_io_slot_a;
+	required_device<hp_ipc_io_slot_device> m_io_slot_b;
 
 	uint32_t m_mmu[4], m_lowest_ram_addr;
 	uint16_t *m_internal_ram;
@@ -498,7 +520,8 @@
 	map(0x0630000, 0x063FFFF).mask(0xf).rw("hpib" , FUNC(tms9914_device::read) , FUNC(tms9914_device::write)).umask16(0x00ff);
 	map(0x0640000, 0x064002F).rw("rtc", FUNC(mm58167_device::read), FUNC(mm58167_device::write)).umask16(0x00ff);
 	map(0x0660000, 0x06600FF).rw("mlc", FUNC(hp_hil_mlc_device::read), FUNC(hp_hil_mlc_device::write)).umask16(0x00ff);  // 'caravan', scrn/caravan.h
-	map(0x0670000, 0x067FFFF).noprw();       // Speaker (NatSemi COP 452)
+	map(0x0670000, 0x067FFFF).w(FUNC(hp_ipc_state::spkr_w));    // Speaker (NatSemi COP 452)
+	map(0x0670000, 0x067FFFF).nopr();   // Speaker (NatSemi COP 452)
 	map(0x0680000, 0x068FFFF).noprw();       // 'SIMON (98628) fast HP-IB card' -- sys/simon.h
 	map(0x0700000, 0x07FFFFF).unmaprw();     // External I/O
 	map(0x0800000, 0x0FFFFFF).rw(FUNC(hp_ipc_state::ram_r), FUNC(hp_ipc_state::ram_w));
@@ -569,6 +592,12 @@
 	if (!machine().side_effects_disabled()) set_bus_error((offset << 1) & 0xFFFFFF, false, mem_mask);
 }
 
+void hp_ipc_state::spkr_w(offs_t offset, uint16_t data)
+{
+	m_spkr->cs_w(!BIT(data , 0));
+	m_spkr->sk_w(BIT(data , 1));
+	m_spkr->di_w(BIT(data , 2));
+}
 
 uint16_t hp_ipc_state::ram_r(offs_t offset, uint16_t mem_mask)
 {
@@ -673,22 +702,22 @@
 
 WRITE_LINE_MEMBER(hp_ipc_state::irq_3)
 {
-	m_maincpu->set_input_line(M68K_IRQ_3, state);
+	m_irq3_merger->in_w<0>(state);
 }
 
 WRITE_LINE_MEMBER(hp_ipc_state::irq_4)
 {
-	m_maincpu->set_input_line(M68K_IRQ_4, state);
+	m_irq4_merger->in_w<0>(state);
 }
 
 WRITE_LINE_MEMBER(hp_ipc_state::irq_5)
 {
-	m_maincpu->set_input_line(M68K_IRQ_5, state);
+	m_irq5_merger->in_w<0>(state);
 }
 
 WRITE_LINE_MEMBER(hp_ipc_state::irq_6)
 {
-	m_maincpu->set_input_line(M68K_IRQ_6, state);
+	m_irq6_merger->in_w<0>(state);
 }
 
 WRITE_LINE_MEMBER(hp_ipc_state::irq_7)
@@ -705,11 +734,17 @@
 
 	m_lowest_ram_addr = 0x3c0000 - (m_ram->size() >> 1);
 	m_internal_ram = (uint16_t *)m_ram->pointer();
+
+	m_io_slot_a->install_read_write_handlers(m_bankdev->space());
+	m_io_slot_b->install_read_write_handlers(m_bankdev->space());
 }
 
 void hp_ipc_state::machine_reset()
 {
 	m_floppy = nullptr;
+	m_spkr->cs_w(1);
+	m_spkr->sk_w(0);
+	m_spkr->di_w(0);
 }
 
 
@@ -783,6 +818,32 @@
 	ieee.ren_callback().set("hpib" , FUNC(tms9914_device::ren_w));
 	IEEE488_SLOT(config , "ieee_rem" , 0 , remote488_devices , nullptr);
 
+	// Beeper
+	COP452(config , m_spkr , 2_MHz_XTAL);
+	SPEAKER(config, "mono").front_center();
+	DAC_1BIT(config, m_dac , 0).add_route(ALL_OUTPUTS, "mono", 0.5, AUTO_ALLOC_INPUT, 0);
+	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
+	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
+	m_spkr->oa_w().set(m_dac , FUNC(dac_1bit_device::write));
+
+	// IO slots
+	HP_IPC_IO_SLOT(config , m_io_slot_a).set_slot_idx(0);
+	HP_IPC_IO_SLOT(config , m_io_slot_b).set_slot_idx(1);
+
+	// IRQ3/4/5/6 mergers
+	INPUT_MERGER_ANY_HIGH(config , m_irq3_merger).output_handler().set_inputline(m_maincpu , M68K_IRQ_3);
+	INPUT_MERGER_ANY_HIGH(config , m_irq4_merger).output_handler().set_inputline(m_maincpu , M68K_IRQ_4);
+	INPUT_MERGER_ANY_HIGH(config , m_irq5_merger).output_handler().set_inputline(m_maincpu , M68K_IRQ_5);
+	INPUT_MERGER_ANY_HIGH(config , m_irq6_merger).output_handler().set_inputline(m_maincpu , M68K_IRQ_6);
+	m_io_slot_a->irq3_cb().set(m_irq3_merger , FUNC(input_merger_any_high_device::in_w<1>));
+	m_io_slot_a->irq4_cb().set(m_irq4_merger , FUNC(input_merger_any_high_device::in_w<1>));
+	m_io_slot_a->irq5_cb().set(m_irq5_merger , FUNC(input_merger_any_high_device::in_w<1>));
+	m_io_slot_a->irq6_cb().set(m_irq6_merger , FUNC(input_merger_any_high_device::in_w<1>));
+	m_io_slot_b->irq3_cb().set(m_irq3_merger , FUNC(input_merger_any_high_device::in_w<2>));
+	m_io_slot_b->irq4_cb().set(m_irq4_merger , FUNC(input_merger_any_high_device::in_w<2>));
+	m_io_slot_b->irq5_cb().set(m_irq5_merger , FUNC(input_merger_any_high_device::in_w<2>));
+	m_io_slot_b->irq6_cb().set(m_irq6_merger , FUNC(input_merger_any_high_device::in_w<2>));
+
 	RAM(config, RAM_TAG).set_default_size("512K").set_extra_options("768K,1M,1576K,2M,3M,4M,5M,6M,7M,7680K");
 }
 
@@ -855,5 +916,5 @@
 #define rom_hp9808a rom_hp_ipc
 
 //    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT        COMPANY            FULLNAME                            FLAGS
-COMP( 1985, hp_ipc,  0,      0,      hp_ipc,  hp_ipc, hp_ipc_state, empty_init, "Hewlett-Packard", "Integral Personal Computer 9807A", MACHINE_NO_SOUND)
+COMP( 1985, hp_ipc,  0,      0,      hp_ipc,  hp_ipc, hp_ipc_state, empty_init, "Hewlett-Packard", "Integral Personal Computer 9807A", 0)
 COMP( 1985, hp9808a, 0,      0,      hp9808a, hp_ipc, hp_ipc_state, empty_init, "Hewlett-Packard", "Integral Personal Computer 9808A", MACHINE_NOT_WORKING)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ht68k.cpp mame-0.224+dfsg.1/src/mame/drivers/ht68k.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ht68k.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ht68k.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -40,14 +40,13 @@
 {
 public:
 	ht68k_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_duart(*this, "duart68681"),
-		m_fdc(*this, "wd1770"),
-		m_floppy(*this, "wd1770:%u", 0U),
-		m_p_ram(*this, "p_ram")
-	{
-	}
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_duart(*this, "duart")
+		, m_fdc(*this, "fdc")
+		, m_floppy(*this, "fdc:%u", 0U)
+		, m_ram(*this, "mainram")
+	{ }
 
 	void ht68k(machine_config &config);
 
@@ -59,21 +58,21 @@
 
 	DECLARE_WRITE_LINE_MEMBER(duart_txb);
 	void duart_output(uint8_t data);
-	required_shared_ptr<uint16_t> m_p_ram;
-	virtual void machine_reset() override;
-	void ht68k_mem(address_map &map);
+	required_shared_ptr<uint16_t> m_ram;
+	void machine_reset() override;
+	void mem_map(address_map &map);
 };
 
 
-void ht68k_state::ht68k_mem(address_map &map)
+void ht68k_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x00000000, 0x0007ffff).ram().share("p_ram"); // 512 KB RAM / ROM at boot
+	map(0x00000000, 0x0007ffff).ram().share("mainram"); // 512 KB RAM / ROM at boot
 	//map(0x00080000, 0x000fffff) // Expansion
 	//map(0x00d80000, 0x00d8ffff) // Printer
 	map(0x00e00000, 0x00e00007).mirror(0xfff8).rw(m_fdc, FUNC(wd1770_device::read), FUNC(wd1770_device::write)).umask16(0x00ff); // FDC WD1770
 	map(0x00e80000, 0x00e800ff).mirror(0xff00).rw(m_duart, FUNC(mc68681_device::read), FUNC(mc68681_device::write)).umask16(0x00ff);
-	map(0x00f00000, 0x00f07fff).rom().mirror(0xf8000).region("bios", 0);
+	map(0x00f00000, 0x00f07fff).rom().mirror(0xf8000).region("maincpu", 0);
 }
 
 /* Input ports */
@@ -82,9 +81,9 @@
 
 void ht68k_state::machine_reset()
 {
-	uint8_t *bios = memregion("bios")->base();
+	uint8_t *bios = memregion("maincpu")->base();
 
-	memcpy((uint8_t*)m_p_ram.target(),bios,0x8000);
+	memcpy((uint8_t*)m_ram.target(),bios,0x8000);
 
 	m_fdc->reset();
 	m_fdc->set_floppy(nullptr);
@@ -126,7 +125,7 @@
 {
 	/* basic machine hardware */
 	M68000(config, m_maincpu, 8_MHz_XTAL);
-	m_maincpu->set_addrmap(AS_PROGRAM, &ht68k_state::ht68k_mem);
+	m_maincpu->set_addrmap(AS_PROGRAM, &ht68k_state::mem_map);
 
 	/* video hardware */
 	MC68681(config, m_duart, 8_MHz_XTAL / 2);
@@ -142,17 +141,17 @@
 	WD1770(config, m_fdc, 8_MHz_XTAL);
 	m_fdc->intrq_wr_callback().set_inputline(m_maincpu, M68K_IRQ_4);
 
-	FLOPPY_CONNECTOR(config, "wd1770:0", ht68k_floppies, "525dd", floppy_image_device::default_floppy_formats);
-	FLOPPY_CONNECTOR(config, "wd1770:1", ht68k_floppies, nullptr, floppy_image_device::default_floppy_formats);
-	FLOPPY_CONNECTOR(config, "wd1770:2", ht68k_floppies, nullptr, floppy_image_device::default_floppy_formats);
-	FLOPPY_CONNECTOR(config, "wd1770:3", ht68k_floppies, nullptr, floppy_image_device::default_floppy_formats);
+	FLOPPY_CONNECTOR(config, "fdc:0", ht68k_floppies, "525dd", floppy_image_device::default_floppy_formats);
+	FLOPPY_CONNECTOR(config, "fdc:1", ht68k_floppies, nullptr, floppy_image_device::default_floppy_formats);
+	FLOPPY_CONNECTOR(config, "fdc:2", ht68k_floppies, nullptr, floppy_image_device::default_floppy_formats);
+	FLOPPY_CONNECTOR(config, "fdc:3", ht68k_floppies, nullptr, floppy_image_device::default_floppy_formats);
 
 	SOFTWARE_LIST(config, "flop525_list").set_original("ht68k");
 }
 
 /* ROM definition */
 ROM_START( ht68k )
-	ROM_REGION16_BE( 0x8000, "bios", ROMREGION_ERASEFF )
+	ROM_REGION16_BE( 0x8000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "ht68k-u4.bin", 0x0001, 0x4000, CRC(3fbcdd0a) SHA1(45fcbbf920dc1e9eada3b7b0a55f5720d08ffdd5))
 	ROM_LOAD16_BYTE( "ht68k-u3.bin", 0x0000, 0x4000, CRC(1d85d101) SHA1(8ba01e1595b0b3c4fb128a4a50242f3588b89c43))
 ROM_END
@@ -160,4 +159,4 @@
 /* Driver */
 
 //    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY                 FULLNAME           FLAGS
-COMP( 1987, ht68k, 0,      0,      ht68k,   ht68k, ht68k_state, empty_init, "Hawthorne Technology", "TinyGiant HT68k", MACHINE_NO_SOUND_HW )
+COMP( 1987, ht68k, 0,      0,      ht68k,   ht68k, ht68k_state, empty_init, "Hawthorne Technology", "TinyGiant HT68k", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/hyprduel.cpp mame-0.224+dfsg.1/src/mame/drivers/hyprduel.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/hyprduel.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/hyprduel.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -436,6 +436,7 @@
 {
 	I4220(config, m_vdp, XTAL(26'666'000));
 	m_vdp->blit_irq_cb().set(FUNC(hyprduel_state::vdp_blit_end_w));
+	m_vdp->set_spriteram_buffered(true); // sprites are 1 frame delayed
 
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_video_attributes(VIDEO_UPDATE_SCANLINE);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ibmpcjr.cpp mame-0.224+dfsg.1/src/mame/drivers/ibmpcjr.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ibmpcjr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ibmpcjr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -226,6 +226,7 @@
 {
 	m_pit_out2 = state ? 1 : 0;
 	m_speaker->level_w(m_pc_spkrdata & m_pit_out2);
+	m_cassette->output(state ? 1.0 : -1.0);
 }
 
 /*************************************************************
@@ -656,6 +657,7 @@
 	/* cassette */
 	CASSETTE(config, m_cassette);
 	m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
 
 	UPD765A(config, m_fdc, 8'000'000, false, false);
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/indy_indigo2.cpp mame-0.224+dfsg.1/src/mame/drivers/indy_indigo2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/indy_indigo2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/indy_indigo2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -95,7 +95,6 @@
 		, m_hpc3(*this, "hpc3")
 		, m_ioc2(*this, "ioc2")
 		, m_rtc(*this, "rtc")
-		, m_softlist(*this, "softlist")
 		, m_vino(*this, "vino")
 		, m_dmsd(*this, "dmsd")
 		, m_gio64(*this, "gio64")
@@ -145,7 +144,6 @@
 	required_device<hpc3_device> m_hpc3;
 	required_device<ioc2_device> m_ioc2;
 	required_device<ds1386_device> m_rtc;
-	required_device<software_list_device> m_softlist;
 	optional_device<vino_device> m_vino;
 	optional_device<saa7191_device> m_dmsd;
 	optional_device<gio64_device> m_gio64;
@@ -383,7 +381,8 @@
 	SGI_HAL2(config, m_hal2);
 	EEPROM_93C56_16BIT(config, m_eeprom);
 
-	SOFTWARE_LIST(config, m_softlist).set_original("sgi_mips");
+	SOFTWARE_LIST(config, "sgi_mips").set_original("sgi_mips");
+	SOFTWARE_LIST(config, "sgi_mips_hdd").set_original("sgi_mips_hdd");
 }
 
 void ip24_state::ip24(machine_config &config)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/intellect02.cpp mame-0.224+dfsg.1/src/mame/drivers/intellect02.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/intellect02.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/intellect02.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -184,8 +184,8 @@
 static INPUT_PORTS_START( intel02 )
 	PORT_START("IN.0")
 	PORT_BIT(0x0007, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_V) PORT_NAME("ПП (View Position)")
-	PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_L) PORT_NAME("УИ (Game Level)")
+	PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_V) PORT_NAME(u8"ПП (View Position)")
+	PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_L) PORT_NAME(u8"УИ (Game Level)")
 	PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_NAME("9")
 	PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_8_PAD) PORT_CODE(KEYCODE_H) PORT_NAME("H8")
 	PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_7) PORT_CODE(KEYCODE_7_PAD) PORT_CODE(KEYCODE_G) PORT_NAME("G7")
@@ -199,12 +199,12 @@
 
 	PORT_START("IN.1")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD) PORT_NAME("ВВ (Input)")
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_S) PORT_NAME("ВИ (Game Select)")
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_DEL) PORT_CODE(KEYCODE_BACKSPACE) PORT_NAME("СТ (Erase)")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD) PORT_NAME(u8"ВВ (Input)")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_S) PORT_NAME(u8"ВИ (Game Select)")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_DEL) PORT_CODE(KEYCODE_BACKSPACE) PORT_NAME(u8"СТ (Erase)")
 
 	PORT_START("RESET")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_R) PORT_CHANGED_MEMBER(DEVICE_SELF, intel02_state, reset_button, 0) PORT_NAME("СБ (Reset)")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_R) PORT_CHANGED_MEMBER(DEVICE_SELF, intel02_state, reset_button, 0) PORT_NAME(u8"СБ (Reset)")
 INPUT_PORTS_END
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/interact.cpp mame-0.224+dfsg.1/src/mame/drivers/interact.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/interact.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/interact.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,305 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:JJ Stacino
-/***************************************************************************
-
-        Interact Family Computer
-
-        12/05/2009 Skeleton driver - Micko
-    31/05/2009 Added notes - Robbbert
-
-    This was made by Interact Company of Ann Arbor, Michigan. However,
-    just after launch, the company collapsed. The liquidator, Protecto,
-    sold some and MicroVideo sold the rest. MicroVideo continued to
-    develop but went under 2 years later. Meanwhile, the French company
-    Lambda Systems sold a clone called the Victor Lambda. But, like the
-    Americans, Lambda Systems also collapsed. Another French company,
-    Micronique, purchased all remaining stock and intellectual rights
-    from Lambda Systems, Microvideo and Interact, and the computer becomes
-    wholly French. The computer has a name change, becoming the Hector.
-    This in turn gets upgraded (2HR, HRX, MX). The line is finally
-    retired in about 1985.
-
-        Hector 2HR+
-        Victor
-        Hector 2HR
-        Hector HRX
-        Hector MX40c
-        Hector MX80c
-        Hector 1
-        Interact
-
-        12/05/2009 Skeleton driver - Micko : mmicko@gmail.com
-        31/06/2009 Video - Robbbert
-
-        29/10/2009 Update skeleton to functional machine
-                    by yo_fr            (jj.stac @ aliceadsl.fr)
-
-                => add Keyboard,
-                => add color,
-                => add cassette,
-                => add sn76477 sound and 1bit sound,
-                => add joysticks (stick, pot, fire)
-                => add BR/HR switching
-                => add bank switch for HRX
-                => add device MX80c and bank switching for the ROM
-    Importante note : the keyboard function add been piked from
-                    DChector project : http://dchector.free.fr/ made by DanielCoulom
-                    (thank's Daniel)
-    TODO :  Add the cartridge function,
-            Adjust the one shot and A/D timing (sn76477)
-****************************************************************************/
-/* Mapping for joystick see hec2hrp.c*/
-
-#include "emu.h"
-#include "includes/hec2hrp.h"
-
-#include "cpu/i8085/i8085.h"
-#include "cpu/z80/z80.h"
-#include "formats/hect_tap.h"
-#include "imagedev/cassette.h"
-#include "imagedev/printer.h"
-#include "machine/upd765.h" /* for floppy disc controller */
-#include "sound/discrete.h"  /* for 1 Bit sound*/
-#include "screen.h"
-#include "softlist.h"
-
-
-class interact_state : public hec2hrp_state
-{
-public:
-	interact_state(const machine_config &mconfig, device_type type, const char *tag)
-		: hec2hrp_state(mconfig, type, tag),
-			m_videoram(*this, "videoram") { }
-
-	void hector1(machine_config &config);
-	void interact(machine_config &config);
-
-private:
-
-	required_shared_ptr<uint8_t> m_videoram;
-	DECLARE_MACHINE_START(interact);
-	DECLARE_MACHINE_RESET(interact);
-	uint32_t screen_update_interact(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void interact_mem(address_map &map);
-};
-
-
-void interact_state::interact_mem(address_map &map)
-{
-	map.unmap_value_high();
-	/* Main ROM page*/
-	map(0x0000, 0x3fff).rom();  /*BANK(2)*/
-//  map(0x1000,0x3fff).ram();
-
-	/* Hardware address mapping*/
-//  map(0x0800,0x0808).w(FUNC(interact_state::switch_bank_w)); // Bank management not udsed in BR machine*/
-	map(0x1000, 0x1000).w(FUNC(interact_state::color_a_w));  /* Color c0/c1*/
-	map(0x1800, 0x1800).w(FUNC(interact_state::color_b_w));  /* Color c2/c3*/
-	map(0x2000, 0x2003).w(FUNC(interact_state::sn_2000_w));  /* Sound*/
-	map(0x2800, 0x2803).w(FUNC(interact_state::sn_2800_w));  /* Sound*/
-	map(0x3000, 0x3000).rw(FUNC(interact_state::cassette_r), FUNC(interact_state::sn_3000_w));/* Write necessary*/
-	map(0x3800, 0x3807).rw(FUNC(interact_state::keyboard_r), FUNC(interact_state::keyboard_w));  /* Keyboard*/
-
-	/* Video br mapping*/
-	map(0x4000, 0x49ff).ram().share("videoram");
-	/* continous RAM*/
-	map(0x4A00, 0xffff).ram();
-
-}
-
-
-MACHINE_RESET_MEMBER(interact_state,interact)
-{
-	hector_reset(0, 0);
-}
-
-MACHINE_START_MEMBER(interact_state,interact)
-{
-	hector_init();
-}
-
-uint32_t interact_state::screen_update_interact(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	uint8_t *videoram = m_videoram;
-	screen.set_visible_area(0, 113, 0, 75);
-	hector_hr(bitmap, videoram,  77, 32);
-	return 0;
-}
-
-void interact_state::interact(machine_config &config)
-{
-	/* basic machine hardware */
-	I8080(config, m_maincpu, XTAL(2'000'000));
-	m_maincpu->set_addrmap(AS_PROGRAM, &interact_state::interact_mem);
-	m_maincpu->set_periodic_int(FUNC(interact_state::irq0_line_hold), attotime::from_hz(50)); /*  put on the I8080 irq in Hz*/
-
-	MCFG_MACHINE_RESET_OVERRIDE(interact_state,interact)
-	MCFG_MACHINE_START_OVERRIDE(interact_state,interact)
-
-	/* video hardware */
-	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(60);
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
-	screen.set_size(256, 79);
-	screen.set_visarea(0, 112, 0, 77);
-	screen.set_screen_update(FUNC(interact_state::screen_update_interact));
-	screen.set_palette(m_palette);
-
-	PALETTE(config, m_palette).set_entries(16);             /* 8 colours, but only 4 at a time*/
-
-	MCFG_VIDEO_START_OVERRIDE(interact_state,hec2hrp)
-
-	hector_audio(config);
-
-	CASSETTE(config, m_cassette);
-	m_cassette->set_formats(hector_cassette_formats);
-	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED);
-	m_cassette->set_interface("interact_cass");
-
-	SOFTWARE_LIST(config, "cass_list").set_original("interact");
-
-	/* printer */
-	PRINTER(config, m_printer, 0);
-}
-
-void interact_state::hector1(machine_config &config)
-{
-	/* basic machine hardware */
-	Z80(config, m_maincpu, XTAL(1'750'000));
-	m_maincpu->set_addrmap(AS_PROGRAM, &interact_state::interact_mem);
-	m_maincpu->set_periodic_int(FUNC(interact_state::irq0_line_hold), attotime::from_hz(50)); /*  put on the I8080 irq in Hz*/
-
-	MCFG_MACHINE_RESET_OVERRIDE(interact_state,interact)
-	MCFG_MACHINE_START_OVERRIDE(interact_state,interact)
-
-	/* video hardware */
-	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(60);
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
-	screen.set_size(256, 79);
-	screen.set_visarea(0, 112, 0, 77);
-	screen.set_screen_update(FUNC(interact_state::screen_update_interact));
-	screen.set_palette(m_palette);
-
-	PALETTE(config, m_palette).set_entries(16);             /* 8 colours, but only 4 at a time*/
-
-	MCFG_VIDEO_START_OVERRIDE(interact_state,hec2hrp)
-
-	hector_audio(config);
-
-	CASSETTE(config, m_cassette);
-	m_cassette->set_formats(hector_cassette_formats);
-	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED);
-	m_cassette->set_interface("interact_cass");
-
-	/* printer */
-	PRINTER(config, m_printer, 0);
-}
-
-/* Input ports */
-static INPUT_PORTS_START( interact )
-	/* keyboard input */
-	PORT_START("KEY.0") /* [0] - port 3000 @ 0 */
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH)    PORT_CHAR('\\') PORT_CHAR('|')
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Space")          PORT_CODE(KEYCODE_SPACE)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Return")         PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Tab")            PORT_CODE(KEYCODE_TAB)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("<--")            PORT_CODE(KEYCODE_BACKSPACE)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Caps Lock")      PORT_CODE(KEYCODE_CAPSLOCK)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ctrl")           PORT_CODE(KEYCODE_LCONTROL)   PORT_CHAR(UCHAR_MAMEKEY(LCONTROL))
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift")          PORT_CODE(KEYCODE_LSHIFT)     PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
-	PORT_START("KEY.1") /* [1] - port 3000 @ 1 */    /* touches => 2  1  0  /  .  -  ,  +     */
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("2 \"")           PORT_CODE(KEYCODE_2)    PORT_CHAR('2')
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("1 >")            PORT_CODE(KEYCODE_1)    PORT_CHAR('1')
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0 <")            PORT_CODE(KEYCODE_0)    PORT_CHAR('0')
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)     PORT_CHAR('.') PORT_CHAR('>')
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)    PORT_CHAR(',') PORT_CHAR('<')
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)    PORT_CHAR('-') PORT_CHAR('_')
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS)   PORT_CHAR('=') PORT_CHAR('+')
-
-	PORT_START("KEY.2") /* [1] - port 3000 @ 2 */     /* touches => .. 9  8  7  6  5  4  3  */
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("9 )")            PORT_CODE(KEYCODE_9)    PORT_CHAR('9')
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("8 (")            PORT_CODE(KEYCODE_8)    PORT_CHAR('8')
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("7 :")            PORT_CODE(KEYCODE_7)    PORT_CHAR('7')
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("6 !")            PORT_CODE(KEYCODE_6)    PORT_CHAR('6')
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("5 %")            PORT_CODE(KEYCODE_5)    PORT_CHAR('5')
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("4 $")            PORT_CODE(KEYCODE_4)    PORT_CHAR('4')
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("3 /")            PORT_CODE(KEYCODE_3)    PORT_CHAR('3')
-	PORT_START("KEY.3") /* [1] - port 3000 @ 3 */    /* touches =>  B  A  ..  ? .. =   ..  ;       */
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)     PORT_CHAR('B')
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A")           PORT_CODE(KEYCODE_Q)   PORT_CHAR('Q')
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)    PORT_CHAR('[') PORT_CHAR('{')
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE)   PORT_CHAR(']') PORT_CHAR('}')
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)       PORT_CHAR('/') PORT_CHAR('?')
-	PORT_START("KEY.4") /* [1] - port 3000 @ 4 */
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J)            PORT_CHAR('J')
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I)            PORT_CHAR('I')
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H)            PORT_CHAR('H')
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G)            PORT_CHAR('G')
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)            PORT_CHAR('F')
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E)            PORT_CHAR('E')
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)            PORT_CHAR('C')
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D)            PORT_CHAR('D')
-
-	PORT_START("KEY.5") /* [1] - port 3000 @ 5 */
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R)            PORT_CHAR('R')
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q")         PORT_CODE(KEYCODE_A)         PORT_CHAR('A')
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P)            PORT_CHAR('P')
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O)            PORT_CHAR('O')
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)            PORT_CHAR('N')
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L)            PORT_CHAR('L')
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K)            PORT_CHAR('K')
-
-	PORT_START("KEY.6") /* [1] - port 3000 @ 6 */
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z")          PORT_CODE(KEYCODE_W)            PORT_CHAR('W')
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)            PORT_CHAR('Y')
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("X")          PORT_CODE(KEYCODE_X)            PORT_CHAR('X')
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W")          PORT_CODE(KEYCODE_Z)            PORT_CHAR('Z')
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)            PORT_CHAR('V')
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U)            PORT_CHAR('U')
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T)            PORT_CHAR('T')
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)            PORT_CHAR('S')
-
-	PORT_START("KEY.7") /* [1] - port 3000 @ 7  JOYSTICK */
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Joy(0) LEFT")        PORT_CODE(KEYCODE_LEFT)     PORT_CHAR(UCHAR_MAMEKEY(LEFT))
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Joy(0) RIGHT")       PORT_CODE(KEYCODE_RIGHT)    PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Joy(0) UP")          PORT_CODE(KEYCODE_UP)       PORT_CHAR(UCHAR_MAMEKEY(UP))
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Joy(0) DOWN")        PORT_CODE(KEYCODE_DOWN)     PORT_CHAR(UCHAR_MAMEKEY(DOWN))
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Joy(1) LEFT")        PORT_CODE(KEYCODE_1_PAD)     /* Joy(1) on numpad*/
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Joy(1) RIGHT")       PORT_CODE(KEYCODE_3_PAD)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Joy(1) UP")          PORT_CODE(KEYCODE_5_PAD)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Joy(1) DOWN")        PORT_CODE(KEYCODE_2_PAD)
-
-	PORT_START("KEY.8") /* [1] - port 3000 @ 8  not for the real machine, but to emulate the analog signal of the joystick */
-		PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("RESET")             PORT_CODE(KEYCODE_ESC)      PORT_CHAR(27)
-		PORT_BIT(0x02, IP_ACTIVE_LOW,  IPT_KEYBOARD) PORT_NAME("Joy(0) FIRE")       PORT_CODE(KEYCODE_0_PAD)
-		PORT_BIT(0x04, IP_ACTIVE_LOW,  IPT_KEYBOARD) PORT_NAME("Joy(1) FIRE")       PORT_CODE(KEYCODE_PLUS_PAD)
-		PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Pot(0)+") PORT_CODE(KEYCODE_INSERT)
-		PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Pot(0)-") PORT_CODE(KEYCODE_DEL)
-		PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Pot(1)+") PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME))
-		PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Pot(1)-") PORT_CODE(KEYCODE_END) PORT_CHAR(UCHAR_MAMEKEY(END))
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
-INPUT_PORTS_END
-
-/* ROM definition */
-ROM_START( interact )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "interact.rom", 0x0000, 0x0800, CRC(1aa50444) SHA1(405806c97378abcf7c7b0d549430c78c7fc60ba2))
-ROM_END
-
-ROM_START( hector1 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "hector1.rom",  0x0000, 0x1000, CRC(3be6628b) SHA1(1c106d6732bed743d8283d39e5b8248271f18c42))
-ROM_END
-
-/* Driver */
-
-/*   YEAR  NAME      PARENT    COMPAT  MACHINE   INPUT     CLASS           INIT        COMPANY       FULLNAME       FLAGS */
-COMP(1979, interact, 0,        0,      interact, interact, interact_state, empty_init, "Interact",   "Interact Family Computer", MACHINE_IMPERFECT_SOUND)
-COMP(1983, hector1,  interact, 0,      hector1,  interact, interact_state, empty_init, "Micronique", "Hector 1",  MACHINE_IMPERFECT_SOUND)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/irisha.cpp mame-0.224+dfsg.1/src/mame/drivers/irisha.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/irisha.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/irisha.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,16 +2,23 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        Irisha driver by Miodrag Milanovic
+Irisha driver by Miodrag Milanovic
 
-        2008-03-27 Preliminary driver.
+2008-03-27 Preliminary driver.
 
-        Jump addresses:
-        Option 1: 0800 (Monitor - the only choice that works)
-        Option 2: 046E
-        Option 3: 0423 (then jumps to 4000)
-        Option 4: 0501
-        Option 5: 042E
+Jump addresses:
+  Option 1: 0800 (Monitor - the only choice that works)
+  Option 2: 046E
+  Option 3: 0423 (then jumps to 4000)
+  Option 4: 0501
+  Option 5: 042E
+
+TODO:
+- Fix options 2,3,4,5
+- Other emulator has yellow text on blue background
+- Need info on fdc (used in option 3) ports 20-2F,38
+- Currently no way to load or save software, and does any exist?
+- Other emulator has clones/variants with different menus
 
 ****************************************************************************/
 
@@ -34,27 +41,27 @@
 		: driver_device(mconfig, type, tag)
 		, m_p_videoram(*this, "videoram")
 		, m_maincpu(*this, "maincpu")
-		, m_pit(*this, "pit8253")
+		, m_pit(*this, "pit")
 		, m_speaker(*this, "speaker")
-		, m_keyboard(*this, "LINE%u", 0)
+		, m_keyboard(*this, "LINE%u", 0U)
 	{ }
 
 	void irisha(machine_config &config);
 
 private:
-	uint8_t irisha_keyboard_r();
-	uint8_t irisha_8255_portb_r();
-	uint8_t irisha_8255_portc_r();
-	void irisha_8255_porta_w(uint8_t data);
-	void irisha_8255_portb_w(uint8_t data);
-	void irisha_8255_portc_w(uint8_t data);
+	uint8_t keyboard_r();
+	uint8_t portb_r();
+	uint8_t portc_r();
+	void porta_w(uint8_t data);
+	void portb_w(uint8_t data);
+	void portc_w(uint8_t data);
 	DECLARE_WRITE_LINE_MEMBER(speaker_w);
 	TIMER_CALLBACK_MEMBER(irisha_key);
-	uint32_t screen_update_irisha(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	required_shared_ptr<uint8_t> m_p_videoram;
 
-	void irisha_io(address_map &map);
-	void irisha_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 
 	bool m_sg1_line;
 	bool m_keypressed;
@@ -63,8 +70,8 @@
 	uint8_t m_ppi_portc;
 	emu_timer *m_key_timer;
 	void update_speaker();
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
+	void machine_start() override;
+	void machine_reset() override;
 	required_device<cpu_device> m_maincpu;
 	required_device<pit8253_device> m_pit;
 	required_device<speaker_sound_device> m_speaker;
@@ -73,20 +80,20 @@
 
 
 /* Address maps */
-void irisha_state::irisha_mem(address_map &map)
+void irisha_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x3fff).rom();  // ROM
-	map(0x4000, 0xdfff).ram();  // RAM
+	map(0x0000, 0x3fff).rom();
+	map(0x4000, 0xdfff).ram();
 	map(0xe000, 0xffff).ram().share("videoram");
 }
 
-void irisha_state::irisha_io(address_map &map)
+void irisha_state::io_map(address_map &map)
 {
-	map(0x04, 0x05).r(FUNC(irisha_state::irisha_keyboard_r));
+	map(0x04, 0x05).r(FUNC(irisha_state::keyboard_r));
 	map(0x06, 0x07).rw("uart", FUNC(i8251_device::read), FUNC(i8251_device::write));
 	map(0x08, 0x0B).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write));
-	map(0x0C, 0x0F).rw("pic8259", FUNC(pic8259_device::read), FUNC(pic8259_device::write)).mask(0x01);
-	map(0x10, 0x13).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0x0C, 0x0F).rw("pic", FUNC(pic8259_device::read), FUNC(pic8259_device::write)).mask(0x01);
+	map(0x10, 0x13).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write));
 }
 
 /* Input ports */
@@ -198,7 +205,7 @@
 
 *************************************************/
 
-uint32_t irisha_state::screen_update_irisha(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t irisha_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	uint8_t gfx;
 	uint16_t y,ma=0,x;
@@ -228,7 +235,7 @@
 }
 
 /* F4 Character Displayer */
-static const gfx_layout irisha_charlayout =
+static const gfx_layout charlayout =
 {
 	8, 8,                   /* 8 x 8 characters */
 	256,                    /* 256 characters */
@@ -242,7 +249,7 @@
 };
 
 static GFXDECODE_START( gfx_irisha )
-	GFXDECODE_ENTRY( "maincpu", 0x3800, irisha_charlayout, 0, 1 )
+	GFXDECODE_ENTRY( "maincpu", 0x3800, charlayout, 0, 1 )
 GFXDECODE_END
 
 
@@ -252,7 +259,7 @@
 
 *************************************************/
 
-uint8_t irisha_state::irisha_8255_portb_r()
+uint8_t irisha_state::portb_r()
 {
 	if (m_keypressed==1)
 	{
@@ -263,13 +270,13 @@
 	return 0x00;
 }
 
-uint8_t irisha_state::irisha_8255_portc_r()
+uint8_t irisha_state::portc_r()
 {
 	logerror("irisha_8255_portc_r\n");
 	return 0;
 }
 
-void irisha_state::irisha_8255_porta_w(uint8_t data)
+void irisha_state::porta_w(uint8_t data)
 {
 	logerror("irisha_8255_porta_w %02x\n",data);
 
@@ -278,12 +285,12 @@
 	update_speaker();
 }
 
-void irisha_state::irisha_8255_portb_w(uint8_t data)
+void irisha_state::portb_w(uint8_t data)
 {
 	logerror("irisha_8255_portb_w %02x\n",data);
 }
 
-void irisha_state::irisha_8255_portc_w(uint8_t data)
+void irisha_state::portc_w(uint8_t data)
 {
 	//logerror("irisha_8255_portc_w %02x\n",data);
 
@@ -329,7 +336,7 @@
 	m_keyboard_cnt = 0;
 }
 
-uint8_t irisha_state::irisha_keyboard_r()
+uint8_t irisha_state::keyboard_r()
 {
 	uint8_t keycode = 0xff;
 
@@ -352,6 +359,11 @@
 {
 	m_key_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(irisha_state::irisha_key),this));
 	m_key_timer->adjust(attotime::from_msec(30), 0, attotime::from_msec(30));
+	save_item(NAME(m_sg1_line));
+	save_item(NAME(m_keypressed));
+	save_item(NAME(m_keyboard_cnt));
+	save_item(NAME(m_ppi_porta));
+	save_item(NAME(m_ppi_portc));
 }
 
 void irisha_state::machine_reset()
@@ -368,8 +380,8 @@
 {
 	/* basic machine hardware */
 	I8080(config, m_maincpu, XTAL(16'000'000) / 9);
-	m_maincpu->set_addrmap(AS_PROGRAM, &irisha_state::irisha_mem);
-	m_maincpu->set_addrmap(AS_IO, &irisha_state::irisha_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &irisha_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &irisha_state::io_map);
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -377,7 +389,7 @@
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	screen.set_size(320, 200);
 	screen.set_visarea(0, 320-1, 0, 200-1);
-	screen.set_screen_update(FUNC(irisha_state::screen_update_irisha));
+	screen.set_screen_update(FUNC(irisha_state::screen_update));
 	screen.set_palette("palette");
 
 	GFXDECODE(config, "gfxdecode", "palette", gfx_irisha);
@@ -392,32 +404,32 @@
 
 	PIT8253(config, m_pit, 0);
 	m_pit->set_clk<0>(16_MHz_XTAL / 9);
-	m_pit->out_handler<0>().set("pic8259", FUNC(pic8259_device::ir0_w));
+	m_pit->out_handler<0>().set("pic", FUNC(pic8259_device::ir0_w));
 	m_pit->set_clk<1>(16_MHz_XTAL / 9 / 8 / 8);
 	m_pit->out_handler<1>().set("uart", FUNC(i8251_device::write_txc));
 	m_pit->out_handler<1>().append("uart", FUNC(i8251_device::write_rxc));
 	m_pit->set_clk<2>(16_MHz_XTAL / 9);
 	m_pit->out_handler<2>().set(FUNC(irisha_state::speaker_w));
 
-	i8255_device &ppi(I8255(config, "ppi8255"));
-	ppi.out_pa_callback().set(FUNC(irisha_state::irisha_8255_porta_w));
-	ppi.in_pb_callback().set(FUNC(irisha_state::irisha_8255_portb_r));
-	ppi.out_pb_callback().set(FUNC(irisha_state::irisha_8255_portb_w));
-	ppi.in_pc_callback().set(FUNC(irisha_state::irisha_8255_portc_r));
-	ppi.out_pc_callback().set(FUNC(irisha_state::irisha_8255_portc_w));
+	i8255_device &ppi(I8255(config, "ppi"));
+	ppi.out_pa_callback().set(FUNC(irisha_state::porta_w));
+	ppi.in_pb_callback().set(FUNC(irisha_state::portb_r));
+	ppi.out_pb_callback().set(FUNC(irisha_state::portb_w));
+	ppi.in_pc_callback().set(FUNC(irisha_state::portc_r));
+	ppi.out_pc_callback().set(FUNC(irisha_state::portc_w));
 
-	pic8259_device &pic8259(PIC8259(config, "pic8259", 0));
+	pic8259_device &pic8259(PIC8259(config, "pic", 0));
 	pic8259.out_int_callback().set_inputline(m_maincpu, 0);
 }
 
 /* ROM definition */
 
 ROM_START( irisha )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x4000, "maincpu", 0 )
 	ROM_LOAD( "ir_bootm.bin", 0x0000, 0x2000, CRC(7f9f4f0e) SHA1(05f97e1a1d7a15f4451129dba6c0bddc87ea748e))
 	ROM_LOAD( "ir_conou.bin", 0x2000, 0x2000, CRC(bf92beed) SHA1(696c482ba53bc6261db11061ecc7141c67f1d820))
 ROM_END
 
 /* Driver */
 //    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT        COMPANY  FULLNAME  FLAGS
-COMP( 1983, irisha,      0,      0, irisha,  irisha, irisha_state, empty_init, "MGU",   "Irisha", MACHINE_NOT_WORKING)
+COMP( 1983, irisha,      0,      0, irisha,  irisha, irisha_state, empty_init, "MGU",   "Irisha", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/itech8.cpp mame-0.224+dfsg.1/src/mame/drivers/itech8.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/itech8.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/itech8.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1982,37 +1982,37 @@
 
 ROM_START( wfortune )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "wofpgm", 0x00000, 0x10000, CRC(bd984654) SHA1(8e16d2feb26e9a6f86c4a36bf0f03db80ded03f6) )
+	ROM_LOAD( "wofpgm.u5", 0x00000, 0x10000, CRC(bd984654) SHA1(8e16d2feb26e9a6f86c4a36bf0f03db80ded03f6) )
 
 	ROM_REGION( 0x10000, "soundcpu", 0 )
-	ROM_LOAD( "wofsnd", 0x08000, 0x8000, CRC(0a6aa5dc) SHA1(42eef40a4300d6d16d9e2af678432a02be05f104) )
+	ROM_LOAD( "wof_snd-wof.u27", 0x08000, 0x8000, CRC(0a6aa5dc) SHA1(42eef40a4300d6d16d9e2af678432a02be05f104) )
 
 	ROM_REGION( 0xc0000, "grom", 0 )
-	ROM_LOAD( "wofgrom0", 0x00000, 0x10000, CRC(9a157b2c) SHA1(c349b41ba00cf6e2fec32872627c8cfdd8b5c1b9) )
-	ROM_LOAD( "wofgrom1", 0x10000, 0x10000, CRC(5064739b) SHA1(424e3f94333f8ca21ac39b64b684cf6b487164d3) )
-	ROM_LOAD( "wofgrom2", 0x20000, 0x10000, CRC(3d393b2b) SHA1(2c94d2dab7369c099c470cf96391b033f39add78) )
-	ROM_LOAD( "wofgrom3", 0x30000, 0x10000, CRC(117a2ce9) SHA1(8d601c1cf9f783a42617f13c6862a5835553ac4f) )
+	ROM_LOAD( "grom0-wof.grom0", 0x00000, 0x10000, CRC(9a157b2c) SHA1(c349b41ba00cf6e2fec32872627c8cfdd8b5c1b9) )
+	ROM_LOAD( "grom1-wof.grom1", 0x10000, 0x10000, CRC(5064739b) SHA1(424e3f94333f8ca21ac39b64b684cf6b487164d3) )
+	ROM_LOAD( "grom2-wof.grom2", 0x20000, 0x10000, CRC(3d393b2b) SHA1(2c94d2dab7369c099c470cf96391b033f39add78) )
+	ROM_LOAD( "grom3-wof.grom3", 0x30000, 0x10000, CRC(117a2ce9) SHA1(8d601c1cf9f783a42617f13c6862a5835553ac4f) )
 
 	ROM_REGION( 0x40000, "oki", 0 )
-	ROM_LOAD( "wofsbom0", 0x00000, 0x20000, CRC(5c28c3fe) SHA1(eba64ede749fb26f9926f644d66860b54b4c76e7) )
+	ROM_LOAD( "wof_vr-sbom0.srom0", 0x00000, 0x20000, CRC(5c28c3fe) SHA1(eba64ede749fb26f9926f644d66860b54b4c76e7) ) /* Labeled as WOF VR-SBOM0  (yes it's actually "SBOM0") */
 ROM_END
 
 
 ROM_START( wfortunea )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "wofpgmr1.bin", 0x00000, 0x10000, CRC(c3d3eb21) SHA1(21137663afd19fba875e188640f0347fc8c5dcf0) )
+	ROM_LOAD( "wof-pgm_r1.u5", 0x00000, 0x10000, CRC(c3d3eb21) SHA1(21137663afd19fba875e188640f0347fc8c5dcf0) ) /* Labeled as WOF-PGM R1 */
 
 	ROM_REGION( 0x10000, "soundcpu", 0 )
-	ROM_LOAD( "wofsnd", 0x08000, 0x8000, CRC(0a6aa5dc) SHA1(42eef40a4300d6d16d9e2af678432a02be05f104) )
+	ROM_LOAD( "wof_snd-wof.u27", 0x08000, 0x8000, CRC(0a6aa5dc) SHA1(42eef40a4300d6d16d9e2af678432a02be05f104) )
 
 	ROM_REGION( 0xc0000, "grom", 0 )
-	ROM_LOAD( "wofgrom0", 0x00000, 0x10000, CRC(9a157b2c) SHA1(c349b41ba00cf6e2fec32872627c8cfdd8b5c1b9) )
-	ROM_LOAD( "wofgrom1", 0x10000, 0x10000, CRC(5064739b) SHA1(424e3f94333f8ca21ac39b64b684cf6b487164d3) )
-	ROM_LOAD( "wofgrom2", 0x20000, 0x10000, CRC(3d393b2b) SHA1(2c94d2dab7369c099c470cf96391b033f39add78) )
-	ROM_LOAD( "wofgrom3", 0x30000, 0x10000, CRC(117a2ce9) SHA1(8d601c1cf9f783a42617f13c6862a5835553ac4f) )
+	ROM_LOAD( "grom0-wof.grom0", 0x00000, 0x10000, CRC(9a157b2c) SHA1(c349b41ba00cf6e2fec32872627c8cfdd8b5c1b9) )
+	ROM_LOAD( "grom1-wof.grom1", 0x10000, 0x10000, CRC(5064739b) SHA1(424e3f94333f8ca21ac39b64b684cf6b487164d3) )
+	ROM_LOAD( "grom2-wof.grom2", 0x20000, 0x10000, CRC(3d393b2b) SHA1(2c94d2dab7369c099c470cf96391b033f39add78) )
+	ROM_LOAD( "grom3-wof.grom3", 0x30000, 0x10000, CRC(117a2ce9) SHA1(8d601c1cf9f783a42617f13c6862a5835553ac4f) )
 
 	ROM_REGION( 0x40000, "oki", 0 )
-	ROM_LOAD( "wofsbom0", 0x00000, 0x20000, CRC(5c28c3fe) SHA1(eba64ede749fb26f9926f644d66860b54b4c76e7) )
+	ROM_LOAD( "wof_vr-sbom0.srom0", 0x00000, 0x20000, CRC(5c28c3fe) SHA1(eba64ede749fb26f9926f644d66860b54b4c76e7) ) /* Labeled as WOF VR-SBOM0  (yes it's actually "SBOM0") */
 ROM_END
 
 
@@ -2742,7 +2742,7 @@
 
 /* Wheel of Fortune-style PCB */
 GAME( 1989, wfortune,   0,         wfortune,          wfortune, itech8_state, empty_init,    ROT0,   "GameTek", "Wheel Of Fortune (set 1)", 0 )
-GAME( 1989, wfortunea,  wfortune,  wfortune,          wfortune, itech8_state, empty_init,    ROT0,   "GameTek", "Wheel Of Fortune (set 2)", 0 )
+GAME( 1989, wfortunea,  wfortune,  wfortune,          wfortune, itech8_state, empty_init,    ROT0,   "GameTek", "Wheel Of Fortune (set 2)", 0 ) /* program ROM label states "R1" */
 
 /* Grudge Match-style PCB */
 GAME( 1989, grmatch,    0,         grmatch,           grmatch,  grmatch_state, empty_init,   ROT0,   "Yankee Game Technology", "Grudge Match (Yankee Game Technology)", 0 )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/jaguar.cpp mame-0.224+dfsg.1/src/mame/drivers/jaguar.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/jaguar.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/jaguar.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2114,10 +2114,10 @@
 
 ROM_START( area51 ) /* R3000 based, Area51 Atari Games License - MAIN: Oct 24 1996 12:02:23 / GUTS: 2.06CJ Nov 11 1996 11:46:43 */
 	ROM_REGION( 0x200000, "maincpu", 0 )    /* 2MB for IDT 79R3041 code */
-	ROM_LOAD32_BYTE( "2-c_area_51_hh.hh", 0x00000, 0x80000, CRC(13af6a1e) SHA1(69da54ed6886e825156bbcc256e8d7abd4dc1ff8) ) /* Grean labels: 2-C AREA 51 HH */
-	ROM_LOAD32_BYTE( "2-c_area_51_hl.hl", 0x00001, 0x80000, CRC(8ab6649b) SHA1(9b4945bc04f8a73161638a2c5fa2fd84c6fd31b4) ) /* Grean labels: 2-C AREA 51 HL */
-	ROM_LOAD32_BYTE( "2-c_area_51_lh.lh", 0x00002, 0x80000, CRC(a6524f73) SHA1(ae377a6803a4f7d1bbcc111725af121a3e82317d) ) /* Grean labels: 2-C AREA 51 LH */
-	ROM_LOAD32_BYTE( "2-c_area_51_ll.ll", 0x00003, 0x80000, CRC(471b15d2) SHA1(4b5f45ee140b03a6be61475cae1c2dbef0f07457) ) /* Grean labels: 2-C AREA 51 LL */
+	ROM_LOAD32_BYTE( "2-c_area_51_hh.hh", 0x00000, 0x80000, CRC(13af6a1e) SHA1(69da54ed6886e825156bbcc256e8d7abd4dc1ff8) ) /* Green labels: 2-C AREA 51 HH */
+	ROM_LOAD32_BYTE( "2-c_area_51_hl.hl", 0x00001, 0x80000, CRC(8ab6649b) SHA1(9b4945bc04f8a73161638a2c5fa2fd84c6fd31b4) ) /* Green labels: 2-C AREA 51 HL */
+	ROM_LOAD32_BYTE( "2-c_area_51_lh.lh", 0x00002, 0x80000, CRC(a6524f73) SHA1(ae377a6803a4f7d1bbcc111725af121a3e82317d) ) /* Green labels: 2-C AREA 51 LH */
+	ROM_LOAD32_BYTE( "2-c_area_51_ll.ll", 0x00003, 0x80000, CRC(471b15d2) SHA1(4b5f45ee140b03a6be61475cae1c2dbef0f07457) ) /* Green labels: 2-C AREA 51 LL */
 
 	ROM_REGION16_BE( 0x1000, "waverom", 0 )
 	ROM_LOAD16_WORD("jagwave.rom", 0x0000, 0x1000, CRC(7a25ee5b) SHA1(58117e11fd6478c521fbd3fdbe157f39567552f0) )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/jpmimpct.cpp mame-0.224+dfsg.1/src/mame/drivers/jpmimpct.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/jpmimpct.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/jpmimpct.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1737,6 +1737,20 @@
 	/* missing? */
 ROM_END
 
+ROM_START( jpmreno ) // was in an MPU4 video set
+	ROM_REGION( 0x1000000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "reno_71_27c040.bin",0x000000, 0x080000,  CRC(c1125c51) SHA1(a461049cd3768096c03f3a5149cdef31d0ab447e) )
+	ROM_LOAD16_BYTE( "reno_72_27c040.bin",0x000001, 0x080000,  CRC(31773743) SHA1(e1245f6b35c9049b3d1478e93fb1b6cfff34733e) )
+
+	ROM_REGION16_LE( 0x200000, "user1", ROMREGION_ERASEFF )
+	ROM_LOAD16_BYTE( "gr1.bin", 0x000000, 0x100000, NO_DUMP )
+	ROM_LOAD16_BYTE( "gr2.bin", 0x000001, 0x100000, NO_DUMP )
+
+	ROM_REGION( 0x800000, "upd", 0 )
+	ROM_LOAD( "reno reels sound 1a",  0x000000, 0x080000,  CRC(a8b7bba7) SHA1(5fa3512a6fdcf512fafa6261b3a99922a00d6874) )
+ROM_END
+
+
 /************************************
  *
  *  Game driver(s)
@@ -1760,5 +1774,6 @@
 GAME( 1999, coronatnd, coronatn, jpmimpct, coronatn, jpmimpct_state, empty_init, ROT0, "JPM", "Coronation Street Quiz Game (Protocol)", MACHINE_SUPPORTS_SAVE )
 GAME( 199?, tqst,      0,        jpmimpct, cluedo,   jpmimpct_state, empty_init, ROT0, "JPM", "Treasure Quest"             , MACHINE_NOT_WORKING) // incomplete (ACE?)
 GAME( 199?, snlad,     0,        jpmimpct, cluedo,   jpmimpct_state, empty_init, ROT0, "JPM", "Snake & Ladders"            , MACHINE_NOT_WORKING) // incomplete
+GAME( 199?, jpmreno ,  0,        jpmimpct, cluedo,   jpmimpct_state, empty_init, ROT0, "JPM", "Reno Reels (JPM)", MACHINE_NOT_WORKING ) // incomplete
 GAME( 199?, buzzundr,  0,        jpmimpct, cluedo,   jpmimpct_state, empty_init, ROT0, "Ace", "Buzzundrum (Ace)", MACHINE_NOT_WORKING )
 GAME( 199?, monspdr ,  0,        jpmimpct, cluedo,   jpmimpct_state, empty_init, ROT0, "Ace", "Money Spider (Ace)", MACHINE_NOT_WORKING )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/jpmsys5.cpp mame-0.224+dfsg.1/src/mame/drivers/jpmsys5.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/jpmsys5.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/jpmsys5.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -24,6 +24,7 @@
       The byte at 0x81 of the EVEN 68k rom appears to be some kind of
       control byte, probably region, or coin / machine type setting.
       Many sets differ only by this byte.
+      Now we have BACTA protocol emulation, see if this is related.
 
       Many sets are probably missing sound roms, however due to the
       varying motherboard configurations (SAA vs. YM, with added UPD)
@@ -34,6 +35,8 @@
 #include "emu.h"
 #include "includes/jpmsys5.h"
 
+#include "machine/bacta_datalogger.h"
+
 #include "machine/clock.h"
 #include "machine/input_merger.h"
 #include "sound/saa1099.h"
@@ -590,10 +593,14 @@
 
 	INPUT_MERGER_ANY_HIGH(config, "acia_irq").output_handler().set_inputline(m_maincpu, INT_6850ACIA);
 
+	bacta_datalogger_device &bacta(BACTA_DATALOGGER(config, "bacta", 0));
+
 	ACIA6850(config, m_acia6850[0], 0);
-	m_acia6850[0]->txd_handler().set(FUNC(jpmsys5v_state::a0_tx_w));
+	m_acia6850[0]->txd_handler().set("bacta", FUNC(bacta_datalogger_device::write_txd));
 	m_acia6850[0]->irq_handler().set("acia_irq", FUNC(input_merger_device::in_w<0>));
 
+	bacta.rxd_handler().set(m_acia6850[0], FUNC(acia6850_device::write_rxd));
+
 	ACIA6850(config, m_acia6850[1], 0);
 	m_acia6850[1]->txd_handler().set(FUNC(jpmsys5v_state::a1_tx_w));
 	m_acia6850[1]->irq_handler().set("acia_irq", FUNC(input_merger_device::in_w<1>));
@@ -602,9 +609,11 @@
 	m_acia6850[2]->txd_handler().set(FUNC(jpmsys5v_state::a2_tx_w));
 	m_acia6850[2]->irq_handler().set("acia_irq", FUNC(input_merger_device::in_w<2>));
 
+	clock_device &bacta_clock(CLOCK(config, "bacta_clock", 19200)); // Gives 1200 baud, but real timer is programmable (location?)
+	bacta_clock.signal_handler().set(m_acia6850[0], FUNC(acia6850_device::write_txc));
+	bacta_clock.signal_handler().append(m_acia6850[0], FUNC(acia6850_device::write_rxc));
+
 	clock_device &acia_clock(CLOCK(config, "acia_clock", 10000)); // What are the correct ACIA clocks ?
-	acia_clock.signal_handler().set(m_acia6850[0], FUNC(acia6850_device::write_txc));
-	acia_clock.signal_handler().append(m_acia6850[0], FUNC(acia6850_device::write_rxc));
 	acia_clock.signal_handler().append(m_acia6850[1], FUNC(acia6850_device::write_txc));
 	acia_clock.signal_handler().append(m_acia6850[1], FUNC(acia6850_device::write_rxc));
 	acia_clock.signal_handler().append(m_acia6850[2], FUNC(acia6850_device::write_txc));
@@ -810,21 +819,27 @@
 
 	INPUT_MERGER_ANY_HIGH(config, "acia_irq").output_handler().set_inputline(m_maincpu, INT_6850ACIA);
 
+	bacta_datalogger_device &bacta(BACTA_DATALOGGER(config, "bacta", 0));
+
 	ACIA6850(config, m_acia6850[0], 0);
-	m_acia6850[0]->txd_handler().set(FUNC(jpmsys5_state::a0_tx_w));
+	m_acia6850[0]->txd_handler().set("bacta", FUNC(bacta_datalogger_device::write_txd));
 	m_acia6850[0]->irq_handler().set("acia_irq", FUNC(input_merger_device::in_w<0>));
 
+	bacta.rxd_handler().set(m_acia6850[0], FUNC(acia6850_device::write_rxd));
+
 	ACIA6850(config, m_acia6850[1], 0);
-	m_acia6850[1]->txd_handler().set(FUNC(jpmsys5_state::a1_tx_w));
+	m_acia6850[1]->txd_handler().set(FUNC(jpmsys5v_state::a1_tx_w));
 	m_acia6850[1]->irq_handler().set("acia_irq", FUNC(input_merger_device::in_w<1>));
 
 	ACIA6850(config, m_acia6850[2], 0);
-	m_acia6850[2]->txd_handler().set(FUNC(jpmsys5_state::a2_tx_w));
+	m_acia6850[2]->txd_handler().set(FUNC(jpmsys5v_state::a2_tx_w));
 	m_acia6850[2]->irq_handler().set("acia_irq", FUNC(input_merger_device::in_w<2>));
 
+	clock_device &bacta_clock(CLOCK(config, "bacta_clock", 19200)); // Gives 1200 baud, but real timer is programmable (location?)
+	bacta_clock.signal_handler().set(m_acia6850[0], FUNC(acia6850_device::write_txc));
+	bacta_clock.signal_handler().append(m_acia6850[0], FUNC(acia6850_device::write_rxc));
+
 	clock_device &acia_clock(CLOCK(config, "acia_clock", 10000)); // What are the correct ACIA clocks ?
-	acia_clock.signal_handler().set(m_acia6850[0], FUNC(acia6850_device::write_txc));
-	acia_clock.signal_handler().append(m_acia6850[0], FUNC(acia6850_device::write_rxc));
 	acia_clock.signal_handler().append(m_acia6850[1], FUNC(acia6850_device::write_txc));
 	acia_clock.signal_handler().append(m_acia6850[1], FUNC(acia6850_device::write_rxc));
 	acia_clock.signal_handler().append(m_acia6850[2], FUNC(acia6850_device::write_txc));
@@ -868,21 +883,27 @@
 
 	INPUT_MERGER_ANY_HIGH(config, "acia_irq").output_handler().set_inputline(m_maincpu, INT_6850ACIA);
 
+	bacta_datalogger_device &bacta(BACTA_DATALOGGER(config, "bacta", 0));
+
 	ACIA6850(config, m_acia6850[0], 0);
-	m_acia6850[0]->txd_handler().set(FUNC(jpmsys5_state::a0_tx_w));
+	m_acia6850[0]->txd_handler().set("bacta", FUNC(bacta_datalogger_device::write_txd));
 	m_acia6850[0]->irq_handler().set("acia_irq", FUNC(input_merger_device::in_w<0>));
 
+	bacta.rxd_handler().set(m_acia6850[0], FUNC(acia6850_device::write_rxd));
+
 	ACIA6850(config, m_acia6850[1], 0);
-	m_acia6850[1]->txd_handler().set(FUNC(jpmsys5_state::a1_tx_w));
+	m_acia6850[1]->txd_handler().set(FUNC(jpmsys5v_state::a1_tx_w));
 	m_acia6850[1]->irq_handler().set("acia_irq", FUNC(input_merger_device::in_w<1>));
 
 	ACIA6850(config, m_acia6850[2], 0);
-	m_acia6850[2]->txd_handler().set(FUNC(jpmsys5_state::a2_tx_w));
+	m_acia6850[2]->txd_handler().set(FUNC(jpmsys5v_state::a2_tx_w));
 	m_acia6850[2]->irq_handler().set("acia_irq", FUNC(input_merger_device::in_w<2>));
 
+	clock_device &bacta_clock(CLOCK(config, "bacta_clock", 19200)); // Gives 1200 baud, but real timer is programmable (location?)
+	bacta_clock.signal_handler().set(m_acia6850[0], FUNC(acia6850_device::write_txc));
+	bacta_clock.signal_handler().append(m_acia6850[0], FUNC(acia6850_device::write_rxc));
+
 	clock_device &acia_clock(CLOCK(config, "acia_clock", 10000)); // What are the correct ACIA clocks ?
-	acia_clock.signal_handler().set(m_acia6850[0], FUNC(acia6850_device::write_txc));
-	acia_clock.signal_handler().append(m_acia6850[0], FUNC(acia6850_device::write_rxc));
 	acia_clock.signal_handler().append(m_acia6850[1], FUNC(acia6850_device::write_txc));
 	acia_clock.signal_handler().append(m_acia6850[1], FUNC(acia6850_device::write_rxc));
 	acia_clock.signal_handler().append(m_acia6850[2], FUNC(acia6850_device::write_txc));
@@ -922,6 +943,7 @@
  *
  *************************************/
 
+
 ROM_START( monopoly )
 	ROM_REGION( 0x300000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "7398.bin", 0x000000, 0x80000, CRC(62c80f20) SHA1(322514f920d6cb48887b624786b52af34bdb8e5f) )
@@ -931,23 +953,25 @@
 	ROM_LOAD16_BYTE( "6670.bin", 0x200000, 0x80000, CRC(66e2a5e1) SHA1(04d4b55d6ad121cdc3592d33e9d953affa24f01a) )
 	ROM_LOAD16_BYTE( "6671.bin", 0x200001, 0x80000, CRC(b2a3cedd) SHA1(e3a5dd028b0769e08a796a96665b31491c3b18ca) )
 
+	ROM_REGION( 0x80000, "upd7759", 0 )
+	ROM_LOAD( "6538.bin", 0x00000, 0x40000, CRC(ccdd4ce3) SHA1(dbb24682cea8081a447ca2c53395964fc46e7f56) )
+ROM_END
 
 
-	ROM_REGION( 0x300000, "altrevs", 0 )
-	ROM_LOAD16_BYTE( "7400.bin", 0x00001, 0x080000, CRC(d6f1f98c) SHA1(f20c788a31a8fe339aed701866180a3eb16fafb9) )
-
-	// this version doesn't work too well, missing other roms, or just bad?
-	ROM_LOAD16_BYTE( "monov3p1", 0x00000, 0x080000, CRC(a66fc610) SHA1(fddd3b37a6aebf5c402942d26a2fa1fa130326dd) )
-	ROM_LOAD16_BYTE( "monov3p2", 0x00001, 0x080000, CRC(2d629723) SHA1(c5584113e50dc5f636dbcf80e4689d2bbfe98e71) )
-	// mismastched?
-	ROM_LOAD16_BYTE( "monov4p2", 0x00001, 0x080000, CRC(3c2dd9b7) SHA1(01c87584b3599763a0c37040199014c2902dc6f3) )
-
+ROM_START( monopolyd )
+	ROM_REGION( 0x300000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "7398.bin", 0x000000, 0x80000, CRC(62c80f20) SHA1(322514f920d6cb48887b624786b52af34bdb8e5f) )
+	ROM_LOAD16_BYTE( "7400.bin", 0x000001, 0x80000, CRC(d6f1f98c) SHA1(f20c788a31a8fe339aed701866180a3eb16fafb9) )
+	ROM_LOAD16_BYTE( "6668.bin", 0x100000, 0x80000, CRC(30bf082a) SHA1(29ba67a86e82f0eb4feb816a2031d62028eb11b0) )
+	ROM_LOAD16_BYTE( "6669.bin", 0x100001, 0x80000, CRC(85d38c2d) SHA1(2f1a394df243e5fbbad31507b9074c997c473106) )
+	ROM_LOAD16_BYTE( "6670.bin", 0x200000, 0x80000, CRC(66e2a5e1) SHA1(04d4b55d6ad121cdc3592d33e9d953affa24f01a) )
+	ROM_LOAD16_BYTE( "6671.bin", 0x200001, 0x80000, CRC(b2a3cedd) SHA1(e3a5dd028b0769e08a796a96665b31491c3b18ca) )
 
 	ROM_REGION( 0x80000, "upd7759", 0 )
 	ROM_LOAD( "6538.bin", 0x00000, 0x40000, CRC(ccdd4ce3) SHA1(dbb24682cea8081a447ca2c53395964fc46e7f56) )
 ROM_END
 
-ROM_START( monopolya )
+ROM_START( monopoly4 )
 	ROM_REGION( 0x300000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "mono4e1",  0x000000, 0x80000, CRC(0338b165) SHA1(fdc0fcf0fddcf88d593a22885779e8224484e7e4) )
 	ROM_LOAD16_BYTE( "mono4e2",  0x000001, 0x80000, CRC(c8aa21d8) SHA1(257ecf85e1d41b15bb2bbe2157e9d3f72b7e0317) )
@@ -956,10 +980,27 @@
 	ROM_LOAD16_BYTE( "6670.bin", 0x200000, 0x80000, CRC(66e2a5e1) SHA1(04d4b55d6ad121cdc3592d33e9d953affa24f01a) )
 	ROM_LOAD16_BYTE( "6671.bin", 0x200001, 0x80000, CRC(b2a3cedd) SHA1(e3a5dd028b0769e08a796a96665b31491c3b18ca) )
 
+	ROM_REGION( 0x300000, "altrevs", 0 )
+	ROM_LOAD16_BYTE( "monov4p2", 0x000001, 0x80000, CRC(3c2dd9b7) SHA1(01c87584b3599763a0c37040199014c2902dc6f3) ) // mismatched?
+
+	ROM_REGION( 0x80000, "upd7759", 0 )
+	ROM_LOAD( "6538.bin", 0x00000, 0x40000, CRC(ccdd4ce3) SHA1(dbb24682cea8081a447ca2c53395964fc46e7f56) )
+ROM_END
+
+ROM_START( monopoly3 )
+	ROM_REGION( 0x300000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "monov3p1", 0x000000, 0x80000, CRC(a66fc610) SHA1(fddd3b37a6aebf5c402942d26a2fa1fa130326dd) )
+	ROM_LOAD16_BYTE( "monov3p2", 0x000001, 0x80000, CRC(2d629723) SHA1(c5584113e50dc5f636dbcf80e4689d2bbfe98e71) )
+	ROM_LOAD16_BYTE( "6668.bin", 0x100000, 0x80000, CRC(30bf082a) SHA1(29ba67a86e82f0eb4feb816a2031d62028eb11b0) )
+	ROM_LOAD16_BYTE( "6669.bin", 0x100001, 0x80000, CRC(85d38c2d) SHA1(2f1a394df243e5fbbad31507b9074c997c473106) )
+	ROM_LOAD16_BYTE( "6670.bin", 0x200000, 0x80000, CRC(66e2a5e1) SHA1(04d4b55d6ad121cdc3592d33e9d953affa24f01a) )
+	ROM_LOAD16_BYTE( "6671.bin", 0x200001, 0x80000, CRC(b2a3cedd) SHA1(e3a5dd028b0769e08a796a96665b31491c3b18ca) )
+
 	ROM_REGION( 0x80000, "upd7759", 0 )
 	ROM_LOAD( "6538.bin", 0x00000, 0x40000, CRC(ccdd4ce3) SHA1(dbb24682cea8081a447ca2c53395964fc46e7f56) )
 ROM_END
 
+//Monopoly Classic is a non-payout quiz game, where the goal is to earn points from collecting properties.
 
 ROM_START( monoplcl )
 	ROM_REGION( 0x300000, "maincpu", 0 )
@@ -970,13 +1011,18 @@
 	ROM_LOAD16_BYTE( "6670.bin", 0x200000, 0x80000, CRC(66e2a5e1) SHA1(04d4b55d6ad121cdc3592d33e9d953affa24f01a) )
 	ROM_LOAD16_BYTE( "6671.bin", 0x200001, 0x80000, CRC(b2a3cedd) SHA1(e3a5dd028b0769e08a796a96665b31491c3b18ca) )
 
-	ROM_REGION( 0x300000, "altrevs", 0 )
-	ROM_LOAD16_BYTE( "7403.bin", 0x000001, 0x080000, CRC(95dbacb6) SHA1(bd551ccad95440a669a547092ab126178b0d0bf9) )
+	ROM_REGION( 0x80000, "upd7759", 0 )
+	ROM_LOAD( "6538.bin", 0x00000, 0x40000, CRC(ccdd4ce3) SHA1(dbb24682cea8081a447ca2c53395964fc46e7f56) )
+ROM_END
 
-	ROM_LOAD( "mdlxv1p1", 0x0000, 0x080000, CRC(48ab1691) SHA1(6df2aad02548d5239e3974a11228bc9aad8c9170) )
-	ROM_LOAD( "mdlxv1p2", 0x0000, 0x080000, CRC(107c3e65) SHA1(e298b3a2826f92ba6119348a36bc4735e1799797) )
-	/* p3 missing? */
-	ROM_LOAD( "mdlxv1p4", 0x0000, 0x080000, CRC(e3fd1a27) SHA1(6bba70ff27a6d068febcbdfa1b1f8ff2ef86ef03) )
+ROM_START( monoplcld )
+	ROM_REGION( 0x300000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "7401.bin", 0x000000, 0x80000, CRC(eec11426) SHA1(b732a5a64d3fba676134942768b823d088792a1f) )
+	ROM_LOAD16_BYTE( "7403.bin", 0x000001, 0x80000, CRC(95dbacb6) SHA1(bd551ccad95440a669a547092ab126178b0d0bf9) )
+	ROM_LOAD16_BYTE( "6668.bin", 0x100000, 0x80000, CRC(30bf082a) SHA1(29ba67a86e82f0eb4feb816a2031d62028eb11b0) )
+	ROM_LOAD16_BYTE( "6669.bin", 0x100001, 0x80000, CRC(85d38c2d) SHA1(2f1a394df243e5fbbad31507b9074c997c473106) )
+	ROM_LOAD16_BYTE( "6670.bin", 0x200000, 0x80000, CRC(66e2a5e1) SHA1(04d4b55d6ad121cdc3592d33e9d953affa24f01a) )
+	ROM_LOAD16_BYTE( "6671.bin", 0x200001, 0x80000, CRC(b2a3cedd) SHA1(e3a5dd028b0769e08a796a96665b31491c3b18ca) )
 
 
 	ROM_REGION( 0x80000, "upd7759", 0 )
@@ -992,10 +1038,37 @@
 	ROM_LOAD16_BYTE( "6881.bin", 0x200000, 0x80000, CRC(8418ee17) SHA1(5666b90db00d9e88a37655bb9a714f076e2689d6) )
 	ROM_LOAD16_BYTE( "6882.bin", 0x200001, 0x80000, CRC(400f5fb4) SHA1(80b1d3902fc9f6db24f49055b07bc31c0c74a993) )
 
-	ROM_REGION( 0x300000, "altrevs", 0 )
-	ROM_LOAD16_BYTE( "8441.bin", 0x000001, 0x080000, CRC(d0825af4) SHA1(a7291806893c42a115763e404337976b8c30e9e0) ) // 1 byte change from 8440 (doesn't boot, but might want additional hw)
+	ROM_REGION( 0x80000, "upd7759", 0 )
+	ROM_LOAD( "modl-snd.bin", 0x000000, 0x80000, CRC(f761da41) SHA1(a07d1b4cb7ce7a24b6fb84843543b95c3aec470f) )
+ROM_END
 
 
+ROM_START( monopldxd )
+	ROM_REGION( 0x300000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "8439.bin", 0x000000, 0x80000, CRC(fbd6caa4) SHA1(73e787ae41a0ce44d48a46dd623d5e1351335e3e) )
+	ROM_LOAD16_BYTE( "8441.bin", 0x000001, 0x80000, CRC(d0825af4) SHA1(a7291806893c42a115763e404337976b8c30e9e0) ) // 1 byte change from 8440
+	ROM_LOAD16_BYTE( "6879.bin", 0x100000, 0x80000, CRC(4fbd1222) SHA1(9a9c9e4768c18a6a3e717605d3c88179676b6ad1) )
+	ROM_LOAD16_BYTE( "6880.bin", 0x100001, 0x80000, CRC(0370bf5f) SHA1(a0ed1dbc6aeab02e8229f23f8ba4ff880d31e7a1) )
+	ROM_LOAD16_BYTE( "6881.bin", 0x200000, 0x80000, CRC(8418ee17) SHA1(5666b90db00d9e88a37655bb9a714f076e2689d6) )
+	ROM_LOAD16_BYTE( "6882.bin", 0x200001, 0x80000, CRC(400f5fb4) SHA1(80b1d3902fc9f6db24f49055b07bc31c0c74a993) )
+
+	ROM_REGION( 0x80000, "upd7759", 0 )
+	ROM_LOAD( "modl-snd.bin", 0x000000, 0x80000, CRC(f761da41) SHA1(a07d1b4cb7ce7a24b6fb84843543b95c3aec470f) )
+ROM_END
+
+ROM_START( monopldx1 )
+	ROM_REGION( 0x300000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "mdlxv1p1", 0x000000, 0x80000, CRC(48ab1691) SHA1(6df2aad02548d5239e3974a11228bc9aad8c9170) )
+	ROM_LOAD16_BYTE( "mdlxv1p2", 0x000001, 0x80000, CRC(107c3e65) SHA1(e298b3a2826f92ba6119348a36bc4735e1799797) )
+	ROM_LOAD16_BYTE( "6879.bin", 0x100000, 0x80000, CRC(4fbd1222) SHA1(9a9c9e4768c18a6a3e717605d3c88179676b6ad1) )
+	ROM_LOAD16_BYTE( "6880.bin", 0x100001, 0x80000, CRC(0370bf5f) SHA1(a0ed1dbc6aeab02e8229f23f8ba4ff880d31e7a1) )
+	ROM_LOAD16_BYTE( "6881.bin", 0x200000, 0x80000, CRC(8418ee17) SHA1(5666b90db00d9e88a37655bb9a714f076e2689d6) )
+	ROM_LOAD16_BYTE( "6882.bin", 0x200001, 0x80000, CRC(400f5fb4) SHA1(80b1d3902fc9f6db24f49055b07bc31c0c74a993) )
+
+	ROM_REGION( 0x300000, "altrevs", 0 )
+	/* p3 missing? */
+	ROM_LOAD16_BYTE( "mdlxv1p4", 0x100001, 0x80000, CRC(e3fd1a27) SHA1(6bba70ff27a6d068febcbdfa1b1f8ff2ef86ef03) ) //Doesn't match set?
+
 	ROM_REGION( 0x80000, "upd7759", 0 )
 	ROM_LOAD( "modl-snd.bin", 0x000000, 0x80000, CRC(f761da41) SHA1(a07d1b4cb7ce7a24b6fb84843543b95c3aec470f) )
 ROM_END
@@ -1010,13 +1083,14 @@
 ROM_END
 
 
-
-
-
-
 /* Video based titles */
-GAME( 1994, monopoly,     0,          jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Monopoly (JPM) (SYSTEM5 VIDEO, set 1)",  0 )
-GAME( 1994, monopolya,    monopoly,   jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Monopoly (JPM) (SYSTEM5 VIDEO, set 2)",  0 )
-GAME( 1995, monoplcl,     monopoly,   jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Monopoly Classic (JPM) (SYSTEM5 VIDEO)", 0 )
-GAME( 1995, monopldx,     0,          jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Monopoly Deluxe (JPM) (SYSTEM5 VIDEO)",  0 )
-GAME( 199?, cashcade,     0,          jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Cashcade (JPM) (SYSTEM5 VIDEO)",         MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) // shows a loading error.. is the set incomplete?
+GAME( 1994, monopoly,     0,          jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Monopoly (JPM) (Version 4H) (SYSTEM5 VIDEO)",  0 )
+GAME( 1994, monopolyd,    monopoly,   jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Monopoly (JPM) (Version 4H, Protocol) (SYSTEM5 VIDEO)",  0 )
+GAME( 1994, monopoly4,    monopoly,   jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Monopoly (JPM) (Version 4) (SYSTEM5 VIDEO)",  0 )
+GAME( 1994, monopoly3,    monopoly,   jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Monopoly (JPM) (Version 3) (SYSTEM5 VIDEO)",   0 )
+GAME( 1995, monoplcl,     monopoly,   jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Monopoly Classic (JPM) (Version 5) (SYSTEM5 VIDEO)", 0 )
+GAME( 1995, monoplcld,    monopoly,   jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Monopoly Classic (JPM) (Version 5, Protocol) (SYSTEM5 VIDEO)", 0 )
+GAME( 1995, monopldx,     0,          jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Monopoly Deluxe (JPM) (Version 6) (SYSTEM5 VIDEO)",  0 )
+GAME( 1995, monopldxd,    monopldx,   jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Monopoly Deluxe (JPM) (Version 6, Protocol) (SYSTEM5 VIDEO)", 0 )
+GAME( 1995, monopldx1,    monopldx,   jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Monopoly Deluxe (JPM) (Version 1) (SYSTEM5 VIDEO)", MACHINE_NOT_WORKING ) // no questions?
+GAME( 199?, cashcade,     0,          jpmsys5v, monopoly, jpmsys5v_state, empty_init, ROT0, "JPM", "Cashcade (JPM) (SYSTEM5 VIDEO)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND ) // shows a loading error.. is the set incomplete?
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/junior.cpp mame-0.224+dfsg.1/src/mame/drivers/junior.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/junior.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/junior.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -226,5 +226,5 @@
 
 /* Driver */
 
-/*    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT        COMPANY                FULLNAME           FLAGS */
-COMP( 1980, junior, 0,      0,      junior,  junior, junior_state, empty_init, "Elektor Electronics", "Junior Computer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+/*    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT        COMPANY    FULLNAME           FLAGS */
+COMP( 1980, junior, 0,      0,      junior,  junior, junior_state, empty_init, "Elektor", "Junior Computer", MACHINE_SUPPORTS_SAVE | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/k1003.cpp mame-0.224+dfsg.1/src/mame/drivers/k1003.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/k1003.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/k1003.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,45 +1,31 @@
 // license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic
-/***************************************************************************
+/*******************************************************************************************************
 
-        Robotron K1003
+Robotron K1003
 
-        20/11/2009 Skeleton driver.
+2009-11-20 Skeleton driver.
 
+The last of the K-1000 series of electronic programmable desktop calculators.
 
-'maincpu' (004B): unmapped i/o memory write to 0B = 00 & FF
-'maincpu' (0322): unmapped i/o memory write to 0A = FF & FF
-'maincpu' (0323): unmapped i/o memory write to 13 = FF & FF
-'maincpu' (0325): unmapped i/o memory write to 11 = 00 & FF
-'maincpu' (0322): unmapped i/o memory write to 0A = FF & FF
-'maincpu' (0323): unmapped i/o memory write to 13 = FF & FF
-'maincpu' (0325): unmapped i/o memory write to 11 = 00 & FF
-'maincpu' (0322): unmapped i/o memory write to 0A = FF & FF
-'maincpu' (0323): unmapped i/o memory write to 13 = FF & FF
-'maincpu' (0325): unmapped i/o memory write to 11 = 00 & FF
-'maincpu' (0322): unmapped i/o memory write to 0A = FF & FF
-'maincpu' (0323): unmapped i/o memory write to 13 = FF & FF
-'maincpu' (0325): unmapped i/o memory write to 11 = 00 & FF
-'maincpu' (0322): unmapped i/o memory write to 0A = FF & FF
-'maincpu' (0323): unmapped i/o memory write to 13 = FF & FF
-'maincpu' (0325): unmapped i/o memory write to 11 = 00 & FF
-'maincpu' (0322): unmapped i/o memory write to 0A = FF & FF
-'maincpu' (0323): unmapped i/o memory write to 13 = FF & FF
-'maincpu' (0325): unmapped i/o memory write to 11 = 00 & FF
-'maincpu' (0322): unmapped i/o memory write to 0A = FF & FF
-'maincpu' (0323): unmapped i/o memory write to 13 = FF & FF
-'maincpu' (0325): unmapped i/o memory write to 11 = 00 & FF
-'maincpu' (02F2): unmapped i/o memory write to 0A = 00 & FF
-'maincpu' (02F2): unmapped i/o memory write to 0A = 00 & FF
-'maincpu' (02F2): unmapped i/o memory write to 0A = 0C & FF
-'maincpu' (02F2): unmapped i/o memory write to 0A = 0C & FF
-'maincpu' (02F2): unmapped i/o memory write to 0A = 0C & FF
+K-1001 : Enter via keyboard, results are on the LED display, much like any other advanced calculator
+         or adding machine.
 
-The writes to ports 0A, 11 & 13 are continuous.
+K-1002 : Has an additional magnetic stripe reader/writer. You can save your programs to the flexible
+         card and insert it in another session. Each card holds about 200 bytes. Further, the unit has
+         a cartridge slot where preset mathematical packages could be inserted (such as Statistics module).
 
-- Need a keyboard
+K-1003 : All of the above, plus a thermal printer. Maximum ram is 4k.
 
-****************************************************************************/
+
+TODO:
+- Need schematic, unable to locate one
+- keyboard to be worked out
+- Cartslots
+- Printer
+- Magnetic cards
+
+******************************************************************************************************/
 
 #include "emu.h"
 #include "cpu/i8008/i8008.h"
@@ -52,6 +38,7 @@
 	k1003_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
+		, m_io_keyboard(*this, "X%u", 0U)
 		, m_digits(*this, "digit%u", 0U)
 		{ }
 
@@ -62,22 +49,23 @@
 	uint8_t key_r();
 	void disp_1_w(uint8_t data);
 	void disp_2_w(uint8_t data);
-	void disp_w(uint8_t data);
+	void seg_w(uint8_t data);
 
-	void k1003_io(address_map &map);
-	void k1003_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 
 	uint8_t m_disp_1;
 	uint8_t m_disp_2;
+	u8 m_digit;
 	uint8_t bit_to_dec(uint8_t val);
-	virtual void machine_reset() override;
-	virtual void machine_start() override { m_digits.resolve(); }
+	void machine_start() override;
 	required_device<cpu_device> m_maincpu;
+	required_ioport_array<8> m_io_keyboard;
 	output_finder<16> m_digits;
 };
 
 
-void k1003_state::k1003_mem(address_map &map)
+void k1003_state::mem_map(address_map &map)
 {
 	map(0x0000, 0x07ff).rom();
 	map(0x0800, 0x17ff).ram();
@@ -87,14 +75,20 @@
 	map(0x3000, 0x3aff).rom();
 }
 
+// if non-zero, jump to cart?
 uint8_t k1003_state::port2_r()
 {
 	return 0x00;
 }
 
 uint8_t k1003_state::key_r()
-{
-	return 0x00;
+{//printf("%X ",m_digit);
+	u8 data = 0;
+	for (u8 i = 0; i < 8; i++)
+		if (BIT(m_digit, i))
+			data |= m_io_keyboard[i]->read();
+
+	return data;
 }
 
 
@@ -108,7 +102,7 @@
 	m_disp_2 = data;
 }
 
-uint8_t k1003_state::bit_to_dec(uint8_t val)
+uint8_t k1003_state::bit_to_dec(uint8_t val) // not used atm
 {
 	if (BIT(val,0)) return 0;
 	if (BIT(val,1)) return 1;
@@ -121,38 +115,128 @@
 	return 0;
 }
 
-void k1003_state::disp_w(uint8_t data)
+void k1003_state::seg_w(uint8_t data)
 {
-	m_digits[bit_to_dec(data)*2] = m_disp_1;
-	m_digits[bit_to_dec(data)*2+1] = m_disp_2;
+	data = bitswap<8>(data, 0,1,2,3,4,5,6,7);
+
+	for (u8 i = 0; i < 8; i++)
+	{
+		m_digits[i] = (m_digits[i] & ~data) | (BIT(m_disp_1, i) ? data : 0);
+		m_digits[i+8] = (m_digits[i+8] & ~data) | (BIT(m_disp_2, i) ? data : 0);
+	}
 }
 
-void k1003_state::k1003_io(address_map &map)
+void k1003_state::io_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x00, 0x00).r(FUNC(k1003_state::key_r));
 	map(0x02, 0x02).r(FUNC(k1003_state::port2_r));
 
-	map(0x08, 0x08).w(FUNC(k1003_state::disp_w));
+	map(0x08, 0x08).w(FUNC(k1003_state::seg_w));
 	map(0x09, 0x09).w(FUNC(k1003_state::disp_2_w));
-	map(0x10, 0x10).w(FUNC(k1003_state::disp_1_w));
+	map(0x0a, 0x0a).w(FUNC(k1003_state::disp_1_w));
+	map(0x10, 0x10).lw8(NAME([this] (u8 data) { m_digit = ~data; }));
+	map(0x11, 0x13).nopw();   // stop error.log rapidly filling up.
 }
 
 /* Input ports */
 static INPUT_PORTS_START( k1003 )
+	PORT_START("X0")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("1") PORT_CODE(KEYCODE_1)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("2") PORT_CODE(KEYCODE_2)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("3") PORT_CODE(KEYCODE_3)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("5") PORT_CODE(KEYCODE_5)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("6") PORT_CODE(KEYCODE_6)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("7") PORT_CODE(KEYCODE_7)
+
+	PORT_START("X1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("8") PORT_CODE(KEYCODE_8)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("9") PORT_CODE(KEYCODE_9)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(":") PORT_CODE(KEYCODE_QUOTE)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(";") PORT_CODE(KEYCODE_COLON)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(",") PORT_CODE(KEYCODE_COMMA)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("-") PORT_CODE(KEYCODE_MINUS)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(".") PORT_CODE(KEYCODE_STOP)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("/") PORT_CODE(KEYCODE_SLASH)
+
+	PORT_START("X2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("@") PORT_CODE(KEYCODE_END)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G)
+
+	PORT_START("X3")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O)
+
+	PORT_START("X4")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W)
+
+	PORT_START("X5")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("[") PORT_CODE(KEYCODE_OPENBRACE)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("\\") PORT_CODE(KEYCODE_BACKSLASH)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("]")  PORT_CODE(KEYCODE_CLOSEBRACE)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("~")  PORT_CODE(KEYCODE_TILDE)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("DEL")PORT_CODE(KEYCODE_BACKSPACE)
+
+	PORT_START("X6")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Space") PORT_CODE(KEYCODE_SPACE)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("LF") PORT_CODE(KEYCODE_RALT)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Tab") PORT_CODE(KEYCODE_TAB)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER)
+
+	PORT_START("X7")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0_PAD)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1_PAD)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2_PAD)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3_PAD)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4_PAD)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5_PAD)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6_PAD)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7_PAD)
 INPUT_PORTS_END
 
 
-void k1003_state::machine_reset()
+void k1003_state::machine_start()
 {
+	m_digits.resolve();
+	save_item(NAME(m_disp_1));
+	save_item(NAME(m_disp_2));
+	save_item(NAME(m_digit));
 }
 
 void k1003_state::k1003(machine_config &config)
 {
 	/* basic machine hardware */
 	I8008(config, m_maincpu, 800000);
-	m_maincpu->set_addrmap(AS_PROGRAM, &k1003_state::k1003_mem);
-	m_maincpu->set_addrmap(AS_IO, &k1003_state::k1003_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &k1003_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &k1003_state::io_map);
 
 	/* video hardware */
 	config.set_default_layout(layout_k1003);
@@ -161,7 +245,7 @@
 
 /* ROM definition */
 ROM_START( k1003 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
 	ROM_LOAD( "k1003.01", 0x0000, 0x0100, CRC(9342f67d) SHA1(75d33cad89cf47e8e691a6ddbb86a8c11f454434))
 	ROM_LOAD( "k1003.02", 0x0100, 0x0100, CRC(a6846b2b) SHA1(a38b15ae0ac3f216e49aef4618363ea0d262fe52))
 	ROM_LOAD( "k1003.03", 0x0200, 0x0100, CRC(3fddd922) SHA1(9c9f28ad8a611d8a0911d2935ffa262976a0272d))
@@ -181,14 +265,14 @@
 	ROM_LOAD( "k1003.16", 0x1f00, 0x0100, CRC(9457f1bd) SHA1(aae0a7c0a63d8213a57850383aaf92927577be7a))
 
 	// Math pack
-	ROM_LOAD( "026.bin", 0x2000, 0x0100, CRC(d678e80c) SHA1(bdf696e9704c286ed0ad5ffbdae206580a277c38))
-	ROM_LOAD( "027.bin", 0x2100, 0x0100, CRC(dbe2ca8e) SHA1(2060bbb6b6dee87c98ddcf84a49069547749ae9b))
-	ROM_LOAD( "028.bin", 0x2200, 0x0100, CRC(2cd742ed) SHA1(ec3f1ba548c64b0fe538af365a383f2341c81988))
-	ROM_LOAD( "029.bin", 0x2300, 0x0100, CRC(12165b43) SHA1(7bb2c97893a07196cf245c8ac3a64c0ee49bb75e))
-	ROM_LOAD( "030.bin", 0x2400, 0x0100, CRC(545dd7e0) SHA1(ab9f2e8cd4d3d4ba8accf74caec20de2e3094a66))
-	ROM_LOAD( "031.bin", 0x2500, 0x0100, CRC(315d27d2) SHA1(26bb39d50781eed8d8be4ad6e1f13bc2b4672ce2))
-	ROM_LOAD( "032.bin", 0x2600, 0x0100, CRC(d03f7cc7) SHA1(5a1c0614eed6dfe21d0d1776f409c1c2209a74d1))
-	ROM_LOAD( "033.bin", 0x2700, 0x0100, CRC(efaeb541) SHA1(decdbbd3c4084dc18b34577f78ddf7044341764a))
+	ROM_LOAD( "026.bin",  0x2000, 0x0100, CRC(d678e80c) SHA1(bdf696e9704c286ed0ad5ffbdae206580a277c38))
+	ROM_LOAD( "027.bin",  0x2100, 0x0100, CRC(dbe2ca8e) SHA1(2060bbb6b6dee87c98ddcf84a49069547749ae9b))
+	ROM_LOAD( "028.bin",  0x2200, 0x0100, CRC(2cd742ed) SHA1(ec3f1ba548c64b0fe538af365a383f2341c81988))
+	ROM_LOAD( "029.bin",  0x2300, 0x0100, CRC(12165b43) SHA1(7bb2c97893a07196cf245c8ac3a64c0ee49bb75e))
+	ROM_LOAD( "030.bin",  0x2400, 0x0100, CRC(545dd7e0) SHA1(ab9f2e8cd4d3d4ba8accf74caec20de2e3094a66))
+	ROM_LOAD( "031.bin",  0x2500, 0x0100, CRC(315d27d2) SHA1(26bb39d50781eed8d8be4ad6e1f13bc2b4672ce2))
+	ROM_LOAD( "032.bin",  0x2600, 0x0100, CRC(d03f7cc7) SHA1(5a1c0614eed6dfe21d0d1776f409c1c2209a74d1))
+	ROM_LOAD( "033.bin",  0x2700, 0x0100, CRC(efaeb541) SHA1(decdbbd3c4084dc18b34577f78ddf7044341764a))
 
 	ROM_LOAD( "k1003.17", 0x3000, 0x0100, CRC(9031390b) SHA1(6f99a9f643b19770a373242edb0df8f342bbc230))
 	ROM_LOAD( "k1003.18", 0x3100, 0x0100, CRC(38435ffe) SHA1(7db78d304fe8a8f71c067babcdcf3c06da908ad3))
@@ -206,22 +290,22 @@
 	ROM_REGION( 0x1000, "user1", 0 )
 	// k1003-extension
 	ROM_LOAD( "040.bin",  0x0000, 0x0100, CRC(06865678) SHA1(91a4f0a32e93d315d4f78a732472c08a380205fc) )
-	ROM_LOAD( "041.bin",  0x0000, 0x0100, CRC(dcd776b3) SHA1(cf8082d31be9bea1e9672d0b92006f14719ba7a6) )
-	ROM_LOAD( "042.bin",  0x0000, 0x0100, CRC(e74aca0d) SHA1(f515b52862f0f31551ec008bf6f27c5fdf78c32a) )
-	ROM_LOAD( "043.bin",  0x0000, 0x0100, CRC(770820e5) SHA1(c34b6a7bde43758c7c3c7041ce1dee06456fe5c4) )
-	ROM_LOAD( "044.bin",  0x0000, 0x0100, CRC(82bd3f5a) SHA1(c4290507de8d295c0b7f04ac2179365b8f73d7c7) )
-	ROM_LOAD( "045.bin",  0x0000, 0x0100, CRC(66c85afb) SHA1(937828a6aee46cbcad86bb1776deb7f9b1dc69ff) )
+	ROM_LOAD( "041.bin",  0x0100, 0x0100, CRC(dcd776b3) SHA1(cf8082d31be9bea1e9672d0b92006f14719ba7a6) )
+	ROM_LOAD( "042.bin",  0x0200, 0x0100, CRC(e74aca0d) SHA1(f515b52862f0f31551ec008bf6f27c5fdf78c32a) )
+	ROM_LOAD( "043.bin",  0x0300, 0x0100, CRC(770820e5) SHA1(c34b6a7bde43758c7c3c7041ce1dee06456fe5c4) )
+	ROM_LOAD( "044.bin",  0x0400, 0x0100, CRC(82bd3f5a) SHA1(c4290507de8d295c0b7f04ac2179365b8f73d7c7) )
+	ROM_LOAD( "045.bin",  0x0500, 0x0100, CRC(66c85afb) SHA1(937828a6aee46cbcad86bb1776deb7f9b1dc69ff) )
 	// k1003-statistics
-	ROM_LOAD( "435.bin",  0x0000, 0x0100, CRC(31203b34) SHA1(5638c45e23b279c5c8960d5d7f2b16acb2e47ed2) )
-	ROM_LOAD( "436.bin",  0x0000, 0x0100, CRC(dd2d4eb5) SHA1(c436419ef71cdf4dfc4d118301749f746f9cd6e5) )
-	ROM_LOAD( "437.bin",  0x0000, 0x0100, CRC(00433159) SHA1(69fab3b875c285e6abcab43b0ba6ef916d0a1484) )
-	ROM_LOAD( "439.bin",  0x0000, 0x0100, CRC(3f5be050) SHA1(f2730078a8346e8670b632048f358a47ff57941e) )
-	ROM_LOAD( "440.bin",  0x0000, 0x0100, CRC(856685fa) SHA1(dbd33194a4eb9ed037f8129bf8b9d4628aab8151) )
-	ROM_LOAD( "441.bin",  0x0000, 0x0100, CRC(257df6a3) SHA1(65c0429b0e352434b7b661e63cacfe74ac1d1ac9) )
-	ROM_LOAD( "442.bin",  0x0000, 0x0100, CRC(d037e0bb) SHA1(5ae8ad62673bd732a05232645c523206024f9afb) )
+	ROM_LOAD( "435.bin",  0x0800, 0x0100, CRC(31203b34) SHA1(5638c45e23b279c5c8960d5d7f2b16acb2e47ed2) )
+	ROM_LOAD( "436.bin",  0x0900, 0x0100, CRC(dd2d4eb5) SHA1(c436419ef71cdf4dfc4d118301749f746f9cd6e5) )
+	ROM_LOAD( "437.bin",  0x0a00, 0x0100, CRC(00433159) SHA1(69fab3b875c285e6abcab43b0ba6ef916d0a1484) )
+	ROM_LOAD( "439.bin",  0x0b00, 0x0100, CRC(3f5be050) SHA1(f2730078a8346e8670b632048f358a47ff57941e) )
+	ROM_LOAD( "440.bin",  0x0c00, 0x0100, CRC(856685fa) SHA1(dbd33194a4eb9ed037f8129bf8b9d4628aab8151) )
+	ROM_LOAD( "441.bin",  0x0d00, 0x0100, CRC(257df6a3) SHA1(65c0429b0e352434b7b661e63cacfe74ac1d1ac9) )
+	ROM_LOAD( "442.bin",  0x0e00, 0x0100, CRC(d037e0bb) SHA1(5ae8ad62673bd732a05232645c523206024f9afb) )
 ROM_END
 
 /* Driver */
 
 //    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY     FULLNAME  FLAGS
-COMP( 1978, k1003, 0,      0,      k1003,   k1003, k1003_state, empty_init, "Robotron", "K1003",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1978, k1003, 0,      0,      k1003,   k1003, k1003_state, empty_init, "Robotron", "K1003",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/k28.cpp mame-0.224+dfsg.1/src/mame/drivers/k28.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/k28.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/k28.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -280,8 +280,8 @@
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('A')
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('K')
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('U')
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME(UTF8_DIVIDE)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ASTERISK) PORT_NAME(UTF8_MULTIPLY)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME(u8"÷")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ASTERISK) PORT_NAME(u8"×")
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS_PAD) PORT_NAME("-")
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PLUS_PAD) PORT_NAME("+")
 INPUT_PORTS_END
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/k8915.cpp mame-0.224+dfsg.1/src/mame/drivers/k8915.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/k8915.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/k8915.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -26,6 +26,7 @@
 		, m_maincpu(*this, "maincpu")
 		, m_rom(*this, "maincpu")
 		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
 		, m_p_videoram(*this, "videoram")
 		, m_p_chargen(*this, "chargen")
 	{ }
@@ -40,12 +41,12 @@
 	void mem_map(address_map &map);
 
 	u8 m_framecnt;
-	bool m_rom_in_map;
 	void machine_start() override;
 	void machine_reset() override;
 	required_device<cpu_device> m_maincpu;
 	required_region_ptr<u8> m_rom;
 	required_shared_ptr<u8> m_ram;
+	required_memory_bank    m_bank1;
 	required_shared_ptr<u8> m_p_videoram;
 	required_region_ptr<u8> m_p_chargen;
 };
@@ -54,13 +55,13 @@
 void k8915_state::k8915_a8_w(u8 data)
 {
 // seems to switch ram and rom around.
-	m_rom_in_map = (data == 0x87) ? 0 : 1;
+	m_bank1->set_entry((data == 0x87) ? 0 : 1);
 }
 
 void k8915_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0x0fff).ram().share("mainram").lr8(NAME([this] (offs_t offset) { if(m_rom_in_map) return m_rom[offset]; else return m_ram[offset]; }));
+	map(0x0000, 0x0fff).ram().share("mainram").bankr("bank1");
 	map(0x1000, 0x17ff).ram().share("videoram");
 	map(0x1800, 0xffff).ram();
 }
@@ -79,13 +80,14 @@
 
 void k8915_state::machine_reset()
 {
-	m_rom_in_map = 1;
+	m_bank1->set_entry(1);
 }
 
 void k8915_state::machine_start()
 {
+	m_bank1->configure_entry(0, m_ram);
+	m_bank1->configure_entry(1, m_rom);
 	save_item(NAME(m_framecnt));
-	save_item(NAME(m_rom_in_map));
 }
 
 u32 k8915_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/karnov.cpp mame-0.224+dfsg.1/src/mame/drivers/karnov.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/karnov.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/karnov.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -766,10 +766,10 @@
 void karnov_state::karnov(machine_config &config)
 {
 	/* basic machine hardware */
-	M68000(config, m_maincpu, 10000000);    /* 10 MHz */
+	M68000(config, m_maincpu, 20_MHz_XTAL/2);    /* 10 MHz */
 	m_maincpu->set_addrmap(AS_PROGRAM, &karnov_state::karnov_map);
 
-	M6502(config, m_audiocpu, 1500000);     /* Accurate */
+	M6502(config, m_audiocpu, 12_MHz_XTAL/8);     /* Accurate */
 	m_audiocpu->set_addrmap(AS_PROGRAM, &karnov_state::karnov_sound_map);
 
 	/* video hardware */
@@ -799,10 +799,10 @@
 	GENERIC_LATCH_8(config, m_soundlatch);
 	m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI);
 
-	ym2203_device &ym1(YM2203(config, "ym1", 1500000));
+	ym2203_device &ym1(YM2203(config, "ym1", 12_MHz_XTAL/8)); // 1.5 MHz
 	ym1.add_route(ALL_OUTPUTS, "mono", 0.25);
 
-	ym3526_device &ym2(YM3526(config, "ym2", 3000000));
+	ym3526_device &ym2(YM3526(config, "ym2", 12_MHz_XTAL/4)); // 3 MHz
 	ym2.irq_handler().set_inputline(m_audiocpu, M6502_IRQ_LINE);
 	ym2.add_route(ALL_OUTPUTS, "mono", 1.0);
 }
@@ -826,7 +826,7 @@
 	karnov(config);
 	m_maincpu->set_addrmap(AS_PROGRAM, &karnov_state::chelnov_map);
 
-	I8751(config, m_mcu, 8_MHz_XTAL); // unknown clock
+	I8751(config, m_mcu, 8_MHz_XTAL); // 8.000 MHz OSC next to MCU
 	m_mcu->port_in_cb<0>().set([this](){ return m_mcu_p0; });
 	m_mcu->port_out_cb<0>().set([this](u8 data){ m_mcu_p0 = data; });
 	m_mcu->port_in_cb<1>().set([this](){ return m_mcu_p1; });
@@ -844,7 +844,7 @@
 	karnov(config);
 	m_maincpu->set_addrmap(AS_PROGRAM, &karnov_state::chelnov_map);
 
-	I8031(config, m_mcu, 8_MHz_XTAL); // unknown clock
+	I8031(config, m_mcu, 8_MHz_XTAL); // info below states 8MHz for MCU
 	m_mcu->set_addrmap(AS_PROGRAM, &karnov_state::chelnovjbl_mcu_map);
 	m_mcu->set_addrmap(AS_IO, &karnov_state::chelnovjbl_mcu_io_map);
 	m_mcu->port_out_cb<1>().set(FUNC(karnov_state::mcubl_p1_w));
@@ -856,10 +856,10 @@
 void karnov_state::wndrplnt(machine_config &config)
 {
 	/* basic machine hardware */
-	M68000(config, m_maincpu, 10000000);   /* 10 MHz */
+	M68000(config, m_maincpu, 20_MHz_XTAL/2);   /* 10 MHz */
 	m_maincpu->set_addrmap(AS_PROGRAM, &karnov_state::karnov_map);
 
-	M6502(config, m_audiocpu, 1500000);    /* Accurate */
+	M6502(config, m_audiocpu, 12_MHz_XTAL/8);    /* Accurate */
 	m_audiocpu->set_addrmap(AS_PROGRAM, &karnov_state::karnov_sound_map);
 
 	/* video hardware */
@@ -889,10 +889,10 @@
 	GENERIC_LATCH_8(config, m_soundlatch);
 	m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, INPUT_LINE_NMI);
 
-	ym2203_device &ym1(YM2203(config, "ym1", 1500000));
+	ym2203_device &ym1(YM2203(config, "ym1", 12_MHz_XTAL/8)); // 1.5 MHz
 	ym1.add_route(ALL_OUTPUTS, "mono", 0.25);
 
-	ym3526_device &ym2(YM3526(config, "ym2", 3000000));
+	ym3526_device &ym2(YM3526(config, "ym2", 12_MHz_XTAL/4)); // 3 MHz
 	ym2.irq_handler().set_inputline(m_audiocpu, M6502_IRQ_LINE);
 	ym2.add_route(ALL_OUTPUTS, "mono", 1.0);
 }
@@ -904,7 +904,7 @@
  *
  *************************************/
 
-ROM_START( karnov )
+ROM_START( karnov ) /* DE-0248-3 main board, DE-259-0 sub/rom board */
 	ROM_REGION( 0x60000, "maincpu", 0 ) /* 6*64k for 68000 code */
 	ROM_LOAD16_BYTE( "dn08-6.j15", 0x00000, 0x10000, CRC(4c60837f) SHA1(6886e6ee1d1563c3011b8fea79e7435f983a3ee0) )
 	ROM_LOAD16_BYTE( "dn11-6.j20", 0x00001, 0x10000, CRC(cd4abb99) SHA1(b4482175f5d90941ad3aec6c2269a50f57a465ed) )
@@ -930,20 +930,20 @@
 
 	ROM_REGION( 0x60000, "gfx3", 0 )
 	ROM_LOAD( "dn12-.f8",   0x00000, 0x10000, CRC(9806772c) SHA1(01f17fa033262a3e64e0675cc4e20b3c3f4b254d) )  /* Sprites - 2 sets of 4, interleaved here */
-	ROM_LOAD( "dn14-5.f9",  0x10000, 0x08000, CRC(ac9e6732) SHA1(6f61344eb8a13349471145dee252a01aadb8cdf0) )
-	ROM_LOAD( "dn13-.f13",  0x18000, 0x10000, CRC(a03308f9) SHA1(1d450725a5c488332c83d8f64a73a750ce7fe4c7) )
-	ROM_LOAD( "dn15-5.f15", 0x28000, 0x08000, CRC(8933fcb8) SHA1(0dbda4b032ed3776d7633264f39e6f00ace7a238) )
-	ROM_LOAD( "dn16-",      0x30000, 0x10000, CRC(55e63a11) SHA1(3ef0468fa02ac5382007428122216917ad5eaa0e) )
-	ROM_LOAD( "dn17-5",     0x40000, 0x08000, CRC(b70ae950) SHA1(1ec833bdad12710ea846ef48dddbe2e1ae6b8ce1) )
-	ROM_LOAD( "dn18-",      0x48000, 0x10000, CRC(2ad53213) SHA1(f22696920bf3d74fb0e28e2d7cb31be5e183c6b4) )
-	ROM_LOAD( "dn19-5",     0x58000, 0x08000, CRC(8fd4fa40) SHA1(1870fb0c5c64fbc53a10115f0f3c7624cf2465db) )
+	ROM_LOAD( "dn14-5.f11", 0x10000, 0x08000, CRC(ac9e6732) SHA1(6f61344eb8a13349471145dee252a01aadb8cdf0) )
+	ROM_LOAD( "dn13-.f9",   0x18000, 0x10000, CRC(a03308f9) SHA1(1d450725a5c488332c83d8f64a73a750ce7fe4c7) )
+	ROM_LOAD( "dn15-5.f12", 0x28000, 0x08000, CRC(8933fcb8) SHA1(0dbda4b032ed3776d7633264f39e6f00ace7a238) )
+	ROM_LOAD( "dn16-.f13",  0x30000, 0x10000, CRC(55e63a11) SHA1(3ef0468fa02ac5382007428122216917ad5eaa0e) )
+	ROM_LOAD( "dn17-5.f15", 0x40000, 0x08000, CRC(b70ae950) SHA1(1ec833bdad12710ea846ef48dddbe2e1ae6b8ce1) )
+	ROM_LOAD( "dn18-.f16",  0x48000, 0x10000, CRC(2ad53213) SHA1(f22696920bf3d74fb0e28e2d7cb31be5e183c6b4) )
+	ROM_LOAD( "dn19-5.f18", 0x58000, 0x08000, CRC(8fd4fa40) SHA1(1870fb0c5c64fbc53a10115f0f3c7624cf2465db) )
 
 	ROM_REGION( 0x0800, "proms", 0 )
 	ROM_LOAD( "dn-21.k8", 0x0000, 0x0400, CRC(aab0bb93) SHA1(545707fbb1007fca1fe297c5fce61e485e7084fc) ) /* MB7132E BPROM */
 	ROM_LOAD( "dn-20.l6", 0x0400, 0x0400, CRC(02f78ffb) SHA1(cb4dd8b0ce3c404195321b17e10f51352f506958) ) /* MB7122E BPROM */
 ROM_END
 
-ROM_START( karnova )
+ROM_START( karnova ) /* DE-0248-3 main board, DE-259-0 sub/rom board */
 	ROM_REGION( 0x60000, "maincpu", 0 ) /* 6*64k for 68000 code */
 	ROM_LOAD16_BYTE( "dn08-5.j15", 0x00000, 0x10000, CRC(db92c264) SHA1(bd4bcd984a3455eedd2b78dc2090c9d625025671) ) /* also known to be labeled DN08-5E */
 	ROM_LOAD16_BYTE( "dn11-5.j20", 0x00001, 0x10000, CRC(05669b4b) SHA1(c78d0da5afc66750dd9841a7d4f8f244d878c081) ) /* also known to be labeled DN11-5E */
@@ -969,20 +969,20 @@
 
 	ROM_REGION( 0x60000, "gfx3", 0 )
 	ROM_LOAD( "dn12-.f8",   0x00000, 0x10000, CRC(9806772c) SHA1(01f17fa033262a3e64e0675cc4e20b3c3f4b254d) )  /* Sprites - 2 sets of 4, interleaved here */
-	ROM_LOAD( "dn14-5.f9",  0x10000, 0x08000, CRC(ac9e6732) SHA1(6f61344eb8a13349471145dee252a01aadb8cdf0) )
-	ROM_LOAD( "dn13-.f13",  0x18000, 0x10000, CRC(a03308f9) SHA1(1d450725a5c488332c83d8f64a73a750ce7fe4c7) )
-	ROM_LOAD( "dn15-5.f15", 0x28000, 0x08000, CRC(8933fcb8) SHA1(0dbda4b032ed3776d7633264f39e6f00ace7a238) )
-	ROM_LOAD( "dn16-",      0x30000, 0x10000, CRC(55e63a11) SHA1(3ef0468fa02ac5382007428122216917ad5eaa0e) )
-	ROM_LOAD( "dn17-5",     0x40000, 0x08000, CRC(b70ae950) SHA1(1ec833bdad12710ea846ef48dddbe2e1ae6b8ce1) )
-	ROM_LOAD( "dn18-",      0x48000, 0x10000, CRC(2ad53213) SHA1(f22696920bf3d74fb0e28e2d7cb31be5e183c6b4) )
-	ROM_LOAD( "dn19-5",     0x58000, 0x08000, CRC(8fd4fa40) SHA1(1870fb0c5c64fbc53a10115f0f3c7624cf2465db) )
+	ROM_LOAD( "dn14-5.f11", 0x10000, 0x08000, CRC(ac9e6732) SHA1(6f61344eb8a13349471145dee252a01aadb8cdf0) )
+	ROM_LOAD( "dn13-.f9",   0x18000, 0x10000, CRC(a03308f9) SHA1(1d450725a5c488332c83d8f64a73a750ce7fe4c7) )
+	ROM_LOAD( "dn15-5.f12", 0x28000, 0x08000, CRC(8933fcb8) SHA1(0dbda4b032ed3776d7633264f39e6f00ace7a238) )
+	ROM_LOAD( "dn16-.f13",  0x30000, 0x10000, CRC(55e63a11) SHA1(3ef0468fa02ac5382007428122216917ad5eaa0e) )
+	ROM_LOAD( "dn17-5.f15", 0x40000, 0x08000, CRC(b70ae950) SHA1(1ec833bdad12710ea846ef48dddbe2e1ae6b8ce1) )
+	ROM_LOAD( "dn18-.f16",  0x48000, 0x10000, CRC(2ad53213) SHA1(f22696920bf3d74fb0e28e2d7cb31be5e183c6b4) )
+	ROM_LOAD( "dn19-5.f18", 0x58000, 0x08000, CRC(8fd4fa40) SHA1(1870fb0c5c64fbc53a10115f0f3c7624cf2465db) )
 
 	ROM_REGION( 0x0800, "proms", 0 )
 	ROM_LOAD( "dn-21.k8", 0x0000, 0x0400, CRC(aab0bb93) SHA1(545707fbb1007fca1fe297c5fce61e485e7084fc) ) /* MB7132E BPROM */
 	ROM_LOAD( "dn-20.l6", 0x0400, 0x0400, CRC(02f78ffb) SHA1(cb4dd8b0ce3c404195321b17e10f51352f506958) ) /* MB7122E BPROM */
 ROM_END
 
-ROM_START( karnovj )
+ROM_START( karnovj ) /* DE-0248-3 main board, DE-259-0 sub/rom board */
 	ROM_REGION( 0x60000, "maincpu", 0 ) /* 6*64k for 68000 code */
 	ROM_LOAD16_BYTE( "kar8.j15",  0x00000, 0x10000, CRC(3e17e268) SHA1(3a63928bb0148175519540f9d891b03590094dfb) )
 	ROM_LOAD16_BYTE( "kar11.j20", 0x00001, 0x10000, CRC(417c936d) SHA1(d31f9291f18c3d5e3c4430768396e1ac10fd9ea3) )
@@ -1008,13 +1008,13 @@
 
 	ROM_REGION( 0x60000, "gfx3", 0 )
 	ROM_LOAD( "dn12-.f8",  0x00000, 0x10000, CRC(9806772c) SHA1(01f17fa033262a3e64e0675cc4e20b3c3f4b254d) )  /* Sprites - 2 sets of 4, interleaved here */
-	ROM_LOAD( "kar14.f9",  0x10000, 0x08000, CRC(c6b39595) SHA1(3bc2d0a613cc1b5d255cccc3b26e21ea1c23e75b) )
-	ROM_LOAD( "dn13-.f13", 0x18000, 0x10000, CRC(a03308f9) SHA1(1d450725a5c488332c83d8f64a73a750ce7fe4c7) )
-	ROM_LOAD( "kar15.f15", 0x28000, 0x08000, CRC(2f72cac0) SHA1(a71e61eea77ecd3240c5217ae84e7aa3ef21288a) )
-	ROM_LOAD( "dn16-",     0x30000, 0x10000, CRC(55e63a11) SHA1(3ef0468fa02ac5382007428122216917ad5eaa0e) )
-	ROM_LOAD( "kar17",     0x40000, 0x08000, CRC(7851c70f) SHA1(47b7a64dd8230e95cd7ae7f661c7586c7598c356) )
-	ROM_LOAD( "dn18-",     0x48000, 0x10000, CRC(2ad53213) SHA1(f22696920bf3d74fb0e28e2d7cb31be5e183c6b4) )
-	ROM_LOAD( "kar19",     0x58000, 0x08000, CRC(7bc174bb) SHA1(d8bc320169fc3a9cdd3f271ea523fb0486abae2c) )
+	ROM_LOAD( "kar14.f11", 0x10000, 0x08000, CRC(c6b39595) SHA1(3bc2d0a613cc1b5d255cccc3b26e21ea1c23e75b) )
+	ROM_LOAD( "dn13-.f9",  0x18000, 0x10000, CRC(a03308f9) SHA1(1d450725a5c488332c83d8f64a73a750ce7fe4c7) )
+	ROM_LOAD( "kar15.f12", 0x28000, 0x08000, CRC(2f72cac0) SHA1(a71e61eea77ecd3240c5217ae84e7aa3ef21288a) )
+	ROM_LOAD( "dn16-.f13", 0x30000, 0x10000, CRC(55e63a11) SHA1(3ef0468fa02ac5382007428122216917ad5eaa0e) )
+	ROM_LOAD( "kar17.f15", 0x40000, 0x08000, CRC(7851c70f) SHA1(47b7a64dd8230e95cd7ae7f661c7586c7598c356) )
+	ROM_LOAD( "dn18-.f16", 0x48000, 0x10000, CRC(2ad53213) SHA1(f22696920bf3d74fb0e28e2d7cb31be5e183c6b4) )
+	ROM_LOAD( "kar19.f18", 0x58000, 0x08000, CRC(7bc174bb) SHA1(d8bc320169fc3a9cdd3f271ea523fb0486abae2c) )
 
 	ROM_REGION( 0x0800, "proms", 0 )
 	ROM_LOAD( "dn-21.k8", 0x0000, 0x0400, CRC(aab0bb93) SHA1(545707fbb1007fca1fe297c5fce61e485e7084fc) ) /* MB7132E BPROM */
@@ -1105,7 +1105,7 @@
 	ROM_LOAD( "ea-20.l6",      0x0400, 0x0400, CRC(619f9d1e) SHA1(17fe49b6c9ce17be4a03e3400229e3ef4998a46f) ) /* MB7122E BPROM */
 ROM_END
 
-ROM_START( chelnov )
+ROM_START( chelnov ) /* DE-0248-1 main board, DE-259-0 sub/rom board */
 	ROM_REGION( 0x60000, "maincpu", 0 ) /* 6*64k for 68000 code */
 	ROM_LOAD16_BYTE( "ee08-e.j16",   0x00000, 0x10000, CRC(8275cc3a) SHA1(961166226b68744eef15fed6a306010757b83556) )
 	ROM_LOAD16_BYTE( "ee11-e.j19",   0x00001, 0x10000, CRC(889e40a0) SHA1(e927f32d9bc448a331fb7b3478b2d07154f5013b) )
@@ -1140,7 +1140,7 @@
 	ROM_LOAD( "ee-16.l6",      0x0400, 0x0400, CRC(41816132) SHA1(89a1194bd8bf39f13419df685e489440bdb05676) ) /* MB7122E BPROM */
 ROM_END
 
-ROM_START( chelnovu )
+ROM_START( chelnovu ) /* DE-0248-1 main board, DE-259-0 sub/rom board */
 	ROM_REGION( 0x60000, "maincpu", 0 ) /* 6*64k for 68000 code */
 	ROM_LOAD16_BYTE( "ee08-a.j15",   0x00000, 0x10000, CRC(2f2fb37b) SHA1(f89b424099097a95cf184d20a15b876c5b639552) )
 	ROM_LOAD16_BYTE( "ee11-a.j20",   0x00001, 0x10000, CRC(f306d05f) SHA1(e523ffd17fb0104fe28eac288b6ebf7fc0ea2908) )
@@ -1175,9 +1175,9 @@
 	ROM_LOAD( "ee-16.l6",      0x0400, 0x0400, CRC(41816132) SHA1(89a1194bd8bf39f13419df685e489440bdb05676) ) /* MB7122E BPROM */
 ROM_END
 
-ROM_START( chelnovj ) /* at least 1 PCB found with all labels as 'EPR-EExx' like Sega labels */
+ROM_START( chelnovj ) /* DE-0248-1 main board, DE-259-0 sub/rom board */
 	ROM_REGION( 0x60000, "maincpu", 0 ) /* 6*64k for 68000 code */
-	ROM_LOAD16_BYTE( "ee08-1.j15",  0x00000, 0x10000, CRC(1978cb52) SHA1(833b8e80445ec2384e0479afb7430b32d6a14441) )
+	ROM_LOAD16_BYTE( "ee08-1.j15",  0x00000, 0x10000, CRC(1978cb52) SHA1(833b8e80445ec2384e0479afb7430b32d6a14441) )/* at least 1 PCB found with all labels as 'EPR-EExx' like Sega labels */
 	ROM_LOAD16_BYTE( "ee11-1.j20",  0x00001, 0x10000, CRC(e0ed3d99) SHA1(f47aaec5c72ecc308c32cdcf117ef4965ac5ea61) )
 	ROM_LOAD16_BYTE( "ee07.j14",    0x20000, 0x10000, CRC(51465486) SHA1(e165e754eb756db3abc1f8477171ab817d03a890) )
 	ROM_LOAD16_BYTE( "ee10.j18",    0x20001, 0x10000, CRC(d09dda33) SHA1(1764215606eec61e4fe30c0fc82ea2faf17821dc) )
@@ -1241,7 +1241,8 @@
 	ROM_LOAD( "5.bin",    0x38000, 0x08000, CRC(99cee6cd) SHA1(b2cd0a1aef04fd63ad27ac8a61d17a6bb4c8b600) )
 
 	ROM_REGION( 0x40000, "gfx3", 0 ) /* Sprites */
-	ROM_LOAD( "17.bin",       0x00000, 0x10000, CRC(47c857f8) SHA1(59f50365cee266c0e4075c989dc7fde50e43667a) ) // probably bad (1st half is 99.996948% match)
+//  ROM_LOAD( "17.bin",       0x00000, 0x10000, CRC(47c857f8) SHA1(59f50365cee266c0e4075c989dc7fde50e43667a) ) // probably bad, 1 byte difference: byte 0x55CC == 0x30 vs 0xF0 in ee12-.f8
+	ROM_LOAD( "ee12-.f8",     0x00000, 0x10000, CRC(9b1c53a5) SHA1(b0fdc89dc7fd0931fa4bca3bbc20fc88f637ec74) )
 	ROM_LOAD( "ee13-.f9",     0x10000, 0x10000, CRC(72b8ae3e) SHA1(535dfd70e6d13296342d96917a57d46bdb28a59e) )
 	ROM_LOAD( "ee14-.f13",    0x20000, 0x10000, CRC(d8f4bbde) SHA1(1f2d336dd97c9cc39e124c18cae634afb0ef3316) )
 	ROM_LOAD( "ee15-.f15",    0x30000, 0x10000, CRC(81e3e68b) SHA1(1059c70b8bfe09c212a19767cfe23efa22afc196) )
@@ -1261,7 +1262,6 @@
 
 */
 
-
 // same pcb as above?
 // this is a further hacked set of the above, with the copyright messages removed etc. (black screens for several seconds instead)
 ROM_START( chelnovjbla )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/kas89.cpp mame-0.224+dfsg.1/src/mame/drivers/kas89.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/kas89.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/kas89.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -125,7 +125,7 @@
   | |-D7--- Audit/Test.
   '-'
 
-  Whilest in Audit/Test mode, pressing the ADVANCE button, you can enter into
+  Whilst in Audit/Test mode, pressing the ADVANCE button, you can enter into
   screen and inputs test mode.
 
   This ADVANCE button, is routed into a latch with D0, sharing with BET button.
@@ -213,12 +213,7 @@
 		m_maincpu(*this, "maincpu"),
 		m_audiocpu(*this, "audiocpu"),
 		m_soundlatch(*this, "soundlatch"),
-		m_pl1(*this, "PL1"),
-		m_pl2(*this, "PL2"),
-		m_pl3(*this, "PL3"),
-		m_pl4(*this, "PL4"),
-		m_pl5(*this, "PL5"),
-		m_pl6(*this, "PL6"),
+		m_pl(*this, "PL%u", 1),
 		m_svc(*this, "SVC"),
 		m_dsw(*this, "DSW"),
 		m_unk(*this, "UNK"),
@@ -229,6 +224,10 @@
 
 	void init_kas89();
 
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
 private:
 	void mux_w(uint8_t data);
 	uint8_t mux_r();
@@ -237,32 +236,24 @@
 	void int_ack_w(uint8_t data);
 	void led_mux_data_w(uint8_t data);
 	void led_mux_select_w(uint8_t data);
-	TIMER_DEVICE_CALLBACK_MEMBER(kas89_nmi_cb);
-	TIMER_DEVICE_CALLBACK_MEMBER(kas89_sound_nmi_cb);
+	TIMER_DEVICE_CALLBACK_MEMBER(nmi_cb);
+	TIMER_DEVICE_CALLBACK_MEMBER(sound_nmi_cb);
 	void audio_io(address_map &map);
 	void audio_map(address_map &map);
 	void kas89_io(address_map &map);
 	void kas89_map(address_map &map);
 
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-
 	uint8_t m_mux_data;
 	uint8_t m_main_nmi_enable;
 
 	uint8_t m_leds_mux_selector;
 	uint8_t m_leds_mux_data;
-	uint8_t m_outdata;            /* Muxed with the sound latch. Output to a sign? */
+	uint8_t m_outdata;            // Muxed with the sound latch. Output to a sign?
 
 	required_device<cpu_device> m_maincpu;
 	required_device<cpu_device> m_audiocpu;
 	required_device<generic_latch_8_device> m_soundlatch;
-	required_ioport m_pl1;
-	required_ioport m_pl2;
-	required_ioport m_pl3;
-	required_ioport m_pl4;
-	required_ioport m_pl5;
-	required_ioport m_pl6;
+	required_ioport_array<6> m_pl;
 	required_ioport m_svc;
 	required_ioport m_dsw;
 	required_ioport m_unk;
@@ -277,7 +268,13 @@
 void kas89_state::machine_start()
 {
 	m_lamps.resolve();
-	m_lamps[37] = 0;   /* turning off the operator led */
+	m_lamps[37] = 0;   // turning off the operator led
+
+	save_item(NAME(m_mux_data));
+	save_item(NAME(m_main_nmi_enable));
+	save_item(NAME(m_leds_mux_selector));
+	save_item(NAME(m_leds_mux_data));
+	save_item(NAME(m_outdata));
 }
 
 void kas89_state::machine_reset()
@@ -306,18 +303,18 @@
 {
 	switch(m_mux_data)
 	{
-		case 0x01: return m_pl1->read();
-		case 0x02: return m_pl2->read();
-		case 0x04: return m_pl3->read();
-		case 0x08: return m_pl4->read();
-		case 0x10: return m_pl5->read();
-		case 0x20: return m_pl6->read();
+		case 0x01: return m_pl[0]->read();
+		case 0x02: return m_pl[1]->read();
+		case 0x04: return m_pl[2]->read();
+		case 0x08: return m_pl[3]->read();
+		case 0x10: return m_pl[4]->read();
+		case 0x20: return m_pl[5]->read();
 		case 0x40:
 		{
-			m_lamps[37] = BIT(~m_svc->read(), 5);  /* Operator Key LAMP */
+			m_lamps[37] = BIT(~m_svc->read(), 5);  // Operator Key LAMP
 			return m_svc->read();
 		}
-		case 0x80: return m_dsw->read();    /* Polled at $162a through NMI routine */
+		case 0x80: return m_dsw->read();    // Polled at $162a through NMI routine
 		case 0x3f: return m_unk->read();
 	}
 
@@ -325,13 +322,13 @@
 	return m_mux_data;
 }
 
-TIMER_DEVICE_CALLBACK_MEMBER(kas89_state::kas89_nmi_cb)
+TIMER_DEVICE_CALLBACK_MEMBER(kas89_state::nmi_cb)
 {
 	if (m_main_nmi_enable)
 		m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
 }
 
-TIMER_DEVICE_CALLBACK_MEMBER(kas89_state::kas89_sound_nmi_cb)
+TIMER_DEVICE_CALLBACK_MEMBER(kas89_state::sound_nmi_cb)
 {
 	m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
 }
@@ -350,8 +347,8 @@
 
 	m_main_nmi_enable = data & 0x40;
 
-	machine().bookkeeping().coin_counter_w(0, (data ^ 0xff) & 0x01); /* Credits In counter */
-	machine().bookkeeping().coin_counter_w(1, (data ^ 0xff) & 0x02); /* Credits Out counter */
+	machine().bookkeeping().coin_counter_w(0, (data ^ 0xff) & 0x01); // Credits In counter
+	machine().bookkeeping().coin_counter_w(1, (data ^ 0xff) & 0x02); // Credits Out counter
 }
 
 void kas89_state::sound_comm_w(uint8_t data)
@@ -373,14 +370,14 @@
 
 	if (data & 0x40)
 	{
-		m_outdata = (data ^ 0x40);  /* Pure data. Without the activator bit */
+		m_outdata = (data ^ 0x40);  // Pure data. Without the activator bit
 
 		if (m_outdata == 0x3f)
 		{
 			uint8_t i;
 			for ( i = 0; i < 37; i++ )
 			{
-				m_lamps[i] = 0;    /* All roulette LEDs OFF */
+				m_lamps[i] = 0;    // All roulette LEDs OFF
 			}
 		}
 
@@ -424,9 +421,9 @@
 	m_leds_mux_selector = data;
 
 	uint8_t i;
-	for ( i = 0; i < 37; i++ )
+	for ( uint8_t i = 0; i < 37; i++ )
 	{
-		m_lamps[i] = 0;    /* All LEDs OFF */
+		m_lamps[i] = 0;    // All LEDs OFF
 	}
 
 	switch(data)
@@ -435,69 +432,69 @@
 		{
 			for ( i = 0; i < 37; i++ )
 			{
-				m_lamps[i] = 0;    /* All LEDs OFF */
+				m_lamps[i] = 0;    // All LEDs OFF
 			}
 		}
 
 		case 0x01:
 		{
-			m_lamps[11] = BIT(m_leds_mux_data, 0);  /* Number 11 LED */
-			m_lamps[36] = BIT(m_leds_mux_data, 1);  /* Number 36 LED */
-			m_lamps[13] = BIT(m_leds_mux_data, 2);  /* Number 13 LED */
-			m_lamps[27] = BIT(m_leds_mux_data, 3);  /* Number 27 LED */
-			m_lamps[06] = BIT(m_leds_mux_data, 4);  /* Number  6 LED */
-			m_lamps[34] = BIT(m_leds_mux_data, 5);  /* Number 34 LED */
-			m_lamps[17] = BIT(m_leds_mux_data, 6);  /* Number 17 LED */
-			m_lamps[25] = BIT(m_leds_mux_data, 7);  /* Number 25 LED */
+			m_lamps[11] = BIT(m_leds_mux_data, 0);  // Number 11 LED
+			m_lamps[36] = BIT(m_leds_mux_data, 1);  // Number 36 LED
+			m_lamps[13] = BIT(m_leds_mux_data, 2);  // Number 13 LED
+			m_lamps[27] = BIT(m_leds_mux_data, 3);  // Number 27 LED
+			m_lamps[06] = BIT(m_leds_mux_data, 4);  // Number  6 LED
+			m_lamps[34] = BIT(m_leds_mux_data, 5);  // Number 34 LED
+			m_lamps[17] = BIT(m_leds_mux_data, 6);  // Number 17 LED
+			m_lamps[25] = BIT(m_leds_mux_data, 7);  // Number 25 LED
 			break;
 		}
 
 		case 0x02:
 		{
-			m_lamps[ 2] = BIT(m_leds_mux_data, 0);  /* Number  2 LED */
-			m_lamps[21] = BIT(m_leds_mux_data, 1);  /* Number 21 LED */
-			m_lamps[ 4] = BIT(m_leds_mux_data, 2);  /* Number  4 LED */
-			m_lamps[19] = BIT(m_leds_mux_data, 3);  /* Number 19 LED */
-			m_lamps[15] = BIT(m_leds_mux_data, 4);  /* Number 15 LED */
-			m_lamps[32] = BIT(m_leds_mux_data, 5);  /* Number 32 LED */
-			m_lamps[ 0] = BIT(m_leds_mux_data, 6);  /* Number  0 LED */
-			m_lamps[26] = BIT(m_leds_mux_data, 7);  /* Number 26 LED */
+			m_lamps[ 2] = BIT(m_leds_mux_data, 0);  // Number  2 LED
+			m_lamps[21] = BIT(m_leds_mux_data, 1);  // Number 21 LED
+			m_lamps[ 4] = BIT(m_leds_mux_data, 2);  // Number  4 LED
+			m_lamps[19] = BIT(m_leds_mux_data, 3);  // Number 19 LED
+			m_lamps[15] = BIT(m_leds_mux_data, 4);  // Number 15 LED
+			m_lamps[32] = BIT(m_leds_mux_data, 5);  // Number 32 LED
+			m_lamps[ 0] = BIT(m_leds_mux_data, 6);  // Number  0 LED
+			m_lamps[26] = BIT(m_leds_mux_data, 7);  // Number 26 LED
 			break;
 		}
 
 		case 0x04:
 		{
-			m_lamps[ 3] = BIT(m_leds_mux_data, 0);  /* Number  3 LED */
-			m_lamps[35] = BIT(m_leds_mux_data, 1);  /* Number 35 LED */
-			m_lamps[12] = BIT(m_leds_mux_data, 2);  /* Number 12 LED */
-			m_lamps[28] = BIT(m_leds_mux_data, 3);  /* Number 28 LED */
-			m_lamps[ 7] = BIT(m_leds_mux_data, 4);  /* Number  7 LED */
-			m_lamps[29] = BIT(m_leds_mux_data, 5);  /* Number 29 LED */
-			m_lamps[18] = BIT(m_leds_mux_data, 6);  /* Number 18 LED */
+			m_lamps[ 3] = BIT(m_leds_mux_data, 0);  // Number  3 LED
+			m_lamps[35] = BIT(m_leds_mux_data, 1);  // Number 35 LED
+			m_lamps[12] = BIT(m_leds_mux_data, 2);  // Number 12 LED
+			m_lamps[28] = BIT(m_leds_mux_data, 3);  // Number 28 LED
+			m_lamps[ 7] = BIT(m_leds_mux_data, 4);  // Number  7 LED
+			m_lamps[29] = BIT(m_leds_mux_data, 5);  // Number 29 LED
+			m_lamps[18] = BIT(m_leds_mux_data, 6);  // Number 18 LED
 			break;
 		}
 
 		case 0x08:
 		{
-			m_lamps[22] = BIT(m_leds_mux_data, 0);  /* Number 22 LED */
-			m_lamps[ 9] = BIT(m_leds_mux_data, 1);  /* Number  9 LED */
-			m_lamps[31] = BIT(m_leds_mux_data, 2);  /* Number 31 LED */
-			m_lamps[14] = BIT(m_leds_mux_data, 3);  /* Number 14 LED */
-			m_lamps[20] = BIT(m_leds_mux_data, 4);  /* Number 20 LED */
-			m_lamps[ 1] = BIT(m_leds_mux_data, 5);  /* Number  1 LED */
-			m_lamps[33] = BIT(m_leds_mux_data, 6);  /* Number 33 LED */
+			m_lamps[22] = BIT(m_leds_mux_data, 0);  // Number 22 LED
+			m_lamps[ 9] = BIT(m_leds_mux_data, 1);  // Number  9 LED
+			m_lamps[31] = BIT(m_leds_mux_data, 2);  // Number 31 LED
+			m_lamps[14] = BIT(m_leds_mux_data, 3);  // Number 14 LED
+			m_lamps[20] = BIT(m_leds_mux_data, 4);  // Number 20 LED
+			m_lamps[ 1] = BIT(m_leds_mux_data, 5);  // Number  1 LED
+			m_lamps[33] = BIT(m_leds_mux_data, 6);  // Number 33 LED
 			break;
 		}
 
 		case 0x10:
 		{
-			m_lamps[16] = BIT(m_leds_mux_data, 0);  /* Number 16 LED */
-			m_lamps[24] = BIT(m_leds_mux_data, 1);  /* Number 24 LED */
-			m_lamps[ 5] = BIT(m_leds_mux_data, 2);  /* Number  5 LED */
-			m_lamps[10] = BIT(m_leds_mux_data, 3);  /* Number 10 LED */
-			m_lamps[23] = BIT(m_leds_mux_data, 4);  /* Number 23 LED */
-			m_lamps[ 8] = BIT(m_leds_mux_data, 5);  /* Number  8 LED */
-			m_lamps[30] = BIT(m_leds_mux_data, 6);  /* Number 30 LED */
+			m_lamps[16] = BIT(m_leds_mux_data, 0);  // Number 16 LED
+			m_lamps[24] = BIT(m_leds_mux_data, 1);  // Number 24 LED
+			m_lamps[ 5] = BIT(m_leds_mux_data, 2);  // Number  5 LED
+			m_lamps[10] = BIT(m_leds_mux_data, 3);  // Number 10 LED
+			m_lamps[23] = BIT(m_leds_mux_data, 4);  // Number 23 LED
+			m_lamps[ 8] = BIT(m_leds_mux_data, 5);  // Number  8 LED
+			m_lamps[30] = BIT(m_leds_mux_data, 6);  // Number 30 LED
 			break;
 		}
 
@@ -505,7 +502,7 @@
 		{
 			for ( i = 0; i < 37; i++ )
 			{
-				m_lamps[i] = 1;    /* All LEDs ON */
+				m_lamps[i] = 1;    // All LEDs ON
 			}
 		}
 	}
@@ -519,15 +516,15 @@
 void kas89_state::kas89_map(address_map &map)
 {
 	map(0x0000, 0x7fff).rom();
-	map(0x0037, 0x0037).nopw();    /* WTF? */
-	map(0x8000, 0x81ff).ram();     /* empty */
-	map(0x8200, 0x83ff).ram();     /* 8200-83ff (PL1) */
-	map(0x8400, 0x85ff).ram();     /* 8400-85ff (PL2) */
-	map(0x8600, 0x87ff).ram();     /* 8600-87ff (PL3) */
-	map(0x8800, 0x89ff).ram();     /* 8800-89ff (PL4) */
-	map(0x8a00, 0x8bff).ram();     /* 8a00-8bff (PL5) */
-	map(0x8c00, 0x8dff).ram();     /* 8c00-8dff (PL6) */
-	map(0x8e00, 0x8fff).ram();     /* empty */
+	map(0x0037, 0x0037).nopw();    // WTF?
+	map(0x8000, 0x81ff).ram();     // empty
+	map(0x8200, 0x83ff).ram();     // 8200-83ff (PL1)
+	map(0x8400, 0x85ff).ram();     // 8400-85ff (PL2)
+	map(0x8600, 0x87ff).ram();     // 8600-87ff (PL3)
+	map(0x8800, 0x89ff).ram();     // 8800-89ff (PL4)
+	map(0x8a00, 0x8bff).ram();     // 8a00-8bff (PL5)
+	map(0x8c00, 0x8dff).ram();     // 8c00-8dff (PL6)
+	map(0x8e00, 0x8fff).ram();     // empty
 	map(0x9000, 0x97ff).ram();
 	map(0x9800, 0x9fff).ram().share("nvram");
 }
@@ -538,7 +535,7 @@
 	map(0x40, 0x43).rw("v9938", FUNC(v9938_device::read), FUNC(v9938_device::write));
 	map(0x80, 0x80).w(FUNC(kas89_state::mux_w));
 	map(0x81, 0x81).r(FUNC(kas89_state::mux_r));
-	map(0x82, 0x82).w(FUNC(kas89_state::control_w));    /* Bit6 trigger the 138Hz osc. tied to main Z80's NMI.*/
+	map(0x82, 0x82).w(FUNC(kas89_state::control_w));    // Bit6 trigger the 138Hz osc. tied to main Z80's NMI.
 	map(0x83, 0x83).w(FUNC(kas89_state::led_mux_data_w));
 	map(0x84, 0x84).w(FUNC(kas89_state::led_mux_select_w));
 	map(0x85, 0x85).w(FUNC(kas89_state::sound_comm_w));
@@ -668,8 +665,8 @@
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_0) PORT_NAME("Avance Pantalla (Advance)")
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )    /* Blank the screen. Disclaimer isn't shown.*/
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN )   /* Otherwise hang the game when insert credits.*/
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )    // Blank the screen. Disclaimer isn't shown.
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNKNOWN )   // Otherwise hang the game when insert credits.
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_8)  PORT_TOGGLE PORT_NAME("Operator/Habilitation Key")
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_CODE(KEYCODE_9)  PORT_TOGGLE PORT_NAME("Audit/Test Mode Switch")
@@ -685,7 +682,7 @@
   |                    Normal     | ON  | OFF |                                   |    Normal
   |                    Dura       | OFF | ON  |                                   |    Hard
   |                    Muy Dura   | ON  | ON  |                                   |    Very Hard
-  +-------------------------------+-----+-----+-----+-----+-----------------------+  [Heart Appeareance]
+  +-------------------------------+-----+-----+-----+-----+-----------------------+  [Heart Appearance]
   | Aparicion          No         |           | OFF | OFF |                       |    No
   |    del             Poco       |           | ON  | OFF |                       |    Few
   |  Corazon           (n/c)      |           | OFF | ON  |                       |    n/c
@@ -729,7 +726,7 @@
 	PORT_DIPSETTING(    0x08, "Dura (Hard)" )
 	PORT_DIPSETTING(    0x00, "Muy Dura (Very Hard)" )
 
-	PORT_DIPNAME( 0x21, 0x21, "Aparicion del Corazon (Heart Appeareance)" ) PORT_DIPLOCATION("DSW1:3,4")
+	PORT_DIPNAME( 0x21, 0x21, "Aparicion del Corazon (Heart Appearance)" ) PORT_DIPLOCATION("DSW1:3,4")
 	PORT_DIPSETTING(    0x01, "n/c" )
 	PORT_DIPSETTING(    0x21, "No (No)" )
 	PORT_DIPSETTING(    0x20, "Poco (Few)" )
@@ -750,7 +747,7 @@
 	PORT_DIPSETTING(    0x50, "Alto (High)" )
 
 
-	PORT_START("UNK")   /* Unknown input set */
+	PORT_START("UNK")   // Unknown input set
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -758,7 +755,7 @@
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )   /* Should be active for Audit/Test Mode, also for boot...*/
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )   // Should be active for Audit/Test Mode, also for boot...
 
 INPUT_PORTS_END
 
@@ -769,32 +766,32 @@
 
 void kas89_state::kas89(machine_config &config)
 {
-	/* basic machine hardware */
-	Z80(config, m_maincpu, MASTER_CLOCK/6);    /* Confirmed */
+	// basic machine hardware
+	Z80(config, m_maincpu, MASTER_CLOCK/6);    // Confirmed
 	m_maincpu->set_addrmap(AS_PROGRAM, &kas89_state::kas89_map);
 	m_maincpu->set_addrmap(AS_IO, &kas89_state::kas89_io);
-	TIMER(config, "kas89_nmi").configure_periodic(FUNC(kas89_state::kas89_nmi_cb), attotime::from_hz(138));
+	TIMER(config, "kas89_nmi").configure_periodic(FUNC(kas89_state::nmi_cb), attotime::from_hz(138));
 
-	Z80(config, m_audiocpu, MASTER_CLOCK/6);   /* Confirmed */
+	Z80(config, m_audiocpu, MASTER_CLOCK/6);   // Confirmed
 	m_audiocpu->set_addrmap(AS_PROGRAM, &kas89_state::audio_map);
 	m_audiocpu->set_addrmap(AS_IO, &kas89_state::audio_io);
-	TIMER(config, "kas89_snmi").configure_periodic(FUNC(kas89_state::kas89_sound_nmi_cb), attotime::from_hz(138));
+	TIMER(config, "kas89_snmi").configure_periodic(FUNC(kas89_state::sound_nmi_cb), attotime::from_hz(138));
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
 
-	/* video hardware */
+	// video hardware
 	v9938_device &v9938(V9938(config, "v9938", MASTER_CLOCK));
 	v9938.set_screen_ntsc("screen");
 	v9938.set_vram_size(VDP_MEM);
 	v9938.int_cb().set_inputline("maincpu", 0);
 	SCREEN(config, "screen", SCREEN_TYPE_RASTER);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 
 	GENERIC_LATCH_8(config, m_soundlatch);
 
-	AY8910(config, "aysnd", MASTER_CLOCK/12).add_route(ALL_OUTPUTS, "mono", 1.0);    /* Confirmed */
+	AY8910(config, "aysnd", MASTER_CLOCK/12).add_route(ALL_OUTPUTS, "mono", 1.0);    // Confirmed
 }
 
 
@@ -853,13 +850,13 @@
 	int memsize = memregion("maincpu")->bytes();
 	std::vector<uint8_t> buf;
 
-	/* Unscrambling data lines */
+	// Unscrambling data lines
 	for (int i = 0; i < memsize; i++)
 	{
 		buf.push_back(bitswap<8>(mem[i], 3, 1, 0, 5, 6, 4, 7, 2));
 	}
 
-	/* Unscrambling address lines */
+	// Unscrambling address lines
 	for (int i = 0; i < memsize; i++)
 	{
 		mem[bitswap<16>(i, 15, 14, 5, 6, 3, 0, 12, 1, 9, 13, 4, 7, 10, 8, 2, 11)] = buf[i];
@@ -872,4 +869,4 @@
 **************************************/
 
 //     YEAR  NAME   PARENT  MACHINE  INPUT  CLASS        INIT        ROT    COMPANY       FULLNAME      FLAGS                    LAYOUT
-GAMEL( 1989, kas89, 0,      kas89,   kas89, kas89_state, init_kas89, ROT90, "SFC S.R.L.", "Kasino '89", MACHINE_IMPERFECT_SOUND, layout_kas89 )
+GAMEL( 1989, kas89, 0,      kas89,   kas89, kas89_state, init_kas89, ROT90, "SFC S.R.L.", "Kasino '89", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_kas89 )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/kawai_ksp10.cpp mame-0.224+dfsg.1/src/mame/drivers/kawai_ksp10.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/kawai_ksp10.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/kawai_ksp10.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,54 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/****************************************************************************
+
+    Skeleton driver for Kawai KSP10 digital piano.
+
+****************************************************************************/
+
+#include "emu.h"
+#include "cpu/tlcs900/tmp96c141.h"
+
+class kawai_ksp10_state : public driver_device
+{
+public:
+	kawai_ksp10_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+	{
+	}
+
+	void ksp10(machine_config &config);
+
+private:
+	void mem_map(address_map &map);
+
+	required_device<tmp96c141_device> m_maincpu;
+};
+
+
+void kawai_ksp10_state::mem_map(address_map &map)
+{
+	map(0x000000, 0x07ffff).rom().region("firmware", 0);
+	map(0x400000, 0x407fff).ram(); // NVRAM?
+}
+
+
+static INPUT_PORTS_START(ksp10)
+INPUT_PORTS_END
+
+void kawai_ksp10_state::ksp10(machine_config &config)
+{
+	TMP96C141(config, m_maincpu, 10'000'000); // clock unknown
+	m_maincpu->set_addrmap(AS_PROGRAM, &kawai_ksp10_state::mem_map);
+}
+
+ROM_START(ksp10)
+	ROM_REGION16_LE(0x80000, "firmware", 0)
+	ROM_LOAD("u3_hp041b_e8dp_tms27c240.bin", 0x00000, 0x80000, CRC(b64e7a97) SHA1(bac0f345d0a039a3315883a6ca8eefe659709a26))
+
+	ROM_REGION16_LE(0x40000, "samples", 0)
+	ROM_LOAD("u21_hp042a_e7dp_mbm27c2048.bin", 0x00000, 0x40000, CRC(e21b1141) SHA1(181c2beed18da2efa2f0e45cb3233adf6b932127))
+ROM_END
+
+SYST(199?, ksp10, 0, 0, ksp10, ksp10, kawai_ksp10_state, empty_init, "Kawai Musical Instruments Manufacturing", "KSP10 Digital Piano", MACHINE_IS_SKELETON)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/kawai_sx240.cpp mame-0.224+dfsg.1/src/mame/drivers/kawai_sx240.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/kawai_sx240.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/kawai_sx240.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,138 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/****************************************************************************
+
+    Skeleton driver for Kawai SX-240 synthesizer.
+
+****************************************************************************/
+
+#include "emu.h"
+#include "cpu/mcs51/mcs51.h"
+#include "machine/nvram.h"
+#include "machine/pit8253.h"
+
+class kawai_sx240_state : public driver_device
+{
+public:
+	kawai_sx240_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_master(*this, "master")
+		, m_slave(*this, "slave")
+	{
+	}
+
+	void sx240(machine_config &config);
+
+private:
+	void sh_outport_w(u8 data);
+	void asn_w(u8 data);
+	void g_w(u8 data);
+
+	void master_prog(address_map &map);
+	void master_ext(address_map &map);
+	void slave_prog(address_map &map);
+	void slave_ext(address_map &map);
+
+	required_device<mcs51_cpu_device> m_master;
+	required_device<mcs51_cpu_device> m_slave;
+};
+
+
+void kawai_sx240_state::sh_outport_w(u8 data)
+{
+	// SAD1–SAD3 = SHA0–SHA2
+	// SAD4, SAD5 -> NE555 for buzzer
+}
+
+void kawai_sx240_state::asn_w(u8 data)
+{
+}
+
+void kawai_sx240_state::g_w(u8 data)
+{
+}
+
+void kawai_sx240_state::master_prog(address_map &map)
+{
+	map.global_mask(0x3fff);
+	map(0x0000, 0x3fff).rom().region("mcode", 0);
+}
+
+void kawai_sx240_state::master_ext(address_map &map)
+{
+	map(0x0000, 0x07ff).ram().share("ram0");
+	map(0x0800, 0x0fff).ram().share("ram1");
+	map(0x1000, 0x17ff).ram().share("ram2");
+	map(0x1800, 0x1fff).ram().share("ram3");
+	map(0x2100, 0x210f).nopr();
+}
+
+void kawai_sx240_state::slave_prog(address_map &map)
+{
+	map.global_mask(0x1fff);
+	map(0x0000, 0x1fff).rom().region("scode", 0);
+}
+
+void kawai_sx240_state::slave_ext(address_map &map)
+{
+	map(0x0000, 0x07ff).mirror(0x800).ram();
+	map(0x1000, 0x1003).mirror(0xfc0).rw("pit0", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+	map(0x1004, 0x1007).mirror(0xfc0).rw("pit1", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+	map(0x1008, 0x100b).mirror(0xfc0).rw("pit2", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+	map(0x100c, 0x100f).mirror(0xfc0).rw("pit3", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+	map(0x1010, 0x1013).mirror(0xfc0).rw("pit4", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+	map(0x1014, 0x1017).mirror(0xfc0).rw("pit5", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+	map(0x1018, 0x101b).mirror(0xfc0).rw("pit6", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+	map(0x101c, 0x101f).mirror(0xfc0).rw("pit7", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+	map(0x1020, 0x1023).mirror(0xfd8).rw("pit8", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+	map(0x1024, 0x1027).mirror(0xfd8).rw("pit9", FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+	map(0x2000, 0x202f).mirror(0xfc0).nopw();
+	map(0x2030, 0x2030).mirror(0xfc7).w(FUNC(kawai_sx240_state::sh_outport_w));
+	map(0x2038, 0x2038).mirror(0xfc7).w(FUNC(kawai_sx240_state::asn_w));
+	map(0x3000, 0x3000).mirror(0xfff).w(FUNC(kawai_sx240_state::g_w));
+}
+
+
+static INPUT_PORTS_START(sx240)
+INPUT_PORTS_END
+
+void kawai_sx240_state::sx240(machine_config &config)
+{
+	I8031(config, m_master, 12_MHz_XTAL);
+	m_master->set_addrmap(AS_PROGRAM, &kawai_sx240_state::master_prog);
+	m_master->set_addrmap(AS_IO, &kawai_sx240_state::master_ext);
+
+	NVRAM(config, "ram0", nvram_device::DEFAULT_ALL_0); // HM6116ALSP-20 (I9) + battery
+	NVRAM(config, "ram1", nvram_device::DEFAULT_ALL_0); // HM6116ALSP-20 (I10) + battery
+	NVRAM(config, "ram2", nvram_device::DEFAULT_ALL_0); // HM6116ALSP-20 (I11) + battery
+	NVRAM(config, "ram3", nvram_device::DEFAULT_ALL_0); // HM6116ALSP-20 (I12) + battery
+
+	I8031(config, m_slave, 12_MHz_XTAL);
+	m_slave->set_addrmap(AS_PROGRAM, &kawai_sx240_state::slave_prog);
+	m_slave->set_addrmap(AS_IO, &kawai_sx240_state::slave_ext);
+
+	PIT8253(config, "pit0"); // MSM82C53-5 (I25)
+	PIT8253(config, "pit1"); // MSM82C53-5 (I26)
+	PIT8253(config, "pit2"); // MSM82C53-5 (I27)
+	PIT8253(config, "pit3"); // MSM82C53-5 (I28)
+	PIT8253(config, "pit4"); // MSM82C53-5 (I29)
+	PIT8253(config, "pit5"); // MSM82C53-5 (I30)
+	PIT8253(config, "pit6"); // MSM82C53-5 (I31)
+	PIT8253(config, "pit7"); // MSM82C53-5 (I32)
+	PIT8253(config, "pit8"); // MSM82C53-5 (I33)
+	PIT8253(config, "pit9"); // MSM82C53-5 (I34)
+}
+
+ROM_START(sx240)
+	ROM_REGION(0x4000, "mcode", 0) // 27128-25
+	ROM_SYSTEM_BIOS(0, "firmware", "Firmware (unknown)")
+	ROMX_LOAD("kawai sx-240 rom firmware binary.bin", 0x0000, 0x4000, CRC(b057c3ee) SHA1(3d3f98ac2c5ccca70690e4fb3482d704a67a6f65), ROM_BIOS(0))
+	ROM_SYSTEM_BIOS(1, "tauntek", "Tauntek CFW")
+	ROMX_LOAD("sx240mst.i8", 0x0000, 0x4000, CRC(426aba62) SHA1(d19c14a9ce6c06f021fa2641f072a82332023b1e), ROM_BIOS(1))
+
+	ROM_REGION(0x2000, "scode", 0) // 2764-25
+	// From Tauntek package: "New Slave EPROM is only required for saving patches or sequences via sysex"
+	ROM_LOAD("sx240slv.i38", 0x0000, 0x2000, CRC(c6bc6439) SHA1(4d51d8c5a198ff139956cb0b07225448357d17ef))
+ROM_END
+
+SYST(1984, sx240, 0, 0, sx240, sx240, kawai_sx240_state, empty_init, "Kawai Musical Instrument Manufacturing", "SX-240 8-Voice Programmable Polyphonic Synthesizer", MACHINE_IS_SKELETON)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/kaypro.cpp mame-0.224+dfsg.1/src/mame/drivers/kaypro.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/kaypro.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/kaypro.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -362,6 +362,7 @@
 	m_fdc->set_force_ready(true);
 	FLOPPY_CONNECTOR(config, "fdc:0", kaypro_floppies, "525dd", floppy_image_device::default_floppy_formats).enable_sound(true);
 	FLOPPY_CONNECTOR(config, "fdc:1", kaypro_floppies, "525dd", floppy_image_device::default_floppy_formats).enable_sound(true);
+	SOFTWARE_LIST(config, "flop_list").set_original("kaypro484");
 }
 
 void kaypro_state::kaypro10(machine_config &config)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/kc.cpp mame-0.224+dfsg.1/src/mame/drivers/kc.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/kc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/kc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,7 +2,7 @@
 // copyright-holders:Kevin Thacker,Sandro Ronco
 /******************************************************************************
 
-    kc.c
+    kc.cpp
     system driver
 
     A big thankyou to Torsten Paul for his great help with this
@@ -11,7 +11,7 @@
 
     Kevin Thacker [MESS driver]
 
- ******************************************************************************/
+******************************************************************************/
 
 /* Core includes */
 #include "emu.h"
@@ -292,7 +292,7 @@
 ROM_END
 
 //    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT  CLASS         INIT        COMPANY, FULLNAME, FLAGS
-COMP( 1987, kc85_2, 0,      0,      kc85_3,  kc85,  kc_state,     empty_init, "VEB Mikroelektronik \"Wilhelm Pieck\" Muehlhausen", "HC900 / KC 85/2", MACHINE_NOT_WORKING)
-COMP( 1987, kc85_3, kc85_2, 0,      kc85_3,  kc85,  kc_state,     empty_init, "VEB Mikroelektronik \"Wilhelm Pieck\" Muehlhausen", "KC 85/3",         MACHINE_NOT_WORKING)
-COMP( 1989, kc85_4, kc85_2, 0,      kc85_4,  kc85,  kc85_4_state, empty_init, "VEB Mikroelektronik \"Wilhelm Pieck\" Muehlhausen", "KC 85/4",         MACHINE_NOT_WORKING)
-COMP( 1989, kc85_5, kc85_2, 0,      kc85_5,  kc85,  kc85_4_state, empty_init, "VEB Mikroelektronik \"Wilhelm Pieck\" Muehlhausen", "KC 85/5",         MACHINE_NOT_WORKING)
+COMP( 1987, kc85_2, 0,      0,      kc85_3,  kc85,  kc_state,     empty_init, u8"VEB Mikroelektronik \"Wilhelm Pieck\" Mühlhausen", "HC900 / KC 85/2", MACHINE_NOT_WORKING)
+COMP( 1987, kc85_3, kc85_2, 0,      kc85_3,  kc85,  kc_state,     empty_init, u8"VEB Mikroelektronik \"Wilhelm Pieck\" Mühlhausen", "KC 85/3",         MACHINE_NOT_WORKING)
+COMP( 1989, kc85_4, kc85_2, 0,      kc85_4,  kc85,  kc85_4_state, empty_init, u8"VEB Mikroelektronik \"Wilhelm Pieck\" Mühlhausen", "KC 85/4",         MACHINE_NOT_WORKING)
+COMP( 1989, kc85_5, kc85_2, 0,      kc85_5,  kc85,  kc85_4_state, empty_init, u8"VEB Mikroelektronik \"Wilhelm Pieck\" Mühlhausen", "KC 85/5",         MACHINE_NOT_WORKING)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/kenseim.cpp mame-0.224+dfsg.1/src/mame/drivers/kenseim.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/kenseim.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/kenseim.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -395,7 +395,7 @@
 
 READ_LINE_MEMBER(kenseim_state::cmd_LVm_r)
 {
-	return m_to_68k_cmd_LVm;;
+	return m_to_68k_cmd_LVm;
 }
 
 /* 68k side COMMS writes */
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/kingdrby.cpp mame-0.224+dfsg.1/src/mame/drivers/kingdrby.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/kingdrby.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/kingdrby.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -283,7 +283,7 @@
 	m_sc0w_tilemap->set_scrolly(0, 32);
 
 	/* maybe it needs two window tilemaps? (one at the top, the other at the bottom)*/
-	clip.set(visarea.min_x, 256, 192, visarea.max_y);
+	clip.set(visarea.min_x, 255, 192, visarea.max_y);
 
 	/*TILEMAP_DRAW_CATEGORY + TILEMAP_DRAW_OPAQUE doesn't suit well?*/
 	m_sc0_tilemap->draw(screen, bitmap, cliprect, 0,0);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/konin.cpp mame-0.224+dfsg.1/src/mame/drivers/konin.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/konin.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/konin.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -42,8 +42,8 @@
 private:
 	DECLARE_WRITE_LINE_MEMBER(picu_r3_w);
 
-	void konin_io(address_map &map);
-	void konin_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 
 	virtual void machine_start() override;
 	required_device<cpu_device> m_maincpu;
@@ -57,7 +57,7 @@
 	m_picu->r_w(4, !state);
 }
 
-void konin_state::konin_mem(address_map &map)
+void konin_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x0000, 0x4fff).rom();
@@ -69,7 +69,7 @@
 	map(0xff00, 0xffff).ram();
 }
 
-void konin_state::konin_io(address_map &map)
+void konin_state::io_map(address_map &map)
 {
 	map.unmap_value_high();
 	map.global_mask(0xff);
@@ -97,8 +97,8 @@
 {
 	/* basic machine hardware */
 	i8080_cpu_device &maincpu(I8080(config, m_maincpu, XTAL(4'000'000)));
-	maincpu.set_addrmap(AS_PROGRAM, &konin_state::konin_mem);
-	maincpu.set_addrmap(AS_IO, &konin_state::konin_io);
+	maincpu.set_addrmap(AS_PROGRAM, &konin_state::mem_map);
+	maincpu.set_addrmap(AS_IO, &konin_state::io_map);
 	maincpu.out_inte_func().set(m_picu, FUNC(i8214_device::inte_w));
 	maincpu.set_irq_acknowledge_callback("intlatch", FUNC(i8212_device::inta_cb));
 
@@ -136,7 +136,7 @@
 
 /* ROM definition */
 ROM_START( konin )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x5000, "maincpu", 0 )
 	ROM_LOAD( "001.bin", 0x0000, 0x0800, CRC(0b13208a) SHA1(38ea17be591b729158d601c03bfd9954f32e0e67))
 	ROM_LOAD( "008.bin", 0x0800, 0x0800, CRC(f003e407) SHA1(11f79ef3b90788cf627ee39705bbbd04dbf45f50))
 	ROM_LOAD( "007.bin", 0x1000, 0x0800, CRC(3d390c03) SHA1(ac2fe31c065e8f630381d6cebd2eb58b403c1e02))
@@ -152,4 +152,4 @@
 /* Driver */
 
 //    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY       FULLNAME  FLAGS
-COMP( 198?, konin, 0,      0,      konin,   konin, konin_state, empty_init, "Mera-Elzab", "Konin",  MACHINE_IS_SKELETON )
+COMP( 198?, konin, 0,      0,      konin,   konin, konin_state, empty_init, "Mera-Elzab", "Konin",  MACHINE_IS_SKELETON | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/konmedal68k.cpp mame-0.224+dfsg.1/src/mame/drivers/konmedal68k.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/konmedal68k.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/konmedal68k.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -50,6 +50,11 @@
 	void kzaurus(machine_config &config);
 	void koropens(machine_config &config);
 
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	virtual void video_start() override;
+
 private:
 	uint32_t screen_update_konmedal68k(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	void fill_backcolor(bitmap_ind16 &bitmap, const rectangle &cliprect, int pen_idx, int mode);
@@ -96,10 +101,6 @@
 	void kzaurus_main(address_map &map);
 	void koropens_main(address_map &map);
 
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-	virtual void video_start() override;
-
 	static constexpr int NUM_LAYERS = 4;
 
 	required_device<cpu_device> m_maincpu;
@@ -325,6 +326,8 @@
 
 void konmedal68k_state::machine_start()
 {
+	save_item(NAME(m_control));
+	save_item(NAME(m_control2));
 }
 
 void konmedal68k_state::machine_reset()
@@ -442,8 +445,22 @@
 	ROM_LOAD( "841-a02-4f.bin", 0x080000, 0x080000, CRC(685c1c10) SHA1(9884940df8c079e8129fc8d870f90e5b7987e6f4) )
 ROM_END
 
-GAME( 1995, kzaurus, 0, kzaurus, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Pittanko Zaurus", MACHINE_IMPERFECT_GRAPHICS )
+ROM_START( dobouchn )
+	ROM_REGION( 0x80000, "maincpu", 0 )
+	ROM_LOAD16_WORD_SWAP( "640-a05-2n.bin", 0x000000, 0x080000, CRC(7643dbc6) SHA1(3b55a782f04a741088b93954279b35c1c90af622) )
+
+	ROM_REGION( 0x100000, "k056832", 0 )
+	ROM_LOAD( "640-a06-14n.bin", 0x000000, 0x080000, CRC(c6c5016c) SHA1(ad0b5258e2c1d0ba95dfc0d8fc6332b524f2c1e2) )
+	ROM_LOAD( "640-a07-17n.bin", 0x080000, 0x080000, CRC(614fee32) SHA1(080fea72c0417752eb0a0b109b524d87379b2921) )
+
+	ROM_REGION( 0x200000, "ymz", 0 )
+	ROM_LOAD( "640-a01-2f.bin", 0x000000, 0x080000, CRC(326e2844) SHA1(62ce14ffe5d0a35c37c9a5a98c9c3a5df63d4512) )
+	ROM_LOAD( "640-a02-4f.bin", 0x080000, 0x080000, CRC(ab6593f5) SHA1(95907ee4a2cdf3bf27b7c0c1283b2bc36b868d9d) )
+ROM_END
+
+GAME( 1995, kzaurus,  0, kzaurus,  kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Pittanko Zaurus", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, dobouchn, 0, kzaurus,  kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Dobou-Chan (ver JAA)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
 GAME( 1997, koropens, 0, koropens, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Korokoro Pensuke", MACHINE_IMPERFECT_GRAPHICS )
 GAME( 1998, kattobas, 0, koropens, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Kattobase Power Pro Kun", MACHINE_IMPERFECT_GRAPHICS )
 GAME( 1999, pwrchanc, 0, koropens, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Powerful Chance", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1999, ymcapsul, 0, kzaurus, kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Yu-Gi-Oh Monster Capsule", MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1999, ymcapsul, 0, kzaurus,  kzaurus, konmedal68k_state, empty_init, ROT0, "Konami", "Yu-Gi-Oh Monster Capsule", MACHINE_IMPERFECT_GRAPHICS )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/konmedal.cpp mame-0.224+dfsg.1/src/mame/drivers/konmedal.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/konmedal.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/konmedal.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -632,7 +632,7 @@
 	TIMER(config, "scantimer").configure_scanline(FUNC(konmedal_state::konmedal_scanline), "screen", 0, 1);
 
 	NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_0);
-	m_nvram->set_custom_handler(FUNC(konmedal_state::medal_nvram_init));;
+	m_nvram->set_custom_handler(FUNC(konmedal_state::medal_nvram_init));
 	HOPPER(config, "hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH);
 
 	K053252(config, m_k053252, XTAL(14'318'181) / 2); // not verified
@@ -675,7 +675,7 @@
 	TIMER(config, "scantimer").configure_scanline(FUNC(konmedal_state::konmedal_scanline), "screen", 0, 1);
 
 	NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_0);
-	m_nvram->set_custom_handler(FUNC(konmedal_state::medal_nvram_init));;
+	m_nvram->set_custom_handler(FUNC(konmedal_state::medal_nvram_init));
 	HOPPER(config, "hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH);
 
 	K053252(config, m_k053252, XTAL(14'318'181) / 2); // not verified
@@ -820,7 +820,7 @@
 	TIMER(config, "scantimer").configure_scanline(FUNC(konmedal_state::shuri_scanline), "screen", 0, 1);
 
 	NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_0);
-	m_nvram->set_custom_handler(FUNC(konmedal_state::shuriboy_nvram_init));;
+	m_nvram->set_custom_handler(FUNC(konmedal_state::shuriboy_nvram_init));
 	HOPPER(config, "hopper", attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH);
 
 	/* video hardware */
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/korgws.cpp mame-0.224+dfsg.1/src/mame/drivers/korgws.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/korgws.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/korgws.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,105 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/****************************************************************************
+
+    Skeleton driver for Korg WaveStation vector synthesizer.
+
+****************************************************************************/
+
+#include "emu.h"
+#include "cpu/h16/hd641016.h"
+#include "cpu/m6502/m3745x.h"
+//#include "video/t6963c.h"
+
+class korgws_state : public driver_device
+{
+public:
+	korgws_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_ksp(*this, "ksp")
+	{
+	}
+
+	void korgws(machine_config &config);
+	void korgwssr(machine_config &config);
+
+private:
+	void h16_map(address_map &map);
+	void wssr_map(address_map &map);
+
+	required_device<hd641016_device> m_maincpu;
+	required_device<m3745x_device> m_ksp;
+};
+
+
+void korgws_state::h16_map(address_map &map)
+{
+	map(0x000000, 0x000007).rom().region("sysroms", 0); // reset vectors
+	map(0xc00000, 0xc3ffff).rom().region("sysroms", 0);
+}
+
+void korgws_state::wssr_map(address_map &map)
+{
+	map(0x000000, 0x000007).rom().region("sysroms", 0); // reset vectors
+	map(0xc00000, 0xc7ffff).rom().region("sysroms", 0);
+}
+
+
+static INPUT_PORTS_START(korgws)
+INPUT_PORTS_END
+
+void korgws_state::korgws(machine_config &config)
+{
+	HD641016(config, m_maincpu, 20_MHz_XTAL); // HD641016CP10
+	m_maincpu->set_addrmap(AS_PROGRAM, &korgws_state::h16_map);
+
+	M37450(config, m_ksp, 20_MHz_XTAL / 2).set_disable(); // M37450M4-233FP
+}
+
+void korgws_state::korgwssr(machine_config &config)
+{
+	korgws(config);
+	m_maincpu->set_addrmap(AS_PROGRAM, &korgws_state::wssr_map);
+}
+
+ROM_START(korgwsex)
+	ROM_REGION16_BE(0x40000, "sysroms", 0) // original EPROM type is NEC D27C1000A-12
+	ROM_LOAD16_BYTE("wsex_319_u18.bin", 0x00000, 0x20000, CRC(623eba63) SHA1(5c5e0842d74a9fefbdea01817325a3349f6f9dd6))
+	ROM_LOAD16_BYTE("wsex_319_u19.bin", 0x00001, 0x20000, CRC(c7b00f02) SHA1(196e4e403cbae728ec21d27d7b5762963e559028))
+
+	ROM_REGION(0x2000, "ksp", 0)
+	ROM_LOAD("m37450m4-233fp.ic34", 0x0000, 0x2000, NO_DUMP)
+
+	ROM_REGION(0x200000, "exroms", 0)
+	ROM_LOAD("ws3p7.bin", 0x000000, 0x80000, CRC(ac2e21e3) SHA1(57cd4701a5ca91a74536d7f7ead4074cfe605607))
+	ROM_LOAD("ws3p8.bin", 0x080000, 0x80000, CRC(7480bacf) SHA1(8d6e61c11ba909767413df2cae09259e6d8b1476))
+	ROM_LOAD16_BYTE("ws3p9.bin", 0x100000, 0x80000, CRC(80a23b7b) SHA1(10b1831b1c2d5d63dd9f4e74cfcfb73c2862f59e))
+	ROM_LOAD16_BYTE("ws4p0.bin", 0x100001, 0x80000, CRC(adf239cf) SHA1(a2236f1b0f63c3f854f8ec8751aeb9e167ea0f47))
+ROM_END
+
+ROM_START(korgwsad)
+	ROM_REGION16_BE(0x40000, "sysroms", 0)
+	ROM_SYSTEM_BIOS(0, "v125", "v1.25 Firmware")
+	ROMX_LOAD("wsad_1p25_910205l.ic41", 0x00000, 0x20000, CRC(22e5631e) SHA1(ea51e2f2e9effc3985d547d60b109c40e93d4d33), ROM_BIOS(0) | ROM_SKIP(1)) // 27C1000-15
+	ROMX_LOAD("wsad_1p25_910305r.ic40", 0x00001, 0x20000, CRC(6a201cbe) SHA1(ee4194baec787d112795b2f34fb21d752c592179), ROM_BIOS(0) | ROM_SKIP(1)) // MBM27C1000-15z
+	ROM_SYSTEM_BIOS(1, "v118", "v1.18 Firmware")
+	ROMX_LOAD("wsad_118_ic204", 0x00000, 0x20000, CRC(ee3fd19e) SHA1(726c7c3cc201d3360d6274118c13871f8aa46fbd), ROM_BIOS(1) | ROM_SKIP(1))
+	ROMX_LOAD("wsad_118_ic304", 0x00001, 0x20000, CRC(4ad559a6) SHA1(f0db05586e7c7be0ce93edd1e07e83d27b69b661), ROM_BIOS(1) | ROM_SKIP(1))
+
+	ROM_REGION(0x2000, "ksp", 0)
+	ROM_LOAD("m37450m4-233fp.bin", 0x0000, 0x2000, NO_DUMP)
+ROM_END
+
+ROM_START(korgwssr)
+	ROM_REGION16_BE(0x80000, "sysroms", 0)
+	ROM_LOAD16_BYTE("920305.ic22", 0x00000, 0x40000, CRC(8307a5da) SHA1(31ce491afb74ac1dfa20ae7320b8d1370fa93698))
+	ROM_LOAD16_BYTE("920405.ic23", 0x00001, 0x40000, CRC(2d367253) SHA1(c0f8a104a036dd39d220491cc15713158ab3d62a))
+
+	ROM_REGION(0x2000, "ksp", 0)
+	ROM_LOAD("m37450m4-233fp.bin", 0x0000, 0x2000, NO_DUMP)
+ROM_END
+
+SYST(1992, korgwsex, 0, 0, korgws,   korgws, korgws_state, empty_init, "Korg", "WaveStation EX", MACHINE_IS_SKELETON)
+SYST(1991, korgwsad, 0, 0, korgws,   korgws, korgws_state, empty_init, "Korg", "WaveStation A/D", MACHINE_IS_SKELETON)
+SYST(1992, korgwssr, 0, 0, korgwssr, korgws, korgws_state, empty_init, "Korg", "WaveStation SR", MACHINE_IS_SKELETON)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/kurukuru.cpp mame-0.224+dfsg.1/src/mame/drivers/kurukuru.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/kurukuru.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/kurukuru.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -412,6 +412,10 @@
 	void ppj(machine_config &config);
 	void kurukuru(machine_config &config);
 
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
 private:
 	required_device<cpu_device> m_maincpu;
 	required_device<cpu_device> m_audiocpu;
@@ -430,8 +434,6 @@
 	void ym2149_aout_w(uint8_t data);
 	void ym2149_bout_w(uint8_t data);
 
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
 	DECLARE_WRITE_LINE_MEMBER(kurukuru_msm5205_vck);
 	void kurukuru_audio_io(address_map &map);
 	void kurukuru_audio_map(address_map &map);
@@ -540,7 +542,7 @@
 void kurukuru_state::ppj_map(address_map &map)
 {
 	map(0x0000, 0x5fff).rom();
-	map(0x6000, 0xdfff).bankr("bank1");
+	map(0x6000, 0xdfff).bankr(m_bank1);
 	map(0xe000, 0xffff).ram().share("nvram");
 }
 
@@ -567,7 +569,7 @@
  13h  W -->                /
 
  30h  W --> soundlatch...
- 40h R  --> (very begining) seems DSW1
+ 40h R  --> (very beginning) seems DSW1
  50h  W --> Output port (counters)
  60h R  --> Input port
  70h R  --> Input port
@@ -645,7 +647,7 @@
   50h R-  --> adpcm irq ack
 */
 
-/* YM2149 ports */
+// YM2149 ports
 void kurukuru_state::ym2149_aout_w(uint8_t data)
 {
 	logerror("YM2149: Port A out: %02X\n", data);
@@ -830,6 +832,8 @@
 void kurukuru_state::machine_start()
 {
 	m_bank1->configure_entries(0, 8, memregion("user1")->base(), 0x8000);
+
+	save_item(NAME(m_adpcm_data));
 }
 
 void kurukuru_state::machine_reset()
@@ -842,7 +846,7 @@
 
 void kurukuru_state::kurukuru(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	Z80(config, m_maincpu, CPU_CLOCK);
 	m_maincpu->set_addrmap(AS_PROGRAM, &kurukuru_state::kurukuru_map);
 	m_maincpu->set_addrmap(AS_IO, &kurukuru_state::kurukuru_io);
@@ -854,7 +858,7 @@
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
 
-	/* video hardware */
+	// video hardware
 	v9938_device &v9938(V9938(config, "v9938", MAIN_CLOCK));
 	v9938.set_screen_ntsc("screen");
 	v9938.set_vram_size(VDP_MEM);
@@ -863,7 +867,7 @@
 
 	TICKET_DISPENSER(config, "hopper", attotime::from_msec(HOPPER_PULSE), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_HIGH);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 
 	GENERIC_LATCH_8(config, "soundlatch").data_pending_callback().set(m_soundirq, FUNC(rst_neg_buffer_device::rst28_w));
@@ -881,7 +885,7 @@
 
 	MSM5205(config, m_adpcm, M5205_CLOCK);
 	m_adpcm->vck_legacy_callback().set(FUNC(kurukuru_state::kurukuru_msm5205_vck));
-	m_adpcm->set_prescaler_selector(msm5205_device::S48_4B);    /* changed on the fly */
+	m_adpcm->set_prescaler_selector(msm5205_device::S48_4B);    // changed on the fly
 	m_adpcm->add_route(ALL_OUTPUTS, "mono", 0.80);
 }
 
@@ -889,7 +893,7 @@
 {
 	kurukuru(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &kurukuru_state::ppj_map);
 	m_maincpu->set_addrmap(AS_IO, &kurukuru_state::ppj_io);
 
@@ -958,9 +962,9 @@
 *                              Game Drivers                                *
 ***************************************************************************/
 
-//    YEAR  NAME      PARENT  MACHINE   INPUT     STATE           INIT        dROT    COMPANY                   FULLNAME                        FLAGS
-GAME( 1990, kurukuru, 0,      kurukuru, kurukuru, kurukuru_state, empty_init, ROT0, "Success / Taiyo Jidoki", "Kuru Kuru Pyon Pyon (Japan)",   0 )
-GAME( 1991, ppj,      0,      ppj,      ppj,      kurukuru_state, empty_init, ROT0, "Success / Taiyo Jidoki", "Pyon Pyon Jump (V1.40, Japan)", 0 )
+//    YEAR  NAME      PARENT  MACHINE   INPUT     STATE           INIT        ROT   COMPANY                   FULLNAME                         FLAGS
+GAME( 1990, kurukuru, 0,      kurukuru, kurukuru, kurukuru_state, empty_init, ROT0, "Success / Taiyo Jidoki", "Kuru Kuru Pyon Pyon (Japan)",   MACHINE_SUPPORTS_SAVE )
+GAME( 1991, ppj,      0,      ppj,      ppj,      kurukuru_state, empty_init, ROT0, "Success / Taiyo Jidoki", "Pyon Pyon Jump (V1.40, Japan)", MACHINE_SUPPORTS_SAVE )
 
 // unemulated....
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/lee1220.cpp mame-0.224+dfsg.1/src/mame/drivers/lee1220.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/lee1220.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/lee1220.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,146 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/****************************************************************************
+
+    Skeleton driver for Lee Data 1220 terminal (IBM 3278-compatible).
+
+****************************************************************************/
+
+#include "emu.h"
+#include "cpu/i8085/i8085.h"
+#include "cpu/mcs48/mcs48.h"
+#include "machine/am9517a.h"
+#include "machine/i8251.h"
+#include "machine/pit8253.h"
+//#include "machine/wd1933.h"
+#include "video/mc6845.h"
+#include "screen.h"
+
+#include <algorithm>
+
+
+class lee1220_state : public driver_device
+{
+public:
+	lee1220_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_crtc(*this, "crtc")
+	{
+	}
+
+	void lee1220(machine_config &config);
+
+protected:
+	virtual void machine_start() override;
+
+private:
+	MC6845_UPDATE_ROW(update_row);
+
+	u8 sdlc_r(offs_t offset);
+	void sdlc_w(offs_t offset, u8 data);
+	u8 c0_r();
+
+	void mem_map(address_map &map);
+	void io_map(address_map &map);
+
+	required_device<cpu_device> m_maincpu;
+	//required_device<wd1933_device> m_sdlc;
+	required_device<hd6845s_device> m_crtc;
+
+	u8 m_sdlc_reg[6];
+};
+
+void lee1220_state::machine_start()
+{
+	std::fill_n(&m_sdlc_reg[0], 6, 0);
+	save_item(NAME(m_sdlc_reg));
+}
+
+MC6845_UPDATE_ROW(lee1220_state::update_row)
+{
+}
+
+
+u8 lee1220_state::sdlc_r(offs_t offset)
+{
+	return m_sdlc_reg[offset]; //m_sdlc->read(~offset & 7);
+}
+
+void lee1220_state::sdlc_w(offs_t offset, u8 data)
+{
+	logerror("%s: Writing %02X to WD1933 register %d\n", machine().describe_context(), data, offset);
+	m_sdlc_reg[offset] = data;
+	//m_sdlc->write(~offset & 7, ~data);
+}
+
+u8 lee1220_state::c0_r()
+{
+	return 0;
+}
+
+void lee1220_state::mem_map(address_map &map)
+{
+	map(0x0000, 0x2fff).rom().region("program", 0);
+	map(0x4000, 0x4fff).ram();
+	map(0x7800, 0x7fff).ram();
+	map(0x8000, 0xbfff).ram();
+}
+
+void lee1220_state::io_map(address_map &map)
+{
+	map(0x80, 0x8f).rw("dmac", FUNC(am9517a_device::read), FUNC(am9517a_device::write));
+	map(0x90, 0x95).rw(FUNC(lee1220_state::sdlc_r), FUNC(lee1220_state::sdlc_w));
+	map(0xa0, 0xa0).w("crtc", FUNC(hd6845s_device::address_w));
+	map(0xa1, 0xa1).w("crtc", FUNC(hd6845s_device::register_w));
+	map(0xb0, 0xb1).rw("usart", FUNC(i8251_device::read), FUNC(i8251_device::write));
+	map(0xc0, 0xc0).r(FUNC(lee1220_state::c0_r));
+	map(0xd0, 0xd3).w("pit", FUNC(pit8253_device::write));
+}
+
+static INPUT_PORTS_START(lee1220)
+INPUT_PORTS_END
+
+void lee1220_state::lee1220(machine_config &config)
+{
+	I8085A(config, m_maincpu, 10'000'000); // Intel P8085AH-2
+	m_maincpu->set_addrmap(AS_PROGRAM, &lee1220_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &lee1220_state::io_map);
+
+	AM9517A(config, "dmac", 5'000'000); // Intel P8237A-5
+
+	I8748(config, "kbdmcu", 5.9904_MHz_XTAL);
+
+	//WD1933(config, m_sdlc); // WDC WD1933PL-11
+
+	i8251_device &usart(I8251(config, "usart", 0)); // NEC D8251AC
+	usart.rxrdy_handler().set_inputline(m_maincpu, I8085_RST55_LINE);
+
+	PIT8253(config, "pit"); // Intel D8253-5
+
+	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
+	screen.set_color(rgb_t::green());
+	screen.set_raw(28'944'000, 1152, 0, 960, 420, 0, 400);
+	screen.set_screen_update(m_crtc, FUNC(hd6845s_device::screen_update));
+
+	HD6845S(config, m_crtc, 2'412'000); // Hitachi HD46505SP/HD6845SP
+	m_crtc->set_screen("screen");
+	m_crtc->set_show_border_area(false);
+	m_crtc->set_char_width(12);
+	m_crtc->set_update_row_callback(FUNC(lee1220_state::update_row));
+}
+
+// Main board XTALs: X1 = 28.944 MHz, X2 = 47.46816 MHz
+// TTL daughterboard XTAL: X1 = 5.0688 MHz
+// Keyboard XTAL: #20 = 5.9904 MHz
+ROM_START(lee1220)
+	ROM_REGION(0x3000, "program", 0)
+	ROM_LOAD("13260303.u21", 0x0000, 0x1000, CRC(28692f78) SHA1(60957e773cb4350d82b02db8f741bd32a43365f1))
+	ROM_LOAD("13260403.u22", 0x1000, 0x1000, CRC(3c54a251) SHA1(8d2849a2590be5cf765d26ff80a170b263a4b080))
+	ROM_LOAD("13260503.u23", 0x2000, 0x1000, CRC(0872e674) SHA1(24d07a2cfccf03e90334daea810fe0e7c533e5ec))
+
+	ROM_REGION(0x400, "kbdmcu", 0)
+	ROM_LOAD("03278_d8748.2", 0x000, 0x400, CRC(a63ce4d8) SHA1(a713f3aae5e9096a627fab13573eee2170b42b1a))
+ROM_END
+
+COMP(1983, lee1220, 0, 0, lee1220, lee1220, lee1220_state, empty_init, "Lee Data", "1220 Display Terminal", MACHINE_IS_SKELETON)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/leland.cpp mame-0.224+dfsg.1/src/mame/drivers/leland.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/leland.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/leland.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1344,19 +1344,19 @@
 */
 ROM_START( alleymas )
 	ROM_REGION( 0x28000, "master", 0 )
-	ROM_LOAD( "101",   0x00000, 0x02000, CRC(4273e260) SHA1(1b2a726e0a6fe6a60d447c987471a6e1a9e78479) )
-	ROM_LOAD( "102",   0x10000, 0x02000, CRC(eb6575aa) SHA1(0876c83d13565937610b5af52aacee1ae6fd59ba) )
-	ROM_CONTINUE(      0x1c000, 0x02000 )
-	ROM_LOAD( "103",   0x12000, 0x02000, CRC(cc9d778c) SHA1(293ac75d45be4531af1982c0b99597d18bab6a05) )
-	ROM_CONTINUE(      0x1e000, 0x02000 )
-	ROM_LOAD( "104",   0x14000, 0x02000, CRC(8edb129b) SHA1(f1268617cf18c1c3fd5fb324e882db14cced3d8c) )
-	ROM_CONTINUE(      0x20000, 0x02000 )
-	ROM_LOAD( "105",   0x16000, 0x02000, CRC(a342dc8e) SHA1(9a6657d66fba5cb1ae3d11e940467b85d47472ea) )
-	ROM_CONTINUE(      0x22000, 0x02000 )
-	ROM_LOAD( "106",   0x18000, 0x02000, CRC(b396c254) SHA1(06b118ae07d3018209b7ae831f7667cc23d23abd) )
-	ROM_CONTINUE(      0x24000, 0x02000 )
-	ROM_LOAD( "107",   0x1a000, 0x02000, CRC(3ca13e8c) SHA1(34e00a17ce305c8327674bd79347f01cda14bc8b) )
-	ROM_CONTINUE(      0x26000, 0x02000 )
+	ROM_LOAD( "02-13509-00.u101",  0x00000, 0x02000, CRC(4273e260) SHA1(1b2a726e0a6fe6a60d447c987471a6e1a9e78479) )
+	ROM_LOAD( "02-13510-00.u102",  0x10000, 0x02000, CRC(eb6575aa) SHA1(0876c83d13565937610b5af52aacee1ae6fd59ba) )
+	ROM_CONTINUE(                  0x1c000, 0x02000 )
+	ROM_LOAD( "02-13511-0x.u103",  0x12000, 0x02000, CRC(cc9d778c) SHA1(293ac75d45be4531af1982c0b99597d18bab6a05) ) /* Not verified if rev "00" or rev "01" */
+	ROM_CONTINUE(                  0x1e000, 0x02000 )
+	ROM_LOAD( "02-13512-00.u104",  0x14000, 0x02000, CRC(8edb129b) SHA1(f1268617cf18c1c3fd5fb324e882db14cced3d8c) )
+	ROM_CONTINUE(                  0x20000, 0x02000 )
+	ROM_LOAD( "02-13513-00.u105",  0x16000, 0x02000, CRC(a342dc8e) SHA1(9a6657d66fba5cb1ae3d11e940467b85d47472ea) )
+	ROM_CONTINUE(                  0x22000, 0x02000 )
+	ROM_LOAD( "02-13514-00.u106",  0x18000, 0x02000, CRC(b396c254) SHA1(06b118ae07d3018209b7ae831f7667cc23d23abd) )
+	ROM_CONTINUE(                  0x24000, 0x02000 )
+	ROM_LOAD( "02-13515-00.u107",  0x1a000, 0x02000, CRC(3ca13e8c) SHA1(34e00a17ce305c8327674bd79347f01cda14bc8b) )
+	ROM_CONTINUE(                  0x26000, 0x02000 )
 
 	ROM_REGION( 0x28000, "slave", 0 )
 	ROM_LOAD( "02-13516-00.u003",  0x00000, 0x02000, CRC(3fee63ae) SHA1(519fe4981dc2c6d025fc2f27af6682103c99dd5e) )
@@ -1444,38 +1444,55 @@
 ROM_END
 
 
+/*
+For Danger Zone, the label format is:
+------------------------
+|(C)1986 Cinematronics | -> Copyright & Manufacturer
+|P/N 03-13823-00       | -> Part number with revision
+|DANGER ZONE      U012 | -> Game name & ROM PCB location
+------------------------
+
+NOTE: Only top board program ROMs were "03-" all other part numbers were "02-"
+
+For Danger Zone revision 2, only 13823 changed: it's label format is:
+------------------------
+|(C)1987Leland Corp.   | -> Copyright & Manufacturer
+|P/N 03-13823-02       | -> Part number with revision
+|D-ZONE chk=0208  U012t| -> Game name & ROM PCB location
+------------------------
+*/
 ROM_START( dangerz )
 	ROM_REGION( 0x20000, "master", 0 )
-	ROM_LOAD( "13823.12t",   0x00000, 0x10000, CRC(31604634) SHA1(0b3d4fea91faf41519888954a21a82827eae6e2a) )
-	ROM_LOAD( "13824.13t",   0x10000, 0x10000, CRC(381026c6) SHA1(16c810d162789154e3b5ad38545855370f73b679) )
+	ROM_LOAD( "03-13823-02.u012t",   0x00000, 0x10000, CRC(31604634) SHA1(0b3d4fea91faf41519888954a21a82827eae6e2a) ) /* This ROM's checksum is 0208 */
+	ROM_LOAD( "03-13824-00.u013",    0x10000, 0x10000, CRC(381026c6) SHA1(16c810d162789154e3b5ad38545855370f73b679) ) /* 2 PCBs verified as U013 and not "U013T" */
 
 	ROM_REGION( 0x28000, "slave", 0 )
-	ROM_LOAD( "13818.3",   0x00000, 0x04000, CRC(71863c5b) SHA1(18fdae631d0990815b07934d9cce73a41df9152f) )
-	ROM_LOAD( "13817.4",   0x10000, 0x02000, CRC(924bead3) SHA1(ba8dd39db9992b426968e5584c94a8b5ed7c0535) )
-	ROM_CONTINUE(          0x1c000, 0x02000 )
-	ROM_LOAD( "13818.5",   0x12000, 0x02000, CRC(403bdfea) SHA1(71b959c674e7583670e638ebbd44c75784f565c8) )
-	ROM_CONTINUE(          0x1e000, 0x02000 )
-	ROM_LOAD( "13819.6",   0x14000, 0x02000, CRC(1fee5f10) SHA1(0aee1e139e13528ec328a8a949f576bfca1892a1) )
-	ROM_CONTINUE(          0x20000, 0x02000 )
-	ROM_LOAD( "13820.7",   0x16000, 0x02000, CRC(42657a1e) SHA1(d5bb6b6a4bc121fea39809b3b2c891345b12f4d7) )
-	ROM_CONTINUE(          0x22000, 0x02000 )
-	ROM_LOAD( "13821.8",   0x18000, 0x02000, CRC(92f3e006) SHA1(134a2412ddc700473b70aec6331b1a65db3c7e29) )
-	ROM_CONTINUE(          0x24000, 0x02000 )
+	ROM_LOAD( "02-13816-00.u003",   0x00000, 0x04000, CRC(71863c5b) SHA1(18fdae631d0990815b07934d9cce73a41df9152f) ) /* part numbers here down start with "02", unlike the program ROMs */
+	ROM_LOAD( "02-13817-00.u004",   0x10000, 0x02000, CRC(924bead3) SHA1(ba8dd39db9992b426968e5584c94a8b5ed7c0535) )
+	ROM_CONTINUE(                   0x1c000, 0x02000 )
+	ROM_LOAD( "02-13818-00.u005",   0x12000, 0x02000, CRC(403bdfea) SHA1(71b959c674e7583670e638ebbd44c75784f565c8) )
+	ROM_CONTINUE(                   0x1e000, 0x02000 )
+	ROM_LOAD( "02-13819-00.u006",   0x14000, 0x02000, CRC(1fee5f10) SHA1(0aee1e139e13528ec328a8a949f576bfca1892a1) )
+	ROM_CONTINUE(                   0x20000, 0x02000 )
+	ROM_LOAD( "02-13820-00.u007",   0x16000, 0x02000, CRC(42657a1e) SHA1(d5bb6b6a4bc121fea39809b3b2c891345b12f4d7) )
+	ROM_CONTINUE(                   0x22000, 0x02000 )
+	ROM_LOAD( "02-13821-00.u008",   0x18000, 0x02000, CRC(92f3e006) SHA1(134a2412ddc700473b70aec6331b1a65db3c7e29) )
+	ROM_CONTINUE(                   0x24000, 0x02000 )
 
 	ROM_REGION( 0x0c000, "bg_gfx", 0 )
-	ROM_LOAD( "13801.93", 0x00000, 0x04000, CRC(f9ff55ec) SHA1(2eab55b3708def97f22a1f13d1faa0bfe19c18e9) )
-	ROM_LOAD( "13802.94", 0x04000, 0x04000, CRC(d4adbcbb) SHA1(dfd427d5a0db309cc7e056857c3b63a1b6e7769b) )
-	ROM_LOAD( "13803.95", 0x08000, 0x04000, CRC(9178ed76) SHA1(f05568eea53c38f46b16217e63b73194d3a3c500) )
+	ROM_LOAD( "02-13801-00.u093", 0x00000, 0x04000, CRC(f9ff55ec) SHA1(2eab55b3708def97f22a1f13d1faa0bfe19c18e9) )
+	ROM_LOAD( "02-13802-00.u094", 0x04000, 0x04000, CRC(d4adbcbb) SHA1(dfd427d5a0db309cc7e056857c3b63a1b6e7769b) )
+	ROM_LOAD( "02-13803-00.u095", 0x08000, 0x04000, CRC(9178ed76) SHA1(f05568eea53c38f46b16217e63b73194d3a3c500) )
 
 	ROM_REGION( 0x20000, "bg_prom", 0 )   /* Ordering: 70/92/69/91/68/90/67/89 */
-	ROM_LOAD( "13809.70",  0x00000, 0x4000, CRC(e44eb9f5) SHA1(f15e4262eb96989cbd13a4cbf0b4a0ab390005aa) )
-	ROM_LOAD( "13804.92",  0x04000, 0x4000, CRC(6c23f1a5) SHA1(0de32ba7b5796bfe37b142fb892beb223f27c381) )
-	ROM_LOAD( "13805.69",  0x08000, 0x4000, CRC(e9c9f38b) SHA1(6a03cf9ab4d06f05d4fb846f14eab22467c79661) )
-	ROM_LOAD( "13808.91",  0x0c000, 0x4000, CRC(035534ad) SHA1(e4759992c479d039d6810f129fa2267e0e9527a2) )
-	ROM_LOAD( "13806.68",  0x10000, 0x4000, CRC(2dbd64d2) SHA1(eaa015c92daa9562f58e5ed1d153ecd3f1403546) )
-	ROM_LOAD( "13808.90",  0x14000, 0x4000, CRC(d5b4985d) SHA1(d9a5e331f6cf9b4abf9f5d739fadf0d6216fe994) )
-	ROM_LOAD( "13822.67",  0x18000, 0x4000, CRC(00ff3033) SHA1(ca183f28cb4732ebfc41b6c1651405fee28a9ec6) )
-	ROM_LOAD( "13810.89",  0x1c000, 0x4000, CRC(4f645973) SHA1(94bf12db53dc08eb917c17f1ba0d5a40922ff22c) )
+	ROM_LOAD( "02-13809-00.u070",  0x00000, 0x4000, CRC(e44eb9f5) SHA1(f15e4262eb96989cbd13a4cbf0b4a0ab390005aa) )
+	ROM_LOAD( "02-13804-00.u092",  0x04000, 0x4000, CRC(6c23f1a5) SHA1(0de32ba7b5796bfe37b142fb892beb223f27c381) )
+	ROM_LOAD( "02-13805-00.u069",  0x08000, 0x4000, CRC(e9c9f38b) SHA1(6a03cf9ab4d06f05d4fb846f14eab22467c79661) )
+	ROM_LOAD( "02-13808-00.u091",  0x0c000, 0x4000, CRC(035534ad) SHA1(e4759992c479d039d6810f129fa2267e0e9527a2) )
+	ROM_LOAD( "02-13806-00.u068",  0x10000, 0x4000, CRC(2dbd64d2) SHA1(eaa015c92daa9562f58e5ed1d153ecd3f1403546) )
+	ROM_LOAD( "02-13808-00.u090",  0x14000, 0x4000, CRC(d5b4985d) SHA1(d9a5e331f6cf9b4abf9f5d739fadf0d6216fe994) )
+	ROM_LOAD( "02-13822-00.u067",  0x18000, 0x4000, CRC(00ff3033) SHA1(ca183f28cb4732ebfc41b6c1651405fee28a9ec6) )
+	ROM_LOAD( "02-13810-00.u089",  0x1c000, 0x4000, CRC(4f645973) SHA1(94bf12db53dc08eb917c17f1ba0d5a40922ff22c) )
 
 	ROM_REGION16_BE( 0x80, "eeprom", 0 )
 	ROM_LOAD16_WORD( "eeprom-dangerz.bin", 0x0000, 0x0080, CRC(db2c632b) SHA1(0dda0895145ffab414b5ce6af6636176c19659e3) )
@@ -1628,12 +1645,12 @@
 	ROM_LOAD( "strkzone.u107",  0x1a000, 0x02000, CRC(1b4b6c2d) SHA1(9cd5e5ce7bc3088f14b6cbbd7c2d5b5e69a7bc11) )
 	ROM_CONTINUE(               0x26000, 0x02000 )
 	/* Extra banks ( referred to as the "top" board) */
-	ROM_LOAD( "strkzone.u2t",   0x28000, 0x02000, CRC(8e0af06f) SHA1(ad277433a2c97c388e626a0ce9119466dff85d37) )
-	ROM_RELOAD(                 0x30000, 0x02000 )
-	ROM_LOAD( "strkzone.u3t",   0x2a000, 0x02000, CRC(909d35f3) SHA1(2ec51b1591990cf13b71d6c343bfe9540d3c2b69) )
-	ROM_RELOAD(                 0x32000, 0x02000 )
-	ROM_LOAD( "strkzone.u4t",   0x2c000, 0x02000, CRC(9b1e72e9) SHA1(09609835b6951d3dc271e48c8bf91cbff99b6f50) )
-	ROM_CONTINUE(               0x34000, 0x02000 )
+	ROM_LOAD( "03-15313-01.u2t",   0x28000, 0x02000, CRC(8e0af06f) SHA1(ad277433a2c97c388e626a0ce9119466dff85d37) )
+	ROM_RELOAD(                    0x30000, 0x02000 )
+	ROM_LOAD( "03-15314-01.u3t",   0x2a000, 0x02000, CRC(909d35f3) SHA1(2ec51b1591990cf13b71d6c343bfe9540d3c2b69) )
+	ROM_RELOAD(                    0x32000, 0x02000 )
+	ROM_LOAD( "03-15027-01.u4t",   0x2c000, 0x02000, CRC(9b1e72e9) SHA1(09609835b6951d3dc271e48c8bf91cbff99b6f50) )
+	ROM_CONTINUE(                  0x34000, 0x02000 )
 
 	ROM_REGION( 0x28000, "slave", 0 )
 	ROM_LOAD( "strkzone.u3",  0x00000, 0x02000, CRC(40258fbe) SHA1(4a68dbf050455bf15fadef20f615ab1de194a1c2) )
@@ -1657,12 +1674,12 @@
 
 	ROM_REGION( 0x20000, "bg_prom", 0 )   /* Ordering: 70/92/69/91/68/90/67/89 */
 	/* U70 = Empty */
-	ROM_LOAD( "strkzone.u92",  0x04000, 0x4000, CRC(2508a9ad) SHA1(f0a56d1b8dbe57b16dc1b3d21980149bbdcd0068) )
-	ROM_LOAD( "strkzone.u69",  0x08000, 0x4000, CRC(b123a28e) SHA1(8d244db422aee9117e901e7d150cdefcbf96dd53) )
+	ROM_LOAD( "strkzone.u92",     0x04000, 0x4000, CRC(2508a9ad) SHA1(f0a56d1b8dbe57b16dc1b3d21980149bbdcd0068) )
+	ROM_LOAD( "03-15009-01.u69",  0x08000, 0x4000, CRC(b123a28e) SHA1(8d244db422aee9117e901e7d150cdefcbf96dd53) )
 	/* U91 = Empty */
-	ROM_LOAD( "strkzone.u68",  0x10000, 0x4000, CRC(a1a51383) SHA1(6b734c5d82fb8159768f8849a26f5569cab2f074) )
-	ROM_LOAD( "strkzone.u90",  0x14000, 0x4000, CRC(ef01d997) SHA1(693bc42b0aaa436f2734efbe2cfb8c98ad4858c6) ) /* 03-15008-01 ?? */
-	ROM_LOAD( "strkzone.u67",  0x18000, 0x4000, CRC(976334e6) SHA1(5b2534f5ba697bd5bad0aef9cefbb7d1c421c06b) ) /* 03-15007-01 ?? */
+	ROM_LOAD( "03-15008-01.u68",  0x10000, 0x4000, CRC(a1a51383) SHA1(6b734c5d82fb8159768f8849a26f5569cab2f074) )
+	ROM_LOAD( "strkzone.u90",     0x14000, 0x4000, CRC(ef01d997) SHA1(693bc42b0aaa436f2734efbe2cfb8c98ad4858c6) )
+	ROM_LOAD( "03-15007-01.u67",  0x18000, 0x4000, CRC(976334e6) SHA1(5b2534f5ba697bd5bad0aef9cefbb7d1c421c06b) )
 	/* 89 = Empty */
 
 	ROM_REGION16_BE( 0x80, "eeprom", 0 )
@@ -1884,39 +1901,47 @@
 ROM_END
 
 
+/*
+Viper, the label format is:
+------------------------
+|(C)1988 Leland Corp.  | -> Copyright & Manufacturer
+|P/N 03-15616-03       | -> Part number with revision
+|VIPER           U48T  | -> Game name & ROM PCB location
+------------------------
+*/
 ROM_START( viper )
 	ROM_REGION( 0x20000, "master", 0 )
-	ROM_LOAD( "15617-03.u49t",   0x00000, 0x10000, CRC(7e4688a6) SHA1(282f98d22447b2f93d6f328a351ce1613a33069b) )
-	ROM_LOAD( "15616-03.u48t",   0x10000, 0x10000, CRC(3fe2f0bf) SHA1(2a1a7d1654e5f45a5b30374596865006e80928f5) )
+	ROM_LOAD( "03-15617-03.u49t",   0x00000, 0x10000, CRC(7e4688a6) SHA1(282f98d22447b2f93d6f328a351ce1613a33069b) )
+	ROM_LOAD( "03-15616-03.u48t",   0x10000, 0x10000, CRC(3fe2f0bf) SHA1(2a1a7d1654e5f45a5b30374596865006e80928f5) )
 
 	ROM_REGION( 0x80000, "slave", 0 )
-	ROM_LOAD( "15600-02.u3", 0x00000, 0x02000, CRC(0f57f68a) SHA1(2cb132eb41da5f8a90f83e54a6a8c00a62b66949) )
-	ROM_LOAD( "viper.u2t",   0x10000, 0x10000, CRC(4043d4ee) SHA1(70ebb98444f13a25cdcd8d31ee47a20af7df5613) )
-	ROM_LOAD( "viper.u3t",   0x20000, 0x10000, CRC(213bc02b) SHA1(53fadd81a0138525d3d39fd9c2ea258f90b2e6e7) )
-	ROM_LOAD( "viper.u4t",   0x30000, 0x10000, CRC(ce0b95b4) SHA1(1a322714ce1e9e5589da9966f2e684e9a2c22592) )
+	ROM_LOAD( "03-15600-02.u3",  0x00000, 0x02000, CRC(0f57f68a) SHA1(2cb132eb41da5f8a90f83e54a6a8c00a62b66949) )
+	ROM_LOAD( "03-15612-02.u2t", 0x10000, 0x10000, CRC(4043d4ee) SHA1(70ebb98444f13a25cdcd8d31ee47a20af7df5613) )
+	ROM_LOAD( "03-15613-02.u3t", 0x20000, 0x10000, CRC(213bc02b) SHA1(53fadd81a0138525d3d39fd9c2ea258f90b2e6e7) )
+	ROM_LOAD( "03-15614-02.u4t", 0x30000, 0x10000, CRC(ce0b95b4) SHA1(1a322714ce1e9e5589da9966f2e684e9a2c22592) )
 
 	ROM_REGION( 0x100000, "custom:audiocpu", 0 )
-	ROM_LOAD16_BYTE( "15620-02.u45t", 0x040001, 0x10000, CRC(7380ece1) SHA1(c131c80c67503785ba1ec5b31366cd72f0f7e0e3) )
-	ROM_LOAD16_BYTE( "15623-02.u62t", 0x040000, 0x10000, CRC(2921d8f9) SHA1(5ce6752ef3928b40263efdcd81fae376e2d86e36) )
-	ROM_LOAD16_BYTE( "15619-02.u44t", 0x060001, 0x10000, CRC(c8507cc2) SHA1(aae9f19b3bc6790a137d94e3c4bb3e61e8670b42) )
-	ROM_LOAD16_BYTE( "15622-02.u61t", 0x060000, 0x10000, CRC(32dfda37) SHA1(bbd643239add553e61735c2997bb4ffdbe67d9e1) )
-	ROM_LOAD16_BYTE( "15618-02.u43t", 0x0e0001, 0x10000, CRC(5562e0c3) SHA1(4c7b0cedc5adc4e24a1cd6010591205ddb16d554) )
-	ROM_LOAD16_BYTE( "15621-02.u60t", 0x0e0000, 0x10000, CRC(cb468f2b) SHA1(f37596c781b1d7c49d8f62d289c15a2ae0d752cc) )
+	ROM_LOAD16_BYTE( "03-15620-02.u45t", 0x040001, 0x10000, CRC(7380ece1) SHA1(c131c80c67503785ba1ec5b31366cd72f0f7e0e3) )
+	ROM_LOAD16_BYTE( "03-15623-02.u62t", 0x040000, 0x10000, CRC(2921d8f9) SHA1(5ce6752ef3928b40263efdcd81fae376e2d86e36) )
+	ROM_LOAD16_BYTE( "03-15619-02.u44t", 0x060001, 0x10000, CRC(c8507cc2) SHA1(aae9f19b3bc6790a137d94e3c4bb3e61e8670b42) )
+	ROM_LOAD16_BYTE( "03-15622-02.u61t", 0x060000, 0x10000, CRC(32dfda37) SHA1(bbd643239add553e61735c2997bb4ffdbe67d9e1) )
+	ROM_LOAD16_BYTE( "03-15618-02.u43t", 0x0e0001, 0x10000, CRC(5562e0c3) SHA1(4c7b0cedc5adc4e24a1cd6010591205ddb16d554) )
+	ROM_LOAD16_BYTE( "03-15621-02.u60t", 0x0e0000, 0x10000, CRC(cb468f2b) SHA1(f37596c781b1d7c49d8f62d289c15a2ae0d752cc) )
 
 	ROM_REGION( 0x0c000, "bg_gfx", 0 )
-	ROM_LOAD( "15609-01.u93", 0x00000, 0x04000, CRC(08ad92e9) SHA1(6eaffd58f03db3a67871ce7390b01754842e2574) )
-	ROM_LOAD( "15610-01.u94", 0x04000, 0x04000, CRC(d4e56dfb) SHA1(0fc83847b8629534b15f9366f197c87e3c81c61a) )
-	ROM_LOAD( "15611-01.u95", 0x08000, 0x04000, CRC(3a2c46fb) SHA1(e96849447852a9922e72f7f1908c76fea3c603c4) )
+	ROM_LOAD( "03-15609-01.u93", 0x00000, 0x04000, CRC(08ad92e9) SHA1(6eaffd58f03db3a67871ce7390b01754842e2574) )
+	ROM_LOAD( "03-15610-01.u94", 0x04000, 0x04000, CRC(d4e56dfb) SHA1(0fc83847b8629534b15f9366f197c87e3c81c61a) )
+	ROM_LOAD( "03-15611-01.u95", 0x08000, 0x04000, CRC(3a2c46fb) SHA1(e96849447852a9922e72f7f1908c76fea3c603c4) )
 
 	ROM_REGION( 0x20000, "bg_prom", 0 )   /* Ordering: 70/92/69/91/68/90/67/89 */
-	ROM_LOAD( "15604-01.u70",  0x00000, 0x4000, CRC(7e3b0cce) SHA1(d9002df27e3de28d40a9cfb081512526987377b2) )
-	ROM_LOAD( "15608-01.u92",  0x04000, 0x4000, CRC(a9bde0ef) SHA1(84f55bc62fc49ae0232ada2ac192c5c8a2519703) )
-	ROM_LOAD( "15603-01.u69",  0x08000, 0x4000, CRC(aecc9516) SHA1(513ae810d62d5df29a96a567a7c024f12c6837d5) )
-	ROM_LOAD( "15607-01.u91",  0x0c000, 0x4000, CRC(14f06f88) SHA1(7e76b5b7d74635dff2dd2245d345beee5c0ee46e) )
-	ROM_LOAD( "15602-01.u68",  0x10000, 0x4000, CRC(4ef613ad) SHA1(b08445056038fdef90bd9de0a4effdfd18f81e15) )
-	ROM_LOAD( "15606-01.u90",  0x14000, 0x4000, CRC(3c2e8e76) SHA1(f526240df82e14102854de8e391571f747dfa405) )
-	ROM_LOAD( "15601-01.u67",  0x18000, 0x4000, CRC(dc7006cd) SHA1(d828b9c7a43c1b37aa55d1c5891fe0744ea78595) )
-	ROM_LOAD( "15605-01.u89",  0x1c000, 0x4000, CRC(4aa9c788) SHA1(77095d7ce4949db3c39c19d131d2902e4099b6d4) )
+	ROM_LOAD( "03-15604-01.u70",  0x00000, 0x4000, CRC(7e3b0cce) SHA1(d9002df27e3de28d40a9cfb081512526987377b2) )
+	ROM_LOAD( "03-15608-01.u92",  0x04000, 0x4000, CRC(a9bde0ef) SHA1(84f55bc62fc49ae0232ada2ac192c5c8a2519703) )
+	ROM_LOAD( "03-15603-01.u69",  0x08000, 0x4000, CRC(aecc9516) SHA1(513ae810d62d5df29a96a567a7c024f12c6837d5) )
+	ROM_LOAD( "03-15607-01.u91",  0x0c000, 0x4000, CRC(14f06f88) SHA1(7e76b5b7d74635dff2dd2245d345beee5c0ee46e) )
+	ROM_LOAD( "03-15602-01.u68",  0x10000, 0x4000, CRC(4ef613ad) SHA1(b08445056038fdef90bd9de0a4effdfd18f81e15) )
+	ROM_LOAD( "03-15606-01.u90",  0x14000, 0x4000, CRC(3c2e8e76) SHA1(f526240df82e14102854de8e391571f747dfa405) )
+	ROM_LOAD( "03-15601-01.u67",  0x18000, 0x4000, CRC(dc7006cd) SHA1(d828b9c7a43c1b37aa55d1c5891fe0744ea78595) )
+	ROM_LOAD( "03-15605-01.u89",  0x1c000, 0x4000, CRC(4aa9c788) SHA1(77095d7ce4949db3c39c19d131d2902e4099b6d4) )
 
 	ROM_REGION16_BE( 0x80, "eeprom", 0 )
 	ROM_LOAD16_WORD( "eeprom-viper.bin", 0x0000, 0x0080, CRC(1c1e7a49) SHA1(3cc0fe501d86cf63de5ac812b8c63e20d9e73372) )
@@ -1930,7 +1955,8 @@
 |P/N 03-15618-03       | -> Part number with revision
 |TEAM QB         U58T  | -> Game name & ROM PCB location
 ------------------------
-*/ROM_START( teamqb )
+*/
+ROM_START( teamqb )
 	ROM_REGION( 0x20000, "master", 0 )
 	ROM_LOAD( "03-15618-03.u58t",   0x00000, 0x10000, CRC(b32568dc) SHA1(92fb8dd89cc7838129e7b106bc0e35107372904f) )
 	ROM_LOAD( "03-15619-03.u59t",   0x10000, 0x10000, CRC(40b3319f) SHA1(26c6e26cd440fc7e1ab5ee7536e17a1c00b83f44) )
@@ -3356,7 +3382,7 @@
 GAME( 1986, upyoural,   alleymas, leland,   upyoural,   leland_state, init_upyoural, ROT270, "Cinematronics", "Up Your Alley", 0 ) // prototype of Alley Master?
 
 /* odd master banks, small slave banks */
-GAME( 1986, dangerz,    0,        leland,   dangerz,    leland_state, init_dangerz,  ROT0,   "Cinematronics", "Danger Zone", 0 )
+GAME( 1986, dangerz,    0,        leland,   dangerz,    leland_state, init_dangerz,  ROT0,   "Cinematronics", "Danger Zone (rev 2)", 0 )
 
 /* small master banks + extra top board, small slave banks */
 GAME( 1987, basebal2,   0,        leland,   basebal2,   leland_state, init_basebal2, ROT0,   "Cinematronics", "Baseball: The Season II", 0 )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/lft_chiptune.cpp mame-0.224+dfsg.1/src/mame/drivers/lft_chiptune.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/lft_chiptune.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/lft_chiptune.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,97 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+/**********************************************************************
+
+ ATmega88-based chiptune players by Linus Åkesson and kryo
+
+**********************************************************************/
+
+#include "emu.h"
+#include "cpu/avr8/avr8.h"
+#include "sound/dac.h"
+#include "sound/volt_reg.h"
+#include "speaker.h"
+
+#define MASTER_CLOCK    8000000
+
+class lft_chiptune_state : public driver_device
+{
+public:
+	lft_chiptune_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_dac(*this, "dac")
+	{
+	}
+
+	void chiptune(machine_config &config);
+
+protected:
+	void prg_map(address_map &map);
+	void data_map(address_map &map);
+	void io_map(address_map &map);
+
+	required_device<avr8_device> m_maincpu;
+	required_device<dac_byte_interface> m_dac;
+};
+
+//**************************************************************************
+//  MEMORY
+//**************************************************************************
+
+void lft_chiptune_state::prg_map(address_map &map)
+{
+	map(0x0000, 0x1fff).rom();
+}
+
+void lft_chiptune_state::data_map(address_map &map)
+{
+	map(0x0100, 0x04ff).ram();
+}
+
+void lft_chiptune_state::io_map(address_map &map)
+{
+	map(AVR8_IO_PORTD, AVR8_IO_PORTD).w(m_dac, FUNC(dac_8bit_r2r_device::write));
+}
+
+//**************************************************************************
+//  MACHINE
+//**************************************************************************
+
+static INPUT_PORTS_START( empty_input )
+INPUT_PORTS_END
+
+void lft_chiptune_state::chiptune(machine_config &config)
+{
+	/* basic machine hardware */
+	ATMEGA88(config, m_maincpu, MASTER_CLOCK);
+	m_maincpu->set_addrmap(AS_PROGRAM, &lft_chiptune_state::prg_map);
+	m_maincpu->set_addrmap(AS_DATA, &lft_chiptune_state::data_map);
+	m_maincpu->set_addrmap(AS_IO, &lft_chiptune_state::io_map);
+	m_maincpu->set_eeprom_tag("eeprom");
+
+	/* sound hardware */
+	SPEAKER(config, "avr8").front_center();
+	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
+	vref.add_route(0, m_dac, 1.0, DAC_VREF_POS_INPUT);
+	vref.add_route(0, m_dac, -1.0, DAC_VREF_NEG_INPUT);
+	DAC_8BIT_R2R(config, m_dac, 0).add_route(0, "avr8", 0.9);
+}
+
+ROM_START( powernin )
+	ROM_REGION( 0x2000, "maincpu", 0 )
+	ROM_LOAD( "powernin.bin", 0x0000, 0x2000, CRC(67458936) SHA1(26a86846a24dd974723a66bea6c22baf51c7bec9) )
+	ROM_REGION( 0x200, "eeprom", 0 )
+	ROM_LOAD( "eeprom.raw", 0x0000, 0x0200, CRC(bd7bc39f) SHA1(9d0ac37bb3ec8c95990fd37a962a17a95ce97aa0) )
+ROM_END
+
+ROM_START( hwchiptn )
+	ROM_REGION( 0x2000, "maincpu", 0 )
+	ROM_LOAD( "hwchiptn.bin", 0x0000, 0x2000, CRC(0706eda8) SHA1(df227467bf4901978493efccaef6c4dfc32d5e62) )
+	ROM_REGION( 0x200, "eeprom", 0 )
+	ROM_LOAD( "eeprom.raw", 0x0000, 0x0200, CRC(bd7bc39f) SHA1(9d0ac37bb3ec8c95990fd37a962a17a95ce97aa0) )
+ROM_END
+
+/*   YEAR  NAME      PARENT  COMPAT  MACHINE     INPUT        CLASS               INIT        COMPANY                 FULLNAME */
+CONS(2007, hwchiptn, 0,      0,      chiptune,   empty_input, lft_chiptune_state, empty_init, u8"Linus Åkesson / kryo", "The Hardware Chiptune Project", 0)
+CONS(2009, powernin, 0,      0,      chiptune,   empty_input, lft_chiptune_state, empty_init, u8"Linus Åkesson", "Power Ninja Action Challenge", 0)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/lft.cpp mame-0.224+dfsg.1/src/mame/drivers/lft.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/lft.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/lft.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -45,7 +45,6 @@
 	void lft(machine_config &config);
 
 private:
-
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
 
@@ -129,7 +128,6 @@
 	ROM_IGNORE(0x1000)
 ROM_END
 
-
 /* Driver */
 
 //    YEAR  NAME     PARENT   COMPAT  MACHINE  INPUT  CLASS      INIT        COMPANY             FULLNAME                      FLAGS
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/lft_craft.cpp mame-0.224+dfsg.1/src/mame/drivers/lft_craft.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/lft_craft.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/lft_craft.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,246 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+/**********************************************************************
+
+ Craft, an ATmega88-based demo by Linus Åkesson
+
+**********************************************************************/
+
+#include "emu.h"
+#include "cpu/avr8/avr8.h"
+#include "sound/dac.h"
+#include "sound/volt_reg.h"
+#include "screen.h"
+#include "emupal.h"
+#include "speaker.h"
+
+#define MASTER_CLOCK        20000000
+
+#define VISIBLE_CYCLES      480
+#define HSYNC_CYCLES        155
+#define LINE_CYCLES         (VISIBLE_CYCLES + HSYNC_CYCLES)
+#define VISIBLE_LINES       480
+#define VSYNC_LINES         45
+#define LINES_PER_FRAME     (VISIBLE_LINES + VSYNC_LINES)
+#define CYCLES_PER_FRAME    (LINES_PER_FRAME * LINE_CYCLES)
+#define PIXELS_PER_FRAME    (CYCLES_PER_FRAME)
+
+class lft_craft_state : public driver_device
+{
+public:
+	lft_craft_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_dac(*this, "dac")
+		, m_screen(*this, "screen")
+		, m_palette(*this, "palette")
+	{
+	}
+
+	void craft(machine_config &config);
+
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
+	void prg_map(address_map &map);
+	void data_map(address_map &map);
+	void io_map(address_map &map);
+
+	uint8_t port_r(offs_t offset);
+	void port_w(offs_t offset, uint8_t data);
+
+	void init_palette(palette_device &palette) const;
+	void video_update();
+	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+	required_device<avr8_device> m_maincpu;
+	required_device<dac_byte_interface> m_dac;
+	required_device<screen_device> m_screen;
+	required_device<palette_device> m_palette;
+
+	enum port : uint8_t
+	{
+		PORT_A,
+		PORT_B,
+		PORT_C,
+		PORT_D,
+
+		PORT_COUNT
+	};
+
+	uint8_t m_ports[PORT_COUNT];
+
+	uint32_t m_last_cycles;
+	uint64_t m_frame_start_cycle;
+
+	uint8_t m_latched_color;
+	std::unique_ptr<uint8_t[]> m_pixels;
+};
+
+//**************************************************************************
+//  GPIO
+//**************************************************************************
+
+uint8_t lft_craft_state::port_r(offs_t offset)
+{
+	return m_ports[offset];
+}
+
+void lft_craft_state::port_w(offs_t offset, uint8_t data)
+{
+	const uint8_t old = m_ports[offset];
+	m_ports[offset] = data;
+	const uint8_t changed = data ^ old;
+
+	switch (offset)
+	{
+	case AVR8_IO_PORTB:
+		if (BIT(changed, 1) && BIT(data, 1))
+		{
+			m_frame_start_cycle = machine().time().as_ticks(MASTER_CLOCK);
+			video_update();
+		}
+		if (BIT(changed, 3))
+		{
+			video_update();
+			m_latched_color = (data & 0x08) ? (m_ports[PORT_C] & 0x3f) : 0x3f;
+		}
+		break;
+
+	case AVR8_IO_PORTC:
+		video_update();
+		m_latched_color = data;
+		break;
+
+	case AVR8_IO_PORTD:
+		m_dac->write((data & 0x02) | ((data & 0xf4) >> 2));
+		break;
+	}
+}
+
+//**************************************************************************
+//  MEMORY
+//**************************************************************************
+
+void lft_craft_state::prg_map(address_map &map)
+{
+	map(0x0000, 0x1fff).rom();
+}
+
+void lft_craft_state::data_map(address_map &map)
+{
+	map(0x0100, 0x04ff).ram();
+}
+
+void lft_craft_state::io_map(address_map &map)
+{
+	map(AVR8_IO_PORTA, AVR8_IO_PORTD).rw(FUNC(lft_craft_state::port_r), FUNC(lft_craft_state::port_w));
+}
+
+//**************************************************************************
+//  VIDEO
+//**************************************************************************
+
+void lft_craft_state::init_palette(palette_device &palette) const
+{
+	for (int i = 0; i < 0x40; i++)
+	{
+		uint8_t r = 0x55 * ((i & 0x30) >> 4);
+		uint8_t g = 0x55 * ((i & 0x0c) >> 2);
+		uint8_t b = 0x55 * (i & 0x03);
+		palette.set_pen_color(i, rgb_t(r, g, b));
+	}
+}
+
+void lft_craft_state::video_update()
+{
+	uint64_t cycles = machine().time().as_ticks(MASTER_CLOCK);
+	uint32_t frame_cycles = (uint32_t)(cycles - m_frame_start_cycle);
+
+	if (m_last_cycles < frame_cycles)
+	{
+		for (uint32_t pixidx = m_last_cycles; pixidx < frame_cycles && pixidx < PIXELS_PER_FRAME; pixidx++)
+		{
+			m_pixels[pixidx] = m_latched_color;
+		}
+	}
+
+	m_last_cycles = frame_cycles;
+}
+
+uint32_t lft_craft_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+{
+	const pen_t *pens = m_palette->pens();
+	for(int y = 0; y < LINES_PER_FRAME; y++)
+	{
+		uint32_t *dst = &bitmap.pix32(y);
+		uint8_t *src = &m_pixels[y * LINE_CYCLES];
+		for(int x = 0; x < LINE_CYCLES; x++)
+		{
+			*dst++ = pens[*src++];
+		}
+	}
+	return 0;
+}
+
+//**************************************************************************
+//  MACHINE
+//**************************************************************************
+
+static INPUT_PORTS_START( empty_input )
+INPUT_PORTS_END
+
+void lft_craft_state::machine_start()
+{
+	m_pixels = std::make_unique<uint8_t[]>(PIXELS_PER_FRAME);
+
+	save_item(NAME(m_ports));
+	save_item(NAME(m_last_cycles));
+	save_item(NAME(m_frame_start_cycle));
+
+	save_item(NAME(m_latched_color));
+	save_pointer(NAME(m_pixels), PIXELS_PER_FRAME);
+}
+
+void lft_craft_state::machine_reset()
+{
+	memset(m_ports, 0, PORT_COUNT);
+
+	m_frame_start_cycle = 0;
+	m_last_cycles = 0;
+
+	m_latched_color = 0;
+	memset(&m_pixels[0], 0, PIXELS_PER_FRAME);
+}
+
+void lft_craft_state::craft(machine_config &config)
+{
+	ATMEGA88(config, m_maincpu, MASTER_CLOCK);
+	m_maincpu->set_addrmap(AS_PROGRAM, &lft_craft_state::prg_map);
+	m_maincpu->set_addrmap(AS_DATA, &lft_craft_state::data_map);
+	m_maincpu->set_addrmap(AS_IO, &lft_craft_state::io_map);
+	m_maincpu->set_eeprom_tag("eeprom");
+
+	PALETTE(config, m_palette, FUNC(lft_craft_state::init_palette), 64);
+	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+	m_screen->set_raw(MASTER_CLOCK, 635, 47, 527, 525, 36, 516);
+	m_screen->set_screen_update(FUNC(lft_craft_state::screen_update));
+
+	SPEAKER(config, "avr8").front_center();
+	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
+	vref.add_route(0, m_dac, 1.0, DAC_VREF_POS_INPUT);
+	vref.add_route(0, m_dac, -1.0, DAC_VREF_NEG_INPUT);
+
+	DAC_6BIT_R2R(config, m_dac, 0).add_route(0, "avr8", 0.25); // pd1/pd2/pd4/pd5/pd6/pd7 + 2k(x7) + 1k(x5)
+}
+
+ROM_START( craft )
+	ROM_REGION( 0x2000, "maincpu", 0 )
+	ROM_LOAD( "craft.bin", 0x0000, 0x2000, CRC(2e6f9ad2) SHA1(75e495bf18395d74289ca7ee2649622fc4010457) )
+	ROM_REGION( 0x200, "eeprom", 0 )
+	ROM_LOAD( "eeprom.raw", 0x0000, 0x0200, CRC(e18a2af9) SHA1(81fc6f2d391edfd3244870214fac37929af0ac0c) )
+ROM_END
+
+/*   YEAR  NAME      PARENT  COMPAT  MACHINE     INPUT        CLASS            INIT        COMPANY            FULLNAME */
+CONS(2008, craft,    0,      0,      craft,      empty_input, lft_craft_state, empty_init, u8"Linus Åkesson", "Craft", MACHINE_IMPERFECT_GRAPHICS)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/lft_phasor.cpp mame-0.224+dfsg.1/src/mame/drivers/lft_phasor.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/lft_phasor.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/lft_phasor.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,266 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+/**********************************************************************
+
+ Phasor, an ATmega88-based demo by Linus Åkesson
+
+**********************************************************************/
+
+#include "emu.h"
+#include "cpu/avr8/avr8.h"
+#include "sound/dac.h"
+#include "sound/volt_reg.h"
+#include "screen.h"
+#include "emupal.h"
+#include "speaker.h"
+
+#define MASTER_CLOCK        17734470
+
+#define SAMPLES_PER_FRAME    (355255)
+
+class lft_phasor_state : public driver_device
+{
+public:
+	lft_phasor_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_dac(*this, "dac")
+		, m_screen(*this, "screen")
+		, m_palette(*this, "palette")
+	{
+	}
+
+	void phasor(machine_config &config);
+
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
+	void prg_map(address_map &map);
+	void data_map(address_map &map);
+	void io_map(address_map &map);
+
+	uint8_t port_r(offs_t offset);
+	void port_w(offs_t offset, uint8_t data);
+
+	void init_palette(palette_device &palette) const;
+	void video_update();
+	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+	required_device<avr8_device> m_maincpu;
+	required_device<dac_byte_interface> m_dac;
+	required_device<screen_device> m_screen;
+	required_device<palette_device> m_palette;
+
+	enum port : uint8_t
+	{
+		PORT_A,
+		PORT_B,
+		PORT_C,
+		PORT_D,
+
+		PORT_COUNT
+	};
+
+	uint8_t m_ports[PORT_COUNT];
+
+	uint64_t m_last_cycles;
+	uint64_t m_frame_start_cycle;
+
+	uint8_t m_latched_sample;
+	bool m_in_blanking;
+	uint64_t m_blanking_start;
+	uint32_t m_sample_x;
+	uint32_t m_sample_y;
+	std::unique_ptr<uint8_t[]> m_samples;
+};
+
+//**************************************************************************
+//  GPIO
+//**************************************************************************
+
+uint8_t lft_phasor_state::port_r(offs_t offset)
+{
+	return m_ports[offset];
+}
+
+void lft_phasor_state::port_w(offs_t offset, uint8_t data)
+{
+	m_ports[offset] = data;
+
+	switch (offset)
+	{
+	case AVR8_IO_PORTB:
+		video_update();
+		break;
+
+	case AVR8_IO_PORTC:
+		m_dac->write(data & 0x3f);
+		break;
+
+	case AVR8_IO_PORTD:
+		//video_update();
+		m_latched_sample = data;
+		break;
+	}
+}
+
+//**************************************************************************
+//  MEMORY
+//**************************************************************************
+
+void lft_phasor_state::prg_map(address_map &map)
+{
+	map(0x0000, 0x1fff).rom();
+}
+
+void lft_phasor_state::data_map(address_map &map)
+{
+	map(0x0100, 0x04ff).ram();
+}
+
+void lft_phasor_state::io_map(address_map &map)
+{
+	map(AVR8_IO_PORTA, AVR8_IO_PORTD).rw(FUNC(lft_phasor_state::port_r), FUNC(lft_phasor_state::port_w));
+}
+
+//**************************************************************************
+//  VIDEO
+//**************************************************************************
+
+void lft_phasor_state::init_palette(palette_device &palette) const
+{
+	for (int i = 0; i < 0x10; i++)
+	{
+		uint8_t gray = (uint8_t)i;
+		gray |= gray << 4;
+		palette.set_pen_color(i, rgb_t(gray, gray, gray));
+	}
+}
+
+void lft_phasor_state::video_update()
+{
+	const uint64_t cycles = machine().time().as_ticks(MASTER_CLOCK);
+
+	if (cycles == m_last_cycles)
+		return;
+
+	if (m_latched_sample == 0 && !m_in_blanking)
+	{
+		m_in_blanking = true;
+		m_blanking_start = cycles;
+	}
+	else if (m_latched_sample != 0 && m_in_blanking)
+	{
+		m_in_blanking = false;
+		const uint64_t blank_duration = cycles - m_blanking_start;
+		if (blank_duration < 80) // Approximate length of hblank
+		{
+			m_sample_y++;
+			m_sample_x = 0;
+		}
+		else
+		{
+			m_sample_y = 0;
+			m_sample_x = 0;
+			m_frame_start_cycle = machine().time().as_ticks(MASTER_CLOCK);
+		}
+	}
+
+	if (m_last_cycles < cycles && !m_in_blanking)
+	{
+		const uint8_t shift = (m_ports[PORT_B] & 4);
+		uint32_t sample_pix = m_sample_y * 1135 + m_sample_x;
+		for (uint64_t idx = m_last_cycles; idx < cycles && sample_pix < SAMPLES_PER_FRAME; idx++)
+		{
+			m_samples[sample_pix++] = (m_latched_sample >> shift) & 0x0f;
+			m_sample_x++;
+		}
+	}
+
+	m_last_cycles = cycles;
+}
+
+uint32_t lft_phasor_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+{
+	const pen_t *pens = m_palette->pens();
+	for(int y = 0; y < 313; y++)
+	{
+		uint32_t *dst = &bitmap.pix32(y);
+		uint8_t *src = &m_samples[y * 1135];
+		for(int x = 0; x < 1135; x++)
+		{
+			*dst++ = pens[*src++];
+		}
+	}
+	return 0;
+}
+
+//**************************************************************************
+//  MACHINE
+//**************************************************************************
+
+static INPUT_PORTS_START( empty_input )
+INPUT_PORTS_END
+
+void lft_phasor_state::machine_start()
+{
+	m_samples = std::make_unique<uint8_t[]>(SAMPLES_PER_FRAME);
+
+	save_item(NAME(m_ports));
+	save_item(NAME(m_last_cycles));
+	save_item(NAME(m_frame_start_cycle));
+
+	save_item(NAME(m_latched_sample));
+	save_item(NAME(m_in_blanking));
+	save_item(NAME(m_blanking_start));
+	save_item(NAME(m_sample_x));
+	save_item(NAME(m_sample_y));
+	save_pointer(NAME(m_samples), SAMPLES_PER_FRAME);
+}
+
+void lft_phasor_state::machine_reset()
+{
+	memset(m_ports, 0, PORT_COUNT);
+
+	m_frame_start_cycle = 0;
+	m_last_cycles = 0;
+
+	m_latched_sample = 0;
+	m_in_blanking = true;
+	m_blanking_start = 0;
+	m_sample_x = 0;
+	m_sample_y = 0;
+	memset(&m_samples[0], 0, SAMPLES_PER_FRAME);
+}
+
+void lft_phasor_state::phasor(machine_config &config)
+{
+	ATMEGA88(config, m_maincpu, MASTER_CLOCK);
+	m_maincpu->set_addrmap(AS_PROGRAM, &lft_phasor_state::prg_map);
+	m_maincpu->set_addrmap(AS_DATA, &lft_phasor_state::data_map);
+	m_maincpu->set_addrmap(AS_IO, &lft_phasor_state::io_map);
+	m_maincpu->set_eeprom_tag("eeprom");
+
+	PALETTE(config, m_palette, FUNC(lft_phasor_state::init_palette), 0x10);
+	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+	m_screen->set_raw(MASTER_CLOCK, 1135, 0, 1064, 313, 6, 310);
+	m_screen->set_screen_update(FUNC(lft_phasor_state::screen_update));
+
+	SPEAKER(config, "avr8").front_center();
+	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
+	vref.add_route(0, m_dac, 1.0, DAC_VREF_POS_INPUT);
+	vref.add_route(0, m_dac, -1.0, DAC_VREF_NEG_INPUT);
+
+	DAC_6BIT_R2R(config, m_dac, 0).add_route(0, "avr8", 0.5);
+}
+
+ROM_START( phasor )
+	ROM_REGION( 0x2000, "maincpu", 0 )
+	ROM_LOAD( "phasor.bin", 0x0000, 0x2000, CRC(300ef49b) SHA1(36b26137f5e8359dc9c2b746621a98bdd6634d2f) )
+	ROM_REGION( 0x200, "eeprom", 0 )
+	ROM_LOAD( "eeprom.raw", 0x0000, 0x0200, CRC(49036547) SHA1(d98c4d02771e80499c56dd71ad3d07597102f9b7) )
+ROM_END
+
+/*   YEAR  NAME      PARENT  COMPAT  MACHINE     INPUT        CLASS             INIT        COMPANY            FULLNAME */
+CONS(2010, phasor,   0,      0,      phasor,     empty_input, lft_phasor_state, empty_init, u8"Linus Åkesson", "Phasor", MACHINE_IMPERFECT_GRAPHICS)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/littlerb.cpp mame-0.224+dfsg.1/src/mame/drivers/littlerb.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/littlerb.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/littlerb.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -111,6 +111,7 @@
 		: driver_device(mconfig, type, tag),
 			m_maincpu(*this, "maincpu"),
 			m_indervid(*this, "inder_vid"),
+			m_sample_rom(*this, "samples"),
 			m_ldac(*this, "ldac"),
 			m_rdac(*this, "rdac"),
 			m_soundframe(0)
@@ -121,11 +122,15 @@
 
 	void init_littlerb();
 
-	DECLARE_CUSTOM_INPUT_MEMBER(littlerb_frame_step_r);
+	DECLARE_CUSTOM_INPUT_MEMBER(frame_step_r);
+
+protected:
+	virtual void machine_start() override;
 
 private:
 	required_device<cpu_device> m_maincpu;
 	required_device<inder_vid_device> m_indervid;
+	required_region_ptr<uint8_t> m_sample_rom;
 
 	required_device<dac_byte_interface> m_ldac;
 	required_device<dac_byte_interface> m_rdac;
@@ -133,39 +138,47 @@
 	uint16_t m_sound_pointer_l,m_sound_pointer_r;
 	int m_soundframe;
 
-	void littlerb_l_sound_w(uint16_t data);
-	void littlerb_r_sound_w(uint16_t data);
+	void l_sound_w(uint16_t data);
+	void r_sound_w(uint16_t data);
 	uint8_t sound_data_shift();
 
-	TIMER_DEVICE_CALLBACK_MEMBER(littlerb_sound_step_cb);
-	TIMER_DEVICE_CALLBACK_MEMBER(littlerb_sound_cb);
+	TIMER_DEVICE_CALLBACK_MEMBER(sound_step_cb);
+	TIMER_DEVICE_CALLBACK_MEMBER(sound_cb);
 
-	void littlerb_main(address_map &map);
+	void main(address_map &map);
 };
 
+void littlerb_state::machine_start()
+{
+	save_item(NAME(m_sound_index_l));
+	save_item(NAME(m_sound_index_r));
+	save_item(NAME(m_sound_pointer_l));
+	save_item(NAME(m_sound_pointer_r));
+	save_item(NAME(m_soundframe));
+}
 
-/* could be slightly different (timing wise, directly related to the irqs), but certainly they smoked some bad pot for this messy way ... */
+// could be slightly different (timing wise, directly related to the irqs), but certainly they smoked some bad pot for this messy way ...
 uint8_t littlerb_state::sound_data_shift()
 {
 	return ((m_soundframe % 16) == 0) ? 8 : 0;
 }
 
-/* l is SFX, r is BGM (they doesn't seem to share the same data ROM) */
-void littlerb_state::littlerb_l_sound_w(uint16_t data)
+// l is SFX, r is BGM (they don't seem to share the same data ROM)
+void littlerb_state::l_sound_w(uint16_t data)
 {
 	m_sound_index_l = (data >> sound_data_shift()) & 0xff;
 	m_sound_pointer_l = 0;
 	//popmessage("%04x %04x",m_sound_index_l,m_sound_index_r);
 }
 
-void littlerb_state::littlerb_r_sound_w(uint16_t data)
+void littlerb_state::r_sound_w(uint16_t data)
 {
 	m_sound_index_r = (data >> sound_data_shift()) & 0xff;
 	m_sound_pointer_r = 0;
 	//popmessage("%04x %04x",m_sound_index_l,m_sound_index_r);
 }
 
-void littlerb_state::littlerb_main(address_map &map)
+void littlerb_state::main(address_map &map)
 {
 	map(0x000008, 0x000017).nopw();
 	map(0x000020, 0x00002f).nopw();
@@ -176,16 +189,16 @@
 
 	map(0x700000, 0x700007).rw("inder_vid:tms", FUNC(tms34010_device::host_r), FUNC(tms34010_device::host_w));
 
-	map(0x740000, 0x740001).w(FUNC(littlerb_state::littlerb_l_sound_w));
-	map(0x760000, 0x760001).w(FUNC(littlerb_state::littlerb_r_sound_w));
+	map(0x740000, 0x740001).w(FUNC(littlerb_state::l_sound_w));
+	map(0x760000, 0x760001).w(FUNC(littlerb_state::r_sound_w));
 	map(0x780000, 0x780001).nopw(); // generic outputs
 	map(0x7c0000, 0x7c0001).portr("DSW");
 	map(0x7e0000, 0x7e0001).portr("P1");
 	map(0x7e0002, 0x7e0003).portr("P2");
 }
 
-/* guess according to DASM code and checking the gameplay speed, could be different */
-CUSTOM_INPUT_MEMBER(littlerb_state::littlerb_frame_step_r)
+// guess according to DASM code and checking the gameplay speed, could be different
+CUSTOM_INPUT_MEMBER(littlerb_state::frame_step_r)
 {
 	uint32_t ret = m_soundframe;
 
@@ -193,7 +206,7 @@
 }
 
 static INPUT_PORTS_START( littlerb )
-	PORT_START("DSW")   /* 16bit */
+	PORT_START("DSW")   // 16bit
 	PORT_DIPNAME( 0x0003, 0x0001, DEF_STR( Lives ) )    PORT_DIPLOCATION("SW1:8,7")
 	PORT_DIPSETTING(      0x0003, "2" )
 	PORT_DIPSETTING(      0x0001, "3" )
@@ -239,7 +252,7 @@
 	PORT_DIPSETTING(      0x0000, DEF_STR( Off ) )
 	PORT_DIPSETTING(      0x8000, DEF_STR( On ) )
 
-	PORT_START("P1")    /* 16bit */
+	PORT_START("P1")    // 16bit
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
@@ -255,9 +268,9 @@
 	PORT_DIPNAME( 0x1000, 0x1000, "???"  )
 	PORT_DIPSETTING(      0x1000, DEF_STR( Off ) )
 	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
-	PORT_BIT( 0xe000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(littlerb_state, littlerb_frame_step_r)
+	PORT_BIT( 0xe000, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(littlerb_state, frame_step_r)
 
-	PORT_START("P2")    /* 16bit */
+	PORT_START("P2")    // 16bit
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(2)
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(2)
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(2)
@@ -270,19 +283,17 @@
 INPUT_PORTS_END
 
 
-TIMER_DEVICE_CALLBACK_MEMBER(littlerb_state::littlerb_sound_cb)
+TIMER_DEVICE_CALLBACK_MEMBER(littlerb_state::sound_cb)
 {
-	uint8_t *sample_rom = memregion("samples")->base();
-
-	m_ldac->write(sample_rom[m_sound_pointer_l | (m_sound_index_l << 10) | 0x40000]);
-	m_rdac->write(sample_rom[m_sound_pointer_r | (m_sound_index_r << 10) | 0x00000]);
+	m_ldac->write(m_sample_rom[m_sound_pointer_l | (m_sound_index_l << 10) | 0x40000]);
+	m_rdac->write(m_sample_rom[m_sound_pointer_r | (m_sound_index_r << 10) | 0x00000]);
 	m_sound_pointer_l++;
 	m_sound_pointer_l&=0x3ff;
 	m_sound_pointer_r++;
 	m_sound_pointer_r&=0x3ff;
 }
 
-TIMER_DEVICE_CALLBACK_MEMBER(littlerb_state::littlerb_sound_step_cb)
+TIMER_DEVICE_CALLBACK_MEMBER(littlerb_state::sound_step_cb)
 {
 	m_soundframe++;
 }
@@ -290,13 +301,13 @@
 void littlerb_state::littlerb(machine_config &config)
 {
 	M68000(config, m_maincpu, XTAL(16'000'000)/2); // 10MHz rated part, near 16Mhz XTAL
-	m_maincpu->set_addrmap(AS_PROGRAM, &littlerb_state::littlerb_main);
+	m_maincpu->set_addrmap(AS_PROGRAM, &littlerb_state::main);
 
 	INDER_VIDEO(config, m_indervid, 0); // XTAL(40'000'000)
 
 	// TODO: not accurate - driven by XTAL(6'000'000)?
-	TIMER(config, "step_timer").configure_periodic(FUNC(littlerb_state::littlerb_sound_step_cb), attotime::from_hz(7500/150));
-	TIMER(config, "sound_timer").configure_periodic(FUNC(littlerb_state::littlerb_sound_cb), attotime::from_hz(7500));
+	TIMER(config, "step_timer").configure_periodic(FUNC(littlerb_state::sound_step_cb), attotime::from_hz(7500/150));
+	TIMER(config, "sound_timer").configure_periodic(FUNC(littlerb_state::sound_cb), attotime::from_hz(7500));
 
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
@@ -309,11 +320,11 @@
 }
 
 ROM_START( littlerb )
-	ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */
+	ROM_REGION( 0x100000, "maincpu", 0 ) // 68000 Code
 	ROM_LOAD16_BYTE( "tch_1.u53", 0x00001, 0x80000, CRC(172fbc13) SHA1(cd165ca0d0546e2634cf182dc98004cbfb02cf9f) )
 	ROM_LOAD16_BYTE( "tch_2.u29", 0x00000, 0x80000, CRC(b2fb1d61) SHA1(9a9d7176c241928d07af651e5f7f21d4f019701d) )
 
-	ROM_REGION( 0x80000, "samples", 0 ) /* sound samples */
+	ROM_REGION( 0x80000, "samples", 0 )
 	ROM_LOAD( "tch_3.u26", 0x40000, 0x40000, CRC(f193c5b6) SHA1(95548a40e2b5064c558b36cabbf507d23678b1b2) )
 	ROM_LOAD( "tch_4.u32", 0x00000, 0x40000, CRC(d6b81583) SHA1(b7a63d18a41ccac4d3db9211de0b0cdbc914317a) )
 ROM_END
@@ -325,4 +336,4 @@
 	m_indervid->subdevice<cpu_device>("tms")->set_clock_scale(1.2f);
 }
 
-GAME( 1994, littlerb, 0, littlerb, littlerb, littlerb_state, init_littlerb, ROT0, "TCH", "Little Robin", MACHINE_IMPERFECT_GRAPHICS|MACHINE_IMPERFECT_SOUND )
+GAME( 1994, littlerb, 0, littlerb, littlerb, littlerb_state, init_littlerb, ROT0, "TCH", "Little Robin", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/llc1.cpp mame-0.224+dfsg.1/src/mame/drivers/llc1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/llc1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/llc1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,39 +2,34 @@
 // copyright-holders:Miodrag Milanovic, Robbbert
 /******************************************************************************
 
-        LLC1 driver by Miodrag Milanovic
+LLC1 driver by Miodrag Milanovic
 
-        17/04/2009 Preliminary driver.
+2009-04-17 Preliminary driver.
 
-        July 2012, updates by Robbbert
+2012-07-?? Updates by Robbbert
 
-        Very little info available on these computers.
+Handy addresses: (Press X then the 4 digits then Enter)
+  0800 = BASIC cold start
+  0803 = BASIC warm start
+  13BE = display Monitor logo
+This machine has an 8-digit LED display with hex keyboard,
+and also a 64x16 monochrome screen with full keyboard.
+The monitor uses the hex keyboard, while Basic uses the full keyboard.
+Monitor output is on the digits, but the single-step command displays
+a running register dump on the main screen.
+There are no storage facilities, and no sound.
+BASIC is integer only (-32768 to 32767), about 6k of space, and all
+input is to be in uppercase. It does have minimal string capability,
+but there is no $ sign, so how to create a string variable is unknown.
+To exit back to the monitor, type BYE.
+The user instructions of the monitor (in German) are here:
+http://www.jens-mueller.org/jkcemu/llc1.html
+
+ToDo:
+- Get good dump of monitor rom, has one known bad byte, possibly more.
+- In Basic, when it first scrolls, the start of the line shifts a character
+  to the right. Unknown if a bug or a bad byte. (patched)
 
-        LLC1:
-        Handy addresses (set the pc register in the debugger, because the
-        monitor's Go command has problems):
-        0800 = BASIC cold start
-        0803 = BASIC warm start
-        13BE = display Monitor logo
-        This machine has an 8-digit LED display with hex keyboard,
-        and also a 64x16 monochrome screen with full keyboard.
-        The monitor uses the hex keyboard, while Basic uses the full keyboard.
-        Monitor output is on the digits, but the single-step command displays
-        a running register dump on the main screen.
-        There are no storage facilities, and no sound.
-        BASIC is integer only (-32768 to 32767), about 6k of space, and all
-        input is to be in uppercase. It does have minimal string capability,
-        but there is no $ sign, so how to create a string variable is unknown.
-        To exit back to the monitor, type BYE.
-        The user instructions of the monitor (in German) are here:
-        http://www.jens-mueller.org/jkcemu/llc1.html
-
-        ToDo:
-        - LLC1: Get good dump of monitor rom, has a number of bad bytes
-        - LLC1: In Basic, pressing enter several times causes the start
-          of the line to be shifted 1 or 2 characters to the right.
-        - LLC1: Go command crashes
-        - Lots of other things
 
 *******************************************************************************/
 
@@ -57,32 +52,33 @@
 	llc1_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
+		, m_ctc(*this, "ctc")
 		, m_p_chargen(*this, "chargen")
 		, m_vram(*this, "videoram")
 		, m_digits(*this, "digit%u", 0U)
 	{ }
 
 	void llc1(machine_config &config);
+	DECLARE_INPUT_CHANGED_MEMBER(z3_button);
 
 private:
 	void machine_start() override;
 	void machine_reset() override;
 	void kbd_put(u8 data);
-	u8 llc1_port1_a_r();
-	u8 llc1_port2_a_r();
-	u8 llc1_port2_b_r();
-	void llc1_port1_a_w(u8 data);
-	void llc1_port1_b_w(u8 data);
-	u32 screen_update_llc1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	u8 port1a_r();
+	u8 port2a_r();
+	u8 port2b_r();
+	void port1a_w(u8 data);
+	void port1b_w(u8 data);
+	u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
 
-	u8 m_term_status;
-	u8 m_llc1_key;
 	u8 m_porta;
 	u8 m_term_data;
 	required_device<z80_device> m_maincpu;
+	required_device<z80ctc_device> m_ctc;
 	required_region_ptr<u8> m_p_chargen;
 	required_shared_ptr<u8> m_vram;
 	output_finder<8> m_digits;
@@ -102,42 +98,47 @@
 {
 	map.global_mask(0xff);
 	map.unmap_value_high();
-	map(0xEC, 0xEF).rw("z80pio2", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
-	map(0xF4, 0xF7).rw("z80pio1", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
-	map(0xF8, 0xFB).rw("z80ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
+	map(0xEC, 0xEF).rw("pio2", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
+	map(0xF4, 0xF7).rw("pio1", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
+	map(0xF8, 0xFB).rw(m_ctc, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
 }
 
 /* Input ports */
 static INPUT_PORTS_START( llc1 )
 	PORT_START("X4") // out F4,BF
-		PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0) PORT_CHAR('0')
-		PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("1") PORT_CODE(KEYCODE_1) PORT_CHAR('1')
-		PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("2") PORT_CODE(KEYCODE_2) PORT_CHAR('2')
-		PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("3") PORT_CODE(KEYCODE_3) PORT_CHAR('3')
-		PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C) PORT_CHAR('C')
-		PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D) PORT_CHAR('D')
-		PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E) PORT_CHAR('E')
-		PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F) PORT_CHAR('F')
+		PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("1") PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("2") PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("3") PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
 	PORT_START("X5") // out F4,DF
-		PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4) PORT_CHAR('4')
-		PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("5") PORT_CODE(KEYCODE_5) PORT_CHAR('5')
-		PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("6") PORT_CODE(KEYCODE_6) PORT_CHAR('6')
-		PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("7") PORT_CODE(KEYCODE_7) PORT_CHAR('7')
-		PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("REG") PORT_CODE(KEYCODE_R) PORT_CHAR('R')
-		PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("M (Mem)") PORT_CODE(KEYCODE_M) PORT_CHAR('M')
-		PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("ST (Start)") PORT_CODE(KEYCODE_ENTER) PORT_CHAR('^')
-		PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED) // resets
+		PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("5") PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("6") PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("7") PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("REG") PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("M (Mem)") PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("ST (Start)") PORT_CODE(KEYCODE_ENTER) PORT_CHAR('^') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("DF (Reset)") PORT_CODE(KEYCODE_ESC) PORT_CHAR(27) PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
 	PORT_START("X6") // out F4,EF
-		PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("8") PORT_CODE(KEYCODE_8) PORT_CHAR('8')
-		PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("9") PORT_CODE(KEYCODE_9) PORT_CHAR('9')
-		PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A) PORT_CHAR('A')
-		PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B) PORT_CHAR('B')
-		PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("ES (Step)") PORT_CODE(KEYCODE_S) PORT_CHAR('S')
-		PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("DL (Go)") PORT_CODE(KEYCODE_X) PORT_CHAR('X')
-		PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("HP (BP)") PORT_CODE(KEYCODE_P) PORT_CHAR('P')
+		PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("8") PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("9") PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("ES (Step)") PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("DL (Go)") PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
+		PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("HP (BP)") PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHANGED_MEMBER(DEVICE_SELF, llc1_state, z3_button, 0)
 		PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED) // does nothing
 INPUT_PORTS_END
 
+INPUT_CHANGED_MEMBER(llc1_state::z3_button)
+{
+	m_ctc->trg3(newval);
+}
+
 void llc1_state::kbd_put(u8 data)
 {
 	static constexpr u8 s1[16]={0x40, 0x1e, 0x12, 0x1b, 0x19, 0x14, 0x15, 0x1d, 0x16, 0x17, 0x1c, 0x3c, 0x3f, 0x3d, 0x3e, 0x10}; // 0x20 to 0x2F
@@ -156,32 +157,28 @@
 		m_term_data = 0;
 
 	if (m_term_data)
-		m_term_status = 0xff;
+		m_term_data |= 0x80;
 }
 
 // LLC1 BASIC keyboard
-u8 llc1_state::llc1_port2_b_r()
+u8 llc1_state::port2b_r()
 {
-	u8 retVal = 0;
-
-	if (m_term_status)
+	if (BIT(m_term_data, 7))
 	{
-		retVal = m_term_status;
-		m_term_status = 0;
+		m_term_data &= 0x7f;
+		return 0xff;
 	}
 	else
-		retVal = m_term_data;
-
-	return retVal;
+		return m_term_data;
 }
 
-u8 llc1_state::llc1_port2_a_r()
+u8 llc1_state::port2a_r()
 {
 	return 0;
 }
 
 // LLC1 Monitor keyboard
-u8 llc1_state::llc1_port1_a_r()
+u8 llc1_state::port1a_r()
 {
 	u8 data = 0;
 	if (!BIT(m_porta, 4))
@@ -193,29 +190,15 @@
 	if (data & 0xf0)
 		data = (data >> 4) | 0x80;
 
-	data |= (m_porta & 0x70);
-
-	// do not repeat key
-	if (data & 15)
-	{
-		if (data == m_llc1_key)
-			data &= 0x70;
-		else
-			m_llc1_key = data;
-	}
-	else
-	if ((data & 0x70) == (m_llc1_key & 0x70))
-		m_llc1_key = 0;
-
 	return data;
 }
 
-void llc1_state::llc1_port1_a_w(u8 data)
+void llc1_state::port1a_w(u8 data)
 {
 	m_porta = data;
 }
 
-void llc1_state::llc1_port1_b_w(u8 data)
+void llc1_state::port1b_w(u8 data)
 {
 	static u8 count = 0, digit = 0;
 
@@ -242,21 +225,17 @@
 
 void llc1_state::machine_reset()
 {
-	m_term_status = 0;
-	m_llc1_key = 0;
+	m_term_data = 0;
 }
 
 void llc1_state::machine_start()
 {
 	m_digits.resolve();
-
-	save_item(NAME(m_term_status));
-	save_item(NAME(m_llc1_key));
 	save_item(NAME(m_porta));
 	save_item(NAME(m_term_data));
 }
 
-u32 llc1_state::screen_update_llc1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+u32 llc1_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	u8 y,ra,chr,gfx,inv;
 	u16 sy=0,ma=0,x;
@@ -291,14 +270,15 @@
 	return 0;
 }
 
-static const z80_daisy_config llc1_daisy_chain[] =
+static const z80_daisy_config daisy_chain[] =
 {
-	{ "z80ctc" },
+	{ "pio2" },
+	{ "ctc" },
 	{ nullptr }
 };
 
 /* F4 Character Displayer */
-static const gfx_layout llc1_charlayout =
+static const gfx_layout charlayout =
 {
 	8, 8,                   /* 8 x 8 characters */
 	128,                    /* 128 characters */
@@ -312,15 +292,15 @@
 };
 
 static GFXDECODE_START( gfx_llc1 )
-	GFXDECODE_ENTRY( "chargen", 0x0000, llc1_charlayout, 0, 1 )
+	GFXDECODE_ENTRY( "chargen", 0x0000, charlayout, 0, 1 )
 GFXDECODE_END
 
 /* Machine driver */
 void llc1_state::llc1(machine_config &config)
 {
 	/* basic machine hardware */
-	Z80(config, m_maincpu, XTAL(3'000'000));
-	m_maincpu->set_daisy_config(llc1_daisy_chain);
+	Z80(config, m_maincpu, XTAL(2'000'000));
+	m_maincpu->set_daisy_config(daisy_chain);
 	m_maincpu->set_addrmap(AS_PROGRAM, &llc1_state::mem_map);
 	m_maincpu->set_addrmap(AS_IO, &llc1_state::io_map);
 
@@ -330,29 +310,29 @@
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	screen.set_size(64*8, 16*8);
 	screen.set_visarea(0, 64*8-1, 0, 16*8-1);
-	screen.set_screen_update(FUNC(llc1_state::screen_update_llc1));
+	screen.set_screen_update(FUNC(llc1_state::screen_update));
 	screen.set_palette("palette");
 
 	GFXDECODE(config, "gfxdecode", "palette", gfx_llc1);
 	PALETTE(config, "palette", palette_device::MONOCHROME);
 	config.set_default_layout(layout_llc1);
 
-	z80pio_device& pio1(Z80PIO(config, "z80pio1", XTAL(3'000'000)));
-	pio1.in_pa_callback().set(FUNC(llc1_state::llc1_port1_a_r));
-	pio1.out_pa_callback().set(FUNC(llc1_state::llc1_port1_a_w));
-	pio1.out_pb_callback().set(FUNC(llc1_state::llc1_port1_b_w));
-
-	z80pio_device& pio2(Z80PIO(config, "z80pio2", XTAL(3'000'000)));
-	pio2.in_pa_callback().set(FUNC(llc1_state::llc1_port2_a_r));
-	pio2.in_pb_callback().set(FUNC(llc1_state::llc1_port2_b_r));
-
-	z80ctc_device& ctc(Z80CTC(config, "z80ctc", XTAL(3'000'000)));
-	// timer 0 irq does digit display, and timer 3 irq does scan of the
-	// monitor keyboard.
-	// No idea how the CTC is connected, so guessed.
-	ctc.intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
-	ctc.zc_callback<0>().set("z80ctc", FUNC(z80ctc_device::trg1));
-	ctc.zc_callback<1>().set("z80ctc", FUNC(z80ctc_device::trg3));
+	z80pio_device& pio1(Z80PIO(config, "pio1", XTAL(2'000'000)));
+	pio1.in_pa_callback().set(FUNC(llc1_state::port1a_r));
+	pio1.out_pa_callback().set(FUNC(llc1_state::port1a_w));
+	pio1.out_pb_callback().set(FUNC(llc1_state::port1b_w));
+
+	z80pio_device& pio2(Z80PIO(config, "pio2", XTAL(2'000'000)));
+	pio2.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+	pio2.in_pa_callback().set(FUNC(llc1_state::port2a_r));
+	pio2.in_pb_callback().set(FUNC(llc1_state::port2b_r));
+
+	Z80CTC(config, m_ctc, XTAL(2'000'000));
+	// timer 0 irq does digit display
+	// timer 3 is kicked off by a key press, and scans the monitor keyboard.
+	m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+	m_ctc->zc_callback<0>().set(m_ctc, FUNC(z80ctc_device::trg1));
+	m_ctc->zc_callback<1>().set(m_ctc, FUNC(z80ctc_device::trg2));
 
 	generic_keyboard_device &keyboard(GENERIC_KEYBOARD(config, "keyboard", 0));
 	keyboard.set_keyboard_callback(FUNC(llc1_state::kbd_put));
@@ -367,8 +347,8 @@
 	ROM_LOAD( "llc1_tb1.bin", 0x0800, 0x0400, CRC(0d9d4039) SHA1(b515e385af57f4faf3a9f7b4a1edd59a1c1ea260) )
 	ROM_LOAD( "llc1_tb2.bin", 0x0c00, 0x0400, CRC(28bfea2a) SHA1(a68a8b87bfc931627ddd8d124b153e511477fbaf) )
 	ROM_LOAD( "llc1_tb3.bin", 0x1000, 0x0400, CRC(fe5e3132) SHA1(cc3b191e41f5772a4b86b8eb0ebe6fce67872df6) )
-	ROM_FILL(0x23b, 1, 0x00) // don't reboot when typing into the monitor
-	ROM_FILL(0x2dc, 1, 0x0f) // fix display of AF in the reg command
+	ROM_FILL(0x02dc, 1, 0x0f) // fix display of AF in the reg command (confirmed from monitor listing)
+	ROM_FILL(0x1361, 1, 0x40) // fix scrolling in Basic
 
 	ROM_REGION( 0x0400, "chargen", 0 )
 	ROM_LOAD ("llc1_zg.bin",  0x0000, 0x0400, CRC(fa2cd659) SHA1(1fa5f9992f35929f656c4ce55ed6980c5da1772b) )
@@ -378,4 +358,4 @@
 /* Driver */
 
 /*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS       INIT       COMPANY  FULLNAME  FLAGS */
-COMP( 1984, llc1, 0,      0,      llc1,    llc1,  llc1_state, empty_init, "SCCH",  "LLC-1",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+COMP( 1984, llc1, 0,      0,      llc1,    llc1,  llc1_state, empty_init, "SCCH",  "LLC-1",  MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/llc2.cpp mame-0.224+dfsg.1/src/mame/drivers/llc2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/llc2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/llc2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,24 +2,21 @@
 // copyright-holders:Miodrag Milanovic, Robbbert
 /******************************************************************************
 
-        LLC driver by Miodrag Milanovic
+LLC2 driver by Miodrag Milanovic
 
-        17/04/2009 Preliminary driver.
+2009-04-17 Preliminary driver.
 
-        July 2012, updates by Robbbert
+2012-07-?? Updates by Robbbert
 
-        Very little info available on these computers.
+The BEL character plays a short tune.
+In the monitor, it is case sensitive, most commands are uppercase,
+ but some are lowercase.
+To start Basic, the command is b. To quit basic, use BYE.
+Inside Basic, it is not case-sensitive.
 
-        LLC2:
-        The BEL character plays a short tune.
-        In the monitor, it is case sensitive, most commands are uppercase,
-        but some are lowercase.
-        To start Basic, the command is b. To quit basic, use BYE.
-        Inside Basic, it is not case-sensitive.
-
-        ToDo:
-        - LLC2: Keyboard is incomplete
-        - Lots of other things
+ToDo:
+- Unofficial expansions
+- Need software
 
 *******************************************************************************/
 
@@ -31,6 +28,7 @@
 #include "machine/ram.h"
 #include "machine/z80ctc.h"
 #include "machine/z80pio.h"
+#include "imagedev/cassette.h"
 #include "sound/spkrdev.h"
 #include "emupal.h"
 #include "screen.h"
@@ -47,6 +45,10 @@
 		, m_maincpu(*this, "maincpu")
 		, m_ram(*this, RAM_TAG)
 		, m_p_chargen(*this, "chargen")
+		, m_cass(*this, "cassette")
+		, m_ctc(*this, "ctc")
+		, m_bankr(*this, "bankr%u", 0U)
+		, m_bankw(*this, "bankw%u", 0U)
 	{ }
 
 	void llc2(machine_config &config);
@@ -56,42 +58,46 @@
 private:
 	void machine_start() override;
 	void machine_reset() override;
-	void llc2_rom_disable_w(u8 data);
-	void llc2_basic_enable_w(u8 data);
-	u8 llc2_port1_b_r();
-	u8 llc2_port2_a_r();
-	void llc2_port1_b_w(u8 data);
-	u32 screen_update_llc2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	void rom_disable_w(u8 data);
+	void basic_enable_w(u8 data);
+	u8 port1b_r();
+	u8 port2a_r();
+	void port1b_w(u8 data);
+	u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
 
 	bool m_rv;
-	optional_device<speaker_sound_device> m_speaker;
-	optional_shared_ptr<u8> m_vram;
+	required_device<speaker_sound_device> m_speaker;
+	required_shared_ptr<u8> m_vram;
 	required_device<z80_device> m_maincpu;
-	optional_device<ram_device> m_ram;
+	required_device<ram_device> m_ram;
 	required_region_ptr<u8> m_p_chargen;
+	required_device<cassette_image_device> m_cass;
+	required_device<z80ctc_device> m_ctc;
+	required_memory_bank_array<2> m_bankr;
+	required_memory_bank_array<2> m_bankw;
 };
 
 /* Address maps */
 void llc2_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x3fff).bankrw("bank1");
-	map(0x4000, 0x5fff).bankrw("bank2");
-	map(0x6000, 0xbfff).bankrw("bank3");
-	map(0xc000, 0xffff).bankrw("bank4");
+	map(0x0000, 0x3fff).bankr("bankr0").bankw("bankw0");
+	map(0x4000, 0x5fff).bankr("bankr1").bankw("bankw1");
+	map(0x6000, 0xbfff).ram();
+	map(0xc000, 0xffff).ram().share("videoram");
 }
 
 void llc2_state::io_map(address_map &map)
 {
 	map.global_mask(0xff);
 	map.unmap_value_high();
-	map(0xE0, 0xE3).w(FUNC(llc2_state::llc2_rom_disable_w));
-	map(0xE4, 0xE7).rw("z80pio2", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
-	map(0xE8, 0xEB).rw("z80pio1", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
-	map(0xEC, 0xEC).w(FUNC(llc2_state::llc2_basic_enable_w));
-	map(0xF8, 0xFB).rw("z80ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
+	map(0xE0, 0xE3).w(FUNC(llc2_state::rom_disable_w));
+	map(0xE4, 0xE7).rw("pio2", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
+	map(0xE8, 0xEB).rw("pio1", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
+	map(0xEC, 0xEC).w(FUNC(llc2_state::basic_enable_w));
+	map(0xF8, 0xFB).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
 }
 
 /* Input ports */
@@ -102,74 +108,53 @@
 /* Driver initialization */
 void llc2_state::init_llc2()
 {
-	m_vram.set_target( m_ram->pointer() + 0xc000,m_vram.bytes());
+	u8 *r = m_ram->pointer();
+	u8 *m = memregion("maincpu")->base();
+
+	m_bankr[0]->configure_entry(0, r);
+	m_bankr[0]->configure_entry(1, m);
+	m_bankw[0]->configure_entry(0, r);
+	m_bankr[1]->configure_entry(0, r+0x4000);
+	m_bankr[1]->configure_entry(1, m+0x4000);
+	m_bankw[1]->configure_entry(0, r+0x4000);
 }
 
 void llc2_state::machine_reset()
 {
-	address_space &space = m_maincpu->space(AS_PROGRAM);
-	u8 *ram = m_ram->pointer();
-
-	space.unmap_write(0x0000, 0x3fff);
-	membank("bank1")->set_base(memregion("maincpu")->base());
-
-	space.unmap_write(0x4000, 0x5fff);
-	membank("bank2")->set_base(ram + 0x4000);
-
-	space.unmap_write(0x6000, 0xbfff);
-	membank("bank3")->set_base(ram + 0x6000);
-
-	space.install_write_bank(0xc000, 0xffff, "bank4");
-	membank("bank4")->set_base(ram + 0xc000);
+	m_bankr[0]->set_entry(1);
+	m_bankw[0]->set_entry(0);
+	m_bankr[1]->set_entry(0);
+	m_bankw[1]->set_entry(0);
 }
 
-void llc2_state::llc2_rom_disable_w(u8 data)
+void llc2_state::rom_disable_w(u8 data)
 {
-	address_space &mem_space = m_maincpu->space(AS_PROGRAM);
-	u8 *ram = m_ram->pointer();
-
-	mem_space.install_write_bank(0x0000, 0xbfff, "bank1");
-	membank("bank1")->set_base(ram);
-
-	mem_space.install_write_bank(0x4000, 0x5fff, "bank2");
-	membank("bank2")->set_base(ram + 0x4000);
-
-	mem_space.install_write_bank(0x6000, 0xbfff, "bank3");
-	membank("bank3")->set_base(ram + 0x6000);
-
-	mem_space.install_write_bank(0xc000, 0xffff, "bank4");
-	membank("bank4")->set_base(ram + 0xc000);
-
+	m_bankr[0]->set_entry(0);
 }
 
-void llc2_state::llc2_basic_enable_w(u8 data)
+void llc2_state::basic_enable_w(u8 data)
 {
-	address_space &mem_space = m_maincpu->space(AS_PROGRAM);
-	if (BIT(data, 1))
-	{
-		mem_space.unmap_write(0x4000, 0x5fff);
-		membank("bank2")->set_base(memregion("maincpu")->base() + 0x4000);
-	}
-	else
-	{
-		mem_space.install_write_bank(0x4000, 0x5fff, "bank2");
-		membank("bank2")->set_base(m_ram->pointer() + 0x4000);
-	}
-
+	m_bankr[1]->set_entry(BIT(data, 1));
 }
 
-u8 llc2_state::llc2_port1_b_r()
+u8 llc2_state::port1b_r()
 {
-	return 0;
+	u8 data = 0xfd;
+
+	if (m_cass->input() > 0.03)
+		data |= 0x02;
+
+	return data;
 }
 
-void llc2_state::llc2_port1_b_w(u8 data)
+void llc2_state::port1b_w(u8 data)
 {
+	m_cass->output(BIT(data, 0) ? -1.0 : +1.0);
 	m_speaker->level_w(BIT(data, 6));
 	m_rv = BIT(data, 5);
 }
 
-u8 llc2_state::llc2_port2_a_r()
+u8 llc2_state::port2a_r()
 {
 	return 0; // bit 2 low or hangs on ^Z^X^C sequence
 }
@@ -179,7 +164,7 @@
 	save_item(NAME(m_rv));
 }
 
-u32 llc2_state::screen_update_llc2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+u32 llc2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	u8 y,ra,chr,gfx,inv, inv1=m_rv ? 0xff : 0;
 	u16 sy=0,ma=0,x;
@@ -222,15 +207,16 @@
 	return 0;
 }
 
-static const z80_daisy_config llc2_daisy_chain[] =
+static const z80_daisy_config daisy_chain[] =
 {
-	{ "z80pio1" },
-	{ "z80ctc" },
+	{ "ctc" },
+	{ "pio1" },
+	{ "pio2" },
 	{ nullptr }
 };
 
 /* F4 Character Displayer */
-static const gfx_layout llc2_charlayout =
+static const gfx_layout charlayout =
 {
 	8, 8,                   /* 8 x 8 characters */
 	256,                    /* 256 characters */
@@ -244,15 +230,15 @@
 };
 
 static GFXDECODE_START( gfx_llc2 )
-	GFXDECODE_ENTRY( "chargen", 0x0000, llc2_charlayout, 0, 1 )
+	GFXDECODE_ENTRY( "chargen", 0x0000, charlayout, 0, 1 )
 GFXDECODE_END
 
 /* Machine driver */
 void llc2_state::llc2(machine_config &config)
 {
 	/* basic machine hardware */
-	Z80(config, m_maincpu, XTAL(3'000'000));
-	m_maincpu->set_daisy_config(llc2_daisy_chain);
+	Z80(config, m_maincpu, 12_MHz_XTAL / 4);
+	m_maincpu->set_daisy_config(daisy_chain);
 	m_maincpu->set_addrmap(AS_PROGRAM, &llc2_state::mem_map);
 	m_maincpu->set_addrmap(AS_IO, &llc2_state::io_map);
 
@@ -262,7 +248,7 @@
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	screen.set_size(64*8, 32*8);
 	screen.set_visarea(0, 64*8-1, 0, 32*8-1);
-	screen.set_screen_update(FUNC(llc2_state::screen_update_llc2));
+	screen.set_screen_update(FUNC(llc2_state::screen_update));
 	screen.set_palette("palette");
 
 	GFXDECODE(config, "gfxdecode", "palette", gfx_llc2);
@@ -270,17 +256,28 @@
 
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
-	SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.15);
+	SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
 
-	z80pio_device& pio1(Z80PIO(config, "z80pio1", XTAL(3'000'000)));
+	z80pio_device& pio1(Z80PIO(config, "pio1", 12_MHz_XTAL / 4));
+	pio1.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
 	pio1.in_pa_callback().set(K7659_KEYBOARD_TAG, FUNC(k7659_keyboard_device::read));
-	pio1.in_pb_callback().set(FUNC(llc2_state::llc2_port1_b_r));
-	pio1.out_pb_callback().set(FUNC(llc2_state::llc2_port1_b_w));
-
-	z80pio_device& pio2(Z80PIO(config, "z80pio2", XTAL(3'000'000)));
-	pio2.in_pa_callback().set(FUNC(llc2_state::llc2_port2_a_r));
+	pio1.in_pb_callback().set(FUNC(llc2_state::port1b_r));
+	pio1.out_pb_callback().set(FUNC(llc2_state::port1b_w));
 
-	Z80CTC(config, "z80ctc", XTAL(3'000'000));
+	z80pio_device& pio2(Z80PIO(config, "pio2", 12_MHz_XTAL / 4));
+	pio2.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+	pio2.in_pa_callback().set(FUNC(llc2_state::port2a_r));
+
+	Z80CTC(config, m_ctc, 12_MHz_XTAL / 4);
+	m_ctc->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+	m_ctc->set_clk<0>(12_MHz_XTAL / 8);
+	m_ctc->set_clk<1>(12_MHz_XTAL / 8);
+	m_ctc->set_clk<2>(50);      // comes from deep in the video section, assumed to be 50Hz
+	m_ctc->zc_callback<2>().set(m_ctc, FUNC(z80ctc_device::trg3));
+
+	CASSETTE(config, m_cass);
+	m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+	m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
 
 	K7659_KEYBOARD(config, K7659_KEYBOARD_TAG, 0);
 
@@ -291,11 +288,11 @@
 /* ROM definition */
 ROM_START( llc2 )
 	ROM_REGION( 0x6000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "scchmon_91.bin", 0x0000, 0x1000, CRC(218d8236) SHA1(b8297272cc79751afc2eb8688d99b40691346dcb) )
+	ROM_LOAD( "scchmon_91.d35", 0x0000, 0x1000, CRC(218d8236) SHA1(b8297272cc79751afc2eb8688d99b40691346dcb) )
 	ROM_LOAD( "gsbasic.bin",    0x4000, 0x2000, CRC(78a5f388) SHA1(e7b475b98dce36b24540ad11eb89046ddb4f02af) )
 
 	ROM_REGION( 0x0800, "chargen", 0 )
-	ROM_LOAD ("llc2font.bin",   0x0000, 0x0800, CRC(ce53e55d) SHA1(da23d93f14a8a1f8d82bb72470a96b0bfd81ed1b) )
+	ROM_LOAD ("llc2font.d17",   0x0000, 0x0800, CRC(ce53e55d) SHA1(da23d93f14a8a1f8d82bb72470a96b0bfd81ed1b) )
 ROM_END
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/looping.cpp mame-0.224+dfsg.1/src/mame/drivers/looping.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/looping.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/looping.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -80,12 +80,12 @@
 
 #define MAIN_CPU_CLOCK      (12000000)
 #define SOUND_CLOCK         (8000000)
-#define COP_CLOCK           (SOUND_CLOCK/2)     /* unknown guess */
+#define COP_CLOCK           (SOUND_CLOCK/2)     // unknown guess
 #define TMS_CLOCK           (640000)
 
-/* the schematics are very blurry here and don't actually specify the clock */
-/* values; however, everything else about the sync chain implies the standard */
-/* 18.432MHz master clock, like is used in similar hardware of the time */
+/* the schematics are very blurry here and don't actually specify the clock
+   values; however, everything else about the sync chain implies the standard
+   18.432MHz master clock, like is used in similar hardware of the time */
 #define MASTER_CLOCK        (18432000)
 
 #define PIXEL_CLOCK         (MASTER_CLOCK/3)
@@ -120,7 +120,6 @@
 		m_dac(*this, "dac"),
 		m_gfxdecode(*this, "gfxdecode"),
 		m_palette(*this, "palette"),
-		m_soundlatch(*this, "soundlatch"),
 		m_watchdog(*this, "watchdog")
 	{ }
 
@@ -136,13 +135,12 @@
 private:
 	DECLARE_WRITE_LINE_MEMBER(flip_screen_x_w);
 	DECLARE_WRITE_LINE_MEMBER(flip_screen_y_w);
-	void looping_videoram_w(offs_t offset, uint8_t data);
-	void looping_colorram_w(offs_t offset, uint8_t data);
+	void videoram_w(offs_t offset, uint8_t data);
+	void colorram_w(offs_t offset, uint8_t data);
 	DECLARE_WRITE_LINE_MEMBER(level2_irq_set);
 	DECLARE_WRITE_LINE_MEMBER(main_irq_ack_w);
 	DECLARE_WRITE_LINE_MEMBER(watchdog_w);
-	DECLARE_WRITE_LINE_MEMBER(looping_souint_clr);
-	void looping_soundlatch_w(uint8_t data);
+	DECLARE_WRITE_LINE_MEMBER(souint_clr);
 	DECLARE_WRITE_LINE_MEMBER(ballon_enable_w);
 	void out_0_w(uint8_t data);
 	void out_2_w(uint8_t data);
@@ -153,28 +151,28 @@
 	DECLARE_READ_LINE_MEMBER(cop_serial_r);
 	void cop_l_w(uint8_t data);
 	uint8_t protection_r();
-	DECLARE_WRITE_LINE_MEMBER(looping_spcint);
-	void looping_sound_sw(uint8_t data);
+	DECLARE_WRITE_LINE_MEMBER(spcint);
+	void sound_sw(uint8_t data);
 	DECLARE_WRITE_LINE_MEMBER(ay_enable_w);
 	DECLARE_WRITE_LINE_MEMBER(speech_enable_w);
 	TILE_GET_INFO_MEMBER(get_tile_info);
-	void looping_palette(palette_device &palette) const;
-	uint32_t screen_update_looping(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	INTERRUPT_GEN_MEMBER(looping_interrupt);
+	void palette(palette_device &palette) const;
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	INTERRUPT_GEN_MEMBER(interrupt);
 	void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void looping_io_map(address_map &map);
-	void looping_map(address_map &map);
-	void looping_sound_io_map(address_map &map);
-	void looping_sound_map(address_map &map);
+	void io_map(address_map &map);
+	void map(address_map &map);
+	void sound_io_map(address_map &map);
+	void sound_map(address_map &map);
 
-	/* memory pointers */
+	// memory pointers
 	required_shared_ptr<uint8_t> m_videoram;
 	required_shared_ptr<uint8_t> m_colorram;
 	required_shared_ptr<uint8_t> m_spriteram;
 	uint8_t m_cop_port_l;
 
-	/* tilemaps */
+	// tilemaps
 	tilemap_t * m_bg_tilemap;
 
 	required_device<tms9995_device> m_maincpu;
@@ -184,7 +182,6 @@
 	required_device<dac_byte_interface> m_dac;
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_device<palette_device> m_palette;
-	required_device<generic_latch_8_device> m_soundlatch;
 	required_device<watchdog_timer_device> m_watchdog;
 };
 
@@ -196,7 +193,7 @@
  *
  *************************************/
 
-void looping_state::looping_palette(palette_device &palette) const
+void looping_state::palette(palette_device &palette) const
 {
 	uint8_t const *const color_prom = memregion("proms")->base();
 	static constexpr int resistances[3] = { 1000, 470, 220 };
@@ -279,27 +276,27 @@
 }
 
 
-void looping_state::looping_videoram_w(offs_t offset, uint8_t data)
+void looping_state::videoram_w(offs_t offset, uint8_t data)
 {
 	m_videoram[offset] = data;
 	m_bg_tilemap->mark_tile_dirty(offset);
 }
 
 
-void looping_state::looping_colorram_w(offs_t offset, uint8_t data)
+void looping_state::colorram_w(offs_t offset, uint8_t data)
 {
 	m_colorram[offset] = data;
 
-	/* odd bytes are column color attribute */
+	// odd bytes are column color attribute
 	if (offset & 1)
 	{
-		/* mark the whole column dirty */
+		// mark the whole column dirty
 		offs_t offs = (offset/2);
 		for (int i = 0; i < 0x20; i++)
 			m_bg_tilemap->mark_tile_dirty(i * 0x20 + offs);
 	}
 
-	/* even bytes are column scroll */
+	// even bytes are column scroll
 	else
 		m_bg_tilemap->set_scrolly(offset/2, data);
 }
@@ -342,7 +339,7 @@
 }
 
 
-uint32_t looping_state::screen_update_looping(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t looping_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
 
@@ -354,12 +351,13 @@
 
 /*************************************
  *
- *  Machine init/reset
+ *  Machine start/reset
  *
  *************************************/
 
 void looping_state::machine_start()
 {
+	save_item(NAME(m_cop_port_l));
 }
 
 void looping_state::machine_reset()
@@ -367,6 +365,8 @@
 	// Disable auto wait state generation by raising the READY line on reset
 	m_maincpu->ready_line(ASSERT_LINE);
 	m_maincpu->reset_line(ASSERT_LINE);
+
+	m_cop_port_l = 0;
 }
 
 /*************************************
@@ -375,7 +375,7 @@
  *
  *************************************/
 
-INTERRUPT_GEN_MEMBER(looping_state::looping_interrupt)
+INTERRUPT_GEN_MEMBER(looping_state::interrupt)
 {
 	m_maincpu->set_input_line(INT_9995_INT1, ASSERT_LINE);
 }
@@ -401,7 +401,7 @@
 }
 
 
-WRITE_LINE_MEMBER(looping_state::looping_souint_clr)
+WRITE_LINE_MEMBER(looping_state::souint_clr)
 {
 	logerror("Soundint clr = %d\n", state);
 	if (state == 0)
@@ -409,26 +409,20 @@
 }
 
 
-WRITE_LINE_MEMBER(looping_state::looping_spcint)
+WRITE_LINE_MEMBER(looping_state::spcint)
 {
 	logerror("Speech /int = %d\n", state==ASSERT_LINE? 1:0);
 	m_audiocpu->set_input_line(INT_9980A_LEVEL4, state==ASSERT_LINE? CLEAR_LINE : ASSERT_LINE);
 }
 
 
-void looping_state::looping_soundlatch_w(uint8_t data)
-{
-	m_soundlatch->write(data);
-	m_audiocpu->set_input_line(INT_9980A_LEVEL2, ASSERT_LINE);
-}
-
 /*************************************
  *
  *  Custom DAC handling
  *
  *************************************/
 
-void looping_state::looping_sound_sw(uint8_t data)
+void looping_state::sound_sw(uint8_t data)
 {
 	/* this can be improved by adding the missing signals for decay etc. (see schematics)
 
@@ -486,8 +480,8 @@
 
 WRITE_LINE_MEMBER(looping_state::plr2_w)
 {
-	/* set to 1 after IDLE, cleared to 0 during processing */
-	/* is this an LED on the PCB? */
+	/* set to 1 after IDLE, cleared to 0 during processing
+	   is this an LED on the PCB? */
 }
 
 
@@ -545,46 +539,46 @@
  *
  *************************************/
 
-void looping_state::looping_map(address_map &map)
+void looping_state::map(address_map &map)
 {
 	map(0x0000, 0x7fff).rom();
 
-	map(0x9000, 0x93ff).ram().w(FUNC(looping_state::looping_videoram_w)).share("videoram");
+	map(0x9000, 0x93ff).ram().w(FUNC(looping_state::videoram_w)).share(m_videoram);
 
-	map(0x9800, 0x983f).mirror(0x0700).ram().w(FUNC(looping_state::looping_colorram_w)).share("colorram");
-	map(0x9840, 0x987f).mirror(0x0700).ram().share("spriteram");
+	map(0x9800, 0x983f).mirror(0x0700).ram().w(FUNC(looping_state::colorram_w)).share(m_colorram);
+	map(0x9840, 0x987f).mirror(0x0700).ram().share(m_spriteram);
 	map(0x9880, 0x98ff).mirror(0x0700).ram();
 
 	map(0xb000, 0xb007).mirror(0x07f8).w("videolatch", FUNC(ls259_device::write_d0));
 
 	map(0xe000, 0xefff).ram();
-	map(0xf800, 0xf800).mirror(0x03fc).portr("P1").w(FUNC(looping_state::out_0_w));                 /* /OUT0 */
-	map(0xf801, 0xf801).mirror(0x03fc).portr("P2").w(FUNC(looping_state::looping_soundlatch_w));    /* /OUT1 */
-	map(0xf802, 0xf802).mirror(0x03fc).portr("DSW").w(FUNC(looping_state::out_2_w));                /* /OUT2 */
+	map(0xf800, 0xf800).mirror(0x03fc).portr("P1").w(FUNC(looping_state::out_0_w));                      // /OUT0
+	map(0xf801, 0xf801).mirror(0x03fc).portr("P2").w("soundlatch", FUNC(generic_latch_8_device::write)); // /OUT1
+	map(0xf802, 0xf802).mirror(0x03fc).portr("DSW").w(FUNC(looping_state::out_2_w));                     // /OUT2
 	map(0xf803, 0xf803).mirror(0x03fc).rw(FUNC(looping_state::adc_r), FUNC(looping_state::adc_w));
 }
 
-void looping_state::looping_io_map(address_map &map)
+void looping_state::io_map(address_map &map)
 {
 	map(0x0800, 0x080f).w("mainlatch", FUNC(ls259_device::write_d0));
 }
 
 
-/* complete memory map derived from schematics */
-void looping_state::looping_sound_map(address_map &map)
+// complete memory map derived from schematics
+void looping_state::sound_map(address_map &map)
 {
 	map.global_mask(0x3fff);
 	map(0x0000, 0x37ff).rom();
 	map(0x3800, 0x3bff).ram();
-	map(0x3c00, 0x3c00).mirror(0x00f4).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w));
+	map(0x3c00, 0x3c00).mirror(0x00f4).rw(m_aysnd, FUNC(ay8910_device::data_r), FUNC(ay8910_device::address_w));
 	map(0x3c01, 0x3c01).mirror(0x00f6).noprw();
-	map(0x3c02, 0x3c02).mirror(0x00f4).nopr().w("aysnd", FUNC(ay8910_device::data_w));
-	map(0x3e00, 0x3e00).mirror(0x00f4).nopr().w("tms", FUNC(tms5220_device::data_w));
+	map(0x3c02, 0x3c02).mirror(0x00f4).nopr().w(m_aysnd, FUNC(ay8910_device::data_w));
+	map(0x3e00, 0x3e00).mirror(0x00f4).nopr().w(m_tms, FUNC(tms5220_device::data_w));
 	map(0x3e01, 0x3e01).mirror(0x00f6).noprw();
-	map(0x3e02, 0x3e02).mirror(0x00f4).r("tms", FUNC(tms5220_device::status_r)).nopw();
+	map(0x3e02, 0x3e02).mirror(0x00f4).r(m_tms, FUNC(tms5220_device::status_r)).nopw();
 }
 
-void looping_state::looping_sound_io_map(address_map &map)
+void looping_state::sound_io_map(address_map &map)
 {
 	map(0x0000, 0x000f).w("sen0", FUNC(ls259_device::write_d0));
 	map(0x0010, 0x001f).w("sen1", FUNC(ls259_device::write_d0));
@@ -625,14 +619,14 @@
 {
 	// CPU TMS9995, standard variant; no line connections
 	TMS9995(config, m_maincpu, MAIN_CPU_CLOCK);
-	m_maincpu->set_addrmap(AS_PROGRAM, &looping_state::looping_map);
-	m_maincpu->set_addrmap(AS_IO, &looping_state::looping_io_map);
-	m_maincpu->set_vblank_int("screen", FUNC(looping_state::looping_interrupt));
+	m_maincpu->set_addrmap(AS_PROGRAM, &looping_state::map);
+	m_maincpu->set_addrmap(AS_IO, &looping_state::io_map);
+	m_maincpu->set_vblank_int("screen", FUNC(looping_state::interrupt));
 
 	// CPU TMS9980A for audio subsystem; no line connections
 	TMS9980A(config, m_audiocpu, SOUND_CLOCK);
-	m_audiocpu->set_addrmap(AS_PROGRAM, &looping_state::looping_sound_map);
-	m_audiocpu->set_addrmap(AS_IO, &looping_state::looping_sound_io_map);
+	m_audiocpu->set_addrmap(AS_PROGRAM, &looping_state::sound_map);
+	m_audiocpu->set_addrmap(AS_IO, &looping_state::sound_io_map);
 
 	cop420_cpu_device &cop(COP420(config, "mcu", COP_CLOCK));
 	cop.set_config(COP400_CKI_DIVISOR_16, COP400_CKO_OSCILLATOR_OUTPUT, false);
@@ -654,41 +648,41 @@
 
 	WATCHDOG_TIMER(config, m_watchdog);
 
-	/* video hardware */
+	// video hardware
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_raw(PIXEL_CLOCK, HTOTAL, HBEND, HBSTART, VTOTAL, VBEND, VBSTART);
-	screen.set_screen_update(FUNC(looping_state::screen_update_looping));
+	screen.set_screen_update(FUNC(looping_state::screen_update));
 	screen.set_palette(m_palette);
 
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_looping);
-	PALETTE(config, m_palette, FUNC(looping_state::looping_palette), 32);
+	PALETTE(config, m_palette, FUNC(looping_state::palette), 32);
 
 	ls259_device &videolatch(LS259(config, "videolatch")); // E2 on video board
 	videolatch.q_out_cb<1>().set(FUNC(looping_state::level2_irq_set));
 	videolatch.q_out_cb<6>().set(FUNC(looping_state::flip_screen_x_w));
 	videolatch.q_out_cb<7>().set(FUNC(looping_state::flip_screen_y_w));
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "speaker").front_center();
 
-	GENERIC_LATCH_8(config, m_soundlatch);
+	GENERIC_LATCH_8(config, "soundlatch").data_pending_callback().set_inputline(m_audiocpu, INT_9980A_LEVEL2);
 
 	AY8910(config, m_aysnd, SOUND_CLOCK/4);
-	m_aysnd->port_a_read_callback().set(m_soundlatch, FUNC(generic_latch_8_device::read));
+	m_aysnd->port_a_read_callback().set("soundlatch", FUNC(generic_latch_8_device::read));
 	m_aysnd->add_route(ALL_OUTPUTS, "speaker", 0.2);
 
 	TMS5220(config, m_tms, TMS_CLOCK);
-	m_tms->irq_cb().set(FUNC(looping_state::looping_spcint));
+	m_tms->irq_cb().set(FUNC(looping_state::spcint));
 	m_tms->add_route(ALL_OUTPUTS, "speaker", 0.5);
 
 	DAC_2BIT_R2R(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.15); // unknown DAC
 	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
-	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
-	vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
+	vref.add_route(0, m_dac, 1.0, DAC_VREF_POS_INPUT);
+	vref.add_route(0, m_dac, -1.0, DAC_VREF_NEG_INPUT);
 
 	ls259_device &sen0(LS259(config, "sen0")); // B3 on sound board
-	sen0.q_out_cb<0>().set(FUNC(looping_state::looping_souint_clr));
-	sen0.parallel_out_cb().set(FUNC(looping_state::looping_sound_sw));
+	sen0.q_out_cb<0>().set(FUNC(looping_state::souint_clr));
+	sen0.parallel_out_cb().set(FUNC(looping_state::sound_sw));
 
 	ls259_device &sen1(LS259(config, "sen1")); // A1 on sound board with outputs connected to 4016 at B1
 	sen1.q_out_cb<0>().set(FUNC(looping_state::ay_enable_w));
@@ -715,7 +709,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 )
 
-	PORT_START("P2") /* cocktail? */
+	PORT_START("P2") // cocktail?
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_COCKTAIL
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_COCKTAIL
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
@@ -748,7 +742,7 @@
 	PORT_DIPSETTING(    0x00, DEF_STR( Cocktail ) )
 INPUT_PORTS_END
 
-/* Same as 'looping' but additional "Infinite Lives" Dip Switch */
+// Same as 'looping' but additional "Infinite Lives" Dip Switch
 static INPUT_PORTS_START( skybump )
 	PORT_INCLUDE(looping)
 
@@ -769,25 +763,25 @@
  *************************************/
 
 ROM_START( loopingv )
-	ROM_REGION( 0x8000, "maincpu", 0 ) /* TMS9995 code */
+	ROM_REGION( 0x8000, "maincpu", 0 ) // TMS9995 code
 	ROM_LOAD( "vli3.5a",        0x0000, 0x2000, CRC(1ac3ccdf) SHA1(9d1cde8bd4d0f12eaf06225b3ecc4a5c3e4f0c11) )
 	ROM_LOAD( "vli1.2a",        0x2000, 0x2000, CRC(97755fd4) SHA1(4a6ef02b0128cd516ff95083a7caaad8f3756f09) )
 	ROM_LOAD( "l056-6.9a",      0x4000, 0x2000, CRC(548afa52) SHA1(0b88ac7394feede023519c585a4084591eb9661a) )
 	ROM_LOAD( "vli9-5.8a",      0x6000, 0x2000, CRC(5d122f86) SHA1(d1c66b890142bb4d4648f3edec6567f58107dbf0) )
 
-	ROM_REGION( 0x3800, "audiocpu", 0 ) /* TMS9980 code */
+	ROM_REGION( 0x3800, "audiocpu", 0 ) // TMS9980 code
 	ROM_LOAD( "i-o.13c",        0x0000, 0x0800, CRC(21e9350c) SHA1(f30a180309e373a17569351944f5e7982c3b3f9d) )
 	ROM_LOAD( "i-o.13a",        0x0800, 0x1000, CRC(1de29f25) SHA1(535acb132266d6137b0610ee9a9b946459ae44af) )
-	ROM_LOAD( "i-o.11a",        0x2800, 0x1000, CRC(61c74c79) SHA1(9f34d18a919446dd76857b851cea23fc1526f3c2) ) /* speech */
+	ROM_LOAD( "i-o.11a",        0x2800, 0x1000, CRC(61c74c79) SHA1(9f34d18a919446dd76857b851cea23fc1526f3c2) ) // speech
 
-	ROM_REGION( 0x1000, "mcu", 0 ) /* COP420 microcontroller code */
+	ROM_REGION( 0x1000, "mcu", 0 ) // COP420 microcontroller code
 /*
-    ROM_LOAD( "cop.bin",        0x0000, 0x0400, BAD_DUMP CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times, and starting PC is not 0
+    ROM_LOAD( "cop.bin",    0x0000, 0x0400, BAD_DUMP CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times, and starting PC is not 0
     ROM_CONTINUE(           0x0000, 0x0400)
     ROM_CONTINUE(           0x0000, 0x0400)
     ROM_CONTINUE(           0x0000, 0x0400)
 */
-	ROM_LOAD( "cop.bin",        0x00c2, 0x033e, CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times and shifted
+	ROM_LOAD( "cop.bin",    0x00c2, 0x033e, CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times and shifted
 	ROM_CONTINUE(           0x0000, 0x00c2)
 	ROM_CONTINUE(           0x00c2, 0x033e)
 	ROM_CONTINUE(           0x0000, 0x00c2)
@@ -800,31 +794,31 @@
 	ROM_LOAD( "log2.8a",        0x0000, 0x800, CRC(ef3284ac) SHA1(8719c9df8c972a56c306b3c707aaa53092ffa2d6) )
 	ROM_LOAD( "log1-9-3.6a",    0x0800, 0x800, CRC(c434c14c) SHA1(3669aaf7adc6b250378bcf62eb8e7058f55476ef) )
 
-	ROM_REGION( 0x0020, "proms", 0 ) /* color prom */
+	ROM_REGION( 0x0020, "proms", 0 ) // color prom
 	ROM_LOAD( "18s030.11b",     0x0000, 0x0020, CRC(6a0c7d87) SHA1(140335d85c67c75b65689d4e76d29863c209cf32) )
 ROM_END
 
 ROM_START( loopingva )
-	ROM_REGION( 0x8000, "maincpu", 0 ) /* TMS9995 code */
+	ROM_REGION( 0x8000, "maincpu", 0 ) // TMS9995 code
 	ROM_LOAD( "vli3.5a",        0x0000, 0x2000, CRC(1ac3ccdf) SHA1(9d1cde8bd4d0f12eaf06225b3ecc4a5c3e4f0c11) )
 	ROM_LOAD( "vli-4-3",        0x2000, 0x1000, CRC(f32cae2b) SHA1(2c6ef82af438e588b56fd58b95cf969c97bb9a66) )
 	ROM_LOAD( "vli-8-4",        0x3000, 0x1000, CRC(611e1dbf) SHA1(0ab6669f1dec30c3f7bca49e158e4790a78fa308) )
 	ROM_LOAD( "l056-6.9a",      0x4000, 0x2000, CRC(548afa52) SHA1(0b88ac7394feede023519c585a4084591eb9661a) )
 	ROM_LOAD( "vli9-5.8a",      0x6000, 0x2000, CRC(5d122f86) SHA1(d1c66b890142bb4d4648f3edec6567f58107dbf0) )
 
-	ROM_REGION( 0x3800, "audiocpu", 0 ) /* TMS9980 code */
+	ROM_REGION( 0x3800, "audiocpu", 0 ) // TMS9980 code
 	ROM_LOAD( "i-o-v2.13c",     0x0000, 0x0800, CRC(09765ebe) SHA1(93b035c3a94f2f6d5e463256e26b600a4dd5d3ea) )
-	ROM_LOAD( "i-o.13a",        0x0800, 0x1000, CRC(1de29f25) SHA1(535acb132266d6137b0610ee9a9b946459ae44af) ) /* speech */
+	ROM_LOAD( "i-o.13a",        0x0800, 0x1000, CRC(1de29f25) SHA1(535acb132266d6137b0610ee9a9b946459ae44af) ) // speech
 	ROM_LOAD( "i-o.11a",        0x2800, 0x1000, CRC(61c74c79) SHA1(9f34d18a919446dd76857b851cea23fc1526f3c2) )
 
-	ROM_REGION( 0x1000, "mcu", 0 ) /* COP420 microcontroller code */
+	ROM_REGION( 0x1000, "mcu", 0 ) // COP420 microcontroller code
 /*
-    ROM_LOAD( "cop.bin",        0x0000, 0x0400, BAD_DUMP CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times, and starting PC is not 0
+    ROM_LOAD( "cop.bin",    0x0000, 0x0400, BAD_DUMP CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times, and starting PC is not 0
     ROM_CONTINUE(           0x0000, 0x0400)
     ROM_CONTINUE(           0x0000, 0x0400)
     ROM_CONTINUE(           0x0000, 0x0400)
 */
-	ROM_LOAD( "cop.bin",        0x00c2, 0x033e, CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times and shifted
+	ROM_LOAD( "cop.bin",    0x00c2, 0x033e, CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times and shifted
 	ROM_CONTINUE(           0x0000, 0x00c2)
 	ROM_CONTINUE(           0x00c2, 0x033e)
 	ROM_CONTINUE(           0x0000, 0x00c2)
@@ -837,12 +831,12 @@
 	ROM_LOAD( "log2.8a",        0x0000, 0x800, CRC(ef3284ac) SHA1(8719c9df8c972a56c306b3c707aaa53092ffa2d6) )
 	ROM_LOAD( "log1-9-3.6a",    0x0800, 0x800, CRC(c434c14c) SHA1(3669aaf7adc6b250378bcf62eb8e7058f55476ef) )
 
-	ROM_REGION( 0x0020, "proms", 0 ) /* color prom */
+	ROM_REGION( 0x0020, "proms", 0 ) // color prom
 	ROM_LOAD( "18s030.11b",     0x0000, 0x0020, CRC(6a0c7d87) SHA1(140335d85c67c75b65689d4e76d29863c209cf32) )
 ROM_END
 
 ROM_START( looping )
-	ROM_REGION( 0x8000, "maincpu", 0 ) /* TMS9995 code */
+	ROM_REGION( 0x8000, "maincpu", 0 ) // TMS9995 code
 	ROM_LOAD( "loop551.bin",        0x0000, 0x1000, CRC(d6bb6db6) SHA1(074eb3bc101096bfe67c3107f306df829ae38548) )
 	ROM_LOAD( "loop552.bin",        0x1000, 0x1000, CRC(bc32956d) SHA1(6ef8d76df1d5b1ed52a4057eae2bf4eb394e4c54) )
 	ROM_LOAD( "loop553.bin",        0x2000, 0x1000, CRC(5f8b9aed) SHA1(32be61788e3d54b23d1663025365b1ab6b96dc91) )
@@ -851,14 +845,14 @@
 	ROM_LOAD( "loop556.bin",        0x5000, 0x1000, CRC(3419a5d5) SHA1(2b0249c54985ab5e12de17c0e3d62caa0c7575e3) )
 	ROM_LOAD( "loop557.bin",        0x6000, 0x1000, CRC(d430e287) SHA1(b0edd25ef4d2468cc1f8c10ac49c545a89d398d7) )
 
-	ROM_REGION( 0x3800, "audiocpu", 0 ) /* TMS9980 code */
+	ROM_REGION( 0x3800, "audiocpu", 0 ) // TMS9980 code
 	ROM_LOAD( "loopc13.bin",        0x0000, 0x1000, CRC(ff9ac4ec) SHA1(9f8df94cd79d86fe4c384df1d5d729b58a7ca7a8) )
 	ROM_LOAD( "loopa13.bin",        0x0800, 0x1000, CRC(1de29f25) SHA1(535acb132266d6137b0610ee9a9b946459ae44af) )
-	ROM_LOAD( "loopa11.bin",        0x2800, 0x1000, CRC(61c74c79) SHA1(9f34d18a919446dd76857b851cea23fc1526f3c2) ) /* speech */
+	ROM_LOAD( "loopa11.bin",        0x2800, 0x1000, CRC(61c74c79) SHA1(9f34d18a919446dd76857b851cea23fc1526f3c2) ) // speech
 
-	ROM_REGION( 0x1000, "mcu", 0 ) /* COP420 microcontroller code */
-	/* taken from the other sets */
-	ROM_LOAD( "cop.bin",        0x00c2, 0x033e, CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times and shifted
+	ROM_REGION( 0x1000, "mcu", 0 ) // COP420 microcontroller code
+	// taken from the other sets
+	ROM_LOAD( "cop.bin",    0x00c2, 0x033e, CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times and shifted
 	ROM_CONTINUE(           0x0000, 0x00c2)
 	ROM_CONTINUE(           0x00c2, 0x033e)
 	ROM_CONTINUE(           0x0000, 0x00c2)
@@ -868,33 +862,33 @@
 	ROM_CONTINUE(           0x0000, 0x00c2)
 
 	ROM_REGION( 0x1000, "gfx1", 0 )
-	ROM_LOAD( "loopaa8.bin",        0x0000, 0x800, CRC(ef3284ac) SHA1(8719c9df8c972a56c306b3c707aaa53092ffa2d6) )
+	ROM_LOAD( "loopaa8.bin",    0x0000, 0x800, CRC(ef3284ac) SHA1(8719c9df8c972a56c306b3c707aaa53092ffa2d6) )
 	ROM_LOAD( "loopaa6.bin",    0x0800, 0x800, CRC(c434c14c) SHA1(3669aaf7adc6b250378bcf62eb8e7058f55476ef) )
 
-	ROM_REGION( 0x0020, "proms", 0 ) /* color prom */
+	ROM_REGION( 0x0020, "proms", 0 ) // color prom
 	ROM_LOAD( "loopvp1.bin",        0x0000, 0x0020, CRC(6a0c7d87) SHA1(140335d85c67c75b65689d4e76d29863c209cf32) )
 ROM_END
 
 ROM_START( skybump )
-	ROM_REGION( 0x8000, "maincpu", 0 ) /* TMS9995 code */
+	ROM_REGION( 0x8000, "maincpu", 0 ) // TMS9995 code
 	ROM_LOAD( "cpu.5a",         0x0000, 0x2000, CRC(dca38df0) SHA1(86abe04cbabf81399f842f53668fe7a3f7ed3757) )
 	ROM_LOAD( "cpu.2a",         0x2000, 0x2000, CRC(6bcc211a) SHA1(245ebae3934df9c3920743a941546d96bb2e7c03) )
 	ROM_LOAD( "cpu.9a",         0x4000, 0x2000, CRC(c7a50797) SHA1(60aa0a28ba970f12d0a0e538ae1c6807d105855c) )
 	ROM_LOAD( "cpu.8a",         0x6000, 0x2000, CRC(a718c6f2) SHA1(19afa8c353829232cb96c27b87f13b43166ab6fc) )
 
-	ROM_REGION( 0x3800, "audiocpu", 0 ) /* TMS9980 code */
+	ROM_REGION( 0x3800, "audiocpu", 0 ) // TMS9980 code
 	ROM_LOAD( "snd.13c",        0x0000, 0x0800, CRC(21e9350c) SHA1(f30a180309e373a17569351944f5e7982c3b3f9d) )
 	ROM_LOAD( "snd.13a",        0x0800, 0x1000, CRC(1de29f25) SHA1(535acb132266d6137b0610ee9a9b946459ae44af) )
 	ROM_LOAD( "snd.11a",        0x2800, 0x1000, CRC(61c74c79) SHA1(9f34d18a919446dd76857b851cea23fc1526f3c2) )
 
-	ROM_REGION( 0x1000, "mcu", 0 ) /* COP420 microcontroller code */
+	ROM_REGION( 0x1000, "mcu", 0 ) // COP420 microcontroller code
 /*
-    ROM_LOAD( "cop.bin",        0x0000, 0x0400, BAD_DUMP CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times, and starting PC is not 0
+    ROM_LOAD( "cop.bin",    0x0000, 0x0400, BAD_DUMP CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times, and starting PC is not 0
     ROM_CONTINUE(           0x0000, 0x0400)
     ROM_CONTINUE(           0x0000, 0x0400)
     ROM_CONTINUE(           0x0000, 0x0400)
 */
-	ROM_LOAD( "cop.bin",        0x00c2, 0x033e, CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times and shifted
+	ROM_LOAD( "cop.bin",    0x00c2, 0x033e, CRC(bbfd26d5) SHA1(5f78b32b6e7c003841ef5b635084db2cdfebf0e1) ) // overdumped 4 times and shifted
 	ROM_CONTINUE(           0x0000, 0x00c2)
 	ROM_CONTINUE(           0x00c2, 0x033e)
 	ROM_CONTINUE(           0x0000, 0x00c2)
@@ -907,7 +901,7 @@
 	ROM_LOAD( "vid.8a",         0x0000, 0x800, CRC(459ccc55) SHA1(747f6789605b48be9e22f779f9e3f6c98ad4e594) )
 	ROM_LOAD( "vid.6a",         0x0800, 0x800, CRC(12ebbe74) SHA1(0f87c81a45d1bf3b8c6a70ee5e1a014069f67755) )
 
-	ROM_REGION( 0x0020, "proms", 0 ) /* color prom */
+	ROM_REGION( 0x0020, "proms", 0 ) // color prom
 	ROM_LOAD( "vid.clr",        0x0000, 0x0020, CRC(6a0c7d87) SHA1(140335d85c67c75b65689d4e76d29863c209cf32) )
 ROM_END
 
@@ -924,13 +918,11 @@
 	int length = memregion("maincpu")->bytes();
 	uint8_t *rom = memregion("maincpu")->base();
 
-	m_cop_port_l = 0;
-
-	/* bitswap the TMS9995 ROMs */
+	// bitswap the TMS9995 ROMs
 	for (int i = 0; i < length; i++)
 		rom[i] = bitswap<8>(rom[i], 0,1,2,3,4,5,6,7);
 
-	/* install protection handlers */
+	// install protection handlers
 	m_maincpu->space(AS_PROGRAM).install_read_handler(0x7000, 0x7007, read8smo_delegate(*this, FUNC(looping_state::protection_r)));
 }
 
@@ -942,7 +934,7 @@
  *
  *************************************/
 
-GAME( 1982, looping,   0,        looping, looping, looping_state, init_looping, ROT90, "Video Games GmbH", "Looping", MACHINE_IMPERFECT_SOUND /*| MACHINE_SUPPORTS_SAVE */)
-GAME( 1982, loopingv,  looping,  looping, looping, looping_state, init_looping, ROT90, "Video Games GmbH (Venture Line license)", "Looping (Venture Line license, set 1)", MACHINE_IMPERFECT_SOUND /* | MACHINE_SUPPORTS_SAVE */)
-GAME( 1982, loopingva, looping,  looping, looping, looping_state, init_looping, ROT90, "Video Games GmbH (Venture Line license)", "Looping (Venture Line license, set 2)", MACHINE_IMPERFECT_SOUND /* | MACHINE_SUPPORTS_SAVE */ )
-GAME( 1982, skybump,   0,        looping, skybump, looping_state, init_looping, ROT90, "Venture Line", "Sky Bumper", MACHINE_IMPERFECT_SOUND /* | MACHINE_SUPPORTS_SAVE  */)
+GAME( 1982, looping,   0,        looping, looping, looping_state, init_looping, ROT90, "Video Games GmbH", "Looping", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, loopingv,  looping,  looping, looping, looping_state, init_looping, ROT90, "Video Games GmbH (Venture Line license)", "Looping (Venture Line license, set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, loopingva, looping,  looping, looping, looping_state, init_looping, ROT90, "Video Games GmbH (Venture Line license)", "Looping (Venture Line license, set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, skybump,   0,        looping, skybump, looping_state, init_looping, ROT90, "Venture Line", "Sky Bumper", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/lucky37.cpp mame-0.224+dfsg.1/src/mame/drivers/lucky37.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/lucky37.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/lucky37.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -32,6 +32,21 @@
   A001: marked B 9G1. Sticker: 8907 1991.03 L-21-D BET/WON
   MCU: Sticker: 8907 1990.10 L21-D M.COM
 
+
+  Bingo 75:
+  A001: marks can't be seen. Sticker: WE8802-A 1989.2
+  PCB marked: Wing 8802-C
+
+  1x scratched DIL40 (@ location 3r)
+  1x 89206A 61H09516P (@ location 7s)
+  1x 101B10P (@ location 7p)
+  2x 06B53P (@ locations 1d & 2d)
+  1x 06B49P (@ location 2b)
+
+  1x 12 MHz Xtal (@ location 3t)
+  5x 8 DIP switches banks (@ locations 5l, 5m, 5n, 5p & 5r)
+
+
   Not much can be done until main CPU ROMs are dumped.
 */
 
@@ -211,7 +226,32 @@
 	ROM_LOAD( "6.bin", 0xa0000, 0x20000, CRC(3283c1b7) SHA1(7a30dd55216b47332ea7c18c2378352f405b2f0a) )
 ROM_END
 
+ROM_START( bingo75 )    // runs on wing 8802-c board
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "a001-nomarks", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x4000, "mcu", 0 )
+	ROM_LOAD( "internal_rom", 0x0000, 0x4000,  NO_DUMP )
+
+	ROM_REGION( 0x40000, "unsorted", 0 )
+	ROM_LOAD( "6.bin", 0x00000, 0x10000, CRC(bda18251) SHA1(7e9ddea30bbedcc9f4b48a2ca2660505ed45ca8d) )
+	ROM_LOAD( "7.bin", 0x10000, 0x10000, CRC(1316d78b) SHA1(9f7a7c5407642d2aad6765d3fb00c7fb5bd08561) )
+	ROM_LOAD( "8.bin", 0x20000, 0x10000, CRC(6a3ce8f1) SHA1(48d3a1d3c1739200c10599ec9451683ba60487eb) )
+	ROM_LOAD( "9.bin", 0x30000, 0x10000, CRC(325169c5) SHA1(00f3fa44c8bda7fd4a9e7855b5681f254ab6de84) )
+
+	ROM_REGION( 0x0700, "proms", 0 )
+	ROM_LOAD( "27s21.4h",  0x0000, 0x0100, CRC(21ae1edd) SHA1(df6204f30412b5c1835146127f45956bc986b182) )
+	ROM_LOAD( "27s21.4j",  0x0100, 0x0100, CRC(a6c2ed16) SHA1(e472bebdc982239ebef5ebe361fb07e6469fc5ed) )
+	ROM_LOAD( "27s21.5h",  0x0200, 0x0100, CRC(a5b1dd09) SHA1(0af6eacc09742f35d2703ba011df20f582ce676a) )
+	ROM_LOAD( "27s21.5j",  0x0300, 0x0100, CRC(0d985358) SHA1(ceb32eb6fd1804febdd1766f8590ae0db1b03faa) )
+	ROM_LOAD( "27s21.5k",  0x0400, 0x0100, CRC(40e880c0) SHA1(74eafbf9506651991b66b6264664325204f61227) )
+	ROM_LOAD( "82s129.4k", 0x0500, 0x0100, CRC(0a9e160d) SHA1(d2377850aa344b027a974ef116bb1aee852d61d8) )
+	ROM_LOAD( "82s129.5f", 0x0600, 0x0100, CRC(83c3ec8f) SHA1(4a6452ef73061a446e6a8ceb9d077bc71cc8e2b2) )
+ROM_END
+
+
 GAME( 199?, lucky21,  0, lucky37, lucky37,  lucky37_state, empty_init, ROT0, "Wing Co., Ltd.", "Lucky 21",   MACHINE_IS_SKELETON )
 GAME( 199?, lucky21d, 0, lucky37, lucky37,  lucky37_state, empty_init, ROT0, "Wing Co., Ltd.", "Lucky 21-D", MACHINE_IS_SKELETON )
 GAME( 199?, lucky25,  0, lucky37, lucky37,  lucky37_state, empty_init, ROT0, "Wing Co., Ltd.", "Lucky 25",   MACHINE_IS_SKELETON )
 GAME( 199?, lucky37,  0, lucky37, lucky37,  lucky37_state, empty_init, ROT0, "Wing Co., Ltd.", "Lucky 37",   MACHINE_IS_SKELETON )
+GAME( 199?, bingo75,  0, lucky37, lucky37,  lucky37_state, empty_init, ROT0, "Wing Co., Ltd.", "Bingo 75",   MACHINE_IS_SKELETON )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/lucky74.cpp mame-0.224+dfsg.1/src/mame/drivers/lucky74.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/lucky74.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/lucky74.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -709,7 +709,7 @@
     - Changes on the interrupt system (need to be verified on the PCB).
     - Renamed the graphics regions to more descriptive names.
     - Corrected the manufacturer's name.
-    - Splitted the driver to driver + video.
+    - Split the driver to driver + video.
     - Updated technical notes.
 
 
@@ -763,7 +763,6 @@
 
 #include "cpu/z80/z80.h"
 #include "sound/ay8910.h"
-#include "sound/msm5205.h"
 #include "sound/sn76496.h"
 #include "machine/i8255.h"
 #include "machine/nvram.h"
@@ -773,29 +772,42 @@
 #include "lucky74.lh"
 
 
-#define MASTER_CLOCK        XTAL(12'000'000)      /* confirmed */
+#define MASTER_CLOCK        XTAL(12'000'000)      // confirmed
 
-/* custom 06B49P clocks */
-#define C_06B49P_CLKOUT_01  (MASTER_CLOCK/2)        /* 6 MHz. */
-#define C_06B49P_CLKOUT_02  (MASTER_CLOCK/4)        /* 3 MHz. */
-#define C_06B49P_CLKOUT_03  (MASTER_CLOCK/4)        /* 3 MHz. */
-#define C_06B49P_CLKOUT_04  (MASTER_CLOCK/8)        /* 1.5 MHz. */
-#define C_06B49P_CLKOUT_05  (MASTER_CLOCK/16)       /* 750 kHz. */
-#define C_06B49P_CLKOUT_06  (MASTER_CLOCK/32)       /* 375 kHz. */
-#define C_06B49P_CLKOUT_07  (MASTER_CLOCK/64)       /* 187.5 kHz. */
-#define C_06B49P_CLKOUT_08  (MASTER_CLOCK/128)      /* 93.75 kHz. */
-#define C_06B49P_CLKOUT_09  (MASTER_CLOCK/256)      /* 46875 Hz. */
-#define C_06B49P_CLKOUT_10  (7782)                  /* 7782 Hz. measured */
-#define C_06B49P_CLKOUT_11  (3920)                  /* 3920 Hz. measured */
-#define C_06B49P_CLKOUT_12  (1960)                  /* 1960 Hz. measured */
-#define C_06B49P_CLKOUT_13  (950)                   /* 950 Hz. measured */
-#define C_06B49P_CLKOUT_14  (475)                   /* 475 Hz. measured */
-#define C_06B49P_CLKOUT_15  (237)                   /* 237 Hz. measured */
-#define C_06B49P_CLKOUT_16  (MASTER_CLOCK/100000)   /* 120 Hz. */
-#define C_06B49P_CLKOUT_17  (MASTER_CLOCK/200000)   /* 60 Hz. */
-#define C_06B49P_CLKOUT_18  (MASTER_CLOCK/256/3)    /* 15625 Hz. (H-Sync) */
-#define C_06B49P_CLKOUT_19  (MASTER_CLOCK/200000)   /* 60 Hz. (V-Sync) */
+// custom 06B49P clocks
+#define C_06B49P_CLKOUT_01  (MASTER_CLOCK/2)        // 6 MHz.
+#define C_06B49P_CLKOUT_02  (MASTER_CLOCK/4)        // 3 MHz.
+#define C_06B49P_CLKOUT_03  (MASTER_CLOCK/4)        // 3 MHz.
+#define C_06B49P_CLKOUT_04  (MASTER_CLOCK/8)        // 1.5 MHz.
+#define C_06B49P_CLKOUT_05  (MASTER_CLOCK/16)       // 750 kHz.
+#define C_06B49P_CLKOUT_06  (MASTER_CLOCK/32)       // 375 kHz.
+#define C_06B49P_CLKOUT_07  (MASTER_CLOCK/64)       // 187.5 kHz.
+#define C_06B49P_CLKOUT_08  (MASTER_CLOCK/128)      // 93.75 kHz.
+#define C_06B49P_CLKOUT_09  (MASTER_CLOCK/256)      // 46875 Hz.
+#define C_06B49P_CLKOUT_10  (7782)                  // 7782 Hz. measured
+#define C_06B49P_CLKOUT_11  (3920)                  // 3920 Hz. measured
+#define C_06B49P_CLKOUT_12  (1960)                  // 1960 Hz. measured
+#define C_06B49P_CLKOUT_13  (950)                   // 950 Hz. measured
+#define C_06B49P_CLKOUT_14  (475)                   // 475 Hz. measured
+#define C_06B49P_CLKOUT_15  (237)                   // 237 Hz. measured
+#define C_06B49P_CLKOUT_16  (MASTER_CLOCK/100000)   // 120 Hz.
+#define C_06B49P_CLKOUT_17  (MASTER_CLOCK/200000)   // 60 Hz.
+#define C_06B49P_CLKOUT_18  (MASTER_CLOCK/256/3)    // 15625 Hz. (H-Sync)
+#define C_06B49P_CLKOUT_19  (MASTER_CLOCK/200000)   // 60 Hz. (V-Sync)
 
+void lucky74_state::machine_start()
+{
+	m_lamps.resolve();
+
+	save_item(NAME(m_ym2149_portb));
+	save_item(NAME(m_usart_8251));
+	save_item(NAME(m_copro_sm7831));
+	save_item(NAME(m_adpcm_pos));
+	save_item(NAME(m_adpcm_end));
+	save_item(NAME(m_adpcm_data));
+	save_item(NAME(m_adpcm_reg));
+	save_item(NAME(m_adpcm_busy_line));
+}
 
 void lucky74_state::machine_reset()
 {
@@ -838,28 +850,28 @@
 
 uint8_t lucky74_state::usart_8251_r()
 {
-	/* reads to USART 8251 port */
+	// reads to USART 8251 port
 	logerror("read from USART port.\n");
 	return 0xff;
 }
 
 void lucky74_state::usart_8251_w(uint8_t data)
 {
-	/* writes to USART 8251 port */
+	// writes to USART 8251 port
 	m_usart_8251 = data;
 	logerror("write to USART port: %02x \n", m_usart_8251);
 }
 
 uint8_t lucky74_state::copro_sm7831_r()
 {
-	/* read from SM7831 co-processor */
+	// read from SM7831 co-processor
 	logerror("read from co-processor.\n");
 	return 0xff;
 }
 
 void lucky74_state::copro_sm7831_w(uint8_t data)
 {
-	/* write to SM7831 co-processor */
+	// write to SM7831 co-processor
 	m_copro_sm7831 = data;
 	logerror("write to co-processor: %2X\n", m_copro_sm7831);
 }
@@ -878,10 +890,10 @@
     ---- xx--  BIG + SMALL (need to be individualized)
 */
 
-	m_lamps[8] = BIT(data, 0);      /* D-UP */
-	m_lamps[9] = BIT(data, 1);      /* TAKE SCORE */
-	m_lamps[10] = BIT(data, 2);     /* BIG */
-	m_lamps[11] = BIT(data, 3);     /* SMALL */
+	m_lamps[8] = BIT(data, 0);      // D-UP
+	m_lamps[9] = BIT(data, 1);      // TAKE SCORE
+	m_lamps[10] = BIT(data, 2);     // BIG
+	m_lamps[11] = BIT(data, 3);     // SMALL
 }
 
 void lucky74_state::lamps_b_w(uint8_t data)
@@ -895,17 +907,17 @@
     ---- x---  HOLD4
     ---x ----  HOLD5
     -xx- ----  BET + START (need to be individualized)
-    x--- ----  CANCEL (should lit start too?)
+    x--- ----  CANCEL (should light start too?)
 */
 
-	m_lamps[0] = BIT(data, 0);                 /* HOLD1 */
-	m_lamps[1] = BIT(data, 1);                 /* HOLD2 */
-	m_lamps[2] = BIT(data, 2);                 /* HOLD3 */
-	m_lamps[3] = BIT(data, 3);                 /* HOLD4 */
-	m_lamps[4] = BIT(data, 4);                 /* HOLD5 */
-	m_lamps[5] = BIT(data, 5);                 /* BET */
-	m_lamps[6] = BIT(data, 6) | BIT(data, 7);  /* START */
-	m_lamps[7] = BIT(data, 7);                 /* CANCEL */
+	m_lamps[0] = BIT(data, 0);                 // HOLD1
+	m_lamps[1] = BIT(data, 1);                 // HOLD2
+	m_lamps[2] = BIT(data, 2);                 // HOLD3
+	m_lamps[3] = BIT(data, 3);                 // HOLD4
+	m_lamps[4] = BIT(data, 4);                 // HOLD5
+	m_lamps[5] = BIT(data, 5);                 // BET
+	m_lamps[6] = BIT(data, 6) | BIT(data, 7);  // START
+	m_lamps[7] = BIT(data, 7);                 // CANCEL
 }
 
 
@@ -915,7 +927,7 @@
 
 INTERRUPT_GEN_MEMBER(lucky74_state::nmi_interrupt)
 {
-	if ((m_ym2149_portb & 0x10) == 0)   /* ym2149 portB bit 4 trigger the NMI */
+	if ((m_ym2149_portb & 0x10) == 0)   // ym2149 portB bit 4 triggers the NMI
 	{
 		device.execute().pulse_input_line(INPUT_LINE_NMI, attotime::zero);
 	}
@@ -926,31 +938,31 @@
 * Memory Map Information *
 *************************/
 
-void lucky74_state::lucky74_map(address_map &map)
+void lucky74_state::prg_map(address_map &map)
 {
 	map(0x0000, 0xbfff).rom();
-	map(0xc000, 0xcfff).ram().share("nvram");   /* NVRAM */
-	map(0xd000, 0xd7ff).ram().w(FUNC(lucky74_state::lucky74_fg_videoram_w)).share("fg_videoram");       // VRAM1-1
-	map(0xd800, 0xdfff).ram().w(FUNC(lucky74_state::lucky74_fg_colorram_w)).share("fg_colorram");       // VRAM1-2
-	map(0xe000, 0xe7ff).ram().w(FUNC(lucky74_state::lucky74_bg_videoram_w)).share("bg_videoram");       // VRAM2-1
-	map(0xe800, 0xefff).ram().w(FUNC(lucky74_state::lucky74_bg_colorram_w)).share("bg_colorram");       // VRAM2-2
-	map(0xf000, 0xf003).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write));           // Input Ports 0 & 1
-	map(0xf080, 0xf083).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write));           // DSW 1, 2 & 3
-	map(0xf0c0, 0xf0c3).rw("ppi8255_3", FUNC(i8255_device::read), FUNC(i8255_device::write));           // DSW 4
-	map(0xf100, 0xf100).w("sn1", FUNC(sn76489_device::write));                                      // SN76489 #1
-	map(0xf200, 0xf203).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write));           // Input Ports 2 & 4
-	map(0xf300, 0xf300).w("sn2", FUNC(sn76489_device::write));                                      // SN76489 #2
-	map(0xf400, 0xf400).w("aysnd", FUNC(ay8910_device::address_w));                                     // YM2149 control
-	map(0xf500, 0xf500).w("sn3", FUNC(sn76489_device::write));                                      // SN76489 #3
-	map(0xf600, 0xf600).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w));          // YM2149 (Input Port 1)
-	map(0xf700, 0xf701).rw(FUNC(lucky74_state::usart_8251_r), FUNC(lucky74_state::usart_8251_w));       // USART 8251 port
-	map(0xf800, 0xf803).rw(FUNC(lucky74_state::copro_sm7831_r), FUNC(lucky74_state::copro_sm7831_w));   // SM7831 Co-Processor
+	map(0xc000, 0xcfff).ram().share("nvram");   // NVRAM
+	map(0xd000, 0xd7ff).ram().w(FUNC(lucky74_state::fg_videoram_w)).share(m_fg_videoram);             // VRAM1-1
+	map(0xd800, 0xdfff).ram().w(FUNC(lucky74_state::fg_colorram_w)).share(m_fg_colorram);             // VRAM1-2
+	map(0xe000, 0xe7ff).ram().w(FUNC(lucky74_state::bg_videoram_w)).share(m_bg_videoram);             // VRAM2-1
+	map(0xe800, 0xefff).ram().w(FUNC(lucky74_state::bg_colorram_w)).share(m_bg_colorram);             // VRAM2-2
+	map(0xf000, 0xf003).rw("ppi8255_0", FUNC(i8255_device::read), FUNC(i8255_device::write));         // Input Ports 0 & 1
+	map(0xf080, 0xf083).rw("ppi8255_2", FUNC(i8255_device::read), FUNC(i8255_device::write));         // DSW 1, 2 & 3
+	map(0xf0c0, 0xf0c3).rw("ppi8255_3", FUNC(i8255_device::read), FUNC(i8255_device::write));         // DSW 4
+	map(0xf100, 0xf100).w("sn1", FUNC(sn76489_device::write));                                        // SN76489 #1
+	map(0xf200, 0xf203).rw("ppi8255_1", FUNC(i8255_device::read), FUNC(i8255_device::write));         // Input Ports 2 & 4
+	map(0xf300, 0xf300).w("sn2", FUNC(sn76489_device::write));                                        // SN76489 #2
+	map(0xf400, 0xf400).w("aysnd", FUNC(ay8910_device::address_w));                                   // YM2149 control
+	map(0xf500, 0xf500).w("sn3", FUNC(sn76489_device::write));                                        // SN76489 #3
+	map(0xf600, 0xf600).rw("aysnd", FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_w));        // YM2149 (Input Port 1)
+	map(0xf700, 0xf701).rw(FUNC(lucky74_state::usart_8251_r), FUNC(lucky74_state::usart_8251_w));     // USART 8251 port
+	map(0xf800, 0xf803).rw(FUNC(lucky74_state::copro_sm7831_r), FUNC(lucky74_state::copro_sm7831_w)); // SM7831 Co-Processor
 }
 
-void lucky74_state::lucky74_portmap(address_map &map)
+void lucky74_state::portmap(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0x00, 0x05).rw(FUNC(lucky74_state::custom_09R81P_port_r), FUNC(lucky74_state::custom_09R81P_port_w));           /* custom 09R81P (samples system) */
+	map(0x00, 0x05).rw(FUNC(lucky74_state::custom_09R81P_port_r), FUNC(lucky74_state::custom_09R81P_port_w));           // custom 09R81P (samples system)
 	map(0xff, 0xff).ram(); // presumably HS satellite control port (check patched in Lucky 74)
 }
 
@@ -1019,24 +1031,24 @@
     Test mode shows them as dupes. Maybe are multiplexed?
 */
 	PORT_START("IN0")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_POKER_HOLD1 )    /* 'A' in test mode */
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD2 )    /* 'B' in test mode */
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_HOLD3 )    /* 'C' in test mode */
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_POKER_HOLD4 )    /* 'D' in test mode */
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_HOLD5 )    /* 'E' in test mode */
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_LOW ) PORT_NAME("Small")  /* 'F' in test mode */
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE )    PORT_NAME("Flip SC Off") PORT_CODE(KEYCODE_O)  /* 'G' in test mode (normal screen) */
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER )      PORT_NAME("Input H") PORT_CODE(KEYCODE_K)  /* 'H' in test mode */
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_POKER_HOLD1 )    // 'A' in test mode
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_POKER_HOLD2 )    // 'B' in test mode
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_HOLD3 )    // 'C' in test mode
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_POKER_HOLD4 )    // 'D' in test mode
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_POKER_HOLD5 )    // 'E' in test mode
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_LOW ) PORT_NAME("Small")  // 'F' in test mode
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE )    PORT_NAME("Flip SC Off") PORT_CODE(KEYCODE_O)  // 'G' in test mode (normal screen)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER )      PORT_NAME("Input H") PORT_CODE(KEYCODE_K)  // 'H' in test mode
 
 	PORT_START("IN1")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )     /* 'I' in test mode */
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )     PORT_NAME("Start")  /* 'J' in test mode */
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_CANCEL )   /* 'K' in test mode */
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_D_UP )        /* 'L' in test mode */
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_GAMBLE_TAKE )        /* 'M' & 'Q' in test mode */
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_HIGH ) PORT_NAME("Big")   /* 'N' & 'P' in test mode */
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE )    PORT_NAME("Flip SC On")  PORT_CODE(KEYCODE_I)  /* 'O' in test mode (inverted screen) */
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )        /* not in test mode */
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_GAMBLE_BET )     // 'I' in test mode
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )     PORT_NAME("Start")  // 'J' in test mode
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_POKER_CANCEL )   // 'K' in test mode
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_GAMBLE_D_UP )        // 'L' in test mode
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_GAMBLE_TAKE )        // 'M' & 'Q' in test mode
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_GAMBLE_HIGH ) PORT_NAME("Big")   // 'N' & 'P' in test mode
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE )    PORT_NAME("Flip SC On")  PORT_CODE(KEYCODE_I)  // 'O' in test mode (inverted screen)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )        // not in test mode
 
 	PORT_START("IN2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1048,11 +1060,11 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
-	PORT_START("IN3")   /* YM2149, port A */
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )    PORT_IMPULSE(2)   /* Coin A */
+	PORT_START("IN3")   // YM2149, port A
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )    PORT_IMPULSE(2)   // Coin A
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_GAMBLE_KEYIN )
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )    PORT_IMPULSE(2)   /* Coin B */
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 )    PORT_IMPULSE(2)   /* Coin C */
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN2 )    PORT_IMPULSE(2)   // Coin B
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 )    PORT_IMPULSE(2)   // Coin C
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_GAMBLE_SERVICE )  PORT_NAME("Service")
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -1069,38 +1081,38 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("DSW1")
-	PORT_DIPNAME( 0x01, 0x01, "Auto Hold" )             PORT_DIPLOCATION("DSW1:1")  /* see note 1 */
+	PORT_DIPNAME( 0x01, 0x01, "Auto Hold" )             PORT_DIPLOCATION("DSW1:1")  // see note 1
 	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( Yes ) )
-	PORT_DIPNAME( 0x02, 0x02, "Jackpot" )               PORT_DIPLOCATION("DSW1:2")  /* see note 2 */
+	PORT_DIPNAME( 0x02, 0x02, "Jackpot" )               PORT_DIPLOCATION("DSW1:2")  // see note 2
 	PORT_DIPSETTING(    0x02, "Bet x 100" )
 	PORT_DIPSETTING(    0x00, "Bet x 150" )
-	PORT_DIPNAME( 0x04, 0x04, "Ceiling Bonus Point" )   PORT_DIPLOCATION("DSW1:3")  /* see note 3 */
+	PORT_DIPNAME( 0x04, 0x04, "Ceiling Bonus Point" )   PORT_DIPLOCATION("DSW1:3")  // see note 3
 	PORT_DIPSETTING(    0x04, "Bet x 40"  )
 	PORT_DIPSETTING(    0x00, "Bet x 50"  )
-	PORT_DIPNAME( 0x78, 0x40, "Percentage" )            PORT_DIPLOCATION("DSW1:4,5,6,7")    /* see note 4 */
-	PORT_DIPSETTING(    0x00, "90%" )   /* 110% in the instruction sheet */
-	PORT_DIPSETTING(    0x08, "87%" )   /* 106% in the instruction sheet */
-	PORT_DIPSETTING(    0x10, "84%" )   /* 102% in the instruction sheet */
-	PORT_DIPSETTING(    0x18, "81%" )   /* 98% in the instruction sheet */
-	PORT_DIPSETTING(    0x20, "78%" )   /* 94% in the instruction sheet */
-	PORT_DIPSETTING(    0x28, "75%" )   /* 90% in the instruction sheet */
-	PORT_DIPSETTING(    0x30, "72%" )   /* 86% in the instruction sheet */
-	PORT_DIPSETTING(    0x38, "69%" )   /* 82% in the instruction sheet */
-	PORT_DIPSETTING(    0x40, "66%" )   /* 78% in the instruction sheet */
-	PORT_DIPSETTING(    0x48, "63%" )   /* 74% in the instruction sheet */
-	PORT_DIPSETTING(    0x50, "60%" )   /* 70% in the instruction sheet */
-	PORT_DIPSETTING(    0x58, "57%" )   /* 66% in the instruction sheet */
-	PORT_DIPSETTING(    0x60, "54%" )   /* 62% in the instruction sheet */
-	PORT_DIPSETTING(    0x68, "51%" )   /* 58% in the instruction sheet */
-	PORT_DIPSETTING(    0x70, "48%" )   /* 54% in the instruction sheet */
-	PORT_DIPSETTING(    0x78, "45%" )   /* 50% in the instruction sheet */
+	PORT_DIPNAME( 0x78, 0x40, "Percentage" )            PORT_DIPLOCATION("DSW1:4,5,6,7")    // see note 4
+	PORT_DIPSETTING(    0x00, "90%" )   // 110% in the instruction sheet
+	PORT_DIPSETTING(    0x08, "87%" )   // 106% in the instruction sheet
+	PORT_DIPSETTING(    0x10, "84%" )   // 102% in the instruction sheet
+	PORT_DIPSETTING(    0x18, "81%" )   // 98% in the instruction sheet
+	PORT_DIPSETTING(    0x20, "78%" )   // 94% in the instruction sheet
+	PORT_DIPSETTING(    0x28, "75%" )   // 90% in the instruction sheet
+	PORT_DIPSETTING(    0x30, "72%" )   // 86% in the instruction sheet
+	PORT_DIPSETTING(    0x38, "69%" )   // 82% in the instruction sheet
+	PORT_DIPSETTING(    0x40, "66%" )   // 78% in the instruction sheet
+	PORT_DIPSETTING(    0x48, "63%" )   // 74% in the instruction sheet
+	PORT_DIPSETTING(    0x50, "60%" )   // 70% in the instruction sheet
+	PORT_DIPSETTING(    0x58, "57%" )   // 66% in the instruction sheet
+	PORT_DIPSETTING(    0x60, "54%" )   // 62% in the instruction sheet
+	PORT_DIPSETTING(    0x68, "51%" )   // 58% in the instruction sheet
+	PORT_DIPSETTING(    0x70, "48%" )   // 54% in the instruction sheet
+	PORT_DIPSETTING(    0x78, "45%" )   // 50% in the instruction sheet
 	PORT_DIPNAME( 0x80, 0x80, "Panties" )               PORT_DIPLOCATION("DSW1:8")
 	PORT_DIPSETTING(    0x00, "Without" )
 	PORT_DIPSETTING(    0x80, "With" )
 
 	PORT_START("DSW2")
-	/* DIPs 1-4 handle the harcoded coinage for Coin A, B and Remote credits (B = A x 5; R = A x 10) */
+	// DIPs 1-4 handle the hardcoded coinage for Coin A, B and Remote credits (B = A x 5; R = A x 10)
 	PORT_DIPNAME( 0x0f, 0x0f, "Coinage A, B & Remote" ) PORT_DIPLOCATION("DSW2:1,2,3,4")
 	PORT_DIPSETTING(    0x00, "A: 20 Coins/1 Credit; B: 4 Coins/1 Credit;   R: 2 Pulses/1 Credit" )
 	PORT_DIPSETTING(    0x01, "A: 15 Coins/1 Credit; B: 3 Coins/1 Credit;   R: 15 Pulses/10 Credits" )
@@ -1118,13 +1130,13 @@
 	PORT_DIPSETTING(    0x0d, "A: 1 Coin/2 Credits;  B: 1 Coin/10 Credits;  R: 1 Pulse/20 Credits" )
 	PORT_DIPSETTING(    0x0e, "A: 1 Coin/5 Credits;  B: 1 Coin/25 Credits;  R: 1 Pulse/50 Credits" )
 	PORT_DIPSETTING(    0x0f, "A: 1 Coin/10 Credits; B: 1 Coin/50 Credits;  R: 1 Pulse/100 Credits" )
-	/* DIPs 5-8 handle the Coin C coinage */
+	// DIPs 5-8 handle the Coin C coinage
 	PORT_DIPNAME( 0xf0, 0xf0, "Coinage C" )             PORT_DIPLOCATION("DSW2:5,6,7,8")
 	PORT_DIPSETTING(    0x00, "10 Coins/1 Credit" )
 	PORT_DIPSETTING(    0x10, DEF_STR( 5C_1C ) )
 	PORT_DIPSETTING(    0x30, DEF_STR( 4C_1C ) )
 	PORT_DIPSETTING(    0x40, DEF_STR( 3C_1C ) )
-	PORT_DIPSETTING(    0x20, "5 Coins/2 Credits" )     /* 2.5 coins per credit */
+	PORT_DIPSETTING(    0x20, "5 Coins/2 Credits" )     // 2.5 coins per credit
 	PORT_DIPSETTING(    0x50, DEF_STR( 2C_1C ) )
 	PORT_DIPSETTING(    0x70, DEF_STR( 1C_1C ) )
 	PORT_DIPSETTING(    0x60, DEF_STR( 2C_3C ) )
@@ -1141,7 +1153,7 @@
 	PORT_DIPNAME( 0x01, 0x00, "Bet Max" )                       PORT_DIPLOCATION("DSW3:1")
 	PORT_DIPSETTING(    0x01, "20" )
 	PORT_DIPSETTING(    0x00, "40" )
-	PORT_DIPNAME( 0x06, 0x06, "Minimum Bet" )                   PORT_DIPLOCATION("DSW3:2,3")    /* Bet Min */
+	PORT_DIPNAME( 0x06, 0x06, "Minimum Bet" )                   PORT_DIPLOCATION("DSW3:2,3")    // Bet Min
 	PORT_DIPSETTING(    0x06, "1" )
 	PORT_DIPSETTING(    0x04, "5" )
 	PORT_DIPSETTING(    0x02, "8" )
@@ -1151,12 +1163,12 @@
 	PORT_DIPSETTING(    0x10, "10000" )
 	PORT_DIPSETTING(    0x08, "15000" )
 	PORT_DIPSETTING(    0x00, "20000" )
-	PORT_DIPNAME( 0x20, 0x20, "Woman's figure in Main Game" )   PORT_DIPLOCATION("DSW3:6")  /* see note 6 */
+	PORT_DIPNAME( 0x20, 0x20, "Woman's figure in Main Game" )   PORT_DIPLOCATION("DSW3:6")  // see note 6
 	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( Yes ) )
 	PORT_DIPNAME( 0x40, 0x40, "Type of Poker" )                 PORT_DIPLOCATION("DSW3:7")
-	PORT_DIPSETTING(    0x40, "A - Without Wild Card" ) /* see the game notes */
-	PORT_DIPSETTING(    0x00, "B - Joker Wild Poker" )  /* see the game notes */
+	PORT_DIPSETTING(    0x40, "A - Without Wild Card" ) // see the game notes
+	PORT_DIPSETTING(    0x00, "B - Joker Wild Poker" )  // see the game notes
 	PORT_DIPNAME( 0x80, 0x80, "Kinds of Poker" )                PORT_DIPLOCATION("DSW3:8")
 	PORT_DIPSETTING(    0x80, "A - Hold" )
 	PORT_DIPSETTING(    0x00, "B - Discard" )
@@ -1171,20 +1183,20 @@
 	PORT_DIPNAME( 0x04, 0x00, "Hopper Capacity" )               PORT_DIPLOCATION("DSW4:3")
 	PORT_DIPSETTING(    0x04, "700" )
 	PORT_DIPSETTING(    0x00, "Unlimited" )
-	PORT_DIPNAME( 0x08, 0x08, "Woman's figure in D-UP game" )   PORT_DIPLOCATION("DSW4:4")  /* doesn't seems to work */
+	PORT_DIPNAME( 0x08, 0x08, "Woman's figure in D-UP game" )   PORT_DIPLOCATION("DSW4:4")  // doesn't seems to work
 	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x08, DEF_STR( Yes ) )
 	PORT_DIPNAME( 0x10, 0x10, "Double-Up game" )                PORT_DIPLOCATION("DSW4:5")
 	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x10, DEF_STR( Yes ) )
-	PORT_DIPNAME( 0x20, 0x20, "Stop by 6th Double-Up" )         PORT_DIPLOCATION("DSW4:6")  /* see note 7 */
+	PORT_DIPNAME( 0x20, 0x20, "Stop by 6th Double-Up" )         PORT_DIPLOCATION("DSW4:6")  // see note 7
 	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( Yes ) )
 	PORT_DIPNAME( 0xC0, 0xC0, "Double-Up difficulty" )          PORT_DIPLOCATION("DSW4:7,8")
-	PORT_DIPSETTING(    0x00, DEF_STR( Hardest ) )  /* easy      (from instruction sheet) */
-	PORT_DIPSETTING(    0x40, DEF_STR( Hard ) )     /* ....      (from instruction sheet) */
-	PORT_DIPSETTING(    0x80, DEF_STR( Normal ) )   /* ....      (from instruction sheet) */
-	PORT_DIPSETTING(    0xC0, DEF_STR( Easy ) )     /* difficult (from instruction sheet) */
+	PORT_DIPSETTING(    0x00, DEF_STR( Hardest ) )  // easy      (from instruction sheet)
+	PORT_DIPSETTING(    0x40, DEF_STR( Hard ) )     // ....      (from instruction sheet)
+	PORT_DIPSETTING(    0x80, DEF_STR( Normal ) )   // ....      (from instruction sheet)
+	PORT_DIPSETTING(    0xC0, DEF_STR( Easy ) )     // difficult (from instruction sheet)
 INPUT_PORTS_END
 
 
@@ -1194,22 +1206,22 @@
 
 	PORT_MODIFY("DSW1")
 	PORT_DIPNAME( 0x78, 0x40, "Percentage" )    PORT_DIPLOCATION("DSW1:4,5,6,7")
-	PORT_DIPSETTING(    0x00, "110%" )   /* 110% in the instruction sheet */
-	PORT_DIPSETTING(    0x08, "106%" )   /* 106% in the instruction sheet */
-	PORT_DIPSETTING(    0x10, "102%" )   /* 102% in the instruction sheet */
-	PORT_DIPSETTING(    0x18, "98%" )   /* 98% in the instruction sheet */
-	PORT_DIPSETTING(    0x20, "94%" )   /* 94% in the instruction sheet */
-	PORT_DIPSETTING(    0x28, "90%" )   /* 90% in the instruction sheet */
-	PORT_DIPSETTING(    0x30, "86%" )   /* 86% in the instruction sheet */
-	PORT_DIPSETTING(    0x38, "82%" )   /* 82% in the instruction sheet */
-	PORT_DIPSETTING(    0x40, "78%" )   /* 78% in the instruction sheet */
-	PORT_DIPSETTING(    0x48, "74%" )   /* 74% in the instruction sheet */
-	PORT_DIPSETTING(    0x50, "70%" )   /* 70% in the instruction sheet */
-	PORT_DIPSETTING(    0x58, "66%" )   /* 66% in the instruction sheet */
-	PORT_DIPSETTING(    0x60, "62%" )   /* 62% in the instruction sheet */
-	PORT_DIPSETTING(    0x68, "58%" )   /* 58% in the instruction sheet */
-	PORT_DIPSETTING(    0x70, "54%" )   /* 54% in the instruction sheet */
-	PORT_DIPSETTING(    0x78, "50%" )   /* 50% in the instruction sheet */
+	PORT_DIPSETTING(    0x00, "110%" )  // 110% in the instruction sheet
+	PORT_DIPSETTING(    0x08, "106%" )  // 106% in the instruction sheet
+	PORT_DIPSETTING(    0x10, "102%" )  // 102% in the instruction sheet
+	PORT_DIPSETTING(    0x18, "98%" )   // 98% in the instruction sheet
+	PORT_DIPSETTING(    0x20, "94%" )   // 94% in the instruction sheet
+	PORT_DIPSETTING(    0x28, "90%" )   // 90% in the instruction sheet
+	PORT_DIPSETTING(    0x30, "86%" )   // 86% in the instruction sheet
+	PORT_DIPSETTING(    0x38, "82%" )   // 82% in the instruction sheet
+	PORT_DIPSETTING(    0x40, "78%" )   // 78% in the instruction sheet
+	PORT_DIPSETTING(    0x48, "74%" )   // 74% in the instruction sheet
+	PORT_DIPSETTING(    0x50, "70%" )   // 70% in the instruction sheet
+	PORT_DIPSETTING(    0x58, "66%" )   // 66% in the instruction sheet
+	PORT_DIPSETTING(    0x60, "62%" )   // 62% in the instruction sheet
+	PORT_DIPSETTING(    0x68, "58%" )   // 58% in the instruction sheet
+	PORT_DIPSETTING(    0x70, "54%" )   // 54% in the instruction sheet
+	PORT_DIPSETTING(    0x78, "50%" )   // 50% in the instruction sheet
 INPUT_PORTS_END
 
 
@@ -1377,12 +1389,12 @@
 static const gfx_layout tilelayout =
 {
 	8, 8,
-	RGN_FRAC(1,4),  /* 4096 tiles */
+	RGN_FRAC(1,4),  // 4096 tiles */
 	4,
-	{ 0, RGN_FRAC(1,4), RGN_FRAC(2,4), RGN_FRAC(3,4) }, /* bitplanes are separated */
+	{ 0, RGN_FRAC(1,4), RGN_FRAC(2,4), RGN_FRAC(3,4) }, // bitplanes are separated
 	{ 0, 1, 2, 3, 4, 5, 6, 7 },
 	{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 },
-	8*8 /* every char takes 8 consecutive bytes */
+	8*8 // every char takes 8 consecutive bytes
 };
 
 
@@ -1391,8 +1403,8 @@
 ******************************/
 
 static GFXDECODE_START( gfx_lucky74 )
-	GFXDECODE_ENTRY( "fgtiles", 0, tilelayout, 0, 16 )      /* text, frames & cards */
-	GFXDECODE_ENTRY( "bgtiles", 0, tilelayout, 256, 16 )    /* title & whores */
+	GFXDECODE_ENTRY( "fgtiles", 0, tilelayout, 0, 16 )      // text, frames & cards
+	GFXDECODE_ENTRY( "bgtiles", 0, tilelayout, 256, 16 )    // title & ladies
 GFXDECODE_END
 
 
@@ -1402,7 +1414,7 @@
 
 void lucky74_state::sound_start()
 {
-	/* cleaning all 09R81P registers */
+	// cleaning all 09R81P registers
 
 	uint8_t i;
 
@@ -1411,18 +1423,18 @@
 		m_adpcm_reg[i] = 0;
 	}
 
-	m_adpcm_busy_line = 0x01;    /* free and ready */
+	m_adpcm_busy_line = 0x01;    // free and ready
 }
 
-WRITE_LINE_MEMBER(lucky74_state::lucky74_adpcm_int)
+WRITE_LINE_MEMBER(lucky74_state::adpcm_int)
 {
-	if (m_adpcm_reg[05] == 0x01) /* register 0x05 (bit 0 activated), trigger the sample */
+	if (m_adpcm_reg[05] == 0x01) // register 0x05 (bit 0 activated), trigger the sample
 	{
-		/* conditional zone for samples reproduction */
+		// conditional zone for samples reproduction
 
-		if (m_adpcm_busy_line)     /* still not started */
+		if (m_adpcm_busy_line)     // still not started
 		{
-			/* init all 09R81P registers */
+			// init all 09R81P registers
 			logerror("init ADPCM registers\n");
 			m_adpcm_end = (m_adpcm_reg[04] << 8) + m_adpcm_reg[03];
 			m_adpcm_pos = (m_adpcm_reg[01] << 8) + m_adpcm_reg[00];
@@ -1435,22 +1447,22 @@
 
 		if (m_adpcm_data == -1)
 		{
-			/* transferring 1st nibble */
+			// transferring 1st nibble
 			m_adpcm_data = memregion("adpcm")->base()[m_adpcm_pos];
 			m_adpcm_pos = (m_adpcm_pos + 1) & 0xffff;
 			m_msm->data_w(m_adpcm_data >> 4);
 
 			if (m_adpcm_pos == m_adpcm_end)
 			{
-				m_msm->reset_w(0);         /* reset the M5205 */
-				m_adpcm_reg[05] = 0;     /* clean trigger register */
-				m_adpcm_busy_line = 0x01;    /* deactivate busy flag */
+				m_msm->reset_w(0);         // reset the M5205
+				m_adpcm_reg[05] = 0;     // clean trigger register
+				m_adpcm_busy_line = 0x01;    // deactivate busy flag
 				logerror("end of sample.\n");
 			}
 		}
 		else
 		{
-			/* transferring 2nd nibble */
+			// transferring 2nd nibble
 			m_msm->data_w(m_adpcm_data & 0x0f);
 			m_adpcm_data = -1;
 		}
@@ -1465,11 +1477,11 @@
 
 void lucky74_state::lucky74(machine_config &config)
 {
-	/* basic machine hardware */
-	Z80(config, m_maincpu, C_06B49P_CLKOUT_03);     /* 3 MHz. */
-	m_maincpu->set_addrmap(AS_PROGRAM, &lucky74_state::lucky74_map);
-	m_maincpu->set_addrmap(AS_IO, &lucky74_state::lucky74_portmap);
-	m_maincpu->set_vblank_int("screen", FUNC(lucky74_state::nmi_interrupt));    /* 60 Hz. measured */
+	// basic machine hardware
+	Z80(config, m_maincpu, C_06B49P_CLKOUT_03);     // 3 MHz.
+	m_maincpu->set_addrmap(AS_PROGRAM, &lucky74_state::prg_map);
+	m_maincpu->set_addrmap(AS_IO, &lucky74_state::portmap);
+	m_maincpu->set_vblank_int("screen", FUNC(lucky74_state::nmi_interrupt));    // 60 Hz. measured
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
 
@@ -1494,34 +1506,34 @@
 	ppi3.out_pb_callback().set(FUNC(lucky74_state::lamps_a_w));
 	ppi3.out_pc_callback().set(FUNC(lucky74_state::lamps_b_w));
 
-	/* video hardware */
+	// video hardware
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(60);
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
 	screen.set_size(64*8, 32*8);
 	screen.set_visarea(0*8, 64*8-1, 1*8, 30*8-1);
-	screen.set_screen_update(FUNC(lucky74_state::screen_update_lucky74));
+	screen.set_screen_update(FUNC(lucky74_state::screen_update));
 	screen.set_palette("palette");
 
 	GFXDECODE(config, m_gfxdecode, "palette", gfx_lucky74);
-	PALETTE(config, "palette", FUNC(lucky74_state::lucky74_palette), 512);
+	PALETTE(config, "palette", FUNC(lucky74_state::palette), 512);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 
-	SN76489(config, "sn1", C_06B49P_CLKOUT_03).add_route(ALL_OUTPUTS, "mono", 0.80);    /* 3 MHz. */
-	SN76489(config, "sn2", C_06B49P_CLKOUT_03).add_route(ALL_OUTPUTS, "mono", 0.80);    /* 3 MHz. */
-	SN76489(config, "sn3", C_06B49P_CLKOUT_03).add_route(ALL_OUTPUTS, "mono", 0.80);    /* 3 MHz. */
+	SN76489(config, "sn1", C_06B49P_CLKOUT_03).add_route(ALL_OUTPUTS, "mono", 0.80);    // 3 MHz.
+	SN76489(config, "sn2", C_06B49P_CLKOUT_03).add_route(ALL_OUTPUTS, "mono", 0.80);    // 3 MHz.
+	SN76489(config, "sn3", C_06B49P_CLKOUT_03).add_route(ALL_OUTPUTS, "mono", 0.80);    // 3 MHz.
 
-	ay8910_device &aysnd(AY8910(config, "aysnd", C_06B49P_CLKOUT_04)); /* 1.5 MHz. */
+	ay8910_device &aysnd(AY8910(config, "aysnd", C_06B49P_CLKOUT_04)); // 1.5 MHz.
 	aysnd.port_a_read_callback().set_ioport("IN3");
-	/* port b read is a sort of status byte */
+	// port b read is a sort of status byte
 	aysnd.port_b_write_callback().set(FUNC(lucky74_state::ym2149_portb_w));
-	aysnd.add_route(ALL_OUTPUTS, "mono", 0.00);         /* not routed to audio hardware */
+	aysnd.add_route(ALL_OUTPUTS, "mono", 0.00);         // not routed to audio hardware
 
-	MSM5205(config, m_msm, C_06B49P_CLKOUT_06); /* 375 kHz. */
-	m_msm->vck_legacy_callback().set(FUNC(lucky74_state::lucky74_adpcm_int));   /* interrupt function */
-	m_msm->set_prescaler_selector(msm5205_device::S48_4B);  /* 8KHz */
+	MSM5205(config, m_msm, C_06B49P_CLKOUT_06); // 375 kHz.
+	m_msm->vck_legacy_callback().set(FUNC(lucky74_state::adpcm_int));   // interrupt function
+	m_msm->set_prescaler_selector(msm5205_device::S48_4B);  // 8KHz
 	m_msm->add_route(ALL_OUTPUTS, "mono", 0.70);
 }
 
@@ -1557,9 +1569,9 @@
 	ROM_LOAD( "luckychi.18",    0x10000, 0x8000, CRC(f2d45e76) SHA1(46df7bf98434c836fd38539575a35bf67c9ec2c6) )
 	ROM_LOAD( "luckychi.19",    0x18000, 0x8000, CRC(6b0196f3) SHA1(277049279dcfcf07189dbdb20935c2a71b2f6061) )
 
-	ROM_REGION( 0x20000, "adpcm", 0 )   /* 4-bits ADPCM samples @ 8kHz */
-	ROM_LOAD( "luckyson.15",    0x00000, 0x10000, CRC(b896c87f) SHA1(985e625a937abd6353218f0cace14d3adec4c1bf) )    /* location 2n */
-	ROM_FILL(                   0x10000, 0x10000, 0xff )                                                            /* empty socket @ 1n */
+	ROM_REGION( 0x20000, "adpcm", 0 )   // 4-bits ADPCM samples @ 8kHz
+	ROM_LOAD( "luckyson.15",    0x00000, 0x10000, CRC(b896c87f) SHA1(985e625a937abd6353218f0cace14d3adec4c1bf) )    // location 2n
+	ROM_FILL(                   0x10000, 0x10000, 0xff )                                                            // empty socket @ 1n
 
 	ROM_REGION( 0x0600, "proms", 0 )
 	ROM_LOAD( "luckyprom.e6",   0x0000, 0x0100, CRC(ae793fef) SHA1(e4e2d2dccabad7d756811fb2d5e123bf30f106f3) )
@@ -1627,9 +1639,9 @@
 	ROM_LOAD( "8.1k",   0x10000, 0x8000, CRC(f2d45e76) SHA1(46df7bf98434c836fd38539575a35bf67c9ec2c6) )
 	ROM_LOAD( "9.1m",   0x18000, 0x8000, CRC(6b0196f3) SHA1(277049279dcfcf07189dbdb20935c2a71b2f6061) )
 
-	ROM_REGION( 0x20000, "adpcm", 0 )   /* 4-bits ADPCM samples @ 8kHz */
-	ROM_LOAD( "5.2n",   0x00000, 0x10000, CRC(b896c87f) SHA1(985e625a937abd6353218f0cace14d3adec4c1bf) )    /* location 2n */
-	ROM_FILL(           0x10000, 0x10000, 0xff )                                                            /* empty socket @ 1n */
+	ROM_REGION( 0x20000, "adpcm", 0 )   // 4-bits ADPCM samples @ 8kHz
+	ROM_LOAD( "5.2n",   0x00000, 0x10000, CRC(b896c87f) SHA1(985e625a937abd6353218f0cace14d3adec4c1bf) )    // location 2n
+	ROM_FILL(           0x10000, 0x10000, 0xff )                                                            // empty socket @ 1n
 
 	ROM_REGION( 0x0600, "proms", 0 )
 	ROM_LOAD( "82s129.e6",  0x0000, 0x0100, CRC(ae793fef) SHA1(e4e2d2dccabad7d756811fb2d5e123bf30f106f3) )
@@ -1652,7 +1664,7 @@
 */
 ROM_START( lucky74b )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "luckygde.00",    0x0000, 0x10000, CRC(e3f7db99) SHA1(5c7d9d3fed9eb19d3d666c8c08b34968a9996a96) ) /* bad dump? */
+	ROM_LOAD( "luckygde.00",    0x0000, 0x10000, CRC(e3f7db99) SHA1(5c7d9d3fed9eb19d3d666c8c08b34968a9996a96) ) // bad dump?
 
 	ROM_REGION( 0x20000, "fgtiles", 0 )
 	ROM_LOAD( "luckygde.12",    0x00000, 0x8000, CRC(7127465b) SHA1(3f72f91652fcab52c073744b1651fdfe772c584a) )
@@ -1666,9 +1678,9 @@
 	ROM_LOAD( "luckygde.18",    0x10000, 0x8000, CRC(717e5f4e) SHA1(0f14c9525bf77bbc4de0d9695648acb40870a176) )
 	ROM_LOAD( "luckygde.19",    0x18000, 0x8000, CRC(bb4608ae) SHA1(cc8ec596f445fe0364f254241227de368f309ebb) )
 
-	ROM_REGION( 0x20000, "adpcm", 0 )   /* 4-bits ADPCM samples @ 8kHz */
-	ROM_LOAD( "luckyson.15",    0x00000, 0x10000, CRC(b896c87f) SHA1(985e625a937abd6353218f0cace14d3adec4c1bf) )    /* location 2n */
-	ROM_FILL(                   0x10000, 0x10000, 0xff )                                                            /* empty socket @ 1n */
+	ROM_REGION( 0x20000, "adpcm", 0 )   // 4-bits ADPCM samples @ 8kHz
+	ROM_LOAD( "luckyson.15",    0x00000, 0x10000, CRC(b896c87f) SHA1(985e625a937abd6353218f0cace14d3adec4c1bf) )    // location 2n
+	ROM_FILL(                   0x10000, 0x10000, 0xff )                                                            // empty socket @ 1n
 
 	ROM_REGION( 0x0600, "proms", 0 )
 	ROM_LOAD( "luckyprom.e6",   0x0000, 0x0100, CRC(ae793fef) SHA1(e4e2d2dccabad7d756811fb2d5e123bf30f106f3) )
@@ -1721,9 +1733,9 @@
 	ROM_LOAD( "ebj_s8.1k",  0x20000, 0x10000, CRC(297443a7) SHA1(3a20498dcf69412f5bd3156391a55d3b1273c0b4) )
 	ROM_LOAD( "ebj_s9.1l",  0x30000, 0x10000, CRC(79ba7d75) SHA1(7301143a019d5e79eff7941a1a34fe96036acffa) )
 
-	ROM_REGION( 0x20000, "adpcm", 0 )   /* 4-bits ADPCM samples @ 8kHz */
-	ROM_LOAD( "ebj_s5.2n",  0x00000, 0x10000, CRC(9b4a10a2) SHA1(843ab5955ba96bb1b1a5367652d0f6424ba23bdf) )    /* location 2n */
-	ROM_LOAD( "ebj_s10.1n", 0x10000, 0x10000, CRC(2fa7401d) SHA1(80a5dfd2b7c183acd2fc124d220de4a4921178b2) )    /* location 1n */
+	ROM_REGION( 0x20000, "adpcm", 0 )   // 4-bits ADPCM samples @ 8kHz
+	ROM_LOAD( "ebj_s5.2n",  0x00000, 0x10000, CRC(9b4a10a2) SHA1(843ab5955ba96bb1b1a5367652d0f6424ba23bdf) )    // location 2n
+	ROM_LOAD( "ebj_s10.1n", 0x10000, 0x10000, CRC(2fa7401d) SHA1(80a5dfd2b7c183acd2fc124d220de4a4921178b2) )    // location 1n
 
 	ROM_REGION( 0x0600, "proms", 0 )
 	ROM_LOAD( "6e-a.6e",    0x0000, 0x0100, CRC(bcaa7a0d) SHA1(75554d539bf67effb862234cdf89e4df4e2193ed) )
@@ -1739,8 +1751,8 @@
 *                Game Drivers                *
 **********************************************/
 
-//     YEAR  NAME      PARENT   MACHINE  INPUT     STATS          INIT        ROT   COMPANY            FULLNAME                    FLAGS                LAYOUT
-GAMEL( 1988, lucky74,  0,       lucky74, lucky74,  lucky74_state, empty_init, ROT0, "Wing Co., Ltd.", "Lucky 74 (bootleg, set 1)", 0,                   layout_lucky74 )
-GAMEL( 1988, lucky74a, lucky74, lucky74, lucky74a, lucky74_state, empty_init, ROT0, "Wing Co., Ltd.", "Lucky 74 (bootleg, set 3)", 0,                   layout_lucky74 )
-GAMEL( 1988, lucky74b, lucky74, lucky74, lucky74,  lucky74_state, empty_init, ROT0, "Wing Co., Ltd.", "Lucky 74 (bootleg, set 2)", MACHINE_NOT_WORKING, layout_lucky74 )
-GAME(  1989, excitbj,  0,       lucky74, excitbj,  lucky74_state, empty_init, ROT0, "Sega",           "Exciting Black Jack",       MACHINE_NOT_WORKING )
+//     YEAR  NAME      PARENT   MACHINE  INPUT     STATS          INIT        ROT   COMPANY            FULLNAME                    FLAGS                                        LAYOUT
+GAMEL( 1988, lucky74,  0,       lucky74, lucky74,  lucky74_state, empty_init, ROT0, "Wing Co., Ltd.", "Lucky 74 (bootleg, set 1)", MACHINE_SUPPORTS_SAVE,                       layout_lucky74 )
+GAMEL( 1988, lucky74a, lucky74, lucky74, lucky74a, lucky74_state, empty_init, ROT0, "Wing Co., Ltd.", "Lucky 74 (bootleg, set 3)", MACHINE_SUPPORTS_SAVE,                       layout_lucky74 )
+GAMEL( 1988, lucky74b, lucky74, lucky74, lucky74,  lucky74_state, empty_init, ROT0, "Wing Co., Ltd.", "Lucky 74 (bootleg, set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE, layout_lucky74 )
+GAME(  1989, excitbj,  0,       lucky74, excitbj,  lucky74_state, empty_init, ROT0, "Sega",           "Exciting Black Jack",       MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/luckybal.cpp mame-0.224+dfsg.1/src/mame/drivers/luckybal.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/luckybal.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/luckybal.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -32,10 +32,10 @@
 
   PCB specs:
 
-  Sikscreened: 'PCB Ver 1.5'
-  Sikscreened: 'SIELCON GAMES'
-  Sikscreened: 'Copyright 1996'
-  Sikscreened: 'MADE IN ARGENTINA'
+  Silkscreened: 'PCB Ver 1.5'
+  Silkscreened: 'SIELCON GAMES'
+  Silkscreened: 'Copyright 1996'
+  Silkscreened: 'MADE IN ARGENTINA'
 
   1x Unknown sanded PLCC68 IC (identified as Zilog Z180).
   1x unknown sanded DIL24 IC labeled PLD-01.
@@ -244,7 +244,7 @@
   '---------'                 '---------'                               '---------'
 
 
-  TOUCH = For iButton inplementation. Not present in the current PCBs.
+  TOUCH = For iButton implementation. Not present in the current PCBs.
 
 
 *********************************************************************
@@ -304,6 +304,9 @@
 	void init_luckybala();
 	void init_luckybald();
 
+protected:
+	virtual void machine_start() override;
+
 private:
 	void z180_trdr_w(uint8_t data);
 	void port90_bitswap_w(uint8_t data);
@@ -329,11 +332,19 @@
 	void main_io(address_map &map);
 	void main_map(address_map &map);
 
-	virtual void machine_start() override { m_lamps.resolve(); }
 	output_finder<38> m_lamps;
 };
 
 
+void luckybal_state::machine_start()
+{
+	m_lamps.resolve();
+
+	save_item(NAME(m_trdr));
+	save_item(NAME(m_led_on));
+}
+
+
 /**************************************
 *             Memory Map              *
 **************************************/
@@ -349,9 +360,9 @@
 {
 	map.global_mask(0xff);
 
-	map(0x00, 0x0a).nopr().nopw();;  // Z180 Internal registers.
+	map(0x00, 0x0a).nopr().nopw();  // Z180 Internal registers.
 	map(0x0b, 0x0b).nopr().w(FUNC(luckybal_state::z180_trdr_w));
-	map(0x0c, 0x3f).nopr().nopw();;  // Z180 Internal registers.
+	map(0x0c, 0x3f).nopr().nopw();  // Z180 Internal registers.
 
 	map(0x90, 0x90).w(FUNC(luckybal_state::port90_bitswap_w));
 	map(0xc0, 0xc3).rw(FUNC(luckybal_state::ppi_bitswap_r), FUNC(luckybal_state::ppi_bitswap_w));
@@ -567,7 +578,7 @@
 
 void luckybal_state::luckybal(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	Z80180(config, m_maincpu, CPU_CLOCK);
 	m_maincpu->set_addrmap(AS_PROGRAM, &luckybal_state::main_map);
 	m_maincpu->set_addrmap(AS_IO, &luckybal_state::main_io);
@@ -584,17 +595,17 @@
 
 	CD4099(config, "latch3", 0);
 
-	/* nvram */
+	// nvram
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
 
-	/* video hardware */
+	// video hardware
 	v9938_device &v9938(V9938(config, "v9938", VID_CLOCK));
 	v9938.set_screen_ntsc("screen");
 	v9938.set_vram_size(VDP_MEM);
 	v9938.int_cb().set_inputline("maincpu", 0);
 	SCREEN(config, "screen", SCREEN_TYPE_RASTER);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "speaker").front_center();
 	DAC08(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.5);
 	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/lviv.cpp mame-0.224+dfsg.1/src/mame/drivers/lviv.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/lviv.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/lviv.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -280,6 +280,7 @@
     b: only if the CPU is requesting a RAM write
     c: only if the CPU is requesting a RAM read
 
+
 *******************************************************************************/
 
 #include "emu.h"
@@ -287,7 +288,6 @@
 
 #include "cpu/i8085/i8085.h"
 
-#include "softlist.h"
 #include "speaker.h"
 
 #include "formats/lviv_lvt.h"
@@ -429,20 +429,20 @@
 	config.set_maximum_quantum(attotime::from_hz(60));
 
 	I8255(config, m_ppi[0]);
-	m_ppi[0]->in_pa_callback().set(FUNC(lviv_state::ppi_0_porta_r));
-	m_ppi[0]->out_pa_callback().set(FUNC(lviv_state::ppi_0_porta_w));
-	m_ppi[0]->in_pb_callback().set(FUNC(lviv_state::ppi_0_portb_r));
-	m_ppi[0]->out_pb_callback().set(FUNC(lviv_state::ppi_0_portb_w));
-	m_ppi[0]->in_pc_callback().set(FUNC(lviv_state::ppi_0_portc_r));
-	m_ppi[0]->out_pc_callback().set(FUNC(lviv_state::ppi_0_portc_w));
+	m_ppi[0]->in_pa_callback().set(FUNC(lviv_state::ppi0_porta_r));
+	m_ppi[0]->out_pa_callback().set(FUNC(lviv_state::ppi0_porta_w));
+	m_ppi[0]->in_pb_callback().set(FUNC(lviv_state::ppi0_portb_r));
+	m_ppi[0]->out_pb_callback().set(FUNC(lviv_state::ppi0_portb_w));
+	m_ppi[0]->in_pc_callback().set(FUNC(lviv_state::ppi0_portc_r));
+	m_ppi[0]->out_pc_callback().set(FUNC(lviv_state::ppi0_portc_w));
 
 	I8255(config, m_ppi[1]);
-	m_ppi[1]->in_pa_callback().set(FUNC(lviv_state::ppi_1_porta_r));
-	m_ppi[1]->out_pa_callback().set(FUNC(lviv_state::ppi_1_porta_w));
-	m_ppi[1]->in_pb_callback().set(FUNC(lviv_state::ppi_1_portb_r));
-	m_ppi[1]->out_pb_callback().set(FUNC(lviv_state::ppi_1_portb_w));
-	m_ppi[1]->in_pc_callback().set(FUNC(lviv_state::ppi_1_portc_r));
-	m_ppi[1]->out_pc_callback().set(FUNC(lviv_state::ppi_1_portc_w));
+	m_ppi[1]->in_pa_callback().set(FUNC(lviv_state::ppi1_porta_r));
+	m_ppi[1]->out_pa_callback().set(FUNC(lviv_state::ppi1_porta_w));
+	m_ppi[1]->in_pb_callback().set(FUNC(lviv_state::ppi1_portb_r));
+	m_ppi[1]->out_pb_callback().set(FUNC(lviv_state::ppi1_portb_w));
+	m_ppi[1]->in_pc_callback().set(FUNC(lviv_state::ppi1_portc_r));
+	m_ppi[1]->out_pc_callback().set(FUNC(lviv_state::ppi1_portc_w));
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
@@ -476,14 +476,14 @@
 
 
 ROM_START(lviv)
-	ROM_REGION(0x14000,"maincpu",0)
+	ROM_REGION(0x4000,"maincpu",0)
 	ROM_SYSTEM_BIOS( 0, "lviv", "Lviv/L'vov" )
-	ROMX_LOAD("lviv.bin", 0x10000, 0x4000, CRC(44a347d9) SHA1(74e067493b2b7d9ab17333202009a1a4f5e460fd), ROM_BIOS(0))
+	ROMX_LOAD("lviv.bin", 0x0000, 0x4000, CRC(44a347d9) SHA1(74e067493b2b7d9ab17333202009a1a4f5e460fd), ROM_BIOS(0))
 	ROM_SYSTEM_BIOS( 1, "lviva", "Lviv/L'vov (alternate)" )
-	ROMX_LOAD("lviva.bin", 0x10000, 0x4000, CRC(551622f5) SHA1(b225f3542b029d767b7db9dce562e8a3f77f92a2), ROM_BIOS(1))
+	ROMX_LOAD("lviva.bin", 0x0000, 0x4000, CRC(551622f5) SHA1(b225f3542b029d767b7db9dce562e8a3f77f92a2), ROM_BIOS(1))
 	ROM_SYSTEM_BIOS( 2, "lvivp", "Lviv/L'vov (prototype)" )
-	ROMX_LOAD("lvivp.bin", 0x10000, 0x4000, CRC(f171c282) SHA1(c7dc2bdb02400e6b5cdcc50040eb06f506a7ed84), ROM_BIOS(2))
+	ROMX_LOAD("lvivp.bin", 0x0000, 0x4000, CRC(f171c282) SHA1(c7dc2bdb02400e6b5cdcc50040eb06f506a7ed84), ROM_BIOS(2))
 ROM_END
 
 /*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS       INIT        COMPANY        FULLNAME      FLAGS */
-COMP( 1989, lviv, 0,      0,      lviv,    lviv,  lviv_state, empty_init, "V. I. Lenin", "PK-01 Lviv", 0 )
+COMP( 1989, lviv, 0,      0,      lviv,    lviv,  lviv_state, empty_init, "V. I. Lenin", "PK-01 Lviv", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/m72.cpp mame-0.224+dfsg.1/src/mame/drivers/m72.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/m72.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/m72.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -454,20 +454,12 @@
 	if (ACCESSING_BITS_0_7 && (data & 0xff) < 9) m_audio->set_sample_start(a[data & 0xff]);
 }
 
-void m72_state::imgfight_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask)
-{
-	static const int a[7] = { 0x0000, 0x0020, 0x44e0, 0x98a0, 0xc820, 0xf7a0, 0x108c0 };
-	if (ACCESSING_BITS_0_7 && (data & 0xff) < 7) m_audio->set_sample_start(a[data & 0xff]);
-}
-
 void m72_state::loht_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask)
 {
 	static const int a[7] = { 0x0000, 0x0020, 0, 0x2c40, 0x4320, 0x7120, 0xb200 };
 	if (ACCESSING_BITS_0_7 && (data & 0xff) < 7) m_audio->set_sample_start(a[data & 0xff]);
 }
 
-
-
 void m72_state::dbreedm72_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask)
 {
 	static const int a[9] = { 0x00000, 0x00020, 0x02c40, 0x08160, 0x0c8c0, 0x0ffe0, 0x13000, 0x15820, 0x15f40 };
@@ -576,34 +568,15 @@
 };
 static const u8 nspirit_crc[CRC_LEN] =   {   0xfe,0x94,0x6e,0x4e, 0xc8,0x33,0xa7,0x2d,
 												0xf2,0xa3,0xf9,0xe1, 0xa9,0x6c,0x02,0x95, 0x00,0x00 };
-/* Image Fight */
-static const u8 imgfight_code[CODE_LEN] =
-{
-	0x68,0x00,0xa0,             // push 0a000h
-	0x1f,                       // pop ds
-	0xc6,0x06,0x38,0x38,0x50,   // mov [3838h], byte 050h
-	0xc6,0x06,0x3a,0x38,0x49,   // mov [383ah], byte 049h
-	0xc6,0x06,0x3c,0x38,0x43,   // mov [383ch], byte 043h
-	0xc6,0x06,0x3e,0x38,0x4b,   // mov [383eh], byte 04bh
-	0xc6,0x06,0x40,0x38,0x45,   // mov [3840h], byte 045h
-	0xc6,0x06,0x42,0x38,0x54,   // mov [3842h], byte 054h
-	0x68,0x00,0xb0,             // push 0b000h
-	0x1f,                       // pop ds
-	0xc6,0x06,0x00,0x09,0x49^0xff,  // mov [0900h], byte 049h
-	0xc6,0x06,0x00,0x0a,0x49^0xff,  // mov [0a00h], byte 049h
-	0xc6,0x06,0x00,0x0b,0x49^0xff,  // mov [0b00h], byte 049h
-	0xc6,0x06,0x20,0x09,0x49^0xff,  // mov [0920h], byte 049h
-	0xc6,0x06,0x21,0x09,0x4d^0xff,  // mov [0921h], byte 04dh
-	0xc6,0x06,0x22,0x09,0x41^0xff,  // mov [0922h], byte 041h
-	0xc6,0x06,0x23,0x09,0x47^0xff,  // mov [0923h], byte 047h
-	0x68,0x00,0xd0,             // push 0d000h
-	0x1f,                       // pop ds
-	0xea,0x00,0x00,0x40,0x00    // jmp  0040:$0000
-};
+/*
+// these are for the world set where we have the mcu anyway...
+static const u8 imgfight_crc[CRC_LEN] =  {  0xf8,0x91,0xc0,0x58, 0x04,0x33,0xb6,0xc5,
+                                                0xbf,0x37,0x92,0x94, 0x00,0x00 };
 
 // these are for the japan set where we have the mcu anyway...
 static const u8 imgfightj_crc[CRC_LEN] =  {  0x7e,0xcc,0xec,0x03, 0x04,0x33,0xb6,0xc5,
-												0xbf,0x37,0x92,0x94, 0x00,0x00 };
+                                                0xbf,0x37,0x92,0x94, 0x00,0x00 };
+*/
 
 /* Dragon Breed */
 static const u8 dbreedm72_code[CODE_LEN] =
@@ -674,12 +647,6 @@
 	m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16s_delegate(*this, FUNC(m72_state::nspirit_sample_trigger_w)));
 }
 
-void m72_state::init_imgfight()
-{
-	install_protection_handler(imgfight_code,imgfightj_crc);
-	m_maincpu->space(AS_IO).install_write_handler(0xc0, 0xc1, write16s_delegate(*this, FUNC(m72_state::imgfight_sample_trigger_w)));
-}
-
 void m72_state::init_dbreedm72()
 {
 	install_protection_handler(dbreedm72_code,dbreedm72_crc);
@@ -2079,10 +2046,10 @@
 	subdevice<v35_device>("maincpu")->set_decryption_table(gunforce_decryption_table);
 }
 
-void m72_state::imgfightj(machine_config &config)
+void m72_state::imgfight(machine_config &config)
 {
 	m72_8751(config);
-	MCFG_VIDEO_START_OVERRIDE(m72_state,imgfightj)
+	MCFG_VIDEO_START_OVERRIDE(m72_state,imgfight)
 }
 
 void m72_state::nspiritj(machine_config &config)
@@ -2222,7 +2189,7 @@
 ***************************************************************************/
 
 ROM_START( rtype )
-	ROM_REGION( 0x100000, "maincpu", 0 ) /* Roms located on the M72-ROM-C rom board */
+	ROM_REGION( 0x100000, "maincpu", 0 ) // Roms located on the M72-ROM-C rom board
 	ROM_LOAD16_BYTE( "rt_r-h0-b.1b", 0x00001, 0x10000, CRC(591c7754) SHA1(0b9d5474bc5963224923126cf84d74a39b8270cc) )
 	ROM_LOAD16_BYTE( "rt_r-l0-b.3b", 0x00000, 0x10000, CRC(a1928df0) SHA1(3001c1b87cd1d441ba1226fb5b9dd6268458c0e8) )
 	ROM_LOAD16_BYTE( "rt_r-h1-b.1c", 0x20001, 0x10000, CRC(a9d71eca) SHA1(008d1dc289df2ae2ba8f93d319c2b2c108cb9b89) )
@@ -2230,8 +2197,8 @@
 	ROM_LOAD16_BYTE( "rt_r-l1-b.3c", 0x20000, 0x10000, CRC(0df3573d) SHA1(0144c846fd0bdb3e4d790f6cb7bb64829e931b76) )
 	ROM_RELOAD(                      0xe0000, 0x10000 )
 
-	ROM_REGION( 0x80000, "sprites", 0 ) /* Roms located on the M72-ROM-C rom board */
-	ROM_LOAD( "rt_r-00.1h", 0x00000, 0x10000, CRC(dad53bc0) SHA1(1e3bc498861946278a0b1fe24259f5d224e265d7) )    /* sprites */
+	ROM_REGION( 0x80000, "sprites", 0 ) // Roms located on the M72-ROM-C rom board
+	ROM_LOAD( "rt_r-00.1h", 0x00000, 0x10000, CRC(dad53bc0) SHA1(1e3bc498861946278a0b1fe24259f5d224e265d7) )    // sprites
 	ROM_LOAD( "rt_r-01.1j", 0x10000, 0x08000, CRC(5e441e7f) SHA1(6741eb7f2d9d985b5a89eefc73ea44c3e38de6f7) )
 	ROM_RELOAD(             0x18000, 0x08000 )
 	ROM_LOAD( "rt_r-10.1k", 0x20000, 0x10000, CRC(d6a66298) SHA1(d2873d05aa3b257e7699c188880ac3daad672fa5) )
@@ -2244,21 +2211,21 @@
 	ROM_LOAD( "rt_r-31.3l", 0x70000, 0x08000, CRC(8558355d) SHA1(b5467d1f22f6e5f90c5d8a8ac2d55974f287d589) )
 	ROM_RELOAD(             0x78000, 0x08000 )
 
-	ROM_REGION( 0x20000, "gfx2", 0 ) /* Roms located on the M72-B-D rom board */
-	ROM_LOAD( "rt_b-a0.3c", 0x00000, 0x08000, CRC(4e212fb0) SHA1(687061ecade2ebd0bd1343c9c4a831791853f79c) )    /* tiles #1 */
+	ROM_REGION( 0x20000, "gfx2", 0 ) // Roms located on the M72-B-D rom board
+	ROM_LOAD( "rt_b-a0.3c", 0x00000, 0x08000, CRC(4e212fb0) SHA1(687061ecade2ebd0bd1343c9c4a831791853f79c) )    // tiles #1
 	ROM_LOAD( "rt_b-a1.3d", 0x08000, 0x08000, CRC(8a65bdff) SHA1(130bf6af521f13247a739a95eab4bdaa24b2ac10) )
 	ROM_LOAD( "rt_b-a2.3a", 0x10000, 0x08000, CRC(5a4ae5b9) SHA1(95c3b64f50e6f673b2bf9b40642c152da5009d25) )
 	ROM_LOAD( "rt_b-a3.3e", 0x18000, 0x08000, CRC(73327606) SHA1(9529ecdedd30e2a0400fb1083117992cc18b5158) )
 
-	ROM_REGION( 0x20000, "gfx3", 0 ) /* Roms located on the M72-B-D rom board */
-	ROM_LOAD( "rt_b-b0.3j", 0x00000, 0x08000, CRC(a7b17491) SHA1(5b390770e56ba2d35e108534d7eda8dca996fdf7) )    /* tiles #2 */
+	ROM_REGION( 0x20000, "gfx3", 0 ) // Roms located on the M72-B-D rom board
+	ROM_LOAD( "rt_b-b0.3j", 0x00000, 0x08000, CRC(a7b17491) SHA1(5b390770e56ba2d35e108534d7eda8dca996fdf7) )    // tiles #2
 	ROM_LOAD( "rt_b-b1.3k", 0x08000, 0x08000, CRC(b9709686) SHA1(700905a3e9661e0874939f54da2909e1396ce596) )
 	ROM_LOAD( "rt_b-b2.3h", 0x10000, 0x08000, CRC(433b229a) SHA1(14222eaa3e67e5a7f80eafcf22bac4eb2d485a9a) )
 	ROM_LOAD( "rt_b-b3.3f", 0x18000, 0x08000, CRC(ad89b072) SHA1(e2683d0e7415f3abd147e518bf6c87e44744cd4f) )
 ROM_END
 
 ROM_START( rtypej )
-	ROM_REGION( 0x100000, "maincpu", 0 ) /* Roms located on the M72-ROM-C rom board */
+	ROM_REGION( 0x100000, "maincpu", 0 ) // Roms located on the M72-ROM-C rom board
 	ROM_LOAD16_BYTE( "rt_r-h0-.1b", 0x00001, 0x10000, CRC(c2940df2) SHA1(cbccd205ef81a0e39990a34d46e3f7d52b62e385) )
 	ROM_LOAD16_BYTE( "rt_r-l0-.3b", 0x00000, 0x10000, CRC(858cc0f6) SHA1(7a256fe3aa3a96e161dd485a90b18c421b61458b) )
 	ROM_LOAD16_BYTE( "rt_r-h1-.1c", 0x20001, 0x10000, CRC(5bcededa) SHA1(4ada3fd207fa57751f8e3d885bc91b374e27035d) )
@@ -2266,8 +2233,8 @@
 	ROM_LOAD16_BYTE( "rt_r-l1-.3c", 0x20000, 0x10000, CRC(4821141c) SHA1(df6cf04c3ecd04b6f27a96871848904575414dae) )
 	ROM_RELOAD(                     0xe0000, 0x10000 )
 
-	ROM_REGION( 0x80000, "sprites", 0 ) /* Roms located on the M72-ROM-C rom board */
-	ROM_LOAD( "rt_r-00.1h", 0x00000, 0x10000, CRC(dad53bc0) SHA1(1e3bc498861946278a0b1fe24259f5d224e265d7) )    /* sprites */
+	ROM_REGION( 0x80000, "sprites", 0 ) // Roms located on the M72-ROM-C rom board
+	ROM_LOAD( "rt_r-00.1h", 0x00000, 0x10000, CRC(dad53bc0) SHA1(1e3bc498861946278a0b1fe24259f5d224e265d7) )    // sprites
 	ROM_LOAD( "rt_r-01.1j", 0x10000, 0x08000, CRC(5e441e7f) SHA1(6741eb7f2d9d985b5a89eefc73ea44c3e38de6f7) )
 	ROM_RELOAD(             0x18000, 0x08000 )
 	ROM_LOAD( "rt_r-10.1k", 0x20000, 0x10000, CRC(d6a66298) SHA1(d2873d05aa3b257e7699c188880ac3daad672fa5) )
@@ -2280,21 +2247,21 @@
 	ROM_LOAD( "rt_r-31.3l", 0x70000, 0x08000, CRC(8558355d) SHA1(b5467d1f22f6e5f90c5d8a8ac2d55974f287d589) )
 	ROM_RELOAD(             0x78000, 0x08000 )
 
-	ROM_REGION( 0x20000, "gfx2", 0 ) /* Roms located on the M72-B-D rom board */
-	ROM_LOAD( "rt_b-a0.3c", 0x00000, 0x08000, CRC(4e212fb0) SHA1(687061ecade2ebd0bd1343c9c4a831791853f79c) )    /* tiles #1 */
+	ROM_REGION( 0x20000, "gfx2", 0 ) // Roms located on the M72-B-D rom board
+	ROM_LOAD( "rt_b-a0.3c", 0x00000, 0x08000, CRC(4e212fb0) SHA1(687061ecade2ebd0bd1343c9c4a831791853f79c) )    // tiles #1
 	ROM_LOAD( "rt_b-a1.3d", 0x08000, 0x08000, CRC(8a65bdff) SHA1(130bf6af521f13247a739a95eab4bdaa24b2ac10) )
 	ROM_LOAD( "rt_b-a2.3a", 0x10000, 0x08000, CRC(5a4ae5b9) SHA1(95c3b64f50e6f673b2bf9b40642c152da5009d25) )
 	ROM_LOAD( "rt_b-a3.3e", 0x18000, 0x08000, CRC(73327606) SHA1(9529ecdedd30e2a0400fb1083117992cc18b5158) )
 
-	ROM_REGION( 0x20000, "gfx3", 0 ) /* Roms located on the M72-B-D rom board */
-	ROM_LOAD( "rt_b-b0.3j", 0x00000, 0x08000, CRC(a7b17491) SHA1(5b390770e56ba2d35e108534d7eda8dca996fdf7) )    /* tiles #2 */
+	ROM_REGION( 0x20000, "gfx3", 0 ) // Roms located on the M72-B-D rom board
+	ROM_LOAD( "rt_b-b0.3j", 0x00000, 0x08000, CRC(a7b17491) SHA1(5b390770e56ba2d35e108534d7eda8dca996fdf7) )    // tiles #2
 	ROM_LOAD( "rt_b-b1.3k", 0x08000, 0x08000, CRC(b9709686) SHA1(700905a3e9661e0874939f54da2909e1396ce596) )
 	ROM_LOAD( "rt_b-b2.3h", 0x10000, 0x08000, CRC(433b229a) SHA1(14222eaa3e67e5a7f80eafcf22bac4eb2d485a9a) )
 	ROM_LOAD( "rt_b-b3.3f", 0x18000, 0x08000, CRC(ad89b072) SHA1(e2683d0e7415f3abd147e518bf6c87e44744cd4f) )
 ROM_END
 
 ROM_START( rtypejp )
-	ROM_REGION( 0x100000, "maincpu", 0 ) /* Roms located on the M72-ROM-C rom board */
+	ROM_REGION( 0x100000, "maincpu", 0 ) // Roms located on the M72-ROM-C rom board
 	ROM_LOAD16_BYTE( "db_b1.bin", 0x00001, 0x10000, CRC(c1865141) SHA1(3302b6529aa903d81eb2196d745eb4f7f8316857) )
 	ROM_LOAD16_BYTE( "db_a1.bin", 0x00000, 0x10000, CRC(5ad2bd90) SHA1(0937dbbdf0cbce2e81cecf4d770bbd8c6bd82801) )
 	ROM_LOAD16_BYTE( "db_b2.bin", 0x20001, 0x10000, CRC(b4f6407e) SHA1(4a00d8e104c580900b4feb318dd162b77b71d0a5) )
@@ -2302,8 +2269,8 @@
 	ROM_LOAD16_BYTE( "db_a2.bin", 0x20000, 0x10000, CRC(6098d86f) SHA1(c6c9c1c2c30d5f190c40e000004bd21606efb8b0) )
 	ROM_RELOAD(                   0xe0000, 0x10000 )
 
-	ROM_REGION( 0x80000, "sprites", 0 ) /* Roms located on the M72-ROM-C rom board */
-	ROM_LOAD( "rt_r-00.1h", 0x00000, 0x10000, CRC(dad53bc0) SHA1(1e3bc498861946278a0b1fe24259f5d224e265d7) )    /* sprites */
+	ROM_REGION( 0x80000, "sprites", 0 ) // Roms located on the M72-ROM-C rom board
+	ROM_LOAD( "rt_r-00.1h", 0x00000, 0x10000, CRC(dad53bc0) SHA1(1e3bc498861946278a0b1fe24259f5d224e265d7) )    // sprites
 	ROM_LOAD( "rt_r-01.1j", 0x10000, 0x08000, CRC(5e441e7f) SHA1(6741eb7f2d9d985b5a89eefc73ea44c3e38de6f7) )
 	ROM_RELOAD(             0x18000, 0x08000 )
 	ROM_LOAD( "rt_r-10.1k", 0x20000, 0x10000, CRC(d6a66298) SHA1(d2873d05aa3b257e7699c188880ac3daad672fa5) )
@@ -2316,21 +2283,21 @@
 	ROM_LOAD( "rt_r-31.3l", 0x70000, 0x08000, CRC(8558355d) SHA1(b5467d1f22f6e5f90c5d8a8ac2d55974f287d589) )
 	ROM_RELOAD(             0x78000, 0x08000 )
 
-	ROM_REGION( 0x20000, "gfx2", 0 ) /* Roms located on the M72-B-D rom board */
-	ROM_LOAD( "rt_b-a0.3c", 0x00000, 0x08000, CRC(4e212fb0) SHA1(687061ecade2ebd0bd1343c9c4a831791853f79c) )    /* tiles #1 */
+	ROM_REGION( 0x20000, "gfx2", 0 ) // Roms located on the M72-B-D rom board
+	ROM_LOAD( "rt_b-a0.3c", 0x00000, 0x08000, CRC(4e212fb0) SHA1(687061ecade2ebd0bd1343c9c4a831791853f79c) )    // tiles #1
 	ROM_LOAD( "rt_b-a1.3d", 0x08000, 0x08000, CRC(8a65bdff) SHA1(130bf6af521f13247a739a95eab4bdaa24b2ac10) )
 	ROM_LOAD( "rt_b-a2.3a", 0x10000, 0x08000, CRC(5a4ae5b9) SHA1(95c3b64f50e6f673b2bf9b40642c152da5009d25) )
 	ROM_LOAD( "rt_b-a3.3e", 0x18000, 0x08000, CRC(73327606) SHA1(9529ecdedd30e2a0400fb1083117992cc18b5158) )
 
-	ROM_REGION( 0x20000, "gfx3", 0 ) /* Roms located on the M72-B-D rom board */
-	ROM_LOAD( "rt_b-b0.3j", 0x00000, 0x08000, CRC(a7b17491) SHA1(5b390770e56ba2d35e108534d7eda8dca996fdf7) )    /* tiles #2 */
+	ROM_REGION( 0x20000, "gfx3", 0 ) // Roms located on the M72-B-D rom board
+	ROM_LOAD( "rt_b-b0.3j", 0x00000, 0x08000, CRC(a7b17491) SHA1(5b390770e56ba2d35e108534d7eda8dca996fdf7) )    // tiles #2
 	ROM_LOAD( "rt_b-b1.3k", 0x08000, 0x08000, CRC(b9709686) SHA1(700905a3e9661e0874939f54da2909e1396ce596) )
 	ROM_LOAD( "rt_b-b2.3h", 0x10000, 0x08000, CRC(433b229a) SHA1(14222eaa3e67e5a7f80eafcf22bac4eb2d485a9a) )
 	ROM_LOAD( "rt_b-b3.3f", 0x18000, 0x08000, CRC(ad89b072) SHA1(e2683d0e7415f3abd147e518bf6c87e44744cd4f) )
 ROM_END
 
 ROM_START( rtypeu )
-	ROM_REGION( 0x100000, "maincpu", 0 ) /* Roms located on the M72-ROM-C rom board */
+	ROM_REGION( 0x100000, "maincpu", 0 ) // Roms located on the M72-ROM-C rom board
 	ROM_LOAD16_BYTE( "rt_r-h0-a.1b", 0x00001, 0x10000, CRC(36008a4e) SHA1(832006cb14a34e1671e305cc8ae606c3c6185a6a) )
 	ROM_LOAD16_BYTE( "rt_r-l0-a.3b", 0x00000, 0x10000, CRC(4aaa668e) SHA1(87059460b59f43f2ca8cd959d76f721facd9de96) )
 	ROM_LOAD16_BYTE( "rt_r-h1-a.1c", 0x20001, 0x10000, CRC(7ebb2a53) SHA1(1466df19888c3374847eb77f702060647e49d6ad) )
@@ -2338,8 +2305,8 @@
 	ROM_LOAD16_BYTE( "rt_r-l1-a.3c", 0x20000, 0x10000, CRC(c28b103b) SHA1(f294a23c3917b97812eb4c7f3a99253fd0cbb7ea) )
 	ROM_RELOAD(                      0xe0000, 0x10000 )
 
-	ROM_REGION( 0x80000, "sprites", 0 ) /* Roms located on the M72-ROM-C rom board */
-	ROM_LOAD( "rt_r-00.1h", 0x00000, 0x10000, CRC(dad53bc0) SHA1(1e3bc498861946278a0b1fe24259f5d224e265d7) )    /* sprites */
+	ROM_REGION( 0x80000, "sprites", 0 ) // Roms located on the M72-ROM-C rom board
+	ROM_LOAD( "rt_r-00.1h", 0x00000, 0x10000, CRC(dad53bc0) SHA1(1e3bc498861946278a0b1fe24259f5d224e265d7) )    // sprites
 	ROM_LOAD( "rt_r-01.1j", 0x10000, 0x08000, CRC(5e441e7f) SHA1(6741eb7f2d9d985b5a89eefc73ea44c3e38de6f7) )
 	ROM_RELOAD(             0x18000, 0x08000 )
 	ROM_LOAD( "rt_r-10.1k", 0x20000, 0x10000, CRC(d6a66298) SHA1(d2873d05aa3b257e7699c188880ac3daad672fa5) )
@@ -2352,32 +2319,32 @@
 	ROM_LOAD( "rt_r-31.3l", 0x70000, 0x08000, CRC(8558355d) SHA1(b5467d1f22f6e5f90c5d8a8ac2d55974f287d589) )
 	ROM_RELOAD(             0x78000, 0x08000 )
 
-	ROM_REGION( 0x20000, "gfx2", 0 ) /* Roms located on the M72-B-D rom board */
-	ROM_LOAD( "rt_b-a0.3c", 0x00000, 0x08000, CRC(4e212fb0) SHA1(687061ecade2ebd0bd1343c9c4a831791853f79c) )    /* tiles #1 */
+	ROM_REGION( 0x20000, "gfx2", 0 ) // Roms located on the M72-B-D rom board
+	ROM_LOAD( "rt_b-a0.3c", 0x00000, 0x08000, CRC(4e212fb0) SHA1(687061ecade2ebd0bd1343c9c4a831791853f79c) )    // tiles #1
 	ROM_LOAD( "rt_b-a1.3d", 0x08000, 0x08000, CRC(8a65bdff) SHA1(130bf6af521f13247a739a95eab4bdaa24b2ac10) )
 	ROM_LOAD( "rt_b-a2.3a", 0x10000, 0x08000, CRC(5a4ae5b9) SHA1(95c3b64f50e6f673b2bf9b40642c152da5009d25) )
 	ROM_LOAD( "rt_b-a3.3e", 0x18000, 0x08000, CRC(73327606) SHA1(9529ecdedd30e2a0400fb1083117992cc18b5158) )
 
-	ROM_REGION( 0x20000, "gfx3", 0 ) /* Roms located on the M72-B-D rom board */
-	ROM_LOAD( "rt_b-b0.3j", 0x00000, 0x08000, CRC(a7b17491) SHA1(5b390770e56ba2d35e108534d7eda8dca996fdf7) )    /* tiles #2 */
+	ROM_REGION( 0x20000, "gfx3", 0 ) // Roms located on the M72-B-D rom board
+	ROM_LOAD( "rt_b-b0.3j", 0x00000, 0x08000, CRC(a7b17491) SHA1(5b390770e56ba2d35e108534d7eda8dca996fdf7) )    // tiles #2
 	ROM_LOAD( "rt_b-b1.3k", 0x08000, 0x08000, CRC(b9709686) SHA1(700905a3e9661e0874939f54da2909e1396ce596) )
 	ROM_LOAD( "rt_b-b2.3h", 0x10000, 0x08000, CRC(433b229a) SHA1(14222eaa3e67e5a7f80eafcf22bac4eb2d485a9a) )
 	ROM_LOAD( "rt_b-b3.3f", 0x18000, 0x08000, CRC(ad89b072) SHA1(e2683d0e7415f3abd147e518bf6c87e44744cd4f) )
 
-	ROM_REGION( 0x0200, "proms", 0 ) /* Located on M72-A-C CPU/Sound board */
-	ROM_LOAD( "m72_a-8l-.ic66", 0x0000, 0x0100, CRC(b460c438) SHA1(00e20cf754b6fd5138ee4d2f6ec28dff9e292fe6) ) /* TBP24S10 */
-	ROM_LOAD( "m72_a-9l-.ic75", 0x0100, 0x0100, CRC(a4f2c4bc) SHA1(f13b0a4b52dcc6704063b676f09d83dcba170133) ) /* TBP24S10 */
+	ROM_REGION( 0x0200, "proms", 0 ) // Located on M72-A-C CPU/Sound board
+	ROM_LOAD( "m72_a-8l-.ic66", 0x0000, 0x0100, CRC(b460c438) SHA1(00e20cf754b6fd5138ee4d2f6ec28dff9e292fe6) ) // TBP24S10
+	ROM_LOAD( "m72_a-9l-.ic75", 0x0100, 0x0100, CRC(a4f2c4bc) SHA1(f13b0a4b52dcc6704063b676f09d83dcba170133) ) // TBP24S10
 
 	ROM_REGION( 0x0003, "plds", 0 )
-	/* Located on M72-ROM-C rom board */
-	ROM_LOAD( "m72_r-3a-.bin",  0x0000, 0x0001, NO_DUMP ) /* PAL16L8 at 3A */
-	/* Located on M72-A-C CPU/Sound board */
-	ROM_LOAD( "m72_a-3d-.bin",  0x0000, 0x0001, NO_DUMP ) /* PAL16L8 at IC11 */
-	ROM_LOAD( "m72_a-4d-.bin",  0x0000, 0x0001, NO_DUMP ) /* PAL16L8 at IC19 */
+	// Located on M72-ROM-C rom board
+	ROM_LOAD( "m72_r-3a-.bin",  0x0000, 0x0001, NO_DUMP ) // PAL16L8 at 3A
+	// Located on M72-A-C CPU/Sound board
+	ROM_LOAD( "m72_a-3d-.bin",  0x0000, 0x0001, NO_DUMP ) // PAL16L8 at IC11
+	ROM_LOAD( "m72_a-4d-.bin",  0x0000, 0x0001, NO_DUMP ) // PAL16L8 at IC19
 ROM_END
 
 ROM_START( rtypeb )
-	ROM_REGION( 0x100000, "maincpu", 0 ) /* Roms located on the M72-ROM-C rom board */
+	ROM_REGION( 0x100000, "maincpu", 0 ) // Roms located on the M72-ROM-C rom board
 	ROM_LOAD16_BYTE( "7.512", 0x00001, 0x10000, CRC(eacc8024) SHA1(6bcf1d4ea182b7341eac736d2a5d5f70deec0758) )
 	ROM_LOAD16_BYTE( "1.512", 0x00000, 0x10000, CRC(2e5fe27b) SHA1(a3364be5ab9c67aaa2152baf39ea12c571eca3cc) )
 	ROM_LOAD16_BYTE( "8.512", 0x20001, 0x10000, CRC(22cc4950) SHA1(ada5cffc13c38391a334411632237166a6be4938) )
@@ -2385,8 +2352,8 @@
 	ROM_LOAD16_BYTE( "2.512", 0x20000, 0x10000, CRC(ada7b90e) SHA1(c9d2caed95b95d1c1718a10766bc88b2f8f51619) )
 	ROM_RELOAD(               0xe0000, 0x10000 )
 
-	ROM_REGION( 0x80000, "sprites", 0 ) /* Roms located on the M72-ROM-C rom board */
-	ROM_LOAD( "rt_r-00.1h", 0x00000, 0x10000, CRC(dad53bc0) SHA1(1e3bc498861946278a0b1fe24259f5d224e265d7) )    /* sprites */
+	ROM_REGION( 0x80000, "sprites", 0 ) // Roms located on the M72-ROM-C rom board
+	ROM_LOAD( "rt_r-00.1h", 0x00000, 0x10000, CRC(dad53bc0) SHA1(1e3bc498861946278a0b1fe24259f5d224e265d7) )    // sprites
 	ROM_LOAD( "rt_r-01.1j", 0x10000, 0x08000, CRC(5e441e7f) SHA1(6741eb7f2d9d985b5a89eefc73ea44c3e38de6f7) )
 	ROM_RELOAD(             0x18000, 0x08000 )
 	ROM_LOAD( "rt_r-10.1k", 0x20000, 0x10000, CRC(d6a66298) SHA1(d2873d05aa3b257e7699c188880ac3daad672fa5) )
@@ -2399,14 +2366,14 @@
 	ROM_LOAD( "rt_r-31.3l", 0x70000, 0x08000, CRC(8558355d) SHA1(b5467d1f22f6e5f90c5d8a8ac2d55974f287d589) )
 	ROM_RELOAD(             0x78000, 0x08000 )
 
-	ROM_REGION( 0x20000, "gfx2", 0 ) /* Roms located on the M72-B-D rom board */
-	ROM_LOAD( "rt_b-a0.3c", 0x00000, 0x08000, CRC(4e212fb0) SHA1(687061ecade2ebd0bd1343c9c4a831791853f79c) )    /* tiles #1 */
+	ROM_REGION( 0x20000, "gfx2", 0 ) // Roms located on the M72-B-D rom board
+	ROM_LOAD( "rt_b-a0.3c", 0x00000, 0x08000, CRC(4e212fb0) SHA1(687061ecade2ebd0bd1343c9c4a831791853f79c) )    // tiles #1
 	ROM_LOAD( "rt_b-a1.3d", 0x08000, 0x08000, CRC(8a65bdff) SHA1(130bf6af521f13247a739a95eab4bdaa24b2ac10) )
 	ROM_LOAD( "rt_b-a2.3a", 0x10000, 0x08000, CRC(5a4ae5b9) SHA1(95c3b64f50e6f673b2bf9b40642c152da5009d25) )
 	ROM_LOAD( "rt_b-a3.3e", 0x18000, 0x08000, CRC(73327606) SHA1(9529ecdedd30e2a0400fb1083117992cc18b5158) )
 
-	ROM_REGION( 0x20000, "gfx3", 0 ) /* Roms located on the M72-B-D rom board */
-	ROM_LOAD( "rt_b-b0.3j", 0x00000, 0x08000, CRC(a7b17491) SHA1(5b390770e56ba2d35e108534d7eda8dca996fdf7) )    /* tiles #2 */
+	ROM_REGION( 0x20000, "gfx3", 0 ) // Roms located on the M72-B-D rom board
+	ROM_LOAD( "rt_b-b0.3j", 0x00000, 0x08000, CRC(a7b17491) SHA1(5b390770e56ba2d35e108534d7eda8dca996fdf7) )    // tiles #2
 	ROM_LOAD( "rt_b-b1.3k", 0x08000, 0x08000, CRC(b9709686) SHA1(700905a3e9661e0874939f54da2909e1396ce596) )
 	ROM_LOAD( "rt_b-b2.3h", 0x10000, 0x08000, CRC(433b229a) SHA1(14222eaa3e67e5a7f80eafcf22bac4eb2d485a9a) )
 	ROM_LOAD( "rt_b-b3.3f", 0x18000, 0x08000, CRC(ad89b072) SHA1(e2683d0e7415f3abd147e518bf6c87e44744cd4f) )
@@ -2424,11 +2391,11 @@
 	ROM_LOAD16_BYTE( "mh_c-l3-b.ic34", 0x60000, 0x10000, CRC(11562221) SHA1(a2f136a487fb6f30350e8d1e26c0729eb0686c7d) )
 	ROM_RELOAD(                        0xe0000, 0x10000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )  /* i8751 microcontroller */
-	ROM_LOAD( "mh_c-pr-b.ic1",  0x00000, 0x10000, NO_DUMP ) /* i8751 MCU labeled  MH C-PR-B  - read protected */
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "mh_c-pr-b.ic1",  0x00000, 0x10000, NO_DUMP ) // i8751 MCU labeled  MH C-PR-B  - read protected
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "mh_c-00-a.ic53", 0x00000, 0x10000, CRC(f6e6e660) SHA1(e066e5ed37719cf2b6fd36e0117f11325bb06f9c) )  /* sprites */
+	ROM_LOAD( "mh_c-00-a.ic53", 0x00000, 0x10000, CRC(f6e6e660) SHA1(e066e5ed37719cf2b6fd36e0117f11325bb06f9c) )  // sprites
 	ROM_LOAD( "mh_c-01-b.ic52", 0x10000, 0x10000, CRC(708cdd37) SHA1(24f3fcd381422f0d75410c2af7a56744e3b4a699) )
 	ROM_LOAD( "mh_c-10-a.ic51", 0x20000, 0x10000, CRC(292c8520) SHA1(c552090d295ee1c1ca611b0cddee356e509e2045) )
 	ROM_LOAD( "mh_c-11-b.ic50", 0x30000, 0x10000, CRC(20904cf3) SHA1(71fe505f2da53c2eb445b7b758d257d6af42e6f1) )
@@ -2438,18 +2405,18 @@
 	ROM_LOAD( "mh_c-31-b.ic46", 0x70000, 0x10000, CRC(23134ec5) SHA1(43453f8a13b51310e04729dc828d391ca9c04da2) )
 
 	ROM_REGION( 0x040000, "gfx2", 0 )
-	ROM_LOAD( "mh_b-a0-b.ic21", 0x00000, 0x10000, CRC(e46ed7bf) SHA1(75abb5f40629f7c40a610a44e068b6c4e3a5126e) )  /* tiles #1 */
+	ROM_LOAD( "mh_b-a0-b.ic21", 0x00000, 0x10000, CRC(e46ed7bf) SHA1(75abb5f40629f7c40a610a44e068b6c4e3a5126e) )  // tiles #1
 	ROM_LOAD( "mh_b-a1-b.ic22", 0x10000, 0x10000, CRC(590605ff) SHA1(fbb5c0cebd28b08d4ce39db4055d6343620e0f1c) )
 	ROM_LOAD( "mh_b-a2-b.ic20", 0x20000, 0x10000, CRC(f8158226) SHA1(bb3a8686cd89bb8265b6b9e03682cc0bf6533793) )
 	ROM_LOAD( "mh_b-a3-b.ic23", 0x30000, 0x10000, CRC(0f07b9b7) SHA1(63dbec17097f07eb39299372b736fbbc1b11b65e) )
 
 	ROM_REGION( 0x040000, "gfx3", 0 )
-	ROM_LOAD( "mh_b-b0-.ic26", 0x00000, 0x10000, CRC(b5b95776) SHA1(4685b56071b916ce712c45f24da8068dd7e40ed1) )  /* tiles #2 */
+	ROM_LOAD( "mh_b-b0-.ic26", 0x00000, 0x10000, CRC(b5b95776) SHA1(4685b56071b916ce712c45f24da8068dd7e40ed1) )  // tiles #2
 	ROM_LOAD( "mh_b-b1-.ic27", 0x10000, 0x10000, CRC(74ca16ee) SHA1(7984bc9a0b46e1b4a8ecac7528d57606305aad73) )
 	ROM_LOAD( "mh_b-b2-.ic25", 0x20000, 0x10000, CRC(b82cca04) SHA1(c12b95be311205181b01d15021bcf9f01ed3e0a3) )
 	ROM_LOAD( "mh_b-b3-.ic24", 0x30000, 0x10000, CRC(a7afc920) SHA1(92c75463ada39184e731b82ef2883ae6f1f67482) )
 
-	ROM_REGION( 0x10000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x10000, "samples", 0 ) // samples
 	ROM_LOAD( "mh_c-v0-b.ic44", 0x00000, 0x10000, CRC(d0c27e58) SHA1(fec76217cc0c04c723989c3ec127a2bd33d64c60) )
 ROM_END
 
@@ -2464,28 +2431,28 @@
 	ROM_LOAD16_BYTE( "mh_c-l3-.ic34", 0x60000, 0x10000, CRC(c0982536) SHA1(45399f8d0577c6e2a277a69303954ce5d2de7c07) )
 	ROM_RELOAD(                       0xe0000, 0x10000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )  /* i8751 microcontroller */
-	ROM_LOAD( "mh_c-pr-.ic1",  0x00000, 0x1000, CRC(897dc4ee) SHA1(05a24bf76e8fa9ca96ba9376cbf44d299df04138) ) /* i8751 MCU labeled  MH C-PR- */
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "mh_c-pr-.ic1",  0x00000, 0x1000, CRC(897dc4ee) SHA1(05a24bf76e8fa9ca96ba9376cbf44d299df04138) ) // i8751 MCU labeled  MH C-PR-
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "mh_c-00.ic53", 0x00000, 0x20000, CRC(dec4e121) SHA1(92169b523f1600e994e016dc1959a52958e1d89d) )  /* sprites */
+	ROM_LOAD( "mh_c-00.ic53", 0x00000, 0x20000, CRC(dec4e121) SHA1(92169b523f1600e994e016dc1959a52958e1d89d) )  // sprites
 	ROM_LOAD( "mh_c-10.ic51", 0x20000, 0x20000, CRC(7aaa151e) SHA1(efd980bb2eed7084354b7a4aa2f733cd2f876741) )
 	ROM_LOAD( "mh_c-20.ic49", 0x40000, 0x20000, CRC(eae0de74) SHA1(3a2469c0eeb18131f989807afb50228f57ccea30) )
 	ROM_LOAD( "mh_c-30.ic47", 0x60000, 0x20000, CRC(01d5052f) SHA1(5d5e70913bb7af48193c70209595f27a64fa6cac) )
 
 	ROM_REGION( 0x040000, "gfx2", 0 )
-	ROM_LOAD( "mh_b-a0.ic21", 0x00000, 0x10000, CRC(6a0db256) SHA1(fa3a2dc03da5bbe06a9c9b3d4ed4fddb47c469ac) )  /* tiles #1 */
+	ROM_LOAD( "mh_b-a0.ic21", 0x00000, 0x10000, CRC(6a0db256) SHA1(fa3a2dc03da5bbe06a9c9b3d4ed4fddb47c469ac) )  // tiles #1
 	ROM_LOAD( "mh_b-a1.ic22", 0x10000, 0x10000, CRC(14ec9795) SHA1(4842e076115efe9daf00dab8f61516d28c19baae) )
 	ROM_LOAD( "mh_b-a2.ic20", 0x20000, 0x10000, CRC(dfcb510e) SHA1(2387cde4ec0bae176486e1f7541103fd557fe255) )
 	ROM_LOAD( "mh_b-a3.ic23", 0x30000, 0x10000, CRC(957e329b) SHA1(9d48a0b84915e1cef0b0311a3581991dc83ee199) )
 
 	ROM_REGION( 0x040000, "gfx3", 0 )
-	ROM_LOAD( "mh_b-b0-.ic26", 0x00000, 0x10000, CRC(b5b95776) SHA1(4685b56071b916ce712c45f24da8068dd7e40ed1) )  /* tiles #2 */
+	ROM_LOAD( "mh_b-b0-.ic26", 0x00000, 0x10000, CRC(b5b95776) SHA1(4685b56071b916ce712c45f24da8068dd7e40ed1) )  // tiles #2
 	ROM_LOAD( "mh_b-b1-.ic27", 0x10000, 0x10000, CRC(74ca16ee) SHA1(7984bc9a0b46e1b4a8ecac7528d57606305aad73) )
 	ROM_LOAD( "mh_b-b2-.ic25", 0x20000, 0x10000, CRC(b82cca04) SHA1(c12b95be311205181b01d15021bcf9f01ed3e0a3) )
 	ROM_LOAD( "mh_b-b3-.ic24", 0x30000, 0x10000, CRC(a7afc920) SHA1(92c75463ada39184e731b82ef2883ae6f1f67482) )
 
-	ROM_REGION( 0x10000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x10000, "samples", 0 ) // samples
 	ROM_LOAD( "mh_c-v0-b.ic44", 0x00000, 0x10000, CRC(d0c27e58) SHA1(fec76217cc0c04c723989c3ec127a2bd33d64c60) )
 ROM_END
 
@@ -2627,40 +2594,40 @@
 	ROM_LOAD16_BYTE( "nin_c-l3-b.6a", 0x60000, 0x10000, CRC(fd7408b8) SHA1(3cbe72835a561c50265a047f0f5cd62db48378fd) )
 	ROM_RELOAD(                       0xe0000, 0x10000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )  /* i8751 microcontroller */
-	ROM_LOAD( "nin_c-pr-b.ic1", 0x00000, 0x01000, NO_DUMP ) /* i8751 MCU labeled  NIN C-PR-B  - read protected */
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "nin_c-pr-b.ic1", 0x00000, 0x01000, NO_DUMP ) // i8751 MCU labeled  NIN C-PR-B  - read protected
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "nin-r00.7m",  0x00000, 0x20000, CRC(5f61d30b) SHA1(7754697e43f6117fa604f50885b76014b1dc5760) )  /* sprites */
+	ROM_LOAD( "nin-r00.7m",  0x00000, 0x20000, CRC(5f61d30b) SHA1(7754697e43f6117fa604f50885b76014b1dc5760) )  // sprites
 	ROM_LOAD( "nin-r10.7j",  0x20000, 0x20000, CRC(0caad107) SHA1(c4eff00327313e05ac8f7c6dbee3a0de1c83fadd) )
 	ROM_LOAD( "nin-r20.7f",  0x40000, 0x20000, CRC(ef3617d3) SHA1(16c175cf45559aacdea6e4002dd8a87f16817cfb) )
 	ROM_LOAD( "nin-r30.7d",  0x60000, 0x20000, CRC(175d2a24) SHA1(d1887efd4d8e74c38c53dbbc541ca8d17f29eb59) )
 
 	ROM_REGION( 0x040000, "gfx2", 0 )
-	ROM_LOAD( "nin_b-a0.4c", 0x00000, 0x10000, CRC(63f8f658) SHA1(82c02d0f7a2d95dfd8d300c46312d511524775ce) )  /* tiles #1 */
+	ROM_LOAD( "nin_b-a0.4c", 0x00000, 0x10000, CRC(63f8f658) SHA1(82c02d0f7a2d95dfd8d300c46312d511524775ce) )  // tiles #1
 	ROM_LOAD( "nin_b-a1.4d", 0x10000, 0x10000, CRC(75eb8306) SHA1(2abc359a0bb2863759a68ed60e730761b9751829) )
 	ROM_LOAD( "nin_b-a2.4b", 0x20000, 0x10000, CRC(df532172) SHA1(58b5a79a57e71405b3e1abd41d54cf6a4d12873a) )
 	ROM_LOAD( "nin_b-a3.4e", 0x30000, 0x10000, CRC(4dedd64c) SHA1(8a5c73a024d95e6fe3ab70daafcd5b235418ad36) )
 
 	ROM_REGION( 0x040000, "gfx3", 0 )
-	ROM_LOAD( "b0.4j",       0x00000, 0x10000, CRC(1b0e08a6) SHA1(892686594970c264babbe8673c258929a5e480f6) )  /* tiles #2 */
+	ROM_LOAD( "b0.4j",       0x00000, 0x10000, CRC(1b0e08a6) SHA1(892686594970c264babbe8673c258929a5e480f6) )  // tiles #2
 	ROM_LOAD( "b1.4k",       0x10000, 0x10000, CRC(728727f0) SHA1(2f594c77a847ebee71c9da8a644f83ea2a1313d7) )
 	ROM_LOAD( "b2.4h",       0x20000, 0x10000, CRC(f87efd75) SHA1(16474c7ab57b4fbb5cb50799ea6a2326c66706b5) )
 	ROM_LOAD( "b3.4f",       0x30000, 0x10000, CRC(98856cb4) SHA1(aa4fbae972d2e827c75650a71ab4ef73a33cd018) )
 
-	ROM_REGION( 0x10000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x10000, "samples", 0 ) // samples
 	ROM_LOAD( "nin-v0.7a",   0x00000, 0x10000, CRC(a32e8caf) SHA1(63d56ad3a63fb089056e4a170159120287594ea8) )
 
-	ROM_REGION( 0x0200, "proms", 0 ) /* Located on M72-A-C CPU/Sound board */
-	ROM_LOAD( "m72_a-8l.8l", 0x0000, 0x0100, CRC(b460c438) SHA1(00e20cf754b6fd5138ee4d2f6ec28dff9e292fe6) ) /* TBP24S10 */
-	ROM_LOAD( "m72_a-9l.9l", 0x0100, 0x0100, CRC(a4f2c4bc) SHA1(f13b0a4b52dcc6704063b676f09d83dcba170133) ) /* TBP24S10 */
+	ROM_REGION( 0x0200, "proms", 0 ) // Located on M72-A-C CPU/Sound board
+	ROM_LOAD( "m72_a-8l.8l", 0x0000, 0x0100, CRC(b460c438) SHA1(00e20cf754b6fd5138ee4d2f6ec28dff9e292fe6) ) // TBP24S10
+	ROM_LOAD( "m72_a-9l.9l", 0x0100, 0x0100, CRC(a4f2c4bc) SHA1(f13b0a4b52dcc6704063b676f09d83dcba170133) ) // TBP24S10
 
 	ROM_REGION( 0x0300, "plds", 0 )
-	/* Located on M72-ROM-C rom board */
-	ROM_LOAD( "nin_c-3f.3f", 0x0000, 0x0100, CRC(5402fc07) SHA1(fa4284710b31be62ab99b0e1d60844db9a8d843e) ) /* TBP16L8 */
-	/* Located on M72-A-C CPU/Sound board */
-	ROM_LOAD( "m72_a-3d.3d", 0x0100, 0x0100, CRC(de85dac3) SHA1(af83b0325f28fbb1bcc424c1b58ff0f4b49f6b67) ) /* TBP16L8 */
-	ROM_LOAD( "m72_a-4d.4d", 0x0200, 0x0100, CRC(59676de1) SHA1(fcf35f5463c14a4b06d58684c47ea9de5216d1da) ) /* TBP16L8 */
+	// Located on M72-ROM-C rom board
+	ROM_LOAD( "nin_c-3f.3f", 0x0000, 0x0100, CRC(5402fc07) SHA1(fa4284710b31be62ab99b0e1d60844db9a8d843e) ) // TBP16L8
+	// Located on M72-A-C CPU/Sound board
+	ROM_LOAD( "m72_a-3d.3d", 0x0100, 0x0100, CRC(de85dac3) SHA1(af83b0325f28fbb1bcc424c1b58ff0f4b49f6b67) ) // TBP16L8
+	ROM_LOAD( "m72_a-4d.4d", 0x0200, 0x0100, CRC(59676de1) SHA1(fcf35f5463c14a4b06d58684c47ea9de5216d1da) ) // TBP16L8
 ROM_END
 
 ROM_START( nspiritj )
@@ -2676,28 +2643,28 @@
 	ROM_LOAD16_BYTE( "nin_c-l3.6a", 0x60000, 0x10000, CRC(e754a87a) SHA1(9951d972ed13a0415c827beff122bc7ddb078447) )
 	ROM_RELOAD(                     0xe0000, 0x10000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )  /* i8751 microcontroller */
-	ROM_LOAD( "nin_c-pr-.ic1", 0x00000, 0x01000, CRC(802d440a) SHA1(45b844b831aa6d5d002e3960e17fb5a058b02a29) ) /* i8751 MCU labeled  NIN C-PR- */
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "nin_c-pr-.ic1", 0x00000, 0x01000, CRC(802d440a) SHA1(45b844b831aa6d5d002e3960e17fb5a058b02a29) ) // i8751 MCU labeled  NIN C-PR-
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "nin-r00.7m",  0x00000, 0x20000, CRC(5f61d30b) SHA1(7754697e43f6117fa604f50885b76014b1dc5760) )  /* sprites */
+	ROM_LOAD( "nin-r00.7m",  0x00000, 0x20000, CRC(5f61d30b) SHA1(7754697e43f6117fa604f50885b76014b1dc5760) )  // sprites
 	ROM_LOAD( "nin-r10.7j",  0x20000, 0x20000, CRC(0caad107) SHA1(c4eff00327313e05ac8f7c6dbee3a0de1c83fadd) )
 	ROM_LOAD( "nin-r20.7f",  0x40000, 0x20000, CRC(ef3617d3) SHA1(16c175cf45559aacdea6e4002dd8a87f16817cfb) )
 	ROM_LOAD( "nin-r30.7d",  0x60000, 0x20000, CRC(175d2a24) SHA1(d1887efd4d8e74c38c53dbbc541ca8d17f29eb59) )
 
 	ROM_REGION( 0x040000, "gfx2", 0 )
-	ROM_LOAD( "nin_b-a0.4c", 0x00000, 0x10000, CRC(63f8f658) SHA1(82c02d0f7a2d95dfd8d300c46312d511524775ce) )  /* tiles #1 */
+	ROM_LOAD( "nin_b-a0.4c", 0x00000, 0x10000, CRC(63f8f658) SHA1(82c02d0f7a2d95dfd8d300c46312d511524775ce) )  // tiles #1
 	ROM_LOAD( "nin_b-a1.4d", 0x10000, 0x10000, CRC(75eb8306) SHA1(2abc359a0bb2863759a68ed60e730761b9751829) )
 	ROM_LOAD( "nin_b-a2.4b", 0x20000, 0x10000, CRC(df532172) SHA1(58b5a79a57e71405b3e1abd41d54cf6a4d12873a) )
 	ROM_LOAD( "nin_b-a3.4e", 0x30000, 0x10000, CRC(4dedd64c) SHA1(8a5c73a024d95e6fe3ab70daafcd5b235418ad36) )
 
 	ROM_REGION( 0x040000, "gfx3", 0 )
-	ROM_LOAD( "b0.4j",       0x00000, 0x10000, CRC(1b0e08a6) SHA1(892686594970c264babbe8673c258929a5e480f6) )  /* tiles #2 */
+	ROM_LOAD( "b0.4j",       0x00000, 0x10000, CRC(1b0e08a6) SHA1(892686594970c264babbe8673c258929a5e480f6) )  // tiles #2
 	ROM_LOAD( "b1.4k",       0x10000, 0x10000, CRC(728727f0) SHA1(2f594c77a847ebee71c9da8a644f83ea2a1313d7) )
 	ROM_LOAD( "b2.4h",       0x20000, 0x10000, CRC(f87efd75) SHA1(16474c7ab57b4fbb5cb50799ea6a2326c66706b5) )
 	ROM_LOAD( "b3.4f",       0x30000, 0x10000, CRC(98856cb4) SHA1(aa4fbae972d2e827c75650a71ab4ef73a33cd018) )
 
-	ROM_REGION( 0x10000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x10000, "samples", 0 ) // samples
 	ROM_LOAD( "nin-v0.7a",   0x00000, 0x10000, CRC(a32e8caf) SHA1(63d56ad3a63fb089056e4a170159120287594ea8) )
 ROM_END
 
@@ -2711,28 +2678,28 @@
 	ROM_LOAD16_BYTE( "if-c-l3.ic34",   0x40000, 0x20000, CRC(c66ae348) SHA1(eca5096ebd5bffc6e68f3fc9969cda9679bd921f) )
 	ROM_RELOAD(                        0xc0000, 0x20000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )  /* i8751 microcontroller */
-	ROM_LOAD( "if_c-pr-a.ic1",  0x00000, 0x01000, NO_DUMP )
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "if_c-pr-a.ic1",  0x00000, 0x01000, CRC(55f10458) SHA1(d520ec2b075c94d76d97e0105644ff96384b378c) ) // i8751 MCU labeled  IF C-PR-A
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "if-c-00.ic53", 0x00000, 0x20000, CRC(745e6638) SHA1(43fb1f9da4190fea67eee3aee8caf4219becc21b) )  /* sprites */
+	ROM_LOAD( "if-c-00.ic53", 0x00000, 0x20000, CRC(745e6638) SHA1(43fb1f9da4190fea67eee3aee8caf4219becc21b) )  // sprites
 	ROM_LOAD( "if-c-10.ic51", 0x20000, 0x20000, CRC(b7108449) SHA1(1f41ebe7164fab86958caaf6749b99425e682657) )
 	ROM_LOAD( "if-c-20.ic49", 0x40000, 0x20000, CRC(aef33cba) SHA1(2d8a8458207d0c790c81b1285366463c8540d190) )
 	ROM_LOAD( "if-c-30.ic47", 0x60000, 0x20000, CRC(1f98e695) SHA1(5fddcfb17523f8e96f4b85f0cb15d837b81f2bd4) )
 
 	ROM_REGION( 0x040000, "gfx2", 0 )
-	ROM_LOAD( "if-a-a0.ic21", 0x00000, 0x10000, CRC(34ee2d77) SHA1(38826e0318aa8da893fa4c93f217288c015df606) )  /* tiles #1 */
+	ROM_LOAD( "if-a-a0.ic21", 0x00000, 0x10000, CRC(34ee2d77) SHA1(38826e0318aa8da893fa4c93f217288c015df606) )  // tiles #1
 	ROM_LOAD( "if-a-a1.ic22", 0x10000, 0x10000, CRC(6bd2845b) SHA1(149cf14f919590da88b9a8e254690da010709862) )
 	ROM_LOAD( "if-a-a2.ic20", 0x20000, 0x10000, CRC(090d50e5) SHA1(4f2a7c76320b3f8dafae90a246187e034fe7562b) )
 	ROM_LOAD( "if-a-a3.ic23", 0x30000, 0x10000, CRC(3a8e3083) SHA1(8a75d556790b6bea41ead1a5f95589dd293bdf4e) )
 
 	ROM_REGION( 0x040000, "gfx3", 0 )
-	ROM_LOAD( "if-a-b0.ic26", 0x00000, 0x10000, CRC(b425c829) SHA1(0ccd487dba00bb7cb0ff5d1c67f8fee3e68df5d8) )  /* tiles #2 */
+	ROM_LOAD( "if-a-b0.ic26", 0x00000, 0x10000, CRC(b425c829) SHA1(0ccd487dba00bb7cb0ff5d1c67f8fee3e68df5d8) )  // tiles #2
 	ROM_LOAD( "if-a-b1.ic27", 0x10000, 0x10000, CRC(e9bfe23e) SHA1(f97a68dbdce7e06d07faab19acf7625cdc8eeaa8) )
 	ROM_LOAD( "if-a-b2.ic25", 0x20000, 0x10000, CRC(256e50f2) SHA1(9e9fda4f1f1449548942c0da4478f61fe0d263d1) )
 	ROM_LOAD( "if-a-b3.ic24", 0x30000, 0x10000, CRC(4c682785) SHA1(f61f1227e0ad629fdfca106306b17a9f6a9959e3) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "if-c-v0.ic44", 0x00000, 0x10000, CRC(cb64a194) SHA1(940fad6b9147bccc8290e112f5973f8ea062b52f) )
 	ROM_LOAD( "if-c-v1.ic45", 0x10000, 0x10000, CRC(45b68bf5) SHA1(2fb28793019ca85b3b6d7c4c31eedff1d71f2d83) )
 ROM_END
@@ -2746,28 +2713,28 @@
 	ROM_LOAD16_BYTE( "if-c-l3.ic34", 0x40000, 0x20000, CRC(c66ae348) SHA1(eca5096ebd5bffc6e68f3fc9969cda9679bd921f) )
 	ROM_RELOAD(                      0xc0000, 0x20000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )    /* i8751 microcontroller */
-	ROM_LOAD( "if_c-pr-.ic1", 0x00000, 0x01000, CRC(ef0d5098) SHA1(068b73937588e16a318a094dfe2fb1293b1a1711) ) /* i8751 MCU labeled  IF C-PR- */
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "if_c-pr-.ic1", 0x00000, 0x01000, CRC(ef0d5098) SHA1(068b73937588e16a318a094dfe2fb1293b1a1711) ) // i8751 MCU labeled  IF C-PR-
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "if-c-00.ic53", 0x00000, 0x20000, CRC(745e6638) SHA1(43fb1f9da4190fea67eee3aee8caf4219becc21b) )  /* sprites */
+	ROM_LOAD( "if-c-00.ic53", 0x00000, 0x20000, CRC(745e6638) SHA1(43fb1f9da4190fea67eee3aee8caf4219becc21b) )  // sprites
 	ROM_LOAD( "if-c-10.ic51", 0x20000, 0x20000, CRC(b7108449) SHA1(1f41ebe7164fab86958caaf6749b99425e682657) )
 	ROM_LOAD( "if-c-20.ic49", 0x40000, 0x20000, CRC(aef33cba) SHA1(2d8a8458207d0c790c81b1285366463c8540d190) )
 	ROM_LOAD( "if-c-30.ic47", 0x60000, 0x20000, CRC(1f98e695) SHA1(5fddcfb17523f8e96f4b85f0cb15d837b81f2bd4) )
 
 	ROM_REGION( 0x040000, "gfx2", 0 )
-	ROM_LOAD( "if-a-a0.ic21", 0x00000, 0x10000, CRC(34ee2d77) SHA1(38826e0318aa8da893fa4c93f217288c015df606) )  /* tiles #1 */
+	ROM_LOAD( "if-a-a0.ic21", 0x00000, 0x10000, CRC(34ee2d77) SHA1(38826e0318aa8da893fa4c93f217288c015df606) )  // tiles #1
 	ROM_LOAD( "if-a-a1.ic22", 0x10000, 0x10000, CRC(6bd2845b) SHA1(149cf14f919590da88b9a8e254690da010709862) )
 	ROM_LOAD( "if-a-a2.ic20", 0x20000, 0x10000, CRC(090d50e5) SHA1(4f2a7c76320b3f8dafae90a246187e034fe7562b) )
 	ROM_LOAD( "if-a-a3.ic23", 0x30000, 0x10000, CRC(3a8e3083) SHA1(8a75d556790b6bea41ead1a5f95589dd293bdf4e) )
 
 	ROM_REGION( 0x040000, "gfx3", 0 )
-	ROM_LOAD( "if-a-b0.ic26", 0x00000, 0x10000, CRC(b425c829) SHA1(0ccd487dba00bb7cb0ff5d1c67f8fee3e68df5d8) )  /* tiles #2 */
+	ROM_LOAD( "if-a-b0.ic26", 0x00000, 0x10000, CRC(b425c829) SHA1(0ccd487dba00bb7cb0ff5d1c67f8fee3e68df5d8) )  // tiles #2
 	ROM_LOAD( "if-a-b1.ic27", 0x10000, 0x10000, CRC(e9bfe23e) SHA1(f97a68dbdce7e06d07faab19acf7625cdc8eeaa8) )
 	ROM_LOAD( "if-a-b2.ic25", 0x20000, 0x10000, CRC(256e50f2) SHA1(9e9fda4f1f1449548942c0da4478f61fe0d263d1) )
 	ROM_LOAD( "if-a-b3.ic24", 0x30000, 0x10000, CRC(4c682785) SHA1(f61f1227e0ad629fdfca106306b17a9f6a9959e3) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "if-c-v0.ic44", 0x00000, 0x10000, CRC(cb64a194) SHA1(940fad6b9147bccc8290e112f5973f8ea062b52f) )
 	ROM_LOAD( "if-c-v1.ic45", 0x10000, 0x10000, CRC(45b68bf5) SHA1(2fb28793019ca85b3b6d7c4c31eedff1d71f2d83) )
 ROM_END
@@ -2789,7 +2756,7 @@
 	ROM_LOAD( "25.ic27.2l",  0x00000, 0x2000, CRC(d83359a2) SHA1(2d486bf4a873abfe591e0d9383f9e230f47bc42a) ) // i80c31 instead of i8751, contents identical to imgfightj MCU, with second half padded with 0xff
 
 	ROM_REGION( 0x080000, "sprites", 0 ) // half size ROMs, but identical content
-	ROM_LOAD( "ic96.7k",  0x00000, 0x10000, CRC(d4febb03) SHA1(6fe53b198bdcef1708ff134c64af9c064e274e1b) )  /* sprites */
+	ROM_LOAD( "ic96.7k",  0x00000, 0x10000, CRC(d4febb03) SHA1(6fe53b198bdcef1708ff134c64af9c064e274e1b) )  // sprites
 	ROM_LOAD( "ic97.7l",  0x10000, 0x10000, CRC(973d7bbc) SHA1(409242ddc7eb90564a15b222641e53d11ab1e04a) )
 	ROM_LOAD( "ic115.9k", 0x20000, 0x10000, CRC(2328880b) SHA1(a35c77a7d04614dbfbca4c79bb3e729115129ee4) )
 	ROM_LOAD( "ic116.9l", 0x30000, 0x10000, CRC(6da001ea) SHA1(473ed89b77809b3b76bfa9f5ca4008c9534cdbb4) )
@@ -2799,53 +2766,54 @@
 	ROM_LOAD( "ic114.9j", 0x70000, 0x10000, CRC(1933eb65) SHA1(4c24cfd059c11875f53b57cc020fbdbac903bd4a) )
 
 	ROM_REGION( 0x040000, "gfx2", 0 ) // identical
-	ROM_LOAD( "ic30.3d",  0x00000, 0x10000, CRC(34ee2d77) SHA1(38826e0318aa8da893fa4c93f217288c015df606) )  /* tiles #1 */
+	ROM_LOAD( "ic30.3d",  0x00000, 0x10000, CRC(34ee2d77) SHA1(38826e0318aa8da893fa4c93f217288c015df606) )  // tiles #1
 	ROM_LOAD( "ic31.3e",  0x10000, 0x10000, CRC(6bd2845b) SHA1(149cf14f919590da88b9a8e254690da010709862) )
 	ROM_LOAD( "ic29.3c",  0x20000, 0x10000, CRC(090d50e5) SHA1(4f2a7c76320b3f8dafae90a246187e034fe7562b) )
 	ROM_LOAD( "ic32.3f",  0x30000, 0x10000, CRC(3a8e3083) SHA1(8a75d556790b6bea41ead1a5f95589dd293bdf4e) )
 
 	ROM_REGION( 0x040000, "gfx3", 0 ) // identical
-	ROM_LOAD( "ic35.3k",  0x00000, 0x10000, CRC(b425c829) SHA1(0ccd487dba00bb7cb0ff5d1c67f8fee3e68df5d8) )  /* tiles #2 */
+	ROM_LOAD( "ic35.3k",  0x00000, 0x10000, CRC(b425c829) SHA1(0ccd487dba00bb7cb0ff5d1c67f8fee3e68df5d8) )  // tiles #2
 	ROM_LOAD( "ic36.3l",  0x10000, 0x10000, CRC(e9bfe23e) SHA1(f97a68dbdce7e06d07faab19acf7625cdc8eeaa8) )
 	ROM_LOAD( "ic34.3j",  0x20000, 0x10000, CRC(256e50f2) SHA1(9e9fda4f1f1449548942c0da4478f61fe0d263d1) )
 	ROM_LOAD( "ic33.3h",  0x30000, 0x10000, CRC(4c682785) SHA1(f61f1227e0ad629fdfca106306b17a9f6a9959e3) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples, identical */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples, identical
 	ROM_LOAD( "ic28.lower.2n",  0x00000, 0x10000, CRC(cb64a194) SHA1(940fad6b9147bccc8290e112f5973f8ea062b52f) )
 	ROM_LOAD( "ic28.upper.2n",  0x10000, 0x10000, CRC(45b68bf5) SHA1(2fb28793019ca85b3b6d7c4c31eedff1d71f2d83) )
 ROM_END
 
+
 ROM_START( loht )
 	ROM_REGION( 0x100000, "maincpu", 0 )
-	ROM_LOAD16_BYTE( "tom_c-h0-b.ic40", 0x00001, 0x20000, CRC(a63204b6) SHA1(d217bc70650a1a1bbe0cf536ec3bb678f670718d) ) /* need to verify actual label */
-	ROM_LOAD16_BYTE( "tom_c-l0-b.ic37", 0x00000, 0x20000, CRC(e788002f) SHA1(35f509976b342fd47e645453381faa3d86645876) ) /* need to verify actual label */
+	ROM_LOAD16_BYTE( "tom_c-h0-b.ic40", 0x00001, 0x20000, CRC(a63204b6) SHA1(d217bc70650a1a1bbe0cf536ec3bb678f670718d) )
+	ROM_LOAD16_BYTE( "tom_c-l0-b.ic37", 0x00000, 0x20000, CRC(e788002f) SHA1(35f509976b342fd47e645453381faa3d86645876) )
 	ROM_LOAD16_BYTE( "tom_c-h3-.ic43",  0x40001, 0x20000, CRC(714778b5) SHA1(e2eaa35d6b5fa5df5163fe0d7b45fa66667f9947) )
 	ROM_RELOAD(                         0xc0001, 0x20000 )
 	ROM_LOAD16_BYTE( "tom_c-l3-.ic34",  0x40000, 0x20000, CRC(2f049b03) SHA1(21047cb10912b1fc23795673af3ea7de249328b7) )
 	ROM_RELOAD(                         0xc0000, 0x20000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )  /* i8751 microcontroller */
-	ROM_LOAD( "tom_c-pr-b.ic1", 0x00000, 0x01000, BAD_DUMP CRC(9c9545f1) SHA1(ca800ce7467efb877d0fff4c47d72478a991e2a9) ) // from bootleg, but works - need to verify dump - Should be TOM C-PR-B ??
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "tom_c-pr-b.ic1", 0x00000, 0x01000, CRC(9c9545f1) SHA1(ca800ce7467efb877d0fff4c47d72478a991e2a9) ) // i8751 MCU labeled  TOM C-PR-B
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "tom_m53.ic53", 0x00000, 0x20000, CRC(0b83265f) SHA1(b31918d6442b79c9fe4f20410189788b050a994e) )  /* sprites */
+	ROM_LOAD( "tom_m53.ic53", 0x00000, 0x20000, CRC(0b83265f) SHA1(b31918d6442b79c9fe4f20410189788b050a994e) )  // sprites
 	ROM_LOAD( "tom_m51.ic51", 0x20000, 0x20000, CRC(8ec5f6f3) SHA1(210f2753f5eeb06396758d21ab1778d459add247) )
 	ROM_LOAD( "tom_m49.ic49", 0x40000, 0x20000, CRC(a41d3bfd) SHA1(536fb7c0321dbbc1a8b73e9647fba9c53a253fcc) )
 	ROM_LOAD( "tom_m47.ic47", 0x60000, 0x20000, CRC(9d81a25b) SHA1(a354537c2fbba85f06485aa8487d7583a7133357) )
 
 	ROM_REGION( 0x040000, "gfx2", 0 )
-	ROM_LOAD( "tom_m21.ic21", 0x00000, 0x10000, CRC(3ca3e771) SHA1(be052e01c5429ee89057c9d408794f2c7744047c) )  /* tiles #1 */
+	ROM_LOAD( "tom_m21.ic21", 0x00000, 0x10000, CRC(3ca3e771) SHA1(be052e01c5429ee89057c9d408794f2c7744047c) )  // tiles #1
 	ROM_LOAD( "tom_m22.ic22", 0x10000, 0x10000, CRC(7a05ee2f) SHA1(7d1ca5db9a5a85610129e3bc6c640ade036fe7f9) )
 	ROM_LOAD( "tom_m20.ic20", 0x20000, 0x10000, CRC(79aa2335) SHA1(6b70c79d800a7b755aa7c9a368c4ea74029aaa1e) )
 	ROM_LOAD( "tom_m23.ic23", 0x30000, 0x10000, CRC(789e8b24) SHA1(e957cd25c3c155ca295ab1aea03d610f91562cfb) )
 
 	ROM_REGION( 0x040000, "gfx3", 0 )
-	ROM_LOAD( "tom_m26.ic26", 0x00000, 0x10000, CRC(44626bf6) SHA1(571ef74d42d30a272ff0fb33f830652b4a4bad29) )  /* tiles #2 */
+	ROM_LOAD( "tom_m26.ic26", 0x00000, 0x10000, CRC(44626bf6) SHA1(571ef74d42d30a272ff0fb33f830652b4a4bad29) )  // tiles #2
 	ROM_LOAD( "tom_m27.ic27", 0x10000, 0x10000, CRC(464952cf) SHA1(6b99360b6ba1ed5a72c257f51291f9f7a1ddf363) )
 	ROM_LOAD( "tom_m25.ic25", 0x20000, 0x10000, CRC(3db9b2c7) SHA1(02a318ffc459c494b7f40827eff5f89b41ac0426) )
 	ROM_LOAD( "tom_m24.ic24", 0x30000, 0x10000, CRC(f01fe899) SHA1(c5ab967b7af55a757638bcdc9975f4b15064022d) )
 
-	ROM_REGION( 0x10000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x10000, "samples", 0 ) // samples
 	ROM_LOAD( "tom_m44.ic44", 0x00000, 0x10000, CRC(3ed51d1f) SHA1(84f3aa17d640df91387e5f1f5b5971cf8dcd4e17) )
 ROM_END
 
@@ -2918,28 +2886,28 @@
 	ROM_LOAD16_BYTE( "tom_c-l3-", 0x40000, 0x20000, CRC(2f049b03) SHA1(21047cb10912b1fc23795673af3ea7de249328b7) )
 	ROM_RELOAD(                   0xc0000, 0x20000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )  /* i8751 microcontroller */
-	ROM_LOAD( "tom_c-pr-.ic1",  0x00000, 0x01000, CRC(9fa9b496) SHA1(b529bcd7bf123894e11f2a8df8826932122e375a) )
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "tom_c-pr-.ic1",  0x00000, 0x01000, CRC(9fa9b496) SHA1(b529bcd7bf123894e11f2a8df8826932122e375a) ) // i8751 MCU labeled  TOM C-PR-
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "r200",     0x00000, 0x20000, CRC(0b83265f) SHA1(b31918d6442b79c9fe4f20410189788b050a994e) )  /* sprites */
+	ROM_LOAD( "r200",     0x00000, 0x20000, CRC(0b83265f) SHA1(b31918d6442b79c9fe4f20410189788b050a994e) )  // sprites
 	ROM_LOAD( "r210",     0x20000, 0x20000, CRC(8ec5f6f3) SHA1(210f2753f5eeb06396758d21ab1778d459add247) )
 	ROM_LOAD( "r220",     0x40000, 0x20000, CRC(a41d3bfd) SHA1(536fb7c0321dbbc1a8b73e9647fba9c53a253fcc) )
 	ROM_LOAD( "r230",     0x60000, 0x20000, CRC(9d81a25b) SHA1(a354537c2fbba85f06485aa8487d7583a7133357) )
 
 	ROM_REGION( 0x040000, "gfx2", 0 )
-	ROM_LOAD( "r2a0.a0",  0x00000, 0x10000, CRC(3ca3e771) SHA1(be052e01c5429ee89057c9d408794f2c7744047c) )  /* tiles #1 */
+	ROM_LOAD( "r2a0.a0",  0x00000, 0x10000, CRC(3ca3e771) SHA1(be052e01c5429ee89057c9d408794f2c7744047c) )  // tiles #1
 	ROM_LOAD( "r2a1.a1",  0x10000, 0x10000, CRC(7a05ee2f) SHA1(7d1ca5db9a5a85610129e3bc6c640ade036fe7f9) )
 	ROM_LOAD( "r2a2.a2",  0x20000, 0x10000, CRC(79aa2335) SHA1(6b70c79d800a7b755aa7c9a368c4ea74029aaa1e) )
 	ROM_LOAD( "r2a3.a3",  0x30000, 0x10000, CRC(789e8b24) SHA1(e957cd25c3c155ca295ab1aea03d610f91562cfb) )
 
 	ROM_REGION( 0x040000, "gfx3", 0 )
-	ROM_LOAD( "078.b0",   0x00000, 0x10000, CRC(44626bf6) SHA1(571ef74d42d30a272ff0fb33f830652b4a4bad29) )  /* tiles #2 */
+	ROM_LOAD( "078.b0",   0x00000, 0x10000, CRC(44626bf6) SHA1(571ef74d42d30a272ff0fb33f830652b4a4bad29) )  // tiles #2
 	ROM_LOAD( "079.b1",   0x10000, 0x10000, CRC(464952cf) SHA1(6b99360b6ba1ed5a72c257f51291f9f7a1ddf363) )
 	ROM_LOAD( "080.b2",   0x20000, 0x10000, CRC(3db9b2c7) SHA1(02a318ffc459c494b7f40827eff5f89b41ac0426) )
 	ROM_LOAD( "081.b3",   0x30000, 0x10000, CRC(f01fe899) SHA1(c5ab967b7af55a757638bcdc9975f4b15064022d) )
 
-	ROM_REGION( 0x10000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x10000, "samples", 0 ) // samples
 	ROM_LOAD( "082",      0x00000, 0x10000, CRC(3ed51d1f) SHA1(84f3aa17d640df91387e5f1f5b5971cf8dcd4e17) )
 ROM_END
 
@@ -2960,10 +2928,10 @@
 	ROM_LOAD16_BYTE( "lohtb04.c", 0x40000, 0x20000, CRC(2f049b03) SHA1(21047cb10912b1fc23795673af3ea7de249328b7) )
 	ROM_RELOAD(                   0xc0000, 0x20000 )
 
-	ROM_REGION( 0x10000, "soundcpu", 0 ) /* Sound CPU program (Z80) + Samples*/
+	ROM_REGION( 0x10000, "soundcpu", 0 ) // Sound CPU program (Z80) + Samples
 	ROM_LOAD( "lohtb01.02",  0x00000, 0x10000, CRC(e4bd8f03) SHA1(69fe41a978db92daa912cb345c2c7bafd2a6eb93) )
 
-	ROM_REGION( 0x080000, "sprites", 0 ) /* Sprites */
+	ROM_REGION( 0x080000, "sprites", 0 ) // Sprites
 	ROM_LOAD( "lohtb14.11",  0x00000, 0x10000, CRC(df5ac5ee) SHA1(5b45417ada402047d97dfb6cee6545686ad26e37) )
 	ROM_LOAD( "lohtb15.12",  0x20000, 0x10000, CRC(45220b01) SHA1(83715cf155f91c82067d69f14b3b01ed77777b7d) )
 	ROM_LOAD( "lohtb16.13",  0x40000, 0x10000, CRC(25b85cfc) SHA1(c7a9962165379193dc6553ed1f977795a79e0f78) )
@@ -2973,19 +2941,19 @@
 	ROM_LOAD( "lohtb20.17",  0x50000, 0x10000, CRC(464d8579) SHA1(b5981f4865ee5439f0e330091927e6d97d29933f) )
 	ROM_LOAD( "lohtb21.18",  0x70000, 0x10000, CRC(a73568c7) SHA1(8fe1867256708cc1ed76d1bed5566b1852b47c40) )
 
-	ROM_REGION( 0x040000, "gfx2", ROMREGION_INVERT ) /* tiles #1 */
+	ROM_REGION( 0x040000, "gfx2", ROMREGION_INVERT )  // tiles #1
 	ROM_LOAD( "lohtb13.10",  0x00000, 0x10000, CRC(359f17d4) SHA1(2875ba48395e7faa1a58404475be936dcca45ed1) )
 	ROM_LOAD( "lohtb11.08",  0x10000, 0x10000, CRC(73391e8a) SHA1(53ca89b8a10895f817ecdb9fa5eef462edb94ae6) )
 	ROM_LOAD( "lohtb09.06",  0x20000, 0x10000, CRC(7096d390) SHA1(f4a16bf8aef7a1a65619ab022cbdb67d2f191888) )
 	ROM_LOAD( "lohtb07.04",  0x30000, 0x10000, CRC(71a27b81) SHA1(d8fe72d15bbcd5b170d1123d8f4c58874cefdca3) )
 
-	ROM_REGION( 0x040000, "gfx3", ROMREGION_INVERT ) /* tiles #2 */
+	ROM_REGION( 0x040000, "gfx3", ROMREGION_INVERT )  // tiles #2
 	ROM_LOAD( "lohtb12.09",  0x00000, 0x10000, CRC(4d5e9b53) SHA1(3e3977bab7a66ed0171afcd555d181960e338749) )
 	ROM_LOAD( "lohtb10.07",  0x10000, 0x10000, CRC(4f75a26a) SHA1(79c09a1ad3a6f9cfbd07cb527bbd89d2478ce582) )
 	ROM_LOAD( "lohtb08.05",  0x20000, 0x10000, CRC(34854262) SHA1(37436c12579fb41d22a1596b495f065959c14a26) )
 	ROM_LOAD( "lohtb06.03",  0x30000, 0x10000, CRC(f923183c) SHA1(a6b578191864aefa81e0cad3ba12a2ca491c91cf) )
 
-	ROM_REGION( 0x10000, "samples", ROMREGION_ERASEFF ) /* -- no sample roms on bootleg, included with z80 code */
+	ROM_REGION( 0x10000, "samples", ROMREGION_ERASEFF ) // -- no sample roms on bootleg, included with z80 code
 
 	ROM_REGION( 0x0117, "plds", 0 )
 	ROM_LOAD( "gal16v8-25qp.ic3", 0x0000, 0x0117, CRC(6acdfafb) SHA1(2ffd6f5a846e49fd2a8c7c7dfc9cf015406a44df) )
@@ -3007,7 +2975,7 @@
 	ROM_LOAD16_BYTE( "loht-a12.bin", 0x60000, 0x10000, CRC(cfb0390d) SHA1(4acc61a51a7ae681bd8d835e2644b44c4d6d7bcb) )
 	ROM_RELOAD(                      0xe0000, 0x10000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 ) /* MCU running in external mode on daughtercard. Same data as lohtj just padded with 0xff */
+	ROM_REGION( 0x10000, "mcu", 0 ) // MCU running in external mode on daughtercard. Same data as lohtj just padded with 0xff
 	ROM_LOAD( "loht-a26.bin",  0x00000, 0x02000, CRC(ac901e17) SHA1(70a73288d594c78ad2aca78ce55a699cb040bede) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
@@ -3021,19 +2989,19 @@
 	ROM_LOAD( "loht-a7.bin",   0x70000, 0x10000, CRC(a73568c7) SHA1(8fe1867256708cc1ed76d1bed5566b1852b47c40) )
 
 	ROM_REGION( 0x040000, "gfx2", 0 )
-	ROM_LOAD( "loht-a19.bin",  0x00000, 0x10000, CRC(3ca3e771) SHA1(be052e01c5429ee89057c9d408794f2c7744047c) ) /* tiles #1 */
+	ROM_LOAD( "loht-a19.bin",  0x00000, 0x10000, CRC(3ca3e771) SHA1(be052e01c5429ee89057c9d408794f2c7744047c) )  // tiles #1
 //  ROM_LOAD( "loht-a20.bin",  0x10000, 0x10000, BAD_DUMP CRC(db2e3d77) SHA1(3f0758f74490b084321d8b2da29525dd1f19da09) )
 	ROM_LOAD( "loht-a20.bin",  0x10000, 0x10000, CRC(7a05ee2f) SHA1(7d1ca5db9a5a85610129e3bc6c640ade036fe7f9) )
 	ROM_LOAD( "loht-a18.bin",  0x20000, 0x10000, CRC(79aa2335) SHA1(6b70c79d800a7b755aa7c9a368c4ea74029aaa1e) )
 	ROM_LOAD( "loht-a21.bin",  0x30000, 0x10000, CRC(789e8b24) SHA1(e957cd25c3c155ca295ab1aea03d610f91562cfb) )
 
 	ROM_REGION( 0x040000, "gfx3", 0 )
-	ROM_LOAD( "loht-a24.bin",  0x00000, 0x10000, CRC(44626bf6) SHA1(571ef74d42d30a272ff0fb33f830652b4a4bad29) ) /* tiles #2 */
+	ROM_LOAD( "loht-a24.bin",  0x00000, 0x10000, CRC(44626bf6) SHA1(571ef74d42d30a272ff0fb33f830652b4a4bad29) )  // tiles #2
 	ROM_LOAD( "loht-a25.bin",  0x10000, 0x10000, CRC(464952cf) SHA1(6b99360b6ba1ed5a72c257f51291f9f7a1ddf363) )
 	ROM_LOAD( "loht-a23.bin",  0x20000, 0x10000, CRC(3db9b2c7) SHA1(02a318ffc459c494b7f40827eff5f89b41ac0426) )
 	ROM_LOAD( "loht-a22.bin",  0x30000, 0x10000, CRC(f01fe899) SHA1(c5ab967b7af55a757638bcdc9975f4b15064022d) )
 
-	ROM_REGION( 0x10000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x10000, "samples", 0 ) // samples
 	ROM_LOAD( "loht-a1.bin",   0x00000, 0x10000, CRC(3ed51d1f) SHA1(84f3aa17d640df91387e5f1f5b5971cf8dcd4e17) )
 ROM_END
 
@@ -3051,8 +3019,8 @@
 	ROM_LOAD16_BYTE( "i-3.3",    0x60000, 0x10000, CRC(cfb0390d) SHA1(4acc61a51a7ae681bd8d835e2644b44c4d6d7bcb) )
 	ROM_RELOAD(                  0xe0000, 0x10000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )  /* i8751 microcontroller */
-	ROM_LOAD( "c8751h.bin",  0x00000, 0x01000, CRC(9c9545f1) SHA1(ca800ce7467efb877d0fff4c47d72478a991e2a9) ) // unprotected?? - works for original loht (World) set
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "c8751h.bin",  0x00000, 0x01000, CRC(9c9545f1) SHA1(ca800ce7467efb877d0fff4c47d72478a991e2a9) ) // unprotected?? == tom_c-pr-b.ic1 from loht (World) set
 
 	ROM_REGION( 0x080000, "sprites", 0 )
 	ROM_LOAD( "i-8.8",   0x00000, 0x10000, CRC(df5ac5ee) SHA1(5b45417ada402047d97dfb6cee6545686ad26e37) )
@@ -3065,18 +3033,18 @@
 	ROM_LOAD( "i-12.12", 0x70000, 0x10000, CRC(a73568c7) SHA1(8fe1867256708cc1ed76d1bed5566b1852b47c40) )
 
 	ROM_REGION( 0x040000, "gfx2", 0 )
-	ROM_LOAD( "i-20.20",  0x00000, 0x10000, CRC(3ca3e771) SHA1(be052e01c5429ee89057c9d408794f2c7744047c) ) /* tiles #1 */
+	ROM_LOAD( "i-20.20",  0x00000, 0x10000, CRC(3ca3e771) SHA1(be052e01c5429ee89057c9d408794f2c7744047c) )  // tiles #1
 	ROM_LOAD( "r-21.21",  0x10000, 0x10000, CRC(7a05ee2f) SHA1(7d1ca5db9a5a85610129e3bc6c640ade036fe7f9) )
 	ROM_LOAD( "i-19.19",  0x20000, 0x10000, CRC(79aa2335) SHA1(6b70c79d800a7b755aa7c9a368c4ea74029aaa1e) )
 	ROM_LOAD( "i-22.22",  0x30000, 0x10000, CRC(789e8b24) SHA1(e957cd25c3c155ca295ab1aea03d610f91562cfb) )
 
 	ROM_REGION( 0x040000, "gfx3", 0 )
-	ROM_LOAD( "r-25.25",  0x00000, 0x10000, CRC(44626bf6) SHA1(571ef74d42d30a272ff0fb33f830652b4a4bad29) ) /* tiles #2 */
+	ROM_LOAD( "r-25.25",  0x00000, 0x10000, CRC(44626bf6) SHA1(571ef74d42d30a272ff0fb33f830652b4a4bad29) )  // tiles #2
 	ROM_LOAD( "r-26.26",  0x10000, 0x10000, CRC(464952cf) SHA1(6b99360b6ba1ed5a72c257f51291f9f7a1ddf363) )
 	ROM_LOAD( "r-24.24",  0x20000, 0x10000, CRC(3db9b2c7) SHA1(02a318ffc459c494b7f40827eff5f89b41ac0426) )
 	ROM_LOAD( "i-23.23",  0x30000, 0x10000, CRC(2e2a085d) SHA1(ed2eed6c30d44b176bd99eb386482b2a19e3b9cb) )
 
-	ROM_REGION( 0x10000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x10000, "samples", 0 ) // samples
 	ROM_LOAD( "i-4.4",   0x00000, 0x10000, CRC(3ed51d1f) SHA1(84f3aa17d640df91387e5f1f5b5971cf8dcd4e17) )
 ROM_END
 
@@ -3314,10 +3282,10 @@
 	ROM_LOAD16_BYTE( "6_lg_603.ic25", 0x40000, 0x20000, CRC(2f049b03) SHA1(21047cb10912b1fc23795673af3ea7de249328b7) )
 	ROM_RELOAD(                       0xc0000, 0x20000 )
 
-	ROM_REGION( 0x10000, "soundcpu", 0 ) /* Sound CPU program (Z80) + Samples*/
+	ROM_REGION( 0x10000, "soundcpu", 0 ) // Sound CPU program (Z80) + Samples
 	ROM_LOAD( "1_lg_1.ic12",  0x00000, 0x10000, CRC(7aa26b54) SHA1(01df7ea6443bbc775d5592edc32816853c857189) )
 
-	ROM_REGION( 0x080000, "sprites", 0 ) /* Sprites */
+	ROM_REGION( 0x080000, "sprites", 0 ) // Sprites
 	ROM_LOAD( "5_lg_501.ic5",   0x00000, 0x10000, CRC(df5ac5ee) SHA1(5b45417ada402047d97dfb6cee6545686ad26e37) )
 	ROM_LOAD( "5_lg_503.ic14",  0x20000, 0x10000, CRC(45220b01) SHA1(83715cf155f91c82067d69f14b3b01ed77777b7d) )
 	ROM_LOAD( "5_lg_505.ic20",  0x40000, 0x10000, CRC(25b85cfc) SHA1(c7a9962165379193dc6553ed1f977795a79e0f78) )
@@ -3327,19 +3295,19 @@
 	ROM_LOAD( "5_lg_506.ic21",  0x50000, 0x10000, CRC(464d8579) SHA1(b5981f4865ee5439f0e330091927e6d97d29933f) )
 	ROM_LOAD( "5_lg_508.ic27",  0x70000, 0x10000, CRC(a73568c7) SHA1(8fe1867256708cc1ed76d1bed5566b1852b47c40) )
 
-	ROM_REGION( 0x040000, "gfx2", ROMREGION_INVERT ) /* tiles #1 */
+	ROM_REGION( 0x040000, "gfx2", ROMREGION_INVERT ) // tiles #1
 	ROM_LOAD( "8_lg_801.ic15",  0x00000, 0x10000, CRC(359f17d4) SHA1(2875ba48395e7faa1a58404475be936dcca45ed1) )
 	ROM_LOAD( "8_lg_803.ic22",  0x10000, 0x10000, CRC(73391e8a) SHA1(53ca89b8a10895f817ecdb9fa5eef462edb94ae6) )
 	ROM_LOAD( "8_lg_805.ic30",  0x20000, 0x10000, CRC(7096d390) SHA1(f4a16bf8aef7a1a65619ab022cbdb67d2f191888) )
 	ROM_LOAD( "8_lg_807.ic37",  0x30000, 0x10000, CRC(1c113901) SHA1(3d4ce2ac6cdad0e1b0a21ffb062f9c92700adcf4) )
 
-	ROM_REGION( 0x040000, "gfx3", ROMREGION_INVERT ) /* tiles #2 */
+	ROM_REGION( 0x040000, "gfx3", ROMREGION_INVERT ) // tiles #2
 	ROM_LOAD( "8_lg_802.ic14",  0x00000, 0x10000, CRC(4d5e9b53) SHA1(3e3977bab7a66ed0171afcd555d181960e338749) )
 	ROM_LOAD( "8_lg_804.ic21",  0x10000, 0x10000, CRC(4f75a26a) SHA1(79c09a1ad3a6f9cfbd07cb527bbd89d2478ce582) )
 	ROM_LOAD( "8_lg_806.ic29",  0x20000, 0x10000, CRC(34854262) SHA1(37436c12579fb41d22a1596b495f065959c14a26) )
 	ROM_LOAD( "8_lg_808.ic36",  0x30000, 0x10000, CRC(f923183c) SHA1(a6b578191864aefa81e0cad3ba12a2ca491c91cf) )
 
-	ROM_REGION( 0x10000, "samples", ROMREGION_ERASEFF ) /* -- no sample roms on bootleg, included with z80 code */
+	ROM_REGION( 0x10000, "samples", ROMREGION_ERASEFF ) // -- no sample roms on bootleg, included with z80 code
 
 	ROM_REGION( 0x320, "prom", ROMREGION_ERASEFF )
 	ROM_LOAD( "51_502_82s129n.ic10",      0x000, 0x100, CRC(15085e44) SHA1(646e7100fcb112594023cf02be036bd3d42cc13c) )
@@ -3373,67 +3341,67 @@
 	ROM_LOAD16_BYTE( "xm_c-l0-.ic37", 0x40000, 0x10000, CRC(06a9e213) SHA1(9831c110814642703d6e71d49848d854095b7d3a) )
 	ROM_RELOAD(                       0xe0000, 0x10000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )  /* i8751 microcontroller */
-	ROM_LOAD( "xm_c-pr-.ic1", 0x00000, 0x01000, CRC(c8ceb3cd) SHA1(e5d20a3a9d7f0919604543c97643a03434d80130) ) /* i8751 MCU labeled  XM C-PR- */
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "xm_c-pr-.ic1", 0x00000, 0x01000, CRC(c8ceb3cd) SHA1(e5d20a3a9d7f0919604543c97643a03434d80130) ) // i8751 MCU labeled  XM C-PR-
 
 	ROM_REGION( 0x100000, "sprites", 0 )
-	ROM_LOAD( "t44.00.ic53", 0x00000, 0x20000, CRC(db45186e) SHA1(8c8edeb4b7e6b0516f2597823dc27eba9c5d9528) )  /* sprites */
+	ROM_LOAD( "t44.00.ic53", 0x00000, 0x20000, CRC(db45186e) SHA1(8c8edeb4b7e6b0516f2597823dc27eba9c5d9528) )  // sprites
 	ROM_LOAD( "t45.01.ic52", 0x20000, 0x20000, CRC(4d0764d4) SHA1(4942333336a110b033f16ac1afa06ffef7b2dad6) )
 	ROM_LOAD( "t46.10.ic51", 0x40000, 0x20000, CRC(f0c465a4) SHA1(69c107c860d4e8736431fd86b6821b70a8367eb3) )
 	ROM_LOAD( "t47.11.ic50", 0x60000, 0x20000, CRC(1263b24b) SHA1(0445a5381df3a868bed6967c8e5de7169e4be6a3) )
-	ROM_LOAD( "t48.20.ic48", 0x80000, 0x20000, CRC(4129944f) SHA1(988b072032d1667c3ac0731fada32fb6978505dc) )
+	ROM_LOAD( "t48.20.ic49", 0x80000, 0x20000, CRC(4129944f) SHA1(988b072032d1667c3ac0731fada32fb6978505dc) )
 	ROM_LOAD( "t49.21.ic48", 0xa0000, 0x20000, CRC(2346e6f9) SHA1(b3de017dd0353e04d279f57e151c47f5fcc70e9c) )
 	ROM_LOAD( "t50.30.ic47", 0xc0000, 0x20000, CRC(e322543e) SHA1(b4c3a7f202d81485d5f0a7b7668ee89fc1edb215) )
 	ROM_LOAD( "t51.31.ic46", 0xe0000, 0x20000, CRC(229bf7b1) SHA1(ae42c7efbb6278dd3fa56842361138391f2d49ca) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "t53.a0",       0x00000, 0x20000, CRC(1a082494) SHA1(63a3a84a262833d2cafab41e35df8f10a5e317b1) )  /* tiles #1 */
+	ROM_LOAD( "t53.a0",       0x00000, 0x20000, CRC(1a082494) SHA1(63a3a84a262833d2cafab41e35df8f10a5e317b1) )  // tiles #1
 	ROM_LOAD( "t54.a1",       0x20000, 0x20000, CRC(076c16c5) SHA1(4be858806b916953d59aceee550e721eaf3996a6) )
 	ROM_LOAD( "t55.a2",       0x40000, 0x20000, CRC(25d877a5) SHA1(48c948bf714c432f534c098123c8f50d5561756f) )
 	ROM_LOAD( "t56.a3",       0x60000, 0x20000, CRC(5b1213f5) SHA1(87782aa0bd04d4378c4ba78b63028ae2709da2f1) )
 
 	ROM_REGION( 0x080000, "gfx3", 0 )
-	ROM_LOAD( "t57.b0",       0x00000, 0x20000, CRC(0a84e0c7) SHA1(67ad181a7d2c431cb4bf45955e09754549a03576) )  /* tiles #2 */
+	ROM_LOAD( "t57.b0",       0x00000, 0x20000, CRC(0a84e0c7) SHA1(67ad181a7d2c431cb4bf45955e09754549a03576) )  // tiles #2
 	ROM_LOAD( "t58.b1",       0x20000, 0x20000, CRC(a874121d) SHA1(1351d5901d55059c6472a4588a2e560396903861) )
 	ROM_LOAD( "t59.b2",       0x40000, 0x20000, CRC(69deb990) SHA1(1eed3183efbe576376661b45152a0a21240ecfc8) )
 	ROM_LOAD( "t60.b3",       0x60000, 0x20000, CRC(14c69f99) SHA1(4bea72f8bd421ef3ca559363f7473ce2e7038699) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "t52.v0.ic44",       0x00000, 0x20000, CRC(2db1bd80) SHA1(657006d0642ec7fb949bb52821d78fe51a599415) )
 ROM_END
 
 
 ROM_START( dbreedm72 )
 	ROM_REGION( 0x100000, "maincpu", 0 )
-	ROM_LOAD16_BYTE( "db_c-h3-b.ic43", 0x00001, 0x20000, CRC(4bf3063c) SHA1(3f970c9ece2ac700738e217e0b31b3aba2848ab2) ) /* need to verify label, with MCU DB C-PR- below shows ROM NG  1  2 */
-	ROM_LOAD16_BYTE( "db_c-l3-b.ic34", 0x00000, 0x20000, CRC(e4b89b79) SHA1(c312925940633e60fb5d0f05044c6e73e4f7fd54) ) /* need to verify label */
+	ROM_LOAD16_BYTE( "db_c-h3-b.ic43", 0x00001, 0x20000, CRC(4bf3063c) SHA1(3f970c9ece2ac700738e217e0b31b3aba2848ab2) ) // need to verify label, with MCU DB C-PR- below shows ROM NG  1  2
+	ROM_LOAD16_BYTE( "db_c-l3-b.ic34", 0x00000, 0x20000, CRC(e4b89b79) SHA1(c312925940633e60fb5d0f05044c6e73e4f7fd54) ) // need to verify label
 	ROM_LOAD16_BYTE( "db_c-h0.ic40",   0x60001, 0x10000, CRC(5aa79fb2) SHA1(b7b862699ddccf90cf18d3822703078668aa1dc7) )
 	ROM_RELOAD(                        0xe0001, 0x10000 )
 	ROM_LOAD16_BYTE( "db_c-l0.ic37",   0x60000, 0x10000, CRC(ed0f5e06) SHA1(9030840b15e83c18d59c884ed08c93c05fa70c5b) )
 	ROM_RELOAD(                        0xe0000, 0x10000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )  /* i8751 microcontroller */
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
 	ROM_LOAD( "db_c-pr-b.ic1",  0x00000, 0x01000, NO_DUMP ) // Requires different currently undumped MCU code - i8751 MCU labeled  DB C-PR-B??
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "db_k800m.00", 0x00000, 0x20000, CRC(c027a8cf) SHA1(534dc416b8f5587168c7f644d3f9438c8a190491) )   /* sprites */
+	ROM_LOAD( "db_k800m.00", 0x00000, 0x20000, CRC(c027a8cf) SHA1(534dc416b8f5587168c7f644d3f9438c8a190491) )   // sprites
 	ROM_LOAD( "db_k801m.10", 0x20000, 0x20000, CRC(093faf33) SHA1(2704f644cdce87daf975984f143b1d55ba731c3f) )
 	ROM_LOAD( "db_k802m.20", 0x40000, 0x20000, CRC(055b4c59) SHA1(71315dd7476612f138cb64b905648791d44eb7da) )
 	ROM_LOAD( "db_k803m.30", 0x60000, 0x20000, CRC(8ed63922) SHA1(51daa8a23e637f6b4394598ff4a1d26f65b59c8b) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 ) // same roms are duplicated at a0-a3 and b0-b3, confirmed
-	ROM_LOAD( "db_k804m.a0", 0x00000, 0x20000, CRC(4c83e92e) SHA1(6dade027435c48ab48bd4516d16a9961d4dd6fad) )   /* tiles #1 */
+	ROM_LOAD( "db_k804m.a0", 0x00000, 0x20000, CRC(4c83e92e) SHA1(6dade027435c48ab48bd4516d16a9961d4dd6fad) )   // tiles #1
 	ROM_LOAD( "db_k805m.a1", 0x20000, 0x20000, CRC(835ef268) SHA1(89d0bb15201440dffad3ef745970f95505d7ab03) )
 	ROM_LOAD( "db_k806m.a2", 0x40000, 0x20000, CRC(5117f114) SHA1(a401a3e638209b32d4101a5c2e2a8b4612eaa21b) )
 	ROM_LOAD( "db_k807m.a3", 0x60000, 0x20000, CRC(8eb0c978) SHA1(7fc55bbe4d0923db88492bb7160a89de34e11cd6) )
 
 	ROM_REGION( 0x080000, "gfx3", 0 )
-	ROM_LOAD( "db_k804m.b0", 0x00000, 0x20000, CRC(4c83e92e) SHA1(6dade027435c48ab48bd4516d16a9961d4dd6fad) )   /* tiles #2 */
+	ROM_LOAD( "db_k804m.b0", 0x00000, 0x20000, CRC(4c83e92e) SHA1(6dade027435c48ab48bd4516d16a9961d4dd6fad) )   // tiles #2
 	ROM_LOAD( "db_k805m.b1", 0x20000, 0x20000, CRC(835ef268) SHA1(89d0bb15201440dffad3ef745970f95505d7ab03) )
 	ROM_LOAD( "db_k806m.b2", 0x40000, 0x20000, CRC(5117f114) SHA1(a401a3e638209b32d4101a5c2e2a8b4612eaa21b) )
 	ROM_LOAD( "db_k807m.b3", 0x60000, 0x20000, CRC(8eb0c978) SHA1(7fc55bbe4d0923db88492bb7160a89de34e11cd6) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "db_c-v0.ic44",  0x00000, 0x20000, CRC(312f7282) SHA1(742d56980b4618180e9a0e02051c5aec4d5cdae4) )
 ROM_END
 
@@ -3446,28 +3414,28 @@
 	ROM_LOAD16_BYTE( "db_c-l0.ic37",  0x60000, 0x10000, CRC(ed0f5e06) SHA1(9030840b15e83c18d59c884ed08c93c05fa70c5b) )
 	ROM_RELOAD(                       0xe0000, 0x10000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )  /* i8751 microcontroller */
-	ROM_LOAD( "db_c-pr-.mcu",  0x00000, 0x01000, CRC(8bf2910c) SHA1(65842c928626077f613e0ab56074e83301a64a2e) ) /* i8751 MCU labeled  DB C-PR- */
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "db_c-pr-.ic1",  0x00000, 0x01000, CRC(8bf2910c) SHA1(65842c928626077f613e0ab56074e83301a64a2e) ) // i8751 MCU labeled  DB C-PR-
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "db_k800m.00", 0x00000, 0x20000, CRC(c027a8cf) SHA1(534dc416b8f5587168c7f644d3f9438c8a190491) )   /* sprites */
+	ROM_LOAD( "db_k800m.00", 0x00000, 0x20000, CRC(c027a8cf) SHA1(534dc416b8f5587168c7f644d3f9438c8a190491) )   // sprites
 	ROM_LOAD( "db_k801m.10", 0x20000, 0x20000, CRC(093faf33) SHA1(2704f644cdce87daf975984f143b1d55ba731c3f) )
 	ROM_LOAD( "db_k802m.20", 0x40000, 0x20000, CRC(055b4c59) SHA1(71315dd7476612f138cb64b905648791d44eb7da) )
 	ROM_LOAD( "db_k803m.30", 0x60000, 0x20000, CRC(8ed63922) SHA1(51daa8a23e637f6b4394598ff4a1d26f65b59c8b) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 ) // same roms are duplicated at a0-a3 and b0-b3, confirmed
-	ROM_LOAD( "db_k804m.a0", 0x00000, 0x20000, CRC(4c83e92e) SHA1(6dade027435c48ab48bd4516d16a9961d4dd6fad) )   /* tiles #1 */
+	ROM_LOAD( "db_k804m.a0", 0x00000, 0x20000, CRC(4c83e92e) SHA1(6dade027435c48ab48bd4516d16a9961d4dd6fad) )   // tiles #1
 	ROM_LOAD( "db_k805m.a1", 0x20000, 0x20000, CRC(835ef268) SHA1(89d0bb15201440dffad3ef745970f95505d7ab03) )
 	ROM_LOAD( "db_k806m.a2", 0x40000, 0x20000, CRC(5117f114) SHA1(a401a3e638209b32d4101a5c2e2a8b4612eaa21b) )
 	ROM_LOAD( "db_k807m.a3", 0x60000, 0x20000, CRC(8eb0c978) SHA1(7fc55bbe4d0923db88492bb7160a89de34e11cd6) )
 
 	ROM_REGION( 0x080000, "gfx3", 0 )
-	ROM_LOAD( "db_k804m.b0", 0x00000, 0x20000, CRC(4c83e92e) SHA1(6dade027435c48ab48bd4516d16a9961d4dd6fad) )   /* tiles #2 */
+	ROM_LOAD( "db_k804m.b0", 0x00000, 0x20000, CRC(4c83e92e) SHA1(6dade027435c48ab48bd4516d16a9961d4dd6fad) )   // tiles #2
 	ROM_LOAD( "db_k805m.b1", 0x20000, 0x20000, CRC(835ef268) SHA1(89d0bb15201440dffad3ef745970f95505d7ab03) )
 	ROM_LOAD( "db_k806m.b2", 0x40000, 0x20000, CRC(5117f114) SHA1(a401a3e638209b32d4101a5c2e2a8b4612eaa21b) )
 	ROM_LOAD( "db_k807m.b3", 0x60000, 0x20000, CRC(8eb0c978) SHA1(7fc55bbe4d0923db88492bb7160a89de34e11cd6) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "db_c-v0.ic44",  0x00000, 0x20000, CRC(312f7282) SHA1(742d56980b4618180e9a0e02051c5aec4d5cdae4) )
 ROM_END
 
@@ -3481,28 +3449,28 @@
 	ROM_LOAD16_BYTE( "ge72-l3.bin",  0x60000, 0x10000, CRC(23d303a5) SHA1(b62010f34d71afb590deae458493454f9af38f7c) )
 	ROM_RELOAD(                      0xe0000, 0x10000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )  /* i8751 microcontroller */
-	ROM_LOAD( "dkgenm72_i8751.mcu",  0x00000, 0x10000, NO_DUMP ) // read protected
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "dkgenm72_i8751.ic1",  0x00000, 0x10000, NO_DUMP ) // read protected
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "hh_00.rom",    0x00000, 0x20000, CRC(ec5127ef) SHA1(014ac8ad7b19cd9b475b72a0f42a4991119501c4) )  /* sprites */
+	ROM_LOAD( "hh_00.rom",    0x00000, 0x20000, CRC(ec5127ef) SHA1(014ac8ad7b19cd9b475b72a0f42a4991119501c4) )  // sprites
 	ROM_LOAD( "hh_10.rom",    0x20000, 0x20000, CRC(def65294) SHA1(23f5d99fa9f604fde37cb52113bff233d9be1d25) )
 	ROM_LOAD( "hh_20.rom",    0x40000, 0x20000, CRC(bb0d6ad4) SHA1(4ab617fadfc32efad90ed7f0555513f167b0c43a) )
 	ROM_LOAD( "hh_30.rom",    0x60000, 0x20000, CRC(4351044e) SHA1(0d3ce3f4f1473fd997e70de91e7b5b5a5ec60ad4) )
 
 	ROM_REGION( 0x040000, "gfx2", 0 )
-	ROM_LOAD( "ge72b-a0.bin", 0x00000, 0x10000, CRC(f5f56b2a) SHA1(4ef6602052fa70e765d6d7747e672b7108b44f59) )  /* tiles #1 */
+	ROM_LOAD( "ge72b-a0.bin", 0x00000, 0x10000, CRC(f5f56b2a) SHA1(4ef6602052fa70e765d6d7747e672b7108b44f59) )  // tiles #1
 	ROM_LOAD( "ge72-a1.bin",  0x10000, 0x10000, CRC(d194ea08) SHA1(0270897049cd256472df42f3dda856ee707535cd) )
 	ROM_LOAD( "ge72-a2.bin",  0x20000, 0x10000, CRC(2b06bcc3) SHA1(36378a4a69f3c3da96d2dc8df48916af8de50009) )
 	ROM_LOAD( "ge72-a3.bin",  0x30000, 0x10000, CRC(94b96bfa) SHA1(33c1e9045e7a984097f3fe4954b20d954cffbafa) )
 
 	ROM_REGION( 0x040000, "gfx3", 0 )
-	ROM_LOAD( "ge72-b0.bin",  0x00000, 0x10000, CRC(208796b3) SHA1(38b90732c8d5c77ee84053364a8a7e3daaaabe66) )  /* tiles #2 */
+	ROM_LOAD( "ge72-b0.bin",  0x00000, 0x10000, CRC(208796b3) SHA1(38b90732c8d5c77ee84053364a8a7e3daaaabe66) )  // tiles #2
 	ROM_LOAD( "ge72-b1.bin",  0x10000, 0x10000, CRC(b4a7f490) SHA1(851b40650fc8920b49f43f9cc6f19e845a25e945) )
 	ROM_LOAD( "ge72b-b2.bin", 0x20000, 0x10000, CRC(34fe8f7f) SHA1(fbf8839b26be55ad83ad4db538ba3e196c1ab945) )
 	ROM_LOAD( "ge72b-b3.bin", 0x30000, 0x10000, CRC(4b0e92f4) SHA1(16ad9220ca6708028cea18c1c4b57e2b6eb425b4) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "gen-vo.bin",   0x00000, 0x20000, CRC(d8595c66) SHA1(97920c9947fbac609fb901415e5471c6e4ca066c) )
 ROM_END
 
@@ -3516,8 +3484,8 @@
 	ROM_LOAD16_BYTE( "ad-c-l3.ic34", 0x40000, 0x20000, CRC(9dd343f7) SHA1(9f499936b6d3807aa5b5c18e9811c73c9a2c99f9) )
 	ROM_RELOAD(                      0xc0000, 0x20000 )
 
-	ROM_REGION( 0x1000, "mcu", 0 )  /* i8751 microcontroller */
-	ROM_LOAD( "ad_c-pr-.ic1", 0x00000, 0x01000, CRC(45584e52) SHA1(647826f1bec9b39ae971ecb58d921d363ee4cf45) ) /* i8751 MCU labeled  AD C-PR- */
+	ROM_REGION( 0x1000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "ad_c-pr-.ic1", 0x00000, 0x01000, CRC(45584e52) SHA1(647826f1bec9b39ae971ecb58d921d363ee4cf45) ) // i8751 MCU labeled  AD C-PR-
 
 	ROM_REGION( 0x080000, "sprites", 0 )
 	ROM_LOAD( "ad-00.ic53", 0x00000, 0x20000, CRC(2f0d599b) SHA1(a966f806b5e25bb98cc63c46c49e0e676a62afcf) )
@@ -3526,13 +3494,13 @@
 	ROM_LOAD( "ad-30.ic47", 0x60000, 0x20000, CRC(923240c3) SHA1(f587a83329087a715a3e42110f74f104e8c8ef1f) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "ad-a0.ic21", 0x00000, 0x20000, CRC(ce134b47) SHA1(841358cc222c81b8a91edc262f355310d50b4dbb) )  /* tiles #1 */
+	ROM_LOAD( "ad-a0.ic21", 0x00000, 0x20000, CRC(ce134b47) SHA1(841358cc222c81b8a91edc262f355310d50b4dbb) )  // tiles #1
 	ROM_LOAD( "ad-a1.ic22", 0x20000, 0x20000, CRC(097fd853) SHA1(8e08f4f4a747c899bb8e21b347635e26af9edc2d) )
 	ROM_LOAD( "ad-a2.ic20", 0x40000, 0x20000, CRC(6a94c1b9) SHA1(55174acbac54236e5fc1b80d120cd6da9fe5524c) )
 	ROM_LOAD( "ad-a3.ic23", 0x60000, 0x20000, CRC(6637c349) SHA1(27cb7c89ab73292b43f8ae3c0d803a01ef3d3936) )
 
 	ROM_REGION( 0x080000, "gfx3", 0 )
-	ROM_LOAD( "ad-b0.ic26", 0x00000, 0x20000, CRC(ce134b47) SHA1(841358cc222c81b8a91edc262f355310d50b4dbb) )  /* tiles #2 */
+	ROM_LOAD( "ad-b0.ic26", 0x00000, 0x20000, CRC(ce134b47) SHA1(841358cc222c81b8a91edc262f355310d50b4dbb) )  // tiles #2
 	ROM_LOAD( "ad-b1.ic27", 0x20000, 0x20000, CRC(097fd853) SHA1(8e08f4f4a747c899bb8e21b347635e26af9edc2d) )
 	ROM_LOAD( "ad-b2.ic25", 0x40000, 0x20000, CRC(6a94c1b9) SHA1(55174acbac54236e5fc1b80d120cd6da9fe5524c) )
 	ROM_LOAD( "ad-b3.ic24", 0x60000, 0x20000, CRC(6637c349) SHA1(27cb7c89ab73292b43f8ae3c0d803a01ef3d3936) )
@@ -3554,29 +3522,29 @@
 	ROM_LOAD16_BYTE( "cc-c-l3.ic34", 0x40000, 0x20000, CRC(acd3278e) SHA1(83d7ddfbdb4bc9548a179b728351a21b3b0ac134) )
 	ROM_RELOAD(                      0xc0000, 0x20000 )
 
-	ROM_REGION( 0x10000, "mcu", 0 )  /* i8751 microcontroller */
+	ROM_REGION( 0x10000, "mcu", 0 )  // i8751 microcontroller
 	ROM_LOAD( "cc_c-pr-.ic1", 0x00000, 0x10000, NO_DUMP ) // read protected (only used for sample triggering, not supplying code / warning screens)
 
-	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "cc-c-00.ic53", 0x00000, 0x20000, CRC(9d99deaa) SHA1(acf16bea0f482306107d2a305c568406b6c21e9a) )  /* sprites */
-	ROM_LOAD( "cc-c-10.ic51", 0x20000, 0x20000, CRC(7eb083ed) SHA1(31fa7d532fd46e861c3d19d5b08661653f685a49) )
-	ROM_LOAD( "cc-c-20.ic49", 0x40000, 0x20000, CRC(9421489e) SHA1(e43d042bf8b4ebed93558d74ec479ec60a01ca5c) )
-	ROM_LOAD( "cc-c-30.ic47", 0x60000, 0x20000, CRC(920ec735) SHA1(2d0949b43dddce7317c45910d6e4868ddf010806) )
-
-	ROM_REGION( 0x040000, "gfx2", 0 )
-	ROM_LOAD( "cc-b-a0.ic21", 0x00000, 0x10000, CRC(a33472bd) SHA1(962047fe3dd1fb996285ecef615a8ebdb529adef) )  /* tiles #1 */
-	ROM_LOAD( "cc-b-a1.ic22", 0x10000, 0x10000, CRC(118b1f2d) SHA1(7413ccc67a8aa9dae156e6ee122b1ca5beeb9a76) )
-	ROM_LOAD( "cc-b-a2.ic20", 0x20000, 0x10000, CRC(83cebf48) SHA1(12847827ecbf6b493eb9dbddd0a469729d87a451) )
-	ROM_LOAD( "cc-b-a3.ic23", 0x30000, 0x10000, CRC(572903fc) SHA1(03305301bcf939e97044e746594736b1ca1d7c0a) )
-
-	ROM_REGION( 0x040000, "gfx3", 0 )
-	ROM_LOAD( "cc-b-b0.ic26", 0x00000, 0x10000, CRC(0df5b439) SHA1(0775cf92139a111542c8b5f940da0f7f43020982) )  /* tiles #2 */
-	ROM_LOAD( "cc-b-b1.ic27", 0x10000, 0x10000, CRC(010b778f) SHA1(cc5bfeb0fbe0ed2fe513458c5785ec0ce5b02f53) )
-	ROM_LOAD( "cc-b-b2.ic25", 0x20000, 0x10000, CRC(bda9f6fb) SHA1(a6b655ae5bff0568c1fb56ee8a3874fc6524052c) )
-	ROM_LOAD( "cc-b-b3.ic24", 0x30000, 0x10000, CRC(d361ba3f) SHA1(7348fdae03e997e05187a2726eb221edb92553df) )
+	ROM_REGION( 0x080000, "sprites", 0 )  // sprites - same data as the cosmccop set
+	ROM_LOAD( "cc-c-00.ic53", 0x00000, 0x20000, CRC(9d99deaa) SHA1(acf16bea0f482306107d2a305c568406b6c21e9a) )   // == cc-c-00.bin
+	ROM_LOAD( "cc-c-10.ic51", 0x20000, 0x20000, CRC(7eb083ed) SHA1(31fa7d532fd46e861c3d19d5b08661653f685a49) )   // == cc-c-10.bin
+	ROM_LOAD( "cc-c-20.ic49", 0x40000, 0x20000, CRC(9421489e) SHA1(e43d042bf8b4ebed93558d74ec479ec60a01ca5c) )   // == cc-c-20.bin
+	ROM_LOAD( "cc-c-30.ic47", 0x60000, 0x20000, CRC(920ec735) SHA1(2d0949b43dddce7317c45910d6e4868ddf010806) )   // == cc-c-30.bin
+
+	ROM_REGION( 0x040000, "gfx2", 0 )  // tiles #1 - same data as the cosmccop set split between the 2 tile banks
+	ROM_LOAD( "cc-b-a0.ic21", 0x00000, 0x10000, CRC(a33472bd) SHA1(962047fe3dd1fb996285ecef615a8ebdb529adef) )   // == cc-d-g00.bin [1/2]
+	ROM_LOAD( "cc-b-a1.ic22", 0x10000, 0x10000, CRC(118b1f2d) SHA1(7413ccc67a8aa9dae156e6ee122b1ca5beeb9a76) )   // == cc-d-g10.bin [1/2]
+	ROM_LOAD( "cc-b-a2.ic20", 0x20000, 0x10000, CRC(83cebf48) SHA1(12847827ecbf6b493eb9dbddd0a469729d87a451) )   // == cc-d-g20.bin [1/2]
+	ROM_LOAD( "cc-b-a3.ic23", 0x30000, 0x10000, CRC(572903fc) SHA1(03305301bcf939e97044e746594736b1ca1d7c0a) )   // == cc-d-g30.bin [1/2]
+
+	ROM_REGION( 0x040000, "gfx3", 0 )  // tiles #2 - same data as the cosmccop set split between the 2 tile banks
+	ROM_LOAD( "cc-b-b0.ic26", 0x00000, 0x10000, CRC(0df5b439) SHA1(0775cf92139a111542c8b5f940da0f7f43020982) )   // == cc-d-g00.bin [2/2]
+	ROM_LOAD( "cc-b-b1.ic27", 0x10000, 0x10000, CRC(010b778f) SHA1(cc5bfeb0fbe0ed2fe513458c5785ec0ce5b02f53) )   // == cc-d-g10.bin [2/2]
+	ROM_LOAD( "cc-b-b2.ic25", 0x20000, 0x10000, CRC(bda9f6fb) SHA1(a6b655ae5bff0568c1fb56ee8a3874fc6524052c) )   // == cc-d-g20.bin [2/2]
+	ROM_LOAD( "cc-b-b3.ic24", 0x30000, 0x10000, CRC(d361ba3f) SHA1(7348fdae03e997e05187a2726eb221edb92553df) )   // == cc-d-g30.bin [2/2]
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
-	ROM_LOAD( "cc-c-v0.ic44", 0x00000, 0x20000, CRC(6247bade) SHA1(4bc9f86acd09908c74b1ab0e7817c4ff1cad6f0b) )
+	ROM_REGION( 0x20000, "samples", 0 ) // samples - same data as the cosmccop set
+	ROM_LOAD( "cc-c-v0.ic44", 0x00000, 0x20000, CRC(6247bade) SHA1(4bc9f86acd09908c74b1ab0e7817c4ff1cad6f0b) )   // == cc-c-v0.bin
 ROM_END
 
 
@@ -3597,7 +3565,7 @@
 	ROM_LOAD( "xm-a-sp-.ic14", 0x00000, 0x10000, CRC(006eef56) SHA1(917b26b200fa4c1692d4c7ca0ea0f7897e3e3b7b) )
 
 	ROM_REGION( 0x100000, "sprites", 0 )
-	ROM_LOAD( "t44.00",        0x00000, 0x20000, CRC(db45186e) SHA1(8c8edeb4b7e6b0516f2597823dc27eba9c5d9528) ) /* sprites */
+	ROM_LOAD( "t44.00",        0x00000, 0x20000, CRC(db45186e) SHA1(8c8edeb4b7e6b0516f2597823dc27eba9c5d9528) )  // sprites
 	ROM_LOAD( "t45.01",        0x20000, 0x20000, CRC(4d0764d4) SHA1(4942333336a110b033f16ac1afa06ffef7b2dad6) )
 	ROM_LOAD( "t46.10",        0x40000, 0x20000, CRC(f0c465a4) SHA1(69c107c860d4e8736431fd86b6821b70a8367eb3) )
 	ROM_LOAD( "t47.11",        0x60000, 0x20000, CRC(1263b24b) SHA1(0445a5381df3a868bed6967c8e5de7169e4be6a3) )
@@ -3607,19 +3575,19 @@
 	ROM_LOAD( "t51.31",        0xe0000, 0x20000, CRC(229bf7b1) SHA1(ae42c7efbb6278dd3fa56842361138391f2d49ca) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "t53.a0",       0x00000, 0x20000, CRC(1a082494) SHA1(63a3a84a262833d2cafab41e35df8f10a5e317b1) )  /* tiles #1 */
+	ROM_LOAD( "t53.a0",       0x00000, 0x20000, CRC(1a082494) SHA1(63a3a84a262833d2cafab41e35df8f10a5e317b1) )  // tiles #1
 	ROM_LOAD( "t54.a1",       0x20000, 0x20000, CRC(076c16c5) SHA1(4be858806b916953d59aceee550e721eaf3996a6) )
 	ROM_LOAD( "t55.a2",       0x40000, 0x20000, CRC(25d877a5) SHA1(48c948bf714c432f534c098123c8f50d5561756f) )
 	ROM_LOAD( "t56.a3",       0x60000, 0x20000, CRC(5b1213f5) SHA1(87782aa0bd04d4378c4ba78b63028ae2709da2f1) )
 
 	ROM_REGION( 0x080000, "gfx3", 0 )
-	/* b0-b3 are populated, Jumper J3 on the M81-B-B board is set to 'W' meaning use the ROMs from the b0-b3 positions*/
-	ROM_LOAD( "t57.b0",       0x00000, 0x20000, CRC(0a84e0c7) SHA1(67ad181a7d2c431cb4bf45955e09754549a03576) )  /* tiles #2 */
+	// b0-b3 are populated, Jumper J3 on the M81-B-B board is set to 'W' meaning use the ROMs from the b0-b3 positions
+	ROM_LOAD( "t57.b0",       0x00000, 0x20000, CRC(0a84e0c7) SHA1(67ad181a7d2c431cb4bf45955e09754549a03576) )  // tiles #2
 	ROM_LOAD( "t58.b1",       0x20000, 0x20000, CRC(a874121d) SHA1(1351d5901d55059c6472a4588a2e560396903861) )
 	ROM_LOAD( "t59.b2",       0x40000, 0x20000, CRC(69deb990) SHA1(1eed3183efbe576376661b45152a0a21240ecfc8) )
 	ROM_LOAD( "t60.b3",       0x60000, 0x20000, CRC(14c69f99) SHA1(4bea72f8bd421ef3ca559363f7473ce2e7038699) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "t52.v0",        0x00000, 0x20000, CRC(2db1bd80) SHA1(657006d0642ec7fb949bb52821d78fe51a599415) )
 
 	ROM_REGION( 0x0200, "proms", 0 )    /* proms */
@@ -3641,21 +3609,21 @@
 	ROM_LOAD( "a-sp-0.rom",   0x00000, 0x10000, CRC(80e210e7) SHA1(66cff58fb37c52e1d8e0567e13b774253e862585) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "hh_00.rom",    0x00000, 0x20000, CRC(ec5127ef) SHA1(014ac8ad7b19cd9b475b72a0f42a4991119501c4) )  /* sprites */
+	ROM_LOAD( "hh_00.rom",    0x00000, 0x20000, CRC(ec5127ef) SHA1(014ac8ad7b19cd9b475b72a0f42a4991119501c4) )  // sprites
 	ROM_LOAD( "hh_10.rom",    0x20000, 0x20000, CRC(def65294) SHA1(23f5d99fa9f604fde37cb52113bff233d9be1d25) )
 	ROM_LOAD( "hh_20.rom",    0x40000, 0x20000, CRC(bb0d6ad4) SHA1(4ab617fadfc32efad90ed7f0555513f167b0c43a) )
 	ROM_LOAD( "hh_30.rom",    0x60000, 0x20000, CRC(4351044e) SHA1(0d3ce3f4f1473fd997e70de91e7b5b5a5ec60ad4) )
 
 	ROM_REGION( 0x080000, "gfx2", ROMREGION_ERASEFF )
-	ROM_LOAD( "hh_a0.rom",    0x00000, 0x20000, CRC(c577ba5f) SHA1(c882e58cf64deca8eee6f14f3df43ecc932488fc) )  /* tiles */
+	ROM_LOAD( "hh_a0.rom",    0x00000, 0x20000, CRC(c577ba5f) SHA1(c882e58cf64deca8eee6f14f3df43ecc932488fc) )  // tiles
 	ROM_LOAD( "hh_a1.rom",    0x20000, 0x20000, CRC(429d12ab) SHA1(ccba25eab981fc4e664f76e06a2964066f2ae2e8) )
 	ROM_LOAD( "hh_a2.rom",    0x40000, 0x20000, CRC(b5b163b0) SHA1(82a708fea4953a7c4dcd1d4a1b07f302221ba30b) )
 	ROM_LOAD( "hh_a3.rom",    0x60000, 0x20000, CRC(8ef566a1) SHA1(3afb020a7317efe89c18b2a7773894ce28499d49) )
 
 	ROM_REGION( 0x080000, "gfx3", ROMREGION_ERASEFF )
-	/* b0-b3 are unpopulated, Jumper J3 on the M81-B-B board is set to 'S' meaning use the ROMs from the a0-a3 positions*/
+	// b0-b3 are unpopulated, Jumper J3 on the M81-B-B board is set to 'S' meaning use the ROMs from the a0-a3 positions
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "a-v0-0.rom",   0x00000, 0x20000, CRC(faaacaff) SHA1(ea3a3920255c07aa9c0a7e0191eae257a9f7f558) )
 ROM_END
 
@@ -3673,21 +3641,21 @@
 	ROM_LOAD( "db-a-sp-.14", 0x00000, 0x10000, CRC(54a61560) SHA1(e5fccfcedcadbab1667900f98370043c1907dd89) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "db_k800m.00", 0x00000, 0x20000, CRC(c027a8cf) SHA1(534dc416b8f5587168c7f644d3f9438c8a190491) )   /* sprites */
+	ROM_LOAD( "db_k800m.00", 0x00000, 0x20000, CRC(c027a8cf) SHA1(534dc416b8f5587168c7f644d3f9438c8a190491) )   // sprites
 	ROM_LOAD( "db_k801m.10", 0x20000, 0x20000, CRC(093faf33) SHA1(2704f644cdce87daf975984f143b1d55ba731c3f) )
 	ROM_LOAD( "db_k802m.20", 0x40000, 0x20000, CRC(055b4c59) SHA1(71315dd7476612f138cb64b905648791d44eb7da) )
 	ROM_LOAD( "db_k803m.30", 0x60000, 0x20000, CRC(8ed63922) SHA1(51daa8a23e637f6b4394598ff4a1d26f65b59c8b) )
 
 	ROM_REGION( 0x080000, "gfx2", ROMREGION_ERASEFF )
-	ROM_LOAD( "db_k804m.a0", 0x00000, 0x20000, CRC(4c83e92e) SHA1(6dade027435c48ab48bd4516d16a9961d4dd6fad) )   /* tiles */
+	ROM_LOAD( "db_k804m.a0", 0x00000, 0x20000, CRC(4c83e92e) SHA1(6dade027435c48ab48bd4516d16a9961d4dd6fad) )   // tiles
 	ROM_LOAD( "db_k805m.a1", 0x20000, 0x20000, CRC(835ef268) SHA1(89d0bb15201440dffad3ef745970f95505d7ab03) )
 	ROM_LOAD( "db_k806m.a2", 0x40000, 0x20000, CRC(5117f114) SHA1(a401a3e638209b32d4101a5c2e2a8b4612eaa21b) )
 	ROM_LOAD( "db_k807m.a3", 0x60000, 0x20000, CRC(8eb0c978) SHA1(7fc55bbe4d0923db88492bb7160a89de34e11cd6) )
 
 	ROM_REGION( 0x080000, "gfx3", ROMREGION_ERASEFF )
-	/* b0-b3 are unpopulated, Jumper J3 on the M81-B-B board is set to 'S' meaning use the ROMs from the a0-a3 positions*/
+	// b0-b3 are unpopulated, Jumper J3 on the M81-B-B board is set to 'S' meaning use the ROMs from the a0-a3 positions
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "db_a-v0.rom", 0x00000, 0x20000, CRC(312f7282) SHA1(742d56980b4618180e9a0e02051c5aec4d5cdae4) )
 ROM_END
 
@@ -3709,24 +3677,24 @@
 	ROM_LOAD( "mt_sp.bin",    0x00000, 0x10000, CRC(e44260a9) SHA1(a2512033c8cca9a8064eae1ada721202edf06e8e) )
 
 	ROM_REGION( 0x100000, "sprites", 0 )
-	ROM_LOAD( "mt_n0.bin",    0x00000, 0x40000, CRC(5618cddc) SHA1(16d34b431ab9b72067fa669d694e635c88aeb261) )  /* sprites #1 */
+	ROM_LOAD( "mt_n0.bin",    0x00000, 0x40000, CRC(5618cddc) SHA1(16d34b431ab9b72067fa669d694e635c88aeb261) )  // sprites #1
 	ROM_LOAD( "mt_n1.bin",    0x40000, 0x40000, CRC(483b873b) SHA1(654efd67b2102521e8c46cd57cefa2cc64cf4fd3) )
 	ROM_LOAD( "mt_n2.bin",    0x80000, 0x40000, CRC(4f5d665b) SHA1(f539d0f5c738ffabfac16121706abe3bb3b2a1fa) )
 	ROM_LOAD( "mt_n3.bin",    0xc0000, 0x40000, CRC(83571549) SHA1(ce0b89aa4b3e3e1cf6ec6136f956577267cdd9d3) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "mt_c0.bin",    0x00000, 0x20000, CRC(780e7a02) SHA1(9776ecb8b5d86636061f8360464001a63bec0842) )  /* tiles */
+	ROM_LOAD( "mt_c0.bin",    0x00000, 0x20000, CRC(780e7a02) SHA1(9776ecb8b5d86636061f8360464001a63bec0842) )  // tiles
 	ROM_LOAD( "mt_c1.bin",    0x20000, 0x20000, CRC(45ad1381) SHA1(de281398dcd1c547bde9fa86f8ca409dd8d4aa6c) )
 	ROM_LOAD( "mt_c2.bin",    0x40000, 0x20000, CRC(5df5856d) SHA1(f16163f672de6701b411315c9956ddb74c8464ce) )
 	ROM_LOAD( "mt_c3.bin",    0x60000, 0x20000, CRC(f5316cc8) SHA1(123892d4a7e8d98582ea736afe659afdba8c5f87) )
 
 	ROM_REGION( 0x080000, "sprites2", 0 )
-	ROM_LOAD( "mt_f0.bin",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  /* sprites #2 */
+	ROM_LOAD( "mt_f0.bin",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  // sprites #2
 	ROM_LOAD( "mt_f1.bin",    0x20000, 0x20000, CRC(c68cd65f) SHA1(8999b558b4af0f453ada9e4ef705163df96844e6) )
 	ROM_LOAD( "mt_f2.bin",    0x40000, 0x20000, CRC(a71feb2d) SHA1(47e366b422772bed08ee4d1c338970687d6c3b4c) )
 	ROM_LOAD( "mt_f3.bin",    0x60000, 0x20000, CRC(179f7562) SHA1(6d28b199daffc62e8fa9009878ac0bb976ccbb2a) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "mt_vo.bin",    0x00000, 0x20000, CRC(eb24bb2c) SHA1(9fca04fba0249e8213dd164eb6829e1a5acbee65) )
 ROM_END
 
@@ -3743,24 +3711,24 @@
 	ROM_LOAD( "mt_sp.bin",    0x00000, 0x10000, CRC(e44260a9) SHA1(a2512033c8cca9a8064eae1ada721202edf06e8e) )
 
 	ROM_REGION( 0x100000, "sprites", 0 )
-	ROM_LOAD( "mt_n0.bin",    0x00000, 0x40000, CRC(5618cddc) SHA1(16d34b431ab9b72067fa669d694e635c88aeb261) )  /* sprites #1 */
+	ROM_LOAD( "mt_n0.bin",    0x00000, 0x40000, CRC(5618cddc) SHA1(16d34b431ab9b72067fa669d694e635c88aeb261) )  // sprites #1
 	ROM_LOAD( "mt_n1.bin",    0x40000, 0x40000, CRC(483b873b) SHA1(654efd67b2102521e8c46cd57cefa2cc64cf4fd3) )
 	ROM_LOAD( "mt_n2.bin",    0x80000, 0x40000, CRC(4f5d665b) SHA1(f539d0f5c738ffabfac16121706abe3bb3b2a1fa) )
 	ROM_LOAD( "mt_n3.bin",    0xc0000, 0x40000, CRC(83571549) SHA1(ce0b89aa4b3e3e1cf6ec6136f956577267cdd9d3) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "mt_c0.bin",    0x00000, 0x20000, CRC(780e7a02) SHA1(9776ecb8b5d86636061f8360464001a63bec0842) )  /* tiles */
+	ROM_LOAD( "mt_c0.bin",    0x00000, 0x20000, CRC(780e7a02) SHA1(9776ecb8b5d86636061f8360464001a63bec0842) )  // tiles
 	ROM_LOAD( "mt_c1.bin",    0x20000, 0x20000, CRC(45ad1381) SHA1(de281398dcd1c547bde9fa86f8ca409dd8d4aa6c) )
 	ROM_LOAD( "mt_c2.bin",    0x40000, 0x20000, CRC(5df5856d) SHA1(f16163f672de6701b411315c9956ddb74c8464ce) )
 	ROM_LOAD( "mt_c3.bin",    0x60000, 0x20000, CRC(f5316cc8) SHA1(123892d4a7e8d98582ea736afe659afdba8c5f87) )
 
 	ROM_REGION( 0x080000, "sprites2", 0 )
-	ROM_LOAD( "mt_f0.bin",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  /* sprites #2 */
+	ROM_LOAD( "mt_f0.bin",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  // sprites #2
 	ROM_LOAD( "mt_f1.bin",    0x20000, 0x20000, CRC(c68cd65f) SHA1(8999b558b4af0f453ada9e4ef705163df96844e6) )
 	ROM_LOAD( "mt_f2.bin",    0x40000, 0x20000, CRC(a71feb2d) SHA1(47e366b422772bed08ee4d1c338970687d6c3b4c) )
 	ROM_LOAD( "mt_f3.bin",    0x60000, 0x20000, CRC(179f7562) SHA1(6d28b199daffc62e8fa9009878ac0bb976ccbb2a) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "mt_vo.bin",    0x00000, 0x20000, CRC(eb24bb2c) SHA1(9fca04fba0249e8213dd164eb6829e1a5acbee65) )
 ROM_END
 
@@ -3778,28 +3746,27 @@
 	ROM_LOAD( "ad_=m82=_a-sp-d.ic15", 0x00000, 0x10000, CRC(16a858a3) SHA1(51dbac5b37ecb30b46072f5a300a29dc7f7b8542) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "ad_=m82=_b-n0-d.ic44",    0x00000, 0x20000, CRC(2f0d599b) SHA1(a966f806b5e25bb98cc63c46c49e0e676a62afcf) )  /* sprites */
+	ROM_LOAD( "ad_=m82=_b-n0-d.ic44",    0x00000, 0x20000, CRC(2f0d599b) SHA1(a966f806b5e25bb98cc63c46c49e0e676a62afcf) )  // sprites
 	ROM_LOAD( "ad_=m82=_b-n1-d.ic45",    0x20000, 0x20000, CRC(9865856b) SHA1(b18a06899ae29d45e2351594df544220f3f4485a) )
 	ROM_LOAD( "ad_=m82=_b-n2-d.ic46",    0x40000, 0x20000, CRC(d392aef2) SHA1(0f639a07066cadddc3884eb490885a8745571567) )
 	ROM_LOAD( "ad_=m82=_b-n3-d.ic36",    0x60000, 0x20000, CRC(923240c3) SHA1(f587a83329087a715a3e42110f74f104e8c8ef1f) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "ad_=m82=_a-c0-d.ic49",    0x00000, 0x20000, CRC(ce134b47) SHA1(841358cc222c81b8a91edc262f355310d50b4dbb) )  /* tiles */
+	ROM_LOAD( "ad_=m82=_a-c0-d.ic49",    0x00000, 0x20000, CRC(ce134b47) SHA1(841358cc222c81b8a91edc262f355310d50b4dbb) )  // tiles
 	ROM_LOAD( "ad_=m82=_a-c1-d.ic48",    0x20000, 0x20000, CRC(097fd853) SHA1(8e08f4f4a747c899bb8e21b347635e26af9edc2d) )
 	ROM_LOAD( "ad_=m82=_a-c2-d.ic57",    0x40000, 0x20000, CRC(6a94c1b9) SHA1(55174acbac54236e5fc1b80d120cd6da9fe5524c) )
 	ROM_LOAD( "ad_=m82=_a-c3-d.ic56",    0x60000, 0x20000, CRC(6637c349) SHA1(27cb7c89ab73292b43f8ae3c0d803a01ef3d3936) )
 
 	ROM_REGION( 0x080000, "sprites2", 0 ) // still had these leftover from Major Title, probably needed to avoid displaying garbage?
-	ROM_LOAD( "mt_f0.ic38",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  /* sprites #2 */
+	ROM_LOAD( "mt_f0.ic38",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  // sprites #2
 	ROM_LOAD( "mt_f1.ic39",    0x20000, 0x20000, CRC(c68cd65f) SHA1(8999b558b4af0f453ada9e4ef705163df96844e6) )
 	ROM_LOAD( "mt_f2.ic40",    0x40000, 0x20000, CRC(a71feb2d) SHA1(47e366b422772bed08ee4d1c338970687d6c3b4c) )
 	ROM_LOAD( "mt_f3.ic41",    0x60000, 0x20000, CRC(179f7562) SHA1(6d28b199daffc62e8fa9009878ac0bb976ccbb2a) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "ad_=m82=_a-v0-d.ic12",    0x00000, 0x20000, CRC(339f474d) SHA1(a81bb52598a0e31b2ed6a538755237c5d14d1844) )
 ROM_END
 
-
 ROM_START( airduelu )
 	ROM_REGION( 0x100000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "r10-m82a-h0.ic52", 0x00001, 0x20000, CRC(17f19965) SHA1(51f84903eba9b0daa6f91f3578e6fdb9b286ef1c) )
@@ -3813,24 +3780,24 @@
 	ROM_LOAD( "r10-bgm.ic15", 0x00000, 0x10000, CRC(16a858a3) SHA1(51dbac5b37ecb30b46072f5a300a29dc7f7b8542) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "r10-obj0.ic44",    0x00000, 0x20000, CRC(2f0d599b) SHA1(a966f806b5e25bb98cc63c46c49e0e676a62afcf) )  /* sprites */
+	ROM_LOAD( "r10-obj0.ic44",    0x00000, 0x20000, CRC(2f0d599b) SHA1(a966f806b5e25bb98cc63c46c49e0e676a62afcf) )  // sprites
 	ROM_LOAD( "r10-obj1.ic45",    0x20000, 0x20000, CRC(9865856b) SHA1(b18a06899ae29d45e2351594df544220f3f4485a) )
 	ROM_LOAD( "r10-obj2.ic46",    0x40000, 0x20000, CRC(d392aef2) SHA1(0f639a07066cadddc3884eb490885a8745571567) )
 	ROM_LOAD( "r10-obj3.ic36",    0x60000, 0x20000, CRC(923240c3) SHA1(f587a83329087a715a3e42110f74f104e8c8ef1f) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "r10-chr0.ic49",    0x00000, 0x20000, CRC(ce134b47) SHA1(841358cc222c81b8a91edc262f355310d50b4dbb) )  /* tiles */
+	ROM_LOAD( "r10-chr0.ic49",    0x00000, 0x20000, CRC(ce134b47) SHA1(841358cc222c81b8a91edc262f355310d50b4dbb) )  // tiles
 	ROM_LOAD( "r10-chr1.ic48",    0x20000, 0x20000, CRC(097fd853) SHA1(8e08f4f4a747c899bb8e21b347635e26af9edc2d) )
 	ROM_LOAD( "r10-chr2.ic57",    0x40000, 0x20000, CRC(6a94c1b9) SHA1(55174acbac54236e5fc1b80d120cd6da9fe5524c) )
 	ROM_LOAD( "r10-chr3.ic56",    0x60000, 0x20000, CRC(6637c349) SHA1(27cb7c89ab73292b43f8ae3c0d803a01ef3d3936) )
 
 	ROM_REGION( 0x080000, "sprites2", 0 ) // leftover from Major Title (mask roms, soldered on pcb)
-	ROM_LOAD( "mt_f0.ic38",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  /* sprites #2 */
+	ROM_LOAD( "mt_f0.ic38",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  // sprites #2
 	ROM_LOAD( "mt_f1.ic39",    0x20000, 0x20000, CRC(c68cd65f) SHA1(8999b558b4af0f453ada9e4ef705163df96844e6) )
 	ROM_LOAD( "mt_f2.ic40",    0x40000, 0x20000, CRC(a71feb2d) SHA1(47e366b422772bed08ee4d1c338970687d6c3b4c) )
 	ROM_LOAD( "mt_f3.ic41",    0x60000, 0x20000, CRC(179f7562) SHA1(6d28b199daffc62e8fa9009878ac0bb976ccbb2a) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "r10-voice.ic12",    0x00000, 0x20000, CRC(339f474d) SHA1(a81bb52598a0e31b2ed6a538755237c5d14d1844) )
 ROM_END
 
@@ -3848,28 +3815,27 @@
 	ROM_LOAD( "rt_sp.bin",    0x00000, 0x10000, CRC(24fded65) SHA1(34e085ebfc6415a60b7440ac53c8ae7130b5e9d4) )
 
 	ROM_REGION( 0x80000, "sprites", 0 )
-	ROM_LOAD( "rt_n0.bin",    0x00000, 0x20000, CRC(236e93ad) SHA1(a168c2f007a7469d8c1d834dc5247d99d13fd36d) )  /* sprites #1 */
+	ROM_LOAD( "rt_n0.bin",    0x00000, 0x20000, CRC(236e93ad) SHA1(a168c2f007a7469d8c1d834dc5247d99d13fd36d) )  // sprites #1
 	ROM_LOAD( "rt_n1.bin",    0x20000, 0x20000, CRC(94e0da50) SHA1(0e8aef07b2a4a60bb6faa9ea3d02869d30dff84c) )
 	ROM_LOAD( "rt_n2.bin",    0x40000, 0x20000, CRC(6310dd0e) SHA1(4e4a50ef64cdfddea10d415a4b2d2490c1364074) )
 	ROM_LOAD( "rt_n3.bin",    0x60000, 0x20000, CRC(dd9674fb) SHA1(925bbd64015ec9109a74ce80747bea2bfdb0cde6) )
 
 	ROM_REGION( 0x100000, "gfx2", 0 )
-	ROM_LOAD( "rt_c0.bin",    0x00000, 0x40000, CRC(c2511272) SHA1(138dd131f827215f13ba0761cacc0f383b5e5a48) )  /* tiles */
+	ROM_LOAD( "rt_c0.bin",    0x00000, 0x40000, CRC(c2511272) SHA1(138dd131f827215f13ba0761cacc0f383b5e5a48) )  // tiles
 	ROM_LOAD( "rt_c1.bin",    0x40000, 0x40000, CRC(6da33dae) SHA1(2b5f686c5c8e45a896ab115818066d03af767cb5) )
 	ROM_LOAD( "rt_c2.bin",    0x80000, 0x40000, CRC(29322d6e) SHA1(b553d46f1270dcc4754800e65c21b5e418994fcd) )
 	ROM_LOAD( "rt_c3.bin",    0xc0000, 0x40000, CRC(0ab3a8db) SHA1(7f4f5c18b5df0f5fdcb471db4e87c1be393aca92) )
 
 	ROM_REGION( 0x080000, "sprites2", 0 ) // leftover from Major Title
-	ROM_LOAD( "mt_f0.bin",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  /* sprites #2 */
+	ROM_LOAD( "mt_f0.bin",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  // sprites #2
 	ROM_LOAD( "mt_f1.bin",    0x20000, 0x20000, CRC(c68cd65f) SHA1(8999b558b4af0f453ada9e4ef705163df96844e6) )
 	ROM_LOAD( "mt_f2.bin",    0x40000, 0x20000, CRC(a71feb2d) SHA1(47e366b422772bed08ee4d1c338970687d6c3b4c) )
 	ROM_LOAD( "mt_f3.bin",    0x60000, 0x20000, CRC(179f7562) SHA1(6d28b199daffc62e8fa9009878ac0bb976ccbb2a) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */  // leftover from Major Title
+	ROM_REGION( 0x20000, "samples", 0 ) // samples - leftover from Major Title
 	ROM_LOAD( "mt_vo.bin",    0x00000, 0x20000, CRC(eb24bb2c) SHA1(9fca04fba0249e8213dd164eb6829e1a5acbee65) )
 ROM_END
 
-
 ROM_START( rtype2m82b )
 	ROM_REGION( 0x100000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "rt2_h0.bin",    0x00001, 0x20000, CRC(47639a78) SHA1(d7dd851fed96d46c850e5c8f24d9d1a081f6b297) )
@@ -3883,24 +3849,24 @@
 	ROM_LOAD( "rt2_sp.bin",    0x00000, 0x10000, CRC(73ffecb4) SHA1(4795bf0d6263060c3d3759b659bdb189a4087600) )
 
 	ROM_REGION( 0x80000, "sprites", 0 )
-	ROM_LOAD( "rt2_n0.bin",    0x00000, 0x20000, CRC(2cd8f913) SHA1(a53752b35da95b420dd29a09176d265d292b3938) )  /* sprites #1 */
+	ROM_LOAD( "rt2_n0.bin",    0x00000, 0x20000, CRC(2cd8f913) SHA1(a53752b35da95b420dd29a09176d265d292b3938) )  // sprites #1
 	ROM_LOAD( "rt2_n1.bin",    0x20000, 0x20000, CRC(5033066d) SHA1(e125127f0610c63f9e59a585db547be5d49ed863) )
 	ROM_LOAD( "rt2_n2.bin",    0x40000, 0x20000, CRC(ec3a0450) SHA1(632bdd397f1bc67f6970faf7d09ab8d911e105fe) )
 	ROM_LOAD( "rt2_n3.bin",    0x60000, 0x20000, CRC(db6176fc) SHA1(1eaf72af0322490c98461aded202288e387caac1) )
 
 	ROM_REGION( 0x100000, "gfx2", 0 )
-	ROM_LOAD( "rt2_c0.bin",    0x00000, 0x40000, CRC(f5bad5f2) SHA1(dc86b93f62e8947e3551f07e393e740e5dc43f5e) )  /* tiles */
+	ROM_LOAD( "rt2_c0.bin",    0x00000, 0x40000, CRC(f5bad5f2) SHA1(dc86b93f62e8947e3551f07e393e740e5dc43f5e) )  // tiles
 	ROM_LOAD( "rt2_c1.bin",    0x40000, 0x40000, CRC(71451778) SHA1(52ca7aa8522b988a19556313041450c767dad054) )
 	ROM_LOAD( "rt2_c2.bin",    0x80000, 0x40000, CRC(c6b0c352) SHA1(eec4fa88c27815960106881e7ccb23e62556bf1c) )
 	ROM_LOAD( "rt2_c3.bin",    0xc0000, 0x40000, CRC(6d530a32) SHA1(4e4100e5e5d88e65fb5494474d3692ecd8f44343) )
 
 	ROM_REGION( 0x080000, "sprites2", 0 ) // leftover from Major Title
-	ROM_LOAD( "mt_f0.bin",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  /* sprites #2 */
+	ROM_LOAD( "mt_f0.bin",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  // sprites #2
 	ROM_LOAD( "mt_f1.bin",    0x20000, 0x20000, CRC(c68cd65f) SHA1(8999b558b4af0f453ada9e4ef705163df96844e6) )
 	ROM_LOAD( "mt_f2.bin",    0x40000, 0x20000, CRC(a71feb2d) SHA1(47e366b422772bed08ee4d1c338970687d6c3b4c) )
 	ROM_LOAD( "mt_f3.bin",    0x60000, 0x20000, CRC(179f7562) SHA1(6d28b199daffc62e8fa9009878ac0bb976ccbb2a) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "rt2_vo.bin",    0x00000, 0x20000, CRC(637172d5) SHA1(9dd0dc409306287238826bf301e2a7a12d6cd9ce) )
 ROM_END
 
@@ -3918,24 +3884,24 @@
 	ROM_LOAD( "gen_=m84=_a-sp-d.ic15",    0x00000, 0x10000, CRC(e83cfc2c) SHA1(3193bdd06a9712fc499e6fc90a33140463ef59fe) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "gen_=m72=_c-l0-b.ic44",    0x00000, 0x20000, CRC(ec5127ef) SHA1(014ac8ad7b19cd9b475b72a0f42a4991119501c4) )  /* sprites */
+	ROM_LOAD( "gen_=m72=_c-l0-b.ic44",    0x00000, 0x20000, CRC(ec5127ef) SHA1(014ac8ad7b19cd9b475b72a0f42a4991119501c4) )  // sprites
 	ROM_LOAD( "gen_=m72=_c-l3-b.ic45",    0x20000, 0x20000, CRC(def65294) SHA1(23f5d99fa9f604fde37cb52113bff233d9be1d25) )
 	ROM_LOAD( "gen_=m72=_c-h0-b.ic46",    0x40000, 0x20000, CRC(bb0d6ad4) SHA1(4ab617fadfc32efad90ed7f0555513f167b0c43a) )
 	ROM_LOAD( "gen_=m72=_c-h3-b.ic36",    0x60000, 0x20000, CRC(4351044e) SHA1(0d3ce3f4f1473fd997e70de91e7b5b5a5ec60ad4) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "gen_=m81=_a-l0-a.ic49",    0x00000, 0x20000, CRC(c577ba5f) SHA1(c882e58cf64deca8eee6f14f3df43ecc932488fc) )  /* tiles */
+	ROM_LOAD( "gen_=m81=_a-l0-a.ic49",    0x00000, 0x20000, CRC(c577ba5f) SHA1(c882e58cf64deca8eee6f14f3df43ecc932488fc) )  // tiles
 	ROM_LOAD( "gen_=m81=_a-l1-a.ic48",    0x20000, 0x20000, CRC(429d12ab) SHA1(ccba25eab981fc4e664f76e06a2964066f2ae2e8) )
 	ROM_LOAD( "gen_=m81=_a-h0-a.ic57",    0x40000, 0x20000, CRC(b5b163b0) SHA1(82a708fea4953a7c4dcd1d4a1b07f302221ba30b) )
 	ROM_LOAD( "gen_=m81=_a-h1-a.ic56",    0x60000, 0x20000, CRC(8ef566a1) SHA1(3afb020a7317efe89c18b2a7773894ce28499d49) )
 
 	ROM_REGION( 0x080000, "sprites2", 0 ) // leftover from Major Title (mask roms, soldered on pcb)
-	ROM_LOAD( "mt_f0.ic38",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  /* sprites #2 */
+	ROM_LOAD( "mt_f0.ic38",    0x00000, 0x20000, CRC(2d5e05d5) SHA1(18bdc9c561dbf0f91642161ca985d2154bd58b5d) )  // sprites #2
 	ROM_LOAD( "mt_f1.ic39",    0x20000, 0x20000, CRC(c68cd65f) SHA1(8999b558b4af0f453ada9e4ef705163df96844e6) )
 	ROM_LOAD( "mt_f2.ic40",    0x40000, 0x20000, CRC(a71feb2d) SHA1(47e366b422772bed08ee4d1c338970687d6c3b4c) )
 	ROM_LOAD( "mt_f3.ic41",    0x60000, 0x20000, CRC(179f7562) SHA1(6d28b199daffc62e8fa9009878ac0bb976ccbb2a) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "gen_=m84=_a-v0-d.ic12",   0x00000, 0x20000, CRC(d8595c66) SHA1(97920c9947fbac609fb901415e5471c6e4ca066c) )
 ROM_END
 
@@ -3957,13 +3923,13 @@
 	ROM_LOAD( "ic17.4f",      0x00000, 0x10000, CRC(73ffecb4) SHA1(4795bf0d6263060c3d3759b659bdb189a4087600) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "ic31.6l",      0x00000, 0x20000, CRC(2cd8f913) SHA1(a53752b35da95b420dd29a09176d265d292b3938) )  /* sprites */
+	ROM_LOAD( "ic31.6l",      0x00000, 0x20000, CRC(2cd8f913) SHA1(a53752b35da95b420dd29a09176d265d292b3938) )  // sprites
 	ROM_LOAD( "ic21.4l",      0x20000, 0x20000, CRC(5033066d) SHA1(e125127f0610c63f9e59a585db547be5d49ed863) )
 	ROM_LOAD( "ic32.6m",      0x40000, 0x20000, CRC(ec3a0450) SHA1(632bdd397f1bc67f6970faf7d09ab8d911e105fe) )
 	ROM_LOAD( "ic22.4m",      0x60000, 0x20000, CRC(db6176fc) SHA1(1eaf72af0322490c98461aded202288e387caac1) )
 
 	ROM_REGION( 0x100000, "gfx2", 0 )
-	ROM_LOAD( "ic50.7s",      0x00000, 0x20000, CRC(f3f8736e) SHA1(37872b30459ad05b2981d4ac84983f3b52d0d2d6) )  /* tiles */
+	ROM_LOAD( "ic50.7s",      0x00000, 0x20000, CRC(f3f8736e) SHA1(37872b30459ad05b2981d4ac84983f3b52d0d2d6) )  // tiles
 	ROM_LOAD( "ic51.7u",      0x20000, 0x20000, CRC(b4c543af) SHA1(56042eba711160fc701021c8787414dcaddcdecb) )
 	ROM_LOAD( "ic56.8s",      0x40000, 0x20000, CRC(4cb80d66) SHA1(31c5496c14b277e428a2f22195fe1742d6a577d4) )
 	ROM_LOAD( "ic57.8u",      0x60000, 0x20000, CRC(bee128e0) SHA1(b149dae5f8f67a329d6df033fadf50ad75c0a57a) )
@@ -3972,7 +3938,7 @@
 	ROM_LOAD( "ic63.9m",      0xc0000, 0x20000, CRC(a6ad67f2) SHA1(b005b037ce8b3c932089982ecfbccdc922278fe3) )
 	ROM_LOAD( "ic64.9p",      0xe0000, 0x20000, CRC(3686d555) SHA1(d03754d9b8a6a3bfd4a85eeddacc35a36af197bd) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "ic14.4c",      0x00000, 0x20000, CRC(637172d5) SHA1(9dd0dc409306287238826bf301e2a7a12d6cd9ce) )
 ROM_END
 
@@ -3989,13 +3955,13 @@
 	ROM_LOAD( "ic17.4f",      0x00000, 0x10000, CRC(73ffecb4) SHA1(4795bf0d6263060c3d3759b659bdb189a4087600) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "ic31.6l",      0x00000, 0x20000, CRC(2cd8f913) SHA1(a53752b35da95b420dd29a09176d265d292b3938) )  /* sprites */
+	ROM_LOAD( "ic31.6l",      0x00000, 0x20000, CRC(2cd8f913) SHA1(a53752b35da95b420dd29a09176d265d292b3938) )  // sprites
 	ROM_LOAD( "ic21.4l",      0x20000, 0x20000, CRC(5033066d) SHA1(e125127f0610c63f9e59a585db547be5d49ed863) )
 	ROM_LOAD( "ic32.6m",      0x40000, 0x20000, CRC(ec3a0450) SHA1(632bdd397f1bc67f6970faf7d09ab8d911e105fe) )
 	ROM_LOAD( "ic22.4m",      0x60000, 0x20000, CRC(db6176fc) SHA1(1eaf72af0322490c98461aded202288e387caac1) )
 
 	ROM_REGION( 0x100000, "gfx2", 0 )
-	ROM_LOAD( "ic50.7s",      0x00000, 0x20000, CRC(f3f8736e) SHA1(37872b30459ad05b2981d4ac84983f3b52d0d2d6) )  /* tiles */
+	ROM_LOAD( "ic50.7s",      0x00000, 0x20000, CRC(f3f8736e) SHA1(37872b30459ad05b2981d4ac84983f3b52d0d2d6) )  // tiles
 	ROM_LOAD( "ic51.7u",      0x20000, 0x20000, CRC(b4c543af) SHA1(56042eba711160fc701021c8787414dcaddcdecb) )
 	ROM_LOAD( "ic56.8s",      0x40000, 0x20000, CRC(4cb80d66) SHA1(31c5496c14b277e428a2f22195fe1742d6a577d4) )
 	ROM_LOAD( "ic57.8u",      0x60000, 0x20000, CRC(bee128e0) SHA1(b149dae5f8f67a329d6df033fadf50ad75c0a57a) )
@@ -4004,14 +3970,14 @@
 	ROM_LOAD( "ic63.9m",      0xc0000, 0x20000, CRC(a6ad67f2) SHA1(b005b037ce8b3c932089982ecfbccdc922278fe3) )
 	ROM_LOAD( "ic64.9p",      0xe0000, 0x20000, CRC(3686d555) SHA1(d03754d9b8a6a3bfd4a85eeddacc35a36af197bd) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "ic14.4c",      0x00000, 0x20000, CRC(637172d5) SHA1(9dd0dc409306287238826bf301e2a7a12d6cd9ce) )
 
-	ROM_REGION( 0x0200, "proms", 0 ) /* located on M84-B-A */
+	ROM_REGION( 0x0200, "proms", 0 ) // located on M84-B-A
 	ROM_LOAD( "rt2_b-4n-.bin", 0x0000, 0x0100, CRC(b460c438) SHA1(00e20cf754b6fd5138ee4d2f6ec28dff9e292fe6) )
 	ROM_LOAD( "rt2_b-4p-.bin", 0x0100, 0x0100, CRC(a4f2c4bc) SHA1(f13b0a4b52dcc6704063b676f09d83dcba170133) )
 
-	/* stuff below isn't used but loaded because it was on the board .. */
+	// stuff below isn't used but loaded because it was on the board ..
 	ROM_REGION( 0x0800, "plds", 0 )
 	ROM_LOAD( "rt2-a-2h-.5",  0x0000, 0x0104, NO_DUMP ) // TIBPAL-16L8-25
 	ROM_LOAD( "rt2-a-5l-.33", 0x0200, 0x0104, NO_DUMP ) // TIBPAL-16L8-25
@@ -4032,13 +3998,13 @@
 	ROM_LOAD( "ic17.4f",      0x00000, 0x10000, CRC(73ffecb4) SHA1(4795bf0d6263060c3d3759b659bdb189a4087600) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "ic31.6l",      0x00000, 0x20000, CRC(2cd8f913) SHA1(a53752b35da95b420dd29a09176d265d292b3938) )  /* sprites */
+	ROM_LOAD( "ic31.6l",      0x00000, 0x20000, CRC(2cd8f913) SHA1(a53752b35da95b420dd29a09176d265d292b3938) )  // sprites
 	ROM_LOAD( "ic21.4l",      0x20000, 0x20000, CRC(5033066d) SHA1(e125127f0610c63f9e59a585db547be5d49ed863) )
 	ROM_LOAD( "ic32.6m",      0x40000, 0x20000, CRC(ec3a0450) SHA1(632bdd397f1bc67f6970faf7d09ab8d911e105fe) )
 	ROM_LOAD( "ic22.4m",      0x60000, 0x20000, CRC(db6176fc) SHA1(1eaf72af0322490c98461aded202288e387caac1) )
 
 	ROM_REGION( 0x100000, "gfx2", 0 )
-	ROM_LOAD( "ic50.7s",      0x00000, 0x20000, CRC(f3f8736e) SHA1(37872b30459ad05b2981d4ac84983f3b52d0d2d6) )  /* tiles */
+	ROM_LOAD( "ic50.7s",      0x00000, 0x20000, CRC(f3f8736e) SHA1(37872b30459ad05b2981d4ac84983f3b52d0d2d6) )  // tiles
 	ROM_LOAD( "ic51.7u",      0x20000, 0x20000, CRC(b4c543af) SHA1(56042eba711160fc701021c8787414dcaddcdecb) )
 	ROM_LOAD( "ic56.8s",      0x40000, 0x20000, CRC(4cb80d66) SHA1(31c5496c14b277e428a2f22195fe1742d6a577d4) )
 	ROM_LOAD( "ic57.8u",      0x60000, 0x20000, CRC(bee128e0) SHA1(b149dae5f8f67a329d6df033fadf50ad75c0a57a) )
@@ -4047,7 +4013,7 @@
 	ROM_LOAD( "ic63.9m",      0xc0000, 0x20000, CRC(a6ad67f2) SHA1(b005b037ce8b3c932089982ecfbccdc922278fe3) )
 	ROM_LOAD( "ic64.9p",      0xe0000, 0x20000, CRC(3686d555) SHA1(d03754d9b8a6a3bfd4a85eeddacc35a36af197bd) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "ic14.4c",      0x00000, 0x20000, CRC(637172d5) SHA1(9dd0dc409306287238826bf301e2a7a12d6cd9ce) )
 ROM_END
 
@@ -4065,18 +4031,18 @@
 	ROM_LOAD( "a-sp-0.rom",   0x00000, 0x10000, CRC(80e210e7) SHA1(66cff58fb37c52e1d8e0567e13b774253e862585) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "hh_00.rom",    0x00000, 0x20000, CRC(ec5127ef) SHA1(014ac8ad7b19cd9b475b72a0f42a4991119501c4) )  /* sprites */
+	ROM_LOAD( "hh_00.rom",    0x00000, 0x20000, CRC(ec5127ef) SHA1(014ac8ad7b19cd9b475b72a0f42a4991119501c4) )  // sprites
 	ROM_LOAD( "hh_10.rom",    0x20000, 0x20000, CRC(def65294) SHA1(23f5d99fa9f604fde37cb52113bff233d9be1d25) )
 	ROM_LOAD( "hh_20.rom",    0x40000, 0x20000, CRC(bb0d6ad4) SHA1(4ab617fadfc32efad90ed7f0555513f167b0c43a) )
 	ROM_LOAD( "hh_30.rom",    0x60000, 0x20000, CRC(4351044e) SHA1(0d3ce3f4f1473fd997e70de91e7b5b5a5ec60ad4) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "hh_a0.rom",    0x00000, 0x20000, CRC(c577ba5f) SHA1(c882e58cf64deca8eee6f14f3df43ecc932488fc) )  /* tiles */
+	ROM_LOAD( "hh_a0.rom",    0x00000, 0x20000, CRC(c577ba5f) SHA1(c882e58cf64deca8eee6f14f3df43ecc932488fc) )  // tiles
 	ROM_LOAD( "hh_a1.rom",    0x20000, 0x20000, CRC(429d12ab) SHA1(ccba25eab981fc4e664f76e06a2964066f2ae2e8) )
 	ROM_LOAD( "hh_a2.rom",    0x40000, 0x20000, CRC(b5b163b0) SHA1(82a708fea4953a7c4dcd1d4a1b07f302221ba30b) )
 	ROM_LOAD( "hh_a3.rom",    0x60000, 0x20000, CRC(8ef566a1) SHA1(3afb020a7317efe89c18b2a7773894ce28499d49) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "a-v0-0.rom",   0x00000, 0x20000, CRC(faaacaff) SHA1(ea3a3920255c07aa9c0a7e0191eae257a9f7f558) )
 ROM_END
 
@@ -4093,21 +4059,56 @@
 	ROM_LOAD( "gen-a-sp.bin", 0x00000, 0x10000, CRC(e83cfc2c) SHA1(3193bdd06a9712fc499e6fc90a33140463ef59fe) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "hh_00.rom",    0x00000, 0x20000, CRC(ec5127ef) SHA1(014ac8ad7b19cd9b475b72a0f42a4991119501c4) )  /* sprites */
+	ROM_LOAD( "hh_00.rom",    0x00000, 0x20000, CRC(ec5127ef) SHA1(014ac8ad7b19cd9b475b72a0f42a4991119501c4) )  // sprites
 	ROM_LOAD( "hh_10.rom",    0x20000, 0x20000, CRC(def65294) SHA1(23f5d99fa9f604fde37cb52113bff233d9be1d25) )
 	ROM_LOAD( "hh_20.rom",    0x40000, 0x20000, CRC(bb0d6ad4) SHA1(4ab617fadfc32efad90ed7f0555513f167b0c43a) )
 	ROM_LOAD( "hh_30.rom",    0x60000, 0x20000, CRC(4351044e) SHA1(0d3ce3f4f1473fd997e70de91e7b5b5a5ec60ad4) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "hh_a0.rom",    0x00000, 0x20000, CRC(c577ba5f) SHA1(c882e58cf64deca8eee6f14f3df43ecc932488fc) )  /* tiles */
+	ROM_LOAD( "hh_a0.rom",    0x00000, 0x20000, CRC(c577ba5f) SHA1(c882e58cf64deca8eee6f14f3df43ecc932488fc) )  // tiles
 	ROM_LOAD( "hh_a1.rom",    0x20000, 0x20000, CRC(429d12ab) SHA1(ccba25eab981fc4e664f76e06a2964066f2ae2e8) )
 	ROM_LOAD( "hh_a2.rom",    0x40000, 0x20000, CRC(b5b163b0) SHA1(82a708fea4953a7c4dcd1d4a1b07f302221ba30b) )
 	ROM_LOAD( "hh_a3.rom",    0x60000, 0x20000, CRC(8ef566a1) SHA1(3afb020a7317efe89c18b2a7773894ce28499d49) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "gen-vo.bin",   0x00000, 0x20000, CRC(d8595c66) SHA1(97920c9947fbac609fb901415e5471c6e4ca066c) )
 ROM_END
 
+ROM_START( hharryb )
+	ROM_REGION( 0x100000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "4-a-27c010a.bin", 0x00001, 0x20000, CRC(755c0874) SHA1(28ea0f7d700cc0119d8cb5693d0bcfef3da78c95) )
+	ROM_LOAD16_BYTE( "6-a-27c010a.bin", 0x00000, 0x20000, CRC(f10fb55c) SHA1(1bb0d56a29ca34b003c57faa9693b96413718608) )
+	ROM_LOAD16_BYTE( "3-a-27c512.bin",  0x60001, 0x10000, CRC(31b741c5) SHA1(46c1c4cea09477cc4989f3e06e08851d02743e62) )
+	ROM_RELOAD(                         0xe0001, 0x10000 )
+	ROM_LOAD16_BYTE( "5-a-27c512.bin",  0x60000, 0x10000, CRC(b23e966c) SHA1(f506f6d1f4f7874070e91d1df8f141cca031ce29) )
+	ROM_RELOAD(                         0xe0000, 0x10000 )
+
+	ROM_REGION( 0x10000, "soundcpu", 0 )
+	ROM_LOAD( "2-a-27c512.bin",   0x00000, 0x10000, CRC(80e210e7) SHA1(66cff58fb37c52e1d8e0567e13b774253e862585) )
+
+	ROM_REGION( 0x080000, "sprites", 0 )
+	ROM_LOAD( "17-c-27c010a.bin",    0x00000, 0x20000, CRC(ec5127ef) SHA1(014ac8ad7b19cd9b475b72a0f42a4991119501c4) )
+	ROM_LOAD( "16-c-27c010a.bin",    0x20000, 0x20000, CRC(def65294) SHA1(23f5d99fa9f604fde37cb52113bff233d9be1d25) )
+	ROM_LOAD( "14-c-27c010a.bin",    0x40000, 0x20000, CRC(bb0d6ad4) SHA1(4ab617fadfc32efad90ed7f0555513f167b0c43a) )
+	ROM_LOAD( "15-c-27c010a.bin",    0x60000, 0x20000, CRC(4351044e) SHA1(0d3ce3f4f1473fd997e70de91e7b5b5a5ec60ad4) )
+
+	ROM_REGION( 0x080000, "gfx2", 0 )
+	ROM_LOAD( "13-b-27c010a.bin",   0x00000, 0x20000, CRC(c577ba5f) SHA1(c882e58cf64deca8eee6f14f3df43ecc932488fc) )  // tiles
+	ROM_LOAD( "11-b-27c010a.bin",   0x20000, 0x20000, CRC(429d12ab) SHA1(ccba25eab981fc4e664f76e06a2964066f2ae2e8) )
+	ROM_LOAD( "9-b-27c010a.bin",    0x40000, 0x20000, CRC(b5b163b0) SHA1(82a708fea4953a7c4dcd1d4a1b07f302221ba30b) )
+	ROM_LOAD( "7-b-27c010a.bin",    0x60000, 0x20000, CRC(8ef566a1) SHA1(3afb020a7317efe89c18b2a7773894ce28499d49) )
+
+	ROM_REGION( 0x20000, "samples", 0 )
+	ROM_LOAD( "1-a-27c010a.bin",   0x00000, 0x20000, CRC(faaacaff) SHA1(ea3a3920255c07aa9c0a7e0191eae257a9f7f558) )
+
+	ROM_REGION( 0x200, "proms", 0 )
+	ROM_LOAD( "19-c-82s129.bin", 0x0000, 0x0100, CRC(b460c438) SHA1(00e20cf754b6fd5138ee4d2f6ec28dff9e292fe6) )
+	ROM_LOAD( "18-c-82s129.bin", 0x0100, 0x0100, CRC(a4f2c4bc) SHA1(f13b0a4b52dcc6704063b676f09d83dcba170133) )
+
+	ROM_REGION( 0x104, "plds", 0 )
+	ROM_LOAD( "a-pal16l8.bin", 0x000, 0x104, CRC(1358c513) SHA1(7c8f44e4d63867d54e16fc29d168a27be5f4babf) )
+ROM_END
+
 
 ROM_START( cosmccop )
 	ROM_REGION( 0x100000, "maincpu", 0 )
@@ -4119,20 +4120,20 @@
 	ROM_REGION( 0x10000, "soundcpu", 0 )
 	ROM_LOAD( "cc-d-sp.bin", 0x00000, 0x10000, CRC(3e3ace60) SHA1(d89b1b84de2887598bb7bcb17b1df1ec8d1862a9) )
 
-	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "cc-c-00.bin", 0x00000, 0x20000, CRC(9d99deaa) SHA1(acf16bea0f482306107d2a305c568406b6c21e9a) )   // cc-b-n0
-	ROM_LOAD( "cc-c-10.bin", 0x20000, 0x20000, CRC(7eb083ed) SHA1(31fa7d532fd46e861c3d19d5b08661653f685a49) )   // cc-b-n1
-	ROM_LOAD( "cc-c-20.bin", 0x40000, 0x20000, CRC(9421489e) SHA1(e43d042bf8b4ebed93558d74ec479ec60a01ca5c) )   // cc-b-n2
-	ROM_LOAD( "cc-c-30.bin", 0x60000, 0x20000, CRC(920ec735) SHA1(2d0949b43dddce7317c45910d6e4868ddf010806) )   // cc-b-n3
-
-	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "cc-d-g00.bin", 0x00000, 0x20000, CRC(e7f3d772) SHA1(c7f0bc42e8dde7bae334c7974c3d0ddba3856144) ) /* tiles */
-	ROM_LOAD( "cc-d-g10.bin", 0x20000, 0x20000, CRC(418b4e4c) SHA1(1191f12741ee7a360240f706534c9c83be8d5c2d) )
-	ROM_LOAD( "cc-d-g20.bin", 0x40000, 0x20000, CRC(a4b558eb) SHA1(0babf725de0065dbeca73fa170bd33565305d129) )
-	ROM_LOAD( "cc-d-g30.bin", 0x60000, 0x20000, CRC(f64a3166) SHA1(1661db2a37c76e6b4552e48c04966dbbccab8926) )
+	ROM_REGION( 0x080000, "sprites", 0 ) // sprites - same data as the gallop set
+	ROM_LOAD( "cc-c-00.bin", 0x00000, 0x20000, CRC(9d99deaa) SHA1(acf16bea0f482306107d2a305c568406b6c21e9a) )   // == cc-c-00.ic53
+	ROM_LOAD( "cc-c-10.bin", 0x20000, 0x20000, CRC(7eb083ed) SHA1(31fa7d532fd46e861c3d19d5b08661653f685a49) )   // == cc-c-10.ic51
+	ROM_LOAD( "cc-c-20.bin", 0x40000, 0x20000, CRC(9421489e) SHA1(e43d042bf8b4ebed93558d74ec479ec60a01ca5c) )   // == cc-c-20.ic49
+	ROM_LOAD( "cc-c-30.bin", 0x60000, 0x20000, CRC(920ec735) SHA1(2d0949b43dddce7317c45910d6e4868ddf010806) )   // == cc-c-30.ic47
+
+	ROM_REGION( 0x080000, "gfx2", 0 )  // tiles - same data, different format as the gallop set
+	ROM_LOAD( "cc-d-g00.bin", 0x00000, 0x20000, CRC(e7f3d772) SHA1(c7f0bc42e8dde7bae334c7974c3d0ddba3856144) )   // == cc-b-a0.ic21 + cc-b-b0.ic26
+	ROM_LOAD( "cc-d-g10.bin", 0x20000, 0x20000, CRC(418b4e4c) SHA1(1191f12741ee7a360240f706534c9c83be8d5c2d) )   // == cc-b-a1.ic22 + cc-b-b1.ic27
+	ROM_LOAD( "cc-d-g20.bin", 0x40000, 0x20000, CRC(a4b558eb) SHA1(0babf725de0065dbeca73fa170bd33565305d129) )   // == cc-b-a2.ic20 + cc-b-b2.ic25
+	ROM_LOAD( "cc-d-g30.bin", 0x60000, 0x20000, CRC(f64a3166) SHA1(1661db2a37c76e6b4552e48c04966dbbccab8926) )   // == cc-b-a3.ic23 + cc-b-b3.ic24
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
-	ROM_LOAD( "cc-c-v0.bin", 0x00000, 0x20000, CRC(6247bade) SHA1(4bc9f86acd09908c74b1ab0e7817c4ff1cad6f0b) )   // cc-d-v0
+	ROM_REGION( 0x20000, "samples", 0 ) // samples - same data as the gallop set
+	ROM_LOAD( "cc-c-v0.bin", 0x00000, 0x20000, CRC(6247bade) SHA1(4bc9f86acd09908c74b1ab0e7817c4ff1cad6f0b) )   // == cc-c-v0.ic44
 ROM_END
 
 
@@ -4147,18 +4148,18 @@
 	ROM_LOAD( "ken_d-sp.rom", 0x00000, 0x10000, CRC(233ca1cf) SHA1(4ebb6162773bd586a10016ccd77998a9b880f474) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "ken_m31.rom",  0x00000, 0x20000, CRC(e00b95a6) SHA1(6efcd8d58f8ebe3a42c60a0aa790b42c0e132777) )  /* sprites */
+	ROM_LOAD( "ken_m31.rom",  0x00000, 0x20000, CRC(e00b95a6) SHA1(6efcd8d58f8ebe3a42c60a0aa790b42c0e132777) )  // sprites
 	ROM_LOAD( "ken_m21.rom",  0x20000, 0x20000, CRC(d7722f87) SHA1(8606a53b8630934d2b5dfc986bd92ac4142f67e2) )
 	ROM_LOAD( "ken_m32.rom",  0x40000, 0x20000, CRC(30a844c4) SHA1(72b2caba3ee7a229ca56f004516dea8d3f0a7ba6) )
 	ROM_LOAD( "ken_m22.rom",  0x60000, 0x20000, CRC(a00dac85) SHA1(0c1ed852795046926f62843f6b256cbeecf9ebcf) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "ken_m51.rom",  0x00000, 0x20000, CRC(1646cf4f) SHA1(d240cb2bad3e766128e8e40aa7b1bf4f3b9a5559) )  /* tiles */
+	ROM_LOAD( "ken_m51.rom",  0x00000, 0x20000, CRC(1646cf4f) SHA1(d240cb2bad3e766128e8e40aa7b1bf4f3b9a5559) )  // tiles
 	ROM_LOAD( "ken_m57.rom",  0x20000, 0x20000, CRC(a9f88d90) SHA1(c8d4a96fe55fed4b7499550f3c74b03d10306757) )
 	ROM_LOAD( "ken_m66.rom",  0x40000, 0x20000, CRC(e9d17645) SHA1(fbe18d6691686a1c458d4a91169c9850698b5ca7) )
 	ROM_LOAD( "ken_m64.rom",  0x60000, 0x20000, CRC(df46709b) SHA1(e7c2cd752e765bf7b8ff24637305d61031ce0baa) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "ken_m14.rom",  0x00000, 0x20000, CRC(6651e9b7) SHA1(c42009f986c9a9f35732d5cd717d548536469b1c) )
 ROM_END
 
@@ -4173,18 +4174,18 @@
 	ROM_LOAD( "ken_d-sp.rom", 0x00000, 0x10000, CRC(233ca1cf) SHA1(4ebb6162773bd586a10016ccd77998a9b880f474) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "ken_m31.rom",  0x00000, 0x20000, CRC(e00b95a6) SHA1(6efcd8d58f8ebe3a42c60a0aa790b42c0e132777) )  /* sprites */
+	ROM_LOAD( "ken_m31.rom",  0x00000, 0x20000, CRC(e00b95a6) SHA1(6efcd8d58f8ebe3a42c60a0aa790b42c0e132777) )  // sprites
 	ROM_LOAD( "ken_m21.rom",  0x20000, 0x20000, CRC(d7722f87) SHA1(8606a53b8630934d2b5dfc986bd92ac4142f67e2) )
 	ROM_LOAD( "ken_m32.rom",  0x40000, 0x20000, CRC(30a844c4) SHA1(72b2caba3ee7a229ca56f004516dea8d3f0a7ba6) )
 	ROM_LOAD( "ken_m22.rom",  0x60000, 0x20000, CRC(a00dac85) SHA1(0c1ed852795046926f62843f6b256cbeecf9ebcf) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "ken_m51.rom",  0x00000, 0x20000, CRC(1646cf4f) SHA1(d240cb2bad3e766128e8e40aa7b1bf4f3b9a5559) )  /* tiles */
+	ROM_LOAD( "ken_m51.rom",  0x00000, 0x20000, CRC(1646cf4f) SHA1(d240cb2bad3e766128e8e40aa7b1bf4f3b9a5559) )  // tiles
 	ROM_LOAD( "ken_m57.rom",  0x20000, 0x20000, CRC(a9f88d90) SHA1(c8d4a96fe55fed4b7499550f3c74b03d10306757) )
 	ROM_LOAD( "ken_m66.rom",  0x40000, 0x20000, CRC(e9d17645) SHA1(fbe18d6691686a1c458d4a91169c9850698b5ca7) )
 	ROM_LOAD( "ken_m64.rom",  0x60000, 0x20000, CRC(df46709b) SHA1(e7c2cd752e765bf7b8ff24637305d61031ce0baa) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "ken_m14.rom",  0x00000, 0x20000, CRC(6651e9b7) SHA1(c42009f986c9a9f35732d5cd717d548536469b1c) )
 ROM_END
 
@@ -4199,18 +4200,18 @@
 	ROM_LOAD( "ken_d-sp.rom", 0x00000, 0x10000, CRC(233ca1cf) SHA1(4ebb6162773bd586a10016ccd77998a9b880f474) )
 
 	ROM_REGION( 0x080000, "sprites", 0 )
-	ROM_LOAD( "ken_m31.rom",  0x00000, 0x20000, CRC(e00b95a6) SHA1(6efcd8d58f8ebe3a42c60a0aa790b42c0e132777) )  /* sprites */
+	ROM_LOAD( "ken_m31.rom",  0x00000, 0x20000, CRC(e00b95a6) SHA1(6efcd8d58f8ebe3a42c60a0aa790b42c0e132777) )  // sprites
 	ROM_LOAD( "ken_m21.rom",  0x20000, 0x20000, CRC(d7722f87) SHA1(8606a53b8630934d2b5dfc986bd92ac4142f67e2) )
 	ROM_LOAD( "ken_m32.rom",  0x40000, 0x20000, CRC(30a844c4) SHA1(72b2caba3ee7a229ca56f004516dea8d3f0a7ba6) )
 	ROM_LOAD( "ken_m22.rom",  0x60000, 0x20000, CRC(a00dac85) SHA1(0c1ed852795046926f62843f6b256cbeecf9ebcf) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "ken_m51.rom",  0x00000, 0x20000, CRC(1646cf4f) SHA1(d240cb2bad3e766128e8e40aa7b1bf4f3b9a5559) )  /* tiles */
+	ROM_LOAD( "ken_m51.rom",  0x00000, 0x20000, CRC(1646cf4f) SHA1(d240cb2bad3e766128e8e40aa7b1bf4f3b9a5559) )  // tiles
 	ROM_LOAD( "ken_m57.rom",  0x20000, 0x20000, CRC(a9f88d90) SHA1(c8d4a96fe55fed4b7499550f3c74b03d10306757) )
 	ROM_LOAD( "ken_m66.rom",  0x40000, 0x20000, CRC(e9d17645) SHA1(fbe18d6691686a1c458d4a91169c9850698b5ca7) )
 	ROM_LOAD( "ken_m64.rom",  0x60000, 0x20000, CRC(df46709b) SHA1(e7c2cd752e765bf7b8ff24637305d61031ce0baa) )
 
-	ROM_REGION( 0x20000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x20000, "samples", 0 ) // samples
 	ROM_LOAD( "ken_m14.rom",  0x00000, 0x20000, CRC(6651e9b7) SHA1(c42009f986c9a9f35732d5cd717d548536469b1c) )
 
 	ROM_REGION( 0x0200, "proms", 0 ) /* located on M84-B-B */
@@ -4236,18 +4237,18 @@
 	ROM_LOAD( "ppa-sp.4j",    0x00000, 0x10000, CRC(3f458a5b) SHA1(d73740b2a548bf8a895909da0841f18d9ed32668) )
 
 	ROM_REGION( 0x100000, "sprites", 0 )
-	ROM_LOAD( "ppb-n0.bin",   0x00000, 0x40000, CRC(951a41f8) SHA1(59b64f63ea2452c2b42ff7ebf1ff6fc4e7879ce3) )  /* sprites */
+	ROM_LOAD( "ppb-n0.bin",   0x00000, 0x40000, CRC(951a41f8) SHA1(59b64f63ea2452c2b42ff7ebf1ff6fc4e7879ce3) )  // sprites
 	ROM_LOAD( "ppb-n1.bin",   0x40000, 0x40000, CRC(c609b7f2) SHA1(1da3550c7e4d2a26d75d143934680d9177ba5c35) )
 	ROM_LOAD( "ppb-n2.bin",   0x80000, 0x40000, CRC(318c0b5f) SHA1(1d4cd17dc2f8fc4e523eaf679f21d83e1bfade4e) )
 	ROM_LOAD( "ppb-n3.bin",   0xc0000, 0x40000, CRC(93dc9490) SHA1(3df4d57a7bf19443f5aa6a416bcee968f81d9059) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "ppa-g00.bin",  0x00000, 0x20000, CRC(8a88a174) SHA1(d360b9014aec31960538ee488894496248a820dc) )  /* tiles */
+	ROM_LOAD( "ppa-g00.bin",  0x00000, 0x20000, CRC(8a88a174) SHA1(d360b9014aec31960538ee488894496248a820dc) )  // tiles
 	ROM_LOAD( "ppa-g10.bin",  0x20000, 0x20000, CRC(e48a66ac) SHA1(49b33db6a922d6f1d1417e28714a67431b7c0217) )
 	ROM_LOAD( "ppa-g20.bin",  0x40000, 0x20000, CRC(12b93e79) SHA1(f3d2b76a30874827c8998c1d13a55a3990b699b7) )
 	ROM_LOAD( "ppa-g30.bin",  0x60000, 0x20000, CRC(faa39aee) SHA1(9cc1a468b304437766c04189054d3b8f7ff1f958) )
 
-	ROM_REGION( 0x40000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x40000, "samples", 0 ) // samples
 	ROM_LOAD( "ppa-v0.bin",   0x00000, 0x40000, CRC(03321664) SHA1(51f2b2b712385c1cd55fd069829efac01838d603) )
 ROM_END
 
@@ -4264,18 +4265,18 @@
 	ROM_LOAD( "ppa-sp.4j",    0x00000, 0x10000, CRC(3f458a5b) SHA1(d73740b2a548bf8a895909da0841f18d9ed32668) )
 
 	ROM_REGION( 0x100000, "sprites", 0 )
-	ROM_LOAD( "ppb-n0.bin",   0x00000, 0x40000, CRC(951a41f8) SHA1(59b64f63ea2452c2b42ff7ebf1ff6fc4e7879ce3) )  /* sprites */
+	ROM_LOAD( "ppb-n0.bin",   0x00000, 0x40000, CRC(951a41f8) SHA1(59b64f63ea2452c2b42ff7ebf1ff6fc4e7879ce3) )  // sprites
 	ROM_LOAD( "ppb-n1.bin",   0x40000, 0x40000, CRC(c609b7f2) SHA1(1da3550c7e4d2a26d75d143934680d9177ba5c35) )
 	ROM_LOAD( "ppb-n2.bin",   0x80000, 0x40000, CRC(318c0b5f) SHA1(1d4cd17dc2f8fc4e523eaf679f21d83e1bfade4e) )
 	ROM_LOAD( "ppb-n3.bin",   0xc0000, 0x40000, CRC(93dc9490) SHA1(3df4d57a7bf19443f5aa6a416bcee968f81d9059) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "ppa-g00.bin",  0x00000, 0x20000, CRC(8a88a174) SHA1(d360b9014aec31960538ee488894496248a820dc) )  /* tiles */
+	ROM_LOAD( "ppa-g00.bin",  0x00000, 0x20000, CRC(8a88a174) SHA1(d360b9014aec31960538ee488894496248a820dc) )  // tiles
 	ROM_LOAD( "ppa-g10.bin",  0x20000, 0x20000, CRC(e48a66ac) SHA1(49b33db6a922d6f1d1417e28714a67431b7c0217) )
 	ROM_LOAD( "ppa-g20.bin",  0x40000, 0x20000, CRC(12b93e79) SHA1(f3d2b76a30874827c8998c1d13a55a3990b699b7) )
 	ROM_LOAD( "ppa-g30.bin",  0x60000, 0x20000, CRC(faa39aee) SHA1(9cc1a468b304437766c04189054d3b8f7ff1f958) )
 
-	ROM_REGION( 0x40000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x40000, "samples", 0 ) // samples
 	ROM_LOAD( "ppa-v0.bin",   0x00000, 0x40000, CRC(03321664) SHA1(51f2b2b712385c1cd55fd069829efac01838d603) )
 ROM_END
 
@@ -4292,18 +4293,18 @@
 	ROM_LOAD( "ppa-sp.4j",    0x00000, 0x10000, CRC(3f458a5b) SHA1(d73740b2a548bf8a895909da0841f18d9ed32668) )
 
 	ROM_REGION( 0x100000, "sprites", 0 )
-	ROM_LOAD( "ppb-n0.bin",   0x00000, 0x40000, CRC(951a41f8) SHA1(59b64f63ea2452c2b42ff7ebf1ff6fc4e7879ce3) )  /* sprites */
+	ROM_LOAD( "ppb-n0.bin",   0x00000, 0x40000, CRC(951a41f8) SHA1(59b64f63ea2452c2b42ff7ebf1ff6fc4e7879ce3) )  // sprites
 	ROM_LOAD( "ppb-n1.bin",   0x40000, 0x40000, CRC(c609b7f2) SHA1(1da3550c7e4d2a26d75d143934680d9177ba5c35) )
 	ROM_LOAD( "ppb-n2.bin",   0x80000, 0x40000, CRC(318c0b5f) SHA1(1d4cd17dc2f8fc4e523eaf679f21d83e1bfade4e) )
 	ROM_LOAD( "ppb-n3.bin",   0xc0000, 0x40000, CRC(93dc9490) SHA1(3df4d57a7bf19443f5aa6a416bcee968f81d9059) )
 
 	ROM_REGION( 0x080000, "gfx2", 0 )
-	ROM_LOAD( "ppa-g00.bin",  0x00000, 0x20000, CRC(8a88a174) SHA1(d360b9014aec31960538ee488894496248a820dc) )  /* tiles */
+	ROM_LOAD( "ppa-g00.bin",  0x00000, 0x20000, CRC(8a88a174) SHA1(d360b9014aec31960538ee488894496248a820dc) )  // tiles
 	ROM_LOAD( "ppa-g10.bin",  0x20000, 0x20000, CRC(e48a66ac) SHA1(49b33db6a922d6f1d1417e28714a67431b7c0217) )
 	ROM_LOAD( "ppa-g20.bin",  0x40000, 0x20000, CRC(12b93e79) SHA1(f3d2b76a30874827c8998c1d13a55a3990b699b7) )
 	ROM_LOAD( "ppa-g30.bin",  0x60000, 0x20000, CRC(faa39aee) SHA1(9cc1a468b304437766c04189054d3b8f7ff1f958) )
 
-	ROM_REGION( 0x40000, "samples", 0 ) /* samples */
+	ROM_REGION( 0x40000, "samples", 0 ) // samples
 	ROM_LOAD( "ppa-v0.bin",   0x00000, 0x40000, CRC(03321664) SHA1(51f2b2b712385c1cd55fd069829efac01838d603) )
 ROM_END
 
@@ -4325,8 +4326,8 @@
 GAME( 1988, nspirit,     0,        m72,          nspirit,      m72_state, init_nspirit,    ROT0,   "Irem", "Ninja Spirit (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // doesn't wait / check for japan warning string.. fails rom check if used with japanese mcu rom (World version?)
 GAME( 1988, nspiritj,    nspirit,  nspiritj,     nspirit,      m72_state, init_m72_8751,   ROT0,   "Irem", "Saigo no Nindou (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
 
-GAME( 1988, imgfight,    0,        m72,          imgfight,     m72_state, init_imgfight,   ROT270, "Irem", "Image Fight (World)", MACHINE_SUPPORTS_SAVE ) // doesn't wait / check for japan warning string.. fails rom check if used with japanese mcu rom (World version?)
-GAME( 1988, imgfightj,   imgfight, imgfightj,    imgfight,     m72_state, init_m72_8751,   ROT270, "Irem", "Image Fight (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, imgfight,    0,        imgfight,     imgfight,     m72_state, init_m72_8751,   ROT270, "Irem", "Image Fight (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, imgfightj,   imgfight, imgfight,     imgfight,     m72_state, init_m72_8751,   ROT270, "Irem", "Image Fight (Japan)", MACHINE_SUPPORTS_SAVE )
 GAME( 1988, imgfightb,   imgfight, imgfightb,    imgfight,     m72_state, init_m72_8751,   ROT270, "Irem", "Image Fight (Japan, bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // uses an 80c31 MCU, which isn't hooked up correctly yet. Gives 'RAM NG 7' error
 
 GAME( 1989, loht,        0,        m72_8751,     loht,         m72_state, init_m72_8751,   ROT0,   "Irem", "Legend of Hero Tonma (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
@@ -4365,6 +4366,7 @@
 /* M84 */
 GAME( 1990, hharryu,     hharry,   hharryu,      hharry,       m72_state, empty_init,      ROT0,   "Irem America", "Hammerin' Harry (US, M84 hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
 GAME( 1990, dkgensan,    hharry,   hharryu,      hharry,       m72_state, empty_init,      ROT0,   "Irem", "Daiku no Gensan (Japan, M84 hardware)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1990, hharryb,     hharry,   hharryu,      hharry,       m72_state, empty_init,      ROT0,   "bootleg", "Hammerin' Harry (World, M84 hardware bootleg)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
 
 GAME( 1989, rtype2,      0,        rtype2,       rtype2,       m72_state, empty_init,      ROT0,   "Irem", "R-Type II (World)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
 GAME( 1989, rtype2j,     rtype2,   rtype2,       rtype2,       m72_state, empty_init,      ROT0,   "Irem", "R-Type II (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/m79152pc.cpp mame-0.224+dfsg.1/src/mame/drivers/m79152pc.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/m79152pc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/m79152pc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -134,7 +134,7 @@
 void m79152pc_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0x3fff).rom().region("maincpu", 0);;
+	map(0x0000, 0x3fff).rom().region("maincpu", 0);
 	map(0x4000, 0x47ff).ram();
 	map(0x8000, 0x8fff).ram().share("videoram");
 	map(0x9000, 0x9fff).ram().share("attributes");
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/m92.cpp mame-0.224+dfsg.1/src/mame/drivers/m92.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/m92.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/m92.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4,35 +4,40 @@
 
     Irem M92 system games:
 
-    Gunforce (World)                M92-A   (c) 1991 Irem Corp
-    Gunforce (USA)                  M92-A   (c) 1991 Irem America Corp
-    Gunforce (Japan)                M92-A   (c) 1991 Irem Corp
-    Blade Master (World)                    (c) 1991 Irem Corp
-    Cross Blades! (Japan)                   (c) 1991 Irem Corp
-    Lethal Thunder (World)                  (c) 1991 Irem Corp
-    Thunder Blaster (Japan)                 (c) 1991 Irem Corp
-    Undercover Cops (World)                 (c) 1992 Irem Corp
-    Undercover Cops (Japan)                 (c) 1992 Irem Corp
-    Mystic Riders (World)                   (c) 1992 Irem Corp
-    Gun Hohki (Japan)                       (c) 1992 Irem Corp
-    Major Title 2 (World)           M92-F   (c) 1992 Irem Corp
-    Major Title 2 (Japan)           M92-F   (c) 1992 Irem Corp
-    The Irem Skins Game (USA Set 1) M92-F   (c) 1992 Irem America Corp
-    The Irem Skins Game (USA Set 2) M92-F   (c) 1992 Irem America Corp
-    Hook (World)                            (c) 1992 Irem Corp
-    Hook (Japan)                            (c) 1992 Irem Corp
-    Hook (USA)                              (c) 1992 Irem America Corp
-    R-Type Leo (World)                      (c) 1992 Irem Corp
-    R-Type Leo (Japan)                      (c) 1992 Irem Corp
-    In The Hunt (World)             M92-E   (c) 1993 Irem Corp
-    In The Hunt (USA)               M92-E   (c) 1993 Irem Corp
-    Kaitei Daisensou (Japan)        M92-E   (c) 1993 Irem Corp
-    Ninja Baseball Batman (USA)             (c) 1993 Irem America Corp
-    Yakyuu Kakutou League-Man (Japan)       (c) 1993 Irem Corp
-    Perfect Soldiers (Japan)        M92-G   (c) 1993 Irem Corp
-    Dream Soccer 94 (Japan)         M92-G   (c) 1994 Irem Corp
-    Gunforce 2 (US)                 M92-G   (c) 1994 Irem Corp
-    Geostorm (Japan)                M92-G   (c) 1994 Irem Corp
+    Gunforce (World)                                 M92-A   (c) 1991 Irem Corp
+    Gunforce (USA)                                   M92-A   (c) 1991 Irem America Corp
+    Gunforce (Japan)                                 M92-A   (c) 1991 Irem Corp
+    Blade Master (World)                             M92-B   (c) 1991 Irem Corp
+    Cross Blades! (Japan)                            M92-D   (c) 1991 Irem Corp
+    Lethal Thunder (World)                                   (c) 1991 Irem Corp
+    Thunder Blaster (Japan)                          M92-C   (c) 1991 Irem Corp
+    Undercover Cops (World)                          M92-E   (c) 1992 Irem Corp
+    Undercover Cops (US)                             M92-E   (c) 1992 Irem America Corp
+    Undercover Cops (Japan)                          M92-E   (c) 1992 Irem Corp
+    Undercover Cops - Alpha Renewal Version (World)  M92-E   (c) 1992 Irem Corp
+    Undercover Cops - Alpha Renewal Version (US)     M92-E   (c) 1992 Irem America Corp
+    Mystic Riders (World)                                    (c) 1992 Irem Corp
+    Mahou Keibitai Gun Hohki (Japan)                         (c) 1992 Irem Corp
+    Major Title 2 (World)                            M92-F   (c) 1992 Irem Corp
+    Major Title 2 (Japan)                            M92-F   (c) 1992 Irem Corp
+    The Irem Skins Game (USA Set 1)                  M92-F   (c) 1992 Irem America Corp
+    The Irem Skins Game (USA Set 2)                  M92-F   (c) 1992 Irem America Corp
+    Hook (World)                                             (c) 1992 Irem Corp
+    Hook (USA)                                               (c) 1992 Irem America Corp
+    Hook (Japan)                                             (c) 1992 Irem Corp
+    R-Type Leo (World)                                       (c) 1992 Irem Corp
+    R-Type Leo (Japan)                                       (c) 1992 Irem Corp
+    In The Hunt (World)                              M92-E   (c) 1993 Irem Corp
+    In The Hunt (USA)                                M92-E   (c) 1993 Irem Corp
+    Kaitei Daisensou (Japan)                         M92-E   (c) 1993 Irem Corp
+    Ninja Baseball Batman (World)                            (c) 1993 Irem Corp
+    Ninja Baseball Batman (USA)                              (c) 1993 Irem America Corp
+    Yakyuu Kakutou League-Man (Japan)                        (c) 1993 Irem Corp
+    Superior Soldiers (US)                           M92-G   (c) 1993 Irem Corp
+    Perfect Soldiers (Japan)                         M92-G   (c) 1993 Irem Corp
+    Dream Soccer '94 (Japan)                         M92-G   (c) 1994 Irem Corp
+    Gun Force II (US)                                M92-G   (c) 1994 Irem Corp
+    Geo Storm (Japan)                                M92-G   (c) 1994 Irem Corp
 
 System notes:
     Each game has an encrypted sound cpu (see irem_cpu.c), the sound cpu and
@@ -97,7 +102,7 @@
 World PK Soccer               1995  Rev 3.51 M92
 Fire Barrel                   1993  Rev 3.52 M92
 Dream Soccer '94              1994  Rev 3.53 M92
-Gunforce 2                    1994  Rev 3.53 M92
+Gun Force II                  1994  Rev 3.53 M92
 
 Gun Force
 1991, Irem Corp.
@@ -1793,14 +1798,14 @@
 
 ROM_START( uccops )
 	ROM_REGION( 0x100000, "maincpu", 0 )
-	ROM_LOAD16_BYTE( "uc_h0.ic28", 0x000001, 0x040000, CRC(240aa5f7) SHA1(8d864bb1377e9f6d266631ed365c5809b9da33f8) )
-	ROM_LOAD16_BYTE( "uc_l0.ic39", 0x000000, 0x040000, CRC(df9a4826) SHA1(298033d97b9587e3548cb3bffa16b7ba9a6ff20d) )
-	ROM_LOAD16_BYTE( "uc_h1.ic27", 0x080001, 0x020000, CRC(8d29bcd6) SHA1(470b77d1b8f88824bac294bd12a205a23dad2287) )
-	ROM_LOAD16_BYTE( "uc_l1.ic38", 0x080000, 0x020000, CRC(a8a402d8) SHA1(0b40fb69f0a3e24e6b60117d2d2fd4cc170bc621) )
+	ROM_LOAD16_BYTE( "ucc_e-h0.ic28", 0x000001, 0x040000, CRC(240aa5f7) SHA1(8d864bb1377e9f6d266631ed365c5809b9da33f8) )
+	ROM_LOAD16_BYTE( "ucc_e-l0.ic39", 0x000000, 0x040000, CRC(df9a4826) SHA1(298033d97b9587e3548cb3bffa16b7ba9a6ff20d) )
+	ROM_LOAD16_BYTE( "ucc_h1.ic27",   0x080001, 0x020000, CRC(8d29bcd6) SHA1(470b77d1b8f88824bac294bd12a205a23dad2287) )
+	ROM_LOAD16_BYTE( "ucc_l1.ic38",   0x080000, 0x020000, CRC(a8a402d8) SHA1(0b40fb69f0a3e24e6b60117d2d2fd4cc170bc621) )
 
 	ROM_REGION( 0x20000, "soundcpu", 0 )
-	ROM_LOAD16_BYTE( "uc_sh0.rom", 0x00001, 0x10000, CRC(df90b198) SHA1(6b334457f06f6b9cfb355ba3d399bebb37b5733e) )
-	ROM_LOAD16_BYTE( "uc_sl0.rom", 0x00000, 0x10000, CRC(96c11aac) SHA1(16c47b4f97f0532fff30bb163f26d8cf6b923a2e) )
+	ROM_LOAD16_BYTE( "ucc_e-sh0.ic30", 0x00001, 0x10000, CRC(df90b198) SHA1(6b334457f06f6b9cfb355ba3d399bebb37b5733e) )
+	ROM_LOAD16_BYTE( "ucc_e-sl0.ic31", 0x00000, 0x10000, CRC(96c11aac) SHA1(16c47b4f97f0532fff30bb163f26d8cf6b923a2e) )
 
 	ROM_REGION( 0x200000, "gfx1", 0 ) /* Tiles */
 	ROM_LOAD( "uc_w38m.rom", 0x000000, 0x080000, CRC(130a40e5) SHA1(f70bad2fe126bb0e451a3fa6100a610928e9a502) )
@@ -1820,14 +1825,14 @@
 
 ROM_START( uccopsu )
 	ROM_REGION( 0x100000, "maincpu", 0 )
-	ROM_LOAD16_BYTE( "uc_h0.ic28",   0x000001, 0x040000, CRC(240aa5f7) SHA1(8d864bb1377e9f6d266631ed365c5809b9da33f8) )
-	ROM_LOAD16_BYTE( "uc_l0.ic39",   0x000000, 0x040000, CRC(df9a4826) SHA1(298033d97b9587e3548cb3bffa16b7ba9a6ff20d) )
-	ROM_LOAD16_BYTE( "uc_h1-g.ic27", 0x080001, 0x020000, CRC(6b8ca2de) SHA1(1096b93bbaa4c97d4900e8c083cde99195cad5ba) )
-	ROM_LOAD16_BYTE( "uc_l1-g.ic38", 0x080000, 0x020000, CRC(2bdec7dd) SHA1(58817099e74fd5bc299b7bc14d83ee75ed200b53) )
+	ROM_LOAD16_BYTE( "ucc_e-h0.ic28", 0x000001, 0x040000, CRC(240aa5f7) SHA1(8d864bb1377e9f6d266631ed365c5809b9da33f8) )
+	ROM_LOAD16_BYTE( "ucc_e-l0.ic39", 0x000000, 0x040000, CRC(df9a4826) SHA1(298033d97b9587e3548cb3bffa16b7ba9a6ff20d) )
+	ROM_LOAD16_BYTE( "ucc_h1-g.ic27", 0x080001, 0x020000, CRC(6b8ca2de) SHA1(1096b93bbaa4c97d4900e8c083cde99195cad5ba) )
+	ROM_LOAD16_BYTE( "ucc_l1-g.ic38", 0x080000, 0x020000, CRC(2bdec7dd) SHA1(58817099e74fd5bc299b7bc14d83ee75ed200b53) )
 
 	ROM_REGION( 0x20000, "soundcpu", 0 )
-	ROM_LOAD16_BYTE( "uc_sh0.rom", 0x00001, 0x10000, CRC(df90b198) SHA1(6b334457f06f6b9cfb355ba3d399bebb37b5733e) )
-	ROM_LOAD16_BYTE( "uc_sl0.rom", 0x00000, 0x10000, CRC(96c11aac) SHA1(16c47b4f97f0532fff30bb163f26d8cf6b923a2e) )
+	ROM_LOAD16_BYTE( "ucc_e-sh0.ic30", 0x00001, 0x10000, CRC(df90b198) SHA1(6b334457f06f6b9cfb355ba3d399bebb37b5733e) )
+	ROM_LOAD16_BYTE( "ucc_e-sl0.ic31", 0x00000, 0x10000, CRC(96c11aac) SHA1(16c47b4f97f0532fff30bb163f26d8cf6b923a2e) )
 
 	ROM_REGION( 0x200000, "gfx1", 0 ) /* Tiles */
 	ROM_LOAD( "uc_w38m.rom", 0x000000, 0x080000, CRC(130a40e5) SHA1(f70bad2fe126bb0e451a3fa6100a610928e9a502) )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mac128.cpp mame-0.224+dfsg.1/src/mame/drivers/mac128.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mac128.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mac128.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -13,11 +13,11 @@
         0x400000 - 0x4fffff     ROM
         0x580000 - 0x5fffff     5380 NCR/Symbios SCSI peripherals chip (Mac Plus only)
         0x600000 - 0x6fffff     RAM
-        0x800000 - 0x9fffff     Zilog 8530 SCC (Serial Control Chip) Read
-        0xa00000 - 0xbfffff     Zilog 8530 SCC (Serial Control Chip) Write
+        0x800000 - 0x9fffff     Zilog 8530 SCC (Serial Communications Controller) Read
+        0xa00000 - 0xbfffff     Zilog 8530 SCC (Serial Communications Controller) Write
         0xc00000 - 0xdfffff     IWM (Integrated Woz Machine; floppy)
         0xe80000 - 0xefffff     Rockwell 6522 VIA
-        0xf00000 - 0xffffef     ??? (the ROM appears to be accessing here)
+        0xf00000 - 0xffffef     Open bus??? (the ROM appears to be accessing here)
         0xfffff0 - 0xffffff     Auto Vector
 
     Interrupts:
@@ -37,6 +37,9 @@
             PB_EXT (DCDB)  from mouse Y circuitry
             PA_EXT (DCDA)  from mouse X circuitry
 
+    The MC68000's FC outputs are not used even for autovectoring. The
+    VIA's address range is overdecoded to generate VPA for both.
+
 SCC Init:
 
 Control B:
@@ -79,35 +82,37 @@
 ****************************************************************************/
 
 #include "emu.h"
+
+#include "machine/macrtc.h"
+
+#include "bus/mackbd/mackbd.h"
+#include "bus/macpds/hyperdrive.h"
+#include "bus/scsi/scsicd.h"
+#include "bus/scsi/scsi.h"
+#include "bus/scsi/scsihd.h"
 #include "cpu/m68000/m68000.h"
-#include "cpu/powerpc/ppc.h"
 #include "machine/6522via.h"
-#include "machine/z80scc.h"
-#include "machine/ncr5380.h"
 #include "machine/applefdc.h"
-#include "machine/swim.h"
-#include "machine/sonydriv.h"
-#include "machine/mackbd.h"
-#include "machine/macrtc.h"
+#include "machine/ncr5380.h"
 #include "machine/ram.h"
+#include "machine/sonydriv.h"
+#include "machine/swim.h"
 #include "machine/timer.h"
+#include "machine/z80scc.h"
 #include "sound/dac.h"
 #include "sound/volt_reg.h"
+
 #include "formats/ap_dsk35.h"
-#include "bus/scsi/scsi.h"
-#include "bus/scsi/scsihd.h"
-#include "bus/scsi/scsicd.h"
+
 #include "emupal.h"
 #include "screen.h"
 #include "softlist.h"
 #include "speaker.h"
 
-#include "bus/macpds/hyperdrive.h"
 
 #define MAC_SCREEN_NAME "screen"
 #define MAC_539X_1_TAG "539x_1"
 #define MAC_539X_2_TAG "539x_2"
-#define MACKBD_TAG "mackbd"
 #define DAC_TAG "macdac"
 #define SCC_TAG "scc"
 
@@ -148,12 +153,11 @@
 		m_ram(*this, RAM_TAG),
 		m_ncr5380(*this, "ncr5380"),
 		m_iwm(*this, "fdc"),
-		m_mackbd(*this, MACKBD_TAG),
+		m_mackbd(*this, "kbd"),
 		m_rtc(*this,"rtc"),
 		m_mouse0(*this, "MOUSE0"),
 		m_mouse1(*this, "MOUSE1"),
 		m_mouse2(*this, "MOUSE2"),
-		m_key_port(*this, "KEY%u", 0),
 		m_screen(*this, "screen"),
 		m_dac(*this, DAC_TAG),
 		m_scc(*this, SCC_TAG)
@@ -174,11 +178,10 @@
 	required_device<ram_device> m_ram;
 	optional_device<ncr5380_device> m_ncr5380;
 	required_device<applefdc_base_device> m_iwm;
-	optional_device<mackbd_device> m_mackbd;
+	required_device<mac_keyboard_port_device> m_mackbd;
 	optional_device<rtc3430042_device> m_rtc;
 
 	required_ioport m_mouse0, m_mouse1, m_mouse2;
-	optional_ioport_array<7> m_key_port;
 
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
@@ -189,9 +192,6 @@
 
 	int m_irq_count, m_ca1_data, m_ca2_data;
 
-	/* keyboard matrix to detect transition - macadb needs to stop relying on this */
-	int m_key_matrix[7];
-
 	int m_mouse_bit_x;
 	int m_mouse_bit_y;
 	int last_mx, last_my;
@@ -227,22 +227,13 @@
 
 	TIMER_CALLBACK_MEMBER(mac_scanline);
 	TIMER_CALLBACK_MEMBER(mac_hblank);
-	DECLARE_VIDEO_START(mac);
 	uint32_t screen_update_mac(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	DECLARE_WRITE_LINE_MEMBER(mac_kbd_clk_in);
-
-	DECLARE_WRITE_LINE_MEMBER(mac_via_out_cb2);
 	uint8_t mac_via_in_a();
 	uint8_t mac_via_in_b();
 	void mac_via_out_a(uint8_t data);
 	void mac_via_out_b(uint8_t data);
-	void mac128_state_load();
 	DECLARE_WRITE_LINE_MEMBER(mac_via_irq);
-	int scan_keyboard();
-	void keyboard_init();
-	void kbd_shift_out(int data);
-	void keyboard_receive(int val);
 	void mac_driver_init(mac128model_t model);
 	void update_volume();
 
@@ -746,18 +737,6 @@
 	m_rtc->clk_w((data >> 1) & 0x01);
 }
 
-/******************* Keyboard <-> VIA communication ***********************/
-
-WRITE_LINE_MEMBER(mac128_state::mac_kbd_clk_in)
-{
-	m_via->write_cb1(state ? 0 : 1);
-}
-
-WRITE_LINE_MEMBER(mac128_state::mac_via_out_cb2)
-{
-	m_mackbd->datain_w(state);
-}
-
 /* *************************************************************************
  * Mouse
  * *************************************************************************/
@@ -854,23 +833,6 @@
 #endif
 
 	memset(m_ram->pointer(), 0, m_ram->size());
-
-	/* clear key matrix for macadb */
-	for (int i=0; i<7; i++)
-	{
-		m_key_matrix[i] = 0;
-	}
-
-	/* save state stuff */
-	machine().save().register_postload(save_prepost_delegate(FUNC(mac128_state::mac128_state_load), this));
-}
-
-void mac128_state::mac128_state_load()
-{
-}
-
-VIDEO_START_MEMBER(mac128_state,mac)
-{
 }
 
 #define MAC_MAIN_SCREEN_BUF_OFFSET  (0x5900>>1)
@@ -986,8 +948,6 @@
 
 	PALETTE(config, "palette", palette_device::MONOCHROME_INVERTED);
 
-	MCFG_VIDEO_START_OVERRIDE(mac128_state,mac)
-
 	/* sound hardware */
 	SPEAKER(config, "speaker").front_center();
 	DAC_8BIT_PWM(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.25); // 2 x ls161
@@ -1009,12 +969,12 @@
 	m_via->readpb_handler().set(FUNC(mac128_state::mac_via_in_b));
 	m_via->writepa_handler().set(FUNC(mac128_state::mac_via_out_a));
 	m_via->writepb_handler().set(FUNC(mac128_state::mac_via_out_b));
-	m_via->cb2_handler().set(FUNC(mac128_state::mac_via_out_cb2));
+	m_via->cb2_handler().set(m_mackbd, FUNC(mac_keyboard_port_device::data_w));
 	m_via->irq_handler().set(FUNC(mac128_state::mac_via_irq));
 
-	mackbd_device &mackbd(MACKBD(config, MACKBD_TAG, 0));
-	mackbd.dataout_handler().set(m_via, FUNC(via6522_device::write_cb2));
-	mackbd.clkout_handler().set(FUNC(mac128_state::mac_kbd_clk_in));
+	MAC_KEYBOARD_PORT(config, m_mackbd, mac_keyboard_devices, "pad");
+	m_mackbd->clock_cb().set(m_via, FUNC(via6522_device::write_cb1));
+	m_mackbd->data_cb().set(m_via, FUNC(via6522_device::write_cb2));
 
 	/* internal ram */
 	RAM(config, m_ram);
@@ -1040,6 +1000,8 @@
 	mac512ke(config);
 	m_maincpu->set_addrmap(AS_PROGRAM, &mac128_state::macplus_map);
 
+	m_mackbd->set_default_option("usp");
+
 	scsi_port_device &scsibus(SCSI_PORT(config, "scsi"));
 	scsibus.set_slot_device(1, "harddisk", SCSIHD, DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_6));
 	scsibus.set_slot_device(2, "harddisk", SCSIHD, DEVICE_INPUT_DEFAULTS_NAME(SCSI_ID_5));
@@ -1062,125 +1024,6 @@
 
 	PORT_START("MOUSE2") /* Mouse - Y AXIS */
 	PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y) PORT_SENSITIVITY(100) PORT_KEYDELTA(0) PORT_PLAYER(1)
-
-	/* R Nabet 000531 : pseudo-input ports with keyboard layout */
-	/* we only define US layout for keyboard - international layout is different! */
-	/* note : 16 bits at most per port! */
-
-	/* main keyboard pad */
-
-	PORT_START("KEY0")
-	PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)             PORT_CHAR('a') PORT_CHAR('A')
-	PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)             PORT_CHAR('s') PORT_CHAR('S')
-	PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_D)             PORT_CHAR('d') PORT_CHAR('D')
-	PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)             PORT_CHAR('f') PORT_CHAR('F')
-	PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_H)             PORT_CHAR('h') PORT_CHAR('H')
-	PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_G)             PORT_CHAR('g') PORT_CHAR('G')
-	PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)             PORT_CHAR('z') PORT_CHAR('Z')
-	PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)             PORT_CHAR('x') PORT_CHAR('X')
-	PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)             PORT_CHAR('c') PORT_CHAR('C')
-	PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)             PORT_CHAR('v') PORT_CHAR('V')
-	PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_UNUSED)    /* extra key on ISO : */
-	PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)             PORT_CHAR('b') PORT_CHAR('B')
-	PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)             PORT_CHAR('q') PORT_CHAR('Q')
-	PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)             PORT_CHAR('w') PORT_CHAR('W')
-	PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_E)             PORT_CHAR('e') PORT_CHAR('E')
-	PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_R)             PORT_CHAR('r') PORT_CHAR('R')
-
-	PORT_START("KEY1")
-	PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)             PORT_CHAR('y') PORT_CHAR('Y')
-	PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_T)             PORT_CHAR('t') PORT_CHAR('T')
-	PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)             PORT_CHAR('1') PORT_CHAR('!')
-	PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)             PORT_CHAR('2') PORT_CHAR('@')
-	PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)             PORT_CHAR('3') PORT_CHAR('#')
-	PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)             PORT_CHAR('4') PORT_CHAR('$')
-	PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)             PORT_CHAR('6') PORT_CHAR('^')
-	PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)             PORT_CHAR('5') PORT_CHAR('%')
-	PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS)        PORT_CHAR('=') PORT_CHAR('+')
-	PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)             PORT_CHAR('9') PORT_CHAR('(')
-	PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)             PORT_CHAR('7') PORT_CHAR('&')
-	PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)         PORT_CHAR('-') PORT_CHAR('_')
-	PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)             PORT_CHAR('8') PORT_CHAR('*')
-	PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)             PORT_CHAR('0') PORT_CHAR(')')
-	PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE)    PORT_CHAR(']') PORT_CHAR('}')
-	PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_O)             PORT_CHAR('o') PORT_CHAR('O')
-
-	PORT_START("KEY2")
-	PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_U)             PORT_CHAR('u') PORT_CHAR('U')
-	PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)     PORT_CHAR('[') PORT_CHAR('{')
-	PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_I)             PORT_CHAR('i') PORT_CHAR('I')
-	PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_P)             PORT_CHAR('p') PORT_CHAR('P')
-	PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Return") PORT_CODE(KEYCODE_ENTER) PORT_CHAR('\r')
-	PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_L)             PORT_CHAR('l') PORT_CHAR('L')
-	PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_J)             PORT_CHAR('j') PORT_CHAR('J')
-	PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE)         PORT_CHAR('\'') PORT_CHAR('"')
-	PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_K)             PORT_CHAR('k') PORT_CHAR('K')
-	PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)         PORT_CHAR(';') PORT_CHAR(':')
-	PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH)     PORT_CHAR('\\') PORT_CHAR('|')
-	PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA)         PORT_CHAR(',') PORT_CHAR('<')
-	PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH)         PORT_CHAR('/') PORT_CHAR('?')
-	PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)             PORT_CHAR('n') PORT_CHAR('N')
-	PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)             PORT_CHAR('m') PORT_CHAR('M')
-	PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)          PORT_CHAR('.') PORT_CHAR('>')
-
-	PORT_START("KEY3")
-	PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB)           PORT_CHAR('\t')
-	PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE)         PORT_CHAR(' ')
-	PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE)         PORT_CHAR('`') PORT_CHAR('~')
-	PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE)     PORT_CHAR(8)
-	PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_UNUSED)    /* keyboard Enter : */
-	PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_UNUSED)    /* escape: */
-	PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_UNUSED)    /* ??? */
-	PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Command") PORT_CODE(KEYCODE_RALT)
-	PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
-	PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Caps Lock") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE
-	PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Option") PORT_CODE(KEYCODE_LALT) PORT_CHAR(UCHAR_SHIFT_2)
-	PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_UNUSED)    /* Control: */
-	PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_UNUSED)    /* keypad pseudo-keycode */
-	PORT_BIT(0xE000, IP_ACTIVE_HIGH, IPT_UNUSED)    /* ??? */
-
-	/* keypad */
-	PORT_START("KEY4")
-	PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_DEL_PAD)           PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD))
-	PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ASTERISK)          PORT_CHAR(UCHAR_MAMEKEY(ASTERISK))
-	PORT_BIT(0x0038, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_PLUS_PAD)          PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD))
-	PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Keypad Clear") PORT_CODE(/*KEYCODE_NUMLOCK*/KEYCODE_DEL) PORT_CHAR(UCHAR_MAMEKEY(NUMLOCK))
-	PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(/*CODE_OTHER*/KEYCODE_NUMLOCK) PORT_CHAR(UCHAR_MAMEKEY(EQUALS_PAD))
-	PORT_BIT(0x0E00, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER_PAD)         PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD))
-	PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH_PAD)         PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD))
-	PORT_BIT(0x4000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS_PAD)         PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD))
-	PORT_BIT(0x8000, IP_ACTIVE_HIGH, IPT_UNUSED)
-
-	PORT_START("KEY5")
-	PORT_BIT(0x0001, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x0002, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0_PAD)             PORT_CHAR(UCHAR_MAMEKEY(0_PAD))
-	PORT_BIT(0x0008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1_PAD)             PORT_CHAR(UCHAR_MAMEKEY(1_PAD))
-	PORT_BIT(0x0010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2_PAD)             PORT_CHAR(UCHAR_MAMEKEY(2_PAD))
-	PORT_BIT(0x0020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3_PAD)             PORT_CHAR(UCHAR_MAMEKEY(3_PAD))
-	PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4_PAD)             PORT_CHAR(UCHAR_MAMEKEY(4_PAD))
-	PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5_PAD)             PORT_CHAR(UCHAR_MAMEKEY(5_PAD))
-	PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6_PAD)             PORT_CHAR(UCHAR_MAMEKEY(6_PAD))
-	PORT_BIT(0x0200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7_PAD)             PORT_CHAR(UCHAR_MAMEKEY(7_PAD))
-	PORT_BIT(0x0400, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x0800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD)             PORT_CHAR(UCHAR_MAMEKEY(8_PAD))
-	PORT_BIT(0x1000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD)             PORT_CHAR(UCHAR_MAMEKEY(9_PAD))
-	PORT_BIT(0xE000, IP_ACTIVE_HIGH, IPT_UNUSED)
-
-	/* Arrow keys */
-	PORT_START("KEY6")
-	PORT_BIT(0x0003, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x0004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Right Arrow") PORT_CODE(KEYCODE_RIGHT)    PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
-	PORT_BIT(0x0038, IP_ACTIVE_HIGH, IPT_UNUSED )
-	PORT_BIT(0x0040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Left Arrow") PORT_CODE(KEYCODE_LEFT)      PORT_CHAR(UCHAR_MAMEKEY(LEFT))
-	PORT_BIT(0x0080, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x0100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Down Arrow") PORT_CODE(KEYCODE_DOWN)      PORT_CHAR(UCHAR_MAMEKEY(DOWN))
-	PORT_BIT(0x1E00, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x2000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Up Arrow") PORT_CODE(KEYCODE_UP)          PORT_CHAR(UCHAR_MAMEKEY(UP))
-	PORT_BIT(0xC000, IP_ACTIVE_HIGH, IPT_UNUSED)
 INPUT_PORTS_END
 
 /***************************************************************************
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mac.cpp mame-0.224+dfsg.1/src/mame/drivers/mac.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mac.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mac.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -47,6 +47,7 @@
 
 #include "emu.h"
 #include "includes/mac.h"
+
 #include "cpu/m68000/m68000.h"
 #include "cpu/powerpc/ppc.h"
 #include "cpu/m6805/m6805.h"
@@ -929,17 +930,6 @@
 	m_scc->intrq_callback().set(FUNC(mac_state::set_scc_interrupt));
 }
 
-void mac_state::add_mackbd(machine_config &config)
-{
-#ifdef MAC_USE_EMULATED_KBD
-	MACKBD(config, m_mackbd, 0);
-	m_mackbd->dataout_handler().set(m_via, FUNC(via6522_device::write_cb2));
-	m_mackbd->clkout_handler().set(FUNC(mac_state::mac_kbd_clk_in));
-#else
-	MACKBD(config, m_mackbd, 0);
-#endif
-}
-
 void mac_state::add_scsi(machine_config &config, bool cdrom)
 {
 	scsi_port_device &scsibus(SCSI_PORT(config, "scsi"));
@@ -1067,7 +1057,6 @@
 	m_via1->readpb_handler().set(FUNC(mac_state::mac_via_in_b));
 	m_via1->writepa_handler().set(FUNC(mac_state::mac_via_out_a));
 	m_via1->writepb_handler().set(FUNC(mac_state::mac_via_out_b));
-	m_via1->cb2_handler().set(FUNC(mac_state::mac_via_out_cb2));
 	m_via1->irq_handler().set(FUNC(mac_state::mac_via_irq));
 
 	RAM(config, m_ram);
@@ -1077,7 +1066,6 @@
 void mac_state::mac512ke(machine_config &config)
 {
 	mac512ke_base(config);
-	add_mackbd(config);
 }
 
 void mac_state::add_macplus_additions(machine_config &config)
@@ -1135,7 +1123,6 @@
 {
 	mac512ke_base(config);
 	add_macplus_additions(config);
-	add_mackbd(config);
 }
 
 void mac_state::macse(machine_config &config)
@@ -1195,7 +1182,6 @@
 	m_via1->readpb_handler().set(FUNC(mac_state::mac_via_in_b_pmu));
 	m_via1->writepa_handler().set(FUNC(mac_state::mac_via_out_a_pmu));
 	m_via1->writepb_handler().set(FUNC(mac_state::mac_via_out_b_pmu));
-	m_via1->cb2_handler().set(FUNC(mac_state::mac_via_out_cb2));
 	m_via1->irq_handler().set(FUNC(mac_state::mac_via_irq));
 
 	RAM(config, m_ram);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/magicard.cpp mame-0.224+dfsg.1/src/mame/drivers/magicard.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/magicard.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/magicard.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,16 +10,22 @@
 
   Games running on this hardware:
 
-  * Magic Card (set 1),        Impera, 199?.
-  * Magic Card (set 2),        Impera, 199?.
-  * Magic Card (set 3),        Impera, 199?.
-  * Magic Card Export 94,      Impera, 1994.
-  * Magic Card Jackpot (4.01), Impera, 1998.
-  * Magic Lotto Export (5.03), Impera, 2001.
-  * Hot Slots (6.00),          Impera, 2002.
-  * Quingo Export (5.00),      Impera, 1999.
-  * Bel Slots Export (5.01),   Impera, 1999.
-  * Big Deal Belgien (5.04),   Impera, 2001.
+  * Magic Card (set 1),                         Impera, 199?.
+  * Magic Card (set 2),                         Impera, 199?.
+  * Magic Card (set 3),                         Impera, 199?.
+  * Magic Card Export 94,                       Impera, 1994.
+  * Magic Export (V.211A),                      Impera, 1994.
+  * Magic Card Jackpot (4.01),                  Impera, 1998.
+  * Magic Card - Wien (Sicherheitsversion 1.2), Impera, 1993.
+  * Magic Lotto Export (5.03),                  Impera, 2001.
+  * Hot Slots (6.00),                           Impera, 2002.
+  * Quingo Export (5.00),                       Impera, 1999.
+  * Bel Slots Export (5.01),                    Impera, 1999.
+  * Big Deal Belgien (5.04),                    Impera, 2001.
+  * Puzzle Me!,                                 Impera, 199?.
+  * unknown 'TE06',                             Impera, 199?.
+  * Lucky 7 (Impera),                           Impera, 199?.
+
 
 *******************************************************************************
 
@@ -960,7 +966,6 @@
   XTAL: 3x unknown frequency.
 
 */
-
 ROM_START( magicardf )
 	ROM_REGION( 0x80000, "maincpu", 0 )  // 68070 Code & GFX
 	ROM_LOAD16_WORD_SWAP( "27c4002.ic21", 0x00000, 0x80000, CRC(098258c0) SHA1(5f5dfe376c980ec88e68b324ba912022091e2426) )
@@ -972,6 +977,20 @@
 	ROM_LOAD("24lc02b.ic26",    0x0000, 0x0100, CRC(47c8b137) SHA1(6581e1f4ea65c833fa566c21c76dbe741af488f4) )
 ROM_END
 
+/*
+
+  Magic Card - Wien
+  Sicherheitsversion 1.2
+
+*/
+ROM_START( magicardw )
+	ROM_REGION( 0x80000, "maincpu", 0 )  // 68070 Code & GFX
+	ROM_LOAD16_WORD_SWAP( "am27c4096.bin", 0x00000, 0x80000, CRC(d9e2a4ec) SHA1(b3000ded242fa25709c90b9b2541c9d1d5cabebb) )
+
+	ROM_REGION( 0x0200, "pic16c54", 0 ) // protected
+	ROM_LOAD("pic16c54a.bin",   0x0000, 0x0200, NO_DUMP )
+ROM_END
+
 
 ROM_START( magicle )
 	ROM_REGION( 0x80000, "maincpu", 0 ) /* 68070 Code & GFX */
@@ -1068,6 +1087,47 @@
 	ROM_LOAD16_WORD_SWAP("bel_slots_exp_24c04a.bin", 0x0000, 0x0200, BAD_DUMP CRC(d5e82b49) SHA1(7dbdf7d539cbd59a3ac546b6f50861c4958abb3a) ) // all AA & 55
 ROM_END
 
+/*
+  Puzzle Me!
+  Impera.
+
+  vectors are wrong.
+*/
+ROM_START( puzzleme )
+	ROM_REGION( 0x80000, "maincpu", 0 ) /* 68070 Code & GFX */
+	ROM_LOAD16_WORD_SWAP( "27c4002.ic21", 0x00000, 0x80000, CRC(cd3bc5a9) SHA1(682f62eba454f4f00212b2a8dabb05d6747f22fd) )
+
+	ROM_REGION( 0x0200, "pic16c54", 0 ) /* protected */
+	ROM_LOAD("pic16c54.ic29",   0x0000, 0x0200, NO_DUMP )
+
+	ROM_REGION( 0x0100, "sereeprom", 0 ) /* Serial EPROM */
+	ROM_LOAD("x24c02p.ic26",    0x0000, 0x0100, CRC(bc940f53) SHA1(6b870019752ba5c446a5ad5155e4a81dfbf6e523) )
+ROM_END
+
+
+/*
+
+  Unknown TE06
+
+*/
+ROM_START( unkte06 )
+	ROM_REGION( 0x80000, "maincpu", 0 )  // 68070 Code & GFX
+	ROM_LOAD16_WORD_SWAP( "m27c4002.bin", 0x00000, 0x80000, CRC(229a504f) SHA1(8033e9b4cb55f2364bf4606375ef9ac05fc715fe) )
+
+	ROM_REGION( 0x0200, "pic16c54", 0 ) // protected
+	ROM_LOAD("pic16c54.bin",   0x0000, 0x0200, NO_DUMP )
+ROM_END
+
+/*
+  Lucky 7
+  Impera
+
+*/
+ROM_START( lucky7i )
+	ROM_REGION( 0x80000, "maincpu", 0 )  // 68070 Code & GFX
+	ROM_LOAD16_WORD_SWAP( "27c210.6", 0x00000, 0x20000, CRC(3a99e9f3) SHA1(b9b533378ce514662cbd85a37ee138a2df760ed4) )
+	ROM_LOAD16_WORD_SWAP( "27c210.5", 0x20000, 0x20000, CRC(b4da8856) SHA1(a33158d75047561fa9674ceb6b22cc63b5b49aed) )
+ROM_END
 
 
 /*************************
@@ -1084,16 +1144,20 @@
 *      Game Drivers      *
 *************************/
 
-//    YEAR  NAME       PARENT    MACHINE   INPUT     STATE           INIT           ROT   COMPANY   FULLNAME                     FLAGS
+//    YEAR  NAME       PARENT    MACHINE   INPUT     STATE           INIT           ROT    COMPANY   FULLNAME                                     FLAGS
 
-GAME( 199?, magicard,  0,        magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Card (set 1)",        MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 199?, magicarda, magicard, magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Card (set 2)",        MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 199?, magicardb, magicard, magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Card (set 3)",        MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 1994, magicarde, magicard, magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Card Export 94",      MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 1994, magicardf, magicard, magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Export (V.211A)",     MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 1998, magicardj, magicard, magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Card Jackpot (4.01)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 2001, magicle,   0,        magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Lotto Export (5.03)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 2002, hotslots,  0,        hotslots, magicard, magicard_state, init_magicard, ROT0, "Impera", "Hot Slots (6.00)",          MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 1999, quingo,    0,        hotslots, magicard, magicard_state, init_magicard, ROT0, "Impera", "Quingo Export (5.00)",      MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 1999, belslots,  0,        hotslots, magicard, magicard_state, init_magicard, ROT0, "Impera", "Bel Slots Export (5.01)",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
-GAME( 2001, bigdeal0,  0,        hotslots, magicard, magicard_state, init_magicard, ROT0, "Impera", "Big Deal Belgien (5.04)",   MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 199?, magicard,  0,        magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Card (set 1)",                         MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 199?, magicarda, magicard, magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Card (set 2)",                         MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 199?, magicardb, magicard, magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Card (set 3)",                         MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1994, magicarde, magicard, magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Card Export 94",                       MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1994, magicardf, magicard, magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Export (V.211A)",                      MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1998, magicardj, magicard, magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Card Jackpot (4.01)",                  MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1993, magicardw, magicard, magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Card - Wien (Sicherheitsversion 1.2)", MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 2001, magicle,   0,        magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Magic Lotto Export (5.03)",                  MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 2002, hotslots,  0,        hotslots, magicard, magicard_state, init_magicard, ROT0, "Impera", "Hot Slots (6.00)",                           MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1999, quingo,    0,        hotslots, magicard, magicard_state, init_magicard, ROT0, "Impera", "Quingo Export (5.00)",                       MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 1999, belslots,  0,        hotslots, magicard, magicard_state, init_magicard, ROT0, "Impera", "Bel Slots Export (5.01)",                    MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 2001, bigdeal0,  0,        hotslots, magicard, magicard_state, init_magicard, ROT0, "Impera", "Big Deal Belgien (5.04)",                    MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 199?, puzzleme,  0,        magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Puzzle Me!",                                 MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 199?, unkte06,   0,        magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "unknown 'TE06'",                             MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
+GAME( 199?, lucky7i,   0,        magicard, magicard, magicard_state, init_magicard, ROT0, "Impera", "Lucky 7 (Impera)",                           MACHINE_NO_SOUND | MACHINE_NOT_WORKING )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mastboyo.cpp mame-0.224+dfsg.1/src/mame/drivers/mastboyo.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mastboyo.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mastboyo.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -24,8 +24,7 @@
 public:
 	mastboyo_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
-		m_fgram(*this, "fgram"),
-		m_fgram2(*this, "fgram2"),
+		m_fgram(*this, "fgram.%u", 0U),
 		m_maincpu(*this, "maincpu"),
 		m_gfxdecode(*this, "gfxdecode"),
 		m_bank1(*this, "bank1"),
@@ -42,8 +41,7 @@
 private:
 	tilemap_t *m_fg_tilemap;
 
-	required_shared_ptr<uint8_t> m_fgram;
-	required_shared_ptr<uint8_t> m_fgram2;
+	required_shared_ptr_array<uint8_t, 2> m_fgram;
 	required_device<cpu_device> m_maincpu;
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_memory_bank m_bank1;
@@ -53,19 +51,18 @@
 	void mastboyo_map(address_map &map);
 	void mastboyo_portmap(address_map &map);
 
-	void fgram_w(offs_t offset, uint8_t data);
-	void fgram2_w(offs_t offset, uint8_t data);
+	template<uint8_t Which> void fgram_w(offs_t offset, uint8_t data);
 	void rombank_w(uint8_t data);
 	TILE_GET_INFO_MEMBER(get_fg_tile_info);
-	uint32_t screen_update_mastboyo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void mastboyo_palette(palette_device &palette) const;
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	void palette(palette_device &palette) const;
 };
 
 
 TILE_GET_INFO_MEMBER(mastboyo_state::get_fg_tile_info)
 {
-	int code = m_fgram[tile_index];
-	int attr = m_fgram2[tile_index];
+	int code = m_fgram[0][tile_index];
+	int attr = m_fgram[1][tile_index];
 	tileinfo.set(0,
 			code,
 			attr & 0x0f,
@@ -77,25 +74,20 @@
 	m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(mastboyo_state::get_fg_tile_info)), TILEMAP_SCAN_ROWS, 8, 8, 32, 32);
 }
 
-uint32_t mastboyo_state::screen_update_mastboyo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t mastboyo_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
 	return 0;
 }
 
+template<uint8_t Which>
 void mastboyo_state::fgram_w(offs_t offset, uint8_t data)
 {
-	m_fgram[offset] = data;
+	m_fgram[Which][offset] = data;
 	m_fg_tilemap->mark_tile_dirty(offset);
 }
 
-void mastboyo_state::fgram2_w(offs_t offset, uint8_t data)
-{
-	m_fgram2[offset] = data;
-	m_fg_tilemap->mark_tile_dirty(offset);
-}
-
-void mastboyo_state::mastboyo_palette(palette_device &palette) const
+void mastboyo_state::palette(palette_device &palette) const
 {
 	for (int i = 0; i < palette.entries(); i++)
 	{
@@ -119,11 +111,11 @@
 {
 	map(0x0000, 0x3fff).rom();
 	map(0x4000, 0x47ff).ram().share("nvram");
-	map(0x5000, 0x53ff).ram().w(FUNC(mastboyo_state::fgram_w)).share("fgram");
-	map(0x5400, 0x57ff).ram().w(FUNC(mastboyo_state::fgram2_w)).share("fgram2");
+	map(0x5000, 0x53ff).ram().w(FUNC(mastboyo_state::fgram_w<0>)).share(m_fgram[0]);
+	map(0x5400, 0x57ff).ram().w(FUNC(mastboyo_state::fgram_w<1>)).share(m_fgram[1]);
 	map(0x6000, 0x6000).w(FUNC(mastboyo_state::rombank_w));
 //  map(0x7000, 0x7000).portr("UNK"); // possible watchdog? or IRQ ack?
-	map(0x8000, 0xffff).bankr("bank1");
+	map(0x8000, 0xffff).bankr(m_bank1);
 }
 
 void mastboyo_state::mastboyo_portmap(address_map &map)
@@ -213,12 +205,12 @@
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
 	screen.set_size(256, 256);
 	screen.set_visarea(0, 256-1, 2*8, 256-2*8-1);
-	screen.set_screen_update(FUNC(mastboyo_state::screen_update_mastboyo));
+	screen.set_screen_update(FUNC(mastboyo_state::screen_update));
 	screen.set_palette("palette");
 
 	GFXDECODE(config, m_gfxdecode, "palette", gfx_mastboyo);
 
-	PALETTE(config, "palette", FUNC(mastboyo_state::mastboyo_palette), 256);
+	PALETTE(config, "palette", FUNC(mastboyo_state::palette), 256);
 
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
@@ -321,6 +313,30 @@
 	ROM_LOAD( "l_82s129.ic40", 0x000, 0x100, CRC(4d061216) SHA1(1abf9320da75a3fd23c6bdbcc4088d18e133c4e5) )
 ROM_END
 
-GAME( 1987, mastboyo,  0,        mastboyo, mastboyo, mastboyo_state, empty_init, ROT0, "Gaelco (Covielsa license)",    "Master Boy (1987, Z80 hardware, Covielsa, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, mastboyoa, mastboyo, mastboyo, mastboyo, mastboyo_state, empty_init, ROT0, "Gaelco (Covielsa license)",    "Master Boy (1987, Z80 hardware, Covielsa, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, mastboyob, mastboyo, mastboyo, mastboyo, mastboyo_state, empty_init, ROT0, "Gaelco (Ichi-Funtel license)", "Master Boy (1987, Z80 hardware, Ichi-Funtel)", MACHINE_SUPPORTS_SAVE )
+ROM_START( mastboyoc ) // PCB marked 'MMV-1 FABRICADO POR GAELCO'
+	ROM_REGION( 0x4000, "maincpu", 0 )
+	ROM_LOAD( "ic14-mb-pt-27128.bin", 0x0000, 0x4000, CRC(3a42c74d) SHA1(64791b5a48e53d07275076077f3860799992c005) ) // basically the same as mastboyoa but with different phone number
+
+	ROM_REGION( 0x4000, "gfx1", 0 )
+	ROM_LOAD( "ic36-fij-27128.bin", 0x0000, 0x4000, CRC(bdd0f821) SHA1(63f607bccf1eded92531b2a10605d0578d371f77) ) // same as mastboyob
+
+	ROM_REGION( 0x80000, "questions", ROMREGION_ERASEFF )
+	ROM_LOAD( "ic13-mb-1-27256.bin", 0x40000, 0x08000, CRC(efb4b2f9) SHA1(c68f7d83549b554d25f7404a758f48f962622a2d) ) // same as the parent
+	ROM_LOAD( "ic12-mb-2-27256.bin", 0x48000, 0x08000, CRC(f2611186) SHA1(05860fecc23014c39cb28762763e94bc91412b34) ) // same as the parent
+	ROM_LOAD( "ic11-mb-3-27256.bin", 0x50000, 0x08000, CRC(b92ffd4f) SHA1(34431d6771e58f2ec083756f07e8b2a02bdb0e5a) ) // same as the parent
+	ROM_LOAD( "ic10-mb-4-27256.bin", 0x58000, 0x08000, CRC(266e7d37) SHA1(39b5e4ff4475393126a97c8b51980bfc1b7b2627) ) // same as the parent
+	ROM_LOAD( "ic9-mb-5-27256.bin",  0x60000, 0x08000, CRC(40b07eeb) SHA1(93f62e0a2a330f7ff1041eaa7cba3ef42121b1a8) ) // same as the parent
+	ROM_LOAD( "ic8-mb-6-27256.bin",  0x68000, 0x08000, CRC(3a214efd) SHA1(752fe28a70dc01b5d4ec38c4751e609c690eed71) ) // same as the parent
+
+	ROM_REGION( 0x100, "proms", 0 ) // timing or memory mapping?
+	ROM_LOAD( "d_82s129.ic23", 0x000, 0x100, CRC(d5fd2dfd) SHA1(66e3afa9e73507db0647d125c0be992b27d08adc) )
+
+	ROM_REGION( 0x200, "palette", 0 )
+	ROM_LOAD( "h_82s129.ic39", 0x100, 0x100, CRC(8e965fc3) SHA1(b52c8e505438937c7a5d3e1393d54f0ad0425e78) )
+	ROM_LOAD( "l_82s129.ic40", 0x000, 0x100, CRC(4d061216) SHA1(1abf9320da75a3fd23c6bdbcc4088d18e133c4e5) )
+ROM_END
+
+GAME( 1987, mastboyo,  0,        mastboyo, mastboyo, mastboyo_state, empty_init, ROT0, "Gaelco (Covielsa license)",    "Master Boy (1987, Z80 hardware, Covielsa, set 1)",    MACHINE_SUPPORTS_SAVE )
+GAME( 1987, mastboyoa, mastboyo, mastboyo, mastboyo, mastboyo_state, empty_init, ROT0, "Gaelco (Covielsa license)",    "Master Boy (1987, Z80 hardware, Covielsa, set 2)",    MACHINE_SUPPORTS_SAVE )
+GAME( 1987, mastboyob, mastboyo, mastboyo, mastboyo, mastboyo_state, empty_init, ROT0, "Gaelco (Ichi-Funtel license)", "Master Boy (1987, Z80 hardware, Ichi-Funtel, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, mastboyoc, mastboyo, mastboyo, mastboyo, mastboyo_state, empty_init, ROT0, "Gaelco (Ichi-Funtel license)", "Master Boy (1987, Z80 hardware, Ichi-Funtel, set 2)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/maygay1b.cpp mame-0.224+dfsg.1/src/mame/drivers/maygay1b.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/maygay1b.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/maygay1b.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -721,7 +721,7 @@
 
 	MC68681(config, m_duart68681, M1_DUART_CLOCK);
 	m_duart68681->irq_cb().set(FUNC(maygay1b_state::duart_irq_handler));
-	m_duart68681->inport_cb().set(FUNC(maygay1b_state::m1_duart_r));;
+	m_duart68681->inport_cb().set(FUNC(maygay1b_state::m1_duart_r));
 
 	pia6821_device &pia(PIA6821(config, "pia", 0));
 	pia.writepa_handler().set(FUNC(maygay1b_state::m1_pia_porta_w));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/maygayv1.cpp mame-0.224+dfsg.1/src/mame/drivers/maygayv1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/maygayv1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/maygayv1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -918,7 +918,7 @@
 
 	MC68681(config, m_duart68681, DUART_CLOCK);
 	m_duart68681->irq_cb().set(FUNC(maygayv1_state::duart_irq_handler));
-	m_duart68681->a_tx_cb().set(FUNC(maygayv1_state::duart_txa));;
+	m_duart68681->a_tx_cb().set(FUNC(maygayv1_state::duart_txa));
 
 	i8279_device &kbdc(I8279(config, "i8279", MASTER_CLOCK/4));         // unknown clock
 	kbdc.out_sl_callback().set(FUNC(maygayv1_state::strobe_w));         // scan SL lines
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mc8030.cpp mame-0.224+dfsg.1/src/mame/drivers/mc8030.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mc8030.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mc8030.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -34,7 +34,6 @@
 public:
 	mc8030_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-		, m_p_videoram(*this, "vram")
 		, m_maincpu(*this, "maincpu")
 	{ }
 
@@ -52,12 +51,13 @@
 	uint8_t asp_port_b_r();
 	void asp_port_a_w(uint8_t data);
 	void asp_port_b_w(uint8_t data);
+	void machine_start() override;
 	uint32_t screen_update_mc8030(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
 
-	required_region_ptr<uint8_t> m_p_videoram;
+	std::unique_ptr<u8[]> m_vram;
 	required_device<z80_device> m_maincpu;
 };
 
@@ -113,9 +113,9 @@
 	uint16_t addr = ((offset & 0xff00) >> 2) | ((offset & 0x08) << 2) | (data >> 3);
 	uint8_t c = 1 << (data & 7);
 	if (BIT(offset, 0))
-		m_p_videoram[addr] |= c;
+		m_vram[addr] |= c;
 	else
-		m_p_videoram[addr] &= ~c;
+		m_vram[addr] &= ~c;
 }
 
 void mc8030_state::eprom_prog_w(uint8_t data)
@@ -154,7 +154,7 @@
 		{
 			for (x = ma; x < ma + 64; x++)
 			{
-				gfx = m_p_videoram[x^0x3fff];
+				gfx = m_vram[x^0x3fff];
 
 				/* Display a scanline of a character */
 				*p++ = BIT(gfx, 7);
@@ -183,6 +183,11 @@
 	{ nullptr }
 };
 
+void mc8030_state::machine_start()
+{
+	m_vram = make_unique_clear<u8[]>(0x4000);
+	save_pointer(NAME(m_vram), 0x4000);
+}
 
 void mc8030_state::mc8030(machine_config &config)
 {
@@ -245,7 +250,7 @@
 
 /* ROM definition */
 ROM_START( mc8030 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
 	ROM_LOAD( "zve_1.rom", 0x0000, 0x0800, CRC(31ec0159) SHA1(a97ea9eb733c462e77d625a7942134e45d911c0a))
 	ROM_LOAD( "zve_2.rom", 0x0800, 0x0800, CRC(5104983d) SHA1(7516274904042f4fc6813aa8b2a75c0a64f9b937))
 	ROM_LOAD( "zve_3.rom", 0x1000, 0x0800, CRC(4bcfd727) SHA1(d296e587098e70270ad60db8edaa685af368b849))
@@ -253,8 +258,6 @@
 	ROM_LOAD( "spe_1.rom", 0x2000, 0x0400, CRC(826f609c) SHA1(e77ff6c180f5a6d7756d076173ae264a0e26f066))
 	ROM_LOAD( "spe_2.rom", 0x2400, 0x0400, CRC(98320040) SHA1(6baf87e196f1ccdf44912deafa6042becbfb0679))
 
-	ROM_REGION( 0x4000, "vram", ROMREGION_ERASE00 )
-
 	ROM_REGION( 0x4000, "user1", 0 )
 	// marked as "80.3x"
 	ROM_LOAD( "mc80.3-x-2c00-c63c.bin", 0x2c00, 0x0400, CRC(469be754) SHA1(a7fea257a1c0970349f75504c0870a2649b50303) )
@@ -293,4 +296,4 @@
 /* Driver */
 
 //    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT        COMPANY                FULLNAME       FLAGS
-COMP( 198?, mc8030, 0,      0,      mc8030,  mc8030, mc8030_state, empty_init, "VEB Elektronik Gera", "MC-80.30/31", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | ORIENTATION_FLIP_X )
+COMP( 198?, mc8030, 0,      0,      mc8030,  mc8030, mc8030_state, empty_init, "VEB Elektronik Gera", "MC-80.30/31", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | ORIENTATION_FLIP_X | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mccpm.cpp mame-0.224+dfsg.1/src/mame/drivers/mccpm.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mccpm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mccpm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,27 +2,27 @@
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
-        mc-CP/M-Computer
+mc-CP/M-Computer
 
-        31/08/2010 Skeleton driver.
-        18/11/2010 Connected to a terminal
-        28/09/2011 Added more bioses
+2010-08-31 Skeleton driver.
+2010-11-18 Connected to a terminal
+2011-09-28 Added more bioses
 
 Some Monitor commands (varies between versions):
 
-B - boot a floppy (^N to regain control)
+B - lock keyboard (^N to regain control)
 E - prints a number
-I - Select boot drive/set parameters
+I - Select boot drive/set parameters - then it attempts to boot
 K,O - display version header
 N - newline
 Z - print 'EFFF'
 
 URL for v3.4: http://www.hanshehl.de/mc-prog.htm (German language)
 
-unknown I/O ports (my guess)
-30 - fdc (1st drive)
-40 - fdc (2nd drive)
+Although the manual specifies ports 40-44 for the FDC, all bios versions
+support it at 30-34 as well.
 
+No software to test with, so we'll never know if the FDC works.
 
 ****************************************************************************/
 
@@ -31,7 +31,10 @@
 #include "machine/z80pio.h"
 #include "machine/z80sio.h"
 #include "machine/clock.h"
+#include "machine/bankdev.h"
+#include "machine/wd_fdc.h"
 #include "bus/rs232/rs232.h"
+#include "imagedev/floppy.h"
 
 
 class mccpm_state : public driver_device
@@ -40,7 +43,10 @@
 	mccpm_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_ram(*this, "mainram")
+		, m_bank(*this, "bankdev_map")
+		, m_fdc (*this, "fdc")
+		, m_floppy0(*this, "fdc:0")
+		, m_floppy1(*this, "fdc:1")
 	{ }
 
 	void mccpm(machine_config &config);
@@ -48,22 +54,43 @@
 private:
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
-
-	virtual void machine_reset() override;
+	void bankdev_map(address_map &map);
+	void port44_w(u8);
+	u8 port44_r();
+	void fdc_irq(bool);
+	u8 m_fdc_status;
+	floppy_image_device *m_floppy;
+	void machine_reset() override;
+	void machine_start() override;
 	required_device<cpu_device> m_maincpu;
-	required_shared_ptr<u8> m_ram;
+	required_device<address_map_bank_device> m_bank;
+	required_device<fd1797_device> m_fdc;
+	required_device<floppy_connector> m_floppy0;
+	required_device<floppy_connector> m_floppy1;
 };
 
 
+void mccpm_state::bankdev_map(address_map &map)
+{
+	// bank 0
+	map(0x0000, 0x3fff).rom().region("maincpu", 0);
+	map(0x4000, 0x7fff).lr8(NAME([this] () { if (!machine().side_effects_disabled()) m_bank->set_bank(1); return 0xff; }));
+	// bank 1
+	map(0x8000, 0xffff).ram();
+}
+
 void mccpm_state::mem_map(address_map &map)
 {
-	map(0x0000, 0xffff).ram().share("mainram");
+	map(0x0000, 0x7fff).m(m_bank, FUNC(address_map_bank_device::amap8));
+	map(0x8000, 0xffff).ram();
 }
 
 void mccpm_state::io_map(address_map &map)
 {
 	map.unmap_value_high();
 	map.global_mask(0xff);
+	map(0x40, 0x43).rw(m_fdc, FUNC(fd1797_device::read), FUNC(fd1797_device::write));
+	map(0x44, 0x44).rw(FUNC(mccpm_state::port44_r), FUNC(mccpm_state::port44_w));
 	map(0xf0, 0xf3).rw("sio", FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
 	map(0xf4, 0xf7).rw("pio", FUNC(z80pio_device::read_alt), FUNC(z80pio_device::write_alt));
 }
@@ -72,11 +99,58 @@
 static INPUT_PORTS_START( mccpm )
 INPUT_PORTS_END
 
+void mccpm_state::port44_w(u8 data)
+{
+	m_floppy = nullptr;
+	if (BIT(data, 1))
+		m_floppy = m_floppy1->get_device();
+	else
+	if (BIT(data, 0))
+		m_floppy = m_floppy0->get_device();
+
+	m_fdc->set_floppy(m_floppy);
+
+	if (m_floppy)
+	{
+		m_floppy->mon_w(0);
+		m_fdc->dden_w(!BIT(data, 4));   // 0 = FM; 1 = MFM
+	}
+	// side select comes from fdc pin 25
+	m_fdc->set_unscaled_clock(BIT(data, 5) ? 1e6 : 2e6);  // 13 or 20cm clock select
+	m_maincpu->set_input_line_vector(0, 0xD7 ); // Z80 - jump to 0x0010 upon interrupt acknowledge IM 0 (or should it say 0x10?)
+}
+
+u8 mccpm_state::port44_r()
+{
+	// bit 4 is floppy hld_r, not yet emulated.
+	// So we assume the head is loaded if the drive is selected.
+	if (m_floppy)
+		return m_fdc_status | 4;
+	else
+		return m_fdc_status;
+}
+
+void mccpm_state::fdc_irq(bool state)
+{
+	m_fdc_status = (m_fdc_status & 0xfd) | (state ? 2 : 0);
+	m_maincpu->set_input_line(0, state ? ASSERT_LINE : CLEAR_LINE);
+}
 
 void mccpm_state::machine_reset()
 {
-	uint8_t* bios = memregion("maincpu")->base();
-	memcpy(m_ram, bios, 0x1000);
+	m_bank->set_bank(0);
+	m_fdc_status = 0xfb;
+	m_floppy = nullptr;
+}
+
+void mccpm_state::machine_start()
+{
+	save_item(NAME(m_fdc_status));;
+}
+
+static void flop_types(device_slot_interface &device)
+{
+	device.option_add("flop", FLOPPY_525_QD);
 }
 
 void mccpm_state::mccpm(machine_config &config)
@@ -86,11 +160,19 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &mccpm_state::mem_map);
 	m_maincpu->set_addrmap(AS_IO, &mccpm_state::io_map);
 
+	ADDRESS_MAP_BANK(config, m_bank, 0);
+	m_bank->set_addrmap(0, &mccpm_state::bankdev_map);
+	m_bank->set_data_width(8);
+	m_bank->set_addr_width(16);
+	m_bank->set_stride(0x8000);
+
 	/* Devices */
-	clock_device &uart_clock(CLOCK(config, "uart_clock", 153600));
+	// clock supplied by pair of HD4702 baud rate generators
+	clock_device &uart_clock(CLOCK(config, "uart_clock", 153'600));
 	uart_clock.signal_handler().set("sio", FUNC(z80sio_device::txca_w));
 	uart_clock.signal_handler().append("sio", FUNC(z80sio_device::rxca_w));
 
+	// Ch A: terminal; Ch B: printer
 	z80sio_device& sio(Z80SIO(config, "sio", XTAL(4'000'000)));
 	sio.out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
 	sio.out_txda_callback().set("rs232", FUNC(rs232_port_device::write_txd));
@@ -102,11 +184,17 @@
 	rs232.cts_handler().set("sio", FUNC(z80sio_device::ctsa_w));
 
 	Z80PIO(config, "pio", XTAL(4'000'000));
+
+	FD1797(config, m_fdc, 8_MHz_XTAL / 8);
+	m_fdc->intrq_wr_callback().set([this] (bool state) { mccpm_state::fdc_irq(state); });
+	m_fdc->drq_wr_callback().set([this] (u8 state) { m_fdc_status = (m_fdc_status & 0xfe) | (state ? 1 : 0); });
+	FLOPPY_CONNECTOR(config, "fdc:0", flop_types, "flop", floppy_image_device::default_floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fdc:1", flop_types, "flop", floppy_image_device::default_floppy_formats).enable_sound(true);
 }
 
 /* ROM definition */
 ROM_START( mccpm )
-	ROM_REGION( 0x1000, "maincpu", 0 )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
 	ROM_SYSTEM_BIOS(0, "v36", "V3.6")
 	ROMX_LOAD("mon36.j15",   0x0000, 0x1000, CRC(9c441537) SHA1(f95bad52d9392b8fc9d9b8779b7b861672a0022b), ROM_BIOS(0))
 	ROM_SYSTEM_BIOS(1, "v34", "V3.4")
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mcr68.cpp mame-0.224+dfsg.1/src/mame/drivers/mcr68.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mcr68.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mcr68.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -179,9 +179,24 @@
 
 void mcr68_state::archrivl_control_w(offs_t offset, uint16_t data, uint16_t mem_mask)
 {
+	// the arch rivals schematics are terrible here, but some information can be gathered from pages 30 and 42
+	// the bits here seem to have the following functions:
+	// code:   D0-D7 go to sound board pins 3-10
+	// code:   D8 goes to sound board pin 13 (/STB)
+	// guess:  D9 goes to sound board pin 12 (/STBR) ? (/STBR is usually an output, not an input?)
+	// code:   D10 goes to sound board pin 18 (/RESET)
+	// guess:  D11 is n/c (may control the SPARE pin on J3 pin 13)
+	// guess:  D12 is n/c
+	// schems: D13 goes to coin meter 1 (second meter)
+	// schems: D14 is SCREENFLIP
+	// schems: D15 goes to coin meter 0 (first meter)
 	COMBINE_DATA(&m_control_word);
-	m_cvsd_sound->reset_write(~m_control_word & 0x0400);
-	m_cvsd_sound->write(m_control_word & 0x3ff);
+	m_bg->resetq_w(BIT(m_control_word, 10));
+	m_bg->data_w(m_control_word & 0xff);
+	m_bg->ctrl_w(BIT(m_control_word, 8));
+	m_bg->extra_w(BIT(m_control_word, 9));
+	///TODO: coin meters; do the games even use these?
+	///TODO: flipscreen; this is actually quite complex, involving many PLDs/pals
 }
 
 
@@ -602,7 +617,7 @@
 	PORT_START("IN1")
 	PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED )  /* player 1/2 joysticks go here */
 
-	PORT_START("DSW")   /* There are actually 10 switches, but where do 9 & 10 map to?? (10=Freeze Screen) */
+	PORT_START("DSW")   /* There are actually 10 switches; 9 is unconnected, 10 (freeze) connects to a PAL and disables the watchdog */
 	PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Game_Time ) )    PORT_DIPLOCATION("SW1:1,2")
 	PORT_DIPSETTING(      0x0003, "Preset Time" )
 	PORT_DIPSETTING(      0x0002, "Preset + 10sec" )
@@ -677,7 +692,7 @@
 	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
 	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
 
-	PORT_START("DSW")   /* There are actually 10 switches, but where do 9 & 10 map to?? (10=Freeze Screen) */
+	PORT_START("DSW")   /* There are actually 10 switches; 9 is unconnected, 10 (freeze) connects to a PAL and disables the watchdog on the non-bootleg hardware, unclear here */
 	PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Game_Time ) )    PORT_DIPLOCATION("SW1:1,2")
 	PORT_DIPSETTING(      0x0003, "Preset Time" )
 	PORT_DIPSETTING(      0x0002, "Preset + 10sec" )
@@ -732,7 +747,7 @@
 	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )  /* player 1 joystick goes here */
 
-	PORT_START("DSW")   /* There are actually 10 switches, but where do 9 & 10 map to?? (10=Freeze Screen) */
+	PORT_START("DSW")   /* There are actually 10 switches; 9 is unconnected, 10 (freeze) connects to a PAL and disables the watchdog */
 	PORT_DIPNAME( 0x0003, 0x0003, DEF_STR( Game_Time ) )    PORT_DIPLOCATION("SW1:1,2")
 	PORT_DIPSETTING(      0x0000, "Shortest" )
 	PORT_DIPSETTING(      0x0002, "Short" )
@@ -789,7 +804,7 @@
 	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )  /* analog controls go here */
 
-	PORT_START("DSW")   /* There are actually 10 switches, but where do 9 & 10 map to?? (10=Freeze Screen) */
+	PORT_START("DSW")   /* There are actually 10 switches; 9 is unconnected, 10 (freeze) connects to a PAL and disables the watchdog */
 	PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )  PORT_DIPLOCATION("SW1:1,2,3")
 	PORT_DIPSETTING(      0x0002, DEF_STR( 4C_1C ) )
 	PORT_DIPSETTING(      0x0003, DEF_STR( 3C_1C ) )
@@ -970,7 +985,9 @@
 	mcr68(config);
 
 	/* basic machine hardware */
-	WILLIAMS_CVSD_SOUND(config, m_cvsd_sound).add_route(ALL_OUTPUTS, "speaker", 1.0);
+	S11_BG(config, m_bg).add_route(ALL_OUTPUTS, "speaker", 1.0); // uses a D-11581 w/o W10/W11 jumpers, older mix resistors
+	// The schematics actually imply on the parts list that this may use the even older mix resistors from the D-1129x board
+	// but the actual schematic shows the D-11581 resistors. This may be worth checking from an original board.
 }
 
 
@@ -979,7 +996,7 @@
 	mcr68(config);
 
 	/* basic machine hardware */
-	WILLIAMS_CVSD_SOUND(config, m_cvsd_sound).add_route(ALL_OUTPUTS, "speaker", 1.0);
+	S11C_BG(config, m_bg).add_route(ALL_OUTPUTS, "speaker", 1.0); // uses a D-11581-4xxx w/ W10/W11 jumpers, newer mix resistors
 
 	m_maincpu->set_addrmap(AS_PROGRAM, &mcr68_state::pigskin_map);
 }
@@ -990,7 +1007,10 @@
 	mcr68(config);
 
 	/* basic machine hardware */
-	WILLIAMS_CVSD_SOUND(config, m_cvsd_sound).add_route(ALL_OUTPUTS, "speaker", 1.0);
+	S11C_BG(config, m_bg).add_route(ALL_OUTPUTS, "speaker", 1.0); // uses a D-11581-4xxx w/ W10/W11 jumpers, newer mix resistors
+	// the above could use verification from the schematics, but based on the fact that it uses 3 roms, two 27512 and one 27256,
+	// and only the S11C_BG/D-11581-4xxx board properly supports that specific combination, it is almost certainly using
+	// S11C_BG and not S11_BG/D-11581
 
 	m_maincpu->set_addrmap(AS_PROGRAM, &mcr68_state::trisport_map);
 
@@ -1206,19 +1226,19 @@
 	ROM_LOAD16_BYTE( "arch_rivals_2c_rev4.2c",  0x20000, 0x10000, CRC(cc2893f7) SHA1(44931299cb98e27ac2f11b3922da76895fbfe0a7) )
 	ROM_LOAD16_BYTE( "arch_rivals_2b_rev4.2b",  0x20001, 0x10000, CRC(fa977050) SHA1(67c66995da755401162f7e668b97eb42ac769ec0) )
 
-	ROM_REGION( 0x90000, "cvsd:cpu", 0 )  /* Audio System board */
-	ROM_LOAD( "arch_rivals_u4_rev1.u4",   0x10000, 0x08000, CRC(96b3c652) SHA1(1bb576d0bf6b6b8df24e7b9352a33e97dd8ebdcb) ) /* "REV1" portion of label is brown */
+	ROM_REGION( 0x90000, "bg:cpu", 0 )  /* Audio System board */
+	ROM_LOAD( "arch_rivals_u4_rev1.u4",   0x00000, 0x08000, CRC(96b3c652) SHA1(1bb576d0bf6b6b8df24e7b9352a33e97dd8ebdcb) ) /* "REV1" portion of label is brown */
+	ROM_RELOAD(                           0x08000, 0x08000 )
+	ROM_RELOAD(                           0x10000, 0x08000 )
 	ROM_RELOAD(                           0x18000, 0x08000 )
-	ROM_RELOAD(                           0x20000, 0x08000 )
+	ROM_LOAD( "arch_rivals_u19_rev1.u19", 0x20000, 0x08000, CRC(c4b3dc23) SHA1(87e6eaec82d749ad28e0fa3d0efecd8a4aaf5cd7) )
 	ROM_RELOAD(                           0x28000, 0x08000 )
-	ROM_LOAD( "arch_rivals_u19_rev1.u19", 0x30000, 0x08000, CRC(c4b3dc23) SHA1(87e6eaec82d749ad28e0fa3d0efecd8a4aaf5cd7) )
+	ROM_RELOAD(                           0x30000, 0x08000 )
 	ROM_RELOAD(                           0x38000, 0x08000 )
-	ROM_RELOAD(                           0x40000, 0x08000 )
+	ROM_LOAD( "arch_rivals_u20_rev1.u20", 0x40000, 0x08000, CRC(f7907a02) SHA1(3fabb2b7fd82e773d7b6db53c5328b5866d70617) )
 	ROM_RELOAD(                           0x48000, 0x08000 )
-	ROM_LOAD( "arch_rivals_u20_rev1.u20", 0x50000, 0x08000, CRC(f7907a02) SHA1(3fabb2b7fd82e773d7b6db53c5328b5866d70617) )
+	ROM_RELOAD(                           0x50000, 0x08000 )
 	ROM_RELOAD(                           0x58000, 0x08000 )
-	ROM_RELOAD(                           0x60000, 0x08000 )
-	ROM_RELOAD(                           0x68000, 0x08000 )
 
 	ROM_REGION( 0x20000, "gfx1", ROMREGION_INVERT )
 	ROM_LOAD( "arch_rivals_11d_rev1.11d", 0x00000, 0x10000, CRC(7eb3d7c6) SHA1(8544d04929cdb36fa7f0dcb67e0b7fd8c7b0fc2b) ) /* "REV1" portion of label is brown */
@@ -1253,19 +1273,19 @@
 	ROM_LOAD16_BYTE( "arch_rivals_2c_rev2.2c",  0x20000, 0x10000, CRC(d6d08ff7) SHA1(bbbd4b5c3218c9bb461b17e536191d40ab39f67c) )
 	ROM_LOAD16_BYTE( "arch_rivals_2b_rev2.2b",  0x20001, 0x10000, CRC(92f3a43d) SHA1(45fdcbacd65f5898d54cc2ac95639b7ee2c097e6) )
 
-	ROM_REGION( 0x90000, "cvsd:cpu", 0 )  /* Audio System board */
-	ROM_LOAD( "arch_rivals_u4_rev1.u4",   0x10000, 0x08000, CRC(96b3c652) SHA1(1bb576d0bf6b6b8df24e7b9352a33e97dd8ebdcb) ) /* "REV1" portion of label is brown */
+	ROM_REGION( 0x90000, "bg:cpu", 0 )  /* Audio System board */
+	ROM_LOAD( "arch_rivals_u4_rev1.u4",   0x00000, 0x08000, CRC(96b3c652) SHA1(1bb576d0bf6b6b8df24e7b9352a33e97dd8ebdcb) ) /* "REV1" portion of label is brown */
+	ROM_RELOAD(                           0x08000, 0x08000 )
+	ROM_RELOAD(                           0x10000, 0x08000 )
 	ROM_RELOAD(                           0x18000, 0x08000 )
-	ROM_RELOAD(                           0x20000, 0x08000 )
+	ROM_LOAD( "arch_rivals_u19_rev1.u19", 0x20000, 0x08000, CRC(c4b3dc23) SHA1(87e6eaec82d749ad28e0fa3d0efecd8a4aaf5cd7) )
 	ROM_RELOAD(                           0x28000, 0x08000 )
-	ROM_LOAD( "arch_rivals_u19_rev1.u19", 0x30000, 0x08000, CRC(c4b3dc23) SHA1(87e6eaec82d749ad28e0fa3d0efecd8a4aaf5cd7) )
+	ROM_RELOAD(                           0x30000, 0x08000 )
 	ROM_RELOAD(                           0x38000, 0x08000 )
-	ROM_RELOAD(                           0x40000, 0x08000 )
+	ROM_LOAD( "arch_rivals_u20_rev1.u20", 0x40000, 0x08000, CRC(f7907a02) SHA1(3fabb2b7fd82e773d7b6db53c5328b5866d70617) )
 	ROM_RELOAD(                           0x48000, 0x08000 )
-	ROM_LOAD( "arch_rivals_u20_rev1.u20", 0x50000, 0x08000, CRC(f7907a02) SHA1(3fabb2b7fd82e773d7b6db53c5328b5866d70617) )
+	ROM_RELOAD(                           0x50000, 0x08000 )
 	ROM_RELOAD(                           0x58000, 0x08000 )
-	ROM_RELOAD(                           0x60000, 0x08000 )
-	ROM_RELOAD(                           0x68000, 0x08000 )
 
 	ROM_REGION( 0x20000, "gfx1", ROMREGION_INVERT )
 	ROM_LOAD( "arch_rivals_11d_rev1.11d", 0x00000, 0x10000, CRC(7eb3d7c6) SHA1(8544d04929cdb36fa7f0dcb67e0b7fd8c7b0fc2b) ) /* "REV1" portion of label is brown */
@@ -1300,19 +1320,19 @@
 	ROM_LOAD16_BYTE( "3.bin",  0x20000, 0x10000, CRC(d6d08ff7) SHA1(bbbd4b5c3218c9bb461b17e536191d40ab39f67c) )
 	ROM_LOAD16_BYTE( "1.bin",  0x20001, 0x10000, CRC(92f3a43d) SHA1(45fdcbacd65f5898d54cc2ac95639b7ee2c097e6) )
 
-	ROM_REGION( 0x90000, "cvsd:cpu", 0 )  /* Audio System board */
-	ROM_LOAD( "13.bin",   0x10000, 0x08000, CRC(96b3c652) SHA1(1bb576d0bf6b6b8df24e7b9352a33e97dd8ebdcb) )
+	ROM_REGION( 0x90000, "bg:cpu", 0 )  /* Audio System board */
+	ROM_LOAD( "13.bin",   0x00000, 0x08000, CRC(96b3c652) SHA1(1bb576d0bf6b6b8df24e7b9352a33e97dd8ebdcb) )
+	ROM_RELOAD(                           0x08000, 0x08000 )
+	ROM_RELOAD(                           0x10000, 0x08000 )
 	ROM_RELOAD(                           0x18000, 0x08000 )
-	ROM_RELOAD(                           0x20000, 0x08000 )
+	ROM_LOAD( "12.bin", 0x20000, 0x08000, CRC(c4b3dc23) SHA1(87e6eaec82d749ad28e0fa3d0efecd8a4aaf5cd7) )
 	ROM_RELOAD(                           0x28000, 0x08000 )
-	ROM_LOAD( "12.bin", 0x30000, 0x08000, CRC(c4b3dc23) SHA1(87e6eaec82d749ad28e0fa3d0efecd8a4aaf5cd7) )
+	ROM_RELOAD(                           0x30000, 0x08000 )
 	ROM_RELOAD(                           0x38000, 0x08000 )
-	ROM_RELOAD(                           0x40000, 0x08000 )
+	ROM_LOAD( "11.bin", 0x40000, 0x08000, CRC(f7907a02) SHA1(3fabb2b7fd82e773d7b6db53c5328b5866d70617) )
 	ROM_RELOAD(                           0x48000, 0x08000 )
-	ROM_LOAD( "11.bin", 0x50000, 0x08000, CRC(f7907a02) SHA1(3fabb2b7fd82e773d7b6db53c5328b5866d70617) )
+	ROM_RELOAD(                           0x50000, 0x08000 )
 	ROM_RELOAD(                           0x58000, 0x08000 )
-	ROM_RELOAD(                           0x60000, 0x08000 )
-	ROM_RELOAD(                           0x68000, 0x08000 )
 
 	ROM_REGION( 0x20000, "gfx1", ROMREGION_INVERT )
 	ROM_LOAD( "5.bin", 0x00000, 0x10000, CRC(7eb3d7c6) SHA1(8544d04929cdb36fa7f0dcb67e0b7fd8c7b0fc2b) )
@@ -1347,13 +1367,13 @@
 	ROM_LOAD16_BYTE( "pigskin-k_a6_la1.a6",  0x20000, 0x10000, CRC(4d8b7e50) SHA1(9e5d0edf1603e11f22d3129a2b8865ebcb5e27f9) )
 	ROM_LOAD16_BYTE( "pigskin-k_b6_la1.b6",  0x20001, 0x10000, CRC(1194f187) SHA1(e7cebe5322a5c8e382b6773939be5bc88492f289) )
 
-	ROM_REGION( 0x90000, "cvsd:cpu", 0 )  /* Audio System board */
-	ROM_LOAD( "pigskin_u4_sl1.u4",   0x10000, 0x10000, CRC(6daf2d37) SHA1(4c8098520fe44e36b01389bcfcfe3ad1d027cbde) )
-	ROM_RELOAD(                      0x20000, 0x10000 )
-	ROM_LOAD( "pigskin_u19_sl1.u19", 0x30000, 0x10000, CRC(56fd16a3) SHA1(b91aabdbd3185355f2b7177fc4d3a86fa110f51d) )
-	ROM_RELOAD(                      0x40000, 0x10000 )
-	ROM_LOAD( "pigskin_u20_sl1.u20", 0x50000, 0x10000, CRC(5d032fb8) SHA1(a236cdc64856637e560bec7119b051fac13efbe0) )
-	ROM_RELOAD(                      0x60000, 0x10000 )
+	ROM_REGION( 0x90000, "bg:cpu", 0 )  // Audio System board; W10/W11 are jumpered: W10 shorted, W11 open (U20 is a 27512)
+	ROM_LOAD( "pigskin_u4_sl1.u4",   0x00000, 0x10000, CRC(6daf2d37) SHA1(4c8098520fe44e36b01389bcfcfe3ad1d027cbde) )
+	ROM_RELOAD(                      0x10000, 0x10000 )
+	ROM_LOAD( "pigskin_u19_sl1.u19", 0x20000, 0x10000, CRC(56fd16a3) SHA1(b91aabdbd3185355f2b7177fc4d3a86fa110f51d) )
+	ROM_RELOAD(                      0x30000, 0x10000 )
+	ROM_LOAD( "pigskin_u20_sl1.u20", 0x40000, 0x10000, CRC(5d032fb8) SHA1(a236cdc64856637e560bec7119b051fac13efbe0) )
+	ROM_RELOAD(                      0x50000, 0x10000 )
 
 	ROM_REGION( 0x20000, "gfx1", ROMREGION_INVERT )
 	ROM_LOAD( "pigskin_e2_la1.e2", 0x00000, 0x10000, CRC(12d5737b) SHA1(73040233bb86eaa42257112e2f0540de1206e310) )
@@ -1374,13 +1394,13 @@
 	ROM_LOAD16_BYTE( "pigskin_a6_la2.a6", 0x20000, 0x10000, CRC(2fc91002) SHA1(64d270b78c69d3f4fb36d1233a1632d6ba3d87a5) )
 	ROM_LOAD16_BYTE( "pigskin_b6_la2.b6", 0x20001, 0x10000, CRC(0b93dc66) SHA1(f3b516a1d1e4abd7b0d56243949e9cd7ac79178b) )
 
-	ROM_REGION( 0x90000, "cvsd:cpu", 0 )  /* Audio System board */
-	ROM_LOAD( "pigskin_u4_sl1.u4",   0x10000, 0x10000, CRC(6daf2d37) SHA1(4c8098520fe44e36b01389bcfcfe3ad1d027cbde) )
-	ROM_RELOAD(                      0x20000, 0x10000 )
-	ROM_LOAD( "pigskin_u19_sl1.u19", 0x30000, 0x10000, CRC(56fd16a3) SHA1(b91aabdbd3185355f2b7177fc4d3a86fa110f51d) )
-	ROM_RELOAD(                      0x40000, 0x10000 )
-	ROM_LOAD( "pigskin_u20_sl1.u20", 0x50000, 0x10000, CRC(5d032fb8) SHA1(a236cdc64856637e560bec7119b051fac13efbe0) )
-	ROM_RELOAD(                      0x60000, 0x10000 )
+	ROM_REGION( 0x90000, "bg:cpu", 0 )  // Audio System board; W10/W11 are jumpered: W10 shorted, W11 open (U20 is a 27512)
+	ROM_LOAD( "pigskin_u4_sl1.u4",   0x00000, 0x10000, CRC(6daf2d37) SHA1(4c8098520fe44e36b01389bcfcfe3ad1d027cbde) )
+	ROM_RELOAD(                      0x10000, 0x10000 )
+	ROM_LOAD( "pigskin_u19_sl1.u19", 0x20000, 0x10000, CRC(56fd16a3) SHA1(b91aabdbd3185355f2b7177fc4d3a86fa110f51d) )
+	ROM_RELOAD(                      0x30000, 0x10000 )
+	ROM_LOAD( "pigskin_u20_sl1.u20", 0x40000, 0x10000, CRC(5d032fb8) SHA1(a236cdc64856637e560bec7119b051fac13efbe0) )
+	ROM_RELOAD(                      0x50000, 0x10000 )
 
 	ROM_REGION( 0x20000, "gfx1", ROMREGION_INVERT )
 	ROM_LOAD( "pigskin_e2_la1.e2", 0x00000, 0x10000, CRC(12d5737b) SHA1(73040233bb86eaa42257112e2f0540de1206e310) )
@@ -1401,13 +1421,13 @@
 	ROM_LOAD16_BYTE( "pigskin_a6_la1.a6", 0x20000, 0x10000, CRC(5fca2c4e) SHA1(6892ba763a0c9847c589514ff989b7f40e09784b) )
 	ROM_LOAD16_BYTE( "pigskin_b6_la1.b6", 0x20001, 0x10000, CRC(778a75fc) SHA1(3199efa34676d5856b33a8810043616e3618229e) )
 
-	ROM_REGION( 0x90000, "cvsd:cpu", 0 )  /* Audio System board */
-	ROM_LOAD( "pigskin_u4_sl1.u4",   0x10000, 0x10000, CRC(6daf2d37) SHA1(4c8098520fe44e36b01389bcfcfe3ad1d027cbde) )
-	ROM_RELOAD(                      0x20000, 0x10000 )
-	ROM_LOAD( "pigskin_u19_sl1.u19", 0x30000, 0x10000, CRC(56fd16a3) SHA1(b91aabdbd3185355f2b7177fc4d3a86fa110f51d) )
-	ROM_RELOAD(                      0x40000, 0x10000 )
-	ROM_LOAD( "pigskin_u20_sl1.u20", 0x50000, 0x10000, CRC(5d032fb8) SHA1(a236cdc64856637e560bec7119b051fac13efbe0) )
-	ROM_RELOAD(                      0x60000, 0x10000 )
+	ROM_REGION( 0x90000, "bg:cpu", 0 )  // Audio System board; W10/W11 are jumpered: W10 shorted, W11 open (U20 is a 27512)
+	ROM_LOAD( "pigskin_u4_sl1.u4",   0x00000, 0x10000, CRC(6daf2d37) SHA1(4c8098520fe44e36b01389bcfcfe3ad1d027cbde) )
+	ROM_RELOAD(                      0x10000, 0x10000 )
+	ROM_LOAD( "pigskin_u19_sl1.u19", 0x20000, 0x10000, CRC(56fd16a3) SHA1(b91aabdbd3185355f2b7177fc4d3a86fa110f51d) )
+	ROM_RELOAD(                      0x30000, 0x10000 )
+	ROM_LOAD( "pigskin_u20_sl1.u20", 0x40000, 0x10000, CRC(5d032fb8) SHA1(a236cdc64856637e560bec7119b051fac13efbe0) )
+	ROM_RELOAD(                      0x50000, 0x10000 )
 
 	ROM_REGION( 0x20000, "gfx1", ROMREGION_INVERT )
 	ROM_LOAD( "pigskin_e2_la1.e2", 0x00000, 0x10000, CRC(12d5737b) SHA1(73040233bb86eaa42257112e2f0540de1206e310) )
@@ -1428,15 +1448,15 @@
 	ROM_LOAD16_BYTE( "tri_sports_a6_la3.a6", 0x20000, 0x10000, CRC(9c6a1398) SHA1(ee115d9207f3a9034b7c9eccd2ff151d9c923c9a) )
 	ROM_LOAD16_BYTE( "tri_sports_b6_la3.b6", 0x20001, 0x10000, CRC(597b564c) SHA1(090da3ec0c86035cc41a9caea182b8a5419c3be9) )
 
-	ROM_REGION( 0x90000, "cvsd:cpu", 0 )  /* Audio System board */
-	ROM_LOAD( "tri_sports_u4_sl1.u4",   0x10000, 0x10000, CRC(0ed8c904) SHA1(21292a001c4c44f87b8782c706e5c346b767cd6b) )
-	ROM_RELOAD(                         0x20000, 0x10000 )
-	ROM_LOAD( "tri_sports_u19_sl1.u19", 0x30000, 0x10000, CRC(b57d7d7e) SHA1(483f718f1cc4549baf5696935532d30803254a19) )
-	ROM_RELOAD(                         0x40000, 0x10000 )
-	ROM_LOAD( "tri_sports_u20_sl1.u20", 0x50000, 0x08000, CRC(3ae15c08) SHA1(6b0fd09c39da08d1f67b6dd4287e8d2894522e1d) )
+	ROM_REGION( 0x90000, "bg:cpu", 0 )  // Audio System board; W10/W11 are jumpered: W11 shorted, W10 open (U20 is a 27256)
+	ROM_LOAD( "tri_sports_u4_sl1.u4",   0x00000, 0x10000, CRC(0ed8c904) SHA1(21292a001c4c44f87b8782c706e5c346b767cd6b) )
+	ROM_RELOAD(                         0x10000, 0x10000 )
+	ROM_LOAD( "tri_sports_u19_sl1.u19", 0x20000, 0x10000, CRC(b57d7d7e) SHA1(483f718f1cc4549baf5696935532d30803254a19) )
+	ROM_RELOAD(                         0x30000, 0x10000 )
+	ROM_LOAD( "tri_sports_u20_sl1.u20", 0x40000, 0x08000, CRC(3ae15c08) SHA1(6b0fd09c39da08d1f67b6dd4287e8d2894522e1d) )
+	ROM_RELOAD(                         0x48000, 0x08000 )
+	ROM_RELOAD(                         0x50000, 0x08000 )
 	ROM_RELOAD(                         0x58000, 0x08000 )
-	ROM_RELOAD(                         0x60000, 0x08000 )
-	ROM_RELOAD(                         0x68000, 0x08000 )
 
 	ROM_REGION( 0x20000, "gfx1", ROMREGION_INVERT )
 	ROM_LOAD( "tri_sports_e2_la2.e2",  0x00000, 0x10000, CRC(f61149a0) SHA1(a43d184db23c7f194042709550e7bf36b838ee5c) )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/meadows.cpp mame-0.224+dfsg.1/src/mame/drivers/meadows.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/meadows.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/meadows.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -235,7 +235,7 @@
 	if (state)
 	{
 		m_main_sense_state++;
-		m_maincpu->set_input_line(1, (m_main_sense_state & 0x40) ? ASSERT_LINE : CLEAR_LINE);
+		m_maincpu->set_input_line(S2650_SENSE_LINE, (m_main_sense_state & 0x40) ? ASSERT_LINE : CLEAR_LINE);
 	}
 }
 
@@ -687,6 +687,7 @@
 	/* basic machine hardware */
 	S2650(config, m_maincpu, MASTER_CLOCK/8);  /* 5MHz / 8 = 625 kHz */
 	m_maincpu->set_addrmap(AS_PROGRAM, &meadows_state::bowl3d_main_map);
+	m_maincpu->intack_handler().set([]() { return 0x82; });
 
 	S2650(config, m_audiocpu, MASTER_CLOCK/8); /* 5MHz / 8 = 625 kHz */
 	m_audiocpu->set_addrmap(AS_PROGRAM, &meadows_state::audio_map);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/megadriv_acbl.cpp mame-0.224+dfsg.1/src/mame/drivers/megadriv_acbl.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/megadriv_acbl.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/megadriv_acbl.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -6,6 +6,7 @@
 
     Games supported:
         * Aladdin
+        * Bare Knuckle II
         * Bare Knuckle III
         * Jurassic Park
         * Mortal Kombat 3
@@ -356,6 +357,18 @@
 	return 0x0000;
 }
 
+uint16_t md_boot_state::barek2mb_r()
+{
+	if (m_maincpu->pc()==0xfa40)
+		return 0x0400; // TODO: what's this? Needed or the game doesn't boot
+
+	if (m_maincpu->pc()==0xfa88)
+		return 0x0ff0; // TODO: fix this, should probably read coin inputs, as is gives 9 credits at start up
+
+	logerror("aladbl_r : %06x\n",m_maincpu->pc());
+	return 0x0000;
+}
+
 uint16_t md_boot_state::mk3mdb_dsw_r(offs_t offset)
 {
 	static const char *const dswname[3] = { "DSWA", "DSWB", "DSWC" };
@@ -769,6 +782,11 @@
 	PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN )
 INPUT_PORTS_END
 
+INPUT_PORTS_START( barek2 )
+	PORT_INCLUDE( aladmdb )
+	// TODO!
+INPUT_PORTS_END
+
 INPUT_PORTS_START( barek3 )
 	PORT_INCLUDE( md_common )
 
@@ -843,7 +861,7 @@
 	ROM_LOAD16_BYTE( "m1.bin", 0x000001, 0x080000,  CRC(5e2671e4) SHA1(54705c7614fc7b5a1065478fa41f51dd1d8045b7) )
 	ROM_LOAD16_BYTE( "m2.bin", 0x000000, 0x080000,  CRC(142a0366) SHA1(6c94aa9936cd11ccda503b52019a6721e64a32f0) )
 	ROM_LOAD16_BYTE( "m3.bin", 0x100001, 0x080000,  CRC(0feeeb19) SHA1(bd567a33077ab9997871d21736066140d50e3d70) )
-	ROM_LOAD16_BYTE( "m4.bin", 0x100000, 0x080000,  CRC(bc712661) SHA1(dfd554d000399e17b4ddc69761e572195ed4e1f0))
+	ROM_LOAD16_BYTE( "m4.bin", 0x100000, 0x080000,  CRC(bc712661) SHA1(dfd554d000399e17b4ddc69761e572195ed4e1f0) )
 
 	ROM_REGION( 0x2000, "pic", ROMREGION_ERASE00 )
 	ROM_LOAD( "pic16c57xtp", 0x0000, 0x2000, NO_DUMP )
@@ -888,7 +906,7 @@
 	ROM_LOAD16_BYTE( "u1", 0x000001, 0x020000,  CRC(c59f33bd) SHA1(bd5bce7698a70ea005b79ab34bcdb056872ef980) )
 	ROM_LOAD16_BYTE( "u2", 0x000000, 0x020000,  CRC(9125c054) SHA1(c73bdeb6b11c59d2b5f5968959b02697957ca894) )
 	ROM_LOAD16_BYTE( "u3", 0x040001, 0x020000,  CRC(0fee0fbe) SHA1(001e0fda12707512aad537e533acf28e726e6107) )
-	ROM_LOAD16_BYTE( "u4", 0x040000, 0x020000,  CRC(fc2aed41) SHA1(27eb3957f5ed26ee5276523b1df46fa7eb298e1f))
+	ROM_LOAD16_BYTE( "u4", 0x040000, 0x020000,  CRC(fc2aed41) SHA1(27eb3957f5ed26ee5276523b1df46fa7eb298e1f) )
 ROM_END
 
 ROM_START( topshoot ) /* Top Shooter (c)1995 Sun Mixing */
@@ -907,6 +925,17 @@
 	ROM_LOAD16_BYTE( "m2", 0x000000, 0x080000,  CRC(84b3f758) SHA1(19846b9d951db6f78f3e155d33f1b6349fb87f1a) )
 ROM_END
 
+ROM_START( barek2mb )
+	ROM_REGION( 0x200000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "m1.bin", 0x000001, 0x080000,  CRC(1c1fa718) SHA1(393488f7747478728eb4f20c10b0cfce3b188719) )
+	ROM_LOAD16_BYTE( "m2.bin", 0x000000, 0x080000,  CRC(59ee0905) SHA1(0e9f1f6e17aae2dd99bf9d7f640568b48ba699c7) )
+	ROM_LOAD16_BYTE( "m3.bin", 0x100001, 0x080000,  CRC(6ec5af5d) SHA1(9088a2d4cff5e7eb439ebaa91ad3bfff11366127) )
+	ROM_LOAD16_BYTE( "m4.bin", 0x100000, 0x080000,  CRC(d8c61e0d) SHA1(3d06e656f6621bb0741211f80c1ecff1669475ee) )
+
+	ROM_REGION( 0x2000, "pic", ROMREGION_ERASE00 )
+	ROM_LOAD( "pic16c57xtp", 0x0000, 0x2000, NO_DUMP )
+ROM_END
+
 ROM_START( barek3mb )
 	ROM_REGION( 0x400000, "maincpu", 0 ) /* 68000 Code */
 	ROM_LOAD16_BYTE( "6.u19", 0x000000, 0x080000,  CRC(2de19519) SHA1(f5fcef1da8b5370e399f0451382e3c6e7754c9c8) )
@@ -1068,6 +1097,14 @@
 	init_megadriv();
 }
 
+void md_boot_state::init_barek2()
+{
+	m_maincpu->space(AS_PROGRAM).install_write_handler(0x220000, 0x220001, write16smo_delegate(*this, FUNC(md_boot_state::aladmdb_w)));
+	m_maincpu->space(AS_PROGRAM).install_read_handler(0x330000, 0x330001, read16smo_delegate(*this, FUNC(md_boot_state::barek2mb_r)));
+
+	init_megadrij();
+}
+
 void md_boot_state::init_barek3()
 {
 	uint8_t* rom = memregion("maincpu")->base();
@@ -1126,6 +1163,7 @@
 GAME( 1993, srmdb,    0, megadrvb,     srmdb,    md_boot_state, init_srmdb,    ROT0, "bootleg / Konami", "Sunset Riders (bootleg of Megadrive version)", 0)
 GAME( 1995, topshoot, 0, md_bootleg,   topshoot, md_boot_state, init_topshoot, ROT0, "Sun Mixing",       "Top Shooter", 0)
 GAME( 1993, sonic2mb, 0, md_bootleg,   sonic2mb, md_boot_state, init_sonic2mb, ROT0, "bootleg / Sega",   "Sonic The Hedgehog 2 (bootleg of Megadrive version)", 0 ) // flying wires going through the empty PIC space aren't completely understood
+GAME( 1994, barek2mb, 0, md_bootleg,   barek2,   md_boot_state, init_barek2,   ROT0, "bootleg / Sega",   "Bare Knuckle II (bootleg of Megadrive version)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING ) // needs PIC decap or simulation
 GAME( 1994, barek3mb, 0, megadrvb,     barek3,   md_boot_state, init_barek3,   ROT0, "bootleg / Sega",   "Bare Knuckle III (bootleg of Megadrive version)", 0 )
-GAME( 1993, twinktmb, 0, md_bootleg,   twinktmb, md_boot_state, init_twinktmb, ROT0, "bootleg / Sega",   "Twinkle Tale (bootleg of Megadrive version)",  MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING ) // needs PIC decap or simulation
-GAME( 1993, jparkmb,  0, md_bootleg,   twinktmb, md_boot_state, init_jparkmb,  ROT0, "bootleg / Sega",   "Jurassic Park (bootleg of Megadrive version)",  MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING ) // needs PIC decap or simulation
+GAME( 1993, twinktmb, 0, md_bootleg,   twinktmb, md_boot_state, init_twinktmb, ROT0, "bootleg / Sega",   "Twinkle Tale (bootleg of Megadrive version)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING ) // needs PIC decap or simulation
+GAME( 1993, jparkmb,  0, md_bootleg,   twinktmb, md_boot_state, init_jparkmb,  ROT0, "bootleg / Sega",   "Jurassic Park (bootleg of Megadrive version)", MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING ) // needs PIC decap or simulation
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/megaplay.cpp mame-0.224+dfsg.1/src/mame/drivers/megaplay.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/megaplay.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/megaplay.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -182,7 +182,7 @@
 	PORT_DIPSETTING( 0x10, "1 coin/1 credit - 2 coins/3 credits" )
 	PORT_DIPSETTING( 0x00, " 1 coin/1 credit" )
 
-	PORT_START("DSW1")  /* DSW C  (per game settings) */
+	PORT_START("DSW1")  // DSW C  (per game settings)
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) ) PORT_DIPLOCATION("SW3:1")
 	PORT_DIPSETTING( 0x01, DEF_STR( Off )  )
 	PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -200,7 +200,7 @@
 static INPUT_PORTS_START ( mp_sonic )
 	PORT_INCLUDE( megaplay )
 
-	PORT_MODIFY("DSW1") /* DSW C  (per game settings) */
+	PORT_MODIFY("DSW1") // DSW C  (per game settings)
 	PORT_DIPNAME( 0x03, 0x01, "Initial Players" ) PORT_DIPLOCATION("SW3:1,2")
 	PORT_DIPSETTING( 0x00, "4" )
 	PORT_DIPSETTING( 0x01, "3" )
@@ -221,7 +221,7 @@
 static INPUT_PORTS_START ( mp_gaxe2 )
 	PORT_INCLUDE( megaplay )
 
-	PORT_MODIFY("DSW1") /* DSW C  (per game settings) */
+	PORT_MODIFY("DSW1") // DSW C  (per game settings)
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW3:1")
 	PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
 	PORT_DIPSETTING( 0x00, DEF_STR( Hard ) )
@@ -245,7 +245,7 @@
 static INPUT_PORTS_START ( mp_col3 )
 	PORT_INCLUDE( megaplay )
 
-	PORT_MODIFY("DSW1") /* DSW C  (per game settings) */
+	PORT_MODIFY("DSW1") // DSW C  (per game settings)
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Language ) ) PORT_DIPLOCATION("SW3:1")
 	PORT_DIPSETTING( 0x01, DEF_STR( English ) )
 	PORT_DIPSETTING( 0x00, DEF_STR( Japanese ) )
@@ -268,7 +268,7 @@
 static INPUT_PORTS_START ( mp_twc )
 	PORT_INCLUDE( megaplay )
 
-	PORT_MODIFY("DSW1") /* DSW C  (per game settings) */
+	PORT_MODIFY("DSW1") // DSW C  (per game settings)
 	PORT_DIPNAME( 0x01, 0x01, "Time" ) PORT_DIPLOCATION("SW3:1")
 	PORT_DIPSETTING( 0x01, DEF_STR( Normal ) )
 	PORT_DIPSETTING( 0x00, "Short" )
@@ -286,7 +286,7 @@
 static INPUT_PORTS_START ( mp_sor2 )
 	PORT_INCLUDE( megaplay )
 
-	PORT_MODIFY("DSW1") /* DSW C  (per game settings) */
+	PORT_MODIFY("DSW1") // DSW C  (per game settings)
 	PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW3:1,2")
 	PORT_DIPSETTING( 0x00, "4" )
 	PORT_DIPSETTING( 0x01, "3" )
@@ -302,7 +302,7 @@
 static INPUT_PORTS_START ( mp_bio )
 	PORT_INCLUDE( megaplay )
 
-	PORT_MODIFY("DSW1") /* DSW C  (per game settings) */
+	PORT_MODIFY("DSW1") // DSW C  (per game settings)
 	PORT_DIPNAME( 0x03, 0x03, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW3:1,2")
 	PORT_DIPSETTING( 0x00, "5" )
 	PORT_DIPSETTING( 0x01, "4" )
@@ -318,7 +318,7 @@
 static INPUT_PORTS_START ( mp_gslam )
 	PORT_INCLUDE( megaplay )
 
-	PORT_MODIFY("DSW1") /* DSW C  (per game settings) */
+	PORT_MODIFY("DSW1") // DSW C  (per game settings)
 	PORT_DIPNAME( 0x07, 0x04, DEF_STR ( Game_Time ) ) PORT_DIPLOCATION("SW3:1,2,3")
 	PORT_DIPSETTING( 0x00, "5:00" )
 	PORT_DIPSETTING( 0x01, "4:30" )
@@ -336,7 +336,7 @@
 static INPUT_PORTS_START ( mp_mazin )
 	PORT_INCLUDE( megaplay )
 
-	PORT_MODIFY("DSW1") /* DSW C  (per game settings) */
+	PORT_MODIFY("DSW1") // DSW C  (per game settings)
 	PORT_DIPNAME( 0x03, 0x02, "Initial Player" ) PORT_DIPLOCATION("SW3:1,2")
 	PORT_DIPSETTING( 0x00, "2" )
 	PORT_DIPSETTING( 0x01, "1" )
@@ -353,7 +353,7 @@
 static INPUT_PORTS_START ( mp_soni2 )
 	PORT_INCLUDE( megaplay )
 
-	PORT_MODIFY("DSW1") /* DSW C  (per game settings) */
+	PORT_MODIFY("DSW1") // DSW C  (per game settings)
 	PORT_DIPNAME( 0x03, 0x01, "Initial Players (Normal mode)" ) PORT_DIPLOCATION("SW3:1,2")
 	PORT_DIPSETTING( 0x00, "4" )
 	PORT_DIPSETTING( 0x01, "3" )
@@ -369,7 +369,7 @@
 static INPUT_PORTS_START ( mp_shnb3 )
 	PORT_INCLUDE( megaplay )
 
-	PORT_MODIFY("DSW1") /* DSW C  (per game settings) */
+	PORT_MODIFY("DSW1") // DSW C  (per game settings)
 	PORT_DIPNAME( 0x03, 0x01, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW3:1,2")
 	PORT_DIPSETTING( 0x00, "4" )
 	PORT_DIPSETTING( 0x01, "3" )
@@ -385,7 +385,7 @@
 static INPUT_PORTS_START ( mp_gunhe )
 	PORT_INCLUDE( megaplay )
 
-	PORT_MODIFY("DSW1") /* DSW C  (per game settings) */
+	PORT_MODIFY("DSW1") // DSW C  (per game settings)
 	PORT_DIPNAME( 0x03, 0x01, "Initial Players" ) PORT_DIPLOCATION("SW3:1,2")
 	PORT_DIPSETTING( 0x00, "4" )
 	PORT_DIPSETTING( 0x01, "3" )
@@ -398,7 +398,7 @@
 	PORT_DIPSETTING( 0x0c, DEF_STR ( Normal ) )
 INPUT_PORTS_END
 
-/*MEGAPLAY specific*/
+// MEGAPLAY specific
 
 READ_LINE_MEMBER(mplay_state::start1_r)
 {
@@ -508,8 +508,8 @@
 }
 
 
-/* Megaplay BIOS handles regs[2] at start in a different way compared to megadrive */
-/* other io data/ctrl regs are dealt with exactly like in the console              */
+/* Megaplay BIOS handles regs[2] at start in a different way compared to MegaDrive
+   other I/O data/ctrl regs are dealt with exactly like in the console */
 
 uint8_t mplay_state::bios_6402_r()
 {
@@ -668,12 +668,12 @@
 
 void mplay_state::megaplay(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	md_ntsc(config);
 
-	/* The Megaplay has an extra BIOS cpu which drives an SMS VDP
+	/* The Megaplay has an extra BIOS CPU which drives an SMS VDP
 	   which includes an SN76496 for sound */
-	Z80(config, m_bioscpu, MASTER_CLOCK / 15); /* ?? */
+	Z80(config, m_bioscpu, MASTER_CLOCK / 15); // ??
 	m_bioscpu->set_addrmap(AS_PROGRAM, &mplay_state::megaplay_bios_map);
 	m_bioscpu->set_addrmap(AS_IO, &mplay_state::megaplay_bios_io_map);
 
@@ -697,14 +697,14 @@
 
 	m_vdp->set_lcm_scaling(true);
 
-	/* New update functions to handle the extra layer */
+	// New update functions to handle the extra layer
 	subdevice<screen_device>("megadriv")->set_raw((XTAL(10'738'635) * 5)/2,
 			sega315_5124_device::WIDTH * 5, (sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH) * 5, (sega315_5124_device::LBORDER_START + sega315_5124_device::LBORDER_WIDTH + 256) * 5,
 			sega315_5124_device::HEIGHT_NTSC, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT, sega315_5124_device::TBORDER_START + sega315_5124_device::NTSC_224_TBORDER_HEIGHT + 224);
 	subdevice<screen_device>("megadriv")->set_screen_update(FUNC(mplay_state::screen_update_megplay));
 
 	// Megaplay has an additional SMS VDP as an overlay
-	SEGA315_5246(config, m_vdp1, MASTER_CLOCK / 5); /* ?? */
+	SEGA315_5246(config, m_vdp1, MASTER_CLOCK / 5); // ??
 	m_vdp1->set_screen("megadriv");
 	m_vdp1->set_hcounter_divide(5);
 	m_vdp1->set_is_pal(false);
@@ -714,183 +714,220 @@
 }
 
 
-/* MegaPlay Games - Modified Genesis games */
+// MegaPlay Games - Modified Genesis games
+
+#define MEGAPLAY_PLDS \
+	ROM_REGION( 0x651, "plds", 0) \
+	ROM_LOAD( "315-5661.ic7",   0x000, 0x117, BAD_DUMP CRC(d8289e31) SHA1(a0e9134d9e8043a3660a2ce122cfd5d7f76773b9) ) /* GAL16V8, bruteforced but verified */ \
+	ROM_LOAD( "315-5653.ic56",  0x117, 0x117, BAD_DUMP CRC(fd5c4fb3) SHA1(6b2ba657836f3031d77602526416200e31d41a6e) ) /* GAL16V8, bruteforced but verified */ \
+	ROM_LOAD( "315-5651.ic8",   0x22e, 0x117, BAD_DUMP CRC(55c6cddb) SHA1(e1a968305ca7ea17e9021b31506ca087b84a8ab1) ) /* GAL16V8, bruteforced but verified */ \
+	ROM_LOAD( "315-5349a.ic54", 0x345, 0x104, BAD_DUMP CRC(825ea316) SHA1(f49edb6a3f9349330f7ff525ef60517ed276a663) ) /* PAL16L8BCN, bruteforced but verified */ \
+	ROM_LOAD( "315-5654.ic33",  0x449, 0x104, NO_DUMP ) /* PAL16L8BCN */ \
+	ROM_LOAD( "315-5655.ic34",  0x54d, 0x104, BAD_DUMP CRC(4a2d27d1) SHA1(ba79183e4b522d1b57a46a56fc7d9b85de24df36) ) /* PAL16L8BCN, bruteforced but verified */
 
 #define ROM_LOAD_BIOS(bios,name,offset,length,hash) \
 		ROMX_LOAD(name, offset, length, hash, ROM_BIOS(bios))
 
 #define MEGAPLAY_BIOS \
-	ROM_SYSTEM_BIOS( 0, "ver1",       "Megaplay Bios (Ver. 1)" ) \
+	ROM_SYSTEM_BIOS( 0, "ver1",       "Mega Play BIOS (Ver. 1)" ) \
 	ROM_LOAD_BIOS( 0, "ep15294.ic2",   0x000000, 0x20000, CRC(aa8dc2d8) SHA1(96771ad7b79dc9c83a1594243250d65052d23176) ) \
-	ROM_SYSTEM_BIOS( 1, "ver2",       "Megaplay Bios (Ver. 2)" ) /* this one doesn't boot .. dump was verified with another working pcb */ \
+	ROM_SYSTEM_BIOS( 1, "ver2",       "Mega Play BIOS (Ver. 2)" ) /* This one doesn't boot... Dump was verified with another working PCB */ \
 	ROM_LOAD_BIOS( 1, "epr-a15294.ic2",0x000000, 0x20000, CRC(f97c68aa) SHA1(bcabc879950bca1ced11c550a484e697ec5706b2) )
+
 ROM_START( megaplay )
 	ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
 
 	ROM_REGION( 0x8000, "user1", ROMREGION_ERASEFF )
 
-	ROM_REGION( 0x20000, "mtbios", 0 ) /* Bios */
+	ROM_REGION( 0x20000, "mtbios", 0 ) // BIOS
 	MEGAPLAY_BIOS
+
+	MEGAPLAY_PLDS
 ROM_END
 
 /* The system appears to access the instruction rom at
-    0x300000 in the 68k space (rom window from z80 side)
+    0x300000 in the 68k space (ROM window from z80 side)
 
    This probably means the maximum 68k rom size is 0x2fffff for MegaPlay
 */
-/* pcb  171-5834 */
-ROM_START( mp_sonic ) /* Sonic */
+
+// PCB  171-5834
+ROM_START( mp_sonic ) // Sonic
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "ep15177.ic2", 0x000000, 0x040000, CRC(a389b03b) SHA1(8e9e1cf3dd65ddf08757f5a1ce472130c902ea2c) )
 	ROM_LOAD16_BYTE( "ep15176.ic1", 0x000001, 0x040000, CRC(d180cc21) SHA1(62805cfaaa80c1da6146dd89fc2b49d819fd4f22) )
-	/* Game Instruction rom copied to 0x300000 - 0x310000 (odd / even bytes equal) */
+	// Game instruction ROM copied to 0x300000 - 0x310000 (odd / even bytes equal)
 
-	ROM_REGION( 0x8000, "user1", 0 ) /* Game Instructions */
+	ROM_REGION( 0x8000, "user1", 0 ) // Game instructions
 	ROM_LOAD( "ep15175-01.ic3", 0x000000, 0x08000, CRC(99246889) SHA1(184aa3b7fdedcf578c5e34edb7ed44f57f832258) )
 
-	ROM_REGION( 0x20000, "mtbios", 0 ) /* Bios */
+	ROM_REGION( 0x20000, "mtbios", 0 ) // BIOS
 	MEGAPLAY_BIOS
+
+	MEGAPLAY_PLDS
 ROM_END
 
-/* this cart looks to be a conversion from something else.. sega rom numbers were missing
+/* this cart looks to be a conversion from something else... Sega rom numbers were missing
    but the code looks like it's probably real */
-/* pcb  171-5834 */
-ROM_START( mp_col3 ) /* Columns 3 */
+// PCB  171-5834
+ROM_START( mp_col3 ) // Columns 3
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "3.ic2", 0x000000, 0x040000, CRC(a1602235) SHA1(38751b585849c8966acc3f508714937fe29dcf5c) )
 	ROM_LOAD16_BYTE( "2.ic1", 0x000001, 0x040000, CRC(999b2fe6) SHA1(ad967a28e4eebd7b01273e4e04c35a0198ef834a) )
-	/* Game Instruction rom copied to 0x300000 - 0x310000 (odd / even bytes equal) */
+	// Game instruction ROM copied to 0x300000 - 0x310000 (odd / even bytes equal)
 
-	ROM_REGION( 0x8000, "user1", 0 ) /* Game Instructions */
+	ROM_REGION( 0x8000, "user1", 0 ) // Game instructions
 	ROM_LOAD( "1.ic3", 0x000000, 0x08000,  CRC(dac9bf91) SHA1(0117972a7181f8aaf942a259cc8764b821031253) )
 
-	ROM_REGION( 0x20000, "mtbios", 0 ) /* Bios */
+	ROM_REGION( 0x20000, "mtbios", 0 ) // BIOS
 	MEGAPLAY_BIOS
+
+	MEGAPLAY_PLDS
 ROM_END
 
-ROM_START( mp_gaxe2 ) /* Golden Axe 2, revision B */
+ROM_START( mp_gaxe2 ) // Golden Axe 2, revision B
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "ep15179b.ic2", 0x000000, 0x040000, CRC(00d97b84) SHA1(914bbf566ddf940aab67b92af237d251650ddadf) )
 	ROM_LOAD16_BYTE( "ep15178b.ic1", 0x000001, 0x040000, CRC(2ea576db) SHA1(6d96b948243533de1f488b1f80e0d5431a4f1f53) )
-	/* Game Instruction rom copied to 0x300000 - 0x310000 (odd / even bytes equal) */
+	// Game instruction ROM copied to 0x300000 - 0x310000 (odd / even bytes equal)
 
-	ROM_REGION( 0x8000, "user1", 0 ) /* Game Instructions */
+	ROM_REGION( 0x8000, "user1", 0 ) // Game Instructions
 	ROM_LOAD( "ep15175-02b.ic3", 0x000000, 0x08000, CRC(3039b653) SHA1(b19874c74d0fc0cca1169f62e5e74f0e8ca83679) ) // 15175-02b.ic3
 
-	ROM_REGION( 0x20000, "mtbios", 0 ) /* Bios */
+	ROM_REGION( 0x20000, "mtbios", 0 ) // BIOS
 	MEGAPLAY_BIOS
+
+	MEGAPLAY_PLDS
 ROM_END
 
-ROM_START( mp_gaxe2a ) /* Golden Axe 2 */
+ROM_START( mp_gaxe2a ) // Golden Axe 2
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "epr-15179.ic2", 0x000000, 0x040000, CRC(d35f1a35) SHA1(3105cd3b55f65337863703db04527fe298fc04e0) )
 	ROM_LOAD16_BYTE( "epr-15178.ic1", 0x000001, 0x040000, CRC(2c6b6b76) SHA1(25577f49ecad451c217da9cacbd78ffca9dca24e) )
-	/* Game Instruction rom copied to 0x300000 - 0x310000 (odd / even bytes equal) */
+	// Game instruction ROM copied to 0x300000 - 0x310000 (odd / even bytes equal)
 
-	ROM_REGION( 0x8000, "user1", 0 ) /* Game Instructions */
+	ROM_REGION( 0x8000, "user1", 0 ) // Game instructions
 	ROM_LOAD( "epr-15175-02.ic3", 0x000000, 0x08000, CRC(cfc87f91) SHA1(110609094aa6d848bec613faa0558db7ad272b77) )
 
-	ROM_REGION( 0x20000, "mtbios", 0 ) /* Bios */
+	ROM_REGION( 0x20000, "mtbios", 0 ) // BIOS
 	MEGAPLAY_BIOS
+
+	MEGAPLAY_PLDS
 ROM_END
 
-ROM_START( mp_gslam ) /* Grand Slam */
+ROM_START( mp_gslam ) // Grand Slam
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "epr-15181.ic2", 0x000000, 0x040000, CRC(642437c1) SHA1(cbf88e196c04b6d886bf9642b69bf165045510fe) )
 	ROM_LOAD16_BYTE( "epr-15180.ic1", 0x000001, 0x040000, CRC(73bb48f1) SHA1(981b64f834d5618599352f5fad683bf232390ba3) )
-	/* Game Instruction rom copied to 0x300000 - 0x310000 (odd / even bytes equal) */
+	// Game instruction ROM copied to 0x300000 - 0x310000 (odd / even bytes equal)
 
-	ROM_REGION( 0x8000, "user1", 0 ) /* Game Instructions */
+	ROM_REGION( 0x8000, "user1", 0 ) // Game instructions
 	ROM_LOAD( "epr-15175-03.ic3", 0x000000, 0x08000, CRC(70ea1aec) SHA1(0d9d82a1f8aa51d02707f7b343e7cfb6591efccd) ) // 15175-02b.ic3
 
-	ROM_REGION( 0x20000, "mtbios", 0 ) /* Bios */
+	ROM_REGION( 0x20000, "mtbios", 0 ) // BIOS
 	MEGAPLAY_BIOS
+
+	MEGAPLAY_PLDS
 ROM_END
 
 
-ROM_START( mp_twcup ) /* Tecmo World Cup */
+ROM_START( mp_twcup ) // Tecmo World Cup
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "ep15183.ic2", 0x000000, 0x040000, CRC(8b79b861) SHA1(c72af72840513b82f2562409eccdf13b031bf3c0) )
 	ROM_LOAD16_BYTE( "ep15182.ic1", 0x000001, 0x040000, CRC(eb8325c3) SHA1(bb21ac926c353e14184dd476222bc6a8714606e5) )
-	/* Game Instruction rom copied to 0x300000 - 0x310000 (odd / even bytes equal) */
+	// Game instruction ROM copied to 0x300000 - 0x310000 (odd / even bytes equal)
 
-	ROM_REGION( 0x8000, "user1", 0 ) /* Game Instructions */
+	ROM_REGION( 0x8000, "user1", 0 ) // Game instructions
 	ROM_LOAD( "ep15175-04.ic3", 0x000000, 0x08000, CRC(faf7c030) SHA1(16ef405335b4d3ecb0b7d97b088dafc4278d4726) )
 
-	ROM_REGION( 0x20000, "mtbios", 0 ) /* Bios */
+	ROM_REGION( 0x20000, "mtbios", 0 ) // BIOS
 	MEGAPLAY_BIOS
+
+	MEGAPLAY_PLDS
 ROM_END
 
-ROM_START( mp_sor2 ) /* Streets of Rage 2 */
+ROM_START( mp_sor2 ) // Streets of Rage 2
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_WORD_SWAP( "mpr-15425.ic1", 0x000000, 0x200000, CRC(cd6376af) SHA1(57ec210975e40505649f152b60ef54f99da31f0e) )
-	/* Game Instruction rom copied to 0x300000 - 0x310000 (odd / even bytes equal) */
+	// Game Instruction rom copied to 0x300000 - 0x310000 (odd / even bytes equal)
 
-	ROM_REGION( 0x8000, "user1", 0 ) /* Game Instructions */
+	ROM_REGION( 0x8000, "user1", 0 ) // Game instructions
 	ROM_LOAD( "epr-15175-05.ic2", 0x000000, 0x08000, CRC(1df5347c) SHA1(faced2e875e1914392f61577b5256d006eebeef9) )
 
-	ROM_REGION( 0x20000, "mtbios", 0 ) /* Bios */
+	ROM_REGION( 0x20000, "mtbios", 0 ) // BIOS
 	MEGAPLAY_BIOS
+
+	MEGAPLAY_PLDS
 ROM_END
 
-ROM_START( mp_bio ) /* Bio Hazard Battle */
+ROM_START( mp_bio ) // Bio Hazard Battle
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_WORD_SWAP( "mpr-15699-f.ic1", 0x000000, 0x100000, CRC(4b193229) SHA1(f8629171ae9b4792f142f6957547d886e5cc6817) )
-	/* Game Instruction rom copied to 0x300000 - 0x310000 (odd / even bytes equal) */
+	// Game instruction ROM copied to 0x300000 - 0x310000 (odd / even bytes equal)
 
-	ROM_REGION( 0x8000, "user1", 0 ) /* Game Instructions */
+	ROM_REGION( 0x8000, "user1", 0 ) // Game instructions
 	ROM_LOAD( "epr-15175-06.ic2", 0x000000, 0x08000, CRC(1ef64e41) SHA1(13984b714b014ea41963b70de74a5358ed223bc5) )
 
-	ROM_REGION( 0x20000, "mtbios", 0 ) /* Bios */
+	ROM_REGION( 0x20000, "mtbios", 0 ) // BIOS
 	MEGAPLAY_BIOS
+
+	MEGAPLAY_PLDS
 ROM_END
 
-ROM_START( mp_soni2 ) /* Sonic The Hedgehog 2 */
+ROM_START( mp_soni2 ) // Sonic The Hedgehog 2
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_WORD_SWAP( "mpr-16011.ic1", 0x000000, 0x100000, CRC(3d7bf98a) SHA1(dce0e4e8f2573e0ffe851edaa235e4ed9e61ee2d) )
-	/* Game Instruction rom copied to 0x300000 - 0x310000 (odd / even bytes equal) */
+	// Game instruction ROM copied to 0x300000 - 0x310000 (odd / even bytes equal)
 
-	ROM_REGION( 0x8000, "user1", 0 ) /* Game Instructions */
+	ROM_REGION( 0x8000, "user1", 0 ) // Game instructions
 	ROM_LOAD( "epr-15175-07.ic1", 0x000000, 0x08000, CRC(bb5f67f0) SHA1(33b7a5d14015a5fcf41976a8f648f8f48ce9bb03) )
 
-	ROM_REGION( 0x20000, "mtbios", 0 ) /* Bios */
+	ROM_REGION( 0x20000, "mtbios", 0 ) // BIOS
 	MEGAPLAY_BIOS
+
+	MEGAPLAY_PLDS
 ROM_END
 
-ROM_START( mp_mazin ) /* Mazin Wars */
+ROM_START( mp_mazin ) // Mazin Wars
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_WORD_SWAP( "mpr-16460.ic1", 0x000000, 0x100000, CRC(e9635a83) SHA1(ab3afa11656f0ae3a50c957dce012fb15d3992e0) )
-	/* Game Instruction rom copied to 0x300000 - 0x310000 (odd / even bytes equal) */
+	// Game instruction ROM copied to 0x300000 - 0x310000 (odd / even bytes equal)
 
-	ROM_REGION( 0x8000, "user1", 0 ) /* Game Instructions */
+	ROM_REGION( 0x8000, "user1", 0 ) // Game instructions
 	ROM_LOAD( "epr-15175-11.ic2", 0x000000, 0x08000, CRC(bb651120) SHA1(81cb736f2732373e260dde162249c1d29a3489c3) )
 
-	ROM_REGION( 0x20000, "mtbios", 0 ) /* Bios */
+	ROM_REGION( 0x20000, "mtbios", 0 ) // BIOS
 	MEGAPLAY_BIOS
+
+	MEGAPLAY_PLDS
 ROM_END
 
-ROM_START( mp_shnb3 ) /* Shinobi 3 */
+ROM_START( mp_shnb3 ) // Shinobi 3
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_WORD_SWAP( "mpr-16197.ic1", 0x000000, 0x100000, CRC(48162361) SHA1(77d544509339b5ddf6d19941377e81d29e9e21dc) )
-	/* Game Instruction rom copied to 0x300000 - 0x310000 (odd / even bytes equal) */
+	// Game instruction ROM copied to 0x300000 - 0x310000 (odd / even bytes equal)
 
-	ROM_REGION( 0x8000, "user1", 0 ) /* Game Instructions */
+	ROM_REGION( 0x8000, "user1", 0 ) // Game instructions
 	ROM_LOAD( "epr-15175-09.ic2", 0x000000, 0x08000, CRC(6254e45a) SHA1(8667922a6eade03c964ce224f7fa39ba871c60a4) )
 
-	ROM_REGION( 0x20000, "mtbios", 0 ) /* Bios */
+	ROM_REGION( 0x20000, "mtbios", 0 ) // BIOS
 	MEGAPLAY_BIOS
+
+	MEGAPLAY_PLDS
 ROM_END
 
-ROM_START( mp_gunhe ) /* Gunstar Heroes */
+ROM_START( mp_gunhe ) // Gunstar Heroes
 	ROM_REGION( 0x400000, "maincpu", 0 )
 	ROM_LOAD16_WORD_SWAP( "mpr-16390.ic1", 0x000000, 0x100000, CRC(d963a748) SHA1(adf231c5180a9307fd6675fe77fffd4c5bfa3d6a) )
-	/* Game Instruction rom copied to 0x300000 - 0x310000 (odd / even bytes equal) */
+	// Game instruction ROM copied to 0x300000 - 0x310000 (odd / even bytes equal)
 
-	ROM_REGION( 0x8000, "user1", 0 ) /* Game Instructions */
+	ROM_REGION( 0x8000, "user1", 0 ) // Game instructions
 	ROM_LOAD( "epr-15175-10.ic2", 0x000000, 0x08000, CRC(e4f08233) SHA1(b7e0ad3f6ae1c56df6ec76375842050f08afcbef) )
 
-	ROM_REGION( 0x20000, "mtbios", 0 ) /* Bios */
+	ROM_REGION( 0x20000, "mtbios", 0 ) // BIOS
 	MEGAPLAY_BIOS
+
+	MEGAPLAY_PLDS
 ROM_END
 
 uint16_t mplay_state::extra_ram_r(offs_t offset)
@@ -979,18 +1016,18 @@
 ** Probably reused cart case
 */
 
-/* -- */ GAME( 1993, megaplay, 0,        megaplay, megaplay, mplay_state, init_megaplay, ROT0, "Sega",                  "Mega Play BIOS", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
-/* 01 */ GAME( 1993, mp_sonic, megaplay, megaplay, mp_sonic, mplay_state, init_megaplay, ROT0, "Sega",                  "Sonic The Hedgehog (Mega Play)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
-/* 02 */ GAME( 1993, mp_gaxe2, megaplay, megaplay, mp_gaxe2, mplay_state, init_megaplay, ROT0, "Sega",                  "Golden Axe II (Mega Play) (Rev B)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
-/* 02 */ GAME( 1993, mp_gaxe2a,mp_gaxe2, megaplay, mp_gaxe2, mplay_state, init_megaplay, ROT0, "Sega",                  "Golden Axe II (Mega Play)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
-/* 03 */ GAME( 1993, mp_gslam, megaplay, megaplay, mp_gslam, mplay_state, init_megaplay, ROT0, "Sega",                  "Grand Slam (Mega Play)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
-/* 04 */ GAME( 1993, mp_twcup, megaplay, megaplay, mp_twc,   mplay_state, init_megaplay, ROT0, "Sega",                  "Tecmo World Cup (Mega Play)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
-/* 05 */ GAME( 1993, mp_sor2,  megaplay, megaplay, mp_sor2,  mplay_state, init_megaplay, ROT0, "Sega",                  "Streets of Rage II (Mega Play)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
-/* 06 */ GAME( 1993, mp_bio,   megaplay, megaplay, mp_bio,   mplay_state, init_megaplay, ROT0, "Sega",                  "Bio-hazard Battle (Mega Play)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
-/* 07 */ GAME( 1993, mp_soni2, megaplay, megaplay, mp_soni2, mplay_state, init_megaplay, ROT0, "Sega",                  "Sonic The Hedgehog 2 (Mega Play)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+/* -- */ GAME( 1993, megaplay, 0,        megaplay, megaplay, mplay_state, init_megaplay, ROT0, "Sega", "Mega Play BIOS",                      MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+/* 01 */ GAME( 1993, mp_sonic, megaplay, megaplay, mp_sonic, mplay_state, init_megaplay, ROT0, "Sega", "Sonic The Hedgehog (Mega Play)",      MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+/* 02 */ GAME( 1993, mp_gaxe2, megaplay, megaplay, mp_gaxe2, mplay_state, init_megaplay, ROT0, "Sega", "Golden Axe II (Mega Play) (Rev B)",   MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+/* 02 */ GAME( 1993, mp_gaxe2a,mp_gaxe2, megaplay, mp_gaxe2, mplay_state, init_megaplay, ROT0, "Sega", "Golden Axe II (Mega Play)",           MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+/* 03 */ GAME( 1993, mp_gslam, megaplay, megaplay, mp_gslam, mplay_state, init_megaplay, ROT0, "Sega", "Grand Slam (Mega Play)",              MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+/* 04 */ GAME( 1993, mp_twcup, megaplay, megaplay, mp_twc,   mplay_state, init_megaplay, ROT0, "Sega", "Tecmo World Cup (Mega Play)",         MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+/* 05 */ GAME( 1993, mp_sor2,  megaplay, megaplay, mp_sor2,  mplay_state, init_megaplay, ROT0, "Sega", "Streets of Rage II (Mega Play)",      MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+/* 06 */ GAME( 1993, mp_bio,   megaplay, megaplay, mp_bio,   mplay_state, init_megaplay, ROT0, "Sega", "Bio-hazard Battle (Mega Play)",       MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+/* 07 */ GAME( 1993, mp_soni2, megaplay, megaplay, mp_soni2, mplay_state, init_megaplay, ROT0, "Sega", "Sonic The Hedgehog 2 (Mega Play)",    MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
 /* 08 - Columns 3? see below */
-/* 09 */ GAME( 1993, mp_shnb3, megaplay, megaplay, mp_shnb3, mplay_state, init_megaplay, ROT0, "Sega",                  "Shinobi III (Mega Play)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
-/* 10 */ GAME( 1993, mp_gunhe, megaplay, megaplay, mp_gunhe, mplay_state, init_megaplay, ROT0, "Sega",                  "Gunstar Heroes (Mega Play)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
-/* 11 */ GAME( 1993, mp_mazin, megaplay, megaplay, mp_mazin, mplay_state, init_megaplay, ROT0, "Sega",                  "Mazin Wars / Mazin Saga (Mega Play)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+/* 09 */ GAME( 1993, mp_shnb3, megaplay, megaplay, mp_shnb3, mplay_state, init_megaplay, ROT0, "Sega", "Shinobi III (Mega Play)",             MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+/* 10 */ GAME( 1993, mp_gunhe, megaplay, megaplay, mp_gunhe, mplay_state, init_megaplay, ROT0, "Sega", "Gunstar Heroes (Mega Play)",          MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+/* 11 */ GAME( 1993, mp_mazin, megaplay, megaplay, mp_mazin, mplay_state, init_megaplay, ROT0, "Sega", "Mazin Wars / Mazin Saga (Mega Play)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
 
-/* ?? */ GAME( 1993, mp_col3,  megaplay, megaplay, megaplay, mplay_state, init_megaplay, ROT0, "Sega",                  "Columns III (Mega Play)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
+/* ?? */ GAME( 1993, mp_col3,  megaplay, megaplay, megaplay, mplay_state, init_megaplay, ROT0, "Sega", "Columns III (Mega Play)",             MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/megatech.cpp mame-0.224+dfsg.1/src/mame/drivers/megatech.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/megatech.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/megatech.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -611,7 +611,7 @@
 	uint8_t* pin = memregion("sms_pin")->base();
 	init_mt_slot();
 
-	m_cart_is_genesis[0] = !pin[0] ? 1 : 0;;
+	m_cart_is_genesis[0] = !pin[0] ? 1 : 0;
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mephisto_academy.cpp mame-0.224+dfsg.1/src/mame/drivers/mephisto_academy.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mephisto_academy.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mephisto_academy.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,182 @@
+// license:BSD-3-Clause
+// copyright-holders:Sandro Ronco, hap
+// thanks-to:yoyo_chessboard
+/***************************************************************************
+
+Mephisto Academy
+
+Hardware notes:
+- PCB label HGS 10 130 01
+- VL65NC02-04PC, 4.91Mhz XTAL
+- 2*32KB ROM(TC57256AD-12), 1st ROM half-empty
+- 8KB battery-backed RAM(TC5564APL-15)
+- HD44100H, HD44780, 2*16 chars LCD screen
+- 8 tri-color leds (not fully used: always outputs 6 red, 2 green)
+- magnets chessboard with leds, beeper
+
+Since the program is on an external module, it appears it was meant to be
+a modular chesscomputer. However, no extra modules were sold separately.
+Module PCB is the same as Super Mondial II College, label HGS 10 116 05.
+
+***************************************************************************/
+
+#include "emu.h"
+
+#include "cpu/m6502/m65c02.h"
+#include "machine/74259.h"
+#include "machine/nvram.h"
+#include "machine/mmboard.h"
+#include "video/mmdisplay2.h"
+#include "video/pwm.h"
+
+#include "mephisto_academy.lh"
+
+
+namespace {
+
+class academy_state : public driver_device
+{
+public:
+	academy_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_board(*this, "board")
+		, m_led_pwm(*this, "led_pwm")
+		, m_outlatch(*this, "outlatch")
+		, m_keys(*this, "KEY")
+	{ }
+
+	void academy(machine_config &config);
+
+private:
+	required_device<cpu_device> m_maincpu;
+	required_device<mephisto_board_device> m_board;
+	required_device<pwm_display_device> m_led_pwm;
+	required_device<hc259_device> m_outlatch;
+	required_ioport m_keys;
+
+	void main_map(address_map &map);
+
+	void led_w(u8 data);
+	u8 input_r();
+};
+
+
+
+/******************************************************************************
+    I/O
+******************************************************************************/
+
+void academy_state::led_w(u8 data)
+{
+	// d0-d3: keypad led select
+	// d4-d7: keypad led data
+	m_led_pwm->matrix(data & 0xf, ~data >> 4 & 0xf);
+}
+
+u8 academy_state::input_r()
+{
+	// 74259 Q1 selects keypad
+	u8 data = m_outlatch->q1_r() ? 0 : m_keys->read();
+	return ~m_board->input_r() | data;
+}
+
+
+
+/******************************************************************************
+    Address Maps
+******************************************************************************/
+
+void academy_state::main_map(address_map &map)
+{
+	map(0x0000, 0x1fff).ram().share("nvram");
+	map(0x2400, 0x2400).r(FUNC(academy_state::input_r));
+	map(0x2800, 0x2800).w(m_board, FUNC(mephisto_board_device::mux_w));
+	map(0x2c00, 0x2c00).w(m_board, FUNC(mephisto_board_device::led_w));
+	map(0x3000, 0x3007).w("outlatch", FUNC(hc259_device::write_d7));
+	map(0x3400, 0x3400).w(FUNC(academy_state::led_w));
+	map(0x3800, 0x3801).rw("display:hd44780", FUNC(hd44780_device::read), FUNC(hd44780_device::write));
+	map(0x4000, 0xffff).rom();
+}
+
+
+
+/******************************************************************************
+    Input Ports
+******************************************************************************/
+
+static INPUT_PORTS_START( academy )
+	PORT_START("KEY")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD)     PORT_NAME("TRAIN")  PORT_CODE(KEYCODE_T)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD)     PORT_NAME("INFO")   PORT_CODE(KEYCODE_I)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD)     PORT_NAME("MEM")    PORT_CODE(KEYCODE_M)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD)     PORT_NAME("POS")    PORT_CODE(KEYCODE_O)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD)     PORT_NAME("LEV")    PORT_CODE(KEYCODE_L)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD)     PORT_NAME("FCT")    PORT_CODE(KEYCODE_F)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD)     PORT_NAME("ENT")    PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_F1) // combine for NEW GAME
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD)     PORT_NAME("CL")     PORT_CODE(KEYCODE_BACKSPACE) PORT_CODE(KEYCODE_DEL) PORT_CODE(KEYCODE_F1) // "
+INPUT_PORTS_END
+
+
+
+/******************************************************************************
+    Machine Configs
+******************************************************************************/
+
+void academy_state::academy(machine_config &config)
+{
+	/* basic machine hardware */
+	M65C02(config, m_maincpu, 4.9152_MHz_XTAL);
+	m_maincpu->set_addrmap(AS_PROGRAM, &academy_state::main_map);
+
+	const attotime nmi_period = attotime::from_hz(4.9152_MHz_XTAL / (1 << 13));
+	m_maincpu->set_periodic_int(FUNC(academy_state::nmi_line_pulse), nmi_period);
+
+	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
+
+	HC259(config, m_outlatch); // SN74HC259N
+	m_outlatch->parallel_out_cb().set("display:dac", FUNC(dac_byte_interface::write)).rshift(2).mask(0x03);
+
+	MEPHISTO_SENSORS_BOARD(config, "board");
+	MEPHISTO_DISPLAY_MODULE2(config, "display"); // internal
+
+	PWM_DISPLAY(config, m_led_pwm).set_size(4, 4);
+	config.set_default_layout(layout_mephisto_academy);
+}
+
+
+
+/******************************************************************************
+    ROM Definitions
+******************************************************************************/
+
+ROM_START( academy )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("acad4000.bin", 0x0000, 0x8000, CRC(9c5affdb) SHA1(621d16227e49b0f46ce58ce15107bae23abacadc) )
+	ROM_LOAD("acad8000.bin", 0x8000, 0x8000, CRC(a967922b) SHA1(1327903ff89bf96d72c930c400f367ae19e3ec68) )
+ROM_END
+
+ROM_START( academyg )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("academy_16k_6.3.89", 0x0000, 0x8000, CRC(e242dd6f) SHA1(95d3668b478a93a5d62304d58ef135f848b7d2cf) )
+	ROM_LOAD("academy_32k_6.3.89", 0x8000, 0x8000, CRC(e313d084) SHA1(ced5712d34fcc81bedcd741b7ac9e2ba17bf5235) )
+ROM_END
+
+ROM_START( academyga )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("academy_16k_04.10.88", 0x0000, 0x8000, CRC(89055eaa) SHA1(4b3045a75b9107737db39a8c9ab9c15ec6b0ead6) )
+	ROM_LOAD("academy_32k_04.10.88", 0x8000, 0x8000, CRC(478155db) SHA1(d363ab6d5bc0f47a6cdfa5132b77535ef8da8256) )
+ROM_END
+
+} // anonymous namespace
+
+
+
+/***************************************************************************
+    Game Drivers
+***************************************************************************/
+
+/*    YEAR, NAME,      PARENT   COMPAT  MACHINE   INPUT    CLASS          INIT        COMPANY, FULLNAME, FLAGS */
+CONS( 1989, academy,   0,       0,      academy,  academy, academy_state, empty_init, "Hegener + Glaser", "Mephisto Academy (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1989, academyg,  academy, 0,      academy,  academy, academy_state, empty_init, "Hegener + Glaser", "Mephisto Academy (German, 06-03-89)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1989, academyga, academy, 0,      academy,  academy, academy_state, empty_init, "Hegener + Glaser", "Mephisto Academy (German, 04-10-88)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mephisto_mm1.cpp mame-0.224+dfsg.1/src/mame/drivers/mephisto_mm1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mephisto_mm1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mephisto_mm1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -37,6 +37,7 @@
 ******************************************************************************/
 
 #include "emu.h"
+
 #include "cpu/cosmac/cosmac.h"
 #include "machine/sensorboard.h"
 #include "sound/dac.h"
@@ -44,6 +45,8 @@
 #include "video/pwm.h"
 #include "bus/generic/slot.h"
 #include "bus/generic/carts.h"
+
+#include "softlist.h"
 #include "speaker.h"
 
 // internal artwork
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mephisto_mm2.cpp mame-0.224+dfsg.1/src/mame/drivers/mephisto_mm2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mephisto_mm2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mephisto_mm2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -78,6 +78,7 @@
 ******************************************************************************/
 
 #include "emu.h"
+
 #include "cpu/m6502/m65c02.h"
 #include "machine/74259.h"
 #include "machine/mmboard.h"
@@ -86,6 +87,8 @@
 #include "sound/volt_reg.h"
 #include "bus/generic/slot.h"
 #include "bus/generic/carts.h"
+
+#include "softlist.h"
 #include "speaker.h"
 
 // internal artwork
@@ -573,8 +576,8 @@
 CONS( 1984, mm2c,    mm2,    0,      mm2,      mephisto, mephisto_state, empty_init, "Hegener + Glaser", "Mephisto MM II (set 4)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 CONS( 1984, mm2d,    mm2,    0,      mm2,      mephisto, mephisto_state, empty_init, "Hegener + Glaser", "Mephisto MM II (set 5)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 
-CONS( 1985, bup,     0,      0,      bup,      bup,      mephisto_state, empty_init, "Hegener + Glaser", "Mephisto Blitz- und Problemloesungs-Modul (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1985, bupa,    bup,    0,      bup,      bup,      mephisto_state, empty_init, "Hegener + Glaser", "Mephisto Blitz- und Problemloesungs-Modul (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1985, bup,     0,      0,      bup,      bup,      mephisto_state, empty_init, "Hegener + Glaser", u8"Mephisto Blitz- und Problemlösungs-Modul (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1985, bupa,    bup,    0,      bup,      bup,      mephisto_state, empty_init, "Hegener + Glaser", u8"Mephisto Blitz- und Problemlösungs-Modul (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 
 CONS( 1986, rebel5,  0,      0,      rebel5,   mephisto, mephisto_state, empty_init, "Hegener + Glaser", "Mephisto Rebell 5,0 (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // aka MM III
 CONS( 1986, rebel5a, rebel5, 0,      rebel5,   mephisto, mephisto_state, empty_init, "Hegener + Glaser", "Mephisto Rebell 5,0 (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mephisto_modena.cpp mame-0.224+dfsg.1/src/mame/drivers/mephisto_modena.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mephisto_modena.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mephisto_modena.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,5 +1,6 @@
 // license:BSD-3-Clause
-// copyright-holders:Sandro Ronco
+// copyright-holders:Sandro Ronco, hap
+// thanks-to:yoyo_chessboard
 /**************************************************************************************************
 
 Mephisto Modena
@@ -12,6 +13,7 @@
 #include "emu.h"
 
 #include "cpu/m6502/m65c02.h"
+#include "machine/clock.h"
 #include "machine/nvram.h"
 #include "machine/sensorboard.h"
 #include "machine/timer.h"
@@ -24,10 +26,12 @@
 #include "mephisto_modena.lh"
 
 
-class mephisto_modena_state : public driver_device
+namespace {
+
+class modena_state : public driver_device
 {
 public:
-	mephisto_modena_state(const machine_config &mconfig, device_type type, const char *tag)
+	modena_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
 		, m_board(*this, "board")
@@ -52,21 +56,18 @@
 
 	void modena_mem(address_map &map);
 
-	uint8_t input_r();
-	void digits_w(uint8_t data);
-	void io_w(uint8_t data);
-	void led_w(uint8_t data);
+	u8 input_r();
+	void digits_w(u8 data);
+	void io_w(u8 data);
+	void led_w(u8 data);
 	void update_display();
 
-	TIMER_DEVICE_CALLBACK_MEMBER(nmi_on)  { m_maincpu->set_input_line(M6502_NMI_LINE, ASSERT_LINE); }
-	TIMER_DEVICE_CALLBACK_MEMBER(nmi_off) { m_maincpu->set_input_line(M6502_NMI_LINE, CLEAR_LINE);  }
-
-	uint8_t m_board_mux = 0xff;
-	uint8_t m_digits_idx = 0;
-	uint8_t m_io_ctrl = 0;
+	u8 m_board_mux = 0xff;
+	u8 m_digits_idx = 0;
+	u8 m_io_ctrl = 0;
 };
 
-void mephisto_modena_state::machine_start()
+void modena_state::machine_start()
 {
 	m_digits.resolve();
 
@@ -80,14 +81,14 @@
     I/O
 ******************************************************************************/
 
-void mephisto_modena_state::update_display()
+void modena_state::update_display()
 {
 	m_display->matrix(m_io_ctrl >> 1 & 7, ~m_board_mux);
 }
 
-uint8_t mephisto_modena_state::input_r()
+u8 modena_state::input_r()
 {
-	uint8_t data = 0;
+	u8 data = 0;
 
 	// read buttons
 	if (~m_io_ctrl & 1)
@@ -101,14 +102,14 @@
 	return data;
 }
 
-void mephisto_modena_state::led_w(uint8_t data)
+void modena_state::led_w(u8 data)
 {
 	// d0-d7: chessboard mux, led data
 	m_board_mux = data;
 	update_display();
 }
 
-void mephisto_modena_state::io_w(uint8_t data)
+void modena_state::io_w(u8 data)
 {
 	// d0: button select
 	// d1-d3: led select
@@ -119,7 +120,7 @@
 	m_dac->write(BIT(data, 6));
 }
 
-void mephisto_modena_state::digits_w(uint8_t data)
+void modena_state::digits_w(u8 data)
 {
 	m_digits[m_digits_idx] = data ^ ((m_io_ctrl & 0x10) ? 0xff : 0x00);
 	m_digits_idx = (m_digits_idx + 1) & 3;
@@ -131,13 +132,13 @@
     Address Maps
 ******************************************************************************/
 
-void mephisto_modena_state::modena_mem(address_map &map)
+void modena_state::modena_mem(address_map &map)
 {
 	map(0x0000, 0x1fff).ram().share("nvram");
-	map(0x4000, 0x4000).w(FUNC(mephisto_modena_state::digits_w));
-	map(0x5000, 0x5000).w(FUNC(mephisto_modena_state::led_w));
-	map(0x6000, 0x6000).w(FUNC(mephisto_modena_state::io_w));
-	map(0x7000, 0x7000).r(FUNC(mephisto_modena_state::input_r));
+	map(0x4000, 0x4000).w(FUNC(modena_state::digits_w));
+	map(0x5000, 0x5000).w(FUNC(modena_state::led_w));
+	map(0x6000, 0x6000).w(FUNC(modena_state::io_w));
+	map(0x7000, 0x7000).r(FUNC(modena_state::input_r));
 	map(0x7f00, 0x7fff).nopr(); // dummy read on 6502 absolute X page wrap
 	map(0x8000, 0xffff).rom().region("maincpu", 0);
 }
@@ -166,15 +167,14 @@
     Machine Configs
 ******************************************************************************/
 
-void mephisto_modena_state::modena(machine_config &config)
+void modena_state::modena(machine_config &config)
 {
 	/* basic machine hardware */
-	M65C02(config, m_maincpu, XTAL(4'194'304)); // W65C02SP or RP65C02G
-	m_maincpu->set_addrmap(AS_PROGRAM, &mephisto_modena_state::modena_mem);
-	timer_device &nmi_on(TIMER(config, "nmi_on"));
-	nmi_on.configure_periodic(FUNC(mephisto_modena_state::nmi_on), attotime::from_hz(XTAL(4'194'304) / (1 << 13)));
-	nmi_on.set_start_delay(attotime::from_hz(XTAL(4'194'304) / (1 << 13)) - attotime::from_usec(975)); // active for 975us
-	TIMER(config, "nmi_off").configure_periodic(FUNC(mephisto_modena_state::nmi_off), attotime::from_hz(XTAL(4'194'304) / (1 << 13)));
+	M65C02(config, m_maincpu, 4.194304_MHz_XTAL); // W65C02SP or RP65C02G
+	m_maincpu->set_addrmap(AS_PROGRAM, &modena_state::modena_mem);
+
+	clock_device &nmi_clock(CLOCK(config, "nmi_clock", 4.194304_MHz_XTAL / (1 << 13))); // active for 975us
+	nmi_clock.signal_handler().set_inputline(m_maincpu, INPUT_LINE_NMI);
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
 
@@ -214,13 +214,15 @@
 	ROM_LOAD("modena_4929_270192.u3", 0x0000, 0x8000, CRC(99212677) SHA1(f0565e5441fb38df201176d01793c953886b0303) )
 ROM_END
 
+} // anonymous namespace
+
 
 
 /***************************************************************************
     Game driver(s)
 ***************************************************************************/
 
-/*    YEAR  NAME      PARENT  COMPAT  MACHINE   INPUT   CLASS                   INIT        COMPANY             FULLNAME                   FLAGS */
-CONS( 1992, modena,   0,      0,      modena,   modena, mephisto_modena_state,  empty_init, "Hegener + Glaser", "Mephisto Modena (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1992, modenaa,  modena, 0,      modena,   modena, mephisto_modena_state,  empty_init, "Hegener + Glaser", "Mephisto Modena (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1992, modenab,  modena, 0,      modena,   modena, mephisto_modena_state,  empty_init, "Hegener + Glaser", "Mephisto Modena (set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+/*    YEAR  NAME      PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT        COMPANY             FULLNAME                   FLAGS */
+CONS( 1992, modena,   0,      0,      modena,  modena, modena_state, empty_init, "Hegener + Glaser", "Mephisto Modena (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1992, modenaa,  modena, 0,      modena,  modena, modena_state, empty_init, "Hegener + Glaser", "Mephisto Modena (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1992, modenab,  modena, 0,      modena,  modena, modena_state, empty_init, "Hegener + Glaser", "Mephisto Modena (set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mephisto_mondial68k.cpp mame-0.224+dfsg.1/src/mame/drivers/mephisto_mondial68k.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mephisto_mondial68k.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mephisto_mondial68k.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,5 +1,5 @@
 // license:BSD-3-Clause
-// copyright-holders:Sandro Ronco
+// copyright-holders:Sandro Ronco, hap
 // thanks-to:Berger
 /***************************************************************************
 
@@ -30,6 +30,8 @@
 #include "mephisto_mondial68k.lh"
 
 
+namespace {
+
 class mondial68k_state : public driver_device
 {
 public:
@@ -51,9 +53,9 @@
 	void mondial68k_mem(address_map &map);
 
 	void lcd_s_w(u32 data);
-	void input_mux_w(uint8_t data);
-	void board_mux_w(uint8_t data);
-	uint8_t inputs_r();
+	void input_mux_w(u8 data);
+	void board_mux_w(u8 data);
+	u8 inputs_r();
 	void update_display();
 
 	required_device<cpu_device> m_maincpu;
@@ -63,8 +65,8 @@
 	required_ioport_array<4> m_inputs;
 	output_finder<4> m_digits;
 
-	uint8_t m_input_mux = 0xff;
-	uint8_t m_board_mux = 0xff;
+	u8 m_input_mux = 0xff;
+	u8 m_board_mux = 0xff;
 };
 
 
@@ -94,14 +96,14 @@
 		m_digits[i] = bitswap<8>((data & 0x7fffffff) >> (8 * i), 7,4,5,0,1,2,3,6);
 }
 
-void mondial68k_state::board_mux_w(uint8_t data)
+void mondial68k_state::board_mux_w(u8 data)
 {
 	// d0-d7: chessboard mux, led data
 	m_board_mux = data;
 	update_display();
 }
 
-void mondial68k_state::input_mux_w(uint8_t data)
+void mondial68k_state::input_mux_w(u8 data)
 {
 	// d0-d3: button mux
 	// d6,d7: led select
@@ -109,9 +111,9 @@
 	update_display();
 }
 
-uint8_t mondial68k_state::inputs_r()
+u8 mondial68k_state::inputs_r()
 {
-	uint8_t data = 0x00;
+	u8 data = 0x00;
 
 	// read buttons
 	for (int i=0; i<4; i++)
@@ -223,6 +225,8 @@
 	ROM_LOAD16_BYTE("68000xl_l_06.11.87", 0x0001, 0x8000, CRC(564e32c5) SHA1(8c9df46bc5ced114e72fb663f1055d775b8e2e0b) )
 ROM_END
 
+} // anonymous namespace
+
 
 
 /***************************************************************************
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mephisto_montec.cpp mame-0.224+dfsg.1/src/mame/drivers/mephisto_montec.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mephisto_montec.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mephisto_montec.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -16,6 +16,7 @@
     - split driver into several files?
     - megaiv/smondial leds are tri-color
     - why are megaiv/smondial2 beeps noisy?
+    - what is montec 0x2000? (it can't be nmi ack)
     - add Monte Carlo IV (non-LE)
 
 **************************************************************************************************/
@@ -65,8 +66,6 @@
 
 protected:
 	uint8_t montec_input_r();
-	uint8_t montec_nmi_ack_r();
-	void montec_nmi_ack_w(uint8_t data);
 	void montec_led_w(uint8_t data);
 	template<int N> void montec_lcd_s_w(uint32_t data);
 
@@ -154,18 +153,6 @@
 	return m_board->input_r() ^ 0xff;
 }
 
-uint8_t mephisto_montec_state::montec_nmi_ack_r()
-{
-	if (!machine().side_effects_disabled())
-		m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
-	return 0;
-}
-
-void mephisto_montec_state::montec_nmi_ack_w(uint8_t data)
-{
-	m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
-}
-
 void mephisto_montec_state::megaiv_led_w(uint8_t data)
 {
 	if (m_leds_mux != m_board->mux_r())
@@ -199,7 +186,7 @@
 void mephisto_montec_state::montec_mem(address_map &map)
 {
 	map(0x0000, 0x1fff).ram().share("nvram");
-	map(0x2000, 0x2000).rw(FUNC(mephisto_montec_state::montec_nmi_ack_r), FUNC(mephisto_montec_state::montec_nmi_ack_w));
+	map(0x2000, 0x2000).noprw(); // ?
 	map(0x2400, 0x2400).r(FUNC(mephisto_montec_state::montec_input_r));
 	map(0x2800, 0x2800).w(m_board, FUNC(mephisto_board_device::mux_w));
 	map(0x2c00, 0x2c00).w(m_board, FUNC(mephisto_board_device::led_w));
@@ -336,7 +323,7 @@
 {
 	M65C02(config, m_maincpu, XTAL(8'000'000) / 2); // R65C02P4
 	m_maincpu->set_addrmap(AS_PROGRAM, &mephisto_montec_state::montec_mem);
-	m_maincpu->set_periodic_int(FUNC(mephisto_montec_state::nmi_line_assert), attotime::from_hz(XTAL(8'000'000) / (1 << 14)));
+	m_maincpu->set_periodic_int(FUNC(mephisto_montec_state::nmi_line_pulse), attotime::from_hz(XTAL(8'000'000) / (1 << 14)));
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
 
@@ -485,4 +472,4 @@
 
 CONS( 1987, montec,     0,        0,      montec,    montec,    mephisto_montec_state, empty_init, "Hegener + Glaser", "Mephisto Monte Carlo (ver. MC3)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 CONS( 1987, monteca,    montec,   0,      montec,    montec,    mephisto_montec_state, empty_init, "Hegener + Glaser", "Mephisto Monte Carlo (ver. MC2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1990, monteciv,   montec,   0,      monteciv,  montec,    mephisto_montec_state, empty_init, "Hegener + Glaser", "Mephisto Monte Carlo IV - Limited Edition", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1990, monteciv,   0,        0,      monteciv,  montec,    mephisto_montec_state, empty_init, "Hegener + Glaser", "Mephisto Monte Carlo IV - Limited Edition", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mephisto_polgar.cpp mame-0.224+dfsg.1/src/mame/drivers/mephisto_polgar.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mephisto_polgar.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mephisto_polgar.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -25,7 +25,6 @@
 #include "speaker.h"
 
 // internal artwork
-#include "mephisto_academy.lh"
 #include "mephisto_milano.lh"
 #include "mephisto_polgar.lh"
 
@@ -99,32 +98,6 @@
 	uint8_t m_led_latch;
 };
 
-class mephisto_academy_state : public mephisto_polgar_state
-{
-public:
-	mephisto_academy_state(const machine_config &mconfig, device_type type, const char *tag)
-		: mephisto_polgar_state(mconfig, type, tag)
-		, m_board(*this, "board")
-		, m_leds(*this, "led%u", 100U)
-	{ }
-
-	INTERRUPT_GEN_MEMBER(academy_irq);
-	DECLARE_WRITE_LINE_MEMBER(academy_nmi_w);
-	void academy_led_w(uint8_t data);
-	uint8_t academy_input_r();
-
-	void academy(machine_config &config);
-	void academy_mem(address_map &map);
-protected:
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-
-private:
-	required_device<mephisto_board_device> m_board;
-	output_finder<16> m_leds;
-	bool m_enable_nmi;
-};
-
 uint8_t mephisto_polgar_state::polgar_keys_r(offs_t offset)
 {
 	return (BIT(m_keys->read(), offset) << 7) | 0x7f;
@@ -217,50 +190,6 @@
 }
 
 
-INTERRUPT_GEN_MEMBER(mephisto_academy_state::academy_irq)
-{
-	if (m_enable_nmi)
-		device.execute().pulse_input_line(INPUT_LINE_NMI, attotime::zero);
-}
-
-WRITE_LINE_MEMBER(mephisto_academy_state::academy_nmi_w)
-{
-	m_enable_nmi = state;
-}
-
-void mephisto_academy_state::academy_led_w(uint8_t data)
-{
-	for(int i=0; i<4; i++)
-		for(int j=0; j<4; j++)
-		{
-			if (BIT(data, i))
-				m_leds[j * 4 + i] = BIT(data, 4 + j) ? 0 : 1;
-		}
-}
-
-uint8_t mephisto_academy_state::academy_input_r()
-{
-	uint8_t data;
-	if (m_board->mux_r() == 0xff)
-		data = m_keys->read();
-	else
-		data = m_board->input_r();
-
-	return data ^ 0xff;
-}
-
-void mephisto_academy_state::academy_mem(address_map &map)
-{
-	map(0x0000, 0x1fff).ram().share("nvram");
-	map(0x2400, 0x2400).r(FUNC(mephisto_academy_state::academy_input_r));
-	map(0x2800, 0x2800).w(m_board, FUNC(mephisto_board_device::mux_w));
-	map(0x2c00, 0x2c00).w(m_board, FUNC(mephisto_board_device::led_w));
-	map(0x3000, 0x3007).w("outlatch", FUNC(hc259_device::write_d7));
-	map(0x3400, 0x3400).w(FUNC(mephisto_academy_state::academy_led_w));
-	map(0x3800, 0x3801).rw("display:hd44780", FUNC(hd44780_device::read), FUNC(hd44780_device::write));
-	map(0x4000, 0xffff).rom();
-}
-
 static INPUT_PORTS_START( polgar )
 	PORT_START("KEY")
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD)     PORT_NAME("Trn")    PORT_CODE(KEYCODE_T)
@@ -290,16 +219,6 @@
 	m_led_latch = 0;
 }
 
-void mephisto_academy_state::machine_start()
-{
-	m_leds.resolve();
-}
-
-void mephisto_academy_state::machine_reset()
-{
-	m_enable_nmi = true;
-}
-
 void mephisto_polgar_state::polgar(machine_config &config)
 {
 	M65C02(config, m_maincpu, XTAL(4'915'200)); // RP65C02G
@@ -363,22 +282,15 @@
 	config.set_default_layout(layout_mephisto_milano);
 }
 
-void mephisto_academy_state::academy(machine_config &config)
-{
-	polgar(config); // CPU: VL65NC02-04PC, 4.9152Mhz
-	m_maincpu->set_addrmap(AS_PROGRAM, &mephisto_academy_state::academy_mem);
-
-	hc259_device &outlatch(HC259(config.replace(), "outlatch"));
-	outlatch.q_out_cb<1>().set(FUNC(mephisto_academy_state::academy_nmi_w));
-	outlatch.q_out_cb<2>().set("display:dac", FUNC(dac_byte_interface::write));
-
-	config.set_default_layout(layout_mephisto_academy);
-}
-
 
 ROM_START( polgar )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD("polgar_1.5_1.2.1990", 0x0000, 0x10000, CRC(88d55c0f) SHA1(e86d088ec3ac68deaf90f6b3b97e3e31b1515913) )
+	ROM_LOAD("polgar_1.5_01.02.1990", 0x0000, 0x10000, CRC(88d55c0f) SHA1(e86d088ec3ac68deaf90f6b3b97e3e31b1515913) )
+ROM_END
+
+ROM_START( polgara )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("polgar_1.10_04.08.1989", 0x0000, 0x10000, CRC(a4519c55) SHA1(35463a4cbcf20ebbd5ac5bc7664a862b1557c65f) ) // TC57512AD-15
 ROM_END
 
 ROM_START( polgar10 )
@@ -405,24 +317,6 @@
 	ROM_LOAD("risc_2.31", 0x00000, 0x20000, CRC(9ecf9cd3) SHA1(7bfc628183037a172242c9589f15aca218d8fb12) )
 ROM_END
 
-ROM_START( academy )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD("acad4000.bin", 0x4000, 0x4000, CRC(ee1222b5) SHA1(98541d87755a7186b69b9723cc4adbd07f20f0e2) )
-	ROM_LOAD("acad8000.bin", 0x8000, 0x8000, CRC(a967922b) SHA1(1327903ff89bf96d72c930c400f367ae19e3ec68) )
-ROM_END
-
-ROM_START( academyg )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD("academy_16k_6.3.89", 0x4000, 0x4000, CRC(900a0001) SHA1(174a6bc3bde55994c603e232fcb45fccd62f11f6) )
-	ROM_LOAD("academy_32k_6.3.89", 0x8000, 0x8000, CRC(e313d084) SHA1(ced5712d34fcc81bedcd741b7ac9e2ba17bf5235) )
-ROM_END
-
-ROM_START( academyga )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD("academy_16k_04.10.88", 0x4000, 0x4000, CRC(fb4d83c4) SHA1(f5132042c3b5a17c173f81eaa57e313ff0bb848e) )
-	ROM_LOAD("academy_32k_04.10.88", 0x8000, 0x8000, CRC(478155db) SHA1(d363ab6d5bc0f47a6cdfa5132b77535ef8da8256) )
-ROM_END
-
 ROM_START( milano )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD("milano102.bin", 0x0000, 0x10000, CRC(0e9c8fe1) SHA1(e9176f42d86fe57e382185c703c7eff7e63ca711) )
@@ -444,7 +338,8 @@
 ***************************************************************************/
 
 /*    YEAR  NAME       PARENT   COMPAT  MACHINE   INPUT   CLASS                   INIT        COMPANY             FULLNAME                  FLAGS */
-CONS( 1989, polgar,    0,       0,      polgar,   polgar, mephisto_polgar_state,  empty_init, "Hegener + Glaser", "Mephisto Polgar (v1.5)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1990, polgar,    0,       0,      polgar,   polgar, mephisto_polgar_state,  empty_init, "Hegener + Glaser", "Mephisto Polgar (v1.50)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1989, polgara,   polgar,  0,      polgar,   polgar, mephisto_polgar_state,  empty_init, "Hegener + Glaser", "Mephisto Polgar (v1.10)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 CONS( 1990, polgar10,  polgar,  0,      polgar10, polgar, mephisto_polgar_state,  empty_init, "Hegener + Glaser", "Mephisto Polgar 10 MHz (v10.0)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 CONS( 1990, polgar101, polgar,  0,      polgar10, polgar, mephisto_polgar_state,  empty_init, "Hegener + Glaser", "Mephisto Polgar 10 MHz (v10.1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 
@@ -452,10 +347,6 @@
 CONS( 1994, mrisc2,    mrisc,   0,      mrisc,    polgar, mephisto_risc_state,    empty_init, "Hegener + Glaser / Tasc", "Mephisto Risc II",  MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 
 // not modular boards
-CONS( 1989, academy,   0,       0,      academy,  polgar, mephisto_academy_state, empty_init, "Hegener + Glaser", "Mephisto Academy (English)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1989, academyg,  academy, 0,      academy,  polgar, mephisto_academy_state, empty_init, "Hegener + Glaser", "Mephisto Academy (German, 06-03-89)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1989, academyga, academy, 0,      academy,  polgar, mephisto_academy_state, empty_init, "Hegener + Glaser", "Mephisto Academy (German, 04-10-88)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-
 CONS( 1991, milano,    0,       0,      milano,   polgar, mephisto_milano_state,  empty_init, "Hegener + Glaser", "Mephisto Milano (v1.02)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 CONS( 1991, milanoa,   milano,  0,      milano,   polgar, mephisto_milano_state,  empty_init, "Hegener + Glaser", "Mephisto Milano (v1.01)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
 CONS( 1993, nshort,    milano,  0,      milano,   polgar, mephisto_milano_state,  empty_init, "Hegener + Glaser", "Mephisto Nigel Short", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/metalmx.cpp mame-0.224+dfsg.1/src/mame/drivers/metalmx.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/metalmx.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/metalmx.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -286,10 +286,17 @@
 	/* TODO: TMS34020 should take care of this */
 
 //  uint32_t *src_base = &gsp_vram[(vreg_base[0x40/4] & 0x40) ? 0x20000 : 0];
-	uint16_t const *const src_base = m_gsp_vram;
+	uint32_t const *const src_base = &m_gsp_vram[0];
 
 	for (int y = (std::max)(0, cliprect.min_y); y <= (std::min)(383, cliprect.max_y); ++y)
-		std::copy_n(&src_base[512 * y], 512, &bitmap.pix16(y));
+	{
+		uint16_t *pix = &bitmap.pix16(y);
+		for (int x = 0; x < 256; x++)
+		{
+			*pix++ = src_base[256 * y + x] & 0xffff;
+			*pix++ = src_base[256 * y + x] >> 16;
+		}
+	}
 
 	return 0;
 }
@@ -408,45 +415,40 @@
 {
 	address_space &gsp_space = m_gsp->space(AS_PROGRAM);
 
-	gsp_space.write_word((0xc0000000 + (offset << 5) + 0x10) / 8, data);
-	gsp_space.write_word((0xc0000000 + (offset << 5))/ 8 , data >> 16);
+	gsp_space.write_dword(0xc0000000 + (offset << 5), (data << 16) | (data >> 16));
 }
 
 uint32_t metalmx_state::host_gsp_r(offs_t offset)
 {
 	address_space &gsp_space = m_gsp->space(AS_PROGRAM);
-	uint32_t val;
 
-	val  = gsp_space.read_word((0xc0000000 + (offset << 5) + 0x10) / 8);
-	val |= gsp_space.read_word((0xc0000000 + (offset << 5)) / 8) << 16;
-	return val;
+	uint32_t val = gsp_space.read_dword(0xc0000000 + (offset << 5));
+	return (val << 16) | (val >> 16);
 }
 
 
 uint32_t metalmx_state::host_dram_r(offs_t offset)
 {
-	return (m_gsp_dram[offset * 2] << 16) | m_gsp_dram[offset * 2 + 1];
+	return (m_gsp_dram[offset] << 16) | (m_gsp_dram[offset] >> 16);
 }
 
 void metalmx_state::host_dram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
 {
-	COMBINE_DATA(m_gsp_dram + offset * 2 + 1);
-	data >>= 16;
-	mem_mask >>= 16;
-	COMBINE_DATA(m_gsp_dram + offset * 2);
+	data = (data << 16) | (data >> 16);
+	mem_mask = (mem_mask << 16) | (mem_mask >> 16);
+	COMBINE_DATA(&m_gsp_dram[offset]);
 }
 
 uint32_t metalmx_state::host_vram_r(offs_t offset)
 {
-	return (m_gsp_vram[offset * 2] << 16) | m_gsp_vram[offset * 2 + 1];
+	return (m_gsp_vram[offset] << 16) | (m_gsp_vram[offset] >> 16);
 }
 
 void metalmx_state::host_vram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
 {
-	COMBINE_DATA(m_gsp_vram + offset * 2 + 1);
-	data >>= 16;
-	mem_mask >>= 16;
-	COMBINE_DATA(m_gsp_vram + offset * 2);
+	data = (data << 16) | (data >> 16);
+	mem_mask = (mem_mask << 16) | (mem_mask >> 16);
+	COMBINE_DATA(&m_gsp_vram[offset]);
 }
 
 
@@ -525,8 +527,8 @@
 
 void metalmx_state::gsp_map(address_map &map)
 {
-	map(0x88800000, 0x8880000f).ram(); /* ? */
-	map(0x88c00000, 0x88c0000f).ram(); /* ? */
+	map(0x88800000, 0x8880001f).ram(); /* ? */
+	map(0x88c00000, 0x88c0001f).ram(); /* ? */
 	map(0xff000000, 0xff7fffff).ram().share("gsp_dram");
 	map(0xff800000, 0xffffffff).ram().share("gsp_vram");
 }
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/metro.cpp mame-0.224+dfsg.1/src/mame/drivers/metro.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/metro.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/metro.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3606,8 +3606,10 @@
 
 	m_screen->screen_vblank().set(FUNC(metro_state::vblank_irq));
 
-	m_vdp2->set_tmap_xoffsets(-16,-16,-16);
-	m_vdp2->set_tmap_yoffsets(-16,-16,-16);
+	m_vdp2->set_tmap_xoffsets(0,0,0);
+	m_vdp2->set_tmap_yoffsets(0,0,0);
+	m_vdp2->set_tmap_flip_xoffsets(16,16,16);
+	m_vdp2->set_tmap_flip_yoffsets(16,16,16);
 
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/microdar.cpp mame-0.224+dfsg.1/src/mame/drivers/microdar.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/microdar.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/microdar.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -59,18 +59,20 @@
 **************************************************************************
 
 Known machines using this hardware:
-___________________________________________________________________________________________________________
-|Dumped | Name       | Manufacturer | Notes                                                               |
-|-------|------------|--------------|---------------------------------------------------------------------|
-|  NO   | Sagitario  | CIC Play     | CPU silkscreened "REF 0034 9115S", without manufacturer logos       |
-|  YES  | Unknown    | Bifuca       | Added as "microdar". Standard Microdar SPD with Philips REF34VA     |
-|  NO   | Party Darts| Compumatic   | More info: http://www.recreativas.org/party-darts-4906-compumatic   |
-|  NO   | Diamant    | Unknown      | Newer PCB with Philips REF34VA and additional Compumatic custom ICs |
-|  NO   | Tiger Dart | Unknown      | Standard Microdar SPD with Philips REF34VA                          |
-|_______|____________|______________|_____________________________________________________________________|
+____________________________________________________________________________________________________________________________________________
+|Dumped | Name        | Manufacturer     | Notes                                                               | Machine type               |
+|-------|-------------|------------------|---------------------------------------------------------------------|----------------------------|
+|  NO   | Sagitario   | CIC Play         | CPU silkscreened "REF 0034 9115S", without manufacturer logos       | Darts                      |
+|  YES  | Diana Bifuca| Compumatic/Bifuca| Standard Microdar SPD with Philips REF34VA. "Bifuca" string on ROM  | Darts                      |
+|  NO   | Party Darts | Compumatic       | More info: http://www.recreativas.org/party-darts-4906-compumatic   | Darts                      |
+|  NO   | Diamant     | Unknown          | Newer PCB with Philips REF34VA and additional Compumatic custom ICs | Darts                      |
+|  NO   | Tiger Dart  | Unknown          | Standard Microdar SPD with Philips REF34VA                          | Darts                      |
+|  YES  | Far West    | Compumatic       | Standard Microdar SPD with Philips REF34VA                          | Electromechanical shooting |
+|  YES  | Unknown     | Compumatic       | Compumatic ProSPDP-V3 PCB (Philips REF34VA + REF0096 + REF8032)     | Darts                      |
+|  YES  | Diana Olakoa| Compumatic/Olaoka| Compumatic Microdard-V5 PCB (REF0034 + REF0032 + REF0096)           | Darts                      |
+|_______|_____________|__________________|_____________________________________________________________________|____________________________|
 
-There's a later revision of the Compumatic Microdar PCB (V5), smaller, with a standard Atmel AT89S51
-instead of the REF34 CPU.
+There's a later revision of the Compumatic Microdar, smaller, with a standard Atmel AT89S51 instead of the REF34 CPU.
 
 */
 
@@ -90,6 +92,8 @@
 	}
 
 	void microdar(machine_config &config);
+	void prospdp(machine_config &config);
+	void microdv5(machine_config &config);
 
 private:
 	void prog_map(address_map &map);
@@ -119,100 +123,114 @@
 	m_maincpu->set_addrmap(AS_IO, &microdar_state::ext_map);
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); // GM76C88ALK-15 + battery
-
-	I2C_24C16(config, m_eeprom); // 24LC16B
+	I2C_24C16(config, m_eeprom);
 
 	// Code also references some sort of serial RTC?
 }
 
+void microdar_state::prospdp(machine_config &config)
+{
+	microdar(config);
+	m_maincpu->set_clock(24_MHz_XTAL);
+}
 
-ROM_START(microdar)
-	ROM_REGION(0x1000, "maincpu", ROMREGION_ERASE00)
-	ROM_LOAD("ref34va_k7v5534_9818h-.ic1", 0x0000, 0x1000, NO_DUMP)
-	ROM_FILL(0x0000, 1, 0x02) // temporary LJMP to external init code
-	ROM_FILL(0x0001, 1, 0x10)
-	ROM_FILL(0x0002, 1, 0x1b)
-	ROM_FILL(0x000b, 1, 0x02) // temporary LJMP to interrupt handler
-	ROM_FILL(0x000c, 1, 0x10)
-	ROM_FILL(0x000d, 1, 0x15)
-	ROM_FILL(0x001b, 1, 0x02) // temporary LJMP to interrupt handler
-	ROM_FILL(0x001c, 1, 0x10)
-	ROM_FILL(0x001d, 1, 0x18)
-	ROM_FILL(0x0058, 1, 0x32) // RETI stubs
-	ROM_FILL(0x00af, 1, 0x32)
-	ROM_FILL(0x00c9, 1, 0x02) // temporary LJMP to end of interrupt handler
-	ROM_FILL(0x00ca, 1, 0x12)
-	ROM_FILL(0x00cb, 1, 0xd1)
-	ROM_FILL(0x0135, 1, 0x22) // RET stubs
-	ROM_FILL(0x0163, 1, 0x22)
-	ROM_FILL(0x0185, 1, 0x22)
-	ROM_FILL(0x01cf, 1, 0x22)
-	ROM_FILL(0x02de, 1, 0x22)
-	ROM_FILL(0x02fa, 1, 0x22)
-	ROM_FILL(0x0308, 1, 0x22)
-	ROM_FILL(0x0313, 1, 0x22)
-	ROM_FILL(0x037d, 1, 0x22)
-	ROM_FILL(0x03be, 1, 0x22)
-	ROM_FILL(0x0496, 1, 0x22)
-	ROM_FILL(0x04ce, 1, 0x22)
-	ROM_FILL(0x0514, 1, 0x22)
-	ROM_FILL(0x0520, 1, 0x22)
-	ROM_FILL(0x0550, 1, 0x22)
-	ROM_FILL(0x0574, 1, 0x22)
-	ROM_FILL(0x05b4, 1, 0x22)
-	ROM_FILL(0x05bb, 1, 0x22)
-	ROM_FILL(0x05ca, 1, 0x22)
-	ROM_FILL(0x05d8, 1, 0x22)
-	ROM_FILL(0x0605, 1, 0x22)
-	ROM_FILL(0x0638, 1, 0x22)
-	ROM_FILL(0x068a, 1, 0x22)
-	ROM_FILL(0x06a2, 1, 0x22)
-	ROM_FILL(0x06bd, 1, 0x22)
-	ROM_FILL(0x06db, 1, 0x22)
-	ROM_FILL(0x0708, 1, 0x22)
-	ROM_FILL(0x0715, 1, 0x22)
-	ROM_FILL(0x072d, 1, 0x22)
-	ROM_FILL(0x0744, 1, 0x22)
-	ROM_FILL(0x0751, 1, 0x22)
-	ROM_FILL(0x0767, 1, 0x22)
-	ROM_FILL(0x0772, 1, 0x22)
-	ROM_FILL(0x077d, 1, 0x22)
-	ROM_FILL(0x07a4, 1, 0x22)
-	ROM_FILL(0x07c2, 1, 0x22)
-	ROM_FILL(0x0802, 1, 0x22)
-	ROM_FILL(0x0836, 1, 0x22)
-	ROM_FILL(0x087d, 1, 0x22)
-	ROM_FILL(0x0893, 1, 0x22)
-	ROM_FILL(0x0930, 1, 0x22)
-	ROM_FILL(0x094a, 1, 0x22)
-	ROM_FILL(0x095a, 1, 0x22)
-	ROM_FILL(0x096a, 1, 0x22)
-	ROM_FILL(0x097b, 1, 0x22)
-	ROM_FILL(0x098f, 1, 0x22)
-	ROM_FILL(0x09a3, 1, 0x22)
-	ROM_FILL(0x09c0, 1, 0x22)
-	ROM_FILL(0x0a21, 1, 0x22)
-	ROM_FILL(0x0a54, 1, 0x22)
-	ROM_FILL(0x0a63, 1, 0x22)
-	ROM_FILL(0x0a73, 1, 0x22)
-	ROM_FILL(0x0a90, 1, 0x22)
-	ROM_FILL(0x0ae8, 1, 0x22)
-	ROM_FILL(0x0abf, 1, 0x22)
-	ROM_FILL(0x0ac7, 1, 0x22)
-	ROM_FILL(0x0b11, 1, 0x22)
-	ROM_FILL(0x0b7f, 1, 0x22)
-	ROM_FILL(0x0bf1, 1, 0x22)
-	ROM_FILL(0x0bf6, 1, 0x22)
-	ROM_FILL(0x0c4a, 1, 0x22)
-	ROM_FILL(0x0c59, 1, 0x22)
-	ROM_FILL(0x0c64, 1, 0x22)
-	ROM_FILL(0x0c99, 1, 0x22)
-	ROM_FILL(0x0ca8, 1, 0x22)
-	ROM_FILL(0x0cbd, 1, 0x22)
-	ROM_FILL(0x0dac, 1, 0x22)
-	ROM_FILL(0x0dca, 1, 0x22)
+void microdar_state::microdv5(machine_config &config)
+{
+	microdar(config);
+	m_maincpu->set_clock(16_MHz_XTAL);
+}
+
+#define PHILIPS_REF34VA \
+	ROM_REGION(0x1000, "maincpu", ROMREGION_ERASE00) \
+	ROM_LOAD("ref34va.ic1", 0x0000, 0x1000, NO_DUMP) \
+	ROM_FILL(0x0000, 1, 0x02) /* temporary LJMP to external init code */ \
+	ROM_FILL(0x0001, 1, 0x10) \
+	ROM_FILL(0x0002, 1, 0x1b) \
+	ROM_FILL(0x000b, 1, 0x02) /* temporary LJMP to interrupt handler */ \
+	ROM_FILL(0x000c, 1, 0x10) \
+	ROM_FILL(0x000d, 1, 0x15) \
+	ROM_FILL(0x001b, 1, 0x02) /* temporary LJMP to interrupt handler */ \
+	ROM_FILL(0x001c, 1, 0x10) \
+	ROM_FILL(0x001d, 1, 0x18) \
+	ROM_FILL(0x0058, 1, 0x32) /* RETI stubs */ \
+	ROM_FILL(0x00af, 1, 0x32) \
+	ROM_FILL(0x00c9, 1, 0x02) /* temporary LJMP to end of interrupt handler */ \
+	ROM_FILL(0x00ca, 1, 0x12) \
+	ROM_FILL(0x00cb, 1, 0xd1) \
+	ROM_FILL(0x0135, 1, 0x22) /* RET stubs */ \
+	ROM_FILL(0x0163, 1, 0x22) \
+	ROM_FILL(0x0185, 1, 0x22) \
+	ROM_FILL(0x01cf, 1, 0x22) \
+	ROM_FILL(0x02de, 1, 0x22) \
+	ROM_FILL(0x02fa, 1, 0x22) \
+	ROM_FILL(0x0308, 1, 0x22) \
+	ROM_FILL(0x0313, 1, 0x22) \
+	ROM_FILL(0x037d, 1, 0x22) \
+	ROM_FILL(0x03be, 1, 0x22) \
+	ROM_FILL(0x0496, 1, 0x22) \
+	ROM_FILL(0x04ce, 1, 0x22) \
+	ROM_FILL(0x0514, 1, 0x22) \
+	ROM_FILL(0x0520, 1, 0x22) \
+	ROM_FILL(0x0550, 1, 0x22) \
+	ROM_FILL(0x0574, 1, 0x22) \
+	ROM_FILL(0x05b4, 1, 0x22) \
+	ROM_FILL(0x05bb, 1, 0x22) \
+	ROM_FILL(0x05ca, 1, 0x22) \
+	ROM_FILL(0x05d8, 1, 0x22) \
+	ROM_FILL(0x0605, 1, 0x22) \
+	ROM_FILL(0x0638, 1, 0x22) \
+	ROM_FILL(0x068a, 1, 0x22) \
+	ROM_FILL(0x06a2, 1, 0x22) \
+	ROM_FILL(0x06bd, 1, 0x22) \
+	ROM_FILL(0x06db, 1, 0x22) \
+	ROM_FILL(0x0708, 1, 0x22) \
+	ROM_FILL(0x0715, 1, 0x22) \
+	ROM_FILL(0x072d, 1, 0x22) \
+	ROM_FILL(0x0744, 1, 0x22) \
+	ROM_FILL(0x0751, 1, 0x22) \
+	ROM_FILL(0x0767, 1, 0x22) \
+	ROM_FILL(0x0772, 1, 0x22) \
+	ROM_FILL(0x077d, 1, 0x22) \
+	ROM_FILL(0x07a4, 1, 0x22) \
+	ROM_FILL(0x07c2, 1, 0x22) \
+	ROM_FILL(0x0802, 1, 0x22) \
+	ROM_FILL(0x0836, 1, 0x22) \
+	ROM_FILL(0x087d, 1, 0x22) \
+	ROM_FILL(0x0893, 1, 0x22) \
+	ROM_FILL(0x0930, 1, 0x22) \
+	ROM_FILL(0x094a, 1, 0x22) \
+	ROM_FILL(0x095a, 1, 0x22) \
+	ROM_FILL(0x096a, 1, 0x22) \
+	ROM_FILL(0x097b, 1, 0x22) \
+	ROM_FILL(0x098f, 1, 0x22) \
+	ROM_FILL(0x09a3, 1, 0x22) \
+	ROM_FILL(0x09c0, 1, 0x22) \
+	ROM_FILL(0x0a21, 1, 0x22) \
+	ROM_FILL(0x0a54, 1, 0x22) \
+	ROM_FILL(0x0a63, 1, 0x22) \
+	ROM_FILL(0x0a73, 1, 0x22) \
+	ROM_FILL(0x0a90, 1, 0x22) \
+	ROM_FILL(0x0ae8, 1, 0x22) \
+	ROM_FILL(0x0abf, 1, 0x22) \
+	ROM_FILL(0x0ac7, 1, 0x22) \
+	ROM_FILL(0x0b11, 1, 0x22) \
+	ROM_FILL(0x0b7f, 1, 0x22) \
+	ROM_FILL(0x0bf1, 1, 0x22) \
+	ROM_FILL(0x0bf6, 1, 0x22) \
+	ROM_FILL(0x0c4a, 1, 0x22) \
+	ROM_FILL(0x0c59, 1, 0x22) \
+	ROM_FILL(0x0c64, 1, 0x22) \
+	ROM_FILL(0x0c99, 1, 0x22) \
+	ROM_FILL(0x0ca8, 1, 0x22) \
+	ROM_FILL(0x0cbd, 1, 0x22) \
+	ROM_FILL(0x0dac, 1, 0x22) \
+	ROM_FILL(0x0dca, 1, 0x22) \
 	ROM_FILL(0x0e6a, 1, 0x22)
 
+ROM_START(dibifuca)
+	// Philips REF34VA K7V5534 9818h
+	PHILIPS_REF34VA
+
 	ROM_REGION(0x20000, "program", 0)
 	ROM_LOAD("compumatic_727.ic3", 0x00000, 0x20000, CRC(ccf973b6) SHA1(ab67e466849b3bbd8f24be041c979c3f833a32a8))
 
@@ -220,4 +238,110 @@
 	ROM_LOAD("24lc16b.ic8", 0x000, 0x800, CRC(1cae70db) SHA1(575d4c787fd65950417e85fdb34d2961fc327c74))
 ROM_END
 
-GAME(199?, microdar, 0, microdar, microdar, microdar_state, empty_init, ROT0, "Compumatic / Bifuca", "Microdar SPD", MACHINE_IS_SKELETON_MECHANICAL)
+ROM_START(cfarwest)
+	// Philips REF34VA K8V2873 Phr9920 0
+	PHILIPS_REF34VA
+
+	ROM_REGION(0x20000, "program", 0)
+	ROM_LOAD("farwest_pistola.ic3", 0x00000, 0x20000, CRC(ad68a0e8) SHA1(157a6a84f31e05d289e2fc67099fcff2887a84b9))
+
+	// No EEPROM on this PCB
+ROM_END
+
+/* Compumatic ProSPDP-V3 PCB
+  ____________________________________________________________________________________________________
+__|_  ________ ___ ___ ___ __________ ____________ ________ __________ ____ ________ __________       |
+|   ||_CN105_| 110 123 119 |__CN125_| |__CN124___| |_CN121| |__CN112_|CN127 |_CN128| |__CN103_|   ___ |
+| C |                                               _______ __________                          : |C ||
+| N |                                               |CN116| |__CN115_|  BATTERY 3.6V              |N ||
+| 1 |   ______               ______   ______       ______                                         |1 ||
+| 1 | CD4514BCWM             MM74HC   MM74HC     CD4514BCWM           ______       ___________    |0 ||
+| 3 |  ___________  _____   _____       _____________        ______   MM74HC       |COMPUMATIC|   |6 ||
+|   |  |UDN2981A_| 74HC00D 74HC00D   :  GM76C88ALK-15        MM74HC   ______       | REF0096  |Xtal__||
+|   |  ___________        ______      _______________  ___   ______   |HC367       |__________|   |C ||
+|   |: |TD62683AP|        MM74HC      |  28SF040A   | 25C16N TLC77051P               Xtal 16.000  |N ||
+|   |: ___________                    |_____________|           __________  ____                  |1 ||
+|   |: |TD62683AP|    _____           _________________      ATF16V8B-15PC LM358                  |0 ||
+|   |: ___________    |REF |          |PHILIPS REF34VA| Xtal     _________                TEST    |9 ||
+|   |  |TD62683AP|    |8032|   ____   |_______________| 24.000   |ULN2803A|              SWITCH   |__||
+|___|                 |____|   CN122                                                             CN102|
+  | ________       _________   ____  _______________  ___________________ _____ _________  ________   |
+  | |_CN101_|      |__CN111_|  CN126 |___CN108______| |_____CN107________|CN114 |_CN118_| |_CN120_|   |
+  |___________________________________________________________________________________________________|
+
+CN101 = DISPLAY INFO
+CN102 = SPEAKER
+CN103 = CARD/NOTE
+CN105 = 6 pin: GND, RX, TX, TEL, CTL, 12V
+CN106 = EXPANSION
+CN107 = POWER SUPPLY
+CN108 = BUTTON PRO
+CN109 = PAN-LED
+CN110 = 2 pin: GND / KEY
+CN111 = ACCEPTOR
+CN112 = TARGET A
+CN113 = DISPLAY
+CN114 = 2 pin: GND, DISP
+CN116 = 3 pin: BI, SS, SM
+CN118 = GUN A
+CN120 = GUN B
+CN122 = ICC (3 pin: T, GND, X)
+CN123 = CNT, +12
+CN124 = INTA PRO
+CN125 = LED-RING
+CN126 = COIN
+CN127 = FDD (4 pin: +5, FDD, GND, +12)
+CN128 = TROB (5 pin: BUL, OUL, REL, THL, +12)
+*/
+ROM_START(prospdp)
+	// REF34VA K0V951 Phr0038 F
+	PHILIPS_REF34VA
+
+	ROM_REGION(0x80000, "program", 0)
+	ROM_LOAD("28sf040a.ic3", 0x00000, 0x80000, CRC(f5727a08) SHA1(f4185afc62c1d1f6cb6c772ea40062ced9b2130a))
+
+	ROM_REGION(0x800, "eeprom", 0)
+	ROM_LOAD("25c16n.ic8", 0x000, 0x800, CRC(a89a5016) SHA1(84cb29477b1917225e972c2a25e396567c145719)) // Atmel 25C16N
+
+	ROM_REGION(0x117, "plds", 0)
+	ROM_LOAD("atf16v8b.ic7", 0x000, 0x117, CRC(85e98105) SHA1(9b3389eedd62b3e599559a03e9664ed1e374d60b))
+ROM_END
+
+/* Compumatic Microdard-V5 PCB
+   _______________________________________________________________________________
+  | ______    _____________________________  _________  TEST  ___  _______     __|
+  ||_CN__|   |__________CN________________| |___CN___| SWITCH|CN| |__CN__|    |CN|
+ _|___                        ________________________   XT1                  ___|_
+|    |   ________________    |REF0034 91515S         | 16.000  BATT           |C  -
+| CN |  |CD4514BE       |    |                       |   MHz                  |N  -
+|    |  |_______________|    |_______________________|                        |____
+|    |   ____________                           ___________________            __|
+|    |  |__UDN2981A_|   _____  _____________   |27C10000C-15      |  ____     |C||
+|    |   ____________  |24C16 |_TD62083AP__|   |__________________| |___|     |N||
+|    |  |__UDN2981A_|   __________  __________  ____________        ________  | ||
+|    |   ____________  |SN74HC00N| |PALCE16V8| |_GM76C88ALK|       |REF0096|  |_||
+|    |  |__UDN2981A_|   _______________________ ____________       |COMPUMA|   __|
+|    |   ____________  |REF0032 9616T         ||_HD74HC373P|       |TIC    |  |C||
+|    |  |__UDN2981A_|  |______________________|   XT3 16.0MHz  XT2 |_______|  |N||
+|____|     _____ __ __ __ __ __ __  __________________________   ____        ::  |
+  |       |_CN_| CN CN CN CN CN CN |________CN_______________|  |_CN|            |
+  |______________________________________________________________________________|
+*/
+ROM_START(diolakoa)
+	// REF 0034 9515S (without Philips logos)
+	PHILIPS_REF34VA
+
+	ROM_REGION(0x20000, "program", 0)
+	ROM_LOAD("mt_plus_8_27.ic3", 0x00000, 0x20000, CRC(ada2ce10) SHA1(30fd0bd4eae282467dcec2ee1fe2dab47f4ea4d6))
+
+	ROM_REGION(0x800, "eeprom", 0)
+	ROM_LOAD("24c16.ic6", 0x000, 0x800, NO_DUMP) // Atmel 24C16
+
+	ROM_REGION(0x117, "plds", 0)
+	ROM_LOAD("palce16v8h.ic8", 0x000, 0x117, NO_DUMP)
+ROM_END
+
+GAME(199?, dibifuca, 0, microdar, microdar, microdar_state, empty_init, ROT0, "Compumatic / Bifuca", "Diana Bifuca",                                   MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1997, cfarwest, 0, microdar, microdar, microdar_state, empty_init, ROT0, "Compumatic",          "Far West (Compumatic)",                          MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1997, prospdp,  0, prospdp,  microdar, microdar_state, empty_init, ROT0, "Compumatic",          "Unknown Compumatic ProSPDP based darts machine", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1997, diolakoa, 0, microdv5, microdar, microdar_state, empty_init, ROT0, "Compumatic / Olakoa", "Diana Olakoa",                                   MACHINE_IS_SKELETON_MECHANICAL)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/microkorg.cpp mame-0.224+dfsg.1/src/mame/drivers/microkorg.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/microkorg.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/microkorg.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,61 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/****************************************************************************
+
+    Skeleton driver for Korg microKORG compact synthesizer/vocoder.
+
+    The MS2000 Analog Modeling Synthesizer runs on similar hardware.
+
+****************************************************************************/
+
+#include "emu.h"
+#include "cpu/h8/h8s2320.h"
+#include "machine/intelfsh.h"
+
+class microkorg_state : public driver_device
+{
+public:
+	microkorg_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+	{
+	}
+
+	void microkorg(machine_config &config);
+
+private:
+	void mem_map(address_map &map);
+
+	required_device<h8s2320_device> m_maincpu;
+};
+
+
+void microkorg_state::mem_map(address_map &map)
+{
+	map(0x000000, 0x0fffff).rw("flash", FUNC(intelfsh16_device::read), FUNC(intelfsh16_device::write));
+	map(0x400000, 0x47ffff).ram();
+}
+
+
+static INPUT_PORTS_START(microkorg)
+INPUT_PORTS_END
+
+void microkorg_state::microkorg(machine_config &config)
+{
+	H8S2320(config, m_maincpu, 10_MHz_XTAL); // HD6412320VF25 (or HD6412324SVF25)
+	m_maincpu->set_addrmap(AS_PROGRAM, &microkorg_state::mem_map);
+	// TODO: serial channel 0 is SPI link to DSP; serial channel 1 is MIDI
+
+	FUJITSU_29LV800B(config, "flash"); // MBM29LV800BA-90PFTN
+
+	//DSP56362(config, "dsp", 12.288_MHz_XTAL / 4); // DSPB56362PV100
+
+	//AK4522(config, "codec", 12.288_MHz_XTAL); // AK4522VF
+}
+
+ROM_START(microkorg)
+	ROM_REGION16_LE(0x100000, "flash", 0)
+	ROM_LOAD("korg_microkorg_v1.03_29lv800b.ic20", 0x000000, 0x100000, CRC(607ada7e) SHA1(4a6e2f4068cac7493484af2a8c1d1db7d8bd7a17))
+ROM_END
+
+SYST(2002, microkorg, 0, 0, microkorg, microkorg, microkorg_state, empty_init, "Korg", "microKORG Synthesizer/Vocoder", MACHINE_IS_SKELETON)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/micropin.cpp mame-0.224+dfsg.1/src/mame/drivers/micropin.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/micropin.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/micropin.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -365,10 +365,10 @@
 
 ROM_START(pentacup2)
 	ROM_REGION(0x2000, "v2cpu", 0)
-	ROM_LOAD("micro_1.bin", 0x0000, 0x0800, CRC(4d6dc218) SHA1(745c553f3a42124f925ca8f2e52fd08d05999594))
-	ROM_LOAD("micro_2.bin", 0x0800, 0x0800, CRC(33cd226d) SHA1(d1dff8445a0f35da09d560a16038c969845ff21f))
-	ROM_LOAD("micro_3.bin", 0x1000, 0x0800, CRC(997bde74) SHA1(c3ea33f7afbdc7f2a22798a13ec323d7c6628dd4))
-	ROM_LOAD("micro_4.bin", 0x1800, 0x0800, CRC(a804e7d6) SHA1(f414d6a5308266744645849940c00cd422e920d2))
+	ROM_LOAD("micro_1.bin", 0x0000, 0x0800, CRC(62d04111) SHA1(f0ce705c06a43a81293d8610394ce7c4143148e9))
+	ROM_LOAD("micro_2.bin", 0x0800, 0x0800, CRC(832e4223) SHA1(1409b0c7de35012b9d0eba9bb73b52aecc93c0f2))
+	ROM_LOAD("micro_3.bin", 0x1000, 0x0800, CRC(9d5d04d1) SHA1(1af32c418b73ee457f06ee9a8362cfec75e61f30))
+	ROM_LOAD("micro_4.bin", 0x1800, 0x0800, CRC(358ffd6a) SHA1(f5299e39d991bf882f827a62a1d9bb18e46dbcfc))
 	// 2 undumped proms DMA-01, DMA-02
 ROM_END
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/microvsn.cpp mame-0.224+dfsg.1/src/mame/drivers/microvsn.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/microvsn.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/microvsn.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -259,7 +259,8 @@
 			int p = m_lcd_pwm->read_element_bri(y ^ 15, x ^ 15) * 10000;
 			p = (p > 255) ? 0 : p ^ 255;
 
-			bitmap.pix32(y, x) = p << 16 | p << 8 | p;
+			if (cliprect.contains(x, y))
+				bitmap.pix32(y, x) = p << 16 | p << 8 | p;
 		}
 	}
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/midvunit.cpp mame-0.224+dfsg.1/src/mame/drivers/midvunit.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/midvunit.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/midvunit.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,7 +7,7 @@
     driver by Aaron Giles
 
     Games supported:
-        * Cruis'n USA (1994)        [3 sets]
+        * Cruis'n USA (1994)        [4 sets]
         * Cruis'n World (1996)      [7 sets]
         * War Gods (1996)           [3 sets]
         * Off Road Challenge (1997) [5 sets]
@@ -280,25 +280,20 @@
 
 uint32_t midvunit_state::crusnwld_serial_status_r()
 {
-	uint16_t in1 = (m_in1->read() & 0x7fff) | (m_midway_serial_pic->status_r() << 15);
+	uint16_t in1 = (m_in1->read() & 0x7fff) | (m_midway_serial_pic2->status_r() << 15);
 	return in1 | in1 << 16;
 }
 
 
 uint32_t midvunit_state::crusnwld_serial_data_r()
 {
-	return m_midway_serial_pic->read() << 16;
+	return m_midway_serial_pic2->read() << 16;
 }
 
 
 void midvunit_state::crusnwld_serial_data_w(uint32_t data)
 {
-	if ((data & 0xf0000) == 0x10000)
-	{
-		m_midway_serial_pic->reset_w(1);
-		m_midway_serial_pic->reset_w(0);
-	}
-	m_midway_serial_pic->write(data >> 16);
+	m_midway_serial_pic2->write(data >> 16);
 }
 
 
@@ -333,31 +328,6 @@
 }
 
 
-
-/*************************************
- *
- *  Off Road Challenge PIC access
- *
- *************************************/
-
-uint32_t midvunit_state::offroadc_serial_status_r()
-{
-	uint16_t in1 = (m_in1->read() & 0x7fff) | (m_midway_serial_pic2->status_r() << 15);
-	return in1 | in1 << 16;
-}
-
-
-uint32_t midvunit_state::offroadc_serial_data_r()
-{
-	return m_midway_serial_pic2->read() << 16;
-}
-
-
-void midvunit_state::offroadc_serial_data_w(uint32_t data)
-{
-	m_midway_serial_pic2->write(data >> 16);
-}
-
 uint32_t midvunit_state::midvunit_wheel_board_r()
 {
 	//logerror("midvunit_wheel_board_r: %08X\n", m_wheel_board_output);
@@ -1147,8 +1117,9 @@
 {
 	midvunit(config);
 	/* valid values are 450 or 460 */
-	MIDWAY_SERIAL_PIC(config, m_midway_serial_pic, 0);
-	m_midway_serial_pic->set_upper(450);
+	MIDWAY_SERIAL_PIC2(config, m_midway_serial_pic2, 0);
+	m_midway_serial_pic2->set_upper(450);
+	m_midway_serial_pic2->set_yearoffs(94);
 }
 
 void midvunit_state::offroadc(machine_config &config)
@@ -1266,38 +1237,93 @@
                   GAME.Uxx  - PROGRAM ROMs (including GFX)
 */
 
-ROM_START( crusnusa ) /* Version 4.1, Mon Feb 13 1995 - 16:53:40 */
+/*
+Labels for v4.4 were in the following format:
+
+------------------------
+|    3/15/95           |
+)  CRUIS'N USA  U10    |
+|  (C)1995 Midway 87DF |
+------------------------
+
+Each label had it's corresponding U position and checksum value.
+Also had V4.4 printed sideways at front of the label.
+
+*/
+ROM_START( crusnusa ) /* Version 4.4, Wed Mar 15 1995 - 10:52:28 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "cusa.u2",  0x000000, 0x80000, CRC(b9338332) SHA1(e5c420e63c4eba0010a68c7e0a57ef210e2c83d2) )
-	ROM_LOAD16_BYTE( "cusa.u3",  0x200000, 0x80000, CRC(cd8325d6) SHA1(d65d7263e056ca1d637adb44cafef523e0831a34) )
-	ROM_LOAD16_BYTE( "cusa.u4",  0x400000, 0x80000, CRC(fab457f3) SHA1(2b4b647838b7a8100afc25ca1ffdc74ed67ae00a) )
-	ROM_LOAD16_BYTE( "cusa.u5",  0x600000, 0x80000, CRC(becc92f4) SHA1(6dffa73ff5270155c44f295e443d5e77c03c0338) )
-	ROM_LOAD16_BYTE( "cusa.u6",  0x800000, 0x80000, CRC(a9f915d3) SHA1(6a16a2d7a807a775673e7121b54f37c583581203) )
-	ROM_LOAD16_BYTE( "cusa.u7",  0xa00000, 0x80000, CRC(424f0bbc) SHA1(f38a431fc0fb7102c51f2d5b6f716dd4669a9822) )
-	ROM_LOAD16_BYTE( "cusa.u8",  0xc00000, 0x80000, CRC(03c28199) SHA1(393b009acd3eceb346b8fff45ae2bdf4f53d041f) )
-	ROM_LOAD16_BYTE( "cusa.u9",  0xe00000, 0x80000, CRC(24ba6371) SHA1(f60a9ff73b3645e2c8bad67e2f6debc61b5e0653) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u2.u2", 0x000000, 0x80000, CRC(b9338332) SHA1(e5c420e63c4eba0010a68c7e0a57ef210e2c83d2) ) /* also known to be labeled as P2, the P1 revision hasn't been dumped or confirmed to be different */
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u3.u3", 0x200000, 0x80000, CRC(cd8325d6) SHA1(d65d7263e056ca1d637adb44cafef523e0831a34) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u4.u4", 0x400000, 0x80000, CRC(fab457f3) SHA1(2b4b647838b7a8100afc25ca1ffdc74ed67ae00a) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u5.u5", 0x600000, 0x80000, CRC(becc92f4) SHA1(6dffa73ff5270155c44f295e443d5e77c03c0338) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u6.u6", 0x800000, 0x80000, CRC(a9f915d3) SHA1(6a16a2d7a807a775673e7121b54f37c583581203) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u7.u7", 0xa00000, 0x80000, CRC(424f0bbc) SHA1(f38a431fc0fb7102c51f2d5b6f716dd4669a9822) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u8.u8", 0xc00000, 0x80000, CRC(03c28199) SHA1(393b009acd3eceb346b8fff45ae2bdf4f53d041f) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u9.u9", 0xe00000, 0x80000, CRC(24ba6371) SHA1(f60a9ff73b3645e2c8bad67e2f6debc61b5e0653) )
+
+	ROM_REGION32_LE( 0x1000000, "user1", 0 ) /* boot screen reports as HEAD 2 HEAD */
+	ROM_LOAD32_BYTE( "v4.4_3-15-95_cruisn_usa_u10_87df.u10", 0x000000, 0x80000, CRC(e77e2a0c) SHA1(18fa0f1dccba743b9f0f2bb986c35dfb1cf5852a) ) /* V4.4   3/15/95   CRUIS'N USA U10   (C)1995 Midway 87DF */
+	ROM_LOAD32_BYTE( "v4.4_3-15-95_cruisn_usa_u11_6e35.u11", 0x000001, 0x80000, CRC(6eb3e187) SHA1(f6d26998a302dc7de5a18d811fab90a042f01284) ) /* V4.4   3/15/95   CRUIS'N USA U11   (C)1995 Midway 6E35 */
+	ROM_LOAD32_BYTE( "v4.4_3-15-95_cruisn_usa_u12_4c08.u12", 0x000002, 0x80000, CRC(5942b6d6) SHA1(86b0422a0e1348d1c4136a23d1e17653bc3a1b0e) ) /* V4.4   3/15/95   CRUIS'N USA U12   (C)1995 Midway 4C08 */
+	ROM_LOAD32_BYTE( "v4.4_3-15-95_cruisn_usa_u13_43ea.u13", 0x000003, 0x80000, CRC(9da2124a) SHA1(36d61bbd0c991b415a8c85b58de77d94d2c61bcc) ) /* V4.4   3/15/95   CRUIS'N USA U13   (C)1995 Midway 43EA */
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u14.u14", 0x200000, 0x80000, CRC(6a4ae622) SHA1(f488e7616371125d5aef2047b8e0fc954ca4b9b4) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u15.u15", 0x200001, 0x80000, CRC(1a0ad3b7) SHA1(a5300f3c789a4d9d257fda3a280e882f17f4a99f) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u16.u16", 0x200002, 0x80000, CRC(799d4dd6) SHA1(f1208967544477005924f2a553037e0ffbc668ab) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u17.u17", 0x200003, 0x80000, CRC(3d68b660) SHA1(3f14e32c205a504ef39abf1e390bd8031d9d7b5b) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u18.u18", 0x400000, 0x80000, CRC(9e8193fb) SHA1(ec88c2b51bb607d3181e467f8b255c13efebc73c) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u19.u19", 0x400001, 0x80000, CRC(0bf60cde) SHA1(6c63b3eacaefeb405c8fdf641437786262bcb10d) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u20.u20", 0x400002, 0x80000, CRC(c07f68f0) SHA1(444ccf8e49fd9c0f707ab32347984ca5628207f9) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u21.u21", 0x400003, 0x80000, CRC(b0264aed) SHA1(d6a6eca4e4ecedfbc5590dbd06870761155ae8c5) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u22.u22", 0x600000, 0x80000, CRC(ad137193) SHA1(642a7c37940cb3b2b190661da7b1d4848c7c513d) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u23.u23", 0x600001, 0x80000, CRC(842449b0) SHA1(b23ebe28ff3c6a268ff9ae1242a4392d2305396b) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u24.u24", 0x600002, 0x80000, CRC(0b2275be) SHA1(3dc79095064cc158d37218c9a038b5b7a777fc66) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u25.u25", 0x600003, 0x80000, CRC(2b9fe68f) SHA1(2750613e61c1eaac629ef5b9e89fd88e99a262cc) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u26.u26", 0x800000, 0x80000, CRC(ae56b871) SHA1(1e218426084123c6c2389d96ce92691010012aa4) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u27.u27", 0x800001, 0x80000, CRC(2d977a8e) SHA1(8f4d511bfd6c3bee18daa7253be1a27d079aec8f) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u28.u28", 0x800002, 0x80000, CRC(cffa5fb1) SHA1(fb73bc8f65b604c374f88d0ecf06c50ef52f0547) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u29.u29", 0x800003, 0x80000, CRC(cbe52c60) SHA1(3f309ce8ef1784c830f4160cfe76dc3a0b438cac) )
 
-	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "cusa-l41.u10", 0x000000, 0x80000, CRC(eb9372d1) SHA1(ab1e489b23b4540c4e0d1d9a6c9a2c9317f5c099) )
-	ROM_LOAD32_BYTE( "cusa-l41.u11", 0x000001, 0x80000, CRC(76f3cd40) SHA1(52276841944ada54d56ecd2da95998aabd699465) )
-	ROM_LOAD32_BYTE( "cusa-l41.u12", 0x000002, 0x80000, CRC(9021a376) SHA1(6a838d49bec4201e8ead7491e3b6d4a3a52dcb12) )
-	ROM_LOAD32_BYTE( "cusa-l41.u13", 0x000003, 0x80000, CRC(1687c932) SHA1(45947c0c22bd4e6640f792d0c7fd06a1f4483131) )
-	ROM_LOAD32_BYTE( "cusa.u14",     0x200000, 0x80000, CRC(6a4ae622) SHA1(f488e7616371125d5aef2047b8e0fc954ca4b9b4) )
-	ROM_LOAD32_BYTE( "cusa.u15",     0x200001, 0x80000, CRC(1a0ad3b7) SHA1(a5300f3c789a4d9d257fda3a280e882f17f4a99f) )
-	ROM_LOAD32_BYTE( "cusa.u16",     0x200002, 0x80000, CRC(799d4dd6) SHA1(f1208967544477005924f2a553037e0ffbc668ab) )
-	ROM_LOAD32_BYTE( "cusa.u17",     0x200003, 0x80000, CRC(3d68b660) SHA1(3f14e32c205a504ef39abf1e390bd8031d9d7b5b) )
-	ROM_LOAD32_BYTE( "cusa.u18",     0x400000, 0x80000, CRC(9e8193fb) SHA1(ec88c2b51bb607d3181e467f8b255c13efebc73c) )
-	ROM_LOAD32_BYTE( "cusa.u19",     0x400001, 0x80000, CRC(0bf60cde) SHA1(6c63b3eacaefeb405c8fdf641437786262bcb10d) )
-	ROM_LOAD32_BYTE( "cusa.u20",     0x400002, 0x80000, CRC(c07f68f0) SHA1(444ccf8e49fd9c0f707ab32347984ca5628207f9) )
-	ROM_LOAD32_BYTE( "cusa.u21",     0x400003, 0x80000, CRC(b0264aed) SHA1(d6a6eca4e4ecedfbc5590dbd06870761155ae8c5) )
-	ROM_LOAD32_BYTE( "cusa.u22",     0x600000, 0x80000, CRC(ad137193) SHA1(642a7c37940cb3b2b190661da7b1d4848c7c513d) )
-	ROM_LOAD32_BYTE( "cusa.u23",     0x600001, 0x80000, CRC(842449b0) SHA1(b23ebe28ff3c6a268ff9ae1242a4392d2305396b) )
-	ROM_LOAD32_BYTE( "cusa.u24",     0x600002, 0x80000, CRC(0b2275be) SHA1(3dc79095064cc158d37218c9a038b5b7a777fc66) )
-	ROM_LOAD32_BYTE( "cusa.u25",     0x600003, 0x80000, CRC(2b9fe68f) SHA1(2750613e61c1eaac629ef5b9e89fd88e99a262cc) )
-	ROM_LOAD32_BYTE( "cusa.u26",     0x800000, 0x80000, CRC(ae56b871) SHA1(1e218426084123c6c2389d96ce92691010012aa4) )
-	ROM_LOAD32_BYTE( "cusa.u27",     0x800001, 0x80000, CRC(2d977a8e) SHA1(8f4d511bfd6c3bee18daa7253be1a27d079aec8f) )
-	ROM_LOAD32_BYTE( "cusa.u28",     0x800002, 0x80000, CRC(cffa5fb1) SHA1(fb73bc8f65b604c374f88d0ecf06c50ef52f0547) )
-	ROM_LOAD32_BYTE( "cusa.u29",     0x800003, 0x80000, CRC(cbe52c60) SHA1(3f309ce8ef1784c830f4160cfe76dc3a0b438cac) )
+	ROM_REGION( 0x0b33, "pals", 0 ) // all protected
+	ROM_LOAD("a-19993.u38",  0x0000, 0x02e5, BAD_DUMP CRC(7e8b7b0d) SHA1(f9af19da171f949a11c5548da7b4277aecb6f2a8) ) /* TIBPAL22V10-15BCNT */
+	ROM_LOAD("a-19670.u43",  0x0000, 0x0144, BAD_DUMP CRC(acafcc97) SHA1(b6f916838d08590a536fe925ec62d66e6ea3dcbc) ) /* TIBPAL20L8-10CNT */
+	ROM_LOAD("a-19668.u52",  0x0000, 0x0157, BAD_DUMP CRC(7915134e) SHA1(aeb22e46abdc14a9e9b34cfe3b77da3e29b789fe) ) /* GAL20V8B */
+	ROM_LOAD("a-19671.u54",  0x0000, 0x02dd, BAD_DUMP CRC(b9cce038) SHA1(8d1df026bdac66ea5493e9e51c23f8eb182b024e) ) /* TIBPAL22V10-15BCNT */
+	ROM_LOAD("a-19673.u111", 0x0000, 0x02dd, BAD_DUMP CRC(8552977d) SHA1(a1a53d797697682b3f18893a90b6bef39ebb069e) ) /* TIBPAL22V10-15BCNT */
+	ROM_LOAD("a-19672.u114", 0x0000, 0x0001, NO_DUMP ) /* TIBPAL22V10-15BCNT */
+ROM_END
+
+ROM_START( crusnusa41 ) /* Version 4.1, Mon Feb 13 1995 - 16:53:40 */
+	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u2.u2", 0x000000, 0x80000, CRC(b9338332) SHA1(e5c420e63c4eba0010a68c7e0a57ef210e2c83d2) ) /* also known to be labeled as P2, the P1 revision hasn't been dumped or confirmed to be different */
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u3.u3", 0x200000, 0x80000, CRC(cd8325d6) SHA1(d65d7263e056ca1d637adb44cafef523e0831a34) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u4.u4", 0x400000, 0x80000, CRC(fab457f3) SHA1(2b4b647838b7a8100afc25ca1ffdc74ed67ae00a) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u5.u5", 0x600000, 0x80000, CRC(becc92f4) SHA1(6dffa73ff5270155c44f295e443d5e77c03c0338) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u6.u6", 0x800000, 0x80000, CRC(a9f915d3) SHA1(6a16a2d7a807a775673e7121b54f37c583581203) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u7.u7", 0xa00000, 0x80000, CRC(424f0bbc) SHA1(f38a431fc0fb7102c51f2d5b6f716dd4669a9822) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u8.u8", 0xc00000, 0x80000, CRC(03c28199) SHA1(393b009acd3eceb346b8fff45ae2bdf4f53d041f) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u9.u9", 0xe00000, 0x80000, CRC(24ba6371) SHA1(f60a9ff73b3645e2c8bad67e2f6debc61b5e0653) )
+
+	ROM_REGION32_LE( 0x1000000, "user1", 0 ) /*  boot screen reports as HEAD 2 HEAD - Also known to be labeled as: CRUIS'N LINK   U10 REV. 4.1  (C) 1994 MIDWAY CORP */
+	ROM_LOAD32_BYTE( "l4.1_dual_game_linking_cruisin_u.s.a._u10_game_rom.u10", 0x000000, 0x80000, CRC(eb9372d1) SHA1(ab1e489b23b4540c4e0d1d9a6c9a2c9317f5c099) ) /* L4.1   DUAL GAME LINKING   CRUISIN U.S.A.   U 10 GAME ROM */
+	ROM_LOAD32_BYTE( "l4.1_dual_game_linking_cruisin_u.s.a._u11_game_rom.u11", 0x000001, 0x80000, CRC(76f3cd40) SHA1(52276841944ada54d56ecd2da95998aabd699465) ) /* L4.1   DUAL GAME LINKING   CRUISIN U.S.A.   U 11 GAME ROM */
+	ROM_LOAD32_BYTE( "l4.1_dual_game_linking_cruisin_u.s.a._u12_game_rom.u12", 0x000002, 0x80000, CRC(9021a376) SHA1(6a838d49bec4201e8ead7491e3b6d4a3a52dcb12) ) /* L4.1   DUAL GAME LINKING   CRUISIN U.S.A.   U 12 GAME ROM */
+	ROM_LOAD32_BYTE( "l4.1_dual_game_linking_cruisin_u.s.a._u13_game_rom.u13", 0x000003, 0x80000, CRC(1687c932) SHA1(45947c0c22bd4e6640f792d0c7fd06a1f4483131) ) /* L4.1   DUAL GAME LINKING   CRUISIN U.S.A.   U 13 GAME ROM */
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u14.u14", 0x200000, 0x80000, CRC(6a4ae622) SHA1(f488e7616371125d5aef2047b8e0fc954ca4b9b4) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u15.u15", 0x200001, 0x80000, CRC(1a0ad3b7) SHA1(a5300f3c789a4d9d257fda3a280e882f17f4a99f) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u16.u16", 0x200002, 0x80000, CRC(799d4dd6) SHA1(f1208967544477005924f2a553037e0ffbc668ab) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u17.u17", 0x200003, 0x80000, CRC(3d68b660) SHA1(3f14e32c205a504ef39abf1e390bd8031d9d7b5b) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u18.u18", 0x400000, 0x80000, CRC(9e8193fb) SHA1(ec88c2b51bb607d3181e467f8b255c13efebc73c) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u19.u19", 0x400001, 0x80000, CRC(0bf60cde) SHA1(6c63b3eacaefeb405c8fdf641437786262bcb10d) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u20.u20", 0x400002, 0x80000, CRC(c07f68f0) SHA1(444ccf8e49fd9c0f707ab32347984ca5628207f9) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u21.u21", 0x400003, 0x80000, CRC(b0264aed) SHA1(d6a6eca4e4ecedfbc5590dbd06870761155ae8c5) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u22.u22", 0x600000, 0x80000, CRC(ad137193) SHA1(642a7c37940cb3b2b190661da7b1d4848c7c513d) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u23.u23", 0x600001, 0x80000, CRC(842449b0) SHA1(b23ebe28ff3c6a268ff9ae1242a4392d2305396b) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u24.u24", 0x600002, 0x80000, CRC(0b2275be) SHA1(3dc79095064cc158d37218c9a038b5b7a777fc66) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u25.u25", 0x600003, 0x80000, CRC(2b9fe68f) SHA1(2750613e61c1eaac629ef5b9e89fd88e99a262cc) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u26.u26", 0x800000, 0x80000, CRC(ae56b871) SHA1(1e218426084123c6c2389d96ce92691010012aa4) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u27.u27", 0x800001, 0x80000, CRC(2d977a8e) SHA1(8f4d511bfd6c3bee18daa7253be1a27d079aec8f) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u28.u28", 0x800002, 0x80000, CRC(cffa5fb1) SHA1(fb73bc8f65b604c374f88d0ecf06c50ef52f0547) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u29.u29", 0x800003, 0x80000, CRC(cbe52c60) SHA1(3f309ce8ef1784c830f4160cfe76dc3a0b438cac) )
 
 	ROM_REGION( 0x0b33, "pals", 0 ) // all protected
 	ROM_LOAD("a-19993.u38",  0x0000, 0x02e5, BAD_DUMP CRC(7e8b7b0d) SHA1(f9af19da171f949a11c5548da7b4277aecb6f2a8) ) /* TIBPAL22V10-15BCNT */
@@ -1311,36 +1337,36 @@
 
 ROM_START( crusnusa40 ) /* Version 4.0, Wed Feb 08 1995 - 10:45:14 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "cusa.u2",  0x000000, 0x80000, CRC(b9338332) SHA1(e5c420e63c4eba0010a68c7e0a57ef210e2c83d2) )
-	ROM_LOAD16_BYTE( "cusa.u3",  0x200000, 0x80000, CRC(cd8325d6) SHA1(d65d7263e056ca1d637adb44cafef523e0831a34) )
-	ROM_LOAD16_BYTE( "cusa.u4",  0x400000, 0x80000, CRC(fab457f3) SHA1(2b4b647838b7a8100afc25ca1ffdc74ed67ae00a) )
-	ROM_LOAD16_BYTE( "cusa.u5",  0x600000, 0x80000, CRC(becc92f4) SHA1(6dffa73ff5270155c44f295e443d5e77c03c0338) )
-	ROM_LOAD16_BYTE( "cusa.u6",  0x800000, 0x80000, CRC(a9f915d3) SHA1(6a16a2d7a807a775673e7121b54f37c583581203) )
-	ROM_LOAD16_BYTE( "cusa.u7",  0xa00000, 0x80000, CRC(424f0bbc) SHA1(f38a431fc0fb7102c51f2d5b6f716dd4669a9822) )
-	ROM_LOAD16_BYTE( "cusa.u8",  0xc00000, 0x80000, CRC(03c28199) SHA1(393b009acd3eceb346b8fff45ae2bdf4f53d041f) )
-	ROM_LOAD16_BYTE( "cusa.u9",  0xe00000, 0x80000, CRC(24ba6371) SHA1(f60a9ff73b3645e2c8bad67e2f6debc61b5e0653) )
-
-	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "cusa-l4.u10",  0x000000, 0x80000, CRC(7526d8bf) SHA1(ef00ea3b6e1923d3e4d10bf3601b080a009fb711) )
-	ROM_LOAD32_BYTE( "cusa-l4.u11",  0x000001, 0x80000, CRC(bfc691b9) SHA1(41d1503c4290e396a49043fea7778851cdf11310) )
-	ROM_LOAD32_BYTE( "cusa-l4.u12",  0x000002, 0x80000, CRC(059c2234) SHA1(145ec1ab3a46c3316f39bd731730dcb57b55b4ec) )
-	ROM_LOAD32_BYTE( "cusa-l4.u13",  0x000003, 0x80000, CRC(39e0ff7d) SHA1(3b0f95bf2a6999b8ec8722e0bc0f3a60264469aa) )
-	ROM_LOAD32_BYTE( "cusa.u14",     0x200000, 0x80000, CRC(6a4ae622) SHA1(f488e7616371125d5aef2047b8e0fc954ca4b9b4) )
-	ROM_LOAD32_BYTE( "cusa.u15",     0x200001, 0x80000, CRC(1a0ad3b7) SHA1(a5300f3c789a4d9d257fda3a280e882f17f4a99f) )
-	ROM_LOAD32_BYTE( "cusa.u16",     0x200002, 0x80000, CRC(799d4dd6) SHA1(f1208967544477005924f2a553037e0ffbc668ab) )
-	ROM_LOAD32_BYTE( "cusa.u17",     0x200003, 0x80000, CRC(3d68b660) SHA1(3f14e32c205a504ef39abf1e390bd8031d9d7b5b) )
-	ROM_LOAD32_BYTE( "cusa.u18",     0x400000, 0x80000, CRC(9e8193fb) SHA1(ec88c2b51bb607d3181e467f8b255c13efebc73c) )
-	ROM_LOAD32_BYTE( "cusa.u19",     0x400001, 0x80000, CRC(0bf60cde) SHA1(6c63b3eacaefeb405c8fdf641437786262bcb10d) )
-	ROM_LOAD32_BYTE( "cusa.u20",     0x400002, 0x80000, CRC(c07f68f0) SHA1(444ccf8e49fd9c0f707ab32347984ca5628207f9) )
-	ROM_LOAD32_BYTE( "cusa.u21",     0x400003, 0x80000, CRC(b0264aed) SHA1(d6a6eca4e4ecedfbc5590dbd06870761155ae8c5) )
-	ROM_LOAD32_BYTE( "cusa.u22",     0x600000, 0x80000, CRC(ad137193) SHA1(642a7c37940cb3b2b190661da7b1d4848c7c513d) )
-	ROM_LOAD32_BYTE( "cusa.u23",     0x600001, 0x80000, CRC(842449b0) SHA1(b23ebe28ff3c6a268ff9ae1242a4392d2305396b) )
-	ROM_LOAD32_BYTE( "cusa.u24",     0x600002, 0x80000, CRC(0b2275be) SHA1(3dc79095064cc158d37218c9a038b5b7a777fc66) )
-	ROM_LOAD32_BYTE( "cusa.u25",     0x600003, 0x80000, CRC(2b9fe68f) SHA1(2750613e61c1eaac629ef5b9e89fd88e99a262cc) )
-	ROM_LOAD32_BYTE( "cusa.u26",     0x800000, 0x80000, CRC(ae56b871) SHA1(1e218426084123c6c2389d96ce92691010012aa4) )
-	ROM_LOAD32_BYTE( "cusa.u27",     0x800001, 0x80000, CRC(2d977a8e) SHA1(8f4d511bfd6c3bee18daa7253be1a27d079aec8f) )
-	ROM_LOAD32_BYTE( "cusa.u28",     0x800002, 0x80000, CRC(cffa5fb1) SHA1(fb73bc8f65b604c374f88d0ecf06c50ef52f0547) )
-	ROM_LOAD32_BYTE( "cusa.u29",     0x800003, 0x80000, CRC(cbe52c60) SHA1(3f309ce8ef1784c830f4160cfe76dc3a0b438cac) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u2.u2", 0x000000, 0x80000, CRC(b9338332) SHA1(e5c420e63c4eba0010a68c7e0a57ef210e2c83d2) ) /* also known to be labeled as P2, the P1 revision hasn't been dumped or confirmed to be different */
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u3.u3", 0x200000, 0x80000, CRC(cd8325d6) SHA1(d65d7263e056ca1d637adb44cafef523e0831a34) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u4.u4", 0x400000, 0x80000, CRC(fab457f3) SHA1(2b4b647838b7a8100afc25ca1ffdc74ed67ae00a) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u5.u5", 0x600000, 0x80000, CRC(becc92f4) SHA1(6dffa73ff5270155c44f295e443d5e77c03c0338) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u6.u6", 0x800000, 0x80000, CRC(a9f915d3) SHA1(6a16a2d7a807a775673e7121b54f37c583581203) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u7.u7", 0xa00000, 0x80000, CRC(424f0bbc) SHA1(f38a431fc0fb7102c51f2d5b6f716dd4669a9822) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u8.u8", 0xc00000, 0x80000, CRC(03c28199) SHA1(393b009acd3eceb346b8fff45ae2bdf4f53d041f) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u9.u9", 0xe00000, 0x80000, CRC(24ba6371) SHA1(f60a9ff73b3645e2c8bad67e2f6debc61b5e0653) )
+
+	ROM_REGION32_LE( 0x1000000, "user1", 0 ) /* boot screen reports as HEAD 2 HEAD */
+	ROM_LOAD32_BYTE( "l4_cruisin_u.s.a._game_rom_u10.u10", 0x000000, 0x80000, CRC(7526d8bf) SHA1(ef00ea3b6e1923d3e4d10bf3601b080a009fb711) )
+	ROM_LOAD32_BYTE( "l4_cruisin_u.s.a._game_rom_u11.u11", 0x000001, 0x80000, CRC(bfc691b9) SHA1(41d1503c4290e396a49043fea7778851cdf11310) )
+	ROM_LOAD32_BYTE( "l4_cruisin_u.s.a._game_rom_u12.u12", 0x000002, 0x80000, CRC(059c2234) SHA1(145ec1ab3a46c3316f39bd731730dcb57b55b4ec) )
+	ROM_LOAD32_BYTE( "l4_cruisin_u.s.a._game_rom_u13.u13", 0x000003, 0x80000, CRC(39e0ff7d) SHA1(3b0f95bf2a6999b8ec8722e0bc0f3a60264469aa) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u14.u14", 0x200000, 0x80000, CRC(6a4ae622) SHA1(f488e7616371125d5aef2047b8e0fc954ca4b9b4) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u15.u15", 0x200001, 0x80000, CRC(1a0ad3b7) SHA1(a5300f3c789a4d9d257fda3a280e882f17f4a99f) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u16.u16", 0x200002, 0x80000, CRC(799d4dd6) SHA1(f1208967544477005924f2a553037e0ffbc668ab) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u17.u17", 0x200003, 0x80000, CRC(3d68b660) SHA1(3f14e32c205a504ef39abf1e390bd8031d9d7b5b) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u18.u18", 0x400000, 0x80000, CRC(9e8193fb) SHA1(ec88c2b51bb607d3181e467f8b255c13efebc73c) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u19.u19", 0x400001, 0x80000, CRC(0bf60cde) SHA1(6c63b3eacaefeb405c8fdf641437786262bcb10d) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u20.u20", 0x400002, 0x80000, CRC(c07f68f0) SHA1(444ccf8e49fd9c0f707ab32347984ca5628207f9) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u21.u21", 0x400003, 0x80000, CRC(b0264aed) SHA1(d6a6eca4e4ecedfbc5590dbd06870761155ae8c5) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u22.u22", 0x600000, 0x80000, CRC(ad137193) SHA1(642a7c37940cb3b2b190661da7b1d4848c7c513d) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u23.u23", 0x600001, 0x80000, CRC(842449b0) SHA1(b23ebe28ff3c6a268ff9ae1242a4392d2305396b) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u24.u24", 0x600002, 0x80000, CRC(0b2275be) SHA1(3dc79095064cc158d37218c9a038b5b7a777fc66) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u25.u25", 0x600003, 0x80000, CRC(2b9fe68f) SHA1(2750613e61c1eaac629ef5b9e89fd88e99a262cc) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u26.u26", 0x800000, 0x80000, CRC(ae56b871) SHA1(1e218426084123c6c2389d96ce92691010012aa4) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u27.u27", 0x800001, 0x80000, CRC(2d977a8e) SHA1(8f4d511bfd6c3bee18daa7253be1a27d079aec8f) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u28.u28", 0x800002, 0x80000, CRC(cffa5fb1) SHA1(fb73bc8f65b604c374f88d0ecf06c50ef52f0547) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u29.u29", 0x800003, 0x80000, CRC(cbe52c60) SHA1(3f309ce8ef1784c830f4160cfe76dc3a0b438cac) )
 
 	ROM_REGION( 0x0b33, "pals", 0 ) // all protected
 	ROM_LOAD("a-19993.u38",  0x0000, 0x02e5, BAD_DUMP CRC(7e8b7b0d) SHA1(f9af19da171f949a11c5548da7b4277aecb6f2a8) ) /* TIBPAL22V10-15BCNT */
@@ -1354,36 +1380,36 @@
 
 ROM_START( crusnusa21 ) /* Version 2.1, Wed Nov 09 1994 - 16:28:10 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "cusa.u2",  0x000000, 0x80000, CRC(b9338332) SHA1(e5c420e63c4eba0010a68c7e0a57ef210e2c83d2) )
-	ROM_LOAD16_BYTE( "cusa.u3",  0x200000, 0x80000, CRC(cd8325d6) SHA1(d65d7263e056ca1d637adb44cafef523e0831a34) )
-	ROM_LOAD16_BYTE( "cusa.u4",  0x400000, 0x80000, CRC(fab457f3) SHA1(2b4b647838b7a8100afc25ca1ffdc74ed67ae00a) )
-	ROM_LOAD16_BYTE( "cusa.u5",  0x600000, 0x80000, CRC(becc92f4) SHA1(6dffa73ff5270155c44f295e443d5e77c03c0338) )
-	ROM_LOAD16_BYTE( "cusa.u6",  0x800000, 0x80000, CRC(a9f915d3) SHA1(6a16a2d7a807a775673e7121b54f37c583581203) )
-	ROM_LOAD16_BYTE( "cusa.u7",  0xa00000, 0x80000, CRC(424f0bbc) SHA1(f38a431fc0fb7102c51f2d5b6f716dd4669a9822) )
-	ROM_LOAD16_BYTE( "cusa.u8",  0xc00000, 0x80000, CRC(03c28199) SHA1(393b009acd3eceb346b8fff45ae2bdf4f53d041f) )
-	ROM_LOAD16_BYTE( "cusa.u9",  0xe00000, 0x80000, CRC(24ba6371) SHA1(f60a9ff73b3645e2c8bad67e2f6debc61b5e0653) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u2.u2", 0x000000, 0x80000, CRC(b9338332) SHA1(e5c420e63c4eba0010a68c7e0a57ef210e2c83d2) ) /* also known to be labeled as P2, the P1 revision hasn't been dumped or confirmed to be different */
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u3.u3", 0x200000, 0x80000, CRC(cd8325d6) SHA1(d65d7263e056ca1d637adb44cafef523e0831a34) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u4.u4", 0x400000, 0x80000, CRC(fab457f3) SHA1(2b4b647838b7a8100afc25ca1ffdc74ed67ae00a) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u5.u5", 0x600000, 0x80000, CRC(becc92f4) SHA1(6dffa73ff5270155c44f295e443d5e77c03c0338) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u6.u6", 0x800000, 0x80000, CRC(a9f915d3) SHA1(6a16a2d7a807a775673e7121b54f37c583581203) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u7.u7", 0xa00000, 0x80000, CRC(424f0bbc) SHA1(f38a431fc0fb7102c51f2d5b6f716dd4669a9822) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u8.u8", 0xc00000, 0x80000, CRC(03c28199) SHA1(393b009acd3eceb346b8fff45ae2bdf4f53d041f) )
+	ROM_LOAD16_BYTE( "l1_cruisin_u.s.a._sound_rom_u9.u9", 0xe00000, 0x80000, CRC(24ba6371) SHA1(f60a9ff73b3645e2c8bad67e2f6debc61b5e0653) )
 
 	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "cusa-l21.u10", 0x000000, 0x80000, CRC(bb759945) SHA1(dbf5270503cb58adb0abd34a8aece5933063ec66) )
-	ROM_LOAD32_BYTE( "cusa-l21.u11", 0x000001, 0x80000, CRC(4d2da096) SHA1(6ccb9fee095580089f8d43a2e86e0f8a4407dda5) )
-	ROM_LOAD32_BYTE( "cusa-l21.u12", 0x000002, 0x80000, CRC(4b66fe5e) SHA1(885d31c06b11209a1154789bc84e75d0ac9e1e8a) )
-	ROM_LOAD32_BYTE( "cusa-l21.u13", 0x000003, 0x80000, CRC(a165359f) SHA1(eefbeaa67282b3826503f4edff84282ff5f45d35) )
-	ROM_LOAD32_BYTE( "cusa.u14",     0x200000, 0x80000, CRC(6a4ae622) SHA1(f488e7616371125d5aef2047b8e0fc954ca4b9b4) )
-	ROM_LOAD32_BYTE( "cusa.u15",     0x200001, 0x80000, CRC(1a0ad3b7) SHA1(a5300f3c789a4d9d257fda3a280e882f17f4a99f) )
-	ROM_LOAD32_BYTE( "cusa.u16",     0x200002, 0x80000, CRC(799d4dd6) SHA1(f1208967544477005924f2a553037e0ffbc668ab) )
-	ROM_LOAD32_BYTE( "cusa.u17",     0x200003, 0x80000, CRC(3d68b660) SHA1(3f14e32c205a504ef39abf1e390bd8031d9d7b5b) )
-	ROM_LOAD32_BYTE( "cusa.u18",     0x400000, 0x80000, CRC(9e8193fb) SHA1(ec88c2b51bb607d3181e467f8b255c13efebc73c) )
-	ROM_LOAD32_BYTE( "cusa.u19",     0x400001, 0x80000, CRC(0bf60cde) SHA1(6c63b3eacaefeb405c8fdf641437786262bcb10d) )
-	ROM_LOAD32_BYTE( "cusa.u20",     0x400002, 0x80000, CRC(c07f68f0) SHA1(444ccf8e49fd9c0f707ab32347984ca5628207f9) )
-	ROM_LOAD32_BYTE( "cusa.u21",     0x400003, 0x80000, CRC(b0264aed) SHA1(d6a6eca4e4ecedfbc5590dbd06870761155ae8c5) )
-	ROM_LOAD32_BYTE( "cusa.u22",     0x600000, 0x80000, CRC(ad137193) SHA1(642a7c37940cb3b2b190661da7b1d4848c7c513d) )
-	ROM_LOAD32_BYTE( "cusa.u23",     0x600001, 0x80000, CRC(842449b0) SHA1(b23ebe28ff3c6a268ff9ae1242a4392d2305396b) )
-	ROM_LOAD32_BYTE( "cusa.u24",     0x600002, 0x80000, CRC(0b2275be) SHA1(3dc79095064cc158d37218c9a038b5b7a777fc66) )
-	ROM_LOAD32_BYTE( "cusa.u25",     0x600003, 0x80000, CRC(2b9fe68f) SHA1(2750613e61c1eaac629ef5b9e89fd88e99a262cc) )
-	ROM_LOAD32_BYTE( "cusa.u26",     0x800000, 0x80000, CRC(ae56b871) SHA1(1e218426084123c6c2389d96ce92691010012aa4) )
-	ROM_LOAD32_BYTE( "cusa.u27",     0x800001, 0x80000, CRC(2d977a8e) SHA1(8f4d511bfd6c3bee18daa7253be1a27d079aec8f) )
-	ROM_LOAD32_BYTE( "cusa.u28",     0x800002, 0x80000, CRC(cffa5fb1) SHA1(fb73bc8f65b604c374f88d0ecf06c50ef52f0547) )
-	ROM_LOAD32_BYTE( "cusa.u29",     0x800003, 0x80000, CRC(cbe52c60) SHA1(3f309ce8ef1784c830f4160cfe76dc3a0b438cac) )
+	ROM_LOAD32_BYTE( "l2.1_cruisin_u.s.a._game_rom_u10.u10", 0x000000, 0x80000, CRC(bb759945) SHA1(dbf5270503cb58adb0abd34a8aece5933063ec66) )
+	ROM_LOAD32_BYTE( "l2.1_cruisin_u.s.a._game_rom_u11.u11", 0x000001, 0x80000, CRC(4d2da096) SHA1(6ccb9fee095580089f8d43a2e86e0f8a4407dda5) )
+	ROM_LOAD32_BYTE( "l2.1_cruisin_u.s.a._game_rom_u12.u12", 0x000002, 0x80000, CRC(4b66fe5e) SHA1(885d31c06b11209a1154789bc84e75d0ac9e1e8a) )
+	ROM_LOAD32_BYTE( "l2.1_cruisin_u.s.a._game_rom_u13.u13", 0x000003, 0x80000, CRC(a165359f) SHA1(eefbeaa67282b3826503f4edff84282ff5f45d35) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u14.u14", 0x200000, 0x80000, CRC(6a4ae622) SHA1(f488e7616371125d5aef2047b8e0fc954ca4b9b4) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u15.u15", 0x200001, 0x80000, CRC(1a0ad3b7) SHA1(a5300f3c789a4d9d257fda3a280e882f17f4a99f) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u16.u16", 0x200002, 0x80000, CRC(799d4dd6) SHA1(f1208967544477005924f2a553037e0ffbc668ab) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u17.u17", 0x200003, 0x80000, CRC(3d68b660) SHA1(3f14e32c205a504ef39abf1e390bd8031d9d7b5b) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u18.u18", 0x400000, 0x80000, CRC(9e8193fb) SHA1(ec88c2b51bb607d3181e467f8b255c13efebc73c) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u19.u19", 0x400001, 0x80000, CRC(0bf60cde) SHA1(6c63b3eacaefeb405c8fdf641437786262bcb10d) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u20.u20", 0x400002, 0x80000, CRC(c07f68f0) SHA1(444ccf8e49fd9c0f707ab32347984ca5628207f9) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u21.u21", 0x400003, 0x80000, CRC(b0264aed) SHA1(d6a6eca4e4ecedfbc5590dbd06870761155ae8c5) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u22.u22", 0x600000, 0x80000, CRC(ad137193) SHA1(642a7c37940cb3b2b190661da7b1d4848c7c513d) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u23.u23", 0x600001, 0x80000, CRC(842449b0) SHA1(b23ebe28ff3c6a268ff9ae1242a4392d2305396b) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u24.u24", 0x600002, 0x80000, CRC(0b2275be) SHA1(3dc79095064cc158d37218c9a038b5b7a777fc66) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u25.u25", 0x600003, 0x80000, CRC(2b9fe68f) SHA1(2750613e61c1eaac629ef5b9e89fd88e99a262cc) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u26.u26", 0x800000, 0x80000, CRC(ae56b871) SHA1(1e218426084123c6c2389d96ce92691010012aa4) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u27.u27", 0x800001, 0x80000, CRC(2d977a8e) SHA1(8f4d511bfd6c3bee18daa7253be1a27d079aec8f) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u28.u28", 0x800002, 0x80000, CRC(cffa5fb1) SHA1(fb73bc8f65b604c374f88d0ecf06c50ef52f0547) )
+	ROM_LOAD32_BYTE( "l1_cruisin_u.s.a._game_rom_u29.u29", 0x800003, 0x80000, CRC(cbe52c60) SHA1(3f309ce8ef1784c830f4160cfe76dc3a0b438cac) )
 
 	ROM_REGION( 0x0b33, "pals", 0 ) // all protected
 	ROM_LOAD("a-19669.u38",  0x0000, 0x02dd, NO_DUMP ) /* TIBPAL22V10-15BCNT */
@@ -1395,375 +1421,409 @@
 ROM_END
 
 
+/*
+Some Cruis'n World PCBs have mask ROMs for the data ROMs
+
+Mask ROMs are in the following format:
+--------------------------------   --------------------------------
+|    MIDWAY GAMES INC          |   |    MIDWAY GAMES INC          |
+|    CRUISN WORLD              |   |    CRUISN WORLD              |
+)    5341-15282-01             |   )    5341-15287-01             |
+|    U3 SOUND                  |   |    U14 VIDEO IMAGE           |
+|   (C)1996 MIDWAY GAMES       |   |   (C)1996 MIDWAY GAMES       |
+--------------------------------   --------------------------------
+
+*/
 ROM_START( crusnwld ) /* Version 2.5, Wed Nov 04 1998 - 15:50:52 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "cwld.u2",  0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
-	ROM_LOAD16_BYTE( "cwld.u3",  0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
-	ROM_LOAD16_BYTE( "cwld.u4",  0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
-	ROM_LOAD16_BYTE( "cwld.u5",  0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
-	ROM_LOAD16_BYTE( "cwld.u6",  0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
-	ROM_LOAD16_BYTE( "cwld.u7",  0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
-	ROM_LOAD16_BYTE( "cwld.u8",  0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
-	ROM_LOAD16_BYTE( "cwld.u9",  0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u2_sound.u2", 0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u3_sound.u3", 0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u4_sound.u4", 0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u5_sound.u5", 0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u6_sound.u6", 0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u7_sound.u7", 0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u8_sound.u8", 0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u9_sound.u9", 0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
 
 	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "crusnw25.u10", 0x0000000, 0x100000, CRC(fd776872) SHA1(90df230b58b1c60d1ca7545ef177e5df30b4ea9d) ) /* Labeled 2.5 Cruis'n World Automatic U10 */
-	ROM_LOAD32_BYTE( "crusnw25.u11", 0x0000001, 0x100000, CRC(0c99a405) SHA1(14251187f00c198fbaa39817f8c95d1dbec80ec0) ) /* Labeled 2.5 Cruis'n World Automatic U11 */
-	ROM_LOAD32_BYTE( "crusnw25.u12", 0x0000002, 0x100000, CRC(3ba9fad8) SHA1(ac8d0dd4df3c1f1c28d93d615d7e24aed4a4a9b5) ) /* Labeled 2.5 Cruis'n World Automatic U12 */
-	ROM_LOAD32_BYTE( "crusnw25.u13", 0x0000003, 0x100000, CRC(21a79c9a) SHA1(e33f768c2309613e4936416ee5250d3b1690d11d) ) /* Labeled 2.5 Cruis'n World Automatic U13 */
-	ROM_LOAD32_BYTE( "cwld.u14",     0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
-	ROM_LOAD32_BYTE( "cwld.u15",     0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
-	ROM_LOAD32_BYTE( "cwld.u16",     0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
-	ROM_LOAD32_BYTE( "cwld.u17",     0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
-	ROM_LOAD32_BYTE( "cwld.u18",     0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
-	ROM_LOAD32_BYTE( "cwld.u19",     0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
-	ROM_LOAD32_BYTE( "cwld.u20",     0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
-	ROM_LOAD32_BYTE( "cwld.u21",     0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
-	ROM_LOAD32_BYTE( "cwld.u22",     0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
-	ROM_LOAD32_BYTE( "cwld.u23",     0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
-	ROM_LOAD32_BYTE( "cwld.u24",     0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
-	ROM_LOAD32_BYTE( "cwld.u25",     0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
+	ROM_LOAD32_BYTE( "2.5_cruisn_world_automatic_u10.u10", 0x0000000, 0x100000, CRC(fd776872) SHA1(90df230b58b1c60d1ca7545ef177e5df30b4ea9d) ) /* Labeled 2.5 Cruis'n World Automatic U10 */
+	ROM_LOAD32_BYTE( "2.5_cruisn_world_automatic_u11.u11", 0x0000001, 0x100000, CRC(0c99a405) SHA1(14251187f00c198fbaa39817f8c95d1dbec80ec0) ) /* Labeled 2.5 Cruis'n World Automatic U11 */
+	ROM_LOAD32_BYTE( "2.5_cruisn_world_automatic_u12.u12", 0x0000002, 0x100000, CRC(3ba9fad8) SHA1(ac8d0dd4df3c1f1c28d93d615d7e24aed4a4a9b5) ) /* Labeled 2.5 Cruis'n World Automatic U12 */
+	ROM_LOAD32_BYTE( "2.5_cruisn_world_automatic_u13.u13", 0x0000003, 0x100000, CRC(21a79c9a) SHA1(e33f768c2309613e4936416ee5250d3b1690d11d) ) /* Labeled 2.5 Cruis'n World Automatic U13 */
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u14_image.u14", 0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u15_image.u15", 0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u16_image.u16", 0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u17_image.u17", 0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u18_image.u18", 0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u19_image.u19", 0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u20_image.u20", 0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u21_image.u21", 0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u22_image.u22", 0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u23_image.u23", 0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u24_image.u24", 0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u25_image.u25", 0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
 ROM_END
 
 
 ROM_START( crusnwld24 ) /* Version 2.4, Thu Feb 19 1998 - 13:43:26 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "cwld.u2",  0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
-	ROM_LOAD16_BYTE( "cwld.u3",  0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
-	ROM_LOAD16_BYTE( "cwld.u4",  0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
-	ROM_LOAD16_BYTE( "cwld.u5",  0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
-	ROM_LOAD16_BYTE( "cwld.u6",  0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
-	ROM_LOAD16_BYTE( "cwld.u7",  0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
-	ROM_LOAD16_BYTE( "cwld.u8",  0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
-	ROM_LOAD16_BYTE( "cwld.u9",  0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u2_sound.u2", 0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u3_sound.u3", 0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u4_sound.u4", 0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u5_sound.u5", 0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u6_sound.u6", 0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u7_sound.u7", 0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u8_sound.u8", 0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u9_sound.u9", 0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
 
 	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "crusnw24.u10", 0x0000000, 0x100000, CRC(551ec903) SHA1(f3d983ca5d9a90b2898fb2c3adf8859ab7b43917) )
-	ROM_LOAD32_BYTE( "crusnw24.u11", 0x0000001, 0x100000, CRC(4c57faf2) SHA1(d5717e6222bb59c5aba782bce04aa52c1d148c49) )
-	ROM_LOAD32_BYTE( "crusnw24.u12", 0x0000002, 0x100000, CRC(3a4d9a30) SHA1(ac944555340502e9324df8360c3efc538315e474) )
-	ROM_LOAD32_BYTE( "crusnw24.u13", 0x0000003, 0x100000, CRC(ca6a0c94) SHA1(217659d2ce1b970265df258e330148fef327c6f1) )
-	ROM_LOAD32_BYTE( "cwld.u14",     0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
-	ROM_LOAD32_BYTE( "cwld.u15",     0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
-	ROM_LOAD32_BYTE( "cwld.u16",     0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
-	ROM_LOAD32_BYTE( "cwld.u17",     0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
-	ROM_LOAD32_BYTE( "cwld.u18",     0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
-	ROM_LOAD32_BYTE( "cwld.u19",     0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
-	ROM_LOAD32_BYTE( "cwld.u20",     0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
-	ROM_LOAD32_BYTE( "cwld.u21",     0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
-	ROM_LOAD32_BYTE( "cwld.u22",     0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
-	ROM_LOAD32_BYTE( "cwld.u23",     0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
-	ROM_LOAD32_BYTE( "cwld.u24",     0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
-	ROM_LOAD32_BYTE( "cwld.u25",     0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
+	ROM_LOAD32_BYTE( "2.4_cruisn_world_u10_game.u10",  0x0000000, 0x100000, CRC(551ec903) SHA1(f3d983ca5d9a90b2898fb2c3adf8859ab7b43917) )
+	ROM_LOAD32_BYTE( "2.4_cruisn_world_u11_game.u11",  0x0000001, 0x100000, CRC(4c57faf2) SHA1(d5717e6222bb59c5aba782bce04aa52c1d148c49) )
+	ROM_LOAD32_BYTE( "2.4_cruisn_world_u12_game.u12",  0x0000002, 0x100000, CRC(3a4d9a30) SHA1(ac944555340502e9324df8360c3efc538315e474) )
+	ROM_LOAD32_BYTE( "2.4_cruisn_world_u13_game.u13",  0x0000003, 0x100000, CRC(ca6a0c94) SHA1(217659d2ce1b970265df258e330148fef327c6f1) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u14_image.u14", 0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u15_image.u15", 0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u16_image.u16", 0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u17_image.u17", 0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u18_image.u18", 0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u19_image.u19", 0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u20_image.u20", 0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u21_image.u21", 0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u22_image.u22", 0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u23_image.u23", 0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u24_image.u24", 0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u25_image.u25", 0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
 ROM_END
 
 
 ROM_START( crusnwld23 ) /* Version 2.3, Fri Jan 09 1998 - 10:25:49 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "cwld.u2",  0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
-	ROM_LOAD16_BYTE( "cwld.u3",  0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
-	ROM_LOAD16_BYTE( "cwld.u4",  0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
-	ROM_LOAD16_BYTE( "cwld.u5",  0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
-	ROM_LOAD16_BYTE( "cwld.u6",  0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
-	ROM_LOAD16_BYTE( "cwld.u7",  0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
-	ROM_LOAD16_BYTE( "cwld.u8",  0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
-	ROM_LOAD16_BYTE( "cwld.u9",  0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u2_sound.u2", 0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u3_sound.u3", 0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u4_sound.u4", 0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u5_sound.u5", 0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u6_sound.u6", 0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u7_sound.u7", 0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u8_sound.u8", 0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u9_sound.u9", 0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
 
 	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "cwld_l23.u10", 0x0000000, 0x100000, CRC(956e0642) SHA1(c023d41159bac9b468d6fc411005f66b15b9dff6) )
-	ROM_LOAD32_BYTE( "cwld_l23.u11", 0x0000001, 0x100000, CRC(b4ed2929) SHA1(22afc3c7bcc57b7b24b4156376df0b7fb8f0c9fb) )
-	ROM_LOAD32_BYTE( "cwld_l23.u12", 0x0000002, 0x100000, CRC(cd12528e) SHA1(685e2280448be2cd90a875cca9ef2ab3d2f8d3e1) )
-	ROM_LOAD32_BYTE( "cwld_l23.u13", 0x0000003, 0x100000, CRC(b096d211) SHA1(a2663b58e2f21bcfcba5317ff0ae91dd21a399f5) )
-	ROM_LOAD32_BYTE( "cwld.u14",     0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
-	ROM_LOAD32_BYTE( "cwld.u15",     0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
-	ROM_LOAD32_BYTE( "cwld.u16",     0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
-	ROM_LOAD32_BYTE( "cwld.u17",     0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
-	ROM_LOAD32_BYTE( "cwld.u18",     0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
-	ROM_LOAD32_BYTE( "cwld.u19",     0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
-	ROM_LOAD32_BYTE( "cwld.u20",     0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
-	ROM_LOAD32_BYTE( "cwld.u21",     0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
-	ROM_LOAD32_BYTE( "cwld.u22",     0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
-	ROM_LOAD32_BYTE( "cwld.u23",     0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
-	ROM_LOAD32_BYTE( "cwld.u24",     0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
-	ROM_LOAD32_BYTE( "cwld.u25",     0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
+	ROM_LOAD32_BYTE( "2.3_cruisn_world_u10_game.u10",  0x0000000, 0x100000, CRC(956e0642) SHA1(c023d41159bac9b468d6fc411005f66b15b9dff6) )
+	ROM_LOAD32_BYTE( "2.3_cruisn_world_u11_game.u11",  0x0000001, 0x100000, CRC(b4ed2929) SHA1(22afc3c7bcc57b7b24b4156376df0b7fb8f0c9fb) )
+	ROM_LOAD32_BYTE( "2.3_cruisn_world_u12_game.u12",  0x0000002, 0x100000, CRC(cd12528e) SHA1(685e2280448be2cd90a875cca9ef2ab3d2f8d3e1) )
+	ROM_LOAD32_BYTE( "2.3_cruisn_world_u13_game.u13",  0x0000003, 0x100000, CRC(b096d211) SHA1(a2663b58e2f21bcfcba5317ff0ae91dd21a399f5) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u14_image.u14", 0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u15_image.u15", 0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u16_image.u16", 0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u17_image.u17", 0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u18_image.u18", 0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u19_image.u19", 0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u20_image.u20", 0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u21_image.u21", 0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u22_image.u22", 0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u23_image.u23", 0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u24_image.u24", 0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u25_image.u25", 0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
 ROM_END
 
 
 ROM_START( crusnwld20 ) /* Version 2.0, Tue Mar 18 1997 - 12:32:57 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "cwld.u2",  0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
-	ROM_LOAD16_BYTE( "cwld.u3",  0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
-	ROM_LOAD16_BYTE( "cwld.u4",  0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
-	ROM_LOAD16_BYTE( "cwld.u5",  0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
-	ROM_LOAD16_BYTE( "cwld.u6",  0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
-	ROM_LOAD16_BYTE( "cwld.u7",  0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
-	ROM_LOAD16_BYTE( "cwld.u8",  0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
-	ROM_LOAD16_BYTE( "cwld.u9",  0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u2_sound.u2", 0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u3_sound.u3", 0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u4_sound.u4", 0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u5_sound.u5", 0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u6_sound.u6", 0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u7_sound.u7", 0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u8_sound.u8", 0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u9_sound.u9", 0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
 
 	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "u10_v20.u10",  0x0000000, 0x100000, CRC(2a04da6d) SHA1(0aab4f3dc4853de11234245ac14baa14cb3867f3) )
-	ROM_LOAD32_BYTE( "u11_v20.u11",  0x0000001, 0x100000, CRC(26a8ad51) SHA1(522ef3499ba83fa808d7cdae71759e056df353bf) )
-	ROM_LOAD32_BYTE( "u12_v20.u12",  0x0000002, 0x100000, CRC(236caec0) SHA1(f53df733943a52f94878bb1b7d6c877722b3fd82) )
-	ROM_LOAD32_BYTE( "u13_v20.u13",  0x0000003, 0x100000, CRC(7e056e53) SHA1(62b593e093d06a8c0cca56e34f567f795bfc41fc) )
-	ROM_LOAD32_BYTE( "cwld.u14",     0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
-	ROM_LOAD32_BYTE( "cwld.u15",     0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
-	ROM_LOAD32_BYTE( "cwld.u16",     0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
-	ROM_LOAD32_BYTE( "cwld.u17",     0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
-	ROM_LOAD32_BYTE( "cwld.u18",     0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
-	ROM_LOAD32_BYTE( "cwld.u19",     0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
-	ROM_LOAD32_BYTE( "cwld.u20",     0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
-	ROM_LOAD32_BYTE( "cwld.u21",     0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
-	ROM_LOAD32_BYTE( "cwld.u22",     0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
-	ROM_LOAD32_BYTE( "cwld.u23",     0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
-	ROM_LOAD32_BYTE( "cwld.u24",     0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
-	ROM_LOAD32_BYTE( "cwld.u25",     0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
+	ROM_LOAD32_BYTE( "2.0_cruisn_world_u10_game.u10",  0x0000000, 0x100000, CRC(2a04da6d) SHA1(0aab4f3dc4853de11234245ac14baa14cb3867f3) )
+	ROM_LOAD32_BYTE( "2.0_cruisn_world_u11_game.u11",  0x0000001, 0x100000, CRC(26a8ad51) SHA1(522ef3499ba83fa808d7cdae71759e056df353bf) )
+	ROM_LOAD32_BYTE( "2.0_cruisn_world_u12_game.u12",  0x0000002, 0x100000, CRC(236caec0) SHA1(f53df733943a52f94878bb1b7d6c877722b3fd82) )
+	ROM_LOAD32_BYTE( "2.0_cruisn_world_u13_game.u13",  0x0000003, 0x100000, CRC(7e056e53) SHA1(62b593e093d06a8c0cca56e34f567f795bfc41fc) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u14_image.u14", 0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u15_image.u15", 0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u16_image.u16", 0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u17_image.u17", 0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u18_image.u18", 0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u19_image.u19", 0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u20_image.u20", 0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u21_image.u21", 0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u22_image.u22", 0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u23_image.u23", 0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u24_image.u24", 0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u25_image.u25", 0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
 ROM_END
 
 
 ROM_START( crusnwld19 ) /* Version 1.9, Sat Mar 08 1997 - 14:48:17 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "cwld.u2",  0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
-	ROM_LOAD16_BYTE( "cwld.u3",  0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
-	ROM_LOAD16_BYTE( "cwld.u4",  0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
-	ROM_LOAD16_BYTE( "cwld.u5",  0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
-	ROM_LOAD16_BYTE( "cwld.u6",  0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
-	ROM_LOAD16_BYTE( "cwld.u7",  0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
-	ROM_LOAD16_BYTE( "cwld.u8",  0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
-	ROM_LOAD16_BYTE( "cwld.u9",  0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u2_sound.u2", 0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u3_sound.u3", 0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u4_sound.u4", 0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u5_sound.u5", 0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u6_sound.u6", 0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u7_sound.u7", 0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u8_sound.u8", 0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u9_sound.u9", 0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
 
 	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "crusnw19.u10", 0x0000000, 0x100000, CRC(c5cf5316) SHA1(f9900526314c1ea2903fd9a01fcdb839609b1858) )
-	ROM_LOAD32_BYTE( "crusnw19.u11", 0x0000001, 0x100000, CRC(0b183a06) SHA1(06585662abebedc986b22c10fd4f489ed1d94e67) )
-	ROM_LOAD32_BYTE( "crusnw19.u12", 0x0000002, 0x100000, CRC(e32d1a8d) SHA1(ba5bbcee4fe67194e5e0bd99898116350450e83f) )
-	ROM_LOAD32_BYTE( "crusnw19.u13", 0x0000003, 0x100000, CRC(91fcae27) SHA1(a5c2942b01ed6c8a8f4187b4d08a5f1868cf3e2e) )
-	ROM_LOAD32_BYTE( "cwld.u14",     0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
-	ROM_LOAD32_BYTE( "cwld.u15",     0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
-	ROM_LOAD32_BYTE( "cwld.u16",     0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
-	ROM_LOAD32_BYTE( "cwld.u17",     0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
-	ROM_LOAD32_BYTE( "cwld.u18",     0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
-	ROM_LOAD32_BYTE( "cwld.u19",     0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
-	ROM_LOAD32_BYTE( "cwld.u20",     0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
-	ROM_LOAD32_BYTE( "cwld.u21",     0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
-	ROM_LOAD32_BYTE( "cwld.u22",     0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
-	ROM_LOAD32_BYTE( "cwld.u23",     0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
-	ROM_LOAD32_BYTE( "cwld.u24",     0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
-	ROM_LOAD32_BYTE( "cwld.u25",     0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
+	ROM_LOAD32_BYTE( "1.9_cruisn_world_u10_game.u10",  0x0000000, 0x100000, CRC(c5cf5316) SHA1(f9900526314c1ea2903fd9a01fcdb839609b1858) )
+	ROM_LOAD32_BYTE( "1.9_cruisn_world_u11_game.u11",  0x0000001, 0x100000, CRC(0b183a06) SHA1(06585662abebedc986b22c10fd4f489ed1d94e67) )
+	ROM_LOAD32_BYTE( "1.9_cruisn_world_u12_game.u12",  0x0000002, 0x100000, CRC(e32d1a8d) SHA1(ba5bbcee4fe67194e5e0bd99898116350450e83f) )
+	ROM_LOAD32_BYTE( "1.9_cruisn_world_u13_game.u13",  0x0000003, 0x100000, CRC(91fcae27) SHA1(a5c2942b01ed6c8a8f4187b4d08a5f1868cf3e2e) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u14_image.u14", 0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u15_image.u15", 0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u16_image.u16", 0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u17_image.u17", 0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u18_image.u18", 0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u19_image.u19", 0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u20_image.u20", 0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u21_image.u21", 0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u22_image.u22", 0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u23_image.u23", 0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u24_image.u24", 0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u25_image.u25", 0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
 ROM_END
 
 
 ROM_START( crusnwld17 ) /* Version 1.7, Fri Jan 24 1997 - 16:23:59 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "cwld.u2",  0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
-	ROM_LOAD16_BYTE( "cwld.u3",  0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
-	ROM_LOAD16_BYTE( "cwld.u4",  0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
-	ROM_LOAD16_BYTE( "cwld.u5",  0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
-	ROM_LOAD16_BYTE( "cwld.u6",  0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
-	ROM_LOAD16_BYTE( "cwld.u7",  0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
-	ROM_LOAD16_BYTE( "cwld.u8",  0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
-	ROM_LOAD16_BYTE( "cwld.u9",  0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u2_sound.u2", 0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u3_sound.u3", 0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u4_sound.u4", 0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u5_sound.u5", 0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u6_sound.u6", 0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u7_sound.u7", 0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u8_sound.u8", 0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u9_sound.u9", 0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
 
 	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "crusnw17.u10", 0x0000000, 0x100000, CRC(afca0f15) SHA1(52ed51e31ba7f8ac1a71a7bdb64733b6e95b0669) )
-	ROM_LOAD32_BYTE( "crusnw17.u11", 0x0000001, 0x100000, CRC(6610af52) SHA1(c6ab7f369bd0b05e0ce28c7829b870f5b6ddf12f) )
-	ROM_LOAD32_BYTE( "crusnw17.u12", 0x0000002, 0x100000, CRC(ef0107b1) SHA1(350017ab56c220516dda53c8323eaf82d7dee8dd) )
-	ROM_LOAD32_BYTE( "crusnw17.u13", 0x0000003, 0x100000, CRC(c1d68aa0) SHA1(07d5ec75d921935474a9de738b1b7e9cb0748483) )
-	ROM_LOAD32_BYTE( "cwld.u14",     0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
-	ROM_LOAD32_BYTE( "cwld.u15",     0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
-	ROM_LOAD32_BYTE( "cwld.u16",     0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
-	ROM_LOAD32_BYTE( "cwld.u17",     0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
-	ROM_LOAD32_BYTE( "cwld.u18",     0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
-	ROM_LOAD32_BYTE( "cwld.u19",     0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
-	ROM_LOAD32_BYTE( "cwld.u20",     0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
-	ROM_LOAD32_BYTE( "cwld.u21",     0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
-	ROM_LOAD32_BYTE( "cwld.u22",     0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
-	ROM_LOAD32_BYTE( "cwld.u23",     0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
-	ROM_LOAD32_BYTE( "cwld.u24",     0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
-	ROM_LOAD32_BYTE( "cwld.u25",     0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
+	ROM_LOAD32_BYTE( "1.7_cruisn_world_u10_game.u10",  0x0000000, 0x100000, CRC(afca0f15) SHA1(52ed51e31ba7f8ac1a71a7bdb64733b6e95b0669) )
+	ROM_LOAD32_BYTE( "1.7_cruisn_world_u11_game.u11",  0x0000001, 0x100000, CRC(6610af52) SHA1(c6ab7f369bd0b05e0ce28c7829b870f5b6ddf12f) )
+	ROM_LOAD32_BYTE( "1.7_cruisn_world_u12_game.u12",  0x0000002, 0x100000, CRC(ef0107b1) SHA1(350017ab56c220516dda53c8323eaf82d7dee8dd) )
+	ROM_LOAD32_BYTE( "1.7_cruisn_world_u13_game.u13",  0x0000003, 0x100000, CRC(c1d68aa0) SHA1(07d5ec75d921935474a9de738b1b7e9cb0748483) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u14_image.u14", 0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u15_image.u15", 0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u16_image.u16", 0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u17_image.u17", 0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u18_image.u18", 0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u19_image.u19", 0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u20_image.u20", 0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u21_image.u21", 0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u22_image.u22", 0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u23_image.u23", 0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u24_image.u24", 0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u25_image.u25", 0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
 ROM_END
 
 
 ROM_START( crusnwld13 ) /* Version 1.3, Mon Nov 25 1996 - 23:22:45 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "cwld.u2",  0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
-	ROM_LOAD16_BYTE( "cwld.u3",  0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
-	ROM_LOAD16_BYTE( "cwld.u4",  0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
-	ROM_LOAD16_BYTE( "cwld.u5",  0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
-	ROM_LOAD16_BYTE( "cwld.u6",  0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
-	ROM_LOAD16_BYTE( "cwld.u7",  0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
-	ROM_LOAD16_BYTE( "cwld.u8",  0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
-	ROM_LOAD16_BYTE( "cwld.u9",  0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u2_sound.u2", 0x000000, 0x80000, CRC(7a233c89) SHA1(ecfad4bc48a69cd3399e3b3266c81574082e0169) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u3_sound.u3", 0x200000, 0x80000, CRC(be9a5ff0) SHA1(98d69dbfa6aa8462cdd46772e991ee418b79c653) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u4_sound.u4", 0x400000, 0x80000, CRC(69f02d84) SHA1(0fb4ff750de78505f241ae6cd18fccf3ddf4223f) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u5_sound.u5", 0x600000, 0x80000, CRC(9d0b9071) SHA1(05edf9073399a942a9d0b969274a7ebf4ca677da) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u6_sound.u6", 0x800000, 0x80000, CRC(df28f492) SHA1(c61f3870f59458b7bb5efbf93d697e3fa44a7830) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u7_sound.u7", 0xa00000, 0x80000, CRC(0128913e) SHA1(c11bc115877310c17f9b57f72b29d19b0ad71afa) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u8_sound.u8", 0xc00000, 0x80000, CRC(5127c08e) SHA1(4f0eae73817270fa156829100b66f0ff88fa422c) )
+	ROM_LOAD16_BYTE( "1.0_cruisn_world_u9_sound.u9", 0xe00000, 0x80000, CRC(84cdc781) SHA1(62287aa72903698d1890908adde53c39f8bd200c) )
 
 	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "cwld_l13.u10", 0x0000000, 0x100000, CRC(d361d17d) SHA1(7f42baec5492c4040e030e6233e500eb54bd9cba) )
-	ROM_LOAD32_BYTE( "cwld_l13.u11", 0x0000001, 0x100000, CRC(b0c0a462) SHA1(22ae081c3eb9f298aea73e99a0124becd540f0df) )
-	ROM_LOAD32_BYTE( "cwld_l13.u12", 0x0000002, 0x100000, CRC(5e7c566b) SHA1(81e6f21309bd3ba8589bc591a9ba5729f301539e) )
-	ROM_LOAD32_BYTE( "cwld_l13.u13", 0x0000003, 0x100000, CRC(46886e9c) SHA1(a2400f42fef9838fd8a347e8a249ba977d9fbcfe) )
-	ROM_LOAD32_BYTE( "cwld.u14",     0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
-	ROM_LOAD32_BYTE( "cwld.u15",     0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
-	ROM_LOAD32_BYTE( "cwld.u16",     0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
-	ROM_LOAD32_BYTE( "cwld.u17",     0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
-	ROM_LOAD32_BYTE( "cwld.u18",     0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
-	ROM_LOAD32_BYTE( "cwld.u19",     0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
-	ROM_LOAD32_BYTE( "cwld.u20",     0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
-	ROM_LOAD32_BYTE( "cwld.u21",     0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
-	ROM_LOAD32_BYTE( "cwld.u22",     0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
-	ROM_LOAD32_BYTE( "cwld.u23",     0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
-	ROM_LOAD32_BYTE( "cwld.u24",     0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
-	ROM_LOAD32_BYTE( "cwld.u25",     0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
+	ROM_LOAD32_BYTE( "1.3_cruisn_world_u10_game.u10",  0x0000000, 0x100000, CRC(d361d17d) SHA1(7f42baec5492c4040e030e6233e500eb54bd9cba) )
+	ROM_LOAD32_BYTE( "1.3_cruisn_world_u11_game.u11",  0x0000001, 0x100000, CRC(b0c0a462) SHA1(22ae081c3eb9f298aea73e99a0124becd540f0df) )
+	ROM_LOAD32_BYTE( "1.3_cruisn_world_u12_game.u12",  0x0000002, 0x100000, CRC(5e7c566b) SHA1(81e6f21309bd3ba8589bc591a9ba5729f301539e) )
+	ROM_LOAD32_BYTE( "1.3_cruisn_world_u13_game.u13",  0x0000003, 0x100000, CRC(46886e9c) SHA1(a2400f42fef9838fd8a347e8a249ba977d9fbcfe) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u14_image.u14", 0x0400000, 0x100000, CRC(ee815091) SHA1(fb8a99bae07f42966f76a3bb073d7d8280d8efcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u15_image.u15", 0x0400001, 0x100000, CRC(e2da7bf1) SHA1(9d9a80055ee62476f47c95e30ec9a989d5d0e25b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u16_image.u16", 0x0400002, 0x100000, CRC(05a7ad2f) SHA1(4bdfde671379ecefa3f8ceb6fc06e8df5d70fc22) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u17_image.u17", 0x0400003, 0x100000, CRC(d6278c0c) SHA1(3e152d755d69903718a84d4154e442a31026f3d8) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u18_image.u18", 0x0800000, 0x100000, CRC(e2dc2733) SHA1(c277643548c03d831a3b091f1a311accac9d106b) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u19_image.u19", 0x0800001, 0x100000, CRC(5223a070) SHA1(90ce48b2308fa9e7cb636c4732b20b8e177aa9b1) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u20_image.u20", 0x0800002, 0x100000, CRC(db535625) SHA1(599ccd6bcfb155eb68ac131de4af524510ab35b7) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u21_image.u21", 0x0800003, 0x100000, CRC(92a080e8) SHA1(e5e0faf820b5870a81f121b6ad4c37a9081724e4) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u22_image.u22", 0x0c00000, 0x100000, CRC(77c56318) SHA1(52344038942c83f3ce82f3169a345ceb86e43dcb) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u23_image.u23", 0x0c00001, 0x100000, CRC(6b920fc7) SHA1(993da81181f24075e1aead7c4b374f36dd86a9c3) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u24_image.u24", 0x0c00002, 0x100000, CRC(83485401) SHA1(58407818a82a7a3657530dcda7e373e678b58ab2) )
+	ROM_LOAD32_BYTE( "1.1_cruisn_world_u25_image.u25", 0x0c00003, 0x100000, CRC(0dad97a9) SHA1(cdb0c02da35243b118e37ff1519aa6ee1a79d06d) )
 ROM_END
 
 
+/*
+Some Off Road Challenge PCBs were all EPROMs, most seemed to have mask ROMs for the data ROMs
+
+Mask ROMs have been seen in two formats:
+--------------------------------   --------------------------------
+|    MIDWAY GAMES INC          |   |    MIDWAY GAMES INC          |
+|    OFFROAD CHALLENGE         |   |    OFFROAD CHALLENGE         |
+)    5341-15511-01             |   )    5341-15510-01             |
+|    U3 SOUND                  |   |    U14 VIDEO IMAGE           |
+|   (C)1997 MIDWAY GAMES       |   |   (C)1997 MIDWAY GAMES       |
+--------------------------------   --------------------------------
+                                or
+--------------------------------   --------------------------------
+|                              |   |                              |
+|    OFF ROAD                  |   |    OFF ROAD                  |
+)    U3 SOUND                  |   )    U14 IMAGE                 |
+|    1997 MIDWAY               |   |    1997 MIDWAY               |
+|                              |   |                              |
+--------------------------------   --------------------------------
+
+*/
 ROM_START( offroadc ) /* Version 1.63, Tue 03-03-98 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "offroadc.u2",  0x000000, 0x80000, CRC(69976e9d) SHA1(63c886ac2563c43a10840f49f929f8613cd94de2) )
-	ROM_LOAD16_BYTE( "offroadc.u3",  0x200000, 0x80000, CRC(2db9b548) SHA1(4f454a3e6a8851b0ef5d325dd28102d57ea11a11) )
-	ROM_LOAD16_BYTE( "offroadc.u4",  0x400000, 0x80000, CRC(42bdf9d0) SHA1(04add0f0ee7fa61de1913cc0b988345d3d430cde) )
-	ROM_LOAD16_BYTE( "offroadc.u5",  0x600000, 0x80000, CRC(569cc84b) SHA1(08b917cc41fae6b6a3e9d9461a783d3d2865e72a) )
-	ROM_LOAD16_BYTE( "offroadc.u6",  0x800000, 0x80000, CRC(0896f679) SHA1(dde39ef17834256909ef2c9fcd5b5fb9939d5178) )
-	ROM_LOAD16_BYTE( "offroadc.u7",  0xa00000, 0x80000, CRC(fe242d6a) SHA1(8fbac22ed23044841f309ce58c5b1affcdd5d114) )
-	ROM_LOAD16_BYTE( "offroadc.u8",  0xc00000, 0x80000, CRC(5da13f12) SHA1(2bb5e929e8bc6c70cb4475024a6b0bb07ac25244) )
-	ROM_LOAD16_BYTE( "offroadc.u9",  0xe00000, 0x80000, CRC(7ad27f69) SHA1(b33665d0593a95b58d529720aae49e90449bf714) )
+	ROM_LOAD16_BYTE( "1.0_off_road_u2_sound.u2", 0x000000, 0x80000, CRC(69976e9d) SHA1(63c886ac2563c43a10840f49f929f8613cd94de2) ) /* generally a M27C4001 EPROM with label */
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-01_u3_sound.u3", 0x200000, 0x80000, CRC(2db9b548) SHA1(4f454a3e6a8851b0ef5d325dd28102d57ea11a11) ) /* these are mask ROMs */
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-02_u4_sound.u4", 0x400000, 0x80000, CRC(42bdf9d0) SHA1(04add0f0ee7fa61de1913cc0b988345d3d430cde) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-03_u5_sound.u5", 0x600000, 0x80000, CRC(569cc84b) SHA1(08b917cc41fae6b6a3e9d9461a783d3d2865e72a) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-04_u6_sound.u6", 0x800000, 0x80000, CRC(0896f679) SHA1(dde39ef17834256909ef2c9fcd5b5fb9939d5178) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-05_u7_sound.u7", 0xa00000, 0x80000, CRC(fe242d6a) SHA1(8fbac22ed23044841f309ce58c5b1affcdd5d114) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-06_u8_sound.u8", 0xc00000, 0x80000, CRC(5da13f12) SHA1(2bb5e929e8bc6c70cb4475024a6b0bb07ac25244) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-07_u9_sound.u9", 0xe00000, 0x80000, CRC(7ad27f69) SHA1(b33665d0593a95b58d529720aae49e90449bf714) )
 
 	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "orc-1_63.u10", 0x0000000, 0x100000, CRC(faaf81b8) SHA1(d0bd40b2cf5d07db9f668826cc7f0ed84c4e84bf) ) /* Version 1.63 program roms */
-	ROM_LOAD32_BYTE( "orc-1_63.u11", 0x0000001, 0x100000, CRC(f68e9655) SHA1(e29926ea24cfbd228a2136d04a63a92eba0098d7) )
-	ROM_LOAD32_BYTE( "orc-1_63.u12", 0x0000002, 0x100000, CRC(6a5295b3) SHA1(ac72fe205ffb306598400e8b1d9c98ae67b0bab9) )
-	ROM_LOAD32_BYTE( "orc-1_63.u13", 0x0000003, 0x100000, CRC(cb9233b5) SHA1(2d23b6a2312a75dbaa44de3224512c844aaac7b5) )
-	ROM_LOAD32_BYTE( "offroadc.u14", 0x0400000, 0x100000, CRC(1e41d14b) SHA1(3f7c5fae1f8b82ddd811720837fa298785a8dd27) )
-	ROM_LOAD32_BYTE( "offroadc.u15", 0x0400001, 0x100000, CRC(654d623d) SHA1(a944b8f8d71b099d7b5bbd7df6effb90afc3aec8) )
-	ROM_LOAD32_BYTE( "offroadc.u16", 0x0400002, 0x100000, CRC(259774d8) SHA1(90cdf659324b84b3c2c59497cc5611e8f12629a6) )
-	ROM_LOAD32_BYTE( "offroadc.u17", 0x0400003, 0x100000, CRC(50c61434) SHA1(52bc603101b4f88b7d892af683b7c8358cabbf4a) )
-	ROM_LOAD32_BYTE( "offroadc.u18", 0x0800000, 0x100000, CRC(015be91c) SHA1(1624537068c6bc5fa6235bf0b0343347c337e8d8) )
-	ROM_LOAD32_BYTE( "offroadc.u19", 0x0800001, 0x100000, CRC(cfc6b70e) SHA1(8c5ad84c50ca142726db0595153cf04caaabec9c) )
-	ROM_LOAD32_BYTE( "offroadc.u20", 0x0800002, 0x100000, CRC(f48d6e33) SHA1(8b9c205e24f217ac110cdd82388c056ebbbb09b0) )
-	ROM_LOAD32_BYTE( "offroadc.u21", 0x0800003, 0x100000, CRC(17794b56) SHA1(8bfd8f5b43056bfe7f62524bb8c3a8564a3a9413) )
-	ROM_LOAD32_BYTE( "offroadc.u22", 0x0c00000, 0x100000, CRC(f2a6e622) SHA1(a7d7004e95b058124cc02e8073dab8fbed8813c5) )
-	ROM_LOAD32_BYTE( "offroadc.u23", 0x0c00001, 0x100000, CRC(1cba6e20) SHA1(a7c9c58bfc4d26decb08979d83cccedb27528eb6) )
-	ROM_LOAD32_BYTE( "offroadc.u24", 0x0c00002, 0x100000, CRC(fd3ce11f) SHA1(78c65267712488784bc6dc14eef98a90494a9553) )
-	ROM_LOAD32_BYTE( "offroadc.u25", 0x0c00003, 0x100000, CRC(78f8e5db) SHA1(7ec2a5add27d66c43ba5cb7182554321007f5798) )
+	ROM_LOAD32_BYTE( "1.63_off_road_u10_game.u10", 0x0000000, 0x100000, CRC(faaf81b8) SHA1(d0bd40b2cf5d07db9f668826cc7f0ed84c4e84bf) ) /* Version 1.63 program roms */
+	ROM_LOAD32_BYTE( "1.63_off_road_u11_game.u11", 0x0000001, 0x100000, CRC(f68e9655) SHA1(e29926ea24cfbd228a2136d04a63a92eba0098d7) )
+	ROM_LOAD32_BYTE( "1.63_off_road_u12_game.u12", 0x0000002, 0x100000, CRC(6a5295b3) SHA1(ac72fe205ffb306598400e8b1d9c98ae67b0bab9) )
+	ROM_LOAD32_BYTE( "1.63_off_road_u13_game.u13", 0x0000003, 0x100000, CRC(cb9233b5) SHA1(2d23b6a2312a75dbaa44de3224512c844aaac7b5) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-01_u14_video_image.u14", 0x0400000, 0x100000, CRC(1e41d14b) SHA1(3f7c5fae1f8b82ddd811720837fa298785a8dd27) ) /* mask ROMs */
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-02_u15_video_image.u15", 0x0400001, 0x100000, CRC(654d623d) SHA1(a944b8f8d71b099d7b5bbd7df6effb90afc3aec8) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-03_u16_video_image.u16", 0x0400002, 0x100000, CRC(259774d8) SHA1(90cdf659324b84b3c2c59497cc5611e8f12629a6) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-04_u17_video_image.u17", 0x0400003, 0x100000, CRC(50c61434) SHA1(52bc603101b4f88b7d892af683b7c8358cabbf4a) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-05_u18_video_image.u18", 0x0800000, 0x100000, CRC(015be91c) SHA1(1624537068c6bc5fa6235bf0b0343347c337e8d8) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-06_u19_video_image.u19", 0x0800001, 0x100000, CRC(cfc6b70e) SHA1(8c5ad84c50ca142726db0595153cf04caaabec9c) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-07_u20_video_image.u20", 0x0800002, 0x100000, CRC(f48d6e33) SHA1(8b9c205e24f217ac110cdd82388c056ebbbb09b0) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-08_u21_video_image.u21", 0x0800003, 0x100000, CRC(17794b56) SHA1(8bfd8f5b43056bfe7f62524bb8c3a8564a3a9413) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-09_u22_video_image.u22", 0x0c00000, 0x100000, CRC(f2a6e622) SHA1(a7d7004e95b058124cc02e8073dab8fbed8813c5) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-10_u23_video_image.u23", 0x0c00001, 0x100000, CRC(1cba6e20) SHA1(a7c9c58bfc4d26decb08979d83cccedb27528eb6) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-11_u24_video_image.u24", 0x0c00002, 0x100000, CRC(fd3ce11f) SHA1(78c65267712488784bc6dc14eef98a90494a9553) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-12_u25_video_image.u25", 0x0c00003, 0x100000, CRC(78f8e5db) SHA1(7ec2a5add27d66c43ba5cb7182554321007f5798) )
 ROM_END
 
 
 ROM_START( offroadc5 ) /* Version 1.50, Tue 10-21-97 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "offroadc.u2",  0x000000, 0x80000, CRC(69976e9d) SHA1(63c886ac2563c43a10840f49f929f8613cd94de2) )
-	ROM_LOAD16_BYTE( "offroadc.u3",  0x200000, 0x80000, CRC(2db9b548) SHA1(4f454a3e6a8851b0ef5d325dd28102d57ea11a11) )
-	ROM_LOAD16_BYTE( "offroadc.u4",  0x400000, 0x80000, CRC(42bdf9d0) SHA1(04add0f0ee7fa61de1913cc0b988345d3d430cde) )
-	ROM_LOAD16_BYTE( "offroadc.u5",  0x600000, 0x80000, CRC(569cc84b) SHA1(08b917cc41fae6b6a3e9d9461a783d3d2865e72a) )
-	ROM_LOAD16_BYTE( "offroadc.u6",  0x800000, 0x80000, CRC(0896f679) SHA1(dde39ef17834256909ef2c9fcd5b5fb9939d5178) )
-	ROM_LOAD16_BYTE( "offroadc.u7",  0xa00000, 0x80000, CRC(fe242d6a) SHA1(8fbac22ed23044841f309ce58c5b1affcdd5d114) )
-	ROM_LOAD16_BYTE( "offroadc.u8",  0xc00000, 0x80000, CRC(5da13f12) SHA1(2bb5e929e8bc6c70cb4475024a6b0bb07ac25244) )
-	ROM_LOAD16_BYTE( "offroadc.u9",  0xe00000, 0x80000, CRC(7ad27f69) SHA1(b33665d0593a95b58d529720aae49e90449bf714) )
+	ROM_LOAD16_BYTE( "1.0_off_road_u2_sound.u2", 0x000000, 0x80000, CRC(69976e9d) SHA1(63c886ac2563c43a10840f49f929f8613cd94de2) ) /* generally a M27C4001 EPROM with label */
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-01_u3_sound.u3", 0x200000, 0x80000, CRC(2db9b548) SHA1(4f454a3e6a8851b0ef5d325dd28102d57ea11a11) ) /* these are mask ROMs */
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-02_u4_sound.u4", 0x400000, 0x80000, CRC(42bdf9d0) SHA1(04add0f0ee7fa61de1913cc0b988345d3d430cde) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-03_u5_sound.u5", 0x600000, 0x80000, CRC(569cc84b) SHA1(08b917cc41fae6b6a3e9d9461a783d3d2865e72a) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-04_u6_sound.u6", 0x800000, 0x80000, CRC(0896f679) SHA1(dde39ef17834256909ef2c9fcd5b5fb9939d5178) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-05_u7_sound.u7", 0xa00000, 0x80000, CRC(fe242d6a) SHA1(8fbac22ed23044841f309ce58c5b1affcdd5d114) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-06_u8_sound.u8", 0xc00000, 0x80000, CRC(5da13f12) SHA1(2bb5e929e8bc6c70cb4475024a6b0bb07ac25244) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-07_u9_sound.u9", 0xe00000, 0x80000, CRC(7ad27f69) SHA1(b33665d0593a95b58d529720aae49e90449bf714) )
 
 	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "orc-1_5.u10",  0x0000000, 0x100000, CRC(f464be4f) SHA1(da6c04ae49d033f92cdd62f997841365c4a08616) ) /* Version 1.50 program roms */
-	ROM_LOAD32_BYTE( "orc-1_5.u11",  0x0000001, 0x100000, CRC(eaddc9ac) SHA1(a6b810bf7460e3257bf6acdc3b79c532fb71ad68) )
-	ROM_LOAD32_BYTE( "orc-1_5.u12",  0x0000002, 0x100000, CRC(a2da68da) SHA1(b8dcc042b9926055bff9020599c1c218f08b1727) )
-	ROM_LOAD32_BYTE( "orc-1_5.u13",  0x0000003, 0x100000, CRC(b4755ee2) SHA1(1c4cde7ca60a6e8bff12aed348e7148e20a8caba) )
-	ROM_LOAD32_BYTE( "offroadc.u14", 0x0400000, 0x100000, CRC(1e41d14b) SHA1(3f7c5fae1f8b82ddd811720837fa298785a8dd27) )
-	ROM_LOAD32_BYTE( "offroadc.u15", 0x0400001, 0x100000, CRC(654d623d) SHA1(a944b8f8d71b099d7b5bbd7df6effb90afc3aec8) )
-	ROM_LOAD32_BYTE( "offroadc.u16", 0x0400002, 0x100000, CRC(259774d8) SHA1(90cdf659324b84b3c2c59497cc5611e8f12629a6) )
-	ROM_LOAD32_BYTE( "offroadc.u17", 0x0400003, 0x100000, CRC(50c61434) SHA1(52bc603101b4f88b7d892af683b7c8358cabbf4a) )
-	ROM_LOAD32_BYTE( "offroadc.u18", 0x0800000, 0x100000, CRC(015be91c) SHA1(1624537068c6bc5fa6235bf0b0343347c337e8d8) )
-	ROM_LOAD32_BYTE( "offroadc.u19", 0x0800001, 0x100000, CRC(cfc6b70e) SHA1(8c5ad84c50ca142726db0595153cf04caaabec9c) )
-	ROM_LOAD32_BYTE( "offroadc.u20", 0x0800002, 0x100000, CRC(f48d6e33) SHA1(8b9c205e24f217ac110cdd82388c056ebbbb09b0) )
-	ROM_LOAD32_BYTE( "offroadc.u21", 0x0800003, 0x100000, CRC(17794b56) SHA1(8bfd8f5b43056bfe7f62524bb8c3a8564a3a9413) )
-	ROM_LOAD32_BYTE( "offroadc.u22", 0x0c00000, 0x100000, CRC(f2a6e622) SHA1(a7d7004e95b058124cc02e8073dab8fbed8813c5) )
-	ROM_LOAD32_BYTE( "offroadc.u23", 0x0c00001, 0x100000, CRC(1cba6e20) SHA1(a7c9c58bfc4d26decb08979d83cccedb27528eb6) )
-	ROM_LOAD32_BYTE( "offroadc.u24", 0x0c00002, 0x100000, CRC(fd3ce11f) SHA1(78c65267712488784bc6dc14eef98a90494a9553) )
-	ROM_LOAD32_BYTE( "offroadc.u25", 0x0c00003, 0x100000, CRC(78f8e5db) SHA1(7ec2a5add27d66c43ba5cb7182554321007f5798) )
+	ROM_LOAD32_BYTE( "1.5_off_road_u10_game.u10",  0x0000000, 0x100000, CRC(f464be4f) SHA1(da6c04ae49d033f92cdd62f997841365c4a08616) ) /* Version 1.50 program roms */
+	ROM_LOAD32_BYTE( "1.5_off_road_u11_game.u11",  0x0000001, 0x100000, CRC(eaddc9ac) SHA1(a6b810bf7460e3257bf6acdc3b79c532fb71ad68) )
+	ROM_LOAD32_BYTE( "1.5_off_road_u12_game.u12",  0x0000002, 0x100000, CRC(a2da68da) SHA1(b8dcc042b9926055bff9020599c1c218f08b1727) )
+	ROM_LOAD32_BYTE( "1.5_off_road_u13_game.u13",  0x0000003, 0x100000, CRC(b4755ee2) SHA1(1c4cde7ca60a6e8bff12aed348e7148e20a8caba) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-01_u14_video_image.u14", 0x0400000, 0x100000, CRC(1e41d14b) SHA1(3f7c5fae1f8b82ddd811720837fa298785a8dd27) ) /* mask ROMs */
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-02_u15_video_image.u15", 0x0400001, 0x100000, CRC(654d623d) SHA1(a944b8f8d71b099d7b5bbd7df6effb90afc3aec8) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-03_u16_video_image.u16", 0x0400002, 0x100000, CRC(259774d8) SHA1(90cdf659324b84b3c2c59497cc5611e8f12629a6) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-04_u17_video_image.u17", 0x0400003, 0x100000, CRC(50c61434) SHA1(52bc603101b4f88b7d892af683b7c8358cabbf4a) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-05_u18_video_image.u18", 0x0800000, 0x100000, CRC(015be91c) SHA1(1624537068c6bc5fa6235bf0b0343347c337e8d8) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-06_u19_video_image.u19", 0x0800001, 0x100000, CRC(cfc6b70e) SHA1(8c5ad84c50ca142726db0595153cf04caaabec9c) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-07_u20_video_image.u20", 0x0800002, 0x100000, CRC(f48d6e33) SHA1(8b9c205e24f217ac110cdd82388c056ebbbb09b0) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-08_u21_video_image.u21", 0x0800003, 0x100000, CRC(17794b56) SHA1(8bfd8f5b43056bfe7f62524bb8c3a8564a3a9413) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-09_u22_video_image.u22", 0x0c00000, 0x100000, CRC(f2a6e622) SHA1(a7d7004e95b058124cc02e8073dab8fbed8813c5) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-10_u23_video_image.u23", 0x0c00001, 0x100000, CRC(1cba6e20) SHA1(a7c9c58bfc4d26decb08979d83cccedb27528eb6) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-11_u24_video_image.u24", 0x0c00002, 0x100000, CRC(fd3ce11f) SHA1(78c65267712488784bc6dc14eef98a90494a9553) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-12_u25_video_image.u25", 0x0c00003, 0x100000, CRC(78f8e5db) SHA1(7ec2a5add27d66c43ba5cb7182554321007f5798) )
 ROM_END
 
 
 ROM_START( offroadc4 ) /* Version 1.40, Mon 10-06-97 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "offroadc.u2",  0x000000, 0x80000, CRC(69976e9d) SHA1(63c886ac2563c43a10840f49f929f8613cd94de2) )
-	ROM_LOAD16_BYTE( "offroadc.u3",  0x200000, 0x80000, CRC(2db9b548) SHA1(4f454a3e6a8851b0ef5d325dd28102d57ea11a11) )
-	ROM_LOAD16_BYTE( "offroadc.u4",  0x400000, 0x80000, CRC(42bdf9d0) SHA1(04add0f0ee7fa61de1913cc0b988345d3d430cde) )
-	ROM_LOAD16_BYTE( "offroadc.u5",  0x600000, 0x80000, CRC(569cc84b) SHA1(08b917cc41fae6b6a3e9d9461a783d3d2865e72a) )
-	ROM_LOAD16_BYTE( "offroadc.u6",  0x800000, 0x80000, CRC(0896f679) SHA1(dde39ef17834256909ef2c9fcd5b5fb9939d5178) )
-	ROM_LOAD16_BYTE( "offroadc.u7",  0xa00000, 0x80000, CRC(fe242d6a) SHA1(8fbac22ed23044841f309ce58c5b1affcdd5d114) )
-	ROM_LOAD16_BYTE( "offroadc.u8",  0xc00000, 0x80000, CRC(5da13f12) SHA1(2bb5e929e8bc6c70cb4475024a6b0bb07ac25244) )
-	ROM_LOAD16_BYTE( "offroadc.u9",  0xe00000, 0x80000, CRC(7ad27f69) SHA1(b33665d0593a95b58d529720aae49e90449bf714) )
+	ROM_LOAD16_BYTE( "1.0_off_road_u2_sound.u2", 0x000000, 0x80000, CRC(69976e9d) SHA1(63c886ac2563c43a10840f49f929f8613cd94de2) ) /* generally a M27C4001 EPROM with label */
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-01_u3_sound.u3", 0x200000, 0x80000, CRC(2db9b548) SHA1(4f454a3e6a8851b0ef5d325dd28102d57ea11a11) ) /* these are mask ROMs */
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-02_u4_sound.u4", 0x400000, 0x80000, CRC(42bdf9d0) SHA1(04add0f0ee7fa61de1913cc0b988345d3d430cde) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-03_u5_sound.u5", 0x600000, 0x80000, CRC(569cc84b) SHA1(08b917cc41fae6b6a3e9d9461a783d3d2865e72a) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-04_u6_sound.u6", 0x800000, 0x80000, CRC(0896f679) SHA1(dde39ef17834256909ef2c9fcd5b5fb9939d5178) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-05_u7_sound.u7", 0xa00000, 0x80000, CRC(fe242d6a) SHA1(8fbac22ed23044841f309ce58c5b1affcdd5d114) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-06_u8_sound.u8", 0xc00000, 0x80000, CRC(5da13f12) SHA1(2bb5e929e8bc6c70cb4475024a6b0bb07ac25244) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-07_u9_sound.u9", 0xe00000, 0x80000, CRC(7ad27f69) SHA1(b33665d0593a95b58d529720aae49e90449bf714) )
 
 	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "orc-1_4.u10",  0x0000000, 0x100000, CRC(d263b078) SHA1(d376e120e05cf8526b002300db345fd0b9775702) ) /* Version 1.40 program roms */
-	ROM_LOAD32_BYTE( "orc-1_4.u11",  0x0000001, 0x100000, CRC(1b443a72) SHA1(0e16d923f0e97f21e92c8d5b431fcaa0815b2c87) )
-	ROM_LOAD32_BYTE( "orc-1_4.u12",  0x0000002, 0x100000, CRC(4e82a34b) SHA1(c22a3f638b7e226add511147982339b1f59821e9) )
-	ROM_LOAD32_BYTE( "orc-1_4.u13",  0x0000003, 0x100000, CRC(558b859c) SHA1(b7946a4b44976b08a691622000e1457021267d1a) )
-	ROM_LOAD32_BYTE( "offroadc.u14", 0x0400000, 0x100000, CRC(1e41d14b) SHA1(3f7c5fae1f8b82ddd811720837fa298785a8dd27) )
-	ROM_LOAD32_BYTE( "offroadc.u15", 0x0400001, 0x100000, CRC(654d623d) SHA1(a944b8f8d71b099d7b5bbd7df6effb90afc3aec8) )
-	ROM_LOAD32_BYTE( "offroadc.u16", 0x0400002, 0x100000, CRC(259774d8) SHA1(90cdf659324b84b3c2c59497cc5611e8f12629a6) )
-	ROM_LOAD32_BYTE( "offroadc.u17", 0x0400003, 0x100000, CRC(50c61434) SHA1(52bc603101b4f88b7d892af683b7c8358cabbf4a) )
-	ROM_LOAD32_BYTE( "offroadc.u18", 0x0800000, 0x100000, CRC(015be91c) SHA1(1624537068c6bc5fa6235bf0b0343347c337e8d8) )
-	ROM_LOAD32_BYTE( "offroadc.u19", 0x0800001, 0x100000, CRC(cfc6b70e) SHA1(8c5ad84c50ca142726db0595153cf04caaabec9c) )
-	ROM_LOAD32_BYTE( "offroadc.u20", 0x0800002, 0x100000, CRC(f48d6e33) SHA1(8b9c205e24f217ac110cdd82388c056ebbbb09b0) )
-	ROM_LOAD32_BYTE( "offroadc.u21", 0x0800003, 0x100000, CRC(17794b56) SHA1(8bfd8f5b43056bfe7f62524bb8c3a8564a3a9413) )
-	ROM_LOAD32_BYTE( "offroadc.u22", 0x0c00000, 0x100000, CRC(f2a6e622) SHA1(a7d7004e95b058124cc02e8073dab8fbed8813c5) )
-	ROM_LOAD32_BYTE( "offroadc.u23", 0x0c00001, 0x100000, CRC(1cba6e20) SHA1(a7c9c58bfc4d26decb08979d83cccedb27528eb6) )
-	ROM_LOAD32_BYTE( "offroadc.u24", 0x0c00002, 0x100000, CRC(fd3ce11f) SHA1(78c65267712488784bc6dc14eef98a90494a9553) )
-	ROM_LOAD32_BYTE( "offroadc.u25", 0x0c00003, 0x100000, CRC(78f8e5db) SHA1(7ec2a5add27d66c43ba5cb7182554321007f5798) )
+	ROM_LOAD32_BYTE( "1.4_off_road_u10_game.u10",  0x0000000, 0x100000, CRC(d263b078) SHA1(d376e120e05cf8526b002300db345fd0b9775702) ) /* Version 1.40 program roms */
+	ROM_LOAD32_BYTE( "1.4_off_road_u11_game.u11",  0x0000001, 0x100000, CRC(1b443a72) SHA1(0e16d923f0e97f21e92c8d5b431fcaa0815b2c87) )
+	ROM_LOAD32_BYTE( "1.4_off_road_u12_game.u12",  0x0000002, 0x100000, CRC(4e82a34b) SHA1(c22a3f638b7e226add511147982339b1f59821e9) )
+	ROM_LOAD32_BYTE( "1.4_off_road_u13_game.u13",  0x0000003, 0x100000, CRC(558b859c) SHA1(b7946a4b44976b08a691622000e1457021267d1a) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-01_u14_video_image.u14", 0x0400000, 0x100000, CRC(1e41d14b) SHA1(3f7c5fae1f8b82ddd811720837fa298785a8dd27) ) /* mask ROMs */
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-02_u15_video_image.u15", 0x0400001, 0x100000, CRC(654d623d) SHA1(a944b8f8d71b099d7b5bbd7df6effb90afc3aec8) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-03_u16_video_image.u16", 0x0400002, 0x100000, CRC(259774d8) SHA1(90cdf659324b84b3c2c59497cc5611e8f12629a6) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-04_u17_video_image.u17", 0x0400003, 0x100000, CRC(50c61434) SHA1(52bc603101b4f88b7d892af683b7c8358cabbf4a) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-05_u18_video_image.u18", 0x0800000, 0x100000, CRC(015be91c) SHA1(1624537068c6bc5fa6235bf0b0343347c337e8d8) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-06_u19_video_image.u19", 0x0800001, 0x100000, CRC(cfc6b70e) SHA1(8c5ad84c50ca142726db0595153cf04caaabec9c) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-07_u20_video_image.u20", 0x0800002, 0x100000, CRC(f48d6e33) SHA1(8b9c205e24f217ac110cdd82388c056ebbbb09b0) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-08_u21_video_image.u21", 0x0800003, 0x100000, CRC(17794b56) SHA1(8bfd8f5b43056bfe7f62524bb8c3a8564a3a9413) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-09_u22_video_image.u22", 0x0c00000, 0x100000, CRC(f2a6e622) SHA1(a7d7004e95b058124cc02e8073dab8fbed8813c5) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-10_u23_video_image.u23", 0x0c00001, 0x100000, CRC(1cba6e20) SHA1(a7c9c58bfc4d26decb08979d83cccedb27528eb6) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-11_u24_video_image.u24", 0x0c00002, 0x100000, CRC(fd3ce11f) SHA1(78c65267712488784bc6dc14eef98a90494a9553) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-12_u25_video_image.u25", 0x0c00003, 0x100000, CRC(78f8e5db) SHA1(7ec2a5add27d66c43ba5cb7182554321007f5798) )
 ROM_END
 
 
 ROM_START( offroadc3 ) /* Version 1.30, Mon 09-15-97 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "offroadc.u2",  0x000000, 0x80000, CRC(69976e9d) SHA1(63c886ac2563c43a10840f49f929f8613cd94de2) )
-	ROM_LOAD16_BYTE( "offroadc.u3",  0x200000, 0x80000, CRC(2db9b548) SHA1(4f454a3e6a8851b0ef5d325dd28102d57ea11a11) )
-	ROM_LOAD16_BYTE( "offroadc.u4",  0x400000, 0x80000, CRC(42bdf9d0) SHA1(04add0f0ee7fa61de1913cc0b988345d3d430cde) )
-	ROM_LOAD16_BYTE( "offroadc.u5",  0x600000, 0x80000, CRC(569cc84b) SHA1(08b917cc41fae6b6a3e9d9461a783d3d2865e72a) )
-	ROM_LOAD16_BYTE( "offroadc.u6",  0x800000, 0x80000, CRC(0896f679) SHA1(dde39ef17834256909ef2c9fcd5b5fb9939d5178) )
-	ROM_LOAD16_BYTE( "offroadc.u7",  0xa00000, 0x80000, CRC(fe242d6a) SHA1(8fbac22ed23044841f309ce58c5b1affcdd5d114) )
-	ROM_LOAD16_BYTE( "offroadc.u8",  0xc00000, 0x80000, CRC(5da13f12) SHA1(2bb5e929e8bc6c70cb4475024a6b0bb07ac25244) )
-	ROM_LOAD16_BYTE( "offroadc.u9",  0xe00000, 0x80000, CRC(7ad27f69) SHA1(b33665d0593a95b58d529720aae49e90449bf714) )
+	ROM_LOAD16_BYTE( "1.0_off_road_u2_sound.u2", 0x000000, 0x80000, CRC(69976e9d) SHA1(63c886ac2563c43a10840f49f929f8613cd94de2) ) /* generally a M27C4001 EPROM with label */
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-01_u3_sound.u3", 0x200000, 0x80000, CRC(2db9b548) SHA1(4f454a3e6a8851b0ef5d325dd28102d57ea11a11) ) /* these are mask ROMs */
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-02_u4_sound.u4", 0x400000, 0x80000, CRC(42bdf9d0) SHA1(04add0f0ee7fa61de1913cc0b988345d3d430cde) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-03_u5_sound.u5", 0x600000, 0x80000, CRC(569cc84b) SHA1(08b917cc41fae6b6a3e9d9461a783d3d2865e72a) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-04_u6_sound.u6", 0x800000, 0x80000, CRC(0896f679) SHA1(dde39ef17834256909ef2c9fcd5b5fb9939d5178) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-05_u7_sound.u7", 0xa00000, 0x80000, CRC(fe242d6a) SHA1(8fbac22ed23044841f309ce58c5b1affcdd5d114) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-06_u8_sound.u8", 0xc00000, 0x80000, CRC(5da13f12) SHA1(2bb5e929e8bc6c70cb4475024a6b0bb07ac25244) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-07_u9_sound.u9", 0xe00000, 0x80000, CRC(7ad27f69) SHA1(b33665d0593a95b58d529720aae49e90449bf714) )
 
 	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "orc-1_3.u10",  0x0000000, 0x100000, CRC(71c62ce2) SHA1(e6bdbf3df4795f4cf29a08641cc59d90aed73b57) ) /* Version 1.30 program roms */
-	ROM_LOAD32_BYTE( "orc-1_3.u11",  0x0000001, 0x100000, CRC(9e362dbb) SHA1(2480710f1081679ff87239a8e28a9a3f235bd3dc) )
-	ROM_LOAD32_BYTE( "orc-1_3.u12",  0x0000002, 0x100000, CRC(9e0a5b06) SHA1(63bbe427713fc966c65dab575dd42cdce6b00874) )
-	ROM_LOAD32_BYTE( "orc-1_3.u13",  0x0000003, 0x100000, CRC(d602db7e) SHA1(48bc762a83baeb382476619f54631ccbe12d1b2c) )
-	ROM_LOAD32_BYTE( "offroadc.u14", 0x0400000, 0x100000, CRC(1e41d14b) SHA1(3f7c5fae1f8b82ddd811720837fa298785a8dd27) )
-	ROM_LOAD32_BYTE( "offroadc.u15", 0x0400001, 0x100000, CRC(654d623d) SHA1(a944b8f8d71b099d7b5bbd7df6effb90afc3aec8) )
-	ROM_LOAD32_BYTE( "offroadc.u16", 0x0400002, 0x100000, CRC(259774d8) SHA1(90cdf659324b84b3c2c59497cc5611e8f12629a6) )
-	ROM_LOAD32_BYTE( "offroadc.u17", 0x0400003, 0x100000, CRC(50c61434) SHA1(52bc603101b4f88b7d892af683b7c8358cabbf4a) )
-	ROM_LOAD32_BYTE( "offroadc.u18", 0x0800000, 0x100000, CRC(015be91c) SHA1(1624537068c6bc5fa6235bf0b0343347c337e8d8) )
-	ROM_LOAD32_BYTE( "offroadc.u19", 0x0800001, 0x100000, CRC(cfc6b70e) SHA1(8c5ad84c50ca142726db0595153cf04caaabec9c) )
-	ROM_LOAD32_BYTE( "offroadc.u20", 0x0800002, 0x100000, CRC(f48d6e33) SHA1(8b9c205e24f217ac110cdd82388c056ebbbb09b0) )
-	ROM_LOAD32_BYTE( "offroadc.u21", 0x0800003, 0x100000, CRC(17794b56) SHA1(8bfd8f5b43056bfe7f62524bb8c3a8564a3a9413) )
-	ROM_LOAD32_BYTE( "offroadc.u22", 0x0c00000, 0x100000, CRC(f2a6e622) SHA1(a7d7004e95b058124cc02e8073dab8fbed8813c5) )
-	ROM_LOAD32_BYTE( "offroadc.u23", 0x0c00001, 0x100000, CRC(1cba6e20) SHA1(a7c9c58bfc4d26decb08979d83cccedb27528eb6) )
-	ROM_LOAD32_BYTE( "offroadc.u24", 0x0c00002, 0x100000, CRC(fd3ce11f) SHA1(78c65267712488784bc6dc14eef98a90494a9553) )
-	ROM_LOAD32_BYTE( "offroadc.u25", 0x0c00003, 0x100000, CRC(78f8e5db) SHA1(7ec2a5add27d66c43ba5cb7182554321007f5798) )
+	ROM_LOAD32_BYTE( "1.3_off_road_u10.u10",  0x0000000, 0x100000, CRC(71c62ce2) SHA1(e6bdbf3df4795f4cf29a08641cc59d90aed73b57) ) /* Version 1.30 program roms */
+	ROM_LOAD32_BYTE( "1.3_off_road_u11.u11",  0x0000001, 0x100000, CRC(9e362dbb) SHA1(2480710f1081679ff87239a8e28a9a3f235bd3dc) )
+	ROM_LOAD32_BYTE( "1.3_off_road_u12.u12",  0x0000002, 0x100000, CRC(9e0a5b06) SHA1(63bbe427713fc966c65dab575dd42cdce6b00874) )
+	ROM_LOAD32_BYTE( "1.3_off_road_u13.u13",  0x0000003, 0x100000, CRC(d602db7e) SHA1(48bc762a83baeb382476619f54631ccbe12d1b2c) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-01_u14_video_image.u14", 0x0400000, 0x100000, CRC(1e41d14b) SHA1(3f7c5fae1f8b82ddd811720837fa298785a8dd27) ) /* mask ROMs */
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-02_u15_video_image.u15", 0x0400001, 0x100000, CRC(654d623d) SHA1(a944b8f8d71b099d7b5bbd7df6effb90afc3aec8) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-03_u16_video_image.u16", 0x0400002, 0x100000, CRC(259774d8) SHA1(90cdf659324b84b3c2c59497cc5611e8f12629a6) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-04_u17_video_image.u17", 0x0400003, 0x100000, CRC(50c61434) SHA1(52bc603101b4f88b7d892af683b7c8358cabbf4a) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-05_u18_video_image.u18", 0x0800000, 0x100000, CRC(015be91c) SHA1(1624537068c6bc5fa6235bf0b0343347c337e8d8) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-06_u19_video_image.u19", 0x0800001, 0x100000, CRC(cfc6b70e) SHA1(8c5ad84c50ca142726db0595153cf04caaabec9c) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-07_u20_video_image.u20", 0x0800002, 0x100000, CRC(f48d6e33) SHA1(8b9c205e24f217ac110cdd82388c056ebbbb09b0) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-08_u21_video_image.u21", 0x0800003, 0x100000, CRC(17794b56) SHA1(8bfd8f5b43056bfe7f62524bb8c3a8564a3a9413) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-09_u22_video_image.u22", 0x0c00000, 0x100000, CRC(f2a6e622) SHA1(a7d7004e95b058124cc02e8073dab8fbed8813c5) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-10_u23_video_image.u23", 0x0c00001, 0x100000, CRC(1cba6e20) SHA1(a7c9c58bfc4d26decb08979d83cccedb27528eb6) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-11_u24_video_image.u24", 0x0c00002, 0x100000, CRC(fd3ce11f) SHA1(78c65267712488784bc6dc14eef98a90494a9553) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-12_u25_video_image.u25", 0x0c00003, 0x100000, CRC(78f8e5db) SHA1(7ec2a5add27d66c43ba5cb7182554321007f5798) )
 ROM_END
 
 
 ROM_START( offroadc1 ) /* Version 1.10, Mon 08-18-97 */
 	ROM_REGION16_LE( 0x1000000, "dcs", ROMREGION_ERASEFF )  /* sound data */
-	ROM_LOAD16_BYTE( "offroadc.u2",  0x000000, 0x80000, CRC(69976e9d) SHA1(63c886ac2563c43a10840f49f929f8613cd94de2) )
-	ROM_LOAD16_BYTE( "offroadc.u3",  0x200000, 0x80000, CRC(2db9b548) SHA1(4f454a3e6a8851b0ef5d325dd28102d57ea11a11) )
-	ROM_LOAD16_BYTE( "offroadc.u4",  0x400000, 0x80000, CRC(42bdf9d0) SHA1(04add0f0ee7fa61de1913cc0b988345d3d430cde) )
-	ROM_LOAD16_BYTE( "offroadc.u5",  0x600000, 0x80000, CRC(569cc84b) SHA1(08b917cc41fae6b6a3e9d9461a783d3d2865e72a) )
-	ROM_LOAD16_BYTE( "offroadc.u6",  0x800000, 0x80000, CRC(0896f679) SHA1(dde39ef17834256909ef2c9fcd5b5fb9939d5178) )
-	ROM_LOAD16_BYTE( "offroadc.u7",  0xa00000, 0x80000, CRC(fe242d6a) SHA1(8fbac22ed23044841f309ce58c5b1affcdd5d114) )
-	ROM_LOAD16_BYTE( "offroadc.u8",  0xc00000, 0x80000, CRC(5da13f12) SHA1(2bb5e929e8bc6c70cb4475024a6b0bb07ac25244) )
-	ROM_LOAD16_BYTE( "offroadc.u9",  0xe00000, 0x80000, CRC(7ad27f69) SHA1(b33665d0593a95b58d529720aae49e90449bf714) )
+	ROM_LOAD16_BYTE( "1.0_off_road_u2_sound.u2", 0x000000, 0x80000, CRC(69976e9d) SHA1(63c886ac2563c43a10840f49f929f8613cd94de2) ) /* generally a M27C4001 EPROM with label */
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-01_u3_sound.u3", 0x200000, 0x80000, CRC(2db9b548) SHA1(4f454a3e6a8851b0ef5d325dd28102d57ea11a11) ) /* these are mask ROMs */
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-02_u4_sound.u4", 0x400000, 0x80000, CRC(42bdf9d0) SHA1(04add0f0ee7fa61de1913cc0b988345d3d430cde) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-03_u5_sound.u5", 0x600000, 0x80000, CRC(569cc84b) SHA1(08b917cc41fae6b6a3e9d9461a783d3d2865e72a) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-04_u6_sound.u6", 0x800000, 0x80000, CRC(0896f679) SHA1(dde39ef17834256909ef2c9fcd5b5fb9939d5178) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-05_u7_sound.u7", 0xa00000, 0x80000, CRC(fe242d6a) SHA1(8fbac22ed23044841f309ce58c5b1affcdd5d114) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-06_u8_sound.u8", 0xc00000, 0x80000, CRC(5da13f12) SHA1(2bb5e929e8bc6c70cb4475024a6b0bb07ac25244) )
+	ROM_LOAD16_BYTE( "offroad_challenge_5341-15511-07_u9_sound.u9", 0xe00000, 0x80000, CRC(7ad27f69) SHA1(b33665d0593a95b58d529720aae49e90449bf714) )
 
 	ROM_REGION32_LE( 0x1000000, "user1", 0 )
-	ROM_LOAD32_BYTE( "orc-1_1.u10",  0x0000000, 0x100000, CRC(4729660c) SHA1(0baff6a27015f4eb3fe0a981ecbac33d140e872a) ) /* Version 1.10 program roms */
-	ROM_LOAD32_BYTE( "orc-1_1.u11",  0x0000001, 0x100000, CRC(6272d013) SHA1(860121184282627ed692e56a0dafee8b64562811) )
-	ROM_LOAD32_BYTE( "orc-1_1.u12",  0x0000002, 0x100000, CRC(9c8326be) SHA1(55f16d14379f57d08ed84d82f9db1a582bc223a1) )
-	ROM_LOAD32_BYTE( "orc-1_1.u13",  0x0000003, 0x100000, CRC(53bbc181) SHA1(1ab29a27a216eb09d69a9f3d681865de1a904717) )
-	ROM_LOAD32_BYTE( "offroadc.u14", 0x0400000, 0x100000, CRC(1e41d14b) SHA1(3f7c5fae1f8b82ddd811720837fa298785a8dd27) )
-	ROM_LOAD32_BYTE( "offroadc.u15", 0x0400001, 0x100000, CRC(654d623d) SHA1(a944b8f8d71b099d7b5bbd7df6effb90afc3aec8) )
-	ROM_LOAD32_BYTE( "offroadc.u16", 0x0400002, 0x100000, CRC(259774d8) SHA1(90cdf659324b84b3c2c59497cc5611e8f12629a6) )
-	ROM_LOAD32_BYTE( "offroadc.u17", 0x0400003, 0x100000, CRC(50c61434) SHA1(52bc603101b4f88b7d892af683b7c8358cabbf4a) )
-	ROM_LOAD32_BYTE( "offroadc.u18", 0x0800000, 0x100000, CRC(015be91c) SHA1(1624537068c6bc5fa6235bf0b0343347c337e8d8) )
-	ROM_LOAD32_BYTE( "offroadc.u19", 0x0800001, 0x100000, CRC(cfc6b70e) SHA1(8c5ad84c50ca142726db0595153cf04caaabec9c) )
-	ROM_LOAD32_BYTE( "offroadc.u20", 0x0800002, 0x100000, CRC(f48d6e33) SHA1(8b9c205e24f217ac110cdd82388c056ebbbb09b0) )
-	ROM_LOAD32_BYTE( "offroadc.u21", 0x0800003, 0x100000, CRC(17794b56) SHA1(8bfd8f5b43056bfe7f62524bb8c3a8564a3a9413) )
-	ROM_LOAD32_BYTE( "offroadc.u22", 0x0c00000, 0x100000, CRC(f2a6e622) SHA1(a7d7004e95b058124cc02e8073dab8fbed8813c5) )
-	ROM_LOAD32_BYTE( "offroadc.u23", 0x0c00001, 0x100000, CRC(1cba6e20) SHA1(a7c9c58bfc4d26decb08979d83cccedb27528eb6) )
-	ROM_LOAD32_BYTE( "offroadc.u24", 0x0c00002, 0x100000, CRC(fd3ce11f) SHA1(78c65267712488784bc6dc14eef98a90494a9553) )
-	ROM_LOAD32_BYTE( "offroadc.u25", 0x0c00003, 0x100000, CRC(78f8e5db) SHA1(7ec2a5add27d66c43ba5cb7182554321007f5798) )
+	ROM_LOAD32_BYTE( "1.1_off_road_u10.u10",  0x0000000, 0x100000, CRC(4729660c) SHA1(0baff6a27015f4eb3fe0a981ecbac33d140e872a) ) /* Version 1.10 program roms */
+	ROM_LOAD32_BYTE( "1.1_off_road_u11.u11",  0x0000001, 0x100000, CRC(6272d013) SHA1(860121184282627ed692e56a0dafee8b64562811) )
+	ROM_LOAD32_BYTE( "1.1_off_road_u12.u12",  0x0000002, 0x100000, CRC(9c8326be) SHA1(55f16d14379f57d08ed84d82f9db1a582bc223a1) )
+	ROM_LOAD32_BYTE( "1.1_off_road_u13.u13",  0x0000003, 0x100000, CRC(53bbc181) SHA1(1ab29a27a216eb09d69a9f3d681865de1a904717) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-01_u14_video_image.u14", 0x0400000, 0x100000, CRC(1e41d14b) SHA1(3f7c5fae1f8b82ddd811720837fa298785a8dd27) ) /* mask ROMs */
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-02_u15_video_image.u15", 0x0400001, 0x100000, CRC(654d623d) SHA1(a944b8f8d71b099d7b5bbd7df6effb90afc3aec8) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-03_u16_video_image.u16", 0x0400002, 0x100000, CRC(259774d8) SHA1(90cdf659324b84b3c2c59497cc5611e8f12629a6) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-04_u17_video_image.u17", 0x0400003, 0x100000, CRC(50c61434) SHA1(52bc603101b4f88b7d892af683b7c8358cabbf4a) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-05_u18_video_image.u18", 0x0800000, 0x100000, CRC(015be91c) SHA1(1624537068c6bc5fa6235bf0b0343347c337e8d8) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-06_u19_video_image.u19", 0x0800001, 0x100000, CRC(cfc6b70e) SHA1(8c5ad84c50ca142726db0595153cf04caaabec9c) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-07_u20_video_image.u20", 0x0800002, 0x100000, CRC(f48d6e33) SHA1(8b9c205e24f217ac110cdd82388c056ebbbb09b0) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-08_u21_video_image.u21", 0x0800003, 0x100000, CRC(17794b56) SHA1(8bfd8f5b43056bfe7f62524bb8c3a8564a3a9413) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-09_u22_video_image.u22", 0x0c00000, 0x100000, CRC(f2a6e622) SHA1(a7d7004e95b058124cc02e8073dab8fbed8813c5) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-10_u23_video_image.u23", 0x0c00001, 0x100000, CRC(1cba6e20) SHA1(a7c9c58bfc4d26decb08979d83cccedb27528eb6) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-11_u24_video_image.u24", 0x0c00002, 0x100000, CRC(fd3ce11f) SHA1(78c65267712488784bc6dc14eef98a90494a9553) )
+	ROM_LOAD32_BYTE( "offroad_challenge_5341-15510-12_u25_video_image.u25", 0x0c00003, 0x100000, CRC(78f8e5db) SHA1(7ec2a5add27d66c43ba5cb7182554321007f5798) )
 ROM_END
 
 
@@ -1822,6 +1882,8 @@
 	DISK_IMAGE( "wargods_11-07-1996", 0, SHA1(7585bc65b1038589cb59d3e7c56e08ca9d7015b8) ) // HDD had a label of 10-09-1996, but the game reports
 																						  // a version of 11-07-1996, so it was probably upgraded
 																						  // in the field.
+	ROM_REGION( 0x2000, "serial_security_pic", 0 ) // security PIC (provides game ID code and serial number)
+	ROM_LOAD( "452_wargods.u69",  0x0000, 0x2000, CRC(b908f560) SHA1(68b081f0583aa35c2daeedd43e030ebdcea1a54c) )
 ROM_END
 
 ROM_START( wargodsa ) /* Boot EPROM Version 1.0, Game Type: 452 (08/15/1996) */
@@ -1833,6 +1895,9 @@
 
 	DISK_REGION( "ata:0:hdd:image" )
 	DISK_IMAGE( "wargods_08-15-1996", 0, SHA1(5dee00be40c315fbb1d6e3994dae8e498ab87fb2) )
+
+	ROM_REGION( 0x2000, "serial_security_pic", 0 ) // security PIC (provides game ID code and serial number)
+	ROM_LOAD( "452_wargods.u69",  0x0000, 0x2000, CRC(b908f560) SHA1(68b081f0583aa35c2daeedd43e030ebdcea1a54c) )
 ROM_END
 
 ROM_START( wargodsb ) /* Boot EPROM Version 1.0, Game Type: 452 (12/11/1995) */
@@ -1844,6 +1909,9 @@
 
 	DISK_REGION( "ata:0:hdd:image" )
 	DISK_IMAGE( "wargods_12-11-1995", 0, SHA1(141063f95867fdcc4b15c844e510696604a70c6a) )
+
+	ROM_REGION( 0x2000, "serial_security_pic", 0 ) // security PIC (provides game ID code and serial number)
+	ROM_LOAD( "452_wargods.u69",  0x0000, 0x2000, CRC(b908f560) SHA1(68b081f0583aa35c2daeedd43e030ebdcea1a54c) )
 ROM_END
 
 
@@ -1908,8 +1976,9 @@
 	/* control register is different */
 	m_maincpu->space(AS_PROGRAM).install_write_handler(0x994000, 0x994000, write32s_delegate(*this, FUNC(midvunit_state::crusnwld_control_w)));
 
-	m_maincpu->space(AS_PROGRAM).install_read_handler(0x991030, 0x991030, read32smo_delegate(*this, FUNC(midvunit_state::offroadc_serial_status_r)));
-	m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x996000, 0x996000, read32smo_delegate(*this, FUNC(midvunit_state::offroadc_serial_data_r)), write32smo_delegate(*this, FUNC(midvunit_state::offroadc_serial_data_w)));
+	m_maincpu->space(AS_PROGRAM).install_read_handler(0x991030, 0x991030, read32smo_delegate(*this, FUNC(midvunit_state::crusnwld_serial_status_r)));
+	m_maincpu->space(AS_PROGRAM).install_read_handler(0x996000, 0x996000, read32smo_delegate(*this, FUNC(midvunit_state::crusnwld_serial_data_r)));
+	m_maincpu->space(AS_PROGRAM).install_write_handler(0x996000, 0x996000, write32smo_delegate(*this, FUNC(midvunit_state::crusnwld_serial_data_w)));
 
 	/* speedups */
 	m_maincpu->space(AS_PROGRAM).install_read_handler(0x195aa, 0x195aa, read32sm_delegate(*this, FUNC(midvunit_state::generic_speedup_r)));
@@ -1945,7 +2014,8 @@
  *
  *************************************/
 
-GAMEL( 1994, crusnusa,   0,        midvunit, crusnusa, midvunit_state, init_crusnusa, ROT0, "Midway", "Cruis'n USA (rev L4.1)", MACHINE_SUPPORTS_SAVE, layout_crusnusa )
+GAMEL( 1994, crusnusa,   0,        midvunit, crusnusa, midvunit_state, init_crusnusa, ROT0, "Midway", "Cruis'n USA (rev L4.4)", MACHINE_SUPPORTS_SAVE, layout_crusnusa )
+GAMEL( 1994, crusnusa41, crusnusa, midvunit, crusnusa, midvunit_state, init_crusnu40, ROT0, "Midway", "Cruis'n USA (rev L4.1)", MACHINE_SUPPORTS_SAVE, layout_crusnusa )
 GAMEL( 1994, crusnusa40, crusnusa, midvunit, crusnusa, midvunit_state, init_crusnu40, ROT0, "Midway", "Cruis'n USA (rev L4.0)", MACHINE_SUPPORTS_SAVE, layout_crusnusa )
 GAMEL( 1994, crusnusa21, crusnusa, midvunit, crusnusa, midvunit_state, init_crusnu21, ROT0, "Midway", "Cruis'n USA (rev L2.1)", MACHINE_SUPPORTS_SAVE, layout_crusnusa )
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/midwunit.cpp mame-0.224+dfsg.1/src/mame/drivers/midwunit.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/midwunit.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/midwunit.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -94,7 +94,6 @@
 
 
 #include "emu.h"
-#include "includes/midtunit.h"
 #include "includes/midwunit.h"
 #include "audio/dcs.h"
 
@@ -656,18 +655,13 @@
 {
 	wunit(config);
 	MIDWAY_SERIAL_PIC(config, m_midway_serial_pic, 0);
-	m_midway_serial_pic->set_upper(528); // this is actually a generic code all games check for in addition to their own game specific code!
+	m_midway_serial_pic->set_upper(528); // this is actually development PIC code, all games check for in addition to their own game specific code!
 }
 
 void midwunit_state::wunit_picemu(machine_config &config)
 {
 	wunit(config);
 	MIDWAY_SERIAL_PIC_EMU(config, m_midway_serial_pic_emu, 0);
-
-	// todo, REMOVE once the emulated PIC above works!
-	// this just allows it to fall through to the simulation for now
-	MIDWAY_SERIAL_PIC(config, m_midway_serial_pic, 0);
-	m_midway_serial_pic->set_upper(528);
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/midxunit.cpp mame-0.224+dfsg.1/src/mame/drivers/midxunit.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/midxunit.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/midxunit.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,9 +10,6 @@
     Games supported:
         * Revolution X
 
-    Known bugs:
-        * none at this time
-
 ***************************************************************************
 
 Revolution X
@@ -119,7 +116,6 @@
 #include "cpu/adsp2100/adsp2100.h"
 #include "cpu/tms34010/tms34010.h"
 #include "machine/adc0844.h"
-#include "machine/nvram.h"
 
 #include "screen.h"
 
@@ -147,12 +143,11 @@
 	map(0x60c00060, 0x60c0007f).portr("DSW");
 	map(0x60c00080, 0x60c000df).w(FUNC(midxunit_state::midxunit_io_w));
 	map(0x60c000e0, 0x60c000ff).rw(FUNC(midxunit_state::midxunit_security_r), FUNC(midxunit_state::midxunit_security_w));
-	map(0x80800000, 0x8080000f).r("adc", FUNC(adc0848_device::read)).umask16(0x00ff).w("adc", FUNC(adc0848_device::write)).umask16(0x00ff);
-	map(0x80800010, 0x8080001f).noprw();
-	map(0x80c00000, 0x80c000ff).rw(FUNC(midxunit_state::midxunit_uart_r), FUNC(midxunit_state::midxunit_uart_w));
-	map(0xa0440000, 0xa047ffff).rw(FUNC(midxunit_state::midxunit_cmos_r), FUNC(midxunit_state::midxunit_cmos_w)).share("nvram");
+	map(0x80800000, 0x8080001f).rw("adc", FUNC(adc0848_device::read), FUNC(adc0848_device::write)).umask32(0x000000ff);
+	map(0x80c00000, 0x80c000ff).rw(FUNC(midxunit_state::midxunit_uart_r), FUNC(midxunit_state::midxunit_uart_w)).umask32(0x000000ff);
+	map(0xa0440000, 0xa047ffff).rw(FUNC(midxunit_state::midxunit_cmos_r), FUNC(midxunit_state::midxunit_cmos_w)).umask32(0x000000ff);
 	map(0xa0800000, 0xa08fffff).rw(m_video, FUNC(midxunit_video_device::midxunit_paletteram_r), FUNC(midxunit_video_device::midxunit_paletteram_w)).share("palette");
-	map(0xc0800000, 0xc08000ff).mirror(0x00400000).rw(m_video, FUNC(midxunit_video_device::midtunit_dma_r), FUNC(midxunit_video_device::midtunit_dma_w));
+	map(0xc0800000, 0xc08000ff).mirror(0x00400000).rw(FUNC(midxunit_state::midxunit_dma_r), FUNC(midxunit_state::midxunit_dma_w));
 	map(0xf8000000, 0xfeffffff).r(m_video, FUNC(midxunit_video_device::midwunit_gfxrom_r));
 	map(0xff000000, 0xffffffff).rom().region("maincpu", 0);
 }
@@ -167,38 +162,39 @@
 
 static INPUT_PORTS_START( revx )
 	PORT_START("IN0")
-	PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
-	PORT_BIT( 0x00c0, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x0f00, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
-	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
-	PORT_BIT( 0xc000, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x0000000f, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+	PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+	PORT_BIT( 0x000000c0, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x00000f00, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x00001000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+	PORT_BIT( 0x00002000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+	PORT_BIT( 0xffffc000, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("IN1")
-	PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
-	PORT_BIT( 0xffc0, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x0000000f, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x00000010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
+	PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
+	PORT_BIT( 0xffffffc0, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("IN2")
-	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 )
-	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 )
-	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 )
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT ) /* Slam Switch */
-	PORT_SERVICE_NO_TOGGLE(0x0010, IP_ACTIVE_LOW)
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START2 )
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SERVICE1 )
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN3 )
-	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN4 )
-	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START3 )
-	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_VOLUME_DOWN )
-	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_VOLUME_UP )
-	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_CUSTOM ) /* coin door */
-	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BILL1 ) /* bill validator */
+	PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_COIN1 )
+	PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_COIN2 )
+	PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_START1 )
+	PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_TILT ) /* Slam Switch */
+	PORT_SERVICE_NO_TOGGLE(0x00000010, IP_ACTIVE_LOW)
+	PORT_BIT( 0x00000020, IP_ACTIVE_LOW, IPT_START2 )
+	PORT_BIT( 0x00000040, IP_ACTIVE_LOW, IPT_SERVICE1 )
+	PORT_BIT( 0x00000080, IP_ACTIVE_LOW, IPT_COIN3 )
+	PORT_BIT( 0x00000100, IP_ACTIVE_LOW, IPT_COIN4 )
+	PORT_BIT( 0x00000200, IP_ACTIVE_LOW, IPT_START3 )
+	PORT_BIT( 0x00000400, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x00000800, IP_ACTIVE_LOW, IPT_VOLUME_DOWN )
+	PORT_BIT( 0x00001000, IP_ACTIVE_LOW, IPT_VOLUME_UP )
+	PORT_BIT( 0x00002000, IP_ACTIVE_LOW, IPT_CUSTOM ) /* coin door */
+	PORT_BIT( 0x00004000, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x00008000, IP_ACTIVE_LOW, IPT_BILL1 ) /* bill validator */
+	PORT_BIT( 0xffff0000, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("DSW")
 	PORT_DIPNAME( 0x0001, 0x0000, DEF_STR( Flip_Screen ))
@@ -243,6 +239,7 @@
 	PORT_DIPNAME( 0x8000, 0x8000, "Test Switch" )
 	PORT_DIPSETTING(      0x8000, DEF_STR( Off ))
 	PORT_DIPSETTING(      0x0000, DEF_STR( On ))
+	PORT_BIT( 0xffff0000, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("AN0")
 	PORT_BIT( 0xff, 0x80, IPT_AD_STICK_X ) PORT_CROSSHAIR(X, -1.0, 0.0, 0) PORT_SENSITIVITY(20) PORT_KEYDELTA(10) PORT_REVERSE PORT_PLAYER(1)
@@ -295,9 +292,12 @@
 	screen.set_screen_update("maincpu", FUNC(tms34010_device::tms340x0_ind16));
 	screen.set_palette(m_palette);
 
-	MIDWAY_SERIAL_PIC(config, m_midway_serial_pic, 0);
-	/* serial prefixes 419, 420 */
-	m_midway_serial_pic->set_upper(419);
+	PIC16C57(config, m_pic, 625000); // need to be verified
+	m_pic->read_a().set([this]() { return m_pic_command; });
+	m_pic->write_b().set([this](u8 data) { m_pic_data = data; });
+	m_pic->read_c().set([this]() { return m_pic_clk ^ 1; });
+	m_pic->write_c().set([this](u8 data) { m_pic_status = BIT(data, 1); });
+	// there also should be PIC16 reset line control, unknown at the moment
 
 	adc0848_device &adc(ADC0848(config, "adc"));
 	adc.intr_callback().set(FUNC(midxunit_state::adc_int_w)); // ADC INT passed through PLSI1032
@@ -331,14 +331,14 @@
 	ROM_LOAD16_BYTE( "revx_snd.8", 0xc00000, 0x80000, CRC(793a7eb5) SHA1(4b1f81b68f95cedf1b356ef362d1eb37acc74b16) )
 	ROM_LOAD16_BYTE( "revx_snd.9", 0xe00000, 0x80000, CRC(14ddbea1) SHA1(8dba9dc5529ea77c4312ea61f825bf9062ffc6c3) )
 
-	ROM_REGION16_LE( 0x200000, "maincpu", 0 )   /* 34020 code */
+	ROM_REGION32_LE( 0x200000, "maincpu", 0 )   /* 34020 code */
 	ROM_LOAD32_BYTE( "revx.51",  0x00000, 0x80000, CRC(9960ac7c) SHA1(441322f061d627ca7573f612f370a85794681d0f) )
 	ROM_LOAD32_BYTE( "revx.52",  0x00001, 0x80000, CRC(fbf55510) SHA1(8a5b0004ed09391fe37f0f501b979903d6ae4868) )
 	ROM_LOAD32_BYTE( "revx.53",  0x00002, 0x80000, CRC(a045b265) SHA1(b294d3a56e41f5ec4ab9bbcc0088833b1cab1879) )
 	ROM_LOAD32_BYTE( "revx.54",  0x00003, 0x80000, CRC(24471269) SHA1(262345bd147402100785459af422dafd1c562787) )
 
 	ROM_REGION( 0x2000, "pic", 0 )
-	ROM_LOAD( "revx_16c57.bin", 0x0000000, 0x2000, CRC(eb8a8649) SHA1(a1e1d0b7a5e9802e8f889eb7e719259656dc8133) )
+	ROM_LOAD( "revx_16c57.bin", 0x0000000, 0x2000, BAD_DUMP CRC(517e0110) SHA1(cd603c66794ff426dd2994fc1a0c0c8e6bbd864b) ) // manually restored
 
 	ROM_REGION( 0x1000000, "gfxrom", 0 )
 	ROM_LOAD32_BYTE( "revx.120", 0x0000000, 0x80000, CRC(523af1f0) SHA1(a67c0fd757e860fc1c1236945952a295b4d5df5a) )
@@ -398,14 +398,14 @@
 	ROM_LOAD16_BYTE( "revx_snd.8", 0xc00000, 0x80000, CRC(793a7eb5) SHA1(4b1f81b68f95cedf1b356ef362d1eb37acc74b16) )
 	ROM_LOAD16_BYTE( "revx_snd.9", 0xe00000, 0x80000, CRC(14ddbea1) SHA1(8dba9dc5529ea77c4312ea61f825bf9062ffc6c3) )
 
-	ROM_REGION16_LE( 0x200000, "maincpu", 0 )   /* 34020 code */
+	ROM_REGION32_LE( 0x200000, "maincpu", 0 )   /* 34020 code */
 	ROM_LOAD32_BYTE( "revx_p5.51",  0x00000, 0x80000, CRC(f3877eee) SHA1(7a4fdce36edddd35308c107c992ce626a2c9eb8c) )
 	ROM_LOAD32_BYTE( "revx_p5.52",  0x00001, 0x80000, CRC(199a54d8) SHA1(45319437e11176d4926c00c95c372098203a32a3) )
 	ROM_LOAD32_BYTE( "revx_p5.53",  0x00002, 0x80000, CRC(fcfcf72a) SHA1(b471afb416e3d348b046b0b40f497d27b0afa470) )
 	ROM_LOAD32_BYTE( "revx_p5.54",  0x00003, 0x80000, CRC(fd684c31) SHA1(db3453792e4d9fc375297d030f0b3f9cc3cad925) )
 
 	ROM_REGION( 0x2000, "pic", 0 )
-	ROM_LOAD( "revx_16c57.bin", 0x0000000, 0x2000, CRC(eb8a8649) SHA1(a1e1d0b7a5e9802e8f889eb7e719259656dc8133) )
+	ROM_LOAD( "revx_16c57.bin", 0x0000000, 0x2000, BAD_DUMP CRC(517e0110) SHA1(cd603c66794ff426dd2994fc1a0c0c8e6bbd864b) ) // manually restored
 
 	ROM_REGION( 0x1000000, "gfxrom", 0 )
 	ROM_LOAD32_BYTE( "revx.120", 0x0000000, 0x80000, CRC(523af1f0) SHA1(a67c0fd757e860fc1c1236945952a295b4d5df5a) )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/midyunit.cpp mame-0.224+dfsg.1/src/mame/drivers/midyunit.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/midyunit.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/midyunit.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -145,6 +145,21 @@
 		m_oki->set_rom_bank(data & 3);
 }
 
+void midyunit_state::yawdim2_oki_bank_w(uint8_t data)
+{
+	int bnk = (data >> 1 & 4) + (data & 3);
+	m_oki->set_rom_bank(bnk);
+
+	if (!(data & 4))
+		m_oki->reset();
+}
+
+uint8_t midyunit_state::yawdim2_soundlatch_r()
+{
+	m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
+	return m_soundlatch->read();
+}
+
 
 
 /*************************************
@@ -2636,27 +2651,34 @@
 
 ROM_START( mkyawdim2 )
 	ROM_REGION( 0x10000, "audiocpu", 0 )    /* sound CPU */
-	// Differs from other mkyawdim set
-	ROM_LOAD ( "yawdim.u167", 0x00000, 0x08000, CRC(16da7efb) SHA1(ac1db81a55aca36136b94977a91a1fc778b7b164) )
+	// Differs from other mkyawdim sets
+	ROM_LOAD ( "yawdim.u167", 0x00000, 0x08000, CRC(16da7efb) SHA1(ac1db81a55aca36136b94977a91a1fc778b7b164) )  // 27c512
 	ROM_CONTINUE(             0x00000, 0x08000 )
 
-	ROM_REGION( 0x100000, "oki", 0 )    /* ADPCM */
-	// Half size as mkyawdim set
-	ROM_LOAD( "yawdim.u159", 0x00000, 0x20000, CRC(95b120af) SHA1(41b6fb384e5048926b87959a2c58d96b95698aba) )
-	ROM_CONTINUE(            0x40000, 0x20000 )
-	ROM_RELOAD(              0x80000, 0x20000 )
-	ROM_CONTINUE(            0xc0000, 0x20000 )
-	ROM_LOAD( "mw-15.u160",  0x20000, 0x20000, CRC(6e68e0b0) SHA1(edb7aa6507452ffa5ce7097e3b1855a69542971c) )
-	ROM_CONTINUE(            0x60000, 0x20000 )
-	ROM_CONTINUE(            0xa0000, 0x20000 )
-	ROM_CONTINUE(            0xe0000, 0x20000 )
+	ROM_REGION( 0x200000, "oki", 0 )    /* ADPCM */
+	ROM_LOAD( "yawdim.u159", 0x000000, 0x20000, CRC(95b120af) SHA1(41b6fb384e5048926b87959a2c58d96b95698aba) )  // 27c020  Half size of mkyawdim set
+	ROM_CONTINUE(            0x100000, 0x20000 )
+	ROM_RELOAD(              0x040000, 0x20000 )
+	ROM_CONTINUE(            0x140000, 0x20000 )
+	ROM_RELOAD(              0x080000, 0x20000 )
+	ROM_CONTINUE(            0x180000, 0x20000 )
+	ROM_RELOAD(              0x0c0000, 0x20000 )
+	ROM_CONTINUE(            0x1c0000, 0x20000 )
+	ROM_LOAD( "mw-15.u160",  0x020000, 0x20000, CRC(6e68e0b0) SHA1(edb7aa6507452ffa5ce7097e3b1855a69542971c) )  // 4Mbit mask
+	ROM_CONTINUE(            0x060000, 0x20000 )
+	ROM_CONTINUE(            0x0a0000, 0x20000 )
+	ROM_CONTINUE(            0x0e0000, 0x20000 )
+	ROM_RELOAD(              0x120000, 0x20000 )
+	ROM_CONTINUE(            0x160000, 0x20000 )
+	ROM_CONTINUE(            0x1a0000, 0x20000 )
+	ROM_CONTINUE(            0x1e0000, 0x20000 )
 
 	ROM_REGION16_LE( 0x100000, "user1", 0 ) /* 34010 code */
-	ROM_LOAD16_BYTE( "4.u25",  0x00000, 0x80000, CRC(b12b3bf2) SHA1(deb7755e8407d9de25124b3fdbc4c834a25d8252) )
+	ROM_LOAD16_BYTE( "4.u25",  0x00000, 0x80000, CRC(b12b3bf2) SHA1(deb7755e8407d9de25124b3fdbc4c834a25d8252) )  // 2x 4Mbit masks
 	ROM_LOAD16_BYTE( "5.u26",  0x00001, 0x80000, CRC(7a37dc5c) SHA1(c4fc6933d8b990c5c56c65282b1f72b90b5d5435) )
 
 	ROM_REGION( 0x800000, "gfx1", 0 ) /* 8mbit dumps */
-	ROM_LOAD ( "b-1.bin",  0x000000, 0x100000, CRC(f41e61c6) SHA1(7dad38839d5c9aa0cfa7b2f7199f14e0f2c4494b) )
+	ROM_LOAD ( "b-1.bin",  0x000000, 0x100000, CRC(f41e61c6) SHA1(7dad38839d5c9aa0cfa7b2f7199f14e0f2c4494b) )  // 6x 8Mbit masks
 	ROM_LOAD ( "b-2.bin",  0x100000, 0x100000, CRC(8052740b) SHA1(f1b7fd536966d9d0ce690cdec635069c340d678e) )
 
 	ROM_LOAD ( "a-1.bin",  0x200000, 0x100000, CRC(7da3cb93) SHA1(23b9053b3241b69988f7f2e6a9d1353dac4fc8ab) )
@@ -2664,6 +2686,28 @@
 
 	ROM_LOAD ( "c-1.bin",  0x400000, 0x100000, CRC(de27c4c3) SHA1(a7760d239749c7463808adec72795f9785f553ec) )
 	ROM_LOAD ( "c-2.bin",  0x500000, 0x100000, CRC(d99203f3) SHA1(46ea21cbedfd42838562594b9bdc5d80360b7e5e) )
+
+	ROM_REGION( 0x900, "plds", 0 )
+	ROM_LOAD( "22v10.p1",  0x000, 0x2dd, CRC(15c24092) SHA1(7bbd1453c9a230dfa641239f15abb5aec93eb0dd) )  // unsecured
+	ROM_LOAD( "22v10.p2",  0x000, 0x2dd, NO_DUMP )                                                       // secured
+	ROM_LOAD( "22v10.p3",  0x000, 0x2dd, NO_DUMP )                                                       // secured
+	ROM_LOAD( "16v8.p4",   0x000, 0x117, NO_DUMP )                                                       // secured, registered
+	ROM_LOAD( "22v10.p5",  0x000, 0x2dd, NO_DUMP )                                                       // secured
+	ROM_LOAD( "16v8.p6",   0x000, 0x117, NO_DUMP )                                                       // secured, registered
+	ROM_LOAD( "16v8.p7",   0x300, 0x117, CRC(fbbdc832) SHA1(8fe5448dad6025f98c70a9dd9aa7d07a75a6762c) )  // secured but bruteforced ok
+	ROM_LOAD( "16v8.p8",   0x500, 0x117, CRC(8c573ab4) SHA1(9f16936c34cbaaa89b56356353f2a76fd4f28605) )  // secured but bruteforced ok
+	ROM_LOAD( "22v10.p9",  0x000, 0x2dd, NO_DUMP )                                                       // secured
+	ROM_LOAD( "20v8.p10",  0x000, 0x157, NO_DUMP )                                                       // secured
+	ROM_LOAD( "20v8.p11",  0x000, 0x157, NO_DUMP )                                                       // secured
+	ROM_LOAD( "22v10.p12", 0x000, 0x2dd, NO_DUMP )                                                       // secured
+	ROM_LOAD( "22v10.p13", 0x000, 0x2dd, NO_DUMP )                                                       // secured
+	ROM_LOAD( "22v10.p14", 0x000, 0x2dd, NO_DUMP )                                                       // secured
+	ROM_LOAD( "22v10.p15", 0x000, 0x2dd, NO_DUMP )                                                       // secured
+	ROM_LOAD( "20v8.p16",  0x000, 0x157, NO_DUMP )                                                       // secured
+	ROM_LOAD( "20v8.p17",  0x000, 0x157, NO_DUMP )                                                       // secured
+	ROM_LOAD( "22v10.p18", 0x000, 0x2dd, NO_DUMP )                                                       // secured
+	ROM_LOAD( "16v8.p19",  0x700, 0x117, CRC(0346b5fc) SHA1(0cc1e1dcd6017de2e80eb1d40ac3a591e589b030) )  // unsecured
+	// also u130: ti TPC1020AFN-084C PLCC84, unattempted
 ROM_END
 
 
@@ -2672,7 +2716,7 @@
 	ROM_LOAD (  "15.bin", 0x00000, 0x10000, CRC(b58d229e) SHA1(3ed14ef650dfa7f9d460611b19e9233a022cbea6) )
 
 	ROM_REGION( 0x100000, "oki", 0 )    /* ADPCM */
-	ROM_LOAD( "13.bin",  0x00000, 0x20000, CRC(921c613d) SHA1(be62b87f195b6347112ab13cc14514d4c88a8b86) ) // Half size as mkyawdim2 set and a quarter of mkyawdim
+	ROM_LOAD( "13.bin",  0x00000, 0x20000, CRC(921c613d) SHA1(be62b87f195b6347112ab13cc14514d4c88a8b86) ) // Half size of mkyawdim2 set and a quarter of mkyawdim
 	ROM_RELOAD(          0x40000, 0x20000 )
 	ROM_RELOAD(          0x80000, 0x20000 )
 	ROM_RELOAD(          0xc0000, 0x20000 )
@@ -3091,22 +3135,22 @@
 GAME( 1991, term2pa2,   term2,    term2,                   term2,    midyunit_state, init_term2la1, ORIENTATION_FLIP_X, "Midway",   "Terminator 2 - Judgment Day (prototype, rev PA2 10/18/91)", MACHINE_SUPPORTS_SAVE )
 GAME( 1991, term2lg1,   term2,    term2,                   term2,    midyunit_state, init_term2la1, ORIENTATION_FLIP_X, "Midway",   "Terminator 2 - Judgment Day (rev LG1 11/04/91)", MACHINE_SUPPORTS_SAVE )
 
-GAME( 1992, mkla4,      mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyunit,  ROT0, "Midway",   "Mortal Kombat (rev 4.0 09/28/92)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mkla3,      mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyunit,  ROT0, "Midway",   "Mortal Kombat (rev 3.0 08/31/92)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mkla2,      mk,       yunit_adpcm_6bit_fast,   mkla2,    midyunit_state, init_mkyunit,  ROT0, "Midway",   "Mortal Kombat (rev 2.0 08/18/92)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mkla1,      mk,       yunit_adpcm_6bit_fast,   mkla2,    midyunit_state, init_mkyunit,  ROT0, "Midway",   "Mortal Kombat (rev 1.0 08/09/92)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mkprot9,    mk,       yunit_adpcm_6bit_faster, mkla2,    midyunit_state, init_mkyunit,  ROT0, "Midway",   "Mortal Kombat (prototype, rev 9.0 07/28/92)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mkprot8,    mk,       yunit_adpcm_6bit_faster, mkla2,    midyunit_state, init_mkyunit,  ROT0, "Midway",   "Mortal Kombat (prototype, rev 8.0 07/21/92)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mkprot4,    mk,       yunit_adpcm_6bit_faster, mkla2,    midyunit_state, init_mkyunit,  ROT0, "Midway",   "Mortal Kombat (prototype, rev 4.0 07/14/92)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mkyturbo,   mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyturbo, ROT0, "hack",     "Mortal Kombat (Turbo 3.1 09/09/93, hack)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mkyturboe,  mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyturbo, ROT0, "hack",     "Mortal Kombat (Turbo 3.0 08/31/92, hack)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mknifty,    mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyturbo, ROT0, "hack",     "Mortal Kombat (Nifty Kombo, hack)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mknifty666, mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyturbo, ROT0, "hack",     "Mortal Kombat (Nifty Kombo 666, hack)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mkrep,      mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyturbo, ROT0, "hack",     "Mortal Kombat (Reptile Man hack)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
-GAME( 1992, mkyawdim,   mk,       mkyawdim,                mkyawdim, midyunit_state, init_mkyawdim, ROT0, "bootleg (Yawdim)", "Mortal Kombat (Yawdim bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, mkyawdim2,  mk,       mkyawdim,                mkyawdim, midyunit_state, init_mkyawdim, ROT0, "bootleg (Yawdim)", "Mortal Kombat (Yawdim bootleg, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND) // are some sound effects missing/wrong?
-GAME( 1992, mkyawdim3,  mk,       mkyawdim,                mkyawdim, midyunit_state, init_mkyawdim, ROT0, "bootleg (Yawdim)", "Mortal Kombat (Yawdim bootleg, set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND) // are some sound effects missing/wrong?
-GAME( 1992, mkyawdim4,  mk,       mkyawdim,                mkyawdim, midyunit_state, init_mkyawdim, ROT0, "bootleg (Yawdim)", "Mortal Kombat (Yawdim bootleg, set 4)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND) // are some sound effects missing/wrong?
+GAME( 1992, mkla4,      mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyunit,   ROT0, "Midway",   "Mortal Kombat (rev 4.0 09/28/92)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mkla3,      mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyunit,   ROT0, "Midway",   "Mortal Kombat (rev 3.0 08/31/92)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mkla2,      mk,       yunit_adpcm_6bit_fast,   mkla2,    midyunit_state, init_mkyunit,   ROT0, "Midway",   "Mortal Kombat (rev 2.0 08/18/92)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mkla1,      mk,       yunit_adpcm_6bit_fast,   mkla2,    midyunit_state, init_mkyunit,   ROT0, "Midway",   "Mortal Kombat (rev 1.0 08/09/92)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mkprot9,    mk,       yunit_adpcm_6bit_faster, mkla2,    midyunit_state, init_mkyunit,   ROT0, "Midway",   "Mortal Kombat (prototype, rev 9.0 07/28/92)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mkprot8,    mk,       yunit_adpcm_6bit_faster, mkla2,    midyunit_state, init_mkyunit,   ROT0, "Midway",   "Mortal Kombat (prototype, rev 8.0 07/21/92)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mkprot4,    mk,       yunit_adpcm_6bit_faster, mkla2,    midyunit_state, init_mkyunit,   ROT0, "Midway",   "Mortal Kombat (prototype, rev 4.0 07/14/92)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mkyturbo,   mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyturbo,  ROT0, "hack",     "Mortal Kombat (Turbo 3.1 09/09/93, hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mkyturboe,  mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyturbo,  ROT0, "hack",     "Mortal Kombat (Turbo 3.0 08/31/92, hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mknifty,    mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyturbo,  ROT0, "hack",     "Mortal Kombat (Nifty Kombo, hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mknifty666, mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyturbo,  ROT0, "hack",     "Mortal Kombat (Nifty Kombo 666, hack)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mkrep,      mk,       yunit_adpcm_6bit_fast,   mkla4,    midyunit_state, init_mkyturbo,  ROT0, "hack",     "Mortal Kombat (Reptile Man hack)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
+GAME( 1992, mkyawdim,   mk,       mkyawdim,                mkyawdim, midyunit_state, init_mkyawdim,  ROT0, "bootleg (Yawdim)", "Mortal Kombat (Yawdim bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, mkyawdim2,  mk,       mkyawdim,                mkyawdim, midyunit_state, init_mkyawdim2, ROT0, "bootleg (Yawdim)", "Mortal Kombat (Yawdim bootleg, set 2)", MACHINE_SUPPORTS_SAVE ) // some sound effects are missing on real pcb
+GAME( 1992, mkyawdim3,  mk,       mkyawdim,                mkyawdim, midyunit_state, init_mkyawdim,  ROT0, "bootleg (Yawdim)", "Mortal Kombat (Yawdim bootleg, set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND) // are some sound effects missing/wrong?
+GAME( 1992, mkyawdim4,  mk,       mkyawdim,                mkyawdim, midyunit_state, init_mkyawdim,  ROT0, "bootleg (Yawdim)", "Mortal Kombat (Yawdim bootleg, set 4)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND) // are some sound effects missing/wrong?
 
 GAME( 1992, totcarn,    0,        yunit_adpcm_6bit_fast,   totcarn, midyunit_state,  init_totcarn,  ROT0, "Midway",   "Total Carnage (rev LA1 03/10/92)", MACHINE_SUPPORTS_SAVE )
 GAME( 1992, totcarnp,   totcarn,  yunit_adpcm_6bit_fast,   totcarn, midyunit_state,  init_totcarn,  ROT0, "Midway",   "Total Carnage (prototype, rev 1.0 01/25/92)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/midzeus.cpp mame-0.224+dfsg.1/src/mame/drivers/midzeus.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/midzeus.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/midzeus.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -27,17 +27,27 @@
 **************************************************************************/
 
 #include "emu.h"
+#include "audio/dcs.h"
+
 #include "cpu/tms32031/tms32031.h"
 #include "cpu/adsp2100/adsp2100.h"
 #include "cpu/pic16c5x/pic16c5x.h"
+
 #include "includes/midzeus.h"
 
-#include "audio/dcs.h"
+#include "machine/ibm21s850.h"
 #include "machine/nvram.h"
+#include "machine/tsb12lv01a.h"
 
 #include "crusnexo.lh"
 
-#define LOG_FW        (0)
+#define LOG_FIREWIRE    (1 << 1)
+#define LOG_DISK        (1 << 2)
+#define LOG_DISK_JR     (1 << 3)
+#define LOG_UNKNOWN     (1 << 4)
+
+#define VERBOSE (LOG_FIREWIRE)
+#include "logmacro.h"
 
 #define CPU_CLOCK       XTAL(60'000'000)
 
@@ -52,6 +62,8 @@
 	midzeus2_state(const machine_config &mconfig, device_type type, const char *tag)
 		: midzeus_state(mconfig, type, tag)
 		, m_zeus(*this, "zeus2")
+		, m_fw_link(*this, "fw_link")
+		, m_fw_phy(*this, "fw_phy")
 		, m_leds(*this, "led%u", 0U)
 		, m_lamps(*this, "lamp%u", 0U)
 	{ }
@@ -64,21 +76,51 @@
 	void init_thegrid();
 
 private:
+	virtual void machine_start() override
+	{
+		midzeus_state::machine_start();
+
+		m_leds.resolve();
+		m_lamps.resolve();
+
+		save_item(NAME(m_disk_asic));
+		save_item(NAME(m_fw_int_enable));
+		save_item(NAME(m_fw_int));
+	}
+
+	virtual void machine_reset() override
+	{
+		midzeus_state::machine_reset();
+
+		memset(m_disk_asic, 0x0, 0x10 * 4);
+		m_fw_int_enable = 0;
+		m_fw_int = 0;
+	}
+
+	virtual void video_start() override {}
+
+	void zeus2_map(address_map &map);
+
+	uint32_t disk_asic_r(offs_t offset);
+	void disk_asic_w(offs_t offset, uint32_t data);
+
+	DECLARE_WRITE_LINE_MEMBER(firewire_irq);
 	DECLARE_WRITE_LINE_MEMBER(zeus_irq);
+
 	uint32_t zeus2_timekeeper_r(offs_t offset);
 	void zeus2_timekeeper_w(offs_t offset, uint32_t data);
 	uint32_t crusnexo_leds_r(offs_t offset);
 	void crusnexo_leds_w(offs_t offset, uint32_t data);
-	void zeus2_map(address_map &map);
 
-	virtual void machine_start() override
-	{
-		MACHINE_START_CALL_MEMBER(midzeus);
-		m_leds.resolve();
-		m_lamps.resolve();
-	}
+	void update_firewire_irq();
+
+	uint32_t    m_disk_asic[0x10];
+	int         m_fw_int_enable;
+	int         m_fw_int;
 
 	required_device<zeus2_device> m_zeus;
+	required_device<tsb12lv01a_device> m_fw_link;
+	required_device<ibm21s851_device> m_fw_phy;
 	output_finder<32> m_leds;
 	output_finder<8> m_lamps;
 };
@@ -91,37 +133,38 @@
  *
  *************************************/
 
-MACHINE_START_MEMBER(midzeus_state,midzeus)
+void midzeus_state::machine_start()
 {
 	m_digits.resolve();
 
-	timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate());
-	timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate());
+	m_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate());
+	m_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate());
 
-	gun_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(midzeus_state::invasn_gun_callback), this));
-	gun_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(midzeus_state::invasn_gun_callback), this));
+	m_gun_timer[0] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(midzeus_state::invasn_gun_callback), this));
+	m_gun_timer[1] = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(midzeus_state::invasn_gun_callback), this));
 
 	m_display_irq_off_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(midzeus_state::display_irq_off), this));
 
-	save_item(NAME(gun_control));
-	save_item(NAME(gun_irq_state));
-	save_item(NAME(gun_x));
-	save_item(NAME(gun_y));
-	save_item(NAME(crusnexo_leds_select));
-	save_item(NAME(keypad_select));
+	save_item(NAME(m_crusnexo_leds_select));
+	save_item(NAME(m_disk_asic_jr));
+	save_item(NAME(m_cmos_protected));
+	save_item(NAME(m_gun_control));
+	save_item(NAME(m_gun_irq_state));
+	save_item(NAME(m_gun_x));
+	save_item(NAME(m_gun_y));
+	save_item(NAME(m_keypad_select));
 }
 
 
-MACHINE_RESET_MEMBER(midzeus_state,midzeus)
+void midzeus_state::machine_reset()
 {
 	memcpy(m_ram_base, memregion("user1")->base(), 0x40000*4);
 	*m_ram_base <<= 1;
 	m_maincpu->reset();
 
-	cmos_protected = true;
-	memset(disk_asic_jr, 0x0, 0x10 * 4);
-	disk_asic_jr[6] = 0xa0; // Rev3 Athens
-	memset(disk_asic, 0x0, 0x10 * 4);
+	m_cmos_protected = true;
+	memset(m_disk_asic_jr, 0x0, 0x10 * 4);
+	m_disk_asic_jr[6] = 0xa0; // Rev3 Athens
 }
 
 
@@ -134,18 +177,18 @@
 
 TIMER_CALLBACK_MEMBER(midzeus_state::display_irq_off)
 {
-	m_maincpu->set_input_line(0, CLEAR_LINE);
+	m_maincpu->set_input_line(TMS3203X_IRQ0, CLEAR_LINE);
 }
 
 INTERRUPT_GEN_MEMBER(midzeus_state::display_irq)
 {
-	device.execute().set_input_line(0, ASSERT_LINE);
+	m_maincpu->set_input_line(TMS3203X_IRQ0, ASSERT_LINE);
 	m_display_irq_off_timer->adjust(attotime::from_hz(30000000));
 }
 
 WRITE_LINE_MEMBER(midzeus2_state::zeus_irq)
 {
-	m_maincpu->set_input_line(2, ASSERT_LINE);
+	m_maincpu->set_input_line(TMS3203X_IRQ2, ASSERT_LINE);
 }
 
 
@@ -157,11 +200,11 @@
 
 void midzeus_state::cmos_w(offs_t offset, uint32_t data, uint32_t mem_mask)
 {
-	if (disk_asic_jr[2] && !cmos_protected)
+	if (m_disk_asic_jr[2] && !m_cmos_protected)
 		COMBINE_DATA(&m_nvram[offset]);
 	else
-		logerror("%06X:timekeeper_w with disk_asic_jr[2] = %d, cmos_protected = %d\n", m_maincpu->pc(), disk_asic_jr[2], cmos_protected);
-	cmos_protected = true;
+		logerror("%06X:timekeeper_w with disk_asic_jr[2] = %d, cmos_protected = %d\n", m_maincpu->pc(), m_disk_asic_jr[2], m_cmos_protected);
+	m_cmos_protected = true;
 }
 
 
@@ -173,7 +216,7 @@
 
 void midzeus_state::cmos_protect_w(uint32_t data)
 {
-	cmos_protected = false;
+	m_cmos_protected = false;
 }
 
 
@@ -192,11 +235,11 @@
 
 void midzeus2_state::zeus2_timekeeper_w(offs_t offset, uint32_t data)
 {
-	if (disk_asic_jr[2] && !cmos_protected)
+	if (m_disk_asic_jr[2] && !m_cmos_protected)
 		m_m48t35->write(offset, data);
 	else
-		logerror("%s:zeus2_timekeeper_w with disk_asic_jr[2] = %d, cmos_protected = %d\n", machine().describe_context(), disk_asic_jr[2], cmos_protected);
-	cmos_protected = true;
+		logerror("%s:zeus2_timekeeper_w with disk_asic_jr[2] = %d, cmos_protected = %d\n", machine().describe_context(), m_disk_asic_jr[2], m_cmos_protected);
+	m_cmos_protected = true;
 }
 
 
@@ -208,10 +251,10 @@
 
 void midzeus_state::zpram_w(offs_t offset, uint32_t data, uint32_t mem_mask)
 {
-	if (disk_asic_jr[2])
+	if (m_disk_asic_jr[2])
 		COMBINE_DATA(&m_nvram[offset]);
 	else
-		logerror("%06X:zpram_w with disk_asic_jr[2] = %d\n", m_maincpu->pc(), disk_asic_jr[2]);
+		logerror("%06X:zpram_w with disk_asic_jr[2] = %d\n", m_maincpu->pc(), m_disk_asic_jr[2]);
 }
 
 
@@ -221,9 +264,10 @@
 *  Disk ASIC registers
 *
 *************************************/
-uint32_t midzeus_state::disk_asic_r(offs_t offset)
+
+uint32_t midzeus2_state::disk_asic_r(offs_t offset)
 {
-	uint32_t retVal = disk_asic[offset];
+	uint32_t retVal = m_disk_asic[offset];
 	switch (offset)
 	{
 		// Sys Control
@@ -232,37 +276,43 @@
 		// Bit 15:8 Version
 		case 0:
 			retVal = (retVal & 0xffff00ff) | 0x3300;
+			LOGMASKED(LOG_DISK, "%s: Disk ASIC System Control Read: %08x\n", machine().describe_context(), retVal);
 			break;
 		// Interrupt Status / Control
 		// 0x004: IFIFO Interrupt
 		// 0x200: Firewire
 		case 1:
-			retVal = 0x0;
+			retVal = (m_fw_int << 9);
+			LOGMASKED(LOG_DISK, "%s: Disk ASIC Interrupt Status/Ctrl Read: %08x\n", machine().describe_context(), retVal);
 			break;
 		// Test
 		case 2:
+			LOGMASKED(LOG_DISK, "%s: Disk ASIC Test(?) Read: %08x\n", machine().describe_context(), retVal);
 			break;
 		// Wait State Config
 		case 3:
+			LOGMASKED(LOG_DISK, "%s: Disk ASIC Wait State Config Read: %08x\n", machine().describe_context(), retVal);
 			break;
 		// IDE Config
 		case 4:
+			LOGMASKED(LOG_DISK, "%s: Disk ASIC IDE Config Read: %08x\n", machine().describe_context(), retVal);
 			break;
 		// PSRAM Config
 		case 5:
+			LOGMASKED(LOG_DISK, "%s: Disk ASIC PSRAM Config Read: %08x\n", machine().describe_context(), retVal);
 			break;
 		// Unknown
 		default:
-			logerror("%06X:disk_asic_r(%X) Unknown\n", m_maincpu->pc(), offset);
+			LOGMASKED(LOG_DISK | LOG_UNKNOWN, "%s: Disk ASIC Unknown Read: %08x\n", machine().describe_context(), offset);
 			break;
 	}
 	return retVal;
 }
 
 
-void midzeus_state::disk_asic_w(offs_t offset, uint32_t data)
+void midzeus2_state::disk_asic_w(offs_t offset, uint32_t data)
 {
-	disk_asic[offset] = data;
+	m_disk_asic[offset] = data;
 
 	switch (offset)
 	{
@@ -270,27 +320,35 @@
 		// Bit 0: zeus reset
 		// Bit 3: io reset
 		case 0:
+			LOGMASKED(LOG_DISK, "%s: Disk ASIC System Control Write: %08x\n", machine().describe_context(), data);
 			break;
 		// Interrupt Status / Control
 		// 0x004: IFIFO Interrupt
 		// 0x200: Enable Firewire interrupt
 		case 1:
+			LOGMASKED(LOG_DISK, "%s: Disk ASIC Interrupt Status/Ctrl Write: %08x\n", machine().describe_context(), data);
+			m_fw_int_enable = BIT(data, 9);
+			update_firewire_irq();
 			break;
 		// Test
 		case 2:
+			LOGMASKED(LOG_DISK, "%s: Disk ASIC Test(?) Write: %08x\n", machine().describe_context(), data);
 			break;
 		// Wait State Config
 		case 3:
+			LOGMASKED(LOG_DISK, "%s: Disk ASIC Wait State Config Write: %08x\n", machine().describe_context(), data);
 			break;
 		// IDE Config
 		case 4:
+			LOGMASKED(LOG_DISK, "%s: Disk ASIC IDE Config Write: %08x\n", machine().describe_context(), data);
 			break;
 		// PSRAM Config
 		case 5:
+			LOGMASKED(LOG_DISK, "%s: Disk ASIC PSRAM Config Write: %08x\n", machine().describe_context(), data);
 			break;
 		// Unknown
 		default:
-			logerror("%06X:disk_asic_w(%X)=%08X Unknown\n", m_maincpu->pc(), offset, data);
+			LOGMASKED(LOG_DISK | LOG_UNKNOWN, "%s: Disk ASIC Unknown Write: %08x = %08x\n", machine().describe_context(), offset, data);
 			break;
 	}
 }
@@ -302,7 +360,7 @@
  *************************************/
 uint32_t midzeus_state::disk_asic_jr_r(offs_t offset)
 {
-	uint32_t retVal = disk_asic_jr[offset];
+	uint32_t retVal = m_disk_asic_jr[offset];
 	switch (offset)
 	{
 		// miscellaneous hw wait states
@@ -311,16 +369,16 @@
 		/* CMOS/ZPRAM write enable; only low bit is used */
 		case 2:
 			break;
-			//  return disk_asic_jr[offset] | ~1;
+			//  return m_disk_asic_jr[offset] | ~1;
 
 		/* reset status; bit 0 is watchdog reset; mk4/invasn/thegrid read at startup; invasn freaks if it is 1 at startup */
 		case 3:
 			break;
-		//  return disk_asic_jr[offset] | ~1;
+		//  return m_disk_asic_jr[offset] | ~1;
 
 		/* ROM bank selection on Zeus 2; two bits are used */
 		case 5:
-		//  return disk_asic_jr[offset] | ~3;
+		//  return m_disk_asic_jr[offset] | ~3;
 
 		/* disk asic jr id; crusnexo reads at startup: if (val & 0xf0) == 0xa0 it affects */
 		/* how the Zeus is used (reg 0x5d is set to 0x54580006) */
@@ -343,8 +401,8 @@
 
 void midzeus_state::disk_asic_jr_w(offs_t offset, uint32_t data)
 {
-	//uint32_t oldval = disk_asic_jr[offset];
-	disk_asic_jr[offset] = data;
+	//uint32_t oldval = m_disk_asic_jr[offset];
+	m_disk_asic_jr[offset] = data;
 
 	switch (offset)
 	{
@@ -376,7 +434,7 @@
 
 		/* ROM bank selection on Zeus 2 */
 		case 5:
-			membank("bank1")->set_entry(disk_asic_jr[offset] & 3);
+			membank("bank1")->set_entry(m_disk_asic_jr[offset] & 3);
 			break;
 
 		/* zeus2 ws; 0=zeus access 1 wait state, 2=unlock ROMs; crusnexo/thegrid write 1 at startup */
@@ -436,18 +494,18 @@
 
 			/* selection bits 4-6 select the 3 7-segment LEDs */
 			for (bit = 4; bit < 7; bit++)
-				if ((crusnexo_leds_select & (1 << bit)) == 0)
+				if ((m_crusnexo_leds_select & (1 << bit)) == 0)
 					m_digits[bit] = ~data & 0xff;
 
 			/* selection bits 0-2 select the tachometer LEDs */
 			for (bit = 0; bit < 3; bit++)
-				if ((crusnexo_leds_select & (1 << bit)) == 0)
+				if ((m_crusnexo_leds_select & (1 << bit)) == 0)
 					for (led = 0; led < 8; led++)
 						m_leds[bit * 8 + led] = BIT(~data, led);
 			break;
 
 		case 3: /* selects which set of LEDs we are addressing */
-			crusnexo_leds_select = data;
+			m_crusnexo_leds_select = data;
 			break;
 	}
 }
@@ -462,76 +520,18 @@
  *
  *************************************/
 
-uint32_t midzeus_state::firewire_r(offs_t offset)
+WRITE_LINE_MEMBER(midzeus2_state::firewire_irq)
 {
-	uint32_t retVal = 0;
-	if (offset < 0x40)
-		retVal = m_firewire[offset / 4];
-
-	switch (offset) {
-	case 0:
-		// Version
-		retVal = 0x30313042;
-		break;
-	case 0x0c:
-		// Interrupt
-		retVal = 0xf4000000;// &m_firewire[0x10 / 4];
-		break;
-	case 0x30:
-		// Asynchronous Transmit FIFO Status
-		// 8:0 space available
-		retVal = 0x1ff;
-		break;
-	case 0x3c:
-		// General Rx FIFO Status
-		// 0x80000000 = Empty
-		// 0x40000000 = Control Data
-		// 0x20000000 = Packet Complete
-		retVal = 0x80000000;
-		break;
-	case 0xc0:
-		// General Rx FIFO
-		retVal = 0x0;
-		break;
-	}
-	if LOG_FW logerror("%06X:firewire_r(%02X)=%08X\n", m_maincpu->pc(), offset, retVal);
-	return retVal;
+	m_fw_int = state;
+	update_firewire_irq();
 }
 
-void midzeus_state::firewire_w(offs_t offset, uint32_t data, uint32_t mem_mask)
+void midzeus2_state::update_firewire_irq()
 {
-	// 0x08 // Control
-	// Bit 0: Flush bad packets from Rx FIFO
-	// Bit 6: IRP2En
-	// Bit 7: IRP1En
-	// Bit 8: TrgEn
-	// Bit 20: Reset Rx
-	// Bit 21: Reset Tx
-	// Bit 22: Enable Acknowledge
-	// Bit 23: Iso Rx Enable
-	// Bit 24: Iso Rx Enable
-	// Bit 25: Async Rx Enable
-	// Bit 26: Async Tx Enable
-	// Bit 30: Rx Self ID packets
-	// Bit 31: Rx Packets addressed to phy
-	// 0x00200000 Reset Tx
-	// 0x00100000 Reset Rx
-	// 0x1c // FIFO Control
-	// Bit 0:8: ITF Size
-	// Bit 9:17: ATF Size
-	// Bit 18:26 Trigger Size
-	// Bit 29: Clear GRF
-	// Bit 32: Clear ATF
-	// 0x20 // Diagnostics
-	// Bit 31: Enable Snooping
-
-	if (offset < 0x40)
-		COMBINE_DATA(&m_firewire[offset / 4]);
-	if LOG_FW logerror("%06X:firewire_w(%02X) = %08X\n", m_maincpu->pc(),  offset, data);
+	LOGMASKED(LOG_FIREWIRE, "%ssserting FW IRQ\n", (m_fw_int_enable && m_fw_int) ? "A" : "Dea");
+	m_maincpu->set_input_line(TMS3203X_IRQ3, (m_fw_int_enable && m_fw_int) ? ASSERT_LINE : CLEAR_LINE);
 }
 
-
-
 /*************************************
  *
  *  TMS32031 I/O accesses
@@ -545,7 +545,7 @@
 	{
 		/* timer is clocked at 100ns */
 		int which = (offset >> 4) & 1;
-		int32_t result = (timer[which]->elapsed() * 10000000).as_double();
+		int32_t result = (m_timer[which]->elapsed() * 10000000).as_double();
 		return result;
 	}
 
@@ -570,7 +570,7 @@
 	{
 		int which = (offset >> 4) & 1;
 		if (data & 0x40)
-			timer[which]->adjust(attotime::never);
+			m_timer[which]->adjust(attotime::never);
 	}
 	else
 		logerror("%06X:tms32031_control_w(%02X) = %08X\n", m_maincpu->pc(), offset, data);
@@ -594,14 +594,14 @@
 void midzeus_state::keypad_select_w(offs_t offset, uint32_t data)
 {
 	if (offset == 1)
-		keypad_select = data;
+		m_keypad_select = data;
 }
 
 
 CUSTOM_INPUT_MEMBER(midzeus_state::keypad_r)
 {
 	uint32_t bits = m_io_keypad->read();
-	uint8_t select = keypad_select;
+	uint8_t select = m_keypad_select;
 	while ((select & 1) != 0)
 	{
 		select >>= 1;
@@ -656,10 +656,10 @@
 void midzeus_state::update_gun_irq()
 {
 	/* low 2 bits of gun_control seem to enable IRQs */
-	if (gun_irq_state & gun_control & 0x03)
-		m_maincpu->set_input_line(3, ASSERT_LINE);
+	if (m_gun_irq_state & m_gun_control & 0x03)
+		m_maincpu->set_input_line(TMS3203X_IRQ3, ASSERT_LINE);
 	else
-		m_maincpu->set_input_line(3, CLEAR_LINE);
+		m_maincpu->set_input_line(TMS3203X_IRQ3, CLEAR_LINE);
 }
 
 
@@ -669,37 +669,37 @@
 	int beamy = m_screen->vpos();
 
 	/* set the appropriate IRQ in the internal gun control and update */
-	gun_irq_state |= 0x01 << player;
+	m_gun_irq_state |= 0x01 << player;
 	update_gun_irq();
 
 	/* generate another interrupt on the next scanline while we are within the BEAM_DY */
 	beamy++;
-	if (beamy <= m_screen->visible_area().max_y && beamy <= gun_y[player] + BEAM_DY)
-		gun_timer[player]->adjust(m_screen->time_until_pos(beamy, std::max(0, gun_x[player] - BEAM_DX)), player);
+	if (beamy <= m_screen->visible_area().max_y && beamy <= m_gun_y[player] + BEAM_DY)
+		m_gun_timer[player]->adjust(m_screen->time_until_pos(beamy, std::max(0, m_gun_x[player] - BEAM_DX)), player);
 }
 
 
 void midzeus_state::invasn_gun_w(offs_t offset, uint32_t data, uint32_t mem_mask)
 {
-	uint32_t old_control = gun_control;
+	uint32_t old_control = m_gun_control;
 	int player;
 
-	COMBINE_DATA(&gun_control);
+	COMBINE_DATA(&m_gun_control);
 
 	/* bits 0-1 enable IRQs (?) */
 	/* bits 2-3 reset IRQ states */
-	gun_irq_state &= ~((gun_control >> 2) & 3);
+	m_gun_irq_state &= ~((m_gun_control >> 2) & 3);
 	update_gun_irq();
 
 	for (player = 0; player < 2; player++)
 	{
 		uint8_t pmask = 0x04 << player;
-		if (((old_control ^ gun_control) & pmask) != 0 && (gun_control & pmask) == 0)
+		if (((old_control ^ m_gun_control) & pmask) != 0 && (m_gun_control & pmask) == 0)
 		{
 			const rectangle &visarea = m_screen->visible_area();
-			gun_x[player] = m_io_gun_x[player]->read() * visarea.width() / 255 + visarea.min_x + BEAM_XOFFS;
-			gun_y[player] = m_io_gun_y[player]->read() * visarea.height() / 255 + visarea.min_y;
-			gun_timer[player]->adjust(m_screen->time_until_pos(std::max(0, gun_y[player] - BEAM_DY), std::max(0, gun_x[player] - BEAM_DX)), player);
+			m_gun_x[player] = m_io_gun_x[player]->read() * visarea.width() / 255 + visarea.min_x + BEAM_XOFFS;
+			m_gun_y[player] = m_io_gun_y[player]->read() * visarea.height() / 255 + visarea.min_y;
+			m_gun_timer[player]->adjust(m_screen->time_until_pos(std::max(0, m_gun_y[player] - BEAM_DY), std::max(0, m_gun_x[player] - BEAM_DX)), player);
 		}
 	}
 }
@@ -714,8 +714,8 @@
 
 	for (player = 0; player < 2; player++)
 	{
-		int diffx = beamx - gun_x[player];
-		int diffy = beamy - gun_y[player];
+		int diffx = beamx - m_gun_x[player];
+		int diffy = beamy - m_gun_y[player];
 		if (diffx >= -BEAM_DX && diffx <= BEAM_DX && diffy >= -BEAM_DY && diffy <= BEAM_DY)
 			result ^= 0x1000 << player;
 	}
@@ -753,7 +753,8 @@
 	map(0x400000, 0x43ffff).ram();
 	map(0x808000, 0x80807f).rw(FUNC(midzeus2_state::tms32031_control_r), FUNC(midzeus2_state::tms32031_control_w)).share("tms32031_ctl");
 	map(0x880000, 0x88007f).rw(m_zeus, FUNC(zeus2_device::zeus2_r), FUNC(zeus2_device::zeus2_w));
-	map(0x8a0000, 0x8a00cf).rw(FUNC(midzeus2_state::firewire_r), FUNC(midzeus2_state::firewire_w)).share("firewire");
+	map(0x8a0000, 0x8a00cf).rw(m_fw_link, FUNC(tsb12lv01a_device::read), FUNC(tsb12lv01a_device::write));
+	//map(0x8a0000, 0x8a00cf).rw(FUNC(midzeus2_state::firewire_r), FUNC(midzeus2_state::firewire_w)).share("firewire");
 	map(0x8d0000, 0x8d0009).rw(FUNC(midzeus2_state::disk_asic_jr_r), FUNC(midzeus2_state::disk_asic_jr_w));
 	map(0x900000, 0x91ffff).rw(FUNC(midzeus2_state::zpram_r), FUNC(midzeus2_state::zpram_w)).share("nvram").mirror(0x020000);
 	map(0x990000, 0x99000f).rw("ioasic", FUNC(midway_ioasic_device::read), FUNC(midway_ioasic_device::write));
@@ -1266,8 +1267,6 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &midzeus_state::zeus_map);
 	m_maincpu->set_vblank_int("screen", FUNC(midzeus_state::display_irq));
 
-	MCFG_MACHINE_START_OVERRIDE(midzeus_state,midzeus)
-	MCFG_MACHINE_RESET_OVERRIDE(midzeus_state,midzeus)
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
 
 	/* video hardware */
@@ -1275,11 +1274,9 @@
 
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
 	m_screen->set_raw(MIDZEUS_VIDEO_CLOCK / 8, 529, 0, 400, 278, 0, 256);
-	m_screen->set_screen_update(FUNC(midzeus_state::screen_update_midzeus));
+	m_screen->set_screen_update(FUNC(midzeus_state::screen_update));
 	m_screen->set_palette("palette");
 
-	MCFG_VIDEO_START_OVERRIDE(midzeus_state,midzeus)
-
 	/* sound hardware */
 	DCS2_AUDIO_2104(config, "dcs", 0);
 
@@ -1309,7 +1306,6 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &midzeus2_state::zeus2_map);
 	m_maincpu->set_vblank_int("screen", FUNC(midzeus2_state::display_irq));
 
-	MCFG_MACHINE_RESET_OVERRIDE(midzeus2_state,midzeus)
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
 
 	/* video hardware */
@@ -1325,10 +1321,19 @@
 
 	M48T35(config, m_m48t35, 0);
 
+	/* I/O hardware */
 	MIDWAY_IOASIC(config, m_ioasic, 0);
 	m_ioasic->set_shuffle(MIDWAY_IOASIC_STANDARD);
 	m_ioasic->set_yearoffs(99);
 	m_ioasic->set_upper(474);
+
+	IBM21S851(config, m_fw_phy, 0);
+	m_fw_phy->reset_cb().set(m_fw_link, FUNC(tsb12lv01a_device::phy_reset_w));
+
+	TSB12LV01A(config, m_fw_link, 0);
+	m_fw_link->int_cb().set(FUNC(midzeus2_state::firewire_irq));
+	m_fw_link->phy_read().set(m_fw_phy, FUNC(ibm21s851_device::read));
+	m_fw_link->phy_write().set(m_fw_phy, FUNC(ibm21s851_device::write));
 }
 
 void midzeus2_state::crusnexo(machine_config &config)
@@ -1412,7 +1417,7 @@
 	ROM_LOAD16_BYTE( "invasion2.u5", 0xc00000, 0x200000, CRC(e42805c9) SHA1(e5b71eb1852809a649ac43a82168b3bdaf4b1526) )
 
 	ROM_REGION( 0x2000, "pic", 0 ) /* PIC16c57 Code */
-	ROM_LOAD( "pic16c57.u76", 0x00000, 0x2000, CRC(f62729c9) SHA1(9642c53dd7eceeb7eb178497d367691c44abc5c5) ) // is this even a valid dump?
+	ROM_LOAD( "pic16c57.u76", 0x00000, 0x2000, BAD_DUMP CRC(f62729c9) SHA1(9642c53dd7eceeb7eb178497d367691c44abc5c5) ) // is this even a valid dump?
 
 	ROM_REGION32_LE( 0x1800000, "user1", 0 )
 	ROM_LOAD32_WORD( "invasion5.u10", 0x0000000, 0x200000, CRC(8c7785d9) SHA1(701602314cd4eba4215c47ea0ae75fd4eddad43b) ) /* Roms U10 & U11 were labeled as v5.0 */
@@ -1435,7 +1440,7 @@
 	ROM_LOAD16_BYTE( "invasion2.u5", 0xc00000, 0x200000, CRC(e42805c9) SHA1(e5b71eb1852809a649ac43a82168b3bdaf4b1526) )
 
 	ROM_REGION( 0x2000, "pic", 0 ) /* PIC16c57 Code */
-	ROM_LOAD( "pic16c57.u76", 0x00000, 0x2000, CRC(f62729c9) SHA1(9642c53dd7eceeb7eb178497d367691c44abc5c5) ) // is this even a valid dump?
+	ROM_LOAD( "pic16c57.u76", 0x00000, 0x2000, BAD_DUMP CRC(f62729c9) SHA1(9642c53dd7eceeb7eb178497d367691c44abc5c5) ) // is this even a valid dump?
 
 	ROM_REGION32_LE( 0x1800000, "user1", 0 )
 	ROM_LOAD32_WORD( "invasion4.u10", 0x0000000, 0x200000, CRC(b3ce958b) SHA1(ed51c167d85bc5f6155b8046ec056a4f4ad5cf9d) ) /* These ROM were all labeled as v4.0 */
@@ -1458,7 +1463,7 @@
 	ROM_LOAD16_BYTE( "invasion2.u5", 0xc00000, 0x200000, CRC(e42805c9) SHA1(e5b71eb1852809a649ac43a82168b3bdaf4b1526) )
 
 	ROM_REGION( 0x2000, "pic", 0 ) /* PIC16c57 Code */
-	ROM_LOAD( "pic16c57.u76", 0x00000, 0x2000, CRC(f62729c9) SHA1(9642c53dd7eceeb7eb178497d367691c44abc5c5) ) // is this even a valid dump?
+	ROM_LOAD( "pic16c57.u76", 0x00000, 0x2000, BAD_DUMP CRC(f62729c9) SHA1(9642c53dd7eceeb7eb178497d367691c44abc5c5) ) // is this even a valid dump?
 
 	ROM_REGION32_LE( 0x1800000, "user1", 0 )
 	ROM_LOAD32_WORD( "invasion3.u10", 0x0000000, 0x200000, CRC(8404830e) SHA1(808fea45fb09fb7bf60f9f1e195a51d39e9966f5) ) /* Roms U10 through U13 were labeled as v3.0 Dated 8/30 */
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mikro80.cpp mame-0.224+dfsg.1/src/mame/drivers/mikro80.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mikro80.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mikro80.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,12 +1,22 @@
 // license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic
-/***************************************************************************
+/*****************************************************************************************
 
-        MIKRO80 driver by Miodrag Milanovic
+MIKRO80 driver by Miodrag Milanovic
 
-        10/03/2008 Preliminary driver.
+2008-03-10 Preliminary driver.
 
-****************************************************************************/
+
+Cassette:
+* Mikro80: loads software items, but not its own saves
+* Radio99: can load its own saves; can load radio86 tapes, can load ut88 tapes.
+* Kristall2: can load its own saves; can load radio86 tapes; can load radio99 tapes.
+
+
+ToDo:
+- Cassette - need schematic of CMT.
+
+*****************************************************************************************/
 
 
 #include "emu.h"
@@ -16,41 +26,43 @@
 #include "sound/volt_reg.h"
 #include "emupal.h"
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
 /* Address maps */
 void mikro80_state::mikro80_mem(address_map &map)
 {
-	map(0x0000, 0x07ff).bankrw("bank1"); // First bank
-	map(0x0800, 0xdfff).ram();  // RAM
-	map(0xe000, 0xe7ff).ram().share("cursor_ram");// Video RAM
-	map(0xe800, 0xefff).ram().share("video_ram"); // Video RAM
-	map(0xf000, 0xf7ff).ram();  // RAM
-	map(0xf800, 0xffff).rom();  // System ROM
+	map(0x0000, 0xdfff).ram().share("mainram");
+	map(0xe000, 0xe7ff).ram().share("attrram");
+	map(0xe800, 0xefff).ram().share("videoram");
+	map(0xf000, 0xf7ff).ram();
+	map(0xf800, 0xffff).rom().region("maincpu",0);
 }
 
 void mikro80_state::mikro80_io(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x01, 0x01).rw(FUNC(mikro80_state::mikro80_tape_r), FUNC(mikro80_state::mikro80_tape_w));
-	map(0x04, 0x07).rw(FUNC(mikro80_state::mikro80_keyboard_r), FUNC(mikro80_state::mikro80_keyboard_w));
+	map(0x01, 0x01).rw(FUNC(mikro80_state::tape_r), FUNC(mikro80_state::tape_w));
+	map(0x04, 0x07).lr8(NAME([this] (offs_t offset) { return m_ppi->read(offset^3); })).lw8(NAME([this] (offs_t offset, u8 data) { m_ppi->write(offset^3, data); }));
 }
 
 void mikro80_state::kristall_io(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x00, 0x03).rw(m_ppi8255, FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0x00, 0x03).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0x02, 0x02).w(FUNC(mikro80_state::portc_w));
+	// map(0x20, 0x23).  init byte 8B, so possibly another ppi with reversed offset like mikro80
 }
 
 void mikro80_state::radio99_io(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x01, 0x01).rw(FUNC(mikro80_state::mikro80_tape_r), FUNC(mikro80_state::mikro80_tape_w));
-	map(0x04, 0x04).w(FUNC(mikro80_state::radio99_sound_w));
-	map(0x05, 0x05).rw(FUNC(mikro80_state::mikro80_8255_portc_r), FUNC(mikro80_state::mikro80_8255_portc_w));
-	map(0x06, 0x06).r(FUNC(mikro80_state::mikro80_8255_portb_r));
-	map(0x07, 0x07).w(FUNC(mikro80_state::mikro80_8255_porta_w));
+	map(0x01, 0x01).rw(FUNC(mikro80_state::tape_r), FUNC(mikro80_state::tape_w));
+	// no init byte, so ppi has been replaced by ordinary latches
+	map(0x04, 0x04).w(FUNC(mikro80_state::sound_w));
+	//map(0x05, 0x05).rw(FUNC(mikro80_state::portc_r), FUNC(mikro80_state::portc_w));
+	map(0x05, 0x05).r(FUNC(mikro80_state::portc_r)).nopw();
+	map(0x06, 0x06).r(FUNC(mikro80_state::portb_r));
+	map(0x07, 0x07).w(FUNC(mikro80_state::porta_w));
 }
 
 /* Input ports */
@@ -147,7 +159,7 @@
 INPUT_PORTS_END
 
 /* F4 Character Displayer */
-static const gfx_layout mikro80_charlayout =
+static const gfx_layout charlayout =
 {
 	8, 8,                   /* 8 x 8 characters */
 	256,                    /* 256 characters */
@@ -161,9 +173,42 @@
 };
 
 static GFXDECODE_START( gfx_mikro80 )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, mikro80_charlayout, 0, 1 )
+	GFXDECODE_ENTRY( "chargen", 0x0000, charlayout, 0, 1 )
 GFXDECODE_END
 
+u32 mikro80_state::screen_update_mikro80(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	u16 sy=0,ma=0;
+
+	for (u8 y = 0; y < 32; y++)
+	{
+		for (u8 ra = 0; ra < 8; ra++)
+		{
+			u16 *p = &bitmap.pix16(sy++);
+
+			for (u16 x = ma; x < ma + 64; x++)
+			{
+				bool attr = BIT(m_aram[x+1], 7);
+				u8 chr = m_vram[x];
+				u8 gfx = m_p_chargen[(chr<<3) | ra ] ^ (attr ? 0xff : 0);
+
+				/* Display a scanline of a character */
+				*p++ = BIT(gfx, 7);
+				*p++ = BIT(gfx, 6);
+				*p++ = BIT(gfx, 5);
+				*p++ = BIT(gfx, 4);
+				*p++ = BIT(gfx, 3);
+				*p++ = BIT(gfx, 2);
+				*p++ = BIT(gfx, 1);
+				*p++ = BIT(gfx, 0);
+			}
+		}
+		ma+=64;
+	}
+	return 0;
+}
+
+
 void mikro80_state::mikro80(machine_config &config)
 {
 	/* basic machine hardware */
@@ -171,10 +216,10 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &mikro80_state::mikro80_mem);
 	m_maincpu->set_addrmap(AS_IO, &mikro80_state::mikro80_io);
 
-	I8255(config, m_ppi8255);
-	m_ppi8255->out_pa_callback().set(FUNC(mikro80_state::mikro80_8255_porta_w));
-	m_ppi8255->in_pb_callback().set(FUNC(mikro80_state::mikro80_8255_portb_r));
-	m_ppi8255->in_pc_callback().set(FUNC(mikro80_state::mikro80_8255_portc_r));
+	I8255(config, m_ppi);
+	m_ppi->out_pa_callback().set(FUNC(mikro80_state::porta_w));
+	m_ppi->in_pb_callback().set(FUNC(mikro80_state::portb_r));
+	m_ppi->in_pc_callback().set(FUNC(mikro80_state::portc_r));
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -206,7 +251,7 @@
 	/* basic machine hardware */
 	m_maincpu->set_addrmap(AS_IO, &mikro80_state::radio99_io);
 
-	DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.12);
+	DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.50);
 	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
 	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
 }
@@ -215,35 +260,39 @@
 {
 	mikro80(config);
 	m_maincpu->set_addrmap(AS_IO, &mikro80_state::kristall_io);
+	m_ppi->in_pc_callback().set(FUNC(mikro80_state::kristall2_portc_r));
 }
 
 
 /* ROM definition */
 
 ROM_START( mikro80 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "mikro80.rom", 0xf800, 0x0800, CRC(63a4b72a) SHA1(6bd3e396539a15e2ccffa7486cae06ef6ddd1d03))
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x0800, "maincpu", 0 )
+	ROM_LOAD( "mikro80.rom", 0x0000, 0x0800, CRC(63a4b72a) SHA1(6bd3e396539a15e2ccffa7486cae06ef6ddd1d03))
+
+	ROM_REGION(0x0800, "chargen",0)
 	ROM_LOAD ("mikro80.fnt", 0x0000, 0x0800, CRC(43eb72bb) SHA1(761319cc6747661b33e84aa449cec83800543b5b) )
 ROM_END
 
 ROM_START( radio99 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "monrk88.bin", 0xf800, 0x0800, CRC(5415d847) SHA1(c8233c72548bc79846b9d998766a10df349c5bda))
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x0800, "maincpu", 0 )
+	ROM_LOAD( "monrk88.bin", 0x0000, 0x0800, CRC(5415d847) SHA1(c8233c72548bc79846b9d998766a10df349c5bda))
+
+	ROM_REGION(0x0800, "chargen",0)
 	ROM_LOAD ("mikro80.fnt", 0x0000, 0x0800, CRC(43eb72bb) SHA1(761319cc6747661b33e84aa449cec83800543b5b) )
 ROM_END
 
 ROM_START( kristall2 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "kristall-2.rom", 0xf800, 0x0800, CRC(e1b5c60f) SHA1(8ce5158def7fca91ec7e11efbb10aa5d70b7c36d))
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x0800, "maincpu", 0 )
+	ROM_LOAD( "kristall-2.rom", 0x0000, 0x0800, CRC(e1b5c60f) SHA1(8ce5158def7fca91ec7e11efbb10aa5d70b7c36d))
+
+	ROM_REGION(0x0800, "chargen",0)
 	ROM_LOAD( "kristall-2.fnt", 0x0000, 0x0800, CRC(9661c9f5) SHA1(830c38735dcb1c8a271fa0027f94b4e034848fc8))
 ROM_END
 
 
 /* Driver */
 /*    YEAR  NAME       PARENT   COMPAT  MACHINE   INPUT    CLASS          INIT          COMPANY      FULLNAME       FLAGS */
-COMP( 1983, mikro80,   0,       0,      mikro80,  mikro80, mikro80_state, init_mikro80, "<unknown>", "Mikro-80",    0)
-COMP( 1993, radio99,   mikro80, 0,      radio99,  mikro80, mikro80_state, init_radio99, "<unknown>", "Radio-99DM",  0)
-COMP( 1987, kristall2, mikro80, 0,      kristall, mikro80, mikro80_state, init_mikro80, "<unknown>", "Kristall-2",  0)
+COMP( 1983, mikro80,   0,       0,      mikro80,  mikro80, mikro80_state, init_mikro80, "<unknown>", "Mikro-80",    MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1993, radio99,   mikro80, 0,      radio99,  mikro80, mikro80_state, init_radio99, "<unknown>", "Radio-99DM",  MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1987, kristall2, mikro80, 0,      kristall, mikro80, mikro80_state, init_mikro80, "<unknown>", "Kristall-2",  MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mikrosha.cpp mame-0.224+dfsg.1/src/mame/drivers/mikrosha.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mikrosha.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mikrosha.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,12 +12,9 @@
 #include "includes/radio86.h"
 
 #include "cpu/i8085/i8085.h"
-#include "imagedev/cassette.h"
-#include "machine/i8255.h"
 #include "machine/pit8253.h"
 
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
 #include "formats/rk_cas.h"
@@ -36,10 +33,11 @@
 	void mikrosha_8255_font_page_w(uint8_t data);
 	DECLARE_WRITE_LINE_MEMBER(mikrosha_pit_out2);
 	I8275_DRAW_CHARACTER_MEMBER(display_pixels);
-	virtual void machine_reset() override;
+	void machine_reset() override;
+	void machine_start() override;
 
-	void mikrosha_io(address_map &map);
-	void mikrosha_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 
 	uint8_t m_mikrosha_font_page;
 };
@@ -52,20 +50,18 @@
 }
 
 /* Address maps */
-void mikrosha_state::mikrosha_mem(address_map &map)
+void mikrosha_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x0fff).bankrw("bank1"); // First bank
-	map(0x1000, 0x7fff).ram(); // RAM
-	map(0xc000, 0xc003).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x07fc);
-	map(0xc800, 0xc803).rw(m_ppi8255_2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x07fc);
-	map(0xd000, 0xd001).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x07fe); // video
-	map(0xd800, 0xd803).rw("pit8253", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).mirror(0x07fc); // Timer
+	map(0x0000, 0x7fff).ram().share("mainram"); // RAM
+	map(0xc000, 0xc003).rw(m_ppi1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x07fc);
+	map(0xc800, 0xc803).rw(m_ppi2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x07fc);
+	map(0xd000, 0xd001).rw("crtc", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x07fe); // video
+	map(0xd800, 0xd803).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write)).mirror(0x07fc); // Timer
 	map(0xe000, 0xf7ff).r(FUNC(mikrosha_state::radio_cpu_state_r)); // Not connected
-	map(0xf800, 0xffff).w(m_dma8257, FUNC(i8257_device::write));    // DMA
-	map(0xf800, 0xffff).rom();  // System ROM
+	map(0xf800, 0xffff).rom().region("maincpu",0).w(m_dma, FUNC(i8257_device::write));    // DMA
 }
 
-void mikrosha_state::mikrosha_io(address_map &map)
+void mikrosha_state::io_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x00, 0xff).rw(FUNC(mikrosha_state::radio_io_r), FUNC(mikrosha_state::radio_io_w));
@@ -173,23 +169,28 @@
 {
 }
 
+void mikrosha_state::machine_start()
+{
+	save_item(NAME(m_tape_value));
+	save_item(NAME(m_mikrosha_font_page));
+}
+
 I8275_DRAW_CHARACTER_MEMBER(mikrosha_state::display_pixels)
 {
 	rgb_t const *const palette = m_palette->palette()->entry_list_raw();
-	uint8_t const *const charmap = &m_charmap[(m_mikrosha_font_page & 1) * 0x400];
+	uint8_t const *const charmap = &m_chargen[(m_mikrosha_font_page & 1) * 0x400];
 	uint8_t pixels = charmap[(linecount & 7) + (charcode << 3)] ^ 0xff;
-	if (vsp) {
+	if (vsp)
 		pixels = 0;
-	}
-	if (lten) {
+
+	if (lten)
 		pixels = 0xff;
-	}
-	if (rvv) {
+
+	if (rvv)
 		pixels ^= 0xff;
-	}
-	for(int i=0;i<6;i++) {
+
+	for(int i=0;i<6;i++)
 		bitmap.pix32(y, x + i) = palette[(pixels >> (5-i)) & 1 ? (hlgt ? 2 : 1) : 0];
-	}
 }
 
 /* F4 Character Displayer */
@@ -207,40 +208,40 @@
 };
 
 static GFXDECODE_START( gfx_mikrosha )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, mikrosha_charlayout, 0, 1 )
+	GFXDECODE_ENTRY( "chargen", 0x0000, mikrosha_charlayout, 0, 1 )
 GFXDECODE_END
 
 void mikrosha_state::mikrosha(machine_config &config)
 {
 	/* basic machine hardware */
 	I8080(config, m_maincpu, XTAL(16'000'000) / 9);
-	m_maincpu->set_addrmap(AS_PROGRAM, &mikrosha_state::mikrosha_mem);
-	m_maincpu->set_addrmap(AS_IO, &mikrosha_state::mikrosha_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &mikrosha_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &mikrosha_state::io_map);
 
-	I8255(config, m_ppi8255_1);
-	m_ppi8255_1->in_pa_callback().set(FUNC(radio86_state::radio86_8255_portb_r2));
-	m_ppi8255_1->out_pb_callback().set(FUNC(radio86_state::radio86_8255_porta_w2));
-	m_ppi8255_1->in_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_r2));
-	m_ppi8255_1->out_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_w2));
-
-	I8255(config, m_ppi8255_2);
-	m_ppi8255_2->out_pb_callback().set(FUNC(mikrosha_state::mikrosha_8255_font_page_w));
-	m_ppi8255_2->tri_pb_callback().set_constant(0);
+	I8255(config, m_ppi1);
+	m_ppi1->in_pa_callback().set(FUNC(mikrosha_state::radio86_8255_portb_r2));
+	m_ppi1->out_pb_callback().set(FUNC(mikrosha_state::radio86_8255_porta_w2));
+	m_ppi1->in_pc_callback().set(FUNC(mikrosha_state::radio86_8255_portc_r2));
+	m_ppi1->out_pc_callback().set(FUNC(mikrosha_state::radio86_8255_portc_w2));
+
+	I8255(config, m_ppi2);
+	m_ppi2->out_pb_callback().set(FUNC(mikrosha_state::mikrosha_8255_font_page_w));
+	m_ppi2->tri_pb_callback().set_constant(0);
 
-	i8275_device &i8275(I8275(config, "i8275", XTAL(16'000'000) / 12));
+	i8275_device &i8275(I8275(config, "crtc", XTAL(16'000'000) / 12));
 	i8275.set_character_width(6);
 	i8275.set_display_callback(FUNC(mikrosha_state::display_pixels));
-	i8275.drq_wr_callback().set(m_dma8257, FUNC(i8257_device::dreq2_w));
+	i8275.drq_wr_callback().set(m_dma, FUNC(i8257_device::dreq2_w));
 
-	pit8253_device &pit8253(PIT8253(config, "pit8253", 0));
-	pit8253.set_clk<0>(0);
-	pit8253.set_clk<1>(0);
-	pit8253.set_clk<2>(2000000);
-	pit8253.out_handler<2>().set(FUNC(mikrosha_state::mikrosha_pit_out2));
+	pit8253_device &pit(PIT8253(config, "pit", 0));
+	pit.set_clk<0>(0);
+	pit.set_clk<1>(0);
+	pit.set_clk<2>(2000000);
+	pit.out_handler<2>().set(FUNC(mikrosha_state::mikrosha_pit_out2));
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_screen_update("i8275", FUNC(i8275_device::screen_update));
+	screen.set_screen_update("crtc", FUNC(i8275_device::screen_update));
 	screen.set_refresh_hz(50);
 	screen.set_size(78*6, 30*10);
 	screen.set_visarea(0, 78*6-1, 0, 30*10-1);
@@ -250,12 +251,12 @@
 
 	SPEAKER(config, "mono").front_center();
 
-	I8257(config, m_dma8257, XTAL(16'000'000) / 9);
-	m_dma8257->out_hrq_cb().set(FUNC(radio86_state::hrq_w));
-	m_dma8257->in_memr_cb().set(FUNC(radio86_state::memory_read_byte));
-	m_dma8257->out_memw_cb().set(FUNC(radio86_state::memory_write_byte));
-	m_dma8257->out_iow_cb<2>().set("i8275", FUNC(i8275_device::dack_w));
-	m_dma8257->set_reverse_rw_mode(1);
+	I8257(config, m_dma, XTAL(16'000'000) / 9);
+	m_dma->out_hrq_cb().set(FUNC(mikrosha_state::hrq_w));
+	m_dma->in_memr_cb().set(FUNC(mikrosha_state::memory_read_byte));
+	m_dma->out_memw_cb().set(FUNC(mikrosha_state::memory_write_byte));
+	m_dma->out_iow_cb<2>().set("crtc", FUNC(i8275_device::dack_w));
+	m_dma->set_reverse_rw_mode(1);
 
 	CASSETTE(config, m_cassette);
 	m_cassette->set_formats(rkm_cassette_formats);
@@ -272,21 +273,23 @@
 
 /* ROM definition */
 ROM_START( mikrosha )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "mikrosha.rom", 0xf800, 0x0800, CRC(86a83556) SHA1(94b1baad0a419145939a891ff51f4324e8e4ddd2))
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x0800, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "mikrosha.rom", 0x0000, 0x0800, CRC(86a83556) SHA1(94b1baad0a419145939a891ff51f4324e8e4ddd2))
+
+	ROM_REGION(0x0800, "chargen",0)
 	ROM_LOAD ("mikrosha.fnt", 0x0000, 0x0800, CRC(b315da1c) SHA1(b5bf9abc0fff75b1aba709a7f08b23d4a89bb04b))
 ROM_END
 
 ROM_START( m86rk )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "m86rk.bin", 0xf800, 0x0800, CRC(a898d77a) SHA1(c2497bf8434b5028fe0a9fc09be311465d5553a5))
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x0800, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "m86rk.bin", 0x0000, 0x0800, CRC(a898d77a) SHA1(c2497bf8434b5028fe0a9fc09be311465d5553a5))
+
+	ROM_REGION(0x0800, "chargen",0)
 	/* here should probably be different rom */
 	ROM_LOAD ("mikrosha.fnt", 0x0000, 0x0800, CRC(b315da1c) SHA1(b5bf9abc0fff75b1aba709a7f08b23d4a89bb04b))
 ROM_END
 
 /* Driver */
 //    YEAR  NAME      PARENT   COMPAT  MACHINE   INPUT     CLASS           INIT          COMPANY                                FULLNAME         FLAGS
-COMP( 1987, mikrosha, radio86, 0,      mikrosha, mikrosha, mikrosha_state, init_radio86, "Lianozovo Electromechanical Factory", "Mikrosha",      0)
-COMP( 1987, m86rk,    radio86, 0,      mikrosha, mikrosha, mikrosha_state, init_radio86, "<unknown>",                           "Mikrosha-86RK", 0)
+COMP( 1987, mikrosha, radio86, 0,      mikrosha, mikrosha, mikrosha_state, init_radio86, "Lianozovo Electromechanical Factory", "Mikrosha",      MACHINE_SUPPORTS_SAVE )
+COMP( 1987, m86rk,    radio86, 0,      mikrosha, mikrosha, mikrosha_state, init_radio86, "<unknown>",                           "Mikrosha-86RK", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mk85.cpp mame-0.224+dfsg.1/src/mame/drivers/mk85.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mk85.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mk85.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -38,17 +38,17 @@
 
 private:
 	virtual void machine_reset() override;
-	virtual void video_start() override;
+	virtual void machine_start() override;
 
-	void mk85_mem(address_map &map);
+	void mem_map(address_map &map);
 
-	uint32_t screen_update_mk85(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	required_device<k1801vm2_device> m_maincpu;
 };
 
 
-void mk85_state::mk85_mem(address_map &map)
+void mk85_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x0000, 0x3fff).rom().mirror(0x4000);
@@ -64,11 +64,11 @@
 {
 }
 
-void mk85_state::video_start()
+void mk85_state::machine_start()
 {
 }
 
-uint32_t mk85_state::screen_update_mk85(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t mk85_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	return 0;
 }
@@ -78,7 +78,7 @@
 	/* basic machine hardware */
 	K1801VM2(config, m_maincpu, XTAL(4'000'000));
 	m_maincpu->set_initial_mode(0);
-	m_maincpu->set_addrmap(AS_PROGRAM, &mk85_state::mk85_mem);
+	m_maincpu->set_addrmap(AS_PROGRAM, &mk85_state::mem_map);
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -86,7 +86,7 @@
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	screen.set_size(640, 480);
 	screen.set_visarea(0, 640-1, 0, 480-1);
-	screen.set_screen_update(FUNC(mk85_state::screen_update_mk85));
+	screen.set_screen_update(FUNC(mk85_state::screen_update));
 	screen.set_palette("palette");
 
 	PALETTE(config, "palette", palette_device::MONOCHROME);
@@ -94,11 +94,11 @@
 
 /* ROM definition */
 ROM_START( mk85 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x4000, "maincpu", 0 )
 	ROM_LOAD( "mk85.rom", 0x0000, 0x4000, CRC(398e4fd1) SHA1(5e2f877d0f451b46840f01190004552bad5248c8))
 ROM_END
 
 /* Driver */
 
 /*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS       INIT        COMPANY        FULLNAME  FLAGS */
-COMP( 1986, mk85, 0,      0,      mk85,    mk85,  mk85_state, empty_init, "Elektronika", "MK-85",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1986, mk85, 0,      0,      mk85,    mk85,  mk85_state, empty_init, "Elektronika", "MK-85",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mk90.cpp mame-0.224+dfsg.1/src/mame/drivers/mk90.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mk90.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mk90.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,9 +2,9 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        Elektronika MK-90
+Elektronika MK-90
 
-        12/05/2009 Skeleton driver.
+2009-05-12 Skeleton driver.
 
 
     http://www.pisi.com.pl/piotr433/index.htm#mk90
@@ -14,6 +14,8 @@
 It has a LCD display. It cost about 1500 roubles, which is the wages for 6
 months for an average citizen.
 
+Status: Starts in the weeds.
+
 ****************************************************************************/
 
 #include "emu.h"
@@ -34,17 +36,17 @@
 
 private:
 	virtual void machine_reset() override;
-	virtual void video_start() override;
+	virtual void machine_start() override;
 
-	void mk90_mem(address_map &map);
+	void mem_map(address_map &map);
 
-	uint32_t screen_update_mk90(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	required_device<k1801vm2_device> m_maincpu;
 };
 
 
-void mk90_state::mk90_mem(address_map &map)
+void mk90_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x0000, 0x3fff).ram(); // RAM
@@ -68,11 +70,11 @@
 {
 }
 
-void mk90_state::video_start()
+void mk90_state::machine_start()
 {
 }
 
-uint32_t mk90_state::screen_update_mk90(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t mk90_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	return 0;
 }
@@ -82,7 +84,7 @@
 	/* basic machine hardware */
 	K1801VM2(config, m_maincpu, XTAL(4'000'000));
 	m_maincpu->set_initial_mode(0x8000);
-	m_maincpu->set_addrmap(AS_PROGRAM, &mk90_state::mk90_mem);
+	m_maincpu->set_addrmap(AS_PROGRAM, &mk90_state::mem_map);
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -90,7 +92,7 @@
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	screen.set_size(640, 480);
 	screen.set_visarea(0, 640-1, 0, 480-1);
-	screen.set_screen_update(FUNC(mk90_state::screen_update_mk90));
+	screen.set_screen_update(FUNC(mk90_state::screen_update));
 	screen.set_palette("palette");
 
 	PALETTE(config, "palette", palette_device::MONOCHROME);
@@ -110,4 +112,4 @@
 /* Driver */
 
 /*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS       INIT        COMPANY        FULLNAME  FLAGS */
-COMP( 1988, mk90, 0,      0,      mk90,    mk90,  mk90_state, empty_init, "Elektronika", "MK-90",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1988, mk90, 0,      0,      mk90,    mk90,  mk90_state, empty_init, "Elektronika", "MK-90",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mod8.cpp mame-0.224+dfsg.1/src/mame/drivers/mod8.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mod8.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mod8.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -63,7 +63,7 @@
 public:
 	mod8_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-		, m_teleprinter(*this, TELEPRINTER_TAG)
+		, m_teleprinter(*this, "teleprinter")
 		, m_maincpu(*this, "maincpu")
 	{ }
 
@@ -75,51 +75,51 @@
 	void kbd_put(u8 data);
 	uint8_t tty_r();
 	IRQ_CALLBACK_MEMBER(mod8_irq_callback);
-	void mod8_io(address_map &map);
-	void mod8_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 
-	uint16_t m_tty_data;
-	uint8_t m_tty_key_data;
+	uint16_t m_tty_data_out;
+	uint8_t m_tty_data_in;
 	int m_tty_cnt;
-	virtual void machine_reset() override;
+	void machine_start() override;
 	required_device<teleprinter_device> m_teleprinter;
 	required_device<cpu_device> m_maincpu;
 };
 
 void mod8_state::out_w(uint8_t data)
 {
-	m_tty_data >>= 1;
-	m_tty_data |= BIT(data, 0) ? 0x8000 : 0;
+	m_tty_data_out >>= 1;
+	m_tty_data_out |= BIT(data, 0) ? 0x8000 : 0;
 	m_tty_cnt++;
 
 	if (m_tty_cnt == 10)
 	{
-		m_teleprinter->write((m_tty_data >> 7) & 0x7f);
+		m_teleprinter->write(BIT(m_tty_data_out, 7, 7));
 		m_tty_cnt = 0;
 	}
 }
 
 void mod8_state::tty_w(uint8_t data)
 {
-	m_tty_data = 0;
+	m_tty_data_out = 0;
 	m_tty_cnt = 0;
 }
 
 uint8_t mod8_state::tty_r()
 {
-	uint8_t d = m_tty_key_data & 1;
-	m_tty_key_data >>= 1;
+	uint8_t d = m_tty_data_in & 1;
+	m_tty_data_in >>= 1;
 	return d;
 }
 
-void mod8_state::mod8_mem(address_map &map)
+void mod8_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x000, 0x6ff).rom();
-	map(0x700, 0xfff).ram();
+	map(0x000, 0x7ff).rom();
+	map(0x800, 0xbff).ram();
 }
 
-void mod8_state::mod8_io(address_map &map)
+void mod8_state::io_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x00, 0x00).r(FUNC(mod8_state::tty_r));
@@ -136,13 +136,16 @@
 	return 0xC0; // LAA - NOP equivalent
 }
 
-void mod8_state::machine_reset()
+void mod8_state::machine_start()
 {
+	save_item(NAME(m_tty_data_out));
+	save_item(NAME(m_tty_data_in));
+	save_item(NAME(m_tty_cnt));
 }
 
 void mod8_state::kbd_put(u8 data)
 {
-	m_tty_key_data = data ^ 0xff;
+	m_tty_data_in = data ^ 0xff;
 	m_maincpu->set_input_line(0, HOLD_LINE);
 }
 
@@ -150,8 +153,8 @@
 {
 	/* basic machine hardware */
 	I8008(config, m_maincpu, 800000);
-	m_maincpu->set_addrmap(AS_PROGRAM, &mod8_state::mod8_mem);
-	m_maincpu->set_addrmap(AS_IO, &mod8_state::mod8_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &mod8_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &mod8_state::io_map);
 	m_maincpu->set_irq_acknowledge_callback(FUNC(mod8_state::mod8_irq_callback));
 
 	/* video hardware */
@@ -162,7 +165,7 @@
 
 /* ROM definition */
 ROM_START( mod8 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x0800, "maincpu", ROMREGION_ERASEFF )
 	ROM_LOAD( "mon8.001", 0x0000, 0x0100, CRC(b82ac6b8) SHA1(fbea5a6dd4c779ca1671d84089f857a3f548ffcb))
 	ROM_LOAD( "mon8.002", 0x0100, 0x0100, CRC(8b82bc3c) SHA1(66222511527b27e56a5a1f9656d424d407eac7d3))
 	ROM_LOAD( "mon8.003", 0x0200, 0x0100, CRC(679ae913) SHA1(22423efcb9051c9812fcbac9a27af70415d0dd81))
@@ -175,4 +178,4 @@
 /* Driver */
 
 //    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS       INIT        COMPANY                           FULLNAME  FLAGS
-COMP( 1974, mod8, 0,      0,      mod8,    mod8,  mod8_state, empty_init, "Microsystems International Ltd", "MOD-8",  MACHINE_NO_SOUND_HW )
+COMP( 1974, mod8, 0,      0,      mod8,    mod8,  mod8_state, empty_init, "Microsystems International Ltd", "MOD-8",  MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/model2.cpp mame-0.224+dfsg.1/src/mame/drivers/model2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/model2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/model2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -5742,7 +5742,7 @@
 	ROM_LOAD32_WORD("mpr-19325.21",  0x0000002, 0x400000, CRC(7cbe432d) SHA1(8b31e292160b88df9c77b36096914d09ab8b6086) )
 	ROM_LOAD32_WORD("mpr-19323.18",  0x0800000, 0x400000, CRC(453d3f4a) SHA1(8c0530824bb8ecb007021ee6e93412597bb0ecd6) )
 	ROM_LOAD32_WORD("mpr-19326.22",  0x0800002, 0x400000, CRC(b976da02) SHA1(a154eb128604aac9e35438d8811971133eab94a1) )
-	ROM_LOAD32_WORD("mpr-19324.19",  0x1000000, 0x400000, CRC(d972201f) SHA1(1857ffc58697997ee22436586c398eb0c3daba6c) )
+	ROM_LOAD32_WORD("mpr-19324.19",  0x1000000, 0x400000, CRC(0d6bf454) SHA1(4cf48f19128d728c4ec7e9ec7014223a6c0f2362) )
 	ROM_LOAD32_WORD("mpr-19327.23",  0x1000002, 0x400000, CRC(6a75634c) SHA1(8ed74c7afd95fc7a4df0f01a47479b6f44e3073c) )
 
 	ROM_REGION( 0x800000, "textures", 0 ) // Textures
@@ -5762,7 +5762,7 @@
 	MODEL2A_VID_BOARD
 ROM_END
 
-ROM_START( doa ) /* Dead or Alive Revision B, Model 2B, 837-12880 security board */
+ROM_START( doab ) /* Dead or Alive Revision B, Model 2B, 837-12880 security board */
 	ROM_REGION( 0x200000, "maincpu", 0 ) // i960 program
 	ROM_LOAD32_WORD("epr-19379b.15", 0x000000, 0x080000, CRC(8a10a944) SHA1(c675a344f74d0118907fb5292495883c0c30c719) )
 	ROM_LOAD32_WORD("epr-19380b.16", 0x000002, 0x080000, CRC(766c1ec8) SHA1(49250886f66db9fd37d88bc22c8f22046f74f043) )
@@ -5783,7 +5783,48 @@
 	ROM_LOAD32_WORD("mpr-19325.21",  0x0000002, 0x400000, CRC(7cbe432d) SHA1(8b31e292160b88df9c77b36096914d09ab8b6086) )
 	ROM_LOAD32_WORD("mpr-19323.18",  0x0800000, 0x400000, CRC(453d3f4a) SHA1(8c0530824bb8ecb007021ee6e93412597bb0ecd6) )
 	ROM_LOAD32_WORD("mpr-19326.22",  0x0800002, 0x400000, CRC(b976da02) SHA1(a154eb128604aac9e35438d8811971133eab94a1) )
-	ROM_LOAD32_WORD("mpr-19324.19",  0x1000000, 0x400000, CRC(d972201f) SHA1(1857ffc58697997ee22436586c398eb0c3daba6c) )
+	ROM_LOAD32_WORD("mpr-19324.19",  0x1000000, 0x400000, CRC(0d6bf454) SHA1(4cf48f19128d728c4ec7e9ec7014223a6c0f2362) )
+	ROM_LOAD32_WORD("mpr-19327.23",  0x1000002, 0x400000, CRC(6a75634c) SHA1(8ed74c7afd95fc7a4df0f01a47479b6f44e3073c) )
+
+	ROM_REGION( 0x800000, "textures", 0 ) // Textures
+	ROM_LOAD32_WORD("mpr-19321.27", 0x000000, 0x400000, CRC(9c49e845) SHA1(344839640d9814263fa5ed00c2043cd6f18d5cb2) )
+	ROM_LOAD32_WORD("mpr-19320.25", 0x000002, 0x400000, CRC(190c017f) SHA1(4c3250b9abe39fc5c8fd0fcdb5fb7ea131434516) )
+
+	ROM_REGION32_LE( 0x800000, "copro_data", ROMREGION_ERASE00 ) // Copro extra data (collision/height map/etc)
+
+	ROM_REGION( 0x080000, "audiocpu", 0 ) // Sound program
+	ROM_LOAD16_WORD_SWAP("epr-19328.30", 0x000000, 0x080000, CRC(400bdbfb) SHA1(54db969fa54cf3c502d77aa6a6aaeef5d7db9f04) )
+
+	ROM_REGION16_BE( 0x800000, "samples", 0 ) // Samples
+	ROM_LOAD16_WORD_SWAP("mpr-19329.31", 0x000000, 0x200000, CRC(8fd2708a) SHA1(7a341b15afa489aa95af70cb34ac3934b1a7d887) )
+	ROM_LOAD16_WORD_SWAP("mpr-19330.32", 0x200000, 0x200000, CRC(0c69787d) SHA1(dc5870cd93da2babe5fc9c03b252fc6ea6e45721) )
+	ROM_LOAD16_WORD_SWAP("mpr-19331.33", 0x400000, 0x200000, CRC(c18ea0b8) SHA1(0f42458829ae85fffcedd42cd9f728a7a3d75f1c) )
+	ROM_LOAD16_WORD_SWAP("mpr-19332.34", 0x600000, 0x200000, CRC(2877f96f) SHA1(00e5677da30527b862e238f10762a5cbfbabde2b) )
+ROM_END
+
+ROM_START( doa ) /* Dead or Alive Jan 10 1997, probably Revision C, Model 2B, 837-12880 security board */
+	ROM_REGION( 0x200000, "maincpu", 0 ) // i960 program
+	// ROMs have hand written labels - "EPR-19379B / EPR-19380B, 96/12/6", probably was reused and reprogrammed to newer revision
+	ROM_LOAD32_WORD("epr-19379c.15", 0x000000, 0x080000, CRC(5cc62fbe) SHA1(a1489b92f32bcd16cca10017975beb62fc27a060) )
+	ROM_LOAD32_WORD("epr-19380c.16", 0x000002, 0x080000, CRC(58cfeaa9) SHA1(4319c22b8ebcff152676b62b5b1d4c1c7ce64fa6) )
+
+	ROM_REGION32_LE( 0x2000000, "main_data", 0 ) // Data
+	ROM_LOAD32_WORD("mpr-19318.11",  0x0000000, 0x400000, CRC(ab431bfe) SHA1(45b5ccf67c91014daf6bf3c4bd8ec372b246e404) )
+	ROM_LOAD32_WORD("mpr-19319.12",  0x0000002, 0x400000, CRC(c5cb694d) SHA1(448b45d30cc7a71395a49a2c5789989fd7b7b4e7) )
+	ROM_LOAD32_WORD("mpr-19316.9",   0x0800000, 0x400000, CRC(2d2d1b1a) SHA1(77ce5d8aa98bdbc97ae08a452f584b30d8885cfc) )
+	ROM_LOAD32_WORD("mpr-19317.10",  0x0800002, 0x400000, CRC(96b17bcf) SHA1(3aa9d2f8afad74b5626ce2cf2d7a86aef8cac80b) )
+	ROM_LOAD32_WORD("mpr-19314.7",   0x1000000, 0x400000, CRC(a8d963fb) SHA1(6a1680d6380321279b0d701e4b47d4ae712f3b72) )
+	ROM_LOAD32_WORD("mpr-19315.8",   0x1000002, 0x400000, CRC(90ae5682) SHA1(ec56df14f0847daf9bd0435f785a8946c94d2988) )
+	ROM_LOAD32_WORD("mpr-19312.5",   0x1800000, 0x200000, CRC(1dcedb10) SHA1(a60fb9e7c0731004d0f0ff28c4cde272b21dd658) )
+	ROM_LOAD32_WORD("mpr-19313.6",   0x1800002, 0x200000, CRC(8c63055e) SHA1(9f375b3f4a8884163ffcf364989499f2cd21e18b) )
+	ROM_COPY("main_data", 0x1800000, 0x1c00000, 0x400000 )
+
+	ROM_REGION( 0x2000000, "polygons", ROMREGION_ERASEFF ) // Models
+	ROM_LOAD32_WORD("mpr-19322.17",  0x0000000, 0x400000, CRC(d0e6ecf0) SHA1(1b87f6337b4286fd738856da899462e7baa92601) )
+	ROM_LOAD32_WORD("mpr-19325.21",  0x0000002, 0x400000, CRC(7cbe432d) SHA1(8b31e292160b88df9c77b36096914d09ab8b6086) )
+	ROM_LOAD32_WORD("mpr-19323.18",  0x0800000, 0x400000, CRC(453d3f4a) SHA1(8c0530824bb8ecb007021ee6e93412597bb0ecd6) )
+	ROM_LOAD32_WORD("mpr-19326.22",  0x0800002, 0x400000, CRC(b976da02) SHA1(a154eb128604aac9e35438d8811971133eab94a1) )
+	ROM_LOAD32_WORD("mpr-19324.19",  0x1000000, 0x400000, CRC(0d6bf454) SHA1(4cf48f19128d728c4ec7e9ec7014223a6c0f2362) )
 	ROM_LOAD32_WORD("mpr-19327.23",  0x1000002, 0x400000, CRC(6a75634c) SHA1(8ed74c7afd95fc7a4df0f01a47479b6f44e3073c) )
 
 	ROM_REGION( 0x800000, "textures", 0 ) // Textures
@@ -7101,7 +7142,8 @@
 GAME( 1996, lastbrnx,  0,        model2b,      vf2,       model2b_state, empty_init,    ROT0, "Sega",   "Last Bronx (Export, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
 GAME( 1996, lastbrnxu, lastbrnx, model2b,      vf2,       model2b_state, empty_init,    ROT0, "Sega",   "Last Bronx (USA, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
 GAME( 1996, lastbrnxj, lastbrnx, model2b,      vf2,       model2b_state, empty_init,    ROT0, "Sega",   "Last Bronx (Japan, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
-GAME( 1996, doa,       0,        model2b_0229, doa,       model2b_state, init_doa,      ROT0, "Tecmo",  "Dead or Alive (Model 2B, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
+GAME( 1996, doab,      doa,      model2b_0229, doa,       model2b_state, init_doa,      ROT0, "Tecmo",  "Dead or Alive (Model 2B, Revision B)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) // Dec 4 1996
+GAME( 1996, doa,       0,        model2b_0229, doa,       model2b_state, init_doa,      ROT0, "Tecmo",  "Dead or Alive (Model 2B, Revision C)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS ) // Jan 10 1997
 GAME( 1996, sgt24h,    0,        overrev2b,    sgt24h,    model2b_state, init_sgt24h,   ROT0, "Jaleco", "Super GT 24h", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
 GAME( 1996, powsled,   0,        powsled,      powsled,   model2b_state, empty_init,    ROT0, "Sega",   "Power Sled (Slave, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
 GAME( 1996, powsledr,  powsled,  powsled,      powsled,   model2b_state, empty_init,    ROT0, "Sega",   "Power Sled (Relay, Revision A)", MACHINE_NOT_WORKING|MACHINE_IMPERFECT_GRAPHICS )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/model3.cpp mame-0.224+dfsg.1/src/mame/drivers/model3.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/model3.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/model3.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -735,6 +735,8 @@
 #include "includes/model3.h"
 
 #include "cpu/m68000/m68000.h"
+#include "cpu/z80/kl5c80a16.h"
+#include "machine/315_5296.h"
 #include "machine/clock.h"
 #include "machine/eepromser.h"
 #include "machine/53c810.h"
@@ -6006,6 +6008,31 @@
 	MCFG_MACHINE_RESET_OVERRIDE(model3_state,model3_10)
 }
 
+void model3_state::getbass_iocpu_mem(address_map &map)
+{
+	map(0x00000, 0x0efff).rom();
+	map(0x0f000, 0x0ffff).ram();
+}
+
+void model3_state::getbass_iocpu_io(address_map &map)
+{
+	map.global_mask(0xff);
+	map(0x60, 0x6f).rw("io60", FUNC(sega_315_5296_device::read), FUNC(sega_315_5296_device::write));
+	map(0x70, 0x7f).rw("io70", FUNC(sega_315_5649_device::read), FUNC(sega_315_5649_device::write));
+}
+
+void model3_state::getbass(machine_config &config)
+{
+	model3_10(config);
+
+	kl5c80a16_device &iocpu(KL5C80A16(config, "iocpu", 32_MHz_XTAL / 2));
+	iocpu.set_addrmap(AS_PROGRAM, &model3_state::getbass_iocpu_mem);
+	iocpu.set_addrmap(AS_IO, &model3_state::getbass_iocpu_io);
+
+	SEGA_315_5296(config, "io60", 32_MHz_XTAL);
+	SEGA_315_5649(config, "io70", 0);
+}
+
 void model3_state::model3_15(machine_config &config)
 {
 	add_cpu_100mhz(config);
@@ -6469,7 +6496,7 @@
 GAME( 1996, vf3tb,        vf3, model3_10, model3, model3_state,  init_model3_10, ROT0, "Sega", "Virtua Fighter 3 Team Battle", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 GAME( 1997, bass,           0, model3_10, bass,   model3_state,       init_bass, ROT0, "Sega", "Sega Bass Fishing", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 GAME( 1997, bassdx,      bass, model3_10, bass,   model3_state,    init_getbass, ROT0, "Sega", "Sega Bass Fishing Deluxe", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-GAME( 1997, getbass,     bass, model3_10, bass,   model3_state,    init_getbass, ROT0, "Sega", "Get Bass", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+GAME( 1997, getbass,     bass,   getbass, bass,   model3_state,    init_getbass, ROT0, "Sega", "Get Bass", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 
 /* Model 3 Step 1.5 */
 GAME( 1996, scud,           0,      scud, scud,     model3_state,     init_scud, ROT0, "Sega", "Scud Race Twin (Australia)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/monkey_king_3b.cpp mame-0.224+dfsg.1/src/mame/drivers/monkey_king_3b.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/monkey_king_3b.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/monkey_king_3b.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,252 @@
+// license:BSD-3-Clause
+// copyright-holders:David Shah
+
+/*
+
+Monkey King SoCs (currently only 3B is supported)
+
+Presumably-custom ARM-based system-on-chips by Digital Media Cartridge (DMC).
+Intended to run NES and Genesis emulators, primarily for ATgames systems.
+
+Sometimes abbreviated MK. It is a successor of the Titan SoC used in previous
+emulation based ATgames systems.
+
+Monkey King and Monkey 2: Presumed custom. Used in some ATgames/Blaze
+Genesis systems and the Atari Flashback Portable.
+
+Monkey King 3 and Monkey King 3B: Presumed custom. Used in the ATgames
+BLAST system and the RS-70 648-in-1 "PS1 form factor" clone. Supports
+HDMI output.
+
+Monkey King 3.6: not a custom part but a rebranded RK3036, usually
+running a cut-down Android based OS. Used in newer ATgames systems.
+
+The typical configuration of the Monkey King SoCs (other than the
+3.6) is with 8/16MB of SDRAM, NOR flash for the firmware and
+built-in games, and a SD card for additional games.
+
+The RS-70 is notable for having a debug UART on the USB port
+(serial TX on D+, 115200). It prints the following messages on boot:
+
+    EXEC: Executing 'boot' with 0 args (ZLib ON)...
+    EXEC: Loading 'boot' at 0x18000000...
+    EXEC: Loaded 372272 bytes of 2097152 available.
+
+This is different from the serial output that this emulation model
+currently produces. Perhaps one of the unimplemented IO is causing
+it to go into some kind of debug mode. The log output produced by
+this machine is:
+
+    Modes:0x00000000
+    PUT: Setting joystick to mode 0x0, timer to 250us
+
+    ******************************************************
+     MK FIRMWARE INFORMATION
+     Mode:       0xB4
+     Build Time: May  8 2019 14:09:21
+     CPU Clock:  240MHz
+     TFS Start:  0x8070000
+     Video Buf:  0x6000000
+     Stack Top:  0x3001EE8
+     IWRAM Size: 32kB
+     EVRAM Size: 16384kB
+     Heap Size:  6144kB at 0x18200000
+     Video Mode: 0
+     Video Size: 1280x720x16bpp
+    ******************************************************
+
+There are other strings in the ROM that imply there may be more serial
+debug possibilities.
+
+TODO:
+    implement everything
+    add dumps of more Monkey King systems
+*/
+
+#include "emu.h"
+#include "cpu/arm7/arm7.h"
+#include "cpu/arm7/arm7core.h"
+#include "emupal.h"
+#include "screen.h"
+
+class mk3b_soc_state : public driver_device
+{
+public:
+	mk3b_soc_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag),
+		m_iram0(*this, "iram0"),
+		m_iram3(*this, "iram3"),
+		m_sdram(*this, "sdram"),
+		m_maincpu(*this, "maincpu"),
+		m_screen(*this, "screen")
+	{ }
+
+	void mk3b_soc(machine_config &config);
+
+	void init_rs70();
+
+private:
+	required_shared_ptr<uint32_t> m_iram0, m_iram3;
+	required_shared_ptr<uint32_t> m_sdram;
+	required_device<cpu_device> m_maincpu;
+	required_device<screen_device> m_screen;
+
+	virtual void machine_reset() override;
+	virtual void video_start() override;
+	uint32_t io4_r(offs_t offset, uint32_t mem_mask = ~0);
+	void io4_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+
+	uint32_t io7_r(offs_t offset, uint32_t mem_mask = ~0);
+	void io7_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+
+	uint32_t io10_r(offs_t offset, uint32_t mem_mask = ~0);
+	void io10_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+
+	uint32_t screen_update_mk3b_soc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+	void map(address_map &map);
+	std::string debug_buf;
+};
+
+
+void mk3b_soc_state::map(address_map &map)
+{
+	// 64MB external NOR flash
+	map(0x08000000, 0x0BFFFFFF).rom().share("norflash").region("norflash", 0x0);;
+	// unknown amount and configuration of internal RAM
+	map(0x00000000, 0x0000FFFF).ram().share("iram0");
+	// This section of RAM seems to contain the stack
+	map(0x03000000, 0x0300FFFF).ram().share("iram3");
+
+	// 16MB of external SDRAM
+	map(0x18000000, 0x18FFFFFF).ram().share("sdram");
+	// IO is totally unknown for now
+	map(0x04000000, 0x0400FFFF).rw(FUNC(mk3b_soc_state::io4_r), FUNC(mk3b_soc_state::io4_w));
+	map(0x07000000, 0x0700FFFF).rw(FUNC(mk3b_soc_state::io7_r), FUNC(mk3b_soc_state::io7_w));
+	map(0x10000000, 0x1000FFFF).rw(FUNC(mk3b_soc_state::io10_r), FUNC(mk3b_soc_state::io10_w));
+}
+
+static INPUT_PORTS_START( mk3b_soc )
+
+INPUT_PORTS_END
+
+void mk3b_soc_state::video_start()
+{
+}
+
+void mk3b_soc_state::machine_reset()
+{
+	// In practice, this will probably be done by a small
+	// internal boot ROM.
+	m_iram0[0] = 0xe59f0000; // ldr r0, [pc]
+	m_iram0[1] = 0xe12fff10; // bx, r0
+	m_iram0[2] = 0x08000000; // target address
+}
+
+uint32_t mk3b_soc_state::screen_update_mk3b_soc(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+{
+	return 0;
+}
+
+void mk3b_soc_state::mk3b_soc(machine_config &config)
+{
+	// type unknown (should actually have VFP?)
+	// debug output suggests 240MHz clock
+	ARM920T(config, m_maincpu, 240000000);
+	m_maincpu->set_addrmap(AS_PROGRAM, &mk3b_soc_state::map);
+
+	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+	m_screen->set_refresh_hz(60);
+	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500) /* not accurate */);
+	m_screen->set_size(1280, 720);
+	m_screen->set_visarea(0, 1280-1, 0, 720-1);
+	m_screen->set_screen_update(FUNC(mk3b_soc_state::screen_update_mk3b_soc));
+}
+
+uint32_t mk3b_soc_state::io4_r(offs_t offset, uint32_t mem_mask)
+{
+	switch (offset) {
+		case 0x01:
+			return (m_screen->vblank() << 27) | m_screen->vblank(); // who knows? seems to need to toggle between 0 and 1
+		default:
+			logerror("%s: IO 0x04 read 0x%04X\n", machine().describe_context(), offset);
+			return 0x00;
+	}
+}
+
+void mk3b_soc_state::io4_w(offs_t offset, uint32_t data, uint32_t mem_mask)
+{
+	logerror("%s: IO 0x04 write 0x%04X 0x%08X & 0x%08X\n", machine().describe_context(), offset, data, mem_mask);
+}
+
+
+uint32_t mk3b_soc_state::io7_r(offs_t offset, uint32_t mem_mask)
+{
+	switch (offset) {
+		case 0x21: // video size
+			return (1280 << 16) | (720);
+		default:
+			logerror("%s: IO 0x07 read 0x%04X\n", machine().describe_context(), offset);
+			return 0x00;
+	}
+}
+
+void mk3b_soc_state::io7_w(offs_t offset, uint32_t data, uint32_t mem_mask)
+{
+	logerror("%s: IO 0x07 write 0x%04X 0x%08X & 0x%08X\n", machine().describe_context(), offset, data, mem_mask);
+}
+
+uint32_t mk3b_soc_state::io10_r(offs_t offset, uint32_t mem_mask)
+{
+	switch (offset) {
+		// Definitely not correct, but toggling somehow keeps things moving
+		case 0x148:
+		case 0x149:
+			return m_screen->vblank() ? 0x00000000 : 0xFFFFFFFF;
+		default:
+			logerror("%s: IO 0x10 read 0x%04X\n", machine().describe_context(), offset);
+			return 0x00;
+	}
+}
+
+void mk3b_soc_state::io10_w(offs_t offset, uint32_t data, uint32_t mem_mask)
+{
+	switch (offset) {
+		case 0x148: { // debug UART
+			char c =  data & 0xFF;
+			logerror("%s: UART W: %c\n", machine().describe_context(), c);
+			if (c == '\n') {
+				logerror("%s: [DEBUG] %s\n", machine().describe_context(), debug_buf.c_str());
+				debug_buf.clear();
+			} else if (c != '\r') {
+				debug_buf += c;
+			}
+			break;
+		}
+		default:
+			logerror("%s: IO 0x10 write 0x%04X 0x%08X & 0x%08X\n", machine().describe_context(), offset, data, mem_mask);
+	}
+}
+
+void mk3b_soc_state::init_rs70()
+{
+	// Uppermost address bit seems to be inverted
+	uint8_t *ROM = memregion("norflash")->base();
+	int size = memregion("norflash")->bytes();
+
+	for (int i = 0; i < (size / 2); i++) {
+		std::swap(ROM[i], ROM[i + (size / 2)]);
+	}
+	// FIXME: Work around missing FPU for now
+	ROM[0x32f24] = 0x00;
+	ROM[0x32f25] = 0x00;
+	ROM[0x32f26] = 0x00;
+	ROM[0x32f27] = 0x00;
+}
+
+
+ROM_START( rs70_648 )
+	ROM_REGION(0x04000000, "norflash", 0)
+	ROM_LOAD("s29gl512p.bin", 0x000000, 0x04000000, CRC(cb452bd7) SHA1(0b19a13a3d0b829725c10d64d7ff852ff5202ed0) )
+ROM_END
+
+CONS( 2019, rs70_648,  0,        0, mk3b_soc, mk3b_soc, mk3b_soc_state, init_rs70, "<unknown>", "RS-70 648-in-1",      MACHINE_IS_SKELETON )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mpu4.cpp mame-0.224+dfsg.1/src/mame/drivers/mpu4.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mpu4.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mpu4.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,6 +1,6 @@
 // license:BSD-3-Clause
 // copyright-holders:David Haywood
-/* these are the MPU4 set listings / set specific code, for hardware emulation see mpu4hw.c */
+/* these are the MPU4 set listings / set specific code, for hardware emulation see machine/mpu4.cpp */
 
 /* todo: driver inits (basic hw reel, protection configs etc.) should probably be moved here
          once the actual code for them is cleaned up and can be put into neater structures
@@ -270,6 +270,15 @@
 	M4CHASEI_EXTRAS
 ROM_END
 
+ROM_START( m4chaseig )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_20.10", 0x0000, 0x010000, CRC(80a4bfb3) SHA1(b3c11bd621457d190eeab423bc15895b0c7cf6da) ) // found in cash inferno set.
+	M4CHASEI_EXTRAS
+ROM_END
+
+
+
+
 
 
 ROM_START( m4c9c )
@@ -2459,11 +2468,14 @@
 
 // won't boot with current reel setup, not even in test mode
 GAME(199?, m4maglin,  0,          mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","Magic Liner (Barcrest) (MPU4) (DMA2.1)",GAME_FLAGS )
+
 GAME(199?, m4magdrg,  0,          mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","Magic Dragon (Barcrest) (MPU4) (DMD1.0)",GAME_FLAGS )
+
 GAME(199?, m4clbveg,  0,          mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","Club Vegas (Barcrest) (MPU4) (set 1)",GAME_FLAGS )
 GAME(199?, m4clbvega, m4clbveg,   mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","Club Vegas (Barcrest) (MPU4) (set 2)",GAME_FLAGS )
 GAME(199?, m4clbvegb, m4clbveg,   mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","Club Vegas (Barcrest) (MPU4) (set 3)",GAME_FLAGS )
 GAME(199?, m4clbvegc, m4clbveg,   mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","Club Vegas (Barcrest) (MPU4) (set 4)",GAME_FLAGS )
+
 GAME(199?, m4chasei,  0,          mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","Chase Invaders (Barcrest) (MPU4) (set 1)",GAME_FLAGS )
 GAME(199?, m4chaseia, m4chasei,   mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","Chase Invaders (Barcrest) (MPU4) (set 2)",GAME_FLAGS )
 GAME(199?, m4chaseib, m4chasei,   mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","Chase Invaders (Barcrest) (MPU4) (set 3)",GAME_FLAGS )
@@ -2471,6 +2483,7 @@
 GAME(199?, m4chaseid, m4chasei,   mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","Chase Invaders (Barcrest) (MPU4) (set 5)",GAME_FLAGS )
 GAME(199?, m4chaseie, m4chasei,   mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","Chase Invaders (Barcrest) (MPU4) (set 6)",GAME_FLAGS )
 GAME(199?, m4chaseif, m4chasei,   mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","Chase Invaders (Barcrest) (MPU4) (set 7)",GAME_FLAGS )
+GAME(199?, m4chaseig, m4chasei,   mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "hack",    "Chase Invaders (Barcrest) (MPU4) (set 8)",GAME_FLAGS ) // copyright removed
 
 GAME(199?, m4bluedm,  0,          mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","Blue Diamond (Barcrest) (MPU4) (DBD1.0)",GAME_FLAGS )
 GAME(199?, m4amhiwy,  0,          mod4oki_alt,mpu4,    mpu4_state, init_m4altreels, ROT0,   "Barcrest","American Highway (Barcrest) (MPU4) (DAH)",GAME_FLAGS )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mpu4mod4yam.cpp mame-0.224+dfsg.1/src/mame/drivers/mpu4mod4yam.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mpu4mod4yam.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mpu4mod4yam.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -282,20 +282,37 @@
 	ROM_END \
 	GAME(year, setname, parent, mod4yam, mpu4, mpu4_state, init_m4_showstring, ROT0, company, title, GAME_FLAGS )
 
-GAME_CUSTOM( 199?, m4monte,     0,          "nm8b.p1",  0x0000, 0x010000, CRC(1632080e) SHA1(9ca2cd8f00e49c29f4a216d3c9eacba221ada6ce), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 1)" )
-GAME_CUSTOM( 199?, m4monte__a,  m4monte,    "nm8ad.p1", 0x0000, 0x010000, CRC(92a07e05) SHA1(94015b219fffb8ad9a40a804a4e0b0fad61cdf21), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 2)" )
-GAME_CUSTOM( 199?, m4monte__b,  m4monte,    "nm8bd.p1", 0x0000, 0x010000, CRC(a4bc134f) SHA1(72af6b66a5ea7566289bd9bdf8975c29dbb547cf), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 3)" )
-GAME_CUSTOM( 199?, m4monte__c,  m4monte,    "nm8c.p1",  0x0000, 0x010000, CRC(7e558a64) SHA1(9f325aa9a5b036c317686b901b4c65c1e23fd845), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 4)" )
-GAME_CUSTOM( 199?, m4monte__d,  m4monte,    "nm8d.p1",  0x0000, 0x010000, CRC(66716e7d) SHA1(719d32a3486accfa1c2e8e2ca53c05f916927e7a), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 5)" )
-GAME_CUSTOM( 199?, m4monte__e,  m4monte,    "nm8dk.p1", 0x0000, 0x010000, CRC(ae4866e8) SHA1(5ec210b6b69f72b85abe5844b800b251fef20fc5), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 6)" )
-GAME_CUSTOM( 199?, m4monte__f,  m4monte,    "nm8dy.p1", 0x0000, 0x010000, CRC(9d6f71a5) SHA1(577d39eef82761fff30f851282cd85b84ac22953), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 7)" )
-GAME_CUSTOM( 199?, m4monte__g,  m4monte,    "nm8k.p1",  0x0000, 0x010000, CRC(47c00612) SHA1(647216e7489043f90e0cd807ddc3d631842b3f7f), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 8)" )
-GAME_CUSTOM( 199?, m4monte__h,  m4monte,    "nm8s.p1",  0x0000, 0x010000, CRC(cf8fd333) SHA1(4b2b98d0c3d043a6425a6d82f7a98cf662582832), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 9)" )
-GAME_CUSTOM( 199?, m4monte__i,  m4monte,    "nm8y.p1",  0x0000, 0x010000, CRC(cbb96053) SHA1(9fb6c449d8e26ecacfa9ba40979134c705ecb1be), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 10)" )
-GAME_CUSTOM( 199?, m4monte__j,  m4monte,    "nmnc.p1",  0x0000, 0x010000, CRC(c2fdcc91) SHA1(aa3ec11425adee94c24b3a1472541e7e04e4000a), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 11)" )
-GAME_CUSTOM( 199?, m4monte__k,  m4monte,    "nmnd.p1",  0x0000, 0x010000, CRC(94985809) SHA1(636b9106ea330a238f3d4168636fbf21021a7216), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 12)" )
-GAME_CUSTOM( 199?, m4monte__l,  m4monte,    "nmnk.p1",  0x0000, 0x010000, CRC(8d022ae6) SHA1(01e12acbed34a2d4fb81dc9da12441ddc31f605b), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 13)" )
-GAME_CUSTOM( 199?, m4monte__m,  m4monte,    "nmns.p1",  0x0000, 0x010000, CRC(48e2ab70) SHA1(bc452a36374a6e62516aad1a4887876ee9da37f7), "Barcrest","Monte Carlo (Barcrest) (MPU4) (set 14)" )
+GAME_CUSTOM( 199?, m4monte,     0,          "nm8b.p1",  0x0000, 0x010000, CRC(1632080e) SHA1(9ca2cd8f00e49c29f4a216d3c9eacba221ada6ce), "Barcrest","Monte Carlo (NM8 0.1 B) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 199?, m4monte__a,  m4monte,    "nm8ad.p1", 0x0000, 0x010000, CRC(92a07e05) SHA1(94015b219fffb8ad9a40a804a4e0b0fad61cdf21), "Barcrest","Monte Carlo (NM8 0.1 AD) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 199?, m4monte__b,  m4monte,    "nm8bd.p1", 0x0000, 0x010000, CRC(a4bc134f) SHA1(72af6b66a5ea7566289bd9bdf8975c29dbb547cf), "Barcrest","Monte Carlo (NM8 0.1 BD) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 199?, m4monte__c,  m4monte,    "nm8c.p1",  0x0000, 0x010000, CRC(7e558a64) SHA1(9f325aa9a5b036c317686b901b4c65c1e23fd845), "Barcrest","Monte Carlo (NM8 0.1 C) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 199?, m4monte__d,  m4monte,    "nm8d.p1",  0x0000, 0x010000, CRC(66716e7d) SHA1(719d32a3486accfa1c2e8e2ca53c05f916927e7a), "Barcrest","Monte Carlo (NM8 0.1 D) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 199?, m4monte__e,  m4monte,    "nm8dk.p1", 0x0000, 0x010000, CRC(ae4866e8) SHA1(5ec210b6b69f72b85abe5844b800b251fef20fc5), "Barcrest","Monte Carlo (NM8 0.1 KD) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 199?, m4monte__f,  m4monte,    "nm8dy.p1", 0x0000, 0x010000, CRC(9d6f71a5) SHA1(577d39eef82761fff30f851282cd85b84ac22953), "Barcrest","Monte Carlo (NM8 0.1 YD) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 199?, m4monte__g,  m4monte,    "nm8k.p1",  0x0000, 0x010000, CRC(47c00612) SHA1(647216e7489043f90e0cd807ddc3d631842b3f7f), "Barcrest","Monte Carlo (NM8 0.1 K) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 199?, m4monte__h,  m4monte,    "nm8s.p1",  0x0000, 0x010000, CRC(cf8fd333) SHA1(4b2b98d0c3d043a6425a6d82f7a98cf662582832), "Barcrest","Monte Carlo (NM8 0.1) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 199?, m4monte__i,  m4monte,    "nm8y.p1",  0x0000, 0x010000, CRC(cbb96053) SHA1(9fb6c449d8e26ecacfa9ba40979134c705ecb1be), "Barcrest","Monte Carlo (NM8 0.1 Y) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 199?, m4monte__j,  m4monte,    "nmnc.p1",  0x0000, 0x010000, CRC(c2fdcc91) SHA1(aa3ec11425adee94c24b3a1472541e7e04e4000a), "Barcrest","Monte Carlo (NMN 0.1 C) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 199?, m4monte__k,  m4monte,    "nmnd.p1",  0x0000, 0x010000, CRC(94985809) SHA1(636b9106ea330a238f3d4168636fbf21021a7216), "Barcrest","Monte Carlo (NMN 0.1 D) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 199?, m4monte__l,  m4monte,    "nmnk.p1",  0x0000, 0x010000, CRC(8d022ae6) SHA1(01e12acbed34a2d4fb81dc9da12441ddc31f605b), "Barcrest","Monte Carlo (NMN 0.1 K) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 199?, m4monte__m,  m4monte,    "nmns.p1",  0x0000, 0x010000, CRC(48e2ab70) SHA1(bc452a36374a6e62516aad1a4887876ee9da37f7), "Barcrest","Monte Carlo (NMN 0.1) (Barcrest) (MPU4)" )
+// this might be a different game
+GAME_CUSTOM( 1991, m4montez,    m4monte,    "montvnd",  0x0000, 0x010000, CRC(9858bb1d) SHA1(a2d3de2cec7420cc6f7da2239bdc79d7c4b7394e), "Barcrest","Monte Carlo (MSS 1.6 C) (Barcrest) (MPU4)" )
+// this might be a different game
+GAME_CUSTOM( 1995, m4monteza,   m4monte,    "mx_05a__.2_1", 0x0000, 0x010000, CRC(a1a03e03) SHA1(bf49b516e6824a47cd9bf1408bf676f9f1e43d62), "BwB","Monte Carlo (MX052.0 K) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 1995, m4montezi,   m4monte,    "mxi05___.2_1", 0x0000, 0x010000, CRC(de425b55) SHA1(2aa63bbd32c766e7e2d888345115c3185dc03bff), "BwB","Monte Carlo (MX052.0 C) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 1995, m4montezb,   m4monte,    "mx_10a__.2_1", 0x0000, 0x010000, CRC(bbf21e9f) SHA1(901b14b96cdb0945f491c39707ab9d2b9a2d25dd), "BwB","Monte Carlo (MX102.0 K) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 1995, m4montezj,   m4monte,    "mxi10___.2_1", 0x0000, 0x010000, CRC(19077425) SHA1(e31da38a903345c65b083cac192555f1f4ba2e5a), "BwB","Monte Carlo (MX102.0 C) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 1996, m4montezc,   m4monte,    "mx_20__c.1_1", 0x0000, 0x010000, CRC(a753798d) SHA1(ae1f5f14a37dead66f6b2d075a5bfc019d59f806), "BwB","Monte Carlo (MC  2.0 C) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 1996, m4montezd,   m4monte,    "mx_20a_c.1_1", 0x0000, 0x010000, CRC(9ec6f5fb) SHA1(ee181a64557053349cc8bff86bba937b191cab01), "BwB","Monte Carlo (MC  2.0 K) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 1996, m4monteze,   m4monte,    "mx_20dkc.1_1", 0x0000, 0x010000, CRC(d580f742) SHA1(3c1d6aba4068d60ab53eceecf65bc920f8b5604e), "BwB","Monte Carlo (MC  2.0 YD) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 1996, m4montezf,   m4monte,    "mx_25__c.3_1", 0x0000, 0x010000, CRC(11ae121d) SHA1(11e61db1c645410ac18ef429cde167a7774be5f5), "BwB","Monte Carlo (MC_ 3.0 C) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 1996, m4montezh,   m4monte,    "mx_25a_c.3_1", 0x0000, 0x010000, CRC(283b9e6b) SHA1(937da8bda49a7a0fa1f728770f96d10a65bfe7bc), "BwB","Monte Carlo (MC_ 3.0 K) (Barcrest) (MPU4)" )
+GAME_CUSTOM( 1996, m4montezg,   m4monte,    "mx_25_bc.3_1", 0x0000, 0x010000, CRC(4228139c) SHA1(a448ddc034923cba58ee298fd2a4c2cdd4f84f04), "BwB","Monte Carlo (MC_ 3.0 YD) (Barcrest) (MPU4)" )
+
+
+
+
 
 #undef GAME_CUSTOM
 #define GAME_CUSTOM(year, setname,parent,name,offset,length,hash,company,title) \
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mpu4plasma.cpp mame-0.224+dfsg.1/src/mame/drivers/mpu4plasma.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mpu4plasma.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mpu4plasma.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -173,8 +173,8 @@
 
 #define M4APACH_PLASMA \
 	ROM_REGION( 0x40000, "plasmacpu", 0 ) \
-	ROM_LOAD16_BYTE( "plasma.p0", 0x00000, 0x010000, NO_DUMP ) \
-	ROM_LOAD16_BYTE( "plasma.p1", 0x00001, 0x010000, NO_DUMP )
+	ROM_LOAD16_BYTE( "a6ppl.p0", 0x00000, 0x020000, CRC(350da2df) SHA1(a390e0c7e1e624c17f0e254e0b99ef9dbf56269d) ) \
+	ROM_LOAD16_BYTE( "a6ppl.p1", 0x00001, 0x020000, CRC(63038aba) SHA1(8ec4e02109e872460a9598e469b59919cc5450dd) ) \
 
 ROM_START( m4apach )
 	ROM_REGION( 0x10000, "maincpu", 0 )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mpu4vid.cpp mame-0.224+dfsg.1/src/mame/drivers/mpu4vid.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mpu4vid.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mpu4vid.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -167,13 +167,12 @@
 
 TODO:
       - Correctly implement characteriser protection for each game.
-      - Get the BwB games running
+      - Get the BWB games running
         * They have a slightly different 68k memory map. The 6850 is at e00000 and the 6840 is at e01000
         They appear to hang on the handshake with the MPU4 board
-      - Find out what causes the games to hang/reset in service mode
-        Probably down to AVDC interrupt timing, there seem to be a number of race conditions re: masks
-        that need sorting out with proper blank handling, etc. I'm using a scanline timer to drive an
-        approximation of the SCN2674 scanline logic, but this is perhaps better served as a proper device.
+      - Layouts needed for the other working games, and DIP switches need checking/altering (no test mode?)
+      - BWB Vid5 cabinets seem to have the speakers wired the other way according to test (left/right swapped)
+      - BWB sampled sound seems to not play despite hookup.
  ***********************************************************************************************************/
 #include "emu.h"
 #include "includes/mpu4.h"
@@ -203,22 +202,18 @@
 
 #include "crmaze2p.lh"
 #include "crmaze4p.lh"
+#include "v4addlad.lh"
+#include "v4barqst.lh"
+#include "v4psi.lh"
+#include "v4strike.lh"
 
 
 class mpu4vid_state : public mpu4_state
 {
 public:
-	struct bt471_t
-	{
-		uint8_t address;
-		uint8_t addr_cnt;
-		uint8_t pixmask;
-		uint8_t command;
-		rgb_t color;
-	};
 
-	mpu4vid_state(const machine_config &mconfig, device_type type, const char *tag)
-		: mpu4_state(mconfig, type, tag),
+	mpu4vid_state(const machine_config &mconfig, device_type type, const char *tag) :
+		mpu4_state(mconfig, type, tag),
 		m_videocpu(*this, "video"),
 		m_scn2674(*this, "scn2674_vid"),
 		m_vid_vidram(*this, "vid_vidram"),
@@ -228,15 +223,25 @@
 		m_ptm(*this, "6840ptm_68k"),
 		m_trackx_port(*this, "TRACKX"),
 		m_tracky_port(*this, "TRACKY"),
-		m_gfxdecode(*this, "gfxdecode")
+		m_gfxdecode(*this, "gfxdecode"),
+		m_ef9369(*this, "ef9369"),
+		m_4krow(0),
+		m_4ktable(nullptr)
 	{
 	}
 
 	void mpu4_vid(machine_config &config);
+	void mpu4_vid_strike(machine_config &config);
+
 	void bwbvid(machine_config &config);
 	void crmaze(machine_config &config);
-	void bwbvid5(machine_config &config);
+	void bwbvid_oki(machine_config &config);
+	void bwbvid_oki_bt471(machine_config &config);
+
+	void bwbvid_oki_bt471_german(machine_config &config);
+
 	void mating(machine_config &config);
+	void vid_oki(machine_config &config);
 
 	void init_crmazea();
 	void init_v4barqst2();
@@ -253,13 +258,14 @@
 	void init_strikeit();
 	void init_v4wize();
 	void init_turnover();
-	void init_adders();
+	//void init_adders();
 	void init_mating();
 	void init_crmaze3a();
 	void init_skiltrek();
 	void init_crmaze3();
 	void init_cybcas();
-
+	void init_v4frfact();
+	void init_bwbhack();
 private:
 	required_device<m68000_base_device> m_videocpu;
 	optional_device<scn2674_device> m_scn2674;
@@ -272,7 +278,7 @@
 	optional_ioport m_tracky_port;
 	required_device<gfxdecode_device> m_gfxdecode;
 
-	struct bt471_t m_bt471;
+	optional_device<ef9369_device> m_ef9369;
 
 	//Video
 	uint8_t m_m6840_irq_state;
@@ -296,19 +302,40 @@
 	uint16_t mpu4_vid_vidram_r(offs_t offset);
 	void mpu4_vid_vidram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	EF9369_COLOR_UPDATE(ef9369_color_update);
-	void bt471_w(offs_t offset, uint8_t data);
-	uint8_t bt471_r(offs_t offset);
+
 	void vidcharacteriser_w(offs_t offset, uint8_t data);
 	uint8_t vidcharacteriser_r(offs_t offset);
 	DECLARE_WRITE_LINE_MEMBER(mpu_video_reset);
 	void vram_w(offs_t offset, uint8_t data);
 	uint8_t vram_r(offs_t offset);
+	void ic3ss_vid_w(offs_t offset, uint8_t data);
 
-	void bwbvid5_68k_map(address_map &map);
+	void bwbvidoki_68k_base_map(address_map &map);
+	void bwbvidoki_68k_map(address_map &map);
+	void bwbvidoki_68k_bt471_map(address_map &map);
 	void bwbvid_68k_map(address_map &map);
+	void mpu4_68k_map_base(address_map &map);
 	void mpu4_68k_map(address_map &map);
+	void mpu4_68k_map_strike(address_map &map);
 	void mpu4_vram(address_map &map);
 	void mpu4oki_68k_map(address_map &map);
+
+	void mpu4_6809_german_map(address_map &map);
+
+	void vidcharacteriser_4k_lookup_w(offs_t offset, uint8_t data);
+	uint8_t vidcharacteriser_4k_lookup_r(offs_t offset);
+	uint8_t m_4krow;
+	uint8_t *m_4ktable;
+	void hack_bwb_startup_protection();
+
+	uint8_t mpu4_vid_bt_a00004_r(offs_t offset);
+	void mpu4_vid_bt_a00002_w(offs_t offset, uint8_t data);
+	void mpu4_vid_bt_a00008_w(offs_t offset, uint8_t data);
+	uint8_t m_bt_palbase;
+	uint8_t m_bt_which;
+	uint8_t m_btpal_r[0x100];
+	uint8_t m_btpal_g[0x100];
+	uint8_t m_btpal_b[0x100];
 };
 
 /*************************************
@@ -417,8 +444,42 @@
 		uint16_t tile = m_vid_mainram[address & 0x7fff];
 		const uint8_t *line = m_gfxdecode->gfx(m_gfx_index+0)->get_data(tile & 0xfff);
 		int offset = m_gfxdecode->gfx(m_gfx_index+0)->rowbytes() * linecount;
-		for(int i = 0; i < 8; i++)
-			bitmap.pix32(y, x + i) = (tile >> 12) ? m_palette->pen(line[offset + i]) : m_palette->black_pen();
+
+		for (int i = 0; i < 8; i++)
+		{
+			uint8_t pen = line[offset + i];
+			int extra = tile >> 12;
+
+			if (m_ef9369)
+			{
+				// TODO: calculate instead?
+				static const uint8_t lookup[256] = {
+					0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+					0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
+					0, 0, 2, 2, 0, 0, 2, 2, 0, 0, 2, 2, 0, 0, 2, 2,
+					0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3,
+					0, 0, 0, 0, 4, 4, 4, 4, 0, 0, 0, 0, 4, 4, 4, 4,
+					0, 1, 0, 1, 4, 5, 4, 5, 0, 1, 0, 1, 4, 5, 4, 5,
+					0, 0, 2, 2, 4, 4, 6, 6, 0, 0, 2, 2, 4, 4, 6, 6,
+					0, 1, 2, 3, 4, 5, 6, 7, 0, 1, 2, 3, 4, 5, 6, 7,
+					0, 0, 0, 0, 0, 0, 0, 0, 8, 8, 8, 8, 8, 8, 8, 8,
+					0, 1, 0, 1, 0, 1, 0, 1, 8, 9, 8, 9, 8, 9, 8, 9,
+					0, 0, 2, 2, 0, 0, 2, 2, 8, 8,10,10, 8, 8,10,10,
+					0, 1, 2, 3, 0, 1, 2, 3, 8, 9,10,11, 8, 9,10,11,
+					0, 0, 0, 0, 4, 4, 4, 4, 8, 8, 8, 8,12,12,12,12,
+					0, 1, 0, 1, 4, 5, 4, 5, 8, 9, 8, 9,12,13,12,13,
+					0, 0, 2, 2, 4, 4, 6, 6, 8, 8,10,10,12,12,14,14,
+					0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15
+				};
+
+				bitmap.pix32(y, x + i) = m_palette->pen(lookup[(extra << 4) | (pen & 0xf)]);
+			}
+			else
+			{
+				bitmap.pix32(y, x + i) = m_palette->pen((extra<<4) | (pen & 0xf));
+
+			}
+		}
 	}
 }
 
@@ -459,72 +520,6 @@
 	m_palette->set_pen_color(entry, pal4bit(cc), pal4bit(cb), pal4bit(ca));
 }
 
-/******************************************
- *
- *  Brooktree Bt471 RAMDAC
- *  Implementation stolen from JPM
- *  Impact, may not be 100% (that has a 477)
- ******************************************/
-
-/*
- *  0 0 0    Address register (RAM write mode)
- *  0 0 1    Color palette RAMs
- *  0 1 0    Pixel read mask register
- *  0 1 1    Address register (RAM read mode)
- *  1 0 0    Address register (overlay write mode)
- *  1 1 1    Address register (overlay read mode)
- *  1 0 1    Overlay register
- */
-
-void mpu4vid_state::bt471_w(offs_t offset, uint8_t data)
-{
-	struct bt471_t &bt471 = m_bt471;
-
-	switch (offset)
-	{
-		case 0x0:
-		{
-			bt471.address = data;
-			bt471.addr_cnt = 0;
-			break;
-		}
-		case 0x1:
-		{
-			uint8_t *addr_cnt = &bt471.addr_cnt;
-			rgb_t *color = &bt471.color;
-
-			color[*addr_cnt] = data;
-
-			if (++*addr_cnt == 3)
-			{
-				m_palette->set_pen_color(bt471.address, rgb_t(color[0], color[1], color[2]));
-				*addr_cnt = 0;
-
-				/* Address register increments */
-				bt471.address++;
-			}
-			break;
-		}
-		case 0x2:
-		{
-			bt471.pixmask = data;
-			break;
-		}
-
-		default:
-		{
-			popmessage("Bt471: Unhandled write access (offset:%x, data:%x)", offset, data);
-		}
-	}
-}
-
-uint8_t mpu4vid_state::bt471_r(offs_t offset)
-{
-	popmessage("Bt471: Unhandled read access (offset:%x)", offset);
-	return 0;
-}
-
-
 /*************************************
  *
  *  Trackball interface
@@ -574,62 +569,52 @@
  *  Input defintions
  *
  *************************************/
-
-static INPUT_PORTS_START( crmaze )
-	PORT_START("ORANGE1")
-	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+INPUT_PORTS_START( mpu4vid )
+	PORT_START("ORANGE1") //0 - 7
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("00")//  20p level
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("01")// 100p level
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("02")// Token 1 level
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("03")// Token 2 level
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("04")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("05")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("06")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("07")
 
 	PORT_START("ORANGE2")
-	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("08")// 8 - 11 is JP Key
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("09")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("10")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("11")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("12")// 12 - 15 is % Key
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("13")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("14")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("15")
 
 	PORT_START("BLACK1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER)   PORT_NAME("16")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER)   PORT_NAME("17")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER)   PORT_NAME("18")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER)   PORT_NAME("19")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER)   PORT_NAME("20")
 	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Test Button") PORT_CODE(KEYCODE_W)
 	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox (Back) Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
 
 	PORT_START("BLACK2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Right Yellow")
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Right Red")
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("Left Red")
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Left Yellow")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Getout Yellow")
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Escape/Getout Red")/* Labelled Escape on cabinet */
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("24")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("25")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("26")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("27")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("28")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("29")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("30")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_START1)
 
 	PORT_START("DIL1")
-	PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL102" ) PORT_DIPLOCATION("DIL1:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL103" ) PORT_DIPLOCATION("DIL1:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL104" ) PORT_DIPLOCATION("DIL1:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL105" ) PORT_DIPLOCATION("DIL1:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL106" ) PORT_DIPLOCATION("DIL1:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL107" ) PORT_DIPLOCATION("DIL1:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL108" ) PORT_DIPLOCATION("DIL1:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
 	PORT_START("DIL2")
-	PORT_DIPNAME( 0x01, 0x00, "DIL201" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPNAME( 0x01, 0x00, "1 Pound for change" ) PORT_DIPLOCATION("DIL2:01")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
 	PORT_DIPNAME( 0x02, 0x00, "DIL202" ) PORT_DIPLOCATION("DIL2:02")
@@ -638,142 +623,66 @@
 	PORT_DIPNAME( 0x04, 0x00, "DIL203" ) PORT_DIPLOCATION("DIL2:03")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL204" ) PORT_DIPLOCATION("DIL2:04")
+	PORT_DIPNAME( 0x08, 0x00, "Attract mode inhibit" ) PORT_DIPLOCATION("DIL2:04")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
 	PORT_DIPNAME( 0x10, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:05")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL206" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPNAME( 0x20, 0x00, "Coin alarm inhibit" ) PORT_DIPLOCATION("DIL2:06")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
 	PORT_DIPNAME( 0x40, 0x00, "DIL207" ) PORT_DIPLOCATION("DIL2:07")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL208" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPNAME( 0x80, 0x00, "Single coin entry" ) PORT_DIPLOCATION("DIL2:08")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
 
 	PORT_START("AUX1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_CUSTOM)//XA
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_CUSTOM)//YA
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_CUSTOM)//XB
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_CUSTOM)//YB
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_0")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_1")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_2")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_3")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_4")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_5")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_6")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_7")
 
 	PORT_START("AUX2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM) //Lockouts, in same order as below
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")
-
-	PORT_START("TRACKX")//FAKE
-	PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_INVERT
-	PORT_START("TRACKY")//FAKE
-	PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_INVERT
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")//PORT_IMPULSE(5)
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")//PORT_IMPULSE(5)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")//PORT_IMPULSE(5)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")//PORT_IMPULSE(5)
 INPUT_PORTS_END
 
-static INPUT_PORTS_START( mating )
-	PORT_START("ORANGE1")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("ORANGE2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+static INPUT_PORTS_START( crmaze )
+	PORT_INCLUDE( mpu4vid )
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("BLACK1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Test Button") PORT_CODE(KEYCODE_W)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
+	PORT_MODIFY("ORANGE2")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("BLACK2")
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x1F, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("BLACK2")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Right Yellow")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Right Red")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("Left Yellow")
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Left Red")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("100p Service?")
-
-	PORT_START("DIL1")
-	PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL102" ) PORT_DIPLOCATION("DIL1:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL103" ) PORT_DIPLOCATION("DIL1:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL104" ) PORT_DIPLOCATION("DIL1:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL105" ) PORT_DIPLOCATION("DIL1:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL106" ) PORT_DIPLOCATION("DIL1:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL107" ) PORT_DIPLOCATION("DIL1:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL108" ) PORT_DIPLOCATION("DIL1:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
-
-	PORT_START("DIL2")
-	PORT_DIPNAME( 0x01, 0x00, "DIL201" ) PORT_DIPLOCATION("DIL2:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL202" ) PORT_DIPLOCATION("DIL2:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL203" ) PORT_DIPLOCATION("DIL2:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL204" ) PORT_DIPLOCATION("DIL2:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL206" ) PORT_DIPLOCATION("DIL2:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL207" ) PORT_DIPLOCATION("DIL2:07")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL208" ) PORT_DIPLOCATION("DIL2:08")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("Left Red")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Left Yellow")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER)   PORT_NAME("Getout Yellow")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Escape/Getout Red")/* Labelled Escape on cabinet */
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("AUX1")
+	PORT_MODIFY("AUX1")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
@@ -783,115 +692,297 @@
 	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_CUSTOM)//XB
 	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_CUSTOM)//YB
 
-	PORT_START("AUX2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")
-
 	PORT_START("TRACKX")//FAKE
 	PORT_BIT( 0xff, 0, IPT_TRACKBALL_X ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_INVERT
 	PORT_START("TRACKY")//FAKE
 	PORT_BIT( 0xff, 0, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(50) PORT_KEYDELTA(10) PORT_INVERT
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( mating )
+	PORT_INCLUDE( crmaze )
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Left Red")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Left Yellow")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("Right Yellow")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Right Red")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
 
 INPUT_PORTS_END
 
+static INPUT_PORTS_START( barquest )
+	PORT_INCLUDE( mpu4vid )
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
+	PORT_MODIFY("ORANGE2")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-static INPUT_PORTS_START( skiltrek )
-	PORT_START("ORANGE1")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("C")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("B")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("A")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Pass")
 
-	PORT_START("ORANGE2")
+	PORT_MODIFY("BLACK2")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON7) PORT_NAME("C")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON8) PORT_NAME("B")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON9) PORT_NAME("A")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON6) PORT_NAME("Continue")
 	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Collect")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_START1)
 
-	PORT_START("BLACK1")
+	PORT_MODIFY("AUX1")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( skiltrek )
+	PORT_INCLUDE( mpu4vid )
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("ORANGE2")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("BLACK1")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Pass")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("C")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("B")
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("A")
 	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Test Button") PORT_CODE(KEYCODE_W)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
 
-	PORT_START("BLACK2")
+	PORT_MODIFY("BLACK2")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Continue")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON6) PORT_NAME("C")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON7) PORT_NAME("B")
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON8) PORT_NAME("A")
 	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_START1)
+	PORT_BIT(0xE0, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("AUX1")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( turnover )
+	PORT_INCLUDE( mpu4vid )
+
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("ORANGE2")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Pass")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("C")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("B")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("A")
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Continue")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON6) PORT_NAME("C")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON7) PORT_NAME("B")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON8) PORT_NAME("A")
 	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_START1)
 
-	PORT_START("DIL1")
-	PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL102" ) PORT_DIPLOCATION("DIL1:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL103" ) PORT_DIPLOCATION("DIL1:03")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL104" ) PORT_DIPLOCATION("DIL1:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL105" ) PORT_DIPLOCATION("DIL1:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL106" ) PORT_DIPLOCATION("DIL1:06")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL107" ) PORT_DIPLOCATION("DIL1:07")
+	PORT_MODIFY("AUX1")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( adders )
+	PORT_INCLUDE( mpu4vid )
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("ORANGE2")
+	PORT_BIT( 0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("C")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("B")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("A")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Pass")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Collect")
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON8) PORT_NAME("C")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON7) PORT_NAME("B")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON6) PORT_NAME("A")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Continue")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_START1)
+
+	PORT_MODIFY("AUX1")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( strike )
+	PORT_INCLUDE( mpu4vid )
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT( 0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON9) PORT_NAME("Freeze")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON10) PORT_NAME("Go On!")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("ORANGE2")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_START2)  PORT_NAME("Play")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("Green (Left)")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Yellow (Left)")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Red (Left)")
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON7) PORT_NAME("Help")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON6) PORT_NAME("Green (Right)")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Yellow (Right)")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Red (Right)")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_BUTTON8) PORT_NAME("Collect")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_START1)
+
+	PORT_MODIFY("AUX1")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( bwbvid )
+	PORT_START("ORANGE1")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM )// 20p level
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM )// Short token bottom level
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM )// 100p level
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM )// Long token bottom level
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_CUSTOM )// Prize token level sensor
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_CUSTOM )// Short token top level
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_START("ORANGE2")
+	PORT_CONFNAME( 0x0F, 0x00, "Jackpot / Prize Key" )
+	PORT_CONFSETTING(    0x00, "Not fitted"  )
+	PORT_CONFSETTING(    0x01, "3 GBP"  )
+	PORT_CONFSETTING(    0x02, "4 GBP"  )
+	PORT_CONFSETTING(    0x08, "5 GBP"  )
+	PORT_CONFSETTING(    0x03, "6 GBP"  )
+	PORT_CONFSETTING(    0x04, "6 GBP Token"  )
+	PORT_CONFSETTING(    0x05, "8 GBP"  )
+	PORT_CONFSETTING(    0x06, "8 GBP Token"  )
+	PORT_CONFSETTING(    0x07, "10 GBP"  )
+	PORT_CONFSETTING(    0x09, "15 GBP"  )
+	PORT_CONFSETTING(    0x0A, "25 GBP"  )
+	PORT_CONFSETTING(    0x0B, "25 GBP - Licensed Betting Office Profile"  )
+	PORT_CONFSETTING(    0x0C, "35 GBP"  )
+	PORT_CONFSETTING(    0x0D, "70 GBP"  )
+	PORT_CONFSETTING(    0x0E, "Reserved 0e"  )
+	PORT_CONFSETTING(    0x0F, "Reserved 0f"  )
+
+	PORT_CONFNAME( 0xF0, 0x00, "Percentage Key" )
+	PORT_CONFSETTING(    0x00, "Not fitted / 68% (Invalid for UK Games)"  )
+	PORT_CONFSETTING(    0x10, "70" )
+	PORT_CONFSETTING(    0x20, "72" )
+	PORT_CONFSETTING(    0x30, "74" )
+	PORT_CONFSETTING(    0x40, "76" )
+	PORT_CONFSETTING(    0x50, "78" )
+	PORT_CONFSETTING(    0x60, "80" )
+	PORT_CONFSETTING(    0x70, "82" )
+	PORT_CONFSETTING(    0x80, "84" )
+	PORT_CONFSETTING(    0x90, "86" )
+	PORT_CONFSETTING(    0xA0, "88" )
+	PORT_CONFSETTING(    0xB0, "90" )
+	PORT_CONFSETTING(    0xC0, "92" )
+	PORT_CONFSETTING(    0xD0, "94" )
+	PORT_CONFSETTING(    0xE0, "96" )
+	PORT_CONFSETTING(    0xF0, "98" )
+
+	PORT_START("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Button 9")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("Button 10")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER)   PORT_NAME("Button 11")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER)   PORT_NAME("Button 12")
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_CUSTOM)  // Prize Shelf Opto
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Test Button") PORT_CODE(KEYCODE_W)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox (Back) Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
+
+	PORT_START("BLACK2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Button 1")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Button 2")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Button 3")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Button 4")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Button 5")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Button 6")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("Button 7")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_START1) //Button 8
+
+	PORT_START("DIL1")
+	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIL1:01")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL108" ) PORT_DIPLOCATION("DIL1:08")
+	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIL1:02")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x04, 0x00, "High Token Payout Proportion" ) PORT_DIPLOCATION("DIL1:03")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x08, 0x00, "Low Token Payout Proportion" ) PORT_DIPLOCATION("DIL1:04")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0xF0, 0x00, "Target Percentage (if key not fitted)" )PORT_DIPLOCATION("DIL1:05,06,07,08")
+	PORT_DIPSETTING(    0x00, "Unset (Program Optimum)"  )
+	PORT_DIPSETTING(    0x10, "70" )
+	PORT_DIPSETTING(    0x20, "72" )
+	PORT_DIPSETTING(    0x30, "74" )
+	PORT_DIPSETTING(    0x40, "76" )
+	PORT_DIPSETTING(    0x50, "78" )
+	PORT_DIPSETTING(    0x60, "80" )
+	PORT_DIPSETTING(    0x70, "82" )
+	PORT_DIPSETTING(    0x80, "84" )
+	PORT_DIPSETTING(    0x90, "86" )
+	PORT_DIPSETTING(    0xA0, "88" )
+	PORT_DIPSETTING(    0xB0, "90" )
+	PORT_DIPSETTING(    0xC0, "92" )
+	PORT_DIPSETTING(    0xD0, "94" )
+	PORT_DIPSETTING(    0xE0, "96" )
+	PORT_DIPSETTING(    0xF0, "98" )
 
 	PORT_START("DIL2")
-	PORT_DIPNAME( 0x01, 0x00, "1 Pound for change" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIL2:01") //Clear MPU on some machines
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL202" ) PORT_DIPLOCATION("DIL2:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL203" ) PORT_DIPLOCATION("DIL2:03")
+	PORT_DIPNAME( 0x02, 0x00, "Enable Cash Refill") PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Inhibit Win Banking" ) PORT_DIPLOCATION("DIL2:03") //If on, wins are paid live, as opposed to stored
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "Attract mode inhibit" ) PORT_DIPLOCATION("DIL2:04")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "Coin alarm inhibit" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPNAME( 0x08, 0x00, "High Prize Payout proportion (if available)" ) PORT_DIPLOCATION("DIL2:04") //Non Prize machines use this to inhibit OCD attract mode
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x10, 0x00, "Halt Payout when Empty" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x20, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:06")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL207" ) PORT_DIPLOCATION("DIL2:07")
+	PORT_DIPNAME( 0x40, 0x00, "Excess Token Lockout" ) PORT_DIPLOCATION("DIL2:07") //If an 'arcade' ROM, this flips, or is unused entirely.
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "Single coin entry" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPNAME( 0x80, 0x00, "Single Credit Entry" ) PORT_DIPLOCATION("DIL2:08")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
 
@@ -906,244 +997,855 @@
 	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
 
 	PORT_START("AUX2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM) //Lockouts, in same order as below
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")//PORT_IMPULSE(5)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")//PORT_IMPULSE(5)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")//PORT_IMPULSE(5)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")//PORT_IMPULSE(5)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_COIN5) PORT_NAME("Token")// If valid, then 0x04 is unused, 0x01 is token lockout, 0x02 is all other lockouts.
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")
 INPUT_PORTS_END
 
-static INPUT_PORTS_START( turnover )
-	PORT_START("ORANGE1")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("ORANGE2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+static INPUT_PORTS_START( v4psi )
+	PORT_INCLUDE( bwbvid )
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM )// 20p level
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM )// Short token bottom level
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM )// 100p level
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_CUSTOM ) // Payout Shelf opto
+	PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_MODIFY("ORANGE2")
+	// No. 17 to 24 according to test mode
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Fire")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_MODIFY("BLACK1")
+	// No. 9 to 16
+	PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START3 ) PORT_NAME("Continue 30p")
+
+	PORT_MODIFY("BLACK2")
+	// No. 1 to 8
+	PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Collect")
+	PORT_BIT( 0x30, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start 30p")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Start 50p")
+
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Allow Multiple Credits" ) PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( No  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Payout when Empty?" ) PORT_DIPLOCATION("DIL2:03")
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( No  ) )
+	PORT_DIPNAME( 0x08, 0x00, "Bank Win" ) PORT_DIPLOCATION("DIL2:04")
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x08, "Pay Live" )
+	PORT_DIPNAME( 0x10, 0x00, "Collect Mode" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, "Credit and Bank" )
+	PORT_DIPSETTING(    0x10, "Bank Only" )
+	PORT_DIPNAME( 0x20, 0x00, "Hall of Fame Entry" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPSETTING(    0x00, "Full Names" )
+	PORT_DIPSETTING(    0x20, "Initials" )
+	PORT_DIPNAME( 0x40, 0x00, "Long Game" ) PORT_DIPLOCATION("DIL2:07")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x80, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( Yes  ) )
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( v4tetris )
+	PORT_INCLUDE( bwbvid )
+
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM )// 20p level
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM )// Short token bottom level
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM )// 100p level
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM )// Long token bottom level
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_CUSTOM )// Prize token level sensor
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_CUSTOM )// Short token top level
+	PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+
+	PORT_MODIFY("ORANGE2")
+	PORT_BIT(0xFF, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+
+	PORT_MODIFY("BLACK1")
+	// no up also according to cabinet panel
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
+	// buttons are actually repeated on both left and right on the cabinet panel,
+	// with joystick at center
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Rotate Left")
+	// left of main screen cab
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start (Practice Mode)")
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT( 0x07, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Rotate Right")
+	// right of main screen cab
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Start (Prize Mode)")
+	PORT_BIT( 0xe0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Allow Multiple Credits" ) PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( No  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Demo Mode" ) PORT_DIPLOCATION("DIL2:03")
+	PORT_DIPSETTING(    0x00, "Continuous" )
+	PORT_DIPSETTING(    0x04, "Cancelled @5min" )
+	PORT_DIPNAME( 0x08, 0x00, "Odd 10p" ) PORT_DIPLOCATION("DIL2:04")
+	PORT_DIPSETTING(    0x00, "Lost @2min" )
+	PORT_DIPSETTING(    0x08, "Never Lost" )
+	PORT_DIPNAME( 0x10, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x20, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x40, 0x00, "DIL207" ) PORT_DIPLOCATION("DIL2:07")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x80, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( Yes  ) )
+
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( v4pztet )
+	PORT_INCLUDE( v4tetris )
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start (Practice Mode)")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Start (Prize Mode)")
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_CUSTOM )  // Prize Shelf Opto
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Rotate Left")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Rotate Right")
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( v4bulblx )
+	PORT_INCLUDE( v4pztet )
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Start (Practice Mode)")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start (Prize Mode)")
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_CUSTOM)  // Prize Shelf Opto
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( v4vgpok )
+	PORT_INCLUDE( bwbvid )
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start / Deal / Draw")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_BET ) // Stake
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_GAMBLE_PAYOUT ) // Collect
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_GAMBLE_LOW )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_GAMBLE_HIGH )
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 )
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 )
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_POKER_HOLD4 )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_POKER_HOLD5 )
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( v4big40 )
+	PORT_INCLUDE( bwbvid )
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON9) PORT_NAME("Swop")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start / Deal / Draw")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
-
-	PORT_START("BLACK1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Pass")
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("C")
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("B")
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("A")
+	PORT_BIT(0x10, IP_ACTIVE_LOW,  IPT_CUSTOM)  // Prize Shelf Opto
 	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Test Button") PORT_CODE(KEYCODE_W)
 	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox (Back) Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
 
-	PORT_START("BLACK2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("Continue")
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON6) PORT_NAME("C")
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON7) PORT_NAME("B")
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON8) PORT_NAME("A")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_START1)
+	PORT_MODIFY("BLACK2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("Cancel/Collect")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_POKER_HOLD1 )
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_POKER_HOLD2 )
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_POKER_HOLD3 )
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_POKER_HOLD4 )
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_POKER_HOLD5 )
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_BUTTON7) PORT_NAME("Hi/Twist")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_BUTTON8) PORT_NAME("Lo/Stick")
+
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x80, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( Yes  ) )
 
-	PORT_START("DIL1")
-	PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( v4mdice )
+	PORT_INCLUDE( bwbvid )
+	PORT_MODIFY("ORANGE1")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_CUSTOM )// 20p level
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM )// Short token bottom level
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM )// 100p level
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM )// Long token bottom level
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_CUSTOM )// Prize token level sensor
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_CUSTOM )// Short token top level
+	PORT_BIT( 0xc0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Cancel/Collect")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Hold/Nudge A")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Hold/Nudge B")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Hold/Nudge C")
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Hi")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Lo")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Exchange")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
+
+	PORT_MODIFY("DIL1")
+	PORT_DIPNAME( 0x01, 0x00, "Play Jingle" ) PORT_DIPLOCATION("DIL1:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( No  ) )
+	PORT_DIPNAME( 0x02, 0x00, u8"£8 Advert?" ) PORT_DIPLOCATION("DIL1:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( No  ) )
+	PORT_DIPNAME( 0x04, 0x00, "High Token Payout Proportion" ) PORT_DIPLOCATION("DIL1:03")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x08, 0x00, "Low Token Payout Proportion" ) PORT_DIPLOCATION("DIL1:04")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0xF0, 0x00, "Target Percentage (if key not fitted)" )PORT_DIPLOCATION("DIL1:05,06,07,08")
+	PORT_DIPSETTING(    0x00, "Unset (Program Optimum)"  )
+	PORT_DIPSETTING(    0x10, "70" )
+	PORT_DIPSETTING(    0x20, "72" )
+	PORT_DIPSETTING(    0x30, "74" )
+	PORT_DIPSETTING(    0x40, "76" )
+	PORT_DIPSETTING(    0x50, "78" )
+	PORT_DIPSETTING(    0x60, "80" )
+	PORT_DIPSETTING(    0x70, "82" )
+	PORT_DIPSETTING(    0x80, "84" )
+	PORT_DIPSETTING(    0x90, "86" )
+	PORT_DIPSETTING(    0xA0, "88" )
+	PORT_DIPSETTING(    0xB0, "90" )
+	PORT_DIPSETTING(    0xC0, "92" )
+	PORT_DIPSETTING(    0xD0, "94" )
+	PORT_DIPSETTING(    0xE0, "96" )
+	PORT_DIPSETTING(    0xF0, "98" )
+
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Enable Cash Refill") PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Inhibit Win Banking" ) PORT_DIPLOCATION("DIL2:03") //If on, wins are paid live, as opposed to stored
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL102" ) PORT_DIPLOCATION("DIL1:02")
+	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x08, 0x00, "High Prize Payout proportion (if available)" ) PORT_DIPLOCATION("DIL2:04") //Non Prize machines use this to inhibit OCD attract mode
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x10, 0x00, "Halt Payout when Empty" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x20, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:06")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL103" ) PORT_DIPLOCATION("DIL1:03")
+	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x40, 0x00, "Excess Token Lockout" ) PORT_DIPLOCATION("DIL2:07") //If an 'arcade' ROM, this flips, or is unused entirely.
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL104" ) PORT_DIPLOCATION("DIL1:04")
+	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x80, 0x00, "Single Credit Entry" ) PORT_DIPLOCATION("DIL2:08")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL105" ) PORT_DIPLOCATION("DIL1:05")
+	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
+
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( v4cshinf )
+	PORT_INCLUDE( v4mdice )
+
+	PORT_MODIFY("DIL1")
+	PORT_DIPNAME( 0x01, 0x00, "Lower Price of Play?" ) PORT_DIPLOCATION("DIL1:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( No  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Higher Price of Play?" ) PORT_DIPLOCATION("DIL1:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( No  ) )
+	PORT_DIPNAME( 0x04, 0x00, "High Token Payout Proportion" ) PORT_DIPLOCATION("DIL1:03")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x08, 0x00, "Low Token Payout Proportion" ) PORT_DIPLOCATION("DIL1:04")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0xF0, 0x00, "Target Percentage (if key not fitted)" )PORT_DIPLOCATION("DIL1:05,06,07,08")
+	PORT_DIPSETTING(    0x00, "Unset (Program Optimum)"  )
+	PORT_DIPSETTING(    0x10, "70" )
+	PORT_DIPSETTING(    0x20, "72" )
+	PORT_DIPSETTING(    0x30, "74" )
+	PORT_DIPSETTING(    0x40, "76" )
+	PORT_DIPSETTING(    0x50, "78" )
+	PORT_DIPSETTING(    0x60, "80" )
+	PORT_DIPSETTING(    0x70, "82" )
+	PORT_DIPSETTING(    0x80, "84" )
+	PORT_DIPSETTING(    0x90, "86" )
+	PORT_DIPSETTING(    0xA0, "88" )
+	PORT_DIPSETTING(    0xB0, "90" )
+	PORT_DIPSETTING(    0xC0, "92" )
+	PORT_DIPSETTING(    0xD0, "94" )
+	PORT_DIPSETTING(    0xE0, "96" )
+	PORT_DIPSETTING(    0xF0, "98" )
+
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Enable Cash Refill") PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Inhibit Win Banking" ) PORT_DIPLOCATION("DIL2:03") //If on, wins are paid live, as opposed to stored
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL106" ) PORT_DIPLOCATION("DIL1:06")
+	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x08, 0x00, "High Prize Payout proportion (if available)" ) PORT_DIPLOCATION("DIL2:04") //Non Prize machines use this to inhibit OCD attract mode
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x10, 0x00, "Halt Payout when Empty" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x20, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:06")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL107" ) PORT_DIPLOCATION("DIL1:07")
+	PORT_DIPNAME( 0x40, 0x00, "Excess Token Lockout (Token ROMs)" ) PORT_DIPLOCATION("DIL2:07") //If an 'arcade' ROM, this flips, or is unused entirely.
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL108" ) PORT_DIPLOCATION("DIL1:08")
+	PORT_DIPNAME( 0x80, 0x00, "Single Credit Entry" ) PORT_DIPLOCATION("DIL2:08")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
 
-	PORT_START("DIL2")
-	PORT_DIPNAME( 0x01, 0x00, "1 Pound for change" ) PORT_DIPLOCATION("DIL2:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL202" ) PORT_DIPLOCATION("DIL2:02")
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( v4reno )
+	PORT_INCLUDE( v4mdice )
+
+	PORT_MODIFY("DIL1")
+	PORT_DIPNAME( 0x01, 0x00, "Set Price of Play?" ) PORT_DIPLOCATION("DIL1:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( No  ) )
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIL1:02")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL203" ) PORT_DIPLOCATION("DIL2:03")
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIL1:03")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "Attract mode inhibit" ) PORT_DIPLOCATION("DIL2:04")
+	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIL1:04")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPNAME( 0xF0, 0x00, "Target Percentage (if key not fitted)" )PORT_DIPLOCATION("DIL1:05,06,07,08")
+	PORT_DIPSETTING(    0x00, "Unset (Program Optimum)"  )
+	PORT_DIPSETTING(    0x10, "70" )
+	PORT_DIPSETTING(    0x20, "72" )
+	PORT_DIPSETTING(    0x30, "74" )
+	PORT_DIPSETTING(    0x40, "76" )
+	PORT_DIPSETTING(    0x50, "78" )
+	PORT_DIPSETTING(    0x60, "80" )
+	PORT_DIPSETTING(    0x70, "82" )
+	PORT_DIPSETTING(    0x80, "84" )
+	PORT_DIPSETTING(    0x90, "86" )
+	PORT_DIPSETTING(    0xA0, "88" )
+	PORT_DIPSETTING(    0xB0, "90" )
+	PORT_DIPSETTING(    0xC0, "92" )
+	PORT_DIPSETTING(    0xD0, "94" )
+	PORT_DIPSETTING(    0xE0, "96" )
+	PORT_DIPSETTING(    0xF0, "98" )
+
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Enable Cash Refill") PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Inhibit Win Banking" ) PORT_DIPLOCATION("DIL2:03") //If on, wins are paid live, as opposed to stored
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "Coin alarm inhibit" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x08, 0x00, "High Prize Payout proportion (if available)" ) PORT_DIPLOCATION("DIL2:04") //Non Prize machines use this to inhibit OCD attract mode
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x10, 0x00, "Halt Payout when Empty" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x20, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:06")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL207" ) PORT_DIPLOCATION("DIL2:07")
+	PORT_DIPNAME( 0x40, 0x00, "Excess Token Lockout (Token ROMs)" ) PORT_DIPLOCATION("DIL2:07") //If an 'arcade' ROM, this flips, or is unused entirely.
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "Single coin entry" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPNAME( 0x80, 0x00, "Single Credit Entry" ) PORT_DIPLOCATION("DIL2:08")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
 
-	PORT_START("AUX1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
-
-	PORT_START("AUX2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")//PORT_IMPULSE(5)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")//PORT_IMPULSE(5)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")//PORT_IMPULSE(5)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")//PORT_IMPULSE(5)
 INPUT_PORTS_END
 
-static INPUT_PORTS_START( adders )
-	PORT_START("ORANGE1")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
-
-	PORT_START("ORANGE2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("BLACK1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON1) PORT_NAME("C")
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON2) PORT_NAME("B")
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON3) PORT_NAME("A")
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_BUTTON4) PORT_NAME("Pass")
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Test Button") PORT_CODE(KEYCODE_W)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
+static INPUT_PORTS_START( v4bigfrt )
+	PORT_INCLUDE( bwbvid )
 
-	PORT_START("BLACK2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON5) PORT_NAME("C")
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_BUTTON6) PORT_NAME("B")
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_BUTTON7) PORT_NAME("A")
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON9) PORT_NAME("Fast/ High Play")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Start 1")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_START1)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("DIL1")
-	PORT_DIPNAME( 0x01, 0x00, "DIL101" ) PORT_DIPLOCATION("DIL1:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL102" ) PORT_DIPLOCATION("DIL1:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL103" ) PORT_DIPLOCATION("DIL1:03")
+	PORT_MODIFY("BLACK2")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Cancel/Collect")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Hold/Nudge A")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Hi")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Hold/Nudge B")
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Lo")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Hold/Nudge C")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Take It")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_NAME("Leave It")
+
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Enable Cash Refill") PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Inhibit Win Banking" ) PORT_DIPLOCATION("DIL2:03") //If on, wins are paid live, as opposed to stored
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "DIL104" ) PORT_DIPLOCATION("DIL1:04")
+	PORT_DIPNAME( 0x08, 0x00, "Inhibit Attract Mode" ) PORT_DIPLOCATION("DIL2:04") //Non Prize machines use this to inhibit OCD attract mode
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL105" ) PORT_DIPLOCATION("DIL1:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "DIL106" ) PORT_DIPLOCATION("DIL1:06")
+	PORT_DIPNAME( 0x10, 0x00, "Halt Payout when Empty" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x20, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:06")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL107" ) PORT_DIPLOCATION("DIL1:07")
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIL2:07") //If an 'arcade' ROM, this flips, or is unused entirely.
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "DIL108" ) PORT_DIPLOCATION("DIL1:08")
+	PORT_DIPNAME( 0x80, 0x00, "Single Credit Entry" ) PORT_DIPLOCATION("DIL2:08")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
+INPUT_PORTS_END
 
-	PORT_START("DIL2")
-	PORT_DIPNAME( 0x01, 0x00, "1 Pound for change" ) PORT_DIPLOCATION("DIL2:01")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x02, 0x00, "DIL202" ) PORT_DIPLOCATION("DIL2:02")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x04, 0x00, "DIL203" ) PORT_DIPLOCATION("DIL2:03")
+static INPUT_PORTS_START( v4bubbnk )
+	PORT_INCLUDE( bwbvid )
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Cancel/Nudge Up")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Hold A")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Hold B")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Hold C")
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Swop")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Hi")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Lo")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
+
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Enable Cash Refill") PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Inhibit Win Banking" ) PORT_DIPLOCATION("DIL2:03") //If on, wins are paid live, as opposed to stored
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x08, 0x00, "Attract mode inhibit" ) PORT_DIPLOCATION("DIL2:04")
+	PORT_DIPNAME( 0x08, 0x00, "Inhibit Attract Mode" ) PORT_DIPLOCATION("DIL2:04") //Non Prize machines use this to inhibit OCD attract mode
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x10, 0x00, "DIL205" ) PORT_DIPLOCATION("DIL2:05")
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x20, 0x00, "Coin alarm inhibit" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPNAME( 0x10, 0x00, "Halt Payout when Empty" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x20, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:06")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x40, 0x00, "DIL207" ) PORT_DIPLOCATION("DIL2:07")
+	PORT_DIPNAME( 0x40, 0x00, "Excess Token Lockout (Token ROMs)" ) PORT_DIPLOCATION("DIL2:07") //If an 'arcade' ROM, this flips, or is unused entirely.
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
-	PORT_DIPNAME( 0x80, 0x00, "Single coin entry" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPNAME( 0x80, 0x00, "Single Credit Entry" ) PORT_DIPLOCATION("DIL2:08")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
+INPUT_PORTS_END
 
-	PORT_START("AUX1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+static INPUT_PORTS_START( v4dbltak )
+	PORT_INCLUDE( bwbvid )
+
+	PORT_MODIFY("ORANGE1")
+	PORT_CONFNAME( 0xc0, 0xc0, "Stake Key" )
+	PORT_CONFSETTING(    0x80, "20p" )
+	PORT_CONFSETTING(    0xc0, "25p" )
+	// invalid settings
+	PORT_CONFSETTING(    0x00, "Invalid (Not fitted)"  )
+	PORT_CONFSETTING(    0x40, "Invalid" )
+
+	PORT_MODIFY("ORANGE2")
+	PORT_CONFNAME( 0x0f, 0x07, "Jackpot / Prize Key" )
+	PORT_CONFSETTING(    0x08, "5 GBP"  )
+	PORT_CONFSETTING(    0x07, "10 GBP"  )
+	PORT_CONFSETTING(    0x09, "15 GBP"  )
+	// invalid settings
+	PORT_CONFSETTING(    0x00, "Invalid (Not fitted)"  )
+	PORT_CONFSETTING(    0x01, "Invalid (3 GBP)"  )
+	PORT_CONFSETTING(    0x02, "Invalid (4 GBP)"  )
+	PORT_CONFSETTING(    0x03, "Invalid (6 GBP)"  )
+	PORT_CONFSETTING(    0x04, "Invalid (6 GBP Token)"  )
+	PORT_CONFSETTING(    0x05, "Invalid (8 GBP)"  )
+	PORT_CONFSETTING(    0x06, "Invalid (8 GBP Token)"  )
+	PORT_CONFSETTING(    0x0a, "Invalid (25 GBP)"  )
+	PORT_CONFSETTING(    0x0b, "Invalid (25 GBP - Licensed Betting Office Profile)"  )
+	PORT_CONFSETTING(    0x0c, "Invalid (35 GBP)"  )
+	PORT_CONFSETTING(    0x0d, "Invalid (70 GBP)"  )
+	PORT_CONFSETTING(    0x0e, "Invalid (Reserved 0e)"  )
+	PORT_CONFSETTING(    0x0f, "Invalid (Reserved 0f)"  )
+	PORT_BIT(0xf0, IP_ACTIVE_HIGH, IPT_UNUSED) // % Key not used
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON9) PORT_NAME("Swop")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_START1)
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-	PORT_START("AUX2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_COIN1) PORT_NAME("10p")//PORT_IMPULSE(5)
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_COIN2) PORT_NAME("20p")//PORT_IMPULSE(5)
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_COIN3) PORT_NAME("50p")//PORT_IMPULSE(5)
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_COIN4) PORT_NAME("100p")//PORT_IMPULSE(5)
+	PORT_MODIFY("BLACK2")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Cancel/Collect")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Hold A")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Hold B")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Hold C")
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Hold D")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Hold E")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Hi/Twist")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_NAME("Lo/Stick")
+
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Enable Cash Refill") PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Inhibit Win Banking" ) PORT_DIPLOCATION("DIL2:03") //If on, wins are paid live, as opposed to stored
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x08, 0x00, "High Prize Percentage?" ) PORT_DIPLOCATION("DIL2:04") //Non Prize machines use this to inhibit OCD attract mode
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( No  ) )
+	PORT_DIPNAME( 0x10, 0x00, "Halt Payout when Empty" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x20, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIL2:07") //If an 'arcade' ROM, this flips, or is unused entirely.
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x80, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( Yes  ) )
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( v4dbltak_perc ) // requires a valid % key
+	PORT_INCLUDE( v4dbltak )
+
+	PORT_MODIFY("ORANGE2")
+	PORT_CONFNAME( 0xf0, 0x60, "Percentage Key" )
+	PORT_CONFSETTING(    0x00, "Not fitted / 68% (Invalid for UK Games)"  )
+	PORT_CONFSETTING(    0x10, "70" )
+	PORT_CONFSETTING(    0x20, "72" )
+	PORT_CONFSETTING(    0x30, "74" )
+	PORT_CONFSETTING(    0x40, "76" )
+	PORT_CONFSETTING(    0x50, "78" )
+	PORT_CONFSETTING(    0x60, "80" )
+	PORT_CONFSETTING(    0x70, "82" )
+	PORT_CONFSETTING(    0x80, "84" )
+	PORT_CONFSETTING(    0x90, "86" )
+	PORT_CONFSETTING(    0xa0, "88" )
+	PORT_CONFSETTING(    0xb0, "90" )
+	PORT_CONFSETTING(    0xc0, "92" )
+	PORT_CONFSETTING(    0xd0, "94" )
+	PORT_CONFSETTING(    0xe0, "96" )
+	PORT_CONFSETTING(    0xf0, "98" )
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( v4mazbel )
+	PORT_INCLUDE( bwbvid )
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Collect/Cancel")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Hold A")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Hold B")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Hold C")
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Hold/Swop")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Hi/Up")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Lo/Down")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
+
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Enable Cash Refill") PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Inhibit Win Banking" ) PORT_DIPLOCATION("DIL2:03") //If on, wins are paid live, as opposed to stored
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x08, 0x00, "Inhibit Attract Mode" ) PORT_DIPLOCATION("DIL2:04") //Non Prize machines use this to inhibit OCD attract mode
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x10, 0x00, "Halt Payout when Empty" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x20, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIL2:07") //If an 'arcade' ROM, this flips, or is unused entirely.
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x80, 0x00, "Single Credit Entry" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( v4redhtp )
+	PORT_INCLUDE( bwbvid )
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_BUTTON9) PORT_NAME("Swop")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_START1) PORT_NAME("Deal/Draw")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Collect")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Hold A")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Hold B")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Hold C")
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Hold D")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Hold E")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Hi")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_NAME("Lo")
+
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Enable Cash Refill") PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Inhibit Win Banking" ) PORT_DIPLOCATION("DIL2:03") //If on, wins are paid live, as opposed to stored
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x08, 0x00, "Inhibit Attract Mode" ) PORT_DIPLOCATION("DIL2:04") //Non Prize machines use this to inhibit OCD attract mode
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x10, 0x00, "Halt Payout when Empty" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x20, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIL2:07") //If an 'arcade' ROM, this flips, or is unused entirely.
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x80, 0x00, "Single Credit Entry" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( v4shpwnd )
+	PORT_INCLUDE( bwbvid )
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start (L)")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Hold A")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Hold B")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Hold C")
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Cancel")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Collect")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Auto Start")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START3 ) PORT_NAME("Start (R)")
+
+	PORT_MODIFY("DIL1")
+	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIL1:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Price of Play" ) PORT_DIPLOCATION("DIL1:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( Low ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( High  ) )
+	PORT_DIPNAME( 0x04, 0x00, "High Token Payout Proportion" ) PORT_DIPLOCATION("DIL1:03")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x08, 0x00, "Low Token Payout Proportion" ) PORT_DIPLOCATION("DIL1:04")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0xF0, 0x00, "Target Percentage (if key not fitted)" )PORT_DIPLOCATION("DIL1:05,06,07,08")
+	PORT_DIPSETTING(    0x00, "Unset (Program Optimum)"  )
+	PORT_DIPSETTING(    0x10, "70" )
+	PORT_DIPSETTING(    0x20, "72" )
+	PORT_DIPSETTING(    0x30, "74" )
+	PORT_DIPSETTING(    0x40, "76" )
+	PORT_DIPSETTING(    0x50, "78" )
+	PORT_DIPSETTING(    0x60, "80" )
+	PORT_DIPSETTING(    0x70, "82" )
+	PORT_DIPSETTING(    0x80, "84" )
+	PORT_DIPSETTING(    0x90, "86" )
+	PORT_DIPSETTING(    0xA0, "88" )
+	PORT_DIPSETTING(    0xB0, "90" )
+	PORT_DIPSETTING(    0xC0, "92" )
+	PORT_DIPSETTING(    0xD0, "94" )
+	PORT_DIPSETTING(    0xE0, "96" )
+	PORT_DIPSETTING(    0xF0, "98" )
+
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Enable Cash Refill") PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Inhibit Win Banking" ) PORT_DIPLOCATION("DIL2:03") //If on, wins are paid live, as opposed to stored
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x08, 0x00, "Spin Speed" ) PORT_DIPLOCATION("DIL2:04") //Non Prize machines use this to inhibit OCD attract mode
+	PORT_DIPSETTING(    0x00, "Normal" )
+	PORT_DIPSETTING(    0x08, "Fast" )
+	PORT_DIPNAME( 0x10, 0x00, "Halt Payout when Empty" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x20, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x40, 0x00, "Excess Token Lockout (Token games only)" ) PORT_DIPLOCATION("DIL2:07") //If an 'arcade' ROM, this flips, or is unused entirely.
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x80, 0x00, "Single Credit Entry" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
+
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( v4timebn )
+	PORT_INCLUDE( bwbvid )
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_CUSTOM)  // Prize Shelf Opto
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Test Button") PORT_CODE(KEYCODE_W)
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_SERVICE) PORT_NAME("Refill Key") PORT_CODE(KEYCODE_R) PORT_TOGGLE
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_INTERLOCK) PORT_NAME("Cashbox (Back) Door")  PORT_CODE(KEYCODE_Q) PORT_TOGGLE
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Collect")
+	//Will show as 'unused' in test, but give response when connected
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Hi")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Lo")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Luck")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 )
+
+	PORT_MODIFY("DIL2")
+	PORT_DIPNAME( 0x01, 0x00, "Clear MPU Memory" ) PORT_DIPLOCATION("DIL2:01")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x02, 0x00, "Enable Cash Refill") PORT_DIPLOCATION("DIL2:02")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x04, 0x00, "Inhibit Win Banking" ) PORT_DIPLOCATION("DIL2:03") //If on, wins are paid live, as opposed to stored
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x08, 0x00, "Inhibit Attract Mode" ) PORT_DIPLOCATION("DIL2:04") //Non Prize machines use this to inhibit OCD attract mode
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x10, 0x00, "Halt Payout when Empty" ) PORT_DIPLOCATION("DIL2:05")
+	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( Yes  ) )
+	PORT_DIPNAME( 0x20, 0x00, "Coin Alarm Inhibit" ) PORT_DIPLOCATION("DIL2:06")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unused ) ) PORT_DIPLOCATION("DIL2:07") //If an 'arcade' ROM, this flips, or is unused entirely.
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On  ) )
+	PORT_DIPNAME( 0x80, 0x00, "Single Credit Entry" ) PORT_DIPLOCATION("DIL2:08")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( v4cybcas )
+	PORT_INCLUDE( bwbvid )
+
+	PORT_MODIFY("BLACK1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+
+	PORT_MODIFY("BLACK2")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Nehmen")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Halten A")
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Halten B")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Halten C")
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Ensatz")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Exchange")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START2 ) PORT_NAME("Start Super")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start/Risiko")
 INPUT_PORTS_END
 
+
 WRITE_LINE_MEMBER(mpu4vid_state::mpu_video_reset)
 {
 	m_ptm->reset();
@@ -1155,7 +1857,7 @@
 {
 	mpu4_config_common();
 
-	m_mod_number=4; //No AY chip
+	m_mod_number=2;
 	/* setup communications */
 	m_link7a_connected = 1;
 }
@@ -1180,37 +1882,51 @@
 	m_chr_value     = 0;
 }
 
-void mpu4vid_state::mpu4_68k_map(address_map &map)
+void mpu4vid_state::mpu4_68k_map_base(address_map &map)
 {
 	map(0x000000, 0x7fffff).rom();
 	map(0x800000, 0x80ffff).ram().share("vid_mainram");
 //  map(0x810000, 0x81ffff).ram(); /* ? */
-	map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff);
-	map(0xa00001, 0xa00001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w));
-	map(0xa00003, 0xa00003).w("ef9369", FUNC(ef9369_device::address_w));
+	map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff).mirror(0x000004);
+	map(0xa00001, 0xa00001).rw(m_ef9369, FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w)).umask16(0x00ff);
+	map(0xa00002, 0xa00003).nopr(); // uses a clr instruction on address which generates a dummy read
+	map(0xa00003, 0xa00003).w(m_ef9369, FUNC(ef9369_device::address_w)).umask16(0x00ff);
 //  map(0xa00004, 0xa0000f).rw(FUNC(mpu4vid_state::mpu4_vid_unmap_r), FUNC(mpu4vid_state::mpu4_vid_unmap_w));
 	map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff);
 	map(0xc00000, 0xc1ffff).rw(FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram");
 	map(0xff8000, 0xff8003).rw(m_acia_1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff);
 	map(0xff9000, 0xff900f).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0x00ff);
+}
+
+void mpu4vid_state::mpu4_68k_map(address_map& map)
+{
+	mpu4_68k_map_base(map);
 	map(0xffd000, 0xffd00f).rw(FUNC(mpu4vid_state::vidcharacteriser_r), FUNC(mpu4vid_state::vidcharacteriser_w)).umask16(0x00ff);
 }
 
+void mpu4vid_state::mpu4_68k_map_strike(address_map& map)
+{
+	mpu4_68k_map_base(map);
+	map(0xffd000, 0xffd00f).rw(FUNC(mpu4vid_state::vidcharacteriser_4k_lookup_r), FUNC(mpu4vid_state::vidcharacteriser_4k_lookup_w)).umask16(0x00ff);
+}
+
+
 void mpu4vid_state::mpu4oki_68k_map(address_map &map)
 {
 	map(0x000000, 0x5fffff).rom(); //.nopw();
 	map(0x600000, 0x63ffff).ram(); /* The Mating Game has an extra 256kB RAM on the program card */
 //  map(0x640000, 0x7fffff).noprw(); /* Possible bug, reads and writes here */
 	map(0x800000, 0x80ffff).ram().share("vid_mainram");
-	map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff);
-	map(0xa00001, 0xa00001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w));
-	map(0xa00003, 0xa00003).w("ef9369", FUNC(ef9369_device::address_w));
+	map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff).mirror(0x000004);
+	map(0xa00001, 0xa00001).rw(m_ef9369, FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w)).umask16(0x00ff);
+	map(0xa00002, 0xa00003).nopr(); // uses a clr instruction on address which generates a dummy read
+	map(0xa00003, 0xa00003).w(m_ef9369, FUNC(ef9369_device::address_w)).umask16(0x00ff);
 	map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff);
 	map(0xc00000, 0xc1ffff).rw(FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram");
 	map(0xff8000, 0xff8003).rw(m_acia_1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff);
 	map(0xff9000, 0xff900f).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0x00ff);
 	map(0xffa040, 0xffa04f).r("ptm_ic3ss", FUNC(ptm6840_device::read)).umask16(0x00ff);  // 6840PTM on sampled sound board
-	map(0xffa040, 0xffa04f).w(FUNC(mpu4vid_state::ic3ss_w)).umask16(0x00ff);  // 6840PTM on sampled sound board
+	map(0xffa040, 0xffa04f).w(FUNC(mpu4vid_state::ic3ss_vid_w)).umask16(0x00ff);  // 6840PTM on sampled sound board
 	map(0xffa060, 0xffa067).rw("pia_ic4ss", FUNC(pia6821_device::read), FUNC(pia6821_device::write)).umask16(0x00ff);    // PIA6821 on sampled sound board
 	map(0xffd000, 0xffd00f).rw(FUNC(mpu4vid_state::vidcharacteriser_r), FUNC(mpu4vid_state::vidcharacteriser_w)).umask16(0x00ff);
 //  map(0xfff000, 0xffffff).noprw(); /* Possible bug, reads and writes here */
@@ -1221,36 +1937,82 @@
 	map(0x000000, 0x7fffff).rom();
 	map(0x800000, 0x80ffff).ram().share("vid_mainram");
 	map(0x810000, 0x81ffff).ram(); /* ? */
-	map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff);
-	map(0xa00001, 0xa00001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w));
-	map(0xa00003, 0xa00003).w("ef9369", FUNC(ef9369_device::address_w));
-//  map(0xa00000, 0xa0000f).rw(FUNC(mpu4vid_state::bt471_r), FUNC(mpu4vid_state::bt471_w)); //Some games use this
-//  map(0xa00004, 0xa0000f).rw(FUNC(mpu4vid_state::mpu4_vid_unmap_r), FUNC(mpu4vid_state::mpu4_vid_unmap_w));
+	map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff).mirror(0x000004);
+	map(0xa00001, 0xa00001).rw(m_ef9369, FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w)).umask16(0x00ff);
+	map(0xa00002, 0xa00003).nopr(); // uses a clr instruction on address which generates a dummy read
+	map(0xa00003, 0xa00003).w(m_ef9369, FUNC(ef9369_device::address_w)).umask16(0x00ff);
 	map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff);
 	map(0xc00000, 0xc1ffff).rw(FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram");
 	map(0xe00000, 0xe00003).rw(m_acia_1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff);
 	map(0xe01000, 0xe0100f).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0x00ff);
-	//map(0xa00004, 0xa0000f).rw(FUNC(mpu4vid_state::bwb_characteriser16_r), FUNC(mpu4vid_state::bwb_characteriser16_w)); //.rw(FUNC(mpu4vid_state::adpcm_r), FUNC(mpu4vid_state::adpcm_w));  CHR ?
 }
 
-void mpu4vid_state::bwbvid5_68k_map(address_map &map)
+void mpu4vid_state::bwbvidoki_68k_base_map(address_map &map)
 {
 	map(0x000000, 0x7fffff).rom();
 	map(0x800000, 0x80ffff).ram().share("vid_mainram");
 	map(0x810000, 0x81ffff).ram(); /* ? */
-	map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff);
-	map(0xa00001, 0xa00001).rw("ef9369", FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w));
-	map(0xa00003, 0xa00003).w("ef9369", FUNC(ef9369_device::address_w));
-//  map(0xa00000, 0xa00003).rw(FUNC(mpu4vid_state::bt471_r), FUNC(mpu4vid_state::bt471_w)).umask16(0x00ff); Some games use this
-//  map(0xa00004, 0xa0000f).rw(FUNC(mpu4vid_state::mpu4_vid_unmap_r), FUNC(mpu4vid_state::mpu4_vid_unmap_w));
+	map(0x900000, 0x900003).w("saa", FUNC(saa1099_device::write)).umask16(0x00ff).mirror(0x000004);
+
 	map(0xb00000, 0xb0000f).rw(m_scn2674, FUNC(scn2674_device::read), FUNC(scn2674_device::write)).umask16(0x00ff);
 	map(0xc00000, 0xc1ffff).rw(FUNC(mpu4vid_state::mpu4_vid_vidram_r), FUNC(mpu4vid_state::mpu4_vid_vidram_w)).share("vid_vidram");
 	map(0xe00000, 0xe00003).rw(m_acia_1, FUNC(acia6850_device::read), FUNC(acia6850_device::write)).umask16(0x00ff);
 	map(0xe01000, 0xe0100f).rw(m_ptm, FUNC(ptm6840_device::read), FUNC(ptm6840_device::write)).umask16(0x00ff);
-	map(0xe02000, 0xe02007).rw("pia_ic4ss", FUNC(pia6821_device::read), FUNC(pia6821_device::write)).umask16(0xff00); //Seems odd...
+	map(0xe02000, 0xe02007).rw("pia_ic4ss", FUNC(pia6821_device::read), FUNC(pia6821_device::write)).umask16(0xff00);
 	map(0xe03000, 0xe0300f).r("ptm_ic3ss", FUNC(ptm6840_device::read)).umask16(0xff00);  // 6840PTM on sampled sound board
-	map(0xe03000, 0xe0300f).w(FUNC(mpu4vid_state::ic3ss_w)).umask16(0xff00);  // 6840PTM on sampled sound board
-	map(0xe04000, 0xe0400f).rw(FUNC(mpu4vid_state::bwb_characteriser_r), FUNC(mpu4vid_state::bwb_characteriser_w)).umask16(0x00ff); //.rw(FUNC(mpu4vid_state::adpcm_r), FUNC(mpu4vid_state::adpcm_w));  CHR ?
+	map(0xe03000, 0xe0300f).w(FUNC(mpu4vid_state::ic3ss_vid_w)).umask16(0xff00);  // 6840PTM on sampled sound board
+	map(0xe05000, 0xe05001).noprw();
+}
+
+void mpu4vid_state::bwbvidoki_68k_map(address_map& map)
+{
+	bwbvidoki_68k_base_map(map);
+
+	map(0xa00001, 0xa00001).rw(m_ef9369, FUNC(ef9369_device::data_r), FUNC(ef9369_device::data_w)).umask16(0x00ff);
+	map(0xa00002, 0xa00003).nopr(); // uses a clr instruction on address which generates a dummy read
+	map(0xa00003, 0xa00003).w(m_ef9369, FUNC(ef9369_device::address_w)).umask16(0x00ff);
+}
+
+// TODO: use actual BT471 device, currently seems to not work when hooked up tho? fails detection?
+
+uint8_t mpu4vid_state::mpu4_vid_bt_a00004_r(offs_t offset)
+{
+	// used by software to detect alt palette type? (same value is written prior to this)
+	return 0xaf;
+}
+
+void mpu4vid_state::mpu4_vid_bt_a00008_w(offs_t offset, uint8_t data)
+{
+	m_bt_palbase = data;
+	m_bt_which = 0;
+}
+
+void mpu4vid_state::mpu4_vid_bt_a00002_w(offs_t offset, uint8_t data)
+{
+	switch (m_bt_which)
+	{
+	case 0: m_btpal_r[m_bt_palbase] = data;
+	case 1: m_btpal_g[m_bt_palbase] = data;
+	case 2: m_btpal_b[m_bt_palbase] = data;
+	}
+
+	m_bt_which++;
+
+	if (m_bt_which == 3)
+	{
+		m_bt_which = 0;
+		m_palette->set_pen_color(m_bt_palbase, pal6bit(m_btpal_r[m_bt_palbase]), pal6bit(m_btpal_g[m_bt_palbase]), pal6bit(m_btpal_b[m_bt_palbase]));
+		m_bt_palbase++;
+	}
+}
+
+void mpu4vid_state::bwbvidoki_68k_bt471_map(address_map& map)
+{
+	bwbvidoki_68k_base_map(map);
+
+	map(0xa00002, 0xa00003).w(FUNC(mpu4vid_state::mpu4_vid_bt_a00002_w)).umask16(0xffff);
+	map(0xa00004, 0xa00005).r(FUNC(mpu4vid_state::mpu4_vid_bt_a00004_r)).umask16(0xffff);
+	map(0xa00008, 0xa00009).w(FUNC(mpu4vid_state::mpu4_vid_bt_a00008_w)).umask16(0xffff);
 }
 
 /* TODO: Fix up MPU4 map*/
@@ -1271,6 +2033,57 @@
 	map(0xc000, 0xffff).rom().region("maincpu",0);  /* 64k EPROM on board, only this region read */
 }
 
+void mpu4vid_state::mpu4_6809_german_map(address_map &map)
+{
+	mpu4_6809_map(map);
+
+	map(0x4000, 0xbfff).ram();
+}
+
+//Sampled sound timer
+/*
+Unlike the standard setup, in MPU4 Video, the E clock is used for computation, so the chip frequency
+freq = (1000000/((t3L+1)(t3H+1)))*[(t3H(T3L+1)+1)/(2(t1+1))]
+where [] means rounded up integer,
+t3L is the LSB of Clock 3,
+t3H is the MSB of Clock 3,
+and t1 is the initial value in clock 1.
+*/
+
+//O3 -> G1  O1 -> c2 o2 -> c1
+
+/* This is a bit of a cheat - since we don't clock into the OKI chip directly, we need to
+calculate the oscillation frequency in advance. We're running the timer for interrupt
+purposes, but the frequency calculation is done by plucking the values out as they are written.*/
+void mpu4vid_state::ic3ss_vid_w(offs_t offset, uint8_t data)
+{
+	m_ptm_ic3ss->write(offset,data);
+
+	if (offset == 3)
+	{
+		m_t1 = data;
+	}
+	if (offset == 6)
+	{
+		m_t3h = data;
+	}
+	if (offset == 7)
+	{
+		m_t3l = data;
+	}
+
+	// E clock = VIDEO_MASTER_CLOCK / 10
+
+	float num = (1000000/((m_t3l + 1)*(m_t3h + 1)));
+	float denom1 = ((m_t3h *(m_t3l + 1)+ 1)/(2*(m_t1 + 1)));
+
+	int denom2 = denom1 + 0.5f;//need to round up, this gives same precision as chip
+	int freq=num*denom2;
+	if (freq)
+	{
+		m_msm6376->set_unscaled_clock(freq);
+	}
+}
 
 
 void mpu4vid_state::mpu4_vid(machine_config &config)
@@ -1278,10 +2091,18 @@
 	MC6809(config, m_maincpu, MPU4_MASTER_CLOCK);
 	m_maincpu->set_addrmap(AS_PROGRAM, &mpu4vid_state::mpu4_6809_map);
 
+
+	AY8913(config, m_ay8913, MPU4_MASTER_CLOCK/4);
+	m_ay8913->set_flags(AY8910_SINGLE_OUTPUT);
+	m_ay8913->set_resistors_load(820, 0, 0);
+	m_ay8913->add_route(ALL_OUTPUTS, "lspeaker", 1.0);
+	m_ay8913->add_route(ALL_OUTPUTS, "rspeaker", 1.0);
+
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);               /* confirm */
 
 	mpu4_common(config);
 
+
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_raw(VIDEO_MASTER_CLOCK, (63*8)+(17*8), 0, (63*8), (37*8)+17, 0, (37*8));
@@ -1292,6 +2113,7 @@
 
 	SCN2674(config, m_scn2674, VIDEO_MASTER_CLOCK / 8);
 	m_scn2674->intr_callback().set_inputline("video", M68K_IRQ_3);
+
 	m_scn2674->set_character_width(8);
 	m_scn2674->set_display_callback(FUNC(mpu4vid_state::display_pixels));
 	m_scn2674->set_addrmap(0, &mpu4vid_state::mpu4_vram);
@@ -1300,11 +2122,10 @@
 	m_videocpu->set_addrmap(AS_PROGRAM, &mpu4vid_state::mpu4_68k_map);
 	m_videocpu->set_reset_callback(FUNC(mpu4vid_state::mpu_video_reset));
 
-//  config.set_maximum_quantum(attotime::from_hz(960));
 
 	PALETTE(config, m_palette).set_entries(ef9369_device::NUMCOLORS);
 
-	EF9369(config, "ef9369").set_color_update_callback(FUNC(mpu4vid_state::ef9369_color_update));
+	EF9369(config, m_ef9369).set_color_update_callback(FUNC(mpu4vid_state::ef9369_color_update));
 
 	PTM6840(config, m_ptm, VIDEO_MASTER_CLOCK / 10); /* 68k E clock */
 	m_ptm->set_external_clocks(0, 0, 0);
@@ -1331,6 +2152,12 @@
 	m_acia_1->irq_handler().set(FUNC(mpu4vid_state::m68k_acia_irq));
 }
 
+void mpu4vid_state::mpu4_vid_strike(machine_config& config)
+{
+	mpu4_vid(config);
+	m_videocpu->set_addrmap(AS_PROGRAM, &mpu4vid_state::mpu4_68k_map_strike);
+}
+
 void mpu4vid_state::crmaze(machine_config &config)
 {
 	mpu4_vid(config);
@@ -1339,17 +2166,36 @@
 	m_pia5->writepb_handler().set_nop();
 }
 
+void mpu4vid_state::vid_oki(machine_config &config)
+{
+	//On MPU4 Video, the sound board is clocked via the 68k E clock,
+	//and all samples are adjusted to fit the different clock speed.
+	PTM6840(config, m_ptm_ic3ss, VIDEO_MASTER_CLOCK / 10);
+	m_ptm_ic3ss->set_external_clocks(0, 0, 0);
+	m_ptm_ic3ss->o1_callback().set("ptm_ic3ss", FUNC(ptm6840_device::set_c2));
+	m_ptm_ic3ss->o2_callback().set("ptm_ic3ss", FUNC(ptm6840_device::set_c1));
+	m_ptm_ic3ss->o3_callback().set("ptm_ic3ss", FUNC(ptm6840_device::set_g1));
+
+	PIA6821(config, m_pia_ic4ss, 0);
+	m_pia_ic4ss->readpb_handler().set(FUNC(mpu4vid_state::pia_gb_portb_r));
+	m_pia_ic4ss->writepa_handler().set(FUNC(mpu4vid_state::pia_gb_porta_w));
+	m_pia_ic4ss->writepb_handler().set(FUNC(mpu4vid_state::pia_gb_portb_w));
+	m_pia_ic4ss->ca2_handler().set(FUNC(mpu4vid_state::pia_gb_ca2_w));
+	m_pia_ic4ss->cb2_handler().set(FUNC(mpu4vid_state::pia_gb_cb2_w));
+
+	okim6376_device &msm6376(OKIM6376(config, "msm6376", 128000)); //Adjusted by IC3 on sound board
+	msm6376.add_route(0, "lspeaker", 0.5);
+	msm6376.add_route(1, "rspeaker", 0.5);
+}
+
 void mpu4vid_state::mating(machine_config &config)
 {
 	crmaze(config);
+	vid_oki(config);
 	m_videocpu->set_addrmap(AS_PROGRAM, &mpu4vid_state::mpu4oki_68k_map);
+}
 
-	mpu4_common2(config);
 
-	okim6376_device &msm6376(OKIM6376(config, "msm6376", 128000)); //?
-	msm6376.add_route(0, "lspeaker", 0.5);
-	msm6376.add_route(1, "rspeaker", 0.5);
-}
 
 void mpu4vid_state::bwbvid(machine_config &config)
 {
@@ -1357,27 +2203,41 @@
 	m_videocpu->set_addrmap(AS_PROGRAM, &mpu4vid_state::bwbvid_68k_map);
 }
 
-void mpu4vid_state::bwbvid5(machine_config &config)
+void mpu4vid_state::bwbvid_oki(machine_config &config)
+{
+	mpu4_vid(config);
+	m_videocpu->set_addrmap(AS_PROGRAM, &mpu4vid_state::bwbvidoki_68k_map);
+	vid_oki(config);
+}
+
+void mpu4vid_state::bwbvid_oki_bt471(machine_config &config)
 {
-	bwbvid(config);
-	m_videocpu->set_addrmap(AS_PROGRAM, &mpu4vid_state::bwbvid5_68k_map);
+	mpu4_vid(config);
+	m_videocpu->set_addrmap(AS_PROGRAM, &mpu4vid_state::bwbvidoki_68k_bt471_map);
+	vid_oki(config);
 
-	mpu4_common2(config);
+	config.device_remove("ef9369");
 
-	okim6376_device &msm6376(OKIM6376(config, "msm6376", 128000)); //?
-	msm6376.add_route(0, "lspeaker", 0.5);
-	msm6376.add_route(1, "rspeaker", 0.5);
+	PALETTE(config.replace(), m_palette).set_entries(256);
+
+}
+
+void mpu4vid_state::bwbvid_oki_bt471_german(machine_config &config)
+{
+	bwbvid_oki_bt471(config);
+	m_maincpu->set_addrmap(AS_PROGRAM, &mpu4vid_state::mpu4_6809_german_map);
 }
 
+
 /*
 Characteriser (CHR)
- The question data on the quiz games gets passed through the characterizer, the tables tested at startup are just a
+ The question data on the quiz games gets passed through the characteriser, the tables tested at startup are just a
  very specific test with known responses to make sure the device functions properly.  Unless there is extra encryption
  applied to just the question ROMs then the assumptions made here are wrong, because the questions don't decode.
 
  Perhaps the address lines for the question ROMS are scrambled somehow to make things decode, but how?
 
- It seems more likely that the Characterizer (PAL) acts as a challenge / response system, but various writes cause
+ It seems more likely that the Characteriser (PAL) acts as a challenge / response system, but various writes cause
  'latching' behavior because if you study the sequence written at startup you can see that the same write value should
  generate different responses.
 
@@ -1439,17 +2299,55 @@
 }
 
 
+void mpu4vid_state::vidcharacteriser_4k_lookup_w(offs_t offset, uint8_t data)
+{
+	logerror("%04x write to characteriser %02x - %02x\n", m_videocpu->pcbase(), offset, data);
+
+	if (data == 0x00) // reset?
+	{
+		m_4krow = 0;
+		m_prot_col = 0;
+	}
+	else
+	{
+		m_prot_col = data & 0x3f; // 6-bit writes (upper 2 bits unused)
+	}
+}
+
+uint8_t mpu4vid_state::vidcharacteriser_4k_lookup_r(offs_t offset)
+{
+	uint8_t ret = m_4ktable[m_4krow * 64 + m_prot_col];
+	m_4krow = ret;
+
+	// hack for v4strike, otherwise it reports questions as invalid, even if they decode properly
+	// is this a secondary security check, or are they mismatched for the version?
+	// it writes '03' to the characteriser, (the question revision or coincidence?)
+	// but expects 00 back for that check
+
+	if (m_videocpu->pcbase() == 0x32c4)
+	{
+		if (m_videocpu->state_int(M68K_A4) == 0xaab54)
+			ret = 0x00;
+	}
+
+	logerror("%04x read from characteriser %02x - %02x\n", m_videocpu->pcbase(), offset, ret);
+
+	return ret << 2; // 6-bit reads (lower 2 bits unused)
+}
+
 
+/*
 static mpu4_chr_table adders_data[64] = {
-	{0x00, 0x00}, {0x1A, 0x8C}, {0x04, 0x64}, {0x10, 0x84}, {0x18, 0x84}, {0x0F, 0xC4}, {0x13, 0x84}, {0x1B, 0x84},
-	{0x03, 0x9C}, {0x07, 0xF4}, {0x17, 0x04}, {0x1D, 0xCC}, {0x36, 0x24}, {0x35, 0x84}, {0x2B, 0xC4}, {0x28, 0x94},
-	{0x39, 0x54}, {0x21, 0x0C}, {0x22, 0x74}, {0x25, 0x0C}, {0x2C, 0x34}, {0x29, 0x04}, {0x31, 0x84}, {0x34, 0x84},
-	{0x0A, 0xC4}, {0x1F, 0x84}, {0x06, 0x9C}, {0x0E, 0xE4}, {0x1C, 0x84}, {0x12, 0x84}, {0x1E, 0x84}, {0x0D, 0xD4},
-	{0x14, 0x44}, {0x0A, 0x84}, {0x19, 0xC4}, {0x15, 0x84}, {0x06, 0x9C}, {0x0F, 0xE4}, {0x08, 0x84}, {0x1B, 0x84},
-	{0x1E, 0x84}, {0x04, 0x8C}, {0x01, 0x60}, {0x0C, 0x84}, {0x18, 0x84}, {0x1A, 0x84}, {0x11, 0x84}, {0x0B, 0xC4},
-	{0x03, 0x9C}, {0x17, 0xF4}, {0x10, 0x04}, {0x1D, 0xCC}, {0x0E, 0x24}, {0x07, 0x9C}, {0x12, 0xF4}, {0x09, 0x04},
-	{0x0D, 0x94}, {0x1F, 0x14}, {0x16, 0x44}, {0x05, 0x8C}, {0x13, 0x34}, {0x1C, 0x04}, {0x02, 0x9C}, {0x00, 0x00}
+    {0x00, 0x00}, {0x1A, 0x8C}, {0x04, 0x64}, {0x10, 0x84}, {0x18, 0x84}, {0x0F, 0xC4}, {0x13, 0x84}, {0x1B, 0x84},
+    {0x03, 0x9C}, {0x07, 0xF4}, {0x17, 0x04}, {0x1D, 0xCC}, {0x36, 0x24}, {0x35, 0x84}, {0x2B, 0xC4}, {0x28, 0x94},
+    {0x39, 0x54}, {0x21, 0x0C}, {0x22, 0x74}, {0x25, 0x0C}, {0x2C, 0x34}, {0x29, 0x04}, {0x31, 0x84}, {0x34, 0x84},
+    {0x0A, 0xC4}, {0x1F, 0x84}, {0x06, 0x9C}, {0x0E, 0xE4}, {0x1C, 0x84}, {0x12, 0x84}, {0x1E, 0x84}, {0x0D, 0xD4},
+    {0x14, 0x44}, {0x0A, 0x84}, {0x19, 0xC4}, {0x15, 0x84}, {0x06, 0x9C}, {0x0F, 0xE4}, {0x08, 0x84}, {0x1B, 0x84},
+    {0x1E, 0x84}, {0x04, 0x8C}, {0x01, 0x60}, {0x0C, 0x84}, {0x18, 0x84}, {0x1A, 0x84}, {0x11, 0x84}, {0x0B, 0xC4},
+    {0x03, 0x9C}, {0x17, 0xF4}, {0x10, 0x04}, {0x1D, 0xCC}, {0x0E, 0x24}, {0x07, 0x9C}, {0x12, 0xF4}, {0x09, 0x04},
+    {0x0D, 0x94}, {0x1F, 0x14}, {0x16, 0x44}, {0x05, 0x8C}, {0x13, 0x34}, {0x1C, 0x04}, {0x02, 0x9C}, {0x00, 0x00}
 };
+*/
 
 static mpu4_chr_table crmaze_data[64] = {
 	{0x00, 0x00}, {0x1A, 0x34}, {0x04, 0x14}, {0x10, 0x0C}, {0x18, 0x54}, {0x0F, 0x04}, {0x13, 0x24}, {0x1B, 0x34},
@@ -1539,16 +2437,18 @@
 	{0x0D, 0xC4}, {0x1F, 0x0C}, {0x16, 0xC4}, {0x05, 0x2C}, {0x13, 0xC4}, {0x1C, 0x0C}, {0x02, 0xD4}, {0x00, 0x00}
 };
 
+/*
 static mpu4_chr_table strikeit_data[64] = {
-	{0x00, 0x00}, {0x1A, 0xC4}, {0x04, 0xC4}, {0x10, 0x44}, {0x18, 0xC4}, {0x0F, 0x44}, {0x13, 0x44}, {0x1B, 0xC4},
-	{0x03, 0xCC}, {0x07, 0x3C}, {0x17, 0x5C}, {0x1D, 0x7C}, {0x36, 0x54}, {0x35, 0x24}, {0x2B, 0xC4}, {0x28, 0x4C},
-	{0x39, 0xB4}, {0x21, 0x84}, {0x22, 0xCC}, {0x25, 0x34}, {0x2C, 0x04}, {0x29, 0x4C}, {0x31, 0x14}, {0x34, 0x24},
-	{0x0A, 0xC4}, {0x1F, 0x44}, {0x06, 0xCC}, {0x0E, 0x14}, {0x1C, 0x04}, {0x12, 0x44}, {0x1E, 0xC4}, {0x0D, 0x4C},
-	{0x14, 0x1C}, {0x0A, 0x54}, {0x19, 0x2C}, {0x15, 0x1C}, {0x06, 0x7C}, {0x0F, 0xD4}, {0x08, 0x0C}, {0x1B, 0x94},
-	{0x1E, 0x04}, {0x04, 0xC4}, {0x01, 0xC0}, {0x0C, 0x4C}, {0x18, 0x94}, {0x1A, 0x04}, {0x11, 0x44}, {0x0B, 0x44},
-	{0x03, 0xCC}, {0x17, 0x1C}, {0x10, 0x7C}, {0x1D, 0x7C}, {0x0E, 0xD4}, {0x07, 0x8C}, {0x12, 0x1C}, {0x09, 0x5C},
-	{0x0D, 0x5C}, {0x1F, 0x5C}, {0x16, 0x7C}, {0x05, 0x74}, {0x13, 0x04}, {0x1C, 0xC4}, {0x02, 0xCC}, {0x00, 0x00}
+    {0x00, 0x00}, {0x1A, 0xC4}, {0x04, 0xC4}, {0x10, 0x44}, {0x18, 0xC4}, {0x0F, 0x44}, {0x13, 0x44}, {0x1B, 0xC4},
+    {0x03, 0xCC}, {0x07, 0x3C}, {0x17, 0x5C}, {0x1D, 0x7C}, {0x36, 0x54}, {0x35, 0x24}, {0x2B, 0xC4}, {0x28, 0x4C},
+    {0x39, 0xB4}, {0x21, 0x84}, {0x22, 0xCC}, {0x25, 0x34}, {0x2C, 0x04}, {0x29, 0x4C}, {0x31, 0x14}, {0x34, 0x24},
+    {0x0A, 0xC4}, {0x1F, 0x44}, {0x06, 0xCC}, {0x0E, 0x14}, {0x1C, 0x04}, {0x12, 0x44}, {0x1E, 0xC4}, {0x0D, 0x4C},
+    {0x14, 0x1C}, {0x0A, 0x54}, {0x19, 0x2C}, {0x15, 0x1C}, {0x06, 0x7C}, {0x0F, 0xD4}, {0x08, 0x0C}, {0x1B, 0x94},
+    {0x1E, 0x04}, {0x04, 0xC4}, {0x01, 0xC0}, {0x0C, 0x4C}, {0x18, 0x94}, {0x1A, 0x04}, {0x11, 0x44}, {0x0B, 0x44},
+    {0x03, 0xCC}, {0x17, 0x1C}, {0x10, 0x7C}, {0x1D, 0x7C}, {0x0E, 0xD4}, {0x07, 0x8C}, {0x12, 0x1C}, {0x09, 0x5C},
+    {0x0D, 0x5C}, {0x1F, 0x5C}, {0x16, 0x7C}, {0x05, 0x74}, {0x13, 0x04}, {0x1C, 0xC4}, {0x02, 0xCC}, {0x00, 0x00}
 };
+*/
 
 static mpu4_chr_table turnover_data[64] = {
 	{0x00, 0x00}, {0x1A, 0x1C}, {0x04, 0x6C}, {0x10, 0xA4}, {0x18, 0x0C}, {0x0F, 0x24}, {0x13, 0x0C}, {0x1B, 0x34},
@@ -1584,21 +2484,21 @@
 };
 
 static mpu4_chr_table blank_data[72] = {
-{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
-{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
-{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
-{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
-{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
-{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
-{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
-{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
-{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
+	{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
+	{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
+	{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
+	{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
+	{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
+	{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
+	{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
+	{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
+	{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},{0xff, 0xff},
 };
 
 
 #if 0
 static const bwb_chr_table prizeinv_data1[5] = {
-//This is all wrong, but without BwB Vid booting,
+//This is all wrong, but without BWB Vid booting,
 //I can't find the right values. These should be close though
 	{0x67},{0x17},{0x0f},{0x24},{0x3c},
 };
@@ -1609,11 +2509,13 @@
 {0x06, 0x20},{0xC6, 0x0f},{0xF8, 0x24},{0x8E, 0x3c},
 };
 
+/*
 void mpu4vid_state::init_adders()
 {
-	m_reels = 0;//currently no hybrid games
-	m_current_chr_table = adders_data;
+    m_reels = 0;//currently no hybrid games
+    m_current_chr_table = adders_data;
 }
+*/
 
 void mpu4vid_state::init_crmaze()
 {
@@ -1673,8 +2575,11 @@
 
 void mpu4vid_state::init_strikeit()
 {
+	m_led_extender = SIMPLE_CARD;
 	m_reels = 0;//currently no hybrid games
-	m_current_chr_table = strikeit_data;
+	m_current_chr_table = nullptr;
+	m_4ktable = memregion( "video_prot" )->base();
+	m_4krow = 0;
 }
 
 void mpu4vid_state::init_turnover()
@@ -1695,52 +2600,178 @@
 	m_current_chr_table = quidgrid_data;
 }
 
-void mpu4vid_state::init_prizeinv()
+void mpu4vid_state::init_v4frfact()
 {
-	m_reels = 0;//currently no hybrid games
-	m_current_chr_table = prizeinv_data;
+	mpu4vid_char_cheat(0x4f6);
 }
 
-static const bwb_chr_table cybcas_data1[5] = {
-//Magic number 724A
+void mpu4vid_state::hack_bwb_startup_protection()
+{
+	// there's no checksum that we need to fix after this
+	// so we can't be sure there are no bad dumps?
 
-// PAL Codes
-// 0   1   2  3  4  5  6  7  8
-// ??  ?? 20 0F 24 3C 36 27 09
+	uint16_t *rom = (uint16_t*)memregion("video")->base();
+	int len = memregion("video")->bytes()/2;
 
-	{0x67},{0x17},{0x0f},{0x24},{0x3c},
-};
+	uint16_t sequence[8] = { 0x3428, 0x0002, 0xb428, 0x0002, 0x671a, 0x2cbc, 0x0002, 0x4001 };
 
-static mpu4_chr_table cybcas_data[8] = {
-{0xEF, 0x02},{0x81, 0x00},{0xCE, 0x00},{0x00, 0x2e},
-{0x06, 0x20},{0xC6, 0x0f},{0xF8, 0x24},{0x8E, 0x3c},
-};
+	for (int i = 0; i < len - 8; i++)
+	{
 
-void mpu4vid_state::init_cybcas()
-{
-	//no idea what this should be, use blues boys table for now
-	m_bwb_chr_table1 = cybcas_data1;
-	m_current_chr_table = cybcas_data;
-}
+		bool matched = true;
+
+		for (int j = 0; j < 8; j++)
+		{
+			if (sequence[j] != rom[i + j])
+				matched = false;
+		}
 
+		if (matched)
+		{
+			logerror("boot protection match found at %08x\n", i * 2);
 
-void mpu4vid_state::mpu4vid_char_cheat( int address)
-{
-	uint8_t* cheattable = memregion( "video" )->base()+address;
-	m_current_chr_table = blank_data;
-	for (int i=0;i<72;i++)
-	{
-		m_current_chr_table[i].response = cheattable++[0];
-		m_current_chr_table[i].call = cheattable++[0];
+			rom[i + 5] = 0x6618;
+			rom[i + 6] = 0x4E71;
+			rom[i + 7] = 0x4E71;
+		}
 	}
 }
 
-void mpu4vid_state::init_v4barqst()
-{
-	mpu4vid_char_cheat(0x154);
-}
 
-void mpu4vid_state::init_v4barqst2()
+
+void mpu4vid_state::init_prizeinv()
+{
+	m_reels = 0;//currently no hybrid games
+	m_current_chr_table = prizeinv_data;
+
+	hack_bwb_startup_protection();
+}
+
+/*
+TODO: use official Barcrest / BWB letters here, some show them, eg D = protocol / datapak, Y = % Key needed
+this is based on header info in a few games, could differ, check!
+
+offset 0 : Option Byte
+
+YtSi safD
+
+D = Protocol / Datapak
+f = fixed %
+a = arcade
+s = switchable (or use offset 1 value)
+i = 'irish'
+S = special (use offset 2)
+t = token
+Y = % key needed
+
+offset 1: price of pay (per-game, used depending on above)
+
+offset 2: special game type (per-game>)
+
+---- --rg
+
+g = Bingo Gala A
+r = Bingo Rank R
+*/
+
+
+void mpu4vid_state::init_bwbhack()
+{
+	hack_bwb_startup_protection();
+
+
+	uint8_t* rom = memregion("maincpu")->base();
+	int len = memregion("maincpu")->bytes();
+
+	if (len != 0x10000)
+	{
+		logerror("main CPU size is not 0x10000!\n");
+		return;
+	}
+
+	for (int i = 0; i < 0x4000; i++)
+	{
+		if ((rom[i] != rom[i + 0x4000]) ||
+			(rom[i] != rom[i + 0x8000]) ||
+			(rom[i] != rom[i + 0xc000]))
+			logerror("main CPU ROM data not mirroring as expected at %04x!\n", i);
+	}
+
+	// helper for sorting out sets
+	uint8_t option = rom[0xc000];
+	uint8_t price = rom[0xc001];
+	uint8_t special = rom[0xc002];
+
+	logerror("option byte is %02x\n", option);
+	logerror("bit 0: Datapak     = %d\n", (option >> 0) & 1);
+	logerror("bit 1: Fixed %     = %d\n", (option >> 1) & 1);
+	logerror("bit 2: Arcade      = %d\n", (option >> 2) & 1);
+	logerror("bit 3: Switchable  = %d\n", (option >> 3) & 1);
+	logerror("bit 4: Irish       = %d\n", (option >> 4) & 1);
+	logerror("bit 5: Special     = %d\n", (option >> 5) & 1);
+	logerror("bit 6: Token       = %d\n", (option >> 6) & 1);
+	logerror("bit 7: Percent Key = %d\n", (option >> 7) & 1);
+
+	if (!((option >> 3) & 1))
+	{
+		logerror("Switchable was not set, so use coinage setting %02x\n", price);
+	}
+
+	if ((option >> 5) & 1)
+	{
+		logerror("Special was set, so use special setting %02x\n", special);
+	}
+}
+
+
+static const bwb_chr_table cybcas_data1[5] = {
+//Magic num4ber 724A
+
+// PAL Codes
+// 0   1   2  3  4  5  6  7  8
+// ??  ?? 20 0F 24 3C 36 27 09
+
+	{0x67},{0x17},{0x0f},{0x24},{0x3c},
+};
+
+static mpu4_chr_table cybcas_data[8] = {
+{0xEF, 0x02},{0x81, 0x00},{0xCE, 0x00},{0x00, 0x2e},
+{0x06, 0x20},{0xC6, 0x0f},{0xF8, 0x24},{0x8E, 0x3c},
+};
+
+void mpu4vid_state::init_cybcas()
+{
+	//no idea what this should be, use blues boys table for now
+	m_bwb_chr_table1 = cybcas_data1;
+	m_current_chr_table = cybcas_data;
+
+	hack_bwb_startup_protection();
+
+	// hack out half the startup checks for now until we work out what they're checking!
+	uint16_t *rom = (uint16_t*)memregion("video")->base();
+
+	for (int i = 0x1e42; i < 0x1e74; i += 2)
+		rom[i / 2] = 0x4e71;
+}
+
+
+void mpu4vid_state::mpu4vid_char_cheat( int address)
+{
+	uint8_t* cheattable = memregion( "video" )->base()+address;
+	m_current_chr_table = blank_data;
+	for (int i=0;i<72;i++)
+	{
+		m_current_chr_table[i].response = cheattable++[0];
+		m_current_chr_table[i].call = cheattable++[0];
+	}
+}
+
+void mpu4vid_state::init_v4barqst()
+{
+	mpu4vid_char_cheat(0x154);
+}
+
+void mpu4vid_state::init_v4barqst2()
 {
 	mpu4vid_char_cheat(0x15c);
 }
@@ -1780,9 +2811,9 @@
 	ROM_LOAD16_BYTE( "in2-20p1.4",  0x020001, 0x10000, CRC(04933278) SHA1(97462aef782f7fe82b60f4bddcad0e6a6b50f3df) )
 ROM_END
 
-ROM_START( v4psi214 )
+ROM_START( v4psid )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "in214.p1", 0x0000, 0x004000, CRC(4fb02448) SHA1(c2f2413a460012e3aadf7effbf8a33b40bc02df1) )
+	ROM_LOAD( "in20d.p1", 0x0000, 0x004000, CRC(e86e62a0) SHA1(97b0d41fa688cdd86bd6a1ef65cf143a34e23fac) )
 
 	ROM_REGION( 0x800000, "video", 0 )
 	ROM_LOAD16_BYTE( "in2-20p1.1",  0x000000, 0x10000, CRC(f34d9001) SHA1(2bae06f4a5a5510b15b918261ecb0de9e34a6b53) )
@@ -1791,30 +2822,29 @@
 	ROM_LOAD16_BYTE( "in2-20p1.4",  0x020001, 0x10000, CRC(04933278) SHA1(97462aef782f7fe82b60f4bddcad0e6a6b50f3df) )
 ROM_END
 
-ROM_START( v4psi20d )
+ROM_START( v4psi14 )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "in20d.p1", 0x0000, 0x004000, CRC(e86e62a0) SHA1(97b0d41fa688cdd86bd6a1ef65cf143a34e23fac) )
+	ROM_LOAD( "psi20int", 0x0000, 0x004000, CRC(20ee94b4) SHA1(4c77be34e20a843add2bba23c092fd5bba90bc45) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "in2-20p1.1",  0x000000, 0x10000, CRC(f34d9001) SHA1(2bae06f4a5a5510b15b918261ecb0de9e34a6b53) )
-	ROM_LOAD16_BYTE( "in2-20p1.2",  0x000001, 0x10000, CRC(1dc931b4) SHA1(c46626183edd52c7938c5edee2395aacb49e0730) )
-	ROM_LOAD16_BYTE( "in2-20p1.3",  0x020000, 0x10000, CRC(107aa448) SHA1(7b3d4053aaae3b97136cddefbc9edd5e61713ff7) )
-	ROM_LOAD16_BYTE( "in2-20p1.4",  0x020001, 0x10000, CRC(04933278) SHA1(97462aef782f7fe82b60f4bddcad0e6a6b50f3df) )
+	ROM_LOAD16_BYTE( "psi20p1", 0x000000, 0x010000, CRC(1795fe9c) SHA1(c93e0815d76ab4e55e7659d5c332db9d847a00b0) )
+	ROM_LOAD16_BYTE( "psi20p2", 0x000001, 0x010000, CRC(c1497581) SHA1(f6b64df97d90aa13ed7b5d42608b9014326a880b) )
+	ROM_LOAD16_BYTE( "psi20p3", 0x020000, 0x10000, NO_DUMP )
+	ROM_LOAD16_BYTE( "psi20p4", 0x020001, 0x010000, CRC(45ff4d46) SHA1(f3d402fad950adb366e4deb67b4038c0febae004) )
 ROM_END
 
-ROM_START( v4psi14d )
+ROM_START( v4psi14a )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "in14d.p1", 0x0000, 0x004000, CRC(cb9a093a) SHA1(225ca4f191f64f6ca3ed6bc7b58819a893fdd36a) )
+	ROM_LOAD( "in214.p1", 0x0000, 0x004000, CRC(4fb02448) SHA1(c2f2413a460012e3aadf7effbf8a33b40bc02df1) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "in2-20p1.1",  0x000000, 0x10000, CRC(f34d9001) SHA1(2bae06f4a5a5510b15b918261ecb0de9e34a6b53) )
-	ROM_LOAD16_BYTE( "in2-20p1.2",  0x000001, 0x10000, CRC(1dc931b4) SHA1(c46626183edd52c7938c5edee2395aacb49e0730) )
-	ROM_LOAD16_BYTE( "in2-20p1.3",  0x020000, 0x10000, CRC(107aa448) SHA1(7b3d4053aaae3b97136cddefbc9edd5e61713ff7) )
-	ROM_LOAD16_BYTE( "in2-20p1.4",  0x020001, 0x10000, CRC(04933278) SHA1(97462aef782f7fe82b60f4bddcad0e6a6b50f3df) )
+	ROM_LOAD16_BYTE( "psi20p1", 0x000000, 0x010000, CRC(1795fe9c) SHA1(c93e0815d76ab4e55e7659d5c332db9d847a00b0) )
+	ROM_LOAD16_BYTE( "psi20p2", 0x000001, 0x010000, CRC(c1497581) SHA1(f6b64df97d90aa13ed7b5d42608b9014326a880b) )
+	ROM_LOAD16_BYTE( "psi20p3", 0x020000, 0x10000, NO_DUMP )
+	ROM_LOAD16_BYTE( "psi20p4", 0x020001, 0x010000, CRC(45ff4d46) SHA1(f3d402fad950adb366e4deb67b4038c0febae004) )
 ROM_END
 
-
-ROM_START( v4psia )
+ROM_START( v4psibc )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD("psi12m.p1",  0x00000, 0x04000,  CRC(560b2085) SHA1(5dccede70e228d896ff11ff861c9f32b895e807d) )
 
@@ -1825,15 +2855,15 @@
 	ROM_LOAD16_BYTE( "psi12.p4",  0x020001, 0x10000, CRC(83781f1a) SHA1(a21d2e0ce6add058b5c6efad778a14128842b71b) )
 ROM_END
 
-ROM_START( v4psib )
+ROM_START( v4psibcd )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "psi20int", 0x0000, 0x004000, CRC(20ee94b4) SHA1(4c77be34e20a843add2bba23c092fd5bba90bc45) )
+	ROM_LOAD( "in14d.p1", 0x0000, 0x004000, CRC(cb9a093a) SHA1(225ca4f191f64f6ca3ed6bc7b58819a893fdd36a) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "psi20p1", 0x000000, 0x010000, CRC(1795fe9c) SHA1(c93e0815d76ab4e55e7659d5c332db9d847a00b0) )
-	ROM_LOAD16_BYTE( "psi20p2", 0x000001, 0x010000, CRC(c1497581) SHA1(f6b64df97d90aa13ed7b5d42608b9014326a880b) )
-	ROM_LOAD16_BYTE( "psi20p3", 0x020000, 0x10000, NO_DUMP )
-	ROM_LOAD16_BYTE( "psi20p4", 0x020001, 0x010000, CRC(45ff4d46) SHA1(f3d402fad950adb366e4deb67b4038c0febae004) )
+	ROM_LOAD16_BYTE( "psi12.p1",  0x000000, 0x10000, CRC(9a3972bd) SHA1(72c747c16b5a31a7efcf561c2f9ce151a559b1ac) )
+	ROM_LOAD16_BYTE( "psi12.p2",  0x000001, 0x10000, CRC(1a5da4f4) SHA1(f926cb650e2014a771621a497d4cc228c18f2979) )
+	ROM_LOAD16_BYTE( "psi12.p3",  0x020000, 0x10000, CRC(cab2e50b) SHA1(f5ba3ccef87bb7afc59e6aa38c364a492d11b0a2) )
+	ROM_LOAD16_BYTE( "psi12.p4",  0x020001, 0x10000, CRC(83781f1a) SHA1(a21d2e0ce6add058b5c6efad778a14128842b71b) )
 ROM_END
 
 
@@ -1846,7 +2876,7 @@
 	ROM_LOAD16_BYTE( "blxv___2.0_2",  0x000001, 0x10000, CRC(6b1f8588) SHA1(e8a443f062555f1ed228e1bfed2031927bcd7015) )
 	ROM_LOAD16_BYTE( "blxv___2.0_3",  0x020000, 0x10000, CRC(c62d704b) SHA1(bea0c9519063f1601f70372ccb49fb892fbd6e76) )
 	ROM_LOAD16_BYTE( "blxv___2.0_4",  0x020001, 0x10000, CRC(e431471a) SHA1(cf90dc48be3bc5e3c5a8efea5818dbc15fa442e9) )
-	ROM_LOAD16_BYTE( "blxv___2.0_5",  0x040001, 0x10000, CRC(98ac6bc7) SHA1(9575014ba21fa4330138a34f53e13d30d312bc8b) )
+	ROM_LOAD16_BYTE( "blxv___2.0_5",  0x040000, 0x10000, CRC(98ac6bc7) SHA1(9575014ba21fa4330138a34f53e13d30d312bc8b) )
 	ROM_LOAD16_BYTE( "blxv___2.0_6",  0x040001, 0x10000, CRC(a3d92b5b) SHA1(1e7042d5eae4a19a01a3ef7d806c434886dc9f4d) )
 ROM_END
 
@@ -1859,7 +2889,7 @@
 	ROM_LOAD16_BYTE( "blxv___2.0_2",  0x000001, 0x10000, CRC(6b1f8588) SHA1(e8a443f062555f1ed228e1bfed2031927bcd7015) )
 	ROM_LOAD16_BYTE( "blxv___2.0_3",  0x020000, 0x10000, CRC(c62d704b) SHA1(bea0c9519063f1601f70372ccb49fb892fbd6e76) )
 	ROM_LOAD16_BYTE( "blxv___2.0_4",  0x020001, 0x10000, CRC(e431471a) SHA1(cf90dc48be3bc5e3c5a8efea5818dbc15fa442e9) )
-	ROM_LOAD16_BYTE( "blxv___2.0_5",  0x040001, 0x10000, CRC(98ac6bc7) SHA1(9575014ba21fa4330138a34f53e13d30d312bc8b) )
+	ROM_LOAD16_BYTE( "blxv___2.0_5",  0x040000, 0x10000, CRC(98ac6bc7) SHA1(9575014ba21fa4330138a34f53e13d30d312bc8b) )
 	ROM_LOAD16_BYTE( "blxv___2.0_6",  0x040001, 0x10000, CRC(a3d92b5b) SHA1(1e7042d5eae4a19a01a3ef7d806c434886dc9f4d) )
 ROM_END
 
@@ -1872,20 +2902,20 @@
 	ROM_LOAD16_BYTE( "tetris22.p2",  0x000001, 0x10000, CRC(68aa4f15) SHA1(4e4511a64391fc64e5f5b7ccb46a78fd2e1d94d6) )
 	ROM_LOAD16_BYTE( "tetris22.p3",  0x020000, 0x10000, CRC(b38b4763) SHA1(d28e77fdd6869cb5b5ec40ed1f300a2a947e0482) )
 	ROM_LOAD16_BYTE( "tetris22.p4",  0x020001, 0x10000, CRC(1649f604) SHA1(ca4ac303391a0969d41c8f988b8e81cfcee1a21c) )
-	ROM_LOAD16_BYTE( "tetris22.p5",  0x040001, 0x10000, CRC(02859676) SHA1(5293c767021a6b5253eecab0b0568aa082ea7084) )
+	ROM_LOAD16_BYTE( "tetris22.p5",  0x040000, 0x10000, CRC(02859676) SHA1(5293c767021a6b5253eecab0b0568aa082ea7084) )
 	ROM_LOAD16_BYTE( "tetris22.p6",  0x040001, 0x10000, CRC(40d24c82) SHA1(7ac3cf148af84ad93eaf11ce3420abbe45d986e2) )
 ROM_END
 
 ROM_START( v4tetrs1 )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "tetv1int", 0x0000, 0x004000, CRC(98de975d) SHA1(5b4fc06aa8008d3967c68f364c47f8377a1ba9df) )
+	ROM_LOAD( "tetv1int", 0x0000, 0x004000, CRC(98de975d) SHA1(5b4fc06aa8008d3967c68f364c47f8377a1ba9df) ) // alt / earlier base ROM?
 
 	ROM_REGION( 0x800000, "video", 0 )
 	ROM_LOAD16_BYTE( "tetris22.p1",  0x000000, 0x10000, CRC(e81dd182) SHA1(28b460224abf6fe24b637542ccd1c84040674555) )
 	ROM_LOAD16_BYTE( "tetris22.p2",  0x000001, 0x10000, CRC(68aa4f15) SHA1(4e4511a64391fc64e5f5b7ccb46a78fd2e1d94d6) )
 	ROM_LOAD16_BYTE( "tetris22.p3",  0x020000, 0x10000, CRC(b38b4763) SHA1(d28e77fdd6869cb5b5ec40ed1f300a2a947e0482) )
 	ROM_LOAD16_BYTE( "tetris22.p4",  0x020001, 0x10000, CRC(1649f604) SHA1(ca4ac303391a0969d41c8f988b8e81cfcee1a21c) )
-	ROM_LOAD16_BYTE( "tetris22.p5",  0x040001, 0x10000, CRC(02859676) SHA1(5293c767021a6b5253eecab0b0568aa082ea7084) )
+	ROM_LOAD16_BYTE( "tetris22.p5",  0x040000, 0x10000, CRC(02859676) SHA1(5293c767021a6b5253eecab0b0568aa082ea7084) )
 	ROM_LOAD16_BYTE( "tetris22.p6",  0x040001, 0x10000, CRC(40d24c82) SHA1(7ac3cf148af84ad93eaf11ce3420abbe45d986e2) )
 ROM_END
 
@@ -1921,1521 +2951,5898 @@
 	ROM_REGION( 0x200000, "msm6376", 0 )
 	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
 	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
+ROM_END
 
-	ROM_REGION( 0x800000, "altvideo", 0 ) // alt revs of the video roms?
-	ROM_LOAD16_BYTE( "reno reels 5-1",    0x000000, 0x080000,  CRC(9ebd0eaf) SHA1(3d326509240fe8a83df9d2369f184838bee2b407) )
-	ROM_LOAD16_BYTE( "reno reels 5-2",    0x000001, 0x080000,  CRC(1cbcd9b5) SHA1(989d64e10c67dab7d20229e5c63d24111d556138) )
-	ROM_LOAD16_BYTE( "reno_71_27c040.bin",0x000000, 0x080000,  CRC(c1125c51) SHA1(a461049cd3768096c03f3a5149cdef31d0ab447e) )
-	ROM_LOAD16_BYTE( "reno_72_27c040.bin",0x000001, 0x080000,  CRC(31773743) SHA1(e1245f6b35c9049b3d1478e93fb1b6cfff34733e) )
-	ROM_LOAD16_BYTE( "rr8p1",             0x000000, 0x080000,  CRC(68992dd3) SHA1(75ab1cd02ac627b6191e9b61ee7c072029becaeb) )
-	ROM_LOAD16_BYTE( "rr8p2",             0x000001, 0x080000,  CRC(b859020e) SHA1(811ccac82d022ceccc83f1bf6c6b4de6cc313e14) )
-	ROM_LOAD16_BYTE( "rr______.8_1",      0x000000, 0x080000,  CRC(eca43ed4) SHA1(e2e4e5d3d4b659ddd74c120316b9658708e188f1) )
-	ROM_LOAD16_BYTE( "rr______.8_2",      0x000001, 0x080000,  CRC(c3f25586) SHA1(7335708a7d90c7fbd0088bb6ee5ce0255b9b18ab) )
-
-	ROM_REGION( 0x800000, "altmain", 0 ) // alt revs of MPU4 interface ROM
+ROM_START( v4renoa )
+	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD("rri20s__.a_0",    0x00000, 0x10000,   CRC(0fb9686a) SHA1(a403d4424897fcdc343b277aa0caa032ed970747) )
-	ROM_LOAD("rrixes__.a_0",    0x00000, 0x10000,   CRC(3f055fa1) SHA1(ee6561d6849e5150d7b7b5585e8ed8176e706aeb) )
-	ROM_LOAD("rrv8ss",          0x00000, 0x10000,   CRC(a37383a5) SHA1(6c2563967546d810f2c50aa9a269bb1369014c18) )
-	ROM_LOAD("rr_20ab_.a_0",    0x00000, 0x10000,   CRC(6da308aa) SHA1(c1f418592942a9f68aac9a5a6f91911b96861d48) )
-	ROM_LOAD("rr_20a_p.a_0",    0x00000, 0x10000,   CRC(0dc6b163) SHA1(5a666dec859807cab6478b06f38473997fe49cd6) )
-	ROM_LOAD("rr_20a__.a_0",    0x00000, 0x10000,   CRC(9b279f39) SHA1(9e9e80fdc8517a314bac15a5087d7619a84c1e00) )
-	ROM_LOAD("rr_20bgp.a_0",    0x00000, 0x10000,   CRC(7175112b) SHA1(799c822a6dabcf2a7d67b2ef81273a0fba6cf3d9) )
-	ROM_LOAD("rr_20bg_.a_0",    0x00000, 0x10000,   CRC(e7943f71) SHA1(490af3fc7d3506ca9c5c049a6fcffb856bf28d1e) )
-	ROM_LOAD("rr_20btp.a_0",    0x00000, 0x10000,   CRC(c73e1c28) SHA1(37c5b984311439906cae2ba48aab249caeb1f2ab) )
-	ROM_LOAD("rr_20bt_.a_0",    0x00000, 0x10000,   CRC(51df3272) SHA1(c9cc06556e79e09b9b3cd9816b6f7dde92dadfe7) )
-	ROM_LOAD("rr_20sbp.a_0",    0x00000, 0x10000,   CRC(0ea4be35) SHA1(2e3950bcc01f4c1ce53873b552cb156a91c74e85) )
-	ROM_LOAD("rr_20sb_.a_0",    0x00000, 0x10000,   CRC(9845906f) SHA1(693e480d548482c073644513803ddd4e5ed0694c) )
-	ROM_LOAD("rr_20s__.a_0",    0x00000, 0x10000,   CRC(6ec107fc) SHA1(46ac2bbb19ff4d562fa2e0029e9831be0bec5def) )
-	ROM_LOAD("rr_27sd_.a60",    0x00000, 0x10000,   CRC(0f6c18e6) SHA1(23f07d1ed2340e73abcf6b86581bc5dd768dbab5) )
-	ROM_LOAD("rr_37sd_.a60",    0x00000, 0x10000,   CRC(807e73c8) SHA1(202d621cead9b2af8fef12ea0d07a6fce6262518) )
-	ROM_LOAD("rr_37s__.a60",    0x00000, 0x10000,   CRC(cbdb9469) SHA1(bc802b4c15451feebc332944f6bc09c7fb20ea20) )
-	ROM_LOAD("rr_x7sd_.a60",    0x00000, 0x10000,   CRC(3fd02f2d) SHA1(49ae60e8bdc6681482272d31eefc0098cc6c9667) )
-	ROM_LOAD("rr_x7s__.a60",    0x00000, 0x10000,   CRC(7475c88c) SHA1(0425e722321d4f365f6e90de5159721ac8a9d0d2) )
-	ROM_LOAD("rr_xeadp.a_0",    0x00000, 0x10000,   CRC(76df6109) SHA1(fbc76a9612a48f1b589e43e2f920459ed6c32c57) )
-	ROM_LOAD("rr_xead_.a_0",    0x00000, 0x10000,   CRC(e03e4f53) SHA1(17b4bdf82393aacf74765f04fc0d9b1f683114cc) )
-	ROM_LOAD("rr_xea_p.a_0",    0x00000, 0x10000,   CRC(3d7a86a8) SHA1(98bb8b2c0705219536720eef404c7bbc14a85793) )
-	ROM_LOAD("rr_xea__.a_0",    0x00000, 0x10000,   CRC(ab9ba8f2) SHA1(52b77aa66980fa552d286225919fca9910f48326) )
 
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
 
-	ROM_REGION( 0x800000, "altsnd", 0 ) // alt revs of the sound roms?
-	ROM_LOAD( "reno reels sound 1a",  0x000000, 0x080000,  CRC(a8b7bba7) SHA1(5fa3512a6fdcf512fafa6261b3a99922a00d6874) ) // bad dump, only one ROM?
-
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-
-
-ROM_START( v4redhtp )
+ROM_START( v4renob )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD("rp_20s__.3_0",  0x00000, 0x10000,  CRC(b7d02d22) SHA1(f9da1c6dde064bc39d0c48a165dac7acde933397))
+	ROM_LOAD("rrixes__.a_0",    0x00000, 0x10000,   CRC(3f055fa1) SHA1(ee6561d6849e5150d7b7b5585e8ed8176e706aeb) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
-	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
-	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
-	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
-	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
-	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
 
-	ROM_REGION( 0x800000, "altvideo", 0 ) // alt revs of the video roms?
-	ROM_LOAD16_BYTE( "rp_05___.2_5", 0x040000, 0x010000, CRC(cc79187b) SHA1(b2e556fd7a1667203dcb196b1dc2d89bff785675) )
-	ROM_LOAD16_BYTE( "rp_05___.2_6", 0x040001, 0x010000, CRC(57d1cf7b) SHA1(c8d6f4d0e8a5a383c47300e8d56e13d62295f60f) )
-	ROM_LOAD16_BYTE( "rhp1.6p5", 0x040000, 0x010000, CRC(750436a1) SHA1(006a31fc5c22969bd79dbc54e618348ad7832ac7) )
-	ROM_LOAD16_BYTE( "rhp1.6p6", 0x040001, 0x010000, CRC(d78839c2) SHA1(e82b769cba4b8d50dcf5c301c03d4ca66e893f70) )
-	ROM_LOAD16_BYTE( "redhotpokervideoboardp5.bin", 0x040000, 0x010000, CRC(d36189b7) SHA1(7757ce9879754d4b8a450ba1f6067c17c151c13c) )
-	ROM_LOAD16_BYTE( "redhotpokervideoboardp6.bin", 0x040001, 0x010000, CRC(c89d164d) SHA1(0cf33db0f85958251624dd7bc2c3024814489040) )
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
+ROM_END
 
+ROM_START( v4renoc )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("rr_20ab_.a_0",    0x00000, 0x10000,   CRC(6da308aa) SHA1(c1f418592942a9f68aac9a5a6f91911b96861d48) )
 
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
 
-	ROM_REGION( 0x800000, "altmain", 0 ) // alt revs of MPU4 interface ROM
-	ROM_LOAD( "rhpmpu4.p1", 0x0000, 0x010000, CRC(e614757f) SHA1(96e825bedfb1715aa9b5d131e5b492247b17b725) )
-	ROM_LOAD( "redhotpoker20_mpu4_interface.bin", 0x0000, 0x010000, CRC(cafbcc82) SHA1(662df1f6409f9e20fac07c07d08eae3ea8ba362a) )
-	ROM_LOAD( "rhp20ac6", 0x0000, 0x010000, CRC(d6a842b4) SHA1(94f6cc6a9e0efa8a2eeee14f981f9d2407dfb092) )
-	ROM_LOAD( "rhpint", 0x0000, 0x010000, CRC(d60e7e30) SHA1(174f69ff2e76837455c107055b06f98875033b5e) )
-	ROM_LOAD( "rp_05a__.2_0", 0x0000, 0x010000, CRC(970fa9ad) SHA1(77550948aae171eae715e077cdbeffaeeadb2436) )
-	ROM_LOAD( "rp_05ab_.2_0", 0x0000, 0x010000, CRC(618b3e3e) SHA1(19f7c83957f1d0b36f62607d314a310748b3c84a) )
-	ROM_LOAD( "rp_05ad_.2_0", 0x0000, 0x010000, CRC(dcaa4e0c) SHA1(2a037722f5e951513c233227448c3a2e55de8ef9) )
-	ROM_LOAD( "rp_05ak_.2_0", 0x0000, 0x010000, CRC(2a2ed99f) SHA1(45215a140b4e9d6b190fff0b89fcbeffc054d732) )
-	ROM_LOAD( "rp_05s__.2_0", 0x0000, 0x010000, CRC(62e93168) SHA1(8287eee2d6ac4cc447ce6652de24dfe056015ef3) )
-	ROM_LOAD( "rp_05sb_.2_0", 0x0000, 0x010000, CRC(946da6fb) SHA1(d406f0bea0940b6910dc923ded0c89db9c1f3c61) )
-	ROM_LOAD( "rp_05sd_.2_0", 0x0000, 0x010000, CRC(294cd6c9) SHA1(4f2890c58cfa6d91ddc73d9098d8e45e79f410c3) )
-	ROM_LOAD( "rp_05sk_.2_0", 0x0000, 0x010000, CRC(dfc8415a) SHA1(5d9f946dc0307d16c9d90856d4ae2b4c8c5013a6) )
-	ROM_LOAD( "rp_10a__.3_0", 0x0000, 0x010000, CRC(90f58c6f) SHA1(c9b412172a6ef361407f486a8fb134ac68fe31e5) )
-	ROM_LOAD( "rp_10ab_.3_0", 0x0000, 0x010000, CRC(66711bfc) SHA1(ee51215479e57646e9490b6e898ca5092172879a) )
-	ROM_LOAD( "rp_10ad_.3_0", 0x0000, 0x010000, CRC(db506bce) SHA1(1f152e58a3a5251aa00f890df9a9930a72d84db6) )
-	ROM_LOAD( "rp_10ak_.3_0", 0x0000, 0x010000, CRC(2dd4fc5d) SHA1(b1e908ef70c98e7467a5f7d3ec26e7e6bfa1c475) )
-	ROM_LOAD( "rp_10bg_.3_0", 0x0000, 0x010000, CRC(ec462c27) SHA1(88379585055f245c8d84bd1295e7f5b6555ad8c3) )
-	ROM_LOAD( "rp_10s__.3_0", 0x0000, 0x010000, CRC(651314aa) SHA1(f11cd9c9419511e179acd2883d83cb475eb4d761) )
-	ROM_LOAD( "rp_10sb_.3_0", 0x0000, 0x010000, CRC(93978339) SHA1(7c943fe44103d0ac276b4478e20709d6ab0b07d5) )
-	ROM_LOAD( "rp_10sd_.3_0", 0x0000, 0x010000, CRC(2eb6f30b) SHA1(5aa3161888ad50bb9c1945bff32e6d8552ab4c89) )
-	ROM_LOAD( "rp_10sk_.3_0", 0x0000, 0x010000, CRC(d8326498) SHA1(89ab78991ea72f5186488714e8b7daeafa1e9497) )
-	ROM_LOAD( "rp_20a__.3_0", 0x0000, 0x010000, CRC(4236b5e7) SHA1(1bd73c8fd20a176c25288becb6f07b7f0447ede3) )
-	ROM_LOAD( "rp_20ab_.3_0", 0x0000, 0x010000, CRC(b4b22274) SHA1(f5f4d4f88d74454e6857118dc3eba90defd15e50) )
-	ROM_LOAD( "rp_20ad_.3_0", 0x0000, 0x010000, CRC(09935246) SHA1(e82749b575f22373a3a7f24a8f68980e8040ac9d) )
-	ROM_LOAD( "rp_20ak_.3_0", 0x0000, 0x010000, CRC(ff17c5d5) SHA1(1aa1ca348cd8828e616a4781704445d04800b970) )
-	ROM_LOAD( "rp_20bg_.3_0", 0x0000, 0x010000, CRC(3e8515af) SHA1(3df382818b1d527ab4037a0dca24ba28227ab6a4) )
-	ROM_LOAD( "rp_20sb_.3_0", 0x0000, 0x010000, CRC(4154bab1) SHA1(b3d5dcdd276e3b2fc1f5d66a870e85c5064f0f5b) )
-	ROM_LOAD( "rp_20sd_.3_0", 0x0000, 0x010000, CRC(fc75ca83) SHA1(9cf7178c990151c7711c8bca68c0dd85325808ab) )
-	ROM_LOAD( "rp_20sk_.3_0", 0x0000, 0x010000, CRC(0af15d10) SHA1(df1367176f8f2efcc21cf5c841125f9553ad0c8a) )
-	ROM_LOAD( "rp_xca__.3_0", 0x0000, 0x010000, CRC(728a822c) SHA1(b23e4893325c2dbeb8f72114dd1e5c3f06a786a8) )
-	ROM_LOAD( "rp_xcab_.3_0", 0x0000, 0x010000, CRC(840e15bf) SHA1(9eba10eeebdf1c801186ae2c0206292da28ab7c5) )
-	ROM_LOAD( "rp_xcad_.3_0", 0x0000, 0x010000, CRC(392f658d) SHA1(c730a5e54faab1946554af9e6b9e08dc50bbe9d6) )
-	ROM_LOAD( "rp_xcak_.3_0", 0x0000, 0x010000, CRC(cfabf21e) SHA1(9cec91ea209d250ba885552579044b5ce9d730bd) )
-	ROM_LOAD( "rp_xcbg_.3_0", 0x0000, 0x010000, CRC(0e392264) SHA1(aeb5a4df61b3e67100912ede2f5e127d413b656c) )
-	ROM_LOAD( "rp_xcs__.3_0", 0x0000, 0x010000, CRC(876c1ae9) SHA1(9ea1b2a28f2b87089500dd25e6dc1450be43acbc) )
-	ROM_LOAD( "rp_xcsb_.3_0", 0x0000, 0x010000, CRC(71e88d7a) SHA1(81d38e598514a5a1b9bca0131232b18c3829edfb) )
-	ROM_LOAD( "rp_xcsd_.3_0", 0x0000, 0x010000, CRC(ccc9fd48) SHA1(1069b945b5312eb01139b7671901212f8f65e3bf) )
-	ROM_LOAD( "rp_xcsk_.3_0", 0x0000, 0x010000, CRC(3a4d6adb) SHA1(01dfead74d40af9a5a4a95781b83d078cfb92ac9) )
-	ROM_LOAD( "rpi10___.3_0", 0x0000, 0x010000, CRC(046b7b3c) SHA1(71f74153dbdd52036a55fc0a217120dee84ca230) )
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmaze )
+ROM_START( v4renod )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_20a_p.a_0",    0x00000, 0x10000,   CRC(0dc6b163) SHA1(5a666dec859807cab6478b06f38473997fe49cd6) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "crys.p1", 0x000000, 0x80000,  CRC(40fbde50) SHA1(91bd21c0aaffb9c9b89a114affbc485b12ae9bb4) )
-	ROM_LOAD16_BYTE( "cry.p2",  0x000001, 0x80000,  CRC(fa7d006f) SHA1(ecc03b4d7a4089feccc53ad05313c35b33e061d7) )
-	ROM_LOAD16_BYTE( "cry.p3",  0x100000, 0x80000,  CRC(e8cf8203) SHA1(e9f42e5c18b97807f51284ad2416346578ed73c4) )
-	ROM_LOAD16_BYTE( "cry.p4",  0x100001, 0x80000,  CRC(7b036151) SHA1(7b0040c296059b1e1798ddedf0ecb4582d67ee70) )
-	ROM_LOAD16_BYTE( "cry.p5",  0x200000, 0x80000,  CRC(48f17b20) SHA1(711c46fcfd86ded8ff7da883188d70560d20e42f) )
-	ROM_LOAD16_BYTE( "cry.p6",  0x200001, 0x80000,  CRC(2b3d9a97) SHA1(7468fffd90d840d245a70475b42308f1e48c5017) )
-	ROM_LOAD16_BYTE( "cry.p7",  0x300000, 0x80000,  CRC(20f73433) SHA1(593b40ac17591ac312ad41b4d3a5772626137bba) )
-	ROM_LOAD16_BYTE( "cry.p8",  0x300001, 0x80000,  CRC(835da1f2) SHA1(f93e075916d370466832871410591570ad7b9f3b) )
-	ROM_LOAD16_BYTE( "cry.p9",  0x400000, 0x80000,  CRC(c0e442ee) SHA1(a3877b200538642fe2bc96cfe8b33f04d8a82a98) )
-	ROM_LOAD16_BYTE( "cry.p10", 0x400001, 0x80000,  CRC(500172fa) SHA1(d83a37612daa79ba8425fdb28f39b8324b5736b6) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmazedat )
+ROM_START( v4renoe )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_20a__.a_0",    0x00000, 0x10000,   CRC(9b279f39) SHA1(9e9e80fdc8517a314bac15a5087d7619a84c1e00) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "cryd.p1", 0x000000, 0x80000,  CRC(b245f661) SHA1(85a8baca8797fea74bc36eea077be56bde8e54a9) )
-	ROM_LOAD16_BYTE( "cry.p2",  0x000001, 0x80000,  CRC(fa7d006f) SHA1(ecc03b4d7a4089feccc53ad05313c35b33e061d7) )
-	ROM_LOAD16_BYTE( "cry.p3",  0x100000, 0x80000,  CRC(e8cf8203) SHA1(e9f42e5c18b97807f51284ad2416346578ed73c4) )
-	ROM_LOAD16_BYTE( "cry.p4",  0x100001, 0x80000,  CRC(7b036151) SHA1(7b0040c296059b1e1798ddedf0ecb4582d67ee70) )
-	ROM_LOAD16_BYTE( "cry.p5",  0x200000, 0x80000,  CRC(48f17b20) SHA1(711c46fcfd86ded8ff7da883188d70560d20e42f) )
-	ROM_LOAD16_BYTE( "cry.p6",  0x200001, 0x80000,  CRC(2b3d9a97) SHA1(7468fffd90d840d245a70475b42308f1e48c5017) )
-	ROM_LOAD16_BYTE( "cry.p7",  0x300000, 0x80000,  CRC(20f73433) SHA1(593b40ac17591ac312ad41b4d3a5772626137bba) )
-	ROM_LOAD16_BYTE( "cry.p8",  0x300001, 0x80000,  CRC(835da1f2) SHA1(f93e075916d370466832871410591570ad7b9f3b) )
-	ROM_LOAD16_BYTE( "cry.p9",  0x400000, 0x80000,  CRC(c0e442ee) SHA1(a3877b200538642fe2bc96cfe8b33f04d8a82a98) )
-	ROM_LOAD16_BYTE( "cry.p10", 0x400001, 0x80000,  CRC(500172fa) SHA1(d83a37612daa79ba8425fdb28f39b8324b5736b6) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmazea )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+
+ROM_START( v4renof )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("rr_20bgp.a_0",    0x00000, 0x10000,   CRC(7175112b) SHA1(799c822a6dabcf2a7d67b2ef81273a0fba6cf3d9) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "am1z.p1",  0x000000, 0x80000,  CRC(d2fdda6d) SHA1(96c27dedc3cf1dd478e6169200844d418a276f14) )
-	ROM_LOAD16_BYTE( "am1z.p2",  0x000001, 0x80000,  CRC(1637170f) SHA1(fd17a0e7794f01bf4ad7a16b185f87cb060c70ab) )
-	ROM_LOAD16_BYTE( "am1g.p1",  0x100000, 0x80000,  CRC(e8cf8203) SHA1(e9f42e5c18b97807f51284ad2416346578ed73c4) )
-	ROM_LOAD16_BYTE( "am1g.p2",  0x100001, 0x80000,  CRC(7b036151) SHA1(7b0040c296059b1e1798ddedf0ecb4582d67ee70) )
-	ROM_LOAD16_BYTE( "am1g.p3",  0x200000, 0x80000,  CRC(48f17b20) SHA1(711c46fcfd86ded8ff7da883188d70560d20e42f) )
-	ROM_LOAD16_BYTE( "am1g.p4",  0x200001, 0x80000,  CRC(2b3d9a97) SHA1(7468fffd90d840d245a70475b42308f1e48c5017) )
-	ROM_LOAD16_BYTE( "am1g.p5",  0x300000, 0x80000,  CRC(68286bb1) SHA1(c307e3ad1e0fd92314216c8e554aafa949559452) )
-	ROM_LOAD16_BYTE( "am1g.p6",  0x300001, 0x80000,  CRC(a6b498ad) SHA1(117e1a4ec7e2d3c7d530c5a56cbc1d24b0ddc747) )
-	ROM_LOAD16_BYTE( "am1g.p7",  0x400000, 0x80000,  CRC(15882699) SHA1(b29a331e51a37554323b91330a7c2b62b33a943a) )
-	ROM_LOAD16_BYTE( "am1g.p8",  0x400001, 0x80000,  CRC(6f0f855b) SHA1(ab411d1af0f88049a6c435bafd4b1fa63f5519b1) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmazeb ) /* Was in a romset called 'Mad Money!' */
+ROM_START( v4renog )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_20bg_.a_0",    0x00000, 0x10000,   CRC(e7943f71) SHA1(490af3fc7d3506ca9c5c049a6fcffb856bf28d1e) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "cm1.2p1", 0x000000, 0x040000, CRC(481f2fe2) SHA1(7bff9476dbd8c0812a51cd648acf11ca42789e54) )
-	ROM_LOAD16_BYTE( "cm1.2p2", 0x000001, 0x040000, CRC(6e6dc121) SHA1(05b29ea935d54aa97279e0a80265412747a92a10) )
-	ROM_LOAD16_BYTE( "cry.p3",  0x100000, 0x80000,  CRC(e8cf8203) SHA1(e9f42e5c18b97807f51284ad2416346578ed73c4) )
-	ROM_LOAD16_BYTE( "cry.p4",  0x100001, 0x80000,  CRC(7b036151) SHA1(7b0040c296059b1e1798ddedf0ecb4582d67ee70) )
-	ROM_LOAD16_BYTE( "cry.p5",  0x200000, 0x80000,  CRC(48f17b20) SHA1(711c46fcfd86ded8ff7da883188d70560d20e42f) )
-	ROM_LOAD16_BYTE( "cry.p6",  0x200001, 0x80000,  CRC(2b3d9a97) SHA1(7468fffd90d840d245a70475b42308f1e48c5017) )
-	ROM_LOAD16_BYTE( "cry.p7",  0x300000, 0x80000,  CRC(20f73433) SHA1(593b40ac17591ac312ad41b4d3a5772626137bba) )
-	ROM_LOAD16_BYTE( "cry.p8",  0x300001, 0x80000,  CRC(835da1f2) SHA1(f93e075916d370466832871410591570ad7b9f3b) )
-	ROM_LOAD16_BYTE( "cry.p9",  0x400000, 0x80000,  CRC(c0e442ee) SHA1(a3877b200538642fe2bc96cfe8b33f04d8a82a98) )
-	ROM_LOAD16_BYTE( "cry.p10", 0x400001, 0x80000,  CRC(500172fa) SHA1(d83a37612daa79ba8425fdb28f39b8324b5736b6) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmazec )
+ROM_START( v4renoh )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_20btp.a_0",    0x00000, 0x10000,   CRC(c73e1c28) SHA1(37c5b984311439906cae2ba48aab249caeb1f2ab) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "cm1.p1",  0x000000, 0x040000, CRC(40533c1d) SHA1(06f115b7e1008e8797767d3f1e37edb4c1ce6675) )
-	ROM_LOAD16_BYTE( "cm1.p2",  0x000001, 0x040000, CRC(8b207eca) SHA1(cbd6b1b177daefe255609f7adc00effa6afc9cb5) )
-	ROM_LOAD16_BYTE( "cry.p3",  0x100000, 0x80000,  CRC(e8cf8203) SHA1(e9f42e5c18b97807f51284ad2416346578ed73c4) )
-	ROM_LOAD16_BYTE( "cry.p4",  0x100001, 0x80000,  CRC(7b036151) SHA1(7b0040c296059b1e1798ddedf0ecb4582d67ee70) )
-	ROM_LOAD16_BYTE( "cry.p5",  0x200000, 0x80000,  CRC(48f17b20) SHA1(711c46fcfd86ded8ff7da883188d70560d20e42f) )
-	ROM_LOAD16_BYTE( "cry.p6",  0x200001, 0x80000,  CRC(2b3d9a97) SHA1(7468fffd90d840d245a70475b42308f1e48c5017) )
-	ROM_LOAD16_BYTE( "cry.p7",  0x300000, 0x80000,  CRC(20f73433) SHA1(593b40ac17591ac312ad41b4d3a5772626137bba) )
-	ROM_LOAD16_BYTE( "cry.p8",  0x300001, 0x80000,  CRC(835da1f2) SHA1(f93e075916d370466832871410591570ad7b9f3b) )
-	ROM_LOAD16_BYTE( "cry.p9",  0x400000, 0x80000,  CRC(c0e442ee) SHA1(a3877b200538642fe2bc96cfe8b33f04d8a82a98) )
-	ROM_LOAD16_BYTE( "cry.p10", 0x400001, 0x80000,  CRC(500172fa) SHA1(d83a37612daa79ba8425fdb28f39b8324b5736b6) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmazed )
+ROM_START( v4renoi )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_20bt_.a_0",    0x00000, 0x10000,   CRC(51df3272) SHA1(c9cc06556e79e09b9b3cd9816b6f7dde92dadfe7) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "cmz11p1",  0x000000, 0x040000, CRC(887baf65) SHA1(096133414bff89db4e30405f72f3c994f962be08) )
-	ROM_LOAD16_BYTE( "cmz11p2",  0x000001, 0x040000, CRC(f8f095a6) SHA1(6b23fe3712416bf268c6387d3b304f05206d45e1) )
-	ROM_LOAD16_BYTE( "cry.p3",  0x100000, 0x80000,  CRC(e8cf8203) SHA1(e9f42e5c18b97807f51284ad2416346578ed73c4) )
-	ROM_LOAD16_BYTE( "cry.p4",  0x100001, 0x80000,  CRC(7b036151) SHA1(7b0040c296059b1e1798ddedf0ecb4582d67ee70) )
-	ROM_LOAD16_BYTE( "cry.p5",  0x200000, 0x80000,  CRC(48f17b20) SHA1(711c46fcfd86ded8ff7da883188d70560d20e42f) )
-	ROM_LOAD16_BYTE( "cry.p6",  0x200001, 0x80000,  CRC(2b3d9a97) SHA1(7468fffd90d840d245a70475b42308f1e48c5017) )
-	ROM_LOAD16_BYTE( "cry.p7",  0x300000, 0x80000,  CRC(20f73433) SHA1(593b40ac17591ac312ad41b4d3a5772626137bba) )
-	ROM_LOAD16_BYTE( "cry.p8",  0x300001, 0x80000,  CRC(835da1f2) SHA1(f93e075916d370466832871410591570ad7b9f3b) )
-	ROM_LOAD16_BYTE( "cry.p9",  0x400000, 0x80000,  CRC(c0e442ee) SHA1(a3877b200538642fe2bc96cfe8b33f04d8a82a98) )
-	ROM_LOAD16_BYTE( "cry.p10", 0x400001, 0x80000,  CRC(500172fa) SHA1(d83a37612daa79ba8425fdb28f39b8324b5736b6) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
+ROM_START( v4renoj )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("rr_20sbp.a_0",    0x00000, 0x10000,   CRC(0ea4be35) SHA1(2e3950bcc01f4c1ce53873b552cb156a91c74e85) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
 
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
+ROM_END
 
-//The New Crystal Maze Featuring Ocean Zone
-ROM_START( v4cmaze2 )
+ROM_START( v4renok )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_20sb_.a_0",    0x00000, 0x10000,   CRC(9845906f) SHA1(693e480d548482c073644513803ddd4e5ed0694c) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "cm2s.p1", 0x000000, 0x80000,  CRC(2bcdff56) SHA1(5ae4d4960db032ec9b8d66c53bc151830d009f61) )
-	ROM_LOAD16_BYTE( "cm2s.p2", 0x000001, 0x80000,  CRC(92126def) SHA1(531593dee05954000d9836018aeff9460aecbd26) )
-	ROM_LOAD16_BYTE( "cm2.p3",  0x100000, 0x80000,  CRC(88324715) SHA1(c6c8de4e5aeda14232ec7b026da389774b3c7bb1) )
-	ROM_LOAD16_BYTE( "cm2.p4",  0x100001, 0x80000,  CRC(8d54a81d) SHA1(37753cf8595647aaf8b8267ca177b6744de9c6d4) )
-	ROM_LOAD16_BYTE( "cm2.p5",  0x200000, 0x80000,  CRC(5cf8a2bf) SHA1(2514e78e82842fa5c85d26de35637269cd08b21d) )
-	ROM_LOAD16_BYTE( "cm2.p6",  0x200001, 0x80000,  CRC(cf793d2d) SHA1(579c759f57fb6bb87aa27c9d5fb684058913dedc) )
-	ROM_LOAD16_BYTE( "cm2.p7",  0x300000, 0x80000,  CRC(008aa4b0) SHA1(b4cec6d11abd0e111c295533700595398ff59075) )
-	ROM_LOAD16_BYTE( "cm2.p8",  0x300001, 0x80000,  CRC(bac04f5a) SHA1(130721b7abf28dea1f8162705c8bfc5a4bb78152) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmaze2d )
+ROM_START( v4renol )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_20s__.a_0",    0x00000, 0x10000,   CRC(6ec107fc) SHA1(46ac2bbb19ff4d562fa2e0029e9831be0bec5def) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "cm2d.p1", 0x000000, 0x80000,  CRC(a150027b) SHA1(f737b0e3b8954c1589a929b7e567cb55df4a3997) )
-	ROM_LOAD16_BYTE( "cm2d.p2", 0x000001, 0x80000,  CRC(84ed6bce) SHA1(7a11473e7ec277508952f7ae6cfc7ed28e1b5c99) )
-	ROM_LOAD16_BYTE( "cm2.p3",  0x100000, 0x80000,  CRC(88324715) SHA1(c6c8de4e5aeda14232ec7b026da389774b3c7bb1) )
-	ROM_LOAD16_BYTE( "cm2.p4",  0x100001, 0x80000,  CRC(8d54a81d) SHA1(37753cf8595647aaf8b8267ca177b6744de9c6d4) )
-	ROM_LOAD16_BYTE( "cm2.p5",  0x200000, 0x80000,  CRC(5cf8a2bf) SHA1(2514e78e82842fa5c85d26de35637269cd08b21d) )
-	ROM_LOAD16_BYTE( "cm2.p6",  0x200001, 0x80000,  CRC(cf793d2d) SHA1(579c759f57fb6bb87aa27c9d5fb684058913dedc) )
-	ROM_LOAD16_BYTE( "cm2.p7",  0x300000, 0x80000,  CRC(008aa4b0) SHA1(b4cec6d11abd0e111c295533700595398ff59075) )
-	ROM_LOAD16_BYTE( "cm2.p8",  0x300001, 0x80000,  CRC(bac04f5a) SHA1(130721b7abf28dea1f8162705c8bfc5a4bb78152) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmaze2a )
+ROM_START( v4renom )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_27sd_.a60",    0x00000, 0x10000,   CRC(0f6c18e6) SHA1(23f07d1ed2340e73abcf6b86581bc5dd768dbab5) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "am2z.p1",  0x000000, 0x80000,  CRC(f27e02f0) SHA1(8637904c201ece4f08ad63b4fd6d06a860fa762f) )
-	ROM_LOAD16_BYTE( "am2z.p2",  0x000001, 0x80000,  CRC(4d24f482) SHA1(9e3687db9d0233e56999017f3ed59ec543bce303) )
-	ROM_LOAD16_BYTE( "am2g.p1",  0x100000, 0x80000,  CRC(115402db) SHA1(250f2eded1b88a1abf82febb009eadbb90936f8a) )
-	ROM_LOAD16_BYTE( "am2g.p2",  0x100001, 0x80000,  CRC(5d804fbb) SHA1(8dc02eb9329f9c29d4bcc9a0315ae96085625d3e) )
-	ROM_LOAD16_BYTE( "am2g.p3",  0x200000, 0x80000,  CRC(5ead0c06) SHA1(35d9aefc60e2c391e32f8119a6dc44434d91c09e) )
-	ROM_LOAD16_BYTE( "am2g.p4",  0x200001, 0x80000,  CRC(de4fb542) SHA1(4bf8f8f6850fd819d91827d3c474bd488e61e5ac) )
-	ROM_LOAD16_BYTE( "am2g.p5",  0x300000, 0x80000,  CRC(80b01ce2) SHA1(4a3a4bcff4bd9affd1a5eeca5781b6af05bbcc16) )
-	ROM_LOAD16_BYTE( "am2g.p6",  0x300001, 0x80000,  CRC(3e134ecc) SHA1(1f8cdce62e693eb07c4620b64cc467339c0563de) )
-	ROM_LOAD16_BYTE( "am2g.p7",  0x400000, 0x80000,  CRC(6eb36f1d) SHA1(08b9ec184d64bdbdfa61d3e991a3647e74a7756f) )
-	ROM_LOAD16_BYTE( "am2g.p8",  0x400001, 0x80000,  CRC(dda353ef) SHA1(56a5b43f0b0bd9dbf348946a5758ebe63eadb8cf) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmaze2b )
+ROM_START( v4renon )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_37sd_.a60",    0x00000, 0x10000,   CRC(807e73c8) SHA1(202d621cead9b2af8fef12ea0d07a6fce6262518) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "cr220.p1", 0x000000, 0x80000,  CRC(0a6ebe65) SHA1(504648c97bc9de6c3e0c9c73eb2f356632e1c562) )
-	ROM_LOAD16_BYTE( "cr220.p2", 0x000001, 0x80000,  CRC(699ab8d4) SHA1(8a6516e515d111c29833f6a94845942d156cc54d) )
-	ROM_LOAD16_BYTE( "cm2.p3",  0x100000, 0x80000,  CRC(88324715) SHA1(c6c8de4e5aeda14232ec7b026da389774b3c7bb1) )
-	ROM_LOAD16_BYTE( "cm2.p4",  0x100001, 0x80000,  CRC(8d54a81d) SHA1(37753cf8595647aaf8b8267ca177b6744de9c6d4) )
-	ROM_LOAD16_BYTE( "cm2.p5",  0x200000, 0x80000,  CRC(5cf8a2bf) SHA1(2514e78e82842fa5c85d26de35637269cd08b21d) )
-	ROM_LOAD16_BYTE( "cm2.p6",  0x200001, 0x80000,  CRC(cf793d2d) SHA1(579c759f57fb6bb87aa27c9d5fb684058913dedc) )
-	ROM_LOAD16_BYTE( "cm2.p7",  0x300000, 0x80000,  CRC(008aa4b0) SHA1(b4cec6d11abd0e111c295533700595398ff59075) )
-	ROM_LOAD16_BYTE( "cm2.p8",  0x300001, 0x80000,  CRC(bac04f5a) SHA1(130721b7abf28dea1f8162705c8bfc5a4bb78152) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmaze2c )//Should be a set, but PROM 2 checksum error?
+ROM_START( v4renoo )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_37s__.a60",    0x00000, 0x10000,   CRC(cbdb9469) SHA1(bc802b4c15451feebc332944f6bc09c7fb20ea20) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "cm2_7.p1", 0x000000, 0x80000,  CRC(d455d5fe) SHA1(20186a5fff458d3eba15ccb564addc0b064736e0) )
-	ROM_LOAD16_BYTE( "cm2_7.p2", 0x000001, 0x80000, BAD_DUMP CRC(55fef843) SHA1(ccc187c0137af54bad8b72181a544d5b78004ed8) )
-	ROM_LOAD16_BYTE( "cm2.p3",  0x100000, 0x80000,  CRC(88324715) SHA1(c6c8de4e5aeda14232ec7b026da389774b3c7bb1) )
-	ROM_LOAD16_BYTE( "cm2.p4",  0x100001, 0x80000,  CRC(8d54a81d) SHA1(37753cf8595647aaf8b8267ca177b6744de9c6d4) )
-	ROM_LOAD16_BYTE( "cm2.p5",  0x200000, 0x80000,  CRC(5cf8a2bf) SHA1(2514e78e82842fa5c85d26de35637269cd08b21d) )
-	ROM_LOAD16_BYTE( "cm2.p6",  0x200001, 0x80000,  CRC(cf793d2d) SHA1(579c759f57fb6bb87aa27c9d5fb684058913dedc) )
-	ROM_LOAD16_BYTE( "cm2.p7",  0x300000, 0x80000,  CRC(008aa4b0) SHA1(b4cec6d11abd0e111c295533700595398ff59075) )
-	ROM_LOAD16_BYTE( "cm2.p8",  0x300001, 0x80000,  CRC(bac04f5a) SHA1(130721b7abf28dea1f8162705c8bfc5a4bb78152) )
-ROM_END
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
 
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
+ROM_END
 
 
-//The Crystal Maze Team Challenge
-ROM_START( v4cmaze3 )
+ROM_START( v4renop )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_x7sd_.a60",    0x00000, 0x10000,   CRC(3fd02f2d) SHA1(49ae60e8bdc6681482272d31eefc0098cc6c9667) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "cm3.p1",  0x000000, 0x80000,  CRC(2d2edee5) SHA1(0281ec97aaaaf4c7969340bd5995ac1541dbad54) )
-	ROM_LOAD16_BYTE( "cm3.p2",  0x000001, 0x80000,  CRC(c223d7b9) SHA1(da9d730716a30d0e93f2a02c1efa7f19457ae010) )
-	ROM_LOAD16_BYTE( "cm3.p3",  0x100000, 0x80000,  CRC(2959c77b) SHA1(8de533bfad48ad19a635dddcafa2a0825133b4de) )
-	ROM_LOAD16_BYTE( "cm3.p4",  0x100001, 0x80000,  CRC(b7873e9a) SHA1(a71fac883e02d5f49aee0a20f92dbdb00640ce8d) )
-	ROM_LOAD16_BYTE( "cm3.p5",  0x200000, 0x80000,  CRC(c8375070) SHA1(da2ba6591d8765f896c40d6526da8e945d02a182) )
-	ROM_LOAD16_BYTE( "cm3.p6",  0x200001, 0x80000,  CRC(1ea36938) SHA1(43f62935b21232d23f662e1e124663267edb1283) )
-	ROM_LOAD16_BYTE( "cm3.p7",  0x300000, 0x80000,  CRC(9de3802e) SHA1(ec792f115a0708d68046ba0beb314b7e1f1eb422) )
-	ROM_LOAD16_BYTE( "cm3.p8",  0x300001, 0x80000,  CRC(1e6e60b0) SHA1(5e71714747073dd89852a84585642388ee440325) )
-	ROM_LOAD16_BYTE( "cm3.p9",  0x400000, 0x80000,  CRC(bfba55a7) SHA1(22eb9b1f9fe83d3b424fd521b68e2976a1940df9) )
-	ROM_LOAD16_BYTE( "cm3.p10",  0x400001, 0x80000,  CRC(07edda81) SHA1(e94525be03f30e407051992925bb0d693f3d809b) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmaze3d )
+ROM_START( v4renoq )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_x7s__.a60",    0x00000, 0x10000,   CRC(7475c88c) SHA1(0425e722321d4f365f6e90de5159721ac8a9d0d2) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "cm3d.p1",  0x000000, 0x80000,  CRC(245f00fa) SHA1(ff5ae1a2ae024dfc0b4104360626e4106f4cd36f) )
-	ROM_LOAD16_BYTE( "cm3d.p2",  0x000001, 0x80000,  CRC(091adbcb) SHA1(1466b036d06f6335c90426095ad0f60ea958a29d) )
-	ROM_LOAD16_BYTE( "cm3.p3",  0x100000, 0x80000,  CRC(2959c77b) SHA1(8de533bfad48ad19a635dddcafa2a0825133b4de) )
-	ROM_LOAD16_BYTE( "cm3.p4",  0x100001, 0x80000,  CRC(b7873e9a) SHA1(a71fac883e02d5f49aee0a20f92dbdb00640ce8d) )
-	ROM_LOAD16_BYTE( "cm3.p5",  0x200000, 0x80000,  CRC(c8375070) SHA1(da2ba6591d8765f896c40d6526da8e945d02a182) )
-	ROM_LOAD16_BYTE( "cm3.p6",  0x200001, 0x80000,  CRC(1ea36938) SHA1(43f62935b21232d23f662e1e124663267edb1283) )
-	ROM_LOAD16_BYTE( "cm3.p7",  0x300000, 0x80000,  CRC(9de3802e) SHA1(ec792f115a0708d68046ba0beb314b7e1f1eb422) )
-	ROM_LOAD16_BYTE( "cm3.p8",  0x300001, 0x80000,  CRC(1e6e60b0) SHA1(5e71714747073dd89852a84585642388ee440325) )
-	ROM_LOAD16_BYTE( "cm3.p9",  0x400000, 0x80000,  CRC(bfba55a7) SHA1(22eb9b1f9fe83d3b424fd521b68e2976a1940df9) )
-	ROM_LOAD16_BYTE( "cm3.p10",  0x400001, 0x80000,  CRC(07edda81) SHA1(e94525be03f30e407051992925bb0d693f3d809b) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmaze3a )
+ROM_START( v4renor )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_xeadp.a_0",    0x00000, 0x10000,   CRC(76df6109) SHA1(fbc76a9612a48f1b589e43e2f920459ed6c32c57) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "am3z.p1",  0x000000, 0x80000,  CRC(9484e656) SHA1(3c35a8ebeddea56d73ce8db4e93c51cdd9546d59) )
-	ROM_LOAD16_BYTE( "am3z.p2",  0x000001, 0x80000,  CRC(1865ee80) SHA1(b3ff8e1631d811b8e88664dd84ae82231ce1f5aa) )
-	ROM_LOAD16_BYTE( "am3g.p1",  0x100000, 0x80000,  CRC(49fe36af) SHA1(7c39223b07f53ff57a56c3817299734491372170) )
-	ROM_LOAD16_BYTE( "am3g.p2",  0x100001, 0x80000,  CRC(b8823cbd) SHA1(206d3b1b2daff1979f97841041661f8407c35d4d) )
-	ROM_LOAD16_BYTE( "am3g.p3",  0x200000, 0x80000,  CRC(b1870f17) SHA1(54c6cabb56e4daa4ccf801d5e44b2789b116d562) )
-	ROM_LOAD16_BYTE( "am3g.p4",  0x200001, 0x80000,  CRC(c015d446) SHA1(669007e841afeb1084d9062d0a47c159e4c83cc9) )
-	ROM_LOAD16_BYTE( "am3g.p5",  0x300000, 0x80000,  CRC(9de3802e) SHA1(ec792f115a0708d68046ba0beb314b7e1f1eb422) )
-	ROM_LOAD16_BYTE( "am3g.p6",  0x300001, 0x80000,  CRC(1e6e60b0) SHA1(5e71714747073dd89852a84585642388ee440325) )
-	ROM_LOAD16_BYTE( "am3g.p7",  0x400000, 0x80000,  CRC(a4611e29) SHA1(91b164eea5dbdd1129ad12d7af2dbdb3cd68bcec) )
-	ROM_LOAD16_BYTE( "am3g.p8",  0x400001, 0x80000,  CRC(1a10c22e) SHA1(8533a5db3922b80b6e9f74e4e432a2b64bc24fc0) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmaze3b )
+ROM_START( v4renos )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_xead_.a_0",    0x00000, 0x10000,   CRC(e03e4f53) SHA1(17b4bdf82393aacf74765f04fc0d9b1f683114cc) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "cm30_8.p1", 0x000000, 0x80000,CRC(fde7333e) SHA1(a94d7b88972af599418b9893124457a11c125fcc) )
-	ROM_LOAD16_BYTE( "cm30_8.p2", 0x000001, 0x80000,CRC(35ff7e31) SHA1(52fe305c63cde70de550230bad03d85b53f8e227) )
-	ROM_LOAD16_BYTE( "cm3.p3",  0x100000, 0x80000,  CRC(2959c77b) SHA1(8de533bfad48ad19a635dddcafa2a0825133b4de) )
-	ROM_LOAD16_BYTE( "cm3.p4",  0x100001, 0x80000,  CRC(b7873e9a) SHA1(a71fac883e02d5f49aee0a20f92dbdb00640ce8d) )
-	ROM_LOAD16_BYTE( "cm3.p5",  0x200000, 0x80000,  CRC(c8375070) SHA1(da2ba6591d8765f896c40d6526da8e945d02a182) )
-	ROM_LOAD16_BYTE( "cm3.p6",  0x200001, 0x80000,  CRC(1ea36938) SHA1(43f62935b21232d23f662e1e124663267edb1283) )
-	ROM_LOAD16_BYTE( "cm3.p7",  0x300000, 0x80000,  CRC(9de3802e) SHA1(ec792f115a0708d68046ba0beb314b7e1f1eb422) )
-	ROM_LOAD16_BYTE( "cm3.p8",  0x300001, 0x80000,  CRC(1e6e60b0) SHA1(5e71714747073dd89852a84585642388ee440325) )
-	ROM_LOAD16_BYTE( "cm3.p9",  0x400000, 0x80000,  CRC(bfba55a7) SHA1(22eb9b1f9fe83d3b424fd521b68e2976a1940df9) )
-	ROM_LOAD16_BYTE( "cm3.p10", 0x400001, 0x80000,  CRC(07edda81) SHA1(e94525be03f30e407051992925bb0d693f3d809b) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4cmaze3c )
+ROM_START( v4renot )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_xea_p.a_0",    0x00000, 0x10000,   CRC(3d7a86a8) SHA1(98bb8b2c0705219536720eef404c7bbc14a85793) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "cm30_6.p1",  0x000000, 0x80000,  CRC(68aa610a) SHA1(d57071a960402b12a13ac3af602cedade03989f8) )
-	ROM_LOAD16_BYTE( "cm30_6.p2",  0x000001, 0x80000,  NO_DUMP )
-	ROM_LOAD16_BYTE( "cm3.p3",  0x100000, 0x80000,  CRC(2959c77b) SHA1(8de533bfad48ad19a635dddcafa2a0825133b4de) )
-	ROM_LOAD16_BYTE( "cm3.p4",  0x100001, 0x80000,  CRC(b7873e9a) SHA1(a71fac883e02d5f49aee0a20f92dbdb00640ce8d) )
-	ROM_LOAD16_BYTE( "cm3.p5",  0x200000, 0x80000,  CRC(c8375070) SHA1(da2ba6591d8765f896c40d6526da8e945d02a182) )
-	ROM_LOAD16_BYTE( "cm3.p6",  0x200001, 0x80000,  CRC(1ea36938) SHA1(43f62935b21232d23f662e1e124663267edb1283) )
-	ROM_LOAD16_BYTE( "cm3.p7",  0x300000, 0x80000,  CRC(9de3802e) SHA1(ec792f115a0708d68046ba0beb314b7e1f1eb422) )
-	ROM_LOAD16_BYTE( "cm3.p8",  0x300001, 0x80000,  CRC(1e6e60b0) SHA1(5e71714747073dd89852a84585642388ee440325) )
-	ROM_LOAD16_BYTE( "cm3.p9",  0x400000, 0x80000,  CRC(bfba55a7) SHA1(22eb9b1f9fe83d3b424fd521b68e2976a1940df9) )
-	ROM_LOAD16_BYTE( "cm3.p10",  0x400001, 0x80000,  CRC(07edda81) SHA1(e94525be03f30e407051992925bb0d693f3d809b) )
-ROM_END
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
 
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
+ROM_END
 
-ROM_START( v4turnov )
+ROM_START( v4renou )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rr_xea__.a_0",    0x00000, 0x10000,   CRC(ab9ba8f2) SHA1(52b77aa66980fa552d286225919fca9910f48326) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "tos.p1",  0x000000, 0x010000,  CRC(4044dbeb) SHA1(3aa553055c56f14564b1e33e1c1975337e639f70) )
-	ROM_LOAD16_BYTE( "to.p2",   0x000001, 0x010000,  CRC(4bc4659a) SHA1(0e282134c4fe4e8c1cc7b16957903179e23c7abc) )
-	ROM_LOAD16_BYTE( "to.p3",   0x020000, 0x010000,  CRC(273c7c14) SHA1(71feb555a05a0ff1ec674505cab72d93c9fbdf65) )
-	ROM_LOAD16_BYTE( "to.p4",   0x020001, 0x010000,  CRC(83d29546) SHA1(cef90455b9d8a92424fe1aa10f20fd075d0e3091) )
-	ROM_LOAD16_BYTE( "to.p5",   0x040000, 0x010000,  CRC(dceac511) SHA1(7a6d65464e23d832943f771c4cf580aabc6f0e44) )
-	ROM_LOAD16_BYTE( "to.p6",   0x040001, 0x010000,  CRC(54c6afb7) SHA1(b724b87b6f4e47d220310b38c97be2fa73dcd617) )
-	ROM_LOAD16_BYTE( "to.p7",   0x060000, 0x010000,  CRC(acf19542) SHA1(ad46ffb3c2c078a8e3712eff27aa61f0d1a7c059) )
-	ROM_LOAD16_BYTE( "to.p8",   0x060001, 0x010000,  CRC(a5ca385d) SHA1(8df26a33ea7f5b577761c6f9d2fa4eaed74661f8) )
-	ROM_LOAD16_BYTE( "to.p9",   0x080000, 0x010000,  CRC(6e85fde3) SHA1(14868d58829e13987e66f52e1899c4385987a87b) )
-	ROM_LOAD16_BYTE( "to.p10",  0x080001, 0x010000,  CRC(fadd11a2) SHA1(2b2fbb0769ef6035688d495464f3ea3bc8c7c660) )
-	ROM_LOAD16_BYTE( "to.p11",  0x0a0000, 0x010000,  CRC(2d72a61a) SHA1(ce455ab6fea452f96a3ad365178e0e5a0b437867) )
-	ROM_LOAD16_BYTE( "to.p12",  0x0a0001, 0x010000,  CRC(a14eedb6) SHA1(219b887a334ff28a88ed2e50f0caff4b510cd549) )
-	ROM_LOAD16_BYTE( "to.p13",  0x0c0000, 0x010000,  CRC(3f66ef6b) SHA1(60be6d3f8da1f3084db15ac1bb2470e55c0271de) )
-	ROM_LOAD16_BYTE( "to.p14",  0x0c0001, 0x010000,  CRC(127ba65d) SHA1(e34dcd19efd31dc712daac940277bb17694ea61a) )
-	ROM_LOAD16_BYTE( "to.p15",  0x0e0000, 0x010000,  CRC(ad787e31) SHA1(314ba312adfc71e4b3b2d52355ec692c192b74eb) )
-	ROM_LOAD16_BYTE( "to.p16",  0x0e0001, 0x010000,  CRC(e635c942) SHA1(08f8b5fdb738647bc0b49938da05533be42a2d60) )
-
-	ROM_REGION( 0x800000, "altvideo", 0 )
-	// seems to be an unmatched 2.2 revision rom
-	ROM_LOAD16_BYTE( "tov2.2p1", 0x0000, 0x010000, CRC(460a5dd0) SHA1(42bc54b0ca206606b980dd80ccf0cbfb3210769d) )
-
-	ROM_LOAD16_BYTE( "to3.p1", 0x0000, 0x010000, CRC(09751994) SHA1(72d4aa40f14411ef8064822de3f5a13bcc84aea3) )
-	ROM_LOAD16_BYTE( "todo.p1", 0x0000, 0x010000, CRC(9111e702) SHA1(fa408e1c8fa56a96ffc3422335f105ef328a6edd) )
-	ROM_LOAD16_BYTE( "too.p1", 0x0000, 0x010000, CRC(919b5207) SHA1(770be6e3b00e666c6f939167d35d43bb2d793e14) )
+	ROM_LOAD16_BYTE( "rr______.a_1",  0x000000, 0x80000,  CRC(ff27d0ba) SHA1(85cce36495f00a05c1806ecde37274212680e466) )
+	ROM_LOAD16_BYTE( "rr______.a_2",  0x000001, 0x80000,  CRC(519b9ae1) SHA1(8ccfe8de0f2c85923df81af8cba6f20af43d2fe2) )
 
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4skltrk )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
 
-	ROM_REGION( 0x800000, "video", 0 )
 
+ROM_START( v4reno8 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("rrv8ss",          0x00000, 0x10000,   CRC(a37383a5) SHA1(6c2563967546d810f2c50aa9a269bb1369014c18) )
 
-	ROM_LOAD16_BYTE( "st.p1",  0x000000, 0x010000,  CRC(d9de47a5) SHA1(625bf40780203293fc34cd8cea8278b4b4a52a75) )
-	ROM_LOAD16_BYTE( "st.p2",  0x000001, 0x010000,  CRC(b62575c2) SHA1(06d75e8a364750663d329650720021279e195236) )
-	ROM_LOAD16_BYTE( "st.p3",  0x020000, 0x010000,  CRC(9506da76) SHA1(6ef28ab8ec1af455be8ecfab20243f0823dca7c1) )
-	ROM_LOAD16_BYTE( "st.p4",  0x020001, 0x010000,  CRC(6ab447bc) SHA1(d01c209dbf4d19a6a7f878fa54ff1cb51e7dcba5) )
-	ROM_LOAD16_BYTE( "st.q1",  0x040000, 0x010000,  CRC(4faca475) SHA1(69b498c543600b8e37ab0ed1863ba57845648f3c) )
-	ROM_LOAD16_BYTE( "st.q2",  0x040001, 0x010000,  CRC(9f2c5938) SHA1(85527c4c0b7a1e66576d56607d89750fab082580) )
-	ROM_LOAD16_BYTE( "st.q3",  0x060000, 0x010000,  CRC(6b6cb194) SHA1(aeac5dcc0827c17e758e3e821ae8a78a3a16ddce) )
-	ROM_LOAD16_BYTE( "st.q4",  0x060001, 0x010000,  CRC(ec57bc17) SHA1(d9f522739dbb190fb941ca654299bbedbb8fb703) )
-	ROM_LOAD16_BYTE( "st.q5",  0x080000, 0x010000,  CRC(7740a88b) SHA1(d9a683d3e0d6c1b4b59520f90f825124b7a61168) )
-	ROM_LOAD16_BYTE( "st.q6",  0x080001, 0x010000,  CRC(95e97796) SHA1(f1a8de0ad02aca31f79a4fe8ba5044546163e3c4) )
-	ROM_LOAD16_BYTE( "st.q7",  0x0a0000, 0x010000,  CRC(f3b8fe7f) SHA1(52d5be3f8cab419103f4727d0fb9d30f34c8f651) )
-	ROM_LOAD16_BYTE( "st.q8",  0x0a0001, 0x010000,  CRC(b85e75a2) SHA1(b7b03b090c0ec6d92e9a25abb7fec0507356bdfc) )
-	ROM_LOAD16_BYTE( "st.q9",  0x0c0000, 0x010000,  CRC(835f6001) SHA1(2cd9084c102d74bcb578c8ea22bbc9ea58f0ceab) )
-	ROM_LOAD16_BYTE( "st.qa",  0x0c0001, 0x010000,  CRC(3fc62a0e) SHA1(0628de4b962d3fcca3757cd4e89b3005c9bfd218) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 8, good
+	ROM_LOAD16_BYTE( "rr______.8_1",      0x000001, 0x080000,  CRC(eca43ed4) SHA1(e2e4e5d3d4b659ddd74c120316b9658708e188f1) )
+	ROM_LOAD16_BYTE( "rr______.8_2",      0x000000, 0x080000,  CRC(c3f25586) SHA1(7335708a7d90c7fbd0088bb6ee5ce0255b9b18ab) )
+
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
-ROM_START( v4skltrka )
+ROM_START( v4reno7 )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("release7.mpu4",          0x00000, 0x10000,  NO_DUMP )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "sws.p1",0x000000, 0x010000, CRC(a96f11ea) SHA1(5e5c548e96674f8f98c1c4eb0a590979371f6f10) )
-	ROM_LOAD16_BYTE( "sw.p2", 0x000001, 0x010000, CRC(2598ba38) SHA1(30509bd2f987949bb423600e13a464edaa7f9ce5) )
-	ROM_LOAD16_BYTE( "sw.p3", 0x020000, 0x010000, CRC(1290cef3) SHA1(5cf63940c164becf64902846aa4fd5bc628f9ebe) )
-	ROM_LOAD16_BYTE( "sw.p4", 0x020001, 0x010000, CRC(176f23c3) SHA1(e64460818329f23e449f65781e3dc56d3a1710a3) )
-	ROM_LOAD16_BYTE( "st.q1",  0x040000, 0x010000,  CRC(4faca475) SHA1(69b498c543600b8e37ab0ed1863ba57845648f3c) )
-	ROM_LOAD16_BYTE( "st.q2",  0x040001, 0x010000,  CRC(9f2c5938) SHA1(85527c4c0b7a1e66576d56607d89750fab082580) )
-	ROM_LOAD16_BYTE( "st.q3",  0x060000, 0x010000,  CRC(6b6cb194) SHA1(aeac5dcc0827c17e758e3e821ae8a78a3a16ddce) )
-	ROM_LOAD16_BYTE( "st.q4",  0x060001, 0x010000,  CRC(ec57bc17) SHA1(d9f522739dbb190fb941ca654299bbedbb8fb703) )
-	ROM_LOAD16_BYTE( "st.q5",  0x080000, 0x010000,  CRC(7740a88b) SHA1(d9a683d3e0d6c1b4b59520f90f825124b7a61168) )
-	ROM_LOAD16_BYTE( "st.q6",  0x080001, 0x010000,  CRC(95e97796) SHA1(f1a8de0ad02aca31f79a4fe8ba5044546163e3c4) )
-	ROM_LOAD16_BYTE( "st.q7",  0x0a0000, 0x010000,  CRC(f3b8fe7f) SHA1(52d5be3f8cab419103f4727d0fb9d30f34c8f651) )
-	ROM_LOAD16_BYTE( "st.q8",  0x0a0001, 0x010000,  CRC(b85e75a2) SHA1(b7b03b090c0ec6d92e9a25abb7fec0507356bdfc) )
-	ROM_LOAD16_BYTE( "st.q9",  0x0c0000, 0x010000,  CRC(835f6001) SHA1(2cd9084c102d74bcb578c8ea22bbc9ea58f0ceab) )
-	ROM_LOAD16_BYTE( "st.qa",  0x0c0001, 0x010000,  CRC(3fc62a0e) SHA1(0628de4b962d3fcca3757cd4e89b3005c9bfd218) )
-ROM_END
+	ROM_REGION( 0x800000, "video", 0 ) // Release 7
+	ROM_LOAD16_BYTE( "rr8p1",             0x000001, 0x080000,  CRC(68992dd3) SHA1(75ab1cd02ac627b6191e9b61ee7c072029becaeb) )
+	ROM_LOAD16_BYTE( "rr8p2",             0x000000, 0x080000,  CRC(b859020e) SHA1(811ccac82d022ceccc83f1bf6c6b4de6cc313e14) )
 
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
+ROM_END
 
-ROM_START( v4sklcsh )
+ROM_START( v4reno5 )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("release5.mpu4",          0x00000, 0x10000,  NO_DUMP )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "scs.p1", 0x000000, 0x010000, CRC(3181524e) SHA1(e801a036b9d509d8e2e5f7c9c6ccd9d9ddf76b2f) )
-	ROM_LOAD16_BYTE( "scs.p2", 0x000001, 0x010000, CRC(a7596804) SHA1(f27fc3ee7a17904ea08baa421e14d02226428c42) )
-	ROM_LOAD16_BYTE( "scs.p3", 0x020000, 0x010000, CRC(b3ded2bc) SHA1(39cb15fde4aea1187668120d548bfe022835b600) )
-	ROM_LOAD16_BYTE( "scs.p4", 0x020001, 0x010000, CRC(2ce2e9d1) SHA1(c492fea2e179796a360131c19a9cba5bbfe3c7fd) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 5
+	ROM_LOAD16_BYTE( "reno reels 5-1",    0x000000, 0x080000,  CRC(9ebd0eaf) SHA1(3d326509240fe8a83df9d2369f184838bee2b407) )
+	ROM_LOAD16_BYTE( "reno reels 5-2",    0x000001, 0x080000,  CRC(1cbcd9b5) SHA1(989d64e10c67dab7d20229e5c63d24111d556138) )
 
-	/* missing questions */
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "renosnda.bin",  0x000000, 0x080000,  CRC(a72a5e1b) SHA1(a0d5338a400345a55484848a7612119405f617b1) )
+	ROM_LOAD( "renosndb.bin",  0x080000, 0x080000,  CRC(46e9a32f) SHA1(d45835a82368992597e44b3c5b9d00d8b901e733) )
 ROM_END
 
 
-
-
-ROM_START( v4time )
+ROM_START( v4redhtp ) // ok
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD("rp_20s__.3_0",  0x00000, 0x10000,  CRC(b7d02d22) SHA1(f9da1c6dde064bc39d0c48a165dac7acde933397))
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "tm20.p1",  0x000000, 0x010000,  CRC(6919697c) SHA1(786d7b9ab218dbf54ff839d1f83580c409c725b3) )
-	ROM_LOAD16_BYTE( "tm20.p2",  0x000001, 0x010000,  CRC(d13b56e4) SHA1(623e73995da93c07b51ce0a5843dba1f853529dd) )
-	ROM_LOAD16_BYTE( "tm20.p3",  0x020000, 0x010000,  CRC(efd3ae64) SHA1(9d2a3b65048e04842205751c6921d2550f38bd52) )
-	ROM_LOAD16_BYTE( "tm20.p4",  0x020001, 0x010000,  CRC(602ba3fb) SHA1(7243f58df9a26adfd1a149a1e60630b187787dd0) )
-	ROM_LOAD16_BYTE( "q12.p5" ,  0x040000, 0x010000,  CRC(adddd8a7) SHA1(73a8dd191eda2f4b41b79d4b55723731953b8970) )
-	ROM_LOAD16_BYTE( "q11.p6" ,  0x040001, 0x010000,  CRC(e8ed736f) SHA1(e7068c550aa39a6e8f1692a16794147e996d36b4) )
-	ROM_LOAD16_BYTE( "q14.p7" ,  0x060000, 0x010000,  CRC(02abb026) SHA1(42224678e5913090c91c21672661beb8e27127a8) )
-	ROM_LOAD16_BYTE( "q13.p8" ,  0x060001, 0x010000,  CRC(3de147dd) SHA1(d2111d54d1604fe2da0133102bbfee706f8f542e) )
-	ROM_LOAD16_BYTE( "q16.p9" ,  0x080000, 0x010000,  CRC(ce2bf15e) SHA1(29c7f2e718bce415b0b8dc6d902bf74dad6b1ef4) )
-	ROM_LOAD16_BYTE( "q15.p10",  0x080001, 0x010000,  CRC(7894ac8b) SHA1(dc46bd108ac4f67a9062bb7ace91aa51f069cbc8) )
-	ROM_LOAD16_BYTE( "q18.p11",  0x0a0000, 0x010000,  CRC(27de90b3) SHA1(625c98e555f7b627ea96653926b8917996a2fdb7) )
-	ROM_LOAD16_BYTE( "q17.p12",  0x0a0001, 0x010000,  CRC(5cab773e) SHA1(59a235c51a975b341bdbb88e909729507408f75b) )
-	ROM_LOAD16_BYTE( "q20.p13",  0x0c0000, 0x010000,  CRC(083f6c65) SHA1(291ad39ee5f8eba9da293d9206b1f6a6d852f9bd) )
-	ROM_LOAD16_BYTE( "q19.p14",  0x0c0001, 0x010000,  CRC(73747644) SHA1(ae252fc95c069a3c82e155220fbfcb74dd43bf89) )
-
-	ROM_REGION( 0x800000, "altvideo", 0 )
-	ROM_LOAD( "tmd.p1", 0x0000, 0x010000, CRC(e21045e0) SHA1(c4d0e80970ec8558db777a882edc5a0c80767375) )
-
-	ROM_REGION( 0x800000, "altquestion", 0 )
-	ROM_LOAD( "tm.q1", 0x0000, 0x010000, CRC(6af4d58b) SHA1(ee547dad30cd9940f0b017caac97aeb046604f22) )
-	ROM_LOAD( "tm.q2", 0x0000, 0x010000, CRC(b01b7687) SHA1(99db448d7e40c2ec16afef3c10abc8a9493f2ab4) )
-	ROM_LOAD( "tm.q3", 0x0000, 0x010000, CRC(e97f14eb) SHA1(9163d11e1bc5a13d5002a13bc18b65a91e1738c7) )
-	ROM_LOAD( "tm.q4", 0x0000, 0x010000, CRC(6134d918) SHA1(e4b4d6b08d94729d4dcca474d4c7bdcb267530a8) )
-	ROM_LOAD( "tm.q5", 0x0000, 0x010000, CRC(6c07814b) SHA1(a97feada5cfa1bb059837b292637fbad9c7137ac) )
-	ROM_LOAD( "tm.q6", 0x0000, 0x010000, CRC(5f16a536) SHA1(3435282bfb940604fb44e06dc4748e668768f286) )
-	ROM_LOAD( "tm.q7", 0x0000, 0x010000, CRC(9afdce0b) SHA1(a969038d9ce2a2cff1e1a75959c05a3f03f08235) )
-	ROM_LOAD( "tm.q8", 0x0000, 0x010000, CRC(f1878251) SHA1(b6a8527112bcdf21b9a0acab4d8fa507a96aaba7) )
-	ROM_LOAD( "tm.q9", 0x0000, 0x010000, CRC(ace01faa) SHA1(79d6247a74e1bce0d76ea3788d0022d9e50173c4) )
-	ROM_LOAD( "tm.qa", 0x0000, 0x010000, CRC(021f4523) SHA1(10884665f5700c147c7035d0c98f3889917ff015) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4mate )
+ROM_START( v4redhtpa )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rhpmpu4.p1", 0x0000, 0x010000, CRC(e614757f) SHA1(96e825bedfb1715aa9b5d131e5b492247b17b725) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "mats.p1",  0x000000, 0x080000,  CRC(ebc7ea7e) SHA1(11015489a803ba5c8dbdafd632424bbd6080aece) )
-	ROM_LOAD16_BYTE( "mats.p2",  0x000001, 0x080000,  CRC(a4c7e9b4) SHA1(30148c0257181bb88159e02d2b7cd79995ee84a7) )
-	ROM_LOAD16_BYTE( "matg.p3",  0x100000, 0x080000,  CRC(571f4e8e) SHA1(51babacb5d9fb1cc9e1e56a3b2a355597d04f178) )
-	ROM_LOAD16_BYTE( "matg.p4",  0x100001, 0x080000,  CRC(52d8657b) SHA1(e44e1db13c4abd4fedcd72df9dce1df594f74e44) )
-	ROM_LOAD16_BYTE( "matg.p5",  0x200000, 0x080000,  CRC(9f0c9552) SHA1(8b1197f20853e18841a8f64fd5ff58cdd0bd1dbd) )
-	ROM_LOAD16_BYTE( "matg.p6",  0x200001, 0x080000,  CRC(59f2b6a8) SHA1(4921cf1fc4c3bc50d2598b63726f61f68b41658c) )
-	ROM_LOAD16_BYTE( "matg.p7",  0x300000, 0x080000,  CRC(64c0031a) SHA1(a519addd5d8f4696967ec84c163d28cb81ff9f32) )
-	ROM_LOAD16_BYTE( "matg.p8",  0x300001, 0x080000,  CRC(22370dae) SHA1(72b1686b458750b5ee9dfe5599c308329d2c79d5) )
-	ROM_LOAD16_BYTE( "matq.p9",  0x400000, 0x040000,  CRC(2d42e982) SHA1(80e476d5d65662059daa93a2fd383aecb74903c1) )
-	ROM_LOAD16_BYTE( "matq.p10", 0x400001, 0x040000,  CRC(90364c3c) SHA1(6a4d2a3dd2cf9040887503888e6f38341578ad64) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	/* Mating Game has an extra OKI sound chip */
-	ROM_REGION( 0x200000, "msm6376", 0 )
-	ROM_LOAD( "matsnd.p1",  0x000000, 0x080000,  CRC(f16df9e3) SHA1(fd9b82d73e18e635a9ea4aabd8c0b4aa2c8c6fdb) )
-	ROM_LOAD( "matsnd.p2",  0x080000, 0x080000,  CRC(0c041621) SHA1(9156bf17ef6652968d9fbdc0b2bde64d3a67459c) )
-	ROM_LOAD( "matsnd.p3",  0x100000, 0x080000,  CRC(c7435af9) SHA1(bd6080afaaaecca0d65e6d4125b46849aa4d1f33) )
-	ROM_LOAD( "matsnd.p4",  0x180000, 0x080000,  CRC(d7e65c5b) SHA1(5575fb9f948158f2e94c986bf4bca9c9ee66a489) )
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4mated )
+ROM_START( v4redhtpb )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_10a__.3_0", 0x0000, 0x010000, CRC(90f58c6f) SHA1(c9b412172a6ef361407f486a8fb134ac68fe31e5) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "matd.p1",  0x000000, 0x080000,  CRC(e660909f) SHA1(0acd990264fd7faf1f91a796d2438e8c2c7b83d1) )
-	ROM_LOAD16_BYTE( "matd.p2",  0x000001, 0x080000,  CRC(a4c7e9b4) SHA1(30148c0257181bb88159e02d2b7cd79995ee84a7) )
-	ROM_LOAD16_BYTE( "matg.p3",  0x100000, 0x080000,  CRC(571f4e8e) SHA1(51babacb5d9fb1cc9e1e56a3b2a355597d04f178) )
-	ROM_LOAD16_BYTE( "matg.p4",  0x100001, 0x080000,  CRC(52d8657b) SHA1(e44e1db13c4abd4fedcd72df9dce1df594f74e44) )
-	ROM_LOAD16_BYTE( "matg.p5",  0x200000, 0x080000,  CRC(9f0c9552) SHA1(8b1197f20853e18841a8f64fd5ff58cdd0bd1dbd) )
-	ROM_LOAD16_BYTE( "matg.p6",  0x200001, 0x080000,  CRC(59f2b6a8) SHA1(4921cf1fc4c3bc50d2598b63726f61f68b41658c) )
-	ROM_LOAD16_BYTE( "matg.p7",  0x300000, 0x080000,  CRC(64c0031a) SHA1(a519addd5d8f4696967ec84c163d28cb81ff9f32) )
-	ROM_LOAD16_BYTE( "matg.p8",  0x300001, 0x080000,  CRC(22370dae) SHA1(72b1686b458750b5ee9dfe5599c308329d2c79d5) )
-	ROM_LOAD16_BYTE( "matq.p9",  0x400000, 0x040000,  CRC(2d42e982) SHA1(80e476d5d65662059daa93a2fd383aecb74903c1) )
-	ROM_LOAD16_BYTE( "matq.p10", 0x400001, 0x040000,  CRC(90364c3c) SHA1(6a4d2a3dd2cf9040887503888e6f38341578ad64) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	/* Mating Game has an extra OKI sound chip */
-	ROM_REGION( 0x200000, "msm6376", 0 )
-	ROM_LOAD( "matsnd.p1",  0x000000, 0x080000,  CRC(f16df9e3) SHA1(fd9b82d73e18e635a9ea4aabd8c0b4aa2c8c6fdb) )
-	ROM_LOAD( "matsnd.p2",  0x080000, 0x080000,  CRC(0c041621) SHA1(9156bf17ef6652968d9fbdc0b2bde64d3a67459c) )
-	ROM_LOAD( "matsnd.p3",  0x100000, 0x080000,  CRC(c7435af9) SHA1(bd6080afaaaecca0d65e6d4125b46849aa4d1f33) )
-	ROM_LOAD( "matsnd.p4",  0x180000, 0x080000,  CRC(d7e65c5b) SHA1(5575fb9f948158f2e94c986bf4bca9c9ee66a489) )
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4addlad )
+ROM_START( v4redhtpc )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
-
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "als_21.p1", 0x000000, 0x010000, CRC(c2c4ceea) SHA1(0c5ea4d02ba053191855547b714da9a7f61f3713) )
-	ROM_LOAD16_BYTE( "al_21.p2",  0x000001, 0x010000, CRC(d5909619) SHA1(eb8d978ed28cd3afab6b3c1274d79bc6b188d240) )
-	ROM_LOAD16_BYTE( "al_21.p3",  0x020000, 0x010000, CRC(5dc65d9f) SHA1(52dffb162a0e5649e056817e9db567cc7653538c) )
-	ROM_LOAD16_BYTE( "al_21.p4",  0x020001, 0x010000, CRC(17c77264) SHA1(321372c1c0d25cfc5a1302ccfd5680d9bf62d31b) )
-	ROM_LOAD16_BYTE( "al.q1",  0x040000, 0x10000,  CRC(b9b50b70) SHA1(1887ab00ee004e3f27902d6880fa31277a981891) )
-	ROM_LOAD16_BYTE( "al.q2",  0x040001, 0x10000,  CRC(1bed86ac) SHA1(8e6563b5441ad9ddd468a3d9ae906733fed7912a) )
-	ROM_LOAD16_BYTE( "al.q3",  0x060000, 0x10000,  CRC(294d8f28) SHA1(9f9aca491ba6c4dc5cfb91da867990a9610c3a28) )
-	ROM_LOAD16_BYTE( "al.q4",  0x060001, 0x10000,  CRC(aa3e9fbd) SHA1(59d0868f4c8b3f56ca31a11d2e6af83b202bb735) )
-	ROM_LOAD16_BYTE( "al.q5",  0x080000, 0x10000,  CRC(503f4193) SHA1(86df379c736598ba59446961bf0666e155164e1d) )
-	ROM_LOAD16_BYTE( "al.q6",  0x080001, 0x10000,  CRC(9fd77e52) SHA1(d8fdebb0fd57ab9ea9797dd386168581a45ebc62) )
-	ROM_LOAD16_BYTE( "al.q7",  0x0a0000, 0x10000,  CRC(cf3fa7c7) SHA1(fa1edf09c6d3a8b5737474117b0306ef64f7741c) )
-	ROM_LOAD16_BYTE( "al.q8",  0x0a0001, 0x10000,  CRC(55058a63) SHA1(cf9edef5264f4301be4ee11f221ab67a5183a603) )
-	ROM_LOAD16_BYTE( "al.q9",  0x0c0000, 0x10000,  CRC(22274191) SHA1(9bee5709edcd853e96408f37447c0f5324610903) )
-	ROM_LOAD16_BYTE( "al.qa",  0x0c0001, 0x10000,  CRC(1fe98b4d) SHA1(533afeaea42903905f6f1206bba1a023b141bdd9) )
+	ROM_LOAD( "rp_10ab_.3_0", 0x0000, 0x010000, CRC(66711bfc) SHA1(ee51215479e57646e9490b6e898ca5092172879a) )
 
-	ROM_REGION( 0x800000, "altvideo", 0 )
-	ROM_LOAD16_BYTE( "ald_21.p1", 0x000000, 0x010000, CRC(ecc7c79c) SHA1(e03f470d0b83ed81af737a1d16a02528df733149) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_REGION( 0x800000, "altvideo2", 0 ) // not sure what these are, they look like different hw??
-	ROM_LOAD16_BYTE( "a6ppl.p0", 0x00000, 0x020000, CRC(350da2df) SHA1(a390e0c7e1e624c17f0e254e0b99ef9dbf56269d) )
-	ROM_LOAD16_BYTE( "a6ppl.p1", 0x00001, 0x020000, CRC(63038aba) SHA1(8ec4e02109e872460a9598e469b59919cc5450dd) )
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4addlad20 )
+ROM_START( v4redhtpd )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_10ad_.3_0", 0x0000, 0x010000, CRC(db506bce) SHA1(1f152e58a3a5251aa00f890df9a9930a72d84db6) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "al.p1",  0x000000, 0x10000,  CRC(97579eb2) SHA1(68f08ab73e0c8044de32f7eea1b3abc1fefff830) )
-	ROM_LOAD16_BYTE( "al.p2",  0x000001, 0x10000,  CRC(ca877046) SHA1(7d0e1bb471b7acc89d04953ee5e0b34f64d58325) )
-	ROM_LOAD16_BYTE( "al.p3",  0x020000, 0x10000,  CRC(92b5e1c4) SHA1(910126527ddb9d83f5c9c29caf2424ae4ebbc640) )
-	ROM_LOAD16_BYTE( "al.p4",  0x020001, 0x10000,  CRC(5e0e3b23) SHA1(3862e7b873a1e2762032151289ce2ad886a8cc3c) )
-	ROM_LOAD16_BYTE( "al.q1",  0x040000, 0x10000,  CRC(b9b50b70) SHA1(1887ab00ee004e3f27902d6880fa31277a981891) )
-	ROM_LOAD16_BYTE( "al.q2",  0x040001, 0x10000,  CRC(1bed86ac) SHA1(8e6563b5441ad9ddd468a3d9ae906733fed7912a) )
-	ROM_LOAD16_BYTE( "al.q3",  0x060000, 0x10000,  CRC(294d8f28) SHA1(9f9aca491ba6c4dc5cfb91da867990a9610c3a28) )
-	ROM_LOAD16_BYTE( "al.q4",  0x060001, 0x10000,  CRC(aa3e9fbd) SHA1(59d0868f4c8b3f56ca31a11d2e6af83b202bb735) )
-	ROM_LOAD16_BYTE( "al.q5",  0x080000, 0x10000,  CRC(503f4193) SHA1(86df379c736598ba59446961bf0666e155164e1d) )
-	ROM_LOAD16_BYTE( "al.q6",  0x080001, 0x10000,  CRC(9fd77e52) SHA1(d8fdebb0fd57ab9ea9797dd386168581a45ebc62) )
-	ROM_LOAD16_BYTE( "al.q7",  0x0a0000, 0x10000,  CRC(cf3fa7c7) SHA1(fa1edf09c6d3a8b5737474117b0306ef64f7741c) )
-	ROM_LOAD16_BYTE( "al.q8",  0x0a0001, 0x10000,  CRC(55058a63) SHA1(cf9edef5264f4301be4ee11f221ab67a5183a603) )
-	ROM_LOAD16_BYTE( "al.q9",  0x0c0000, 0x10000,  CRC(22274191) SHA1(9bee5709edcd853e96408f37447c0f5324610903) )
-	ROM_LOAD16_BYTE( "al.qa",  0x0c0001, 0x10000,  CRC(1fe98b4d) SHA1(533afeaea42903905f6f1206bba1a023b141bdd9) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-
-
-ROM_START( v4strike )
+ROM_START( v4redhtpe )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_10ak_.3_0", 0x0000, 0x010000, CRC(2dd4fc5d) SHA1(b1e908ef70c98e7467a5f7d3ec26e7e6bfa1c475) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "sils.p1", 0x000000, 0x020000,  CRC(66ed6696) SHA1(a6aa68eb212254213db5573dfb9da1e9e06a8e39) )
-	ROM_LOAD16_BYTE( "sil.p2",  0x000001, 0x020000,  CRC(1afc07b7) SHA1(38777d56192b640b003d8dbf4b793cee0c81d9b2) )
-	ROM_LOAD16_BYTE( "sil.p3",  0x040000, 0x020000,  CRC(40f5851c) SHA1(0e3dc0dd2a257a955a1f250556d047481ae87269) )
-	ROM_LOAD16_BYTE( "sil.p4",  0x040001, 0x020000,  CRC(657e297e) SHA1(306f40376115ca40099a0010650b5edc183a2c57) )
-	ROM_LOAD16_BYTE( "sil.p5",  0x080000, 0x020000,  CRC(28bced09) SHA1(7ba5013f1e0f4e921581b23c4a1d4c005a043b66) )
-	ROM_LOAD16_BYTE( "sil.p6",  0x080001, 0x020000,  CRC(6f5fc296) SHA1(bd32a937581df6b5a4f08e6ef40c37a2b4278936) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_LOAD( "strikeitlucky_questions",  0x0c0000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4striked )
+ROM_START( v4redhtpf )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_10bg_.3_0", 0x0000, 0x010000, CRC(ec462c27) SHA1(88379585055f245c8d84bd1295e7f5b6555ad8c3) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "sild.p1", 0x000000, 0x020000,  CRC(6886e7c8) SHA1(9ef0895c9a8df762d17a3ea036bf0c6c2a440582) )
-	ROM_LOAD16_BYTE( "sil.p2",  0x000001, 0x020000,  CRC(1afc07b7) SHA1(38777d56192b640b003d8dbf4b793cee0c81d9b2) )
-	ROM_LOAD16_BYTE( "sil.p3",  0x040000, 0x020000,  CRC(40f5851c) SHA1(0e3dc0dd2a257a955a1f250556d047481ae87269) )
-	ROM_LOAD16_BYTE( "sil.p4",  0x040001, 0x020000,  CRC(657e297e) SHA1(306f40376115ca40099a0010650b5edc183a2c57) )
-	ROM_LOAD16_BYTE( "sil.p5",  0x080000, 0x020000,  CRC(28bced09) SHA1(7ba5013f1e0f4e921581b23c4a1d4c005a043b66) )
-	ROM_LOAD16_BYTE( "sil.p6",  0x080001, 0x020000,  CRC(6f5fc296) SHA1(bd32a937581df6b5a4f08e6ef40c37a2b4278936) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_LOAD( "strikeitlucky_questions",  0x0c0000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4strike2 )
+ROM_START( v4redhtpg )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_10s__.3_0", 0x0000, 0x010000, CRC(651314aa) SHA1(f11cd9c9419511e179acd2883d83cb475eb4d761) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "sil3.p1", 0x000000, 0x020000,  CRC(51c22f94) SHA1(dbdd30e67df4662d13b32a1df6cfabef2cf9471f) )
-	ROM_LOAD16_BYTE( "sil.p2",  0x000001, 0x020000,  CRC(1afc07b7) SHA1(38777d56192b640b003d8dbf4b793cee0c81d9b2) )
-	ROM_LOAD16_BYTE( "sil.p3",  0x040000, 0x020000,  CRC(40f5851c) SHA1(0e3dc0dd2a257a955a1f250556d047481ae87269) )
-	ROM_LOAD16_BYTE( "sil.p4",  0x040001, 0x020000,  CRC(657e297e) SHA1(306f40376115ca40099a0010650b5edc183a2c57) )
-	ROM_LOAD16_BYTE( "sil.p5",  0x080000, 0x020000,  CRC(28bced09) SHA1(7ba5013f1e0f4e921581b23c4a1d4c005a043b66) )
-	ROM_LOAD16_BYTE( "sil.p6",  0x080001, 0x020000,  CRC(6f5fc296) SHA1(bd32a937581df6b5a4f08e6ef40c37a2b4278936) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_LOAD( "strikeitlucky_questions",  0x0c0000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4strike2d )
+ROM_START( v4redhtph )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_10sb_.3_0", 0x0000, 0x010000, CRC(93978339) SHA1(7c943fe44103d0ac276b4478e20709d6ab0b07d5) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "sil3d.p1", 0x000000, 0x020000,  CRC(82def1b5) SHA1(d3e90e8e4e905a3779889305bb6441907d9169f1) )
-	ROM_LOAD16_BYTE( "sil.p2",  0x000001, 0x020000,  CRC(1afc07b7) SHA1(38777d56192b640b003d8dbf4b793cee0c81d9b2) )
-	ROM_LOAD16_BYTE( "sil.p3",  0x040000, 0x020000,  CRC(40f5851c) SHA1(0e3dc0dd2a257a955a1f250556d047481ae87269) )
-	ROM_LOAD16_BYTE( "sil.p4",  0x040001, 0x020000,  CRC(657e297e) SHA1(306f40376115ca40099a0010650b5edc183a2c57) )
-	ROM_LOAD16_BYTE( "sil.p5",  0x080000, 0x020000,  CRC(28bced09) SHA1(7ba5013f1e0f4e921581b23c4a1d4c005a043b66) )
-	ROM_LOAD16_BYTE( "sil.p6",  0x080001, 0x020000,  CRC(6f5fc296) SHA1(bd32a937581df6b5a4f08e6ef40c37a2b4278936) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_LOAD( "strikeitlucky_questions",  0x0c0000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4eyedwn )
+ROM_START( v4redhtpi )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_10sd_.3_0", 0x0000, 0x010000, CRC(2eb6f30b) SHA1(5aa3161888ad50bb9c1945bff32e6d8552ab4c89) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "eds.p1", 0x000000, 0x010000, CRC(bd4f4c5d) SHA1(4ad34d92d45c0b8c70af8454525dd669cab94c5c) )
-	ROM_LOAD16_BYTE( "ed.p2",  0x000001, 0x010000, CRC(8804b926) SHA1(cf9d49ca090a435819f2cd2d32dec3a6767f9e10) )
-	ROM_LOAD16_BYTE( "ed.p3",  0x020000, 0x010000, CRC(969d2264) SHA1(b55f6881852f81ec9fb2c57c8137c872f4714710) )
-	ROM_LOAD16_BYTE( "ed.p4",  0x020001, 0x010000, CRC(80d9addd) SHA1(f6359354c928e69a90cdf6d4f514c4992d3fa64c) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_LOAD( "eyesdown_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4eyedwnd )
+ROM_START( v4redhtpj )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_10sk_.3_0", 0x0000, 0x010000, CRC(d8326498) SHA1(89ab78991ea72f5186488714e8b7daeafa1e9497) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "edd.p1", 0x000000, 0x010000, CRC(369a145c) SHA1(c54305690798086b4f809f38d1a6454d1d34fd0c) )
-	ROM_LOAD16_BYTE( "ed.p2",  0x000001, 0x010000, CRC(8804b926) SHA1(cf9d49ca090a435819f2cd2d32dec3a6767f9e10) )
-	ROM_LOAD16_BYTE( "ed.p3",  0x020000, 0x010000, CRC(969d2264) SHA1(b55f6881852f81ec9fb2c57c8137c872f4714710) )
-	ROM_LOAD16_BYTE( "ed.p4",  0x020001, 0x010000, CRC(80d9addd) SHA1(f6359354c928e69a90cdf6d4f514c4992d3fa64c) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_LOAD( "eyesdown_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4quidgr )
+ROM_START( v4redhtpk )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_20a__.3_0", 0x0000, 0x010000, CRC(4236b5e7) SHA1(1bd73c8fd20a176c25288becb6f07b7f0447ede3) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "qgs.p1", 0x000000, 0x010000, CRC(e6d072a9) SHA1(b2d656818c2fb12a26ef8a170152087336c00c66) )
-	ROM_LOAD16_BYTE( "qg.p2",  0x000001, 0x010000, CRC(e4d74b11) SHA1(d23ccc57c54823ffaa7869ca824e049dc80f8945) )
-	ROM_LOAD16_BYTE( "qg.p3",  0x020000, 0x010000, CRC(5dda7cd8) SHA1(246a801e862990aade98fa358477e53707714b42) )
-	ROM_LOAD16_BYTE( "qg.p4",  0x020001, 0x010000, CRC(2106cf5d) SHA1(2073589775139ad92daef05a67afb2c70ece168c) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_LOAD( "quidgrid_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4quidgrd )
+ROM_START( v4redhtpl )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_20ab_.3_0", 0x0000, 0x010000, CRC(b4b22274) SHA1(f5f4d4f88d74454e6857118dc3eba90defd15e50) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "qgd.p1", 0x000000, 0x010000, CRC(c8d37bdf) SHA1(e39a41015dd551fd62efa52faf2c5106bf7d23ac) )
-	ROM_LOAD16_BYTE( "qg.p2",  0x000001, 0x010000, CRC(e4d74b11) SHA1(d23ccc57c54823ffaa7869ca824e049dc80f8945) )
-	ROM_LOAD16_BYTE( "qg.p3",  0x020000, 0x010000, CRC(5dda7cd8) SHA1(246a801e862990aade98fa358477e53707714b42) )
-	ROM_LOAD16_BYTE( "qg.p4",  0x020001, 0x010000, CRC(2106cf5d) SHA1(2073589775139ad92daef05a67afb2c70ece168c) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_LOAD( "quidgrid_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4quidgr2 )
+ROM_START( v4redhtpm )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_20ad_.3_0", 0x0000, 0x010000, CRC(09935246) SHA1(e82749b575f22373a3a7f24a8f68980e8040ac9d) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "q2gs.p1", 0x000000, 0x010000, CRC(6d4b92c0) SHA1(05777e0ecc8bf9f3564d8395bb7bfa245498d132) )
-	ROM_LOAD16_BYTE( "q2g.p2",  0x000001, 0x010000, CRC(9bf74ae3) SHA1(11e75acad496a9304f612714afbef90e48d1b9cb) )
-	ROM_LOAD16_BYTE( "q2g.p3",  0x020000, 0x010000, CRC(78555155) SHA1(e1218fc00f08c19a0cafb203e46044efa617ac16) )
-	ROM_LOAD16_BYTE( "q2g.p4",  0x020001, 0x010000, CRC(2a4295b6) SHA1(2aa0b5dbe6b934a7a4c8069c91fd6d85cae02836) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_LOAD( "quidgrid_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4quidgr2d )
+ROM_START( v4redhtpn )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_20ak_.3_0", 0x0000, 0x010000, CRC(ff17c5d5) SHA1(1aa1ca348cd8828e616a4781704445d04800b970) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "q2gd.p1", 0x000000, 0x010000, CRC(26185449) SHA1(921d355020788d53e8ffa83af44223dbe5a2dd5e) )
-	ROM_LOAD16_BYTE( "q2g.p2",  0x000001, 0x010000, CRC(9bf74ae3) SHA1(11e75acad496a9304f612714afbef90e48d1b9cb) )
-	ROM_LOAD16_BYTE( "q2g.p3",  0x020000, 0x010000, CRC(78555155) SHA1(e1218fc00f08c19a0cafb203e46044efa617ac16) )
-	ROM_LOAD16_BYTE( "q2g.p4",  0x020001, 0x010000, CRC(2a4295b6) SHA1(2aa0b5dbe6b934a7a4c8069c91fd6d85cae02836) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_LOAD( "quidgrid_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-
-ROM_START( v4barqst )
+ROM_START( v4redhtpo )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_20bg_.3_0", 0x0000, 0x010000, CRC(3e8515af) SHA1(3df382818b1d527ab4037a0dca24ba28227ab6a4) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "bqd.p1", 0x000000, 0x010000, CRC(b574ea46) SHA1(0eb446fbf4f7fcd1b30f35631b4b521730ce26b4) )
-	ROM_LOAD16_BYTE( "bq.p2", 0x000001, 0x010000, CRC(b9ce9f2e) SHA1(9407a83d1713b641dc551dd73f357d99baebbba2) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_LOAD( "barquest_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4barqs2 )
+ROM_START( v4redhtpp )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_20sb_.3_0", 0x0000, 0x010000, CRC(4154bab1) SHA1(b3d5dcdd276e3b2fc1f5d66a870e85c5064f0f5b) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "b2qs.p1", 0x000000, 0x010000, CRC(35c1a58b) SHA1(e2d07229e7136c462c48b6c77c9d26a33deb8e34) )
-	ROM_LOAD16_BYTE( "b2q.p2", 0x000001, 0x010000, CRC(28a0064a) SHA1(3751d9f3cc93994c44927ca3f72ade6bee22b20b) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_LOAD( "barquest2_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4wize )
+ROM_START( v4redhtpq )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_20sd_.3_0", 0x0000, 0x010000, CRC(fc75ca83) SHA1(9cf7178c990151c7711c8bca68c0dd85325808ab) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "wmd.p1", 0x000000, 0x010000, CRC(45d29045) SHA1(37911346753211801f8404d42b275f49764ba5f4) )
-	ROM_LOAD16_BYTE( "wm.p2",  0x000001, 0x010000, CRC(41b5fb2a) SHA1(e9ee484ec7445d58efa9bbfbd705202ef83656f2) )
-	ROM_LOAD16_BYTE( "wm.p3",  0x020000, 0x010000, CRC(934da7e4) SHA1(9cac87ccadbc871577640ec0bddd5e07aef139f8) )
-	ROM_LOAD16_BYTE( "wm.p4",  0x020001, 0x010000, CRC(463f6c0b) SHA1(ffee4cca73ebe7130e34118031cb16b3c42f03cb) )
-	ROM_LOAD16_BYTE( "wm.p5",  0x040000, 0x010000, CRC(eaea2502) SHA1(adeda7148ee4eee98870f4aa529b5c9f36417e2e) )
-	ROM_LOAD16_BYTE( "wm.p6",  0x040001, 0x010000, CRC(40a5e980) SHA1(e7bd49308b63a94a9ca0b138de0c48d2316d6aa0) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_LOAD( "wizemove_questions",  0x080000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
+ROM_END
 
+ROM_START( v4redhtpr )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rp_20sk_.3_0", 0x0000, 0x010000, CRC(0af15d10) SHA1(df1367176f8f2efcc21cf5c841125f9553ad0c8a) )
 
-	ROM_REGION( 0x800000, "altrevs", 0 )
-	ROM_LOAD16_BYTE( "w23.p1", 0x000000, 0x010000, CRC(a8d8fb2e) SHA1(cf5462b224a7960ade867cf76079d11084f13e4b) )
-	ROM_LOAD16_BYTE( "wm3.p1", 0x000000, 0x010000, CRC(0752f0f1) SHA1(2b0531312bf1d4b489394401c5d78c7f04e12aea) )
-	ROM_LOAD16_BYTE( "wm3d.p1", 0x000000, 0x010000, CRC(4e3ab877) SHA1(64408d1ac1f626390ffe93e024c672ba5acb42d6) )
-	ROM_LOAD16_BYTE( "wms.p1", 0x000000, 0x010000, CRC(712385c1) SHA1(075a98626eba2eae6a31b395c2a74541a31b2582) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4wizea )
+ROM_START( v4redhtps )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
-
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "wzm1+2p1", 0x000000, 0x010000, CRC(629e38d0) SHA1(bbc2688635c4cb9a1712a0a0d28017d1867417a4) )
-	ROM_LOAD16_BYTE( "wzm1+2p2", 0x000001, 0x010000, CRC(96b9c484) SHA1(b02595ba5a5c7d673bdc7675708a4d8f6d907779) )
-	ROM_LOAD16_BYTE( "wzm1+2p3", 0x020000, 0x010000, CRC(e545fac0) SHA1(4a3f9e5522bd666d5a1e9ac7878d3d78f3756762) )
-	ROM_LOAD16_BYTE( "wzm1+2p4", 0x020001, 0x010000, CRC(df7d4dba) SHA1(b892cfb807421c99ba98bfd9b34d717e17345d83) )
-	ROM_LOAD16_BYTE( "wzm1+2p5", 0x040000, 0x010000, NO_DUMP )
-	ROM_LOAD16_BYTE( "wzm1+2p6", 0x040001, 0x010000, CRC(3eecbdf8) SHA1(9ecc4fe25e1c1e167aaa413eaf601b55e1a432fb) )
+	ROM_LOAD( "rp_xca__.3_0", 0x0000, 0x010000, CRC(728a822c) SHA1(b23e4893325c2dbeb8f72114dd1e5c3f06a786a8) )
 
-	ROM_LOAD( "wizemove_questions",  0x080000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
+ROM_START( v4redhtpt )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rp_xcab_.3_0", 0x0000, 0x010000, CRC(840e15bf) SHA1(9eba10eeebdf1c801186ae2c0206292da28ab7c5) )
 
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
+ROM_END
 
-ROM_START( v4opt3 )
+ROM_START( v4redhtpu )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_xcad_.3_0", 0x0000, 0x010000, CRC(392f658d) SHA1(c730a5e54faab1946554af9e6b9e08dc50bbe9d6) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "o3-s.p1",0x000000, 0x020000, CRC(9b825fa1) SHA1(c743bed32fa1af934f9610204a4f4062cfb85193) )
-	ROM_LOAD16_BYTE( "o3-.p2", 0x000001, 0x020000, CRC(9545a845) SHA1(24c6656c137baf74c8ea5d930220bf0d0c90b3ab) )
-	ROM_LOAD16_BYTE( "o3-.p3", 0x040000, 0x020000, CRC(2f3666cb) SHA1(94010eb56de7f3900fbe1c0b77a43752f9cf3ba6) )
-	ROM_LOAD16_BYTE( "o3-.p4", 0x040001, 0x020000, CRC(63b6aa70) SHA1(6f0bef67437caa150ee98f0349d0f6412665e36b) )
-	ROM_LOAD16_BYTE( "o3-.p5", 0x080000, 0x020000, CRC(750db328) SHA1(8442b32e2f70ba2e0849d994a1e2502634652c5e) )
-	ROM_LOAD16_BYTE( "o3-.p6", 0x080001, 0x020000, CRC(1fed469e) SHA1(351a8cd687c0e11300c498e45e4b6f3a35940615) )
-	ROM_LOAD16_BYTE( "o3-.p7", 0x0c0000, 0x020000, CRC(400e304f) SHA1(3abe30cf75990a5ce9066ccd4cfed680e5d4963c) )
-	ROM_LOAD16_BYTE( "o3-.p8", 0x0c0001, 0x020000, CRC(0fb22311) SHA1(2329520d4ce763ba10cc81314711d28b4a5fb192) )
-	ROM_LOAD16_BYTE( "o3-.p9", 0x100000, 0x020000, CRC(0d71b620) SHA1(103cf5700c876e94e2ca3b63ef71b768bd2d99a2) )
-	ROM_LOAD16_BYTE( "o3-.p10",0x100001, 0x020000, CRC(239fa03b) SHA1(c4c77ded07481746b041122a8538036a65a5abe6) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4opt3d )
+ROM_START( v4redhtpv )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS
+	ROM_LOAD( "rp_xcak_.3_0", 0x0000, 0x010000, CRC(cfabf21e) SHA1(9cec91ea209d250ba885552579044b5ce9d730bd) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "o3-d.p1",0x000000, 0x020000, CRC(09eef902) SHA1(2ce68fe08c5a1be7daaf3a380aa5f5fef8401944) )
-	ROM_LOAD16_BYTE( "o3-.p2", 0x000001, 0x020000, CRC(9545a845) SHA1(24c6656c137baf74c8ea5d930220bf0d0c90b3ab) )
-	ROM_LOAD16_BYTE( "o3-.p3", 0x040000, 0x020000, CRC(2f3666cb) SHA1(94010eb56de7f3900fbe1c0b77a43752f9cf3ba6) )
-	ROM_LOAD16_BYTE( "o3-.p4", 0x040001, 0x020000, CRC(63b6aa70) SHA1(6f0bef67437caa150ee98f0349d0f6412665e36b) )
-	ROM_LOAD16_BYTE( "o3-.p5", 0x080000, 0x020000, CRC(750db328) SHA1(8442b32e2f70ba2e0849d994a1e2502634652c5e) )
-	ROM_LOAD16_BYTE( "o3-.p6", 0x080001, 0x020000, CRC(1fed469e) SHA1(351a8cd687c0e11300c498e45e4b6f3a35940615) )
-	ROM_LOAD16_BYTE( "o3-.p7", 0x0c0000, 0x020000, CRC(400e304f) SHA1(3abe30cf75990a5ce9066ccd4cfed680e5d4963c) )
-	ROM_LOAD16_BYTE( "o3-.p8", 0x0c0001, 0x020000, CRC(0fb22311) SHA1(2329520d4ce763ba10cc81314711d28b4a5fb192) )
-	ROM_LOAD16_BYTE( "o3-.p9", 0x100000, 0x020000, CRC(0d71b620) SHA1(103cf5700c876e94e2ca3b63ef71b768bd2d99a2) )
-	ROM_LOAD16_BYTE( "o3-.p10",0x100001, 0x020000, CRC(239fa03b) SHA1(c4c77ded07481746b041122a8538036a65a5abe6) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
+ROM_START( v4redhtpw )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rp_xcbg_.3_0", 0x0000, 0x010000, CRC(0e392264) SHA1(aeb5a4df61b3e67100912ede2f5e127d413b656c) )
 
-/*
-
-FRUIT FACTORY                   ID=FF_
--------------
-
-GRAPHIC PROMS
-=============
-
-FF_GFX10.P3     4mb
-FF_GFX10.P4     4MB
-FF_GFX10.P5     4MB
-FF_GFX10.P6     4MB
-FF_GFX10.P7     4MB
-FF_GFX10.P8     4MB
-
-MPU4 PROM
-=========
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-FFMPU416.P1 A209    27C512
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
+ROM_END
 
+ROM_START( v4redhtpx )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rp_xcs__.3_0", 0x0000, 0x010000, CRC(876c1ae9) SHA1(9ea1b2a28f2b87089500dd25e6dc1450be43acbc) )
 
-GAME PROMS
-==========
-FF_293.P1   5F95    27C040  20p/?15
-FF_293.P2   DCE6    27C040  20p/?15
-FF_293D.P2  5F95    27C040  20p/?15 data
-FF_293D.P2  DDE5    27C040  20p/?15 data
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-FF_393.P1   5F9F    27C040  25p/?15
-FF_393.P2   DCE6    27C040  25p/?15
-FF_393D.P2  5F9F    27C040  25p/?15 data
-FF_393D.P2  DDE5    27C040  25p/?15 data
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
+ROM_END
 
-FF_493.P1   5EAA    27C040  30p/?15
-FF_493.P2   DCE6    27C040  30p/?15
-FF_493D.P2  5EAA    27C040  30p/?15 data
-FF_493D.P2  DDE5    27C040  30p/?15 data
+ROM_START( v4redhtpy )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rp_xcsb_.3_0", 0x0000, 0x010000, CRC(71e88d7a) SHA1(81d38e598514a5a1b9bca0131232b18c3829edfb) )
 
----------------------------------------------------------------------
- END
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
- */
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
+ROM_END
 
-ROM_START( v4frfact )
+ROM_START( v4redhtpz )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	VID_BIOS // should use FFMPU416.P1  A209    27C512 .. find out which that is, if it's dumped
-
-	ROM_REGION( 0x800000, "video", 0 )
-	/* p1/p2 load the wrong way around? */
-	ROM_LOAD16_BYTE( "ff_40d.p1", 0x000001, 0x080000, CRC(c91fd349) SHA1(18c36612ee9fed6f12bb3dbf08f6740cf2a463c2) )
-	ROM_LOAD16_BYTE( "ff_40d.p2", 0x000000, 0x080000, CRC(e7555936) SHA1(0af7a0be17735831eb037c4bc55d35891a608b23) )
+	ROM_LOAD( "rp_xcsd_.3_0", 0x0000, 0x010000, CRC(ccc9fd48) SHA1(1069b945b5312eb01139b7671901212f8f65e3bf) )
 
-	ROM_LOAD16_BYTE( "ff_gfx10.p3", 0x100001, 0x080000, CRC(a043a1f6) SHA1(0e591f0e7ecdf8b390a20ee826705a22ed6923d5) )
-	ROM_LOAD16_BYTE( "ff_gfx10.p4", 0x100000, 0x080000, CRC(58226ff5) SHA1(f2647e43da69e8aa2f78d46f3cfc553440213c36) )
-	ROM_LOAD16_BYTE( "ff_gfx10.p5", 0x200001, 0x080000, CRC(9bfc6da8) SHA1(969c4a84392c28d61e87482e7f881bdfda79f879) )
-	ROM_LOAD16_BYTE( "ff_gfx10.p6", 0x200000, 0x080000, CRC(240cdfd3) SHA1(8ccf199aff929813df554d957e84484a482c98c6) )
-	ROM_LOAD16_BYTE( "ff_gfx10.p7", 0x300001, 0x080000, CRC(42d3bd01) SHA1(6d07875e8f251c3c9c4e7f48ae886b8069c20897) )
-	ROM_LOAD16_BYTE( "ff_gfx10.p8", 0x300000, 0x080000, CRC(1951a944) SHA1(b8eca580ae43be855d93cf9f50058b2fb9e8981b) )
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
-	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision Prg ROMs, to be sorted into clones */
-	// 30p/?15
-	ROM_LOAD16_BYTE( "ff_493.p1", 0x000001, 0x080000, CRC(1a88e0e6) SHA1(198fffd0d98d557462485b1ca6e3460199e03924) )
-	ROM_LOAD16_BYTE( "ff_493.p2", 0x000000, 0x080000, CRC(1c948e83) SHA1(571f854c33a2ef68daa8633193b49486ff92d7e2) )
-	// 30p/?15 data
-	ROM_LOAD16_BYTE( "ff_493d.p1", 0x000001, 0x080000, CRC(1a88e0e6) SHA1(198fffd0d98d557462485b1ca6e3460199e03924) )
-	ROM_LOAD16_BYTE( "ff_493d.p2", 0x000000, 0x080000, CRC(86830e6c) SHA1(9510bf42a8c2f8ffeafd1f2b0e027a0a59d80b20) )
-	// 25p/?15
-	ROM_LOAD16_BYTE( "ff_393.p1", 0x000001, 0x080000, CRC(35011cab) SHA1(9e381db93dbe1f71d40b152ae6c68ea7a7b9728c) )
-	ROM_LOAD16_BYTE( "ff_393.p2", 0x000000, 0x080000, CRC(1c948e83) SHA1(571f854c33a2ef68daa8633193b49486ff92d7e2) )
-	// 25p/?15 data
-	ROM_LOAD16_BYTE( "ff_393d.p1", 0x000001, 0x080000, CRC(35011cab) SHA1(9e381db93dbe1f71d40b152ae6c68ea7a7b9728c) )
-	ROM_LOAD16_BYTE( "ff_393d.p2", 0x000000, 0x080000, CRC(86830e6c) SHA1(9510bf42a8c2f8ffeafd1f2b0e027a0a59d80b20) )
-	// 20p/?15
-	ROM_LOAD16_BYTE( "ff_293.p1", 0x000001, 0x080000, CRC(4787bc3d) SHA1(a1d53f1640c6d829c9fee8c72057b2801aac4cb2) )
-	ROM_LOAD16_BYTE( "ff_293.p2", 0x000000, 0x080000, CRC(1c948e83) SHA1(571f854c33a2ef68daa8633193b49486ff92d7e2) )
-	// 20p/?15 data
-	ROM_LOAD16_BYTE( "ff_293d.p1", 0x000001, 0x080000, CRC(4787bc3d) SHA1(a1d53f1640c6d829c9fee8c72057b2801aac4cb2) )
-	ROM_LOAD16_BYTE( "ff_293d.p2", 0x000000, 0x080000, CRC(86830e6c) SHA1(9510bf42a8c2f8ffeafd1f2b0e027a0a59d80b20) )
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-/* BwB */
-ROM_START( v4bigfrt )
+ROM_START( v4redhtpaa )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	// standard/stake Key
-	ROM_LOAD("bi_xca__.2_0",  0x00000, 0x10000,  CRC(bdba5ce9) SHA1(e4bce58957230183b96f9d3155575005ffb002c8))
-
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE("bi______.2_1",  0x000000, 0x010000,  CRC(22e7e736) SHA1(478abe8dc9e29b8ceccfac80ddaa5ce2727572cd))
-	ROM_LOAD16_BYTE("bi______.2_2",  0x000001, 0x010000,  CRC(9d139ae7) SHA1(fb38b3102355ee5f79f66410ce5a26f74296321a))
-	ROM_LOAD16_BYTE("bi______.2_3",  0x020000, 0x010000,  CRC(9f4c424d) SHA1(f20e5e6f43ac0d481b7f2d8ea421fa6b9fa92b38))
-	ROM_LOAD16_BYTE("bi______.2_4",  0x020001, 0x010000,  CRC(58f0dcb4) SHA1(79039d489f5ce3a1865fa92a2b6e8b002b63efcf))
-	ROM_LOAD16_BYTE("bi______.2_5",  0x040000, 0x010000,  CRC(512c6d1a) SHA1(1c9d04e7e59a95f6975e6d2d5e5def4c1a7777e0))
-	ROM_LOAD16_BYTE("bi______.2_6",  0x040001, 0x010000,  CRC(5df850ec) SHA1(5b455f4cfb19c551723f7fd5f4f95e5420f8682f))
-	ROM_LOAD16_BYTE("bi______.2_7",  0x050000, 0x010000,  CRC(9ea394a2) SHA1(3b9840627f7676aa7872d2bc022406a4ced7958f))
-	ROM_LOAD16_BYTE("bi______.2_8",  0x050001, 0x010000,  CRC(4aa1d37d) SHA1(3c1a3ccacdc33cd4a54b7bbf06ea4c33868705f4))
+	ROM_LOAD( "rp_xcsk_.3_0", 0x0000, 0x010000, CRC(3a4d6adb) SHA1(01dfead74d40af9a5a4a95781b83d078cfb92ac9) )
 
-	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision BIOS ROMs, to be sorted into clones (could probably do so already, but let's not complicate things)*/
-	// protocol/20p/Rank Bingo
-	ROM_LOAD("bi_20bt_.2_0",  0x00000, 0x10000,  CRC(0c5b21c8) SHA1(bec3a0ca87156de82024449ed5acfd9d8877f15c))
-	// protocol/20p/Gala Bingo
-	ROM_LOAD("bi_20bg_.2_0",  0x00000, 0x10000,  CRC(f1b5cb6a) SHA1(b26040a283d3c2642367e86f66e47d97c1ac07a4))
-	// protocol and % key/20p
-	ROM_LOAD("bi_20sb_.2_0",  0x00000, 0x10000,  CRC(8e646474) SHA1(8b72fba96947fb78a79997b37987eadec522cc4e))
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4bubbnk )
+ROM_START( v4redhtpab )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	// Standard/20p
-	ROM_LOAD("bu_20a__.4_0",  0x00000, 0x10000,  CRC(743a0c56) SHA1(6dfe6733d19b19fcb9be2472615a340237253966))
-
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE("bu______.4_1",  0x000000, 0x010000,  CRC(1e85dd5d) SHA1(0f3c35d9f75d3495e2d0cc1fcf0e96dcbbeeacc8))
-	ROM_LOAD16_BYTE("bu______.4_2",  0x000001, 0x010000,  CRC(989db70a) SHA1(e44f8900392db51cc3f0a5bf0391bde0d71b9878))
-	ROM_LOAD16_BYTE("bu______.4_3",  0x020000, 0x010000,  CRC(b079fc12) SHA1(6cb736fbe07617eca3ea691e85ff17a0ae218faf))
-	ROM_LOAD16_BYTE("bu______.4_4",  0x020001, 0x010000,  CRC(7e22a7cf) SHA1(00f6a303684850e0a8a168d4a6da628bc19599ea))
-	ROM_LOAD16_BYTE("bu______.4_5",  0x040000, 0x010000,  CRC(225eff49) SHA1(015efc0f058172cc03f9e38794784e52c097e2bc))
-	ROM_LOAD16_BYTE("bu______.4_6",  0x040001, 0x010000,  CRC(84ce8822) SHA1(5b9b24bc5e586678d415c1234b8c870776f970cb))
-	ROM_LOAD16_BYTE("bu______.4_7",  0x060000, 0x010000,  CRC(a3b00c9f) SHA1(16d9f09a9c20a23521468ea332d19ec485e3606f))
-	ROM_LOAD16_BYTE("bu______.4_8",  0x060001, 0x010000,  CRC(7bd03d6e) SHA1(63802bc31115410f5021cdaca2ef832ace59288d))
-	ROM_LOAD16_BYTE("bu______.4_9",  0x080000, 0x010000,  CRC(18157aca) SHA1(e6666ecae620a9d8d3c9099f2d269a3cebd05d0f))
-	ROM_LOAD16_BYTE("bu______.4_a",  0x080001, 0x010000,  CRC(bc76817d) SHA1(418355740310d431a2803663b5138dff4b45452f))
+	ROM_LOAD( "rpi10___.3_0", 0x0000, 0x010000, CRC(046b7b3c) SHA1(71f74153dbdd52036a55fc0a217120dee84ca230) )
 
-	ROM_REGION( 0x100000, "altrevs", 0 ) /* Alternate revision BIOS ROMs, to be sorted into clones (could probably do so already, but let's not complicate things)*/
-	// Irish/20p
-	ROM_LOAD("bui20a__.4_0",  0x00000, 0x10000,  CRC(154263c0) SHA1(8207ce1876be443e2023554629c0de1117544170))
-	// protocol and % key/20p
-	ROM_LOAD("bu_20ab_.4_0",  0x00000, 0x10000,  CRC(82be9bc5) SHA1(6bd5e08cd157c7c02259aa93ddbce19979dd85f0))
-	// protocol/20p
-	ROM_LOAD("bu_20ad_.4_0",  0x00000, 0x10000,  CRC(3f9febf7) SHA1(172e7e03d7b4c6fdda6bb8f3f5d93d3803f678c3))
-	// % Key/20p
-	ROM_LOAD("bu_20ak_.4_0",  0x00000, 0x10000,  CRC(c91b7c64) SHA1(7cb4027e43e524792e1b5e523857f5d52cc7e7d2))
+	ROM_REGION( 0x800000, "video", 0 ) // Release 3 Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE("rp______.3_5",  0x040000, 0x010000,  CRC(d9fd05d0) SHA1(330ef58c012b5d5fd018bea54b3ae315b3e45cfd))
+	ROM_LOAD16_BYTE("rp______.3_6",  0x040001, 0x010000,  CRC(eeea91ff) SHA1(cc7870a68f62d4dd70c13713a432a61a091821ef))
 
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
 
-ROM_START( v4mazbla )
+ROM_START( v4redhtpunk )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	// standard/20p
-	ROM_LOAD("maz20__1.5x0",  0x00000, 0x10000,  CRC(06f95de7) SHA1(6ee8a345b12c9993513dda686ddb8c89d847976f))
-
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE("maz20__1.5x1",  0x000000, 0x010000,  CRC(a4be5a3f) SHA1(e510a54c7d7551dbb2c5dd450c921fd0e3649db6))
-	ROM_LOAD16_BYTE("maz20__1.5x2",  0x000001, 0x010000,  CRC(261466aa) SHA1(ce61f7f1af9abed6e9fad778a270b3c4c167d401))
-	ROM_LOAD16_BYTE("maz20__1.5x3",  0x020000, 0x010000,  CRC(a9f02fc6) SHA1(d892bcd3e755c623bb7f2ff4db4876c091c5ae30))
-	ROM_LOAD16_BYTE("maz20__1.5x4",  0x020001, 0x010000,  CRC(b5f333b6) SHA1(b848f9d6f39e102d72992d56836cd5b8c16b5554))
+	ROM_LOAD( "rhp20ac6", 0x0000, 0x010000, CRC(d6a842b4) SHA1(94f6cc6a9e0efa8a2eeee14f981f9d2407dfb092) )
 
-	ROM_REGION( 0x100000, "altrevs", 0 )
-	// protocol % key/20p/
-	ROM_LOAD("maz20dy1.5x0",  0x00000, 0x10000,  CRC(f07dca74) SHA1(f5c2658911a3d8d082ca3f2289b69e767f5a80f4))
+	ROM_REGION( 0x800000, "video", 0 ) // none of the ROMs are have are commpatible with this?
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
 
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4mazbel )
+
+ROM_START( v4redhtparc ) // ok
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	// protocol % key/20p/
-	ROM_LOAD("maz20dy2.5_0",  0x00000, 0x10000,  CRC(e43220df) SHA1(07b58cc40fa490564a6bf8add65a3b3c4d9b1164))
+	ROM_LOAD( "redhotpoker20_mpu4_interface.bin", 0x0000, 0x010000, CRC(cafbcc82) SHA1(662df1f6409f9e20fac07c07d08eae3ea8ba362a) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE("maz20__2.5_1",  0x000000, 0x010000,  CRC(6d3b4dbd) SHA1(79479c458395fa718f00e4c1547b186a85153848))
-	ROM_LOAD16_BYTE("maz20__2.5_2",  0x000001, 0x010000,  CRC(40074cc3) SHA1(498beeed1a1f86e535474a25f3ec73c1fdb004b9))
-	ROM_LOAD16_BYTE("maz20__2.5_3",  0x020000, 0x010000,  CRC(b78bc8a9) SHA1(7436cb9e67a3d72b36cbdd92d8aa3e26e6b7b40d))
-	ROM_LOAD16_BYTE("maz20__2.5_4",  0x020001, 0x010000,  CRC(116a6f65) SHA1(10fa599b620f6d595b27723f7ae1c36f6ff61f7d))
+	ROM_REGION( 0x800000, "video", 0 ) // Version 1.9 Arcade Video ROMs
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE( "redhotpokervideoboardp5.bin", 0x040000, 0x010000, CRC(d36189b7) SHA1(7757ce9879754d4b8a450ba1f6067c17c151c13c) )
+	ROM_LOAD16_BYTE( "redhotpokervideoboardp6.bin", 0x040001, 0x010000, CRC(c89d164d) SHA1(0cf33db0f85958251624dd7bc2c3024814489040) )
 
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-ROM_START( v4shpwnd )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	// Standard/20p/
-	ROM_LOAD("sw_20___.2_0",  0x00000, 0x10000,  CRC(c1b49d81) SHA1(dcb077734beb814002046d36091a6407644c1393))
-
-	ROM_REGION( 0x10000, "altmain", 0 )
-	ROM_LOAD( "sw_10___.2_0", 0x0000, 0x010000, CRC(1377a409) SHA1(632bae8bf70270fb13caabbc491f81f8b6589ece) )
-	ROM_LOAD( "sw_10_b_.2_0", 0x0000, 0x010000, CRC(e5f3339a) SHA1(67d79c2939ad0c566e05e470672d7153fdc2fbd5) )
-	ROM_LOAD( "sw_10_d_.2_0", 0x0000, 0x010000, CRC(58d243a8) SHA1(1f718a153e2a42893c2dcecddf857c93872a780d) )
-	ROM_LOAD( "sw_10_k_.2_0", 0x0000, 0x010000, CRC(ae56d43b) SHA1(ad73f7ad4c142d3ad629b0df46985456a2f8ebc8) )
-	ROM_LOAD( "sw_20_b_.2_0", 0x0000, 0x010000, CRC(37300a12) SHA1(34abe1b28afe9c36810f9c7eba356720d9ff53de) )
-	ROM_LOAD( "sw_20_d_.2_0", 0x0000, 0x010000, CRC(8a117a20) SHA1(697d97155b3c4f515988390997064ace7402959e) )
-	ROM_LOAD( "sw_20_k_.2_0", 0x0000, 0x010000, CRC(7c95edb3) SHA1(4a8208c2786eed73a4ade67209a5cb66ba8c4ed8) )
-	ROM_LOAD( "sw_20bg_.2_0", 0x0000, 0x010000, CRC(48e1a50c) SHA1(7f1aaa3207b86996cb1804ff82685723839e7c7c) )
-	ROM_LOAD( "sw_20bt_.2_0", 0x0000, 0x010000, CRC(feaaa80f) SHA1(23ec154fe0fdb4bbb558960d700c94674bb4a144) )
-	ROM_LOAD( "sw_xc___.2_0", 0x0000, 0x010000, CRC(f108aa4a) SHA1(f27456a22b781df3103cc7b7f35fb08bb547e864) )
-	ROM_LOAD( "sw_xc_b_.2_0", 0x0000, 0x010000, CRC(078c3dd9) SHA1(07515a2476ae15c780da2de58de8b17f30c0ebdf) )
-	ROM_LOAD( "sw_xc_d_.2_0", 0x0000, 0x010000, CRC(baad4deb) SHA1(ad3d90eefdad4e6baa10558ed5a1415ed94742b6) )
-	ROM_LOAD( "sw_xc_k_.2_0", 0x0000, 0x010000, CRC(4c29da78) SHA1(0431016a0a13d97fc833e31bc2897e7abb6a5047) )
 
+ROM_START( v4redhtp2 ) // ok
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rp_05s__.2_0", 0x0000, 0x010000, CRC(62e93168) SHA1(8287eee2d6ac4cc447ce6652de24dfe056015ef3) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
-	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
-	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
-	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+	ROM_REGION( 0x800000, "video", 0 ) // newer 'release 2' 68k ROMs with 1993 date
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE( "rp_05___.2_5", 0x040000, 0x010000, CRC(cc79187b) SHA1(b2e556fd7a1667203dcb196b1dc2d89bff785675) )
+	ROM_LOAD16_BYTE( "rp_05___.2_6", 0x040001, 0x010000, CRC(57d1cf7b) SHA1(c8d6f4d0e8a5a383c47300e8d56e13d62295f60f) )
 
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
 ROM_END
 
-/* Nova */
-
-ROM_START( v4cybcas )
+ROM_START( v4redhtp2a )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "ccd_____.6_0", 0x0000, 0x010000, CRC(93aa1a3d) SHA1(dce4cc4bfc616163ca240c417d1ef9a0a19e5901) )
+	ROM_LOAD( "rp_05a__.2_0", 0x0000, 0x010000, CRC(970fa9ad) SHA1(77550948aae171eae715e077cdbeffaeeadb2436) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "ccd_____.6_1", 0x000001, 0x080000, CRC(58c8ae96) SHA1(9f3aea47ae014c61bb2b75664210a3609996f983) )
-	ROM_LOAD16_BYTE( "ccd_____.6_2", 0x000000, 0x080000, CRC(f0556749) SHA1(2f35a9f9672219001c2a48d7f103ac99e1b21b32) )
-	ROM_LOAD16_BYTE( "ccd_____.6_3", 0x100001, 0x080000, CRC(4d2f5485) SHA1(a8c9b5843384ce55a10531b82766f5498dc0d334) )
-	ROM_LOAD16_BYTE( "ccd_____.6_4", 0x100000, 0x080000, CRC(87b29468) SHA1(89a3855754e8a720ca76fa16b11f791ade75fb78) )
-	ROM_LOAD16_BYTE( "ccd_____.6_5", 0x200001, 0x080000, CRC(bd8be9ff) SHA1(c5d620774e476e6ec00876e513ff838af102ecc9) )
-	ROM_LOAD16_BYTE( "ccd_____.6_6", 0x200000, 0x080000, CRC(faf65e25) SHA1(f50369348740ba4c878455c108ac3e8d2262ef5e) )
-	ROM_LOAD16_BYTE( "ccd_____.6_7", 0x300001, 0x080000, CRC(4cd1461c) SHA1(00379212130d5e9c1c364191f67a35cc5eca8b72) )
-	ROM_LOAD16_BYTE( "ccd_____.6_8", 0x300000, 0x080000, CRC(08ce378f) SHA1(035b0ff4d18c09a385002db73c54b8dac92dfa8a) )
+	ROM_REGION( 0x800000, "video", 0 ) // newer 'release 2' 68k ROMs with 1993 date
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE( "rp_05___.2_5", 0x040000, 0x010000, CRC(cc79187b) SHA1(b2e556fd7a1667203dcb196b1dc2d89bff785675) )
+	ROM_LOAD16_BYTE( "rp_05___.2_6", 0x040001, 0x010000, CRC(57d1cf7b) SHA1(c8d6f4d0e8a5a383c47300e8d56e13d62295f60f) )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
-	/* none present */
+	// none present
 ROM_END
 
-ROM_START( v4miami )
+ROM_START( v4redhtp2b )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "mdd4_0.bin", 0x0000, 0x010000, CRC(0d868466) SHA1(3cea446f094ae3b4f56163ccf01cd31c15dca03f) )
+	ROM_LOAD( "rp_05ab_.2_0", 0x0000, 0x010000, CRC(618b3e3e) SHA1(19f7c83957f1d0b36f62607d314a310748b3c84a) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "md41.p1", 0x000001, 0x080000, CRC(9567347f) SHA1(5188b3f359ff26c0854d5745df37575851502ae9) )
-	ROM_LOAD16_BYTE( "md42.p2", 0x000000, 0x080000, CRC(e0dad693) SHA1(9768331a4a776906935b3c5501b68cb4dd1bd41f) )
-	ROM_LOAD16_BYTE( "md43.p3", 0x100001, 0x080000, CRC(9bceb3f6) SHA1(5be84d5f1635f80a9fe8072c2d94012ed00d97be) )
-	ROM_LOAD16_BYTE( "md44.p4", 0x100000, 0x080000, CRC(54b8fbfa) SHA1(ca2fb67972507a2eb33d2800a3b2d45d3ee49289) )
+	ROM_REGION( 0x800000, "video", 0 ) // newer 'release 2' 68k ROMs with 1993 date
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE( "rp_05___.2_5", 0x040000, 0x010000, CRC(cc79187b) SHA1(b2e556fd7a1667203dcb196b1dc2d89bff785675) )
+	ROM_LOAD16_BYTE( "rp_05___.2_6", 0x040001, 0x010000, CRC(57d1cf7b) SHA1(c8d6f4d0e8a5a383c47300e8d56e13d62295f60f) )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
-	ROM_LOAD( "md41snd.p1", 0x000000, 0x080000, CRC(7a3ba770) SHA1(e620f521d16b39be9b41b934435812afff3993b2) )
-	ROM_LOAD( "md42snd.p2", 0x080000, 0x080000, CRC(8ebc7329) SHA1(82ce25c1486a8619355f363125a26d8cdeb05d33) )
-	ROM_LOAD( "md43snd.p3", 0x100000, 0x080000, CRC(14f4d838) SHA1(0508890a9884fbef0e194a38fe3afc5cf5282091) )
+	// none present
 ROM_END
 
-
-ROM_START( v4missis )
+ROM_START( v4redhtp2c )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "mldsf___.6_0", 0x0000, 0x010000, CRC(3f0fe40e) SHA1(6fd9ddede5f11c35d47c7ddd360b0021267e7e3f) )
+	ROM_LOAD( "rp_05ad_.2_0", 0x0000, 0x010000, CRC(dcaa4e0c) SHA1(2a037722f5e951513c233227448c3a2e55de8ef9) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "mld_____.6_1", 0x000000, 0x080000, CRC(44e26e6e) SHA1(ba96757b74e75d094b6cda340c78754f1b8f6a7c) )
-	ROM_LOAD16_BYTE( "mld_____.6_2", 0x000001, 0x080000, CRC(e9219fff) SHA1(80c0211b98c4200ad9512e89b067018ce8600494) )
-	ROM_LOAD16_BYTE( "mld_____.6_3", 0x100000, 0x080000, CRC(680bd284) SHA1(33dfd0cb396c1466c2a5cfc474756b8a2d966518) )
-	ROM_LOAD16_BYTE( "mld_____.6_4", 0x100001, 0x080000, CRC(0e21022b) SHA1(30465321a976064f7841b2c3314244b744a45092) )
-	ROM_LOAD16_BYTE( "mld_____.6_5", 0x200000, 0x080000, CRC(cd6c39d2) SHA1(c4d4b5c7a1f3dcfdc464fff29f10ccee932f265a) )
-	ROM_LOAD16_BYTE( "mld_____.6_6", 0x200001, 0x080000, CRC(5ad997a3) SHA1(0fd75b4a9b5991fda9cc3373b86f466492c3b4bb) )
+	ROM_REGION( 0x800000, "video", 0 ) // newer 'release 2' 68k ROMs with 1993 date
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE( "rp_05___.2_5", 0x040000, 0x010000, CRC(cc79187b) SHA1(b2e556fd7a1667203dcb196b1dc2d89bff785675) )
+	ROM_LOAD16_BYTE( "rp_05___.2_6", 0x040001, 0x010000, CRC(57d1cf7b) SHA1(c8d6f4d0e8a5a383c47300e8d56e13d62295f60f) )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
-	ROM_LOAD( "mld_snd_.1_1", 0x000000, 0x080000, CRC(8c26fe12) SHA1(0532126d8e283b4567a4cdf2bb807f5471c84832) )
-	ROM_LOAD( "mld_snd_.1_2", 0x080000, 0x080000, CRC(9ab841b6) SHA1(7828c6144777621859b85a3ec92760d353576527) )
-	ROM_LOAD( "mld_snd_.1_3", 0x100000, 0x080000, CRC(3f068632) SHA1(5e43da287b3aa163493c1be03ebee28ef58c44a1) )
-	ROM_LOAD( "mld_snd_.1_4", 0x180000, 0x080000, CRC(f78f7221) SHA1(dac88abee6a5fdf7b69c5d39345ee05c1ac47314) )
+	// none present
 ROM_END
 
-ROM_START( v4picdil )
+ROM_START( v4redhtp2d )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "pcdsf___.a_0", 0x0000, 0x010000, CRC(45a15082) SHA1(d7655722c7ad9f3b1b2663d85287ae185917d677) )
-	ROM_LOAD( "pcdsf__e.a_0", 0x0000, 0x010000, CRC(0ed1c7af) SHA1(c19ff141fba7fd1f2cf0b152e3c6df61c6b27b46) )
+	ROM_LOAD( "rp_05ak_.2_0", 0x0000, 0x010000, CRC(2a2ed99f) SHA1(45215a140b4e9d6b190fff0b89fcbeffc054d732) )
 
-	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "pcd_____.a_1", 0x000001, 0x080000, CRC(0ed561d4) SHA1(899c76d2a2352988a01bece2a229deb934a00892) )
-	ROM_LOAD16_BYTE( "pcd_____.a_2", 0x000000, 0x080000, CRC(bffe3863) SHA1(ea6fdcce470e8a50c35f43fd86e39524be2db3a3) )
-	ROM_LOAD16_BYTE( "pcd_____.a_3", 0x100001, 0x080000, CRC(3b64a328) SHA1(a9fa9dc30b352388906e6021bc0d1ad7c3a28746) )
-	ROM_LOAD16_BYTE( "pcd_____.a_4", 0x100000, 0x080000, CRC(25faba03) SHA1(572aaee3af3b915294ba057b7ceb653dd135098b) )
-	ROM_LOAD16_BYTE( "pcd_____.a_5", 0x200001, 0x080000, CRC(275f3c1c) SHA1(1d0f8f7d0388d5072ae404f10b2481153979a217) )
-	ROM_LOAD16_BYTE( "pcd_____.a_6", 0x200000, 0x080000, CRC(148ecba0) SHA1(2ae0f5529fa3951025539fe19f4e8fdf10f13374) )
+	ROM_REGION( 0x800000, "video", 0 ) // newer 'release 2' 68k ROMs with 1993 date
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE( "rp_05___.2_5", 0x040000, 0x010000, CRC(cc79187b) SHA1(b2e556fd7a1667203dcb196b1dc2d89bff785675) )
+	ROM_LOAD16_BYTE( "rp_05___.2_6", 0x040001, 0x010000, CRC(57d1cf7b) SHA1(c8d6f4d0e8a5a383c47300e8d56e13d62295f60f) )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
-	/* none present */
+	// none present
 ROM_END
 
+ROM_START( v4redhtp2e )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rp_05sb_.2_0", 0x0000, 0x010000, CRC(946da6fb) SHA1(d406f0bea0940b6910dc923ded0c89db9c1f3c61) )
+
+	ROM_REGION( 0x800000, "video", 0 ) // newer 'release 2' 68k ROMs with 1993 date
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE( "rp_05___.2_5", 0x040000, 0x010000, CRC(cc79187b) SHA1(b2e556fd7a1667203dcb196b1dc2d89bff785675) )
+	ROM_LOAD16_BYTE( "rp_05___.2_6", 0x040001, 0x010000, CRC(57d1cf7b) SHA1(c8d6f4d0e8a5a383c47300e8d56e13d62295f60f) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
+ROM_END
+
+ROM_START( v4redhtp2f )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rp_05sd_.2_0", 0x0000, 0x010000, CRC(294cd6c9) SHA1(4f2890c58cfa6d91ddc73d9098d8e45e79f410c3) )
+
+	ROM_REGION( 0x800000, "video", 0 ) // newer 'release 2' 68k ROMs with 1993 date
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE( "rp_05___.2_5", 0x040000, 0x010000, CRC(cc79187b) SHA1(b2e556fd7a1667203dcb196b1dc2d89bff785675) )
+	ROM_LOAD16_BYTE( "rp_05___.2_6", 0x040001, 0x010000, CRC(57d1cf7b) SHA1(c8d6f4d0e8a5a383c47300e8d56e13d62295f60f) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
+ROM_END
+
+ROM_START( v4redhtp2g )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rp_05sk_.2_0", 0x0000, 0x010000, CRC(dfc8415a) SHA1(5d9f946dc0307d16c9d90856d4ae2b4c8c5013a6) )
+
+	ROM_REGION( 0x800000, "video", 0 ) // newer 'release 2' 68k ROMs with 1993 date
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE( "rp_05___.2_5", 0x040000, 0x010000, CRC(cc79187b) SHA1(b2e556fd7a1667203dcb196b1dc2d89bff785675) )
+	ROM_LOAD16_BYTE( "rp_05___.2_6", 0x040001, 0x010000, CRC(57d1cf7b) SHA1(c8d6f4d0e8a5a383c47300e8d56e13d62295f60f) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
+ROM_END
+
+
+
+
+
+ROM_START( v4redhtp2z ) // ok
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rhpint", 0x0000, 0x010000, CRC(d60e7e30) SHA1(174f69ff2e76837455c107055b06f98875033b5e) )
+
+	ROM_REGION( 0x800000, "video", 0 ) // older 'release 2' 68K ROMs with 1992 date
+	ROM_LOAD16_BYTE("rp______.3_1",  0x000000, 0x010000,  CRC(b987406d) SHA1(8c4d386570c0c6298b1cabf50295021b3b0cf625))
+	ROM_LOAD16_BYTE("rp______.3_2",  0x000001, 0x010000,  CRC(73e3c12e) SHA1(19e3ed7255fa0c3bfa14b6a4b705c0c3e1a237b6))
+	ROM_LOAD16_BYTE("rp______.3_3",  0x020000, 0x010000,  CRC(05a30183) SHA1(302f4926073bf7335da7f0b1e6399b64ea9bbae4))
+	ROM_LOAD16_BYTE("rp______.3_4",  0x020001, 0x010000,  CRC(6b122765) SHA1(72cd0fda322790bed8cdc7697306ec01efc43789))
+	ROM_LOAD16_BYTE( "rhp1.6p5", 0x040000, 0x010000, CRC(750436a1) SHA1(006a31fc5c22969bd79dbc54e618348ad7832ac7) )
+	ROM_LOAD16_BYTE( "rhp1.6p6", 0x040001, 0x010000, CRC(d78839c2) SHA1(e82b769cba4b8d50dcf5c301c03d4ca66e893f70) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	// none present
+ROM_END
+
+ROM_START( v4cmaze )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "crys.p1", 0x000000, 0x80000,  CRC(40fbde50) SHA1(91bd21c0aaffb9c9b89a114affbc485b12ae9bb4) )
+	ROM_LOAD16_BYTE( "cry.p2",  0x000001, 0x80000,  CRC(fa7d006f) SHA1(ecc03b4d7a4089feccc53ad05313c35b33e061d7) )
+	ROM_LOAD16_BYTE( "cry.p3",  0x100000, 0x80000,  CRC(e8cf8203) SHA1(e9f42e5c18b97807f51284ad2416346578ed73c4) )
+	ROM_LOAD16_BYTE( "cry.p4",  0x100001, 0x80000,  CRC(7b036151) SHA1(7b0040c296059b1e1798ddedf0ecb4582d67ee70) )
+	ROM_LOAD16_BYTE( "cry.p5",  0x200000, 0x80000,  CRC(48f17b20) SHA1(711c46fcfd86ded8ff7da883188d70560d20e42f) )
+	ROM_LOAD16_BYTE( "cry.p6",  0x200001, 0x80000,  CRC(2b3d9a97) SHA1(7468fffd90d840d245a70475b42308f1e48c5017) )
+	ROM_LOAD16_BYTE( "cry.p7",  0x300000, 0x80000,  CRC(20f73433) SHA1(593b40ac17591ac312ad41b4d3a5772626137bba) )
+	ROM_LOAD16_BYTE( "cry.p8",  0x300001, 0x80000,  CRC(835da1f2) SHA1(f93e075916d370466832871410591570ad7b9f3b) )
+	ROM_LOAD16_BYTE( "cry.p9",  0x400000, 0x80000,  CRC(c0e442ee) SHA1(a3877b200538642fe2bc96cfe8b33f04d8a82a98) )
+	ROM_LOAD16_BYTE( "cry.p10", 0x400001, 0x80000,  CRC(500172fa) SHA1(d83a37612daa79ba8425fdb28f39b8324b5736b6) )
+ROM_END
+
+ROM_START( v4cmazedat )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "cryd.p1", 0x000000, 0x80000,  CRC(b245f661) SHA1(85a8baca8797fea74bc36eea077be56bde8e54a9) )
+	ROM_LOAD16_BYTE( "cry.p2",  0x000001, 0x80000,  CRC(fa7d006f) SHA1(ecc03b4d7a4089feccc53ad05313c35b33e061d7) )
+	ROM_LOAD16_BYTE( "cry.p3",  0x100000, 0x80000,  CRC(e8cf8203) SHA1(e9f42e5c18b97807f51284ad2416346578ed73c4) )
+	ROM_LOAD16_BYTE( "cry.p4",  0x100001, 0x80000,  CRC(7b036151) SHA1(7b0040c296059b1e1798ddedf0ecb4582d67ee70) )
+	ROM_LOAD16_BYTE( "cry.p5",  0x200000, 0x80000,  CRC(48f17b20) SHA1(711c46fcfd86ded8ff7da883188d70560d20e42f) )
+	ROM_LOAD16_BYTE( "cry.p6",  0x200001, 0x80000,  CRC(2b3d9a97) SHA1(7468fffd90d840d245a70475b42308f1e48c5017) )
+	ROM_LOAD16_BYTE( "cry.p7",  0x300000, 0x80000,  CRC(20f73433) SHA1(593b40ac17591ac312ad41b4d3a5772626137bba) )
+	ROM_LOAD16_BYTE( "cry.p8",  0x300001, 0x80000,  CRC(835da1f2) SHA1(f93e075916d370466832871410591570ad7b9f3b) )
+	ROM_LOAD16_BYTE( "cry.p9",  0x400000, 0x80000,  CRC(c0e442ee) SHA1(a3877b200538642fe2bc96cfe8b33f04d8a82a98) )
+	ROM_LOAD16_BYTE( "cry.p10", 0x400001, 0x80000,  CRC(500172fa) SHA1(d83a37612daa79ba8425fdb28f39b8324b5736b6) )
+ROM_END
+
+ROM_START( v4cmaze_amld )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "am1z.p1",  0x000000, 0x80000,  CRC(d2fdda6d) SHA1(96c27dedc3cf1dd478e6169200844d418a276f14) )
+	ROM_LOAD16_BYTE( "am1z.p2",  0x000001, 0x80000,  CRC(1637170f) SHA1(fd17a0e7794f01bf4ad7a16b185f87cb060c70ab) )
+	ROM_LOAD16_BYTE( "am1g.p1",  0x100000, 0x80000,  CRC(e8cf8203) SHA1(e9f42e5c18b97807f51284ad2416346578ed73c4) )
+	ROM_LOAD16_BYTE( "am1g.p2",  0x100001, 0x80000,  CRC(7b036151) SHA1(7b0040c296059b1e1798ddedf0ecb4582d67ee70) )
+	ROM_LOAD16_BYTE( "am1g.p3",  0x200000, 0x80000,  CRC(48f17b20) SHA1(711c46fcfd86ded8ff7da883188d70560d20e42f) )
+	ROM_LOAD16_BYTE( "am1g.p4",  0x200001, 0x80000,  CRC(2b3d9a97) SHA1(7468fffd90d840d245a70475b42308f1e48c5017) )
+	ROM_LOAD16_BYTE( "am1g.p5",  0x300000, 0x80000,  CRC(68286bb1) SHA1(c307e3ad1e0fd92314216c8e554aafa949559452) )
+	ROM_LOAD16_BYTE( "am1g.p6",  0x300001, 0x80000,  CRC(a6b498ad) SHA1(117e1a4ec7e2d3c7d530c5a56cbc1d24b0ddc747) )
+	ROM_LOAD16_BYTE( "am1g.p7",  0x400000, 0x80000,  CRC(15882699) SHA1(b29a331e51a37554323b91330a7c2b62b33a943a) )
+	ROM_LOAD16_BYTE( "am1g.p8",  0x400001, 0x80000,  CRC(6f0f855b) SHA1(ab411d1af0f88049a6c435bafd4b1fa63f5519b1) )
+ROM_END
+
+ROM_START( v4cmazeb ) /* Was in a romset called 'Mad Money!' */
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "cm1.2p1", 0x000000, 0x040000, CRC(481f2fe2) SHA1(7bff9476dbd8c0812a51cd648acf11ca42789e54) )
+	ROM_LOAD16_BYTE( "cm1.2p2", 0x000001, 0x040000, CRC(6e6dc121) SHA1(05b29ea935d54aa97279e0a80265412747a92a10) )
+	ROM_LOAD16_BYTE( "cry.p3",  0x100000, 0x80000,  CRC(e8cf8203) SHA1(e9f42e5c18b97807f51284ad2416346578ed73c4) )
+	ROM_LOAD16_BYTE( "cry.p4",  0x100001, 0x80000,  CRC(7b036151) SHA1(7b0040c296059b1e1798ddedf0ecb4582d67ee70) )
+	ROM_LOAD16_BYTE( "cry.p5",  0x200000, 0x80000,  CRC(48f17b20) SHA1(711c46fcfd86ded8ff7da883188d70560d20e42f) )
+	ROM_LOAD16_BYTE( "cry.p6",  0x200001, 0x80000,  CRC(2b3d9a97) SHA1(7468fffd90d840d245a70475b42308f1e48c5017) )
+	ROM_LOAD16_BYTE( "cry.p7",  0x300000, 0x80000,  CRC(20f73433) SHA1(593b40ac17591ac312ad41b4d3a5772626137bba) )
+	ROM_LOAD16_BYTE( "cry.p8",  0x300001, 0x80000,  CRC(835da1f2) SHA1(f93e075916d370466832871410591570ad7b9f3b) )
+	ROM_LOAD16_BYTE( "cry.p9",  0x400000, 0x80000,  CRC(c0e442ee) SHA1(a3877b200538642fe2bc96cfe8b33f04d8a82a98) )
+	ROM_LOAD16_BYTE( "cry.p10", 0x400001, 0x80000,  CRC(500172fa) SHA1(d83a37612daa79ba8425fdb28f39b8324b5736b6) )
+ROM_END
+
+ROM_START( v4cmazec )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "cm1.p1",  0x000000, 0x040000, CRC(40533c1d) SHA1(06f115b7e1008e8797767d3f1e37edb4c1ce6675) )
+	ROM_LOAD16_BYTE( "cm1.p2",  0x000001, 0x040000, CRC(8b207eca) SHA1(cbd6b1b177daefe255609f7adc00effa6afc9cb5) )
+	ROM_LOAD16_BYTE( "cry.p3",  0x100000, 0x80000,  CRC(e8cf8203) SHA1(e9f42e5c18b97807f51284ad2416346578ed73c4) )
+	ROM_LOAD16_BYTE( "cry.p4",  0x100001, 0x80000,  CRC(7b036151) SHA1(7b0040c296059b1e1798ddedf0ecb4582d67ee70) )
+	ROM_LOAD16_BYTE( "cry.p5",  0x200000, 0x80000,  CRC(48f17b20) SHA1(711c46fcfd86ded8ff7da883188d70560d20e42f) )
+	ROM_LOAD16_BYTE( "cry.p6",  0x200001, 0x80000,  CRC(2b3d9a97) SHA1(7468fffd90d840d245a70475b42308f1e48c5017) )
+	ROM_LOAD16_BYTE( "cry.p7",  0x300000, 0x80000,  CRC(20f73433) SHA1(593b40ac17591ac312ad41b4d3a5772626137bba) )
+	ROM_LOAD16_BYTE( "cry.p8",  0x300001, 0x80000,  CRC(835da1f2) SHA1(f93e075916d370466832871410591570ad7b9f3b) )
+	ROM_LOAD16_BYTE( "cry.p9",  0x400000, 0x80000,  CRC(c0e442ee) SHA1(a3877b200538642fe2bc96cfe8b33f04d8a82a98) )
+	ROM_LOAD16_BYTE( "cry.p10", 0x400001, 0x80000,  CRC(500172fa) SHA1(d83a37612daa79ba8425fdb28f39b8324b5736b6) )
+ROM_END
+
+ROM_START( v4cmazed )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "cmz11p1",  0x000000, 0x040000, CRC(887baf65) SHA1(096133414bff89db4e30405f72f3c994f962be08) )
+	ROM_LOAD16_BYTE( "cmz11p2",  0x000001, 0x040000, CRC(f8f095a6) SHA1(6b23fe3712416bf268c6387d3b304f05206d45e1) )
+	ROM_LOAD16_BYTE( "cry.p3",  0x100000, 0x80000,  CRC(e8cf8203) SHA1(e9f42e5c18b97807f51284ad2416346578ed73c4) )
+	ROM_LOAD16_BYTE( "cry.p4",  0x100001, 0x80000,  CRC(7b036151) SHA1(7b0040c296059b1e1798ddedf0ecb4582d67ee70) )
+	ROM_LOAD16_BYTE( "cry.p5",  0x200000, 0x80000,  CRC(48f17b20) SHA1(711c46fcfd86ded8ff7da883188d70560d20e42f) )
+	ROM_LOAD16_BYTE( "cry.p6",  0x200001, 0x80000,  CRC(2b3d9a97) SHA1(7468fffd90d840d245a70475b42308f1e48c5017) )
+	ROM_LOAD16_BYTE( "cry.p7",  0x300000, 0x80000,  CRC(20f73433) SHA1(593b40ac17591ac312ad41b4d3a5772626137bba) )
+	ROM_LOAD16_BYTE( "cry.p8",  0x300001, 0x80000,  CRC(835da1f2) SHA1(f93e075916d370466832871410591570ad7b9f3b) )
+	ROM_LOAD16_BYTE( "cry.p9",  0x400000, 0x80000,  CRC(c0e442ee) SHA1(a3877b200538642fe2bc96cfe8b33f04d8a82a98) )
+	ROM_LOAD16_BYTE( "cry.p10", 0x400001, 0x80000,  CRC(500172fa) SHA1(d83a37612daa79ba8425fdb28f39b8324b5736b6) )
+ROM_END
+
+
+
+//The New Crystal Maze Featuring Ocean Zone
+ROM_START( v4cmaze2 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "cm2s.p1", 0x000000, 0x80000,  CRC(2bcdff56) SHA1(5ae4d4960db032ec9b8d66c53bc151830d009f61) )
+	ROM_LOAD16_BYTE( "cm2s.p2", 0x000001, 0x80000,  CRC(92126def) SHA1(531593dee05954000d9836018aeff9460aecbd26) )
+	ROM_LOAD16_BYTE( "cm2.p3",  0x100000, 0x80000,  CRC(88324715) SHA1(c6c8de4e5aeda14232ec7b026da389774b3c7bb1) )
+	ROM_LOAD16_BYTE( "cm2.p4",  0x100001, 0x80000,  CRC(8d54a81d) SHA1(37753cf8595647aaf8b8267ca177b6744de9c6d4) )
+	ROM_LOAD16_BYTE( "cm2.p5",  0x200000, 0x80000,  CRC(5cf8a2bf) SHA1(2514e78e82842fa5c85d26de35637269cd08b21d) )
+	ROM_LOAD16_BYTE( "cm2.p6",  0x200001, 0x80000,  CRC(cf793d2d) SHA1(579c759f57fb6bb87aa27c9d5fb684058913dedc) )
+	ROM_LOAD16_BYTE( "cm2.p7",  0x300000, 0x80000,  CRC(008aa4b0) SHA1(b4cec6d11abd0e111c295533700595398ff59075) )
+	ROM_LOAD16_BYTE( "cm2.p8",  0x300001, 0x80000,  CRC(bac04f5a) SHA1(130721b7abf28dea1f8162705c8bfc5a4bb78152) )
+ROM_END
+
+ROM_START( v4cmaze2d )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "cm2d.p1", 0x000000, 0x80000,  CRC(a150027b) SHA1(f737b0e3b8954c1589a929b7e567cb55df4a3997) )
+	ROM_LOAD16_BYTE( "cm2d.p2", 0x000001, 0x80000,  CRC(84ed6bce) SHA1(7a11473e7ec277508952f7ae6cfc7ed28e1b5c99) )
+	ROM_LOAD16_BYTE( "cm2.p3",  0x100000, 0x80000,  CRC(88324715) SHA1(c6c8de4e5aeda14232ec7b026da389774b3c7bb1) )
+	ROM_LOAD16_BYTE( "cm2.p4",  0x100001, 0x80000,  CRC(8d54a81d) SHA1(37753cf8595647aaf8b8267ca177b6744de9c6d4) )
+	ROM_LOAD16_BYTE( "cm2.p5",  0x200000, 0x80000,  CRC(5cf8a2bf) SHA1(2514e78e82842fa5c85d26de35637269cd08b21d) )
+	ROM_LOAD16_BYTE( "cm2.p6",  0x200001, 0x80000,  CRC(cf793d2d) SHA1(579c759f57fb6bb87aa27c9d5fb684058913dedc) )
+	ROM_LOAD16_BYTE( "cm2.p7",  0x300000, 0x80000,  CRC(008aa4b0) SHA1(b4cec6d11abd0e111c295533700595398ff59075) )
+	ROM_LOAD16_BYTE( "cm2.p8",  0x300001, 0x80000,  CRC(bac04f5a) SHA1(130721b7abf28dea1f8162705c8bfc5a4bb78152) )
+ROM_END
+
+ROM_START( v4cmaze2_amld )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "am2z.p1",  0x000000, 0x80000,  CRC(f27e02f0) SHA1(8637904c201ece4f08ad63b4fd6d06a860fa762f) )
+	ROM_LOAD16_BYTE( "am2z.p2",  0x000001, 0x80000,  CRC(4d24f482) SHA1(9e3687db9d0233e56999017f3ed59ec543bce303) )
+	ROM_LOAD16_BYTE( "am2g.p1",  0x100000, 0x80000,  CRC(115402db) SHA1(250f2eded1b88a1abf82febb009eadbb90936f8a) )
+	ROM_LOAD16_BYTE( "am2g.p2",  0x100001, 0x80000,  CRC(5d804fbb) SHA1(8dc02eb9329f9c29d4bcc9a0315ae96085625d3e) )
+	ROM_LOAD16_BYTE( "am2g.p3",  0x200000, 0x80000,  CRC(5ead0c06) SHA1(35d9aefc60e2c391e32f8119a6dc44434d91c09e) )
+	ROM_LOAD16_BYTE( "am2g.p4",  0x200001, 0x80000,  CRC(de4fb542) SHA1(4bf8f8f6850fd819d91827d3c474bd488e61e5ac) )
+	ROM_LOAD16_BYTE( "am2g.p5",  0x300000, 0x80000,  CRC(80b01ce2) SHA1(4a3a4bcff4bd9affd1a5eeca5781b6af05bbcc16) )
+	ROM_LOAD16_BYTE( "am2g.p6",  0x300001, 0x80000,  CRC(3e134ecc) SHA1(1f8cdce62e693eb07c4620b64cc467339c0563de) )
+	ROM_LOAD16_BYTE( "am2g.p7",  0x400000, 0x80000,  CRC(6eb36f1d) SHA1(08b9ec184d64bdbdfa61d3e991a3647e74a7756f) )
+	ROM_LOAD16_BYTE( "am2g.p8",  0x400001, 0x80000,  CRC(dda353ef) SHA1(56a5b43f0b0bd9dbf348946a5758ebe63eadb8cf) )
+ROM_END
+
+ROM_START( v4cmaze2b )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "cr220.p1", 0x000000, 0x80000,  CRC(0a6ebe65) SHA1(504648c97bc9de6c3e0c9c73eb2f356632e1c562) )
+	ROM_LOAD16_BYTE( "cr220.p2", 0x000001, 0x80000,  CRC(699ab8d4) SHA1(8a6516e515d111c29833f6a94845942d156cc54d) )
+	ROM_LOAD16_BYTE( "cm2.p3",  0x100000, 0x80000,  CRC(88324715) SHA1(c6c8de4e5aeda14232ec7b026da389774b3c7bb1) )
+	ROM_LOAD16_BYTE( "cm2.p4",  0x100001, 0x80000,  CRC(8d54a81d) SHA1(37753cf8595647aaf8b8267ca177b6744de9c6d4) )
+	ROM_LOAD16_BYTE( "cm2.p5",  0x200000, 0x80000,  CRC(5cf8a2bf) SHA1(2514e78e82842fa5c85d26de35637269cd08b21d) )
+	ROM_LOAD16_BYTE( "cm2.p6",  0x200001, 0x80000,  CRC(cf793d2d) SHA1(579c759f57fb6bb87aa27c9d5fb684058913dedc) )
+	ROM_LOAD16_BYTE( "cm2.p7",  0x300000, 0x80000,  CRC(008aa4b0) SHA1(b4cec6d11abd0e111c295533700595398ff59075) )
+	ROM_LOAD16_BYTE( "cm2.p8",  0x300001, 0x80000,  CRC(bac04f5a) SHA1(130721b7abf28dea1f8162705c8bfc5a4bb78152) )
+ROM_END
+
+ROM_START( v4cmaze2c )//Should be a set, but PROM 2 checksum error?
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "cm2_7.p1", 0x000000, 0x80000,  CRC(d455d5fe) SHA1(20186a5fff458d3eba15ccb564addc0b064736e0) )
+	ROM_LOAD16_BYTE( "cm2_7.p2", 0x000001, 0x80000, BAD_DUMP CRC(55fef843) SHA1(ccc187c0137af54bad8b72181a544d5b78004ed8) )
+	ROM_LOAD16_BYTE( "cm2.p3",  0x100000, 0x80000,  CRC(88324715) SHA1(c6c8de4e5aeda14232ec7b026da389774b3c7bb1) )
+	ROM_LOAD16_BYTE( "cm2.p4",  0x100001, 0x80000,  CRC(8d54a81d) SHA1(37753cf8595647aaf8b8267ca177b6744de9c6d4) )
+	ROM_LOAD16_BYTE( "cm2.p5",  0x200000, 0x80000,  CRC(5cf8a2bf) SHA1(2514e78e82842fa5c85d26de35637269cd08b21d) )
+	ROM_LOAD16_BYTE( "cm2.p6",  0x200001, 0x80000,  CRC(cf793d2d) SHA1(579c759f57fb6bb87aa27c9d5fb684058913dedc) )
+	ROM_LOAD16_BYTE( "cm2.p7",  0x300000, 0x80000,  CRC(008aa4b0) SHA1(b4cec6d11abd0e111c295533700595398ff59075) )
+	ROM_LOAD16_BYTE( "cm2.p8",  0x300001, 0x80000,  CRC(bac04f5a) SHA1(130721b7abf28dea1f8162705c8bfc5a4bb78152) )
+ROM_END
+
+
+
+//The Crystal Maze Team Challenge
+ROM_START( v4cmaze3 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "cm3.p1",  0x000000, 0x80000,  CRC(2d2edee5) SHA1(0281ec97aaaaf4c7969340bd5995ac1541dbad54) )
+	ROM_LOAD16_BYTE( "cm3.p2",  0x000001, 0x80000,  CRC(c223d7b9) SHA1(da9d730716a30d0e93f2a02c1efa7f19457ae010) )
+	ROM_LOAD16_BYTE( "cm3.p3",  0x100000, 0x80000,  CRC(2959c77b) SHA1(8de533bfad48ad19a635dddcafa2a0825133b4de) )
+	ROM_LOAD16_BYTE( "cm3.p4",  0x100001, 0x80000,  CRC(b7873e9a) SHA1(a71fac883e02d5f49aee0a20f92dbdb00640ce8d) )
+	ROM_LOAD16_BYTE( "cm3.p5",  0x200000, 0x80000,  CRC(c8375070) SHA1(da2ba6591d8765f896c40d6526da8e945d02a182) )
+	ROM_LOAD16_BYTE( "cm3.p6",  0x200001, 0x80000,  CRC(1ea36938) SHA1(43f62935b21232d23f662e1e124663267edb1283) )
+	ROM_LOAD16_BYTE( "cm3.p7",  0x300000, 0x80000,  CRC(9de3802e) SHA1(ec792f115a0708d68046ba0beb314b7e1f1eb422) )
+	ROM_LOAD16_BYTE( "cm3.p8",  0x300001, 0x80000,  CRC(1e6e60b0) SHA1(5e71714747073dd89852a84585642388ee440325) )
+	ROM_LOAD16_BYTE( "cm3.p9",  0x400000, 0x80000,  CRC(bfba55a7) SHA1(22eb9b1f9fe83d3b424fd521b68e2976a1940df9) )
+	ROM_LOAD16_BYTE( "cm3.p10",  0x400001, 0x80000,  CRC(07edda81) SHA1(e94525be03f30e407051992925bb0d693f3d809b) )
+ROM_END
+
+ROM_START( v4cmaze3d )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "cm3d.p1",  0x000000, 0x80000,  CRC(245f00fa) SHA1(ff5ae1a2ae024dfc0b4104360626e4106f4cd36f) )
+	ROM_LOAD16_BYTE( "cm3d.p2",  0x000001, 0x80000,  CRC(091adbcb) SHA1(1466b036d06f6335c90426095ad0f60ea958a29d) )
+	ROM_LOAD16_BYTE( "cm3.p3",  0x100000, 0x80000,  CRC(2959c77b) SHA1(8de533bfad48ad19a635dddcafa2a0825133b4de) )
+	ROM_LOAD16_BYTE( "cm3.p4",  0x100001, 0x80000,  CRC(b7873e9a) SHA1(a71fac883e02d5f49aee0a20f92dbdb00640ce8d) )
+	ROM_LOAD16_BYTE( "cm3.p5",  0x200000, 0x80000,  CRC(c8375070) SHA1(da2ba6591d8765f896c40d6526da8e945d02a182) )
+	ROM_LOAD16_BYTE( "cm3.p6",  0x200001, 0x80000,  CRC(1ea36938) SHA1(43f62935b21232d23f662e1e124663267edb1283) )
+	ROM_LOAD16_BYTE( "cm3.p7",  0x300000, 0x80000,  CRC(9de3802e) SHA1(ec792f115a0708d68046ba0beb314b7e1f1eb422) )
+	ROM_LOAD16_BYTE( "cm3.p8",  0x300001, 0x80000,  CRC(1e6e60b0) SHA1(5e71714747073dd89852a84585642388ee440325) )
+	ROM_LOAD16_BYTE( "cm3.p9",  0x400000, 0x80000,  CRC(bfba55a7) SHA1(22eb9b1f9fe83d3b424fd521b68e2976a1940df9) )
+	ROM_LOAD16_BYTE( "cm3.p10",  0x400001, 0x80000,  CRC(07edda81) SHA1(e94525be03f30e407051992925bb0d693f3d809b) )
+ROM_END
+
+ROM_START( v4cmaze3_amld )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "am3z.p1",  0x000000, 0x80000,  CRC(9484e656) SHA1(3c35a8ebeddea56d73ce8db4e93c51cdd9546d59) )
+	ROM_LOAD16_BYTE( "am3z.p2",  0x000001, 0x80000,  CRC(1865ee80) SHA1(b3ff8e1631d811b8e88664dd84ae82231ce1f5aa) )
+	ROM_LOAD16_BYTE( "am3g.p1",  0x100000, 0x80000,  CRC(49fe36af) SHA1(7c39223b07f53ff57a56c3817299734491372170) )
+	ROM_LOAD16_BYTE( "am3g.p2",  0x100001, 0x80000,  CRC(b8823cbd) SHA1(206d3b1b2daff1979f97841041661f8407c35d4d) )
+	ROM_LOAD16_BYTE( "am3g.p3",  0x200000, 0x80000,  CRC(b1870f17) SHA1(54c6cabb56e4daa4ccf801d5e44b2789b116d562) )
+	ROM_LOAD16_BYTE( "am3g.p4",  0x200001, 0x80000,  CRC(c015d446) SHA1(669007e841afeb1084d9062d0a47c159e4c83cc9) )
+	ROM_LOAD16_BYTE( "am3g.p5",  0x300000, 0x80000,  CRC(9de3802e) SHA1(ec792f115a0708d68046ba0beb314b7e1f1eb422) )
+	ROM_LOAD16_BYTE( "am3g.p6",  0x300001, 0x80000,  CRC(1e6e60b0) SHA1(5e71714747073dd89852a84585642388ee440325) )
+	ROM_LOAD16_BYTE( "am3g.p7",  0x400000, 0x80000,  CRC(a4611e29) SHA1(91b164eea5dbdd1129ad12d7af2dbdb3cd68bcec) )
+	ROM_LOAD16_BYTE( "am3g.p8",  0x400001, 0x80000,  CRC(1a10c22e) SHA1(8533a5db3922b80b6e9f74e4e432a2b64bc24fc0) )
+ROM_END
+
+ROM_START( v4cmaze3b )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "cm30_8.p1", 0x000000, 0x80000,CRC(fde7333e) SHA1(a94d7b88972af599418b9893124457a11c125fcc) )
+	ROM_LOAD16_BYTE( "cm30_8.p2", 0x000001, 0x80000,CRC(35ff7e31) SHA1(52fe305c63cde70de550230bad03d85b53f8e227) )
+	ROM_LOAD16_BYTE( "cm3.p3",  0x100000, 0x80000,  CRC(2959c77b) SHA1(8de533bfad48ad19a635dddcafa2a0825133b4de) )
+	ROM_LOAD16_BYTE( "cm3.p4",  0x100001, 0x80000,  CRC(b7873e9a) SHA1(a71fac883e02d5f49aee0a20f92dbdb00640ce8d) )
+	ROM_LOAD16_BYTE( "cm3.p5",  0x200000, 0x80000,  CRC(c8375070) SHA1(da2ba6591d8765f896c40d6526da8e945d02a182) )
+	ROM_LOAD16_BYTE( "cm3.p6",  0x200001, 0x80000,  CRC(1ea36938) SHA1(43f62935b21232d23f662e1e124663267edb1283) )
+	ROM_LOAD16_BYTE( "cm3.p7",  0x300000, 0x80000,  CRC(9de3802e) SHA1(ec792f115a0708d68046ba0beb314b7e1f1eb422) )
+	ROM_LOAD16_BYTE( "cm3.p8",  0x300001, 0x80000,  CRC(1e6e60b0) SHA1(5e71714747073dd89852a84585642388ee440325) )
+	ROM_LOAD16_BYTE( "cm3.p9",  0x400000, 0x80000,  CRC(bfba55a7) SHA1(22eb9b1f9fe83d3b424fd521b68e2976a1940df9) )
+	ROM_LOAD16_BYTE( "cm3.p10", 0x400001, 0x80000,  CRC(07edda81) SHA1(e94525be03f30e407051992925bb0d693f3d809b) )
+ROM_END
+
+ROM_START( v4cmaze3c )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "cm30_6.p1",  0x000000, 0x80000,  CRC(68aa610a) SHA1(d57071a960402b12a13ac3af602cedade03989f8) )
+	ROM_LOAD16_BYTE( "cm30_6.p2",  0x000001, 0x80000,  NO_DUMP )
+	ROM_LOAD16_BYTE( "cm3.p3",  0x100000, 0x80000,  CRC(2959c77b) SHA1(8de533bfad48ad19a635dddcafa2a0825133b4de) )
+	ROM_LOAD16_BYTE( "cm3.p4",  0x100001, 0x80000,  CRC(b7873e9a) SHA1(a71fac883e02d5f49aee0a20f92dbdb00640ce8d) )
+	ROM_LOAD16_BYTE( "cm3.p5",  0x200000, 0x80000,  CRC(c8375070) SHA1(da2ba6591d8765f896c40d6526da8e945d02a182) )
+	ROM_LOAD16_BYTE( "cm3.p6",  0x200001, 0x80000,  CRC(1ea36938) SHA1(43f62935b21232d23f662e1e124663267edb1283) )
+	ROM_LOAD16_BYTE( "cm3.p7",  0x300000, 0x80000,  CRC(9de3802e) SHA1(ec792f115a0708d68046ba0beb314b7e1f1eb422) )
+	ROM_LOAD16_BYTE( "cm3.p8",  0x300001, 0x80000,  CRC(1e6e60b0) SHA1(5e71714747073dd89852a84585642388ee440325) )
+	ROM_LOAD16_BYTE( "cm3.p9",  0x400000, 0x80000,  CRC(bfba55a7) SHA1(22eb9b1f9fe83d3b424fd521b68e2976a1940df9) )
+	ROM_LOAD16_BYTE( "cm3.p10",  0x400001, 0x80000,  CRC(07edda81) SHA1(e94525be03f30e407051992925bb0d693f3d809b) )
+ROM_END
+
+
+ROM_START( v4turnov )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "tos.p1",  0x000000, 0x010000,  CRC(4044dbeb) SHA1(3aa553055c56f14564b1e33e1c1975337e639f70) )
+	ROM_LOAD16_BYTE( "to.p2",   0x000001, 0x010000,  CRC(4bc4659a) SHA1(0e282134c4fe4e8c1cc7b16957903179e23c7abc) )
+	ROM_LOAD16_BYTE( "to.p3",   0x020000, 0x010000,  CRC(273c7c14) SHA1(71feb555a05a0ff1ec674505cab72d93c9fbdf65) )
+	ROM_LOAD16_BYTE( "to.p4",   0x020001, 0x010000,  CRC(83d29546) SHA1(cef90455b9d8a92424fe1aa10f20fd075d0e3091) )
+	ROM_LOAD16_BYTE( "to.p5",   0x040000, 0x010000,  CRC(dceac511) SHA1(7a6d65464e23d832943f771c4cf580aabc6f0e44) )
+	ROM_LOAD16_BYTE( "to.p6",   0x040001, 0x010000,  CRC(54c6afb7) SHA1(b724b87b6f4e47d220310b38c97be2fa73dcd617) )
+	ROM_LOAD16_BYTE( "to.p7",   0x060000, 0x010000,  CRC(acf19542) SHA1(ad46ffb3c2c078a8e3712eff27aa61f0d1a7c059) )
+	ROM_LOAD16_BYTE( "to.p8",   0x060001, 0x010000,  CRC(a5ca385d) SHA1(8df26a33ea7f5b577761c6f9d2fa4eaed74661f8) )
+	ROM_LOAD16_BYTE( "to.p9",   0x080000, 0x010000,  CRC(6e85fde3) SHA1(14868d58829e13987e66f52e1899c4385987a87b) ) // ISSUE1 Q1
+	ROM_LOAD16_BYTE( "to.p10",  0x080001, 0x010000,  CRC(fadd11a2) SHA1(2b2fbb0769ef6035688d495464f3ea3bc8c7c660) ) // ISSUE1 Q2
+	ROM_LOAD16_BYTE( "to.p11",  0x0a0000, 0x010000,  CRC(2d72a61a) SHA1(ce455ab6fea452f96a3ad365178e0e5a0b437867) ) // ISSUE1 Q3
+	ROM_LOAD16_BYTE( "to.p12",  0x0a0001, 0x010000,  CRC(a14eedb6) SHA1(219b887a334ff28a88ed2e50f0caff4b510cd549) ) // ISSUE1 Q4
+	ROM_LOAD16_BYTE( "to.p13",  0x0c0000, 0x010000,  CRC(3f66ef6b) SHA1(60be6d3f8da1f3084db15ac1bb2470e55c0271de) ) // ISSUE1 Q5
+	ROM_LOAD16_BYTE( "to.p14",  0x0c0001, 0x010000,  CRC(127ba65d) SHA1(e34dcd19efd31dc712daac940277bb17694ea61a) ) // ISSUE1 Q6
+	ROM_LOAD16_BYTE( "to.p15",  0x0e0000, 0x010000,  CRC(ad787e31) SHA1(314ba312adfc71e4b3b2d52355ec692c192b74eb) ) // ISSUE1 Q7
+	ROM_LOAD16_BYTE( "to.p16",  0x0e0001, 0x010000,  CRC(e635c942) SHA1(08f8b5fdb738647bc0b49938da05533be42a2d60) ) // ISSUE1 Q8
+ROM_END
+
+ROM_START( v4turnova )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "to3.p1",  0x000000, 0x010000, CRC(09751994) SHA1(72d4aa40f14411ef8064822de3f5a13bcc84aea3) )
+	ROM_LOAD16_BYTE( "to.p2",   0x000001, 0x010000,  CRC(4bc4659a) SHA1(0e282134c4fe4e8c1cc7b16957903179e23c7abc) )
+	ROM_LOAD16_BYTE( "to.p3",   0x020000, 0x010000,  CRC(273c7c14) SHA1(71feb555a05a0ff1ec674505cab72d93c9fbdf65) )
+	ROM_LOAD16_BYTE( "to.p4",   0x020001, 0x010000,  CRC(83d29546) SHA1(cef90455b9d8a92424fe1aa10f20fd075d0e3091) )
+	ROM_LOAD16_BYTE( "to.p5",   0x040000, 0x010000,  CRC(dceac511) SHA1(7a6d65464e23d832943f771c4cf580aabc6f0e44) )
+	ROM_LOAD16_BYTE( "to.p6",   0x040001, 0x010000,  CRC(54c6afb7) SHA1(b724b87b6f4e47d220310b38c97be2fa73dcd617) )
+	ROM_LOAD16_BYTE( "to.p7",   0x060000, 0x010000,  CRC(acf19542) SHA1(ad46ffb3c2c078a8e3712eff27aa61f0d1a7c059) )
+	ROM_LOAD16_BYTE( "to.p8",   0x060001, 0x010000,  CRC(a5ca385d) SHA1(8df26a33ea7f5b577761c6f9d2fa4eaed74661f8) )
+	ROM_LOAD16_BYTE( "to.p9",   0x080000, 0x010000,  CRC(6e85fde3) SHA1(14868d58829e13987e66f52e1899c4385987a87b) ) // ISSUE1 Q1
+	ROM_LOAD16_BYTE( "to.p10",  0x080001, 0x010000,  CRC(fadd11a2) SHA1(2b2fbb0769ef6035688d495464f3ea3bc8c7c660) ) // ISSUE1 Q2
+	ROM_LOAD16_BYTE( "to.p11",  0x0a0000, 0x010000,  CRC(2d72a61a) SHA1(ce455ab6fea452f96a3ad365178e0e5a0b437867) ) // ISSUE1 Q3
+	ROM_LOAD16_BYTE( "to.p12",  0x0a0001, 0x010000,  CRC(a14eedb6) SHA1(219b887a334ff28a88ed2e50f0caff4b510cd549) ) // ISSUE1 Q4
+	ROM_LOAD16_BYTE( "to.p13",  0x0c0000, 0x010000,  CRC(3f66ef6b) SHA1(60be6d3f8da1f3084db15ac1bb2470e55c0271de) ) // ISSUE1 Q5
+	ROM_LOAD16_BYTE( "to.p14",  0x0c0001, 0x010000,  CRC(127ba65d) SHA1(e34dcd19efd31dc712daac940277bb17694ea61a) ) // ISSUE1 Q6
+	ROM_LOAD16_BYTE( "to.p15",  0x0e0000, 0x010000,  CRC(ad787e31) SHA1(314ba312adfc71e4b3b2d52355ec692c192b74eb) ) // ISSUE1 Q7
+	ROM_LOAD16_BYTE( "to.p16",  0x0e0001, 0x010000,  CRC(e635c942) SHA1(08f8b5fdb738647bc0b49938da05533be42a2d60) ) // ISSUE1 Q8
+ROM_END
+
+// this ROM just seems to be a corrupt version of existing ones, bad vector table
+//  ROM_LOAD16_BYTE( "todo.p1", 0x000000, 0x010000, CRC(9111e702) SHA1(fa408e1c8fa56a96ffc3422335f105ef328a6edd) )
+
+ROM_START( v4turnovc )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "too.p1",  0x000000, 0x010000,  CRC(919b5207) SHA1(770be6e3b00e666c6f939167d35d43bb2d793e14) )
+	ROM_LOAD16_BYTE( "to.p2",   0x000001, 0x010000,  CRC(4bc4659a) SHA1(0e282134c4fe4e8c1cc7b16957903179e23c7abc) )
+	ROM_LOAD16_BYTE( "to.p3",   0x020000, 0x010000,  CRC(273c7c14) SHA1(71feb555a05a0ff1ec674505cab72d93c9fbdf65) )
+	ROM_LOAD16_BYTE( "to.p4",   0x020001, 0x010000,  CRC(83d29546) SHA1(cef90455b9d8a92424fe1aa10f20fd075d0e3091) )
+	ROM_LOAD16_BYTE( "to.p5",   0x040000, 0x010000,  CRC(dceac511) SHA1(7a6d65464e23d832943f771c4cf580aabc6f0e44) )
+	ROM_LOAD16_BYTE( "to.p6",   0x040001, 0x010000,  CRC(54c6afb7) SHA1(b724b87b6f4e47d220310b38c97be2fa73dcd617) )
+	ROM_LOAD16_BYTE( "to.p7",   0x060000, 0x010000,  CRC(acf19542) SHA1(ad46ffb3c2c078a8e3712eff27aa61f0d1a7c059) )
+	ROM_LOAD16_BYTE( "to.p8",   0x060001, 0x010000,  CRC(a5ca385d) SHA1(8df26a33ea7f5b577761c6f9d2fa4eaed74661f8) )
+	ROM_LOAD16_BYTE( "to.p9",   0x080000, 0x010000,  CRC(6e85fde3) SHA1(14868d58829e13987e66f52e1899c4385987a87b) ) // ISSUE1 Q1
+	ROM_LOAD16_BYTE( "to.p10",  0x080001, 0x010000,  CRC(fadd11a2) SHA1(2b2fbb0769ef6035688d495464f3ea3bc8c7c660) ) // ISSUE1 Q2
+	ROM_LOAD16_BYTE( "to.p11",  0x0a0000, 0x010000,  CRC(2d72a61a) SHA1(ce455ab6fea452f96a3ad365178e0e5a0b437867) ) // ISSUE1 Q3
+	ROM_LOAD16_BYTE( "to.p12",  0x0a0001, 0x010000,  CRC(a14eedb6) SHA1(219b887a334ff28a88ed2e50f0caff4b510cd549) ) // ISSUE1 Q4
+	ROM_LOAD16_BYTE( "to.p13",  0x0c0000, 0x010000,  CRC(3f66ef6b) SHA1(60be6d3f8da1f3084db15ac1bb2470e55c0271de) ) // ISSUE1 Q5
+	ROM_LOAD16_BYTE( "to.p14",  0x0c0001, 0x010000,  CRC(127ba65d) SHA1(e34dcd19efd31dc712daac940277bb17694ea61a) ) // ISSUE1 Q6
+	ROM_LOAD16_BYTE( "to.p15",  0x0e0000, 0x010000,  CRC(ad787e31) SHA1(314ba312adfc71e4b3b2d52355ec692c192b74eb) ) // ISSUE1 Q7
+	ROM_LOAD16_BYTE( "to.p16",  0x0e0001, 0x010000,  CRC(e635c942) SHA1(08f8b5fdb738647bc0b49938da05533be42a2d60) ) // ISSUE1 Q8
+ROM_END
+
+ROM_START( v4turnovd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "tov2.2p1",0x000000, 0x010000, CRC(460a5dd0) SHA1(42bc54b0ca206606b980dd80ccf0cbfb3210769d) )
+	ROM_LOAD16_BYTE( "tov2.2p2",0x000000, 0x010000, NO_DUMP )
+	// + unkonwn additional ROMs
+ROM_END
+
+
+
+ROM_START( v4skltrk )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st.p1",  0x000000, 0x010000,  CRC(d9de47a5) SHA1(625bf40780203293fc34cd8cea8278b4b4a52a75) )
+	ROM_LOAD16_BYTE( "st.p2",  0x000001, 0x010000,  CRC(b62575c2) SHA1(06d75e8a364750663d329650720021279e195236) )
+	ROM_LOAD16_BYTE( "st.p3",  0x020000, 0x010000,  CRC(9506da76) SHA1(6ef28ab8ec1af455be8ecfab20243f0823dca7c1) )
+	ROM_LOAD16_BYTE( "st.p4",  0x020001, 0x010000,  CRC(6ab447bc) SHA1(d01c209dbf4d19a6a7f878fa54ff1cb51e7dcba5) )
+	ROM_LOAD16_BYTE( "st.q1",  0x040000, 0x010000,  CRC(4faca475) SHA1(69b498c543600b8e37ab0ed1863ba57845648f3c) ) // ISSUE1 Q1
+	ROM_LOAD16_BYTE( "st.q2",  0x040001, 0x010000,  CRC(9f2c5938) SHA1(85527c4c0b7a1e66576d56607d89750fab082580) ) // ISSUE1 Q2
+	ROM_LOAD16_BYTE( "st.q3",  0x060000, 0x010000,  CRC(6b6cb194) SHA1(aeac5dcc0827c17e758e3e821ae8a78a3a16ddce) ) // ISSUE1 Q3
+	ROM_LOAD16_BYTE( "st.q4",  0x060001, 0x010000,  CRC(ec57bc17) SHA1(d9f522739dbb190fb941ca654299bbedbb8fb703) ) // ISSUE1 Q4
+	ROM_LOAD16_BYTE( "st.q5",  0x080000, 0x010000,  CRC(7740a88b) SHA1(d9a683d3e0d6c1b4b59520f90f825124b7a61168) ) // ISSUE1 Q5
+	ROM_LOAD16_BYTE( "st.q6",  0x080001, 0x010000,  CRC(95e97796) SHA1(f1a8de0ad02aca31f79a4fe8ba5044546163e3c4) ) // ISSUE1 Q6
+	ROM_LOAD16_BYTE( "st.q7",  0x0a0000, 0x010000,  CRC(f3b8fe7f) SHA1(52d5be3f8cab419103f4727d0fb9d30f34c8f651) ) // ISSUE1 Q7
+	ROM_LOAD16_BYTE( "st.q8",  0x0a0001, 0x010000,  CRC(b85e75a2) SHA1(b7b03b090c0ec6d92e9a25abb7fec0507356bdfc) ) // ISSUE1 Q8
+	ROM_LOAD16_BYTE( "st.q9",  0x0c0000, 0x010000,  CRC(835f6001) SHA1(2cd9084c102d74bcb578c8ea22bbc9ea58f0ceab) ) // ISSUE1 Q9
+	ROM_LOAD16_BYTE( "st.qa",  0x0c0001, 0x010000,  CRC(3fc62a0e) SHA1(0628de4b962d3fcca3757cd4e89b3005c9bfd218) ) // ISSUE1 Q10
+ROM_END
+
+ROM_START( v4skltrka )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "sws.p1",0x000000, 0x010000, CRC(a96f11ea) SHA1(5e5c548e96674f8f98c1c4eb0a590979371f6f10) )
+	ROM_LOAD16_BYTE( "sw.p2", 0x000001, 0x010000, CRC(2598ba38) SHA1(30509bd2f987949bb423600e13a464edaa7f9ce5) )
+	ROM_LOAD16_BYTE( "sw.p3", 0x020000, 0x010000, CRC(1290cef3) SHA1(5cf63940c164becf64902846aa4fd5bc628f9ebe) )
+	ROM_LOAD16_BYTE( "sw.p4", 0x020001, 0x010000, CRC(176f23c3) SHA1(e64460818329f23e449f65781e3dc56d3a1710a3) )
+	ROM_LOAD16_BYTE( "st.q1",  0x040000, 0x010000,  CRC(4faca475) SHA1(69b498c543600b8e37ab0ed1863ba57845648f3c) )
+	ROM_LOAD16_BYTE( "st.q2",  0x040001, 0x010000,  CRC(9f2c5938) SHA1(85527c4c0b7a1e66576d56607d89750fab082580) )
+	ROM_LOAD16_BYTE( "st.q3",  0x060000, 0x010000,  CRC(6b6cb194) SHA1(aeac5dcc0827c17e758e3e821ae8a78a3a16ddce) )
+	ROM_LOAD16_BYTE( "st.q4",  0x060001, 0x010000,  CRC(ec57bc17) SHA1(d9f522739dbb190fb941ca654299bbedbb8fb703) )
+	ROM_LOAD16_BYTE( "st.q5",  0x080000, 0x010000,  CRC(7740a88b) SHA1(d9a683d3e0d6c1b4b59520f90f825124b7a61168) )
+	ROM_LOAD16_BYTE( "st.q6",  0x080001, 0x010000,  CRC(95e97796) SHA1(f1a8de0ad02aca31f79a4fe8ba5044546163e3c4) )
+	ROM_LOAD16_BYTE( "st.q7",  0x0a0000, 0x010000,  CRC(f3b8fe7f) SHA1(52d5be3f8cab419103f4727d0fb9d30f34c8f651) )
+	ROM_LOAD16_BYTE( "st.q8",  0x0a0001, 0x010000,  CRC(b85e75a2) SHA1(b7b03b090c0ec6d92e9a25abb7fec0507356bdfc) )
+	ROM_LOAD16_BYTE( "st.q9",  0x0c0000, 0x010000,  CRC(835f6001) SHA1(2cd9084c102d74bcb578c8ea22bbc9ea58f0ceab) )
+	ROM_LOAD16_BYTE( "st.qa",  0x0c0001, 0x010000,  CRC(3fc62a0e) SHA1(0628de4b962d3fcca3757cd4e89b3005c9bfd218) )
+ROM_END
+
+
+ROM_START( v4sklcsh )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "scs.p1", 0x000000, 0x010000, CRC(3181524e) SHA1(e801a036b9d509d8e2e5f7c9c6ccd9d9ddf76b2f) )
+	ROM_LOAD16_BYTE( "scs.p2", 0x000001, 0x010000, CRC(a7596804) SHA1(f27fc3ee7a17904ea08baa421e14d02226428c42) )
+	ROM_LOAD16_BYTE( "scs.p3", 0x020000, 0x010000, CRC(b3ded2bc) SHA1(39cb15fde4aea1187668120d548bfe022835b600) )
+	ROM_LOAD16_BYTE( "scs.p4", 0x020001, 0x010000, CRC(2ce2e9d1) SHA1(c492fea2e179796a360131c19a9cba5bbfe3c7fd) )
+
+	/* missing questions */
+ROM_END
+
+
+
+
+ROM_START( v4tmach )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "tm20.p1",  0x000000, 0x010000,  CRC(6919697c) SHA1(786d7b9ab218dbf54ff839d1f83580c409c725b3) )
+	ROM_LOAD16_BYTE( "tm20.p2",  0x000001, 0x010000,  CRC(d13b56e4) SHA1(623e73995da93c07b51ce0a5843dba1f853529dd) )
+	ROM_LOAD16_BYTE( "tm20.p3",  0x020000, 0x010000,  CRC(efd3ae64) SHA1(9d2a3b65048e04842205751c6921d2550f38bd52) )
+	ROM_LOAD16_BYTE( "tm20.p4",  0x020001, 0x010000,  CRC(602ba3fb) SHA1(7243f58df9a26adfd1a149a1e60630b187787dd0) )
+	// questions can go in any slot, game detects what is installed
+	ROM_LOAD16_BYTE( "issue3_q16" , 0x040000, 0x010000,  CRC(ce2bf15e) SHA1(29c7f2e718bce415b0b8dc6d902bf74dad6b1ef4) ) // ISSUE3 Q16
+	ROM_LOAD16_BYTE( "issue3_q17",  0x040001, 0x010000,  CRC(5cab773e) SHA1(59a235c51a975b341bdbb88e909729507408f75b) ) // ISSUE3 Q17
+	ROM_LOAD16_BYTE( "issue3_q18",  0x060000, 0x010000,  CRC(27de90b3) SHA1(625c98e555f7b627ea96653926b8917996a2fdb7) ) // ISSUE3 Q18
+	ROM_LOAD16_BYTE( "issue3_q19",  0x060001, 0x010000,  CRC(083f6c65) SHA1(291ad39ee5f8eba9da293d9206b1f6a6d852f9bd) ) // ISSUE3 Q19
+	ROM_LOAD16_BYTE( "issue3_q20",  0x080000, 0x010000,  CRC(73747644) SHA1(ae252fc95c069a3c82e155220fbfcb74dd43bf89) ) // ISSUE3 Q20
+ROM_END
+
+ROM_START( v4tmachd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "tmd.p1",   0x000000, 0x010000,  CRC(e21045e0) SHA1(c4d0e80970ec8558db777a882edc5a0c80767375) )
+	ROM_LOAD16_BYTE( "tm20.p2",  0x000001, 0x010000,  CRC(d13b56e4) SHA1(623e73995da93c07b51ce0a5843dba1f853529dd) )
+	ROM_LOAD16_BYTE( "tm20.p3",  0x020000, 0x010000,  CRC(efd3ae64) SHA1(9d2a3b65048e04842205751c6921d2550f38bd52) )
+	ROM_LOAD16_BYTE( "tm20.p4",  0x020001, 0x010000,  CRC(602ba3fb) SHA1(7243f58df9a26adfd1a149a1e60630b187787dd0) )
+	// questions can go in any slot, game detects what is installed
+	ROM_LOAD16_BYTE( "issue3_q16" , 0x040000, 0x010000,  CRC(ce2bf15e) SHA1(29c7f2e718bce415b0b8dc6d902bf74dad6b1ef4) ) // ISSUE3 Q16
+	ROM_LOAD16_BYTE( "issue3_q17",  0x040001, 0x010000,  CRC(5cab773e) SHA1(59a235c51a975b341bdbb88e909729507408f75b) ) // ISSUE3 Q17
+	ROM_LOAD16_BYTE( "issue3_q18",  0x060000, 0x010000,  CRC(27de90b3) SHA1(625c98e555f7b627ea96653926b8917996a2fdb7) ) // ISSUE3 Q18
+	ROM_LOAD16_BYTE( "issue3_q19",  0x060001, 0x010000,  CRC(083f6c65) SHA1(291ad39ee5f8eba9da293d9206b1f6a6d852f9bd) ) // ISSUE3 Q19
+	ROM_LOAD16_BYTE( "issue3_q20",  0x080000, 0x010000,  CRC(73747644) SHA1(ae252fc95c069a3c82e155220fbfcb74dd43bf89) ) // ISSUE3 Q20
+ROM_END
+
+
+ROM_START( v4tmach1 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "tm20.p1",  0x000000, 0x010000,  CRC(6919697c) SHA1(786d7b9ab218dbf54ff839d1f83580c409c725b3) )
+	ROM_LOAD16_BYTE( "tm20.p2",  0x000001, 0x010000,  CRC(d13b56e4) SHA1(623e73995da93c07b51ce0a5843dba1f853529dd) )
+	ROM_LOAD16_BYTE( "tm20.p3",  0x020000, 0x010000,  CRC(efd3ae64) SHA1(9d2a3b65048e04842205751c6921d2550f38bd52) )
+	ROM_LOAD16_BYTE( "tm20.p4",  0x020001, 0x010000,  CRC(602ba3fb) SHA1(7243f58df9a26adfd1a149a1e60630b187787dd0) )
+	// questions can go in any slot, game detects what is installed
+	ROM_LOAD16_BYTE( "issue1_q1", 0x040000, 0x010000, CRC(6af4d58b) SHA1(ee547dad30cd9940f0b017caac97aeb046604f22) ) // ISSUE1 Q1
+	ROM_LOAD16_BYTE( "issue1_q2", 0x040001, 0x010000, CRC(b01b7687) SHA1(99db448d7e40c2ec16afef3c10abc8a9493f2ab4) ) // ISSUE1 Q2
+	ROM_LOAD16_BYTE( "issue1_q3", 0x060000, 0x010000, CRC(e97f14eb) SHA1(9163d11e1bc5a13d5002a13bc18b65a91e1738c7) ) // ISSUE1 Q3
+	ROM_LOAD16_BYTE( "issue1_q4", 0x060001, 0x010000, CRC(6134d918) SHA1(e4b4d6b08d94729d4dcca474d4c7bdcb267530a8) ) // ISSUE1 Q4
+	ROM_LOAD16_BYTE( "issue1_q5", 0x080000, 0x010000, CRC(6c07814b) SHA1(a97feada5cfa1bb059837b292637fbad9c7137ac) ) // ISSUE1 Q5
+	ROM_LOAD16_BYTE( "issue1_q6", 0x080001, 0x010000, CRC(5f16a536) SHA1(3435282bfb940604fb44e06dc4748e668768f286) ) // ISSUE1 Q6
+	ROM_LOAD16_BYTE( "issue1_q7", 0x0a0000, 0x010000, CRC(9afdce0b) SHA1(a969038d9ce2a2cff1e1a75959c05a3f03f08235) ) // ISSUE1 Q7
+	ROM_LOAD16_BYTE( "issue1_q8", 0x0a0001, 0x010000, CRC(f1878251) SHA1(b6a8527112bcdf21b9a0acab4d8fa507a96aaba7) ) // ISSUE1 Q8
+	ROM_LOAD16_BYTE( "issue1_q9", 0x0c0000, 0x010000, CRC(ace01faa) SHA1(79d6247a74e1bce0d76ea3788d0022d9e50173c4) ) // ISSUE1 Q9
+	ROM_LOAD16_BYTE( "issue1_q10",0x0c0001, 0x010000, CRC(021f4523) SHA1(10884665f5700c147c7035d0c98f3889917ff015) ) // ISSUE1 Q10
+ROM_END
+
+ROM_START( v4tmach1d )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "tmd.p1",   0x000000, 0x010000,  CRC(e21045e0) SHA1(c4d0e80970ec8558db777a882edc5a0c80767375) )
+	ROM_LOAD16_BYTE( "tm20.p2",  0x000001, 0x010000,  CRC(d13b56e4) SHA1(623e73995da93c07b51ce0a5843dba1f853529dd) )
+	ROM_LOAD16_BYTE( "tm20.p3",  0x020000, 0x010000,  CRC(efd3ae64) SHA1(9d2a3b65048e04842205751c6921d2550f38bd52) )
+	ROM_LOAD16_BYTE( "tm20.p4",  0x020001, 0x010000,  CRC(602ba3fb) SHA1(7243f58df9a26adfd1a149a1e60630b187787dd0) )
+	// questions can go in any slot, game detects what is installed
+	ROM_LOAD16_BYTE( "issue1_q1", 0x040000, 0x010000, CRC(6af4d58b) SHA1(ee547dad30cd9940f0b017caac97aeb046604f22) ) // ISSUE1 Q1
+	ROM_LOAD16_BYTE( "issue1_q2", 0x040001, 0x010000, CRC(b01b7687) SHA1(99db448d7e40c2ec16afef3c10abc8a9493f2ab4) ) // ISSUE1 Q2
+	ROM_LOAD16_BYTE( "issue1_q3", 0x060000, 0x010000, CRC(e97f14eb) SHA1(9163d11e1bc5a13d5002a13bc18b65a91e1738c7) ) // ISSUE1 Q3
+	ROM_LOAD16_BYTE( "issue1_q4", 0x060001, 0x010000, CRC(6134d918) SHA1(e4b4d6b08d94729d4dcca474d4c7bdcb267530a8) ) // ISSUE1 Q4
+	ROM_LOAD16_BYTE( "issue1_q5", 0x080000, 0x010000, CRC(6c07814b) SHA1(a97feada5cfa1bb059837b292637fbad9c7137ac) ) // ISSUE1 Q5
+	ROM_LOAD16_BYTE( "issue1_q6", 0x080001, 0x010000, CRC(5f16a536) SHA1(3435282bfb940604fb44e06dc4748e668768f286) ) // ISSUE1 Q6
+	ROM_LOAD16_BYTE( "issue1_q7", 0x0a0000, 0x010000, CRC(9afdce0b) SHA1(a969038d9ce2a2cff1e1a75959c05a3f03f08235) ) // ISSUE1 Q7
+	ROM_LOAD16_BYTE( "issue1_q8", 0x0a0001, 0x010000, CRC(f1878251) SHA1(b6a8527112bcdf21b9a0acab4d8fa507a96aaba7) ) // ISSUE1 Q8
+	ROM_LOAD16_BYTE( "issue1_q9", 0x0c0000, 0x010000, CRC(ace01faa) SHA1(79d6247a74e1bce0d76ea3788d0022d9e50173c4) ) // ISSUE1 Q9
+	ROM_LOAD16_BYTE( "issue1_q10",0x0c0001, 0x010000, CRC(021f4523) SHA1(10884665f5700c147c7035d0c98f3889917ff015) ) // ISSUE1 Q10
+ROM_END
+
+ROM_START( v4tmach2 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "tm20.p1",  0x000000, 0x010000,  CRC(6919697c) SHA1(786d7b9ab218dbf54ff839d1f83580c409c725b3) )
+	ROM_LOAD16_BYTE( "tm20.p2",  0x000001, 0x010000,  CRC(d13b56e4) SHA1(623e73995da93c07b51ce0a5843dba1f853529dd) )
+	ROM_LOAD16_BYTE( "tm20.p3",  0x020000, 0x010000,  CRC(efd3ae64) SHA1(9d2a3b65048e04842205751c6921d2550f38bd52) )
+	ROM_LOAD16_BYTE( "tm20.p4",  0x020001, 0x010000,  CRC(602ba3fb) SHA1(7243f58df9a26adfd1a149a1e60630b187787dd0) )
+	// questions can go in any slot, game detects what is installed
+	ROM_LOAD16_BYTE( "issue2_q11" ,  0x040000, 0x010000,  CRC(e8ed736f) SHA1(e7068c550aa39a6e8f1692a16794147e996d36b4) ) // ISSUE2 Q11
+	ROM_LOAD16_BYTE( "issue2_q12" ,  0x040001, 0x010000,  BAD_DUMP CRC(adddd8a7) SHA1(73a8dd191eda2f4b41b79d4b55723731953b8970) ) // ISSUE2 Q12 // game doesn't recognize this one in any slot? bad? wrong game?
+	ROM_LOAD16_BYTE( "issue2_q13" ,  0x060000, 0x010000,  CRC(3de147dd) SHA1(d2111d54d1604fe2da0133102bbfee706f8f542e) ) // ISSUE2 Q13
+	ROM_LOAD16_BYTE( "issue2_q14" ,  0x060001, 0x010000,  CRC(02abb026) SHA1(42224678e5913090c91c21672661beb8e27127a8) ) // ISSUE2 Q14
+	ROM_LOAD16_BYTE( "issue2_q15" ,  0x080000, 0x010000,  CRC(7894ac8b) SHA1(dc46bd108ac4f67a9062bb7ace91aa51f069cbc8) ) // ISSUE2 Q15
+ROM_END
+
+
+ROM_START( v4tmach2d )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "tmd.p1",   0x000000, 0x010000,  CRC(e21045e0) SHA1(c4d0e80970ec8558db777a882edc5a0c80767375) )
+	ROM_LOAD16_BYTE( "tm20.p2",  0x000001, 0x010000,  CRC(d13b56e4) SHA1(623e73995da93c07b51ce0a5843dba1f853529dd) )
+	ROM_LOAD16_BYTE( "tm20.p3",  0x020000, 0x010000,  CRC(efd3ae64) SHA1(9d2a3b65048e04842205751c6921d2550f38bd52) )
+	ROM_LOAD16_BYTE( "tm20.p4",  0x020001, 0x010000,  CRC(602ba3fb) SHA1(7243f58df9a26adfd1a149a1e60630b187787dd0) )
+	// questions can go in any slot, game detects what is installed
+	ROM_LOAD16_BYTE( "issue2_q11" ,  0x040000, 0x010000,  CRC(e8ed736f) SHA1(e7068c550aa39a6e8f1692a16794147e996d36b4) ) // ISSUE2 Q11
+	ROM_LOAD16_BYTE( "issue2_q12" ,  0x040001, 0x010000,  BAD_DUMP CRC(adddd8a7) SHA1(73a8dd191eda2f4b41b79d4b55723731953b8970) ) // ISSUE2 Q12 // game doesn't recognize this one in any slot? bad? wrong game?
+	ROM_LOAD16_BYTE( "issue2_q13" ,  0x060000, 0x010000,  CRC(3de147dd) SHA1(d2111d54d1604fe2da0133102bbfee706f8f542e) ) // ISSUE2 Q13
+	ROM_LOAD16_BYTE( "issue2_q14" ,  0x060001, 0x010000,  CRC(02abb026) SHA1(42224678e5913090c91c21672661beb8e27127a8) ) // ISSUE2 Q14
+	ROM_LOAD16_BYTE( "issue2_q15" ,  0x080000, 0x010000,  CRC(7894ac8b) SHA1(dc46bd108ac4f67a9062bb7ace91aa51f069cbc8) ) // ISSUE2 Q15
+ROM_END
+
+ROM_START( v4mate )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mats.p1",  0x000000, 0x080000,  CRC(ebc7ea7e) SHA1(11015489a803ba5c8dbdafd632424bbd6080aece) )
+	ROM_LOAD16_BYTE( "mats.p2",  0x000001, 0x080000,  CRC(a4c7e9b4) SHA1(30148c0257181bb88159e02d2b7cd79995ee84a7) )
+	ROM_LOAD16_BYTE( "matg.p3",  0x100000, 0x080000,  CRC(571f4e8e) SHA1(51babacb5d9fb1cc9e1e56a3b2a355597d04f178) )
+	ROM_LOAD16_BYTE( "matg.p4",  0x100001, 0x080000,  CRC(52d8657b) SHA1(e44e1db13c4abd4fedcd72df9dce1df594f74e44) )
+	ROM_LOAD16_BYTE( "matg.p5",  0x200000, 0x080000,  CRC(9f0c9552) SHA1(8b1197f20853e18841a8f64fd5ff58cdd0bd1dbd) )
+	ROM_LOAD16_BYTE( "matg.p6",  0x200001, 0x080000,  CRC(59f2b6a8) SHA1(4921cf1fc4c3bc50d2598b63726f61f68b41658c) )
+	ROM_LOAD16_BYTE( "matg.p7",  0x300000, 0x080000,  CRC(64c0031a) SHA1(a519addd5d8f4696967ec84c163d28cb81ff9f32) )
+	ROM_LOAD16_BYTE( "matg.p8",  0x300001, 0x080000,  CRC(22370dae) SHA1(72b1686b458750b5ee9dfe5599c308329d2c79d5) )
+	ROM_LOAD16_BYTE( "matq.p9",  0x400000, 0x040000,  CRC(2d42e982) SHA1(80e476d5d65662059daa93a2fd383aecb74903c1) )
+	ROM_LOAD16_BYTE( "matq.p10", 0x400001, 0x040000,  CRC(90364c3c) SHA1(6a4d2a3dd2cf9040887503888e6f38341578ad64) )
+
+	/* Mating Game has an extra OKI sound chip */
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "matsnd.p1",  0x000000, 0x080000,  CRC(f16df9e3) SHA1(fd9b82d73e18e635a9ea4aabd8c0b4aa2c8c6fdb) )
+	ROM_LOAD( "matsnd.p2",  0x080000, 0x080000,  CRC(0c041621) SHA1(9156bf17ef6652968d9fbdc0b2bde64d3a67459c) )
+	ROM_LOAD( "matsnd.p3",  0x100000, 0x080000,  CRC(c7435af9) SHA1(bd6080afaaaecca0d65e6d4125b46849aa4d1f33) )
+	ROM_LOAD( "matsnd.p4",  0x180000, 0x080000,  CRC(d7e65c5b) SHA1(5575fb9f948158f2e94c986bf4bca9c9ee66a489) )
+ROM_END
+
+ROM_START( v4mated )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "matd.p1",  0x000000, 0x080000,  CRC(e660909f) SHA1(0acd990264fd7faf1f91a796d2438e8c2c7b83d1) )
+	ROM_LOAD16_BYTE( "matd.p2",  0x000001, 0x080000,  CRC(a4c7e9b4) SHA1(30148c0257181bb88159e02d2b7cd79995ee84a7) )
+	ROM_LOAD16_BYTE( "matg.p3",  0x100000, 0x080000,  CRC(571f4e8e) SHA1(51babacb5d9fb1cc9e1e56a3b2a355597d04f178) )
+	ROM_LOAD16_BYTE( "matg.p4",  0x100001, 0x080000,  CRC(52d8657b) SHA1(e44e1db13c4abd4fedcd72df9dce1df594f74e44) )
+	ROM_LOAD16_BYTE( "matg.p5",  0x200000, 0x080000,  CRC(9f0c9552) SHA1(8b1197f20853e18841a8f64fd5ff58cdd0bd1dbd) )
+	ROM_LOAD16_BYTE( "matg.p6",  0x200001, 0x080000,  CRC(59f2b6a8) SHA1(4921cf1fc4c3bc50d2598b63726f61f68b41658c) )
+	ROM_LOAD16_BYTE( "matg.p7",  0x300000, 0x080000,  CRC(64c0031a) SHA1(a519addd5d8f4696967ec84c163d28cb81ff9f32) )
+	ROM_LOAD16_BYTE( "matg.p8",  0x300001, 0x080000,  CRC(22370dae) SHA1(72b1686b458750b5ee9dfe5599c308329d2c79d5) )
+	ROM_LOAD16_BYTE( "matq.p9",  0x400000, 0x040000,  CRC(2d42e982) SHA1(80e476d5d65662059daa93a2fd383aecb74903c1) )
+	ROM_LOAD16_BYTE( "matq.p10", 0x400001, 0x040000,  CRC(90364c3c) SHA1(6a4d2a3dd2cf9040887503888e6f38341578ad64) )
+
+	/* Mating Game has an extra OKI sound chip */
+	ROM_REGION( 0x200000, "msm6376", 0 )
+	ROM_LOAD( "matsnd.p1",  0x000000, 0x080000,  CRC(f16df9e3) SHA1(fd9b82d73e18e635a9ea4aabd8c0b4aa2c8c6fdb) )
+	ROM_LOAD( "matsnd.p2",  0x080000, 0x080000,  CRC(0c041621) SHA1(9156bf17ef6652968d9fbdc0b2bde64d3a67459c) )
+	ROM_LOAD( "matsnd.p3",  0x100000, 0x080000,  CRC(c7435af9) SHA1(bd6080afaaaecca0d65e6d4125b46849aa4d1f33) )
+	ROM_LOAD( "matsnd.p4",  0x180000, 0x080000,  CRC(d7e65c5b) SHA1(5575fb9f948158f2e94c986bf4bca9c9ee66a489) )
+ROM_END
+
+ROM_START( v4addlad )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "als_21.p1", 0x000000, 0x010000, CRC(c2c4ceea) SHA1(0c5ea4d02ba053191855547b714da9a7f61f3713) )
+	ROM_LOAD16_BYTE( "al_21.p2",  0x000001, 0x010000, CRC(d5909619) SHA1(eb8d978ed28cd3afab6b3c1274d79bc6b188d240) )
+	ROM_LOAD16_BYTE( "al_21.p3",  0x020000, 0x010000, CRC(5dc65d9f) SHA1(52dffb162a0e5649e056817e9db567cc7653538c) )
+	ROM_LOAD16_BYTE( "al_21.p4",  0x020001, 0x010000, CRC(17c77264) SHA1(321372c1c0d25cfc5a1302ccfd5680d9bf62d31b) )
+	ROM_LOAD16_BYTE( "al.q1",  0x040000, 0x10000,  CRC(b9b50b70) SHA1(1887ab00ee004e3f27902d6880fa31277a981891) )
+	ROM_LOAD16_BYTE( "al.q2",  0x040001, 0x10000,  CRC(1bed86ac) SHA1(8e6563b5441ad9ddd468a3d9ae906733fed7912a) )
+	ROM_LOAD16_BYTE( "al.q3",  0x060000, 0x10000,  CRC(294d8f28) SHA1(9f9aca491ba6c4dc5cfb91da867990a9610c3a28) )
+	ROM_LOAD16_BYTE( "al.q4",  0x060001, 0x10000,  CRC(aa3e9fbd) SHA1(59d0868f4c8b3f56ca31a11d2e6af83b202bb735) )
+	ROM_LOAD16_BYTE( "al.q5",  0x080000, 0x10000,  CRC(503f4193) SHA1(86df379c736598ba59446961bf0666e155164e1d) )
+	ROM_LOAD16_BYTE( "al.q6",  0x080001, 0x10000,  CRC(9fd77e52) SHA1(d8fdebb0fd57ab9ea9797dd386168581a45ebc62) )
+	ROM_LOAD16_BYTE( "al.q7",  0x0a0000, 0x10000,  CRC(cf3fa7c7) SHA1(fa1edf09c6d3a8b5737474117b0306ef64f7741c) )
+	ROM_LOAD16_BYTE( "al.q8",  0x0a0001, 0x10000,  CRC(55058a63) SHA1(cf9edef5264f4301be4ee11f221ab67a5183a603) )
+	ROM_LOAD16_BYTE( "al.q9",  0x0c0000, 0x10000,  CRC(22274191) SHA1(9bee5709edcd853e96408f37447c0f5324610903) )
+	ROM_LOAD16_BYTE( "al.qa",  0x0c0001, 0x10000,  CRC(1fe98b4d) SHA1(533afeaea42903905f6f1206bba1a023b141bdd9) )
+
+	ROM_REGION( 0x1000, "video_prot", 0 )
+	// this is a state result dump of the PAL, a 64x64 table of 6-bit values, where a write sets the column index
+	// and the result of the previous read sets the row index, and a write of 00 resets the state machine?
+	ROM_LOAD( "addersandladders_video_mpu4.chr", 0x0000, 0x1000, CRC(2e191981) SHA1(09d57291f73bea6d87007256137d039f5d279235) )
+ROM_END
+
+ROM_START( v4addladd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ald_21.p1", 0x000000, 0x010000, CRC(ecc7c79c) SHA1(e03f470d0b83ed81af737a1d16a02528df733149) )
+	ROM_LOAD16_BYTE( "al_21.p2",  0x000001, 0x010000, CRC(d5909619) SHA1(eb8d978ed28cd3afab6b3c1274d79bc6b188d240) )
+	ROM_LOAD16_BYTE( "al_21.p3",  0x020000, 0x010000, CRC(5dc65d9f) SHA1(52dffb162a0e5649e056817e9db567cc7653538c) )
+	ROM_LOAD16_BYTE( "al_21.p4",  0x020001, 0x010000, CRC(17c77264) SHA1(321372c1c0d25cfc5a1302ccfd5680d9bf62d31b) )
+	ROM_LOAD16_BYTE( "al.q1",  0x040000, 0x10000,  CRC(b9b50b70) SHA1(1887ab00ee004e3f27902d6880fa31277a981891) )
+	ROM_LOAD16_BYTE( "al.q2",  0x040001, 0x10000,  CRC(1bed86ac) SHA1(8e6563b5441ad9ddd468a3d9ae906733fed7912a) )
+	ROM_LOAD16_BYTE( "al.q3",  0x060000, 0x10000,  CRC(294d8f28) SHA1(9f9aca491ba6c4dc5cfb91da867990a9610c3a28) )
+	ROM_LOAD16_BYTE( "al.q4",  0x060001, 0x10000,  CRC(aa3e9fbd) SHA1(59d0868f4c8b3f56ca31a11d2e6af83b202bb735) )
+	ROM_LOAD16_BYTE( "al.q5",  0x080000, 0x10000,  CRC(503f4193) SHA1(86df379c736598ba59446961bf0666e155164e1d) )
+	ROM_LOAD16_BYTE( "al.q6",  0x080001, 0x10000,  CRC(9fd77e52) SHA1(d8fdebb0fd57ab9ea9797dd386168581a45ebc62) )
+	ROM_LOAD16_BYTE( "al.q7",  0x0a0000, 0x10000,  CRC(cf3fa7c7) SHA1(fa1edf09c6d3a8b5737474117b0306ef64f7741c) )
+	ROM_LOAD16_BYTE( "al.q8",  0x0a0001, 0x10000,  CRC(55058a63) SHA1(cf9edef5264f4301be4ee11f221ab67a5183a603) )
+	ROM_LOAD16_BYTE( "al.q9",  0x0c0000, 0x10000,  CRC(22274191) SHA1(9bee5709edcd853e96408f37447c0f5324610903) )
+	ROM_LOAD16_BYTE( "al.qa",  0x0c0001, 0x10000,  CRC(1fe98b4d) SHA1(533afeaea42903905f6f1206bba1a023b141bdd9) )
+
+	ROM_REGION( 0x1000, "video_prot", 0 )
+	// this is a state result dump of the PAL, a 64x64 table of 6-bit values, where a write sets the column index
+	// and the result of the previous read sets the row index, and a write of 00 resets the state machine?
+	ROM_LOAD( "addersandladders_video_mpu4.chr", 0x0000, 0x1000, CRC(2e191981) SHA1(09d57291f73bea6d87007256137d039f5d279235) )
+ROM_END
+
+ROM_START( v4addlad20 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "al.p1",  0x000000, 0x10000,  CRC(97579eb2) SHA1(68f08ab73e0c8044de32f7eea1b3abc1fefff830) )
+	ROM_LOAD16_BYTE( "al.p2",  0x000001, 0x10000,  CRC(ca877046) SHA1(7d0e1bb471b7acc89d04953ee5e0b34f64d58325) )
+	ROM_LOAD16_BYTE( "al.p3",  0x020000, 0x10000,  CRC(92b5e1c4) SHA1(910126527ddb9d83f5c9c29caf2424ae4ebbc640) )
+	ROM_LOAD16_BYTE( "al.p4",  0x020001, 0x10000,  CRC(5e0e3b23) SHA1(3862e7b873a1e2762032151289ce2ad886a8cc3c) )
+	ROM_LOAD16_BYTE( "al.q1",  0x040000, 0x10000,  CRC(b9b50b70) SHA1(1887ab00ee004e3f27902d6880fa31277a981891) )
+	ROM_LOAD16_BYTE( "al.q2",  0x040001, 0x10000,  CRC(1bed86ac) SHA1(8e6563b5441ad9ddd468a3d9ae906733fed7912a) )
+	ROM_LOAD16_BYTE( "al.q3",  0x060000, 0x10000,  CRC(294d8f28) SHA1(9f9aca491ba6c4dc5cfb91da867990a9610c3a28) )
+	ROM_LOAD16_BYTE( "al.q4",  0x060001, 0x10000,  CRC(aa3e9fbd) SHA1(59d0868f4c8b3f56ca31a11d2e6af83b202bb735) )
+	ROM_LOAD16_BYTE( "al.q5",  0x080000, 0x10000,  CRC(503f4193) SHA1(86df379c736598ba59446961bf0666e155164e1d) )
+	ROM_LOAD16_BYTE( "al.q6",  0x080001, 0x10000,  CRC(9fd77e52) SHA1(d8fdebb0fd57ab9ea9797dd386168581a45ebc62) )
+	ROM_LOAD16_BYTE( "al.q7",  0x0a0000, 0x10000,  CRC(cf3fa7c7) SHA1(fa1edf09c6d3a8b5737474117b0306ef64f7741c) )
+	ROM_LOAD16_BYTE( "al.q8",  0x0a0001, 0x10000,  CRC(55058a63) SHA1(cf9edef5264f4301be4ee11f221ab67a5183a603) )
+	ROM_LOAD16_BYTE( "al.q9",  0x0c0000, 0x10000,  CRC(22274191) SHA1(9bee5709edcd853e96408f37447c0f5324610903) )
+	ROM_LOAD16_BYTE( "al.qa",  0x0c0001, 0x10000,  CRC(1fe98b4d) SHA1(533afeaea42903905f6f1206bba1a023b141bdd9) )
+
+	ROM_REGION( 0x1000, "video_prot", 0 )
+	// this is a state result dump of the PAL, a 64x64 table of 6-bit values, where a write sets the column index
+	// and the result of the previous read sets the row index, and a write of 00 resets the state machine?
+	ROM_LOAD( "addersandladders_video_mpu4.chr", 0x0000, 0x1000, CRC(2e191981) SHA1(09d57291f73bea6d87007256137d039f5d279235) )
+ROM_END
+
+
+// for video CPU
+// bp 32c4,a0 == ffd001
+// (a4 == aab54) when doing startup questions check
+ROM_START( v4strike )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", ROMREGION_ERASE00 )
+	ROM_LOAD16_BYTE( "sils.p1", 0x000000, 0x020000,  CRC(66ed6696) SHA1(a6aa68eb212254213db5573dfb9da1e9e06a8e39) )
+	ROM_LOAD16_BYTE( "sil.p2",  0x000001, 0x020000,  CRC(1afc07b7) SHA1(38777d56192b640b003d8dbf4b793cee0c81d9b2) )
+	ROM_LOAD16_BYTE( "sil.p3",  0x040000, 0x020000,  CRC(40f5851c) SHA1(0e3dc0dd2a257a955a1f250556d047481ae87269) )
+	ROM_LOAD16_BYTE( "sil.p4",  0x040001, 0x020000,  CRC(657e297e) SHA1(306f40376115ca40099a0010650b5edc183a2c57) )
+	ROM_LOAD16_BYTE( "sil.p5",  0x080000, 0x020000,  CRC(28bced09) SHA1(7ba5013f1e0f4e921581b23c4a1d4c005a043b66) )
+	ROM_LOAD16_BYTE( "sil.p6",  0x080001, 0x020000,  CRC(6f5fc296) SHA1(bd32a937581df6b5a4f08e6ef40c37a2b4278936) )
+
+	ROM_LOAD16_BYTE( "silq-1.bin",  0x0c0000, 0x020000,  CRC(03332145) SHA1(1700f76622a4b195e3ce03d89b886060d7f3ba71) ) // ISSUE3 Q1 v3.1 ('N' questions) (normal)
+	ROM_LOAD16_BYTE( "silq-2.bin",  0x0c0001, 0x020000,  CRC(9659b0cb) SHA1(c573752ef40c8501907d0e41ed2d2566a2dddcb8) ) // ISSUE3 Q2 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-3.bin",  0x100000, 0x020000,  CRC(443a6c2d) SHA1(1c111d801d76b07cdfef2b465f7ac759331f1843) ) // ISSUE3 Q3 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-4.bin",  0x100001, 0x020000,  CRC(6e84bd19) SHA1(318649fdd3cfec6f7ab0fa6d183a3b94f25a58f5) ) // ISSUE3 Q4 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-5.bin",  0x140000, 0x020000,  CRC(444c6d8e) SHA1(ae662747382b12bee77c30620fb0705312084e42) ) // ISSUE3 Q5 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-7.bin",  0x180000, 0x020000,  CRC(122f2327) SHA1(5c83f473cbfb7624f6eedd6d6521020b2b838da4) ) // ISSUE3 Q1 v3.1 ('T' questions) (true)
+	ROM_LOAD16_BYTE( "silq-6.bin",  0x1c0000, 0x020000,  CRC(0ea36fd5) SHA1(e0649c77007c092fef4cb11fdd71682c88ca82e6) ) // ISSUE3 Q1 v3.1 ('F' questions) (false)
+
+	ROM_REGION( 0x1000, "video_prot", 0 )
+	// this is a state result dump of the PAL, a 64x64 table of 6-bit values, where a write sets the column index
+	// and the result of the previous read sets the row index, and a write of 00 resets the state machine?
+	ROM_LOAD( "strikeitlucky_video_mpu4.chr", 0x0000, 0x1000, CRC(ec529c9f) SHA1(9eb2b08afb2955b0a8fe736500888b63f07ace63) )
+ROM_END
+
+ROM_START( v4striked )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "sild.p1", 0x000000, 0x020000,  CRC(6886e7c8) SHA1(9ef0895c9a8df762d17a3ea036bf0c6c2a440582) )
+	ROM_LOAD16_BYTE( "sil.p2",  0x000001, 0x020000,  CRC(1afc07b7) SHA1(38777d56192b640b003d8dbf4b793cee0c81d9b2) )
+	ROM_LOAD16_BYTE( "sil.p3",  0x040000, 0x020000,  CRC(40f5851c) SHA1(0e3dc0dd2a257a955a1f250556d047481ae87269) )
+	ROM_LOAD16_BYTE( "sil.p4",  0x040001, 0x020000,  CRC(657e297e) SHA1(306f40376115ca40099a0010650b5edc183a2c57) )
+	ROM_LOAD16_BYTE( "sil.p5",  0x080000, 0x020000,  CRC(28bced09) SHA1(7ba5013f1e0f4e921581b23c4a1d4c005a043b66) )
+	ROM_LOAD16_BYTE( "sil.p6",  0x080001, 0x020000,  CRC(6f5fc296) SHA1(bd32a937581df6b5a4f08e6ef40c37a2b4278936) )
+
+	ROM_LOAD16_BYTE( "silq-1.bin",  0x0c0000, 0x020000,  CRC(03332145) SHA1(1700f76622a4b195e3ce03d89b886060d7f3ba71) ) // ISSUE3 Q1 v3.1 ('N' questions) (normal)
+	ROM_LOAD16_BYTE( "silq-2.bin",  0x0c0001, 0x020000,  CRC(9659b0cb) SHA1(c573752ef40c8501907d0e41ed2d2566a2dddcb8) ) // ISSUE3 Q2 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-3.bin",  0x100000, 0x020000,  CRC(443a6c2d) SHA1(1c111d801d76b07cdfef2b465f7ac759331f1843) ) // ISSUE3 Q3 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-4.bin",  0x100001, 0x020000,  CRC(6e84bd19) SHA1(318649fdd3cfec6f7ab0fa6d183a3b94f25a58f5) ) // ISSUE3 Q4 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-5.bin",  0x140000, 0x020000,  CRC(444c6d8e) SHA1(ae662747382b12bee77c30620fb0705312084e42) ) // ISSUE3 Q5 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-7.bin",  0x180000, 0x020000,  CRC(122f2327) SHA1(5c83f473cbfb7624f6eedd6d6521020b2b838da4) ) // ISSUE3 Q1 v3.1 ('T' questions) (true)
+	ROM_LOAD16_BYTE( "silq-6.bin",  0x1c0000, 0x020000,  CRC(0ea36fd5) SHA1(e0649c77007c092fef4cb11fdd71682c88ca82e6) ) // ISSUE3 Q1 v3.1 ('F' questions) (false)
+
+	ROM_REGION( 0x1000, "video_prot", 0 )
+	// this is a state result dump of the PAL, a 64x64 table of 6-bit values, where a write sets the column index
+	// and the result of the previous read sets the row index, and a write of 00 resets the state machine?
+	ROM_LOAD( "strikeitlucky_video_mpu4.chr", 0x0000, 0x1000, CRC(ec529c9f) SHA1(9eb2b08afb2955b0a8fe736500888b63f07ace63) )
+ROM_END
+
+ROM_START( v4strike2 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "sil3.p1", 0x000000, 0x020000,  CRC(51c22f94) SHA1(dbdd30e67df4662d13b32a1df6cfabef2cf9471f) )
+	ROM_LOAD16_BYTE( "sil.p2",  0x000001, 0x020000,  CRC(1afc07b7) SHA1(38777d56192b640b003d8dbf4b793cee0c81d9b2) )
+	ROM_LOAD16_BYTE( "sil.p3",  0x040000, 0x020000,  CRC(40f5851c) SHA1(0e3dc0dd2a257a955a1f250556d047481ae87269) )
+	ROM_LOAD16_BYTE( "sil.p4",  0x040001, 0x020000,  CRC(657e297e) SHA1(306f40376115ca40099a0010650b5edc183a2c57) )
+	ROM_LOAD16_BYTE( "sil.p5",  0x080000, 0x020000,  CRC(28bced09) SHA1(7ba5013f1e0f4e921581b23c4a1d4c005a043b66) )
+	ROM_LOAD16_BYTE( "sil.p6",  0x080001, 0x020000,  CRC(6f5fc296) SHA1(bd32a937581df6b5a4f08e6ef40c37a2b4278936) )
+
+	ROM_LOAD16_BYTE( "silq-1.bin",  0x0c0000, 0x020000,  CRC(03332145) SHA1(1700f76622a4b195e3ce03d89b886060d7f3ba71) ) // ISSUE3 Q1 v3.1 ('N' questions) (normal)
+	ROM_LOAD16_BYTE( "silq-2.bin",  0x0c0001, 0x020000,  CRC(9659b0cb) SHA1(c573752ef40c8501907d0e41ed2d2566a2dddcb8) ) // ISSUE3 Q2 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-3.bin",  0x100000, 0x020000,  CRC(443a6c2d) SHA1(1c111d801d76b07cdfef2b465f7ac759331f1843) ) // ISSUE3 Q3 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-4.bin",  0x100001, 0x020000,  CRC(6e84bd19) SHA1(318649fdd3cfec6f7ab0fa6d183a3b94f25a58f5) ) // ISSUE3 Q4 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-5.bin",  0x140000, 0x020000,  CRC(444c6d8e) SHA1(ae662747382b12bee77c30620fb0705312084e42) ) // ISSUE3 Q5 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-7.bin",  0x180000, 0x020000,  CRC(122f2327) SHA1(5c83f473cbfb7624f6eedd6d6521020b2b838da4) ) // ISSUE3 Q1 v3.1 ('T' questions) (true)
+	ROM_LOAD16_BYTE( "silq-6.bin",  0x1c0000, 0x020000,  CRC(0ea36fd5) SHA1(e0649c77007c092fef4cb11fdd71682c88ca82e6) ) // ISSUE3 Q1 v3.1 ('F' questions) (false)
+
+	ROM_REGION( 0x1000, "video_prot", 0 )
+	// this is a state result dump of the PAL, a 64x64 table of 6-bit values, where a write sets the column index
+	// and the result of the previous read sets the row index, and a write of 00 resets the state machine?
+	ROM_LOAD( "strikeitlucky_video_mpu4.chr", 0x0000, 0x1000, CRC(ec529c9f) SHA1(9eb2b08afb2955b0a8fe736500888b63f07ace63) )
+ROM_END
+
+ROM_START( v4strike2d )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "sil3d.p1", 0x000000, 0x020000,  CRC(82def1b5) SHA1(d3e90e8e4e905a3779889305bb6441907d9169f1) )
+	ROM_LOAD16_BYTE( "sil.p2",  0x000001, 0x020000,  CRC(1afc07b7) SHA1(38777d56192b640b003d8dbf4b793cee0c81d9b2) )
+	ROM_LOAD16_BYTE( "sil.p3",  0x040000, 0x020000,  CRC(40f5851c) SHA1(0e3dc0dd2a257a955a1f250556d047481ae87269) )
+	ROM_LOAD16_BYTE( "sil.p4",  0x040001, 0x020000,  CRC(657e297e) SHA1(306f40376115ca40099a0010650b5edc183a2c57) )
+	ROM_LOAD16_BYTE( "sil.p5",  0x080000, 0x020000,  CRC(28bced09) SHA1(7ba5013f1e0f4e921581b23c4a1d4c005a043b66) )
+	ROM_LOAD16_BYTE( "sil.p6",  0x080001, 0x020000,  CRC(6f5fc296) SHA1(bd32a937581df6b5a4f08e6ef40c37a2b4278936) )
+
+	ROM_LOAD16_BYTE( "silq-1.bin",  0x0c0000, 0x020000,  CRC(03332145) SHA1(1700f76622a4b195e3ce03d89b886060d7f3ba71) ) // ISSUE3 Q1 v3.1 ('N' questions) (normal)
+	ROM_LOAD16_BYTE( "silq-2.bin",  0x0c0001, 0x020000,  CRC(9659b0cb) SHA1(c573752ef40c8501907d0e41ed2d2566a2dddcb8) ) // ISSUE3 Q2 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-3.bin",  0x100000, 0x020000,  CRC(443a6c2d) SHA1(1c111d801d76b07cdfef2b465f7ac759331f1843) ) // ISSUE3 Q3 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-4.bin",  0x100001, 0x020000,  CRC(6e84bd19) SHA1(318649fdd3cfec6f7ab0fa6d183a3b94f25a58f5) ) // ISSUE3 Q4 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-5.bin",  0x140000, 0x020000,  CRC(444c6d8e) SHA1(ae662747382b12bee77c30620fb0705312084e42) ) // ISSUE3 Q5 v3.1 ('N' questions)
+	ROM_LOAD16_BYTE( "silq-7.bin",  0x180000, 0x020000,  CRC(122f2327) SHA1(5c83f473cbfb7624f6eedd6d6521020b2b838da4) ) // ISSUE3 Q1 v3.1 ('T' questions) (true)
+	ROM_LOAD16_BYTE( "silq-6.bin",  0x1c0000, 0x020000,  CRC(0ea36fd5) SHA1(e0649c77007c092fef4cb11fdd71682c88ca82e6) ) // ISSUE3 Q1 v3.1 ('F' questions) (false)
+
+	ROM_REGION( 0x1000, "video_prot", 0 )
+	// this is a state result dump of the PAL, a 64x64 table of 6-bit values, where a write sets the column index
+	// and the result of the previous read sets the row index, and a write of 00 resets the state machine?
+	ROM_LOAD( "strikeitlucky_video_mpu4.chr", 0x0000, 0x1000, CRC(ec529c9f) SHA1(9eb2b08afb2955b0a8fe736500888b63f07ace63) )
+ROM_END
+
+ROM_START( v4eyedwn )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "eds.p1", 0x000000, 0x010000, CRC(bd4f4c5d) SHA1(4ad34d92d45c0b8c70af8454525dd669cab94c5c) )
+	ROM_LOAD16_BYTE( "ed.p2",  0x000001, 0x010000, CRC(8804b926) SHA1(cf9d49ca090a435819f2cd2d32dec3a6767f9e10) )
+	ROM_LOAD16_BYTE( "ed.p3",  0x020000, 0x010000, CRC(969d2264) SHA1(b55f6881852f81ec9fb2c57c8137c872f4714710) )
+	ROM_LOAD16_BYTE( "ed.p4",  0x020001, 0x010000, CRC(80d9addd) SHA1(f6359354c928e69a90cdf6d4f514c4992d3fa64c) )
+
+	ROM_LOAD( "eyesdown_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+ROM_END
+
+ROM_START( v4eyedwnd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "edd.p1", 0x000000, 0x010000, CRC(369a145c) SHA1(c54305690798086b4f809f38d1a6454d1d34fd0c) )
+	ROM_LOAD16_BYTE( "ed.p2",  0x000001, 0x010000, CRC(8804b926) SHA1(cf9d49ca090a435819f2cd2d32dec3a6767f9e10) )
+	ROM_LOAD16_BYTE( "ed.p3",  0x020000, 0x010000, CRC(969d2264) SHA1(b55f6881852f81ec9fb2c57c8137c872f4714710) )
+	ROM_LOAD16_BYTE( "ed.p4",  0x020001, 0x010000, CRC(80d9addd) SHA1(f6359354c928e69a90cdf6d4f514c4992d3fa64c) )
+
+	ROM_LOAD( "eyesdown_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+ROM_END
+
+ROM_START( v4quidgr )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "qgs.p1", 0x000000, 0x010000, CRC(e6d072a9) SHA1(b2d656818c2fb12a26ef8a170152087336c00c66) )
+	ROM_LOAD16_BYTE( "qg.p2",  0x000001, 0x010000, CRC(e4d74b11) SHA1(d23ccc57c54823ffaa7869ca824e049dc80f8945) )
+	ROM_LOAD16_BYTE( "qg.p3",  0x020000, 0x010000, CRC(5dda7cd8) SHA1(246a801e862990aade98fa358477e53707714b42) )
+	ROM_LOAD16_BYTE( "qg.p4",  0x020001, 0x010000, CRC(2106cf5d) SHA1(2073589775139ad92daef05a67afb2c70ece168c) )
+
+	ROM_LOAD( "quidgrid_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+ROM_END
+
+ROM_START( v4quidgrd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "qgd.p1", 0x000000, 0x010000, CRC(c8d37bdf) SHA1(e39a41015dd551fd62efa52faf2c5106bf7d23ac) )
+	ROM_LOAD16_BYTE( "qg.p2",  0x000001, 0x010000, CRC(e4d74b11) SHA1(d23ccc57c54823ffaa7869ca824e049dc80f8945) )
+	ROM_LOAD16_BYTE( "qg.p3",  0x020000, 0x010000, CRC(5dda7cd8) SHA1(246a801e862990aade98fa358477e53707714b42) )
+	ROM_LOAD16_BYTE( "qg.p4",  0x020001, 0x010000, CRC(2106cf5d) SHA1(2073589775139ad92daef05a67afb2c70ece168c) )
+
+	ROM_LOAD( "quidgrid_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+ROM_END
+
+ROM_START( v4quidgr2 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "q2gs.p1", 0x000000, 0x010000, CRC(6d4b92c0) SHA1(05777e0ecc8bf9f3564d8395bb7bfa245498d132) )
+	ROM_LOAD16_BYTE( "q2g.p2",  0x000001, 0x010000, CRC(9bf74ae3) SHA1(11e75acad496a9304f612714afbef90e48d1b9cb) )
+	ROM_LOAD16_BYTE( "q2g.p3",  0x020000, 0x010000, CRC(78555155) SHA1(e1218fc00f08c19a0cafb203e46044efa617ac16) )
+	ROM_LOAD16_BYTE( "q2g.p4",  0x020001, 0x010000, CRC(2a4295b6) SHA1(2aa0b5dbe6b934a7a4c8069c91fd6d85cae02836) )
+
+	ROM_LOAD( "quidgrid_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+ROM_END
+
+ROM_START( v4quidgr2d )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "q2gd.p1", 0x000000, 0x010000, CRC(26185449) SHA1(921d355020788d53e8ffa83af44223dbe5a2dd5e) )
+	ROM_LOAD16_BYTE( "q2g.p2",  0x000001, 0x010000, CRC(9bf74ae3) SHA1(11e75acad496a9304f612714afbef90e48d1b9cb) )
+	ROM_LOAD16_BYTE( "q2g.p3",  0x020000, 0x010000, CRC(78555155) SHA1(e1218fc00f08c19a0cafb203e46044efa617ac16) )
+	ROM_LOAD16_BYTE( "q2g.p4",  0x020001, 0x010000, CRC(2a4295b6) SHA1(2aa0b5dbe6b934a7a4c8069c91fd6d85cae02836) )
+
+	ROM_LOAD( "quidgrid_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+ROM_END
+
+
+ROM_START( v4barqst )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "bq-6.p1", 0x000000, 0x010000, CRC(f5f81993) SHA1(5975da2b944a8e9cb4bb285d87d64740d9ec045b) )
+	ROM_LOAD16_BYTE( "bq-6.p2", 0x000001, 0x010000, CRC(b9ce9f2e) SHA1(9407a83d1713b641dc551dd73f357d99baebbba2) )
+	ROM_LOAD16_BYTE( "bq-iss4.p1", 0x020000, 0x010000, CRC(f8c9e00b) SHA1(b0081756667068eaaf02f34a161b52024e163018) ) //ISSUE4
+	ROM_LOAD16_BYTE( "bq-iss4.p2", 0x020001, 0x010000, CRC(211d7779) SHA1(c1d835dd4758f28b7bd4e81ea5d3316704fe8ff3) )
+	ROM_LOAD16_BYTE( "bq-iss4.p3", 0x040000, 0x010000, CRC(b6066dec) SHA1(63f66f004f6c66dc1bd61385407e1adb4a678ccd) )
+	ROM_LOAD16_BYTE( "bq-iss4.p4", 0x040001, 0x010000, CRC(71a2a3cf) SHA1(41d95d34b801f54bf4f1044d7bb88704c9a318a0) )
+	ROM_LOAD16_BYTE( "bq-iss4.p5", 0x060000, 0x010000, CRC(13cfb410) SHA1(fca72e403a8c150aba73fd501a1a7cfd62bd28ac) )
+	ROM_LOAD16_BYTE( "bq-iss4.p6", 0x060001, 0x010000, CRC(f8847e9d) SHA1(49213302f63efc6e2b6728fed98c0094d023c100) )
+	ROM_LOAD16_BYTE( "bq-iss4.p7", 0x080000, 0x010000, CRC(1f3b3d33) SHA1(117f7121123336e3b33a3d1838ddca9161a7868b) )
+	ROM_LOAD16_BYTE( "bq-iss4.p8", 0x080001, 0x010000, CRC(54007030) SHA1(65306938b2737f7423223eb0290ee69b2955176e) )
+	ROM_LOAD16_BYTE( "bq-iss4.p9", 0x0a0000, 0x010000, CRC(2971f5ca) SHA1(0de9b1d743243d6e127f5417485f1a9fa76d5399) )
+	ROM_LOAD16_BYTE( "bq-iss4.p10", 0x0a0001, 0x010000, CRC(d54f961f) SHA1(14273cf78371550dd525843b388915df567342ce) )
+
+	ROM_REGION( 0x1000, "video_prot", 0 )
+	// this is a state result dump of the PAL, a 64x64 table of 6-bit values, where a write sets the column index
+	// and the result of the previous read sets the row index, and a write of 00 resets the state machine?
+	ROM_LOAD( "barquest.chr", 0x0000, 0x1000, CRC(bc9971fe) SHA1(902684318ad0755ee062a7f10e2c3171b5c4933f) )
+ROM_END
+
+ROM_START( v4barqstd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "bqd.p1", 0x000000, 0x010000, CRC(b574ea46) SHA1(0eb446fbf4f7fcd1b30f35631b4b521730ce26b4) )
+	ROM_LOAD16_BYTE( "bq.p2",  0x000001, 0x010000, CRC(b9ce9f2e) SHA1(9407a83d1713b641dc551dd73f357d99baebbba2) )
+	ROM_LOAD16_BYTE( "bq-iss4.p1", 0x020000, 0x010000, CRC(f8c9e00b) SHA1(b0081756667068eaaf02f34a161b52024e163018) ) //ISSUE4
+	ROM_LOAD16_BYTE( "bq-iss4.p2", 0x020001, 0x010000, CRC(211d7779) SHA1(c1d835dd4758f28b7bd4e81ea5d3316704fe8ff3) )
+	ROM_LOAD16_BYTE( "bq-iss4.p3", 0x040000, 0x010000, CRC(b6066dec) SHA1(63f66f004f6c66dc1bd61385407e1adb4a678ccd) )
+	ROM_LOAD16_BYTE( "bq-iss4.p4", 0x040001, 0x010000, CRC(71a2a3cf) SHA1(41d95d34b801f54bf4f1044d7bb88704c9a318a0) )
+	ROM_LOAD16_BYTE( "bq-iss4.p5", 0x060000, 0x010000, CRC(13cfb410) SHA1(fca72e403a8c150aba73fd501a1a7cfd62bd28ac) )
+	ROM_LOAD16_BYTE( "bq-iss4.p6", 0x060001, 0x010000, CRC(f8847e9d) SHA1(49213302f63efc6e2b6728fed98c0094d023c100) )
+	ROM_LOAD16_BYTE( "bq-iss4.p7", 0x080000, 0x010000, CRC(1f3b3d33) SHA1(117f7121123336e3b33a3d1838ddca9161a7868b) )
+	ROM_LOAD16_BYTE( "bq-iss4.p8", 0x080001, 0x010000, CRC(54007030) SHA1(65306938b2737f7423223eb0290ee69b2955176e) )
+	ROM_LOAD16_BYTE( "bq-iss4.p9", 0x0a0000, 0x010000, CRC(2971f5ca) SHA1(0de9b1d743243d6e127f5417485f1a9fa76d5399) )
+	ROM_LOAD16_BYTE( "bq-iss4.p10", 0x0a0001, 0x010000, CRC(d54f961f) SHA1(14273cf78371550dd525843b388915df567342ce) )
+
+	ROM_REGION( 0x1000, "video_prot", 0 )
+	// this is a state result dump of the PAL, a 64x64 table of 6-bit values, where a write sets the column index
+	// and the result of the previous read sets the row index, and a write of 00 resets the state machine?
+	ROM_LOAD( "barquest.chr", 0x0000, 0x1000, CRC(bc9971fe) SHA1(902684318ad0755ee062a7f10e2c3171b5c4933f) )
+ROM_END
+
+ROM_START( v4barqs2 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "b2qs.p1", 0x000000, 0x010000, CRC(35c1a58b) SHA1(e2d07229e7136c462c48b6c77c9d26a33deb8e34) )
+	ROM_LOAD16_BYTE( "b2q.p2", 0x000001, 0x010000, CRC(28a0064a) SHA1(3751d9f3cc93994c44927ca3f72ade6bee22b20b) )
+
+	ROM_LOAD( "barquest2_questions",  0x040000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+ROM_END
+
+ROM_START( v4wize )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "wms.p1", 0x000000, 0x010000, CRC(712385c1) SHA1(075a98626eba2eae6a31b395c2a74541a31b2582) )
+	ROM_LOAD16_BYTE( "wm.p2",  0x000001, 0x010000, CRC(41b5fb2a) SHA1(e9ee484ec7445d58efa9bbfbd705202ef83656f2) )
+	ROM_LOAD16_BYTE( "wm.p3",  0x020000, 0x010000, CRC(934da7e4) SHA1(9cac87ccadbc871577640ec0bddd5e07aef139f8) )
+	ROM_LOAD16_BYTE( "wm.p4",  0x020001, 0x010000, CRC(463f6c0b) SHA1(ffee4cca73ebe7130e34118031cb16b3c42f03cb) )
+	ROM_LOAD16_BYTE( "wm.p5",  0x040000, 0x010000, CRC(eaea2502) SHA1(adeda7148ee4eee98870f4aa529b5c9f36417e2e) )
+	ROM_LOAD16_BYTE( "wm.p6",  0x040001, 0x010000, CRC(40a5e980) SHA1(e7bd49308b63a94a9ca0b138de0c48d2316d6aa0) )
+
+	ROM_LOAD( "wizemove_questions",  0x080000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+ROM_END
+
+ROM_START( v4wized )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "wmd.p1", 0x000000, 0x010000, CRC(45d29045) SHA1(37911346753211801f8404d42b275f49764ba5f4) )
+	ROM_LOAD16_BYTE( "wm.p2",  0x000001, 0x010000, CRC(41b5fb2a) SHA1(e9ee484ec7445d58efa9bbfbd705202ef83656f2) )
+	ROM_LOAD16_BYTE( "wm.p3",  0x020000, 0x010000, CRC(934da7e4) SHA1(9cac87ccadbc871577640ec0bddd5e07aef139f8) )
+	ROM_LOAD16_BYTE( "wm.p4",  0x020001, 0x010000, CRC(463f6c0b) SHA1(ffee4cca73ebe7130e34118031cb16b3c42f03cb) )
+	ROM_LOAD16_BYTE( "wm.p5",  0x040000, 0x010000, CRC(eaea2502) SHA1(adeda7148ee4eee98870f4aa529b5c9f36417e2e) )
+	ROM_LOAD16_BYTE( "wm.p6",  0x040001, 0x010000, CRC(40a5e980) SHA1(e7bd49308b63a94a9ca0b138de0c48d2316d6aa0) )
+
+	ROM_LOAD( "wizemove_questions",  0x080000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+ROM_END
+
+
+ROM_START( v4wizeb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "wm3.p1", 0x000000, 0x010000, CRC(0752f0f1) SHA1(2b0531312bf1d4b489394401c5d78c7f04e12aea) )
+	ROM_LOAD16_BYTE( "wm.p2",  0x000001, 0x010000, CRC(41b5fb2a) SHA1(e9ee484ec7445d58efa9bbfbd705202ef83656f2) )
+	ROM_LOAD16_BYTE( "wm.p3",  0x020000, 0x010000, CRC(934da7e4) SHA1(9cac87ccadbc871577640ec0bddd5e07aef139f8) )
+	ROM_LOAD16_BYTE( "wm.p4",  0x020001, 0x010000, CRC(463f6c0b) SHA1(ffee4cca73ebe7130e34118031cb16b3c42f03cb) )
+	ROM_LOAD16_BYTE( "wm.p5",  0x040000, 0x010000, CRC(eaea2502) SHA1(adeda7148ee4eee98870f4aa529b5c9f36417e2e) )
+	ROM_LOAD16_BYTE( "wm.p6",  0x040001, 0x010000, CRC(40a5e980) SHA1(e7bd49308b63a94a9ca0b138de0c48d2316d6aa0) )
+
+	ROM_LOAD( "wizemove_questions",  0x080000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+ROM_END
+
+ROM_START( v4wizec )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "wm3d.p1", 0x000000, 0x010000, CRC(4e3ab877) SHA1(64408d1ac1f626390ffe93e024c672ba5acb42d6) )
+	ROM_LOAD16_BYTE( "wm.p2",  0x000001, 0x010000, CRC(41b5fb2a) SHA1(e9ee484ec7445d58efa9bbfbd705202ef83656f2) )
+	ROM_LOAD16_BYTE( "wm.p3",  0x020000, 0x010000, CRC(934da7e4) SHA1(9cac87ccadbc871577640ec0bddd5e07aef139f8) )
+	ROM_LOAD16_BYTE( "wm.p4",  0x020001, 0x010000, CRC(463f6c0b) SHA1(ffee4cca73ebe7130e34118031cb16b3c42f03cb) )
+	ROM_LOAD16_BYTE( "wm.p5",  0x040000, 0x010000, CRC(eaea2502) SHA1(adeda7148ee4eee98870f4aa529b5c9f36417e2e) )
+	ROM_LOAD16_BYTE( "wm.p6",  0x040001, 0x010000, CRC(40a5e980) SHA1(e7bd49308b63a94a9ca0b138de0c48d2316d6aa0) )
+
+	ROM_LOAD( "wizemove_questions",  0x080000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+ROM_END
+
+ROM_START( v4wizen )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 ) // has WW21 in ROM, vector table appears corrupt, seems to be different revision
+	ROM_LOAD16_BYTE( "w23.p1", 0x000000, 0x010000, BAD_DUMP CRC(a8d8fb2e) SHA1(cf5462b224a7960ade867cf76079d11084f13e4b) )
+	ROM_LOAD16_BYTE( "w23.p2", 0x000001, 0x010000, NO_DUMP )
+	// + other ROMs
+
+	ROM_LOAD( "wizemove_questions",  0x080000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+ROM_END
+
+ROM_START( v4wizeo )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "wzm1+2p1", 0x000000, 0x010000, CRC(629e38d0) SHA1(bbc2688635c4cb9a1712a0a0d28017d1867417a4) )
+	ROM_LOAD16_BYTE( "wzm1+2p2", 0x000001, 0x010000, CRC(96b9c484) SHA1(b02595ba5a5c7d673bdc7675708a4d8f6d907779) )
+	ROM_LOAD16_BYTE( "wzm1+2p3", 0x020000, 0x010000, CRC(e545fac0) SHA1(4a3f9e5522bd666d5a1e9ac7878d3d78f3756762) )
+	ROM_LOAD16_BYTE( "wzm1+2p4", 0x020001, 0x010000, CRC(df7d4dba) SHA1(b892cfb807421c99ba98bfd9b34d717e17345d83) )
+	ROM_LOAD16_BYTE( "wzm1+2p5", 0x040000, 0x010000, NO_DUMP )
+	ROM_LOAD16_BYTE( "wzm1+2p6", 0x040001, 0x010000, CRC(3eecbdf8) SHA1(9ecc4fe25e1c1e167aaa413eaf601b55e1a432fb) )
+
+	ROM_LOAD( "wizemove_questions",  0x080000, 0x020000,  NO_DUMP ) // no dumps of question ROMs for this game..
+ROM_END
+
+
+
+
+ROM_START( v4opt3 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "o3-s.p1",0x000000, 0x020000, CRC(9b825fa1) SHA1(c743bed32fa1af934f9610204a4f4062cfb85193) )
+	ROM_LOAD16_BYTE( "o3-.p2", 0x000001, 0x020000, CRC(9545a845) SHA1(24c6656c137baf74c8ea5d930220bf0d0c90b3ab) )
+	ROM_LOAD16_BYTE( "o3-.p3", 0x040000, 0x020000, CRC(2f3666cb) SHA1(94010eb56de7f3900fbe1c0b77a43752f9cf3ba6) )
+	ROM_LOAD16_BYTE( "o3-.p4", 0x040001, 0x020000, CRC(63b6aa70) SHA1(6f0bef67437caa150ee98f0349d0f6412665e36b) )
+	ROM_LOAD16_BYTE( "o3-.p5", 0x080000, 0x020000, CRC(750db328) SHA1(8442b32e2f70ba2e0849d994a1e2502634652c5e) )
+	ROM_LOAD16_BYTE( "o3-.p6", 0x080001, 0x020000, CRC(1fed469e) SHA1(351a8cd687c0e11300c498e45e4b6f3a35940615) )
+	ROM_LOAD16_BYTE( "o3-.p7", 0x0c0000, 0x020000, CRC(400e304f) SHA1(3abe30cf75990a5ce9066ccd4cfed680e5d4963c) )
+	ROM_LOAD16_BYTE( "o3-.p8", 0x0c0001, 0x020000, CRC(0fb22311) SHA1(2329520d4ce763ba10cc81314711d28b4a5fb192) )
+	ROM_LOAD16_BYTE( "o3-.p9", 0x100000, 0x020000, CRC(0d71b620) SHA1(103cf5700c876e94e2ca3b63ef71b768bd2d99a2) )
+	ROM_LOAD16_BYTE( "o3-.p10",0x100001, 0x020000, CRC(239fa03b) SHA1(c4c77ded07481746b041122a8538036a65a5abe6) )
+ROM_END
+
+ROM_START( v4opt3d )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	VID_BIOS
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "o3-d.p1",0x000000, 0x020000, CRC(09eef902) SHA1(2ce68fe08c5a1be7daaf3a380aa5f5fef8401944) )
+	ROM_LOAD16_BYTE( "o3-.p2", 0x000001, 0x020000, CRC(9545a845) SHA1(24c6656c137baf74c8ea5d930220bf0d0c90b3ab) )
+	ROM_LOAD16_BYTE( "o3-.p3", 0x040000, 0x020000, CRC(2f3666cb) SHA1(94010eb56de7f3900fbe1c0b77a43752f9cf3ba6) )
+	ROM_LOAD16_BYTE( "o3-.p4", 0x040001, 0x020000, CRC(63b6aa70) SHA1(6f0bef67437caa150ee98f0349d0f6412665e36b) )
+	ROM_LOAD16_BYTE( "o3-.p5", 0x080000, 0x020000, CRC(750db328) SHA1(8442b32e2f70ba2e0849d994a1e2502634652c5e) )
+	ROM_LOAD16_BYTE( "o3-.p6", 0x080001, 0x020000, CRC(1fed469e) SHA1(351a8cd687c0e11300c498e45e4b6f3a35940615) )
+	ROM_LOAD16_BYTE( "o3-.p7", 0x0c0000, 0x020000, CRC(400e304f) SHA1(3abe30cf75990a5ce9066ccd4cfed680e5d4963c) )
+	ROM_LOAD16_BYTE( "o3-.p8", 0x0c0001, 0x020000, CRC(0fb22311) SHA1(2329520d4ce763ba10cc81314711d28b4a5fb192) )
+	ROM_LOAD16_BYTE( "o3-.p9", 0x100000, 0x020000, CRC(0d71b620) SHA1(103cf5700c876e94e2ca3b63ef71b768bd2d99a2) )
+	ROM_LOAD16_BYTE( "o3-.p10",0x100001, 0x020000, CRC(239fa03b) SHA1(c4c77ded07481746b041122a8538036a65a5abe6) )
+ROM_END
+
+
+/*
+
+FRUIT FACTORY                   ID=FF_
+-------------
+
+GRAPHIC PROMS
+=============
+
+FF_GFX10.P3     4mb
+FF_GFX10.P4     4MB
+FF_GFX10.P5     4MB
+FF_GFX10.P6     4MB
+FF_GFX10.P7     4MB
+FF_GFX10.P8     4MB
+
+MPU4 PROM
+=========
+
+FFMPU416.P1 A209    27C512
+
+
+GAME PROMS
+==========
+FF_293.P1   5F95    27C040  20p/?15
+FF_293.P2   DCE6    27C040  20p/?15
+FF_293D.P2  5F95    27C040  20p/?15 data
+FF_293D.P2  DDE5    27C040  20p/?15 data
+
+FF_393.P1   5F9F    27C040  25p/?15
+FF_393.P2   DCE6    27C040  25p/?15
+FF_393D.P2  5F9F    27C040  25p/?15 data
+FF_393D.P2  DDE5    27C040  25p/?15 data
+
+FF_493.P1   5EAA    27C040  30p/?15
+FF_493.P2   DCE6    27C040  30p/?15
+FF_493D.P2  5EAA    27C040  30p/?15 data
+FF_493D.P2  DDE5    27C040  30p/?15 data
+
+---------------------------------------------------------------------
+ END
+
+ */
+
+ROM_START( v4frfact )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("ffmpu416_a209.p1",  0x00000, 0x10000, NO_DUMP ) // should use "FFMPU416.P1  A209    27C512" according to text file, but ROM was not in archive
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ff_40d.p1", 0x000001, 0x080000, CRC(c91fd349) SHA1(18c36612ee9fed6f12bb3dbf08f6740cf2a463c2) )
+	ROM_LOAD16_BYTE( "ff_40d.p2", 0x000000, 0x080000, CRC(e7555936) SHA1(0af7a0be17735831eb037c4bc55d35891a608b23) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p3", 0x100001, 0x080000, CRC(a043a1f6) SHA1(0e591f0e7ecdf8b390a20ee826705a22ed6923d5) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p4", 0x100000, 0x080000, CRC(58226ff5) SHA1(f2647e43da69e8aa2f78d46f3cfc553440213c36) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p5", 0x200001, 0x080000, CRC(9bfc6da8) SHA1(969c4a84392c28d61e87482e7f881bdfda79f879) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p6", 0x200000, 0x080000, CRC(240cdfd3) SHA1(8ccf199aff929813df554d957e84484a482c98c6) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p7", 0x300001, 0x080000, CRC(42d3bd01) SHA1(6d07875e8f251c3c9c4e7f48ae886b8069c20897) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p8", 0x300000, 0x080000, CRC(1951a944) SHA1(b8eca580ae43be855d93cf9f50058b2fb9e8981b) )
+ROM_END
+
+ROM_START( v4frfacta )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("ffmpu416_a209.p1",  0x00000, 0x10000, NO_DUMP ) // should use "FFMPU416.P1  A209    27C512" according to text file, but ROM was not in archive
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ff_493.p1", 0x000001, 0x080000, CRC(1a88e0e6) SHA1(198fffd0d98d557462485b1ca6e3460199e03924) ) // 30p/?15
+	ROM_LOAD16_BYTE( "ff_493.p2", 0x000000, 0x080000, CRC(1c948e83) SHA1(571f854c33a2ef68daa8633193b49486ff92d7e2) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p3", 0x100001, 0x080000, CRC(a043a1f6) SHA1(0e591f0e7ecdf8b390a20ee826705a22ed6923d5) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p4", 0x100000, 0x080000, CRC(58226ff5) SHA1(f2647e43da69e8aa2f78d46f3cfc553440213c36) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p5", 0x200001, 0x080000, CRC(9bfc6da8) SHA1(969c4a84392c28d61e87482e7f881bdfda79f879) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p6", 0x200000, 0x080000, CRC(240cdfd3) SHA1(8ccf199aff929813df554d957e84484a482c98c6) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p7", 0x300001, 0x080000, CRC(42d3bd01) SHA1(6d07875e8f251c3c9c4e7f48ae886b8069c20897) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p8", 0x300000, 0x080000, CRC(1951a944) SHA1(b8eca580ae43be855d93cf9f50058b2fb9e8981b) )
+ROM_END
+
+ROM_START( v4frfactb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("ffmpu416_a209.p1",  0x00000, 0x10000, NO_DUMP ) // should use "FFMPU416.P1  A209    27C512" according to text file, but ROM was not in archive
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ff_493d.p1", 0x000001, 0x080000, CRC(1a88e0e6) SHA1(198fffd0d98d557462485b1ca6e3460199e03924) )   // 30p/?15 data
+	ROM_LOAD16_BYTE( "ff_493d.p2", 0x000000, 0x080000, CRC(86830e6c) SHA1(9510bf42a8c2f8ffeafd1f2b0e027a0a59d80b20) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p3", 0x100001, 0x080000, CRC(a043a1f6) SHA1(0e591f0e7ecdf8b390a20ee826705a22ed6923d5) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p4", 0x100000, 0x080000, CRC(58226ff5) SHA1(f2647e43da69e8aa2f78d46f3cfc553440213c36) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p5", 0x200001, 0x080000, CRC(9bfc6da8) SHA1(969c4a84392c28d61e87482e7f881bdfda79f879) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p6", 0x200000, 0x080000, CRC(240cdfd3) SHA1(8ccf199aff929813df554d957e84484a482c98c6) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p7", 0x300001, 0x080000, CRC(42d3bd01) SHA1(6d07875e8f251c3c9c4e7f48ae886b8069c20897) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p8", 0x300000, 0x080000, CRC(1951a944) SHA1(b8eca580ae43be855d93cf9f50058b2fb9e8981b) )
+ROM_END
+
+ROM_START( v4frfactc )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("ffmpu416_a209.p1",  0x00000, 0x10000, NO_DUMP ) // should use "FFMPU416.P1  A209    27C512" according to text file, but ROM was not in archive
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ff_393.p1", 0x000001, 0x080000, CRC(35011cab) SHA1(9e381db93dbe1f71d40b152ae6c68ea7a7b9728c) )    // 25p/?15
+	ROM_LOAD16_BYTE( "ff_393.p2", 0x000000, 0x080000, CRC(1c948e83) SHA1(571f854c33a2ef68daa8633193b49486ff92d7e2) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p3", 0x100001, 0x080000, CRC(a043a1f6) SHA1(0e591f0e7ecdf8b390a20ee826705a22ed6923d5) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p4", 0x100000, 0x080000, CRC(58226ff5) SHA1(f2647e43da69e8aa2f78d46f3cfc553440213c36) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p5", 0x200001, 0x080000, CRC(9bfc6da8) SHA1(969c4a84392c28d61e87482e7f881bdfda79f879) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p6", 0x200000, 0x080000, CRC(240cdfd3) SHA1(8ccf199aff929813df554d957e84484a482c98c6) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p7", 0x300001, 0x080000, CRC(42d3bd01) SHA1(6d07875e8f251c3c9c4e7f48ae886b8069c20897) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p8", 0x300000, 0x080000, CRC(1951a944) SHA1(b8eca580ae43be855d93cf9f50058b2fb9e8981b) )
+ROM_END
+
+ROM_START( v4frfactd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("ffmpu416_a209.p1",  0x00000, 0x10000, NO_DUMP ) // should use "FFMPU416.P1  A209    27C512" according to text file, but ROM was not in archive
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ff_393d.p1", 0x000001, 0x080000, CRC(35011cab) SHA1(9e381db93dbe1f71d40b152ae6c68ea7a7b9728c) )   // 25p/?15 data
+	ROM_LOAD16_BYTE( "ff_393d.p2", 0x000000, 0x080000, CRC(86830e6c) SHA1(9510bf42a8c2f8ffeafd1f2b0e027a0a59d80b20) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p3", 0x100001, 0x080000, CRC(a043a1f6) SHA1(0e591f0e7ecdf8b390a20ee826705a22ed6923d5) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p4", 0x100000, 0x080000, CRC(58226ff5) SHA1(f2647e43da69e8aa2f78d46f3cfc553440213c36) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p5", 0x200001, 0x080000, CRC(9bfc6da8) SHA1(969c4a84392c28d61e87482e7f881bdfda79f879) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p6", 0x200000, 0x080000, CRC(240cdfd3) SHA1(8ccf199aff929813df554d957e84484a482c98c6) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p7", 0x300001, 0x080000, CRC(42d3bd01) SHA1(6d07875e8f251c3c9c4e7f48ae886b8069c20897) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p8", 0x300000, 0x080000, CRC(1951a944) SHA1(b8eca580ae43be855d93cf9f50058b2fb9e8981b) )
+ROM_END
+
+ROM_START( v4frfacte )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("ffmpu416_a209.p1",  0x00000, 0x10000, NO_DUMP ) // should use "FFMPU416.P1  A209    27C512" according to text file, but ROM was not in archive
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ff_293.p1", 0x000001, 0x080000, CRC(4787bc3d) SHA1(a1d53f1640c6d829c9fee8c72057b2801aac4cb2) )    // 20p/?15
+	ROM_LOAD16_BYTE( "ff_293.p2", 0x000000, 0x080000, CRC(1c948e83) SHA1(571f854c33a2ef68daa8633193b49486ff92d7e2) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p3", 0x100001, 0x080000, CRC(a043a1f6) SHA1(0e591f0e7ecdf8b390a20ee826705a22ed6923d5) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p4", 0x100000, 0x080000, CRC(58226ff5) SHA1(f2647e43da69e8aa2f78d46f3cfc553440213c36) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p5", 0x200001, 0x080000, CRC(9bfc6da8) SHA1(969c4a84392c28d61e87482e7f881bdfda79f879) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p6", 0x200000, 0x080000, CRC(240cdfd3) SHA1(8ccf199aff929813df554d957e84484a482c98c6) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p7", 0x300001, 0x080000, CRC(42d3bd01) SHA1(6d07875e8f251c3c9c4e7f48ae886b8069c20897) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p8", 0x300000, 0x080000, CRC(1951a944) SHA1(b8eca580ae43be855d93cf9f50058b2fb9e8981b) )
+ROM_END
+
+ROM_START( v4frfactf )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("ffmpu416_a209.p1",  0x00000, 0x10000, NO_DUMP ) // should use "FFMPU416.P1  A209    27C512" according to text file, but ROM was not in archive
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ff_293d.p1", 0x000001, 0x080000, CRC(4787bc3d) SHA1(a1d53f1640c6d829c9fee8c72057b2801aac4cb2) )   // 20p/?15 data
+	ROM_LOAD16_BYTE( "ff_293d.p2", 0x000000, 0x080000, CRC(86830e6c) SHA1(9510bf42a8c2f8ffeafd1f2b0e027a0a59d80b20) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p3", 0x100001, 0x080000, CRC(a043a1f6) SHA1(0e591f0e7ecdf8b390a20ee826705a22ed6923d5) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p4", 0x100000, 0x080000, CRC(58226ff5) SHA1(f2647e43da69e8aa2f78d46f3cfc553440213c36) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p5", 0x200001, 0x080000, CRC(9bfc6da8) SHA1(969c4a84392c28d61e87482e7f881bdfda79f879) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p6", 0x200000, 0x080000, CRC(240cdfd3) SHA1(8ccf199aff929813df554d957e84484a482c98c6) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p7", 0x300001, 0x080000, CRC(42d3bd01) SHA1(6d07875e8f251c3c9c4e7f48ae886b8069c20897) )
+	ROM_LOAD16_BYTE( "ff_gfx10.p8", 0x300000, 0x080000, CRC(1951a944) SHA1(b8eca580ae43be855d93cf9f50058b2fb9e8981b) )
+ROM_END
+
+
+
+/* BWB */
+ROM_START( v4bigfrt )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("bi_xca__.2_0",  0x00000, 0x10000,  CRC(bdba5ce9) SHA1(e4bce58957230183b96f9d3155575005ffb002c8))  // standard/stake Key
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("bi______.2_1",  0x000000, 0x010000,  CRC(22e7e736) SHA1(478abe8dc9e29b8ceccfac80ddaa5ce2727572cd))
+	ROM_LOAD16_BYTE("bi______.2_2",  0x000001, 0x010000,  CRC(9d139ae7) SHA1(fb38b3102355ee5f79f66410ce5a26f74296321a))
+	ROM_LOAD16_BYTE("bi______.2_3",  0x020000, 0x010000,  CRC(9f4c424d) SHA1(f20e5e6f43ac0d481b7f2d8ea421fa6b9fa92b38))
+	ROM_LOAD16_BYTE("bi______.2_4",  0x020001, 0x010000,  CRC(58f0dcb4) SHA1(79039d489f5ce3a1865fa92a2b6e8b002b63efcf))
+	ROM_LOAD16_BYTE("bi______.2_5",  0x040000, 0x010000,  CRC(512c6d1a) SHA1(1c9d04e7e59a95f6975e6d2d5e5def4c1a7777e0))
+	ROM_LOAD16_BYTE("bi______.2_6",  0x040001, 0x010000,  CRC(5df850ec) SHA1(5b455f4cfb19c551723f7fd5f4f95e5420f8682f))
+	ROM_LOAD16_BYTE("bi______.2_7",  0x060000, 0x010000,  CRC(9ea394a2) SHA1(3b9840627f7676aa7872d2bc022406a4ced7958f))
+	ROM_LOAD16_BYTE("bi______.2_8",  0x060001, 0x010000,  CRC(4aa1d37d) SHA1(3c1a3ccacdc33cd4a54b7bbf06ea4c33868705f4))
+ROM_END
+
+ROM_START( v4bigfrta )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("bi_20bt_.2_0",  0x00000, 0x10000,  CRC(0c5b21c8) SHA1(bec3a0ca87156de82024449ed5acfd9d8877f15c))  // protocol/20p/Rank Bingo
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("bi______.2_1",  0x000000, 0x010000,  CRC(22e7e736) SHA1(478abe8dc9e29b8ceccfac80ddaa5ce2727572cd))
+	ROM_LOAD16_BYTE("bi______.2_2",  0x000001, 0x010000,  CRC(9d139ae7) SHA1(fb38b3102355ee5f79f66410ce5a26f74296321a))
+	ROM_LOAD16_BYTE("bi______.2_3",  0x020000, 0x010000,  CRC(9f4c424d) SHA1(f20e5e6f43ac0d481b7f2d8ea421fa6b9fa92b38))
+	ROM_LOAD16_BYTE("bi______.2_4",  0x020001, 0x010000,  CRC(58f0dcb4) SHA1(79039d489f5ce3a1865fa92a2b6e8b002b63efcf))
+	ROM_LOAD16_BYTE("bi______.2_5",  0x040000, 0x010000,  CRC(512c6d1a) SHA1(1c9d04e7e59a95f6975e6d2d5e5def4c1a7777e0))
+	ROM_LOAD16_BYTE("bi______.2_6",  0x040001, 0x010000,  CRC(5df850ec) SHA1(5b455f4cfb19c551723f7fd5f4f95e5420f8682f))
+	ROM_LOAD16_BYTE("bi______.2_7",  0x060000, 0x010000,  CRC(9ea394a2) SHA1(3b9840627f7676aa7872d2bc022406a4ced7958f))
+	ROM_LOAD16_BYTE("bi______.2_8",  0x060001, 0x010000,  CRC(4aa1d37d) SHA1(3c1a3ccacdc33cd4a54b7bbf06ea4c33868705f4))
+ROM_END
+
+ROM_START( v4bigfrtb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("bi_20bg_.2_0",  0x00000, 0x10000,  CRC(f1b5cb6a) SHA1(b26040a283d3c2642367e86f66e47d97c1ac07a4))  // protocol/20p/Gala Bingo
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("bi______.2_1",  0x000000, 0x010000,  CRC(22e7e736) SHA1(478abe8dc9e29b8ceccfac80ddaa5ce2727572cd))
+	ROM_LOAD16_BYTE("bi______.2_2",  0x000001, 0x010000,  CRC(9d139ae7) SHA1(fb38b3102355ee5f79f66410ce5a26f74296321a))
+	ROM_LOAD16_BYTE("bi______.2_3",  0x020000, 0x010000,  CRC(9f4c424d) SHA1(f20e5e6f43ac0d481b7f2d8ea421fa6b9fa92b38))
+	ROM_LOAD16_BYTE("bi______.2_4",  0x020001, 0x010000,  CRC(58f0dcb4) SHA1(79039d489f5ce3a1865fa92a2b6e8b002b63efcf))
+	ROM_LOAD16_BYTE("bi______.2_5",  0x040000, 0x010000,  CRC(512c6d1a) SHA1(1c9d04e7e59a95f6975e6d2d5e5def4c1a7777e0))
+	ROM_LOAD16_BYTE("bi______.2_6",  0x040001, 0x010000,  CRC(5df850ec) SHA1(5b455f4cfb19c551723f7fd5f4f95e5420f8682f))
+	ROM_LOAD16_BYTE("bi______.2_7",  0x060000, 0x010000,  CRC(9ea394a2) SHA1(3b9840627f7676aa7872d2bc022406a4ced7958f))
+	ROM_LOAD16_BYTE("bi______.2_8",  0x060001, 0x010000,  CRC(4aa1d37d) SHA1(3c1a3ccacdc33cd4a54b7bbf06ea4c33868705f4))
+ROM_END
+
+ROM_START( v4bigfrtc )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("bi_20sb_.2_0",  0x00000, 0x10000,  CRC(8e646474) SHA1(8b72fba96947fb78a79997b37987eadec522cc4e))  // protocol and % key/20p
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("bi______.2_1",  0x000000, 0x010000,  CRC(22e7e736) SHA1(478abe8dc9e29b8ceccfac80ddaa5ce2727572cd))
+	ROM_LOAD16_BYTE("bi______.2_2",  0x000001, 0x010000,  CRC(9d139ae7) SHA1(fb38b3102355ee5f79f66410ce5a26f74296321a))
+	ROM_LOAD16_BYTE("bi______.2_3",  0x020000, 0x010000,  CRC(9f4c424d) SHA1(f20e5e6f43ac0d481b7f2d8ea421fa6b9fa92b38))
+	ROM_LOAD16_BYTE("bi______.2_4",  0x020001, 0x010000,  CRC(58f0dcb4) SHA1(79039d489f5ce3a1865fa92a2b6e8b002b63efcf))
+	ROM_LOAD16_BYTE("bi______.2_5",  0x040000, 0x010000,  CRC(512c6d1a) SHA1(1c9d04e7e59a95f6975e6d2d5e5def4c1a7777e0))
+	ROM_LOAD16_BYTE("bi______.2_6",  0x040001, 0x010000,  CRC(5df850ec) SHA1(5b455f4cfb19c551723f7fd5f4f95e5420f8682f))
+	ROM_LOAD16_BYTE("bi______.2_7",  0x060000, 0x010000,  CRC(9ea394a2) SHA1(3b9840627f7676aa7872d2bc022406a4ced7958f))
+	ROM_LOAD16_BYTE("bi______.2_8",  0x060001, 0x010000,  CRC(4aa1d37d) SHA1(3c1a3ccacdc33cd4a54b7bbf06ea4c33868705f4))
+ROM_END
+
+ROM_START( v4bubbnk )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("bu_20a__.4_0",  0x00000, 0x10000,  CRC(743a0c56) SHA1(6dfe6733d19b19fcb9be2472615a340237253966))  // Standard/20p
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("bu______.4_1",  0x000000, 0x010000,  CRC(1e85dd5d) SHA1(0f3c35d9f75d3495e2d0cc1fcf0e96dcbbeeacc8))
+	ROM_LOAD16_BYTE("bu______.4_2",  0x000001, 0x010000,  CRC(989db70a) SHA1(e44f8900392db51cc3f0a5bf0391bde0d71b9878))
+	ROM_LOAD16_BYTE("bu______.4_3",  0x020000, 0x010000,  CRC(b079fc12) SHA1(6cb736fbe07617eca3ea691e85ff17a0ae218faf))
+	ROM_LOAD16_BYTE("bu______.4_4",  0x020001, 0x010000,  CRC(7e22a7cf) SHA1(00f6a303684850e0a8a168d4a6da628bc19599ea))
+	ROM_LOAD16_BYTE("bu______.4_5",  0x040000, 0x010000,  CRC(225eff49) SHA1(015efc0f058172cc03f9e38794784e52c097e2bc))
+	ROM_LOAD16_BYTE("bu______.4_6",  0x040001, 0x010000,  CRC(84ce8822) SHA1(5b9b24bc5e586678d415c1234b8c870776f970cb))
+	ROM_LOAD16_BYTE("bu______.4_7",  0x060000, 0x010000,  CRC(a3b00c9f) SHA1(16d9f09a9c20a23521468ea332d19ec485e3606f))
+	ROM_LOAD16_BYTE("bu______.4_8",  0x060001, 0x010000,  CRC(7bd03d6e) SHA1(63802bc31115410f5021cdaca2ef832ace59288d))
+	ROM_LOAD16_BYTE("bu______.4_9",  0x080000, 0x010000,  CRC(18157aca) SHA1(e6666ecae620a9d8d3c9099f2d269a3cebd05d0f))
+	ROM_LOAD16_BYTE("bu______.4_a",  0x080001, 0x010000,  CRC(bc76817d) SHA1(418355740310d431a2803663b5138dff4b45452f))
+ROM_END
+
+ROM_START( v4bubbnka )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("bui20a__.4_0",  0x00000, 0x10000,  CRC(154263c0) SHA1(8207ce1876be443e2023554629c0de1117544170))  // Irish/20p
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("bu______.4_1",  0x000000, 0x010000,  CRC(1e85dd5d) SHA1(0f3c35d9f75d3495e2d0cc1fcf0e96dcbbeeacc8))
+	ROM_LOAD16_BYTE("bu______.4_2",  0x000001, 0x010000,  CRC(989db70a) SHA1(e44f8900392db51cc3f0a5bf0391bde0d71b9878))
+	ROM_LOAD16_BYTE("bu______.4_3",  0x020000, 0x010000,  CRC(b079fc12) SHA1(6cb736fbe07617eca3ea691e85ff17a0ae218faf))
+	ROM_LOAD16_BYTE("bu______.4_4",  0x020001, 0x010000,  CRC(7e22a7cf) SHA1(00f6a303684850e0a8a168d4a6da628bc19599ea))
+	ROM_LOAD16_BYTE("bu______.4_5",  0x040000, 0x010000,  CRC(225eff49) SHA1(015efc0f058172cc03f9e38794784e52c097e2bc))
+	ROM_LOAD16_BYTE("bu______.4_6",  0x040001, 0x010000,  CRC(84ce8822) SHA1(5b9b24bc5e586678d415c1234b8c870776f970cb))
+	ROM_LOAD16_BYTE("bu______.4_7",  0x060000, 0x010000,  CRC(a3b00c9f) SHA1(16d9f09a9c20a23521468ea332d19ec485e3606f))
+	ROM_LOAD16_BYTE("bu______.4_8",  0x060001, 0x010000,  CRC(7bd03d6e) SHA1(63802bc31115410f5021cdaca2ef832ace59288d))
+	ROM_LOAD16_BYTE("bu______.4_9",  0x080000, 0x010000,  CRC(18157aca) SHA1(e6666ecae620a9d8d3c9099f2d269a3cebd05d0f))
+	ROM_LOAD16_BYTE("bu______.4_a",  0x080001, 0x010000,  CRC(bc76817d) SHA1(418355740310d431a2803663b5138dff4b45452f))
+ROM_END
+
+ROM_START( v4bubbnkb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("bu_20ab_.4_0",  0x00000, 0x10000,  CRC(82be9bc5) SHA1(6bd5e08cd157c7c02259aa93ddbce19979dd85f0))  // protocol and % key/20p
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("bu______.4_1",  0x000000, 0x010000,  CRC(1e85dd5d) SHA1(0f3c35d9f75d3495e2d0cc1fcf0e96dcbbeeacc8))
+	ROM_LOAD16_BYTE("bu______.4_2",  0x000001, 0x010000,  CRC(989db70a) SHA1(e44f8900392db51cc3f0a5bf0391bde0d71b9878))
+	ROM_LOAD16_BYTE("bu______.4_3",  0x020000, 0x010000,  CRC(b079fc12) SHA1(6cb736fbe07617eca3ea691e85ff17a0ae218faf))
+	ROM_LOAD16_BYTE("bu______.4_4",  0x020001, 0x010000,  CRC(7e22a7cf) SHA1(00f6a303684850e0a8a168d4a6da628bc19599ea))
+	ROM_LOAD16_BYTE("bu______.4_5",  0x040000, 0x010000,  CRC(225eff49) SHA1(015efc0f058172cc03f9e38794784e52c097e2bc))
+	ROM_LOAD16_BYTE("bu______.4_6",  0x040001, 0x010000,  CRC(84ce8822) SHA1(5b9b24bc5e586678d415c1234b8c870776f970cb))
+	ROM_LOAD16_BYTE("bu______.4_7",  0x060000, 0x010000,  CRC(a3b00c9f) SHA1(16d9f09a9c20a23521468ea332d19ec485e3606f))
+	ROM_LOAD16_BYTE("bu______.4_8",  0x060001, 0x010000,  CRC(7bd03d6e) SHA1(63802bc31115410f5021cdaca2ef832ace59288d))
+	ROM_LOAD16_BYTE("bu______.4_9",  0x080000, 0x010000,  CRC(18157aca) SHA1(e6666ecae620a9d8d3c9099f2d269a3cebd05d0f))
+	ROM_LOAD16_BYTE("bu______.4_a",  0x080001, 0x010000,  CRC(bc76817d) SHA1(418355740310d431a2803663b5138dff4b45452f))
+ROM_END
+
+ROM_START( v4bubbnkc )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("bu_20ad_.4_0",  0x00000, 0x10000,  CRC(3f9febf7) SHA1(172e7e03d7b4c6fdda6bb8f3f5d93d3803f678c3))  // protocol/20p
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("bu______.4_1",  0x000000, 0x010000,  CRC(1e85dd5d) SHA1(0f3c35d9f75d3495e2d0cc1fcf0e96dcbbeeacc8))
+	ROM_LOAD16_BYTE("bu______.4_2",  0x000001, 0x010000,  CRC(989db70a) SHA1(e44f8900392db51cc3f0a5bf0391bde0d71b9878))
+	ROM_LOAD16_BYTE("bu______.4_3",  0x020000, 0x010000,  CRC(b079fc12) SHA1(6cb736fbe07617eca3ea691e85ff17a0ae218faf))
+	ROM_LOAD16_BYTE("bu______.4_4",  0x020001, 0x010000,  CRC(7e22a7cf) SHA1(00f6a303684850e0a8a168d4a6da628bc19599ea))
+	ROM_LOAD16_BYTE("bu______.4_5",  0x040000, 0x010000,  CRC(225eff49) SHA1(015efc0f058172cc03f9e38794784e52c097e2bc))
+	ROM_LOAD16_BYTE("bu______.4_6",  0x040001, 0x010000,  CRC(84ce8822) SHA1(5b9b24bc5e586678d415c1234b8c870776f970cb))
+	ROM_LOAD16_BYTE("bu______.4_7",  0x060000, 0x010000,  CRC(a3b00c9f) SHA1(16d9f09a9c20a23521468ea332d19ec485e3606f))
+	ROM_LOAD16_BYTE("bu______.4_8",  0x060001, 0x010000,  CRC(7bd03d6e) SHA1(63802bc31115410f5021cdaca2ef832ace59288d))
+	ROM_LOAD16_BYTE("bu______.4_9",  0x080000, 0x010000,  CRC(18157aca) SHA1(e6666ecae620a9d8d3c9099f2d269a3cebd05d0f))
+	ROM_LOAD16_BYTE("bu______.4_a",  0x080001, 0x010000,  CRC(bc76817d) SHA1(418355740310d431a2803663b5138dff4b45452f))
+ROM_END
+
+ROM_START( v4bubbnkd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("bu_20ak_.4_0",  0x00000, 0x10000,  CRC(c91b7c64) SHA1(7cb4027e43e524792e1b5e523857f5d52cc7e7d2))  // % Key/20p
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("bu______.4_1",  0x000000, 0x010000,  CRC(1e85dd5d) SHA1(0f3c35d9f75d3495e2d0cc1fcf0e96dcbbeeacc8))
+	ROM_LOAD16_BYTE("bu______.4_2",  0x000001, 0x010000,  CRC(989db70a) SHA1(e44f8900392db51cc3f0a5bf0391bde0d71b9878))
+	ROM_LOAD16_BYTE("bu______.4_3",  0x020000, 0x010000,  CRC(b079fc12) SHA1(6cb736fbe07617eca3ea691e85ff17a0ae218faf))
+	ROM_LOAD16_BYTE("bu______.4_4",  0x020001, 0x010000,  CRC(7e22a7cf) SHA1(00f6a303684850e0a8a168d4a6da628bc19599ea))
+	ROM_LOAD16_BYTE("bu______.4_5",  0x040000, 0x010000,  CRC(225eff49) SHA1(015efc0f058172cc03f9e38794784e52c097e2bc))
+	ROM_LOAD16_BYTE("bu______.4_6",  0x040001, 0x010000,  CRC(84ce8822) SHA1(5b9b24bc5e586678d415c1234b8c870776f970cb))
+	ROM_LOAD16_BYTE("bu______.4_7",  0x060000, 0x010000,  CRC(a3b00c9f) SHA1(16d9f09a9c20a23521468ea332d19ec485e3606f))
+	ROM_LOAD16_BYTE("bu______.4_8",  0x060001, 0x010000,  CRC(7bd03d6e) SHA1(63802bc31115410f5021cdaca2ef832ace59288d))
+	ROM_LOAD16_BYTE("bu______.4_9",  0x080000, 0x010000,  CRC(18157aca) SHA1(e6666ecae620a9d8d3c9099f2d269a3cebd05d0f))
+	ROM_LOAD16_BYTE("bu______.4_a",  0x080001, 0x010000,  CRC(bc76817d) SHA1(418355740310d431a2803663b5138dff4b45452f))
+ROM_END
+
+ROM_START( v4mazbel )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("maz20dy2.5_0",  0x00000, 0x10000,  CRC(e43220df) SHA1(07b58cc40fa490564a6bf8add65a3b3c4d9b1164))  // protocol % key/20p/
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("maz20__2.5_1",  0x000000, 0x010000,  CRC(6d3b4dbd) SHA1(79479c458395fa718f00e4c1547b186a85153848))
+	ROM_LOAD16_BYTE("maz20__2.5_2",  0x000001, 0x010000,  CRC(40074cc3) SHA1(498beeed1a1f86e535474a25f3ec73c1fdb004b9))
+	ROM_LOAD16_BYTE("maz20__2.5_3",  0x020000, 0x010000,  CRC(b78bc8a9) SHA1(7436cb9e67a3d72b36cbdd92d8aa3e26e6b7b40d))
+	ROM_LOAD16_BYTE("maz20__2.5_4",  0x020001, 0x010000,  CRC(116a6f65) SHA1(10fa599b620f6d595b27723f7ae1c36f6ff61f7d))
+ROM_END
+
+ROM_START( v4mazbel15 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("maz20__1.5x0",  0x00000, 0x10000,  CRC(06f95de7) SHA1(6ee8a345b12c9993513dda686ddb8c89d847976f))  // standard/20p
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("maz20__1.5x1",  0x000000, 0x010000,  CRC(a4be5a3f) SHA1(e510a54c7d7551dbb2c5dd450c921fd0e3649db6))
+	ROM_LOAD16_BYTE("maz20__1.5x2",  0x000001, 0x010000,  CRC(261466aa) SHA1(ce61f7f1af9abed6e9fad778a270b3c4c167d401))
+	ROM_LOAD16_BYTE("maz20__1.5x3",  0x020000, 0x010000,  CRC(a9f02fc6) SHA1(d892bcd3e755c623bb7f2ff4db4876c091c5ae30))
+	ROM_LOAD16_BYTE("maz20__1.5x4",  0x020001, 0x010000,  CRC(b5f333b6) SHA1(b848f9d6f39e102d72992d56836cd5b8c16b5554))
+ROM_END
+
+ROM_START( v4mazbel15a )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("maz20dy1.5x0",  0x00000, 0x10000,  CRC(f07dca74) SHA1(f5c2658911a3d8d082ca3f2289b69e767f5a80f4))  // protocol % key/20p/
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("maz20__1.5x1",  0x000000, 0x010000,  CRC(a4be5a3f) SHA1(e510a54c7d7551dbb2c5dd450c921fd0e3649db6))
+	ROM_LOAD16_BYTE("maz20__1.5x2",  0x000001, 0x010000,  CRC(261466aa) SHA1(ce61f7f1af9abed6e9fad778a270b3c4c167d401))
+	ROM_LOAD16_BYTE("maz20__1.5x3",  0x020000, 0x010000,  CRC(a9f02fc6) SHA1(d892bcd3e755c623bb7f2ff4db4876c091c5ae30))
+	ROM_LOAD16_BYTE("maz20__1.5x4",  0x020001, 0x010000,  CRC(b5f333b6) SHA1(b848f9d6f39e102d72992d56836cd5b8c16b5554))
+ROM_END
+
+
+ROM_START( v4shpwnd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("sw_20___.2_0",  0x00000, 0x10000,  CRC(c1b49d81) SHA1(dcb077734beb814002046d36091a6407644c1393))  // Standard/20p/
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+ROM_START( v4shpwnda )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sw_10___.2_0", 0x0000, 0x010000, CRC(1377a409) SHA1(632bae8bf70270fb13caabbc491f81f8b6589ece) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+ROM_START( v4shpwndb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sw_10_b_.2_0", 0x0000, 0x010000, CRC(e5f3339a) SHA1(67d79c2939ad0c566e05e470672d7153fdc2fbd5) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+ROM_START( v4shpwndc )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sw_10_d_.2_0", 0x0000, 0x010000, CRC(58d243a8) SHA1(1f718a153e2a42893c2dcecddf857c93872a780d) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+ROM_START( v4shpwndd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sw_10_k_.2_0", 0x0000, 0x010000, CRC(ae56d43b) SHA1(ad73f7ad4c142d3ad629b0df46985456a2f8ebc8) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+ROM_START( v4shpwnde )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sw_20_b_.2_0", 0x0000, 0x010000, CRC(37300a12) SHA1(34abe1b28afe9c36810f9c7eba356720d9ff53de) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+ROM_START( v4shpwndf )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sw_20_d_.2_0", 0x0000, 0x010000, CRC(8a117a20) SHA1(697d97155b3c4f515988390997064ace7402959e) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+ROM_START( v4shpwndg )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sw_20_k_.2_0", 0x0000, 0x010000, CRC(7c95edb3) SHA1(4a8208c2786eed73a4ade67209a5cb66ba8c4ed8) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+ROM_START( v4shpwndh )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sw_20bg_.2_0", 0x0000, 0x010000, CRC(48e1a50c) SHA1(7f1aaa3207b86996cb1804ff82685723839e7c7c) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+ROM_START( v4shpwndi )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sw_20bt_.2_0", 0x0000, 0x010000, CRC(feaaa80f) SHA1(23ec154fe0fdb4bbb558960d700c94674bb4a144) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+ROM_START( v4shpwndj )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sw_xc___.2_0", 0x0000, 0x010000, CRC(f108aa4a) SHA1(f27456a22b781df3103cc7b7f35fb08bb547e864) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+ROM_START( v4shpwndk )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sw_xc_b_.2_0", 0x0000, 0x010000, CRC(078c3dd9) SHA1(07515a2476ae15c780da2de58de8b17f30c0ebdf) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+ROM_START( v4shpwndl )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sw_xc_d_.2_0", 0x0000, 0x010000, CRC(baad4deb) SHA1(ad3d90eefdad4e6baa10558ed5a1415ed94742b6) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+ROM_START( v4shpwndm )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sw_xc_k_.2_0", 0x0000, 0x010000, CRC(4c29da78) SHA1(0431016a0a13d97fc833e31bc2897e7abb6a5047) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE("sw______.2_1",  0x000000, 0x010000,  CRC(3346ee38) SHA1(29659ba8173b86bb52057f75dc874465048ef6d9))
+	ROM_LOAD16_BYTE("sw______.2_2",  0x000001, 0x010000,  CRC(2c5293c8) SHA1(e0b5fa629e8dbbc6164f16cbbe19d0e42467d281))
+	ROM_LOAD16_BYTE("sw______.2_3",  0x020000, 0x010000,  CRC(09144ac0) SHA1(d55658a361ebec0e054e3a9d99eba61c81fde619))
+	ROM_LOAD16_BYTE("sw______.2_4",  0x020001, 0x010000,  CRC(a23db51a) SHA1(9516a9655c5f7f000475df03f05f332c5ec09959))
+ROM_END
+
+/* Nova */
+
+ROM_START( v4cybcas )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ccd_____.6_0", 0x0000, 0x010000, CRC(93aa1a3d) SHA1(dce4cc4bfc616163ca240c417d1ef9a0a19e5901) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ccd_____.6_1", 0x000001, 0x080000, CRC(58c8ae96) SHA1(9f3aea47ae014c61bb2b75664210a3609996f983) )
+	ROM_LOAD16_BYTE( "ccd_____.6_2", 0x000000, 0x080000, CRC(f0556749) SHA1(2f35a9f9672219001c2a48d7f103ac99e1b21b32) )
+	ROM_LOAD16_BYTE( "ccd_____.6_3", 0x100001, 0x080000, CRC(4d2f5485) SHA1(a8c9b5843384ce55a10531b82766f5498dc0d334) )
+	ROM_LOAD16_BYTE( "ccd_____.6_4", 0x100000, 0x080000, CRC(87b29468) SHA1(89a3855754e8a720ca76fa16b11f791ade75fb78) )
+	ROM_LOAD16_BYTE( "ccd_____.6_5", 0x200001, 0x080000, CRC(bd8be9ff) SHA1(c5d620774e476e6ec00876e513ff838af102ecc9) )
+	ROM_LOAD16_BYTE( "ccd_____.6_6", 0x200000, 0x080000, CRC(faf65e25) SHA1(f50369348740ba4c878455c108ac3e8d2262ef5e) )
+	ROM_LOAD16_BYTE( "ccd_____.6_7", 0x300001, 0x080000, CRC(4cd1461c) SHA1(00379212130d5e9c1c364191f67a35cc5eca8b72) )
+	ROM_LOAD16_BYTE( "ccd_____.6_8", 0x300000, 0x080000, CRC(08ce378f) SHA1(035b0ff4d18c09a385002db73c54b8dac92dfa8a) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4mdiceger )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mdd4_0.bin", 0x0000, 0x010000, CRC(0d868466) SHA1(3cea446f094ae3b4f56163ccf01cd31c15dca03f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md41.p1", 0x000001, 0x080000, CRC(9567347f) SHA1(5188b3f359ff26c0854d5745df37575851502ae9) )
+	ROM_LOAD16_BYTE( "md42.p2", 0x000000, 0x080000, CRC(e0dad693) SHA1(9768331a4a776906935b3c5501b68cb4dd1bd41f) )
+	ROM_LOAD16_BYTE( "md43.p3", 0x100001, 0x080000, CRC(9bceb3f6) SHA1(5be84d5f1635f80a9fe8072c2d94012ed00d97be) )
+	ROM_LOAD16_BYTE( "md44.p4", 0x100000, 0x080000, CRC(54b8fbfa) SHA1(ca2fb67972507a2eb33d2800a3b2d45d3ee49289) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "md41snd.p1", 0x000000, 0x080000, CRC(7a3ba770) SHA1(e620f521d16b39be9b41b934435812afff3993b2) )
+	ROM_LOAD( "md42snd.p2", 0x080000, 0x080000, CRC(8ebc7329) SHA1(82ce25c1486a8619355f363125a26d8cdeb05d33) )
+	ROM_LOAD( "md43snd.p3", 0x100000, 0x080000, CRC(14f4d838) SHA1(0508890a9884fbef0e194a38fe3afc5cf5282091) )
+ROM_END
+
+
+ROM_START( v4missis )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mldsf___.6_0", 0x0000, 0x010000, CRC(3f0fe40e) SHA1(6fd9ddede5f11c35d47c7ddd360b0021267e7e3f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mld_____.6_1", 0x000000, 0x080000, CRC(44e26e6e) SHA1(ba96757b74e75d094b6cda340c78754f1b8f6a7c) )
+	ROM_LOAD16_BYTE( "mld_____.6_2", 0x000001, 0x080000, CRC(e9219fff) SHA1(80c0211b98c4200ad9512e89b067018ce8600494) )
+	ROM_LOAD16_BYTE( "mld_____.6_3", 0x100000, 0x080000, CRC(680bd284) SHA1(33dfd0cb396c1466c2a5cfc474756b8a2d966518) )
+	ROM_LOAD16_BYTE( "mld_____.6_4", 0x100001, 0x080000, CRC(0e21022b) SHA1(30465321a976064f7841b2c3314244b744a45092) )
+	ROM_LOAD16_BYTE( "mld_____.6_5", 0x200000, 0x080000, CRC(cd6c39d2) SHA1(c4d4b5c7a1f3dcfdc464fff29f10ccee932f265a) )
+	ROM_LOAD16_BYTE( "mld_____.6_6", 0x200001, 0x080000, CRC(5ad997a3) SHA1(0fd75b4a9b5991fda9cc3373b86f466492c3b4bb) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mld_snd_.1_1", 0x000000, 0x080000, CRC(8c26fe12) SHA1(0532126d8e283b4567a4cdf2bb807f5471c84832) )
+	ROM_LOAD( "mld_snd_.1_2", 0x080000, 0x080000, CRC(9ab841b6) SHA1(7828c6144777621859b85a3ec92760d353576527) )
+	ROM_LOAD( "mld_snd_.1_3", 0x100000, 0x080000, CRC(3f068632) SHA1(5e43da287b3aa163493c1be03ebee28ef58c44a1) )
+	ROM_LOAD( "mld_snd_.1_4", 0x180000, 0x080000, CRC(f78f7221) SHA1(dac88abee6a5fdf7b69c5d39345ee05c1ac47314) )
+ROM_END
+
+ROM_START( v4picdil )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "pcdsf___.a_0", 0x0000, 0x010000, CRC(45a15082) SHA1(d7655722c7ad9f3b1b2663d85287ae185917d677) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "pcd_____.a_1", 0x000001, 0x080000, CRC(0ed561d4) SHA1(899c76d2a2352988a01bece2a229deb934a00892) )
+	ROM_LOAD16_BYTE( "pcd_____.a_2", 0x000000, 0x080000, CRC(bffe3863) SHA1(ea6fdcce470e8a50c35f43fd86e39524be2db3a3) )
+	ROM_LOAD16_BYTE( "pcd_____.a_3", 0x100001, 0x080000, CRC(3b64a328) SHA1(a9fa9dc30b352388906e6021bc0d1ad7c3a28746) )
+	ROM_LOAD16_BYTE( "pcd_____.a_4", 0x100000, 0x080000, CRC(25faba03) SHA1(572aaee3af3b915294ba057b7ceb653dd135098b) )
+	ROM_LOAD16_BYTE( "pcd_____.a_5", 0x200001, 0x080000, CRC(275f3c1c) SHA1(1d0f8f7d0388d5072ae404f10b2481153979a217) )
+	ROM_LOAD16_BYTE( "pcd_____.a_6", 0x200000, 0x080000, CRC(148ecba0) SHA1(2ae0f5529fa3951025539fe19f4e8fdf10f13374) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4picdila )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "pcdsf__e.a_0", 0x0000, 0x010000, CRC(0ed1c7af) SHA1(c19ff141fba7fd1f2cf0b152e3c6df61c6b27b46) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "pcd_____.a_1", 0x000001, 0x080000, CRC(0ed561d4) SHA1(899c76d2a2352988a01bece2a229deb934a00892) )
+	ROM_LOAD16_BYTE( "pcd_____.a_2", 0x000000, 0x080000, CRC(bffe3863) SHA1(ea6fdcce470e8a50c35f43fd86e39524be2db3a3) )
+	ROM_LOAD16_BYTE( "pcd_____.a_3", 0x100001, 0x080000, CRC(3b64a328) SHA1(a9fa9dc30b352388906e6021bc0d1ad7c3a28746) )
+	ROM_LOAD16_BYTE( "pcd_____.a_4", 0x100000, 0x080000, CRC(25faba03) SHA1(572aaee3af3b915294ba057b7ceb653dd135098b) )
+	ROM_LOAD16_BYTE( "pcd_____.a_5", 0x200001, 0x080000, CRC(275f3c1c) SHA1(1d0f8f7d0388d5072ae404f10b2481153979a217) )
+	ROM_LOAD16_BYTE( "pcd_____.a_6", 0x200000, 0x080000, CRC(148ecba0) SHA1(2ae0f5529fa3951025539fe19f4e8fdf10f13374) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+ROM_START( v4picdilz )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "pcdsf2_interface_a0.bin", 0x0000, 0x010000, CRC(5e007ac4) SHA1(82fd17da416c29b2e4b75f24bc8d415e57c0e94b))
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "piccadilly_vid_a1_ic15.bin", 0x000000, 0x080000, CRC(22f9ad51) SHA1(f63923e346519833f71a1644d4e504d2f93a173f) )
+	ROM_LOAD16_BYTE( "piccadilly_vid_a2_ic7.bin",  0x000001, 0x080000, CRC(6de3bae1) SHA1(c9fae9bb694341b1cca05ae143beb04989326897) )
+	ROM_LOAD16_BYTE( "pcd_____.a_3", 0x100001, 0x080000, CRC(3b64a328) SHA1(a9fa9dc30b352388906e6021bc0d1ad7c3a28746) )
+	ROM_LOAD16_BYTE( "pcd_____.a_4", 0x100000, 0x080000, CRC(25faba03) SHA1(572aaee3af3b915294ba057b7ceb653dd135098b) )
+	ROM_LOAD16_BYTE( "pcd_____.a_5", 0x200001, 0x080000, CRC(275f3c1c) SHA1(1d0f8f7d0388d5072ae404f10b2481153979a217) )
+	ROM_LOAD16_BYTE( "pcd_____.a_6", 0x200000, 0x080000, CRC(148ecba0) SHA1(2ae0f5529fa3951025539fe19f4e8fdf10f13374) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "pcdsnd_v1_p1.bin", 0x000000, 0x080000, CRC(01c0bec3) SHA1(a755f939d02500f0a03e399bbf7f842173bf5a71) )
+	ROM_LOAD( "pcdsnd_v1_p2.bin", 0x080000, 0x080000, CRC(a9f66e67) SHA1(eba1ff2023356face1d9a6be93417b54a132fe6f) )
+	ROM_LOAD( "pcdsnd_v1_p3.bin", 0x100000, 0x080000, BAD_DUMP CRC(d15ea1bd) SHA1(f47e4d901a89ccf83784e582414f3dce08fc4e18) ) // mostly empty, corrupt?
+	ROM_LOAD( "pcdsnd_v1_p4.bin", 0x180000, 0x080000, CRC(275cdbe0) SHA1(7239d48c4755072a32c237079e623baa95a32593) )
+ROM_END
+
+
+ROM_START( v4big40 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b4_sja__.3_0", 0x0000, 0x010000, CRC(afdd005e) SHA1(71730b55212fbfc1905caf0d2842d495741305f1) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "b4______.3_1", 0x000001, 0x080000, CRC(c388e5a9) SHA1(baafe2da91891f288debd89907d36438494e876a) )
+	ROM_LOAD16_BYTE( "b4______.3_2", 0x000000, 0x080000, CRC(cc3ab5c3) SHA1(a3778b462a823fd73c1a3463c53ef0537e8d5ed4) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "b4__snd_.1_a", 0x0000, 0x080000, CRC(2d630b87) SHA1(e4be02a1356735c47934f8f30e1e2462bf28968c) )
+ROM_END
+
+ROM_START( v4big40a )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b4_sja__.4_0", 0x0000, 0x010000, CRC(4375e090) SHA1(923eadc4cf322e544102cede2eb7a487354981b5) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "b4______.4_1", 0x000001, 0x080000, CRC(fc33c0fc) SHA1(838a7ef4252f9f736639858fe97a4982a89be09f) )
+	ROM_LOAD16_BYTE( "b4______.4_2", 0x000000, 0x080000, CRC(f2211865) SHA1(5bcb95a079f57305d3e58fae3899bceec211f44a) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "b4__snd_.1_a", 0x0000, 0x080000, CRC(2d630b87) SHA1(e4be02a1356735c47934f8f30e1e2462bf28968c) )
+ROM_END
+
+ROM_START( v4big40b )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b4_sja__.6_0", 0x0000, 0x010000, CRC(f5742e6c) SHA1(42b0b22d2da690b24166fe103a3453dcfc7beacc) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "b4______.6_1", 0x000001, 0x080000, CRC(75532ad3) SHA1(0584261faede35f6e846ee398081fac66aea8368) )
+	ROM_LOAD16_BYTE( "b4______.6_2", 0x000000, 0x080000, CRC(03ef74c5) SHA1(fa5d27b0e94c8d05f1c50b28b96f7a4ae3ecda4a) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "b4__snd_.1_a", 0x0000, 0x080000, CRC(2d630b87) SHA1(e4be02a1356735c47934f8f30e1e2462bf28968c) )
+ROM_END
+
+ROM_START( v4big40c )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b4_sja_n.6_0", 0x0000, 0x010000, CRC(be04b941) SHA1(8d0561a623df6fc447fbcbbc1934425b23df4f58) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "b4______.6_1", 0x000001, 0x080000, CRC(75532ad3) SHA1(0584261faede35f6e846ee398081fac66aea8368) )
+	ROM_LOAD16_BYTE( "b4______.6_2", 0x000000, 0x080000, CRC(03ef74c5) SHA1(fa5d27b0e94c8d05f1c50b28b96f7a4ae3ecda4a) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "b4__snd_.1_a", 0x0000, 0x080000, CRC(2d630b87) SHA1(e4be02a1356735c47934f8f30e1e2462bf28968c) )
+ROM_END
+
+ROM_START( v4big40d )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b4_sjad_.6_0", 0x0000, 0x010000, CRC(bed1c9cd) SHA1(f4cfb305e4ec2c4c1b55356ce32745875f1641d9) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "b4______.6_1", 0x000001, 0x080000, CRC(75532ad3) SHA1(0584261faede35f6e846ee398081fac66aea8368) )
+	ROM_LOAD16_BYTE( "b4______.6_2", 0x000000, 0x080000, CRC(03ef74c5) SHA1(fa5d27b0e94c8d05f1c50b28b96f7a4ae3ecda4a) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "b4__snd_.1_a", 0x0000, 0x080000, CRC(2d630b87) SHA1(e4be02a1356735c47934f8f30e1e2462bf28968c) )
+ROM_END
+
+ROM_START( v4big40e )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b4_sjadn.6_0", 0x0000, 0x010000, CRC(f5a15ee0) SHA1(d61fc54724d579d7a7055a1cfe20b55e4e59a653) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "b4______.6_1", 0x000001, 0x080000, CRC(75532ad3) SHA1(0584261faede35f6e846ee398081fac66aea8368) )
+	ROM_LOAD16_BYTE( "b4______.6_2", 0x000000, 0x080000, CRC(03ef74c5) SHA1(fa5d27b0e94c8d05f1c50b28b96f7a4ae3ecda4a) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "b4__snd_.1_a", 0x0000, 0x080000, CRC(2d630b87) SHA1(e4be02a1356735c47934f8f30e1e2462bf28968c) )
+ROM_END
+
+ROM_START( v4big40f )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b4_sjmb_.6_0", 0x0000, 0x010000, CRC(7472fa9c) SHA1(3315b37b1a221e40e6122612c8ee8a27b6131947) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "b4______.6_1", 0x000001, 0x080000, CRC(75532ad3) SHA1(0584261faede35f6e846ee398081fac66aea8368) )
+	ROM_LOAD16_BYTE( "b4______.6_2", 0x000000, 0x080000, CRC(03ef74c5) SHA1(fa5d27b0e94c8d05f1c50b28b96f7a4ae3ecda4a) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "b4__snd_.1_a", 0x0000, 0x080000, CRC(2d630b87) SHA1(e4be02a1356735c47934f8f30e1e2462bf28968c) )
+ROM_END
+
+ROM_START( v4big40g )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b4_sjs__.6_0", 0x0000, 0x010000, CRC(0092b6a9) SHA1(cead4988d2dc6b0e8724c7b1c6eb416317a9b7c4) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "b4______.6_1", 0x000001, 0x080000, CRC(75532ad3) SHA1(0584261faede35f6e846ee398081fac66aea8368) )
+	ROM_LOAD16_BYTE( "b4______.6_2", 0x000000, 0x080000, CRC(03ef74c5) SHA1(fa5d27b0e94c8d05f1c50b28b96f7a4ae3ecda4a) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "b4__snd_.1_a", 0x0000, 0x080000, CRC(2d630b87) SHA1(e4be02a1356735c47934f8f30e1e2462bf28968c) )
+ROM_END
+
+ROM_START( v4big40h )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b4_sjs_n.6_0", 0x0000, 0x010000, CRC(4be22184) SHA1(5b779d8fe85db719b539f93ff05a6e3568968557) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "b4______.6_1", 0x000001, 0x080000, CRC(75532ad3) SHA1(0584261faede35f6e846ee398081fac66aea8368) )
+	ROM_LOAD16_BYTE( "b4______.6_2", 0x000000, 0x080000, CRC(03ef74c5) SHA1(fa5d27b0e94c8d05f1c50b28b96f7a4ae3ecda4a) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "b4__snd_.1_a", 0x0000, 0x080000, CRC(2d630b87) SHA1(e4be02a1356735c47934f8f30e1e2462bf28968c) )
+ROM_END
+
+ROM_START( v4big40i )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b4_sjsb_.6_0", 0x0000, 0x010000, CRC(f616213a) SHA1(bcfc7fd1639ed423faa32d066c7f19877e4d1bc2) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "b4______.6_1", 0x000001, 0x080000, CRC(75532ad3) SHA1(0584261faede35f6e846ee398081fac66aea8368) )
+	ROM_LOAD16_BYTE( "b4______.6_2", 0x000000, 0x080000, CRC(03ef74c5) SHA1(fa5d27b0e94c8d05f1c50b28b96f7a4ae3ecda4a) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "b4__snd_.1_a", 0x0000, 0x080000, CRC(2d630b87) SHA1(e4be02a1356735c47934f8f30e1e2462bf28968c) )
+ROM_END
+
+ROM_START( v4big40j )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b4_sjsbn.6_0", 0x0000, 0x010000, CRC(bd66b617) SHA1(522c0903405f1a97c140c2aaef543aff2057e6ba) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "b4______.6_1", 0x000001, 0x080000, CRC(75532ad3) SHA1(0584261faede35f6e846ee398081fac66aea8368) )
+	ROM_LOAD16_BYTE( "b4______.6_2", 0x000000, 0x080000, CRC(03ef74c5) SHA1(fa5d27b0e94c8d05f1c50b28b96f7a4ae3ecda4a) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "b4__snd_.1_a", 0x0000, 0x080000, CRC(2d630b87) SHA1(e4be02a1356735c47934f8f30e1e2462bf28968c) )
+ROM_END
+
+ROM_START( v4big40k )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b4_sjsd_.6_0", 0x0000, 0x010000, CRC(4b375108) SHA1(77e5a59ca524550c68231cf64387e8f206f97393) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "b4______.6_1", 0x000001, 0x080000, CRC(75532ad3) SHA1(0584261faede35f6e846ee398081fac66aea8368) )
+	ROM_LOAD16_BYTE( "b4______.6_2", 0x000000, 0x080000, CRC(03ef74c5) SHA1(fa5d27b0e94c8d05f1c50b28b96f7a4ae3ecda4a) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "b4__snd_.1_a", 0x0000, 0x080000, CRC(2d630b87) SHA1(e4be02a1356735c47934f8f30e1e2462bf28968c) )
+ROM_END
+
+
+ROM_START( v4bulblx )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "bv_50___.2_0", 0x0000, 0x010000, CRC(615f9772) SHA1(56bc2c78c8b50b7250906ad43211f26c2e7e17b8) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "bv_50___.2_1", 0x000000, 0x010000, CRC(bb80cd18) SHA1(7e16100c30fe8d6feb1ac206447269e9c29489a5) )
+	ROM_LOAD16_BYTE( "bv_50___.2_2", 0x000001, 0x010000, CRC(2a18b8dc) SHA1(c2fccc7eae41176941ec15c421430b8bb20f72bd) )
+	ROM_LOAD16_BYTE( "bv______.2_3", 0x020000, 0x010000, CRC(d249b9dd) SHA1(b624759b10ac12146e6026e52d5d96fe4f7663b3) )
+	ROM_LOAD16_BYTE( "bv______.2_4", 0x020001, 0x010000, CRC(f5fffa95) SHA1(17c63a7e83feb0cafca34c30b334db082bb2c321) )
+	ROM_LOAD16_BYTE( "bv______.2_5", 0x040000, 0x010000, CRC(c5775387) SHA1(b301392ae39298284ae256c819877ae287861cc8) )
+	ROM_LOAD16_BYTE( "bv______.2_6", 0x040001, 0x010000, CRC(4443fddc) SHA1(fb4972620f9aa07f8bd62701f64b7902567d34db) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4bulblxa )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "bv_50_d_.2_0", 0x0000, 0x010000, CRC(2afa70d3) SHA1(11da4db50162054deb753ab85d11566afef2b801) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "bv_50___.2_1", 0x000000, 0x010000, CRC(bb80cd18) SHA1(7e16100c30fe8d6feb1ac206447269e9c29489a5) )
+	ROM_LOAD16_BYTE( "bv_50___.2_2", 0x000001, 0x010000, CRC(2a18b8dc) SHA1(c2fccc7eae41176941ec15c421430b8bb20f72bd) )
+	ROM_LOAD16_BYTE( "bv______.2_3", 0x020000, 0x010000, CRC(d249b9dd) SHA1(b624759b10ac12146e6026e52d5d96fe4f7663b3) )
+	ROM_LOAD16_BYTE( "bv______.2_4", 0x020001, 0x010000, CRC(f5fffa95) SHA1(17c63a7e83feb0cafca34c30b334db082bb2c321) )
+	ROM_LOAD16_BYTE( "bv______.2_5", 0x040000, 0x010000, CRC(c5775387) SHA1(b301392ae39298284ae256c819877ae287861cc8) )
+	ROM_LOAD16_BYTE( "bv______.2_6", 0x040001, 0x010000, CRC(4443fddc) SHA1(fb4972620f9aa07f8bd62701f64b7902567d34db) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4bulblxb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "bv_1p___.2_0", 0x0000, 0x010000, CRC(f3101261) SHA1(e2c82222e3384620f52e15350ab38e62beabe1b3) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "bv_1p___.2_1", 0x000000, 0x010000, CRC(568ea314) SHA1(fa65f2cc4734b9987a153fbf1ac4b32cd0fe4f32) )
+	ROM_LOAD16_BYTE( "bv_1p___.2_2", 0x000001, 0x010000, CRC(b91f8c3b) SHA1(82e1582f75595283a4ea9f2dc39e0d5a0d5ccb57) )
+	ROM_LOAD16_BYTE( "bv______.2_3", 0x020000, 0x010000, CRC(d249b9dd) SHA1(b624759b10ac12146e6026e52d5d96fe4f7663b3) )
+	ROM_LOAD16_BYTE( "bv______.2_4", 0x020001, 0x010000, CRC(f5fffa95) SHA1(17c63a7e83feb0cafca34c30b334db082bb2c321) )
+	ROM_LOAD16_BYTE( "bv______.2_5", 0x040000, 0x010000, CRC(c5775387) SHA1(b301392ae39298284ae256c819877ae287861cc8) )
+	ROM_LOAD16_BYTE( "bv______.2_6", 0x040001, 0x010000, CRC(4443fddc) SHA1(fb4972620f9aa07f8bd62701f64b7902567d34db) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4bulblxc )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "bv_1p_d_.2_0", 0x0000, 0x010000, CRC(b8b5f5c0) SHA1(84bf9b5a3ca5ea7eae1ab97af481206fb87bd2c5) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "bv_1p___.2_1", 0x000000, 0x010000, CRC(568ea314) SHA1(fa65f2cc4734b9987a153fbf1ac4b32cd0fe4f32) )
+	ROM_LOAD16_BYTE( "bv_1p___.2_2", 0x000001, 0x010000, CRC(b91f8c3b) SHA1(82e1582f75595283a4ea9f2dc39e0d5a0d5ccb57) )
+	ROM_LOAD16_BYTE( "bv______.2_3", 0x020000, 0x010000, CRC(d249b9dd) SHA1(b624759b10ac12146e6026e52d5d96fe4f7663b3) )
+	ROM_LOAD16_BYTE( "bv______.2_4", 0x020001, 0x010000, CRC(f5fffa95) SHA1(17c63a7e83feb0cafca34c30b334db082bb2c321) )
+	ROM_LOAD16_BYTE( "bv______.2_5", 0x040000, 0x010000, CRC(c5775387) SHA1(b301392ae39298284ae256c819877ae287861cc8) )
+	ROM_LOAD16_BYTE( "bv______.2_6", 0x040001, 0x010000, CRC(4443fddc) SHA1(fb4972620f9aa07f8bd62701f64b7902567d34db) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+ROM_START( v4cshinf )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_20s__.4_0", 0x0000, 0x010000, CRC(7a62c68b) SHA1(b892e023cd5ec2a508d36075ba5a96320408a4ab) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfa )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_05a__.4_0", 0x0000, 0x010000, CRC(3426fb02) SHA1(84be34a727444232c595c7adaa0a1d733b5416a3) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_10a__.4_0", 0x0000, 0x010000, CRC(5d4767c6) SHA1(291cf48c387fc515dce6eb22b1b38aaa65aec4ac) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+ROM_START( v4cshinfd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_20a__.4_0", 0x0000, 0x010000, CRC(8f845e4e) SHA1(1b8e46fed36db1b1539df3e28fcbb739079d3960) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfe )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_20bg_.4_0", 0x0000, 0x010000, CRC(f337fe06) SHA1(eef073d04a08347ad4814cf0d15615d45ecc8314) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinff )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_20bgp.4_0", 0x0000, 0x010000, CRC(65d6d05c) SHA1(3d0bd44cb692ae54ba0b2186d645124dc12dc5b3) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfg )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_20bt_.4_0", 0x0000, 0x010000, CRC(457cf305) SHA1(122e7f494043ebba01b5b827409d419ac54b240e) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfh )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_20btp.4_0", 0x0000, 0x010000, CRC(d39ddd5f) SHA1(6c97f3c19aea51efec4e510c46b98fbf3a2356a5) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfi )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_20sb_.4_0", 0x0000, 0x010000, CRC(8ce65118) SHA1(57207f1ef7e98eac7f31671789fb1e01e87c2aa0) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfj )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_20sbp.4_0", 0x0000, 0x010000, CRC(1a077f42) SHA1(141f7c3708bde43302a68df65d74d4a2e7296a05) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfk )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_20sd_.4_0", 0x0000, 0x010000, CRC(31c7212a) SHA1(b34aee87d4be460f47c894807ef877700b6be60f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfl )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_20sk_.4_0", 0x0000, 0x010000, CRC(c743b6b9) SHA1(0ef3de1663527a770066e872699ee281f1af21eb) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfm )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_xea__.4_0", 0x0000, 0x010000, CRC(bf386985) SHA1(a7eec0d70bc0795f537ec0975dc251739b86c3ca) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfn )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_xea_p.4_0", 0x0000, 0x010000, CRC(29d947df) SHA1(b08ca18442a701eb6a6f1ffc868333e65aa4aeb2) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfo )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_xeab_.4_0", 0x0000, 0x010000, CRC(49bcfe16) SHA1(0feab2f177ef6bd1d1c7ae9507a247c7afab7e97) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfp )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_xead_.4_0", 0x0000, 0x010000, CRC(f49d8e24) SHA1(f24b41ae866b324af3605f1bc121cd445b9ecb8c) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfq )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_xeak_.4_0", 0x0000, 0x010000, CRC(021919b7) SHA1(d8176be8b4548a5b61af415e7b7d0d1c8742592b) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfr )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_xes__.4_0", 0x0000, 0x010000, CRC(4adef140) SHA1(1003e666532fd773617d4ed30380eda0089027fe) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinfs )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ci_xesd_.4_0", 0x0000, 0x010000, CRC(017b16e1) SHA1(c352c7f635ece2faceb2f3ee6154c9fed86ddc6f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+
+
+ROM_START( v4cshinfu )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ciixea__.4_0", 0x0000, 0x010000, CRC(de400613) SHA1(b353c47b01c3918677f1a2c302171bde7386daf3) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+ROM_START( v4cshinfw )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ciixead_.4_0", 0x0000, 0x010000, CRC(95e5e1b2) SHA1(b823b1c873e209fee61f32f458d6d4f5ec7e206b) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
+	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
+	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
+	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
+	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
+	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
+	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
+	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
+	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
+	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinf3 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ciixea__.3_0", 0x0000, 0x010000, CRC(252f43e5) SHA1(5443a53a50fb27c3e98fa4612b4ba476cc946662) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD( "release3_video_roms", 0x000000, 0x010000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4cshinf3a )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ciixead_.3_0", 0x0000, 0x010000, CRC(6e8aa444) SHA1(63cecb83aa8e4f94b16d6c2ded8dbe8aa98d88a8) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD( "release3_video_roms", 0x000000, 0x010000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+ROM_START( v4dbltak )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "dt_sja_n.4_0", 0x0000, 0x010000, CRC(c6578f37) SHA1(e3fedb25a420bc8565fc07fa6a82ce1d584a7fd1) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "dt______.4_1", 0x000001, 0x080000, CRC(786aaee8) SHA1(309b15bbc597891407d384ded0bc246c5aa50106) )
+	ROM_LOAD16_BYTE( "dt______.4_2", 0x000000, 0x080000, CRC(0b5024ae) SHA1(4385b06021d349c8ee624afc1736666f94152a85) )
+	ROM_LOAD16_BYTE( "dt______.4_3", 0x100001, 0x080000, CRC(b715bff9) SHA1(be8ef30b50c235e78a03ea83eadd7541ad96f7a1) )
+	ROM_LOAD16_BYTE( "dt______.4_4", 0x100000, 0x080000, CRC(f41f2566) SHA1(e18e019bb04003e0fdce3a3051da0c618bdaef3d) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4dbltaka )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "dt_sjadn.4_0", 0x0000, 0x010000, CRC(8df26896) SHA1(6e19e56ba376c063e207b217a120f95041785b0f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "dt______.4_1", 0x000001, 0x080000, CRC(786aaee8) SHA1(309b15bbc597891407d384ded0bc246c5aa50106) )
+	ROM_LOAD16_BYTE( "dt______.4_2", 0x000000, 0x080000, CRC(0b5024ae) SHA1(4385b06021d349c8ee624afc1736666f94152a85) )
+	ROM_LOAD16_BYTE( "dt______.4_3", 0x100001, 0x080000, CRC(b715bff9) SHA1(be8ef30b50c235e78a03ea83eadd7541ad96f7a1) )
+	ROM_LOAD16_BYTE( "dt______.4_4", 0x100000, 0x080000, CRC(f41f2566) SHA1(e18e019bb04003e0fdce3a3051da0c618bdaef3d) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4dbltakb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "dt_sjsbn.4_0", 0x0000, 0x010000, CRC(c5358061) SHA1(aaf0b20175b63bb06524edbcb0b2e8a2b3ca7df2) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "dt______.4_1", 0x000001, 0x080000, CRC(786aaee8) SHA1(309b15bbc597891407d384ded0bc246c5aa50106) )
+	ROM_LOAD16_BYTE( "dt______.4_2", 0x000000, 0x080000, CRC(0b5024ae) SHA1(4385b06021d349c8ee624afc1736666f94152a85) )
+	ROM_LOAD16_BYTE( "dt______.4_3", 0x100001, 0x080000, CRC(b715bff9) SHA1(be8ef30b50c235e78a03ea83eadd7541ad96f7a1) )
+	ROM_LOAD16_BYTE( "dt______.4_4", 0x100000, 0x080000, CRC(f41f2566) SHA1(e18e019bb04003e0fdce3a3051da0c618bdaef3d) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+ROM_START( v4gldrsh )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_27s__.860", 0x0000, 0x010000, CRC(88dd4ff9) SHA1(8edfbb622cd542828f5184f92b357dd9094c2cb0) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrsha )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_20a__.8_0", 0x0000, 0x010000, CRC(57332f87) SHA1(b340107d8679c0a39887e26c7ceddd0e4bbf9047) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_20a_s.8_0", 0x0000, 0x010000, CRC(c1d201dd) SHA1(11d2f2a9022aba402667621d91d29d5a47983d9f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshc )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_20ab_.8_0", 0x0000, 0x010000, CRC(a1b7b814) SHA1(5c03e4d6754429b97590e644106d0c963ad46c53) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_20bg_.8_0", 0x0000, 0x010000, CRC(2b808fcf) SHA1(30394973e0cd4f265dbcd9b4e836a67e0894ae04) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshe )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_20bgs.8_0", 0x0000, 0x010000, CRC(bd61a195) SHA1(9775e45c4c9dfbbe655f27e4c5cf4bb86f9a8b38) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshf )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_20bt_.8_0", 0x0000, 0x010000, CRC(9dcb82cc) SHA1(8283ddaccb4fefbb056883c18165ec52c3df494f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshg )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_20bts.8_0", 0x0000, 0x010000, CRC(0b2aac96) SHA1(115643b3b746ae97f1aa8a5f715b8ff5ec05bd83) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshh )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_20s__.8_0", 0x0000, 0x010000, CRC(a2d5b742) SHA1(1f6d58794226a09609b07d1b66642fe86e808f2e) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshi )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_20sb_.8_0", 0x0000, 0x010000, CRC(545120d1) SHA1(76bcd72c2ffb316ee8cafc6426615f297fe2e845) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshj )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_20sbs.8_0", 0x0000, 0x010000, CRC(c2b00e8b) SHA1(71e4a926de3fe90a38407c6bbc59fdf420260cef) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshk )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_27sd_.860", 0x0000, 0x010000, CRC(c378a858) SHA1(53f0d357daeb0b7a6bdf9a4bbf852b39bd4a337f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshl )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_37s__.860", 0x0000, 0x010000, CRC(07cf24d7) SHA1(305f1f46b7082a25efd32c2960db5961fba249d0) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshm )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_37sd_.860", 0x0000, 0x010000, CRC(4c6ac376) SHA1(9d4d39654638e6adad64ab13bc7b145c93278653) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshn )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_x7s__.860", 0x0000, 0x010000, CRC(b8617832) SHA1(8a3c8de816a39f3bd0d5ba012e65c690468e5574) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrsho )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_x7sd_.860", 0x0000, 0x010000, CRC(f3c49f93) SHA1(bdd9de7be43dce45e435f2fbc7dd770089406dec) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshp )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_xea__.8_0", 0x0000, 0x010000, CRC(678f184c) SHA1(36738f6608fd09e78ae158d0cbcd827d3ae5bb07) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshq )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_xea_s.8_0", 0x0000, 0x010000, CRC(f16e3616) SHA1(a4e46bc464201c8552ec6cb7253228ee15f73f74) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+ROM_START( v4gldrshr )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_xead_.8_0", 0x0000, 0x010000, CRC(2c2affed) SHA1(893a819ec8bb99d08eaace47487f22b6edc3f363) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshs )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "go_xeads.8_0", 0x0000, 0x010000, CRC(bacbd1b7) SHA1(3dee2487f91a815fa450955cae3afb0a6980921d) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrsht )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "goi20s__.8_0", 0x0000, 0x010000, CRC(c3add8d4) SHA1(1b9bd696818eaa57805b5efcf21b5a3a52513d87) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrshu )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "goixes__.8_0", 0x0000, 0x010000, CRC(f311ef1f) SHA1(22b81313e62a3cd36d97fc6e39b6a3815eb5a7f3) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
+	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4gldrsh3 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "goldrush.bin", 0x0000, 0x010000, CRC(459834db) SHA1(dac9945553567c6bbc4e8ca9054a0b5448bc19aa) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "go_3.1.bin", 0x000000, 0x080000, CRC(5edc8226) SHA1(c231978be89db23c1b1d38307510ef7e2a278492) )
+	ROM_LOAD16_BYTE( "go_3.2.bin", 0x000001, 0x080000, CRC(95c10e74) SHA1(73b230e2281d4e2a564f070c752479af2af32757) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+ROM_START( v4mdicee )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_22sd_.8_0", 0x0000, 0x010000, CRC(ac8ea8cd) SHA1(31cc328aa803e232a57572fbc9ea6ac90177ad37) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdice )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_37s__.8_0", 0x0000, 0x010000, CRC(bcd47ec0) SHA1(2f32ae16eada13a826cde1162a56f43079f983fb) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdicea )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_02a__.8_0", 0x0000, 0x010000, CRC(35ed5c15) SHA1(86409c70d7ba5b7a587753abf8180e424d48cc08) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdiceb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_12a__.8_0", 0x0000, 0x010000, CRC(267d19cb) SHA1(a386abfc3296cda0f22f2f9f33902d19a99af16f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdicec )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_16a__.8_0", 0x0000, 0x010000, CRC(cf218b9c) SHA1(78798e9fcb8260e6c27ab363bcea0d30f8e01ab5) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdiced )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_22a__.8_0", 0x0000, 0x010000, CRC(12cdd7a9) SHA1(457a10f02e3c2093f247e2332612a5200ebf3884) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+
+
+
+ROM_START( v4mdicef )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_26a__.8_0", 0x0000, 0x010000, CRC(fb9145fe) SHA1(8173755dd82b49a730858ccec27fbc2a6b0c416a) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdiceg )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_26a_s.8_0", 0x0000, 0x010000, CRC(6d706ba4) SHA1(0c1323b84a247454d4272ac5be595f453b004037) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdiceh )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_26ad_.8_0", 0x0000, 0x010000, CRC(b034a25f) SHA1(70a534b07584f86b3428dbc86b2e9278989b9d0e) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdicei )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_26s__.8_0", 0x0000, 0x010000, CRC(0e77dd3b) SHA1(0989d08d6119c36841697974983397d6327d7a3e) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdicej )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_26sb_.8_0", 0x0000, 0x010000, CRC(f8f34aa8) SHA1(d5e238ebd62da2fad4d208b2e7ca71cfc3d044d9) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdicek )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_26sbs.8_0", 0x0000, 0x010000, CRC(6e1264f2) SHA1(a85e257958e94623bfc63107d3b483a19bc80f10) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdicel )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_26sd_.8_0", 0x0000, 0x010000, CRC(45d23a9a) SHA1(0a825f50a2e3ddfaad710b9dd4e3740f0b2480b6) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdicem )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_26sk_.8_0", 0x0000, 0x010000, CRC(b356ad09) SHA1(06e97be819203d183d10c56fa447b57b7fd5d594) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdicen )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_27a__.8_0", 0x0000, 0x010000, CRC(5aa2a3db) SHA1(e85a982d2ee515a53956ef457b52f3368da038c7) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdiceo )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_27ad_.8_0", 0x0000, 0x010000, CRC(1107447a) SHA1(a5803004b22564611d6073bc6ead88fca4318ce9) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdicep )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_27s__.8_0", 0x0000, 0x010000, CRC(af443b1e) SHA1(e13b5880f0abf173596bbd7b029221a35bdc0c6c) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdiceq )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_27sb_.8_0", 0x0000, 0x010000, CRC(59c0ac8d) SHA1(5abf26e90e0a63cfb47a3a4ee9ef0bbc56123022) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdicer )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_27sd_.8_0", 0x0000, 0x010000, CRC(e4e1dcbf) SHA1(ed0ff22f106350ec614e4ec37f14c1c51468bb66) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdices )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_37a__.8_0", 0x0000, 0x010000, CRC(4932e605) SHA1(6db4ce36708611938ef58586af976b12b45b96fe) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdicet )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_37ad_.8_0", 0x0000, 0x010000, CRC(029701a4) SHA1(88e56394664b807812d2e47e96f8f1280beed6d9) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdiceu )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_37sb_.8_0", 0x0000, 0x010000, CRC(4a50e953) SHA1(d8b1751eafa6c853f0d054e56df8c9d80e5a00e6) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdicev )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_37sd_.8_0", 0x0000, 0x010000, CRC(f7719961) SHA1(6c1a26878adf689cf3aa259356239f364848f681) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdicew )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mdi25a__.8_0", 0x0000, 0x010000, CRC(c3b469d0) SHA1(00cd85bd9acd477f2ab4baf83e7bb10d763b1e93) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md______.8_3", 0x100001, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
+	ROM_LOAD16_BYTE( "md______.8_4", 0x100000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+
+
+
+
+
+
+
+ROM_START( v4mdice5 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "release5_mpu4.rom", 0x0000, 0x010000, NO_DUMP )
+	ROM_LOAD( "mdmpu4.bin", 0x0000, 0x010000, CRC(8e712a33) SHA1(e821167c825b151bcde5eb9c63e7d2da04e1166a) )
+
+	ROM_REGION( 0x800000, "video", 0 ) // release 5 of Miami Dice based on internal strings
+	ROM_LOAD16_BYTE( "mdv58p1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "mdv58p2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "mdv58p3", 0x100001, 0x080000, CRC(0d907e37) SHA1(b6ad78a4a7bc877d2152907df2317621f00bdc1c) )
+	ROM_LOAD16_BYTE( "mdv58p4", 0x100000, 0x080000, CRC(2e21c249) SHA1(d5192339313a8dd234cb164ca0094d9a7b64ccc2) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+ROM_START( v4mdice6 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "md_26a__.6_0", 0x0000, 0x010000, CRC(1902067a) SHA1(ca46375ad859758bd3182653f2614cea47e46e50) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "md______.8_1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
+	ROM_LOAD16_BYTE( "md______.8_2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
+	ROM_LOAD16_BYTE( "md_6_30", 0x100001, 0x080000, CRC(c1526309) SHA1(c6961813310a3873540c9174db3c7ce2347620d5) )
+	ROM_LOAD16_BYTE( "md_6_34", 0x100000, 0x080000, CRC(f6b8cc2f) SHA1(d1022b4a8ab3266dab5401127610c864e6e40a7f) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
+	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+ROM_END
+
+
+	/* Some roms were simply in a set marked as Monte Carlo, but the 2 letter code mn) is the same */
+	/* The roms were a mixture of
+	    VIDEO 5 - MONTE CARLO OR BUST!
+	    others contain
+	    NM4 Monte Carlo on Options4
+
+	    is the latter just an later revision, or a different game? (date suggests it isn't earlier)
+
+	*/
+
+ROM_START( v4monte )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mnixes__.d_0", 0x0000, 0x010000, CRC(44967b33) SHA1(92d35d1b0edcc2eef1062468722c80ef8208b437) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcop3vd",  0x100001, 0x080000, CRC(721e9ad1) SHA1(fb926debd57301c9c0c3ecb9bb1ac36b0b60ee40) )
+	ROM_LOAD16_BYTE( "mcop4vd",  0x100000, 0x080000, CRC(6eba1107) SHA1(c696b620781782c3b4045fe3550ab8e7e905661d) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montea )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mcob2025", 0x0000, 0x010000, CRC(0fe6ec1e) SHA1(de5b7edb40b9ab3fc9111eb83061d55ce569afdd) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcop3vd",  0x100001, 0x080000, CRC(721e9ad1) SHA1(fb926debd57301c9c0c3ecb9bb1ac36b0b60ee40) )
+	ROM_LOAD16_BYTE( "mcop4vd",  0x100000, 0x080000, CRC(6eba1107) SHA1(c696b620781782c3b4045fe3550ab8e7e905661d) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montec )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mcobvd-1", 0x0000, 0x010000, CRC(e0b4bbab) SHA1(bd806a286464d36ff0cbff214ed60ccf81fd2db9) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcop3vd",  0x100001, 0x080000, CRC(721e9ad1) SHA1(fb926debd57301c9c0c3ecb9bb1ac36b0b60ee40) )
+	ROM_LOAD16_BYTE( "mcop4vd",  0x100000, 0x080000, CRC(6eba1107) SHA1(c696b620781782c3b4045fe3550ab8e7e905661d) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monted )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mcovd10", 0x0000, 0x010000, CRC(3f5adbd5) SHA1(f1876afd345e8398c1dc00b63be7d5a91f57519f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcop3vd",  0x100001, 0x080000, CRC(721e9ad1) SHA1(fb926debd57301c9c0c3ecb9bb1ac36b0b60ee40) )
+	ROM_LOAD16_BYTE( "mcop4vd",  0x100000, 0x080000, CRC(6eba1107) SHA1(c696b620781782c3b4045fe3550ab8e7e905661d) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montee )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xes__.d_0", 0x0000, 0x010000, CRC(25ee14a5) SHA1(2eba1b5b68a9f7ad6aacbdf6b93f6b4569164258) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcop3vd",  0x100001, 0x080000, CRC(721e9ad1) SHA1(fb926debd57301c9c0c3ecb9bb1ac36b0b60ee40) )
+	ROM_LOAD16_BYTE( "mcop4vd",  0x100000, 0x080000, CRC(6eba1107) SHA1(c696b620781782c3b4045fe3550ab8e7e905661d) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteg )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_37s__.d60", 0x0000, 0x010000, CRC(b048b0fb) SHA1(277622362d4d31b3e6386b27d1e043a88afea0ab) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcop3vd",  0x100001, 0x080000, CRC(721e9ad1) SHA1(fb926debd57301c9c0c3ecb9bb1ac36b0b60ee40) )
+	ROM_LOAD16_BYTE( "mcop4vd",  0x100000, 0x080000, CRC(6eba1107) SHA1(c696b620781782c3b4045fe3550ab8e7e905661d) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+//---- these sets work with either the release b, or release 5 '3 & 4' 68k pair
+//     v4monteb, v4monteba, v4montebb are set to 'release b' while v4monteba, v4monte5a, v4monte5b are set to 'release 5'
+//     they require the 'mn_9' roms to not have corrupt text, so those ROMs despite the name are not for 'release 9'
+//     maybe one of these 68k pairs is hacked? investigate
+
+ROM_START( v4monteb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mcob8ac", 0x0000, 0x010000, CRC(6dceb28f) SHA1(dc3daee15c25470501ab11e7b34cfef7edf302d4) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mn_9.1.bin", 0x000001, 0x080000, CRC(c0a89d0b) SHA1(22259724119bd1a61b45ba068df61f0cad3b6d17) )
+	ROM_LOAD16_BYTE( "mn_9.2.bin", 0x000000, 0x080000, CRC(308a0f80) SHA1(65f5b9286a0300f3f59a16469ffd247af50c1f07) )
+	ROM_LOAD16_BYTE( "mn_b3.releaseb.lo", 0x100001, 0x080000, CRC(b6de7ca1) SHA1(944e6c6ee20d187148c7cd4b20119422663780fd) )
+	ROM_LOAD16_BYTE( "mn_b4.releaseb.hi", 0x100000, 0x080000, CRC(5b6ff013) SHA1(ea08978ad469a521a6080fb6ab12033c31134a9d) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteba )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mcobarc", 0x0000, 0x010000, CRC(f95045dc) SHA1(463af12feed6dfe5f5e23d584c4eac121672918a) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mn_9.1.bin", 0x000001, 0x080000, CRC(c0a89d0b) SHA1(22259724119bd1a61b45ba068df61f0cad3b6d17) )
+	ROM_LOAD16_BYTE( "mn_9.2.bin", 0x000000, 0x080000, CRC(308a0f80) SHA1(65f5b9286a0300f3f59a16469ffd247af50c1f07) )
+	ROM_LOAD16_BYTE( "mn_b3.releaseb.lo", 0x100001, 0x080000, CRC(b6de7ca1) SHA1(944e6c6ee20d187148c7cd4b20119422663780fd) )
+	ROM_LOAD16_BYTE( "mn_b4.releaseb.hi", 0x100000, 0x080000, CRC(5b6ff013) SHA1(ea08978ad469a521a6080fb6ab12033c31134a9d) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montebb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mnb51020", 0x0000, 0x010000, CRC(c9ec7217) SHA1(006a70fb4050d726ae80678dc49afbd8c2c0c124) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mn_9.1.bin", 0x000001, 0x080000, CRC(c0a89d0b) SHA1(22259724119bd1a61b45ba068df61f0cad3b6d17) )
+	ROM_LOAD16_BYTE( "mn_9.2.bin", 0x000000, 0x080000, CRC(308a0f80) SHA1(65f5b9286a0300f3f59a16469ffd247af50c1f07) )
+	ROM_LOAD16_BYTE( "mn_b3.releaseb.lo", 0x100001, 0x080000, CRC(b6de7ca1) SHA1(944e6c6ee20d187148c7cd4b20119422663780fd) )
+	ROM_LOAD16_BYTE( "mn_b4.releaseb.hi", 0x100000, 0x080000, CRC(5b6ff013) SHA1(ea08978ad469a521a6080fb6ab12033c31134a9d) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte5 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mcob8ac", 0x0000, 0x010000, CRC(6dceb28f) SHA1(dc3daee15c25470501ab11e7b34cfef7edf302d4) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mn_9.1.bin", 0x000001, 0x080000, CRC(c0a89d0b) SHA1(22259724119bd1a61b45ba068df61f0cad3b6d17) )
+	ROM_LOAD16_BYTE( "mn_9.2.bin", 0x000000, 0x080000, CRC(308a0f80) SHA1(65f5b9286a0300f3f59a16469ffd247af50c1f07) )
+	ROM_LOAD16_BYTE( "mn_b3.release5.lo", 0x100001, 0x080000, CRC(a38cfb78) SHA1(3af87c03890bf02dc5bf222fab4ec1326c98ef94) )
+	ROM_LOAD16_BYTE( "mn_b4.release5.hi", 0x100000, 0x080000, CRC(ae260cda) SHA1(7139f61c08d2c9f9fdc7314bd89776349c5c1b60) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte5a )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mcobarc", 0x0000, 0x010000, CRC(f95045dc) SHA1(463af12feed6dfe5f5e23d584c4eac121672918a) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mn_9.1.bin", 0x000001, 0x080000, CRC(c0a89d0b) SHA1(22259724119bd1a61b45ba068df61f0cad3b6d17) )
+	ROM_LOAD16_BYTE( "mn_9.2.bin", 0x000000, 0x080000, CRC(308a0f80) SHA1(65f5b9286a0300f3f59a16469ffd247af50c1f07) )
+	ROM_LOAD16_BYTE( "mn_b3.release5.lo", 0x100001, 0x080000, CRC(a38cfb78) SHA1(3af87c03890bf02dc5bf222fab4ec1326c98ef94) )
+	ROM_LOAD16_BYTE( "mn_b4.release5.hi", 0x100000, 0x080000, CRC(ae260cda) SHA1(7139f61c08d2c9f9fdc7314bd89776349c5c1b60) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+
+ROM_START( v4monte5b )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mnb51020", 0x0000, 0x010000, CRC(c9ec7217) SHA1(006a70fb4050d726ae80678dc49afbd8c2c0c124) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mn_9.1.bin", 0x000001, 0x080000, CRC(c0a89d0b) SHA1(22259724119bd1a61b45ba068df61f0cad3b6d17) )
+	ROM_LOAD16_BYTE( "mn_9.2.bin", 0x000000, 0x080000, CRC(308a0f80) SHA1(65f5b9286a0300f3f59a16469ffd247af50c1f07) )
+	ROM_LOAD16_BYTE( "mn_b3.release5.lo", 0x100001, 0x080000, CRC(a38cfb78) SHA1(3af87c03890bf02dc5bf222fab4ec1326c98ef94) )
+	ROM_LOAD16_BYTE( "mn_b4.release5.hi", 0x100000, 0x080000, CRC(ae260cda) SHA1(7139f61c08d2c9f9fdc7314bd89776349c5c1b60) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+//---- no compatible video ROMs
+
+ROM_START( v4montek )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_", 0x0000, 0x010000, CRC(768bcc18) SHA1(d895f5207145a9d7b93b6b88fefc5be5ccf3eb72) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+
+ROM_START( v4montel )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_x7s__.e60", 0x0000, 0x010000, CRC(a883207a) SHA1(948990c254eaaee7ab7c4d832290069170b2da78) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montem )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xea__.e_0", 0x0000, 0x010000, CRC(776d4004) SHA1(4bc0f5688f6fb39e9398a330317f281c4c7cb1cd) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monten )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xea_s.e_0", 0x0000, 0x010000, CRC(e18c6e5e) SHA1(b008129c50b0b9031f1324fb3feac5ac50695e87) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteo )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xead_.e_0", 0x0000, 0x010000, CRC(3cc8a7a5) SHA1(6d00e4ff02aee210d940d53d1bc0a3c8c57a4f76) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montep )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xes__.e_0", 0x0000, 0x010000, CRC(828bd8c1) SHA1(d6411579ec5f5b1a7f83d27d9e222d17e355441f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteq )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xes_s.e_0", 0x0000, 0x010000, CRC(146af69b) SHA1(ce261fe2e93cb91a46bf67fcda504b168c84fa27) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monter )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xesb_.e_0", 0x0000, 0x010000, CRC(740f4f52) SHA1(cd811a90abd07d5cea466a631ffdc1329a5d3cff) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montes )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xesd_.e_0", 0x0000, 0x010000, CRC(c92e3f60) SHA1(2a07c11bb9e212b1cb049f087b618ec7f7e9e8bc) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montet )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xesk_.e_0", 0x0000, 0x010000, CRC(3faaa8f3) SHA1(6ddaf4ab3128ed16ad9abd9e77556710f88ec6f0) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteu )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mni20s__.e_0", 0x0000, 0x010000, CRC(d34f809c) SHA1(6c51c2b52e06d2b115737690bf22dd0182f73fc2) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montev )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mnixes__.e_0", 0x0000, 0x010000, CRC(e3f3b757) SHA1(f7a285730b7d76de4253c234be652021dc2bf860) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montew )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_20a__.e_0", 0x0000, 0x010000, CRC(47d177cf) SHA1(7d3e59bc399b731880320899169732b20932c39d) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montex )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_20sbs.e_0", 0x0000, 0x010000, CRC(d25256c3) SHA1(b359307021604e405b4bc50e38aa51f7675f73a0) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montey )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_27s__.e60", 0x0000, 0x010000, CRC(983f17b1) SHA1(e57104ff8fc136db11fc81fc2160d1bc6961f362) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montez )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_27sd_.e60", 0x0000, 0x010000, CRC(d39af010) SHA1(71ceb3ab370518b0e367dc93db9101efa4710067) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteaa )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_20s_s.e_0", 0x0000, 0x010000, CRC(24d6c150) SHA1(4671098dc24185837ace42acf224baabb2581906) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteab )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_20sb_.e_0", 0x0000, 0x010000, CRC(44b37899) SHA1(9de7ba3284e6f091d1ae29f7fc861e1da3879daf) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteac )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_20sd_.e_0", 0x0000, 0x010000, CRC(f99208ab) SHA1(1ac02645712bd9c2d575b42ea8641cec03347507) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montead )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_20sk_.e_0", 0x0000, 0x010000, CRC(0f169f38) SHA1(66b95512c3f6bfdf0f6824b5a97b12ac55c56c50) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteae )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xesbs.e_0", 0x0000, 0x010000, CRC(e2ee6108) SHA1(838f724c49f1f737dae02d10dd6633994c6480fc) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteaf )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_37s__.e60", 0x0000, 0x010000, CRC(172d7c9f) SHA1(303bd7019b91c782255befea7a5e530030a6461b) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteag )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_37sd_.e60", 0x0000, 0x010000, CRC(5c889b3e) SHA1(c55c395fc7aa8f6c0ab4f74acf41f04017da8330) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteah )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_x7sd_.e60", 0x0000, 0x010000, CRC(e326c7db) SHA1(d09409b4edca673675bd3b3653de0608b463ea7c) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteai )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_x7s__.f60", 0x0000, 0x010000, CRC(866a18ee) SHA1(b21bc50ef84e5e836da133caffb14b2ef680bdcd) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteaj )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_x7sd_.f60", 0x0000, 0x010000, CRC(cdcfff4f) SHA1(9e442cd46684efbdf186df48a1143a2b23f796e7) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteak )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_20s__.f_0", 0x0000, 0x010000, CRC(9cded79e) SHA1(0702e57e04bfe860ec63122fe29a1ff920884c49) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteal )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_27s__.f60", 0x0000, 0x010000, CRC(b6d62f25) SHA1(1d5f8c40ae12508bb146638706946da9107bacc1) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteam )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_27sd_.f60", 0x0000, 0x010000, CRC(fd73c884) SHA1(32a972cf552af2d9b8c46de3d59b1adee9b4286d) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4montean )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_37s__.f60", 0x0000, 0x010000, CRC(39c4440b) SHA1(e54c480420313f3e5d3d67ffc0b5827458f20c9c) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteao )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_37sd_.f60", 0x0000, 0x010000, CRC(7261a3aa) SHA1(08d289b5f2493d058db0779ae7858c3ea9ef7c85) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+// good again
+
+ROM_START( v4monte9 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mni20s__.940", 0x0000, 0x010000, CRC(13ac85ab) SHA1(f1d65613787dc1312ad68bd49dcb5a9a8bc1093c) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9a )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mnixes__.940", 0x0000, 0x010000, CRC(2310b260) SHA1(309d5e34c811866cbef634032fddc53ca0b78966) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+
+ROM_START( v4monte9b )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xesb_.940", 0x0000, 0x010000, CRC(b4ec4a65) SHA1(e360704a434dde21c6fb794f2b75ecd4b8cea2b5) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9c )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xea__.940", 0x0000, 0x010000, CRC(b78e4533) SHA1(5084f5434c0ee727e6b15422b5fc5d33a7e732d8) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9d )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xeab_.940", 0x0000, 0x010000, CRC(410ad2a0) SHA1(0f781bc89837e7def08f71589834ccbdadca6409) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9e )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_xes__.940", 0x0000, 0x010000, CRC(4268ddf6) SHA1(e81cc5f429ae8c3e868ac6301b60b7a0acd2d190) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9f )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_x7s__.9a0", 0x0000, 0x010000, CRC(6860254d) SHA1(a0247ec07f2ec13fadc543986d27b5763d799f9b) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9g )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_20ab_.940", 0x0000, 0x010000, CRC(71b6e56b) SHA1(b87b488398b5554b63324b3c8d47f5ed2210026d) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9h )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_20a__.940", 0x0000, 0x010000, CRC(873272f8) SHA1(7097987c175fc441a6ae6f1a7a0dec3ef5bf53a5) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9i )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_20sb_.940", 0x0000, 0x010000, CRC(84507dae) SHA1(1a2fb9514cbcb44f324574fc913a7f1f5d321e53) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9j )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_27s__.9a0", 0x0000, 0x010000, CRC(58dc1286) SHA1(d90fe58b612d438c082fb7dac8db82bec3faabf9) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9k )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_27sd_.9a0", 0x0000, 0x010000, CRC(1379f527) SHA1(e9b84b8844be7c26f2e7db731c48b0c6d2bfd689) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9l )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_37s__.9a0", 0x0000, 0x010000, CRC(d7ce79a8) SHA1(6daa848f79ad65bd2567afbacee2dcbb60317f29) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9m )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_37sd_.9a0", 0x0000, 0x010000, CRC(9c6b9e09) SHA1(1b0d35c2ba906b1e478e58d66fc5432cdf05f36b) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9n )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_x7sd_.9a0", 0x0000, 0x010000, CRC(23c5c2ec) SHA1(42568dd981a65c34ae7e25c201ccc90c109bf32e) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monte9o )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mn_20s__.940", 0x0000, 0x010000, CRC(72d4ea3d) SHA1(bf2d3279550351069ccc04064dc3b6966b11ee12) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
+	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
+	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
+	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+
+ROM_START( v4montezz )
+	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD( "mpu4.rom", 0x0000, 0x010000, NO_DUMP )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	// this seems to be a loose video ROM from an otherwise undumped set? investigate, might belong to something else entirely.
+	ROM_LOAD( "mn______.f_1", 0x0000, 0x080000, CRC(1a81b3fb) SHA1(bbf0fe7e48404962a2f2120734efe71dc1eed64c) ) // unmatched rom? (significant changes)
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
+	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
+ROM_END
+
+ROM_START( v4monteger )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mnd-a0_interface.bin", 0x0000, 0x010000, CRC(157e7ee4) SHA1(7a2d2caefd6ff609b8059d0ed0fd7ef94d8d36bc) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "mnd-a2_vid.bin", 0x000000, 0x080000, CRC(220f3a14) SHA1(fdfdc41c62330d77735d1840a4a7d429b3257d07) )
+	ROM_LOAD16_BYTE( "mnd-a1_vid.bin", 0x000001, 0x080000, CRC(b7b28d00) SHA1(0ae4bc759472f58cb738d7e7c8713a54f4e13686) )
+	ROM_LOAD16_BYTE( "mnd-a4_vid.bin", 0x100000, 0x080000, CRC(5fa9d451) SHA1(539438d237b869e97176d031f0014f3e33374eed) )
+	ROM_LOAD16_BYTE( "mnd-a3_vid.bin", 0x100001, 0x080000, CRC(5e3a95a4) SHA1(305a7f8b1c5072d86d6f381501886587a2e186ea) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "mnd-1a-snd.bin", 0x000000, 0x080000, CRC(98bcf6fb) SHA1(b2c0d305f64be10f5ff40518ebb1b66c44559578) )
+	ROM_LOAD( "mnd-1b-snd.bin", 0x080000, 0x080000, CRC(df2118b4) SHA1(6126baff9dfef7c573e3f77847ea58bdc242fdc2) )
+ROM_END
+
+
+ROM_START( v4ovrmn3 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "o3_20s__.4_0", 0x0000, 0x010000, CRC(fab0af50) SHA1(de57130763965bcea42dd17c1094a2d1c363d328) )
+
+	ROM_REGION( 0x800000, "video", 0 ) // first 2 ROMS match Bubbly Bonk ??
+	ROM_LOAD16_BYTE( "o3______.4_1", 0x000000, 0x010000,  CRC(1e85dd5d) SHA1(0f3c35d9f75d3495e2d0cc1fcf0e96dcbbeeacc8)) // == bu______.4_1
+	ROM_LOAD16_BYTE( "o3______.4_2", 0x000001, 0x010000,  CRC(989db70a) SHA1(e44f8900392db51cc3f0a5bf0391bde0d71b9878)) // == bu______.4_2
+	ROM_LOAD16_BYTE( "o3______.4_3", 0x020000, 0x010000, CRC(e6adda98) SHA1(176df97e3f0b22531a4c7b30e951bab0bc6403ad) )
+	ROM_LOAD16_BYTE( "o3______.4_4", 0x020001, 0x010000, CRC(b044faef) SHA1(e78f44fa32d9b8428e8ba9f19d95c0e32b8ec1e8) )
+	ROM_LOAD16_BYTE( "o3______.4_5", 0x040000, 0x010000, CRC(5bcc553d) SHA1(dd073cccce6fca693b772f6739132382b237bc67) )
+	ROM_LOAD16_BYTE( "o3______.4_6", 0x040001, 0x010000, CRC(ea616d69) SHA1(e606f5e999a93f8505f529c95fe209c6452934c3) )
+	ROM_LOAD16_BYTE( "o3______.4_7", 0x060000, 0x010000, CRC(e4dc300d) SHA1(8631bd78abfebcfa75f60a891b9709d84c8124e7) )
+	ROM_LOAD16_BYTE( "o3______.4_8", 0x060001, 0x010000, CRC(c51ffb5f) SHA1(78b0d8fe04d419d52b68549a61bdc51b3bbda50f) )
+	ROM_LOAD16_BYTE( "o3______.4_9", 0x080000, 0x010000, CRC(6201a444) SHA1(a4a419fd94c571a85259f0f0092e1c99ef6b5797) )
+	ROM_LOAD16_BYTE( "o3______.4_a", 0x080001, 0x010000, CRC(5b526937) SHA1(dd9de97ee48a157a26e8e70211819aed0a87921c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4ovrmn3a )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "o3_20sb_.4_0", 0x0000, 0x010000, CRC(0c3438c3) SHA1(dd0fc2db66d7bfb97f7f456c92654fc60c494e49) )
+
+	ROM_REGION( 0x800000, "video", 0 ) // first 2 ROMS match Bubbly Bonk ??
+	ROM_LOAD16_BYTE( "o3______.4_1", 0x000000, 0x010000,  CRC(1e85dd5d) SHA1(0f3c35d9f75d3495e2d0cc1fcf0e96dcbbeeacc8)) // == bu______.4_1
+	ROM_LOAD16_BYTE( "o3______.4_2", 0x000001, 0x010000,  CRC(989db70a) SHA1(e44f8900392db51cc3f0a5bf0391bde0d71b9878)) // == bu______.4_2
+	ROM_LOAD16_BYTE( "o3______.4_3", 0x020000, 0x010000, CRC(e6adda98) SHA1(176df97e3f0b22531a4c7b30e951bab0bc6403ad) )
+	ROM_LOAD16_BYTE( "o3______.4_4", 0x020001, 0x010000, CRC(b044faef) SHA1(e78f44fa32d9b8428e8ba9f19d95c0e32b8ec1e8) )
+	ROM_LOAD16_BYTE( "o3______.4_5", 0x040000, 0x010000, CRC(5bcc553d) SHA1(dd073cccce6fca693b772f6739132382b237bc67) )
+	ROM_LOAD16_BYTE( "o3______.4_6", 0x040001, 0x010000, CRC(ea616d69) SHA1(e606f5e999a93f8505f529c95fe209c6452934c3) )
+	ROM_LOAD16_BYTE( "o3______.4_7", 0x060000, 0x010000, CRC(e4dc300d) SHA1(8631bd78abfebcfa75f60a891b9709d84c8124e7) )
+	ROM_LOAD16_BYTE( "o3______.4_8", 0x060001, 0x010000, CRC(c51ffb5f) SHA1(78b0d8fe04d419d52b68549a61bdc51b3bbda50f) )
+	ROM_LOAD16_BYTE( "o3______.4_9", 0x080000, 0x010000, CRC(6201a444) SHA1(a4a419fd94c571a85259f0f0092e1c99ef6b5797) )
+	ROM_LOAD16_BYTE( "o3______.4_a", 0x080001, 0x010000, CRC(5b526937) SHA1(dd9de97ee48a157a26e8e70211819aed0a87921c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4ovrmn3b )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "o3_20sd_.4_0", 0x0000, 0x010000, CRC(b11548f1) SHA1(59585394c57a0441817d2bea424abe0bcf09f7ff) )
+
+	ROM_REGION( 0x800000, "video", 0 ) // first 2 ROMS match Bubbly Bonk ??
+	ROM_LOAD16_BYTE( "o3______.4_1", 0x000000, 0x010000,  CRC(1e85dd5d) SHA1(0f3c35d9f75d3495e2d0cc1fcf0e96dcbbeeacc8)) // == bu______.4_1
+	ROM_LOAD16_BYTE( "o3______.4_2", 0x000001, 0x010000,  CRC(989db70a) SHA1(e44f8900392db51cc3f0a5bf0391bde0d71b9878)) // == bu______.4_2
+	ROM_LOAD16_BYTE( "o3______.4_3", 0x020000, 0x010000, CRC(e6adda98) SHA1(176df97e3f0b22531a4c7b30e951bab0bc6403ad) )
+	ROM_LOAD16_BYTE( "o3______.4_4", 0x020001, 0x010000, CRC(b044faef) SHA1(e78f44fa32d9b8428e8ba9f19d95c0e32b8ec1e8) )
+	ROM_LOAD16_BYTE( "o3______.4_5", 0x040000, 0x010000, CRC(5bcc553d) SHA1(dd073cccce6fca693b772f6739132382b237bc67) )
+	ROM_LOAD16_BYTE( "o3______.4_6", 0x040001, 0x010000, CRC(ea616d69) SHA1(e606f5e999a93f8505f529c95fe209c6452934c3) )
+	ROM_LOAD16_BYTE( "o3______.4_7", 0x060000, 0x010000, CRC(e4dc300d) SHA1(8631bd78abfebcfa75f60a891b9709d84c8124e7) )
+	ROM_LOAD16_BYTE( "o3______.4_8", 0x060001, 0x010000, CRC(c51ffb5f) SHA1(78b0d8fe04d419d52b68549a61bdc51b3bbda50f) )
+	ROM_LOAD16_BYTE( "o3______.4_9", 0x080000, 0x010000, CRC(6201a444) SHA1(a4a419fd94c571a85259f0f0092e1c99ef6b5797) )
+	ROM_LOAD16_BYTE( "o3______.4_a", 0x080001, 0x010000, CRC(5b526937) SHA1(dd9de97ee48a157a26e8e70211819aed0a87921c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4ovrmn3c )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "o3_20sk_.4_0", 0x0000, 0x010000, CRC(4791df62) SHA1(c3d8ecf5f35a95aa5b2fd0a4085aa80b0b6d4447) )
+
+	ROM_REGION( 0x800000, "video", 0 ) // first 2 ROMS match Bubbly Bonk ??
+	ROM_LOAD16_BYTE( "o3______.4_1", 0x000000, 0x010000,  CRC(1e85dd5d) SHA1(0f3c35d9f75d3495e2d0cc1fcf0e96dcbbeeacc8)) // == bu______.4_1
+	ROM_LOAD16_BYTE( "o3______.4_2", 0x000001, 0x010000,  CRC(989db70a) SHA1(e44f8900392db51cc3f0a5bf0391bde0d71b9878)) // == bu______.4_2
+	ROM_LOAD16_BYTE( "o3______.4_3", 0x020000, 0x010000, CRC(e6adda98) SHA1(176df97e3f0b22531a4c7b30e951bab0bc6403ad) )
+	ROM_LOAD16_BYTE( "o3______.4_4", 0x020001, 0x010000, CRC(b044faef) SHA1(e78f44fa32d9b8428e8ba9f19d95c0e32b8ec1e8) )
+	ROM_LOAD16_BYTE( "o3______.4_5", 0x040000, 0x010000, CRC(5bcc553d) SHA1(dd073cccce6fca693b772f6739132382b237bc67) )
+	ROM_LOAD16_BYTE( "o3______.4_6", 0x040001, 0x010000, CRC(ea616d69) SHA1(e606f5e999a93f8505f529c95fe209c6452934c3) )
+	ROM_LOAD16_BYTE( "o3______.4_7", 0x060000, 0x010000, CRC(e4dc300d) SHA1(8631bd78abfebcfa75f60a891b9709d84c8124e7) )
+	ROM_LOAD16_BYTE( "o3______.4_8", 0x060001, 0x010000, CRC(c51ffb5f) SHA1(78b0d8fe04d419d52b68549a61bdc51b3bbda50f) )
+	ROM_LOAD16_BYTE( "o3______.4_9", 0x080000, 0x010000, CRC(6201a444) SHA1(a4a419fd94c571a85259f0f0092e1c99ef6b5797) )
+	ROM_LOAD16_BYTE( "o3______.4_a", 0x080001, 0x010000, CRC(5b526937) SHA1(dd9de97ee48a157a26e8e70211819aed0a87921c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4ovrmn3d )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "o3i20s__.4_0", 0x0000, 0x010000, CRC(9bc8c0c6) SHA1(19ea9614ca2a9c28e1819d1451bc3117360f143f) )
+
+	ROM_REGION( 0x800000, "video", 0 ) // first 2 ROMS match Bubbly Bonk ??
+	ROM_LOAD16_BYTE( "o3______.4_1", 0x000000, 0x010000,  CRC(1e85dd5d) SHA1(0f3c35d9f75d3495e2d0cc1fcf0e96dcbbeeacc8)) // == bu______.4_1
+	ROM_LOAD16_BYTE( "o3______.4_2", 0x000001, 0x010000,  CRC(989db70a) SHA1(e44f8900392db51cc3f0a5bf0391bde0d71b9878)) // == bu______.4_2
+	ROM_LOAD16_BYTE( "o3______.4_3", 0x020000, 0x010000, CRC(e6adda98) SHA1(176df97e3f0b22531a4c7b30e951bab0bc6403ad) )
+	ROM_LOAD16_BYTE( "o3______.4_4", 0x020001, 0x010000, CRC(b044faef) SHA1(e78f44fa32d9b8428e8ba9f19d95c0e32b8ec1e8) )
+	ROM_LOAD16_BYTE( "o3______.4_5", 0x040000, 0x010000, CRC(5bcc553d) SHA1(dd073cccce6fca693b772f6739132382b237bc67) )
+	ROM_LOAD16_BYTE( "o3______.4_6", 0x040001, 0x010000, CRC(ea616d69) SHA1(e606f5e999a93f8505f529c95fe209c6452934c3) )
+	ROM_LOAD16_BYTE( "o3______.4_7", 0x060000, 0x010000, CRC(e4dc300d) SHA1(8631bd78abfebcfa75f60a891b9709d84c8124e7) )
+	ROM_LOAD16_BYTE( "o3______.4_8", 0x060001, 0x010000, CRC(c51ffb5f) SHA1(78b0d8fe04d419d52b68549a61bdc51b3bbda50f) )
+	ROM_LOAD16_BYTE( "o3______.4_9", 0x080000, 0x010000, CRC(6201a444) SHA1(a4a419fd94c571a85259f0f0092e1c99ef6b5797) )
+	ROM_LOAD16_BYTE( "o3______.4_a", 0x080001, 0x010000, CRC(5b526937) SHA1(dd9de97ee48a157a26e8e70211819aed0a87921c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+ROM_START( v4pztet )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "tc______.2_0", 0x0000, 0x010000, CRC(9a94ccaf) SHA1(42988a22c26f88fa07c1ab68a85f15bc3af0a71c) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "tc______.2_1", 0x000000, 0x010000, CRC(048f30b5) SHA1(e6cf196cabe5c9b27a40942f547d50135d9633d0) )
+	ROM_LOAD16_BYTE( "tc______.2_2", 0x000001, 0x010000, CRC(546719a6) SHA1(17a0fd552f4afa9d4eaeec903f3952f61af345d2) )
+	ROM_LOAD16_BYTE( "tc______.2_3", 0x020000, 0x010000, CRC(6afa8148) SHA1(f4bfe41c9b9bb363c4fc1de616d641bea22248ba) )
+	ROM_LOAD16_BYTE( "tc______.2_4", 0x020001, 0x010000, CRC(f7f99e42) SHA1(ca3b26fd911b8fc277e14dcdba428cb15288c995) )
+	ROM_LOAD16_BYTE( "tc______.2_5", 0x040000, 0x010000, CRC(a2a50948) SHA1(57bf6c0738363da93ec6f379a23e706d1a6fc237) )
+	ROM_LOAD16_BYTE( "tc______.2_6", 0x040001, 0x010000, CRC(de2146e4) SHA1(4e65c5d59d561d052834c9a0d139c286839fcf86) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4pzteta )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "tc____d_.2_0", 0x0000, 0x010000, CRC(d1312b0e) SHA1(d1ba8f49a0b30771f5ffbaaf3f8b6142965a8330) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "tc______.2_1", 0x000000, 0x010000, CRC(048f30b5) SHA1(e6cf196cabe5c9b27a40942f547d50135d9633d0) )
+	ROM_LOAD16_BYTE( "tc______.2_2", 0x000001, 0x010000, CRC(546719a6) SHA1(17a0fd552f4afa9d4eaeec903f3952f61af345d2) )
+	ROM_LOAD16_BYTE( "tc______.2_3", 0x020000, 0x010000, CRC(6afa8148) SHA1(f4bfe41c9b9bb363c4fc1de616d641bea22248ba) )
+	ROM_LOAD16_BYTE( "tc______.2_4", 0x020001, 0x010000, CRC(f7f99e42) SHA1(ca3b26fd911b8fc277e14dcdba428cb15288c995) )
+	ROM_LOAD16_BYTE( "tc______.2_5", 0x040000, 0x010000, CRC(a2a50948) SHA1(57bf6c0738363da93ec6f379a23e706d1a6fc237) )
+	ROM_LOAD16_BYTE( "tc______.2_6", 0x040001, 0x010000, CRC(de2146e4) SHA1(4e65c5d59d561d052834c9a0d139c286839fcf86) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4pztetb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "tp______.2_0", 0x0000, 0x010000, CRC(17757b59) SHA1(013690047e2769c420a9422c662990a71e1bd09d) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "tp______.2_1", 0x000000, 0x010000, CRC(91f3a03d) SHA1(c1eb60b32052cfe188cf465233a2fa0d0ca0a649) )
+	ROM_LOAD16_BYTE( "tp______.2_2", 0x000001, 0x010000, CRC(f5fc5d3d) SHA1(d22f92769c0ad2c30887c60680ff1f984013bd02) )
+	ROM_LOAD16_BYTE( "tp______.2_3", 0x020000, 0x010000, CRC(ef015d5e) SHA1(d7477743cbc0cc7c2e8cdf33a2c82c0425dd7d61) )
+	ROM_LOAD16_BYTE( "tp______.2_4", 0x020001, 0x010000, CRC(401b5a50) SHA1(1b9bea05d4ba69d874f0067908bcfc19a5d8c6af) )
+	ROM_LOAD16_BYTE( "tp______.2_5", 0x040000, 0x010000, CRC(e35cb24b) SHA1(a1c32c195b1d61a99b784c646ad78fa59b8270c4) )
+	ROM_LOAD16_BYTE( "tp______.2_6", 0x040001, 0x010000, CRC(fecd48d0) SHA1(67ee3bee7aade5ec5fce1fcfe7ef3982264f1762) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4pztetc )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "tp____d_.2_0", 0x0000, 0x010000, CRC(5cd09cf8) SHA1(3c288169f9bd49affaaa4e1f5f0fdddf52f381a8) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "tp______.2_1", 0x000000, 0x010000, CRC(91f3a03d) SHA1(c1eb60b32052cfe188cf465233a2fa0d0ca0a649) )
+	ROM_LOAD16_BYTE( "tp______.2_2", 0x000001, 0x010000, CRC(f5fc5d3d) SHA1(d22f92769c0ad2c30887c60680ff1f984013bd02) )
+	ROM_LOAD16_BYTE( "tp______.2_3", 0x020000, 0x010000, CRC(ef015d5e) SHA1(d7477743cbc0cc7c2e8cdf33a2c82c0425dd7d61) )
+	ROM_LOAD16_BYTE( "tp______.2_4", 0x020001, 0x010000, CRC(401b5a50) SHA1(1b9bea05d4ba69d874f0067908bcfc19a5d8c6af) )
+	ROM_LOAD16_BYTE( "tp______.2_5", 0x040000, 0x010000, CRC(e35cb24b) SHA1(a1c32c195b1d61a99b784c646ad78fa59b8270c4) )
+	ROM_LOAD16_BYTE( "tp______.2_6", 0x040001, 0x010000, CRC(fecd48d0) SHA1(67ee3bee7aade5ec5fce1fcfe7ef3982264f1762) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+ROM_START( v4rhmaz )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rm_10___.4_0", 0x0000, 0x010000, CRC(5e9b282e) SHA1(d40744ae4cb36e49398f2f2e91274f9a1ecbe018) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rm______.4_1", 0x000000, 0x010000, CRC(51af0692) SHA1(74e52d63adeaaa1f0949dad60f5d4ca1635d2261) )
+	ROM_LOAD16_BYTE( "rm______.4_2", 0x000001, 0x010000, CRC(2c0971ee) SHA1(7ee22c7bf0e0dcc548537a6418d56c7088a699a0) )
+	ROM_LOAD16_BYTE( "rm______.4_3", 0x020000, 0x010000, CRC(b7981930) SHA1(d4356dcbbfda7486a684d8c8d375648dd0f8e200) )
+	ROM_LOAD16_BYTE( "rm______.4_4", 0x020001, 0x010000, CRC(1bc71ac8) SHA1(ac0f56d974a4aba143cb3b8cad8a65dc25b3e145) )
+	ROM_LOAD16_BYTE( "rm______.4_5", 0x040000, 0x010000, CRC(71460efc) SHA1(3ae79df9d3ec83abdde059827e06e81316026380) )
+	ROM_LOAD16_BYTE( "rm______.4_6", 0x040001, 0x010000, CRC(471678de) SHA1(919394768314bc8707f93875528dca33bcf7e09c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4rhmaza )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rm_10_b_.4_0", 0x0000, 0x010000, CRC(a81fbfbd) SHA1(24fda5a2eaa7291ad4869d2f3061798360c5e862) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rm______.4_1", 0x000000, 0x010000, CRC(51af0692) SHA1(74e52d63adeaaa1f0949dad60f5d4ca1635d2261) )
+	ROM_LOAD16_BYTE( "rm______.4_2", 0x000001, 0x010000, CRC(2c0971ee) SHA1(7ee22c7bf0e0dcc548537a6418d56c7088a699a0) )
+	ROM_LOAD16_BYTE( "rm______.4_3", 0x020000, 0x010000, CRC(b7981930) SHA1(d4356dcbbfda7486a684d8c8d375648dd0f8e200) )
+	ROM_LOAD16_BYTE( "rm______.4_4", 0x020001, 0x010000, CRC(1bc71ac8) SHA1(ac0f56d974a4aba143cb3b8cad8a65dc25b3e145) )
+	ROM_LOAD16_BYTE( "rm______.4_5", 0x040000, 0x010000, CRC(71460efc) SHA1(3ae79df9d3ec83abdde059827e06e81316026380) )
+	ROM_LOAD16_BYTE( "rm______.4_6", 0x040001, 0x010000, CRC(471678de) SHA1(919394768314bc8707f93875528dca33bcf7e09c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4rhmazb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rm_10_d_.4_0", 0x0000, 0x010000, CRC(153ecf8f) SHA1(a1d67c2298bbd008be69b7ae7b3b92669972e37f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rm______.4_1", 0x000000, 0x010000, CRC(51af0692) SHA1(74e52d63adeaaa1f0949dad60f5d4ca1635d2261) )
+	ROM_LOAD16_BYTE( "rm______.4_2", 0x000001, 0x010000, CRC(2c0971ee) SHA1(7ee22c7bf0e0dcc548537a6418d56c7088a699a0) )
+	ROM_LOAD16_BYTE( "rm______.4_3", 0x020000, 0x010000, CRC(b7981930) SHA1(d4356dcbbfda7486a684d8c8d375648dd0f8e200) )
+	ROM_LOAD16_BYTE( "rm______.4_4", 0x020001, 0x010000, CRC(1bc71ac8) SHA1(ac0f56d974a4aba143cb3b8cad8a65dc25b3e145) )
+	ROM_LOAD16_BYTE( "rm______.4_5", 0x040000, 0x010000, CRC(71460efc) SHA1(3ae79df9d3ec83abdde059827e06e81316026380) )
+	ROM_LOAD16_BYTE( "rm______.4_6", 0x040001, 0x010000, CRC(471678de) SHA1(919394768314bc8707f93875528dca33bcf7e09c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4rhmazc )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rm_20___.4_0", 0x0000, 0x010000, CRC(8c5811a6) SHA1(2b51776e7dc78c322173708c6426b9eafde84870) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rm______.4_1", 0x000000, 0x010000, CRC(51af0692) SHA1(74e52d63adeaaa1f0949dad60f5d4ca1635d2261) )
+	ROM_LOAD16_BYTE( "rm______.4_2", 0x000001, 0x010000, CRC(2c0971ee) SHA1(7ee22c7bf0e0dcc548537a6418d56c7088a699a0) )
+	ROM_LOAD16_BYTE( "rm______.4_3", 0x020000, 0x010000, CRC(b7981930) SHA1(d4356dcbbfda7486a684d8c8d375648dd0f8e200) )
+	ROM_LOAD16_BYTE( "rm______.4_4", 0x020001, 0x010000, CRC(1bc71ac8) SHA1(ac0f56d974a4aba143cb3b8cad8a65dc25b3e145) )
+	ROM_LOAD16_BYTE( "rm______.4_5", 0x040000, 0x010000, CRC(71460efc) SHA1(3ae79df9d3ec83abdde059827e06e81316026380) )
+	ROM_LOAD16_BYTE( "rm______.4_6", 0x040001, 0x010000, CRC(471678de) SHA1(919394768314bc8707f93875528dca33bcf7e09c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4rhmazd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rm_20_b_.4_0", 0x0000, 0x010000, CRC(7adc8635) SHA1(8af3c8f332ca877f82940bc2a4e7abc4d37d6f48) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rm______.4_1", 0x000000, 0x010000, CRC(51af0692) SHA1(74e52d63adeaaa1f0949dad60f5d4ca1635d2261) )
+	ROM_LOAD16_BYTE( "rm______.4_2", 0x000001, 0x010000, CRC(2c0971ee) SHA1(7ee22c7bf0e0dcc548537a6418d56c7088a699a0) )
+	ROM_LOAD16_BYTE( "rm______.4_3", 0x020000, 0x010000, CRC(b7981930) SHA1(d4356dcbbfda7486a684d8c8d375648dd0f8e200) )
+	ROM_LOAD16_BYTE( "rm______.4_4", 0x020001, 0x010000, CRC(1bc71ac8) SHA1(ac0f56d974a4aba143cb3b8cad8a65dc25b3e145) )
+	ROM_LOAD16_BYTE( "rm______.4_5", 0x040000, 0x010000, CRC(71460efc) SHA1(3ae79df9d3ec83abdde059827e06e81316026380) )
+	ROM_LOAD16_BYTE( "rm______.4_6", 0x040001, 0x010000, CRC(471678de) SHA1(919394768314bc8707f93875528dca33bcf7e09c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4rhmaze )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rm_20_bl.4_0", 0x0000, 0x010000, CRC(244c3e2c) SHA1(c764fe5a5ec74a4c4bb8bfea1bab2e8ae95cc4e7) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rm______.4_1", 0x000000, 0x010000, CRC(51af0692) SHA1(74e52d63adeaaa1f0949dad60f5d4ca1635d2261) )
+	ROM_LOAD16_BYTE( "rm______.4_2", 0x000001, 0x010000, CRC(2c0971ee) SHA1(7ee22c7bf0e0dcc548537a6418d56c7088a699a0) )
+	ROM_LOAD16_BYTE( "rm______.4_3", 0x020000, 0x010000, CRC(b7981930) SHA1(d4356dcbbfda7486a684d8c8d375648dd0f8e200) )
+	ROM_LOAD16_BYTE( "rm______.4_4", 0x020001, 0x010000, CRC(1bc71ac8) SHA1(ac0f56d974a4aba143cb3b8cad8a65dc25b3e145) )
+	ROM_LOAD16_BYTE( "rm______.4_5", 0x040000, 0x010000, CRC(71460efc) SHA1(3ae79df9d3ec83abdde059827e06e81316026380) )
+	ROM_LOAD16_BYTE( "rm______.4_6", 0x040001, 0x010000, CRC(471678de) SHA1(919394768314bc8707f93875528dca33bcf7e09c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4rhmazf )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rm_20_d_.4_0", 0x0000, 0x010000, CRC(c7fdf607) SHA1(eab05365451d66e23163cbed433921bcbd415022) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rm______.4_1", 0x000000, 0x010000, CRC(51af0692) SHA1(74e52d63adeaaa1f0949dad60f5d4ca1635d2261) )
+	ROM_LOAD16_BYTE( "rm______.4_2", 0x000001, 0x010000, CRC(2c0971ee) SHA1(7ee22c7bf0e0dcc548537a6418d56c7088a699a0) )
+	ROM_LOAD16_BYTE( "rm______.4_3", 0x020000, 0x010000, CRC(b7981930) SHA1(d4356dcbbfda7486a684d8c8d375648dd0f8e200) )
+	ROM_LOAD16_BYTE( "rm______.4_4", 0x020001, 0x010000, CRC(1bc71ac8) SHA1(ac0f56d974a4aba143cb3b8cad8a65dc25b3e145) )
+	ROM_LOAD16_BYTE( "rm______.4_5", 0x040000, 0x010000, CRC(71460efc) SHA1(3ae79df9d3ec83abdde059827e06e81316026380) )
+	ROM_LOAD16_BYTE( "rm______.4_6", 0x040001, 0x010000, CRC(471678de) SHA1(919394768314bc8707f93875528dca33bcf7e09c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4rhmazg )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rm_xc___.4_0", 0x0000, 0x010000, CRC(bce4266d) SHA1(018419adc7ee4af6c183868d1b7c3ef0cab8a837) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rm______.4_1", 0x000000, 0x010000, CRC(51af0692) SHA1(74e52d63adeaaa1f0949dad60f5d4ca1635d2261) )
+	ROM_LOAD16_BYTE( "rm______.4_2", 0x000001, 0x010000, CRC(2c0971ee) SHA1(7ee22c7bf0e0dcc548537a6418d56c7088a699a0) )
+	ROM_LOAD16_BYTE( "rm______.4_3", 0x020000, 0x010000, CRC(b7981930) SHA1(d4356dcbbfda7486a684d8c8d375648dd0f8e200) )
+	ROM_LOAD16_BYTE( "rm______.4_4", 0x020001, 0x010000, CRC(1bc71ac8) SHA1(ac0f56d974a4aba143cb3b8cad8a65dc25b3e145) )
+	ROM_LOAD16_BYTE( "rm______.4_5", 0x040000, 0x010000, CRC(71460efc) SHA1(3ae79df9d3ec83abdde059827e06e81316026380) )
+	ROM_LOAD16_BYTE( "rm______.4_6", 0x040001, 0x010000, CRC(471678de) SHA1(919394768314bc8707f93875528dca33bcf7e09c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4rhmazh )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rm_xc_b_.4_0", 0x0000, 0x010000, CRC(4a60b1fe) SHA1(8effdbcf89aa942c434ebbb5e7127c357608d83f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rm______.4_1", 0x000000, 0x010000, CRC(51af0692) SHA1(74e52d63adeaaa1f0949dad60f5d4ca1635d2261) )
+	ROM_LOAD16_BYTE( "rm______.4_2", 0x000001, 0x010000, CRC(2c0971ee) SHA1(7ee22c7bf0e0dcc548537a6418d56c7088a699a0) )
+	ROM_LOAD16_BYTE( "rm______.4_3", 0x020000, 0x010000, CRC(b7981930) SHA1(d4356dcbbfda7486a684d8c8d375648dd0f8e200) )
+	ROM_LOAD16_BYTE( "rm______.4_4", 0x020001, 0x010000, CRC(1bc71ac8) SHA1(ac0f56d974a4aba143cb3b8cad8a65dc25b3e145) )
+	ROM_LOAD16_BYTE( "rm______.4_5", 0x040000, 0x010000, CRC(71460efc) SHA1(3ae79df9d3ec83abdde059827e06e81316026380) )
+	ROM_LOAD16_BYTE( "rm______.4_6", 0x040001, 0x010000, CRC(471678de) SHA1(919394768314bc8707f93875528dca33bcf7e09c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4rhmazi )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rm_xc_d_.4_0", 0x0000, 0x010000, CRC(f741c1cc) SHA1(576e250319ea2269982cfd6b5ea68ae4a26f81f2) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rm______.4_1", 0x000000, 0x010000, CRC(51af0692) SHA1(74e52d63adeaaa1f0949dad60f5d4ca1635d2261) )
+	ROM_LOAD16_BYTE( "rm______.4_2", 0x000001, 0x010000, CRC(2c0971ee) SHA1(7ee22c7bf0e0dcc548537a6418d56c7088a699a0) )
+	ROM_LOAD16_BYTE( "rm______.4_3", 0x020000, 0x010000, CRC(b7981930) SHA1(d4356dcbbfda7486a684d8c8d375648dd0f8e200) )
+	ROM_LOAD16_BYTE( "rm______.4_4", 0x020001, 0x010000, CRC(1bc71ac8) SHA1(ac0f56d974a4aba143cb3b8cad8a65dc25b3e145) )
+	ROM_LOAD16_BYTE( "rm______.4_5", 0x040000, 0x010000, CRC(71460efc) SHA1(3ae79df9d3ec83abdde059827e06e81316026380) )
+	ROM_LOAD16_BYTE( "rm______.4_6", 0x040001, 0x010000, CRC(471678de) SHA1(919394768314bc8707f93875528dca33bcf7e09c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4rhmazj )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rm_xc_k_.4_0", 0x0000, 0x010000, CRC(01c5565f) SHA1(293b7591cd73d12552db751629a60aa315433dbf) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rm______.4_1", 0x000000, 0x010000, CRC(51af0692) SHA1(74e52d63adeaaa1f0949dad60f5d4ca1635d2261) )
+	ROM_LOAD16_BYTE( "rm______.4_2", 0x000001, 0x010000, CRC(2c0971ee) SHA1(7ee22c7bf0e0dcc548537a6418d56c7088a699a0) )
+	ROM_LOAD16_BYTE( "rm______.4_3", 0x020000, 0x010000, CRC(b7981930) SHA1(d4356dcbbfda7486a684d8c8d375648dd0f8e200) )
+	ROM_LOAD16_BYTE( "rm______.4_4", 0x020001, 0x010000, CRC(1bc71ac8) SHA1(ac0f56d974a4aba143cb3b8cad8a65dc25b3e145) )
+	ROM_LOAD16_BYTE( "rm______.4_5", 0x040000, 0x010000, CRC(71460efc) SHA1(3ae79df9d3ec83abdde059827e06e81316026380) )
+	ROM_LOAD16_BYTE( "rm______.4_6", 0x040001, 0x010000, CRC(471678de) SHA1(919394768314bc8707f93875528dca33bcf7e09c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4rhmazk )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rmixc___.4_0", 0x0000, 0x010000, CRC(dd9c49fb) SHA1(649eb1d5fd05698e60094fe7225413da4971d65b) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "rm______.4_1", 0x000000, 0x010000, CRC(51af0692) SHA1(74e52d63adeaaa1f0949dad60f5d4ca1635d2261) )
+	ROM_LOAD16_BYTE( "rm______.4_2", 0x000001, 0x010000, CRC(2c0971ee) SHA1(7ee22c7bf0e0dcc548537a6418d56c7088a699a0) )
+	ROM_LOAD16_BYTE( "rm______.4_3", 0x020000, 0x010000, CRC(b7981930) SHA1(d4356dcbbfda7486a684d8c8d375648dd0f8e200) )
+	ROM_LOAD16_BYTE( "rm______.4_4", 0x020001, 0x010000, CRC(1bc71ac8) SHA1(ac0f56d974a4aba143cb3b8cad8a65dc25b3e145) )
+	ROM_LOAD16_BYTE( "rm______.4_5", 0x040000, 0x010000, CRC(71460efc) SHA1(3ae79df9d3ec83abdde059827e06e81316026380) )
+	ROM_LOAD16_BYTE( "rm______.4_6", 0x040001, 0x010000, CRC(471678de) SHA1(919394768314bc8707f93875528dca33bcf7e09c) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+
+
+
+
+ROM_START( v4sunbst )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_10___.4_0", 0x0000, 0x010000, CRC(153ce606) SHA1(2e3fada2d150ac46ca38d67845a97d649f7489f9) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbsta )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_10_b_.4_0", 0x0000, 0x010000, CRC(e3b87195) SHA1(f6bc0edd6c1e5396fb10adaee1d1d870262ff084) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_10_d_.4_0", 0x0000, 0x010000, CRC(5e9901a7) SHA1(8e3b620d31e03589330d92bce7fac038a2c2484b) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstc )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_10_k_.4_0", 0x0000, 0x010000, CRC(a81d9634) SHA1(70aded04e2d014632d832d299b0a88124334d2b6) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_20___.4_0", 0x0000, 0x010000, CRC(c7ffdf8e) SHA1(2dd24eeff88ae62b83302404c1304eeb81b83284) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbste )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_20_b_.4_0", 0x0000, 0x010000, CRC(317b481d) SHA1(f06e3510c0a16efa27e94f455c51e8f8cdbc23ae) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstf )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_20_bl.4_0", 0x0000, 0x010000, CRC(6febf004) SHA1(d70a64343d6e509fa10cc2321d14dffda4fb2a4a) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstg )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_20_d_.4_0", 0x0000, 0x010000, CRC(8c5a382f) SHA1(76e5927216c6bd12d3e3c7bc614366c12a733865) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+ROM_START( v4sunbsth )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_20_dl.4_0", 0x0000, 0x010000, CRC(d2ca8036) SHA1(cb2db62defeab671e8407e8139feb3b1f9d91c1f) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbsti )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_20_k_.4_0", 0x0000, 0x010000, CRC(7adeafbc) SHA1(216a3344c5e9e60e4429cfb7813ff250db7eb378) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstj )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_20bg_.4_0", 0x0000, 0x010000, CRC(4eaae703) SHA1(bdc2a0d752496708b911579867844870b799ee5b) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstk )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_20bt_.4_0", 0x0000, 0x010000, CRC(f8e1ea00) SHA1(ce3a0bb34a966d15797e7e398d88342b488e0cb1) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstl )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_xc___.4_0", 0x0000, 0x010000, CRC(f743e845) SHA1(af60698c8349a982b9cb5bef0a9d670cf3658a0c) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstm )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_xc__l.4_0", 0x0000, 0x010000, CRC(a9d3505c) SHA1(07dd1b9a3c663a6315aa3e02bcaa4bc3f38cc4e0) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstn )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_xc_b_.4_0", 0x0000, 0x010000, CRC(01c77fd6) SHA1(7562969f482e20ed4a7d66d204309c12ae1843f6) )
 
-
-ROM_START( v4big40 )
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbsto )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "b4_sja__.3_0", 0x0000, 0x010000, CRC(afdd005e) SHA1(71730b55212fbfc1905caf0d2842d495741305f1) )
+	ROM_LOAD( "st_xc_d_.4_0", 0x0000, 0x010000, CRC(bce60fe4) SHA1(dd2a7e35afe5ed9b07c7395e746090205f014b54) )
 
-	ROM_REGION( 0x10000, "altmain", 0 )
-	ROM_LOAD( "b4_sja__.4_0", 0x0000, 0x010000, CRC(4375e090) SHA1(923eadc4cf322e544102cede2eb7a487354981b5) )
-	ROM_LOAD( "b4_sja__.6_0", 0x0000, 0x010000, CRC(f5742e6c) SHA1(42b0b22d2da690b24166fe103a3453dcfc7beacc) )
-	ROM_LOAD( "b4_sja_n.6_0", 0x0000, 0x010000, CRC(be04b941) SHA1(8d0561a623df6fc447fbcbbc1934425b23df4f58) )
-	ROM_LOAD( "b4_sjad_.6_0", 0x0000, 0x010000, CRC(bed1c9cd) SHA1(f4cfb305e4ec2c4c1b55356ce32745875f1641d9) )
-	ROM_LOAD( "b4_sjadn.6_0", 0x0000, 0x010000, CRC(f5a15ee0) SHA1(d61fc54724d579d7a7055a1cfe20b55e4e59a653) )
-	ROM_LOAD( "b4_sjmb_.6_0", 0x0000, 0x010000, CRC(7472fa9c) SHA1(3315b37b1a221e40e6122612c8ee8a27b6131947) )
-	ROM_LOAD( "b4_sjs__.6_0", 0x0000, 0x010000, CRC(0092b6a9) SHA1(cead4988d2dc6b0e8724c7b1c6eb416317a9b7c4) )
-	ROM_LOAD( "b4_sjs_n.6_0", 0x0000, 0x010000, CRC(4be22184) SHA1(5b779d8fe85db719b539f93ff05a6e3568968557) )
-	ROM_LOAD( "b4_sjsb_.6_0", 0x0000, 0x010000, CRC(f616213a) SHA1(bcfc7fd1639ed423faa32d066c7f19877e4d1bc2) )
-	ROM_LOAD( "b4_sjsbn.6_0", 0x0000, 0x010000, CRC(bd66b617) SHA1(522c0903405f1a97c140c2aaef543aff2057e6ba) )
-	ROM_LOAD( "b4_sjsd_.6_0", 0x0000, 0x010000, CRC(4b375108) SHA1(77e5a59ca524550c68231cf64387e8f206f97393) )
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstp )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_xc_dl.4_0", 0x0000, 0x010000, CRC(e276b7fd) SHA1(b6c295a4f1b7bae5bab0ce75032f514945a0c637) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "b4______.3_1", 0x000001, 0x080000, CRC(c388e5a9) SHA1(baafe2da91891f288debd89907d36438494e876a) )
-	ROM_LOAD16_BYTE( "b4______.3_2", 0x000000, 0x080000, CRC(cc3ab5c3) SHA1(a3778b462a823fd73c1a3463c53ef0537e8d5ed4) )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
 
-	ROM_REGION( 0x800000, "altvideo", 0 )
-	ROM_LOAD16_BYTE( "b4______.4_1", 0x000001, 0x080000, CRC(fc33c0fc) SHA1(838a7ef4252f9f736639858fe97a4982a89be09f) )
-	ROM_LOAD16_BYTE( "b4______.4_2", 0x000000, 0x080000, CRC(f2211865) SHA1(5bcb95a079f57305d3e58fae3899bceec211f44a) )
-	ROM_LOAD16_BYTE( "b4______.6_1", 0x000001, 0x080000, CRC(75532ad3) SHA1(0584261faede35f6e846ee398081fac66aea8368) )
-	ROM_LOAD16_BYTE( "b4______.6_2", 0x000000, 0x080000, CRC(03ef74c5) SHA1(fa5d27b0e94c8d05f1c50b28b96f7a4ae3ecda4a) )
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstq )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "st_xc_k_.4_0", 0x0000, 0x010000, CRC(4a629877) SHA1(8c6e5dba3dc048a727562c53203f26d3ac8fc7ee) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstr )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sti10___.4_0", 0x0000, 0x010000, CRC(74448990) SHA1(4a6163f20f0f79c4328c6e9577b7063d91f5ae33) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbsts )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "sti20___.4_0", 0x0000, 0x010000, CRC(a687b018) SHA1(a1f2bd6568a01614a08b9f64abda458d7b7d3fd4) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstt )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "stixc___.4_0", 0x0000, 0x010000, CRC(963b87d3) SHA1(8999b41cf214992ed8aab60c83cfdb06b7a2b312) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sunbstu )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "stixc_d_.4_0", 0x0000, 0x010000, CRC(dd9e6072) SHA1(a28e3e20863f737e7ba8db434c4563d9bfb15fca) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
+	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
+	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
+	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
+	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
+	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
+	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
+	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+
+
+
+
+ROM_START( v4timebn )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ba_20s__.1_0", 0x0000, 0x010000, CRC(55a7b969) SHA1(2809f207fcfe5357b50df1124f8bf55c6e629308) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ba______.1_1", 0x000000, 0x080000, CRC(df853e0e) SHA1(07b0b9aa8a6dc3a70991236f8c1f88b4a6c6755f) )
+	ROM_LOAD16_BYTE( "ba______.1_2", 0x000001, 0x080000, CRC(9a2ab155) SHA1(582b33f9ddbf7fb2da71ec6ad5fbbb20a03eda19) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "ba______.1_a", 0x000000, 0x080000, CRC(976d761b) SHA1(32cceff2cd9bc6ad48caac0a2d95d815a5f24aa9) )
+	ROM_LOAD( "ba______.1_b", 0x080000, 0x080000, CRC(25a6c7ef) SHA1(cb614c7b2142e47862127d9fdfc7db50978f7f00) )
+ROM_END
+
+ROM_START( v4timebna )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ba_20a__.1_0", 0x0000, 0x010000, CRC(a04121ac) SHA1(7ba2f229de8bc5883e6e961d873e5fa524680201) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ba______.1_1", 0x000000, 0x080000, CRC(df853e0e) SHA1(07b0b9aa8a6dc3a70991236f8c1f88b4a6c6755f) )
+	ROM_LOAD16_BYTE( "ba______.1_2", 0x000001, 0x080000, CRC(9a2ab155) SHA1(582b33f9ddbf7fb2da71ec6ad5fbbb20a03eda19) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "ba______.1_a", 0x000000, 0x080000, CRC(976d761b) SHA1(32cceff2cd9bc6ad48caac0a2d95d815a5f24aa9) )
+	ROM_LOAD( "ba______.1_b", 0x080000, 0x080000, CRC(25a6c7ef) SHA1(cb614c7b2142e47862127d9fdfc7db50978f7f00) )
+ROM_END
+
+ROM_START( v4timebnb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ba_20bg_.1_0", 0x0000, 0x010000, CRC(dcf281e4) SHA1(0145b8d558ed95b96590cdf9c2f54b6b5f26971d) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ba______.1_1", 0x000000, 0x080000, CRC(df853e0e) SHA1(07b0b9aa8a6dc3a70991236f8c1f88b4a6c6755f) )
+	ROM_LOAD16_BYTE( "ba______.1_2", 0x000001, 0x080000, CRC(9a2ab155) SHA1(582b33f9ddbf7fb2da71ec6ad5fbbb20a03eda19) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "ba______.1_a", 0x000000, 0x080000, CRC(976d761b) SHA1(32cceff2cd9bc6ad48caac0a2d95d815a5f24aa9) )
+	ROM_LOAD( "ba______.1_b", 0x080000, 0x080000, CRC(25a6c7ef) SHA1(cb614c7b2142e47862127d9fdfc7db50978f7f00) )
+ROM_END
+
+ROM_START( v4timebnc )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ba_20bt_.1_0", 0x0000, 0x010000, CRC(6ab98ce7) SHA1(6f56c8ba4681255c505bb52e3a76751d1e8acb0e) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ba______.1_1", 0x000000, 0x080000, CRC(df853e0e) SHA1(07b0b9aa8a6dc3a70991236f8c1f88b4a6c6755f) )
+	ROM_LOAD16_BYTE( "ba______.1_2", 0x000001, 0x080000, CRC(9a2ab155) SHA1(582b33f9ddbf7fb2da71ec6ad5fbbb20a03eda19) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "ba______.1_a", 0x000000, 0x080000, CRC(976d761b) SHA1(32cceff2cd9bc6ad48caac0a2d95d815a5f24aa9) )
+	ROM_LOAD( "ba______.1_b", 0x080000, 0x080000, CRC(25a6c7ef) SHA1(cb614c7b2142e47862127d9fdfc7db50978f7f00) )
+ROM_END
+
+ROM_START( v4timebnd )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ba_20sb_.1_0", 0x0000, 0x010000, CRC(a3232efa) SHA1(12ca99a3f368e54a82719382820e4778bdaccb6e) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ba______.1_1", 0x000000, 0x080000, CRC(df853e0e) SHA1(07b0b9aa8a6dc3a70991236f8c1f88b4a6c6755f) )
+	ROM_LOAD16_BYTE( "ba______.1_2", 0x000001, 0x080000, CRC(9a2ab155) SHA1(582b33f9ddbf7fb2da71ec6ad5fbbb20a03eda19) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "ba______.1_a", 0x000000, 0x080000, CRC(976d761b) SHA1(32cceff2cd9bc6ad48caac0a2d95d815a5f24aa9) )
+	ROM_LOAD( "ba______.1_b", 0x080000, 0x080000, CRC(25a6c7ef) SHA1(cb614c7b2142e47862127d9fdfc7db50978f7f00) )
+ROM_END
+
+ROM_START( v4timebne )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "ba_20sd_.1_0", 0x0000, 0x010000, CRC(1e025ec8) SHA1(87cb62ae81aa2735edba08d34c6aa31c78e545e8) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "ba______.1_1", 0x000000, 0x080000, CRC(df853e0e) SHA1(07b0b9aa8a6dc3a70991236f8c1f88b4a6c6755f) )
+	ROM_LOAD16_BYTE( "ba______.1_2", 0x000001, 0x080000, CRC(9a2ab155) SHA1(582b33f9ddbf7fb2da71ec6ad5fbbb20a03eda19) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	ROM_LOAD( "ba______.1_a", 0x000000, 0x080000, CRC(976d761b) SHA1(32cceff2cd9bc6ad48caac0a2d95d815a5f24aa9) )
+	ROM_LOAD( "ba______.1_b", 0x080000, 0x080000, CRC(25a6c7ef) SHA1(cb614c7b2142e47862127d9fdfc7db50978f7f00) )
+ROM_END
+
+
+
+
+ROM_START( v4sixx )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "6x_20s__.3_0", 0x0000, 0x010000, CRC(452ba9aa) SHA1(4034bfdba6cb46a63a59ba56e19ae912f5633412) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sixxa )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "6x_20a__.3_0", 0x0000, 0x010000, CRC(b0cd316f) SHA1(56e2499f041cc534571f14492b5bd8d64a7f0c7b) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
+
+ROM_START( v4sixxb )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "6x_20ad_.3_0", 0x0000, 0x010000, CRC(fb68d6ce) SHA1(186230bd84d41cbe45f808a63f06d37edff818b1) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
-	ROM_LOAD( "b4__snd_.1_a", 0x0000, 0x080000, CRC(2d630b87) SHA1(e4be02a1356735c47934f8f30e1e2462bf28968c) )
+	/* none present */
 ROM_END
 
-
-ROM_START( v4bulblx )
+ROM_START( v4sixxc)
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "bv_50___.2_0", 0x0000, 0x010000, CRC(615f9772) SHA1(56bc2c78c8b50b7250906ad43211f26c2e7e17b8) )
-
-	ROM_REGION( 0x10000, "altmain", 0 )
-	ROM_LOAD( "bv_1p___.2_0", 0x0000, 0x010000, CRC(f3101261) SHA1(e2c82222e3384620f52e15350ab38e62beabe1b3) )
-	ROM_LOAD( "bv_1p_d_.2_0", 0x0000, 0x010000, CRC(b8b5f5c0) SHA1(84bf9b5a3ca5ea7eae1ab97af481206fb87bd2c5) )
-	ROM_LOAD( "bv_50_d_.2_0", 0x0000, 0x010000, CRC(2afa70d3) SHA1(11da4db50162054deb753ab85d11566afef2b801) )
+	ROM_LOAD( "6x_20ak_.3_0", 0x0000, 0x010000, CRC(0dec415d) SHA1(2f9231ee5a3ab978bbeade3495038c14c13cba09) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "bv_50___.2_1", 0x000000, 0x010000, CRC(bb80cd18) SHA1(7e16100c30fe8d6feb1ac206447269e9c29489a5) )
-	ROM_LOAD16_BYTE( "bv_50___.2_2", 0x000001, 0x010000, CRC(2a18b8dc) SHA1(c2fccc7eae41176941ec15c421430b8bb20f72bd) )
-	ROM_LOAD16_BYTE( "bv______.2_3", 0x020000, 0x010000, CRC(d249b9dd) SHA1(b624759b10ac12146e6026e52d5d96fe4f7663b3) )
-	ROM_LOAD16_BYTE( "bv______.2_4", 0x020001, 0x010000, CRC(f5fffa95) SHA1(17c63a7e83feb0cafca34c30b334db082bb2c321) )
-	ROM_LOAD16_BYTE( "bv______.2_5", 0x040000, 0x010000, CRC(c5775387) SHA1(b301392ae39298284ae256c819877ae287861cc8) )
-	ROM_LOAD16_BYTE( "bv______.2_6", 0x040001, 0x010000, CRC(4443fddc) SHA1(fb4972620f9aa07f8bd62701f64b7902567d34db) )
-
-	ROM_REGION( 0x800000, "altvideo", 0 )
-	ROM_LOAD16_BYTE( "bv_1p___.2_1", 0x000000, 0x010000, CRC(568ea314) SHA1(fa65f2cc4734b9987a153fbf1ac4b32cd0fe4f32) )
-	ROM_LOAD16_BYTE( "bv_1p___.2_2", 0x000001, 0x010000, CRC(b91f8c3b) SHA1(82e1582f75595283a4ea9f2dc39e0d5a0d5ccb57) )
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
 	/* none present */
 ROM_END
 
-
-ROM_START( v4cshinf )
+ROM_START( v4sixxd )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "ci_20s__.4_0", 0x0000, 0x010000, CRC(7a62c68b) SHA1(b892e023cd5ec2a508d36075ba5a96320408a4ab) )
-
-	ROM_REGION( 0x10000, "altmain", 0 )
-	ROM_LOAD( "ci_05a__.4_0", 0x0000, 0x010000, CRC(3426fb02) SHA1(84be34a727444232c595c7adaa0a1d733b5416a3) )
-	ROM_LOAD( "ci_10a__.4_0", 0x0000, 0x010000, CRC(5d4767c6) SHA1(291cf48c387fc515dce6eb22b1b38aaa65aec4ac) )
-	ROM_LOAD( "ci_20.10", 0x0000, 0x010000, CRC(80a4bfb3) SHA1(b3c11bd621457d190eeab423bc15895b0c7cf6da) )
-	ROM_LOAD( "ci_20a__.4_0", 0x0000, 0x010000, CRC(8f845e4e) SHA1(1b8e46fed36db1b1539df3e28fcbb739079d3960) )
-	ROM_LOAD( "ci_20bg_.4_0", 0x0000, 0x010000, CRC(f337fe06) SHA1(eef073d04a08347ad4814cf0d15615d45ecc8314) )
-	ROM_LOAD( "ci_20bgp.4_0", 0x0000, 0x010000, CRC(65d6d05c) SHA1(3d0bd44cb692ae54ba0b2186d645124dc12dc5b3) )
-	ROM_LOAD( "ci_20bt_.4_0", 0x0000, 0x010000, CRC(457cf305) SHA1(122e7f494043ebba01b5b827409d419ac54b240e) )
-	ROM_LOAD( "ci_20btp.4_0", 0x0000, 0x010000, CRC(d39ddd5f) SHA1(6c97f3c19aea51efec4e510c46b98fbf3a2356a5) )
-	ROM_LOAD( "ci_20sb_.4_0", 0x0000, 0x010000, CRC(8ce65118) SHA1(57207f1ef7e98eac7f31671789fb1e01e87c2aa0) )
-	ROM_LOAD( "ci_20sbp.4_0", 0x0000, 0x010000, CRC(1a077f42) SHA1(141f7c3708bde43302a68df65d74d4a2e7296a05) )
-	ROM_LOAD( "ci_20sd_.4_0", 0x0000, 0x010000, CRC(31c7212a) SHA1(b34aee87d4be460f47c894807ef877700b6be60f) )
-	ROM_LOAD( "ci_20sk_.4_0", 0x0000, 0x010000, CRC(c743b6b9) SHA1(0ef3de1663527a770066e872699ee281f1af21eb) )
-	ROM_LOAD( "ci_xea__.4_0", 0x0000, 0x010000, CRC(bf386985) SHA1(a7eec0d70bc0795f537ec0975dc251739b86c3ca) )
-	ROM_LOAD( "ci_xea_p.4_0", 0x0000, 0x010000, CRC(29d947df) SHA1(b08ca18442a701eb6a6f1ffc868333e65aa4aeb2) )
-	ROM_LOAD( "ci_xeab_.4_0", 0x0000, 0x010000, CRC(49bcfe16) SHA1(0feab2f177ef6bd1d1c7ae9507a247c7afab7e97) )
-	ROM_LOAD( "ci_xead_.4_0", 0x0000, 0x010000, CRC(f49d8e24) SHA1(f24b41ae866b324af3605f1bc121cd445b9ecb8c) )
-	ROM_LOAD( "ci_xeak_.4_0", 0x0000, 0x010000, CRC(021919b7) SHA1(d8176be8b4548a5b61af415e7b7d0d1c8742592b) )
-	ROM_LOAD( "ci_xes__.4_0", 0x0000, 0x010000, CRC(4adef140) SHA1(1003e666532fd773617d4ed30380eda0089027fe) )
-	ROM_LOAD( "ci_xesd_.4_0", 0x0000, 0x010000, CRC(017b16e1) SHA1(c352c7f635ece2faceb2f3ee6154c9fed86ddc6f) )
-	ROM_LOAD( "ciixea__.3_0", 0x0000, 0x010000, CRC(252f43e5) SHA1(5443a53a50fb27c3e98fa4612b4ba476cc946662) )
-	ROM_LOAD( "ciixea__.4_0", 0x0000, 0x010000, CRC(de400613) SHA1(b353c47b01c3918677f1a2c302171bde7386daf3) )
-	ROM_LOAD( "ciixead_.3_0", 0x0000, 0x010000, CRC(6e8aa444) SHA1(63cecb83aa8e4f94b16d6c2ded8dbe8aa98d88a8) )
-	ROM_LOAD( "ciixead_.4_0", 0x0000, 0x010000, CRC(95e5e1b2) SHA1(b823b1c873e209fee61f32f458d6d4f5ec7e206b) )
+	ROM_LOAD( "6x_20bg_.3_0", 0x0000, 0x010000, CRC(cc7e9127) SHA1(ceeab2d61eec87977528030ea8d4b870d08adae2) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "ci______.4_1", 0x000000, 0x010000, CRC(bd1adec6) SHA1(7a60adc4b5159e672eb4dc33051192f0cf863aef) )
-	ROM_LOAD16_BYTE( "ci______.4_2", 0x000001, 0x010000, CRC(e46852ff) SHA1(ad6f0a75578041b06120d1d5f3c3779c827b8f2f) )
-	ROM_LOAD16_BYTE( "ci______.4_3", 0x020000, 0x010000, CRC(b63b9edf) SHA1(2a47c97f5ea51bc441fb847da6e81451dde77093) )
-	ROM_LOAD16_BYTE( "ci______.4_4", 0x020001, 0x010000, CRC(7ef4daeb) SHA1(f889f4e68dc4ef736eee44ddedaa94832c6cdbc7) )
-	ROM_LOAD16_BYTE( "ci______.4_5", 0x040000, 0x010000, CRC(381277b7) SHA1(6d934d400468c067809452981577c17cf425ff4f) )
-	ROM_LOAD16_BYTE( "ci______.4_6", 0x040001, 0x010000, CRC(e245c830) SHA1(315b8163731abe5c65bebd94884431e99253740b) )
-	ROM_LOAD16_BYTE( "ci______.4_7", 0x060000, 0x010000, CRC(169d6ac5) SHA1(7d9e63d9ab29fbace754e8c46d4e80b1ab2d422d) )
-	ROM_LOAD16_BYTE( "ci______.4_8", 0x060001, 0x010000, CRC(12de2ae0) SHA1(734207fffd918f3a0890ec6a2d442efb428adbaa) )
-	ROM_LOAD16_BYTE( "ci______.4_9", 0x080000, 0x010000, CRC(f1f9987f) SHA1(0a4b5fa61e237e1e209301a07af2ad1e9fedcc35) )
-	ROM_LOAD16_BYTE( "ci______.4_a", 0x080001, 0x010000, CRC(4747cb48) SHA1(ac33d318f6fff67c8a2f7d47c0ee0bcddfc2af8e) )
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
 	/* none present */
 ROM_END
 
-
-
-ROM_START( v4dbltak )
+ROM_START( v4sixxe )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "dt_sja_n.4_0", 0x0000, 0x010000, CRC(c6578f37) SHA1(e3fedb25a420bc8565fc07fa6a82ce1d584a7fd1) )
-
-	ROM_REGION( 0x10000, "altmain", 0 )
-	ROM_LOAD( "dt_sjadn.4_0", 0x0000, 0x010000, CRC(8df26896) SHA1(6e19e56ba376c063e207b217a120f95041785b0f) )
-	ROM_LOAD( "dt_sjsbn.4_0", 0x0000, 0x010000, CRC(c5358061) SHA1(aaf0b20175b63bb06524edbcb0b2e8a2b3ca7df2) )
+	ROM_LOAD( "6x_20bt_.3_0", 0x0000, 0x010000, CRC(7a359c24) SHA1(2a3496ef1da06aa5a65b79e598ac4652d4520551) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "dt______.4_1", 0x000001, 0x080000, CRC(786aaee8) SHA1(309b15bbc597891407d384ded0bc246c5aa50106) )
-	ROM_LOAD16_BYTE( "dt______.4_2", 0x000000, 0x080000, CRC(0b5024ae) SHA1(4385b06021d349c8ee624afc1736666f94152a85) )
-	ROM_LOAD16_BYTE( "dt______.4_3", 0x100001, 0x080000, CRC(b715bff9) SHA1(be8ef30b50c235e78a03ea83eadd7541ad96f7a1) )
-	ROM_LOAD16_BYTE( "dt______.4_4", 0x100000, 0x080000, CRC(f41f2566) SHA1(e18e019bb04003e0fdce3a3051da0c618bdaef3d) )
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
 	/* none present */
 ROM_END
 
-
-
-ROM_START( v4gldrsh )
+ROM_START( v4sixxf )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "go_27s__.860", 0x0000, 0x010000, CRC(88dd4ff9) SHA1(8edfbb622cd542828f5184f92b357dd9094c2cb0) )
-
-	ROM_REGION( 0x10000, "altmain", 0 )
-	ROM_LOAD( "go_20a__.8_0", 0x0000, 0x010000, CRC(57332f87) SHA1(b340107d8679c0a39887e26c7ceddd0e4bbf9047) )
-	ROM_LOAD( "go_20a_s.8_0", 0x0000, 0x010000, CRC(c1d201dd) SHA1(11d2f2a9022aba402667621d91d29d5a47983d9f) )
-	ROM_LOAD( "go_20ab_.8_0", 0x0000, 0x010000, CRC(a1b7b814) SHA1(5c03e4d6754429b97590e644106d0c963ad46c53) )
-	ROM_LOAD( "go_20bg_.8_0", 0x0000, 0x010000, CRC(2b808fcf) SHA1(30394973e0cd4f265dbcd9b4e836a67e0894ae04) )
-	ROM_LOAD( "go_20bgs.8_0", 0x0000, 0x010000, CRC(bd61a195) SHA1(9775e45c4c9dfbbe655f27e4c5cf4bb86f9a8b38) )
-	ROM_LOAD( "go_20bt_.8_0", 0x0000, 0x010000, CRC(9dcb82cc) SHA1(8283ddaccb4fefbb056883c18165ec52c3df494f) )
-	ROM_LOAD( "go_20bts.8_0", 0x0000, 0x010000, CRC(0b2aac96) SHA1(115643b3b746ae97f1aa8a5f715b8ff5ec05bd83) )
-	ROM_LOAD( "go_20s__.8_0", 0x0000, 0x010000, CRC(a2d5b742) SHA1(1f6d58794226a09609b07d1b66642fe86e808f2e) )
-	ROM_LOAD( "go_20sb_.8_0", 0x0000, 0x010000, CRC(545120d1) SHA1(76bcd72c2ffb316ee8cafc6426615f297fe2e845) )
-	ROM_LOAD( "go_20sbs.8_0", 0x0000, 0x010000, CRC(c2b00e8b) SHA1(71e4a926de3fe90a38407c6bbc59fdf420260cef) )
-	ROM_LOAD( "go_27sd_.860", 0x0000, 0x010000, CRC(c378a858) SHA1(53f0d357daeb0b7a6bdf9a4bbf852b39bd4a337f) )
-	ROM_LOAD( "go_37s__.860", 0x0000, 0x010000, CRC(07cf24d7) SHA1(305f1f46b7082a25efd32c2960db5961fba249d0) )
-	ROM_LOAD( "go_37sd_.860", 0x0000, 0x010000, CRC(4c6ac376) SHA1(9d4d39654638e6adad64ab13bc7b145c93278653) )
-	ROM_LOAD( "go_x7s__.860", 0x0000, 0x010000, CRC(b8617832) SHA1(8a3c8de816a39f3bd0d5ba012e65c690468e5574) )
-	ROM_LOAD( "go_x7sd_.860", 0x0000, 0x010000, CRC(f3c49f93) SHA1(bdd9de7be43dce45e435f2fbc7dd770089406dec) )
-	ROM_LOAD( "go_xea__.8_0", 0x0000, 0x010000, CRC(678f184c) SHA1(36738f6608fd09e78ae158d0cbcd827d3ae5bb07) )
-	ROM_LOAD( "go_xea_s.8_0", 0x0000, 0x010000, CRC(f16e3616) SHA1(a4e46bc464201c8552ec6cb7253228ee15f73f74) )
-	ROM_LOAD( "go_xead_.8_0", 0x0000, 0x010000, CRC(2c2affed) SHA1(893a819ec8bb99d08eaace47487f22b6edc3f363) )
-	ROM_LOAD( "go_xeads.8_0", 0x0000, 0x010000, CRC(bacbd1b7) SHA1(3dee2487f91a815fa450955cae3afb0a6980921d) )
-	ROM_LOAD( "goi20s__.8_0", 0x0000, 0x010000, CRC(c3add8d4) SHA1(1b9bd696818eaa57805b5efcf21b5a3a52513d87) )
-	ROM_LOAD( "goixes__.8_0", 0x0000, 0x010000, CRC(f311ef1f) SHA1(22b81313e62a3cd36d97fc6e39b6a3815eb5a7f3) )
+	ROM_LOAD( "6x_20sb_.3_0", 0x0000, 0x010000, CRC(b3af3e39) SHA1(2690b8e84e812898390979268ab496e5fb12f6ca) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "go______.8_1", 0x000001, 0x080000, CRC(42700f68) SHA1(3050e790292c8afcc0e27e01dffa22c46d97bcc4) )
-	ROM_LOAD16_BYTE( "go______.8_2", 0x000000, 0x080000, CRC(a5d3c42e) SHA1(1398d5c8d1402a1dbf7910d00e6201f413dbd898) )
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
 	/* none present */
 ROM_END
 
-
-ROM_START( v4mdice )
+ROM_START( v4sixxg )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "md_37s__.8_0", 0x0000, 0x010000, CRC(bcd47ec0) SHA1(2f32ae16eada13a826cde1162a56f43079f983fb) )
-
-	ROM_REGION( 0x10000, "altmain", 0 )
-	ROM_LOAD( "md_02a__.8_0", 0x0000, 0x010000, CRC(35ed5c15) SHA1(86409c70d7ba5b7a587753abf8180e424d48cc08) )
-	ROM_LOAD( "md_12a__.8_0", 0x0000, 0x010000, CRC(267d19cb) SHA1(a386abfc3296cda0f22f2f9f33902d19a99af16f) )
-	ROM_LOAD( "md_16a__.8_0", 0x0000, 0x010000, CRC(cf218b9c) SHA1(78798e9fcb8260e6c27ab363bcea0d30f8e01ab5) )
-	ROM_LOAD( "md_22a__.8_0", 0x0000, 0x010000, CRC(12cdd7a9) SHA1(457a10f02e3c2093f247e2332612a5200ebf3884) )
-	ROM_LOAD( "md_22sd_.8_0", 0x0000, 0x010000, CRC(ac8ea8cd) SHA1(31cc328aa803e232a57572fbc9ea6ac90177ad37) )
-	ROM_LOAD( "md_26a__.8_0", 0x0000, 0x010000, CRC(fb9145fe) SHA1(8173755dd82b49a730858ccec27fbc2a6b0c416a) )
-	ROM_LOAD( "md_26a_s.8_0", 0x0000, 0x010000, CRC(6d706ba4) SHA1(0c1323b84a247454d4272ac5be595f453b004037) )
-	ROM_LOAD( "md_26ad_.8_0", 0x0000, 0x010000, CRC(b034a25f) SHA1(70a534b07584f86b3428dbc86b2e9278989b9d0e) )
-	ROM_LOAD( "md_26s__.8_0", 0x0000, 0x010000, CRC(0e77dd3b) SHA1(0989d08d6119c36841697974983397d6327d7a3e) )
-	ROM_LOAD( "md_26sb_.8_0", 0x0000, 0x010000, CRC(f8f34aa8) SHA1(d5e238ebd62da2fad4d208b2e7ca71cfc3d044d9) )
-	ROM_LOAD( "md_26sbs.8_0", 0x0000, 0x010000, CRC(6e1264f2) SHA1(a85e257958e94623bfc63107d3b483a19bc80f10) )
-	ROM_LOAD( "md_26sd_.8_0", 0x0000, 0x010000, CRC(45d23a9a) SHA1(0a825f50a2e3ddfaad710b9dd4e3740f0b2480b6) )
-	ROM_LOAD( "md_26sk_.8_0", 0x0000, 0x010000, CRC(b356ad09) SHA1(06e97be819203d183d10c56fa447b57b7fd5d594) )
-	ROM_LOAD( "md_27a__.8_0", 0x0000, 0x010000, CRC(5aa2a3db) SHA1(e85a982d2ee515a53956ef457b52f3368da038c7) )
-	ROM_LOAD( "md_27ad_.8_0", 0x0000, 0x010000, CRC(1107447a) SHA1(a5803004b22564611d6073bc6ead88fca4318ce9) )
-	ROM_LOAD( "md_27s__.8_0", 0x0000, 0x010000, CRC(af443b1e) SHA1(e13b5880f0abf173596bbd7b029221a35bdc0c6c) )
-	ROM_LOAD( "md_27sb_.8_0", 0x0000, 0x010000, CRC(59c0ac8d) SHA1(5abf26e90e0a63cfb47a3a4ee9ef0bbc56123022) )
-	ROM_LOAD( "md_27sd_.8_0", 0x0000, 0x010000, CRC(e4e1dcbf) SHA1(ed0ff22f106350ec614e4ec37f14c1c51468bb66) )
-	ROM_LOAD( "md_37a__.8_0", 0x0000, 0x010000, CRC(4932e605) SHA1(6db4ce36708611938ef58586af976b12b45b96fe) )
-	ROM_LOAD( "md_37ad_.8_0", 0x0000, 0x010000, CRC(029701a4) SHA1(88e56394664b807812d2e47e96f8f1280beed6d9) )
-	ROM_LOAD( "md_37sb_.8_0", 0x0000, 0x010000, CRC(4a50e953) SHA1(d8b1751eafa6c853f0d054e56df8c9d80e5a00e6) )
-	ROM_LOAD( "md_37sd_.8_0", 0x0000, 0x010000, CRC(f7719961) SHA1(6c1a26878adf689cf3aa259356239f364848f681) )
-	ROM_LOAD( "mdi25a__.8_0", 0x0000, 0x010000, CRC(c3b469d0) SHA1(00cd85bd9acd477f2ab4baf83e7bb10d763b1e93) )
+	ROM_LOAD( "6x_xca__.3_0", 0x0000, 0x010000, CRC(807106a4) SHA1(29895cb8450dc916bffdd3958f144b0a35644c39) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "mdv58p1", 0x000001, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
-	ROM_LOAD16_BYTE( "mdv58p2", 0x000000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
-	ROM_LOAD16_BYTE( "mdv58p3", 0x100001, 0x080000, CRC(0d907e37) SHA1(b6ad78a4a7bc877d2152907df2317621f00bdc1c) )
-	ROM_LOAD16_BYTE( "mdv58p4", 0x100000, 0x080000, CRC(2e21c249) SHA1(d5192339313a8dd234cb164ca0094d9a7b64ccc2) )
-
-	ROM_REGION( 0x800000, "altvideo", 0 )
-	ROM_LOAD( "md______.8_1", 0x0000, 0x080000, CRC(3f3fa0d2) SHA1(bb52111bcea5cd404d1e7adf0f3ebca596a251ac) )
-	ROM_LOAD( "md______.8_2", 0x0000, 0x080000, CRC(14bb6b48) SHA1(97025f0899c325d28ac75c54e81fd425b5002064) )
-	ROM_LOAD( "md______.8_3", 0x0000, 0x080000, CRC(cde34cd1) SHA1(7874fa070e52e6c34b770aee5bfec522eb3d72c9) )
-	ROM_LOAD( "md______.8_4", 0x0000, 0x080000, CRC(39bc1267) SHA1(853e047406fed3c12f55a2e032e8c3d8188da182) )
-
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
-	ROM_LOAD( "mdsnda", 0x000000, 0x080000, CRC(18651603) SHA1(c6f7557a82cb49f3f001b43250129d10f4f6ab5a) )
-	ROM_LOAD( "mdsndb", 0x080000, 0x080000, CRC(2233d677) SHA1(a787dc0bafa310df9467e4b8166274288fe94b4c) )
+	/* none present */
 ROM_END
 
-
-
-ROM_START( v4monte )
+ROM_START( v4sixxh )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "montecarloorbustmpu4cardrom.bin", 0x0000, 0x010000, CRC(44967b33) SHA1(92d35d1b0edcc2eef1062468722c80ef8208b437) ) // Monte Carlo Or Bust Release D (c)1996
+	ROM_LOAD( "6x_xcab_.3_0", 0x0000, 0x010000, CRC(76f59137) SHA1(183dac7b11c9a7e8d5fdf44e1c6fa755121af5d3) )
 
-	/* Some roms were simply in a set marked as Monte Carlo, but the 2 letter code mn) is the same */
-	/* The roms were a mixture of
-	    VIDEO 5 - MONTE CARLO OR BUST!
-	    others contain
-	    NM4 Monte Carlo on Options4
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
 
-	    is the latter just an later revision, or a different game? (date suggests it isn't earlier)
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
 
-	*/
+ROM_START( v4sixxi )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "6x_xcad_.3_0", 0x0000, 0x010000, CRC(cbd4e105) SHA1(443ea2c4ff8afe5c43ee462bfca91ed10ad0d431) )
 
-	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS
-	// Monte Carlo Or Bust Release B (c)1995
-	ROM_LOAD( "mcob8ac", 0x0000, 0x010000, CRC(6dceb28f) SHA1(dc3daee15c25470501ab11e7b34cfef7edf302d4) )
-	ROM_LOAD( "mcobarc", 0x0000, 0x010000, CRC(f95045dc) SHA1(463af12feed6dfe5f5e23d584c4eac121672918a) )
-	ROM_LOAD( "mnb51020", 0x0000, 0x010000, CRC(c9ec7217) SHA1(006a70fb4050d726ae80678dc49afbd8c2c0c124) )
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
 
-	// Monte Carlo Or Bust Release C (c)1995
-	ROM_LOAD( "mn_", 0x0000, 0x010000, CRC(768bcc18) SHA1(d895f5207145a9d7b93b6b88fefc5be5ccf3eb72) )
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
 
-	// Monte Carlo Or Bust Release D (c)1996
-	ROM_LOAD( "mcob2025", 0x0000, 0x010000, CRC(0fe6ec1e) SHA1(de5b7edb40b9ab3fc9111eb83061d55ce569afdd) )
-	ROM_LOAD( "mcob5vd", 0x0000, 0x010000, CRC(44967b33) SHA1(92d35d1b0edcc2eef1062468722c80ef8208b437) )
-	ROM_LOAD( "mcobvd-1", 0x0000, 0x010000, CRC(e0b4bbab) SHA1(bd806a286464d36ff0cbff214ed60ccf81fd2db9) )
-	ROM_LOAD( "mcovd10", 0x0000, 0x010000, CRC(3f5adbd5) SHA1(f1876afd345e8398c1dc00b63be7d5a91f57519f) )
-	ROM_LOAD( "mn_xes__.d_0", 0x0000, 0x010000, CRC(25ee14a5) SHA1(2eba1b5b68a9f7ad6aacbdf6b93f6b4569164258) )
-	ROM_LOAD( "mnixes__.d_0", 0x0000, 0x010000, CRC(44967b33) SHA1(92d35d1b0edcc2eef1062468722c80ef8208b437) )
-	ROM_LOAD( "mn_37s__.d60", 0x0000, 0x010000, CRC(b048b0fb) SHA1(277622362d4d31b3e6386b27d1e043a88afea0ab) )
+ROM_START( v4sixxj )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "6x_xcak_.3_0", 0x0000, 0x010000, CRC(3d507696) SHA1(9148e33eeef25bb1f4f40ef65257133f744ad503) )
 
-	// Monte Carlo Or Bust Release E (c)1996
-	ROM_LOAD( "mn_x7s__.e60", 0x0000, 0x010000, CRC(a883207a) SHA1(948990c254eaaee7ab7c4d832290069170b2da78) )
-	ROM_LOAD( "mn_xea__.e_0", 0x0000, 0x010000, CRC(776d4004) SHA1(4bc0f5688f6fb39e9398a330317f281c4c7cb1cd) )
-	ROM_LOAD( "mn_xea_s.e_0", 0x0000, 0x010000, CRC(e18c6e5e) SHA1(b008129c50b0b9031f1324fb3feac5ac50695e87) )
-	ROM_LOAD( "mn_xead_.e_0", 0x0000, 0x010000, CRC(3cc8a7a5) SHA1(6d00e4ff02aee210d940d53d1bc0a3c8c57a4f76) )
-	ROM_LOAD( "mn_xes__.e_0", 0x0000, 0x010000, CRC(828bd8c1) SHA1(d6411579ec5f5b1a7f83d27d9e222d17e355441f) )
-	ROM_LOAD( "mn_xes_s.e_0", 0x0000, 0x010000, CRC(146af69b) SHA1(ce261fe2e93cb91a46bf67fcda504b168c84fa27) )
-	ROM_LOAD( "mn_xesb_.e_0", 0x0000, 0x010000, CRC(740f4f52) SHA1(cd811a90abd07d5cea466a631ffdc1329a5d3cff) )
-	ROM_LOAD( "mn_xesd_.e_0", 0x0000, 0x010000, CRC(c92e3f60) SHA1(2a07c11bb9e212b1cb049f087b618ec7f7e9e8bc) )
-	ROM_LOAD( "mn_xesk_.e_0", 0x0000, 0x010000, CRC(3faaa8f3) SHA1(6ddaf4ab3128ed16ad9abd9e77556710f88ec6f0) )
-	ROM_LOAD( "mni20s__.e_0", 0x0000, 0x010000, CRC(d34f809c) SHA1(6c51c2b52e06d2b115737690bf22dd0182f73fc2) )
-	ROM_LOAD( "mnixes__.e_0", 0x0000, 0x010000, CRC(e3f3b757) SHA1(f7a285730b7d76de4253c234be652021dc2bf860) )
-	ROM_LOAD( "mn_20a__.e_0", 0x0000, 0x010000, CRC(47d177cf) SHA1(7d3e59bc399b731880320899169732b20932c39d) )
-	ROM_LOAD( "mn_20sbs.e_0", 0x0000, 0x010000, CRC(d25256c3) SHA1(b359307021604e405b4bc50e38aa51f7675f73a0) )
-	ROM_LOAD( "mn_27s__.e60", 0x0000, 0x010000, CRC(983f17b1) SHA1(e57104ff8fc136db11fc81fc2160d1bc6961f362) )
-	ROM_LOAD( "mn_27sd_.e60", 0x0000, 0x010000, CRC(d39af010) SHA1(71ceb3ab370518b0e367dc93db9101efa4710067) )
-	ROM_LOAD( "mn_20s_s.e_0", 0x0000, 0x010000, CRC(24d6c150) SHA1(4671098dc24185837ace42acf224baabb2581906) )
-	ROM_LOAD( "mn_20sb_.e_0", 0x0000, 0x010000, CRC(44b37899) SHA1(9de7ba3284e6f091d1ae29f7fc861e1da3879daf) )
-	ROM_LOAD( "mn_20sd_.e_0", 0x0000, 0x010000, CRC(f99208ab) SHA1(1ac02645712bd9c2d575b42ea8641cec03347507) )
-	ROM_LOAD( "mn_20sk_.e_0", 0x0000, 0x010000, CRC(0f169f38) SHA1(66b95512c3f6bfdf0f6824b5a97b12ac55c56c50) )
-	ROM_LOAD( "mn_xesbs.e_0", 0x0000, 0x010000, CRC(e2ee6108) SHA1(838f724c49f1f737dae02d10dd6633994c6480fc) )
-	ROM_LOAD( "mn_37s__.e60", 0x0000, 0x010000, CRC(172d7c9f) SHA1(303bd7019b91c782255befea7a5e530030a6461b) )
-	ROM_LOAD( "mn_37sd_.e60", 0x0000, 0x010000, CRC(5c889b3e) SHA1(c55c395fc7aa8f6c0ab4f74acf41f04017da8330) )
-	ROM_LOAD( "mn_x7sd_.e60", 0x0000, 0x010000, CRC(e326c7db) SHA1(d09409b4edca673675bd3b3653de0608b463ea7c) )
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
 
-	// Monte Carlo Or Bust Release F (c)1996
-	ROM_LOAD( "mn_x7s__.f60", 0x0000, 0x010000, CRC(866a18ee) SHA1(b21bc50ef84e5e836da133caffb14b2ef680bdcd) )
-	ROM_LOAD( "mn_x7sd_.f60", 0x0000, 0x010000, CRC(cdcfff4f) SHA1(9e442cd46684efbdf186df48a1143a2b23f796e7) )
-	ROM_LOAD( "mn_20s__.f_0", 0x0000, 0x010000, CRC(9cded79e) SHA1(0702e57e04bfe860ec63122fe29a1ff920884c49) )
-	ROM_LOAD( "mn_27s__.f60", 0x0000, 0x010000, CRC(b6d62f25) SHA1(1d5f8c40ae12508bb146638706946da9107bacc1) )
-	ROM_LOAD( "mn_27sd_.f60", 0x0000, 0x010000, CRC(fd73c884) SHA1(32a972cf552af2d9b8c46de3d59b1adee9b4286d) )
-	ROM_LOAD( "mn_37s__.f60", 0x0000, 0x010000, CRC(39c4440b) SHA1(e54c480420313f3e5d3d67ffc0b5827458f20c9c) )
-	ROM_LOAD( "mn_37sd_.f60", 0x0000, 0x010000, CRC(7261a3aa) SHA1(08d289b5f2493d058db0779ae7858c3ea9ef7c85) )
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
 
-	// Monte Carlo on Option4 Release 9 (c)1996
-	ROM_LOAD( "mni20s__.940", 0x0000, 0x010000, CRC(13ac85ab) SHA1(f1d65613787dc1312ad68bd49dcb5a9a8bc1093c) )
-	ROM_LOAD( "mnixes__.940", 0x0000, 0x010000, CRC(2310b260) SHA1(309d5e34c811866cbef634032fddc53ca0b78966) )
-	ROM_LOAD( "mn_xesb_.940", 0x0000, 0x010000, CRC(b4ec4a65) SHA1(e360704a434dde21c6fb794f2b75ecd4b8cea2b5) )
-	ROM_LOAD( "mn_xea__.940", 0x0000, 0x010000, CRC(b78e4533) SHA1(5084f5434c0ee727e6b15422b5fc5d33a7e732d8) )
-	ROM_LOAD( "mn_xeab_.940", 0x0000, 0x010000, CRC(410ad2a0) SHA1(0f781bc89837e7def08f71589834ccbdadca6409) )
-	ROM_LOAD( "mn_xes__.940", 0x0000, 0x010000, CRC(4268ddf6) SHA1(e81cc5f429ae8c3e868ac6301b60b7a0acd2d190) )
-	ROM_LOAD( "mn_x7s__.9a0", 0x0000, 0x010000, CRC(6860254d) SHA1(a0247ec07f2ec13fadc543986d27b5763d799f9b) )
-	ROM_LOAD( "mn_20ab_.940", 0x0000, 0x010000, CRC(71b6e56b) SHA1(b87b488398b5554b63324b3c8d47f5ed2210026d) )
-	ROM_LOAD( "mn_20a__.940", 0x0000, 0x010000, CRC(873272f8) SHA1(7097987c175fc441a6ae6f1a7a0dec3ef5bf53a5) )
-	ROM_LOAD( "mn_20sb_.940", 0x0000, 0x010000, CRC(84507dae) SHA1(1a2fb9514cbcb44f324574fc913a7f1f5d321e53) )
-	ROM_LOAD( "mn_27s__.9a0", 0x0000, 0x010000, CRC(58dc1286) SHA1(d90fe58b612d438c082fb7dac8db82bec3faabf9) )
-	ROM_LOAD( "mn_27sd_.9a0", 0x0000, 0x010000, CRC(1379f527) SHA1(e9b84b8844be7c26f2e7db731c48b0c6d2bfd689) )
-	ROM_LOAD( "mn_37s__.9a0", 0x0000, 0x010000, CRC(d7ce79a8) SHA1(6daa848f79ad65bd2567afbacee2dcbb60317f29) )
-	ROM_LOAD( "mn_37sd_.9a0", 0x0000, 0x010000, CRC(9c6b9e09) SHA1(1b0d35c2ba906b1e478e58d66fc5432cdf05f36b) )
-	ROM_LOAD( "mn_x7sd_.9a0", 0x0000, 0x010000, CRC(23c5c2ec) SHA1(42568dd981a65c34ae7e25c201ccc90c109bf32e) )
-	ROM_LOAD( "mn_20s__.940", 0x0000, 0x010000, CRC(72d4ea3d) SHA1(bf2d3279550351069ccc04064dc3b6966b11ee12) )
+ROM_START( v4sixxk )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "6xi20s__.3_0", 0x0000, 0x010000, CRC(2453c63c) SHA1(c83df6afd45d25de0f315b5a75ecd486bca13018) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
 
+ROM_START( v4sixxl )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "6xixcs__.3_0", 0x0000, 0x010000, CRC(14eff1f7) SHA1(a9cb41d2c812e3fa51b859912130a4a1e1c0f43d) )
 
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
 
-	// these look like some other MPU4 game called Monte Carlo...
-	ROM_LOAD( "mx_05a__.2_1", 0x0000, 0x010000, CRC(a1a03e03) SHA1(bf49b516e6824a47cd9bf1408bf676f9f1e43d62) )
-	ROM_LOAD( "mx_10a__.2_1", 0x0000, 0x010000, CRC(bbf21e9f) SHA1(901b14b96cdb0945f491c39707ab9d2b9a2d25dd) )
-	ROM_LOAD( "mx_20__c.1_1", 0x0000, 0x010000, CRC(a753798d) SHA1(ae1f5f14a37dead66f6b2d075a5bfc019d59f806) )
-	ROM_LOAD( "mx_20a_c.1_1", 0x0000, 0x010000, CRC(9ec6f5fb) SHA1(ee181a64557053349cc8bff86bba937b191cab01) )
-	ROM_LOAD( "mx_20dkc.1_1", 0x0000, 0x010000, CRC(d580f742) SHA1(3c1d6aba4068d60ab53eceecf65bc920f8b5604e) )
-	ROM_LOAD( "mx_25__c.3_1", 0x0000, 0x010000, CRC(11ae121d) SHA1(11e61db1c645410ac18ef429cde167a7774be5f5) )
-	ROM_LOAD( "mx_25_bc.3_1", 0x0000, 0x010000, CRC(4228139c) SHA1(a448ddc034923cba58ee298fd2a4c2cdd4f84f04) )
-	ROM_LOAD( "mx_25a_c.3_1", 0x0000, 0x010000, CRC(283b9e6b) SHA1(937da8bda49a7a0fa1f728770f96d10a65bfe7bc) )
-	ROM_LOAD( "mxi05___.2_1", 0x0000, 0x010000, CRC(de425b55) SHA1(2aa63bbd32c766e7e2d888345115c3185dc03bff) )
-	ROM_LOAD( "mxi10___.2_1", 0x0000, 0x010000, CRC(19077425) SHA1(e31da38a903345c65b083cac192555f1f4ba2e5a) )
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
 
+ROM_START( v4sixxm )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "6xixcsd_.3_0", 0x0000, 0x010000, CRC(5f4a1656) SHA1(b541ce749bcfca9ef89e320e46cdf060acbca8c3) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "mcobo4p1", 0x000001, 0x080000, CRC(aaa594f0) SHA1(2bcb13d8b93911a69c181d6f0be43397baf8cbc8) )
-	ROM_LOAD16_BYTE( "mcobo4p2", 0x000000, 0x080000, CRC(ab94c22a) SHA1(a8a0ed992c0b95fb763aea37f78c8d7a53732509) )
-	ROM_LOAD16_BYTE( "mcobo4p3", 0x100001, 0x080000, CRC(ebe851df) SHA1(61d37a7f91480592da6f5b6ee7ef4b6097ee5c65) )
-	ROM_LOAD16_BYTE( "mcobo4p4", 0x100000, 0x080000, CRC(49b0cfd7) SHA1(51fe74371bdac3c507a04aa9faeb522640d1cdf7) )
+	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
+	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
+	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
+	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
+
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
 
 
 
-	ROM_REGION( 0x800000, "altvideo", 0 )
-	// these are bad dumps I think, they're 0x40000-0x60000 of the main roms?
-	ROM_LOAD( "montecarloorbustvideoboardp1.bin", 0x0000, 0x020000, CRC(5fd2c5ee) SHA1(60194df160070754e1cce6558dedc87b7fc05044) )
-	ROM_LOAD( "montecarloorbustvideoboardp2.bin", 0x0000, 0x020000, CRC(7f6747cb) SHA1(0a85c0199583c5c48012f627ec3e4c3d12e39859) )
-	ROM_LOAD( "montecarloorbustvideoboardp3.bin", 0x0000, 0x020000, CRC(f3d4a37d) SHA1(e81df776bb220832b45a5f6d12e8831f17dbd10b) )
-	ROM_LOAD( "montecarloorbustvideoboardp4.bin", 0x0000, 0x020000, CRC(94be9981) SHA1(fe5803102e5e301ad6659ed83d319f55aa62c33e) )
 
-	// this seems to be an alt (incomplete? set)
-	ROM_LOAD( "mn______.f_1", 0x0000, 0x080000, CRC(1a81b3fb) SHA1(bbf0fe7e48404962a2f2120734efe71dc1eed64c) ) // unmatched rom? (significant changes)
-	ROM_LOAD( "mcop3vd", 0x0000, 0x080000, CRC(721e9ad1) SHA1(fb926debd57301c9c0c3ecb9bb1ac36b0b60ee40) ) // alt p3 (significant changes)
-	ROM_LOAD( "mcop4vd", 0x0000, 0x080000, CRC(6eba1107) SHA1(c696b620781782c3b4045fe3550ab8e7e905661d) ) // alt p4 (significant changes
 
-	ROM_REGION( 0x10000, "unk", 0 ) // something else?
-	ROM_LOAD( "montvnd", 0x0000, 0x010000, CRC(9858bb1d) SHA1(a2d3de2cec7420cc6f7da2239bdc79d7c4b7394e) ) // this looks like a different MPU4 game? - check
 
-	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
-	ROM_LOAD( "mcosnda.bin", 0x000000, 0x080000, CRC(801ea236) SHA1(531841d6a4d67f502e93f8d74f3b247ccc46208f) )
-	ROM_LOAD( "mcosndb.bin", 0x080000, 0x080000, CRC(fcbad433) SHA1(a8cd32ca5a17e3c35701a7eac3e9ef741aa04105) )
-ROM_END
 
 
-ROM_START( v4ovrmn3 )
+ROM_START( v4megbuk )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "o3_20s__.4_0", 0x0000, 0x010000, CRC(fab0af50) SHA1(de57130763965bcea42dd17c1094a2d1c363d328) )
-
-	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS
-	ROM_LOAD( "o3_20sb_.4_0", 0x0000, 0x010000, CRC(0c3438c3) SHA1(dd0fc2db66d7bfb97f7f456c92654fc60c494e49) )
-	ROM_LOAD( "o3_20sd_.4_0", 0x0000, 0x010000, CRC(b11548f1) SHA1(59585394c57a0441817d2bea424abe0bcf09f7ff) )
-	ROM_LOAD( "o3_20sk_.4_0", 0x0000, 0x010000, CRC(4791df62) SHA1(c3d8ecf5f35a95aa5b2fd0a4085aa80b0b6d4447) )
-	ROM_LOAD( "o3i20s__.4_0", 0x0000, 0x010000, CRC(9bc8c0c6) SHA1(19ea9614ca2a9c28e1819d1451bc3117360f143f) )
+	ROM_LOAD( "mc_xc___.2_0", 0x0000, 0x010000, CRC(372ed757) SHA1(ce9d13bc546b7e64ee377627577b3ae0848e8659) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	// these 2 match Bubbly Bonk ??
-	ROM_LOAD16_BYTE( "o3______.4_1", 0x000000, 0x010000,  CRC(1e85dd5d) SHA1(0f3c35d9f75d3495e2d0cc1fcf0e96dcbbeeacc8)) // == bu______.4_1
-	ROM_LOAD16_BYTE( "o3______.4_2", 0x000001, 0x010000,  CRC(989db70a) SHA1(e44f8900392db51cc3f0a5bf0391bde0d71b9878)) // == bu______.4_2
-	ROM_LOAD16_BYTE( "o3______.4_3", 0x020000, 0x010000, CRC(e6adda98) SHA1(176df97e3f0b22531a4c7b30e951bab0bc6403ad) )
-	ROM_LOAD16_BYTE( "o3______.4_4", 0x020001, 0x010000, CRC(b044faef) SHA1(e78f44fa32d9b8428e8ba9f19d95c0e32b8ec1e8) )
-	ROM_LOAD16_BYTE( "o3______.4_5", 0x040000, 0x010000, CRC(5bcc553d) SHA1(dd073cccce6fca693b772f6739132382b237bc67) )
-	ROM_LOAD16_BYTE( "o3______.4_6", 0x040001, 0x010000, CRC(ea616d69) SHA1(e606f5e999a93f8505f529c95fe209c6452934c3) )
-	ROM_LOAD16_BYTE( "o3______.4_7", 0x060000, 0x010000, CRC(e4dc300d) SHA1(8631bd78abfebcfa75f60a891b9709d84c8124e7) )
-	ROM_LOAD16_BYTE( "o3______.4_8", 0x060001, 0x010000, CRC(c51ffb5f) SHA1(78b0d8fe04d419d52b68549a61bdc51b3bbda50f) )
-	ROM_LOAD16_BYTE( "o3______.4_9", 0x080000, 0x010000, CRC(6201a444) SHA1(a4a419fd94c571a85259f0f0092e1c99ef6b5797) )
-	ROM_LOAD16_BYTE( "o3______.4_a", 0x080001, 0x010000, CRC(5b526937) SHA1(dd9de97ee48a157a26e8e70211819aed0a87921c) )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
 	/* none present */
 ROM_END
 
+ROM_START( v4megbuka )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "mc_xc_b_.2_0", 0x0000, 0x010000, CRC(c1aa40c4) SHA1(c1ce0bf5929ccba6d5e4ad7508e41d1df8fe10f2) )
+
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
 
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
 
-ROM_START( v4pztet )
+ROM_START( v4megbukb )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "tc______.2_0", 0x0000, 0x010000, CRC(9a94ccaf) SHA1(42988a22c26f88fa07c1ab68a85f15bc3af0a71c) )
-
-	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS
-	ROM_LOAD( "tc____d_.2_0", 0x0000, 0x010000, CRC(d1312b0e) SHA1(d1ba8f49a0b30771f5ffbaaf3f8b6142965a8330) )
+	ROM_LOAD( "mc_xc_d_.2_0", 0x0000, 0x010000, CRC(7c8b30f6) SHA1(d851fc2dcb5cf72d0b63ce6fe47b0350faa94356) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "tc______.2_1", 0x000000, 0x010000, CRC(048f30b5) SHA1(e6cf196cabe5c9b27a40942f547d50135d9633d0) )
-	ROM_LOAD16_BYTE( "tc______.2_2", 0x000001, 0x010000, CRC(546719a6) SHA1(17a0fd552f4afa9d4eaeec903f3952f61af345d2) )
-	ROM_LOAD16_BYTE( "tc______.2_3", 0x020000, 0x010000, CRC(6afa8148) SHA1(f4bfe41c9b9bb363c4fc1de616d641bea22248ba) )
-	ROM_LOAD16_BYTE( "tc______.2_4", 0x020001, 0x010000, CRC(f7f99e42) SHA1(ca3b26fd911b8fc277e14dcdba428cb15288c995) )
-	ROM_LOAD16_BYTE( "tc______.2_5", 0x040000, 0x010000, CRC(a2a50948) SHA1(57bf6c0738363da93ec6f379a23e706d1a6fc237) )
-	ROM_LOAD16_BYTE( "tc______.2_6", 0x040001, 0x010000, CRC(de2146e4) SHA1(4e65c5d59d561d052834c9a0d139c286839fcf86) )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
 	/* none present */
 ROM_END
 
-
-ROM_START( v4pzteta )
+ROM_START( v4megbukc )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "tp______.2_0", 0x0000, 0x010000, CRC(17757b59) SHA1(013690047e2769c420a9422c662990a71e1bd09d) )
-
-	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS
-	ROM_LOAD( "tp____d_.2_0", 0x0000, 0x010000, CRC(5cd09cf8) SHA1(3c288169f9bd49affaaa4e1f5f0fdddf52f381a8) )
+	ROM_LOAD( "mc_xc_k_.2_0", 0x0000, 0x010000, CRC(8a0fa765) SHA1(d687a324223ac1d32a312c8666f63772dc5d9e2b) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "tp______.2_1", 0x000000, 0x010000, CRC(91f3a03d) SHA1(c1eb60b32052cfe188cf465233a2fa0d0ca0a649) )
-	ROM_LOAD16_BYTE( "tp______.2_2", 0x000001, 0x010000, CRC(f5fc5d3d) SHA1(d22f92769c0ad2c30887c60680ff1f984013bd02) )
-	ROM_LOAD16_BYTE( "tp______.2_3", 0x020000, 0x010000, CRC(ef015d5e) SHA1(d7477743cbc0cc7c2e8cdf33a2c82c0425dd7d61) )
-	ROM_LOAD16_BYTE( "tp______.2_4", 0x020001, 0x010000, CRC(401b5a50) SHA1(1b9bea05d4ba69d874f0067908bcfc19a5d8c6af) )
-	ROM_LOAD16_BYTE( "tp______.2_5", 0x040000, 0x010000, CRC(e35cb24b) SHA1(a1c32c195b1d61a99b784c646ad78fa59b8270c4) )
-	ROM_LOAD16_BYTE( "tp______.2_6", 0x040001, 0x010000, CRC(fecd48d0) SHA1(67ee3bee7aade5ec5fce1fcfe7ef3982264f1762) )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
 	/* none present */
@@ -3444,140 +8851,75 @@
 
 
 
-ROM_START( v4rhmaz )
+ROM_START( v4rencas )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "rm_10___.4_0", 0x0000, 0x010000, CRC(5e9b282e) SHA1(d40744ae4cb36e49398f2f2e91274f9a1ecbe018) )
-
-	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS
-	ROM_LOAD( "rm_10_b_.4_0", 0x0000, 0x010000, CRC(a81fbfbd) SHA1(24fda5a2eaa7291ad4869d2f3061798360c5e862) )
-	ROM_LOAD( "rm_10_d_.4_0", 0x0000, 0x010000, CRC(153ecf8f) SHA1(a1d67c2298bbd008be69b7ae7b3b92669972e37f) )
-	ROM_LOAD( "rm_20___.4_0", 0x0000, 0x010000, CRC(8c5811a6) SHA1(2b51776e7dc78c322173708c6426b9eafde84870) )
-	ROM_LOAD( "rm_20_b_.4_0", 0x0000, 0x010000, CRC(7adc8635) SHA1(8af3c8f332ca877f82940bc2a4e7abc4d37d6f48) )
-	ROM_LOAD( "rm_20_bl.4_0", 0x0000, 0x010000, CRC(244c3e2c) SHA1(c764fe5a5ec74a4c4bb8bfea1bab2e8ae95cc4e7) )
-	ROM_LOAD( "rm_20_d_.4_0", 0x0000, 0x010000, CRC(c7fdf607) SHA1(eab05365451d66e23163cbed433921bcbd415022) )
-	ROM_LOAD( "rm_xc___.4_0", 0x0000, 0x010000, CRC(bce4266d) SHA1(018419adc7ee4af6c183868d1b7c3ef0cab8a837) )
-	ROM_LOAD( "rm_xc_b_.4_0", 0x0000, 0x010000, CRC(4a60b1fe) SHA1(8effdbcf89aa942c434ebbb5e7127c357608d83f) )
-	ROM_LOAD( "rm_xc_d_.4_0", 0x0000, 0x010000, CRC(f741c1cc) SHA1(576e250319ea2269982cfd6b5ea68ae4a26f81f2) )
-	ROM_LOAD( "rm_xc_k_.4_0", 0x0000, 0x010000, CRC(01c5565f) SHA1(293b7591cd73d12552db751629a60aa315433dbf) )
-	ROM_LOAD( "rmixc___.4_0", 0x0000, 0x010000, CRC(dd9c49fb) SHA1(649eb1d5fd05698e60094fe7225413da4971d65b) )
+	ROM_LOAD( "rc_20a__.3_0", 0x0000, 0x010000, CRC(9727f862) SHA1(7815bef16fa7304108d553bbf897376ce2a45ad6) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "rm______.4_1", 0x000000, 0x010000, CRC(51af0692) SHA1(74e52d63adeaaa1f0949dad60f5d4ca1635d2261) )
-	ROM_LOAD16_BYTE( "rm______.4_2", 0x000001, 0x010000, CRC(2c0971ee) SHA1(7ee22c7bf0e0dcc548537a6418d56c7088a699a0) )
-	ROM_LOAD16_BYTE( "rm______.4_3", 0x020000, 0x010000, CRC(b7981930) SHA1(d4356dcbbfda7486a684d8c8d375648dd0f8e200) )
-	ROM_LOAD16_BYTE( "rm______.4_4", 0x020001, 0x010000, CRC(1bc71ac8) SHA1(ac0f56d974a4aba143cb3b8cad8a65dc25b3e145) )
-	ROM_LOAD16_BYTE( "rm______.4_5", 0x040000, 0x010000, CRC(71460efc) SHA1(3ae79df9d3ec83abdde059827e06e81316026380) )
-	ROM_LOAD16_BYTE( "rm______.4_6", 0x040001, 0x010000, CRC(471678de) SHA1(919394768314bc8707f93875528dca33bcf7e09c) )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
 	/* none present */
 ROM_END
 
+ROM_START( v4rencasa )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rc_20ab_.3_0", 0x0000, 0x010000, CRC(61a36ff1) SHA1(33a8bd624e995acc43757689988aee1ac79939f1) )
 
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
 
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
 
-ROM_START( v4sunbst )
+ROM_START( v4rencasb )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "st_10___.4_0", 0x0000, 0x010000, CRC(153ce606) SHA1(2e3fada2d150ac46ca38d67845a97d649f7489f9) )
-
-	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS
-	ROM_LOAD( "st_10_b_.4_0", 0x0000, 0x010000, CRC(e3b87195) SHA1(f6bc0edd6c1e5396fb10adaee1d1d870262ff084) )
-	ROM_LOAD( "st_10_d_.4_0", 0x0000, 0x010000, CRC(5e9901a7) SHA1(8e3b620d31e03589330d92bce7fac038a2c2484b) )
-	ROM_LOAD( "st_10_k_.4_0", 0x0000, 0x010000, CRC(a81d9634) SHA1(70aded04e2d014632d832d299b0a88124334d2b6) )
-	ROM_LOAD( "st_20___.4_0", 0x0000, 0x010000, CRC(c7ffdf8e) SHA1(2dd24eeff88ae62b83302404c1304eeb81b83284) )
-	ROM_LOAD( "st_20_b_.4_0", 0x0000, 0x010000, CRC(317b481d) SHA1(f06e3510c0a16efa27e94f455c51e8f8cdbc23ae) )
-	ROM_LOAD( "st_20_bl.4_0", 0x0000, 0x010000, CRC(6febf004) SHA1(d70a64343d6e509fa10cc2321d14dffda4fb2a4a) )
-	ROM_LOAD( "st_20_d_.4_0", 0x0000, 0x010000, CRC(8c5a382f) SHA1(76e5927216c6bd12d3e3c7bc614366c12a733865) )
-	ROM_LOAD( "st_20_dl.4_0", 0x0000, 0x010000, CRC(d2ca8036) SHA1(cb2db62defeab671e8407e8139feb3b1f9d91c1f) )
-	ROM_LOAD( "st_20_k_.4_0", 0x0000, 0x010000, CRC(7adeafbc) SHA1(216a3344c5e9e60e4429cfb7813ff250db7eb378) )
-	ROM_LOAD( "st_20bg_.4_0", 0x0000, 0x010000, CRC(4eaae703) SHA1(bdc2a0d752496708b911579867844870b799ee5b) )
-	ROM_LOAD( "st_20bt_.4_0", 0x0000, 0x010000, CRC(f8e1ea00) SHA1(ce3a0bb34a966d15797e7e398d88342b488e0cb1) )
-	ROM_LOAD( "st_xc___.4_0", 0x0000, 0x010000, CRC(f743e845) SHA1(af60698c8349a982b9cb5bef0a9d670cf3658a0c) )
-	ROM_LOAD( "st_xc__l.4_0", 0x0000, 0x010000, CRC(a9d3505c) SHA1(07dd1b9a3c663a6315aa3e02bcaa4bc3f38cc4e0) )
-	ROM_LOAD( "st_xc_b_.4_0", 0x0000, 0x010000, CRC(01c77fd6) SHA1(7562969f482e20ed4a7d66d204309c12ae1843f6) )
-	ROM_LOAD( "st_xc_d_.4_0", 0x0000, 0x010000, CRC(bce60fe4) SHA1(dd2a7e35afe5ed9b07c7395e746090205f014b54) )
-	ROM_LOAD( "st_xc_dl.4_0", 0x0000, 0x010000, CRC(e276b7fd) SHA1(b6c295a4f1b7bae5bab0ce75032f514945a0c637) )
-	ROM_LOAD( "st_xc_k_.4_0", 0x0000, 0x010000, CRC(4a629877) SHA1(8c6e5dba3dc048a727562c53203f26d3ac8fc7ee) )
-	ROM_LOAD( "sti10___.4_0", 0x0000, 0x010000, CRC(74448990) SHA1(4a6163f20f0f79c4328c6e9577b7063d91f5ae33) )
-	ROM_LOAD( "sti20___.4_0", 0x0000, 0x010000, CRC(a687b018) SHA1(a1f2bd6568a01614a08b9f64abda458d7b7d3fd4) )
-	ROM_LOAD( "stixc___.4_0", 0x0000, 0x010000, CRC(963b87d3) SHA1(8999b41cf214992ed8aab60c83cfdb06b7a2b312) )
-	ROM_LOAD( "stixc_d_.4_0", 0x0000, 0x010000, CRC(dd9e6072) SHA1(a28e3e20863f737e7ba8db434c4563d9bfb15fca) )
+	ROM_LOAD( "rc_20ad_.3_0", 0x0000, 0x010000, CRC(dc821fc3) SHA1(2b7ae1b971d137e4f9dc36bf482d3f69f6737a94) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "st______.4_1", 0x000000, 0x010000, CRC(2cd0bfeb) SHA1(e46261451737a99cbb9b7037224d7839c94df7dd) )
-	ROM_LOAD16_BYTE( "st______.4_2", 0x000001, 0x010000, CRC(673b3f88) SHA1(e659c4a4ad5851843f14025b16870a5bd26db038) )
-	ROM_LOAD16_BYTE( "st______.4_3", 0x020000, 0x010000, CRC(8ae08d60) SHA1(75addb1a323a44cd745b77269d258de4988368d9) )
-	ROM_LOAD16_BYTE( "st______.4_4", 0x020001, 0x010000, CRC(ebab723c) SHA1(4bdeb4ec3970ade52d4385cdf38e44b86e46eee2) )
-	ROM_LOAD16_BYTE( "st______.4_5", 0x040000, 0x010000, CRC(9d8d22ad) SHA1(13fad9b138893e2d536ea2bde5d20830db12f30f) )
-	ROM_LOAD16_BYTE( "st______.4_6", 0x040001, 0x010000, CRC(a139005a) SHA1(ddd417afa7fff180396d3d619bf2e2aa96f26cb9) )
-	ROM_LOAD16_BYTE( "st______.4_7", 0x060000, 0x010000, CRC(d54ef568) SHA1(acce3b37dcd05ca335bbc44bc05d9093a6cebd3c) )
-	ROM_LOAD16_BYTE( "st______.4_8", 0x060001, 0x010000, CRC(d9aa0643) SHA1(6de6b14dcc9cb0a3eef3635dd07e5f1c16928e6e) )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
 	/* none present */
 ROM_END
 
-
-ROM_START( v4timebn )
+ROM_START( v4rencasc )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "ba_20s__.1_0", 0x0000, 0x010000, CRC(55a7b969) SHA1(2809f207fcfe5357b50df1124f8bf55c6e629308) )
-
-	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS
-	ROM_LOAD( "ba_20a__.1_0", 0x0000, 0x010000, CRC(a04121ac) SHA1(7ba2f229de8bc5883e6e961d873e5fa524680201) )
-	ROM_LOAD( "ba_20bg_.1_0", 0x0000, 0x010000, CRC(dcf281e4) SHA1(0145b8d558ed95b96590cdf9c2f54b6b5f26971d) )
-	ROM_LOAD( "ba_20bt_.1_0", 0x0000, 0x010000, CRC(6ab98ce7) SHA1(6f56c8ba4681255c505bb52e3a76751d1e8acb0e) )
-	ROM_LOAD( "ba_20sb_.1_0", 0x0000, 0x010000, CRC(a3232efa) SHA1(12ca99a3f368e54a82719382820e4778bdaccb6e) )
-	ROM_LOAD( "ba_20sd_.1_0", 0x0000, 0x010000, CRC(1e025ec8) SHA1(87cb62ae81aa2735edba08d34c6aa31c78e545e8) )
+	ROM_LOAD( "rc_20ak_.3_0", 0x0000, 0x010000, CRC(2a068850) SHA1(87d439e3e03fb5a9ba225dea37d0aaa8e2f475f9) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "ba______.1_1", 0x000000, 0x080000, CRC(df853e0e) SHA1(07b0b9aa8a6dc3a70991236f8c1f88b4a6c6755f) )
-	ROM_LOAD16_BYTE( "ba______.1_2", 0x000001, 0x080000, CRC(9a2ab155) SHA1(582b33f9ddbf7fb2da71ec6ad5fbbb20a03eda19) )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
-	ROM_LOAD( "ba______.1_a", 0x000000, 0x080000, CRC(976d761b) SHA1(32cceff2cd9bc6ad48caac0a2d95d815a5f24aa9) )
-	ROM_LOAD( "ba______.1_b", 0x080000, 0x080000, CRC(25a6c7ef) SHA1(cb614c7b2142e47862127d9fdfc7db50978f7f00) )
+	/* none present */
 ROM_END
 
-
-ROM_START( v4sixx )
+ROM_START( v4rencasd )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "6x_20s__.3_0", 0x0000, 0x010000, CRC(452ba9aa) SHA1(4034bfdba6cb46a63a59ba56e19ae912f5633412) )
-
-	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS
-	ROM_LOAD( "6x_20a__.3_0", 0x0000, 0x010000, CRC(b0cd316f) SHA1(56e2499f041cc534571f14492b5bd8d64a7f0c7b) )
-	ROM_LOAD( "6x_20ad_.3_0", 0x0000, 0x010000, CRC(fb68d6ce) SHA1(186230bd84d41cbe45f808a63f06d37edff818b1) )
-	ROM_LOAD( "6x_20ak_.3_0", 0x0000, 0x010000, CRC(0dec415d) SHA1(2f9231ee5a3ab978bbeade3495038c14c13cba09) )
-	ROM_LOAD( "6x_20bg_.3_0", 0x0000, 0x010000, CRC(cc7e9127) SHA1(ceeab2d61eec87977528030ea8d4b870d08adae2) )
-	ROM_LOAD( "6x_20bt_.3_0", 0x0000, 0x010000, CRC(7a359c24) SHA1(2a3496ef1da06aa5a65b79e598ac4652d4520551) )
-	ROM_LOAD( "6x_20sb_.3_0", 0x0000, 0x010000, CRC(b3af3e39) SHA1(2690b8e84e812898390979268ab496e5fb12f6ca) )
-	ROM_LOAD( "6x_xca__.3_0", 0x0000, 0x010000, CRC(807106a4) SHA1(29895cb8450dc916bffdd3958f144b0a35644c39) )
-	ROM_LOAD( "6x_xcab_.3_0", 0x0000, 0x010000, CRC(76f59137) SHA1(183dac7b11c9a7e8d5fdf44e1c6fa755121af5d3) )
-	ROM_LOAD( "6x_xcad_.3_0", 0x0000, 0x010000, CRC(cbd4e105) SHA1(443ea2c4ff8afe5c43ee462bfca91ed10ad0d431) )
-	ROM_LOAD( "6x_xcak_.3_0", 0x0000, 0x010000, CRC(3d507696) SHA1(9148e33eeef25bb1f4f40ef65257133f744ad503) )
-	ROM_LOAD( "6xi20s__.3_0", 0x0000, 0x010000, CRC(2453c63c) SHA1(c83df6afd45d25de0f315b5a75ecd486bca13018) )
-	ROM_LOAD( "6xixcs__.3_0", 0x0000, 0x010000, CRC(14eff1f7) SHA1(a9cb41d2c812e3fa51b859912130a4a1e1c0f43d) )
-	ROM_LOAD( "6xixcsd_.3_0", 0x0000, 0x010000, CRC(5f4a1656) SHA1(b541ce749bcfca9ef89e320e46cdf060acbca8c3) )
+	ROM_LOAD( "rc_20s__.3_0", 0x0000, 0x010000, CRC(62c160a7) SHA1(ea0979ebe0a12f58b15825e1a4074385453e839c) )
 
 	ROM_REGION( 0x800000, "video", 0 )
-	ROM_LOAD16_BYTE( "6x______.3_1", 0x000000, 0x010000, CRC(870dc043) SHA1(a0bcc8dbfc3cfdd43ed1d6ed5308c43a6f4f8117) )
-	ROM_LOAD16_BYTE( "6x______.3_2", 0x000001, 0x010000, CRC(f9ff2007) SHA1(87833cd36859332195c845fffb8a310eb561ae2b) )
-	ROM_LOAD16_BYTE( "6x______.3_3", 0x020000, 0x010000, CRC(e8a4531d) SHA1(c816b3b270f1aeaf3ee90aa65dfeea59e8862d1a) )
-	ROM_LOAD16_BYTE( "6x______.3_4", 0x020001, 0x010000, CRC(4129b8af) SHA1(30ad007f543e570021292f3eef728b0697c31bb5) )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
 
 	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
 	/* none present */
 ROM_END
 
+ROM_START( v4rencase )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rc_20sb_.3_0", 0x0000, 0x010000, CRC(9445f734) SHA1(74cff30e57a7cc856e72c1bfd8ab2d8d259a2b72) )
 
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
 
-ROM_START( v4megbuk )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "mc_xc___.2_0", 0x0000, 0x010000, CRC(372ed757) SHA1(ce9d13bc546b7e64ee377627577b3ae0848e8659) )
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
 
-	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS
-	ROM_LOAD( "mc_xc_b_.2_0", 0x0000, 0x010000, CRC(c1aa40c4) SHA1(c1ce0bf5929ccba6d5e4ad7508e41d1df8fe10f2) )
-	ROM_LOAD( "mc_xc_d_.2_0", 0x0000, 0x010000, CRC(7c8b30f6) SHA1(d851fc2dcb5cf72d0b63ce6fe47b0350faa94356) )
-	ROM_LOAD( "mc_xc_k_.2_0", 0x0000, 0x010000, CRC(8a0fa765) SHA1(d687a324223ac1d32a312c8666f63772dc5d9e2b) )
+ROM_START( v4rencasf )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rc_20sd_.3_0", 0x0000, 0x010000, CRC(29648706) SHA1(649aed977028a57664f181bc159663c93fe86e67) )
 
 	ROM_REGION( 0x800000, "video", 0 )
 	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
@@ -3586,22 +8928,20 @@
 	/* none present */
 ROM_END
 
+ROM_START( v4rencasg )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rc_20sk_.3_0", 0x0000, 0x010000, CRC(dfe01095) SHA1(bf7c2b93bce4d5caa3c56ff948439acc99efd75b) )
 
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
 
-ROM_START( v4rencas )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "rc_20a__.3_0", 0x0000, 0x010000, CRC(9727f862) SHA1(7815bef16fa7304108d553bbf897376ce2a45ad6) )
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
 
-	ROM_REGION( 0x10000, "altmain", 0 ) // alt MPU4 interface ROMS
-	ROM_LOAD( "rc_20ab_.3_0", 0x0000, 0x010000, CRC(61a36ff1) SHA1(33a8bd624e995acc43757689988aee1ac79939f1) )
-	ROM_LOAD( "rc_20ad_.3_0", 0x0000, 0x010000, CRC(dc821fc3) SHA1(2b7ae1b971d137e4f9dc36bf482d3f69f6737a94) )
-	ROM_LOAD( "rc_20ak_.3_0", 0x0000, 0x010000, CRC(2a068850) SHA1(87d439e3e03fb5a9ba225dea37d0aaa8e2f475f9) )
-	ROM_LOAD( "rc_20s__.3_0", 0x0000, 0x010000, CRC(62c160a7) SHA1(ea0979ebe0a12f58b15825e1a4074385453e839c) )
-	ROM_LOAD( "rc_20sb_.3_0", 0x0000, 0x010000, CRC(9445f734) SHA1(74cff30e57a7cc856e72c1bfd8ab2d8d259a2b72) )
-	ROM_LOAD( "rc_20sd_.3_0", 0x0000, 0x010000, CRC(29648706) SHA1(649aed977028a57664f181bc159663c93fe86e67) )
-	ROM_LOAD( "rc_20sk_.3_0", 0x0000, 0x010000, CRC(dfe01095) SHA1(bf7c2b93bce4d5caa3c56ff948439acc99efd75b) )
+ROM_START( v4rencash )
+	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "rci20___.3_0", 0x0000, 0x010000, CRC(03b90f31) SHA1(89c73b74751a648686480a17071b231fdfd9002d) )
-	ROM_LOAD( "rci20_d_.3_0", 0x0000, 0x010000, CRC(481ce890) SHA1(2fe493728acc2aa0398fcc6559bce572ce921274) )
 
 	ROM_REGION( 0x800000, "video", 0 )
 	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
@@ -3610,130 +8950,551 @@
 	/* none present */
 ROM_END
 
+ROM_START( v4rencasi )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "rci20_d_.3_0", 0x0000, 0x010000, CRC(481ce890) SHA1(2fe493728acc2aa0398fcc6559bce572ce921274) )
 
+	ROM_REGION( 0x800000, "video", 0 )
+	ROM_LOAD("video_board_roms", 0x0000, 0x10000, NO_DUMP )
 
+	ROM_REGION( 0x200000, "msm6376", ROMREGION_ERASE00 )
+	/* none present */
+ROM_END
 
 
 
 /* Complete sets */
 /* Standard sets are the most common setups, while Datapak releases use a BACTA datalogger (not emulated) to record more information about the game operation, for security etc.
 AMLD versions do not pay out, and instead just feature highscore tables. These were mainly intended for locations unwilling to pay for gaming licenses.
-The AMLD Crystal Maze versions appear to be a mixture of the original game modules and Team Challenge's scoring system. This would suggest they were all made ~1994. */
+The AMLD Crystal Maze versions appear to be a mixture of the original game modules and Team Challenge's scoring system. This would suggest they were all made ~1994, despite
+the copyright dates recorded.
+TODO: Sort these better given the wide variation in dates/versions/core code (SWP version id, for one thing).
+*/
 
-GAME(  199?, v4bios,     0,        mod2,       mpu4,     mpu4_state,    empty_init,     ROT0, "Barcrest","MPU4 Video Firmware",MACHINE_IS_BIOS_ROOT )
+GAME(  199?, v4bios,     0,        mod2,       mpu4vid,     mpu4_state,    empty_init,     ROT0, "Barcrest","MPU4 Video Firmware",MACHINE_IS_BIOS_ROOT )
 
 #define GAME_FLAGS MACHINE_NOT_WORKING
+#define GAME_FLAGS_OK (MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND)
 
-GAMEL( 1993, v4cmaze,    v4bios,   crmaze,     crmaze,   mpu4vid_state, init_crmaze,    ROT0, "Barcrest","The Crystal Maze (v1.3) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9
+GAMEL( 1993, v4cmaze,    v4bios,   crmaze,     crmaze,   mpu4vid_state, init_crmaze,    ROT0, "Barcrest","The Crystal Maze (v1.3) (MPU4 Video)",GAME_FLAGS_OK,layout_crmaze2p )//SWP 0.9
 GAMEL( 1993, v4cmazedat, v4cmaze,  crmaze,     crmaze,   mpu4vid_state, init_crmaze,    ROT0, "Barcrest","The Crystal Maze (v1.3, Datapak) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9D
-GAMEL( 1993, v4cmazea,   v4cmaze,  crmaze,     crmaze,   mpu4vid_state, init_crmazea,   ROT0, "Barcrest","The Crystal Maze (v0.1, AMLD) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9 (actually newer than the 1.1 set then??)
-GAMEL( 1993, v4cmazeb,   v4cmaze,  crmaze,     crmaze,   mpu4vid_state, init_v4cmazeb,  ROT0, "Barcrest","The Crystal Maze (v1.2) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9
+GAMEL( 1993, v4cmazeb,   v4cmaze,  crmaze,     crmaze,   mpu4vid_state, init_v4cmazeb,  ROT0, "Barcrest","The Crystal Maze (v1.2) (MPU4 Video)",GAME_FLAGS_OK,layout_crmaze2p )//SWP 0.9
 GAMEL( 1993, v4cmazec,   v4cmaze,  crmaze,     crmaze,   mpu4vid_state, init_v4cmazeb,  ROT0, "Barcrest","The Crystal Maze (v1.3 alt) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.9
-GAMEL( 1993, v4cmazed,   v4cmaze,  crmaze,     crmaze,   mpu4vid_state, init_v4cmazeb,  ROT0, "Barcrest","The Crystal Maze (v1.1) (MPU4 Video)",GAME_FLAGS,layout_crmaze2p )//SWP 0.6
+GAMEL( 1993, v4cmazed,   v4cmaze,  crmaze,     crmaze,   mpu4vid_state, init_v4cmazeb,  ROT0, "Barcrest","The Crystal Maze (v1.1) (MPU4 Video)",GAME_FLAGS_OK,layout_crmaze2p )//SWP 0.6
 
-GAMEL( 1993, v4cmaze2,   v4bios,   crmaze,     crmaze,   mpu4vid_state, init_crmaze2,   ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v2.2) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 1.0
+GAMEL( 1993, v4cmaze_amld,   v4cmaze,  crmaze,     crmaze,   mpu4vid_state, init_crmazea,   ROT0, "Barcrest","The Crystal Maze (v0.1, AMLD) (MPU4 Video)",GAME_FLAGS_OK,layout_crmaze2p )//SWP 0.9 (actually newer than the 1.1 set then??)
+
+GAMEL( 1993, v4cmaze2,   v4bios,   crmaze,     crmaze,   mpu4vid_state, init_crmaze2,   ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v2.2) (MPU4 Video)",GAME_FLAGS_OK,layout_crmaze4p )//SWP 1.0
 GAMEL( 1993, v4cmaze2d,  v4cmaze2, crmaze,     crmaze,   mpu4vid_state, init_crmaze2,   ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v2.2, Datapak) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 1.0D
-GAMEL( 1993, v4cmaze2a,  v4cmaze2, crmaze,     crmaze,   mpu4vid_state, init_crmaze2a,  ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v0.1, AMLD) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 1.0 /* unprotected? proto? */
-GAMEL( 1993, v4cmaze2b,  v4cmaze2, crmaze,     crmaze,   mpu4vid_state, init_crmaze2,   ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v2.0) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 1.0
+GAMEL( 1993, v4cmaze2b,  v4cmaze2, crmaze,     crmaze,   mpu4vid_state, init_crmaze2,   ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v2.0) (MPU4 Video)",GAME_FLAGS_OK,layout_crmaze4p )//SWP 1.0
 GAMEL( 1993, v4cmaze2c,  v4cmaze2, crmaze,     crmaze,   mpu4vid_state, init_crmaze2,   ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v?.?) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )// bad rom?
 
-GAMEL( 1994, v4cmaze3,   v4bios,   crmaze,     crmaze,   mpu4vid_state, init_crmaze3,   ROT0, "Barcrest","The Crystal Maze Team Challenge (v0.9) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 0.7
+GAMEL( 1993, v4cmaze2_amld,  v4cmaze2, crmaze,     crmaze,   mpu4vid_state, init_crmaze2a,  ROT0, "Barcrest","The New Crystal Maze Featuring Ocean Zone (v0.1, AMLD) (MPU4 Video)",GAME_FLAGS_OK,layout_crmaze4p )//SWP 1.0 /* unprotected? proto? */
+
+GAMEL( 1994, v4cmaze3,   v4bios,   crmaze,     crmaze,   mpu4vid_state, init_crmaze3,   ROT0, "Barcrest","The Crystal Maze Team Challenge (v0.9) (MPU4 Video)",GAME_FLAGS_OK,layout_crmaze4p )//SWP 0.7
 GAMEL( 1994, v4cmaze3d,  v4cmaze3, crmaze,     crmaze,   mpu4vid_state, init_crmaze3,   ROT0, "Barcrest","The Crystal Maze Team Challenge (v0.9, Datapak) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 0.7D
-GAMEL( 1994, v4cmaze3a,  v4cmaze3, crmaze,     crmaze,   mpu4vid_state, init_crmaze3a,  ROT0, "Barcrest","The Crystal Maze Team Challenge (v1.2, AMLD) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 0.7
-GAMEL( 1994, v4cmaze3b,  v4cmaze3, crmaze,     crmaze,   mpu4vid_state, init_v4cmazeb,  ROT0, "Barcrest","The Crystal Maze Team Challenge (v0.8) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )//SWP 0.7
-GAMEL( 1994, v4cmaze3c,  v4cmaze3, crmaze,     crmaze,   mpu4vid_state, init_v4cmazeb,  ROT0, "Barcrest","The Crystal Maze Team Challenge (v?.?) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )// missing one program rom
+GAMEL( 1994, v4cmaze3b,  v4cmaze3, crmaze,     crmaze,   mpu4vid_state, init_v4cmazeb,  ROT0, "Barcrest","The Crystal Maze Team Challenge (v0.8) (MPU4 Video)",GAME_FLAGS_OK,layout_crmaze4p )//SWP 0.7
+GAMEL( 1994, v4cmaze3c,  v4cmaze3, crmaze,     crmaze,   mpu4vid_state, init_v4cmazeb,  ROT0, "Barcrest","The Crystal Maze Team Challenge (v0.6) (MPU4 Video)",GAME_FLAGS,layout_crmaze4p )// missing one program rom
 
-GAME(  199?, v4turnov,   v4bios,   mpu4_vid,   turnover, mpu4vid_state, init_turnover,  ROT0, "Barcrest","Turnover (v2.3) (MPU4 Video)",GAME_FLAGS )
+GAMEL( 1994, v4cmaze3_amld,  v4cmaze3, crmaze,     crmaze,   mpu4vid_state, init_crmaze3a,  ROT0, "Barcrest","The Crystal Maze Team Challenge (v1.2, AMLD) (MPU4 Video)",GAME_FLAGS_OK,layout_crmaze4p )//SWP 0.7
 
-GAME(  1990, v4skltrk,   v4bios,   mpu4_vid,   skiltrek, mpu4vid_state, init_skiltrek,  ROT0, "Barcrest","Skill Trek (v1.1) (MPU4 Video, set 1)",GAME_FLAGS ) // 10 pound max
-GAME(  1990, v4skltrka,  v4skltrk, mpu4_vid,   skiltrek, mpu4vid_state, init_skiltrek,  ROT0, "Barcrest","Skill Trek (v1.1) (MPU4 Video, set 2)",GAME_FLAGS ) // 12 pound max
-GAME(  1990, v4sklcsh,   v4bios,   mpu4_vid,   skiltrek, mpu4vid_state, init_v4barqst,  ROT0, "Barcrest","Skill Cash (v1.1) (MPU4 Video)",GAME_FLAGS )
+//Year is a guess, based on the use of the 'Coin Man' logo
+GAME(  1996?,v4mate,     v4bios,   mating,     mating,   mpu4vid_state, init_mating,    ROT0, "Barcrest","The Mating Game (v0.4) (MPU4 Video)",GAME_FLAGS_OK )//SWP 0.2
+GAME(  1996?,v4mated,    v4mate,   mating,     mating,   mpu4vid_state, init_mating,    ROT0, "Barcrest","The Mating Game (v0.4, Datapak) (MPU4 Video)",GAME_FLAGS_OK )//SWP 0.2D
 
-GAME(  1989, v4addlad,   v4bios,   mpu4_vid,   adders,   mpu4vid_state, init_adders,    ROT0, "Barcrest","Adders and Ladders (v2.1) (MPU4 Video)",GAME_FLAGS )
-GAME(  1989, v4addlad20, v4addlad, mpu4_vid,   adders,   mpu4vid_state, init_adders,    ROT0, "Barcrest","Adders and Ladders (v2.0) (MPU4 Video)",GAME_FLAGS )
+/* Quiz games - Questions decoded */
 
-GAME(  1989, v4time,     v4bios,   mpu4_vid,   skiltrek, mpu4vid_state, init_timemchn,  ROT0, "Barcrest","Time Machine (v2.0) (MPU4 Video)",GAME_FLAGS )
+GAMEL(  1989, v4addlad,   v4bios,   mpu4_vid_strike,   adders,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Adders and Ladders (v2.1) (MPU4 Video)",GAME_FLAGS_OK,layout_v4addlad )
+GAMEL(  1989, v4addladd,  v4addlad, mpu4_vid_strike,   adders,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Adders and Ladders (v2.1d) (MPU4 Video)",GAME_FLAGS_OK,layout_v4addlad )
+GAMEL(  1989, v4addlad20, v4addlad, mpu4_vid_strike,   adders,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Adders and Ladders (v2.0) (MPU4 Video)",GAME_FLAGS_OK,layout_v4addlad )
 
-//Year is a guess, based on the use of the 'Coin Man' logo
-GAME(  1996?,v4mate,     v4bios,   mating,     mating,   mpu4vid_state, init_mating,    ROT0, "Barcrest","The Mating Game (v0.4) (MPU4 Video)",GAME_FLAGS )//SWP 0.2 /* Using crmaze controls for now, cabinet has trackball */
-GAME(  1996?,v4mated,    v4mate,   mating,     mating,   mpu4vid_state, init_mating,    ROT0, "Barcrest","The Mating Game (v0.4, Datapak) (MPU4 Video)",GAME_FLAGS )//SWP 0.2D
+GAMEL(  199?, v4strike,   v4bios,   mpu4_vid_strike,   strike,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Strike it Lucky (v0.5) (MPU4 Video)",GAME_FLAGS_OK,layout_v4strike )
+GAMEL(  199?, v4striked,  v4strike, mpu4_vid_strike,   strike,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Strike it Lucky (v0.5, Datapak) (MPU4 Video)",GAME_FLAGS_OK,layout_v4strike )
+GAMEL(  199?, v4strike2,  v4strike, mpu4_vid_strike,   strike,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Strike it Lucky (v0.53) (MPU4 Video)",GAME_FLAGS_OK,layout_v4strike ) // The '3' is likely a machine type, not a 'version', 68k Pair ROM doesn't change
+GAMEL(  199?, v4strike2d, v4strike, mpu4_vid_strike,   strike,   mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Strike it Lucky (v0.53, Datapak) (MPU4 Video)",GAME_FLAGS_OK,layout_v4strike )
 
-/* Games below are missing question ROMs */
+GAMEL(  199?, v4barqst,   v4bios,   mpu4_vid_strike,   barquest,  mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Barquest (v2.6) (MPU4 Video)",GAME_FLAGS_OK,layout_v4barqst )
+GAMEL(  199?, v4barqstd,  v4barqst, mpu4_vid_strike,   barquest,  mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Barquest (v2.6d) (MPU4 Video)",GAME_FLAGS_OK,layout_v4barqst )
 
-GAME(  199?, v4strike,   v4bios,   mpu4_vid,   mpu4,     mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Strike it Lucky (v0.5) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4striked,  v4strike, mpu4_vid,   mpu4,     mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Strike it Lucky (v0.5, Datapak) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4strike2,  v4strike, mpu4_vid,   mpu4,     mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Strike it Lucky (v0.53) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4strike2d, v4strike, mpu4_vid,   mpu4,     mpu4vid_state, init_strikeit,  ROT0, "Barcrest","Strike it Lucky (v0.53, Datapak) (MPU4 Video)",GAME_FLAGS )
-
-GAME(  199?, v4eyedwn,   v4bios,   mpu4_vid,   mpu4,     mpu4vid_state, init_eyesdown,  ROT0, "Barcrest","Eyes Down (v1.3) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4eyedwnd,  v4eyedwn, mpu4_vid,   mpu4,     mpu4vid_state, init_eyesdown,  ROT0, "Barcrest","Eyes Down (v1.3, Datapak) (MPU4 Video)",GAME_FLAGS )
-
-GAME(  199?, v4quidgr,   v4bios,   mpu4_vid,   mpu4,     mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v1.2) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4quidgrd,  v4quidgr, mpu4_vid,   mpu4,     mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v1.2, Datapak) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4quidgr2,  v4quidgr, mpu4_vid,   mpu4,     mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v2.4) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4quidgr2d, v4quidgr, mpu4_vid,   mpu4,     mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v2.4, Datapak) (MPU4 Video)",GAME_FLAGS )
-
-GAME(  199?, v4barqst,   v4bios,   mpu4_vid,   mpu4,     mpu4vid_state, init_v4barqst,  ROT0, "Barcrest","Barquest (v2.6d) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4barqs2,   v4bios,   mpu4_vid,   mpu4,     mpu4vid_state, init_v4barqst2, ROT0, "Barcrest","Barquest 2 (v0.3) (MPU4 Video)",GAME_FLAGS )
-
-GAME(  199?, v4wize,     v4bios,   mpu4_vid,   mpu4,     mpu4vid_state, init_v4wize,    ROT0, "Barcrest","Wize Move (v1.3d) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4wizea,    v4bios,   mpu4_vid,   mpu4,     mpu4vid_state, init_v4wize,    ROT0, "Barcrest","Wize Move (v1.2) (MPU4 Video)",GAME_FLAGS )
-
-GAME(  1991, v4opt3,     v4bios,   mpu4_vid,   mpu4,     mpu4vid_state, init_v4opt3,    ROT0, "Barcrest","Option 3 (v1.0) (MPU4 Video)",GAME_FLAGS )
-GAME(  1991, v4opt3d,    v4opt3,   mpu4_vid,   mpu4,     mpu4vid_state, init_v4opt3,    ROT0, "Barcrest","Option 3 (v1.0) (Datapak) (MPU4 Video)",GAME_FLAGS )
-
-
-
-
-/* Games below are newer BwB games and use their own BIOS ROMs and hardware setups*/
-
-GAME(  199?, v4vgpok,    0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Vegas Poker (prototype, release 2) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4psi,      0,        bwbvid,     mpu4,     mpu4vid_state, init_prizeinv,  ROT0, "BwB","Prize Space Invaders (v1.1) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4psia,     0,        bwbvid,     mpu4,     mpu4vid_state, init_prizeinv,  ROT0, "BwB","Prize Space Invaders (v1.2) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4psib,     0,        bwbvid,     mpu4,     mpu4vid_state, init_prizeinv,  ROT0, "BwB","Prize Space Invaders (v2.0?) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4psi14d,   0,        bwbvid,     mpu4,     mpu4vid_state, init_prizeinv,  ROT0, "BwB","Prize Space Invaders (v1.4D?) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4psi20d,   0,        bwbvid,     mpu4,     mpu4vid_state, init_prizeinv,  ROT0, "BwB","Prize Space Invaders (v2.0D?) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4psi214,   0,        bwbvid,     mpu4,     mpu4vid_state, init_prizeinv,  ROT0, "BwB","Prize Space Invaders (v2.14?) (MPU4 Video)",GAME_FLAGS )
-// bad dump
-GAME(  199?, v4blox,     0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Blox (v2.0) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4bloxd,    v4blox,   bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Blox (v2.0, Datapak) (MPU4 Video)",GAME_FLAGS )
-GAME(  1996, v4reno,     0,        bwbvid5,    mpu4,     mpu4vid_state, init_prizeinv,  ROT0, "BwB","Reno Reels (20p/10GBP Cash, release A) (MPU4 Video)",GAME_FLAGS )
-
-GAME(  199?, v4bigfrt,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Big Fruits (v2.0?) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4bubbnk,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Bubbly Bonk (v4.0?) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4mazbel,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Mazooma Belle (v2.5) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4mazbla,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Mazooma Belle (v1.5) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4shpwnd,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Shop Window (v2.0) (MPU4 Video)",GAME_FLAGS )
-
-GAME(  199?, v4redhtp,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Red Hot Poker (20p/10GBP Cash, release 3) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4tetrs,    0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","BwB Tetris v 2.2 (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4tetrs1,    0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","BwB Tetris v 1.0? (MPU4 Video)",GAME_FLAGS )
-
-GAME(  199?, v4big40,    0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Big 40 Poker (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4bulblx,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Bullion Blox (Bwb) (MPU4 Video)",GAME_FLAGS ) // is this the same game as v4blox?
-GAME(  199?, v4cshinf,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Cash Inferno (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4dbltak,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Double Take (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4gldrsh,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Gold Rush (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4mdice,    0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Miami Dice (Bwb) (MPU4 Video)",GAME_FLAGS ) // is this the same as the Nova game below?
-GAME(  199?, v4monte,    0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Monte Carlo Or Bust (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4ovrmn3,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Over Moon Pt3 (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4pztet,    0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Prize Tetris (Bwb) (MPU4 Video, set 1)",GAME_FLAGS ) // is this the same as v4tetrs?
-GAME(  199?, v4pzteta,   v4pztet,  bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Prize Tetris (Bwb) (MPU4 Video, set 2)",GAME_FLAGS )
-GAME(  199?, v4rhmaz,    0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Red Hot Mazooma Belle (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4sunbst,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Sunburst (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4timebn,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Time Bandit (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4sixx,     0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","6-X (Bwb) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4megbuk,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Megabucks Poker (Bwb) (MPU4 Video)",GAME_FLAGS ) // no video roms!
-GAME(  199?, v4rencas,   0,        bwbvid,     mpu4,     mpu4vid_state, empty_init,     ROT0, "BwB","Reno Casino (Bwb) (MPU4 Video)",GAME_FLAGS ) // no video roms!
+/* Quiz games - Questions not decoded properly on games below (no complete characteriser table) */
 
+GAME(  199?, v4turnov,   v4bios,    mpu4_vid,   turnover, mpu4vid_state, init_turnover,  ROT0, "Barcrest","Turnover (v2.3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4turnova,  v4turnov,  mpu4_vid,   turnover, mpu4vid_state, init_turnover,  ROT0, "Barcrest","Turnover (v2.33) (MPU4 Video)",GAME_FLAGS ) // the 2nd 3 is likely be a machine type, because much like Strike It Lucky and Wize Move the pairing 68k ROM doesn't change
+GAME(  199?, v4turnovc,  v4turnov,  mpu4_vid,   turnover, mpu4vid_state, init_turnover,  ROT0, "Barcrest","Turnover (v2.3O) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4turnovd,  v4turnov,  mpu4_vid,   turnover, mpu4vid_state, init_turnover,  ROT0, "Barcrest","Turnover (v?.?) (MPU4 Video)",GAME_FLAGS ) // only have a single program ROM
 
-/* Uncertain BIOS */
-GAME(  199?, v4frfact,   v4bios,   crmaze,     crmaze,   mpu4vid_state, init_crmaze,    ROT0, "Bwb","Fruit Factory (Bwb) (MPU4 Video)", GAME_FLAGS )
+GAME(  1990, v4skltrk,   v4bios,    mpu4_vid,   skiltrek, mpu4vid_state, init_skiltrek,  ROT0, "Barcrest","Skill Trek (v1.1) (MPU4 Video, set 1)",GAME_FLAGS ) // 10 pound max
+GAME(  1990, v4skltrka,  v4skltrk,  mpu4_vid,   skiltrek, mpu4vid_state, init_skiltrek,  ROT0, "Barcrest","Skill Trek (v1.1) (MPU4 Video, set 2)",GAME_FLAGS ) // 12 pound max
+
+GAME(  1989, v4tmach,     v4bios,   mpu4_vid,   skiltrek, mpu4vid_state, init_timemchn,  ROT0, "Barcrest","Time Machine (v2.0) (Issue 3 Questions) (MPU4 Video)",GAME_FLAGS )
+GAME(  1989, v4tmachd,    v4tmach,  mpu4_vid,   skiltrek, mpu4vid_state, init_timemchn,  ROT0, "Barcrest","Time Machine (v2.0) (Issue 3 Questions) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  1989, v4tmach1,    v4tmach,  mpu4_vid,   skiltrek, mpu4vid_state, init_timemchn,  ROT0, "Barcrest","Time Machine (v2.0) (Issue 1 Questions) (MPU4 Video)",GAME_FLAGS )
+GAME(  1989, v4tmach1d,   v4tmach,  mpu4_vid,   skiltrek, mpu4vid_state, init_timemchn,  ROT0, "Barcrest","Time Machine (v2.0) (Issue 1 Questions) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  1989, v4tmach2,    v4tmach,  mpu4_vid,   skiltrek, mpu4vid_state, init_timemchn,  ROT0, "Barcrest","Time Machine (v2.0) (Issue 2 Questions) (MPU4 Video)",GAME_FLAGS )
+GAME(  1989, v4tmach2d,   v4tmach,  mpu4_vid,   skiltrek, mpu4vid_state, init_timemchn,  ROT0, "Barcrest","Time Machine (v2.0) (Issue 2 Questions) (Datapak) (MPU4 Video)",GAME_FLAGS )
+
+/* Quiz games - Games below are missing question ROMs */
+
+GAME(  1990, v4sklcsh,   v4bios,   mpu4_vid,   skiltrek, mpu4vid_state, init_v4barqst,  ROT0, "Barcrest","Skill Cash (v1.1) (MPU4 Video)",GAME_FLAGS )
 
+GAME(  199?, v4eyedwn,   v4bios,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_eyesdown,  ROT0, "Barcrest","Eyes Down (v1.3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4eyedwnd,  v4eyedwn, mpu4_vid,   mpu4vid,   mpu4vid_state, init_eyesdown,  ROT0, "Barcrest","Eyes Down (v1.3, Datapak) (MPU4 Video)",GAME_FLAGS )
+
+GAME(  199?, v4quidgr,   v4bios,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v1.2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4quidgrd,  v4quidgr, mpu4_vid,   mpu4vid,   mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v1.2, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4quidgr2,  v4quidgr, mpu4_vid,   mpu4vid,   mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v2.4) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4quidgr2d, v4quidgr, mpu4_vid,   mpu4vid,   mpu4vid_state, init_quidgrid,  ROT0, "Barcrest","Ten Quid Grid (v2.4, Datapak) (MPU4 Video)",GAME_FLAGS )
+
+GAMEL( 199?, v4barqs2,   v4bios,   mpu4_vid,   barquest,   mpu4vid_state, init_v4barqst2, ROT0, "Barcrest","Barquest 2 (v0.3) (MPU4 Video)",GAME_FLAGS,layout_v4barqst )
+
+// again the 2nd '3' seems to indicate a machine type, not a version
+GAME(  199?, v4wize,     v4bios,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_v4wize,    ROT0, "Barcrest","Wize Move (v1.3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4wized,    v4wize,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_v4wize,    ROT0, "Barcrest","Wize Move (v1.3d) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4wizeb,    v4wize,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_v4wize,    ROT0, "Barcrest","Wize Move (v1.33) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4wizec,    v4wize,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_v4wize,    ROT0, "Barcrest","Wize Move (v1.3d3) (Datapak) (MPU4 Video)",GAME_FLAGS )
+// older code, 1x 68k ROM is missing in addition to questions being missing
+GAME(  199?, v4wizeo,    v4wize,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_v4wize,    ROT0, "Barcrest","Wize Move (v1.2) (MPU4 Video)",GAME_FLAGS )
+// newer? code, only 1x 68k ROM is dumped (and it appears to be slightly corrupt)
+GAME(  199?, v4wizen,    v4wize,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_v4wize,    ROT0, "Barcrest","Wize Move (v?.?) (MPU4 Video)",GAME_FLAGS )
+
+
+GAME(  1991, v4opt3,     v4bios,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_v4opt3,    ROT0, "Barcrest","Option 3 (v1.0) (MPU4 Video)",GAME_FLAGS )
+GAME(  1991, v4opt3d,    v4opt3,   mpu4_vid,   mpu4vid,   mpu4vid_state, init_v4opt3,    ROT0, "Barcrest","Option 3 (v1.0) (Datapak) (MPU4 Video)",GAME_FLAGS )
+
+/* ----------------------------------------------------------------  */
+/* Games below are newer BWB games and use their own game and revision specific MPU4 base ROMs (which must be correctly paired with video ROMs of the same revision) and sometimes differing hardware setups */
+/* ----------------------------------------------------------------  */
+
+GAMEL(  1991, v4psi,      0,        bwbvid,     v4psi,     mpu4vid_state, init_prizeinv,  ROT0, "BWB",           u8"Prize Space Invaders (BWB IN2, £20, 50p/30p Play, 20\" Version 1.1) (MPU4 Video)",GAME_FLAGS,layout_v4psi )
+GAMEL(  1991, v4psid,     v4psi,    bwbvid,     v4psi,     mpu4vid_state, init_prizeinv,  ROT0, "BWB",           u8"Prize Space Invaders (BWB IN2, £20, 50p/30p Play, 20\" Version 1.1) (Datapak) (MPU4 Video)",GAME_FLAGS,layout_v4psi )
+// the 68k ROMs are bad on these (one missing)
+GAMEL(  1991, v4psi14,    v4psi,    bwbvid,     v4psi,     mpu4vid_state, init_prizeinv,  ROT0, "BWB",           u8"Prize Space Invaders (BWB IN2, £20, 50p/30p Play, 14\" Version 1.1, set 1) (MPU4 Video)",GAME_FLAGS,layout_v4psi )
+GAMEL(  1991, v4psi14a,   v4psi,    bwbvid,     v4psi,     mpu4vid_state, init_prizeinv,  ROT0, "BWB",           u8"Prize Space Invaders (BWB IN2, £20, 50p/30p Play, 14\" Version 1.1, set 2) (MPU4 Video)",GAME_FLAGS,layout_v4psi )
+// these show BWB and Barcrest (older game release 'INV1' but higher version of it)
+GAMEL(  1991, v4psibc,    v4psi,    bwbvid,     v4psi,     mpu4vid_state, init_prizeinv,  ROT0, "BWB / Barcrest","Prize Space Invaders (BWB INV1, 50p/30p Play, Version 1.2) (MPU4 Video)",GAME_FLAGS_OK,layout_v4psi )
+GAMEL(  1991, v4psibcd,   v4psi,    bwbvid,     v4psi,     mpu4vid_state, init_prizeinv,  ROT0, "BWB / Barcrest","Prize Space Invaders (BWB INV1, 50p/30p Play, Version 1.2) (Datapak) (MPU4 Video)",GAME_FLAGS_OK,layout_v4psi )
+
+
+// Tetris games, these were all sold as different machines so are not set as clones
+GAME(  1989, v4tetrs,    0,        bwbvid,     v4tetris,   mpu4vid_state, init_bwbhack,     ROT0, "BWB / Barcrest","Tetris Payout (BWB TET1 Version 2.2, set 1) (MPU4 Video)",GAME_FLAGS_OK )
+GAME(  1989, v4tetrs1,   v4tetrs,  bwbvid,     v4tetris,   mpu4vid_state, init_bwbhack,     ROT0, "BWB / Barcrest","Tetris Payout (BWB TET1 Version 2.2, set 2) (MPU4 Video)",GAME_FLAGS_OK )
+// Blox is an later version of Payout Tetris, without Tetris license? (SJM = Stuart McArthur?)
+GAME(  1990, v4blox,     0,        bwbvid,     v4tetris,   mpu4vid_state, init_bwbhack,     ROT0, "BWB / Barcrest","Blox (SJM BLOX, 50p/20p Play, Version 2.0) (MPU4 Video)",GAME_FLAGS_OK )
+GAME(  1990, v4bloxd,    v4blox,   bwbvid,     v4tetris,   mpu4vid_state, init_bwbhack,     ROT0, "BWB / Barcrest","Blox (SJM BLOX, 50p/20p Play, Version 2.0) (Datapak) (MPU4 Video)",GAME_FLAGS_OK )
+// Prize Tetris / Bullion Blox have quite different attract presentation to the above
+GAME(  1994, v4pztet,    0,        bwbvid,     v4pztet,    mpu4vid_state, init_bwbhack,     ROT0, "BWB",           "Prize Tetris (BWB) (MPU4 Video)",GAME_FLAGS_OK )
+GAME(  1994, v4pzteta,   v4pztet,  bwbvid,     v4pztet,    mpu4vid_state, init_bwbhack,     ROT0, "BWB",           "Prize Tetris (BWB) (Datapak) (MPU4 Video)",GAME_FLAGS_OK )
+GAME(  1994, v4pztetb,   v4pztet,  bwbvid,     v4pztet,    mpu4vid_state, init_bwbhack,     ROT0, "BWB",           "Prize Tetris (BWB) (Showcase) (MPU4 Video)",GAME_FLAGS_OK ) // screen telling you to exchange tickets for prizes in the 'showcase' during attract
+GAME(  1994, v4pztetc,   v4pztet,  bwbvid,     v4pztet,    mpu4vid_state, init_bwbhack,     ROT0, "BWB",           "Prize Tetris (BWB) (Showcase) (Datapak) (MPU4 Video)",GAME_FLAGS_OK )
+// this appears to be a version of Prize Tetris without the Tetris license. These don't have proper alarms, eg coin1 stuck is 'undefined'
+GAME(  1994, v4bulblx,   0,        bwbvid,     v4bulblx,   mpu4vid_state, init_bwbhack,     ROT0, "BWB",           "Bullion Blox (BWB) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1994, v4bulblxb,  v4bulblx, bwbvid,     v4bulblx,   mpu4vid_state, init_bwbhack,     ROT0, "BWB",           "Bullion Blox (BWB) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1994, v4bulblxa,  v4bulblx, bwbvid,     v4bulblx,   mpu4vid_state, init_bwbhack,     ROT0, "BWB",           "Bullion Blox (BWB) (Datapak) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1994, v4bulblxc,  v4bulblx, bwbvid,     v4bulblx,   mpu4vid_state, init_bwbhack,     ROT0, "BWB",           "Bullion Blox (BWB) (Datapak) (set 2) (MPU4 Video)",GAME_FLAGS )
+
+// doesn't have payout so no shelf error (no payout on prototype?), runs with door closed
+
+GAME(  199?, v4vgpok,    0,        bwbvid,     v4vgpok,    mpu4vid_state, init_bwbhack,     ROT0, "BWB","Vegas Poker (prototype, release 2) (MPU4 Video)",GAME_FLAGS_OK )
+
+// boot and run
+
+GAME(  199?, v4redhtp,   0,        bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Fixed, Cash+Token) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpk,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Fixed, Cash+Token) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpl,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Fixed, Cash+Token, Datapak, % Key) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpp,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Fixed, Cash+Token, Datapak, % Key) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpm,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Fixed, Cash+Token, Datapak) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpo,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Fixed, Cash+Token, Datapak) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpq,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Fixed, Cash+Token, Datapak) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpn,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Fixed, Cash+Token, % Key) (set 1)  (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpr,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Fixed, Cash+Token, % Key) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtps,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Switchable to 10p, Cash+Token) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpx,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Switchable to 10p, Cash+Token) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpt,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Switchable to 10p, Cash+Token, Datapak, % Key) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpy,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Switchable to 10p, Cash+Token, Datapak, % Key) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpu,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Switchable to 10p, Cash+Token, Datapak) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpw,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Switchable to 10p, Cash+Token, Datapak) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpz,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Switchable to 10p, Cash+Token, Datapak) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpv,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Switchable to 10p, Cash+Token, % Key) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpaa, v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Switchable to 10p, Cash+Token, % Key) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpb,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 10p Fixed, Cash+Token) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpg,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 10p Fixed, Cash+Token) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpc,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 10p Fixed, Cash+Token, Datapak) (set 1, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtph,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 10p Fixed, Cash+Token, Datapak) (set 2, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpd,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 10p Fixed, Cash+Token, Datapak) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpf,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 10p Fixed, Cash+Token, Datapak) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpi,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 10p Fixed, Cash+Token, Datapak) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpe,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 10p Fixed, Cash+Token, % Key) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpj,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 10p Fixed, Cash+Token, % Key) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpab, v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 10p Fxed, All-Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4redhtpa,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 3, 20p Switchable to 10p, All - Cash) (MPU4 Video)",GAME_FLAGS )
+// 'version 1.9' 68k ROMs - different numbering format?
+GAME(  199?, v4redhtparc,v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Arcade, Cash+Tokens, 1993 Awards, 20p Fixed, Version 1.9) (MPU4 Video)",GAME_FLAGS )
+// release 2 68k ROMs
+GAME(  1993, v4redhtp2,  v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 2, 1993 copyright, 5p Fixed, Cash+Token) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1993, v4redhtp2a, v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 2, 1993 copryight, 5p Fixed, Cash+Token) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1993, v4redhtp2b, v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 2, 1993 copryight, 5p Fixed, Cash+Token, Datapak, % Key) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1993, v4redhtp2e, v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 2, 1993 copryight, 5p Fixed, Cash+Token, Datapak, % Key) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1993, v4redhtp2c, v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 2, 1993 copryight, 5p Fixed, Cash+Token, Datapak) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1993, v4redhtp2f, v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 2, 1993 copryight, 5p Fixed, Cash+Token, Datapak) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1993, v4redhtp2d, v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 2, 1993 copryight, 5p Fixed, Cash+Token, % Key) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1993, v4redhtp2g, v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 2, 1993 copryight, 5p Fixed, Cash+Token, % Key) (set 2) (MPU4 Video)",GAME_FLAGS )
+// this is older despite still being 'release 2'
+GAME(  1992, v4redhtp2z, v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (Release 2, 1992 copyright, 20p Fixed, Cash+Token) (MPU4 Video)",GAME_FLAGS )
+// no matching 68k ROMs for this one
+GAME(  199?, v4redhtpunk,v4redhtp, bwbvid,     v4redhtp, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Poker (unknown release) (MPU4 Video)",GAME_FLAGS )
+
+
+GAME(  199?, v4bubbnk,   0,        bwbvid,     v4bubbnk, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Bubbly Bonk (v4.0?) (20p Fixed, Cash+Token) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4bubbnkb,  v4bubbnk, bwbvid,     v4bubbnk, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Bubbly Bonk (v4.0?) (20p Fixed, Cash+Token, Datapak, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4bubbnkc,  v4bubbnk, bwbvid,     v4bubbnk, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Bubbly Bonk (v4.0?) (20p Fixed, Cash+Token, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4bubbnkd,  v4bubbnk, bwbvid,     v4bubbnk, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Bubbly Bonk (v4.0?) (20p Fixed, Cash+Token, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4bubbnka,  v4bubbnk, bwbvid,     v4bubbnk, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Bubbly Bonk (v4.0?) (20p Fixed, All - Cash) (MPU4 Video)",GAME_FLAGS )
+
+
+GAME(  199?, v4ovrmn3,   0,        bwbvid,     v4bubbnk, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Over Moon Pt3 (BWB) (20p Fixed, Cash+Token) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4ovrmn3a,  v4ovrmn3, bwbvid,     v4bubbnk, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Over Moon Pt3 (BWB) (20p Fixed, Cash+Token, Datapak, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4ovrmn3b,  v4ovrmn3, bwbvid,     v4bubbnk, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Over Moon Pt3 (BWB) (20p Fixed, Cash+Token, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4ovrmn3c,  v4ovrmn3, bwbvid,     v4bubbnk, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Over Moon Pt3 (BWB) (20p Fixed, Cash+Token, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4ovrmn3d,  v4ovrmn3, bwbvid,     v4bubbnk, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Over Moon Pt3 (BWB) (20p Fixed, All - Cash) (MPU4 Video)",GAME_FLAGS )
+
+
+GAME(  199?, v4mazbel,   0,        bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Mazooma Belle (v2.5 DY, S/Site, Cash+Token, Datapak, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4mazbel15, v4mazbel, bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Mazooma Belle (v1.5, Arcade, Cash+Token) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4mazbel15a,v4mazbel, bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Mazooma Belle (v1.5 DY, Arcade, Cash+Token, % Key) (MPU4 Video)",GAME_FLAGS )
+
+
+GAME(  199?, v4rhmaz,    0,        bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Mazooma Belle (BWB) (Version 1.4, Cash+Token, 1993 Awards, 10p Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rhmaza,   v4rhmaz,  bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Mazooma Belle (BWB) (Version 1.4 DY, Cash+Token, 1993 Awards, 10p Fixed, Datapak, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rhmazb,   v4rhmaz,  bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Mazooma Belle (BWB) (Version 1.4 D, Cash+Token, 1993 Awards, 10p Fixed, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rhmazc,   v4rhmaz,  bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Mazooma Belle (BWB) (Version 1.4, Cash+Token, 1993 Awards, 20p Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rhmazd,   v4rhmaz,  bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Mazooma Belle (BWB) (Version 1.4 DY, Cash+Token, 1993 Awards, 20p Fixed, Datapak, % Key) (set 1) (MPU4 Video)",GAME_FLAGS ) // B   (Data Port failure on first boot?)
+GAME(  199?, v4rhmaze,   v4rhmaz,  bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Mazooma Belle (BWB) (Version 1.4 DY, Cash+Token, 1993 Awards, 20p Fixed, Datapak, % Key) (set 2) (MPU4 Video)",GAME_FLAGS ) // BL  (Data Port failure on first boot?)
+GAME(  199?, v4rhmazf,   v4rhmaz,  bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Mazooma Belle (BWB) (Version 1.4 D, Cash+Token, 1993 Awards, 20p Fixed, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rhmazg,   v4rhmaz,  bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Mazooma Belle (BWB) (Version 1.4, Cash+Token, 1993 Awards, 20p Switchable to 10p) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rhmazh,   v4rhmaz,  bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Mazooma Belle (BWB) (Version 1.4 DY, Cash+Token, 1993 Awards, 20p Switchable to 10p, Datapak, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rhmazi,   v4rhmaz,  bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Mazooma Belle (BWB) (Version 1.4 D, Cash+Token, 1993 Awards, 20p Switchable to 10p, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rhmazj,   v4rhmaz,  bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Mazooma Belle (BWB) (Version 1.4 Y, Cash+Token, 1993 Awards, 20p Switchable to 10p, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rhmazk,   v4rhmaz,  bwbvid,     v4mazbel, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Red Hot Mazooma Belle (BWB) (Version 1.4 C, Cash+Token, 1993 Awards, 20p Switchable to 10p) (MPU4 Video)",GAME_FLAGS )
+
+
+GAME(  199?, v4shpwnd,   0,        bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 20p Fixed, Cash + Special BWB Token) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4shpwndi,  v4shpwnd, bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 20p Fixed, Cash + Special BWB Token) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4shpwnde,  v4shpwnd, bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 20p Fixed, Cash + Special BWB Token, Datapak, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4shpwndf,  v4shpwnd, bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 20p Fixed, Cash + Special BWB Token, Datapak) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4shpwndh,  v4shpwnd, bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 20p Fixed, Cash + Special BWB Token, Datapak) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4shpwndg,  v4shpwnd, bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 20p Fixed, Cash + Special BWB Token, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4shpwnda,  v4shpwnd, bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 10p Fixed, Cash + Special BWB Token) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4shpwndb,  v4shpwnd, bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 10p Fixed, Cash + Special BWB Token, Datapak, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4shpwndc,  v4shpwnd, bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 10p Fixed, Cash + Special BWB Token, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4shpwndd,  v4shpwnd, bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 10p Fixed, Cash + Special BWB Token, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4shpwndj,  v4shpwnd, bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 20p Switchable to 10p, Cash + Special BWB Token) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4shpwndk,  v4shpwnd, bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 20p Switchable to 10p, Cash + Special BWB Token, Datapak, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4shpwndl,  v4shpwnd, bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 20p Switchable to 10p, Cash + Special BWB Token, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4shpwndm,  v4shpwnd, bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Shop Window (v2.0) (Release 2, 20p Switchable to 10p, Cash + Special BWB Token, % Key) (MPU4 Video)",GAME_FLAGS )
+
+
+GAME(  199?, v4sixx,     0,        bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Fixed, Cash+Token) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sixxa,    v4sixx,   bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Fixed, Cash+Token) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sixxe,    v4sixx,   bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Fixed, Cash+Token) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sixxb,    v4sixx,   bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Fixed, Cash+Token, Datapak) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sixxd,    v4sixx,   bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Fixed, Cash+Token, Datapak) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sixxf,    v4sixx,   bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Fixed, Cash+Token, Datapak, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sixxc,    v4sixx,   bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Fixed, Cash+Token, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sixxg,    v4sixx,   bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Switchable to 10p, Cash+Token) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sixxh,    v4sixx,   bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Switchable to 10p, Cash+Token, Datapak, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sixxi,    v4sixx,   bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Switchable to 10p, Cash+Token, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sixxj,    v4sixx,   bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Switchable to 10p, Cash+Token, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sixxk,    v4sixx,   bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Fixed, All - Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sixxl,    v4sixx,   bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Switchable to 10p, All - Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sixxm,    v4sixx,   bwbvid,     v4shpwnd, mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"£6-X (BWB) (Release 3, 20p Switchable to 10p, All - Cash, Datapak) (MPU4 Video)",GAME_FLAGS )
+
+
+GAME(  199?, v4cshinf,   0,        bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Fixed, Cash+Token) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfd,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Fixed, Cash+Token) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfg,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Fixed, Cash+Token) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfe,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Fixed, Cash+Token, Datapak) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfk,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Fixed, Cash+Token, Datapak) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfi,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Fixed, Cash+Token, Datapak, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfh,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Fixed, Cash+Token, Showcase) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinff,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Fixed, Cash+Token, Showcase, Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfj,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Fixed, Cash+Token, Showcase, Datapak, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfl,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Fixed, Cash+Token, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfm,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Switchable 20p/10p/5p, Cash+Token) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfr,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Switchable 20p/10p/5p, Cash+Token) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfp,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Switchable 20p/10p/5p, Cash+Token, Datapak) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfs,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Switchable 20p/10p/5p, Cash+Token, Datapak) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfo,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Switchable 20p/10p/5p, Cash+Token, Datapak, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfn,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Switchable 20p/10p/5p, Cash+Token, Showcase) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfq,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Switchable 20p/10p/5p, Cash+Token, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfu,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Switchable 20p/10p/5p, All - Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfw,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 20p Switchable 20p/10p/5p, All - Cash, Datapak)  (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfb,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 10p Fixed, Cash+Token) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinfa,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 4, 5p Fixed, All - Cash) (MPU4 Video)",GAME_FLAGS )
+// no 68k program is dumped for Release 3
+GAME(  199?, v4cshinf3,  v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 3) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4cshinf3a, v4cshinf, bwbvid,     v4cshinf,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Cash Inferno (BWB) (Release 3) (set 2) (MPU4 Video)",GAME_FLAGS )
+
+
+
+// the onscreen 'version' display doesn't quite align with the labels, 'DY' seems to be represented as 'B' on the labels, rather than the individual flags?
+// the labels seem closer to the Barcrest standard used on MPU4 fruit machines
+// gfx look wrong in test mode, uses BT chip?
+GAME(  199?, v4sunbst,   0,        bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4, Cash+Token, 1993 Awards, 10p Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbsta,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 DY, Cash+Token, 1993 Awards, 10p Fixed, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbstb,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 D, Cash + Token, 1993 Awards, 10p Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbstc,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 Y, Cash+Token, 1993 Awards, 10p Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbstd,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4, Cash+Token, 1993 Awards, 20p Fixed) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbstk,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4, Cash+Token, 1993 Awards, 20p Fixed) (set 2) (MPU4 Video)",GAME_FLAGS ) // BT
+GAME(  199?, v4sunbste,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 DY, Cash+Token, 1993 Awards, 20p Fixed, % Key) (set 1) (MPU4 Video)",GAME_FLAGS )  // B
+GAME(  199?, v4sunbstf,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 DY, Cash+Token, 1993 Awards, 20p Fixed, % Key) (set 2) (MPU4 Video)",GAME_FLAGS )  // BL
+GAME(  199?, v4sunbstg,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 D, Cash+Token, 1993 Awards, 20p Fixed) (set 1) (MPU4 Video)",GAME_FLAGS ) // D
+GAME(  199?, v4sunbsth,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 D, Cash+Token, 1993 Awards, 20p Fixed) (set 2) (MPU4 Video)",GAME_FLAGS ) // DL
+GAME(  199?, v4sunbsti,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 Y, Cash+Token, 1993 Awards, 20p Fixed, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbstj,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 D, Cash+Token, 1993 Awards, 20p Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbstl,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4, Cash+Token, 1993 Awards, 20p Switchable to 10p) (set 1) (MPU4 Video)",GAME_FLAGS ) // XC
+GAME(  199?, v4sunbstm,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4, Cash+Token, 1993 Awards, 20p Switchable to 10p) (set 2) (MPU4 Video)",GAME_FLAGS ) // XC L
+GAME(  199?, v4sunbstn,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 DY, Cash+Token, 1993 Awards, 20p Switchable to 10p, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbsto,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 D, Cash+Token, 1993 Awards, 20p Switchable to 10p (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbstp,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 D, Cash+Token, 1993 Awards, 20p Switchable to 10p) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbstq,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 Y, Cash+Token, 1993 Awards, 20p Switchable to 10p, % Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbstr,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 C, 1993 Awards, 10p Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbsts,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 C, 1993 Awards, 20p Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbstt,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 C, 1993 Awards, 20p Switchable to 10p) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4sunbstu,  v4sunbst, bwbvid,     v4cshinf,   mpu4vid_state, init_bwbhack,     ROT0, "BWB","Sunburst (BWB) (Version 1.4 IC, 1993 Awards, 20p Switchable to 10p) (MPU4 Video)",GAME_FLAGS )
+
+//gfx look wrong in test mode, uses BT chip?
+GAME(  199?, v4bigfrt,   0,        bwbvid,     v4bigfrt,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big Fruits (v2.0?) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4bigfrta,  v4bigfrt, bwbvid,     v4bigfrt,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big Fruits (v2.0?) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4bigfrtb,  v4bigfrt, bwbvid,     v4bigfrt,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big Fruits (v2.0?) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4bigfrtc,  v4bigfrt, bwbvid,     v4bigfrt,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big Fruits (v2.0?) (% Key) (MPU4 Video)",GAME_FLAGS )
+
+
+//gfx look wrong in test mode, uses BT chip?
+GAME(  1996, v4reno,     0,        bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Fixed, All - Cash) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renoa,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Fixed, All - Cash) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renom,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Fixed, All - Cash) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renoe,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Fixed, Cash+Token) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renoi,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Fixed, Cash+Token) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renol,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Fixed, Cash+Token) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renoc,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Fixed, Cash+Token) (Datapak) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renog,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Fixed, Cash+Token) (Datapak) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renok,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Fixed, Cash+Token) (Datapak) (set 3) (MPU4 Video)",GAME_FLAGS ) // gives a Data Port error first itme?
+GAME(  1996, v4renod,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Fixed, Cash+Token) (Showcase) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renoh,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Fixed, Cash+Token) (Showcase) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renof,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Fixed, Cash+Token) (Showcase) (set 1) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renoj,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Fixed, Cash+Token) (Showcase) (set 2) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renoo,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 25p Fixed, All - Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renon,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 25p Fixed, All - Cash) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renoq,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Switchable 20p/25p, All - Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renop,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Switchable 20p/25p, All - Cash) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renob,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Switchable 20p/10p/5p, All - Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renos,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Switchable 20p/10p/5p, Cash+Token) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renou,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Switchable 20p/10p/5p, Cash+Token) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renor,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Switchable 20p/10p/5p, Cash+Token) (Showcase) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4renot,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release A, 20p Switchable 20p/10p/5p, Cash+Token) (Showcase) (set 2) (MPU4 Video)",GAME_FLAGS )
+// older 68k version
+GAME(  1996, v4reno8,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release 8, 20p Fixed, Cash+Token) (MPU4 Video)",GAME_FLAGS )
+// 68k ROMs below have no matching base roms
+GAME(  1996, v4reno7,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release 7) (MPU4 Video)",GAME_FLAGS ) // no base ROM
+GAME(  1996, v4reno5,    v4reno,   bwbvid_oki,    v4reno,   mpu4vid_state, init_prizeinv,    ROT0, "BWB","Reno Reels (Release 5) (MPU4 Video)",GAME_FLAGS ) // no base ROM
+
+
+GAME(  1996, v4big40,    0,        bwbvid_oki_bt471,     v4big40,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big 40 Poker (BWB) (Arcade Standard) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4big40a,   v4big40,  bwbvid_oki_bt471,     v4big40,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big 40 Poker (BWB) (Arcade Standard) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4big40b,   v4big40,  bwbvid_oki_bt471,     v4big40,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big 40 Poker (BWB) (Arcade Standard) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4big40c,   v4big40,  bwbvid_oki_bt471,     v4big40,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big 40 Poker (BWB) (Arcade Standard) (set 4) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4big40d,   v4big40,  bwbvid_oki_bt471,     v4big40,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big 40 Poker (BWB) (Arcade Data) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4big40e,   v4big40,  bwbvid_oki_bt471,     v4big40,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big 40 Poker (BWB) (Arcade Data) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4big40g,   v4big40,  bwbvid_oki_bt471,     v4big40,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big 40 Poker (BWB) (S_Site Standard) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4big40h,   v4big40,  bwbvid_oki_bt471,     v4big40,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big 40 Poker (BWB) (S_Site Standard) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4big40k,   v4big40,  bwbvid_oki_bt471,     v4big40,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big 40 Poker (BWB) (S_Site Data) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4big40i,   v4big40,  bwbvid_oki_bt471,     v4big40,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big 40 Poker (BWB) (S_Site Data + %-Key) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4big40j,   v4big40,  bwbvid_oki_bt471,     v4big40,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big 40 Poker (BWB) (S_Site Data + %-Key) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1996, v4big40f,   v4big40,  bwbvid_oki_bt471,     v4big40,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Big 40 Poker (BWB) (S_Site Data + %-Key + OCDM) (MPU4 Video)",GAME_FLAGS )
+
+
+GAME(  1997, v4dbltak,   0,        bwbvid_oki_bt471, v4dbltak,     mpu4vid_state, init_bwbhack,     ROT0, u8"BWB","Double Take (BWB) (Release 4, Arcade Standard, 20p/25p Stake Key, £5/£10/£15 Prize Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  1997, v4dbltaka,  v4dbltak, bwbvid_oki_bt471, v4dbltak,     mpu4vid_state, init_bwbhack,     ROT0, u8"BWB","Double Take (BWB) (Release 4, Arcade Data, 20p/25p Stake Key, £5/£10/£15 Prize Key) (MPU4 Video)",GAME_FLAGS )
+GAME(  1997, v4dbltakb,  v4dbltak, bwbvid_oki_bt471, v4dbltak_perc,mpu4vid_state, init_bwbhack,     ROT0, u8"BWB","Double Take (BWB) (Release 4, S_Site Data, 20p/25p Stake Key, £5/£10/£15 Prize Key, % Key) (MPU4 Video)",GAME_FLAGS )
+
+
+GAME(  199?, v4gldrsh,   0,        bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 20p Fixed, All - Cash) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrsht,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 20p Fixed, All - Cash) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshk,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 20p Fixed, All - Cash) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshl,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 25p Fixed, All - Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshm,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 25p Fixed, All - Cash) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshn,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, Switchable 20p/25p, All - Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrsho,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, Switchable 20p/25p, All - Cash) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshu,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, Switchable 20p/10p/5p, All - Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshc,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 20p Fixed, Cash+Token) (Datapak) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshd,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 20p Fixed, Cash+Token) (Datapak) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrsha,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 20p Fixed, Cash+Token) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshf,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 20p Fixed, Cash+Token) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshb,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 20p Fixed, Cash+Token) (Showcase) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshg,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 20p Fixed, Cash+Token) (Showcase) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshe,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 20p Fixed, Cash+Token) (Showcase) (Datapak) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshj,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 20p Fixed, Cash+Token) (Showcase) (Datapak) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshh,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 20p Fixed, Cash+Token) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshi,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, 20p Fixed, Cash+Token) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshp,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, Switchable 20p/10p/5p, Cash+Token) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshq,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, Switchable 20p/10p/5p, Cash+Token) (Showcase) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshr,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, Switchable 20p/10p/5p, Cash+Token) (Datapak) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4gldrshs,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 8, Switchable 20p/10p/5p, Cash+Token) (Showcase) (Datapak) (MPU4 Video)",GAME_FLAGS )
+
+GAME(  1994, v4gldrsh3,  v4gldrsh, bwbvid,     v4reno,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Gold Rush (BWB) (Release 3, 20p Fixed, Cash+Token) (MPU4 Video)",GAME_FLAGS )
+
+
+GAME(  199?, v4timebn,   0,        bwbvid_oki,    v4timebn, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Time Bandit (BWB) (Release 1, 20p Fixed, Cash + Tokens) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4timebna,  v4timebn, bwbvid_oki,    v4timebn, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Time Bandit (BWB) (Release 1, 20p Fixed, Cash + Tokens) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4timebnc,  v4timebn, bwbvid_oki,    v4timebn, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Time Bandit (BWB) (Release 1, 20p Fixed, Cash + Tokens) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4timebnb,  v4timebn, bwbvid_oki,    v4timebn, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Time Bandit (BWB) (Release 1, 20p Fixed, Cash + Tokens) (Datapak) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4timebnd,  v4timebn, bwbvid_oki,    v4timebn, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Time Bandit (BWB) (Release 1, 20p Fixed, Cash + Tokens) (Datapak) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4timebne,  v4timebn, bwbvid_oki,    v4timebn, mpu4vid_state, init_bwbhack,     ROT0, "BWB","Time Bandit (BWB) (Release 1, 20p Fixed, Cash + Tokens) (Datapak) (set 3) (MPU4 Video)",GAME_FLAGS )
+
+
+// 'Release D'
+GAME(  199?, v4monte,    0,        bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release D, S/Site Standard, 20p Switchable, £8 All Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montea,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release D, S/Site Standard, 20p Switchable, £10 All Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montee,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release D, S/Site Standard, 20p Switchable, Cash and Tokens) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monted,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release D, S/Site Standard, 20p Fixed, £10 All Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteg,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release D, S/Site Standard, 25p Fixed, £10 All Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montec,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release D, Arcade Special, 20p Fixed, Cash and Tokens) (MPU4 Video)",GAME_FLAGS )
+// 'Release 9'
+GAME(  199?, v4monte9,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release 9, S/Site Standard, Options 4 Cabinet, 20p Fixed, £8 All Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9a,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release 9, S/Site Standard, Options 4 Cabinet, 20p Switchable, £8 All Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9e,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release 9, S/Site Standard, Options 4 Cabinet, 20p Switchable, Cash and Tokens) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9b,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release 9, S/Site Standard, Options 4 Cabinet, 20p Switchable, Cash and Tokens) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9f,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release 9, S/Site Standard, Options 4 Cabinet, 20p Switchable, £10 All Cash) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9n,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release 9, S/Site Standard, Options 4 Cabinet, 20p Switchable, £10 All Cash) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9j,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release 9, S/Site Standard, Options 4 Cabinet, 20p Fixed, £10 All Cash) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9k,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release 9, S/Site Standard, Options 4 Cabinet, 20p Fixed, £10 All Cash) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9l,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release 9, S/Site Standard, Options 4 Cabinet, 25p Fixed, £10 All Cash) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9m,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release 9, S/Site Standard, Options 4 Cabinet, 25p Fixed, £10 All Cash) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9o,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release 9, S/Site Standard, Options 4 Cabinet, 20p Fixed, Cash and Tokens) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9i,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release 9, S/Site Standard, Options 4 Cabinet, 20p Fixed, Cash and Tokens) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9c,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release 9, Arcade Special, Options 4 Cabinet, 20p Switchable, Cash and Tokens) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9d,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release 9, Arcade Special, Options 4 Cabinet, 20p Switchable, Cash and Tokens) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9h,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release 9, Arcade Special, Options 4 Cabinet, 20p Fixed, Cash and Tokens) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte9g,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release 9, Arcade Special, Options 4 Cabinet, 20p Fixed, Cash and Tokens) (set 2) (MPU4 Video)",GAME_FLAGS )
+// 'Release B'
+GAME(  199?, v4monteb,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release B, S/Site Standard, 20p Fixed, £8 All Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteba,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release B, Arcade Special, 20p Fixed, Cash and Tokens) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montebb,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release B, Arcade Special, 20p Switchable, Cash and Tokens) (MPU4 Video)",GAME_FLAGS )
+// 'Release 5' using the same base ROMs as 'Release B' (hacked?)
+GAME(  199?, v4monte5,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Monte Carlo Or Bust (BWB) (Release 5, S/Site Standard, 20p Fixed, £8 All Cash) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte5a,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release 5, Arcade Special, 20p Fixed, Cash and Tokens) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monte5b,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",   "Monte Carlo Or Bust (BWB) (Release 5, Arcade Special, 20p Switchable, Cash and Tokens) (MPU4 Video)",GAME_FLAGS )
+// no suitable 68k ROMs for these
+GAME(  199?, v4montek,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montel,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montem,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monten,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 4) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteo,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 5) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montep,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 6) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteq,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 7) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monter,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 8) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montes,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 9) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montet,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 10) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteu,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 11) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montev,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 12) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montew,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 13) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montex,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 14) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montey,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 15) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montez,   v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 16) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteaa,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 17) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteab,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 18) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteac,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 19) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montead,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 20) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteae,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 21) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteaf,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 22) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteag,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 23) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteah,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 24) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteai,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 25) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteaj,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 26) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteak,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 27) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteal,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 28) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteam,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 29) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4montean,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 30) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4monteao,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 31) (MPU4 Video)",GAME_FLAGS )
+// only have a single loose 68k ROM from this which doesn't match any other set
+GAME(  199?, v4montezz,  v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (Release ?, set 32) (MPU4 Video)",GAME_FLAGS )
+// German Release
+GAME(  199?, v4monteger, v4monte,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB","Monte Carlo Or Bust (BWB) (German) (MPU4 Video)",GAME_FLAGS )
+
+
+GAME(  1995, v4mdice,    0,        bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, S/Site Standard, 25p-£10 Cash - Fixed) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicee,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, S/Site Standard, 20p-£4 Cash - Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicep,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, S/Site Standard, 20p-£10 Cash - Fixed) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdiceq,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, S/Site Standard, 20p-£10 Cash - Fixed) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicer,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, S/Site Standard, 20p-£10 Cash - Fixed) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdiceu,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, S/Site Standard, 25p-£10 Cash - Fixed) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicev,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, S/Site Standard, 25p-£10 Cash - Fixed) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicei,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, S/Site Standard, 20p-£8 Token - Fixed) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicej,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, S/Site Standard, 20p-£8 Token - Fixed) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicel,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, S/Site Standard, 20p-£8 Token - Fixed) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicem,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, S/Site Standard, 20p-£8 Token - Fixed) (set 4) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicek,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, S/Site Showcase, 20p-£8 Token - Fixed) (set 5) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicea,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, Arcade Standard, 5p-£4 Cash - Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdiceb,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, Arcade Standard, 10p-£4 Cash - Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdiced,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, Arcade Standard, 20p-£4 Cash - Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicew,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, Arcade Standard, 20p-£8 Cash - Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicen,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, Arcade Standard, 20p-£10 Cash - Fixed) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdiceo,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, Arcade Standard, 20p-£10 Cash - Fixed) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdices,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, Arcade Standard, 25p-£10 Cash - Fixed) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicet,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, Arcade Standard, 25p-£10 Cash - Fixed) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicec,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, Arcade Standard, 10p-£8 Token - Fixed) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdicef,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, Arcade Standard, 20p-£8 Token - Fixed) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdiceh,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, Arcade Standard, 20p-£8 Token - Fixed) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  1995, v4mdiceg,   v4mdice,  bwbvid_oki,    v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB", u8"Miami Dice (BWB) (Release 8, Arcade Showcase, 20p-£8 Token - Fixed) (set 3) (MPU4 Video)",GAME_FLAGS )
+// 'Release 6'
+GAME(  1995, v4mdice6,   v4mdice,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"Miami Dice (BWB) (Release 6, Arcade Standard, 20p-£8 Token - Fixed) (MPU4 Video)", GAME_FLAGS )
+// 'Release 5'
+GAME(  1995, v4mdice5,   v4mdice,  bwbvid_oki,     v4mdice,  mpu4vid_state, init_bwbhack,     ROT0, "BWB",u8"Miami Dice (BWB) (Release 5, Arcade Showcase, 20p-£8 Token - Fixed) (MPU4 Video)",GAME_FLAGS )
+// this is a German version of v4mdice, produced by Nova
+GAME(  199?, v4mdiceger, v4mdice,  bwbvid_oki,    mpu4,     mpu4vid_state, init_bwbhack,      ROT0, "BWB (Nova license)","Miami Dice (Nova, German) (MPU4 Video)",GAME_FLAGS )
+
+
+// other issues
+
+// no video ROMs dumped!
+GAME(  199?, v4megbuk,   0,        bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Megabucks Poker (BWB) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4megbuka,  v4megbuk, bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Megabucks Poker (BWB) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4megbukb,  v4megbuk, bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Megabucks Poker (BWB) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4megbukc,  v4megbuk, bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Megabucks Poker (BWB) (set 4) (MPU4 Video)",GAME_FLAGS )
+
+
+// no video ROMs dumped!
+GAME(  199?, v4rencas,   0,        bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Reno Casino (BWB) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rencasa,  v4rencas, bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Reno Casino (BWB) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rencasb,  v4rencas, bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Reno Casino (BWB) (set 3) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rencasc,  v4rencas, bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Reno Casino (BWB) (set 4) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rencasd,  v4rencas, bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Reno Casino (BWB) (set 5) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rencase,  v4rencas, bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Reno Casino (BWB) (set 6) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rencasf,  v4rencas, bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Reno Casino (BWB) (set 7) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rencasg,  v4rencas, bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Reno Casino (BWB) (set 8) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rencash,  v4rencas, bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Reno Casino (BWB) (set 9) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4rencasi,  v4rencas, bwbvid,     mpu4,     mpu4vid_state, init_bwbhack,     ROT0, "BWB","Reno Casino (BWB) (set 10) (MPU4 Video)",GAME_FLAGS )
+
+
+/* Uncertain BIOS */
+// has a Barcrest style Characteriser check, not a BWB one?
+GAME(  199?, v4frfact,   v4bios,   crmaze,     bwbvid,   mpu4vid_state, init_v4frfact,    ROT0, "BWB","Fruit Factory (BWB) (set 1) (MPU4 Video)", GAME_FLAGS )
+GAME(  199?, v4frfacta,  v4frfact, crmaze,     bwbvid,   mpu4vid_state, init_v4frfact,    ROT0, "BWB","Fruit Factory (BWB) (set 2) (MPU4 Video)", GAME_FLAGS )
+GAME(  199?, v4frfactb,  v4frfact, crmaze,     bwbvid,   mpu4vid_state, init_v4frfact,    ROT0, "BWB","Fruit Factory (BWB) (set 3) (MPU4 Video)", GAME_FLAGS )
+GAME(  199?, v4frfactc,  v4frfact, crmaze,     bwbvid,   mpu4vid_state, init_v4frfact,    ROT0, "BWB","Fruit Factory (BWB) (set 4) (MPU4 Video)", GAME_FLAGS )
+GAME(  199?, v4frfactd,  v4frfact, crmaze,     bwbvid,   mpu4vid_state, init_v4frfact,    ROT0, "BWB","Fruit Factory (BWB) (set 5) (MPU4 Video)", GAME_FLAGS )
+GAME(  199?, v4frfacte,  v4frfact, crmaze,     bwbvid,   mpu4vid_state, init_v4frfact,    ROT0, "BWB","Fruit Factory (BWB) (set 6) (MPU4 Video)", GAME_FLAGS )
+GAME(  199?, v4frfactf,  v4frfact, crmaze,     bwbvid,   mpu4vid_state, init_v4frfact,    ROT0, "BWB","Fruit Factory (BWB) (set 7) (MPU4 Video)", GAME_FLAGS )
 
 /* Nova - is this the same video board? One of the games displays 'Resetting' but the others do nothing interesting and access strange addresses */
-/* All contain BwB video in the BIOS rom tho */
-GAME(  199?, v4cybcas,   0,        bwbvid5,    mpu4,     mpu4vid_state, init_cybcas,    ROT0, "Nova","Cyber Casino (Nova) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4miami,    0,        bwbvid5,    mpu4,     mpu4vid_state, empty_init,     ROT0, "Nova","Miami Dice (Nova) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4missis,   0,        bwbvid5,    mpu4,     mpu4vid_state, empty_init,     ROT0, "Nova","Mississippi Lady (Nova) (MPU4 Video)",GAME_FLAGS )
-GAME(  199?, v4picdil,   0,        bwbvid5,    mpu4,     mpu4vid_state, empty_init,     ROT0, "Nova","Piccadilly Nights (Nova) (MPU4 Video)",GAME_FLAGS )
+/* All contain BWB video in the BIOS rom tho, Cyber Casino also needs a Jackpot link? */
+/* These seem to use the other palette chip (BT471). and use the German BWB bank setup, so may need more work */
+
+GAME(  199?, v4cybcas,   0,        bwbvid_oki_bt471_german,    v4cybcas,   mpu4vid_state, init_cybcas,     ROT0, "BWB (Nova license)","Cyber Casino (Nova, German) (MPU4 Video)",GAME_FLAGS )
+
+GAME(  199?, v4missis,   0,        bwbvid_oki_bt471_german,    v4cybcas,   mpu4vid_state, init_bwbhack,    ROT0, "BWB (Nova license)","Mississippi Lady (Nova, German) (MPU4 Video)",GAME_FLAGS ) // different hardware type? extra ram on mpu4 side?
+
+GAME(  199?, v4picdil,   0,        bwbvid_oki_bt471_german,    v4cybcas,    mpu4vid_state, init_bwbhack,    ROT0, "BWB (Nova license)","Piccadilly Night (Nova, German) (set 1) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4picdila,  v4picdil, bwbvid_oki_bt471_german,    v4cybcas,    mpu4vid_state, init_bwbhack,    ROT0, "BWB (Nova license)","Piccadilly Night (Nova, German) (set 2) (MPU4 Video)",GAME_FLAGS )
+GAME(  199?, v4picdilz,  v4picdil, bwbvid_oki_bt471_german,    v4cybcas,    mpu4vid_state, init_bwbhack,    ROT0, "BWB (Nova license)","Piccadilly Night (Nova, German) (set 3) (MPU4 Video)",GAME_FLAGS )
+
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mrdo.cpp mame-0.224+dfsg.1/src/mame/drivers/mrdo.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mrdo.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mrdo.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -15,7 +15,6 @@
 Video frequency: VSYNC = HSYNC/262 = 59.94323742 Hz
 VBlank duration: 1/VSYNC * (70/262) = 4457 us
 
-
 The manual for this model clearly shows above values in 'Misc' parts listings.
 There's a chance that certain bootlegs might have the different 8/20 MHz XTALS.
 
@@ -39,8 +38,8 @@
 
 
 
-/* PAL16R6CN used for protection. The game doesn't clear the screen */
-/* if a read from this address doesn't return the value it expects. */
+/* PAL16R6CN used for protection. The game doesn't clear the screen
+   if a read from this address doesn't return the value it expects. */
 uint8_t mrdo_state::mrdo_SECRE_r()
 {
 	uint8_t *RAM = memregion("maincpu")->base();
@@ -56,7 +55,7 @@
 	map(0x8000, 0x87ff).ram().w(FUNC(mrdo_state::mrdo_bgvideoram_w)).share("bgvideoram");
 	map(0x8800, 0x8fff).ram().w(FUNC(mrdo_state::mrdo_fgvideoram_w)).share("fgvideoram");
 	map(0x9000, 0x90ff).writeonly().share("spriteram");
-	map(0x9800, 0x9800).w(FUNC(mrdo_state::mrdo_flipscreen_w));    /* screen flip + playfield priority */
+	map(0x9800, 0x9800).w(FUNC(mrdo_state::mrdo_flipscreen_w)); // screen flip + playfield priority
 	map(0x9801, 0x9801).w("u8106_1", FUNC(u8106_device::write));
 	map(0x9802, 0x9802).w("u8106_2", FUNC(u8106_device::write));
 	map(0x9803, 0x9803).r(FUNC(mrdo_state::mrdo_SECRE_r));
@@ -128,7 +127,7 @@
 	PORT_DIPSETTING(    0x0c, DEF_STR( 1C_4C ) )
 	PORT_DIPSETTING(    0x0b, DEF_STR( 1C_5C ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Free_Play ) )
-	/* settings 0x01 through 0x05 all give 1 Coin/1 Credit */
+	// settings 0x01 through 0x05 all give 1 Coin/1 Credit
 	PORT_DIPNAME( 0xf0, 0xf0, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:4,3,2,1")
 	PORT_DIPSETTING(    0x60, DEF_STR( 4C_1C ) )
 	PORT_DIPSETTING(    0x80, DEF_STR( 3C_1C ) )
@@ -141,7 +140,7 @@
 	PORT_DIPSETTING(    0xc0, DEF_STR( 1C_4C ) )
 	PORT_DIPSETTING(    0xb0, DEF_STR( 1C_5C ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Free_Play ) )
-	/* settings 0x10 through 0x50 all give 1 Coin/1 Credit */
+	// settings 0x10 through 0x50 all give 1 Coin/1 Credit
 INPUT_PORTS_END
 
 
@@ -169,7 +168,7 @@
 };
 
 static GFXDECODE_START( gfx_mrdo )
-	GFXDECODE_ENTRY( "gfx1", 0, charlayout,      0, 64 )    /* colors 0-255 directly mapped */
+	GFXDECODE_ENTRY( "gfx1", 0, charlayout,      0, 64 ) // colors 0-255 directly mapped
 	GFXDECODE_ENTRY( "gfx2", 0, charlayout,      0, 64 )
 	GFXDECODE_ENTRY( "gfx3", 0, spritelayout, 4*64, 16 )
 GFXDECODE_END
@@ -177,12 +176,12 @@
 
 void mrdo_state::mrdo(machine_config &config)
 {
-	/* basic machine hardware */
-	Z80(config, m_maincpu, MAIN_CLOCK/2);  /* Verified */
+	// Basic machine hardware
+	Z80(config, m_maincpu, MAIN_CLOCK/2);  // Verified
 	m_maincpu->set_addrmap(AS_PROGRAM, &mrdo_state::main_map);
 	m_maincpu->set_vblank_int("screen", FUNC(mrdo_state::irq0_line_hold));
 
-	/* video hardware */
+	// Video hardware
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_raw(VIDEO_CLOCK/4, 312, 8, 248, 262, 32, 224);
 	screen.set_screen_update(FUNC(mrdo_state::screen_update_mrdo));
@@ -191,12 +190,12 @@
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_mrdo);
 	PALETTE(config, m_palette, FUNC(mrdo_state::mrdo_palette), 64*4 + 16*4, 256);
 
-	/* sound hardware */
+	// Sound hardware
 	SPEAKER(config, "mono").front_center();
 
-	U8106(config, "u8106_1", MAIN_CLOCK/2).add_route(ALL_OUTPUTS, "mono", 0.50);  /* sn76489-equivalent?, Verified */
+	U8106(config, "u8106_1", MAIN_CLOCK/2).add_route(ALL_OUTPUTS, "mono", 0.50); // sn76489-equivalent?, Verified
 
-	U8106(config, "u8106_2", MAIN_CLOCK/2).add_route(ALL_OUTPUTS, "mono", 0.50);  /* sn76489-equivalent?, Verified */
+	U8106(config, "u8106_2", MAIN_CLOCK/2).add_route(ALL_OUTPUTS, "mono", 0.50); // sn76489-equivalent?, Verified
 }
 
 void mrdo_state::mrlo(machine_config &config)
@@ -205,6 +204,13 @@
 	//config.device_remove("pal16r6");
 }
 
+// Main Clock: XTAL = 8.000 MHz, Video clock: XTAL = 19.908 MHz
+void mrdo_state::mrdobl(machine_config &config)
+{
+	mrdo(config);
+	m_maincpu->set_clock(8_MHz_XTAL/2);
+}
+
 
 
 /***************************************************************************
@@ -233,10 +239,10 @@
 	ROM_LOAD( "k5-06.bin",    0x1000, 0x1000, CRC(b1f68b04) SHA1(25709cd81c03df51f27cd730fecf86a1daa9e27e) )
 
 	ROM_REGION( 0x0080, "proms", 0 )
-	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) )    /* palette (high bits) */
-	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) )    /* palette (low bits) */
-	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) )    /* sprite color lookup table */
-	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) )    /* timing (not used) */
+	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits)
+	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) ) // palette (low bits)
+	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) ) // sprite color lookup table
+	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used)
 
 	ROM_REGION( 0x0200, "pal16r6", 0 )
 	ROM_LOAD( "j2-u001.bin",  0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // PAL16R6 converted to GAL16V8
@@ -262,10 +268,10 @@
 	ROM_LOAD( "k5-06.bin",    0x1000, 0x1000, CRC(b1f68b04) SHA1(25709cd81c03df51f27cd730fecf86a1daa9e27e) )
 
 	ROM_REGION( 0x0080, "proms", 0 )
-	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) )    /* palette (high bits) */
-	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) )    /* palette (low bits) */
-	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) )    /* sprite color lookup table */
-	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) )    /* timing (not used) */
+	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits)
+	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) ) // palette (low bits)
+	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) ) // sprite color lookup table
+	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used)
 
 	ROM_REGION( 0x0200, "pal16r6", 0 )
 	ROM_LOAD( "j2-u001.bin",  0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // PAL16R6 converted to GAL16V8
@@ -291,10 +297,10 @@
 	ROM_LOAD( "k5-06.bin",    0x1000, 0x1000, CRC(b1f68b04) SHA1(25709cd81c03df51f27cd730fecf86a1daa9e27e) )
 
 	ROM_REGION( 0x0080, "proms", 0 )
-	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) )    /* palette (high bits) */
-	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) )    /* palette (low bits) */
-	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) )    /* sprite color lookup table */
-	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) )    /* timing (not used) */
+	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits)
+	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) ) // palette (low bits)
+	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) ) // sprite color lookup table
+	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used)
 
 	ROM_REGION( 0x0200, "pal16r6", 0 )
 	ROM_LOAD( "j2-u001.bin",  0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // PAL16R6 converted to GAL16V8
@@ -320,10 +326,10 @@
 	ROM_LOAD( "k5-06.bin",    0x1000, 0x1000, CRC(b1f68b04) SHA1(25709cd81c03df51f27cd730fecf86a1daa9e27e) )
 
 	ROM_REGION( 0x0080, "proms", 0 )
-	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) )    /* palette (high bits) */
-	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) )    /* palette (low bits) */
-	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) )    /* sprite color lookup table */
-	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) )    /* timing (not used) */
+	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits)
+	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) ) // palette (low bits)
+	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) ) // sprite color lookup table
+	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used)
 ROM_END
 
 ROM_START( mrdu )
@@ -346,10 +352,10 @@
 	ROM_LOAD( "k5-06.bin",    0x1000, 0x1000, CRC(b1f68b04) SHA1(25709cd81c03df51f27cd730fecf86a1daa9e27e) )
 
 	ROM_REGION( 0x0080, "proms", 0 )
-	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) )    /* palette (high bits) */
-	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) )    /* palette (low bits) */
-	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) )    /* sprite color lookup table */
-	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) )    /* timing (not used) */
+	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits)
+	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) ) // palette (low bits)
+	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) ) // sprite color lookup table
+	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used)
 
 	ROM_REGION( 0x0200, "pal16r6", 0 )
 	ROM_LOAD( "j2-u001.bin",  0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) )
@@ -375,10 +381,10 @@
 	ROM_LOAD( "dosnow.6",     0x1000, 0x1000, CRC(413f88d1) SHA1(830df0def7289536e2d08e0517cdb6edbc947400) )
 
 	ROM_REGION( 0x0080, "proms", 0 )
-	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) )    /* palette (high bits) */
-	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) )    /* palette (low bits) */
-	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) )    /* sprite color lookup table */
-	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) )    /* timing (not used) */
+	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits)
+	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) ) // palette (low bits)
+	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) ) // sprite color lookup table
+	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used)
 
 	ROM_REGION( 0x0200, "pal16r6", 0 )
 	ROM_LOAD( "j2-u001.bin",  0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // PAL16R6 converted to GAL16V8
@@ -407,15 +413,44 @@
 	ROM_LOAD( "md_fabre.k5", 0x1000, 0x1000, CRC(b1f68b04) SHA1(25709cd81c03df51f27cd730fecf86a1daa9e27e) )
 
 	ROM_REGION( 0x0080, "proms", 0 )
-	ROM_LOAD( "82s123.u2",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) )    /* palette (high bits) */
-	ROM_LOAD( "82s123.t2",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) )    /* palette (low bits) */
-	ROM_LOAD( "82s123.f10n", 0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) )    /* sprite color lookup table */
-	ROM_LOAD( "82s123.j10",  0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) )    /* timing (not used) */
+	ROM_LOAD( "82s123.u2",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits)
+	ROM_LOAD( "82s123.t2",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) ) // palette (low bits)
+	ROM_LOAD( "82s123.f10n", 0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) ) // sprite color lookup table
+	ROM_LOAD( "82s123.j10",  0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used)
 
 	ROM_REGION( 0x0200, "pal16r6", 0 )
 	ROM_LOAD( "pal16r6.j2",  0x0000, 0x0117, BAD_DUMP CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // From parent, protected on this set
 ROM_END
 
+ROM_START( mrdobl )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "d1.a4",  0x0000, 0x2000, CRC(03dcfba2) SHA1(c15e3d0c4225e0ca120bcd28aca39632575f8e11) )
+	ROM_LOAD( "d2.c4",  0x2000, 0x2000, CRC(0ecdd39c) SHA1(c64b3363593911a676c647bf3dba8fe063fcb0de) )
+	ROM_LOAD( "d3.e4",  0x4000, 0x2000, CRC(afc518e3) SHA1(abfb874e22ce375a2badecafaf95a3cd8c6179b1) )
+	ROM_LOAD( "d4.f4",  0x6000, 0x2000, CRC(f4190cfc) SHA1(24f5125d900f944294d4eda068b710c8f1c6d39f) )
+
+	ROM_REGION( 0x2000, "gfx1", 0 )
+	ROM_LOAD( "d9.s8",  0x0000, 0x1000, CRC(aa80c5b6) SHA1(76f9f90deb74598470e7ed565237da38dd07e4e9) )
+	ROM_LOAD( "d10.u8", 0x1000, 0x1000, CRC(d20ec85b) SHA1(9762bbe34d3fa209ea719807c723f57cb6bf4e01) )
+
+	ROM_REGION( 0x2000, "gfx2", 0 )
+	ROM_LOAD( "d8.r8",  0x0000, 0x1000, CRC(dbdc9ffa) SHA1(93f29fc106283eecbba3fd69cf3c4658aa38ab9f) )
+	ROM_LOAD( "d7.n8",  0x1000, 0x1000, CRC(4b9973db) SHA1(8766c51a345a5e63446e65614c6f665ab5fbe0d7) )
+
+	ROM_REGION( 0x2000, "gfx3", 0 )
+	ROM_LOAD( "d5.h5",  0x0000, 0x1000, CRC(e1218cc5) SHA1(d946613a1cf1c97f7533a4f8c2d0078d1b7daaa8) )
+	ROM_LOAD( "d6.k5",  0x1000, 0x1000, CRC(b1f68b04) SHA1(25709cd81c03df51f27cd730fecf86a1daa9e27e) )
+
+	ROM_REGION( 0x0080, "proms", 0 )
+	ROM_LOAD( "2_18s030.u2", 0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits)
+	ROM_LOAD( "1_18s030.t2", 0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) ) // palette (low bits)
+	ROM_LOAD( "7603-5.e10",  0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) ) // sprite color lookup table
+	ROM_LOAD( "82s123.j10",  0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used)
+
+	ROM_REGION( 0x0104, "pal16r6", 0 )
+	ROM_LOAD( "u001_pal16r6cn.j2", 0x0000, 0x0104, CRC(84dbe498) SHA1(5863342b2db85ffef31b5e9ce26bfd8fca9923b0) )
+ROM_END
+
 ROM_START( yankeedo )
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "a4-01.bin",    0x0000, 0x2000, CRC(03dcfba2) SHA1(c15e3d0c4225e0ca120bcd28aca39632575f8e11) )
@@ -436,21 +471,22 @@
 	ROM_LOAD( "yd_d6.k5",     0x1000, 0x1000, CRC(790579aa) SHA1(89d8a77d2046cf8cfc393e0f08d361d1886bfec1) )
 
 	ROM_REGION( 0x0080, "proms", 0 )
-	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) )    /* palette (high bits) */
-	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) )    /* palette (low bits) */
-	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) )    /* sprite color lookup table */
-	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) )    /* timing (not used) */
+	ROM_LOAD( "u02--2.bin",   0x0000, 0x0020, CRC(238a65d7) SHA1(a5b20184a1989db23544296331462ec4d7be7516) ) // palette (high bits)
+	ROM_LOAD( "t02--3.bin",   0x0020, 0x0020, CRC(ae263dc0) SHA1(7072c100b9d692f5bb12b0c9e304425f534481e2) ) // palette (low bits)
+	ROM_LOAD( "f10--1.bin",   0x0040, 0x0020, CRC(16ee4ca2) SHA1(fcba4d103708b9711452009cd29c4f88d2f64cd3) ) // sprite color lookup table
+	ROM_LOAD( "j10--4.bin",   0x0060, 0x0020, CRC(ff7fe284) SHA1(3ac8e30011c1fcba0ee8f4dc932f82296c3ba143) ) // timing (not used)
 
 	ROM_REGION( 0x0200, "pal16r6", 0 )
 	ROM_LOAD( "j2-u001.bin",  0x0000, 0x0117, CRC(badf5876) SHA1(b301cfc7f8e83408fdcb742f552a0414af6aa16e) ) // PAL16R6 converted to GAL16V8
 ROM_END
 
 
-GAME( 1982, mrdo,     0,    mrdo, mrdo, mrdo_state, empty_init, ROT270, "Universal",                 "Mr. Do!",                    MACHINE_SUPPORTS_SAVE )
-GAME( 1982, mrdoy,    mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "Universal",                 "Mr. Do! (prototype)",        MACHINE_SUPPORTS_SAVE ) /* aka "Yukidaruma" */
-GAME( 1982, mrdot,    mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "Universal (Taito license)", "Mr. Do! (Taito)",            MACHINE_SUPPORTS_SAVE )
-GAME( 1982, mrdofix,  mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "Universal (Taito license)", "Mr. Do! (bugfixed)",         MACHINE_SUPPORTS_SAVE )
-GAME( 1982, mrlo,     mrdo, mrlo, mrdo, mrdo_state, empty_init, ROT270, "bootleg",                   "Mr. Lo!",                    MACHINE_SUPPORTS_SAVE )
-GAME( 1982, mrdu,     mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "bootleg",                   "Mr. Du!",                    MACHINE_SUPPORTS_SAVE )
-GAME( 1982, mrdofabr, mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "bootleg (Fabremar)",        "Mr. Do! (Fabremar bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, yankeedo, mrdo, mrdo, mrdo, mrdo_state, empty_init, ROT270, "hack",                      "Yankee DO!",                 MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mrdo,     0,    mrdo,   mrdo, mrdo_state, empty_init, ROT270, "Universal",                 "Mr. Do!",                    MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mrdoy,    mrdo, mrdo,   mrdo, mrdo_state, empty_init, ROT270, "Universal",                 "Mr. Do! (prototype)",        MACHINE_SUPPORTS_SAVE ) /* aka "Yukidaruma" */
+GAME( 1982, mrdot,    mrdo, mrdo,   mrdo, mrdo_state, empty_init, ROT270, "Universal (Taito license)", "Mr. Do! (Taito)",            MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mrdofix,  mrdo, mrdo,   mrdo, mrdo_state, empty_init, ROT270, "Universal (Taito license)", "Mr. Do! (bugfixed)",         MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mrlo,     mrdo, mrlo,   mrdo, mrdo_state, empty_init, ROT270, "bootleg",                   "Mr. Lo!",                    MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mrdu,     mrdo, mrdo,   mrdo, mrdo_state, empty_init, ROT270, "bootleg",                   "Mr. Du!",                    MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mrdofabr, mrdo, mrdo,   mrdo, mrdo_state, empty_init, ROT270, "bootleg (Fabremar)",        "Mr. Do! (Fabremar bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, mrdobl,   mrdo, mrdobl, mrdo, mrdo_state, empty_init, ROT270, "bootleg",                   "Mr. Do! (bootleg)",          MACHINE_SUPPORTS_SAVE )
+GAME( 1982, yankeedo, mrdo, mrdo,   mrdo, mrdo_state, empty_init, ROT270, "hack",                      "Yankee DO!",                 MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/msbc1.cpp mame-0.224+dfsg.1/src/mame/drivers/msbc1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/msbc1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/msbc1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -71,12 +71,12 @@
 	void msbc1(machine_config &config);
 
 private:
-	void msbc1_mem(address_map &map);
+	void mem_map(address_map &map);
 	virtual void machine_reset() override;
 	required_device<cpu_device> m_maincpu;
 };
 
-void msbc1_state::msbc1_mem(address_map &map)
+void msbc1_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x000000, 0x5fffff).ram();
@@ -102,7 +102,7 @@
 {
 	/* basic machine hardware */
 	M68000(config, m_maincpu, 12.5_MHz_XTAL);
-	m_maincpu->set_addrmap(AS_PROGRAM, &msbc1_state::msbc1_mem);
+	m_maincpu->set_addrmap(AS_PROGRAM, &msbc1_state::mem_map);
 
 	PIT68230(config, "pit", 8_MHz_XTAL);
 
@@ -134,4 +134,4 @@
 /* Driver */
 
 //    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY     FULLNAME  FLAGS
-COMP( 1985, msbc1, 0,      0,      msbc1,   msbc1, msbc1_state, empty_init, "Omnibyte", "MSBC-1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1985, msbc1, 0,      0,      msbc1,   msbc1, msbc1_state, empty_init, "Omnibyte", "MSBC-1", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mw8080bw.cpp mame-0.224+dfsg.1/src/mame/drivers/mw8080bw.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mw8080bw.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mw8080bw.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -747,10 +747,10 @@
 	map(0x02, 0x02).mirror(0x04).portr("IN2");
 	map(0x03, 0x03).mirror(0x04).r(m_mb14241, FUNC(mb14241_device::shift_result_r));
 
-	map(0x02, 0x02).w("soundboard", FUNC(zzzap_audio_device::p1_w));
+	map(0x02, 0x02).w("soundboard", FUNC(zzzap_common_audio_device::p1_w));
 	map(0x03, 0x03).w(m_mb14241, FUNC(mb14241_device::shift_data_w));
 	map(0x04, 0x04).w(m_mb14241, FUNC(mb14241_device::shift_count_w));
-	map(0x05, 0x05).w("soundboard", FUNC(zzzap_audio_device::p2_w));
+	map(0x05, 0x05).w("soundboard", FUNC(zzzap_common_audio_device::p2_w));
 	map(0x07, 0x07).w(m_watchdog, FUNC(watchdog_timer_device::reset_w));
 }
 
@@ -824,7 +824,7 @@
 INPUT_PORTS_END
 
 
-void zzzap_state::zzzap(machine_config &config)
+void zzzap_state::zzzap_common(machine_config &config)
 {
 	mw8080bw_root(config);
 
@@ -836,11 +836,28 @@
 	/* add shifter */
 	MB14241(config, m_mb14241);
 
+	/* audio hardware handled by specific machine */
+}
+
+
+void zzzap_state::zzzap(machine_config &config)
+{
+	zzzap_common(config);
+
 	/* audio hardware */
 	ZZZAP_AUDIO(config, "soundboard");
 }
 
 
+void zzzap_state::lagunar(machine_config &config)
+{
+	zzzap_common(config);
+
+	/* audio hardware */
+	LAGUNAR_AUDIO(config, "soundboard");
+}
+
+
 
 /*************************************
  *
@@ -2965,14 +2982,14 @@
 
 ROM_START( spcenctr )
 	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD( "4m33.h",     0x0000, 0x0800, CRC(7458b2db) SHA1(c4f41efb8a35fd8bebc75bff0111476affe2b34d) )
-	ROM_LOAD( "4m32.g",     0x0800, 0x0800, CRC(1b873788) SHA1(6cdf0d602a65c7efcf8abe149c6172b4c7ab87a1) )
-	ROM_LOAD( "4m31.f",     0x1000, 0x0800, CRC(d4319c91) SHA1(30830595c220f490fe150ad018fbf4671bb71e02) )
-	ROM_LOAD( "4m30.e",     0x1800, 0x0800, CRC(9b9a1a45) SHA1(8023a05c13e8b541f9e2fe4d389e6a2dcd4766ea) )
-	ROM_LOAD( "4m29.d",     0x4000, 0x0800, CRC(294d52ce) SHA1(0ee63413c5caf60d45ae8bef08f6c07099d30f79) )
-	ROM_LOAD( "4m28.c",     0x4800, 0x0800, CRC(ce44c923) SHA1(9d35908de3194c5fe6fc8495ae413fa722018744) )
-	ROM_LOAD( "4m27.b",     0x5000, 0x0800, CRC(098070ab) SHA1(72ae344591df0174353dc2e3d22daf5a70e2261f) )
-	ROM_LOAD( "4m26.a",     0x5800, 0x0800, CRC(7f1d1f44) SHA1(2f4951171a55e7ac072742fa24eceeee6aca7e39) )
+	ROM_LOAD( "m645h-4m33.h1", 0x0000, 0x0800, CRC(7458b2db) SHA1(c4f41efb8a35fd8bebc75bff0111476affe2b34d) )
+	ROM_LOAD( "m645g-4m32.g1", 0x0800, 0x0800, CRC(1b873788) SHA1(6cdf0d602a65c7efcf8abe149c6172b4c7ab87a1) )
+	ROM_LOAD( "m645f-4m31.f1", 0x1000, 0x0800, CRC(d4319c91) SHA1(30830595c220f490fe150ad018fbf4671bb71e02) )
+	ROM_LOAD( "m645e-4m30.e1", 0x1800, 0x0800, CRC(9b9a1a45) SHA1(8023a05c13e8b541f9e2fe4d389e6a2dcd4766ea) )
+	ROM_LOAD( "m645d-4m29.d1", 0x4000, 0x0800, CRC(294d52ce) SHA1(0ee63413c5caf60d45ae8bef08f6c07099d30f79) )
+	ROM_LOAD( "m645c-4m28.c1", 0x4800, 0x0800, CRC(ce44c923) SHA1(9d35908de3194c5fe6fc8495ae413fa722018744) )
+	ROM_LOAD( "m645b-4m27.b1", 0x5000, 0x0800, CRC(098070ab) SHA1(72ae344591df0174353dc2e3d22daf5a70e2261f) )
+	ROM_LOAD( "m645a-4m26.a1", 0x5800, 0x0800, CRC(7f1d1f44) SHA1(2f4951171a55e7ac072742fa24eceeee6aca7e39) )
 ROM_END
 
 
@@ -3094,14 +3111,14 @@
 /* 597 */ GAMEL( 1975, gunfighto,  gunfight, gunfight, gunfight, gunfight_state, empty_init, ROT0,   "Dave Nutting Associates / Midway", "Gun Fight (set 2)", MACHINE_SUPPORTS_SAVE, layout_gunfight )
 /* 604 Gun Fight (cocktail, dump does not exist) */
 /* 605 */ GAME(  1976, tornbase,   0,        tornbase, tornbase, mw8080bw_state, empty_init, ROT0,   "Dave Nutting Associates / Midway / Taito", "Tornado Baseball / Ball Park", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-/* 610 */ GAMEL( 1976, 280zzzap,   0,        zzzap,    zzzap,    zzzap_state, empty_init, ROT0,   "Dave Nutting Associates / Midway", "280-ZZZAP", MACHINE_SUPPORTS_SAVE, layout_280zzzap )
+/* 610 */ GAMEL( 1976, 280zzzap,   0,        zzzap,    zzzap,    zzzap_state,    empty_init, ROT0,   "Dave Nutting Associates / Midway", "280-ZZZAP", MACHINE_SUPPORTS_SAVE, layout_280zzzap )
 /* 611 */ GAMEL( 1976, maze,       0,        maze,     maze,     mw8080bw_state, empty_init, ROT0,   "Midway", "Amazing Maze", MACHINE_SUPPORTS_SAVE, layout_maze )
 /* 612 */ GAME(  1977, boothill,   0,        boothill, boothill, boothill_state, empty_init, ROT0,   "Dave Nutting Associates / Midway", "Boot Hill", MACHINE_SUPPORTS_SAVE )
 /* 615 */ GAME(  1977, checkmat,   0,        checkmat, checkmat, mw8080bw_state, empty_init, ROT0,   "Dave Nutting Associates / Midway", "Checkmate", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 /* 618 */ GAME(  1977, desertgu,   0,        desertgu, desertgu, desertgu_state, empty_init, ROT0,   "Dave Nutting Associates / Midway", "Desert Gun", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 /* 618 */ GAME(  1977, roadrunm,   desertgu, desertgu, desertgu, desertgu_state, empty_init, ROT0,   "Midway", "Road Runner (Midway)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 /* 619 */ GAME(  1977, dplay,      0,        dplay,    dplay,    dplay_state,    empty_init, ROT0,   "Midway", "Double Play", MACHINE_SUPPORTS_SAVE )
-/* 622 */ GAMEL( 1977, lagunar,    0,        zzzap,    lagunar,  zzzap_state, empty_init, ROT90,  "Midway", "Laguna Racer", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE, layout_lagunar )
+/* 622 */ GAMEL( 1977, lagunar,    0,        lagunar,  lagunar,  zzzap_state,    empty_init, ROT90,  "Midway", "Laguna Racer", MACHINE_SUPPORTS_SAVE, layout_lagunar )
 /* 623 */ GAME(  1977, gmissile,   0,        gmissile, gmissile, boothill_state, empty_init, ROT0,   "Midway", "Guided Missile", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 /* 626 */ GAME(  1977, m4,         0,        m4,       m4,       boothill_state, empty_init, ROT0,   "Midway", "M-4", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 /* 630 */ GAMEL( 1978, clowns,     0,        clowns,   clowns,   clowns_state,   empty_init, ROT0,   "Midway", "Clowns (rev. 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_clowns )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mycom.cpp mame-0.224+dfsg.1/src/mame/drivers/mycom.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mycom.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mycom.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -82,6 +82,8 @@
 		, m_maincpu(*this, "maincpu")
 		, m_rom(*this, "maincpu")
 		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
+		, m_bank2(*this, "bank2")
 		, m_ppi0(*this, "ppi8255_0")
 		, m_ppi1(*this, "ppi8255_1")
 		, m_ppi2(*this, "ppi8255_2")
@@ -121,12 +123,13 @@
 	u8 m_sn_we;
 	u16 m_i_videoram;
 	bool m_keyb_press_flag;
-	bool m_upper_sw, m_lower_sw;
 	virtual void machine_reset() override;
 	virtual void machine_start() override;
 	required_device<cpu_device> m_maincpu;
 	required_region_ptr<u8> m_rom;
 	required_shared_ptr<u8> m_ram;
+	required_memory_bank    m_bank1;
+	required_memory_bank    m_bank2;
 	required_device<i8255_device> m_ppi0;
 	required_device<i8255_device> m_ppi1;
 	required_device<i8255_device> m_ppi2;
@@ -202,10 +205,10 @@
 {
 	switch(data)
 	{
-		case 0x00: m_lower_sw = 1; break;   // rom
-		case 0x01: m_lower_sw = 0; break;   // ram
-		case 0x02: m_upper_sw = 1; break;   // rom
-		case 0x03: m_upper_sw = 0; break;   // ram
+		case 0x00: m_bank1->set_entry(1); break;   // rom
+		case 0x01: m_bank1->set_entry(0); break;   // ram
+		case 0x02: m_bank2->set_entry(1); break;   // rom
+		case 0x03: m_bank2->set_entry(0); break;   // ram
 	}
 }
 
@@ -223,8 +226,8 @@
 {
 	map.unmap_value_high();
 	map(0x0000, 0xffff).ram().share("mainram");
-	map(0x0000, 0x0fff).lr8(NAME([this] (offs_t offset) { if(m_lower_sw) return m_rom[offset]; else return m_ram[offset]; }));
-	map(0xc000, 0xffff).lr8(NAME([this] (offs_t offset) { if(m_upper_sw) return m_rom[offset]; else return m_ram[offset | 0xc000]; }));
+	map(0x0000, 0x0fff).bankr("bank1");
+	map(0xc000, 0xffff).bankr("bank2");
 }
 
 void mycom_state::mycom_io(address_map &map)
@@ -492,19 +495,21 @@
 {
 	m_vram = make_unique_clear<u8[]>(0x0800);
 	save_pointer(NAME(m_vram), 0x0800);
+	m_bank1->configure_entry(0, m_ram);
+	m_bank1->configure_entry(1, m_rom);
+	m_bank2->configure_entry(0, m_ram+0xc000);
+	m_bank2->configure_entry(1, m_rom);
 	save_item(NAME(m_port0a));
 	save_item(NAME(m_i_videoram));
 	save_item(NAME(m_keyb_press));
 	save_item(NAME(m_keyb_press_flag));
 	save_item(NAME(m_sn_we));
-	save_item(NAME(m_upper_sw));
-	save_item(NAME(m_lower_sw));
 }
 
 void mycom_state::machine_reset()
 {
-	m_lower_sw = 1;
-	m_upper_sw = 1;
+	m_bank1->set_entry(1);
+	m_bank2->set_entry(1);
 	m_port0a = 0;
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mystwarr.cpp mame-0.224+dfsg.1/src/mame/drivers/mystwarr.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mystwarr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mystwarr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -377,9 +377,7 @@
 	map(0x278002, 0x278003).r(FUNC(mystwarr_state::eeprom_r));
 	map(0x27c000, 0x27c001).nopr();     // watchdog lives here
 	map(0x27c000, 0x27c001).w(FUNC(mystwarr_state::mmeeprom_w));
-	map(0x300000, 0x301fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w));
-	map(0x302000, 0x303fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)); // tilemap RAM mirror read(essential)
-	map(0x304000, 0x3041ff).ram();
+	map(0x300000, 0x301fff).rw(m_k056832, FUNC(k056832_device::ram_word_r), FUNC(k056832_device::ram_word_w)).mirror(0x6000);
 	map(0x310000, 0x311fff).r(m_k056832, FUNC(k056832_device::mw_rom_word_r));
 	map(0x330000, 0x331fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
 }
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/mz2000.cpp mame-0.224+dfsg.1/src/mame/drivers/mz2000.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/mz2000.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/mz2000.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -884,7 +884,7 @@
 
 	i8255_device &ppi(I8255(config, "i8255_0"));
 	ppi.in_pa_callback().set(FUNC(mz2000_state::mz2000_porta_r));
-	ppi.out_pa_callback().set(FUNC(mz2000_state::mz2000_porta_w));;
+	ppi.out_pa_callback().set(FUNC(mz2000_state::mz2000_porta_w));
 	ppi.in_pb_callback().set(FUNC(mz2000_state::mz2000_portb_r));
 	ppi.out_pb_callback().set(FUNC(mz2000_state::mz2000_portb_w));
 	ppi.in_pc_callback().set(FUNC(mz2000_state::mz2000_portc_r));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/namcond1.cpp mame-0.224+dfsg.1/src/mame/drivers/namcond1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/namcond1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/namcond1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -352,7 +352,7 @@
 
 /******************************************
   ND-1 Master clock = 49.152MHz
-  - 680000  = 12288000 (CLK/4)
+  - 68000   = 12288000 (CLK/4)
   - H8/3002 = 16384000 (CLK/3)
   - The level 1 interrupt to the 68k has been measured at 60Hz.
 *******************************************/
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/namcos2.cpp mame-0.224+dfsg.1/src/mame/drivers/namcos2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/namcos2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/namcos2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -86,12 +86,12 @@
 The CPU board also contains the frame timing and video image generation
 circuitry along with text/scroll planes and the palette generator. The system
 has 8192 pens of which 4096+2048 are displayable at any given time. These
-pens refernce a 24 bit colour lookup table (R8:G8:B8).
+pens reference a 24 bit colour lookup table (R8:G8:B8).
 
 The text/tile plane generator has the following capabilities:
 
 2 x Static tile planes (36x28 tiles)
-4 x Scolling tile planes (64x64 tiles)
+4 x Scrolling tile planes (64x64 tiles)
 
 Each plane has its own colour index (8 total) that is used alongside the
 pen number to be looked up in the pen index and generate a 24 bit pixel. Each
@@ -163,7 +163,7 @@
     ????????                       1D0XXX
     ????????                       1D4000 trigger master/slave INT?
 
-    Acknowlegde Master/Slave IRQ   1D6XXX ack master/slave INT
+    Acknowledge Master/Slave IRQ   1D6XXX ack master/slave INT
     Acknowledge EXIRQ              1D8XXX
     Acknowledge POSIRQ             1DAXXX
     Acknowledge SCIRQ              1DCXXX
@@ -197,7 +197,7 @@
     SCIRQ level                    1CCXXX              D00-D02
     VBLANK IRQ level               1CEXXX              D00-D02
     ????????                       1D0XXX
-    Acknowlegde Master/Slave IRQ   1D6XXX
+    Acknowledge Master/Slave IRQ   1D6XXX
     Acknowledge EXIRQ              1D8XXX
     Acknowledge POSIRQ             1DAXXX
     Acknowledge SCIRQ              1DCXXX
@@ -567,31 +567,31 @@
 /* 68000/6809/63705 Shared memory area - DUAL PORT Memory    */
 /*************************************************************/
 
-void namcos2_state::GollyGhostUpdateLED_c4( int data )
+void namcos2_state::GollyGhostUpdateLED_c4(int data)
 {
 	output().set_value("zip100", data >> 4);
 	output().set_value("zip10", data & 0x0f);
 }
 
-void namcos2_state::GollyGhostUpdateLED_c6( int data )
+void namcos2_state::GollyGhostUpdateLED_c6(int data)
 {
 	output().set_value("zip1", data >> 4);
 	output().set_value("time10", data & 0x0f);
 }
 
-void namcos2_state::GollyGhostUpdateLED_c8( int data )
+void namcos2_state::GollyGhostUpdateLED_c8(int data)
 {
 	output().set_value("time1", data >> 4);
 	output().set_value("zap100", data & 0x0f);
 }
 
-void namcos2_state::GollyGhostUpdateLED_ca( int data )
+void namcos2_state::GollyGhostUpdateLED_ca(int data)
 {
 	output().set_value("zap10", data >> 4);
 	output().set_value("zap1", data & 0x0f);
 }
 
-void namcos2_state::GollyGhostUpdateDiorama_c0( int data )
+void namcos2_state::GollyGhostUpdateDiorama_c0(int data)
 {
 	if (data & 0x80)
 	{
@@ -885,8 +885,8 @@
 /*                                                           */
 /*  NAMCO SYSTEM 2 PORT MACROS                               */
 /*                                                           */
-/*  Below are the port defintion macros that should be used  */
-/*  as the basis for defining a port set for a Namco System2  */
+/*  Below are the port definition macros that should be used */
+/*  as the basis for defining a port set for a Namco System2 */
 /*  game.                                                    */
 /*                                                           */
 /*************************************************************/
@@ -1291,7 +1291,7 @@
 	PORT_DIPNAME( 0x10, 0x10, "PortH 0x10")
 	PORT_DIPSETTING(    0x10, "H" )
 	PORT_DIPSETTING(    0x00, "L" )
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_TOGGLE
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Gear Shift") PORT_TOGGLE
 	PORT_DIPNAME( 0x40, 0x40, "PortH 0x40")
 	PORT_DIPSETTING(    0x40, "H" )
 	PORT_DIPSETTING(    0x00, "L" )
@@ -1403,7 +1403,7 @@
    TAB menu.
 
    This game has a rather unique control setup, 2 lightguns, plus steering hardware.  Defaults have been set
-   up to avoid a large number of duplicae buttons.  Using these settings (with -mouse) the following mapping is
+   up to avoid a large number of duplicate buttons.  Using these settings (with -mouse) the following mapping is
    given
 
      Z, X - Steer Car
@@ -1623,7 +1623,7 @@
 
 Soooo;
 
-680000  = 12288000
+68000   = 12288000
 6809    =  3072000
 63B05Z0 =  2048000
 
@@ -4272,87 +4272,87 @@
 /* ROLLING THUNDER 2 */
 ROM_START( rthun2 )
 	ROM_REGION( 0x040000, "maincpu", 0 ) /* Master CPU */
-	ROM_LOAD16_BYTE( "rts2_mpr0.bin",  0x000000, 0x020000, CRC(e09a3549) SHA1(027fe87c98a497c50d12c810b9c7e7216f985dca) )
-	ROM_LOAD16_BYTE( "rts2_mpr1.bin",  0x000001, 0x020000, CRC(09573bff) SHA1(b75e036419f95967d5d95c14f1e08aa0c2a05d8a) )
+	ROM_LOAD16_BYTE( "rts2_mpr0.11d",  0x000000, 0x020000, CRC(e09a3549) SHA1(027fe87c98a497c50d12c810b9c7e7216f985dca) )
+	ROM_LOAD16_BYTE( "rts2_mpr1.13d",  0x000001, 0x020000, CRC(09573bff) SHA1(b75e036419f95967d5d95c14f1e08aa0c2a05d8a) )
 
 	ROM_REGION( 0x040000, "slave", 0 ) /* Slave CPU */
-	ROM_LOAD16_BYTE( "rts2_spr0.bin",  0x000000, 0x010000, CRC(54c22ac5) SHA1(747df2362839e6af15bdbf3298f9ea1c6e25f76a) )
-	ROM_LOAD16_BYTE( "rts2_spr1.bin",  0x000001, 0x010000, CRC(060eb393) SHA1(e8f7dd163df16747a74713a6cadd1d52c09b8036) )
+	ROM_LOAD16_BYTE( "rts2_spr0.11k",  0x000000, 0x010000, CRC(54c22ac5) SHA1(747df2362839e6af15bdbf3298f9ea1c6e25f76a) )
+	ROM_LOAD16_BYTE( "rts2_spr1.13k",  0x000001, 0x010000, CRC(060eb393) SHA1(e8f7dd163df16747a74713a6cadd1d52c09b8036) )
 
 	ROM_REGION( 0x040000, "audiocpu", 0 ) /* Sound CPU (Banked) */
-	ROM_LOAD( "rst1_snd0.bin",  0x000000, 0x020000, CRC(55b7562a) SHA1(47b12206ec4a709769351f3f5b4a1c5ebb98b416) )
-	ROM_LOAD( "rst1_snd1.bin",  0x020000, 0x020000, CRC(00445a4f) SHA1(2e136e3c38e4a1b69f80a19e07555f3269b7beb1) )
+	ROM_LOAD( "rts1_snd0.7j",  0x000000, 0x020000, CRC(55b7562a) SHA1(47b12206ec4a709769351f3f5b4a1c5ebb98b416) )
+	ROM_LOAD( "rts1_snd1.7g",  0x020000, 0x020000, CRC(00445a4f) SHA1(2e136e3c38e4a1b69f80a19e07555f3269b7beb1) )
 
 	ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
-	ROM_LOAD( "sys2c65c.bin",  0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
+	ROM_LOAD( "sys2c65c.3f",  0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
 
-	ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
-	ROM_LOAD32_BYTE( "rst1_obj0.bin",  0x000003, 0x80000, CRC(e5cb82c1) SHA1(2dc1922ecfd9e52af8c4a1edac1df343be64b499) )
-	ROM_LOAD32_BYTE( "rst1_obj1.bin",  0x000002, 0x80000, CRC(19ebe9fd) SHA1(6d7991a52a707f710c809eb44f1dfa4873369c17) )
-	ROM_LOAD32_BYTE( "rst1_obj2.bin",  0x000001, 0x80000, CRC(455c4a2f) SHA1(9d7944b41e98f990423d315365106890e2c5ae77) )
-	ROM_LOAD32_BYTE( "rst1_obj3.bin",  0x000000, 0x80000, CRC(fdcae8a9) SHA1(a1e1057b3263ee9af9e2d861cf8879f51265805e) )
+	ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites, on sub PCB */
+	ROM_LOAD32_BYTE( "rts_obj0.5b",  0x000003, 0x80000, CRC(e5cb82c1) SHA1(2dc1922ecfd9e52af8c4a1edac1df343be64b499) )
+	ROM_LOAD32_BYTE( "rts_obj1.4b",  0x000002, 0x80000, CRC(19ebe9fd) SHA1(6d7991a52a707f710c809eb44f1dfa4873369c17) )
+	ROM_LOAD32_BYTE( "rts_obj2.5d",  0x000001, 0x80000, CRC(455c4a2f) SHA1(9d7944b41e98f990423d315365106890e2c5ae77) )
+	ROM_LOAD32_BYTE( "rts_obj3.4d",  0x000000, 0x80000, CRC(fdcae8a9) SHA1(a1e1057b3263ee9af9e2d861cf8879f51265805e) )
 
 	ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
-	ROM_LOAD( "rst1_chr0.bin",  0x000000, 0x80000, CRC(6f0e9a68) SHA1(873296778104eff11b828273abf7f6ca461c055a) )
-	ROM_LOAD( "rst1_chr1.bin",  0x080000, 0x80000, CRC(15e44adc) SHA1(fead0b2d693f9b6267895d8339bb250f5c77fb4d) )
+	ROM_LOAD( "rts_chr0.11n",  0x000000, 0x80000, CRC(6f0e9a68) SHA1(873296778104eff11b828273abf7f6ca461c055a) )
+	ROM_LOAD( "rts_chr1.11p",  0x080000, 0x80000, CRC(15e44adc) SHA1(fead0b2d693f9b6267895d8339bb250f5c77fb4d) )
 
-	ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
-	ROM_LOAD( "rst1_roz0.bin",  0x000000, 0x80000, CRC(482d0554) SHA1(95b99d1db5851b83b2af4deda2b61635a0562604) )
+	ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles, on sub PCB */
+	ROM_LOAD( "rts_roz0.1a",  0x000000, 0x80000, CRC(482d0554) SHA1(95b99d1db5851b83b2af4deda2b61635a0562604) )
 
 	ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
-	ROM_LOAD( "shape.bin",  0x000000, 0x80000, CRC(cf58fbbe) SHA1(fbe3b2f0c3267b298993d6238d97b119e13e07f6) )
+	ROM_LOAD( "rts_sha0.7n",  0x000000, 0x80000, CRC(cf58fbbe) SHA1(fbe3b2f0c3267b298993d6238d97b119e13e07f6) )
 
 	ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
-	NAMCOS2_DATA_LOAD_E_128K( "rst1_data0.13s",  0x000000, CRC(0baf44ee) SHA1(5135d634f76893adb26a32976a69e2d47e2385c6) )
-	NAMCOS2_DATA_LOAD_O_128K( "rst1_data1.13p",  0x000000, CRC(58a8daac) SHA1(c13ae8fc25b748a006c6db5b4b7ae593738544e8) )
-	NAMCOS2_DATA_LOAD_E_128K( "rst1_data2.13r",  0x100000, CRC(8e850a2a) SHA1(e5230e80a23ca6d09c2c53f443ecf70cc74075d7) )
+	NAMCOS2_DATA_LOAD_E_128K( "rts1_data0.13s",  0x000000, CRC(0baf44ee) SHA1(5135d634f76893adb26a32976a69e2d47e2385c6) )
+	NAMCOS2_DATA_LOAD_O_128K( "rts1_data1.13p",  0x000000, CRC(58a8daac) SHA1(c13ae8fc25b748a006c6db5b4b7ae593738544e8) )
+	NAMCOS2_DATA_LOAD_E_128K( "rts1_data2.13r",  0x100000, CRC(8e850a2a) SHA1(e5230e80a23ca6d09c2c53f443ecf70cc74075d7) )
 
 	ROM_REGION16_BE( 0x200000, "c140", ROMREGION_ERASE00 ) /* Sound voices */
-	ROM_LOAD16_BYTE( "rst1_voi1.bin",  0x000000, 0x080000, CRC(e42027cd) SHA1(fa3a81118c7f112289c27023236dec2e9cbc78b5) )
-	ROM_LOAD16_BYTE( "rst1_voi2.bin",  0x100000, 0x080000, CRC(0c4c2b66) SHA1(7723cbef755439a66d026015596fe1547ccd65b1) )
+	ROM_LOAD16_BYTE( "rts_voi1.3m",  0x000000, 0x080000, CRC(e42027cd) SHA1(fa3a81118c7f112289c27023236dec2e9cbc78b5) )
+	ROM_LOAD16_BYTE( "rts_voi2.3l",  0x100000, 0x080000, CRC(0c4c2b66) SHA1(7723cbef755439a66d026015596fe1547ccd65b1) )
 ROM_END
 
 /* ROLLING THUNDER 2 (Japan) */
 ROM_START( rthun2j )
 	ROM_REGION( 0x040000, "maincpu", 0 ) /* Master CPU */
-	ROM_LOAD16_BYTE( "rst1_mpr0.bin",  0x000000, 0x020000, CRC(2563b9ee) SHA1(c6a4305f88ca5d796f3ba4f36af54fed51c16b75) )
-	ROM_LOAD16_BYTE( "rst1_mpr1.bin",  0x000001, 0x020000, CRC(14c4c564) SHA1(a826176fef65c53518fdbc7b14c7a1a65c821c8c) )
+	ROM_LOAD16_BYTE( "rts1_mpr0.11d",  0x000000, 0x020000, CRC(2563b9ee) SHA1(c6a4305f88ca5d796f3ba4f36af54fed51c16b75) )
+	ROM_LOAD16_BYTE( "rts1_mpr1.13d",  0x000001, 0x020000, CRC(14c4c564) SHA1(a826176fef65c53518fdbc7b14c7a1a65c821c8c) )
 
 	ROM_REGION( 0x040000, "slave", 0 ) /* Slave CPU */
-	ROM_LOAD16_BYTE( "rst1_spr0.bin",  0x000000, 0x010000, CRC(f8ef5150) SHA1(92fddf08b97210afe8d47386fe73078ffc00bd90) )
-	ROM_LOAD16_BYTE( "rst1_spr1.bin",  0x000001, 0x010000, CRC(52ed3a48) SHA1(21a9f0be29a7b121f1a8ca802af3a5ebf2c49cc0) )
+	ROM_LOAD16_BYTE( "rts1_spr0.11k",  0x000000, 0x010000, CRC(f8ef5150) SHA1(92fddf08b97210afe8d47386fe73078ffc00bd90) )
+	ROM_LOAD16_BYTE( "rts1_spr1.13k",  0x000001, 0x010000, CRC(52ed3a48) SHA1(21a9f0be29a7b121f1a8ca802af3a5ebf2c49cc0) )
 
 	ROM_REGION( 0x040000, "audiocpu", 0 ) /* Sound CPU (Banked) */
-	ROM_LOAD( "rst1_snd0.bin",  0x000000, 0x020000, CRC(55b7562a) SHA1(47b12206ec4a709769351f3f5b4a1c5ebb98b416) )
-	ROM_LOAD( "rst1_snd1.bin",  0x020000, 0x020000, CRC(00445a4f) SHA1(2e136e3c38e4a1b69f80a19e07555f3269b7beb1) )
+	ROM_LOAD( "rts1_snd0.7j",  0x000000, 0x020000, CRC(55b7562a) SHA1(47b12206ec4a709769351f3f5b4a1c5ebb98b416) )
+	ROM_LOAD( "rts1_snd1.7g",  0x020000, 0x020000, CRC(00445a4f) SHA1(2e136e3c38e4a1b69f80a19e07555f3269b7beb1) )
 
 	ROM_REGION( 0x8000, "c65mcu:external", ROMREGION_ERASE00 ) /* I/O MCU */
-	ROM_LOAD( "sys2c65c.bin",  0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
+	ROM_LOAD( "sys2c65c.3f",  0x000000, 0x008000, CRC(a5b2a4ff) SHA1(068bdfcc71a5e83706e8b23330691973c1c214dc) )
 
-	ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites */
-	ROM_LOAD32_BYTE( "rst1_obj0.bin",  0x000003, 0x80000, CRC(e5cb82c1) SHA1(2dc1922ecfd9e52af8c4a1edac1df343be64b499) )
-	ROM_LOAD32_BYTE( "rst1_obj1.bin",  0x000002, 0x80000, CRC(19ebe9fd) SHA1(6d7991a52a707f710c809eb44f1dfa4873369c17) )
-	ROM_LOAD32_BYTE( "rst1_obj2.bin",  0x000001, 0x80000, CRC(455c4a2f) SHA1(9d7944b41e98f990423d315365106890e2c5ae77) )
-	ROM_LOAD32_BYTE( "rst1_obj3.bin",  0x000000, 0x80000, CRC(fdcae8a9) SHA1(a1e1057b3263ee9af9e2d861cf8879f51265805e) )
+	ROM_REGION( 0x400000, "sprite", 0 ) /* Sprites, on sub PCB */
+	ROM_LOAD32_BYTE( "rts_obj0.5b",  0x000003, 0x80000, CRC(e5cb82c1) SHA1(2dc1922ecfd9e52af8c4a1edac1df343be64b499) )
+	ROM_LOAD32_BYTE( "rts_obj1.4b",  0x000002, 0x80000, CRC(19ebe9fd) SHA1(6d7991a52a707f710c809eb44f1dfa4873369c17) )
+	ROM_LOAD32_BYTE( "rts_obj2.5d",  0x000001, 0x80000, CRC(455c4a2f) SHA1(9d7944b41e98f990423d315365106890e2c5ae77) )
+	ROM_LOAD32_BYTE( "rts_obj3.4d",  0x000000, 0x80000, CRC(fdcae8a9) SHA1(a1e1057b3263ee9af9e2d861cf8879f51265805e) )
 
 	ROM_REGION( 0x400000, "c123tmap", 0 ) /* Tiles */
-	ROM_LOAD( "rst1_chr0.bin",  0x000000, 0x80000, CRC(6f0e9a68) SHA1(873296778104eff11b828273abf7f6ca461c055a) )
-	ROM_LOAD( "rst1_chr1.bin",  0x080000, 0x80000, CRC(15e44adc) SHA1(fead0b2d693f9b6267895d8339bb250f5c77fb4d) )
+	ROM_LOAD( "rts_chr0.11n",  0x000000, 0x80000, CRC(6f0e9a68) SHA1(873296778104eff11b828273abf7f6ca461c055a) )
+	ROM_LOAD( "rts_chr1.11p",  0x080000, 0x80000, CRC(15e44adc) SHA1(fead0b2d693f9b6267895d8339bb250f5c77fb4d) )
 
-	ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles */
-	ROM_LOAD( "rst1_roz0.bin",  0x000000, 0x80000, CRC(482d0554) SHA1(95b99d1db5851b83b2af4deda2b61635a0562604) )
+	ROM_REGION( 0x400000, "s2roz", 0 ) /* ROZ Tiles, on sub PCB */
+	ROM_LOAD( "rts_roz0.1a",  0x000000, 0x80000, CRC(482d0554) SHA1(95b99d1db5851b83b2af4deda2b61635a0562604) )
 
 	ROM_REGION( 0x080000, "c123tmap:mask", 0 ) /* Mask shape */
-	ROM_LOAD( "shape.bin",  0x000000, 0x80000, CRC(cf58fbbe) SHA1(fbe3b2f0c3267b298993d6238d97b119e13e07f6) )
+	ROM_LOAD( "rts_sha0.7n",  0x000000, 0x80000, CRC(cf58fbbe) SHA1(fbe3b2f0c3267b298993d6238d97b119e13e07f6) )
 
 	ROM_REGION16_BE( 0x200000, "data_rom", 0 ) /* Shared data roms */
-	NAMCOS2_DATA_LOAD_E_128K( "rst1_data0.13s",  0x000000, CRC(0baf44ee) SHA1(5135d634f76893adb26a32976a69e2d47e2385c6) )
-	NAMCOS2_DATA_LOAD_O_128K( "rst1_data1.13p",  0x000000, CRC(58a8daac) SHA1(c13ae8fc25b748a006c6db5b4b7ae593738544e8) )
-	NAMCOS2_DATA_LOAD_E_128K( "rst1_data2.13r",  0x100000, CRC(8e850a2a) SHA1(e5230e80a23ca6d09c2c53f443ecf70cc74075d7) )
+	NAMCOS2_DATA_LOAD_E_128K( "rts1_data0.13s",  0x000000, CRC(0baf44ee) SHA1(5135d634f76893adb26a32976a69e2d47e2385c6) )
+	NAMCOS2_DATA_LOAD_O_128K( "rts1_data1.13p",  0x000000, CRC(58a8daac) SHA1(c13ae8fc25b748a006c6db5b4b7ae593738544e8) )
+	NAMCOS2_DATA_LOAD_E_128K( "rts1_data2.13r",  0x100000, CRC(8e850a2a) SHA1(e5230e80a23ca6d09c2c53f443ecf70cc74075d7) )
 
 	ROM_REGION16_BE( 0x200000, "c140", ROMREGION_ERASE00 ) /* Sound voices */
-	ROM_LOAD16_BYTE( "rst1_voi1.bin",  0x000000, 0x080000, CRC(e42027cd) SHA1(fa3a81118c7f112289c27023236dec2e9cbc78b5) )
-	ROM_LOAD16_BYTE( "rst1_voi2.bin",  0x100000, 0x080000, CRC(0c4c2b66) SHA1(7723cbef755439a66d026015596fe1547ccd65b1) )
+	ROM_LOAD16_BYTE( "rts_voi1.3m",  0x000000, 0x080000, CRC(e42027cd) SHA1(fa3a81118c7f112289c27023236dec2e9cbc78b5) )
+	ROM_LOAD16_BYTE( "rts_voi2.3l",  0x100000, 0x080000, CRC(0c4c2b66) SHA1(7723cbef755439a66d026015596fe1547ccd65b1) )
 
 	/* stuff below isn't used but loaded because it was on the board .. */
 	ROM_REGION( 0x0950, "plds", 0 )
@@ -5495,16 +5495,22 @@
 void namcos2_state::init_finallap()
 {
 	m_gametype = NAMCOS2_FINAL_LAP;
+
+	save_item(NAME(m_finallap_prot_count));
 }
 
 void namcos2_state::init_finalap2()
 {
 	m_gametype = NAMCOS2_FINAL_LAP_2;
+
+	save_item(NAME(m_finallap_prot_count));
 }
 
 void namcos2_state::init_finalap3()
 {
 	m_gametype = NAMCOS2_FINAL_LAP_3;
+
+	save_item(NAME(m_finallap_prot_count));
 }
 
 void namcos2_state::init_finehour()
@@ -5675,91 +5681,91 @@
 /* and metal hawk have the B version and dragon saber has the C version       */
 
 /*    YEAR, NAME,       PARENT,   MACHINE,  INPUT,    STATE,         INIT,          MONITOR,COMPANY, FULLNAME */
-GAMEL( 1987, finallap,   0,        finallap, finallap, namcos2_state, init_finallap, ROT0,   "Namco", "Final Lap (Rev E)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
-GAMEL( 1987, finallapd,  finallap, finallap, finallap, namcos2_state, init_finallap, ROT0,   "Namco", "Final Lap (Rev D)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
-GAMEL( 1987, finallapc,  finallap, finallap, finallap, namcos2_state, init_finallap, ROT0,   "Namco", "Final Lap (Rev C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
-GAMEL( 1987, finallapjc, finallap, finallap, finallap, namcos2_state, init_finallap, ROT0,   "Namco", "Final Lap (Japan, Rev C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
-GAMEL( 1987, finallapjb, finallap, finallap, finallap, namcos2_state, init_finallap, ROT0,   "Namco", "Final Lap (Japan, Rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
+GAMEL( 1987, finallap,   0,        finallap, finallap, namcos2_state, init_finallap, ROT0,   "Namco", "Final Lap (Rev E)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
+GAMEL( 1987, finallapd,  finallap, finallap, finallap, namcos2_state, init_finallap, ROT0,   "Namco", "Final Lap (Rev D)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
+GAMEL( 1987, finallapc,  finallap, finallap, finallap, namcos2_state, init_finallap, ROT0,   "Namco", "Final Lap (Rev C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
+GAMEL( 1987, finallapjc, finallap, finallap, finallap, namcos2_state, init_finallap, ROT0,   "Namco", "Final Lap (Japan, Rev C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
+GAMEL( 1987, finallapjb, finallap, finallap, finallap, namcos2_state, init_finallap, ROT0,   "Namco", "Final Lap (Japan, Rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
 
-GAME(  1988, assault,    0,        base2,    assault,  namcos2_state, init_assault,  ROT90,  "Namco", "Assault (Rev B)", 0 )
-GAME(  1988, assaultj,   assault,  base2,    assault,  namcos2_state, init_assaultj, ROT90,  "Namco", "Assault (Japan)", 0 )
-GAME(  1988, assaultp,   assault,  assaultp, assault,  namcos2_state, init_assaultp, ROT90,  "Namco", "Assault Plus (Japan)", 0)
+GAME(  1988, assault,    0,        base2,    assault,  namcos2_state, init_assault,  ROT90,  "Namco", "Assault (Rev B)", MACHINE_SUPPORTS_SAVE )
+GAME(  1988, assaultj,   assault,  base2,    assault,  namcos2_state, init_assaultj, ROT90,  "Namco", "Assault (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME(  1988, assaultp,   assault,  assaultp, assault,  namcos2_state, init_assaultp, ROT90,  "Namco", "Assault Plus (Japan)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1988, metlhawk,   0,        metlhawk, metlhawk, namcos2_state, init_metlhawk, ROT90,  "Namco", "Metal Hawk (Rev C)", 0 )
-GAME(  1988, metlhawkj,  metlhawk, metlhawk, metlhawk, namcos2_state, init_metlhawk, ROT90,  "Namco", "Metal Hawk (Japan, Rev F)", 0 )
+GAME(  1988, metlhawk,   0,        metlhawk, metlhawk, namcos2_state, init_metlhawk, ROT90,  "Namco", "Metal Hawk (Rev C)", MACHINE_SUPPORTS_SAVE )
+GAME(  1988, metlhawkj,  metlhawk, metlhawk, metlhawk, namcos2_state, init_metlhawk, ROT90,  "Namco", "Metal Hawk (Japan, Rev F)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1988, ordyne,     0,        base,     base,     namcos2_state, init_ordyne,   ROT180, "Namco", "Ordyne (World)", 0 )
-GAME(  1988, ordyneje,   ordyne,   base,     base,     namcos2_state, init_ordyne,   ROT180, "Namco", "Ordyne (Japan, English Version)", 0 )
-GAME(  1988, ordynej,    ordyne,   base,     base,     namcos2_state, init_ordyne,   ROT180, "Namco", "Ordyne (Japan)", 0 )
+GAME(  1988, ordyne,     0,        base,     base,     namcos2_state, init_ordyne,   ROT180, "Namco", "Ordyne (World)", MACHINE_SUPPORTS_SAVE )
+GAME(  1988, ordyneje,   ordyne,   base,     base,     namcos2_state, init_ordyne,   ROT180, "Namco", "Ordyne (Japan, English Version)", MACHINE_SUPPORTS_SAVE )
+GAME(  1988, ordynej,    ordyne,   base,     base,     namcos2_state, init_ordyne,   ROT180, "Namco", "Ordyne (Japan)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1988, mirninja,   0,        base,     base,     namcos2_state, init_mirninja, ROT0,   "Namco", "Mirai Ninja (Japan)", 0 )
+GAME(  1988, mirninja,   0,        base,     base,     namcos2_state, init_mirninja, ROT0,   "Namco", "Mirai Ninja (Japan)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1988, phelios,    0,        base2,    base,     namcos2_state, init_phelios,  ROT90,  "Namco", "Phelios", 0)
-GAME(  1988, pheliosj,   phelios,  base2,    base,     namcos2_state, init_phelios,  ROT90,  "Namco", "Phelios (Japan)", 0)
+GAME(  1988, phelios,    0,        base2,    base,     namcos2_state, init_phelios,  ROT90,  "Namco", "Phelios", MACHINE_SUPPORTS_SAVE )
+GAME(  1988, pheliosj,   phelios,  base2,    base,     namcos2_state, init_phelios,  ROT90,  "Namco", "Phelios (Japan)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1989, dirtfoxj,   0,        base2,    dirtfox,  namcos2_state, init_dirtfoxj, ROT90,  "Namco", "Dirt Fox (Japan)", MACHINE_NODEVICE_LAN )
+GAME(  1989, dirtfoxj,   0,        base2,    dirtfox,  namcos2_state, init_dirtfoxj, ROT90,  "Namco", "Dirt Fox (Japan)", MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE )
 
-GAMEL( 1989, fourtrax,   0,        finallap, fourtrax, namcos2_state, init_fourtrax, ROT0,   "Namco", "Four Trax (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
-GAMEL( 1989, fourtraxj,  fourtrax, finallap, fourtrax, namcos2_state, init_fourtrax, ROT0,   "Namco", "Four Trax (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
-GAMEL( 1989, fourtraxa,  fourtrax, finallap, fourtrax, namcos2_state, init_fourtrax, ROT0,   "Namco (Atari license?)", "Four Trax (US?, censored banners)",  MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap ) // boards using the ROM code FX4 were produced for Atari? there's no US region warning or Atari copyright tho, modded version of the World code
+GAMEL( 1989, fourtrax,   0,        finallap, fourtrax, namcos2_state, init_fourtrax, ROT0,   "Namco", "Four Trax (World)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
+GAMEL( 1989, fourtraxj,  fourtrax, finallap, fourtrax, namcos2_state, init_fourtrax, ROT0,   "Namco", "Four Trax (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
+GAMEL( 1989, fourtraxa,  fourtrax, finallap, fourtrax, namcos2_state, init_fourtrax, ROT0,   "Namco (Atari license?)", "Four Trax (US?, censored banners)",  MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap ) // boards using the ROM code FX4 were produced for Atari? there's no US region warning or Atari copyright tho, modded version of the World code
 
-GAME(  1989, valkyrie,   0,        base3,    base,     namcos2_state, init_valkyrie, ROT90,  "Namco", "Valkyrie no Densetsu (Japan)", 0 )
+GAME(  1989, valkyrie,   0,        base3,    base,     namcos2_state, init_valkyrie, ROT90,  "Namco", "Valkyrie no Densetsu (Japan)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1989, finehour,   0,        base2,    base,     namcos2_state, init_finehour, ROT0,   "Namco", "Finest Hour (Japan)", 0)
+GAME(  1989, finehour,   0,        base2,    base,     namcos2_state, init_finehour, ROT0,   "Namco", "Finest Hour (Japan)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1989, burnforc,   0,        base3,    base,     namcos2_state, init_burnforc, ROT0,   "Namco", "Burning Force (Japan, new version (Rev C))", 0 )
-GAME(  1989, burnforco,  burnforc, base3,    base,     namcos2_state, init_burnforc, ROT0,   "Namco", "Burning Force (Japan, old version)", 0 )
+GAME(  1989, burnforc,   0,        base3,    base,     namcos2_state, init_burnforc, ROT0,   "Namco", "Burning Force (Japan, new version (Rev C))", MACHINE_SUPPORTS_SAVE )
+GAME(  1989, burnforco,  burnforc, base3,    base,     namcos2_state, init_burnforc, ROT0,   "Namco", "Burning Force (Japan, old version)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1989, marvland,   0,        base,     base,     namcos2_state, init_marvland, ROT0,   "Namco", "Marvel Land (US, prototype?)", MACHINE_IMPERFECT_SOUND )
-GAME(  1989, marvlandj,  marvland, base,     base,     namcos2_state, init_marvlanj, ROT0,   "Namco", "Marvel Land (Japan)", 0 )
+GAME(  1989, marvland,   0,        base,     base,     namcos2_state, init_marvland, ROT0,   "Namco", "Marvel Land (US, prototype?)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME(  1989, marvlandj,  marvland, base,     base,     namcos2_state, init_marvlanj, ROT0,   "Namco", "Marvel Land (Japan)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1990, kyukaidk,   0,        base,     kyukaidk, namcos2_state, init_kyukaidk, ROT0,   "Namco", "Kyuukai Douchuuki (Japan, new version (Rev B))", 0 )
-GAME(  1990, kyukaidko,  kyukaidk, base,     kyukaidk, namcos2_state, init_kyukaidk, ROT0,   "Namco", "Kyuukai Douchuuki (Japan, old version)", 0 )
+GAME(  1990, kyukaidk,   0,        base,     kyukaidk, namcos2_state, init_kyukaidk, ROT0,   "Namco", "Kyuukai Douchuuki (Japan, new version (Rev B))", MACHINE_SUPPORTS_SAVE )
+GAME(  1990, kyukaidko,  kyukaidk, base,     kyukaidk, namcos2_state, init_kyukaidk, ROT0,   "Namco", "Kyuukai Douchuuki (Japan, old version)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1990, dsaber,     0,        base3,    base,     namcos2_state, init_dsaber,   ROT90,  "Namco", "Dragon Saber (World, DO2)", 0 )
-GAME(  1990, dsabera,    dsaber,   base3,    base,     namcos2_state, init_dsaber,   ROT90,  "Namco", "Dragon Saber (World, older?)", 0 )
-GAME(  1990, dsaberj,    dsaber,   base3,    base,     namcos2_state, init_dsaberj,  ROT90,  "Namco", "Dragon Saber (Japan, Rev B)", 0 )
+GAME(  1990, dsaber,     0,        base3,    base,     namcos2_state, init_dsaber,   ROT90,  "Namco", "Dragon Saber (World, DO2)", MACHINE_SUPPORTS_SAVE )
+GAME(  1990, dsabera,    dsaber,   base3,    base,     namcos2_state, init_dsaber,   ROT90,  "Namco", "Dragon Saber (World, older?)", MACHINE_SUPPORTS_SAVE )
+GAME(  1990, dsaberj,    dsaber,   base3,    base,     namcos2_state, init_dsaberj,  ROT90,  "Namco", "Dragon Saber (Japan, Rev B)", MACHINE_SUPPORTS_SAVE )
 
-GAMEL( 1990, finalap2,   0,        finalap2, finallap, namcos2_state, init_finalap2, ROT0,   "Namco", "Final Lap 2", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
-GAMEL( 1990, finalap2j,  finalap2, finalap2, finallap, namcos2_state, init_finalap2, ROT0,   "Namco", "Final Lap 2 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
+GAMEL( 1990, finalap2,   0,        finalap2, finallap, namcos2_state, init_finalap2, ROT0,   "Namco", "Final Lap 2", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
+GAMEL( 1990, finalap2j,  finalap2, finalap2, finallap, namcos2_state, init_finalap2, ROT0,   "Namco", "Final Lap 2 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
 
-GAME(  1990, gollygho,   0,        gollygho, gollygho, namcos2_state, init_gollygho, ROT180, "Namco", "Golly! Ghost!", MACHINE_REQUIRES_ARTWORK )
+GAME(  1990, gollygho,   0,        gollygho, gollygho, namcos2_state, init_gollygho, ROT180, "Namco", "Golly! Ghost!", MACHINE_REQUIRES_ARTWORK | MACHINE_SUPPORTS_SAVE )
 
-GAME(  1990, rthun2,     0,        base3,    base,     namcos2_state, init_rthun2,   ROT0,   "Namco", "Rolling Thunder 2", 0 )
-GAME(  1990, rthun2j,    rthun2,   base3,    base,     namcos2_state, init_rthun2j,  ROT0,   "Namco", "Rolling Thunder 2 (Japan)", 0 )
+GAME(  1990, rthun2,     0,        base3,    base,     namcos2_state, init_rthun2,   ROT0,   "Namco", "Rolling Thunder 2", MACHINE_SUPPORTS_SAVE )
+GAME(  1990, rthun2j,    rthun2,   base3,    base,     namcos2_state, init_rthun2j,  ROT0,   "Namco", "Rolling Thunder 2 (Japan)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1990, sgunner,    0,        sgunner,  sgunner,  namcos2_state, init_sgunner2, ROT0,   "Namco", "Steel Gunner (Rev B)", 0 )
-GAME(  1990, sgunnerj,   sgunner,  sgunner,  sgunner,  namcos2_state, init_sgunner2, ROT0,   "Namco", "Steel Gunner (Japan)", 0 )
+GAME(  1990, sgunner,    0,        sgunner,  sgunner,  namcos2_state, init_sgunner2, ROT0,   "Namco", "Steel Gunner (Rev B)", MACHINE_SUPPORTS_SAVE )
+GAME(  1990, sgunnerj,   sgunner,  sgunner,  sgunner,  namcos2_state, init_sgunner2, ROT0,   "Namco", "Steel Gunner (Japan)", MACHINE_SUPPORTS_SAVE )
 
 // The C68 I/O MCU contains a 1991 copyright, so anything after this point is potentially using that instead of C65, games before this point can't be using it
 
-GAME(  1991, sgunner2,   0,        sgunner2, sgunner,  namcos2_state, init_sgunner2, ROT0,   "Namco", "Steel Gunner 2 (US)", 0 )
-GAME(  1991, sgunner2j,  sgunner2, sgunner2, sgunner,  namcos2_state, init_sgunner2, ROT0,   "Namco", "Steel Gunner 2 (Japan, Rev A)", 0 )
+GAME(  1991, sgunner2,   0,        sgunner2, sgunner,  namcos2_state, init_sgunner2, ROT0,   "Namco", "Steel Gunner 2 (US)", MACHINE_SUPPORTS_SAVE )
+GAME(  1991, sgunner2j,  sgunner2, sgunner2, sgunner,  namcos2_state, init_sgunner2, ROT0,   "Namco", "Steel Gunner 2 (Japan, Rev A)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1991, cosmogng,   0,        base,     base,     namcos2_state, init_cosmogng, ROT90,  "Namco", "Cosmo Gang the Video (US)", 0 )
-GAME(  1991, cosmogngj,  cosmogng, base,     base,     namcos2_state, init_cosmogng, ROT90,  "Namco", "Cosmo Gang the Video (Japan)", 0 )
+GAME(  1991, cosmogng,   0,        base,     base,     namcos2_state, init_cosmogng, ROT90,  "Namco", "Cosmo Gang the Video (US)", MACHINE_SUPPORTS_SAVE )
+GAME(  1991, cosmogngj,  cosmogng, base,     base,     namcos2_state, init_cosmogng, ROT90,  "Namco", "Cosmo Gang the Video (Japan)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1992, bubbletr,   0,        gollygho, bubbletr, namcos2_state, init_bubbletr, ROT180, "Namco", "Bubble Trouble - Golly Ghost 2 (World, Rev B)", MACHINE_REQUIRES_ARTWORK )
-GAME(  1992, bubbletrj,  bubbletr, gollygho, bubbletr, namcos2_state, init_bubbletr, ROT180, "Namco", "Bubble Trouble - Golly Ghost 2 (Japan, Rev C)", MACHINE_REQUIRES_ARTWORK )
+GAME(  1992, bubbletr,   0,        gollygho, bubbletr, namcos2_state, init_bubbletr, ROT180, "Namco", "Bubble Trouble - Golly Ghost 2 (World, Rev B)", MACHINE_REQUIRES_ARTWORK | MACHINE_SUPPORTS_SAVE )
+GAME(  1992, bubbletrj,  bubbletr, gollygho, bubbletr, namcos2_state, init_bubbletr, ROT180, "Namco", "Bubble Trouble - Golly Ghost 2 (Japan, Rev C)", MACHINE_REQUIRES_ARTWORK | MACHINE_SUPPORTS_SAVE )
 
-GAMEL( 1992, finalap3,   0,        finalap3, finalap3, namcos2_state, init_finalap3, ROT0,   "Namco", "Final Lap 3 (World, Rev C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
-GAMEL( 1992, finalap3a,  finalap3, finalap3, finalap3, namcos2_state, init_finalap3, ROT0,   "Namco", "Final Lap 3 (World, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
-GAMEL( 1992, finalap3j,  finalap3, finalap3, finalap3, namcos2_state, init_finalap3, ROT0,   "Namco", "Final Lap 3 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
-GAMEL( 1992, finalap3jc, finalap3, finalap3, finalap3, namcos2_state, init_finalap3, ROT0,   "Namco", "Final Lap 3 (Japan, Rev C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
-GAMEL( 1992, finalap3bl, finalap3, finalap3, finalap3, namcos2_state, init_finalap3, ROT0,   "Namco", "Final Lap 3 (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN, layout_finallap )
+GAMEL( 1992, finalap3,   0,        finalap3, finalap3, namcos2_state, init_finalap3, ROT0,   "Namco", "Final Lap 3 (World, Rev C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
+GAMEL( 1992, finalap3a,  finalap3, finalap3, finalap3, namcos2_state, init_finalap3, ROT0,   "Namco", "Final Lap 3 (World, set 2)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
+GAMEL( 1992, finalap3j,  finalap3, finalap3, finalap3, namcos2_state, init_finalap3, ROT0,   "Namco", "Final Lap 3 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
+GAMEL( 1992, finalap3jc, finalap3, finalap3, finalap3, namcos2_state, init_finalap3, ROT0,   "Namco", "Final Lap 3 (Japan, Rev C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
+GAMEL( 1992, finalap3bl, finalap3, finalap3, finalap3, namcos2_state, init_finalap3, ROT0,   "Namco", "Final Lap 3 (bootleg)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE, layout_finallap )
 
-GAME(  1992, luckywld,   0,        luckywld, luckywld, namcos2_state, init_luckywld, ROT0,   "Namco", "Lucky & Wild", 0 )
-GAME(  1992, luckywldj,  luckywld, luckywld, luckywld, namcos2_state, init_luckywld, ROT0,   "Namco", "Lucky & Wild (Japan)", 0 )
+GAME(  1992, luckywld,   0,        luckywld, luckywld, namcos2_state, init_luckywld, ROT0,   "Namco", "Lucky & Wild", MACHINE_SUPPORTS_SAVE )
+GAME(  1992, luckywldj,  luckywld, luckywld, luckywld, namcos2_state, init_luckywld, ROT0,   "Namco", "Lucky & Wild (Japan)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1992, suzuka8h,   0,        suzuka8h, suzuka,   namcos2_state, init_suzuka8h, ROT0,   "Namco", "Suzuka 8 Hours (World, Rev C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN )
-GAME(  1992, suzuka8hj,  suzuka8h, suzuka8h, suzuka,   namcos2_state, init_suzuka8h, ROT0,   "Namco", "Suzuka 8 Hours (Japan, Rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN )
+GAME(  1992, suzuka8h,   0,        suzuka8h, suzuka,   namcos2_state, init_suzuka8h, ROT0,   "Namco", "Suzuka 8 Hours (World, Rev C)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE )
+GAME(  1992, suzuka8hj,  suzuka8h, suzuka8h, suzuka,   namcos2_state, init_suzuka8h, ROT0,   "Namco", "Suzuka 8 Hours (Japan, Rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE )
 
-GAME(  1992, sws,        0,        base_c68, base,     namcos2_state, init_sws,      ROT0,   "Namco", "Super World Stadium (Japan)", 0 )
+GAME(  1992, sws,        0,        base_c68, base,     namcos2_state, init_sws,      ROT0,   "Namco", "Super World Stadium (Japan)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1992, sws92,      0,        base_c68, base,     namcos2_state, init_sws92,    ROT0,   "Namco", "Super World Stadium '92 (Japan)", 0 )
-GAME(  1992, sws92g,     sws92,    base_c68, base,     namcos2_state, init_sws92g,   ROT0,   "Namco", "Super World Stadium '92 Gekitouban (Japan)", 0 )
+GAME(  1992, sws92,      0,        base_c68, base,     namcos2_state, init_sws92,    ROT0,   "Namco", "Super World Stadium '92 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME(  1992, sws92g,     sws92,    base_c68, base,     namcos2_state, init_sws92g,   ROT0,   "Namco", "Super World Stadium '92 Gekitouban (Japan)", MACHINE_SUPPORTS_SAVE )
 
-GAME(  1993, suzuk8h2,   0,        suzuka8h, suzuka,   namcos2_state, init_suzuk8h2, ROT0,   "Namco", "Suzuka 8 Hours 2 (World, Rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN )
-GAME(  1993, suzuk8h2j,  suzuk8h2, suzuka8h, suzuka,   namcos2_state, init_suzuk8h2, ROT0,   "Namco", "Suzuka 8 Hours 2 (Japan, Rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN )
+GAME(  1993, suzuk8h2,   0,        suzuka8h, suzuka,   namcos2_state, init_suzuk8h2, ROT0,   "Namco", "Suzuka 8 Hours 2 (World, Rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE )
+GAME(  1993, suzuk8h2j,  suzuk8h2, suzuka8h, suzuka,   namcos2_state, init_suzuk8h2, ROT0,   "Namco", "Suzuka 8 Hours 2 (Japan, Rev B)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_NODEVICE_LAN | MACHINE_SUPPORTS_SAVE )
 
-GAME(  1993, sws93,      0,        base_c68, base,     namcos2_state, init_sws93,    ROT0,   "Namco", "Super World Stadium '93 (Japan)", 0 ) // this appears to have a subtitle, what is it?
+GAME(  1993, sws93,      0,        base_c68, base,     namcos2_state, init_sws93,    ROT0,   "Namco", "Super World Stadium '93 (Japan)", MACHINE_SUPPORTS_SAVE ) // this appears to have a subtitle, what is it?
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/nanos.cpp mame-0.224+dfsg.1/src/mame/drivers/nanos.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/nanos.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/nanos.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,9 +2,12 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        Nanos
+Nanos
 
-        12/05/2009 Skeleton driver.
+2009-05-12 Skeleton driver.
+
+Status:
+- Waiting for a floppy disk. Need software to proceed.
 
 ****************************************************************************/
 
@@ -13,7 +16,6 @@
 #include "cpu/z80/z80.h"
 #include "imagedev/floppy.h"
 #include "machine/z80daisy.h"
-#include "machine/ram.h"
 #include "machine/timer.h"
 #include "machine/upd765.h"
 #include "machine/z80ctc.h"
@@ -32,24 +34,23 @@
 	nanos_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_pio(*this, "z80pio")
-		, m_pio_0(*this, "z80pio_0")
-		, m_pio_1(*this, "z80pio_1")
-		, m_sio_0(*this, "z80sio_0")
-		, m_sio_1(*this, "z80sio_1")
-		, m_ctc_0(*this, "z80ctc_0")
-		, m_ctc_1(*this, "z80ctc_1")
-		, m_fdc(*this, "upd765")
-		, m_floppy(*this, "upd765:0")
+		, m_rom(*this, "maincpu")
+		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
+		, m_pio(*this, "pio")
+		, m_pio0(*this, "pio0")
+		, m_pio1(*this, "pio1")
+		, m_sio0(*this, "sio0")
+		, m_sio1(*this, "sio1")
+		, m_ctc0(*this, "ctc0")
+		, m_ctc1(*this, "ctc1")
+		, m_fdc(*this, "fdc")
+		, m_floppy(*this, "fdc:0")
 		, m_key_t(*this, "keyboard_timer")
-		, m_ram(*this, RAM_TAG)
-		, m_region_maincpu(*this, "maincpu")
 		, m_p_chargen(*this, "chargen")
-		, m_bank1(*this, "bank1")
-		, m_bank2(*this, "bank2")
-		, m_bank3(*this, "bank3")
-		, m_lines(*this, "LINE%u", 0U)
-		, m_linec(*this, "LINEC")
+		, m_vram(*this, "videoram")
+		, m_io_keyboard(*this, "LINE%u", 0U)
+		, m_io_linec(*this, "LINEC")
 	{ }
 
 	void nanos(machine_config &config);
@@ -80,32 +81,32 @@
 	uint8_t row_number(uint8_t code);
 
 	required_device<z80_device> m_maincpu;
+	required_region_ptr<u8> m_rom;
+	required_shared_ptr<u8> m_ram;
+	required_memory_bank    m_bank1;
 	required_device<z80pio_device> m_pio;
-	required_device<z80pio_device> m_pio_0;
-	required_device<z80pio_device> m_pio_1;
-	required_device<z80sio_device> m_sio_0;
-	required_device<z80sio_device> m_sio_1;
-	required_device<z80ctc_device> m_ctc_0;
-	required_device<z80ctc_device> m_ctc_1;
+	required_device<z80pio_device> m_pio0;
+	required_device<z80pio_device> m_pio1;
+	required_device<z80sio_device> m_sio0;
+	required_device<z80sio_device> m_sio1;
+	required_device<z80ctc_device> m_ctc0;
+	required_device<z80ctc_device> m_ctc1;
 	required_device<upd765a_device> m_fdc;
 	required_device<floppy_connector> m_floppy;
 	required_device<timer_device> m_key_t;
-	required_device<ram_device> m_ram;
-	required_memory_region m_region_maincpu;
 	required_region_ptr<u8> m_p_chargen;
-	required_memory_bank m_bank1;
-	required_memory_bank m_bank2;
-	required_memory_bank m_bank3;
-	required_ioport_array<7> m_lines;
-	required_ioport m_linec;
+	required_shared_ptr<u8> m_vram;
+	required_ioport_array<7> m_io_keyboard;
+	required_ioport m_io_linec;
 };
 
 
 
 void nanos_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x0fff).bankr(m_bank1).bankw(m_bank3);
-	map(0x1000, 0xffff).bankrw(m_bank2);
+	map(0x0000, 0xf7ff).ram().share("mainram");
+	map(0x0000, 0x0fff).bankr(m_bank1);
+	map(0xf800, 0xffff).ram().share("videoram");
 }
 
 void nanos_state::tc_w(uint8_t data)
@@ -137,15 +138,15 @@
 
 /* Z80 Daisy Chain */
 
-static const z80_daisy_config nanos_daisy_chain[] =
+static const z80_daisy_config daisy_chain[] =
 {
-	{ "z80pio" },
-	{ "z80pio_0" },
-	{ "z80pio_1" },
-	{ "z80sio_0" },
-	{ "z80ctc_0" },
-	{ "z80sio_1" },
-	{ "z80ctc_1" },
+	{ "pio" },
+	{ "pio0" },
+	{ "pio1" },
+	{ "sio0" },
+	{ "ctc0" },
+	{ "sio1" },
+	{ "ctc1" },
 	{ nullptr }
 };
 
@@ -157,17 +158,17 @@
 	map(0x00, 0x03).rw(m_pio, FUNC(z80pio_device::read), FUNC(z80pio_device::write));
 
 	/* I/O card */
-	map(0x80, 0x83).rw(m_pio_0, FUNC(z80pio_device::read), FUNC(z80pio_device::write));
-	map(0x84, 0x87).rw(m_sio_0, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
-	map(0x88, 0x8B).rw(m_pio_1, FUNC(z80pio_device::read), FUNC(z80pio_device::write));
-	map(0x8C, 0x8F).rw(m_ctc_0, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
+	map(0x80, 0x83).rw(m_pio0, FUNC(z80pio_device::read), FUNC(z80pio_device::write));
+	map(0x84, 0x87).rw(m_sio0, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
+	map(0x88, 0x8B).rw(m_pio1, FUNC(z80pio_device::read), FUNC(z80pio_device::write));
+	map(0x8C, 0x8F).rw(m_ctc0, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
 
 	/* FDC card */
 	map(0x92, 0x92).w(FUNC(nanos_state::tc_w));
 	map(0x94, 0x95).m(m_fdc, FUNC(upd765a_device::map));
 	/* V24+IFSS card */
-	map(0xA0, 0xA3).rw(m_sio_0, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
-	map(0xA4, 0xA7).rw(m_ctc_1, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
+	map(0xA0, 0xA3).rw(m_sio0, FUNC(z80sio_device::ba_cd_r), FUNC(z80sio_device::ba_cd_w));
+	map(0xA4, 0xA7).rw(m_ctc1, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
 
 	/* 256-k RAM card I  -  64k OS-Memory + 192k-RAM-Floppy */
 	//map(0xC0, 0xC7)
@@ -278,7 +279,7 @@
 			{
 				if (ra < 8)
 				{
-					uint8_t chr = m_ram->pointer()[0xf800+ x];
+					uint8_t chr = m_vram[x];
 
 					/* get pattern of pixels for that character scanline */
 					gfx = m_p_chargen[(chr<<3) | ra ];
@@ -304,9 +305,10 @@
 
 uint8_t nanos_state::port_a_r()
 {
-	if (m_key_command==0)  {
+	if (m_key_command==0)
 		return m_key_pressed;
-	} else {
+	else
+	{
 		uint8_t retVal = m_last_code;
 		m_last_code = 0;
 		return retVal;
@@ -322,11 +324,8 @@
 void nanos_state::port_b_w(uint8_t data)
 {
 	m_key_command = BIT(data,1);
-	if (BIT(data,7)) {
-		m_bank1->set_base(m_region_maincpu->base());
-	} else {
-		m_bank1->set_base(m_ram->pointer());
-	}
+
+	m_bank1->set_entry(BIT(data,7));
 }
 
 uint8_t nanos_state::row_number(uint8_t code)
@@ -342,64 +341,70 @@
 	return 0;
 }
 
+// TODO: clean this up when the machine starts to work.
 TIMER_DEVICE_CALLBACK_MEMBER(nanos_state::keyboard_callback)
 {
 	uint8_t key_code = 0;
-	uint8_t shift = m_linec->read() & 0x02 ? 1 : 0;
-	uint8_t ctrl =  m_linec->read() & 0x01 ? 1 : 0;
+	bool shift = BIT(m_io_linec->read(), 1);
+	bool ctrl =  BIT(m_io_linec->read(), 0);
 	m_key_pressed = 0xff;
 	for(int i = 0; i < 7; i++)
 	{
-		uint8_t code = m_lines[i]->read();
+		uint8_t code = m_io_keyboard[i]->read();
 		if (code != 0)
 		{
-			if (i==0 && shift==0) {
+			if (i==0 && !shift)
 				key_code = 0x30 + row_number(code) + 8*i; // for numbers and some signs
-			}
-			if (i==0 && shift==1) {
+
+			if (i==0 && shift)
 				key_code = 0x20 + row_number(code) + 8*i; // for shifted numbers
-			}
-			if (i==1 && shift==0) {
-				if (row_number(code) < 4) {
+
+			if (i==1 && !shift)
+			{
+				if (row_number(code) < 4)
 					key_code = 0x30 + row_number(code) + 8*i; // for numbers and some signs
-				} else {
+				else
 					key_code = 0x20 + row_number(code) + 8*i; // for numbers and some signs
-				}
 			}
-			if (i==1 && shift==1) {
-				if (row_number(code) < 4) {
+
+			if (i==1 && shift)
+			{
+				if (row_number(code) < 4)
 					key_code = 0x20 + row_number(code) + 8*i; // for numbers and some signs
-				} else {
+				else
 					key_code = 0x30 + row_number(code) + 8*i; // for numbers and some signs
-				}
 			}
-			if (i>=2 && i<=4 && shift==1 && ctrl==0) {
+
+			if (i>=2 && i<=4 && shift && !ctrl)
 				key_code = 0x60 + row_number(code) + (i-2)*8; // for small letters
-			}
-			if (i>=2 && i<=4 && shift==0 && ctrl==0) {
+
+			if (i>=2 && i<=4 && !shift && !ctrl)
 				key_code = 0x40 + row_number(code) + (i-2)*8; // for big letters
-			}
-			if (i>=2 && i<=4 && ctrl==1) {
+
+			if (i>=2 && i<=4 && ctrl)
 				key_code = 0x00 + row_number(code) + (i-2)*8; // for CTRL + letters
-			}
-			if (i==5 && shift==1 && ctrl==0) {
-				if (row_number(code)<7) {
+
+			if (i==5 && shift && !ctrl)
+			{
+				if (row_number(code)<7)
 					key_code = 0x60 + row_number(code) + (i-2)*8; // for small letters
-				} else {
+				else
 					key_code = 0x40 + row_number(code) + (i-2)*8; // for signs it is switched
-				}
 			}
-			if (i==5 && shift==0 && ctrl==0) {
-				if (row_number(code)<7) {
+
+			if (i==5 && !shift && !ctrl)
+			{
+				if (row_number(code)<7)
 					key_code = 0x40 + row_number(code) + (i-2)*8; // for small letters
-				} else {
+				else
 					key_code = 0x60 + row_number(code) + (i-2)*8; // for signs it is switched
-				}
 			}
-			if (i==5 && shift==0 && ctrl==1) {
+
+			if (i==5 && !shift && ctrl)
 				key_code = 0x00 + row_number(code) + (i-2)*8; // for letters + ctrl
-			}
-			if (i==6) {
+
+			if (i==6)
+			{
 				switch(row_number(code))
 				{
 					case 0: key_code = 0x11; break;
@@ -415,28 +420,26 @@
 			m_last_code = key_code;
 		}
 	}
-	if (key_code==0){
+
+	if (key_code==0)
 		m_key_pressed = 0xf7;
-	}
 }
 
 void nanos_state::machine_start()
 {
-	m_key_pressed = 0xff;
+	save_item(NAME(m_key_command));
+	save_item(NAME(m_last_code));
+	save_item(NAME(m_key_pressed));
+
+	m_bank1->configure_entry(0, m_ram);
+	m_bank1->configure_entry(1, m_rom);
 }
 
 void nanos_state::machine_reset()
 {
-	address_space &space = m_maincpu->space(AS_PROGRAM);
-
-	space.install_write_bank(0x0000, 0x0fff, "bank3");
-	space.install_write_bank(0x1000, 0xffff, "bank2");
-
-	m_bank1->set_base(m_region_maincpu->base());
-	m_bank2->set_base(m_ram->pointer() + 0x1000);
-	m_bank3->set_base(m_ram->pointer());
-
-	m_floppy->get_device()->mon_w(false);
+	m_bank1->set_entry(1);
+	m_floppy->get_device()->mon_w(0);
+	m_key_pressed = 0xff;
 }
 
 FLOPPY_FORMATS_MEMBER( nanos_state::floppy_formats )
@@ -472,7 +475,7 @@
 	Z80(config, m_maincpu, XTAL(4'000'000));
 	m_maincpu->set_addrmap(AS_PROGRAM, &nanos_state::mem_map);
 	m_maincpu->set_addrmap(AS_IO, &nanos_state::io_map);
-	m_maincpu->set_daisy_config(nanos_daisy_chain);
+	m_maincpu->set_daisy_config(daisy_chain);
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -487,29 +490,29 @@
 	PALETTE(config, "palette", palette_device::MONOCHROME);
 
 	/* devices */
-	Z80CTC(config, m_ctc_0, XTAL(4'000'000));
-	m_ctc_0->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
-	m_ctc_0->zc_callback<0>().set(FUNC(nanos_state::ctc_z0_w));
-	m_ctc_0->zc_callback<1>().set(FUNC(nanos_state::ctc_z1_w));
-	m_ctc_0->zc_callback<2>().set(FUNC(nanos_state::ctc_z2_w));
-
-	Z80CTC(config, m_ctc_1, XTAL(4'000'000));
-	m_ctc_1->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
-	m_ctc_1->zc_callback<0>().set(FUNC(nanos_state::ctc_z0_w));
-	m_ctc_1->zc_callback<1>().set(FUNC(nanos_state::ctc_z1_w));
-	m_ctc_1->zc_callback<2>().set(FUNC(nanos_state::ctc_z2_w));
-
-	Z80PIO(config, m_pio_0, XTAL(4'000'000));
-	m_pio_0->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+	Z80CTC(config, m_ctc0, XTAL(4'000'000));
+	m_ctc0->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+	m_ctc0->zc_callback<0>().set(FUNC(nanos_state::ctc_z0_w));
+	m_ctc0->zc_callback<1>().set(FUNC(nanos_state::ctc_z1_w));
+	m_ctc0->zc_callback<2>().set(FUNC(nanos_state::ctc_z2_w));
+
+	Z80CTC(config, m_ctc1, XTAL(4'000'000));
+	m_ctc1->intr_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+	m_ctc1->zc_callback<0>().set(FUNC(nanos_state::ctc_z0_w));
+	m_ctc1->zc_callback<1>().set(FUNC(nanos_state::ctc_z1_w));
+	m_ctc1->zc_callback<2>().set(FUNC(nanos_state::ctc_z2_w));
+
+	Z80PIO(config, m_pio0, XTAL(4'000'000));
+	m_pio0->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
 
-	Z80PIO(config, m_pio_1, XTAL(4'000'000));
-	m_pio_1->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+	Z80PIO(config, m_pio1, XTAL(4'000'000));
+	m_pio1->out_int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
 
-	Z80SIO(config, m_sio_0, XTAL(4'000'000));
-	m_sio_0->out_int_callback().set(FUNC(nanos_state::z80daisy_interrupt));
+	Z80SIO(config, m_sio0, XTAL(4'000'000));
+	m_sio0->out_int_callback().set(FUNC(nanos_state::z80daisy_interrupt));
 
-	Z80SIO(config, m_sio_1, XTAL(4'000'000));
-	m_sio_1->out_int_callback().set(FUNC(nanos_state::z80daisy_interrupt));
+	Z80SIO(config, m_sio1, XTAL(4'000'000));
+	m_sio1->out_int_callback().set(FUNC(nanos_state::z80daisy_interrupt));
 
 	Z80PIO(config, m_pio, XTAL(4'000'000));
 	m_pio->in_pa_callback().set(FUNC(nanos_state::port_a_r));
@@ -520,15 +523,12 @@
 	UPD765A(config, m_fdc, 8'000'000, false, true);
 	FLOPPY_CONNECTOR(config, m_floppy, nanos_floppies, "525hd", nanos_state::floppy_formats);
 
-	/* internal ram */
-	RAM(config, RAM_TAG).set_default_size("64K");
-
-	TIMER(config, "keyboard_timer").configure_periodic(FUNC(nanos_state::keyboard_callback), attotime::from_hz(24000));
+	TIMER(config, "keyboard_timer").configure_periodic(FUNC(nanos_state::keyboard_callback), attotime::from_hz(240));
 }
 
 /* ROM definition */
 ROM_START( nanos )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x1000, "maincpu", ROMREGION_ERASEFF )
 	ROM_LOAD( "k7634_1.rom", 0x0000, 0x0800, CRC(8e34e6ac) SHA1(fd342f6effe991823c2a310737fbfcba213c4fe3))
 	ROM_LOAD( "k7634_2.rom", 0x0800, 0x0180, CRC(4e01b02b) SHA1(8a279da886555c7470a1afcbb3a99693ea13c237))
 
@@ -539,4 +539,4 @@
 /* Driver */
 
 /*    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY                                                FULLNAME  FLAGS */
-COMP( 1985, nanos, 0,      0,      nanos,   nanos, nanos_state, empty_init, "Ingenieurhochschule fur Seefahrt Warnemunde/Wustrow", "NANOS",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1985, nanos, 0,      0,      nanos,   nanos, nanos_state, empty_init, "Ingenieurhochschule fur Seefahrt Warnemunde/Wustrow", "NANOS",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/naomi.cpp mame-0.224+dfsg.1/src/mame/drivers/naomi.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/naomi.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/naomi.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3265,9 +3265,10 @@
 EPR-21578g - NAOMI BOOT ROM 2001 09/10  1.70 (Export)
 Korea and Australia is missing.
 
-EPR-21576h - NAOMI BOOT ROM 2002 07/08  1.8- (Japan)
-EPR-21577h - NAOMI BOOT ROM 2002 07/08  1.8- (USA)
-EPR-21578h - NAOMI BOOT ROM 2002 07/08  1.8- (Export)
+version text at 0x1ffd60 / version shown in test mode
+EPR-21576h - NAOMI BOOT ROM 2002 07/08  1.8- / NAOMI GAME BOOT ROM Ver 2.01 (Japan)
+EPR-21577h - NAOMI BOOT ROM 2002 07/08  1.8- / NAOMI GAME BOOT ROM Ver 2.01 (USA)
+EPR-21578h - NAOMI BOOT ROM 2002 07/08  1.8- / NAOMI GAME BOOT ROM Ver 2.01 (Export)
 Korea and Australia is missing.
 
 EPR-21336  - No known dumps (Development BOOT ROM)
@@ -3514,9 +3515,10 @@
 EPR-23609B - NAOMI BOOT ROM 2001 09/10  1.70 (Korea)
 Australia is missing.
 
-EPR-23605C - NAOMI BOOT ROM 2002 07/08  1.8- (Japan)
-EPR-23607C - NAOMI BOOT ROM 2002 07/08  1.8- (USA)
-EPR-23608C - NAOMI BOOT ROM 2002 07/08  1.8- (Export)
+version text at 0x1ffd60 / version shown in test mode
+EPR-23605C - NAOMI BOOT ROM 2002 07/08  1.8- / NAOMI2 GAME BOOT ROM Ver 2.01 (Japan)
+EPR-23607C - NAOMI BOOT ROM 2002 07/08  1.8- / NAOMI2 GAME BOOT ROM Ver 2.01 (USA)
+EPR-23608C - NAOMI BOOT ROM 2002 07/08  1.8- / NAOMI2 GAME BOOT ROM Ver 2.01 (Export)
 Korea and Australia is missing.
 Actual build date Dec 19 2005.
 
@@ -6402,7 +6404,8 @@
 	ROM_PARAMETER( ":rom_board:segam2crypt:key", "-1") // 315-5881 not populated
 ROM_END
 
-/* Oinori-daimyoujin Matsuri (medal) */
+// Oinori-daimyoujin Matsuri (medal)
+// 837-14391-01 SATL BD OND CRX MATSURI
 ROM_START( oinori )
 	NAOMI_BIOS
 	NAOMI_DEFAULT_EEPROM
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/nemesis.cpp mame-0.224+dfsg.1/src/mame/drivers/nemesis.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/nemesis.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/nemesis.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -362,10 +362,15 @@
 	// konamigt also uses bits 0x0018, what are they for?
 }
 
-void nemesis_state::gx400_speech_start_w(uint8_t data)
+void nemesis_state::gx400_speech_w(offs_t offset, uint8_t data)
 {
-	m_vlm->st(1);
-	m_vlm->st(0);
+	m_vlm->rst(BIT(offset, 4));
+	m_vlm->st(BIT(offset, 5));
+	// bits 3, 6 also used (one is OE for VLM data?)
+	// data is irrelevant for most writes
+
+	if (offset == 0)
+		m_vlm->data_w(data);
 }
 
 void nemesis_state::salamand_speech_start_w(uint8_t data)
@@ -586,14 +591,13 @@
 	map(0x8000, 0x87ff).ram().share("voiceram");
 	map(0xa000, 0xafff).w(m_k005289, FUNC(k005289_device::ld1_w));
 	map(0xc000, 0xcfff).w(m_k005289, FUNC(k005289_device::ld2_w));
-	map(0xe000, 0xe000).w(m_vlm, FUNC(vlm5030_device::data_w));
+	map(0xe000, 0xe000).select(0x78).w(FUNC(nemesis_state::gx400_speech_w));
 	map(0xe001, 0xe001).r("soundlatch", FUNC(generic_latch_8_device::read));
 	map(0xe003, 0xe003).w(m_k005289, FUNC(k005289_device::tg1_w));
 	map(0xe004, 0xe004).w(m_k005289, FUNC(k005289_device::tg2_w));
 	map(0xe005, 0xe005).w("ay2", FUNC(ay8910_device::address_w));
 	map(0xe006, 0xe006).w("ay1", FUNC(ay8910_device::address_w));
 	map(0xe007, 0xe007).select(0x1ff8).w(FUNC(nemesis_state::nemesis_filter_w));
-	map(0xe030, 0xe030).w(FUNC(nemesis_state::gx400_speech_start_w));
 	map(0xe086, 0xe086).r("ay1", FUNC(ay8910_device::data_r));
 	map(0xe106, 0xe106).w("ay1", FUNC(ay8910_device::data_w));
 	map(0xe205, 0xe205).r("ay2", FUNC(ay8910_device::data_r));
@@ -1802,7 +1806,7 @@
 	m_audiocpu->set_addrmap(AS_PROGRAM, &nemesis_state::gx400_sound_map);
 
 	ls259_device &outlatch(LS259(config, "outlatch"));
-	outlatch.q_out_cb<0>().set(FUNC(nemesis_state::coin1_lockout_w));;
+	outlatch.q_out_cb<0>().set(FUNC(nemesis_state::coin1_lockout_w));
 	outlatch.q_out_cb<1>().set(FUNC(nemesis_state::coin2_lockout_w));
 	outlatch.q_out_cb<2>().set(FUNC(nemesis_state::sound_irq_w));
 	outlatch.q_out_cb<7>().set(FUNC(nemesis_state::irq4_enable_w)); // ??
@@ -1932,7 +1936,7 @@
 	m_audiocpu->set_addrmap(AS_PROGRAM, &nemesis_state::gx400_sound_map);
 
 	ls259_device &outlatch(LS259(config, "outlatch"));
-	outlatch.q_out_cb<0>().set(FUNC(nemesis_state::coin1_lockout_w));;
+	outlatch.q_out_cb<0>().set(FUNC(nemesis_state::coin1_lockout_w));
 	outlatch.q_out_cb<1>().set(FUNC(nemesis_state::coin2_lockout_w));
 	outlatch.q_out_cb<2>().set(FUNC(nemesis_state::sound_irq_w));
 	outlatch.q_out_cb<7>().set(FUNC(nemesis_state::irq4_enable_w)); // ??
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/nes_clone.cpp mame-0.224+dfsg.1/src/mame/drivers/nes_clone.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/nes_clone.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/nes_clone.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -75,6 +75,39 @@
 	int m_rombase;
 };
 
+class nes_clone_vtvppong_state : public nes_clone_state
+{
+public:
+	nes_clone_vtvppong_state(const machine_config& mconfig, device_type type, const char* tag) :
+		nes_clone_state(mconfig, type, tag)
+	{ }
+	void nes_clone_vtvppong(machine_config& config);
+
+	void init_vtvppong();
+
+private:
+	void nes_clone_vtvppong_map(address_map& map);
+};
+
+class nes_clone_suduko_state : public nes_clone_state
+{
+public:
+	nes_clone_suduko_state(const machine_config& mconfig, device_type type, const char* tag) :
+		nes_clone_state(mconfig, type, tag)
+	{ }
+
+	void init_sudoku();
+
+	void nes_clone_suduko(machine_config& config);
+
+private:
+	void nes_clone_suduko_map(address_map& map);
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	uint8_t rom_r(offs_t offset);
+	void bank_w(uint8_t data);
+	int m_rombase;
+};
 
 void nes_clone_state::sprite_dma_w(address_space &space, uint8_t data)
 {
@@ -152,6 +185,29 @@
 INPUT_PORTS_END
 
 
+static INPUT_PORTS_START( papsudok )
+	PORT_START("IO0")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("Auto Play")
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_NAME("7") PORT_CODE(KEYCODE_7_PAD)
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("Exit / Menu")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("Start / Enter") // this is actually 2 buttons that map to the same input
+
+	PORT_START("IO1")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_PLAYER(1) PORT_NAME("1") PORT_CODE(KEYCODE_1_PAD)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_PLAYER(1) PORT_NAME("2") PORT_CODE(KEYCODE_2_PAD)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_PLAYER(1) PORT_NAME("6") PORT_CODE(KEYCODE_6_PAD)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_PLAYER(1) PORT_NAME("3") PORT_CODE(KEYCODE_3_PAD)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON9 ) PORT_PLAYER(1) PORT_NAME("9") PORT_CODE(KEYCODE_9_PAD)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_BUTTON10 ) PORT_PLAYER(1) PORT_NAME("5") PORT_CODE(KEYCODE_5_PAD)
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON11 ) PORT_PLAYER(1) PORT_NAME("8") PORT_CODE(KEYCODE_8_PAD)
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON12 ) PORT_PLAYER(1) PORT_NAME("4") PORT_CODE(KEYCODE_4_PAD)
+INPUT_PORTS_END
+
+
 static INPUT_PORTS_START( dnce2000 )
 	PORT_START("IO0")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("Down-Left")
@@ -249,15 +305,12 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &nes_clone_dnce2000_state::nes_clone_dnce2000_map);
 }
 
-
-
 void nes_clone_dnce2000_state::nes_clone_dnce2000_map(address_map& map)
 {
 	nes_clone_basemap(map);
 	map(0x8000, 0xffff).rw(FUNC(nes_clone_dnce2000_state::rom_r), FUNC(nes_clone_dnce2000_state::bank_w));
 }
 
-
 void nes_clone_dnce2000_state::machine_reset()
 {
 	nes_clone_state::machine_reset();
@@ -280,6 +333,118 @@
 	m_rombase = data;
 }
 
+void nes_clone_vtvppong_state::nes_clone_vtvppong(machine_config& config)
+{
+	nes_clone_pal(config);
+	m_maincpu->set_addrmap(AS_PROGRAM, &nes_clone_vtvppong_state::nes_clone_vtvppong_map);
+}
+
+void nes_clone_vtvppong_state::nes_clone_vtvppong_map(address_map& map)
+{
+	nes_clone_basemap(map);
+	map(0x8000, 0xffff).rom().region("maincpu", 0x38000);
+}
+
+
+void nes_clone_suduko_state::machine_reset()
+{
+	nes_clone_state::machine_reset();
+	m_rombase = 0;
+}
+
+void nes_clone_suduko_state::machine_start()
+{
+	nes_clone_state::machine_start();
+	save_item(NAME(m_rombase));
+}
+
+void nes_clone_suduko_state::nes_clone_suduko(machine_config& config)
+{
+	nes_clone(config);
+	m_maincpu->set_addrmap(AS_PROGRAM, &nes_clone_suduko_state::nes_clone_suduko_map);
+}
+
+void nes_clone_suduko_state::nes_clone_suduko_map(address_map& map)
+{
+	nes_clone_basemap(map);
+	map(0x8000, 0xffff).rw(FUNC(nes_clone_suduko_state::rom_r), FUNC(nes_clone_suduko_state::bank_w));
+}
+
+uint8_t nes_clone_suduko_state::rom_r(offs_t offset)
+{
+	return m_mainrom[(offset + (m_rombase * 0x8000)) & (m_mainromsize - 1)];
+}
+
+void nes_clone_suduko_state::bank_w(uint8_t data)
+{
+	logerror("%04x: bank_w %02x\n", machine().describe_context(), data);
+	m_rombase = data;
+}
+
+
+void nes_clone_suduko_state::init_sudoku()
+{
+	u8 *src = memregion("maincpu")->base();
+	int len = memregion("maincpu")->bytes();
+
+	std::vector<u8> buffer(len);
+	{
+		for (int i = 0; i < len; i += 8)
+		{
+			buffer[i+0] = src[i+5];
+			buffer[i+1] = src[i+4];
+			buffer[i+2] = src[i+7];
+			buffer[i+3] = src[i+6];
+			buffer[i+4] = src[i+1];
+			buffer[i+5] = src[i+0];
+			buffer[i+6] = src[i+3];
+			buffer[i+7] = src[i+2];
+		}
+
+		std::copy(buffer.begin(), buffer.end(), &src[0]);
+	}
+
+
+}
+
+void nes_clone_vtvppong_state::init_vtvppong()
+{
+	u8 *src = memregion("maincpu")->base();
+	int len = memregion("maincpu")->bytes();
+
+	std::vector<u8> buffer(len);
+	{
+		for (int i = 0; i < len; i++)
+		{
+			int newaddr = bitswap<18>(i, 17, 16, 15, 13, 14, 12,
+				11, 10, 9, 8,
+				7, 6, 5, 4,
+				3, 2, 1, 0);
+
+			buffer[i] = src[newaddr];
+		}
+		std::copy(buffer.begin(), buffer.end(), &src[0]);
+	}
+
+#if 0
+	FILE *fp;
+	char filename[256];
+	sprintf(filename,"decrypted_%s", machine().system().name);
+	fp=fopen(filename, "w+b");
+	if (fp)
+	{
+		fwrite(&src[0], len, 1, fp);
+		fclose(fp);
+	}
+#endif
+}
+
+
+ROM_START( papsudok )
+	ROM_REGION( 0x80000, "maincpu", 0 )
+	ROM_LOAD( "sudoku2.bin", 0x00000, 0x80000, CRC(d1ffcc1e) SHA1(2010e60933a08d0b9271ef37f338758aacba6d2d) )
+ROM_END
+
 ROM_START( pjoypj001 )
 	ROM_REGION( 0x100000, "maincpu", ROMREGION_ERASE00 )
 	ROM_LOAD( "powerjoy_pj001_lh28f008sc_89a6.bin", 0x00000, 0x100000, CRC(e655e0aa) SHA1(c96d3422e26451c366fee2151fedccb95014cbc7) )
@@ -298,6 +463,13 @@
 	ROM_LOAD( "dance.bin", 0x00000, 0x40000, CRC(0982bb50) SHA1(bd608159d7e624ea345f2a188de51cb1aa116421) )
 ROM_END
 
+ROM_START( vtvppong )
+	ROM_REGION( 0x40000, "maincpu", ROMREGION_ERASE00 ) // high bit is never set in the first 0x28000 bytes of this ROM, probably 7-bit sound data? code might need opcode bits swapping
+	ROM_LOAD( "vtvpongcpu.bin", 0x00000, 0x40000, CRC(52df95fa) SHA1(3015bcc90eee862b3568f122b402c9defa566aab) )
+
+	ROM_REGION( 0x20000, "gfx1", ROMREGION_ERASE00 )
+	ROM_LOAD( "vtvpongppu.bin", 0x00000, 0x20000, CRC(474dfc0c) SHA1(4d0afab111e40172ae0b31e94f1b74b73a18385f) )
+ROM_END
 
 void nes_clone_state::init_nes_clone()
 {
@@ -308,4 +480,12 @@
 // "Flashback Mini 7800 uses normal NES-style hardware, together with a mapper chipset similar to the Waixing kk33xx cartridges (NES 2.0 Mapper 534)"
 CONS( 2004, afbm7800,  0,  0,  nes_clone,    nes_clone, nes_clone_state, init_nes_clone, "Atari", "Atari Flashback Mini 7800", MACHINE_NOT_WORKING )
 
+CONS( 200?, vtvppong,  0,  0,  nes_clone_vtvppong,    nes_clone, nes_clone_vtvppong_state, init_vtvppong, "<unknown>", "Virtual TV Ping Pong", MACHINE_NOT_WORKING )
+
+
 CONS( 200?, dnce2000, 0, 0, nes_clone_dnce2000, dnce2000, nes_clone_dnce2000_state, init_nes_clone, "Shenzhen Soyin Electric Appliance Ind. Co., Ltd.", "Dance 2000 / Hot 2000 (Jin Bao TV Dancing Carpet, SY-2000-04)", 0 )
+
+// Black pad marked 'SUDOKU' with tails on the S and U characters looping over the logo.  Box says "Plug and Play Sudoku"
+// Has 2 sets of 4 buttons in circular 'direction pad' layouts (on the left for directions, on the right for functions) and 9 red numbered buttons with red power LED on left of them, and reset button on right
+// Alt. version was released with 'New York Times' titlescreen
+CONS( 200?, papsudok,     0,  0,  nes_clone_suduko, papsudok, nes_clone_suduko_state, init_sudoku, "Nice Code", "Plug and Play Sudoku Game (NES based)", 0 ) // plays, but unclear how 'save' feature is meant to work, is it meant to save after shutdown or not? no obvious writes
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/nes_sh6578.cpp mame-0.224+dfsg.1/src/mame/drivers/nes_sh6578.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/nes_sh6578.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/nes_sh6578.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -5,6 +5,8 @@
     SH6578 NES clone hardware
     enhanced NES, different to VT / OneBus systems
 
+    "UMC 1997.2 A35551S" on CPU die (maxx6in1)
+
     video rendering is changed significantly compared to NES so not using NES PPU device
     has 256x256 pixel pages, attributes are stored next to tile numbers (not in their own table after them) etc.
 
@@ -33,9 +35,9 @@
 public:
 	nes_sh6578_state(const machine_config& mconfig, device_type type, const char* tag) :
 		driver_device(mconfig, type, tag),
+		m_bank(*this, "cartbank"),
 		m_maincpu(*this, "maincpu"),
 		m_ppu(*this, "ppu"),
-		m_bank(*this, "cartbank"),
 		m_fullrom(*this, "fullrom"),
 		m_screen(*this, "screen"),
 		m_apu(*this, "nesapu"),
@@ -55,10 +57,14 @@
 
 	void sprite_dma_w(address_space &space, uint8_t data);
 
+	virtual void io_w(uint8_t data);
+	virtual void extio_w(uint8_t data);
+	bool m_isbanked;
+	required_memory_bank m_bank;
+
 private:
 	required_device<cpu_device> m_maincpu;
 	required_device<ppu_sh6578_device> m_ppu;
-	required_memory_bank m_bank;
 	required_device<address_map_bank_device> m_fullrom;
 	required_device<screen_device> m_screen;
 	required_device<nesapu_device> m_apu;
@@ -99,7 +105,6 @@
 
 	uint8_t io0_r();
 	uint8_t io1_r();
-	void io_w(uint8_t data);
 
 	uint8_t psg1_4014_r();
 	uint8_t psg1_4015_r();
@@ -136,11 +141,31 @@
 	// this might be game specific
 	uint8_t m_previo;
 	uint8_t m_iolatch[2];
-	bool m_isbanked;
 	required_ioport_array<2> m_in;
 };
 
+class nes_sh6578_abl_wikid_state : public nes_sh6578_state
+{
+public:
+	nes_sh6578_abl_wikid_state(const machine_config& mconfig, device_type type, const char* tag) :
+		nes_sh6578_state(mconfig, type, tag)
+	{ }
+
+protected:
+	virtual void io_w(uint8_t data) override;
+};
+
+class nes_sh6578_max10in1_state : public nes_sh6578_state
+{
+public:
+	nes_sh6578_max10in1_state(const machine_config& mconfig, device_type type, const char* tag) :
+		nes_sh6578_state(mconfig, type, tag)
+	{ }
 
+protected:
+	virtual void extio_w(uint8_t data) override;
+	virtual void machine_reset() override;
+};
 
 uint8_t nes_sh6578_state::bank_r(int bank, uint16_t offset)
 {
@@ -398,15 +423,35 @@
 		}
 	}
 
+	m_previo = data;
+}
+
+void nes_sh6578_abl_wikid_state::io_w(uint8_t data)
+{
+	nes_sh6578_state::io_w(data);
+
 	if (m_isbanked)
 	{
 		m_bank->set_entry((data>>1)&1);
 	}
+}
 
-	m_previo = data;
+void nes_sh6578_state::extio_w(uint8_t data)
+{
+	logerror("%s: extio_w : %02x\n", machine().describe_context(), data);
+}
+
+void nes_sh6578_max10in1_state::extio_w(uint8_t data)
+{
+	logerror("%s: extio_w : %02x (max10in1)\n", machine().describe_context(), data);
+
+	m_bank->set_entry((data & 0x80) >> 7);
 }
 
 
+
+
+
 uint8_t nes_sh6578_state::psg1_4014_r()
 {
 	return m_apu->read(0x14);
@@ -454,6 +499,13 @@
 	map(0x4017, 0x4017).rw(FUNC(nes_sh6578_state::io1_r), FUNC(nes_sh6578_state::psg1_4017_w));
 
 	map(0x4020, 0x4020).w(FUNC(nes_sh6578_state::timing_setting_control_w));
+	//4021 write keyboard output port
+	//4022 read/write keyboard data control
+	//4023 read/write joystick,mouse control
+	//4024 read - mouse port / write - mouse baud
+	//4025 write - Printer Port
+	map(0x4026, 0x4026).w(FUNC(nes_sh6578_state::extio_w));
+	//4027 read/write - DAC data register
 
 	map(0x4031, 0x4031).w(FUNC(nes_sh6578_state::initial_startup_w));
 	map(0x4032, 0x4032).w(FUNC(nes_sh6578_state::irq_mask_w));
@@ -510,6 +562,12 @@
 	m_timerval = 0x00;
 }
 
+void nes_sh6578_max10in1_state::machine_reset()
+{
+	nes_sh6578_state::machine_reset();
+	m_bank->set_entry(1);
+}
+
 void nes_sh6578_state::machine_start()
 {
 	m_bank->configure_entry(0, memregion("maincpu")->base() + 0x0000000);
@@ -641,6 +699,20 @@
 	ROM_LOAD( "mx29f1610atc.u2", 0x00000, 0x200000, CRC(f16abf79) SHA1(aeccbb40d7fdd451ba8e5cca20464da2cf116461) )
 ROM_END
 
+ROM_START( maxx5in1 )
+	ROM_REGION( 0x100000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "vsmaxxcasino5_e28f008sa_89a2.bin", 0x00000, 0x100000, CRC(e3d8f24f) SHA1(121411e72d53eabe6be927d1db2f871d59a9e08e) )
+ROM_END
+
+ROM_START( maxx6in1 )
+	ROM_REGION( 0x100000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "maxx6in1.bin", 0x00000, 0x100000, CRC(8e582298) SHA1(89892b9095dbd5101cdf2477a66abd2cb11ad8c8) )
+ROM_END
+
+ROM_START( max10in1 )
+	ROM_REGION( 0x200000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "csmaxxcasino10.bin", 0x000000, 0x200000, CRC(2a05e9af) SHA1(fcf591c22ce8773f72e9d0fa0bae545f6a82a063) )
+ROM_END
 
 CONS( 1997, bandgpad,    0,  0,  nes_sh6578,     nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Bandai", "Multi Game Player Gamepad", MACHINE_NOT_WORKING )
 CONS( 1997, bandggcn,    0,  0,  nes_sh6578,     nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Bandai", "Go! Go! Connie-chan! Asobou Mouse", MACHINE_NOT_WORKING )
@@ -651,4 +723,11 @@
 CONS( 200?, cpatrolm,    0,  0,  nes_sh6578_pal, nes_sh6578, nes_sh6578_state, init_nes_sh6578, "TimeTop", "City Patrolman", MACHINE_NOT_WORKING )
 
 // ROM is banked
-CONS( 200?, ablwikid,    0,  0,  nes_sh6578_pal, nes_sh6578, nes_sh6578_state, init_nes_sh6578, "Advance Bright Ltd.", "Wikid Joystick", MACHINE_NOT_WORKING ) // or Wik!d Joystick
+CONS( 200?, ablwikid,    0,  0,  nes_sh6578_pal, nes_sh6578, nes_sh6578_abl_wikid_state, init_nes_sh6578, "Advance Bright Ltd.", "Wikid Joystick", MACHINE_NOT_WORKING ) // or Wik!d Joystick
+
+CONS( 200?, maxx5in1,  0, 0,  nes_sh6578, nes_sh6578, nes_sh6578_state,  init_nes_sh6578, "Senario", "Vs Maxx 5-in-1 Casino / Senario Card & Casino Games", 0 ) // advertised on box as 'With Solitaire" (was there an even older version without it?)
+
+CONS( 200?, maxx6in1,  0, 0,  nes_sh6578, nes_sh6578, nes_sh6578_state,  init_nes_sh6578, "Senario", "Vs Maxx 6-in-1 Casino / Senario Card & Casino Games", 0 ) // advertised on box as "With Texas Hold 'Em" (which is the added game since the 5-in-1)
+
+CONS( 200?, max10in1,  0, 0,  nes_sh6578, nes_sh6578, nes_sh6578_max10in1_state,  init_nes_sh6578, "Senario", "Vs Maxx 10-in-1 Casino / Senario Card & Casino Games", 0 )
+
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/nes_vt.cpp mame-0.224+dfsg.1/src/mame/drivers/nes_vt.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/nes_vt.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/nes_vt.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -120,6 +120,8 @@
 	void vt_external_space_map_1mbyte(address_map& map);
 	void vt_external_space_map_512kbyte(address_map& map);
 
+	void init_protpp();
+
 protected:
 	required_device<nes_vt_soc_device> m_soc;
 
@@ -135,6 +137,7 @@
 	{ }
 
 	void nes_vt_vh2009(machine_config& config);
+	void nes_vt_vh2009_1mb(machine_config& config);
 	void nes_vt_vh2009_4mb(machine_config& config);
 	void nes_vt_vh2009_8mb(machine_config& config);
 
@@ -176,6 +179,24 @@
 	void nes_vt_waixing_alt_pal_8mb(machine_config& config);
 };
 
+class nes_vt_waixing_alt_duetpp_state : public nes_vt_waixing_alt_state
+{
+public:
+	nes_vt_waixing_alt_duetpp_state(const machine_config& mconfig, device_type type, const char* tag) :
+		nes_vt_waixing_alt_state(mconfig, type, tag)
+	{ }
+
+	void nes_vt_waixing_alt_4mb_duetpp(machine_config& config);
+
+private:
+	uint8_t in1_r() override
+	{
+		uint8_t i = machine().rand() & 0x18;
+		uint8_t ret = m_io1->read() & ~0x18;
+		return i | ret;
+	}
+};
+
 
 class nes_vt_timetp36_state : public nes_vt_state
 {
@@ -256,6 +277,8 @@
 		m_latch1_bit(0)
 	{ }
 
+	void init_lxcmcypp();
+
 protected:
 	virtual uint8_t in0_r() override;
 	virtual uint8_t in1_r() override;
@@ -357,6 +380,8 @@
 		m_plunger(*this, "PLUNGER")
 	{ }
 
+	void nes_vt_waixing_alt_4mb_duetpp(machine_config& config);
+
 protected:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
@@ -374,23 +399,6 @@
 	required_ioport m_plunger;
 };
 
-class nes_vt_sudoku_state : public nes_vt_state
-{
-public:
-	nes_vt_sudoku_state(const machine_config& mconfig, device_type type, const char* tag) :
-		nes_vt_state(mconfig, type, tag)
-	{ }
-
-	void init_sudoku();
-
-	void nes_vt_sudoku_512kb(machine_config& config);
-
-private:
-	virtual uint8_t in0_r() override;
-	virtual uint8_t in1_r() override;
-	virtual void in0_w(uint8_t data) override;
-};
-
 class nes_vt_vg_1mb_majgnc_state : public nes_vt_state
 {
 public:
@@ -704,20 +712,6 @@
 	logerror("in0_w %02x\n", data);
 }
 
-uint8_t nes_vt_sudoku_state::in0_r()
-{
-	return machine().rand();
-}
-
-uint8_t nes_vt_sudoku_state::in1_r()
-{
-	return machine().rand();
-}
-
-void nes_vt_sudoku_state::in0_w(uint8_t data)
-{
-}
-
 
 /* not strictly needed, but helps us see where things are in ROM to aid with figuring out banking schemes*/
 static const gfx_layout helper_layout =
@@ -760,15 +754,6 @@
 	soc->extra_read_3_callback().set(FUNC(nes_vt_base_state::extrain_3_r));
 }
 
-
-
-void nes_vt_sudoku_state::nes_vt_sudoku_512kb(machine_config &config)
-{
-	NES_VT_SOC(config, m_soc, NTSC_APU_CLOCK);
-	configure_soc(m_soc);
-	m_soc->set_addrmap(AS_PROGRAM, &nes_vt_sudoku_state::vt_external_space_map_512kbyte);
-}
-
 void nes_vt_vg_1mb_majgnc_state::nes_vt_vg_1mb_majgnc(machine_config &config)
 {
 	NES_VT_SOC(config, m_soc, NTSC_APU_CLOCK);
@@ -881,6 +866,19 @@
 	m_soc->set_8000_scramble(0x5, 0x4, 0x3, 0x2, 0x7, 0x6, 0x7, 0x8);
 }
 
+void nes_vt_waixing_alt_duetpp_state::nes_vt_waixing_alt_4mb_duetpp(machine_config& config)
+{
+	NES_VT_SOC(config, m_soc, NTSC_APU_CLOCK);
+	configure_soc(m_soc);
+
+	m_soc->set_addrmap(AS_PROGRAM, &nes_vt_ablping_state::vt_external_space_map_4mbyte);
+	m_soc->set_201x_descramble(0x3, 0x2, 0x7, 0x6, 0x5, 0x4);
+	m_soc->set_8000_scramble(0x5, 0x4, 0x3, 0x2, 0x7, 0x6, 0x7, 0x8);
+
+	GFXDECODE(config, "gfxdecode", "soc:ppu", vt03_gfx_helper);
+}
+
+
 void nes_vt_hum_state::nes_vt_hummer_2mb(machine_config& config)
 {
 	NES_VT_SOC(config, m_soc, NTSC_APU_CLOCK);
@@ -1303,6 +1301,12 @@
 	//m_soc->set_default_palette_mode(PAL_MODE_NEW_VG); // gives better title screens, but worse ingame, must be able to switch
 }
 
+void nes_vt_swap_op_d5_d6_state::nes_vt_vh2009_1mb(machine_config& config)
+{
+	nes_vt_vh2009(config);
+	m_soc->set_addrmap(AS_PROGRAM, &nes_vt_swap_op_d5_d6_state::vt_external_space_map_1mbyte);
+}
+
 void nes_vt_swap_op_d5_d6_state::nes_vt_vh2009_4mb(machine_config& config)
 {
 	nes_vt_vh2009(config);
@@ -1364,10 +1368,46 @@
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("NUDGE" )
 INPUT_PORTS_END
 
-static INPUT_PORTS_START( sudoku )
-	PORT_INCLUDE(nes_vt)
+
+static INPUT_PORTS_START( duetpp )
+	PORT_START("IO0")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SELECT ) PORT_PLAYER(1)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_START ) PORT_PLAYER(1)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY
+
+	PORT_START("IO1")
+	PORT_DIPNAME( 0x0001, 0x0000, "P2:0001" )
+	PORT_DIPSETTING(      0x0000, "0000" )
+	PORT_DIPSETTING(      0x0001, "0001" )
+	PORT_DIPNAME( 0x0002, 0x0000, "P2:0002" )
+	PORT_DIPSETTING(      0x0000, "0000" )
+	PORT_DIPSETTING(      0x0002, "0002" )
+	PORT_DIPNAME( 0x0004, 0x0000, "P2:0004" )
+	PORT_DIPSETTING(      0x0000, "0000" )
+	PORT_DIPSETTING(      0x0004, "0004" )
+	PORT_DIPNAME( 0x0008, 0x0000, "P2:0008" )
+	PORT_DIPSETTING(      0x0000, "0000" )
+	PORT_DIPSETTING(      0x0008, "0008" )
+	PORT_DIPNAME( 0x0010, 0x0000, "P2:0010" )
+	PORT_DIPSETTING(      0x0000, "0000" )
+	PORT_DIPSETTING(      0x0010, "0010" )
+	PORT_DIPNAME( 0x0020, 0x0000, "P2:0020" )
+	PORT_DIPSETTING(      0x0000, "0000" )
+	PORT_DIPSETTING(      0x0020, "0020" )
+	PORT_DIPNAME( 0x0040, 0x0000, "P2:0040" )
+	PORT_DIPSETTING(      0x0000, "0000" )
+	PORT_DIPSETTING(      0x0040, "0040" )
+	PORT_DIPNAME( 0x0080, 0x0000, "P2:0080" )
+	PORT_DIPSETTING(      0x0000, "0000" )
+	PORT_DIPSETTING(      0x0080, "0080" )
 INPUT_PORTS_END
 
+
 // the test mode shows 2 gamepads, however this is not the control scheme the game uses
 // there is a reset button too but it doesn't seem to be a software switch
 static INPUT_PORTS_START( majgnc )
@@ -1447,42 +1487,6 @@
 INPUT_PORTS_END
 
 
-void nes_vt_sudoku_state::init_sudoku()
-{
-	u8 *src = memregion("mainrom")->base();
-	int len = memregion("mainrom")->bytes();
-
-	std::vector<u8> buffer(len);
-	{
-		for (int i = 0; i < len; i += 8)
-		{
-			buffer[i+0] = src[i+5];
-			buffer[i+1] = src[i+4];
-			buffer[i+2] = src[i+7];
-			buffer[i+3] = src[i+6];
-			buffer[i+4] = src[i+1];
-			buffer[i+5] = src[i+0];
-			buffer[i+6] = src[i+3];
-			buffer[i+7] = src[i+2];
-		}
-
-		std::copy(buffer.begin(), buffer.end(), &src[0]);
-	}
-
-	if (0)
-	{
-		FILE *fp;
-		char filename[256];
-		sprintf(filename,"decrypted_%s", machine().system().name);
-		fp=fopen(filename, "w+b");
-		if (fp)
-		{
-			fwrite(src, len, 1, fp);
-			fclose(fp);
-		}
-	}
-}
-
 
 
 ROM_START( vdogdeme )
@@ -1521,9 +1525,9 @@
 	ROM_LOAD( "rom.bin", 0x00000, 0x80000, CRC(c115b1af) SHA1(82106e1c11c3279c5d8731c112f713fa3f290125) )
 ROM_END
 
-ROM_START( papsudok )
-	ROM_REGION( 0x80000, "mainrom", 0 )
-	ROM_LOAD( "sudoku2.bin", 0x00000, 0x80000, CRC(d1ffcc1e) SHA1(2010e60933a08d0b9271ef37f338758aacba6d2d) )
+ROM_START( sudopptv )
+	ROM_REGION( 0x80000, "mainrom", ROMREGION_ERASEFF )
+	ROM_LOAD( "sudokupnptvgame_29lv400tc_000422b9.bin", 0x00000, 0x80000, CRC(722cc36d) SHA1(1f6d1f57478cf175a36722b39c52eded4b669f81) )
 ROM_END
 
 ROM_START( mc_dgear )
@@ -1590,12 +1594,35 @@
 	ROM_LOAD( "lexibookspiderman.bin", 0x00000, 0x4000000, CRC(ef6e8847) SHA1(0012df193c52fd48595d85886fd431619c5d5e3e) )
 ROM_END
 
+ROM_START( lxcmcycr )
+	ROM_REGION( 0x4000000, "mainrom", 0 )
+	ROM_LOAD( "lexibook cars.bin", 0x00000, 0x4000000, CRC(198fe11b) SHA1(5e35caa3fc319ec69812c187a3ec89f01749f749) )
+ROM_END
+
+ROM_START( lxcmcypp )
+	ROM_REGION( 0x4000000, "mainrom", 0 )
+	// marked 512mbit, possible A22 / A23 are swapped as they were marked on the board in a different way.
+	ROM_LOAD( "pawpatrol_compact.bin", 0x00000, 0x4000000, CRC(bf536762) SHA1(80dde8426a636bae33a82d779e564fa743eb3776) )
+ROM_END
+
 ROM_START( lxcmc250 )
 	ROM_REGION( 0x4000000, "mainrom", 0 )
 	// sub-board was marked for 2GB capacity (A0-A26 address lines), but only address lines A0-A24 are connected to the chip
 	ROM_LOAD( "cca250in1.u1", 0x00000, 0x4000000, CRC(6ccd6ad6) SHA1(fafed339097c3d1538faa306021a8373c1b799b3) )
 ROM_END
 
+ROM_START( lxccminn )
+	ROM_REGION( 0x4000000, "mainrom", 0 ) // sub-board was hardwired to only be able to address the lower 64MByte, was rewired to also dump upper half when dumping, upper half contains only garbage, hence ROM_IGNORE
+	ROM_LOAD( "minnie_lexibook.bin", 0x00000, 0x4000000, CRC(3f8e5a69) SHA1(c9f11f3e5f9b73832a191f4d1620a85c1b70f79e) )
+	ROM_IGNORE(0x4000000)
+ROM_END
+
+ROM_START( lxccplan )
+	ROM_REGION( 0x4000000, "mainrom", 0 ) // sub-board was hardwired to only be able to address the lower 64MByte, was rewired to also dump upper half when dumping, upper half contains only garbage, hence ROM_IGNORE
+	ROM_LOAD( "planes_lexibook.bin", 0x00000, 0x4000000, CRC(76e1a962) SHA1(83b801c0e0e941ceb1c93e565e833b07c09412c3))
+	ROM_IGNORE(0x4000000)
+ROM_END
+
 ROM_START( red5mam )
 	ROM_REGION( 0x8000000, "mainrom", 0 )
 	ROM_LOAD( "mam.u3", 0x00000, 0x8000000, CRC(0c0a0ecd) SHA1(2dfd8437de17fc9975698f1933dd81fbac78466d) )
@@ -1637,6 +1664,16 @@
 	ROM_LOAD( "silverlit35.bin", 0x00000, 0x400000, CRC(7540e350) SHA1(a0cb456136560fa4d8a365dd44d815ec0e9fc2e7) )
 ROM_END
 
+ROM_START( duetpp )
+	ROM_REGION( 0x400000, "mainrom", 0 )
+	ROM_LOAD( "gamesporzduetpingpong.bin", 0x00000, 0x400000, CRC(96af199b) SHA1(c14ff15683545c1edf03376cebcee7ac408da733) )
+ROM_END
+
+ROM_START( sporzbx )
+	ROM_REGION( 0x400000, "mainrom", 0 )
+	ROM_LOAD( "sporzboxing.bin", 0x00000, 0x400000, CRC(8b832c0b) SHA1(8193955a81e894a01308a80d5153f2ecfe134da6) )
+ROM_END
+
 ROM_START( lpgm240 )
 	ROM_REGION( 0x800000, "mainrom", 0 )
 	ROM_LOAD( "w25q64jv.u1", 0x00000, 0x800000, CRC(b973e65b) SHA1(36ff137068ea56b4679c2db386ac0067de0a9eaf) )
@@ -1794,10 +1831,6 @@
 	ROM_LOAD( "majescogoldennuggetcasino_st29w800at_002000d7.bin", 0x00000, 0x100000, CRC(1a156a9d) SHA1(08be4079dd68c9cf05bb92e11a3da4f092d7cfea) )
 ROM_END
 
-ROM_START( sudopptv )
-	ROM_REGION( 0x80000, "mainrom", ROMREGION_ERASEFF )
-	ROM_LOAD( "sudokupnptvgame_29lv400tc_000422b9.bin", 0x00000, 0x80000, CRC(722cc36d) SHA1(1f6d1f57478cf175a36722b39c52eded4b669f81) )
-ROM_END
 
 ROM_START( zudugo )
 	ROM_REGION( 0x400000, "mainrom", ROMREGION_ERASEFF )
@@ -1811,6 +1844,7 @@
 
 
 
+
 ROM_START( dgun2573 ) // this one lacked a DreamGear logo but was otherwise physically identical, is it a clone product or did DreamGear drop the logo in favor of just using the 'My Arcade' brand?
 	ROM_REGION( 0x2000000, "mainrom", 0 )
 	ROM_LOAD( "myarcadegamerportable_s29gl256p10tfi01_0001227e.bin", 0x00000, 0x2000000, CRC(8f8c8da7) SHA1(76a18458922e39abe1982f05f184babb5e65acf2) )
@@ -1881,6 +1915,12 @@
 	ROM_LOAD( "technigame.bin", 0x00000, 0x200000, CRC(3c96b1b1) SHA1(1acc81b26e740327bd6d9faa5a96ab027a48dd77) )
 ROM_END
 
+
+ROM_START( protpp )
+	ROM_REGION( 0x100000, "mainrom", 0 )
+	ROM_LOAD( "vpingpong_s29al008d70tfi02_0001225b.bin", 0x00000, 0x100000, CRC(8cf46272) SHA1(298a6341d26712ec1f282e7514e995a7af5ac012) )
+ROM_END
+
 ROM_START( unkra200 ) // "Winbond 25Q64FVSIG 1324" SPI ROM
 	ROM_REGION( 0x800000, "mainrom", 0 )
 	ROM_LOAD( "retro_machine_rom", 0x00000, 0x800000, CRC(0e824aa7) SHA1(957e98868559ecc22b3fa42c76692417b76bf132) )
@@ -1932,6 +1972,39 @@
 	ROM_LOAD( "t24c04a.bin", 0x000, 0x200, CRC(ce1fad6f) SHA1(82878996765739edba42042b6336460d5c8f8096) )
 ROM_END
 
+ROM_START( zonefusn )
+	ROM_REGION( 0x1000000, "mainrom", 0 )
+	ROM_LOAD( "fusion.bin", 0x00000, 0x1000000, CRC(240bf970) SHA1(1b82d95a252c08e52fb8da6320276574a30b60db) )
+ROM_END
+
+void nes_vt_cy_lexibook_state::init_lxcmcypp()
+{
+	int size = memregion("mainrom")->bytes()/2;
+	uint16_t* ROM = (uint16_t*)memregion("mainrom")->base();
+
+	for (int i = 0; i < size; i++)
+	{
+		ROM[i] = bitswap<16>(ROM[i], 4, 5, 6, 7, 0, 1, 2, 3, 12, 13, 14, 15, 8, 9, 10, 11);
+	}
+}
+
+void nes_vt_state::init_protpp()
+{
+	// this gets the tiles correct
+	u8 *src = memregion("mainrom")->base();
+	int len = memregion("mainrom")->bytes();
+
+	std::vector<u8> buffer(len);
+	{
+		for (int i = 0; i < len; i++)
+		{
+			buffer[i] = bitswap<8>(src[i],3,1,2,0,7,5,6,4);
+		}
+
+		std::copy(buffer.begin(), buffer.end(), &src[0]);
+	}
+}
+
 
 
 
@@ -1957,11 +2030,10 @@
 // 050329 (29th March 2005) date on PCB
 CONS( 2005, ablpinb, 0,  0,  nes_vt_pal_2mb,    ablpinb, nes_vt_ablpinb_state, empty_init, "Advance Bright Ltd", "Pinball (P8002, ABL TV Game)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 
+// need to map 2 player controls for Ping Pong, 'Eat-Bean' (the PacMan hack) gets stuck during intermission? (same happens on hardware?)
+CONS( 2004, duetpp,    0,  0,  nes_vt_waixing_alt_4mb_duetpp,        duetpp, nes_vt_waixing_alt_duetpp_state, empty_init, "Macro Winners", "Game Sporz Wireless Duet Play Ping-Pong", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 
-// Black pad marked 'SUDOKU' with tails on the S and U characters looping over the logo.  Box says "Plug and Play Sudoku"
-// Has 2 sets of 4 buttons in circular 'direction pad' layouts (on the left for directions, on the right for functions) and 9 red numbered buttons with red power LED on left of them, and reset button on right
-CONS( 200?, papsudok,     0,  0,  nes_vt_sudoku_512kb, sudoku, nes_vt_sudoku_state, init_sudoku, "<unknown>", "Plug and Play Sudoku (VT based?)", MACHINE_NOT_WORKING )
-
+CONS( 2004, sporzbx,   0,  0,  nes_vt_waixing_alt_4mb_duetpp,        duetpp, nes_vt_waixing_alt_duetpp_state, empty_init, "Macro Winners", "Game Sporz Wireless Boxing", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 
 // should be VT03 based
 // for testing 'Shark', 'Octopus', 'Harbor', and 'Earth Fighter' use the extended colour modes, other games just seem to use standard NES modes
@@ -1985,7 +2057,7 @@
 CONS( 2006, ablmini,   0, 0,  nes_vt_waixing_alt_pal_8mb, nes_vt, nes_vt_waixing_alt_state, empty_init, "Advance Bright Ltd", "Double Players Mini Joystick 80-in-1 (MJ8500, ABL TV Game)", MACHINE_IMPERFECT_GRAPHICS )
 
 // silver 'N64' type controller design
-CONS( 200?, zudugo,    0, 0,  nes_vt_waixing_alt_4mb,     nes_vt, nes_vt_waixing_alt_state, empty_init, "<unknown>", "Zudu-go / 2udu-go", MACHINE_IMPERFECT_GRAPHICS ) // the styling on the box looks like a '2' in places, a 'Z' in others.
+CONS( 200?, zudugo,    0, 0,  nes_vt_waixing_alt_4mb,     nes_vt, nes_vt_waixing_alt_state, empty_init, "Macro Winners / Waixing", "Zudu-go / 2udu-go", MACHINE_IMPERFECT_GRAPHICS ) // the styling on the box looks like a '2' in places, a 'Z' in others.
 
  // needs PCM samples, Y button is not mapped (not used by any of the games?)
 CONS( 200?, timetp36,  0, 0,  nes_vt_pal_4mb, timetp36, nes_vt_timetp36_state,        empty_init, "TimeTop", "Super Game 36-in-1 (TimeTop SuperGame) (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
@@ -2006,34 +2078,38 @@
 CONS( 200?, dgun2500,  0,  0,  nes_vt_dg_baddma_16mb, nes_vt, nes_vt_dg_state, empty_init, "dreamGEAR", "dreamGEAR Wireless Motion Control with 130 games (DGUN-2500)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND)
 
 // don't even get to menu. very enhanced chipset, VT368/9?
-CONS( 2012, dgun2561,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init, "dreamGEAR", "My Arcade Portable Gaming System (DGUN-2561)", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
+CONS( 2012, dgun2561,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init, "dreamGEAR", "My Arcade Portable Gaming System with 140 Games (DGUN-2561)", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
 CONS( 2016, dgun2593,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init, "dreamGEAR", "My Arcade Retro Arcade Machine - 300 Handheld Video Games (DGUN-2593)", MACHINE_NOT_WORKING ) // 128Mbyte ROM, must be externally banked or different addressing scheme
 
-CONS( 200?, lxcmcy,    0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init, "Lexibook", "Lexibook Compact Cyber Arcade", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
-CONS( 200?, lxcmc250,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init, "Lexibook", "Lexibook Compact Cyber Arcade - 250-in-1 (JL2375)", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
-CONS( 200?, lxcmcysw,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init, "Lexibook", "Lexibook Compact Cyber Arcade - Star Wars Rebels", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
-CONS( 200?, lxcmcyfz,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init, "Lexibook", "Lexibook Compact Cyber Arcade - Frozen", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
-CONS( 200?, lxcmcydp,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init, "Lexibook", "Lexibook Compact Cyber Arcade - Disney Princess", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
-CONS( 200?, lxcmcysp,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init, "Lexibook", "Lexibook Compact Cyber Arcade - Marvel Ultimate Spider-Man", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
+CONS( 200?, lxcmcy,    0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init,    "Lexibook", "Lexibook Compact Cyber Arcade", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
+CONS( 200?, lxcmc250,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init,    "Lexibook", "Lexibook Compact Cyber Arcade - 250-in-1 (JL2375)", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
+CONS( 200?, lxcmcysw,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init,    "Lexibook", "Lexibook Compact Cyber Arcade - Star Wars Rebels", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
+CONS( 200?, lxcmcyfz,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init,    "Lexibook", "Lexibook Compact Cyber Arcade - Frozen", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
+CONS( 200?, lxcmcydp,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init,    "Lexibook", "Lexibook Compact Cyber Arcade - Disney Princess", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
+CONS( 200?, lxcmcysp,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init,    "Lexibook", "Lexibook Compact Cyber Arcade - Marvel Ultimate Spider-Man", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
+CONS( 200?, lxcmcycr,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init,    "Lexibook", "Lexibook Compact Cyber Arcade - Cars", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
+// the data order is swapped for this one, maybe other internal differences?
+CONS( 200?, lxcmcypp,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, init_lxcmcypp, "Lexibook", "Lexibook Compact Cyber Arcade - Paw Patrol", MACHINE_NOT_WORKING ) // 64Mbyte ROM, must be externally banked, or different addressing scheme
+
+
+CONS( 200?, lxccminn,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init,    "Lexibook", "Lexibook Console Colour - Minnie Mouse", MACHINE_NOT_WORKING ) // 64Mbyte (used) ROM, must be externally banked, or different addressing scheme
+CONS( 200?, lxccplan,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init,    "Lexibook", "Lexibook Console Colour - Disney's Planes", MACHINE_NOT_WORKING ) // 64Mbyte (used) ROM, must be externally banked, or different addressing scheme
+
 
 // GB-NO13-Main-VT389-2 on PCBs
-CONS( 2016, rtvgc300,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init, "Lexibook", "Lexibook Retro TV Game Console - 300 Games", MACHINE_NOT_WORKING )  // 64Mbyte ROM, must be externally banked, or different addressing scheme
-CONS( 2017, rtvgc300fz,0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init, "Lexibook", "Lexibook Retro TV Game Console - Frozen - 300 Games", MACHINE_NOT_WORKING )  // 64Mbyte ROM, must be externally banked, or different addressing scheme
+CONS( 2016, rtvgc300,  0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init,    "Lexibook", "Lexibook Retro TV Game Console - 300 Games", MACHINE_NOT_WORKING )  // 64Mbyte ROM, must be externally banked, or different addressing scheme
+CONS( 2017, rtvgc300fz,0,  0,  nes_vt_cy_bigger, nes_vt, nes_vt_cy_lexibook_state, empty_init,    "Lexibook", "Lexibook Retro TV Game Console - Frozen - 300 Games", MACHINE_NOT_WORKING )  // 64Mbyte ROM, must be externally banked, or different addressing scheme
 
 
 /* The following are also confirmed to be NES/VT derived units, most having a standard set of games with a handful of lazy graphic mods thrown in to fit the unit theme
 
     (handhekd units, use standard AAA batteries)
     Lexibook Compact Cyber Arcade - Cars
-    Lexibook Compact Cyber Arcade - Paw Patrol
     Lexibook Compact Cyber Arcade - Barbie
     Lexibook Compact Cyber Arcade - Finding Dory
-    Lexibook Compact Cyber Arcade - Marvel Ultimate Spiderman
     Lexibook Compact Cyber Arcade - PJ Masks
 
     (Handheld units, but different form factor to Compact Cyber Arcade, charged via USB)
-    Lexibook Console Colour - Minnie Mouse
-    Lexibook Console Colour - Disney's Planes
     Lexibook Console Colour - Barbie
 
     (units for use with TV)
@@ -2041,6 +2117,13 @@
     Lexibook Retro TV Game Console (300 Games) - PJ Masks
 
     (more?)
+
+    There are also updated 'Compact Cyber Arcade' branded units with a large + D-pad and internal battery / USB charger for
+    Spiderman
+    Frozen
+    (generic)
+    it isn't verified if these use the same ROMs as the original Compact Cyber Arcade releases, or if the software has been updated
+
 */
 
 // intial code isn't valid? scrambled?
@@ -2057,6 +2140,8 @@
 // die is marked as VH2009, as above, but no scrambled opcodes here
 CONS( 201?, techni4,   0,  0,  nes_vt_pal_2mb,      nes_vt, nes_vt_state,        empty_init, "Technigame", "Technigame Super 4-in-1 Sports (PAL)", MACHINE_IMPERFECT_GRAPHICS )
 
+ // seems to use PCM for all sound, some garbage at bottom of screen, needs correct inputs (seems to respond to start, and any direction input for 'hit' - check if they're power related)
+CONS( 200?, protpp,   0,  0,  nes_vt_vh2009_1mb,      nes_vt, nes_vt_swap_op_d5_d6_state,        init_protpp, "Protocol", "Virtual Ping Pong (Protocol)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 
 // same encryption as above, but seems like newer hardware (or the above aren't using most of the features)
 CONS( 200?, lpgm240,    0,  0,  nes_vt_vh2009_8mb,        nes_vt, nes_vt_swap_op_d5_d6_state, empty_init, "<unknown>", "Let's Play! Game Machine 240 in 1", MACHINE_NOT_WORKING ) // mini 'retro-arcade' style cabinet
@@ -2169,3 +2254,4 @@
 // Use DIP switch to select console or cartridge, as cartridge is fake and just toggles a GPIO
 CONS( 2016, fcpocket,  0,  0,  nes_vt_fp_4x16mb,   nes_vt_fp, nes_vt_hh_state, empty_init, "<unknown>",   "FC Pocket 600 in 1", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )  // has external banking (2x 32mbyte banks)
 
+CONS( 200?, zonefusn,  0,         0,  nes_vt_fp_16mb,     nes_vt, nes_vt_hh_state, empty_init, "Ultimate Products / Jungle's Soft", "Zone Fusion",  MACHINE_NOT_WORKING )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/news_38xx.cpp mame-0.224+dfsg.1/src/mame/drivers/news_38xx.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/news_38xx.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/news_38xx.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,473 @@
+// license:BSD-3-Clause
+// copyright-holders:Patrick Mackinlay
+
+/*
+ * Sony NEWS NWS-38xx.
+ *
+ * Sources:
+ *
+ * TODO:
+ *   - r3000 cpu
+ *   - misc control registers and leds
+ *   - slots/graphics
+ *   - sound
+ *   - centronics
+ */
+
+#include "emu.h"
+
+#include "cpu/mips/mips1.h"
+#include "cpu/m68000/m68000.h"
+
+// memory
+#include "machine/ram.h"
+
+// various hardware
+#include "machine/msm6242.h"
+#include "machine/z80scc.h"
+#include "machine/am79c90.h"
+#include "machine/upd765.h"
+#include "machine/dmac_0266.h"
+#include "machine/news_hid.h"
+#include "machine/ncr5380n.h"
+
+// video
+#include "screen.h"
+
+// busses and connectors
+#include "machine/nscsi_bus.h"
+#include "bus/nscsi/cd.h"
+#include "bus/nscsi/hd.h"
+#include "bus/rs232/rs232.h"
+
+#include "machine/input_merger.h"
+#include "imagedev/floppy.h"
+#include "formats/pc_dsk.h"
+
+#include "debugger.h"
+
+#define VERBOSE 1
+#include "logmacro.h"
+
+class news_38xx_state : public driver_device
+{
+public:
+	news_38xx_state(machine_config const &mconfig, device_type type, char const *tag)
+		: driver_device(mconfig, type, tag)
+//      , m_cpu(*this, "cpu")
+		, m_iop(*this, "iop")
+		, m_ram(*this, "ram")
+		, m_dma(*this, "dma%u", 0U)
+		, m_rtc(*this, "rtc")
+		, m_scc(*this, "scc")
+		, m_net(*this, "net")
+		, m_fdc(*this, "fdc")
+		, m_hid(*this, "hid")
+		, m_scsi(*this, "scsi%u:7:cxd1180", 0U)
+		, m_serial(*this, "serial%u", 0U)
+		, m_scsibus(*this, "scsi%u", 0U)
+		, m_serial_irq(*this, "serial_irq")
+		, m_floppy_irq(*this, "floppy_irq")
+		, m_eprom(*this, "eprom")
+//      , m_vram(*this, "vram")
+//      , m_led(*this, "led%u", 0U)
+	{
+	}
+
+protected:
+	// driver_device overrides
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
+	// address maps
+	void cpu_map(address_map &map);
+	void iop_map(address_map &map);
+	void iop_vector_map(address_map &map);
+
+	// machine config
+	void common(machine_config &config);
+
+public:
+	void nws3860(machine_config &config);
+
+	void init_common();
+
+protected:
+	u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, rectangle const &cliprect);
+
+	u8 intst_r() { return m_intst; }
+
+	enum irq_number : unsigned
+	{
+		SLOT   = 0,
+		CENTRO = 1,
+		FDC    = 2,
+		LANCE  = 3,
+		IPC    = 4,
+		SCSI1  = 5,
+		SCSI0  = 6,
+		PERR   = 7,
+	};
+	template <irq_number Number> void irq_w(int state);
+	void int_check();
+
+	u32 bus_error_r();
+	void timer_w(u8 data);
+	void timer(void *ptr, s32 param);
+
+	DECLARE_FLOPPY_FORMATS(floppy_formats);
+
+	// devices
+//  required_device<r3000a_device> m_cpu;
+	required_device<m68030_device> m_iop;
+	required_device<ram_device> m_ram;
+	required_device_array<dmac_0266_device, 2> m_dma;
+	required_device<rtc62421_device> m_rtc;
+	required_device<z80scc_device> m_scc;
+	required_device<am7990_device> m_net;
+	required_device<n82077aa_device> m_fdc;
+
+	required_device<news_hid_hle_device> m_hid;
+	required_device_array<cxd1180_device, 2> m_scsi;
+
+	required_device_array<rs232_port_device, 2> m_serial;
+	required_device_array<nscsi_bus_device, 2> m_scsibus;
+
+	required_device<input_merger_device> m_serial_irq;
+	required_device<input_merger_device> m_floppy_irq;
+
+	required_region_ptr<u32> m_eprom;
+	//required_shared_ptr<u32> m_vram;
+	//output_finder<4> m_led;
+
+	std::unique_ptr<u16[]> m_net_ram;
+
+	emu_timer *m_timer;
+
+	u8 m_intst;
+	u8 m_inten;
+
+	bool m_int_state[3];
+	bool m_scc_irq_state;
+};
+
+FLOPPY_FORMATS_MEMBER(news_38xx_state::floppy_formats)
+	FLOPPY_PC_FORMAT
+FLOPPY_FORMATS_END
+
+void news_38xx_state::machine_start()
+{
+	//m_led.resolve();
+
+	m_net_ram = std::make_unique<u16[]>(8192);
+
+	save_pointer(NAME(m_net_ram), 8192);
+
+	save_item(NAME(m_intst));
+	save_item(NAME(m_inten));
+	save_item(NAME(m_int_state));
+
+	m_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(news_38xx_state::timer), this));
+
+	m_intst = 0;
+	m_inten = 0x6d;
+	for (bool &int_state : m_int_state)
+		int_state = false;
+	m_scc_irq_state = false;
+}
+
+void news_38xx_state::machine_reset()
+{
+	// eprom is mapped at 0 after reset
+	m_iop->space(0).install_rom(0x00000000, 0x0000ffff, m_eprom);
+
+	m_timer->adjust(attotime::from_hz(100), 0, attotime::from_hz(100));
+}
+
+void news_38xx_state::init_common()
+{
+	// HACK: hardwire the rate
+	m_fdc->set_rate(500000);
+}
+
+void news_38xx_state::cpu_map(address_map &map)
+{
+}
+
+void news_38xx_state::iop_map(address_map &map)
+{
+	map(0xd8000000, 0xd803ffff).ram(); // iop ram
+
+	map(0xe0000000, 0xe000ffff).rom().region("eprom", 0);
+
+	map(0xe2000000, 0xe2000007).nopw(); // ignore for now
+	// 0xe2000000 // power control
+	map(0xe2000001, 0xe2000001).lw8([this](u8 data) { m_iop->space(0).install_ram(0x00000000, m_ram->mask(), 0xc0000000, m_ram->pointer()); }, "ram_enable");
+	map(0xe2000002, 0xe2000002).lw8([this](u8 data) { m_inten |= 0x80; }, "pie_w");
+	map(0xe2000003, 0xe2000003).w(FUNC(news_38xx_state::timer_w));
+	// 0xe2000004 // soft interrupt
+	// 0xe2000005 // ast interrupt
+	// 0xe2000006 // led 0
+	// 0xe2000007 // led 1
+
+	map(0xe3000000, 0xe3000000).r(FUNC(news_38xx_state::intst_r));
+	// 0xe3800000 // inter-processor interrupt
+
+	map(0xe4000000, 0xe4000007).m(m_fdc, FUNC(n82077aa_device::map));
+	// 0xe4000105 // fdc psuedo-dma port
+
+	// 0xe6040000 // centronics
+	map(0xe6040003, 0xe6040003).lw8([this](u8 data) { m_inten |= 0x02; }, "cie_w");
+	map(0xe6080000, 0xe6080007).m(m_scsi[0], FUNC(cxd1180_device::map));
+	map(0xe60c0000, 0xe60c0007).m(m_scsi[1], FUNC(cxd1180_device::map));
+
+	map(0xe6100000, 0xe6100007).m(m_hid, FUNC(news_hid_hle_device::map_68k));
+	map(0xe6140000, 0xe6140003).rw(m_scc, FUNC(z80scc_device::ab_dc_r), FUNC(z80scc_device::ab_dc_w));
+	map(0xe6180000, 0xe618000f).rw(m_rtc, FUNC(rtc62421_device::read), FUNC(rtc62421_device::write));
+	// 0xe61c0000 // beep frequency
+
+	map(0xe6200000, 0xe6203fff).lrw16(
+		[this](offs_t offset) { return m_net_ram[offset]; }, "net_ram_r",
+		[this](offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_net_ram[offset]); }, "net_ram_w");
+	// 0xe62c0000 // audio
+
+	map(0xe6300000, 0xe6300003).rw(m_net, FUNC(am7990_device::regs_r), FUNC(am7990_device::regs_w));
+	// 0xe6340000 // park
+	// 0xe6380000 // divide fdd index pulse?
+
+	map(0xe8000000, 0xe8000017).m(m_dma[0], FUNC(dmac_0266_device::map));
+	map(0xea000000, 0xea000017).m(m_dma[1], FUNC(dmac_0266_device::map));
+
+	map(0xec000000, 0xec0000ff).rom().region("idrom", 0);
+	map(0xec000100, 0xec000103).portr("SW1");
+
+	map(0xee000000, 0xeeffffff).r(FUNC(news_38xx_state::bus_error_r));
+}
+
+void news_38xx_state::iop_vector_map(address_map &map)
+{
+	map(0xfffffff3, 0xfffffff3).lr8(NAME([]() { return m68000_base_device::autovector(1); }));
+	map(0xfffffff5, 0xfffffff5).lr8(NAME([]() { return m68000_base_device::autovector(2); }));
+	map(0xfffffff7, 0xfffffff7).lr8(NAME([]() { return m68000_base_device::autovector(3); }));
+	map(0xfffffff9, 0xfffffff9).lr8(NAME([]() { return m68000_base_device::autovector(4); }));
+	map(0xfffffffb, 0xfffffffb).lr8(NAME([this]() { return m_scc_irq_state ? m_scc->m1_r() : m68000_base_device::autovector(5); }));
+	map(0xfffffffd, 0xfffffffd).lr8(NAME([]() { return m68000_base_device::autovector(6); }));
+	map(0xffffffff, 0xffffffff).lr8(NAME([]() { return m68000_base_device::autovector(7); }));
+}
+
+template <news_38xx_state::irq_number Number> void news_38xx_state::irq_w(int state)
+{
+	LOG("irq number %d state %d\n",  Number, state);
+
+	if (state)
+		m_intst |= 1U << Number;
+	else
+		m_intst &= ~(1U << Number);
+
+	int_check();
+}
+
+void news_38xx_state::int_check()
+{
+	// TODO: assume 74444333
+	static int const int_line[] = { INPUT_LINE_IRQ7, INPUT_LINE_IRQ4, INPUT_LINE_IRQ3 };
+	static u8 const int_mask[] = { 0x80, 0x78, 0x07 };
+
+	for (unsigned i = 0; i < ARRAY_LENGTH(m_int_state); i++)
+	{
+		bool const int_state = m_intst & m_inten & int_mask[i];
+
+		if (m_int_state[i] != int_state)
+		{
+			m_int_state[i] = int_state;
+			m_iop->set_input_line(int_line[i], int_state);
+		}
+	}
+}
+
+u32 news_38xx_state::bus_error_r()
+{
+	if (!machine().side_effects_disabled())
+		m_iop->set_input_line(M68K_LINE_BUSERROR, ASSERT_LINE);
+
+	return 0;
+}
+
+void news_38xx_state::timer_w(u8 data)
+{
+	LOG("timer_w 0x%02x\n", data);
+
+	m_timer->set_param(data);
+
+	if (!data)
+		m_iop->set_input_line(INPUT_LINE_IRQ6, CLEAR_LINE);
+}
+
+void news_38xx_state::timer(void *ptr, s32 param)
+{
+	if (param)
+		m_iop->set_input_line(INPUT_LINE_IRQ6, ASSERT_LINE);
+}
+
+static void news_scsi_devices(device_slot_interface &device)
+{
+	device.option_add("harddisk", NSCSI_HARDDISK);
+	device.option_add("cdrom", NSCSI_CDROM);
+}
+
+void news_38xx_state::common(machine_config &config)
+{
+	//R3000A(config, m_cpu, 25_MHz_XTAL, 32768, 32768);
+	//m_cpu->set_addrmap(AS_PROGRAM, &news_38xx_state::cpu_map);
+	//m_cpu->set_fpu(mips1_device_base::MIPS_R3010Av4);
+
+	M68030(config, m_iop, 50_MHz_XTAL / 2);
+	m_iop->set_addrmap(AS_PROGRAM, &news_38xx_state::iop_map);
+	m_iop->set_addrmap(m68000_base_device::AS_CPU_SPACE, &news_38xx_state::iop_vector_map);
+
+	RAM(config, m_ram);
+	m_ram->set_default_size("16M");
+	// TODO: confirm each bank supports 4x1M or 4x4M
+	//m_ram->set_extra_options("4M,8M,12M,20M,24M,32M,36M,48M");
+
+	RTC62421(config, m_rtc, 32.768_kHz_XTAL);
+
+	DMAC_0266(config, m_dma[0], 0);
+	m_dma[0]->set_bus(m_iop, 0);
+
+	DMAC_0266(config, m_dma[1], 0);
+	m_dma[1]->set_bus(m_iop, 0);
+
+	INPUT_MERGER_ANY_HIGH(config, m_serial_irq);
+	m_serial_irq->output_handler().set_inputline(m_iop, INPUT_LINE_IRQ5);
+
+	SCC85C30(config, m_scc, 4.9152_MHz_XTAL);
+	m_scc->out_int_callback().set(
+		[this](int state)
+		{
+			m_scc_irq_state = bool(state);
+			m_serial_irq->in_w<2>(state);
+		});
+
+	// scc channel A
+	RS232_PORT(config, m_serial[0], default_rs232_devices, "terminal");
+	m_serial[0]->cts_handler().set(m_scc, FUNC(z80scc_device::ctsa_w));
+	m_serial[0]->dcd_handler().set(m_scc, FUNC(z80scc_device::dcda_w));
+	m_serial[0]->rxd_handler().set(m_scc, FUNC(z80scc_device::rxa_w));
+	m_scc->out_rtsa_callback().set(m_serial[0], FUNC(rs232_port_device::write_rts));
+	m_scc->out_txda_callback().set(m_serial[0], FUNC(rs232_port_device::write_txd));
+
+	// scc channel B
+	RS232_PORT(config, m_serial[1], default_rs232_devices, nullptr);
+	m_serial[1]->cts_handler().set(m_scc, FUNC(z80scc_device::ctsb_w));
+	m_serial[1]->dcd_handler().set(m_scc, FUNC(z80scc_device::dcdb_w));
+	m_serial[1]->rxd_handler().set(m_scc, FUNC(z80scc_device::rxb_w));
+	m_scc->out_rtsb_callback().set(m_serial[1], FUNC(rs232_port_device::write_rts));
+	m_scc->out_txdb_callback().set(m_serial[1], FUNC(rs232_port_device::write_txd));
+
+	AM7990(config, m_net);
+	m_net->intr_out().set(FUNC(news_38xx_state::irq_w<LANCE>)).invert();
+	m_net->dma_in().set([this](offs_t offset) { return m_net_ram[offset >> 1]; });
+	m_net->dma_out().set([this](offs_t offset, u16 data, u16 mem_mask) { COMBINE_DATA(&m_net_ram[offset >> 1]); });
+
+	INPUT_MERGER_ANY_HIGH(config, m_floppy_irq);
+	m_floppy_irq->output_handler().set(FUNC(news_38xx_state::irq_w<FDC>));
+
+	N82077AA(config, m_fdc, 16_MHz_XTAL);
+	m_fdc->intrq_wr_callback().set(m_floppy_irq, FUNC(input_merger_any_high_device::in_w<0>));
+	m_fdc->drq_wr_callback().set(m_floppy_irq, FUNC(input_merger_any_high_device::in_w<1>));
+	FLOPPY_CONNECTOR(config, "fdc:0", "35hd", FLOPPY_35_HD, true, floppy_formats).enable_sound(false);
+
+	// scsi bus 0 and devices
+	NSCSI_BUS(config, m_scsibus[0]);
+	NSCSI_CONNECTOR(config, "scsi0:0", news_scsi_devices, "harddisk");
+	NSCSI_CONNECTOR(config, "scsi0:1", news_scsi_devices, nullptr);
+	NSCSI_CONNECTOR(config, "scsi0:2", news_scsi_devices, nullptr);
+	NSCSI_CONNECTOR(config, "scsi0:3", news_scsi_devices, nullptr);
+	NSCSI_CONNECTOR(config, "scsi0:4", news_scsi_devices, nullptr);
+	NSCSI_CONNECTOR(config, "scsi0:5", news_scsi_devices, nullptr);
+	NSCSI_CONNECTOR(config, "scsi0:6", news_scsi_devices, nullptr);
+
+	// scsi bus 0 host adapter
+	NSCSI_CONNECTOR(config, "scsi0:7").option_set("cxd1180", CXD1180).machine_config(
+		[this](device_t *device)
+		{
+			cxd1180_device &adapter = downcast<cxd1180_device &>(*device);
+
+			adapter.irq_handler().set(*this, FUNC(news_38xx_state::irq_w<SCSI0>));
+			adapter.drq_handler().set(m_dma[0], FUNC(dmac_0266_device::drq_w));
+
+			//subdevice<dmac_0266_device>(":dma0")->out_eop_cb().set(adapter, FUNC(cxd1180_device::eop_w));
+			subdevice<dmac_0266_device>(":dma0")->dma_r_cb().set(adapter, FUNC(cxd1180_device::dma_r));
+			subdevice<dmac_0266_device>(":dma0")->dma_w_cb().set(adapter, FUNC(cxd1180_device::dma_w));
+		});
+
+	// scsi bus 1 and devices
+	NSCSI_BUS(config, m_scsibus[1]);
+	NSCSI_CONNECTOR(config, "scsi1:0", news_scsi_devices, "harddisk");
+	NSCSI_CONNECTOR(config, "scsi1:1", news_scsi_devices, nullptr);
+	NSCSI_CONNECTOR(config, "scsi1:2", news_scsi_devices, nullptr);
+	NSCSI_CONNECTOR(config, "scsi1:3", news_scsi_devices, nullptr);
+	NSCSI_CONNECTOR(config, "scsi1:4", news_scsi_devices, nullptr);
+	NSCSI_CONNECTOR(config, "scsi1:5", news_scsi_devices, nullptr);
+	NSCSI_CONNECTOR(config, "scsi1:6", news_scsi_devices, nullptr);
+
+	// scsi bus 1 host adapter
+	NSCSI_CONNECTOR(config, "scsi1:7").option_set("cxd1180", CXD1180).machine_config(
+		[this](device_t *device)
+		{
+			cxd1180_device &adapter = downcast<cxd1180_device &>(*device);
+
+			adapter.irq_handler().set(*this, FUNC(news_38xx_state::irq_w<SCSI1>));
+			adapter.drq_handler().set(m_dma[1], FUNC(dmac_0266_device::drq_w));
+
+			//subdevice<dmac_0266_device>(":dma1")->out_eop_cb().set(adapter, FUNC(cxd1180_device::eop_w));
+			subdevice<dmac_0266_device>(":dma1")->dma_r_cb().set(adapter, FUNC(cxd1180_device::dma_r));
+			subdevice<dmac_0266_device>(":dma1")->dma_w_cb().set(adapter, FUNC(cxd1180_device::dma_w));
+		});
+
+	NEWS_HID_HLE(config, m_hid);
+	m_hid->irq_out<news_hid_hle_device::KEYBOARD>().set(m_serial_irq, FUNC(input_merger_device::in_w<0>));
+	m_hid->irq_out<news_hid_hle_device::MOUSE>().set(m_serial_irq, FUNC(input_merger_device::in_w<1>));
+}
+
+void news_38xx_state::nws3860(machine_config &config)
+{
+	common(config);
+}
+
+ROM_START(nws3860)
+	ROM_REGION32_BE(0x10000, "eprom", 0)
+	ROM_SYSTEM_BIOS(0, "nws3860", "NWS-3860 v1.6")
+	ROMX_LOAD("mpu_10__ver.1.6__1990_sony.ic159", 0x00000, 0x10000, CRC(542e21b8) SHA1(631dca1f3446761973073f5c32c1a0aeba538c2c), ROM_BIOS(0))
+
+	ROM_REGION32_BE(0x100, "idrom", 0)
+	ROM_LOAD("idrom.bin", 0x000, 0x100, CRC(a2b9e968) SHA1(09c7d253c7ed0b368c49f4b60bfe5ca76acd7cc3) BAD_DUMP)
+ROM_END
+
+static INPUT_PORTS_START(nws3860)
+	PORT_START("SW1")
+	PORT_DIPNAME(0x07000000, 0x07000000, "Display") PORT_DIPLOCATION("SW1:1,2,3")
+	PORT_DIPSETTING(0x07000000, "Console")
+	PORT_DIPSETTING(0x06000000, "NWB-512")
+	PORT_DIPSETTING(0x03000000, "NWB-225A")
+	PORT_DIPSETTING(0x00000000, "Autoselect")
+
+	PORT_DIPNAME(0x08000000, 0x08000000, "Boot Device") PORT_DIPLOCATION("SW1:4")
+	PORT_DIPSETTING(0x08000000, "SCSI")
+	PORT_DIPSETTING(0x00000000, "Floppy")
+
+	PORT_DIPNAME(0x10000000, 0x10000000, "Automatic Boot") PORT_DIPLOCATION("SW1:5")
+	PORT_DIPSETTING(0x10000000, DEF_STR(Off))
+	PORT_DIPSETTING(0x00000000, DEF_STR(On))
+
+	PORT_DIPNAME(0x20000000, 0x20000000, "Diagnostic Mode") PORT_DIPLOCATION("SW1:6")
+	PORT_DIPSETTING(0x20000000, DEF_STR(Off))
+	PORT_DIPSETTING(0x00000000, DEF_STR(On))
+
+	PORT_DIPNAME(0xc0000000, 0xc0000000, "Unused") PORT_DIPLOCATION("SW1:7,8")
+	PORT_DIPSETTING(0xc0000000, DEF_STR(Off))
+INPUT_PORTS_END
+
+/*   YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS            INIT         COMPANY  FULLNAME    FLAGS */
+COMP(1989, nws3860, 0,      0,      nws3860, nws3860, news_38xx_state, init_common, "Sony",  "NWS-3860", MACHINE_IS_SKELETON)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/nmk16.cpp mame-0.224+dfsg.1/src/mame/drivers/nmk16.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/nmk16.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/nmk16.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4113,13 +4113,14 @@
 	const int IRQ1_SCANLINE = 25; // guess
 	const int VBIN_SCANLINE = 0;
 	const int VBOUT_SCANLINE = 240;
+	const int SPRDMA_SCANLINE = 241; // 256 USEC after VBOUT
 
 	int scanline = param;
 
 	if (scanline == VBOUT_SCANLINE) // vblank-out irq
 	{
 		m_maincpu->set_input_line(4, HOLD_LINE);
-		m_dma_timer->adjust(attotime::from_usec(256)); // 256 USEC after VBOUT
+		m_dma_timer->adjust(m_screen->time_until_pos(SPRDMA_SCANLINE)/*attotime::from_usec(256)*/);
 	}
 
 	/* Vblank-in irq, Vandyke definitely relies that irq fires at scanline ~0 instead of 112 (as per previous
@@ -6057,7 +6058,7 @@
 |SBS-G_03.IC194                                                    10MHz  |
 |-------------------------------------------------------------------------|
 Notes:
-      680000 @ 10.0MHz
+      68000 @ 10.0MHz
       YM2203 @ 1.5MHz [12/8]
       M6295 @ 4.0MHz [12/3], pin 7 HIGH
       VSync 60Hz
@@ -8567,7 +8568,7 @@
 // a 1992 version of Gunnail exists, see https://www.youtube.com/watch?v=tf15Wz0zUiA  3:10; is this bootleg version 'gunnailb'?
 
 GAME( 1993, macross2,   0,        macross2,     macross2,     nmk16_state, init_banked_audiocpu, ROT0,   "Banpresto",                    "Super Spacefortress Macross II / Chou-Jikuu Yousai Macross II", MACHINE_NO_COCKTAIL )
-GAME( 1993, macross2g,  macross2, macross2,     macross2,     nmk16_state, init_banked_audiocpu, ROT0,   "Banpresto",                    "Super Spacefortress Macross II / Chou-Jikuu Yousai Macross II (GAMEST review build)", MACHINE_NO_COCKTAIL ) // Service switch pauses game
+GAME( 1993, macross2g,  macross2, macross2,     macross2,     nmk16_state, init_banked_audiocpu, ROT0,   "Banpresto",                    "Super Spacefortress Macross II / Chou-Jikuu Yousai Macross II (Gamest review build)", MACHINE_NO_COCKTAIL ) // Service switch pauses game
 GAME( 1993, macross2k,  macross2, macross2,     macross2,     nmk16_state, init_banked_audiocpu, ROT0,   "Banpresto",                    "Macross II (Korea)", MACHINE_NO_COCKTAIL ) // Title screen only shows Macross II
 
 GAME( 1993, tdragon2,   0,        tdragon2,     tdragon2,     nmk16_state, init_banked_audiocpu, ROT270, "NMK",                          "Thunder Dragon 2 (9th Nov. 1993)", MACHINE_NO_COCKTAIL )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/novag_const.cpp mame-0.224+dfsg.1/src/mame/drivers/novag_const.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/novag_const.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/novag_const.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -41,7 +41,10 @@
 - MOS MPS6502A @ 2MHz
 - 1KB battery-backed RAM (2*TC5514AP-3)
 - 8KB ROM (TMM2364P)
-- 2 ROM sockets unpopulated
+- 2 ROM sockets for expansion (blue @ u6, white @ u5)
+
+Known Super Sensor IV expansion ROMs:
+- Quartz Chess Clock (came with the clock accessory)
 
 Sensor Dynamic's ROM is identical to Super Sensor IV "1I", the hardware is
 basically a low-budget version of it with peripheral ports removed.
@@ -58,6 +61,7 @@
 ******************************************************************************/
 
 #include "emu.h"
+
 #include "cpu/m6502/m6502.h"
 #include "cpu/m6502/m65sc02.h"
 #include "cpu/m6502/r65c02.h"
@@ -66,6 +70,10 @@
 #include "machine/timer.h"
 #include "sound/beep.h"
 #include "video/pwm.h"
+#include "bus/generic/slot.h"
+#include "bus/generic/carts.h"
+
+#include "softlist.h"
 #include "speaker.h"
 
 // internal artwork
@@ -226,9 +234,12 @@
 void const_state::ssensor4_map(address_map &map)
 {
 	map(0x0000, 0x03ff).ram().share("nvram");
+	map(0x2000, 0x2000).nopw(); // accessory?
+	map(0x4000, 0x4000).nopw(); // "
 	map(0x6000, 0x6000).rw(FUNC(const_state::input2_r), FUNC(const_state::mux_w));
 	map(0x8000, 0x8000).rw(FUNC(const_state::input1_r), FUNC(const_state::control_w));
-	map(0xa000, 0xffff).rom();
+	map(0xc000, 0xdfff).r("exrom", FUNC(generic_slot_device::read_rom));
+	map(0xe000, 0xffff).rom();
 }
 
 void const_state::const_map(address_map &map)
@@ -242,8 +253,8 @@
 void const_state::sconst_map(address_map &map)
 {
 	map(0x0000, 0x0fff).ram().share("nvram");
-	map(0x1c00, 0x1c00).nopw(); // printer/clock?
-	map(0x1d00, 0x1d00).nopw(); // printer/clock?
+	map(0x1c00, 0x1c00).nopw(); // accessory?
+	map(0x1d00, 0x1d00).nopw(); // "
 	map(0x1e00, 0x1e00).rw(FUNC(const_state::input2_r), FUNC(const_state::mux_w));
 	map(0x1f00, 0x1f00).rw(FUNC(const_state::input1_r), FUNC(const_state::control_w));
 	map(0x2000, 0xffff).rom();
@@ -380,6 +391,10 @@
 	m_board->set_nvram_enable(true);
 
 	config.set_default_layout(layout_novag_ssensor4);
+
+	/* expansion */
+	GENERIC_CARTSLOT(config, "exrom", generic_plain_slot, "novag_ssensor4");
+	SOFTWARE_LIST(config, "cart_list").set_original("novag_ssensor4");
 }
 
 void const_state::nconst36(machine_config &config)
@@ -460,7 +475,7 @@
 ******************************************************************************/
 
 ROM_START( ssensor4 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
+	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD("5611_1i_orange.u4", 0xe000, 0x2000, CRC(f4ee99d1) SHA1(f44144a26b92c51f4350da85858470e6c3b66fc1) ) // TMM2364P
 ROM_END
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/novag_micro2.cpp mame-0.224+dfsg.1/src/mame/drivers/novag_micro2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/novag_micro2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/novag_micro2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,18 +7,18 @@
 
 This program was used in several Novag chesscomputers:
 - Novag Micro II (1st use)
+- Novag Micro III
 - Novag Presto
 - Novag Octo
 
 suspected, to be confirmed:
-- Novag Micro III
 - Novag Allegro
 - Novag Piccolo
 - Novag Alto
 
 Hardware notes:
 
-Micro II:
+Micro II, Micro III(same pcb):
 - Mitsubishi M5L8049-079P-6, 6MHz XTAL
 - buzzer, 20 leds, 8*8 chessboard buttons
 
@@ -31,7 +31,7 @@
 - speaker circuit is a bit different, not sure why
 
 Note that even though the MCUs are different, internal ROM contents is
-identical for Micro II, Presto, Octo.
+identical for Micro II/III, Presto, Octo.
 
 TODO:
 - controls are too sensitive, is there a bug in the CPU core timer emulation?
@@ -84,7 +84,7 @@
 	required_device<mcs48_cpu_device> m_maincpu;
 	required_device<pwm_display_device> m_display;
 	required_device<sensorboard_device> m_board;
-	optional_device<dac_bit_interface> m_dac;
+	required_device<dac_bit_interface> m_dac;
 	required_ioport m_inputs;
 
 	// I/O handlers
@@ -222,7 +222,7 @@
 
 ROM_START( nmicro2 )
 	ROM_REGION( 0x0800, "maincpu", 0 )
-	ROM_LOAD("8049_8210", 0x0000, 0x0800, CRC(29a0eb4c) SHA1(e058d6018e53ddcaa3b5ec25b33b8bff091b04db) )
+	ROM_LOAD("8049_8210.u1", 0x0000, 0x0800, CRC(29a0eb4c) SHA1(e058d6018e53ddcaa3b5ec25b33b8bff091b04db) )
 ROM_END
 
 } // anonymous namespace
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/novag_micro.cpp mame-0.224+dfsg.1/src/mame/drivers/novag_micro.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/novag_micro.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/novag_micro.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,247 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+// thanks-to:Berger
+/******************************************************************************
+
+Novag Micro Chess
+
+It's a portable chesscomputer with sensory board. The MCU says "(C) CAL R & O3",
+though the program is supposedly by David Kittinger?
+
+Hardware notes:
+- Mostek 3875/42 (4KB ROM, 64 bytes extra RAM)
+- buzzer, button sensors chessboard, 16+4 leds
+
+MCU interrupts are unused. MCU embedded extra RAM is battery-backed via MEM
+switch tied to pin #4 (VSB: RAM standby power).
+
+******************************************************************************/
+
+#include "emu.h"
+
+#include "cpu/f8/f8.h"
+#include "machine/f3853.h"
+#include "machine/sensorboard.h"
+#include "machine/nvram.h"
+#include "sound/dac.h"
+#include "sound/volt_reg.h"
+#include "video/pwm.h"
+
+#include "speaker.h"
+
+// internal artwork
+#include "novag_micro.lh" // clickable
+
+
+namespace {
+
+class micro_state : public driver_device
+{
+public:
+	micro_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu"),
+		m_display(*this, "display"),
+		m_board(*this, "board"),
+		m_dac(*this, "dac"),
+		m_inputs(*this, "IN.0")
+	{ }
+
+	void micro(machine_config &config);
+
+protected:
+	virtual void machine_start() override;
+
+private:
+	// devices/pointers
+	required_device<cpu_device> m_maincpu;
+	required_device<pwm_display_device> m_display;
+	required_device<sensorboard_device> m_board;
+	required_device<dac_bit_interface> m_dac;
+	required_ioport m_inputs;
+
+	// address maps
+	void main_map(address_map &map);
+	void main_io(address_map &map);
+
+	// I/O handlers
+	void update_display();
+	void input_w(u8 data);
+	u8 input_r();
+	void control_w(u8 data);
+	u8 control_r();
+	void led_w(u8 data);
+
+	u8 m_led_data = 0;
+	u8 m_control = 0;
+	u8 m_inp_mux = 0;
+};
+
+void micro_state::machine_start()
+{
+	// register for savestates
+	save_item(NAME(m_led_data));
+	save_item(NAME(m_control));
+	save_item(NAME(m_inp_mux));
+}
+
+
+
+/******************************************************************************
+    I/O
+******************************************************************************/
+
+void micro_state::update_display()
+{
+	u8 sel = (m_control << 2 & 0x3c) | (m_led_data >> 6 & 3);
+	m_display->matrix(sel, m_led_data & 0x3f);
+}
+
+void micro_state::input_w(u8 data)
+{
+	// P00-P01: MK3875 doesn't have these pins
+	// P02-P07: input mux part
+	m_inp_mux = data;
+}
+
+u8 micro_state::input_r()
+{
+	u8 data = 0;
+
+	// P10-P17: multiplexed inputs
+	// read chessboard
+	u8 cb_mux = (m_inp_mux & 0xfc) | (m_control >> 5 & 3);
+	cb_mux = bitswap<8>(cb_mux,4,5,6,7,1,0,3,2);
+
+	for (int i = 0; i < 8; i++)
+		if (BIT(cb_mux, i))
+			data |= bitswap<8>(m_board->read_file(i),4,5,6,7,3,2,1,0);
+
+	// read buttons
+	if (m_control & 0x10)
+		data |= m_inputs->read();
+
+	return data;
+}
+
+void micro_state::control_w(u8 data)
+{
+	// P40: led select part
+	// P41: white led
+	// P42: ?
+	// P43: black led
+	// P44-P46: input mux part
+	m_control = data;
+	update_display();
+
+	// P47: speaker out
+	m_dac->write(BIT(data, 7));
+}
+
+u8 micro_state::control_r()
+{
+	return m_control;
+}
+
+void micro_state::led_w(u8 data)
+{
+	// P50-P55: led data
+	// P56,P57: led select part
+	m_led_data = data;
+	update_display();
+}
+
+
+
+/******************************************************************************
+    Address Maps
+******************************************************************************/
+
+void micro_state::main_map(address_map &map)
+{
+	map.global_mask(0xfff);
+	map(0x0000, 0x0fbf).rom();
+	map(0x0fc0, 0x0fff).ram().share("nvram");
+}
+
+void micro_state::main_io(address_map &map)
+{
+	map(0x00, 0x00).w(FUNC(micro_state::input_w));
+	map(0x01, 0x01).r(FUNC(micro_state::input_r)).nopw();
+	map(0x04, 0x07).rw("psu", FUNC(f38t56_device::read), FUNC(f38t56_device::write));
+}
+
+
+
+/******************************************************************************
+    Input Ports
+******************************************************************************/
+
+static INPUT_PORTS_START( micro )
+	PORT_START("IN.0")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD) PORT_NAME("Level / Bishop")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD) PORT_NAME("Sound / Queen")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_7) PORT_CODE(KEYCODE_7_PAD) PORT_NAME("Take Back / King")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_8_PAD) PORT_NAME("Go")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD) PORT_NAME("B/W")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD) PORT_NAME("Verify / Pawn")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_3) PORT_CODE(KEYCODE_3_PAD) PORT_NAME("Set Up / Rook")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD) PORT_NAME("New Game / Knight")
+INPUT_PORTS_END
+
+
+
+/******************************************************************************
+    Machine Configs
+******************************************************************************/
+
+void micro_state::micro(machine_config &config)
+{
+	// basic machine hardware
+	F8(config, m_maincpu, 4500000/2); // matches video reference
+	m_maincpu->set_addrmap(AS_PROGRAM, &micro_state::main_map);
+	m_maincpu->set_addrmap(AS_IO, &micro_state::main_io);
+
+	f38t56_device &psu(F38T56(config, "psu", 4500000/2));
+	psu.read_a().set(FUNC(micro_state::control_r));
+	psu.write_a().set(FUNC(micro_state::control_w));
+	psu.write_b().set(FUNC(micro_state::led_w));
+
+	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
+
+	SENSORBOARD(config, m_board).set_type(sensorboard_device::BUTTONS);
+	m_board->init_cb().set(m_board, FUNC(sensorboard_device::preset_chess));
+	m_board->set_delay(attotime::from_msec(150));
+	m_board->set_nvram_enable(true);
+
+	// video hardware
+	PWM_DISPLAY(config, m_display).set_size(6, 6);
+	config.set_default_layout(layout_novag_micro);
+
+	// sound hardware
+	SPEAKER(config, "speaker").front_center();
+	DAC_1BIT(config, m_dac).add_route(ALL_OUTPUTS, "speaker", 0.25);
+	VOLTAGE_REGULATOR(config, "vref").add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
+}
+
+
+
+/******************************************************************************
+    ROM Definitions
+******************************************************************************/
+
+ROM_START( nmicro )
+	ROM_REGION( 0x1000, "maincpu", 0 )
+	ROM_LOAD("3875_42_mk17121n", 0x0000, 0x1000, CRC(f21189f7) SHA1(ba346177eaeddc87a03b1103f0299b5bcd4b6c27) )
+ROM_END
+
+} // anonymous namespace
+
+
+
+/******************************************************************************
+    Drivers
+******************************************************************************/
+
+//    YEAR  NAME    PARENT CMP MACHINE  INPUT  STATE        INIT        COMPANY, FULLNAME, FLAGS
+CONS( 1981, nmicro, 0,      0, micro,   micro, micro_state, empty_init, "Novag", "Micro Chess", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/novag_savant.cpp mame-0.224+dfsg.1/src/mame/drivers/novag_savant.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/novag_savant.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/novag_savant.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -231,7 +231,6 @@
 	m_lcd1->lcd_w(BIT(~data, 4));
 
 	// d5-d7: keypad mux
-
 	m_control = data;
 }
 
@@ -373,7 +372,9 @@
 	config.set_perfect_quantum(m_mcu);
 
 	SENSORBOARD(config, m_board).set_type(sensorboard_device::BUTTONS);
+	m_board->set_delay(attotime::from_msec(200));
 	m_board->set_ui_enable(false); // no chesspieces
+	m_board->set_mod_enable(true);
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/novag_sexpert.cpp mame-0.224+dfsg.1/src/mame/drivers/novag_sexpert.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/novag_sexpert.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/novag_sexpert.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -77,6 +77,7 @@
 
 	// machine configs
 	void sexpert(machine_config &config);
+	void sexpertb(machine_config &config);
 
 	void init_sexpert();
 
@@ -169,6 +170,7 @@
 
 	// machine configs
 	void sforte(machine_config &config);
+	void sforteb(machine_config &config);
 
 protected:
 	virtual void machine_start() override;
@@ -407,6 +409,15 @@
 	PORT_CONFSETTING(    0x01, "6MHz" )
 INPUT_PORTS_END
 
+static INPUT_PORTS_START( sexpertb )
+	PORT_INCLUDE( sexpert )
+
+	PORT_MODIFY("FAKE") // default CPU for B/C is W65C802P-6 @ 6MHz
+	PORT_CONFNAME( 0x01, 0x01, "CPU Frequency" ) PORT_CHANGED_MEMBER(DEVICE_SELF, sexpert_state, sexpert_cpu_freq, 0) // factory set
+	PORT_CONFSETTING(    0x00, "5MHz" )
+	PORT_CONFSETTING(    0x01, "6MHz" )
+INPUT_PORTS_END
+
 
 
 /******************************************************************************
@@ -466,6 +477,12 @@
 	m_rs232->dsr_handler().set("acia", FUNC(mos6551_device::write_dsr));
 }
 
+void sexpert_state::sexpertb(machine_config &config)
+{
+	sexpert(config);
+	m_maincpu->set_clock(12_MHz_XTAL/2);
+}
+
 void sforte_state::sforte(machine_config &config)
 {
 	sexpert(config);
@@ -479,6 +496,12 @@
 	config.set_default_layout(layout_novag_sforte);
 }
 
+void sforte_state::sforteb(machine_config &config)
+{
+	sforte(config);
+	m_maincpu->set_clock(12_MHz_XTAL/2);
+}
+
 
 
 /******************************************************************************
@@ -530,37 +553,44 @@
 
 ROM_START( sfortea )
 	ROM_REGION( 0x18000, "maincpu", 0 )
-	ROM_LOAD("sf_lo_609.u3", 0x0000, 0x8000, CRC(88138075) SHA1(bc1f3a2829f7299c81b48202c651cde9b8831157) )
-	ROM_LOAD("sf_hi1_609.u1", 0x8000, 0x8000, CRC(ccd35d09) SHA1(9101cbdecdec00aa4de6d72c96ecdffbcf3359f6) )
-	ROM_LOAD("se_f_hi0_c22.u2", 0x10000, 0x8000, CRC(3e42cf7c) SHA1(b2faa36a127e08e5755167a25ed4a07f12d62957) )
+	ROM_LOAD("sf_lo_609.u13", 0x0000, 0x8000, CRC(88138075) SHA1(bc1f3a2829f7299c81b48202c651cde9b8831157) )
+	ROM_LOAD("sf_hi1_609.u11", 0x8000, 0x8000, CRC(ccd35d09) SHA1(9101cbdecdec00aa4de6d72c96ecdffbcf3359f6) )
+	ROM_LOAD("se_f_hi0_c22.u12", 0x10000, 0x8000, CRC(3e42cf7c) SHA1(b2faa36a127e08e5755167a25ed4a07f12d62957) )
 ROM_END
 
 ROM_START( sfortea1 )
 	ROM_REGION( 0x18000, "maincpu", 0 )
-	ROM_LOAD("sfa_lo_204.u3", 0x0000, 0x8000, CRC(78734bfd) SHA1(b6d8e9efccee6f6d0b0cd257a82162bf8ccec719) )
-	ROM_LOAD("sfa_hi1_204.u1", 0x8000, 0x8000, CRC(e5e84580) SHA1(bae55c3da7b720bf6ccfb450e383c53cebd5e9ef) )
-	ROM_LOAD("sfa_hi0_c22.u2", 0x10000, 0x8000, CRC(3e42cf7c) SHA1(b2faa36a127e08e5755167a25ed4a07f12d62957) )
+	ROM_LOAD("sfa_lo_204.u13", 0x0000, 0x8000, CRC(78734bfd) SHA1(b6d8e9efccee6f6d0b0cd257a82162bf8ccec719) )
+	ROM_LOAD("sfa_hi1_204.u11", 0x8000, 0x8000, CRC(e5e84580) SHA1(bae55c3da7b720bf6ccfb450e383c53cebd5e9ef) )
+	ROM_LOAD("sfa_hi0_c22.u12", 0x10000, 0x8000, CRC(3e42cf7c) SHA1(b2faa36a127e08e5755167a25ed4a07f12d62957) )
 ROM_END
 
 ROM_START( sfortea2 )
 	ROM_REGION( 0x18000, "maincpu", 0 )
-	ROM_LOAD("sfalo.u3", 0x0000, 0x8000, CRC(86e0230a) SHA1(0d6e18a17e636b8c7292c8f331349d361892d1a8) )
-	ROM_LOAD("sfahi.u1", 0x8000, 0x8000, CRC(81c02746) SHA1(0bf68b68ade5a3263bead88da0a8965fc71483c1) )
-	ROM_LOAD("sfabook.u2", 0x10000, 0x8000, CRC(3e42cf7c) SHA1(b2faa36a127e08e5755167a25ed4a07f12d62957) )
+	ROM_LOAD("sfalo.u13", 0x0000, 0x8000, CRC(86e0230a) SHA1(0d6e18a17e636b8c7292c8f331349d361892d1a8) )
+	ROM_LOAD("sfahi.u11", 0x8000, 0x8000, CRC(81c02746) SHA1(0bf68b68ade5a3263bead88da0a8965fc71483c1) )
+	ROM_LOAD("sfabook.u12", 0x10000, 0x8000, CRC(3e42cf7c) SHA1(b2faa36a127e08e5755167a25ed4a07f12d62957) )
 ROM_END
 
 ROM_START( sforteb )
 	ROM_REGION( 0x18000, "maincpu", 0 )
-	ROM_LOAD("forte_b_lo.u3", 0x0000, 0x8000, CRC(48bfe5d6) SHA1(323642686b6d2fb8db2b7d50c6cd431058078ce1) )
-	ROM_LOAD("forte_b_hi1.u1", 0x8000, 0x8000, CRC(9778ca2c) SHA1(d8b88b9768a1a9171c68cbb0892b817d68d78351) )
-	ROM_LOAD("forte_b_hi0.u2", 0x10000, 0x8000, CRC(bb07ad52) SHA1(30cf9005021ab2d7b03facdf2d3588bc94dc68a6) )
+	ROM_LOAD("forte_b_lo.u13", 0x0000, 0x8000, CRC(48bfe5d6) SHA1(323642686b6d2fb8db2b7d50c6cd431058078ce1) )
+	ROM_LOAD("forte_b_hi1.u11", 0x8000, 0x8000, CRC(9778ca2c) SHA1(d8b88b9768a1a9171c68cbb0892b817d68d78351) )
+	ROM_LOAD("forte_b_hi0.u12", 0x10000, 0x8000, CRC(bb07ad52) SHA1(30cf9005021ab2d7b03facdf2d3588bc94dc68a6) )
+ROM_END
+
+ROM_START( sfortec ) // ID = F3.6
+	ROM_REGION( 0x18000, "maincpu", 0 )
+	ROM_LOAD("sfl_124.u13", 0x0000, 0x8000, CRC(c0cba797) SHA1(c630c3552178854a46275c18b0741b0ad1ae3c75) ) // Toshiba TC57256AD-12
+	ROM_LOAD("sfh_b15.u11", 0x8000, 0x8000, CRC(e129ec69) SHA1(76feb0d3110a1c7746233cd89c0b2aaae9d0e427) ) // "
+	ROM_LOAD("sef_b07.u12", 0x10000, 0x8000, CRC(2d085064) SHA1(76162322aa7d23a5c07e8356d0bbbb33816419af) ) // NEC D27C256AD-12
 ROM_END
 
-ROM_START( sfortec ) // ID = F1.2
+ROM_START( sfortec1 ) // ID = F1.2
 	ROM_REGION( 0x18000, "maincpu", 0 )
-	ROM_LOAD("sfl_c_iii.u3", 0x0000, 0x8000, CRC(f040cf30) SHA1(1fc1220b8ed67cdffa3866d230ce001721cf684f) ) // Toshiba TC57256AD-12
-	ROM_LOAD("sfh_c_iii.u1", 0x8000, 0x8000, CRC(0f926b32) SHA1(9c7270ecb3f41dd9172a9a7928e6e04e64b2a340) ) // NEC D27C256AD-12
-	ROM_LOAD("h0_c_c26.u2", 0x10000, 0x8000, CRC(c6a1419a) SHA1(017a0ffa9aa59438c879624a7ddea2071d1524b8) ) // Toshiba TC57256AD-12
+	ROM_LOAD("sfl_c_iii.u13", 0x0000, 0x8000, CRC(f040cf30) SHA1(1fc1220b8ed67cdffa3866d230ce001721cf684f) ) // Toshiba TC57256AD-12
+	ROM_LOAD("sfh_c_iii.u11", 0x8000, 0x8000, CRC(0f926b32) SHA1(9c7270ecb3f41dd9172a9a7928e6e04e64b2a340) ) // NEC D27C256AD-12
+	ROM_LOAD("h0_c_c26.u12", 0x10000, 0x8000, CRC(c6a1419a) SHA1(017a0ffa9aa59438c879624a7ddea2071d1524b8) ) // Toshiba TC57256AD-12
 ROM_END
 
 } // anonymous namespace
@@ -571,16 +601,17 @@
     Drivers
 ******************************************************************************/
 
-//    YEAR  NAME       PARENT   CMP MACHINE  INPUT    STATE          INIT          COMPANY, FULLNAME, FLAGS
-CONS( 1988, sexperta,  0,        0, sexpert, sexpert, sexpert_state, init_sexpert, "Novag", "Super Expert (version A, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // 886
-CONS( 1987, sexperta1, sexperta, 0, sexpert, sexpert, sexpert_state, init_sexpert, "Novag", "Super Expert (version A, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // 878
-CONS( 1987, sexperta2, sexperta, 0, sexpert, sexpert, sexpert_state, init_sexpert, "Novag", "Super Expert (version A, set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // 878
-CONS( 1988, sexpertb,  sexperta, 0, sexpert, sexpert, sexpert_state, init_sexpert, "Novag", "Super Expert (version B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // 887
-CONS( 1990, sexpertc,  sexperta, 0, sexpert, sexpert, sexpert_state, init_sexpert, "Novag", "Super Expert (version C, V3.6)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1990, sexpertc1, sexperta, 0, sexpert, sexpert, sexpert_state, init_sexpert, "Novag", "Super Expert (version C, V3.0)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // 902
-
-CONS( 1987, sfortea,   0,        0, sforte,  sexpert, sforte_state,  init_sexpert, "Novag", "Super Forte (version A, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1987, sfortea1,  sfortea,  0, sforte,  sexpert, sforte_state,  init_sexpert, "Novag", "Super Forte (version A, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1987, sfortea2,  sfortea,  0, sforte,  sexpert, sforte_state,  init_sexpert, "Novag", "Super Forte (version A, set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1988, sforteb,   sfortea,  0, sforte,  sexpert, sforte_state,  init_sexpert, "Novag", "Super Forte (version B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
-CONS( 1990, sfortec,   sfortea,  0, sforte,  sexpert, sforte_state,  init_sexpert, "Novag", "Super Forte (version C)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+//    YEAR  NAME       PARENT   CMP MACHINE   INPUT     STATE          INIT          COMPANY, FULLNAME, FLAGS
+CONS( 1988, sexperta,  0,        0, sexpert,  sexpert,  sexpert_state, init_sexpert, "Novag", "Super Expert (version A, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // 886
+CONS( 1987, sexperta1, sexperta, 0, sexpert,  sexpert,  sexpert_state, init_sexpert, "Novag", "Super Expert (version A, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // 878
+CONS( 1987, sexperta2, sexperta, 0, sexpert,  sexpert,  sexpert_state, init_sexpert, "Novag", "Super Expert (version A, set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // 878
+CONS( 1988, sexpertb,  sexperta, 0, sexpertb, sexpertb, sexpert_state, init_sexpert, "Novag", "Super Expert (version B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // 887
+CONS( 1990, sexpertc,  sexperta, 0, sexpertb, sexpertb, sexpert_state, init_sexpert, "Novag", "Super Expert (version C, V3.6)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1990, sexpertc1, sexperta, 0, sexpertb, sexpertb, sexpert_state, init_sexpert, "Novag", "Super Expert (version C, V3.0)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK ) // 902
+
+CONS( 1987, sfortea,   0,        0, sforte,   sexpert,  sforte_state,  init_sexpert, "Novag", "Super Forte (version A, set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1987, sfortea1,  sfortea,  0, sforte,   sexpert,  sforte_state,  init_sexpert, "Novag", "Super Forte (version A, set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1987, sfortea2,  sfortea,  0, sforte,   sexpert,  sforte_state,  init_sexpert, "Novag", "Super Forte (version A, set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1988, sforteb,   sfortea,  0, sforteb,  sexpertb, sforte_state,  init_sexpert, "Novag", "Super Forte (version B)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1990, sfortec,   sfortea,  0, sforteb,  sexpertb, sforte_state,  init_sexpert, "Novag", "Super Forte (version C, V3.6)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1990, sfortec1,  sfortea,  0, sforteb,  sexpertb, sforte_state,  init_sexpert, "Novag", "Super Forte (version C, V1.2)", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/nwk-tr.cpp mame-0.224+dfsg.1/src/mame/drivers/nwk-tr.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/nwk-tr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/nwk-tr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -458,7 +458,7 @@
 	{
 		case 0:
 		case 1:
-			m_pcb_digit[offset] = bitswap<8>(~data,7,0,1,2,3,4,5,6) & 0x7f;
+			m_pcb_digit[offset] = bitswap<7>(~data,0,1,2,3,4,5,6);
 			break;
 
 		case 4:
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/odyssey2.cpp mame-0.224+dfsg.1/src/mame/drivers/odyssey2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/odyssey2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/odyssey2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,13 +1,72 @@
 // license:BSD-3-Clause
-// copyright-holders:Wilbert Pol
+// copyright-holders:Wilbert Pol, hap
 /***************************************************************************
 
-  /drivers/odyssey2.c
+Driver file to handle emulation of the Magnavox Odyssey 2 (stylized Odyssey²),
+Philips Videopac G7000 and Philips Videopac+ G7400.
 
-  Driver file to handle emulation of the Odyssey2.
+Magnavox was wholly owned by Philips at the time. The console had a limited
+release late-1978 in Europe as the Philips G7000, but the launch was quickly
+halted due to a hardware defect, wide release continued in 1979.
+
+The 2 joysticks have no clear distinction between player 1 and 2, it differs
+per game. And in MAME it's extra awkward due to the default input mapping
+conflicting with the keyboard.
+
+Odyssey 2/Videopac hardware notes:
+- Intel 8048 (1KB internal ROM, 64 bytes internal RAM)
+- 128 bytes RAM(6810)
+- Intel 8244 for video and sound (8245 on PAL consoles)
+- 2 joysticks(either hardwired, or connectors), keyboard
+
+Videopac+ G7400 hardware notes:
+- same base hardware
+- Intel 8243 I/O expander
+- EF9340 + EF9341 graphics chips + 6KB VRAM(3*2128, only 4KB used)
+- larger keyboard
+
+XTAL notes (differs per model):
+- Odyssey 2: 7.15909MHz
+- G7000: 17.734476MHz
+- C52/N60: 17.812
+- G7200: 5.911MHz + 3.547MHz
+- G7400: 5.911MHz + 8.867MHz
+- JO7400: 5.911MHz + 3.5625MHz
+
+TODO:
+- backgamm doesn't draw all the chars/sprites, it does multiple screen updates
+  and writes to the ptr/color registers, but does not increment the Y regs
+- 824x screen resolution is not strictly defined, height(243) is correct, but
+  horizontal overscan differs depending on monitor/tv? see syracuse for overscan
+- 824x on the real console, overlapping characters on eachother will cause
+  glitches (it is used to an advantage in some as-of-yet undumped homebrews)
+- 8244(NTSC) is not supposed to show characters near the upper border, but
+  hiding them will cause bugs in some Euro games
+- 8245(PAL) video timing is not 100% accurate, though vtotal and htotal should
+  be correct
+- ppp(the tetris game) does not work properly on PAL, is this homebrew NTSC-only,
+  or is PAL detection going wrong? It does look like PAL/NTSC detection is working,
+  see internal RAM $3D d7. So maybe it is due to inaccurate PAL video timing.
+  The game does mid-scanline updates.
+- g7400 probably has different video timing too (not same as g7000)
+- g7400 helicopt sometimes locks up at the sea level, timing related?
+- 4in1 and musician are not supposed to work on g7400, but work fine on MAME,
+  caused by bus conflict or because they write to P2?
+- verify odyssey3 cpu/video clocks
+- odyssey3 keyboard layout is not the same as g7400, but there is no software
+  to test the scancodes
+- partial screen updates aren't shown when using MAME's debugger, this is caused
+  by a forced full screen update and a reset_partial_updates in emu/video.cpp.
+  For the same reason, collision detection also won't work properly when stepping
+  through the debugger
+
+BTANB:
+- a lot of PAL games have problems on NTSC (the other way around, not so much)
+- g7400 games don't look correct on odyssey3 and vice versa: ef934x graphics are
+  placed lower on odyssey3
+- Blackjack (Videopac 5) does not work on G7400, caused by a removed BIOS routine
 
-  Minor update to "the voice" rom names, and add comment about
-  the older revision of "the voice" - LN, 10/03/08
+Plenty games have minor bugs not worth mentioning here.
 
 ***************************************************************************/
 
@@ -26,6 +85,8 @@
 #include "speaker.h"
 
 
+namespace {
+
 class odyssey2_state : public driver_device
 {
 public:
@@ -33,863 +94,746 @@
 		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
 		m_i8244(*this, "i8244"),
+		m_screen(*this, "screen"),
 		m_cart(*this, "cartslot"),
 		m_keyboard(*this, "KEY.%u", 0),
 		m_joysticks(*this, "JOY.%u", 0)
 	{ }
 
-	void odyssey2_cartslot(machine_config &config);
-	void videopac(machine_config &config);
-	void odyssey2(machine_config &config);
+	// Reset button is tied to 8048 RESET pin
+	DECLARE_INPUT_CHANGED_MEMBER(reset_button) { m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE); }
 
-	void init_odyssey2();
+	void odyssey2(machine_config &config);
+	void videopac(machine_config &config);
+	void videopacf(machine_config &config);
 
-	uint32_t screen_update_odyssey2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	void odyssey2_palette(palette_device &palette) const;
 
 protected:
-
 	required_device<i8048_device> m_maincpu;
 	required_device<i8244_device> m_i8244;
+	required_device<screen_device> m_screen;
 	required_device<o2_cart_slot_device> m_cart;
 
-	uint8_t m_ram[256];
-	uint8_t m_p1;
-	uint8_t m_p2;
-	uint8_t m_lum;
-
+	uint8_t m_ram[0x80];
+	uint8_t m_p1 = 0xff;
+	uint8_t m_p2 = 0xff;
 
 	DECLARE_READ_LINE_MEMBER(t1_read);
-	void odyssey2_palette(palette_device &palette) const;
-
-	void scanline_postprocess(uint16_t data);
 
 	void odyssey2_io(address_map &map);
 	void odyssey2_mem(address_map &map);
 
 	virtual void machine_start() override;
-	virtual void machine_reset() override;
-
-	/* constants */
-	static const uint8_t P1_BANK_LO_BIT          = 0x01;
-	static const uint8_t P1_BANK_HI_BIT          = 0x02;
-	static const uint8_t P1_KEYBOARD_SCAN_ENABLE = 0x04; /* active low */
-	static const uint8_t P1_VDC_ENABLE           = 0x08; /* active low */
-	static const uint8_t P1_EXT_RAM_ENABLE       = 0x10; /* active low */
-	static const uint8_t P1_VPP_ENABLE           = 0x20; /* active low */
-	static const uint8_t P1_VDC_COPY_MODE_ENABLE = 0x40;
-	static const uint8_t P2_KEYBOARD_SELECT_MASK = 0x07; /* select row to scan */
 
-	required_ioport_array<6> m_keyboard;
+	required_ioport_array<8> m_keyboard;
 	required_ioport_array<2> m_joysticks;
 
-	uint8_t io_read(offs_t offset);
-	void io_write(offs_t offset, uint8_t data);
+	virtual uint8_t io_read(offs_t offset);
+	virtual void io_write(offs_t offset, uint8_t data);
 	uint8_t bus_read();
-	void bus_write(uint8_t data);
-	uint8_t p1_read();
 	void p1_write(uint8_t data);
 	uint8_t p2_read();
 	void p2_write(uint8_t data);
+
+private:
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 };
 
 class g7400_state : public odyssey2_state
 {
 public:
-	g7400_state(const machine_config &mconfig, device_type type, const char *tag)
-		: odyssey2_state(mconfig, type, tag)
-		, m_i8243(*this, "i8243")
-		, m_ef9340_1(*this, "ef9340_1")
+	g7400_state(const machine_config &mconfig, device_type type, const char *tag) :
+		odyssey2_state(mconfig, type, tag),
+		m_i8243(*this, "i8243"),
+		m_ef934x(*this, "ef934x")
 	{ }
 
 	void g7400(machine_config &config);
+	void jo7400(machine_config &config);
 	void odyssey3(machine_config &config);
 
+protected:
+	virtual void machine_start() override;
+
+	virtual uint8_t io_read(offs_t offset) override;
+	virtual void io_write(offs_t offset, uint8_t data) override;
+
 private:
 	required_device<i8243_device> m_i8243;
-	required_device<ef9340_1_device> m_ef9340_1;
+	required_device<ef9340_1_device> m_ef934x;
 
-	void g7400_palette(palette_device &palette) const;
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-	void p2_write(uint8_t data);
-	uint8_t io_read(offs_t offset);
-	void io_write(offs_t offset, uint8_t data);
-	void i8243_p4_w(uint8_t data);
-	void i8243_p5_w(uint8_t data);
-	void i8243_p6_w(uint8_t data);
-	void i8243_p7_w(uint8_t data);
-	void scanline_postprocess(uint16_t data);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
-	void g7400_io(address_map &map);
+	void p2_write(uint8_t data);
+	uint8_t io_vpp(offs_t offset, uint8_t data);
+	template<int P> void i8243_port_w(uint8_t data);
 
-	uint8_t m_ic674_decode[8];
-	uint8_t m_ic678_decode[8];
+	inline offs_t ef934x_extram_address(offs_t offset);
+	uint8_t ef934x_extram_r(offs_t offset);
+	void ef934x_extram_w(offs_t offset, uint8_t data);
+
+	uint8_t m_mix_i8244 = 0xff;
+	uint8_t m_mix_ef934x = 0xff;
+	uint8_t m_ef934x_extram[0x800];
 };
 
-
-void odyssey2_state::odyssey2_mem(address_map &map)
+void odyssey2_state::machine_start()
 {
-	map(0x0000, 0x03ff).rom();
-	map(0x0400, 0x0bff).r(m_cart, FUNC(o2_cart_slot_device::read_rom04));
-	map(0x0c00, 0x0fff).r(m_cart, FUNC(o2_cart_slot_device::read_rom0c));
-}
-
+	memset(m_ram, 0, sizeof(m_ram));
 
-void odyssey2_state::odyssey2_io(address_map &map)
-{
-	map(0x00, 0xff).rw(FUNC(odyssey2_state::io_read), FUNC(odyssey2_state::io_write));
+	save_item(NAME(m_ram));
+	save_item(NAME(m_p1));
+	save_item(NAME(m_p2));
 }
 
-
-void g7400_state::g7400_io(address_map &map)
+void g7400_state::machine_start()
 {
-	map(0x00, 0xff).rw(FUNC(g7400_state::io_read), FUNC(g7400_state::io_write));
-}
-
-
-static INPUT_PORTS_START( odyssey2 )
-	PORT_START("KEY.0")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CHAR('1')
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_CHAR('2')
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_CHAR('3')
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_CHAR('4')
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_5) PORT_CHAR('5')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_6) PORT_CHAR('6')
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_7) PORT_CHAR('7')
-
-	PORT_START("KEY.1")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_8) PORT_CHAR('8')
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_9) PORT_CHAR('9')
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("?? :") PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1))
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("?? $") PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2))
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('?')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_L) PORT_CHAR('L')
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('P')
-
-	PORT_START("KEY.2")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PLUS_PAD) PORT_CHAR('+')
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('W')
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CHAR('E')
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_R) PORT_CHAR('R')
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_T) PORT_CHAR('T')
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_U) PORT_CHAR('U')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_I) PORT_CHAR('I')
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('O')
-
-	PORT_START("KEY.3")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_S) PORT_CHAR('S')
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CHAR('D')
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_F) PORT_CHAR('F')
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_G) PORT_CHAR('G')
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_H) PORT_CHAR('H')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_J) PORT_CHAR('J')
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_K) PORT_CHAR('K')
-
-	PORT_START("KEY.4")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_A) PORT_CHAR('A')
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z')
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_X) PORT_CHAR('X')
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_C) PORT_CHAR('C')
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('V')
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_B) PORT_CHAR('B')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CHAR('M')
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.')
-
-	PORT_START("KEY.5")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-')
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ASTERISK) PORT_CHAR('*')
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_CHAR('/')
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=')
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME(DEF_STR( Yes )) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y')
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME(DEF_STR( No )) PORT_CODE(KEYCODE_N) PORT_CHAR('N')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("CLR") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("ENT") PORT_CODE(KEYCODE_ENTER) PORT_CHAR('\r')
+	odyssey2_state::machine_start();
+	memset(m_ef934x_extram, 0, sizeof(m_ef934x_extram));
 
-	PORT_START("JOY.0")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)     PORT_PLAYER(1)
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT)  PORT_PLAYER(1)
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN)   PORT_PLAYER(1)
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT)   PORT_PLAYER(1)
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1)         PORT_PLAYER(1)
-	PORT_BIT( 0xe0, 0xe0,    IPT_UNUSED )
+	save_item(NAME(m_mix_i8244));
+	save_item(NAME(m_mix_ef934x));
+	save_item(NAME(m_ef934x_extram));
+}
 
-	PORT_START("JOY.1")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)     PORT_PLAYER(2)
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT)  PORT_PLAYER(2)
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN)   PORT_PLAYER(2)
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT)   PORT_PLAYER(2)
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1)         PORT_PLAYER(2)
-	PORT_BIT( 0xe0, 0xe0,    IPT_UNUSED )
-INPUT_PORTS_END
 
 
-/* character sprite colors
-   dark grey, red, green, yellow, blue, violet, light grey, white
-   dark back / grid colors
-   black, dark blue, dark green, light green, red, violet, yellow, light grey
-   light back / grid colors
-   black, blue, green, light green, red, violet, yellow, light grey */
+/******************************************************************************
+    Video
+******************************************************************************/
 
 constexpr rgb_t odyssey2_colors[] =
 {
 	// Background,Grid Dim
 	{ 0x00, 0x00, 0x00 },   /* Black */                                         // i r g b
-	{ 0x1a, 0x37, 0xbe },   /* Blue           - Calibrated To Real VideoPac */  // i r g B
-	{ 0x00, 0x6d, 0x07 },   /* Green          - Calibrated To Real VideoPac */  // i r G b
-	{ 0x2a, 0xaa, 0xbe },   /* Blue-Green     - Calibrated To Real VideoPac */  // i r G B
 	{ 0x79, 0x00, 0x00 },   /* Red            - Calibrated To Real VideoPac */  // i R g b
-	{ 0x94, 0x30, 0x9f },   /* Violet         - Calibrated To Real VideoPac */  // i R g B
+	{ 0x00, 0x6d, 0x07 },   /* Green          - Calibrated To Real VideoPac */  // i r G b
 	{ 0x77, 0x67, 0x0b },   /* Khaki          - Calibrated To Real VideoPac */  // i R g B
+	{ 0x1a, 0x37, 0xbe },   /* Blue           - Calibrated To Real VideoPac */  // i r g B
+	{ 0x94, 0x30, 0x9f },   /* Violet         - Calibrated To Real VideoPac */  // i R g B
+	{ 0x2a, 0xaa, 0xbe },   /* Blue-Green     - Calibrated To Real VideoPac */  // i r G B
 	{ 0xce, 0xce, 0xce },   /* Lt Grey */                                       // i R G B
 
 	// Background,Grid Bright
 	{ 0x67, 0x67, 0x67 },   /* Grey           - Calibrated To Real VideoPac */  // I R g B
-	{ 0x5c, 0x80, 0xf6 },   /* Lt Blue        - Calibrated To Real VideoPac */  // I R g B
-	{ 0x56, 0xc4, 0x69 },   /* Lt Green       - Calibrated To Real VideoPac */  // I R g B
-	{ 0x77, 0xe6, 0xeb },   /* Lt Blue-Green  - Calibrated To Real VideoPac */  // I R g b
 	{ 0xc7, 0x51, 0x51 },   /* Lt Red         - Calibrated To Real VideoPac */  // I R g b
-	{ 0xdc, 0x84, 0xe8 },   /* Lt Violet      - Calibrated To Real VideoPac */  // I R g B
+	{ 0x56, 0xc4, 0x69 },   /* Lt Green       - Calibrated To Real VideoPac */  // I R g B
 	{ 0xc6, 0xb8, 0x6a },   /* Lt Yellow      - Calibrated To Real VideoPac */  // I R G b
+	{ 0x5c, 0x80, 0xf6 },   /* Lt Blue        - Calibrated To Real VideoPac */  // I R g B
+	{ 0xdc, 0x84, 0xe8 },   /* Lt Violet      - Calibrated To Real VideoPac */  // I R g B
+	{ 0x77, 0xe6, 0xeb },   /* Lt Blue-Green  - Calibrated To Real VideoPac */  // I R g b
 	{ 0xff, 0xff, 0xff }    /* White */                                         // I R G B
 };
 
-
 void odyssey2_state::odyssey2_palette(palette_device &palette) const
 {
 	palette.set_pen_colors(0, odyssey2_colors);
 }
 
 
-void g7400_state::g7400_palette(palette_device &palette) const
+uint32_t odyssey2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	constexpr rgb_t g7400_colors[]{
-		{ 0x00, 0x00, 0x00 }, // Black
-		{ 0x1a, 0x37, 0xbe }, // Blue
-		{ 0x00, 0x6d, 0x07 }, // Green
-		{ 0x2a, 0xaa, 0xbe }, // Blue-Green
-		{ 0x79, 0x00, 0x00 }, // Red
-		{ 0x94, 0x30, 0x9f }, // Violet
-		{ 0x77, 0x67, 0x0b }, // Khaki
-		{ 0xce, 0xce, 0xce }, // Lt Grey
-
-		{ 0x67, 0x67, 0x67 }, // Grey
-		{ 0x5c, 0x80, 0xf6 }, // Lt Blue
-		{ 0x56, 0xc4, 0x69 }, // Lt Green
-		{ 0x77, 0xe6, 0xeb }, // Lt Blue-Green
-		{ 0xc7, 0x51, 0x51 }, // Lt Red
-		{ 0xdc, 0x84, 0xe8 }, // Lt Violet
-		{ 0xc6, 0xb8, 0x6a }, // Lt Yellow
-		{ 0xff, 0xff, 0xff }  // White
-	};
+	m_i8244->screen_update(screen, bitmap, cliprect);
 
-	palette.set_pen_colors(0, g7400_colors);
-}
+	u8 lum = ~m_p1 >> 4 & 0x08;
 
-void odyssey2_state::init_odyssey2()
-{
-	uint8_t *gfx = memregion("gfx1")->base();
+	// apply external LUM setting
+	for (int y = cliprect.min_y; y <= cliprect.max_y; y++)
+		for (int x = cliprect.min_x; x <= cliprect.max_x; x++)
+			bitmap.pix16(y, x) |= lum;
 
-	for (int i = 0; i < 256; i++)
-	{
-		gfx[i] = i;     /* TODO: Why i and not 0? */
-		m_ram[i] = 0;
-	}
+	return 0;
 }
 
-
-void odyssey2_state::machine_start()
+uint32_t g7400_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	save_pointer(NAME(m_ram),256);
-	save_item(NAME(m_p1));
-	save_item(NAME(m_p2));
-	save_item(NAME(m_lum));
-}
+	u8 lum = ~m_p1 >> 4 & 0x08;
+	bitmap_ind16 *ef934x_bitmap = m_ef934x->get_bitmap();
 
+	// apply external LUM setting
+	for (int y = cliprect.min_y; y <= cliprect.max_y; y++)
+	{
+		rectangle clip = cliprect;
+		clip.min_y = clip.max_y = y;
 
-void odyssey2_state::machine_reset()
-{
-	m_lum = 0;
+		m_i8244->screen_update(screen, bitmap, clip);
 
-	/* jump to "last" bank, will work for all sizes due to being mirrored */
-	m_p1 = 0xff;
-	m_p2 = 0xff;
-	m_cart->write_bank(m_p1);
-}
+		for (int x = clip.min_x; x <= clip.max_x; x++)
+		{
+			uint16_t d = bitmap.pix16(y, x) & 7;
+			uint16_t e = ef934x_bitmap->pix16(y, x);
 
+			// i8244 decoder enable is masked with cartridge pin B
+			bool en = (e & 8) || !m_cart->b_read();
+			e &= 7;
+
+			// ef934x decoder output is tied to CX
+			bool i2 = !BIT(m_mix_ef934x, e);
+			m_i8244->write_cx(x, i2);
 
-void g7400_state::machine_start()
-{
-	odyssey2_state::machine_start();
+			if (en && BIT(m_mix_i8244, d))
+			{
+				// Use i8245 input
+				bitmap.pix16(y, x) |= lum;
+			}
+			else
+			{
+				// Use EF934x input
+				bitmap.pix16(y, x) = e | (i2 ? 8 : 0);
+			}
+		}
+	}
 
-	save_pointer(NAME(m_ic674_decode),8);
-	save_pointer(NAME(m_ic678_decode),8);
+	return 0;
 }
 
 
-void g7400_state::machine_reset()
-{
-	odyssey2_state::machine_reset();
-
-	for ( int i = 0; i < 8; i++ )
-	{
-		m_ic674_decode[i] = 0;
-		m_ic678_decode[i] = 0;
-	}
-}
 
-/****** External RAM ******************************/
+/******************************************************************************
+    I/O
+******************************************************************************/
 
 uint8_t odyssey2_state::io_read(offs_t offset)
 {
-	if ((m_p1 & (P1_VDC_COPY_MODE_ENABLE | P1_VDC_ENABLE)) == 0)
-	{
-		return m_i8244->read(offset);
-	}
-	if (!(m_p1 & P1_EXT_RAM_ENABLE))
-	{
-		return m_ram[offset];
-	}
+	u8 data = m_cart->io_read(offset);
+	if (!(m_p1 & 0x10) && ~offset & 0x80)
+		data &= m_ram[offset];
 
-	return 0;
-}
+	if ((m_p1 & 0x48) == 0)
+		data &= m_i8244->read(offset);
 
+	return data;
+}
 
 void odyssey2_state::io_write(offs_t offset, uint8_t data)
 {
-	if ((m_p1 & (P1_EXT_RAM_ENABLE | P1_VDC_COPY_MODE_ENABLE)) == 0x00)
+	if (!(m_p1 & 0x40))
 	{
-		m_ram[offset] = data;
-		if (offset & 0x80)
-		{
-			logerror("voice write %02X, data = %02X (p1 = %02X)\n", offset, data, m_p1);
-			m_cart->io_write(offset, data);
-		}
+		m_cart->io_write(offset, data);
+		if (!(m_p1 & 0x10) && ~offset & 0x80)
+			m_ram[offset] = data;
 	}
-	else if (!(m_p1 & P1_VDC_ENABLE))
-	{
+
+	if (!(m_p1 & 0x08))
 		m_i8244->write(offset, data);
-	}
 }
 
 
-uint8_t g7400_state::io_read(offs_t offset)
+// 8048 ports
+
+void odyssey2_state::p1_write(uint8_t data)
 {
-	if ((m_p1 & (P1_VDC_COPY_MODE_ENABLE | P1_VDC_ENABLE)) == 0)
-	{
-		return m_i8244->read(offset);
-	}
-	else if (!(m_p1 & P1_EXT_RAM_ENABLE))
-	{
-		return m_ram[offset];
-	}
-	else if (!(m_p1 & P1_VPP_ENABLE))
-	{
-		return m_ef9340_1->ef9341_read( offset & 0x02, offset & 0x01 );
-	}
+	// LUM changed
+	if ((m_p1 ^ data) & 0x80)
+		m_screen->update_now();
 
-	return 0;
+	m_p1 = data;
+	m_cart->write_p1(m_p1 & 0x13);
 }
 
-
-void g7400_state::io_write(offs_t offset, uint8_t data)
+uint8_t odyssey2_state::p2_read()
 {
-	if ((m_p1 & (P1_EXT_RAM_ENABLE | P1_VDC_COPY_MODE_ENABLE)) == 0x00)
-	{
-		m_ram[offset] = data;
-		if (offset & 0x80)
-		{
-			logerror("voice write %02X, data = %02X (p1 = %02X)\n", offset, data, m_p1);
-			m_cart->io_write(offset, data);
-		}
-	}
-	else if (!(m_p1 & P1_VDC_ENABLE))
-	{
-		m_i8244->write(offset, data);
-	}
-	else if (!(m_p1 & P1_VPP_ENABLE))
+	u8 data = 0xff;
+
+	if (!(m_p1 & 0x04))
 	{
-		m_ef9340_1->ef9341_write( offset & 0x02, offset & 0x01, data );
+		// 74148 priority encoder, GS to P24, outputs to P25-P27
+		u8 inp = count_leading_zeros(m_keyboard[m_p2 & 0x07]->read()) - 24;
+		if (inp < 8)
+			data &= inp << 5 | 0xf;
 	}
+
+	return data;
 }
 
+void odyssey2_state::p2_write(uint8_t data)
+{
+	m_p2 = data;
+	m_cart->write_p2(m_p2 & 0x0f);
+}
 
-void odyssey2_state::scanline_postprocess(uint16_t data)
+uint8_t odyssey2_state::bus_read()
 {
-	int vpos = data;
-	bitmap_ind16 *bitmap = m_i8244->get_bitmap();
+	u8 data = 0xff;
 
-	if ( vpos < i8244_device::START_Y || vpos >= i8244_device::START_Y + i8244_device::SCREEN_HEIGHT )
+	if (!(m_p1 & 0x04))
 	{
-		return;
+		u8 sel = m_p2 & 0x07;
+		if (sel < 2)
+			data &= ~m_joysticks[sel]->read();
 	}
 
-	// apply external LUM setting
-	for ( int x = i8244_device::START_ACTIVE_SCAN; x < i8244_device::END_ACTIVE_SCAN; x++ )
-	{
-		bitmap->pix16( vpos, x ) |= ( m_lum ^ 0x08 );
-	}
+	return data;
 }
 
-
-void g7400_state::scanline_postprocess(uint16_t data)
+READ_LINE_MEMBER(odyssey2_state::t1_read)
 {
-	int vpos = data;
-	int y = vpos - i8244_device::START_Y - 5;
-	bitmap_ind16 *bitmap = m_i8244->get_bitmap();
-	bitmap_ind16 *ef934x_bitmap = m_ef9340_1->get_bitmap();
-
-	if ( vpos < i8244_device::START_Y || vpos >= i8244_device::START_Y + i8244_device::SCREEN_HEIGHT )
-	{
-		return;
-	}
+	return m_i8244->vblank() | m_i8244->hblank();
+}
 
-	// apply external LUM setting
-	int x_real_start = i8244_device::START_ACTIVE_SCAN + i8244_device::BORDER_SIZE + 5;
-	int x_real_end = i8244_device::END_ACTIVE_SCAN - i8244_device::BORDER_SIZE + 5;
-	for ( int x = i8244_device::START_ACTIVE_SCAN; x < i8244_device::END_ACTIVE_SCAN; x++ )
-	{
-		uint16_t d = bitmap->pix16( vpos, x );
 
-		if ( ( ! m_ic678_decode[ d & 0x07 ] ) && x >= x_real_start && x < x_real_end && y >= 0 && y < 240 )
-		{
-			// Use EF934x input
-			d = ef934x_bitmap->pix16( y, x - x_real_start ) & 0x07;
+// G7400-specific
 
-			if ( ! m_ic674_decode[ d & 0x07 ] )
-			{
-				d |= 0x08;
-			}
-		}
-		else
-		{
-			// Use i8245 input
-			d |= ( m_lum ^ 0x08 );
-		}
-		bitmap->pix16( vpos, x ) = d;
-	}
+uint8_t g7400_state::io_read(offs_t offset)
+{
+	u8 data = odyssey2_state::io_read(offset);
+	return io_vpp(offset, data);
 }
 
-
-uint32_t odyssey2_state::screen_update_odyssey2(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+void g7400_state::io_write(offs_t offset, uint8_t data)
 {
-	return m_i8244->screen_update(screen, bitmap, cliprect);
+	odyssey2_state::io_write(offset, data);
+	io_vpp(offset, data);
 }
 
-
-READ_LINE_MEMBER(odyssey2_state::t1_read)
+uint8_t g7400_state::io_vpp(offs_t offset, uint8_t data)
 {
-	if ( m_i8244->vblank() || m_i8244->hblank() )
+	if (!(m_p1 & 0x20))
 	{
-		return 1;
+		// A2 to R/W pin
+		if (offset & 4)
+			data &= m_ef934x->ef9341_read( offset & 0x02, offset & 0x01 );
+		else
+			m_ef934x->ef9341_write( offset & 0x02, offset & 0x01, data );
 	}
-	return 0;
-}
-
-
-uint8_t odyssey2_state::p1_read()
-{
-	uint8_t data = m_p1;
 
 	return data;
 }
 
-
-void odyssey2_state::p1_write(uint8_t data)
+void g7400_state::p2_write(uint8_t data)
 {
-	m_p1 = data;
-	m_lum = ( data & 0x80 ) >> 4;
-	m_cart->write_bank(m_p1);
+	odyssey2_state::p2_write(data);
+	m_i8243->p2_w(m_p2 & 0x0f);
 }
 
-
-uint8_t odyssey2_state::p2_read()
+template<int P>
+void g7400_state::i8243_port_w(uint8_t data)
 {
-	uint8_t h = 0xFF;
-	int i, j;
-
-	if (!(m_p1 & P1_KEYBOARD_SCAN_ENABLE))
+	// P4,P5: color mix I8244 side (IC674)
+	// P6,P7: color mix EF9340 side (IC678)
+	u8 mask = 0xf;
+	if (~P & 1)
 	{
-		if ((m_p2 & P2_KEYBOARD_SELECT_MASK) <= 5)  /* read keyboard */
-		{
-			h &= m_keyboard[m_p2 & P2_KEYBOARD_SELECT_MASK]->read();
-		}
-
-		for (i= 0x80, j = 0; i > 0; i >>= 1, j++)
-		{
-			if (!(h & i))
-			{
-				m_p2 &= ~0x10;                   /* set key was pressed indicator */
-				m_p2 = (m_p2 & ~0xE0) | (j << 5);  /* column that was pressed */
+		data <<= 4;
+		mask <<= 4;
+	}
 
-				break;
-			}
-		}
+	m_screen->update_now();
 
-		if (h == 0xFF)  /* active low inputs, so no keypresses */
-		{
-			m_p2 = m_p2 | 0xF0;
-		}
-	}
+	if (P & 2)
+		m_mix_i8244 = (m_mix_i8244 & ~mask) | (data & mask);
 	else
-	{
-		m_p2 = m_p2 | 0xF0;
-	}
-
-	return m_p2;
+		m_mix_ef934x = (m_mix_ef934x & ~mask) | (data & mask);
 }
 
 
-void odyssey2_state::p2_write(uint8_t data)
+// EF9341 extended RAM
+
+offs_t g7400_state::ef934x_extram_address(offs_t offset)
 {
-	m_p2 = data;
-}
+	u8 latch = (offset >> 12 & 0x80) | (offset >> 4 & 0x7f);
+	u16 address = (latch & 0x1f) | (offset << 9 & 0x200) | (latch << 3 & 0x400);
 
+	if (offset & 8)
+		return address | (latch & 0x60);
+	else
+		return address | (offset << 4 & 0x60) | (latch << 2 & 0x180);
+}
 
-void g7400_state::p2_write(uint8_t data)
+uint8_t g7400_state::ef934x_extram_r(offs_t offset)
 {
-	m_p2 = data;
-	m_i8243->p2_w(m_p2 & 0x0f);
+	return m_ef934x_extram[ef934x_extram_address(offset)];
 }
 
-
-uint8_t odyssey2_state::bus_read()
+void g7400_state::ef934x_extram_w(offs_t offset, uint8_t data)
 {
-	uint8_t data = 0xff;
-
-	if ((m_p2 & P2_KEYBOARD_SELECT_MASK) == 1)
-	{
-		data &= m_joysticks[0]->read();
-	}
+	m_ef934x_extram[ef934x_extram_address(offset)] = data;
+}
 
-	if ((m_p2 & P2_KEYBOARD_SELECT_MASK) == 0)
-	{
-		data &= m_joysticks[1]->read();
-	}
 
-	return data;
-}
 
+/******************************************************************************
+    Address Maps
+******************************************************************************/
 
-void odyssey2_state::bus_write(uint8_t data)
+void odyssey2_state::odyssey2_mem(address_map &map)
 {
-	logerror("%.6f bus written %.2x\n", machine().time().as_double(), data);
+	map(0x0000, 0x03ff).rom();
+	map(0x0400, 0x0bff).r(m_cart, FUNC(o2_cart_slot_device::read_rom04));
+	map(0x0c00, 0x0fff).r(m_cart, FUNC(o2_cart_slot_device::read_rom0c));
 }
 
-
-/*
-    i8243 in the g7400
-*/
-
-void g7400_state::i8243_p4_w(uint8_t data)
+void odyssey2_state::odyssey2_io(address_map &map)
 {
-	// "port 4"
-	logerror("setting ef-port4 to %02x\n", data);
-	m_ic674_decode[4] = BIT(data,0);
-	m_ic674_decode[5] = BIT(data,1);
-	m_ic674_decode[6] = BIT(data,2);
-	m_ic674_decode[7] = BIT(data,3);
+	map(0x00, 0xff).rw(FUNC(odyssey2_state::io_read), FUNC(odyssey2_state::io_write));
 }
 
 
-void g7400_state::i8243_p5_w(uint8_t data)
-{
-	// "port 5"
-	logerror("setting ef-port5 to %02x\n", data);
-	m_ic674_decode[0] = BIT(data,0);
-	m_ic674_decode[1] = BIT(data,1);
-	m_ic674_decode[2] = BIT(data,2);
-	m_ic674_decode[3] = BIT(data,3);
-}
 
+/******************************************************************************
+    Input Ports
+******************************************************************************/
 
-void g7400_state::i8243_p6_w(uint8_t data)
-{
-	// "port 6"
-	logerror("setting vdc-port6 to %02x\n", data);
-	m_ic678_decode[4] = BIT(data,0);
-	m_ic678_decode[5] = BIT(data,1);
-	m_ic678_decode[6] = BIT(data,2);
-	m_ic678_decode[7] = BIT(data,3);
-}
+static INPUT_PORTS_START( odyssey2 )
+	PORT_START("KEY.0")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7')
 
+	PORT_START("KEY.1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('?')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P')
 
-void g7400_state::i8243_p7_w(uint8_t data)
-{
-	// "port 7"
-	logerror("setting vdc-port7 to %02x\n", data);
-	m_ic678_decode[0] = BIT(data,0);
-	m_ic678_decode[1] = BIT(data,1);
-	m_ic678_decode[2] = BIT(data,2);
-	m_ic678_decode[3] = BIT(data,3);
-}
+	PORT_START("KEY.2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_PLUS_PAD) PORT_CHAR('+')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('U')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O')
 
+	PORT_START("KEY.3")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('K')
 
-static const gfx_layout odyssey2_graphicslayout =
-{
-	8,1,
-	256,                                    /* 256 characters */
-	1,                      /* 1 bits per pixel */
-	{ 0 },                  /* no bitplanes; 1 bit per pixel */
-	/* x offsets */
-	{
-	0,
-	1,
-	2,
-	3,
-	4,
-	5,
-	6,
-	7,
-	},
-	/* y offsets */
-	{ 0 },
-	1*8
-};
+	PORT_START("KEY.4")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.')
 
+	PORT_START("KEY.5")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHAR('-')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(u8"×") PORT_CODE(KEYCODE_ASTERISK) PORT_CHAR('*')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(u8"÷") PORT_CODE(KEYCODE_SLASH_PAD) PORT_CHAR('/')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Y / Yes") PORT_CODE(KEYCODE_Y) PORT_CHAR('Y')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("N / No") PORT_CODE(KEYCODE_N) PORT_CHAR('N')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Clear") PORT_CODE(KEYCODE_BACKSPACE) PORT_CODE(KEYCODE_DEL_PAD) PORT_CHAR(8)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
 
-static const gfx_layout odyssey2_spritelayout =
-{
-	8,1,
-	256,                                    /* 256 characters */
-	1,                      /* 1 bits per pixel */
-	{ 0 },                  /* no bitplanes; 1 bit per pixel */
-	/* x offsets */
-	{
-	7,6,5,4,3,2,1,0
-	},
-	/* y offsets */
-	{ 0 },
-	1*8
-};
+	PORT_START("KEY.6")
+	PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
 
+	PORT_START("KEY.7")
+	PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
 
-static GFXDECODE_START( gfx_odyssey2 )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, odyssey2_graphicslayout, 0, 2 )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, odyssey2_spritelayout, 0, 2 )
-GFXDECODE_END
+	PORT_START("JOY.0")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP)     PORT_PLAYER(2)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT)  PORT_PLAYER(2)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN)   PORT_PLAYER(2)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT)   PORT_PLAYER(2)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON1)         PORT_PLAYER(2)
+	PORT_BIT(0xe0, IP_ACTIVE_HIGH, IPT_UNUSED)
 
+	PORT_START("JOY.1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP)     PORT_PLAYER(1)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT)  PORT_PLAYER(1)
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN)   PORT_PLAYER(1)
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT)   PORT_PLAYER(1)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_BUTTON1)         PORT_PLAYER(1)
+	PORT_BIT(0xe0, IP_ACTIVE_HIGH, IPT_UNUSED)
 
+	PORT_START("RESET")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Reset") PORT_CODE(KEYCODE_F1) PORT_CHANGED_MEMBER(DEVICE_SELF, odyssey2_state, reset_button, 0)
+INPUT_PORTS_END
 
-void odyssey2_state::odyssey2_cartslot(machine_config &config)
-{
-	O2_CART_SLOT(config, m_cart, o2_cart, nullptr);
+static INPUT_PORTS_START( g7400 )
+	PORT_INCLUDE( odyssey2 )
 
-	SOFTWARE_LIST(config, "cart_list").set_original("odyssey2");
-}
+	PORT_MODIFY("KEY.0")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("0  #") PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR('#')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("1  !") PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("2  \"") PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('\"')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(u8"3  £") PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR(0xa3)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("4  $") PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("5  %") PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("6  &") PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("7  '") PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
+
+	PORT_MODIFY("KEY.1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("8  (") PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("9  )") PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')
+
+	PORT_MODIFY("KEY.2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(u8"+  \u2191") PORT_CODE(KEYCODE_PLUS_PAD) PORT_CHAR('+') PORT_CHAR(UCHAR_MAMEKEY(UP))
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
+
+	PORT_MODIFY("KEY.3")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')
+
+	PORT_MODIFY("KEY.4")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M')
+
+	PORT_MODIFY("KEY.5")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(u8"-  \u2193") PORT_CODE(KEYCODE_MINUS) PORT_CODE(KEYCODE_MINUS_PAD) PORT_CHAR('-') PORT_CHAR(UCHAR_MAMEKEY(DOWN))
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(u8"×  \u2196") PORT_CODE(KEYCODE_ASTERISK) PORT_CHAR(0xd7) PORT_CHAR(UCHAR_MAMEKEY(HOME))
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(u8"÷  \u2190") PORT_CODE(KEYCODE_SLASH_PAD) PORT_CHAR(0xf7) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(u8"=  \u2192") PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=') PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Y / Yes") PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("N / No") PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Clear  ;") PORT_CODE(KEYCODE_BACKSPACE) PORT_CODE(KEYCODE_DEL_PAD) PORT_CHAR(8) PORT_CHAR(';')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Enter  _") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(10) PORT_CHAR('_')
+
+	PORT_MODIFY("KEY.6")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Ret") PORT_CODE(KEYCODE_ENTER_PAD) PORT_CHAR(13)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Lock") PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(":  *") PORT_CODE(KEYCODE_COLON) PORT_CHAR(':') PORT_CHAR('*')
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("|  @") PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('|') PORT_CHAR('@')
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("]  [") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('[')
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(u8"¨  ^") PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(0xa8) PORT_CHAR('^')
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME(",  /") PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('/')
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("<  >") PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('<') PORT_CHAR('>')
+
+	PORT_MODIFY("KEY.7")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Break") PORT_CODE(KEYCODE_END) PORT_CHAR(UCHAR_MAMEKEY(PAUSE))
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Cntl") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CODE(KEYCODE_ESC) PORT_CHAR(27)
+INPUT_PORTS_END
 
 
+
+/******************************************************************************
+    Machine Configs
+******************************************************************************/
+
 void odyssey2_state::odyssey2(machine_config &config)
 {
 	/* basic machine hardware */
-	I8048(config, m_maincpu, ((XTAL(7'159'090) * 3) / 4));
+	I8048(config, m_maincpu, (7.15909_MHz_XTAL * 3) / 4);
 	m_maincpu->set_addrmap(AS_PROGRAM, &odyssey2_state::odyssey2_mem);
 	m_maincpu->set_addrmap(AS_IO, &odyssey2_state::odyssey2_io);
-	m_maincpu->p1_in_cb().set(FUNC(odyssey2_state::p1_read));
 	m_maincpu->p1_out_cb().set(FUNC(odyssey2_state::p1_write));
 	m_maincpu->p2_in_cb().set(FUNC(odyssey2_state::p2_read));
 	m_maincpu->p2_out_cb().set(FUNC(odyssey2_state::p2_write));
 	m_maincpu->bus_in_cb().set(FUNC(odyssey2_state::bus_read));
-	m_maincpu->bus_out_cb().set(FUNC(odyssey2_state::bus_write));
 	m_maincpu->t0_in_cb().set("cartslot", FUNC(o2_cart_slot_device::t0_read));
 	m_maincpu->t1_in_cb().set(FUNC(odyssey2_state::t1_read));
 
-	config.set_maximum_quantum(attotime::from_hz(60));
-
 	/* video hardware */
-	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_screen_update(FUNC(odyssey2_state::screen_update_odyssey2));
-	screen.set_palette("palette");
+	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+	m_screen->set_screen_update(FUNC(odyssey2_state::screen_update));
+	m_screen->set_video_attributes(VIDEO_ALWAYS_UPDATE);
+	m_screen->set_palette("palette");
 
-	GFXDECODE(config, "gfxdecode", "palette", gfx_odyssey2);
-	PALETTE(config, "palette", FUNC(odyssey2_state::odyssey2_palette), 32);
+	PALETTE(config, "palette", FUNC(odyssey2_state::odyssey2_palette), 16);
 
-	/* sound hardware */
-	SPEAKER(config, "mono").front_center();
-	I8244(config, m_i8244, XTAL(7'159'090)/2 * 2);
+	I8244(config, m_i8244, 7.15909_MHz_XTAL / 2);
 	m_i8244->set_screen("screen");
+	m_i8244->set_screen_size(360, 243);
 	m_i8244->irq_cb().set_inputline(m_maincpu, MCS48_INPUT_IRQ);
-	m_i8244->postprocess_cb().set(FUNC(odyssey2_state::scanline_postprocess));
 	m_i8244->add_route(ALL_OUTPUTS, "mono", 0.40);
 
-	odyssey2_cartslot(config);
-}
+	SPEAKER(config, "mono").front_center();
 
+	/* cartridge */
+	O2_CART_SLOT(config, m_cart, o2_cart, nullptr);
+	SOFTWARE_LIST(config, "cart_list").set_original("odyssey2").set_filter("O2");
+	SOFTWARE_LIST(config, "g7400_list").set_compatible("g7400").set_filter("O2");
+}
 
 void odyssey2_state::videopac(machine_config &config)
 {
-	/* basic machine hardware */
-	I8048(config, m_maincpu, (XTAL(17'734'470) / 3));
-	m_maincpu->set_addrmap(AS_PROGRAM, &odyssey2_state::odyssey2_mem);
-	m_maincpu->set_addrmap(AS_IO, &odyssey2_state::odyssey2_io);
-	m_maincpu->p1_in_cb().set(FUNC(odyssey2_state::p1_read));
-	m_maincpu->p1_out_cb().set(FUNC(odyssey2_state::p1_write));
-	m_maincpu->p2_in_cb().set(FUNC(odyssey2_state::p2_read));
-	m_maincpu->p2_out_cb().set(FUNC(odyssey2_state::p2_write));
-	m_maincpu->bus_in_cb().set(FUNC(odyssey2_state::bus_read));
-	m_maincpu->bus_out_cb().set(FUNC(odyssey2_state::bus_write));
-	m_maincpu->t0_in_cb().set("cartslot", FUNC(o2_cart_slot_device::t0_read));
-	m_maincpu->t1_in_cb().set(FUNC(odyssey2_state::t1_read));
-
-	config.set_maximum_quantum(attotime::from_hz(60));
-
-	/* video hardware */
-	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_screen_update(FUNC(odyssey2_state::screen_update_odyssey2));
-	screen.set_palette("palette");
-
-	GFXDECODE(config, "gfxdecode", "palette", gfx_odyssey2);
-	PALETTE(config, "palette", FUNC(odyssey2_state::odyssey2_palette), 16);
+	odyssey2(config);
 
-	/* sound hardware */
-	SPEAKER(config, "mono").front_center();
-	I8245(config, m_i8244, XTAL(17'734'470)/5 * 2);
+	// PAL video chip
+	I8245(config.replace(), m_i8244, 17.734476_MHz_XTAL / 5);
 	m_i8244->set_screen("screen");
+	m_i8244->set_screen_size(360, 243);
 	m_i8244->irq_cb().set_inputline(m_maincpu, MCS48_INPUT_IRQ);
-	m_i8244->postprocess_cb().set(FUNC(odyssey2_state::scanline_postprocess));
 	m_i8244->add_route(ALL_OUTPUTS, "mono", 0.40);
 
-	odyssey2_cartslot(config);
+	m_maincpu->set_clock(17.734476_MHz_XTAL / 3);
+
+	subdevice<software_list_device>("cart_list")->set_filter("VP");
+	subdevice<software_list_device>("g7400_list")->set_filter("VP");
+}
+
+void odyssey2_state::videopacf(machine_config &config)
+{
+	videopac(config);
+
+	// different master XTAL
+	m_maincpu->set_clock(17.812_MHz_XTAL / 3);
+	m_i8244->set_clock(17.812_MHz_XTAL / 5);
 }
 
 
 void g7400_state::g7400(machine_config &config)
 {
 	/* basic machine hardware */
-	I8048(config, m_maincpu, XTAL(5'911'000));
+	I8048(config, m_maincpu, 5.911_MHz_XTAL);
 	m_maincpu->set_addrmap(AS_PROGRAM, &g7400_state::odyssey2_mem);
-	m_maincpu->set_addrmap(AS_IO, &g7400_state::g7400_io);
-	m_maincpu->p1_in_cb().set(FUNC(g7400_state::p1_read));
+	m_maincpu->set_addrmap(AS_IO, &g7400_state::odyssey2_io);
 	m_maincpu->p1_out_cb().set(FUNC(g7400_state::p1_write));
 	m_maincpu->p2_in_cb().set(FUNC(g7400_state::p2_read));
 	m_maincpu->p2_out_cb().set(FUNC(g7400_state::p2_write));
 	m_maincpu->bus_in_cb().set(FUNC(g7400_state::bus_read));
-	m_maincpu->bus_out_cb().set(FUNC(g7400_state::bus_write));
 	m_maincpu->t0_in_cb().set("cartslot", FUNC(o2_cart_slot_device::t0_read));
 	m_maincpu->t1_in_cb().set(FUNC(g7400_state::t1_read));
 	m_maincpu->prog_out_cb().set(m_i8243, FUNC(i8243_device::prog_w));
 
-	config.set_maximum_quantum(attotime::from_hz(60));
-
 	/* video hardware */
-	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_screen_update(FUNC(odyssey2_state::screen_update_odyssey2));
-	screen.set_palette("palette");
+	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+	m_screen->set_screen_update(FUNC(g7400_state::screen_update));
+	m_screen->set_video_attributes(VIDEO_ALWAYS_UPDATE);
+	m_screen->set_palette("palette");
 
-	GFXDECODE(config, "gfxdecode", "palette", gfx_odyssey2);
-	PALETTE(config, "palette", FUNC(g7400_state::g7400_palette), 16);
+	PALETTE(config, "palette", m_i8244, FUNC(i8244_device::i8244_palette), 16);
 
 	I8243(config, m_i8243);
-	m_i8243->p4_out_cb().set(FUNC(g7400_state::i8243_p4_w));
-	m_i8243->p5_out_cb().set(FUNC(g7400_state::i8243_p5_w));
-	m_i8243->p6_out_cb().set(FUNC(g7400_state::i8243_p6_w));
-	m_i8243->p7_out_cb().set(FUNC(g7400_state::i8243_p7_w));
+	m_i8243->p4_out_cb().set(FUNC(g7400_state::i8243_port_w<0>));
+	m_i8243->p5_out_cb().set(FUNC(g7400_state::i8243_port_w<1>));
+	m_i8243->p6_out_cb().set(FUNC(g7400_state::i8243_port_w<2>));
+	m_i8243->p7_out_cb().set(FUNC(g7400_state::i8243_port_w<3>));
+
+	EF9340_1(config, m_ef934x, (8.867_MHz_XTAL * 2) / 5, "screen");
+	m_ef934x->set_offsets(15, 5);
+	m_ef934x->read_exram().set(FUNC(g7400_state::ef934x_extram_r));
+	m_ef934x->write_exram().set(FUNC(g7400_state::ef934x_extram_w));
 
-	EF9340_1(config, m_ef9340_1, 3540000, "screen");
-
-	SPEAKER(config, "mono").front_center();
-	I8245(config, m_i8244, 3540000 * 2);
+	I8245(config, m_i8244, (8.867_MHz_XTAL * 2) / 5);
 	m_i8244->set_screen("screen");
+	m_i8244->set_screen_size(360, 243);
 	m_i8244->irq_cb().set_inputline(m_maincpu, MCS48_INPUT_IRQ);
-	m_i8244->postprocess_cb().set(FUNC(g7400_state::scanline_postprocess));
 	m_i8244->add_route(ALL_OUTPUTS, "mono", 0.40);
 
-	odyssey2_cartslot(config);
-	SOFTWARE_LIST(config.replace(), "cart_list").set_original("g7400");
-	SOFTWARE_LIST(config, "ody2_list").set_compatible("odyssey2");
+	SPEAKER(config, "mono").front_center();
+
+	/* cartridge */
+	O2_CART_SLOT(config, m_cart, o2_cart, nullptr);
+	SOFTWARE_LIST(config, "cart_list").set_original("g7400").set_filter("VPP");
+	SOFTWARE_LIST(config, "ody2_list").set_compatible("odyssey2").set_filter("VPP");
 }
 
+void g7400_state::jo7400(machine_config &config)
+{
+	g7400(config);
+
+	// different video clock
+	m_i8244->set_clock(3.5625_MHz_XTAL);
+	m_ef934x->set_clock(3.5625_MHz_XTAL);
+}
 
 void g7400_state::odyssey3(machine_config &config)
 {
-	/* basic machine hardware */
-	I8048(config, m_maincpu, XTAL(5'911'000));
-	m_maincpu->set_addrmap(AS_PROGRAM, &g7400_state::odyssey2_mem);
-	m_maincpu->set_addrmap(AS_IO, &g7400_state::g7400_io);
-	m_maincpu->p1_in_cb().set(FUNC(g7400_state::p1_read));
-	m_maincpu->p1_out_cb().set(FUNC(g7400_state::p1_write));
-	m_maincpu->p2_in_cb().set(FUNC(g7400_state::p2_read));
-	m_maincpu->p2_out_cb().set(FUNC(g7400_state::p2_write));
-	m_maincpu->bus_in_cb().set(FUNC(g7400_state::bus_read));
-	m_maincpu->bus_out_cb().set(FUNC(g7400_state::bus_write));
-	m_maincpu->t0_in_cb().set("cartslot", FUNC(o2_cart_slot_device::t0_read));
-	m_maincpu->t1_in_cb().set(FUNC(g7400_state::t1_read));
-	m_maincpu->prog_out_cb().set(m_i8243, FUNC(i8243_device::prog_w));
+	g7400(config);
 
-	config.set_maximum_quantum(attotime::from_hz(60));
+	// NTSC video chip
+	I8244(config.replace(), m_i8244, 7.15909_MHz_XTAL / 2);
+	m_i8244->set_screen("screen");
+	m_i8244->set_screen_size(360, 243);
+	m_i8244->irq_cb().set_inputline(m_maincpu, MCS48_INPUT_IRQ);
+	m_i8244->add_route(ALL_OUTPUTS, "mono", 0.40);
 
-	/* video hardware */
-	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_screen_update(FUNC(odyssey2_state::screen_update_odyssey2));
-	screen.set_palette("palette");
+	m_ef934x->set_clock(7.15909_MHz_XTAL / 2);
+	m_ef934x->set_offsets(15, 15);
 
-	GFXDECODE(config, "gfxdecode", "palette", gfx_odyssey2);
-	PALETTE(config, "palette", FUNC(g7400_state::g7400_palette), 16);
+	m_maincpu->set_clock((7.15909_MHz_XTAL * 3) / 4);
 
-	I8243(config, m_i8243);
-	m_i8243->p4_out_cb().set(FUNC(g7400_state::i8243_p4_w));
-	m_i8243->p5_out_cb().set(FUNC(g7400_state::i8243_p5_w));
-	m_i8243->p6_out_cb().set(FUNC(g7400_state::i8243_p6_w));
-	m_i8243->p7_out_cb().set(FUNC(g7400_state::i8243_p7_w));
+	// same color encoder as O2 (no RGB port)
+	PALETTE(config.replace(), "palette", FUNC(odyssey2_state::odyssey2_palette), 16);
 
-	EF9340_1(config, m_ef9340_1, 3540000, "screen");
+	subdevice<software_list_device>("cart_list")->set_filter("O3");
+	subdevice<software_list_device>("ody2_list")->set_filter("O3");
+}
 
-	SPEAKER(config, "mono").front_center();
-	I8244(config, m_i8244, 3540000 * 2);
-	m_i8244->set_screen("screen");
-	m_i8244->irq_cb().set_inputline(m_maincpu, MCS48_INPUT_IRQ);
-	m_i8244->postprocess_cb().set(FUNC(g7400_state::scanline_postprocess));
-	m_i8244->add_route(ALL_OUTPUTS, "mono", 0.40);
 
-	odyssey2_cartslot(config);
-	SOFTWARE_LIST(config.replace(), "cart_list").set_original("g7400");
-	SOFTWARE_LIST(config, "ody2_list").set_compatible("odyssey2");
-}
 
+/******************************************************************************
+    ROM Definitions
+******************************************************************************/
 
 ROM_START (odyssey2)
-	ROM_REGION(0x10000,"maincpu",0)    /* safer for the memory handler/bankswitching??? */
+	ROM_REGION(0x0400,"maincpu",0)
 	ROM_LOAD ("o2bios.rom", 0x0000, 0x0400, CRC(8016a315) SHA1(b2e1955d957a475de2411770452eff4ea19f4cee))
-	ROM_REGION(0x100, "gfx1", ROMREGION_ERASEFF)
 ROM_END
 
-
 ROM_START (videopac)
-	ROM_REGION(0x10000,"maincpu",0)    /* safer for the memory handler/bankswitching??? */
-	ROM_SYSTEM_BIOS( 0, "g7000", "g7000" )
-	ROMX_LOAD ("o2bios.rom", 0x0000, 0x0400, CRC(8016a315) SHA1(b2e1955d957a475de2411770452eff4ea19f4cee), ROM_BIOS(0))
-	ROM_SYSTEM_BIOS( 1, "c52", "c52" )
-	ROMX_LOAD ("c52.bin", 0x0000, 0x0400, CRC(a318e8d6) SHA1(a6120aed50831c9c0d95dbdf707820f601d9452e), ROM_BIOS(1))
-	ROM_REGION(0x100, "gfx1", ROMREGION_ERASEFF)
+	ROM_REGION(0x0400,"maincpu",0)
+	ROM_LOAD ("o2bios.rom", 0x0000, 0x0400, CRC(8016a315) SHA1(b2e1955d957a475de2411770452eff4ea19f4cee))
+ROM_END
+
+ROM_START (videopacf)
+	ROM_REGION(0x0400,"maincpu",0)
+	ROM_LOAD ("c52.rom", 0x0000, 0x0400, CRC(a318e8d6) SHA1(a6120aed50831c9c0d95dbdf707820f601d9452e))
 ROM_END
 
 
 ROM_START (g7400)
-	ROM_REGION(0x10000,"maincpu",0)    /* safer for the memory handler/bankswitching??? */
+	ROM_REGION(0x0400,"maincpu",0)
 	ROM_LOAD ("g7400.bin", 0x0000, 0x0400, CRC(e20a9f41) SHA1(5130243429b40b01a14e1304d0394b8459a6fbae))
-	ROM_REGION(0x100, "gfx1", ROMREGION_ERASEFF)
 ROM_END
 
-
 ROM_START (jopac)
-	ROM_REGION(0x10000,"maincpu",0)    /* safer for the memory handler/bankswitching??? */
+	ROM_REGION(0x0400,"maincpu",0)
 	ROM_LOAD ("jopac.bin", 0x0000, 0x0400, CRC(11647ca5) SHA1(54b8d2c1317628de51a85fc1c424423a986775e4))
-	ROM_REGION(0x100, "gfx1", ROMREGION_ERASEFF)
 ROM_END
 
-
 ROM_START (odyssey3)
-	ROM_REGION(0x10000, "maincpu", 0)
+	ROM_REGION(0x0400, "maincpu", 0)
 	ROM_LOAD ("odyssey3.bin", 0x0000, 0x0400, CRC(e2b23324) SHA1(0a38c5f2cea929d2fe0a23e5e1a60de9155815dc))
-
-	ROM_REGION(0x100, "gfx1", ROMREGION_ERASEFF)
 ROM_END
 
-/*    YEAR  NAME      PARENT    COMPAT  MACHINE   INPUT     CLASS           INIT           COMPANY     FULLNAME                                FLAGS */
-COMP( 1978, odyssey2, 0,        0,      odyssey2, odyssey2, odyssey2_state, init_odyssey2, "Magnavox", "Odyssey 2",                            0 )
-COMP( 1979, videopac, odyssey2, 0,      videopac, odyssey2, odyssey2_state, init_odyssey2, "Philips",  "Videopac G7000/C52",                   0 )
-COMP( 1983, g7400,    odyssey2, 0,      g7400,    odyssey2, g7400_state,    init_odyssey2, "Philips",  "Videopac Plus G7400",                  MACHINE_IMPERFECT_GRAPHICS )
-COMP( 1983, jopac,    odyssey2, 0,      g7400,    odyssey2, g7400_state,    init_odyssey2, "Brandt",   "Jopac JO7400",                         MACHINE_IMPERFECT_GRAPHICS )
-COMP( 1983, odyssey3, odyssey2, 0,      odyssey3, odyssey2, g7400_state,    init_odyssey2, "Magnavox", "Odyssey 3 Command Center (prototype)", MACHINE_IMPERFECT_GRAPHICS )
+} // anonymous namespace
+
+
+
+/******************************************************************************
+    Drivers
+******************************************************************************/
+
+//    YEAR  NAME       PARENT   CMP MACHINE    INPUT     STATE           INIT        COMPANY, FULLNAME, FLAGS
+COMP( 1979, odyssey2,  0,        0, odyssey2,  odyssey2, odyssey2_state, empty_init, "Magnavox", "Odyssey 2 (US)", MACHINE_SUPPORTS_SAVE )
+COMP( 1978, videopac,  odyssey2, 0, videopac,  odyssey2, odyssey2_state, empty_init, "Philips", "Videopac G7000 (Europe)", MACHINE_SUPPORTS_SAVE )
+COMP( 1979, videopacf, odyssey2, 0, videopacf, odyssey2, odyssey2_state, empty_init, "Philips", "Videopac C52 (France)", MACHINE_SUPPORTS_SAVE )
+
+COMP( 1983, g7400,     0,        0, g7400,     g7400,    g7400_state,    empty_init, "Philips", "Videopac+ G7400 (Europe)", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, jopac,     g7400,    0, jo7400,    g7400,    g7400_state,    empty_init, "Philips (Brandt license)", "Jopac JO7400 (France)", MACHINE_SUPPORTS_SAVE )
+COMP( 1983, odyssey3,  g7400,    0, odyssey3,  g7400,    g7400_state,    empty_init, "Magnavox", "Odyssey 3 Command Center (US, prototype)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ondra.cpp mame-0.224+dfsg.1/src/mame/drivers/ondra.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ondra.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ondra.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,119 +1,155 @@
 // license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic
-/***************************************************************************
+/*****************************************************************************
 
-        Ondra driver by Miodrag Milanovic
+Ondra driver by Miodrag Milanovic
 
-        08/09/2008 Preliminary driver.
+2008-09-08 Preliminary driver.
 
-****************************************************************************/
+ToDo:
+- Paste/Natural keyboard are useless because 3rd modifier key is not supported.
+- Add 2x i8253 pits which are part of the video timing circuit. They are not
+  connected to the data bus, and are always selected.
+- The video is somewhat similar to the standard super80, in that the CPU is
+  turned off by BUSRQ about half the time, so that the video can be drawn
+  without causing snow. The CPU can gain full control by disabling the video.
+- Sound is a speaker connected to a multivibrator circuit. There are 3 diodes
+  from this circuit to allow a choice of 7 frequencies. We have used a buzzer
+  with selected arbitrary frequencies, not having any idea what they should be.
+- Ondrav: can load from softlist. Load the tape then press Enter.
+- Ondrav: doesn't seem to accept any other commands, need instructions.
+  You have to press Esc before trying again.
+- Ondrat: Doesn't load from softlist
+- Cassette: don't know how to save.
+
+******************************************************************************/
 
 
 #include "emu.h"
 #include "includes/ondra.h"
-
 #include "cpu/z80/z80.h"
-#include "imagedev/cassette.h"
-#include "machine/ram.h"
 #include "emupal.h"
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
 
 /* Address maps */
-void ondra_state::ondra_mem(address_map &map)
+void ondra_state::mem_map(address_map &map)
 {
 	map(0x0000, 0x3fff).bankrw("bank1");
 	map(0x4000, 0xdfff).bankrw("bank2");
 	map(0xe000, 0xffff).bankrw("bank3");
 }
 
-void ondra_state::ondra_io(address_map &map)
+void ondra_state::io_map(address_map &map)
 {
-	map.global_mask(0x0b);
+	//map.global_mask(0x0b);
 	map.unmap_value_high();
-	map(0x03, 0x03).w(FUNC(ondra_state::ondra_port_03_w));
-	//map(0x09, 0x09).w(FUNC(ondra_state::ondra_port_09_w);
-	//map(0x0a, 0x0a).w(FUNC(ondra_state::ondra_port_0a_w);
+	map(0x03, 0x03).mirror(0xff00).w(FUNC(ondra_state::port03_w));
+	//map(0x09, 0x09).mirror(0xff00).r(FUNC(ondra_state::port09_r));
+	map(0x0a, 0x0a).mirror(0xff00).w(FUNC(ondra_state::port0a_w));
 }
 
 /* Input ports */
 static INPUT_PORTS_START( ondra )
 	PORT_START("LINE0")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q)
-		PORT_BIT(0xE0, IP_ACTIVE_LOW, IPT_UNUSED)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("R 4 $") PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHAR('r') PORT_CHAR('4') PORT_CHAR('$')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E 3 #") PORT_CODE(KEYCODE_E) PORT_CHAR('E') PORT_CHAR('e') PORT_CHAR('3') PORT_CHAR('#')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W 2 \"") PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_CHAR('w') PORT_CHAR('2') PORT_CHAR('\"')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("T 5 %") PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_CHAR('t') PORT_CHAR('5') PORT_CHAR('%')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q 1 !") PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_CHAR('q') PORT_CHAR('1') PORT_CHAR('!')
 	PORT_START("LINE1")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A)
-		PORT_BIT(0xE0, IP_ACTIVE_LOW, IPT_UNUSED)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F ^") PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_CHAR('f') PORT_CHAR('^')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D =") PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHAR('d') PORT_CHAR('=')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("S +") PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHAR('s') PORT_CHAR('+')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G _") PORT_CODE(KEYCODE_G) PORT_CHAR('G') PORT_CHAR('g') PORT_CHAR('_')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A -") PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHAR('a') PORT_CHAR('-')
 	PORT_START("LINE2")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_RSHIFT)
-		PORT_BIT(0xE0, IP_ACTIVE_LOW, IPT_UNUSED)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C :") PORT_CODE(KEYCODE_C) PORT_CHAR('C') PORT_CHAR('c') PORT_CHAR(':')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("X /") PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('x') PORT_CHAR('/')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z *") PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHAR('z') PORT_CHAR('*')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("V ;") PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_CHAR('v') PORT_CHAR(';')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_RSHIFT) //PORT_CHAR(UCHAR_SHIFT_3)  not supported yet
 	PORT_START("LINE3")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Space") PORT_CODE(KEYCODE_SPACE)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0xE0, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("LINE4")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0-9") PORT_CODE(KEYCODE_RALT)
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0-9") PORT_CODE(KEYCODE_RALT) PORT_CHAR(UCHAR_SHIFT_2)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("CS")  PORT_CODE(KEYCODE_LALT)
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("UpCase") PORT_CODE(KEYCODE_LSHIFT)
-		PORT_BIT(0xE0, IP_ACTIVE_LOW, IPT_UNUSED)
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("UpCase") PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
 	PORT_START("LINE5")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("J >") PORT_CODE(KEYCODE_J) PORT_CHAR('J') PORT_CHAR('j') PORT_CHAR('>')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("K [") PORT_CODE(KEYCODE_K) PORT_CHAR('K') PORT_CHAR('k') PORT_CHAR('[')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("L ]") PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHAR('l') PORT_CHAR(']')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("H <") PORT_CODE(KEYCODE_H) PORT_CHAR('H') PORT_CHAR('h') PORT_CHAR('<')
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER)
-		PORT_BIT(0xE0, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("LINE6")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P)
-		PORT_BIT(0xE0, IP_ACTIVE_LOW, IPT_UNUSED)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("U 7 \'") PORT_CODE(KEYCODE_U) PORT_CHAR('U') PORT_CHAR('u') PORT_CHAR('7') PORT_CHAR('\'')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("I 8 (") PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_CHAR('i') PORT_CHAR('8') PORT_CHAR('(')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("O 9 )") PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_CHAR('o') PORT_CHAR('9') PORT_CHAR(')')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Y 6 &") PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_CHAR('y') PORT_CHAR('6') PORT_CHAR('&')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("P 0 @") PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHAR('p') PORT_CHAR('0') PORT_CHAR('@')
 	PORT_START("LINE7")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("N ,") PORT_CODE(KEYCODE_N) PORT_CHAR('N') PORT_CHAR('n') PORT_CHAR(',')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("M .") PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHAR('m') PORT_CHAR('.')
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Up") PORT_CODE(KEYCODE_UP)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B)
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B ?") PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHAR('b') PORT_CHAR('?')
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL)
-		PORT_BIT(0xE0, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("LINE8")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Left") PORT_CODE(KEYCODE_LEFT)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Down") PORT_CODE(KEYCODE_DOWN)
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Right") PORT_CODE(KEYCODE_RIGHT)
-		PORT_BIT(0xE0, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("LINE9")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN) PORT_CODE(KEYCODE_2_PAD) PORT_CODE(JOYCODE_Y_DOWN_SWITCH)  PORT_PLAYER(1)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT) PORT_CODE(KEYCODE_4_PAD) PORT_CODE(JOYCODE_X_LEFT_SWITCH)  PORT_PLAYER(1)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)   PORT_CODE(KEYCODE_8_PAD) PORT_CODE(JOYCODE_Y_UP_SWITCH)    PORT_PLAYER(1)
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_BUTTON1)       PORT_CODE(KEYCODE_0_PAD) PORT_CODE(JOYCODE_BUTTON1)        PORT_PLAYER(1)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT)PORT_CODE(KEYCODE_6_PAD) PORT_CODE(JOYCODE_X_RIGHT_SWITCH) PORT_PLAYER(1)
-		PORT_BIT(0xE0, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("NMI")
-		PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("NMI") PORT_CODE(KEYCODE_ESC)
+		PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("NMI") PORT_CODE(KEYCODE_ESC) PORT_CHANGED_MEMBER(DEVICE_SELF, ondra_state, nmi_button, 0)
 INPUT_PORTS_END
 
+INPUT_CHANGED_MEMBER(ondra_state::nmi_button)
+{
+	m_maincpu->set_input_line(INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE);
+}
+
+u32 ondra_state::screen_update_ondra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	u8 *r = m_ram->pointer();
+
+	u8 code1=0,code2=0;
+	int y, x, b;
+	int Vaddr = 0x2800;
+
+	for (x = 0; x < 40; x++)
+	{
+		for (y = 127; y >=0; y--)
+		{
+			if (m_video_enable)
+			{
+				code1 = r[0xd700 + Vaddr + 0x80];
+				code2 = r[0xd700 + Vaddr + 0x00];
+			}
+			for (b = 0; b < 8; b++)
+			{
+				bitmap.pix16(2*y, x*8+b) =  ((code1 << b) & 0x80) ? 1 : 0;
+				bitmap.pix16(2*y+1, x*8+b) =  ((code2 << b) & 0x80) ? 1 : 0;
+			}
+			Vaddr++;
+		}
+		Vaddr = (Vaddr - 128) - 256;
+	}
+	return 0;
+}
+
 WRITE_LINE_MEMBER(ondra_state::vblank_irq)
 {
 	if (state)
@@ -124,9 +160,9 @@
 void ondra_state::ondra(machine_config &config)
 {
 	/* basic machine hardware */
-	Z80(config, m_maincpu, 2000000);
-	m_maincpu->set_addrmap(AS_PROGRAM, &ondra_state::ondra_mem);
-	m_maincpu->set_addrmap(AS_IO, &ondra_state::ondra_io);
+	Z80(config, m_maincpu, 8_MHz_XTAL / 4);
+	m_maincpu->set_addrmap(AS_PROGRAM, &ondra_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &ondra_state::io_map);
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -140,12 +176,13 @@
 
 	PALETTE(config, "palette", palette_device::MONOCHROME);
 
-
 	// sound hardware
 	SPEAKER(config, "mono").front_center();
+	BEEP(config, m_beep, 950); // guess
+	m_beep->add_route(ALL_OUTPUTS, "mono", 0.25);
 
 	CASSETTE(config, m_cassette);
-	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+	m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
 	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
 	m_cassette->set_interface("ondra_cass");
 
@@ -158,31 +195,31 @@
 /* ROM definition */
 
 ROM_START( ondrat )
-	ROM_REGION( 0x14000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "tesla_a.rom", 0x10000, 0x0800, CRC(6d56b815) SHA1(7feb4071d5142e4c2f891747b75fa4d48ccad262) )
-	ROM_COPY( "maincpu", 0x10000, 0x10800, 0x0800 )
-	ROM_COPY( "maincpu", 0x10000, 0x11000, 0x0800 )
-	ROM_COPY( "maincpu", 0x10000, 0x11800, 0x0800 )
-	ROM_LOAD( "tesla_b.rom", 0x12000, 0x0800, CRC(5f145eaa) SHA1(c1eac68b13fedc4d0d6f98b15e2a5397f0139dc3) )
-	ROM_COPY( "maincpu", 0x10000, 0x12800, 0x0800 )
-	ROM_COPY( "maincpu", 0x10000, 0x13000, 0x0800 )
-	ROM_COPY( "maincpu", 0x10000, 0x13800, 0x0800 )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "tesla_a.d22", 0x0000, 0x0800, CRC(6d56b815) SHA1(7feb4071d5142e4c2f891747b75fa4d48ccad262) )
+	ROM_LOAD( "tesla_b.d21", 0x2000, 0x0800, CRC(5f145eaa) SHA1(c1eac68b13fedc4d0d6f98b15e2a5397f0139dc3) )
+
+	ROM_REGION( 0x0040, "proms", 0 )
+	ROM_LOAD( "mh74188.d27", 0x0000, 0x0040, CRC(7faceafe) SHA1(597f867e38b1c66d4622662cb01b3aefa680f234) )
 ROM_END
 
 ROM_START( ondrav )
-	ROM_REGION( 0x14000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "vili_a.rom", 0x10000, 0x0800, CRC(76932657) SHA1(1f3700f670f158e4bed256aed751e2c1331a28e8) )
-	ROM_COPY( "maincpu", 0x10000, 0x10800, 0x0800 )
-	ROM_COPY( "maincpu", 0x10000, 0x11000, 0x0800 )
-	ROM_COPY( "maincpu", 0x10000, 0x11800, 0x0800 )
-	ROM_LOAD( "vili_b.rom", 0x12000, 0x0800, CRC(03a6073f) SHA1(66f198e63f473e09350bcdbb10fe0cf440111bec) )
-	ROM_COPY( "maincpu", 0x10000, 0x12800, 0x0800 )
-	ROM_COPY( "maincpu", 0x10000, 0x13000, 0x0800 )
-	ROM_COPY( "maincpu", 0x10000, 0x13800, 0x0800 )
+	ROM_REGION( 0x4000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "vili_a.d22",  0x0000, 0x0800, CRC(76932657) SHA1(1f3700f670f158e4bed256aed751e2c1331a28e8) )
+	ROM_RELOAD(0x0800, 0x0800)
+	ROM_RELOAD(0x1000, 0x0800)
+	ROM_RELOAD(0x1800, 0x0800)
+	ROM_LOAD( "vili_b.d21",  0x2000, 0x0800, CRC(03a6073f) SHA1(66f198e63f473e09350bcdbb10fe0cf440111bec) )
+	ROM_RELOAD(0x2800, 0x0800)
+	ROM_RELOAD(0x3000, 0x0800)
+	ROM_RELOAD(0x3800, 0x0800)
+
+	ROM_REGION( 0x0040, "proms", 0 )
+	ROM_LOAD( "mh74188.d27", 0x0000, 0x0040, CRC(7faceafe) SHA1(597f867e38b1c66d4622662cb01b3aefa680f234) )
 ROM_END
 
 /* Driver */
 
 //    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY  FULLNAME      FLAGS
-COMP( 1989, ondrat, 0,      0,      ondra,   ondra, ondra_state, empty_init, "Tesla", "Ondra",      0 )
-COMP( 1989, ondrav, ondrat, 0,      ondra,   ondra, ondra_state, empty_init, "ViLi",  "Ondra ViLi", 0 )
+COMP( 1989, ondrat, 0,      0,      ondra,   ondra, ondra_state, empty_init, "Tesla", "Ondra",      MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1989, ondrav, ondrat, 0,      ondra,   ondra, ondra_state, empty_init, "ViLi",  "Ondra ViLi", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/orao.cpp mame-0.224+dfsg.1/src/mame/drivers/orao.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/orao.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/orao.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,21 +2,29 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        Orao driver by Miodrag Milanovic
+Orao driver by Miodrag Milanovic
 
-        01/03/2008 Updated to work with latest SVN code
-        23/02/2008 Sound support added.
-        22/02/2008 Preliminary driver.
+2008-02-22 Preliminary driver.
+2008-02-23 Sound support added.
+2008-03-01 Updated to work with latest SVN code
+
+Driver is based on work of Josip Perusanec
+
+Ctrl-V turns on keyclick
+Ctrl-S turns on reversed video
+
+BC starts BASIC. orao103: EXIT to quit. orao: unknown how to quit.
+
+Todo:
+- When pasting, shift key doesn't work
+- orao103: loads its own tapes, but can't load software items
+- orao: can't load anything
 
-        Driver is based on work of Josip Perusanec
 
 ****************************************************************************/
 
 #include "emu.h"
-#include "includes/orao.h"
-
 #include "cpu/m6502/m6502.h"
-
 #include "emupal.h"
 #include "screen.h"
 #include "softlist.h"
@@ -24,122 +32,145 @@
 
 #include "formats/orao_cas.h"
 
+#include "sound/spkrdev.h"
+#include "imagedev/cassette.h"
+
+class orao_state : public driver_device
+{
+public:
+	orao_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_memory(*this, "memory")
+		, m_vram(*this, "videoram")
+		, m_maincpu(*this, "maincpu")
+		, m_speaker(*this, "speaker")
+		, m_cassette(*this, "cassette")
+		, m_io_keyboard(*this, "LINE.%d", 0)
+	{ }
+
+	void orao(machine_config &config);
+
+	void init_orao();
+
+private:
+	u8 kbd_r(offs_t offset);
+	void sound_w(offs_t offset, u8 data);
+	virtual void machine_reset() override;
+	virtual void machine_start() override;
+	u32 screen_update_orao(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+	void mem_map(address_map &map);
+
+	required_shared_ptr<u8> m_memory;
+	required_shared_ptr<u8> m_vram;
+	required_device<cpu_device> m_maincpu;
+	required_device<speaker_sound_device> m_speaker;
+	required_device<cassette_image_device> m_cassette;
+	required_ioport_array<20> m_io_keyboard;
+	bool m_spr_bit;
+};
+
 
 /* Address maps */
-void orao_state::orao_mem(address_map &map)
+void orao_state::mem_map(address_map &map)
 {
 	map(0x0000, 0x5fff).ram().share("memory");
-	map(0x6000, 0x7fff).ram().share("video_ram"); // video ram
-	map(0x8000, 0x9fff).rw(FUNC(orao_state::orao_io_r), FUNC(orao_state::orao_io_w));
+	map(0x6000, 0x7fff).ram().share("videoram");
+	map(0x8000, 0x87ff).r(FUNC(orao_state::kbd_r));
+	map(0x8800, 0x8fff).w(FUNC(orao_state::sound_w));
 	map(0xa000, 0xafff).ram();  // extension
 	map(0xb000, 0xbfff).ram();  // DOS
-	map(0xc000, 0xdfff).rom();
-	map(0xe000, 0xffff).rom();
+	map(0xc000, 0xffff).rom().region("maincpu",0);
 }
 
 
 /* Input ports */
+// bits 0-3 are masked out in the code
 static INPUT_PORTS_START( orao )
 	PORT_START("LINE.0")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP))
 	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
 
 	PORT_START("LINE.1")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Control") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL)
 	PORT_BIT(0xC0, IP_ACTIVE_LOW, IPT_UNUSED)
 
 	PORT_START("LINE.2")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F1") PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1))
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F2") PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2))
 	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F3") PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3))
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F4") PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4))
 
 	PORT_START("LINE.3")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
 	PORT_BIT(0xC0, IP_ACTIVE_LOW, IPT_UNUSED)
 
 	PORT_START("LINE.4")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z')
 	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T')
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('&')
 
 	PORT_START("LINE.5")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
 	PORT_BIT(0xC0, IP_ACTIVE_LOW, IPT_UNUSED)
 
 	PORT_START("LINE.6")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I')
 	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('U')
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('\'')
 
 	PORT_START("LINE.7")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('(')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
 	PORT_BIT(0xC0, IP_ACTIVE_LOW, IPT_UNUSED)
 
 	PORT_START("LINE.8")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
 	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W')
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
 
 	PORT_START("LINE.9")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('"')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
 	PORT_BIT(0xC0, IP_ACTIVE_LOW, IPT_UNUSED)
 
 	PORT_START("LINE.10")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J')
 	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('K')
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M')
 
 	PORT_START("LINE.11")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
 	PORT_BIT(0xC0, IP_ACTIVE_LOW, IPT_UNUSED)
 
 	PORT_START("LINE.12")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A')
 	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S')
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y')
 
 	PORT_START("LINE.13")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C')
 	PORT_BIT(0xC0, IP_ACTIVE_LOW, IPT_UNUSED)
 
 	PORT_START("LINE.14")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H')
 	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G')
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N')
 
 	PORT_START("LINE.15")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V')
 	PORT_BIT(0xC0, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -151,7 +182,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH2) PORT_CHAR(':') PORT_CHAR('*')
 
 	PORT_START("LINE.17")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Del") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('^') PORT_CHAR('@')
 	PORT_BIT(0xC0, IP_ACTIVE_LOW, IPT_UNUSED)
@@ -163,18 +193,92 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR(';') PORT_CHAR('+')
 
 	PORT_START("LINE.19")
-	PORT_BIT(0x0F, IP_ACTIVE_HIGH, IPT_UNUSED)
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS) PORT_CHAR('-') PORT_CHAR('=')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0')
 	PORT_BIT(0xC0, IP_ACTIVE_LOW, IPT_UNUSED)
 INPUT_PORTS_END
 
+/* Driver initialization */
+void orao_state::init_orao()
+{
+	memset(m_memory,0xff,0x6000);
+}
+
+void orao_state::machine_reset()
+{
+	m_spr_bit = 0;
+}
+
+void orao_state::machine_start()
+{
+	save_item(NAME(m_spr_bit));
+}
+
+u8 orao_state::kbd_r(offs_t offset)
+{
+	switch(offset)
+	{
+		/* Keyboard*/
+		case 0x07FC : return m_io_keyboard[0]->read();
+		case 0x07FD : return m_io_keyboard[1]->read();
+		case 0x07FA : return m_io_keyboard[2]->read();
+		case 0x07FB : return m_io_keyboard[3]->read();
+		case 0x07F6 : return m_io_keyboard[4]->read();
+		case 0x07F7 : return m_io_keyboard[5]->read();
+		case 0x07EE : return m_io_keyboard[6]->read();
+		case 0x07EF : return m_io_keyboard[7]->read();
+		case 0x07DE : return m_io_keyboard[8]->read();
+		case 0x07DF : return m_io_keyboard[9]->read();
+		case 0x07BE : return m_io_keyboard[10]->read();
+		case 0x07BF : return m_io_keyboard[11]->read();
+		case 0x077E : return m_io_keyboard[12]->read();
+		case 0x077F : return m_io_keyboard[13]->read();
+		case 0x06FE : return m_io_keyboard[14]->read();
+		case 0x06FF : return m_io_keyboard[15]->read();
+		case 0x05FE : return m_io_keyboard[16]->read();
+		case 0x05FF : return m_io_keyboard[17]->read();
+		case 0x03FE : return m_io_keyboard[18]->read();
+		case 0x03FF : return m_io_keyboard[19]->read();
+		/* Tape */
+		case 0x07FF : return (m_cassette->input() > 0.002) ? 0xff : 0;
+	}
+
+	return 0xff;
+}
+
+
+void orao_state::sound_w(offs_t offset, u8 data)
+{
+	m_speaker->level_w(m_spr_bit);
+	m_cassette->output(m_spr_bit ? 1.0 : -1.0);
+	m_spr_bit ^= 1;
+}
+
+// bitmapped graphics
+u32 orao_state::screen_update_orao(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	u16 addr = 0;
+	for (u16 y = 0; y < 256; y++)
+	{
+		int horpos = 0;
+		for (u8 x = 0; x < 32; x++)
+		{
+			u8 code = m_vram[addr++];
+			for (u8 b = 0; b < 8; b++)
+			{
+				bitmap.pix16(y, horpos++) =  (code >> b) & 0x01;
+			}
+		}
+	}
+	return 0;
+}
+
 /* Machine driver */
 void orao_state::orao(machine_config &config)
 {
 	/* basic machine hardware */
-	M6502(config, m_maincpu, 1000000);
-	m_maincpu->set_addrmap(AS_PROGRAM, &orao_state::orao_mem);
+	M6502(config, m_maincpu, 8_MHz_XTAL / 8);
+	m_maincpu->set_addrmap(AS_PROGRAM, &orao_state::mem_map);
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -187,7 +291,6 @@
 
 	PALETTE(config, "palette", palette_device::MONOCHROME);
 
-
 	/* audio hardware */
 	SPEAKER(config, "mono").front_center();
 	SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 0.50);
@@ -203,18 +306,18 @@
 
 /* ROM definition */
 ROM_START( orao )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "bas12.rom", 0xc000, 0x2000, CRC(42ae6f69) SHA1(b9d4a544fae13a9c492af027545178addd557111) )
-	ROM_LOAD( "crt12.rom", 0xe000, 0x2000, CRC(94ebdc94) SHA1(3959d717f96558823ccc806c842d2fb5ab0c3890) )
+	ROM_REGION( 0x4000, "maincpu", 0 )
+	ROM_LOAD( "bas12.ic5", 0x0000, 0x2000, CRC(42ae6f69) SHA1(b9d4a544fae13a9c492af027545178addd557111) )
+	ROM_LOAD( "crt12.ic6", 0x2000, 0x2000, CRC(94ebdc94) SHA1(3959d717f96558823ccc806c842d2fb5ab0c3890) )
 ROM_END
 
 ROM_START( orao103 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "bas13.rom", 0xc000, 0x2000, CRC(35daf5da) SHA1(499c5a4bd930c26ec6226623c2793b4c7f771658) )
-	ROM_LOAD( "crt13.rom", 0xe000, 0x2000, CRC(e7076014) SHA1(0e213287b0b520440af6a2a6297788a9356818c2) )
+	ROM_REGION( 0x4000, "maincpu", 0 )
+	ROM_LOAD( "bas13.ic5", 0x0000, 0x2000, CRC(35daf5da) SHA1(499c5a4bd930c26ec6226623c2793b4c7f771658) )
+	ROM_LOAD( "crt13.ic6", 0x2000, 0x2000, CRC(e7076014) SHA1(0e213287b0b520440af6a2a6297788a9356818c2) )
 ROM_END
 
 /* Driver */
 //    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT  CLASS       INIT          COMPANY         FULLNAME    FLAGS
-COMP( 1984, orao,    0,      0,      orao,    orao,  orao_state, init_orao,    "PEL Varazdin", "Orao 102", 0 )
-COMP( 1985, orao103, orao,   0,      orao,    orao,  orao_state, init_orao103, "PEL Varazdin", "Orao 103", 0 )
+COMP( 1984, orao,    0,      0,      orao,    orao,  orao_state, init_orao,    "PEL Varazdin", "Orao 102", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1985, orao103, orao,   0,      orao,    orao,  orao_state, init_orao,    "PEL Varazdin", "Orao 103", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/orion.cpp mame-0.224+dfsg.1/src/mame/drivers/orion.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/orion.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/orion.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,10 +2,19 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        Orion driver by Miodrag Milanovic
+Orion driver by Miodrag Milanovic
 
-        22/04/2008 Orion Pro added
-        02/04/2008 Preliminary driver.
+2008-04-02 Preliminary driver.
+2008-04-22 Orion Pro added
+
+Orionide and orionidm produce ERROR at start, not sure why. The others
+appear to function well, as long as you use the romdisk software item.
+You can load tapes with the CH4 program which is found on the romdisk.
+
+Orionpro has its own menu. If you choose Orion Pro, you need to have the
+cpm370 disk in the drive. If you choose Orion 128, you need the romdisk.
+
+It's unknown how to create a tape.
 
 ****************************************************************************/
 
@@ -13,9 +22,7 @@
 #include "emu.h"
 #include "includes/orion.h"
 
-#include "imagedev/cassette.h"
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
 #include "formats/smx_dsk.h"
@@ -25,7 +32,7 @@
 /* Address maps */
 
 /* Orion 128 */
-void orion_state::orion128_mem(address_map &map)
+void orion_state::mem_map(address_map &map)
 {
 	map(0x0000, 0xefff).bankrw("bank1");
 	map(0xf000, 0xf3ff).bankrw("bank2");
@@ -39,7 +46,7 @@
 }
 
 /* Orion Z80 Card II */
-void orion_state::orion128_io(address_map &map)
+void orion_state::io_map(address_map &map)
 {
 	map.global_mask(0xff);
 	map.unmap_value_high();
@@ -48,7 +55,7 @@
 	map(0xfa, 0xfa).w(FUNC(orion_state::orion128_video_page_w));
 }
 
-void orion_state::orionz80_mem(address_map &map)
+void orion_z80_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x0000, 0x3fff).bankrw("bank1");
@@ -59,12 +66,12 @@
 }
 
 /* Orion Pro */
-void orion_state::orionz80_io(address_map &map)
+void orion_z80_state::io_map(address_map &map)
 {
-	map(0x0000, 0xffff).rw(FUNC(orion_state::orionz80_io_r), FUNC(orion_state::orionz80_io_w));
+	map(0x0000, 0xffff).rw(FUNC(orion_z80_state::orionz80_io_r), FUNC(orion_z80_state::orionz80_io_w));
 }
 
-void orion_state::orionpro_mem(address_map &map)
+void orion_pro_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x0000, 0x1fff).bankrw("bank1");
@@ -77,9 +84,9 @@
 	map(0xf800, 0xffff).bankrw("bank8");
 }
 
-void orion_state::orionpro_io(address_map &map)
+void orion_pro_state::io_map(address_map &map)
 {
-	map(0x0000, 0xffff).rw(FUNC(orion_state::orionpro_io_r), FUNC(orion_state::orionpro_io_w));
+	map(0x0000, 0xffff).rw(FUNC(orion_pro_state::orionpro_io_r), FUNC(orion_pro_state::orionpro_io_w));
 }
 
 FLOPPY_FORMATS_MEMBER( orion_state::orion_floppy_formats )
@@ -90,19 +97,19 @@
 void orion_state::orion128(machine_config &config)
 {
 	I8080(config, m_maincpu, 2000000);
-	m_maincpu->set_addrmap(AS_PROGRAM, &orion_state::orion128_mem);
-	m_maincpu->set_addrmap(AS_IO, &orion_state::orion128_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &orion_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &orion_state::io_map);
 
-	auto &ppi1(I8255A(config, "ppi8255_1"));
-	ppi1.in_pa_callback().set(FUNC(orion_state::orion_romdisk_porta_r));
-	ppi1.out_pb_callback().set(FUNC(orion_state::orion_romdisk_portb_w));
-	ppi1.out_pc_callback().set(FUNC(orion_state::orion_romdisk_portc_w));
-
-	auto &ppi2(I8255A(config, "ppi8255_2"));
-	ppi2.out_pa_callback().set(FUNC(radio86_state::radio86_8255_porta_w2));
-	ppi2.in_pb_callback().set(FUNC(radio86_state::radio86_8255_portb_r2));
-	ppi2.in_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_r2));
-	ppi2.out_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_w2));
+	I8255A(config, m_ppi1);
+	m_ppi1->in_pa_callback().set(FUNC(orion_state::orion_romdisk_porta_r));
+	m_ppi1->out_pb_callback().set(FUNC(orion_state::orion_romdisk_portb_w));
+	m_ppi1->out_pc_callback().set(FUNC(orion_state::orion_romdisk_portc_w));
+
+	I8255A(config, m_ppi2);
+	m_ppi2->out_pa_callback().set(FUNC(orion_state::radio86_8255_porta_w2));
+	m_ppi2->in_pb_callback().set(FUNC(orion_state::radio86_8255_portb_r2));
+	m_ppi2->in_pc_callback().set(FUNC(orion_state::radio86_8255_portc_r2));
+	m_ppi2->out_pc_callback().set(FUNC(orion_state::radio86_8255_portc_w2));
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
@@ -117,11 +124,11 @@
 
 	SPEAKER(config, "mono").front_center();
 
-	auto &cassette(CASSETTE(config, "cassette"));
-	cassette.set_formats(rko_cassette_formats);
-	cassette.set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
-	cassette.add_route(ALL_OUTPUTS, "mono", 0.05);
-	cassette.set_interface("orion_cass");
+	CASSETTE(config, m_cassette);
+	m_cassette->set_formats(rko_cassette_formats);
+	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
+	m_cassette->set_interface("orion_cass");
 
 	SOFTWARE_LIST(config, "cass_list").set_original("orion_cass");
 
@@ -148,31 +155,31 @@
 void orion_state::orion128ms(machine_config &config)
 {
 	orion128(config);
-	auto &ppi2(I8255A(config.replace(), "ppi8255_2"));
-	ppi2.out_pa_callback().set(FUNC(radio86_state::radio86_8255_porta_w2));
-	ppi2.in_pb_callback().set(FUNC(radio86_state::radio86_8255_portb_r2));
-	ppi2.in_pc_callback().set(FUNC(radio86_state::rk7007_8255_portc_r));
-	ppi2.out_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_w2));
+	I8255A(config.replace(), m_ppi2);
+	m_ppi2->out_pa_callback().set(FUNC(orion_state::radio86_8255_porta_w2));
+	m_ppi2->in_pb_callback().set(FUNC(orion_state::radio86_8255_portb_r2));
+	m_ppi2->in_pc_callback().set(FUNC(orion_state::rk7007_8255_portc_r));
+	m_ppi2->out_pc_callback().set(FUNC(orion_state::radio86_8255_portc_w2));
 }
 
 
 void orion_z80_state::orionz80(machine_config &config)
 {
 	Z80(config, m_maincpu, 2500000);
-	m_maincpu->set_addrmap(AS_PROGRAM, &orion_z80_state::orionz80_mem);
-	m_maincpu->set_addrmap(AS_IO, &orion_z80_state::orionz80_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &orion_z80_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &orion_z80_state::io_map);
 	m_maincpu->set_vblank_int("screen", FUNC(orion_z80_state::orionz80_interrupt));
 
-	auto &ppi1(I8255A(config, "ppi8255_1"));
-	ppi1.in_pa_callback().set(FUNC(orion_z80_state::orion_romdisk_porta_r));
-	ppi1.out_pb_callback().set(FUNC(orion_z80_state::orion_romdisk_portb_w));
-	ppi1.out_pc_callback().set(FUNC(orion_z80_state::orion_romdisk_portc_w));
-
-	auto &ppi2(I8255A(config, "ppi8255_2"));
-	ppi2.out_pa_callback().set(FUNC(radio86_state::radio86_8255_porta_w2));
-	ppi2.in_pb_callback().set(FUNC(radio86_state::radio86_8255_portb_r2));
-	ppi2.in_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_r2));
-	ppi2.out_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_w2));
+	I8255A(config, m_ppi1);
+	m_ppi1->in_pa_callback().set(FUNC(orion_z80_state::orion_romdisk_porta_r));
+	m_ppi1->out_pb_callback().set(FUNC(orion_z80_state::orion_romdisk_portb_w));
+	m_ppi1->out_pc_callback().set(FUNC(orion_z80_state::orion_romdisk_portc_w));
+
+	I8255A(config, m_ppi2);
+	m_ppi2->out_pa_callback().set(FUNC(orion_z80_state::radio86_8255_porta_w2));
+	m_ppi2->in_pb_callback().set(FUNC(orion_z80_state::radio86_8255_portb_r2));
+	m_ppi2->in_pc_callback().set(FUNC(orion_z80_state::radio86_8255_portc_r2));
+	m_ppi2->out_pc_callback().set(FUNC(orion_z80_state::radio86_8255_portc_w2));
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
@@ -193,11 +200,11 @@
 	auto &ay8912(AY8912(config, "ay8912", 1773400));
 	ay8912.add_route(ALL_OUTPUTS, "mono", 1.00);
 
-	auto &cassette(CASSETTE(config, "cassette"));
-	cassette.set_formats(rko_cassette_formats);
-	cassette.set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
-	cassette.add_route(ALL_OUTPUTS, "mono", 0.05);
-	cassette.set_interface("orion_cass");
+	CASSETTE(config, m_cassette);
+	m_cassette->set_formats(rko_cassette_formats);
+	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
+	m_cassette->set_interface("orion_cass");
 
 	SOFTWARE_LIST(config, "cass_list").set_original("orion_cass");
 
@@ -225,29 +232,29 @@
 {
 	orionz80(config);
 
-	auto &ppi2(I8255A(config.replace(), "ppi8255_2"));
-	ppi2.out_pa_callback().set(FUNC(radio86_state::radio86_8255_porta_w2));
-	ppi2.in_pb_callback().set(FUNC(radio86_state::radio86_8255_portb_r2));
-	ppi2.in_pc_callback().set(FUNC(radio86_state::rk7007_8255_portc_r));
-	ppi2.out_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_w2));
+	I8255A(config.replace(), m_ppi2);
+	m_ppi2->out_pa_callback().set(FUNC(orion_z80_state::radio86_8255_porta_w2));
+	m_ppi2->in_pb_callback().set(FUNC(orion_z80_state::radio86_8255_portb_r2));
+	m_ppi2->in_pc_callback().set(FUNC(orion_z80_state::rk7007_8255_portc_r));
+	m_ppi2->out_pc_callback().set(FUNC(orion_z80_state::radio86_8255_portc_w2));
 }
 
 void orion_pro_state::orionpro(machine_config &config)
 {
 	Z80(config, m_maincpu, 5000000);
-	m_maincpu->set_addrmap(AS_PROGRAM, &orion_pro_state::orionpro_mem);
-	m_maincpu->set_addrmap(AS_IO, &orion_pro_state::orionpro_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &orion_pro_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &orion_pro_state::io_map);
 
-	auto &ppi1(I8255A(config, "ppi8255_1"));
-	ppi1.in_pa_callback().set(FUNC(orion_pro_state::orion_romdisk_porta_r));
-	ppi1.out_pb_callback().set(FUNC(orion_pro_state::orion_romdisk_portb_w));
-	ppi1.out_pc_callback().set(FUNC(orion_pro_state::orion_romdisk_portc_w));
-
-	auto &ppi2(I8255A(config, "ppi8255_2"));
-	ppi2.out_pa_callback().set(FUNC(radio86_state::radio86_8255_porta_w2));
-	ppi2.in_pb_callback().set(FUNC(radio86_state::radio86_8255_portb_r2));
-	ppi2.in_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_r2));
-	ppi2.out_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_w2));
+	I8255A(config, m_ppi1);
+	m_ppi1->in_pa_callback().set(FUNC(orion_pro_state::orion_romdisk_porta_r));
+	m_ppi1->out_pb_callback().set(FUNC(orion_pro_state::orion_romdisk_portb_w));
+	m_ppi1->out_pc_callback().set(FUNC(orion_pro_state::orion_romdisk_portc_w));
+
+	I8255A(config, m_ppi2);
+	m_ppi2->out_pa_callback().set(FUNC(orion_pro_state::radio86_8255_porta_w2));
+	m_ppi2->in_pb_callback().set(FUNC(orion_pro_state::radio86_8255_portb_r2));
+	m_ppi2->in_pc_callback().set(FUNC(orion_pro_state::radio86_8255_portc_r2));
+	m_ppi2->out_pc_callback().set(FUNC(orion_pro_state::radio86_8255_portc_w2));
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
@@ -265,11 +272,11 @@
 	auto &ay8912(AY8912(config, "ay8912", 1773400));
 	ay8912.add_route(ALL_OUTPUTS, "mono", 1.00);
 
-	auto &cassette(CASSETTE(config, "cassette"));
-	cassette.set_formats(rko_cassette_formats);
-	cassette.set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
-	cassette.add_route(ALL_OUTPUTS, "mono", 0.05);
-	cassette.set_interface("orion_cass");
+	CASSETTE(config, m_cassette);
+	m_cassette->set_formats(rko_cassette_formats);
+	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
+	m_cassette->set_interface("orion_cass");
 
 	SOFTWARE_LIST(config, "cass_list").set_original("orion_cass");
 
@@ -361,10 +368,10 @@
 /* Driver */
 
 //    YEAR  NAME      PARENT    COMPAT  MACHINE     INPUT    CLASS            INIT        COMPANY      FULLNAME                                  FLAGS
-COMP( 1990, orion128, 0,        0,      orion128,   radio86, orion_state,     empty_init, "<unknown>", "Orion 128",                              0 )
-COMP( 1990, orionms,  orion128, 0,      orion128ms, ms7007,  orion_state,     empty_init, "<unknown>", "Orion 128 (MS7007)",                     0 )
-COMP( 1990, orionz80, orion128, 0,      orionz80,   radio86, orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II",                0 )
-COMP( 1990, orionide, orion128, 0,      orionz80,   radio86, orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II + IDE",          0 )
-COMP( 1990, orionzms, orion128, 0,      orionz80ms, ms7007,  orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II (MS7007)",       0 )
-COMP( 1990, orionidm, orion128, 0,      orionz80ms, ms7007,  orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II + IDE (MS7007)", 0 )
-COMP( 1994, orionpro, orion128, 0,      orionpro,   radio86, orion_pro_state, empty_init, "<unknown>", "Orion Pro",                              0 )
+COMP( 1990, orion128, 0,        0,      orion128,   radio86, orion_state,     empty_init, "<unknown>", "Orion 128",                              MACHINE_SUPPORTS_SAVE )
+COMP( 1990, orionms,  orion128, 0,      orion128ms, ms7007,  orion_state,     empty_init, "<unknown>", "Orion 128 (MS7007)",                     MACHINE_SUPPORTS_SAVE )
+COMP( 1990, orionz80, orion128, 0,      orionz80,   radio86, orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II",                MACHINE_SUPPORTS_SAVE )
+COMP( 1990, orionide, orion128, 0,      orionz80,   radio86, orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II + IDE",          MACHINE_SUPPORTS_SAVE )
+COMP( 1990, orionzms, orion128, 0,      orionz80ms, ms7007,  orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II (MS7007)",       MACHINE_SUPPORTS_SAVE )
+COMP( 1990, orionidm, orion128, 0,      orionz80ms, ms7007,  orion_z80_state, empty_init, "<unknown>", "Orion 128 + Z80 Card II + IDE (MS7007)", MACHINE_SUPPORTS_SAVE )
+COMP( 1994, orionpro, orion128, 0,      orionpro,   radio86, orion_pro_state, empty_init, "<unknown>", "Orion Pro",                              MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/pacman.cpp mame-0.224+dfsg.1/src/mame/drivers/pacman.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/pacman.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/pacman.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3610,6 +3610,7 @@
 	pacman(config);
 
 	/* basic machine hardware */
+	m_maincpu->set_addrmap(AS_PROGRAM, &pacman_state::woodpek_map);
 	m_maincpu->set_addrmap(AS_IO, &pacman_state::piranha_portmap);
 }
 
@@ -5152,6 +5153,35 @@
 	ROM_LOAD( "82s126.3m", 0x0100, 0x0100, CRC(77245b66) SHA1(0c4d0bee858b97632411c440bea6948a74759746) )  /* timing - not used */
 ROM_END
 
+ROM_START( mspacmab3 ) // main PCB with GDP-02 auxiliary card
+	ROM_REGION( 0x10000, "maincpu",0 )
+	ROM_LOAD( "p1.6ef",  0x0000, 0x1000, CRC(50b38941) SHA1(c798fe6efe7ec6d15add74986d72d9ea8676d14a) ) // could also be d instead of p
+	ROM_LOAD( "p2.7ef",  0x1000, 0x1000, CRC(195883b8) SHA1(3395fd2f9963b1809fc55a4f1c998673de75793b) ) // could also be d instead of p
+	ROM_LOAD( "p3.bin",  0x2000, 0x1000, CRC(124a4507) SHA1(a7c82970ac53129c7a642322214adee4206298ff) ) // could also be d instead of p
+	ROM_LOAD( "p4.bin",  0x3000, 0x1000, CRC(08ac65da) SHA1(745d9d054c33df96a7f27a1f4575f8770d92ac10) ) // could also be d instead of p
+	ROM_LOAD( "d5.6fh",  0x8000, 0x1000, CRC(50b29f09) SHA1(27ca2cdf57b96d628b1811210d254b107e2f324e) )
+	ROM_LOAD( "d6.6j",   0x9000, 0x0800, CRC(33b09ed9) SHA1(a2a3e069cce442c3b179315e90476cd431c604c2) )
+
+	ROM_REGION( 0x2000, "gfx1" , 0 )
+	ROM_LOAD( "d7.5de", 0x0000, 0x0800, CRC(b5d8c872) SHA1(d137b0cff8635a6a02f9334b7fa72dc1a623fe9b) )
+	ROM_LOAD( "d9.5fh", 0x0800, 0x0800, CRC(9b2b936c) SHA1(d6f57d0ce6fba37d4838cdcace7e2e02c94b1ba1) )
+	ROM_LOAD( "d8.5ef", 0x1000, 0x0800, CRC(a70a6ac4) SHA1(81b0c56697bb671cc43928133446da74e74b4982) )
+	ROM_LOAD( "d10.5j", 0x1800, 0x0800, CRC(53368498) SHA1(0409288fe59c2bbf2730c31e4c7817392a544165) )
+
+	ROM_REGION( 0x0120, "proms", 0 )
+	ROM_LOAD( "6331.8h", 0x0000, 0x0020, CRC(2fc650bd) SHA1(8d0268dee78e47c712202b0ec4f1f51109b1f2a5) )
+	ROM_LOAD( "6301.4a", 0x0020, 0x0100, CRC(720528b4) SHA1(1f8fee1b8dec02cb19e706ca807438cec512479c) ) // 11xxxxxxx = 0x00
+	ROM_IGNORE(                  0x0100 )
+
+	ROM_REGION( 0x0200, "namco", 0 ) // sound PROMs
+	ROM_LOAD( "63s141.1k", 0x0000, 0x0100, CRC(459d2618) SHA1(14ba61caada575909b4dbd57e7342dc84722325d) )
+	ROM_IGNORE(                    0x0100 ) // 1xxxxxxxx = 0x00
+	ROM_LOAD( "63s141.3k", 0x0100, 0x0100, CRC(fcc24d5d) SHA1(7ae2523f92cccdbd8db8bda80c613a2f90220807) )  // timing - not used
+	ROM_IGNORE(                    0x0100 ) // 11xxxxxxx = 0x00
+
+	ROM_REGION( 0x0200, "gdp02_prom", 0 ) // currently not used by the emulation
+	ROM_LOAD( "82s141.i14", 0x0000, 0x0200, CRC(8d43d0a6) SHA1(be4e0d86ce4c6f1833cc0efc18277b4e04dc458f) ) // 1ST AND 2ND HALF IDENTICAL
+ROM_END
 
 ROM_START( ctrpllrp )
 	ROM_REGION( 0x10000, "maincpu",0 )
@@ -5523,7 +5553,7 @@
 	ROM_LOAD( "u7a.bin",          0xb000, 0x1000, CRC(5fafec7c) SHA1(1c6a85e5c348a69b8d51bcea4f8bdebb24825770) )
 
 	ROM_REGION( 0x2000, "gfx1", 0 )
-	ROM_LOAD( "pmg9.bin",    0x0000, 0x0800, CRC(93933d1d) SHA1(fa38d2cb87e872bb9a3158a4df98f38360dc85ec) )
+	ROM_LOAD( "pmg9.bin",   0x0000, 0x0800, CRC(93933d1d) SHA1(fa38d2cb87e872bb9a3158a4df98f38360dc85ec) )
 	ROM_LOAD( "pmg11.bin",  0x0800, 0x0800, CRC(7409fbec) SHA1(f440f08ba026ae6172666e1bdc0894ce33bba420) )
 	ROM_LOAD( "pmg10.bin",  0x1000, 0x0800, CRC(22b0188a) SHA1(a9ed9ca8b36a60081fd364abc9bc23963932cc0b) )
 	ROM_LOAD( "pmg12.bin",  0x1800, 0x0800, CRC(50c7477d) SHA1(c04ec282a8cb528df5e38ad750d12ee71612695d) )
@@ -5537,6 +5567,48 @@
 	ROM_LOAD( "82s126.3m",    0x0100, 0x0100, CRC(77245b66) SHA1(0c4d0bee858b97632411c440bea6948a74759746) )    /* timing - not used */
 ROM_END
 
+ROM_START( mspacmbn ) // Main PCB H-P1, sub PCB with main CPU ROMs marked Novatronic and 1982
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "1_sub.bin",       0x2000, 0x0200, CRC(0839a86e) SHA1(b9f3e477bd2e7ffd98156d5fa14f5ea12468811f) )
+	ROM_CONTINUE(                0x0200, 0x0200 )
+	ROM_CONTINUE(                0x2400, 0x0200 )
+	ROM_CONTINUE(                0x0600, 0x0a00 )
+	ROM_LOAD( "2_sub.bin",       0x3000, 0x0200, CRC(f40b1ce9) SHA1(0a00ef0873b60cbc8dcf5aac88fee4023f6f4087) )
+	ROM_CONTINUE(                0x1200, 0x0200 )
+	ROM_CONTINUE(                0x3400, 0x0200 )
+	ROM_CONTINUE(                0x1600, 0x0a00 )
+	ROM_LOAD( "3_sub.bin",       0x0000, 0x0200, CRC(40257a62) SHA1(89da3a47345902d58695fabd456099c1b1661dc4) )
+	ROM_CONTINUE(                0x2200, 0x0200 )
+	ROM_CONTINUE(                0x0400, 0x0200 )
+	ROM_CONTINUE(                0x2600, 0x0a00 )
+	ROM_LOAD( "4_sub.bin",       0x1000, 0x0200, CRC(269e0bdb) SHA1(51882b6bedc6488e4634f58bcaca4bb434e85d04) )
+	ROM_CONTINUE(                0x3200, 0x0200 )
+	ROM_CONTINUE(                0x1400, 0x0200 )
+	ROM_CONTINUE(                0x3600, 0x0a00 )
+	ROM_LOAD( "5_sub.bin",       0x9000, 0x0200, CRC(370b55a4) SHA1(10daebf5c858bec44d50d22348be3ffaa209e829) )
+	ROM_CONTINUE(                0x8200, 0x0200 )
+	ROM_CONTINUE(                0x9400, 0x0200 )
+	ROM_CONTINUE(                0x8600, 0x0a00 )
+	ROM_LOAD( "6_sub.bin",       0x8000, 0x0200, CRC(d0c0f66b) SHA1(b91859c363178dc21326305131f045c3f0e0a8d7) )
+	ROM_CONTINUE(                0x9200, 0x0200 )
+	ROM_CONTINUE(                0x8400, 0x0200 )
+	ROM_CONTINUE(                0x9600, 0x0a00 )
+	ROM_COPY( "maincpu", 0x2000, 0xa000, 0x2000 )
+
+	ROM_REGION( 0x2000, "gfx1", 0 )
+	ROM_LOAD( "7.bin",  0x0000, 0x0800, CRC(93933d1d) SHA1(fa38d2cb87e872bb9a3158a4df98f38360dc85ec) )
+	ROM_LOAD( "8.bin",  0x0800, 0x0800, CRC(7409fbec) SHA1(f440f08ba026ae6172666e1bdc0894ce33bba420) )
+	ROM_LOAD( "9.bin",  0x1000, 0x0800, CRC(22b0188a) SHA1(a9ed9ca8b36a60081fd364abc9bc23963932cc0b) )
+	ROM_LOAD( "10.bin", 0x1800, 0x0800, CRC(50c7477d) SHA1(c04ec282a8cb528df5e38ad750d12ee71612695d) )
+
+	ROM_REGION( 0x0120, "proms", 0 ) // not dumped for this set, taken from the very similar pacgal2
+	ROM_LOAD( "82s123.7f",    0x0000, 0x0020, BAD_DUMP CRC(2fc650bd) SHA1(8d0268dee78e47c712202b0ec4f1f51109b1f2a5) )
+	ROM_LOAD( "82s126.4a",    0x0020, 0x0100, BAD_DUMP CRC(3eb3a8e4) SHA1(19097b5f60d1030f8b82d9f1d3a241f93e5c75d6) )
+
+	ROM_REGION( 0x0200, "namco", 0 ) // sound PROMs,not dumped for this set, taken from the very similar pacgal2
+	ROM_LOAD( "82s126.1m",    0x0000, 0x0100, BAD_DUMP CRC(a9cc86bf) SHA1(bbcec0570aeceb582ff8238a4bc8546a23430081) )
+	ROM_LOAD( "82s126.3m",    0x0100, 0x0100, BAD_DUMP CRC(77245b66) SHA1(0c4d0bee858b97632411c440bea6948a74759746) )
+ROM_END
 
 ROM_START( mschamp ) /* "Original" Zola-Puc board.  FORCE ELECTRONICS KM-001 PCB copyright by RAYGLO MFG CO  1992/1993 */
 	ROM_REGION( 0x20000, "maincpu", 0 )
@@ -7269,7 +7341,7 @@
 
 	/* Data lines D3 and D5 swapped */
 	uint8_t *RAM = memregion("maincpu")->base();
-	for (int i = 0; i < 0x4000; i++)
+	for (int i = 0; i < 0xc000; i++)
 	{
 		RAM[i] = bitswap<8>(RAM[i],7,6,3,4,5,2,1,0);
 	}
@@ -7568,11 +7640,11 @@
 void pacman_state::init_pengomc1()
 {
 	uint8_t *romdata = memregion("maincpu")->base();
-	uint8_t buf[0x8000];
-	memcpy(buf, romdata, 0x8000);
+	uint8_t buf[0xc000];
+	memcpy(buf, romdata, 0xc000);
 
 	// some sort of weak protection?
-	for (int i = 0; i < 0x8000; i++)
+	for (int i = 0; i < 0xc000; i++)
 		romdata[i] = buf[i^0xff];
 }
 
@@ -7619,6 +7691,7 @@
 GAME( 1982, ctrpllrp, puckman,  pacman,   pacman,   pacman_state,  empty_init,    ROT90,  "hack", "Caterpillar Pacman Hack", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, piranha,  puckman,  piranha,  mspacman, pacman_state,  init_eyes,     ROT90,  "GL (US Billiards license)", "Piranha", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, piranhao, puckman,  piranha,  mspacman, pacman_state,  init_eyes,     ROT90,  "GL (US Billiards license)", "Piranha (older)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, mspacmab3,puckman,  piranha,  mspacman, pacman_state,  init_eyes,     ROT90,  "bootleg", "Ms. Pac-Man (bootleg, set 3)", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, abscam,   puckman,  piranha,  mspacman, pacman_state,  init_eyes,     ROT90,  "GL (US Billiards license)", "Abscam", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, piranhah, puckman,  pacman,   mspacman, pacman_state,  empty_init,    ROT90,  "hack", "Piranha (hack)", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, titanpac, puckman,  piranha,  mspacman, pacman_state,  init_eyes,     ROT90,  "hack", "Titan (Pac-Man hack)", MACHINE_SUPPORTS_SAVE )
@@ -7637,6 +7710,7 @@
 GAME( 1981, mspacmab2,mspacman, woodpek,  mspacman, pacman_state,  empty_init,    ROT90,  "bootleg", "Ms. Pac-Man (bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, mspacmbe, mspacman, woodpek,  mspacman, pacman_state,  init_mspacmbe, ROT90,  "bootleg", "Ms. Pac-Man (bootleg, encrypted)", MACHINE_SUPPORTS_SAVE )
 GAME( 1982, mspacmbmc,mspacman, woodpek,  mspacman, pacman_state,  empty_init,    ROT90,  "bootleg (Marti Colls)", "Ms. Pac-Man (Marti Colls bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, mspacmbn, mspacman, woodpek,  mspacman, pacman_state,  init_pengomc1, ROT90,  "bootleg (Novatronic)", "Ms. Pac-Man (Novatronic bootleg)", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, mspacii,  mspacman, woodpek,  mspacman, pacman_state,  init_mspacii,  ROT90,  "bootleg (Orca)", "Ms. Pac-Man II (Orca bootleg set 1)", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, mspacii2, mspacman, woodpek,  mspacman, pacman_state,  init_mspacii,  ROT90,  "bootleg (Orca)", "Ms. Pac-Man II (Orca bootleg set 2)", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, pacgal,   mspacman, woodpek,  mspacman, pacman_state,  empty_init,    ROT90,  "hack", "Pac-Gal (set 1)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/partner.cpp mame-0.224+dfsg.1/src/mame/drivers/partner.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/partner.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/partner.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,9 +2,15 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        Partner driver by Miodrag Milanovic
+Partner driver by Miodrag Milanovic
 
-        09/06/2008 Preliminary driver.
+2008-06-09 Preliminary driver.
+
+Works well with cassette. Need to find out how to access the built-in
+rom programs. Also need to find out how to access floppy disks, including
+those in the softlist.
+
+Cursor is one position too far to the right.
 
 ****************************************************************************/
 
@@ -13,10 +19,7 @@
 #include "includes/partner.h"
 
 #include "cpu/i8085/i8085.h"
-#include "imagedev/cassette.h"
-
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
 #include "formats/rk_cas.h"
@@ -24,7 +27,7 @@
 
 
 /* Address maps */
-void partner_state::partner_mem(address_map &map)
+void partner_state::mem_map(address_map &map)
 {
 	map(0x0000, 0x07ff).bankrw("bank1");
 	map(0x0800, 0x3fff).bankrw("bank2");
@@ -36,12 +39,12 @@
 	map(0xc000, 0xc7ff).bankrw("bank8");
 	map(0xc800, 0xcfff).bankrw("bank9");
 	map(0xd000, 0xd7ff).bankrw("bank10");
-	map(0xd800, 0xd8ff).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write));  // video
-	map(0xd900, 0xd9ff).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0xda00, 0xdaff).w(FUNC(partner_state::partner_mem_page_w));
-	map(0xdb00, 0xdbff).w(m_dma8257, FUNC(i8257_device::write));    // DMA
+	map(0xd800, 0xd8ff).rw("crtc", FUNC(i8275_device::read), FUNC(i8275_device::write));
+	map(0xd900, 0xd9ff).rw(m_ppi1, FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0xda00, 0xdaff).w(FUNC(partner_state::mem_page_w));
+	map(0xdb00, 0xdbff).w(m_dma, FUNC(i8257_device::write));
 	map(0xdc00, 0xddff).bankrw("bank11");
-	map(0xde00, 0xdeff).w(FUNC(partner_state::partner_win_memory_page_w));
+	map(0xde00, 0xdeff).w(FUNC(partner_state::win_memory_page_w));
 	map(0xe000, 0xe7ff).bankrw("bank12");
 	map(0xe800, 0xffff).bankrw("bank13");
 }
@@ -145,7 +148,7 @@
 FLOPPY_FORMATS_END
 
 /* F4 Character Displayer */
-static const gfx_layout partner_charlayout =
+static const gfx_layout charlayout =
 {
 	8, 8,                   /* 8 x 8 characters */
 	512,                    /* 512 characters */
@@ -159,7 +162,7 @@
 };
 
 static GFXDECODE_START( gfx_partner )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, partner_charlayout, 0, 1 )
+	GFXDECODE_ENTRY( "chargen", 0x0000, charlayout, 0, 1 )
 GFXDECODE_END
 
 
@@ -167,22 +170,22 @@
 {
 	/* basic machine hardware */
 	I8080(config, m_maincpu, 16_MHz_XTAL / 9);
-	m_maincpu->set_addrmap(AS_PROGRAM, &partner_state::partner_mem);
+	m_maincpu->set_addrmap(AS_PROGRAM, &partner_state::mem_map);
 
-	auto &ppi1(I8255(config, "ppi8255_1"));
-	ppi1.out_pa_callback().set(FUNC(radio86_state::radio86_8255_porta_w2));
-	ppi1.in_pb_callback().set(FUNC(radio86_state::radio86_8255_portb_r2));
-	ppi1.in_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_r2));
-	ppi1.out_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_w2));
+	I8255(config, m_ppi1);
+	m_ppi1->out_pa_callback().set(FUNC(partner_state::radio86_8255_porta_w2));
+	m_ppi1->in_pb_callback().set(FUNC(partner_state::radio86_8255_portb_r2));
+	m_ppi1->in_pc_callback().set(FUNC(partner_state::radio86_8255_portc_r2));
+	m_ppi1->out_pc_callback().set(FUNC(partner_state::radio86_8255_portc_w2));
 
-	auto &i8275(I8275(config, "i8275", 16_MHz_XTAL / 12));
+	auto &i8275(I8275(config, "crtc", 16_MHz_XTAL / 12));
 	i8275.set_character_width(6);
 	i8275.set_display_callback(FUNC(partner_state::display_pixels));
-	i8275.drq_wr_callback().set("dma8257", FUNC(i8257_device::dreq2_w));
+	i8275.drq_wr_callback().set(m_dma, FUNC(i8257_device::dreq2_w));
 
 	/* video hardware */
 	auto &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_screen_update("i8275", FUNC(i8275_device::screen_update));
+	screen.set_screen_update("crtc", FUNC(i8275_device::screen_update));
 	screen.set_refresh_hz(50);
 	screen.set_size(78*6, 30*10);
 	screen.set_visarea(0, 78*6-1, 0, 30*10-1);
@@ -192,14 +195,14 @@
 
 	SPEAKER(config, "mono").front_center();
 
-	auto &dma8257(I8257(config, "dma8257", 16_MHz_XTAL / 9));
-	dma8257.out_hrq_cb().set(FUNC(partner_state::hrq_w));
-	dma8257.in_memr_cb().set(FUNC(partner_state::memory_read_byte));
-	dma8257.out_memw_cb().set(FUNC(partner_state::memory_write_byte));
-	dma8257.in_ior_cb<0>().set("wd1793", FUNC(fd1793_device::data_r));
-	dma8257.out_iow_cb<0>().set("wd1793", FUNC(fd1793_device::data_w));
-	dma8257.out_iow_cb<2>().set("i8275", FUNC(i8275_device::dack_w));
-	dma8257.set_reverse_rw_mode(true);
+	I8257(config, m_dma, 16_MHz_XTAL / 9);
+	m_dma->out_hrq_cb().set(FUNC(partner_state::hrq_w));
+	m_dma->in_memr_cb().set(FUNC(partner_state::memory_read_byte));
+	m_dma->out_memw_cb().set(FUNC(partner_state::memory_write_byte));
+	m_dma->in_ior_cb<0>().set("fdc", FUNC(fd1793_device::data_r));
+	m_dma->out_iow_cb<0>().set("fdc", FUNC(fd1793_device::data_w));
+	m_dma->out_iow_cb<2>().set("crtc", FUNC(i8275_device::dack_w));
+	m_dma->set_reverse_rw_mode(true);
 
 	auto &cassette(CASSETTE(config, "cassette"));
 	cassette.set_formats(rkp_cassette_formats);
@@ -209,10 +212,10 @@
 
 	SOFTWARE_LIST(config, "cass_list").set_original("partner_cass");
 
-	FD1793(config, "wd1793", 16_MHz_XTAL / 16);
+	FD1793(config, "fdc", 16_MHz_XTAL / 16);
 
-	FLOPPY_CONNECTOR(config, "fd0", "525qd", FLOPPY_525_QD, true, floppy_formats);
-	FLOPPY_CONNECTOR(config, "fd1", "525qd", FLOPPY_525_QD, true, floppy_formats);
+	FLOPPY_CONNECTOR(config, "fd0", "525qd", FLOPPY_525_QD, true, floppy_formats).enable_sound(true);
+	FLOPPY_CONNECTOR(config, "fd1", "525qd", FLOPPY_525_QD, true, floppy_formats).enable_sound(true);
 
 	SOFTWARE_LIST(config, "flop_list").set_original("partner_flop");
 
@@ -224,16 +227,17 @@
 
 /* ROM definition */
 ROM_START( partner )
-	ROM_REGION( 0x1A000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "partner.rom", 0x10000, 0x2000, CRC(be1eaa10) SHA1(f9658d8055bf434240ec020d7892ea98cb5cbb76))
-	ROM_LOAD( "basic.rom",   0x12000, 0x2000, CRC(1e9be0ec) SHA1(2c431f487cffddaac8413efddfc0527ad595f03b))
-	ROM_LOAD( "mcpg.rom",    0x14000, 0x0800, CRC(3401225c) SHA1(6c252393ee73ed1a53d3e583547d86ab6718a533))
-	ROM_LOAD( "fdd.rom",     0x16000, 0x0800, CRC(8ca350b5) SHA1(76fc92298726fb2840f4c19d7edc860d1ed86356))
-	ROM_LOAD( "font.rom",    0x18000, 0x2000, CRC(dc4f1723) SHA1(6b8d5efb403cf0aeb3fd3197a0529d23c8e2f93c))
-	ROM_REGION(0x2000, "gfx1",0)
-	ROM_LOAD ("partner.fnt", 0x0000, 0x2000, CRC(2705f726) SHA1(3d7b33901ef098a405d7ddad924ba9677f6a9b15))
+	ROM_REGION( 0xA000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "partner.rom", 0x0000, 0x2000, CRC(be1eaa10) SHA1(f9658d8055bf434240ec020d7892ea98cb5cbb76))
+	ROM_LOAD( "basic.rom",   0x2000, 0x2000, CRC(1e9be0ec) SHA1(2c431f487cffddaac8413efddfc0527ad595f03b))
+	ROM_LOAD( "mcpg.rom",    0x4000, 0x0800, CRC(3401225c) SHA1(6c252393ee73ed1a53d3e583547d86ab6718a533))
+	ROM_LOAD( "fdd.rom",     0x6000, 0x0800, CRC(8ca350b5) SHA1(76fc92298726fb2840f4c19d7edc860d1ed86356))
+	ROM_LOAD( "font.rom",    0x8000, 0x2000, CRC(dc4f1723) SHA1(6b8d5efb403cf0aeb3fd3197a0529d23c8e2f93c))
+
+	ROM_REGION(0x2000, "chargen",0)
+	ROM_LOAD ("partner.d25", 0x0000, 0x2000, CRC(2705f726) SHA1(3d7b33901ef098a405d7ddad924ba9677f6a9b15))
 ROM_END
 
 /* Driver */
 //    YEAR  NAME     PARENT   COMPAT  MACHINE  INPUT    CLASS          INIT          COMPANY       FULLNAME         FLAGS
-COMP( 1987, partner, radio86, 0,      partner, partner, partner_state, init_partner, "SAM SKB VM", "Partner-01.01", MACHINE_NOT_WORKING )
+COMP( 1987, partner, radio86, 0,      partner, partner, partner_state, init_partner, "SAM SKB VM", "Partner-01.01", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/pasopia.cpp mame-0.224+dfsg.1/src/mame/drivers/pasopia.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/pasopia.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/pasopia.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -392,6 +392,7 @@
 	CASSETTE(config, m_cass);
 	m_cass->set_default_state(CASSETTE_PLAY | CASSETTE_MOTOR_DISABLED | CASSETTE_SPEAKER_ENABLED);
 	m_cass->add_route(ALL_OUTPUTS, "mono", 0.05);
+	m_cass->set_interface("pasopia_cass");
 
 	PASOPIA_PAC2(config, "dtfcst", pac2_default_devices, nullptr); // "Data File Cassette"
 	PASOPIA_PAC2(config, "dtfunt", pac2_default_devices, nullptr); // "Data File Unit"
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/pc2000.cpp mame-0.224+dfsg.1/src/mame/drivers/pc2000.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/pc2000.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/pc2000.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -16,6 +16,11 @@
 
 Other known international versions:
 - Genio 2000 (Spanish version of Genius Leader 4000 Quadro)
+- Genius 4000 (French version of Genius Leader 4000 Quadro)
+- Genius 5000 (French version of Genius Leader 5000)
+- Genius 6000 (French version of Genius Leader 6000 SL)
+- Genius 6500 Duo (alternate French version of Genius Leader 6000 SL)
+- Genius Notebook (French version of Genius Leader 3000 S)
 - PreComputer Power Pad (English version of Genius Leader 4000 Quadro)
 - PreComputer Power Pad Plus (English version of Genius Leader 5000)
 - Talking Whiz-Kid Einstein (English version of Genius Leader Power Notebook)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/pc8801.cpp mame-0.224+dfsg.1/src/mame/drivers/pc8801.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/pc8801.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/pc8801.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2379,6 +2379,7 @@
 	//CENTRONICS(config, "centronics", centronics_devices, "printer");
 	CASSETTE(config, m_cassette);
 	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+	m_cassette->set_interface("pc8801_cass");
 
 	SOFTWARE_LIST(config, "tape_list").set_original("pc8801_cass");
 
@@ -2403,6 +2404,7 @@
 
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
 	YM2203(config, m_opn, MASTER_CLOCK);
 	m_opn->irq_handler().set(FUNC(pc8801_state::pc8801_sound_irq));
 	m_opn->port_a_read_callback().set(FUNC(pc8801_state::opn_porta_r));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/pcat_dyn.cpp mame-0.224+dfsg.1/src/mame/drivers/pcat_dyn.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/pcat_dyn.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/pcat_dyn.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -266,6 +266,7 @@
 	ROM_LOAD("prom.1", 0x40000, 0x40000, CRC(8f96e2a8) SHA1(bc3ce8b99e6ff40e355df2c3f797f1fe88b3b219))
 	ROM_LOAD("prom.2", 0x80000, 0x40000, CRC(8b0ac5cf) SHA1(1c2b6a53c9ff4d18a5227d899facbbc719f40205))
 	ROM_LOAD("prom.3", 0xc0000, 0x40000, CRC(9352e965) SHA1(2bfb647ec27c60a8c821fdf7483199e1a444cea8))
+	ROM_FILL(0x334f6, 1, 0xeb) // skip prot(?) check
 
 	ROM_REGION(0x2000, "nvram", 0)
 	ROM_LOAD("prom.7", 0, 0x2000, CRC(154c8092) SHA1(4439ee82f36d5d5c334494ba7bb4848e839213a7))
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/pcd.cpp mame-0.224+dfsg.1/src/mame/drivers/pcd.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/pcd.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/pcd.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -239,7 +239,7 @@
 	//logerror("%s: mmu read %04x %04x\n", machine().describe_context(), (offset << 1) + 0x8000, data);
 	if(!offset)
 		return m_mmu.ctl;
-	else if((offset >= 0x200) && (offset < 0x300) && !(offset & 3))
+	else if((offset >= 0x200) && (offset < 0x400) && !(offset & 3))
 		return (data << 4) | (data >> 12) | (m_mmu.sc && (offset == 0x200) ? 0xc0 : 0);
 	else if(offset == 0x400)
 	{
@@ -254,7 +254,7 @@
 	//logerror("%s: mmu write %04x %04x\n", machine().describe_context(), (offset << 1) + 0x8000, data);
 	if(!offset)
 		m_mmu.ctl = data;
-	else if((offset >= 0x200) && (offset < 0x300) && !(offset & 3))
+	else if((offset >= 0x200) && (offset < 0x400) && !(offset & 3))
 		m_mmu.regs[((m_mmu.ctl & 0x1f) << 5) | ((offset >> 2) & 0x1f)] = (data >> 4) | (data << 12);
 	else if(offset == 0x400)
 	{
@@ -376,7 +376,7 @@
 			reg = m_mmu.regs[((offset >> 10) & 0xff) | ((m_mmu.ctl & 0x18) << 5)];
 		else
 			reg = m_mmu.regs[((offset >> 10) & 0x7f) | ((m_mmu.ctl & 0x1c) << 5)];
-		if(!reg && !machine().side_effects_disabled())
+		if(!(reg & 1) && !machine().side_effects_disabled())
 		{
 			offset <<= 1;
 			logerror("%s: Null mmu entry %06x\n", machine().describe_context(), offset);
@@ -398,7 +398,7 @@
 			reg = m_mmu.regs[((offset >> 10) & 0xff) | ((m_mmu.ctl & 0x18) << 5)];
 		else
 			reg = m_mmu.regs[((offset >> 10) & 0x7f) | ((m_mmu.ctl & 0x1c) << 5)];
-		if(!reg && !machine().side_effects_disabled())
+		if(!(reg & 2) && !machine().side_effects_disabled())
 		{
 			offset <<= 1;
 			logerror("%s: Null mmu entry %06x\n", machine().describe_context(), offset);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/pcm.cpp mame-0.224+dfsg.1/src/mame/drivers/pcm.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/pcm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/pcm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,53 +2,54 @@
 // copyright-holders:Miodrag Milanovic, Robbbert
 /***************************************************************************
 
-        PC/M by Miodrag Milanovic
+PC/M by Miodrag Milanovic
 
-        http://www.li-pro.net/pcm.phtml  (in German)
+http://www.li-pro.net/pcm.phtml  (in German)
 
-        12/05/2009 Preliminary driver.
-
-        14/02/2011 Added keyboard (from terminal).
-
-        Commands:
-        1 select memory bank 1
-        2 select memory bank 2
-        B
-        C start cp/m from the inbuilt CCP
-        D Debugger
-        Fx Format disk A or B
-        G  Jump to address
-        I List files on tape
-        L filename.typ  Load file from tape
-        R read from disk
-        S filename aaaa / bbbb save a file to tape
-        V verify
-        W write to disk
-        X
-        Z set tape baud (1200, 2400, 3600 (default), 4800)
-        filename   start running this .COM file
-
-        Therefore if you enter random input, it will lock up while trying to
-        load up a file of that name. Filenames on disk and tape are of the
-        standard 8.3 format. You must specify an extension.
-
-        Here is an example of starting the debugger, executing a command in
-        it, then exiting back to the monitor.
-
-        D
-        U
-        E
-
-        In practice, the I and R commands produce an error, while all disk
-        commands are directed to tape. The F command lists the files on a
-        tape.
-
-        ToDo:
-        - Add bankswitching
-        - Add NMI generator
-        - Find out if there really is any floppy-disk feature - the schematic
-          has no mention of it.
-        - Add the 6 LEDs.
+2009-05-12 Preliminary driver.
+2011-02-14 Added keyboard (from terminal).
+2020-07-15 Added banking
+
+Commands:
+1 select memory bank 1
+2 select memory bank 2
+B
+C start cp/m from the inbuilt CCP
+D Debugger
+Fx Format disk A or B
+G  Jump to address
+I List files on tape
+L filename.typ  Load file from tape
+R read from disk
+S filename aaaa / bbbb save a file to tape
+V verify
+W write to disk
+X
+Z set tape baud (1200, 2400, 3600 (default), 4800)
+filename   start running this .COM file
+
+Therefore if you enter random input, it will lock up while trying to
+load up a file of that name. Filenames on disk and tape are of the
+standard 8.3 format. You must specify an extension.
+
+Here is an example of starting the debugger, executing a command in
+it, then exiting back to the monitor.
+
+D
+U
+Q
+
+In practice, the I and R commands produce an error, while all disk
+commands are directed to tape. The F command lists the files on a
+tape.
+
+ToDo:
+- Add NMI generator
+- Find out if there really is any floppy-disk feature - the schematic
+  has no mention of it. (it might be the ram drives)
+- Add the 6 LEDs.
+- Need software
+- MNW until we can be sure it works as intended.
 
 ****************************************************************************/
 
@@ -60,6 +61,7 @@
 #include "machine/z80ctc.h"
 #include "machine/z80sio.h"
 #include "machine/z80pio.h"
+#include "machine/ram.h"
 #include "sound/spkrdev.h"
 #include "emupal.h"
 #include "screen.h"
@@ -72,40 +74,45 @@
 	pcm_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
+		, m_ram(*this, RAM_TAG)
 		, m_pio_s(*this, "pio_s")
 		, m_pio_u(*this, "pio_u")
 		, m_ctc_s(*this, "ctc_s")
 		, m_ctc_u(*this, "ctc_u")
 		, m_speaker(*this, "speaker")
 		, m_cass(*this, "cassette")
-		, m_p_videoram(*this, "videoram")
+		, m_vram(*this, "videoram")
 		, m_p_chargen(*this, "chargen")
-	{
-	}
+		, m_bank(*this, {"bankr", "bankw", "bank2", "bank3"})
+	{ }
 
 	void pcm(machine_config &config);
 
 private:
-	uint8_t port85_r();
+	u8 port85_r();
 	DECLARE_WRITE_LINE_MEMBER( port82_w );
-	void port85_w(uint8_t data);
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	void port85_w(u8);
+	void port94_w(u8);
+	u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
 
 	bool m_cone;
-	uint8_t m_85;
+	u8 m_port85;
 	void machine_start() override;
+	void machine_reset() override;
 	required_device<z80_device> m_maincpu;
+	required_device<ram_device> m_ram;
 	required_device<z80pio_device> m_pio_s;
 	required_device<z80pio_device> m_pio_u;
 	required_device<z80ctc_device> m_ctc_s;
 	required_device<z80ctc_device> m_ctc_u;
 	required_device<speaker_sound_device> m_speaker;
 	required_device<cassette_image_device> m_cass;
-	required_shared_ptr<uint8_t> m_p_videoram;
+	optional_shared_ptr<u8> m_vram;
 	required_region_ptr<u8> m_p_chargen;
+	required_memory_bank_array<4> m_bank;
 };
 
 
@@ -139,9 +146,9 @@
 */
 
 
-uint8_t pcm_state::port85_r()
+u8 pcm_state::port85_r()
 {
-	uint8_t data = m_85 & 0x7f;
+	u8 data = m_port85 & 0x7f;
 
 	if ((m_cass)->input() > 0.03)
 		data |= 0x80;
@@ -149,24 +156,46 @@
 	return data;
 }
 
-void pcm_state::port85_w(uint8_t data)
+void pcm_state::port85_w(u8 data)
 {
-	if (BIT(data, 5))
-		m_cass->change_state(CASSETTE_MOTOR_ENABLED,CASSETTE_MASK_MOTOR);
-	else
-		m_cass->change_state(CASSETTE_MOTOR_DISABLED,CASSETTE_MASK_MOTOR);
-
+	m_cass->change_state(BIT(data, 5) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR);
 	m_cass->output( BIT(data, 6) ? -1.0 : +1.0);
-	m_85 = data;
+	m_port85 = data;
 }
 
+/* Banking:
+d0,d1,d2 - select which 64k bank (first 3 are internal)
+d3,d4,d5 - external
+d6 - force c000-ffff of 64k bank
+d7(low) - switch in the roms to 0000-1fff
+Real hardware can disable all ram and crash the system. We don't emulate that. */
+
+void pcm_state::port94_w(u8 data)
+{
+	u8 bank = BIT(data, 0, 3);
+	if (bank < 3)
+	{
+		m_bank[0]->set_entry(bank);
+		m_bank[1]->set_entry(bank);
+		m_bank[2]->set_entry(bank);
+		m_bank[3]->set_entry(bank);
+	}
+
+	if (BIT(data, 6))
+		m_bank[3]->set_entry(0); // via D13 and D51.1
 
+	if (!BIT(data, 7))
+	{
+		m_bank[0]->set_entry(3); // via D12 and D53.1
+		m_bank[1]->set_entry(3);
+	}
+}
 
 void pcm_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x1fff).rom();
-	map(0x2000, 0xf7ff).ram();
-	map(0xf800, 0xffff).ram().share("videoram");
+	map(0x0000, 0x1fff).bankr("bankr").bankw("bankw");
+	map(0x2000, 0xbfff).bankrw("bank2");
+	map(0xc000, 0xffff).bankrw("bank3");
 }
 
 void pcm_state::io_map(address_map &map)
@@ -178,9 +207,9 @@
 	map(0x88, 0x8B).rw("sio", FUNC(z80sio_device::cd_ba_r), FUNC(z80sio_device::cd_ba_w)); // SIO
 	map(0x8C, 0x8F).rw(m_ctc_u, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write)); // user CTC
 	map(0x90, 0x93).rw(m_pio_u, FUNC(z80pio_device::read), FUNC(z80pio_device::write)); // user PIO
-	//map(0x94, 0x97) // bank select
-	//map(0x98, 0x9B) // NMI generator
-	//map(0x9C, 0x9F) // io ports available to the user
+	map(0x94, 0x97).w(FUNC(pcm_state::port94_w));
+	//map(0x98, 0x9B) // NMI generator for debugging
+	map(0x9C, 0x9F); // io ports available to the user
 	// disk controller?
 }
 
@@ -190,24 +219,40 @@
 
 void pcm_state::machine_start()
 {
+	u8* r = m_ram->pointer();
+	u8 *m = memregion("maincpu")->base();
+
+	m_vram.set_target(r+0xf800, 0x800); // Fix position of vram
+
 	save_item(NAME(m_cone));
-	save_item(NAME(m_85));
+	save_item(NAME(m_port85));
+
+	m_bank[0]->configure_entries(0, 3, r, 0x10000);
+	m_bank[1]->configure_entries(0, 4, r, 0x10000);
+	m_bank[2]->configure_entries(0, 3, r+0x2000, 0x10000);
+	m_bank[3]->configure_entries(0, 3, r+0xc000, 0x10000);
+	m_bank[0]->configure_entry(3, m);
 }
 
-uint32_t pcm_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+void pcm_state::machine_reset()
 {
-	uint8_t y,ra,chr,gfx;
-	uint16_t sy=0,ma=0x400,x;
+	port94_w(0);   // setup initial state of banks
+}
+
+u32 pcm_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	u8 y,ra,chr,gfx;
+	u16 sy=0,ma=0x400,x;
 
 	for (y = 0; y < 16; y++)
 	{
 		for (ra = 0; ra < 8; ra++)
 		{
-			uint16_t *p = &bitmap.pix16(sy++);
+			u16 *p = &bitmap.pix16(sy++);
 
 			for (x = ma; x < ma + 64; x++)
 			{
-				chr = m_p_videoram[x];
+				chr = m_vram[x];
 
 				gfx = m_p_chargen[(chr<<3) | ra];
 
@@ -305,11 +350,14 @@
 	m_ctc_s->zc_callback<0>().append("sio", FUNC(z80sio_device::txca_w));
 	m_ctc_s->zc_callback<1>().set("sio", FUNC(z80sio_device::rxtxcb_w));
 	m_ctc_s->zc_callback<2>().set(FUNC(pcm_state::port82_w));  // speaker
+
+	// internal ram: bank0 for cp/m; banks 1 and 2 are ram-drives; last 2k is dummy for rom-write
+	RAM(config, RAM_TAG).set_default_size("194K");
 }
 
 /* ROM definition */
 ROM_START( pcm )
-	ROM_REGION( 0x2000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x2000, "maincpu", 0 )
 	ROM_SYSTEM_BIOS( 0, "v202", "Version 2.02" )
 	ROMX_LOAD( "bios_v202.d14", 0x0000, 0x0800, CRC(27c24892) SHA1(a97bf9ef075de91330dc0c7cfd3bb6c7a88bb585), ROM_BIOS(0))
 	ROMX_LOAD( "bios_v202.d15", 0x0800, 0x0800, CRC(e9cedc70) SHA1(913c526283d9289d0cb2157985bb48193df7aa16), ROM_BIOS(0))
@@ -333,4 +381,4 @@
 /* Driver */
 
 /*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS      INIT        COMPANY          FULLNAME  FLAGS */
-COMP( 1988, pcm,  0,      0,      pcm,     pcm,   pcm_state, empty_init, "Mugler/Mathes", "PC/M",   MACHINE_SUPPORTS_SAVE )
+COMP( 1988, pcm,  0,      0,      pcm,     pcm,   pcm_state, empty_init, "Mugler/Mathes", "PC/M",   MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/pecom.cpp mame-0.224+dfsg.1/src/mame/drivers/pecom.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/pecom.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/pecom.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,37 +2,54 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        Pecom driver by Miodrag Milanovic
+Pecom driver by Miodrag Milanovic
 
-        08/11/2008 Preliminary driver.
+2008-11-08 Preliminary driver.
 
-        Need to press capslock twice to get caps to engage - bug?
+- All commands to be in UPPERCASE.
+- Change background colour: SCR n
+- Enter monitor: PROB     (B to exit)
+- If Capslock is engaged, then Shift doesn't work.
+- Control hangs the machine while it is pressed. It doesn't work in the
+  expected way.
+- Don't touch the Shift key while loading a tape because it will corrupt
+  the data.
+- The screen will flash in a crazy epileptic fashion while loading a tape.
+  Beware!
+
+TODO:
+- Cassette: can load its own recordings, but not those from software list
+  (software-list tapes are slower & wobbly)
+- Both machines currently have 32k ram.
+- Autorepeat seems a bit fast
 
 ****************************************************************************/
 
 #include "emu.h"
 #include "includes/pecom.h"
-
-#include "softlist.h"
 #include "speaker.h"
 
 
 /* Address maps */
-void pecom_state::pecom64_mem(address_map &map)
+void pecom_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x3fff).bankrw("bank1");
-	map(0x4000, 0x7fff).bankrw("bank2");
-	map(0x8000, 0xbfff).rom();  // ROM 1
-	map(0xc000, 0xf3ff).rom();  // ROM 2
+	map(0x0000, 0x7fff).ram().share("mainram");
+	map(0x0000, 0x3fff).bankr("bank1");
+	map(0x8000, 0xefff).rom().region("maincpu",0);
 	map(0xf000, 0xf7ff).bankrw("bank3"); // CDP1869 / ROM
 	map(0xf800, 0xffff).bankrw("bank4"); // CDP1869 / ROM
 }
 
-void pecom_state::pecom64_io(address_map &map)
+void pecom_state::io_map(address_map &map)
+{
+	map(0x01, 0x01).w(FUNC(pecom_state::bank_w));
+	map(0x03, 0x03).r(FUNC(pecom_state::keyboard_r));
+	map(0x03, 0x07).w(FUNC(pecom_state::cdp1869_w));
+}
+
+void pecom_state::cdp1869_page_ram(address_map &map)
 {
-	map(0x01, 0x01).w(FUNC(pecom_state::pecom_bank_w));
-	map(0x03, 0x03).r(FUNC(pecom_state::pecom_keyboard_r));
-	map(0x03, 0x07).w(FUNC(pecom_state::pecom_cdp1869_w));
+	map(0x000, 0x3ff).mirror(0x400).ram();
 }
 
 /* Input ports */
@@ -50,12 +67,12 @@
 
 Being keys distributed on four lines, it makes a bit difficult to accurately remap them
 on modern keyboards. Hence, we move by default Up/Down/Left/Right to Cursor Keys and
-use LEft/Right Ctrl/Alt keys for the remaining keys. Due to the unnatural emulated keyboard
+use Left/Right Ctrl/Alt keys for the remaining keys. Due to the unnatural emulated keyboard
 mappings, this is another situation where natural keyboard comes very handy!          */
 
 INPUT_CHANGED_MEMBER(pecom_state::ef_w)
 {
-	m_cdp1802->set_input_line((int)param, newval);
+	m_maincpu->set_input_line((int)param, newval);
 }
 
 static INPUT_PORTS_START( pecom )
@@ -164,8 +181,8 @@
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Del") PORT_CODE(KEYCODE_TAB) PORT_CHAR(UCHAR_MAMEKEY(DEL))
 
 	PORT_START("CNT")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_2) PORT_CHANGED_MEMBER(DEVICE_SELF, pecom_state, ef_w, COSMAC_INPUT_LINE_EF1)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift") PORT_CODE(KEYCODE_LCONTROL) PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL) PORT_CHANGED_MEMBER(DEVICE_SELF, pecom_state, ef_w, COSMAC_INPUT_LINE_EF1)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Caps") PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_TOGGLE PORT_CHANGED_MEMBER(DEVICE_SELF, pecom_state, ef_w, COSMAC_INPUT_LINE_EF3)
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_NAME("Break") PORT_CODE(KEYCODE_MINUS) PORT_CHANGED_MEMBER(DEVICE_SELF, pecom_state, ef_w, COSMAC_INPUT_LINE_EF4)
 INPUT_PORTS_END
@@ -174,47 +191,54 @@
 void pecom_state::pecom64(machine_config &config)
 {
 	/* basic machine hardware */
-	CDP1802(config, m_cdp1802, cdp1869_device::DOT_CLK_PAL);
-	m_cdp1802->set_addrmap(AS_PROGRAM, &pecom_state::pecom64_mem);
-	m_cdp1802->set_addrmap(AS_IO, &pecom_state::pecom64_io);
-	m_cdp1802->wait_cb().set_constant(1);
-	m_cdp1802->clear_cb().set(FUNC(pecom_state::clear_r));
-	m_cdp1802->ef2_cb().set(FUNC(pecom_state::ef2_r));
-	m_cdp1802->q_cb().set(FUNC(pecom_state::q_w));
-	m_cdp1802->sc_cb().set(FUNC(pecom_state::sc_w));
-
-	// sound and video hardware
-	pecom_video(config);
+	CDP1802(config, m_maincpu, cdp1869_device::DOT_CLK_PAL);
+	m_maincpu->set_addrmap(AS_PROGRAM, &pecom_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &pecom_state::io_map);
+	m_maincpu->wait_cb().set_constant(1);
+	m_maincpu->clear_cb().set(FUNC(pecom_state::clear_r));
+	m_maincpu->ef2_cb().set(FUNC(pecom_state::ef2_r));
+	m_maincpu->q_cb().set(FUNC(pecom_state::q_w));
+	m_maincpu->sc_cb().set(FUNC(pecom_state::sc_w));
+
+	SPEAKER(config, "mono").front_center();
+
+	CDP1869(config, m_cdp1869, cdp1869_device::DOT_CLK_PAL, &pecom_state::cdp1869_page_ram);
+	m_cdp1869->add_pal_screen(config, "screen", cdp1869_device::DOT_CLK_PAL);
+	m_cdp1869->set_color_clock(cdp1869_device::COLOR_CLK_PAL);
+	m_cdp1869->set_pcb_read_callback(FUNC(pecom_state::pcb_r));
+	m_cdp1869->set_char_ram_read_callback(FUNC(pecom_state::char_ram_r));
+	m_cdp1869->set_char_ram_write_callback(FUNC(pecom_state::char_ram_w));
+	m_cdp1869->pal_ntsc_callback().set_constant(1);
+	m_cdp1869->prd_callback().set(FUNC(pecom_state::prd_w));
+	m_cdp1869->add_route(ALL_OUTPUTS, "mono", 0.25);
 
 	// devices
 	CASSETTE(config, m_cassette);
 	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
 	m_cassette->set_interface("pecom_cass");
 
 	SOFTWARE_LIST(config, "cass_list").set_original("pecom_cass");
-
-	/* internal ram */
-	RAM(config, RAM_TAG).set_default_size("32K").set_default_value(0x00);
 }
 
 /* ROM definition */
 ROM_START( pecom32 )
-	ROM_REGION( 0x10000, CDP1802_TAG, ROMREGION_ERASEFF )
-	ROM_LOAD( "090786.bin", 0x8000, 0x4000, CRC(b3b1ea23) SHA1(de69f22568161ced801973345fa39d6d207b9e8c) )
+	ROM_REGION( 0x8000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "090786.bin", 0x0000, 0x4000, CRC(b3b1ea23) SHA1(de69f22568161ced801973345fa39d6d207b9e8c) )
 ROM_END
 
 ROM_START( pecom64 )
-	ROM_REGION( 0x10000, CDP1802_TAG, ROMREGION_ERASEFF )
+	ROM_REGION( 0x8000, "maincpu", ROMREGION_ERASEFF )
 	ROM_SYSTEM_BIOS(0, "ver4", "version 4")
-	ROMX_LOAD( "rom_1_g_24.02.88_l.bin", 0x8000, 0x4000, CRC(9a433b47) SHA1(dadb8c399e0a25a2693e10e42a2d7fc2ea9ad427), ROM_BIOS(0) )
-	ROMX_LOAD( "rom_2_g_24.02.88_d.bin", 0xc000, 0x4000, CRC(2116cadc) SHA1(03f11055cd221d438a40a41874af8fba0fa116d9), ROM_BIOS(0) )
+	ROMX_LOAD( "rom_1_g_24.02.88_l.bin", 0x0000, 0x4000, CRC(9a433b47) SHA1(dadb8c399e0a25a2693e10e42a2d7fc2ea9ad427), ROM_BIOS(0) )
+	ROMX_LOAD( "rom_2_g_24.02.88_d.bin", 0x4000, 0x4000, CRC(2116cadc) SHA1(03f11055cd221d438a40a41874af8fba0fa116d9), ROM_BIOS(0) )
 	ROM_SYSTEM_BIOS(1, "ver1", "version 1")
-	ROMX_LOAD( "170887-rom1.bin", 0x8000, 0x4000, CRC(43710fb4) SHA1(f84f75061c9ac3e34af93141ecabd3c955881aa2), ROM_BIOS(1) )
-	ROMX_LOAD( "170887-rom2.bin", 0xc000, 0x4000, CRC(d0d34f08) SHA1(7baab17d1e68771b8dcef97d0fffc655beabef28), ROM_BIOS(1) )
+	ROMX_LOAD( "170887-rom1.bin", 0x0000, 0x4000, CRC(43710fb4) SHA1(f84f75061c9ac3e34af93141ecabd3c955881aa2), ROM_BIOS(1) )
+	ROMX_LOAD( "170887-rom2.bin", 0x4000, 0x4000, CRC(d0d34f08) SHA1(7baab17d1e68771b8dcef97d0fffc655beabef28), ROM_BIOS(1) )
 ROM_END
 
 /* Driver */
 
 /*    YEAR  NAME     PARENT   COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY   FULLNAME     FLAGS */
-COMP( 1986, pecom32, 0,       0,      pecom64, pecom, pecom_state, empty_init, "Ei Nis", "Pecom 32",  0)
-COMP( 1987, pecom64, pecom32, 0,      pecom64, pecom, pecom_state, empty_init, "Ei Nis", "Pecom 64",  0)
+COMP( 1986, pecom32, 0,       0,      pecom64, pecom, pecom_state, empty_init, "Ei Nis (Elektronska Industrija Nis)", "Pecom 32", MACHINE_SUPPORTS_SAVE )
+COMP( 1987, pecom64, pecom32, 0,      pecom64, pecom, pecom_state, empty_init, "Ei Nis (Elektronska Industrija Nis)", "Pecom 64", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/peoplepc.cpp mame-0.224+dfsg.1/src/mame/drivers/peoplepc.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/peoplepc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/peoplepc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -25,6 +25,7 @@
 
 #include "emu.h"
 #include "cpu/i86/i86.h"
+#include "cpu/mcs48/mcs48.h"
 #include "imagedev/floppy.h"
 #include "machine/pic8259.h"
 #include "machine/pit8253.h"
@@ -80,8 +81,6 @@
 	MC6845_UPDATE_ROW(update_row);
 	uint8_t get_slave_ack(offs_t offset);
 	void charram_w(offs_t offset, uint16_t data);
-	DECLARE_WRITE_LINE_MEMBER(tty_clock_tick_w);
-	DECLARE_WRITE_LINE_MEMBER(kbd_clock_tick_w);
 	void dmapg_w(uint8_t data);
 	void p7c_w(uint8_t data);
 	DECLARE_WRITE_LINE_MEMBER(tc_w);
@@ -155,18 +154,6 @@
 	m_gfxdecode->gfx(0)->mark_dirty(offset/16);
 }
 
-WRITE_LINE_MEMBER(peoplepc_state::tty_clock_tick_w)
-{
-	m_8251ser->write_txc(state);
-	m_8251ser->write_rxc(state);
-}
-
-WRITE_LINE_MEMBER(peoplepc_state::kbd_clock_tick_w)
-{
-	m_8251key->write_txc(state);
-	m_8251key->write_rxc(state);
-}
-
 void peoplepc_state::dmapg_w(uint8_t data)
 {
 	m_dma0pg = data;
@@ -287,20 +274,22 @@
 	m_maincpu->set_addrmap(AS_IO, &peoplepc_state::peoplepc_io);
 	m_maincpu->set_irq_acknowledge_callback("pic8259_0", FUNC(pic8259_device::inta_cb));
 
-	pit8253_device &pit8253(PIT8253(config, "pit8253", 0));
+	pit8253_device &pit8253(PIT8253(config, "pit8253"));
 	pit8253.set_clk<0>(XTAL(14'745'600)/6);
-	pit8253.out_handler<0>().set(FUNC(peoplepc_state::kbd_clock_tick_w));
+	pit8253.out_handler<0>().set(m_8251key, FUNC(i8251_device::write_txc));
+	pit8253.out_handler<0>().append(m_8251key, FUNC(i8251_device::write_rxc));
+	pit8253.out_handler<0>().append("pit8253", FUNC(pit8253_device::write_clk2));
 	pit8253.set_clk<1>(XTAL(14'745'600)/6);
-	pit8253.out_handler<1>().set(FUNC(peoplepc_state::tty_clock_tick_w));
-	pit8253.set_clk<2>(XTAL(14'745'600)/6);
+	pit8253.out_handler<1>().set(m_8251ser, FUNC(i8251_device::write_txc));
+	pit8253.out_handler<1>().append(m_8251ser, FUNC(i8251_device::write_rxc));
 	pit8253.out_handler<2>().set("pic8259_0", FUNC(pic8259_device::ir0_w));
 
-	pic8259_device &pic8259_0(PIC8259(config, "pic8259_0", 0));
+	pic8259_device &pic8259_0(PIC8259(config, "pic8259_0"));
 	pic8259_0.out_int_callback().set_inputline(m_maincpu, 0);
 	pic8259_0.in_sp_callback().set_constant(1);
 	pic8259_0.read_slave_ack_callback().set(FUNC(peoplepc_state::get_slave_ack));
 
-	PIC8259(config, m_pic_1, 0);
+	PIC8259(config, m_pic_1);
 	m_pic_1->out_int_callback().set("pic8259_0", FUNC(pic8259_device::ir7_w));
 	m_pic_1->in_sp_callback().set_constant(0);
 
@@ -327,13 +316,13 @@
 	m_dmac->in_ior_cb<0>().set("upd765", FUNC(upd765a_device::dma_r));
 	m_dmac->out_iow_cb<0>().set("upd765", FUNC(upd765a_device::dma_w));
 
-	UPD765A(config, m_fdc, 8'000'000, true, true);
+	UPD765A(config, m_fdc, XTAL(8'000'000)/2, true, true);
 	m_fdc->intrq_wr_callback().set("pic8259_0", FUNC(pic8259_device::ir2_w));
 	m_fdc->drq_wr_callback().set(m_dmac, FUNC(i8257_device::dreq0_w));
 	FLOPPY_CONNECTOR(config, "upd765:0", peoplepc_floppies, "525qd", peoplepc_state::floppy_formats);
 	FLOPPY_CONNECTOR(config, "upd765:1", peoplepc_floppies, "525qd", peoplepc_state::floppy_formats);
 
-	I8251(config, m_8251key, 0);
+	I8251(config, m_8251key, XTAL(14'745'600)/6);
 	m_8251key->rxrdy_handler().set("pic8259_1", FUNC(pic8259_device::ir1_w));
 	m_8251key->txd_handler().set("kbd", FUNC(rs232_port_device::write_txd));
 
@@ -341,17 +330,32 @@
 	kbd.rxd_handler().set(m_8251key, FUNC(i8251_device::write_rxd));
 	kbd.set_option_device_input_defaults("keyboard", DEVICE_INPUT_DEFAULTS_NAME(keyboard));
 
-	I8251(config, m_8251ser, 0);
+	I8048(config, "kbdmcu", 4'608'000).set_disable(); // XTAL unknown
+
+	I8251(config, m_8251ser, XTAL(14'745'600)/6);
+	m_8251ser->rxrdy_handler().set("pic8259_0", FUNC(pic8259_device::ir5_w));
+	m_8251ser->txrdy_handler().set("pic8259_0", FUNC(pic8259_device::ir6_w));
+	m_8251ser->txd_handler().set("rs232c", FUNC(rs232_port_device::write_txd));
+	m_8251ser->rts_handler().set("rs232c", FUNC(rs232_port_device::write_rts));
+	m_8251ser->dtr_handler().set("rs232c", FUNC(rs232_port_device::write_dtr));
+
+	rs232_port_device &rs232c(RS232_PORT(config, "rs232c", default_rs232_devices, nullptr));
+	rs232c.rxd_handler().set(m_8251ser, FUNC(i8251_device::write_rxd));
+	rs232c.dsr_handler().set(m_8251ser, FUNC(i8251_device::write_dsr));
+	rs232c.cts_handler().set(m_8251ser, FUNC(i8251_device::write_cts));
 }
 
 ROM_START( olypeopl )
-	ROM_REGION(0x2000,"maincpu", 0)
+	ROM_REGION(0x2000, "maincpu", 0)
 	ROM_SYSTEM_BIOS(0, "hd",  "HD ROM")
 	ROMX_LOAD( "u01271c0.bin", 0x00000, 0x1000, CRC(8e0ef114) SHA1(774bab0a3e29853e9f6b951cf73082063ea61e6d), ROM_SKIP(1) | ROM_BIOS(0))
 	ROMX_LOAD( "u01271d0.bin", 0x00001, 0x1000, CRC(e2419bf9) SHA1(d88381f8709c91e2adba08f378e29bd0d19ee5ae), ROM_SKIP(1) | ROM_BIOS(0))
 	ROM_SYSTEM_BIOS(1, "2fd",  "2 FD ROM")
 	ROMX_LOAD( "u01277f3.bin", 0x00000, 0x1000, CRC(428ff135) SHA1(ec11f0e43455570c40f5dc4b84f8420da5939368), ROM_SKIP(1) | ROM_BIOS(1))
 	ROMX_LOAD( "u01277g3.bin", 0x00001, 0x1000, CRC(3295691c) SHA1(7d7ade62117d11656b8dd86cf0703127616d55bc), ROM_SKIP(1) | ROM_BIOS(1))
+
+	ROM_REGION(0x400, "kbdmcu", 0)
+	ROM_LOAD( "m1.bin", 0x000, 0x400, NO_DUMP )
 ROM_END
 
-COMP( 198?, olypeopl, 0, 0, olypeopl, 0, peoplepc_state, empty_init, "Olympia", "People PC", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
+COMP( 1983, olypeopl, 0, 0, olypeopl, 0, peoplepc_state, empty_init, "Olympia", "People PC", MACHINE_NOT_WORKING|MACHINE_NO_SOUND)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/pgm.cpp mame-0.224+dfsg.1/src/mame/drivers/pgm.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/pgm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/pgm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -182,7 +182,7 @@
          SW1       - Push button switch to enter Test Mode
          SW2       - 8 position DIP Switch (for configuration of PCB/game options)
          SW3       - SPDT switch , to clear the NVRAM and reset the whole system
-         TD62064   - Toshiba NPN 50V 1.5A Quad Darlinton Switch; for driving coin meters (DIP16)
+         TD62064   - Toshiba NPN 50V 1.5A Quad Darlington Switch; for driving coin meters (DIP16)
          TDA1519A  - Philips 2x 6W Stereo Power AMP (SIL9)
          uPD6379   - NEC 2-channel 16-bit D/A converter 10mW typ. (SOIC8)
          uPC844C   - NEC Quad High Speed Wide Band Operational Amplifier (DIP14)
@@ -265,7 +265,7 @@
 	}
 	else
 	{
-		/* this might not be 100% correct, but several of the games (ddp2, puzzli2 etc. expect the z80 to be turned
+		/* this might not be 100% correct, but several of the games (ddp2, puzzli2 etc.) expect the z80 to be turned
 		off during data uploads, they write here before the upload */
 		m_soundcpu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
 	}
@@ -321,6 +321,13 @@
 	map(0x900000, 0x907fff).mirror(0x0f8000).rw(FUNC(pgm_state::videoram_r), FUNC(pgm_state::videoram_w)).share("videoram"); /* IGS023 VIDEO CHIP */
 	map(0xa00000, 0xa011ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
 	map(0xb00000, 0xb0ffff).ram().share("videoregs"); /* Video Regs inc. Zoom Table */
+	//map(0xb01000, 0xb0103f) Zoom/Shrink table for sprites
+	//map(0xb02000, 0xb02001) Background scroll Y
+	//map(0xb03000, 0xb03001) Background scroll X
+	//map(0xb04000, 0xb04001) Unknown #0
+	//map(0xb05000, 0xb05001) Foreground scroll Y
+	//map(0xb06000, 0xb06001) Foreground scroll X?
+	//map(0xb0e000, 0xb0e001) Unknown #1
 
 	map(0xc00003, 0xc00003).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(FUNC(pgm_state::m68k_l1_w));
 	map(0xc00005, 0xc00005).rw("soundlatch2", FUNC(generic_latch_8_device::read), FUNC(generic_latch_8_device::write));
@@ -444,17 +451,6 @@
    Note that the bit indexes are reversed compared to usual gfx layouts
    (0-7 = LSB to MSB) */
 
-static const gfx_layout pgm8_charlayout =
-{
-	8,8,
-	RGN_FRAC(1,1),
-	4,
-	{ STEP4(3,-1) },
-	{ STEP8(0,4) },
-	{ STEP8(0,4*8) },
-	8*32
-};
-
 static const gfx_layout pgm32_charlayout =
 {
 	32,32,
@@ -467,8 +463,8 @@
 };
 
 GFXDECODE_START( gfx_pgm )
-	GFXDECODE_REVERSEBITS( "tiles", 0, pgm8_charlayout,    0x800, 32  ) /* 8x8x4 Tiles */
-	GFXDECODE_REVERSEBITS( "tiles", 0, pgm32_charlayout,   0x400, 32  ) /* 32x32x5 Tiles */
+	GFXDECODE_ENTRY(       "tiles", 0, gfx_8x8x4_packed_lsb, 0x800, 32 ) /* 8x8x4 Tiles */
+	GFXDECODE_REVERSEBITS( "tiles", 0, pgm32_charlayout,     0x400, 32 ) /* 32x32x5 Tiles */
 GFXDECODE_END
 
 /*** Machine Driver **********************************************************/
@@ -479,10 +475,11 @@
 {
 	int scanline = param;
 
-// already being generated by m_maincpu->set_vblank_int("screen", FUNC(pgm_state::irq6_line_hold));
+// already being generated by screen.screen_vblank().set(FUNC(pgm_state::screen_vblank));;
 //  if (scanline == 224)
 //      m_maincpu->set_input_line(6, HOLD_LINE);
 
+//  vblank end interrupt
 	if (scanline == 0)
 		if (!m_irq4_disabled) m_maincpu->set_input_line(4, HOLD_LINE);
 }
@@ -497,7 +494,6 @@
 	/* basic machine hardware */
 	M68000(config, m_maincpu, 20_MHz_XTAL); /* 20 mhz! verified on real board */
 	m_maincpu->set_addrmap(AS_PROGRAM, &pgm_state::pgm_basic_mem);
-	m_maincpu->set_vblank_int("screen", FUNC(pgm_state::irq6_line_hold));
 	TIMER(config, "scantimer").configure_scanline(FUNC(pgm_state::interrupt), "screen", 0, 1);
 
 	Z80(config, m_soundcpu, 33.8688_MHz_XTAL/4);
@@ -510,10 +506,7 @@
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(60); // killing blade won't boot (just displays 'error') if this is lower than 59.9 or higher than 60.1 .. are actual PGM boards different to the Cave one?
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
-	screen.set_size(64*8, 64*8);
-	screen.set_visarea(0*8, 56*8-1, 0*8, 28*8-1);
+	screen.set_raw(50_MHz_XTAL/5, 640, 0, 448, 264, 0, 224); // or 20MHz / 2? framerate verified
 	screen.set_screen_update(FUNC(pgm_state::screen_update));
 	screen.screen_vblank().set(FUNC(pgm_state::screen_vblank));
 	screen.set_palette(m_palette);
@@ -577,51 +570,51 @@
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
+	ROM_LOAD( "pgm_t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
-	ROM_LOAD( "a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
-	ROM_LOAD( "a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
-	ROM_LOAD( "a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
-	ROM_LOAD( "a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
-	ROM_LOAD( "a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
+	ROM_LOAD( "pgm_a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
+	ROM_LOAD( "pgm_a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
+	ROM_LOAD( "pgm_a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
+	ROM_LOAD( "pgm_a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
+	ROM_LOAD( "pgm_a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
+	ROM_LOAD( "pgm_a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
-	ROM_LOAD( "b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
-	ROM_LOAD( "b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
+	ROM_LOAD( "pgm_b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
+	ROM_LOAD( "pgm_b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
+	ROM_LOAD( "pgm_b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
 
 	ROM_REGION( 0x600000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
+	ROM_LOAD( "pgm_m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
 ROM_END
 
 ROM_START( orlegende )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "p0102.rom",    0x100000, 0x200000, CRC(4d0f6cc5) SHA1(8d41f0a712fb11a1da865f5159e5e27447b4388a) )
+	ROM_LOAD16_WORD_SWAP( "pgm_p0102.u2",    0x100000, 0x200000, CRC(4d0f6cc5) SHA1(8d41f0a712fb11a1da865f5159e5e27447b4388a) )
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
+	ROM_LOAD( "pgm_t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
-	ROM_LOAD( "a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
-	ROM_LOAD( "a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
-	ROM_LOAD( "a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
-	ROM_LOAD( "a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
-	ROM_LOAD( "a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
+	ROM_LOAD( "pgm_a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
+	ROM_LOAD( "pgm_a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
+	ROM_LOAD( "pgm_a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
+	ROM_LOAD( "pgm_a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
+	ROM_LOAD( "pgm_a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
+	ROM_LOAD( "pgm_a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
-	ROM_LOAD( "b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
-	ROM_LOAD( "b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
+	ROM_LOAD( "pgm_b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
+	ROM_LOAD( "pgm_b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
+	ROM_LOAD( "pgm_b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
 
 	ROM_REGION( 0x600000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
+	ROM_LOAD( "pgm_m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
 ROM_END
 
 ROM_START( orlegendc )
@@ -631,24 +624,24 @@
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
+	ROM_LOAD( "pgm_t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
-	ROM_LOAD( "a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
-	ROM_LOAD( "a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
-	ROM_LOAD( "a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
-	ROM_LOAD( "a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
-	ROM_LOAD( "a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
+	ROM_LOAD( "pgm_a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
+	ROM_LOAD( "pgm_a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
+	ROM_LOAD( "pgm_a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
+	ROM_LOAD( "pgm_a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
+	ROM_LOAD( "pgm_a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
+	ROM_LOAD( "pgm_a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
-	ROM_LOAD( "b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
-	ROM_LOAD( "b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
+	ROM_LOAD( "pgm_b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
+	ROM_LOAD( "pgm_b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
+	ROM_LOAD( "pgm_b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
 
 	ROM_REGION( 0x600000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
+	ROM_LOAD( "pgm_m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
 ROM_END
 
 ROM_START( orlegendca )
@@ -658,24 +651,24 @@
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
+	ROM_LOAD( "pgm_t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
-	ROM_LOAD( "a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
-	ROM_LOAD( "a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
-	ROM_LOAD( "a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
-	ROM_LOAD( "a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
-	ROM_LOAD( "a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
+	ROM_LOAD( "pgm_a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
+	ROM_LOAD( "pgm_a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
+	ROM_LOAD( "pgm_a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
+	ROM_LOAD( "pgm_a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
+	ROM_LOAD( "pgm_a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
+	ROM_LOAD( "pgm_a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
-	ROM_LOAD( "b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
-	ROM_LOAD( "b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
+	ROM_LOAD( "pgm_b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
+	ROM_LOAD( "pgm_b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
+	ROM_LOAD( "pgm_b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
 
 	ROM_REGION( 0x600000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
+	ROM_LOAD( "pgm_m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
 ROM_END
 
 
@@ -688,10 +681,10 @@
 IGS PCB NO-0134-1
 IGS PCB NO-0135
 
-OLV111CH.U11 [b80ddd3c]
-OLV111CH.U6  [5fb86373]
-OLV111CH.U7  [6ee79faf]
-OLV111CH.U9  [83cf09c8]
+OLV 111 CHINA U11.U11 [b80ddd3c]
+OLV 111 CHINA U6.U6   [5fb86373]
+OLV 111 CHINA U7.U7   [6ee79faf]
+OLV 111 CHINA U9.U9   [83cf09c8]
 
 T0100.U8
 
@@ -713,92 +706,154 @@
 ROM_START( orlegend111c )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "olv111ch.u6",     0x100001, 0x080000, CRC(5fb86373) SHA1(2fc58eff1f38754c75819fde666244b867ca4f05) )
-	ROM_LOAD16_BYTE( "olv111ch.u9",     0x100000, 0x080000, CRC(83cf09c8) SHA1(959780b45326059517f3008a356657f4f3d2908f) )
-	ROM_LOAD16_BYTE( "olv111ch.u7",     0x200001, 0x080000, CRC(6ee79faf) SHA1(039b4b07b8577f0d3022ae01210c00375624cb3c) )
-	ROM_LOAD16_BYTE( "olv111ch.u11",    0x200000, 0x080000, CRC(b80ddd3c) SHA1(55c700ce71ffdee392e03fd9d4719542c3527132) )
+	ROM_LOAD16_BYTE( "olv_111_china_u6.u6",     0x100001, 0x080000, CRC(5fb86373) SHA1(2fc58eff1f38754c75819fde666244b867ca4f05) )
+	ROM_LOAD16_BYTE( "olv_111_china_u9.u9",     0x100000, 0x080000, CRC(83cf09c8) SHA1(959780b45326059517f3008a356657f4f3d2908f) )
+	ROM_LOAD16_BYTE( "olv_111_china_u7.u7",     0x200001, 0x080000, CRC(6ee79faf) SHA1(039b4b07b8577f0d3022ae01210c00375624cb3c) )
+	ROM_LOAD16_BYTE( "olv_111_china_u11.u11",   0x200000, 0x080000, CRC(b80ddd3c) SHA1(55c700ce71ffdee392e03fd9d4719542c3527132) )
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
+	ROM_LOAD( "pgm_t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
-	ROM_LOAD( "a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
-	ROM_LOAD( "a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
-	ROM_LOAD( "a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
-	ROM_LOAD( "a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
-	ROM_LOAD( "a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
+	ROM_LOAD( "pgm_a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
+	ROM_LOAD( "pgm_a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
+	ROM_LOAD( "pgm_a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
+	ROM_LOAD( "pgm_a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
+	ROM_LOAD( "pgm_a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
+	ROM_LOAD( "pgm_a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
-	ROM_LOAD( "b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
-	ROM_LOAD( "b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
+	ROM_LOAD( "pgm_b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
+	ROM_LOAD( "pgm_b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
+	ROM_LOAD( "pgm_b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
 
 	ROM_REGION( 0x600000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
+	ROM_LOAD( "pgm_m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
 ROM_END
 
 
 ROM_START( orlegend111t )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "olv111tw.u6",     0x100001, 0x080000, CRC(b205a733) SHA1(33f4c9162e36be4957004f80593f94fc33b163f8) )
-	ROM_LOAD16_BYTE( "olv111tw.u9",     0x100000, 0x080000, CRC(6d9d29b4) SHA1(29a18de7e5b58c2f3125d6dc9cc8a8186180e956) )
-	ROM_LOAD16_BYTE( "olv111tw.u7",     0x200001, 0x080000, CRC(27628e87) SHA1(a0effd83dc57ac72ba4f110737a075705d78e798) )
-	ROM_LOAD16_BYTE( "olv111tw.u11",    0x200000, 0x080000, CRC(23f33bc9) SHA1(f24490370d40d905afe8b716a3953b4e9f0aada4) )
+	ROM_LOAD16_BYTE( "olv_111_taiwan_u6.u6",     0x100001, 0x080000, CRC(b205a733) SHA1(33f4c9162e36be4957004f80593f94fc33b163f8) )
+	ROM_LOAD16_BYTE( "olv_111_taiwan_u9.u9",     0x100000, 0x080000, CRC(6d9d29b4) SHA1(29a18de7e5b58c2f3125d6dc9cc8a8186180e956) )
+	ROM_LOAD16_BYTE( "olv_111_taiwan_u7.u7",     0x200001, 0x080000, CRC(27628e87) SHA1(a0effd83dc57ac72ba4f110737a075705d78e798) )
+	ROM_LOAD16_BYTE( "olv_111_taiwan_u11.u11",    0x200000, 0x080000, CRC(23f33bc9) SHA1(f24490370d40d905afe8b716a3953b4e9f0aada4) )
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
+	ROM_LOAD( "pgm_t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
-	ROM_LOAD( "a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
-	ROM_LOAD( "a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
-	ROM_LOAD( "a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
-	ROM_LOAD( "a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
-	ROM_LOAD( "a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
+	ROM_LOAD( "pgm_a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
+	ROM_LOAD( "pgm_a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
+	ROM_LOAD( "pgm_a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
+	ROM_LOAD( "pgm_a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
+	ROM_LOAD( "pgm_a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
+	ROM_LOAD( "pgm_a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
-	ROM_LOAD( "b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
-	ROM_LOAD( "b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
+	ROM_LOAD( "pgm_b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
+	ROM_LOAD( "pgm_b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
+	ROM_LOAD( "pgm_b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
 
 	ROM_REGION( 0x600000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
+	ROM_LOAD( "pgm_m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
 ROM_END
 
+
+/*
+
+Oriental Legend / Xi You Shi E Zhuan (KOREA 111 Ver.)
+(c)1997 IGS
+
+PGM system
+IGS PCB NO-0134-2
+IGS PCB NO-0135
+
+OLV 111 KOREA U11.U11 [23f33bc9]
+OLV 111 KOREA U6.U6   [1ff35baa]
+OLV 111 KOREA U7.U7   [27628e87]
+OLV 111 KOREA U9.U9   [87b6d202]
+
+T0100.U8
+
+A0100.U5
+A0101.U6
+A0102.U7
+A0103.U8
+A0104.U11
+A0105.U12
+
+B0100.U9
+B0101.U10
+B0102.U15
+
+M0100.U1
+
+*/
+
 ROM_START( orlegend111k )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "olv111ko.u6",     0x100001, 0x080000, CRC(1ff35baa) SHA1(f6791cc37ea468d0154b0e31a99f6f33a74bca81) )
-	ROM_LOAD16_BYTE( "olv111ko.u9",     0x100000, 0x080000, CRC(87b6d202) SHA1(32828166a645158630f79e7d493a2774e69bc265) )
-	ROM_LOAD16_BYTE( "olv111ko.u7",     0x200001, 0x080000, CRC(27628e87) SHA1(a0effd83dc57ac72ba4f110737a075705d78e798) )
-	ROM_LOAD16_BYTE( "olv111ko.u11",    0x200000, 0x080000, CRC(23f33bc9) SHA1(f24490370d40d905afe8b716a3953b4e9f0aada4) )
+	ROM_LOAD16_BYTE( "olv_111_korea_u6.u6",     0x100001, 0x080000, CRC(1ff35baa) SHA1(f6791cc37ea468d0154b0e31a99f6f33a74bca81) )
+	ROM_LOAD16_BYTE( "olv_111_korea_u9.u9",     0x100000, 0x080000, CRC(87b6d202) SHA1(32828166a645158630f79e7d493a2774e69bc265) )
+	ROM_LOAD16_BYTE( "olv_111_korea_u7.u7",     0x200001, 0x080000, CRC(27628e87) SHA1(a0effd83dc57ac72ba4f110737a075705d78e798) )
+	ROM_LOAD16_BYTE( "olv_111_korea_u11.u11",   0x200000, 0x080000, CRC(23f33bc9) SHA1(f24490370d40d905afe8b716a3953b4e9f0aada4) )
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
+	ROM_LOAD( "pgm_t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
-	ROM_LOAD( "a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
-	ROM_LOAD( "a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
-	ROM_LOAD( "a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
-	ROM_LOAD( "a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
-	ROM_LOAD( "a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
+	ROM_LOAD( "pgm_a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
+	ROM_LOAD( "pgm_a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
+	ROM_LOAD( "pgm_a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
+	ROM_LOAD( "pgm_a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
+	ROM_LOAD( "pgm_a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
+	ROM_LOAD( "pgm_a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
-	ROM_LOAD( "b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
-	ROM_LOAD( "b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
+	ROM_LOAD( "pgm_b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
+	ROM_LOAD( "pgm_b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
+	ROM_LOAD( "pgm_b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
 
 	ROM_REGION( 0x600000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
+	ROM_LOAD( "pgm_m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
+ROM_END
+
+ROM_START( orlegend105t )
+	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
+	PGM_68K_BIOS
+	ROM_LOAD16_BYTE( "olv_105_taiwan_u6.u6",     0x100001, 0x080000, CRC(2b14331f) SHA1(3909b5480764916761895ad3f25dd4f40762a2d8) )
+	ROM_LOAD16_BYTE( "olv_105_taiwan_u9.u9",     0x100000, 0x080000, CRC(ae9d71e4) SHA1(20f84c18808a80464f22c72eafe7680690274f39) )
+	ROM_LOAD16_BYTE( "olv_105_taiwan_u7.u7",     0x200001, 0x080000, CRC(5712facc) SHA1(2d95ebd1703874e89ac3a206f8c1f0ece6e833e0) )
+	ROM_LOAD16_BYTE( "olv_105_taiwan_u11.u11",   0x200000, 0x080000, CRC(40ae4d9e) SHA1(62d7a96438b7fe93f74753333f50e077d417971e) )
+
+	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	PGM_VIDEO_BIOS
+	ROM_LOAD( "pgm_t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
+
+	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "pgm_a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
+	ROM_LOAD( "pgm_a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
+	ROM_LOAD( "pgm_a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
+	ROM_LOAD( "pgm_a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
+	ROM_LOAD( "pgm_a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
+	ROM_LOAD( "pgm_a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
+
+	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "pgm_b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
+	ROM_LOAD( "pgm_b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
+	ROM_LOAD( "pgm_b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
+
+	ROM_REGION( 0x600000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
+	PGM_AUDIO_BIOS
+	ROM_LOAD( "pgm_m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
 ROM_END
 
 /*
@@ -842,24 +897,24 @@
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
+	ROM_LOAD( "pgm_t0100.u8",     0x180000, 0x400000, CRC(61425e1e) SHA1(20753b86fc12003cfd763d903f034dbba8010b32) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
-	ROM_LOAD( "a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
-	ROM_LOAD( "a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
-	ROM_LOAD( "a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
-	ROM_LOAD( "a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
-	ROM_LOAD( "a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
+	ROM_LOAD( "pgm_a0100.u5",     0x0000000, 0x400000, CRC(8b3bd88a) SHA1(42db3a60c6ba9d83ebe2008c8047d094027f65a7) )
+	ROM_LOAD( "pgm_a0101.u6",     0x0400000, 0x400000, CRC(3b9e9644) SHA1(5b95ec1d25c3bc3504c93547f5adb5ce24376405) )
+	ROM_LOAD( "pgm_a0102.u7",     0x0800000, 0x400000, CRC(069e2c38) SHA1(9bddca8c2f5bd80f4abe4e1f062751736dc151dd) )
+	ROM_LOAD( "pgm_a0103.u8",     0x0c00000, 0x400000, CRC(4460a3fd) SHA1(cbebdb65c17605853f7d0b298018dd8801a25a58) )
+	ROM_LOAD( "pgm_a0104.u11",    0x1000000, 0x400000, CRC(5f8abb56) SHA1(6c1ddc0309862a141aa0c0f63b641aec9257aaee) )
+	ROM_LOAD( "pgm_a0105.u12",    0x1400000, 0x400000, CRC(a17a7147) SHA1(44eeb43c6b0ebb829559a20ae357383fbdeecd82) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
-	ROM_LOAD( "b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
-	ROM_LOAD( "b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
+	ROM_LOAD( "pgm_b0100.u9",     0x0000000, 0x400000, CRC(69d2e48c) SHA1(5b5f759007264c07b3b39be8e03a713698e1fc2a) )
+	ROM_LOAD( "pgm_b0101.u10",    0x0400000, 0x400000, CRC(0d587bf3) SHA1(5347828b0a6e4ddd7a263663d2c2604407e4d49c) )
+	ROM_LOAD( "pgm_b0102.u15",    0x0800000, 0x400000, CRC(43823c1e) SHA1(e10a1a9a81b51b11044934ff702e35d8d7ab1b08) )
 
 	ROM_REGION( 0x600000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
+	ROM_LOAD( "pgm_m0100.u1",     0x400000, 0x200000, CRC(e5c36c83) SHA1(50c6f66770e8faa3df349f7d68c407a7ad021716) )
 ROM_END
 
 /*
@@ -932,93 +987,114 @@
 ROM_START( drgw2 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "v-110x.u2",    0x100000, 0x080000, CRC(1978106b) SHA1(af8a13d7783b755a58762c98bdc32cab845b2251) )
+	ROM_LOAD16_WORD_SWAP( "dragon_ii_v-110x.u2",    0x100000, 0x080000, CRC(1978106b) SHA1(af8a13d7783b755a58762c98bdc32cab845b2251) )
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "pgmt0200.u7",    0x180000, 0x400000, CRC(b0f6534d) SHA1(174cacd81169a0e0d14790ac06d03caed737e05d) )
+	ROM_LOAD( "pgm_t0200.u7",    0x180000, 0x400000, CRC(b0f6534d) SHA1(174cacd81169a0e0d14790ac06d03caed737e05d) )
 
 	ROM_REGION16_LE( 0x0400000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "pgma0200.u5",    0x0000000, 0x400000, CRC(13b95069) SHA1(4888b06002afb18eab81c010e9362629045767af) )
+	ROM_LOAD( "pgm_a0200.u5",    0x0000000, 0x400000, CRC(13b95069) SHA1(4888b06002afb18eab81c010e9362629045767af) )
 
 	ROM_REGION16_LE( 0x0400000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "pgmb0200.u9",    0x0000000, 0x400000, CRC(932d0f13) SHA1(4b8e008f9c617cb2b95effeb81abc065b30e5c86) )
+	ROM_LOAD( "pgm_b0200.u9",    0x0000000, 0x400000, CRC(932d0f13) SHA1(4b8e008f9c617cb2b95effeb81abc065b30e5c86) )
 
 	ROM_REGION( 0x400000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
 ROM_END
 
-ROM_START( dw2v100x )
+ROM_START( drgw2100x )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "dragonv100x.bin",    0x100000, 0x080000,  CRC(5e71851d) SHA1(62052469f69daec88efd26652c1b893d6f981912) )
+	ROM_LOAD16_WORD_SWAP( "dragon_ii_v-100x.u2",    0x100000, 0x080000,  CRC(5e71851d) SHA1(62052469f69daec88efd26652c1b893d6f981912) )
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "pgmt0200.u7",    0x180000, 0x400000, CRC(b0f6534d) SHA1(174cacd81169a0e0d14790ac06d03caed737e05d) )
+	ROM_LOAD( "pgm_t0200.u7",    0x180000, 0x400000, CRC(b0f6534d) SHA1(174cacd81169a0e0d14790ac06d03caed737e05d) )
 
 	ROM_REGION16_LE( 0x0400000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "pgma0200.u5",    0x0000000, 0x400000, CRC(13b95069) SHA1(4888b06002afb18eab81c010e9362629045767af) )
+	ROM_LOAD( "pgm_a0200.u5",    0x0000000, 0x400000, CRC(13b95069) SHA1(4888b06002afb18eab81c010e9362629045767af) )
 
 	ROM_REGION16_LE( 0x0400000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "pgmb0200.u9",    0x0000000, 0x400000, CRC(932d0f13) SHA1(4b8e008f9c617cb2b95effeb81abc065b30e5c86) )
+	ROM_LOAD( "pgm_b0200.u9",    0x0000000, 0x400000, CRC(932d0f13) SHA1(4b8e008f9c617cb2b95effeb81abc065b30e5c86) )
 
 	ROM_REGION( 0x400000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
 ROM_END
 
-ROM_START( drgw2c )
+ROM_START( drgw2101c )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "v-100c.u2",    0x100000, 0x080000, CRC(67467981) SHA1(58af01a3871b6179fe42ff471cc39a2161940043) )
+	ROM_LOAD16_WORD_SWAP( "dragon_ii_v-101c.u2",    0x100000, 0x080000, CRC(b0c592fa) SHA1(87ccfdb940303ebcf42cb2952aecae97648c1e0d) )
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "pgmt0200.u7",    0x180000, 0x400000, CRC(b0f6534d) SHA1(174cacd81169a0e0d14790ac06d03caed737e05d) )
+	ROM_LOAD( "pgm_t0200.u7",    0x180000, 0x400000, CRC(b0f6534d) SHA1(174cacd81169a0e0d14790ac06d03caed737e05d) )
 
 	ROM_REGION16_LE( 0x0400000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "pgma0200.u5",    0x0000000, 0x400000, CRC(13b95069) SHA1(4888b06002afb18eab81c010e9362629045767af) )
+	ROM_LOAD( "pgm_a0200.u5",    0x0000000, 0x400000, CRC(13b95069) SHA1(4888b06002afb18eab81c010e9362629045767af) )
 
 	ROM_REGION16_LE( 0x0400000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "pgmb0200.u9",    0x0000000, 0x400000, CRC(932d0f13) SHA1(4b8e008f9c617cb2b95effeb81abc065b30e5c86) )
+	ROM_LOAD( "pgm_b0200.u9",    0x0000000, 0x400000, CRC(932d0f13) SHA1(4b8e008f9c617cb2b95effeb81abc065b30e5c86) )
 
 	ROM_REGION( 0x400000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
 ROM_END
 
-ROM_START( drgw2j )
+ROM_START( drgw2100c )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "v-100j.u2",    0x100000, 0x080000, CRC(f8f8393e) SHA1(ef0db668b4e4f661d4c1e95d57afe881bcdf13cc) )
+	ROM_LOAD16_WORD_SWAP( "dragon_ii_v-100c.u2",    0x100000, 0x080000, CRC(67467981) SHA1(58af01a3871b6179fe42ff471cc39a2161940043) )
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "pgmt0200.u7",    0x180000, 0x400000, CRC(b0f6534d) SHA1(174cacd81169a0e0d14790ac06d03caed737e05d) )
+	ROM_LOAD( "pgm_t0200.u7",    0x180000, 0x400000, CRC(b0f6534d) SHA1(174cacd81169a0e0d14790ac06d03caed737e05d) )
 
 	ROM_REGION16_LE( 0x0400000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "pgma0200.u5",    0x0000000, 0x400000, CRC(13b95069) SHA1(4888b06002afb18eab81c010e9362629045767af) )
+	ROM_LOAD( "pgm_a0200.u5",    0x0000000, 0x400000, CRC(13b95069) SHA1(4888b06002afb18eab81c010e9362629045767af) )
 
 	ROM_REGION16_LE( 0x0400000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "pgmb0200.u9",    0x0000000, 0x400000, CRC(932d0f13) SHA1(4b8e008f9c617cb2b95effeb81abc065b30e5c86) )
+	ROM_LOAD( "pgm_b0200.u9",    0x0000000, 0x400000, CRC(932d0f13) SHA1(4b8e008f9c617cb2b95effeb81abc065b30e5c86) )
 
 	ROM_REGION( 0x400000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
 ROM_END
 
-ROM_START( drgw2hk ) // the IGS025 has a "DRAGON-II 0004-1" sticker, the IGS012 has no per-game marking
+ROM_START( drgw2100j )
+	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
+	PGM_68K_BIOS
+	ROM_LOAD16_WORD_SWAP( "dragon_ii_v-100j.u2",    0x100000, 0x080000, CRC(f8f8393e) SHA1(ef0db668b4e4f661d4c1e95d57afe881bcdf13cc) )
+	// A cart has been found with same contents but ROM label on sticker is DRAGON II V101J.
+	// Is this correct or wrong sticker applied?
+
+	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	PGM_VIDEO_BIOS
+	ROM_LOAD( "pgm_t0200.u7",    0x180000, 0x400000, CRC(b0f6534d) SHA1(174cacd81169a0e0d14790ac06d03caed737e05d) )
+
+	ROM_REGION16_LE( 0x0400000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "pgm_a0200.u5",    0x0000000, 0x400000, CRC(13b95069) SHA1(4888b06002afb18eab81c010e9362629045767af) )
+
+	ROM_REGION16_LE( 0x0400000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "pgm_b0200.u9",    0x0000000, 0x400000, CRC(932d0f13) SHA1(4b8e008f9c617cb2b95effeb81abc065b30e5c86) )
+
+	ROM_REGION( 0x400000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
+	PGM_AUDIO_BIOS
+ROM_END
+
+ROM_START( drgw2100hk ) // the IGS025 has a "DRAGON-II 0004-1" sticker, the IGS012 has no per-game marking
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
 	ROM_LOAD16_WORD_SWAP( "dragon_ii_v-100-h.u2",    0x100000, 0x080000, CRC(c6e2e6ec) SHA1(84145dfb26857ea20efb233363f175bc9bb25b0c) )
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "pgmt0200.u7",    0x180000, 0x400000, CRC(b0f6534d) SHA1(174cacd81169a0e0d14790ac06d03caed737e05d) )
+	ROM_LOAD( "pgm_t0200.u7",    0x180000, 0x400000, CRC(b0f6534d) SHA1(174cacd81169a0e0d14790ac06d03caed737e05d) )
 
 	ROM_REGION16_LE( 0x0400000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "pgma0200.u5",    0x0000000, 0x400000, CRC(13b95069) SHA1(4888b06002afb18eab81c010e9362629045767af) )
+	ROM_LOAD( "pgm_a0200.u5",    0x0000000, 0x400000, CRC(13b95069) SHA1(4888b06002afb18eab81c010e9362629045767af) )
 
 	ROM_REGION16_LE( 0x0400000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "pgmb0200.u9",    0x0000000, 0x400000, CRC(932d0f13) SHA1(4b8e008f9c617cb2b95effeb81abc065b30e5c86) )
+	ROM_LOAD( "pgm_b0200.u9",    0x0000000, 0x400000, CRC(932d0f13) SHA1(4b8e008f9c617cb2b95effeb81abc065b30e5c86) )
 
 	ROM_REGION( 0x400000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
@@ -1043,77 +1119,77 @@
 ROM_START( drgw3 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "dw3_v106.u12",     0x100001, 0x080000,  CRC(c3f6838b) SHA1(c135b1d4dd62af308139d40d03c29be7508fb1e7) )
-	ROM_LOAD16_BYTE( "dw3_v106.u13",     0x100000, 0x080000,  CRC(28284e22) SHA1(4643a69881ddb7383ca10f3eb2aa2cf41be39e9f) )
+	ROM_LOAD16_BYTE( "dw3_v106_u12.u12",     0x100001, 0x080000,  CRC(c3f6838b) SHA1(c135b1d4dd62af308139d40d03c29be7508fb1e7) )
+	ROM_LOAD16_BYTE( "dw3_v106_u13.u13",     0x100000, 0x080000,  CRC(28284e22) SHA1(4643a69881ddb7383ca10f3eb2aa2cf41be39e9f) )
 
 	ROM_REGION( 0x010000, "igs022", 0 ) /* Protection Data - is it correct for this set? */
-	ROM_LOAD( "dw3_v100.u15", 0x000000, 0x010000, CRC(03dc4fdf) SHA1(b329b04325d4f725231b1bb7862eedef2319b652) )
+	ROM_LOAD( "dw3_text_u15.u15", 0x000000, 0x010000, CRC(03dc4fdf) SHA1(b329b04325d4f725231b1bb7862eedef2319b652) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "dw3t0400.u18",   0x180000, 0x400000, CRC(b70f3357) SHA1(8733969d7d21f540f295a9f747a4bb8f0d325cf0) )
+	ROM_LOAD( "pgm_t0400.u18",   0x180000, 0x400000, CRC(b70f3357) SHA1(8733969d7d21f540f295a9f747a4bb8f0d325cf0) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "dw3a0400.u9",     0x0000000, 0x400000, CRC(dd7bfd40) SHA1(fb7ec5bf89a413c5208716083762a725ff63f5db) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "dw3a0401.u10",    0x0400000, 0x400000, CRC(cab6557f) SHA1(1904dd86645eea27ac1ab8a2462b20f6531356f8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0400.u9",     0x0000000, 0x400000, CRC(dd7bfd40) SHA1(fb7ec5bf89a413c5208716083762a725ff63f5db) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0401.u10",    0x0400000, 0x400000, CRC(cab6557f) SHA1(1904dd86645eea27ac1ab8a2462b20f6531356f8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "dw3b0400.u13",    0x0000000, 0x400000,  CRC(4bb87cc0) SHA1(71b2dc43fd11f7a6dffaba501e4e344b843583d8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_b0400.u13",    0x0000000, 0x400000,  CRC(4bb87cc0) SHA1(71b2dc43fd11f7a6dffaba501e4e344b843583d8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "dw3m0400.u1",  0x400000, 0x400000, CRC(031eb9ce) SHA1(0673ec194732becc6648c2ae1396e894aa269f9a) )
+	ROM_LOAD( "pgm_m0400.u1",  0x400000, 0x400000, CRC(031eb9ce) SHA1(0673ec194732becc6648c2ae1396e894aa269f9a) )
 ROM_END
 
 
 ROM_START( drgw3105 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "dw3_v105.u12",     0x100001, 0x080000,  CRC(c5e24318) SHA1(c6954495bbc72c3985df75aecf6afd6826c8e30e) )
-	ROM_LOAD16_BYTE( "dw3_v105.u13",     0x100000, 0x080000,  CRC(8d6c9d39) SHA1(cb79303ab551e91f07e11414db4254d5b161d415) )
+	ROM_LOAD16_BYTE( "dw3_v105_u12.u12",     0x100001, 0x080000,  CRC(c5e24318) SHA1(c6954495bbc72c3985df75aecf6afd6826c8e30e) )
+	ROM_LOAD16_BYTE( "dw3_v105_u13.u13",     0x100000, 0x080000,  CRC(8d6c9d39) SHA1(cb79303ab551e91f07e11414db4254d5b161d415) )
 
 	ROM_REGION( 0x010000, "igs022", 0 ) /* Protection Data - is it correct for this set? */
 	ROM_LOAD( "dw3_v100.u15", 0x000000, 0x010000, CRC(03dc4fdf) SHA1(b329b04325d4f725231b1bb7862eedef2319b652) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "dw3t0400.u18",   0x180000, 0x400000, CRC(b70f3357) SHA1(8733969d7d21f540f295a9f747a4bb8f0d325cf0) )
+	ROM_LOAD( "pgm_t0400.u18",   0x180000, 0x400000, CRC(b70f3357) SHA1(8733969d7d21f540f295a9f747a4bb8f0d325cf0) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "dw3a0400.u9",     0x0000000, 0x400000, CRC(dd7bfd40) SHA1(fb7ec5bf89a413c5208716083762a725ff63f5db) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "dw3a0401.u10",    0x0400000, 0x400000, CRC(cab6557f) SHA1(1904dd86645eea27ac1ab8a2462b20f6531356f8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0400.u9",     0x0000000, 0x400000, CRC(dd7bfd40) SHA1(fb7ec5bf89a413c5208716083762a725ff63f5db) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0401.u10",    0x0400000, 0x400000, CRC(cab6557f) SHA1(1904dd86645eea27ac1ab8a2462b20f6531356f8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "dw3b0400.u13",    0x0000000, 0x400000,  CRC(4bb87cc0) SHA1(71b2dc43fd11f7a6dffaba501e4e344b843583d8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_b0400.u13",    0x0000000, 0x400000,  CRC(4bb87cc0) SHA1(71b2dc43fd11f7a6dffaba501e4e344b843583d8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "dw3m0400.u1",  0x400000, 0x400000, CRC(031eb9ce) SHA1(0673ec194732becc6648c2ae1396e894aa269f9a) )
+	ROM_LOAD( "pgm_m0400.u1",  0x400000, 0x400000, CRC(031eb9ce) SHA1(0673ec194732becc6648c2ae1396e894aa269f9a) )
 ROM_END
 
 ROM_START( drgw3103 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "dw3_v103j.u12",     0x100001, 0x080000,  CRC(275b39a2) SHA1(8ba4d2601734c2dda3d4269fbe8f543dc3f0b212) )
-	ROM_LOAD16_BYTE( "dw3_v103j.u13",     0x100000, 0x080000,  CRC(9aa56e8f) SHA1(c3f27d8b59adf72040a2e2c11e34f9b07efd7e9e) )
+	ROM_LOAD16_BYTE( "dragon_iii_v103j_u12.u12",     0x100001, 0x080000,  CRC(275b39a2) SHA1(8ba4d2601734c2dda3d4269fbe8f543dc3f0b212) )
+	ROM_LOAD16_BYTE( "dragon_iii_v103j_u13.u13",     0x100000, 0x080000,  CRC(9aa56e8f) SHA1(c3f27d8b59adf72040a2e2c11e34f9b07efd7e9e) )
 
 	ROM_REGION( 0x010000, "igs022", 0 ) /* Protection Data */
-	ROM_LOAD( "dw3_v100.u15", 0x000000, 0x010000, CRC(03dc4fdf) SHA1(b329b04325d4f725231b1bb7862eedef2319b652) )
+	ROM_LOAD( "dw3_v100_u15.u15", 0x000000, 0x010000, CRC(03dc4fdf) SHA1(b329b04325d4f725231b1bb7862eedef2319b652) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "dw3t0400.u18",   0x180000, 0x400000, CRC(b70f3357) SHA1(8733969d7d21f540f295a9f747a4bb8f0d325cf0) )
+	ROM_LOAD( "pgm_t0400.u18",   0x180000, 0x400000, CRC(b70f3357) SHA1(8733969d7d21f540f295a9f747a4bb8f0d325cf0) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "dw3a0400.u9",     0x0000000, 0x400000, CRC(dd7bfd40) SHA1(fb7ec5bf89a413c5208716083762a725ff63f5db) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "dw3a0401.u10",    0x0400000, 0x400000, CRC(cab6557f) SHA1(1904dd86645eea27ac1ab8a2462b20f6531356f8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0400.u9",     0x0000000, 0x400000, CRC(dd7bfd40) SHA1(fb7ec5bf89a413c5208716083762a725ff63f5db) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0401.u10",    0x0400000, 0x400000, CRC(cab6557f) SHA1(1904dd86645eea27ac1ab8a2462b20f6531356f8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "dw3b0400.u13",    0x0000000, 0x400000,  CRC(4bb87cc0) SHA1(71b2dc43fd11f7a6dffaba501e4e344b843583d8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_b0400.u13",    0x0000000, 0x400000,  CRC(4bb87cc0) SHA1(71b2dc43fd11f7a6dffaba501e4e344b843583d8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "dw3m0400.u1",  0x400000, 0x400000, CRC(031eb9ce) SHA1(0673ec194732becc6648c2ae1396e894aa269f9a) )
+	ROM_LOAD( "pgm_m0400.u1",  0x400000, 0x400000, CRC(031eb9ce) SHA1(0673ec194732becc6648c2ae1396e894aa269f9a) )
 ROM_END
 /*
 
@@ -1142,26 +1218,26 @@
 ROM_START( drgw3100 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "dw3_v100.u12",     0x100001, 0x080000,  CRC(47243906) SHA1(9cd46e3cba97f049bcb238ceb6edf27a760ef831) )
-	ROM_LOAD16_BYTE( "dw3_v100.u13",     0x100000, 0x080000,  CRC(b7cded21) SHA1(c1ae2af2e42227503c81bbcd2bd6862aa416bd78) )
+	ROM_LOAD16_BYTE( "dw3_v100_u12.u12",     0x100001, 0x080000,  CRC(47243906) SHA1(9cd46e3cba97f049bcb238ceb6edf27a760ef831) )
+	ROM_LOAD16_BYTE( "dw3_v100_u13.u13",     0x100000, 0x080000,  CRC(b7cded21) SHA1(c1ae2af2e42227503c81bbcd2bd6862aa416bd78) )
 
 	ROM_REGION( 0x010000, "igs022", 0 ) /* Protection Data */
-	ROM_LOAD( "dw3_v100.u15", 0x000000, 0x010000, CRC(03dc4fdf) SHA1(b329b04325d4f725231b1bb7862eedef2319b652) )
+	ROM_LOAD( "dw3_v100_u15.u15", 0x000000, 0x010000, CRC(03dc4fdf) SHA1(b329b04325d4f725231b1bb7862eedef2319b652) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "dw3t0400.u18",   0x180000, 0x400000, CRC(b70f3357) SHA1(8733969d7d21f540f295a9f747a4bb8f0d325cf0) )
+	ROM_LOAD( "pgm_t0400.u18",   0x180000, 0x400000, CRC(b70f3357) SHA1(8733969d7d21f540f295a9f747a4bb8f0d325cf0) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "dw3a0400.u9",     0x0000000, 0x400000, CRC(dd7bfd40) SHA1(fb7ec5bf89a413c5208716083762a725ff63f5db) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "dw3a0401.u10",    0x0400000, 0x400000, CRC(cab6557f) SHA1(1904dd86645eea27ac1ab8a2462b20f6531356f8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0400.u9",     0x0000000, 0x400000, CRC(dd7bfd40) SHA1(fb7ec5bf89a413c5208716083762a725ff63f5db) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0401.u10",    0x0400000, 0x400000, CRC(cab6557f) SHA1(1904dd86645eea27ac1ab8a2462b20f6531356f8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "dw3b0400.u13",    0x0000000, 0x400000,  CRC(4bb87cc0) SHA1(71b2dc43fd11f7a6dffaba501e4e344b843583d8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_b0400.u13",    0x0000000, 0x400000,  CRC(4bb87cc0) SHA1(71b2dc43fd11f7a6dffaba501e4e344b843583d8) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "dw3m0400.u1",  0x400000, 0x400000, CRC(031eb9ce) SHA1(0673ec194732becc6648c2ae1396e894aa269f9a) )
+	ROM_LOAD( "pgm_m0400.u1",  0x400000, 0x400000, CRC(031eb9ce) SHA1(0673ec194732becc6648c2ae1396e894aa269f9a) )
 ROM_END
 
 /*
@@ -1194,51 +1270,51 @@
 ROM_START( dwex )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "ex_v100.u12",     0x100001, 0x080000, CRC(bc171799) SHA1(142329dffbca199f3e748a52146a03e27b36db6a) ) // V100 08/16/00 09:39:27
-	ROM_LOAD16_BYTE( "ex_v100.u13",     0x100000, 0x080000, CRC(7afe6322) SHA1(a52d71af1d6de16c5a3df23eacdab3466693ba8d) )
+	ROM_LOAD16_BYTE( "dwex_v100.u12",     0x100001, 0x080000, CRC(bc171799) SHA1(142329dffbca199f3e748a52146a03e27b36db6a) ) // V100 08/16/00 09:39:27
+	ROM_LOAD16_BYTE( "dwex_v100.u13",     0x100000, 0x080000, CRC(7afe6322) SHA1(a52d71af1d6de16c5a3df23eacdab3466693ba8d) )
 
 	ROM_REGION( 0x010000, "igs022", 0 ) /* Protection Data */
-	ROM_LOAD( "ex_data.u15", 0x000000, 0x010000, CRC(03dc4fdf) SHA1(b329b04325d4f725231b1bb7862eedef2319b652) )
+	ROM_LOAD( "dwiii_data_u15.u15", 0x000000, 0x010000, CRC(03dc4fdf) SHA1(b329b04325d4f725231b1bb7862eedef2319b652) )
 
 	ROM_REGION( 0x500000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "ex_t0400.u18", 0x180000, 0x200000, CRC(9ecc950d) SHA1(fd97f43818a3eb18254636166871fa09bd0d6c07) )
+	ROM_LOAD( "pgm_t0400.u18", 0x180000, 0x200000, CRC(9ecc950d) SHA1(fd97f43818a3eb18254636166871fa09bd0d6c07) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "ex_a0400.u9",     0x0000000, 0x400000, CRC(dd7bfd40) SHA1(fb7ec5bf89a413c5208716083762a725ff63f5db) )
-	ROM_LOAD( "ex_a0401.u10",    0x0400000, 0x200000, CRC(d36c06a4) SHA1(f192e8bfdfbe3d82a49d8f0d3cb0603e39719773) )
+	ROM_LOAD( "pgm_a0400.u9",     0x0000000, 0x400000, CRC(dd7bfd40) SHA1(fb7ec5bf89a413c5208716083762a725ff63f5db) )
+	ROM_LOAD( "pgm_a0401.u10",    0x0400000, 0x200000, CRC(d36c06a4) SHA1(f192e8bfdfbe3d82a49d8f0d3cb0603e39719773) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "ex_b0400.u13",    0x0000000, 0x400000,  CRC(4bb87cc0) SHA1(71b2dc43fd11f7a6dffaba501e4e344b843583d8) )
+	ROM_LOAD( "pgm_b0400.u13",    0x0000000, 0x400000,  CRC(4bb87cc0) SHA1(71b2dc43fd11f7a6dffaba501e4e344b843583d8) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "ex_m0400.u1",  0x400000, 0x200000, CRC(42d54fd5) SHA1(ad915b514aa6cae6f72dea78e6208f40b08ceac0) )
+	ROM_LOAD( "pgm_m0400.u1",  0x400000, 0x200000, CRC(42d54fd5) SHA1(ad915b514aa6cae6f72dea78e6208f40b08ceac0) )
 ROM_END
 
 ROM_START( dwex101cn )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "ex_v101cn.u12",     0x100001, 0x080000, CRC(4f951f42) SHA1(830a943ce34c63ce418f60d913fae333377a9704) ) // V101CN (China) / V100 (other regions) 12/12/01 09:45:00
-	ROM_LOAD16_BYTE( "ex_v101cn.u13",     0x100000, 0x080000, CRC(66172511) SHA1(eb1a6fc9c22f04fcca0395a4b5c2972438c60a78) )
+	ROM_LOAD16_BYTE( "dwex_v101cn.u12",     0x100001, 0x080000, CRC(4f951f42) SHA1(830a943ce34c63ce418f60d913fae333377a9704) ) // V101CN (China) / V100 (other regions) 12/12/01 09:45:00
+	ROM_LOAD16_BYTE( "dwex_v101cn.u13",     0x100000, 0x080000, CRC(66172511) SHA1(eb1a6fc9c22f04fcca0395a4b5c2972438c60a78) )
 
 	ROM_REGION( 0x010000, "igs022", 0 ) /* Protection Data */
-	ROM_LOAD( "ex_data.u15", 0x000000, 0x010000, CRC(03dc4fdf) SHA1(b329b04325d4f725231b1bb7862eedef2319b652) )
+	ROM_LOAD( "dwiii_data_u15.u15", 0x000000, 0x010000, CRC(03dc4fdf) SHA1(b329b04325d4f725231b1bb7862eedef2319b652) )
 
 	ROM_REGION( 0x500000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "ex_t0400.u18", 0x180000, 0x200000, CRC(9ecc950d) SHA1(fd97f43818a3eb18254636166871fa09bd0d6c07) )
+	ROM_LOAD( "pgm_t0400.u18", 0x180000, 0x200000, CRC(9ecc950d) SHA1(fd97f43818a3eb18254636166871fa09bd0d6c07) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "ex_a0400.u9",     0x0000000, 0x400000, CRC(dd7bfd40) SHA1(fb7ec5bf89a413c5208716083762a725ff63f5db) )
-	ROM_LOAD( "ex_a0401.u10",    0x0400000, 0x200000, CRC(d36c06a4) SHA1(f192e8bfdfbe3d82a49d8f0d3cb0603e39719773) )
+	ROM_LOAD( "pgm_a0400.u9",     0x0000000, 0x400000, CRC(dd7bfd40) SHA1(fb7ec5bf89a413c5208716083762a725ff63f5db) )
+	ROM_LOAD( "pgm_a0401.u10",    0x0400000, 0x200000, CRC(d36c06a4) SHA1(f192e8bfdfbe3d82a49d8f0d3cb0603e39719773) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "ex_b0400.u13",    0x0000000, 0x400000,  CRC(4bb87cc0) SHA1(71b2dc43fd11f7a6dffaba501e4e344b843583d8) )
+	ROM_LOAD( "pgm_b0400.u13",    0x0000000, 0x400000,  CRC(4bb87cc0) SHA1(71b2dc43fd11f7a6dffaba501e4e344b843583d8) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "ex_m0400.u1",  0x400000, 0x200000, CRC(42d54fd5) SHA1(ad915b514aa6cae6f72dea78e6208f40b08ceac0) )
+	ROM_LOAD( "pgm_m0400.u1",  0x400000, 0x200000, CRC(42d54fd5) SHA1(ad915b514aa6cae6f72dea78e6208f40b08ceac0) )
 ROM_END
 
 
@@ -1252,21 +1328,21 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u11",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0603.rom",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
+	ROM_LOAD( "pgm_a0600.u2",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u4",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u6",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0603.u9",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0601.rom",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
+	ROM_LOAD( "pgm_b0600.u5",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "pgm_b0601.u7",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u3",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 ROM_START( kov115 )
@@ -1279,26 +1355,57 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u11",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0603.rom",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
+	ROM_LOAD( "pgm_a0600.u2",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u4",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u6",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0603.u9",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0601.rom",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
+	ROM_LOAD( "pgm_b0600.u5",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "pgm_b0601.u7",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u3",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+ROM_END
+
+ROM_START( kov114 )
+	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
+	PGM_68K_BIOS
+	ROM_LOAD16_BYTE( "sav114_u4.u4",        0x100001, 0x080000, CRC(4db3d4d3) SHA1(924734ec3b3d6de21872890b9575f72f81c7b636) )
+	ROM_LOAD16_BYTE( "sav114_u7.u7",        0x100000, 0x080000, CRC(b8d12b0c) SHA1(f4c02e494a479c3021b56bb87341d507104f93d5) )
+	ROM_LOAD16_BYTE( "sav114_u5.u5",        0x200001, 0x080000, CRC(9e586dab) SHA1(3de948decf2b7bcbbbc37d2e6fa7a2a71f0b8d5e) )
+	ROM_LOAD16_BYTE( "sav114_u8.u8",        0x200000, 0x080000, CRC(ab129997) SHA1(b0e56a09df0def3e8b584ca6f53cd3c88634653e) )
+	ROM_LOAD16_WORD_SWAP( "sav114_u10.u10", 0x300000, 0x080000, CRC(8f84ecfd) SHA1(2e7f322da6c4b1d6daf7a308229f4cf2e69fda8f) )
+
+	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
+	ROM_LOAD( "kov_igs027.bin", 0x000000, 0x04000, NO_DUMP ) // IGS 027 55857E 100 9901 HONG KONG
+
+	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	PGM_VIDEO_BIOS
+	ROM_LOAD( "pgm_t0600.u11",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+
+	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "pgm_a0600.u2",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u4",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u6",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0603.u9",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
+
+	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "pgm_b0600.u5",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "pgm_b0601.u7",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
+
+	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
+	PGM_AUDIO_BIOS
+	ROM_LOAD( "pgm_m0600.u3",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 /*
 
-Sangoku Senki / Knights of Valour (JPN 100 Ver.)
+Sangoku Senki / Knights of Valour (JPN 111 Ver.)
 (c)1999 ALTA / IGS
 
 PGM system
@@ -1327,93 +1434,62 @@
 
 */
 
-ROM_START( kov100 )
+ROM_START( kov111 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "sav111.u4",      0x100001, 0x080000, CRC(ae2f1b4e) SHA1(2ac9d84f5dee52f374941cfd68e2b98ecad436a8) )
-	ROM_LOAD16_BYTE( "sav111.u7",      0x100000, 0x080000, CRC(95eedf0e) SHA1(582a54e9a1eda7ff73e20f0e69d2d50141772378) )
-	ROM_LOAD16_BYTE( "sav111.u5",      0x200001, 0x080000, CRC(5fdd4aa8) SHA1(43c96e21ad4f11148e1e94a59c53780b2edd43ba) )
-	ROM_LOAD16_BYTE( "sav111.u8",      0x200000, 0x080000, CRC(003cbf49) SHA1(fb5bea47ecae025b1b425af52cd05e061f45e377) )
-	ROM_LOAD16_WORD_SWAP( "sav111.u10",0x300000, 0x080000, CRC(d5536107) SHA1(f963e015d99c1621323eecf63e773c0b9f4b6a43) )
+	ROM_LOAD16_BYTE( "sav111_u4.u4",        0x100001, 0x080000, CRC(ae2f1b4e) SHA1(2ac9d84f5dee52f374941cfd68e2b98ecad436a8) )
+	ROM_LOAD16_BYTE( "sav111_u7.u7",        0x100000, 0x080000, CRC(95eedf0e) SHA1(582a54e9a1eda7ff73e20f0e69d2d50141772378) )
+	ROM_LOAD16_BYTE( "sav111_u5.u5",        0x200001, 0x080000, CRC(5fdd4aa8) SHA1(43c96e21ad4f11148e1e94a59c53780b2edd43ba) )
+	ROM_LOAD16_BYTE( "sav111_u8.u8",        0x200000, 0x080000, CRC(003cbf49) SHA1(fb5bea47ecae025b1b425af52cd05e061f45e377) )
+	ROM_LOAD16_WORD_SWAP( "sav111_u10.u10", 0x300000, 0x080000, CRC(d5536107) SHA1(f963e015d99c1621323eecf63e773c0b9f4b6a43) )
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov_igs027a.bin", 0x000000, 0x04000, NO_DUMP )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
-
-	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0603.rom",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
-
-	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0601.rom",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
-
-	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
-	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
-ROM_END
-
-ROM_START( kov100hk )
-	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
-	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "sav114.u4",      0x100001, 0x080000, CRC(4db3d4d3) SHA1(924734ec3b3d6de21872890b9575f72f81c7b636) )
-	ROM_LOAD16_BYTE( "sav114.u7",      0x100000, 0x080000, CRC(b8d12b0c) SHA1(f4c02e494a479c3021b56bb87341d507104f93d5) )
-	ROM_LOAD16_BYTE( "sav114.u5",      0x200001, 0x080000, CRC(9e586dab) SHA1(3de948decf2b7bcbbbc37d2e6fa7a2a71f0b8d5e) )
-	ROM_LOAD16_BYTE( "sav114.u8",      0x200000, 0x080000, CRC(ab129997) SHA1(b0e56a09df0def3e8b584ca6f53cd3c88634653e) )
-	ROM_LOAD16_WORD_SWAP( "sav114.u10",0x300000, 0x080000, CRC(8f84ecfd) SHA1(2e7f322da6c4b1d6daf7a308229f4cf2e69fda8f) )
-
-	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
-	ROM_LOAD( "kov_igs027.bin", 0x000000, 0x04000, NO_DUMP ) // IGS 027 55857E 100 9901 HONG KONG
-
-	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
-	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u11",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0603.rom",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
+	ROM_LOAD( "pgm_a0600.u2",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u4",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u6",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0603.u9",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0601.rom",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
+	ROM_LOAD( "pgm_b0600.u5",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "pgm_b0601.u7",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u3",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 ROM_START( kovplus )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "p0600.119",    0x100000, 0x400000, CRC(e4b0875d) SHA1(e8382e131b0e431406dc2a05cc1ef128302d987c) )
+	ROM_LOAD16_WORD_SWAP( "pgm_p0603_v119.u1",    0x100000, 0x400000, CRC(e4b0875d) SHA1(e8382e131b0e431406dc2a05cc1ef128302d987c) )
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov_igs027a.bin", 0x000000, 0x04000, NO_DUMP )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u11",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0603.rom",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
+	ROM_LOAD( "pgm_a0600.u2",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u4",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u6",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0603.u9",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0601.rom",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
+	ROM_LOAD( "pgm_b0600.u5",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "pgm_b0601.u7",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u3",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 
@@ -1451,32 +1527,32 @@
 ROM_START( kovplusa )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "v119.u3",     0x100001, 0x080000, CRC(6750388f) SHA1(869f4ad27f2992cc62baa9a78bf7984a43ec4cc5) )
-	ROM_LOAD16_BYTE( "v119.u5",     0x100000, 0x080000, CRC(d4101ffd) SHA1(a327fd56eec65b07df9305cd93ef2c46bf8e40f3) )
-	ROM_LOAD16_BYTE( "v119.u4",     0x200001, 0x080000, CRC(8200ece6) SHA1(97081d2e8aed2ac6fbe5951890aecea18af5ce2e) )
-	ROM_LOAD16_BYTE( "v119.u6",     0x200000, 0x080000, CRC(71e28f27) SHA1(db382807e9185f0dc17124f210165fa1b36ca6ac) )
-	ROM_LOAD16_WORD_SWAP( "v119.u2",0x300000, 0x080000, CRC(29588ef2) SHA1(17d1a308d44434cf65224a24360cf4b6e32d28f3) )
+	ROM_LOAD16_BYTE( "v119.u4",         0x100001, 0x080000, CRC(6750388f) SHA1(869f4ad27f2992cc62baa9a78bf7984a43ec4cc5) )
+	ROM_LOAD16_BYTE( "v119.u7",         0x100000, 0x080000, CRC(d4101ffd) SHA1(a327fd56eec65b07df9305cd93ef2c46bf8e40f3) )
+	ROM_LOAD16_BYTE( "v119.u5",         0x200001, 0x080000, CRC(8200ece6) SHA1(97081d2e8aed2ac6fbe5951890aecea18af5ce2e) )
+	ROM_LOAD16_BYTE( "v119.u8",         0x200000, 0x080000, CRC(71e28f27) SHA1(db382807e9185f0dc17124f210165fa1b36ca6ac) )
+	ROM_LOAD16_WORD_SWAP( "v119.u10",   0x300000, 0x080000, CRC(29588ef2) SHA1(17d1a308d44434cf65224a24360cf4b6e32d28f3) )
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov_igs027a.bin", 0x000000, 0x04000, NO_DUMP )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u11",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0603.rom",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
+	ROM_LOAD( "pgm_a0600.u2",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u4",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u6",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0603.u9",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0601.rom",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
+	ROM_LOAD( "pgm_b0600.u5",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "pgm_b0601.u7",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u3",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 ROM_START( kovsgqyz )
@@ -1489,21 +1565,21 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u11",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "qyza0603.rom", 0x1800000, 0x0800000, CRC(c8b92220) SHA1(4f9c43970d92ac8a8f1563021022797ae8e32012) )
+	ROM_LOAD( "pgm_a0600.u2",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u4",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u6",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "qyza0603.rom",    0x1800000, 0x0800000, CRC(c8b92220) SHA1(4f9c43970d92ac8a8f1563021022797ae8e32012) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "qyzb0601.rom", 0x0800000, 0x0800000, CRC(64f55882) SHA1(ab9ac1396587c3d78d06f6ec83cab61d6a9faacd) )
+	ROM_LOAD( "pgm_b0600.u5",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "qyzb0601.rom",    0x0800000, 0x0800000, CRC(64f55882) SHA1(ab9ac1396587c3d78d06f6ec83cab61d6a9faacd) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u3",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 ROM_START( kovsgqyza )
@@ -1516,21 +1592,21 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u11",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "qyza0603.rom", 0x1800000, 0x0800000, CRC(c8b92220) SHA1(4f9c43970d92ac8a8f1563021022797ae8e32012) )
+	ROM_LOAD( "pgm_a0600.u2",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u4",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u6",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "qyza0603.rom",    0x1800000, 0x0800000, CRC(c8b92220) SHA1(4f9c43970d92ac8a8f1563021022797ae8e32012) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "qyzb0601.rom", 0x0800000, 0x0800000, CRC(64f55882) SHA1(ab9ac1396587c3d78d06f6ec83cab61d6a9faacd) )
+	ROM_LOAD( "pgm_b0600.u5",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "qyzb0601.rom",    0x0800000, 0x0800000, CRC(64f55882) SHA1(ab9ac1396587c3d78d06f6ec83cab61d6a9faacd) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u3",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 ROM_START( kovsgqyzb )
@@ -1543,30 +1619,27 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u11",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "qyza0603.rom", 0x1800000, 0x0800000, CRC(c8b92220) SHA1(4f9c43970d92ac8a8f1563021022797ae8e32012) )
+	ROM_LOAD( "pgm_a0600.u2",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u4",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u6",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "qyza0603.rom",    0x1800000, 0x0800000, CRC(c8b92220) SHA1(4f9c43970d92ac8a8f1563021022797ae8e32012) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "qyzb0601.rom", 0x0800000, 0x0800000, CRC(64f55882) SHA1(ab9ac1396587c3d78d06f6ec83cab61d6a9faacd) )
+	ROM_LOAD( "pgm_b0600.u5",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "qyzb0601.rom",    0x0800000, 0x0800000, CRC(64f55882) SHA1(ab9ac1396587c3d78d06f6ec83cab61d6a9faacd) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u3",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
-
-
-
 ROM_START( kovsh )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "p0600.322",    0x100000, 0x400000, CRC(7c78e5f3) SHA1(9b1e4bd63fb1294ebeb539966842273c8dc7683b) )
+	ROM_LOAD16_WORD_SWAP( "pgm_p0605_v104.u1",    0x100000, 0x400000, CRC(7c78e5f3) SHA1(9b1e4bd63fb1294ebeb539966842273c8dc7683b) )
 	//ROM_LOAD16_WORD_SWAP( "kovsh-v0104-u1.bin",    0x100000, 0x400000, CRC(4e2ba39b) SHA1(f3b5aa6f45cfd5a7f1e2a2e893d1652a3f23d6b8) ) // identical but the last 1MB is filled with 0xff instead of 0x00
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
@@ -1574,54 +1647,54 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u11",      0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	/* all roms below need checking to see if they're the same on this board */
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0603.rom",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
-	ROM_LOAD( "a0604.rom",    0x1a00000, 0x0400000, CRC(26b59fd3) SHA1(53219376056f4766dc5236735599d982ceb56b84) )
+	ROM_LOAD( "pgm_a0600.u1",       0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u3",       0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u5",       0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0603.u7",       0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
+	ROM_LOAD( "pgm_a0604_v200.u9",  0x1a00000, 0x0400000, CRC(26b59fd3) SHA1(53219376056f4766dc5236735599d982ceb56b84) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0601.rom",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
-	ROM_LOAD( "b0602.rom",    0x0c00000, 0x0100000, CRC(9df77934) SHA1(99a3fe337c13702c9aa2373bcd1bb1befd0e2a13) )
+	ROM_LOAD( "pgm_b0600.u6",       0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "pgm_b0601.u8",       0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
+	ROM_LOAD( "pgm_b0602_v200.u10", 0x0c00000, 0x0100000, CRC(9df77934) SHA1(99a3fe337c13702c9aa2373bcd1bb1befd0e2a13) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u4",       0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 ROM_START( kovsh103 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "p0600.103",    0x100000, 0x400000, CRC(f0b3da82) SHA1(4067beb69c049b51bce6154f4cf880600ca4de11) )
+	ROM_LOAD16_WORD_SWAP( "pgm_p0604_v103.u1",    0x100000, 0x400000, CRC(f0b3da82) SHA1(4067beb69c049b51bce6154f4cf880600ca4de11) )
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kovsh_v100_china.asic", 0x000000, 0x04000,  CRC(0f09a5c1) SHA1(621b38c05f33277608d58b49822aebc930ae4870) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u11",      0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	/* all roms below need checking to see if they're the same on this board */
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0603.rom",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
-	ROM_LOAD( "a0604.rom",    0x1a00000, 0x0400000, CRC(26b59fd3) SHA1(53219376056f4766dc5236735599d982ceb56b84) )
+	ROM_LOAD( "pgm_a0600.u1",       0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u3",       0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u5",       0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0603.u7",       0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
+	ROM_LOAD( "pgm_a0604_v200.u9",  0x1a00000, 0x0400000, CRC(26b59fd3) SHA1(53219376056f4766dc5236735599d982ceb56b84) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0601.rom",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
-	ROM_LOAD( "b0602.rom",    0x0c00000, 0x0100000, CRC(9df77934) SHA1(99a3fe337c13702c9aa2373bcd1bb1befd0e2a13) ) // this dump had the same rom 4x bigger but with the data duplicated 4x, which is correct?
+	ROM_LOAD( "pgm_b0600.u6",       0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "pgm_b0601.u8",       0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
+	ROM_LOAD( "pgm_b0602_v200.u10", 0x0c00000, 0x0100000, CRC(9df77934) SHA1(99a3fe337c13702c9aa2373bcd1bb1befd0e2a13) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u4",       0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 ROM_START( kovsh102 )
@@ -1634,24 +1707,24 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u11",      0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	/* all roms below need checking to see if they're the same on this board */
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0603.rom",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
-	ROM_LOAD( "a0604.rom",    0x1a00000, 0x0400000, CRC(26b59fd3) SHA1(53219376056f4766dc5236735599d982ceb56b84) )
+	ROM_LOAD( "pgm_a0600.u1",       0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u3",       0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u5",       0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0603.u7",       0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
+	ROM_LOAD( "pgm_a0604_v200.u9",  0x1a00000, 0x0400000, CRC(26b59fd3) SHA1(53219376056f4766dc5236735599d982ceb56b84) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0601.rom",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
-	ROM_LOAD( "b0602.rom",    0x0c00000, 0x0100000, CRC(9df77934) SHA1(99a3fe337c13702c9aa2373bcd1bb1befd0e2a13) )
+	ROM_LOAD( "pgm_b0600.u6",       0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "pgm_b0601.u8",       0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
+	ROM_LOAD( "pgm_b0602_v200.u10", 0x0c00000, 0x0100000, CRC(9df77934) SHA1(99a3fe337c13702c9aa2373bcd1bb1befd0e2a13) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u4",       0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 ROM_START( kovsh101 )
@@ -1664,24 +1737,24 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u11",      0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	/* all roms below need checking to see if they're the same on this board */
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0603.rom",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
-	ROM_LOAD( "a0604.rom",    0x1a00000, 0x0400000, CRC(26b59fd3) SHA1(53219376056f4766dc5236735599d982ceb56b84) )
+	ROM_LOAD( "pgm_a0600.u1",       0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u3",       0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u5",       0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0603.u7",       0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
+	ROM_LOAD( "pgm_a0604_v200.u9",  0x1a00000, 0x0400000, CRC(26b59fd3) SHA1(53219376056f4766dc5236735599d982ceb56b84) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0601.rom",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
-	ROM_LOAD( "b0602.rom",    0x0c00000, 0x0100000, CRC(9df77934) SHA1(99a3fe337c13702c9aa2373bcd1bb1befd0e2a13) )
+	ROM_LOAD( "pgm_b0600.u6",       0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "pgm_b0601.u8",       0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
+	ROM_LOAD( "pgm_b0602_v200.u10", 0x0c00000, 0x0100000, CRC(9df77934) SHA1(99a3fe337c13702c9aa2373bcd1bb1befd0e2a13) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u4",       0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 ROM_START( kovsh100 )
@@ -1694,24 +1767,24 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u11",      0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	/* all roms below need checking to see if they're the same on this board */
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0603.rom",    0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
-	ROM_LOAD( "a0604.rom",    0x1a00000, 0x0400000, CRC(26b59fd3) SHA1(53219376056f4766dc5236735599d982ceb56b84) )
+	ROM_LOAD( "pgm_a0600.u1",       0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u3",       0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u5",       0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0603.u7",       0x1800000, 0x0400000, CRC(ec31abda) SHA1(ee526655369bae63b0ef0730e9768b765c9950fc) )
+	ROM_LOAD( "pgm_a0604_v200.u9",  0x1a00000, 0x0400000, CRC(26b59fd3) SHA1(53219376056f4766dc5236735599d982ceb56b84) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0601.rom",    0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
-	ROM_LOAD( "b0602.rom",    0x0c00000, 0x0100000, CRC(9df77934) SHA1(99a3fe337c13702c9aa2373bcd1bb1befd0e2a13) )
+	ROM_LOAD( "pgm_b0600.u6",       0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "pgm_b0601.u8",       0x0800000, 0x0400000, CRC(a0bb1c2f) SHA1(0542348c6e27779e0a98de16f04f9c18158f2b28) )
+	ROM_LOAD( "pgm_b0602_v200.u10", 0x0c00000, 0x0100000, CRC(9df77934) SHA1(99a3fe337c13702c9aa2373bcd1bb1befd0e2a13) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u4",       0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 ROM_START( kovqhsgs )
@@ -1748,7 +1821,7 @@
 
 p0701_v105.u2
 
-IGS
+IGS PCB NO-0220-1
 PGM P0701 V105
 1B2687LC
 C994746
@@ -1758,30 +1831,27 @@
 ROM_START( photoy2k )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "p0701_v105.u2",     0x100000, 0x200000, CRC(fab142e0) SHA1(8dc7e53b740ed68bac98c0ef7ca4943c517e6f5d) ) // 10/12/99 21:07:53
+	ROM_LOAD16_WORD_SWAP( "pgm_p0701_v105.u2",     0x100000, 0x200000, CRC(fab142e0) SHA1(8dc7e53b740ed68bac98c0ef7ca4943c517e6f5d) ) // 10/12/99 21:07:53
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "igs027a_photoy2k_v100_china.asic", 0x000000, 0x04000, CRC(1a0b68f6) SHA1(290441ed652f54b26ace8f59a26220881fb62084) ) // 3 bytes differ from the read in the other sets.  I think this one is GOOD and the other is bad.  This always gives the same read, so unless the actual chips is bad... TBC
 
 	ROM_REGION( 0x280000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0700.rom",    0x180000, 0x080000, CRC(93943b4d) SHA1(3b439903853727d45d62c781af6073024eb3c5a3) )
+	ROM_LOAD( "pgm_t0700.u11",   0x180000, 0x080000, CRC(93943b4d) SHA1(3b439903853727d45d62c781af6073024eb3c5a3) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0700.l",    0x0000000, 0x0400000, CRC(26a9ae9c) SHA1(c977c89db6fdf47ee260ff687b80375caeab975c) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0700.h",    0x0400000, 0x0400000, CRC(79bc1fc1) SHA1(a09472a9b75704c1d31ab828f92c2a5007b2b4ed) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0701.l",    0x0800000, 0x0400000, CRC(23607f81) SHA1(8b6dbcdce9b131370693847ed9771aa04b62711c) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0701.h",    0x0c00000, 0x0400000, CRC(5f2efd37) SHA1(9a5bd9751691bc085b0751b9fa8ede9eb97b1248) )
-	ROM_LOAD( "a0702.rom",  0x1000000, 0x0080000, CRC(42239e1b) SHA1(2b6d20958abf8a67ce525d5c8964b6d225ccaeda) )
+	ROM_LOAD( "pgm_a0700.u2",    0x0000000, 0x0800000, CRC(503c855b) SHA1(aa910cc33a23ac8f1c91f88da388ed92e49fa1b8) )
+	ROM_LOAD( "pgm_a0701.u4",    0x0800000, 0x0800000, CRC(845e11a8) SHA1(9e35d0e6620acd023eba83f86d970e9895204767) )
+	ROM_LOAD( "pgm_a0702.u3",    0x1000000, 0x0080000, CRC(42239e1b) SHA1(2b6d20958abf8a67ce525d5c8964b6d225ccaeda) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0700.l",    0x0000000, 0x0400000, CRC(af096904) SHA1(8e86b36cc44720ece68022e409279bf9144341ba) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "b0700.h",    0x0400000, 0x0400000, CRC(6d53de26) SHA1(f3f93fd2f87adb815834ba0242b94073fbb5e333) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "cgv101.rom", 0x0800000, 0x0020000, CRC(da02ec3e) SHA1(7ee21d748c9b932f53e790a9040167f904fecefc) )
+	ROM_LOAD( "pgm_b0700.u7",            0x0000000, 0x0800000, CRC(8cd027f6) SHA1(e377c64facbf657f58b8567d8b483ca067967fc0) )
+	ROM_LOAD( "photo_y2k_cg_v101_u6.u6", 0x0800000, 0x0020000, CRC(da02ec3e) SHA1(7ee21d748c9b932f53e790a9040167f904fecefc) )
 
 	ROM_REGION( 0x480000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0700.rom",    0x400000, 0x080000, CRC(acc7afce) SHA1(ac2d344ebac336f0f363bb045dd8ea4e83d1fb50) )
+	ROM_LOAD( "pgm_m0700.u5",    0x400000, 0x080000, CRC(acc7afce) SHA1(ac2d344ebac336f0f363bb045dd8ea4e83d1fb50) )
 ROM_END
 
 
@@ -1795,23 +1865,20 @@
 
 	ROM_REGION( 0x280000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0700.rom",    0x180000, 0x080000, CRC(93943b4d) SHA1(3b439903853727d45d62c781af6073024eb3c5a3) )
+	ROM_LOAD( "pgm_t0700.u11",   0x180000, 0x080000, CRC(93943b4d) SHA1(3b439903853727d45d62c781af6073024eb3c5a3) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0700.l",    0x0000000, 0x0400000, CRC(26a9ae9c) SHA1(c977c89db6fdf47ee260ff687b80375caeab975c) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0700.h",    0x0400000, 0x0400000, CRC(79bc1fc1) SHA1(a09472a9b75704c1d31ab828f92c2a5007b2b4ed) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0701.l",    0x0800000, 0x0400000, CRC(23607f81) SHA1(8b6dbcdce9b131370693847ed9771aa04b62711c) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0701.h",    0x0c00000, 0x0400000, CRC(5f2efd37) SHA1(9a5bd9751691bc085b0751b9fa8ede9eb97b1248) )
-	ROM_LOAD( "a0702.rom",  0x1000000, 0x0080000, CRC(42239e1b) SHA1(2b6d20958abf8a67ce525d5c8964b6d225ccaeda) )
+	ROM_LOAD( "pgm_a0700.u2",    0x0000000, 0x0800000, CRC(503c855b) SHA1(aa910cc33a23ac8f1c91f88da388ed92e49fa1b8) )
+	ROM_LOAD( "pgm_a0701.u4",    0x0800000, 0x0800000, CRC(845e11a8) SHA1(9e35d0e6620acd023eba83f86d970e9895204767) )
+	ROM_LOAD( "pgm_a0702.u3",    0x1000000, 0x0080000, CRC(42239e1b) SHA1(2b6d20958abf8a67ce525d5c8964b6d225ccaeda) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0700.l",    0x0000000, 0x0400000, CRC(af096904) SHA1(8e86b36cc44720ece68022e409279bf9144341ba) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "b0700.h",    0x0400000, 0x0400000, CRC(6d53de26) SHA1(f3f93fd2f87adb815834ba0242b94073fbb5e333) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "cgv101.rom", 0x0800000, 0x0020000, CRC(da02ec3e) SHA1(7ee21d748c9b932f53e790a9040167f904fecefc) )
+	ROM_LOAD( "pgm_b0700.u7",            0x0000000, 0x0800000, CRC(8cd027f6) SHA1(e377c64facbf657f58b8567d8b483ca067967fc0) )
+	ROM_LOAD( "photo_y2k_cg_v101_u6.u6", 0x0800000, 0x0020000, CRC(da02ec3e) SHA1(7ee21d748c9b932f53e790a9040167f904fecefc) )
 
 	ROM_REGION( 0x480000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0700.rom",    0x400000, 0x080000, CRC(acc7afce) SHA1(ac2d344ebac336f0f363bb045dd8ea4e83d1fb50) )
+	ROM_LOAD( "pgm_m0700.u5",    0x400000, 0x080000, CRC(acc7afce) SHA1(ac2d344ebac336f0f363bb045dd8ea4e83d1fb50) )
 ROM_END
 
 
@@ -1828,23 +1895,20 @@
 
 	ROM_REGION( 0x280000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0700.rom",    0x180000, 0x080000, CRC(93943b4d) SHA1(3b439903853727d45d62c781af6073024eb3c5a3) )
+	ROM_LOAD( "pgm_t0700.u11",   0x180000, 0x080000, CRC(93943b4d) SHA1(3b439903853727d45d62c781af6073024eb3c5a3) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0700.l",    0x0000000, 0x0400000, CRC(26a9ae9c) SHA1(c977c89db6fdf47ee260ff687b80375caeab975c) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0700.h",    0x0400000, 0x0400000, CRC(79bc1fc1) SHA1(a09472a9b75704c1d31ab828f92c2a5007b2b4ed) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0701.l",    0x0800000, 0x0400000, CRC(23607f81) SHA1(8b6dbcdce9b131370693847ed9771aa04b62711c) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0701.h",    0x0c00000, 0x0400000, CRC(5f2efd37) SHA1(9a5bd9751691bc085b0751b9fa8ede9eb97b1248) )
-	ROM_LOAD( "a0702.rom",  0x1000000, 0x0080000, CRC(42239e1b) SHA1(2b6d20958abf8a67ce525d5c8964b6d225ccaeda) )
+	ROM_LOAD( "pgm_a0700.u2",    0x0000000, 0x0800000, CRC(503c855b) SHA1(aa910cc33a23ac8f1c91f88da388ed92e49fa1b8) )
+	ROM_LOAD( "pgm_a0701.u4",    0x0800000, 0x0800000, CRC(845e11a8) SHA1(9e35d0e6620acd023eba83f86d970e9895204767) )
+	ROM_LOAD( "pgm_a0702.u3",    0x1000000, 0x0080000, CRC(42239e1b) SHA1(2b6d20958abf8a67ce525d5c8964b6d225ccaeda) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0700.l",    0x0000000, 0x0400000, CRC(af096904) SHA1(8e86b36cc44720ece68022e409279bf9144341ba) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "b0700.h",    0x0400000, 0x0400000, CRC(6d53de26) SHA1(f3f93fd2f87adb815834ba0242b94073fbb5e333) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "cgv101.rom", 0x0800000, 0x0020000, CRC(da02ec3e) SHA1(7ee21d748c9b932f53e790a9040167f904fecefc) )
+	ROM_LOAD( "pgm_b0700.u7",            0x0000000, 0x0800000, CRC(8cd027f6) SHA1(e377c64facbf657f58b8567d8b483ca067967fc0) )
+	ROM_LOAD( "photo_y2k_cg_v101_u6.u6", 0x0800000, 0x0020000, CRC(da02ec3e) SHA1(7ee21d748c9b932f53e790a9040167f904fecefc) )
 
 	ROM_REGION( 0x480000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0700.rom",    0x400000, 0x080000, CRC(acc7afce) SHA1(ac2d344ebac336f0f363bb045dd8ea4e83d1fb50) )
+	ROM_LOAD( "photo_y2k_sp_v102_u5.u5", 0x400000, 0x080000, CRC(acc7afce) SHA1(ac2d344ebac336f0f363bb045dd8ea4e83d1fb50) )
 ROM_END
 
 
@@ -1878,36 +1942,33 @@
 
 */
 
-ROM_START( photoy2k102 )
+ROM_START( photoy2k102j )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "v102.u4",     0x100001, 0x080000, CRC(a65eda9f) SHA1(6307cacf4a262e781753eff14700a0455837780c) ) // 05/03/99 16:06:33
-	ROM_LOAD16_BYTE( "v102.u6",     0x100000, 0x080000, CRC(b9ca5504) SHA1(058cf01316f233236ca9861349f515935283b75e) )
-	ROM_LOAD16_BYTE( "v102.u5",     0x200001, 0x080000, CRC(9201621b) SHA1(1ca3ebe7eec40614bfa8b911657fa2b51f2c51a4) )
-	ROM_LOAD16_BYTE( "v102.u8",     0x200000, 0x080000, CRC(3be22b8f) SHA1(03634fbd6a8a8369c6cb1fd6694a3784dac5bf59) )
+	ROM_LOAD16_BYTE( "photo_y2k_v102_u4.u4",     0x100001, 0x080000, CRC(a65eda9f) SHA1(6307cacf4a262e781753eff14700a0455837780c) ) // 05/03/99 16:06:33
+	ROM_LOAD16_BYTE( "photo_y2k_v102_u6.u6",     0x100000, 0x080000, CRC(b9ca5504) SHA1(058cf01316f233236ca9861349f515935283b75e) )
+	ROM_LOAD16_BYTE( "photo_y2k_v102_u5.u5",     0x200001, 0x080000, CRC(9201621b) SHA1(1ca3ebe7eec40614bfa8b911657fa2b51f2c51a4) )
+	ROM_LOAD16_BYTE( "photo_y2k_v102_u8.u8",     0x200000, 0x080000, CRC(3be22b8f) SHA1(03634fbd6a8a8369c6cb1fd6694a3784dac5bf59) )
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "igs027a_photoy2k_v100_china_alt.asic", 0x000000, 0x04000,  CRC(6dd7f257) SHA1(1984f98a282d8b3264674f231c3b7def1757cf72) )
 
 	ROM_REGION( 0x280000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0700.rom",    0x180000, 0x080000, CRC(93943b4d) SHA1(3b439903853727d45d62c781af6073024eb3c5a3) )
+	ROM_LOAD( "pgm_t0700.u11",   0x180000, 0x080000, CRC(93943b4d) SHA1(3b439903853727d45d62c781af6073024eb3c5a3) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0700.l",    0x0000000, 0x0400000, CRC(26a9ae9c) SHA1(c977c89db6fdf47ee260ff687b80375caeab975c) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0700.h",    0x0400000, 0x0400000, CRC(79bc1fc1) SHA1(a09472a9b75704c1d31ab828f92c2a5007b2b4ed) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0701.l",    0x0800000, 0x0400000, CRC(23607f81) SHA1(8b6dbcdce9b131370693847ed9771aa04b62711c) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0701.h",    0x0c00000, 0x0400000, CRC(5f2efd37) SHA1(9a5bd9751691bc085b0751b9fa8ede9eb97b1248) )
-	ROM_LOAD( "a0702.rom",  0x1000000, 0x0080000, CRC(42239e1b) SHA1(2b6d20958abf8a67ce525d5c8964b6d225ccaeda) )
+	ROM_LOAD( "pgm_a0700.u2",    0x0000000, 0x0800000, CRC(503c855b) SHA1(aa910cc33a23ac8f1c91f88da388ed92e49fa1b8) )
+	ROM_LOAD( "pgm_a0701.u4",    0x0800000, 0x0800000, CRC(845e11a8) SHA1(9e35d0e6620acd023eba83f86d970e9895204767) )
+	ROM_LOAD( "pgm_a0702.u3",    0x1000000, 0x0080000, CRC(42239e1b) SHA1(2b6d20958abf8a67ce525d5c8964b6d225ccaeda) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0700.l",    0x0000000, 0x0400000, CRC(af096904) SHA1(8e86b36cc44720ece68022e409279bf9144341ba) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "b0700.h",    0x0400000, 0x0400000, CRC(6d53de26) SHA1(f3f93fd2f87adb815834ba0242b94073fbb5e333) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "cgv101.rom", 0x0800000, 0x0020000, CRC(da02ec3e) SHA1(7ee21d748c9b932f53e790a9040167f904fecefc) )
+	ROM_LOAD( "pgm_b0700.u7",            0x0000000, 0x0800000, CRC(8cd027f6) SHA1(e377c64facbf657f58b8567d8b483ca067967fc0) )
+	ROM_LOAD( "photo_y2k_cg_v101_u6.u6", 0x0800000, 0x0020000, CRC(da02ec3e) SHA1(7ee21d748c9b932f53e790a9040167f904fecefc) )
 
 	ROM_REGION( 0x480000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0700.rom",    0x400000, 0x080000, CRC(acc7afce) SHA1(ac2d344ebac336f0f363bb045dd8ea4e83d1fb50) )
+	ROM_LOAD( "photo_y2k_sp_v102_u5.u5", 0x400000, 0x080000, CRC(acc7afce) SHA1(ac2d344ebac336f0f363bb045dd8ea4e83d1fb50) )
 ROM_END
 
 
@@ -1943,18 +2004,18 @@
 	/* no extra tilemap rom */
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "y2k2_a1100.u6",    0x0000000, 0x0800000, CRC(e32ce499) SHA1(f84c7daa55c25a05da467b5654ebf432b7ce1754) )
-	ROM_LOAD( "y2k2_a1101.u7",    0x0800000, 0x0800000, CRC(4e7568bc) SHA1(bf9cc453191bd5ec9fbcce62891809f253a44267) )
-	ROM_LOAD( "y2k2_a1102.u8",    0x1000000, 0x0800000, CRC(6da7c143) SHA1(9408ba7722bfc8013f851aadea5e2819f5263129) )
-	ROM_LOAD( "y2k2_a1103.u9",    0x1800000, 0x0800000, CRC(0ebebfdc) SHA1(4faad7f97c7e734f179ec934a37e75d8d6adccf4) )
+	ROM_LOAD( "pgm_a1100.u6",    0x0000000, 0x0800000, CRC(e32ce499) SHA1(f84c7daa55c25a05da467b5654ebf432b7ce1754) )
+	ROM_LOAD( "pgm_a1101.u7",    0x0800000, 0x0800000, CRC(4e7568bc) SHA1(bf9cc453191bd5ec9fbcce62891809f253a44267) )
+	ROM_LOAD( "pgm_a1102.u8",    0x1000000, 0x0800000, CRC(6da7c143) SHA1(9408ba7722bfc8013f851aadea5e2819f5263129) )
+	ROM_LOAD( "pgm_a1103.u9",    0x1800000, 0x0800000, CRC(0ebebfdc) SHA1(4faad7f97c7e734f179ec934a37e75d8d6adccf4) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "y2k2_b1100.u4",    0x0000000, 0x0800000,  CRC(fa53d6f6) SHA1(c2da55f4b7e721fa1c63bd7f9528f261643164e8) )
-	ROM_LOAD( "y2k2_b1101.u5",    0x0800000, 0x0800000, CRC(001e4c81) SHA1(21119055f8fd7f831529e73ff9c97bca3987a1dc))
+	ROM_LOAD( "pgm_b1100.u4",    0x0000000, 0x0800000,  CRC(fa53d6f6) SHA1(c2da55f4b7e721fa1c63bd7f9528f261643164e8) )
+	ROM_LOAD( "pgm_b1101.u5",    0x0800000, 0x0800000, CRC(001e4c81) SHA1(21119055f8fd7f831529e73ff9c97bca3987a1dc))
 
 	ROM_REGION( 0x880000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "y2k2_m1100.u3",    0x400000, 0x200000, CRC(fb1515f8) SHA1(90e5e5bfdac9a460445bf224952e4a536888dc1b) )
+	ROM_LOAD( "pgm_m1100.u3",    0x400000, 0x200000, CRC(fb1515f8) SHA1(90e5e5bfdac9a460445bf224952e4a536888dc1b) )
 ROM_END
 
 ROM_START( py2k2100 )
@@ -1970,24 +2031,58 @@
 	/* no extra tilemap rom */
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "y2k2_a1100.u6",    0x0000000, 0x0800000, CRC(e32ce499) SHA1(f84c7daa55c25a05da467b5654ebf432b7ce1754) )
-	ROM_LOAD( "y2k2_a1101.u7",    0x0800000, 0x0800000, CRC(4e7568bc) SHA1(bf9cc453191bd5ec9fbcce62891809f253a44267) )
-	ROM_LOAD( "y2k2_a1102.u8",    0x1000000, 0x0800000, CRC(6da7c143) SHA1(9408ba7722bfc8013f851aadea5e2819f5263129) )
-	ROM_LOAD( "y2k2_a1103.u9",    0x1800000, 0x0800000, CRC(0ebebfdc) SHA1(4faad7f97c7e734f179ec934a37e75d8d6adccf4) )
+	ROM_LOAD( "pgm_a1100.u6",    0x0000000, 0x0800000, CRC(e32ce499) SHA1(f84c7daa55c25a05da467b5654ebf432b7ce1754) )
+	ROM_LOAD( "pgm_a1101.u7",    0x0800000, 0x0800000, CRC(4e7568bc) SHA1(bf9cc453191bd5ec9fbcce62891809f253a44267) )
+	ROM_LOAD( "pgm_a1102.u8",    0x1000000, 0x0800000, CRC(6da7c143) SHA1(9408ba7722bfc8013f851aadea5e2819f5263129) )
+	ROM_LOAD( "pgm_a1103.u9",    0x1800000, 0x0800000, CRC(0ebebfdc) SHA1(4faad7f97c7e734f179ec934a37e75d8d6adccf4) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "y2k2_b1100.u4",    0x0000000, 0x0800000,  CRC(fa53d6f6) SHA1(c2da55f4b7e721fa1c63bd7f9528f261643164e8) )
-	ROM_LOAD( "y2k2_b1101.u5",    0x0800000, 0x0800000, CRC(001e4c81) SHA1(21119055f8fd7f831529e73ff9c97bca3987a1dc))
+	ROM_LOAD( "pgm_b1100.u4",    0x0000000, 0x0800000,  CRC(fa53d6f6) SHA1(c2da55f4b7e721fa1c63bd7f9528f261643164e8) )
+	ROM_LOAD( "pgm_b1101.u5",    0x0800000, 0x0800000, CRC(001e4c81) SHA1(21119055f8fd7f831529e73ff9c97bca3987a1dc))
 
 	ROM_REGION( 0x880000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "y2k2_m1100.u3",    0x400000, 0x200000, CRC(fb1515f8) SHA1(90e5e5bfdac9a460445bf224952e4a536888dc1b) )
+	ROM_LOAD( "pgm_m1100.u3",    0x400000, 0x200000, CRC(fb1515f8) SHA1(90e5e5bfdac9a460445bf224952e4a536888dc1b) )
 ROM_END
 
 
 ROM_START( pgm3in1 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
+	ROM_LOAD16_WORD_SWAP( "v-102cn.u3",     0x100000, 0x200000, CRC(72e06b2b) SHA1(0d72f90b1a2df5f0e8708b59d2a7c13dba998acd)) // M68K V102 08/23/04 13:03:26 (encrypted)
+
+	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
+	ROM_LOAD( "igs027a_pgm3in1.asic", 0x000000, 0x04000, NO_DUMP )
+
+	/* No external ARM rom */
+
+	ROM_REGION( 0x500000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	PGM_VIDEO_BIOS
+	ROM_LOAD( "u5.u5",    0x180000, 0x200000, CRC(da375a50) SHA1(62cd2fd3dfc1897528eaa38d243d7a9526eac71b) )
+
+	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "pgm_a1100.u4",    0x0000000, 0x0800000, CRC(e32ce499) SHA1(f84c7daa55c25a05da467b5654ebf432b7ce1754) ) // == y2k2_a1100.u6
+	ROM_LOAD( "pgm_a1101.u5",    0x0800000, 0x0800000, CRC(4e7568bc) SHA1(bf9cc453191bd5ec9fbcce62891809f253a44267) ) // == y2k2_a1101.u7
+	ROM_LOAD( "pgm_a1102.u6",    0x1000000, 0x0800000, CRC(6da7c143) SHA1(9408ba7722bfc8013f851aadea5e2819f5263129) ) // == y2k2_a1102.u8
+	ROM_LOAD( "pgm_a1103.u7",    0x1800000, 0x0800000, CRC(0ebebfdc) SHA1(4faad7f97c7e734f179ec934a37e75d8d6adccf4) ) // == y2k2_a1103.u9
+	ROM_LOAD( "ext_bit_cg.u20",  0x2000000, 0x0400000, CRC(fe314754) SHA1(ae3e8bbdce852a3fa39806a5221c053dee5abfd4) )
+
+	ROM_REGION16_LE( 0x1000000, "sprmask", ROMREGION_ERASE00 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "pgm_b1100.u8",    0x0000000, 0x0800000, CRC(fa53d6f6) SHA1(c2da55f4b7e721fa1c63bd7f9528f261643164e8) ) // == y2k2_b1100.u4
+	ROM_LOAD( "pgm_b1101.u9",    0x0800000, 0x0800000, CRC(001e4c81) SHA1(21119055f8fd7f831529e73ff9c97bca3987a1dc) ) // == y2k2_b1101.u5
+	ROM_LOAD( "ext_bit_map.u21", 0x0f00000, 0x0100000, CRC(fe31dca6) SHA1(825bab7342c944794514fc7fe3e41779de3b5cd4) ) // yes this loads over the empty part of u9
+	ROM_IGNORE(0x0100000) // the 2nd half is empty
+
+	ROM_REGION( 0xe80000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
+	PGM_AUDIO_BIOS
+	ROM_LOAD( "pgm_m1100.u17",    0x400000, 0x200000, CRC(fb1515f8) SHA1(90e5e5bfdac9a460445bf224952e4a536888dc1b) ) // == y2k2_m1100.u3
+	ROM_LOAD( "u16.u16",          0x600000, 0x800000, CRC(714c33e5) SHA1(5478d5247349cdfb5f835171615d6ca2e5689140) ) // check loading
+ROM_END
+
+
+ROM_START( pgm3in1c100 )
+	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
+	PGM_68K_BIOS
 	ROM_LOAD16_WORD_SWAP( "v-100cn.u3",     0x100000, 0x200000, CRC(a39f59b4) SHA1(4eb53fb9f173cb470e16dc8f193c8909cf045e3d)) // M68K V100 07/13/04 12:09:20 (encrypted)
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
@@ -2104,33 +2199,38 @@
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
 	ROM_LOAD16_WORD_SWAP( "p0300_v109.u9", 0x100000, 0x200000, CRC(2fcee215) SHA1(855281a9090bfdf3da9f4d50c121765131a13400) )
+	// also found with 4 smaller ROMs
+	// p0300_v109.u9 [even 1/2] kb_u3_v109.u3              IDENTICAL CRC(fe028dd5) SHA1(a865639e6ce9a5ad7100bc0445a58b0465bfe8a6)
+	// p0300_v109.u9 [odd 1/2]  kb_u6_v109.u6              IDENTICAL CRC(e50dba01) SHA1(0103192a877ab18c4da0b3448a1dd9e088c7a740)
+	// p0300_v109.u9 [even 2/2] kb_u4_v109.u4              IDENTICAL CRC(6ac58bb3) SHA1(5e911d1490f6a32f90e150ea933d8679302e0f61)
+	// p0300_v109.u9 [odd 2/2]  kb_u5_v109.u5              IDENTICAL CRC(7dabf576) SHA1(a9fb7fb4c487752597793962ef2bc17ae244fc0a)
 
 	ROM_REGION( 0x010000, "igs022", 0 ) /* Protection Data */
-	ROM_LOAD( "kb_u2.rom", 0x000000, 0x010000,  CRC(de3eae63) SHA1(03af767ef764055bda528b5cc6a24b9e1218cca8) )
+	ROM_LOAD( "kb_u2_v109.u2", 0x000000, 0x010000,  CRC(de3eae63) SHA1(03af767ef764055bda528b5cc6a24b9e1218cca8) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0300.u14",    0x180000, 0x400000, CRC(0922f7d9) SHA1(4302b4b7369e13f315fad14f7d6cad1321101d24) )
+	ROM_LOAD( "pgm_t0300.u14",    0x180000, 0x400000, CRC(0922f7d9) SHA1(4302b4b7369e13f315fad14f7d6cad1321101d24) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0300.u9",   0x0000000, 0x0400000,  CRC(3f9455d3) SHA1(3718ce00ad93975383aafc14e5a74dc297b011a1) )
-	ROM_LOAD( "a0301.u10",  0x0400000, 0x0400000,  CRC(92776889) SHA1(6d677837fefff47bfd1c6166322f69f89989a5e2) )
-	ROM_LOAD( "a0303.u11",  0x0800000, 0x0400000,  CRC(33f5cc69) SHA1(9cacd5058d4bb25b77f71658bbbbd4b38d0a6b6a) )
-	ROM_LOAD( "a0306.u12",  0x0c00000, 0x0400000,  CRC(cc018a8e) SHA1(37752d46f238fb57c0ab5a4f96b1e013f2077347) )
-	ROM_LOAD( "a0307.u2",   0x1000000, 0x0400000,  CRC(bc772e39) SHA1(079cc42a190cb916f02b59bca8fa90e524acefe9) )
-//  ROM_LOAD( "a0302.u3",   0x1400000, 0x0200000,  CRC(a4810e38) SHA1(c31fe641feab2c93795fc35bf71d4f37af1056d4) ) // from lord of gun! unused..
-//  ROM_LOAD( "a0304.u4",   0x1600000, 0x0200000,  CRC(3096de1c) SHA1(d010990d21cfda9cb8ab5b4bc0e329c23b7719f5) ) // from lord of gun! unused..
-//  ROM_LOAD( "a0305.u5",   0x1800000, 0x0200000,  CRC(2234531e) SHA1(58a82e31a1c0c1a4dd026576319f4e7ecffd140e) ) // from lord of gun! unused..
+	ROM_LOAD( "pgm_a0300.u9",   0x0000000, 0x0400000,  CRC(3f9455d3) SHA1(3718ce00ad93975383aafc14e5a74dc297b011a1) )
+	ROM_LOAD( "pgm_a0301.u10",  0x0400000, 0x0400000,  CRC(92776889) SHA1(6d677837fefff47bfd1c6166322f69f89989a5e2) )
+	ROM_LOAD( "pgm_a0303.u11",  0x0800000, 0x0400000,  CRC(33f5cc69) SHA1(9cacd5058d4bb25b77f71658bbbbd4b38d0a6b6a) )
+	ROM_LOAD( "pgm_a0306.u12",  0x0c00000, 0x0400000,  CRC(cc018a8e) SHA1(37752d46f238fb57c0ab5a4f96b1e013f2077347) )
+	ROM_LOAD( "pgm_a0307.u2",   0x1000000, 0x0400000,  CRC(bc772e39) SHA1(079cc42a190cb916f02b59bca8fa90e524acefe9) )
+//  ROM_LOAD( "pgm_a0302.u3",   0x1400000, 0x0200000,  CRC(a4810e38) SHA1(c31fe641feab2c93795fc35bf71d4f37af1056d4) ) // from lord of gun! unused..
+//  ROM_LOAD( "pgm_a0304.u4",   0x1600000, 0x0200000,  CRC(3096de1c) SHA1(d010990d21cfda9cb8ab5b4bc0e329c23b7719f5) ) // from lord of gun! unused..
+//  ROM_LOAD( "pgm_a0305.u5",   0x1800000, 0x0200000,  CRC(2234531e) SHA1(58a82e31a1c0c1a4dd026576319f4e7ecffd140e) ) // from lord of gun! unused..
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0300.u13",    0x0000000, 0x0400000, CRC(7f876981) SHA1(43555a200929ad5ecc42137fc9aeb42dc4f50d20) )
-	ROM_LOAD( "b0302.u14",    0x0400000, 0x0400000, CRC(eea9c502) SHA1(04b3972c7111ea59a3cceab6ad124080c4ce3520) )
-	ROM_LOAD( "b0303.u15",    0x0800000, 0x0200000, CRC(77a9652e) SHA1(2342f643d37945fbda224a5034c013796e5134ca) )
-//  ROM_LOAD( "b0301.u8",     0x0a00000, 0x0200000, CRC(400abe33) SHA1(20de1eb626424ea41bd55eb3cecd6b50be744ee0) ) // from lord of gun! unused..
+	ROM_LOAD( "pgm_b0300.u13",    0x0000000, 0x0400000, CRC(7f876981) SHA1(43555a200929ad5ecc42137fc9aeb42dc4f50d20) )
+	ROM_LOAD( "pgm_b0302.u14",    0x0400000, 0x0400000, CRC(eea9c502) SHA1(04b3972c7111ea59a3cceab6ad124080c4ce3520) )
+	ROM_LOAD( "pgm_b0303.u15",    0x0800000, 0x0200000, CRC(77a9652e) SHA1(2342f643d37945fbda224a5034c013796e5134ca) )
+//  ROM_LOAD( "pgm_b0301.u8",     0x0a00000, 0x0200000, CRC(400abe33) SHA1(20de1eb626424ea41bd55eb3cecd6b50be744ee0) ) // from lord of gun! unused..
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0300.u1",     0x400000, 0x400000, CRC(93159695) SHA1(50c5976c9b681bd3d1ebefa3bfa9fe6e72dcb96f) )
+	ROM_LOAD( "pgm_m0300.u1",     0x400000, 0x400000, CRC(93159695) SHA1(50c5976c9b681bd3d1ebefa3bfa9fe6e72dcb96f) )
 ROM_END
 
 ROM_START( killbld104 )
@@ -2146,27 +2246,27 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0300.u14",    0x180000, 0x400000, CRC(0922f7d9) SHA1(4302b4b7369e13f315fad14f7d6cad1321101d24) )
+	ROM_LOAD( "pgm_t0300.u14",    0x180000, 0x400000, CRC(0922f7d9) SHA1(4302b4b7369e13f315fad14f7d6cad1321101d24) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0300.u9",   0x0000000, 0x0400000,  CRC(3f9455d3) SHA1(3718ce00ad93975383aafc14e5a74dc297b011a1) )
-	ROM_LOAD( "a0301.u10",  0x0400000, 0x0400000,  CRC(92776889) SHA1(6d677837fefff47bfd1c6166322f69f89989a5e2) )
-	ROM_LOAD( "a0303.u11",  0x0800000, 0x0400000,  CRC(33f5cc69) SHA1(9cacd5058d4bb25b77f71658bbbbd4b38d0a6b6a) )
-	ROM_LOAD( "a0306.u12",  0x0c00000, 0x0400000,  CRC(cc018a8e) SHA1(37752d46f238fb57c0ab5a4f96b1e013f2077347) )
-	ROM_LOAD( "a0307.u2",   0x1000000, 0x0400000,  CRC(bc772e39) SHA1(079cc42a190cb916f02b59bca8fa90e524acefe9) )
-//  ROM_LOAD( "a0302.u3",   0x1400000, 0x0200000,  CRC(a4810e38) SHA1(c31fe641feab2c93795fc35bf71d4f37af1056d4) ) // from lord of gun! unused..
-//  ROM_LOAD( "a0304.u4",   0x1600000, 0x0200000,  CRC(3096de1c) SHA1(d010990d21cfda9cb8ab5b4bc0e329c23b7719f5) ) // from lord of gun! unused..
-//  ROM_LOAD( "a0305.u5",   0x1800000, 0x0200000,  CRC(2234531e) SHA1(58a82e31a1c0c1a4dd026576319f4e7ecffd140e) ) // from lord of gun! unused..
-
-	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0300.u13",    0x0000000, 0x0400000, CRC(7f876981) SHA1(43555a200929ad5ecc42137fc9aeb42dc4f50d20) )
-	ROM_LOAD( "b0302.u14",    0x0400000, 0x0400000, CRC(eea9c502) SHA1(04b3972c7111ea59a3cceab6ad124080c4ce3520) )
-	ROM_LOAD( "b0303.u15",    0x0800000, 0x0200000, CRC(77a9652e) SHA1(2342f643d37945fbda224a5034c013796e5134ca) )
-//  ROM_LOAD( "b0301.u8",     0x0a00000, 0x0200000, CRC(400abe33) SHA1(20de1eb626424ea41bd55eb3cecd6b50be744ee0) ) // from lord of gun! unused..
+	ROM_LOAD( "pgm_a0300.u9",   0x0000000, 0x0400000,  CRC(3f9455d3) SHA1(3718ce00ad93975383aafc14e5a74dc297b011a1) )
+	ROM_LOAD( "pgm_a0301.u10",  0x0400000, 0x0400000,  CRC(92776889) SHA1(6d677837fefff47bfd1c6166322f69f89989a5e2) )
+	ROM_LOAD( "pgm_a0303.u11",  0x0800000, 0x0400000,  CRC(33f5cc69) SHA1(9cacd5058d4bb25b77f71658bbbbd4b38d0a6b6a) )
+	ROM_LOAD( "pgm_a0306.u12",  0x0c00000, 0x0400000,  CRC(cc018a8e) SHA1(37752d46f238fb57c0ab5a4f96b1e013f2077347) )
+	ROM_LOAD( "pgm_a0307.u2",   0x1000000, 0x0400000,  CRC(bc772e39) SHA1(079cc42a190cb916f02b59bca8fa90e524acefe9) )
+//  ROM_LOAD( "pgm_a0302.u3",   0x1400000, 0x0200000,  CRC(a4810e38) SHA1(c31fe641feab2c93795fc35bf71d4f37af1056d4) ) // from lord of gun! unused..
+//  ROM_LOAD( "pgm_a0304.u4",   0x1600000, 0x0200000,  CRC(3096de1c) SHA1(d010990d21cfda9cb8ab5b4bc0e329c23b7719f5) ) // from lord of gun! unused..
+//  ROM_LOAD( "pgm_a0305.u5",   0x1800000, 0x0200000,  CRC(2234531e) SHA1(58a82e31a1c0c1a4dd026576319f4e7ecffd140e) ) // from lord of gun! unused..
+
+	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "pgm_b0300.u13",    0x0000000, 0x0400000, CRC(7f876981) SHA1(43555a200929ad5ecc42137fc9aeb42dc4f50d20) )
+	ROM_LOAD( "pgm_b0302.u14",    0x0400000, 0x0400000, CRC(eea9c502) SHA1(04b3972c7111ea59a3cceab6ad124080c4ce3520) )
+	ROM_LOAD( "pgm_b0303.u15",    0x0800000, 0x0200000, CRC(77a9652e) SHA1(2342f643d37945fbda224a5034c013796e5134ca) )
+//  ROM_LOAD( "pgm_b0301.u8",     0x0a00000, 0x0200000, CRC(400abe33) SHA1(20de1eb626424ea41bd55eb3cecd6b50be744ee0) ) // from lord of gun! unused..
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0300.u1",     0x400000, 0x400000, CRC(93159695) SHA1(50c5976c9b681bd3d1ebefa3bfa9fe6e72dcb96f) )
+	ROM_LOAD( "pgm_m0300.u1",     0x400000, 0x400000, CRC(93159695) SHA1(50c5976c9b681bd3d1ebefa3bfa9fe6e72dcb96f) )
 ROM_END
 
 ROM_START( killbld106 )
@@ -2182,32 +2282,30 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0300.u14",    0x180000, 0x400000, CRC(0922f7d9) SHA1(4302b4b7369e13f315fad14f7d6cad1321101d24) )
+	ROM_LOAD( "pgm_t0300.u14",    0x180000, 0x400000, CRC(0922f7d9) SHA1(4302b4b7369e13f315fad14f7d6cad1321101d24) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0300.u9",   0x0000000, 0x0400000,  CRC(3f9455d3) SHA1(3718ce00ad93975383aafc14e5a74dc297b011a1) )
-	ROM_LOAD( "a0301.u10",  0x0400000, 0x0400000,  CRC(92776889) SHA1(6d677837fefff47bfd1c6166322f69f89989a5e2) )
-	ROM_LOAD( "a0303.u11",  0x0800000, 0x0400000,  CRC(33f5cc69) SHA1(9cacd5058d4bb25b77f71658bbbbd4b38d0a6b6a) )
-	ROM_LOAD( "a0306.u12",  0x0c00000, 0x0400000,  CRC(cc018a8e) SHA1(37752d46f238fb57c0ab5a4f96b1e013f2077347) )
-	ROM_LOAD( "a0307.u2",   0x1000000, 0x0400000,  CRC(bc772e39) SHA1(079cc42a190cb916f02b59bca8fa90e524acefe9) )
-//  ROM_LOAD( "a0302.u3",   0x1400000, 0x0200000,  CRC(a4810e38) SHA1(c31fe641feab2c93795fc35bf71d4f37af1056d4) ) // from lord of gun! unused..
-//  ROM_LOAD( "a0304.u4",   0x1600000, 0x0200000,  CRC(3096de1c) SHA1(d010990d21cfda9cb8ab5b4bc0e329c23b7719f5) ) // from lord of gun! unused..
-//  ROM_LOAD( "a0305.u5",   0x1800000, 0x0200000,  CRC(2234531e) SHA1(58a82e31a1c0c1a4dd026576319f4e7ecffd140e) ) // from lord of gun! unused..
-
-	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0300.u13",    0x0000000, 0x0400000, CRC(7f876981) SHA1(43555a200929ad5ecc42137fc9aeb42dc4f50d20) )
-	ROM_LOAD( "b0302.u14",    0x0400000, 0x0400000, CRC(eea9c502) SHA1(04b3972c7111ea59a3cceab6ad124080c4ce3520) )
-	ROM_LOAD( "b0303.u15",    0x0800000, 0x0200000, CRC(77a9652e) SHA1(2342f643d37945fbda224a5034c013796e5134ca) )
-//  ROM_LOAD( "b0301.u8",     0x0a00000, 0x0200000, CRC(400abe33) SHA1(20de1eb626424ea41bd55eb3cecd6b50be744ee0) ) // from lord of gun! unused..
+	ROM_LOAD( "pgm_a0300.u9",   0x0000000, 0x0400000,  CRC(3f9455d3) SHA1(3718ce00ad93975383aafc14e5a74dc297b011a1) )
+	ROM_LOAD( "pgm_a0301.u10",  0x0400000, 0x0400000,  CRC(92776889) SHA1(6d677837fefff47bfd1c6166322f69f89989a5e2) )
+	ROM_LOAD( "pgm_a0303.u11",  0x0800000, 0x0400000,  CRC(33f5cc69) SHA1(9cacd5058d4bb25b77f71658bbbbd4b38d0a6b6a) )
+	ROM_LOAD( "pgm_a0306.u12",  0x0c00000, 0x0400000,  CRC(cc018a8e) SHA1(37752d46f238fb57c0ab5a4f96b1e013f2077347) )
+	ROM_LOAD( "pgm_a0307.u2",   0x1000000, 0x0400000,  CRC(bc772e39) SHA1(079cc42a190cb916f02b59bca8fa90e524acefe9) )
+//  ROM_LOAD( "pgm_a0302.u3",   0x1400000, 0x0200000,  CRC(a4810e38) SHA1(c31fe641feab2c93795fc35bf71d4f37af1056d4) ) // from lord of gun! unused..
+//  ROM_LOAD( "pgm_a0304.u4",   0x1600000, 0x0200000,  CRC(3096de1c) SHA1(d010990d21cfda9cb8ab5b4bc0e329c23b7719f5) ) // from lord of gun! unused..
+//  ROM_LOAD( "pgm_a0305.u5",   0x1800000, 0x0200000,  CRC(2234531e) SHA1(58a82e31a1c0c1a4dd026576319f4e7ecffd140e) ) // from lord of gun! unused..
+
+	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "pgm_b0300.u13",    0x0000000, 0x0400000, CRC(7f876981) SHA1(43555a200929ad5ecc42137fc9aeb42dc4f50d20) )
+	ROM_LOAD( "pgm_b0302.u14",    0x0400000, 0x0400000, CRC(eea9c502) SHA1(04b3972c7111ea59a3cceab6ad124080c4ce3520) )
+	ROM_LOAD( "pgm_b0303.u15",    0x0800000, 0x0200000, CRC(77a9652e) SHA1(2342f643d37945fbda224a5034c013796e5134ca) )
+//  ROM_LOAD( "pgm_b0301.u8",     0x0a00000, 0x0200000, CRC(400abe33) SHA1(20de1eb626424ea41bd55eb3cecd6b50be744ee0) ) // from lord of gun! unused..
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0300.u1",     0x400000, 0x400000, CRC(93159695) SHA1(50c5976c9b681bd3d1ebefa3bfa9fe6e72dcb96f) )
+	ROM_LOAD( "pgm_m0300.u1",     0x400000, 0x400000, CRC(93159695) SHA1(50c5976c9b681bd3d1ebefa3bfa9fe6e72dcb96f) )
 ROM_END
 
 
-
-
 /*
 Puzzle Star
 IGS, 1999
@@ -2259,7 +2357,31 @@
       U3 - 16MBit MaskROM (DIP42)
 */
 
-ROM_START( puzlstar )
+ROM_START( puzlstar ) // V100MG 09/30/99 11:39:23
+	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
+	PGM_68K_BIOS
+	ROM_LOAD16_BYTE( "puzzlestar_u1_v100mg.u1",     0x100000, 0x080000, CRC(c6ee43d7) SHA1(2419414ded556b5e4868d51b0da5dfce374d6bc0) )
+	ROM_LOAD16_BYTE( "puzzlestar_u2_v100mg.u2",     0x100001, 0x080000, CRC(42aa03ce) SHA1(8e1666cc3ded98179a3e4854973604172921bbd6) )
+
+	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
+	ROM_LOAD( "puzlstar_igs027a.bin", 0x000000, 0x04000, NO_DUMP )
+
+	ROM_REGION( 0x500000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	PGM_VIDEO_BIOS
+	ROM_LOAD( "pgm_t0800.u5",    0x180000, 0x200000, CRC(f9d84e59) SHA1(80ec77025ac5bf355b1a60f2a678dd4c56071f6b) )
+
+	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "pgm_a0800.u1",    0x0000000, 0x0400000, CRC(e1e6ec40) SHA1(390432431f144ef63424a426582b311765a61771) )
+
+	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "pgm_b0800.u3",    0x0000000, 0x0200000, CRC(52e7bef5) SHA1(a678251b7e46a1016d0afc1d8d5c9928008ad5b1) )
+
+	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
+	PGM_AUDIO_BIOS
+	ROM_LOAD( "pgm_m0800.u2",    0x400000, 0x400000,  CRC(e1a46541) SHA1(6fe9de5700d8638374734d80551dcedb62975140) )
+ROM_END
+
+ROM_START( puzlstara ) // V100MG 09/20/99 15:16:02
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
 	ROM_LOAD16_BYTE( "v100mg.u1",     0x100000, 0x080000, CRC(5788b77d) SHA1(7770aae6e686da92b2623c977d1bc8f019f48267) )
@@ -2270,17 +2392,17 @@
 
 	ROM_REGION( 0x500000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0800.u5",    0x180000, 0x200000, CRC(f9d84e59) SHA1(80ec77025ac5bf355b1a60f2a678dd4c56071f6b) )
+	ROM_LOAD( "pgm_t0800.u5",    0x180000, 0x200000, CRC(f9d84e59) SHA1(80ec77025ac5bf355b1a60f2a678dd4c56071f6b) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0800.u1",    0x0000000, 0x0400000, CRC(e1e6ec40) SHA1(390432431f144ef63424a426582b311765a61771) )
+	ROM_LOAD( "pgm_a0800.u1",    0x0000000, 0x0400000, CRC(e1e6ec40) SHA1(390432431f144ef63424a426582b311765a61771) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0800.u3",    0x0000000, 0x0200000, CRC(52e7bef5) SHA1(a678251b7e46a1016d0afc1d8d5c9928008ad5b1) )
+	ROM_LOAD( "pgm_b0800.u3",    0x0000000, 0x0200000, CRC(52e7bef5) SHA1(a678251b7e46a1016d0afc1d8d5c9928008ad5b1) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0800.u2",    0x400000, 0x400000,  CRC(e1a46541) SHA1(6fe9de5700d8638374734d80551dcedb62975140) )
+	ROM_LOAD( "pgm_m0800.u2",    0x400000, 0x400000,  CRC(e1a46541) SHA1(6fe9de5700d8638374734d80551dcedb62975140) )
 ROM_END
 
 
@@ -2339,10 +2461,6 @@
 
 */
 
-
-
-
-
 ROM_START( olds103t )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
@@ -2350,40 +2468,40 @@
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0500.rom",    0x180000, 0x400000, CRC(d881726c) SHA1(a82517e665996f7b7017c940f1fcf016fccb65c2) )
-	ROM_LOAD( "t0501.rom",    0x580000, 0x200000, CRC(d2106864) SHA1(65d827135b87d82196433aea3279608ee263feca) )
+	ROM_LOAD( "pgm_t0500.u18",   0x180000, 0x400000, CRC(d881726c) SHA1(a82517e665996f7b7017c940f1fcf016fccb65c2) )
+	ROM_LOAD( "pgm_t0501.u19",   0x580000, 0x200000, CRC(d2106864) SHA1(65d827135b87d82196433aea3279608ee263feca) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0500.rom",    0x0000000, 0x400000, CRC(80a59197) SHA1(7d0108e2f0d0347d43ace2d96c0388202c05fdfb) )
-	ROM_LOAD( "a0501.rom",    0x0400000, 0x400000, CRC(98c931b1) SHA1(9b70d1a7beb4c3a0c1436c25fd1fb76e47539538) )
-	ROM_LOAD( "a0502.rom",    0x0800000, 0x400000, CRC(c3fcdf1d) SHA1(107585fd103fcd0af0fb7db283be4f7c7058aef7) )
-	ROM_LOAD( "a0503.rom",    0x0c00000, 0x400000, CRC(066dffec) SHA1(f023032a7202b7090fb609a39e0f19018e664bf3) )
-	ROM_LOAD( "a0504.rom",    0x1000000, 0x400000, CRC(45337583) SHA1(c954d0e5bf7fa99c90b0d154e7119d2b0c461f1c) )
-	ROM_LOAD( "a0505.rom",    0x1400000, 0x400000, CRC(5b8cf3a5) SHA1(856d1e47b5d9a66dcfbdc74a51ed646fd7d96a35) )
-	ROM_LOAD( "a0506.rom",    0x1800000, 0x400000, CRC(087ac60c) SHA1(3d5bf7dd40c8a3c1224cf82e12410ca904c0c5db) )
+	ROM_LOAD( "pgm_a0500.u5",    0x0000000, 0x400000, CRC(80a59197) SHA1(7d0108e2f0d0347d43ace2d96c0388202c05fdfb) )
+	ROM_LOAD( "pgm_a0501.u6",    0x0400000, 0x400000, CRC(98c931b1) SHA1(9b70d1a7beb4c3a0c1436c25fd1fb76e47539538) )
+	ROM_LOAD( "pgm_a0502.u7",    0x0800000, 0x400000, CRC(c3fcdf1d) SHA1(107585fd103fcd0af0fb7db283be4f7c7058aef7) )
+	ROM_LOAD( "pgm_a0503.u8",    0x0c00000, 0x400000, CRC(066dffec) SHA1(f023032a7202b7090fb609a39e0f19018e664bf3) )
+	ROM_LOAD( "pgm_a0504.u11",   0x1000000, 0x400000, CRC(45337583) SHA1(c954d0e5bf7fa99c90b0d154e7119d2b0c461f1c) )
+	ROM_LOAD( "pgm_a0505.u12",   0x1400000, 0x400000, CRC(5b8cf3a5) SHA1(856d1e47b5d9a66dcfbdc74a51ed646fd7d96a35) )
+	ROM_LOAD( "pgm_a0506.u13",   0x1800000, 0x400000, CRC(087ac60c) SHA1(3d5bf7dd40c8a3c1224cf82e12410ca904c0c5db) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0500.rom",    0x0000000, 0x400000, CRC(cde07f74) SHA1(1fe90db7c57faa28f3a054b2c07909bef89e3efb) )
-	ROM_LOAD( "b0501.rom",    0x0400000, 0x400000, CRC(1546c2e9) SHA1(a7b9c8b44203db54a59d49fe469bb52bba807ba2) )
-	ROM_LOAD( "b0502.rom",    0x0800000, 0x400000, CRC(e97b31c3) SHA1(1a7ca4f6c8644e84a33ae41cd4637f21046b14c5) )
-	ROM_LOAD( "b0503.u16",    0x0c00000, 0x400000, CRC(e41d98e4) SHA1(f80b27fcee81762993e09bf1b3cad6e85274760c) )
+	ROM_LOAD( "pgm_b0500.u9",    0x0000000, 0x400000, CRC(cde07f74) SHA1(1fe90db7c57faa28f3a054b2c07909bef89e3efb) )
+	ROM_LOAD( "pgm_b0501.u10",   0x0400000, 0x400000, CRC(1546c2e9) SHA1(a7b9c8b44203db54a59d49fe469bb52bba807ba2) )
+	ROM_LOAD( "pgm_b0502.u15",   0x0800000, 0x400000, CRC(e97b31c3) SHA1(1a7ca4f6c8644e84a33ae41cd4637f21046b14c5) )
+	ROM_LOAD( "pgm_b0503.u16",   0x0c00000, 0x400000, CRC(e41d98e4) SHA1(f80b27fcee81762993e09bf1b3cad6e85274760c) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0500.rom",    0x400000, 0x200000, CRC(37928cdd) SHA1(e80498cabc2a6a54d4f3ebcb097d4b3fad96fe55) )
+	ROM_LOAD( "pgm_m0500.u1",    0x400000, 0x200000, CRC(37928cdd) SHA1(e80498cabc2a6a54d4f3ebcb097d4b3fad96fe55) )
 ROM_END
 
 ROM_START( olds )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "sp_v101.u2",      0x100001, 0x080000,   CRC(08eb9661) SHA1(105946e72e562adb1a9fd794ca0fd2c91967eb56) )
-	ROM_LOAD16_BYTE( "sp_v101.u3",      0x100000, 0x080000,   CRC(0a358c1e) SHA1(95c7c3f069c5d05001e22535750f6b3cd7de105f) )
-	ROM_LOAD16_BYTE( "sp_v101.u4",      0x200001, 0x080000,   CRC(766570e0) SHA1(e7c3f5664ec69b662b82c2e1375555db7305390c) )
-	ROM_LOAD16_BYTE( "sp_v101.u5",      0x200000, 0x080000,   CRC(58662e12) SHA1(2b39bd847e9c4968a8e77a2f3cec77cf323ceee3) )
-	ROM_LOAD16_WORD_SWAP( "sp_v101.u1",0x300000, 0x080000,    CRC(2b2f4f1e) SHA1(67b97cf8cc7f517d67cd45588addd2ad8e24612a) )
+	ROM_LOAD16_BYTE( "sp_v101_u2.u2",      0x100001, 0x080000,   CRC(08eb9661) SHA1(105946e72e562adb1a9fd794ca0fd2c91967eb56) )
+	ROM_LOAD16_BYTE( "sp_v101_u3.u3",      0x100000, 0x080000,   CRC(0a358c1e) SHA1(95c7c3f069c5d05001e22535750f6b3cd7de105f) )
+	ROM_LOAD16_BYTE( "sp_v101_u4.u4",      0x200001, 0x080000,   CRC(766570e0) SHA1(e7c3f5664ec69b662b82c2e1375555db7305390c) )
+	ROM_LOAD16_BYTE( "sp_v101_u5.u5",      0x200000, 0x080000,   CRC(58662e12) SHA1(2b39bd847e9c4968a8e77a2f3cec77cf323ceee3) )
+	ROM_LOAD16_WORD_SWAP( "sp_v101_u1.u1", 0x300000, 0x080000,    CRC(2b2f4f1e) SHA1(67b97cf8cc7f517d67cd45588addd2ad8e24612a) )
 
 	ROM_REGION32_LE( 0x010000, "user1", 0 ) /* IGS028 Protection Data */
-	ROM_LOAD( "sp_v101.u6", 0x000000, 0x010000,  CRC(097046bc) SHA1(6d75db85cf4c79b63e837897785c253014b2126d) )
+	ROM_LOAD( "sp_v101_u6.u6", 0x000000, 0x010000,  CRC(097046bc) SHA1(6d75db85cf4c79b63e837897785c253014b2126d) )
 
 	ROM_REGION( 0x4000, "user2", ROMREGION_ERASEFF ) /* its a dump of the shared protection rom/ram from pcb. */
 	// clearly not for this revision
@@ -2391,68 +2509,68 @@
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0500.rom",    0x180000, 0x400000, CRC(d881726c) SHA1(a82517e665996f7b7017c940f1fcf016fccb65c2) )
-	ROM_LOAD( "t0501.rom",    0x580000, 0x200000, CRC(d2106864) SHA1(65d827135b87d82196433aea3279608ee263feca) )
+	ROM_LOAD( "pgm_t0500.u18",   0x180000, 0x400000, CRC(d881726c) SHA1(a82517e665996f7b7017c940f1fcf016fccb65c2) )
+	ROM_LOAD( "pgm_t0501.u19",   0x580000, 0x200000, CRC(d2106864) SHA1(65d827135b87d82196433aea3279608ee263feca) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0500.rom",    0x0000000, 0x400000, CRC(80a59197) SHA1(7d0108e2f0d0347d43ace2d96c0388202c05fdfb) )
-	ROM_LOAD( "a0501.rom",    0x0400000, 0x400000, CRC(98c931b1) SHA1(9b70d1a7beb4c3a0c1436c25fd1fb76e47539538) )
-	ROM_LOAD( "a0502.rom",    0x0800000, 0x400000, CRC(c3fcdf1d) SHA1(107585fd103fcd0af0fb7db283be4f7c7058aef7) )
-	ROM_LOAD( "a0503.rom",    0x0c00000, 0x400000, CRC(066dffec) SHA1(f023032a7202b7090fb609a39e0f19018e664bf3) )
-	ROM_LOAD( "a0504.rom",    0x1000000, 0x400000, CRC(45337583) SHA1(c954d0e5bf7fa99c90b0d154e7119d2b0c461f1c) )
-	ROM_LOAD( "a0505.rom",    0x1400000, 0x400000, CRC(5b8cf3a5) SHA1(856d1e47b5d9a66dcfbdc74a51ed646fd7d96a35) )
-	ROM_LOAD( "a0506.rom",    0x1800000, 0x400000, CRC(087ac60c) SHA1(3d5bf7dd40c8a3c1224cf82e12410ca904c0c5db) )
+	ROM_LOAD( "pgm_a0500.u5",    0x0000000, 0x400000, CRC(80a59197) SHA1(7d0108e2f0d0347d43ace2d96c0388202c05fdfb) )
+	ROM_LOAD( "pgm_a0501.u6",    0x0400000, 0x400000, CRC(98c931b1) SHA1(9b70d1a7beb4c3a0c1436c25fd1fb76e47539538) )
+	ROM_LOAD( "pgm_a0502.u7",    0x0800000, 0x400000, CRC(c3fcdf1d) SHA1(107585fd103fcd0af0fb7db283be4f7c7058aef7) )
+	ROM_LOAD( "pgm_a0503.u8",    0x0c00000, 0x400000, CRC(066dffec) SHA1(f023032a7202b7090fb609a39e0f19018e664bf3) )
+	ROM_LOAD( "pgm_a0504.u11",   0x1000000, 0x400000, CRC(45337583) SHA1(c954d0e5bf7fa99c90b0d154e7119d2b0c461f1c) )
+	ROM_LOAD( "pgm_a0505.u12",   0x1400000, 0x400000, CRC(5b8cf3a5) SHA1(856d1e47b5d9a66dcfbdc74a51ed646fd7d96a35) )
+	ROM_LOAD( "pgm_a0506.u13",   0x1800000, 0x400000, CRC(087ac60c) SHA1(3d5bf7dd40c8a3c1224cf82e12410ca904c0c5db) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0500.rom",    0x0000000, 0x400000, CRC(cde07f74) SHA1(1fe90db7c57faa28f3a054b2c07909bef89e3efb) )
-	ROM_LOAD( "b0501.rom",    0x0400000, 0x400000, CRC(1546c2e9) SHA1(a7b9c8b44203db54a59d49fe469bb52bba807ba2) )
-	ROM_LOAD( "b0502.rom",    0x0800000, 0x400000, CRC(e97b31c3) SHA1(1a7ca4f6c8644e84a33ae41cd4637f21046b14c5) )
-	ROM_LOAD( "b0503.u16",    0x0c00000, 0x400000, CRC(e41d98e4) SHA1(f80b27fcee81762993e09bf1b3cad6e85274760c) )
+	ROM_LOAD( "pgm_b0500.u9",    0x0000000, 0x400000, CRC(cde07f74) SHA1(1fe90db7c57faa28f3a054b2c07909bef89e3efb) )
+	ROM_LOAD( "pgm_b0501.u10",   0x0400000, 0x400000, CRC(1546c2e9) SHA1(a7b9c8b44203db54a59d49fe469bb52bba807ba2) )
+	ROM_LOAD( "pgm_b0502.u15",   0x0800000, 0x400000, CRC(e97b31c3) SHA1(1a7ca4f6c8644e84a33ae41cd4637f21046b14c5) )
+	ROM_LOAD( "pgm_b0503.u16",   0x0c00000, 0x400000, CRC(e41d98e4) SHA1(f80b27fcee81762993e09bf1b3cad6e85274760c) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0500.rom",    0x400000, 0x200000, CRC(37928cdd) SHA1(e80498cabc2a6a54d4f3ebcb097d4b3fad96fe55) )
+	ROM_LOAD( "pgm_m0500.u1",    0x400000, 0x200000, CRC(37928cdd) SHA1(e80498cabc2a6a54d4f3ebcb097d4b3fad96fe55) )
 ROM_END
 
 ROM_START( olds100 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
-	ROM_LOAD16_BYTE( "v100-u2.040",      0x100001, 0x080000,  CRC(517c2a06) SHA1(bbf5b311fac9b0bb4d4129c0561e5e24f6963fa2) )
-	ROM_LOAD16_BYTE( "v100-u3.040",      0x100000, 0x080000,  CRC(d0e2b741) SHA1(2e671dbb4320d1f0c059b35efd33cdea26f12131) )
-	ROM_LOAD16_BYTE( "v100-u4.040",      0x200001, 0x080000,  CRC(32a6bdbd) SHA1(a93d7f4eae722a58eca9ec351ad5890cefda56f0) )
-	ROM_LOAD16_BYTE( "v100-u5.040",      0x200000, 0x080000,  CRC(b4a1cafb) SHA1(b2fccd480ede93f58ad043387b18b898152f06ef) )
-	ROM_LOAD16_WORD_SWAP( "v100-u1.040", 0x300000, 0x080000,  CRC(37ea4e75) SHA1(a94fcb89da3394a43d360f885419677f511d2580) )
+	ROM_LOAD16_BYTE( "sp_v100_u2.u2",      0x100001, 0x080000,  CRC(517c2a06) SHA1(bbf5b311fac9b0bb4d4129c0561e5e24f6963fa2) )
+	ROM_LOAD16_BYTE( "sp_v100_u3.u3",      0x100000, 0x080000,  CRC(d0e2b741) SHA1(2e671dbb4320d1f0c059b35efd33cdea26f12131) )
+	ROM_LOAD16_BYTE( "sp_v100_u4.u4",      0x200001, 0x080000,  CRC(32a6bdbd) SHA1(a93d7f4eae722a58eca9ec351ad5890cefda56f0) )
+	ROM_LOAD16_BYTE( "sp_v100_u5.u5",      0x200000, 0x080000,  CRC(b4a1cafb) SHA1(b2fccd480ede93f58ad043387b18b898152f06ef) )
+	ROM_LOAD16_WORD_SWAP( "sp_v100_u1.u1", 0x300000, 0x080000,  CRC(37ea4e75) SHA1(a94fcb89da3394a43d360f885419677f511d2580) )
 
 	ROM_REGION( 0x4000, "user2", ROMREGION_ERASEFF ) /* its a dump of the shared protection rom/ram from pcb. */
 	// used to simulate encrypted DMA protection device for now ..
 	ROM_LOAD( "ram_dump", 0x000000, 0x04000, CRC(280cfb4e) SHA1(cd2bdcaa21347952c2bf38b105a204d327fde39e) )
 
 	ROM_REGION32_LE( 0x010000, "user1", 0 ) /* IGS028 Protection Data */
-	ROM_LOAD( "kd-u6.512", 0x000000, 0x010000,  CRC(e7613dda) SHA1(0d7c043b90e2f9a36a45066f22e3e305dc716676) )
+	ROM_LOAD( "sp_v100_u6.u6", 0x000000, 0x010000,  CRC(e7613dda) SHA1(0d7c043b90e2f9a36a45066f22e3e305dc716676) )
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0500.rom",    0x180000, 0x400000, CRC(d881726c) SHA1(a82517e665996f7b7017c940f1fcf016fccb65c2) )
-	ROM_LOAD( "t0501.rom",    0x580000, 0x200000, CRC(d2106864) SHA1(65d827135b87d82196433aea3279608ee263feca) )
+	ROM_LOAD( "pgm_t0500.u18",   0x180000, 0x400000, CRC(d881726c) SHA1(a82517e665996f7b7017c940f1fcf016fccb65c2) )
+	ROM_LOAD( "pgm_t0501.u19",   0x580000, 0x200000, CRC(d2106864) SHA1(65d827135b87d82196433aea3279608ee263feca) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0500.rom",    0x0000000, 0x400000, CRC(80a59197) SHA1(7d0108e2f0d0347d43ace2d96c0388202c05fdfb) )
-	ROM_LOAD( "a0501.rom",    0x0400000, 0x400000, CRC(98c931b1) SHA1(9b70d1a7beb4c3a0c1436c25fd1fb76e47539538) )
-	ROM_LOAD( "a0502.rom",    0x0800000, 0x400000, CRC(c3fcdf1d) SHA1(107585fd103fcd0af0fb7db283be4f7c7058aef7) )
-	ROM_LOAD( "a0503.rom",    0x0c00000, 0x400000, CRC(066dffec) SHA1(f023032a7202b7090fb609a39e0f19018e664bf3) )
-	ROM_LOAD( "a0504.rom",    0x1000000, 0x400000, CRC(45337583) SHA1(c954d0e5bf7fa99c90b0d154e7119d2b0c461f1c) )
-	ROM_LOAD( "a0505.rom",    0x1400000, 0x400000, CRC(5b8cf3a5) SHA1(856d1e47b5d9a66dcfbdc74a51ed646fd7d96a35) )
-	ROM_LOAD( "a0506.rom",    0x1800000, 0x400000, CRC(087ac60c) SHA1(3d5bf7dd40c8a3c1224cf82e12410ca904c0c5db) )
+	ROM_LOAD( "pgm_a0500.u5",    0x0000000, 0x400000, CRC(80a59197) SHA1(7d0108e2f0d0347d43ace2d96c0388202c05fdfb) )
+	ROM_LOAD( "pgm_a0501.u6",    0x0400000, 0x400000, CRC(98c931b1) SHA1(9b70d1a7beb4c3a0c1436c25fd1fb76e47539538) )
+	ROM_LOAD( "pgm_a0502.u7",    0x0800000, 0x400000, CRC(c3fcdf1d) SHA1(107585fd103fcd0af0fb7db283be4f7c7058aef7) )
+	ROM_LOAD( "pgm_a0503.u8",    0x0c00000, 0x400000, CRC(066dffec) SHA1(f023032a7202b7090fb609a39e0f19018e664bf3) )
+	ROM_LOAD( "pgm_a0504.u11",   0x1000000, 0x400000, CRC(45337583) SHA1(c954d0e5bf7fa99c90b0d154e7119d2b0c461f1c) )
+	ROM_LOAD( "pgm_a0505.u12",   0x1400000, 0x400000, CRC(5b8cf3a5) SHA1(856d1e47b5d9a66dcfbdc74a51ed646fd7d96a35) )
+	ROM_LOAD( "pgm_a0506.u13",   0x1800000, 0x400000, CRC(087ac60c) SHA1(3d5bf7dd40c8a3c1224cf82e12410ca904c0c5db) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0500.rom",    0x0000000, 0x400000, CRC(cde07f74) SHA1(1fe90db7c57faa28f3a054b2c07909bef89e3efb) )
-	ROM_LOAD( "b0501.rom",    0x0400000, 0x400000, CRC(1546c2e9) SHA1(a7b9c8b44203db54a59d49fe469bb52bba807ba2) )
-	ROM_LOAD( "b0502.rom",    0x0800000, 0x400000, CRC(e97b31c3) SHA1(1a7ca4f6c8644e84a33ae41cd4637f21046b14c5) )
-	ROM_LOAD( "b0503.u16",    0x0c00000, 0x400000, CRC(e41d98e4) SHA1(f80b27fcee81762993e09bf1b3cad6e85274760c) )
+	ROM_LOAD( "pgm_b0500.u9",    0x0000000, 0x400000, CRC(cde07f74) SHA1(1fe90db7c57faa28f3a054b2c07909bef89e3efb) )
+	ROM_LOAD( "pgm_b0501.u10",   0x0400000, 0x400000, CRC(1546c2e9) SHA1(a7b9c8b44203db54a59d49fe469bb52bba807ba2) )
+	ROM_LOAD( "pgm_b0502.u15",   0x0800000, 0x400000, CRC(e97b31c3) SHA1(1a7ca4f6c8644e84a33ae41cd4637f21046b14c5) )
+	ROM_LOAD( "pgm_b0503.u16",   0x0c00000, 0x400000, CRC(e41d98e4) SHA1(f80b27fcee81762993e09bf1b3cad6e85274760c) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0500.rom",    0x400000, 0x200000, CRC(37928cdd) SHA1(e80498cabc2a6a54d4f3ebcb097d4b3fad96fe55) )
+	ROM_LOAD( "pgm_m0500.u1",    0x400000, 0x200000, CRC(37928cdd) SHA1(e80498cabc2a6a54d4f3ebcb097d4b3fad96fe55) )
 ROM_END
 
 /* this is the set which the protection ram dump seems to be for.. */
@@ -2460,10 +2578,11 @@
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code  */
 	PGM_68K_BIOS
 	/* this rom had a lame hack applied to it by the dumper, this was removed, hopefully it is correct now */
-	ROM_LOAD16_WORD_SWAP( "p0500.v10",    0x100000, 0x400000, CRC(8981fc87) SHA1(678d6705d06b99bca5951ff77708adadc4c4396b) )
+	ROM_LOAD16_WORD_SWAP( "pgm_p0500_v100.u24",    0x100000, 0x400000, CRC(8981fc87) SHA1(678d6705d06b99bca5951ff77708adadc4c4396b) )
 
-	ROM_REGION32_LE( 0x010000, "user1", ROMREGION_ERASEFF ) /* IGS028 Protection Data */
-	/* missing from this set .. */
+	/* ROM label SP 西遊記 DATA on sticker */
+	ROM_REGION32_LE( 0x010000, "user1", 0 ) /* IGS028 Protection Data */
+	ROM_LOAD( "sp_data.u6", 0x000000, 0x010000,  CRC(e7613dda) SHA1(0d7c043b90e2f9a36a45066f22e3e305dc716676) )
 
 	ROM_REGION( 0x4000, "user2", ROMREGION_ERASEFF ) /* its a dump of the shared protection rom/ram from pcb. */
 	// used to simulate encrypted DMA protection device for now ..
@@ -2471,370 +2590,401 @@
 
 	ROM_REGION( 0xa00000, "tiles",  0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0500.rom",    0x180000, 0x400000, CRC(d881726c) SHA1(a82517e665996f7b7017c940f1fcf016fccb65c2) )
-	ROM_LOAD( "t0501.rom",    0x580000, 0x200000, CRC(d2106864) SHA1(65d827135b87d82196433aea3279608ee263feca) )
+	ROM_LOAD( "pgm_t0500.u18",   0x180000, 0x400000, CRC(d881726c) SHA1(a82517e665996f7b7017c940f1fcf016fccb65c2) )
+	ROM_LOAD( "pgm_t0501.u19",   0x580000, 0x200000, CRC(d2106864) SHA1(65d827135b87d82196433aea3279608ee263feca) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0500.rom",    0x0000000, 0x400000, CRC(80a59197) SHA1(7d0108e2f0d0347d43ace2d96c0388202c05fdfb) )
-	ROM_LOAD( "a0501.rom",    0x0400000, 0x400000, CRC(98c931b1) SHA1(9b70d1a7beb4c3a0c1436c25fd1fb76e47539538) )
-	ROM_LOAD( "a0502.rom",    0x0800000, 0x400000, CRC(c3fcdf1d) SHA1(107585fd103fcd0af0fb7db283be4f7c7058aef7) )
-	ROM_LOAD( "a0503.rom",    0x0c00000, 0x400000, CRC(066dffec) SHA1(f023032a7202b7090fb609a39e0f19018e664bf3) )
-	ROM_LOAD( "a0504.rom",    0x1000000, 0x400000, CRC(45337583) SHA1(c954d0e5bf7fa99c90b0d154e7119d2b0c461f1c) )
-	ROM_LOAD( "a0505.rom",    0x1400000, 0x400000, CRC(5b8cf3a5) SHA1(856d1e47b5d9a66dcfbdc74a51ed646fd7d96a35) )
-	ROM_LOAD( "a0506.rom",    0x1800000, 0x400000, CRC(087ac60c) SHA1(3d5bf7dd40c8a3c1224cf82e12410ca904c0c5db) )
+	ROM_LOAD( "pgm_a0500.u5",    0x0000000, 0x400000, CRC(80a59197) SHA1(7d0108e2f0d0347d43ace2d96c0388202c05fdfb) )
+	ROM_LOAD( "pgm_a0501.u6",    0x0400000, 0x400000, CRC(98c931b1) SHA1(9b70d1a7beb4c3a0c1436c25fd1fb76e47539538) )
+	ROM_LOAD( "pgm_a0502.u7",    0x0800000, 0x400000, CRC(c3fcdf1d) SHA1(107585fd103fcd0af0fb7db283be4f7c7058aef7) )
+	ROM_LOAD( "pgm_a0503.u8",    0x0c00000, 0x400000, CRC(066dffec) SHA1(f023032a7202b7090fb609a39e0f19018e664bf3) )
+	ROM_LOAD( "pgm_a0504.u11",   0x1000000, 0x400000, CRC(45337583) SHA1(c954d0e5bf7fa99c90b0d154e7119d2b0c461f1c) )
+	ROM_LOAD( "pgm_a0505.u12",   0x1400000, 0x400000, CRC(5b8cf3a5) SHA1(856d1e47b5d9a66dcfbdc74a51ed646fd7d96a35) )
+	ROM_LOAD( "pgm_a0506.u13",   0x1800000, 0x400000, CRC(087ac60c) SHA1(3d5bf7dd40c8a3c1224cf82e12410ca904c0c5db) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0500.rom",    0x0000000, 0x400000, CRC(cde07f74) SHA1(1fe90db7c57faa28f3a054b2c07909bef89e3efb) )
-	ROM_LOAD( "b0501.rom",    0x0400000, 0x400000, CRC(1546c2e9) SHA1(a7b9c8b44203db54a59d49fe469bb52bba807ba2) )
-	ROM_LOAD( "b0502.rom",    0x0800000, 0x400000, CRC(e97b31c3) SHA1(1a7ca4f6c8644e84a33ae41cd4637f21046b14c5) )
-	ROM_LOAD( "b0503.u16",    0x0c00000, 0x400000, CRC(e41d98e4) SHA1(f80b27fcee81762993e09bf1b3cad6e85274760c) )
+	ROM_LOAD( "pgm_b0500.u9",    0x0000000, 0x400000, CRC(cde07f74) SHA1(1fe90db7c57faa28f3a054b2c07909bef89e3efb) )
+	ROM_LOAD( "pgm_b0501.u10",   0x0400000, 0x400000, CRC(1546c2e9) SHA1(a7b9c8b44203db54a59d49fe469bb52bba807ba2) )
+	ROM_LOAD( "pgm_b0502.u15",   0x0800000, 0x400000, CRC(e97b31c3) SHA1(1a7ca4f6c8644e84a33ae41cd4637f21046b14c5) )
+	ROM_LOAD( "pgm_b0503.u16",   0x0c00000, 0x400000, CRC(e41d98e4) SHA1(f80b27fcee81762993e09bf1b3cad6e85274760c) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0500.rom",    0x400000, 0x200000, CRC(37928cdd) SHA1(e80498cabc2a6a54d4f3ebcb097d4b3fad96fe55) )
+	ROM_LOAD( "pgm_m0500.u1",    0x400000, 0x200000, CRC(37928cdd) SHA1(e80498cabc2a6a54d4f3ebcb097d4b3fad96fe55) )
 ROM_END
 
 
 ROM_START( kov2 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "u18.107",      0x100000, 0x400000, CRC(661a5b2c) SHA1(125054fabc93d4f4cba869c3e6adf863650d30cf) ) // 05/10/01 14:24:08 V107
+	ROM_LOAD16_WORD_SWAP( "v107_u18.u18",      0x100000, 0x400000, CRC(661a5b2c) SHA1(125054fabc93d4f4cba869c3e6adf863650d30cf) ) // 05/10/01 14:24:08 V107
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov2_v100_hongkong.asic", 0x000000, 0x04000,  CRC(e0d7679f) SHA1(e1c2d127eba4ddbeb8ad173c55b90ac1467e1ca8) )
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "u19.102", 0x000000, 0x200000,   CRC(462e2980) SHA1(3da7c3d2c65b59f50c78be1c25922b71d40f6080) )
+	ROM_LOAD( "v102_u19.u19",   0x000000, 0x200000,   CRC(462e2980) SHA1(3da7c3d2c65b59f50c78be1c25922b71d40f6080) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1200.rom",    0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
+	ROM_LOAD( "pgm_t1200.u27",  0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1200.rom",    0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
-	ROM_LOAD( "a1201.rom",    0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
-	ROM_LOAD( "a1202.rom",    0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
-	ROM_LOAD( "a1203.rom",    0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
-	ROM_LOAD( "a1204.rom",    0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
+	ROM_LOAD( "pgm_a1200.u1",   0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
+	ROM_LOAD( "pgm_a1201.u4",   0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
+	ROM_LOAD( "pgm_a1202.u6",   0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
+	ROM_LOAD( "pgm_a1203.u8",   0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
+	ROM_LOAD( "pgm_a1204.u10",  0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1200.rom",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
-	ROM_LOAD( "b1201.rom",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
+	ROM_LOAD( "pgm_b1200.u5",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
+	ROM_LOAD( "pgm_b1201.u7",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1200.rom",    0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
+	ROM_LOAD( "pgm_m1200.u3",   0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
 ROM_END
 
 ROM_START( kov2106 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "u18.106",    0x100000, 0x400000, CRC(40051ad9) SHA1(ba2ddf267fe688d5dfed575aeeccbab10135b37b) ) // 02/27/01 13:26:46 V106
+	ROM_LOAD16_WORD_SWAP( "v106_u18.u18",    0x100000, 0x400000, CRC(40051ad9) SHA1(ba2ddf267fe688d5dfed575aeeccbab10135b37b) ) // 02/27/01 13:26:46 V106
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov2_v100_hongkong.asic", 0x000000, 0x04000,  CRC(e0d7679f) SHA1(e1c2d127eba4ddbeb8ad173c55b90ac1467e1ca8) )
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "u19.102", 0x000000, 0x200000,   CRC(462e2980) SHA1(3da7c3d2c65b59f50c78be1c25922b71d40f6080) )
+	ROM_LOAD( "v102_u19.u19",   0x000000, 0x200000,   CRC(462e2980) SHA1(3da7c3d2c65b59f50c78be1c25922b71d40f6080) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1200.rom",    0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
+	ROM_LOAD( "pgm_t1200.u27",  0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1200.rom",    0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
-	ROM_LOAD( "a1201.rom",    0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
-	ROM_LOAD( "a1202.rom",    0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
-	ROM_LOAD( "a1203.rom",    0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
-	ROM_LOAD( "a1204.rom",    0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
+	ROM_LOAD( "pgm_a1200.u1",   0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
+	ROM_LOAD( "pgm_a1201.u4",   0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
+	ROM_LOAD( "pgm_a1202.u6",   0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
+	ROM_LOAD( "pgm_a1203.u8",   0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
+	ROM_LOAD( "pgm_a1204.u10",  0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1200.rom",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
-	ROM_LOAD( "b1201.rom",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
+	ROM_LOAD( "pgm_b1200.u5",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
+	ROM_LOAD( "pgm_b1201.u7",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1200.rom",    0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
+	ROM_LOAD( "pgm_m1200.u3",   0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
 ROM_END
 
 ROM_START( kov2104 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "u18.104",    0x100000, 0x400000, CRC(0fdb050b) SHA1(8ac704459e1a17d0956dd3529e81b6bcd8abf361) ) // 01/19/01 10:19:38 V104
+	ROM_LOAD16_WORD_SWAP( "v104_u18.u18",    0x100000, 0x400000, CRC(0fdb050b) SHA1(8ac704459e1a17d0956dd3529e81b6bcd8abf361) ) // 01/19/01 10:19:38 V104
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov2_v100_hongkong.asic", 0x000000, 0x04000,  CRC(e0d7679f) SHA1(e1c2d127eba4ddbeb8ad173c55b90ac1467e1ca8) )
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "u19.102", 0x000000, 0x200000,   CRC(462e2980) SHA1(3da7c3d2c65b59f50c78be1c25922b71d40f6080) )
+	ROM_LOAD( "v102_u19.u19",   0x000000, 0x200000,   CRC(462e2980) SHA1(3da7c3d2c65b59f50c78be1c25922b71d40f6080) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1200.rom",    0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
+	ROM_LOAD( "pgm_t1200.u27",  0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1200.rom",    0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
-	ROM_LOAD( "a1201.rom",    0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
-	ROM_LOAD( "a1202.rom",    0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
-	ROM_LOAD( "a1203.rom",    0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
-	ROM_LOAD( "a1204.rom",    0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
+	ROM_LOAD( "pgm_a1200.u1",   0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
+	ROM_LOAD( "pgm_a1201.u4",   0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
+	ROM_LOAD( "pgm_a1202.u6",   0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
+	ROM_LOAD( "pgm_a1203.u8",   0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
+	ROM_LOAD( "pgm_a1204.u10",  0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1200.rom",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
-	ROM_LOAD( "b1201.rom",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
+	ROM_LOAD( "pgm_b1200.u5",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
+	ROM_LOAD( "pgm_b1201.u7",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1200.rom",    0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
+	ROM_LOAD( "pgm_m1200.u3",   0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
 ROM_END
 
 ROM_START( kov2103 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "u18.103",    0x100000, 0x400000, CRC(98c32f76) SHA1(ec7e35e8071bb7097e415493be4e40be0ca19fd6) ) // 12/28/00 15:09:31 V103
+	ROM_LOAD16_WORD_SWAP( "v103_u18.u18",    0x100000, 0x400000, CRC(98c32f76) SHA1(ec7e35e8071bb7097e415493be4e40be0ca19fd6) ) // 12/28/00 15:09:31 V103
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov2_v100_hongkong.asic", 0x000000, 0x04000,  CRC(e0d7679f) SHA1(e1c2d127eba4ddbeb8ad173c55b90ac1467e1ca8) )
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "u19.101", 0x000000, 0x200000, CRC(8c35f2fe) SHA1(d4858f97fcfad0f342fccbc9cf1590276cc3c69c) )
+	ROM_LOAD( "v101_u19.u19",   0x000000, 0x200000, CRC(8c35f2fe) SHA1(d4858f97fcfad0f342fccbc9cf1590276cc3c69c) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1200.rom",    0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
+	ROM_LOAD( "pgm_t1200.u27",  0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1200.rom",    0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
-	ROM_LOAD( "a1201.rom",    0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
-	ROM_LOAD( "a1202.rom",    0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
-	ROM_LOAD( "a1203.rom",    0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
-	ROM_LOAD( "a1204.rom",    0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
+	ROM_LOAD( "pgm_a1200.u1",   0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
+	ROM_LOAD( "pgm_a1201.u4",   0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
+	ROM_LOAD( "pgm_a1202.u6",   0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
+	ROM_LOAD( "pgm_a1203.u8",   0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
+	ROM_LOAD( "pgm_a1204.u10",  0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1200.rom",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
-	ROM_LOAD( "b1201.rom",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
+	ROM_LOAD( "pgm_b1200.u5",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
+	ROM_LOAD( "pgm_b1201.u7",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1200.rom",    0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
+	ROM_LOAD( "pgm_m1200.u3",   0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
 ROM_END
 
 ROM_START( kov2102 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "u18.102",    0x100000, 0x400000, CRC(a2489c37) SHA1(77ea7cdec211848296dafd45bee1d042133ea2a6) ) // 12/14/00 10:33:36 V102
+	ROM_LOAD16_WORD_SWAP( "v102_u18.u18",    0x100000, 0x400000, CRC(a2489c37) SHA1(77ea7cdec211848296dafd45bee1d042133ea2a6) ) // 12/14/00 10:33:36 V102
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov2_v100_hongkong.asic", 0x000000, 0x04000,  CRC(e0d7679f) SHA1(e1c2d127eba4ddbeb8ad173c55b90ac1467e1ca8) )
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "u19.101", 0x000000, 0x200000, CRC(8c35f2fe) SHA1(d4858f97fcfad0f342fccbc9cf1590276cc3c69c) )
+	ROM_LOAD( "v101_u19.u19",   0x000000, 0x200000, CRC(8c35f2fe) SHA1(d4858f97fcfad0f342fccbc9cf1590276cc3c69c) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1200.rom",    0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
+	ROM_LOAD( "pgm_t1200.u27",  0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1200.rom",    0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
-	ROM_LOAD( "a1201.rom",    0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
-	ROM_LOAD( "a1202.rom",    0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
-	ROM_LOAD( "a1203.rom",    0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
-	ROM_LOAD( "a1204.rom",    0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
+	ROM_LOAD( "pgm_a1200.u1",   0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
+	ROM_LOAD( "pgm_a1201.u4",   0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
+	ROM_LOAD( "pgm_a1202.u6",   0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
+	ROM_LOAD( "pgm_a1203.u8",   0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
+	ROM_LOAD( "pgm_a1204.u10",  0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1200.rom",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
-	ROM_LOAD( "b1201.rom",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
+	ROM_LOAD( "pgm_b1200.u5",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
+	ROM_LOAD( "pgm_b1201.u7",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1200.rom",    0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
+	ROM_LOAD( "pgm_m1200.u3",   0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
 ROM_END
 
 ROM_START( kov2101 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "u18.101",    0x100000, 0x400000, CRC(c9926f35) SHA1(a9c72d0c5d239164107894c7d3fffe4af29ed201) ) // 12/07/00 16:40:30 V101
+	ROM_LOAD16_WORD_SWAP( "v101_u18.u18",    0x100000, 0x400000, CRC(c9926f35) SHA1(a9c72d0c5d239164107894c7d3fffe4af29ed201) ) // 12/07/00 16:40:30 V101
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov2_v100_hongkong.asic", 0x000000, 0x04000,  CRC(e0d7679f) SHA1(e1c2d127eba4ddbeb8ad173c55b90ac1467e1ca8) )
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "u19.101", 0x000000, 0x200000, CRC(8c35f2fe) SHA1(d4858f97fcfad0f342fccbc9cf1590276cc3c69c) )
+	ROM_LOAD( "v101_u19.u19",   0x000000, 0x200000, CRC(8c35f2fe) SHA1(d4858f97fcfad0f342fccbc9cf1590276cc3c69c) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1200.rom",    0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
+	ROM_LOAD( "pgm_t1200.u27",  0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1200.rom",    0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
-	ROM_LOAD( "a1201.rom",    0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
-	ROM_LOAD( "a1202.rom",    0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
-	ROM_LOAD( "a1203.rom",    0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
-	ROM_LOAD( "a1204.rom",    0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
+	ROM_LOAD( "pgm_a1200.u1",   0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
+	ROM_LOAD( "pgm_a1201.u4",   0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
+	ROM_LOAD( "pgm_a1202.u6",   0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
+	ROM_LOAD( "pgm_a1203.u8",   0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
+	ROM_LOAD( "pgm_a1204.u10",  0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1200.rom",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
-	ROM_LOAD( "b1201.rom",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
+	ROM_LOAD( "pgm_b1200.u5",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
+	ROM_LOAD( "pgm_b1201.u7",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1200.rom",    0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
+	ROM_LOAD( "pgm_m1200.u3",   0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
 ROM_END
 
 ROM_START( kov2100 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "igs_u18.rom",    0x100000, 0x400000, CRC(86205879) SHA1(f73d5b70b41d39be1cac75e474b025de2cce0b01) ) // 11/29/00 11:03:08 V100
+	ROM_LOAD16_WORD_SWAP( "v100_u18.u18",    0x100000, 0x400000, CRC(86205879) SHA1(f73d5b70b41d39be1cac75e474b025de2cce0b01) ) // 11/29/00 11:03:08 V100
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov2_v100_hongkong.asic", 0x000000, 0x04000,  CRC(e0d7679f) SHA1(e1c2d127eba4ddbeb8ad173c55b90ac1467e1ca8) )
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "u19.100", 0x000000, 0x200000,   CRC(edd59922) SHA1(09b14f20f685944a93292c83e5830849aade42c9) )
+	ROM_LOAD( "v100_u19.u19",   0x000000, 0x200000,   CRC(edd59922) SHA1(09b14f20f685944a93292c83e5830849aade42c9) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1200.rom",    0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
+	ROM_LOAD( "pgm_t1200.u27",  0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1200.rom",    0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
-	ROM_LOAD( "a1201.rom",    0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
-	ROM_LOAD( "a1202.rom",    0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
-	ROM_LOAD( "a1203.rom",    0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
-	ROM_LOAD( "a1204.rom",    0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
+	ROM_LOAD( "pgm_a1200.u1",   0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
+	ROM_LOAD( "pgm_a1201.u4",   0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
+	ROM_LOAD( "pgm_a1202.u6",   0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
+	ROM_LOAD( "pgm_a1203.u8",   0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
+	ROM_LOAD( "pgm_a1204.u10",  0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1200.rom",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
-	ROM_LOAD( "b1201.rom",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
+	ROM_LOAD( "pgm_b1200.u5",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
+	ROM_LOAD( "pgm_b1201.u7",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1200.rom",    0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
+	ROM_LOAD( "pgm_m1200.u3",   0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
 ROM_END
 
 
 ROM_START( kov2p )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "u8-27322.rom",    0x100000, 0x400000, CRC(3a2cc0de) SHA1(d7511478b34bfb03b2fb5b8268b60502d05b9414) ) // 04/25/02 17:48:27 M205XX
+	ROM_LOAD16_WORD_SWAP( "v205_32m.u8",    0x100000, 0x400000, CRC(3a2cc0de) SHA1(d7511478b34bfb03b2fb5b8268b60502d05b9414) ) // 04/25/02 17:48:27 M205XX
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov2p_igs027a_china.bin", 0x000000, 0x04000, CRC(19a0bd95) SHA1(83e9f22512832a51d41c588debe8be7adb3b1df7) )
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "v200-16.rom", 0x000000, 0x200000,  CRC(16a0c11f) SHA1(ce449cef76ebd5657d49b57951e2eb0f132e203e) )
+	ROM_LOAD( "v200_16m.u23",   0x000000, 0x200000,  CRC(16a0c11f) SHA1(ce449cef76ebd5657d49b57951e2eb0f132e203e) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1200.rom",    0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
+	ROM_LOAD( "pgm_t1200.u27",  0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1200.rom",    0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
-	ROM_LOAD( "a1201.rom",    0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
-	ROM_LOAD( "a1202.rom",    0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
-	ROM_LOAD( "a1203.rom",    0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
-	ROM_LOAD( "a1204.rom",    0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
+	ROM_LOAD( "pgm_a1200.u1",   0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
+	ROM_LOAD( "pgm_a1201.u4",   0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
+	ROM_LOAD( "pgm_a1202.u6",   0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
+	ROM_LOAD( "pgm_a1203.u8",   0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
+	ROM_LOAD( "pgm_a1204.u10",  0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1200.rom",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
-	ROM_LOAD( "b1201.rom",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
+	ROM_LOAD( "pgm_b1200.u5",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
+	ROM_LOAD( "pgm_b1201.u7",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1200.rom",    0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
+	ROM_LOAD( "pgm_m1200.u3",   0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
 ROM_END
 
 ROM_START( kov2p204 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "v204-32m.rom",    0x100000, 0x400000, CRC(583e0650) SHA1(2e5656dd9c6cba9f84af9baa3f5f70cdccf9db47) ) // 08/28/01 09:11:49 M204XX
+	ROM_LOAD16_WORD_SWAP( "v204_32m.u8",    0x100000, 0x400000, CRC(583e0650) SHA1(2e5656dd9c6cba9f84af9baa3f5f70cdccf9db47) ) // 08/28/01 09:11:49 M204XX
+
+	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
+	ROM_LOAD( "kov2p_igs027a_china.bin", 0x000000, 0x04000, CRC(19a0bd95) SHA1(83e9f22512832a51d41c588debe8be7adb3b1df7) )
+
+	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
+	ROM_LOAD( "v200_16m.u23",   0x000000, 0x200000,  CRC(16a0c11f) SHA1(ce449cef76ebd5657d49b57951e2eb0f132e203e) )
+
+	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	PGM_VIDEO_BIOS
+	ROM_LOAD( "pgm_t1200.u27",  0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
+
+	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "pgm_a1200.u1",   0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
+	ROM_LOAD( "pgm_a1201.u4",   0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
+	ROM_LOAD( "pgm_a1202.u6",   0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
+	ROM_LOAD( "pgm_a1203.u8",   0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
+	ROM_LOAD( "pgm_a1204.u10",  0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
+
+	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "pgm_b1200.u5",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
+	ROM_LOAD( "pgm_b1201.u7",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
+
+	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
+	PGM_AUDIO_BIOS
+	ROM_LOAD( "pgm_m1200.u3",   0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
+ROM_END
+
+ROM_START( kov2p203 )
+	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
+	PGM_68K_BIOS
+	ROM_LOAD16_WORD_SWAP( "v203_32m.u8",    0x100000, 0x400000, CRC(11416886) SHA1(00088165893ed0b5fb8bbac3def0edeb9ff0c4fd) ) // 08/13/01 16:57:32 M203XX
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov2p_igs027a_china.bin", 0x000000, 0x04000, CRC(19a0bd95) SHA1(83e9f22512832a51d41c588debe8be7adb3b1df7) )
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "v200-16.rom", 0x000000, 0x200000,  CRC(16a0c11f) SHA1(ce449cef76ebd5657d49b57951e2eb0f132e203e) )
+	ROM_LOAD( "v200_16m.u23",   0x000000, 0x200000,  CRC(16a0c11f) SHA1(ce449cef76ebd5657d49b57951e2eb0f132e203e) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1200.rom",    0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
+	ROM_LOAD( "pgm_t1200.u27",  0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1200.rom",    0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
-	ROM_LOAD( "a1201.rom",    0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
-	ROM_LOAD( "a1202.rom",    0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
-	ROM_LOAD( "a1203.rom",    0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
-	ROM_LOAD( "a1204.rom",    0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
+	ROM_LOAD( "pgm_a1200.u1",   0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
+	ROM_LOAD( "pgm_a1201.u4",   0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
+	ROM_LOAD( "pgm_a1202.u6",   0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
+	ROM_LOAD( "pgm_a1203.u8",   0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
+	ROM_LOAD( "pgm_a1204.u10",  0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1200.rom",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
-	ROM_LOAD( "b1201.rom",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
+	ROM_LOAD( "pgm_b1200.u5",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
+	ROM_LOAD( "pgm_b1201.u7",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1200.rom",    0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
+	ROM_LOAD( "pgm_m1200.u3",   0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
 ROM_END
 
 ROM_START( kov2p202 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "v202.bin",    0x100000, 0x400000, CRC(e9b5aa0c) SHA1(39a776c8501e8557d305cfa56c997f9adeb6bcd2) ) // 07/09/01 11:03:50 M202XX
+	ROM_LOAD16_WORD_SWAP( "v202_32m.u8",    0x100000, 0x400000, CRC(e9b5aa0c) SHA1(39a776c8501e8557d305cfa56c997f9adeb6bcd2) ) // 07/09/01 11:03:50 M202XX
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov2p_igs027a_china.bin", 0x000000, 0x04000, CRC(19a0bd95) SHA1(83e9f22512832a51d41c588debe8be7adb3b1df7) )
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "v200-16.rom", 0x000000, 0x200000,  CRC(16a0c11f) SHA1(ce449cef76ebd5657d49b57951e2eb0f132e203e) )
+	ROM_LOAD( "v200_16m.u23",   0x000000, 0x200000,  CRC(16a0c11f) SHA1(ce449cef76ebd5657d49b57951e2eb0f132e203e) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1200.rom",    0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
+	ROM_LOAD( "pgm_t1200.u27",  0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1200.rom",    0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
-	ROM_LOAD( "a1201.rom",    0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
-	ROM_LOAD( "a1202.rom",    0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
-	ROM_LOAD( "a1203.rom",    0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
-	ROM_LOAD( "a1204.rom",    0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
+	ROM_LOAD( "pgm_a1200.u1",   0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
+	ROM_LOAD( "pgm_a1201.u4",   0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
+	ROM_LOAD( "pgm_a1202.u6",   0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
+	ROM_LOAD( "pgm_a1203.u8",   0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
+	ROM_LOAD( "pgm_a1204.u10",  0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1200.rom",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
-	ROM_LOAD( "b1201.rom",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
+	ROM_LOAD( "pgm_b1200.u5",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
+	ROM_LOAD( "pgm_b1201.u7",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1200.rom",    0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
+	ROM_LOAD( "pgm_m1200.u3",   0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
 ROM_END
 
 ROM_START( kov2p200 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "v200_32m.ic8",    0x100000, 0x400000, CRC(9a09fd61) SHA1(690a0b323e1f275a08ba84febf93bf8edc2d0802) ) // 06/18/01  22:59:12 M200XX
+	ROM_LOAD16_WORD_SWAP( "v200_32m.u8",    0x100000, 0x400000, CRC(9a09fd61) SHA1(690a0b323e1f275a08ba84febf93bf8edc2d0802) ) // 06/18/01  22:59:12 M200XX
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kov2p_igs027a_china.bin", 0x000000, 0x04000, CRC(19a0bd95) SHA1(83e9f22512832a51d41c588debe8be7adb3b1df7) )
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "v200-16.rom", 0x000000, 0x200000,  CRC(16a0c11f) SHA1(ce449cef76ebd5657d49b57951e2eb0f132e203e) )
+	ROM_LOAD( "v200_16m.u23",   0x000000, 0x200000,  CRC(16a0c11f) SHA1(ce449cef76ebd5657d49b57951e2eb0f132e203e) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1200.rom",    0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
+	ROM_LOAD( "pgm_t1200.u27",  0x180000, 0x800000, CRC(d7e26609) SHA1(bdad810f82fcf1d50a8791bdc495374ec5a309c6) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1200.rom",    0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
-	ROM_LOAD( "a1201.rom",    0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
-	ROM_LOAD( "a1202.rom",    0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
-	ROM_LOAD( "a1203.rom",    0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
-	ROM_LOAD( "a1204.rom",    0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
+	ROM_LOAD( "pgm_a1200.u1",   0x0000000, 0x0800000, CRC(ceeb81d8) SHA1(5476729443fc1bc9593ae10fbf7cbc5d7290b017) )
+	ROM_LOAD( "pgm_a1201.u4",   0x0800000, 0x0800000, CRC(21063ca7) SHA1(cf561b44902425a920d5cbea5bf65dd9530b2289) )
+	ROM_LOAD( "pgm_a1202.u6",   0x1000000, 0x0800000, CRC(4bb92fae) SHA1(f0b6d72ed425de1c69dc8f8d5795ea760a4a59b0) )
+	ROM_LOAD( "pgm_a1203.u8",   0x1800000, 0x0800000, CRC(e73cb627) SHA1(4c6e48b845a5d1e8f9899010fbf273d54c2b8899) )
+	ROM_LOAD( "pgm_a1204.u10",  0x2000000, 0x0200000, CRC(14b4b5bb) SHA1(d7db5740eec971f2782fb2885ee3af8f2a796550) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1200.rom",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
-	ROM_LOAD( "b1201.rom",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
+	ROM_LOAD( "pgm_b1200.u5",   0x0000000, 0x0800000,  CRC(bed7d994) SHA1(019dfba8154256d64cd249eb0fa4c451edce34b8) )
+	ROM_LOAD( "pgm_b1201.u7",   0x0800000, 0x0800000,  CRC(f251eb57) SHA1(56a5fc14ab7822f83379cecb26638e5bb266349a) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1200.rom",    0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
+	ROM_LOAD( "pgm_m1200.u3",   0x800000, 0x800000, CRC(b0d88720) SHA1(44ab137e3f8e15b7cb5697ffbd9b1143d8210c4f) )
 ROM_END
 
 /*
@@ -2883,18 +3033,18 @@
 
 #define DDP2_COMMON_ROMS \
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */ \
-	ROM_LOAD( "v100.u23", 0x000000, 0x20000, CRC(06c3dd29) SHA1(20c9479f158467fc2037dcf162b6c6be18c91d46) ) \
+	ROM_LOAD( "v100_210.u23",   0x000000, 0x20000, CRC(06c3dd29) SHA1(20c9479f158467fc2037dcf162b6c6be18c91d46) ) \
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */ \
 	PGM_VIDEO_BIOS \
-	ROM_LOAD( "t1300.u21",    0x180000, 0x800000, CRC(e748f0cb) SHA1(5843bee3a17c33648ce904af2b98c6a90aff7393) ) \
+	ROM_LOAD( "pgm_t1300.u21",  0x180000, 0x800000, CRC(e748f0cb) SHA1(5843bee3a17c33648ce904af2b98c6a90aff7393) ) \
 	ROM_REGION16_LE( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */ \
-	ROM_LOAD( "a1300.u1",    0x0000000, 0x0800000, CRC(fc87a405) SHA1(115c21ecc56997652e527c92654076870bc9fa51) ) /* FIXED BITS (xxxxxxxx1xxxxxxx) */ \
-	ROM_LOAD( "a1301.u2",    0x0800000, 0x0800000, CRC(0c8520da) SHA1(390317857ae5baa94a4cc042874b00a811f06a63) ) /* FIXED BITS (xxxxxxxx1xxxxxxx) */ \
+	ROM_LOAD( "pgm_a1300.u1",   0x0000000, 0x0800000, CRC(fc87a405) SHA1(115c21ecc56997652e527c92654076870bc9fa51) ) /* FIXED BITS (xxxxxxxx1xxxxxxx) */ \
+	ROM_LOAD( "pgm_a1301.u2",   0x0800000, 0x0800000, CRC(0c8520da) SHA1(390317857ae5baa94a4cc042874b00a811f06a63) ) /* FIXED BITS (xxxxxxxx1xxxxxxx) */ \
 	ROM_REGION16_LE( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */ \
-	ROM_LOAD( "b1300.u7",    0x0000000, 0x0800000,  CRC(ef646604) SHA1(d737ff513792962f18df88c2caa9dd71de449079) ) \
+	ROM_LOAD( "pgm_b1300.u7",   0x0000000, 0x0800000,  CRC(ef646604) SHA1(d737ff513792962f18df88c2caa9dd71de449079) ) \
 	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */ \
 	PGM_AUDIO_BIOS \
-	ROM_LOAD( "m1300.u5",    0x400000, 0x400000, CRC(82d4015d) SHA1(d4cdc1aec1c97cf23ff7a20ccaad822962e66ffa) )
+	ROM_LOAD( "pgm_m1300.u5",   0x400000, 0x400000, CRC(82d4015d) SHA1(d4cdc1aec1c97cf23ff7a20ccaad822962e66ffa) )
 
 #define DDP2_PROGRAM_102 \
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */ \
@@ -3045,58 +3195,87 @@
 */
 
 ROM_START( dw2001 )
+	/* All ROMs labels are on stickers */
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "2001.u22", 0x100000, 0x80000, CRC(5cabed92) SHA1(d513e353c5c4695b16228e0bda9388c396aa4a81) ) // 02/21/01 16:05:16
+	ROM_LOAD16_WORD_SWAP( "dw2001_u22.u22", 0x100000, 0x80000, CRC(5cabed92) SHA1(d513e353c5c4695b16228e0bda9388c396aa4a81) ) // 02/21/01 16:05:16
 
 	ROM_REGION( 0x4000, "prot", ROMREGION_ERASEFF ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "dw2001_igs027a_japan.bin", 0x000000, 0x04000, CRC(3a79159b) SHA1(0d693c798ce24c6a749669be8c7b1e4633409e49) )
 
 	ROM_REGION32_LE( 0x4000000, "user1", ROMREGION_ERASEFF )
-	ROM_LOAD( "2001.u12", 0x000000, 0x80000, CRC(973db1ab) SHA1(cc35e1a8534fa5d59d888f530769bae4e08c62ca) ) // external ARM data rom (encrypted)
+	ROM_LOAD( "dw2001_u12.u12", 0x000000, 0x80000, CRC(973db1ab) SHA1(cc35e1a8534fa5d59d888f530769bae4e08c62ca) ) // external ARM data rom (encrypted)
 
 	ROM_REGION( 0x500000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "2001.u11",    0x180000, 0x200000, CRC(b27cf093) SHA1(7c5736a3d72b89742da1c92b2604d66e48b95e56) )
+	ROM_LOAD( "dw2001_u11.u11",    0x180000, 0x200000, CRC(b27cf093) SHA1(7c5736a3d72b89742da1c92b2604d66e48b95e56) )
 
 	ROM_REGION16_LE( 0x0400000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "2001.u2",    0x000000, 0x200000, CRC(d11c733c) SHA1(8faad32e8e215631a2263bdd51a9ae434540d028) )
-	ROM_LOAD( "2001.u3",    0x200000, 0x200000, CRC(1435aef2) SHA1(582eb9f6415c89418401be7ebad041adeb600515) )
+	ROM_LOAD( "dw2001_u2.u2",    0x000000, 0x200000, CRC(d11c733c) SHA1(8faad32e8e215631a2263bdd51a9ae434540d028) )
+	ROM_LOAD( "dw2001_u3.u3",    0x200000, 0x200000, CRC(1435aef2) SHA1(582eb9f6415c89418401be7ebad041adeb600515) )
 
 	ROM_REGION16_LE( 0x0200000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "2001.u9",    0x000000, 0x200000, CRC(ccbca572) SHA1(4d3512e82cb65e5cdfcc6cb18deec9f4a6dd350a) )
+	ROM_LOAD( "dw2001_u9.u9",    0x000000, 0x200000, CRC(ccbca572) SHA1(4d3512e82cb65e5cdfcc6cb18deec9f4a6dd350a) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "2001.u7",      0x200000, 0x200000, CRC(4ea62f21) SHA1(318f8a1ff5d4ff029a1c4133fe7acc2fc185d112) )
+	ROM_LOAD( "dw2001_u7.u7",      0x200000, 0x200000, CRC(4ea62f21) SHA1(318f8a1ff5d4ff029a1c4133fe7acc2fc185d112) )
 ROM_END
 
-
 ROM_START( dwpc )
+	/* All ROMs labels are on stickers */
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "dwpc_v101jp.u22", 0x100000, 0x80000, CRC(b93027c0) SHA1(602e5f651ccb63e6465ebd7762d8d2dcf7d54077) ) // 09/26/01 10:23:26
+	ROM_LOAD16_WORD_SWAP( "dwpc_v110cn_u22.u22", 0x100000, 0x80000, CRC(64f22362) SHA1(5f7c58498ae5cbec1c36eaa65c75287c36b6bd52) ) // 03/19/02 11:13:16
+
+	ROM_REGION( 0x4000, "prot", ROMREGION_ERASEFF ) /* ARM protection ASIC - internal rom */
+	ROM_LOAD( "dw2001_igs027a_japan.bin", 0x000000, 0x04000, BAD_DUMP CRC(3a79159b) SHA1(0d693c798ce24c6a749669be8c7b1e4633409e49) ) // this was dumped for the Japanese version
+
+	ROM_REGION32_LE( 0x4000000, "user1", ROMREGION_ERASEFF )
+	ROM_LOAD( "dwpc_v110cn_u12.u12", 0x000000, 0x80000, CRC(5bb1ee6a) SHA1(7844e7eb8c10a5aeb18c6057d9dc2fee7ff822ba) ) // external ARM data rom (encrypted)
+
+	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	PGM_VIDEO_BIOS
+	ROM_LOAD( "dwpc_v110cn_u11.u11",    0x180000, 0x400000, CRC(db219cb8) SHA1(8af5a8dac8db93a7720675c64212293d7eab106d) )
+
+	ROM_REGION16_LE( 0x0400000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "dwpc_v101xx_u2.u2",    0x000000, 0x200000, CRC(48b2f407) SHA1(9b3c0f315805aaca72c9dc3a35406f775856a8bb) )
+	ROM_LOAD( "dwpc_v101xx_u3.u3",    0x200000, 0x200000, CRC(3bb45a97) SHA1(5c5cd5a241ed25dbb83690cb879472b60cd03260) )
+
+	ROM_REGION16_LE( 0x0200000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "dwpc_v101xx_u9.u9",    0x000000, 0x200000, CRC(481b89b1) SHA1(6a241dc3b4a53ce320f3f17e972ffffe46adda4f) )
+
+	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
+	PGM_AUDIO_BIOS
+	ROM_LOAD( "dwpc_v101xx_u7.u7",      0x200000, 0x200000, CRC(5cf9bada) SHA1(c5868a31e09e6909c724411a402d8964c29584fc) )
+ROM_END
+
+ROM_START( dwpc101j )
+	/* All ROMs labels are on stickers */
+	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
+	PGM_68K_BIOS
+	ROM_LOAD16_WORD_SWAP( "dwpc_v101jp_u22.u22", 0x100000, 0x80000, CRC(b93027c0) SHA1(602e5f651ccb63e6465ebd7762d8d2dcf7d54077) ) // 09/26/01 10:23:26
 
 	ROM_REGION( 0x4000, "prot", ROMREGION_ERASEFF ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "dw2001_igs027a_japan.bin", 0x000000, 0x04000, CRC(3a79159b) SHA1(0d693c798ce24c6a749669be8c7b1e4633409e49) )
 
 	ROM_REGION32_LE( 0x4000000, "user1", ROMREGION_ERASEFF )
-	ROM_LOAD( "dwpc_v100jp.u12", 0x000000, 0x80000, CRC(0d112126) SHA1(2b569b8ef974d1d9906cc052eee63b869c8d4fa4) ) // external ARM data rom (encrypted)
+	ROM_LOAD( "dwpc_v100jp_u12.u12", 0x000000, 0x80000, CRC(0d112126) SHA1(2b569b8ef974d1d9906cc052eee63b869c8d4fa4) ) // external ARM data rom (encrypted)
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "dwpc_v100jp.u11",    0x180000, 0x400000, CRC(3aa5a787) SHA1(ef7bb83f7141b24621c86237244fd9f280923ed1) )
+	ROM_LOAD( "dwpc_v100jp_u11.u11",    0x180000, 0x400000, CRC(3aa5a787) SHA1(ef7bb83f7141b24621c86237244fd9f280923ed1) )
 
 	ROM_REGION16_LE( 0x0400000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "dwpc_v100jp.u2",    0x000000, 0x200000, CRC(e7115763) SHA1(f1bf06e9434a3b962166849f51b9dc3a74d7f2a4) )
-	ROM_LOAD( "dwpc_v100jp.u3",    0x200000, 0x200000, CRC(49c184a4) SHA1(320504adf596c38db56247e9cef02e7c7a363ccb) )
+	ROM_LOAD( "dwpc_v100jp_u2.u2",    0x000000, 0x200000, CRC(e7115763) SHA1(f1bf06e9434a3b962166849f51b9dc3a74d7f2a4) )
+	ROM_LOAD( "dwpc_v100jp_u3.u3",    0x200000, 0x200000, CRC(49c184a4) SHA1(320504adf596c38db56247e9cef02e7c7a363ccb) )
 
 	ROM_REGION16_LE( 0x0200000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "dwpc_v100jp.u9",    0x000000, 0x200000, CRC(412b9913) SHA1(52fc42a966575e02991aa92382b855744f44854a) )
+	ROM_LOAD( "dwpc_v100jp_u9.u9",    0x000000, 0x200000, CRC(412b9913) SHA1(52fc42a966575e02991aa92382b855744f44854a) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "dwpc_v100jp.u7",      0x200000, 0x200000, CRC(5cf9bada) SHA1(c5868a31e09e6909c724411a402d8964c29584fc) )
+	ROM_LOAD( "dwpc_v100jp_u7.u7",      0x200000, 0x200000, CRC(5cf9bada) SHA1(c5868a31e09e6909c724411a402d8964c29584fc) )
 ROM_END
 
 /*
@@ -3156,24 +3335,24 @@
 ROM_START( puzzli2 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "v100.u5",     0x100000, 0x200000, CRC(1abb4595) SHA1(860bb49efc3cb55b6b9846f5ab787d6fd586432d) ) // PUZZLI-2 V0001
+	ROM_LOAD16_WORD_SWAP( "v100_u5.u5",     0x100000, 0x200000, CRC(1abb4595) SHA1(860bb49efc3cb55b6b9846f5ab787d6fd586432d) ) // PUZZLI-2 V0001
 
 	ROM_REGION( 0x4000, "prot", ROMREGION_ERASEFF ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "puzzli2_igs027a.bin", 0x000000, 0x04000, NO_DUMP )
 
 	ROM_REGION( 0x500000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0900.u9",    0x180000, 0x200000, CRC(70615611) SHA1(a46d4aa71396947b427f9ba4ba0e636876c09d6b) )
+	ROM_LOAD( "pgm_t0900.u9",    0x180000, 0x200000, CRC(70615611) SHA1(a46d4aa71396947b427f9ba4ba0e636876c09d6b) )
 
 	ROM_REGION16_LE( 0x0400000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0900.u3",    0x0000000, 0x0400000, CRC(14911251) SHA1(e0d10ef50c408dbcf0907f81d4f0e49aeb651a6c) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0900.u3",    0x0000000, 0x0400000, CRC(14911251) SHA1(e0d10ef50c408dbcf0907f81d4f0e49aeb651a6c) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
 
 	ROM_REGION16_LE( 0x0200000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0900.u4",    0x0000000, 0x0200000,  CRC(6f0638b6) SHA1(14b315fe9e80b3314bb63487e6ea9ce04c9703bd) )
+	ROM_LOAD( "pgm_b0900.u4",    0x0000000, 0x0200000,  CRC(6f0638b6) SHA1(14b315fe9e80b3314bb63487e6ea9ce04c9703bd) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0900.u2",    0x400000, 0x400000, CRC(9ea7af2e) SHA1(d2593d391a93c5cf5a554750c32886dea6599b3d) )
+	ROM_LOAD( "pgm_m0900.u2",    0x400000, 0x400000, CRC(9ea7af2e) SHA1(d2593d391a93c5cf5a554750c32886dea6599b3d) )
 ROM_END
 
 
@@ -3188,17 +3367,17 @@
 
 	ROM_REGION( 0x500000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0900.u9",    0x180000, 0x200000, CRC(70615611) SHA1(a46d4aa71396947b427f9ba4ba0e636876c09d6b) )
+	ROM_LOAD( "pgm_t0900.u9",    0x180000, 0x200000, CRC(70615611) SHA1(a46d4aa71396947b427f9ba4ba0e636876c09d6b) )
 
 	ROM_REGION16_LE( 0x0400000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0900.u3",    0x0000000, 0x0400000, CRC(14911251) SHA1(e0d10ef50c408dbcf0907f81d4f0e49aeb651a6c) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0900.u3",    0x0000000, 0x0400000, CRC(14911251) SHA1(e0d10ef50c408dbcf0907f81d4f0e49aeb651a6c) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
 
 	ROM_REGION16_LE( 0x0200000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0900.u4",    0x0000000, 0x0200000,  CRC(6f0638b6) SHA1(14b315fe9e80b3314bb63487e6ea9ce04c9703bd) )
+	ROM_LOAD( "pgm_b0900.u4",    0x0000000, 0x0200000,  CRC(6f0638b6) SHA1(14b315fe9e80b3314bb63487e6ea9ce04c9703bd) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0900.u2",    0x400000, 0x400000, CRC(9ea7af2e) SHA1(d2593d391a93c5cf5a554750c32886dea6599b3d) )
+	ROM_LOAD( "pgm_m0900.u2",    0x400000, 0x400000, CRC(9ea7af2e) SHA1(d2593d391a93c5cf5a554750c32886dea6599b3d) )
 ROM_END
 
 
@@ -3270,30 +3449,30 @@
 	ROM_LOAD( "martial_masters_v102_usa.asic", 0x000000, 0x04000, CRC(a6c0828c) SHA1(0a5bda56dca264c3c7ff7698b8f699563f203c4d) ) // not verified, could be bad
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "v102_16m.u10", 0x000000, 0x200000,  CRC(18b745e6) SHA1(7bcb58dd3a2d6072f492cf0dd7181cb061c1f49d) )
+	ROM_LOAD( "v102_16m.u10",    0x000000, 0x200000,  CRC(18b745e6) SHA1(7bcb58dd3a2d6072f492cf0dd7181cb061c1f49d) ) // maybe incorrect size, probably needs redump
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1000.u3",    0x180000, 0x800000, CRC(bbf879b5) SHA1(bd9a6aea34ad4001e89e62ff4b7a2292eb833c00) )
+	ROM_LOAD( "pgm_t1000.u3",    0x180000, 0x800000, CRC(bbf879b5) SHA1(bd9a6aea34ad4001e89e62ff4b7a2292eb833c00) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1000.u3",    0x0000000, 0x0800000, CRC(43577ac8) SHA1(6eea8b455985d5bac74dcc9943cdc3c0902de6cc) )
-	ROM_LOAD( "a1001.u4",    0x0800000, 0x0800000, CRC(fe7a476f) SHA1(a8c7f1f0dd3e53141aed6d927eb88a3ceebb81e4) )
-	ROM_LOAD( "a1002.u6",    0x1000000, 0x0800000, CRC(62e33d38) SHA1(96163d583e25073594f8413ce263e56b66bd69a1) )
-	ROM_LOAD( "a1003.u8",    0x1800000, 0x0800000, CRC(b2c4945a) SHA1(7b18287a2db56db3651cfd4deb607af53522fefd) )
-	ROM_LOAD( "a1004.u10",   0x2000000, 0x0400000, CRC(9fd3f5fd) SHA1(057531f91062be51589c6cf8f4170089b9be6380) )
+	ROM_LOAD( "pgm_a1000.u3",    0x0000000, 0x0800000, CRC(43577ac8) SHA1(6eea8b455985d5bac74dcc9943cdc3c0902de6cc) )
+	ROM_LOAD( "pgm_a1001.u4",    0x0800000, 0x0800000, CRC(fe7a476f) SHA1(a8c7f1f0dd3e53141aed6d927eb88a3ceebb81e4) )
+	ROM_LOAD( "pgm_a1002.u6",    0x1000000, 0x0800000, CRC(62e33d38) SHA1(96163d583e25073594f8413ce263e56b66bd69a1) )
+	ROM_LOAD( "pgm_a1003.u8",    0x1800000, 0x0800000, CRC(b2c4945a) SHA1(7b18287a2db56db3651cfd4deb607af53522fefd) )
+	ROM_LOAD( "pgm_a1004.u10",   0x2000000, 0x0400000, CRC(9fd3f5fd) SHA1(057531f91062be51589c6cf8f4170089b9be6380) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1000.u9",    0x0000000, 0x0800000,  CRC(c5961f6f) SHA1(a68060b10edbd084cbde79d2ed1c9084777beb10) )
-	ROM_LOAD( "b1001.u11",   0x0800000, 0x0800000,  CRC(0b7e1c06) SHA1(545e15e0087f8621d593fecd8b4013f7ca311686) )
+	ROM_LOAD( "pgm_b1000.u9",    0x0000000, 0x0800000,  CRC(c5961f6f) SHA1(a68060b10edbd084cbde79d2ed1c9084777beb10) )
+	ROM_LOAD( "pgm_b1001.u11",   0x0800000, 0x0800000,  CRC(0b7e1c06) SHA1(545e15e0087f8621d593fecd8b4013f7ca311686) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1000.u5",    0x400000, 0x800000, CRC(ed407ae8) SHA1(a6e9c09b39c13e8fb7fbc89fa9f823cbeb66e901) )
-	ROM_LOAD( "m1001.u7",    0xc00000, 0x400000, CRC(662d2d48) SHA1(2fcc3099d9c04456cae3b13035fb28eaf709e7d8) )
+	ROM_LOAD( "pgm_m1000.u5",    0x400000, 0x800000, CRC(ed407ae8) SHA1(a6e9c09b39c13e8fb7fbc89fa9f823cbeb66e901) )
+	ROM_LOAD( "pgm_m1001.u7",    0xc00000, 0x400000, CRC(662d2d48) SHA1(2fcc3099d9c04456cae3b13035fb28eaf709e7d8) )
 ROM_END
 
-ROM_START( martmastc )
+ROM_START( martmast104c )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
 	ROM_LOAD16_WORD_SWAP( "v104_32m.u9",    0x100000, 0x400000, CRC(cfd9dff4) SHA1(328eaf6ac49a73265ee4e0f992b1b1312f49877b) )
@@ -3302,30 +3481,30 @@
 	ROM_LOAD( "martial_masters_v101_cn.asic", 0x000000, 0x04000, CRC(b3e25b7d) SHA1(6147d7ee2e11636521df1bb96ed5da8ad21b2a57) ) // not verified, could be bad
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "v102_16m.u10", 0x000000, 0x200000,  CRC(18b745e6) SHA1(7bcb58dd3a2d6072f492cf0dd7181cb061c1f49d) )
+	ROM_LOAD( "v102_16m.u10",    0x000000, 0x200000,  CRC(18b745e6) SHA1(7bcb58dd3a2d6072f492cf0dd7181cb061c1f49d) ) // maybe incorrect size, probably needs redump
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1000.u3",    0x180000, 0x800000, CRC(bbf879b5) SHA1(bd9a6aea34ad4001e89e62ff4b7a2292eb833c00) )
+	ROM_LOAD( "pgm_t1000.u3",    0x180000, 0x800000, CRC(bbf879b5) SHA1(bd9a6aea34ad4001e89e62ff4b7a2292eb833c00) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1000.u3",    0x0000000, 0x0800000, CRC(43577ac8) SHA1(6eea8b455985d5bac74dcc9943cdc3c0902de6cc) )
-	ROM_LOAD( "a1001.u4",    0x0800000, 0x0800000, CRC(fe7a476f) SHA1(a8c7f1f0dd3e53141aed6d927eb88a3ceebb81e4) )
-	ROM_LOAD( "a1002.u6",    0x1000000, 0x0800000, CRC(62e33d38) SHA1(96163d583e25073594f8413ce263e56b66bd69a1) )
-	ROM_LOAD( "a1003.u8",    0x1800000, 0x0800000, CRC(b2c4945a) SHA1(7b18287a2db56db3651cfd4deb607af53522fefd) )
-	ROM_LOAD( "a1004.u10",   0x2000000, 0x0400000, CRC(9fd3f5fd) SHA1(057531f91062be51589c6cf8f4170089b9be6380) )
+	ROM_LOAD( "pgm_a1000.u3",    0x0000000, 0x0800000, CRC(43577ac8) SHA1(6eea8b455985d5bac74dcc9943cdc3c0902de6cc) )
+	ROM_LOAD( "pgm_a1001.u4",    0x0800000, 0x0800000, CRC(fe7a476f) SHA1(a8c7f1f0dd3e53141aed6d927eb88a3ceebb81e4) )
+	ROM_LOAD( "pgm_a1002.u6",    0x1000000, 0x0800000, CRC(62e33d38) SHA1(96163d583e25073594f8413ce263e56b66bd69a1) )
+	ROM_LOAD( "pgm_a1003.u8",    0x1800000, 0x0800000, CRC(b2c4945a) SHA1(7b18287a2db56db3651cfd4deb607af53522fefd) )
+	ROM_LOAD( "pgm_a1004.u10",   0x2000000, 0x0400000, CRC(9fd3f5fd) SHA1(057531f91062be51589c6cf8f4170089b9be6380) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1000.u9",    0x0000000, 0x0800000,  CRC(c5961f6f) SHA1(a68060b10edbd084cbde79d2ed1c9084777beb10) )
-	ROM_LOAD( "b1001.u11",   0x0800000, 0x0800000,  CRC(0b7e1c06) SHA1(545e15e0087f8621d593fecd8b4013f7ca311686) )
+	ROM_LOAD( "pgm_b1000.u9",    0x0000000, 0x0800000,  CRC(c5961f6f) SHA1(a68060b10edbd084cbde79d2ed1c9084777beb10) )
+	ROM_LOAD( "pgm_b1001.u11",   0x0800000, 0x0800000,  CRC(0b7e1c06) SHA1(545e15e0087f8621d593fecd8b4013f7ca311686) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1000.u5",    0x400000, 0x800000, CRC(ed407ae8) SHA1(a6e9c09b39c13e8fb7fbc89fa9f823cbeb66e901) )
-	ROM_LOAD( "m1001.u7",    0xc00000, 0x400000, CRC(662d2d48) SHA1(2fcc3099d9c04456cae3b13035fb28eaf709e7d8) )
+	ROM_LOAD( "pgm_m1000.u5",    0x400000, 0x800000, CRC(ed407ae8) SHA1(a6e9c09b39c13e8fb7fbc89fa9f823cbeb66e901) )
+	ROM_LOAD( "pgm_m1001.u7",    0xc00000, 0x400000, CRC(662d2d48) SHA1(2fcc3099d9c04456cae3b13035fb28eaf709e7d8) )
 ROM_END
 
-ROM_START( martmastc103 )
+ROM_START( martmast103c )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
 	ROM_LOAD16_WORD_SWAP( "v103_32m.u9",    0x100000, 0x400000, CRC(df5ffbe9) SHA1(cd37900b3741707f81077ca07565997031409131) )
@@ -3334,63 +3513,63 @@
 	ROM_LOAD( "martial_masters_v101_cn.asic", 0x000000, 0x04000, CRC(b3e25b7d) SHA1(6147d7ee2e11636521df1bb96ed5da8ad21b2a57) ) // v102 on the PCB the maincpu ROM was dumped from. v102 Chinese ASIC hasn't been dumped yet.
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "v102_16m.u10", 0x000000, 0x200000,  CRC(18b745e6) SHA1(7bcb58dd3a2d6072f492cf0dd7181cb061c1f49d) )
+	ROM_LOAD( "v102_16m.u10",    0x000000, 0x200000,  CRC(18b745e6) SHA1(7bcb58dd3a2d6072f492cf0dd7181cb061c1f49d) ) // maybe incorrect size, probably needs redump
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1000.u3",    0x180000, 0x800000, CRC(bbf879b5) SHA1(bd9a6aea34ad4001e89e62ff4b7a2292eb833c00) )
+	ROM_LOAD( "pgm_t1000.u3",    0x180000, 0x800000, CRC(bbf879b5) SHA1(bd9a6aea34ad4001e89e62ff4b7a2292eb833c00) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1000.u3",    0x0000000, 0x0800000, CRC(43577ac8) SHA1(6eea8b455985d5bac74dcc9943cdc3c0902de6cc) )
-	ROM_LOAD( "a1001.u4",    0x0800000, 0x0800000, CRC(fe7a476f) SHA1(a8c7f1f0dd3e53141aed6d927eb88a3ceebb81e4) )
-	ROM_LOAD( "a1002.u6",    0x1000000, 0x0800000, CRC(62e33d38) SHA1(96163d583e25073594f8413ce263e56b66bd69a1) )
-	ROM_LOAD( "a1003.u8",    0x1800000, 0x0800000, CRC(b2c4945a) SHA1(7b18287a2db56db3651cfd4deb607af53522fefd) )
-	ROM_LOAD( "a1004.u10",   0x2000000, 0x0400000, CRC(9fd3f5fd) SHA1(057531f91062be51589c6cf8f4170089b9be6380) )
+	ROM_LOAD( "pgm_a1000.u3",    0x0000000, 0x0800000, CRC(43577ac8) SHA1(6eea8b455985d5bac74dcc9943cdc3c0902de6cc) )
+	ROM_LOAD( "pgm_a1001.u4",    0x0800000, 0x0800000, CRC(fe7a476f) SHA1(a8c7f1f0dd3e53141aed6d927eb88a3ceebb81e4) )
+	ROM_LOAD( "pgm_a1002.u6",    0x1000000, 0x0800000, CRC(62e33d38) SHA1(96163d583e25073594f8413ce263e56b66bd69a1) )
+	ROM_LOAD( "pgm_a1003.u8",    0x1800000, 0x0800000, CRC(b2c4945a) SHA1(7b18287a2db56db3651cfd4deb607af53522fefd) )
+	ROM_LOAD( "pgm_a1004.u10",   0x2000000, 0x0400000, CRC(9fd3f5fd) SHA1(057531f91062be51589c6cf8f4170089b9be6380) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1000.u9",    0x0000000, 0x0800000,  CRC(c5961f6f) SHA1(a68060b10edbd084cbde79d2ed1c9084777beb10) )
-	ROM_LOAD( "b1001.u11",   0x0800000, 0x0800000,  CRC(0b7e1c06) SHA1(545e15e0087f8621d593fecd8b4013f7ca311686) )
+	ROM_LOAD( "pgm_b1000.u9",    0x0000000, 0x0800000,  CRC(c5961f6f) SHA1(a68060b10edbd084cbde79d2ed1c9084777beb10) )
+	ROM_LOAD( "pgm_b1001.u11",   0x0800000, 0x0800000,  CRC(0b7e1c06) SHA1(545e15e0087f8621d593fecd8b4013f7ca311686) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1000.u5",    0x400000, 0x800000, CRC(ed407ae8) SHA1(a6e9c09b39c13e8fb7fbc89fa9f823cbeb66e901) )
-	ROM_LOAD( "m1001.u7",    0xc00000, 0x400000, CRC(662d2d48) SHA1(2fcc3099d9c04456cae3b13035fb28eaf709e7d8) )
+	ROM_LOAD( "pgm_m1000.u5",    0x400000, 0x800000, CRC(ed407ae8) SHA1(a6e9c09b39c13e8fb7fbc89fa9f823cbeb66e901) )
+	ROM_LOAD( "pgm_m1001.u7",    0xc00000, 0x400000, CRC(662d2d48) SHA1(2fcc3099d9c04456cae3b13035fb28eaf709e7d8) )
 ROM_END
 
-ROM_START( martmastc102 )
+ROM_START( martmast102c )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "martmast_u9-v102.322",    0x100000, 0x400000, CRC(bb24b92a) SHA1(442cb9e3f51727be82f71c078c5c3e49dc1a23f0) )
+	ROM_LOAD16_WORD_SWAP( "mm_v102_u9.u9",    0x100000, 0x400000, CRC(bb24b92a) SHA1(442cb9e3f51727be82f71c078c5c3e49dc1a23f0) )
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "martial_masters_v101_cn.asic", 0x000000, 0x04000, CRC(b3e25b7d) SHA1(6147d7ee2e11636521df1bb96ed5da8ad21b2a57) ) // not verified, could be bad
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "martmast_u10-v101.160", 0x000000, 0x200000,   CRC(d5d93294) SHA1(58d0a99749f7dc05814892b508ce21b160410947) )
+	ROM_LOAD( "mm_v101_u10.u10", 0x000000, 0x400000,   CRC(41b9497c) SHA1(a941abbb938fb769112eaad374cc513a71aaa556) ) // double size wrt to other sets
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1000.u3",    0x180000, 0x800000, CRC(bbf879b5) SHA1(bd9a6aea34ad4001e89e62ff4b7a2292eb833c00) )
+	ROM_LOAD( "pgm_t1000.u3",    0x180000, 0x800000, CRC(bbf879b5) SHA1(bd9a6aea34ad4001e89e62ff4b7a2292eb833c00) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1000.u3",    0x0000000, 0x0800000, CRC(43577ac8) SHA1(6eea8b455985d5bac74dcc9943cdc3c0902de6cc) )
-	ROM_LOAD( "a1001.u4",    0x0800000, 0x0800000, CRC(fe7a476f) SHA1(a8c7f1f0dd3e53141aed6d927eb88a3ceebb81e4) )
-	ROM_LOAD( "a1002.u6",    0x1000000, 0x0800000, CRC(62e33d38) SHA1(96163d583e25073594f8413ce263e56b66bd69a1) )
-	ROM_LOAD( "a1003.u8",    0x1800000, 0x0800000, CRC(b2c4945a) SHA1(7b18287a2db56db3651cfd4deb607af53522fefd) )
-	ROM_LOAD( "a1004.u10",   0x2000000, 0x0400000, CRC(9fd3f5fd) SHA1(057531f91062be51589c6cf8f4170089b9be6380) )
+	ROM_LOAD( "pgm_a1000.u3",    0x0000000, 0x0800000, CRC(43577ac8) SHA1(6eea8b455985d5bac74dcc9943cdc3c0902de6cc) )
+	ROM_LOAD( "pgm_a1001.u4",    0x0800000, 0x0800000, CRC(fe7a476f) SHA1(a8c7f1f0dd3e53141aed6d927eb88a3ceebb81e4) )
+	ROM_LOAD( "pgm_a1002.u6",    0x1000000, 0x0800000, CRC(62e33d38) SHA1(96163d583e25073594f8413ce263e56b66bd69a1) )
+	ROM_LOAD( "pgm_a1003.u8",    0x1800000, 0x0800000, CRC(b2c4945a) SHA1(7b18287a2db56db3651cfd4deb607af53522fefd) )
+	ROM_LOAD( "pgm_a1004.u10",   0x2000000, 0x0400000, CRC(9fd3f5fd) SHA1(057531f91062be51589c6cf8f4170089b9be6380) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1000.u9",    0x0000000, 0x0800000,  CRC(c5961f6f) SHA1(a68060b10edbd084cbde79d2ed1c9084777beb10) )
-	ROM_LOAD( "b1001.u11",   0x0800000, 0x0800000,  CRC(0b7e1c06) SHA1(545e15e0087f8621d593fecd8b4013f7ca311686) )
+	ROM_LOAD( "pgm_b1000.u9",    0x0000000, 0x0800000,  CRC(c5961f6f) SHA1(a68060b10edbd084cbde79d2ed1c9084777beb10) )
+	ROM_LOAD( "pgm_b1001.u11",   0x0800000, 0x0800000,  CRC(0b7e1c06) SHA1(545e15e0087f8621d593fecd8b4013f7ca311686) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1000.u5",    0x400000, 0x800000, CRC(ed407ae8) SHA1(a6e9c09b39c13e8fb7fbc89fa9f823cbeb66e901) )
-	ROM_LOAD( "m1001.u7",    0xc00000, 0x400000, CRC(662d2d48) SHA1(2fcc3099d9c04456cae3b13035fb28eaf709e7d8) )
+	ROM_LOAD( "pgm_m1000.u5",    0x400000, 0x800000, CRC(ed407ae8) SHA1(a6e9c09b39c13e8fb7fbc89fa9f823cbeb66e901) )
+	ROM_LOAD( "pgm_m1001.u7",    0xc00000, 0x400000, CRC(662d2d48) SHA1(2fcc3099d9c04456cae3b13035fb28eaf709e7d8) )
 ROM_END
 
 /*
-Only the ROMs at U9 and U10 were dumped.
+Only the ROMs at U9 and U10 were dumped. According to FBNeo they could be bad dumps.
 
 U9 and U10 are not standard EPROMs, instead they are 27C322 adapter boards with an SMD OKI 27C3202 TSOP.
 */
@@ -3398,33 +3577,33 @@
 ROM_START( martmasttw )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "mm_v102_u9.bin",    0x100000, 0x400000, CRC(7eb41ed4) SHA1(7df7789db8f9110fe747f41e193b4a28096018e7) )
+	ROM_LOAD16_WORD_SWAP( "mm_v102_u9.u9",    0x100000, 0x400000, CRC(7eb41ed4) SHA1(7df7789db8f9110fe747f41e193b4a28096018e7) )
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "martial_masters_v101_tw.asic", 0x000000, 0x04000, NO_DUMP )
 
 	ROM_REGION32_LE( 0x400000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "mm_v101_u10.bin", 0x000000, 0x400000,   CRC(917beb91) SHA1(0d867d8382518197ac98522bfc69063042db9890) ) // double size wrt to other sets
+	ROM_LOAD( "mm_v101_u10.u10", 0x000000, 0x400000,   CRC(917beb91) SHA1(0d867d8382518197ac98522bfc69063042db9890) ) // double size wrt to other sets
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t1000.u3",    0x180000, 0x800000, CRC(bbf879b5) SHA1(bd9a6aea34ad4001e89e62ff4b7a2292eb833c00) )
+	ROM_LOAD( "pgm_t1000.u3",    0x180000, 0x800000, CRC(bbf879b5) SHA1(bd9a6aea34ad4001e89e62ff4b7a2292eb833c00) )
 
 	ROM_REGION16_LE( 0x4000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a1000.u3",    0x0000000, 0x0800000, CRC(43577ac8) SHA1(6eea8b455985d5bac74dcc9943cdc3c0902de6cc) )
-	ROM_LOAD( "a1001.u4",    0x0800000, 0x0800000, CRC(fe7a476f) SHA1(a8c7f1f0dd3e53141aed6d927eb88a3ceebb81e4) )
-	ROM_LOAD( "a1002.u6",    0x1000000, 0x0800000, CRC(62e33d38) SHA1(96163d583e25073594f8413ce263e56b66bd69a1) )
-	ROM_LOAD( "a1003.u8",    0x1800000, 0x0800000, CRC(b2c4945a) SHA1(7b18287a2db56db3651cfd4deb607af53522fefd) )
-	ROM_LOAD( "a1004.u10",   0x2000000, 0x0400000, CRC(9fd3f5fd) SHA1(057531f91062be51589c6cf8f4170089b9be6380) )
+	ROM_LOAD( "pgm_a1000.u3",    0x0000000, 0x0800000, CRC(43577ac8) SHA1(6eea8b455985d5bac74dcc9943cdc3c0902de6cc) )
+	ROM_LOAD( "pgm_a1001.u4",    0x0800000, 0x0800000, CRC(fe7a476f) SHA1(a8c7f1f0dd3e53141aed6d927eb88a3ceebb81e4) )
+	ROM_LOAD( "pgm_a1002.u6",    0x1000000, 0x0800000, CRC(62e33d38) SHA1(96163d583e25073594f8413ce263e56b66bd69a1) )
+	ROM_LOAD( "pgm_a1003.u8",    0x1800000, 0x0800000, CRC(b2c4945a) SHA1(7b18287a2db56db3651cfd4deb607af53522fefd) )
+	ROM_LOAD( "pgm_a1004.u10",   0x2000000, 0x0400000, CRC(9fd3f5fd) SHA1(057531f91062be51589c6cf8f4170089b9be6380) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b1000.u9",    0x0000000, 0x0800000,  CRC(c5961f6f) SHA1(a68060b10edbd084cbde79d2ed1c9084777beb10) )
-	ROM_LOAD( "b1001.u11",   0x0800000, 0x0800000,  CRC(0b7e1c06) SHA1(545e15e0087f8621d593fecd8b4013f7ca311686) )
+	ROM_LOAD( "pgm_b1000.u9",    0x0000000, 0x0800000,  CRC(c5961f6f) SHA1(a68060b10edbd084cbde79d2ed1c9084777beb10) )
+	ROM_LOAD( "pgm_b1001.u11",   0x0800000, 0x0800000,  CRC(0b7e1c06) SHA1(545e15e0087f8621d593fecd8b4013f7ca311686) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m1000.u5",    0x400000, 0x800000, CRC(ed407ae8) SHA1(a6e9c09b39c13e8fb7fbc89fa9f823cbeb66e901) )
-	ROM_LOAD( "m1001.u7",    0xc00000, 0x400000, CRC(662d2d48) SHA1(2fcc3099d9c04456cae3b13035fb28eaf709e7d8) )
+	ROM_LOAD( "pgm_m1000.u5",    0x400000, 0x800000, CRC(ed407ae8) SHA1(a6e9c09b39c13e8fb7fbc89fa9f823cbeb66e901) )
+	ROM_LOAD( "pgm_m1001.u7",    0xc00000, 0x400000, CRC(662d2d48) SHA1(2fcc3099d9c04456cae3b13035fb28eaf709e7d8) )
 ROM_END
 
 /*
@@ -3478,7 +3657,7 @@
 */
 
 
-ROM_START( dmnfrnt )
+ROM_START( dmnfrnt ) // same romset has also been found on a single PCB board (set dmnfrnta in FBNeo)
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
 	ROM_LOAD16_WORD_SWAP( "v105_16m.u5",    0x100000, 0x200000, CRC(bda083bd) SHA1(58d6438737a2c43aa8bbcb7f34fb51375b781b1c) )
@@ -3491,108 +3670,107 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t04501.u29",    0x180000, 0x800000, CRC(900eaaac) SHA1(4033cb7b28fcadb92d5af3ea7fdd1c22747618fd) )
+	ROM_LOAD( "igs_t04501w064.u29",    0x180000, 0x800000, CRC(900eaaac) SHA1(4033cb7b28fcadb92d5af3ea7fdd1c22747618fd) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04501.u3",    0x0000000, 0x0800000, CRC(9741bea6) SHA1(e3e904249be228628c8c2bd3495cda23586dc048) )
-	ROM_LOAD( "a04502.u4",    0x0800000, 0x0800000, CRC(e104f405) SHA1(124b3deed3e838f8bae6c7d78bdd788859597585) )
-	ROM_LOAD( "a04503.u6",    0x1000000, 0x0800000, CRC(bfd5cfe3) SHA1(fbe4c0a2987c2036df707b86597d78124ee2e665) )
+	ROM_LOAD( "igs_a04501w064.u3",     0x0000000, 0x0800000, CRC(9741bea6) SHA1(e3e904249be228628c8c2bd3495cda23586dc048) )
+	ROM_LOAD( "igs_a04502w064.u4",     0x0800000, 0x0800000, CRC(e104f405) SHA1(124b3deed3e838f8bae6c7d78bdd788859597585) )
+	ROM_LOAD( "igs_a04503w064.u6",     0x1000000, 0x0800000, CRC(bfd5cfe3) SHA1(fbe4c0a2987c2036df707b86597d78124ee2e665) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04501.u9",    0x0000000, 0x0800000,  CRC(29320b7d) SHA1(59c78805e666f912df201c34616744f46057937b) )
-	ROM_LOAD( "b04502.u11",   0x0800000, 0x0200000,  CRC(578c00e9) SHA1(14235cc8b0f8c7dd659512f017a2d4aacd91d89d) )
+	ROM_LOAD( "igs_b04501w064.u9",     0x0000000, 0x0800000,  CRC(29320b7d) SHA1(59c78805e666f912df201c34616744f46057937b) )
+	ROM_LOAD( "igs_b04502w016.u11",    0x0800000, 0x0200000,  CRC(578c00e9) SHA1(14235cc8b0f8c7dd659512f017a2d4aacd91d89d) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "w04501.u5",    0x400000, 0x800000, CRC(3ab58137) SHA1(b221f7e551ff0bfa3fd97b6ebedbac69442a66e9) )
+	ROM_LOAD( "igs_w04501b064.u5",     0x400000, 0x800000, CRC(3ab58137) SHA1(b221f7e551ff0bfa3fd97b6ebedbac69442a66e9) )
 ROM_END
 
-ROM_START( dmnfrnta )
+ROM_START( dmnfrnt103 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "v102_16m.u5",    0x100000, 0x200000, CRC(3d4d481a) SHA1(95953b8f31343389405cc722b4177ff5adf67b62) )
+	ROM_LOAD16_WORD_SWAP( "v103_16m.u5",    0x100000, 0x200000, CRC(2ddafb3d) SHA1(c7d22e007952459de6d23a42ce32aab67b493fc3) )
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "dmnfrnt_igs027a.bin", 0x000000, 0x04000, NO_DUMP )
 
 	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data, internal missing) */
-	ROM_LOAD( "v101_32m.u26", 0x000000, 0x400000,  CRC(93965281) SHA1(89da198aaa7ca759cb96b5f18859a477e55fd590) )
+	ROM_LOAD( "v103_32m.u26", 0x000000, 0x400000, CRC(e78383a3) SHA1(7ae99e93489e79fb1e4240124d22b6002fb7fe18) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t04501.u29",    0x180000, 0x800000, CRC(900eaaac) SHA1(4033cb7b28fcadb92d5af3ea7fdd1c22747618fd) )
+	ROM_LOAD( "igs_t04501w064.u29",    0x180000, 0x800000, CRC(900eaaac) SHA1(4033cb7b28fcadb92d5af3ea7fdd1c22747618fd) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04501.u3",    0x0000000, 0x0800000, CRC(9741bea6) SHA1(e3e904249be228628c8c2bd3495cda23586dc048) )
-	ROM_LOAD( "a04502.u4",    0x0800000, 0x0800000, CRC(e104f405) SHA1(124b3deed3e838f8bae6c7d78bdd788859597585) )
-	ROM_LOAD( "a04503.u6",    0x1000000, 0x0800000, CRC(bfd5cfe3) SHA1(fbe4c0a2987c2036df707b86597d78124ee2e665) )
+	ROM_LOAD( "igs_a04501w064.u3",     0x0000000, 0x0800000, CRC(9741bea6) SHA1(e3e904249be228628c8c2bd3495cda23586dc048) )
+	ROM_LOAD( "igs_a04502w064.u4",     0x0800000, 0x0800000, CRC(e104f405) SHA1(124b3deed3e838f8bae6c7d78bdd788859597585) )
+	ROM_LOAD( "igs_a04503w064.u6",     0x1000000, 0x0800000, CRC(bfd5cfe3) SHA1(fbe4c0a2987c2036df707b86597d78124ee2e665) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04501.u9",    0x0000000, 0x0800000,  CRC(29320b7d) SHA1(59c78805e666f912df201c34616744f46057937b) )
-	ROM_LOAD( "b04502.u11",   0x0800000, 0x0200000,  CRC(578c00e9) SHA1(14235cc8b0f8c7dd659512f017a2d4aacd91d89d) )
+	ROM_LOAD( "igs_b04501w064.u9",     0x0000000, 0x0800000,  CRC(29320b7d) SHA1(59c78805e666f912df201c34616744f46057937b) )
+	ROM_LOAD( "igs_b04502w016.u11",    0x0800000, 0x0200000,  CRC(578c00e9) SHA1(14235cc8b0f8c7dd659512f017a2d4aacd91d89d) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "w04501.u5",    0x400000, 0x800000, CRC(3ab58137) SHA1(b221f7e551ff0bfa3fd97b6ebedbac69442a66e9) )
+	ROM_LOAD( "igs_w04501b064.u5",     0x400000, 0x800000, CRC(3ab58137) SHA1(b221f7e551ff0bfa3fd97b6ebedbac69442a66e9) )
 ROM_END
 
-
-ROM_START( dmnfrntb )
+ROM_START( dmnfrnt102 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "v103_16m.u5",    0x100000, 0x200000, CRC(2ddafb3d) SHA1(c7d22e007952459de6d23a42ce32aab67b493fc3) )
+	ROM_LOAD16_WORD_SWAP( "v102_16m.u5",    0x100000, 0x200000, CRC(3d4d481a) SHA1(95953b8f31343389405cc722b4177ff5adf67b62) )
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "dmnfrnt_igs027a.bin", 0x000000, 0x04000, NO_DUMP )
 
 	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data, internal missing) */
-	ROM_LOAD( "v103_32m.u26", 0x000000, 0x400000, CRC(e78383a3) SHA1(7ae99e93489e79fb1e4240124d22b6002fb7fe18) )
+	ROM_LOAD( "v101_32m.u26", 0x000000, 0x400000,  CRC(93965281) SHA1(89da198aaa7ca759cb96b5f18859a477e55fd590) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t04501.u29",    0x180000, 0x800000, CRC(900eaaac) SHA1(4033cb7b28fcadb92d5af3ea7fdd1c22747618fd) )
+	ROM_LOAD( "igs_t04501w064.u29",    0x180000, 0x800000, CRC(900eaaac) SHA1(4033cb7b28fcadb92d5af3ea7fdd1c22747618fd) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04501.u3",    0x0000000, 0x0800000, CRC(9741bea6) SHA1(e3e904249be228628c8c2bd3495cda23586dc048) )
-	ROM_LOAD( "a04502.u4",    0x0800000, 0x0800000, CRC(e104f405) SHA1(124b3deed3e838f8bae6c7d78bdd788859597585) )
-	ROM_LOAD( "a04503.u6",    0x1000000, 0x0800000, CRC(bfd5cfe3) SHA1(fbe4c0a2987c2036df707b86597d78124ee2e665) )
+	ROM_LOAD( "igs_a04501w064.u3",     0x0000000, 0x0800000, CRC(9741bea6) SHA1(e3e904249be228628c8c2bd3495cda23586dc048) )
+	ROM_LOAD( "igs_a04502w064.u4",     0x0800000, 0x0800000, CRC(e104f405) SHA1(124b3deed3e838f8bae6c7d78bdd788859597585) )
+	ROM_LOAD( "igs_a04503w064.u6",     0x1000000, 0x0800000, CRC(bfd5cfe3) SHA1(fbe4c0a2987c2036df707b86597d78124ee2e665) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04501.u9",    0x0000000, 0x0800000,  CRC(29320b7d) SHA1(59c78805e666f912df201c34616744f46057937b) )
-	ROM_LOAD( "b04502.u11",   0x0800000, 0x0200000,  CRC(578c00e9) SHA1(14235cc8b0f8c7dd659512f017a2d4aacd91d89d) )
+	ROM_LOAD( "igs_b04501w064.u9",     0x0000000, 0x0800000,  CRC(29320b7d) SHA1(59c78805e666f912df201c34616744f46057937b) )
+	ROM_LOAD( "igs_b04502w016.u11",    0x0800000, 0x0200000,  CRC(578c00e9) SHA1(14235cc8b0f8c7dd659512f017a2d4aacd91d89d) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "w04501.u5",    0x400000, 0x800000, CRC(3ab58137) SHA1(b221f7e551ff0bfa3fd97b6ebedbac69442a66e9) )
+	ROM_LOAD( "igs_w04501b064.u5",     0x400000, 0x800000, CRC(3ab58137) SHA1(b221f7e551ff0bfa3fd97b6ebedbac69442a66e9) )
 ROM_END
 
 ROM_START( dmnfrntpcb )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	ROM_LOAD16_WORD_SWAP( "pgm_p02s.u42",    0x00000, 0x020000, CRC(78c15fa2) SHA1(885a6558e022602cc6f482ac9667ba9f61e75092) ) /* IGS PGM P02S 1A3708A1A0 S002838  (uses standard PGM v2 bios) */
-	ROM_LOAD16_WORD_SWAP( "demonfront_v107-u43.bin",    0x100000, 0x200000,  CRC(671d8a31) SHA1(a0c2af67d7c56b4b355883892a47640fc72408a1) )
+	ROM_LOAD16_WORD_SWAP( "demonfront_v107kr_u43.u43",    0x100000, 0x200000,  CRC(671d8a31) SHA1(a0c2af67d7c56b4b355883892a47640fc72408a1) )
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "dmnfrnt_igs027a.bin", 0x000000, 0x04000, NO_DUMP )
 
 	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data, internal missing) */
-	ROM_LOAD( "demonfront_v107-u62.bin",     0x000000, 0x400000, CRC(cb94772e) SHA1(4213600be41fd9ea295dd308920b1d89b635724f) )
+	ROM_LOAD( "demonfront_v107kr_u62.u62",     0x000000, 0x400000, CRC(cb94772e) SHA1(4213600be41fd9ea295dd308920b1d89b635724f) )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t04501.u29",    0x180000, 0x800000, CRC(900eaaac) SHA1(4033cb7b28fcadb92d5af3ea7fdd1c22747618fd) )
+	ROM_LOAD( "igs_t04501w064.u71",    0x180000, 0x800000, CRC(900eaaac) SHA1(4033cb7b28fcadb92d5af3ea7fdd1c22747618fd) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04501.u3",    0x0000000, 0x0800000, CRC(9741bea6) SHA1(e3e904249be228628c8c2bd3495cda23586dc048) )
-	ROM_LOAD( "a04502.u4",    0x0800000, 0x0800000, CRC(e104f405) SHA1(124b3deed3e838f8bae6c7d78bdd788859597585) )
-	ROM_LOAD( "a04503.u6",    0x1000000, 0x0800000, CRC(bfd5cfe3) SHA1(fbe4c0a2987c2036df707b86597d78124ee2e665) )
+	ROM_LOAD( "igs_a04501w064.u30",    0x0000000, 0x0800000, CRC(9741bea6) SHA1(e3e904249be228628c8c2bd3495cda23586dc048) )
+	ROM_LOAD( "igs_a04502w064.u31",    0x0800000, 0x0800000, CRC(e104f405) SHA1(124b3deed3e838f8bae6c7d78bdd788859597585) )
+	ROM_LOAD( "igs_a04503w064.u32",    0x1000000, 0x0800000, CRC(bfd5cfe3) SHA1(fbe4c0a2987c2036df707b86597d78124ee2e665) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04501.u9",    0x0000000, 0x0800000,  CRC(29320b7d) SHA1(59c78805e666f912df201c34616744f46057937b) )
-	ROM_LOAD( "b04502.u11",   0x0800000, 0x0200000,  CRC(578c00e9) SHA1(14235cc8b0f8c7dd659512f017a2d4aacd91d89d) )
+	ROM_LOAD( "igs_b04501w064.u40",    0x0000000, 0x0800000,  CRC(29320b7d) SHA1(59c78805e666f912df201c34616744f46057937b) )
+	ROM_LOAD( "igs_b04502w016.u41",   0x0800000, 0x0200000,  CRC(578c00e9) SHA1(14235cc8b0f8c7dd659512f017a2d4aacd91d89d) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "w04501.u5",    0x400000, 0x800000, CRC(3ab58137) SHA1(b221f7e551ff0bfa3fd97b6ebedbac69442a66e9) )
+	ROM_LOAD( "igs_w04501b064.u8",    0x400000, 0x800000, CRC(3ab58137) SHA1(b221f7e551ff0bfa3fd97b6ebedbac69442a66e9) )
 ROM_END
 
 // the (readable part of) internal roms have been verified on
@@ -3603,31 +3781,31 @@
 ROM_START( theglad )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "v101.u6",      0x100000, 0x080000, CRC(f799e866) SHA1(dccc3c903357c40c3cf85ac0ae8fc12fb0f853a6) ) // V101 05/15/03 09:00:32
+	ROM_LOAD16_WORD_SWAP( "v101_u6.u6",      0x100000, 0x080000, CRC(f799e866) SHA1(dccc3c903357c40c3cf85ac0ae8fc12fb0f853a6) ) // V101 05/15/03 09:00:32
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "theglad_igs027a_execute_only_area", 0x0000, 0x00188, NO_DUMP )
 	ROM_LOAD( "theglad_igs027a_v100_overseas.bin", 0x0188, 0x3e78, CRC(02fe6f52) SHA1(0b0ddf4507856cfc5b7d4ef7e4c5375254c2a024) )
 
 	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data, internal missing) */
-	ROM_LOAD( "v107.u26", 0x000000, 0x200000,  CRC(f7c61357) SHA1(52d31c464dfc83c5371b078cb6b73c0d0e0d57e3) ) // 06/06/03 16:17:27 V107
+	ROM_LOAD( "v107_u26.u26", 0x000000, 0x200000,  CRC(f7c61357) SHA1(52d31c464dfc83c5371b078cb6b73c0d0e0d57e3) ) // 06/06/03 16:17:27 V107
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t04601.u33",   0x180000, 0x800000, CRC(e5dab371) SHA1(2e3c93958eb0326b6b84b95c2168626f26bbac76) )
+	ROM_LOAD( "igs_t04601w64m.u33",   0x180000, 0x800000, CRC(e5dab371) SHA1(2e3c93958eb0326b6b84b95c2168626f26bbac76) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04601.u2",    0x0000000, 0x0800000,  CRC(d9b2e004) SHA1(8e1882b800fe9f12d7d49303e7417ba5b6f8ef85) )
-	ROM_LOAD( "a04602.u4",    0x0800000, 0x0800000,  CRC(14f22308) SHA1(7fad54704e8c97eab723f53dfb50fb3e7bb606d2) )
-	ROM_LOAD( "a04603.u6",    0x1000000, 0x0800000,  CRC(8f621e17) SHA1(b0f87f378e0115d0c95017ca0f1b0d508827a7c6) )
+	ROM_LOAD( "igs_a04601w64m.u2",    0x0000000, 0x0800000,  CRC(d9b2e004) SHA1(8e1882b800fe9f12d7d49303e7417ba5b6f8ef85) )
+	ROM_LOAD( "igs_a04602w64m.u4",    0x0800000, 0x0800000,  CRC(14f22308) SHA1(7fad54704e8c97eab723f53dfb50fb3e7bb606d2) )
+	ROM_LOAD( "igs_a04603w64m.u6",    0x1000000, 0x0800000,  CRC(8f621e17) SHA1(b0f87f378e0115d0c95017ca0f1b0d508827a7c6) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04601.u11",   0x0000000, 0x0800000, CRC(ee72bccf) SHA1(73c25fe659f6c903447066e4ef83d2f580449d76) )
-	ROM_LOAD( "b04602.u12",   0x0800000, 0x0400000, CRC(7dba9c38) SHA1(a03d509274e8f6a500a7ebe2da5aab8bed4e7f2f) )
+	ROM_LOAD( "igs_b04601w64m.u11",   0x0000000, 0x0800000, CRC(ee72bccf) SHA1(73c25fe659f6c903447066e4ef83d2f580449d76) )
+	ROM_LOAD( "igs_b04602w32m.u12",   0x0800000, 0x0400000, CRC(7dba9c38) SHA1(a03d509274e8f6a500a7ebe2da5aab8bed4e7f2f) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "w04601.u1",    0x400000, 0x800000, CRC(5f15ddb3) SHA1(c38dcef8e06802a84e42a7fc9fa505475fc3ac65) )
+	ROM_LOAD( "igs_w04601b64m.u1",    0x400000, 0x800000, CRC(5f15ddb3) SHA1(c38dcef8e06802a84e42a7fc9fa505475fc3ac65) )
 ROM_END
 
 ROM_START( theglad100 ) // is this actually a pre-v100 proto?
@@ -3644,20 +3822,20 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t04601.u33",   0x180000, 0x800000, CRC(e5dab371) SHA1(2e3c93958eb0326b6b84b95c2168626f26bbac76) )
+	ROM_LOAD( "igs_t04601w64m.u33",   0x180000, 0x800000, CRC(e5dab371) SHA1(2e3c93958eb0326b6b84b95c2168626f26bbac76) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04601.u2",    0x0000000, 0x0800000,  CRC(d9b2e004) SHA1(8e1882b800fe9f12d7d49303e7417ba5b6f8ef85) )
-	ROM_LOAD( "a04602.u4",    0x0800000, 0x0800000,  CRC(14f22308) SHA1(7fad54704e8c97eab723f53dfb50fb3e7bb606d2) )
-	ROM_LOAD( "a04603.u6",    0x1000000, 0x0800000,  CRC(8f621e17) SHA1(b0f87f378e0115d0c95017ca0f1b0d508827a7c6) )
+	ROM_LOAD( "igs_a04601w64m.u2",    0x0000000, 0x0800000,  CRC(d9b2e004) SHA1(8e1882b800fe9f12d7d49303e7417ba5b6f8ef85) )
+	ROM_LOAD( "igs_a04602w64m.u4",    0x0800000, 0x0800000,  CRC(14f22308) SHA1(7fad54704e8c97eab723f53dfb50fb3e7bb606d2) )
+	ROM_LOAD( "igs_a04603w64m.u6",    0x1000000, 0x0800000,  CRC(8f621e17) SHA1(b0f87f378e0115d0c95017ca0f1b0d508827a7c6) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04601.u11",   0x0000000, 0x0800000, CRC(ee72bccf) SHA1(73c25fe659f6c903447066e4ef83d2f580449d76) )
-	ROM_LOAD( "b04602.u12",   0x0800000, 0x0400000, CRC(7dba9c38) SHA1(a03d509274e8f6a500a7ebe2da5aab8bed4e7f2f) )
+	ROM_LOAD( "igs_b04601w64m.u11",   0x0000000, 0x0800000, CRC(ee72bccf) SHA1(73c25fe659f6c903447066e4ef83d2f580449d76) )
+	ROM_LOAD( "igs_b04602w32m.u12",   0x0800000, 0x0400000, CRC(7dba9c38) SHA1(a03d509274e8f6a500a7ebe2da5aab8bed4e7f2f) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "w04601.u1",    0x400000, 0x800000, CRC(5f15ddb3) SHA1(c38dcef8e06802a84e42a7fc9fa505475fc3ac65) )
+	ROM_LOAD( "igs_w04601b64m.u1",    0x400000, 0x800000, CRC(5f15ddb3) SHA1(c38dcef8e06802a84e42a7fc9fa505475fc3ac65) )
 ROM_END
 
 
@@ -3675,58 +3853,89 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t04601.u33",   0x180000, 0x800000, CRC(e5dab371) SHA1(2e3c93958eb0326b6b84b95c2168626f26bbac76) )
+	ROM_LOAD( "igs_t04601w64m.u33",   0x180000, 0x800000, CRC(e5dab371) SHA1(2e3c93958eb0326b6b84b95c2168626f26bbac76) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04601.u2",    0x0000000, 0x0800000,  CRC(d9b2e004) SHA1(8e1882b800fe9f12d7d49303e7417ba5b6f8ef85) )
-	ROM_LOAD( "a04602.u4",    0x0800000, 0x0800000,  CRC(14f22308) SHA1(7fad54704e8c97eab723f53dfb50fb3e7bb606d2) )
-	ROM_LOAD( "a04603.u6",    0x1000000, 0x0800000,  CRC(8f621e17) SHA1(b0f87f378e0115d0c95017ca0f1b0d508827a7c6) )
+	ROM_LOAD( "igs_a04601w64m.u2",    0x0000000, 0x0800000,  CRC(d9b2e004) SHA1(8e1882b800fe9f12d7d49303e7417ba5b6f8ef85) )
+	ROM_LOAD( "igs_a04602w64m.u4",    0x0800000, 0x0800000,  CRC(14f22308) SHA1(7fad54704e8c97eab723f53dfb50fb3e7bb606d2) )
+	ROM_LOAD( "igs_a04603w64m.u6",    0x1000000, 0x0800000,  CRC(8f621e17) SHA1(b0f87f378e0115d0c95017ca0f1b0d508827a7c6) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04601.u11",   0x0000000, 0x0800000, CRC(ee72bccf) SHA1(73c25fe659f6c903447066e4ef83d2f580449d76) )
-	ROM_LOAD( "b04602.u12",   0x0800000, 0x0400000, CRC(7dba9c38) SHA1(a03d509274e8f6a500a7ebe2da5aab8bed4e7f2f) )
+	ROM_LOAD( "igs_b04601w64m.u11",   0x0000000, 0x0800000, CRC(ee72bccf) SHA1(73c25fe659f6c903447066e4ef83d2f580449d76) )
+	ROM_LOAD( "igs_b04602w32m.u12",   0x0800000, 0x0400000, CRC(7dba9c38) SHA1(a03d509274e8f6a500a7ebe2da5aab8bed4e7f2f) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "w04601.u1",    0x400000, 0x800000, CRC(5f15ddb3) SHA1(c38dcef8e06802a84e42a7fc9fa505475fc3ac65) )
+	ROM_LOAD( "igs_w04601b64m.u1",    0x400000, 0x800000, CRC(5f15ddb3) SHA1(c38dcef8e06802a84e42a7fc9fa505475fc3ac65) )
 ROM_END
 
 
 ROM_START( thegladpcb )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
-	ROM_LOAD16_WORD_SWAP( "bios.42",    0x000000, 0x020000, CRC(517cf7a2) SHA1(f5720b29e3be6ec22be03a768618cb2a1aa4ade7) ) // V0001-001J
-	ROM_LOAD16_WORD_SWAP( "glad_v100.43",  0x100000, 0x080000, CRC(bcf3b172) SHA1(df7e2808c0341be0a59eefa852c857a3a919223e) ) // 02/25/03 17:42:51
+	ROM_LOAD16_WORD_SWAP( "bios.42",       0x000000, 0x020000, CRC(517cf7a2) SHA1(f5720b29e3be6ec22be03a768618cb2a1aa4ade7) ) // V0001-001J
+	ROM_LOAD16_WORD_SWAP( "v100_u43.u43",  0x100000, 0x080000, CRC(bcf3b172) SHA1(df7e2808c0341be0a59eefa852c857a3a919223e) ) // 02/25/03 17:42:51
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "thegladpcb_igs027a_execute_only_area", 0x0000, 0x00188, NO_DUMP )
 	ROM_LOAD( "thegladpcb_igs027a_v100_japan.bin", 0x0188, 0x3e78, CRC(d7f06e2d) SHA1(9c3aca7a487f5329d84731e2c63d5ed591bf9d24) )    // from 'thegladpcb set'
 
 	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data, internal missing) */
-	ROM_LOAD( "igs_v100.62", 0x000000, 0x200000, CRC(0f3f511e) SHA1(28dd8d27495cec86e968a3ea549c5b30513dbb6e) ) // 02/25/03 16:32:21 V100
+	ROM_LOAD( "v101_u62.u62", 0x000000, 0x200000, CRC(23faec02) SHA1(9065d55c2a14e6889e735a452bbc32530056645a) ) // 03/13/03 14:06:44 V101
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
-	ROM_LOAD( "pgm_t01s.u72", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // standard PGM tx bios
-	ROM_LOAD( "t04601.u71",   0x180000, 0x800000, CRC(e5dab371) SHA1(2e3c93958eb0326b6b84b95c2168626f26bbac76) )
+	ROM_LOAD( "pgm_t01s.u72",         0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // standard PGM tx bios
+	ROM_LOAD( "igs_t04601w64m.u71",   0x180000, 0x800000, CRC(e5dab371) SHA1(2e3c93958eb0326b6b84b95c2168626f26bbac76) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04601.u30",    0x0000000, 0x0800000,  CRC(d9b2e004) SHA1(8e1882b800fe9f12d7d49303e7417ba5b6f8ef85) )
-	ROM_LOAD( "a04602.u31",    0x0800000, 0x0800000,  CRC(14f22308) SHA1(7fad54704e8c97eab723f53dfb50fb3e7bb606d2) )
-	ROM_LOAD( "a04603.u32",    0x1000000, 0x0800000,  CRC(8f621e17) SHA1(b0f87f378e0115d0c95017ca0f1b0d508827a7c6) )
+	ROM_LOAD( "igs_a04601w64m.u30",   0x0000000, 0x0800000,  CRC(d9b2e004) SHA1(8e1882b800fe9f12d7d49303e7417ba5b6f8ef85) )
+	ROM_LOAD( "igs_a04602w64m.u31",   0x0800000, 0x0800000,  CRC(14f22308) SHA1(7fad54704e8c97eab723f53dfb50fb3e7bb606d2) )
+	ROM_LOAD( "igs_a04603w64m.u32",   0x1000000, 0x0800000,  CRC(8f621e17) SHA1(b0f87f378e0115d0c95017ca0f1b0d508827a7c6) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04601.u40",   0x0000000, 0x0800000, CRC(ee72bccf) SHA1(73c25fe659f6c903447066e4ef83d2f580449d76) )
-	ROM_LOAD( "b04602.u41",   0x0800000, 0x0400000, CRC(7dba9c38) SHA1(a03d509274e8f6a500a7ebe2da5aab8bed4e7f2f) )
+	ROM_LOAD( "igs_b04601w64m.u40",   0x0000000, 0x0800000, CRC(ee72bccf) SHA1(73c25fe659f6c903447066e4ef83d2f580449d76) )
+	ROM_LOAD( "igs_b04602w32m.u41",   0x0800000, 0x0400000, CRC(7dba9c38) SHA1(a03d509274e8f6a500a7ebe2da5aab8bed4e7f2f) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
-	ROM_LOAD( "pgm_m01s.u4", 0x000000, 0x200000, CRC(45ae7159) SHA1(d3ed3ff3464557fd0df6b069b2e431528b0ebfa8) ) // standard PGM sample bios
-	ROM_LOAD( "w04601.u8",    0x400000, 0x800000, CRC(5f15ddb3) SHA1(c38dcef8e06802a84e42a7fc9fa505475fc3ac65) )
-	ROM_LOAD( "igs29.bin",    0xc00000, 0x200000, CRC(51acb395) SHA1(65a2ecd3de2ff782f2aa0f0f905f9b18323aea64) ) // extra ROM on the PCB version for the Japanese music
+	ROM_LOAD( "pgm_m01s.u4",          0x000000, 0x200000, CRC(45ae7159) SHA1(d3ed3ff3464557fd0df6b069b2e431528b0ebfa8) ) // standard PGM sample bios
+	ROM_LOAD( "igs_w04601b64m.u8",    0x400000, 0x800000, CRC(5f15ddb3) SHA1(c38dcef8e06802a84e42a7fc9fa505475fc3ac65) )
+	ROM_LOAD( "wave_u29.u29",         0xc00000, 0x200000, CRC(51acb395) SHA1(65a2ecd3de2ff782f2aa0f0f905f9b18323aea64) ) // extra ROM on the PCB version for the Japanese music
+ROM_END
+
+ROM_START( thegladpcba )
+	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
+	ROM_LOAD16_WORD_SWAP( "bios.42",       0x000000, 0x020000, CRC(517cf7a2) SHA1(f5720b29e3be6ec22be03a768618cb2a1aa4ade7) ) // V0001-001J
+	ROM_LOAD16_WORD_SWAP( "v100_u43.u43",  0x100000, 0x080000, CRC(bcf3b172) SHA1(df7e2808c0341be0a59eefa852c857a3a919223e) ) // 02/25/03 17:42:51
+
+	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
+	ROM_LOAD( "thegladpcb_igs027a_execute_only_area", 0x0000, 0x00188, NO_DUMP )
+	ROM_LOAD( "thegladpcb_igs027a_v100_japan.bin", 0x0188, 0x3e78, CRC(d7f06e2d) SHA1(9c3aca7a487f5329d84731e2c63d5ed591bf9d24) )    // from 'thegladpcb set'
+
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data, internal missing) */
+	ROM_LOAD( "v100_u62.u62", 0x000000, 0x200000, CRC(0f3f511e) SHA1(28dd8d27495cec86e968a3ea549c5b30513dbb6e) ) // 02/25/03 16:32:21 V100
+
+	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	ROM_LOAD( "pgm_t01s.u72",         0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // standard PGM tx bios
+	ROM_LOAD( "igs_t04601w64m.u71",   0x180000, 0x800000, CRC(e5dab371) SHA1(2e3c93958eb0326b6b84b95c2168626f26bbac76) )
+
+	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "igs_a04601w64m.u30",   0x0000000, 0x0800000,  CRC(d9b2e004) SHA1(8e1882b800fe9f12d7d49303e7417ba5b6f8ef85) )
+	ROM_LOAD( "igs_a04602w64m.u31",   0x0800000, 0x0800000,  CRC(14f22308) SHA1(7fad54704e8c97eab723f53dfb50fb3e7bb606d2) )
+	ROM_LOAD( "igs_a04603w64m.u32",   0x1000000, 0x0800000,  CRC(8f621e17) SHA1(b0f87f378e0115d0c95017ca0f1b0d508827a7c6) )
+
+	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "igs_b04601w64m.u40",   0x0000000, 0x0800000, CRC(ee72bccf) SHA1(73c25fe659f6c903447066e4ef83d2f580449d76) )
+	ROM_LOAD( "igs_b04602w32m.u41",   0x0800000, 0x0400000, CRC(7dba9c38) SHA1(a03d509274e8f6a500a7ebe2da5aab8bed4e7f2f) )
+
+	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
+	ROM_LOAD( "pgm_m01s.u4",          0x000000, 0x200000, CRC(45ae7159) SHA1(d3ed3ff3464557fd0df6b069b2e431528b0ebfa8) ) // standard PGM sample bios
+	ROM_LOAD( "igs_w04601b64m.u8",    0x400000, 0x800000, CRC(5f15ddb3) SHA1(c38dcef8e06802a84e42a7fc9fa505475fc3ac65) )
+	ROM_LOAD( "wave_u29.u29",         0xc00000, 0x200000, CRC(51acb395) SHA1(65a2ecd3de2ff782f2aa0f0f905f9b18323aea64) ) // extra ROM on the PCB version for the Japanese music
 ROM_END
 
 ROM_START( oldsplus )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "p05301.rom",   0x100000, 0x400000, CRC(923f7246) SHA1(818ade79e9724f5a2b0cc5a647ae5d4ee0374799) )
+	ROM_LOAD16_WORD_SWAP( "v-205cn.u10",   0x100000, 0x400000, CRC(923f7246) SHA1(818ade79e9724f5a2b0cc5a647ae5d4ee0374799) )
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "oldsplus_igs027a.bin", 0x000000, 0x04000, NO_DUMP )
@@ -3735,21 +3944,50 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t05301.rom",   0x180000, 0x800000, CRC(8257bbb0) SHA1(b48067b7e7081a15fddf21739b641d677c2df3d9) )
+	ROM_LOAD( "igs_t05301w064.u2",   0x180000, 0x800000, CRC(8257bbb0) SHA1(b48067b7e7081a15fddf21739b641d677c2df3d9) )
+
+	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "igs_a05301w064.u3",   0x0000000, 0x0800000, CRC(57946fd2) SHA1(5d79bc71a1881f3099821a9b255a5f271e0eeff6) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "igs_a05302w064.u4",   0x0800000, 0x0800000, CRC(3459a0b8) SHA1(94ab6f980b5582f1db9bb12019d03f0b6e0a06df) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "igs_a05303w064.u6",   0x1000000, 0x0800000, CRC(13475d85) SHA1(4683a3bf304fdc15ffb1c61b7957ad68b023fa33) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "igs_a05304w064.u8",   0x1800000, 0x0800000, CRC(f03ef7a6) SHA1(c18b1b622b430d5e031e65daa6819b84c3e12ef5) )
+
+	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "igs_b05301w064.u9",   0x0000000, 0x0800000, CRC(fd98f503) SHA1(02046ab1aa89f63bff149003d9d61776e025a92a) )
+	ROM_LOAD( "igs_b05302w064.u11",  0x0800000, 0x0800000, CRC(9f6094a8) SHA1(69f6f2003ab975eae13ea6b5c2ffa40df6e6bdf6) )
+
+	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
+	PGM_AUDIO_BIOS
+	ROM_LOAD( "igs_w05301b032.u5",   0x400000, 0x400000, CRC(86ec83bc) SHA1(067cb7ec449eacd1f49298f45a364368934db5dd) )
+ROM_END
+
+ROM_START( oldsplus203 ) // only program ROM provided for this set
+	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
+	PGM_68K_BIOS
+	ROM_LOAD16_WORD_SWAP( "v-203cn.u10",   0x100000, 0x400000, CRC(c728cadc) SHA1(7e6acd2535b1700fdefc048bd521c305d3170108) )
+
+	ROM_REGION( 0x4000, "prot", 0 ) // ARM protection ASIC - internal ROM
+	ROM_LOAD( "oldsplus_igs027a.bin", 0x000000, 0x04000, NO_DUMP )
+
+	ROM_REGION32_LE( 0x800000, "user1", ROMREGION_ERASE00 )
+
+	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	PGM_VIDEO_BIOS
+	ROM_LOAD( "igs_t05301w064.u2",   0x180000, 0x800000, CRC(8257bbb0) SHA1(b48067b7e7081a15fddf21739b641d677c2df3d9) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a05301.rom",   0x0000000, 0x0800000, CRC(57946fd2) SHA1(5d79bc71a1881f3099821a9b255a5f271e0eeff6) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a05302.rom",   0x0800000, 0x0800000, CRC(3459a0b8) SHA1(94ab6f980b5582f1db9bb12019d03f0b6e0a06df) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a05303.rom",   0x1000000, 0x0800000, CRC(13475d85) SHA1(4683a3bf304fdc15ffb1c61b7957ad68b023fa33) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a05304.rom",   0x1800000, 0x0800000, CRC(f03ef7a6) SHA1(c18b1b622b430d5e031e65daa6819b84c3e12ef5) )
+	ROM_LOAD( "igs_a05301w064.u3",   0x0000000, 0x0800000, CRC(57946fd2) SHA1(5d79bc71a1881f3099821a9b255a5f271e0eeff6) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "igs_a05302w064.u4",   0x0800000, 0x0800000, CRC(3459a0b8) SHA1(94ab6f980b5582f1db9bb12019d03f0b6e0a06df) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "igs_a05303w064.u6",   0x1000000, 0x0800000, CRC(13475d85) SHA1(4683a3bf304fdc15ffb1c61b7957ad68b023fa33) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "igs_a05304w064.u8",   0x1800000, 0x0800000, CRC(f03ef7a6) SHA1(c18b1b622b430d5e031e65daa6819b84c3e12ef5) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b05301.rom",   0x0000000, 0x0800000, CRC(fd98f503) SHA1(02046ab1aa89f63bff149003d9d61776e025a92a) )
-	ROM_LOAD( "b05302.rom",   0x0800000, 0x0800000, CRC(9f6094a8) SHA1(69f6f2003ab975eae13ea6b5c2ffa40df6e6bdf6) )
+	ROM_LOAD( "igs_b05301w064.u9",   0x0000000, 0x0800000, CRC(fd98f503) SHA1(02046ab1aa89f63bff149003d9d61776e025a92a) )
+	ROM_LOAD( "igs_b05302w064.u11",  0x0800000, 0x0800000, CRC(9f6094a8) SHA1(69f6f2003ab975eae13ea6b5c2ffa40df6e6bdf6) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m05301.rom",   0x400000, 0x400000, CRC(86ec83bc) SHA1(067cb7ec449eacd1f49298f45a364368934db5dd) )
+	ROM_LOAD( "igs_w05301b032.u5",   0x400000, 0x400000, CRC(86ec83bc) SHA1(067cb7ec449eacd1f49298f45a364368934db5dd) )
 ROM_END
 
 ROM_START( kovshp )
@@ -3762,48 +4000,51 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u2",       0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	// also seen split in 2 smaller ROMs
+	// "s&k_fntcg_u3.u3" - t0600.rom    [1/2]  IDENTICAL - CRC(164b3c94) SHA1(f00ea66886ca6bff74bbeaa49e7f5c75c275d5d7)
+	// "s&k_fntcg_u7.u7" - t0600.rom    [2/2]  IDENTICAL - CRC(b1fae5e8) SHA1(88b84879b5ce9c29081647186b3a1b003efe6dcc)
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0540.rom",    0x1800000, 0x0800000, CRC(4fd3413e) SHA1(5e8f3e421342bf558c77e59635f9b5d713e825c2) )
+	ROM_LOAD( "pgm_a0600.u3",       0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u4",       0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u6",       0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "igs_a05401w064.u8",  0x1800000, 0x0800000, CRC(4fd3413e) SHA1(5e8f3e421342bf558c77e59635f9b5d713e825c2) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0540.rom",    0x0800000, 0x0800000, CRC(60999757) SHA1(118cf058e67858958bcb931e14f5d160c7de87cc) )
+	ROM_LOAD( "pgm_b0600.u9",       0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "igs_b05401w064.u11", 0x0800000, 0x0800000, CRC(60999757) SHA1(118cf058e67858958bcb931e14f5d160c7de87cc) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u5",       0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
-ROM_START( kovshpa )
+ROM_START( kovshp100 )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "p0600h.rom",   0x100000, 0x400000, CRC(e251e8e4) SHA1(af5b7c81632a39e1450d932951bed634c76b84e8) )
+	ROM_LOAD16_WORD_SWAP( "s__s_m-100cn.u10",   0x100000, 0x400000, CRC(e251e8e4) SHA1(af5b7c81632a39e1450d932951bed634c76b84e8) )
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kovsh_v100_china.asic", 0x000000, 0x04000, BAD_DUMP CRC(0f09a5c1) SHA1(621b38c05f33277608d58b49822aebc930ae4870) ) // this is the kovsh ARM rom, we intercept and modify protection calls
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u2",       0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0540.rom",    0x1800000, 0x0800000, CRC(4fd3413e) SHA1(5e8f3e421342bf558c77e59635f9b5d713e825c2) )
+	ROM_LOAD( "pgm_a0600.u3",       0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u4",       0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u6",       0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "igs_a05401w064.u8",  0x1800000, 0x0800000, CRC(4fd3413e) SHA1(5e8f3e421342bf558c77e59635f9b5d713e825c2) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0540.rom",    0x0800000, 0x0800000, CRC(60999757) SHA1(118cf058e67858958bcb931e14f5d160c7de87cc) )
+	ROM_LOAD( "pgm_b0600.u9",       0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "igs_b05401w064.u11", 0x0800000, 0x0800000, CRC(60999757) SHA1(118cf058e67858958bcb931e14f5d160c7de87cc) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u5",       0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 
@@ -3818,27 +4059,27 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t0600.rom",    0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
+	ROM_LOAD( "pgm_t0600.u2",       0x180000, 0x800000, CRC(4acc1ad6) SHA1(0668dbd5e856c2406910c6b7382548b37c631780) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0540.rom",    0x1800000, 0x0800000, CRC(4fd3413e) SHA1(5e8f3e421342bf558c77e59635f9b5d713e825c2) )
+	ROM_LOAD( "pgm_a0600.u3",       0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0601.u4",       0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "pgm_a0602.u6",       0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
+	ROM_LOAD( "igs_a05401w064.u8",  0x1800000, 0x0800000, CRC(4fd3413e) SHA1(5e8f3e421342bf558c77e59635f9b5d713e825c2) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0540.rom",    0x0800000, 0x0800000, CRC(60999757) SHA1(118cf058e67858958bcb931e14f5d160c7de87cc) )
+	ROM_LOAD( "pgm_b0600.u9",       0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
+	ROM_LOAD( "igs_b05401w064.u11", 0x0800000, 0x0800000, CRC(60999757) SHA1(118cf058e67858958bcb931e14f5d160c7de87cc) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "m0600.rom",    0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
+	ROM_LOAD( "pgm_m0600.u5",       0x400000, 0x400000, CRC(3ada4fd6) SHA1(4c87adb25d31cbd41f04fbffe31f7bc37173da76) )
 ROM_END
 
 ROM_START( kovshxas )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "de_p0609.322",   0x100000, 0x400000, CRC(3b7b627f) SHA1(b331148501f9349fbd5882fb3f184f6304e58646) ) // V202CN Oct 6 2008 09:59:26
+	ROM_LOAD16_WORD_SWAP( "assg_v202cn.rom",   0x100000, 0x400000, CRC(3b7b627f) SHA1(b331148501f9349fbd5882fb3f184f6304e58646) ) // V202CN Oct 6 2008 09:59:26
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "kovsh_v100_china.asic", 0x000000, 0x04000, BAD_DUMP CRC(0f09a5c1) SHA1(621b38c05f33277608d58b49822aebc930ae4870) ) // this is the kovsh ARM rom, we intercept and modify protection calls
@@ -3851,11 +4092,11 @@
 	ROM_LOAD( "a0600.rom",    0x0000000, 0x0800000, CRC(d8167834) SHA1(fa55a99629d03b2ea253392352f70d2c8639a991) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
 	ROM_LOAD( "a0601.rom",    0x0800000, 0x0800000, CRC(ff7a4373) SHA1(7def9fca7513ad5a117da230bebd2e3c78679041) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
 	ROM_LOAD( "a0602.rom",    0x1000000, 0x0800000, CRC(e7a32959) SHA1(3d0ed684dc5b269238890836b2ce7ef46aa5265b) ) // FIXED BITS (xxxxxxxx1xxxxxxx)
-	ROM_LOAD( "a0603xas.rom",    0x1800000, 0x0800000, CRC(7057b37e) SHA1(85a19f23303b4d581c4fa315b2c204af92fcb424) )
+	ROM_LOAD( "a0603as.rom",    0x1800000, 0x0800000, CRC(7057b37e) SHA1(85a19f23303b4d581c4fa315b2c204af92fcb424) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
 	ROM_LOAD( "b0600.rom",    0x0000000, 0x0800000, CRC(7d3cd059) SHA1(00cf994b63337e0e4ebe96453daf45f24192af1c) )
-	ROM_LOAD( "b0601xas.rom",    0x0800000, 0x0800000, CRC(3784fb49) SHA1(7e85fe5b5fb8746f1321c03ad2350d2a58969d7a) )
+	ROM_LOAD( "b0601as.rom",    0x0800000, 0x0800000, CRC(3784fb49) SHA1(7e85fe5b5fb8746f1321c03ad2350d2a58969d7a) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
@@ -3984,7 +4225,7 @@
 ROM_START( killbldp )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "v300x.u6",     0x100000, 0x080000, CRC(b7fb8ec9) SHA1(e71b2d74269a82c7155b9818821156e128b68b28) ) // V300 05-09-16 11:58:20
+	ROM_LOAD16_WORD_SWAP( "v300xx_u6.u6",     0x100000, 0x080000, CRC(b7fb8ec9) SHA1(e71b2d74269a82c7155b9818821156e128b68b28) ) // V300 05-09-16 11:58:20
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	/* the first 0x268 bytes of this are EXECUTE ONLY in the original chip, attempting to read them even via the original CPU just returns what is on the bus */
@@ -3993,131 +4234,133 @@
 	ROM_LOAD( "killbldp_igs027a_alt.bin", 0x000000, 0x04000, CRC(98316b06) SHA1(09be9fad24d68980a0a5beae60ced48012286216) ) // from a bootleg
 
 	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "v300x.u26", 0x000000, 0x200000,  CRC(144388c8) SHA1(d7469df077c1a674129f18210584ba4d05a61888) ) // 05-09-16 23:52:32 V300
+	ROM_LOAD( "v300xx_u26.u26", 0x000000, 0x200000,  CRC(144388c8) SHA1(d7469df077c1a674129f18210584ba4d05a61888) ) // 05-09-16 23:52:32 V300
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t05701w032.bin",0x180000, 0x400000, CRC(567c714f) SHA1(b25b20e1ec9f077d6f7b9d41723a68d0d461bef2) )
+	ROM_LOAD( "igs_t05701w032.u33", 0x180000, 0x400000, CRC(567c714f) SHA1(b25b20e1ec9f077d6f7b9d41723a68d0d461bef2) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a05701w064.bin",   0x0000000, 0x0800000, CRC(8c0c992c) SHA1(28391e50ca4400060676f1524bd49ede373292da) )
-	ROM_LOAD( "a05702w064.bin",   0x0800000, 0x0800000, CRC(7e5b0f27) SHA1(9e8d69f34c30216925fcb7af87f8b37f703317e7) )
-	ROM_LOAD( "a05703w064.bin",   0x1000000, 0x0800000, CRC(accbdb44) SHA1(d59b2452c7a5b4e666473dc973b73a0f2b4edc13) )
+	ROM_LOAD( "igs_a05701w064.u3",  0x0000000, 0x0800000, CRC(8c0c992c) SHA1(28391e50ca4400060676f1524bd49ede373292da) )
+	ROM_LOAD( "igs_a05702w064.u4",  0x0800000, 0x0800000, CRC(7e5b0f27) SHA1(9e8d69f34c30216925fcb7af87f8b37f703317e7) )
+	ROM_LOAD( "igs_a05703w064.u6",  0x1000000, 0x0800000, CRC(accbdb44) SHA1(d59b2452c7a5b4e666473dc973b73a0f2b4edc13) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b05701w064.bin",   0x0000000, 0x0800000, CRC(a20cdcef) SHA1(029a49971adf1e72ab556a207172bdfbd0b86b03) )
-	ROM_LOAD( "b05702w016.bin",   0x0800000, 0x0200000, CRC(fe7457df) SHA1(d66b1b31102b0210f9faf40e1473cd1511ccaf1f) )
+	ROM_LOAD( "igs_b05701w064.u9",  0x0000000, 0x0800000, CRC(a20cdcef) SHA1(029a49971adf1e72ab556a207172bdfbd0b86b03) )
+	ROM_LOAD( "igs_b05702w016.u11", 0x0800000, 0x0200000, CRC(fe7457df) SHA1(d66b1b31102b0210f9faf40e1473cd1511ccaf1f) )
 
 	ROM_REGION( 0x800000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "w05701b032.bin",   0x400000, 0x400000, CRC(2d3ae593) SHA1(b9c1d2994be95ba974bc134a3bf115bc9c9c9c16) )
+	ROM_LOAD( "igs_w05701b032.u5",  0x400000, 0x400000, CRC(2d3ae593) SHA1(b9c1d2994be95ba974bc134a3bf115bc9c9c9c16) )
 ROM_END
 
 ROM_START( svg )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "u30.bin",      0x100000, 0x080000, CRC(34c18f3f) SHA1(42d1edd0dcfaa5e44861c6a1d4cb24f51ba23de8) ) // V200 09/12/05 16:42:51
+	ROM_LOAD16_WORD_SWAP( "svg_v200_u30.u30",      0x100000, 0x080000, CRC(34c18f3f) SHA1(42d1edd0dcfaa5e44861c6a1d4cb24f51ba23de8) ) // V200 09/12/05 16:42:51
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "svg_igs027a_execute_only_area", 0x0000, 0x00188, NO_DUMP )
 	ROM_LOAD( "svg_igs027a_v200_china.bin", 0x0188, 0x3e78, CRC(72b73169) SHA1(ffc0caea855ab4b01beb3aebd0bf17187c66c22c) )
 
 	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "u26.bin", 0x000000, 0x400000, CRC(46826ec8) SHA1(ad1daf6f615fb8d748ce7f98f19dd3bf22f79fba) ) // 10/11/05 10:07:20 V201
-	ROM_LOAD( "u29.bin", 0x400000, 0x400000, CRC(fa5f3901) SHA1(8ab7c6763df4f752b50ed2197063f58046b32ddb) )
+	/* eproms with no labels stickers */
+	ROM_LOAD( "epr.u26", 0x000000, 0x400000, CRC(46826ec8) SHA1(ad1daf6f615fb8d748ce7f98f19dd3bf22f79fba) ) // 10/11/05 10:07:20 V201
+	ROM_LOAD( "epr.u36", 0x400000, 0x400000, CRC(fa5f3901) SHA1(8ab7c6763df4f752b50ed2197063f58046b32ddb) )
 
 	ROM_REGION( 0x500000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t05601w016.bin",0x180000, 0x200000, CRC(03e110dc) SHA1(41c8f286e9303b24ba6235b341371c298226fb6a) )
+	ROM_LOAD( "igs_t05601w016.u29", 0x180000, 0x200000, CRC(03e110dc) SHA1(41c8f286e9303b24ba6235b341371c298226fb6a) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a05601w064.bin",  0x0000000, 0x0800000, CRC(ea6453e4) SHA1(b5c82edafa8008ad59b5f2219511947d078d446e) )
-	ROM_LOAD( "a05602w064.bin",  0x0800000, 0x0800000, CRC(6d00621b) SHA1(55a4bc357e14b975b0234a9cd49e2224f509dad9) )
-	ROM_LOAD( "a05603w064.bin",  0x1000000, 0x0800000, CRC(7b71c64f) SHA1(bec7c7edf0634cf8351a54abb867c56af08ad2c3) )
-	ROM_LOAD( "a05604w032.bin",  0x1800000, 0x0400000, CRC(9452a567) SHA1(01fdb8e1f131603843ef4c49ab76d7a56b2d6414) )
+	ROM_LOAD( "igs_a05601w064.u3",  0x0000000, 0x0800000, CRC(ea6453e4) SHA1(b5c82edafa8008ad59b5f2219511947d078d446e) )
+	ROM_LOAD( "igs_a05602w064.u4",  0x0800000, 0x0800000, CRC(6d00621b) SHA1(55a4bc357e14b975b0234a9cd49e2224f509dad9) )
+	ROM_LOAD( "igs_a05603w064.u6",  0x1000000, 0x0800000, CRC(7b71c64f) SHA1(bec7c7edf0634cf8351a54abb867c56af08ad2c3) )
+	ROM_LOAD( "igs_a05604w032.u8",  0x1800000, 0x0400000, CRC(9452a567) SHA1(01fdb8e1f131603843ef4c49ab76d7a56b2d6414) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b05601w064.bin",  0x0000000, 0x0800000, CRC(35c0a489) SHA1(a7d5527da01f8eaa7499fb6785b57094521bce97) )
-	ROM_LOAD( "b05602w064.bin",  0x0800000, 0x0800000, CRC(8aad3f85) SHA1(da6996d901d42b3a2ba7019ad014bb938a5e328b) )
+	ROM_LOAD( "igs_b05601w064.u9",  0x0000000, 0x0800000, CRC(35c0a489) SHA1(a7d5527da01f8eaa7499fb6785b57094521bce97) )
+	ROM_LOAD( "igs_b05602w064.u11", 0x0800000, 0x0800000, CRC(8aad3f85) SHA1(da6996d901d42b3a2ba7019ad014bb938a5e328b) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "w05601b064.bin",  0x400000, 0x800000, CRC(bfe61a71) SHA1(e682ca8d57ca51c4d72f64fc091161f3dbdce871) )
-	ROM_LOAD( "w05602b032.bin",  0xc00000, 0x400000, CRC(0685166d) SHA1(64dac49abd2a46d5fb58c678027aa5e23d672dc4) )
+	ROM_LOAD( "igs_w05601b064.u5",  0x400000, 0x800000, CRC(bfe61a71) SHA1(e682ca8d57ca51c4d72f64fc091161f3dbdce871) )
+	ROM_LOAD( "igs_w05602b032.u7",  0xc00000, 0x400000, CRC(0685166d) SHA1(64dac49abd2a46d5fb58c678027aa5e23d672dc4) )
 ROM_END
 
 ROM_START( svgtw )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "v101tw.u30",      0x100000, 0x080000, CRC(8d0405e4) SHA1(b6175c9ffeaac531d28e7845cb34c673476e286a) ) // V100 03/14/05 20:04:08
+	ROM_LOAD16_WORD_SWAP( "v101tw_u30.u30",      0x100000, 0x080000, CRC(8d0405e4) SHA1(b6175c9ffeaac531d28e7845cb34c673476e286a) ) // V100 03/14/05 20:04:08
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */ // marked H1
 	ROM_LOAD( "svgpcb_igs027a_execute_only_area", 0x0000, 0x00188, NO_DUMP )
 	ROM_LOAD( "svgcpb_igs027a_v100_japan.bin", 0x0188, 0x3e78, CRC(7a59da5d) SHA1(d67ba465db40ca716b4b901b1c8e762716fb954e) ) // this is from the Japan set, the cart this came from was Taiwan
 
 	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "v101tw.u26", 0x000000, 0x400000, CRC(cc24f542) SHA1(623ed398d2eeea229833d92eb4fb6492133202b3) ) // 06/20/05 11:36:15 V100
-	ROM_LOAD( "v101tw.u36", 0x400000, 0x400000, CRC(f18283e2) SHA1(15323c5f816a0bf6f510311eb49d485ccf713cf7) )
+	ROM_LOAD( "v101tw_u26.u26", 0x000000, 0x400000, CRC(cc24f542) SHA1(623ed398d2eeea229833d92eb4fb6492133202b3) ) // 06/20/05 11:36:15 V100
+	ROM_LOAD( "v101tw_u36.u36", 0x400000, 0x400000, CRC(f18283e2) SHA1(15323c5f816a0bf6f510311eb49d485ccf713cf7) )
 
 	ROM_REGION( 0x500000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t05601w016.bin",0x180000, 0x200000, CRC(03e110dc) SHA1(41c8f286e9303b24ba6235b341371c298226fb6a) )
+	ROM_LOAD( "igs_t05601w016.u29", 0x180000, 0x200000, CRC(03e110dc) SHA1(41c8f286e9303b24ba6235b341371c298226fb6a) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a05601w064.bin",  0x0000000, 0x0800000, CRC(ea6453e4) SHA1(b5c82edafa8008ad59b5f2219511947d078d446e) )
-	ROM_LOAD( "a05602w064.bin",  0x0800000, 0x0800000, CRC(6d00621b) SHA1(55a4bc357e14b975b0234a9cd49e2224f509dad9) )
-	ROM_LOAD( "a05603w064.bin",  0x1000000, 0x0800000, CRC(7b71c64f) SHA1(bec7c7edf0634cf8351a54abb867c56af08ad2c3) )
-	ROM_LOAD( "a05604w032.bin",  0x1800000, 0x0400000, CRC(9452a567) SHA1(01fdb8e1f131603843ef4c49ab76d7a56b2d6414) )
+	ROM_LOAD( "igs_a05601w064.u3",  0x0000000, 0x0800000, CRC(ea6453e4) SHA1(b5c82edafa8008ad59b5f2219511947d078d446e) )
+	ROM_LOAD( "igs_a05602w064.u4",  0x0800000, 0x0800000, CRC(6d00621b) SHA1(55a4bc357e14b975b0234a9cd49e2224f509dad9) )
+	ROM_LOAD( "igs_a05603w064.u6",  0x1000000, 0x0800000, CRC(7b71c64f) SHA1(bec7c7edf0634cf8351a54abb867c56af08ad2c3) )
+	ROM_LOAD( "igs_a05604w032.u8",  0x1800000, 0x0400000, CRC(9452a567) SHA1(01fdb8e1f131603843ef4c49ab76d7a56b2d6414) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b05601w064.bin",  0x0000000, 0x0800000, CRC(35c0a489) SHA1(a7d5527da01f8eaa7499fb6785b57094521bce97) )
-	ROM_LOAD( "b05602w064.bin",  0x0800000, 0x0800000, CRC(8aad3f85) SHA1(da6996d901d42b3a2ba7019ad014bb938a5e328b) )
+	ROM_LOAD( "igs_b05601w064.u9",  0x0000000, 0x0800000, CRC(35c0a489) SHA1(a7d5527da01f8eaa7499fb6785b57094521bce97) )
+	ROM_LOAD( "igs_b05602w064.u11", 0x0800000, 0x0800000, CRC(8aad3f85) SHA1(da6996d901d42b3a2ba7019ad014bb938a5e328b) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "w05601b064.bin",  0x400000, 0x800000, CRC(bfe61a71) SHA1(e682ca8d57ca51c4d72f64fc091161f3dbdce871) )
-	ROM_LOAD( "w05602b032.bin",  0xc00000, 0x400000, CRC(0685166d) SHA1(64dac49abd2a46d5fb58c678027aa5e23d672dc4) )
+	ROM_LOAD( "igs_w05601b064.u5",  0x400000, 0x800000, CRC(bfe61a71) SHA1(e682ca8d57ca51c4d72f64fc091161f3dbdce871) )
+	ROM_LOAD( "igs_w05602b032.u7",  0xc00000, 0x400000, CRC(0685166d) SHA1(64dac49abd2a46d5fb58c678027aa5e23d672dc4) )
 ROM_END
 
 
 ROM_START( svgpcb )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
-	ROM_LOAD16_WORD_SWAP( "svg_bios.u49",    0x000000, 0x020000, CRC(3346401f) SHA1(28bd730b6026c1e521c95072d33c7bdcd19c1460) )
-	ROM_LOAD16_WORD_SWAP( "svg_v100jp.u50",  0x100000, 0x080000, CRC(8d0405e4) SHA1(b6175c9ffeaac531d28e7845cb34c673476e286a) ) // V100 03/14/05 20:04:08
+	ROM_LOAD16_WORD_SWAP( "svg_bios.u49",        0x000000, 0x020000, CRC(3346401f) SHA1(28bd730b6026c1e521c95072d33c7bdcd19c1460) )
+	ROM_LOAD16_WORD_SWAP( "svg_v100jp_u50.u50",  0x100000, 0x080000, CRC(8d0405e4) SHA1(b6175c9ffeaac531d28e7845cb34c673476e286a) ) // V100 03/14/05 20:04:08
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "svgpcb_igs027a_execute_only_area", 0x0000, 0x00188, NO_DUMP )
 	ROM_LOAD( "svgcpb_igs027a_v100_japan.bin", 0x0188, 0x3e78, CRC(7a59da5d) SHA1(d67ba465db40ca716b4b901b1c8e762716fb954e) )
 
 	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "svg_v100jp.u64", 0x000000, 0x400000, CRC(399d4a8b) SHA1(b120e8386a259e6fd7941acf3c33cf288eda616c) ) // 05/12/05 15:31:35 V100
-	ROM_LOAD( "svg_v100jp.u65", 0x400000, 0x400000, CRC(6e1c33b1) SHA1(66f26b2f4c0b3dcf6d1bb1df48e2ddbcc9d9432d) )
+	ROM_LOAD( "svg_v100jp_u64.u64", 0x000000, 0x400000, CRC(399d4a8b) SHA1(b120e8386a259e6fd7941acf3c33cf288eda616c) ) // 05/12/05 15:31:35 V100
+	ROM_LOAD( "svg_v100jp_u65.u65", 0x400000, 0x400000, CRC(6e1c33b1) SHA1(66f26b2f4c0b3dcf6d1bb1df48e2ddbcc9d9432d) )
 
 	ROM_REGION( 0x500000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS // IGS PGM T01S 1B8558A1 M002146
-	ROM_LOAD( "t05601w016.bin",0x180000, 0x200000, CRC(03e110dc) SHA1(41c8f286e9303b24ba6235b341371c298226fb6a) ) // IGS T05601W016 2C35 B270 2L464103 B050924
+	ROM_LOAD( "igs_t05601w016.u70", 0x180000, 0x200000, CRC(03e110dc) SHA1(41c8f286e9303b24ba6235b341371c298226fb6a) ) // IGS T05601W016 2C35 B270 2L464103 B050924
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a05601w064.bin",  0x0000000, 0x0800000, CRC(ea6453e4) SHA1(b5c82edafa8008ad59b5f2219511947d078d446e) ) // IGS A05601W064 44BF 2ECD 2E153602A1 S050914
-	ROM_LOAD( "a05602w064.bin",  0x0800000, 0x0800000, CRC(6d00621b) SHA1(55a4bc357e14b975b0234a9cd49e2224f509dad9) ) // IGS A05602W064 85C1 8A1F 2E153602A2 S050914
-	ROM_LOAD( "a05603w064.bin",  0x1000000, 0x0800000, CRC(7b71c64f) SHA1(bec7c7edf0634cf8351a54abb867c56af08ad2c3) ) // IGS A05603W064 8EC7 329A 2E153602A3 S050914
-	ROM_LOAD( "a05604w032.bin",  0x1800000, 0x0400000, CRC(9452a567) SHA1(01fdb8e1f131603843ef4c49ab76d7a56b2d6414) ) // IGS A05604W032 55F5 4CDB SL529808 S050912
+	ROM_LOAD( "igs_a05601w064.u44", 0x0000000, 0x0800000, CRC(ea6453e4) SHA1(b5c82edafa8008ad59b5f2219511947d078d446e) ) // IGS A05601W064 44BF 2ECD 2E153602A1 S050914
+	ROM_LOAD( "igs_a05602w064.u45", 0x0800000, 0x0800000, CRC(6d00621b) SHA1(55a4bc357e14b975b0234a9cd49e2224f509dad9) ) // IGS A05602W064 85C1 8A1F 2E153602A2 S050914
+	ROM_LOAD( "igs_a05603w064.u46", 0x1000000, 0x0800000, CRC(7b71c64f) SHA1(bec7c7edf0634cf8351a54abb867c56af08ad2c3) ) // IGS A05603W064 8EC7 329A 2E153602A3 S050914
+	ROM_LOAD( "igs_a05604w032.u47", 0x1800000, 0x0400000, CRC(9452a567) SHA1(01fdb8e1f131603843ef4c49ab76d7a56b2d6414) ) // IGS A05604W032 55F5 4CDB SL529808 S050912
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b05601w064.bin",  0x0000000, 0x0800000, CRC(35c0a489) SHA1(a7d5527da01f8eaa7499fb6785b57094521bce97) ) // IGS B05601W064 EED5 E656 2E350003A1 S050914
-	ROM_LOAD( "b05602w064.bin",  0x0800000, 0x0800000, CRC(8aad3f85) SHA1(da6996d901d42b3a2ba7019ad014bb938a5e328b) ) // IGS B05602W064 DD65 3D89 2E350004A2 S050914
+	ROM_LOAD( "igs_b05601w064.u61", 0x0000000, 0x0800000, CRC(35c0a489) SHA1(a7d5527da01f8eaa7499fb6785b57094521bce97) ) // IGS B05601W064 EED5 E656 2E350003A1 S050914
+	ROM_LOAD( "igs_b05602w064.u62", 0x0800000, 0x0800000, CRC(8aad3f85) SHA1(da6996d901d42b3a2ba7019ad014bb938a5e328b) ) // IGS B05602W064 DD65 3D89 2E350004A2 S050914
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS // IGS PGM M01S 1BB278A1 E002146
-	ROM_LOAD( "w05601b064.bin",  0x400000, 0x800000, CRC(bfe61a71) SHA1(e682ca8d57ca51c4d72f64fc091161f3dbdce871) ) // IGS W05601B064 2530 FBF6 2E350004A3 S050914
-	ROM_LOAD( "w05602b032.bin",  0xc00000, 0x400000, CRC(0685166d) SHA1(64dac49abd2a46d5fb58c678027aa5e23d672dc4) ) // IGS w05602B032 1BC2 90D3 2K453504 S050912
+	ROM_LOAD( "igs_w05601b064.u30", 0x400000, 0x800000, CRC(bfe61a71) SHA1(e682ca8d57ca51c4d72f64fc091161f3dbdce871) ) // IGS W05601B064 2530 FBF6 2E350004A3 S050914
+	ROM_LOAD( "igs_w05602b032.u31", 0xc00000, 0x400000, CRC(0685166d) SHA1(64dac49abd2a46d5fb58c678027aa5e23d672dc4) ) // IGS w05602B032 1BC2 90D3 2K453504 S050912
 ROM_END
 
 
 ROM_START( happy6 )
+	/* All ROMs labels are on stickers */
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "v101cn.u5",      0x100000, 0x080000, CRC(aa4646e3) SHA1(e6772cc480ddd3e1d199364b1f2ff93b973e6842) ) // V101 03/17/04 11:26:48
+	ROM_LOAD16_WORD_SWAP( "s101xx_u5.u5",      0x100000, 0x080000, CRC(aa4646e3) SHA1(e6772cc480ddd3e1d199364b1f2ff93b973e6842) ) // V101 03/17/04 11:26:48
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	// data before 0x188 is read-protected and cannot be read even with a trojan (as with most 2001/2+ IGS titles)
@@ -4126,28 +4369,29 @@
 	ROM_LOAD( "happy6_igs027a_v100_china.bin", 0x0188, 0x3e78, CRC(ed530445) SHA1(05c92d649701be2541557b1334dd6c820ca1009e) )
 
 	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "v102cn.u26", 0x000000, 0x400000, CRC(310510fb) SHA1(e0e80a04e9f7bf27e6581a8935c960bad33bb6de) ) // 03/16/04 14:29:17 V102
+	ROM_LOAD( "v-102cn_u26.u26", 0x000000, 0x400000, CRC(310510fb) SHA1(e0e80a04e9f7bf27e6581a8935c960bad33bb6de) ) // 03/16/04 14:29:17 V102
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t01w64m.u29",0x180000, 0x800000, CRC(2d3feb8b) SHA1(9832b1c46b1ee73febf5c5c8913859f4e0581665) )
+	ROM_LOAD( "t01w64m_u29.u29", 0x180000, 0x800000, CRC(2d3feb8b) SHA1(9832b1c46b1ee73febf5c5c8913859f4e0581665) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a01w64m.u5",  0x0000000, 0x0800000, CRC(bbaa3df3) SHA1(a72268d3989e96d571242279922291d0dc72db28) )
-	ROM_LOAD( "a02w64m.u6",  0x0800000, 0x0800000, CRC(f8c9cd36) SHA1(d9613a83bcc2364492fa922fde1c4f0d07b3009c) )
+	ROM_LOAD( "a01w64m_u5.u5",   0x0000000, 0x0800000, CRC(bbaa3df3) SHA1(a72268d3989e96d571242279922291d0dc72db28) )
+	ROM_LOAD( "a02w64m_u6.u6",   0x0800000, 0x0800000, CRC(f8c9cd36) SHA1(d9613a83bcc2364492fa922fde1c4f0d07b3009c) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b01w64m.u19",  0x0000000, 0x0800000, CRC(73f5f225) SHA1(507126fa96dcec967bdbc0978d79fbce9d25db37) )
+	ROM_LOAD( "b01w64m_u19.u19", 0x0000000, 0x0800000, CRC(73f5f225) SHA1(507126fa96dcec967bdbc0978d79fbce9d25db37) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "w01w64m.u17",  0x400000, 0x800000, CRC(7e23e2be) SHA1(5e920b8e480f00b6666292d4a56039b40af18141) )
+	ROM_LOAD( "w01w64m_u17.u17", 0x400000, 0x800000, CRC(7e23e2be) SHA1(5e920b8e480f00b6666292d4a56039b40af18141) )
 ROM_END
 
 ROM_START( happy6101 )
+	/* All ROMs labels are on stickers */
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "happy6in1_v100cn.u5",      0x100000, 0x080000, CRC(a25418e8) SHA1(acd7e7b69956cb4ce8e26c6420cb97bb4bf404e7) ) // V100 12/22/03 15:35:33
+	ROM_LOAD16_WORD_SWAP( "v100cn_u5.u5",      0x100000, 0x080000, CRC(a25418e8) SHA1(acd7e7b69956cb4ce8e26c6420cb97bb4bf404e7) ) // V100 12/22/03 15:35:33
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	// data before 0x188 is read-protected and cannot be read even with a trojan (as with most 2001/2+ IGS titles)
@@ -4156,28 +4400,29 @@
 	ROM_LOAD( "happy6_igs027a_v100_china.bin", 0x0188, 0x3e78, CRC(ed530445) SHA1(05c92d649701be2541557b1334dd6c820ca1009e) )
 
 	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "happy6in1_v101cn.u26", 0x000000, 0x400000, CRC(4a48ca1c) SHA1(3bebc091787903d45cb84c7302046602a903f59c) ) // 01/09/04 19:51:11 V101
+	ROM_LOAD( "v101cn_u26.u26", 0x000000, 0x400000, CRC(4a48ca1c) SHA1(3bebc091787903d45cb84c7302046602a903f59c) ) // 01/09/04 19:51:11 V101
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t01w64m.u29",0x180000, 0x800000, CRC(2d3feb8b) SHA1(9832b1c46b1ee73febf5c5c8913859f4e0581665) )
+	ROM_LOAD( "t01w64m_u29.u29", 0x180000, 0x800000, CRC(2d3feb8b) SHA1(9832b1c46b1ee73febf5c5c8913859f4e0581665) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a01w64m.u5",  0x0000000, 0x0800000, CRC(bbaa3df3) SHA1(a72268d3989e96d571242279922291d0dc72db28) )
-	ROM_LOAD( "a02w64m.u6",  0x0800000, 0x0800000, CRC(f8c9cd36) SHA1(d9613a83bcc2364492fa922fde1c4f0d07b3009c) )
+	ROM_LOAD( "a01w64m_u5.u5",   0x0000000, 0x0800000, CRC(bbaa3df3) SHA1(a72268d3989e96d571242279922291d0dc72db28) )
+	ROM_LOAD( "a02w64m_u6.u6",   0x0800000, 0x0800000, CRC(f8c9cd36) SHA1(d9613a83bcc2364492fa922fde1c4f0d07b3009c) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b01w64m.u19",  0x0000000, 0x0800000, CRC(73f5f225) SHA1(507126fa96dcec967bdbc0978d79fbce9d25db37) )
+	ROM_LOAD( "b01w64m_u19.u19", 0x0000000, 0x0800000, CRC(73f5f225) SHA1(507126fa96dcec967bdbc0978d79fbce9d25db37) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "w01w64m.u17",  0x400000, 0x800000, CRC(7e23e2be) SHA1(5e920b8e480f00b6666292d4a56039b40af18141) )
+	ROM_LOAD( "w01w64m_u17.u17", 0x400000, 0x800000, CRC(7e23e2be) SHA1(5e920b8e480f00b6666292d4a56039b40af18141) )
 ROM_END
 
 ROM_START( happy6100hk )
+	/* All ROMs labels are on stickers */
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	PGM_68K_BIOS
-	ROM_LOAD16_WORD_SWAP( "h6n1_prog_v100hk.u5",      0x100000, 0x080000, CRC(a25418e8) SHA1(acd7e7b69956cb4ce8e26c6420cb97bb4bf404e7) ) // V100 12/22/03 15:35:33
+	ROM_LOAD16_WORD_SWAP( "v100hk_u5.u5",      0x100000, 0x080000, CRC(a25418e8) SHA1(acd7e7b69956cb4ce8e26c6420cb97bb4bf404e7) ) // V100 12/22/03 15:35:33
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	// data before 0x188 is read-protected and cannot be read even with a trojan (as with most 2001/2+ IGS titles)
@@ -4186,22 +4431,53 @@
 	ROM_LOAD( "happy6_igs027a_v100_china.bin", 0x0188, 0x3e78, BAD_DUMP CRC(ed530445) SHA1(05c92d649701be2541557b1334dd6c820ca1009e) ) // needs the HK version
 
 	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
-	ROM_LOAD( "h6n1_arm_v100hk.u26", 0x000000, 0x400000, CRC(8f2feb1f) SHA1(acbc6620a296e8a6819bf088886bcbfc329f286d) ) // 12/22/03 11:28:36 V100
+	ROM_LOAD( "v100hk_u26.u26", 0x000000, 0x400000, CRC(8f2feb1f) SHA1(acbc6620a296e8a6819bf088886bcbfc329f286d) ) // 12/22/03 11:28:36 V100
+
+	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	PGM_VIDEO_BIOS
+	ROM_LOAD( "t01w64m_u29.u29", 0x180000, 0x800000, CRC(2d3feb8b) SHA1(9832b1c46b1ee73febf5c5c8913859f4e0581665) )
+
+	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "a01w64m_u5.u5",   0x0000000, 0x0800000, CRC(bbaa3df3) SHA1(a72268d3989e96d571242279922291d0dc72db28) )
+	ROM_LOAD( "a02w64m_u6.u6",   0x0800000, 0x0800000, CRC(f8c9cd36) SHA1(d9613a83bcc2364492fa922fde1c4f0d07b3009c) )
+
+	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "b01w64m_u19.u19", 0x0000000, 0x0800000, CRC(73f5f225) SHA1(507126fa96dcec967bdbc0978d79fbce9d25db37) )
+
+	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
+	PGM_AUDIO_BIOS
+	ROM_LOAD( "w01w64m_u17.u17", 0x400000, 0x800000, CRC(7e23e2be) SHA1(5e920b8e480f00b6666292d4a56039b40af18141) )
+ROM_END
+
+ROM_START( happy6100cn )
+	/* All ROMs labels are on stickers */
+	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
+	PGM_68K_BIOS
+	ROM_LOAD16_WORD_SWAP( "v100cn_u5.u5",      0x100000, 0x080000, CRC(a25418e8) SHA1(acd7e7b69956cb4ce8e26c6420cb97bb4bf404e7) ) // V100 12/22/03 15:35:33
+
+	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
+	// data before 0x188 is read-protected and cannot be read even with a trojan (as with most 2001/2+ IGS titles)
+//  ROM_LOAD( "happy6_igs027a.bin", 0x000000, 0x04000, NO_DUMP )
+	ROM_LOAD( "happy6_igs027a_execute_only_area", 0x0000, 0x00188, NO_DUMP )
+	ROM_LOAD( "happy6_igs027a_v100_china.bin", 0x0188, 0x3e78, CRC(ed530445) SHA1(05c92d649701be2541557b1334dd6c820ca1009e) )
+
+	ROM_REGION32_LE( 0x800000, "user1", 0 ) /* Protection Data (encrypted external ARM data) */
+	ROM_LOAD( "v100cn_u26.u26", 0x000000, 0x400000, CRC(9c29e482) SHA1(17a054cb4ab0663e3eba9661c3a9d4dfb7dad010) ) // 12/22/03 11:28:36 V100
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	PGM_VIDEO_BIOS
-	ROM_LOAD( "t01w64m.u29",0x180000, 0x800000, CRC(2d3feb8b) SHA1(9832b1c46b1ee73febf5c5c8913859f4e0581665) )
+	ROM_LOAD( "t01w64m_u29.u29", 0x180000, 0x800000, CRC(2d3feb8b) SHA1(9832b1c46b1ee73febf5c5c8913859f4e0581665) )
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a01w64m.u5",  0x0000000, 0x0800000, CRC(bbaa3df3) SHA1(a72268d3989e96d571242279922291d0dc72db28) )
-	ROM_LOAD( "a02w64m.u6",  0x0800000, 0x0800000, CRC(f8c9cd36) SHA1(d9613a83bcc2364492fa922fde1c4f0d07b3009c) )
+	ROM_LOAD( "a01w64m_u5.u5",   0x0000000, 0x0800000, CRC(bbaa3df3) SHA1(a72268d3989e96d571242279922291d0dc72db28) )
+	ROM_LOAD( "a02w64m_u6.u6",   0x0800000, 0x0800000, CRC(f8c9cd36) SHA1(d9613a83bcc2364492fa922fde1c4f0d07b3009c) )
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b01w64m.u19",  0x0000000, 0x0800000, CRC(73f5f225) SHA1(507126fa96dcec967bdbc0978d79fbce9d25db37) )
+	ROM_LOAD( "b01w64m_u19.u19", 0x0000000, 0x0800000, CRC(73f5f225) SHA1(507126fa96dcec967bdbc0978d79fbce9d25db37) )
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	PGM_AUDIO_BIOS
-	ROM_LOAD( "w01w64m.u17",  0x400000, 0x800000, CRC(7e23e2be) SHA1(5e920b8e480f00b6666292d4a56039b40af18141) )
+	ROM_LOAD( "w01w64m_u17.u17", 0x400000, 0x800000, CRC(7e23e2be) SHA1(5e920b8e480f00b6666292d4a56039b40af18141) )
 ROM_END
 
 /* all known revisions of ketsui have roms marked v100, even when the actual game revision is upgraded */
@@ -4216,18 +4492,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
-	ROM_LOAD( "t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
+	ROM_LOAD( "cave_t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
 
 	ROM_REGION16_LE( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
-	ROM_LOAD( "a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
+	ROM_LOAD( "cave_a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
+	ROM_LOAD( "cave_a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
 
 	ROM_REGION16_LE( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
+	ROM_LOAD( "cave_b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
 
 	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
 	/* there is a position for the PGM audio bios rom, but it's unpopulated, and the M of PGM has been scratched off the PCB */
-	ROM_LOAD( "m04701b032.u17",    0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
+	ROM_LOAD( "cave_m04701b032.u17",   0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ket_defaults.nv",  0x0000000, 0x020000, CRC(3ca892d8) SHA1(67430df5217e453ae8140c5653deeadfad8fa684) )
@@ -4243,18 +4519,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
-	ROM_LOAD( "t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
+	ROM_LOAD( "cave_t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
 
 	ROM_REGION16_LE( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
-	ROM_LOAD( "a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
+	ROM_LOAD( "cave_a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
+	ROM_LOAD( "cave_a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
 
 	ROM_REGION16_LE( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
+	ROM_LOAD( "cave_b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
 
 	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
 	/* there is a position for the PGM audio bios rom, but it's unpopulated, and the M of PGM has been scratched off the PCB */
-	ROM_LOAD( "m04701b032.u17",    0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
+	ROM_LOAD( "cave_m04701b032.u17",   0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ket_defaults.nv",  0x0000000, 0x020000, CRC(3ca892d8) SHA1(67430df5217e453ae8140c5653deeadfad8fa684) )
@@ -4270,18 +4546,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
-	ROM_LOAD( "t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
+	ROM_LOAD( "cave_t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
 
 	ROM_REGION16_LE( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
-	ROM_LOAD( "a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
+	ROM_LOAD( "cave_a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
+	ROM_LOAD( "cave_a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
 
 	ROM_REGION16_LE( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
+	ROM_LOAD( "cave_b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
 
 	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
 	/* there is a position for the PGM audio bios rom, but it's unpopulated, and the M of PGM has been scratched off the PCB */
-	ROM_LOAD( "m04701b032.u17",    0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
+	ROM_LOAD( "cave_m04701b032.u17",   0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ket_defaults.nv",  0x0000000, 0x020000, CRC(3ca892d8) SHA1(67430df5217e453ae8140c5653deeadfad8fa684) )
@@ -4297,18 +4573,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
-	ROM_LOAD( "t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
+	ROM_LOAD( "cave_t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
 
 	ROM_REGION16_LE( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
-	ROM_LOAD( "a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
+	ROM_LOAD( "cave_a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
+	ROM_LOAD( "cave_a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
 
 	ROM_REGION16_LE( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
+	ROM_LOAD( "cave_b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
 
 	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
 	/* there is a position for the PGM audio bios rom, but it's unpopulated, and the M of PGM has been scratched off the PCB */
-	ROM_LOAD( "m04701b032.u17",    0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
+	ROM_LOAD( "cave_m04701b032.u17",   0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ket_defaults.nv",  0x0000000, 0x020000, CRC(3ca892d8) SHA1(67430df5217e453ae8140c5653deeadfad8fa684) )
@@ -4325,18 +4601,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
-	ROM_LOAD( "t04701w064.u19", 0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
+	ROM_LOAD( "cave_t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
 
 	ROM_REGION16_LE( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04701w064.u7", 0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
-	ROM_LOAD( "a04702w064.u8", 0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
+	ROM_LOAD( "cave_a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
+	ROM_LOAD( "cave_a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
 
 	ROM_REGION16_LE( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04701w064.u1", 0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
+	ROM_LOAD( "cave_b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
 
 	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
 	/* there is a position for the PGM audio bios rom, but it's unpopulated, and the M of PGM has been scratched off the PCB */
-	ROM_LOAD( "m04701b032.u17", 0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
+	ROM_LOAD( "cave_m04701b032.u17",   0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ket_defaults.nv", 0x0000000, 0x020000, CRC(3ca892d8) SHA1(67430df5217e453ae8140c5653deeadfad8fa684) )
@@ -4353,18 +4629,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
-	ROM_LOAD( "t04701w064.u19", 0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
+	ROM_LOAD( "cave_t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
 
 	ROM_REGION16_LE( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04701w064.u7", 0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
-	ROM_LOAD( "a04702w064.u8", 0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
+	ROM_LOAD( "cave_a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
+	ROM_LOAD( "cave_a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
 
 	ROM_REGION16_LE( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04701w064.u1", 0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
+	ROM_LOAD( "cave_b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
 
 	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
 	/* there is a position for the PGM audio bios rom, but it's unpopulated, and the M of PGM has been scratched off the PCB */
-	ROM_LOAD( "m04701b032.u17", 0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
+	ROM_LOAD( "cave_m04701b032.u17",   0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ket_defaults.nv", 0x0000000, 0x020000, CRC(3ca892d8) SHA1(67430df5217e453ae8140c5653deeadfad8fa684) )
@@ -4380,18 +4656,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
-	ROM_LOAD( "t04701w064.u19", 0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
+	ROM_LOAD( "cave_t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
 
 	ROM_REGION16_LE( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04701w064.u7", 0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
-	ROM_LOAD( "a04702w064.u8", 0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
+	ROM_LOAD( "cave_a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
+	ROM_LOAD( "cave_a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
 
 	ROM_REGION16_LE( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04701w064.u1", 0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
+	ROM_LOAD( "cave_b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
 
 	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
 	/* there is a position for the PGM audio bios rom, but it's unpopulated, and the M of PGM has been scratched off the PCB */
-	ROM_LOAD( "m04701b032.u17", 0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
+	ROM_LOAD( "cave_m04701b032.u17",   0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ket_defaults.nv", 0x0000000, 0x020000, CRC(3ca892d8) SHA1(67430df5217e453ae8140c5653deeadfad8fa684) )
@@ -4407,18 +4683,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
-	ROM_LOAD( "t04701w064.u19", 0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
+	ROM_LOAD( "cave_t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
 
 	ROM_REGION16_LE( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04701w064.u7", 0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
-	ROM_LOAD( "a04702w064.u8", 0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
+	ROM_LOAD( "cave_a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
+	ROM_LOAD( "cave_a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
 
 	ROM_REGION16_LE( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04701w064.u1", 0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
+	ROM_LOAD( "cave_b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
 
 	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
 	/* there is a position for the PGM audio bios rom, but it's unpopulated, and the M of PGM has been scratched off the PCB */
-	ROM_LOAD( "m04701b032.u17", 0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
+	ROM_LOAD( "cave_m04701b032.u17",   0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ket_defaults.nv", 0x0000000, 0x020000, CRC(3ca892d8) SHA1(67430df5217e453ae8140c5653deeadfad8fa684) )
@@ -4434,18 +4710,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
-	ROM_LOAD( "t04701w064.u19", 0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
+	ROM_LOAD( "cave_t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
 
 	ROM_REGION16_LE( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04701w064.u7", 0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
-	ROM_LOAD( "a04702w064.u8", 0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
+	ROM_LOAD( "cave_a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
+	ROM_LOAD( "cave_a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
 
 	ROM_REGION16_LE( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04701w064.u1", 0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
+	ROM_LOAD( "cave_b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
 
 	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
 	/* there is a position for the PGM audio bios rom, but it's unpopulated, and the M of PGM has been scratched off the PCB */
-	ROM_LOAD( "m04701b032.u17", 0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
+	ROM_LOAD( "cave_m04701b032.u17",   0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ket_defaults.nv", 0x0000000, 0x020000, CRC(3ca892d8) SHA1(67430df5217e453ae8140c5653deeadfad8fa684) )
@@ -4461,18 +4737,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
-	ROM_LOAD( "t04701w064.u19", 0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
+	ROM_LOAD( "cave_t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
 
 	ROM_REGION16_LE( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04701w064.u7", 0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
-	ROM_LOAD( "a04702w064.u8", 0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
+	ROM_LOAD( "cave_a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
+	ROM_LOAD( "cave_a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
 
 	ROM_REGION16_LE( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04701w064.u1", 0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
+	ROM_LOAD( "cave_b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
 
 	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
 	/* there is a position for the PGM audio bios rom, but it's unpopulated, and the M of PGM has been scratched off the PCB */
-	ROM_LOAD( "m04701b032.u17", 0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
+	ROM_LOAD( "cave_m04701b032.u17",   0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ket_defaults.nv", 0x0000000, 0x020000, CRC(3ca892d8) SHA1(67430df5217e453ae8140c5653deeadfad8fa684) )
@@ -4482,22 +4758,23 @@
 	ROM_REGION( 0x600000, "maincpu", 0 )
 	ROM_LOAD16_WORD_SWAP( "ketarr17_v100.u38", 0x000000, 0x200000, CRC(2cb80b89) SHA1(e1aa072b8344890486e11795e02703aa2d234bb1) )
 
-	ROM_REGION( 0x4000, "prot", 0 )
+	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "ket_igs027a.bin", 0x000000, 0x04000, NO_DUMP )
 
-	ROM_REGION( 0xa00000, "tiles", 0 )
-	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) )
-	ROM_LOAD( "t04701w064.u19", 0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
+	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
+	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
+	ROM_LOAD( "cave_t04701w064.u19",   0x180000, 0x800000, CRC(2665b041) SHA1(fb1107778b66f2af0de77ac82e1ee2902f53a959) ) //text-1
 
-	ROM_REGION16_LE( 0x1000000, "sprcol", 0 )
-	ROM_LOAD( "a04701w064.u7", 0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
-	ROM_LOAD( "a04702w064.u8", 0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
+	ROM_REGION16_LE( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
+	ROM_LOAD( "cave_a04701w064.u7",    0x0000000, 0x0800000, CRC(5ef1b94b) SHA1(f10dfa46e0a4d297c3a856aea5b49d648f98935c) ) //image-1
+	ROM_LOAD( "cave_a04702w064.u8",    0x0800000, 0x0800000, CRC(26d6da7f) SHA1(f20e07a7994f41b5ed917f8b0119dc5542f3541c) ) //image-2
 
-	ROM_REGION16_LE( 0x0800000, "sprmask", 0 )
-	ROM_LOAD( "b04701w064.u1", 0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
+	ROM_REGION16_LE( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
+	ROM_LOAD( "cave_b04701w064.u1",    0x0000000, 0x0800000, CRC(1bec008d) SHA1(07d117dc2eebb35727fb18a7c563acbaf25a8d36) ) //bitmap-1
 
-	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 )
-	ROM_LOAD( "m04701b032.u17", 0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
+	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
+	/* there is a position for the PGM audio bios rom, but it's unpopulated, and the M of PGM has been scratched off the PCB */
+	ROM_LOAD( "cave_m04701b032.u17",   0x400000, 0x400000, CRC(b46e22d1) SHA1(670853dc485942fb96380568494bdf3235f446ee) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ket_defaults.nv", 0x0000000, 0x020000, CRC(3ca892d8) SHA1(67430df5217e453ae8140c5653deeadfad8fa684) )
@@ -4555,18 +4832,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "t01s.u18", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM text bios - surface scratched to remove details
-	ROM_LOAD( "t04801w064.u19",   0x180000, 0x800000, CRC(6021c79e) SHA1(fbc340dafb18aa3094de29b881318a5a9794e4bc) ) //text-1
+	ROM_LOAD( "cave_t04801w064.u19",   0x180000, 0x800000, CRC(6021c79e) SHA1(fbc340dafb18aa3094de29b881318a5a9794e4bc) ) //text-1
 
 	ROM_REGION16_LE( 0x1000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04801w064.u7",    0x0000000, 0x0800000, CRC(26dd4932) SHA1(9bbabb5a53cb5ba88397cc2c258980f3b70314ce) ) //image-1
-	ROM_LOAD( "a04802w064.u8",    0x0800000, 0x0800000, CRC(0e6bf7a9) SHA1(a7541e2b5a0df2bc62a5b347e54dbc2ed1922db2) ) //image-2
+	ROM_LOAD( "cave_a04801w064.u7",    0x0000000, 0x0800000, CRC(26dd4932) SHA1(9bbabb5a53cb5ba88397cc2c258980f3b70314ce) ) //image-1
+	ROM_LOAD( "cave_a04802w064.u8",    0x0800000, 0x0800000, CRC(0e6bf7a9) SHA1(a7541e2b5a0df2bc62a5b347e54dbc2ed1922db2) ) //image-2
 
 	ROM_REGION16_LE( 0x0800000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04801w064.u1",    0x0000000, 0x0800000, CRC(98dce13a) SHA1(61d48b7117459f7babc022b68231f6928177a71d) ) //bitmap-1
+	ROM_LOAD( "cave_b04801w064.u1",    0x0000000, 0x0800000, CRC(98dce13a) SHA1(61d48b7117459f7babc022b68231f6928177a71d) ) //bitmap-1
 
 	ROM_REGION( 0x800000, "ics", ROMREGION_ERASE00 ) /* Samples - (8 bit mono 11025Hz) - */
 	/* there is a position for the PGM audio bios rom, but it's unpopulated, same as ketsui but not "PGM" string on PCB */
-	ROM_LOAD( "w04801b032.u17",    0x400000, 0x400000, CRC(60298536) SHA1(6b7333f16cce778c5725dbdf75a5446f0906397a) ) //music-1
+	ROM_LOAD( "cave_w04801b032.u17",   0x400000, 0x400000, CRC(60298536) SHA1(6b7333f16cce778c5725dbdf75a5446f0906397a) ) //music-1
 ROM_END
 
 ROM_START( espgalbl ) // this assumes a Dodonpachi 2 Bee Storm cart was used
@@ -4608,18 +4885,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM bios
-	ROM_LOAD( "t04401w064.u19",0x180000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) ) //text-1
+	ROM_LOAD( "cave_t04401w064.u19", 0x180000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) ) //text-1
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04401w064.u7",  0x0000000, 0x0800000, CRC(ed229794) SHA1(1cf1863495a18c7c7d277a9be43ec116b00960b0) ) //image-1
-	ROM_LOAD( "a04402w064.u8",  0x0800000, 0x0800000, CRC(752167b0) SHA1(c33c3398dd8e479c9d5bd348924958a6aecbf0fc) ) //image-2
+	ROM_LOAD( "cave_a04401w064.u7",  0x0000000, 0x0800000, CRC(ed229794) SHA1(1cf1863495a18c7c7d277a9be43ec116b00960b0) ) //image-1
+	ROM_LOAD( "cave_a04402w064.u8",  0x0800000, 0x0800000, CRC(752167b0) SHA1(c33c3398dd8e479c9d5bd348924958a6aecbf0fc) ) //image-2
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04401w064.u1",  0x0000000, 0x0800000, CRC(17731c9d) SHA1(0e0aa0ec01035323985ac8e08228a0fd6edf6689) ) //bitmap-1
+	ROM_LOAD( "cave_b04401w064.u1",  0x0000000, 0x0800000, CRC(17731c9d) SHA1(0e0aa0ec01035323985ac8e08228a0fd6edf6689) ) //bitmap-1
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	ROM_LOAD( "pgm_m01s.rom", 0x000000, 0x200000, CRC(45ae7159) SHA1(d3ed3ff3464557fd0df6b069b2e431528b0ebfa8) ) // same as standard PGM bios
-	ROM_LOAD( "m04401b032.u17",  0x400000, 0x400000, CRC(5a0dbd76) SHA1(06ab202f6bd5ebfb35b9d8cc7a8fb83ec8840659) ) //music-1
+	ROM_LOAD( "cave_m04401b032.u17", 0x400000, 0x400000, CRC(5a0dbd76) SHA1(06ab202f6bd5ebfb35b9d8cc7a8fb83ec8840659) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ddp3_defaults.nv",  0x0000000, 0x020000, CRC(571e96c0) SHA1(348940c77ca348213331b85b9b1d3aabb96a528a) )
@@ -4627,7 +4904,7 @@
 
 ROM_START( ddpdoj )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
-	ROM_LOAD16_WORD_SWAP( "ddp3_bios.u37",    0x00000, 0x080000, CRC(b3cc5c8f) SHA1(02d9511cf71e4a0d6ca8fd9a1ef2c79b0d001824) ) // uses a standard PGM bios with the startup logos hacked out
+	ROM_LOAD16_WORD_SWAP( "ddp3_bios.u37",   0x00000, 0x080000, CRC(b3cc5c8f) SHA1(02d9511cf71e4a0d6ca8fd9a1ef2c79b0d001824) ) // uses a standard PGM bios with the startup logos hacked out
 	ROM_LOAD16_WORD_SWAP( "ddp3_v101.u36",  0x100000, 0x200000, CRC(195b5c1e) SHA1(f18d791c034b0a3d85888a92fb5d326ee3deb04f) ) // yes this one was actually marked v101 which goes against the standard Cave marking system
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
@@ -4635,18 +4912,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM bios
-	ROM_LOAD( "t04401w064.u19",0x180000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) ) //text-1
+	ROM_LOAD( "cave_t04401w064.u19", 0x180000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) ) //text-1
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04401w064.u7",  0x0000000, 0x0800000, CRC(ed229794) SHA1(1cf1863495a18c7c7d277a9be43ec116b00960b0) ) //image-1
-	ROM_LOAD( "a04402w064.u8",  0x0800000, 0x0800000, CRC(752167b0) SHA1(c33c3398dd8e479c9d5bd348924958a6aecbf0fc) ) //image-2
+	ROM_LOAD( "cave_a04401w064.u7",  0x0000000, 0x0800000, CRC(ed229794) SHA1(1cf1863495a18c7c7d277a9be43ec116b00960b0) ) //image-1
+	ROM_LOAD( "cave_a04402w064.u8",  0x0800000, 0x0800000, CRC(752167b0) SHA1(c33c3398dd8e479c9d5bd348924958a6aecbf0fc) ) //image-2
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04401w064.u1",  0x0000000, 0x0800000, CRC(17731c9d) SHA1(0e0aa0ec01035323985ac8e08228a0fd6edf6689) ) //bitmap-1
+	ROM_LOAD( "cave_b04401w064.u1",  0x0000000, 0x0800000, CRC(17731c9d) SHA1(0e0aa0ec01035323985ac8e08228a0fd6edf6689) ) //bitmap-1
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	ROM_LOAD( "pgm_m01s.rom", 0x000000, 0x200000, CRC(45ae7159) SHA1(d3ed3ff3464557fd0df6b069b2e431528b0ebfa8) ) // same as standard PGM bios
-	ROM_LOAD( "m04401b032.u17",  0x400000, 0x400000, CRC(5a0dbd76) SHA1(06ab202f6bd5ebfb35b9d8cc7a8fb83ec8840659) ) //music-1
+	ROM_LOAD( "cave_m04401b032.u17", 0x400000, 0x400000, CRC(5a0dbd76) SHA1(06ab202f6bd5ebfb35b9d8cc7a8fb83ec8840659) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ddp3_defaults.nv",  0x0000000, 0x020000, CRC(571e96c0) SHA1(348940c77ca348213331b85b9b1d3aabb96a528a) )
@@ -4663,18 +4940,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM bios
-	ROM_LOAD( "t04401w064.u19",0x180000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) ) //text-1
+	ROM_LOAD( "cave_t04401w064.u19", 0x180000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) ) //text-1
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04401w064.u7",  0x0000000, 0x0800000, CRC(ed229794) SHA1(1cf1863495a18c7c7d277a9be43ec116b00960b0) ) //image-1
-	ROM_LOAD( "a04402w064.u8",  0x0800000, 0x0800000, CRC(752167b0) SHA1(c33c3398dd8e479c9d5bd348924958a6aecbf0fc) ) //image-2
+	ROM_LOAD( "cave_a04401w064.u7",  0x0000000, 0x0800000, CRC(ed229794) SHA1(1cf1863495a18c7c7d277a9be43ec116b00960b0) ) //image-1
+	ROM_LOAD( "cave_a04402w064.u8",  0x0800000, 0x0800000, CRC(752167b0) SHA1(c33c3398dd8e479c9d5bd348924958a6aecbf0fc) ) //image-2
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04401w064.u1",  0x0000000, 0x0800000, CRC(17731c9d) SHA1(0e0aa0ec01035323985ac8e08228a0fd6edf6689) ) //bitmap-1
+	ROM_LOAD( "cave_b04401w064.u1",  0x0000000, 0x0800000, CRC(17731c9d) SHA1(0e0aa0ec01035323985ac8e08228a0fd6edf6689) ) //bitmap-1
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	ROM_LOAD( "pgm_m01s.rom", 0x000000, 0x200000, CRC(45ae7159) SHA1(d3ed3ff3464557fd0df6b069b2e431528b0ebfa8) ) // same as standard PGM bios
-	ROM_LOAD( "m04401b032.u17",  0x400000, 0x400000, CRC(5a0dbd76) SHA1(06ab202f6bd5ebfb35b9d8cc7a8fb83ec8840659) ) //music-1
+	ROM_LOAD( "cave_m04401b032.u17", 0x400000, 0x400000, CRC(5a0dbd76) SHA1(06ab202f6bd5ebfb35b9d8cc7a8fb83ec8840659) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ddp3_defaults.nv",  0x0000000, 0x020000, CRC(571e96c0) SHA1(348940c77ca348213331b85b9b1d3aabb96a528a) )
@@ -4683,25 +4960,25 @@
 ROM_START( ddpdojb )
 	ROM_REGION( 0x600000, "maincpu", 0 ) /* 68000 Code */
 	ROM_LOAD16_WORD_SWAP( "ddp3_bios.u37",    0x00000, 0x080000, CRC(b3cc5c8f) SHA1(02d9511cf71e4a0d6ca8fd9a1ef2c79b0d001824) ) // uses a standard PGM bios with the startup logos hacked out
-	ROM_LOAD16_WORD_SWAP( "dd v100.bin",  0x100000, 0x200000, CRC(7da0c1e4) SHA1(aca2fe35ba0ab3628900fa2aba2d22fc4fd7046d) ) // marked v100
+	ROM_LOAD16_WORD_SWAP( "dd_v100.u36",  0x100000, 0x200000, CRC(7da0c1e4) SHA1(aca2fe35ba0ab3628900fa2aba2d22fc4fd7046d) ) // marked v100
 
 	ROM_REGION( 0x4000, "prot", 0 ) /* ARM protection ASIC - internal rom */
 	ROM_LOAD( "ddp3_igs027a.bin", 0x000000, 0x04000, NO_DUMP )
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM bios
-	ROM_LOAD( "t04401w064.u19",0x180000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) ) //text-1
+	ROM_LOAD( "cave_t04401w064.u19", 0x180000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) ) //text-1
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04401w064.u7",  0x0000000, 0x0800000, CRC(ed229794) SHA1(1cf1863495a18c7c7d277a9be43ec116b00960b0) ) //image-1
-	ROM_LOAD( "a04402w064.u8",  0x0800000, 0x0800000, CRC(752167b0) SHA1(c33c3398dd8e479c9d5bd348924958a6aecbf0fc) ) //image-2
+	ROM_LOAD( "cave_a04401w064.u7",  0x0000000, 0x0800000, CRC(ed229794) SHA1(1cf1863495a18c7c7d277a9be43ec116b00960b0) ) //image-1
+	ROM_LOAD( "cave_a04402w064.u8",  0x0800000, 0x0800000, CRC(752167b0) SHA1(c33c3398dd8e479c9d5bd348924958a6aecbf0fc) ) //image-2
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04401w064.u1",  0x0000000, 0x0800000, CRC(17731c9d) SHA1(0e0aa0ec01035323985ac8e08228a0fd6edf6689) ) //bitmap-1
+	ROM_LOAD( "cave_b04401w064.u1",  0x0000000, 0x0800000, CRC(17731c9d) SHA1(0e0aa0ec01035323985ac8e08228a0fd6edf6689) ) //bitmap-1
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	ROM_LOAD( "pgm_m01s.rom", 0x000000, 0x200000, CRC(45ae7159) SHA1(d3ed3ff3464557fd0df6b069b2e431528b0ebfa8) ) // same as standard PGM bios
-	ROM_LOAD( "m04401b032.u17",  0x400000, 0x400000, CRC(5a0dbd76) SHA1(06ab202f6bd5ebfb35b9d8cc7a8fb83ec8840659) ) //music-1
+	ROM_LOAD( "cave_m04401b032.u17", 0x400000, 0x400000, CRC(5a0dbd76) SHA1(06ab202f6bd5ebfb35b9d8cc7a8fb83ec8840659) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* default settings */
 	ROM_LOAD( "ddp3_defaults.nv",  0x0000000, 0x020000, CRC(571e96c0) SHA1(348940c77ca348213331b85b9b1d3aabb96a528a) )
@@ -4748,18 +5025,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM bios
-	ROM_LOAD( "t04401w064.u19",0x180000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) ) //text-1
+	ROM_LOAD( "cave_t04401w064.u19", 0x180000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) ) //text-1
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04401w064.u7",  0x0000000, 0x0800000, CRC(ed229794) SHA1(1cf1863495a18c7c7d277a9be43ec116b00960b0) ) //image-1
-	ROM_LOAD( "a04402w064.u8",  0x0800000, 0x0800000, CRC(752167b0) SHA1(c33c3398dd8e479c9d5bd348924958a6aecbf0fc) ) //image-2
+	ROM_LOAD( "cave_a04401w064.u7",  0x0000000, 0x0800000, CRC(ed229794) SHA1(1cf1863495a18c7c7d277a9be43ec116b00960b0) ) //image-1
+	ROM_LOAD( "cave_a04402w064.u8",  0x0800000, 0x0800000, CRC(752167b0) SHA1(c33c3398dd8e479c9d5bd348924958a6aecbf0fc) ) //image-2
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04401w064.u1",  0x0000000, 0x0800000, CRC(17731c9d) SHA1(0e0aa0ec01035323985ac8e08228a0fd6edf6689) ) //bitmap-1
+	ROM_LOAD( "cave_b04401w064.u1",  0x0000000, 0x0800000, CRC(17731c9d) SHA1(0e0aa0ec01035323985ac8e08228a0fd6edf6689) ) //bitmap-1
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	ROM_LOAD( "pgm_m01s.rom", 0x000000, 0x200000, CRC(45ae7159) SHA1(d3ed3ff3464557fd0df6b069b2e431528b0ebfa8) ) // same as standard PGM bios
-	ROM_LOAD( "m04401b032.u17",  0x400000, 0x400000, CRC(5a0dbd76) SHA1(06ab202f6bd5ebfb35b9d8cc7a8fb83ec8840659) ) //music-1
+	ROM_LOAD( "cave_m04401b032.u17", 0x400000, 0x400000, CRC(5a0dbd76) SHA1(06ab202f6bd5ebfb35b9d8cc7a8fb83ec8840659) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* NVRAM with factory programmed values - needed to boot */
 	ROM_LOAD( "ddp3blk_defaults.nv",  0x0000000, 0x020000, CRC(a1651904) SHA1(5b80d3c4c764895c40953a66161d4dd84f742604) )
@@ -4775,18 +5052,18 @@
 
 	ROM_REGION( 0xa00000, "tiles", 0 ) /* 8x8 Text Tiles + 32x32 BG Tiles */
 	ROM_LOAD( "pgm_t01s.rom", 0x000000, 0x200000, CRC(1a7123a0) SHA1(cc567f577bfbf45427b54d6695b11b74f2578af3) ) // same as standard PGM bios
-	ROM_LOAD( "t04401w064.u19",0x180000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) ) //text-1
+	ROM_LOAD( "cave_t04401w064.u19", 0x180000, 0x800000, CRC(3a95f19c) SHA1(fd3c47cf0b8b1e20c6bec4be68a089fc8bbf4dbe) ) //text-1
 
 	ROM_REGION16_LE( 0x2000000, "sprcol", 0 ) /* Sprite Colour Data */
-	ROM_LOAD( "a04401w064.u7",  0x0000000, 0x0800000, CRC(ed229794) SHA1(1cf1863495a18c7c7d277a9be43ec116b00960b0) ) //image-1
-	ROM_LOAD( "a04402w064.u8",  0x0800000, 0x0800000, CRC(752167b0) SHA1(c33c3398dd8e479c9d5bd348924958a6aecbf0fc) ) //image-2
+	ROM_LOAD( "cave_a04401w064.u7",  0x0000000, 0x0800000, CRC(ed229794) SHA1(1cf1863495a18c7c7d277a9be43ec116b00960b0) ) //image-1
+	ROM_LOAD( "cave_a04402w064.u8",  0x0800000, 0x0800000, CRC(752167b0) SHA1(c33c3398dd8e479c9d5bd348924958a6aecbf0fc) ) //image-2
 
 	ROM_REGION16_LE( 0x1000000, "sprmask", 0 ) /* Sprite Masks + Colour Indexes */
-	ROM_LOAD( "b04401w064.u1",  0x0000000, 0x0800000, CRC(17731c9d) SHA1(0e0aa0ec01035323985ac8e08228a0fd6edf6689) ) //bitmap-1
+	ROM_LOAD( "cave_b04401w064.u1",  0x0000000, 0x0800000, CRC(17731c9d) SHA1(0e0aa0ec01035323985ac8e08228a0fd6edf6689) ) //bitmap-1
 
 	ROM_REGION( 0x1000000, "ics", 0 ) /* Samples - (8 bit mono 11025Hz) - */
 	ROM_LOAD( "pgm_m01s.rom", 0x000000, 0x200000, CRC(45ae7159) SHA1(d3ed3ff3464557fd0df6b069b2e431528b0ebfa8) ) // same as standard PGM bios
-	ROM_LOAD( "m04401b032.u17",  0x400000, 0x400000, CRC(5a0dbd76) SHA1(06ab202f6bd5ebfb35b9d8cc7a8fb83ec8840659) ) //music-1
+	ROM_LOAD( "cave_m04401b032.u17", 0x400000, 0x400000, CRC(5a0dbd76) SHA1(06ab202f6bd5ebfb35b9d8cc7a8fb83ec8840659) ) //music-1
 
 	ROM_REGION( 0x20000, "sram", 0 ) /* NVRAM with factory programmed values - needed to boot */
 	ROM_LOAD( "ddp3blk_defaults.nv",  0x0000000, 0x020000, CRC(a1651904) SHA1(5b80d3c4c764895c40953a66161d4dd84f742604) )
@@ -4854,16 +5131,18 @@
 GAME( 1997, orlegend111c, orlegend,  pgm_asic3,              orlegend,  pgm_asic3_state,   init_orlegend, ROT0,   "IGS", "Oriental Legend / Xiyou Shi E Chuan (ver. 111, Chinese Board)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )  // V0001 no date!          - runs as HongKong, China, China
 GAME( 1997, orlegend111t, orlegend,  pgm_asic3,              orlegendt, pgm_asic3_state,   init_orlegend, ROT0,   "IGS", "Oriental Legend / Xiyou Shi E Chuan (ver. 111, Taiwanese Board)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )// V0001 no date! - needs a different protection sequence
 GAME( 1997, orlegend111k, orlegend,  pgm_asic3,              orlegendk, pgm_asic3_state,   init_orlegend, ROT0,   "IGS", "Oriental Legend / Xiyou Shi E Chuan (ver. 111, Korean Board)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )   // not checked
+GAME( 1997, orlegend105t, orlegend,  pgm_asic3,              orlegendt, pgm_asic3_state,   init_orlegend, ROT0,   "IGS", "Oriental Legend / Xiyou Shi E Chuan (ver. 105, Taiwanese Board)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )// V0000 no date! - needs a different protection sequence
 GAME( 1997, orlegend105k, orlegend,  pgm_asic3,              orlegendk, pgm_asic3_state,   init_orlegend, ROT0,   "IGS", "Oriental Legend / Xiyou Shi E Chuan (ver. 105, Korean Board)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )  //  V0000 no date!          - runs as Korea
 
 //Dragon World II
 //中國龍II/Zhōngguó lóng II (China, Taiwan, Japan; Traditional Chinese only in title screen)
 //東方之珠II/Dung1Fong1 Zi1 Zyu1 II (Hong Kong)/dongbang jiju II (Korea(undumped))
 GAME( 1997, drgw2,        pgm,       pgm_012_025_drgw2,      pgm,       pgm_012_025_state, init_drgw2,    ROT0,   "IGS", "Dragon World II (ver. 110X, Export)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1997, dw2v100x,     drgw2,     pgm_012_025_drgw2,      pgm,       pgm_012_025_state, init_dw2v100x, ROT0,   "IGS", "Dragon World II (ver. 100X, Export)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1997, drgw2j,       drgw2,     pgm_012_025_drgw2,      pgm,       pgm_012_025_state, init_drgw2j,   ROT0,   "IGS (Alta license)", "Chuugokuryuu II (ver. 100J, Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1997, drgw2c,       drgw2,     pgm_012_025_drgw2,      pgm,       pgm_012_025_state, init_drgw2c,   ROT0,   "IGS", "Zhongguo Long II (ver. 100C, China)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1997, drgw2hk,      drgw2,     pgm_012_025_drgw2,      pgm,       pgm_012_025_state, init_drgw2hk,  ROT0,   "IGS", "Dungfong Zi Zyu II (ver. 100H, Hong Kong)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // (region is shown as Hokg Kong, Dragon World 3 is the same)
+GAME( 1997, drgw2100x,    drgw2,     pgm_012_025_drgw2,      pgm,       pgm_012_025_state, init_dw2v100x, ROT0,   "IGS", "Dragon World II (ver. 100X, Export)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1997, drgw2100j,    drgw2,     pgm_012_025_drgw2,      pgm,       pgm_012_025_state, init_drgw2j,   ROT0,   "IGS (Alta license)", "Chuugokuryuu II (ver. 100J, Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1997, drgw2101c,    drgw2,     pgm_012_025_drgw2,      pgm,       pgm_012_025_state, init_drgw2c101,ROT0,   "IGS", "Zhongguo Long II (ver. 101C, China)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1997, drgw2100c,    drgw2,     pgm_012_025_drgw2,      pgm,       pgm_012_025_state, init_drgw2c,   ROT0,   "IGS", "Zhongguo Long II (ver. 100C, China)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1997, drgw2100hk,   drgw2,     pgm_012_025_drgw2,      pgm,       pgm_012_025_state, init_drgw2hk,  ROT0,   "IGS", "Dungfong Zi Zyu II (ver. 100H, Hong Kong)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // (region is shown as Hokg Kong, Dragon World 3 is the same)
 
 //The Killing Blade
 //傲剑狂刀/Ào jiàn kuáng dāo (China, Hong Kong; Simplified Chinese)
@@ -4892,7 +5171,7 @@
 GAME( 1999, photoy2k,     pgm,       pgm_arm_type1,          photoy2k,  pgm_arm_type1_state, init_photoy2k, ROT0,   "IGS", "Photo Y2K / Chaoji Bi Yi Bi / Dajia Lai Zhao Cha / Real and Fake (ver. 105)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) /* region provided by protection device */
 GAME( 1999, photoy2k104,  photoy2k,  pgm_arm_type1,          photoy2k,  pgm_arm_type1_state, init_photoy2k, ROT0,   "IGS", "Photo Y2K / Chaoji Bi Yi Bi / Dajia Lai Zhao Cha / Real and Fake (ver. 104)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) /* region provided by protection device */
 GAME( 1999, photoy2k103j, photoy2k,  pgm_arm_type1,          photoy2kj, pgm_arm_type1_state, init_photoy2k, ROT0,   "IGS", "Photo Y2K / Chaoji Bi Yi Bi / Dajia Lai Zhao Cha / Real and Fake (ver. 103, Japanese Board)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) /* region provided by protection device */
-GAME( 1999, photoy2k102,  photoy2k,  pgm_arm_type1,          photoy2k,  pgm_arm_type1_state, init_photoy2k, ROT0,   "IGS", "Photo Y2K / Chaoji Bi Yi Bi / Dajia Lai Zhao Cha / Real and Fake (ver. 102, Japanese Board)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) /* region provided by protection device */
+GAME( 1999, photoy2k102j, photoy2k,  pgm_arm_type1,          photoy2k,  pgm_arm_type1_state, init_photoy2k, ROT0,   "IGS", "Photo Y2K / Chaoji Bi Yi Bi / Dajia Lai Zhao Cha / Real and Fake (ver. 102, Japanese Board)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) /* region provided by protection device */
 
 //三国战纪风云再起/Sānguó zhàn jì Fēngyún zàiqǐ (China, Hong Kong; Simplified Chinese)
 //三國戰紀風雲再起/Sānguó zhàn jì Fēngyún zàiqǐ (Taiwan; Traditional Chinese)
@@ -4924,15 +5203,16 @@
 // region provided by internal ARM rom (we only have a China internal ROM)
 GAME( 2001, kov2p,        pgm,       pgm_arm_type2,          kov2,      pgm_arm_type2_state, init_kov2p,      ROT0,   "IGS", "Knights of Valour 2 Plus - Nine Dragons / Sanguo Zhan Ji 2 Qunxiong Zhengba / Sanguo Zhan Ji 2 Feilong Zai Tian / Sangoku Senki Busyou Souha (ver. M205XX, 200, 100CN)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 04/25/02  17:48:27 M205XX
 GAME( 2001, kov2p204,     kov2p,     pgm_arm_type2,          kov2,      pgm_arm_type2_state, init_kov2p,      ROT0,   "IGS", "Knights of Valour 2 Plus - Nine Dragons / Sanguo Zhan Ji 2 Qunxiong Zhengba / Sanguo Zhan Ji 2 Feilong Zai Tian / Sangoku Senki Busyou Souha (ver. M204XX, 200, 100CN)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 08/28/01  09:11:49 M204XX
+GAME( 2001, kov2p203,     kov2p,     pgm_arm_type2,          kov2,      pgm_arm_type2_state, init_kov2p,      ROT0,   "IGS", "Knights of Valour 2 Plus - Nine Dragons / Sanguo Zhan Ji 2 Qunxiong Zhengba / Sanguo Zhan Ji 2 Feilong Zai Tian / Sangoku Senki Busyou Souha (ver. M203XX, 200, 100CN)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 08/13/01  16:57:32 M203XX
 GAME( 2001, kov2p202,     kov2p,     pgm_arm_type2,          kov2,      pgm_arm_type2_state, init_kov2p,      ROT0,   "IGS", "Knights of Valour 2 Plus - Nine Dragons / Sanguo Zhan Ji 2 Qunxiong Zhengba / Sanguo Zhan Ji 2 Feilong Zai Tian / Sangoku Senki Busyou Souha (ver. M202XX, 200, 100CN)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 07/09/01  11:03:50 M202XX
 GAME( 2001, kov2p200,     kov2p,     pgm_arm_type2,          kov2,      pgm_arm_type2_state, init_kov2p,      ROT0,   "IGS", "Knights of Valour 2 Plus - Nine Dragons / Sanguo Zhan Ji 2 Qunxiong Zhengba / Sanguo Zhan Ji 2 Feilong Zai Tian / Sangoku Senki Busyou Souha (ver. M200XX, 200, 100CN)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 06/18/01  22:59:12 M200XX
 
 //形意拳/Xíng yì quán/Sin ī ken(Japanese label)
 // region provided by internal ARM rom
 GAME( 2001, martmast,     pgm,       pgm_arm_type2_22m,      martmast,  pgm_arm_type2_state, init_martmast,   ROT0,   "IGS", "Martial Masters / Xing Yi Quan (ver. 104, 102, 102US)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k V104, Ext Arm 102, Int Arm 102US
-GAME( 2001, martmastc,    martmast,  pgm_arm_type2_22m,      martmast,  pgm_arm_type2_state, init_martmast,   ROT0,   "IGS", "Martial Masters / Xing Yi Quan (ver. 104, 102, 101CN)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k V104, Ext Arm 102, Int Arm 101CN
-GAME( 2001, martmastc103, martmast,  pgm_arm_type2_22m,      martmast,  pgm_arm_type2_state, init_martmast,   ROT0,   "IGS", "Martial Masters / Xing Yi Quan (ver. 103, 102, 101CN)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k V103, Ext Arm 102, Int Arm 101CN (actually 102 CN on the PCB, needs to be dumped)
-GAME( 2001, martmastc102, martmast,  pgm_arm_type2_22m,      martmast,  pgm_arm_type2_state, init_martmast,   ROT0,   "IGS", "Martial Masters / Xing Yi Quan (ver. 102, 101, 101CN)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k V102, Ext Arm 101, Int Arm 101CN
+GAME( 2001, martmast104c, martmast,  pgm_arm_type2_22m,      martmast,  pgm_arm_type2_state, init_martmast,   ROT0,   "IGS", "Martial Masters / Xing Yi Quan (ver. 104, 102, 101CN)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k V104, Ext Arm 102, Int Arm 101CN
+GAME( 2001, martmast103c, martmast,  pgm_arm_type2_22m,      martmast,  pgm_arm_type2_state, init_martmast,   ROT0,   "IGS", "Martial Masters / Xing Yi Quan (ver. 103, 102, 101CN)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k V103, Ext Arm 102, Int Arm 101CN (actually 102 CN on the PCB, needs to be dumped)
+GAME( 2001, martmast102c, martmast,  pgm_arm_type2_22m,      martmast,  pgm_arm_type2_state, init_martmast,   ROT0,   "IGS", "Martial Masters / Xing Yi Quan (ver. 102, 101, 101CN)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k V102, Ext Arm 101, Int Arm 101CN
 GAME( 2001, martmasttw,   martmast,  pgm_arm_type2_22m,      martmast,  pgm_arm_type2_state, init_martmast,   ROT0,   "IGS", "Martial Masters / Xing Yi Quan (ver. 102, 101, 101TW)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) // 68k V102, Ext Arm 101, Int Arm 101TW
 
 //蜂暴/Fēng bào (Chinese, Title call excepting Japan)/Fung1 Bou6 (Hong Kong, Jyutping)
@@ -4962,27 +5242,28 @@
 
 // japan region only? service mode calls it Dragon World Pretty Chance so I'm leaving that title in the description
 // english / chinese version also exists
-GAME( 2001, dwpc,         pgm,       pgm_arm_type2_22m,      dw2001,    pgm_arm_type2_state, init_dwpc,       ROT0,   "IGS", "Chuugokuryuu Pretty Chance [Dragon World Pretty Chance] (V101 09/26/01 10:23:26, Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 09/26/01 10:23:26
+GAME( 2001, dwpc,         pgm,       pgm_arm_type2_22m,      dw2001,    pgm_arm_type2_state, init_dwpc,       ROT0,   "IGS", "Zhongguo Long Pretty Chance [Dragon World Pretty Chance] (V110 03/19/02 11:13:16, China)", MACHINE_UNEMULATED_PROTECTION | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 03/19/02 11:13:16, needs proper ARM internal ROM dump, currently hacked, needs reset before working
+GAME( 2001, dwpc101j,     dwpc,      pgm_arm_type2_22m,      dw2001,    pgm_arm_type2_state, init_dwpc101j,   ROT0,   "IGS", "Chuugokuryuu Pretty Chance [Dragon World Pretty Chance] (V101 09/26/01 10:23:26, Japan)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 09/26/01 10:23:26
 
 //魔域戰線/Móyù zhànxiàn (Traditional Chinese)
 //魔域战线/Móyù zhànxiàn (Simplified Chinese)
 // we bypass the internal ARM rom on these, ideally it should still be dumped tho! the region screens show a blank string where the internal ROM revision would otherwise be displayed
 // ARM version strings don't match 100% with labels... for 68k ROMs I'm using the build time / date stamp from near the start of the rom, there are some slightly different time stamps later
 GAME( 2002, dmnfrnt,      pgm,       pgm_arm_type3_22m,      pgm,       pgm_arm_type3_state, init_dmnfrnt,    ROT0,   "IGS", "Demon Front / Moyu Zhanxian (68k label V105, ROM M105XX 08/05/02) (ARM label V105, ROM 08/05/02 S105XX)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k time: 10:24:11 ARM time: 10:33:23
-GAME( 2002, dmnfrntb,     dmnfrnt,   pgm_arm_type3_22m,      pgm,       pgm_arm_type3_state, init_dmnfrnt,    ROT0,   "IGS", "Demon Front / Moyu Zhanxian (68k label V103, ROM M103XX 07/05/02) (ARM label V103, ROM 07/05/02 S103XX)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k time: 14:43:13 ARM time: 11:04:24
-GAME( 2002, dmnfrnta,     dmnfrnt,   pgm_arm_type3_22m,      pgm,       pgm_arm_type3_state, init_dmnfrnt,    ROT0,   "IGS", "Demon Front / Moyu Zhanxian (68k label V102, ROM M102XX 06/19/02) (ARM label V102, ROM 05/24/02 S101XX)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k time: 13:44:08 ARM time: 13:04:31  (from the strings it looks like V102 only upgraded the 68k ROM)
+GAME( 2002, dmnfrnt103,   dmnfrnt,   pgm_arm_type3_22m,      pgm,       pgm_arm_type3_state, init_dmnfrnt,    ROT0,   "IGS", "Demon Front / Moyu Zhanxian (68k label V103, ROM M103XX 07/05/02) (ARM label V103, ROM 07/05/02 S103XX)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k time: 14:43:13 ARM time: 11:04:24
+GAME( 2002, dmnfrnt102,   dmnfrnt,   pgm_arm_type3_22m,      pgm,       pgm_arm_type3_state, init_dmnfrnt,    ROT0,   "IGS", "Demon Front / Moyu Zhanxian (68k label V102, ROM M102XX 06/19/02) (ARM label V102, ROM 05/24/02 S101XX)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // 68k time: 13:44:08 ARM time: 13:04:31  (from the strings it looks like V102 only upgraded the 68k ROM)
 GAME( 2002, dmnfrntpcb,   dmnfrnt,   pgm_arm_type3_24m,      pgm,       pgm_arm_type3_state, init_dmnfrnt,    ROT0,   "IGS", "Demon Front V1.1 / Moyu Zhanxian V1.1 (68k label V107KR, ROM M107KR 11/03/03) (ARM label V106KR, ROM 10/16/03 S106KR) (JAMMA PCB)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // works but reports version mismatch (wants internal rom version and region to match external?)
 
 
 /* these don't use an External ARM rom, and don't have any weak internal functions which would allow the internal ROM to be read out */
-GAME( 2002, ddp3,       0,           pgm_arm_type1_cave,     ddp3,      pgm_arm_type1_state, init_ddp3,     ROT270, "Cave (AMI license)", "DoDonPachi III (World, 2002.05.15 Master Ver)",                MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2002, ddpdoj,     ddp3,        pgm_arm_type1_cave,     ddp3,      pgm_arm_type1_state, init_ddp3,     ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou (Japan, 2002.04.05.Master Ver, 68k Label V101)",  MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // is there a v101 without the . after 05?
-GAME( 2002, ddpdoja,    ddp3,        pgm_arm_type1_cave,     ddp3,      pgm_arm_type1_state, init_ddp3,     ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou (Japan, 2002.04.05.Master Ver, 68k Label V100)",  MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2002, ddpdojb,    ddp3,        pgm_arm_type1_cave,     ddp3,      pgm_arm_type1_state, init_ddp3,     ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou (Japan, 2002.04.05 Master Ver)",       MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 2002, ddpdojp,    ddp3,        pgm,                    ddp3,      pgm_state,           init_pgm,      ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou (Japan, 2002.04.05 Master Ver, location test)",       MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // unprotected, but still has strings related to the protection ASIC
-GAME( 2002, ddpdojblk,  ddp3,        pgm_arm_type1_cave,     ddp3,      pgm_arm_type1_state, init_ddp3,     ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou Black Label (Japan, 2002.10.07.Black Ver)",        MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // Displays "2002.04.05.Master Ver" (old) or "2002.10.07.Black Ver" (new)
-GAME( 2002, ddpdojblka, ddp3,        pgm_arm_type1_cave,     ddp3,      pgm_arm_type1_state, init_ddp3,     ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou Black Label (Japan, 2002.10.07 Black Ver)",        MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // Displays "2002.04.05.Master Ver" (old) or "2002.10.07 Black Ver" (new)
-GAME( 2012, ddpdojblkbl,ddp3,        pgm_arm_type1,          pgm,       pgm_arm_type1_state, init_kovsh,    ROT270, "bootleg",            "DoDonPachi Dai-Ou-Jou Black Label (Japan, 2002.10.07 Black Ver., bootleg Knights of Valour Super Heroes conversion)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // the extra . in the revision has been added by bootlegger
+GAME( 2002, ddp3,         0,         pgm_arm_type1_cave,     ddp3,      pgm_arm_type1_state, init_ddp3,     ROT270, "Cave (AMI license)", "DoDonPachi III (World, 2002.05.15 Master Ver)",                MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, ddpdoj,       ddp3,      pgm_arm_type1_cave,     ddp3,      pgm_arm_type1_state, init_ddp3,     ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou (Japan, 2002.04.05.Master Ver, 68k Label V101)",  MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // is there a v101 without the . after 05?
+GAME( 2002, ddpdoja,      ddp3,      pgm_arm_type1_cave,     ddp3,      pgm_arm_type1_state, init_ddp3,     ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou (Japan, 2002.04.05.Master Ver, 68k Label V100)",  MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, ddpdojb,      ddp3,      pgm_arm_type1_cave,     ddp3,      pgm_arm_type1_state, init_ddp3,     ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou (Japan, 2002.04.05 Master Ver)",       MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2002, ddpdojp,      ddp3,      pgm,                    ddp3,      pgm_state,           init_pgm,      ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou (Japan, 2002.04.05 Master Ver, location test)",       MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // unprotected, but still has strings related to the protection ASIC
+GAME( 2002, ddpdojblk,    ddp3,      pgm_arm_type1_cave,     ddp3,      pgm_arm_type1_state, init_ddp3,     ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou Black Label (Japan, 2002.10.07.Black Ver)",        MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // Displays "2002.04.05.Master Ver" (old) or "2002.10.07.Black Ver" (new)
+GAME( 2002, ddpdojblka,   ddp3,      pgm_arm_type1_cave,     ddp3,      pgm_arm_type1_state, init_ddp3,     ROT270, "Cave (AMI license)", "DoDonPachi Dai-Ou-Jou Black Label (Japan, 2002.10.07 Black Ver)",        MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // Displays "2002.04.05.Master Ver" (old) or "2002.10.07 Black Ver" (new)
+GAME( 2012, ddpdojblkbl,  ddp3,      pgm_arm_type1,          pgm,       pgm_arm_type1_state, init_kovsh,    ROT270, "bootleg",            "DoDonPachi Dai-Ou-Jou Black Label (Japan, 2002.10.07 Black Ver., bootleg Knights of Valour Super Heroes conversion)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) // the extra . in the revision has been added by bootlegger
 
 // the exact text of the 'version' shows which revision of the game it is; the newest has 2 '.' symbols in the string, the oldest, none.
 // the only difference between 'ket' and 'ket1' is the ROM fill at 0x1443bc-0x1c88cd, on ket1 it seems to be randomized / garbage data, on ket it's all 0xff, both have been seen on more than one PCB.
@@ -5035,7 +5316,8 @@
 // the v100 68k ROM on this is older than the v101 set, this set also uses a different internal ROM to everything else, must be a very early release, maybe pre v100 proto with v100 strings?
 GAME( 2003, theglad100,   theglad,   pgm_arm_type3_22m,      theglad,   pgm_arm_type3_state, init_theglada, ROT0,   "IGS", "The Gladiator / Shen Jian Fu Mo Lu / Shen Jian Fengyun (M68k label V100) (ARM label V100, ROM 01/16/03 SHEN JIAN)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) /* need correct internal rom of IGS027A - we currently patch the one we have */ // ARM time: 10:39:25
 // newer than ARM V100 Cart, older than ARM V101 Cart, same 68k rom as V101 Cart.
-GAME( 2003, thegladpcb,   theglad,   pgm_arm_type3_33m,      pgm,       pgm_arm_type3_state, init_theglad,  ROT0,   "IGS (Alta/AMI license)", "Tougenkyou - Road of the Sword (M68k label V100) (ARM label V100, ROM 02/25/03 SHEN JIAN) (Japan, JAMMA PCB)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )// ARM time: 16:32:21 // PCB version only released in Japan?
+GAME( 2003, thegladpcb,   theglad,   pgm_arm_type3_33m,      pgm,       pgm_arm_type3_state, init_theglad,  ROT0,   "IGS (Alta/AMI license)", "Tougenkyou - Road of the Sword (M68k label V100) (ARM label V101, ROM 03/13/03 SHEN JIAN) (Japan, JAMMA PCB)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )// ARM time: 16:17:27 // PCB version only released in Japan?
+GAME( 2003, thegladpcba,  theglad,   pgm_arm_type3_33m,      pgm,       pgm_arm_type3_state, init_theglad,  ROT0,   "IGS (Alta/AMI license)", "Tougenkyou - Road of the Sword (M68k label V100) (ARM label V100, ROM 02/25/03 SHEN JIAN) (Japan, JAMMA PCB)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )// ARM time: 16:32:21 // PCB version only released in Japan?
 
 //圣魔世纪/Shèng mó shìjì (China)
 //聖魔世紀/Shèng mó shìjì (Taiwan, Hong Kong)
@@ -5048,6 +5330,13 @@
 GAME( 2004, happy6,       pgm,       pgm_arm_type3_24m,      happy6,    pgm_arm_type3_state,  init_happy6,  ROT0,   "IGS", "Huanle Liuhe Yi (Happy 6-in-1) (M68K ver. V101, ARM ver. V102CN)",   MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 2004, happy6101,    happy6,    pgm_arm_type3_24m,      happy6,    pgm_arm_type3_state,  init_happy6,  ROT0,   "IGS", "Huanle Liuhe Yi (Happy 6-in-1) (M68K ver. V100, ARM ver. V101CN)",   MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 2004, happy6100hk,  happy6,    pgm_arm_type3_24m,      happy6hk,  pgm_arm_type3_state,  init_happy6,  ROT0,   "IGS", "Huanle Liuhe Yi (Happy 6-in-1) (M68K ver. V100HK, ARM ver. V100HK)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 2004, happy6100cn,  happy6,    pgm_arm_type3_24m,      happy6,    pgm_arm_type3_state,  init_happy6,  ROT0,   "IGS", "Huanle Liuhe Yi (Happy 6-in-1) (M68K ver. V100, ARM ver. V100CN)",   MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+
+//超級比一比2/Chāojí bǐ yī bǐ 2 (Taiwan)
+//大家来找碴2/Dàjiā lái zhǎo chá 2/Daai6gaa1 Loi4 Zaau2 Caa4 2 (China, Hong Kong)
+//リアルアンドフェイク 2 Photo Y2K/Riaruandofeiku(Real and Fake) 2 Photo Y2K (Japan)
+GAME( 2001, py2k2,        pgm,       pgm_arm_type1_sim,      py2k2,     pgm_arm_type1_state,  init_py2k2,    ROT0,   "IGS", "Photo Y2K 2 / Chaoji Bi Yi Bi 2 / Dajia Lai Zhao Cha 2 / Real and Fake 2 Photo Y2K (M101XX 05/25/01 11:02:54)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )  /* need internal rom of IGS027A */
+GAME( 2000, py2k2100,     py2k2,     pgm_arm_type1_sim,      py2k2,     pgm_arm_type1_state,  init_py2k2,    ROT0,   "IGS", "Photo Y2K 2 / Chaoji Bi Yi Bi 2 / Dajia Lai Zhao Cha 2 / Real and Fake 2 Photo Y2K (ver. 100, Japanese Board)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )  /* need internal rom of IGS027A */
 
 /* -----------------------------------------------------------------------------------------------------------------------
    Partially Working, playable, but some imperfections
@@ -5065,11 +5354,12 @@
 //三國戰紀/Sānguó zhàn jì (Taiwan, Japan; Traditional Chinese)
 GAME( 1999, kov,          pgm,       pgm_arm_type1_sim,      sango,     pgm_arm_type1_state,  init_kov,     ROT0,   "IGS", "Knights of Valour / Sanguo Zhan Ji / Sangoku Senki (ver. 117)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */                 // V0008 04/27/99 10:33:33
 GAME( 1999, kov115,       kov,       pgm_arm_type1_sim,      sango,     pgm_arm_type1_state,  init_kov,     ROT0,   "IGS", "Knights of Valour / Sanguo Zhan Ji / Sangoku Senki (ver. 115)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */                 // V0006 02/22/99 11:53:18
-GAME( 1999, kov100,       kov,       pgm_arm_type1_sim,      sango,     pgm_arm_type1_state,  init_kov,     ROT0,   "IGS", "Knights of Valour / Sanguo Zhan Ji / Sangoku Senki (ver. 100, Japanese Board)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */ // V0002 01/31/99 01:54:16
-GAME( 1999, kov100hk,     kov,       pgm_arm_type1_sim,      sango,     pgm_arm_type1_state,  init_kov,     ROT0,   "IGS", "Knights of Valour / Sanguo Zhan Ji / Sangoku Senki (ver. 100, Hong Kong)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
+GAME( 1999, kov114,       kov,       pgm_arm_type1_sim,      sango,     pgm_arm_type1_state,  init_kov,     ROT0,   "IGS", "Knights of Valour / Sanguo Zhan Ji / Sangoku Senki (ver. 114, Hong Kong)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
+GAME( 1999, kov111,       kov,       pgm_arm_type1_sim,      sango,     pgm_arm_type1_state,  init_kov,     ROT0,   "IGS", "Knights of Valour / Sanguo Zhan Ji / Sangoku Senki (ver. 111, Japanese Board)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */ // V0002 01/31/99 01:54:16
 
 //三国战纪正宗Plus/Sānguó zhàn jì Zhèngzōng Plus (China/Hong Kong; Simplified Chinese)
 //三國戰紀正宗Plus/Sānguó zhàn jì Zhèngzōng Plus (Taiwan, Japan; Traditional Chinese)
+// no PLUS on screen when set to Korea
 GAME( 1999, kovplus,      pgm,       pgm_arm_type1_sim,      sango,     pgm_arm_type1_state,  init_kov,     ROT0,   "IGS", "Knights of Valour Plus / Sanguo Zhan Ji Zhengzong Plus / Sangoku Senki Masamune Plus (ver. 119, set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
 GAME( 1999, kovplusa,     kovplus,   pgm_arm_type1_sim,      sango,     pgm_arm_type1_state,  init_kov,     ROT0,   "IGS", "Knights of Valour Plus / Sanguo Zhan Ji Zhengzong Plus / Sangoku Senki Masamune Plus (ver. 119, set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
 
@@ -5085,17 +5375,13 @@
    -----------------------------------------------------------------------------------------------------------------------*/
 
 //魔幻星座/Móhuàn xīngzuò
-GAME( 1999, puzlstar,     pgm,       pgm_arm_type1_sim,      pstar,     pgm_arm_type1_state,  init_pstar,    ROT0,   "IGS (Metro license)", "Puzzle Star / Mohuan Xingzuo (ver. 100MG)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
-
-//超級比一比2/Chāojí bǐ yī bǐ 2 (Taiwan)
-//大家来找碴2/Dàjiā lái zhǎo chá 2/Daai6gaa1 Loi4 Zaau2 Caa4 2 (China, Hong Kong)
-//リアルアンドフェイク 2 Photo Y2K/Riaruandofeiku(Real and Fake) 2 Photo Y2K (Japan)
-GAME( 2001, py2k2,        pgm,       pgm_arm_type1_sim,      py2k2,     pgm_arm_type1_state,  init_py2k2,    ROT0,   "IGS", "Photo Y2K 2 / Chaoji Bi Yi Bi 2 / Dajia Lai Zhao Cha 2 / Real and Fake 2 Photo Y2K (M101XX 05/25/01 11:02:54)", MACHINE_NOT_WORKING )  /* need internal rom of IGS027A */
-GAME( 2000, py2k2100,     py2k2,     pgm_arm_type1_sim,      py2k2,     pgm_arm_type1_state,  init_py2k2,    ROT0,   "IGS", "Photo Y2K 2 / Chaoji Bi Yi Bi 2 / Dajia Lai Zhao Cha 2 / Real and Fake 2 Photo Y2K (ver. 100, Japanese Board)", MACHINE_NOT_WORKING )  /* need internal rom of IGS027A */
+GAME( 1999, puzlstar,     pgm,       pgm_arm_type1_sim,      pstar,     pgm_arm_type1_state,  init_pstar,    ROT0,   "IGS (Metro license)", "Puzzle Star / Mohuan Xingzuo (ver. 100MG, 09/30/99 build)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
+GAME( 1999, puzlstara,    puzlstar,  pgm_arm_type1_sim,      pstar,     pgm_arm_type1_state,  init_pstar,    ROT0,   "IGS (Metro license)", "Puzzle Star / Mohuan Xingzuo (ver. 100MG, 09/20/99 build)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
 
 //閃亮三合一/Shǎn liàng sān hé yī (Taiwan, Hong Kong, Oversea)
 //闪亮三合一/Shǎn liàng sān hé yī (China)
-GAME( 2004, pgm3in1,      pgm,       pgm_arm_type1_sim,      pgm3in1,   pgm_arm_type1_state,  init_pgm3in1,  ROT0,   "IGS", "Shan Liang San He Yi (Flash 3-in-1) (V100 07/13/04 12:09:20)", MACHINE_NOT_WORKING )  /* need internal rom of IGS027A */
+GAME( 2004, pgm3in1,      pgm,       pgm_arm_type1_sim,      pgm3in1,   pgm_arm_type1_state,  init_pgm3in1,  ROT0,   "IGS", "Shan Liang San He Yi (Flash 3-in-1) (V102 08/23/04 13:03:26)", MACHINE_NOT_WORKING )  /* need internal rom of IGS027A */
+GAME( 2004, pgm3in1c100,  pgm3in1,   pgm_arm_type1_sim,      pgm3in1,   pgm_arm_type1_state,  init_pgm3in1,  ROT0,   "IGS", "Shan Liang San He Yi (Flash 3-in-1) (V100 07/13/04 12:09:20)", MACHINE_NOT_WORKING )  /* need internal rom of IGS027A */
 
 
 /* Games below this point are known to have an 'execute only' internal ROM area covering an area at the start of the internal ROM.  This can't be read when running code from either internal or external ROM space. */
@@ -5103,10 +5389,11 @@
 //西游释厄传群魔乱舞/Xīyóu shì è chuán Qúnmóluànwǔ (China, Japan; Simplified Chinese)
 //西遊釋厄傳群魔亂舞/Xīyóu shì è chuán Qúnmóluànwǔ (Hong Kong, World, Taiwan; Traditional Chinese)
 //Oriental Legend 2/손오공 2/Son Ogong 2 (Korea)
-// Simulation doesn't seem 100% so marked as NOT WORKING.  Probably wasn't released in all specified regions (protection device intenral ROM supplies the region)  "Oriental Ex" is the identifier string used in test mode.
-GAME( 2004, oldsplus,     pgm,       pgm_arm_type1_sim,      oldsplus,  pgm_arm_type1_state, init_oldsplus, ROT0,   "IGS", "Oriental Legend 2 (Korea) / Xiyou Shi E Chuan Qunmoluanwu (World, China, Japan, Hong Kong, Taiwan) (ver. 205) [Oriental Ex]", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
+// Simulation doesn't seem 100% so marked as NOT WORKING.  Probably wasn't released in all specified regions (protection device internal ROM supplies the region)  "Oriental Ex" is the identifier string used in test mode.
+GAME( 2004, oldsplus,     pgm,           pgm_arm_type1_sim,      oldsplus,  pgm_arm_type1_state, init_oldsplus, ROT0,   "IGS", "Oriental Legend 2 (Korea) / Xiyou Shi E Chuan Qunmoluanwu (World, China, Japan, Hong Kong, Taiwan) (ver. 205) [Oriental Ex]", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
+GAME( 2004, oldsplus203,  oldsplus,      pgm_arm_type1_sim,      oldsplus,  pgm_arm_type1_state, init_oldsplus, ROT0,   "IGS", "Oriental Legend 2 (Korea) / Xiyou Shi E Chuan Qunmoluanwu (World, China, Japan, Hong Kong, Taiwan) (ver. 203) [Oriental Ex]", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
 
-// we use the kovsh ARM rom for this, itercepting commands and changing them to match it, doesn't seem 100% correct tho so I'm leaving it as NOT WORKING; for example the ARM rom supplies addresses of Z80 music data sections, which have moved causing incorrect music, some damage rates could be different too.
+// we use the kovsh ARM rom for this, intercepting commands and changing them to match it, doesn't seem 100% correct tho so I'm leaving it as NOT WORKING; for example the ARM rom supplies addresses of Z80 music data sections, which have moved causing incorrect music, some damage rates could be different too.
 // the game logo remains stuck on the screen during gameplay, but videos of the original board suggest this happens on real hardware as well
 // if the internal ROM can't be extracted (likely case, execute only area and NO chance of custom code execution at all due to lack of external ROM) then a reference simulator should probably be written based on the actual
 // kovsh code, tweaked based on tests done with this specific board to catch any different behaviors.  These all seem to be for China only, they don't work as expected when set to other regions.
@@ -5114,7 +5401,7 @@
 //三国战记乱世枭雄/Sānguó zhàn jì Luànshì xiāoxióng (China; Simplified Chinese, Official?)
 //三國戰記亂世梟雄/Sānguó zhàn jì Luànshì xiāoxióng (Traditional Chinese, Official?)
 GAME( 2004, kovshp,       pgm,       pgm_arm_type1,          kovsh,     pgm_arm_type1_state, init_kovshp,   ROT0,   "IGS", "Knights of Valour Super Heroes Plus / Sanguo Zhan Ji Luanshi Xiaoxiong (ver. 101)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
-GAME( 2004, kovshpa,      kovshp,    pgm_arm_type1,          kovsh,     pgm_arm_type1_state, init_kovshp,   ROT0,   "IGS", "Knights of Valour Super Heroes Plus / Sanguo Zhan Ji Luanshi Xiaoxiong (ver. 100)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
+GAME( 2004, kovshp100,    kovshp,    pgm_arm_type1,          kovsh,     pgm_arm_type1_state, init_kovshp,   ROT0,   "IGS", "Knights of Valour Super Heroes Plus / Sanguo Zhan Ji Luanshi Xiaoxiong (ver. 100)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
 // First(possibly) major updated version of kovsh with 3 game modes and new characters, Version is V201 and identification string is "SANGO EX+" instead "SANGO EX".
 // 一统中原/Yītǒng zhōngyuán is game mode(this mode is similar as kovsh), and ROM labels too?
 GAME( 1999, kovytzy,      pgm,       pgm_arm_type1,          kovsh,     pgm_arm_type1_state, init_kovshp,   ROT0,   "IGS", "Knights of Valour Super Heroes / Sanguo Zhan Ji Fengyun Zaiqi / Sangoku Senki Super Heroes (SANGO EX+) (ver. 201 'Yitong Zhongyuan', China)", MACHINE_IMPERFECT_SOUND | MACHINE_UNEMULATED_PROTECTION | MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) /* need internal rom of IGS027A */
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/photon.cpp mame-0.224+dfsg.1/src/mame/drivers/photon.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/photon.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/photon.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -23,6 +23,7 @@
 #include "cpu/i8085/i8085.h"
 #include "machine/i8255.h"
 #include "sound/spkrdev.h"
+#include "machine/ram.h"
 #include "screen.h"
 #include "speaker.h"
 
@@ -33,14 +34,15 @@
 	photon_state(const machine_config &mconfig, device_type type, const char *tag)
 		: pk8000_base_state(mconfig, type, tag)
 		, m_speaker(*this, "speaker")
-		, m_banks(*this, "bank%u", 1U)
+		, m_banks(*this, "bank%u", 0U)
+		, m_ram(*this, RAM_TAG)
 	{ }
 
 	void photon(machine_config &config);
 
 protected:
 	virtual void machine_reset() override;
-	virtual void video_start() override;
+	virtual void machine_start() override;
 
 private:
 	uint8_t _80_portb_r();
@@ -57,13 +59,14 @@
 
 	required_device<speaker_sound_device> m_speaker;
 	required_memory_bank_array<8> m_banks;
+	required_device<ram_device> m_ram;
 };
 
 
 void photon_state::set_bank(uint8_t data)
 {
 	uint8_t *const rom = memregion("maincpu")->base();
-	uint8_t *const ram = memregion("maincpu")->base();
+	u8 *ram = m_ram->pointer();
 	uint8_t const block1 = data & 3;
 	uint8_t const block2 = (data >> 2) & 3;
 	uint8_t const block3 = (data >> 4) & 3;
@@ -71,7 +74,7 @@
 
 	switch(block1) {
 	case 0:
-		m_banks[0]->set_base(rom + 0x10000);
+		m_banks[0]->set_base(rom);
 		m_banks[4]->set_base(ram);
 		break;
 	case 1: break;
@@ -84,7 +87,7 @@
 
 	switch(block2) {
 	case 0:
-		m_banks[1]->set_base(rom + 0x14000);
+		m_banks[1]->set_base(rom + 0x4000);
 		m_banks[5]->set_base(ram + 0x4000);
 		break;
 	case 1: break;
@@ -97,7 +100,7 @@
 
 	switch(block3) {
 	case 0:
-		m_banks[2]->set_base(rom + 0x18000);
+		m_banks[2]->set_base(rom + 0x8000);
 		m_banks[6]->set_base(ram + 0x8000);
 		break;
 	case 1: break;
@@ -110,7 +113,7 @@
 
 	switch(block4) {
 	case 0:
-		m_banks[3]->set_base(rom + 0x1c000);
+		m_banks[3]->set_base(rom + 0xc000);
 		m_banks[7]->set_base(ram + 0xc000);
 		break;
 	case 1: break;
@@ -135,10 +138,10 @@
 void photon_state::pk8000_mem(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0x3fff).bankr("bank1").bankw("bank5");
-	map(0x4000, 0x7fff).bankr("bank2").bankw("bank6");
-	map(0x8000, 0xbfff).bankr("bank3").bankw("bank7");
-	map(0xc000, 0xffff).bankr("bank4").bankw("bank8");
+	map(0x0000, 0x3fff).bankr("bank0").bankw("bank4");
+	map(0x4000, 0x7fff).bankr("bank1").bankw("bank5");
+	map(0x8000, 0xbfff).bankr("bank2").bankw("bank6");
+	map(0xc000, 0xffff).bankr("bank3").bankw("bank7");
 }
 
 void photon_state::pk8000_io(address_map &map)
@@ -184,15 +187,11 @@
 
 void photon_state::machine_reset()
 {
-	pk8000_base_state::machine_reset();
-
 	set_bank(0);
 }
 
-void photon_state::video_start()
+void photon_state::machine_start()
 {
-	pk8000_base_state::video_start();
-
 	save_item(NAME(m_text_start));
 	save_item(NAME(m_chargen_start));
 	save_item(NAME(m_video_start));
@@ -205,7 +204,7 @@
 
 uint32_t photon_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	return video_update(screen, bitmap, cliprect, memregion("maincpu")->base());
+	return video_update(screen, bitmap, cliprect, m_ram->pointer());
 }
 
 void photon_state::photon(machine_config &config)
@@ -234,9 +233,12 @@
 	ppi1.out_pc_callback().set(FUNC(photon_state::_80_portc_w));
 
 	i8255_device &ppi2(I8255(config, "ppi8255_2"));
-	ppi2.in_pa_callback().set(FUNC(pk8000_base_state::_84_porta_r));
-	ppi2.out_pa_callback().set(FUNC(pk8000_base_state::_84_porta_w));
-	ppi2.out_pc_callback().set(FUNC(pk8000_base_state::_84_portc_w));
+	ppi2.in_pa_callback().set(FUNC(photon_state::_84_porta_r));
+	ppi2.out_pa_callback().set(FUNC(photon_state::_84_porta_w));
+	ppi2.out_pc_callback().set(FUNC(photon_state::_84_portc_w));
+
+	/* internal ram */
+	RAM(config, RAM_TAG).set_default_size("64K");
 
 	/* audio hardware */
 	SPEAKER(config, "mono").front_center();
@@ -256,8 +258,8 @@
     3800...3FFFh - ROM8 (D48)
 */
 ROM_START( phtetris )
-	ROM_REGION( 0x20000, "maincpu", 0 )
-	ROM_LOAD( "foton_tetris.bin", 0x10000, 0x4000, BAD_DUMP CRC(a8af10bb) SHA1(5e2ea9a5d38399cbe156638eea73a3d25c442f77) )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "foton_tetris.bin", 0x0000, 0x4000, BAD_DUMP CRC(a8af10bb) SHA1(5e2ea9a5d38399cbe156638eea73a3d25c442f77) )
 ROM_END
 
 /*
@@ -269,8 +271,8 @@
     1000...17FFh - ROM3 (D43)
 */
 ROM_START( phpython )
-	ROM_REGION( 0x20000, "maincpu", 0 )
-	ROM_LOAD( "foton_piton.bin", 0x10000, 0x1800, BAD_DUMP CRC(4eac925a) SHA1(26f9a18c7aed31b7daacdc003bafb60a5e6d6300) )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "foton_piton.bin", 0x0000, 0x1800, BAD_DUMP CRC(4eac925a) SHA1(26f9a18c7aed31b7daacdc003bafb60a5e6d6300) )
 ROM_END
 
 
@@ -278,10 +280,10 @@
     Dump was made using custom adaptor, hence it is marked as bad dump.
 */
 ROM_START( phklad )
-	ROM_REGION( 0x20000, "maincpu", 0 )
-	ROM_LOAD( "klad.bin", 0x10000, 0x4000, BAD_DUMP CRC(49cc7d65) SHA1(d966cfc1d973a533df8044a71fad37f7177da554) )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "klad.bin", 0x0000, 0x4000, BAD_DUMP CRC(49cc7d65) SHA1(d966cfc1d973a533df8044a71fad37f7177da554) )
 ROM_END
 
-GAME( 19??,  phtetris, 0,      photon, photon, photon_state, empty_init, ROT0, "<unknown>", "Tetris (Photon System)",           0 )
-GAME( 1989?, phpython,  0,     photon, photon, photon_state, empty_init, ROT0, "<unknown>", "Python (Photon System)",           0 )
-GAME( 19??,  phklad,   0,      photon, photon, photon_state, empty_init, ROT0, "<unknown>", "Klad / Labyrinth (Photon System)", 0 )
+GAME( 19??,  phtetris, 0,      photon, photon, photon_state, empty_init, ROT0, "<unknown>", "Tetris (Photon System)",           MACHINE_SUPPORTS_SAVE )
+GAME( 1989?, phpython,  0,     photon, photon, photon_state, empty_init, ROT0, "<unknown>", "Python (Photon System)",           MACHINE_SUPPORTS_SAVE )
+GAME( 19??,  phklad,   0,      photon, photon, photon_state, empty_init, ROT0, "<unknown>", "Klad / Labyrinth (Photon System)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/photoply.cpp mame-0.224+dfsg.1/src/mame/drivers/photoply.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/photoply.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/photoply.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -8,8 +8,8 @@
 
 TODO:
 - BIOS CMOS doesn't save at all (needed for setting up the Hard Disk);
-- DISK BOOT FAILURE after eeprom checking (many unknown IDE cs1 reads/writes);
-- partition boot sector is missing from the CHD dump, protection?
+- DISK BOOT FAILURE after EEPROM checking (many unknown IDE cs1 reads/writes);
+- Partition boot sector is missing from the CHD dump, protection?
 - Detects CPU type as "-S 16 MHz"? Sometimes it detects it as 486SX, unknown repro (after fiddling with CMOS settings anyway)
 - VGA BIOS reports being a Cirrus Logic GD5436 / 5446, it is unknown what exactly this game uses.
 - PCI hookups (no idea about what this uses), and improve/device-ify SiS85C49x;
@@ -42,6 +42,7 @@
 	}
 
 	void photoply(machine_config &config);
+	void photoply_dx4_100(machine_config &config);
 
 private:
 	required_device<eeprom_serial_93cxx_device> m_eeprom;
@@ -203,8 +204,6 @@
 	map(0xfffe0000, 0xffffffff).lr8([this] (offs_t offset) { return m_main_bios[offset]; }, "bios_upper_r");
 }
 
-
-
 void photoply_state::photoply_io(address_map &map)
 {
 	pcat32_io_common(map);
@@ -231,43 +230,43 @@
 
 static INPUT_PORTS_START( photoply )
 	PORT_START("pc_keyboard_0")
-	PORT_BIT ( 0x0001, 0x0000, IPT_UNUSED )     /* unused scancode 0 */
-	AT_KEYB_HELPER( 0x0002, "Esc",          KEYCODE_Q           ) /* Esc                         01  81 */
-	AT_KEYB_HELPER( 0x0004, "1",            KEYCODE_1           )
-	AT_KEYB_HELPER( 0x0008, "2",            KEYCODE_2           )
-	AT_KEYB_HELPER( 0x0010, "3",            KEYCODE_3           )
-	AT_KEYB_HELPER( 0x0020, "4",            KEYCODE_4           )
-	AT_KEYB_HELPER( 0x0040, "5",            KEYCODE_5           )
-	AT_KEYB_HELPER( 0x0080, "6",            KEYCODE_6           )
-	AT_KEYB_HELPER( 0x0100, "7",            KEYCODE_7           )
-	AT_KEYB_HELPER( 0x0200, "8",            KEYCODE_8           )
-	AT_KEYB_HELPER( 0x0400, "9",            KEYCODE_9           )
-	AT_KEYB_HELPER( 0x0800, "0",            KEYCODE_0           )
+	PORT_BIT ( 0x0001, 0x0000, IPT_UNUSED ) // Unused scancode 0
+	AT_KEYB_HELPER( 0x0002, "Esc",               KEYCODE_Q     ) // Esc       01  81
+	AT_KEYB_HELPER( 0x0004, "1",                 KEYCODE_1     )
+	AT_KEYB_HELPER( 0x0008, "2",                 KEYCODE_2     )
+	AT_KEYB_HELPER( 0x0010, "3",                 KEYCODE_3     )
+	AT_KEYB_HELPER( 0x0020, "4",                 KEYCODE_4     )
+	AT_KEYB_HELPER( 0x0040, "5",                 KEYCODE_5     )
+	AT_KEYB_HELPER( 0x0080, "6",                 KEYCODE_6     )
+	AT_KEYB_HELPER( 0x0100, "7",                 KEYCODE_7     )
+	AT_KEYB_HELPER( 0x0200, "8",                 KEYCODE_8     )
+	AT_KEYB_HELPER( 0x0400, "9",                 KEYCODE_9     )
+	AT_KEYB_HELPER( 0x0800, "0",                 KEYCODE_0     )
 
 	PORT_START("pc_keyboard_1")
-	AT_KEYB_HELPER( 0x0020, "Y",            KEYCODE_Y           ) /* Y                           15  95 */
-	AT_KEYB_HELPER( 0x1000, "Enter",        KEYCODE_ENTER       ) /* Enter                       1C  9C */
+	AT_KEYB_HELPER( 0x0020, "Y",                 KEYCODE_Y     ) // Y         15  95
+	AT_KEYB_HELPER( 0x1000, "Enter",             KEYCODE_ENTER ) // Enter     1C  9C
 
 	PORT_START("pc_keyboard_2")
 
 	PORT_START("pc_keyboard_3")
-	AT_KEYB_HELPER( 0x0002, "N",            KEYCODE_N           ) /* N                           31  B1 */
-	AT_KEYB_HELPER( 0x0800, "F1",           KEYCODE_F1          ) /* F1                          3B  BB */
-	AT_KEYB_HELPER( 0x1000, "F2",           KEYCODE_F2          )
-	AT_KEYB_HELPER( 0x4000, "F4",           KEYCODE_F4          )
+	AT_KEYB_HELPER( 0x0002, "N",                 KEYCODE_N     ) // N         31  B1
+	AT_KEYB_HELPER( 0x0800, "F1",                KEYCODE_F1    ) // F1        3B  BB
+	AT_KEYB_HELPER( 0x1000, "F2",                KEYCODE_F2    )
+	AT_KEYB_HELPER( 0x4000, "F4",                KEYCODE_F4    )
 
 	PORT_START("pc_keyboard_4")
 
 	PORT_START("pc_keyboard_5")
 
 	PORT_START("pc_keyboard_6")
-	AT_KEYB_HELPER( 0x0040, "(MF2)Cursor Up",       KEYCODE_UP          ) /* Up                          67  e7 */
-	AT_KEYB_HELPER( 0x0080, "(MF2)Page Up",         KEYCODE_PGUP        ) /* Page Up                     68  e8 */
-	AT_KEYB_HELPER( 0x0100, "(MF2)Cursor Left",     KEYCODE_LEFT        ) /* Left                        69  e9 */
-	AT_KEYB_HELPER( 0x0200, "(MF2)Cursor Right",    KEYCODE_RIGHT       ) /* Right                       6a  ea */
-	AT_KEYB_HELPER( 0x0800, "(MF2)Cursor Down",     KEYCODE_DOWN        ) /* Down                        6c  ec */
-	AT_KEYB_HELPER( 0x1000, "(MF2)Page Down",       KEYCODE_PGDN        ) /* Page Down                   6d  ed */
-	AT_KEYB_HELPER( 0x4000, "Del",                  KEYCODE_A           ) /* Delete                      6f  ef */
+	AT_KEYB_HELPER( 0x0040, "(MF2)Cursor Up",    KEYCODE_UP    ) // Up         67  e7
+	AT_KEYB_HELPER( 0x0080, "(MF2)Page Up",      KEYCODE_PGUP  ) // Page Up    68  e8
+	AT_KEYB_HELPER( 0x0100, "(MF2)Cursor Left",  KEYCODE_LEFT  ) // Left       69  e9
+	AT_KEYB_HELPER( 0x0200, "(MF2)Cursor Right", KEYCODE_RIGHT ) // Right      6a  ea
+	AT_KEYB_HELPER( 0x0800, "(MF2)Cursor Down",  KEYCODE_DOWN  ) // Down       6c  ec
+	AT_KEYB_HELPER( 0x1000, "(MF2)Page Down",    KEYCODE_PGDN  ) // Page Down  6d  ed
+	AT_KEYB_HELPER( 0x4000, "Del",               KEYCODE_A     ) // Delete     6f  ef
 
 	PORT_START("pc_keyboard_7")
 INPUT_PORTS_END
@@ -283,7 +282,6 @@
 	m_pci_shadow_reg = 0;
 }
 
-
 static const gfx_layout CGA_charlayout =
 {
 	8,8,
@@ -296,14 +294,14 @@
 };
 
 static GFXDECODE_START( gfx_photoply )
-	GFXDECODE_ENTRY( "video_bios", 0x6000+0xa5*8+7, CGA_charlayout,              0, 256 )
-	//there's also a 8x16 entry (just after the 8x8)
+	GFXDECODE_ENTRY( "video_bios", 0x6000+0xa5*8+7, CGA_charlayout, 0, 256 )
+	// There's also a 8x16 entry (just after the 8x8)
 GFXDECODE_END
 
 void photoply_state::photoply(machine_config &config)
 {
-	/* basic machine hardware */
-	I486DX4(config, m_maincpu, 75000000); /* I486DX4, 75 or 100 Mhz */
+	// Basic machine hardware
+	I486DX4(config, m_maincpu, 75000000); // I486DX4, 75 or 100 Mhz
 	m_maincpu->set_addrmap(AS_PROGRAM, &photoply_state::photoply_map);
 	m_maincpu->set_addrmap(AS_IO, &photoply_state::photoply_io);
 	m_maincpu->set_irq_acknowledge_callback("pic8259_1", FUNC(pic8259_device::inta_cb));
@@ -332,30 +330,90 @@
 		.erase_all_time(attotime::from_usec(10));
 }
 
+void photoply_state::photoply_dx4_100(machine_config &config)
+{
+	photoply(config);
+	m_maincpu->set_clock(100000000); // 100MHz
+}
+
+/* Intel A80486DX4100
+   4096KB RAM
+   SiS 85C496 + 85C497
+   5 x ISSI IS61C256AN-15N Cache RAM
+   Winbond W83787IF (near Xtal 24.00 MHz)
+   3 x ISA + 2 x PCI */
+ROM_START(photoply99sp)
+	ROM_REGION(0x20000, "bios", 0)  // Motherboard BIOS
+	ROM_LOAD("funworld_1999_award_v4.51g.bin", 0x000000, 0x20000, CRC(af7ff1d4) SHA1(72eeecf798a03817ce7ba4d65cd4128ed3ef7e68) ) // Award Modular BIOS v4.51G, AT29C010A
+
+	/* Multifunction board with a ESS AudioDrive chip ISA Sound + I/O (PP2000/CI-8000)
+	   ESS AudioDrve ES1868F
+	   NEC D71055L-10 Parallel Interface Unit
+	   Winbond W83877AF
+	   Xtal 24.000 MHz (near W83877AF and D71055L-10)
+	   Xtal 14.31818 MHz (near ES1868F)
+	   Atmel 93C46 Serial EEPROM
+	   PALCE16V8H (UNDUMPED)
+	   PALCE16V8H (UNDUMPED)
+	   8 Dips */
+	ROM_REGION(0x8000, "ex_bios", ROMREGION_ERASE00 )
+	ROM_LOAD("enhanced_bios_1.06.u13", 0x0000, 0x8000, CRC(d05e9d20) SHA1(854501b7b3bf988b10516109d058f7ca2aa07d3e) ) // Centos Combo I/O ROM BIOS for CI-8000/PP2000 v1.06, W27E257
+
+	/* Cirrus Logic PCI CL-GD5446-HC-A
+	   512MB RAM (2 x M5416258B-30J)
+	   Xtal 14.31818 MHz */
+	ROM_REGION(0x8000, "video_bios", 0 )
+	ROM_LOAD("cl-gd5446_pci_vga_bios_version_1.31.u2", 0x0000, 0x8000, CRC(61f8cac7) SHA1(6e54aadfe10dfa5c7e417a054e9a64499a99083c) ) // Cirrus Logic/Quadtel CL-GD5446 PCI VGA BIOS v1.31 , AT27C256R
+
+	/* The PhotoPlay 1999 parallel port dongle contains, under expoxy resin:
+	   Atmel AT89C2051 MCU (2KBytes internal ROM, UNDUMPED)
+	   Xtal 11.05MHz
+	   24C08W6 SEEPROM
+	   HC132 */
+	ROM_REGION(0xC00, "dongle", 0)
+	ROM_SYSTEM_BIOS(0, "pp_99_dongle_r3",  "Parallel port dongle Rev. 3")
+	ROMX_LOAD("dongle_photoply_1999_sp_r3_mcu.bin",         0x000, 0x800, NO_DUMP,                                                      ROM_BIOS(0)) // AT89C2051
+	ROMX_LOAD("dongle_photoply_1999_sp_r3_seeprom.bin",     0x800, 0x400, CRC(62f68a79) SHA1(72477e07db0982764aede1b7e723aedf58937426), ROM_BIOS(0)) // 24C08W6
+	ROM_SYSTEM_BIOS(1, "pp_99_dongle_r3a", "Parallel port dongle Rev. 3 (alt)")
+	ROMX_LOAD("dongle_photoply_1999_sp_r3_alt_mcu.bin",     0x000, 0x800, NO_DUMP,                                                      ROM_BIOS(1)) // AT89C2051
+	ROMX_LOAD("dongle_photoply_1999_sp_r3_alt_seeprom.bin", 0x800, 0x400, CRC(9442d1d7) SHA1(4426542c4dbb3f1df65e7ba798a7d7e0d8b98838), ROM_BIOS(1)) // 24C08W6
+	ROM_SYSTEM_BIOS(2, "pp_99_dongle_r2",  "Parallel port dongle Rev. 2")
+	ROMX_LOAD("dongle_photoply_1999_sp_r2_mcu.bin",         0x000, 0x800, NO_DUMP,                                                      ROM_BIOS(2)) // AT89C2051
+	ROMX_LOAD("dongle_photoply_1999_sp_r2_seeprom.bin",     0x800, 0x400, CRC(52274688) SHA1(786f7407e510b303401120b8e1b082cdb412e648), ROM_BIOS(2)) // 24C08W6
+	ROM_SYSTEM_BIOS(3, "pp_99_dongle_r1",  "Parallel port dongle Rev. 1")
+	ROMX_LOAD("dongle_photoply_1999_sp_r1_mcu.bin",         0x000, 0x800, NO_DUMP,                                                      ROM_BIOS(3)) // AT89C2051
+	ROMX_LOAD("dongle_photoply_1999_sp_r1_seeprom.bin",     0x800, 0x400, CRC(fe8f14d2) SHA1(1caad3200a22e0d510238ba44e5d96f561045ec1), ROM_BIOS(3)) // 24C08W6
+
+	// Quantum Fireball EX3.2A
+	// C/H/S: 3.2 - 6256/16/63
+	// PhotoPlay label: 09.02.1999
+	DISK_REGION( "ide:0:hdd:image" )
+	DISK_IMAGE( "photoplay99sp", 0, BAD_DUMP SHA1(887e5b8c931d6122a1c3a8eda5cb919eb162eced) ) // From an operated HDD. A clean one must be recreated from the CDs
+ROM_END
 
 ROM_START(photoply)
-	ROM_REGION(0x20000, "bios", 0)  /* motherboard bios */
-	ROM_LOAD("award bootblock bios v1.0.bin", 0x000000, 0x20000, CRC(e96d1bbc) SHA1(64d0726c4e9ecee8fddf4cc39d92aecaa8184d5c) )
+	ROM_REGION(0x20000, "bios", 0)  // Motherboard BIOS
+	ROM_LOAD("award bootblock bios v1.0.bin", 0x000000, 0x20000, CRC(e96d1bbc) SHA1(64d0726c4e9ecee8fddf4cc39d92aecaa8184d5c) ) // Award Modular BIOS v4.51G
 
-	ROM_REGION(0x8000, "ex_bios", ROMREGION_ERASE00 ) /* multifunction board with a ESS AudioDrive chip,  M27128A */
-	ROM_LOAD("enhanced bios.bin", 0x000000, 0x4000, CRC(a216404e) SHA1(c9067cf87d5c8106de00866bb211eae3a6c02c65) )
+	ROM_REGION(0x8000, "ex_bios", ROMREGION_ERASE00 ) // Multifunction board with a ESS AudioDrive chip
+	ROM_LOAD("enhanced bios.bin", 0x000000, 0x4000, CRC(a216404e) SHA1(c9067cf87d5c8106de00866bb211eae3a6c02c65) ) // Centos Combo I/O ROM BIOS for CI-8000/PP2000 v1.06, M27128A
 //  ROM_RELOAD(                   0x004000, 0x4000 )
 //  ROM_RELOAD(                   0x008000, 0x4000 )
 //  ROM_RELOAD(                   0x00c000, 0x4000 )
 
 	ROM_REGION(0x8000, "video_bios", 0 )
-	ROM_LOAD("vga.bin", 0x000000, 0x8000, CRC(7a859659) SHA1(ff667218261969c48082ec12aa91088a01b0cb2a) )
+	ROM_LOAD("vga.bin", 0x000000, 0x8000, CRC(7a859659) SHA1(ff667218261969c48082ec12aa91088a01b0cb2a) ) // Cirrus Logic/Quadtel CL-GD5436/46 PCI VGA BIOS v1.25
 
 	DISK_REGION( "ide:0:hdd:image" )
 	DISK_IMAGE( "pp201", 0, SHA1(23e1940d485d19401e7d0ad912ddad2cf2ea10b4) )
 ROM_END
 
-// bios not provided, might be different
+// BIOS not provided, might be different
 ROM_START(photoply2k4)
-	ROM_REGION(0x20000, "bios", 0)  /* motherboard bios */
+	ROM_REGION(0x20000, "bios", 0)  // Motherboard BIOS
 	ROM_LOAD("award bootblock bios v1.0.bin", 0x000000, 0x20000, BAD_DUMP CRC(e96d1bbc) SHA1(64d0726c4e9ecee8fddf4cc39d92aecaa8184d5c) )
 
-	ROM_REGION(0x8000, "ex_bios", ROMREGION_ERASE00 ) /* multifunction board with a ESS AudioDrive chip,  M27128A */
+	ROM_REGION(0x8000, "ex_bios", ROMREGION_ERASE00 ) // Multifunction board with a ESS AudioDrive chip,  M27128A
 	ROM_LOAD("enhanced bios.bin", 0x000000, 0x4000, BAD_DUMP CRC(a216404e) SHA1(c9067cf87d5c8106de00866bb211eae3a6c02c65) )
 //  ROM_RELOAD(                   0x004000, 0x4000 )
 //  ROM_RELOAD(                   0x008000, 0x4000 )
@@ -370,6 +428,6 @@
 ROM_END
 
 
-GAME( 199?, photoply,     0,  photoply, photoply, photoply_state, empty_init, ROT0, "Funworld", "Photo Play 2000 (v2.01)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_UNEMULATED_PROTECTION )
-GAME( 2004, photoply2k4,  0,  photoply, photoply, photoply_state, empty_init, ROT0, "Funworld", "Photo Play 2004", MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_UNEMULATED_PROTECTION )
-
+GAME( 1999, photoply99sp, 0,  photoply_dx4_100, photoply, photoply_state, empty_init, ROT0, "Funworld", "Photo Play 1999 (Spanish)", MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_UNEMULATED_PROTECTION )
+GAME( 199?, photoply,     0,  photoply,         photoply, photoply_state, empty_init, ROT0, "Funworld", "Photo Play 2000 (v2.01)",   MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_UNEMULATED_PROTECTION )
+GAME( 2004, photoply2k4,  0,  photoply,         photoply, photoply_state, empty_init, ROT0, "Funworld", "Photo Play 2004",           MACHINE_NOT_WORKING|MACHINE_NO_SOUND|MACHINE_UNEMULATED_PROTECTION )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/pk8000.cpp mame-0.224+dfsg.1/src/mame/drivers/pk8000.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/pk8000.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/pk8000.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -33,35 +33,27 @@
 		, m_ram(*this, RAM_TAG)
 		, m_speaker(*this, "speaker")
 		, m_region_maincpu(*this, "maincpu")
-		, m_bank1(*this, "bank1")
-		, m_bank2(*this, "bank2")
-		, m_bank3(*this, "bank3")
-		, m_bank4(*this, "bank4")
-		, m_bank5(*this, "bank5")
-		, m_bank6(*this, "bank6")
-		, m_bank7(*this, "bank7")
-		, m_bank8(*this, "bank8")
+		, m_banks(*this, "bank%u", 0U)
 		, m_io_joy1(*this, "JOY1")
 		, m_io_joy2(*this, "JOY2")
-		, m_keyboard(*this, "LINE%u", 0)
+		, m_keyboard(*this, "LINE%u", 0U)
 	{ }
 
 	void pk8000(machine_config &config);
 
 private:
-	uint8_t m_keyboard_line;
+	u8 m_keyboard_line;
 
-	uint8_t joy_1_r();
-	uint8_t joy_2_r();
-	void _80_porta_w(uint8_t data);
-	uint8_t _80_portb_r();
-	void _80_portc_w(uint8_t data);
+	u8 joy_1_r();
+	u8 joy_2_r();
+	void _80_porta_w(u8 data);
+	u8 _80_portb_r();
+	void _80_portc_w(u8 data);
 
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
-	virtual void video_start() override;
 
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	INTERRUPT_GEN_MEMBER(interrupt);
 	IRQ_CALLBACK_MEMBER(irq_callback);
@@ -73,88 +65,81 @@
 	required_device<ram_device> m_ram;
 	required_device<speaker_sound_device> m_speaker;
 	required_memory_region m_region_maincpu;
-	required_memory_bank m_bank1;
-	required_memory_bank m_bank2;
-	required_memory_bank m_bank3;
-	required_memory_bank m_bank4;
-	required_memory_bank m_bank5;
-	required_memory_bank m_bank6;
-	required_memory_bank m_bank7;
-	required_memory_bank m_bank8;
+	required_memory_bank_array<8> m_banks;
 	required_ioport m_io_joy1;
 	required_ioport m_io_joy2;
 	required_ioport_array<10> m_keyboard;
 
-	void set_bank(uint8_t data);
+	void set_bank(u8 data);
 };
 
 
 
-void pk8000_state::set_bank(uint8_t data)
+void pk8000_state::set_bank(u8 data)
 {
-	uint8_t *rom = m_region_maincpu->base();
-	uint8_t *ram = m_ram->pointer();
-	uint8_t block1 = data & 3;
-	uint8_t block2 = (data >> 2) & 3;
-	uint8_t block3 = (data >> 4) & 3;
-	uint8_t block4 = (data >> 6) & 3;
+	u8 *rom = m_region_maincpu->base();
+	u8 *ram = m_ram->pointer();
+	u8 block1 = data & 3;
+	u8 block2 = (data >> 2) & 3;
+	u8 block3 = (data >> 4) & 3;
+	u8 block4 = (data >> 6) & 3;
 
 	switch(block1) {
 		case 0:
-				m_bank1->set_base(rom + 0x10000);
-				m_bank5->set_base(ram);
+				m_banks[0]->set_base(rom);
+				m_banks[4]->set_base(ram);
 				break;
 		case 1: break;
 		case 2: break;
 		case 3:
-				m_bank1->set_base(ram);
-				m_bank5->set_base(ram);
+				m_banks[0]->set_base(ram);
+				m_banks[4]->set_base(ram);
 				break;
 	}
 
 	switch(block2) {
 		case 0:
-				m_bank2->set_base(rom + 0x14000);
-				m_bank6->set_base(ram + 0x4000);
+				m_banks[1]->set_base(rom + 0x4000);
+				m_banks[5]->set_base(ram + 0x4000);
 				break;
 		case 1: break;
 		case 2: break;
 		case 3:
-				m_bank2->set_base(ram + 0x4000);
-				m_bank6->set_base(ram + 0x4000);
+				m_banks[1]->set_base(ram + 0x4000);
+				m_banks[5]->set_base(ram + 0x4000);
 				break;
 	}
 	switch(block3) {
 		case 0:
-				m_bank3->set_base(rom + 0x18000);
-				m_bank7->set_base(ram + 0x8000);
+				m_banks[2]->set_base(rom + 0x8000);
+				m_banks[6]->set_base(ram + 0x8000);
 				break;
 		case 1: break;
 		case 2: break;
 		case 3:
-				m_bank3->set_base(ram + 0x8000);
-				m_bank7->set_base(ram + 0x8000);
+				m_banks[2]->set_base(ram + 0x8000);
+				m_banks[6]->set_base(ram + 0x8000);
 				break;
 	}
 	switch(block4) {
 		case 0:
-				m_bank4->set_base(rom + 0x1c000);
-				m_bank8->set_base(ram + 0xc000);
+				m_banks[3]->set_base(rom + 0xc000);
+				m_banks[7]->set_base(ram + 0xc000);
 				break;
 		case 1: break;
 		case 2: break;
 		case 3:
-				m_bank4->set_base(ram + 0xc000);
-				m_bank8->set_base(ram + 0xc000);
+				m_banks[3]->set_base(ram + 0xc000);
+				m_banks[7]->set_base(ram + 0xc000);
 				break;
 	}
 }
-void pk8000_state::_80_porta_w(uint8_t data)
+void pk8000_state::_80_porta_w(u8 data)
 {
 	set_bank(data);
 }
 
-uint8_t pk8000_state::_80_portb_r()
+u8 pk8000_state::_80_portb_r()
 {
 	if(m_keyboard_line>9) {
 		return 0xff;
@@ -162,7 +147,7 @@
 	return m_keyboard[m_keyboard_line]->read();
 }
 
-void pk8000_state::_80_portc_w(uint8_t data)
+void pk8000_state::_80_portc_w(u8 data)
 {
 	m_keyboard_line = data & 0x0f;
 
@@ -172,15 +157,15 @@
 	m_cassette->output((BIT(data, 6)) ? +1.0 : 0.0);
 }
 
-uint8_t pk8000_state::joy_1_r()
+u8 pk8000_state::joy_1_r()
 {
-	uint8_t retVal = (m_cassette->input() > 0.0038 ? 0x80 : 0);
+	u8 retVal = (m_cassette->input() > 0.0038 ? 0x80 : 0);
 	retVal |= m_io_joy1->read() & 0x7f;
 	return retVal;
 }
-uint8_t pk8000_state::joy_2_r()
+u8 pk8000_state::joy_2_r()
 {
-	uint8_t retVal = (m_cassette->input() > 0.0038 ? 0x80 : 0);
+	u8 retVal = (m_cassette->input() > 0.0038 ? 0x80 : 0);
 	retVal |= m_io_joy2->read() & 0x7f;
 	return retVal;
 }
@@ -188,10 +173,10 @@
 void pk8000_state::pk8000_mem(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0x3fff).bankr("bank1").bankw("bank5");
-	map(0x4000, 0x7fff).bankr("bank2").bankw("bank6");
-	map(0x8000, 0xbfff).bankr("bank3").bankw("bank7");
-	map(0xc000, 0xffff).bankr("bank4").bankw("bank8");
+	map(0x0000, 0x3fff).bankr("bank0").bankw("bank4");
+	map(0x4000, 0x7fff).bankr("bank1").bankw("bank5");
+	map(0x8000, 0xbfff).bankr("bank2").bankw("bank6");
+	map(0xc000, 0xffff).bankr("bank3").bankw("bank7");
 }
 
 void pk8000_state::pk8000_io(address_map &map)
@@ -207,6 +192,11 @@
 	map(0x92, 0x92).rw(FUNC(pk8000_state::video_start_r), FUNC(pk8000_state::video_start_w));
 	map(0x93, 0x93).rw(FUNC(pk8000_state::color_start_r), FUNC(pk8000_state::color_start_w));
 	map(0xa0, 0xbf).rw(FUNC(pk8000_state::color_r), FUNC(pk8000_state::color_w));
+	// extras for pk8002
+	//map(0x8c, 0x8f).   // cassette in   2x KR1533KP11
+	//map(0x94, 0x97).   // video colour
+	//map(0x98, 0x9b).w  // audio  KR1533TM9, KR572PA1A, 2x KR555IR8
+	//map(0x9c, 0x9f).rw("ctc", FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));  // part of the audio
 }
 
 /*   Input ports */
@@ -335,15 +325,6 @@
 void pk8000_state::machine_start()
 {
 	save_item(NAME(m_keyboard_line));
-}
-
-void pk8000_state::machine_reset()
-{
-	set_bank(0);
-}
-
-void pk8000_state::video_start()
-{
 	save_item(NAME(m_text_start));
 	save_item(NAME(m_chargen_start));
 	save_item(NAME(m_video_start));
@@ -354,7 +335,12 @@
 	save_item(NAME(m_video_enable));
 }
 
-uint32_t pk8000_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+void pk8000_state::machine_reset()
+{
+	set_bank(0);
+}
+
+u32 pk8000_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	return video_update(screen, bitmap, cliprect, m_ram->pointer());
 }
@@ -362,7 +348,7 @@
 void pk8000_state::pk8000(machine_config &config)
 {
 	/* basic machine hardware */
-	I8080(config, m_maincpu, 1780000);
+	I8080(config, m_maincpu, 1780000); // pk8002 = 10'220'000 / 8
 	m_maincpu->set_addrmap(AS_PROGRAM, &pk8000_state::pk8000_mem);
 	m_maincpu->set_addrmap(AS_IO, &pk8000_state::pk8000_io);
 	m_maincpu->set_vblank_int("screen", FUNC(pk8000_state::interrupt));
@@ -385,9 +371,9 @@
 	ppi1.out_pc_callback().set(FUNC(pk8000_state::_80_portc_w));
 
 	i8255_device &ppi2(I8255(config, "ppi8255_2"));
-	ppi2.in_pa_callback().set(FUNC(pk8000_base_state::_84_porta_r));
-	ppi2.out_pa_callback().set(FUNC(pk8000_base_state::_84_porta_w));
-	ppi2.out_pc_callback().set(FUNC(pk8000_base_state::_84_portc_w));
+	ppi2.in_pa_callback().set(FUNC(pk8000_state::_84_porta_r));
+	ppi2.out_pa_callback().set(FUNC(pk8000_state::_84_porta_w));
+	ppi2.out_pc_callback().set(FUNC(pk8000_state::_84_portc_w));
 
 	/* audio hardware */
 	SPEAKER(config, "mono").front_center();
@@ -404,23 +390,24 @@
 
 /* ROM definition */
 ROM_START( vesta )
-	ROM_REGION( 0x18000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "vesta.rom", 0x10000, 0x4000, CRC(fbf7e2cc) SHA1(4bc5873066124bd926c3c6aa2fd1a062c87af339))
+	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "vesta.rom", 0x0000, 0x4000, CRC(fbf7e2cc) SHA1(4bc5873066124bd926c3c6aa2fd1a062c87af339))
 ROM_END
 
 ROM_START( hobby )
-	ROM_REGION( 0x18000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "hobby.rom", 0x10000, 0x4000, CRC(a25b4b2c) SHA1(0d86e6e4be8d1aa389bfa9dd79e3604a356729f7))
+	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "hobby.rom", 0x0000, 0x4000, CRC(a25b4b2c) SHA1(0d86e6e4be8d1aa389bfa9dd79e3604a356729f7))
 ROM_END
 
 ROM_START( pk8002 )
-	ROM_REGION( 0x18000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "pk8002.rom", 0x10000, 0x4000, CRC(07b9ae71) SHA1(2137a41cc095c7aba58b7b109fce63f30a4568b2))
+	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	// there is actually 1 rom 0000-07ff (U3) mirrored to 0800,1000,1800, then another rom 2000-27ff (U4) mirrored to 2800,3000,3800
+	ROM_LOAD( "pk8002.rom", 0x0000, 0x4000, CRC(07b9ae71) SHA1(2137a41cc095c7aba58b7b109fce63f30a4568b2))
 ROM_END
 
 /* Driver */
 
 /*    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT        COMPANY      FULLNAME             FLAGS */
-COMP( 1987, vesta,  0,      0,      pk8000,  pk8000, pk8000_state, empty_init, "BP EVM",    "PK8000 Vesta",      0 )
-COMP( 1987, hobby,  vesta,  0,      pk8000,  pk8000, pk8000_state, empty_init, "BP EVM",    "PK8000 Sura/Hobby", 0 )
-COMP( 1987, pk8002, vesta,  0,      pk8000,  pk8000, pk8000_state, empty_init, "<unknown>", "PK8002 Elf",        MACHINE_NOT_WORKING )
+COMP( 1987, vesta,  0,      0,      pk8000,  pk8000, pk8000_state, empty_init, "BP EVM",    "PK8000 Vesta",      MACHINE_SUPPORTS_SAVE )
+COMP( 1987, hobby,  vesta,  0,      pk8000,  pk8000, pk8000_state, empty_init, "BP EVM",    "PK8000 Sura/Hobby", MACHINE_SUPPORTS_SAVE )
+COMP( 1987, pk8002, vesta,  0,      pk8000,  pk8000, pk8000_state, empty_init, "<unknown>", "PK8002 Elf",        MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/pmd85.cpp mame-0.224+dfsg.1/src/mame/drivers/pmd85.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/pmd85.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/pmd85.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -26,19 +26,19 @@
 Notes on emulation status and to do list:
 -----------------------------------------
 
-1. V.24.
-2. Tape emulation for other machines than PMD-85.1.
-3. Flash video attribute.
-4. External interfaces connectors (K2-K5).
-5. Speaker.
-6. Verify PMD-85.2A, PMD-85.3, Didaktik Alfa and Mato monitor roms.
-7. Verify all Basic roms.
-8. 8251 in Didaktik Alfa.
-9. Colors (if any).
-10. PMD-85, Didaktik Alfa 2 and Didaktik Beta (ROMs and documentation needed).
-11. FDD interface (ROMs and disk images needed).
-12. "Duch & Pampuch" Mato game displays scores with incorrect characters.
-13. Tape save in pmd851 is badly formatted - cannot be loaded.
+1.  V.24.
+2.  Flash video attribute.
+3.  External interfaces connectors (K2-K5).
+4.  C2717PMD is marked MNW, but there's nothing to say why.
+5.  Verify PMD-85.2A, PMD-85.3, Didaktik Alfa and Mato monitor roms.
+6.  Verify all Basic roms.
+7.  8251 in Didaktik Alfa.
+8.  Colors (if any). Seems most versions supported 4 colours via RGB connector. But, the TV modulator only carried the G line.
+    The video signals are developed in a forest of gates which may take a while to work out.
+9.  PMD-85, Didaktik Alfa 2 and Didaktik Beta (ROMs and documentation needed).
+10. FDD interface (ROMs and disk images needed).
+11. "Duch & Pampuch" Mato game displays scores with incorrect characters.
+
 
 PMD-85 technical information
 ============================
@@ -183,47 +183,50 @@
 
 Cassette
 --------
-The systems belong to 3 groups which are not compatible with each other.
-- pmd851, alfa
-- mato
-- pmd852, pmd852a, pmd852b, pmd853, c2717, c2717pmd
 
 Cassettes tested with Basic
 - pmd852,pmd852a,pmd852b,pmd853,c2717,c2717pmd - these can save and load back their own files
-- pmd851 - won't go into basic
-- mato,alfa - don't come with basic?
-
-Software list items
-- mato - not compatible
-- all others - recognise headers of sw-item-tapes, but won't load? Maybe the usage is not understood properly.
+- pmd851,mato,alfa - not tested yet.
 
-- Some software items will crash the emulator, for example >mame pmd851 bdash
+Getting into Basic:
+- pmd852,pmd852a,pmd852b,pmd853 : In the Machine Configuration, enable Basic and Reset.
+- pmd851,alfa : type BASIC 00 (or any parameter)
+- mato : type BASIC
+- c2717,c2717pmd : you're already in Basic.
+- How to get out? Unknown.
+
+Loading a tape:
+- In the monitor : type MGLD <fn>, where <fn> is the file number, usually 00. File numbers will be shown in the
+  software list usage.
+- In Basic : type LOAD <fn>, where <fn> is the same as above.
+- The tape can only be loaded into the environment it's meant for. Otherwise, you'll only get header information
+  followed by a freeze.
 
-Header information from what I can understand
-xx/z yyyyyyyy
+Header information from what I can understand: xx/z yyyyyyyy
+yyyyyyyy = filename
 xx = file number
 z = status code (guesses below)
     > - only loadable by Basic
-    ? - only loadable by the monitor - it gives no clue as to the exec address
-    P - protected? I've had no luck getting one to load
-yyyyyyyy = filename
+    ? - only loadable by the monitor - it gives no clue as to the exec address, but should start by itself if it's
+        been saved correctly.
+    x - other codes are added by the user and have program-specific meanings.
+
+Software list items: Some work, some don't, and some only work on certain machines. A test with "bludiste"
+(a monitor program) produced the following:
+- pmd851,pmd852,pmd852a,pmd852b,alfa - loads and runs
+- c2717,c2717pmd - recognises and prints the header, but then doesn't load the tape, because the machine is
+  stuck in Basic.
+- mato,pmd853 - does nothing
+
+Some software items will crash MAME, for example "bdash".
 
 *******************************************************************************************************************/
 
 #include "emu.h"
 #include "includes/pmd85.h"
-
 #include "cpu/i8085/i8085.h"
-#include "imagedev/cassette.h"
-#include "machine/i8251.h"
-#include "machine/i8255.h"
-#include "machine/pit8253.h"
-#include "machine/ram.h"
-
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
-
 #include "formats/pmd_cas.h"
 
 
@@ -231,7 +234,7 @@
 //  VIDEO EMULATION
 //**************************************************************************
 
-uint32_t pmd85_state::screen_update_pmd85(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t pmd85_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	for (int y = 0; y < 256; y++)
 	{
@@ -258,12 +261,12 @@
 
 /* I/O ports */
 
-void pmd85_state::pmd85_io_map(address_map &map)
+void pmd85_state::pmd85_io(address_map &map)
 {
-	map(0x00, 0xff).rw(FUNC(pmd85_state::pmd85_io_r), FUNC(pmd85_state::pmd85_io_w));
+	map(0x00, 0xff).rw(FUNC(pmd85_state::io_r), FUNC(pmd85_state::io_w));
 }
 
-void pmd85_state::mato_io_map(address_map &map)
+void pmd85_state::mato_io(address_map &map)
 {
 	map(0x00, 0xff).rw(FUNC(pmd85_state::mato_io_r), FUNC(pmd85_state::mato_io_w));
 }
@@ -278,9 +281,7 @@
 	map(0x3000, 0x3fff).bankrw("bank4");
 	map(0x4000, 0x7fff).bankrw("bank5");
 	map(0x8000, 0x8fff).bankr("bank6");
-	map(0x9000, 0x9fff).noprw();
 	map(0xa000, 0xafff).bankr("bank7");
-	map(0xb000, 0xbfff).noprw();
 	map(0xc000, 0xffff).bankrw("bank8");
 }
 
@@ -318,7 +319,6 @@
 	map(0x4000, 0x7fff).bankrw("bank4");
 	map(0x8000, 0x8fff).bankr("bank5");
 	map(0x9000, 0xb3ff).bankr("bank6");
-	map(0xb400, 0xbfff).noprw();
 	map(0xc000, 0xffff).bankrw("bank7");
 }
 
@@ -518,7 +518,7 @@
 	PORT_INCLUDE( pmd85 )
 
 	PORT_MODIFY( "DSW0" )
-		PORT_BIT( 0x01, 0x00, IPT_UNUSED )
+		PORT_BIT( 0x01, 0x01, IPT_UNUSED )
 INPUT_PORTS_END
 
 
@@ -623,7 +623,7 @@
 	/* basic machine hardware */
 	I8080(config, m_maincpu, XTAL(18'432'000)/9);
 	m_maincpu->set_addrmap(AS_PROGRAM, &pmd85_state::pmd85_mem);
-	m_maincpu->set_addrmap(AS_IO, &pmd85_state::pmd85_io_map);
+	m_maincpu->set_addrmap(AS_IO, &pmd85_state::pmd85_io);
 	config.set_maximum_quantum(attotime::from_hz(60));
 
 
@@ -647,10 +647,10 @@
 
 *******************************************************************************/
 
-	PIT8253(config, m_pit8253, 0);
-	m_pit8253->set_clk<0>(0);
-	m_pit8253->set_clk<1>(XTAL(18'432'000)/9);
-	m_pit8253->set_clk<2>(1);
+	PIT8253(config, m_pit, 0);
+	m_pit->set_clk<0>(0);
+	m_pit->set_clk<1>(XTAL(18'432'000)/9);
+	m_pit->set_clk<2>(1);
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -659,13 +659,14 @@
 	screen.set_vblank_time(0);
 	screen.set_size(288, 256);
 	screen.set_visarea(0, 288-1, 0, 256-1);
-	screen.set_screen_update(FUNC(pmd85_state::screen_update_pmd85));
+	screen.set_screen_update(FUNC(pmd85_state::screen_update));
 	screen.set_palette(m_palette);
 
 	PALETTE(config, m_palette, palette_device::MONOCHROME_HIGHLIGHT);
 
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
+	SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
 
 	/* cassette */
 	CASSETTE(config, m_cassette);
@@ -687,44 +688,44 @@
 	}
 
 	/* internal ram */
-	RAM(config, m_ram).set_default_size("64K");
+	RAM(config, m_ram).set_default_size("64K").set_default_value(0x00);
 }
 
 void pmd85_state::pmd851(machine_config &config)
 {
 	pmd85(config);
 
-	I8255(config, m_ppi8255_0, 0);
-	m_ppi8255_0->in_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_0_porta_r));
-	m_ppi8255_0->in_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_0_portb_r));
-	m_ppi8255_0->in_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_0_portc_r));
-	m_ppi8255_0->out_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_0_porta_w));
-	m_ppi8255_0->out_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_0_portb_w));
-	m_ppi8255_0->out_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_0_portc_w));
-
-	I8255(config, m_ppi8255_1, 0);
-	m_ppi8255_1->in_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_1_porta_r));
-	m_ppi8255_1->in_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_1_portb_r));
-	m_ppi8255_1->in_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_1_portc_r));
-	m_ppi8255_1->out_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_1_porta_w));
-	m_ppi8255_1->out_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_1_portb_w));
-	m_ppi8255_1->out_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_1_portc_w));
-
-	I8255(config, m_ppi8255_2, 0);
-	m_ppi8255_2->in_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_2_porta_r));
-	m_ppi8255_2->in_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_2_portb_r));
-	m_ppi8255_2->in_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_2_portc_r));
-	m_ppi8255_2->out_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_2_porta_w));
-	m_ppi8255_2->out_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_2_portb_w));
-	m_ppi8255_2->out_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_2_portc_w));
-
-	I8255(config, m_ppi8255_3, 0);
-	m_ppi8255_3->in_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_3_porta_r));
-	m_ppi8255_3->in_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_3_portb_r));
-	m_ppi8255_3->in_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_3_portc_r));
-	m_ppi8255_3->out_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_3_porta_w));
-	m_ppi8255_3->out_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_3_portb_w));
-	m_ppi8255_3->out_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_3_portc_w));
+	I8255(config, m_ppi0, 0);
+	m_ppi0->in_pa_callback().set(FUNC(pmd85_state::ppi0_porta_r));
+	m_ppi0->in_pb_callback().set(FUNC(pmd85_state::ppi0_portb_r));
+	m_ppi0->in_pc_callback().set(FUNC(pmd85_state::ppi0_portc_r));
+	m_ppi0->out_pa_callback().set(FUNC(pmd85_state::ppi0_porta_w));
+	m_ppi0->out_pb_callback().set(FUNC(pmd85_state::ppi0_portb_w));
+	m_ppi0->out_pc_callback().set(FUNC(pmd85_state::ppi0_portc_w));
+
+	I8255(config, m_ppi1, 0);
+	m_ppi1->in_pa_callback().set(FUNC(pmd85_state::ppi1_porta_r));
+	m_ppi1->in_pb_callback().set(FUNC(pmd85_state::ppi1_portb_r));
+	m_ppi1->in_pc_callback().set(FUNC(pmd85_state::ppi1_portc_r));
+	m_ppi1->out_pa_callback().set(FUNC(pmd85_state::ppi1_porta_w));
+	m_ppi1->out_pb_callback().set(FUNC(pmd85_state::ppi1_portb_w));
+	m_ppi1->out_pc_callback().set(FUNC(pmd85_state::ppi1_portc_w));
+
+	I8255(config, m_ppi2, 0);
+	m_ppi2->in_pa_callback().set(FUNC(pmd85_state::ppi2_porta_r));
+	m_ppi2->in_pb_callback().set(FUNC(pmd85_state::ppi2_portb_r));
+	m_ppi2->in_pc_callback().set(FUNC(pmd85_state::ppi2_portc_r));
+	m_ppi2->out_pa_callback().set(FUNC(pmd85_state::ppi2_porta_w));
+	m_ppi2->out_pb_callback().set(FUNC(pmd85_state::ppi2_portb_w));
+	m_ppi2->out_pc_callback().set(FUNC(pmd85_state::ppi2_portc_w));
+
+	I8255(config, m_ppi3, 0);
+	m_ppi3->in_pa_callback().set(FUNC(pmd85_state::ppi3_porta_r));
+	m_ppi3->in_pb_callback().set(FUNC(pmd85_state::ppi3_portb_r));
+	m_ppi3->in_pc_callback().set(FUNC(pmd85_state::ppi3_portc_r));
+	m_ppi3->out_pa_callback().set(FUNC(pmd85_state::ppi3_porta_w));
+	m_ppi3->out_pb_callback().set(FUNC(pmd85_state::ppi3_portb_w));
+	m_ppi3->out_pc_callback().set(FUNC(pmd85_state::ppi3_portc_w));
 }
 
 void pmd85_state::pmd852a(machine_config &config)
@@ -744,44 +745,44 @@
 	pmd85(config);
 	m_maincpu->set_addrmap(AS_PROGRAM, &pmd85_state::alfa_mem);
 
-	I8255(config, m_ppi8255_0, 0);
-	m_ppi8255_0->in_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_0_porta_r));
-	m_ppi8255_0->in_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_0_portb_r));
-	m_ppi8255_0->in_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_0_portc_r));
-	m_ppi8255_0->out_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_0_porta_w));
-	m_ppi8255_0->out_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_0_portb_w));
-	m_ppi8255_0->out_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_0_portc_w));
-
-	I8255(config, m_ppi8255_1, 0);
-	m_ppi8255_1->in_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_1_porta_r));
-	m_ppi8255_1->in_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_1_portb_r));
-	m_ppi8255_1->in_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_1_portc_r));
-	m_ppi8255_1->out_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_1_porta_w));
-	m_ppi8255_1->out_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_1_portb_w));
-	m_ppi8255_1->out_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_1_portc_w));
-
-	I8255(config, m_ppi8255_2, 0);
-	m_ppi8255_2->in_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_2_porta_r));
-	m_ppi8255_2->in_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_2_portb_r));
-	m_ppi8255_2->in_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_2_portc_r));
-	m_ppi8255_2->out_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_2_porta_w));
-	m_ppi8255_2->out_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_2_portb_w));
-	m_ppi8255_2->out_pc_callback().set(FUNC(pmd85_state::pmd85_ppi_2_portc_w));
+	I8255(config, m_ppi0, 0);
+	m_ppi0->in_pa_callback().set(FUNC(pmd85_state::ppi0_porta_r));
+	m_ppi0->in_pb_callback().set(FUNC(pmd85_state::ppi0_portb_r));
+	m_ppi0->in_pc_callback().set(FUNC(pmd85_state::ppi0_portc_r));
+	m_ppi0->out_pa_callback().set(FUNC(pmd85_state::ppi0_porta_w));
+	m_ppi0->out_pb_callback().set(FUNC(pmd85_state::ppi0_portb_w));
+	m_ppi0->out_pc_callback().set(FUNC(pmd85_state::ppi0_portc_w));
+
+	I8255(config, m_ppi1, 0);
+	m_ppi1->in_pa_callback().set(FUNC(pmd85_state::ppi1_porta_r));
+	m_ppi1->in_pb_callback().set(FUNC(pmd85_state::ppi1_portb_r));
+	m_ppi1->in_pc_callback().set(FUNC(pmd85_state::ppi1_portc_r));
+	m_ppi1->out_pa_callback().set(FUNC(pmd85_state::ppi1_porta_w));
+	m_ppi1->out_pb_callback().set(FUNC(pmd85_state::ppi1_portb_w));
+	m_ppi1->out_pc_callback().set(FUNC(pmd85_state::ppi1_portc_w));
+
+	I8255(config, m_ppi2, 0);
+	m_ppi2->in_pa_callback().set(FUNC(pmd85_state::ppi2_porta_r));
+	m_ppi2->in_pb_callback().set(FUNC(pmd85_state::ppi2_portb_r));
+	m_ppi2->in_pc_callback().set(FUNC(pmd85_state::ppi2_portc_r));
+	m_ppi2->out_pa_callback().set(FUNC(pmd85_state::ppi2_porta_w));
+	m_ppi2->out_pb_callback().set(FUNC(pmd85_state::ppi2_portb_w));
+	m_ppi2->out_pc_callback().set(FUNC(pmd85_state::ppi2_portc_w));
 }
 
 void pmd85_state::mato(machine_config &config)
 {
 	pmd85(config, false); /* no uart */
 	m_maincpu->set_addrmap(AS_PROGRAM, &pmd85_state::mato_mem);
-	m_maincpu->set_addrmap(AS_IO, &pmd85_state::mato_io_map);
+	m_maincpu->set_addrmap(AS_IO, &pmd85_state::mato_io);
 
-	I8255(config, m_ppi8255_0, 0);
-	m_ppi8255_0->in_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_0_porta_r));
-	m_ppi8255_0->out_pa_callback().set(FUNC(pmd85_state::pmd85_ppi_0_porta_w));
-	m_ppi8255_0->in_pb_callback().set(FUNC(pmd85_state::mato_ppi_0_portb_r));
-	m_ppi8255_0->out_pb_callback().set(FUNC(pmd85_state::pmd85_ppi_0_portb_w));
-	m_ppi8255_0->in_pc_callback().set(FUNC(pmd85_state::mato_ppi_0_portc_r));
-	m_ppi8255_0->out_pc_callback().set(FUNC(pmd85_state::mato_ppi_0_portc_w));
+	I8255(config, m_ppi0, 0);
+	m_ppi0->in_pa_callback().set(FUNC(pmd85_state::ppi0_porta_r));
+	m_ppi0->out_pa_callback().set(FUNC(pmd85_state::ppi0_porta_w));
+	m_ppi0->in_pb_callback().set(FUNC(pmd85_state::mato_ppi0_portb_r));
+	m_ppi0->out_pb_callback().set(FUNC(pmd85_state::ppi0_portb_w));
+	m_ppi0->in_pc_callback().set(FUNC(pmd85_state::mato_ppi0_portc_r));
+	m_ppi0->out_pc_callback().set(FUNC(pmd85_state::mato_ppi0_portc_w));
 }
 
 void pmd85_state::c2717(machine_config &config)
@@ -792,82 +793,87 @@
 
 
 ROM_START(pmd851)
-	ROM_REGION(0x11000,"maincpu",0)
-	ROM_LOAD("pmd85-1.bin", 0x10000, 0x1000, CRC(ef50b416) SHA1(afa3ec0d03228adc5287a4cba905ce7ad0497dff))
+	ROM_REGION(0x1000,"maincpu",0)
+	ROM_LOAD("pmd85-1.bin", 0x0000, 0x1000, CRC(ef50b416) SHA1(afa3ec0d03228adc5287a4cba905ce7ad0497dff))
+
 	ROM_REGION(0x2400,"user1",0)
-	ROM_LOAD_OPTIONAL("pmd85-1.bas", 0x0000, 0x2400, CRC(4fc37d45) SHA1(3bd0f92f37a3f2ee539916dc75508bda37433a72))
+	ROM_LOAD("pmd85-1.bas", 0x0000, 0x2400, CRC(4fc37d45) SHA1(3bd0f92f37a3f2ee539916dc75508bda37433a72))
 ROM_END
 
 ROM_START(pmd852)
-	ROM_REGION(0x11000,"maincpu",0)
-	ROM_LOAD("pmd85-2.bin", 0x10000, 0x1000, CRC(d4786f63) SHA1(6facdf37bb012714244b012a0c4bd715a956e42b))
+	ROM_REGION(0x1000,"maincpu",0)
+	ROM_LOAD("pmd85-2.bin", 0x0000, 0x1000, CRC(d4786f63) SHA1(6facdf37bb012714244b012a0c4bd715a956e42b))
+
 	ROM_REGION(0x2400,"user1",0)
-	ROM_LOAD_OPTIONAL("pmd85-2.bas", 0x0000, 0x2400, CRC(fc4a3ebf) SHA1(3bfc0e9a5cd5187da573b5d539d7246358125a88))
+	ROM_LOAD("pmd85-2.bas", 0x0000, 0x2400, CRC(fc4a3ebf) SHA1(3bfc0e9a5cd5187da573b5d539d7246358125a88))
 ROM_END
 
 ROM_START(pmd852a)
-	ROM_REGION(0x11000,"maincpu",0)
-	ROM_LOAD("pmd85-2a.bin", 0x10000, 0x1000, CRC(5a9a961b) SHA1(7363341596367d08b9a98767c6585ce18dfd03af))
+	ROM_REGION(0x1000,"maincpu",0)
+	ROM_LOAD("pmd85-2a.bin", 0x0000, 0x1000, CRC(5a9a961b) SHA1(7363341596367d08b9a98767c6585ce18dfd03af))
+
 	ROM_REGION(0x2400,"user1",0)
-	ROM_LOAD_OPTIONAL("pmd85-2a.bas", 0x0000, 0x2400, CRC(6ff379ad) SHA1(edcaf2420cac9771596ead5c86c41116b228eca3))
+	ROM_LOAD("pmd85-2a.bas", 0x0000, 0x2400, CRC(6ff379ad) SHA1(edcaf2420cac9771596ead5c86c41116b228eca3))
 ROM_END
 
 ROM_START(pmd852b)
-	ROM_REGION(0x11000,"maincpu",0)
-	ROM_LOAD("pmd85-2a.bin", 0x10000, 0x1000, CRC(5a9a961b) SHA1(7363341596367d08b9a98767c6585ce18dfd03af))
+	ROM_REGION(0x1000,"maincpu",0)
+	ROM_LOAD("pmd85-2a.bin", 0x0000, 0x1000, CRC(5a9a961b) SHA1(7363341596367d08b9a98767c6585ce18dfd03af))
+
 	ROM_REGION(0x2400,"user1",0)
-	ROM_LOAD_OPTIONAL("pmd85-2a.bas", 0x0000, 0x2400, CRC(6ff379ad) SHA1(edcaf2420cac9771596ead5c86c41116b228eca3))
+	ROM_LOAD("pmd85-2a.bas", 0x0000, 0x2400, CRC(6ff379ad) SHA1(edcaf2420cac9771596ead5c86c41116b228eca3))
 ROM_END
 
 ROM_START(pmd853)
-	ROM_REGION(0x12000,"maincpu",0)
-	ROM_LOAD("pmd85-3.bin", 0x10000, 0x2000, CRC(83e22c47) SHA1(5f131e27ae3ec8907adbe5cd228c67d131066084))
+	ROM_REGION(0x2000,"maincpu",0)
+	ROM_LOAD("pmd85-3.bin", 0x0000, 0x2000, CRC(83e22c47) SHA1(5f131e27ae3ec8907adbe5cd228c67d131066084))
+
 	ROM_REGION(0x2800,"user1",0)
-	ROM_LOAD_OPTIONAL("pmd85-3.bas", 0x0000, 0x2800, CRC(1e30e91d) SHA1(d086040abf4c0a7e5da8cf4db7d1668a1d9309a4))
+	ROM_LOAD("pmd85-3.bas", 0x0000, 0x2800, CRC(1e30e91d) SHA1(d086040abf4c0a7e5da8cf4db7d1668a1d9309a4))
 ROM_END
 
 ROM_START(alfa)
-	ROM_REGION(0x13400,"maincpu",0)
-	ROM_LOAD("alfa.bin", 0x10000, 0x1000, CRC(e425eedb) SHA1(db93b5de1e16b5ae71be08feb083a2ac15759495))
-	ROM_LOAD("alfa.bas", 0x11000, 0x2400, CRC(9a73bfd2) SHA1(74314d989846f64e715f64deb84cb177fa62f4a9))
+	ROM_REGION(0x3400,"maincpu",0)
+	ROM_LOAD("alfa.bin", 0x0000, 0x1000, CRC(e425eedb) SHA1(db93b5de1e16b5ae71be08feb083a2ac15759495))
+	ROM_LOAD("alfa.bas", 0x1000, 0x2400, CRC(9a73bfd2) SHA1(74314d989846f64e715f64deb84cb177fa62f4a9))
 ROM_END
 
 ROM_START(mato)
-	ROM_REGION(0x14000,"maincpu",0)
+	ROM_REGION(0x4000,"maincpu",0)
 	ROM_SYSTEM_BIOS(0, "default", "BASIC")
-	ROMX_LOAD("mato.bin",  0x10000, 0x4000, CRC(574110a6) SHA1(4ff2cd4b07a1a700c55f92e5b381c04f758fb461), ROM_BIOS(0))
+	ROMX_LOAD("mato.bin",  0x0000, 0x4000, CRC(574110a6) SHA1(4ff2cd4b07a1a700c55f92e5b381c04f758fb461), ROM_BIOS(0))
 	ROM_SYSTEM_BIOS(1, "ru", "Russian")
-	ROMX_LOAD("mato-ru.rom",  0x10000, 0x4000, CRC(44b68be4) SHA1(0d9ea9a9380e2af011a2f0b64c534dd0eb0a1fac), ROM_BIOS(1))
+	ROMX_LOAD("mato-ru.rom",  0x0000, 0x4000, CRC(44b68be4) SHA1(0d9ea9a9380e2af011a2f0b64c534dd0eb0a1fac), ROM_BIOS(1))
 	ROM_SYSTEM_BIOS(2, "lan", "BASIC LAN")
-	ROMX_LOAD("mato-lan.rom",  0x10000, 0x4000, CRC(422cddde) SHA1(2a3dacf8e3e7637109c9d267f589a00881e9a5f4), ROM_BIOS(2))
+	ROMX_LOAD("mato-lan.rom",  0x0000, 0x4000, CRC(422cddde) SHA1(2a3dacf8e3e7637109c9d267f589a00881e9a5f4), ROM_BIOS(2))
 	ROM_SYSTEM_BIOS(3, "games", "Games v1")
-	ROMX_LOAD("matoh.bin", 0x10000, 0x4000, CRC(ca25880d) SHA1(38ce0b6a26d48a09fdf96863c3eaf3705aca2590), ROM_BIOS(3))
+	ROMX_LOAD("matoh.bin", 0x0000, 0x4000, CRC(ca25880d) SHA1(38ce0b6a26d48a09fdf96863c3eaf3705aca2590), ROM_BIOS(3))
 	ROM_SYSTEM_BIOS(4, "gamesen", "Games v2 EN")
-	ROMX_LOAD("matogmen.rom", 0x10000, 0x4000, CRC(47e039c8) SHA1(6cc73a6b58921b33691d2751dee28428456eb222), ROM_BIOS(4))
+	ROMX_LOAD("matogmen.rom", 0x0000, 0x4000, CRC(47e039c8) SHA1(6cc73a6b58921b33691d2751dee28428456eb222), ROM_BIOS(4))
 	ROM_SYSTEM_BIOS(5, "gamessk", "Games v2 SK")
-	ROMX_LOAD("matogmsk.rom", 0x10000, 0x4000, CRC(d0c9b1e7) SHA1(9e7289d971a957bf161c317e5fa76db3289ee23c), ROM_BIOS(5))
+	ROMX_LOAD("matogmsk.rom", 0x0000, 0x4000, CRC(d0c9b1e7) SHA1(9e7289d971a957bf161c317e5fa76db3289ee23c), ROM_BIOS(5))
 	ROM_SYSTEM_BIOS(6, "games3", "Games v3")
-	ROMX_LOAD("matogm3.rom", 0x10000, 0x4000, CRC(9352f2c1) SHA1(b3e45c56d2800c69a0bb02febda6fa715f1afbc3), ROM_BIOS(6))
+	ROMX_LOAD("matogm3.rom", 0x0000, 0x4000, CRC(9352f2c1) SHA1(b3e45c56d2800c69a0bb02febda6fa715f1afbc3), ROM_BIOS(6))
 ROM_END
 
 ROM_START(c2717)
-	ROM_REGION(0x14000,"maincpu",0)
-	ROM_LOAD("c2717.rom", 0x10000, 0x4000, CRC(da1703b1) SHA1(9fb93e6cae8b551064c7175bf3b4e3113429ce73))
+	ROM_REGION(0x4000,"maincpu",0)
+	ROM_LOAD("c2717.rom", 0x0000, 0x4000, CRC(da1703b1) SHA1(9fb93e6cae8b551064c7175bf3b4e3113429ce73))
 ROM_END
 
 ROM_START(c2717pmd)
-	ROM_REGION(0x14000,"maincpu",0)
-	ROM_LOAD( "c2717-pmd32.rom", 0x10000, 0x4000, CRC(cbdd323c) SHA1(ee9fea11be8bd4f945c583b0ae5684269906d0ce))
+	ROM_REGION(0x4000,"maincpu",0)
+	ROM_LOAD( "c2717-pmd32.rom", 0x00000, 0x4000, CRC(cbdd323c) SHA1(ee9fea11be8bd4f945c583b0ae5684269906d0ce))
 ROM_END
 
 
 //    YEAR  NAME      PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT          COMPANY             FULLNAME                     FLAGS
-COMP( 1985, pmd851,   0,      0,      pmd851,  pmd85, pmd85_state, init_pmd851,  "Tesla",            "PMD-85.1",                  0 )
-COMP( 1985, pmd852,   pmd851, 0,      pmd851,  pmd85, pmd85_state, init_pmd852,  "Tesla",            "PMD-85.2",                  0 )
-COMP( 1985, pmd852a,  pmd851, 0,      pmd852a, pmd85, pmd85_state, init_pmd852a, "Tesla",            "PMD-85.2A",                 0 )
-COMP( 1985, pmd852b,  pmd851, 0,      pmd852a, pmd85, pmd85_state, init_pmd852a, "Tesla",            "PMD-85.2B",                 0 )
-COMP( 1988, pmd853,   pmd851, 0,      pmd853,  pmd85, pmd85_state, init_pmd853,  "Tesla",            "PMD-85.3",                  0 )
-COMP( 1986, alfa,     pmd851, 0,      alfa,    alfa,  pmd85_state, init_alfa,    "Didaktik Skalica", "Didaktik Alfa",             0 )
-COMP( 1985, mato,     pmd851, 0,      mato,    mato,  pmd85_state, init_mato,    "Statny",           "Mato",                      0 )
-COMP( 1989, c2717,    pmd851, 0,      c2717,   pmd85, pmd85_state, init_c2717,   "Zbrojovka Brno",   "Consul 2717",               0 )
-COMP( 1989, c2717pmd, pmd851, 0,      c2717,   pmd85, pmd85_state, init_c2717,   "Zbrojovka Brno",   "Consul 2717 (with PMD-32)", MACHINE_NOT_WORKING )
+COMP( 1985, pmd851,   0,      0,      pmd851,  alfa,  pmd85_state, init_pmd851,  "Tesla",            "PMD-85.1",                  MACHINE_SUPPORTS_SAVE )
+COMP( 1985, pmd852,   pmd851, 0,      pmd851,  pmd85, pmd85_state, init_pmd852,  "Tesla",            "PMD-85.2",                  MACHINE_SUPPORTS_SAVE )
+COMP( 1985, pmd852a,  pmd851, 0,      pmd852a, pmd85, pmd85_state, init_pmd852a, "Tesla",            "PMD-85.2A",                 MACHINE_SUPPORTS_SAVE )
+COMP( 1985, pmd852b,  pmd851, 0,      pmd852a, pmd85, pmd85_state, init_pmd852a, "Tesla",            "PMD-85.2B",                 MACHINE_SUPPORTS_SAVE )
+COMP( 1988, pmd853,   pmd851, 0,      pmd853,  pmd85, pmd85_state, init_pmd853,  "Tesla",            "PMD-85.3",                  MACHINE_SUPPORTS_SAVE )
+COMP( 1986, alfa,     pmd851, 0,      alfa,    alfa,  pmd85_state, init_alfa,    "Didaktik Skalica", "Didaktik Alfa",             MACHINE_SUPPORTS_SAVE )
+COMP( 1985, mato,     pmd851, 0,      mato,    mato,  pmd85_state, init_mato,    "Statny",           "Mato",                      MACHINE_SUPPORTS_SAVE )
+COMP( 1989, c2717,    pmd851, 0,      c2717,   pmd85, pmd85_state, init_c2717,   "Zbrojovka Brno",   "Consul 2717",               MACHINE_SUPPORTS_SAVE )
+COMP( 1989, c2717pmd, pmd851, 0,      c2717,   pmd85, pmd85_state, init_c2717,   "Zbrojovka Brno",   "Consul 2717 (with PMD-32)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/poly88.cpp mame-0.224+dfsg.1/src/mame/drivers/poly88.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/poly88.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/poly88.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -221,5 +221,5 @@
 /* Driver */
 
 //    YEAR  NAME      PARENT  COMPAT  MACHINE   INPUT   CLASS         INIT         COMPANY                FULLNAME     FLAGS
-COMP( 1976, poly88,   0,      0,      poly88,   poly88, poly88_state, empty_init,  "PolyMorphic Systems", "Poly-88",   0 )
-COMP( 1977, poly8813, poly88, 0,      poly8813, poly88, poly88_state, empty_init,  "PolyMorphic Systems", "Poly-8813", MACHINE_NOT_WORKING )
+COMP( 1976, poly88,   0,      0,      poly88,   poly88, poly88_state, empty_init,  "PolyMorphic Systems", "Poly-88",   MACHINE_SUPPORTS_SAVE )
+COMP( 1977, poly8813, poly88, 0,      poly8813, poly88, poly88_state, empty_init,  "PolyMorphic Systems", "Poly-8813", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/pp01.cpp mame-0.224+dfsg.1/src/mame/drivers/pp01.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/pp01.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/pp01.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -16,6 +16,9 @@
 
 ToDo:
 - Interrupt controller
+- Add missing keys
+- Quickload support
+- Software to test with
 
 *****************************************************************************************/
 
@@ -29,22 +32,22 @@
 /* Address maps */
 void pp01_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x0fff).bankrw("bank1");
-	map(0x1000, 0x1fff).bankrw("bank2");
-	map(0x2000, 0x2fff).bankrw("bank3");
-	map(0x3000, 0x3fff).bankrw("bank4");
-	map(0x4000, 0x4fff).bankrw("bank5");
-	map(0x5000, 0x5fff).bankrw("bank6");
-	map(0x6000, 0x6fff).bankrw("bank7");
-	map(0x7000, 0x7fff).bankrw("bank8");
-	map(0x8000, 0x8fff).bankrw("bank9");
-	map(0x9000, 0x9fff).bankrw("bank10");
-	map(0xa000, 0xafff).bankrw("bank11");
-	map(0xb000, 0xbfff).bankrw("bank12");
-	map(0xc000, 0xcfff).bankrw("bank13");
-	map(0xd000, 0xdfff).bankrw("bank14");
-	map(0xe000, 0xefff).bankrw("bank15");
-	map(0xf000, 0xffff).bankrw("bank16");
+	map(0x0000, 0x0fff).bankrw("bank0");
+	map(0x1000, 0x1fff).bankrw("bank1");
+	map(0x2000, 0x2fff).bankrw("bank2");
+	map(0x3000, 0x3fff).bankrw("bank3");
+	map(0x4000, 0x4fff).bankrw("bank4");
+	map(0x5000, 0x5fff).bankrw("bank5");
+	map(0x6000, 0x6fff).bankrw("bank6");
+	map(0x7000, 0x7fff).bankrw("bank7");
+	map(0x8000, 0x8fff).bankrw("bank8");
+	map(0x9000, 0x9fff).bankrw("bank9");
+	map(0xa000, 0xafff).bankrw("bank10");
+	map(0xb000, 0xbfff).bankrw("bank11");
+	map(0xc000, 0xcfff).bankrw("bank12");
+	map(0xd000, 0xdfff).bankrw("bank13");
+	map(0xe000, 0xefff).bankrw("bank14");
+	map(0xf000, 0xffff).bankrw("bank15");
 }
 
 void pp01_state::io_map(address_map &map)
@@ -68,8 +71,6 @@
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("LINE1")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F1") PORT_CODE(KEYCODE_F1)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F2") PORT_CODE(KEYCODE_F2)
@@ -77,8 +78,6 @@
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("1") PORT_CODE(KEYCODE_1)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("LINE2")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F3") PORT_CODE(KEYCODE_F3)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F4") PORT_CODE(KEYCODE_F4)
@@ -86,8 +85,6 @@
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("2") PORT_CODE(KEYCODE_2)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("LINE3")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F5") PORT_CODE(KEYCODE_F5)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F6") PORT_CODE(KEYCODE_F6)
@@ -95,8 +92,6 @@
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("3") PORT_CODE(KEYCODE_3)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("LINE4")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F7") PORT_CODE(KEYCODE_F7)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F8") PORT_CODE(KEYCODE_F8)
@@ -104,8 +99,6 @@
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("LINE5")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F9") PORT_CODE(KEYCODE_F9)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F10") PORT_CODE(KEYCODE_F10)
@@ -113,8 +106,6 @@
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("5") PORT_CODE(KEYCODE_5)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("LINE6")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F11") PORT_CODE(KEYCODE_F11)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F12") PORT_CODE(KEYCODE_F12)
@@ -122,8 +113,6 @@
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("6") PORT_CODE(KEYCODE_6)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("LINE7")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F13") PORT_CODE(KEYCODE_PGUP)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F14") PORT_CODE(KEYCODE_PGDN)
@@ -131,8 +120,6 @@
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("7") PORT_CODE(KEYCODE_7)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("LINE8")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Backspace") PORT_CODE(KEYCODE_BACKSPACE)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Delete line") PORT_CODE(KEYCODE_TILDE)
@@ -140,8 +127,6 @@
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("8") PORT_CODE(KEYCODE_8)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_START("LINE9")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Num +") PORT_CODE(KEYCODE_PLUS_PAD)
@@ -149,64 +134,49 @@
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("9") PORT_CODE(KEYCODE_9)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
-	PORT_START("LINEA")
+	PORT_START("LINE10")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(":") PORT_CODE(KEYCODE_QUOTE)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
-	PORT_START("LINEB")
+	PORT_START("LINE11")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(";") PORT_CODE(KEYCODE_COLON)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("[") PORT_CODE(KEYCODE_OPENBRACE)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
-	PORT_START("LINEC")
+	PORT_START("LINE12")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Num *") PORT_CODE(KEYCODE_ASTERISK)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Num -") PORT_CODE(KEYCODE_MINUS_PAD)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(",") PORT_CODE(KEYCODE_COMMA)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("\\") PORT_CODE(KEYCODE_BACKSLASH)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
-	PORT_START("LINED")
+	PORT_START("LINE13")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("-") PORT_CODE(KEYCODE_MINUS)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("]") PORT_CODE(KEYCODE_CLOSEBRACE)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
-	PORT_START("LINEE")
+	PORT_START("LINE14")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Num /") PORT_CODE(KEYCODE_SLASH_PAD)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Num .") PORT_CODE(KEYCODE_DEL_PAD)
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(".") PORT_CODE(KEYCODE_STOP)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^") PORT_CODE(KEYCODE_TILDE)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
-	PORT_START("LINEF")
+	PORT_START("LINE15")
 		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
 		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("/") PORT_CODE(KEYCODE_SLASH)
 		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O)
 		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("_") PORT_CODE(KEYCODE_HOME)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
-	PORT_START("LINEALL")
-		PORT_BIT(0x3F, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_START("LINE16")
 		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL)
 		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT)
 INPUT_PORTS_END
@@ -266,28 +236,27 @@
 /* ROM definition */
 
 ROM_START( pp01 )
-	ROM_REGION( 0x18000, "maincpu", ROMREGION_ERASEFF )
-
-	ROM_LOAD( "ep01.rom", 0x14000, 0x0400, CRC(e48e440f) SHA1(aaae41f0bf163f254e28f6e4d9f6010b349e0c45))
-	ROM_LOAD( "ep02.rom", 0x14400, 0x0400, CRC(b9314867) SHA1(220e2a686c6624574e8ea7f6012030c8378a8be6))
-	ROM_LOAD( "ep03.rom", 0x14800, 0x0400, CRC(47b91d49) SHA1(51445e24d1c375e798c5ed7b48cb1c7b5e01603a))
-	ROM_LOAD( "ep04.rom", 0x14c00, 0x0400, CRC(cc890123) SHA1(7110f301453d925da0d3f29c2ba4eacd5ff8583d))
-	ROM_LOAD( "ep05.rom", 0x15000, 0x0400, CRC(b36e2071) SHA1(7c7b2c410f4039980627196575109426bb7bab35))
-	ROM_LOAD( "ep06.rom", 0x15400, 0x0400, CRC(3f74efb3) SHA1(77d055eb53ba9b4b14eb2bb8d71f93095b846bb5))
-	ROM_LOAD( "ep07.rom", 0x15800, 0x0400, CRC(1dd0bc29) SHA1(109bc3f24a76884d2581f75edc532917cb7ea155))
-	ROM_LOAD( "ep08.rom", 0x15c00, 0x0400, CRC(607b710a) SHA1(c5ac7da31204c54d6892d6b708d0291d71963581))
-	ROM_LOAD( "ep09.rom", 0x16000, 0x0400, CRC(07f773d1) SHA1(a6cf454318ef0a564a86e669b751e414b12c12d1))
-	ROM_LOAD( "ep10.rom", 0x16400, 0x0400, CRC(7793d84b) SHA1(d16ad3db36c8cec68713082ee60324219d3d5032))
-	ROM_LOAD( "ep11.rom", 0x16800, 0x0400, CRC(d1b98b5e) SHA1(5526af6317667d707ae413916242cd1bac821373))
-	ROM_LOAD( "ep12.rom", 0x16c00, 0x0400, CRC(03c45326) SHA1(f9157ab86cdf1d111bcf19c24e4d7250705be965))
-	ROM_LOAD( "ep13.rom", 0x17000, 0x0400, CRC(51769d6c) SHA1(76d6e91cf32b1eb94b9c0ded02e5057ed7ff7d72))
-	ROM_LOAD( "ep14.rom", 0x17400, 0x0400, CRC(5d48cefb) SHA1(9b8599dabaf7297ec800fa9a122ad7e3b7b30e8b))
-	ROM_LOAD( "ep15.rom", 0x17800, 0x0400, CRC(f44bfe36) SHA1(0ab3c4f061dff6f779685409b07343d0a839fdae))
-	ROM_LOAD( "ep16.rom", 0x17c00, 0x0400, CRC(f39c230d) SHA1(9789cedef5655bcb82561f387cc1a6cf48287d78))
+	ROM_REGION( 0x4000, "maincpu", 0 )
+	ROM_LOAD( "ep01.rom", 0x0000, 0x0400, CRC(e48e440f) SHA1(aaae41f0bf163f254e28f6e4d9f6010b349e0c45))
+	ROM_LOAD( "ep02.rom", 0x0400, 0x0400, CRC(b9314867) SHA1(220e2a686c6624574e8ea7f6012030c8378a8be6))
+	ROM_LOAD( "ep03.rom", 0x0800, 0x0400, CRC(47b91d49) SHA1(51445e24d1c375e798c5ed7b48cb1c7b5e01603a))
+	ROM_LOAD( "ep04.rom", 0x0c00, 0x0400, CRC(cc890123) SHA1(7110f301453d925da0d3f29c2ba4eacd5ff8583d))
+	ROM_LOAD( "ep05.rom", 0x1000, 0x0400, CRC(b36e2071) SHA1(7c7b2c410f4039980627196575109426bb7bab35))
+	ROM_LOAD( "ep06.rom", 0x1400, 0x0400, CRC(3f74efb3) SHA1(77d055eb53ba9b4b14eb2bb8d71f93095b846bb5))
+	ROM_LOAD( "ep07.rom", 0x1800, 0x0400, CRC(1dd0bc29) SHA1(109bc3f24a76884d2581f75edc532917cb7ea155))
+	ROM_LOAD( "ep08.rom", 0x1c00, 0x0400, CRC(607b710a) SHA1(c5ac7da31204c54d6892d6b708d0291d71963581))
+	ROM_LOAD( "ep09.rom", 0x2000, 0x0400, CRC(07f773d1) SHA1(a6cf454318ef0a564a86e669b751e414b12c12d1))
+	ROM_LOAD( "ep10.rom", 0x2400, 0x0400, CRC(7793d84b) SHA1(d16ad3db36c8cec68713082ee60324219d3d5032))
+	ROM_LOAD( "ep11.rom", 0x2800, 0x0400, CRC(d1b98b5e) SHA1(5526af6317667d707ae413916242cd1bac821373))
+	ROM_LOAD( "ep12.rom", 0x2c00, 0x0400, CRC(03c45326) SHA1(f9157ab86cdf1d111bcf19c24e4d7250705be965))
+	ROM_LOAD( "ep13.rom", 0x3000, 0x0400, CRC(51769d6c) SHA1(76d6e91cf32b1eb94b9c0ded02e5057ed7ff7d72))
+	ROM_LOAD( "ep14.rom", 0x3400, 0x0400, CRC(5d48cefb) SHA1(9b8599dabaf7297ec800fa9a122ad7e3b7b30e8b))
+	ROM_LOAD( "ep15.rom", 0x3800, 0x0400, CRC(f44bfe36) SHA1(0ab3c4f061dff6f779685409b07343d0a839fdae))
+	ROM_LOAD( "ep16.rom", 0x3c00, 0x0400, CRC(f39c230d) SHA1(9789cedef5655bcb82561f387cc1a6cf48287d78))
 ROM_END
 
 
 /* Driver */
 
 //    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  CLASS       INIT        COMPANY  FULLNAME  FLAGS
-COMP( 198?, pp01, 0,      0,      pp01,    pp01,  pp01_state, empty_init, "ZVT",   "PP-01",  MACHINE_NOT_WORKING )
+COMP( 198?, pp01, 0,      0,      pp01,    pp01,  pp01_state, empty_init, "ZVT",   "PP-01",  MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/prestige.cpp mame-0.224+dfsg.1/src/mame/drivers/prestige.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/prestige.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/prestige.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -929,8 +929,8 @@
 COMP( 1996, snotecex, 0,       0,      snotec,   glcolor,  prestige_state, empty_init, "Bandai", "Super Note Club EX (Japan)",           MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 COMP( 1996, glmcolor, 0,       0,      glmcolor, glmcolor, prestige_state, empty_init, "VTech",  "Genius Leader Magic Color (Germany)",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 COMP( 1997, gl6000sl, 0,       0,      gl6000sl, prestige, prestige_state, empty_init, "VTech",  "Genius Leader 6000SL (Germany)",       MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 1998, snotecu,  0,       0,      snotec,   glcolor,  prestige_state, empty_init, "Bandai", "Super Note Club \xce\xbc (Japan)",     MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1998, snotecu,  0,       0,      snotec,   glcolor,  prestige_state, empty_init, "Bandai", u8"Super Note Club µ (Japan)",          MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 COMP( 1998, gl7007sl, 0,       0,      gl7007sl, prestige, prestige_state, empty_init, "VTech",  "Genius Leader 7007SL (Germany)",       MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 COMP( 1998, prestige, 0,       0,      prestige, prestige, prestige_state, empty_init, "VTech",  "PreComputer Prestige Elite",           MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
 COMP( 1999, gwnf,     0,       0,      prestige, prestige, prestige_state, empty_init, "VTech",  "Genius Winner Notebook Fun (Germany)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-COMP( 19??, gmmc,     0,       0,      prestige, prestige, prestige_state, empty_init, "VTech",  "Genius Master Mega Color (Germany)",   MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 199?, gmmc,     0,       0,      prestige, prestige, prestige_state, empty_init, "VTech",  "Genius Master Mega Color (Germany)",   MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/primo.cpp mame-0.224+dfsg.1/src/mame/drivers/primo.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/primo.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/primo.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -104,6 +104,10 @@
 Interrupts:
     NMI - 20ms (50HZ), can be disbled/enabled by I/O write
 
+ToDO:
+- primoc64 works, but it seems it should be used with a commodore 64
+  disk drive. This isn't emulated.
+
 *******************************************************************************/
 
 #include "emu.h"
@@ -117,19 +121,19 @@
 #include "formats/primoptp.h"
 
 
-void primo_state::primoa_port(address_map &map)
+void primo_state::primoa_io(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0x00, 0x3f).rw(FUNC(primo_state::primo_be_1_r), FUNC(primo_state::primo_ki_1_w));
-	map(0xfd, 0xfd).w(FUNC(primo_state::primo_FD_w));
+	map(0x00, 0x3f).rw(FUNC(primo_state::be_1_r), FUNC(primo_state::ki_1_w));
+	map(0xfd, 0xfd).w(FUNC(primo_state::FD_w));
 }
 
-void primo_state::primob_port(address_map &map)
+void primo_state::primob_io(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0x00, 0x3f).rw(FUNC(primo_state::primo_be_1_r), FUNC(primo_state::primo_ki_1_w));
-	map(0x40, 0x7f).rw(FUNC(primo_state::primo_be_2_r), FUNC(primo_state::primo_ki_2_w));
-	map(0xfd, 0xfd).w(FUNC(primo_state::primo_FD_w));
+	map(0x00, 0x3f).rw(FUNC(primo_state::be_1_r), FUNC(primo_state::ki_1_w));
+	map(0x40, 0x7f).rw(FUNC(primo_state::be_2_r), FUNC(primo_state::ki_2_w));
+	map(0xfd, 0xfd).w(FUNC(primo_state::FD_w));
 }
 
 void primo_state::primo32_mem(address_map &map)
@@ -251,7 +255,7 @@
 	/* basic machine hardware */
 	Z80(config, m_maincpu, 2500000);
 	m_maincpu->set_addrmap(AS_PROGRAM, &primo_state::primo32_mem);
-	m_maincpu->set_addrmap(AS_IO, &primo_state::primoa_port);
+	m_maincpu->set_addrmap(AS_IO, &primo_state::primoa_io);
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
@@ -259,7 +263,7 @@
 	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	m_screen->set_size(256, 192);
 	m_screen->set_visarea(0, 256-1, 0, 192-1);
-	m_screen->set_screen_update(FUNC(primo_state::screen_update_primo));
+	m_screen->set_screen_update(FUNC(primo_state::screen_update));
 	m_screen->set_palette("palette");
 	m_screen->screen_vblank().set(FUNC(primo_state::vblank_irq));
 
@@ -302,7 +306,7 @@
 void primo_state::primob32(machine_config &config)
 {
 	primoa32(config);
-	m_maincpu->set_addrmap(AS_IO, &primo_state::primob_port);
+	m_maincpu->set_addrmap(AS_IO, &primo_state::primob_io);
 
 	MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob)
 }
@@ -310,7 +314,7 @@
 void primo_state::primob48(machine_config &config)
 {
 	primoa48(config);
-	m_maincpu->set_addrmap(AS_IO, &primo_state::primob_port);
+	m_maincpu->set_addrmap(AS_IO, &primo_state::primob_io);
 
 	MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob)
 }
@@ -318,7 +322,7 @@
 void primo_state::primob64(machine_config &config)
 {
 	primoa64(config);
-	m_maincpu->set_addrmap(AS_IO, &primo_state::primob_port);
+	m_maincpu->set_addrmap(AS_IO, &primo_state::primob_io);
 
 	MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob)
 }
@@ -326,67 +330,66 @@
 void primo_state::primoc64(machine_config &config)
 {
 	primoa64(config);
-	m_maincpu->set_addrmap(AS_IO, &primo_state::primob_port);
+	m_maincpu->set_addrmap(AS_IO, &primo_state::primob_io);
 
 	MCFG_MACHINE_RESET_OVERRIDE(primo_state, primob)
 }
 
 ROM_START( primoa32 )
-	ROM_REGION( 0x14000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "a32_1.rom", 0x10000, 0x1000, CRC(4e91c1a4) SHA1(bf6e41b6b36a2556a50065e9acfd8cd57968f039) )
-	ROM_LOAD( "a32_2.rom", 0x11000, 0x1000, CRC(81a8a0fb) SHA1(df75bd7774969cabb062e50da6004f2efbde489e) )
-	ROM_LOAD( "a32_3.rom", 0x12000, 0x1000, CRC(a97de2f5) SHA1(743c76121f5b9e1eab35c8c00797311f58da5243) )
-	ROM_LOAD( "a32_4.rom", 0x13000, 0x1000, CRC(70f84bc8) SHA1(9ae1c06531edf20c14ba47e78c0747dd2a92612a) )
+	ROM_REGION( 0x4000, "maincpu", 0 )
+	ROM_LOAD( "a32_1.rom", 0x0000, 0x1000, CRC(4e91c1a4) SHA1(bf6e41b6b36a2556a50065e9acfd8cd57968f039) )
+	ROM_LOAD( "a32_2.rom", 0x1000, 0x1000, CRC(81a8a0fb) SHA1(df75bd7774969cabb062e50da6004f2efbde489e) )
+	ROM_LOAD( "a32_3.rom", 0x2000, 0x1000, CRC(a97de2f5) SHA1(743c76121f5b9e1eab35c8c00797311f58da5243) )
+	ROM_LOAD( "a32_4.rom", 0x3000, 0x1000, CRC(70f84bc8) SHA1(9ae1c06531edf20c14ba47e78c0747dd2a92612a) )
 ROM_END
 
 ROM_START( primoa48 )
-	ROM_REGION( 0x14000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "a48_1.rom", 0x10000, 0x1000, CRC(7de6ad6f) SHA1(f2fd6fac4f9bc57c646efe40281758bb7c3f56e1) )
-	ROM_LOAD( "a48_2.rom", 0x11000, 0x1000, CRC(81a8a0fb) SHA1(df75bd7774969cabb062e50da6004f2efbde489e) )
-	ROM_LOAD( "a48_3.rom", 0x12000, 0x1000, CRC(a97de2f5) SHA1(743c76121f5b9e1eab35c8c00797311f58da5243) )
-	ROM_LOAD( "a48_4.rom", 0x13000, 0x1000, CRC(e4d0c452) SHA1(4a98ff7502f1236445250d6b4e1c34850734350e) )
+	ROM_REGION( 0x4000, "maincpu", 0 )
+	ROM_LOAD( "a48_1.rom", 0x0000, 0x1000, CRC(7de6ad6f) SHA1(f2fd6fac4f9bc57c646efe40281758bb7c3f56e1) )
+	ROM_LOAD( "a48_2.rom", 0x1000, 0x1000, CRC(81a8a0fb) SHA1(df75bd7774969cabb062e50da6004f2efbde489e) )
+	ROM_LOAD( "a48_3.rom", 0x2000, 0x1000, CRC(a97de2f5) SHA1(743c76121f5b9e1eab35c8c00797311f58da5243) )
+	ROM_LOAD( "a48_4.rom", 0x3000, 0x1000, CRC(e4d0c452) SHA1(4a98ff7502f1236445250d6b4e1c34850734350e) )
 ROM_END
 
 ROM_START( primoa64 )
-	ROM_REGION( 0x14000, "maincpu", ROMREGION_ERASEFF )
-	ROM_SYSTEM_BIOS(0, "ver1", "ver 1")
-	ROM_LOAD( "a64_1.rom", 0x10000, 0x1000, CRC(6a7a9b9b) SHA1(e9ce16f90d9a799a26a9cef09d9ee6a6d7749484) )
-	ROM_LOAD( "a64_2.rom", 0x11000, 0x1000, CRC(81a8a0fb) SHA1(df75bd7774969cabb062e50da6004f2efbde489e) )
-	ROM_LOAD( "a64_3.rom", 0x12000, 0x1000, CRC(a97de2f5) SHA1(743c76121f5b9e1eab35c8c00797311f58da5243) )
-	ROM_LOAD( "a64_4.rom", 0x13000, 0x1000, CRC(e4d0c452) SHA1(4a98ff7502f1236445250d6b4e1c34850734350e) )
+	ROM_REGION( 0x4000, "maincpu", 0 )
+	ROM_LOAD( "a64_1.rom", 0x0000, 0x1000, CRC(6a7a9b9b) SHA1(e9ce16f90d9a799a26a9cef09d9ee6a6d7749484) )
+	ROM_LOAD( "a64_2.rom", 0x1000, 0x1000, CRC(81a8a0fb) SHA1(df75bd7774969cabb062e50da6004f2efbde489e) )
+	ROM_LOAD( "a64_3.rom", 0x2000, 0x1000, CRC(a97de2f5) SHA1(743c76121f5b9e1eab35c8c00797311f58da5243) )
+	ROM_LOAD( "a64_4.rom", 0x3000, 0x1000, CRC(e4d0c452) SHA1(4a98ff7502f1236445250d6b4e1c34850734350e) )
 ROM_END
 
 ROM_START( primob32 )
-	ROM_REGION( 0x14000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "b32.rom",   0x10000, 0x4000, CRC(f594d2bb) SHA1(b74961dba008a1a6f15a22ddbd1b89acd7e286c2) )
+	ROM_REGION( 0x4000, "maincpu", 0 )
+	ROM_LOAD( "b32.rom",   0x0000, 0x4000, CRC(f594d2bb) SHA1(b74961dba008a1a6f15a22ddbd1b89acd7e286c2) )
 ROM_END
 
 ROM_START( primob48 )
-	ROM_REGION( 0x14000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "b48.rom",   0x10000, 0x4000, CRC(df3d2a57) SHA1(ab9413aa9d7749d30a486da00bc8c6d178a2172c) )
+	ROM_REGION( 0x4000, "maincpu", 0 )
+	ROM_LOAD( "b48.rom",   0x0000, 0x4000, CRC(df3d2a57) SHA1(ab9413aa9d7749d30a486da00bc8c6d178a2172c) )
 ROM_END
 
 ROM_START( primob64 )
-	ROM_REGION( 0x14000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x4000, "maincpu", 0 )
 	ROM_SYSTEM_BIOS(0, "standard", "Standard")
-	ROMX_LOAD( "b64.rom",     0x10000, 0x4000, CRC(cea28188) SHA1(a77e42e97402e601b78ab3751eac1e85d0bbb4a0), ROM_BIOS(0) )
+	ROMX_LOAD( "b64.rom",     0x0000, 0x4000, CRC(cea28188) SHA1(a77e42e97402e601b78ab3751eac1e85d0bbb4a0), ROM_BIOS(0) )
 	ROM_SYSTEM_BIOS(1, "cdos", "CDOS")
-	ROMX_LOAD( "b64cdos.rom", 0x10000, 0x4000, CRC(73305e4d) SHA1(c090c3430cdf19eed8363377b981e1c21a4ed169), ROM_BIOS(1) )
+	ROMX_LOAD( "b64cdos.rom", 0x0000, 0x4000, CRC(73305e4d) SHA1(c090c3430cdf19eed8363377b981e1c21a4ed169), ROM_BIOS(1) )
 ROM_END
 
 ROM_START( primoc64 )
-	ROM_REGION( 0x14000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "c64_1.rom", 0x10000, 0x1000, CRC(c22290ea) SHA1(af5c73f6d0f7a987c4f082a5cb69e3f016127d57) )
-	ROM_LOAD( "c64_2.rom", 0x11000, 0x1000, CRC(0756b56e) SHA1(589dbdb7c43ca7ca29ed1e56e080adf8c069e407) )
-	ROM_LOAD( "c64_3.rom", 0x12000, 0x1000, CRC(fc56e0af) SHA1(b547fd270d3413400bc800f5b7ea9153b7a59bff) )
-	ROM_LOAD( "c64_4.rom", 0x13000, 0x1000, CRC(3770e3e6) SHA1(792cc71d8f89eb447f94aded5afc70d626a26030) )
+	ROM_REGION( 0x4000, "maincpu", 0 )
+	ROM_LOAD( "c64_1.rom", 0x0000, 0x1000, CRC(c22290ea) SHA1(af5c73f6d0f7a987c4f082a5cb69e3f016127d57) )
+	ROM_LOAD( "c64_2.rom", 0x1000, 0x1000, CRC(0756b56e) SHA1(589dbdb7c43ca7ca29ed1e56e080adf8c069e407) )
+	ROM_LOAD( "c64_3.rom", 0x2000, 0x1000, CRC(fc56e0af) SHA1(b547fd270d3413400bc800f5b7ea9153b7a59bff) )
+	ROM_LOAD( "c64_4.rom", 0x3000, 0x1000, CRC(3770e3e6) SHA1(792cc71d8f89eb447f94aded5afc70d626a26030) )
 ROM_END
 
 //    YEAR  NAME      PARENT    COMPAT  MACHINE   INPUT  CLASS        INIT        COMPANY     FULLNAME      FLAGS
-COMP( 1984, primoa32, 0,        0,      primoa32, primo, primo_state, init_primo, "Microkey", "Primo A-32", 0 )
-COMP( 1984, primoa48, primoa32, 0,      primoa48, primo, primo_state, init_primo, "Microkey", "Primo A-48", 0 )
-COMP( 1984, primoa64, primoa32, 0,      primoa64, primo, primo_state, init_primo, "Microkey", "Primo A-64", 0 )
-COMP( 1984, primob32, primoa32, 0,      primob32, primo, primo_state, init_primo, "Microkey", "Primo B-32", 0 )
-COMP( 1984, primob48, primoa32, 0,      primob48, primo, primo_state, init_primo, "Microkey", "Primo B-48", 0 )
-COMP( 1984, primob64, primoa32, 0,      primob64, primo, primo_state, init_primo, "Microkey", "Primo B-64", 0 )
-COMP( 1984, primoc64, primoa32, 0,      primoc64, primo, primo_state, init_primo, "Microkey", "Primo C-64", MACHINE_NOT_WORKING )
+COMP( 1984, primoa32, 0,        0,      primoa32, primo, primo_state, init_primo, "Microkey", "Primo A-32", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, primoa48, primoa32, 0,      primoa48, primo, primo_state, init_primo, "Microkey", "Primo A-48", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, primoa64, primoa32, 0,      primoa64, primo, primo_state, init_primo, "Microkey", "Primo A-64", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, primob32, primoa32, 0,      primob32, primo, primo_state, init_primo, "Microkey", "Primo B-32", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, primob48, primoa32, 0,      primob48, primo, primo_state, init_primo, "Microkey", "Primo B-48", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, primob64, primoa32, 0,      primob64, primo, primo_state, init_primo, "Microkey", "Primo B-64", MACHINE_SUPPORTS_SAVE )
+COMP( 1984, primoc64, primoa32, 0,      primoc64, primo, primo_state, init_primo, "Microkey", "Primo C-64", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/progolf.cpp mame-0.224+dfsg.1/src/mame/drivers/progolf.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/progolf.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/progolf.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -13,43 +13,133 @@
 
 =========================================================================================
 
-Pro Golf
+18 Holes Pro Golf (PCB version)
 Data East 1981
-PCB version (not cassette)
---------------
+Hardware info by Guru
 
-All eproms 2732
 
-g0-m through g6-m on top pcb.
-g7-m through g9-m on bottom pcb.
-
-Three Proms are 82S123 or equivalents.
-
-gam.k11
-gbm.k4
-gcm.a14
-
-Top pcb contains:
------------------
-One 6502 CPU
-
-Two AY-3-8910
-
-One 6116 ram.
-
-Two 8 dip banks
-------------------
-
-Bottom pcb contains:
---------------------
-Epoxy CPU module.
-
-MC6845P CRT controller.
-
-Two 6116 rams.
-
-Twenty four 8116 rams.
+Top Board (Sound/Inputs)
+------------------------
 
+GGM-Ø2  DE-0087C-0   MADE IN JAPAN
+DE-0087B-0 (top side)
+DE-0087A-0 (bottom side)
+  |---------------------------------------|
+  |             G6-M.1B                   |
+ |-|                            6502      |
+ | |  G4-M.2A   MK4118                    |
+ | |                            AY3-8910  |
+ | |  G3-M.4A                             |
+ | |                            AY3-8910  |
+ | |  G2-M.6A                             |
+ |-|            DSW1                      |
+  |   G1-M.8A                             |
+  |                                       |
+  |   G0-M.9A   DSW2                      |
+|-|                                       |
+|1 A18                                    |
+|8                                        |
+|W                                        |
+|A                       555      555     |
+|Y                                        |
+|-|A1      TA75558                        |
+  |  C1181H  VOL                          |
+  |---------------------------------------|
+Notes:
+      6502 Clock - 441.458333kHz [10.595/24]
+  AY3-8910 Clock - 1.324375MHz [10.595/8] (both)
+          MK4118 - MOSTEK MK4118 1kx8 SRAM (also seen 6116 and M58725 on other
+                   PCBs which are both 2kx8 SRAM)
+          DSW1/2 - 8-position DIP Switch
+         TA75558 - Toshiba TA75558 Dual Operational Amplifier
+          C1181H - NEC uPC1181H Power AMP
+             555 - 555 Timer
+             VOL - 1k Volume Pot
+              G* - 2732 4kx8-bit EPROM
+
+        TOP BOARD PINOUT
+    -------------------------
+    Parts Side    Solder Side
+    ------+---------+--------
+      GND | A1   B1 | GND
+      GND | A2   B2 | GND
+      GND | A3   B3 | GND
+     SPKR+| A4   B4 | SPKR-
+     -----+---------+----- (KEY)
+ RIGHT P1 | A5   B5 | RIGHT P2
+  LEFT P1 | A6   B6 | LEFT P2
+    UP P1 | A7   B7 | UP P2
+  DOWN P1 | A8   B8 | DOWN P2
+BUTTON P1 | A9   B9 | BUTTON P2
+       NC | A10  B10| NC
+ START P1 | A11  B11| START P2
+       NC | A12  B12| NC
+    COIN 1| A13  B13| COIN 2
+       NC | A14  B14| NC
+       NC | A15  B15| NC
+      GND | A16  B16| GND
+      +5V | A17  B17| +5V
+      +12V| A18  B18| +12V
+   -------+---------+-------
+
+
+Bottom Board (CPU/Video)
+------------------------
+
+GGM-Ø1  DE-0086   MADE IN JAPAN
+DE-0086B-0 (top side)
+DE-0086A-0 (bottom side)
+  |-------------------------------------------------------------------|
+  |                                                                   |
+ |-| |----------|                                                     |
+ | | | DECO     |                                                     |
+ | | | CPU-6    | 6845P                                               |
+ | | | CUSTOM   |                                                     |
+ | | | MODULE   |                           M58725              GBM.4K|
+ | | |----------|                                                     |
+ |-|     G7-M.7A                            M58725                    |
+  |                                                                   |
+  |      G8-M.9A                                                      |
+  |                                                                   |
+|-|      G9-M.10A  555                                                |
+|1 A10                                                         GAM.11K|
+|0                       8116   8116   8116   8116                    |
+|W                       8116   8116   8116   8116                    |
+|A                       8116   8116   8116   8116                    |
+|Y       GCM.14A         8116   8116   8116   8116                    |
+|-|A1                    8116   8116   8116   8116                    |
+  |                      8116   8116   8116   8116          10.595MHz |
+  |-------------------------------------------------------------------|
+Notes:
+    MC6845P - Motorola MC6845P CRT Controller (CRTC). Clock 662.1875kHz [10.595/16]
+      CPU-6 - The input base clock on several pins is 1.324375MHz [10.595/8].
+              There are no other different clocks going into the CPU module.
+              Note the logic inside the CPU-6 module may be dividing the clock so the
+              actual CPU clock is unknown but a 6502 running at 1.32437MHz is highly likely.
+       8116 - Fujitsu MB8116E 16kx1 DRAM (24 chips = 48kB)
+     M58725 - Mitsubishi M58725 2kx8 SRAM (compatible with 6116)
+      Gx-M* - 2732 4kx8-bit EPROM
+GCM/GBM/GAM - Harris M3 7603-5 Bipolar PROM (compatible with 82S123)
+        555 - 555 Timer
+      HSync - 15.45kHz
+      VSync - 57Hz
+
+    BOTTOM BOARD PINOUT
+ -------------------------
+ Parts Side    Solder Side
+ ------+---------+--------
+   +5V | A1   B1 | +5V
+   +5V | A2   B2 | +5V
+   +5V | A3   B3 | +5V
+   +12V| A4   B4 | +12V
+   -5V | A5   B5 | -5V
+   RED | A6   B6 | GREEN
+   BLUE| A7   B7 | SYNC
+   GND | A8   B8 | GND
+  -----+---------+----- (KEY)
+   GND | A9   B9 | GND
+   GND | A10  B10| GND
+-------+---------+-------
 ****************************************************************************************/
 
 #include "emu.h"
@@ -82,6 +172,9 @@
 
 	DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
 
+protected:
+	virtual void video_start() override;
+
 private:
 	required_device<cpu_device> m_maincpu;
 	required_device<cpu_device> m_audiocpu;
@@ -106,8 +199,6 @@
 	uint8_t videoram_r(offs_t offset);
 	void videoram_w(offs_t offset, uint8_t data);
 
-	virtual void machine_start() override;
-	virtual void video_start() override;
 	void progolf_palette(palette_device &palette) const;
 
 	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
@@ -115,11 +206,6 @@
 	void sound_cpu(address_map &map);
 };
 
-
-void progolf_state::machine_start()
-{
-}
-
 void progolf_state::video_start()
 {
 	m_scrollx_hi = 0;
@@ -160,7 +246,7 @@
 		}
 	}
 
-	/* framebuffer is 8x8 chars arranged like a bitmap + a register that controls the pen handling. */
+	// framebuffer is 8x8 chars arranged like a bitmap + a register that controls the pen handling.
 	{
 		count = 0;
 
@@ -273,7 +359,7 @@
 	map(0x9000, 0x9000).portr("IN2").w(FUNC(progolf_state::char_vregs_w));
 	map(0x9200, 0x9200).portr("P1").w(FUNC(progolf_state::scrollx_hi_w)); //p1 inputs
 	map(0x9400, 0x9400).portr("P2").w(FUNC(progolf_state::scrollx_lo_w)); //p2 inputs
-	map(0x9600, 0x9600).portr("IN0").w(FUNC(progolf_state::flip_screen_w));   /* VBLANK */
+	map(0x9600, 0x9600).portr("IN0").w(FUNC(progolf_state::flip_screen_w)); // VBLANK
 	map(0x9800, 0x9800).portr("DSW1");
 	map(0x9800, 0x9800).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x9801, 0x9801).w("crtc", FUNC(mc6845_device::register_w));
@@ -299,7 +385,7 @@
 	m_maincpu->set_input_line(INPUT_LINE_NMI, newval ? CLEAR_LINE : ASSERT_LINE);
 }
 
-/* verified from M6502 code */
+// verified from M6502 code
 static INPUT_PORTS_START( progolf )
 	PORT_START("IN0")
 	PORT_BIT( 0x7f, IP_ACTIVE_HIGH, IPT_UNUSED )
@@ -327,66 +413,56 @@
 
 	PORT_START("IN2")
 	PORT_BIT( 0x3f, IP_ACTIVE_HIGH, IPT_UNUSED )
-	PORT_BIT( 0x40, IP_ACTIVE_LOW,IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, progolf_state,coin_inserted, 0)
-	PORT_BIT( 0x80, IP_ACTIVE_LOW,IPT_COIN2 ) PORT_CHANGED_MEMBER(DEVICE_SELF, progolf_state,coin_inserted, 0)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, progolf_state, coin_inserted, 0)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED_MEMBER(DEVICE_SELF, progolf_state, coin_inserted, 0)
 
 	PORT_START("DSW1")
-	PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_B ) )
+	PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("DSW1:1,2")
 	PORT_DIPSETTING(    0x03, DEF_STR( 2C_1C ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( 1C_1C ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( 1C_2C ) )
 	PORT_DIPSETTING(    0x02, DEF_STR( 1C_3C ) )  PORT_CONDITION("DSW2",0x40,EQUALS,0x00)
 	PORT_DIPSETTING(    0x02, DEF_STR( 1C_6C ) )  PORT_CONDITION("DSW2",0x40,EQUALS,0x40)
-	PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Coin_A ) )
+	PORT_DIPNAME( 0x0c, 0x00, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("DSW1:3,4")
 	PORT_DIPSETTING(    0x0c, DEF_STR( 2C_1C ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( 1C_1C ) )
 	PORT_DIPSETTING(    0x04, DEF_STR( 1C_2C ) )
 	PORT_DIPSETTING(    0x08, DEF_STR( 1C_3C ) )  PORT_CONDITION("DSW2",0x40,EQUALS,0x00)
 	PORT_DIPSETTING(    0x08, DEF_STR( 1C_6C ) )  PORT_CONDITION("DSW2",0x40,EQUALS,0x40)
-	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Cabinet ) )
+	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Cabinet ) ) PORT_DIPLOCATION("DSW1:5")
 	PORT_DIPSETTING(    0x10, DEF_STR( Upright ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Cocktail ) )
-	PORT_DIPUNUSED( 0x20, IP_ACTIVE_HIGH )
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, progolf_state,coin_inserted, 0)    /* same coinage as COIN1 */
-	PORT_SERVICE( 0x80, IP_ACTIVE_HIGH )
+	PORT_DIPUNUSED( 0x20, IP_ACTIVE_HIGH ) PORT_DIPLOCATION("DSW1:6")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_SERVICE1 )  PORT_DIPLOCATION("DSW1:7") PORT_CHANGED_MEMBER(DEVICE_SELF, progolf_state, coin_inserted, 0) // same coinage as COIN1
+	PORT_SERVICE( 0x80, IP_ACTIVE_HIGH ) PORT_DIPLOCATION("DSW1:8")
 
 	PORT_START("DSW2")
-	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) )
+	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Lives ) ) PORT_DIPLOCATION("DSW2:1")
 	PORT_DIPSETTING(    0x00, "1" )
 	PORT_DIPSETTING(    0x01, "2" )
-	PORT_DIPNAME( 0x06, 0x00, DEF_STR( Bonus_Life ) )       /* table at 0xd16e (4 * 3 bytes, LSB first) - no multiple bonus lives */
+	PORT_DIPNAME( 0x06, 0x00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("DSW2:2,3") // table at 0xd16e (4 * 3 bytes, LSB first) - no multiple bonus lives
 	PORT_DIPSETTING(    0x00, "10000" )
 	PORT_DIPSETTING(    0x02, "30000" )
 	PORT_DIPSETTING(    0x04, "50000" )
 	PORT_DIPSETTING(    0x06, DEF_STR( None ) )
-	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Difficulty ) )       /* code at 0xd188 */
+	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("DSW2:4") // code at 0xd188
 	PORT_DIPSETTING(    0x00, DEF_STR( Easy ) )
 	PORT_DIPSETTING(    0x08, DEF_STR( Hard ) )
-	PORT_DIPNAME( 0x10, 0x00, "Display Strength and Position" )
+	PORT_DIPNAME( 0x10, 0x00, "Display Strength and Position" ) PORT_DIPLOCATION("DSW2:5")
 	PORT_DIPSETTING(    0x10, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
-	PORT_DIPNAME( 0x20, 0x00, "Force Coinage = A 1C/3C - B 1C/8C" )   /* SERVICE1 = 2C/1C */
+	PORT_DIPNAME( 0x20, 0x00, "Force Coinage = A 1C/3C - B 1C/8C" ) PORT_DIPLOCATION("DSW2:6") // SERVICE1 = 2C/1C
 	PORT_DIPSETTING(    0x00, DEF_STR( No ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( Yes ) )
-	PORT_DIPNAME( 0x40, 0x00, "Coin Mode" )
+	PORT_DIPNAME( 0x40, 0x00, "Coin Mode" ) PORT_DIPLOCATION("DSW2:7")
 	PORT_DIPSETTING(    0x00, "Mode 1" )
 	PORT_DIPSETTING(    0x40, "Mode 2" )
-	PORT_DIPUNUSED( 0x80, IP_ACTIVE_HIGH )
+	PORT_DIPUNUSED( 0x80, IP_ACTIVE_HIGH ) PORT_DIPLOCATION("DSW2:8")
 INPUT_PORTS_END
 
-static const gfx_layout charlayout =
-{
-	8,8,            /* 8*8 characters */
-	RGN_FRAC(1,3),  /* 512 characters */
-	3,              /* 3 bits per pixel */
-	{ RGN_FRAC(2,3), RGN_FRAC(1,3), RGN_FRAC(0,3) },  /* the bitplanes are separated */
-	{ 0, 1, 2, 3, 4, 5, 6, 7 },
-	{ 0*8, 1*8, 2*8, 3*8, 4*8, 5*8, 6*8, 7*8 },
-	8*8     /* every char takes 8 consecutive bytes */
-};
 
 static GFXDECODE_START( gfx_progolf )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, charlayout, 0, 8 ) /* sprites */
+	GFXDECODE_ENTRY( "gfx1", 0x0000, gfx_8x8x3_planar, 0, 8 ) // sprites
 GFXDECODE_END
 
 
@@ -420,11 +496,11 @@
 
 void progolf_state::progolf(machine_config &config)
 {
-	/* basic machine hardware */
-	DECO_222(config, m_maincpu, 3000000/2); /* guess, 3 Mhz makes the game to behave worse? */
+	// basic machine hardware
+	DECO_222(config, m_maincpu, 10.595_MHz_XTAL / 8);
 	m_maincpu->set_addrmap(AS_PROGRAM, &progolf_state::main_cpu);
 
-	M6502(config, m_audiocpu, 500000);
+	M6502(config, m_audiocpu, 10.595_MHz_XTAL / 24);
 	m_audiocpu->set_addrmap(AS_PROGRAM, &progolf_state::sound_cpu);
 
 	config.set_perfect_quantum(m_maincpu);
@@ -433,7 +509,7 @@
 	soundlatch.data_pending_callback().set_inputline(m_audiocpu, 0);
 	soundlatch.set_separate_acknowledge(true);
 
-	/* video hardware */
+	// video hardware
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(57);
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(3072));
@@ -444,24 +520,24 @@
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_progolf);
 	PALETTE(config, m_palette, FUNC(progolf_state::progolf_palette), 32 * 3);
 
-	mc6845_device &crtc(MC6845(config, "crtc", 3000000/4)); /* hand tuned to get ~57 fps */
+	mc6845_device &crtc(MC6845(config, "crtc", 10.595_MHz_XTAL / 16));
 	crtc.set_screen("screen");
 	crtc.set_show_border_area(false);
 	crtc.set_char_width(8);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 
-	AY8910(config, "ay1", 12000000/8).add_route(ALL_OUTPUTS, "mono", 0.23);
+	AY8910(config, "ay1", 10.595_MHz_XTAL / 8).add_route(ALL_OUTPUTS, "mono", 0.23);
 
-	AY8910(config, "ay2", 12000000/8).add_route(ALL_OUTPUTS, "mono", 0.23);
+	AY8910(config, "ay2", 10.595_MHz_XTAL / 8).add_route(ALL_OUTPUTS, "mono", 0.23);
 }
 
 void progolf_state::progolfa(machine_config &config)
 {
 	progolf(config);
-	/* different encrypted cpu to progolf */
-	DECO_CPU6(config.replace(), m_maincpu, 3000000/2); /* guess, 3 Mhz makes the game to behave worse? */
+	// different encrypted cpu to progolf
+	DECO_CPU6(config.replace(), m_maincpu, 10.595_MHz_XTAL / 8);
 	m_maincpu->set_addrmap(AS_PROGRAM, &progolf_state::main_cpu);
 }
 
@@ -488,6 +564,8 @@
 	ROM_LOAD( "gam.k11",      0x0040, 0x0020, CRC(b9665de3) SHA1(4c5aba5f6589f4bce4692c0d5bb2811ab8e14aed) )
 ROM_END
 
+// top board: GGM-Ø2  DE-0087C-0
+// bottom board: GGM-Ø1  DE-0086B-0
 ROM_START( progolfa )
 	ROM_REGION( 0x10000, "maincpu", 0 ) // custom DECO CPU-6 module
 	ROM_LOAD( "g4-m.a3",      0xb000, 0x1000, CRC(015a08d9) SHA1(671d5cd708e098dbda3e495a8b4ce3393c6971da) )
@@ -495,9 +573,11 @@
 	ROM_LOAD( "g2-m.a6",      0xd000, 0x1000, CRC(fafec36e) SHA1(70880d6f9b11505d466f36c12a43361ee2639fed) )
 	ROM_LOAD( "g1-m.a8",      0xe000, 0x1000, CRC(749032eb) SHA1(daa356b2c70bcd8cdd0c4df4268b6158bc8aae8e) )
 	ROM_LOAD( "g0-m.a9",      0xf000, 0x1000, CRC(a03c533f) SHA1(2e0006be40e32b64b1490bd339d9fc9302eee7c4) )
+	// the following single byte patch gets the ball position to be correct like in the parent. g3-m.a4 dump has been verified on multiple PCBs
+	// ROM_FILL( 0xc14b, 0x01, 0xf0) // from: EB 07    sbc #$07 to: F0 07    beq $c154
 
 	ROM_REGION( 0x10000, "audiocpu", 0 )
-	ROM_LOAD( "g5-m.b1",      0xf000, 0x1000, CRC(0c6fadf5) SHA1(9af2c2152b339cadab7aff0b0164d4431d2558bd) )
+	ROM_LOAD( "g6-m.b1",      0xf000, 0x1000, CRC(0c6fadf5) SHA1(9af2c2152b339cadab7aff0b0164d4431d2558bd) )
 
 	ROM_REGION( 0x3000, "gfx1", 0 )
 	ROM_LOAD( "g7-m.a8",      0x0000, 0x1000, CRC(16b42975) SHA1(29268a8a660781ff0de77b3b1bfc16edff7be134) )
@@ -511,10 +591,7 @@
 ROM_END
 
 
-
-
-
 // this uses DECO222 style encryption
 GAME( 1981, progolf,  0,       progolf,  progolf, progolf_state, empty_init, ROT270, "Data East Corporation", "18 Holes Pro Golf (set 1)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-// this uses DECO CPU-6 as custom module CPU (the same as Zoar, are we sure? our Zoar has different encryption, CPU-7 style)
+// this uses DECO CPU-6 as custom module CPU
 GAME( 1981, progolfa, progolf, progolfa, progolf, progolf_state, empty_init, ROT270, "Data East Corporation", "18 Holes Pro Golf (set 2)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ps2sony.cpp mame-0.224+dfsg.1/src/mame/drivers/ps2sony.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ps2sony.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ps2sony.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -691,7 +691,7 @@
 	map(0x10005000, 0x1000500f).mirror(0xff0).rw(m_vu1, FUNC(sonyvu1_device::vif_r), FUNC(sonyvu1_device::vif_w));
 	map(0x10006000, 0x1000600f).mirror(0xff0).rw(FUNC(ps2sony_state::gif_fifo_r), FUNC(ps2sony_state::gif_fifo_w));
 	map(0x10007000, 0x1000701f).mirror(0xfe0).rw(FUNC(ps2sony_state::ipu_fifo_r), FUNC(ps2sony_state::ipu_fifo_w));
-	map(0x10008000, 0x1000dfff).rw(m_dmac, FUNC(ps2_dmac_device::channel_r), FUNC(ps2_dmac_device::channel_w)).umask64(0x00000000ffffffff);;
+	map(0x10008000, 0x1000dfff).rw(m_dmac, FUNC(ps2_dmac_device::channel_r), FUNC(ps2_dmac_device::channel_w)).umask64(0x00000000ffffffff);
 	map(0x1000e000, 0x1000efff).rw(m_dmac, FUNC(ps2_dmac_device::read), FUNC(ps2_dmac_device::write)).umask64(0x00000000ffffffff);
 	map(0x1000f000, 0x1000f017).rw(m_intc, FUNC(ps2_intc_device::read), FUNC(ps2_intc_device::write)).umask64(0x00000000ffffffff);
 	map(0x1000f130, 0x1000f137).nopr();
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/pulsar.cpp mame-0.224+dfsg.1/src/mame/drivers/pulsar.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/pulsar.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/pulsar.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -58,6 +58,7 @@
 		, m_maincpu(*this, "maincpu")
 		, m_rom(*this, "maincpu")
 		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
 		, m_fdc (*this, "fdc")
 		, m_floppy0(*this, "fdc:0")
 		, m_floppy1(*this, "fdc:1")
@@ -78,12 +79,12 @@
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
 
-	bool m_rom_in_map;
 	floppy_image_device *m_floppy;
 	memory_passthrough_handler *m_rom_shadow_tap;
 	required_device<z80_device> m_maincpu;
 	required_region_ptr<u8> m_rom;
 	required_shared_ptr<u8> m_ram;
+	required_memory_bank    m_bank1;
 	required_device<fd1797_device> m_fdc;
 	required_device<floppy_connector> m_floppy0;
 	required_device<floppy_connector> m_floppy1;
@@ -93,7 +94,7 @@
 void pulsar_state::mem_map(address_map &map)
 {
 	map(0x0000, 0xffff).ram().share("mainram");
-	map(0xf800, 0xffff).lr8(NAME([this] (offs_t offset) { if(m_rom_in_map) return m_rom[offset]; else return m_ram[offset+0xf800]; }));
+	map(0xf800, 0xffff).bankr("bank1");
 }
 
 void pulsar_state::io_map(address_map &map)
@@ -141,7 +142,7 @@
 	m_rtc->read_w(BIT(data, 4));
 	m_rtc->write_w(BIT(data, 5));
 	m_rtc->hold_w(BIT(data, 6));
-	m_rom_in_map = BIT(data, 7);
+	m_bank1->set_entry(BIT(data, 7));
 }
 
 // d0..d3 Data lines to rtc
@@ -186,7 +187,7 @@
 void pulsar_state::machine_reset()
 {
 
-	m_rom_in_map = true;
+	m_bank1->set_entry(1);
 	m_rtc->cs_w(1); // always enabled
 
 	address_space &program = m_maincpu->space(AS_PROGRAM);
@@ -210,7 +211,8 @@
 void pulsar_state::machine_start()
 {
 	// register for savestates
-	save_item(NAME(m_rom_in_map));
+	m_bank1->configure_entry(0, m_ram+0xf800);
+	m_bank1->configure_entry(1, m_rom);
 }
 
 void pulsar_state::pulsar(machine_config &config)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/qix.cpp mame-0.224+dfsg.1/src/mame/drivers/qix.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/qix.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/qix.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -681,7 +681,12 @@
 	video(config);
 }
 
-
+void zookeep_state::zookeepbl(machine_config &config)
+{
+	qix(config);
+	m_maincpu->set_addrmap(AS_PROGRAM, &zookeep_state::main_map);
+	video(config);
+}
 
 /***************************************************************************
 
@@ -1106,6 +1111,28 @@
 	ROM_LOAD( "za_coin.bin", 0x0000, 0x0800, CRC(364d3557) SHA1(049d0759750c576187053306e07984b1e5877df7) )
 ROM_END
 
+// the top PCB is definitely an Italian made one (same place Sidam PCBs were made). The bottom PCB (MTD-19) looks like one of those Taito PCBs made for licensees.
+// there's an unpopulated IC location for an M68705
+// only ROMS 16-17, 18-19 and 26-27 had still stickers on, so the others are educated guesses
+ROM_START( zookeepbl )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "zk-12-13.bin",    0x8000, 0x2000, CRC(b85e5200) SHA1(3f47626fe35f2e9fa893595e06ea4275a9beb10b) )
+	ROM_LOAD( "zk-14-15.bin",    0xa000, 0x2000, CRC(b621a415) SHA1(7b6e595f1c797d6619e7ea128aeb67f432d64a83) )
+	ROM_LOAD( "zk-16-17.bin",    0xc000, 0x2000, CRC(9e192104) SHA1(318c902debfcb49a02a3a776bf2a860685603b3c) )
+	ROM_LOAD( "zk-18-19.bin",    0xe000, 0x2000, CRC(2854b69d) SHA1(3d258d57909228d13b1b557e8178b722ec297d6d) )
+
+	ROM_REGION( 0x12000, "videocpu", 0 )
+	ROM_LOAD( "zk-5-6.bin",  0x0a000, 0x2000, CRC(467b42dc) SHA1(e92a98b56959f5ccf2a4dc4ebafa13f9074e551b) )
+	ROM_LOAD( "zk-7-8.bin",  0x0c000, 0x2000, CRC(2a5571ed) SHA1(ac6947c8fb22c0c549c747cc88b1a4da7063fcf6) )
+	ROM_LOAD( "zk-9-10.bin", 0x0e000, 0x2000, CRC(7430e09c) SHA1(05a2cd5a9dd06c235881e7d9b734be1d3e41de5d) ) // only ROM with differences compared to the parent
+	ROM_LOAD( "zk-3-4.bin",  0x10000, 0x2000, CRC(ab5a72f0) SHA1(4595a785d212464d599cfacd75ea4fc368231550) )
+
+	ROM_REGION( 0x10000, "audiocpu", 0 )
+	ROM_LOAD( "zk-25.bin",    0xd000, 0x1000, CRC(32e6d667) SHA1(4d693ac4a73746f17515b805382f5aeaf606da39) ) // 0xxxxxxxxxxxx = 0xFF
+	ROM_CONTINUE(             0xd000, 0x1000 )
+	ROM_LOAD( "zk-26-27.bin", 0xe000, 0x2000, CRC(2138554c) SHA1(6fbf46e0dd3d8a0dd526064baee3d84212713b9a) )
+ROM_END
+
 
 ROM_START( slither )
 	ROM_REGION( 0x10000, "maincpu", 0 )
@@ -1433,21 +1460,22 @@
  *
  *************************************/
 
-GAME( 1981, qix,       0,        qix,     qix,      qix_state,     empty_init,   ROT270, "Taito America Corporation", "Qix (Rev 2)", MACHINE_SUPPORTS_SAVE ) // newest set?  closest to 'qix2'
-GAME( 1981, qixa,      qix,      qix,     qix,      qix_state,     empty_init,   ROT270, "Taito America Corporation", "Qix (set 2, smaller roms)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, qixb,      qix,      qix,     qix,      qix_state,     empty_init,   ROT270, "Taito America Corporation", "Qix (set 2, larger roms)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, qixo,      qix,      qix,     qix,      qix_state,     empty_init,   ROT270, "Taito America Corporation", "Qix (set 3, earlier)", MACHINE_SUPPORTS_SAVE ) // oldest set / prototype? has incorrect spelling 'deutch' and doesn't allow language selection to be changed
-GAME( 1981, qix2,      qix,      qix,     qix,      qix_state,     empty_init,   ROT270, "Taito America Corporation", "Qix II (Tournament)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, sdungeon,  0,        mcu,     sdungeon, qixmcu_state,  empty_init,   ROT270, "Taito America Corporation", "Space Dungeon", MACHINE_SUPPORTS_SAVE ) // actually released July 1982
-GAME( 1981, sdungeona, sdungeon, mcu,     sdungeon, qixmcu_state,  empty_init,   ROT270, "Taito America Corporation", "Space Dungeon (larger roms)", MACHINE_SUPPORTS_SAVE ) // same as above but uses larger ROMs
-GAMEL(1982, elecyoyo,  0,        mcu,     elecyoyo, qixmcu_state,  empty_init,   ROT270, "Taito America Corporation", "The Electric Yo-Yo (set 1)", MACHINE_SUPPORTS_SAVE, layout_elecyoyo )
-GAMEL(1982, elecyoyo2, elecyoyo, mcu,     elecyoyo, qixmcu_state,  empty_init,   ROT270, "Taito America Corporation", "The Electric Yo-Yo (set 2)", MACHINE_SUPPORTS_SAVE, layout_elecyoyo )
-GAME( 1982, kram,      0,        mcu,     kram,     qixmcu_state,  empty_init,   ROT0,   "Taito America Corporation", "Kram (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, kram2,     kram,     mcu,     kram,     qixmcu_state,  empty_init,   ROT0,   "Taito America Corporation", "Kram (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, kram3,     kram,     kram3,   kram,     qix_state,     init_kram3,   ROT0,   "Taito America Corporation", "Kram (encrypted)", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 1982, zookeep,   0,        zookeep, zookeep,  zookeep_state, empty_init,   ROT0,   "Taito America Corporation", "Zoo Keeper (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, zookeep2,  zookeep,  zookeep, zookeep,  zookeep_state, empty_init,   ROT0,   "Taito America Corporation", "Zoo Keeper (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, zookeep3,  zookeep,  zookeep, zookeep,  zookeep_state, empty_init,   ROT0,   "Taito America Corporation", "Zoo Keeper (set 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, slither,   0,        slither, slither,  qix_state,     empty_init,   ROT270, "Century II", "Slither (set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, slithera,  slither,  slither, slither,  qix_state,     empty_init,   ROT270, "Century II", "Slither (set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1984, complexx,  0,        qix,     complexx, qix_state,     empty_init,   ROT270, "Taito America Corporation", "Complex X", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, qix,       0,        qix,       qix,      qix_state,     empty_init,   ROT270, "Taito America Corporation", "Qix (Rev 2)", MACHINE_SUPPORTS_SAVE ) // newest set?  closest to 'qix2'
+GAME( 1981, qixa,      qix,      qix,       qix,      qix_state,     empty_init,   ROT270, "Taito America Corporation", "Qix (set 2, smaller roms)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, qixb,      qix,      qix,       qix,      qix_state,     empty_init,   ROT270, "Taito America Corporation", "Qix (set 2, larger roms)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, qixo,      qix,      qix,       qix,      qix_state,     empty_init,   ROT270, "Taito America Corporation", "Qix (set 3, earlier)", MACHINE_SUPPORTS_SAVE ) // oldest set / prototype? has incorrect spelling 'deutch' and doesn't allow language selection to be changed
+GAME( 1981, qix2,      qix,      qix,       qix,      qix_state,     empty_init,   ROT270, "Taito America Corporation", "Qix II (Tournament)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, sdungeon,  0,        mcu,       sdungeon, qixmcu_state,  empty_init,   ROT270, "Taito America Corporation", "Space Dungeon", MACHINE_SUPPORTS_SAVE ) // actually released July 1982
+GAME( 1981, sdungeona, sdungeon, mcu,       sdungeon, qixmcu_state,  empty_init,   ROT270, "Taito America Corporation", "Space Dungeon (larger roms)", MACHINE_SUPPORTS_SAVE ) // same as above but uses larger ROMs
+GAMEL(1982, elecyoyo,  0,        mcu,       elecyoyo, qixmcu_state,  empty_init,   ROT270, "Taito America Corporation", "The Electric Yo-Yo (set 1)", MACHINE_SUPPORTS_SAVE, layout_elecyoyo )
+GAMEL(1982, elecyoyo2, elecyoyo, mcu,       elecyoyo, qixmcu_state,  empty_init,   ROT270, "Taito America Corporation", "The Electric Yo-Yo (set 2)", MACHINE_SUPPORTS_SAVE, layout_elecyoyo )
+GAME( 1982, kram,      0,        mcu,       kram,     qixmcu_state,  empty_init,   ROT0,   "Taito America Corporation", "Kram (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, kram2,     kram,     mcu,       kram,     qixmcu_state,  empty_init,   ROT0,   "Taito America Corporation", "Kram (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, kram3,     kram,     kram3,     kram,     qix_state,     init_kram3,   ROT0,   "Taito America Corporation", "Kram (encrypted)", MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, zookeep,   0,        zookeep,   zookeep,  zookeep_state, empty_init,   ROT0,   "Taito America Corporation", "Zoo Keeper (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, zookeep2,  zookeep,  zookeep,   zookeep,  zookeep_state, empty_init,   ROT0,   "Taito America Corporation", "Zoo Keeper (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, zookeep3,  zookeep,  zookeep,   zookeep,  zookeep_state, empty_init,   ROT0,   "Taito America Corporation", "Zoo Keeper (set 3)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, zookeepbl, zookeep,  zookeepbl, zookeep,  zookeep_state, empty_init,   ROT0,   "bootleg", "Zoo Keeper (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, slither,   0,        slither,   slither,  qix_state,     empty_init,   ROT270, "Century II", "Slither (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, slithera,  slither,  slither,   slither,  qix_state,     empty_init,   ROT270, "Century II", "Slither (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1984, complexx,  0,        qix,       complexx, qix_state,     empty_init,   ROT270, "Taito America Corporation", "Complex X", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/qvt70.cpp mame-0.224+dfsg.1/src/mame/drivers/qvt70.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/qvt70.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/qvt70.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,9 +2,9 @@
 // copyright-holders: Dirk Best
 /****************************************************************************
 
-    Qume QVT-70 terminal
+    Qume QVT-70/QVT-82 terminal
 
-    Hardware:
+    QVT-70:
     - Z80 (Z8040008VSC)
     - Z80 DART (Z0847006PSC)
     - QUME 303489-01 QFP144
@@ -22,6 +22,16 @@
     - 64 background/foreground colors
     - 80/132 columns
 
+    QVT-82:
+    - Z80 (Z0840008PSC)
+    - Z80 DART (Z0847006PSC)
+    - QUME 303489-01 QFP144
+    - ROM 64k * 2
+    - RAM 8k UM6264AK-10L (above Z80) + 8k UM6264K-70L * 3 (below Z80)
+    - DS1231
+    - 54.2857MHz XTAL
+    - Battery
+
 ****************************************************************************/
 
 #include "emu.h"
@@ -331,12 +341,13 @@
 
 void qvt70_state::rombank_w(uint8_t data)
 {
-//  logerror("rombank_w: %02x\n", data);
+	if (data & ~0x19)
+		logerror("rombank_w: %02x\n", data);
 
-	// 765----- unknown
-	// ---43--- bankswitching
-	// -----21- unknown
-	// -------0 bankswitching
+	// 765-----  unknown
+	// ---43---  bankswitching
+	// -----21-  unknown
+	// -------0  bankswitching
 
 	switch (data & 0x19)
 	{
@@ -407,4 +418,11 @@
 	ROM_LOAD( "251513-04_revj.u12", 0x20000, 0x10000, CRC(3960bbd5) SHA1(9db306cef09be21ff43c081ebe11e9b46f617861) ) // 251513-04  C/S:18D0  95' REV.J (checksum matches)
 ROM_END
 
+ROM_START( qvt82 )
+	ROM_REGION(0x30000, "maincpu", 0)
+	ROM_LOAD( "304229-02d_revd.u6", 0x00000, 0x10000, CRC(597431df) SHA1(10c4669b759dd7cfd6746e54dc12807197cf841a) ) // 304229-02D  QVT-82 REV. D  U6 (BF7F) (checksum matches)
+	ROM_LOAD( "304229-01d_revd.u5", 0x20000, 0x10000, CRC(9ebd09b6) SHA1(ef9f002016d05b770e7b66d15f05fc286bd022d9) ) // 304229-01D  QVT-82 REV. D  U5 (462B) (checksum matches)
+ROM_END
+
 COMP( 1992, qvt70, 0, 0, qvt70, qvt70, qvt70_state, empty_init, "Qume", "QVT-70", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1993, qvt82, 0, 0, qvt70, qvt70, qvt70_state, empty_init, "Qume", "QVT-82", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/radio86.cpp mame-0.224+dfsg.1/src/mame/drivers/radio86.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/radio86.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/radio86.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -11,13 +11,8 @@
 
 #include "emu.h"
 #include "includes/radio86.h"
-
 #include "cpu/i8085/i8085.h"
-#include "imagedev/cassette.h"
-#include "machine/i8255.h"
-
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
 #include "formats/rk_cas.h"
@@ -26,13 +21,12 @@
 /* Address maps */
 void radio86_state::radio86_mem(address_map &map)
 {
-	map(0x0000, 0x0fff).bankrw("bank1"); // First bank
-	map(0x1000, 0x7fff).ram();  // RAM
-	map(0x8000, 0x8003).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
-	//map(0xa000, 0xa003).rw(m_ppi8255_2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
-	map(0xc000, 0xc001).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x1ffe); // video
-	map(0xe000, 0xffff).w(m_dma8257, FUNC(i8257_device::write));    // DMA
-	map(0xf000, 0xffff).rom();  // System ROM
+	map(0x0000, 0x7fff).ram().share("mainram");
+	map(0x8000, 0x8003).rw(m_ppi1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
+	//map(0xa000, 0xa003).rw(m_ppi2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
+	map(0xc000, 0xc001).rw("crtc", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x1ffe); // video
+	map(0xe000, 0xffff).w(m_dma, FUNC(i8257_device::write));    // DMA
+	map(0xf000, 0xffff).rom().region("maincpu",0);  // System ROM
 }
 
 void radio86_state::radio86_io(address_map &map)
@@ -49,63 +43,58 @@
 
 void radio86_state::radio86rom_mem(address_map &map)
 {
-	map(0x0000, 0x0fff).bankrw("bank1"); // First bank
-	map(0x1000, 0x7fff).ram();  // RAM
-	map(0x8000, 0x8003).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
-	map(0xa000, 0xa003).rw(m_ppi8255_2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
-	map(0xc000, 0xc001).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x1ffe); // video
-	map(0xe000, 0xffff).w(m_dma8257, FUNC(i8257_device::write));    // DMA
-	map(0xf000, 0xffff).rom();  // System ROM
+	map(0x0000, 0x7fff).ram().share("mainram");
+	map(0x8000, 0x8003).rw(m_ppi1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
+	map(0xa000, 0xa003).rw(m_ppi2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
+	map(0xc000, 0xc001).rw("crtc", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x1ffe); // video
+	map(0xe000, 0xffff).w(m_dma, FUNC(i8257_device::write));    // DMA
+	map(0xf000, 0xffff).rom().region("maincpu",0);  // System ROM
 }
 
 void radio86_state::radio86ram_mem(address_map &map)
 {
-	map(0x0000, 0x0fff).bankrw("bank1"); // First bank
-	map(0x1000, 0xdfff).ram();  // RAM
+	map(0x0000, 0xdfff).ram().share("mainram");
 	map(0xe000, 0xe7ff).rom();  // System ROM page 2
 	map(0xe800, 0xf5ff).ram();  // RAM
-	map(0xf700, 0xf703).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0xf780, 0xf7bf).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)); // video
-	map(0xf684, 0xf687).rw(m_ppi8255_2, FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0xf700, 0xf703).rw(m_ppi1, FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0xf780, 0xf7bf).rw("crtc", FUNC(i8275_device::read), FUNC(i8275_device::write)); // video
+	map(0xf684, 0xf687).rw(m_ppi2, FUNC(i8255_device::read), FUNC(i8255_device::write));
 	map(0xf688, 0xf688).w(FUNC(radio86_state::radio86_pagesel));
-	map(0xf800, 0xffff).w(m_dma8257, FUNC(i8257_device::write));    // DMA
-	map(0xf800, 0xffff).rom();  // System ROM page 1
+	map(0xf800, 0xffff).w(m_dma, FUNC(i8257_device::write));    // DMA
+	map(0xf800, 0xffff).rom().region("maincpu",0);  // System ROM page 1
 }
 
 void radio86_state::radio86_16_mem(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0x0fff).bankrw("bank1"); // First bank
-	map(0x1000, 0x3fff).ram();  // RAM
+	map(0x0000, 0x3fff).ram().share("mainram");
 	map(0x4000, 0x7fff).r(FUNC(radio86_state::radio_cpu_state_r));
-	map(0x8000, 0x8003).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
-	//map(0xa000, 0xa003).rw(m_ppi8255_2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
-	map(0xc000, 0xc001).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x1ffe); // video
-	map(0xe000, 0xffff).w(m_dma8257, FUNC(i8257_device::write));    // DMA
-	map(0xf000, 0xffff).rom();  // System ROM
+	map(0x8000, 0x8003).rw(m_ppi1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
+	//map(0xa000, 0xa003).rw(m_ppi2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
+	map(0xc000, 0xc001).rw("crtc", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x1ffe); // video
+	map(0xe000, 0xffff).w(m_dma, FUNC(i8257_device::write));    // DMA
+	map(0xf000, 0xffff).rom().region("maincpu",0);  // System ROM
 }
 
 
 void radio86_state::mikron2_mem(address_map &map)
 {
-	map(0x0000, 0x0fff).bankrw("bank1"); // First bank
-	map(0x1000, 0x7fff).ram();  // RAM
-	map(0xc000, 0xc003).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x00fc);
-	//map(0xc100, 0xc103).rw(m_ppi8255_2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x00fc);
-	map(0xc200, 0xc201).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x00fe); // video
-	map(0xc300, 0xc3ff).w(m_dma8257, FUNC(i8257_device::write));    // DMA
-	map(0xf000, 0xffff).rom();  // System ROM
+	map(0x0000, 0x7fff).ram().share("mainram");
+	map(0xc000, 0xc003).rw(m_ppi1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x00fc);
+	//map(0xc100, 0xc103).rw(m_ppi2, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x00fc);
+	map(0xc200, 0xc201).rw("crtc", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x00fe); // video
+	map(0xc300, 0xc3ff).w(m_dma, FUNC(i8257_device::write));    // DMA
+	map(0xf000, 0xffff).rom().region("maincpu",0);  // System ROM
 }
 
 void radio86_state::impuls03_mem(address_map &map)
 {
-	map(0x0000, 0x0fff).bankrw("bank1"); // First bank
-	map(0x1000, 0x7fff).ram();  // RAM
-	map(0x8000, 0x8003).rw(m_ppi8255_1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
-	map(0xa000, 0xbfff).rom();  // Basic ROM
-	map(0xc000, 0xc001).rw("i8275", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x1ffe); // video
-	map(0xe000, 0xffff).w(m_dma8257, FUNC(i8257_device::write));    // DMA
-	map(0xf000, 0xffff).rom();  // System ROM
+	map(0x0000, 0x7fff).ram().share("mainram");
+	map(0x8000, 0x8003).rw(m_ppi1, FUNC(i8255_device::read), FUNC(i8255_device::write)).mirror(0x1ffc);
+	map(0xa000, 0xbfff).rom().region("maincpu",0x1000);  // Basic ROM
+	map(0xc000, 0xc001).rw("crtc", FUNC(i8275_device::read), FUNC(i8275_device::write)).mirror(0x1ffe); // video
+	map(0xe000, 0xffff).w(m_dma, FUNC(i8257_device::write));    // DMA
+	map(0xf000, 0xffff).rom().region("maincpu",0);  // System ROM
 }
 
 /* Input ports */
@@ -456,7 +445,7 @@
 };
 
 static GFXDECODE_START( gfx_radio86 )
-	GFXDECODE_ENTRY( "gfx1", 0x0000, radio86_charlayout, 0, 1 )
+	GFXDECODE_ENTRY( "chargen", 0x0000, radio86_charlayout, 0, 1 )
 GFXDECODE_END
 
 
@@ -468,32 +457,32 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &radio86_state::radio86_mem);
 	m_maincpu->set_addrmap(AS_IO, &radio86_state::radio86_io);
 
-	I8255(config, m_ppi8255_1);
-	m_ppi8255_1->out_pa_callback().set(FUNC(radio86_state::radio86_8255_porta_w2));
-	m_ppi8255_1->in_pb_callback().set(FUNC(radio86_state::radio86_8255_portb_r2));
-	m_ppi8255_1->in_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_r2));
-	m_ppi8255_1->out_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_w2));
+	I8255(config, m_ppi1);
+	m_ppi1->out_pa_callback().set(FUNC(radio86_state::radio86_8255_porta_w2));
+	m_ppi1->in_pb_callback().set(FUNC(radio86_state::radio86_8255_portb_r2));
+	m_ppi1->in_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_r2));
+	m_ppi1->out_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_w2));
 
-	i8275_device &crtc(I8275(config, "i8275", XTAL(16'000'000) / 12));
+	i8275_device &crtc(I8275(config, "crtc", XTAL(16'000'000) / 12));
 	crtc.set_character_width(6);
 	crtc.set_display_callback(FUNC(radio86_state::display_pixels));
-	crtc.drq_wr_callback().set(m_dma8257, FUNC(i8257_device::dreq2_w));
+	crtc.drq_wr_callback().set(m_dma, FUNC(i8257_device::dreq2_w));
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_screen_update("i8275", FUNC(i8275_device::screen_update));
+	screen.set_screen_update("crtc", FUNC(i8275_device::screen_update));
 	screen.set_raw(XTAL(16'000'000) / 2, 516, 0, 78*6, 310, 0, 30*10);
 	GFXDECODE(config, "gfxdecode", m_palette, gfx_radio86);
 	PALETTE(config, m_palette, FUNC(radio86_state::radio86_palette), 3);
 
 	SPEAKER(config, "mono").front_center();
 
-	I8257(config, m_dma8257, XTAL(16'000'000) / 9);
-	m_dma8257->out_hrq_cb().set(FUNC(radio86_state::hrq_w));
-	m_dma8257->in_memr_cb().set(FUNC(radio86_state::memory_read_byte));
-	m_dma8257->out_memw_cb().set(FUNC(radio86_state::memory_write_byte));
-	m_dma8257->out_iow_cb<2>().set("i8275", FUNC(i8275_device::dack_w));
-	m_dma8257->set_reverse_rw_mode(1);
+	I8257(config, m_dma, XTAL(16'000'000) / 9);
+	m_dma->out_hrq_cb().set(FUNC(radio86_state::hrq_w));
+	m_dma->in_memr_cb().set(FUNC(radio86_state::memory_read_byte));
+	m_dma->out_memw_cb().set(FUNC(radio86_state::memory_write_byte));
+	m_dma->out_iow_cb<2>().set("crtc", FUNC(i8275_device::dack_w));
+	m_dma->set_reverse_rw_mode(1);
 
 	CASSETTE(config, m_cassette);
 	m_cassette->set_formats(rkr_cassette_formats);
@@ -510,10 +499,10 @@
 	radio86(config);
 	/* basic machine hardware */
 
-	m_ppi8255_1->out_pa_callback().set(FUNC(radio86_state::radio86_8255_porta_w2));
-	m_ppi8255_1->in_pb_callback().set(FUNC(radio86_state::kr03_8255_portb_r2));
-	m_ppi8255_1->in_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_r2));
-	m_ppi8255_1->out_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_w2));
+	m_ppi1->out_pa_callback().set(FUNC(radio86_state::radio86_8255_porta_w2));
+	m_ppi1->in_pb_callback().set(FUNC(radio86_state::kr03_8255_portb_r2));
+	m_ppi1->in_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_r2));
+	m_ppi1->out_pc_callback().set(FUNC(radio86_state::radio86_8255_portc_w2));
 }
 
 void radio86_state::radio16(machine_config &config)
@@ -529,10 +518,10 @@
 	/* basic machine hardware */
 	m_maincpu->set_addrmap(AS_PROGRAM, &radio86_state::radio86rom_mem);
 
-	I8255(config, m_ppi8255_2);
-	m_ppi8255_2->in_pa_callback().set(FUNC(radio86_state::radio86rom_romdisk_porta_r));
-	m_ppi8255_2->out_pb_callback().set(FUNC(radio86_state::radio86_romdisk_portb_w));
-	m_ppi8255_2->out_pc_callback().set(FUNC(radio86_state::radio86_romdisk_portc_w));
+	I8255(config, m_ppi2);
+	m_ppi2->in_pa_callback().set(FUNC(radio86_state::radio86rom_romdisk_porta_r));
+	m_ppi2->out_pb_callback().set(FUNC(radio86_state::radio86_romdisk_portb_w));
+	m_ppi2->out_pc_callback().set(FUNC(radio86_state::radio86_romdisk_portc_w));
 
 	GENERIC_CARTSLOT(config, m_cart, generic_plain_slot, "radio86_cart", "bin,rom");
 
@@ -545,10 +534,10 @@
 	/* basic machine hardware */
 	m_maincpu->set_addrmap(AS_PROGRAM, &radio86_state::radio86ram_mem);
 
-	I8255(config, m_ppi8255_2);
-	m_ppi8255_2->in_pa_callback().set(FUNC(radio86_state::radio86ram_romdisk_porta_r));
-	m_ppi8255_2->out_pb_callback().set(FUNC(radio86_state::radio86_romdisk_portb_w));
-	m_ppi8255_2->out_pc_callback().set(FUNC(radio86_state::radio86_romdisk_portc_w));
+	I8255(config, m_ppi2);
+	m_ppi2->in_pa_callback().set(FUNC(radio86_state::radio86ram_romdisk_porta_r));
+	m_ppi2->out_pb_callback().set(FUNC(radio86_state::radio86_romdisk_portb_w));
+	m_ppi2->out_pc_callback().set(FUNC(radio86_state::radio86_romdisk_portc_w));
 }
 
 void radio86_state::rk7007(machine_config &config)
@@ -593,107 +582,119 @@
 
 /* ROM definition */
 ROM_START( radio86 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "bios.rom", 0xf800, 0x0800, CRC(bf1ceea5) SHA1(8f3d472203e550e9854dd79e1f44628635581ed0))
-	ROM_COPY( "maincpu", 0xf800, 0xf000, 0x0800 )
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x1000, "maincpu", 0 )
+	ROM_LOAD( "bios.rom", 0x0800, 0x0800, CRC(bf1ceea5) SHA1(8f3d472203e550e9854dd79e1f44628635581ed0))
+	ROM_RELOAD( 0x0000, 0x0800 )
+
+	ROM_REGION( 0x0800, "chargen", 0 )
 	ROM_LOAD ("radio86.fnt", 0x0000, 0x0400, CRC(7666bd5e) SHA1(8652787603bee9b4da204745e3b2aa07a4783dfc))
 ROM_END
 
 ROM_START( radio4k )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "bios4k.rom", 0xf000, 0x1000, CRC(2ac9d864) SHA1(296716c6cddc9dd31d500ba421aa807c45757cfd))
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x1000, "maincpu", 0 )
+	ROM_LOAD( "bios4k.rom", 0x0000, 0x1000, CRC(2ac9d864) SHA1(296716c6cddc9dd31d500ba421aa807c45757cfd))
+
+	ROM_REGION( 0x0800, "chargen", 0 )
 	ROM_LOAD ("radio86.fnt", 0x0000, 0x0400, CRC(7666bd5e) SHA1(8652787603bee9b4da204745e3b2aa07a4783dfc))
 ROM_END
 
 ROM_START( spektr01 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "spektr001.rom", 0xf800, 0x0800, CRC(5a38e6d5) SHA1(799c3bbe2a9f08f3aba55379cc093329048350ff))
-	ROM_COPY( "maincpu", 0xf800, 0xf000, 0x0800 )
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x1000, "maincpu", 0 )
+	ROM_LOAD( "spektr001.rom", 0x0800, 0x0800, CRC(5a38e6d5) SHA1(799c3bbe2a9f08f3aba55379cc093329048350ff))
+	ROM_RELOAD( 0x0000, 0x0800 )
+
+	ROM_REGION(0x0800, "chargen",0 )
 	ROM_LOAD ("radio86.fnt", 0x0000, 0x0400, CRC(7666bd5e) SHA1(8652787603bee9b4da204745e3b2aa07a4783dfc))
 ROM_END
 
 ROM_START( radio16 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "rk86.16k", 0xf800, 0x0800, CRC(fd8a4caf) SHA1(90d6af571049a7c8748eac03541e921eac3f70c5))
-	ROM_COPY( "maincpu", 0xf800, 0xf000, 0x0800 )
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x1000, "maincpu", 0 )
+	ROM_LOAD( "rk86.16k", 0x0800, 0x0800, CRC(fd8a4caf) SHA1(90d6af571049a7c8748eac03541e921eac3f70c5))
+	ROM_RELOAD( 0x0000, 0x0800 )
+
+	ROM_REGION( 0x0800, "chargen", 0 )
 	ROM_LOAD ("radio86.fnt", 0x0000, 0x0400, CRC(7666bd5e) SHA1(8652787603bee9b4da204745e3b2aa07a4783dfc))
 ROM_END
 
 ROM_START( radiorom )
 	ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASEFF )
 	ROM_SYSTEM_BIOS(0, "32k", "32 KB rom disk")
-	ROMX_LOAD( "radiorom.rom", 0xf800, 0x0800, CRC(b5cdeab7) SHA1(1c80d72082f2fb2190b575726cb82d86ae0ee7d8), ROM_BIOS(0))
+	ROMX_LOAD( "radiorom.rom", 0x0800, 0x0800, CRC(b5cdeab7) SHA1(1c80d72082f2fb2190b575726cb82d86ae0ee7d8), ROM_BIOS(0))
 	ROM_SYSTEM_BIOS(1, "64k", "64 KB rom disk")
-	ROMX_LOAD( "radiorom.64",  0xf800, 0x0800, CRC(5250b927) SHA1(e885e0f5b2325190b38a4c92b20a8b4fa78fbd8f), ROM_BIOS(1))
-	ROM_COPY( "maincpu", 0xf800, 0xf000, 0x0800 )
-	ROM_REGION(0x0800, "gfx1",0)
+	ROMX_LOAD( "radiorom.64",  0x0800, 0x0800, CRC(5250b927) SHA1(e885e0f5b2325190b38a4c92b20a8b4fa78fbd8f), ROM_BIOS(1))
+	ROM_COPY( "maincpu", 0x0800, 0x0000, 0x0800 )
+
+	ROM_REGION( 0x0800, "chargen", 0 )
 	ROM_LOAD ("radio86.fnt", 0x0000, 0x0400, CRC(7666bd5e) SHA1(8652787603bee9b4da204745e3b2aa07a4783dfc))
 ROM_END
 
 ROM_START( radioram )
 	ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "r86-1.bin", 0xf800, 0x0800, CRC(7e7ab7cb) SHA1(fedb00b6b8fbe1167faba3e4611b483f800e6934))
+	ROM_LOAD( "r86-1.bin", 0x0800, 0x0800, CRC(7e7ab7cb) SHA1(fedb00b6b8fbe1167faba3e4611b483f800e6934))
+	ROM_RELOAD( 0x0000, 0x0800 )
 	ROM_LOAD( "r86-2.bin", 0xe000, 0x0800, CRC(955f0616) SHA1(d2b9f960558bdcb60074091fc79d1ad56c313586))
 	ROM_LOAD( "romdisk.bin", 0x10000, 0x10000, CRC(43c0279b) SHA1(bc1dfd9bdbce39460616e2158f5d96279d0af3cf))
-	ROM_REGION(0x0800, "gfx1",0)
+
+	ROM_REGION( 0x0800, "chargen", 0 )
 	ROM_LOAD ("radio86.fnt", 0x0000, 0x0400, CRC(7666bd5e) SHA1(8652787603bee9b4da204745e3b2aa07a4783dfc))
 ROM_END
 
 ROM_START( rk7007 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "ms7007.rom", 0xf800, 0x0800, CRC(002811dc) SHA1(4529eb72198c49af77fbcd7833bcd06a1cf9b1ac))
-	ROM_COPY( "maincpu", 0xf800, 0xf000, 0x0800 )
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x1000, "maincpu", 0 )
+	ROM_LOAD( "ms7007.rom", 0x0800, 0x0800, CRC(002811dc) SHA1(4529eb72198c49af77fbcd7833bcd06a1cf9b1ac))
+	ROM_RELOAD( 0x0000, 0x0800 )
+
+	ROM_REGION( 0x0800, "chargen", 0 )
 	ROM_LOAD ("radio86.fnt", 0x0000, 0x0400, CRC(7666bd5e) SHA1(8652787603bee9b4da204745e3b2aa07a4783dfc))
 ROM_END
 
 ROM_START( rk700716 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "ms7007.16k", 0xf800, 0x0800, CRC(5268d7b6) SHA1(efd69d8456b8cf8b37f33237153c659725608528))
-	ROM_COPY( "maincpu", 0xf800, 0xf000, 0x0800 )
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x1000, "maincpu", 0 )
+	ROM_LOAD( "ms7007.16k", 0x0800, 0x0800, CRC(5268d7b6) SHA1(efd69d8456b8cf8b37f33237153c659725608528))
+	ROM_RELOAD( 0x0000, 0x0800 )
+
+	ROM_REGION( 0x0800, "chargen", 0 )
 	ROM_LOAD ("radio86.fnt", 0x0000, 0x0400, CRC(7666bd5e) SHA1(8652787603bee9b4da204745e3b2aa07a4783dfc))
 ROM_END
 
 ROM_START( mikron2 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "mikron2.bin", 0xf800, 0x0800, CRC(2cd79bb4) SHA1(501df47e65aaa8f4ce27751bc2a7e7089e2e888c))
-	ROM_COPY( "maincpu", 0xf800, 0xf000, 0x0800 )
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x1000, "maincpu", 0 )
+	ROM_LOAD( "mikron2.bin", 0x0800, 0x0800, CRC(2cd79bb4) SHA1(501df47e65aaa8f4ce27751bc2a7e7089e2e888c))
+	ROM_RELOAD( 0x0000, 0x0800 )
+
+	ROM_REGION( 0x0800, "chargen", 0 )
 	ROM_LOAD ("radio86.fnt", 0x0000, 0x0400, CRC(7666bd5e) SHA1(8652787603bee9b4da204745e3b2aa07a4783dfc))
 ROM_END
 
 ROM_START( kr03 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "kr03-dd17.rf2", 0xf800, 0x0800, CRC(ac2e24d5) SHA1(a1317a261bfd55b3b37109b14d1391308dee04de))
-	ROM_COPY( "maincpu", 0xf800, 0xf000, 0x0800 )
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x1000, "maincpu", 0 )
+	ROM_LOAD( "kr03-dd17.rf2", 0x0800, 0x0800, CRC(ac2e24d5) SHA1(a1317a261bfd55b3b37109b14d1391308dee04de))
+	ROM_RELOAD( 0x0000, 0x0800 )
+
+	ROM_REGION( 0x0800, "chargen", 0 )
 	ROM_LOAD ("kr03-dd12.rf2", 0x0000, 0x0800, CRC(085f4259) SHA1(11c5829b072a00961ad936c26559fb63bf2dc896))
 ROM_END
 
 ROM_START( impuls03 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "imp03bas.rom", 0xa000, 0x2000, CRC(b13b2de4) SHA1(9af8c49d72ca257bc34cad3c62e530730929702e))
-	ROM_LOAD( "imp03mon.rom", 0xf800, 0x0800, CRC(8c591ce4) SHA1(8e8e9cba6b3123d74218b92f4b4210606ba53376))
-	ROM_COPY( "maincpu", 0xf800, 0xf000, 0x0800 )
-	ROM_REGION(0x0800, "gfx1",0)
+	ROM_REGION( 0x3000, "maincpu", 0 )
+	ROM_LOAD( "imp03bas.rom", 0x1000, 0x2000, CRC(b13b2de4) SHA1(9af8c49d72ca257bc34cad3c62e530730929702e))
+	ROM_LOAD( "imp03mon.rom", 0x0800, 0x0800, CRC(8c591ce4) SHA1(8e8e9cba6b3123d74218b92f4b4210606ba53376))
+	ROM_RELOAD( 0x0000, 0x0800 )
+
+	ROM_REGION( 0x0800, "chargen", 0 )
 	ROM_LOAD ("radio86.fnt", 0x0000, 0x0400, CRC(7666bd5e) SHA1(8652787603bee9b4da204745e3b2aa07a4783dfc))
 ROM_END
 /* Driver */
 
 //    YEAR  NAME      PARENT   COMPAT  MACHINE   INPUT    CLASS          INIT           COMPANY        FULLNAME                       FLAGS
-COMP( 1986, radio86,  0,       0,      radio86,  radio86, radio86_state, init_radio86,  "<unknown>",   "Radio-86RK",                  0 )
-COMP( 1986, radio16,  radio86, 0,      radio16,  radio86, radio86_state, init_radio86,  "<unknown>",   "Radio-86RK (16K RAM)",        0 )
-COMP( 1986, kr03,     radio86, 0,      kr03,     kr03,    radio86_state, init_radio86,  "Elektronika", "KR-03",                       0 )
-COMP( 1986, radio4k,  radio86, 0,      radio86,  radio86, radio86_state, init_radio86,  "<unknown>",   "Radio-86RK (4K ROM)",         0 )
-COMP( 1986, radiorom, radio86, 0,      radiorom, radio86, radio86_state, init_radio86,  "<unknown>",   "Radio-86RK (ROM-Disk)",       0 )
-COMP( 1986, radioram, radio86, 0,      radioram, radio86, radio86_state, init_radioram, "<unknown>",   "Radio-86RK (ROM/RAM Disk)",   0 )
-COMP( 1986, spektr01, radio86, 0,      radio86,  radio86, radio86_state, init_radio86,  "<unknown>",   "Spektr-001",                  0 )
-COMP( 1986, rk7007,   radio86, 0,      rk7007,   ms7007,  radio86_state, init_radio86,  "<unknown>",   "Radio-86RK (MS7007)",         0 )
-COMP( 1986, rk700716, radio86, 0,      rk700716, ms7007,  radio86_state, init_radio86,  "<unknown>",   "Radio-86RK (MS7007 16K RAM)", 0 )
-COMP( 1986, mikron2,  radio86, 0,      mikron2,  radio86, radio86_state, init_radio86,  "<unknown>",   "Mikron-2",                    0 )
-COMP( 1986, impuls03, radio86, 0,      impuls03, radio86, radio86_state, init_radio86,  "<unknown>",   "Impuls-03",                   0 )
+COMP( 1986, radio86,  0,       0,      radio86,  radio86, radio86_state, init_radio86,  "<unknown>",   "Radio-86RK",                  MACHINE_SUPPORTS_SAVE )
+COMP( 1986, radio16,  radio86, 0,      radio16,  radio86, radio86_state, init_radio86,  "<unknown>",   "Radio-86RK (16K RAM)",        MACHINE_SUPPORTS_SAVE )
+COMP( 1986, kr03,     radio86, 0,      kr03,     kr03,    radio86_state, init_radio86,  "Elektronika", "KR-03",                       MACHINE_SUPPORTS_SAVE )
+COMP( 1986, radio4k,  radio86, 0,      radio86,  radio86, radio86_state, init_radio86,  "<unknown>",   "Radio-86RK (4K ROM)",         MACHINE_SUPPORTS_SAVE )
+COMP( 1986, radiorom, radio86, 0,      radiorom, radio86, radio86_state, init_radio86,  "<unknown>",   "Radio-86RK (ROM-Disk)",       MACHINE_SUPPORTS_SAVE )
+COMP( 1986, radioram, radio86, 0,      radioram, radio86, radio86_state, init_radioram, "<unknown>",   "Radio-86RK (ROM/RAM Disk)",   MACHINE_SUPPORTS_SAVE )
+COMP( 1986, spektr01, radio86, 0,      radio86,  radio86, radio86_state, init_radio86,  "<unknown>",   "Spektr-001",                  MACHINE_SUPPORTS_SAVE )
+COMP( 1986, rk7007,   radio86, 0,      rk7007,   ms7007,  radio86_state, init_radio86,  "<unknown>",   "Radio-86RK (MS7007)",         MACHINE_SUPPORTS_SAVE )
+COMP( 1986, rk700716, radio86, 0,      rk700716, ms7007,  radio86_state, init_radio86,  "<unknown>",   "Radio-86RK (MS7007 16K RAM)", MACHINE_SUPPORTS_SAVE )
+COMP( 1986, mikron2,  radio86, 0,      mikron2,  radio86, radio86_state, init_radio86,  "<unknown>",   "Mikron-2",                    MACHINE_SUPPORTS_SAVE )
+COMP( 1986, impuls03, radio86, 0,      impuls03, radio86, radio86_state, init_radio86,  "<unknown>",   "Impuls-03",                   MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/raiden_ms.cpp mame-0.224+dfsg.1/src/mame/drivers/raiden_ms.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/raiden_ms.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/raiden_ms.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -9,18 +9,193 @@
 
     For this game the Modular System cage contains 8 main boards and 1 sub board.
 
-    Unmarked red board - 2 V30s, unpopulated M68000 socket + 6 ROMs + RAMs.
-    MOD-6/1 - RAMs, 20 MHz XTAL and unpopulated M68000 socket.
+    8086/1 red board - 2 V30s, M68000 socket for connecting to board 6/1 + 6 ROMs + RAMs.
+    MOD-6/1 - RAMs, 20 MHz XTAL and  M68000 socket used for connecting to board 8086/1.
     MOD 21/1 - 24 MHz XTAL.
     MOD 1/5 - Sound board (Z80, 2xYM2203C). 2 8-dips banks + small sub board with OKI M5205.
     MOD 51/3 - Sprite board, has logic + 4 sprite ROMs.
-    MOD 4/3 - Tilemap board, has logic + 4 tilemap ROMs, long thin sub-board (CAR-0484/1 SOLD) with no chips, just routing along one edge.
-    MOD 4/3 - Tilemap board, has logic + 4 tilemap ROMs, long thin sub-board (CAR-0484/1 SOLD) with no chips, just routing along one edge.
-    MOD 4/3 - Tilemap board, has logic + 4 tilemap ROMs, long thin sub-board (CAR-0484/1 SOLD) with no chips, just routing along one edge.
+    MOD 4/3 - Tilemap board, has logic + 4 tilemap ROMs, long thin sub-board (CAR-0484/1) for terminating the connector (it's not used).
+    MOD 4/3 - Tilemap board, has logic + 4 tilemap ROMs, long thin sub-board (CAR-0484/1) for terminating the connector (it's not used).
+    MOD 4/3 - Tilemap board, has logic + 4 tilemap ROMs, long thin sub-board (CAR-0484/1) for terminating the connector (it's not used).
 
     PCBs pictures and dip listing are available at: http://www.recreativas.org/modular-system-raiden-4315-gaelco-sa
-*/
 
+Board 6/1                                           Board 21/1
+ _____________________________________________       ______________________________________________
+ |             _______________              __|_     |                                             |
+ |             |              |             |   |    |                                             |
+ |             | HM62256LP-12 |             |   |    |   ________   _______  ________              |
+ |             |______________|             |   |    |   |_EMPTY_| |_EMPTY_| |_EMPTY_|             |
+ |  _______   ________________    ________  |   |    |                                             |
+ | 74LS367AN  |               |  T74LS138B1 |   |    |                                             |
+ |            | EMPTY         |             |   |    |                                             |
+ |            |_______________|             |   |    |   ________   _______  ________              |
+ |  _______   ________________    _______   |   |    |   |74F74N_| 74LS393PC 74LS393PC             |
+ | 74LS367AN  |               |   74LS245N  |   |    |                                             |
+ |            | EMPTY         |             |   |    |                                             |
+ |            |_______________|             |   |    |                                             |
+ |            ________________              |   |    |   ________   ________  ________             |
+ |  _______   |               |   _______   |   |    |   74LS7273N |82S129_| |82S129_|             |
+ | 74LS138N   | EMPTY         |   74LS374N  |   |    |               P0202      211                |
+ |            |_______________|             |   |    |                                             |
+ |             _______________              |   |    |                                             |
+ |  _______    |              |   _______   |___|    |   ________   _______  ________              |
+ |  GAL16V8    | HM62256LP-12 |   74LS245N    |      |   74LS74AN    XTAL    SN74LS367AN           |
+ |    686      |______________|               |      |             24.000 MHz                      |
+ |            ________________                |      |                                             |
+ |  _______   |               |   _______     |      |   ________   _______  ________              |
+ | 74LS174N   | EMPTY         |   74LS374N    |   __ |_  74LS32PC  74LS368AB UM2148-1              |
+ |            |_______________|               |   |   |                                            |
+ |            ________________                |   |   |                                            |
+ |            |               |               |   |   |  ________   _______  ________              |
+ |  _______   | EMPTY         |   _______     |   |   |  74LS157N  74F112PC  UM2148-1              |
+ |  GAL16V8   |_______________|  T74LS138B1   |   |   |                                            |
+ |   645B*    ________________                |   |   |                                            |
+ |            |               |               |   |   |  ________   _______  ________              |
+ |            | EMPTY         |               |   |   |  74LS148N  74LS368AB UM2148-1              |
+ |            |_______________|   _______     |   |   |                                            |
+ |  __________________________    74LS32B1    |   |   |                                            |
+ |  | 68000 SOCKET BUT        |               |   |   |  ________   _______  ________   ________   |
+ |  | CONNECTED TO CPU PCB    |   _______     |   |   |  74LS298N  74LS298N  74LS298N   74LS174PC  |
+ |  |_________________________|   74LS20N     |   |   |                                            |
+ |                                            |   |   |                                            |
+ |  _______  ______  _______      _______     |   |   |  ________   _______  ________   ________   |
+ |  |74S74N   XTAL  74LS368AB1    74LS132N    |   |   |  74LS245N  74LS245N  |74LS08B   74LS174PC  |
+ |          20.000MHz                         |   |___|                                            |
+ |____________________________________________|      |_____________________________________________|
+
+  Sound Board (1/5)
+    ______________________________________________
+    |                                             |
+    |  ________  ________  ________               |
+    |  74LS107N  |74LS32N| |_EMPTY_|              |
+    |                                             |
+    |  ________  __________________               |
+    | 74LS368AB1 |                 |              |
+    |            | EMPTY           |              |
+    |  ________  |_________________|              |
+    |  74LS74AN  __________________               |
+    |            |  Z8400BB1       |              |
+    |  ________  |  Z80 B CPU      |  ________    |
+    | 74HCT157E  |_________________|  |LM324AN|   |
+    |            ________________                 |
+    |  ________  |               |             __ |
+  110->N82S123N  | RD 01         |             |D||
+    |  ________  |_______________|             |I||
+    | 74HCT157E  ________________              |P||     SOUND SUB
+    | __________ |               | _____ _____ |S|| __________________
+    | |         || LH5164D-10L   |Y3014B Y3014B|-|| | ______          |
+    | | SOUND   ||_______________|             |D|| | LM358N     ___  |
+    | |  SUB    |                              |I|| | .......... |  | |
+    | |         |                              |P|| |            |OKI |
+  __|_|_________|__________________            |S|| | .......... |M5205
+  |   |          | YAMAHA          |           |_|| | ________   |__| |
+  |   |          | YM2203C         |              | | 74LS377P        |
+  |   |          |_________________|              | |_________________|
+  |   |                                           |
+  |   | _______  ________                         |
+  |   | |EMPTY_| 74LS74AN                         |
+  |   |                                           |
+  |   |                                           |
+  |   |          __________________    _____      |
+  |   | _______  | YAMAHA          |  TDA2003     |
+  |   | |EMPTY|  | YM2203C         |              |
+  |   |          |_________________|              |
+  |   |                                           |
+  |   |          _________  _________             |
+  |   |          74LS244B1  74LS244B1             |
+  |   |                                           |
+  |___|        __________________________         |
+    |__________| |_|_|_|_|_|_|_|_|_|_|_| |________|
+                        PRE-JAMMA
+
+  CPU PCB (8086/1)                                       Board 51/3
+  ______________________________________________         _____________________________________________
+ | ____________                    ____________ |       |                                            |
+ ||RD601B      | ________         |NEC D70116C-10       | __________  ________ ________ ________     |
+ ||____________|SN74LS373N        |_V30________||       | |RD504    | 74LS299N 74LS169BN CY7C149|    |
+ | ____________                    ____________ |       | |_________| ________ ________ ________     |
+ ||RD601B      | ________         |NEC D70116C-10       |            74LS169BN 74LS169BN CY7C149|    |
+ ||____________|SN74LS373N        |_V30________||       |                                            |
+ |  ___________                     ___________ |       | __________  ________ ________ ________     |
+ | |RD603      | ________          |RD605B     ||       | |RD503    | 74LS158A 74LS169BN 82S129N <- 502
+ | |___________|SN74LS373N         |___________||       | |_________| ________ ________ ________     |
+ |  ___________  ________           ___________ |       |             74LS299N 74LS169BN 74LS244N    |
+ | |RD604      |SN74LS373N         |RD606B     ||       |                                            |
+ | |___________|                   |___________||       | __________  ________ ________ ________     |
+ |  ___________  ________ ________   __________ |       | |RD502    | 74LS299N 74LS169BN 74LS244N    |
+ | |SRM20256LC |SN74LS373N 74LS00N  |D4464-15L ||       | |_________| ________ ________ ________     |
+ | |___________| ________ ________  |__________||       |             74LS20B1 |CY7C149 74LS298B1    |
+ |  ___________ SN74LS373N 74LS368AN __________ |       |                                            |
+ | |SRM20256LC | ________ ________  |D4464-15L ||       | __________  ________ ________ ________     |
+ | |___________| |74LS32N 74LS139N  |__________||       | |RD501    | 74LS299N |CY7C149 74LS298B1    |
+ |                                              |       | |_________|                                |
+ |   ________   ________  ________   ________   |       |   ________  ________ ________ ________  __ |
+ |   74LS245N   74LS157N  74LS157N   74LS245N   |       |   74LS273B1 |74LS00N 74LS86B1 74LS244N  | ||
+ |   ________   ________  ________   ________   |       |                                         | ||
+ |   74LS245N   74LS157N  74LS157N   74LS245N   |      _|_  ________  ________ ________ ________  |V||
+ |   ______________________          ________   |      |  | |74LS08N  74F158APC 74LS74B1 74LS20B1 |O||
+ |  | 68000 SOCKET BUT     |         GAL16V8 <- 645C   |  |                                       |I||
+ |  | CONNECTED TO PCB 6/1 |         ________   |      |  | ________  ________ ________ ________  |D||
+ |  |______________________|         PALCE16V8 <- 645D 503-> GAL16V8 74LS393B1 74LS368AB1 74LS377N|E||
+ |______________________________________________|      |  |                                       |D||
+                                                       |  | ________  ________ ________ ________  | ||
+                                                       |  | 74LS138N  74LS283N UM2148-2 |_EMPTY_| | ||
+                                                       |  |                                       | ||
+                                                       |  | ________  ________ ________ ________  | ||
+                                                       |  | 74LS175B1 74LS283N UM2148-2 74LS273B1 | ||
+                                                       |  |                                       | ||
+                                                       |  | ________  ________ ________ ________  |_||
+                                                       |  | 74LS298B1 74LS157N 74LS157N 74LS273B1    |
+                                                       |  |                                          |
+                                                       |  | ________  ________ ________ ________     |
+                                                       |  | 74LS158P 74LS169BN 74LS169BN 74LS245B1   |
+                                                       |__|                                          |
+                                                        |____________________________________________|
+
+  Board 4/3 (B)                                     Board 4/3 (A)                                    Board 4/3
+ _____________________________________________    _____________________________________________    _____________________________________________
+ |                                            |   |                                            |   |                                            |
+ |   ________  ________ ________ ________     |   |   ________  ________ ________ ________     |   |   ________  ________ ________ ________     |
+ |   74LS00PC  |74S20N| 74LS244N 74LS163A  __ |   |   74LS00PC  |74S20N| 74LS244N 74LS163A  __ |   |   74LS00PC  |74S20N| 74LS244N 74LS163A  __ |
+ |                                         | ||   |                                         | ||   |                                         | ||
+ |                                         | ||   |                                         | ||   |                                         | ||
+ |   ________  ________ ________ ________  | ||   |   ________  ________ ________ ________  | ||   |   ________  ________ ________ ________  | ||
+ |   PAL16R8A 74LS163A 74LS373PC 74LS163A  | ||   |   PAL16R8A 74LS163A 74LS373PC 74LS163A  | ||   |   PAL16R8A 74LS163A 74LS373PC 74LS163A  | ||
+ |    PC403                                | ||   |     403                                 | ||   |    P0403                                | ||
+ |                                         | ||   |                                         | ||   |                                         | ||
+ |   ________  ________ ________ ________  | ||   |   ________  ________ ________ ________  | ||   |   ________  ________ ________ ________  | ||
+ |   74LS138PC 74LS283N 74LS273PC 74LS163A | ||   |   74LS138PC 74LS283N 74LS273PC 74LS163A | ||   |   74LS138B1 74LS283N 74LS273PC 74LS163A | ||
+ |                                         | ||   |                                         | ||   |                                         | ||
+ |                                         | ||   |                                         | ||   |                                         | ||
+ |   ________  ________ ________ ________  | ||   |   ________  ________ ________ ________  | ||   |   ________  ________ ________ ________  | ||
+ |   74LS393N  74LS283N 74LS273N 74LS153PC | ||   |   74LS393N  74LS283N 74LS273N 74LS153   | ||   |   74LS393N  74LS283N 74LS273N 74LS153PC | ||
+ |                                         | ||   |                                         | ||   |                                         | ||
+ |                                         | ||   |                                         | ||   |                                         | ||
+ |   ________  ________ ________ ________  | ||   |   ________  ________ ________ ________  | ||   |   ________  ________ ________ ________  | ||
+ |   74LS86PC  74LS299N |RD4B4  | 74LS153PC| ||   |   74LS86PC  74LS299N |RD4A4  | 74LS153  | ||   |   74LS86PC  74LS299  |RD401  | 74LS153N | ||
+ |                      |_______|          | ||   |                      |_______|          | ||   |                      |_______|          | ||
+ |                                         | ||   |                                         | ||   |                                         | ||
+ |   ________  ________ ________ ________  | ||   |   ________  ________ ________ ________  | ||   |   ________  ________ ________ ________  | ||
+_|_  74LS86PC  74LS299N |RD4B3  | 74LS153PC|V||  _|_  74LS86PC  74LS299N |RD4A3  | 74LS153  |V||  _|_  74LS86PC  74LS299  |RD402  | 74LS153N |V||
+|  |                    |_______|          |O||  |  |                    |_______|          |O||  |  |                    |_______|          |O||
+|  |                                       |I||  |  |                                       |I||  |  |                                       |I||
+|  | ________  ________ ________ ________  |D||  |  | ________  ________ ________ ________  |D||  |  | ________  ________ ________ ________  |D||
+|  |  74LS04   74LS299N |RD4B2  | 74LS153PC|E||  |  |  74LS04   74LS299N |RD4A2  | 74LS153  |E||  |  |  74LS04   74LS299  |RD403  | 74LS153N |E||
+|  |                    |_______|          |D||  |  |                    |_______|          |D||  |  |                    |_______|          |D||
+|  |                                       | ||  |  |                                       | ||  |  |                                       | ||
+|  | ________  ________ ________ ________  | ||  |  | ________  ________ ________ ________  | ||  |  | ________  ________ ________ ________  | ||
+|  | 74LS245P  74LS299N |RD4B1  | 74LS153PC| ||  |  | 74LS245P  74LS299N |RD4A1  | 74LS153  | ||  |  | 74LS245P  74LS299  |RD4A4  | 74LS153N | ||
+|  |                    |_______|          | ||  |  |                    |_______|          | ||  |  |                    |_______|          | ||
+|  |                                       | ||  |  |                                       | ||  |  |                                       | ||
+|  | ________  ________ ________ ________  | ||  |  | ________  ________ ________ ________  | ||  |  | ________  ________ ________ ________  | ||
+|  | 74LS32PC  74LS158P |D4364C | 74LS153PC| ||  |  | 74LS32PC  74LS158P |HM32064| 74LS153  | ||  |  | 74LS32B1  74LS158N |SRM2064| 74LS153N | ||
+|  |                    |15L____|          | ||  |  |                    |5______|          | ||  |  |                    |C15____|          | ||
+|  |                                       |_||  |  |                                       |_||  |  |                                       |_||
+|__|                                          |  |__|                                          |  |__|                                          |
+ |____________________________________________|   |____________________________________________|   |____________________________________________|
+
+*/
 
 #include "emu.h"
 #include "cpu/nec/nec.h"
@@ -31,6 +206,7 @@
 #include "emupal.h"
 #include "screen.h"
 #include "speaker.h"
+#include "tilemap.h"
 
 
 class raiden_ms_state : public driver_device
@@ -39,55 +215,434 @@
 	raiden_ms_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_screen(*this, "screen")
+		m_subcpu(*this, "subcpu"),
+		m_audiocpu(*this, "audiocpu"),
+		m_screen(*this, "screen"),
+		m_palette(*this, "palette"),
+		m_ym1(*this, "ym1"),
+		m_ym2(*this, "ym2"),
+		m_msm(*this, "msm5205"),
+		m_spriteram(*this, "spriteram"),
+		m_scrollram1(*this, "scrollram1"),
+		m_scrollram2(*this, "scrollram2"),
+		m_gfxdecode(*this, "gfxdecode"),
+		m_videoram(*this, "videoram"),
+		m_videoram2(*this, "videoram2"),
+		m_videoram3(*this, "videoram3"),
+		m_soundlatch(*this, "soundlatch")
 	{ }
 
 	void raidenm(machine_config &config);
+	void init_raidenm();
 
 protected:
 	virtual void machine_start() override;
+	virtual void video_start() override;
 
 private:
 	required_device<cpu_device> m_maincpu;
+	required_device<cpu_device> m_subcpu;
+	required_device<cpu_device> m_audiocpu;
 	required_device<screen_device> m_screen;
+	required_device<palette_device> m_palette;
+	required_device<ym2203_device> m_ym1;
+	required_device<ym2203_device> m_ym2;
+	required_device<msm5205_device> m_msm;
+	required_shared_ptr<uint16_t> m_spriteram;
+	required_shared_ptr<uint16_t> m_scrollram1;
+	required_shared_ptr<uint16_t> m_scrollram2;
+	required_device<gfxdecode_device> m_gfxdecode;
+	required_shared_ptr<uint16_t> m_videoram;
+	required_shared_ptr<uint16_t> m_videoram2;
+	required_shared_ptr<uint16_t> m_videoram3;
+	required_device<generic_latch_8_device> m_soundlatch;
+
+	uint16_t pal_read16(offs_t offset, u16 mem_mask = ~0) { uint16_t data = m_palette->read16(offset); return ((data & 0xff00) >> 8) | ((data & 0x00ff) << 8); };
+	uint16_t pal_read16_ext(offs_t offset, u16 mem_mask = ~0) { uint16_t data = m_palette->read16_ext(offset); return ((data & 0xff00) >> 8) | ((data & 0x00ff) << 8);  };
+	void pal_write16(offs_t offset, u16 data, u16 mem_mask = ~0) { m_palette->write16(offset, ((data & 0xff00) >> 8) | ((data & 0x00ff) << 8), ((mem_mask & 0xff00) >> 8) | ((mem_mask & 0x00ff) << 8)); };
+	void pal_write16_ext(offs_t offset, u16 data, u16 mem_mask = ~0) { m_palette->write16_ext(offset, ((data & 0xff00) >> 8) | ((data & 0x00ff) << 8), ((mem_mask & 0xff00) >> 8) | ((mem_mask & 0x00ff) << 8)); };
 
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	void raidenm_map(address_map &map);
+	void raidenm_sub_map(address_map &map);
+
+	u8 sound_status_r();
+	void sound_command_w(u8 data);
+	void adpcm_w(u8 data);
+	void audio_map(address_map& map);
+	DECLARE_WRITE_LINE_MEMBER(adpcm_int);
+	u8 m_adpcm_data;
+
+	void unk_snd_dffx_w(offs_t offset, u8 data);
+
+	DECLARE_WRITE_LINE_MEMBER(vblank_irq);
+
+	void descramble_16x16tiles(uint8_t* src, int len);
+
+	void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+	void vram2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+	void vram3_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+
+	TILE_GET_INFO_MEMBER(get_tile_info_tilemap1);
+	TILE_GET_INFO_MEMBER(get_tile_info_tilemap2);
+	TILE_GET_INFO_MEMBER(get_tile_info_tilemap3);
+
+	tilemap_t *m_bg_tilemap;
+	tilemap_t *m_bg_tilemap2;
+	tilemap_t *m_bg_tilemap3;
 };
 
 
 void raiden_ms_state::raidenm_map(address_map &map)
 {
+	map(0x00000, 0x06fff).ram();
+	map(0x07000, 0x07fff).ram();
+	map(0x0a000, 0x0afff).ram().share("shared_ram");
+
+	map(0x0b000, 0x0b001).portr("P1");
+	map(0x0b002, 0x0b003).portr("P2");
+	map(0x0b004, 0x0b005).portr("P3");
+	map(0x0b006, 0x0b007).nopw();
+	map(0x0b008, 0x0b009).rw(FUNC(raiden_ms_state::sound_status_r), FUNC(raiden_ms_state::sound_command_w)).umask16(0xff00);
+
+
+	map(0x0c000, 0x0cfff).ram().w(FUNC(raiden_ms_state::vram_w)).share("videoram");
+	map(0x0d800, 0x0dfff).ram().share("spriteram");
+
+	map(0x0f100, 0x0f103).ram().share("scrollram1");
+	map(0x0f900, 0x0f903).ram().share("scrollram2");
+
 	map(0xa0000, 0xfffff).rom();
 }
 
+void raiden_ms_state::raidenm_sub_map(address_map &map)
+{
+	map(0x00000, 0x01fff).ram();
+	map(0x02000, 0x027ff).ram().w(FUNC(raiden_ms_state::vram2_w)).share("videoram2");
+	map(0x02800, 0x02fff).ram().w(FUNC(raiden_ms_state::vram3_w)).share("videoram3");
+	map(0x03000, 0x033ff).ram().rw(FUNC(raiden_ms_state::pal_read16), FUNC(raiden_ms_state::pal_write16)).share("palette");
+	map(0x03400, 0x037ff).ram().rw(FUNC(raiden_ms_state::pal_read16_ext), FUNC(raiden_ms_state::pal_write16_ext)).share("palette_ext");
+	map(0x03800, 0x03fff).ram();
+
+	map(0x04000, 0x04fff).ram().share("shared_ram");
+
+	map(0x07ffe, 0x07fff).ram();
+
+	map(0x08000, 0x08001).nopw();
+	map(0x0a000, 0x0a001).nopw();
+	map(0x0e800, 0x0e801).nopw();
+
+	map(0xc0000, 0xfffff).rom();
+}
+
+
+u8 raiden_ms_state::sound_status_r()
+{
+	return 0;
+}
+
+void raiden_ms_state::sound_command_w(u8 data)
+{
+	m_soundlatch->write(data & 0xff);
+}
+
+
+void raiden_ms_state::adpcm_w(u8 data)
+{
+//  membank("sound_bank")->set_entry(((data & 0x10) >> 4) ^ 1);
+	m_msm->reset_w(BIT(data, 4));
+
+	m_adpcm_data = data & 0xf;
+	//m_msm->data_w(data & 0xf);
+//  m_msm->vclk_w(BIT(data, 7));
+	//m_msm->vclk_w(1);
+	//m_msm->vclk_w(0);
+}
+
+void raiden_ms_state::unk_snd_dffx_w(offs_t offset, u8 data)
+{
+
+}
+
+void raiden_ms_state::audio_map(address_map &map)
+{
+	map(0x0000, 0x7fff).rom();
+	map(0x8000, 0x8000).w(FUNC(raiden_ms_state::adpcm_w));
+	map(0x8000, 0xbfff).bankr("sound_bank");
+	map(0xc000, 0xc7ff).ram();
+	map(0xd000, 0xd7ff).ram();
+	// area 0xdff0-5 is never ever readback, applying a RAM mirror causes sound to go significantly worse,
+	// what they are even for?  (offset select bankswitch rather than data select?)
+	map(0xdff0, 0xdfff).r(m_soundlatch, FUNC(generic_latch_8_device::read)).w(FUNC(raiden_ms_state::unk_snd_dffx_w));
+	map(0xe000, 0xe001).w(m_ym1, FUNC(ym2203_device::write));
+	map(0xe002, 0xe003).w(m_ym2, FUNC(ym2203_device::write));
+	map(0xe008, 0xe009).r(m_ym1, FUNC(ym2203_device::read));
+	map(0xe00a, 0xe00b).r(m_ym2, FUNC(ym2203_device::read));
+}
+
+WRITE_LINE_MEMBER(raiden_ms_state::adpcm_int)
+{
+	m_msm->data_w(m_adpcm_data);
+	m_audiocpu->set_input_line(0, HOLD_LINE);
+}
+
 
 void raiden_ms_state::machine_start()
 {
+	membank("sound_bank")->configure_entries(0, 2, memregion("audiocpu")->base() + 0x8000, 0x4000);
+}
+
+
+void raiden_ms_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	COMBINE_DATA(&m_videoram[offset]);
+	m_bg_tilemap->mark_tile_dirty(offset);
+}
+
+void raiden_ms_state::vram2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	COMBINE_DATA(&m_videoram2[offset]);
+	m_bg_tilemap2->mark_tile_dirty(offset);
+}
+
+void raiden_ms_state::vram3_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	COMBINE_DATA(&m_videoram3[offset]);
+	m_bg_tilemap3->mark_tile_dirty(offset);
+}
+
+TILE_GET_INFO_MEMBER(raiden_ms_state::get_tile_info_tilemap1)
+{
+	int tiledata = m_videoram[tile_index];
+	int tile = (tiledata & 0xff) | ((tiledata >> 6) & 0x300);
+	int color = (tiledata >> 8) & 0x0f;
+
+	tileinfo.set(3, tile, color, 0);
 }
 
+TILE_GET_INFO_MEMBER(raiden_ms_state::get_tile_info_tilemap2)
+{
+	int tile = m_videoram2[tile_index];
+	tileinfo.set(1, tile & 0xfff, tile >> 12, 0);
+}
+
+TILE_GET_INFO_MEMBER(raiden_ms_state::get_tile_info_tilemap3)
+{
+	int tile = m_videoram3[tile_index];
+	tileinfo.set(2, tile & 0xfff, tile >> 12, 0);
+}
+
+
+void raiden_ms_state::video_start()
+{
+	m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(raiden_ms_state::get_tile_info_tilemap1)), TILEMAP_SCAN_ROWS, 8, 8, 32, 32);
+	m_bg_tilemap->set_transparent_pen(15);
+
+	m_bg_tilemap2 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(raiden_ms_state::get_tile_info_tilemap2)), TILEMAP_SCAN_COLS, 16, 16, 32, 32);
+	//m_bg_tilemap2->set_transparent_pen(15);
+
+	m_bg_tilemap3 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(raiden_ms_state::get_tile_info_tilemap3)), TILEMAP_SCAN_COLS, 16, 16, 32, 32);
+	m_bg_tilemap3->set_transparent_pen(15);
+
+}
 
 uint32_t raiden_ms_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
+	bitmap.fill(0, cliprect);
+
+	m_bg_tilemap3->set_scrollx(0, 64 + (((m_scrollram1[0] & 0xff00) >> 8) | ((m_scrollram1[0] & 0x00ff) << 8)));
+	m_bg_tilemap3->set_scrolly(0, 17 + (((m_scrollram1[1] & 0xff00) >> 8) | ((m_scrollram1[1] & 0x00ff) << 8)));
+
+	m_bg_tilemap2->set_scrollx(0, 64 + (((m_scrollram2[0] & 0xff00) >> 8) | ((m_scrollram2[0] & 0x00ff) << 8)));
+	m_bg_tilemap2->set_scrolly(0, 17 + (((m_scrollram2[1] & 0xff00) >> 8) | ((m_scrollram2[1] & 0x00ff) << 8)));
+
+	m_bg_tilemap2->draw(screen, bitmap, cliprect, 0, 0);
+	m_bg_tilemap3->draw(screen, bitmap, cliprect, 0, 0);
+
+
+	// TODO, convert to device, share between Modualar System games
+	const int NUM_SPRITES = 0x200;
+	const int X_EXTRA_OFFSET = 256-16;
+	const int Y_EXTRA_OFFSET = 30;
+
+	for (int i = NUM_SPRITES - 2; i >= 0; i -= 2)
+	{
+		gfx_element* gfx = m_gfxdecode->gfx(0);
+
+		uint16_t attr0 = m_spriteram[i + 0];
+		uint16_t attr1 = m_spriteram[i + 1];
+
+		uint16_t attr2 = m_spriteram[i + NUM_SPRITES];
+		//uint16_t attr3 = m_spriteram[i + NUM_SPRITES + 1]; // unused?
+
+		int ypos = attr0 & 0x00ff;
+		int xpos = (attr1 & 0xff00) >> 8;
+		xpos |= (attr2 & 0x8000) ? 0x100 : 0x000;
+
+		ypos = (0xff - ypos);
+
+		int tile = (attr0 & 0xff00) >> 8;
+		tile |= (attr1 & 0x003f) << 8;
+
+		int flipy = (attr2 & 0x4000);
+		int flipx = (attr2 & 0x2000);
+
+		gfx->transpen(bitmap, cliprect, tile, (attr2 & 0x0f00) >> 8, flipx, flipy, xpos - 16 - X_EXTRA_OFFSET, ypos - Y_EXTRA_OFFSET, 15);
+	}
+
+	m_bg_tilemap->set_scrolly(0, 16);
+
+	m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
+
 	return 0;
 }
 
 static INPUT_PORTS_START( raidenm )
+	PORT_START("P1")
+	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
+	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 )
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 )
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
+	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2)
+	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2)
+	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2)
+	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
+	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
+	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_START2 )
+
+	PORT_START("P2")
+	PORT_DIPNAME( 0x0001, 0x0001, "Coin Mode" ) PORT_DIPLOCATION("SW1:1")
+	PORT_DIPSETTING(      0x0001, "A" )
+	PORT_DIPSETTING(      0x0000, "B" )
+	/* Coin Mode A */
+	PORT_DIPNAME( 0x001e, 0x001e, DEF_STR( Coinage ) ) PORT_CONDITION("P2", 0x0001, EQUALS, 0x0001) PORT_DIPLOCATION("SW1:2,3,4,5")
+	PORT_DIPSETTING(      0x0014, DEF_STR( 6C_1C ) )
+	PORT_DIPSETTING(      0x0016, DEF_STR( 5C_1C ) )
+	PORT_DIPSETTING(      0x0018, DEF_STR( 4C_1C ) )
+	PORT_DIPSETTING(      0x001a, DEF_STR( 3C_1C ) )
+	PORT_DIPSETTING(      0x0002, DEF_STR( 8C_3C ) )
+	PORT_DIPSETTING(      0x001c, DEF_STR( 2C_1C ) )
+	PORT_DIPSETTING(      0x0004, DEF_STR( 5C_3C ) )
+	PORT_DIPSETTING(      0x0006, DEF_STR( 3C_2C ) )
+	PORT_DIPSETTING(      0x001e, DEF_STR( 1C_1C ) )
+	PORT_DIPSETTING(      0x0008, DEF_STR( 2C_3C ) )
+	PORT_DIPSETTING(      0x0012, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING(      0x0010, DEF_STR( 1C_3C ) )
+	PORT_DIPSETTING(      0x000e, DEF_STR( 1C_4C ) )
+	PORT_DIPSETTING(      0x000c, DEF_STR( 1C_5C ) )
+	PORT_DIPSETTING(      0x000a, DEF_STR( 1C_6C ) )
+	PORT_DIPSETTING(      0x0000, DEF_STR( Free_Play ) )
+	/* Coin Mode B */
+	PORT_DIPNAME( 0x0006, 0x0006, DEF_STR( Coin_A ) ) PORT_CONDITION("P2", 0x0001, NOTEQUALS, 0x0001) PORT_DIPLOCATION("SW1:2,3")
+	PORT_DIPSETTING(      0x0000, "5C/1C or Free if Coin B too" )
+	PORT_DIPSETTING(      0x0002, DEF_STR( 3C_1C ) )
+	PORT_DIPSETTING(      0x0004, DEF_STR( 2C_1C ) )
+	PORT_DIPSETTING(      0x0006, DEF_STR( 1C_1C ) )
+	PORT_DIPNAME( 0x0018, 0x0018, DEF_STR( Coin_B ) ) PORT_CONDITION("P2", 0x0001, NOTEQUALS, 0x0001) PORT_DIPLOCATION("SW1:4,5")
+	PORT_DIPSETTING(      0x0018, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING(      0x0010, DEF_STR( 1C_3C ) )
+	PORT_DIPSETTING(      0x0008, DEF_STR( 1C_5C ) )
+	PORT_DIPSETTING(      0x0000, "1C/6C or Free if Coin A too" )
+
+	PORT_DIPNAME( 0x0020, 0x0020, "Credits to Start" ) PORT_DIPLOCATION("SW1:6")
+	PORT_DIPSETTING(      0x0020, "1" )
+	PORT_DIPSETTING(      0x0000, "2" )
+	PORT_DIPUNUSED_DIPLOC( 0x0040, 0x0040, "SW1:7")
+	PORT_DIPNAME( 0x0080, 0x0080, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:8")
+	PORT_DIPSETTING(      0x0080, DEF_STR( Off ) )
+	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
+	PORT_DIPNAME( 0x0300, 0x0300, DEF_STR( Lives ) ) PORT_DIPLOCATION("SW2:1,2")
+	PORT_DIPSETTING(      0x0200, "1" )
+	PORT_DIPSETTING(      0x0100, "2" )
+	PORT_DIPSETTING(      0x0300, "3" )
+	PORT_DIPSETTING(      0x0000, "5" )
+	PORT_DIPNAME( 0x0c00, 0x0c00, DEF_STR( Bonus_Life ) ) PORT_DIPLOCATION("SW2:3,4")
+	PORT_DIPSETTING(      0x0800, "80000 300000" )
+	PORT_DIPSETTING(      0x0c00, "150000 400000" )
+	PORT_DIPSETTING(      0x0400, "300000 1000000" )
+	PORT_DIPSETTING(      0x0000, "1000000 5000000" )
+	PORT_DIPNAME( 0x3000, 0x3000, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:5,6")
+	PORT_DIPSETTING(      0x2000, DEF_STR( Easy ) )
+	PORT_DIPSETTING(      0x3000, DEF_STR( Normal ) )
+	PORT_DIPSETTING(      0x1000, DEF_STR( Hard ) )
+	PORT_DIPSETTING(      0x0000, DEF_STR( Very_Hard ) )
+	PORT_DIPNAME( 0x4000, 0x4000, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:7")
+	PORT_DIPSETTING(      0x0000, DEF_STR( No ) )
+	PORT_DIPSETTING(      0x4000, DEF_STR( Yes ) )
+	PORT_DIPNAME( 0x8000, 0x8000, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("SW2:8")
+	PORT_DIPSETTING(      0x0000, DEF_STR( Off ) )
+	PORT_DIPSETTING(      0x8000, DEF_STR( On ) )
+
+	PORT_START("P3")
+	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN1 )
+	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_COIN2 )
+	PORT_BIT( 0xfc00, IP_ACTIVE_LOW, IPT_UNUSED )
+
+	PORT_START("P4")
+	PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED )
 INPUT_PORTS_END
 
+static const gfx_layout tiles16x16x4_layout =
+{
+	16,16,
+	RGN_FRAC(1,1),
+	4,
+	{ 0,8,16,24 },
+	{ 0,1,2,3,4,5,6,7, 512,513,514,515,516,517,518,519 },
+	{ STEP16(0,32) },
+	16 * 16 * 4
+};
+
+
+static const gfx_layout tiles8x8x4_layout =
+{
+	8,8,
+	RGN_FRAC(1,1),
+	4,
+	{ 0,8,16,24 },
+	{ 0,1,2,3,4,5,6,7 },
+	{ STEP8(0,32) },
+	16 * 16
+};
+
+
 static GFXDECODE_START( gfx_raiden_ms )
+	GFXDECODE_ENTRY( "sprites", 0, tiles16x16x4_layout, 0x200, 16 )
+
+	GFXDECODE_ENTRY( "gfx1", 0, tiles16x16x4_layout, 0x300, 16 )
+	GFXDECODE_ENTRY( "gfx2", 0, tiles16x16x4_layout, 0x100, 16 )
+	GFXDECODE_ENTRY( "gfx3", 0, tiles8x8x4_layout, 0x000, 16 )
 GFXDECODE_END
 
+WRITE_LINE_MEMBER(raiden_ms_state::vblank_irq)
+{
+	if (state)
+	{
+		m_maincpu->set_input_line_and_vector(0, HOLD_LINE, 0xc8/4); // V30
+		m_subcpu->set_input_line_and_vector(0, HOLD_LINE, 0xc8/4); // V30
+	}
+}
+
+
 void raiden_ms_state::raidenm(machine_config &config)
 {
 	/* basic machine hardware */
 	V30(config, m_maincpu, 20_MHz_XTAL / 2); // divisor unknown
 	m_maincpu->set_addrmap(AS_PROGRAM, &raiden_ms_state::raidenm_map);
 
-	V30(config, "subcpu", 20_MHz_XTAL / 2).set_disable(); // divisor unknown
+	V30(config, m_subcpu, 20_MHz_XTAL / 2); // divisor unknown
+	m_subcpu->set_addrmap(AS_PROGRAM, &raiden_ms_state::raidenm_sub_map);
 
-	Z80(config, "audiocpu", 24_MHz_XTAL / 8).set_disable(); // divisor unknown, no XTAL on the PCB, might also use the 20 MHz one
+	Z80(config, m_audiocpu, XTAL(4'000'000));
+	m_audiocpu->set_addrmap(AS_PROGRAM, &raiden_ms_state::audio_map);
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER); // all wrong
@@ -97,23 +652,59 @@
 	m_screen->set_visarea(0, 256-1, 0, 256-32-1);
 	m_screen->set_screen_update(FUNC(raiden_ms_state::screen_update));
 	m_screen->set_palette("palette");
+	m_screen->screen_vblank().set(FUNC(raiden_ms_state::vblank_irq));
 
-	PALETTE(config, "palette").set_format(palette_device::xBRG_444, 1024);
+	PALETTE(config, m_palette).set_format(palette_device::xBGR_444, 0x400);
 
 	GFXDECODE(config, "gfxdecode", "palette", gfx_raiden_ms);
 
+	GENERIC_LATCH_8(config, m_soundlatch);
+
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
+	YM2203(config, m_ym1, XTAL(4'000'000)/4); // unknown clock
+	m_ym1->add_route(0, "mono", 0.15);
+	m_ym1->add_route(1, "mono", 0.15);
+	m_ym1->add_route(2, "mono", 0.15);
+	m_ym1->add_route(3, "mono", 0.10);
+
+	YM2203(config, m_ym2, XTAL(4'000'000)/4); // unknown clock
+	m_ym2->add_route(0, "mono", 0.15);
+	m_ym2->add_route(1, "mono", 0.15);
+	m_ym2->add_route(2, "mono", 0.15);
+	m_ym2->add_route(3, "mono", 0.10);
+
+	MSM5205(config, m_msm, XTAL(384'000)); // unknown clock
+	m_msm->vck_legacy_callback().set(FUNC(raiden_ms_state::adpcm_int));
+	m_msm->set_prescaler_selector(msm5205_device::S48_4B); // unverified
+	m_msm->add_route(ALL_OUTPUTS, "mono", 0.25);
 
-	GENERIC_LATCH_8(config, "soundlatch");
+}
 
-	YM2203(config, "ym1", 24_MHz_XTAL / 8).add_route(ALL_OUTPUTS, "mono", 0.15); // divisor unknown, no XTAL on the PCB, might also use the 20 MHz one
+// reorganize graphics into something we can decode with a single pass
+void raiden_ms_state::descramble_16x16tiles(uint8_t* src, int len)
+{
+	std::vector<uint8_t> buffer(len);
+	{
+		for (int i = 0; i < len; i++)
+		{
+			int j = bitswap<20>(i, 19,18,17,16,15,12,11,10,9,8,7,6,5,14,13,4,3,2,1,0);
+			buffer[j] = src[i];
+		}
 
-	YM2203(config, "ym2", 24_MHz_XTAL / 8).add_route(ALL_OUTPUTS, "mono", 0.15); // divisor unknown, no XTAL on the PCB, might also use the 20 MHz one
+		std::copy(buffer.begin(), buffer.end(), &src[0]);
+	}
+}
 
-	MSM5205(config, "msm", 24_MHz_XTAL / 8).add_route(ALL_OUTPUTS, "mono", 0.15); // divisor unknown, no XTAL on the PCB, might also use the 20 MHz one
+void raiden_ms_state::init_raidenm()
+{
+	descramble_16x16tiles(memregion("gfx1")->base(), memregion("gfx1")->bytes());
+	descramble_16x16tiles(memregion("gfx2")->base(), memregion("gfx2")->bytes());
+	// gfx3 is 8x8 tiles
 }
 
+
+
 ROM_START( raidenm )
 	ROM_REGION( 0x100000, "maincpu", 0 ) // on red board
 	ROM_LOAD16_BYTE( "msraid_6-1-8086-1_rd604.u7",   0x0a0000, 0x10000, CRC(a4b12785) SHA1(446314e82ce01315cb3e3d1f323eaa2ad6fb48dd) )
@@ -122,8 +713,8 @@
 	ROM_LOAD16_BYTE( "msraid_6-1-8086-1_rd601b.u6",  0x0c0001, 0x20000, CRC(bf6245e1) SHA1(8eccd42f1eef012a5c937d77d2f877de14dcf39c) )
 
 	ROM_REGION( 0x100000, "subcpu", 0 ) // on red board
-	ROM_LOAD16_BYTE( "msraid_6-1-8086-1_rd606b.u19", 0x0c0000, 0x20000, CRC(58eac0b6) SHA1(618813c7593d13271d2826739f24e08dda400b0d) )
-	ROM_LOAD16_BYTE( "msraid_6-1-8086-1_rd605b.u18", 0x0c0001, 0x20000, CRC(251fef93) SHA1(818095a77cb94fd4acc9eb26954615ee93e8432c) )
+	ROM_LOAD16_BYTE( "msraid_6-1-8086-1_rd606b.u19", 0x0c0001, 0x20000, CRC(58eac0b6) SHA1(618813c7593d13271d2826739f24e08dda400b0d) )
+	ROM_LOAD16_BYTE( "msraid_6-1-8086-1_rd605b.u18", 0x0c0000, 0x20000, CRC(251fef93) SHA1(818095a77cb94fd4acc9eb26954615ee93e8432c) )
 
 	ROM_REGION( 0x10000, "audiocpu", 0 ) // on MOD 1/5 board
 	ROM_LOAD( "msraid_1-5_rd101.ic12",  0x00000, 0x10000, CRC(2b76e371) SHA1(4c9732950f576e498d02fde485ba92fb293d5594) )
@@ -131,29 +722,29 @@
 	// dumper's note: ROMs [rd4b1, rd4b2, rb4b3, rd4b4] and [rd4a1, rd4a2, rb4a3, rd4a4] have a strange setup
 	// with pins 32, 31 and 31 soldered together and pin 2 connected between all four chips, while the sockets are for 28 pin chips
 	// (with 27C512 silkscreened on the PCB behind the chips)
-	ROM_REGION( 0x80000, "gfx1", 0 ) // on one of the MOD 4/3 boards
-	ROM_LOAD( "msraid_4-3-1_rd4b1.ic17",  0x00000, 0x20000, CRC(ff35b830) SHA1(fb552b2aa50aed12c3adb6ef9032a438adf6f37f) )
-	ROM_LOAD( "msraid_4-3-1_rd4b2.ic16",  0x20000, 0x20000, CRC(da0b2fca) SHA1(4ffe177587759ea03e73bcc5c36bedc869653ce5) )
-	ROM_LOAD( "msraid_4-3-1_rd4b3.ic15",  0x40000, 0x20000, CRC(00e5953f) SHA1(488ac889a587bf4108be424faa9123abe73b5246) )
-	ROM_LOAD( "msraid_4-3-1_rd4b4.ic14",  0x60000, 0x20000, CRC(932f8407) SHA1(0c7a0b18bbc3ac1f30bdb0ba4466c1e253130305) )
-
-	ROM_REGION( 0x80000, "gfx2", 0 ) // on another MOD 4/3 board
-	ROM_LOAD( "msraid_4-3-2_rd4a1.ic17",  0x00000, 0x20000, CRC(32892554) SHA1(8136626bf7073cdf19a8a38d19f6d0c52405df16) )
-	ROM_LOAD( "msraid_4-3-2_rd4a2.ic16",  0x20000, 0x20000, CRC(cb325246) SHA1(f0a7bf8b1b5145541af78eba0375392a3030e2d9) )
-	ROM_LOAD( "msraid_4-3-2_rd4a3.ic15",  0x40000, 0x20000, CRC(7554acef) SHA1(ec418ef2246c889d0e308925e11b1d3328bd83f9) )
-	ROM_LOAD( "msraid_4-3-2_rd4a4.ic14",  0x60000, 0x20000, CRC(1e1537a5) SHA1(3f17a85c185dd8be7f7b3a5adb28d508f9f059a5) )
-
-	ROM_REGION( 0x20000, "gfx3", 0 ) // on a third MOD 4/3 board, all 1st and 2nd half identical
-	ROM_LOAD( "msraid_4-3-3_rd404.ic17",  0x00000, 0x08000, CRC(caec39f5) SHA1(c61bd1f02515c6597d276dfcb21ed0969b556b8b) )
-	ROM_LOAD( "msraid_4-3-3_rd403.ic16",  0x08000, 0x08000, CRC(0e817530) SHA1(efbc05d31ab38d0213387f4e61977f5203e19ace) )
-	ROM_LOAD( "msraid_4-3-3_rd402.ic15",  0x10000, 0x08000, CRC(55dd887b) SHA1(efa687afe0b19fc741626b8fe5cd6ab541874396) )
-	ROM_LOAD( "msraid_4-3-3_rd401.ic14",  0x18000, 0x08000, CRC(da82ab5d) SHA1(462db31a3cc1494fdc163d5abdf6d74a182a1421) )
-
-	ROM_REGION( 0x80000, "gfx4", 0 ) // on MOD 51/3 board
-	ROM_LOAD( "msraid_51-3_rd501.ic43",   0x00000, 0x20000, CRC(fcd1fc21) SHA1(465036348f19dd3ff999c12e6591b172a7fb621e) )
-	ROM_LOAD( "msraid_51-3_rd502.ic42",   0x20000, 0x20000, CRC(faba2544) SHA1(1d32b370f43bf6f7cb3bbe052775e52403a7ccb6) )
-	ROM_LOAD( "msraid_51-3_rd503.ic41",   0x40000, 0x20000, CRC(ae4001e9) SHA1(5f21a042cad1807d2ef5e7f4f2cfd86cadc0503b) )
-	ROM_LOAD( "msraid_51-3_rd504.ic40",   0x60000, 0x20000, CRC(0452eb10) SHA1(3b998da404bd7133d12aadcadd57ee21a0cfc226) )
+	ROM_REGION( 0x80000, "gfx1", ROMREGION_INVERT ) // on one of the MOD 4/3 boards
+	ROM_LOAD32_BYTE( "msraid_4-3-1_rd4b1.ic17",  0x00003, 0x20000, CRC(ff35b830) SHA1(fb552b2aa50aed12c3adb6ef9032a438adf6f37f) )
+	ROM_LOAD32_BYTE( "msraid_4-3-1_rd4b2.ic16",  0x00002, 0x20000, CRC(da0b2fca) SHA1(4ffe177587759ea03e73bcc5c36bedc869653ce5) )
+	ROM_LOAD32_BYTE( "msraid_4-3-1_rd4b3.ic15",  0x00001, 0x20000, CRC(00e5953f) SHA1(488ac889a587bf4108be424faa9123abe73b5246) )
+	ROM_LOAD32_BYTE( "msraid_4-3-1_rd4b4.ic14",  0x00000, 0x20000, CRC(932f8407) SHA1(0c7a0b18bbc3ac1f30bdb0ba4466c1e253130305) )
+
+	ROM_REGION( 0x80000, "gfx2", ROMREGION_INVERT ) // on another MOD 4/3 board
+	ROM_LOAD32_BYTE( "msraid_4-3-2_rd4a1.ic17",  0x00003, 0x20000, CRC(32892554) SHA1(8136626bf7073cdf19a8a38d19f6d0c52405df16) )
+	ROM_LOAD32_BYTE( "msraid_4-3-2_rd4a2.ic16",  0x00002, 0x20000, CRC(cb325246) SHA1(f0a7bf8b1b5145541af78eba0375392a3030e2d9) )
+	ROM_LOAD32_BYTE( "msraid_4-3-2_rd4a3.ic15",  0x00001, 0x20000, CRC(7554acef) SHA1(ec418ef2246c889d0e308925e11b1d3328bd83f9) )
+	ROM_LOAD32_BYTE( "msraid_4-3-2_rd4a4.ic14",  0x00000, 0x20000, CRC(1e1537a5) SHA1(3f17a85c185dd8be7f7b3a5adb28d508f9f059a5) )
+
+	ROM_REGION( 0x20000, "gfx3", ROMREGION_INVERT ) // on a third MOD 4/3 board, all 1st and 2nd half identical
+	ROM_LOAD32_BYTE( "msraid_4-3-3_rd404.ic17",  0x00000, 0x08000, CRC(caec39f5) SHA1(c61bd1f02515c6597d276dfcb21ed0969b556b8b) )
+	ROM_LOAD32_BYTE( "msraid_4-3-3_rd403.ic16",  0x00001, 0x08000, CRC(0e817530) SHA1(efbc05d31ab38d0213387f4e61977f5203e19ace) )
+	ROM_LOAD32_BYTE( "msraid_4-3-3_rd402.ic15",  0x00002, 0x08000, CRC(55dd887b) SHA1(efa687afe0b19fc741626b8fe5cd6ab541874396) )
+	ROM_LOAD32_BYTE( "msraid_4-3-3_rd401.ic14",  0x00003, 0x08000, CRC(da82ab5d) SHA1(462db31a3cc1494fdc163d5abdf6d74a182a1421) )
+
+	ROM_REGION( 0x80000, "sprites", ROMREGION_INVERT ) // on MOD 51/3 board
+	ROM_LOAD32_BYTE( "msraid_51-3_rd501.ic43",   0x00003, 0x20000, CRC(fcd1fc21) SHA1(465036348f19dd3ff999c12e6591b172a7fb621e) )
+	ROM_LOAD32_BYTE( "msraid_51-3_rd502.ic42",   0x00002, 0x20000, CRC(faba2544) SHA1(1d32b370f43bf6f7cb3bbe052775e52403a7ccb6) )
+	ROM_LOAD32_BYTE( "msraid_51-3_rd503.ic41",   0x00001, 0x20000, CRC(ae4001e9) SHA1(5f21a042cad1807d2ef5e7f4f2cfd86cadc0503b) )
+	ROM_LOAD32_BYTE( "msraid_51-3_rd504.ic40",   0x00000, 0x20000, CRC(0452eb10) SHA1(3b998da404bd7133d12aadcadd57ee21a0cfc226) )
 
 	ROM_REGION( 0x0700, "proms", 0 )    /* PROMs (function unknown) */
 	ROM_LOAD( "msraid_1-5_110_82s123.ic20",      0x0000, 0x0020, CRC(e26e680a) SHA1(9bbe30e98e952a6113c64e1171330153ddf22ce7) )
@@ -172,4 +763,4 @@
 	ROM_LOAD( "msraid_6-1-8086-1_645d_gal16v8.u27", 0x000, 0x117, NO_DUMP )
 ROM_END
 
-GAME( 199?, raidenm,  raiden,  raidenm,  raidenm,  raiden_ms_state, empty_init, ROT0, "bootleg (Gaelco / Ervisa)", "Raiden (Modular System)", MACHINE_IS_SKELETON )
+GAME( 1990, raidenm,  raiden,  raidenm,  raidenm,  raiden_ms_state, init_raidenm, ROT270, "bootleg (Gaelco / Ervisa)", "Raiden (Modular System)", MACHINE_NOT_WORKING )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/rc702.cpp mame-0.224+dfsg.1/src/mame/drivers/rc702.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/rc702.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/rc702.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -52,6 +52,7 @@
 		, m_maincpu(*this, "maincpu")
 		, m_rom(*this, "maincpu")
 		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
 		, m_p_chargen(*this, "chargen")
 		, m_ctc1(*this, "ctc1")
 		, m_pio(*this, "pio")
@@ -92,11 +93,11 @@
 	uint16_t m_beepcnt;
 	bool m_eop;
 	bool m_dack1;
-	bool m_rom_in_map;
 	required_device<palette_device> m_palette;
 	required_device<z80_device> m_maincpu;
 	required_region_ptr<u8> m_rom;
 	required_shared_ptr<u8> m_ram;
+	required_memory_bank    m_bank1;
 	required_region_ptr<u8> m_p_chargen;
 	required_device<z80ctc_device> m_ctc1;
 	required_device<z80pio_device> m_pio;
@@ -110,8 +111,8 @@
 
 void rc702_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x07ff).ram().share("mainram").lr8(NAME([this] (offs_t offset) { if(m_rom_in_map) return m_rom[offset]; else return m_ram[offset]; }));
-	map(0x0800, 0xffff).ram();
+	map(0x0000, 0xffff).ram().share("mainram");
+	map(0x0000, 0x07ff).bankr("bank1");
 }
 
 void rc702_state::io_map(address_map &map)
@@ -124,7 +125,7 @@
 	map(0x0c, 0x0f).rw(m_ctc1, FUNC(z80ctc_device::read), FUNC(z80ctc_device::write));
 	map(0x10, 0x13).rw(m_pio, FUNC(z80pio_device::read), FUNC(z80pio_device::write));
 	map(0x14, 0x17).portr("DSW").w(FUNC(rc702_state::port14_w)); // motors
-	map(0x18, 0x1b).lw8(NAME([this] (u8 data) { m_rom_in_map = false; })); // replace roms with ram
+	map(0x18, 0x1b).lw8(NAME([this] (u8 data) { m_bank1->set_entry(0); })); // replace roms with ram
 	map(0x1c, 0x1f).w(FUNC(rc702_state::port1c_w)); // sound
 	map(0xf0, 0xff).rw(m_dma, FUNC(am9517a_device::read), FUNC(am9517a_device::write));
 }
@@ -160,7 +161,7 @@
 
 void rc702_state::machine_reset()
 {
-	m_rom_in_map = true;
+	m_bank1->set_entry(1);
 	m_beepcnt = 0xffff;
 	m_dack1 = 0;
 	m_eop = 0;
@@ -172,13 +173,14 @@
 
 void rc702_state::machine_start()
 {
+	m_bank1->configure_entry(0, m_ram);
+	m_bank1->configure_entry(1, m_rom);
 	save_item(NAME(m_q_state));
 	save_item(NAME(m_qbar_state));
 	save_item(NAME(m_drq_state));
 	save_item(NAME(m_beepcnt));
 	save_item(NAME(m_eop));
 	save_item(NAME(m_dack1));
-	save_item(NAME(m_rom_in_map));
 }
 
 WRITE_LINE_MEMBER( rc702_state::q_w )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/regence.cpp mame-0.224+dfsg.1/src/mame/drivers/regence.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/regence.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/regence.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -151,7 +151,7 @@
 static INPUT_PORTS_START( regence )
 	PORT_START("IN.0")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_S) PORT_NAME("Changement de Position (Set Up)") // Veränderung
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_T) PORT_NAME("Retour en Arrière (Take Back)") // Zug Zurück
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_T) PORT_NAME(u8"Retour en Arrière (Take Back)") // Zug Zurück
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_N) PORT_NAME("Nouvelle Partie (New Game)") // Neues Spiel (press after setup)
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD) PORT_NAME("King")
 	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD) PORT_NAME("Queen")
@@ -220,4 +220,4 @@
 ******************************************************************************/
 
 /*    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY, FULLNAME, FLAGS */
-CONS( 1982, regence, 0,      0,      regence, regence, regence_state, empty_init, "France Double R", "La Regence", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1982, regence, 0,      0,      regence, regence, regence_state, empty_init, "France Double R", u8"La Régence", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/renegade.cpp mame-0.224+dfsg.1/src/mame/drivers/renegade.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/renegade.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/renegade.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -9,55 +9,55 @@
 (c)1986 Technos Japan
 
 Nekketsu Kouha Kunio Kun (bootleg)
+Renegade (bootleg)
 
 driver by Phil Stroffolino, Carlos A. Lozano, Rob Rosenbrock
 
 to enter test mode, hold down P1+P2 and press reset
 
 NMI is used to refresh the sprites
-IRQ is used to handle coin inputs
+IRQ is used to poll the coin and service inputs
+coin counter outputs are connected directly to coin inputs (via 74LS04 inverter gates IC55, IC43)
+no coin lockout
 
 Known issues:
-- Knockdown samples farts (coming from YM3526 DAC);
-- Static ADPCM sound, end trigger not understood.
-  Most likely ends when specific data format is encountered during playback
-  cfr. jantotsu.cpp;
-- Verify irq sources;
 - Unemulated partial update bg scrolling, which should effectively add layer
   tearing at line ~12 according to the refs. Scrolling currently
   triggers at line 6 with current timings so we are quite off.
   Additionally scrolling updates every other frame so simply using partial
   updates won't cope with it;
-- None of the refs has the top 8 pixels shown but 256x232 seems unlikely.
-  Verify what it shows on real HW, should be either garbage or vblank or
-  border color;
-- Verify if coin counter is really tied to $3807;
 
-Memory Map (Preliminary):
+Non-emulation issues:  (these are confirmed accurate, present on real pcb)
+- Knockdown samples farts (coming from YM3526 DAC)
+- Static ADPCM sound
+- Active video period is 238 lines but last 7 lines are unused
+
+
+Memory Map:
 
 Working RAM
-  $24       used to mirror bankswitch state
-  $25       coin trigger state
-  $26       #credits (decimal)
-  $27 -  $28    partial credits
-  $2C -  $2D    sprite refresh trigger (used by NMI)
-  $31       live/demo (if live, player controls are read from input ports)
-  $32       indicates 2 player (alternating) game, or 1 player game
-  $33       active player
-  $37       stage number
-  $38       stage state (for stages with more than one part)
-  $40       game status flags; 0x80 indicates time over, 0x40 indicates player dead
- $220       player health
- $222 -  $223   stage timer
- $48a -  $48b   horizontal scroll buffer
- $511 -  $690   sprite RAM buffer
- $693       num pending sound commands
- $694 -  $698   sound command queue
+  $24           used to mirror bankswitch state
+  $25           coin trigger state
+  $26           #credits (decimal)
+  $27 - $28     partial credits
+  $2C - $2D     sprite refresh trigger (used by NMI)
+  $31           live/demo (if live, player controls are read from input ports)
+  $32           indicates 2 player (alternating) game, or 1 player game
+  $33           active player
+  $37           stage number
+  $38           stage state (for stages with more than one part)
+  $40           game status flags; 0x80 indicates time over, 0x40 indicates player dead
+ $220           player health
+ $222 - $223    stage timer
+ $48a - $48b    horizontal scroll buffer
+ $511 - $690    sprite RAM buffer
+ $693           num pending sound commands
+ $694 - $698    sound command queue
 
-$1002       #lives
+$1002           #lives
 $1014 - $1015   stage timer - separated digits
 $1017 - $1019   stage timer: (ticks,seconds,minutes)
-$101a       timer for palette animation
+$101a           timer for palette animation
 $1020 - $1048   high score table
 $10e5 - $10ff   68705 data buffer
 
@@ -80,33 +80,33 @@
 $3804r  receive data from 68705
 
 $3805w  bankswitch
-$3806w  watchdog?
-$3807w  coin counter
+$3806w  nmi clear
+$3807w  irq clear
 
-$3800r  'player1'
-    xx      start buttons
-      xx    fire buttons
-        xxxx    joystick state
-
-$3801r  'player2'
-    xx      coin inputs
-      xx    fire buttons
-        xxxx    joystick state
-
-$3802r  'DIP2'
-    x       unused?
-     x      vblank
-      x     0: 68705 is ready to send information
-       x    1: 68705 is ready to receive information
-        xx  3rd fire buttons for player 2,1
-          xx    difficulty
-
-$3803r 'DIP1'
-    x       screen flip
-     x      cabinet type
-      x     bonus (extra life for high score)
-       x    starting lives: 1 or 2
-        xxxx    coins per play
+$3800r  player 1 controls
+xx          start buttons
+  xx        fire buttons
+    xxxx    joystick state
+
+$3801r  player 2 controls
+xx          coin inputs
+  xx        fire buttons
+    xxxx    joystick state
+
+$3802r  dipswitch 2 + misc
+x           service input
+ x          vblank (reads state of nmi flipflop)
+  x         0: 68705 is ready to send information
+   x        1: 68705 is ready to receive information
+    xx      3rd fire buttons for player 2,1
+      xx    difficulty
+
+$3803r dipswitch 1
+x           screen flip
+ x          cabinet type
+  x         bonus (extra life for high score)
+   x        starting lives: 1 or 2
+    xxxx    coins per play
 
 ROM
 $4000 - $7fff   bankswitched ROM
@@ -128,15 +128,22 @@
 /**************************************************************************/
 /*  ADPCM sound
 **
-**  Inferred from the 6809 code and analogy with ddragon
-**  NMI at end of sample is not needed in order for
-**  playback to work, but seems to be what the code expects
+**  oki m5205 s/w selectable 4/8KHz
+**  12x speech samples of 0x2000*2 samples each (approx 2.5 seconds)
+**  4x chained 4-bit binary counters clock out the rom data (2x 74LS393, IC48/IC46, 2 counters per chip)
+**  74LS74A @ IC45 is the nmi control flipflop, nmi = Q, m5205 and counter chain shared reset = /Q
+**  6809 wr to 3000-37ff asserts nmi (ff CLR pin)
+**  6809 wr to 1800-1fff clears nmi, releases m5205/counter shared reset line (ff SET pin)
+**  6809 wr to 2000-27ff selects 1 of 3 sample roms, sets upper 2 address lines, and sets m5205 sample rate
+**  counter asserts nmi on rollover (sample playback finished) (ff CLK pin, ff D = gnd)
+**  main system reset line is ANDed (74LS08 IC11) with ff CLR pin such that nmi is asserted on system reset
 */
 
 void renegade_state::adpcm_start_w(uint8_t data)
 {
 	m_msm->reset_w(0);
 	m_adpcm_playing = true;
+	m_audiocpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE);
 }
 
 void renegade_state::adpcm_addr_w(uint8_t data)
@@ -144,36 +151,38 @@
 	// table at $CB52 in audiocpu program:
 	// 38 38 39 3A 3B 34 35 36 37 2C 2D 2E 2F
 	//
-	// bits 2-4 are active-low chip select; bit 5 is always set
-	// (chip select for an unpopulated fourth ROM?)
+	// bits 2-4 are active-low chip select
 	switch (data & 0x1c)
 	{
-		case 0x18: m_adpcm_pos = 0 * 0x8000 * 2; break;     // 110 -> ic33
-		case 0x14: m_adpcm_pos = 1 * 0x8000 * 2; break;     // 101 -> ic32
-		case 0x0c: m_adpcm_pos = 2 * 0x8000 * 2; break;     // 011 -> ic31
-		default: m_adpcm_pos = m_adpcm_end = 0; return; // doesn't happen
+		case 0x18: m_adpcm_pos = 0 * 0x8000 * 2; break;   // 110 -> ic33
+		case 0x14: m_adpcm_pos = 1 * 0x8000 * 2; break;   // 101 -> ic32
+		case 0x0c: m_adpcm_pos = 2 * 0x8000 * 2; break;   // 011 -> ic31
+		default: m_adpcm_pos = m_adpcm_end = 0; return;   // doesn't happen
 	}
 	// bits 0-1 are a13-a14
 	m_adpcm_pos |= (data & 0x03) * 0x2000 * 2;
 	// a0-a12 are driven by a binary counter; playback ends when it rolls over
 	m_adpcm_end = m_adpcm_pos + 0x2000 * 2;
+	// bit 5 selects 8 or 4 KHz m5205 sample rate (connected to the S1 pin, S2 pin is gnd)
+	m_msm->playmode_w(BIT(data, 5) ? msm5205_device::S48_4B : msm5205_device::S96_4B);
 }
 
 void renegade_state::adpcm_stop_w(uint8_t data)
 {
 	m_msm->reset_w(1);
 	m_adpcm_playing = false;
+	m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
 }
 
 WRITE_LINE_MEMBER(renegade_state::adpcm_int)
 {
-	if (!m_adpcm_playing) return;
+	if (!m_adpcm_playing || !state) return;
 
 	if (m_adpcm_pos >= m_adpcm_end)
 	{
 		m_msm->reset_w(1);
 		m_adpcm_playing = false;
-		m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
+		m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
 	}
 	else
 	{
@@ -234,9 +243,14 @@
 {
 	int scanline = param;
 
-	// vblank irq?
-	if (scanline == 240)
+	// nmi  8 lines before vsync
+	if (scanline == 265)
 		m_maincpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
+
+	// irq  16 clks per frame: once every 16 lines, but increases to 24 lines during vblank
+	// (lines 16,40,56,72,88,104,120,136,152,168,184,200,216,232,248,264)
+	if (scanline == 0x10 || (scanline > 0x20 && (scanline & 0xf) == 8))
+		m_maincpu->set_input_line(0, ASSERT_LINE);
 }
 
 void renegade_state::nmi_ack_w(uint8_t data)
@@ -246,13 +260,7 @@
 
 void renegade_state::irq_ack_w(uint8_t data)
 {
-	if (data != 0xff)
-	{
-		// guess: trigger a 1->0 transition on irq ack
-		machine().bookkeeping().coin_counter_w(0, 1);
-		machine().bookkeeping().coin_counter_w(0, 0);
-	}
-	//m_maincpu->set_input_line(0, CLEAR_LINE);
+	m_maincpu->set_input_line(0, CLEAR_LINE);
 }
 
 
@@ -287,18 +295,18 @@
 void renegade_state::renegade_sound_map(address_map &map)
 {
 	map(0x0000, 0x0fff).ram();
-	map(0x1000, 0x1000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
-	map(0x1800, 0x1800).w(FUNC(renegade_state::adpcm_start_w));
-	map(0x2000, 0x2000).w(FUNC(renegade_state::adpcm_addr_w));
-	map(0x2800, 0x2801).rw("ymsnd", FUNC(ym3526_device::read), FUNC(ym3526_device::write));
-	map(0x3000, 0x3000).w(FUNC(renegade_state::adpcm_stop_w));
-//  map(0x2000, 0x7fff) read in service mode during sound test
+	map(0x1000, 0x17ff).r(m_soundlatch, FUNC(generic_latch_8_device::read));
+	map(0x1800, 0x1fff).w(FUNC(renegade_state::adpcm_start_w));
+	map(0x2000, 0x27ff).w(FUNC(renegade_state::adpcm_addr_w));
+	map(0x2800, 0x2fff).rw("ymsnd", FUNC(ym3526_device::read), FUNC(ym3526_device::write));
+	map(0x3000, 0x37ff).w(FUNC(renegade_state::adpcm_stop_w));
+	map(0x3800, 0x7fff).nopr(); // misc reads in service mode during sound test
 	map(0x8000, 0xffff).rom();
 }
 
 INPUT_CHANGED_MEMBER(renegade_state::coin_inserted)
 {
-	m_maincpu->set_input_line(0, newval ? CLEAR_LINE : ASSERT_LINE);
+	machine().bookkeeping().coin_counter_w(param ? 1 : 0, oldval);
 }
 
 
@@ -321,7 +329,7 @@
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Left Attack")
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Jump")
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, renegade_state, coin_inserted, 0)
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED_MEMBER(DEVICE_SELF, renegade_state, coin_inserted, 0)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED_MEMBER(DEVICE_SELF, renegade_state, coin_inserted, 1)
 
 	PORT_START("DSW2")  /* DIP2 */
 	PORT_DIPNAME( 0x03, 0x03, DEF_STR( Difficulty ) )   PORT_DIPLOCATION("SW2:1,2")
@@ -333,7 +341,7 @@
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Right Attack")
 	PORT_BIT( 0x30, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_CUSTOM_MEMBER(renegade_state, mcu_status_r)
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_VBLANK("screen")
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, renegade_state, coin_inserted, 0)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE1 )
 
 	PORT_START("DSW1")  /* DIP1 */
 	PORT_DIPNAME( 0x03, 0x03, DEF_STR( Coin_A ) )       PORT_DIPLOCATION("SW1:1,2")
@@ -496,6 +504,7 @@
 	m_rombank->set_entry(0);
 	m_msm->reset_w(1);
 	m_adpcm_playing = 0;
+	m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
 }
 
 
@@ -506,14 +515,14 @@
 	m_maincpu->set_addrmap(AS_PROGRAM, &renegade_state::renegade_map);
 	TIMER(config, "scantimer").configure_scanline(FUNC(renegade_state::interrupt), "screen", 0, 1);
 
-	MC6809(config, m_audiocpu, 12000000/2); // HD68A09P
+	MC6809(config, m_audiocpu, 12000000/2); /* HD68A09P 6 MHz (measured) */
 	m_audiocpu->set_addrmap(AS_PROGRAM, &renegade_state::renegade_sound_map);    /* IRQs are caused by the main CPU */
 
-	TAITO68705_MCU(config, m_mcu, 12000000/4); // ?
+	TAITO68705_MCU(config, m_mcu, 12000000/4); /* 3 MHz (measured) */
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
-	m_screen->set_raw(12000000/2, 384, 0, 256, 272, 0, 240); // assume same as ddragon.cpp
+	m_screen->set_raw(12000000/2, 384, 0, 256, 272, 19, 257);
 	m_screen->set_screen_update(FUNC(renegade_state::screen_update));
 	m_screen->set_palette("palette");
 
@@ -526,13 +535,12 @@
 	GENERIC_LATCH_8(config, m_soundlatch);
 	m_soundlatch->data_pending_callback().set_inputline(m_audiocpu, M6809_IRQ_LINE);
 
-	ym3526_device &ymsnd(YM3526(config, "ymsnd", 12000000/4));
+	ym3526_device &ymsnd(YM3526(config, "ymsnd", 12000000/4)); /* 3 MHz (measured) */
 	ymsnd.irq_handler().set_inputline(m_audiocpu, M6809_FIRQ_LINE);
 	ymsnd.add_route(ALL_OUTPUTS, "mono", 1.0);
 
-	MSM5205(config, m_msm, 12000000/32);
-	m_msm->vck_legacy_callback().set(FUNC(renegade_state::adpcm_int));
-	m_msm->set_prescaler_selector(msm5205_device::S48_4B);  /* 8kHz */
+	MSM5205(config, m_msm, 12000000/32); /* 375 KHz (measured) */
+	m_msm->vck_callback().set(FUNC(renegade_state::adpcm_int));
 	m_msm->add_route(ALL_OUTPUTS, "mono", 1.0);
 }
 
@@ -709,7 +717,7 @@
 
 
 
-GAME( 1986, renegade,  0,        renegade,  renegade, renegade_state, empty_init, ROT0, "Technos Japan (Taito America license)", "Renegade (US)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, renegadeb, renegade, kuniokunb, renegade, renegade_state, empty_init, ROT0, "bootleg", "Renegade (US bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, kuniokun,  renegade, renegade,  renegade, renegade_state, empty_init, ROT0, "Technos Japan", "Nekketsu Kouha Kunio-kun (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-GAME( 1986, kuniokunb, renegade, kuniokunb, renegade, renegade_state, empty_init, ROT0, "bootleg", "Nekketsu Kouha Kunio-kun (Japan bootleg)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+GAME( 1986, renegade,  0,        renegade,  renegade, renegade_state, empty_init, ROT0, "Technos Japan (Taito America license)", "Renegade (US)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, renegadeb, renegade, kuniokunb, renegade, renegade_state, empty_init, ROT0, "bootleg", "Renegade (US bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, kuniokun,  renegade, renegade,  renegade, renegade_state, empty_init, ROT0, "Technos Japan", "Nekketsu Kouha Kunio-kun (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1986, kuniokunb, renegade, kuniokunb, renegade, renegade_state, empty_init, ROT0, "bootleg", "Nekketsu Kouha Kunio-kun (Japan bootleg)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/roland_s50.cpp mame-0.224+dfsg.1/src/mame/drivers/roland_s50.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/roland_s50.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/roland_s50.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -36,7 +36,6 @@
 	}
 
 	void s50(machine_config &config);
-	void s550(machine_config &config);
 
 protected:
 	virtual void machine_start() override;
@@ -44,7 +43,6 @@
 	TIMER_DEVICE_CALLBACK_MEMBER(vdp_timer);
 
 	void p2_w(u8 data);
-	void ioga_out_w(u8 data);
 	u8 floppy_status_r();
 	u8 floppy_unknown_r();
 	u16 key_r(offs_t offset);
@@ -54,9 +52,10 @@
 	void vram_map(address_map &map);
 
 private:
+	void ioga_out_w(u8 data);
+
 	void mem_map(address_map &map);
-	void s50_io_map(address_map &map);
-	void s550_io_map(address_map &map);
+	void io_map(address_map &map);
 
 protected:
 	required_device<i8x9x_device> m_maincpu;
@@ -69,6 +68,27 @@
 	optional_device<mb63h149_device> m_keyscan;
 };
 
+class roland_s550_state : public roland_s50_state
+{
+public:
+	roland_s550_state(const machine_config &mconfig, device_type type, const char *tag)
+		: roland_s50_state(mconfig, type, tag)
+		, m_lowmem(*this, "lowmem")
+	{
+	}
+
+	void s550(machine_config &config);
+
+private:
+	void sram_bank_w(u8 data);
+
+	void mem_map(address_map &map);
+	void io_map(address_map &map);
+	void lowmem_map(address_map &map);
+
+	required_device<address_map_bank_device> m_lowmem;
+};
+
 class roland_w30_state : public roland_s50_state
 {
 public:
@@ -132,6 +152,12 @@
 	m_sram->set_bank(BIT(data, 6, 2));
 }
 
+void roland_s550_state::sram_bank_w(u8 data)
+{
+	m_sram->set_bank(BIT(data, 0, 2));
+	m_lowmem->set_bank(BIT(data, 2, 3));
+}
+
 u8 roland_w30_state::psram_bank_r()
 {
 	return m_psram_bank;
@@ -178,7 +204,7 @@
 	map(0xc000, 0xffff).m(m_io, FUNC(address_map_bank_device::amap16));
 }
 
-void roland_s50_state::s50_io_map(address_map &map)
+void roland_s50_state::io_map(address_map &map)
 {
 	map(0x0000, 0x0000).w(FUNC(roland_s50_state::ioga_out_w));
 	map(0x0200, 0x0200).r(FUNC(roland_s50_state::floppy_status_r));
@@ -191,16 +217,25 @@
 	map(0x4000, 0x4fff).mirror(0x3000).rw(FUNC(roland_s50_state::key_r), FUNC(roland_s50_state::key_w));
 }
 
-void roland_s50_state::s550_io_map(address_map &map)
+void roland_s550_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x0000).w(FUNC(roland_s50_state::ioga_out_w));
-	map(0x0200, 0x0200).r(FUNC(roland_s50_state::floppy_status_r));
-	map(0x0300, 0x0300).r(FUNC(roland_s50_state::floppy_unknown_r));
+	map(0x0000, 0x1fff).m(m_lowmem, FUNC(address_map_bank_device::amap16));
+	map(0x2000, 0x3fff).rom().region("program", 0x2000);
+	map(0x4000, 0x7fff).ram().share("common");
+	map(0x8000, 0xbfff).m(m_sram, FUNC(address_map_bank_device::amap16));
+	map(0xc000, 0xffff).m(m_io, FUNC(address_map_bank_device::amap16));
+}
+
+void roland_s550_state::io_map(address_map &map)
+{
+	map(0x0200, 0x0200).r(FUNC(roland_s550_state::floppy_status_r));
+	map(0x0300, 0x0300).r(FUNC(roland_s550_state::floppy_unknown_r));
 	map(0x0800, 0x0807).rw(m_fdc, FUNC(wd1772_device::read), FUNC(wd1772_device::write)).umask16(0x00ff);
 	map(0x1000, 0x1000).r(m_vdp, FUNC(tms3556_device::vram_r));
 	map(0x1002, 0x1002).rw(m_vdp, FUNC(tms3556_device::initptr_r), FUNC(tms3556_device::vram_w));
 	map(0x1004, 0x1004).rw(m_vdp, FUNC(tms3556_device::reg_r), FUNC(tms3556_device::reg_w));
 	//map(0x1800, 0x181f).rw(m_tvf, FUNC(mb654419u_device::read), FUNC(mb654419u_device::write)).umask16(0x00ff);
+	map(0x2000, 0x2000).w(FUNC(roland_s550_state::sram_bank_w));
 	map(0x2800, 0x281f).w("outas", FUNC(bu3905_device::write)).umask16(0x00ff);
 	//map(0x3800, 0x381f).rw(m_scsic, FUNC(mb89352_device::read), FUNC(mb89352_device::write)).umask16(0x00ff);
 	//map(0x0000, 0x3fff).rw(m_wave, FUNC(rf5c16_device::read), FUNC(rf5c16_device::write)).umask16(0xff00);
@@ -240,6 +275,12 @@
 	map(0x4000, 0xffff).ram();
 }
 
+void roland_s550_state::lowmem_map(address_map &map)
+{
+	map(0x0000, 0x1fff).rom().region("program", 0);
+	map(0x2000, 0xffff).ram();
+}
+
 void roland_w30_state::psram1_map(address_map &map)
 {
 	map(0x0000, 0x1fff).rom().region("program", 0);
@@ -295,7 +336,7 @@
 	m_io->set_data_width(16);
 	m_io->set_addr_width(15);
 	m_io->set_stride(0x4000);
-	m_io->set_addrmap(0, &roland_s50_state::s50_io_map);
+	m_io->set_addrmap(0, &roland_s50_state::io_map);
 
 	MB63H149(config, m_keyscan, 24_MHz_XTAL / 2);
 	m_keyscan->int_callback().set_inputline(m_maincpu, i8x9x_device::EXTINT_LINE);
@@ -331,11 +372,19 @@
 	//m_wave->int_callback().set_inputline(m_maincpu, i8x9x_device::HSI0_LINE);
 }
 
-void roland_s50_state::s550(machine_config &config)
+void roland_s550_state::s550(machine_config &config)
 {
 	s50(config);
 
-	m_io->set_addrmap(0, &roland_s50_state::s550_io_map);
+	m_maincpu->set_addrmap(AS_PROGRAM, &roland_s550_state::mem_map);
+	m_io->set_addrmap(0, &roland_s550_state::io_map);
+
+	ADDRESS_MAP_BANK(config, m_lowmem);
+	m_lowmem->set_endianness(ENDIANNESS_LITTLE);
+	m_lowmem->set_data_width(16);
+	m_lowmem->set_addr_width(16);
+	m_lowmem->set_stride(0x2000);
+	m_lowmem->set_addrmap(0, &roland_s550_state::lowmem_map);
 
 	//UPD7537(config.device_replace(), "fipcpu", 400_kHz_XTAL);
 
@@ -478,7 +527,7 @@
 ROM_END
 #endif
 
-SYST(1987, s50,  0,   0, s50,  s50,  roland_s50_state, empty_init, "Roland", "S-50 Digital Sampling Keyboard", MACHINE_IS_SKELETON)
-SYST(1987, s550, s50, 0, s550, s550, roland_s50_state, empty_init, "Roland", "S-550 Digital Sampler", MACHINE_IS_SKELETON)
-SYST(1988, w30,  0,   0, w30,  w30,  roland_w30_state, empty_init, "Roland", "W-30 Music Workstation", MACHINE_IS_SKELETON)
+SYST(1987, s50,  0,   0, s50,  s50,  roland_s50_state,  empty_init, "Roland", "S-50 Digital Sampling Keyboard", MACHINE_IS_SKELETON)
+SYST(1987, s550, s50, 0, s550, s550, roland_s550_state, empty_init, "Roland", "S-550 Digital Sampler", MACHINE_IS_SKELETON)
+SYST(1988, w30,  0,   0, w30,  w30,  roland_w30_state,  empty_init, "Roland", "W-30 Music Workstation", MACHINE_IS_SKELETON)
 //SYST(1988, s330, w30, 0, s330, s330, roland_w30_state, empty_init, "Roland", "S-330 Digital Sampler", MACHINE_IS_SKELETON)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/royalmah.cpp mame-0.224+dfsg.1/src/mame/drivers/royalmah.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/royalmah.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/royalmah.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -123,13 +123,15 @@
 		m_audiocpu(*this, "audiocpu"),
 		m_rtc(*this, "rtc"),
 		m_soundlatch(*this, "soundlatch"),
-		m_mainbank(*this, "mainbank")
+		m_mainbank(*this, "mainbank"),
+		m_decrypted_opcodes(*this, "decrypted_opcodes")
 	{ }
 
 	void mjdiplob(machine_config &config);
 	void tahjong(machine_config &config);
 	void tontonb(machine_config &config);
 	void mjderngr(machine_config &config);
+	void mjsenka(machine_config &config);
 	void mjyarou(machine_config &config);
 	void janoh(machine_config &config);
 	void mjtensin(machine_config &config);
@@ -161,6 +163,10 @@
 	void init_mjifb();
 	void init_tontonb();
 	void init_janptr96();
+	void init_mjsenka();
+
+protected:
+	virtual void machine_start() override;
 
 private:
 	uint8_t player_1_port_r();
@@ -280,6 +286,8 @@
 	void mjderngr_iomap(address_map &map);
 	void mjdiplob_iomap(address_map &map);
 	void mjifb_map(address_map &map);
+	void mjyarou_map(address_map &map);
+	void mjsenka_opcodes_map(address_map &map);
 	void mjtensin_map(address_map &map);
 	void mjvegasa_map(address_map &map);
 	void mjyarou_iomap(address_map &map);
@@ -292,8 +300,6 @@
 	void tahjong_map(address_map &map);
 	void tontonb_iomap(address_map &map);
 
-	virtual void machine_start() override;
-
 	required_device<cpu_device> m_maincpu;
 	required_device<palette_device> m_palette;
 	required_device<ay8910_device> m_ay;
@@ -302,6 +308,7 @@
 	optional_device<msm6242_device> m_rtc;
 	optional_device<generic_latch_8_device> m_soundlatch;
 	optional_memory_bank m_mainbank;
+	optional_shared_ptr<uint8_t> m_decrypted_opcodes;
 
 	// used by most games
 	uint8_t m_input_port_select;
@@ -651,8 +658,18 @@
 	map(0x8000, 0xffff).writeonly().share("videoram");
 }
 
+void royalmah_state::mjyarou_map(address_map &map)
+{
+	map(0x0000, 0x6fff).rom().nopw();
+	map(0x7000, 0x77ff).ram().share("nvram");
+	map(0x7800, 0x9fff).rom();
+	map(0x8000, 0xffff).writeonly().share("videoram");
+}
 
-
+void royalmah_state::mjsenka_opcodes_map(address_map &map)
+{
+	map(0x0000, 0x9fff).rom().share(m_decrypted_opcodes);
+}
 
 void royalmah_state::royalmah_iomap(address_map &map)
 {
@@ -3636,9 +3653,16 @@
 void royalmah_state::mjyarou(machine_config &config)
 {
 	royalmah(config);
+	m_maincpu->set_addrmap(AS_PROGRAM, &royalmah_state::mjyarou_map);
 	m_maincpu->set_addrmap(AS_IO, &royalmah_state::mjyarou_iomap);
 }
 
+void royalmah_state::mjsenka(machine_config &config)
+{
+	mjyarou(config);
+	m_maincpu->set_addrmap(AS_OPCODES, &royalmah_state::mjsenka_opcodes_map);
+}
+
 void royalmah_state::ippatsu(machine_config &config)
 {
 	dondenmj(config);
@@ -4986,7 +5010,7 @@
 
 Modified Royal Mahjong Hardware
 
-CPU: Z80 <- wrong,they are 2 z80 CPUs -AS
+CPU: Z80
 Sound: AY-3-8910
 OSC: 18.432MHz
 Others: Battery
@@ -5013,11 +5037,8 @@
 	ROM_REGION( 0x10000, "maincpu", 0 )
 	ROM_LOAD( "3",       0x0000, 0x4000, CRC(b2d8be1f) SHA1(da75e1072d271de2dbd897a551f6c32593f6421b) )
 	ROM_LOAD( "4",       0x4000, 0x2000, CRC(e9e84999) SHA1(7b5f0edd92cf3a45e85055460e6cb00b154fd152) )
-	ROM_LOAD( "2",       0x6000, 0x2000, CRC(cdb02fc5) SHA1(5de6b15b79ea7c4246a294b17f166e53be6a4abc) )
-
-	/*encrypted z80*/
-	ROM_REGION( 0x10000, "sub", 0 )
-	ROM_LOAD( "1",       0x0000, 0x2000, CRC(83e943d1) SHA1(c4f9b5036627ccb369e7db03a743e496b149af85) )
+	ROM_LOAD( "1",       0x6000, 0x2000, CRC(83e943d1) SHA1(c4f9b5036627ccb369e7db03a743e496b149af85) )
+	ROM_LOAD( "2",       0x8000, 0x2000, CRC(cdb02fc5) SHA1(5de6b15b79ea7c4246a294b17f166e53be6a4abc) )
 
 	ROM_REGION( 0x0040, "proms", 0 )
 	ROM_LOAD( "4.8k",  0x0000, 0x0020, CRC(41bd4d69) SHA1(4d2da761b338b62b2ea151c201063a24d6e4cc97) )
@@ -5339,7 +5360,53 @@
 	membank("rambank")->configure_entries(0, 8, m_janptr96_nvram.get() + 0x1000, 0x1000);
 }
 
+void royalmah_state::init_mjsenka()
+{
+	uint8_t *rom = memregion("maincpu")->base();
+
+	for (int i = 0x0000; i < 0xa000; i++)
+		m_decrypted_opcodes[i] = rom[i];
+
+	for (int i = 0x6000; i < 0x8000; i++)
+	{
+		switch (i & 0x15)
+		{
+			case 0x00: m_decrypted_opcodes[i] ^= 0x03; break;
+			case 0x01: m_decrypted_opcodes[i] ^= 0x07; break;
+			case 0x04: m_decrypted_opcodes[i] ^= 0x01; break;
+			case 0x05: m_decrypted_opcodes[i] ^= 0x05; break;
+			case 0x10: m_decrypted_opcodes[i] ^= 0x02; break;
+			case 0x11: m_decrypted_opcodes[i] ^= 0x06; break;
+			case 0x14: m_decrypted_opcodes[i] ^= 0x00; break;
+			case 0x15: m_decrypted_opcodes[i] ^= 0x04; break;
+		}
+
+		if (i & 0x02)
+			m_decrypted_opcodes[i] ^= 0x80;
 
+		m_decrypted_opcodes[i] = bitswap<8>(m_decrypted_opcodes[i], 2, 6, 5, 4, 3, 0, 7, 1);
+	}
+
+	for (int i = 0x6000; i < 0x8000; i++)
+	{
+		switch (i & 0x0e)
+		{
+			case 0x00: rom[i] ^= 0x01; break;
+			case 0x02: rom[i] ^= 0x03; break;
+			case 0x04: rom[i] ^= 0x05; break;
+			case 0x06: rom[i] ^= 0x07; break;
+			case 0x08: rom[i] ^= 0x00; break;
+			case 0x0a: rom[i] ^= 0x02; break;
+			case 0x0c: rom[i] ^= 0x04; break;
+			case 0x0e: rom[i] ^= 0x06; break;
+		}
+
+		if ((i & 0x01) == 0x00)
+			rom[i] ^= 0x80;
+
+		rom[i] = bitswap<8>(rom[i], 0, 6, 5, 4, 3, 1, 2, 7);
+	}
+}
 
 // the original Janputer (Sanritsu) is not yet dumped, basically Royal Mahjong but non-BET type
 GAME( 1981,  royalmj,  0,        royalmah, royalmah, royalmah_state, empty_init,    ROT0,   "Nichibutsu",                 "Royal Mahjong (Japan, v1.13)",          0 )
@@ -5361,7 +5428,7 @@
 GAME( 1986,  suzume,   0,        suzume,   suzume,   royalmah_state, init_suzume,   ROT0,   "Dyna Electronics",           "Watashiha Suzumechan (Japan)",          0 )
 GAME( 1986,  jongshin, 0,        jongshin, jongshin, royalmah_state, init_jongshin, ROT0,   "Dyna Electronics",           "Jong Shin (Japan)",                     0 )
 GAME( 1986,  mjsiyoub, 0,        royalmah, royalmah, royalmah_state, empty_init,    ROT0,   "Visco",                      "Mahjong Shiyou (Japan)",                MACHINE_NOT_WORKING )
-GAME( 1986,  mjsenka,  0,        royalmah, royalmah, royalmah_state, empty_init,    ROT0,   "Visco",                      "Mahjong Senka (Japan)",                 MACHINE_NOT_WORKING )
+GAME( 1986,  mjsenka,  0,        mjsenka,  mjyarou,  royalmah_state, init_mjsenka,  ROT0,   "Visco",                      "Mahjong Senka (Japan)",                 MACHINE_NOT_WORKING ) // heavy GFX glitches, wrong palette decode, code flow doesn't seem totally correct
 GAME( 1986,  mjyarou,  0,        mjyarou,  mjyarou,  royalmah_state, empty_init,    ROT0,   "Visco / Video System",       "Mahjong Yarou [BET] (Japan, set 1)",    MACHINE_IMPERFECT_GRAPHICS ) // girls aren't shown
 GAME( 1986,  mjyarou2, mjyarou,  mjyarou,  mjyarou,  royalmah_state, empty_init,    ROT0,   "Visco / Video System",       "Mahjong Yarou [BET] (Japan, set 2)",    MACHINE_IMPERFECT_GRAPHICS ) // girls aren't shown
 GAME( 1986?, mjclub,   0,        mjclub,   mjclub,   royalmah_state, init_tontonb,  ROT0,   "Xex",                        "Mahjong Club [BET] (Japan)",            0 )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/rulechan.cpp mame-0.224+dfsg.1/src/mame/drivers/rulechan.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/rulechan.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/rulechan.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -113,14 +113,14 @@
       must type a password. At this time, in the layout, under the
       roulette leds will appear the password we need (six numeric digits).
 
-  4.- Enter the required paswword using the credits in (IN1....IN6)
+  4.- Enter the required password using the credits in (IN1....IN6)
       and credits out (OUT1...OUT6) buttons following the key assignment
       indications located under the password field.
       Use the "E" button to finish once all numbers were typed.
       Use the "B" button clear last digit typed, in case of mistake.
 
   5.- Once finished that, the game will reboot and will be ready
-      to play. Also, password showed on layout will dissapear.
+      to play. Also, password showed on layout will disappear.
 
       In case that (by unknown reason) the game asks for
       "CONTROL ADMINISTRATIVO" again, follow the instructions starting
@@ -140,13 +140,13 @@
   roulettes like Lucky Ball, Lucky Roulette, Corona, Re900, etc...
 
   The most exciting part of this work was discover that this game runs
-  with an electromechanical roulette, not a tipical LED roulette. It
-  added an extra challenge to the work, wich implies a full develop
+  with an electromechanical roulette, not a typical LED roulette. It
+  added an extra challenge to the work, which implies a full develop
   of an electromechanical part simulation, objective that finally
   could be reached.
 
   Surprisingly, this game firmware includes a full communications
-  module, accesible via RS232 serial interface, that let the users
+  module, accessible via RS232 serial interface, that let the users
   some useful things like reconfigure hardware and game options or
   get different kinds of reports, like accounting, statistics and
   many other technical items. All this tasks are performed from a
@@ -216,7 +216,7 @@
 	void rulechan_init();
 
 protected:
-	virtual void machine_start() override { m_lamps.resolve(); m_digits.resolve(); }
+	virtual void machine_start() override;
 
 private:
 	void port0_w(uint8_t data);
@@ -265,6 +265,27 @@
 
 constexpr uint8_t rulechan_state::s_sndsrt[10];
 
+void rulechan_state::machine_start()
+{
+	m_lamps.resolve();
+	m_digits.resolve();
+
+	save_item(NAME(m_sline));
+	save_item(NAME(m_p30));
+	save_item(NAME(m_p31));
+	save_item(NAME(m_p32));
+	save_item(NAME(m_step));
+	save_item(NAME(m_updn2));
+	save_item(NAME(m_updn3));
+	save_item(NAME(m_updn4));
+	save_item(NAME(m_num));
+	save_item(NAME(m_spin));
+	save_item(NAME(m_tspin));
+	save_item(NAME(d_spin));
+	save_item(NAME(m_ballin));
+	save_item(NAME(m_led));
+	save_item(NAME(m_pass));
+}
 
 /* BCD to Seven Segment Decoder */
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/s11a.cpp mame-0.224+dfsg.1/src/mame/drivers/s11a.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/s11a.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/s11a.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -16,7 +16,9 @@
       hold one of the trough switches (usually the left) and the ball shooter switch for
       about 1 second.  Then you are able to start a game.
       For Pinbot, you must hold L and V for a second, then press start.
-      For Millionaire, you must hold [ and ] for a second, then start.
+      For Millionaire, you must hold [ and ] for a second, then press start.
+      For Fire!, you must hold U, I, O for a second, then press start.
+      For F-14, unknown. It seems likely it would be D, F, G, H, or D, F, G but this doesn't seem to work. The machine may be EXTREMELY picky about seeing all 4 balls pass the 4 trough sensors in the expected order before it thinks they are present
 
 *****************************************************************************************/
 
@@ -30,52 +32,18 @@
 #include "s11a.lh"
 
 
-void s11a_state::s11a_main_map(address_map &map)
-{
-	map(0x0000, 0x0fff).ram().share("nvram");
-	map(0x2100, 0x2103).mirror(0x00fc).rw(m_pia21, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids
-	map(0x2200, 0x2200).mirror(0x01ff).w(FUNC(s11a_state::sol3_w)); // solenoids
-	map(0x2400, 0x2403).mirror(0x03fc).rw(m_pia24, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps
-	map(0x2800, 0x2803).mirror(0x03fc).rw(m_pia28, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // display
-	map(0x2c00, 0x2c03).mirror(0x03fc).rw(m_pia2c, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // alphanumeric display
-	map(0x3000, 0x3003).mirror(0x03fc).rw(m_pia30, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // inputs
-	map(0x3400, 0x3403).mirror(0x0bfc).rw(m_pia34, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // widget
-	map(0x4000, 0xffff).rom();
-}
-
-void s11a_state::s11a_audio_map(address_map &map)
-{
-	map(0x0000, 0x07ff).mirror(0x0800).ram();
-	map(0x1000, 0x1fff).w(FUNC(s11a_state::bank_w));
-	map(0x2000, 0x2003).mirror(0x0ffc).rw(m_pias, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
-	map(0x8000, 0xbfff).bankr("bank0");
-	map(0xc000, 0xffff).bankr("bank1");
-}
-
-void s11a_state::s11a_bg_map(address_map &map)
-{
-	map(0x0000, 0x07ff).mirror(0x1800).ram();
-	map(0x2000, 0x2001).mirror(0x1ffe).rw(m_ym, FUNC(ym2151_device::read), FUNC(ym2151_device::write));
-	map(0x4000, 0x4003).mirror(0x1ffc).rw(m_pia40, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
-	map(0x7800, 0x7fff).w(FUNC(s11a_state::bgbank_w));
-	map(0x8000, 0xffff).bankr("bgbank");
-}
-
 static INPUT_PORTS_START( s11a )
-	PORT_START("X0")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-
-	PORT_START("X1")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER )
+	PORT_START("SW.0")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) // always plumb-bob tilt
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RSHIFT) // a relay from the power section
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START )
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 )
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_LSHIFT) // usually slam tilt
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RCONTROL) // usually high score reset
 
-	PORT_START("X2")
+	PORT_START("SW.1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D)
@@ -85,7 +53,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_J)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_K)
 
-	PORT_START("X4")
+	PORT_START("SW.2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_L)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Z)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_C)
@@ -95,7 +63,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_M)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COMMA)
 
-	PORT_START("X8")
+	PORT_START("SW.3")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_STOP)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COLON)
@@ -105,7 +73,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_EQUALS)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSPACE)
 
-	PORT_START("X10")
+	PORT_START("SW.4")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_OPENBRACE)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_CLOSEBRACE)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSLASH)
@@ -115,7 +83,17 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_UP)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DOWN)
 
-	PORT_START("X20")
+	PORT_START("SW.5")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DEL)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_HOME)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_END)
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PGUP)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PGDN)
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_0_PAD)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DEL_PAD)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_ENTER_PAD)
+
+	PORT_START("SW.6")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Q)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E)
@@ -125,11 +103,15 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_I)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_O)
 
-	PORT_START("X40")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-	PORT_START("X80")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_START("SW.7")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_2_PAD)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_3_PAD)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_7_PAD)
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_8_PAD)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_9_PAD)
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH_PAD)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_ASTERISK)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PLUS_PAD)
 
 	PORT_START("DIAGS")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_1_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, s11a_state, audio_nmi, 1)
@@ -145,7 +127,6 @@
 MACHINE_RESET_MEMBER( s11a_state, s11a )
 {
 	MACHINE_RESET_CALL_MEMBER(s11);
-	membank("bgbank")->set_entry(0);
 }
 
 void s11a_state::dig0_w(uint8_t data)
@@ -160,25 +141,19 @@
 	set_segment2(0);
 }
 
-void s11a_state::bgbank_w(uint8_t data)
-{
-	membank("bgbank")->set_entry(data & 0x03);
-}
-
 void s11a_state::init_s11a()
 {
-	uint8_t *BGROM = memregion("bgcpu")->base();
-	membank("bgbank")->configure_entries(0, 4, &BGROM[0x10000], 0x8000);
-	membank("bgbank")->set_entry(0);
 	s11_state::init_s11();
 }
 
-void s11a_state::s11a(machine_config &config)
+void s11a_state::s11a_base(machine_config &config)
 {
 	/* basic machine hardware */
 	M6808(config, m_maincpu, XTAL(4'000'000));
-	m_maincpu->set_addrmap(AS_PROGRAM, &s11a_state::s11a_main_map);
+	m_maincpu->set_addrmap(AS_PROGRAM, &s11_state::s11_main_map);
 	MCFG_MACHINE_RESET_OVERRIDE(s11a_state, s11a)
+	INPUT_MERGER_ANY_HIGH(config, m_mainirq).output_handler().set(FUNC(s11_state::main_irq));
+	INPUT_MERGER_ANY_HIGH(config, m_piairq).output_handler().set(FUNC(s11_state::pia_irq));
 
 	/* Video */
 	config.set_default_layout(layout_s11a);
@@ -189,91 +164,101 @@
 	/* Devices */
 	PIA6821(config, m_pia21, 0);
 	m_pia21->readpa_handler().set(FUNC(s11_state::sound_r));
+	m_pia21->set_port_a_input_overrides_output_mask(0xff);
 	m_pia21->writepa_handler().set(FUNC(s11_state::sound_w));
 	m_pia21->writepb_handler().set(FUNC(s11_state::sol2_w));
 	m_pia21->ca2_handler().set(FUNC(s11_state::pia21_ca2_w));
 	m_pia21->cb2_handler().set(FUNC(s11_state::pia21_cb2_w));
-	m_pia21->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia21->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia21->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<1>));
+	m_pia21->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<2>));
 
 	PIA6821(config, m_pia24, 0);
 	m_pia24->writepa_handler().set(FUNC(s11_state::lamp0_w));
 	m_pia24->writepb_handler().set(FUNC(s11_state::lamp1_w));
 	m_pia24->cb2_handler().set(FUNC(s11_state::pia24_cb2_w));
-	m_pia24->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia24->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia24->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<3>));
+	m_pia24->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<4>));
 
 	PIA6821(config, m_pia28, 0);
 	m_pia28->readpa_handler().set(FUNC(s11_state::pia28_w7_r));
+	m_pia28->set_port_a_input_overrides_output_mask(0xff);
 	m_pia28->writepa_handler().set(FUNC(s11a_state::dig0_w));
 	m_pia28->writepb_handler().set(FUNC(s11_state::dig1_w));
 	m_pia28->ca2_handler().set(FUNC(s11_state::pia28_ca2_w));
 	m_pia28->cb2_handler().set(FUNC(s11_state::pia28_cb2_w));
-	m_pia28->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia28->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia28->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<5>));
+	m_pia28->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<6>));
 
 	PIA6821(config, m_pia2c, 0);
 	m_pia2c->writepa_handler().set(FUNC(s11_state::pia2c_pa_w));
 	m_pia2c->writepb_handler().set(FUNC(s11_state::pia2c_pb_w));
-	m_pia2c->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia2c->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia2c->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<7>));
+	m_pia2c->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<8>));
 
 	PIA6821(config, m_pia30, 0);
 	m_pia30->readpa_handler().set(FUNC(s11_state::switch_r));
+	m_pia30->set_port_a_input_overrides_output_mask(0xff);
 	m_pia30->writepb_handler().set(FUNC(s11_state::switch_w));
 	m_pia30->cb2_handler().set(FUNC(s11_state::pia30_cb2_w));
-	m_pia30->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia30->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia30->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<9>));
+	m_pia30->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<10>));
 
 	PIA6821(config, m_pia34, 0);
 	m_pia34->writepa_handler().set(FUNC(s11_state::pia34_pa_w));
 	m_pia34->writepb_handler().set(FUNC(s11_state::pia34_pb_w));
 	m_pia34->cb2_handler().set(FUNC(s11_state::pia34_cb2_w));
-	m_pia34->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia34->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia34->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<11>));
+	m_pia34->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<12>));
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
 
 	/* Add the soundcard */
 	M6802(config, m_audiocpu, XTAL(4'000'000));
 	m_audiocpu->set_ram_enable(false);
-	m_audiocpu->set_addrmap(AS_PROGRAM, &s11a_state::s11a_audio_map);
+	m_audiocpu->set_addrmap(AS_PROGRAM, &s11_state::s11_audio_map);
+	INPUT_MERGER_ANY_HIGH(config, m_audioirq).output_handler().set_inputline(m_audiocpu, M6802_IRQ_LINE);
 
 	SPEAKER(config, "speaker").front_center();
-	MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.25);
+	MC1408(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.25);
 	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
-	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
-	vref.add_route(0, "dac1", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac1", -1.0, DAC_VREF_NEG_INPUT);
+	vref.add_route(0, m_dac, 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, m_dac, -1.0, DAC_VREF_NEG_INPUT);
 
 	SPEAKER(config, "speech").front_center();
 	HC55516(config, m_hc55516, 0).add_route(ALL_OUTPUTS, "speech", 0.50);
 
 	PIA6821(config, m_pias, 0);
 	m_pias->readpa_handler().set(FUNC(s11_state::sound_r));
+	m_pias->set_port_a_input_overrides_output_mask(0xff);
 	m_pias->writepa_handler().set(FUNC(s11_state::sound_w));
-	m_pias->writepb_handler().set("dac", FUNC(dac_byte_interface::data_w));
-	m_pias->cb2_handler().set(FUNC(s11_state::pia40_cb2_w));
-	m_pias->irqa_handler().set_inputline(m_audiocpu, M6802_IRQ_LINE);
-	m_pias->irqa_handler().set_inputline(m_audiocpu, M6802_IRQ_LINE);
+	m_pias->writepb_handler().set(m_dac, FUNC(dac_byte_interface::data_w));
+	m_pias->ca2_handler().set(m_hc55516, FUNC(hc55516_device::clock_w));
+	m_pias->cb2_handler().set(m_hc55516, FUNC(hc55516_device::digit_w));
+	m_pias->irqa_handler().set(m_audioirq, FUNC(input_merger_device::in_w<0>));
+	m_pias->irqb_handler().set(m_audioirq, FUNC(input_merger_device::in_w<1>));
+}
 
+void s11a_state::s11a(machine_config &config)
+{
+	s11a_base(config);
 	/* Add the background music card */
-	MC6809E(config, m_bgcpu, XTAL(8'000'000) / 4); // MC68B09E
-	m_bgcpu->set_addrmap(AS_PROGRAM, &s11a_state::s11a_bg_map);
+	SPEAKER(config, "bgspk").front_center();
+	S11_BG(config, m_bg);
+	m_pia34->ca2_handler().set(m_bg, FUNC(s11_bg_device::resetq_w));
+	m_bg->pb_cb().set(m_pia34, FUNC(pia6821_device::portb_w));
+	m_bg->cb2_cb().set(m_pia34, FUNC(pia6821_device::cb1_w));
+	m_bg->add_route(ALL_OUTPUTS, "bgspk", 1.0);
+}
 
-	SPEAKER(config, "bg").front_center();
-	YM2151(config, m_ym, XTAL(3'579'545));
-	m_ym->irq_handler().set(FUNC(s11a_state::ym2151_irq_w));
-	m_ym->add_route(ALL_OUTPUTS, "bg", 0.50);
-
-	MC1408(config, "dac1", 0).add_route(ALL_OUTPUTS, "bg", 0.25);
-
-	PIA6821(config, m_pia40, 0);
-	m_pia40->writepa_handler().set("dac1", FUNC(dac_byte_interface::data_w));
-	m_pia40->writepb_handler().set(FUNC(s11_state::pia40_pb_w));
-	m_pia40->ca2_handler().set(FUNC(s11_state::pias_ca2_w));
-	m_pia40->cb2_handler().set(FUNC(s11_state::pias_cb2_w));
-	m_pia40->irqa_handler().set_inputline(m_bgcpu, M6809_FIRQ_LINE);
-	m_pia40->irqb_handler().set_inputline(m_bgcpu, INPUT_LINE_NMI);
+void s11a_state::s11a_obg(machine_config &config)
+{
+	s11a_base(config);
+	/* Add the older-style background music card */
+	SPEAKER(config, "bgspk").front_center();
+	S11_OBG(config, m_bg);
+	m_pia34->ca2_handler().set(m_bg, FUNC(s11_obg_device::resetq_w));
+	m_bg->pb_cb().set(m_pia34, FUNC(pia6821_device::portb_w));
+	m_bg->cb2_cb().set(m_pia34, FUNC(pia6821_device::cb1_w));
+	m_bg->add_route(ALL_OUTPUTS, "bgspk", 1.0);
 }
 
 /*------------------------
@@ -289,9 +274,15 @@
 	ROM_LOAD("f14_u21.l1", 0x18000, 0x8000, CRC(e412300c) SHA1(382d0cfa47abea295f0c7501bc0a010473e9d73b))
 	ROM_LOAD("f14_u22.l1", 0x10000, 0x8000, CRC(c9dd7496) SHA1(de3cb855d87033274cc912578b02d1593d2d69f9))
 
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("f14_u4.l1", 0x10000, 0x8000, CRC(43ecaabf) SHA1(64b50dbff03cd556130d0cff47b951fdf37d397d))
-	ROM_LOAD("f14_u19.l1", 0x18000, 0x8000, CRC(d0de4a7c) SHA1(46ecd5786653add47751cc56b38d9db7c4622377))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("f14_u4.l1", 0x00000, 0x8000, CRC(43ecaabf) SHA1(64b50dbff03cd556130d0cff47b951fdf37d397d))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("f14_u19.l1", 0x20000, 0x8000, CRC(d0de4a7c) SHA1(46ecd5786653add47751cc56b38d9db7c4622377))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(f14_p4)
@@ -303,9 +294,15 @@
 	ROM_LOAD("f14_u21.l1", 0x18000, 0x8000, CRC(e412300c) SHA1(382d0cfa47abea295f0c7501bc0a010473e9d73b))
 	ROM_LOAD("f14_u22.l1", 0x10000, 0x8000, CRC(c9dd7496) SHA1(de3cb855d87033274cc912578b02d1593d2d69f9))
 
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("f14_u4.l1", 0x10000, 0x8000, CRC(43ecaabf) SHA1(64b50dbff03cd556130d0cff47b951fdf37d397d))
-	ROM_LOAD("f14_u19.l1", 0x18000, 0x8000, CRC(d0de4a7c) SHA1(46ecd5786653add47751cc56b38d9db7c4622377))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("f14_u4.l1", 0x00000, 0x8000, CRC(43ecaabf) SHA1(64b50dbff03cd556130d0cff47b951fdf37d397d))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("f14_u19.l1", 0x20000, 0x8000, CRC(d0de4a7c) SHA1(46ecd5786653add47751cc56b38d9db7c4622377))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(f14_p5)
@@ -317,9 +314,15 @@
 	ROM_LOAD("f14_u21.l1", 0x18000, 0x8000, CRC(e412300c) SHA1(382d0cfa47abea295f0c7501bc0a010473e9d73b))
 	ROM_LOAD("f14_u22.l1", 0x10000, 0x8000, CRC(c9dd7496) SHA1(de3cb855d87033274cc912578b02d1593d2d69f9))
 
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("f14_u4.l1", 0x10000, 0x8000, CRC(43ecaabf) SHA1(64b50dbff03cd556130d0cff47b951fdf37d397d))
-	ROM_LOAD("f14_u19.l1", 0x18000, 0x8000, CRC(d0de4a7c) SHA1(46ecd5786653add47751cc56b38d9db7c4622377))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("f14_u4.l1", 0x00000, 0x8000, CRC(43ecaabf) SHA1(64b50dbff03cd556130d0cff47b951fdf37d397d))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("f14_u19.l1", 0x20000, 0x8000, CRC(d0de4a7c) SHA1(46ecd5786653add47751cc56b38d9db7c4622377))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(f14_l1)
@@ -331,9 +334,15 @@
 	ROM_LOAD("f14_u21.l1", 0x18000, 0x8000, CRC(e412300c) SHA1(382d0cfa47abea295f0c7501bc0a010473e9d73b))
 	ROM_LOAD("f14_u22.l1", 0x10000, 0x8000, CRC(c9dd7496) SHA1(de3cb855d87033274cc912578b02d1593d2d69f9))
 
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("f14_u4.l1", 0x10000, 0x8000, CRC(43ecaabf) SHA1(64b50dbff03cd556130d0cff47b951fdf37d397d))
-	ROM_LOAD("f14_u19.l1", 0x18000, 0x8000, CRC(d0de4a7c) SHA1(46ecd5786653add47751cc56b38d9db7c4622377))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("f14_u4.l1", 0x00000, 0x8000, CRC(43ecaabf) SHA1(64b50dbff03cd556130d0cff47b951fdf37d397d))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("f14_u19.l1", 0x20000, 0x8000, CRC(d0de4a7c) SHA1(46ecd5786653add47751cc56b38d9db7c4622377))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 /*--------------------
@@ -348,8 +357,11 @@
 	ROM_LOAD("fire_u21.l2", 0x18000, 0x8000, CRC(2edde0a4) SHA1(de292a340a3a06b0b996fc69fee73eb7bbfbbe64))
 	ROM_LOAD("fire_u22.l2", 0x10000, 0x8000, CRC(16145c97) SHA1(523e99df3907a2c843c6e27df4d16799c4136a46))
 
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("fire_u4.l1", 0x10000, 0x8000, CRC(0e058918) SHA1(4d6bf2290141119174787f8dd653c47ea4c73693))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("fire_u4.l1", 0x00000, 0x8000, CRC(0e058918) SHA1(4d6bf2290141119174787f8dd653c47ea4c73693))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
 ROM_END
 
 ROM_START(fire_l2)
@@ -361,8 +373,11 @@
 	ROM_LOAD("fire_u21.l2", 0x18000, 0x8000, CRC(2edde0a4) SHA1(de292a340a3a06b0b996fc69fee73eb7bbfbbe64))
 	ROM_LOAD("fire_u22.l2", 0x10000, 0x8000, CRC(16145c97) SHA1(523e99df3907a2c843c6e27df4d16799c4136a46))
 
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("fire_u4.l1", 0x10000, 0x8000, CRC(0e058918) SHA1(4d6bf2290141119174787f8dd653c47ea4c73693))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("fire_u4.l1", 0x00000, 0x8000, CRC(0e058918) SHA1(4d6bf2290141119174787f8dd653c47ea4c73693))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
 ROM_END
 
 /*--------------------------------------
@@ -381,9 +396,15 @@
 	ROM_LOAD("mill_u21.l1", 0x18000, 0x8000, CRC(4cd1ee90) SHA1(4e24b96138ced16eff9036303ca6347e3423dbfc))
 	ROM_LOAD("mill_u22.l1", 0x10000, 0x8000, CRC(73735cfc) SHA1(f74c873a20990263e0d6b35609fc51c08c9f8e31))
 
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("mill_u4.l1", 0x10000, 0x8000, CRC(cf766506) SHA1(a6e4df19a513102abbce2653d4f72245f54407b1))
-	ROM_LOAD("mill_u19.l1", 0x18000, 0x8000, CRC(e073245a) SHA1(cbaddde6bb19292ace574a8329e18c97c2ee9763))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("mill_u4.l1", 0x00000, 0x8000, CRC(cf766506) SHA1(a6e4df19a513102abbce2653d4f72245f54407b1))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("mill_u19.l1", 0x20000, 0x8000, CRC(e073245a) SHA1(cbaddde6bb19292ace574a8329e18c97c2ee9763))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 /*--------------------
@@ -398,9 +419,15 @@
 	ROM_LOAD("pbot_u21.l1", 0x18000, 0x8000, CRC(3eab88d9) SHA1(667e3b675e2ae8fec6a6faddb9b0dd5531d64f8f))
 	ROM_LOAD("pbot_u22.l1", 0x10000, 0x8000, CRC(a2d2c9cb) SHA1(46437dc54538f1626caf41a2818ddcf8000c44e4))
 
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pbot_u4.l1", 0x10000, 0x8000, CRC(de5926bd) SHA1(3d111e27c5f0c8c0afc5fe5cc45bf77c12b69228))
-	ROM_LOAD("pbot_u19.l1", 0x18000, 0x8000, CRC(40eb4e9f) SHA1(07b0557b35599a2dd5aa66a306fbbe8f50eed998))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pbot_u4.l1", 0x00000, 0x8000, CRC(de5926bd) SHA1(3d111e27c5f0c8c0afc5fe5cc45bf77c12b69228))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("pbot_u19.l1", 0x20000, 0x8000, CRC(40eb4e9f) SHA1(07b0557b35599a2dd5aa66a306fbbe8f50eed998))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(pb_l1)
@@ -412,9 +439,15 @@
 	ROM_LOAD("pbot_u21.l1", 0x18000, 0x8000, CRC(3eab88d9) SHA1(667e3b675e2ae8fec6a6faddb9b0dd5531d64f8f))
 	ROM_LOAD("pbot_u22.l1", 0x10000, 0x8000, CRC(a2d2c9cb) SHA1(46437dc54538f1626caf41a2818ddcf8000c44e4))
 
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pbot_u4.l1", 0x10000, 0x8000, CRC(de5926bd) SHA1(3d111e27c5f0c8c0afc5fe5cc45bf77c12b69228))
-	ROM_LOAD("pbot_u19.l1", 0x18000, 0x8000, CRC(40eb4e9f) SHA1(07b0557b35599a2dd5aa66a306fbbe8f50eed998))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pbot_u4.l1", 0x00000, 0x8000, CRC(de5926bd) SHA1(3d111e27c5f0c8c0afc5fe5cc45bf77c12b69228))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("pbot_u19.l1", 0x20000, 0x8000, CRC(40eb4e9f) SHA1(07b0557b35599a2dd5aa66a306fbbe8f50eed998))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(pb_l2)
@@ -426,9 +459,15 @@
 	ROM_LOAD("pbot_u21.l1", 0x18000, 0x8000, CRC(3eab88d9) SHA1(667e3b675e2ae8fec6a6faddb9b0dd5531d64f8f))
 	ROM_LOAD("pbot_u22.l1", 0x10000, 0x8000, CRC(a2d2c9cb) SHA1(46437dc54538f1626caf41a2818ddcf8000c44e4))
 
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pbot_u4.l1", 0x10000, 0x8000, CRC(de5926bd) SHA1(3d111e27c5f0c8c0afc5fe5cc45bf77c12b69228))
-	ROM_LOAD("pbot_u19.l1", 0x18000, 0x8000, CRC(40eb4e9f) SHA1(07b0557b35599a2dd5aa66a306fbbe8f50eed998))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pbot_u4.l1", 0x00000, 0x8000, CRC(de5926bd) SHA1(3d111e27c5f0c8c0afc5fe5cc45bf77c12b69228))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("pbot_u19.l1", 0x20000, 0x8000, CRC(40eb4e9f) SHA1(07b0557b35599a2dd5aa66a306fbbe8f50eed998))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(pb_l3)
@@ -440,9 +479,15 @@
 	ROM_LOAD("pbot_u21.l1", 0x18000, 0x8000, CRC(3eab88d9) SHA1(667e3b675e2ae8fec6a6faddb9b0dd5531d64f8f))
 	ROM_LOAD("pbot_u22.l1", 0x10000, 0x8000, CRC(a2d2c9cb) SHA1(46437dc54538f1626caf41a2818ddcf8000c44e4))
 
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pbot_u4.l1", 0x10000, 0x8000, CRC(de5926bd) SHA1(3d111e27c5f0c8c0afc5fe5cc45bf77c12b69228))
-	ROM_LOAD("pbot_u19.l1", 0x18000, 0x8000, CRC(40eb4e9f) SHA1(07b0557b35599a2dd5aa66a306fbbe8f50eed998))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pbot_u4.l1", 0x00000, 0x8000, CRC(de5926bd) SHA1(3d111e27c5f0c8c0afc5fe5cc45bf77c12b69228))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("pbot_u19.l1", 0x20000, 0x8000, CRC(40eb4e9f) SHA1(07b0557b35599a2dd5aa66a306fbbe8f50eed998))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(pb_p4)
@@ -454,9 +499,15 @@
 	ROM_LOAD("pbot_u21.l1", 0x18000, 0x8000, CRC(3eab88d9) SHA1(667e3b675e2ae8fec6a6faddb9b0dd5531d64f8f))
 	ROM_LOAD("pbot_u22.l1", 0x10000, 0x8000, CRC(a2d2c9cb) SHA1(46437dc54538f1626caf41a2818ddcf8000c44e4))
 
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pbot_u4.l1", 0x10000, 0x8000, CRC(de5926bd) SHA1(3d111e27c5f0c8c0afc5fe5cc45bf77c12b69228))
-	ROM_LOAD("pbot_u19.l1", 0x18000, 0x8000, CRC(40eb4e9f) SHA1(07b0557b35599a2dd5aa66a306fbbe8f50eed998))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pbot_u4.l1", 0x00000, 0x8000, CRC(de5926bd) SHA1(3d111e27c5f0c8c0afc5fe5cc45bf77c12b69228))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("pbot_u19.l1", 0x20000, 0x8000, CRC(40eb4e9f) SHA1(07b0557b35599a2dd5aa66a306fbbe8f50eed998))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 GAME(1987, f14_l1,   0,       s11a, s11a, s11a_state, init_s11a, ROT0, "Williams", "F-14 Tomcat (L-1)", MACHINE_IS_SKELETON_MECHANICAL)
@@ -465,9 +516,9 @@
 GAME(1987, f14_p5,   f14_l1,  s11a, s11a, s11a_state, init_s11a, ROT0, "Williams", "F-14 Tomcat (P-5)", MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1987, fire_l3,  0,       s11a, s11a, s11a_state, init_s11a, ROT0, "Williams", "Fire! (L-3)",       MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1987, fire_l2,  fire_l3, s11a, s11a, s11a_state, init_s11a, ROT0, "Williams", "Fire! (L-2)",       MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1987, milln_l3, 0,       s11a, s11a, s11a_state, init_s11a, ROT0, "Williams", "Millionaire (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, pb_l5,    0,       s11a, s11a, s11a_state, init_s11a, ROT0, "Williams", "Pin-Bot (L-5)",     MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, pb_l1,    pb_l5,   s11a, s11a, s11a_state, init_s11a, ROT0, "Williams", "Pin-Bot (L-1)",     MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, pb_l2,    pb_l5,   s11a, s11a, s11a_state, init_s11a, ROT0, "Williams", "Pin-Bot (L-2)",     MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, pb_l3,    pb_l5,   s11a, s11a, s11a_state, init_s11a, ROT0, "Williams", "Pin-Bot (L-3)",     MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1986, pb_p4,    pb_l5,   s11a, s11a, s11a_state, init_s11a, ROT0, "Williams", "Pin-Bot (P-4)",     MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1987, milln_l3, 0,       s11a_obg, s11a, s11a_state, init_s11a, ROT0, "Williams", "Millionaire (L-3)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, pb_l5,    0,       s11a_obg, s11a, s11a_state, init_s11a, ROT0, "Williams", "Pin-Bot (L-5)",     MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, pb_l1,    pb_l5,   s11a_obg, s11a, s11a_state, init_s11a, ROT0, "Williams", "Pin-Bot (L-1)",     MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, pb_l2,    pb_l5,   s11a_obg, s11a, s11a_state, init_s11a, ROT0, "Williams", "Pin-Bot (L-2)",     MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, pb_l3,    pb_l5,   s11a_obg, s11a, s11a_state, init_s11a, ROT0, "Williams", "Pin-Bot (L-3)",     MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1986, pb_p4,    pb_l5,   s11a_obg, s11a, s11a_state, init_s11a, ROT0, "Williams", "Pin-Bot (P-4)",     MACHINE_IS_SKELETON_MECHANICAL)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/s11b.cpp mame-0.224+dfsg.1/src/mame/drivers/s11b.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/s11b.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/s11b.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4,23 +4,41 @@
     Williams System 11b
 
     Known issues:
-    - Background music is not working in some games
-    - Black Knight 2000 randomly goes nuts or resets
-      (some bug possibly relating to the 'lighting draws the "Ball 1"' animation???);
+    - Black Knight 2000 sometimes goes nuts or resets, although this is largely dependent on
+      whether the 'ball 1' animation was played or not.
       if you insert 2 or more credits and hit start 2 times quickly so it doesn't
-      play the animation, the game seems more stable afterwards; original
-      game bug or 6802 core bug or something else?
-      This bug behaves slightly differently in the different sets, depending on whether
-      nvram is cleared beforehand or not, and whether the last reset was soft or hard.
+      play the animation, the game seems more stable afterwards; is this an original
+      game bug or 6802 core bug or something else? Activating a switch ('x' for instance) after
+      the ball 1 animation makes it significantly more stable, so this could be an original code bug,
+      or a code bug which is hit if the motor drawbridge limit sensors are not working/emulated, as in MAME.
       Proximate cause is smashing the stack, after which the RTS at 61DE (in bk2k_l4)
       transfers to 0000 (where no valid code exists).
+      This may or may not be an original game bug if the game is started if the
+      coin door is left open (hence the memory protect switch is left disengaged.
+      We do not currently emulate the memory protect function to write protect
+      the ram at 0x780-0x7ff, so it is possible that the protection being
+      active prevents the real machine from crashing)
     - Black Knight 2000 LG-1 set reports U26 ROM FAILURE. Bad/hacked dump or original bug?
-    - Advance button doesn't seem to work well (TODO: check if this may have been fixed with the irq and diagnostic button masking changes)
-    - Jokerz has an entirely different "Pin Sound '88" stereo audio board (D-12338-567)
+    - Taxi and Police Force both have issues with the display showing garbage overlaid by the alphanumerics.
 
     Known keys necessary to get games to start (so the proper number of balls are detected):
-    - Black Knight 2000: Hold "D" "F" "Y" and press "1" after inserting 1 or more credits. press 'x' to get the main music started.
-    - Cyclone: Nothing. The game doesn't bother to check if the ball is ready before allowing start. Insert 1 or more credits first, of course.
+    (Hold these keys and press "1" after inserting 1 or more credits.)
+    Almost universally, these will be listed in the switch matrix as "Ball Trough Right" "Ball Trough Center" and "Ball Shooter"
+    - Bad Cats: "H" "Enter"
+    - Banzai Run: "S" "D" "F" (won't start due to calibration? needs more investigation, try hitting E and / and lots of keys until calibration finishes); - starts music
+    - Big Guns: "D" "F" "U"
+    - Black Knight 2000: "D" "F" "Y"; 'x' starts music
+    - Cyclone: Nothing, game does not have switches to check for balls in the trough.
+    - Earthshaker: "D" "F" "W"
+    - Elvira and the Party Monsters: "D" "F" "U"
+    - Jokerz!: "D" "F" "H"
+    - Mousin' Around: "D" "F" "H"
+    - Police Force: "D" "F"
+    - Space Station: "D" "F" "End"
+    - Swords of Fury: "D" "F" "H"
+    - Taxi: "D" "F"
+    - Transporter: the Rescue: "D" "F" "H"
+    - Whirlwind: "D" "F" "H"
 */
 
 #include "emu.h"
@@ -33,55 +51,19 @@
 #include "s11b.lh"
 
 
-void s11b_state::s11b_main_map(address_map &map)
-{
-	map(0x0000, 0x0fff).ram().share("nvram");
-	map(0x2100, 0x2103).mirror(0x00fc).rw(m_pia21, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids
-	map(0x2200, 0x2200).mirror(0x01ff).w(FUNC(s11b_state::sol3_w)); // solenoids
-	map(0x2400, 0x2403).mirror(0x03fc).rw(m_pia24, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps
-	map(0x2800, 0x2803).mirror(0x03fc).rw(m_pia28, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // display
-	map(0x2c00, 0x2c03).mirror(0x03fc).rw(m_pia2c, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // alphanumeric display
-	map(0x3000, 0x3003).mirror(0x03fc).rw(m_pia30, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // inputs
-	map(0x3400, 0x3403).mirror(0x0bfc).rw(m_pia34, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // widget
-	map(0x4000, 0xffff).rom();
-}
-
-void s11b_state::s11b_audio_map(address_map &map)
-{
-	map(0x0000, 0x07ff).mirror(0x0800).ram();
-	map(0x1000, 0x1fff).w(FUNC(s11b_state::bank_w));
-	map(0x2000, 0x2003).mirror(0x0ffc).rw(m_pias, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
-	map(0x8000, 0xbfff).bankr("bank0");
-	map(0xc000, 0xffff).bankr("bank1");
-}
-
-void s11b_state::s11b_bg_map(address_map &map)
-{
-	map(0x0000, 0x07ff).ram();
-	map(0x2000, 0x2001).mirror(0x1ffe).rw(m_ym, FUNC(ym2151_device::read), FUNC(ym2151_device::write));
-	map(0x4000, 0x4003).mirror(0x1ffc).rw(m_pia40, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
-	map(0x6000, 0x67ff).w(FUNC(s11b_state::bg_speech_digit_w));
-	map(0x6800, 0x6fff).w(FUNC(s11b_state::bg_speech_clock_w));
-	map(0x7800, 0x7fff).w(FUNC(s11b_state::bgbank_w));
-	map(0x8000, 0xffff).bankr("bgbank");
-}
-
 static INPUT_PORTS_START( s11b )
-	PORT_START("X0")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-
-	PORT_START("X1")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER )
+	PORT_START("SW.0")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) // always plumb-bob tilt
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RSHIFT) // a relay from the power section
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START )
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 )
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_LSHIFT) // usually slam tilt
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RCONTROL) // usually high score reset
 
-	PORT_START("X2")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A)
+	PORT_START("SW.1")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A) // usually playfield tilt
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D)
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F)
@@ -90,7 +72,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_J)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_K)
 
-	PORT_START("X4")
+	PORT_START("SW.2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_L)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Z)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_C)
@@ -100,7 +82,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_M)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COMMA)
 
-	PORT_START("X8")
+	PORT_START("SW.3")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_STOP)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COLON)
@@ -110,7 +92,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_EQUALS)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSPACE)
 
-	PORT_START("X10")
+	PORT_START("SW.4")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_OPENBRACE)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_CLOSEBRACE)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSLASH)
@@ -120,10 +102,17 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_UP)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DOWN)
 
-	PORT_START("X20")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_START("SW.5")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DEL)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_HOME)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_END)
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PGUP)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PGDN)
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_0_PAD)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DEL_PAD)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_ENTER_PAD)
 
-	PORT_START("X40")
+	PORT_START("SW.6")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Q)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E)
@@ -133,8 +122,15 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_I)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_O)
 
-	PORT_START("X80")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_START("SW.7")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_2_PAD)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_3_PAD)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_7_PAD)
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_8_PAD)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_9_PAD)
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH_PAD)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_ASTERISK)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PLUS_PAD)
 
 	PORT_START("DIAGS")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_1_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, s11b_state, audio_nmi, 1)
@@ -150,27 +146,10 @@
 {
 	membank("bank0")->set_entry(0);
 	membank("bank1")->set_entry(0);
-	membank("bgbank")->set_entry(0);
 	// reset the CPUs again, so that the CPUs are starting with the right vectors (otherwise sound may die on reset)
 	m_audiocpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
-	if(m_bgcpu)
-		m_bgcpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
-}
-
-void s11b_state::bg_speech_clock_w(uint8_t data)
-{
-	if(m_bg_hc55516)
-	{
-		// pulses clock input?
-		m_bg_hc55516->clock_w(1);
-		m_bg_hc55516->clock_w(0);
-	}
-}
-
-void s11b_state::bg_speech_digit_w(uint8_t data)
-{
-	if(m_bg_hc55516)
-		m_bg_hc55516->digit_w(data);
+	if(m_bg)
+		m_bg->device_reset();
 }
 
 void s11b_state::dig1_w(uint8_t data)
@@ -249,12 +228,14 @@
 	m_invert = true;
 }
 
-void s11b_state::s11b(machine_config &config)
+void s11b_state::s11b_base(machine_config &config)
 {
 	/* basic machine hardware */
 	M6808(config, m_maincpu, XTAL(4'000'000));
-	m_maincpu->set_addrmap(AS_PROGRAM, &s11b_state::s11b_main_map);
+	m_maincpu->set_addrmap(AS_PROGRAM, &s11_state::s11_main_map);
 	MCFG_MACHINE_RESET_OVERRIDE(s11b_state, s11b)
+	INPUT_MERGER_ANY_HIGH(config, m_mainirq).output_handler().set(FUNC(s11_state::main_irq));
+	INPUT_MERGER_ANY_HIGH(config, m_piairq).output_handler().set(FUNC(s11_state::pia_irq));
 
 	/* Video */
 	config.set_default_layout(layout_s11b);
@@ -265,95 +246,102 @@
 	/* Devices */
 	PIA6821(config, m_pia21, 0);
 	m_pia21->readpa_handler().set(FUNC(s11_state::sound_r));
+	m_pia21->set_port_a_input_overrides_output_mask(0xff);
 	m_pia21->writepa_handler().set(FUNC(s11_state::sound_w));
 	m_pia21->writepb_handler().set(FUNC(s11_state::sol2_w));
 	m_pia21->ca2_handler().set(FUNC(s11_state::pia21_ca2_w));
 	m_pia21->cb2_handler().set(FUNC(s11_state::pia21_cb2_w));
-	m_pia21->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia21->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia21->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<1>));
+	m_pia21->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<2>));
 
 	PIA6821(config, m_pia24, 0);
 	m_pia24->writepa_handler().set(FUNC(s11_state::lamp0_w));
 	m_pia24->writepb_handler().set(FUNC(s11_state::lamp1_w));
 	m_pia24->cb2_handler().set(FUNC(s11_state::pia24_cb2_w));
-	m_pia24->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia24->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia24->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<3>));
+	m_pia24->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<4>));
 
 	PIA6821(config, m_pia28, 0);
 	m_pia28->readpa_handler().set(FUNC(s11_state::pia28_w7_r));
+	m_pia28->set_port_a_input_overrides_output_mask(0xff);
 	m_pia28->writepa_handler().set(FUNC(s11a_state::dig0_w));
 	m_pia28->writepb_handler().set(FUNC(s11b_state::dig1_w));
 	m_pia28->ca2_handler().set(FUNC(s11_state::pia28_ca2_w));
 	m_pia28->cb2_handler().set(FUNC(s11_state::pia28_cb2_w));
-	m_pia28->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia28->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia28->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<5>));
+	m_pia28->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<6>));
 
 	PIA6821(config, m_pia2c, 0);
 	m_pia2c->writepa_handler().set(FUNC(s11b_state::pia2c_pa_w));
 	m_pia2c->writepb_handler().set(FUNC(s11b_state::pia2c_pb_w));
-	m_pia2c->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia2c->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia2c->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<7>));
+	m_pia2c->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<8>));
 
 	PIA6821(config, m_pia30, 0);
 	m_pia30->readpa_handler().set(FUNC(s11_state::switch_r));
+	m_pia30->set_port_a_input_overrides_output_mask(0xff);
 	m_pia30->writepb_handler().set(FUNC(s11_state::switch_w));
 	m_pia30->cb2_handler().set(FUNC(s11_state::pia30_cb2_w));
-	m_pia30->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia30->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia30->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<9>));
+	m_pia30->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<10>));
 
 	PIA6821(config, m_pia34, 0);
 	m_pia34->writepa_handler().set(FUNC(s11b_state::pia34_pa_w));
 	m_pia34->writepb_handler().set(FUNC(s11_state::pia34_pb_w));
 	m_pia34->cb2_handler().set(FUNC(s11_state::pia34_cb2_w));
-	m_pia34->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia34->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia34->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<11>));
+	m_pia34->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<12>));
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
 
 	/* Add the soundcard */
 	M6802(config, m_audiocpu, XTAL(4'000'000));
 	m_audiocpu->set_ram_enable(false);
-	m_audiocpu->set_addrmap(AS_PROGRAM, &s11b_state::s11b_audio_map);
+	m_audiocpu->set_addrmap(AS_PROGRAM, &s11_state::s11_audio_map);
+	INPUT_MERGER_ANY_HIGH(config, m_audioirq).output_handler().set_inputline(m_audiocpu, M6802_IRQ_LINE);
 
 	SPEAKER(config, "speaker").front_center();
-	MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.25);
+	MC1408(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.25);
 	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
-	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
-	vref.add_route(0, "dac1", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac1", -1.0, DAC_VREF_NEG_INPUT);
+	vref.add_route(0, m_dac, 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, m_dac, -1.0, DAC_VREF_NEG_INPUT);
 
 	SPEAKER(config, "speech").front_center();
 	HC55516(config, m_hc55516, 0).add_route(ALL_OUTPUTS, "speech", 0.50);
 
 	PIA6821(config, m_pias, 0);
 	m_pias->readpa_handler().set(FUNC(s11_state::sound_r));
+	m_pias->set_port_a_input_overrides_output_mask(0xff);
 	m_pias->writepa_handler().set(FUNC(s11_state::sound_w));
-	m_pias->writepb_handler().set("dac", FUNC(dac_byte_interface::data_w));
-	m_pias->ca2_handler().set("hc55516", FUNC(hc55516_device::clock_w));
-	m_pias->cb2_handler().set("hc55516", FUNC(hc55516_device::digit_w));
-	m_pias->irqa_handler().set_inputline("audiocpu", M6802_IRQ_LINE);
-	m_pias->irqa_handler().set_inputline("audiocpu", M6802_IRQ_LINE);
+	m_pias->writepb_handler().set(m_dac, FUNC(dac_byte_interface::data_w));
+	m_pias->ca2_handler().set(m_hc55516, FUNC(hc55516_device::clock_w));
+	m_pias->cb2_handler().set(m_hc55516, FUNC(hc55516_device::digit_w));
+	m_pias->irqa_handler().set(m_audioirq, FUNC(input_merger_device::in_w<0>));
+	m_pias->irqb_handler().set(m_audioirq, FUNC(input_merger_device::in_w<1>));
+}
 
+void s11b_state::s11b(machine_config &config)
+{
+	s11b_base(config);
 	/* Add the background music card */
-	MC6809E(config, m_bgcpu, XTAL(8'000'000) / 4); // MC68B09E
-	m_bgcpu->set_addrmap(AS_PROGRAM, &s11b_state::s11b_bg_map);
-	config.set_maximum_quantum(attotime::from_hz(50));
-
-	SPEAKER(config, "bg").front_center();
-	YM2151(config, m_ym, 3580000);
-	m_ym->irq_handler().set(FUNC(s11b_state::ym2151_irq_w));
-	m_ym->add_route(ALL_OUTPUTS, "bg", 0.25);
-
-	MC1408(config, "dac1", 0).add_route(ALL_OUTPUTS, "bg", 0.25);
-
-	HC55516(config, m_bg_hc55516, 0).add_route(ALL_OUTPUTS, "speech", 0.50);
-
-	PIA6821(config, m_pia40, 0);
-	m_pia40->writepa_handler().set("dac1", FUNC(dac_byte_interface::data_w));
-	m_pia40->writepb_handler().set(FUNC(s11_state::pia40_pb_w));
-	m_pia40->ca2_handler().set("ym2151", FUNC(ym2151_device::reset_w));
-	m_pia40->cb2_handler().set(FUNC(s11_state::pia40_cb2_w));
-	m_pia40->irqa_handler().set_inputline("bgcpu", M6809_FIRQ_LINE);
-	m_pia40->irqb_handler().set_inputline("bgcpu", INPUT_LINE_NMI);
+	S11_BG(config, m_bg);
+	m_pia34->ca2_handler().set(m_bg, FUNC(s11_bg_device::resetq_w));
+	m_bg->pb_cb().set(m_pia34, FUNC(pia6821_device::portb_w));
+	m_bg->cb2_cb().set(m_pia34, FUNC(pia6821_device::cb1_w));
+	SPEAKER(config, "bgspk").front_center();
+	m_bg->add_route(ALL_OUTPUTS, "bgspk", 1.0);
+}
+
+void s11b_state::s11b_jokerz(machine_config &config)
+{
+	s11b_base(config);
+	/* Add the pin sound 88 music card */
+	PINSND88(config, m_ps88);
+	m_pia34->ca2_handler().set(m_ps88, FUNC(pinsnd88_device::resetq_w));
+	m_ps88->syncq_cb().set(m_pia34, FUNC(pia6821_device::ca1_w)); // the sync connection comes from sound connector pin 16 to MCA1, not the usual pin 12 to MCB1
+	SPEAKER(config, "cabinet").front_floor(); // the cabinet speaker is aimed down underneath the pinball table itself
+	SPEAKER(config, "backbox").front_center(); // the backbox speakers are roughly level with the user, but farther in front of them than the cabinet
+	m_ps88->add_route(0, "cabinet", 1.0);
+	m_ps88->add_route(1, "backbox", 1.0);
 }
 
 /*-----------------------
@@ -366,10 +354,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("cats_u21.l1", 0x18000, 0x8000, CRC(04110d08) SHA1(4b44b26983cb5d14a93c16a19dc2bdbaa665dc69))
 	ROM_LOAD("cats_u22.l1", 0x10000, 0x8000, CRC(7e152c78) SHA1(b4ab770fdd9420a5d35e55bf8fb84c99ac544b8b))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("cats_u4.l1", 0x10000, 0x8000, CRC(18c62813) SHA1(a4fb69cfedd0b92c22b599913df3cdf8b3eef42c))
-	ROM_LOAD("cats_u19.l1", 0x18000, 0x8000, CRC(f2fea68b) SHA1(9a41823e71342b7a162420378f122bba34ce0636))
-	ROM_LOAD("cats_u20.l1", 0x20000, 0x8000, CRC(bf4dc35a) SHA1(9920ce90d93fb6ecf98792c35bb6eb8862a969f3))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("cats_u4.l1", 0x00000, 0x8000, CRC(18c62813) SHA1(a4fb69cfedd0b92c22b599913df3cdf8b3eef42c))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("cats_u19.l1", 0x20000, 0x8000, CRC(f2fea68b) SHA1(9a41823e71342b7a162420378f122bba34ce0636))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("cats_u20.l1", 0x40000, 0x8000, CRC(bf4dc35a) SHA1(9920ce90d93fb6ecf98792c35bb6eb8862a969f3))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(bcats_l2)
@@ -379,10 +376,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("cats_u21.l1", 0x18000, 0x8000, CRC(04110d08) SHA1(4b44b26983cb5d14a93c16a19dc2bdbaa665dc69))
 	ROM_LOAD("cats_u22.l1", 0x10000, 0x8000, CRC(7e152c78) SHA1(b4ab770fdd9420a5d35e55bf8fb84c99ac544b8b))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("cats_u4.l1", 0x10000, 0x8000, CRC(18c62813) SHA1(a4fb69cfedd0b92c22b599913df3cdf8b3eef42c))
-	ROM_LOAD("cats_u19.l1", 0x18000, 0x8000, CRC(f2fea68b) SHA1(9a41823e71342b7a162420378f122bba34ce0636))
-	ROM_LOAD("cats_u20.l1", 0x20000, 0x8000, CRC(bf4dc35a) SHA1(9920ce90d93fb6ecf98792c35bb6eb8862a969f3))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("cats_u4.l1", 0x00000, 0x8000, CRC(18c62813) SHA1(a4fb69cfedd0b92c22b599913df3cdf8b3eef42c))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("cats_u19.l1", 0x20000, 0x8000, CRC(f2fea68b) SHA1(9a41823e71342b7a162420378f122bba34ce0636))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("cats_u20.l1", 0x40000, 0x8000, CRC(bf4dc35a) SHA1(9920ce90d93fb6ecf98792c35bb6eb8862a969f3))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 /*--------------------
@@ -395,10 +401,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("banz_u21.l1", 0x18000, 0x8000, CRC(cd06716e) SHA1(b61a0dc017dd4a09296a43a855461c5cee07517b))
 	ROM_LOAD("banz_u22.l1", 0x10000, 0x8000, CRC(e8159033) SHA1(e8f15801feefeb30768e88d685c208108aa134e8))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("banz_u4.l1", 0x10000, 0x8000, CRC(8fd69c69) SHA1(c024cda85c6616943c3a12ab5943a7be8709bfe3))
-	ROM_LOAD("banz_u19.l1", 0x18000, 0x8000, CRC(9104248c) SHA1(48a8c41f3a4127f4fb4de37e876c8380e3511e1f))
-	ROM_LOAD("banz_u20.l1", 0x20000, 0x8000, CRC(26b3d15c) SHA1(528084b6c62394f8ed9fc0f90b91d844060fc904))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("banz_u4.l1", 0x00000, 0x8000, CRC(8fd69c69) SHA1(c024cda85c6616943c3a12ab5943a7be8709bfe3))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("banz_u19.l1", 0x20000, 0x8000, CRC(9104248c) SHA1(48a8c41f3a4127f4fb4de37e876c8380e3511e1f))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("banz_u20.l1", 0x40000, 0x8000, CRC(26b3d15c) SHA1(528084b6c62394f8ed9fc0f90b91d844060fc904))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(bnzai_g3)
@@ -408,10 +423,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("banz_u21.l1", 0x18000, 0x8000, CRC(cd06716e) SHA1(b61a0dc017dd4a09296a43a855461c5cee07517b))
 	ROM_LOAD("banz_u22.l1", 0x10000, 0x8000, CRC(e8159033) SHA1(e8f15801feefeb30768e88d685c208108aa134e8))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("banz_u4.l1", 0x10000, 0x8000, CRC(8fd69c69) SHA1(c024cda85c6616943c3a12ab5943a7be8709bfe3))
-	ROM_LOAD("banz_u19.l1", 0x18000, 0x8000, CRC(9104248c) SHA1(48a8c41f3a4127f4fb4de37e876c8380e3511e1f))
-	ROM_LOAD("banz_u20.l1", 0x20000, 0x8000, CRC(26b3d15c) SHA1(528084b6c62394f8ed9fc0f90b91d844060fc904))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("banz_u4.l1", 0x00000, 0x8000, CRC(8fd69c69) SHA1(c024cda85c6616943c3a12ab5943a7be8709bfe3))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("banz_u19.l1", 0x20000, 0x8000, CRC(9104248c) SHA1(48a8c41f3a4127f4fb4de37e876c8380e3511e1f))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("banz_u20.l1", 0x40000, 0x8000, CRC(26b3d15c) SHA1(528084b6c62394f8ed9fc0f90b91d844060fc904))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(bnzai_l1)
@@ -421,10 +445,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("banz_u21.l1", 0x18000, 0x8000, CRC(cd06716e) SHA1(b61a0dc017dd4a09296a43a855461c5cee07517b))
 	ROM_LOAD("banz_u22.l1", 0x10000, 0x8000, CRC(e8159033) SHA1(e8f15801feefeb30768e88d685c208108aa134e8))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("banz_u4.l1", 0x10000, 0x8000, CRC(8fd69c69) SHA1(c024cda85c6616943c3a12ab5943a7be8709bfe3))
-	ROM_LOAD("banz_u19.l1", 0x18000, 0x8000, CRC(9104248c) SHA1(48a8c41f3a4127f4fb4de37e876c8380e3511e1f))
-	ROM_LOAD("banz_u20.l1", 0x20000, 0x8000, CRC(26b3d15c) SHA1(528084b6c62394f8ed9fc0f90b91d844060fc904))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("banz_u4.l1", 0x00000, 0x8000, CRC(8fd69c69) SHA1(c024cda85c6616943c3a12ab5943a7be8709bfe3))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("banz_u19.l1", 0x20000, 0x8000, CRC(9104248c) SHA1(48a8c41f3a4127f4fb4de37e876c8380e3511e1f))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("banz_u20.l1", 0x40000, 0x8000, CRC(26b3d15c) SHA1(528084b6c62394f8ed9fc0f90b91d844060fc904))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(bnzai_pa)
@@ -434,10 +467,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("banz_u21.l1", 0x18000, 0x8000, CRC(cd06716e) SHA1(b61a0dc017dd4a09296a43a855461c5cee07517b))
 	ROM_LOAD("banz_u22.l1", 0x10000, 0x8000, CRC(e8159033) SHA1(e8f15801feefeb30768e88d685c208108aa134e8))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("u4-p7.rom", 0x10000, 0x8000, CRC(630d1ce9) SHA1(fb7f6004b94bf20281216519f18b53949eef4405))
-	ROM_LOAD("banz_u19.l1", 0x18000, 0x8000, CRC(9104248c) SHA1(48a8c41f3a4127f4fb4de37e876c8380e3511e1f))
-	ROM_LOAD("banz_u20.l1", 0x20000, 0x8000, CRC(26b3d15c) SHA1(528084b6c62394f8ed9fc0f90b91d844060fc904))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("u4-p7.rom", 0x00000, 0x8000, CRC(630d1ce9) SHA1(fb7f6004b94bf20281216519f18b53949eef4405))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("banz_u19.l1", 0x20000, 0x8000, CRC(9104248c) SHA1(48a8c41f3a4127f4fb4de37e876c8380e3511e1f))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("banz_u20.l1", 0x40000, 0x8000, CRC(26b3d15c) SHA1(528084b6c62394f8ed9fc0f90b91d844060fc904))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 /*--------------------
@@ -450,9 +492,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("guns_u21.l1", 0x18000, 0x8000, CRC(35c6bfe4) SHA1(83dbd10311add75f56046de58d315f8a87389703))
 	ROM_LOAD("guns_u22.l1", 0x10000, 0x8000, CRC(091a5cb8) SHA1(db77314241eb6ed7f4385f99312a49b7caad1283))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("gund_u4.l1", 0x10000, 0x8000, CRC(d4a430a3) SHA1(5b44e3f313cc7cb75f51c239013d46e5eb986f9d))
-	ROM_LOAD("guns_u19.l1", 0x18000, 0x8000, CRC(ec1a6c23) SHA1(45bb4f78b89de9e690b5f9741d17f97766e702d6))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("gund_u4.l1", 0x00000, 0x8000, CRC(d4a430a3) SHA1(5b44e3f313cc7cb75f51c239013d46e5eb986f9d))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("guns_u19.l1", 0x20000, 0x8000, CRC(ec1a6c23) SHA1(45bb4f78b89de9e690b5f9741d17f97766e702d6))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(bguns_l7)
@@ -462,9 +510,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("guns_u21.l1", 0x18000, 0x8000, CRC(35c6bfe4) SHA1(83dbd10311add75f56046de58d315f8a87389703))
 	ROM_LOAD("guns_u22.l1", 0x10000, 0x8000, CRC(091a5cb8) SHA1(db77314241eb6ed7f4385f99312a49b7caad1283))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("gund_u4.l1", 0x10000, 0x8000, CRC(d4a430a3) SHA1(5b44e3f313cc7cb75f51c239013d46e5eb986f9d))
-	ROM_LOAD("guns_u19.l1", 0x18000, 0x8000, CRC(ec1a6c23) SHA1(45bb4f78b89de9e690b5f9741d17f97766e702d6))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("gund_u4.l1", 0x00000, 0x8000, CRC(d4a430a3) SHA1(5b44e3f313cc7cb75f51c239013d46e5eb986f9d))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("guns_u19.l1", 0x20000, 0x8000, CRC(ec1a6c23) SHA1(45bb4f78b89de9e690b5f9741d17f97766e702d6))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(bguns_la)
@@ -474,9 +528,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("guns_u21.l1", 0x18000, 0x8000, CRC(35c6bfe4) SHA1(83dbd10311add75f56046de58d315f8a87389703))
 	ROM_LOAD("guns_u22.l1", 0x10000, 0x8000, CRC(091a5cb8) SHA1(db77314241eb6ed7f4385f99312a49b7caad1283))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("gund_u4.l1", 0x10000, 0x8000, CRC(d4a430a3) SHA1(5b44e3f313cc7cb75f51c239013d46e5eb986f9d))
-	ROM_LOAD("guns_u19.l1", 0x18000, 0x8000, CRC(ec1a6c23) SHA1(45bb4f78b89de9e690b5f9741d17f97766e702d6))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("gund_u4.l1", 0x00000, 0x8000, CRC(d4a430a3) SHA1(5b44e3f313cc7cb75f51c239013d46e5eb986f9d))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("guns_u19.l1", 0x20000, 0x8000, CRC(ec1a6c23) SHA1(45bb4f78b89de9e690b5f9741d17f97766e702d6))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(bguns_p1)
@@ -486,9 +546,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("guns_u21.l1", 0x18000, 0x8000, CRC(35c6bfe4) SHA1(83dbd10311add75f56046de58d315f8a87389703))
 	ROM_LOAD("guns_u22.l1", 0x10000, 0x8000, CRC(091a5cb8) SHA1(db77314241eb6ed7f4385f99312a49b7caad1283))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("gund_u4.l1", 0x10000, 0x8000, CRC(d4a430a3) SHA1(5b44e3f313cc7cb75f51c239013d46e5eb986f9d))
-	ROM_LOAD("guns_u19.l1", 0x18000, 0x8000, CRC(ec1a6c23) SHA1(45bb4f78b89de9e690b5f9741d17f97766e702d6))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("gund_u4.l1", 0x00000, 0x8000, CRC(d4a430a3) SHA1(5b44e3f313cc7cb75f51c239013d46e5eb986f9d))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("guns_u19.l1", 0x20000, 0x8000, CRC(ec1a6c23) SHA1(45bb4f78b89de9e690b5f9741d17f97766e702d6))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 /*-----------------------
@@ -501,9 +567,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("bk2k_u21.l1", 0x18000, 0x8000, CRC(08be36ad) SHA1(0f4c448e003df54ed8ccf0e0c57f6123ce1e2027))
 	ROM_LOAD("bk2k_u22.l1", 0x10000, 0x8000, CRC(9c8becd8) SHA1(9090e8104dad63f14246caabafec428d94d5e18d))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("bk2k_u4.l2", 0x10000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
-	ROM_LOAD("bk2k_u19.l1", 0x18000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("bk2k_u4.l2", 0x00000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("bk2k_u19.l1", 0x20000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(bk2k_lg1) // the rom at u26 is reported as bad when the game is booted, but appears to run nonetheless; bad dump or original bug in the LG-1 set fixed in LG-2 and LG-3?
@@ -513,9 +585,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("bk2k_u21.l1", 0x18000, 0x8000, CRC(08be36ad) SHA1(0f4c448e003df54ed8ccf0e0c57f6123ce1e2027))
 	ROM_LOAD("bk2k_u22.l1", 0x10000, 0x8000, CRC(9c8becd8) SHA1(9090e8104dad63f14246caabafec428d94d5e18d))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("bk2k_u4.l2", 0x10000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
-	ROM_LOAD("bk2k_u19.l1", 0x18000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("bk2k_u4.l2", 0x00000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("bk2k_u19.l1", 0x20000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(bk2k_lg3)
@@ -525,9 +603,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("bk2k_u21.l1", 0x18000, 0x8000, CRC(08be36ad) SHA1(0f4c448e003df54ed8ccf0e0c57f6123ce1e2027))
 	ROM_LOAD("bk2k_u22.l1", 0x10000, 0x8000, CRC(9c8becd8) SHA1(9090e8104dad63f14246caabafec428d94d5e18d))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("bk2k_u4.l2", 0x10000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
-	ROM_LOAD("bk2k_u19.l1", 0x18000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("bk2k_u4.l2", 0x00000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("bk2k_u19.l1", 0x20000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(bk2k_pu1)
@@ -537,9 +621,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("bk2k_u21.l1", 0x18000, 0x8000, CRC(08be36ad) SHA1(0f4c448e003df54ed8ccf0e0c57f6123ce1e2027))
 	ROM_LOAD("bk2k_u22.l1", 0x10000, 0x8000, CRC(9c8becd8) SHA1(9090e8104dad63f14246caabafec428d94d5e18d))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("bk2k_u4.l2", 0x10000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
-	ROM_LOAD("bk2k_u19.l1", 0x18000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("bk2k_u4.l2", 0x00000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("bk2k_u19.l1", 0x20000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(bk2k_pf1)
@@ -549,9 +639,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("bk2k_u21.l1", 0x18000, 0x8000, CRC(08be36ad) SHA1(0f4c448e003df54ed8ccf0e0c57f6123ce1e2027))
 	ROM_LOAD("bk2k_u22.l1", 0x10000, 0x8000, CRC(9c8becd8) SHA1(9090e8104dad63f14246caabafec428d94d5e18d))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("bk2k_u4.l2", 0x10000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
-	ROM_LOAD("bk2k_u19.l1", 0x18000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("bk2k_u4.l2", 0x00000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("bk2k_u19.l1", 0x20000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(bk2k_la2)
@@ -561,9 +657,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("bk2k_u21.l1", 0x18000, 0x8000, CRC(08be36ad) SHA1(0f4c448e003df54ed8ccf0e0c57f6123ce1e2027))
 	ROM_LOAD("bk2k_u22.l1", 0x10000, 0x8000, CRC(9c8becd8) SHA1(9090e8104dad63f14246caabafec428d94d5e18d))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("bk2k_u4.l2", 0x10000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
-	ROM_LOAD("bk2k_u19.l1", 0x18000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("bk2k_u4.l2", 0x00000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("bk2k_u19.l1", 0x20000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(bk2k_pa7)
@@ -573,9 +675,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("bk2k_u21.l1", 0x18000, 0x8000, CRC(08be36ad) SHA1(0f4c448e003df54ed8ccf0e0c57f6123ce1e2027))
 	ROM_LOAD("bk2k_u22.l1", 0x10000, 0x8000, CRC(9c8becd8) SHA1(9090e8104dad63f14246caabafec428d94d5e18d))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("bk2k_u4.l2", 0x10000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
-	ROM_LOAD("bk2k_u19.l1", 0x18000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("bk2k_u4.l2", 0x00000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("bk2k_u19.l1", 0x20000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(bk2k_pa5)
@@ -585,9 +693,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("bk2k_u21.l1", 0x18000, 0x8000, CRC(08be36ad) SHA1(0f4c448e003df54ed8ccf0e0c57f6123ce1e2027))
 	ROM_LOAD("bk2k_u22.l1", 0x10000, 0x8000, CRC(9c8becd8) SHA1(9090e8104dad63f14246caabafec428d94d5e18d))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("bk2k_u4.l2", 0x10000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
-	ROM_LOAD("bk2k_u19.l1", 0x18000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("bk2k_u4.l2", 0x00000, 0x8000, CRC(1d87281b) SHA1(609288b017aac6ce6da8717a35fdf87013adeb3c))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("bk2k_u19.l1", 0x20000, 0x8000, CRC(58e162b2) SHA1(891f810ae18b46593f570d719f0290a1d08a1a10))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 /*--------------------
@@ -600,9 +714,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("cycl_u21.l1", 0x18000, 0x8000, CRC(d4f69a7c) SHA1(da0ce27d92b22583be54a41fc8083cee803c987a))
 	ROM_LOAD("cycl_u22.l1", 0x10000, 0x8000, CRC(28dc8f13) SHA1(bccce3a9b6b2f52da919c6df8db07e5e3de12657))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("cycl_u4.l5", 0x10000, 0x8000, CRC(d04b663b) SHA1(f54c6df08ec73b733cfeb2a989e44e5c04da3d9e))
-	ROM_LOAD("cycl_u19.l1", 0x18000, 0x8000, CRC(a20f6519) SHA1(63ded5f76133340fa31d4fe65420f4465866fb85))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("cycl_u4.l5", 0x00000, 0x8000, CRC(d04b663b) SHA1(f54c6df08ec73b733cfeb2a989e44e5c04da3d9e))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("cycl_u19.l1", 0x20000, 0x8000, CRC(a20f6519) SHA1(63ded5f76133340fa31d4fe65420f4465866fb85))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(cycln_l4)
@@ -612,9 +732,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("cycl_u21.l1", 0x18000, 0x8000, CRC(d4f69a7c) SHA1(da0ce27d92b22583be54a41fc8083cee803c987a))
 	ROM_LOAD("cycl_u22.l1", 0x10000, 0x8000, CRC(28dc8f13) SHA1(bccce3a9b6b2f52da919c6df8db07e5e3de12657))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("cycl_u4.l5", 0x10000, 0x8000, CRC(d04b663b) SHA1(f54c6df08ec73b733cfeb2a989e44e5c04da3d9e))
-	ROM_LOAD("cycl_u19.l1", 0x18000, 0x8000, CRC(a20f6519) SHA1(63ded5f76133340fa31d4fe65420f4465866fb85))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("cycl_u4.l5", 0x00000, 0x8000, CRC(d04b663b) SHA1(f54c6df08ec73b733cfeb2a989e44e5c04da3d9e))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("cycl_u19.l1", 0x20000, 0x8000, CRC(a20f6519) SHA1(63ded5f76133340fa31d4fe65420f4465866fb85))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(cycln_l1)
@@ -624,9 +750,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("cycl_u21.l1", 0x18000, 0x8000, CRC(d4f69a7c) SHA1(da0ce27d92b22583be54a41fc8083cee803c987a))
 	ROM_LOAD("cycl_u22.l1", 0x10000, 0x8000, CRC(28dc8f13) SHA1(bccce3a9b6b2f52da919c6df8db07e5e3de12657))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("cycl_u4.l5", 0x10000, 0x8000, CRC(d04b663b) SHA1(f54c6df08ec73b733cfeb2a989e44e5c04da3d9e))
-	ROM_LOAD("cycl_u19.l1", 0x18000, 0x8000, CRC(a20f6519) SHA1(63ded5f76133340fa31d4fe65420f4465866fb85))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("cycl_u4.l5", 0x00000, 0x8000, CRC(d04b663b) SHA1(f54c6df08ec73b733cfeb2a989e44e5c04da3d9e))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("cycl_u19.l1", 0x20000, 0x8000, CRC(a20f6519) SHA1(63ded5f76133340fa31d4fe65420f4465866fb85))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 /*--------------------
@@ -639,9 +771,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("eshk_u21.l1", 0x18000, 0x8000, CRC(feac68e5) SHA1(2f12a78398bc3a468e3e0656da91260d45b0663b))
 	ROM_LOAD("eshk_u22.l1", 0x10000, 0x8000, CRC(44f50fe1) SHA1(a8e24dbb0f5cf300118e1ebdcd2bb6b274d87936))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("eshk_u4.l1", 0x10000, 0x8000, CRC(40069f8c) SHA1(aafdc189259fa9c8dc49e60e978b84775e16c64e))
-	ROM_LOAD("eshk_u19.l1", 0x18000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("eshk_u4.l1", 0x00000, 0x8000, CRC(40069f8c) SHA1(aafdc189259fa9c8dc49e60e978b84775e16c64e))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("eshk_u19.l1", 0x20000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(esha_la3)
@@ -651,9 +789,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("eshk_u21.l1", 0x18000, 0x8000, CRC(feac68e5) SHA1(2f12a78398bc3a468e3e0656da91260d45b0663b))
 	ROM_LOAD("eshk_u22.l1", 0x10000, 0x8000, CRC(44f50fe1) SHA1(a8e24dbb0f5cf300118e1ebdcd2bb6b274d87936))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("eshk_u4.l1", 0x10000, 0x8000, CRC(40069f8c) SHA1(aafdc189259fa9c8dc49e60e978b84775e16c64e))
-	ROM_LOAD("eshk_u19.l1", 0x18000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("eshk_u4.l1", 0x00000, 0x8000, CRC(40069f8c) SHA1(aafdc189259fa9c8dc49e60e978b84775e16c64e))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("eshk_u19.l1", 0x20000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(esha_ma3)
@@ -663,9 +807,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("eshk_u21.l1", 0x18000, 0x8000, CRC(feac68e5) SHA1(2f12a78398bc3a468e3e0656da91260d45b0663b))
 	ROM_LOAD("eshk_u22.l1", 0x10000, 0x8000, CRC(44f50fe1) SHA1(a8e24dbb0f5cf300118e1ebdcd2bb6b274d87936))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("eshk_u4.l1", 0x10000, 0x8000, CRC(40069f8c) SHA1(aafdc189259fa9c8dc49e60e978b84775e16c64e))
-	ROM_LOAD("eshk_u19.l1", 0x18000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("eshk_u4.l1", 0x00000, 0x8000, CRC(40069f8c) SHA1(aafdc189259fa9c8dc49e60e978b84775e16c64e))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("eshk_u19.l1", 0x20000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(esha_lg1)
@@ -675,9 +825,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("eshk_u21.l1", 0x18000, 0x8000, CRC(feac68e5) SHA1(2f12a78398bc3a468e3e0656da91260d45b0663b))
 	ROM_LOAD("eshk_u22.l1", 0x10000, 0x8000, CRC(44f50fe1) SHA1(a8e24dbb0f5cf300118e1ebdcd2bb6b274d87936))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("eshk_u4.l1", 0x10000, 0x8000, CRC(40069f8c) SHA1(aafdc189259fa9c8dc49e60e978b84775e16c64e))
-	ROM_LOAD("eshk_u19.l1", 0x18000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("eshk_u4.l1", 0x00000, 0x8000, CRC(40069f8c) SHA1(aafdc189259fa9c8dc49e60e978b84775e16c64e))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("eshk_u19.l1", 0x20000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(esha_lg2)
@@ -687,9 +843,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("eshk_u21.l1", 0x18000, 0x8000, CRC(feac68e5) SHA1(2f12a78398bc3a468e3e0656da91260d45b0663b))
 	ROM_LOAD("eshk_u22.l1", 0x10000, 0x8000, CRC(44f50fe1) SHA1(a8e24dbb0f5cf300118e1ebdcd2bb6b274d87936))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("eshk_u4.l1", 0x10000, 0x8000, CRC(40069f8c) SHA1(aafdc189259fa9c8dc49e60e978b84775e16c64e))
-	ROM_LOAD("eshk_u19.l1", 0x18000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("eshk_u4.l1", 0x00000, 0x8000, CRC(40069f8c) SHA1(aafdc189259fa9c8dc49e60e978b84775e16c64e))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("eshk_u19.l1", 0x20000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(esha_la1)
@@ -699,9 +861,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("eshk_u21.l1", 0x18000, 0x8000, CRC(feac68e5) SHA1(2f12a78398bc3a468e3e0656da91260d45b0663b))
 	ROM_LOAD("eshk_u22.l1", 0x10000, 0x8000, CRC(44f50fe1) SHA1(a8e24dbb0f5cf300118e1ebdcd2bb6b274d87936))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("eshk_u4.l1", 0x10000, 0x8000, CRC(40069f8c) SHA1(aafdc189259fa9c8dc49e60e978b84775e16c64e))
-	ROM_LOAD("eshk_u19.l1", 0x18000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("eshk_u4.l1", 0x00000, 0x8000, CRC(40069f8c) SHA1(aafdc189259fa9c8dc49e60e978b84775e16c64e))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("eshk_u19.l1", 0x20000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(esha_pa1)
@@ -711,9 +879,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("eshk_u21.l1", 0x18000, 0x8000, CRC(feac68e5) SHA1(2f12a78398bc3a468e3e0656da91260d45b0663b))
 	ROM_LOAD("eshk_u22.l1", 0x10000, 0x8000, CRC(44f50fe1) SHA1(a8e24dbb0f5cf300118e1ebdcd2bb6b274d87936))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("u4-p1.rom", 0x10000, 0x8000, CRC(7219ffc2) SHA1(b8585b7d12f401d8ba4d95a5e2f20d35ff0ac26a))
-	ROM_LOAD("eshk_u19.l1", 0x18000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("u4-p1.rom", 0x00000, 0x8000, CRC(7219ffc2) SHA1(b8585b7d12f401d8ba4d95a5e2f20d35ff0ac26a))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("eshk_u19.l1", 0x20000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(esha_pa4)
@@ -723,9 +897,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("eshk_u21.l1", 0x18000, 0x8000, CRC(feac68e5) SHA1(2f12a78398bc3a468e3e0656da91260d45b0663b))
 	ROM_LOAD("eshk_u22.l1", 0x10000, 0x8000, CRC(44f50fe1) SHA1(a8e24dbb0f5cf300118e1ebdcd2bb6b274d87936))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("u4-p1.rom", 0x10000, 0x8000, CRC(7219ffc2) SHA1(b8585b7d12f401d8ba4d95a5e2f20d35ff0ac26a))
-	ROM_LOAD("eshk_u19.l1", 0x18000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("u4-p1.rom", 0x00000, 0x8000, CRC(7219ffc2) SHA1(b8585b7d12f401d8ba4d95a5e2f20d35ff0ac26a))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("eshk_u19.l1", 0x20000, 0x8000, CRC(e5593075) SHA1(549b03402e5639b449e35325eb52e78f8810b07a))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 /*--------------------
@@ -738,10 +918,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("elvi_u21.l1", 0x18000, 0x8000, CRC(68d44545) SHA1(8c3ea8521a44b1539cd148f142cca14184174ba7))
 	ROM_LOAD("elvi_u22.l1", 0x10000, 0x8000, CRC(e525b4fe) SHA1(be728ec33a00b93c3346428a9248b588460af945))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("elvi_u4.l1", 0x10000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
-	ROM_LOAD("elvi_u19.l1", 0x18000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
-	ROM_LOAD("elvi_u20.l1", 0x20000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("elvi_u4.l1", 0x00000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("elvi_u19.l1", 0x20000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("elvi_u20.l1", 0x40000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(eatpm_l1)
@@ -751,10 +940,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("elvi_u21.l1", 0x18000, 0x8000, CRC(68d44545) SHA1(8c3ea8521a44b1539cd148f142cca14184174ba7))
 	ROM_LOAD("elvi_u22.l1", 0x10000, 0x8000, CRC(e525b4fe) SHA1(be728ec33a00b93c3346428a9248b588460af945))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("elvi_u4.l1", 0x10000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
-	ROM_LOAD("elvi_u19.l1", 0x18000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
-	ROM_LOAD("elvi_u20.l1", 0x20000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("elvi_u4.l1", 0x00000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("elvi_u19.l1", 0x20000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("elvi_u20.l1", 0x40000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(eatpm_l2)
@@ -764,10 +962,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("elvi_u21.l1", 0x18000, 0x8000, CRC(68d44545) SHA1(8c3ea8521a44b1539cd148f142cca14184174ba7))
 	ROM_LOAD("elvi_u22.l1", 0x10000, 0x8000, CRC(e525b4fe) SHA1(be728ec33a00b93c3346428a9248b588460af945))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("elvi_u4.l1", 0x10000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
-	ROM_LOAD("elvi_u19.l1", 0x18000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
-	ROM_LOAD("elvi_u20.l1", 0x20000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("elvi_u4.l1", 0x00000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("elvi_u19.l1", 0x20000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("elvi_u20.l1", 0x40000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(eatpm_4g)
@@ -777,10 +984,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("elvi_u21.l1", 0x18000, 0x8000, CRC(68d44545) SHA1(8c3ea8521a44b1539cd148f142cca14184174ba7))
 	ROM_LOAD("elvi_u22.l1", 0x10000, 0x8000, CRC(e525b4fe) SHA1(be728ec33a00b93c3346428a9248b588460af945))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("elvi_u4.l1", 0x10000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
-	ROM_LOAD("elvi_u19.l1", 0x18000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
-	ROM_LOAD("elvi_u20.l1", 0x20000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("elvi_u4.l1", 0x00000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("elvi_u19.l1", 0x20000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("elvi_u20.l1", 0x40000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(eatpm_4u)
@@ -790,10 +1006,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("elvi_u21.l1", 0x18000, 0x8000, CRC(68d44545) SHA1(8c3ea8521a44b1539cd148f142cca14184174ba7))
 	ROM_LOAD("elvi_u22.l1", 0x10000, 0x8000, CRC(e525b4fe) SHA1(be728ec33a00b93c3346428a9248b588460af945))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("elvi_u4.l1", 0x10000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
-	ROM_LOAD("elvi_u19.l1", 0x18000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
-	ROM_LOAD("elvi_u20.l1", 0x20000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("elvi_u4.l1", 0x00000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("elvi_u19.l1", 0x20000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("elvi_u20.l1", 0x40000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(eatpm_f1)
@@ -803,10 +1028,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("elvi_u21.l1", 0x18000, 0x8000, CRC(68d44545) SHA1(8c3ea8521a44b1539cd148f142cca14184174ba7))
 	ROM_LOAD("elvi_u22.l1", 0x10000, 0x8000, CRC(e525b4fe) SHA1(be728ec33a00b93c3346428a9248b588460af945))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("elvi_u4.l1", 0x10000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
-	ROM_LOAD("elvi_u19.l1", 0x18000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
-	ROM_LOAD("elvi_u20.l1", 0x20000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("elvi_u4.l1", 0x00000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("elvi_u19.l1", 0x20000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("elvi_u20.l1", 0x40000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(eatpm_p7)
@@ -816,15 +1050,25 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("elvi_u21.l1", 0x18000, 0x8000, CRC(68d44545) SHA1(8c3ea8521a44b1539cd148f142cca14184174ba7))
 	ROM_LOAD("elvi_u22.l1", 0x10000, 0x8000, CRC(e525b4fe) SHA1(be728ec33a00b93c3346428a9248b588460af945))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("elvi_u4.l1", 0x10000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
-	ROM_LOAD("elvi_u19.l1", 0x18000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
-	ROM_LOAD("elvi_u20.l1", 0x20000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("elvi_u4.l1", 0x00000, 0x8000, CRC(b5afa4db) SHA1(59b72dac5301a4befa01b93da5162478682e6021))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("elvi_u19.l1", 0x20000, 0x8000, CRC(806bc350) SHA1(d170aef11001096da9f2f7240726662009e26f5f))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("elvi_u20.l1", 0x40000, 0x8000, CRC(3d92d5fd) SHA1(834d40a59be57057103d1d8ab48fdaaf7dc5eda2))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 /*--------------------
 / Jokerz! 1/89
 /--------------------*/
+// NOTE: This game uses an entirely different sound/music board unique for this game: D-12338-567
 ROM_START(jokrz_l6)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("jokeru26.l6", 0x4000, 0x4000, CRC(c748c1ba) SHA1(e74b3be2c5d3e81ff29bc4444384f456846111b3))
@@ -832,8 +1076,9 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("jokeru21.l1", 0x18000, 0x8000, CRC(9e2be4f6) SHA1(6e26b55935d0c8138176b54a11c1a9ab58366628))
 	ROM_LOAD("jokeru22.l1", 0x10000, 0x8000, CRC(2f67160c) SHA1(f1e179fde41f9bf8226069c24b0bd5152a13e518))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("jokeru5.l2", 0x10000, 0x10000, CRC(e9dc0095) SHA1(23a99555e50461ccc8e67de01796642c080294c2))
+	ROM_REGION(0x40000, "ps88:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("jokeru5.l2", 0x30000, 0x10000, CRC(e9dc0095) SHA1(23a99555e50461ccc8e67de01796642c080294c2))
+	ROM_RELOAD(0x20000,0x10000)
 ROM_END
 
 ROM_START(jokrz_l3)
@@ -843,8 +1088,9 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("jokeru21.l1", 0x18000, 0x8000, CRC(9e2be4f6) SHA1(6e26b55935d0c8138176b54a11c1a9ab58366628))
 	ROM_LOAD("jokeru22.l1", 0x10000, 0x8000, CRC(2f67160c) SHA1(f1e179fde41f9bf8226069c24b0bd5152a13e518))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("jokeru5.l2", 0x10000, 0x10000, CRC(e9dc0095) SHA1(23a99555e50461ccc8e67de01796642c080294c2))
+	ROM_REGION(0x40000, "ps88:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("jokeru5.l2", 0x30000, 0x10000, CRC(e9dc0095) SHA1(23a99555e50461ccc8e67de01796642c080294c2))
+	ROM_RELOAD(0x20000,0x10000)
 ROM_END
 
 ROM_START(jokrz_g4)
@@ -854,8 +1100,9 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("jokeru21.l1", 0x18000, 0x8000, CRC(9e2be4f6) SHA1(6e26b55935d0c8138176b54a11c1a9ab58366628))
 	ROM_LOAD("jokeru22.l1", 0x10000, 0x8000, CRC(2f67160c) SHA1(f1e179fde41f9bf8226069c24b0bd5152a13e518))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("jokeru5.l2", 0x10000, 0x10000, CRC(e9dc0095) SHA1(23a99555e50461ccc8e67de01796642c080294c2))
+	ROM_REGION(0x40000, "ps88:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("jokeru5.l2", 0x30000, 0x10000, CRC(e9dc0095) SHA1(23a99555e50461ccc8e67de01796642c080294c2))
+	ROM_RELOAD(0x20000,0x10000)
 ROM_END
 
 /*-----------------------
@@ -868,10 +1115,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("mous_u20.l2", 0x18000, 0x8000, CRC(59b1b0c5) SHA1(443426be41c1413f22b137145dbc3bcf84d9ccc7))
 	ROM_LOAD("mous_u22.l1", 0x10000, 0x8000, CRC(00ad198c) SHA1(4f15696909e1f3574ad20b28e31da2c155ed129f))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("mous_u4.l2", 0x10000, 0x8000, CRC(643add1e) SHA1(45dea0f4c6f24d17e6f7dda75afaa7caefdc6b96))
-	ROM_LOAD("mous_u19.l2", 0x18000, 0x8000, CRC(7b4941f7) SHA1(2b2fc8e7634b1885b020b2115126d6341172cc91))
-	ROM_LOAD("mous_u20.l2", 0x20000, 0x8000, CRC(59b1b0c5) SHA1(443426be41c1413f22b137145dbc3bcf84d9ccc7))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("mous_u4.l2", 0x00000, 0x8000, CRC(643add1e) SHA1(45dea0f4c6f24d17e6f7dda75afaa7caefdc6b96))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("mous_u19.l2", 0x20000, 0x8000, CRC(7b4941f7) SHA1(2b2fc8e7634b1885b020b2115126d6341172cc91))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("mous_u20.l2", 0x40000, 0x8000, CRC(59b1b0c5) SHA1(443426be41c1413f22b137145dbc3bcf84d9ccc7))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(mousn_l1)
@@ -881,10 +1137,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("mous_u20.l2", 0x18000, 0x8000, CRC(59b1b0c5) SHA1(443426be41c1413f22b137145dbc3bcf84d9ccc7))
 	ROM_LOAD("mous_u22.l1", 0x10000, 0x8000, CRC(00ad198c) SHA1(4f15696909e1f3574ad20b28e31da2c155ed129f))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("mous_u4.l2", 0x10000, 0x8000, CRC(643add1e) SHA1(45dea0f4c6f24d17e6f7dda75afaa7caefdc6b96))
-	ROM_LOAD("mous_u19.l2", 0x18000, 0x8000, CRC(7b4941f7) SHA1(2b2fc8e7634b1885b020b2115126d6341172cc91))
-	ROM_LOAD("mous_u20.l2", 0x20000, 0x8000, CRC(59b1b0c5) SHA1(443426be41c1413f22b137145dbc3bcf84d9ccc7))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("mous_u4.l2", 0x00000, 0x8000, CRC(643add1e) SHA1(45dea0f4c6f24d17e6f7dda75afaa7caefdc6b96))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("mous_u19.l2", 0x20000, 0x8000, CRC(7b4941f7) SHA1(2b2fc8e7634b1885b020b2115126d6341172cc91))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("mous_u20.l2", 0x40000, 0x8000, CRC(59b1b0c5) SHA1(443426be41c1413f22b137145dbc3bcf84d9ccc7))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(mousn_lu)
@@ -894,10 +1159,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("mous_u20.l2", 0x18000, 0x8000, CRC(59b1b0c5) SHA1(443426be41c1413f22b137145dbc3bcf84d9ccc7))
 	ROM_LOAD("mous_u22.l1", 0x10000, 0x8000, CRC(00ad198c) SHA1(4f15696909e1f3574ad20b28e31da2c155ed129f))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("mous_u4.l2", 0x10000, 0x8000, CRC(643add1e) SHA1(45dea0f4c6f24d17e6f7dda75afaa7caefdc6b96))
-	ROM_LOAD("mous_u19.l2", 0x18000, 0x8000, CRC(7b4941f7) SHA1(2b2fc8e7634b1885b020b2115126d6341172cc91))
-	ROM_LOAD("mous_u20.l2", 0x20000, 0x8000, CRC(59b1b0c5) SHA1(443426be41c1413f22b137145dbc3bcf84d9ccc7))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("mous_u4.l2", 0x00000, 0x8000, CRC(643add1e) SHA1(45dea0f4c6f24d17e6f7dda75afaa7caefdc6b96))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("mous_u19.l2", 0x20000, 0x8000, CRC(7b4941f7) SHA1(2b2fc8e7634b1885b020b2115126d6341172cc91))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("mous_u20.l2", 0x40000, 0x8000, CRC(59b1b0c5) SHA1(443426be41c1413f22b137145dbc3bcf84d9ccc7))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(mousn_lx)
@@ -907,10 +1181,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("mous_u20.l2", 0x18000, 0x8000, CRC(59b1b0c5) SHA1(443426be41c1413f22b137145dbc3bcf84d9ccc7))
 	ROM_LOAD("mous_u22.l1", 0x10000, 0x8000, CRC(00ad198c) SHA1(4f15696909e1f3574ad20b28e31da2c155ed129f))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("mous_u4.lx", 0x10000, 0x8000, CRC(d311db4a) SHA1(d9d20921eb42c19c5074c976608bfec0d3130204))
-	ROM_LOAD("mous_u19.lx", 0x18000, 0x8000, CRC(c7a6f494) SHA1(272f0bd3885bb81da13ee6ed3d66f9424ccf4b0d))
-	ROM_LOAD("mous_u20.l2", 0x20000, 0x8000, CRC(59b1b0c5) SHA1(443426be41c1413f22b137145dbc3bcf84d9ccc7))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("mous_u4.lx", 0x00000, 0x8000, CRC(d311db4a) SHA1(d9d20921eb42c19c5074c976608bfec0d3130204))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("mous_u19.lx", 0x20000, 0x8000, CRC(c7a6f494) SHA1(272f0bd3885bb81da13ee6ed3d66f9424ccf4b0d))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("mous_u20.l2", 0x40000, 0x8000, CRC(59b1b0c5) SHA1(443426be41c1413f22b137145dbc3bcf84d9ccc7))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
 ROM_END
 
 /*-----------------------
@@ -923,9 +1206,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("pfrc_u21.l1", 0x18000, 0x8000, CRC(7729afd3) SHA1(9cd2898a7a4203cf3b2dcd203e25cde5dd582ee7))
 	ROM_LOAD("pfrc_u22.l1", 0x10000, 0x8000, CRC(40f5e6b2) SHA1(4af2e2658720b08d03d24c9d314a6e5074b2c747))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pfrc_u4.l2", 0x10000, 0x8000, CRC(8f431529) SHA1(0f479990715a31fd860c000a066cffb70da502c2))
-	ROM_LOAD("pfrc_u19.l1", 0x18000, 0x8000, CRC(abc4caeb) SHA1(6faef2de9a49a1015b4038ab18849de2f25dbded))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pfrc_u4.l2", 0x00000, 0x8000, CRC(8f431529) SHA1(0f479990715a31fd860c000a066cffb70da502c2))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("pfrc_u19.l1", 0x20000, 0x8000, CRC(abc4caeb) SHA1(6faef2de9a49a1015b4038ab18849de2f25dbded))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(polic_l3)
@@ -935,9 +1224,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("pfrc_u21.l1", 0x18000, 0x8000, CRC(7729afd3) SHA1(9cd2898a7a4203cf3b2dcd203e25cde5dd582ee7))
 	ROM_LOAD("pfrc_u22.l1", 0x10000, 0x8000, CRC(40f5e6b2) SHA1(4af2e2658720b08d03d24c9d314a6e5074b2c747))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pfrc_u4.l2", 0x10000, 0x8000, CRC(8f431529) SHA1(0f479990715a31fd860c000a066cffb70da502c2))
-	ROM_LOAD("pfrc_u19.l1", 0x18000, 0x8000, CRC(abc4caeb) SHA1(6faef2de9a49a1015b4038ab18849de2f25dbded))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pfrc_u4.l2", 0x00000, 0x8000, CRC(8f431529) SHA1(0f479990715a31fd860c000a066cffb70da502c2))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("pfrc_u19.l1", 0x20000, 0x8000, CRC(abc4caeb) SHA1(6faef2de9a49a1015b4038ab18849de2f25dbded))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(polic_l2)
@@ -947,9 +1242,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("pfrc_u21.l1", 0x18000, 0x8000, CRC(7729afd3) SHA1(9cd2898a7a4203cf3b2dcd203e25cde5dd582ee7))
 	ROM_LOAD("pfrc_u22.l1", 0x10000, 0x8000, CRC(40f5e6b2) SHA1(4af2e2658720b08d03d24c9d314a6e5074b2c747))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pfrc_u4.l2", 0x10000, 0x8000, CRC(8f431529) SHA1(0f479990715a31fd860c000a066cffb70da502c2))
-	ROM_LOAD("pfrc_u19.l1", 0x18000, 0x8000, CRC(abc4caeb) SHA1(6faef2de9a49a1015b4038ab18849de2f25dbded))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pfrc_u4.l2", 0x00000, 0x8000, CRC(8f431529) SHA1(0f479990715a31fd860c000a066cffb70da502c2))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("pfrc_u19.l1", 0x20000, 0x8000, CRC(abc4caeb) SHA1(6faef2de9a49a1015b4038ab18849de2f25dbded))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(polic_g4)
@@ -959,9 +1260,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("pfrc_u21.l1", 0x18000, 0x8000, CRC(7729afd3) SHA1(9cd2898a7a4203cf3b2dcd203e25cde5dd582ee7))
 	ROM_LOAD("pfrc_u22.l1", 0x10000, 0x8000, CRC(40f5e6b2) SHA1(4af2e2658720b08d03d24c9d314a6e5074b2c747))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pfrc_u4.l2", 0x10000, 0x8000, CRC(8f431529) SHA1(0f479990715a31fd860c000a066cffb70da502c2))
-	ROM_LOAD("pfrc_u19.l1", 0x18000, 0x8000, CRC(abc4caeb) SHA1(6faef2de9a49a1015b4038ab18849de2f25dbded))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pfrc_u4.l2", 0x00000, 0x8000, CRC(8f431529) SHA1(0f479990715a31fd860c000a066cffb70da502c2))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("pfrc_u19.l1", 0x20000, 0x8000, CRC(abc4caeb) SHA1(6faef2de9a49a1015b4038ab18849de2f25dbded))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 /*--------------------
@@ -974,8 +1281,11 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("sstn_u21.l1", 0x18000, 0x8000, CRC(a2ceccaa) SHA1(4c23713543e06458e49e3f2d472543c4a4246a93))
 	ROM_LOAD("sstn_u22.l1", 0x10000, 0x8000, CRC(2b745994) SHA1(67ebfe13db6670237496b033611bf9d4ba8d5c30))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("sstn_u4.l1", 0x10000, 0x8000, CRC(ad7a0511) SHA1(9aa6412de12599fd0d10faef8fffb5d535f49015))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("sstn_u4.l1", 0x00000, 0x8000, CRC(ad7a0511) SHA1(9aa6412de12599fd0d10faef8fffb5d535f49015))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
 ROM_END
 
 /*--------------------
@@ -988,9 +1298,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("swrd_u21.l1", 0x18000, 0x8000, CRC(ee8b0a64) SHA1(c2c52059a9a5f7c0abcfdd76cfc6d5b5451f7d1e))
 	ROM_LOAD("swrd_u22.l1", 0x10000, 0x8000, CRC(73dcdbb0) SHA1(66f5b3804442a1742b6fb3cccf539c4df956b3f2))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("swrd_u4.l1", 0x10000, 0x8000, CRC(272b509c) SHA1(756d3783f664ca1c41dd1d12032330b74c3f89ea))
-	ROM_LOAD("swrd_u19.l1", 0x18000, 0x8000, CRC(a22f84fa) SHA1(1731e86e85cca2d283512d5048c787df3970c9c5))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("swrd_u4.l1", 0x00000, 0x8000, CRC(272b509c) SHA1(756d3783f664ca1c41dd1d12032330b74c3f89ea))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("swrd_u19.l1", 0x20000, 0x8000, CRC(a22f84fa) SHA1(1731e86e85cca2d283512d5048c787df3970c9c5))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(swrds_l1)
@@ -1000,9 +1316,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("swrd_u21.l1", 0x18000, 0x8000, CRC(ee8b0a64) SHA1(c2c52059a9a5f7c0abcfdd76cfc6d5b5451f7d1e))
 	ROM_LOAD("swrd_u22.l1", 0x10000, 0x8000, CRC(73dcdbb0) SHA1(66f5b3804442a1742b6fb3cccf539c4df956b3f2))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("swrd_u4.l1", 0x10000, 0x8000, CRC(272b509c) SHA1(756d3783f664ca1c41dd1d12032330b74c3f89ea))
-	ROM_LOAD("swrd_u19.l1", 0x18000, 0x8000, CRC(a22f84fa) SHA1(1731e86e85cca2d283512d5048c787df3970c9c5))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("swrd_u4.l1", 0x00000, 0x8000, CRC(272b509c) SHA1(756d3783f664ca1c41dd1d12032330b74c3f89ea))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("swrd_u19.l1", 0x20000, 0x8000, CRC(a22f84fa) SHA1(1731e86e85cca2d283512d5048c787df3970c9c5))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 /*--------------------
@@ -1015,9 +1337,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("taxi_u21.l1", 0x18000, 0x8000, CRC(2b20e9ab) SHA1(d785667ae0fd237dd8343bb1ecfbacf050ec2c6f))
 	ROM_LOAD("taxi_u22.l1", 0x10000, 0x8000, CRC(d13055c5) SHA1(8c2959bde03567b83db425ebc9e7309d9601c2b2))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("taxi_u4.l1", 0x10000, 0x8000, CRC(6082ebb5) SHA1(37e19ad27fe05b4c8e572f6598d2d574e4ac5a7d))
-	ROM_LOAD("taxi_u19.l1", 0x18000, 0x8000, CRC(91c64913) SHA1(10e48977f925f6bc1be0c56854aafa99283b4047))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("taxi_u4.l1", 0x00000, 0x8000, CRC(6082ebb5) SHA1(37e19ad27fe05b4c8e572f6598d2d574e4ac5a7d))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("taxi_u19.l1", 0x20000, 0x8000, CRC(91c64913) SHA1(10e48977f925f6bc1be0c56854aafa99283b4047))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(taxi_l3)
@@ -1027,9 +1355,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("taxi_u21.l1", 0x18000, 0x8000, CRC(2b20e9ab) SHA1(d785667ae0fd237dd8343bb1ecfbacf050ec2c6f))
 	ROM_LOAD("taxi_u22.l1", 0x10000, 0x8000, CRC(d13055c5) SHA1(8c2959bde03567b83db425ebc9e7309d9601c2b2))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("taxi_u4.l1", 0x10000, 0x8000, CRC(6082ebb5) SHA1(37e19ad27fe05b4c8e572f6598d2d574e4ac5a7d))
-	ROM_LOAD("taxi_u19.l1", 0x18000, 0x8000, CRC(91c64913) SHA1(10e48977f925f6bc1be0c56854aafa99283b4047))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("taxi_u4.l1", 0x00000, 0x8000, CRC(6082ebb5) SHA1(37e19ad27fe05b4c8e572f6598d2d574e4ac5a7d))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("taxi_u19.l1", 0x20000, 0x8000, CRC(91c64913) SHA1(10e48977f925f6bc1be0c56854aafa99283b4047))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(taxi_lu1)
@@ -1037,11 +1371,17 @@
 	ROM_LOAD("u26-lu1m.rom", 0x4000, 0x4000, CRC(40a2f33c) SHA1(815910b36a5df6c63862590c42b6a41286f38236))
 	ROM_LOAD("u27-lu1m.rom", 0x8000, 0x8000, CRC(d15f08b4) SHA1(adef8c2c7ee685207b146b4401dc9b732cf212b7))
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
-	ROM_LOAD("taxi_u21.l1", 0x0000, 0x8000, CRC(2b20e9ab) SHA1(d785667ae0fd237dd8343bb1ecfbacf050ec2c6f))
-	ROM_LOAD("taxi_u22.l1", 0x8000, 0x8000, CRC(d13055c5) SHA1(8c2959bde03567b83db425ebc9e7309d9601c2b2))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("taxi_u4.l1", 0x10000, 0x8000, CRC(6082ebb5) SHA1(37e19ad27fe05b4c8e572f6598d2d574e4ac5a7d))
-	ROM_LOAD("taxi_u19.l1", 0x18000, 0x8000, CRC(91c64913) SHA1(10e48977f925f6bc1be0c56854aafa99283b4047))
+	ROM_LOAD("taxi_u21.l1", 0x18000, 0x8000, CRC(2b20e9ab) SHA1(d785667ae0fd237dd8343bb1ecfbacf050ec2c6f))
+	ROM_LOAD("taxi_u22.l1", 0x10000, 0x8000, CRC(d13055c5) SHA1(8c2959bde03567b83db425ebc9e7309d9601c2b2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("taxi_u4.l1", 0x00000, 0x8000, CRC(6082ebb5) SHA1(37e19ad27fe05b4c8e572f6598d2d574e4ac5a7d))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("taxi_u19.l1", 0x20000, 0x8000, CRC(91c64913) SHA1(10e48977f925f6bc1be0c56854aafa99283b4047))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(taxi_lg1)
@@ -1049,11 +1389,17 @@
 	ROM_LOAD("u26-lu1m.rom", 0x4000, 0x4000, CRC(40a2f33c) SHA1(815910b36a5df6c63862590c42b6a41286f38236))
 	ROM_LOAD("u27-lg1m.rom", 0x8000, 0x8000, CRC(955dcbab) SHA1(e66e0da6366885ceed7618b09cf66fe11ae27627))
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
-	ROM_LOAD("taxi_u21.l1", 0x0000, 0x8000, CRC(2b20e9ab) SHA1(d785667ae0fd237dd8343bb1ecfbacf050ec2c6f))
-	ROM_LOAD("taxi_u22.l1", 0x8000, 0x8000, CRC(d13055c5) SHA1(8c2959bde03567b83db425ebc9e7309d9601c2b2))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("taxi_u4.l1", 0x10000, 0x8000, CRC(6082ebb5) SHA1(37e19ad27fe05b4c8e572f6598d2d574e4ac5a7d))
-	ROM_LOAD("taxi_u19.l1", 0x18000, 0x8000, CRC(91c64913) SHA1(10e48977f925f6bc1be0c56854aafa99283b4047))
+	ROM_LOAD("taxi_u21.l1", 0x18000, 0x8000, CRC(2b20e9ab) SHA1(d785667ae0fd237dd8343bb1ecfbacf050ec2c6f))
+	ROM_LOAD("taxi_u22.l1", 0x10000, 0x8000, CRC(d13055c5) SHA1(8c2959bde03567b83db425ebc9e7309d9601c2b2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("taxi_u4.l1", 0x00000, 0x8000, CRC(6082ebb5) SHA1(37e19ad27fe05b4c8e572f6598d2d574e4ac5a7d))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("taxi_u19.l1", 0x20000, 0x8000, CRC(91c64913) SHA1(10e48977f925f6bc1be0c56854aafa99283b4047))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 ROM_START(taxi_p5)
@@ -1063,9 +1409,15 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("taxi_u21.l1", 0x18000, 0x8000, CRC(2b20e9ab) SHA1(d785667ae0fd237dd8343bb1ecfbacf050ec2c6f))
 	ROM_LOAD("taxi_u22.l1", 0x10000, 0x8000, CRC(d13055c5) SHA1(8c2959bde03567b83db425ebc9e7309d9601c2b2))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("taxi_u4.l1", 0x10000, 0x8000, CRC(6082ebb5) SHA1(37e19ad27fe05b4c8e572f6598d2d574e4ac5a7d))
-	ROM_LOAD("taxi_u19.l1", 0x18000, 0x8000, CRC(91c64913) SHA1(10e48977f925f6bc1be0c56854aafa99283b4047))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("taxi_u4.l1", 0x00000, 0x8000, CRC(6082ebb5) SHA1(37e19ad27fe05b4c8e572f6598d2d574e4ac5a7d))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("taxi_u19.l1", 0x20000, 0x8000, CRC(91c64913) SHA1(10e48977f925f6bc1be0c56854aafa99283b4047))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
 ROM_END
 
 /*-----------------------------
@@ -1078,10 +1430,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("tran_u21.l2", 0x18000, 0x8000, CRC(b10120ee) SHA1(305a898a8b762c27dba26921ef169556bf96e518))
 	ROM_LOAD("tran_u22.l2", 0x10000, 0x8000, CRC(337784b5) SHA1(30c17afd8f76118940982db946cd3a2a29445d10))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("tran_u4.l2", 0x10000, 0x8000, CRC(a06ddd61) SHA1(630fe7ab94516930c4876a95f822024a44371170))
-	ROM_LOAD("tran_u19.l2", 0x18000, 0x8000, CRC(3cfde8b0) SHA1(7bdc71ba1ba4fd337f052354323c86fd97b2b881))
-	ROM_LOAD("tran_u20.l2", 0x20000, 0x8000, CRC(e9890cf1) SHA1(0ae37504c704401101c79ce49df11044f8d8caa9))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("tran_u4.l2", 0x00000, 0x8000, CRC(a06ddd61) SHA1(630fe7ab94516930c4876a95f822024a44371170))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("tran_u19.l2", 0x20000, 0x8000, CRC(3cfde8b0) SHA1(7bdc71ba1ba4fd337f052354323c86fd97b2b881))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("tran_u20.l2", 0x40000, 0x8000, CRC(e9890cf1) SHA1(0ae37504c704401101c79ce49df11044f8d8caa9))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 /*-----------------------
@@ -1094,10 +1455,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("whir_u21.l1", 0x18000, 0x8000, CRC(fa3da322) SHA1(732107eace9eecdb97eff4abb4420a2febef7425))
 	ROM_LOAD("whir_u22.l1", 0x10000, 0x8000, CRC(fcaf8c4e) SHA1(8e8cab1923a56bcef4671dce28aef1e39303c04a))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("whir_u4.l1", 0x10000, 0x8000, CRC(29952d84) SHA1(26479a341b0552c5f9d9bf9dd013855e51a7b857))
-	ROM_LOAD("whir_u19.l1", 0x18000, 0x8000, CRC(c63f6fe9) SHA1(947bbccb5eeae414770254d42d0a95425e2dca8c))
-	ROM_LOAD("whir_u20.l1", 0x20000, 0x8000, CRC(713007af) SHA1(3ac88bb905ccf8e227bbf3c102c74e3d2446cc88))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("whir_u4.l1", 0x00000, 0x8000, CRC(29952d84) SHA1(26479a341b0552c5f9d9bf9dd013855e51a7b857))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("whir_u19.l1", 0x20000, 0x8000, CRC(c63f6fe9) SHA1(947bbccb5eeae414770254d42d0a95425e2dca8c))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("whir_u20.l1", 0x40000, 0x8000, CRC(713007af) SHA1(3ac88bb905ccf8e227bbf3c102c74e3d2446cc88))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(whirl_lg3)
@@ -1107,10 +1477,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("whir_u21.l1", 0x18000, 0x8000, CRC(fa3da322) SHA1(732107eace9eecdb97eff4abb4420a2febef7425))
 	ROM_LOAD("whir_u22.l1", 0x10000, 0x8000, CRC(fcaf8c4e) SHA1(8e8cab1923a56bcef4671dce28aef1e39303c04a))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("whir_u4.l1", 0x10000, 0x8000, CRC(29952d84) SHA1(26479a341b0552c5f9d9bf9dd013855e51a7b857))
-	ROM_LOAD("whir_u19.l1", 0x18000, 0x8000, CRC(c63f6fe9) SHA1(947bbccb5eeae414770254d42d0a95425e2dca8c))
-	ROM_LOAD("whir_u20.l1", 0x20000, 0x8000, CRC(713007af) SHA1(3ac88bb905ccf8e227bbf3c102c74e3d2446cc88))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("whir_u4.l1", 0x00000, 0x8000, CRC(29952d84) SHA1(26479a341b0552c5f9d9bf9dd013855e51a7b857))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("whir_u19.l1", 0x20000, 0x8000, CRC(c63f6fe9) SHA1(947bbccb5eeae414770254d42d0a95425e2dca8c))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("whir_u20.l1", 0x40000, 0x8000, CRC(713007af) SHA1(3ac88bb905ccf8e227bbf3c102c74e3d2446cc88))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 ROM_START(whirl_l2)
@@ -1120,10 +1499,19 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("whir_u21.l1", 0x18000, 0x8000, CRC(fa3da322) SHA1(732107eace9eecdb97eff4abb4420a2febef7425))
 	ROM_LOAD("whir_u22.l1", 0x10000, 0x8000, CRC(fcaf8c4e) SHA1(8e8cab1923a56bcef4671dce28aef1e39303c04a))
-	ROM_REGION(0x30000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("whir_u4.l1", 0x10000, 0x8000, CRC(29952d84) SHA1(26479a341b0552c5f9d9bf9dd013855e51a7b857))
-	ROM_LOAD("whir_u19.l1", 0x18000, 0x8000, CRC(c63f6fe9) SHA1(947bbccb5eeae414770254d42d0a95425e2dca8c))
-	ROM_LOAD("whir_u20.l1", 0x20000, 0x8000, CRC(713007af) SHA1(3ac88bb905ccf8e227bbf3c102c74e3d2446cc88))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("whir_u4.l1", 0x00000, 0x8000, CRC(29952d84) SHA1(26479a341b0552c5f9d9bf9dd013855e51a7b857))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
+	ROM_RELOAD(0x18000,0x8000)
+	ROM_LOAD("whir_u19.l1", 0x20000, 0x8000, CRC(c63f6fe9) SHA1(947bbccb5eeae414770254d42d0a95425e2dca8c))
+	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	ROM_LOAD("whir_u20.l1", 0x40000, 0x8000, CRC(713007af) SHA1(3ac88bb905ccf8e227bbf3c102c74e3d2446cc88))
+	ROM_RELOAD(0x48000,0x8000)
+	ROM_RELOAD(0x50000,0x8000)
+	ROM_RELOAD(0x58000,0x8000)
 ROM_END
 
 GAME(1989,  bcats_l5,       0,          s11b,   s11b, s11b_state, init_s11b_invert, ROT0, "Williams", "Bad Cats (L-5)",                               MACHINE_IS_SKELETON_MECHANICAL)
@@ -1162,9 +1550,9 @@
 GAME(1989,  eatpm_4u,       eatpm_l4,   s11b,   s11b, s11b_state, init_s11b_invert, ROT0, "Bally",    "Elvira and the Party Monsters (LU-4)",         MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1989,  eatpm_f1,       eatpm_l4,   s11b,   s11b, s11b_state, init_s11b_invert, ROT0, "Bally",    "Elvira and the Party Monsters (LF-1) French",  MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1989,  eatpm_p7,       eatpm_l4,   s11b,   s11b, s11b_state, init_s11b_invert, ROT0, "Bally",    "Elvira and the Party Monsters (PA-7)",         MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989,  jokrz_l6,       0,          s11b,   s11b, s11b_state, init_s11b_invert, ROT0, "Williams", "Jokerz! (L-6)",                                MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989,  jokrz_l3,       jokrz_l6,   s11b,   s11b, s11b_state, init_s11b_invert, ROT0, "Williams", "Jokerz! (L-3)",                                MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1989,  jokrz_g4,       jokrz_l6,   s11b,   s11b, s11b_state, init_s11b_invert, ROT0, "Williams", "Jokerz! (G-4)",                                MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989,  jokrz_l6,       0,     s11b_jokerz, s11b, s11b_state, init_s11b_invert, ROT0, "Williams", "Jokerz! (L-6)",                                MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989,  jokrz_l3,    jokrz_l6, s11b_jokerz, s11b, s11b_state, init_s11b_invert, ROT0, "Williams", "Jokerz! (L-3)",                                MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1989,  jokrz_g4,    jokrz_l6, s11b_jokerz, s11b, s11b_state, init_s11b_invert, ROT0, "Williams", "Jokerz! (G-4)",                                MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1989,  mousn_l4,       0,          s11b,   s11b, s11b_state, init_s11b_invert, ROT0, "Bally",    "Mousin' Around! (LA-4)",                       MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1989,  mousn_l1,       mousn_l4,   s11b,   s11b, s11b_state, init_s11b_invert, ROT0, "Bally",    "Mousin' Around! (LA-1)",                       MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1989,  mousn_lu,       mousn_l4,   s11b,   s11b, s11b_state, init_s11b_invert, ROT0, "Bally",    "Mousin' Around! (LU-1)",                       MACHINE_IS_SKELETON_MECHANICAL)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/s11c.cpp mame-0.224+dfsg.1/src/mame/drivers/s11c.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/s11c.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/s11c.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -13,55 +13,19 @@
 #include "s11c.lh"
 
 
-void s11c_state::s11c_main_map(address_map &map)
-{
-	map(0x0000, 0x0fff).ram().share("nvram");
-	map(0x2100, 0x2103).mirror(0x00fc).rw(m_pia21, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids
-	map(0x2200, 0x2200).mirror(0x01ff).w(FUNC(s11c_state::sol3_w)); // solenoids
-	map(0x2400, 0x2403).mirror(0x03fc).rw(m_pia24, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps
-	map(0x2800, 0x2803).mirror(0x03fc).rw(m_pia28, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // display
-	map(0x2c00, 0x2c03).mirror(0x03fc).rw(m_pia2c, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // alphanumeric display
-	map(0x3000, 0x3003).mirror(0x03fc).rw(m_pia30, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // inputs
-	map(0x3400, 0x3403).mirror(0x0bfc).rw(m_pia34, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // widget
-	map(0x4000, 0xffff).rom();
-}
-
-void s11c_state::s11c_audio_map(address_map &map)
-{
-	map(0x0000, 0x07ff).mirror(0x0800).ram();
-	map(0x1000, 0x1fff).w(FUNC(s11c_state::bank_w));
-	map(0x2000, 0x2003).mirror(0x0ffc).rw("pias", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
-	map(0x8000, 0xbfff).bankr("bank0");
-	map(0xc000, 0xffff).bankr("bank1");
-}
-
-void s11c_state::s11c_bg_map(address_map &map)
-{
-	map(0x0000, 0x07ff).ram();
-	map(0x2000, 0x2001).mirror(0x1ffe).rw("ym2151", FUNC(ym2151_device::read), FUNC(ym2151_device::write));
-	map(0x4000, 0x4003).mirror(0x1ffc).rw("pia40", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
-	map(0x6000, 0x67ff).w(FUNC(s11c_state::bg_speech_digit_w));
-	map(0x6800, 0x6fff).w(FUNC(s11c_state::bg_speech_clock_w));
-	map(0x7800, 0x7fff).w(FUNC(s11c_state::bgbank_w));
-	map(0x8000, 0xffff).bankr("bgbank");
-}
-
 static INPUT_PORTS_START( s11c )
-	PORT_START("X0")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-
-	PORT_START("X1")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER )
+	PORT_START("SW.0")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) // always plumb-bob tilt
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RSHIFT) // a relay from the power section
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START )
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 )
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_LSHIFT) // usually slam tilt
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RCONTROL) // usually high score reset
 
-	PORT_START("X2")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A)
+	PORT_START("SW.1")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A) // usually playfield tilt
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D)
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F)
@@ -70,7 +34,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_J)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_K)
 
-	PORT_START("X4")
+	PORT_START("SW.2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_L)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Z)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_C)
@@ -80,7 +44,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_M)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COMMA)
 
-	PORT_START("X8")
+	PORT_START("SW.3")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_STOP)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COLON)
@@ -90,7 +54,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_EQUALS)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSPACE)
 
-	PORT_START("X10")
+	PORT_START("SW.4")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_OPENBRACE)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_CLOSEBRACE)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSLASH)
@@ -100,10 +64,17 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_UP)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DOWN)
 
-	PORT_START("X20")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_START("SW.5")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DEL)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_HOME)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_END)
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PGUP)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PGDN)
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_0_PAD)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DEL_PAD)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_ENTER_PAD)
 
-	PORT_START("X40")
+	PORT_START("SW.6")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Q)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E)
@@ -113,8 +84,15 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_I)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_O)
 
-	PORT_START("X80")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_START("SW.7")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_2_PAD)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_3_PAD)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_7_PAD)
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_8_PAD)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_9_PAD)
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH_PAD)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_ASTERISK)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PLUS_PAD)
 
 	PORT_START("DIAGS")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_1_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, s11c_state, audio_nmi, 1)
@@ -126,37 +104,26 @@
 	PORT_CONFSETTING( 0x10, "English" )
 INPUT_PORTS_END
 
-/*
-void s11c_state::bgbank_w(uint8_t data)
-{
-    uint8_t bank = ((data & 0x04) >> 2) | ((data & 0x03) << 1);
-    membank("bgbank")->set_entry(bank);
-//  popmessage("BG bank set to %02x (%i)",data,bank);
-}
-*/
 void s11c_state::machine_reset()
 {
-//  membank("bgbank")->set_entry(0);
-	// reset the CPUs again, so that the CPUs are starting with the right vectors (otherwise sound may die on reset)
-//  m_bgcpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
+	m_bg->device_reset();
 }
 
 void s11c_state::init_s11c()
 {
 	emu_timer* timer = timer_alloc(TIMER_IRQ);
-//  uint8_t *BGROM = memregion("bgcpu")->base();
-//  membank("bgbank")->configure_entries(0, 8, &BGROM[0x10000], 0x8000);
-//  membank("bgbank")->set_entry(0);
 	set_invert(true);
 	set_timer(timer);
-	timer->adjust(attotime::from_ticks(S11_IRQ_CYCLES,E_CLOCK),1);
+	timer->adjust(attotime::from_ticks(32,E_CLOCK),0);
 }
 
 void s11c_state::s11c(machine_config &config)
 {
 	/* basic machine hardware */
 	M6808(config, m_maincpu, XTAL(4'000'000));
-	m_maincpu->set_addrmap(AS_PROGRAM, &s11c_state::s11c_main_map);
+	m_maincpu->set_addrmap(AS_PROGRAM, &s11_state::s11_main_map);
+	INPUT_MERGER_ANY_HIGH(config, m_mainirq).output_handler().set(FUNC(s11_state::main_irq));
+	INPUT_MERGER_ANY_HIGH(config, m_piairq).output_handler().set(FUNC(s11_state::pia_irq));
 
 	/* Video */
 	config.set_default_layout(layout_s11c);
@@ -167,48 +134,51 @@
 	/* Devices */
 	PIA6821(config, m_pia21, 0);
 	m_pia21->readpa_handler().set(FUNC(s11_state::sound_r));
+	m_pia21->set_port_a_input_overrides_output_mask(0xff);
 	m_pia21->writepa_handler().set(FUNC(s11_state::sound_w));
 	m_pia21->writepb_handler().set(FUNC(s11_state::sol2_w));
 	m_pia21->ca2_handler().set(FUNC(s11_state::pia21_ca2_w));
 	m_pia21->cb2_handler().set(FUNC(s11_state::pia21_cb2_w));
-	m_pia21->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia21->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia21->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<1>));
+	m_pia21->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<2>));
 
 	PIA6821(config, m_pia24, 0);
 	m_pia24->writepa_handler().set(FUNC(s11_state::lamp0_w));
 	m_pia24->writepb_handler().set(FUNC(s11_state::lamp1_w));
 	m_pia24->cb2_handler().set(FUNC(s11_state::pia24_cb2_w));
-	m_pia24->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia24->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia24->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<3>));
+	m_pia24->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<4>));
 
 	PIA6821(config, m_pia28, 0);
 	m_pia28->readpa_handler().set(FUNC(s11_state::pia28_w7_r));
+	m_pia28->set_port_a_input_overrides_output_mask(0xff);
 	m_pia28->writepa_handler().set(FUNC(s11a_state::dig0_w));
 	m_pia28->writepb_handler().set(FUNC(s11b_state::dig1_w));
 	m_pia28->ca2_handler().set(FUNC(s11_state::pia28_ca2_w));
 	m_pia28->cb2_handler().set(FUNC(s11_state::pia28_cb2_w));
-	m_pia28->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia28->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia28->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<5>));
+	m_pia28->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<6>));
 
 	PIA6821(config, m_pia2c, 0);
 	m_pia2c->writepa_handler().set(FUNC(s11b_state::pia2c_pa_w));
 	m_pia2c->writepb_handler().set(FUNC(s11b_state::pia2c_pb_w));
-	m_pia2c->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia2c->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia2c->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<7>));
+	m_pia2c->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<8>));
 
 	PIA6821(config, m_pia30, 0);
 	m_pia30->readpa_handler().set(FUNC(s11_state::switch_r));
+	m_pia30->set_port_a_input_overrides_output_mask(0xff);
 	m_pia30->writepb_handler().set(FUNC(s11_state::switch_w));
 	m_pia30->cb2_handler().set(FUNC(s11_state::pia30_cb2_w));
-	m_pia30->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia30->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia30->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<9>));
+	m_pia30->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<10>));
 
 	PIA6821(config, m_pia34, 0);
 	m_pia34->writepa_handler().set(FUNC(s11b_state::pia34_pa_w));
 	m_pia34->writepb_handler().set(FUNC(s11b_state::pia34_pb_w));
 	m_pia34->cb2_handler().set(FUNC(s11b_state::pia34_cb2_w));
-	m_pia34->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia34->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia34->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<11>));
+	m_pia34->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<12>));
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
 
@@ -217,10 +187,16 @@
 	/* Add the background music card */
 	SPEAKER(config, "speaker").front_center();
 	S11C_BG(config, m_bg);
-	m_bg->set_romregion("bgcpu");
+	m_pia34->ca2_handler().set(m_bg, FUNC(s11c_bg_device::resetq_w));
+	m_bg->pb_cb().set(m_pia34, FUNC(pia6821_device::portb_w));
+	m_bg->cb2_cb().set(m_pia34, FUNC(pia6821_device::cb1_w));
 	m_bg->add_route(ALL_OUTPUTS, "speaker", 1.0);
 }
 
+// Unless otherwise noted, assume S11 Background Sound Board jumpers W2/W3 are
+// set so W2 is shorted, W3 open (U4 and U19 are 27512) and (assuming the board
+// installed has jumpers W10/W11) W10/W11 are set so W10 is shorted, W11 open
+// (U20 is 27512)
 /*--------------------
 / Bugs Bunny Birthday Ball 11/90
 /--------------------*/
@@ -228,20 +204,26 @@
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("bugs_u26.l2", 0x4000, 0x4000, CRC(b4358920) SHA1(93af1cf5dc2b5442f428a621c0f73b27c197a3df))
 	ROM_LOAD("bugs_u27.l2", 0x8000, 0x8000, CRC(8ff29439) SHA1(8fcdcea556e9e01ea8cb7c1548f98af2467c8a5f))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("bugs_u4.l2", 0x10000, 0x10000, CRC(04bc9aa5) SHA1(c3da2dc3e26b88a0ebc6f87e61fc71bec45330c3))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("bugs_u4.l2", 0x00000, 0x10000, CRC(04bc9aa5) SHA1(c3da2dc3e26b88a0ebc6f87e61fc71bec45330c3))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("bugs_u19.l1", 0x20000, 0x10000, CRC(a2084702) SHA1(ffd749387e7b52bad1e98c6a8939fb87bc67524c))
-	ROM_LOAD("bugs_u20.l1", 0x30000, 0x10000, CRC(5df734ef) SHA1(c8d153444dd6171c3ebddc8100ab06fde3373cc6))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("bugs_u20.l1", 0x40000, 0x10000, CRC(5df734ef) SHA1(c8d153444dd6171c3ebddc8100ab06fde3373cc6))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(bbnny_lu)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("bugs_u26.l2", 0x4000, 0x4000, CRC(b4358920) SHA1(93af1cf5dc2b5442f428a621c0f73b27c197a3df))
 	ROM_LOAD("u27-lu2.rom", 0x8000, 0x8000, CRC(aaa2c82d) SHA1(b279c87cb2ac90a818eeb1afa6115b8cdab1b0df))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("bugs_u4.l2", 0x10000, 0x10000, CRC(04bc9aa5) SHA1(c3da2dc3e26b88a0ebc6f87e61fc71bec45330c3))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("bugs_u4.l2", 0x00000, 0x10000, CRC(04bc9aa5) SHA1(c3da2dc3e26b88a0ebc6f87e61fc71bec45330c3))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("bugs_u19.l1", 0x20000, 0x10000, CRC(a2084702) SHA1(ffd749387e7b52bad1e98c6a8939fb87bc67524c))
-	ROM_LOAD("bugs_u20.l1", 0x30000, 0x10000, CRC(5df734ef) SHA1(c8d153444dd6171c3ebddc8100ab06fde3373cc6))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("bugs_u20.l1", 0x40000, 0x10000, CRC(5df734ef) SHA1(c8d153444dd6171c3ebddc8100ab06fde3373cc6))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 /*--------------------
@@ -251,60 +233,78 @@
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("dinr_u26.l4", 0x4000, 0x4000, CRC(6f187abf) SHA1(8acabbccdf3528a9c5e60cc8939ab960bf4c5512))
 	ROM_LOAD("dinr_u27.l4", 0x8000, 0x8000, CRC(d69f9f74) SHA1(88d9b42c2313a90e5d6f50220d3b44331595d86b))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("dinr_u4.l1", 0x10000, 0x10000, CRC(3bd28368) SHA1(41eec2f5f863039deaabfae8aece4b1cf15e4b78))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("dinr_u4.l1", 0x00000, 0x10000, CRC(3bd28368) SHA1(41eec2f5f863039deaabfae8aece4b1cf15e4b78))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("dinr_u19.l1", 0x20000, 0x10000, CRC(278b9a30) SHA1(41e59adb8b6c08caee46c3dd73256480b4041619))
-	ROM_LOAD("dinr_u20.l1", 0x30000, 0x10000, CRC(511fb260) SHA1(e6e25b464c5c38f3c0492436f1e8aa2be33dd278))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("dinr_u20.l1", 0x40000, 0x10000, CRC(511fb260) SHA1(e6e25b464c5c38f3c0492436f1e8aa2be33dd278))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(diner_l3)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("dinr_u26.l2", 0x4000, 0x4000, CRC(8b6aa22e) SHA1(6b802a85fc2babf5a183fb434df11597363c1c9d))
 	ROM_LOAD("u27-la3.rom", 0x8000, 0x8000, CRC(4171451a) SHA1(818e330245691d9ef3181b885c9342880f89d912))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("dinr_u4.l1", 0x10000, 0x10000, CRC(3bd28368) SHA1(41eec2f5f863039deaabfae8aece4b1cf15e4b78))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("dinr_u4.l1", 0x00000, 0x10000, CRC(3bd28368) SHA1(41eec2f5f863039deaabfae8aece4b1cf15e4b78))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("dinr_u19.l1", 0x20000, 0x10000, CRC(278b9a30) SHA1(41e59adb8b6c08caee46c3dd73256480b4041619))
-	ROM_LOAD("dinr_u20.l1", 0x30000, 0x10000, CRC(511fb260) SHA1(e6e25b464c5c38f3c0492436f1e8aa2be33dd278))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("dinr_u20.l1", 0x40000, 0x10000, CRC(511fb260) SHA1(e6e25b464c5c38f3c0492436f1e8aa2be33dd278))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(diner_l2)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("dinr_u26.l2", 0x4000, 0x4000, CRC(8b6aa22e) SHA1(6b802a85fc2babf5a183fb434df11597363c1c9d))
 	ROM_LOAD("dinr_u27.lu2", 0x8000, 0x8000, CRC(ea72f6aa) SHA1(58df02e8353dd9be2ecfbcdc78fc54981dd001e1))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("dinr_u4.l1", 0x10000, 0x10000, CRC(3bd28368) SHA1(41eec2f5f863039deaabfae8aece4b1cf15e4b78))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("dinr_u4.l1", 0x00000, 0x10000, CRC(3bd28368) SHA1(41eec2f5f863039deaabfae8aece4b1cf15e4b78))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("dinr_u19.l1", 0x20000, 0x10000, CRC(278b9a30) SHA1(41e59adb8b6c08caee46c3dd73256480b4041619))
-	ROM_LOAD("dinr_u20.l1", 0x30000, 0x10000, CRC(511fb260) SHA1(e6e25b464c5c38f3c0492436f1e8aa2be33dd278))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("dinr_u20.l1", 0x40000, 0x10000, CRC(511fb260) SHA1(e6e25b464c5c38f3c0492436f1e8aa2be33dd278))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(diner_f2)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("dinr_u26.l2", 0x4000, 0x4000, CRC(8b6aa22e) SHA1(6b802a85fc2babf5a183fb434df11597363c1c9d))
 	ROM_LOAD("dinr_u27.lf2", 0x8000, 0x8000, CRC(343af291) SHA1(ecf30dd828537cd68dc6c9f97256a38c820b9afc))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("dinr_u4.l1", 0x10000, 0x10000, CRC(3bd28368) SHA1(41eec2f5f863039deaabfae8aece4b1cf15e4b78))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("dinr_u4.l1", 0x00000, 0x10000, CRC(3bd28368) SHA1(41eec2f5f863039deaabfae8aece4b1cf15e4b78))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("dinr_u19.l1", 0x20000, 0x10000, CRC(278b9a30) SHA1(41e59adb8b6c08caee46c3dd73256480b4041619))
-	ROM_LOAD("dinr_u20.l1", 0x30000, 0x10000, CRC(511fb260) SHA1(e6e25b464c5c38f3c0492436f1e8aa2be33dd278))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("dinr_u20.l1", 0x40000, 0x10000, CRC(511fb260) SHA1(e6e25b464c5c38f3c0492436f1e8aa2be33dd278))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(diner_l1)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("u26-lu1.rom", 0x4000, 0x4000, CRC(259b302f) SHA1(d7e19c2d2ad7805d9158178c24d180d158a59b0c))
 	ROM_LOAD("u27-lu1.rom", 0x8000, 0x8000, CRC(35fafbb3) SHA1(0db3d0c9421f4fdcf4d376d543626559e1bf2daa))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("dinr_u4.l1", 0x10000, 0x10000, CRC(3bd28368) SHA1(41eec2f5f863039deaabfae8aece4b1cf15e4b78))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("dinr_u4.l1", 0x00000, 0x10000, CRC(3bd28368) SHA1(41eec2f5f863039deaabfae8aece4b1cf15e4b78))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("dinr_u19.l1", 0x20000, 0x10000, CRC(278b9a30) SHA1(41e59adb8b6c08caee46c3dd73256480b4041619))
-	ROM_LOAD("dinr_u20.l1", 0x30000, 0x10000, CRC(511fb260) SHA1(e6e25b464c5c38f3c0492436f1e8aa2be33dd278))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("dinr_u20.l1", 0x40000, 0x10000, CRC(511fb260) SHA1(e6e25b464c5c38f3c0492436f1e8aa2be33dd278))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(diner_p0)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("dinr_u26.pa0", 0x4000, 0x4000, CRC(dbf5de09) SHA1(55ca30bdf6e6e482f3ce5891b866103492fa3754))
 	ROM_LOAD("dinr_u27.pa0", 0x8000, 0x8000, CRC(9875d16e) SHA1(fbbab61cc9e8e3f7a1bf1428ad50ad3c13f0f120))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("dinr_u4.l1", 0x10000, 0x10000, CRC(3bd28368) SHA1(41eec2f5f863039deaabfae8aece4b1cf15e4b78))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("dinr_u4.l1", 0x00000, 0x10000, CRC(3bd28368) SHA1(41eec2f5f863039deaabfae8aece4b1cf15e4b78))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("dinr_u19.l1", 0x20000, 0x10000, CRC(278b9a30) SHA1(41e59adb8b6c08caee46c3dd73256480b4041619))
-	ROM_LOAD("dinr_u20.l1", 0x30000, 0x10000, CRC(511fb260) SHA1(e6e25b464c5c38f3c0492436f1e8aa2be33dd278))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("dinr_u20.l1", 0x40000, 0x10000, CRC(511fb260) SHA1(e6e25b464c5c38f3c0492436f1e8aa2be33dd278))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 /*--------------------
@@ -314,30 +314,39 @@
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("dude_u26.lu1", 0x4000, 0x4000, CRC(6f6a6e22) SHA1(2d8a1b472eb06a9f7aeea4b2f9a82f83eb4ee08a))
 	ROM_LOAD("dude_u27.lu1", 0x8000, 0x8000, CRC(43c2d4f3) SHA1(d61d855fa06394bdc1142e21624bdaac1ee9ca20))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("dude_u4.l1", 0x10000, 0x10000, CRC(3eeef714) SHA1(74dcc83958cb62819e0ac36ca83001694faafec7))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("dude_u4.l1", 0x00000, 0x10000, CRC(3eeef714) SHA1(74dcc83958cb62819e0ac36ca83001694faafec7))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("dude_u19.l1", 0x20000, 0x10000, CRC(dc7b985b) SHA1(f672d1f1fe1d1d887113ea6ccd745a78f7760526))
-	ROM_LOAD("dude_u20.l1", 0x30000, 0x10000, CRC(a83d53dd) SHA1(92a81069c42c7760888201fb0787fa7ddfbf1658))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("dude_u20.l1", 0x40000, 0x10000, CRC(a83d53dd) SHA1(92a81069c42c7760888201fb0787fa7ddfbf1658))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(dd_lu1)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("dude_u26.l2", 0x4000, 0x4000, CRC(d1e19fc2) SHA1(800329b5fd563fcd27add14da4522082c01eb86e))
 	ROM_LOAD("dude_u27.l2", 0x8000, 0x8000, CRC(654b5d4c) SHA1(e73834dbb35cf78eab68a5966e4049640e16dddf))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("dude_u4.l1", 0x10000, 0x10000, CRC(3eeef714) SHA1(74dcc83958cb62819e0ac36ca83001694faafec7))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("dude_u4.l1", 0x00000, 0x10000, CRC(3eeef714) SHA1(74dcc83958cb62819e0ac36ca83001694faafec7))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("dude_u19.l1", 0x20000, 0x10000, CRC(dc7b985b) SHA1(f672d1f1fe1d1d887113ea6ccd745a78f7760526))
-	ROM_LOAD("dude_u20.l1", 0x30000, 0x10000, CRC(a83d53dd) SHA1(92a81069c42c7760888201fb0787fa7ddfbf1658))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("dude_u20.l1", 0x40000, 0x10000, CRC(a83d53dd) SHA1(92a81069c42c7760888201fb0787fa7ddfbf1658))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(dd_p6)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("u26-pa6.11c", 0x4000, 0x4000, CRC(6f6a6e22) SHA1(2d8a1b472eb06a9f7aeea4b2f9a82f83eb4ee08a))
 	ROM_LOAD("u27-pa6.11c", 0x8000, 0x8000, CRC(26022273) SHA1(ca66139c3bd0c313d41a396c484d2c1b8f4ae536))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("dude_u4.l1", 0x10000, 0x10000, CRC(3eeef714) SHA1(74dcc83958cb62819e0ac36ca83001694faafec7))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("dude_u4.l1", 0x00000, 0x10000, CRC(3eeef714) SHA1(74dcc83958cb62819e0ac36ca83001694faafec7))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("dude_u19.l1", 0x20000, 0x10000, CRC(dc7b985b) SHA1(f672d1f1fe1d1d887113ea6ccd745a78f7760526))
-	ROM_LOAD("dude_u20.l1", 0x30000, 0x10000, CRC(a83d53dd) SHA1(92a81069c42c7760888201fb0787fa7ddfbf1658))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("dude_u20.l1", 0x40000, 0x10000, CRC(a83d53dd) SHA1(92a81069c42c7760888201fb0787fa7ddfbf1658))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 /*--------------------
@@ -347,51 +356,67 @@
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("pool_u26.l7", 0x4000, 0x4000, CRC(cee98aed) SHA1(5b652684c10ab4945783089d848b2f663d3b2547))
 	ROM_LOAD("pool_u27.l7", 0x8000, 0x8000, CRC(356d9a89) SHA1(ce795c535d03a14d28fb3f2071cae48ccdb1a856))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pool_u4.l2", 0x10000, 0x10000, CRC(04e95e10) SHA1(3873b3cd6c2961b3f2f28a1e17f8a63c6db808d2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pool_u4.l2", 0x00000, 0x10000, CRC(04e95e10) SHA1(3873b3cd6c2961b3f2f28a1e17f8a63c6db808d2))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("pool_u19.l2", 0x20000, 0x10000, CRC(0f45d02b) SHA1(58bbfdb3b98c43b66e11808cec7cd65a7f2dce6d))
-	ROM_LOAD("pool_u20.l2", 0x30000, 0x10000, CRC(925f62d6) SHA1(21b8d6f9a8b98fce8a3cdf7f5f2d40200544a898))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("pool_u20.l2", 0x40000, 0x10000, CRC(925f62d6) SHA1(21b8d6f9a8b98fce8a3cdf7f5f2d40200544a898))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(pool_l6)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("pool_u26.la6", 0x4000, 0x4000, CRC(fec70d5a) SHA1(bc155a590f64f2b43b8799c1a6d2336dde45a10c))
 	ROM_LOAD("pool_u27.la6", 0x8000, 0x8000, CRC(91fb5231) SHA1(538ddc66a5885e4b7a840d35a1e62b92f73b39ad))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pool_u4.l2", 0x10000, 0x10000, CRC(04e95e10) SHA1(3873b3cd6c2961b3f2f28a1e17f8a63c6db808d2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pool_u4.l2", 0x00000, 0x10000, CRC(04e95e10) SHA1(3873b3cd6c2961b3f2f28a1e17f8a63c6db808d2))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("pool_u19.l2", 0x20000, 0x10000, CRC(0f45d02b) SHA1(58bbfdb3b98c43b66e11808cec7cd65a7f2dce6d))
-	ROM_LOAD("pool_u20.l2", 0x30000, 0x10000, CRC(925f62d6) SHA1(21b8d6f9a8b98fce8a3cdf7f5f2d40200544a898))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("pool_u20.l2", 0x40000, 0x10000, CRC(925f62d6) SHA1(21b8d6f9a8b98fce8a3cdf7f5f2d40200544a898))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(pool_l5)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("pool_u26.l5", 0x4000, 0x4000, CRC(373d18d9) SHA1(320d72777380971c16fe59cb1ed2314dec76705d))
 	ROM_LOAD("pool_u27.l5", 0x8000, 0x8000, CRC(1a2f0717) SHA1(cb8a7a62e0aac721ce68ae0bb1157b92edda62cb))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pool_u4.l2", 0x10000, 0x10000, CRC(04e95e10) SHA1(3873b3cd6c2961b3f2f28a1e17f8a63c6db808d2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pool_u4.l2", 0x00000, 0x10000, CRC(04e95e10) SHA1(3873b3cd6c2961b3f2f28a1e17f8a63c6db808d2))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("pool_u19.l2", 0x20000, 0x10000, CRC(0f45d02b) SHA1(58bbfdb3b98c43b66e11808cec7cd65a7f2dce6d))
-	ROM_LOAD("pool_u20.l2", 0x30000, 0x10000, CRC(925f62d6) SHA1(21b8d6f9a8b98fce8a3cdf7f5f2d40200544a898))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("pool_u20.l2", 0x40000, 0x10000, CRC(925f62d6) SHA1(21b8d6f9a8b98fce8a3cdf7f5f2d40200544a898))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(pool_le2)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("pool_u26.le2", 0x4000, 0x4000, CRC(70526965) SHA1(69c7b74fff8fcc351e8bd9b8fce7655aebf7205c))
 	ROM_LOAD("pool_u27.le2", 0x8000, 0x8000, CRC(90911f02) SHA1(ef3d32b3c5bafcd886bbde8b897cb225c0c04464))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pool_u4.l2", 0x10000, 0x10000, CRC(04e95e10) SHA1(3873b3cd6c2961b3f2f28a1e17f8a63c6db808d2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pool_u4.l2", 0x00000, 0x10000, CRC(04e95e10) SHA1(3873b3cd6c2961b3f2f28a1e17f8a63c6db808d2))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("pool_u19.l2", 0x20000, 0x10000, CRC(0f45d02b) SHA1(58bbfdb3b98c43b66e11808cec7cd65a7f2dce6d))
-	ROM_LOAD("pool_u20.l2", 0x30000, 0x10000, CRC(925f62d6) SHA1(21b8d6f9a8b98fce8a3cdf7f5f2d40200544a898))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("pool_u20.l2", 0x40000, 0x10000, CRC(925f62d6) SHA1(21b8d6f9a8b98fce8a3cdf7f5f2d40200544a898))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(pool_p7)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("pool_u26.pa7", 0x4000, 0x4000, CRC(91d2aae9) SHA1(b3dbc80809bca8b0435c3d8a0ceb504acab4a04a))
 	ROM_LOAD("pool_u27.pa7", 0x8000, 0x8000, CRC(eff6b940) SHA1(e0c3858803bbc5cacedefe57681efc2dc339e16d))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pool_u4.l2", 0x10000, 0x10000, CRC(04e95e10) SHA1(3873b3cd6c2961b3f2f28a1e17f8a63c6db808d2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("pool_u4.l2", 0x00000, 0x10000, CRC(04e95e10) SHA1(3873b3cd6c2961b3f2f28a1e17f8a63c6db808d2))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("pool_u19.l2", 0x20000, 0x10000, CRC(0f45d02b) SHA1(58bbfdb3b98c43b66e11808cec7cd65a7f2dce6d))
-	ROM_LOAD("pool_u20.l2", 0x30000, 0x10000, CRC(925f62d6) SHA1(21b8d6f9a8b98fce8a3cdf7f5f2d40200544a898))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("pool_u20.l2", 0x40000, 0x10000, CRC(925f62d6) SHA1(21b8d6f9a8b98fce8a3cdf7f5f2d40200544a898))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
+
 /*--------------------
 / Radical 9/90
 /--------------------*/
@@ -399,33 +424,45 @@
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("rad_u26.l1", 0x4000, 0x4000, CRC(84b1a125) SHA1(dd01fb9189acd2620c57149921aadb051f7a2412))
 	ROM_LOAD("rad_u27.l1", 0x8000, 0x8000, CRC(6f6ca382) SHA1(a61055aab97d3fe2ecd0ed4281a9681b1d910269))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("rad_u4.l1", 0x10000, 0x10000, CRC(5aafc09c) SHA1(27984bbc91dc7593e6a5b42f74dd6ddf58189bec))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF) // W10/W11 are jumpered: W11 shorted, W10 open (U20 is a 27256)
+	ROM_LOAD("rad_u4.l1", 0x00000, 0x10000, CRC(5aafc09c) SHA1(27984bbc91dc7593e6a5b42f74dd6ddf58189bec))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("rad_u19.l1", 0x20000, 0x10000, CRC(7c005e1f) SHA1(bdeea7517f2adf72b4b642bffb25ba5b98453127))
-	ROM_LOAD("rad_u20.l1", 0x30000, 0x8000, CRC(05b96292) SHA1(7da0289cf0a0c93768c0706fdedfc3a5f2101e77))
-	ROM_RELOAD(0x38000, 0x8000)
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("rad_u20.l1", 0x40000, 0x8000, CRC(05b96292) SHA1(7da0289cf0a0c93768c0706fdedfc3a5f2101e77))
+	ROM_RELOAD(0x48000, 0x8000)
+	ROM_RELOAD(0x50000, 0x8000)
+	ROM_RELOAD(0x58000, 0x8000)
 ROM_END
 
 ROM_START(radcl_g1)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("rad_u26.l1", 0x4000, 0x4000, CRC(84b1a125) SHA1(dd01fb9189acd2620c57149921aadb051f7a2412))
 	ROM_LOAD("u27-lg1.rom", 0x8000, 0x8000, CRC(4f2eca4b) SHA1(ff44deded1686cfa0351c4499485d6eb4561cbc1))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("rad_u4.l1", 0x10000, 0x10000, CRC(5aafc09c) SHA1(27984bbc91dc7593e6a5b42f74dd6ddf58189bec))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF) // W10/W11 are jumpered: W11 shorted, W10 open (U20 is a 27256)
+	ROM_LOAD("rad_u4.l1", 0x00000, 0x10000, CRC(5aafc09c) SHA1(27984bbc91dc7593e6a5b42f74dd6ddf58189bec))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("rad_u19.l1", 0x20000, 0x10000, CRC(7c005e1f) SHA1(bdeea7517f2adf72b4b642bffb25ba5b98453127))
-	ROM_LOAD("rad_u20.l1", 0x30000, 0x8000, CRC(05b96292) SHA1(7da0289cf0a0c93768c0706fdedfc3a5f2101e77))
-	ROM_RELOAD(0x38000, 0x8000)
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("rad_u20.l1", 0x40000, 0x8000, CRC(05b96292) SHA1(7da0289cf0a0c93768c0706fdedfc3a5f2101e77))
+	ROM_RELOAD(0x48000, 0x8000)
+	ROM_RELOAD(0x50000, 0x8000)
+	ROM_RELOAD(0x58000, 0x8000)
 ROM_END
 
 ROM_START(radcl_p3)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("rad_u26.p1", 0x4000, 0x4000, CRC(7d736ae9) SHA1(4ea6945fa5cfbd33fcdf780814b0bf5cb3faa388))
 	ROM_LOAD("u27-p1.rom", 0x8000, 0x8000, CRC(83b1d928) SHA1(b1bd5d8a93f1ab9fb9bf5c268d8530be438448e6))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("rad_u4.p3", 0x10000, 0x10000, CRC(d31b7744) SHA1(7ebcc1503fc322909d32c7c8bda8c0b6505919b3))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF) // W10/W11 are jumpered: W11 shorted, W10 open (U20 is a 27256)
+	ROM_LOAD("rad_u4.p3", 0x00000, 0x10000, CRC(d31b7744) SHA1(7ebcc1503fc322909d32c7c8bda8c0b6505919b3))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("rad_u19.l1", 0x20000, 0x10000, CRC(7c005e1f) SHA1(bdeea7517f2adf72b4b642bffb25ba5b98453127))
-	ROM_LOAD("rad_u20.p3", 0x30000, 0x8000, CRC(82f8369c) SHA1(0691a80672fc11d46359f710bd211de7a59de346))
-	ROM_RELOAD(0x38000, 0x8000)
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("rad_u20.p3", 0x40000, 0x8000, CRC(82f8369c) SHA1(0691a80672fc11d46359f710bd211de7a59de346))
+	ROM_RELOAD(0x48000, 0x8000)
+	ROM_RELOAD(0x50000, 0x8000)
+	ROM_RELOAD(0x58000, 0x8000)
 ROM_END
 
 /*--------------------
@@ -435,20 +472,26 @@
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("gamb_u26.l3", 0x4000, 0x4000, CRC(a65f6004) SHA1(ea44bb7f8f2ec9e5989be63ba41f674b14d19b8a))
 	ROM_LOAD("gamb_u27.l3", 0x8000, 0x8000, CRC(9be0f613) SHA1(1c2b442bc3daef212fe23ff03f5409c354e79989))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("gamb_u4.l2", 0x10000, 0x10000, CRC(c0cfa9be) SHA1(352df9a4dcbc131ae249416e9e517137a04627ba))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("gamb_u4.l2", 0x00000, 0x10000, CRC(c0cfa9be) SHA1(352df9a4dcbc131ae249416e9e517137a04627ba))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("gamb_u19.l1", 0x20000, 0x10000, CRC(04a3a8c8) SHA1(e72ef767f13282d2335cda3288037610d9bfedf2))
-	ROM_LOAD("gamb_u20.l1", 0x30000, 0x10000, CRC(a60c734d) SHA1(76cfcf96276ca4f6b5eee0e0402fab5ee9685366))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("gamb_u20.l1", 0x40000, 0x10000, CRC(a60c734d) SHA1(76cfcf96276ca4f6b5eee0e0402fab5ee9685366))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(rvrbt_p7)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("gamb_u26.pa7", 0x4000, 0x4000, CRC(594db647) SHA1(914d10755c2a1609d3945554fdd8006f7d294287))
 	ROM_LOAD("gamb_u27.pa7", 0x8000, 0x8000, CRC(696248c4) SHA1(892ea48121165792d10d64dcfc188e4a100e6371))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("gamb_u4.l2", 0x10000, 0x10000, CRC(c0cfa9be) SHA1(352df9a4dcbc131ae249416e9e517137a04627ba))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("gamb_u4.l2", 0x00000, 0x10000, CRC(c0cfa9be) SHA1(352df9a4dcbc131ae249416e9e517137a04627ba))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("gamb_u19.l1", 0x20000, 0x10000, CRC(04a3a8c8) SHA1(e72ef767f13282d2335cda3288037610d9bfedf2))
-	ROM_LOAD("gamb_u20.l1", 0x30000, 0x10000, CRC(a60c734d) SHA1(76cfcf96276ca4f6b5eee0e0402fab5ee9685366))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("gamb_u20.l1", 0x40000, 0x10000, CRC(a60c734d) SHA1(76cfcf96276ca4f6b5eee0e0402fab5ee9685366))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 /*--------------------
@@ -458,90 +501,117 @@
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("rolr_u26.l2", 0x4000, 0x4000, CRC(cd7cad9e) SHA1(e381fa73895c307a0b3b4b699cfec2a68908f6f7))
 	ROM_LOAD("rolr_u27.l2", 0x8000, 0x8000, CRC(f3bac2b8) SHA1(9f0ff32ea83e43097de42065909137a362b29d49))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("rolr_u4.l3", 0x10000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("rolr_u4.l3", 0x00000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("rolr_u19.l3", 0x20000, 0x10000, CRC(45a89e55) SHA1(3aff897514d242c83a8e7575d430d594a873736e))
-	ROM_LOAD("rolr_u20.l3", 0x30000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("rolr_u20.l3", 0x40000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(rollr_ex)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("rolr-u26.ea3", 0x4000, 0x4000, CRC(78c3c1ad) SHA1(04e4370548b3ba85c49634402a0ea166e3643f68))
 	ROM_LOAD("rolr_u27.ea3", 0x8000, 0x8000, CRC(18685158) SHA1(d1a79fbe1185fb9e1ae1d9e2b2751429f487bb4c))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("rolr_u4.l3", 0x10000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("rolr_u4.l3", 0x00000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("rolr_u19.l3", 0x20000, 0x10000, CRC(45a89e55) SHA1(3aff897514d242c83a8e7575d430d594a873736e))
-	ROM_LOAD("rolr_u20.l3", 0x30000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("rolr_u20.l3", 0x40000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(rollr_e1)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("rolr_u26.pe1", 0x4000, 0x4000, CRC(56620505) SHA1(2df9097e52178f246148a40e0ad4a6e6a5cdb5d4))
 	ROM_LOAD("rolr_u27.pe1", 0x8000, 0x8000, CRC(724d0af2) SHA1(5de5596f4e594c0e6b8448817de6ff46ffc7194b))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("rolr_u4.pe1", 0x10000, 0x10000, CRC(8c383b24) SHA1(5c738e5ec566f7fa5706cd4c33e5d706fa76c72d))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("rolr_u4.pe1", 0x00000, 0x10000, CRC(8c383b24) SHA1(5c738e5ec566f7fa5706cd4c33e5d706fa76c72d))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("rolr_u19.pe1", 0x20000, 0x10000, CRC(c6880cff) SHA1(c8ce23d68297d36ef62e508855a478434ff9a592))
-	ROM_LOAD("rolr_u20.pe1", 0x30000, 0x10000, CRC(4220812b) SHA1(7071565f1087020d1e1738e801dafb509ea37622))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("rolr_u20.pe1", 0x40000, 0x10000, CRC(4220812b) SHA1(7071565f1087020d1e1738e801dafb509ea37622))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(rollr_p2)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("rolr_u26.pa2", 0x4000, 0x4000, CRC(11d96b1c) SHA1(e96991bdef8b14043285feeb4cacc182a6e9dcbd))
 	ROM_LOAD("rolr_u27.pa2", 0x8000, 0x8000, CRC(ee547bd5) SHA1(db45bf7a25321ac041f58404f7512bded9ebf11e))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("rolr_u4.pa1", 0x10000, 0x10000, CRC(324df946) SHA1(e7ba2b9434baea20a0cf38540fdab1668c058539))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("rolr_u4.pa1", 0x00000, 0x10000, CRC(324df946) SHA1(e7ba2b9434baea20a0cf38540fdab1668c058539))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("rolr_u19.pa1", 0x20000, 0x10000, CRC(45a89e55) SHA1(3aff897514d242c83a8e7575d430d594a873736e))
-	ROM_LOAD("rolr_u20.pa1", 0x30000, 0x10000, CRC(8ddaaad1) SHA1(33f58c6a9b0e509b7c9a460a687d6e2c388b4b54))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("rolr_u20.pa1", 0x40000, 0x10000, CRC(8ddaaad1) SHA1(33f58c6a9b0e509b7c9a460a687d6e2c388b4b54))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(rollr_l3)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("rolr-u26.lu3", 0x4000, 0x4000, CRC(7d71ed50) SHA1(092aa13706a7fe58ad80e88c1c4a5c1d7d712546))
 	ROM_LOAD("rolr_u27.l2", 0x8000, 0x8000, CRC(f3bac2b8) SHA1(9f0ff32ea83e43097de42065909137a362b29d49))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("rolr_u4.l3", 0x10000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("rolr_u4.l3", 0x00000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("rolr_u19.l3", 0x20000, 0x10000, CRC(45a89e55) SHA1(3aff897514d242c83a8e7575d430d594a873736e))
-	ROM_LOAD("rolr_u20.l3", 0x30000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("rolr_u20.l3", 0x40000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(rollr_g3)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("rolr-u26.lg3", 0x4000, 0x4000, CRC(438d2b94) SHA1(f507a06794563701b6d4fc51ff90a42a6d21d060))
 	ROM_LOAD("rolr_u27.l2", 0x8000, 0x8000, CRC(f3bac2b8) SHA1(9f0ff32ea83e43097de42065909137a362b29d49))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("rolr_u4.l3", 0x10000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("rolr_u4.l3", 0x00000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("rolr_u19.l3", 0x20000, 0x10000, CRC(45a89e55) SHA1(3aff897514d242c83a8e7575d430d594a873736e))
-	ROM_LOAD("rolr_u20.l3", 0x30000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("rolr_u20.l3", 0x40000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(rollr_f2)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("rolr-u26.lf2", 0x4000, 0x4000, CRC(a33a3a39) SHA1(fa67cede5fe9f86ce8772e49dba8d929d2b53ecb))
 	ROM_LOAD("rolr_u27.l2", 0x8000, 0x8000, CRC(f3bac2b8) SHA1(9f0ff32ea83e43097de42065909137a362b29d49))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("rolr_u4.l3", 0x10000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("rolr_u4.l3", 0x00000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("rolr_u19.l3", 0x20000, 0x10000, CRC(45a89e55) SHA1(3aff897514d242c83a8e7575d430d594a873736e))
-	ROM_LOAD("rolr_u20.l3", 0x30000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("rolr_u20.l3", 0x40000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(rollr_f3)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("rolr-u26.lf3", 0x4000, 0x4000, CRC(0c54de2a) SHA1(764a0986bb1966ddfd547ee6380debaaa1ea3769))
 	ROM_LOAD("rolr_u27.l2", 0x8000, 0x8000, CRC(f3bac2b8) SHA1(9f0ff32ea83e43097de42065909137a362b29d49))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("rolr_u4.l3", 0x10000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("rolr_u4.l3", 0x00000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("rolr_u19.l3", 0x20000, 0x10000, CRC(45a89e55) SHA1(3aff897514d242c83a8e7575d430d594a873736e))
-	ROM_LOAD("rolr_u20.l3", 0x30000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("rolr_u20.l3", 0x40000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(rollr_d2) // American Drops 2 - sample/prototype with 8 drop targets
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("rolr-u26.ad2", 0x4000, 0x4000, CRC(913574ac) SHA1(52e2b398d087e998ba5c16a623c7d1a02b99ca55))
 	ROM_LOAD("rolr_u27.ad2", 0x8000, 0x8000, CRC(92d2172f) SHA1(73f15d338f2680ee2dd961e9e4d4ea97e9328b6e))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("rolr_u4.l3", 0x10000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("rolr_u4.l3", 0x00000, 0x10000, CRC(d366c705) SHA1(76018305b5040b2e5d8c45cc81a18f13e1a8f8da))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("rolr_u19.l3", 0x20000, 0x10000, CRC(45a89e55) SHA1(3aff897514d242c83a8e7575d430d594a873736e))
-	ROM_LOAD("rolr_u20.l3", 0x30000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("rolr_u20.l3", 0x40000, 0x10000, CRC(77f89aff) SHA1(dcd9fe233f33ef8f97cdeaaa365532e485a28944))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 /*--------------------
@@ -551,40 +621,52 @@
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("gshw_u26.l3", 0x4000, 0x4000, CRC(3419bfb2) SHA1(7ce294a3118d20c7cdc3d5cd946e4c43090c5151))
 	ROM_LOAD("u27-lu4.rom", 0x8000, 0x8000, CRC(ba265978) SHA1(66ac8e83e35cdfd72f1d3aa8ce6d92c2c833f304))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("gshw_u4.l2", 0x10000, 0x10000, CRC(e89e0116) SHA1(e96bee143d1662d078f21531f405d838fdace693))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("gshw_u4.l2", 0x00000, 0x10000, CRC(e89e0116) SHA1(e96bee143d1662d078f21531f405d838fdace693))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("gshw_u19.l1", 0x20000, 0x10000, CRC(8bae0813) SHA1(a2b1beca13796892d8ee1533e395cabdbbb11f88))
-	ROM_LOAD("gshw_u20.l1", 0x30000, 0x10000, CRC(75ccbdf7) SHA1(7dce8ae427a621919caad8d8b08b06bb0adad850))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("gshw_u20.l1", 0x40000, 0x10000, CRC(75ccbdf7) SHA1(7dce8ae427a621919caad8d8b08b06bb0adad850))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(gs_lu3)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("gameshow_u26-lu3.rom", 0x4000, 0x4000, CRC(4fa15683) SHA1(789bac55090a54d5b5180a0ef49c3903238f407f))
 	ROM_LOAD("gameshow_u27-lu3.rom", 0x8000, 0x8000, CRC(22270bd2) SHA1(a24a5e199179fd7c7ae8cd1b24c1d21b2fadf8da))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("gshw_u4.l2", 0x10000, 0x10000, CRC(e89e0116) SHA1(e96bee143d1662d078f21531f405d838fdace693))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("gshw_u4.l2", 0x00000, 0x10000, CRC(e89e0116) SHA1(e96bee143d1662d078f21531f405d838fdace693))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("gshw_u19.l1", 0x20000, 0x10000, CRC(8bae0813) SHA1(a2b1beca13796892d8ee1533e395cabdbbb11f88))
-	ROM_LOAD("gshw_u20.l1", 0x30000, 0x10000, CRC(75ccbdf7) SHA1(7dce8ae427a621919caad8d8b08b06bb0adad850))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("gshw_u20.l1", 0x40000, 0x10000, CRC(75ccbdf7) SHA1(7dce8ae427a621919caad8d8b08b06bb0adad850))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(gs_la3)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("gshw_u26.l3", 0x4000, 0x4000, CRC(3419bfb2) SHA1(7ce294a3118d20c7cdc3d5cd946e4c43090c5151))
 	ROM_LOAD("gshw_u27.l3", 0x8000, 0x8000, CRC(4f3babb6) SHA1(87091a6786fc6817529cfed7f60396babe153d8d))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("gshw_u4.l2", 0x10000, 0x10000, CRC(e89e0116) SHA1(e96bee143d1662d078f21531f405d838fdace693))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("gshw_u4.l2", 0x00000, 0x10000, CRC(e89e0116) SHA1(e96bee143d1662d078f21531f405d838fdace693))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("gshw_u19.l1", 0x20000, 0x10000, CRC(8bae0813) SHA1(a2b1beca13796892d8ee1533e395cabdbbb11f88))
-	ROM_LOAD("gshw_u20.l1", 0x30000, 0x10000, CRC(75ccbdf7) SHA1(7dce8ae427a621919caad8d8b08b06bb0adad850))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("gshw_u20.l1", 0x40000, 0x10000, CRC(75ccbdf7) SHA1(7dce8ae427a621919caad8d8b08b06bb0adad850))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 ROM_START(gs_lg6)
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("gshw_u26.l3", 0x4000, 0x4000, CRC(3419bfb2) SHA1(7ce294a3118d20c7cdc3d5cd946e4c43090c5151))
 	ROM_LOAD("u27-lg6.bin", 0x8000, 0x8000, CRC(02c75b24) SHA1(29bc0404c8598393cb1d0f17fb157e84f3b9a794))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("gshw_u4.l2", 0x10000, 0x10000, CRC(e89e0116) SHA1(e96bee143d1662d078f21531f405d838fdace693))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("gshw_u4.l2", 0x00000, 0x10000, CRC(e89e0116) SHA1(e96bee143d1662d078f21531f405d838fdace693))
+	ROM_RELOAD(0x10000, 0x10000)
 	ROM_LOAD("gshw_u19.l1", 0x20000, 0x10000, CRC(8bae0813) SHA1(a2b1beca13796892d8ee1533e395cabdbbb11f88))
-	ROM_LOAD("gshw_u20.l1", 0x30000, 0x10000, CRC(75ccbdf7) SHA1(7dce8ae427a621919caad8d8b08b06bb0adad850))
+	ROM_RELOAD(0x30000, 0x10000)
+	ROM_LOAD("gshw_u20.l1", 0x40000, 0x10000, CRC(75ccbdf7) SHA1(7dce8ae427a621919caad8d8b08b06bb0adad850))
+	ROM_RELOAD(0x50000, 0x10000)
 ROM_END
 
 /*-----------------------
@@ -594,15 +676,20 @@
 	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("strx_u26.p7", 0x4000, 0x4000, CRC(0d2a401c) SHA1(b0a0899dcde04dc42e4fd5d6baf39bb0e81dbb34))
 	ROM_LOAD("strx_u27.p7", 0x8000, 0x8000, CRC(6e9c0632) SHA1(5c0ea2b60dd9001b802d2ecdb5c381ab05f08ec9))
-	ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF)  // TODO: add generic sound board hardware
+	ROM_REGION(0x10000, "cpu3", ROMREGION_ERASEFF)  // TODO: add S11B generic sound board hardware, or just move this to s11b.cpp even though it is technically an s11c game
 	ROM_REGION(0x10000, "sound2", 0)
 	ROM_LOAD("strx_u21.l1", 0x0000, 0x8000, CRC(6a323227) SHA1(7c7263754e5672c654a2ee9582f0b278e637a909))
 	ROM_LOAD("strx_u22.l1", 0x8000, 0x8000, CRC(58407eb4) SHA1(6bd9b304c88d9470eae5afb6621187f4a8313573))
-	ROM_REGION(0x50000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("pfrc_u4.l2", 0x10000, 0x8000, CRC(8f431529) SHA1(0f479990715a31fd860c000a066cffb70da502c2))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)  // W2/W3 are jumpered: W3 shorted, W2 open (U4 and U19 are 27256s); W10/W11 don't matter because U20 is unpopulated
+	ROM_LOAD("pfrc_u4.l2", 0x00000, 0x8000, CRC(8f431529) SHA1(0f479990715a31fd860c000a066cffb70da502c2))
+	ROM_RELOAD(0x08000,0x8000)
+	ROM_RELOAD(0x10000,0x8000)
 	ROM_RELOAD(0x18000,0x8000)
 	ROM_LOAD("pfrc_u19.l1", 0x20000, 0x8000, CRC(abc4caeb) SHA1(6faef2de9a49a1015b4038ab18849de2f25dbded))
 	ROM_RELOAD(0x28000,0x8000)
+	ROM_RELOAD(0x30000,0x8000)
+	ROM_RELOAD(0x38000,0x8000)
+	// socket U20 is empty
 ROM_END
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/s11.cpp mame-0.224+dfsg.1/src/mame/drivers/s11.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/s11.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/s11.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -9,11 +9,15 @@
 
 
 ToDo:
-- Can coin up but not start
-- Doesn't react to the Advance button very well
+- tic-tac-strike belongs in s11a.cpp
+- gold mine belongs in s11b.cpp
+- top dawg belongs in s11b.cpp
+- shuffle inn belongs in s11b.cpp
 
     Known keys necessary to get games to start (so the proper number of balls are detected):
-    - Road Kings: press 'Up' (the direction key) and Q, and press "1" after inserting 1 or more credits.
+    - Grand Lizard: Press S, D, F, and press "1" after inserting 1 or more credits.
+    - Road Kings: press 'Up' (the direction key) and 'Delete', and press "1" after inserting 1 or more credits.
+    - High Speed: press D (ball trough center), F (ball trough lower right) and Enter (Ball Shooter) after inserting 1 or more credits.
 
 *****************************************************************************************/
 
@@ -26,10 +30,22 @@
 
 #include "s11.lh"
 
-
+/*
+15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00 RW MEMPROT
+0  0  0  0  0  x  x  x  0  *  *  *  *  *  *  *  *  * battery backed RAM RW normal
+0  0  0  0  0  x  x  0  x  *  *  *  *  *  *  *  *  * battery backed RAM RW normal
+0  0  0  0  0  x  0  x  x  *  *  *  *  *  *  *  *  * battery backed RAM RW normal
+0  0  0  0  0  0  x  x  x  *  *  *  *  *  *  *  *  * battery backed RAM RW normal
+0  0  0  0  0  1  1  1  1  *  *  *  *  *  *  *  *  0 battery backed RAM RW in protected area, but protection switch is off
+0  0  0  0  0  1  1  1  1  *  *  *  *  *  *  *  R  1 battery backed RAM Read in protected area, but protection switch is on, read is allowed
+0  0  0  0  0  1  1  1  1  *  *  *  *  *  *  *  W  1 battery backed RAM Write in protected area, but protection switch is on, write is BLOCKED
+*/
 void s11_state::s11_main_map(address_map &map)
 {
 	map(0x0000, 0x07ff).ram().share("nvram");
+	// TODO:
+	//map(0x0000, 0x077f).ram().share("nvram"); // unprotected ram area
+	//map(0x0780, 0x07ff).rw(FUNC(prot_ram_r), FUNC(prot_ram_w)); // protected ram area
 	map(0x2100, 0x2103).rw(m_pia21, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // sound+solenoids
 	map(0x2200, 0x2200).w(FUNC(s11_state::sol3_w)); // solenoids
 	map(0x2400, 0x2403).rw(m_pia24, FUNC(pia6821_device::read), FUNC(pia6821_device::write)); // lamps
@@ -49,29 +65,18 @@
 	map(0xc000, 0xffff).bankr("bank1");
 }
 
-void s11_state::s11_bg_map(address_map &map)
-{
-	map(0x0000, 0x07ff).mirror(0x1800).ram();
-	map(0x2000, 0x2001).mirror(0x1ffe).rw(m_ym, FUNC(ym2151_device::read), FUNC(ym2151_device::write));
-	map(0x4000, 0x4003).mirror(0x1ffc).rw(m_pia40, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
-	map(0x8000, 0xffff).rom();
-}
-
 static INPUT_PORTS_START( s11 )
-	PORT_START("X0")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-
-	PORT_START("X1")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER )
+	PORT_START("SW.0")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) // always plumb-bob tilt
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RSHIFT) // a relay from the power section
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START )
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 )
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_LSHIFT) // usually slam tilt
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RCONTROL) // usually high score reset
 
-	PORT_START("X2")
+	PORT_START("SW.1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D)
@@ -81,7 +86,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_J)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_K)
 
-	PORT_START("X4")
+	PORT_START("SW.2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_L)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Z)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_C)
@@ -91,7 +96,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_M)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COMMA)
 
-	PORT_START("X8")
+	PORT_START("SW.3")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_STOP)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COLON)
@@ -101,7 +106,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_EQUALS)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSPACE)
 
-	PORT_START("X10")
+	PORT_START("SW.4")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_OPENBRACE)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_CLOSEBRACE)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSLASH)
@@ -111,7 +116,17 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_UP)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DOWN)
 
-	PORT_START("X20")
+	PORT_START("SW.5")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DEL)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_HOME)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_END)
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PGUP)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PGDN)
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_0_PAD)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DEL_PAD)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_ENTER_PAD)
+
+	PORT_START("SW.6")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Q)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E)
@@ -121,11 +136,15 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_I)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_O)
 
-	PORT_START("X40")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
-	PORT_START("X80")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_START("SW.7")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_2_PAD)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_3_PAD)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_7_PAD)
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_8_PAD)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_9_PAD)
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH_PAD)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_ASTERISK)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PLUS_PAD)
 
 	PORT_START("DIAGS")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER) PORT_NAME("Audio Diag") PORT_CODE(KEYCODE_1_PAD) PORT_CHANGED_MEMBER(DEVICE_SELF, s11_state, audio_nmi, 1)
@@ -142,26 +161,30 @@
 	switch(id)
 	{
 	case TIMER_IRQ:
-		if(param == 1)
+		// handle the cd4020 14-bit timer irq counter; this timer fires on the rising and falling edges of Q5, every 32 clocks
+		m_timer_count += 0x20;
+		m_timer_count &= 0x3fff;
+		// handle the reset case (happens on the high level of Eclock, so supersedes the firing of the timer int)
+		if (BIT(m_timer_count, 5) && (m_timer_irq_active || m_pia_irq_active))
 		{
-			m_maincpu->set_input_line(M6802_IRQ_LINE, ASSERT_LINE);
-			m_irq_timer->adjust(attotime::from_ticks(32,E_CLOCK),0);
-			if(m_pias)
-				m_pias->cb1_w(0);
-			m_irq_active = true;
-			m_pia28->ca1_w(BIT(ioport("DIAGS")->read(), 2));  // Advance
-			m_pia28->cb1_w(BIT(ioport("DIAGS")->read(), 3));  // Up/Down
+			m_timer_count = 0;
+			m_timer_irq_active = false;
 		}
-		else
+		else // handle the timer int firing case
 		{
-			m_maincpu->set_input_line(M6802_IRQ_LINE, CLEAR_LINE);
-			m_irq_timer->adjust(attotime::from_ticks(S11_IRQ_CYCLES,E_CLOCK),1);
-			if(m_pias)
-				m_pias->cb1_w(1);
-			m_irq_active = false;
-			m_pia28->ca1_w(1);
-			m_pia28->cb1_w(1);
+#ifndef S11_W15
+			// W14 jumper present (Q7), W15 absent (Q10)
+			m_timer_irq_active = (BIT(m_timer_count, 7) && BIT(m_timer_count, 8) && BIT(m_timer_count, 9));
+#else
+			// W14 jumper absent (Q7), W15 present (Q10)
+			m_timer_irq_active = (BIT(m_timer_count, 10) && BIT(m_timer_count, 8) && BIT(m_timer_count, 9));
+#endif
 		}
+
+		m_mainirq->in_w<0>(m_timer_irq_active);
+		if(m_pias)
+			m_pias->cb1_w(m_timer_irq_active);
+		m_irq_timer->adjust(attotime::from_ticks(32,E_CLOCK),0);
 		break;
 	}
 }
@@ -189,19 +212,24 @@
 
 WRITE_LINE_MEMBER( s11_state::pia_irq )
 {
+	m_pia_irq_active = state;
+	m_mainirq->in_w<1>(state);
+}
+
+WRITE_LINE_MEMBER( s11_state::main_irq )
+{
+	// handle the fact that the Advance and Up/Down switches are gated by the combined timer/pia irq signal
 	if(state == CLEAR_LINE)
 	{
-		// restart IRQ timer
-		m_irq_timer->adjust(attotime::from_ticks(S11_IRQ_CYCLES,E_CLOCK),1);
-		m_irq_active = false;
+		m_pia28->ca1_w(1);
+		m_pia28->cb1_w(1);
 	}
 	else
 	{
-		// disable IRQ timer while other IRQs are being handled
-		// (counter is reset every 32 cycles while a PIA IRQ is handled)
-		m_irq_timer->adjust(attotime::zero);
-		m_irq_active = true;
+		m_pia28->ca1_w(BIT(ioport("DIAGS")->read(), 2));  // Advance
+		m_pia28->cb1_w(BIT(ioport("DIAGS")->read(), 3));  // Up/Down
 	}
+	m_maincpu->set_input_line(M6802_IRQ_LINE, state);
 }
 
 void s11_state::sol3_w(uint8_t data)
@@ -218,13 +246,10 @@
 // sound ns
 	if(m_pias)
 		m_pias->ca1_w(state);
-	if(m_pia40)
-		m_pia40->cb2_w(state);
 }
 
 void s11_state::lamp0_w(uint8_t data)
 {
-	m_maincpu->set_input_line(M6802_IRQ_LINE, CLEAR_LINE);
 }
 
 void s11_state::dig0_w(uint8_t data)
@@ -286,14 +311,22 @@
 
 uint8_t s11_state::switch_r()
 {
-	char kbdrow[8];
-	sprintf(kbdrow,"X%X",m_kbdrow);
-	return ~ioport(kbdrow)->read();
+	uint8_t retval = 0xff;
+	// scan all 8 input columns, since multiple can be selected at once
+	for (int i = 0; i < 7; i++)
+	{
+		if (m_switch_col & (1<<i))
+			retval &= m_swarray[i]->read();
+	}
+	//retval &= ioport("OPTOS")->read(); // optos should be read here as well, and are always active even if no column is selected
+	return ~retval;
 }
 
 void s11_state::switch_w(uint8_t data)
 {
-	m_kbdrow = data;
+	// this drives the pulldown 2N3904 NPN transistors Q42-Q49, each of which drives one column of the switch matrix low
+	// it is possible for multiple columns to be enabled at once, this is handled in switch_r above.
+	m_switch_col = data;
 }
 
 void s11_state::pia34_pa_w(uint8_t data)
@@ -309,18 +342,18 @@
 
 void s11_state::pia34_pb_w(uint8_t data)
 {
-	if(m_pia40)
-		m_pia40->portb_w(data);
-	else
+	if(m_bg)
 		m_bg->data_w(data);
+	else if (m_ps88)
+		m_ps88->data_w(data);
 }
 
 WRITE_LINE_MEMBER( s11_state::pia34_cb2_w )
 {
-	if(m_pia40)
-		m_pia40->cb1_w(state);  // MCB2 through CPU interface
-	else
-		m_bg->ctrl_w(state);
+	if(m_bg)
+		m_bg->ctrl_w(state); // MCB2 through CPU interface
+	else if (m_ps88)
+		m_ps88->strobe_w(state);
 }
 
 void s11_state::bank_w(uint8_t data)
@@ -348,27 +381,6 @@
 	return m_sound_data;
 }
 
-WRITE_LINE_MEMBER( s11_state::ym2151_irq_w )
-{
-	if(m_pia40)
-	{
-		if(state == CLEAR_LINE)
-			m_pia40->ca1_w(1);
-		else
-			m_pia40->ca1_w(0);
-	}
-}
-
-WRITE_LINE_MEMBER( s11_state::pia40_cb2_w )
-{
-	m_pia34->cb1_w(state);  // To Widget MCB1 through CPU Data interface
-}
-
-void s11_state::pia40_pb_w(uint8_t data)
-{
-	m_pia34->portb_w(data);
-}
-
 void s11_state::init_s11()
 {
 	uint8_t *ROM = memregion("audiocpu")->base();
@@ -376,9 +388,11 @@
 	membank("bank1")->configure_entries(0, 2, &ROM[0x18000], 0x4000);
 	membank("bank0")->set_entry(0);
 	membank("bank1")->set_entry(0);
+	m_timer_count = 0;
 	m_irq_timer = timer_alloc(TIMER_IRQ);
-	m_irq_timer->adjust(attotime::from_ticks(S11_IRQ_CYCLES,E_CLOCK),1);
-	m_irq_active = false;
+	m_irq_timer->adjust(attotime::from_ticks(32,E_CLOCK),0);
+	m_timer_irq_active = false;
+	m_pia_irq_active = false;
 }
 
 void s11_state::s11(machine_config &config)
@@ -387,6 +401,8 @@
 	M6802(config, m_maincpu, XTAL(4'000'000));
 	m_maincpu->set_addrmap(AS_PROGRAM, &s11_state::s11_main_map);
 	MCFG_MACHINE_RESET_OVERRIDE(s11_state, s11)
+	INPUT_MERGER_ANY_HIGH(config, m_mainirq).output_handler().set(FUNC(s11_state::main_irq));
+	INPUT_MERGER_ANY_HIGH(config, m_piairq).output_handler().set(FUNC(s11_state::pia_irq));
 
 	/* Video */
 	config.set_default_layout(layout_s11);
@@ -397,90 +413,100 @@
 	/* Devices */
 	PIA6821(config, m_pia21, 0);
 	m_pia21->readpa_handler().set(FUNC(s11_state::sound_r));
+	m_pia21->set_port_a_input_overrides_output_mask(0xff);
 	m_pia21->writepa_handler().set(FUNC(s11_state::sound_w));
 	m_pia21->writepb_handler().set(FUNC(s11_state::sol2_w));
 	m_pia21->ca2_handler().set(FUNC(s11_state::pia21_ca2_w));
 	m_pia21->cb2_handler().set(FUNC(s11_state::pia21_cb2_w));
-	m_pia21->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia21->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia21->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<1>));
+	m_pia21->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<2>));
 
 	PIA6821(config, m_pia24, 0);
 	m_pia24->writepa_handler().set(FUNC(s11_state::lamp0_w));
 	m_pia24->writepb_handler().set(FUNC(s11_state::lamp1_w));
 	m_pia24->cb2_handler().set(FUNC(s11_state::pia24_cb2_w));
-	m_pia24->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia24->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia24->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<3>));
+	m_pia24->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<4>));
 
 	PIA6821(config, m_pia28, 0);
 	m_pia28->readpa_handler().set(FUNC(s11_state::pia28_w7_r));
+	m_pia28->set_port_a_input_overrides_output_mask(0xff);
 	m_pia28->writepa_handler().set(FUNC(s11_state::dig0_w));
 	m_pia28->writepb_handler().set(FUNC(s11_state::dig1_w));
 	m_pia28->ca2_handler().set(FUNC(s11_state::pia28_ca2_w));
 	m_pia28->cb2_handler().set(FUNC(s11_state::pia28_cb2_w));
-	m_pia28->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia28->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia28->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<5>));
+	m_pia28->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<6>));
 
 	PIA6821(config, m_pia2c, 0);
 	m_pia2c->writepa_handler().set(FUNC(s11_state::pia2c_pa_w));
 	m_pia2c->writepb_handler().set(FUNC(s11_state::pia2c_pb_w));
-	m_pia2c->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia2c->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia2c->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<7>));
+	m_pia2c->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<8>));
 
 	PIA6821(config, m_pia30, 0);
 	m_pia30->readpa_handler().set(FUNC(s11_state::switch_r));
+	m_pia30->set_port_a_input_overrides_output_mask(0xff);
 	m_pia30->writepb_handler().set(FUNC(s11_state::switch_w));
 	m_pia30->cb2_handler().set(FUNC(s11_state::pia30_cb2_w));
-	m_pia30->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia30->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia30->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<9>));
+	m_pia30->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<10>));
 
 	PIA6821(config, m_pia34, 0);
 	m_pia34->writepa_handler().set(FUNC(s11_state::pia34_pa_w));
 	m_pia34->writepb_handler().set(FUNC(s11_state::pia34_pb_w));
 	m_pia34->cb2_handler().set(FUNC(s11_state::pia34_cb2_w));
-	m_pia34->irqa_handler().set(FUNC(s11_state::pia_irq));
-	m_pia34->irqb_handler().set(FUNC(s11_state::pia_irq));
+	m_pia34->irqa_handler().set(m_piairq, FUNC(input_merger_device::in_w<11>));
+	m_pia34->irqb_handler().set(m_piairq, FUNC(input_merger_device::in_w<12>));
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
 
 	/* Add the soundcard */
 	M6808(config, m_audiocpu, XTAL(4'000'000));
 	m_audiocpu->set_addrmap(AS_PROGRAM, &s11_state::s11_audio_map);
+	INPUT_MERGER_ANY_HIGH(config, m_audioirq).output_handler().set_inputline(m_audiocpu, M6808_IRQ_LINE);
 
 	SPEAKER(config, "speaker").front_center();
-	MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.5);
+	MC1408(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.25);
 	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
-	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
-	vref.add_route(0, "dac1", 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, "dac1", -1.0, DAC_VREF_NEG_INPUT);
+	vref.add_route(0, m_dac, 1.0, DAC_VREF_POS_INPUT); vref.add_route(0, m_dac, -1.0, DAC_VREF_NEG_INPUT);
 
 	SPEAKER(config, "speech").front_center();
-	HC55516(config, m_hc55516, 0).add_route(ALL_OUTPUTS, "speech", 1.00);
+	HC55516(config, m_hc55516, 0).add_route(ALL_OUTPUTS, "speech", 0.5);
 
 	PIA6821(config, m_pias, 0);
 	m_pias->readpa_handler().set(FUNC(s11_state::sound_r));
+	m_pias->set_port_a_input_overrides_output_mask(0xff);
 	m_pias->writepa_handler().set(FUNC(s11_state::sound_w));
-	m_pias->writepb_handler().set("dac", FUNC(dac_byte_interface::data_w));
+	m_pias->writepb_handler().set(m_dac, FUNC(dac_byte_interface::data_w));
 	m_pias->ca2_handler().set(m_hc55516, FUNC(hc55516_device::clock_w));
 	m_pias->cb2_handler().set(m_hc55516, FUNC(hc55516_device::digit_w));
-	m_pias->irqa_handler().set_inputline(m_audiocpu, M6808_IRQ_LINE);
-	m_pias->irqa_handler().set_inputline(m_audiocpu, M6808_IRQ_LINE);
+	m_pias->irqa_handler().set(m_audioirq, FUNC(input_merger_device::in_w<0>));
+	m_pias->irqb_handler().set(m_audioirq, FUNC(input_merger_device::in_w<1>));
+}
 
-	/* Add the background music card */
-	MC6809E(config, m_bgcpu, 8000000 / 4); // MC68B09E
-	m_bgcpu->set_addrmap(AS_PROGRAM, &s11_state::s11_bg_map);
+void s11_state::s11_bgs(machine_config &config)
+{
+	s11(config);
+	/* Add the background sound card */
+	SPEAKER(config, "bgspk").front_center();
+	S11_BGS(config, m_bg);
+	m_pia34->ca2_handler().set(m_bg, FUNC(s11_bgs_device::resetq_w));
+	m_bg->pb_cb().set(m_pia34, FUNC(pia6821_device::portb_w));
+	m_bg->cb2_cb().set(m_pia34, FUNC(pia6821_device::cb1_w));
+	m_bg->add_route(ALL_OUTPUTS, "bgspk", 0.5);
+}
 
-	SPEAKER(config, "bg").front_center();
-	YM2151(config, m_ym, 3580000);
-	m_ym->irq_handler().set(FUNC(s11_state::ym2151_irq_w));
-	m_ym->add_route(ALL_OUTPUTS, "bg", 0.50);
-
-	MC1408(config, "dac1", 0).add_route(ALL_OUTPUTS, "bg", 0.25);
-
-	PIA6821(config, m_pia40, 0);
-	m_pia40->writepa_handler().set("dac1", FUNC(dac_byte_interface::data_w));
-	m_pia40->writepb_handler().set(FUNC(s11_state::pia40_pb_w));
-	m_pia40->cb2_handler().set(FUNC(s11_state::pia40_cb2_w));
-	m_pia40->irqa_handler().set_inputline(m_bgcpu, M6809_FIRQ_LINE);
-	m_pia40->irqb_handler().set_inputline(m_bgcpu, INPUT_LINE_NMI);
+void s11_state::s11_bgm(machine_config &config)
+{
+	s11(config);
+	/* Add the background music card */
+	SPEAKER(config, "bgspk").front_center();
+	S11_BGM(config, m_bg);
+	m_pia34->ca2_handler().set(m_bg, FUNC(s11_bgm_device::resetq_w));
+	m_bg->pb_cb().set(m_pia34, FUNC(pia6821_device::portb_w));
+	m_bg->cb2_cb().set(m_pia34, FUNC(pia6821_device::cb1_w));
+	m_bg->add_route(ALL_OUTPUTS, "bgspk", 1.0);
 }
 
 
@@ -501,8 +527,8 @@
 	ROM_LOAD("lzrd_u22.l1", 0x14000, 0x4000, CRC(4e782eba) SHA1(b44ab499128300175bdb57f07ffe2992c82e47e4))
 	ROM_RELOAD( 0x10000, 0x4000)
 
-	ROM_REGION(0x10000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("lzrd_u4.l1", 0x8000, 0x8000, CRC(4baafc11) SHA1(3507f5f37e02688fa56cf5bb303eaccdcedede06))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("lzrd_u4.l1", 0x0000, 0x8000, CRC(4baafc11) SHA1(3507f5f37e02688fa56cf5bb303eaccdcedede06))
 ROM_END
 
 ROM_START(grand_l3)
@@ -519,8 +545,8 @@
 	ROM_LOAD("lzrd_u22.l1", 0x14000, 0x4000, CRC(4e782eba) SHA1(b44ab499128300175bdb57f07ffe2992c82e47e4))
 	ROM_RELOAD( 0x10000, 0x4000)
 
-	ROM_REGION(0x10000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("lzrd_u4.l1", 0x8000, 0x8000, CRC(4baafc11) SHA1(3507f5f37e02688fa56cf5bb303eaccdcedede06))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("lzrd_u4.l1", 0x0000, 0x8000, CRC(4baafc11) SHA1(3507f5f37e02688fa56cf5bb303eaccdcedede06))
 ROM_END
 
 /*-------------------------
@@ -536,8 +562,8 @@
 	ROM_LOAD("hs_u21.l2", 0x18000, 0x8000, CRC(c0580037) SHA1(675ca65a6a20f8607232c532b4d127641f77d837))
 	ROM_LOAD("hs_u22.l2", 0x10000, 0x8000, CRC(c03be631) SHA1(53823e0f55377a45aa181882c310dd307cf368f5))
 
-	ROM_REGION(0x10000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("hs_u4.l1", 0x8000, 0x8000, CRC(0f96e094) SHA1(58650705a02a71ced85f5c2a243722a35282cbf7))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("hs_u4.l1", 0x0000, 0x8000, CRC(0f96e094) SHA1(58650705a02a71ced85f5c2a243722a35282cbf7))
 ROM_END
 
 ROM_START(hs_l3)
@@ -550,8 +576,8 @@
 	ROM_LOAD("hs_u21.l2", 0x18000, 0x8000, CRC(c0580037) SHA1(675ca65a6a20f8607232c532b4d127641f77d837))
 	ROM_LOAD("hs_u22.l2", 0x10000, 0x8000, CRC(c03be631) SHA1(53823e0f55377a45aa181882c310dd307cf368f5))
 
-	ROM_REGION(0x10000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("hs_u4.l1", 0x8000, 0x8000, CRC(0f96e094) SHA1(58650705a02a71ced85f5c2a243722a35282cbf7))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("hs_u4.l1", 0x0000, 0x8000, CRC(0f96e094) SHA1(58650705a02a71ced85f5c2a243722a35282cbf7))
 ROM_END
 
 /*-------------------------
@@ -567,8 +593,8 @@
 	ROM_LOAD("road_u21.l1", 0x18000, 0x8000, CRC(f34efbf4) SHA1(cb5ffe9818994f4681e3492a5cd46f410d2e5353))
 	ROM_LOAD("road_u22.l1", 0x10000, 0x8000, CRC(a9803804) SHA1(a400d4621c3f7a6e47546b2f33dc4920183a5a74))
 
-	ROM_REGION(0x10000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("road_u4.l1", 0x8000, 0x8000, CRC(4395b48f) SHA1(2325ce6ba7f6f92f884c302e6f053c31229dc774))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("road_u4.l1", 0x0000, 0x8000, CRC(4395b48f) SHA1(2325ce6ba7f6f92f884c302e6f053c31229dc774))
 ROM_END
 
 ROM_START(rdkng_l2)
@@ -580,8 +606,8 @@
 	ROM_LOAD("road_u21.l1", 0x18000, 0x8000, CRC(f34efbf4) SHA1(cb5ffe9818994f4681e3492a5cd46f410d2e5353))
 	ROM_LOAD("road_u22.l1", 0x10000, 0x8000, CRC(a9803804) SHA1(a400d4621c3f7a6e47546b2f33dc4920183a5a74))
 
-	ROM_REGION(0x10000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("road_u4.l1", 0x8000, 0x8000, CRC(4395b48f) SHA1(2325ce6ba7f6f92f884c302e6f053c31229dc774))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("road_u4.l1", 0x0000, 0x8000, CRC(4395b48f) SHA1(2325ce6ba7f6f92f884c302e6f053c31229dc774))
 ROM_END
 
 ROM_START(rdkng_l3)
@@ -593,8 +619,8 @@
 	ROM_LOAD("road_u21.l1", 0x18000, 0x8000, CRC(f34efbf4) SHA1(cb5ffe9818994f4681e3492a5cd46f410d2e5353))
 	ROM_LOAD("road_u22.l1", 0x10000, 0x8000, CRC(a9803804) SHA1(a400d4621c3f7a6e47546b2f33dc4920183a5a74))
 
-	ROM_REGION(0x10000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("road_u4.l1", 0x8000, 0x8000, CRC(4395b48f) SHA1(2325ce6ba7f6f92f884c302e6f053c31229dc774))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("road_u4.l1", 0x0000, 0x8000, CRC(4395b48f) SHA1(2325ce6ba7f6f92f884c302e6f053c31229dc774))
 ROM_END
 
 ROM_START(rdkng_l4)
@@ -606,8 +632,8 @@
 	ROM_LOAD("road_u21.l1", 0x18000, 0x8000, CRC(f34efbf4) SHA1(cb5ffe9818994f4681e3492a5cd46f410d2e5353))
 	ROM_LOAD("road_u22.l1", 0x10000, 0x8000, CRC(a9803804) SHA1(a400d4621c3f7a6e47546b2f33dc4920183a5a74))
 
-	ROM_REGION(0x10000, "bgcpu", ROMREGION_ERASEFF)
-	ROM_LOAD("road_u4.l1", 0x8000, 0x8000, CRC(4395b48f) SHA1(2325ce6ba7f6f92f884c302e6f053c31229dc774))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("road_u4.l1", 0x0000, 0x8000, CRC(4395b48f) SHA1(2325ce6ba7f6f92f884c302e6f053c31229dc774))
 ROM_END
 
 /************************ From here, not pinball machines **************************************/
@@ -623,8 +649,6 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("tts_u21.256", 0x18000, 0x8000, NO_DUMP)
 	ROM_LOAD("tts_u22.256", 0x10000, 0x8000, NO_DUMP)
-
-	ROM_REGION(0x10000, "bgcpu", ROMREGION_ERASEFF)
 ROM_END
 
 ROM_START(tts_l1)
@@ -635,8 +659,6 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("tts_u21.256", 0x18000, 0x8000, NO_DUMP)
 	ROM_LOAD("tts_u22.256", 0x10000, 0x8000, NO_DUMP)
-
-	ROM_REGION(0x10000, "bgcpu", ROMREGION_ERASEFF)
 ROM_END
 
 /*-------------------------------
@@ -650,8 +672,6 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("u21.256", 0x18000, 0x8000, CRC(3b801570) SHA1(50b50ff826dcb031a30940fa3099bd3a8d773831))
 	ROM_LOAD("u22.256", 0x10000, 0x8000, CRC(08352101) SHA1(a7437847a71cf037a80686292f9616b1e08922df))
-
-	ROM_REGION(0x10000, "bgcpu", ROMREGION_ERASEFF)
 ROM_END
 
 /*-------------------------
@@ -665,8 +685,6 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("tdsu21r1.256", 0x18000, 0x8000, CRC(6a323227) SHA1(7c7263754e5672c654a2ee9582f0b278e637a909))
 	ROM_LOAD("tdsu22r1.256", 0x10000, 0x8000, CRC(58407eb4) SHA1(6bd9b304c88d9470eae5afb6621187f4a8313573))
-
-	ROM_REGION(0x10000, "bgcpu", ROMREGION_ERASEFF)
 ROM_END
 
 /*----------------------------
@@ -680,18 +698,16 @@
 	ROM_REGION(0x20000, "audiocpu", ROMREGION_ERASEFF)
 	ROM_LOAD("u21snd-2.rv1", 0x18000, 0x8000, CRC(80ddce05) SHA1(9498260e5ccd2fe0eb03ff321dd34eb945b0213a))
 	ROM_LOAD("u22snd-2.rv1", 0x10000, 0x8000, CRC(6894abaf) SHA1(2d661765fbfce33a73a20778c41233c0bd9933e9))
-
-	ROM_REGION(0x10000, "bgcpu", ROMREGION_ERASEFF)
 ROM_END
 
-GAME( 1986, grand_l4, 0,        s11, s11, s11_state, init_s11, ROT0, "Williams", "Grand Lizard (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1986, grand_l3, grand_l4, s11, s11, s11_state, init_s11, ROT0, "Williams", "Grand Lizard (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1986, hs_l4,    0,        s11, s11, s11_state, init_s11, ROT0, "Williams", "High Speed (L-4)",   MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1986, hs_l3,    hs_l4,    s11, s11, s11_state, init_s11, ROT0, "Williams", "High Speed (L-3)",   MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1986, rdkng_l4, 0,        s11, s11, s11_state, init_s11, ROT0, "Williams", "Road Kings (L-4)",   MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1986, rdkng_l1, rdkng_l4, s11, s11, s11_state, init_s11, ROT0, "Williams", "Road Kings (L-1)",   MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1986, rdkng_l2, rdkng_l4, s11, s11, s11_state, init_s11, ROT0, "Williams", "Road Kings (L-2)",   MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
-GAME( 1986, rdkng_l3, rdkng_l4, s11, s11, s11_state, init_s11, ROT0, "Williams", "Road Kings (L-3)",   MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, grand_l4, 0,        s11_bgs, s11, s11_state, init_s11, ROT0, "Williams", "Grand Lizard (L-4)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, grand_l3, grand_l4, s11_bgs, s11, s11_state, init_s11, ROT0, "Williams", "Grand Lizard (L-3)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, hs_l4,    0,        s11_bgs, s11, s11_state, init_s11, ROT0, "Williams", "High Speed (L-4)",   MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, hs_l3,    hs_l4,    s11_bgs, s11, s11_state, init_s11, ROT0, "Williams", "High Speed (L-3)",   MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, rdkng_l4, 0,        s11_bgm, s11, s11_state, init_s11, ROT0, "Williams", "Road Kings (L-4)",   MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, rdkng_l1, rdkng_l4, s11_bgm, s11, s11_state, init_s11, ROT0, "Williams", "Road Kings (L-1)",   MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, rdkng_l2, rdkng_l4, s11_bgm, s11, s11_state, init_s11, ROT0, "Williams", "Road Kings (L-2)",   MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
+GAME( 1986, rdkng_l3, rdkng_l4, s11_bgm, s11, s11_state, init_s11, ROT0, "Williams", "Road Kings (L-3)",   MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
 
 GAME( 1986, tts_l2,   0,        s11, s11, s11_state, init_s11, ROT0, "Williams", "Tic-Tac-Strike (Shuffle) (L-2)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
 GAME( 1986, tts_l1,   tts_l2,   s11, s11, s11_state, init_s11, ROT0, "Williams", "Tic-Tac-Strike (Shuffle) (L-1)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/s3.cpp mame-0.224+dfsg.1/src/mame/drivers/s3.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/s3.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/s3.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -63,6 +63,7 @@
 		, m_pia30(*this, "pia30")
 		, m_pias(*this, "pias")
 		, m_digits(*this, "digit%u", 0U)
+		, m_swarray(*this, "SW.%u", 0U)
 	{ }
 
 	void s3a(machine_config &config);
@@ -101,7 +102,7 @@
 	uint8_t m_t_c;
 	uint8_t m_sound_data;
 	uint8_t m_strobe;
-	uint8_t m_kbdrow;
+	uint8_t m_switch_col;
 	bool m_data_ok;
 	bool m_chimes;
 	virtual void machine_start() override { m_digits.resolve(); }
@@ -113,6 +114,7 @@
 	required_device<pia6821_device> m_pia30;
 	optional_device<pia6821_device> m_pias;
 	output_finder<32> m_digits;
+	required_ioport_array<8> m_swarray;
 };
 
 void s3_state::s3_main_map(address_map &map)
@@ -135,10 +137,7 @@
 }
 
 static INPUT_PORTS_START( s3 )
-	PORT_START("X0")
-	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
-
-	PORT_START("X1")
+	PORT_START("SW.0")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_TILT ) // 3 touches before it tilts
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER )
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_START )
@@ -148,7 +147,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER )
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER )
 
-	PORT_START("X2")
+	PORT_START("SW.1")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_A)
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_S)
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_D)
@@ -158,7 +157,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_J)
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_K)
 
-	PORT_START("X4")
+	PORT_START("SW.2")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_L)
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_Z)
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_C)
@@ -168,7 +167,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_M)
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_COMMA) // 1 touch tilt
 
-	PORT_START("X8")
+	PORT_START("SW.3")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_STOP)
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH)
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_COLON)
@@ -178,7 +177,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_EQUALS)
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSPACE)
 
-	PORT_START("X10")
+	PORT_START("SW.4")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_OPENBRACE)
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_CLOSEBRACE)
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSLASH)
@@ -188,7 +187,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_UP)
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_DOWN)
 
-	PORT_START("X20")
+	PORT_START("SW.5")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_Q)
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_W)
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_E)
@@ -198,10 +197,10 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_I)
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_CODE(KEYCODE_O)
 
-	PORT_START("X40")
+	PORT_START("SW.6")
 	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 
-	PORT_START("X80")
+	PORT_START("SW.7")
 	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 
 	PORT_START("SND")
@@ -412,14 +411,21 @@
 
 uint8_t s3_state::switch_r()
 {
-	char kbdrow[8];
-	sprintf(kbdrow,"X%X",m_kbdrow);
-	return ioport(kbdrow)->read();
+	uint8_t retval = 0xff;
+	// scan all 8 input columns, since multiple can be selected at once
+	for (int i = 0; i < 7; i++)
+	{
+		if (m_switch_col & (1<<i))
+			retval &= m_swarray[i]->read();
+	}
+	return ~retval;
 }
 
 void s3_state::switch_w(uint8_t data)
 {
-	m_kbdrow = data;
+	// this drives the pulldown 7406 quad open collector inverters at IC17 and IC18, each inverter drives one column of the switch matrix low
+	// it is possible for multiple columns to be enabled at once, this is handled in switch_r above.
+	m_switch_col = data;
 }
 
 uint8_t s3_state::sound_r()
@@ -468,6 +474,7 @@
 
 	PIA6821(config, m_pia28, 0);
 	m_pia28->readpa_handler().set(FUNC(s3_state::dips_r));
+	m_pia28->set_port_a_input_overrides_output_mask(0xff);
 	m_pia28->readca1_handler().set(FUNC(s3_state::pia28_ca1_r));
 	m_pia28->readcb1_handler().set(FUNC(s3_state::pia28_cb1_r));
 	m_pia28->writepa_handler().set(FUNC(s3_state::dig0_w));
@@ -479,6 +486,7 @@
 
 	PIA6821(config, m_pia30, 0);
 	m_pia30->readpa_handler().set(FUNC(s3_state::switch_r));
+	m_pia30->set_port_a_input_overrides_output_mask(0xff);
 	m_pia30->writepb_handler().set(FUNC(s3_state::switch_w));
 	m_pia30->ca2_handler().set(FUNC(s3_state::pia30_ca2_w));
 	m_pia30->cb2_handler().set(FUNC(s3_state::pia30_cb2_w));
@@ -595,7 +603,7 @@
 	ROM_LOAD("white2.716",   0x1800, 0x0800, CRC(4d4010dd) SHA1(11221124fef3b7bf82d353d65ce851495f6946a7))
 
 	ROM_REGION(0x0800, "audioroms", 0)
-	ROM_LOAD("sound1.716",   0x0000, 0x0800, CRC(f4190ca3) SHA1(ee234fb5c894fca5876ee6dc7ea8e89e7e0aec9c))
+	ROM_LOAD("488_s0_pokerino.716",   0x0000, 0x0800, CRC(5de02e62) SHA1(f838439a731511a264e508a576ae7193d9fed1af))
 ROM_END
 
 GAME( 1977, httip_l1, 0, s3,  s3, s3_state, empty_init, ROT0, "Williams", "Hot Tip (L-1)",          MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/s4.cpp mame-0.224+dfsg.1/src/mame/drivers/s4.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/s4.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/s4.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -57,6 +57,7 @@
 		, m_pia30(*this, "pia30")
 		, m_pias(*this, "pias")
 		, m_digits(*this, "digit%u", 0U)
+		, m_swarray(*this, "SW.%u", 0U)
 	{ }
 
 	void s4(machine_config &config);
@@ -95,7 +96,7 @@
 	uint8_t m_t_c;
 	uint8_t m_sound_data;
 	uint8_t m_strobe;
-	uint8_t m_kbdrow;
+	uint8_t m_switch_col;
 	bool m_data_ok;
 	bool m_chimes;
 	virtual void machine_start() override { m_digits.resolve(); }
@@ -107,6 +108,7 @@
 	required_device<pia6821_device> m_pia30;
 	optional_device<pia6821_device> m_pias;
 	output_finder<32> m_digits;
+	required_ioport_array<8> m_swarray;
 };
 
 void s4_state::s4_main_map(address_map &map)
@@ -130,10 +132,7 @@
 }
 
 static INPUT_PORTS_START( s4 )
-	PORT_START("X0")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-
-	PORT_START("X1")
+	PORT_START("SW.0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START )
@@ -143,7 +142,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER )
 
-	PORT_START("X2")
+	PORT_START("SW.1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_X)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D)
@@ -153,7 +152,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_J)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_K)
 
-	PORT_START("X4")
+	PORT_START("SW.2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_L)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Z)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_C)
@@ -163,7 +162,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_M)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COMMA)
 
-	PORT_START("X8")
+	PORT_START("SW.3")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_STOP)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COLON)
@@ -173,7 +172,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_EQUALS)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSPACE)
 
-	PORT_START("X10")
+	PORT_START("SW.4")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_OPENBRACE)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_CLOSEBRACE)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSLASH)
@@ -183,7 +182,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_UP)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DOWN)
 
-	PORT_START("X20")
+	PORT_START("SW.5")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Q)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E)
@@ -193,10 +192,10 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_I)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_O)
 
-	PORT_START("X40")
+	PORT_START("SW.6")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
-	PORT_START("X80")
+	PORT_START("SW.7")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SND")
@@ -407,14 +406,21 @@
 
 uint8_t s4_state::switch_r()
 {
-	char kbdrow[8];
-	sprintf(kbdrow,"X%X",m_kbdrow);
-	return ioport(kbdrow)->read() ^ 0xff;
+	uint8_t retval = 0xff;
+	// scan all 8 input columns, since multiple can be selected at once
+	for (int i = 0; i < 7; i++)
+	{
+		if (m_switch_col & (1<<i))
+			retval &= m_swarray[i]->read();
+	}
+	return ~retval;
 }
 
 void s4_state::switch_w(uint8_t data)
 {
-	m_kbdrow = data;
+	// this drives the pulldown 7406 quad open collector inverters at IC17 and IC18, each inverter drives one column of the switch matrix low
+	// it is possible for multiple columns to be enabled at once, this is handled in switch_r above.
+	m_switch_col = data;
 }
 
 uint8_t s4_state::sound_r()
@@ -463,6 +469,7 @@
 
 	PIA6821(config, m_pia28, 0);
 	m_pia28->readpa_handler().set(FUNC(s4_state::dips_r));
+	m_pia28->set_port_a_input_overrides_output_mask(0xff);
 	m_pia28->readca1_handler().set(FUNC(s4_state::pia28_ca1_r));
 	m_pia28->readcb1_handler().set(FUNC(s4_state::pia28_cb1_r));
 	m_pia28->writepa_handler().set(FUNC(s4_state::dig0_w));
@@ -474,6 +481,7 @@
 
 	PIA6821(config, m_pia30, 0);
 	m_pia30->readpa_handler().set(FUNC(s4_state::switch_r));
+	m_pia30->set_port_a_input_overrides_output_mask(0xff);
 	m_pia30->writepb_handler().set(FUNC(s4_state::switch_w));
 	m_pia30->ca2_handler().set(FUNC(s4_state::pia30_ca2_w));
 	m_pia30->cb2_handler().set(FUNC(s4_state::pia30_cb2_w));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/s6a.cpp mame-0.224+dfsg.1/src/mame/drivers/s6a.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/s6a.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/s6a.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -66,6 +66,7 @@
 		, m_pia28(*this, "pia28")
 		, m_pia30(*this, "pia30")
 		, m_digits(*this, "digit%u", 0U)
+		, m_swarray(*this, "SW.%u", 0U)
 	{ }
 
 	void s6a(machine_config &config);
@@ -102,7 +103,7 @@
 
 	uint8_t m_sound_data;
 	uint8_t m_strobe;
-	uint8_t m_kbdrow;
+	uint8_t m_switch_col;
 	bool m_data_ok;
 	emu_timer* m_irq_timer;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -117,6 +118,7 @@
 	required_device<pia6821_device> m_pia28;
 	required_device<pia6821_device> m_pia30;
 	output_finder<32> m_digits;
+	required_ioport_array<8> m_swarray;
 };
 
 void s6a_state::s6a_main_map(address_map &map)
@@ -139,10 +141,7 @@
 }
 
 static INPUT_PORTS_START( s6a )
-	PORT_START("X0")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-
-	PORT_START("X1")
+	PORT_START("SW.0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START )
@@ -152,7 +151,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER )
 
-	PORT_START("X2")
+	PORT_START("SW.1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_X)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D)
@@ -162,7 +161,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_J)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_K)
 
-	PORT_START("X4")
+	PORT_START("SW.2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_L)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Z)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_C)
@@ -172,7 +171,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_M)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COMMA)
 
-	PORT_START("X8")
+	PORT_START("SW.3")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_STOP)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COLON)
@@ -182,7 +181,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_EQUALS)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSPACE)
 
-	PORT_START("X10")
+	PORT_START("SW.4")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_OPENBRACE)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_CLOSEBRACE)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSLASH)
@@ -192,7 +191,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_UP)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DOWN)
 
-	PORT_START("X20")
+	PORT_START("SW.5")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Q)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E)
@@ -202,10 +201,10 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_I)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_O)
 
-	PORT_START("X40")
+	PORT_START("SW.6")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
-	PORT_START("X80")
+	PORT_START("SW.7")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SND")
@@ -329,14 +328,21 @@
 
 uint8_t s6a_state::switch_r()
 {
-	char kbdrow[8];
-	sprintf(kbdrow,"X%X",m_kbdrow);
-	return ioport(kbdrow)->read() ^ 0xff;
+	uint8_t retval = 0xff;
+	// scan all 8 input columns, since multiple can be selected at once
+	for (int i = 0; i < 7; i++)
+	{
+		if (m_switch_col & (1<<i))
+			retval &= m_swarray[i]->read();
+	}
+	return ~retval;
 }
 
 void s6a_state::switch_w(uint8_t data)
 {
-	m_kbdrow = data;
+	// this drives the pulldown 7406 quad open collector inverters at IC17 and IC18, each inverter drives one column of the switch matrix low
+	// it is possible for multiple columns to be enabled at once, this is handled in switch_r above.
+	m_switch_col = data;
 }
 
 uint8_t s6a_state::sound_r()
@@ -424,6 +430,7 @@
 
 	PIA6821(config, m_pia28, 0);
 	m_pia28->readpa_handler().set(FUNC(s6a_state::dips_r));
+	m_pia28->set_port_a_input_overrides_output_mask(0xff);
 	m_pia28->writepa_handler().set(FUNC(s6a_state::dig0_w));
 	m_pia28->writepb_handler().set(FUNC(s6a_state::dig1_w));
 	m_pia28->ca2_handler().set(FUNC(s6a_state::pia28_ca2_w));
@@ -433,6 +440,7 @@
 
 	PIA6821(config, m_pia30, 0);
 	m_pia30->readpa_handler().set(FUNC(s6a_state::switch_r));
+	m_pia30->set_port_a_input_overrides_output_mask(0xff);
 	m_pia30->writepb_handler().set(FUNC(s6a_state::switch_w));
 	m_pia30->ca2_handler().set(FUNC(s6a_state::pia30_ca2_w));
 	m_pia30->cb2_handler().set(FUNC(s6a_state::pia30_cb2_w));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/s6.cpp mame-0.224+dfsg.1/src/mame/drivers/s6.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/s6.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/s6.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -73,6 +73,7 @@
 		, m_pia28(*this, "pia28")
 		, m_pia30(*this, "pia30")
 		, m_digits(*this, "digit%u", 0U)
+		, m_swarray(*this, "SW.%u", 0U)
 	{ }
 
 	void s6(machine_config &config);
@@ -109,7 +110,7 @@
 
 	uint8_t m_sound_data;
 	uint8_t m_strobe;
-	uint8_t m_kbdrow;
+	uint8_t m_switch_col;
 	bool m_data_ok;
 	emu_timer* m_irq_timer;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -124,6 +125,7 @@
 	required_device<pia6821_device> m_pia28;
 	required_device<pia6821_device> m_pia30;
 	output_finder<61> m_digits;
+	required_ioport_array<8> m_swarray;
 };
 
 void s6_state::s6_main_map(address_map &map)
@@ -147,10 +149,7 @@
 }
 
 static INPUT_PORTS_START( s6 )
-	PORT_START("X0")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-
-	PORT_START("X1")
+	PORT_START("SW.0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START )
@@ -160,7 +159,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER )
 
-	PORT_START("X2")
+	PORT_START("SW.1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_X)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D)
@@ -170,7 +169,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_J)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_K)
 
-	PORT_START("X4")
+	PORT_START("SW.2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_L)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Z)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_C)
@@ -180,7 +179,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_M)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COMMA)
 
-	PORT_START("X8")
+	PORT_START("SW.3")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_STOP)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COLON)
@@ -190,7 +189,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_EQUALS)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSPACE)
 
-	PORT_START("X10")
+	PORT_START("SW.4")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_OPENBRACE)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_CLOSEBRACE)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSLASH)
@@ -200,7 +199,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_UP)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DOWN)
 
-	PORT_START("X20")
+	PORT_START("SW.5")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Q)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E)
@@ -210,7 +209,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_I)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_O)
 
-	PORT_START("X40")
+	PORT_START("SW.6")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RSHIFT)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SPACE)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_END)
@@ -220,7 +219,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("X80")
+	PORT_START("SW.7")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PGUP)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PGDN)
 	PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -346,14 +345,21 @@
 
 uint8_t s6_state::switch_r()
 {
-	char kbdrow[8];
-	sprintf(kbdrow,"X%X",m_kbdrow);
-	return ioport(kbdrow)->read() ^ 0xff;
+	uint8_t retval = 0xff;
+	// scan all 8 input columns, since multiple can be selected at once
+	for (int i = 0; i < 7; i++)
+	{
+		if (m_switch_col & (1<<i))
+			retval &= m_swarray[i]->read();
+	}
+	return ~retval;
 }
 
 void s6_state::switch_w(uint8_t data)
 {
-	m_kbdrow = data;
+	// this drives the pulldown 7406 quad open collector inverters at IC17 and IC18, each inverter drives one column of the switch matrix low
+	// it is possible for multiple columns to be enabled at once, this is handled in switch_r above.
+	m_switch_col = data;
 }
 
 uint8_t s6_state::sound_r()
@@ -441,6 +447,7 @@
 
 	PIA6821(config, m_pia28, 0);
 	m_pia28->readpa_handler().set(FUNC(s6_state::dips_r));
+	m_pia28->set_port_a_input_overrides_output_mask(0xff);
 	m_pia28->writepa_handler().set(FUNC(s6_state::dig0_w));
 	m_pia28->writepb_handler().set(FUNC(s6_state::dig1_w));
 	m_pia28->ca2_handler().set(FUNC(s6_state::pia28_ca2_w));
@@ -450,6 +457,7 @@
 
 	PIA6821(config, m_pia30, 0);
 	m_pia30->readpa_handler().set(FUNC(s6_state::switch_r));
+	m_pia30->set_port_a_input_overrides_output_mask(0xff);
 	m_pia30->writepb_handler().set(FUNC(s6_state::switch_w));
 	m_pia30->ca2_handler().set(FUNC(s6_state::pia30_ca2_w));
 	m_pia30->cb2_handler().set(FUNC(s6_state::pia30_cb2_w));
@@ -494,6 +502,16 @@
 	ROM_LOAD("sound2.716",   0x4800, 0x0800, CRC(c9103a68) SHA1(cc77af54fdb192f0b334d9d1028210618c3f1d95))
 ROM_END
 
+ROM_START(lzbal_l2sp)
+	ROM_REGION(0x2000, "roms", 0)
+	ROM_LOAD("gamerom.716",  0x0000, 0x0800, CRC(9c5ffe2f) SHA1(f0db627abaeb8c023a3ccc75262e236c998a5d6f))
+	ROM_LOAD("green1.716",   0x1000, 0x0800, CRC(2145f8ab) SHA1(ddf63208559a3a08d4e88327c55426b0eed27654))
+	ROM_LOAD("green2.716",   0x1800, 0x0800, CRC(1c978a4a) SHA1(1959184764643d58f1740c54bb74c2aad7d667d2))
+
+	ROM_REGION(0x5000, "audioroms", 0)
+	ROM_LOAD("493_s0_laser_ball.716",   0x4800, 0x0800, CRC(726c06eb) SHA1(33bbf6ce3629e933863ac85eac03fd3a906d9de5))
+ROM_END
+
 ROM_START(lzbal_t2)
 	ROM_REGION(0x2000, "roms", 0)
 	ROM_LOAD("gamerom.716",  0x0000, 0x0800, CRC(9c5ffe2f) SHA1(f0db627abaeb8c023a3ccc75262e236c998a5d6f))
@@ -653,15 +671,16 @@
 ROM_END
 
 
-GAME( 1979, lzbal_l2, 0,        s6, s6, s6_state, init_s6, ROT0, "Williams", "Laser Ball (L-2)",              MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1980, lzbal_t2, lzbal_l2, s6, s6, s6_state, init_s6, ROT0, "Williams", "Laser Ball (T-2)",              MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1980, scrpn_l1, 0,        s6, s6, s6_state, init_s6, ROT0, "Williams", "Scorpion (L-1)",                MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1980, scrpn_t1, scrpn_l1, s6, s6, s6_state, init_s6, ROT0, "Williams", "Scorpion (T-1)",                MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, blkou_l1, 0,        s6, s6, s6_state, init_s6, ROT0, "Williams", "Blackout (L-1)",                MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, blkou_t1, blkou_l1, s6, s6, s6_state, init_s6, ROT0, "Williams", "Blackout (T-1)",                MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, blkou_f1, blkou_l1, s6, s6, s6_state, init_s6, ROT0, "Williams", "Blackout (L-1, French Speech)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, grgar_l1, 0,        s6, s6, s6_state, init_s6, ROT0, "Williams", "Gorgar (L-1)",                  MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1979, grgar_t1, grgar_l1, s6, s6, s6_state, init_s6, ROT0, "Williams", "Gorgar (T-1)",                  MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
-GAME( 1980, frpwr_l6, 0,        s6, s6, s6_state, init_s6, ROT0, "Williams", "Firepower (L-6)",               MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME( 1980, frpwr_t6, frpwr_l6, s6, s6, s6_state, init_s6, ROT0, "Williams", "Firepower (T-6)",               MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME( 1980, frpwr_l2, frpwr_l6, s6, s6, s6_state, init_s6, ROT0, "Williams", "Firepower (L-2)",               MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1979, lzbal_l2,   0,        s6, s6, s6_state, init_s6, ROT0, "Williams", "Laser Ball (L-2)",              MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, lzbal_l2sp, lzbal_l2, s6, s6, s6_state, init_s6, ROT0, "Williams", "Laser Ball (L-2, PROM sound)",  MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, lzbal_t2,   lzbal_l2, s6, s6, s6_state, init_s6, ROT0, "Williams", "Laser Ball (T-2)",              MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, scrpn_l1,   0,        s6, s6, s6_state, init_s6, ROT0, "Williams", "Scorpion (L-1)",                MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, scrpn_t1,   scrpn_l1, s6, s6, s6_state, init_s6, ROT0, "Williams", "Scorpion (T-1)",                MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, blkou_l1,   0,        s6, s6, s6_state, init_s6, ROT0, "Williams", "Blackout (L-1)",                MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, blkou_t1,   blkou_l1, s6, s6, s6_state, init_s6, ROT0, "Williams", "Blackout (T-1)",                MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, blkou_f1,   blkou_l1, s6, s6, s6_state, init_s6, ROT0, "Williams", "Blackout (L-1, French Speech)", MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, grgar_l1,   0,        s6, s6, s6_state, init_s6, ROT0, "Williams", "Gorgar (L-1)",                  MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1979, grgar_t1,   grgar_l1, s6, s6, s6_state, init_s6, ROT0, "Williams", "Gorgar (T-1)",                  MACHINE_MECHANICAL | MACHINE_NOT_WORKING )
+GAME( 1980, frpwr_l6,   0,        s6, s6, s6_state, init_s6, ROT0, "Williams", "Firepower (L-6)",               MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1980, frpwr_t6,   frpwr_l6, s6, s6, s6_state, init_s6, ROT0, "Williams", "Firepower (T-6)",               MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 1980, frpwr_l2,   frpwr_l6, s6, s6, s6_state, init_s6, ROT0, "Williams", "Firepower (L-2)",               MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/s7.cpp mame-0.224+dfsg.1/src/mame/drivers/s7.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/s7.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/s7.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -29,11 +29,10 @@
 A number of games are multiball therefore they either cannot start or the outhole
 is ineffective/unknown. All games can coin up.
 
-
 Game              Outhole   Tilt        Notes
 ----------------------------------------------------------------------------------
 Black Knight      L Z C     U           To start, hold down LZC and press 1.
-Firepower II      S D                   To start, hold down SD and press 1.
+Firepower II      S D [D F]             To start, hold down SD or DF and press 1.
 Defender          rs I O                To start, hold down IO and Right-Shift, then press 1.
 Pharoah           Right Up              To start, hold down Right and Down, and press 1
 Starlight         S D                   To start, hold down SD and press 1.
@@ -84,6 +83,7 @@
 		, m_pia28(*this, "pia28")
 		, m_pia30(*this, "pia30")
 		, m_digits(*this, "digit%u", 0U)
+		, m_swarray(*this, "SW.%u", 0U)
 	{ }
 
 	void s7(machine_config &config);
@@ -127,7 +127,7 @@
 
 	uint8_t m_sound_data;
 	uint8_t m_strobe;
-	uint8_t m_kbdrow;
+	uint8_t m_switch_col;
 	uint8_t m_nvram[0x100];
 	bool m_data_ok;
 	bool m_memprotect;
@@ -145,6 +145,7 @@
 	required_device<pia6821_device> m_pia28;
 	required_device<pia6821_device> m_pia30;
 	output_finder<61> m_digits;
+	required_ioport_array<8> m_swarray;
 };
 
 void s7_state::s7_main_map(address_map &map)
@@ -170,20 +171,18 @@
 }
 
 static INPUT_PORTS_START( s7 )
-	PORT_START("X0")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("X1")
+	PORT_START("SW.0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT ) // pendulum tilt
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START2 ) // 2-player start
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START ) // 1-player start
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN3 )
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 )
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_TILT ) // slam tilt
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) // slam tilt
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_7_PAD) // high score reset
 
-	PORT_START("X2")
+	PORT_START("SW.1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_X)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D)
@@ -193,7 +192,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_J)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_K)
 
-	PORT_START("X4")
+	PORT_START("SW.2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_L)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Z)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_C)
@@ -203,7 +202,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_M)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COMMA)
 
-	PORT_START("X8")
+	PORT_START("SW.3")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_STOP)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COLON)
@@ -213,7 +212,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_EQUALS)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSPACE)
 
-	PORT_START("X10")
+	PORT_START("SW.4")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_OPENBRACE)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_CLOSEBRACE)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSLASH)
@@ -223,7 +222,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_UP)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DOWN)
 
-	PORT_START("X20")
+	PORT_START("SW.5")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Q)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E)
@@ -233,14 +232,14 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_I)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_O)
 
-	PORT_START("X40")
+	PORT_START("SW.6")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RSHIFT)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SPACE)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_LALT)
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_LSHIFT)
 	PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
-	PORT_START("X80")
+	PORT_START("SW.7")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("SND")
@@ -350,14 +349,21 @@
 
 uint8_t s7_state::switch_r()
 {
-	char kbdrow[8];
-	sprintf(kbdrow,"X%X",m_kbdrow);
-	return ioport(kbdrow)->read() ^ 0xff; // comes in through inverter buffers
+	uint8_t retval = 0xff;
+	// scan all 8 input columns, since multiple can be selected at once
+	for (int i = 0; i < 7; i++)
+	{
+		if (m_switch_col & (1<<i))
+			retval &= m_swarray[i]->read();
+	}
+	return ~retval;
 }
 
 void s7_state::switch_w(uint8_t data)
 {
-	m_kbdrow = data;
+	// this drives the pulldown 7406 quad open collector inverters at IC17 and IC18, each inverter drives one column of the switch matrix low
+	// it is possible for multiple columns to be enabled at once, this is handled in switch_r above.
+	m_switch_col = data;
 }
 
 uint8_t s7_state::nvram_r(offs_t offset)
@@ -476,6 +482,7 @@
 
 	PIA6821(config, m_pia28, 0);
 	m_pia28->readpa_handler().set(FUNC(s7_state::dips_r));
+	m_pia28->set_port_a_input_overrides_output_mask(0xff);
 	m_pia28->writepa_handler().set(FUNC(s7_state::dig0_w));
 	m_pia28->writepb_handler().set(FUNC(s7_state::dig1_w));
 	m_pia28->ca2_handler().set(FUNC(s7_state::pia28_ca2_w));
@@ -485,6 +492,7 @@
 
 	PIA6821(config, m_pia30, 0);
 	m_pia30->readpa_handler().set(FUNC(s7_state::switch_r));
+	m_pia30->set_port_a_input_overrides_output_mask(0xff);
 	m_pia30->writepb_handler().set(FUNC(s7_state::switch_w));
 	m_pia30->ca2_handler().set(FUNC(s7_state::pia30_ca2_w));
 	m_pia30->cb2_handler().set(FUNC(s7_state::pia30_cb2_w));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/s8a.cpp mame-0.224+dfsg.1/src/mame/drivers/s8a.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/s8a.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/s8a.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -45,6 +45,7 @@
 		, m_pia28(*this, "pia28")
 		, m_pia30(*this, "pia30")
 		, m_digits(*this, "digit%u", 0U)
+		, m_swarray(*this, "SW.%u", 0U)
 	{ }
 
 	void s8a(machine_config &config);
@@ -79,7 +80,7 @@
 
 	uint8_t m_sound_data;
 	uint8_t m_strobe;
-	uint8_t m_kbdrow;
+	uint8_t m_switch_col;
 	bool m_data_ok;
 	emu_timer* m_irq_timer;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -93,6 +94,7 @@
 	required_device<pia6821_device> m_pia28;
 	required_device<pia6821_device> m_pia30;
 	output_finder<61> m_digits;
+	required_ioport_array<8> m_swarray;
 };
 
 void s8a_state::s8a_main_map(address_map &map)
@@ -115,10 +117,7 @@
 }
 
 static INPUT_PORTS_START( s8a )
-	PORT_START("X0")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-
-	PORT_START("X1")
+	PORT_START("SW.0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN1 )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START )
@@ -128,7 +127,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_M)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_L)
 
-	PORT_START("X2")
+	PORT_START("SW.1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D)
@@ -138,22 +137,22 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_J)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_K)
 
-	PORT_START("X4")
+	PORT_START("SW.2")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("X8")
+	PORT_START("SW.3")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("X10")
+	PORT_START("SW.4")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("X20")
+	PORT_START("SW.5")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("X40")
+	PORT_START("SW.6")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("X80")
+	PORT_START("SW.7")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("DIAGS")
@@ -226,14 +225,22 @@
 
 uint8_t s8a_state::switch_r()
 {
-	char kbdrow[8];
-	sprintf(kbdrow,"X%X",m_kbdrow);
-	return ioport(kbdrow)->read() ^ 0xff;
+	uint8_t retval = 0xff;
+	// scan all 8 input columns, since multiple can be selected at once
+	for (int i = 0; i < 7; i++)
+	{
+		if (m_switch_col & (1<<i))
+			retval &= m_swarray[i]->read();
+	}
+	//retval &= ioport("OPTOS")->read(); // optos should be read here as well, and are always active even if no column is selected
+	return ~retval;
 }
 
 void s8a_state::switch_w(uint8_t data)
 {
-	m_kbdrow = data;
+	// this drives the pulldown 2N3904 NPN transistors Q7-Q14, each of which drives one column of the switch matrix low
+	// it is possible for multiple columns to be enabled at once, this is handled in switch_r above.
+	m_switch_col = data;
 }
 
 uint8_t s8a_state::sound_r()
@@ -306,6 +313,7 @@
 	/* Devices */
 	PIA6821(config, m_pia21, 0);
 	m_pia21->readpa_handler().set(FUNC(s8a_state::sound_r));
+	m_pia21->set_port_a_input_overrides_output_mask(0xff);
 	m_pia21->readca1_handler().set(FUNC(s8a_state::pia21_ca1_r));
 	m_pia21->writepa_handler().set(FUNC(s8a_state::sound_w));
 	m_pia21->writepb_handler().set(FUNC(s8a_state::sol2_w));
@@ -331,6 +339,7 @@
 
 	PIA6821(config, m_pia30, 0);
 	m_pia30->readpa_handler().set(FUNC(s8a_state::switch_r));
+	m_pia30->set_port_a_input_overrides_output_mask(0xff);
 	m_pia30->writepb_handler().set(FUNC(s8a_state::switch_w));
 	m_pia30->irqa_handler().set(FUNC(s8a_state::pia_irq));
 	m_pia30->irqb_handler().set(FUNC(s8a_state::pia_irq));
@@ -349,9 +358,10 @@
 
 	PIA6821(config, m_pias, 0);
 	m_pias->readpa_handler().set(FUNC(s8a_state::sound_r));
+	m_pias->set_port_a_input_overrides_output_mask(0xff);
 	m_pias->writepb_handler().set("dac", FUNC(dac_byte_interface::data_w));
 	m_pias->irqa_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
-	m_pias->irqa_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
+	m_pias->irqb_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/s8.cpp mame-0.224+dfsg.1/src/mame/drivers/s8.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/s8.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/s8.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -69,6 +69,7 @@
 		, m_pia28(*this, "pia28")
 		, m_pia30(*this, "pia30")
 		, m_digits(*this, "digit%u", 0U)
+		, m_swarray(*this, "SW.%u", 0U)
 	{ }
 
 	void s8(machine_config &config);
@@ -103,7 +104,7 @@
 
 	uint8_t m_sound_data;
 	uint8_t m_strobe;
-	uint8_t m_kbdrow;
+	uint8_t m_switch_col;
 	bool m_data_ok;
 	emu_timer* m_irq_timer;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -117,6 +118,7 @@
 	required_device<pia6821_device> m_pia28;
 	required_device<pia6821_device> m_pia30;
 	output_finder<61> m_digits;
+	required_ioport_array<8> m_swarray;
 };
 
 void s8_state::s8_main_map(address_map &map)
@@ -139,10 +141,7 @@
 }
 
 static INPUT_PORTS_START( s8 )
-	PORT_START("X0")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-
-	PORT_START("X1")
+	PORT_START("SW.0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START )
@@ -152,12 +151,12 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER )
 
-	PORT_START("X2")
+	PORT_START("SW.1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A)
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_F)
 	PORT_BIT( 0xf6, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("X4")
+	PORT_START("SW.2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_L)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Z)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_C)
@@ -167,21 +166,21 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_M)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COMMA)
 
-	PORT_START("X8")
+	PORT_START("SW.3")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_STOP)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH)
 	PORT_BIT( 0xfc, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("X10")
+	PORT_START("SW.4")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("X20")
+	PORT_START("SW.5")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("X40")
+	PORT_START("SW.6")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("X80")
+	PORT_START("SW.7")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("DIAGS")
@@ -254,14 +253,22 @@
 
 uint8_t s8_state::switch_r()
 {
-	char kbdrow[8];
-	sprintf(kbdrow,"X%X",m_kbdrow);
-	return ioport(kbdrow)->read() ^ 0xff;
+	uint8_t retval = 0xff;
+	// scan all 8 input columns, since multiple can be selected at once
+	for (int i = 0; i < 7; i++)
+	{
+		if (m_switch_col & (1<<i))
+			retval &= m_swarray[i]->read();
+	}
+	//retval &= ioport("OPTOS")->read(); // optos should be read here as well, and are always active even if no column is selected
+	return ~retval;
 }
 
 void s8_state::switch_w(uint8_t data)
 {
-	m_kbdrow = data;
+	// this drives the pulldown 2N3904 NPN transistors Q7-Q14, each of which drives one column of the switch matrix low
+	// it is possible for multiple columns to be enabled at once, this is handled in switch_r above.
+	m_switch_col = data;
 }
 
 uint8_t s8_state::sound_r()
@@ -334,6 +341,7 @@
 	/* Devices */
 	PIA6821(config, m_pia21, 0);
 	m_pia21->readpa_handler().set(FUNC(s8_state::sound_r));
+	m_pia21->set_port_a_input_overrides_output_mask(0xff);
 	m_pia21->readca1_handler().set(FUNC(s8_state::pia21_ca1_r));
 	m_pia21->writepa_handler().set(FUNC(s8_state::sound_w));
 	m_pia21->writepb_handler().set(FUNC(s8_state::sol2_w));
@@ -359,6 +367,7 @@
 
 	PIA6821(config, m_pia30, 0);
 	m_pia30->readpa_handler().set(FUNC(s8_state::switch_r));
+	m_pia30->set_port_a_input_overrides_output_mask(0xff);
 	m_pia30->writepb_handler().set(FUNC(s8_state::switch_w));
 	m_pia30->irqa_handler().set(FUNC(s8_state::pia_irq));
 	m_pia30->irqb_handler().set(FUNC(s8_state::pia_irq));
@@ -377,9 +386,10 @@
 
 	PIA6821(config, m_pias, 0);
 	m_pias->readpa_handler().set(FUNC(s8_state::sound_r));
+	m_pias->set_port_a_input_overrides_output_mask(0xff);
 	m_pias->writepb_handler().set("dac", FUNC(dac_byte_interface::data_w));
 	m_pias->irqa_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
-	m_pias->irqa_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
+	m_pias->irqb_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
 }
 
 /*------------------------------
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/s9.cpp mame-0.224+dfsg.1/src/mame/drivers/s9.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/s9.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/s9.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -56,6 +56,7 @@
 		, m_pia28(*this, "pia28")
 		, m_pia30(*this, "pia30")
 		, m_digits(*this, "digit%u", 0U)
+		, m_swarray(*this, "SW.%u", 0U)
 	{ }
 
 	void s9(machine_config &config);
@@ -90,7 +91,7 @@
 
 	uint8_t m_sound_data;
 	uint8_t m_strobe;
-	uint8_t m_kbdrow;
+	uint8_t m_switch_col;
 	bool m_data_ok;
 	emu_timer* m_irq_timer;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -105,6 +106,7 @@
 	required_device<pia6821_device> m_pia28;
 	required_device<pia6821_device> m_pia30;
 	output_finder<61> m_digits;
+	required_ioport_array<8> m_swarray;
 };
 
 void s9_state::s9_main_map(address_map &map)
@@ -127,10 +129,7 @@
 }
 
 static INPUT_PORTS_START( s9 )
-	PORT_START("X0")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
-
-	PORT_START("X1")
+	PORT_START("SW.0")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_TILT )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START )
@@ -140,7 +139,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER )
 
-	PORT_START("X2")
+	PORT_START("SW.1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_S)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_D)
@@ -150,7 +149,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_J)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_K)
 
-	PORT_START("X4")
+	PORT_START("SW.2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_L)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Z)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_C)
@@ -160,7 +159,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_M)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COMMA)
 
-	PORT_START("X8")
+	PORT_START("SW.3")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_STOP)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_COLON)
@@ -170,7 +169,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_EQUALS)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSPACE)
 
-	PORT_START("X10")
+	PORT_START("SW.4")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_OPENBRACE)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_CLOSEBRACE)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_BACKSLASH)
@@ -180,7 +179,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_UP)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DOWN)
 
-	PORT_START("X20")
+	PORT_START("SW.5")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Q)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E)
@@ -190,14 +189,14 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_I)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_O)
 
-	PORT_START("X40")
+	PORT_START("SW.6")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RSHIFT)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SPACE)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_LALT)
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_LSHIFT)
 	PORT_BIT( 0xf0, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
-	PORT_START("X80")
+	PORT_START("SW.7")
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("DIAGS")
@@ -260,14 +259,22 @@
 
 uint8_t s9_state::switch_r()
 {
-	char kbdrow[8];
-	sprintf(kbdrow,"X%X",m_kbdrow);
-	return ioport(kbdrow)->read() ^ 0xff;
+	uint8_t retval = 0xff;
+	// scan all 8 input columns, since multiple can be selected at once
+	for (int i = 0; i < 7; i++)
+	{
+		if (m_switch_col & (1<<i))
+			retval &= m_swarray[i]->read();
+	}
+	//retval &= ioport("OPTOS")->read(); // optos should be read here as well, and are always active even if no column is selected
+	return ~retval;
 }
 
 void s9_state::switch_w(uint8_t data)
 {
-	m_kbdrow = data;
+	// this drives the pulldown 2N3904 NPN transistors Q7-Q14, each of which drives one column of the switch matrix low
+	// it is possible for multiple columns to be enabled at once, this is handled in switch_r above.
+	m_switch_col = data;
 }
 
 uint8_t s9_state::sound_r()
@@ -339,6 +346,7 @@
 	/* Devices */
 	PIA6821(config, m_pia21, 0);
 	m_pia21->readpa_handler().set(FUNC(s9_state::sound_r));
+	m_pia21->set_port_a_input_overrides_output_mask(0xff);
 	m_pia21->readca1_handler().set(FUNC(s9_state::pia21_ca1_r));
 	m_pia21->writepa_handler().set(FUNC(s9_state::sound_w));
 	m_pia21->writepb_handler().set(FUNC(s9_state::sol2_w));
@@ -364,6 +372,7 @@
 
 	PIA6821(config, m_pia30, 0);
 	m_pia30->readpa_handler().set(FUNC(s9_state::switch_r));
+	m_pia30->set_port_a_input_overrides_output_mask(0xff);
 	m_pia30->writepb_handler().set(FUNC(s9_state::switch_w));
 	m_pia30->irqa_handler().set(FUNC(s9_state::pia_irq));
 	m_pia30->irqb_handler().set(FUNC(s9_state::pia_irq));
@@ -385,11 +394,12 @@
 
 	PIA6821(config, m_pias, 0);
 	m_pias->readpa_handler().set(FUNC(s9_state::sound_r));
+	m_pias->set_port_a_input_overrides_output_mask(0xff);
 	m_pias->writepb_handler().set("dac", FUNC(dac_byte_interface::data_w));
 	m_pias->ca2_handler().set("hc55516", FUNC(hc55516_device::clock_w));
 	m_pias->cb2_handler().set("hc55516", FUNC(hc55516_device::digit_w));
 	m_pias->irqa_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
-	m_pias->irqa_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
+	m_pias->irqb_handler().set_inputline("audiocpu", M6808_IRQ_LINE);
 }
 
 /*-----------------------------
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/saitek_ccompan.cpp mame-0.224+dfsg.1/src/mame/drivers/saitek_ccompan.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/saitek_ccompan.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/saitek_ccompan.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,236 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+// thanks-to:Berger
+/******************************************************************************
+
+SciSys Chess Companion
+
+The 1st one (this) has a 6504, the 'sequels' II and III have a 6301.
+Not to be confused with Kasparov Chess Companion.
+
+Hardware notes:
+- PCB label: SciSys Y01 A
+- Synertek 6504 @ ~1MHz
+- Synertek SY6520/SY6820 PIA
+- 4KB ROM (2332N, chip manufacturer unknown)
+- 1KB RAM (2*HM472114P-4)
+- beeper, button sensors chessboard, 16+12 leds
+
+******************************************************************************/
+
+#include "emu.h"
+
+#include "cpu/m6502/m6504.h"
+#include "machine/6821pia.h"
+#include "machine/sensorboard.h"
+#include "sound/dac.h"
+#include "sound/volt_reg.h"
+#include "video/pwm.h"
+
+#include "speaker.h"
+
+// internal artwork
+#include "saitek_ccompan.lh" // clickable
+
+
+namespace {
+
+class ccompan_state : public driver_device
+{
+public:
+	ccompan_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu"),
+		m_pia(*this, "pia"),
+		m_board(*this, "board"),
+		m_display(*this, "display"),
+		m_dac(*this, "dac"),
+		m_inputs(*this, "IN.%u", 0)
+	{ }
+
+	void ccompan(machine_config &config);
+
+protected:
+	virtual void machine_start() override;
+
+private:
+	// devices/pointers
+	required_device<cpu_device> m_maincpu;
+	required_device<pia6821_device> m_pia;
+	required_device<sensorboard_device> m_board;
+	required_device<pwm_display_device> m_display;
+	required_device<dac_bit_interface> m_dac;
+	required_ioport_array<2> m_inputs;
+
+	// address maps
+	void main_map(address_map &map);
+
+	// I/O handlers
+	void update_display();
+	void control_w(u8 data);
+	u8 input_r();
+	void sled_w(int state);
+	void cled_w(int state);
+
+	u8 m_inp_mux = 0;
+	u8 m_led_data = 0;
+	u8 m_led_direct = 0;
+};
+
+void ccompan_state::machine_start()
+{
+	// register for savestates
+	save_item(NAME(m_inp_mux));
+	save_item(NAME(m_led_data));
+	save_item(NAME(m_led_direct));
+}
+
+
+
+/******************************************************************************
+    I/O
+******************************************************************************/
+
+void ccompan_state::update_display()
+{
+	m_display->matrix((1 << m_inp_mux & 0x3ff) | (m_led_direct << 10), m_led_data);
+}
+
+void ccompan_state::sled_w(int state)
+{
+	// CA2: "sides swapped" led
+	m_led_direct = (m_led_direct & ~2) | (state ? 2 : 0);
+	update_display();
+}
+
+void ccompan_state::cled_w(int state)
+{
+	// CB2: "color" led
+	m_led_direct = (m_led_direct & ~1) | (state ? 1 : 0);
+	update_display();
+}
+
+void ccompan_state::control_w(u8 data)
+{
+	// PB0-PB3: input mux, led select
+	m_inp_mux = data & 0xf;
+
+	// PB4-PB6: led data
+	m_led_data = ~data >> 4 & 7;
+	update_display();
+
+	// PB7: speaker out
+	m_dac->write(BIT(data, 7));
+}
+
+u8 ccompan_state::input_r()
+{
+	u8 data = 0;
+
+	// PA0-PA7: multiplexed inputs
+	// read chessboard sensors
+	if (m_inp_mux < 8)
+		data = m_board->read_file(m_inp_mux);
+
+	// read other buttons
+	else if (m_inp_mux < 10)
+		data = m_inputs[m_inp_mux - 8]->read();
+
+	return ~data;
+}
+
+
+
+/******************************************************************************
+    Address Maps
+******************************************************************************/
+
+void ccompan_state::main_map(address_map &map)
+{
+	map.global_mask(0x1fff);
+	map(0x0000, 0x03ff).ram();
+	map(0x0800, 0x0803).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+	map(0x1000, 0x1fff).rom();
+}
+
+
+
+/******************************************************************************
+    Input Ports
+******************************************************************************/
+
+static INPUT_PORTS_START( ccompan )
+	PORT_START("IN.0")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD) PORT_NAME("Pawn")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD) PORT_NAME("Knight")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD) PORT_NAME("Bishop")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD) PORT_NAME("Queen")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD) PORT_NAME("King")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_S) PORT_NAME("Swap Sides")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_C) PORT_NAME("Color")
+
+	PORT_START("IN.1")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_N) PORT_NAME("New Game")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_3) PORT_CODE(KEYCODE_3_PAD) PORT_NAME("Rook")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_O) PORT_NAME("Play")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_B) PORT_NAME("Clear Board")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_T) PORT_NAME("Take Back")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_M) PORT_NAME("Multi Move")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_L) PORT_NAME("Change Level")
+INPUT_PORTS_END
+
+
+
+/******************************************************************************
+    Machine Configs
+******************************************************************************/
+
+void ccompan_state::ccompan(machine_config &config)
+{
+	/* basic machine hardware */
+	M6504(config, m_maincpu, 1000000); // approximation, no XTAL
+	m_maincpu->set_addrmap(AS_PROGRAM, &ccompan_state::main_map);
+
+	PIA6821(config, m_pia, 0);
+	m_pia->readpa_handler().set(FUNC(ccompan_state::input_r));
+	m_pia->writepb_handler().set(FUNC(ccompan_state::control_w));
+	m_pia->ca2_handler().set(FUNC(ccompan_state::sled_w));
+	m_pia->cb2_handler().set(FUNC(ccompan_state::cled_w));
+
+	SENSORBOARD(config, m_board).set_type(sensorboard_device::BUTTONS);
+	m_board->init_cb().set(m_board, FUNC(sensorboard_device::preset_chess));
+	m_board->set_delay(attotime::from_msec(150));
+
+	/* video hardware */
+	PWM_DISPLAY(config, m_display).set_size(10+2, 3);
+	config.set_default_layout(layout_saitek_ccompan);
+
+	/* sound hardware */
+	SPEAKER(config, "speaker").front_center();
+	DAC_1BIT(config, m_dac).add_route(ALL_OUTPUTS, "speaker", 0.25);
+	VOLTAGE_REGULATOR(config, "vref").add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
+}
+
+
+
+/******************************************************************************
+    ROM Definitions
+******************************************************************************/
+
+ROM_START( ccompan )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("2332n_y01a", 0x1000, 0x1000, CRC(a715d51c) SHA1(3e1bd9dc119c914b502f1433ee2d6ce3f477b99a) ) // 2332
+ROM_END
+
+} // anonymous namespace
+
+
+
+/******************************************************************************
+    Drivers
+******************************************************************************/
+
+//    YEAR  NAME     PARENT CMP MACHINE  INPUT    STATE          INIT        COMPANY, FULLNAME, FLAGS
+CONS( 1982, ccompan, 0,      0, ccompan, ccompan, ccompan_state, empty_init, "SciSys", "Chess Companion", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/saitek_chesstrv.cpp mame-0.224+dfsg.1/src/mame/drivers/saitek_chesstrv.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/saitek_chesstrv.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/saitek_chesstrv.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,11 +1,12 @@
 // license:BSD-3-Clause
 // copyright-holders:Sandro Ronco, hap
-// thanks-to:Sean Riddle
+// thanks-to:Sean Riddle, Berger
 /******************************************************************************
 
-SciSys Chess Traveler
+SciSys Chess Traveler (aka Novag Pocket Chess)
+SciSys Chess Intercontinental Traveler
 
-Hardware notes:
+Chess Traveler hardware notes:
 - Fairchild 3870 MCU, label SL90387 (does not use the timer or irq at all)
 - 256 bytes RAM(3539)
 - 4-digit 7seg led panel
@@ -17,19 +18,43 @@
 it has the same MCU serial (SL90387). They added battery low voltage detection
 to it (rightmost digit DP lights up).
 
+Chess Intercontinental Traveler, released after the SciSys/Novag partnership splitup,
+is nearly the same program. Only a few bytes different, not counting changed jump
+addresses due to inserted code.
+
+Chess Intercontinental Traveler hardware notes:
+- Fairchild 3870 MCU, label SL90594, backside label 3870T-0594
+- 256 bytes RAM(2*TC5501P)
+- 4-digit LCD screen, the exact same one as in Mini Chess, but of the extra segments,
+  only the 'low battery' and 'computing' segments are used
+
+Regarding MCU frequency:
+
+Chess Traveler should be around 4.5MHz. An Acetronic version was measured ~3MHz,
+but that is far too slow. On Novag Pocket Chess, opening move F2F3 at level 6 is
+answered after around 60 seconds.
+
+Likewise, Intercontinental Traveler was measured ~5MHz, but in reality is much
+closer to 6MHz. This was confirmed by hooking up a 6MHz XTAL, taking around
+44 seconds after the same F2F3 move.
+
+Both chesscomputers have a cheap RC circuit for the MCU clock, it seems that
+electronically measuring them affected the frequency.
+
 TODO:
-- MCU frequency was actually measured ~3MHz, but this is much too slow when compared
-  to a video recording (of Novag Pocket Chess), need to reverify
+- add low-battery indicator? useless since it's not software-controlled
 
 ******************************************************************************/
 
 #include "emu.h"
 #include "cpu/f8/f8.h"
 #include "machine/f3853.h"
+#include "machine/timer.h"
 #include "video/pwm.h"
 
 // internal artwork
 #include "saitek_chesstrv.lh" // clickable
+#include "saitek_chesstrvi.lh" // clickable
 
 
 namespace {
@@ -41,10 +66,13 @@
 		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
 		m_display(*this, "display"),
+		m_comp_timer(*this, "comp_timer"),
+		m_computing(*this, "computing"),
 		m_inputs(*this, "IN.%u", 0)
 	{ }
 
 	void chesstrv(machine_config &config);
+	void chesstrvi(machine_config &config);
 
 protected:
 	virtual void machine_start() override;
@@ -53,11 +81,15 @@
 	// devices/pointers
 	required_device<cpu_device> m_maincpu;
 	required_device<pwm_display_device> m_display;
+	optional_device<timer_device> m_comp_timer;
+	output_finder<> m_computing;
 	required_ioport_array<4> m_inputs;
 
 	void chesstrv_mem(address_map &map);
 	void chesstrv_io(address_map &map);
 
+	TIMER_DEVICE_CALLBACK_MEMBER(computing) { m_computing = 1; }
+
 	void update_display();
 	void matrix_w(u8 data);
 	void digit_w(u8 data);
@@ -70,18 +102,15 @@
 	void ram_data_w(u8 data) { m_ram[m_ram_address] = data; }
 
 	std::unique_ptr<u8[]> m_ram;
-	u8 m_ram_address;
-	u8 m_inp_mux;
-	u8 m_7seg_data;
+	u8 m_ram_address = 0;
+	u8 m_inp_mux = 0;
+	u8 m_7seg_data = 0;
 };
 
 void chesstrv_state::machine_start()
 {
-	// zerofill
 	m_ram = make_unique_clear<u8[]>(0x100);
-	m_ram_address = 0;
-	m_inp_mux = 0;
-	m_7seg_data = 0;
+	m_computing.resolve();
 
 	// register for savestates
 	save_pointer(NAME(m_ram), 0x100);
@@ -112,6 +141,13 @@
 
 void chesstrv_state::matrix_w(u8 data)
 {
+	// chesstrvi: "computing" segment goes on when LCD isn't driven
+	if (m_comp_timer != nullptr && ~data & m_inp_mux & 1)
+	{
+		m_computing = 0;
+		m_comp_timer->adjust(attotime::from_msec(100));
+	}
+
 	// d0-d3: input/digit select (active low)
 	m_inp_mux = data;
 	update_display();
@@ -185,6 +221,19 @@
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
 INPUT_PORTS_END
 
+static INPUT_PORTS_START( chesstrvi )
+	PORT_INCLUDE( chesstrv )
+
+	PORT_MODIFY("IN.2")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_L) PORT_NAME("Level / CS")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_K) PORT_NAME("Find Position")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_O) PORT_NAME("Enter Position")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_N) PORT_NAME("New Game")
+
+	PORT_MODIFY("IN.3")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_M) PORT_NAME("Multi Move")
+INPUT_PORTS_END
+
 
 
 /******************************************************************************
@@ -210,6 +259,18 @@
 	config.set_default_layout(layout_saitek_chesstrv);
 }
 
+void chesstrv_state::chesstrvi(machine_config &config)
+{
+	chesstrv(config);
+
+	/* basic machine hardware */
+	m_maincpu->set_clock(6000000/2); // approximation
+	subdevice<f38t56_device>("psu")->set_clock(6000000/2);
+
+	TIMER(config, m_comp_timer).configure_generic(FUNC(chesstrv_state::computing));
+	config.set_default_layout(layout_saitek_chesstrvi);
+}
+
 
 
 /******************************************************************************
@@ -221,6 +282,11 @@
 	ROM_LOAD("sl90387", 0x0000, 0x0800, CRC(b76214d8) SHA1(7760903a64d9c513eb54c4787f535dabec62eb64) )
 ROM_END
 
+ROM_START( chesstrvi )
+	ROM_REGION( 0x0800, "maincpu", 0 )
+	ROM_LOAD("sl90594.u3", 0x0000, 0x0800, CRC(9162e89a) SHA1(c3f71365b73b0112aae09f11722bd78186c78408) )
+ROM_END
+
 } // anonymous namespace
 
 
@@ -229,5 +295,6 @@
     Drivers
 ******************************************************************************/
 
-//    YEAR  NAME      PARENT CMP MACHINE   INPUT     STATE           INIT        COMPANY, FULLNAME, FLAGS
-CONS( 1980, chesstrv, 0,      0, chesstrv, chesstrv, chesstrv_state, empty_init, "SciSys / Novag", "Chess Traveler", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+//    YEAR  NAME       PARENT CMP MACHINE    INPUT      STATE           INIT        COMPANY, FULLNAME, FLAGS
+CONS( 1980, chesstrv,  0,      0, chesstrv,  chesstrv,  chesstrv_state, empty_init, "SciSys / Novag", "Chess Traveler", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
+CONS( 1982, chesstrvi, 0,      0, chesstrvi, chesstrvi, chesstrv_state, empty_init, "SciSys", "Chess Intercontinental Traveler", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/saitek_delta1.cpp mame-0.224+dfsg.1/src/mame/drivers/saitek_delta1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/saitek_delta1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/saitek_delta1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,7 +12,7 @@
 - 4KB ROM(2332A), 256 bytes RAM(2*2111A-4)
 - 4-digit 7seg panel, no sound, no chessboard
 
--------------------------------------------------------------------------------
+===============================================================================
 
 Program origin notes by bataais:
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/saitek_exchess.cpp mame-0.224+dfsg.1/src/mame/drivers/saitek_exchess.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/saitek_exchess.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/saitek_exchess.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -58,9 +58,11 @@
 	output_finder<> m_battery;
 	required_ioport_array<4> m_inputs;
 
+	// address maps
 	void main_map(address_map &map);
 	void main_io(address_map &map);
 
+	// I/O handlers
 	template<int N> void lcd_output_w(u64 data);
 	void lcd_data_w(u8 data);
 
@@ -239,7 +241,7 @@
 
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_SVG));
 	screen.set_refresh_hz(60);
-	screen.set_size(1020, 1080);
+	screen.set_size(1020/1.5, 1080/1.5);
 	screen.set_visarea_full();
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/saitek_intchess.cpp mame-0.224+dfsg.1/src/mame/drivers/saitek_intchess.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/saitek_intchess.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/saitek_intchess.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,367 @@
+// license:BSD-3-Clause
+// copyright-holders:hap
+// thanks-to:Berger, Achim
+/******************************************************************************
+
+SciSys Intelligent Chess
+
+The UK version wasn't widely released, perhaps it wasn't sold at all (can't find
+photos, just brochures and some magazine reviews). The German version was common.
+Development by Intelligent Games, the same group of people that worked on the
+Super System III and Mark V. The visual interface is an evolution of "Tolinka".
+
+Hardware notes:
+- Synertek 6502A @ ~1.1MHz
+- Synertek 6522 VIA
+- 2*4KB ROM(Synertek 2332), 2KB RAM(4*M5L2114LP)
+- 256 bytes PROM(MMI 6336-1J), 256x4 VRAM(2101-1), RF video
+- MM74C923N keyboard encoder, 20 buttons
+- cassette deck with microphone
+- 4-digit 7seg display
+
+TODO:
+- colors are estimated from photos (black and white are obvious, but the green
+  and cyan are not standard 0x00ff00 / 0x00ffff)
+- video timing is unknown, sprite offsets are estimated from photos
+
+******************************************************************************/
+
+#include "emu.h"
+#include "cpu/m6502/m6502.h"
+#include "imagedev/cassette.h"
+#include "machine/6522via.h"
+#include "machine/mm74c922.h"
+#include "machine/timer.h"
+#include "sound/dac.h"
+#include "sound/volt_reg.h"
+#include "video/pwm.h"
+
+#include "emupal.h"
+#include "screen.h"
+#include "speaker.h"
+
+// internal artwork
+#include "saitek_intchess.lh" // clickable
+
+
+namespace {
+
+class intchess_state : public driver_device
+{
+public:
+	intchess_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu"),
+		m_via(*this, "via"),
+		m_encoder(*this, "encoder"),
+		m_display(*this, "display"),
+		m_dac(*this, "dac"),
+		m_vram(*this, "vram"),
+		m_gfxdecode(*this, "gfxdecode"),
+		m_screen(*this, "screen"),
+		m_palette(*this, "palette"),
+		m_cass(*this, "cassette")
+	{ }
+
+	DECLARE_INPUT_CHANGED_MEMBER(reset_button);
+
+	void intchess(machine_config &config);
+
+protected:
+	virtual void machine_start() override;
+
+private:
+	// devices/pointers
+	required_device<cpu_device> m_maincpu;
+	required_device<via6522_device> m_via;
+	required_device<mm74c923_device> m_encoder;
+	required_device<pwm_display_device> m_display;
+	required_device<dac_bit_interface> m_dac;
+	required_shared_ptr<u8> m_vram;
+	required_device<gfxdecode_device> m_gfxdecode;
+	required_device<screen_device> m_screen;
+	required_device<palette_device> m_palette;
+	required_device<cassette_image_device> m_cass;
+
+	// address maps
+	void main_map(address_map &map);
+
+	// I/O handlers
+	void update_display();
+	void seg_w(u8 data);
+	void control_w(u8 data);
+	u8 control_r();
+
+	void init_palette(palette_device &palette) const;
+	u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	void vram_w(offs_t offset, u8 data);
+
+	TIMER_DEVICE_CALLBACK_MEMBER(cass_input);
+
+	u8 m_select = 0;
+	u8 m_7seg_data = 0;
+};
+
+void intchess_state::machine_start()
+{
+	// register for savestates
+	save_item(NAME(m_select));
+	save_item(NAME(m_7seg_data));
+}
+
+INPUT_CHANGED_MEMBER(intchess_state::reset_button)
+{
+	// assume that reset button is tied to 6502/6522
+	m_maincpu->set_input_line(INPUT_LINE_RESET, newval ? ASSERT_LINE : CLEAR_LINE);
+	if (newval)
+		m_via->reset();
+}
+
+
+
+/******************************************************************************
+    Video
+******************************************************************************/
+
+void intchess_state::init_palette(palette_device &palette) const
+{
+	palette.set_pen_color(0, 0xa0, 0xb0, 0xff);
+	palette.set_pen_color(1, 0x00, 0x00, 0x00);
+	palette.set_pen_color(2, 0x50, 0x80, 0x20);
+	palette.set_pen_color(3, 0xff, 0xff, 0xff);
+}
+
+u32 intchess_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	// draw chessboard background
+	for (int y = cliprect.top(); y <= cliprect.bottom(); y++)
+		for (int x = cliprect.left(); x <= cliprect.right(); x++)
+			bitmap.pix16(y, x) = ((x / 20) ^ (y / 16)) << 1 & 2;
+
+	// draw the sprites
+	for (int i = 0; i < 64; i++)
+	{
+		int code = (m_vram[i] & 7) << 2;
+		int color = m_vram[i] >> 3 & 1;
+		int x = (i % 8) * 20 + 2;
+		int y = (i / 8) * 16;
+
+		m_gfxdecode->gfx(0)->transpen(bitmap, cliprect, code+0, color, 0, 0, x+8, y, 0);
+		m_gfxdecode->gfx(0)->transpen(bitmap, cliprect, code+1, color, 0, 0, x+8, y+8, 0);
+		m_gfxdecode->gfx(0)->transpen(bitmap, cliprect, code+2, color, 0, 0, x, y, 0);
+		m_gfxdecode->gfx(0)->transpen(bitmap, cliprect, code+3, color, 0, 0, x, y+8, 0);
+	}
+
+	return 0;
+}
+
+void intchess_state::vram_w(offs_t offset, u8 data)
+{
+	// d0-d2: sprite index
+	// d3: color
+	// d4-d7: N/C (4-bit RAM chip)
+	m_vram[offset] = data & 0xf;
+}
+
+
+
+/******************************************************************************
+    I/O
+******************************************************************************/
+
+void intchess_state::update_display()
+{
+	m_display->matrix(m_select, m_7seg_data);
+}
+
+void intchess_state::seg_w(u8 data)
+{
+	// PA1-PA7: 7seg data
+	// PA0: ?
+	m_7seg_data = bitswap<8>(~data,0,1,2,3,4,5,6,7);
+	update_display();
+}
+
+void intchess_state::control_w(u8 data)
+{
+	// PB0-PB3: digit select
+	m_select = data & 0xf;
+	update_display();
+
+	// PB5-PB7 to cassette deck
+	// PB5: speaker
+	m_dac->write(BIT(data, 5));
+
+	// PB6: ?
+	// PB7: cassette output
+	m_cass->output(BIT(data, 7) ? +1.0 : -1.0);
+}
+
+u8 intchess_state::control_r()
+{
+	// PB4: 74C923 data available
+	return m_encoder->da_r() ? 0x10 : 0x00;
+}
+
+TIMER_DEVICE_CALLBACK_MEMBER(intchess_state::cass_input)
+{
+	// cassette input is tied to NMI
+	bool state = ((m_cass->get_state() & CASSETTE_MASK_UISTATE) == CASSETTE_PLAY) && (m_cass->input() < -0.04);
+	m_maincpu->set_input_line(INPUT_LINE_NMI, state ? ASSERT_LINE : CLEAR_LINE);
+}
+
+
+
+/******************************************************************************
+    Address Maps
+******************************************************************************/
+
+void intchess_state::main_map(address_map &map)
+{
+	map(0x0000, 0x03ff).mirror(0x0400).ram();
+	map(0x0800, 0x0bff).mirror(0x0400).ram();
+	map(0x1000, 0x1000).r(m_encoder, FUNC(mm74c923_device::read));
+	map(0x1800, 0x18ff).ram().w(FUNC(intchess_state::vram_w)).share("vram");
+	map(0xa800, 0xa80f).m(m_via, FUNC(via6522_device::map));
+	map(0xc000, 0xdfff).mirror(0x2000).rom();
+}
+
+
+
+/******************************************************************************
+    Input Ports
+******************************************************************************/
+
+static INPUT_PORTS_START( intchess )
+	PORT_START("X1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_A) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD) PORT_NAME("A 1 / Pawn")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_E) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD) PORT_NAME("E 5 / Queen")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_L) PORT_NAME("Level / Clear Square") // Spielstärke / Feld Frei
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_DEL) PORT_CODE(KEYCODE_BACKSPACE) PORT_NAME("Clear") // Löschen
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_X) PORT_NAME("Flash")
+
+	PORT_START("X2")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_B) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD) PORT_NAME("B 2 / Knight")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_F) PORT_CODE(KEYCODE_6) PORT_CODE(KEYCODE_6_PAD) PORT_NAME("F 6 / King")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_N) PORT_NAME("New Game / Clear Board") // Neue Partie / Brett Frei
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD) PORT_NAME("Enter") // Eingabe
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_T) PORT_NAME("Take Back") // Zurück
+
+	PORT_START("X3")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_C) PORT_CODE(KEYCODE_3) PORT_CODE(KEYCODE_3_PAD) PORT_NAME("C 3 / Bishop")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_G) PORT_CODE(KEYCODE_7) PORT_CODE(KEYCODE_7_PAD) PORT_NAME("G 7 / White")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_M) PORT_NAME("Mode") // Modus
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_I) PORT_NAME("Find") // Check
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_O) PORT_NAME("Next Best") // Altern
+
+	PORT_START("X4")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_D) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD) PORT_NAME("D 4 / Rook")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_H) PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_8_PAD) PORT_NAME("H 8 / Black")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_Z) PORT_NAME("Record") // Speichern
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_U) PORT_NAME("Place") // Setzen
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_CODE(KEYCODE_S) PORT_NAME("Step") // Vor
+
+	PORT_START("RESET")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_F1) PORT_CHANGED_MEMBER(DEVICE_SELF, intchess_state, reset_button, 0) PORT_NAME("Reset") // Start
+INPUT_PORTS_END
+
+
+
+/******************************************************************************
+    GFX Layouts
+******************************************************************************/
+
+static const gfx_layout layout_8x8 =
+{
+	8,8,
+	RGN_FRAC(1,1),
+	1,
+	{ 0 },
+	{ STEP8(0,1) },
+	{ STEP8(0,8) },
+	8*8
+};
+
+static GFXDECODE_START( gfx_intchess )
+	GFXDECODE_ENTRY( "gfx", 0, layout_8x8, 0, 2 )
+GFXDECODE_END
+
+
+
+/******************************************************************************
+    Machine Configs
+******************************************************************************/
+
+void intchess_state::intchess(machine_config &config)
+{
+	// basic machine hardware
+	M6502(config, m_maincpu, 4.433619_MHz_XTAL / 4);
+	m_maincpu->set_addrmap(AS_PROGRAM, &intchess_state::main_map);
+
+	VIA6522(config, m_via, 4.433619_MHz_XTAL / 4); // DDRA = 0xff, DDRB = 0xef
+	m_via->writepa_handler().set(FUNC(intchess_state::seg_w));
+	m_via->writepb_handler().set(FUNC(intchess_state::control_w));
+	m_via->readpb_handler().set(FUNC(intchess_state::control_r));
+	m_via->irq_handler().set_inputline(m_maincpu, M6502_IRQ_LINE);
+
+	MM74C923(config, m_encoder, 0); // timing parameters unknown
+	m_encoder->da_wr_callback().set(m_via, FUNC(via6522_device::write_ca2));
+	m_encoder->x1_rd_callback().set_ioport("X1");
+	m_encoder->x2_rd_callback().set_ioport("X2");
+	m_encoder->x3_rd_callback().set_ioport("X3");
+	m_encoder->x4_rd_callback().set_ioport("X4");
+	m_encoder->data_tri_callback().set(m_encoder, FUNC(mm74c923_device::read));
+
+	// video hardware
+	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+	m_screen->set_refresh_hz(50); // PAL
+	m_screen->set_size(8*20 + 32, 8*16 + 32);
+	m_screen->set_visarea(0, 8*20-1, 0, 8*16-1);
+	m_screen->set_screen_update(FUNC(intchess_state::screen_update));
+	m_screen->set_palette(m_palette);
+	m_screen->screen_vblank().set(m_via, FUNC(via6522_device::write_cb2));
+
+	GFXDECODE(config, m_gfxdecode, m_palette, gfx_intchess);
+	PALETTE(config, m_palette, FUNC(intchess_state::init_palette), 4);
+
+	PWM_DISPLAY(config, m_display).set_size(4, 8);
+	m_display->set_segmask(0xf, 0x7f);
+	config.set_default_layout(layout_saitek_intchess);
+
+	// sound hardware
+	SPEAKER(config, "speaker").front_center();
+	DAC_1BIT(config, m_dac).add_route(ALL_OUTPUTS, "speaker", 0.25);
+	VOLTAGE_REGULATOR(config, "vref").add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
+
+	// cassette
+	CASSETTE(config, m_cass);
+	m_cass->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
+	m_cass->add_route(ALL_OUTPUTS, "speaker", 0.05);
+	TIMER(config, "cass_input").configure_periodic(FUNC(intchess_state::cass_input), attotime::from_usec(10));
+}
+
+
+
+/******************************************************************************
+    ROM Definitions
+******************************************************************************/
+
+ROM_START( intchess )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD("c45015_ytv-lrom.u9", 0xc000, 0x1000, CRC(eef04467) SHA1(5bdcb8d596b91aa06c6ef1ed53ef14d0d13f4194) ) // 2332
+	ROM_LOAD("c45016_ytv-hrom.u8", 0xd000, 0x1000, CRC(7e6f85b4) SHA1(4cd15257eae04067160026f9a062a28581f46227) ) // "
+
+	ROM_REGION( 0x100, "gfx", 0 )
+	ROM_LOAD("igp.u15", 0x000, 0x100, CRC(bf8358e0) SHA1(880e0d9bd8a75874ba9e51dfb5999b8fcd321a4f) ) // 6336-1
+ROM_END
+
+} // anonymous namespace
+
+
+
+/******************************************************************************
+    Drivers
+******************************************************************************/
+
+//    YEAR  NAME      PARENT CMP MACHINE   INPUT     STATE           INIT        COMPANY, FULLNAME, FLAGS
+CONS( 1980, intchess, 0,      0, intchess, intchess, intchess_state, empty_init, "SciSys / Intelligent Games", "Intelligent Chess", MACHINE_SUPPORTS_SAVE | MACHINE_CLICKABLE_ARTWORK | MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_GRAPHICS )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/saitek_mark5.cpp mame-0.224+dfsg.1/src/mame/drivers/saitek_mark5.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/saitek_mark5.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/saitek_mark5.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -436,7 +436,7 @@
 
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_SVG));
 	screen.set_refresh_hz(60);
-	screen.set_size(942, 1080);
+	screen.set_size(942/1.5, 1080/1.5);
 	screen.set_visarea_full();
 
 	config.set_default_layout(layout_saitek_mark5);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/saitek_risc2500.cpp mame-0.224+dfsg.1/src/mame/drivers/saitek_risc2500.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/saitek_risc2500.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/saitek_risc2500.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -18,7 +18,7 @@
   Is cpu cycle timing wrong? I suspect conditional branch timing due to cache miss
   (pipeline has to refill). The delay loop between writing to the speaker is simply:
   SUBS R2, R2, #$1, BNE $2000cd8
-- does it have an LCDC? if so, what chip?
+- use SED1520 device for the LCD
 
 ******************************************************************************/
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/saitek_simultano.cpp mame-0.224+dfsg.1/src/mame/drivers/saitek_simultano.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/saitek_simultano.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/saitek_simultano.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -19,6 +19,9 @@
 It also appeared in Tandy's Chess Champion 2150, not as a simple rebrand, but
 with hardware differences: 3MHz R65C02, 1 64KB ROM and no EGR socket.
 
+TODO:
+- where does the IRQ come from? same problem as with stratos
+
 ***************************************************************************/
 
 #include "emu.h"
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/saitek_ssystem3.cpp mame-0.224+dfsg.1/src/mame/drivers/saitek_ssystem3.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/saitek_ssystem3.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/saitek_ssystem3.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -8,11 +8,11 @@
 manufacturing chain is unknown. The software is by SciSys (no mention of Novag
 in the ROM, it has "COPYRIGHT SCISYS LTD 1979").
 
-This is their 1st original product. MK II was licensed from Commodore, and
+This is their 1st original product. MK II was licensed from Peter Jennings, and
 MK I was, to put it bluntly, a bootleg. The chess engine is by Mike Johnson,
 with support from David Levy.
 
-Hardware notes: (main unit)
+Hardware notes (Master Unit):
 - Synertek 6502A @ 2MHz (4MHz XTAL)
 - Synertek 6522 VIA
 - 8KB ROM (2*Synertek 2332)
@@ -23,9 +23,9 @@
 
 Chess Unit:
 - PCB label: Radofin XM-2057-0C
-- Fairchild F6808P CPU @ ?MHz (M6808 compatible)
+- Fairchild F6808P CPU @ ~6.8MHz (M6808 compatible)
 - Fairchild F6821P PIA
-- C28A97M 4KB ROM(2332), 128x8 RAM(F6810P)
+- 2KB ROM(2316), 128x8 RAM(F6810P)
 - 2*HLCD0438, chessboard LCD
 
 Printer Unit:
@@ -52,7 +52,7 @@
   Should be doable to add, but 6522 device doesn't support live clock changes.
 - LCD TC pin? connects to the display, source is a 50hz timer(from power supply),
   probably to keep refreshing the LCD when inactive, there is no need to emulate it
-- dump/add chessboard lcd and printer unit
+- dump/add printer unit
 - dump/add ssystem3 1980 program revision, were the BTANB fixed?
 - ssystem4 softwarelist if a prototype cartridge is ever dumped
 
@@ -62,15 +62,21 @@
   lessen the chance by adding a spring to the switch.
 - Similar to the TIME switch bug, pressing 2 buttons simultaneously can cause it
   to malfunction, eg. press A+CE or C+CE and an "8" appears in the display.
+- chess unit screen briefly flickers at power-on and when the subcpu receives an
+  NMI in the middle of updating the LCD, it is mentioned in the manual
 
 ******************************************************************************/
 
 #include "emu.h"
+
 #include "cpu/m6502/m6502.h"
+#include "cpu/m6800/m6800.h"
 #include "machine/6522via.h"
+#include "machine/6821pia.h"
 #include "machine/nvram.h"
 #include "sound/dac.h"
 #include "sound/volt_reg.h"
+#include "video/hlcd0438.h"
 #include "video/md4330b.h"
 #include "video/pwm.h"
 
@@ -90,14 +96,20 @@
 	ssystem3_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
+		m_subcpu(*this, "subcpu"),
 		m_via(*this, "via"),
-		m_lcd(*this, "lcd"),
-		m_display(*this, "display"),
+		m_pia(*this, "pia"),
+		m_lcd1(*this, "lcd1"),
+		m_lcd2(*this, "lcd2_%u", 0),
+		m_display(*this, "display%u", 0),
 		m_dac(*this, "dac"),
 		m_nvram(*this, "nvram"),
-		m_inputs(*this, "IN.%u", 0)
+		m_inputs(*this, "IN.%u", 0),
+		m_out_lcd2(*this, "s%u.%u", 0U, 0U)
 	{ }
 
+	DECLARE_INPUT_CHANGED_MEMBER(cu_plug);
+
 	// machine configs
 	void ssystem3(machine_config &config);
 	void ssystem4(machine_config &config);
@@ -110,40 +122,60 @@
 private:
 	// devices/pointers
 	required_device<cpu_device> m_maincpu;
+	optional_device<cpu_device> m_subcpu;
 	required_device<via6522_device> m_via;
-	required_device<md4332b_device> m_lcd;
-	required_device<pwm_display_device> m_display;
+	optional_device<pia6821_device> m_pia;
+	required_device<md4332b_device> m_lcd1;
+	optional_device_array<hlcd0438_device, 2> m_lcd2;
+	optional_device_array<pwm_display_device, 2> m_display;
 	required_device<dac_bit_interface> m_dac;
 	optional_shared_ptr<u8> m_nvram;
-	required_ioport_array<4+2> m_inputs;
+	optional_ioport_array<4+3> m_inputs;
+	output_finder<8, 48> m_out_lcd2;
 
 	// address maps
 	void ssystem3_map(address_map &map);
 	void ssystem4_map(address_map &map);
+	void chessunit_map(address_map &map);
 
 	// I/O handlers
-	void lcd_q_w(u32 data) { m_lcd_q = data; }
-	void nvram_w(offs_t offset, u8 data);
-	u8 nvram_r(offs_t offset);
+	void lcd1_output_w(u32 data) { m_lcd1_data = data; }
 	void input_w(u8 data);
 	u8 input_r();
 	void control_w(u8 data);
 	u8 control_r();
 
+	void nvram_w(offs_t offset, u8 data);
+	u8 nvram_r(offs_t offset);
+
+	void lcd2_pwm_w(offs_t offset, u8 data);
+	void lcd2_update();
+	template<int N> void lcd2_output_w(offs_t offset, u32 data);
+	void cu_pia_a_w(u8 data);
+	u8 cu_pia_a_r();
+	void cu_pia_b_w(u8 data);
+	u8 cu_pia_b_r();
+
 	u8 m_inp_mux = 0;
 	u8 m_control = 0;
 	u8 m_shift = 0;
-	u32 m_lcd_q = 0;
+	u32 m_lcd1_data = 0;
+	u64 m_lcd2_data = 0;
+	u8 m_lcd2_select = 0;
 	bool m_xor_kludge = false;
 };
 
 void ssystem3_state::machine_start()
 {
+	m_out_lcd2.resolve();
+
 	// register for savestates
 	save_item(NAME(m_inp_mux));
 	save_item(NAME(m_control));
 	save_item(NAME(m_shift));
-	save_item(NAME(m_lcd_q));
+	save_item(NAME(m_lcd1_data));
+	save_item(NAME(m_lcd2_data));
+	save_item(NAME(m_lcd2_select));
 }
 
 
@@ -152,17 +184,7 @@
     I/O
 ******************************************************************************/
 
-void ssystem3_state::nvram_w(offs_t offset, u8 data)
-{
-	// nvram is only d0-d3
-	if (m_inputs[5]->read() & 1)
-		m_nvram[offset] = data & 0x0f;
-}
-
-u8 ssystem3_state::nvram_r(offs_t offset)
-{
-	return (m_inputs[5]->read() & 1) ? (m_nvram[offset] & 0x0f) : 0;
-}
+// Master Unit
 
 void ssystem3_state::input_w(u8 data)
 {
@@ -199,26 +221,28 @@
 
 	// PB1: LCD DI
 	// PB2: LCD CLK
-	m_lcd->di_w(BIT(data, 1));
-	m_lcd->clk_w(BIT(data, 2));
+	m_lcd1->di_w(BIT(data, 1));
+	m_lcd1->clk_w(BIT(data, 2));
 
 	// PB2 also clocks a 4015B
 	// DA: LCD DO, DB: Q3A
 	if (data & ~m_control & 4)
 	{
-		m_shift = m_shift << 1 | m_lcd->do_r();
+		m_shift = m_shift << 1 | m_lcd1->do_r();
 
 		// weird TTL maze, I assume it's a hw kludge to fix a bug after the maskroms were already manufactured
-		u8 xorval = m_xor_kludge && (BIT(m_shift, 3) & ~(BIT(m_shift, 1) ^ BIT(m_shift, 4)) & ~(BIT(m_lcd_q, 7) & BIT(m_lcd_q, 23))) ? 0x12 : 0;
+		u8 xorval = m_xor_kludge && (BIT(m_shift, 3) & ~(BIT(m_shift, 1) ^ BIT(m_shift, 4)) & ~(BIT(m_lcd1_data, 7) & BIT(m_lcd1_data, 23))) ? 0x12 : 0;
 
 		// update display
 		for (int i = 0; i < 4; i++)
-			m_display->write_row(i, m_lcd_q >> (8*i) & 0xff);
-		m_display->write_row(4, (m_shift ^ xorval) | 0x100);
-		m_display->update();
+			m_display[0]->write_row(i, m_lcd1_data >> (8*i) & 0xff);
+		m_display[0]->write_row(4, (m_shift ^ xorval) | 0x100);
+		m_display[0]->update();
 	}
 
 	// PB3: device serial out
+	if (m_inputs[5]->read() & 2)
+		m_pia->ca1_w(BIT(~data, 3));
 
 	// PB7: tied to PB6 (pulse timer 2)
 	m_via->write_pb6(BIT(data, 7));
@@ -228,9 +252,102 @@
 
 u8 ssystem3_state::control_r()
 {
-	// PB4: device busy
-	// PB5: device attached?
-	return 0xff;
+	u8 data = 0;
+
+	// PB4: device busy (unused on chess unit)
+	// PB5: device attached
+	if (m_inputs[5]->read() & 2)
+		data ^= 0x30;
+
+	return ~data;
+}
+
+
+// PSU
+
+void ssystem3_state::nvram_w(offs_t offset, u8 data)
+{
+	// nvram is only d0-d3
+	if (m_inputs[5]->read() & 1)
+		m_nvram[offset] = data & 0x0f;
+}
+
+u8 ssystem3_state::nvram_r(offs_t offset)
+{
+	return (m_inputs[5]->read() & 1) ? (m_nvram[offset] & 0x0f) : 0;
+}
+
+
+// Chess Unit
+
+INPUT_CHANGED_MEMBER(ssystem3_state::cu_plug)
+{
+	m_subcpu->set_input_line(INPUT_LINE_RESET, newval ? CLEAR_LINE : ASSERT_LINE);
+
+	if (newval)
+		m_pia->reset();
+	else
+		m_display[1]->clear();
+}
+
+void ssystem3_state::lcd2_pwm_w(offs_t offset, u8 data)
+{
+	m_out_lcd2[offset & 0x3f][offset >> 6] = data;
+}
+
+void ssystem3_state::lcd2_update()
+{
+	if (m_inputs[5]->read() & 2)
+		m_display[1]->matrix(1 << m_lcd2_select, m_lcd2_data);
+}
+
+template<int N>
+void ssystem3_state::lcd2_output_w(offs_t offset, u32 data)
+{
+	if (!offset)
+		data = 0;
+
+	m_lcd2_data = u64(data) << 32 | m_lcd2_data >> 32;
+
+	if (N == 1)
+		lcd2_update();
+}
+
+void ssystem3_state::cu_pia_a_w(u8 data)
+{
+	// PA0-PA2: CD4051 to LCD column
+	m_lcd2_select = data & 7;
+	lcd2_update();
+}
+
+u8 ssystem3_state::cu_pia_a_r()
+{
+	// PA7: serial data in
+	return ~m_control << 4 & 0x80;
+}
+
+void ssystem3_state::cu_pia_b_w(u8 data)
+{
+	// PB3: LCD LOAD (both)
+	// PB4: LCD LCD (both) + CD4051 COM OUT/IN
+	// PB6: LCD CLOCK (both)
+	// PB7: LCD DATA IN (1st)
+	m_lcd2[0]->data_w(BIT(data, 7));
+
+	for (int i = 0; i < 2; i++)
+		m_lcd2[i]->clock_w(BIT(data, 6));
+
+	for (int i = 0; i < 2; i++)
+		m_lcd2[i]->load_w(BIT(~data, 3));
+
+	for (int i = 0; i < 2; i++)
+		m_lcd2[i]->lcd_w(BIT(data, 4));
+}
+
+u8 ssystem3_state::cu_pia_b_r()
+{
+	// PB5: look switch
+	return m_inputs[6]->read() << 5 & 0x20;
 }
 
 
@@ -255,18 +372,25 @@
 	map(0xd000, 0xffff).rom();
 }
 
+void ssystem3_state::chessunit_map(address_map &map)
+{
+	map(0x3000, 0x307f).mirror(0x0f80).ram();
+	map(0x4000, 0x47ff).mirror(0xb800).rom();
+	map(0x8000, 0x8003).mirror(0x3ffc).rw(m_pia, FUNC(pia6821_device::read), FUNC(pia6821_device::write));
+}
+
 
 
 /******************************************************************************
     Input Ports
 ******************************************************************************/
 
-static INPUT_PORTS_START( ssystem3 )
+static INPUT_PORTS_START( ssystem4 )
 	PORT_START("IN.0")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_NAME("9 / EP / C SQ")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_NAME("9 / EP / C.Square")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_ENTER) PORT_CODE(KEYCODE_ENTER_PAD) PORT_NAME("Enter")
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_0) PORT_CODE(KEYCODE_0_PAD) PORT_NAME("0 / MD / C Board")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_0) PORT_CODE(KEYCODE_0_PAD) PORT_NAME("0 / MD / C.Board")
 
 	PORT_START("IN.1")
 	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
@@ -281,7 +405,7 @@
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_1_PAD) PORT_CODE(KEYCODE_A) PORT_NAME("A 1 / White")
 
 	PORT_START("IN.3")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_T) PORT_NAME("Time") // spring-loaded
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_TOGGLE PORT_CODE(KEYCODE_T) PORT_NAME("Time")
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_8) PORT_CODE(KEYCODE_8_PAD) PORT_CODE(KEYCODE_H) PORT_NAME("H 8 / Black")
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_3) PORT_CODE(KEYCODE_3_PAD) PORT_CODE(KEYCODE_C) PORT_NAME("C 3 / Queen / #50")
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_2) PORT_CODE(KEYCODE_2_PAD) PORT_CODE(KEYCODE_B) PORT_NAME("B 2 / King / FP")
@@ -290,29 +414,40 @@
 	PORT_CONFNAME( 0x01, 0x01, "Sound" )
 	PORT_CONFSETTING(    0x00, DEF_STR( Off ) )
 	PORT_CONFSETTING(    0x01, DEF_STR( On ) )
-	PORT_CONFNAME( 0x02, 0x02, "LCD Light" )
+	PORT_CONFNAME( 0x02, 0x02, "LCD 1 Light" )
 	PORT_CONFSETTING(    0x00, DEF_STR( Off ) )
 	PORT_CONFSETTING(    0x02, DEF_STR( On ) )
 
 	PORT_START("IN.5") // accessories/diodes
-	PORT_CONFNAME( 0x01, 0x01, "Memory Unit" )
-	PORT_CONFSETTING(    0x00, DEF_STR( Off ) )
-	PORT_CONFSETTING(    0x01, DEF_STR( On ) )
-	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_CUSTOM)
+	PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
 INPUT_PORTS_END
 
-static INPUT_PORTS_START( ssystem4 )
-	PORT_INCLUDE( ssystem3 )
+static INPUT_PORTS_START( ssystem3 )
+	PORT_INCLUDE( ssystem4 )
 
 	PORT_MODIFY("IN.0")
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_NAME("9 / EP / C.Square")
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_0) PORT_CODE(KEYCODE_0_PAD) PORT_NAME("0 / MD / C.Board")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_9) PORT_CODE(KEYCODE_9_PAD) PORT_NAME("9 / EP / C SQ")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_0) PORT_CODE(KEYCODE_0_PAD) PORT_NAME("0 / MD / C Board")
 
 	PORT_MODIFY("IN.3")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_TOGGLE PORT_CODE(KEYCODE_T) PORT_NAME("Time")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYPAD) PORT_CODE(KEYCODE_T) PORT_NAME("Time") // spring-loaded
 
-	PORT_MODIFY("IN.5")
-	PORT_BIT(0xff, IP_ACTIVE_HIGH, IPT_UNUSED)
+	PORT_MODIFY("IN.4") // switches
+	PORT_CONFNAME( 0x04, 0x04, "LCD 2 Light" )
+	PORT_CONFSETTING(    0x00, DEF_STR( Off ) )
+	PORT_CONFSETTING(    0x04, DEF_STR( On ) )
+
+	PORT_MODIFY("IN.5") // accessories/diodes
+	PORT_CONFNAME( 0x01, 0x01, "Memory Unit" )
+	PORT_CONFSETTING(    0x00, DEF_STR( Off ) )
+	PORT_CONFSETTING(    0x01, DEF_STR( On ) )
+	PORT_CONFNAME( 0x02, 0x02, "Chess Unit" ) PORT_CHANGED_MEMBER(DEVICE_SELF, ssystem3_state, cu_plug, 0)
+	PORT_CONFSETTING(    0x00, DEF_STR( Off ) )
+	PORT_CONFSETTING(    0x02, DEF_STR( On ) )
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_CUSTOM)
+
+	PORT_START("IN.6") // chess unit
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_TOGGLE PORT_CODE(KEYCODE_O) PORT_NAME("Look")
 INPUT_PORTS_END
 
 
@@ -334,16 +469,16 @@
 	m_via->readpb_handler().set(FUNC(ssystem3_state::control_r));
 
 	/* video hardware */
-	MD4332B(config, m_lcd);
-	m_lcd->write_q().set(FUNC(ssystem3_state::lcd_q_w));
+	MD4332B(config, m_lcd1);
+	m_lcd1->write_q().set(FUNC(ssystem3_state::lcd1_output_w));
 
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_SVG));
 	screen.set_refresh_hz(60);
 	screen.set_size(1920/2, 729/2);
 	screen.set_visarea_full();
 
-	PWM_DISPLAY(config, m_display).set_size(5, 9);
-	m_display->set_bri_levels(0.25);
+	PWM_DISPLAY(config, m_display[0]).set_size(5, 9);
+	m_display[0]->set_bri_levels(0.25);
 
 	config.set_default_layout(layout_saitek_ssystem4);
 
@@ -360,9 +495,39 @@
 	/* basic machine hardware */
 	m_maincpu->set_addrmap(AS_PROGRAM, &ssystem3_state::ssystem3_map);
 
+	M6808(config, m_subcpu, 6800000); // LC circuit, measured
+	m_subcpu->set_addrmap(AS_PROGRAM, &ssystem3_state::chessunit_map);
+
+	config.set_perfect_quantum(m_maincpu);
+
+	PIA6821(config, m_pia, 0);
+	m_pia->irqa_handler().set_inputline(m_subcpu, INPUT_LINE_NMI);
+	m_pia->writepa_handler().set(FUNC(ssystem3_state::cu_pia_a_w));
+	m_pia->readpa_handler().set(FUNC(ssystem3_state::cu_pia_a_r));
+	m_pia->writepb_handler().set(FUNC(ssystem3_state::cu_pia_b_w));
+	m_pia->readpb_handler().set(FUNC(ssystem3_state::cu_pia_b_r));
+	m_pia->cb2_handler().set(m_pia, FUNC(pia6821_device::cb1_w));
+	m_pia->cb2_handler().append(m_pia, FUNC(pia6821_device::ca2_w));
+
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
 
-	m_display->set_segmask(0xf, 0x7f); // 7segs are at expected positions
+	/* video hardware */
+	HLCD0438(config, m_lcd2[0], 0);
+	m_lcd2[0]->write_segs().set(FUNC(ssystem3_state::lcd2_output_w<0>));
+	m_lcd2[0]->write_data().set(m_lcd2[1], FUNC(hlcd0438_device::data_w));
+
+	HLCD0438(config, m_lcd2[1], 0);
+	m_lcd2[1]->write_segs().set(FUNC(ssystem3_state::lcd2_output_w<1>));
+
+	screen_device &screen(SCREEN(config, "chessunit", SCREEN_TYPE_SVG));
+	screen.set_refresh_hz(60);
+	screen.set_size(1060/1.5, 1080/1.5);
+	screen.set_visarea_full();
+
+	PWM_DISPLAY(config, m_display[1]).set_size(8, 48);
+	m_display[1]->output_x().set(FUNC(ssystem3_state::lcd2_pwm_w));
+
+	m_display[0]->set_segmask(0xf, 0x7f); // 7segs are at expected positions
 	config.set_default_layout(layout_saitek_ssystem3);
 }
 
@@ -373,22 +538,28 @@
 ******************************************************************************/
 
 ROM_START( ssystem3 )
-	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_REGION(0x10000, "maincpu", 0)
 	ROM_LOAD("c19081e_ss-3-lrom.u4", 0x8000, 0x1000, CRC(9ea46ed3) SHA1(34eef85b356efbea6ddac1d1705b104fc8e2731a) ) // 2332
 	ROM_LOAD("c19082_ss-3-hrom.u5",  0x9000, 0x1000, CRC(52741e0b) SHA1(2a7b950f9810c5a14a1b9d5e6b2bd93da621662e) ) // "
 
 	// HACK! 6522 ACR register setup
 	ROM_FILL(0x946d, 1, 0xe0) // was 0xe3
 
-	ROM_REGION( 0x100, "nvram", 0 ) // default settings
-	ROM_LOAD( "nvram", 0, 0x100, CRC(b5dddc7b) SHA1(3be9ec8359cc9ef16a04f28dfd24f9ffe1a2fca9) )
+	ROM_REGION(0x10000, "subcpu", 0)
+	ROM_LOAD("c28a97m_ss-3l-rom", 0x4000, 0x0800, CRC(bf0b2a84) SHA1(286f56aca2e50b78ac1fae4a89413659aceb71d9) ) // 2316
+
+	ROM_REGION(0x100, "nvram", 0) // default settings
+	ROM_LOAD("nvram", 0, 0x100, CRC(b5dddc7b) SHA1(3be9ec8359cc9ef16a04f28dfd24f9ffe1a2fca9) )
+
+	ROM_REGION(53552, "screen", 0)
+	ROM_LOAD("ssystem3.svg", 0, 53552, CRC(6047f88f) SHA1(2ff9cfce01cd3811a3f46f84b47fdc4ea2cf2ba8) )
 
-	ROM_REGION( 53552, "screen", 0)
-	ROM_LOAD( "ssystem3.svg", 0, 53552, CRC(6047f88f) SHA1(2ff9cfce01cd3811a3f46f84b47fdc4ea2cf2ba8) )
+	ROM_REGION(748939, "chessunit", 0)
+	ROM_LOAD("chessunit.svg", 0, 748939, CRC(713a46fd) SHA1(6119162fb7c00f81aeca0dfe274475dc8575dd70) )
 ROM_END
 
 ROM_START( ssystem4 )
-	ROM_REGION( 0x10000, "maincpu", 0 ) // roms in a cartridge
+	ROM_REGION(0x10000, "maincpu", 0) // roms in a cartridge
 	ROM_LOAD("c45021_ss4-lrom", 0xd000, 0x1000, CRC(fc86a4fc) SHA1(ee292925165d4bf7b948c60a81d95f7a4064e797) ) // 2332
 	ROM_LOAD("c45022_ss4-mrom", 0xe000, 0x1000, CRC(c6110af1) SHA1(4b63454a23b2fe6b5c8f3fa6718eb49770cb6907) ) // "
 	ROM_LOAD("c45023_ss4-hrom", 0xf000, 0x1000, CRC(ab4a4343) SHA1(6eeee7168e13dc1115cb5833f1938a8ea8c01d69) ) // "
@@ -396,8 +567,8 @@
 	// HACK! 6522 ACR register setup
 	ROM_FILL(0xd05b, 1, 0xe0) // was 0xe3
 
-	ROM_REGION( 53552, "screen", 0) // looks same, but different pinout
-	ROM_LOAD( "ssystem4.svg", 0, 53552, CRC(b69b12e3) SHA1(c2e39d015397d403309f1c23619fe8abc3745d87) )
+	ROM_REGION(53552, "screen", 0) // looks same, but different pinout
+	ROM_LOAD("ssystem4.svg", 0, 53552, CRC(b69b12e3) SHA1(c2e39d015397d403309f1c23619fe8abc3745d87) )
 ROM_END
 
 } // anonymous namespace
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/saitek_stratos.cpp mame-0.224+dfsg.1/src/mame/drivers/saitek_stratos.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/saitek_stratos.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/saitek_stratos.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -9,7 +9,6 @@
 - Stratos
 - Turbo King
 - Corona --> saitek_corona.cpp
-- Simultano --> saitek_simultano.cpp
 
 IMPORTANT: The user is expected to press the STOP button to turn off the computer.
 When not using -autosave, press that button before exiting MAME, or NVRAM can get corrupt.
@@ -38,7 +37,6 @@
 
 Stratos/Turbo King are identical.
 Corona has magnet sensors and two HELIOS chips.
-Simultano has an extra LCD screen representing the chessboard state.
 
 There is no official Saitek program versioning for these. The D/D+ versions are known since
 they're the same chess engine as later Saitek modules, such as the Analyst module.
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/saitek_superstar.cpp mame-0.224+dfsg.1/src/mame/drivers/saitek_superstar.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/saitek_superstar.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/saitek_superstar.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -199,8 +199,8 @@
 	M6502(config, m_maincpu, 2000000); // no XTAL
 	m_maincpu->set_addrmap(AS_PROGRAM, &star_state::sstar28k_map);
 
-	const attotime irq_period = attotime::from_hz(2000000 / 0x2000); // 4020 Q13
-	m_maincpu->set_periodic_int(FUNC(star_state::nmi_line_pulse), irq_period);
+	const attotime nmi_period = attotime::from_hz(2000000 / 0x2000); // 4020 Q13
+	m_maincpu->set_periodic_int(FUNC(star_state::nmi_line_pulse), nmi_period);
 
 	SENSORBOARD(config, m_board).set_type(sensorboard_device::BUTTONS);
 	m_board->init_cb().set(m_board, FUNC(sensorboard_device::preset_chess));
@@ -224,8 +224,8 @@
 	R65C02(config.replace(), m_maincpu, 4_MHz_XTAL);
 	m_maincpu->set_addrmap(AS_PROGRAM, &star_state::tstar432_map);
 
-	const attotime irq_period = attotime::from_hz(4_MHz_XTAL / 0x4000); // 4020 Q14
-	m_maincpu->set_periodic_int(FUNC(star_state::nmi_line_pulse), irq_period);
+	const attotime nmi_period = attotime::from_hz(4_MHz_XTAL / 0x4000); // 4020 Q14
+	m_maincpu->set_periodic_int(FUNC(star_state::nmi_line_pulse), nmi_period);
 
 	config.set_default_layout(layout_saitek_tstar432);
 
@@ -242,8 +242,8 @@
 	M6502(config.replace(), m_maincpu, 2_MHz_XTAL);
 	m_maincpu->set_addrmap(AS_PROGRAM, &star_state::tstar432_map);
 
-	const attotime irq_period = attotime::from_hz(2_MHz_XTAL / 0x2000); // 4020 Q13
-	m_maincpu->set_periodic_int(FUNC(star_state::nmi_line_pulse), irq_period);
+	const attotime nmi_period = attotime::from_hz(2_MHz_XTAL / 0x2000); // 4020 Q13
+	m_maincpu->set_periodic_int(FUNC(star_state::nmi_line_pulse), nmi_period);
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/samcoupe.cpp mame-0.224+dfsg.1/src/mame/drivers/samcoupe.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/samcoupe.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/samcoupe.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4,52 +4,511 @@
 
     Miles Gordon Technology SAM Coupe
 
-    Notes:
-    ------
-
-    Beware - the early ROMs are very buggy, and tend to go mad once BASIC
-    starts paging.  ROM 10 (version 1.0) requires the CALL after F9 or BOOT
-    because the ROM loads the bootstrap but fails to execute it. The address
-    depends on the RAM size:
-
-    On a 256K SAM: CALL 229385
-    Or on a 512K (or larger) machine: CALL 491529
-
-
-    Todo:
-    -----
-
-    - Attribute read
-    - Better timing
-    - Harddisk interfaces
+    Note:
+    - Early ROMs are buggy. Version 1.0 requires the command CALL 229385
+      (256k machine) or CALL 491529 (512k machine) to execute the bootstrap.
+
+    TODO:
+    - Better timing, emulate memory contention
+
+    Hardware:
+    - Z80 at 6 MHz
+    - Custom ASIC handling the system and video
+    - SAA1099 sound
+    - XTAL X1: 24 MHz (system clock)
+    - XTAL X2: 4.433619 MHz (RGB encoder)
 
 ***************************************************************************/
 
-/* core includes */
 #include "emu.h"
-#include "includes/samcoupe.h"
-
 #include "cpu/z80/z80.h"
+#include "machine/bankdev.h"
+#include "machine/ram.h"
 #include "sound/saa1099.h"
-
+#include "sound/spkrdev.h"
+#include "imagedev/cassette.h"
+#include "bus/samcoupe/drive/drive.h"
+#include "bus/samcoupe/expansion/expansion.h"
+#include "bus/samcoupe/mouse/mouseport.h"
+#include "formats/tzx_cas.h"
+#include "emupal.h"
 #include "screen.h"
 #include "softlist.h"
 #include "speaker.h"
 
-#include "formats/tzx_cas.h"
-#include "formats/coupedsk.h"
 
-/***************************************************************************
-    CONSTANTS
-***************************************************************************/
+//**************************************************************************
+//  CONSTANTS
+//**************************************************************************
+
+#define SAM_ENABLE_JOYSTICK (0)
+
+#define SAM_BLOCK           8
+
+#define SAM_TOTAL_WIDTH     SAM_BLOCK*96
+#define SAM_TOTAL_HEIGHT    312
+#define SAM_SCREEN_WIDTH    SAM_BLOCK*64
+#define SAM_SCREEN_HEIGHT   192
+#define SAM_BORDER_LEFT     SAM_BLOCK*4
+#define SAM_BORDER_RIGHT    SAM_BLOCK*4
+#define SAM_BORDER_TOP      37
+#define SAM_BORDER_BOTTOM   46
+
+
+//**************************************************************************
+//  TYPE DEFINITIONS
+//**************************************************************************
+
+class samcoupe_state :  public driver_device
+{
+public:
+	samcoupe_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu"),
+		m_mem(*this, "mem"),
+		m_io(*this, "io"),
+		m_ram(*this, RAM_TAG),
+		m_bios(*this, "maincpu"),
+		m_screen(*this, "screen"),
+		m_speaker(*this, "speaker"),
+		m_cassette(*this, "cassette"),
+		m_mouse(*this, "mouseport"),
+		m_keyboard(*this, "kbd_%u", 0U),
+#if SAM_ENABLE_JOYSTICK
+		m_joystick(*this, "joy_%u", 0U)
+#endif
+		m_drive(*this, "drive%u", 1),
+		m_expansion(*this, "exp")
+	{
+	}
 
-#define SAMCOUPE_XTAL_X1  24_MHz_XTAL
-#define SAMCOUPE_XTAL_X2  4.433619_MHz_XTAL
+	void samcoupe(machine_config &config);
 
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	virtual void video_start() override;
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+private:
+	required_device<cpu_device> m_maincpu;
+	required_device<address_map_bank_device> m_mem;
+	required_device<address_map_bank_device> m_io;
+	required_device<ram_device> m_ram;
+	required_memory_region m_bios;
+	required_device<screen_device> m_screen;
+	required_device<speaker_sound_device> m_speaker;
+	required_device<cassette_image_device> m_cassette;
+	required_device<samcoupe_mouse_port_device> m_mouse;
+	required_ioport_array<9> m_keyboard;
+#if SAM_ENABLE_JOYSTICK
+	required_ioport_array<2> m_joystick;
+#endif
+	required_device_array<samcoupe_drive_port_device, 2> m_drive;
+	required_device<samcoupe_expansion_device> m_expansion;
 
-/***************************************************************************
-    TIMERS
-***************************************************************************/
+	enum
+	{
+		TIMER_IRQ_OFF,
+		TIMER_VIDEO_UPDATE
+	};
+
+	enum
+	{
+		INT_LINE    = 0x01,
+		INT_MOUSE   = 0x02,
+		INT_MIDIIN  = 0x04,
+		INT_FRAME   = 0x08,
+		INT_MIDIOUT = 0x10
+	};
+
+	void postload();
+
+	// video
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+	bitmap_ind16 m_bitmap;
+
+	emu_timer *m_video_update_timer;
+
+	uint8_t m_lmpr, m_hmpr, m_vmpr; /* memory pages */
+	uint8_t m_border;           /* border */
+	uint8_t m_clut[16];         /* color lookup table, 16 entries */
+	uint8_t m_line_int;         /* line interrupt */
+	uint8_t m_status;           /* status register */
+
+	/* attribute */
+	uint8_t m_attribute;
+
+	uint8_t *m_videoram;
+
+	uint8_t pen_r(offs_t offset);
+	void clut_w(offs_t offset, uint8_t data);
+	uint8_t status_r(offs_t offset);
+	void line_int_w(uint8_t data);
+	uint8_t lmpr_r();
+	void lmpr_w(uint8_t data);
+	uint8_t hmpr_r();
+	void hmpr_w(uint8_t data);
+	uint8_t vmpr_r();
+	void vmpr_w(uint8_t data);
+	uint8_t midi_r();
+	void midi_w(uint8_t data);
+	uint8_t keyboard_r(offs_t offset);
+	void border_w(uint8_t data);
+	uint8_t attributes_r();
+
+	void samcoupe_palette(palette_device &palette) const;
+	INTERRUPT_GEN_MEMBER(samcoupe_frame_interrupt);
+	TIMER_CALLBACK_MEMBER(irq_off);
+	TIMER_CALLBACK_MEMBER(sam_video_update_callback);
+
+	void draw_mode4_line(int y, int hpos);
+	void draw_mode3_line(int y, int hpos);
+	void draw_mode12_block(bitmap_ind16 &bitmap, int vpos, int hpos, uint8_t mask);
+	void draw_mode2_line(int y, int hpos);
+	void draw_mode1_line(int y, int hpos);
+
+	void samcoupe_irq(uint8_t src);
+
+	// memory
+	uint8_t mem_r(offs_t offset);
+	void mem_w(offs_t offset, uint8_t data);
+	uint8_t io_r(offs_t offset);
+	void io_w(offs_t offset, uint8_t data);
+
+	uint8_t mem_page_r(int page, offs_t offset);
+	void mem_page_w(int page, offs_t offset, uint8_t data);
+
+	uint8_t mem_block_a_r(offs_t offset);
+	void mem_block_a_w(offs_t offset, uint8_t data);
+	uint8_t mem_block_b_r(offs_t offset);
+	void mem_block_b_w(offs_t offset, uint8_t data);
+	uint8_t mem_block_c_r(offs_t offset);
+	void mem_block_c_w(offs_t offset, uint8_t data);
+	uint8_t mem_block_d_r(offs_t offset);
+	void mem_block_d_w(offs_t offset, uint8_t data);
+
+	void mem_map_base(address_map &map);
+	void mem_map(address_map &map);
+	void io_map_base(address_map &map);
+	void io_map(address_map &map);
+
+	int m_pages; // total internal memory pages (16 or 32)
+};
+
+
+//**************************************************************************
+//  ADDRESS MAPS
+//**************************************************************************
+
+void samcoupe_state::mem_map_base(address_map &map)
+{
+	map(0x0000, 0xffff).rw(FUNC(samcoupe_state::mem_r), FUNC(samcoupe_state::mem_w));
+}
+
+void samcoupe_state::mem_map(address_map &map)
+{
+	map(0x0000, 0x3fff).ram().rw(FUNC(samcoupe_state::mem_block_a_r), FUNC(samcoupe_state::mem_block_a_w));
+	map(0x4000, 0x7fff).ram().rw(FUNC(samcoupe_state::mem_block_b_r), FUNC(samcoupe_state::mem_block_b_w));
+	map(0x8000, 0xbfff).ram().rw(FUNC(samcoupe_state::mem_block_c_r), FUNC(samcoupe_state::mem_block_c_w));
+	map(0xc000, 0xffff).ram().rw(FUNC(samcoupe_state::mem_block_d_r), FUNC(samcoupe_state::mem_block_d_w));
+}
+
+void samcoupe_state::io_map_base(address_map &map)
+{
+	map(0x0000, 0xffff).rw(FUNC(samcoupe_state::io_r), FUNC(samcoupe_state::io_w));
+}
+
+void samcoupe_state::io_map(address_map &map)
+{
+	map.unmap_value_high();
+	map(0x00e0, 0x00e7).mirror(0xff00).rw(m_drive[0], FUNC(samcoupe_drive_port_device::read), FUNC(samcoupe_drive_port_device::write));
+	map(0x00e8, 0x00ef).mirror(0xff00).noprw(); // "print" - handled by expansion devices
+	map(0x00f0, 0x00f7).mirror(0xff00).rw(m_drive[1], FUNC(samcoupe_drive_port_device::read), FUNC(samcoupe_drive_port_device::write));
+	map(0x00f8, 0x00f8).select(0xff00).rw(FUNC(samcoupe_state::pen_r), FUNC(samcoupe_state::clut_w));
+	map(0x00f9, 0x00f9).select(0xff00).rw(FUNC(samcoupe_state::status_r), FUNC(samcoupe_state::line_int_w));
+	map(0x00fa, 0x00fa).select(0xff00).rw(FUNC(samcoupe_state::lmpr_r), FUNC(samcoupe_state::lmpr_w));
+	map(0x00fb, 0x00fb).select(0xff00).rw(FUNC(samcoupe_state::hmpr_r), FUNC(samcoupe_state::hmpr_w));
+	map(0x00fc, 0x00fc).select(0xff00).rw(FUNC(samcoupe_state::vmpr_r), FUNC(samcoupe_state::vmpr_w));
+	map(0x00fd, 0x00fd).select(0xff00).rw(FUNC(samcoupe_state::midi_r), FUNC(samcoupe_state::midi_w));
+	map(0x00fe, 0x00fe).select(0xff00).rw(FUNC(samcoupe_state::keyboard_r), FUNC(samcoupe_state::border_w));
+	map(0x00ff, 0x00ff).select(0xff00).r(FUNC(samcoupe_state::attributes_r));
+	map(0x00ff, 0x00ff).mirror(0xfe00).w("saa1099", FUNC(saa1099_device::data_w));
+	map(0x01ff, 0x01ff).mirror(0xfe00).w("saa1099", FUNC(saa1099_device::control_w));
+}
+
+
+//**************************************************************************
+//  INPUT PORT DEFINITIONS
+//**************************************************************************
+
+static INPUT_PORTS_START( samcoupe )
+	PORT_START("kbd_0")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)     PORT_CHAR('z') PORT_CHAR('Z')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)     PORT_CHAR('x') PORT_CHAR('X') PORT_CHAR('?')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)     PORT_CHAR('c') PORT_CHAR('C')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)     PORT_CHAR('v') PORT_CHAR('V')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1_PAD) PORT_CHAR(UCHAR_MAMEKEY(F1))
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2_PAD) PORT_CHAR(UCHAR_MAMEKEY(F2))
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3_PAD) PORT_CHAR(UCHAR_MAMEKEY(F3))
+
+	PORT_START("kbd_1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)     PORT_CHAR('a') PORT_CHAR('A')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)     PORT_CHAR('s') PORT_CHAR('S')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D)     PORT_CHAR('d') PORT_CHAR('D')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)     PORT_CHAR('f') PORT_CHAR('F') PORT_CHAR('{')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G)     PORT_CHAR('g') PORT_CHAR('G') PORT_CHAR('}')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4_PAD) PORT_CHAR(UCHAR_MAMEKEY(F4))
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5_PAD) PORT_CHAR(UCHAR_MAMEKEY(F5))
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6_PAD) PORT_CHAR(UCHAR_MAMEKEY(F6))
+
+	PORT_START("kbd_2")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)     PORT_CHAR('q') PORT_CHAR('Q') PORT_CHAR('<')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)     PORT_CHAR('w') PORT_CHAR('W') PORT_CHAR('>')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E)     PORT_CHAR('e') PORT_CHAR('E')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R)     PORT_CHAR('r') PORT_CHAR('R') PORT_CHAR('[')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T)     PORT_CHAR('t') PORT_CHAR('T') PORT_CHAR(']')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7_PAD) PORT_CHAR(UCHAR_MAMEKEY(F7))
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD) PORT_CHAR(UCHAR_MAMEKEY(F8))
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(F9))
+
+	PORT_START("kbd_3")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)        PORT_CHAR('1') PORT_CHAR('!')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)        PORT_CHAR('2') PORT_CHAR('@')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)        PORT_CHAR('3') PORT_CHAR('#')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)        PORT_CHAR('4') PORT_CHAR('$')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)        PORT_CHAR('5') PORT_CHAR('%')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC)      PORT_CHAR(UCHAR_MAMEKEY(ESC))
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB)      PORT_CHAR('\t')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
+
+	PORT_START("kbd_4")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)         PORT_CHAR('0') PORT_CHAR('~')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)         PORT_CHAR('9') PORT_CHAR(')')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)         PORT_CHAR('8') PORT_CHAR('(')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)         PORT_CHAR('7') PORT_CHAR('\'')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)         PORT_CHAR('6') PORT_CHAR('&')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)     PORT_CHAR('-') PORT_CHAR('/')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS)    PORT_CHAR('+') PORT_CHAR('*')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("DELETE") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
+
+	PORT_START("kbd_5")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P)          PORT_CHAR('p') PORT_CHAR('P')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O)          PORT_CHAR('o') PORT_CHAR('O')
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I)          PORT_CHAR('i') PORT_CHAR('I')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U)          PORT_CHAR('u') PORT_CHAR('U')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)          PORT_CHAR('y') PORT_CHAR('Y')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR('=') PORT_CHAR('_')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('"') PORT_CHAR(0xA9)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F0") PORT_CODE(KEYCODE_0_PAD) PORT_CHAR(UCHAR_MAMEKEY(F10))
+
+	PORT_START("kbd_6")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L)     PORT_CHAR('l') PORT_CHAR('L') PORT_CHAR(0xA3)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K)     PORT_CHAR('k') PORT_CHAR('K')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J)     PORT_CHAR('j') PORT_CHAR('J')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H)     PORT_CHAR('h') PORT_CHAR('H') PORT_CHAR('^')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("EDIT") PORT_CODE(KEYCODE_RALT) PORT_CHAR(UCHAR_MAMEKEY(INSERT))
+
+	PORT_START("kbd_7")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("SYMBOL") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)     PORT_CHAR('m') PORT_CHAR('M')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)     PORT_CHAR('n') PORT_CHAR('N')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)     PORT_CHAR('b') PORT_CHAR('B')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)  PORT_CHAR('.')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("INV") PORT_CODE(KEYCODE_SLASH) PORT_CHAR(UCHAR_MAMEKEY(HOME)) PORT_CHAR('\\')
+
+	PORT_START("kbd_8")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("CTRL") PORT_CODE(KEYCODE_LALT) PORT_CHAR(UCHAR_MAMEKEY(LALT))
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP)     PORT_CHAR(UCHAR_MAMEKEY(UP))
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN)   PORT_CHAR(UCHAR_MAMEKEY(DOWN))
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT)   PORT_CHAR(UCHAR_MAMEKEY(LEFT))
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT)  PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
+
+#if SAM_ENABLE_JOYSTICK
+	/* Sam Coupe has single 9-pin ATARI-compatible connector but supports 2 joysticks via a splitter,
+	   this works by using a different ground for each stick (pin 8: stick 1 gnd, pin 9: stick 2 gnd.)
+	   Joysticks overlay number keys 6-0 for the stick 1 and 1-5 for stick 2 (same scheme as ZX Spectrum) */
+
+	PORT_START("joy_0")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1)        PORT_PLAYER(1)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)    PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN)  PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT)  PORT_8WAY PORT_PLAYER(1)
+
+	PORT_START("joy_1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT)  PORT_8WAY PORT_PLAYER(2)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_8WAY PORT_PLAYER(2)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN)  PORT_8WAY PORT_PLAYER(2)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)    PORT_8WAY PORT_PLAYER(2)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON1)        PORT_PLAYER(2)
+#endif
+INPUT_PORTS_END
+
+
+//**************************************************************************
+//  VIDEO EMULATION
+//**************************************************************************
+
+void samcoupe_state::samcoupe_palette(palette_device &palette) const
+{
+	for (int i = 0; i < 128; i++)
+	{
+		uint8_t const b = bitswap<3>(i, 4, 0, 3); //  blue: bits 403
+		uint8_t const r = bitswap<3>(i, 5, 1, 3); //   red: bits 513
+		uint8_t const g = bitswap<3>(i, 6, 2, 3); // green: bits 623
+
+		palette.set_pen_color(i, pal3bit(r), pal3bit(g), pal3bit(b));
+	}
+}
+
+void samcoupe_state::video_start()
+{
+	m_screen->register_screen_bitmap(m_bitmap);
+}
+
+uint32_t samcoupe_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	copybitmap(bitmap, m_bitmap, 0, 0, 0, 0, cliprect);
+	return 0;
+}
+
+void samcoupe_state::draw_mode4_line(int y, int hpos)
+{
+	/* get start address */
+	uint8_t *vram = m_videoram + ((y - SAM_BORDER_TOP) * 128) + ((hpos - SAM_BORDER_LEFT) / 4);
+
+	for (int i = 0; i < (SAM_BLOCK*2)/4; i++)
+	{
+		/* draw 2 pixels (doublewidth) */
+		m_bitmap.pix16(y, hpos + i * 4 + 0) = m_clut[(*vram >> 4) & 0x0f];
+		m_bitmap.pix16(y, hpos + i * 4 + 1) = m_clut[(*vram >> 4) & 0x0f];
+		m_bitmap.pix16(y, hpos + i * 4 + 2) = m_clut[(*vram >> 0) & 0x0f];
+		m_bitmap.pix16(y, hpos + i * 4 + 3) = m_clut[(*vram >> 0) & 0x0f];
+
+		/* move to next address */
+		vram++;
+
+		/* attribute register contains the third displayed byte */
+		if (i == 2)
+			m_attribute = *vram;
+	}
+}
+
+void samcoupe_state::draw_mode3_line(int y, int hpos)
+{
+	/* get start address */
+	uint8_t *vram = m_videoram + ((y - SAM_BORDER_TOP) * 128) + ((hpos - SAM_BORDER_LEFT) / 4);
+
+	for (int i = 0; i < (SAM_BLOCK*2)/4; i++)
+	{
+		/* draw 4 pixels */
+		m_bitmap.pix16(y, hpos + i * 4 + 0) = m_clut[(*vram >> 6) & 0x03];
+		m_bitmap.pix16(y, hpos + i * 4 + 1) = m_clut[(*vram >> 4) & 0x03];
+		m_bitmap.pix16(y, hpos + i * 4 + 2) = m_clut[(*vram >> 2) & 0x03];
+		m_bitmap.pix16(y, hpos + i * 4 + 3) = m_clut[(*vram >> 0) & 0x03];
+
+		/* move to next address */
+		vram++;
+
+		/* attribute register contains the third displayed byte */
+		if (i == 2)
+			m_attribute = *vram;
+	}
+}
+
+void samcoupe_state::draw_mode12_block(bitmap_ind16 &bitmap, int vpos, int hpos, uint8_t mask)
+{
+	/* extract colors from attribute */
+	uint8_t ink = m_clut[((m_attribute >> 3) & 0x08) | (m_attribute & 0x07)];
+	uint8_t pap = m_clut[(m_attribute >> 3) & 0x0f];
+
+	/* draw block of 8 pixels (doubled to 16) */
+	for (int i = 0; i < SAM_BLOCK; i++)
+	{
+		bitmap.pix16(vpos, hpos + i*2 + 0) = BIT(mask, 7 - i) ? ink : pap;
+		bitmap.pix16(vpos, hpos + i*2 + 1) = BIT(mask, 7 - i) ? ink : pap;
+	}
+}
+
+void samcoupe_state::draw_mode2_line(int y, int hpos)
+{
+	int cell = (y - SAM_BORDER_TOP) * 32 + (hpos - SAM_BORDER_LEFT) / SAM_BLOCK / 2;
+
+	uint8_t mask = m_videoram[cell];
+	m_attribute = m_videoram[cell + 0x2000];
+
+	draw_mode12_block(m_bitmap, y, hpos, mask);
+}
+
+void samcoupe_state::draw_mode1_line(int y, int hpos)
+{
+	uint8_t mask = m_videoram[((((y - SAM_BORDER_TOP) & 0xc0) << 5) | (((y - SAM_BORDER_TOP) & 0x07) << 8) | (((y - SAM_BORDER_TOP) & 0x38) << 2)) + (hpos - SAM_BORDER_LEFT) / SAM_BLOCK / 2];
+	m_attribute = m_videoram[32*192 + (((y - SAM_BORDER_TOP) & 0xf8) << 2) + (hpos - SAM_BORDER_LEFT) / SAM_BLOCK / 2];
+
+	draw_mode12_block(m_bitmap, y, hpos, mask);
+}
+
+TIMER_CALLBACK_MEMBER(samcoupe_state::sam_video_update_callback)
+{
+	int vpos = m_screen->vpos();
+	int hpos = m_screen->hpos();
+
+	int next_vpos = vpos;
+	int next_hpos = hpos + SAM_BLOCK*2;
+
+	/* next scanline? */
+	if (next_hpos >= SAM_BORDER_LEFT + SAM_SCREEN_WIDTH + SAM_BORDER_RIGHT)
+	{
+		next_vpos = (vpos + 1) % (SAM_BORDER_TOP + SAM_SCREEN_HEIGHT + SAM_BORDER_BOTTOM);
+		next_hpos = 0;
+	}
+
+	/* display disabled? (only in mode 3 or 4) */
+	if (BIT(m_vmpr, 6) && BIT(m_border, 7))
+	{
+		m_bitmap.plot_box(hpos, vpos, SAM_BLOCK*2, 1, 0);
+	}
+	else
+	{
+		/* border area? */
+		if (vpos < SAM_BORDER_TOP || vpos >= SAM_BORDER_TOP + SAM_SCREEN_HEIGHT || hpos < SAM_BORDER_LEFT || hpos >= SAM_BORDER_LEFT + SAM_SCREEN_WIDTH)
+		{
+			m_attribute = 0xff;
+			m_bitmap.plot_box(hpos, vpos, SAM_BLOCK*2, 1, m_clut[(m_border & 0x20) >> 2 | (m_border & 0x07)]);
+		}
+		else
+		{
+			/* main screen area */
+			switch ((m_vmpr & 0x60) >> 5)
+			{
+			case 0: draw_mode1_line(vpos, hpos); break;
+			case 1: draw_mode2_line(vpos, hpos); break;
+			case 2: draw_mode3_line(vpos, hpos); break;
+			case 3: draw_mode4_line(vpos, hpos); break;
+			}
+		}
+	}
+
+	/* do we need to trigger the scanline interrupt (interrupt happens at the start of the right border before the specified line)? */
+	if (m_line_int < SAM_SCREEN_HEIGHT && hpos == SAM_BORDER_LEFT + SAM_SCREEN_WIDTH && vpos == (m_line_int + SAM_BORDER_TOP - 1))
+		samcoupe_irq(INT_LINE);
+
+	/* schedule next update */
+	m_video_update_timer->adjust(m_screen->time_until_pos(next_vpos, next_hpos));
+}
+
+
+//**************************************************************************
+//  MACHINE EMULATION
+//**************************************************************************
 
 void samcoupe_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
 {
@@ -58,9 +517,6 @@
 	case TIMER_IRQ_OFF:
 		irq_off(ptr, param);
 		break;
-	case TIMER_MOUSE_RESET:
-		samcoupe_mouse_reset(ptr, param);
-		break;
 	case TIMER_VIDEO_UPDATE:
 		sam_video_update_callback(ptr, param);
 		break;
@@ -69,47 +525,87 @@
 	}
 }
 
-/***************************************************************************
-    I/O PORTS
-***************************************************************************/
+TIMER_CALLBACK_MEMBER(samcoupe_state::irq_off)
+{
+	/* adjust STATUS register */
+	m_status |= param;
 
-uint8_t samcoupe_state::samcoupe_disk_r(offs_t offset)
+	/* clear interrupt */
+	if ((m_status & 0x1f) == 0x1f)
+		m_maincpu->set_input_line(0, CLEAR_LINE);
+}
+
+void samcoupe_state::samcoupe_irq(uint8_t src)
 {
-	/* drive and side is encoded into bit 5 and 3 */
-	floppy_connector *con = (BIT(offset, 4) ? m_wd1772_1 : m_wd1772_0);
-	floppy_image_device *floppy = con ? con->get_device() : nullptr;
+	/* assert irq and a timer to set it off again */
+	m_maincpu->set_input_line(0, ASSERT_LINE);
+	timer_set(attotime::from_usec(20), TIMER_IRQ_OFF, src);
 
-	if(floppy)
-		floppy->ss_w(BIT(offset, 2));
-	m_fdc->set_floppy(floppy);
+	/* adjust STATUS register */
+	m_status &= ~src;
+}
 
-	/* bit 1 and 2 select the controller register */
-	return m_fdc->read(offset & 0x03);
+INTERRUPT_GEN_MEMBER(samcoupe_state::samcoupe_frame_interrupt)
+{
+	/* signal frame interrupt */
+	samcoupe_irq(INT_FRAME);
 }
 
-void samcoupe_state::samcoupe_disk_w(offs_t offset, uint8_t data)
+void samcoupe_state::postload()
 {
-	/* drive and side is encoded into bit 5 and 3 */
-	floppy_connector *con = (BIT(offset, 4) ? m_wd1772_1 : m_wd1772_0);
-	floppy_image_device *floppy = con ? con->get_device() : nullptr;
+	// restore videoram pointer
+	vmpr_w(m_vmpr);
+}
 
-	if(floppy)
-		floppy->ss_w(BIT(offset, 2));
-	m_fdc->set_floppy(floppy);
+void samcoupe_state::machine_start()
+{
+	// make sure the ram device is already running
+	if (!m_ram->started())
+		throw device_missing_dependencies();
+
+	m_pages = m_ram->size() / 0x4000; // 16 or 32
+
+	/* schedule our video updates */
+	m_video_update_timer = timer_alloc(TIMER_VIDEO_UPDATE);
+	m_video_update_timer->adjust(m_screen->time_until_pos(0, 0));
+
+	// register for save states
+	save_item(NAME(m_lmpr));
+	save_item(NAME(m_hmpr));
+	save_item(NAME(m_vmpr));
+	save_item(NAME(m_border));
+	save_item(NAME(m_clut), 16);
+	save_item(NAME(m_line_int));
+	save_item(NAME(m_status));
+	save_item(NAME(m_attribute));
 
-	/* bit 1 and 2 select the controller register */
-	return m_fdc->write(offset & 0x03, data);
+	machine().save().register_postload(save_prepost_delegate(FUNC(samcoupe_state::postload), this));
 }
 
-uint8_t samcoupe_state::samcoupe_pen_r(offs_t offset)
+void samcoupe_state::machine_reset()
+{
+	m_lmpr = 0x0f;      // ROM0 paged in, ROM1 paged out, RAM Banks
+	m_hmpr = 0x01;
+	vmpr_w(0x81);
+	m_line_int = 0xff;  // line interrupts disabled
+	m_status = 0x1f;    // no interrupts active
+}
+
+
+//**************************************************************************
+//  ASIC
+//**************************************************************************
+
+uint8_t samcoupe_state::pen_r(offs_t offset)
 {
 	uint8_t data;
 
 	if (offset & 0x100)
 	{
+		// HPEN
 		int vpos = m_screen->vpos();
 
-		/* return the current screen line or 192 for the border area */
+		// return the current screen line or 192 for the border area
 		if (vpos < SAM_BORDER_TOP || vpos >= SAM_BORDER_TOP + SAM_SCREEN_HEIGHT)
 			data = 192;
 		else
@@ -117,445 +613,325 @@
 	}
 	else
 	{
-		/* horizontal position is encoded into bits 3 to 8 */
-		data = m_screen->hpos() & 0xfc;
+		// LPEN
+
+		// 765432--  screen horizontal position
+		// ------1-  midi status (currently transferring)
+		// -------0  border clut bit 0
+
+		data = (m_screen->hpos() & 0xfc) | (0 << 1) | (m_border & 1);
 	}
 
 	return data;
 }
 
-void samcoupe_state::samcoupe_clut_w(offs_t offset, uint8_t data)
+void samcoupe_state::clut_w(offs_t offset, uint8_t data)
 {
 	m_clut[(offset >> 8) & 0x0f] = data & 0x7f;
 }
 
-uint8_t samcoupe_state::samcoupe_status_r(offs_t offset)
+uint8_t samcoupe_state::status_r(offs_t offset)
 {
+	// 765-----  keyboard matrix k8 to k6
+	// ---4----  midi out interrupt
+	// ----3---  frame interrupt
+	// -----2--  midi in interrupt
+	// ------1-  mouse interrupt
+	// -------0  line interrupt
+
 	uint8_t data = 0xe0;
 
-	/* bit 5-7, keyboard input */
-	if (!BIT(offset,  8)) data &= m_keyboard_row_fe->read() & 0xe0;
-	if (!BIT(offset,  9)) data &= m_keyboard_row_fd->read() & 0xe0;
-	if (!BIT(offset, 10)) data &= m_keyboard_row_fb->read() & 0xe0;
-	if (!BIT(offset, 11)) data &= m_keyboard_row_f7->read() & 0xe0;
-	if (!BIT(offset, 12)) data &= m_keyboard_row_ef->read() & 0xe0;
-	if (!BIT(offset, 13)) data &= m_keyboard_row_df->read() & 0xe0;
-	if (!BIT(offset, 14)) data &= m_keyboard_row_bf->read() & 0xe0;
-	if (!BIT(offset, 15)) data &= m_keyboard_row_7f->read() & 0xe0;
+	for (int i = 0; i < 8; i++)
+		if (BIT(offset, i + 8) == 0)
+			data &= m_keyboard[i]->read() & 0xe0;
 
-	/* bit 0-4, interrupt source */
 	data |= m_status;
 
 	return data;
 }
 
-void samcoupe_state::samcoupe_line_int_w(uint8_t data)
+void samcoupe_state::line_int_w(uint8_t data)
 {
 	m_line_int = data;
 }
 
-uint8_t samcoupe_state::samcoupe_lmpr_r()
+uint8_t samcoupe_state::lmpr_r()
 {
 	return m_lmpr;
 }
 
-void samcoupe_state::samcoupe_lmpr_w(uint8_t data)
+void samcoupe_state::lmpr_w(uint8_t data)
 {
-	address_space &space_program = m_maincpu->space(AS_PROGRAM);
-
 	m_lmpr = data;
-	samcoupe_update_memory(space_program);
 }
 
-uint8_t samcoupe_state::samcoupe_hmpr_r()
+uint8_t samcoupe_state::hmpr_r()
 {
 	return m_hmpr;
 }
 
-void samcoupe_state::samcoupe_hmpr_w(uint8_t data)
+void samcoupe_state::hmpr_w(uint8_t data)
 {
-	address_space &space_program = m_maincpu->space(AS_PROGRAM);
-
 	m_hmpr = data;
-	samcoupe_update_memory(space_program);
 }
 
-uint8_t samcoupe_state::samcoupe_vmpr_r()
+uint8_t samcoupe_state::vmpr_r()
 {
 	return m_vmpr;
 }
 
-void samcoupe_state::samcoupe_vmpr_w(uint8_t data)
+void samcoupe_state::vmpr_w(uint8_t data)
 {
-	address_space &space_program = m_maincpu->space(AS_PROGRAM);
-
 	m_vmpr = data;
-	samcoupe_update_memory(space_program);
+
+	if (BIT(m_vmpr, 6))   /* if bit set in 2 bank screen mode */
+		m_videoram = &m_ram->pointer()[(m_vmpr & 0x1e) << 14];
+	else
+		m_videoram = &m_ram->pointer()[(m_vmpr & 0x1f) << 14];
 }
 
-uint8_t samcoupe_state::samcoupe_midi_r()
+uint8_t samcoupe_state::midi_r()
 {
-	logerror("%s: read from midi port\n", machine().describe_context());
+	logerror("Read from MIDI port\n");
 	return 0xff;
 }
 
-void samcoupe_state::samcoupe_midi_w(uint8_t data)
+void samcoupe_state::midi_w(uint8_t data)
 {
-	logerror("%s: write to midi port: 0x%02x\n", machine().describe_context(), data);
+	logerror("Write to MIDI port: 0x%02x\n", data);
 }
 
-uint8_t samcoupe_state::samcoupe_keyboard_r(offs_t offset)
+uint8_t samcoupe_state::keyboard_r(offs_t offset)
 {
+	// 7-------  status bit external memory
+	// -6------  cassette input
+	// --5-----  light pen input
+	// ---43210  keyboard matrix k5 to k1, mouse
+
 	uint8_t data = 0x1f;
 
-	/* bit 0-4, keyboard input */
-	if (!BIT(offset,  8)) data &= m_keyboard_row_fe->read() & 0x1f;
-	if (!BIT(offset,  9)) data &= m_keyboard_row_fd->read() & 0x1f;
-	if (!BIT(offset, 10)) data &= m_keyboard_row_fb->read() & 0x1f;
-	if (!BIT(offset, 11)) data &= m_keyboard_row_f7->read() & 0x1f;
-	if (!BIT(offset, 12)) data &= m_keyboard_row_ef->read() & 0x1f;
-	if (!BIT(offset, 13)) data &= m_keyboard_row_df->read() & 0x1f;
-	if (!BIT(offset, 14)) data &= m_keyboard_row_bf->read() & 0x1f;
-	if (!BIT(offset, 15)) data &= m_keyboard_row_7f->read() & 0x1f;
+	for (int i = 0; i < 8; i++)
+		if (BIT(offset, i + 8) == 0)
+			data &= m_keyboard[i]->read() & 0x1f;
+
+#if SAM_ENABLE_JOYSTICK
+	if (BIT(offset, 12) == 0) data &= m_joystick[0]->read() & 0x1f;
+	if (BIT(offset, 11) == 0) data &= m_joystick[1]->read() & 0x1f;
+#endif
 
 	if (offset == 0xff00)
 	{
-		data &= m_keyboard_row_ff->read() & 0x1f;
-
-		/* if no key has been pressed, return the mouse state */
-		if (data == 0x1f)
-			data = samcoupe_mouse_r();
+		data &= m_keyboard[8]->read() & 0x1f;
+		data &= m_mouse->read() & 0x1f;
 	}
 
-	/* bit 5, lightpen strobe */
 	data |= 1 << 5;
-
-	/* bit 6, cassette input */
 	data |= (m_cassette->input() > 0 ? 1 : 0) << 6;
-
-	/* bit 7, external memory */
 	data |= 1 << 7;
 
-	/* joysticks */
-	if (!BIT(offset, 12)) data &= m_joy1->read() | (0xff ^ 0x1f);
-	if (!BIT(offset, 11)) data &= m_joy2->read() | (0xff ^ 0x1f);
-
 	return data;
 }
 
-void samcoupe_state::samcoupe_border_w(uint8_t data)
+void samcoupe_state::border_w(uint8_t data)
 {
-	m_border = data;
+	// 7-------  screen off in mode 3/4
+	// -6------  midi through
+	// --5--210  clut address for border color
+	// ---4----  beeper
+	// ----3---  cassette output
 
-	/* bit 3, cassette output */
-	m_cassette->output( BIT(data, 3) ? -1.0 : +1.0);
+	m_border = data;
 
-	/* bit 4, beep */
+	m_cassette->output(BIT(data, 3) ? -1.0 : +1.0);
 	m_speaker->level_w(BIT(data, 4));
 }
 
-uint8_t samcoupe_state::samcoupe_attributes_r()
+uint8_t samcoupe_state::attributes_r()
 {
 	return m_attribute;
 }
 
-WRITE_LINE_MEMBER(samcoupe_state::write_lpt1_busy)
-{
-	m_lpt1_busy = state;
-}
 
-uint8_t samcoupe_state::samcoupe_lpt1_busy_r()
-{
-	return m_lpt1_busy;
-}
-
-void samcoupe_state::samcoupe_lpt1_strobe_w(uint8_t data)
-{
-	m_lpt1->write_strobe(data & 1);
-}
-
-DECLARE_WRITE_LINE_MEMBER(samcoupe_state::write_lpt2_busy)
-{
-	m_lpt2_busy = state;
-}
-
-uint8_t samcoupe_state::samcoupe_lpt2_busy_r()
-{
-	return m_lpt2_busy;
-}
-
-void samcoupe_state::samcoupe_lpt2_strobe_w(uint8_t data)
-{
-	m_lpt2->write_strobe(data & 1);
-}
+//**************************************************************************
+//  MEMORY
+//**************************************************************************
 
-/***************************************************************************
-    ADDRESS MAPS
-***************************************************************************/
+//-------------------------------------------------
+//  mem_r/w - program space accesses
+//-------------------------------------------------
 
-void samcoupe_state::samcoupe_mem(address_map &map)
+uint8_t samcoupe_state::mem_r(offs_t offset)
 {
-	map(0x0000, 0x3fff).ram().rw(FUNC(samcoupe_state::sam_bank1_r), FUNC(samcoupe_state::sam_bank1_w)); // .bankrw("bank1");
-	map(0x4000, 0x7fff).ram().rw(FUNC(samcoupe_state::sam_bank2_r), FUNC(samcoupe_state::sam_bank2_w)); // .bankrw("bank2");
-	map(0x8000, 0xbfff).ram().rw(FUNC(samcoupe_state::sam_bank3_r), FUNC(samcoupe_state::sam_bank3_w)); // .bankrw("bank3");
-	map(0xc000, 0xffff).ram().rw(FUNC(samcoupe_state::sam_bank4_r), FUNC(samcoupe_state::sam_bank4_w)); // .bankrw("bank4");
-}
-
-void samcoupe_state::samcoupe_io(address_map &map)
-{
-	map(0x0080, 0x0081).select(0xff00).w(FUNC(samcoupe_state::samcoupe_ext_mem_w));
-	map(0x00e0, 0x00e7).select(0xff10).rw(FUNC(samcoupe_state::samcoupe_disk_r), FUNC(samcoupe_state::samcoupe_disk_w));
-	map(0x00e8, 0x00e8).select(0xff00).w("lpt1_data_out", FUNC(output_latch_device::write));
-	map(0x00e9, 0x00e9).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_lpt1_busy_r), FUNC(samcoupe_state::samcoupe_lpt1_strobe_w));
-	map(0x00ea, 0x00ea).select(0xff00).w("lpt2_data_out", FUNC(output_latch_device::write));
-	map(0x00eb, 0x00eb).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_lpt2_busy_r), FUNC(samcoupe_state::samcoupe_lpt2_strobe_w));
-	map(0x00f8, 0x00f8).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_pen_r), FUNC(samcoupe_state::samcoupe_clut_w));
-	map(0x00f9, 0x00f9).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_status_r), FUNC(samcoupe_state::samcoupe_line_int_w));
-	map(0x00fa, 0x00fa).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_lmpr_r), FUNC(samcoupe_state::samcoupe_lmpr_w));
-	map(0x00fb, 0x00fb).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_hmpr_r), FUNC(samcoupe_state::samcoupe_hmpr_w));
-	map(0x00fc, 0x00fc).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_vmpr_r), FUNC(samcoupe_state::samcoupe_vmpr_w));
-	map(0x00fd, 0x00fd).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_midi_r), FUNC(samcoupe_state::samcoupe_midi_w));
-	map(0x00fe, 0x00fe).select(0xff00).rw(FUNC(samcoupe_state::samcoupe_keyboard_r), FUNC(samcoupe_state::samcoupe_border_w));
-	map(0x00ff, 0x00ff).select(0xff00).r(FUNC(samcoupe_state::samcoupe_attributes_r));
-	map(0x00ff, 0x00ff).select(0xfe00).w("saa1099", FUNC(saa1099_device::data_w));
-	map(0x01ff, 0x01ff).select(0xfe00).w("saa1099", FUNC(saa1099_device::control_w));
-}
+	uint8_t data = 0xff;
 
+	int xmem = BIT(m_hmpr, 7) && BIT(offset, 15) ? 1 : 0;
 
-/***************************************************************************
-    INTERRUPTS
-***************************************************************************/
-
-TIMER_CALLBACK_MEMBER(samcoupe_state::irq_off)
-{
-	/* adjust STATUS register */
-	m_status |= param;
+	m_expansion->xmem_w(xmem);
 
-	/* clear interrupt */
-	if ((m_status & 0x1f) == 0x1f)
-		m_maincpu->set_input_line(0, CLEAR_LINE);
+	data &= m_expansion->mreq_r(offset);
 
-}
+	if (xmem == 0)
+		data &= m_mem->read8(offset);
 
-void samcoupe_state::samcoupe_irq(uint8_t src)
-{
-	/* assert irq and a timer to set it off again */
-	m_maincpu->set_input_line(0, ASSERT_LINE);
-	timer_set(attotime::from_usec(20), TIMER_IRQ_OFF, src);
-
-	/* adjust STATUS register */
-	m_status &= ~src;
+	return data;
 }
 
-INTERRUPT_GEN_MEMBER(samcoupe_state::samcoupe_frame_interrupt)
+void samcoupe_state::mem_w(offs_t offset, uint8_t data)
 {
-	/* signal frame interrupt */
-	samcoupe_irq(SAM_FRAME_INT);
-}
+	int xmem = BIT(m_hmpr, 7) && BIT(offset, 15) ? 1 : 0;
 
+	m_expansion->xmem_w(xmem);
 
-/***************************************************************************
-    INPUT PORTS
-***************************************************************************/
+	m_expansion->mreq_w(offset, data);
 
-static INPUT_PORTS_START( samcoupe )
-	PORT_START("keyboard_row_fe")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z)     PORT_CHAR('z') PORT_CHAR('Z')
-	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X)     PORT_CHAR('x') PORT_CHAR('X') PORT_CHAR('?')
-	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C)     PORT_CHAR('c') PORT_CHAR('C')
-	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V)     PORT_CHAR('v') PORT_CHAR('V')
-	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1_PAD) PORT_CHAR(UCHAR_MAMEKEY(F1))
-	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2_PAD) PORT_CHAR(UCHAR_MAMEKEY(F2))
-	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3_PAD) PORT_CHAR(UCHAR_MAMEKEY(F3))
+	if (xmem == 0)
+		m_mem->write8(offset, data);
+}
 
-	PORT_START("keyboard_row_fd")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A)     PORT_CHAR('a') PORT_CHAR('A')
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S)     PORT_CHAR('s') PORT_CHAR('S')
-	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D)     PORT_CHAR('d') PORT_CHAR('D')
-	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F)     PORT_CHAR('f') PORT_CHAR('F') PORT_CHAR('{')
-	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G)     PORT_CHAR('g') PORT_CHAR('G') PORT_CHAR('}')
-	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4_PAD) PORT_CHAR(UCHAR_MAMEKEY(F4))
-	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5_PAD) PORT_CHAR(UCHAR_MAMEKEY(F5))
-	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6_PAD) PORT_CHAR(UCHAR_MAMEKEY(F6))
+//-------------------------------------------------
+//  io_r/w - i/o space accesses
+//-------------------------------------------------
 
-	PORT_START("keyboard_row_fb")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q)     PORT_CHAR('q') PORT_CHAR('Q') PORT_CHAR('<')
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W)     PORT_CHAR('w') PORT_CHAR('W') PORT_CHAR('>')
-	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E)     PORT_CHAR('e') PORT_CHAR('E')
-	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R)     PORT_CHAR('r') PORT_CHAR('R') PORT_CHAR('[')
-	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T)     PORT_CHAR('t') PORT_CHAR('T') PORT_CHAR(']')
-	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7_PAD) PORT_CHAR(UCHAR_MAMEKEY(F7))
-	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8_PAD) PORT_CHAR(UCHAR_MAMEKEY(F8))
-	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9_PAD) PORT_CHAR(UCHAR_MAMEKEY(F9))
+uint8_t samcoupe_state::io_r(offs_t offset)
+{
+	uint8_t data = 0xff;
 
-	PORT_START("keyboard_row_f7")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1)        PORT_CHAR('1') PORT_CHAR('!')
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2)        PORT_CHAR('2') PORT_CHAR('@')
-	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3)        PORT_CHAR('3') PORT_CHAR('#')
-	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4)        PORT_CHAR('4') PORT_CHAR('$')
-	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5)        PORT_CHAR('5') PORT_CHAR('%')
-	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE)    PORT_CHAR(UCHAR_MAMEKEY(ESC))
-	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB)      PORT_CHAR('\t')
-	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CAPSLOCK) PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))
+	m_expansion->print_w((offset & 0xf8) == 0xe8); // 0xe8 to 0xef
 
-	PORT_START("keyboard_row_ef")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0)         PORT_CHAR('0') PORT_CHAR('~')
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9)         PORT_CHAR('9') PORT_CHAR(')')
-	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8)         PORT_CHAR('8') PORT_CHAR('(')
-	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7)         PORT_CHAR('7') PORT_CHAR('\'')
-	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6)         PORT_CHAR('6') PORT_CHAR('&')
-	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)     PORT_CHAR('-') PORT_CHAR('/')
-	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS)    PORT_CHAR('+') PORT_CHAR('*')
-	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("DELETE") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
+	data &= m_expansion->iorq_r(offset);
+	data &= m_io->read8(offset);
 
-	PORT_START("keyboard_row_df")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P)          PORT_CHAR('p') PORT_CHAR('P')
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O)          PORT_CHAR('o') PORT_CHAR('O')
-	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I)          PORT_CHAR('i') PORT_CHAR('I')
-	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U)          PORT_CHAR('u') PORT_CHAR('U')
-	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y)          PORT_CHAR('y') PORT_CHAR('Y')
-	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR('=') PORT_CHAR('_')
-	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('"') PORT_CHAR(0xA9)
-	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F0") PORT_CODE(KEYCODE_0_PAD) PORT_CHAR(UCHAR_MAMEKEY(F10))
+	return data;
+}
 
-	PORT_START("keyboard_row_bf")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L)     PORT_CHAR('l') PORT_CHAR('L') PORT_CHAR(0xA3)
-	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K)     PORT_CHAR('k') PORT_CHAR('K')
-	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J)     PORT_CHAR('j') PORT_CHAR('J')
-	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H)     PORT_CHAR('h') PORT_CHAR('H') PORT_CHAR('^')
-	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON) PORT_CHAR(';')
-	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':')
-	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("EDIT") PORT_CODE(KEYCODE_RALT) PORT_CHAR(UCHAR_MAMEKEY(INSERT))
+void samcoupe_state::io_w(offs_t offset, uint8_t data)
+{
+	m_expansion->print_w((offset & 0xf8) == 0xe8);
 
-	PORT_START("keyboard_row_7f")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("SYMBOL") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
-	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M)     PORT_CHAR('m') PORT_CHAR('M')
-	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N)     PORT_CHAR('n') PORT_CHAR('N')
-	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B)     PORT_CHAR('b') PORT_CHAR('B')
-	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',')
-	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP)  PORT_CHAR('.')
-	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("INV") PORT_CODE(KEYCODE_SLASH) PORT_CHAR(UCHAR_MAMEKEY(HOME)) PORT_CHAR('\\')
+	m_expansion->iorq_w(offset, data);
+	m_io->write8(offset, data);
+}
 
-	PORT_START("keyboard_row_ff")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("CTRL") PORT_CODE(KEYCODE_LALT) PORT_CHAR(UCHAR_MAMEKEY(LALT))
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP)     PORT_CHAR(UCHAR_MAMEKEY(UP))
-	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN)   PORT_CHAR(UCHAR_MAMEKEY(DOWN))
-	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT)   PORT_CHAR(UCHAR_MAMEKEY(LEFT))
-	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT)  PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
+//-------------------------------------------------
+//  mem_page_r/w - read/write memory pages
+//-------------------------------------------------
 
-	PORT_START("mouse_buttons")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1) PORT_CODE(MOUSECODE_BUTTON1) PORT_NAME("Mouse Button 1")
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_BUTTON3) PORT_CODE(MOUSECODE_BUTTON3) PORT_NAME("Mouse Button 3")
-	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_BUTTON2) PORT_CODE(MOUSECODE_BUTTON2) PORT_NAME("Mouse Button 2")
-	PORT_BIT(0xf8, IP_ACTIVE_LOW, IPT_UNUSED)
-
-	PORT_START("mouse_x")
-	PORT_BIT(0xfff, 0x000, IPT_MOUSE_X) PORT_SENSITIVITY(50) PORT_KEYDELTA(0) PORT_REVERSE
-
-	PORT_START("mouse_y")
-	PORT_BIT(0xfff, 0x000, IPT_MOUSE_Y) PORT_SENSITIVITY(50) PORT_KEYDELTA(0)
-
-	PORT_START("config")
-	PORT_CONFNAME(0x01, 0x00, "Real Time Clock")
-	PORT_CONFSETTING(   0x00, DEF_STR(None))
-	PORT_CONFSETTING(   0x01, "SAMBUS")
+uint8_t samcoupe_state::mem_page_r(int page, offs_t offset)
+{
+	if (page < m_pages)
+		return m_ram->pointer()[(page << 14) | offset];
+	else
+		return 0xff;
+}
 
-	/* Sam Coupe has single 9-pin ATARI-compatible connector but supports 2 joysticks via a splitter,
-	   this works by using a different ground for each stick (pin 8: stick 1 gnd, pin 9: stick 2 gnd.)
-	   Joysticks overlay number keys 6-0 for the stick 1 and 1-5 for stick 2 (same scheme as ZX Spectrum) */
+void samcoupe_state::mem_page_w(int page, offs_t offset, uint8_t data)
+{
+	if (page < m_pages)
+		m_ram->pointer()[(page << 14) | offset] = data;
+}
 
-	PORT_START("joy_1")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_BUTTON1)        PORT_PLAYER(1)
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)    PORT_8WAY PORT_PLAYER(1)
-	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN)  PORT_8WAY PORT_PLAYER(1)
-	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_8WAY PORT_PLAYER(1)
-	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT)  PORT_8WAY PORT_PLAYER(1)
+//-------------------------------------------------
+//  mem_block_a/b/c/d_r/w - read/write memory blocks
+//-------------------------------------------------
 
-	PORT_START("joy_2")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT)  PORT_8WAY PORT_PLAYER(2)
-	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT) PORT_8WAY PORT_PLAYER(2)
-	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN)  PORT_8WAY PORT_PLAYER(2)
-	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_UP)    PORT_8WAY PORT_PLAYER(2)
-	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_BUTTON1)        PORT_PLAYER(2)
-INPUT_PORTS_END
+uint8_t samcoupe_state::mem_block_a_r(offs_t offset)
+{
+	int page = m_lmpr & 0x1f;
 
+	// ram enabled?
+	if (BIT(m_lmpr, 5))
+		return mem_page_r(page, offset);
+	else
+		return m_bios->base()[offset];
+}
 
-/***************************************************************************
-    PALETTE
-***************************************************************************/
+void samcoupe_state::mem_block_a_w(offs_t offset, uint8_t data)
+{
+	int page = m_lmpr & 0x1f;
 
-/*
-    Decode colours for the palette as follows:
+	// not write protected?
+	if (BIT(m_lmpr, 7) == 0)
+		mem_page_w(page, offset, data);
+}
 
-    bit     7       6       5       4       3       2       1       0
-         nothing   G+4     R+4     B+4    ALL+1    G+2     R+2     B+2
+uint8_t samcoupe_state::mem_block_b_r(offs_t offset)
+{
+	int page = ((m_lmpr & 0x1f) + 1) & 0x1f;
+	return mem_page_r(page, offset);
+}
 
-*/
-void samcoupe_state::samcoupe_palette(palette_device &palette) const
+void samcoupe_state::mem_block_b_w(offs_t offset, uint8_t data)
 {
-	for (int i = 0; i < 128; i++)
-	{
-		uint8_t const b = bitswap<3>(i, 4, 0, 3);
-		uint8_t const r = bitswap<3>(i, 5, 1, 3);
-		uint8_t const g = bitswap<3>(i, 6, 2, 3);
+	int page = ((m_lmpr & 0x1f) + 1) & 0x1f;
+	mem_page_w(page, offset, data);
+}
 
-		palette.set_pen_color(i, pal3bit(r), pal3bit(g), pal3bit(b));
-	}
+uint8_t samcoupe_state::mem_block_c_r(offs_t offset)
+{
+	int page = m_hmpr & 0x1f;
+	return mem_page_r(page, offset);
 }
 
+void samcoupe_state::mem_block_c_w(offs_t offset, uint8_t data)
+{
+	int page = m_hmpr & 0x1f;
+	mem_page_w(page, offset, data);
+}
 
-/***************************************************************************
-    MACHINE DRIVERS
-***************************************************************************/
+uint8_t samcoupe_state::mem_block_d_r(offs_t offset)
+{
+	int page = ((m_hmpr & 0x1f) + 1) & 0x1f;
 
-FLOPPY_FORMATS_MEMBER( samcoupe_state::floppy_formats )
-	FLOPPY_MGT_FORMAT
-FLOPPY_FORMATS_END
+	// ram enabled?
+	if (BIT(m_lmpr, 6) == 0)
+		return mem_page_r(page, offset);
+	else
+		return m_bios->base()[0x4000 + offset];
+}
 
-static void samcoupe_floppies(device_slot_interface &device)
+void samcoupe_state::mem_block_d_w(offs_t offset, uint8_t data)
 {
-	device.option_add("35dd", FLOPPY_35_DD);
+	int page = ((m_hmpr & 0x1f) + 1) & 0x1f;
+	mem_page_w(page, offset, data);
 }
 
+
+//**************************************************************************
+//  MACHINE DEFINTIONS
+//**************************************************************************
+
 void samcoupe_state::samcoupe(machine_config &config)
 {
-	/* basic machine hardware */
-	Z80(config, m_maincpu, SAMCOUPE_XTAL_X1 / 4); /* 6 MHz */
-	m_maincpu->set_addrmap(AS_PROGRAM, &samcoupe_state::samcoupe_mem);
-	m_maincpu->set_addrmap(AS_IO, &samcoupe_state::samcoupe_io);
+	Z80(config, m_maincpu, 24_MHz_XTAL / 4); // 6 MHz
+	m_maincpu->set_addrmap(AS_PROGRAM, &samcoupe_state::mem_map_base);
+	m_maincpu->set_addrmap(AS_IO, &samcoupe_state::io_map_base);
 	m_maincpu->set_vblank_int("screen", FUNC(samcoupe_state::samcoupe_frame_interrupt));
 
-	/* video hardware */
+	ADDRESS_MAP_BANK(config, m_mem);
+	m_mem->set_addrmap(AS_PROGRAM, &samcoupe_state::mem_map);
+	m_mem->set_data_width(8);
+	m_mem->set_addr_width(16);
+
+	ADDRESS_MAP_BANK(config, m_io);
+	m_io->set_addrmap(AS_PROGRAM, &samcoupe_state::io_map);
+	m_io->set_data_width(8);
+	m_io->set_addr_width(16);
+
+	RAM(config, RAM_TAG).set_default_size("512K").set_extra_options("256K");
+
+	// video hardware
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
-	m_screen->set_raw(SAMCOUPE_XTAL_X1/2, SAM_TOTAL_WIDTH,  0, SAM_BORDER_LEFT + SAM_SCREEN_WIDTH + SAM_BORDER_RIGHT,
-										  SAM_TOTAL_HEIGHT, 0, SAM_BORDER_TOP + SAM_SCREEN_HEIGHT + SAM_BORDER_BOTTOM);
+	m_screen->set_raw(24_MHz_XTAL / 2, SAM_TOTAL_WIDTH,  0, SAM_BORDER_LEFT + SAM_SCREEN_WIDTH + SAM_BORDER_RIGHT,
+									   SAM_TOTAL_HEIGHT, 0, SAM_BORDER_TOP + SAM_SCREEN_HEIGHT + SAM_BORDER_BOTTOM);
 	m_screen->set_screen_update(FUNC(samcoupe_state::screen_update));
 	m_screen->set_palette("palette");
 
 	PALETTE(config, "palette", FUNC(samcoupe_state::samcoupe_palette), 128);
 
-	/* devices */
-	CENTRONICS(config, m_lpt1, centronics_devices, "printer");
-	m_lpt1->busy_handler().set(FUNC(samcoupe_state::write_lpt1_busy));
-
-	output_latch_device &lpt1_data_out(OUTPUT_LATCH(config, "lpt1_data_out"));
-	m_lpt1->set_output_latch(lpt1_data_out);
-
-	CENTRONICS(config, m_lpt2, centronics_devices, "printer");
-	m_lpt2->busy_handler().set(FUNC(samcoupe_state::write_lpt2_busy));
-
-	output_latch_device &lpt2_data_out(OUTPUT_LATCH(config, "lpt2_data_out"));
-	m_lpt2->set_output_latch(lpt2_data_out);
-
-	MSM6242(config, m_rtc, 32.768_kHz_XTAL);
-
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 	SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
-	SAA1099(config, "saa1099", SAMCOUPE_XTAL_X1/3).add_route(ALL_OUTPUTS, "mono", 0.50); /* 8 MHz */
+	SAA1099(config, "saa1099", 24_MHz_XTAL / 3).add_route(ALL_OUTPUTS, "mono", 0.50); // 8 MHz
 
 	CASSETTE(config, m_cassette);
 	m_cassette->set_formats(tzx_cassette_formats);
@@ -564,19 +940,21 @@
 	m_cassette->set_interface("samcoupe_cass");
 	SOFTWARE_LIST(config, "cass_list").set_original("samcoupe_cass");
 
-	WD1772(config, m_fdc, SAMCOUPE_XTAL_X1/3);
-	FLOPPY_CONNECTOR(config, "wd1772:0", samcoupe_floppies, "35dd", samcoupe_state::floppy_formats);
-	FLOPPY_CONNECTOR(config, "wd1772:1", samcoupe_floppies, "35dd", samcoupe_state::floppy_formats);
+	// expansion ports
+	SAMCOUPE_MOUSE_PORT(config, m_mouse, samcoupe_mouse_modules);
+
+	SAMCOUPE_DRIVE_PORT(config, m_drive[0], samcoupe_drive_modules, "floppy");
+	SAMCOUPE_DRIVE_PORT(config, m_drive[1], samcoupe_drive_modules, "floppy");
+
 	SOFTWARE_LIST(config, "flop_list").set_original("samcoupe_flop");
 
-	/* internal ram */
-	RAM(config, RAM_TAG).set_default_size("512K").set_extra_options("256K,1280K,1536K,2304K,2560K,3328K,3584K,4352K,4608K");
+	SAMCOUPE_EXPANSION(config, m_expansion, samcoupe_expansion_modules);
 }
 
 
-/***************************************************************************
-    ROM DEFINITIONS
-***************************************************************************/
+//**************************************************************************
+//  ROM DEFINTIONS
+//**************************************************************************
 
 /*
     The bios is actually 32K. This is the combined version of the two old 16K MESS roms.
@@ -613,11 +991,14 @@
 	ROMX_LOAD( "rom04.z5",  0x0000, 0x8000, CRC(f439e84e) SHA1(8bc457a5c764b0bb0aa7008c57f28c30248fc6a4), ROM_BIOS(12) )
 	ROM_SYSTEM_BIOS( 13, "01",  "v0.1" )
 	ROMX_LOAD( "rom01.z5",  0x0000, 0x8000, CRC(c04acfdf) SHA1(8976ed005c14905eec1215f0a5c28aa686a7dda2), ROM_BIOS(13) )
+	ROM_SYSTEM_BIOS( 14, "atom",  "ATOM HDD Interface Auto Boot" )
+	ROMX_LOAD( "atom.z5",   0x0000, 0x8000, CRC(dec75f58) SHA1(cd342579f066c0863e4f769c2e6757085e21b0a1), ROM_BIOS(14) )
 ROM_END
 
+
 /***************************************************************************
     GAME DRIVERS
 ***************************************************************************/
 
 //    YEAR  NAME      PARENT  COMPAT  MACHINE   INPUT     CLASS           INIT        COMPANY                        FULLNAME     FLAGS
-COMP( 1989, samcoupe, 0,      0,      samcoupe, samcoupe, samcoupe_state, empty_init, "Miles Gordon Technology plc", "SAM Coupe", 0 )
+COMP( 1989, samcoupe, 0,      0,      samcoupe, samcoupe, samcoupe_state, empty_init, "Miles Gordon Technology plc", "SAM Coupe", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/sapi1.cpp mame-0.224+dfsg.1/src/mame/drivers/sapi1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/sapi1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/sapi1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -97,11 +97,11 @@
 	uint8_t port11_r();
 	uint8_t port40_r();
 	uint8_t port41_r();
-	DECLARE_MACHINE_RESET(sapi1);
-	DECLARE_MACHINE_RESET(sapizps3);
 	MC6845_UPDATE_ROW(crtc_update_row);
 	DECLARE_READ_LINE_MEMBER(si);
 	DECLARE_WRITE_LINE_MEMBER(so);
+	void machine_reset() override;
+	void machine_start() override;
 	uint32_t screen_update_sapi1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	uint32_t screen_update_sapi3(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
@@ -724,24 +724,39 @@
 	m_zps3_25 = data & 0xfc; //??
 }
 
-MACHINE_RESET_MEMBER( sapi_state, sapi1 )
+void sapi_state::machine_reset()
 {
 	m_keyboard_mask = 0;
 	m_refresh_counter = 0x20;
-	// setup uart to 8N2 for sapi1 -bios 0
-	m_uart->write_np(1);
-	m_uart->write_tsb(1);
-	m_uart->write_nb1(1);
-	m_uart->write_nb2(1);
-	m_uart->write_eps(1);
-	m_uart->write_cs(1);
-	m_uart->write_cs(0);
+
+	if (m_uart)
+	{
+		// setup uart to 8N2 for sapi1 -bios 0
+		m_uart->write_np(1);
+		m_uart->write_tsb(1);
+		m_uart->write_nb1(1);
+		m_uart->write_nb2(1);
+		m_uart->write_eps(1);
+		m_uart->write_cs(1);
+		m_uart->write_cs(0);
+	}
+
+	if (m_bank1)
+		m_bank1->set_entry(1);
 }
 
-MACHINE_RESET_MEMBER( sapi_state, sapizps3 )
+void sapi_state::machine_start()
 {
-	m_keyboard_mask = 0;
-	m_bank1->set_entry(1);
+	save_item(NAME(m_term_data));
+	save_item(NAME(m_keyboard_mask));
+	save_item(NAME(m_refresh_counter));
+	save_item(NAME(m_zps3_25));
+	save_item(NAME(m_cass_data));
+	save_item(NAME(m_cassinbit));
+	save_item(NAME(m_cassoutbit));
+	save_item(NAME(m_cassold));
+	save_item(NAME(m_ier));
+	save_item(NAME(m_iet));
 }
 
 void sapi_state::init_sapizps3()
@@ -771,7 +786,6 @@
 	I8080A(config, m_maincpu, 18_MHz_XTAL / 9); // Tesla MHB8080A + MHB8224 + MHB8228
 	m_maincpu->set_addrmap(AS_PROGRAM, &sapi_state::sapi1_mem);
 	m_maincpu->set_addrmap(AS_IO, &sapi_state::sapi1_io);
-	MCFG_MACHINE_RESET_OVERRIDE(sapi_state, sapi1)
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -821,7 +835,6 @@
 	/* basic machine hardware */
 	m_maincpu->set_addrmap(AS_PROGRAM, &sapi_state::sapi3_mem);
 	m_maincpu->set_addrmap(AS_IO, &sapi_state::sapi3_io);
-	MCFG_MACHINE_RESET_OVERRIDE(sapi_state, sapizps3 )
 
 	screen_device &screen(*subdevice<screen_device>("screen"));
 	screen.set_size(40*6, 20*9);
@@ -867,7 +880,6 @@
 	I8080A(config, m_maincpu, 18_MHz_XTAL / 9); // Tesla MHB8080A + MHB8224 + MHB8228
 	m_maincpu->set_addrmap(AS_PROGRAM, &sapi_state::sapi3a_mem);
 	m_maincpu->set_addrmap(AS_IO, &sapi_state::sapi3a_io);
-	MCFG_MACHINE_RESET_OVERRIDE(sapi_state, sapizps3 )
 
 	/* video hardware */
 	AY51013(config, m_uart); // Tesla MHB1012
@@ -942,9 +954,9 @@
 /* Driver */
 
 //    YEAR  NAME       PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT            COMPANY  FULLNAME                   FLAGS
-COMP( 1985, sapi1,     0,      0,      sapi1,   sapi1, sapi_state, empty_init,     "Tesla", "SAPI-1 ZPS 1",            MACHINE_NO_SOUND_HW )
-COMP( 1985, sapizps2,  sapi1,  0,      sapi2,   sapi1, sapi_state, empty_init,     "Tesla", "SAPI-1 ZPS 2",            MACHINE_NO_SOUND_HW )
-COMP( 1985, sapizps3,  sapi1,  0,      sapi3,   sapi1, sapi_state, init_sapizps3,  "Tesla", "SAPI-1 ZPS 3",            MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
-COMP( 1985, sapizps3a, sapi1,  0,      sapi3a,  sapi1, sapi_state, init_sapizps3a, "Tesla", "SAPI-1 ZPS 3 (terminal)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
-COMP( 1985, sapizps3b, sapi1,  0,      sapi3b,  sapi1, sapi_state, init_sapizps3b, "Tesla", "SAPI-1 ZPS 3 (6845)",     MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW )
+COMP( 1985, sapi1,     0,      0,      sapi1,   sapi1, sapi_state, empty_init,     "Tesla", "SAPI-1 ZPS 1",            MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+COMP( 1985, sapizps2,  sapi1,  0,      sapi2,   sapi1, sapi_state, empty_init,     "Tesla", "SAPI-1 ZPS 2",            MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+COMP( 1985, sapizps3,  sapi1,  0,      sapi3,   sapi1, sapi_state, init_sapizps3,  "Tesla", "SAPI-1 ZPS 3",            MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+COMP( 1985, sapizps3a, sapi1,  0,      sapi3a,  sapi1, sapi_state, init_sapizps3a, "Tesla", "SAPI-1 ZPS 3 (terminal)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+COMP( 1985, sapizps3b, sapi1,  0,      sapi3b,  sapi1, sapi_state, init_sapizps3b, "Tesla", "SAPI-1 ZPS 3 (6845)",     MACHINE_NOT_WORKING | MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/sc2.cpp mame-0.224+dfsg.1/src/mame/drivers/sc2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/sc2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/sc2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,7 +7,8 @@
 2nd chess computer by VEB(Volkseigener Betrieb) Funkwerk Erfurt. The company
 was renamed to VEB Mikroelektronik "Karl Marx" Erfurt in 1983, and formed into
 X-FAB Semiconductor Foundries AG after the German unification. SC 2 chess
-program is based on Fidelity Chess Challenger 10(C?).
+program is an unlicensed copy of Fidelity Chess Challenger 10 C, with some
+patches and an extra 1KB ROM to deal with the different I/O.
 
 3 versions known: initial version, revision E, revision EP.
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/schick.cpp mame-0.224+dfsg.1/src/mame/drivers/schick.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/schick.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/schick.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -99,7 +99,6 @@
 	{
 		return 0xff;
 	}
-
 };
 
 #define MASTER_CLOCK        (18432000)
@@ -323,7 +322,7 @@
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN1 )
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN2 )
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN3 )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_SERVICE )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 )
 
 	PORT_START("IN1")
@@ -336,25 +335,65 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
 
-	PORT_START("SW1")
-	PORT_DIPUNKNOWN_DIPLOC(0x01, 0x01, "SW1:1")
-	PORT_DIPUNKNOWN_DIPLOC(0x02, 0x02, "SW1:2")
-	PORT_DIPUNKNOWN_DIPLOC(0x04, 0x04, "SW1:3")
-	PORT_DIPUNKNOWN_DIPLOC(0x08, 0x08, "SW1:4")
-	PORT_DIPUNKNOWN_DIPLOC(0x10, 0x10, "SW1:5")
-	PORT_DIPUNKNOWN_DIPLOC(0x20, 0x20, "SW1:6")
-	PORT_DIPUNKNOWN_DIPLOC(0x40, 0x40, "SW1:7")
-	PORT_DIPUNKNOWN_DIPLOC(0x80, 0x80, "SW1:8")
+	PORT_START("SW1") // dips seem the same as Pengo
+	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Bonus_Life ) )       PORT_DIPLOCATION("SW1:1")
+	PORT_DIPSETTING(    0x00, "30000" )
+	PORT_DIPSETTING(    0x01, "50000" )
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Demo_Sounds ) )      PORT_DIPLOCATION("SW1:2")
+	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Cabinet ) )          PORT_DIPLOCATION("SW1:3")
+	PORT_DIPSETTING(    0x00, DEF_STR( Upright ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( Cocktail ) )
+	PORT_DIPNAME( 0x18, 0x10, DEF_STR( Lives ) )            PORT_DIPLOCATION("SW1:4,5")
+	PORT_DIPSETTING(    0x18, "2" )
+	PORT_DIPSETTING(    0x10, "3" )
+	PORT_DIPSETTING(    0x08, "4" )
+	PORT_DIPSETTING(    0x00, "5" )
+	PORT_DIPNAME( 0x20, 0x20, "Rack Test (Cheat)" ) PORT_CODE(KEYCODE_F1)   PORT_DIPLOCATION("SW1:6")
+	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0xc0, 0x80, DEF_STR( Difficulty ) )       PORT_DIPLOCATION("SW1:7,8")
+	PORT_DIPSETTING(    0xc0, DEF_STR( Easy ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( Medium ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( Hard ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Hardest ) )
 
 	PORT_START("SW2")
-	PORT_DIPUNKNOWN_DIPLOC(0x01, 0x01, "SW2:1")
-	PORT_DIPUNKNOWN_DIPLOC(0x02, 0x02, "SW2:2")
-	PORT_DIPUNKNOWN_DIPLOC(0x04, 0x04, "SW2:3")
-	PORT_DIPUNKNOWN_DIPLOC(0x08, 0x08, "SW2:4")
-	PORT_DIPUNKNOWN_DIPLOC(0x10, 0x10, "SW2:5")
-	PORT_DIPUNKNOWN_DIPLOC(0x20, 0x20, "SW2:6")
-	PORT_DIPUNKNOWN_DIPLOC(0x40, 0x40, "SW2:7")
-	PORT_DIPUNKNOWN_DIPLOC(0x80, 0x80, "SW2:8")
+	PORT_DIPNAME( 0x0f, 0x0c, DEF_STR( Coin_A ) )           PORT_DIPLOCATION("SW2:1,2,3,4")
+	PORT_DIPSETTING(    0x00, DEF_STR( 4C_1C ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( 3C_1C ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( 2C_1C ) )
+	PORT_DIPSETTING(    0x09, "2 Coins/1 Credit 5/3" )
+	PORT_DIPSETTING(    0x05, "2 Coins/1 Credit 4/3" )
+	PORT_DIPSETTING(    0x0c, DEF_STR( 1C_1C ) )
+	PORT_DIPSETTING(    0x0d, "1 Coin/1 Credit 5/6" )
+	PORT_DIPSETTING(    0x03, "1 Coin/1 Credit 4/5" )
+	PORT_DIPSETTING(    0x0b, "1 Coin/1 Credit 2/3" )
+	PORT_DIPSETTING(    0x02, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING(    0x07, "1 Coin/2 Credits 5/11" )
+	PORT_DIPSETTING(    0x0f, "1 Coin/2 Credits 4/9" )
+	PORT_DIPSETTING(    0x0a, DEF_STR( 1C_3C ) )
+	PORT_DIPSETTING(    0x06, DEF_STR( 1C_4C ) )
+	PORT_DIPSETTING(    0x0e, DEF_STR( 1C_5C ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( 1C_6C ) )
+	PORT_DIPNAME( 0xf0, 0xc0, DEF_STR( Coin_B ) )           PORT_DIPLOCATION("SW2:5,6,7,8")
+	PORT_DIPSETTING(    0x00, DEF_STR( 4C_1C ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( 3C_1C ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( 2C_1C ) )
+	PORT_DIPSETTING(    0x90, "2 Coins/1 Credit 5/3" )
+	PORT_DIPSETTING(    0x50, "2 Coins/1 Credit 4/3" )
+	PORT_DIPSETTING(    0xc0, DEF_STR( 1C_1C ) )
+	PORT_DIPSETTING(    0xd0, "1 Coin/1 Credit 5/6" )
+	PORT_DIPSETTING(    0x30, "1 Coin/1 Credit 4/5" )
+	PORT_DIPSETTING(    0xb0, "1 Coin/1 Credit 2/3" )
+	PORT_DIPSETTING(    0x20, DEF_STR( 1C_2C ) )
+	PORT_DIPSETTING(    0x70, "1 Coin/2 Credits 5/11" )
+	PORT_DIPSETTING(    0xf0, "1 Coin/2 Credits 4/9" )
+	PORT_DIPSETTING(    0xa0, DEF_STR( 1C_3C ) )
+	PORT_DIPSETTING(    0x60, DEF_STR( 1C_4C ) )
+	PORT_DIPSETTING(    0xe0, DEF_STR( 1C_5C ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( 1C_6C ) )
 INPUT_PORTS_END
 
 
@@ -415,8 +454,8 @@
 	m_latch->q_out_cb<1>().set_log("m_latch bit 1 set");
 	m_latch->q_out_cb<2>().set(FUNC(schick_state::schick_palettebank_w));
 	m_latch->q_out_cb<3>().set_log("m_latch bit 3 set");
-	m_latch->q_out_cb<4>().set_log("m_latch bit 4 set");
-	m_latch->q_out_cb<5>().set_log("m_latch bit 5 set");
+	m_latch->q_out_cb<4>().set(FUNC(schick_state::coin_counter_1_w));
+	m_latch->q_out_cb<5>().set(FUNC(schick_state::coin_counter_2_w));
 	m_latch->q_out_cb<6>().set(FUNC(schick_state::schick_colortablebank_w));
 	m_latch->q_out_cb<7>().set(FUNC(schick_state::schick_gfxbank_w));
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/sdk86.cpp mame-0.224+dfsg.1/src/mame/drivers/sdk86.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/sdk86.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/sdk86.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,17 +2,7 @@
 // copyright-holders:Miodrag Milanovic, Jonathan Gevaryahu
 /***************************************************************************
 
-        Intel MCS-86 System Design Kit (SDK-86)
-
-        12/05/2009 Skeleton driver by Micko
-        29/11/2009 Some fleshing out by Lord Nightmare
-        22/06/2011 Working [Robbbert]
-
-    TODO:
-    Add optional 2x 8255A port read/write logging
-
-
-
+Intel MCS-86 System Design Kit (SDK-86)
 This is an evaluation kit for the 8086 cpu.
 
 There is no speaker or storage facility in the standard kit.
@@ -20,9 +10,12 @@
 Download the User Manual to get the operating procedures.
 The user manual is available from: http://www.bitsavers.org/pdf/intel/8086/9800698A_SDK-86_Users_Man_Apr79.pdf
 
+2009-05-12 Skeleton driver by Micko
+2009-11-29 Some fleshing out by Lord Nightmare
+2011-06-22 Working [Robbbert]
+
 ToDo:
-- Artwork
-- Add INTR and RESET keys
+- Add optional 2x 8255A port read/write logging
 
 ****************************************************************************/
 
@@ -35,50 +28,56 @@
 #include "machine/i8279.h"
 #include "sdk86.lh"
 
-#define I8251_TAG       "i8251"
-#define RS232_TAG       "rs232"
-
-
 class sdk86_state : public driver_device
 {
 public:
 	sdk86_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_kbdrow(*this, "X%X", 0U)
+		, m_uart(*this, "uart")
+		, m_kdc(*this, "i8279")
+		, m_ppi1(*this, "ppi1")
+		, m_ppi2(*this, "ppi2")
+		, m_io_keyboard(*this, "X%u", 0U)
 		, m_digits(*this, "digit%u", 0U)
 	{ }
 
 	void sdk86(machine_config &config);
+	DECLARE_INPUT_CHANGED_MEMBER(nmi_button);
+	DECLARE_INPUT_CHANGED_MEMBER(reset_button);
 
 private:
-	void scanlines_w(uint8_t data);
-	void digit_w(uint8_t data);
-	uint8_t kbd_r();
+	void scanlines_w(u8 data);
+	void digit_w(u8 data);
+	u8 kbd_r();
 
-	void sdk86_io(address_map &map);
-	void sdk86_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 
-	uint8_t m_digit;
-	virtual void machine_start() override { m_digits.resolve(); }
+	u8 m_digit;
+	void machine_start() override;
 	required_device<cpu_device> m_maincpu;
-	required_ioport_array<3> m_kbdrow;
+	required_device<i8251_device> m_uart;
+	required_device<i8279_device> m_kdc;
+	required_device<i8255_device> m_ppi1;
+	required_device<i8255_device> m_ppi2;
+	required_ioport_array<3> m_io_keyboard;
 	output_finder<8> m_digits;
 };
 
-void sdk86_state::sdk86_mem(address_map &map)
+void sdk86_state::mem_map(address_map &map)
 {
 	map(0x00000, 0x00fff).ram(); //2K standard, or 4k (board fully populated)
 	map(0xfe000, 0xfffff).rom().region("maincpu", 0);
 }
 
-void sdk86_state::sdk86_io(address_map &map)
+void sdk86_state::io_map(address_map &map)
 {
 	map.unmap_value_high();
-	map(0xfff0, 0xfff3).mirror(4).rw(I8251_TAG, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0x00ff);
-	map(0xffe8, 0xffeb).mirror(4).rw("i8279", FUNC(i8279_device::read), FUNC(i8279_device::write)).umask16(0x00ff);
-	map(0xfff8, 0xffff).rw("port1", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0xff00);
-	map(0xfff8, 0xffff).rw("port2", FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff);
+	map(0xfff0, 0xfff3).mirror(4).rw(m_uart, FUNC(i8251_device::read), FUNC(i8251_device::write)).umask16(0x00ff);
+	map(0xffe8, 0xffeb).mirror(4).rw(m_kdc, FUNC(i8279_device::read), FUNC(i8279_device::write)).umask16(0x00ff);
+	map(0xfff8, 0xffff).rw(m_ppi1, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0xff00);
+	map(0xfff8, 0xffff).rw(m_ppi2, FUNC(i8255_device::read), FUNC(i8255_device::write)).umask16(0x00ff);
 }
 
 /* Input ports */
@@ -111,30 +110,57 @@
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(":") PORT_CODE(KEYCODE_COLON)
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("REG") PORT_CODE(KEYCODE_R)
 	PORT_BIT(0xC0, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("X3")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("INTR") PORT_CODE(KEYCODE_ESC) PORT_CHANGED_MEMBER(DEVICE_SELF, sdk86_state, nmi_button, 0)
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Systm Reset") PORT_CODE(KEYCODE_F3) PORT_CHANGED_MEMBER(DEVICE_SELF, sdk86_state, reset_button, 0)
 INPUT_PORTS_END
 
+INPUT_CHANGED_MEMBER(sdk86_state::nmi_button)
+{
+	m_maincpu->set_input_line(INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE);
+}
+
+// Reset button connects to i8284, output of this resets all major chips
+INPUT_CHANGED_MEMBER(sdk86_state::reset_button)
+{
+	if (newval)
+	{
+		m_ppi1->reset();
+		m_ppi2->reset();
+		m_uart->reset();
+		m_kdc->reset();
+		m_maincpu->reset();
+	}
+}
 
-void sdk86_state::scanlines_w(uint8_t data)
+void sdk86_state::scanlines_w(u8 data)
 {
 	m_digit = data;
 }
 
-void sdk86_state::digit_w(uint8_t data)
+void sdk86_state::digit_w(u8 data)
 {
 	if (m_digit < 8)
 		m_digits[m_digit] = data;
 }
 
-uint8_t sdk86_state::kbd_r()
+u8 sdk86_state::kbd_r()
 {
-	uint8_t data = 0xff;
+	u8 data = 0xff;
 
 	if ((m_digit & 7) < 3)
-		data = m_kbdrow[m_digit & 7]->read();
+		data = m_io_keyboard[m_digit & 7]->read();
 
 	return data;
 }
 
+void sdk86_state::machine_start()
+{
+	m_digits.resolve();
+	save_item(NAME(m_digit));
+}
+
 static DEVICE_INPUT_DEFAULTS_START( terminal )
 	DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_4800 )
 	DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_4800 )
@@ -148,36 +174,36 @@
 {
 	/* basic machine hardware */
 	I8086(config, m_maincpu, XTAL(14'745'600)/3); /* divided down by i8284 clock generator; jumper selection allows it to be slowed to 2.5MHz, hence changing divider from 3 to 6 */
-	m_maincpu->set_addrmap(AS_PROGRAM, &sdk86_state::sdk86_mem);
-	m_maincpu->set_addrmap(AS_IO, &sdk86_state::sdk86_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &sdk86_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &sdk86_state::io_map);
 
 	/* video hardware */
 	config.set_default_layout(layout_sdk86);
 
 	/* Devices */
-	i8251_device &i8251(I8251(config, I8251_TAG, 0));
-	i8251.txd_handler().set(RS232_TAG, FUNC(rs232_port_device::write_txd));
-	i8251.dtr_handler().set(RS232_TAG, FUNC(rs232_port_device::write_dtr));
-	i8251.rts_handler().set(I8251_TAG, FUNC(i8251_device::write_cts));
-
-	rs232_port_device &rs232(RS232_PORT(config, RS232_TAG, default_rs232_devices, "terminal"));
-	rs232.rxd_handler().set(I8251_TAG, FUNC(i8251_device::write_rxd));
-	rs232.dsr_handler().set(I8251_TAG, FUNC(i8251_device::write_dsr));
+	I8251(config, m_uart, 0);
+	m_uart->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
+	m_uart->dtr_handler().set("rs232", FUNC(rs232_port_device::write_dtr));
+	m_uart->rts_handler().set(m_uart, FUNC(i8251_device::write_cts));
+
+	rs232_port_device &rs232(RS232_PORT(config, "rs232", default_rs232_devices, "terminal"));
+	rs232.rxd_handler().set(m_uart, FUNC(i8251_device::write_rxd));
+	rs232.dsr_handler().set(m_uart, FUNC(i8251_device::write_dsr));
 	rs232.set_option_device_input_defaults("terminal", DEVICE_INPUT_DEFAULTS_NAME(terminal));
 
 	clock_device &usart_clock(CLOCK(config, "usart_clock", XTAL(14'745'600)/3/16));
-	usart_clock.signal_handler().set(I8251_TAG, FUNC(i8251_device::write_txc));
-	usart_clock.signal_handler().append(I8251_TAG, FUNC(i8251_device::write_rxc));
+	usart_clock.signal_handler().set(m_uart, FUNC(i8251_device::write_txc));
+	usart_clock.signal_handler().append(m_uart, FUNC(i8251_device::write_rxc));
 
-	i8279_device &kbdc(I8279(config, "i8279", 2500000));        // based on divider
-	kbdc.out_sl_callback().set(FUNC(sdk86_state::scanlines_w)); // scan SL lines
-	kbdc.out_disp_callback().set(FUNC(sdk86_state::digit_w));   // display A&B
-	kbdc.in_rl_callback().set(FUNC(sdk86_state::kbd_r));        // kbd RL lines
-	kbdc.in_shift_callback().set_constant(0);                   // Shift key
-	kbdc.in_ctrl_callback().set_constant(0);
+	I8279(config, m_kdc, 2500000);        // based on divider
+	m_kdc->out_sl_callback().set(FUNC(sdk86_state::scanlines_w)); // scan SL lines
+	m_kdc->out_disp_callback().set(FUNC(sdk86_state::digit_w));   // display A&B
+	m_kdc->in_rl_callback().set(FUNC(sdk86_state::kbd_r));        // kbd RL lines
+	m_kdc->in_shift_callback().set_constant(0);                   // Shift key
+	m_kdc->in_ctrl_callback().set_constant(0);
 
-	I8255A(config, "port1");
-	I8255A(config, "port2");
+	I8255A(config, m_ppi1);
+	I8255A(config, m_ppi2);
 }
 
 /* ROM definition */
@@ -221,4 +247,4 @@
 /* Driver */
 
 /*    YEAR  NAME   PARENT  COMPAT  MACHINE  INPUT  CLASS        INIT        COMPANY   FULLNAME  FLAGS */
-COMP( 1979, sdk86, 0,      0,      sdk86,   sdk86, sdk86_state, empty_init, "Intel",  "MCS-86 System Design Kit", MACHINE_NO_SOUND_HW)
+COMP( 1979, sdk86, 0,      0,      sdk86,   sdk86, sdk86_state, empty_init, "Intel",  "MCS-86 System Design Kit", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/seattle.cpp mame-0.224+dfsg.1/src/mame/drivers/seattle.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/seattle.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/seattle.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -288,11 +288,15 @@
 		m_ethernet(*this, "ethernet"),
 		m_ioasic(*this, "ioasic"),
 		m_io_analog(*this, "AN%u", 0U),
+		m_io_p4_8way(*this, "8WAY_P4"),
+		m_io_49way_x(*this, "49WAYX_P%u", 1U),
+		m_io_49way_y(*this, "49WAYY_P%u", 1U),
 		m_io_gun_x(*this, "LIGHT%u_X", 0U),
 		m_io_gun_y(*this, "LIGHT%u_Y", 0U),
 		m_io_fake(*this, "FAKE"),
 		m_io_gearshift(*this, "GEAR"),
 		m_io_system(*this, "SYSTEM"),
+		m_io_dips(*this, "DIPS"),
 		m_wheel_driver(*this, "wheel"),
 		m_lamps(*this, "lamp%u", 0U),
 		m_leds(*this, "led%u", 0U)
@@ -332,6 +336,8 @@
 	void init_mace();
 	void init_blitz99();
 
+	DECLARE_CUSTOM_INPUT_MEMBER(blitz_49way_r);
+	DECLARE_CUSTOM_INPUT_MEMBER(i40_r);
 	DECLARE_CUSTOM_INPUT_MEMBER(gearshift_r);
 
 private:
@@ -345,15 +351,21 @@
 	optional_device<smc91c94_device> m_ethernet;
 	required_device<midway_ioasic_device> m_ioasic;
 	optional_ioport_array<8> m_io_analog;
+	optional_ioport m_io_p4_8way;
+	optional_ioport_array<4> m_io_49way_x;
+	optional_ioport_array<4> m_io_49way_y;
 	optional_ioport_array<2> m_io_gun_x;
 	optional_ioport_array<2> m_io_gun_y;
 	optional_ioport m_io_fake;
 	optional_ioport m_io_gearshift;
 	optional_ioport m_io_system;
+	optional_ioport m_io_dips;
 	output_finder<1> m_wheel_driver;
 	output_finder<16> m_lamps;
 	output_finder<24> m_leds;
 
+	static const uint8_t translate49[7];
+
 	widget_data m_widget;
 	uint32_t m_interrupt_enable;
 	uint32_t m_interrupt_config;
@@ -370,6 +382,7 @@
 	uint32_t m_cmos_write_enabled;
 	uint16_t m_output_last;
 	uint8_t m_output_mode;
+	uint32_t m_i40_data;
 	uint32_t m_gear;
 	int8_t m_wheel_force;
 	int m_wheel_offset;
@@ -401,6 +414,7 @@
 	void output_w(uint32_t data);
 	uint32_t widget_r(offs_t offset, uint32_t mem_mask = ~0);
 	void widget_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+	void i40_w(uint32_t data);
 	void wheel_board_w(offs_t offset, uint32_t data);
 
 
@@ -427,7 +441,6 @@
 	void flagstaff_cs3_map(address_map &map);
 };
 
-
 /*************************************
  *
  *  Machine init
@@ -460,6 +473,7 @@
 	save_item(NAME(m_cmos_write_enabled));
 	save_item(NAME(m_output_last));
 	save_item(NAME(m_output_mode));
+	save_item(NAME(m_i40_data));
 	save_item(NAME(m_gear));
 	save_item(NAME(m_wheel_calibrated));
 
@@ -732,6 +746,83 @@
 }
 
 /*************************************
+* 49 Way translation matrix
+*************************************/
+const uint8_t seattle_state::translate49[7] = { 0x8, 0xc, 0xe, 0xf, 0x3, 0x1, 0x0 };
+
+/*************************************
+* 2 player 49 Way Joystick on Blitz
+*************************************/
+CUSTOM_INPUT_MEMBER(seattle_state::blitz_49way_r)
+{
+	return  (translate49[m_io_49way_y[1]->read() >> 4] << 12) | (translate49[m_io_49way_x[1]->read() >> 4] << 8) |
+		(translate49[m_io_49way_y[0]->read() >> 4] << 4) | (translate49[m_io_49way_x[0]->read() >> 4] << 0);
+}
+
+/*************************************
+* Optical 49 Way Joystick I40 Board
+*************************************/
+void seattle_state::i40_w(uint32_t data)
+{
+	//printf("i40_w: data = %08x\n", data);
+	//logerror("i40_w: data = %08x\n", data);
+	m_i40_data = data;
+}
+
+CUSTOM_INPUT_MEMBER(seattle_state::i40_r)
+{
+	if (m_io_dips->read() & 0x100) {
+		// 8 way joysticks
+		return m_io_p4_8way->read();
+	}
+	else {
+		// 49 way joysticks via i40 adapter board
+		int index = m_i40_data & 0xf;
+		uint8_t data = 0;
+		switch (index) {
+		case 0:
+			data = translate49[m_io_49way_x[0]->read() >> 4];
+			break;
+		case 1:
+			data = translate49[m_io_49way_y[0]->read() >> 4];
+			break;
+		case 2:
+			data = translate49[m_io_49way_x[1]->read() >> 4];
+			break;
+		case 3:
+			data = translate49[m_io_49way_y[1]->read() >> 4];
+			break;
+		case 4:
+			data = translate49[m_io_49way_x[2]->read() >> 4];
+			break;
+		case 5:
+			data = translate49[m_io_49way_y[2]->read() >> 4];
+			break;
+		case 6:
+			data = translate49[m_io_49way_x[3]->read() >> 4];
+			break;
+		case 7:
+			data = translate49[m_io_49way_y[3]->read() >> 4];
+			break;
+		case 10:
+		case 11:
+		case 12:
+			// I40 Detection
+			data = ~index & 0xf;
+			break;
+		default:
+			//logerror("%s: i40_r: select: %x index: %d data: %x\n", machine().describe_context(), m_i40_data, index, data);
+			break;
+		}
+		logerror("%s: i40_r: select: %x index: %d data: %x\n", machine().describe_context(), m_i40_data, index, data);
+		//if (m_i40_data & 0x1000)
+		//  printf("%s: i40_r: select: %x index: %d data: %x\n", machine().describe_context().c_str(), m_i40_data, index, data);
+		//m_i40_data &= ~0x1000;
+		return data;
+	}
+}
+
+/*************************************
 *
 *  Gearshift (calspeed)
 *
@@ -1247,8 +1338,8 @@
 	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SERVICE1 )
 	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN3 )
 	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN4 )
-	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START3 )
+	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_START4 )
 	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_VOLUME_DOWN )
 	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_VOLUME_UP )
 	PORT_BIT( 0x6000, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1273,18 +1364,6 @@
 	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("IN2")
-	PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
-
-INPUT_PORTS_END
-
-static INPUT_PORTS_START( seattle_4p )
-	PORT_INCLUDE(seattle_common)
-
-	PORT_MODIFY("SYSTEM")
-	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START3 )
-	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_START4 )
-
-	PORT_MODIFY("IN2")
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
@@ -1328,7 +1407,7 @@
  *************************************/
 
 static INPUT_PORTS_START( wg3dh )
-	PORT_INCLUDE(seattle_4p)
+	PORT_INCLUDE(seattle_common)
 
 	PORT_MODIFY("DIPS")
 	PORT_DIPNAME( 0x0002, 0x0002, "Boot ROM Test" )
@@ -1547,7 +1626,7 @@
 
 
 static INPUT_PORTS_START( blitz )
-	PORT_INCLUDE(seattle_4p)
+	PORT_INCLUDE(seattle_common)
 
 	PORT_MODIFY("DIPS")
 	PORT_DIPNAME( 0x0001, 0x0000, "Coinage Source" )
@@ -1606,12 +1685,19 @@
 	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Turbo")
 
 	PORT_MODIFY("IN2")
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) PORT_NAME("P3 A")
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) PORT_NAME("P3 B")
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) PORT_NAME("P3 Turbo")
-	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) PORT_NAME("P4 A")
-	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4) PORT_NAME("P4 B")
-	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) PORT_NAME("P4 Turbo")
+	PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_CUSTOM  ) PORT_CUSTOM_MEMBER(seattle_state, blitz_49way_r)
+
+	PORT_START("49WAYX_P1")
+	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
+
+	PORT_START("49WAYY_P1")
+	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
+
+	PORT_START("49WAYX_P2")
+	PORT_BIT(0xff, 0x38, IPT_AD_STICK_X) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
+
+	PORT_START("49WAYY_P2")
+	PORT_BIT(0xff, 0x38, IPT_AD_STICK_Y) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
 
 INPUT_PORTS_END
 
@@ -1663,6 +1749,37 @@
 	PORT_DIPSETTING(      0x2000, "2" )
 	PORT_DIPSETTING(      0x0000, "4" )
 
+	PORT_MODIFY("IN2")
+	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(3)
+	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(3)
+	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(3)
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(3)
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) PORT_NAME("P3 A")
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) PORT_NAME("P3 B")
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) PORT_NAME("P3 Turbo")
+	PORT_BIT( 0x0f00, IP_ACTIVE_LOW, IPT_CUSTOM) PORT_CUSTOM_MEMBER(seattle_state, i40_r)
+	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) PORT_NAME("P4 A")
+	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4) PORT_NAME("P4 B")
+	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) PORT_NAME("P4 Turbo")
+
+	PORT_START("8WAY_P4")
+	PORT_BIT( 0x1, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP    ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x2, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN  ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x4, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT  ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x8, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4) PORT_8WAY
+
+	PORT_START("49WAYX_P3")
+	PORT_BIT(0xff, 0x38, IPT_AD_STICK_X) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
+
+	PORT_START("49WAYY_P3")
+	PORT_BIT(0xff, 0x38, IPT_AD_STICK_Y) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
+
+	PORT_START("49WAYX_P4")
+	PORT_BIT(0xff, 0x38, IPT_AD_STICK_X) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4)
+
+	PORT_START("49WAYY_P4")
+	PORT_BIT(0xff, 0x38, IPT_AD_STICK_Y) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4)
+
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( carnevil )
@@ -2088,6 +2205,7 @@
 	m_ioasic->set_upper(444); // or 528
 	m_ioasic->set_yearoffs(80);
 	m_ioasic->irq_handler().set(FUNC(seattle_state::ioasic_irq));
+	m_ioasic->aux_output_handler().set(FUNC(seattle_state::i40_w));
 }
 
 void seattle_state::blitz99(machine_config &config)
@@ -2102,6 +2220,7 @@
 	m_ioasic->set_upper(481); // or 484 or 520
 	m_ioasic->set_yearoffs(80);
 	m_ioasic->irq_handler().set(FUNC(seattle_state::ioasic_irq));
+	m_ioasic->aux_output_handler().set(FUNC(seattle_state::i40_w));
 }
 
 void seattle_state::blitz2k(machine_config &config)
@@ -2116,6 +2235,7 @@
 	m_ioasic->set_upper(494); // or 498
 	m_ioasic->set_yearoffs(80);
 	m_ioasic->irq_handler().set(FUNC(seattle_state::ioasic_irq));
+	m_ioasic->aux_output_handler().set(FUNC(seattle_state::i40_w));
 }
 
 void seattle_state::carnevil(machine_config &config)
@@ -2179,6 +2299,9 @@
 
 	ROM_REGION16_LE( 0x10000, "dcs", 0 ) // ADSP-2115 data Version L1.1, Labeled as Version 1.0
 	ROM_LOAD16_BYTE( "soundl11.u95", 0x000000, 0x8000, CRC(c589458c) SHA1(0cf970a35910a74cdcf3bd8119bfc0c693e19b00) )
+
+	ROM_REGION( 0x2000, "serial_security_pic", 0 ) // security PIC (provides game ID code and serial number)
+	ROM_LOAD( "314_mace.u96", 0x0000, 0x2000, CRC(65943e82) SHA1(984a1938f43671fc8f6394677396451dab7f042b) )
 ROM_END
 
 
@@ -2193,6 +2316,9 @@
 
 	ROM_REGION16_LE( 0x10000, "dcs", 0 ) // ADSP-2115 data Version L1.1
 	ROM_LOAD16_BYTE( "soundl11.u95", 0x000000, 0x8000, CRC(c589458c) SHA1(0cf970a35910a74cdcf3bd8119bfc0c693e19b00) )
+
+	ROM_REGION( 0x2000, "serial_security_pic", 0 ) // security PIC (provides game ID code and serial number)
+	ROM_LOAD( "314_mace.u96", 0x0000, 0x2000, CRC(65943e82) SHA1(984a1938f43671fc8f6394677396451dab7f042b) )
 ROM_END
 
 
@@ -2426,6 +2552,9 @@
 
 	DISK_REGION( PCI_ID_IDE":ide:0:hdd:image" ) // Hard Drive Version 1.30
 	DISK_IMAGE( "blitz99", 0, SHA1(19877e26ffce81dd525031e9e2b4f83ff982e2d9) )
+
+	ROM_REGION( 0x2000, "serial_security_pic", 0 ) // security PIC (provides game ID code and serial number)
+	ROM_LOAD( "481_blitz-99.u96", 0x0000, 0x2000, CRC(f58df548) SHA1(5bda123035f49f06b4721ab4a1577a115470aa02) )
 ROM_END
 
 ROM_START( blitz99a )
@@ -2442,6 +2571,9 @@
 
 	DISK_REGION( PCI_ID_IDE":ide:0:hdd:image" ) // Hard Drive Version 1.30
 	DISK_IMAGE( "blitz99a", 0, SHA1(43f834727ce01d7a63b482fc28cbf292477fc6f2) )
+
+	ROM_REGION( 0x2000, "serial_security_pic", 0 ) // security PIC (provides game ID code and serial number)
+	ROM_LOAD( "481_blitz-99.u96", 0x0000, 0x2000, CRC(f58df548) SHA1(5bda123035f49f06b4721ab4a1577a115470aa02) )
 ROM_END
 
 
@@ -2470,6 +2602,9 @@
 
 	DISK_REGION( PCI_ID_IDE":ide:0:hdd:image" ) // Hard Drive v1.0.3  Diagnostics v3.4 / Feb 1 1999 16:00:07
 	DISK_IMAGE( "carnevil", 0, SHA1(5cffb0de63ad36eb01c5951bab04d3f8a9e23e16) )
+
+	ROM_REGION( 0x2000, "serial_security_pic", 0 ) // security PIC (provides game ID code and serial number)
+	ROM_LOAD( "486_carnevil.u96", 0x0000, 0x2000, CRC(40eea9d4) SHA1(60a5f5c4de716722fa2ff55dccfc5fbbd7cd02e1) )
 ROM_END
 
 
@@ -2484,6 +2619,9 @@
 
 	DISK_REGION( PCI_ID_IDE":ide:0:hdd:image" ) // Hard Drive v1.0.1  Diagnostics v3.3 / Oct 20 1998 11:44:41
 	DISK_IMAGE( "carnevi1", 0, BAD_DUMP SHA1(94532727512280930a100fe473bf3a938fe2d44f) )
+
+	ROM_REGION( 0x2000, "serial_security_pic", 0 ) // security PIC (provides game ID code and serial number)
+	ROM_LOAD( "486_carnevil.u96", 0x0000, 0x2000, CRC(40eea9d4) SHA1(60a5f5c4de716722fa2ff55dccfc5fbbd7cd02e1) )
 ROM_END
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/segag80r.cpp mame-0.224+dfsg.1/src/mame/drivers/segag80r.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/segag80r.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/segag80r.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -136,6 +136,11 @@
 #define VBEND               (0)
 #define VBSTART             (224)
 
+// Unsure whether this should be 2 or 3. It depends on how many rising clock
+// edges MEMRQ is held for, plus 1 additional cycle. Going to 3 creates
+// noticeable slowdowns in Space Fury.
+static constexpr int WAIT_STATES = 2;
+
 
 
 /*************************************
@@ -856,8 +861,8 @@
 	SPEAKER(config, "speaker").front_center();
 
 	/* sound boards */
-	astrob_sound_board(config);
-	sega_speech_board(config);
+	ASTRO_BLASTER_AUDIO(config, m_g80_audio, 0).add_route(ALL_OUTPUTS, "speech", 1.0);
+	SEGA_SPEECH_BOARD(config, "speech", 0).add_route(ALL_OUTPUTS, "speaker", 0.5);
 }
 
 
@@ -1007,19 +1012,21 @@
 	ROM_LOAD( "924a.prom-u18",  0x9000, 0x0800, CRC(120a39c7) SHA1(d8fdf97290725cf9ebddab9eeb34d7adba097394) )
 	ROM_LOAD( "925a.prom-u19",  0x9800, 0x0800, CRC(790a7f4e) SHA1(16b7b8e864a8f5f59da6bf2ad17f1e4791f34abe) )
 
-	ROM_REGION( 0x0800, "audiocpu", 0 )
+	ROM_REGION( 0x0800, "speech:cpu", 0 )
 	ROM_LOAD( "808b.speech-u7", 0x0000, 0x0800, CRC(5988c767) SHA1(3b91a8cd46aa7e714028cc40f700fea32287afb1) )
 
-	ROM_REGION( 0x4000, SEGASND_SEGASPEECH_REGION, 0 )
+	ROM_REGION( 0x0020, "speech:proms", 0 )
+	ROM_LOAD( "pr84.speech-u30",     0x0000, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* 7051, speech board addressing */
+
+	ROM_REGION( 0x4000, "speech:data", 0 )
 	ROM_LOAD( "809a.speech-u6", 0x0000, 0x0800, CRC(893f228d) SHA1(41c08210d322105f5446cfaa1258c194dd078a34) )
 	ROM_LOAD( "810.speech-u5",  0x0800, 0x0800, CRC(ff0163c5) SHA1(158a12f9bf01d25c7e98f34fce56df51d49e5a85) )
 	ROM_LOAD( "811.speech-u4",  0x1000, 0x0800, CRC(219f3978) SHA1(728edb9251f7cde237fa3b005971366a099c6342) )
 	ROM_LOAD( "812a.speech-u3", 0x1800, 0x0800, CRC(410ad0d2) SHA1(9b5f05bb64a6ecfe3543025a10c6ec67de797333) )
 
-	ROM_REGION( 0x0440, "proms", 0 ) // not dumped for this set, but believed identical
+	ROM_REGION( 0x0420, "proms", 0 ) // not dumped for this set, but believed identical
 	ROM_LOAD( "316-0806.video1-u52", 0x0000, 0x0020, CRC(358128b6) SHA1(b6b4b9ecfdcc69b45e69e7a8614153d83be4c62b) ) /* 6331 */
 	ROM_LOAD( "316-0764.cpu-u15",    0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) /* 6331, CPU board addressing */
-	ROM_LOAD( "pr84.speech-u30",     0x0420, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* 7051, speech board addressing */
 ROM_END
 
 ROM_START( astrob2 )
@@ -1045,19 +1052,21 @@
 	ROM_LOAD( "905.prom-u18",   0x9000, 0x0800, CRC(4f08f9f4) SHA1(755a825b18ed50caa7bf274a0a5c3a1b00b1c070) )
 	ROM_LOAD( "906.prom-u19",   0x9800, 0x0800, CRC(58149df1) SHA1(2bba56576a225ca47ce31a5b6dcc491546dfffec) )
 
-	ROM_REGION( 0x0800, "audiocpu", 0 )
+	ROM_REGION( 0x0800, "speech:cpu", 0 )
 	ROM_LOAD( "808b.speech-u7", 0x0000, 0x0800, CRC(5988c767) SHA1(3b91a8cd46aa7e714028cc40f700fea32287afb1) )
 
-	ROM_REGION( 0x4000, SEGASND_SEGASPEECH_REGION, 0 )
+	ROM_REGION( 0x0020, "speech:proms", 0 )
+	ROM_LOAD( "pr84.speech-u30",     0x0000, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* 7051, speech board addressing */
+
+	ROM_REGION( 0x4000, "speech:data", 0 )
 	ROM_LOAD( "809a.speech-u6", 0x0000, 0x0800, CRC(893f228d) SHA1(41c08210d322105f5446cfaa1258c194dd078a34) )
 	ROM_LOAD( "810.speech-u5",  0x0800, 0x0800, CRC(ff0163c5) SHA1(158a12f9bf01d25c7e98f34fce56df51d49e5a85) )
 	ROM_LOAD( "811.speech-u4",  0x1000, 0x0800, CRC(219f3978) SHA1(728edb9251f7cde237fa3b005971366a099c6342) )
 	ROM_LOAD( "812a.speech-u3", 0x1800, 0x0800, CRC(410ad0d2) SHA1(9b5f05bb64a6ecfe3543025a10c6ec67de797333) )
 
-	ROM_REGION( 0x0440, "proms", 0 ) // not dumped for this set, but believed identical
+	ROM_REGION( 0x0420, "proms", 0 ) // not dumped for this set, but believed identical
 	ROM_LOAD( "316-0806.video1-u52", 0x0000, 0x0020, CRC(358128b6) SHA1(b6b4b9ecfdcc69b45e69e7a8614153d83be4c62b) ) /* 6331 */
 	ROM_LOAD( "316-0764.cpu-u15",    0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) /* 6331, CPU board addressing */
-	ROM_LOAD( "pr84.speech-u30",     0x0420, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* 7051, speech board addressing */
 ROM_END
 
 ROM_START( astrob2a )
@@ -1083,19 +1092,21 @@
 	ROM_LOAD( "905.prom-u18",   0x9000, 0x0800, CRC(4f08f9f4) SHA1(755a825b18ed50caa7bf274a0a5c3a1b00b1c070) )
 	ROM_LOAD( "906.prom-u19",   0x9800, 0x0800, CRC(58149df1) SHA1(2bba56576a225ca47ce31a5b6dcc491546dfffec) )
 
-	ROM_REGION( 0x0800, "audiocpu", 0 )
+	ROM_REGION( 0x0800, "speech:cpu", 0 )
 	ROM_LOAD( "808b.speech-u7", 0x0000, 0x0800, CRC(5988c767) SHA1(3b91a8cd46aa7e714028cc40f700fea32287afb1) )
 
-	ROM_REGION( 0x4000, SEGASND_SEGASPEECH_REGION, 0 )
+	ROM_REGION( 0x0020, "speech:proms", 0 )
+	ROM_LOAD( "pr84.speech-u30",     0x0000, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* 7051, speech board addressing */
+
+	ROM_REGION( 0x4000, "speech:data", 0 )
 	ROM_LOAD( "809a.speech-u6", 0x0000, 0x0800, CRC(893f228d) SHA1(41c08210d322105f5446cfaa1258c194dd078a34) )
 	ROM_LOAD( "810.speech-u5",  0x0800, 0x0800, CRC(ff0163c5) SHA1(158a12f9bf01d25c7e98f34fce56df51d49e5a85) )
 	ROM_LOAD( "811.speech-u4",  0x1000, 0x0800, CRC(219f3978) SHA1(728edb9251f7cde237fa3b005971366a099c6342) )
 	ROM_LOAD( "812a.speech-u3", 0x1800, 0x0800, CRC(410ad0d2) SHA1(9b5f05bb64a6ecfe3543025a10c6ec67de797333) )
 
-	ROM_REGION( 0x0440, "proms", 0 )
+	ROM_REGION( 0x0420, "proms", 0 )
 	ROM_LOAD( "316-0806.video1-u52", 0x0000, 0x0020, CRC(358128b6) SHA1(b6b4b9ecfdcc69b45e69e7a8614153d83be4c62b) ) /* 6331 */
 	ROM_LOAD( "316-0764.cpu-u15",    0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) /* 6331, CPU board addressing */
-	ROM_LOAD( "pr84.speech-u30",     0x0420, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* 7051, speech board addressing */
 ROM_END
 
 ROM_START( astrob2b ) // This was dumped from 2 different PCB sets, with matching reads. Only different ROM from astrob2a is 829d.
@@ -1121,19 +1132,21 @@
 	ROM_LOAD( "905.prom-u18",   0x9000, 0x0800, CRC(4f08f9f4) SHA1(755a825b18ed50caa7bf274a0a5c3a1b00b1c070) )
 	ROM_LOAD( "906.prom-u19",   0x9800, 0x0800, CRC(58149df1) SHA1(2bba56576a225ca47ce31a5b6dcc491546dfffec) )
 
-	ROM_REGION( 0x0800, "audiocpu", 0 )
+	ROM_REGION( 0x0800, "speech:cpu", 0 )
 	ROM_LOAD( "808b.speech-u7", 0x0000, 0x0800, CRC(5988c767) SHA1(3b91a8cd46aa7e714028cc40f700fea32287afb1) )
 
-	ROM_REGION( 0x4000, SEGASND_SEGASPEECH_REGION, 0 )
+	ROM_REGION( 0x0020, "speech:proms", 0 )
+	ROM_LOAD( "pr84.speech-u30",     0x0000, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* 7051, speech board addressing */
+
+	ROM_REGION( 0x4000, "speech:data", 0 )
 	ROM_LOAD( "809a.speech-u6", 0x0000, 0x0800, CRC(893f228d) SHA1(41c08210d322105f5446cfaa1258c194dd078a34) )
 	ROM_LOAD( "810.speech-u5",  0x0800, 0x0800, CRC(ff0163c5) SHA1(158a12f9bf01d25c7e98f34fce56df51d49e5a85) )
 	ROM_LOAD( "811.speech-u4",  0x1000, 0x0800, CRC(219f3978) SHA1(728edb9251f7cde237fa3b005971366a099c6342) )
 	ROM_LOAD( "812a.speech-u3", 0x1800, 0x0800, CRC(410ad0d2) SHA1(9b5f05bb64a6ecfe3543025a10c6ec67de797333) )
 
-	ROM_REGION( 0x0440, "proms", 0 )
+	ROM_REGION( 0x0420, "proms", 0 )
 	ROM_LOAD( "316-0806.video1-u52", 0x0000, 0x0020, CRC(358128b6) SHA1(b6b4b9ecfdcc69b45e69e7a8614153d83be4c62b) ) /* 6331 */
 	ROM_LOAD( "316-0764.cpu-u15",    0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) /* 6331, CPU board addressing */
-	ROM_LOAD( "pr84.speech-u30",     0x0420, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* 7051, speech board addressing */
 ROM_END
 
 ROM_START( astrob1 )
@@ -1156,19 +1169,21 @@
 	ROM_LOAD( "851.prom-u15",   0x7800, 0x0800, CRC(3d4cf9f0) SHA1(11e996f33f3a104e50d0a54a0814ea3e07735683) )
 	ROM_LOAD( "852.prom-u16",   0x8000, 0x0800, CRC(af88a97e) SHA1(fe7993101c629b296b5da05519b0990cc2b78286) )
 
-	ROM_REGION( 0x0800, "audiocpu", 0 )
+	ROM_REGION( 0x0800, "speech:cpu", 0 )
 	ROM_LOAD( "808b.speech-u7", 0x0000, 0x0800, CRC(5988c767) SHA1(3b91a8cd46aa7e714028cc40f700fea32287afb1) )
 
-	ROM_REGION( 0x4000, SEGASND_SEGASPEECH_REGION, 0 )
+	ROM_REGION( 0x0020, "speech:proms", 0 )
+	ROM_LOAD( "pr84.speech-u30",     0x0000, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* 7051, speech board addressing */
+
+	ROM_REGION( 0x4000, "speech:data", 0 )
 	ROM_LOAD( "809a.speech-u6", 0x0000, 0x0800, CRC(893f228d) SHA1(41c08210d322105f5446cfaa1258c194dd078a34) )
 	ROM_LOAD( "810.speech-u5",  0x0800, 0x0800, CRC(ff0163c5) SHA1(158a12f9bf01d25c7e98f34fce56df51d49e5a85) )
 	ROM_LOAD( "811.speech-u4",  0x1000, 0x0800, CRC(219f3978) SHA1(728edb9251f7cde237fa3b005971366a099c6342) )
 	ROM_LOAD( "812a.speech-u3", 0x1800, 0x0800, CRC(410ad0d2) SHA1(9b5f05bb64a6ecfe3543025a10c6ec67de797333) )
 
-	ROM_REGION( 0x0440, "proms", 0 ) // not dumped for this set, but believed identical
+	ROM_REGION( 0x0420, "proms", 0 ) // not dumped for this set, but believed identical
 	ROM_LOAD( "316-0806.video1-u52", 0x0000, 0x0020, CRC(358128b6) SHA1(b6b4b9ecfdcc69b45e69e7a8614153d83be4c62b) ) /* 6331 */
 	ROM_LOAD( "316-0764.cpu-u15",    0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) /* 6331, CPU board addressing */
-	ROM_LOAD( "pr84.speech-u30",     0x0420, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* 7051, speech board addressing */
 ROM_END
 
 ROM_START( astrobg )
@@ -1191,19 +1206,21 @@
 	ROM_LOAD( "835.u15",    0x7800, 0x0800, CRC(6eeeb409) SHA1(1caf9b7ac08a4adcbf8c17f9e4b398373db706e1) )
 	ROM_LOAD( "836.u16",    0x8000, 0x0800, CRC(07ffe6dc) SHA1(70673e8266139034afa64bf980b1b9ddbf294e0f) )
 
-	ROM_REGION( 0x0800, "audiocpu", 0 )
+	ROM_REGION( 0x0800, "speech:cpu", 0 )
 	ROM_LOAD( "808b_speech_de.u07", 0x0000, 0x0800, CRC(5988c767) SHA1(3b91a8cd46aa7e714028cc40f700fea32287afb1) )
 
-	ROM_REGION( 0x4000, SEGASND_SEGASPEECH_REGION, 0 )
+	ROM_REGION( 0x0020, "speech:proms", 0 )
+	ROM_LOAD( "pr84.speech-u30",     0x0000, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* 7051, speech board addressing */
+
+	ROM_REGION( 0x4000, "speech:data", 0 )
 	ROM_LOAD( "830_speech_de.u06", 0x0000, 0x0800, CRC(2d840552) SHA1(7a2a7b54378b6cc85b8ab5c26e42266aa747c635) )
 	ROM_LOAD( "831_speech_de.u05", 0x0800, 0x0800, CRC(46b30ee4) SHA1(c9e19a9b9ebc9b3b853e79f93ad74e4ec5dfd1ae) )
 	ROM_LOAD( "832_speech_de.u04", 0x1000, 0x0800, CRC(d05280b8) SHA1(8d30b23b83b32465a8a2decd2ce9bfed24394e7e) )
 	ROM_LOAD( "833_speech_de.u03", 0x1800, 0x0800, CRC(08f11459) SHA1(da6dc2bf30b95882f95c21739ec02fc89d286a66) )
 
-	ROM_REGION( 0x0440, "proms", 0 ) // not dumped for this set, but believed identical
+	ROM_REGION( 0x0420, "proms", 0 ) // not dumped for this set, but believed identical
 	ROM_LOAD( "316-0806.video1-u52", 0x0000, 0x0020, CRC(358128b6) SHA1(b6b4b9ecfdcc69b45e69e7a8614153d83be4c62b) ) /* 6331 */
 	ROM_LOAD( "316-0764.cpu-u15",    0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) /* 6331, CPU board addressing */
-	ROM_LOAD( "pr84.speech-u30",     0x0420, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* 7051, speech board addressing */
 ROM_END
 
 ROM_START( 005 )
@@ -1526,8 +1543,36 @@
  *
  *************************************/
 
+void segag80r_state::init_waitstates()
+{
+	address_space &pgmspace = m_maincpu->space(AS_PROGRAM);
+	address_space &opspace = m_maincpu->space(AS_OPCODES);
+
+	pgmspace.install_read_tap(0x0000, 0xffff, "program_waitstate_r",[this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+			m_maincpu->adjust_icount(-WAIT_STATES);
+		return data;
+	});
+	pgmspace.install_write_tap(0x0000, 0xffff, "program_waitstate_w",[this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+			m_maincpu->adjust_icount(-WAIT_STATES);
+		return data;
+	});
+
+	opspace.install_read_tap(0x0000, 0xffff, "opcodes_waitstate_r",[this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+			m_maincpu->adjust_icount(-WAIT_STATES);
+		return data;
+	});
+}
+
 void segag80r_state::init_astrob()
 {
+	init_waitstates();
+
 	address_space &iospace = m_maincpu->space(AS_IO);
 
 	/* configure the 315-0062 security chip */
@@ -1537,19 +1582,18 @@
 	m_background_pcb = G80_BACKGROUND_NONE;
 
 	/* install speech board */
-	iospace.install_write_handler(0x38, 0x38, write8smo_delegate(*m_speech, FUNC(speech_sound_device::data_w)));
-	iospace.install_write_handler(0x3b, 0x3b, write8smo_delegate(*m_speech, FUNC(speech_sound_device::control_w)));
+	iospace.install_write_handler(0x38, 0x38, write8smo_delegate(*m_speech, FUNC(sega_speech_device::data_w)));
+	iospace.install_write_handler(0x3b, 0x3b, write8smo_delegate(*m_speech, FUNC(sega_speech_device::control_w)));
 
 	/* install Astro Blaster sound board */
-	iospace.install_write_handler(0x3e, 0x3f, write8sm_delegate(*this, FUNC(segag80r_state::astrob_sound_w)));
-
-	save_item(NAME(m_sound_state));
-	save_item(NAME(m_sound_rate));
+	iospace.install_write_handler(0x3e, 0x3f, write8sm_delegate(*m_g80_audio, FUNC(segag80_audio_device::write)));
 }
 
 
 void segag80r_state::init_005()
 {
+	init_waitstates();
+
 	/* configure the 315-0070 security chip */
 	m_decrypt = segag80_security(70);
 
@@ -1566,6 +1610,8 @@
 
 void segag80r_state::init_spaceod()
 {
+	init_waitstates();
+
 	address_space &iospace = m_maincpu->space(AS_IO);
 
 	/* configure the 315-0063 security chip */
@@ -1590,6 +1636,8 @@
 
 void segag80r_state::init_monsterb()
 {
+	init_waitstates();
+
 	address_space &iospace = m_maincpu->space(AS_IO);
 	address_space &pgmspace = m_maincpu->space(AS_PROGRAM);
 
@@ -1611,6 +1659,8 @@
 
 void segag80r_state::init_monster2()
 {
+	init_waitstates();
+
 	address_space &iospace = m_maincpu->space(AS_IO);
 	address_space &pgmspace = m_maincpu->space(AS_PROGRAM);
 
@@ -1633,6 +1683,8 @@
 
 void segag80r_state::init_pignewt()
 {
+	init_waitstates();
+
 	address_space &iospace = m_maincpu->space(AS_IO);
 	address_space &pgmspace = m_maincpu->space(AS_PROGRAM);
 
@@ -1657,6 +1709,8 @@
 
 void segag80r_state::init_sindbadm()
 {
+	init_waitstates();
+
 	address_space &iospace = m_maincpu->space(AS_IO);
 	address_space &pgmspace = m_maincpu->space(AS_PROGRAM);
 
@@ -1681,12 +1735,12 @@
 
 //    YEAR, NAME,      PARENT,   MACHINE,  INPUT,    CLASS,          INIT,          MONITOR,COMPANY,FULLNAME,FLAGS
 /* basic G-80 system with: CPU board, PROM board, Video I board, custom sound boards */
-GAME( 1981, astrob,    0,        astrob,   astrob,   segag80r_state, init_astrob,   ROT270, "Sega", "Astro Blaster (version 3)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, astrob2,   astrob,   astrob,   astrob2,  segag80r_state, init_astrob,   ROT270, "Sega", "Astro Blaster (version 2)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, astrob2a,  astrob,   astrob,   astrob2,  segag80r_state, init_astrob,   ROT270, "Sega", "Astro Blaster (version 2a)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, astrob2b,  astrob,   astrob,   astrob2,  segag80r_state, init_astrob,   ROT270, "Sega", "Astro Blaster (version 2b)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, astrob1,   astrob,   astrob,   astrob,   segag80r_state, init_astrob,   ROT270, "Sega", "Astro Blaster (version 1)", MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // instant death if you start game with 1 credit, protection?, bad dump?
-GAME( 1981, astrobg,   astrob,   astrob,   astrob,   segag80r_state, init_astrob,   ROT270, "Sega", "Astro Blaster (German)", MACHINE_IMPERFECT_SOUND )
+GAME( 1981, astrob,    0,        astrob,   astrob,   segag80r_state, init_astrob,   ROT270, "Sega", "Astro Blaster (version 3)", 0 )
+GAME( 1981, astrob2,   astrob,   astrob,   astrob2,  segag80r_state, init_astrob,   ROT270, "Sega", "Astro Blaster (version 2)", 0 )
+GAME( 1981, astrob2a,  astrob,   astrob,   astrob2,  segag80r_state, init_astrob,   ROT270, "Sega", "Astro Blaster (version 2a)", 0 )
+GAME( 1981, astrob2b,  astrob,   astrob,   astrob2,  segag80r_state, init_astrob,   ROT270, "Sega", "Astro Blaster (version 2b)", 0 )
+GAME( 1981, astrob1,   astrob,   astrob,   astrob,   segag80r_state, init_astrob,   ROT270, "Sega", "Astro Blaster (version 1)", 0 | MACHINE_NOT_WORKING ) // instant death if you start game with 1 credit, protection?, bad dump?
+GAME( 1981, astrobg,   astrob,   astrob,   astrob,   segag80r_state, init_astrob,   ROT270, "Sega", "Astro Blaster (German)", 0 )
 GAME( 1981, 005,       0,        sega005,  005,      segag80r_state, init_005,      ROT270, "Sega", "005", MACHINE_IMPERFECT_SOUND )
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/segag80v.cpp mame-0.224+dfsg.1/src/mame/drivers/segag80v.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/segag80v.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/segag80v.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -135,6 +135,7 @@
 ***************************************************************************/
 
 #include "emu.h"
+#include "audio/segag80.h"
 #include "includes/segag80v.h"
 #include "machine/segag80.h"
 
@@ -143,15 +144,10 @@
 #include "speaker.h"
 
 
-/*************************************
- *
- *  Constants
- *
- *************************************/
-
-#define CPU_CLOCK           8000000     /* not used when video boards are connected */
-#define VIDEO_CLOCK         15468480
-
+// Unsure whether this should be 2 or 3. It depends on how many rising clock
+// edges MEMRQ is held for, plus 1 additional cycle. Going to 3 creates
+// noticeable slowdowns in Space Fury.
+static constexpr int WAIT_STATES = 2;
 
 
 /*************************************
@@ -160,10 +156,10 @@
  *
  *************************************/
 
-INPUT_CHANGED_MEMBER(segag80v_state::service_switch)
+WRITE_LINE_MEMBER(segag80v_state::service_switch_w)
 {
-	/* pressing the service switch sends an NMI */
-	if (newval)
+	// pressing the service switch sends an NMI
+	if (state)
 		m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
 }
 
@@ -172,13 +168,15 @@
 {
 	m_scrambled_write_pc = 0xffff;
 
-	/* register for save states */
 	save_item(NAME(m_mult_data));
 	save_item(NAME(m_mult_result));
 	save_item(NAME(m_spinner_select));
 	save_item(NAME(m_spinner_sign));
 	save_item(NAME(m_spinner_count));
 	save_item(NAME(m_scrambled_write_pc));
+	save_item(NAME(m_coin_ff_state));
+	save_item(NAME(m_coin_last_state));
+	save_item(NAME(m_edgint_ff_state));
 }
 
 
@@ -189,10 +187,10 @@
  *
  *************************************/
 
-uint8_t segag80v_state::g80v_opcode_r(offs_t offset)
+u8 segag80v_state::opcode_r(offs_t offset)
 {
 	// opcodes themselves are not scrambled
-	uint8_t op = m_maincpu->space(AS_PROGRAM).read_byte(offset);
+	u8 op = m_maincpu->space(AS_PROGRAM).read_byte(offset);
 
 	// writes via opcode $32 (LD $(XXYY),A) get scrambled
 	if (!machine().side_effects_disabled())
@@ -209,17 +207,21 @@
 	offs_t pc = m_scrambled_write_pc;
 	m_scrambled_write_pc = 0xffff;
 
-	/* munge the low byte of the address */
+	// munge the low byte of the address
 	return (offset & 0xff00) | (*m_decrypt)(pc, offset & 0xff);
 }
 
-void segag80v_state::mainram_w(offs_t offset, uint8_t data)
+void segag80v_state::mainram_w(offs_t offset, u8 data)
 {
 	m_mainram[decrypt_offset(offset)] = data;
 }
 
-void segag80v_state::usb_ram_w(offs_t offset, uint8_t data){ m_usb->ram_w(decrypt_offset(offset), data); }
-void segag80v_state::vectorram_w(offs_t offset, uint8_t data)
+void segag80v_state::usb_ram_w(offs_t offset, u8 data)
+{
+	m_usb->ram_w(decrypt_offset(offset), data);
+}
+
+void segag80v_state::vectorram_w(offs_t offset, u8 data)
 {
 	m_vectorram[decrypt_offset(offset)] = data;
 }
@@ -232,28 +234,50 @@
  *
  *************************************/
 
-inline uint8_t segag80v_state::demangle(uint8_t d7d6, uint8_t d5d4, uint8_t d3d2, uint8_t d1d0)
-{
-	return ((d7d6 << 7) & 0x80) | ((d7d6 << 2) & 0x40) |
-			((d5d4 << 5) & 0x20) | ((d5d4 << 0) & 0x10) |
-			((d3d2 << 3) & 0x08) | ((d3d2 >> 2) & 0x04) |
-			((d1d0 << 1) & 0x02) | ((d1d0 >> 4) & 0x01);
-}
-
+//
+// I/O port mapping
+//
+//        +--------------- Offset-----------------+
+//        |    0    |    1    |    2    |    3    |
+//   +----+---------+---------+---------+---------+
+//   | D7 |  COINA  |   n/c   |   n/c   |   n/c   |
+//   | D6 |  COINB  |  P1.13  |  P1.14  |   n/c   |
+//   | D5 | SERVICE |  P1.15  |  P1.16  |  P1.17  |
+//   | D4 |  P1.18  |  P1.19  |  P1.20  |  P1.21  |
+//   | D3 |  SW1.8  |  SW1.7  |  SW1.6  |  SW1.5  |
+//   | D2 |  SW1.4  |  SW1.3  |  SW1.2  |  SW1.1  |
+//   | D1 |  SW2.8  |  SW2.7  |  SW2.6  |  SW2.5  |
+//   | D0 |  SW2.4  |  SW2.3  |  SW2.2  |  SW2.1  |
+//   +----+---------+---------+---------+---------+
+//
+//   Notes:
+//      COINA, COINB are gated to be impulses, and signal an INT
+//      SERVICE is gated to be an impulse, but does not signal
+//      P1.13 = DRAW signal from XY board
+//
+// The input ports are mapped to how the schematics show them, so
+// to achieve the matrix above, they must be demangled.
+//
+
+u8 segag80v_state::mangled_ports_r(offs_t offset)
+{
+	u8 d7d6 = m_d7d6->read();
+	u8 d5d4 = m_d5d4->read();
+	u8 d3d2 = m_d3d2->read();
+	u8 d1d0 = m_d1d0->read();
+
+	offset &= 3;
+	u8 result =
+		(BIT(d7d6, offset + 0) << 7) |
+		(BIT(d7d6, offset + 4) << 6) |
+		(BIT(d5d4, offset + 0) << 5) |
+		(BIT(d5d4, offset + 4) << 4) |
+		(BIT(d3d2, offset + 0) << 3) |
+		(BIT(d3d2, offset + 4) << 2) |
+		(BIT(d1d0, offset + 0) << 1) |
+		(BIT(d1d0, offset + 4) << 0);
 
-uint8_t segag80v_state::mangled_ports_r(offs_t offset)
-{
-	/* The input ports are odd. Neighboring lines are read via a mux chip  */
-	/* one bit at a time. This means that one bank of DIP switches will be */
-	/* read as two bits from each of 4 ports. For this reason, the input   */
-	/* ports have been organized logically, and are demangled at runtime.  */
-	/* 4 input ports each provide 8 bits of information. */
-	uint8_t d7d6 = ioport("D7D6")->read();
-	uint8_t d5d4 = ioport("D5D4")->read();
-	uint8_t d3d2 = ioport("D3D2")->read();
-	uint8_t d1d0 = ioport("D1D0")->read();
-	int shift = offset & 3;
-	return demangle(d7d6 >> shift, d5d4 >> shift, d3d2 >> shift, d1d0 >> shift);
+	return result;
 }
 
 
@@ -264,28 +288,24 @@
  *
  *************************************/
 
-void segag80v_state::spinner_select_w(uint8_t data)
+void segag80v_state::spinner_select_w(u8 data)
 {
 	m_spinner_select = data;
 }
 
 
-uint8_t segag80v_state::spinner_input_r()
+u8 segag80v_state::spinner_input_r()
 {
-	int8_t delta;
-
 	if (m_spinner_select & 1)
-		return ioport("FC")->read();
-
-/*
- * The values returned are always increasing.  That is, regardless of whether
- * you turn the spinner left or right, the self-test should always show the
- * number as increasing. The direction is only reflected in the least
- * significant bit.
- */
+		return m_fc->read();
 
-	/* I'm sure this can be further simplified ;-) BW */
-	delta = ioport("SPINNER")->read();
+	//
+	// The values returned are always increasing.  That is, regardless of whether
+	// you turn the spinner left or right, the self-test should always show the
+	// number as increasing. The direction is only reflected in the least
+	// significant bit.
+	//
+	s8 delta = m_spinner->read();
 	if (delta != 0)
 	{
 		m_spinner_sign = (delta >> 7) & 1;
@@ -304,32 +324,33 @@
 
 READ_LINE_MEMBER(segag80v_state::elim4_joint_coin_r)
 {
-	return (ioport("COINS")->read() & 0xf) != 0xf;
+	return (m_coins->read() & 0xf) != 0xf;
 }
 
 
-uint8_t segag80v_state::elim4_input_r()
+u8 segag80v_state::elim4_input_r()
 {
-	uint8_t result = 0;
+	u8 result = 0;
 
-	/* bit 3 enables demux */
-	if (m_spinner_select & 8)
+	// bit 3 enables demux
+	if (BIT(m_spinner_select, 3) != 0)
 	{
-		/* Demux bit 0-2. Only 6 and 7 are connected */
+		// Demux bit 0-2. Only 6 and 7 are connected
 		switch (m_spinner_select & 7)
 		{
 			case 6:
-				/* player 3 & 4 controls */
-				result = ioport("FC")->read();
+				// player 3 & 4 controls
+				result = m_fc->read();
 				break;
+
 			case 7:
-				/* the 4 coin inputs */
-				result = ioport("COINS")->read();
+				// the 4 coin inputs
+				result = m_coins->read();
 				break;
 		}
 	}
 
-	/* LS240 has inverting outputs */
+	// LS240 has inverting outputs
 	return (result ^ 0xff);
 }
 
@@ -341,7 +362,7 @@
  *
  *************************************/
 
-void segag80v_state::multiply_w(offs_t offset, uint8_t data)
+void segag80v_state::multiply_w(offs_t offset, u8 data)
 {
 	m_mult_data[offset] = data;
 	if (offset == 1)
@@ -349,9 +370,9 @@
 }
 
 
-uint8_t segag80v_state::multiply_r()
+u8 segag80v_state::multiply_r()
 {
-	uint8_t result = m_mult_result;
+	u8 result = m_mult_result;
 	m_mult_result >>= 8;
 	return result;
 }
@@ -364,21 +385,76 @@
  *
  *************************************/
 
-void segag80v_state::coin_count_w(uint8_t data)
+void segag80v_state::coin_count_w(u8 data)
 {
 	machine().bookkeeping().coin_counter_w(0, (data >> 7) & 1);
 	machine().bookkeeping().coin_counter_w(1, (data >> 6) & 1);
 }
 
 
-void segag80v_state::unknown_w(uint8_t data)
+void segag80v_state::unknown_w(u8 data)
 {
-	/* writing an 0x04 here enables interrupts */
-	/* some games write 0x00/0x01 here as well */
+	// writing an 0x04 here enables interrupts
+	// some games write 0x00/0x01 here as well
 	if (data != 0x00 && data != 0x01 && data != 0x04)
 		osd_printf_debug("%04X:unknown_w = %02X\n", m_maincpu->pc(), data);
 }
 
+READ_LINE_MEMBER(segag80v_state::draw_r)
+{
+	return (machine().scheduler().time() < m_draw_end_time);
+}
+
+
+
+/*************************************
+ *
+ *  Main CPU interrupts
+ *
+ *************************************/
+
+void segag80v_state::vblank_callback(screen_device &screen, bool state)
+{
+	if (!state)
+	{
+		m_edgint_ff_state = 1;
+		update_int();
+	}
+}
+
+void segag80v_state::update_int()
+{
+	//
+	// IRQ signal comes from multiple sources:
+	//    * XINT signal, which is a combination of:
+	//        - COINA impulse, clocks an LS74, cleared by INTCL signal
+	//        - COINB impulse, clocks an LS74, cleared by INTCL signal
+	//        - SERVICE impulse
+	//    * /EDGINT signal from vector board, clocks an LS74, cleared by INTCL signal
+	//        - signal comes from 15468480 crystal, divided by 3, and then by 0x1f788
+	//    * /INT signal from ???
+	//
+
+	if (m_coin_ff_state != 0 || m_edgint_ff_state != 0)
+		m_maincpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE);
+	else
+		m_maincpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
+
+	// SERVICE coin doesn't have a flip-flop; it's instantaneous
+	m_coin_ff_state &= ~0x04;
+}
+
+WRITE_LINE_MEMBER(segag80v_state::irq_ack_w)
+{
+	if (state)
+	{
+		// INTCL signal clears both coin flip-flops and EDGINT flip-flop
+		m_coin_ff_state = 0;
+		m_edgint_ff_state = 0;
+		update_int();
+	}
+}
+
 
 
 /*************************************
@@ -387,26 +463,26 @@
  *
  *************************************/
 
-/* complete memory map derived from schematics */
+// complete memory map derived from schematics
 void segag80v_state::main_map(address_map &map)
 {
-	map(0x0000, 0x07ff).rom();     /* CPU board ROM */
-	map(0x0800, 0xbfff).rom();     /* PROM board ROM area */
+	map(0x0000, 0x07ff).rom();     // CPU board ROM
+	map(0x0800, 0xbfff).rom();     // PROM board ROM area
 	map(0xc800, 0xcfff).ram().w(FUNC(segag80v_state::mainram_w)).share("mainram");
 	map(0xe000, 0xefff).ram().w(FUNC(segag80v_state::vectorram_w)).share("vectorram");
 }
 
 void segag80v_state::opcodes_map(address_map &map)
 {
-	map(0x0000, 0xffff).r(FUNC(segag80v_state::g80v_opcode_r));
+	map(0x0000, 0xffff).r(FUNC(segag80v_state::opcode_r));
 }
 
 
-/* complete memory map derived from schematics */
+// complete memory map derived from schematics
 void segag80v_state::main_portmap(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0xbc, 0xbc); /* .r(FUNC(segag80v_state::)); ??? */
+	map(0xbc, 0xbc); // .r(FUNC(segag80v_state::)); ???
 	map(0xbd, 0xbe).w(FUNC(segag80v_state::multiply_w));
 	map(0xbe, 0xbe).r(FUNC(segag80v_state::multiply_r));
 	map(0xbf, 0xbf).w(FUNC(segag80v_state::unknown_w));
@@ -426,24 +502,24 @@
 
 static INPUT_PORTS_START( g80v_generic )
 	PORT_START("D7D6")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(3)  /* P1.5 */
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )                 /* n/c */
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )                 /* n/c */
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )                 /* n/c */
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(3)  /* P1.8 */
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )                 /* P1.13 */
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )                 /* P1.14 */
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )                 /* n/c */
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_WRITE_LINE_MEMBER(segag80v_state, coin_w<0>) // P1.5
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )                 // n/c
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )                 // n/c
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )                 // n/c
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_WRITE_LINE_MEMBER(segag80v_state, coin_w<1>) // P1.8
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(segag80v_state, draw_r)   // P1.13
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )                 // P1.14
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )                 // n/c
 
 	PORT_START("D5D4")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 )               /* P1.10 */
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )                 /* P1.15 */
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )                 /* P1.16 */
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )                 /* P1.17 */
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED )                 /* P1.18 */
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )                 /* P1.19 */
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )                 /* P1.20 */
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )                 /* P1.21 */
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_WRITE_LINE_MEMBER(segag80v_state, coin_w<2>) // P1.10
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )                 // P1.15
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )                 // P1.16
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )                 // P1.17
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNUSED )                 // P1.18
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START2 )                 // P1.19
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )                 // P1.20
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )                 // P1.21
 
 	PORT_START("D3D2")
 	PORT_DIPUNUSED_DIPLOC( 0x01, 0x01, "SW1:8" )
@@ -492,17 +568,17 @@
 	PORT_DIPSETTING(    0x80, DEF_STR( 1C_6C ))
 
 	PORT_START("FC")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )                /* P1.23 */
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )                /* P1.24 */
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )                /* P1.25 */
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )                /* P1.26 */
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )                /* P1.27 */
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED )                /* P1.28 */
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )                /* P1.29 */
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )                /* P1.30 */
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED )                // P1.23
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_UNUSED )                // P1.24
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_UNUSED )                // P1.25
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )                // P1.26
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_UNUSED )                // P1.27
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNUSED )                // P1.28
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED )                // P1.29
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNUSED )                // P1.30
 
 	PORT_START("SERVICESW")
-	PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_HIGH ) PORT_CHANGED_MEMBER(DEVICE_SELF, segag80v_state,service_switch, 0)
+	PORT_SERVICE_NO_TOGGLE( 0x01, IP_ACTIVE_HIGH ) PORT_WRITE_LINE_MEMBER(segag80v_state, service_switch_w)
 INPUT_PORTS_END
 
 
@@ -714,8 +790,8 @@
 	PORT_DIPSETTING(    0x40, "30000" )
 
 	PORT_MODIFY("D5D4")
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )                 /* P1.15 */
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )                 /* P1.19 */
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )                 // P1.15
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )                 // P1.19
 
 	PORT_MODIFY("FC")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
@@ -755,8 +831,8 @@
 	PORT_DIPSETTING(    0x40, "30000" )
 
 	PORT_MODIFY("D5D4")
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )                 /* P1.15 */
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )                 /* P1.19 */
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )                 // P1.15
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )                 // P1.19
 
 	PORT_MODIFY("FC")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_START1 )
@@ -796,8 +872,8 @@
 	PORT_DIPSETTING(    0xc0, "40000" )
 
 	PORT_MODIFY("D5D4")
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )                 /* P1.15 */
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )                 /* P1.19 */
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )                 // P1.15
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )                 // P1.19
 
 
 	PORT_MODIFY("FC")
@@ -816,161 +892,65 @@
 
 /*************************************
  *
- *  Eliminator sound interfaces
- *
- *************************************/
-
-static const char *const elim_sample_names[] =
-{
-	"*elim2",
-	"elim1",
-	"elim2",
-	"elim3",
-	"elim4",
-	"elim5",
-	"elim6",
-	"elim7",
-	"elim8",
-	"elim9",
-	"elim10",
-	"elim11",
-	"elim12",
-	nullptr   /* end of array */
-};
-
-
-/*************************************
- *
- *  Space Fury sound interfaces
- *
- *************************************/
-
-static const char *const spacfury_sample_names[] =
-{
-	"*spacfury",
-	/* Sound samples */
-	"sfury1",
-	"sfury2",
-	"sfury3",
-	"sfury4",
-	"sfury5",
-	"sfury6",
-	"sfury7",
-	"sfury8",
-	"sfury9",
-	"sfury10",
-	nullptr   /* end of array */
-};
-
-/*************************************
- *
- *  Zektor sound interfaces
- *
- *************************************/
-
-static const char *const zektor_sample_names[] =
-{
-	"*zektor",
-	"elim1",  /*  0 fireball */
-	"elim2",  /*  1 bounce */
-	"elim3",  /*  2 Skitter */
-	"elim4",  /*  3 Eliminator */
-	"elim5",  /*  4 Electron */
-	"elim6",  /*  5 fire */
-	"elim7",  /*  6 thrust */
-	"elim8",  /*  7 Electron */
-	"elim9",  /*  8 small explosion */
-	"elim10", /*  9 med explosion */
-	"elim11", /* 10 big explosion */
-	nullptr
-};
-
-
-/*************************************
- *
  *  Machine drivers
  *
  *************************************/
 
 void segag80v_state::g80v_base(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	Z80(config, m_maincpu, VIDEO_CLOCK/4);
 	m_maincpu->set_addrmap(AS_PROGRAM, &segag80v_state::main_map);
 	m_maincpu->set_addrmap(AS_OPCODES, &segag80v_state::opcodes_map);
 	m_maincpu->set_addrmap(AS_IO, &segag80v_state::main_portmap);
-	m_maincpu->set_vblank_int("screen", FUNC(segag80v_state::irq0_line_hold));
+	m_maincpu->irqack_cb().set(FUNC(segag80v_state::irq_ack_w));
+//  m_maincpu->set_vblank_int("screen", FUNC(segag80v_state::irq0_line_hold));
 
-	/* video hardware */
+	// video hardware
 	SCREEN(config, m_screen, SCREEN_TYPE_VECTOR);
 	m_screen->set_refresh_hz(40);
 	m_screen->set_size(400, 300);
 	m_screen->set_visarea(512, 1536, 640-32, 1408+32);
 	m_screen->set_screen_update(FUNC(segag80v_state::screen_update_segag80v));
+	m_screen->register_vblank_callback(vblank_state_delegate(&segag80v_state::vblank_callback, this));
 
 	VECTOR(config, m_vector);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "speaker").front_center();
 }
 
 void segag80v_state::elim2(machine_config &config)
 {
 	g80v_base(config);
-
-	/* custom sound board */
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(8);
-	m_samples->set_samples_names(elim_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "speaker", 1.0);
+	ELIMINATOR_AUDIO(config, m_g80_audio, 0).add_route(ALL_OUTPUTS, "speaker", 1.0);
 }
 
 void segag80v_state::spacfury(machine_config &config)
 {
 	g80v_base(config);
-
-	/* custom sound board */
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(8);
-	m_samples->set_samples_names(spacfury_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "speaker", 0.1);
-
-	/* speech board */
-	sega_speech_board(config);
+	SPACE_FURY_AUDIO(config, m_g80_audio, 0).add_route(ALL_OUTPUTS, "speech", 1.0);
+	SEGA_SPEECH_BOARD(config, "speech", 0).add_route(ALL_OUTPUTS, "speaker", 1.0);
 }
 
 void segag80v_state::zektor(machine_config &config)
 {
 	g80v_base(config);
-
-	/* custom sound board */
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(8);
-	m_samples->set_samples_names(zektor_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "speaker", 0.1);
-
-	AY8912(config, m_aysnd, VIDEO_CLOCK/4/2).add_route(ALL_OUTPUTS, "speaker", 0.33);
-
-	/* speech board */
-	sega_speech_board(config);
+	ZEKTOR_AUDIO(config, m_g80_audio, 0).add_route(ALL_OUTPUTS, "speech", 0.7);
+	SEGA_SPEECH_BOARD(config, "speech", 0).add_route(ALL_OUTPUTS, "speaker", 1.0);
 }
 
-
 void segag80v_state::tacscan(machine_config &config)
 {
 	g80v_base(config);
-
-	/* universal sound board */
 	SEGAUSB(config, m_usb, 0, m_maincpu).add_route(ALL_OUTPUTS, "speaker", 1.0);
 }
 
-
 void segag80v_state::startrek(machine_config &config)
 {
-	tacscan(config);
-
-	/* speech board */
-	sega_speech_board(config);
+	g80v_base(config);
+	SEGAUSB(config, m_usb, 0, m_maincpu).add_route(ALL_OUTPUTS, "speech", 1.0);
+	SEGA_SPEECH_BOARD(config, "speech", 0).add_route(ALL_OUTPUTS, "speaker", 1.0);
 }
 
 
@@ -999,8 +979,8 @@
 	ROM_LOAD( "1345.prom-u13", 0x6800, 0x0800, CRC(40597a92) SHA1(ee1ae2b424c38b40d2cbeda4aba3328e6d3f9c81) )
 
 	ROM_REGION( 0x0420, "proms", 0 )
-	ROM_LOAD( "s-c.xyt-u39",   0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) )   /* sine table */
-	ROM_LOAD( "pr-82.cpu-u15", 0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) )   /* CPU board addressing */
+	ROM_LOAD( "s-c.xyt-u39",   0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) )   // sine table
+	ROM_LOAD( "pr-82.cpu-u15", 0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) )   // CPU board addressing
 ROM_END
 
 ROM_START( elim2a )
@@ -1021,8 +1001,8 @@
 	ROM_LOAD( "1170a.prom-u13", 0x6800, 0x0800, CRC(8cdacd35) SHA1(f24f8a74cb4b8452ddbd42e61d3b0366bbee7f98) )
 
 	ROM_REGION( 0x0420, "proms", 0 )
-	ROM_LOAD( "s-c.xyt-u39",    0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) )  /* sine table */
-	ROM_LOAD( "pr-82.cpu-u15",  0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) )  /* CPU board addressing */
+	ROM_LOAD( "s-c.xyt-u39",    0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) )  // sine table
+	ROM_LOAD( "pr-82.cpu-u15",  0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) )  // CPU board addressing
 ROM_END
 
 ROM_START( elim2c )
@@ -1043,8 +1023,8 @@
 	ROM_LOAD( "1212.prom-u13", 0x6800, 0x0800, CRC(152cf376) SHA1(56c3141598b8bac81e85b1fc7052fdd19cd95609) )
 
 	ROM_REGION( 0x0420, "proms", 0 )
-	ROM_LOAD( "s-c.xyt-u39",   0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) )   /* sine table */
-	ROM_LOAD( "pr-82.cpu-u15", 0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) )   /* CPU board addressing */
+	ROM_LOAD( "s-c.xyt-u39",   0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) )   // sine table
+	ROM_LOAD( "pr-82.cpu-u15", 0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) )   // CPU board addressing
 ROM_END
 
 ROM_START( elim4 )
@@ -1066,8 +1046,8 @@
 	ROM_LOAD( "1360.prom-u14", 0x7000, 0x0800, CRC(96d48238) SHA1(76a7b49081cd2d0dd1976077aa66b6d5ae5b2b43) )
 
 	ROM_REGION( 0x0420, "proms", 0 )
-	ROM_LOAD( "s-c.xyt-u39",   0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) )   /* sine table */
-	ROM_LOAD( "pr-82.cpu-u15", 0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) )   /* CPU board addressing */
+	ROM_LOAD( "s-c.xyt-u39",   0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) )   // sine table
+	ROM_LOAD( "pr-82.cpu-u15", 0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) )   // CPU board addressing
 ROM_END
 
 ROM_START( elim4p )
@@ -1089,12 +1069,12 @@
 	ROM_LOAD( "swe.prom-u14",  0x7000, 0x0800, CRC(ec4cc343) SHA1(00e107eaf530ce6bec2afffd7d7bedd7763cfb17) )
 
 	ROM_REGION( 0x0420, "proms", 0 )
-	ROM_LOAD( "s-c.xyt-u39",   0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) )   /* sine table */
-	ROM_LOAD( "pr-82.cpu-u15", 0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) )   /* CPU board addressing */
+	ROM_LOAD( "s-c.xyt-u39",   0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) )   // sine table
+	ROM_LOAD( "pr-82.cpu-u15", 0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) )   // CPU board addressing
 ROM_END
 
 
-ROM_START( spacfury ) /* Revision C */
+ROM_START( spacfury ) // Revision C
 	ROM_REGION( 0xc000, "maincpu", 0 )
 	ROM_LOAD( "969c.cpu-u25",    0x0000, 0x0800, CRC(411207f2) SHA1(2a082be4052b5d8f365abd0a51ea805d270d1189) )
 	ROM_LOAD( "960c.prom-u1",    0x0800, 0x0800, CRC(d071ab7e) SHA1(c7d2429e4fa77988d7ac62bc68f876ffb7467838) )
@@ -1107,21 +1087,23 @@
 	ROM_LOAD( "967c.prom-u8",    0x4000, 0x0800, CRC(330f0751) SHA1(07ae52fdbfa2cc326f88dc76c3dc8e145b592863) )
 	ROM_LOAD( "968c.prom-u9",    0x4800, 0x0800, CRC(8366eadb) SHA1(8e4cb30a730237da2e933370faf5eaa1a41cacbf) )
 
-	ROM_REGION( 0x0800, "audiocpu", 0 )
+	ROM_REGION( 0x0800, "speech:cpu", 0 )
 	ROM_LOAD( "808c.speech-u7",  0x0000, 0x0800, CRC(b779884b) SHA1(ac07e99717a1f51b79f3e43a5d873ebfa0559320) )
 
-	ROM_REGION( 0x4000, SEGASND_SEGASPEECH_REGION, 0 )
+	ROM_REGION( 0x0020, "speech:proms", 0 )
+	ROM_LOAD( "6331.speech-u30", 0x0000, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) // speech board addressing
+
+	ROM_REGION( 0x4000, "speech:data", 0 )
 	ROM_LOAD( "970c.speech-u6",  0x0000, 0x1000, CRC(979d8535) SHA1(1ed097e563319ca6d2b7df9875ce7ee921eae468) )
 	ROM_LOAD( "971c.speech-u5",  0x1000, 0x1000, CRC(022dbd32) SHA1(4e0504b5ccc28094078912673c49571cf83804ab) )
 	ROM_LOAD( "972c.speech-u4",  0x2000, 0x1000, CRC(fad9346d) SHA1(784e5ab0fb00235cfd733c502baf23960923504f) )
 
-	ROM_REGION( 0x0440, "proms", 0 )
-	ROM_LOAD( "s-c.xyt-u39",     0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) ) /* sine table */
-	ROM_LOAD( "pr-82.cpu-u15",   0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) /* CPU board addressing */
-	ROM_LOAD( "6331.speech-u30", 0x0420, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* speech board addressing */
+	ROM_REGION( 0x0420, "proms", 0 )
+	ROM_LOAD( "s-c.xyt-u39",     0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) ) // sine table
+	ROM_LOAD( "pr-82.cpu-u15",   0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) // CPU board addressing
 ROM_END
 
-ROM_START( spacfurya ) /* Revision A */
+ROM_START( spacfurya ) // Revision A
 	ROM_REGION( 0xc000, "maincpu", 0 )
 	ROM_LOAD( "969a.cpu-u25",    0x0000, 0x0800, CRC(896a615c) SHA1(542386196eca9fd822e36508e173201ee8a962ed) )
 	ROM_LOAD( "960a.prom-u1",    0x0800, 0x0800, CRC(e1ea7964) SHA1(9c84c525973fcf1437b062d98195272723249d02) )
@@ -1134,21 +1116,23 @@
 	ROM_LOAD( "967a.prom-u8",    0x4000, 0x0800, CRC(d60f667d) SHA1(821271ec1918e22ed29a5b1f4b0182765ef5ba10) )
 	ROM_LOAD( "968a.prom-u9",    0x4800, 0x0800, CRC(aea85b6a) SHA1(8778ff0be34cd4fd5b8f6f76c64bfca68d4d240e) )
 
-	ROM_REGION( 0x0800, "audiocpu", 0 )
+	ROM_REGION( 0x0800, "speech:cpu", 0 )
 	ROM_LOAD( "808a.speech-u7",  0x0000, 0x0800, CRC(5988c767) SHA1(3b91a8cd46aa7e714028cc40f700fea32287afb1) )
 
-	ROM_REGION( 0x4000, SEGASND_SEGASPEECH_REGION, 0 )
+	ROM_REGION( 0x0020, "speech:proms", 0 )
+	ROM_LOAD( "6331.speech-u30", 0x0000, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) // speech board addressing
+
+	ROM_REGION( 0x4000, "speech:data", 0 )
 	ROM_LOAD( "970.speech-u6",   0x0000, 0x1000, CRC(f3b47b36) SHA1(6ae0b627349664140a7f70799645b368e452d69c) )
 	ROM_LOAD( "971.speech-u5",   0x1000, 0x1000, CRC(e72bbe88) SHA1(efadf8aa448c289cf4d0cf1831255b9ac60820f2) )
 	ROM_LOAD( "972.speech-u4",   0x2000, 0x1000, CRC(8b3da539) SHA1(3a0c4af96a2116fc668a340534582776b2018663) )
 
-	ROM_REGION( 0x0440, "proms", 0 )
-	ROM_LOAD( "s-c.xyt-u39",     0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) ) /* sine table */
-	ROM_LOAD( "pr-82.cpu-u15",   0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) /* CPU board addressing */
-	ROM_LOAD( "6331.speech-u30", 0x0420, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* speech board addressing */
+	ROM_REGION( 0x0420, "proms", 0 )
+	ROM_LOAD( "s-c.xyt-u39",     0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) ) // sine table
+	ROM_LOAD( "pr-82.cpu-u15",   0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) // CPU board addressing
 ROM_END
 
-ROM_START( spacfuryb ) /* Revision B */
+ROM_START( spacfuryb ) // Revision B
 	ROM_REGION( 0xc000, "maincpu", 0 )
 	ROM_LOAD( "969a.cpu-u25",    0x0000, 0x0800, CRC(896a615c) SHA1(542386196eca9fd822e36508e173201ee8a962ed) )
 	ROM_LOAD( "960b.prom-u1",    0x0800, 0x0800, CRC(8a99b63f) SHA1(4b9ec152e0fad50afeea11f5d61331f3211da606) )
@@ -1161,18 +1145,20 @@
 	ROM_LOAD( "967b.prom-u8",    0x4000, 0x0800, CRC(82b5768d) SHA1(823d8c0a537bad62e8186f88f8d02a0f3dc6da0f) )
 	ROM_LOAD( "968b.prom-u9",    0x4800, 0x0800, CRC(fea68f02) SHA1(83bef40dfaac014b7929239d81075335ff8fd506) )
 
-	ROM_REGION( 0x0800, "audiocpu", 0 )
+	ROM_REGION( 0x0800, "speech:cpu", 0 )
 	ROM_LOAD( "808a.speech-u7",  0x0000, 0x0800, CRC(5988c767) SHA1(3b91a8cd46aa7e714028cc40f700fea32287afb1) )
 
-	ROM_REGION( 0x4000, SEGASND_SEGASPEECH_REGION, 0 )
+	ROM_REGION( 0x0020, "speech:proms", 0 )
+	ROM_LOAD( "6331.speech-u30", 0x0000, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) // speech board addressing
+
+	ROM_REGION( 0x4000, "speech:data", 0 )
 	ROM_LOAD( "970.speech-u6",   0x0000, 0x1000, CRC(f3b47b36) SHA1(6ae0b627349664140a7f70799645b368e452d69c) )
 	ROM_LOAD( "971.speech-u5",   0x1000, 0x1000, CRC(e72bbe88) SHA1(efadf8aa448c289cf4d0cf1831255b9ac60820f2) )
 	ROM_LOAD( "972.speech-u4",   0x2000, 0x1000, CRC(8b3da539) SHA1(3a0c4af96a2116fc668a340534582776b2018663) )
 
-	ROM_REGION( 0x0440, "proms", 0 )
-	ROM_LOAD( "s-c.xyt-u39",     0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) ) /* sine table */
-	ROM_LOAD( "pr-82.cpu-u15",   0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) /* CPU board addressing */
-	ROM_LOAD( "6331.speech-u30", 0x0420, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* speech board addressing */
+	ROM_REGION( 0x0420, "proms", 0 )
+	ROM_LOAD( "s-c.xyt-u39",     0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) ) // sine table
+	ROM_LOAD( "pr-82.cpu-u15",   0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) // CPU board addressing
 ROM_END
 
 
@@ -1201,18 +1187,20 @@
 	ROM_LOAD( "1605.prom-u20",   0xa000, 0x0800, CRC(e27d7144) SHA1(5b82fda797d86e11882d1f9738a59092c5e3e7d8) )
 	ROM_LOAD( "1606.prom-u21",   0xa800, 0x0800, CRC(7965f636) SHA1(5c8720beedab4979a813ce7f0e8961c863973ff7) )
 
-	ROM_REGION( 0x0800, "audiocpu", 0 )
+	ROM_REGION( 0x0800, "speech:cpu", 0 )
 	ROM_LOAD( "1607.speech-u7",  0x0000, 0x0800, CRC(b779884b) SHA1(ac07e99717a1f51b79f3e43a5d873ebfa0559320) )
 
-	ROM_REGION( 0x4000, SEGASND_SEGASPEECH_REGION, 0 )
+	ROM_REGION( 0x0020, "speech:proms", 0 )
+	ROM_LOAD( "6331.speech-u30", 0x0000, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) // speech board addressing
+
+	ROM_REGION( 0x4000, "speech:data", 0 )
 	ROM_LOAD( "1608.speech-u6",  0x0000, 0x1000, CRC(637e2b13) SHA1(8a470f9a8a722f7ced340c4d32b4cf6f05b3e848) )
 	ROM_LOAD( "1609.speech-u5",  0x1000, 0x1000, CRC(675ee8e5) SHA1(e314482028b8925ad02e833a1d22224533d0a683) )
 	ROM_LOAD( "1610.speech-u4",  0x2000, 0x1000, CRC(2915c7bd) SHA1(3ed98747b5237aa1b3bab6866292370dc2c7655a) )
 
-	ROM_REGION( 0x0440, "proms", 0 )
-	ROM_LOAD( "s-c.xyt-u39",     0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) ) /* sine table */
-	ROM_LOAD( "pr-82.cpu-u15",   0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) /* CPU board addressing */
-	ROM_LOAD( "6331.speech-u30", 0x0420, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* speech board addressing */
+	ROM_REGION( 0x0420, "proms", 0 )
+	ROM_LOAD( "s-c.xyt-u39",     0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) ) // sine table
+	ROM_LOAD( "pr-82.cpu-u15",   0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) // CPU board addressing
 ROM_END
 
 
@@ -1242,8 +1230,8 @@
 	ROM_LOAD( "1710a.prom-u21", 0xa800, 0x0800, CRC(6203be22) SHA1(89731c7c88d0125a11368d707f566eb53c783266) )
 
 	ROM_REGION( 0x0420, "proms", 0 )
-	ROM_LOAD( "s-c.xyt-u39",    0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) )  /* sine table */
-	ROM_LOAD( "pr-82.cpu-u15",  0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) )  /* CPU board addressing */
+	ROM_LOAD( "s-c.xyt-u39",    0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) )  // sine table
+	ROM_LOAD( "pr-82.cpu-u15",  0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) )  // CPU board addressing
 ROM_END
 
 
@@ -1274,17 +1262,19 @@
 	ROM_LOAD( "1869.prom-u22",   0xb000, 0x0800, CRC(e5663070) SHA1(735944c2b924964f72f3bb3d251a35ea2aef3d15) )
 	ROM_LOAD( "1870.prom-u23",   0xb800, 0x0800, CRC(4340616d) SHA1(e93686a29377933332523425532d102e30211111) )
 
-	ROM_REGION( 0x0800, "audiocpu", 0 )
+	ROM_REGION( 0x0800, "speech:cpu", 0 )
 	ROM_LOAD( "1670.speech-u7",  0x0000, 0x0800, CRC(b779884b) SHA1(ac07e99717a1f51b79f3e43a5d873ebfa0559320) )
 
-	ROM_REGION( 0x4000, SEGASND_SEGASPEECH_REGION, 0 )
+	ROM_REGION( 0x0020, "speech:proms", 0 )
+	ROM_LOAD( "6331.speech-u30", 0x0000, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) // speech board addressing
+
+	ROM_REGION( 0x4000, "speech:data", 0 )
 	ROM_LOAD( "1871.speech-u6",  0x0000, 0x1000, CRC(03713920) SHA1(25a0158cab9983248e91133f96d1849c9e9bcbd2) )
 	ROM_LOAD( "1872.speech-u5",  0x1000, 0x1000, CRC(ebb5c3a9) SHA1(533b6f0499b311f561cf7aba14a7f48ca7c47321) )
 
-	ROM_REGION( 0x0440, "proms", 0 )
-	ROM_LOAD( "s-c.xyt-u39",     0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) ) /* sine table */
-	ROM_LOAD( "pr-82.cpu-u15",   0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) /* CPU board addressing */
-	ROM_LOAD( "6331.speech-u30", 0x0420, 0x0020, CRC(adcb81d0) SHA1(74b0efc7e8362b0c98e54a6107981cff656d87e1) ) /* speech board addressing */
+	ROM_REGION( 0x0420, "proms", 0 )
+	ROM_LOAD( "s-c.xyt-u39",     0x0000, 0x0400, CRC(56484d19) SHA1(61f43126fdcfc230638ed47085ae037a098e6781) ) // sine table
+	ROM_LOAD( "pr-82.cpu-u15",   0x0400, 0x0020, CRC(c609b79e) SHA1(49dbcbb607079a182d7eb396c0da097166ea91c9) ) // CPU board addressing
 ROM_END
 
 
@@ -1295,31 +1285,59 @@
  *
  *************************************/
 
+void segag80v_state::init_waitstates()
+{
+	address_space &pgmspace = m_maincpu->space(AS_PROGRAM);
+	address_space &opspace = m_maincpu->space(AS_OPCODES);
+
+	pgmspace.install_read_tap(0x0000, 0xffff, "program_waitstate_r",[this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+			m_maincpu->adjust_icount(-WAIT_STATES);
+		return data;
+	});
+	pgmspace.install_write_tap(0x0000, 0xffff, "program_waitstate_w",[this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+			m_maincpu->adjust_icount(-WAIT_STATES);
+		return data;
+	});
+
+	opspace.install_read_tap(0x0000, 0xffff, "opcodes_waitstate_r",[this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+			m_maincpu->adjust_icount(-WAIT_STATES);
+		return data;
+	});
+}
+
 void segag80v_state::init_elim2()
 {
+	init_waitstates();
+
 	address_space &iospace = m_maincpu->space(AS_IO);
 
-	/* configure security */
+	// configure security
 	m_decrypt = segag80_security(70);
 
-	/* configure sound */
-	iospace.install_write_handler(0x3e, 0x3e, write8smo_delegate(*this, FUNC(segag80v_state::elim1_sh_w)));
-	iospace.install_write_handler(0x3f, 0x3f, write8smo_delegate(*this, FUNC(segag80v_state::elim2_sh_w)));
+	// configure sound
+	iospace.install_write_handler(0x3e, 0x3f, write8sm_delegate(*m_g80_audio, FUNC(segag80_audio_device::write)));
 }
 
 
 void segag80v_state::init_elim4()
 {
+	init_waitstates();
+
 	address_space &iospace = m_maincpu->space(AS_IO);
 
-	/* configure security */
+	// configure security
 	m_decrypt = segag80_security(76);
 
-	/* configure sound */
-	iospace.install_write_handler(0x3e, 0x3e, write8smo_delegate(*this, FUNC(segag80v_state::elim1_sh_w)));
-	iospace.install_write_handler(0x3f, 0x3f, write8smo_delegate(*this, FUNC(segag80v_state::elim2_sh_w)));
+	// configure sound
+	iospace.install_write_handler(0x3e, 0x3f, write8sm_delegate(*m_g80_audio, FUNC(segag80_audio_device::write)));
 
-	/* configure inputs */
+	// configure inputs
 	iospace.install_write_handler(0xf8, 0xf8, write8smo_delegate(*this, FUNC(segag80v_state::spinner_select_w)));
 	iospace.install_read_handler(0xfc, 0xfc, read8smo_delegate(*this, FUNC(segag80v_state::elim4_input_r)));
 }
@@ -1327,34 +1345,36 @@
 
 void segag80v_state::init_spacfury()
 {
+	init_waitstates();
+
 	address_space &iospace = m_maincpu->space(AS_IO);
 
-	/* configure security */
+	// configure security
 	m_decrypt = segag80_security(64);
 
-	/* configure sound */
-	iospace.install_write_handler(0x38, 0x38, write8smo_delegate(*m_speech, FUNC(speech_sound_device::data_w)));
-	iospace.install_write_handler(0x3b, 0x3b, write8smo_delegate(*m_speech, FUNC(speech_sound_device::control_w)));
-	iospace.install_write_handler(0x3e, 0x3e, write8smo_delegate(*this, FUNC(segag80v_state::spacfury1_sh_w)));
-	iospace.install_write_handler(0x3f, 0x3f, write8smo_delegate(*this, FUNC(segag80v_state::spacfury2_sh_w)));
+	// configure sound
+	iospace.install_write_handler(0x38, 0x38, write8smo_delegate(*m_speech, FUNC(sega_speech_device::data_w)));
+	iospace.install_write_handler(0x3b, 0x3b, write8smo_delegate(*m_speech, FUNC(sega_speech_device::control_w)));
+	iospace.install_write_handler(0x3e, 0x3f, write8sm_delegate(*m_g80_audio, FUNC(segag80_audio_device::write)));
 }
 
 
 void segag80v_state::init_zektor()
 {
+	init_waitstates();
+
 	address_space &iospace = m_maincpu->space(AS_IO);
 
-	/* configure security */
+	// configure security
 	m_decrypt = segag80_security(82);
 
-	/* configure sound */
-	iospace.install_write_handler(0x38, 0x38, write8smo_delegate(*m_speech, FUNC(speech_sound_device::data_w)));
-	iospace.install_write_handler(0x3b, 0x3b, write8smo_delegate(*m_speech, FUNC(speech_sound_device::control_w)));
-	iospace.install_write_handler(0x3c, 0x3d, write8sm_delegate(*m_aysnd, FUNC(ay8912_device::address_data_w)));
-	iospace.install_write_handler(0x3e, 0x3e, write8smo_delegate(*this, FUNC(segag80v_state::zektor1_sh_w)));
-	iospace.install_write_handler(0x3f, 0x3f, write8smo_delegate(*this, FUNC(segag80v_state::zektor2_sh_w)));
+	// configure sound
+	iospace.install_write_handler(0x38, 0x38, write8smo_delegate(*m_speech, FUNC(sega_speech_device::data_w)));
+	iospace.install_write_handler(0x3b, 0x3b, write8smo_delegate(*m_speech, FUNC(sega_speech_device::control_w)));
+	iospace.install_write_handler(0x3c, 0x3d, write8sm_delegate(*m_g80_audio, FUNC(segag80_audio_device::write_ay)));
+	iospace.install_write_handler(0x3e, 0x3f, write8sm_delegate(*m_g80_audio, FUNC(segag80_audio_device::write)));
 
-	/* configure inputs */
+	// configure inputs
 	iospace.install_write_handler(0xf8, 0xf8, write8smo_delegate(*this, FUNC(segag80v_state::spinner_select_w)));
 	iospace.install_read_handler(0xfc, 0xfc, read8smo_delegate(*this, FUNC(segag80v_state::spinner_input_r)));
 }
@@ -1362,18 +1382,20 @@
 
 void segag80v_state::init_tacscan()
 {
+	init_waitstates();
+
 	address_space &pgmspace = m_maincpu->space(AS_PROGRAM);
 	address_space &iospace = m_maincpu->space(AS_IO);
 
-	/* configure security */
+	// configure security
 	m_decrypt = segag80_security(76);
 
-	/* configure sound */
+	// configure sound
 	iospace.install_readwrite_handler(0x3f, 0x3f, read8smo_delegate(*m_usb, FUNC(usb_sound_device::status_r)), write8smo_delegate(*m_usb, FUNC(usb_sound_device::data_w)));
 	pgmspace.install_read_handler(0xd000, 0xdfff, read8sm_delegate(*m_usb, FUNC(usb_sound_device::ram_r)));
 	pgmspace.install_write_handler(0xd000, 0xdfff, write8sm_delegate(*this, FUNC(segag80v_state::usb_ram_w)));
 
-	/* configure inputs */
+	// configure inputs
 	iospace.install_write_handler(0xf8, 0xf8, write8smo_delegate(*this, FUNC(segag80v_state::spinner_select_w)));
 	iospace.install_read_handler(0xfc, 0xfc, read8smo_delegate(*this, FUNC(segag80v_state::spinner_input_r)));
 }
@@ -1381,21 +1403,23 @@
 
 void segag80v_state::init_startrek()
 {
+	init_waitstates();
+
 	address_space &pgmspace = m_maincpu->space(AS_PROGRAM);
 	address_space &iospace = m_maincpu->space(AS_IO);
 
-	/* configure security */
+	// configure security
 	m_decrypt = segag80_security(64);
 
-	/* configure sound */
-	iospace.install_write_handler(0x38, 0x38, write8smo_delegate(*m_speech, FUNC(speech_sound_device::data_w)));
-	iospace.install_write_handler(0x3b, 0x3b, write8smo_delegate(*m_speech, FUNC(speech_sound_device::control_w)));
+	// configure sound
+	iospace.install_write_handler(0x38, 0x38, write8smo_delegate(*m_speech, FUNC(sega_speech_device::data_w)));
+	iospace.install_write_handler(0x3b, 0x3b, write8smo_delegate(*m_speech, FUNC(sega_speech_device::control_w)));
 
 	iospace.install_readwrite_handler(0x3f, 0x3f, read8smo_delegate(*m_usb, FUNC(usb_sound_device::status_r)), write8smo_delegate(*m_usb, FUNC(usb_sound_device::data_w)));
 	pgmspace.install_read_handler(0xd000, 0xdfff, read8sm_delegate(*m_usb, FUNC(usb_sound_device::ram_r)));
 	pgmspace.install_write_handler(0xd000, 0xdfff, write8sm_delegate(*this, FUNC(segag80v_state::usb_ram_w)));
 
-	/* configure inputs */
+	// configure inputs
 	iospace.install_write_handler(0xf8, 0xf8, write8smo_delegate(*this, FUNC(segag80v_state::spinner_select_w)));
 	iospace.install_read_handler(0xfc, 0xfc, read8smo_delegate(*this, FUNC(segag80v_state::spinner_input_r)));
 }
@@ -1409,14 +1433,14 @@
  *************************************/
 
 //    YEAR, NAME,      PARENT,   MACHINE,  INPUT,    STATE           INIT,          MONITOR,                     COMPANY,   FULLNAME,FLAGS
-GAME( 1981, elim2,     0,        elim2,    elim2,    segag80v_state, init_elim2,    ORIENTATION_FLIP_Y,          "Gremlin", "Eliminator (2 Players, set 1)",     MACHINE_IMPERFECT_SOUND )
-GAME( 1981, elim2a,    elim2,    elim2,    elim2,    segag80v_state, init_elim2,    ORIENTATION_FLIP_Y,          "Gremlin", "Eliminator (2 Players, set 2)",     MACHINE_IMPERFECT_SOUND )
-GAME( 1981, elim2c,    elim2,    elim2,    elim2c,   segag80v_state, init_elim2,    ORIENTATION_FLIP_Y,          "Gremlin", "Eliminator (2 Players, cocktail)",  MACHINE_IMPERFECT_SOUND )
-GAME( 1981, elim4,     elim2,    elim2,    elim4,    segag80v_state, init_elim4,    ORIENTATION_FLIP_Y,          "Gremlin", "Eliminator (4 Players)",            MACHINE_IMPERFECT_SOUND )
-GAME( 1981, elim4p,    elim2,    elim2,    elim4,    segag80v_state, init_elim4,    ORIENTATION_FLIP_Y,          "Gremlin", "Eliminator (4 Players, prototype)", MACHINE_IMPERFECT_SOUND )
-GAME( 1981, spacfury,  0,        spacfury, spacfury, segag80v_state, init_spacfury, ORIENTATION_FLIP_Y,          "Sega",    "Space Fury (revision C)",           MACHINE_IMPERFECT_SOUND )
-GAME( 1981, spacfurya, spacfury, spacfury, spacfury, segag80v_state, init_spacfury, ORIENTATION_FLIP_Y,          "Sega",    "Space Fury (revision A)",           MACHINE_IMPERFECT_SOUND )
-GAME( 1981, spacfuryb, spacfury, spacfury, spacfury, segag80v_state, init_spacfury, ORIENTATION_FLIP_Y,          "Sega",    "Space Fury (revision B)",           MACHINE_IMPERFECT_SOUND )
-GAME( 1982, zektor,    0,        zektor,   zektor,   segag80v_state, init_zektor,   ORIENTATION_FLIP_Y,          "Sega",    "Zektor (revision B)",               MACHINE_IMPERFECT_SOUND )
-GAME( 1982, tacscan,   0,        tacscan,  tacscan,  segag80v_state, init_tacscan,  ORIENTATION_FLIP_X ^ ROT270, "Sega",    "Tac/Scan",                          MACHINE_IMPERFECT_SOUND )
-GAME( 1982, startrek,  0,        startrek, startrek, segag80v_state, init_startrek, ORIENTATION_FLIP_Y,          "Sega",    "Star Trek",                         MACHINE_IMPERFECT_SOUND )
+GAME( 1981, elim2,     0,        elim2,    elim2,    segag80v_state, init_elim2,    ORIENTATION_FLIP_Y,          "Gremlin", "Eliminator (2 Players, set 1)", 0 )
+GAME( 1981, elim2a,    elim2,    elim2,    elim2,    segag80v_state, init_elim2,    ORIENTATION_FLIP_Y,          "Gremlin", "Eliminator (2 Players, set 2)", 0 )
+GAME( 1981, elim2c,    elim2,    elim2,    elim2c,   segag80v_state, init_elim2,    ORIENTATION_FLIP_Y,          "Gremlin", "Eliminator (2 Players, cocktail)", 0 )
+GAME( 1981, elim4,     elim2,    elim2,    elim4,    segag80v_state, init_elim4,    ORIENTATION_FLIP_Y,          "Gremlin", "Eliminator (4 Players)", 0 )
+GAME( 1981, elim4p,    elim2,    elim2,    elim4,    segag80v_state, init_elim4,    ORIENTATION_FLIP_Y,          "Gremlin", "Eliminator (4 Players, prototype)", 0 )
+GAME( 1981, spacfury,  0,        spacfury, spacfury, segag80v_state, init_spacfury, ORIENTATION_FLIP_Y,          "Sega",    "Space Fury (revision C)", 0 )
+GAME( 1981, spacfurya, spacfury, spacfury, spacfury, segag80v_state, init_spacfury, ORIENTATION_FLIP_Y,          "Sega",    "Space Fury (revision A)", 0 )
+GAME( 1981, spacfuryb, spacfury, spacfury, spacfury, segag80v_state, init_spacfury, ORIENTATION_FLIP_Y,          "Sega",    "Space Fury (revision B)", 0 )
+GAME( 1982, zektor,    0,        zektor,   zektor,   segag80v_state, init_zektor,   ORIENTATION_FLIP_Y,          "Sega",    "Zektor (revision B)", 0 )
+GAME( 1982, tacscan,   0,        tacscan,  tacscan,  segag80v_state, init_tacscan,  ORIENTATION_FLIP_X ^ ROT270, "Sega",    "Tac/Scan", 0 )
+GAME( 1982, startrek,  0,        startrek, startrek, segag80v_state, init_startrek, ORIENTATION_FLIP_Y,          "Sega",    "Star Trek", 0 )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/segas16a.cpp mame-0.224+dfsg.1/src/mame/drivers/segas16a.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/segas16a.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/segas16a.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2827,7 +2827,7 @@
 	ROM_LOAD16_BYTE( "ic18-2614.bin",  0x10000, 0x8000, CRC(e05a1e25) SHA1(9691d9f0763b7483ee6912437902f22ab4b78a05) ) // MATCH
 
 	// these were missing, but it seems like they should be different?
-	ROM_LOAD16_BYTE( "ic23",  0x20001, 0x8000, BAD_DUMP CRC(531ca13f) SHA1(19e68bc515f6021e1145cff4f3f0e083839ee8f3) ) // misisng
+	ROM_LOAD16_BYTE( "ic23",  0x20001, 0x8000, BAD_DUMP CRC(531ca13f) SHA1(19e68bc515f6021e1145cff4f3f0e083839ee8f3) ) // missing
 	ROM_LOAD16_BYTE( "ic24",  0x20000, 0x8000, BAD_DUMP CRC(68807b49) SHA1(0a189da8cdd2090e76d6d06c55b478abce60542d) ) // missing
 
 	ROM_REGION( 0x10000, "soundcpu", 0 ) // sound CPU
@@ -3052,6 +3052,8 @@
 //
 //  CPU/Video/Sound Board: 171-5335
 //  ROM Board:             171-5336
+//  Sega game ID: 837-5934
+//     ROM board: 837-5935
 //
 ROM_START( quartet2 )
 	ROM_REGION( 0x40000, "maincpu", 0 ) // 68000 code
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/segas18.cpp mame-0.224+dfsg.1/src/mame/drivers/segas18.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/segas18.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/segas18.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -222,7 +222,7 @@
 	}
 
 	if (!m_custom_io_r.isnull())
-		return m_custom_io_r(mem_mask);
+		return m_custom_io_r(offset);
 	logerror("%06X:misc_io_r - unknown read access to address %04X\n", m_maincpu->pc(), offset * 2);
 	return m_mapper->open_bus_r();
 }
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/segasp.cpp mame-0.224+dfsg.1/src/mame/drivers/segasp.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/segasp.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/segasp.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -71,6 +71,7 @@
 Tetris Giant / Tetris Dekaris               834-14970    G  MDA-C0076 CF   ANY    253-5508-0604   AAFE-01G03025212
 Tetris Giant / Tetris Dekaris Ver.2.000     834-14970    G            ROM  ANY    253-5508-0604   AAFE-xxxxxxxxxxx
 Thomas: The Tank Engine                     ???-?????                 no          ???-????-????   AAFE-xxxxxxxxxxx
+Yataimura Kingyosukui (4-player, China)     ???-?????                 CF   EXP    253-5508-0526J  AAFE-xxxxxxxxxxx
 Unknown                                     834-14865                      JAP
 
 REV PCB       IC6s      Flash       AU1500
@@ -645,6 +646,25 @@
 	ROM_LOAD( "317-0408-com.ic15", 0, 0x800, CRC(f77c49dc) SHA1(e10173bbbd5930ed159cec9a7dba308e2a3f3c43) )
 ROM_END
 
+ROM_START( kingyoch )
+	SEGASP_BIOS
+	ROM_DEFAULT_BIOS( "v201" )
+	SEGASP_EXP
+	SEGASP_MISC
+
+	ROM_REGION( 0x08000000, "rom_board", ROMREGION_ERASEFF)
+
+	// YATAIMURA
+	// KINGYOSUKUI EX
+	DISK_REGION( "cflash" )
+	DISK_IMAGE( "kingyo", 0, SHA1(f3685a0c6109b78f4812972b71bcec4ef9e9198f) ) // free space contain other game leftovers, presumable Issyouni Wan Wan, encrypted, key is 511248c2
+
+	ROM_PARAMETER( ":rom_board:id", "5508" )  // 8x 512Mbit FlashROMs
+
+	ROM_REGION( 0x800, "pic_readout", 0 )
+	ROM_LOAD( "317-0526-jpn.ic15", 0, 0x800, BAD_DUMP CRC(8af67833) SHA1(0b79abf9182c249a6d4976d6fd3b90101d66354f) )
+ROM_END
+
 ROM_START( loveber3 )
 	SEGASP_BIOS
 	ROM_DEFAULT_BIOS( "v200" )
@@ -723,6 +743,7 @@
 GAME( 2008, dinoki25,segasp,     segasp,    segasp, segasp_state, init_segasp, ROT0, "Sega", "Dinosaur King - D-Team VS. the Alpha Fortress (Export, Ver 2.500) (MDA-C0047)", GAME_FLAGS )
 GAME( 2010, dinokich,dinoki25,   segasp,    segasp, segasp_state, init_segasp, ROT0, "Sega", "Konglongwang - D-Kids VS Alpha Yaosai (China, Ver 2.501) (MDA-C0081)", GAME_FLAGS ) // D-Kids VS 亚法要塞
 GAME( 2008, dinoki4,segasp,      segasp,    segasp, segasp_state, init_segasp, ROT0, "Sega", "Kodai Ouja Kyouryuu King - Mezame yo! Arata-naru Chikara!! (Japan, Ver 4.000) (MDA-C0061)", GAME_FLAGS ) // Ancient Ruler Dinosaur King - Wake up! New Power!!
+GAME( 2009, kingyoch,segasp,     segasp,    segasp, segasp_state, init_segasp, ROT0, "Sega", "Yataimura Kingyosukui (4-player, China, Ver 1.000)", GAME_FLAGS )
 GAME( 2007, loveber3,segasp,     segasp,    segasp, segasp_state, init_segasp, ROT0, "Sega", "Love And Berry - 3rd-5th Collection (USA, Export, Ver 1.002) (MDA-C0042)", GAME_FLAGS )
 GAME( 2010, loveber3cn,loveber3, segasp,    segasp, segasp_state, init_segasp, ROT0, "Sega", "Love And Berry - 3rd-5th Collection (China, Ver 1.001) (MDA-C0071)", GAME_FLAGS )
 GAME( 2009, tetgiano,tetgiant,   segasp,    segasp, segasp_state, init_segasp, ROT0, "Sega", "Tetris Giant / Tetris Dekaris (MDA-C0076)", GAME_FLAGS )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/segattl.cpp mame-0.224+dfsg.1/src/mame/drivers/segattl.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/segattl.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/segattl.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -19,7 +19,7 @@
     Double Block
     Duck Shoot
     Erase
-    Fonz                                                           94789-P                   IC86.86 IC87.87 PR-09.49 PR-08.50
+    Fonz                                                             94789-P                   IC86.86 IC87.87 PR-09.49 PR-08.50
     Galaxy War
     Goal Kick
     Heavyweight Champ
@@ -33,7 +33,7 @@
     Pong-Tron II
     Pro Monaco GP
     Pro Racer
-    Road Race
+    Road Race                                                        94540Y-P
     Rock'n Bark
     Secret Base
     Secret War
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/segaybd.cpp mame-0.224+dfsg.1/src/mame/drivers/segaybd.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/segaybd.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/segaybd.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -22,7 +22,7 @@
 ****************************************************************************
 
     Known bugs:
-        * pdriftl's comms doesn't work
+        * pdriftl's comms don't work
 
 ****************************************************************************
 
@@ -1181,7 +1181,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START2 )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_START1 )
 
-	PORT_MODIFY("COINAGE")
+	PORT_MODIFY("COINAGE") // like with the other games, set all switches to 0x00 for Free Play
 	PORT_DIPNAME( 0x03, 0x03, "Coin to Credit" ) PORT_DIPLOCATION("SWA:1,2")
 	PORT_DIPSETTING(    0x00, DEF_STR( 4C_1C ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( 3C_1C ) )
@@ -1399,8 +1399,9 @@
 //*************************************************************************************************************************
 //  Galaxy Force 2 (World), Sega Y-board
 //  CPU: 68000 (317-????)
-//  GAME BD: 834-6614-02 GALAXY FORCE 2
-//
+//  GAME BD:  834-6614-02 GALAXY FORCE 2
+//  DRIVE BD: 839-0161
+
 ROM_START( gforce2 )
 	ROM_REGION( 0x080000, "maincpu", 0 ) // M
 	ROM_LOAD16_BYTE( "epr-11688.25",   0x000000, 0x20000, CRC(c845f2df) SHA1(17586a5f83170e99f28cd35b28e85e503e7bbe75) )
@@ -1414,6 +1415,10 @@
 	ROM_LOAD16_BYTE( "epr-11816b.54",   0x000000, 0x20000, CRC(317dd0c2) SHA1(7f1c7dcfb111385e2a94912975c2f9bfe78445ac) )
 	ROM_LOAD16_BYTE( "epr-11815b.53",   0x000001, 0x20000, CRC(f1fb22f1) SHA1(da3ce521b0a19b391913c35af34084d29edceca7) )
 
+	ROM_REGION( 0x08000, "drive_board", 0 )
+	ROM_LOAD( "epr-11707.ic37",  0x00000, 0x08000, NO_DUMP )
+	ROM_LOAD( "epr-11707a.ic37", 0x00000, 0x08000, NO_DUMP )
+
 	ROM_REGION16_BE( 0x080000, "bsprites", 0 )
 	ROM_LOAD16_BYTE( "mpr-11467.16",   0x000000, 0x20000, CRC(6e60e736) SHA1(73086744cb2fe1ce162f851cb879755c21819b33) )
 	ROM_LOAD16_BYTE( "mpr-11468.14",   0x000001, 0x20000, CRC(74ca9ca5) SHA1(c6f27ce43ef270088e6155c8240fd15afa5729fd) )
@@ -1488,6 +1493,10 @@
 	ROM_LOAD16_BYTE( "epr-11816b.54",   0x000000, 0x20000, CRC(317dd0c2) SHA1(7f1c7dcfb111385e2a94912975c2f9bfe78445ac) )
 	ROM_LOAD16_BYTE( "epr-11815b.53",   0x000001, 0x20000, CRC(f1fb22f1) SHA1(da3ce521b0a19b391913c35af34084d29edceca7) )
 
+	ROM_REGION( 0x08000, "drive_board", 0 )
+	ROM_LOAD( "epr-11707.ic37",  0x00000, 0x08000, NO_DUMP )
+	ROM_LOAD( "epr-11707a.ic37", 0x00000, 0x08000, NO_DUMP )
+
 	ROM_REGION16_BE( 0x080000, "bsprites", 0 )
 	ROM_LOAD16_BYTE( "mpr-11467.16",   0x000000, 0x20000, CRC(6e60e736) SHA1(73086744cb2fe1ce162f851cb879755c21819b33) )
 	ROM_LOAD16_BYTE( "mpr-11468.14",   0x000001, 0x20000, CRC(74ca9ca5) SHA1(c6f27ce43ef270088e6155c8240fd15afa5729fd) )
@@ -1566,6 +1575,10 @@
 	ROM_LOAD16_BYTE( "epr-11690a.54",  0x000000, 0x20000, CRC(e18bc177) SHA1(3fb179c9074954fc9b64da1463f542d60a99ec84) )
 	ROM_LOAD16_BYTE( "epr-11689a.53",  0x000001, 0x20000, CRC(6010e63e) SHA1(00aa5e8516f094409a407744b84ef183393b8b19) )
 
+	ROM_REGION( 0x08000, "drive_board", 0 )
+	ROM_LOAD( "epr-11707.ic37",  0x00000, 0x08000, NO_DUMP )
+	ROM_LOAD( "epr-11707a.ic37", 0x00000, 0x08000, NO_DUMP )
+
 	ROM_REGION16_BE( 0x080000, "bsprites", 0 )
 	ROM_LOAD16_BYTE( "mpr-11467.16",   0x000000, 0x20000, CRC(6e60e736) SHA1(73086744cb2fe1ce162f851cb879755c21819b33) )
 	ROM_LOAD16_BYTE( "mpr-11468.14",   0x000001, 0x20000, CRC(74ca9ca5) SHA1(c6f27ce43ef270088e6155c8240fd15afa5729fd) )
@@ -1641,6 +1654,10 @@
 	ROM_LOAD16_BYTE( "epr-11513.54",   0x000000, 0x20000, CRC(e18bc177) SHA1(3fb179c9074954fc9b64da1463f542d60a99ec84) )
 	ROM_LOAD16_BYTE( "epr-11512.53",   0x000001, 0x20000, CRC(6010e63e) SHA1(00aa5e8516f094409a407744b84ef183393b8b19) )
 
+	ROM_REGION( 0x08000, "drive_board", 0 )
+	ROM_LOAD( "epr-11707.ic37",  0x00000, 0x08000, NO_DUMP )
+	ROM_LOAD( "epr-11707a.ic37", 0x00000, 0x08000, NO_DUMP )
+
 	ROM_REGION16_BE( 0x080000, "bsprites", 0 )
 	ROM_LOAD16_BYTE( "mpr-11467.16",   0x000000, 0x20000, CRC(6e60e736) SHA1(73086744cb2fe1ce162f851cb879755c21819b33) )
 	ROM_LOAD16_BYTE( "mpr-11468.14",   0x000001, 0x20000, CRC(74ca9ca5) SHA1(c6f27ce43ef270088e6155c8240fd15afa5729fd) )
@@ -1708,7 +1725,8 @@
 //  CPU BD      837-7403
 //  VIDEO BD    837-7301-02
 //  GAME BD     834-7300-07 G-LOC
-//
+//  DRIVE BD:   839-0341
+
 ROM_START( gloc )
 	ROM_REGION( 0x080000, "maincpu", 0 ) // M
 	ROM_LOAD16_BYTE( "epr-13172.25",  0x000000, 0x20000, CRC(75e7174c) SHA1(ef052a6973cf49267463a0c14e8c392a083c62fb) )
@@ -1724,6 +1742,9 @@
 	ROM_LOAD16_BYTE( "epr-13030.54",  0x000000, 0x20000, CRC(81abcabf) SHA1(cb4e817d66a7f384aa9757758c51cd1bf7347dd0) )
 	ROM_LOAD16_BYTE( "epr-13029.53",  0x000001, 0x20000, CRC(f3638efb) SHA1(f82a46fc8616cbe0235746161c587e54adecfe50) )
 
+	ROM_REGION( 0x08000, "drive_board", 0 )
+	ROM_LOAD( "epr-11830.ic37",  0x00000, 0x8000, CRC(c1201c02) SHA1(3fc854f33631a65e499d581712c46b60b6f5b4c7) )
+
 	ROM_REGION16_BE( 0x200000, "bsprites", 0)
 	ROM_LOAD16_BYTE( "epr-13039.16",  0x000000, 0x80000, CRC(d7e1266d) SHA1(b0fc4cc60a7e876ae2af343bba6da3fb926ea9c5) )
 	ROM_LOAD16_BYTE( "epr-13037.14",  0x000001, 0x80000, CRC(b801a250) SHA1(7d1f6a1f2022a4f302f22d11fa79057cf8134ad2) )
@@ -1799,6 +1820,9 @@
 	ROM_LOAD16_BYTE( "epr-13030.54",  0x000000, 0x20000, CRC(81abcabf) SHA1(cb4e817d66a7f384aa9757758c51cd1bf7347dd0) )
 	ROM_LOAD16_BYTE( "epr-13029.53",  0x000001, 0x20000, CRC(f3638efb) SHA1(f82a46fc8616cbe0235746161c587e54adecfe50) )
 
+	ROM_REGION( 0x08000, "drive_board", 0 )
+	ROM_LOAD( "epr-11830.ic37",  0x00000, 0x8000, CRC(c1201c02) SHA1(3fc854f33631a65e499d581712c46b60b6f5b4c7) )
+
 	ROM_REGION16_BE( 0x200000, "bsprites", 0)
 	ROM_LOAD16_BYTE( "epr-13039.16",  0x000000, 0x80000, CRC(d7e1266d) SHA1(b0fc4cc60a7e876ae2af343bba6da3fb926ea9c5) )
 	ROM_LOAD16_BYTE( "epr-13037.14",  0x000001, 0x80000, CRC(b801a250) SHA1(7d1f6a1f2022a4f302f22d11fa79057cf8134ad2) )
@@ -2008,7 +2032,8 @@
 //  CPU: 68000 (317-????)
 //   CPU BD POWER DRIFT   837-6695-08 (or 837-6695-09)
 //   VIDEO BD POWER DRIFT 837-6696-01 (or 837-6696-02)
-//
+//   DRIVE BD:            839-0213
+
 ROM_START( pdrift )
 	ROM_REGION( 0x080000, "maincpu", 0 ) // M
 	ROM_LOAD16_BYTE( "epr-12017.25",  0x000000, 0x20000, CRC(31190322) SHA1(18df4bd6078b1c76c7061c05a476a7cbf7d0b37b) )
@@ -2024,6 +2049,9 @@
 	ROM_LOAD16_BYTE( "epr-12019a.54", 0x000000, 0x20000, CRC(11188a30) SHA1(42dd0344d92529848b53a8cec4c145237ccd5b51) )
 	ROM_LOAD16_BYTE( "epr-12018a.53", 0x000001, 0x20000, CRC(1c582e1f) SHA1(c32d2f921554bddd7dedcb81e231aa91f50fa27b) )
 
+	ROM_REGION( 0x08000, "drive_board", 0 )
+	ROM_LOAD( "epr-11485.ic37",  0x00000, 0x08000, NO_DUMP )
+
 	ROM_REGION16_BE( 0x080000, "bsprites", 0 )
 	ROM_LOAD16_BYTE( "epr-11789.16",  0x000000, 0x20000, CRC(b86f8d2b) SHA1(a053f2021841fd0ef89fd3f28050a698b36c435e) )
 	ROM_LOAD16_BYTE( "epr-11791.14",  0x000001, 0x20000, CRC(36b2910a) SHA1(9948b91837f944a7a606542fa685525e74bbe398) )
@@ -2107,6 +2135,9 @@
 	ROM_LOAD16_BYTE( "epr-12019.54", 0x000000, 0x20000, CRC(e514d7b6) SHA1(27ae99f5f3e8d2f248916f7a252e2c0686638df5) )
 	ROM_LOAD16_BYTE( "epr-12018.53", 0x000001, 0x20000, CRC(0a3f7faf) SHA1(fe20a164a7a2c9e9bf0e7aade75b0488bdc93d79) )
 
+	ROM_REGION( 0x08000, "drive_board", 0 )
+	ROM_LOAD( "epr-11485.ic37",  0x00000, 0x08000, NO_DUMP )
+
 	ROM_REGION16_BE( 0x080000, "bsprites", 0 )
 	ROM_LOAD16_BYTE( "epr-11789.16",  0x000000, 0x20000, CRC(b86f8d2b) SHA1(a053f2021841fd0ef89fd3f28050a698b36c435e) )
 	ROM_LOAD16_BYTE( "epr-11791.14",  0x000001, 0x20000, CRC(36b2910a) SHA1(9948b91837f944a7a606542fa685525e74bbe398) )
@@ -2191,6 +2222,9 @@
 	ROM_LOAD16_BYTE( "epr-11903.54",  0x000000, 0x20000, CRC(d004f411) SHA1(212a985275647fae24b580ebaffc1230c06318ac) )
 	ROM_LOAD16_BYTE( "epr-11902.53",  0x000001, 0x20000, CRC(e8028e08) SHA1(de4ee5011e9552e624b6223e0e1ef00bc271a811) )
 
+	ROM_REGION( 0x08000, "drive_board", 0 )
+	ROM_LOAD( "epr-11485.ic37",  0x00000, 0x08000, NO_DUMP )
+
 	ROM_REGION16_BE( 0x080000, "bsprites", 0 )
 	ROM_LOAD16_BYTE( "epr-11789.16",  0x000000, 0x20000, CRC(b86f8d2b) SHA1(a053f2021841fd0ef89fd3f28050a698b36c435e) )
 	ROM_LOAD16_BYTE( "epr-11791.14",  0x000001, 0x20000, CRC(36b2910a) SHA1(9948b91837f944a7a606542fa685525e74bbe398) )
@@ -2278,6 +2312,9 @@
 	ROM_LOAD16_BYTE( "epr-11750b.54", 0x000000, 0x20000, CRC(bc14ce30) SHA1(9bbadee0946e0abaac4f0d2625ba5550f11fa8a9) )
 	ROM_LOAD16_BYTE( "epr-11749b.53", 0x000001, 0x20000, CRC(9e385568) SHA1(74e22eaed645cc80b1eb0c52912186066e58b9d2) )
 
+	ROM_REGION( 0x08000, "drive_board", 0 )
+	ROM_LOAD( "epr-11485.ic37",  0x00000, 0x08000, NO_DUMP )
+
 	ROM_REGION16_BE( 0x080000, "bsprites", 0 )
 	ROM_LOAD16_BYTE( "epr-11789.16",  0x000000, 0x20000, CRC(b86f8d2b) SHA1(a053f2021841fd0ef89fd3f28050a698b36c435e) )
 	ROM_LOAD16_BYTE( "epr-11791.14",  0x000001, 0x20000, CRC(36b2910a) SHA1(9948b91837f944a7a606542fa685525e74bbe398) )
@@ -2363,6 +2400,9 @@
 	ROM_LOAD16_BYTE("epr-12109.54", 0x000000, 0x20000, CRC(256350b8) SHA1(72b05d3583d63766690fed4827ec586e832168d1) )
 	ROM_LOAD16_BYTE("epr-12108.53", 0x000001, 0x20000, CRC(a3a56771) SHA1(f41d466f31a1b833d21a7011314c48d5056409eb) )
 
+	ROM_REGION( 0x08000, "drive_board", 0 )
+	ROM_LOAD( "epr-11485.ic37",  0x00000, 0x08000, NO_DUMP )
+
 	ROM_REGION16_BE(0x080000, "bsprites", 0)
 	ROM_LOAD16_BYTE("epr-12114.16", 0x000000, 0x20000, CRC(8b07e8eb) SHA1(22a4aff968d6de52372b7b2b5322d353f7b835ef) )
 	ROM_LOAD16_BYTE("epr-12115.14", 0x000001, 0x20000, CRC(045b2912) SHA1(697c8eff69bf1a23745d24171f0b50635cf8513e) )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/seicross.cpp mame-0.224+dfsg.1/src/mame/drivers/seicross.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/seicross.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/seicross.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,11 +1,9 @@
 // license:BSD-3-Clause
 // copyright-holders:Nicola Salmoria
 /***************************************************************************
-
-Seicross memory map (preliminary)
-
 driver by Nicola Salmoria
 
+Seicross memory map (preliminary)
 
 0000-77ff ROM
 7800-7fff RAM
@@ -28,13 +26,11 @@
 1         8910 write
 4         8910 read
 
-
 There is a microcontroller on the board. Nichibutsu custom part marked
 NSC81050-102  8127 E37 and labeled No. 00363.  It's a 40-pin IC at location 4F
 on the (Seicross-) board. Looks like it is linked to the dips (and those are
 on a very small daughterboard).
 
-
 Differences in new/old version of Frisky Tom
 - The lady wears bikini in new version
 - Game config is backed up by 4.5v battery in old version
@@ -74,7 +70,7 @@
 
 void seicross_state::machine_reset()
 {
-	/* start with the protection mcu halted */
+	// start with the protection mcu halted
 	m_mcu->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);
 }
 
@@ -88,20 +84,20 @@
 void seicross_state::portB_w(uint8_t data)
 {
 	//logerror("PC %04x: 8910 port B = %02x\n", m_maincpu->pc(), data);
-	/* bit 0 is IRQ enable */
+	// bit 0 is IRQ enable
 	m_irq_mask = data & 1;
 
-	/* bit 1 flips screen */
+	// bit 1 flips screen
 
-	/* bit 2 resets the microcontroller */
+	// bit 2 resets the microcontroller
 	if (((m_portb & 4) == 0) && (data & 4))
 	{
-		/* reset and start the protection mcu */
+		// reset and start the protection mcu
 		m_mcu->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
 		m_mcu->set_input_line(INPUT_LINE_HALT, CLEAR_LINE);
 	}
 
-	/* other bits unknown */
+	// other bits unknown
 	m_portb = data;
 }
 
@@ -115,13 +111,13 @@
 	map(0x0000, 0x77ff).rom();
 	map(0x7800, 0x7fff).ram().share("share1");
 	map(0x8820, 0x887f).ram().share("spriteram");
-	map(0x9000, 0x93ff).ram().w(FUNC(seicross_state::videoram_w)).share("videoram"); /* video RAM */
+	map(0x9000, 0x93ff).ram().w(FUNC(seicross_state::videoram_w)).share("videoram");
 	map(0x9800, 0x981f).ram().share("row_scroll");
 	map(0x9880, 0x989f).writeonly().share("spriteram2");
 	map(0x9c00, 0x9fff).ram().w(FUNC(seicross_state::colorram_w)).share("colorram");
-	map(0xa000, 0xa000).portr("IN0");        /* IN0 */
-	map(0xa800, 0xa800).portr("IN1");        /* IN1 */
-	map(0xb000, 0xb000).portr("TEST");       /* test */
+	map(0xa000, 0xa000).portr("IN0");
+	map(0xa800, 0xa800).portr("IN1");
+	map(0xb000, 0xb000).portr("TEST");
 	map(0xb800, 0xb800).r("watchdog", FUNC(watchdog_timer_device::reset_r));
 }
 
@@ -143,24 +139,17 @@
 
 void seicross_state::mcu_no_nvram_map(address_map &map)
 {
-	map(0x1003, 0x1003).portr("DSW1");       /* DSW1 */
-	map(0x1005, 0x1005).portr("DSW2");       /* DSW2 */
-	map(0x1006, 0x1006).portr("DSW3");       /* DSW3 */
+	map(0x1003, 0x1003).portr("DSW1");
+	map(0x1005, 0x1005).portr("DSW2");
+	map(0x1006, 0x1006).portr("DSW3");
 	map(0x2000, 0x2000).w(FUNC(seicross_state::dac_w));
 	map(0x8000, 0xf7ff).rom().region("maincpu", 0);
 	map(0xf800, 0xffff).ram().share("share1");
 }
 
-void seicross_state::decrypted_opcodes_map(address_map &map)
-{
-	map(0x8000, 0xf7ff).rom().share("decrypted_opcodes");
-	map(0xf800, 0xffff).ram().share("share1");
-}
-
-
 
 static INPUT_PORTS_START( friskyt )
-	PORT_START("IN0")       /* IN0 */
+	PORT_START("IN0")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -170,7 +159,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
 
-	PORT_START("IN1")       /* IN1 */
+	PORT_START("IN1")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -182,18 +171,18 @@
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
 
-	PORT_START("TEST")      /* Test */
+	PORT_START("TEST")
 	PORT_DIPNAME( 0x01, 0x00, "Test Mode" )
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
 	PORT_DIPNAME( 0x02, 0x00, "Connection Error" )
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
-	PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )   /* probably unused */
+	PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )   // probably unused
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( radrad )
-	PORT_START("IN0")       /* IN0 */
+	PORT_START("IN0")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -203,7 +192,7 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
 
-	PORT_START("IN1")       /* IN1 */
+	PORT_START("IN1")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
@@ -213,12 +202,12 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 )
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 
-	PORT_START("TEST")      /* Test */
+	PORT_START("TEST")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_COCKTAIL
-	PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )   /* probably unused */
+	PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )   // probably unused
 
-	PORT_START("DSW1")          /* DSW1 */
+	PORT_START("DSW1")
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( Upright ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Cocktail ) )
@@ -232,7 +221,7 @@
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
 
-	PORT_START("DSW2")      /* DSW2 */
+	PORT_START("DSW2")
 	PORT_DIPNAME( 0x0f, 0x01, DEF_STR( Coin_A ) )
 	PORT_DIPSETTING(    0x07, DEF_STR( 7C_1C ) )
 	PORT_DIPSETTING(    0x06, DEF_STR( 6C_1C ) )
@@ -251,7 +240,7 @@
 	PORT_DIPSETTING(    0x00, DEF_STR( Free_Play ) )
 	PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
 
-	PORT_START("DSW3")      /* DSW3 */
+	PORT_START("DSW3")
 	PORT_DIPNAME( 0x0f, 0x00, DEF_STR( Coin_B ) )
 	PORT_DIPSETTING(    0x08, DEF_STR( 2C_1C ) )
 	PORT_DIPSETTING(    0x09, DEF_STR( 2C_2C ) )
@@ -273,7 +262,7 @@
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( seicross )
-	PORT_START("IN0")       /* IN0 */
+	PORT_START("IN0")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY
@@ -283,24 +272,24 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
 
-	PORT_START("IN1")       /* IN1 */
+	PORT_START("IN1")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_8WAY PORT_COCKTAIL
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_COCKTAIL
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_COCKTAIL
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_COCKTAIL
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_SERVICE1 )
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )   /* probably unused */
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_UNKNOWN )   // probably unused
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON1 )
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_COCKTAIL
 
-	PORT_START("TEST")      /* Test */
+	PORT_START("TEST")
 	PORT_SERVICE( 0x01, IP_ACTIVE_HIGH )
 	PORT_DIPNAME( 0x02, 0x00, "Connection Error" )
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
-	PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )   /* probably unused */
+	PORT_BIT( 0xfc, IP_ACTIVE_HIGH, IPT_UNKNOWN )   // probably unused
 
-	PORT_START("DSW1")      /* DSW1 */
+	PORT_START("DSW1")
 	PORT_DIPNAME( 0x01, 0x00, DEF_STR( Unknown ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
@@ -314,7 +303,7 @@
 	PORT_DIPSETTING(    0x0c, "30000 60000 90000" )
 	PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
 
-	PORT_START("DSW2")      /* DSW2 */
+	PORT_START("DSW2")
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Cabinet ) )
 	PORT_DIPSETTING(    0x01, DEF_STR( Upright ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Cocktail ) )
@@ -328,7 +317,7 @@
 	PORT_DIPSETTING(    0x0c, "5" )
 	PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
 
-	PORT_START("DSW3")      /* DSW3 */
+	PORT_START("DSW3")
 	PORT_DIPNAME( 0x03, 0x00, DEF_STR( Coin_B ) )
 	PORT_DIPSETTING(    0x03, DEF_STR( 4C_1C ) )
 	PORT_DIPSETTING(    0x02, DEF_STR( 3C_1C ) )
@@ -341,7 +330,7 @@
 	PORT_DIPSETTING(    0x0c, DEF_STR( 1C_6C ) )
 	PORT_BIT( 0xf0, IP_ACTIVE_HIGH, IPT_UNUSED )
 
-	PORT_START("DEBUG")     /* Debug */
+	PORT_START("DEBUG")
 	PORT_BIT( 0x1f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 	PORT_DIPNAME( 0x20, 0x20, "Debug Mode" )
 	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
@@ -356,25 +345,25 @@
 
 static const gfx_layout charlayout =
 {
-	8,8,    /* 8*8 characters */
-	512,    /* 512 characters */
-	2,  /* 2 bits per pixel */
-	{ 0, 4 },   /* the two bitplanes are packed in one byte */
+	8,8,    // 8*8 characters
+	512,    // 512 characters
+	2,  // 2 bits per pixel
+	{ 0, 4 },   // the two bitplanes are packed in one byte
 	{ 0, 1, 2, 3, 8+0, 8+1, 8+2, 8+3 },
 	{ 0*16, 1*16, 2*16, 3*16, 4*16, 5*16, 6*16, 7*16 },
-	16*8    /* every char takes 16 consecutive bytes */
+	16*8    // every char takes 16 consecutive bytes
 };
 static const gfx_layout spritelayout =
 {
-	16,16,  /* 16*16 sprites */
-	256,    /* 256 sprites */
-	2,  /* 2 bits per pixel */
-	{ 0, 4 },   /* the two bitplanes are packed in one byte */
+	16,16,  // 16*16 sprites
+	256,    // 256 sprites
+	2,  // 2 bits per pixel
+	{ 0, 4 },   // the two bitplanes are packed in one byte
 	{ 0, 1, 2, 3, 8+0, 8+1, 8+2, 8+3,
 			16*8+0, 16*8+1, 16*8+2, 16*8+3, 17*8+0, 17*8+1, 17*8+2, 17*8+3 },
 	{ 0*16, 1*16, 2*16, 3*16, 4*16, 5*16, 6*16, 7*16,
 			16*16, 17*16, 18*16, 19*16, 20*16, 21*16, 22*16, 23*16 },
-	64*8    /* every sprite takes 64 consecutive bytes */
+	64*8    // every sprite takes 64 consecutive bytes
 };
 
 
@@ -395,24 +384,23 @@
 
 void seicross_state::no_nvram(machine_config &config)
 {
-	/* basic machine hardware */
-	Z80(config, m_maincpu, XTAL(18'432'000) / 6);   /* D780C, 3.072 MHz? */
+	// Basic machine hardware
+	Z80(config, m_maincpu, XTAL(18'432'000) / 6);   // D780C, 3.072 MHz?
 	m_maincpu->set_addrmap(AS_PROGRAM, &seicross_state::main_map);
 	m_maincpu->set_addrmap(AS_IO, &seicross_state::main_portmap);
 	m_maincpu->set_vblank_int("screen", FUNC(seicross_state::vblank_irq));
 
-	NSC8105(config, m_mcu, XTAL(18'432'000) / 6);   /* ??? */
+	NSC8105(config, m_mcu, XTAL(18'432'000) / 6);   // ???
 	m_mcu->set_addrmap(AS_PROGRAM, &seicross_state::mcu_no_nvram_map);
 
-	config.set_maximum_quantum(attotime::from_hz(1200));  /* 20 CPU slices per frame - a high value to ensure proper */
-						/* synchronization of the CPUs */
+	config.set_maximum_quantum(attotime::from_hz(1200)); // 20 CPU slices per frame, a high value to ensure proper synchronization of the CPUs
 
 	WATCHDOG_TIMER(config, "watchdog");
 
-	/* video hardware */
+	// Video hardware
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(60);
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500) /* not accurate */    /* frames per second, vblank duration */);
+	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); // not accurate - frames per second, vblank duration
 	screen.set_size(32*8, 32*8);
 	screen.set_visarea(0*8, 32*8-1, 2*8, 30*8-1);
 	screen.set_screen_update(FUNC(seicross_state::screen_update));
@@ -421,7 +409,7 @@
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_seicross);
 	PALETTE(config, m_palette, FUNC(seicross_state::seicross_palette), 64);
 
-	/* sound hardware */
+	// Sound hardware
 	SPEAKER(config, "speaker").front_center();
 
 	ay8910_device &aysnd(AY8910(config, "aysnd", XTAL(18'432'000) / 12));
@@ -440,7 +428,7 @@
 {
 	no_nvram(config);
 
-	/* basic machine hardware */
+	// Basic machine hardware
 	m_mcu->set_addrmap(AS_PROGRAM, &seicross_state::mcu_nvram_map);
 
 	NVRAM(config, "nvram").set_custom_handler(FUNC(seicross_state::nvram_init));
@@ -449,14 +437,19 @@
 void seicross_state::friskytb(machine_config &config)
 {
 	nvram(config);
-	m_mcu->set_addrmap(AS_OPCODES, &seicross_state::decrypted_opcodes_map);
+	M6802(config.replace(), m_mcu, XTAL(18'432'000) / 6);   // presumed to be an HD46802P or compatible
+	m_mcu->set_addrmap(AS_PROGRAM, &seicross_state::mcu_nvram_map);
 }
 
+void seicross_state::sectznt(machine_config &config)
+{
+	no_nvram(config);
+	M6802(config.replace(), m_mcu, XTAL(18'432'000) / 6);   // actually HD46802P
+	m_mcu->set_addrmap(AS_PROGRAM, &seicross_state::mcu_no_nvram_map);
+}
 
 /***************************************************************************
-
   Game driver(s)
-
 ***************************************************************************/
 
 ROM_START( friskyt )
@@ -654,22 +647,65 @@
 	ROM_LOAD( "pal16h2.3b", 0x0000, 0x0044, CRC(e1a6a86d) SHA1(740a5c2ef8a992f6a794c0fc4c81eb50cfcedc32) )
 ROM_END
 
-void seicross_state::init_friskytb()
-{
-	uint8_t *ROM = memregion("maincpu")->base();
-	// this code is in ROM 6.3h, maps to MCU at dxxx
-	for (int i = 0; i < 0x7800; i++)
-	{
-		m_decrypted_opcodes[i] = bitswap<8>(ROM[i], 6, 7, 5, 4, 3, 2, 0, 1);
-	}
-}
+ROM_START( sectrzont )
+	ROM_REGION( 0x7800, "maincpu", 0 )
+	ROM_LOAD( "czt_1.bin", 0x0000, 0x1000, CRC(f0a45cb4) SHA1(ab3b8d78e25cdbb2fd6a6c0718ae13767364994d) )
+	ROM_LOAD( "czt_2.bin", 0x1000, 0x1000, CRC(fea68ddb) SHA1(b9ed0cad9a2ded04bcc7042d975b77be63313070) )
+	ROM_LOAD( "czt_3.bin", 0x2000, 0x1000, CRC(baad4294) SHA1(e7fc3ccc940de6df8d786c986b602127c9db9ebb) )
+	ROM_LOAD( "czt_4.bin", 0x3000, 0x1000, CRC(75f2ca75) SHA1(fbf990edcb7b5a58f8dcee160883fde5e222ca6b) )
+	ROM_LOAD( "czt_5.bin", 0x4000, 0x1000, CRC(dc14f2c8) SHA1(dcda8d6f7be458d0adcddc37bbe0eb636a5b0b06) )
+	ROM_LOAD( "czt_6.bin", 0x5000, 0x1000, CRC(397a38c5) SHA1(6189028376c1781aae107c5fe0aec181a1d885e1) )
+	ROM_LOAD( "czt_7.bin", 0x6000, 0x1000, CRC(7b34dc1c) SHA1(fb163a908c991cd214e0d2d685e74563a460a929) )
+	ROM_LOAD( "czt_8.bin", 0x7000, 0x0800, CRC(673a20e7) SHA1(66be7581323dceddb594eed53dd3abc62b450327) ) // 1ST AND 2ND HALF IDENTICAL
+	ROM_IGNORE(                    0x0800)
+
+	ROM_REGION( 0x4000, "gfx1", 0 )
+	ROM_LOAD( "czt_11.bin", 0x0000, 0x1000, CRC(fbd9b91d) SHA1(6b3581f4b518c058b970d569ced07dd7dc6a87e6) )
+	ROM_LOAD( "czt_12.bin", 0x1000, 0x1000, CRC(2bdef9ad) SHA1(50fe41e81c1307317b4fb6b47bf0619d141c42ff) )
+	ROM_LOAD( "czt_9.bin",  0x2000, 0x1000, CRC(4819f0cd) SHA1(fa8d371efc3198daf76ff1264e22673c5521becf) )
+	ROM_LOAD( "czt_10.bin", 0x3000, 0x1000, CRC(4c268778) SHA1(a1444fb3eb397c8167d769aa1f935c5f19df4d6d) )
+
+	ROM_REGION( 0x0040, "proms", 0 )
+	ROM_LOAD( "czt_2_82s123.bin", 0x0000, 0x0020, CRC(4d218a3c) SHA1(26364dfdb7e13080357328a06c3bcf504778defd) )
+	ROM_LOAD( "czt_1_82s123.bin", 0x0020, 0x0020, CRC(c550531c) SHA1(d564aeb8a99861d29e00cf968242fe6c6cec478b) )
+
+	ROM_REGION( 0x0100, "plds", 0 )
+	ROM_LOAD( "czt_pal16h2cn.bin", 0x0000, 0x0044, CRC(7edec1ed) SHA1(1b28cb250875f14a76d84bfc0b23ee02b1862c2c) )
+ROM_END
+
+ROM_START( sectrzona ) // This and set seicross seem bug-fixed versions, where the attract mode works. In the other sets during attract the player only goes straight until he crashes
+	ROM_REGION( 0x7800, "maincpu", 0 )
+	ROM_LOAD( "sz1.3a",         0x0000, 0x1000, CRC(f6c3aeca) SHA1(d57019e80f7e3d47ca74f54604e92d40ba9819fc) )
+	ROM_LOAD( "sz2.3c",         0x1000, 0x1000, CRC(f167f10e) SHA1(d23043afe0f7a06fbec92b333d6db172523faf27) )
+	ROM_LOAD( "sz3.3d",         0x2000, 0x1000, CRC(ceb3c8f4) SHA1(e49f834637b4addcf362cd010e31802c3e145cbe) )
+	ROM_LOAD( "sz4.3e",         0x3000, 0x1000, CRC(3112af59) SHA1(3d4e5a74a13bdeaf07f059f8c3a0d2ca8cbb3d32) )
+	ROM_LOAD( "sz5.3fg",        0x4000, 0x1000, CRC(b494a993) SHA1(ed60cbaef2ac780c11426d29a612d34e76b29a0e) )
+	ROM_LOAD( "sz6.3h",         0x5000, 0x1000, CRC(09d5b9da) SHA1(636a8d4717df4ed1fc02fa83782fa8d96b88f969) )
+	ROM_LOAD( "sz7.3i",         0x6000, 0x1000, CRC(13052b03) SHA1(2866f2533a788f734310a74789f762f3fa17a57a) )
+	ROM_LOAD( "sz8.3j",         0x7000, 0x0800, CRC(019f9651) SHA1(2b030e7823b277fb6e3f37753a4d52d277e0e079) )
+
+	ROM_REGION( 0x4000, "gfx1", 0 )
+	ROM_LOAD( "sz11.7k",      0x0000, 0x1000, CRC(fbd9b91d) SHA1(6b3581f4b518c058b970d569ced07dd7dc6a87e6) )
+	ROM_LOAD( "sz12.7m",      0x1000, 0x1000, CRC(2bdef9ad) SHA1(50fe41e81c1307317b4fb6b47bf0619d141c42ff) )
+	ROM_LOAD( "sz9.7j",       0x2000, 0x1000, CRC(4819f0cd) SHA1(fa8d371efc3198daf76ff1264e22673c5521becf) )
+	ROM_LOAD( "sz10.7h",      0x3000, 0x1000, CRC(4c268778) SHA1(a1444fb3eb397c8167d769aa1f935c5f19df4d6d) )
+
+	ROM_REGION( 0x0040, "proms", 0 ) // not dumped for this set
+	ROM_LOAD( "sz73.10c",     0x0000, 0x0020, BAD_DUMP CRC(4d218a3c) SHA1(26364dfdb7e13080357328a06c3bcf504778defd) )
+	ROM_LOAD( "sz74.10b",     0x0020, 0x0020, BAD_DUMP CRC(c550531c) SHA1(d564aeb8a99861d29e00cf968242fe6c6cec478b) )
+
+	ROM_REGION( 0x0100, "plds", 0 ) // not dumped for this set
+	ROM_LOAD( "pal16h2.3b", 0x0000, 0x0044, BAD_DUMP CRC(e1a6a86d) SHA1(740a5c2ef8a992f6a794c0fc4c81eb50cfcedc32) )
+ROM_END
 
 
-GAME( 1981, friskyt,   0,        nvram,    friskyt,  seicross_state, empty_init,    ROT0,  "Nichibutsu", "Frisky Tom (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, friskyta,  friskyt,  nvram,    friskyt,  seicross_state, empty_init,    ROT0,  "Nichibutsu", "Frisky Tom (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1981, friskytb,  friskyt,  friskytb, friskyt,  seicross_state, init_friskytb, ROT0,  "Nichibutsu", "Frisky Tom (set 3, encrypted)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE ) // protection mcu runs encrypted opcodes
-GAME( 1982, radrad,    0,        no_nvram, radrad,   seicross_state, empty_init,    ROT0,  "Nichibutsu USA", "Radical Radial (US)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1983, radradj,   radrad,   no_nvram, radrad,   seicross_state, empty_init,    ROT0,  "Logitec Corp.", "Radical Radial (Japan)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, seicross,  0,        no_nvram, seicross, seicross_state, empty_init,    ROT90, "Nichibutsu / Alice", "Seicross (set 1)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, seicrossa, seicross, no_nvram, seicross, seicross_state, empty_init,    ROT90, "Nichibutsu / Alice", "Seicross (set 2)", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
-GAME( 1984, sectrzon,  seicross, no_nvram, seicross, seicross_state, empty_init,    ROT90, "Nichibutsu / Alice", "Sector Zone", MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, friskyt,   0,        nvram,    friskyt,  seicross_state, empty_init,    ROT0,  "Nichibutsu",         "Frisky Tom (set 1)",                              MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, friskyta,  friskyt,  nvram,    friskyt,  seicross_state, empty_init,    ROT0,  "Nichibutsu",         "Frisky Tom (set 2)",                              MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1981, friskytb,  friskyt,  friskytb, friskyt,  seicross_state, empty_init,    ROT0,  "Nichibutsu",         "Frisky Tom (set 3)",                              MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1982, radrad,    0,        no_nvram, radrad,   seicross_state, empty_init,    ROT0,  "Nichibutsu USA",     "Radical Radial (US)",                             MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1983, radradj,   radrad,   no_nvram, radrad,   seicross_state, empty_init,    ROT0,  "Logitec Corp.",      "Radical Radial (Japan)",                          MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, seicross,  0,        no_nvram, seicross, seicross_state, empty_init,    ROT90, "Nichibutsu / Alice", "Seicross (set 1)",                                MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, seicrossa, seicross, no_nvram, seicross, seicross_state, empty_init,    ROT90, "Nichibutsu / Alice", "Seicross (set 2)",                                MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sectrzon,  seicross, no_nvram, seicross, seicross_state, empty_init,    ROT90, "Nichibutsu / Alice", "Sector Zone (set 1)",                             MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sectrzont, seicross, sectznt,  seicross, seicross_state, empty_init,    ROT90, "Nichibutsu / Alice", "Sector Zone (set 2, Tecfri hardware)",            MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
+GAME( 1984, sectrzona, seicross, no_nvram, seicross, seicross_state, empty_init,    ROT90, "Nichibutsu / Alice", "Sector Zone (set 3)",                             MACHINE_NO_COCKTAIL | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/seta.cpp mame-0.224+dfsg.1/src/mame/drivers/seta.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/seta.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/seta.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -139,6 +139,7 @@
   stage 2: when BOX-MEN gets angry
 - games using 6bpp gfx switch tilemaps color mode. Only blandia uses both, while the other ones use only mode 1, thus mode 0 is untested for them
 
+
 ***************************************************************************/
 
 /***************************************************************************
@@ -4558,11 +4559,11 @@
 	JOY_TYPE2_2BUTTONS(2)
 
 	PORT_START("COINS") //Coins
-	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_TILT     )
+	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_TILT )
 	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_SERVICE1 )
 	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
@@ -4642,7 +4643,7 @@
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT     )
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT )
 	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
@@ -4711,7 +4712,7 @@
 	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
 	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1  )
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
 
 	PORT_START("P2") //Player 2
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_2WAY PORT_PLAYER(2)
@@ -4808,10 +4809,10 @@
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
 	PORT_SERVICE_NO_TOGGLE( 0x0008, IP_ACTIVE_LOW )
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN  )
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("DSW") //2 DSWs - $600001 & 3.b
 	PORT_DIPNAME( 0x000f, 0x000f, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3,4")
@@ -4867,34 +4868,34 @@
 
 static INPUT_PORTS_START( zombraid )
 	PORT_START("P1") //Player 1
-	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1  ) PORT_PLAYER(1)  PORT_NAME("P1 Trigger")
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2  ) PORT_PLAYER(1)  PORT_NAME("P1 Reload")
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1   )
+	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)  PORT_NAME("P1 Trigger")
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)  PORT_NAME("P1 Reload")
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START1 )
 
 	PORT_START("P2") //Player 2
-	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1  ) PORT_PLAYER(2)  PORT_NAME("P2 Trigger")
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2  ) PORT_PLAYER(2)  PORT_NAME("P2 Reload")
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2   )
+	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)  PORT_NAME("P2 Trigger")
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)  PORT_NAME("P2 Reload")
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_START2 )
 
 	PORT_START("COINS") //Coins
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
 	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN  )
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("DSW")
 	PORT_DIPNAME( 0x0001, 0x0001, "Vertical Screen Flip" ) PORT_DIPLOCATION("SW2:1")
@@ -4907,9 +4908,9 @@
 	PORT_DIPSETTING(      0x0000, DEF_STR( Off ) )
 	PORT_DIPSETTING(      0x0004, DEF_STR( On ) )
 	PORT_DIPNAME( 0x0018, 0x0018, DEF_STR( Difficulty ) ) PORT_DIPLOCATION("SW2:4,5")
-	PORT_DIPSETTING(      0x0010, DEF_STR( Easy )    )
-	PORT_DIPSETTING(      0x0018, DEF_STR( Normal )  )
-	PORT_DIPSETTING(      0x0008, DEF_STR( Hard )    )
+	PORT_DIPSETTING(      0x0010, DEF_STR( Easy ) )
+	PORT_DIPSETTING(      0x0018, DEF_STR( Normal ) )
+	PORT_DIPSETTING(      0x0008, DEF_STR( Hard ) )
 	PORT_DIPSETTING(      0x0000, DEF_STR( Hardest ) )
 	PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Allow_Continue ) ) PORT_DIPLOCATION("SW2:6")
 	PORT_DIPSETTING(      0x0000, DEF_STR( Off ) )
@@ -4971,11 +4972,11 @@
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN  )
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN  )
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("DSW") //2 DSWs - $600001 & 3.b
 	PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("SW2:1,2,3")
@@ -5039,7 +5040,7 @@
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT     )
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT )
 	/* These are NOT Dip Switches but jumpers */
 	PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unused ) )
 	PORT_DIPSETTING(      0x0010, DEF_STR( Off ) )
@@ -5125,11 +5126,11 @@
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) PORT_IMPULSE(5)
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW,  IPT_UNKNOWN )
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW,  IPT_UNKNOWN )
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW,  IPT_UNKNOWN )
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW,  IPT_UNKNOWN )
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW,  IPT_UNKNOWN )
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("DSW") //2 DSWs - $600001 & 3.b
 	PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW1:1")
@@ -5208,20 +5209,22 @@
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_IMPULSE(5)
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 )
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT     )
-	/* These are NOT Dip Switches but jumpers */
-	PORT_DIPNAME( 0x0010, 0x0010, DEF_STR( Unused ) )
-	PORT_DIPSETTING(      0x0010, DEF_STR( Off ) )
-	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0020, 0x0020, DEF_STR( Unused ) )
-	PORT_DIPSETTING(      0x0020, DEF_STR( Off ) )
-	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0040, 0x0040, DEF_STR( Unused ) )
-	PORT_DIPSETTING(      0x0040, DEF_STR( Off ) )
-	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
-	PORT_DIPNAME( 0x0080, 0x0000, "Country" )
-	PORT_DIPSETTING(      0x0080, DEF_STR( Japan ) )
-	PORT_DIPSETTING(      0x0000, DEF_STR( World ) )
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_TILT )
+	// Soldered Jumpers on board
+	PORT_CONFNAME( 0x0010, 0x0010, DEF_STR( Unused ) )
+	PORT_CONFSETTING(      0x0010, DEF_STR( Off ) )
+	PORT_CONFSETTING(      0x0000, DEF_STR( On ) )
+	PORT_CONFNAME( 0x0020, 0x0020, DEF_STR( Unused ) )
+	PORT_CONFSETTING(      0x0020, DEF_STR( Off ) )
+	PORT_CONFSETTING(      0x0000, DEF_STR( On ) )
+	PORT_CONFNAME( 0x0040, 0x0040, DEF_STR( Unused ) )
+	PORT_CONFSETTING(      0x0040, DEF_STR( Off ) )
+	PORT_CONFSETTING(      0x0000, DEF_STR( On ) )
+	// TODO: pinpoint for what market is the Chinese title for
+	// (Is our current romset even suited for this setting to properly work? It still says Mad Shark during attract)
+	PORT_CONFNAME( 0x0080, 0x0000, "Title Language" )       // Changes title graphics only
+	PORT_CONFSETTING(      0x0000, "English" )              // Mad Shark - title used in most of the world, including Japan
+	PORT_CONFSETTING(      0x0080, "Traditional Chinese" )  // 最強鮫 - presumably for Taiwan (Zuìqiáng Jiāo) or Hong Kong (Zeoi Koeng Gaau)
 
 	PORT_START("DSW") //2 DSWs
 	PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("SW2:1")
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/sfkick.cpp mame-0.224+dfsg.1/src/mame/drivers/sfkick.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/sfkick.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/sfkick.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -155,6 +155,7 @@
 #include "emu.h"
 #include "cpu/z80/z80.h"
 #include "video/v9938.h"
+#include "machine/bankdev.h"
 #include "machine/gen_latch.h"
 #include "machine/i8255.h"
 #include "sound/2203intf.h"
@@ -169,18 +170,8 @@
 		: driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
 		m_soundcpu(*this, "soundcpu"),
-		m_region_bios(*this, "bios"),
-		m_region_extrom(*this, "extrom"),
-		m_region_banked(*this, "banked"),
-		m_region_cartridge(*this, "cartridge"),
-		m_bank1(*this, "bank1"),
-		m_bank2(*this, "bank2"),
-		m_bank3(*this, "bank3"),
-		m_bank4(*this, "bank4"),
-		m_bank5(*this, "bank5"),
-		m_bank6(*this, "bank6"),
-		m_bank7(*this, "bank7"),
-		m_bank8(*this, "bank8"),
+		m_page(*this, "page%u", 0U),
+		m_bank(*this, "bank%u", 0U),
 		m_in0(*this, "IN0"),
 		m_in1(*this, "IN1"),
 		m_dial(*this, "DIAL"),
@@ -190,44 +181,31 @@
 
 	void sfkick(machine_config &config);
 
-	void init_sfkick();
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
 
 private:
-	void page0_w(offs_t offset, uint8_t data);
-	void page1_w(offs_t offset, uint8_t data);
-	void page2_w(offs_t offset, uint8_t data);
-	void page3_w(offs_t offset, uint8_t data);
+	uint8_t mem_r(offs_t offset);
+	void mem_w(offs_t offset, uint8_t data);
+	void bank_w(offs_t offset, uint8_t data);
 	uint8_t ppi_port_b_r();
 	void ppi_port_a_w(uint8_t data);
 	void ppi_port_c_w(uint8_t data);
-	virtual void machine_reset() override;
-	void sfkick_remap_banks();
-	void sfkick_bank_set(int num, int data);
 	DECLARE_WRITE_LINE_MEMBER(irqhandler);
 	void sfkick_io_map(address_map &map);
 	void sfkick_map(address_map &map);
 	void sfkick_sound_io_map(address_map &map);
 	void sfkick_sound_map(address_map &map);
+	void bank_mem(address_map &map);
 
-	std::unique_ptr<uint8_t[]> m_main_mem;
-	int m_bank_cfg;
-	int m_bank[8];
+	uint8_t m_primary_slot_reg;
 	int m_input_mux;
 
 	required_device<cpu_device> m_maincpu;
 	required_device<cpu_device> m_soundcpu;
-	required_memory_region m_region_bios;
-	required_memory_region m_region_extrom;
-	required_memory_region m_region_banked;
-	required_memory_region m_region_cartridge;
-	required_memory_bank m_bank1;
-	required_memory_bank m_bank2;
-	required_memory_bank m_bank3;
-	required_memory_bank m_bank4;
-	required_memory_bank m_bank5;
-	required_memory_bank m_bank6;
-	required_memory_bank m_bank7;
-	required_memory_bank m_bank8;
+	required_device_array<address_map_bank_device, 4> m_page;
+	required_memory_bank_array<8> m_bank;
 	required_ioport m_in0;
 	required_ioport m_in1;
 	required_ioport m_dial;
@@ -238,245 +216,72 @@
 
 #define MASTER_CLOCK    XTAL(21'477'272)
 
-
-uint8_t sfkick_state::ppi_port_b_r()
-{
-	switch(m_input_mux&0x0f)
-	{
-		case 0: return m_in0->read();
-		case 1: return m_in1->read();
-		case 2: return bitswap<8>(m_dial->read(),4,5,6,7,3,2,1,0);
-		case 3: return m_dsw1->read();
-		case 4: return m_dsw2->read();
-	}
-	return 0xff;
-}
-
-void sfkick_state::sfkick_remap_banks()
+uint8_t sfkick_state::mem_r(offs_t offset)
 {
-	/* 0000-3fff */
-	switch(m_bank_cfg&3)
-	{
-		case 0: /* bios */
-		{
-			uint8_t *mem = m_region_bios->base();
-			m_bank1->set_base(mem);
-			m_bank2->set_base(mem+0x2000);
-		}
-		break;
-
-		case 1: /* ext rom */
-		{
-			uint8_t *mem = m_region_extrom->base();
-			m_bank1->set_base(mem+0x4000);
-			m_bank2->set_base(mem+0x6000);
-		}
-		break;
-
-		case 2: /* banked */
-		{
-			uint8_t *mem = m_region_banked->base();
-			m_bank1->set_base(mem+0x2000*m_bank[0]);
-			m_bank2->set_base(mem+0x2000*m_bank[1]);
-		}
-		break;
-
-		case 3: /* unknown */
-		{
-			uint8_t *mem = m_region_banked->base();
-			m_bank1->set_base(mem+0x18000);
-			m_bank2->set_base(mem+0x18000);
-		}
-		break;
-	}
-
-	/* 4000-7fff */
-	switch((m_bank_cfg>>2)&3)
-	{
-		case 0: /* bios - upper part */
-		{
-			uint8_t *mem = m_region_bios->base();
-			m_bank3->set_base(mem+0x4000);
-			m_bank4->set_base(mem+0x6000);
-		}
-		break;
-
-		case 1:  /* unknown */
-		case 3:
-		{
-			uint8_t *mem = m_region_banked->base();
-			m_bank3->set_base(mem+0x18000);
-			m_bank4->set_base(mem+0x18000);
-		}
-		break;
-
-		case 2: /* banked */
-		{
-			uint8_t *mem = m_region_banked->base();
-			m_bank3->set_base(mem+0x2000*m_bank[2]);
-			m_bank4->set_base(mem+0x2000*m_bank[3]);
-		}
-		break;
-	}
-
-	/* 8000-bfff */
-	switch((m_bank_cfg>>4)&3)
-	{
-		case 0: /* cartridge */
-		{
-			uint8_t *mem = m_region_cartridge->base();
-			m_bank5->set_base(mem+0x4000);
-			m_bank6->set_base(mem+0x6000);
-		}
-		break;
-
-		case 1: /* unknown */
-		case 3:
-		{
-			uint8_t *mem = m_region_banked->base();
-			m_bank5->set_base(mem+0x18000);
-			m_bank6->set_base(mem+0x18000);
-		}
-		break;
-
-		case 2: /* banked */
-		{
-			uint8_t *mem = m_region_banked->base();
-			m_bank5->set_base(mem+0x2000*m_bank[4]);
-			m_bank6->set_base(mem+0x2000*m_bank[5]);
-		}
-		break;
-	}
-
-	/* c000-ffff */
-	switch((m_bank_cfg>>6)&3)
-	{
-		case 0: /* unknown */
-		case 1:
-		{
-			uint8_t *mem = m_region_banked->base();
-			m_bank7->set_base(mem+0x18000);
-			m_bank8->set_base(mem+0x18000);
-		}
-		break;
-
-		case 2: /* banked */
-		{
-			uint8_t *mem = m_region_banked->base();
-			m_bank7->set_base(mem+0x2000*m_bank[6]);
-			m_bank8->set_base(mem+0x2000*m_bank[7]);
-		}
-		break;
-
-		case 3: /* RAM */
-		{
-			m_bank7->set_base(m_main_mem.get());
-			m_bank8->set_base(m_main_mem.get()+0x2000);
-		}
-		break;
-	}
+	return m_page[offset >> 14 & 3]->read8(offset);
 }
 
-void sfkick_state::ppi_port_a_w(uint8_t data)
+void sfkick_state::mem_w(offs_t offset, uint8_t data)
 {
-	m_bank_cfg=data;
-	sfkick_remap_banks();
+	m_page[offset >> 14 & 3]->write8(offset, data);
 }
 
-void sfkick_state::sfkick_bank_set(int num, int data)
+void sfkick_state::bank_w(offs_t offset, uint8_t data)
 {
-	/* ignore bit 1 */
-	data&=0xf;
-	num&=5;
-	m_bank[num]=data;
-	num|=2;
-	m_bank[num]=data;
-	sfkick_remap_banks();
+	m_bank[offset >> 13 & 7]->set_entry(data & 0xf);
 }
 
-void sfkick_state::page0_w(offs_t offset, uint8_t data)
+uint8_t sfkick_state::ppi_port_b_r()
 {
-	if((m_bank_cfg&3)==2)
+	switch(m_input_mux & 0x0f)
 	{
-		if(offset<0x2000)
-		{
-			sfkick_bank_set(0,data);
-		}
-		else
-		{
-			sfkick_bank_set(1,data);
-		}
+		case 0: return m_in0->read();
+		case 1: return m_in1->read();
+		case 2: return bitswap<8>(m_dial->read(), 4, 5, 6, 7, 3, 2, 1, 0);
+		case 3: return m_dsw1->read();
+		case 4: return m_dsw2->read();
 	}
+	return 0xff;
 }
 
-void sfkick_state::page1_w(offs_t offset, uint8_t data)
+void sfkick_state::ppi_port_a_w(uint8_t data)
 {
-	if(((m_bank_cfg>>2)&3)==2)
+	if (data != m_primary_slot_reg)
 	{
-		if(offset<0x2000)
-		{
-			sfkick_bank_set(2,data);
-		}
-		else
-		{
-			sfkick_bank_set(3,data);
-		}
-	}
-}
+		for (int i = 0; i < 4; i++)
+			m_page[i]->set_bank(data >> (i * 2) & 3);
 
-void sfkick_state::page2_w(offs_t offset, uint8_t data)
-{
-	if(((m_bank_cfg>>4)&3)==2)
-	{
-		if(offset<0x2000)
-		{
-			sfkick_bank_set(4,data);
-		}
-		else
-		{
-			sfkick_bank_set(5,data);
-		}
+		m_primary_slot_reg = data;
 	}
 }
 
-void sfkick_state::page3_w(offs_t offset, uint8_t data)
+void sfkick_state::sfkick_map(address_map &map)
 {
-	if(((m_bank_cfg>>6)&3)==2)
-	{
-		if(offset<0x2000)
-		{
-			sfkick_bank_set(6,data);
-		}
-		else
-		{
-			sfkick_bank_set(7,data);
-		}
-	}
-	else
-	{
-		if(((m_bank_cfg>>6)&3)==3)
-		{
-			m_main_mem[offset]=data;
-		}
-	}
+	map(0x0000, 0xffff).rw(FUNC(sfkick_state::mem_r), FUNC(sfkick_state::mem_w)); // 4 pages of 16KB
 }
 
-
-
-void sfkick_state::sfkick_map(address_map &map)
+void sfkick_state::bank_mem(address_map &map)
 {
-	map(0x0000, 0x1fff).bankr("bank1");
-	map(0x2000, 0x3fff).bankr("bank2");
-	map(0x4000, 0x5fff).bankr("bank3");
-	map(0x6000, 0x7fff).bankr("bank4");
-	map(0x8000, 0x9fff).bankr("bank5");
-	map(0xa000, 0xbfff).bankr("bank6");
-	map(0xc000, 0xdfff).bankr("bank7");
-	map(0xe000, 0xffff).bankr("bank8");
-	map(0x0000, 0x3fff).w(FUNC(sfkick_state::page0_w));
-	map(0x4000, 0x7fff).w(FUNC(sfkick_state::page1_w));
-	map(0x8000, 0xbfff).w(FUNC(sfkick_state::page2_w));
-	map(0xc000, 0xffff).w(FUNC(sfkick_state::page3_w));
+	// slot 0, MSX BIOS
+	map(0x00000, 0x07fff).rom().region("bios", 0);
+	map(0x08000, 0x0bfff).rom().region("cartridge", 0x4000);
+
+	// slot 1, extrom
+	map(0x10000, 0x13fff).rom().region("extrom", 0x4000);
+
+	// slot 2, banked
+	map(0x20000, 0x21fff).bankr(m_bank[0]);
+	map(0x22000, 0x23fff).bankr(m_bank[1]);
+	map(0x24000, 0x25fff).bankr(m_bank[2]);
+	map(0x26000, 0x27fff).bankr(m_bank[3]);
+	map(0x28000, 0x29fff).bankr(m_bank[4]);
+	map(0x2a000, 0x2bfff).bankr(m_bank[5]);
+	map(0x2c000, 0x2dfff).bankr(m_bank[6]);
+	map(0x2e000, 0x2ffff).bankr(m_bank[7]);
+	map(0x20000, 0x2ffff).w(FUNC(sfkick_state::bank_w));
+
+	// slot 3, 16KB RAM
+	map(0x3c000, 0x3ffff).ram();
 }
 
 void sfkick_state::sfkick_io_map(address_map &map)
@@ -486,7 +291,7 @@
 	map(0xa0, 0xa7).w("soundlatch", FUNC(generic_latch_8_device::write));
 	map(0x98, 0x9b).rw("v9938", FUNC(v9938_device::read), FUNC(v9938_device::write));
 	map(0xa8, 0xab).rw("ppi8255", FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0xb4, 0xb5).ram(); /* loopback ? req by sfkicka (MSX Bios leftover)*/
+	map(0xb4, 0xb5).ram(); // loopback ? req by sfkicka (MSX Bios leftover)
 }
 
 void sfkick_state::sfkick_sound_map(address_map &map)
@@ -504,17 +309,17 @@
 
 void sfkick_state::ppi_port_c_w(uint8_t data)
 {
-	m_input_mux=data;
+	m_input_mux = data;
 }
 
 static INPUT_PORTS_START( sfkick )
 	PORT_START("IN0")
-	PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED ) /* unused ? */
+	PORT_BIT( 0x3f, IP_ACTIVE_LOW, IPT_UNUSED ) // unused ?
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
 
 	PORT_START("IN1")
-	PORT_BIT( 0x71, IP_ACTIVE_LOW, IPT_UNUSED ) /* unused ? */
+	PORT_BIT( 0x71, IP_ACTIVE_LOW, IPT_UNUSED ) // unused ?
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_START1 )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START2 )
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
@@ -523,11 +328,11 @@
 	PORT_START("DIAL")
 	PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(25) PORT_KEYDELTA(-20)
 
-	PORT_START("DSW1") /* bitswapped at read! 76543210 -> 45673210 */
+	PORT_START("DSW1") // bitswapped at read! 76543210 -> 45673210
 	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Cabinet ) )  PORT_DIPLOCATION("SW1:1")
 	PORT_DIPSETTING(    0x10, DEF_STR( Upright ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Cocktail ) )
-	PORT_DIPNAME( 0x01, 0x01,  "Stage Select" ) PORT_DIPLOCATION("SW1:2") /* How does this work?? */
+	PORT_DIPNAME( 0x01, 0x01,  "Stage Select" ) PORT_DIPLOCATION("SW1:2") // How does this work??
 	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
 	PORT_DIPNAME( 0x20, 0x20,  "Freeze" )   PORT_DIPLOCATION("SW1:3")
@@ -549,8 +354,8 @@
 	PORT_DIPSETTING(    0x0c, DEF_STR( 1C_3C ) )
 	PORT_DIPSETTING(    0x08, DEF_STR( 1C_5C ) )
 
-	PORT_START("DSW2") /* bitswapped at read! 76543210 -> 45673210 */
-	PORT_DIPUNUSED_DIPLOC( 0x10, IP_ACTIVE_LOW, "SW2:1" ) /* Manual states "No Comment" */
+	PORT_START("DSW2") // bitswapped at read! 76543210 -> 45673210
+	PORT_DIPUNUSED_DIPLOC( 0x10, IP_ACTIVE_LOW, "SW2:1" ) // Manual states "No Comment"
 	PORT_DIPNAME( 0x20, 0x20, DEF_STR( Demo_Sounds ) )  PORT_DIPLOCATION("SW2:2")
 	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
 	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
@@ -571,19 +376,25 @@
 	PORT_DIPSETTING(    0x00, DEF_STR( Hardest ) )
 INPUT_PORTS_END
 
+void sfkick_state::machine_start()
+{
+	// init banks
+	for (int i = 0; i < 8; i++)
+		m_bank[i]->configure_entries(0, 0x10, memregion("banked")->base(), 0x2000);
+
+	save_item(NAME(m_primary_slot_reg));
+	save_item(NAME(m_input_mux));
+}
 
 void sfkick_state::machine_reset()
 {
-	m_bank_cfg=0;
-	m_bank[0]=0;
-	m_bank[1]=0;
-	m_bank[2]=0;
-	m_bank[3]=0;
-	m_bank[4]=0;
-	m_bank[5]=0;
-	m_bank[6]=0;
-	m_bank[7]=0;
-	sfkick_remap_banks();
+	m_primary_slot_reg = 0;
+	m_input_mux = 0;
+
+	for (int i = 0; i < 4; i++)
+		m_page[i]->set_bank(0);
+	for (int i = 0; i < 8; i++)
+		m_bank[i]->set_entry(i);
 }
 
 WRITE_LINE_MEMBER(sfkick_state::irqhandler)
@@ -603,10 +414,15 @@
 	m_soundcpu->set_addrmap(AS_PROGRAM, &sfkick_state::sfkick_sound_map);
 	m_soundcpu->set_addrmap(AS_IO, &sfkick_state::sfkick_sound_io_map);
 
+	ADDRESS_MAP_BANK(config, m_page[0]).set_map(&sfkick_state::bank_mem).set_options(ENDIANNESS_LITTLE, 8, 18, 0x10000);
+	ADDRESS_MAP_BANK(config, m_page[1]).set_map(&sfkick_state::bank_mem).set_options(ENDIANNESS_LITTLE, 8, 18, 0x10000);
+	ADDRESS_MAP_BANK(config, m_page[2]).set_map(&sfkick_state::bank_mem).set_options(ENDIANNESS_LITTLE, 8, 18, 0x10000);
+	ADDRESS_MAP_BANK(config, m_page[3]).set_map(&sfkick_state::bank_mem).set_options(ENDIANNESS_LITTLE, 8, 18, 0x10000);
+
 	v9938_device &v9938(V9938(config, "v9938", MASTER_CLOCK));
 	v9938.set_screen_ntsc("screen");
 	v9938.set_vram_size(0x80000);
-	v9938.int_cb().set_inputline("maincpu", 0);
+	v9938.int_cb().set_inputline(m_maincpu, 0);
 	SCREEN(config, "screen", SCREEN_TYPE_RASTER);
 
 	i8255_device &ppi(I8255A(config, "ppi8255"));
@@ -626,13 +442,6 @@
 	ym1.add_route(3, "mono", 0.50);
 }
 
-void sfkick_state::init_sfkick()
-{
-	m_main_mem = std::make_unique<uint8_t[]>(0x4000);
-}
-
-
-
 
 ROM_START( sfkick )
 	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
@@ -641,7 +450,7 @@
 	ROM_LOAD( "sfkick2.a7", 0x00000, 0x8000, CRC(1dcaec5e) SHA1(7e063d46fb6606df2d772866cc55f207035b98c4) )
 	ROM_LOAD( "sfkick3.c7", 0x08000, 0x8000, CRC(639d3cf2) SHA1(950fd28058d32e4532eb6e99454dcaef092a955e) )
 	ROM_LOAD( "sfkick4.d7", 0x10000, 0x8000, CRC(ee1b344e) SHA1(d33fbad017cc4838192e9c540621537edb7e8dc4) )
-	/* 0x18000-0x1ffff = empty */
+	// 0x18000-0x1ffff = empty
 
 	ROM_REGION(0x8000,  "extrom", 0)
 	ROM_LOAD( "sfkick5.h7", 0x00000, 0x8000, CRC(8e8bd9cf) SHA1(f493de40147fdd67a48d4c90b01170fbd6ea074e) )
@@ -664,10 +473,10 @@
 	ROM_LOAD( "c145.bin", 0x00000, 0x8000, CRC(1dcaec5e) SHA1(7e063d46fb6606df2d772866cc55f207035b98c4) )
 	ROM_LOAD( "c146.bin", 0x08000, 0x8000, CRC(57afc4c6) SHA1(ee28b3f74e3175c22f542855b09f1673d048b1fa) )
 	ROM_LOAD( "c147.bin", 0x10000, 0x8000, CRC(ee1b344e) SHA1(d33fbad017cc4838192e9c540621537edb7e8dc4) )
-	/* 0x18000-0x1ffff = empty */
+	// 0x18000-0x1ffff = empty
 
 	ROM_REGION(0x8000,  "extrom", 0)
-		ROM_LOAD( "c149.bin", 0x00000, 0x8000, CRC(2edbf61f) SHA1(23dcff43faf222a4b69001312ce4b1c920e2f4c2) )
+	ROM_LOAD( "c149.bin", 0x00000, 0x8000, CRC(2edbf61f) SHA1(23dcff43faf222a4b69001312ce4b1c920e2f4c2) )
 
 	ROM_REGION(0x8000,  "cartridge", 0)
 	ROM_LOAD( "c150.bin", 0x0000, 0x8000, CRC(20412918) SHA1(b0fefa957b20373ffb84d9ff97a2e84a9a3af56c) )
@@ -687,7 +496,7 @@
 	ROM_LOAD( "spinkick.r2", 0x00000, 0x8000, CRC(1dcaec5e) SHA1(7e063d46fb6606df2d772866cc55f207035b98c4) )
 	ROM_LOAD( "spinkick.r3", 0x08000, 0x8000, CRC(e86a194a) SHA1(19a02375ec463e795770403c3e948d754919458b) )
 	ROM_LOAD( "spinkick.r4", 0x10000, 0x8000, CRC(ee1b344e) SHA1(d33fbad017cc4838192e9c540621537edb7e8dc4) )
-	/* 0x18000-0x1ffff = empty */
+	// 0x18000-0x1ffff = empty
 
 	ROM_REGION(0x8000,  "extrom", 0)
 	ROM_LOAD( "spinkick.r5", 0x00000, 0x8000, CRC(8e8bd9cf) SHA1(f493de40147fdd67a48d4c90b01170fbd6ea074e) )
@@ -703,6 +512,6 @@
 ROM_END
 
 
-GAME( 1988, sfkick,   0,      sfkick, sfkick, sfkick_state, init_sfkick, ROT90, "Haesung/HJ Corp", "Super Free Kick (set 1)", 0 )
-GAME( 198?, sfkicka,  sfkick, sfkick, sfkick, sfkick_state, init_sfkick, ROT90, "Haesung", "Super Free Kick (set 2)", 0 )
-GAME( 1988, spinkick, sfkick, sfkick, sfkick, sfkick_state, init_sfkick, ROT90, "Haesung/Seojin", "Hec's Spinkick", 0 )
+GAME( 1988, sfkick,   0,      sfkick, sfkick, sfkick_state, empty_init, ROT90, "Haesung/HJ Corp", "Super Free Kick (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 198?, sfkicka,  sfkick, sfkick, sfkick, sfkick_state, empty_init, ROT90, "Haesung",         "Super Free Kick (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, spinkick, sfkick, sfkick, sfkick, sfkick_state, empty_init, ROT90, "Haesung/Seojin",  "Hec's Spinkick",          MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/shine.cpp mame-0.224+dfsg.1/src/mame/drivers/shine.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/shine.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/shine.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,12 +1,22 @@
 // license:BSD-3-Clause
 // copyright-holders:Nigel Barnes
-/***************************************************************************
+/***********************************************************************************
 
     Shine/1
 
     TODO: everything to be verified.
 
-****************************************************************************/
+The system rom has an inbuilt monitor program - unknown how to access it.
+
+The floppy disk is accessed via an "expansion" socket on the back. Inbuilt commands
+such as DIR [1|2], RENAME, ERASE, PROT, XFER look interesting. The DIR command does
+multiple reads of 0x9E00.
+
+There's a DIN socket for cassette. Commands BAUD, SAVE, LOAD appear to be the ones
+but the syntax has yet to be worked out. BAUD [0-9] is allowed but what is it doing?
+
+
+************************************************************************************/
 
 #include "emu.h"
 #include "cpu/m6502/m6502.h"
@@ -35,21 +45,21 @@
 		, m_via(*this, "via%u", 0)
 		, m_fdc(*this, "fdc")
 		, m_floppy(*this, "fdc:%u", 0)
-		, m_cassette(*this, "cassette")
 		, m_centronics(*this, "centronics")
 		, m_speaker(*this, "speaker")
 		, m_cass(*this, "cassette")
 		, m_irqs(*this, "irqs")
-		, m_y(*this, "Y%u", 0)
+		, m_y(*this, "Y%u", 0U)
 		, m_video_ram(*this, "video_ram")
 	{ }
 
-	virtual void machine_start() override;
-	void shine_mem(address_map &map);
-
 	void shine(machine_config &config);
 
+protected:
+	virtual void machine_start() override;
+
 private:
+	void shine_mem(address_map &map);
 	uint8_t via0_pa_r();
 	void via0_pb_w(uint8_t data);
 	void floppy_w(uint8_t data);
@@ -61,7 +71,6 @@
 	required_device_array<via6522_device, 2> m_via;
 	required_device<fd1771_device> m_fdc;
 	required_device_array<floppy_connector, 2> m_floppy;
-	required_device<cassette_image_device> m_cassette;
 	required_device<centronics_device> m_centronics;
 	required_device<speaker_sound_device> m_speaker;
 	required_device<cassette_image_device> m_cass;
@@ -70,7 +79,7 @@
 	required_shared_ptr<uint8_t> m_video_ram;
 
 	/* keyboard state */
-	int m_keylatch;
+	u8 m_keylatch;
 };
 
 
@@ -84,7 +93,7 @@
 	map(0x9800, 0x980f).m(m_via[1], FUNC(via6522_device::map));
 	map(0x9c00, 0x9c03).rw(m_fdc, FUNC(fd1771_device::read), FUNC(fd1771_device::write));
 	map(0x9d00, 0x9d00).w(FUNC(shine_state::floppy_w));
-	map(0xb000, 0xffff).rom();
+	map(0xb000, 0xffff).rom().region("maincpu",0);
 }
 
 
@@ -258,6 +267,7 @@
 	m_via[0]->readpa_handler().set(FUNC(shine_state::via0_pa_r));
 	m_via[0]->writepb_handler().set(FUNC(shine_state::via0_pb_w));
 	m_via[0]->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<0>));
+	m_via[0]->cb2_handler().set(m_speaker, FUNC(speaker_sound_device::level_w));
 
 	VIA6522(config, m_via[1], 1000000);
 	m_via[1]->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<1>));
@@ -276,14 +286,14 @@
 
 
 ROM_START( shine )
-	ROM_REGION( 0x10000, "maincpu", 0 )
-	ROM_LOAD("basic_plus.ic58", 0xb000, 0x1000, CRC(c75d9675) SHA1(eecc12533aa33c7744e1ea1fde56883739ac7436))
-	ROM_LOAD("disco-dk2.ic59",  0xc000, 0x1000, CRC(b9230d50) SHA1(3975e5850356c035cd1963e0fbca1e980463ee01))
-	ROM_LOAD("d3.ic62",         0xd000, 0x1000, CRC(7c88e219) SHA1(93003715bb82d63b6d4f673f89eae59c73f2945e))
-	ROM_LOAD("e3.ic61",         0xe000, 0x1000, CRC(5a1624e9) SHA1(b4fbc983c646d4e70dda878d5dd75e45408522a9))
-	ROM_LOAD("f3.ic60",         0xf000, 0x1000, CRC(1549ca2f) SHA1(5b011cdca0121a550af956b6d4580544942459ce))
+	ROM_REGION( 0x5000, "maincpu", 0 )
+	ROM_LOAD("basic_plus.ic58", 0x0000, 0x1000, CRC(c75d9675) SHA1(eecc12533aa33c7744e1ea1fde56883739ac7436))
+	ROM_LOAD("disco-dk2.ic59",  0x1000, 0x1000, CRC(b9230d50) SHA1(3975e5850356c035cd1963e0fbca1e980463ee01))
+	ROM_LOAD("d3.ic62",         0x2000, 0x1000, CRC(7c88e219) SHA1(93003715bb82d63b6d4f673f89eae59c73f2945e))
+	ROM_LOAD("e3.ic61",         0x3000, 0x1000, CRC(5a1624e9) SHA1(b4fbc983c646d4e70dda878d5dd75e45408522a9))
+	ROM_LOAD("f3.ic60",         0x4000, 0x1000, CRC(1549ca2f) SHA1(5b011cdca0121a550af956b6d4580544942459ce))
 ROM_END
 
 
 /*    YEAR  NAME    PARENT  COMPAT  MACHINE   INPUT   CLASS         INIT         COMPANY                  FULLNAME    FLAGS */
-COMP( 1983, shine,  0,      0,      shine,    shine,  shine_state,  empty_init,  "Lorenzon Elettronica",  "Shine/1",  MACHINE_NOT_WORKING )
+COMP( 1983, shine,  0,      0,      shine,    shine,  shine_state,  empty_init,  "Lorenzon Elettronica",  "Shine/1", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/sidepckt.cpp mame-0.224+dfsg.1/src/mame/drivers/sidepckt.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/sidepckt.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/sidepckt.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -480,7 +480,7 @@
 
 	ROM_REGION( 0x0200, "proms", 0 )    /* color PROMs */
 	ROM_LOAD( "dh-09.16l", 0x0000, 0x0100, CRC(ce049b4f) SHA1(e4918cef7b319dd40cf1722eb8bf5e79be04fd6c) )
-	ROM_LOAD( "dh-08.16l", 0x0100, 0x0100, CRC(cdf2180f) SHA1(123215d096f88b66396d40d7a579380d0b5b2b89) )
+	ROM_LOAD( "dh-08.15l", 0x0100, 0x0100, CRC(cdf2180f) SHA1(123215d096f88b66396d40d7a579380d0b5b2b89) )
 ROM_END
 
 ROM_START( sidepcktb )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/sigmab31.cpp mame-0.224+dfsg.1/src/mame/drivers/sigmab31.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/sigmab31.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/sigmab31.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,199 @@
+// license:BSD-3-Clause
+// copyright-holders:
+/*
+
+SIGMA B31 SYSTEM
+Seems a predecessor (or only mechanical version) of the hardware in sigmab52.cpp
+
+Board silkscreend on top    sigma,inc. B31-1E
+                B31-1E      GTP
+                MECH-SLOT   (MS)
+                1ST REEL
+                2ND REEL
+                3RD REEL
+                4TH REEL
+                5TH REEL
+                sigma, inc.
+
+Board stickered on top x2   microware
+                            (c)MICROWARE SYSTEMS CORPORATION
+                            IND09LI
+
+9 jumpers on back that look like it came that way, not re-worked.
+
+.57 27256   stickered   M-SLOT
+                        03-00
+                        L89-1625
+
+.70 27512   stickered   B325107-084
+                        CAPTAIN LUCKY
+                        L93-0091
+
+
+chip at location ic69   24 pin dip  Stamped     Motorola logo?  MC68B50P    stickered   MODS
+                                                T6A J9007                               COMPLETE
+
+chip at location ic62   28 pin dip  Stamped     Hitachi logo? OJ1 R
+                                                HD63B40P
+
+chip at location ic3    28 pin dip  Stamped     Fujitsu logo?   JAPAN
+                                                8464A-15L
+                                                9034 T98
+
+chip at location ic9    28 pin dip  Stamped     Fujitsu logo?   JAPAN
+                                                8464A-15L
+                                                9034 T98
+
+chip at location ic65   28 pin dip  Stamped     Fujitsu logo?   JAPAN
+                                                8464A-15L
+                                                9047 T01
+
+chip at location ic65   28 pin dip  Stamped     NEC JAPAN
+                                                D43256AC-10L
+                                                9103AD053
+
+chip at location JP6    20 pin dip switch       stickered   DENOMINATION
+                                                            SET
+
+chip at location ic80   7 pin sip           stamped     Fujitsu logo? JAPAN
+                                                        MB3730
+                                                        9041 M40            <- might be missing some since the bolt of the heat sink blocks it
+
+    sw1 off
+    sw2 off
+    sw3 on
+    sw4 on
+    sw5 on
+    sw6 off
+    sw7 off
+    sw8 off
+    sw9 off
+    sw10    off
+
+Oscillator at x1    stamped     KX0-01-1
+                                8.0000MHZ
+                                9051 KYOCERA
+
+Oscillator at x2    stamped     KX0-HC1-T
+                                3.579545MHZ
+                                9103 KYOCERA
+
+missing chip at ic56    silkscreen says 6809
+
+chip at location ic43   24 pin dip  stamped     YAMAHA
+                                                YM3812
+                                                9036 EADB
+
+chip at location ic50   28 pin dip  stamped     Hitachi logo? 1A1 R
+                                                HD63B40P
+                                                JAPAN
+
+*/
+
+#include "emu.h"
+#include "cpu/m6809/m6809.h"
+#include "machine/6840ptm.h"
+#include "machine/6850acia.h"
+#include "machine/nvram.h"
+#include "sound/3812intf.h"
+#include "speaker.h"
+
+
+class sigmab31_state : public driver_device
+{
+public:
+	sigmab31_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu")
+	{ }
+
+	void sigmab31(machine_config &config);
+
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
+private:
+	void prg_map(address_map &map);
+
+	required_device<cpu_device>     m_maincpu;
+};
+
+
+void sigmab31_state::prg_map(address_map &map)
+{
+	map(0x6000, 0xf6ff).rom();
+	map(0xf800, 0xffff).rom();
+}
+
+
+static INPUT_PORTS_START( cptlucky )
+	PORT_START("IN0")
+	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+	PORT_START("DSW1") // TODO: should be 10 switches
+	PORT_DIPNAME( 0x01, 0x01, "DSW1-1" )        PORT_DIPLOCATION("SW1:1")
+	PORT_DIPSETTING(    0x01, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x02, "DSW1-2" )        PORT_DIPLOCATION("SW1:2")
+	PORT_DIPSETTING(    0x02, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x04, "DSW1-3" )        PORT_DIPLOCATION("SW1:3")
+	PORT_DIPSETTING(    0x04, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x08, "DSW1-4" )        PORT_DIPLOCATION("SW1:4")
+	PORT_DIPSETTING(    0x08, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x10, "DSW1-5" )        PORT_DIPLOCATION("SW1:5")
+	PORT_DIPSETTING(    0x10, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x20, "DSW1-6" )        PORT_DIPLOCATION("SW1:6")
+	PORT_DIPSETTING(    0x20, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x40, "DSW1-7" )        PORT_DIPLOCATION("SW1:7")
+	PORT_DIPSETTING(    0x40, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x80, "DSW1-8" )        PORT_DIPLOCATION("SW1:8")
+	PORT_DIPSETTING(    0x80, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( On ) )
+INPUT_PORTS_END
+
+
+void sigmab31_state::machine_start()
+{
+}
+
+void sigmab31_state::machine_reset()
+{
+}
+
+
+void sigmab31_state::sigmab31(machine_config &config)
+{
+	MC6809(config, m_maincpu, 8_MHz_XTAL);
+	m_maincpu->set_addrmap(AS_PROGRAM, &sigmab31_state::prg_map);
+
+	PTM6840(config, "6840ptm_1", 8_MHz_XTAL / 8);
+
+	PTM6840(config, "6840ptm_2", 8_MHz_XTAL / 8);
+
+	ACIA6850(config, "acia");
+
+	//NVRAM(config, "nvram", nvram_device::DEFAULT_NONE);
+
+	SPEAKER(config, "mono").front_center();
+
+	YM3812(config, "ymsnd", 3.579545_MHz_XTAL).add_route(ALL_OUTPUTS, "mono", 1.0);
+}
+
+
+ROM_START( cptlucky )
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_LOAD( "b325107-084_captain_lucky_l93-0091.70", 0x00000, 0x10000, CRC(84c2ab4e) SHA1(3d388ba1c8e4718ca95df45f59d0315887385a27) )
+
+	ROM_REGION( 0x8000, "opl", 0 )
+	ROM_LOAD( "m-slot_03-00_l89-1625.57", 0x00000, 0x8000, CRC(268c8a7c) SHA1(90903428d6c0af3ebdcb462e80a7c28dc4ee7af2) )
+ROM_END
+
+
+GAME( 199?, cptlucky, 0, sigmab31, cptlucky, sigmab31_state, empty_init, ROT0, "Sigma", "Captain Lucky", MACHINE_IS_SKELETON_MECHANICAL ) // a 1992 copyright can be found online, but could be for a later version
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/sigmab98.cpp mame-0.224+dfsg.1/src/mame/drivers/sigmab98.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/sigmab98.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/sigmab98.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -38,7 +38,7 @@
 
 Sammy Kids Medal Series
 
-CPU     :   Kawasaki KL5C80A120FP (Z80 Compatible High Speed Microcontroller)
+CPU     :   Kawasaki KL5C80A12CFP (Z80 Compatible High Speed Microcontroller)
 Video   :   TAXAN KY-3211
 Sound   :   OKI M9810B
 NVRAM   :   93C46 and battery backed RAM
@@ -96,7 +96,7 @@
 
 To Do:
 
-- KL5C80 emulation is needed to consolidate the sammymdl games in one memory map and to run the BIOS
+- Consolidate the sammymdl games in one memory map and run the BIOS without ROM patches
 - Remove ROM patches: gegege checks the EEPROM output after reset, and wants a timed 0->1 transition or locks up while
   saving setting in service mode. Using a reset_delay of 7 works, unless when "play style" is set
   to "coin" (it probably changes the number of reads from port $C0).
@@ -105,6 +105,7 @@
   with no visible gaps. It currently leaves the screen empty instead, for several seconds.
 - tdoboon: no smoke from hit planes as shown in the video? Tiles are present (f60-125f) and used in demo mode.
 - dashhero does not acknowledge the button bashing correctly, it's very hard to win (a slower pace works better!)
+- dodghero and sushimar often write zeroes to 81XX1 and 00XX1 for some reason (maybe just sloppy coding?)
 
 Notes:
 
@@ -113,7 +114,8 @@
 *************************************************************************************************************/
 
 #include "emu.h"
-#include "cpu/z80/z80.h"
+#include "cpu/z80/kl5c80a12.h"
+#include "cpu/z80/ky80.h"
 #include "machine/74165.h"
 #include "machine/eepromser.h"
 #include "machine/mb3773.h"
@@ -129,240 +131,228 @@
 #include "speaker.h"
 
 
-class sigmab98_state : public driver_device
+class sigmab98_base_state : public driver_device
 {
 public:
-	sigmab98_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		// Required devices
-		m_maincpu(*this,"maincpu"),
-		m_screen(*this, "screen"),
-		m_palette(*this, "palette"),
-		m_gfxdecode(*this, "gfxdecode"),
-		// Optional devices
-		m_buffered_spriteram(*this, "spriteram"),
-		m_nvramdev(*this, "nvram"),
-		m_eeprom(*this, "eeprom"),
-		m_hopper(*this, "hopper"),
-		m_hopper_small(*this, "hopper_small"),
-		m_hopper_large(*this, "hopper_large"),
-		// Shared pointers
-		m_nvram(*this, "nvram"),
-		m_spriteram(*this, "spriteram"),
-		m_vregs(*this, "vregs"),
-		m_vtable(*this, "vtable"),
-		m_leds(*this, "led%u", 0U)
+	sigmab98_base_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_screen(*this, "screen")
+		, m_palette(*this, "palette")
+		, m_gfxdecode(*this, "gfxdecode")
+		, m_buffered_spriteram(*this, "spriteram")
+		, m_spriteram(*this, "spriteram")
+		, m_vregs(*this, "vregs")
+		, m_vtable(*this, "vtable")
+		, m_new_sprite_chip(false)
+		, m_vblank(0)
+	{ }
+
+protected:
+	virtual void video_start() override;
+
+	// TODO: unify these handlers
+	void vregs_w(offs_t offset, uint8_t data);
+	uint8_t vregs_r(offs_t offset);
+	uint8_t d013_r();
+	uint8_t d021_r();
+	void vblank_w(uint8_t data);
+	uint8_t vblank_r();
+	uint8_t haekaka_vblank_r();
+
+	void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri_mask);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+	DECLARE_WRITE_LINE_MEMBER(screen_vblank_sammymdl);
+
+	// Required devices
+	required_device<screen_device> m_screen;
+	required_device<palette_device> m_palette;
+	required_device<gfxdecode_device> m_gfxdecode;
+
+	// Optional devices
+	optional_device<buffered_spriteram8_device> m_buffered_spriteram;   // not on sammymdl?
+
+	// Shared pointers
+	required_shared_ptr<uint8_t> m_spriteram;
+	required_shared_ptr<uint8_t> m_vregs;
+	required_shared_ptr<uint8_t> m_vtable;
+
+	std::unique_ptr<bitmap_ind16> m_sprite_bitmap;
+
+	bool m_new_sprite_chip; // KY-10510 has a slightly different sprite format than KY-3211
+
+	uint8_t m_vblank;
+};
+
+
+class sigmab98_state : public sigmab98_base_state
+{
+public:
+	sigmab98_state(const machine_config &mconfig, device_type type, const char *tag)
+		: sigmab98_base_state(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_hopper(*this, "hopper")
+		, m_eeprom(*this, "eeprom")
+		, m_leds(*this, "led%u", 0U)
 	{ }
 
 	void sigmab98(machine_config &config);
-	void pyenaget(machine_config &config);
 	void dodghero(machine_config &config);
-	void dashhero(machine_config &config);
-	void gegege(machine_config &config);
-	void haekaka(machine_config &config);
-	void gocowboy(machine_config &config);
-	void tdoboon(machine_config &config);
-	void animalc(machine_config &config);
-	void sammymdl(machine_config &config);
-	void itazuram(machine_config &config);
 
-	void init_dodghero();
 	void init_b3rinsya();
 	void init_tbeastw2();
 	void init_dashhero();
 	void init_gegege();
 	void init_pepsiman();
-	void init_itazuram();
-	void init_animalc();
 	void init_ucytokyu();
-	void init_haekaka();
-	void init_gocowboy();
-
-	uint32_t screen_update_sigmab98(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 protected:
-	void gegege_regs_w(offs_t offset, uint8_t data);
-	uint8_t gegege_regs_r(offs_t offset);
-	void gegege_regs2_w(offs_t offset, uint8_t data);
-	uint8_t gegege_regs2_r(offs_t offset);
-
-	void dodghero_regs_w(offs_t offset, uint8_t data);
-	uint8_t dodghero_regs_r(offs_t offset);
-	void dodghero_regs2_w(offs_t offset, uint8_t data);
-	uint8_t dodghero_regs2_r(offs_t offset);
-
-	void dashhero_regs2_w(offs_t offset, uint8_t data);
-	uint8_t dashhero_regs2_r(offs_t offset);
-
-	void vregs_w(offs_t offset, uint8_t data);
-	uint8_t vregs_r(offs_t offset);
-	uint8_t d013_r();
-	uint8_t d021_r();
-
 	void c4_w(uint8_t data);
 	void c6_w(uint8_t data);
 	void c8_w(uint8_t data);
 
-	void animalc_rombank_w(offs_t offset, uint8_t data);
-	uint8_t animalc_rombank_r(offs_t offset);
-	void animalc_rambank_w(offs_t offset, uint8_t data);
-	uint8_t animalc_rambank_r(offs_t offset);
-
-	uint8_t unk_34_r();
-	void vblank_w(uint8_t data);
-	uint8_t vblank_r();
-	uint8_t sammymdl_coin_counter_r();
-	void sammymdl_coin_counter_w(uint8_t data);
-	uint8_t sammymdl_leds_r();
-	void sammymdl_leds_w(uint8_t data);
-	void sammymdl_hopper_w(uint8_t data);
-	uint8_t sammymdl_coin_hopper_r();
-
-	void gocowboy_rombank_w(offs_t offset, uint8_t data);
-	uint8_t gocowboy_rombank_r(offs_t offset);
-	void gocowboy_rambank_w(offs_t offset, uint8_t data);
-	uint8_t gocowboy_rambank_r(offs_t offset);
-	void gocowboy_4400_w(offs_t offset, uint8_t data);
-	uint8_t gocowboy_4400_r(offs_t offset);
-	void gocowboy_dc00_w(offs_t offset, uint8_t data);
-	uint8_t gocowboy_dc00_r(offs_t offset);
-	void gocowboy_leds_w(uint8_t data);
-
-	void haekaka_rombank_w(offs_t offset, uint8_t data);
-	uint8_t haekaka_rombank_r(offs_t offset);
-	void haekaka_rambank_w(offs_t offset, uint8_t data);
-	uint8_t haekaka_rambank_r(offs_t offset);
-	uint8_t haekaka_vblank_r();
-	uint8_t haekaka_b000_r(offs_t offset);
-	void haekaka_b000_w(offs_t offset, uint8_t data);
-	void haekaka_leds_w(uint8_t data);
-	void haekaka_coin_counter_w(uint8_t data);
-
-	void itazuram_rombank_w(offs_t offset, uint8_t data);
-	uint8_t itazuram_rombank_r(offs_t offset);
-	void itazuram_rambank_w(offs_t offset, uint8_t data);
-	uint8_t itazuram_rambank_r(offs_t offset);
-	void itazuram_nvram_palette_w(offs_t offset, uint8_t data);
-	void itazuram_palette_w(offs_t offset, uint8_t data);
-	uint8_t itazuram_palette_r(offs_t offset);
-
-	void tdoboon_rombank_w(offs_t offset, uint8_t data);
-	uint8_t tdoboon_rombank_r(offs_t offset);
-	void tdoboon_rambank_w(offs_t offset, uint8_t data);
-	uint8_t tdoboon_rambank_r(offs_t offset);
-	uint8_t tdoboon_c000_r(offs_t offset);
-	void tdoboon_c000_w(offs_t offset, uint8_t data);
-
 	void show_outputs();
-	void show_3_outputs();
 	void eeprom_w(uint8_t data);
-	uint8_t sammymdl_eeprom_r();
-	void sammymdl_eeprom_w(uint8_t data);
 
-	DECLARE_MACHINE_RESET(sigmab98);
-	DECLARE_MACHINE_RESET(sammymdl);
-
-	DECLARE_WRITE_LINE_MEMBER(screen_vblank_sammymdl);
 	INTERRUPT_GEN_MEMBER(sigmab98_vblank_interrupt);
-	TIMER_DEVICE_CALLBACK_MEMBER(sammymdl_irq);
-	void draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri_mask);
 
-	void animalc_io(address_map &map);
-	void animalc_map(address_map &map);
-	void dashhero_io_map(address_map &map);
-	void dodghero_io_map(address_map &map);
 	void dodghero_mem_map(address_map &map);
 	void gegege_io_map(address_map &map);
 	void gegege_mem_map(address_map &map);
-	void gocowboy_io(address_map &map);
-	void gocowboy_map(address_map &map);
-	void haekaka_io(address_map &map);
-	void haekaka_map(address_map &map);
-	void itazuram_io(address_map &map);
-	void itazuram_map(address_map &map);
-	void pyenaget_io(address_map &map);
-	void tdoboon_io(address_map &map);
-	void tdoboon_map(address_map &map);
 
 	virtual void machine_start() override { m_leds.resolve(); }
-	virtual void video_start() override;
 
 	// Required devices
-	required_device<cpu_device> m_maincpu;
-	required_device<screen_device> m_screen;
-	required_device<palette_device> m_palette;
-	required_device<gfxdecode_device> m_gfxdecode;
+	required_device<ky80_device> m_maincpu;
+	required_device<ticket_dispenser_device> m_hopper;
+
 	// Optional devices
-	optional_device<buffered_spriteram8_device> m_buffered_spriteram;   // not on sammymdl?
-	optional_device<nvram_device> m_nvramdev; // battery backed RAM (should be required, but dashhero breaks with it)
 	optional_device<eeprom_serial_93cxx_device> m_eeprom;
-	optional_device<ticket_dispenser_device> m_hopper;
-	optional_device<ticket_dispenser_device> m_hopper_small;
-	optional_device<ticket_dispenser_device> m_hopper_large;
-	// Shared pointers
-	required_shared_ptr<uint8_t> m_nvram;
-	optional_shared_ptr<uint8_t> m_spriteram; // optional as some games allocate it themselves (due to banking)
-	optional_shared_ptr<uint8_t> m_vregs;     // optional as some games allocate it themselves (due to banking)
-	optional_shared_ptr<uint8_t> m_vtable;    // optional as some games allocate it themselves (due to banking)
-	output_finder<8> m_leds;
-
-	std::vector<uint8_t> m_paletteram;
-
-	std::unique_ptr<bitmap_ind16> m_sprite_bitmap;
-	bool new_sprite_chip; // KY-10510 has a slightly different sprite format than KY-3211
-
-	uint8_t m_reg;
-	uint8_t m_rombank;
-	uint8_t m_reg2;
-	uint8_t m_rambank;
 
-	uint8_t m_vblank_vector;
-	uint8_t m_timer0_vector;
-	uint8_t m_timer1_vector;
+	output_finder<4> m_leds;
 
 	uint8_t m_c0;
 	uint8_t m_c4;
 	uint8_t m_c6;
 	uint8_t m_c8;
-	uint8_t m_vblank;
-	uint8_t m_out[3];
 };
 
 
 class lufykzku_state : public sigmab98_state
 {
 public:
-	lufykzku_state(const machine_config &mconfig, device_type type, const char *tag) :
-		sigmab98_state(mconfig, type, tag),
-		m_watchdog(*this, "watchdog_mb3773"),
-		m_dsw_shifter(*this, "ttl165_%u", 1U),
-		m_dsw_bit(0)
+	lufykzku_state(const machine_config &mconfig, device_type type, const char *tag)
+		: sigmab98_state(mconfig, type, tag)
+		, m_watchdog(*this, "watchdog_mb3773")
+		, m_dsw_shifter(*this, "ttl165_%u", 1U)
+		, m_dsw_bit(0)
 	{
-		new_sprite_chip = true;
+		m_new_sprite_chip = true;
 	}
 
+	void init_lufykzku();
+	void lufykzku(machine_config &config);
+
+private:
 	required_device<mb3773_device> m_watchdog;
 	required_device_array<ttl165_device, 2> m_dsw_shifter;
 
 	int m_dsw_bit;
 	DECLARE_WRITE_LINE_MEMBER(dsw_w);
 
-	void lufykzku_regs_w(offs_t offset, uint8_t data);
-	uint8_t lufykzku_regs_r(offs_t offset);
 	void lufykzku_c4_w(uint8_t data);
 	void lufykzku_c6_w(uint8_t data);
 	uint8_t lufykzku_c8_r();
 	void lufykzku_c8_w(uint8_t data);
 	void lufykzku_watchdog_w(uint8_t data);
 
-	DECLARE_MACHINE_RESET(lufykzku);
-	void init_lufykzku();
-
 	TIMER_DEVICE_CALLBACK_MEMBER(lufykzku_irq);
 
-	void lufykzku(machine_config &config);
 	void lufykzku_io_map(address_map &map);
 	void lufykzku_mem_map(address_map &map);
+
+	uint8_t m_vblank_vector;
+	uint8_t m_timer0_vector;
+	uint8_t m_timer1_vector;
+};
+
+
+class sammymdl_state : public sigmab98_base_state
+{
+public:
+	sammymdl_state(const machine_config &mconfig, device_type type, const char *tag)
+		: sigmab98_base_state(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_eeprom(*this, "eeprom")
+		, m_hopper(*this, "hopper")
+		, m_hopper_small(*this, "hopper_small")
+		, m_hopper_large(*this, "hopper_large")
+		, m_leds(*this, "led%u", 0U)
+	{ }
+
+	void haekaka(machine_config &config);
+	void gocowboy(machine_config &config);
+	void tdoboon(machine_config &config);
+	void animalc(machine_config &config);
+	void sammymdl(machine_config &config);
+	void itazuram(machine_config &config);
+	void pyenaget(machine_config &config);
+
+	void init_itazuram();
+	void init_animalc();
+	void init_haekaka();
+	void init_gocowboy();
+
+protected:
+	virtual void machine_start() override { m_leds.resolve(); }
+
+private:
+	TIMER_DEVICE_CALLBACK_MEMBER(sammymdl_irq);
+
+	uint8_t coin_counter_r();
+	void coin_counter_w(uint8_t data);
+	uint8_t leds_r();
+	void leds_w(uint8_t data);
+	void hopper_w(uint8_t data);
+	uint8_t coin_hopper_r();
+
+	void gocowboy_leds_w(uint8_t data);
+
+	void haekaka_leds_w(uint8_t data);
+	void haekaka_coin_counter_w(uint8_t data);
+
+	void show_3_outputs();
+	uint8_t eeprom_r();
+	void eeprom_w(uint8_t data);
+
+	void animalc_io(address_map &map);
+	void animalc_map(address_map &map);
+	void gocowboy_io(address_map &map);
+	void gocowboy_map(address_map &map);
+	void haekaka_io(address_map &map);
+	void haekaka_map(address_map &map);
+	void itazuram_io(address_map &map);
+	void itazuram_map(address_map &map);
+	void pyenaget_io(address_map &map);
+	void tdoboon_io(address_map &map);
+	void tdoboon_map(address_map &map);
+
+	// Required devices
+	required_device<kl5c80a12_device> m_maincpu;
+	required_device<eeprom_serial_93cxx_device> m_eeprom;
+
+	// Optional devices
+	optional_device<ticket_dispenser_device> m_hopper;
+	optional_device<ticket_dispenser_device> m_hopper_small;
+	optional_device<ticket_dispenser_device> m_hopper_large;
+
+	output_finder<8> m_leds;
+
+	uint8_t m_vblank_vector;
+	uint8_t m_timer0_vector;
+	uint8_t m_timer1_vector;
+
+	uint8_t m_out[3];
 };
 
 
@@ -372,7 +362,7 @@
 
 ***************************************************************************/
 
-void sigmab98_state::video_start()
+void sigmab98_base_state::video_start()
 {
 	m_sprite_bitmap = std::make_unique<bitmap_ind16>(512, 512);
 }
@@ -424,22 +414,22 @@
 	return (x + 0x8000) >> 16;
 }
 
-void sigmab98_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri_mask)
+void sigmab98_base_state::draw_sprites(bitmap_ind16 &bitmap, const rectangle &cliprect, int pri_mask)
 {
 	uint8_t *end      =   (m_buffered_spriteram ? m_buffered_spriteram->buffer() : m_spriteram) - 0x10;
 	uint8_t *s        =   end + 0x1000;
 
 	for ( ; s != end; s -= 0x10 )
 	{
-		if ( (s[ 0x01 ] & (new_sprite_chip ? 0x0c : 0x04)) == 0)
+		if ( (s[ 0x01 ] & (m_new_sprite_chip ? 0x0c : 0x04)) == 0)
 			continue;
 
 		if ( ((1 << (s[ 0x01 ] & 0x03)) & pri_mask) == 0 )
 			continue;
 
-		int color   =   s[ 0x00 ] & (new_sprite_chip ? 0xff : 0xf);
+		int color   =   s[ 0x00 ] & (m_new_sprite_chip ? 0xff : 0xf);
 
-		int gfx     =   (s[ 0x01 ] & (new_sprite_chip ? 0x08 : 0x40)) ? 1 : 0;
+		int gfx     =   (s[ 0x01 ] & (m_new_sprite_chip ? 0x08 : 0x40)) ? 1 : 0;
 		int code    =   s[ 0x02 ] * 256 + s[ 0x03 ];
 
 		int nx      =   ((s[ 0x04 ] & 0xf8) >> 3) + 1;
@@ -459,8 +449,8 @@
 		dsty = (dsty  & 0x01ff) - (dsty  & 0x0200);
 
 		// Flipping
-		int x0, x1, dx, flipx = new_sprite_chip ? s[ 0x04 ] & 0x04 : s[ 0x01 ] & 0x10;
-		int y0, y1, dy, flipy = new_sprite_chip ? s[ 0x06 ] & 0x04 : s[ 0x01 ] & 0x08;
+		int x0, x1, dx, flipx = m_new_sprite_chip ? s[ 0x04 ] & 0x04 : s[ 0x01 ] & 0x10;
+		int y0, y1, dy, flipy = m_new_sprite_chip ? s[ 0x06 ] & 0x04 : s[ 0x01 ] & 0x08;
 
 		if ( flipx )    {   x0 = nx - 1;    x1 = -1;    dx = -1;    }
 		else            {   x0 = 0;         x1 = nx;    dx = +1;    }
@@ -599,7 +589,7 @@
 	}
 }
 
-uint32_t sigmab98_state::screen_update_sigmab98(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t sigmab98_base_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	int layers_ctrl = -1;
 
@@ -656,7 +646,7 @@
 
 ***************************************************************************/
 
-void sigmab98_state::vregs_w(offs_t offset, uint8_t data)
+void sigmab98_base_state::vregs_w(offs_t offset, uint8_t data)
 {
 	m_vregs[offset] = data;
 
@@ -677,7 +667,7 @@
 	}
 }
 
-uint8_t sigmab98_state::vregs_r(offs_t offset)
+uint8_t sigmab98_base_state::vregs_r(offs_t offset)
 {
 	switch (offset)
 	{
@@ -688,7 +678,7 @@
 	}
 }
 
-uint8_t sigmab98_state::d013_r()
+uint8_t sigmab98_base_state::d013_r()
 {
 	// bit 5 must go 0->1 (vblank?)
 	// bit 2 must be set (sprite buffered? triggered by pulsing bit 3 of port C6?)
@@ -696,7 +686,7 @@
 	return (m_screen->vblank() ? 0x20 : 0x01) | 0x04;
 //  return machine().rand();
 }
-uint8_t sigmab98_state::d021_r()
+uint8_t sigmab98_base_state::d021_r()
 {
 	// bit 5 must be 0?
 	return 0;
@@ -714,318 +704,111 @@
                           Minna Atsumare! Dodge Hero
 ***************************************************************************/
 
-// rombank
-void sigmab98_state::dodghero_regs_w(offs_t offset, uint8_t data)
+void sigmab98_state::dodghero_mem_map(address_map &map)
 {
-	if (offset == 0)
-	{
-		m_reg = data;
-		return;
-	}
+	map(0x00000, 0x1ffff).rom().nopw();
 
-	switch ( m_reg )
-	{
-		case 0x1f:
-			m_rombank = data;
-			if (data >= 0x18)
-				logerror("%s: unknown rom bank = %02x\n", machine().describe_context(), data);
-			else
-				membank("rombank")->set_entry(data * 2);
-			break;
+	map(0x40000, 0x41fff).ram().share("nvram"); // battery backed RAM
 
-		case 0x9f:
-			m_rombank = data;
-			if (data >= 0x18)
-				logerror("%s: unknown rom bank2 = %02x\n", machine().describe_context(), data);
-			else
-				membank("rombank")->set_entry(data * 2 + 1);
-			break;
+	map(0x80000, 0x80fff).ram().share("spriteram");
+	map(0x81000, 0x811ff).nopw();
+	map(0x82000, 0x821ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
 
-		default:
-			logerror("%s: unknown reg written: %02x = %02x\n", machine().describe_context(), m_reg, data);
-	}
+	map(0x82800, 0x8287f).ram().share("vtable");
+
+	map(0x83000, 0x83021).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs");
+	map(0x83013, 0x83013).r(FUNC(sigmab98_state::d013_r));
+	map(0x83021, 0x83021).r(FUNC(sigmab98_state::d021_r));
 }
-uint8_t sigmab98_state::dodghero_regs_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg;
 
-	switch ( m_reg )
-	{
-		case 0x1f:
-		case 0x9f:
-			return m_rombank;
+/***************************************************************************
+                        GeGeGe no Kitarou Youkai Slot
+***************************************************************************/
 
-		default:
-			logerror("%s: unknown reg read: %02x\n", machine().describe_context(), m_reg);
-			return 0x00;
-	}
+// Outputs
+
+void sigmab98_state::show_outputs()
+{
+#ifdef MAME_DEBUG
+	popmessage("0: %02X  4: %02X  6: %02X  8: %02X", m_c0, m_c4, m_c6, m_c8);
+#endif
 }
 
-// rambank
-void sigmab98_state::dodghero_regs2_w(offs_t offset, uint8_t data)
+// Port c0
+void sigmab98_state::eeprom_w(uint8_t data)
 {
-	if (offset == 0)
-	{
-		m_reg2 = data;
-		return;
-	}
+	// latch the bit
+	m_eeprom->di_write((data & 0x40) >> 6);
 
-	switch ( m_reg2 )
-	{
-		case 0x37:
-			m_rambank = data;
-			switch (data)
-			{
-				case 0x32:
-					membank("rambank")->set_entry(0);
-					break;
-				case 0x36:
-					membank("rambank")->set_entry(1);
-					break;
-				default:
-					logerror("%s: unknown ram bank = %02x\n", machine().describe_context(), data);
-			}
-			break;
+	// reset line asserted: reset.
+//  if ((m_c0 ^ data) & 0x20)
+		m_eeprom->cs_write((data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
 
-		default:
-			logerror("%s: unknown reg2 written: %02x = %02x\n", machine().describe_context(), m_reg2, data);
-	}
+	// clock line asserted: write latch or select next bit to read
+	m_eeprom->clk_write((data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
+
+	m_c0 = data;
+	//show_outputs(state);
 }
-uint8_t sigmab98_state::dodghero_regs2_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg2;
 
-	switch ( m_reg2 )
-	{
-		case 0x37:
-			return m_rambank;
+// Port c4
+// 10 led?
+void sigmab98_state::c4_w(uint8_t data)
+{
+	m_leds[0] = BIT(data, 4);
 
-		default:
-			logerror("%s: unknown reg2 read: %02x\n", machine().describe_context(), m_reg2);
-			return 0x00;
-	}
+	m_c4 = data;
+	show_outputs();
 }
 
-void sigmab98_state::dodghero_mem_map(address_map &map)
+// Port c6
+// 03 lockout (active low, 02 is cleared when reaching 99 credits)
+// 04 pulsed on coin in
+// 08 buffer sprites?
+// 10 led?
+// 20 led? (starts blinking after coin in)
+void sigmab98_state::c6_w(uint8_t data)
 {
-	map(0x0000, 0x7fff).rom();
-	map(0x8000, 0xa7ff).bankr("rombank");
-
-	map(0xa800, 0xb7ff).ram().share("spriteram");
+	machine().bookkeeping().coin_lockout_w(0, (~data) & 0x02);
 
-	map(0xc800, 0xc9ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
+	machine().bookkeeping().coin_counter_w(0,   data  & 0x04);
 
-	map(0xd001, 0xd07f).ram().share("vtable");
+	if ((data & 0x08) && !(m_c6 & 0x08))
+		m_buffered_spriteram->copy();
 
-	map(0xd800, 0xdfff).bankrw("rambank");    // not used, where is it mapped?
+	m_leds[1] = BIT(data, 4);
+	m_leds[2] = BIT(data, 5);
 
-	map(0xd800, 0xd821).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs");
-	map(0xd813, 0xd813).r(FUNC(sigmab98_state::d013_r));
-	map(0xd821, 0xd821).r(FUNC(sigmab98_state::d021_r));
+	m_c6 = data;
+	show_outputs();
+}
 
-	map(0xe000, 0xefff).ram().share("nvram"); // battery backed RAM
+// Port c8
+// 01 hopper enable?
+// 02 hopper motor on (active low)?
+void sigmab98_state::c8_w(uint8_t data)
+{
+	m_hopper->motor_w((!(data & 0x02) && (data & 0x01)) ? 0 : 1);
 
-	map(0xf000, 0xffff).ram();
+	m_c8 = data;
+	show_outputs();
 }
 
-void sigmab98_state::dodghero_io_map(address_map &map)
+void sigmab98_state::gegege_mem_map(address_map &map)
 {
-	map.global_mask(0xff);
+	map(0x00000, 0x1ffff).rom();
 
-	map(0x00, 0x01).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write));
+	map(0x40000, 0x47fff).ram().share("nvram"); // battery backed RAM
 
-	map(0xa0, 0xa1).rw(FUNC(sigmab98_state::dodghero_regs_r), FUNC(sigmab98_state::dodghero_regs_w));
-//  map(0xa2, 0xa3)
-	map(0xa4, 0xa5).rw(FUNC(sigmab98_state::dodghero_regs2_r), FUNC(sigmab98_state::dodghero_regs2_w));
+	map(0x80000, 0x80fff).ram().share("spriteram");
 
-	map(0xc0, 0xc0).portr("EEPROM").w(FUNC(sigmab98_state::eeprom_w));
-	map(0xc2, 0xc2).portr("BUTTON");
-	map(0xc4, 0xc4).portr("PAYOUT").w(FUNC(sigmab98_state::c4_w));
-	map(0xc6, 0xc6).w(FUNC(sigmab98_state::c6_w));
-	map(0xc8, 0xc8).w(FUNC(sigmab98_state::c8_w));
-}
-
-/***************************************************************************
-                        GeGeGe no Kitarou Youkai Slot
-***************************************************************************/
-
-// rombank
-void sigmab98_state::gegege_regs_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg = data;
-		return;
-	}
-
-	switch ( m_reg )
-	{
-		case 0x1f:
-			m_rombank = data;
-			if (data >= 0x18)
-				logerror("%s: unknown rom bank = %02x\n", machine().describe_context(), data);
-			else
-				membank("rombank")->set_entry(data);
-			break;
+	map(0x82000, 0x821ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
 
-		default:
-			logerror("%s: unknown reg written: %02x = %02x\n", machine().describe_context(), m_reg, data);
-	}
-}
-uint8_t sigmab98_state::gegege_regs_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg;
-
-	switch ( m_reg )
-	{
-		case 0x1f:
-			return m_rombank;
+	map(0x82800, 0x8287f).ram().share("vtable");
 
-		default:
-			logerror("%s: unknown reg read: %02x\n", machine().describe_context(), m_reg);
-			return 0x00;
-	}
-}
-
-// rambank
-void sigmab98_state::gegege_regs2_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg2 = data;
-		return;
-	}
-
-	switch ( m_reg2 )
-	{
-		case 0xb5:
-			m_rambank = data;
-			switch (data)
-			{
-				case 0x32:
-					membank("rambank")->set_entry(0);
-					break;
-				case 0x36:
-					membank("rambank")->set_entry(1);
-					break;
-				default:
-					logerror("%s: unknown ram bank = %02x\n", machine().describe_context(), data);
-			}
-			break;
-
-		default:
-			logerror("%s: unknown reg2 written: %02x = %02x\n", machine().describe_context(), m_reg2, data);
-	}
-}
-uint8_t sigmab98_state::gegege_regs2_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg2;
-
-	switch ( m_reg2 )
-	{
-		case 0xb5:
-			return m_rambank;
-
-		default:
-			logerror("%s: unknown reg2 read: %02x\n", machine().describe_context(), m_reg2);
-			return 0x00;
-	}
-}
-
-
-// Outputs
-
-void sigmab98_state::show_outputs()
-{
-#ifdef MAME_DEBUG
-	popmessage("0: %02X  4: %02X  6: %02X  8: %02X", m_c0, m_c4, m_c6, m_c8);
-#endif
-}
-
-// Port c0
-void sigmab98_state::eeprom_w(uint8_t data)
-{
-	// latch the bit
-	m_eeprom->di_write((data & 0x40) >> 6);
-
-	// reset line asserted: reset.
-//  if ((m_c0 ^ data) & 0x20)
-		m_eeprom->cs_write((data & 0x20) ? ASSERT_LINE : CLEAR_LINE);
-
-	// clock line asserted: write latch or select next bit to read
-	m_eeprom->clk_write((data & 0x10) ? ASSERT_LINE : CLEAR_LINE);
-
-	m_c0 = data;
-	//show_outputs(state);
-}
-
-// Port c4
-// 10 led?
-void sigmab98_state::c4_w(uint8_t data)
-{
-	m_leds[0] = BIT(data, 4);
-
-	m_c4 = data;
-	show_outputs();
-}
-
-// Port c6
-// 03 lockout (active low, 02 is cleared when reaching 99 credits)
-// 04 pulsed on coin in
-// 08 buffer sprites?
-// 10 led?
-// 20 led? (starts blinking after coin in)
-void sigmab98_state::c6_w(uint8_t data)
-{
-	machine().bookkeeping().coin_lockout_w(0, (~data) & 0x02);
-
-	machine().bookkeeping().coin_counter_w(0,   data  & 0x04);
-
-	if ((data & 0x08) && !(m_c6 & 0x08))
-		m_buffered_spriteram->copy();
-
-	m_leds[1] = BIT(data, 4);
-	m_leds[2] = BIT(data, 5);
-
-	m_c6 = data;
-	show_outputs();
-}
-
-// Port c8
-// 01 hopper enable?
-// 02 hopper motor on (active low)?
-void sigmab98_state::c8_w(uint8_t data)
-{
-	m_hopper->motor_w((!(data & 0x02) && (data & 0x01)) ? 0 : 1);
-
-	m_c8 = data;
-	show_outputs();
-}
-
-void sigmab98_state::gegege_mem_map(address_map &map)
-{
-	map(0x0000, 0x7fff).rom();
-	map(0x8000, 0x9fff).bankr("rombank");
-
-	map(0xa000, 0xafff).ram().share("spriteram");
-
-	map(0xc000, 0xc1ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
-
-	map(0xc800, 0xc87f).ram().share("vtable");
-
-	map(0xd000, 0xd021).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs");
-	map(0xd013, 0xd013).r(FUNC(sigmab98_state::d013_r));
-	map(0xd021, 0xd021).r(FUNC(sigmab98_state::d021_r));
-
-	map(0xd800, 0xdfff).bankrw("rambank");
-
-	map(0xe000, 0xefff).ram().share("nvram"); // battery backed RAM
-
-	map(0xf000, 0xffff).ram();
+	map(0x83000, 0x83021).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs");
+	map(0x83013, 0x83013).r(FUNC(sigmab98_state::d013_r));
+	map(0x83021, 0x83021).r(FUNC(sigmab98_state::d021_r));
 }
 
 void sigmab98_state::gegege_io_map(address_map &map)
@@ -1034,89 +817,6 @@
 
 	map(0x00, 0x01).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write));
 
-	map(0xa0, 0xa1).rw(FUNC(sigmab98_state::gegege_regs_r), FUNC(sigmab98_state::gegege_regs_w));
-//  map(0xa2, 0xa3)
-	map(0xa4, 0xa5).rw(FUNC(sigmab98_state::gegege_regs2_r), FUNC(sigmab98_state::gegege_regs2_w));
-
-	map(0xc0, 0xc0).portr("EEPROM").w(FUNC(sigmab98_state::eeprom_w));
-	map(0xc2, 0xc2).portr("BUTTON");
-	map(0xc4, 0xc4).portr("PAYOUT").w(FUNC(sigmab98_state::c4_w));
-	map(0xc6, 0xc6).w(FUNC(sigmab98_state::c6_w));
-	map(0xc8, 0xc8).w(FUNC(sigmab98_state::c8_w));
-
-	map(0xe5, 0xe5).nopr();   // during irq
-}
-
-/***************************************************************************
-                           Minna Ganbare! Dash Hero
-***************************************************************************/
-
-// rambank
-void sigmab98_state::dashhero_regs2_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg2 = data;
-		return;
-	}
-
-	switch ( m_reg2 )
-	{
-		case 0x75:
-		case 0xb5:
-		case 0xf5:
-			m_rambank = data;
-			switch (data)
-			{
-				case 0x32:
-					membank("rambank")->set_entry(0);
-					break;
-				case 0x34:
-					membank("rambank")->set_entry(1);
-					break;
-				case 0x36:
-					membank("rambank")->set_entry(2);
-					break;
-				case 0x39:
-					membank("rambank")->set_entry(3);
-					break;
-				default:
-					logerror("%s: unknown ram bank = %02x\n", machine().describe_context(), data);
-			}
-			break;
-
-		default:
-			logerror("%s: unknown reg2 written: %02x = %02x\n", machine().describe_context(), m_reg2, data);
-	}
-}
-uint8_t sigmab98_state::dashhero_regs2_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg2;
-
-	switch ( m_reg2 )
-	{
-		case 0x75:
-		case 0xb5:
-		case 0xf5:
-			return m_rambank;
-
-		default:
-			logerror("%s: unknown reg2 read: %02x\n", machine().describe_context(), m_reg2);
-			return 0x00;
-	}
-}
-
-void sigmab98_state::dashhero_io_map(address_map &map)
-{
-	map.global_mask(0xff);
-
-	map(0x00, 0x01).rw("ymz", FUNC(ymz280b_device::read), FUNC(ymz280b_device::write));
-
-	map(0xa0, 0xa1).rw(FUNC(sigmab98_state::gegege_regs_r), FUNC(sigmab98_state::gegege_regs_w));
-//  map(0xa2, 0xa3)
-	map(0xa4, 0xa5).rw(FUNC(sigmab98_state::dashhero_regs2_r), FUNC(sigmab98_state::dashhero_regs2_w));
-
 	map(0xc0, 0xc0).portr("EEPROM").w(FUNC(sigmab98_state::eeprom_w));
 	map(0xc2, 0xc2).portr("BUTTON");
 	map(0xc4, 0xc4).portr("PAYOUT").w(FUNC(sigmab98_state::c4_w));
@@ -1131,56 +831,6 @@
                        Otakara Itadaki Luffy Kaizoku-Dan!
 ***************************************************************************/
 
-// romrambank
-void lufykzku_state::lufykzku_regs_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg = data;
-		return;
-	}
-
-	switch ( m_reg )
-	{
-		case 0x1f: // 8000
-			m_rombank = data;
-			switch (data)
-			{
-				case 0x00: // (8000) ROM
-					membank("romrambank")->set_entry(0);
-					break;
-
-				case 0x78: // (80000) NVRAM
-					membank("romrambank")->set_entry(1);
-					break;
-
-				default:
-					logerror("%s: unknown rom bank = %02x, reg = %02x\n", machine().describe_context(), data, m_reg);
-			}
-			break;
-
-		default:
-			logerror("%s: unknown reg written: %02x = %02x\n", machine().describe_context(), m_reg, data);
-	}
-}
-
-uint8_t lufykzku_state::lufykzku_regs_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg;
-
-	switch ( m_reg )
-	{
-		case 0x00:
-		case 0x78:
-			return m_rombank;
-
-		default:
-			logerror("%s: unknown reg read: %02x\n", machine().describe_context(), m_reg);
-			return 0x00;
-	}
-}
-
 WRITE_LINE_MEMBER(lufykzku_state::dsw_w)
 {
 	m_dsw_bit = state;
@@ -1242,20 +892,16 @@
 
 void lufykzku_state::lufykzku_mem_map(address_map &map)
 {
-	map(0x0000, 0x7fff).rom();
-	map(0x8000, 0xbfff).bankrw("romrambank").share("nvram"); // ROM | NVRAM
-
-	map(0xc000, 0xcfff).ram().share("spriteram");
-
-	map(0xd000, 0xefff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); // more palette entries
+	map(0x00000, 0x1ffff).rom();
+	map(0x80000, 0x83fff).ram().share("nvram");
 
-	map(0xf000, 0xf021).rw(FUNC(lufykzku_state::vregs_r), FUNC(lufykzku_state::vregs_w)).share("vregs");
-	map(0xf013, 0xf013).r(FUNC(lufykzku_state::d013_r));
-	map(0xf021, 0xf021).r(FUNC(lufykzku_state::d021_r));
+	map(0xc0000, 0xc0fff).ram().share("spriteram");
+	map(0xc1000, 0xc2fff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette"); // more palette entries
+	map(0xc3000, 0xc3021).rw(FUNC(lufykzku_state::vregs_r), FUNC(lufykzku_state::vregs_w)).share("vregs");
+	map(0xc3013, 0xc3013).r(FUNC(lufykzku_state::d013_r));
+	map(0xc3021, 0xc3021).r(FUNC(lufykzku_state::d021_r));
 
-	map(0xf400, 0xf47f).ram().share("vtable");
-
-	map(0xfc00, 0xffff).ram();
+	map(0xc3400, 0xc347f).ram().share("vtable");
 }
 
 void lufykzku_state::lufykzku_io_map(address_map &map)
@@ -1264,8 +910,6 @@
 	map(0x00, 0x00).w("oki", FUNC(okim9810_device::write));
 	map(0x01, 0x01).w("oki", FUNC(okim9810_device::tmp_register_w));
 
-	map(0xa2, 0xa3).rw(FUNC(lufykzku_state::lufykzku_regs_r), FUNC(lufykzku_state::lufykzku_regs_w));
-
 	map(0xc0, 0xc0).portr("COIN").w(FUNC(lufykzku_state::lufykzku_watchdog_w)); // bit 7 -> watchdog
 	map(0xc2, 0xc2).portr("BUTTON");
 	map(0xc4, 0xc4).portr("PAYOUT").w(FUNC(lufykzku_state::lufykzku_c4_w)); // bit 7 = medal lock, bit 6 = coin3, bit 5 = yen
@@ -1278,107 +922,12 @@
                                  Animal Catch
 ***************************************************************************/
 
-// rombank
-void sigmab98_state::animalc_rombank_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg = data;
-		return;
-	}
-
-	uint8_t *rom = memregion("maincpu")->base();
-	switch ( m_reg )
-	{
-		case 0x0f:
-			m_rombank = data;
-			switch (data)
-			{
-				case 0x10:  membank("rombank")->set_base(rom + 0x400 + 0x4000); break;
-				case 0x14:  membank("rombank")->set_base(rom + 0x400 + 0x8000); break;
-				case 0x18:  membank("rombank")->set_base(rom + 0x400 + 0xc000); break;
-				default:
-					logerror("%s: unknown rom bank = %02x, reg = %02x\n", machine().describe_context(), data, m_reg);
-			}
-			break;
-
-		default:
-			logerror("%s: unknown reg written: %02x = %02x\n", machine().describe_context(), m_reg, data);
-	}
-}
-uint8_t sigmab98_state::animalc_rombank_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg;
-
-	switch ( m_reg )
-	{
-		case 0x0f:
-			return m_rombank;
-
-		default:
-			logerror("%s: unknown reg read: %02x\n", machine().describe_context(), m_reg);
-			return 0x00;
-	}
-}
-
-// rambank
-void sigmab98_state::animalc_rambank_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg2 = data;
-		return;
-	}
-
-	int bank = 0;
-	switch ( m_reg2 )
-	{
-		case 0x1f:
-			m_rambank = data;
-			switch (data)
-			{
-				case 0x58:  bank = 0;   break;
-				case 0x62:  bank = 1;   break;
-				case 0x63:  bank = 2;   break;
-				case 0x64:  bank = 3;   break;
-				case 0x65:  bank = 4;   break;
-				default:
-					logerror("%s: unknown ram bank = %02x, reg2 = %02x\n", machine().describe_context(), data, m_reg2);
-					return;
-			}
-			membank("rambank")->set_entry(bank);
-			if ( (bank == 1) || (bank == 2) || (bank == 3) )
-				membank("sprbank")->set_entry(bank-1);
-			break;
-
-		default:
-			logerror("%s: unknown reg2 written: %02x = %02x\n", machine().describe_context(), m_reg2, data);
-	}
-}
-uint8_t sigmab98_state::animalc_rambank_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg2;
-
-	switch ( m_reg2 )
-	{
-		case 0x1f:
-			return m_rambank;
-
-		default:
-			logerror("%s: unknown reg2 read: %02x\n", machine().describe_context(), m_reg2);
-			return 0x00;
-	}
-}
-
-
-uint8_t sigmab98_state::sammymdl_eeprom_r()
+uint8_t sammymdl_state::eeprom_r()
 {
 	return m_eeprom->do_read() ? 0x80 : 0;
 }
 
-void sigmab98_state::sammymdl_eeprom_w(uint8_t data)
+void sammymdl_state::eeprom_w(uint8_t data)
 {
 	// latch the bit
 	m_eeprom->di_write((data & 0x40) >> 6);
@@ -1393,25 +942,19 @@
 		logerror("%s: unknown eeeprom bits written %02x\n", machine().describe_context(), data);
 }
 
-uint8_t sigmab98_state::unk_34_r()
-{
-	// mask 0x01?
-	return 0x01;
-}
-
-uint8_t sigmab98_state::vblank_r()
+uint8_t sigmab98_base_state::vblank_r()
 {
 	// mask 0x04 must be set before writing sprite list
 	// mask 0x10 must be set or irq/00 hangs?
 	return  m_vblank | 0x14;
 }
 
-void sigmab98_state::vblank_w(uint8_t data)
+void sigmab98_base_state::vblank_w(uint8_t data)
 {
 	m_vblank = (m_vblank & ~0x03) | (data & 0x03);
 }
 
-WRITE_LINE_MEMBER(sigmab98_state::screen_vblank_sammymdl)
+WRITE_LINE_MEMBER(sigmab98_base_state::screen_vblank_sammymdl)
 {
 	// rising edge
 	if (state)
@@ -1420,18 +963,18 @@
 	}
 }
 
-void sigmab98_state::show_3_outputs()
+void sammymdl_state::show_3_outputs()
 {
 #ifdef MAME_DEBUG
 	popmessage("COIN: %02X  LED: %02X  HOP: %02X", m_out[0], m_out[1], m_out[2]);
 #endif
 }
 // Port 31
-uint8_t sigmab98_state::sammymdl_coin_counter_r()
+uint8_t sammymdl_state::coin_counter_r()
 {
 	return m_out[0];
 }
-void sigmab98_state::sammymdl_coin_counter_w(uint8_t data)
+void sammymdl_state::coin_counter_w(uint8_t data)
 {
 	machine().bookkeeping().coin_counter_w(0,   data  & 0x01 );  // coin1 in
 	machine().bookkeeping().coin_counter_w(1,   data  & 0x02 );  // coin2 in
@@ -1448,11 +991,11 @@
 }
 
 // Port 32
-uint8_t sigmab98_state::sammymdl_leds_r()
+uint8_t sammymdl_state::leds_r()
 {
 	return m_out[1];
 }
-void sigmab98_state::sammymdl_leds_w(uint8_t data)
+void sammymdl_state::leds_w(uint8_t data)
 {
 	m_leds[0] = BIT(data, 0);   // button
 
@@ -1463,7 +1006,7 @@
 // Port b0
 // 02 hopper enable?
 // 01 hopper motor on (active low)?
-void sigmab98_state::sammymdl_hopper_w(uint8_t data)
+void sammymdl_state::hopper_w(uint8_t data)
 {
 	m_hopper->motor_w((!(data & 0x01) && (data & 0x02)) ? 0 : 1);
 
@@ -1471,7 +1014,7 @@
 	show_3_outputs();
 }
 
-uint8_t sigmab98_state::sammymdl_coin_hopper_r()
+uint8_t sammymdl_state::coin_hopper_r()
 {
 	uint8_t ret = ioport("COIN")->read();
 
@@ -1481,42 +1024,32 @@
 	return ret;
 }
 
-void sigmab98_state::animalc_map(address_map &map)
+void sammymdl_state::animalc_map(address_map &map)
 {
-	map(0x0000, 0x3fff).rom();
-	map(0x4000, 0x7fff).bankr("rombank");
-	map(0x8000, 0x8fff).bankrw("rambank").share("nvram");
-
-	map(0x9000, 0x9fff).ram();
-	map(0xa000, 0xafff).ram();
-	map(0xb000, 0xbfff).bankrw("sprbank");
-
-	map(0xd000, 0xd1ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
-	map(0xd800, 0xd87f).ram().share("vtable");
-
-	map(0xe000, 0xe021).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs");
-	map(0xe011, 0xe011).nopw();  // IRQ Enable? Screen disable?
-	map(0xe013, 0xe013).rw(FUNC(sigmab98_state::vblank_r), FUNC(sigmab98_state::vblank_w));    // IRQ Ack?
-
-	map(0xfe00, 0xffff).ram();   // High speed internal RAM
+	map(0x00000, 0x0ffff).rom().region("mainbios", 0);
+	map(0x10000, 0x2ffff).rom().region("maincpu", 0x400);
+	map(0x60000, 0x63fff).ram().share("nvram");
+	map(0x6a000, 0x6ffff).ram();
+	map(0x70000, 0x70fff).ram().share("spriteram");
+	map(0x72000, 0x721ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
+	map(0x72800, 0x7287f).ram().share("vtable");
+	map(0x73000, 0x73021).rw(FUNC(sammymdl_state::vregs_r), FUNC(sammymdl_state::vregs_w)).share("vregs");
+	map(0x73011, 0x73011).nopw();  // IRQ Enable? Screen disable?
+	map(0x73013, 0x73013).rw(FUNC(sammymdl_state::vblank_r), FUNC(sammymdl_state::vblank_w));    // IRQ Ack?
 }
 
-void sigmab98_state::animalc_io(address_map &map)
+void sammymdl_state::animalc_io(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0x02, 0x03).rw(FUNC(sigmab98_state::animalc_rombank_r), FUNC(sigmab98_state::animalc_rombank_w));
-	map(0x04, 0x05).rw(FUNC(sigmab98_state::animalc_rambank_r), FUNC(sigmab98_state::animalc_rambank_w));
-
-	map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w));
-	map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r));
+	map(0x2c, 0x2c).rw(FUNC(sammymdl_state::eeprom_r), FUNC(sammymdl_state::eeprom_w));
+	map(0x2e, 0x2e).r(FUNC(sammymdl_state::coin_hopper_r));
 	map(0x30, 0x30).portr("BUTTON");
-	map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w));
-	map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w));
-	map(0x34, 0x34).r(FUNC(sigmab98_state::unk_34_r));
+	map(0x31, 0x31).rw(FUNC(sammymdl_state::coin_counter_r), FUNC(sammymdl_state::coin_counter_w));
+	map(0x32, 0x32).rw(FUNC(sammymdl_state::leds_r), FUNC(sammymdl_state::leds_w));
 	map(0x90, 0x90).w("oki", FUNC(okim9810_device::write));
 	map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w));
 	map(0x92, 0x92).r("oki", FUNC(okim9810_device::read));
-	map(0xb0, 0xb0).w(FUNC(sigmab98_state::sammymdl_hopper_w));
+	map(0xb0, 0xb0).w(FUNC(sammymdl_state::hopper_w));
 	map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w));  // 1
 }
 
@@ -1524,494 +1057,58 @@
                                Go Go Cowboy
 ***************************************************************************/
 
-// rombank
-void sigmab98_state::gocowboy_rombank_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg = data;
-		return;
-	}
-
-	switch ( m_reg )
-	{
-		case 0x50: // 4400
-			m_rombank = data;
-			switch (data)
-			{
-				case 0x13: // (17800) ROM
-				case 0x15: // (19800) ROM
-					break;
-				default:
-					logerror("%s: unknown rom bank = %02x, reg = %02x\n", machine().describe_context(), data, m_reg);
-			}
-			break;
-
-		case 0x90: // 4400
-			m_rombank = data;
-			switch (data)
-			{
-				case 0x0f: // (13c00) ROM
-					break;
-				case 0x17: // (1bc00) ROM
-					break;
-				default:
-					logerror("%s: unknown rom bank = %02x, reg = %02x\n", machine().describe_context(), data, m_reg);
-			}
-			break;
-
-		case 0xd0: // 4400
-			m_rombank = data;
-			switch (data)
-			{
-				case 0x0f: // (14000) ROM
-					break;
-
-				case 0x5b: // (60000) clears 4400-c3ff
-					break;
-
-				case 0x5d: // (62000) copies 1404 bytes: 4400 <-> e6c6
-					break;
-
-				case 0x6b: // (70000) SPRITERAM + (72000) PALETTERAM + (72800) VTABLE + (73000) VREGS
-					break;
-
-				default:
-					logerror("%s: unknown rom bank = %02x, reg = %02x\n", machine().describe_context(), data, m_reg);
-			}
-			break;
-
-		default:
-			logerror("%s: unknown reg written: %02x = %02x\n", machine().describe_context(), m_reg, data);
-	}
-}
-
-uint8_t sigmab98_state::gocowboy_rombank_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg;
-
-	switch ( m_reg )
-	{
-		case 0x50:
-		case 0x90:
-		case 0xd0:
-			return m_rombank;
-
-		default:
-			logerror("%s: unknown reg read: %02x\n", machine().describe_context(), m_reg);
-			return 0x00;
-	}
-}
-
-uint8_t sigmab98_state::gocowboy_4400_r(offs_t offset)
-{
-	switch (m_rombank)
-	{
-		// ROM
-		case 0x0f:
-			return memregion("maincpu")->base()[offset + 0x3800 + (m_reg >> 6) * 0x400];
-			break;
-
-		case 0x13:
-			return memregion("maincpu")->base()[offset + 0x7c00];
-			break;
-
-		case 0x15:
-			return memregion("maincpu")->base()[offset + 0x9c00];
-			break;
-
-		case 0x17:
-			return memregion("maincpu")->base()[offset + 0xc000];
-			break;
-
-		case 0x5b: // (60000) clears 4400-c3ff
-			return m_nvram[offset];
-			break;
-
-		case 0x5d: // (62000) copies 1404 bytes: 4400 <-> e6c6
-			if (offset + 0x2000 < 0x80000)
-				return m_nvram[offset + 0x2000];
-			break;
-
-		case 0x6b: // (70000) SPRITERAM + (72000) PALETTERAM + (72800) VTABLE + (73000) VREGS
-			if (offset < 0x1000)
-				return m_spriteram[offset];
-			else if ((offset >= 0x2000) && (offset < 0x2200))
-				return m_paletteram[offset - 0x2000];
-			else if ((offset >= 0x2800) && (offset < 0x2880))
-				return m_vtable[offset - 0x2800];
-			else if (offset >= 0x3000 && offset <= 0x3021)
-				return vregs_r(offset - 0x3000);
-			break;
-	}
-
-	logerror("%s: unknown read from %02x with rombank = %02x\n", machine().describe_context(), offset+0x4400, m_rombank);
-	return 0x00;
-}
-
-void sigmab98_state::gocowboy_4400_w(offs_t offset, uint8_t data)
-{
-	switch (m_rombank)
-	{
-		case 0x5b: // (60000) clears 4400-c3ff
-			m_nvram[offset] = data;
-			return;
-
-		case 0x5d: // (62000) copies 1404 bytes: 4400 <-> e6c6
-			if (offset + 0x2000 < 0x80000)
-			{
-				m_nvram[offset + 0x2000] = data;
-				return;
-			}
-			break;
-
-		case 0x6b: // (70000) SPRITERAM + (72000) PALETTERAM + (72800) VTABLE + (73000) VREGS
-			if (offset < 0x1000)
-			{
-				m_spriteram[offset] = data;
-				return;
-			}
-			else if ((offset >= 0x2000) && (offset < 0x2200))
-			{
-				m_palette->write8(offset-0x2000, data);
-				return;
-			}
-			else if ((offset >= 0x2800) && (offset < 0x2880))
-			{
-				m_vtable[offset-0x2800] = data;
-				return;
-			}
-			else if (offset >= 0x3000 && offset <= 0x3021)
-			{
-				vregs_w(offset - 0x3000, data);
-				return;
-			}
-			break;
-	}
-
-	logerror("%s: unknown write to %02x = %02x with rombank = %02x\n", machine().describe_context(), offset + 0x4400, data, m_rombank);
-}
-
-// rambank
-void sigmab98_state::gocowboy_rambank_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg2 = data;
-		return;
-	}
-
-	switch ( m_reg2 )
-	{
-		case 0x76: // dc00
-			m_rambank = data;
-			switch (data)
-			{
-				case 0x52: // (60000) NVRAM
-					break;
-
-				case 0x64: // (72000) PALETTERAM
-					break;
-
-				default:
-					logerror("%s: unknown ram bank = %02x, reg2 = %02x\n", machine().describe_context(), data, m_reg2);
-					return;
-			}
-			break;
-
-		default:
-			logerror("%s: unknown reg2 written: %02x = %02x\n", machine().describe_context(), m_reg2, data);
-	}
-}
-
-uint8_t sigmab98_state::gocowboy_rambank_r(offs_t offset)
+void sammymdl_state::gocowboy_map(address_map &map)
 {
-	if (offset == 0)
-		return m_reg2;
-
-	switch ( m_reg2 )
-	{
-		case 0x76:
-			return m_rambank;
-
-		default:
-			logerror("%s: unknown reg2 read: %02x\n", machine().describe_context(), m_reg2);
-			return 0x00;
-	}
+	map(0x00000, 0x5ffff).rom().region("mainbios", 0);
+	map(0x60000, 0x67fff).ram().share("nvram");
+	map(0x70000, 0x70fff).ram().share("spriteram");
+	map(0x72000, 0x721ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
+	map(0x72800, 0x7287f).ram().share("vtable");
+	map(0x73000, 0x73021).rw(FUNC(sammymdl_state::vregs_r), FUNC(sammymdl_state::vregs_w)).share("vregs");
 }
 
-uint8_t sigmab98_state::gocowboy_dc00_r(offs_t offset)
-{
-	switch (m_rambank)
-	{
-		case 0x52: // (60000) NVRAM
-			return m_nvram[offset];
-
-		case 0x64: // (72000) PALETTERAM
-			return m_paletteram[offset];
-	}
 
-	logerror("%s: unknown read from %02x with rombank = %02x\n", machine().describe_context(), offset + 0xdc00, m_rambank);
-	return 0;
-}
-
-void sigmab98_state::gocowboy_dc00_w(offs_t offset, uint8_t data)
-{
-	switch (m_rambank)
-	{
-		case 0x52: // (60000) NVRAM
-			m_nvram[offset] = data;
-			return;
-
-		case 0x64: // (72000) PALETTERAM
-			m_palette->write8(offset, data);
-			return;
-	}
-
-	logerror("%s: unknown write to %02x = %02x with rambank = %02x\n", machine().describe_context(), offset + 0xdc00, data, m_rambank);
-}
-
-void sigmab98_state::gocowboy_map(address_map &map)
-{
-	map(0x0000, 0x43ff).rom();
-
-	map(0x4400, 0xdbff).rw(FUNC(sigmab98_state::gocowboy_4400_r), FUNC(sigmab98_state::gocowboy_4400_w));    // SPRITERAM + PALETTERAM + VTABLE + VREGS | NVRAM
-
-	map(0xdc00, 0xfbff).rw(FUNC(sigmab98_state::gocowboy_dc00_r), FUNC(sigmab98_state::gocowboy_dc00_w)).share("nvram");  // PALETTERAM | NVRAM
-
-	map(0xfe00, 0xffff).ram();   // High speed internal RAM
-}
-
-
-void sigmab98_state::gocowboy_leds_w(uint8_t data)
+void sammymdl_state::gocowboy_leds_w(uint8_t data)
 {
 	m_leds[0] = BIT(data, 0);   // button
 	m_leds[1] = BIT(data, 1);   // coin lockout? (after coining up, but not for service coin)
-	m_leds[2] = BIT(data, 2);   // ? long after a prize is not collected
-	m_leds[3] = BIT(data, 3);   // ? "don't forget the large prizes"
-
-	// 10 hopper enable?
-	// 20 hopper motor on (active low)?
-	m_hopper_small->motor_w((!(data & 0x20) && (data & 0x10)) ? 0 : 1);
-	m_hopper_large->motor_w((!(data & 0x80) && (data & 0x40)) ? 0 : 1);
-
-	m_out[1] = data;
-	show_3_outputs();
-}
-
-void sigmab98_state::gocowboy_io(address_map &map)
-{
-	map.global_mask(0xff);
-	map(0x02, 0x03).rw(FUNC(sigmab98_state::gocowboy_rombank_r), FUNC(sigmab98_state::gocowboy_rombank_w));
-	map(0x04, 0x05).rw(FUNC(sigmab98_state::gocowboy_rambank_r), FUNC(sigmab98_state::gocowboy_rambank_w));
-
-	map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w));
-	map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r));
-	map(0x30, 0x30).portr("BUTTON");
-	map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w));
-	map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::gocowboy_leds_w));
-	map(0x90, 0x90).rw("oki", FUNC(okim9810_device::read), FUNC(okim9810_device::write));
-	map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w));
-	map(0x92, 0x92).r("oki", FUNC(okim9810_device::read));
-	map(0xb0, 0xb0).nopw();
-	map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w));  // 1
-}
-
-/***************************************************************************
-                             Hae Hae Ka Ka Ka
-***************************************************************************/
-
-// rombank
-void sigmab98_state::haekaka_rombank_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg = data;
-		return;
-	}
-
-	switch ( m_reg )
-	{
-		case 0x2b:
-			m_rombank = data;
-			switch (data)
-			{
-				case 0x10:  // ROM
-				case 0x11:
-				case 0x12:
-				case 0x13:
-				case 0x14:
-				case 0x15:
-				case 0x16:
-				case 0x17:
-				case 0x18:
-				case 0x19:
-				case 0x1a:
-				case 0x1b:
-				case 0x1c:
-				case 0x1d:
-				case 0x1e:
-				case 0x1f:
-
-				case 0x65:  // SPRITERAM
-				case 0x67:  // PALETTERAM + VTABLE + VREGS
-					break;
-
-				default:
-					logerror("%s: unknown rom bank = %02x, reg = %02x\n", machine().describe_context(), data, m_reg);
-			}
-			break;
-
-		default:
-			logerror("%s: unknown reg written: %02x = %02x\n", machine().describe_context(), m_reg, data);
-	}
-}
-uint8_t sigmab98_state::haekaka_rombank_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg;
-
-	switch ( m_reg )
-	{
-		case 0x2b:
-			return m_rombank;
-
-		default:
-			logerror("%s: unknown reg read: %02x\n", machine().describe_context(), m_reg);
-			return 0x00;
-	}
-}
-
-// rambank
-void sigmab98_state::haekaka_rambank_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg2 = data;
-		return;
-	}
-
-	switch ( m_reg2 )
-	{
-		case 0x33:
-			m_rambank = data;
-			switch (data)
-			{
-				case 0x53:
-					break;
-
-				default:
-					logerror("%s: unknown ram bank = %02x, reg2 = %02x\n", machine().describe_context(), data, m_reg2);
-			}
-			break;
-
-		default:
-			logerror("%s: unknown reg2 written: %02x = %02x\n", machine().describe_context(), m_reg2, data);
-	}
-}
-uint8_t sigmab98_state::haekaka_rambank_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg2;
-
-	switch ( m_reg2 )
-	{
-		case 0x33:
-			return m_rambank;
-
-		default:
-			logerror("%s: unknown reg2 read: %02x\n", machine().describe_context(), m_reg2);
-			return 0x00;
-	}
-}
-
-uint8_t sigmab98_state::haekaka_vblank_r()
-{
-	return m_screen->vblank() ? 0 : 0x1c;
-}
-
-uint8_t sigmab98_state::haekaka_b000_r(offs_t offset)
-{
-	switch (m_rombank)
-	{
-		case 0x10:  // ROM
-		case 0x11:
-		case 0x12:
-		case 0x13:
-		case 0x14:
-		case 0x15:
-		case 0x16:
-		case 0x17:
-		case 0x18:
-		case 0x19:
-		case 0x1a:
-		case 0x1b:
-		case 0x1c:
-		case 0x1d:
-		case 0x1e:
-		case 0x1f:
-			return memregion("maincpu")->base()[offset + 0xb400 + 0x1000 * (m_rombank-0x10)];
-
-		case 0x65:  // SPRITERAM
-			if (offset < 0x1000)
-				return m_spriteram[offset];
-
-		case 0x67:  // PALETTERAM + VTABLE + VREGS
-			if (offset < 0x200)
-				return m_paletteram[offset];
-			else if ((offset >= 0x800) && (offset < 0x880))
-			{
-				return m_vtable[offset-0x800];
-			}
-			else if (offset >= (0xc000-0xb000) && offset <= (0xc021-0xb000))
-			{
-				if (offset == (0xc013-0xb000))
-					return haekaka_vblank_r();
-				return vregs_r(offset-(0xc000-0xb000));
-			}
-			break;
-	}
+	m_leds[2] = BIT(data, 2);   // ? long after a prize is not collected
+	m_leds[3] = BIT(data, 3);   // ? "don't forget the large prizes"
+
+	// 10 hopper enable?
+	// 20 hopper motor on (active low)?
+	m_hopper_small->motor_w((!(data & 0x20) && (data & 0x10)) ? 0 : 1);
+	m_hopper_large->motor_w((!(data & 0x80) && (data & 0x40)) ? 0 : 1);
 
-	logerror("%s: unknown read from %02x with rombank = %02x\n", machine().describe_context(), offset+0xb000, m_rombank);
-	return 0x00;
+	m_out[1] = data;
+	show_3_outputs();
 }
 
-void sigmab98_state::haekaka_b000_w(offs_t offset, uint8_t data)
+void sammymdl_state::gocowboy_io(address_map &map)
 {
-	switch (m_rombank)
-	{
-		case 0x65:  // SPRITERAM
-			if (offset < 0x1000)
-			{
-				m_spriteram[offset] = data;
-				return;
-			}
-			break;
+	map.global_mask(0xff);
+	map(0x2c, 0x2c).rw(FUNC(sammymdl_state::eeprom_r), FUNC(sammymdl_state::eeprom_w));
+	map(0x2e, 0x2e).r(FUNC(sammymdl_state::coin_hopper_r));
+	map(0x30, 0x30).portr("BUTTON");
+	map(0x31, 0x31).rw(FUNC(sammymdl_state::coin_counter_r), FUNC(sammymdl_state::coin_counter_w));
+	map(0x32, 0x32).rw(FUNC(sammymdl_state::leds_r), FUNC(sammymdl_state::gocowboy_leds_w));
+	map(0x90, 0x90).rw("oki", FUNC(okim9810_device::read), FUNC(okim9810_device::write));
+	map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w));
+	map(0x92, 0x92).r("oki", FUNC(okim9810_device::read));
+	map(0xb0, 0xb0).nopw();
+	map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w));  // 1
+}
 
-		case 0x67:  // PALETTERAM + VTABLE + VREGS
-			if (offset < 0x200)
-			{
-				m_palette->write8(offset, data);
-				return;
-			}
-			else if ((offset >= 0x800) && (offset < 0x880))
-			{
-				m_vtable[offset-0x800] = data;
-				return;
-			}
-			else if (offset >= (0xc000-0xb000) && offset <= (0xc021-0xb000))
-			{
-				vregs_w(offset-(0xc000-0xb000), data);
-				return;
-			}
-			break;
-	}
+/***************************************************************************
+                             Hae Hae Ka Ka Ka
+***************************************************************************/
 
-	logerror("%s: unknown write to %02x = %02x with rombank = %02x\n", machine().describe_context(), offset+0xb000, data, m_rombank);
+uint8_t sigmab98_base_state::haekaka_vblank_r()
+{
+	return m_screen->vblank() ? 0 : 0x1c;
 }
 
-void sigmab98_state::haekaka_leds_w(uint8_t data)
+void sammymdl_state::haekaka_leds_w(uint8_t data)
 {
 	// All used
 	m_leds[0] = BIT(data, 0);
@@ -2027,7 +1124,7 @@
 	show_3_outputs();
 }
 
-void sigmab98_state::haekaka_coin_counter_w(uint8_t data)
+void sammymdl_state::haekaka_coin_counter_w(uint8_t data)
 {
 	machine().bookkeeping().coin_counter_w(0,   data & 0x01 );   // medal out
 //                                 data & 0x02 ?
@@ -2038,29 +1135,30 @@
 	show_3_outputs();
 }
 
-void sigmab98_state::haekaka_map(address_map &map)
+void sammymdl_state::haekaka_map(address_map &map)
 {
-	map(0x0000, 0x7fff).rom();
-	map(0xb000, 0xcfff).rw(FUNC(sigmab98_state::haekaka_b000_r), FUNC(sigmab98_state::haekaka_b000_w));
-	map(0xd000, 0xefff).ram().share("nvram");
-	map(0xfe00, 0xffff).ram();   // High speed internal RAM
+	map(0x00000, 0x0ffff).rom().region("mainbios", 0);
+	map(0x10000, 0x2ffff).rom().region("maincpu", 0x400);
+	map(0x60000, 0x61fff).ram().share("nvram");
+	map(0x70000, 0x70fff).ram().share("spriteram");
+	map(0x72000, 0x721ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
+	map(0x72800, 0x7287f).ram().share("vtable");
+	map(0x73000, 0x73021).rw(FUNC(sammymdl_state::vregs_r), FUNC(sammymdl_state::vregs_w)).share("vregs");
+	map(0x73013, 0x73013).r(FUNC(sammymdl_state::haekaka_vblank_r));
 }
 
-void sigmab98_state::haekaka_io(address_map &map)
+void sammymdl_state::haekaka_io(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0x02, 0x03).rw(FUNC(sigmab98_state::haekaka_rombank_r), FUNC(sigmab98_state::haekaka_rombank_w));
-	map(0x04, 0x05).rw(FUNC(sigmab98_state::haekaka_rambank_r), FUNC(sigmab98_state::haekaka_rambank_w));
-
-	map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w));
-	map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r));
+	map(0x2c, 0x2c).rw(FUNC(sammymdl_state::eeprom_r), FUNC(sammymdl_state::eeprom_w));
+	map(0x2e, 0x2e).r(FUNC(sammymdl_state::coin_hopper_r));
 	map(0x30, 0x30).portr("BUTTON");
-	map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::haekaka_coin_counter_w));
-	map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::haekaka_leds_w));
+	map(0x31, 0x31).rw(FUNC(sammymdl_state::coin_counter_r), FUNC(sammymdl_state::haekaka_coin_counter_w));
+	map(0x32, 0x32).rw(FUNC(sammymdl_state::leds_r), FUNC(sammymdl_state::haekaka_leds_w));
 	map(0x90, 0x90).w("oki", FUNC(okim9810_device::write));
 	map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w));
 	map(0x92, 0x92).r("oki", FUNC(okim9810_device::read));
-	map(0xb0, 0xb0).w(FUNC(sigmab98_state::sammymdl_hopper_w));
+	map(0xb0, 0xb0).w(FUNC(sammymdl_state::hopper_w));
 	map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w));  // 1
 }
 
@@ -2068,248 +1166,31 @@
                               Itazura Monkey
 ***************************************************************************/
 
-// rombank
-void sigmab98_state::itazuram_rombank_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg = data;
-		return;
-	}
-
-	uint8_t *rom = memregion("maincpu")->base();
-	switch ( m_reg )
-	{
-		case 0x0d:
-			m_rombank = data;
-			switch (data)
-			{
-				case 0x11:  // 3800 IS ROM
-					membank("rombank0")->set_base(rom + 0x4c00);
-					membank("rombank1")->set_base(rom + 0x5c00);
-					membank("sprbank0")->set_base(m_spriteram + 0x1000*4);  // scratch
-					membank("sprbank1")->set_base(m_spriteram + 0x1000*4);  // scratch
-					break;
-
-				default:
-					logerror("%s: unknown rom bank = %02x, reg = %02x\n", machine().describe_context(), data, m_reg);
-			}
-			break;
-
-		case 0x4d:
-			m_rombank = data;
-			switch (data)
-			{
-//              case 0x0f:  // demo mode, after title
-
-				case 0x14:  // 3800 IS ROM
-					membank("rombank0")->set_base(rom + 0x8000);
-					membank("rombank1")->set_base(rom + 0x9000);
-					membank("sprbank0")->set_base(m_spriteram + 0x1000*4);  // scratch
-					membank("sprbank1")->set_base(m_spriteram + 0x1000*4);  // scratch
-					break;
-
-				default:
-					logerror("%s: unknown rom bank = %02x, reg = %02x\n", machine().describe_context(), data, m_reg);
-			}
-			break;
-
-		case 0x8d:
-			m_rombank = data;
-			switch (data)
-			{
-				case 0x0f:  // 3800 IS ROM
-					membank("rombank0")->set_base(rom + 0x3400);
-					membank("rombank1")->set_base(rom + 0x4400);
-					membank("sprbank0")->set_base(m_spriteram + 0x1000*4);  // scratch
-					membank("sprbank1")->set_base(m_spriteram + 0x1000*4);  // scratch
-					break;
-
-				case 0x12:  // 3800 IS ROM
-					membank("rombank0")->set_base(rom + 0x6400);
-					membank("rombank1")->set_base(rom + 0x7400);
-					membank("sprbank0")->set_base(m_spriteram + 0x1000*4);  // scratch
-					membank("sprbank1")->set_base(m_spriteram + 0x1000*4);  // scratch
-					break;
-
-				// used in test mode (code at 2cc4):
-//              case 0x5c:  membank("rombank")->set_base(rom + 0x400 + 0x0000);    break;  // 3800 IS RAM! (8000 bytes)
-
-				case 0x5e:  // 3800 IS RAM! (1404 bytes)
-					membank("rombank0")->set_base(m_spriteram + 0x1000*1);
-					membank("sprbank0")->set_base(m_spriteram + 0x1000*1);
-					membank("rombank1")->set_base(m_spriteram + 0x1000*2);
-					membank("sprbank1")->set_base(m_spriteram + 0x1000*2);
-					break;
-
-				case 0x6c:  // 3800 IS RAM! (1000 bytes) - SPRITERAM
-					membank("rombank0")->set_base(m_spriteram);
-					membank("sprbank0")->set_base(m_spriteram);
-//                  membank("sprbank1")->set_base(m_spriteram + 0x1000*4);    // scratch
-					break;
-
-				default:
-					logerror("%s: unknown rom bank = %02x, reg = %02x\n", machine().describe_context(), data, m_reg);
-			}
-			break;
-
-		case 0xcd:
-			m_rombank = data;
-			switch (data)
-			{
-				case 0x14:  // 3800 IS ROM
-					membank("rombank0")->set_base(rom + 0x8800);
-					membank("rombank1")->set_base(rom + 0x9800);
-					membank("sprbank0")->set_base(m_spriteram + 0x1000*4);  // scratch
-					membank("sprbank1")->set_base(m_spriteram + 0x1000*4);  // scratch
-					break;
-
-				case 0x16:  // 3800 IS ROM
-					membank("rombank0")->set_base(rom + 0xa800);
-					membank("rombank1")->set_base(rom + 0xb800);
-					membank("sprbank0")->set_base(m_spriteram + 0x1000*4);  // scratch
-					membank("sprbank1")->set_base(m_spriteram + 0x1000*4);  // scratch
-					break;
-
-				default:
-					logerror("%s: unknown rom bank = %02x, reg = %02x\n", machine().describe_context(), data, m_reg);
-			}
-			break;
-
-		default:
-			logerror("%s: unknown reg written: %02x = %02x\n", machine().describe_context(), m_reg, data);
-	}
-}
-uint8_t sigmab98_state::itazuram_rombank_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg;
-
-	switch ( m_reg )
-	{
-		// FIXME: different registers
-		case 0x0d:
-		case 0x4d:
-		case 0x8d:
-		case 0xcd:
-			return m_rombank;
-
-		default:
-			logerror("%s: unknown reg read: %02x\n", machine().describe_context(), m_reg);
-			return 0x00;
-	}
-}
-
-// rambank
-void sigmab98_state::itazuram_rambank_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg2 = data;
-		return;
-	}
-
-	switch ( m_reg2 )
-	{
-		case 0x76:
-			m_rambank = data;
-			switch (data)
-			{
-				case 0x52:  membank("palbank")->set_base(m_nvram);          break;
-				case 0x64:  membank("palbank")->set_base(&m_paletteram[0]); break;
-				default:
-					logerror("%s: unknown ram bank = %02x, reg2 = %02x\n", machine().describe_context(), data, m_reg2);
-					return;
-			}
-			break;
-
-		default:
-			logerror("%s: unknown reg2 written: %02x = %02x\n", machine().describe_context(), m_reg2, data);
-	}
-}
-
-uint8_t sigmab98_state::itazuram_rambank_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg2;
-
-	switch ( m_reg2 )
-	{
-		case 0x76:
-			return m_rambank;
-
-		default:
-			logerror("%s: unknown reg2 read: %02x\n", machine().describe_context(), m_reg2);
-			return 0x00;
-	}
-}
-
-void sigmab98_state::itazuram_nvram_palette_w(offs_t offset, uint8_t data)
-{
-	if (m_rambank == 0x64)
-	{
-		m_palette->write8(offset, data);
-	}
-	else if (m_rambank == 0x52)
-	{
-		m_nvram[offset] = data;
-	}
-	else
-	{
-		logerror("%s: itazuram_nvram_palette_w offset = %03x with unknown bank = %02x\n", machine().describe_context(), offset, m_rambank);
-	}
-}
-
-void sigmab98_state::itazuram_palette_w(offs_t offset, uint8_t data)
-{
-	if (m_rombank == 0x6c)
-	{
-		if (offset < 0x200)
-			m_palette->write8(offset, data);
-	}
-	else
-	{
-		logerror("%s: itazuram_palette_w offset = %03x with unknown bank = %02x\n", machine().describe_context(), offset, m_rombank);
-	}
-}
-
-uint8_t sigmab98_state::itazuram_palette_r(offs_t offset)
-{
-	return m_paletteram[offset];
-}
-
-void sigmab98_state::itazuram_map(address_map &map)
+void sammymdl_state::itazuram_map(address_map &map)
 {
-	map(0x0000, 0x37ff).rom();
-	map(0x3800, 0x47ff).bankr("rombank0").bankw("sprbank0");
-	map(0x4800, 0x57ff).bankr("rombank1").bankw("sprbank1");
-
-	map(0x5800, 0x59ff).rw(FUNC(sigmab98_state::itazuram_palette_r), FUNC(sigmab98_state::itazuram_palette_w));
-	map(0x6000, 0x607f).ram().share("vtable");
-
-	map(0x6800, 0x6821).rw(FUNC(sigmab98_state::vregs_r), FUNC(sigmab98_state::vregs_w)).share("vregs");
-	map(0x6811, 0x6811).nopw();  // IRQ Enable? Screen disable?
-	map(0x6813, 0x6813).nopw();  // IRQ Ack?
-	map(0xdc00, 0xfdff).bankr("palbank").w(FUNC(sigmab98_state::itazuram_nvram_palette_w)).share("nvram");    // nvram | paletteram
-
-	map(0xfe00, 0xffff).ram();   // High speed internal RAM
+	map(0x00000, 0x0ffff).rom().region("mainbios", 0);
+	map(0x10000, 0x2ffff).rom().region("maincpu", 0x400);
+	map(0x60000, 0x63fff).ram().share("nvram");
+	map(0x70000, 0x70fff).ram().share("spriteram");
+	map(0x72000, 0x721ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
+	map(0x72800, 0x7287f).ram().share("vtable");
+	map(0x73000, 0x73021).rw(FUNC(sammymdl_state::vregs_r), FUNC(sammymdl_state::vregs_w)).share("vregs");
+	map(0x73011, 0x73011).nopw();  // IRQ Enable? Screen disable?
+	map(0x73013, 0x73013).r(FUNC(sammymdl_state::haekaka_vblank_r)).nopw();  // IRQ Ack?
 }
 
-void sigmab98_state::itazuram_io(address_map &map)
+void sammymdl_state::itazuram_io(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0x02, 0x03).rw(FUNC(sigmab98_state::itazuram_rombank_r), FUNC(sigmab98_state::itazuram_rombank_w));
-	map(0x04, 0x05).rw(FUNC(sigmab98_state::itazuram_rambank_r), FUNC(sigmab98_state::itazuram_rambank_w));
-
-	map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w));
-	map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r));
+	map(0x2c, 0x2c).rw(FUNC(sammymdl_state::eeprom_r), FUNC(sammymdl_state::eeprom_w));
+	map(0x2e, 0x2e).r(FUNC(sammymdl_state::coin_hopper_r));
 	map(0x30, 0x30).portr("BUTTON");
-	map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w));
-	map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w));
+	map(0x31, 0x31).rw(FUNC(sammymdl_state::coin_counter_r), FUNC(sammymdl_state::coin_counter_w));
+	map(0x32, 0x32).rw(FUNC(sammymdl_state::leds_r), FUNC(sammymdl_state::leds_w));
 	map(0x90, 0x90).w("oki", FUNC(okim9810_device::write));
 	map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w));
 	map(0x92, 0x92).r("oki", FUNC(okim9810_device::read));
-	map(0xb0, 0xb0).w(FUNC(sigmab98_state::sammymdl_hopper_w));
+	map(0xb0, 0xb0).w(FUNC(sammymdl_state::hopper_w));
 	map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w));  // 1
 }
 
@@ -2317,231 +1198,40 @@
                              Pye-nage Taikai
 ***************************************************************************/
 
-void sigmab98_state::pyenaget_io(address_map &map)
+void sammymdl_state::pyenaget_io(address_map &map)
 {
 	haekaka_io(map);
-	map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w));
+	map(0x31, 0x31).rw(FUNC(sammymdl_state::coin_counter_r), FUNC(sammymdl_state::coin_counter_w));
 }
 
 /***************************************************************************
                              Taihou de Doboon
 ***************************************************************************/
 
-// rombank
-void sigmab98_state::tdoboon_rombank_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg = data;
-		return;
-	}
-
-	switch ( m_reg )
-	{
-		case 0x2f:
-			m_rombank = data;
-			switch (data)
-			{
-				case 0x10:  // ROM
-				case 0x11:
-				case 0x12:
-				case 0x13:
-				case 0x14:
-				case 0x15:
-				case 0x16:
-				case 0x17:
-				case 0x18:
-				case 0x19:
-				case 0x1a:
-				case 0x1b:
-				case 0x1c:
-				case 0x1d:
-				case 0x1e:
-				case 0x1f:
-
-				case 0x64:  // SPRITERAM
-				case 0x66:  // PALETTERAM + VTABLE
-				case 0x67:  // VREGS
-					break;
-
-				default:
-					logerror("%s: unknown rom bank = %02x, reg = %02x\n", machine().describe_context(), data, m_reg);
-			}
-			break;
-
-		default:
-			logerror("%s: unknown reg written: %02x = %02x\n", machine().describe_context(), m_reg, data);
-	}
-}
-uint8_t sigmab98_state::tdoboon_rombank_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg;
-
-	switch ( m_reg )
-	{
-		case 0x2f:
-			return m_rombank;
-
-		default:
-			logerror("%s: unknown reg read: %02x\n", machine().describe_context(), m_reg);
-			return 0x00;
-	}
-}
-
-// rambank
-void sigmab98_state::tdoboon_rambank_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0)
-	{
-		m_reg2 = data;
-		return;
-	}
-
-	switch ( m_reg2 )
-	{
-		case 0x33:
-			m_rambank = data;
-			switch (data)
-			{
-				case 0x53:
-					break;
-
-				default:
-					logerror("%s: unknown ram bank = %02x, reg2 = %02x\n", machine().describe_context(), data, m_reg2);
-			}
-			break;
-
-		default:
-			logerror("%s: unknown reg2 written: %02x = %02x\n", machine().describe_context(), m_reg2, data);
-	}
-}
-uint8_t sigmab98_state::tdoboon_rambank_r(offs_t offset)
-{
-	if (offset == 0)
-		return m_reg2;
-
-	switch ( m_reg2 )
-	{
-		case 0x33:
-			return m_rambank;
-
-		default:
-			logerror("%s: unknown reg2 read: %02x\n", machine().describe_context(), m_reg2);
-			return 0x00;
-	}
-}
-
-uint8_t sigmab98_state::tdoboon_c000_r(offs_t offset)
-{
-	switch (m_rombank)
-	{
-		case 0x10:  // ROM
-		case 0x11:
-		case 0x12:
-		case 0x13:
-		case 0x14:
-		case 0x15:
-		case 0x16:
-		case 0x17:
-		case 0x18:
-		case 0x19:
-		case 0x1a:
-		case 0x1b:
-		case 0x1c:
-		case 0x1d:
-		case 0x1e:
-		case 0x1f:
-			return memregion("maincpu")->base()[offset + 0xc400 + 0x1000 * (m_rombank-0x10)];
-
-		case 0x64:  // SPRITERAM
-			if (offset < 0x1000)
-				return m_spriteram[offset];
-			break;
-
-		case 0x66:  // PALETTERAM + VTABLE
-			if (offset < 0x200)
-				return m_paletteram[offset];
-			else if ((offset >= 0x800) && (offset < 0x880))
-			{
-				return m_vtable[offset-0x800];
-			}
-			break;
-
-		case 0x67:  // VREGS
-			if (offset >= (0xc000-0xc000) && offset <= (0xc021-0xc000))
-			{
-				if (offset == (0xc013-0xc000))
-					return haekaka_vblank_r();
-				return vregs_r(offset-(0xc000-0xc000));
-			}
-			break;
-	}
-
-	logerror("%s: unknown read from %02x with rombank = %02x\n", machine().describe_context(), offset+0xc000, m_rombank);
-	return 0x00;
-}
-
-void sigmab98_state::tdoboon_c000_w(offs_t offset, uint8_t data)
-{
-	switch (m_rombank)
-	{
-		case 0x64:  // SPRITERAM
-			if (offset < 0x1000)
-			{
-				m_spriteram[offset] = data;
-				return;
-			}
-			break;
-
-		case 0x66:  // PALETTERAM + VTABLE
-			if (offset < 0x200)
-			{
-				m_palette->write8(offset, data);
-				return;
-			}
-			else if ((offset >= 0x800) && (offset < 0x880))
-			{
-				m_vtable[offset-0x800] = data;
-				return;
-			}
-			break;
-
-		case 0x67:  // VREGS
-			if (offset >= (0xc000-0xc000) && offset <= (0xc021-0xc000))
-			{
-				vregs_w(offset-(0xc000-0xc000), data);
-				return;
-			}
-			break;
-	}
-
-	logerror("%s: unknown write to %02x = %02x with rombank = %02x\n", machine().describe_context(), offset+0xc000, data, m_rombank);
-}
-
-void sigmab98_state::tdoboon_map(address_map &map)
+void sammymdl_state::tdoboon_map(address_map &map)
 {
-	map(0x0000, 0xbfff).rom();
-	map(0xc000, 0xcfff).rw(FUNC(sigmab98_state::tdoboon_c000_r), FUNC(sigmab98_state::tdoboon_c000_w));
-	map(0xd000, 0xefff).ram().share("nvram");
-	map(0xfe00, 0xffff).ram();   // High speed internal RAM
+	map(0x00000, 0x0ffff).rom().region("mainbios", 0);
+	map(0x10000, 0x2ffff).rom().region("maincpu", 0x400);
+	map(0x60000, 0x61fff).ram().share("nvram");
+	map(0x70000, 0x70fff).ram().share("spriteram");
+	map(0x72000, 0x721ff).ram().w(m_palette, FUNC(palette_device::write8)).share("palette");
+	map(0x72800, 0x7287f).ram().share("vtable");
+	map(0x73000, 0x73021).rw(FUNC(sammymdl_state::vregs_r), FUNC(sammymdl_state::vregs_w)).share("vregs");
+	map(0x73013, 0x73013).r(FUNC(sammymdl_state::haekaka_vblank_r));
 }
 
-void sigmab98_state::tdoboon_io(address_map &map)
+void sammymdl_state::tdoboon_io(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0x02, 0x03).rw(FUNC(sigmab98_state::tdoboon_rombank_r), FUNC(sigmab98_state::tdoboon_rombank_w));
-	map(0x04, 0x05).rw(FUNC(sigmab98_state::tdoboon_rambank_r), FUNC(sigmab98_state::tdoboon_rambank_w));
-
-	map(0x2c, 0x2c).rw(FUNC(sigmab98_state::sammymdl_eeprom_r), FUNC(sigmab98_state::sammymdl_eeprom_w));
-	map(0x2e, 0x2e).r(FUNC(sigmab98_state::sammymdl_coin_hopper_r));
+	map(0x2c, 0x2c).rw(FUNC(sammymdl_state::eeprom_r), FUNC(sammymdl_state::eeprom_w));
+	map(0x2e, 0x2e).r(FUNC(sammymdl_state::coin_hopper_r));
 	map(0x30, 0x30).portr("BUTTON");
-	map(0x31, 0x31).rw(FUNC(sigmab98_state::sammymdl_coin_counter_r), FUNC(sigmab98_state::sammymdl_coin_counter_w));
-	map(0x32, 0x32).rw(FUNC(sigmab98_state::sammymdl_leds_r), FUNC(sigmab98_state::sammymdl_leds_w));
+	map(0x31, 0x31).rw(FUNC(sammymdl_state::coin_counter_r), FUNC(sammymdl_state::coin_counter_w));
+	map(0x32, 0x32).rw(FUNC(sammymdl_state::leds_r), FUNC(sammymdl_state::leds_w));
 	map(0x90, 0x90).w("oki", FUNC(okim9810_device::write));
 	map(0x91, 0x91).w("oki", FUNC(okim9810_device::tmp_register_w));
 	map(0x92, 0x92).r("oki", FUNC(okim9810_device::read));
-	map(0xb0, 0xb0).w(FUNC(sigmab98_state::sammymdl_hopper_w));
+	map(0xb0, 0xb0).w(FUNC(sammymdl_state::hopper_w));
 	map(0xc0, 0xc0).w("watchdog", FUNC(watchdog_timer_device::reset_w));  // 1
 }
 
@@ -2827,15 +1517,6 @@
                              Sigma B-98 Games
 ***************************************************************************/
 
-MACHINE_RESET_MEMBER(sigmab98_state,sigmab98)
-{
-	m_rombank = 0;
-	membank("rombank")->set_entry(0);
-
-	m_rambank = 0;
-	membank("rambank")->set_entry(0);
-}
-
 INTERRUPT_GEN_MEMBER(sigmab98_state::sigmab98_vblank_interrupt)
 {
 	device.execute().set_input_line_and_vector(0, HOLD_LINE, 0x5a); // Z80
@@ -2843,13 +1524,11 @@
 
 void sigmab98_state::sigmab98(machine_config &config)
 {
-	Z80(config, m_maincpu, 10000000);  // !! TAXAN KY-80, clock @X1? !!
+	KY80(config, m_maincpu, 20000000);  // !! TAXAN KY-80, clock @X1? !!
 	m_maincpu->set_addrmap(AS_PROGRAM, &sigmab98_state::gegege_mem_map);
 	m_maincpu->set_addrmap(AS_IO, &sigmab98_state::gegege_io_map);
 	m_maincpu->set_vblank_int("screen", FUNC(sigmab98_state::sigmab98_vblank_interrupt));
 
-	MCFG_MACHINE_RESET_OVERRIDE(sigmab98_state, sigmab98)
-
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
 	EEPROM_93C46_16BIT(config, "eeprom");
 
@@ -2861,7 +1540,7 @@
 	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500) /* not accurate */);   // game reads vblank state
 	m_screen->set_size(0x140, 0x100);
 	m_screen->set_visarea(0,0x140-1, 0,0xf0-1);
-	m_screen->set_screen_update(FUNC(sigmab98_state::screen_update_sigmab98));
+	m_screen->set_screen_update(FUNC(sigmab98_state::screen_update));
 	m_screen->set_palette(m_palette);
 
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_sigmab98);
@@ -2884,25 +1563,6 @@
 	sigmab98(config);
 
 	m_maincpu->set_addrmap(AS_PROGRAM, &sigmab98_state::dodghero_mem_map);
-	m_maincpu->set_addrmap(AS_IO, &sigmab98_state::dodghero_io_map);
-}
-
-void sigmab98_state::gegege(machine_config &config)
-{
-	sigmab98(config);
-
-	m_maincpu->set_addrmap(AS_PROGRAM, &sigmab98_state::gegege_mem_map);
-	m_maincpu->set_addrmap(AS_IO, &sigmab98_state::gegege_io_map);
-}
-
-void sigmab98_state::dashhero(machine_config &config)
-{
-	sigmab98(config);
-
-	m_maincpu->set_addrmap(AS_PROGRAM, &sigmab98_state::gegege_mem_map);
-	m_maincpu->set_addrmap(AS_IO, &sigmab98_state::dashhero_io_map);
-
-	config.device_remove("nvram"); // FIXME: does not survive between sessions otherwise
 }
 
 
@@ -2910,12 +1570,6 @@
                            Banpresto Medal Games
 ***************************************************************************/
 
-MACHINE_RESET_MEMBER(lufykzku_state,lufykzku)
-{
-	m_rombank = 0;
-	membank("romrambank")->set_entry(0);
-}
-
 TIMER_DEVICE_CALLBACK_MEMBER(lufykzku_state::lufykzku_irq)
 {
 	int scanline = param;
@@ -2930,13 +1584,11 @@
 
 void lufykzku_state::lufykzku(machine_config &config)
 {
-	Z80(config, m_maincpu, XTAL(20'000'000) / 2);  // !! TAXAN KY-80, clock @X1? !!
+	KY80(config, m_maincpu, XTAL(20'000'000));  // !! TAXAN KY-80, clock @X1? !!
 	m_maincpu->set_addrmap(AS_PROGRAM, &lufykzku_state::lufykzku_mem_map);
 	m_maincpu->set_addrmap(AS_IO, &lufykzku_state::lufykzku_io_map);
 	TIMER(config, "scantimer").configure_scanline(FUNC(lufykzku_state::lufykzku_irq), "screen", 0, 1);
 
-	MCFG_MACHINE_RESET_OVERRIDE(lufykzku_state, lufykzku)
-
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);   // battery backed RAM
 	// No EEPROM
 
@@ -2958,7 +1610,7 @@
 	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500) /* not accurate */);   // game reads vblank state
 	m_screen->set_size(0x140, 0x100);
 	m_screen->set_visarea(0,0x140-1, 0,0xf0-1);
-	m_screen->set_screen_update(FUNC(sigmab98_state::screen_update_sigmab98));
+	m_screen->set_screen_update(FUNC(lufykzku_state::screen_update));
 	m_screen->set_palette(m_palette);
 
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_lufykzku);
@@ -2980,34 +1632,32 @@
                              Sammy Medal Games
 ***************************************************************************/
 
-MACHINE_RESET_MEMBER(sigmab98_state,sammymdl)
-{
-	m_maincpu->set_state_int(Z80_PC, 0x400);  // code starts at 400 ??? (000 = cart header)
-}
-
-TIMER_DEVICE_CALLBACK_MEMBER(sigmab98_state::sammymdl_irq)
+TIMER_DEVICE_CALLBACK_MEMBER(sammymdl_state::sammymdl_irq)
 {
 	int scanline = param;
+	uint16_t irqs = 0;
 
 	if (scanline == 240)
-		m_maincpu->set_input_line_and_vector(0, HOLD_LINE, m_vblank_vector); // Z80
+		irqs |= 1 << ((m_vblank_vector & 0x1e) >> 1);
 
 	if (scanline == 128)
-		m_maincpu->set_input_line_and_vector(0, HOLD_LINE, m_timer0_vector); // Z80
+		irqs |= 1 << ((m_timer0_vector & 0x1e) >> 1);
 
 	if (scanline == 32)
-		m_maincpu->set_input_line_and_vector(0, HOLD_LINE, m_timer1_vector); // Z80
+		irqs |= 1 << ((m_timer1_vector & 0x1e) >> 1);
+
+	// FIXME: this is not much less of a hack than HOLD_LINE
+	if (irqs != 0)
+		m_maincpu->set_state_int(kl5c80a12_device::KP69_IRR, m_maincpu->state_int(kl5c80a12_device::KP69_IRR) | irqs);
 }
 
-void sigmab98_state::sammymdl(machine_config &config)
+void sammymdl_state::sammymdl(machine_config &config)
 {
-	Z80(config, m_maincpu, XTAL(20'000'000) / 2);    // !! KL5C80A120FP @ 10MHz? (actually 4 times faster than Z80) !!
-	m_maincpu->set_addrmap(AS_PROGRAM, &sigmab98_state::animalc_map);
-	m_maincpu->set_addrmap(AS_IO, &sigmab98_state::animalc_io);
+	KL5C80A12(config, m_maincpu, XTAL(20'000'000));    // !! KL5C80A12CFP @ 10MHz? (actually 4 times faster than Z80) !!
+	m_maincpu->set_addrmap(AS_PROGRAM, &sammymdl_state::animalc_map);
+	m_maincpu->set_addrmap(AS_IO, &sammymdl_state::animalc_io);
 
-	TIMER(config, "scantimer").configure_scanline(FUNC(sigmab98_state::sammymdl_irq), "screen", 0, 1);
-
-	MCFG_MACHINE_RESET_OVERRIDE(sigmab98_state, sammymdl )
+	TIMER(config, "scantimer").configure_scanline(FUNC(sammymdl_state::sammymdl_irq), "screen", 0, 1);
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);   // battery backed RAM
 	EEPROM_93C46_8BIT(config, "eeprom");
@@ -3022,8 +1672,8 @@
 	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500) /* not accurate */);   // game reads vblank state
 	m_screen->set_size(0x140, 0x100);
 	m_screen->set_visarea(0, 0x140-1, 0, 0xf0-1);
-	m_screen->set_screen_update(FUNC(sigmab98_state::screen_update_sigmab98));
-	m_screen->screen_vblank().set(FUNC(sigmab98_state::screen_vblank_sammymdl));
+	m_screen->set_screen_update(FUNC(sammymdl_state::screen_update));
+	m_screen->screen_vblank().set(FUNC(sammymdl_state::screen_vblank_sammymdl));
 	m_screen->set_palette(m_palette);
 
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_sigmab98);
@@ -3041,56 +1691,56 @@
 	oki.add_route(1, "rspeaker", 0.80);
 }
 
-void sigmab98_state::animalc(machine_config &config)
+void sammymdl_state::animalc(machine_config &config)
 {
 	sammymdl(config);
 
-	m_maincpu->set_addrmap(AS_PROGRAM, &sigmab98_state::animalc_map);
-	m_maincpu->set_addrmap(AS_IO, &sigmab98_state::animalc_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &sammymdl_state::animalc_map);
+	m_maincpu->set_addrmap(AS_IO, &sammymdl_state::animalc_io);
 }
 
-void sigmab98_state::gocowboy(machine_config &config)
+void sammymdl_state::gocowboy(machine_config &config)
 {
 	sammymdl(config);
 
-	m_maincpu->set_addrmap(AS_PROGRAM, &sigmab98_state::gocowboy_map);
-	m_maincpu->set_addrmap(AS_IO, &sigmab98_state::gocowboy_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &sammymdl_state::gocowboy_map);
+	m_maincpu->set_addrmap(AS_IO, &sammymdl_state::gocowboy_io);
 
 	config.device_remove("hopper");
 	TICKET_DISPENSER(config, m_hopper_small, attotime::from_msec(1000), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW );
 	TICKET_DISPENSER(config, m_hopper_large, attotime::from_msec(1000), TICKET_MOTOR_ACTIVE_LOW, TICKET_STATUS_ACTIVE_LOW );
 }
 
-void sigmab98_state::haekaka(machine_config &config)
+void sammymdl_state::haekaka(machine_config &config)
 {
 	sammymdl(config);
 
-	m_maincpu->set_addrmap(AS_PROGRAM, &sigmab98_state::haekaka_map);
-	m_maincpu->set_addrmap(AS_IO, &sigmab98_state::haekaka_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &sammymdl_state::haekaka_map);
+	m_maincpu->set_addrmap(AS_IO, &sammymdl_state::haekaka_io);
 }
 
-void sigmab98_state::itazuram(machine_config &config)
+void sammymdl_state::itazuram(machine_config &config)
 {
 	sammymdl(config);
 
-	m_maincpu->set_addrmap(AS_PROGRAM, &sigmab98_state::itazuram_map);
-	m_maincpu->set_addrmap(AS_IO, &sigmab98_state::itazuram_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &sammymdl_state::itazuram_map);
+	m_maincpu->set_addrmap(AS_IO, &sammymdl_state::itazuram_io);
 }
 
-void sigmab98_state::pyenaget(machine_config &config)
+void sammymdl_state::pyenaget(machine_config &config)
 {
 	sammymdl(config);
 
-	m_maincpu->set_addrmap(AS_PROGRAM, &sigmab98_state::haekaka_map);
-	m_maincpu->set_addrmap(AS_IO, &sigmab98_state::pyenaget_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &sammymdl_state::haekaka_map);
+	m_maincpu->set_addrmap(AS_IO, &sammymdl_state::pyenaget_io);
 }
 
-void sigmab98_state::tdoboon(machine_config &config)
+void sammymdl_state::tdoboon(machine_config &config)
 {
 	sammymdl(config);
 
-	m_maincpu->set_addrmap(AS_PROGRAM, &sigmab98_state::tdoboon_map);
-	m_maincpu->set_addrmap(AS_IO, &sigmab98_state::tdoboon_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &sammymdl_state::tdoboon_map);
+	m_maincpu->set_addrmap(AS_IO, &sammymdl_state::tdoboon_io);
 
 	m_screen->set_visarea(0,0x140-1, 0+4,0xf0+4-1);
 }
@@ -3121,17 +1771,6 @@
 	ROM_LOAD( "b9802-6.ic26", 0x80000, 0x80000, CRC(d83d8537) SHA1(9a5afdc68417db828a09188d653552452930b136) )
 ROM_END
 
-void sigmab98_state::init_dodghero()
-{
-	// ROM banks
-	uint8_t *rom = memregion("maincpu")->base();
-	membank("rombank")->configure_entries(0, 0x18*2, rom + 0x8000, 0x800);
-
-	// RAM banks
-	uint8_t *bankedram = auto_alloc_array(machine(), uint8_t, 0x800 * 2);
-	membank("rambank")->configure_entries(0, 2, bankedram, 0x800);
-}
-
 /***************************************************************************
 
   Itazura Daisuki! Sushimaru Kun
@@ -3216,15 +1855,6 @@
 
 	rom[0x8164] = 0x00;
 	rom[0x8165] = 0x00;
-
-	// ROM banks
-	membank("rombank")->configure_entries(0, 0x18, rom + 0x8000, 0x1000);
-	membank("rombank")->set_entry(0);
-
-	// RAM banks
-	uint8_t *bankedram = auto_alloc_array(machine(), uint8_t, 0x800 * 2);
-	membank("rambank")->configure_entries(0, 2, bankedram, 0x800);
-	membank("rambank")->set_entry(0);
 }
 
 /***************************************************************************
@@ -3255,15 +1885,6 @@
 
 	rom[0x8164] = 0x00;
 	rom[0x8165] = 0x00;
-
-	// ROM banks
-	membank("rombank")->configure_entries(0, 0x18, rom + 0x8000, 0x1000);
-	membank("rombank")->set_entry(0);
-
-	// RAM banks
-	uint8_t *bankedram = auto_alloc_array(machine(), uint8_t, 0x800 * 2);
-	membank("rambank")->configure_entries(0, 2, bankedram, 0x800);
-	membank("rambank")->set_entry(0);
 }
 
 /***************************************************************************
@@ -3302,15 +1923,6 @@
 
 	rom[0x8164] = 0x00;
 	rom[0x8165] = 0x00;
-
-	// ROM banks
-	membank("rombank")->configure_entries(0, 0x18, rom + 0x8000, 0x1000);
-	membank("rombank")->set_entry(0);
-
-	// RAM banks
-	uint8_t *bankedram = auto_alloc_array(machine(), uint8_t, 0x800 * 2);
-	membank("rambank")->configure_entries(0, 2, bankedram, 0x800);
-	membank("rambank")->set_entry(0);
 }
 
 /***************************************************************************
@@ -3343,15 +1955,6 @@
 
 	rom[0x8164] = 0x00;
 	rom[0x8165] = 0x00;
-
-	// ROM banks
-	membank("rombank")->configure_entries(0, 0x18, rom + 0x8000, 0x1000);
-	membank("rombank")->set_entry(0);
-
-	// RAM banks
-	uint8_t *bankedram = auto_alloc_array(machine(), uint8_t, 0x800 * 2);
-	membank("rambank")->configure_entries(0, 2, bankedram, 0x800);
-	membank("rambank")->set_entry(0);
 }
 
 /***************************************************************************
@@ -3392,15 +1995,6 @@
 
 	rom[0x8164] = 0x00;
 	rom[0x8165] = 0x00;
-
-	// ROM banks
-	membank("rombank")->configure_entries(0, 0x18, rom + 0x8000, 0x1000);
-	membank("rombank")->set_entry(0);
-
-	// RAM banks
-	uint8_t *bankedram = auto_alloc_array(machine(), uint8_t, 0x800 * 2);
-	membank("rambank")->configure_entries(0, 2, bankedram, 0x800);
-	membank("rambank")->set_entry(0);
 }
 
 /***************************************************************************
@@ -3432,15 +2026,6 @@
 
 	rom[0x8162] = 0x00;
 	rom[0x8163] = 0x00;
-
-	// ROM banks
-	membank("rombank")->configure_entries(0, 0x18, rom + 0x8000, 0x1000);
-	membank("rombank")->set_entry(0);
-
-	// RAM banks
-	uint8_t *bankedram = auto_alloc_array(machine(), uint8_t, 0x800 * 4);
-	membank("rambank")->configure_entries(0, 4, bankedram, 0x800);
-	membank("rambank")->set_entry(0);
 }
 
 
@@ -3490,17 +2075,6 @@
 
 void lufykzku_state::init_lufykzku()
 {
-	m_nvram.allocate(0x4000);
-	memset(m_nvram, 0, 0x4000);
-	m_nvramdev->set_base(m_nvram, 0x4000);
-
-	// ROM/RAM banks
-	uint8_t *rom = memregion("maincpu")->base();
-
-	membank("romrambank")->configure_entry(0, rom + 0x8000);
-	membank("romrambank")->configure_entry(1, m_nvram);
-	membank("romrambank")->set_entry(0);
-
 	m_vblank_vector = 0xfa; // nop
 	m_timer0_vector = 0xfc; // write coin counters/lockout, drive hopper
 	m_timer1_vector = 0xfe; // read inputs and hopper sensor, handle coin in
@@ -3520,15 +2094,16 @@
 
   CPU:
 
-    KAWASAKI KL5C80A120FP (@U1) - Z80 Compatible High Speed Microcontroller
+    KAWASAKI KL5C80A12CFP (@U1) - Z80 Compatible High Speed Microcontroller
     XTAL 20 MHz  (@X1)
     MX29F040TC-12 VM1211L01 (@U2) - 4M-bit [512kx8] CMOS Equal Sector Flash Memory
     BSI BS62LV256SC-70      (@U4) - Very Low Power/Voltage CMOS SRAM 32K X 8 bit
+    (or Toshiba TC55257DFL-70L)
 
   Video:
 
-    TAXAN KY-3211 ? (@U17)
-    M548262-60 (@U18) - 262144-Word x 8-Bit Multiport DRAM
+    TAXAN KY-3211 (@U17)
+    OKI M548262-60 (@U18) - 262144-Word x 8-Bit Multiport DRAM
     XTAL 27 MHz (@X3)
 
   Sound:
@@ -3541,13 +2116,18 @@
   Other:
 
     Xilinx XC9536 VM1212F01 (@U5) - In-System Programmable CPLD
-    MX29F0??C (@U3) - Empty 32 Pin ROM Socket
+    MX29F0?TC (@U3) - Empty 32 Pin DIP Socket
     M5295A (@U8) - Watchdog Timer (Near CUT-DEBUG MODE Jumper)
-    M93C46MN6T (@U11?) - Serial EEPROM
+    M93C46MN6T (@U6) - Serial EEPROM
+    RTC8564 (@U7) - not populated
+    SN75C1168 (@U10) - Dual RS-422 Transceiver
     Cell Battery (@BAT)
     25 Pin Edge Connector
     56 Pin Cartridge Connector
-    6 Pin Connector
+    6 Pin Connector - +5V (1), GND (2), TCLK (3), TDO (4), TDI (5), TMS (6)
+
+  On Go Go Cowboy, U2 and U10 are unpopulated, but U3 is occupied by a
+  ST M27C4001-10F1 EPROM.
 
 ***************************************************************************/
 
@@ -3562,7 +2142,7 @@
 	ROM_REGION( 0x1000000, "oki", ROMREGION_ERASEFF )
 
 	ROM_REGION( 0x40000, "maincpu", ROMREGION_ERASEFF )
-	ROM_COPY( "mainbios", 0x000000, 0x0000, 0x40000 )
+	ROM_COPY( "mainbios", 0x00fc00, 0x0000, 0x40000 )
 
 	ROM_REGION( 0x200000, "sprites", ROMREGION_ERASEFF )
 ROM_END
@@ -3590,18 +2170,20 @@
 	ROM_LOAD( "vx2301l01.u016", 0x00000, 0x200000, CRC(4ae14ff9) SHA1(1273d15ea642452fecacff572655cd3ab47a5884) )   // 1xxxxxxxxxxxxxxxxxxxx = 0x00
 ROM_END
 
-void sigmab98_state::init_animalc()
+void sammymdl_state::init_animalc()
 {
-	// RAM banks
-	uint8_t *bankedram = auto_alloc_array(machine(), uint8_t, 0x1000 * 5);
-	membank("rambank")->configure_entry(0, m_nvram);
-	membank("rambank")->configure_entries(1, 4, bankedram, 0x1000);
-	membank("rambank")->set_entry(0);
-
-	m_spriteram.allocate(0x1000 * 5);
-	memset(m_spriteram, 0, 0x1000 * 5);
-	membank("sprbank")->configure_entries(0, 5, m_spriteram, 0x1000);
-	membank("sprbank")->set_entry(0);
+	uint8_t *rom = memregion("mainbios")->base();
+
+	// video timing loops
+	rom[0x015d9] = 0x00;
+	rom[0x015da] = 0x00;
+	rom[0x01605] = 0x00;
+	rom[0x01606] = 0x00;
+	rom[0x01750] = 0x00;
+	rom[0x01751] = 0x00;
+
+	// force jump out of BIOS loop
+	rom[0x005ac] = 0xc3;
 
 	m_vblank_vector = 0x00; // increment counter
 	m_timer0_vector = 0x1c; // read hopper state
@@ -3633,9 +2215,6 @@
 	ROM_REGION( 0x1000000, "oki", ROMREGION_ERASEFF )
 	ROM_LOAD( "em702l01.u021", 0x000000, 0x200000, CRC(4c4289fe) SHA1(517b5a1e9d91e7ed322b4792d863e7abda835d4a) )
 
-	ROM_REGION( 0x40000, "maincpu", 0 )
-	ROM_COPY( "mainbios", 0x00fc00, 0x00000, 0x40000 )
-
 	ROM_REGION( 0x200000, "sprites", 0 )
 	ROM_LOAD( "em701l01.u016", 0x000000, 0x200000, CRC(c1f07320) SHA1(734717140e66ddcf0bded1489156c51cdaf1b50c) )
 
@@ -3646,29 +2225,8 @@
 	ROM_LOAD( "vm1212f01.u5.jed", 0x0000, 0x5cde, CRC(b86a1825) SHA1(cc2e633fb8a24cfc93291a778b0964089f6b8ac7) )
 ROM_END
 
-void sigmab98_state::init_gocowboy()
+void sammymdl_state::init_gocowboy()
 {
-	// RAM banks
-	m_paletteram.resize(0x200);
-	memset(&m_paletteram[0], 0, 0x200);
-	m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2);
-
-	m_nvram.allocate(0x8000);
-	memset(m_nvram, 0, 0x8000);
-	m_nvramdev->set_base(m_nvram, 0x8000);
-
-	m_spriteram.allocate(0x1000);
-	memset(m_spriteram, 0, 0x1000);
-
-	m_vregs.allocate(0x22);
-	memset(m_vregs, 0, 0x22);
-
-	m_vtable.allocate(0x80);
-	memset(m_vtable, 0, 0x80);
-
-	m_rombank = 0x6b;
-	m_rambank = 0x52;
-
 	m_vblank_vector = 0x00;
 	m_timer0_vector = 0x02;
 	m_timer1_vector = 0x16;
@@ -3696,25 +2254,12 @@
 	ROM_LOAD( "vx2001l01.u016", 0x00000, 0x200000, CRC(9ee95222) SHA1(7154d43ef312a48a882207ca37e1c61e8b215a9b) )
 ROM_END
 
-void sigmab98_state::init_itazuram()
+void sammymdl_state::init_itazuram()
 {
-	// ROM banks
-	uint8_t *rom = memregion("maincpu")->base();
-	membank("rombank0")->set_base(rom + 0x3400);
-	membank("rombank1")->set_base(rom + 0x4400);
-	m_rombank = 0x0f;
-
-	// RAM banks
-	m_paletteram.resize(0x3000);
-	memset(&m_paletteram[0], 0, 0x3000);
-	m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2);
-	membank("palbank")->set_base(&m_paletteram[0]);
-	m_rambank = 0x64;
-
-	m_spriteram.allocate(0x1000 * 5);
-	memset(m_spriteram, 0, 0x1000 * 5);
-	membank("sprbank0")->set_base(m_spriteram + 0x1000*4);  // scratch
-	membank("sprbank1")->set_base(m_spriteram + 0x1000*4);  // scratch
+	uint8_t *rom = memregion("mainbios")->base();
+
+	// force jump out of BIOS loop
+	rom[0x005ac] = 0xc3;
 
 	m_vblank_vector = 0x00;
 	m_timer0_vector = 0x02;
@@ -3815,24 +2360,12 @@
 	ROM_LOAD( "em4207l01.u016", 0x00000, 0x200000, CRC(3876961c) SHA1(3d842c1f63ea5aa7e799967928b86c5fabb4e65e) )
 ROM_END
 
-void sigmab98_state::init_haekaka()
+void sammymdl_state::init_haekaka()
 {
-	// RAM banks
-	m_paletteram.resize(0x200);
-	memset(&m_paletteram[0], 0, 0x200);
-	m_palette->basemem().set(m_paletteram, ENDIANNESS_BIG, 2);
-
-	m_spriteram.allocate(0x1000);
-	memset(m_spriteram, 0, 0x1000);
-
-	m_vregs.allocate(0x22);
-	memset(m_vregs, 0, 0x22);
-
-	m_vtable.allocate(0x80);
-	memset(m_vtable, 0, 0x80);
+	uint8_t *rom = memregion("mainbios")->base();
 
-	m_rombank = 0x65;
-	m_rambank = 0x53;
+	// force jump out of BIOS loop
+	rom[0x005ac] = 0xc3;
 
 	m_vblank_vector = 0x04;
 	m_timer0_vector = 0x1a;
@@ -3846,21 +2379,21 @@
 ***************************************************************************/
 
 // Sigma Medal Games
-GAME( 1997, dodghero, 0,        dodghero, sigma_1b, sigmab98_state, init_dodghero, ROT0, "Sigma",             "Minna Atsumare! Dodge Hero",           0 )
-GAME( 1997, sushimar, 0,        dodghero, sigma_3b, sigmab98_state, init_dodghero, ROT0, "Sigma",             "Itazura Daisuki! Sushimaru Kun",       0 )
-GAME( 1997, gegege,   0,        gegege,   sigma_1b, sigmab98_state, init_gegege,   ROT0, "Sigma / Banpresto", "GeGeGe no Kitarou Youkai Slot",        0 )
-GAME( 1997, b3rinsya, 0,        gegege,   sigma_5b, sigmab98_state, init_b3rinsya, ROT0, "Sigma",             "Burning Sanrinsya - Burning Tricycle", 0 ) // 1997 in the rom
-GAME( 1997, pepsiman, 0,        gegege,   sigma_3b, sigmab98_state, init_pepsiman, ROT0, "Sigma",             "PEPSI Man",                            0 )
-GAME( 1998, tbeastw2, 0,        gegege,   sigma_3b, sigmab98_state, init_tbeastw2, ROT0, "Sigma / Transformer Production Company / Takara", "Transformers Beast Wars II", 0 ) // 1997 in the rom
-GAME( 1997, ucytokyu, 0,        gegege,   sigma_js, sigmab98_state, init_ucytokyu, ROT0, "Sigma",             "Uchuu Tokkyuu Medalian",               0 ) // Banpresto + others in the ROM
-GAME( 2000, dashhero, 0,        dashhero, sigma_1b, sigmab98_state, init_dashhero, ROT0, "Sigma",             "Minna Ganbare! Dash Hero",             MACHINE_NOT_WORKING ) // 1999 in the rom
+GAME( 1997, dodghero, 0,        dodghero, sigma_1b, sigmab98_state, empty_init,    ROT0, "Sigma",             "Minna Atsumare! Dodge Hero",           0 )
+GAME( 1997, sushimar, 0,        dodghero, sigma_3b, sigmab98_state, empty_init,    ROT0, "Sigma",             "Itazura Daisuki! Sushimaru Kun",       0 )
+GAME( 1997, gegege,   0,        sigmab98, sigma_1b, sigmab98_state, init_gegege,   ROT0, "Sigma / Banpresto", "GeGeGe no Kitarou Youkai Slot",        0 )
+GAME( 1997, b3rinsya, 0,        sigmab98, sigma_5b, sigmab98_state, init_b3rinsya, ROT0, "Sigma",             "Burning Sanrinsya - Burning Tricycle", 0 ) // 1997 in the rom
+GAME( 1997, pepsiman, 0,        sigmab98, sigma_3b, sigmab98_state, init_pepsiman, ROT0, "Sigma",             "PEPSI Man",                            0 )
+GAME( 1998, tbeastw2, 0,        sigmab98, sigma_3b, sigmab98_state, init_tbeastw2, ROT0, "Sigma / Transformer Production Company / Takara", "Transformers Beast Wars II", 0 ) // 1997 in the rom
+GAME( 1997, ucytokyu, 0,        sigmab98, sigma_js, sigmab98_state, init_ucytokyu, ROT0, "Sigma",             "Uchuu Tokkyuu Medalian",               0 ) // Banpresto + others in the ROM
+GAME( 2000, dashhero, 0,        sigmab98, sigma_1b, sigmab98_state, init_dashhero, ROT0, "Sigma",             "Minna Ganbare! Dash Hero",             MACHINE_NOT_WORKING ) // 1999 in the rom
 // Banpresto Medal Games
 GAME( 2001, lufykzku, 0,        lufykzku, lufykzku, lufykzku_state, init_lufykzku, ROT0, "Banpresto / Eiichiro Oda / Shueisha - Fuji TV - Toho Animation", "Otakara Itadaki Luffy Kaizoku-Dan! (Japan, v1.02)", 0 )
 // Sammy Medal Games:
-GAME( 2000, sammymdl, 0,        sammymdl, sammymdl, sigmab98_state, init_animalc,  ROT0, "Sammy",             "Sammy Medal Game System Bios",         MACHINE_IS_BIOS_ROOT )
-GAME( 2000, animalc,  sammymdl, animalc,  sammymdl, sigmab98_state, init_animalc,  ROT0, "Sammy",             "Animal Catch",                         0 )
-GAME( 2000, itazuram, sammymdl, itazuram, sammymdl, sigmab98_state, init_itazuram, ROT0, "Sammy",             "Itazura Monkey",                       0 )
-GAME( 2000, pyenaget, sammymdl, pyenaget, sammymdl, sigmab98_state, init_haekaka,  ROT0, "Sammy",             "Pye-nage Taikai",                      0 )
-GAME( 2000, tdoboon,  sammymdl, tdoboon,  haekaka,  sigmab98_state, init_haekaka,  ROT0, "Sammy",             "Taihou de Doboon",                     0 )
-GAME( 2001, haekaka,  sammymdl, haekaka,  haekaka,  sigmab98_state, init_haekaka,  ROT0, "Sammy",             "Hae Hae Ka Ka Ka",                     0 )
-GAME( 2003, gocowboy, sammymdl, gocowboy, gocowboy, sigmab98_state, init_gocowboy, ROT0, "Sammy",             "Go Go Cowboy (English, prize)",        0 )
+GAME( 2000, sammymdl, 0,        sammymdl, sammymdl, sammymdl_state, init_animalc,  ROT0, "Sammy",             "Sammy Medal Game System Bios",         MACHINE_IS_BIOS_ROOT )
+GAME( 2000, animalc,  sammymdl, animalc,  sammymdl, sammymdl_state, init_animalc,  ROT0, "Sammy",             "Animal Catch",                         0 )
+GAME( 2000, itazuram, sammymdl, itazuram, sammymdl, sammymdl_state, init_itazuram, ROT0, "Sammy",             "Itazura Monkey",                       0 )
+GAME( 2000, pyenaget, sammymdl, pyenaget, sammymdl, sammymdl_state, init_haekaka,  ROT0, "Sammy",             "Pye-nage Taikai",                      0 )
+GAME( 2000, tdoboon,  sammymdl, tdoboon,  haekaka,  sammymdl_state, init_haekaka,  ROT0, "Sammy",             "Taihou de Doboon",                     0 )
+GAME( 2001, haekaka,  sammymdl, haekaka,  haekaka,  sammymdl_state, init_haekaka,  ROT0, "Sammy",             "Hae Hae Ka Ka Ka",                     0 )
+GAME( 2003, gocowboy, 0,        gocowboy, gocowboy, sammymdl_state, init_gocowboy, ROT0, "Sammy",             "Go Go Cowboy (English, prize)",        0 )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/simpsons.cpp mame-0.224+dfsg.1/src/mame/drivers/simpsons.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/simpsons.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/simpsons.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -341,12 +341,11 @@
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 
-	// Screen timings generated by the 051962, probably not programmable (except maybe between 6 amd 8MHz)
+	// Screen timings generated by the 051962, probably not programmable (except maybe between 6 and 8MHz)
 	// 6MHz dot clock
 	// horizontal: 16 cycles front porch, 32 cycles sync, 16 cycles back porch
 	// vertical: 16 lines front porch, 8 lines sync, 16 lines back porch
-
-	screen.set_raw(XTAL(24'000'000)/4, 384, 0, 320, 256, 0, 224);
+	screen.set_raw(XTAL(24'000'000)/4, 384, 0+16, 320-16, 264, 0, 224);
 	screen.set_video_attributes(VIDEO_UPDATE_AFTER_VBLANK);
 	screen.set_screen_update(FUNC(simpsons_state::screen_update_simpsons));
 	screen.set_palette("palette");
@@ -569,7 +568,7 @@
 	ROM_REGION( 0x80000, "maincpu", 0 ) /* code + banked roms */
 	ROM_LOAD( "072-g02.16c", 0x00000, 0x20000, CRC(580ce1d6) SHA1(5b07fb8e8041e1663980aa35d853fdc13b22dac5) ) /* Same as both world 2p sets */
 	ROM_LOAD( "072-p01.17c", 0x20000, 0x20000, CRC(07ceeaea) SHA1(c18255ae1d578c2d53de80d6323cdf41cbe47b57) ) /* Same as both world 2p sets */
-	ROM_LOAD( "072-113.13c", 0x40000, 0x20000, CRC(8781105a) SHA1(ef2f16f7a56d3715536511c674df4b3aab1be2bd) ) /* Same as world set simpsn2p */
+	ROM_LOAD( "072-113.13c", 0x40000, 0x20000, CRC(8781105a) SHA1(ef2f16f7a56d3715536511c674df4b3aab1be2bd) ) /* Same as world set simpsons2p */
 	ROM_LOAD( "072-112.15c", 0x60000, 0x20000, CRC(3bd69404) SHA1(e055fed7e9bde8315ae2f9b2d35bc05fece6b80b) )
 
 	ROM_REGION( 0x28000, "audiocpu", 0 ) /* Z80 code + banks */
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/slapshot.cpp mame-0.224+dfsg.1/src/mame/drivers/slapshot.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/slapshot.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/slapshot.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -534,6 +534,39 @@
 
 ROM_START( slapshot )
 	ROM_REGION( 0x100000, "maincpu", 0 )    /* 1024K for 68000 code */
+	ROM_LOAD16_BYTE( "promat.ic3",  0x00000, 0x80000, CRC(58e61833) SHA1(35ee07ab165618686ee98d60444d77070853d09b) ) /* yellow PROMAT label, but should be D71-xx - need to verify number */
+	ROM_LOAD16_BYTE( "promat.ic1",  0x00001, 0x80000, CRC(4d404f76) SHA1(d74b9d67e0fd35884526f79aa00f76bf936ab79f) ) /* yellow PROMAT label, but should be D71-yy - need to verify number */
+
+	ROM_REGION( 0x10000, "audiocpu", 0 )    /* sound cpu */
+	ROM_LOAD    ( "d71-07.77",    0x00000, 0x10000, CRC(dd5f670c) SHA1(743a9563c40fe40178c9ec8eece71a08380c2239) )
+
+	ROM_REGION( 0x100000, "tc0480scp", 0 )
+	ROM_LOAD32_WORD( "d71-04.79", 0x00000, 0x80000, CRC(b727b81c) SHA1(9f56160e2b3e4d59cfa96b5c013f4e368781666e) )  /* SCR */
+	ROM_LOAD32_WORD( "d71-05.80", 0x00002, 0x80000, CRC(7b0f5d6d) SHA1(a54e4a651dc7cdc160286afb3d38531c7b9396b1) )
+
+	ROM_REGION( 0x200000, "sprites", 0 )
+	ROM_LOAD16_BYTE( "d71-01.23", 0x000000, 0x100000, CRC(0b1e8c27) SHA1(ffa452f7414f3d61edb69bb61b29a0cc8d9176d0) )    /* OBJ 4bpp */
+	ROM_LOAD16_BYTE( "d71-02.24", 0x000001, 0x100000, CRC(ccaaea2d) SHA1(71b507f215f37e991abae5523642417a6b23a70d) )
+
+	ROM_REGION( 0x100000, "sprites_hi", 0 )
+	ROM_LOAD       ( "d71-03.25", 0x000000, 0x100000, CRC(dccef9ec) SHA1(ee7a49727b822cf4c1d7acff994b77ea6191c423) )    /* OBJ 2bpp */
+
+	ROM_REGION( 0x80000, "ymsnd", 0 )   /* ADPCM samples */
+	ROM_LOAD( "d71-06.37", 0x00000, 0x80000, CRC(f3324188) SHA1(70dd724441eae8614218bc7f0f51860bd2462f0c) )
+
+	/* no Delta-T samples */
+
+//  Pals (not dumped)
+//  ROM_LOAD( "d71-08.40",  0x00000, 0x00???, NO_DUMP )
+//  ROM_LOAD( "d71-09.57",  0x00000, 0x00???, NO_DUMP )
+//  ROM_LOAD( "d71-10.60",  0x00000, 0x00???, NO_DUMP )
+//  ROM_LOAD( "d71-11.42",  0x00000, 0x00???, NO_DUMP )
+//  ROM_LOAD( "d71-12.59",  0x00000, 0x00???, NO_DUMP )
+//  ROM_LOAD( "d71-13.8",   0x00000, 0x00???, NO_DUMP )
+ROM_END
+
+ROM_START( slapshotj )
+	ROM_REGION( 0x100000, "maincpu", 0 )    /* 1024K for 68000 code */
 	ROM_LOAD16_BYTE( "d71-15.3",  0x00000, 0x80000, CRC(1470153f) SHA1(63fd5314fcaafba7326fd9481e3c686901dde65c) )
 	ROM_LOAD16_BYTE( "d71-16.1",  0x00001, 0x80000, CRC(f13666e0) SHA1(e8b475163ea7da5ee3f2b900004cc67c684bab75) )
 
@@ -685,7 +718,8 @@
 	m_gfxdecode->set_gfx(1, nullptr);
 }
 
-GAME( 1994, slapshot, 0,       slapshot, slapshot, slapshot_state, driver_init, ROT0, "Taito Corporation",         "Slap Shot (Japan)",        MACHINE_SUPPORTS_SAVE )
-GAME( 1994, opwolf3,  0,       opwolf3,  opwolf3,  slapshot_state, driver_init, ROT0, "Taito Corporation Japan",   "Operation Wolf 3 (World)", MACHINE_SUPPORTS_SAVE )
-GAME( 1994, opwolf3u, opwolf3, opwolf3,  opwolf3,  slapshot_state, driver_init, ROT0, "Taito America Corporation", "Operation Wolf 3 (US)",    MACHINE_SUPPORTS_SAVE )
-GAME( 1994, opwolf3j, opwolf3, opwolf3,  opwolf3,  slapshot_state, driver_init, ROT0, "Taito Corporation",         "Operation Wolf 3 (Japan)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, slapshot,  0,        slapshot, slapshot, slapshot_state, driver_init, ROT0, "Taito Corporation Japan",   "Slap Shot (Ver 3.0 O)",    MACHINE_SUPPORTS_SAVE ) // 7/1  12:00  Ver 3.0 O
+GAME( 1994, slapshotj, slapshot, slapshot, slapshot, slapshot_state, driver_init, ROT0, "Taito Corporation",         "Slap Shot (Ver 2.2 J)",    MACHINE_SUPPORTS_SAVE ) // 6/8  12:00  Ver 2.2 J
+GAME( 1994, opwolf3,   0,        opwolf3,  opwolf3,  slapshot_state, driver_init, ROT0, "Taito Corporation Japan",   "Operation Wolf 3 (World)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, opwolf3u,  opwolf3,  opwolf3,  opwolf3,  slapshot_state, driver_init, ROT0, "Taito America Corporation", "Operation Wolf 3 (US)",    MACHINE_SUPPORTS_SAVE )
+GAME( 1994, opwolf3j,  opwolf3,  opwolf3,  opwolf3,  slapshot_state, driver_init, ROT0, "Taito Corporation",         "Operation Wolf 3 (Japan)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/sm1800.cpp mame-0.224+dfsg.1/src/mame/drivers/sm1800.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/sm1800.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/sm1800.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -30,9 +30,9 @@
 	sm1800_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_uart(*this, "i8251")
-		, m_ppi(*this, "i8255")
-		, m_crtc(*this, "i8275")
+		, m_uart(*this, "uart")
+		, m_ppi(*this, "ppi")
+		, m_crtc(*this, "crtc")
 		, m_palette(*this, "palette")
 	{ }
 
@@ -44,29 +44,29 @@
 	required_device<i8255_device> m_ppi;
 	required_device<i8275_device> m_crtc;
 	required_device<palette_device> m_palette;
-	void sm1800_8255_portb_w(uint8_t data);
-	void sm1800_8255_portc_w(uint8_t data);
-	uint8_t sm1800_8255_porta_r();
-	uint8_t sm1800_8255_portc_r();
+	void portb_w(uint8_t data);
+	void portc_w(uint8_t data);
+	uint8_t porta_r();
+	uint8_t portc_r();
 	uint8_t m_irq_state;
-	virtual void machine_reset() override;
+	void machine_start() override;
 	void sm1800_palette(palette_device &palette) const;
-	INTERRUPT_GEN_MEMBER(sm1800_vblank_interrupt);
-	IRQ_CALLBACK_MEMBER(sm1800_irq_callback);
+	INTERRUPT_GEN_MEMBER(vblank_interrupt);
+	IRQ_CALLBACK_MEMBER(irq_callback);
 	I8275_DRAW_CHARACTER_MEMBER( crtc_display_pixels );
-	void sm1800_io(address_map &map);
-	void sm1800_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 };
 
-void sm1800_state::sm1800_mem(address_map &map)
+void sm1800_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x0000, 0x07ff).rom();
-	//map(0x0fb0, 0x0fff).w("i8275", FUNC(i8275_device::dack_w));
+	//map(0x0fb0, 0x0fff).w("crtc", FUNC(i8275_device::dack_w));
 	map(0x1000, 0x17ff).ram(); // videoram looks like 1080-17FF, normal ascii
 }
 
-void sm1800_state::sm1800_io(address_map &map)
+void sm1800_state::io_map(address_map &map)
 {
 	map.global_mask(0xff);
 	map.unmap_value_high();
@@ -81,16 +81,17 @@
 static INPUT_PORTS_START( sm1800 )
 INPUT_PORTS_END
 
-IRQ_CALLBACK_MEMBER(sm1800_state::sm1800_irq_callback)
+IRQ_CALLBACK_MEMBER(sm1800_state::irq_callback)
 {
 	return 0xff;
 }
 
-void sm1800_state::machine_reset()
+void sm1800_state::machine_start()
 {
+	save_item(NAME(m_irq_state));
 }
 
-INTERRUPT_GEN_MEMBER(sm1800_state::sm1800_vblank_interrupt)
+INTERRUPT_GEN_MEMBER(sm1800_state::vblank_interrupt)
 {
 	m_maincpu->set_input_line(0, m_irq_state ?  HOLD_LINE : CLEAR_LINE);
 	m_irq_state ^= 1;
@@ -115,20 +116,20 @@
 		bitmap.pix32(y, x + i) = palette[(pixels >> (7-i)) & 1 ? (hlgt ? 2 : 1) : 0];
 }
 
-void sm1800_state::sm1800_8255_portb_w(uint8_t data)
+void sm1800_state::portb_w(uint8_t data)
 {
 }
 
-void sm1800_state::sm1800_8255_portc_w(uint8_t data)
+void sm1800_state::portc_w(uint8_t data)
 {
 }
 
-uint8_t sm1800_state::sm1800_8255_porta_r()
+uint8_t sm1800_state::porta_r()
 {
 	return 0xff;
 }
 
-uint8_t sm1800_state::sm1800_8255_portc_r()
+uint8_t sm1800_state::portc_r()
 {
 	return 0;
 }
@@ -142,7 +143,7 @@
 
 
 /* F4 Character Displayer */
-static const gfx_layout sm1800_charlayout =
+static const gfx_layout charlayout =
 {
 	8, 8,                   /* 8 x 8 characters */
 	256,                    /* 256 characters */
@@ -156,7 +157,7 @@
 };
 
 static GFXDECODE_START( gfx_sm1800 )
-	GFXDECODE_ENTRY( "chargen", 0x0000, sm1800_charlayout, 0, 1 )
+	GFXDECODE_ENTRY( "chargen", 0x0000, charlayout, 0, 1 )
 GFXDECODE_END
 
 
@@ -164,14 +165,14 @@
 {
 	/* basic machine hardware */
 	I8080(config, m_maincpu, XTAL(2'000'000));
-	m_maincpu->set_addrmap(AS_PROGRAM, &sm1800_state::sm1800_mem);
-	m_maincpu->set_addrmap(AS_IO, &sm1800_state::sm1800_io);
-	m_maincpu->set_vblank_int("screen", FUNC(sm1800_state::sm1800_vblank_interrupt));
-	m_maincpu->set_irq_acknowledge_callback(FUNC(sm1800_state::sm1800_irq_callback));
+	m_maincpu->set_addrmap(AS_PROGRAM, &sm1800_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &sm1800_state::io_map);
+	m_maincpu->set_vblank_int("screen", FUNC(sm1800_state::vblank_interrupt));
+	m_maincpu->set_irq_acknowledge_callback(FUNC(sm1800_state::irq_callback));
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_screen_update("i8275", FUNC(i8275_device::screen_update));
+	screen.set_screen_update("crtc", FUNC(i8275_device::screen_update));
 	screen.set_refresh_hz(50);
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	screen.set_size(640, 480);
@@ -182,10 +183,10 @@
 
 	/* Devices */
 	I8255(config, m_ppi);
-	m_ppi->in_pa_callback().set(FUNC(sm1800_state::sm1800_8255_porta_r));
-	m_ppi->out_pb_callback().set(FUNC(sm1800_state::sm1800_8255_portb_w));
-	m_ppi->in_pc_callback().set(FUNC(sm1800_state::sm1800_8255_portc_r));
-	m_ppi->out_pc_callback().set(FUNC(sm1800_state::sm1800_8255_portc_w));
+	m_ppi->in_pa_callback().set(FUNC(sm1800_state::porta_r));
+	m_ppi->out_pb_callback().set(FUNC(sm1800_state::portb_w));
+	m_ppi->in_pc_callback().set(FUNC(sm1800_state::portc_r));
+	m_ppi->out_pc_callback().set(FUNC(sm1800_state::portc_w));
 
 	I8275(config, m_crtc, 2000000);
 	m_crtc->set_character_width(8);
@@ -196,14 +197,14 @@
 
 /* ROM definition */
 ROM_START( sm1800 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x0800, "maincpu", 0 )
 	ROM_LOAD( "prog.bin", 0x0000, 0x0800, CRC(55736ad5) SHA1(b77f720f1b64b208dd6a5d4f9c9521d1284028e9))
 
-	ROM_REGION(0x0800, "chargen", 0)
+	ROM_REGION( 0x0800, "chargen", 0 )
 	ROM_LOAD( "font.bin", 0x0000, 0x0800, CRC(28ed9ebc) SHA1(f561136962a06a5dcb5a0436931d29e940155d24))
 ROM_END
 
 /* Driver */
 
 /*    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT   STATE         INIT        COMPANY      FULLNAME   FLAGS */
-COMP( ????, sm1800, 0,      0,      sm1800,  sm1800, sm1800_state, empty_init, "<unknown>", "SM1800",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( ????, sm1800, 0,      0,      sm1800,  sm1800, sm1800_state, empty_init, "<unknown>", "SM1800",  MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/smsmcorp.cpp mame-0.224+dfsg.1/src/mame/drivers/smsmcorp.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/smsmcorp.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/smsmcorp.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -866,7 +866,21 @@
 ROM_END
 
 
-ROM_START( sms4in1 )
+ROM_START( sms4in1 ) // VERSION SWS1-052587
+	ROM_REGION( 0x100000, "maincpu", 0 )
+	ROM_LOAD( "sms_26.19", 0xf8000, 0x02000, CRC(f6da0e37) SHA1(e7c64bb1915955dacb01ab0b19c327066615b5bb) )
+	ROM_LOAD( "sms_26.18", 0xfa000, 0x02000, CRC(6685c236) SHA1(7cc96d4b6253f3a57f5dd1da115997eb89184c0b) )
+	ROM_LOAD( "sms_26.17", 0xfc000, 0x02000, CRC(9972f206) SHA1(afcfbf004ee5457cb576ad421bee61ec42f5c057) )
+	ROM_LOAD( "sms_26.16", 0xfe000, 0x02000, CRC(0290772b) SHA1(7e7b68598473b86fcf770f3472560c828241d966) )
+	ROM_COPY( "maincpu",   0xf8000, 0x08000, 0x8000 )
+
+	ROM_REGION( 0x10000, "soundcpu", 0 )
+	ROM_LOAD( "sms_26.26", 0x0000, 0x1000, CRC(e04bb922) SHA1(1df90720f11a5b736273f43272d7727b3020f848) )
+	ROM_RELOAD(            0x1000, 0x1000 )
+ROM_END
+
+
+ROM_START( sms4in1a ) // VERSION SWS1-110984
 	ROM_REGION( 0x100000, "maincpu", 0 )
 	ROM_LOAD( "set4_u19_2764.bin", 0xf8000, 0x02000, CRC(6f6116b9) SHA1(f91412ca9b911e2a822dab91c96e5f655e7ebb1b) )
 	ROM_LOAD( "set4_u18_2764.bin", 0xfa000, 0x02000, CRC(cc13a404) SHA1(1c00d173706c5e88cee69f9c52efa64dbdf4c15b) )
@@ -957,9 +971,11 @@
 	ROM_RELOAD(         0x1000, 0x1000 )
 ROM_END
 
-GAME( 1984, trvhang,  0, sms,      sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "Trivia Hangup (question set 1)",   MACHINE_SUPPORTS_SAVE ) /* Version Trivia-1-050185 */
-GAME( 1984, trvhanga, 0, sms,      sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "Trivia Hangup (question set 2)",   MACHINE_NOT_WORKING ) /* Version Trivia-2-011586 */
-GAME( 1984, sms4in1,  0, sureshot, sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "4-in-1",                           MACHINE_SUPPORTS_SAVE )
-GAME( 1985, smsjoker, 0, sureshot, sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "Joker Poker With Hi-Lo Double-Up", MACHINE_SUPPORTS_SAVE )
-GAME( 1985, sureshot, 0, sureshot, sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "Sure Shot",                        MACHINE_SUPPORTS_SAVE )
-GAME( 1985, secondch, 0, sureshot, sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "Second Chance",                    MACHINE_SUPPORTS_SAVE )
+
+GAME( 1984, trvhang,  0,       sms,      sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "Trivia Hangup (question set 1)",   MACHINE_SUPPORTS_SAVE ) // Version Trivia-1-050185
+GAME( 1984, trvhanga, 0,       sms,      sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "Trivia Hangup (question set 2)",   MACHINE_NOT_WORKING )   // Version Trivia-2-011586
+GAME( 1984, sms4in1,  0,       sureshot, sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "4-in-1 (version SWS1-052587)",     MACHINE_SUPPORTS_SAVE ) // still shows 1984 copyright on title screen
+GAME( 1984, sms4in1a, sms4in1, sureshot, sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "4-in-1 (version SWS1-110984)",     MACHINE_SUPPORTS_SAVE )
+GAME( 1985, smsjoker, 0,       sureshot, sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "Joker Poker With Hi-Lo Double-Up", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, sureshot, 0,       sureshot, sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "Sure Shot",                        MACHINE_SUPPORTS_SAVE )
+GAME( 1985, secondch, 0,       sureshot, sms, smsmfg_state, empty_init, ROT0, "SMS Manufacturing Corp.", "Second Chance",                    MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/snesb51.cpp mame-0.224+dfsg.1/src/mame/drivers/snesb51.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/snesb51.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/snesb51.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -6,9 +6,10 @@
 
     Skeleton driver
 
-    Currently there are dumps for a Mortal Kombat 3 board and a board with
-    4 slots that supports various games directly and also has a generic
-    timer based mode.
+    The following systems are dumped:
+    - Mortal Kombat 3
+    - 4 Slot board
+    - 4 Slot board with built-in NBA Jam
 
     Hardware (for the 4 slot switcher):
     - MCS-51 based CPU 44-pin (markings removed)
@@ -67,6 +68,7 @@
 
 	void mk3snes(machine_config &config);
 	void snes4sl(machine_config &config);
+	void snes4sln(machine_config &config);
 
 protected:
 	void machine_start() override;
@@ -180,7 +182,7 @@
 
 void snesb51_state::mk3snes(machine_config &config)
 {
-	I8751(config, m_mcu, 12_MHz_XTAL / 6);
+	I8751(config, m_mcu, 12_MHz_XTAL);
 	m_mcu->set_addrmap(AS_IO, &snesb51_state::io_map);
 	m_mcu->port_out_cb<1>().set(FUNC(snesb51_state::mcu_p1_w));
 	m_mcu->port_in_cb<3>().set(FUNC(snesb51_state::mcu_p3_r));
@@ -189,8 +191,8 @@
 
 void snesb51_state::snes4sl(machine_config &config)
 {
-	// exact type and clock unknown
-	I8031(config, m_mcu, 12_MHz_XTAL / 6);
+	// exact type unknown
+	I8031(config, m_mcu, 12_MHz_XTAL);
 	m_mcu->set_addrmap(AS_PROGRAM, &snesb51_state::mem_map);
 	m_mcu->set_addrmap(AS_IO, &snesb51_state::io_map);
 	m_mcu->port_out_cb<1>().set(FUNC(snesb51_state::mcu_p1_w));
@@ -202,6 +204,16 @@
 	GFXDECODE(config, "gfxdecode", "palette", chars);
 }
 
+void snesb51_state::snes4sln(machine_config &config)
+{
+	I8051(config, m_mcu, 12_MHz_XTAL); // SAB 8051A-P
+	m_mcu->set_addrmap(AS_PROGRAM, &snesb51_state::mem_map);
+	m_mcu->set_addrmap(AS_IO, &snesb51_state::io_map);
+	m_mcu->port_out_cb<1>().set(FUNC(snesb51_state::mcu_p1_w));
+	m_mcu->port_in_cb<3>().set(FUNC(snesb51_state::mcu_p3_r));
+	m_mcu->port_out_cb<3>().set(FUNC(snesb51_state::mcu_p3_w));
+}
+
 // this is identical to the snes release apart from a single byte
 ROM_START( mk3snes )
 	ROM_REGION(0x400000, "game", 0)
@@ -227,6 +239,19 @@
 	ROM_LOAD("27c256_11-03.bin", 0x0000, 0x8000, CRC(4e471581) SHA1(0f23ad065d448097f56ab45c3850d53cf85f3670))
 ROM_END
 
-//    YEAR  NAME     PARENT   MACHINE  INPUT    CLASS          INIT        ROT   COMPANY    FULLNAME                          FLAGS
-GAME( 199?, mk3snes, 0,       mk3snes, mk3snes, snesb51_state, empty_init, ROT0, "bootleg", "Mortal Kombat 3 (SNES bootleg)", MACHINE_IS_SKELETON )
-GAME( 1993, snes4sl, 0,       snes4sl, snes4sl, snesb51_state, empty_init, ROT0, "bootleg", "SNES 4 Slot arcade switcher",    MACHINE_IS_SKELETON )
+ROM_START( snes4sln )
+	// identical to NBA Jam (nbajamua)
+	ROM_REGION(0x400000, "game", 0)
+	ROM_LOAD("4.bin", 0x000000, 0x080000, CRC(d27bbebe) SHA1(fcf614fcd3c0fb06037038514d828f0cb597838e))
+	ROM_LOAD("3.bin", 0x080000, 0x080000, CRC(c0ca8c3c) SHA1(af5caa1b0254f6b42e4f7f3ba07d0af904017e3c))
+	ROM_LOAD("2.bin", 0x100000, 0x080000, CRC(4de70641) SHA1(1f575282a1bb842afcc80e29cebc13d96f8158a4))
+	ROM_LOAD("1.bin", 0x180000, 0x080000, CRC(9d59835f) SHA1(061872d9a2b39d271fbfc90b9e8f9abefcfa4282))
+
+	ROM_REGION(0x8000, "mcu", 0)
+	ROM_LOAD("5.bin", 0x0000, 0x8000, CRC(af8a64e3) SHA1(f13187d213fe7c2a0edcb88d4e828bd24112e812))
+ROM_END
+
+//    YEAR  NAME      PARENT  MACHINE   INPUT    CLASS          INIT        ROT   COMPANY    FULLNAME                                 FLAGS
+GAME( 199?, mk3snes,  0,      mk3snes,  mk3snes, snesb51_state, empty_init, ROT0, "bootleg", "Mortal Kombat 3 (SNES bootleg)",        MACHINE_IS_SKELETON )
+GAME( 1993, snes4sl,  0,      snes4sl,  snes4sl, snesb51_state, empty_init, ROT0, "bootleg", "SNES 4 Slot arcade switcher",           MACHINE_IS_SKELETON )
+GAME( 1994, snes4sln, 0,      snes4sln, snes4sl, snesb51_state, empty_init, ROT0, "bootleg", "SNES 4 Slot arcade switcher (NBA Jam)", MACHINE_IS_SKELETON )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/sothello.cpp mame-0.224+dfsg.1/src/mame/drivers/sothello.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/sothello.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/sothello.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -46,11 +46,13 @@
 #include "speaker.h"
 
 
+namespace {
+
 class sothello_state : public driver_device
 {
 public:
-	sothello_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
+	sothello_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
 		m_soundcpu(*this, "soundcpu"),
 		m_subcpu(*this, "subcpu"),
@@ -60,20 +62,23 @@
 
 	void sothello(machine_config &config);
 
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
 private:
 	void bank_w(uint8_t data);
-	uint8_t subcpu_halt_set();
-	uint8_t subcpu_halt_clear();
-	uint8_t subcpu_comm_status();
+	uint8_t subcpu_comm_clear_r();
+	uint8_t subcpu_comm_nmi_r();
+	uint8_t subcpu_comm_status_r();
 	uint8_t soundcpu_status_r();
 	void msm_data_w(uint8_t data);
 	void soundcpu_busyflag_set_w(uint8_t data);
 	void soundcpu_busyflag_reset_w(uint8_t data);
 	void soundcpu_int_clear_w(uint8_t data);
 	void subcpu_status_w(uint8_t data);
-	uint8_t subcpu_status_r();
 	void msm_cfg_w(uint8_t data);
-	DECLARE_WRITE_LINE_MEMBER(adpcm_int);
+	DECLARE_WRITE_LINE_MEMBER(adpcm_int_w);
 
 	void maincpu_io_map(address_map &map);
 	void maincpu_mem_map(address_map &map);
@@ -81,17 +86,10 @@
 	void soundcpu_mem_map(address_map &map);
 	void subcpu_mem_map(address_map &map);
 
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-
 	int m_subcpu_status;
 	int m_soundcpu_busy;
 	int m_msm_data;
 
-	TIMER_CALLBACK_MEMBER(subcpu_suspend);
-	TIMER_CALLBACK_MEMBER(subcpu_resume);
-	void unlock_shared_ram();
-
 	required_device<cpu_device> m_maincpu;
 	required_device<cpu_device> m_soundcpu;
 	required_device<cpu_device> m_subcpu;
@@ -99,14 +97,6 @@
 	required_memory_bank m_mainbank;
 };
 
-
-#define VDP_MEM             0x40000
-
-
-
-
-/* main Z80 */
-
 void sothello_state::machine_start()
 {
 	m_mainbank->configure_entries(0, 4, memregion("maincpu")->base() + 0x8000, 0x4000);
@@ -116,6 +106,21 @@
 	save_item(NAME(m_msm_data));
 }
 
+void sothello_state::machine_reset()
+{
+	m_subcpu_status = 0;
+	m_soundcpu_busy = 0;
+	m_msm_data = 0;
+}
+
+
+
+/******************************************************************************
+    I/O & Address Maps
+******************************************************************************/
+
+// main Z80
+
 void sothello_state::bank_w(uint8_t data)
 {
 	int bank=0;
@@ -129,33 +134,21 @@
 	m_mainbank->set_entry(bank);
 }
 
-TIMER_CALLBACK_MEMBER(sothello_state::subcpu_suspend)
-{
-	m_subcpu->suspend(SUSPEND_REASON_HALT, 1);
-}
-
-TIMER_CALLBACK_MEMBER(sothello_state::subcpu_resume)
+uint8_t sothello_state::subcpu_comm_clear_r()
 {
-	m_subcpu->resume(SUSPEND_REASON_HALT);
-	m_subcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
-}
-
-uint8_t sothello_state::subcpu_halt_set()
-{
-	machine().scheduler().synchronize(timer_expired_delegate(FUNC(sothello_state::subcpu_suspend), this));
-	m_subcpu_status|=2;
+	if(!machine().side_effects_disabled())
+		m_subcpu_status = 0;
 	return 0;
 }
 
-uint8_t sothello_state::subcpu_halt_clear()
+uint8_t sothello_state::subcpu_comm_nmi_r()
 {
-	machine().scheduler().synchronize(timer_expired_delegate(FUNC(sothello_state::subcpu_resume), this));
-	m_subcpu_status&=~1;
-	m_subcpu_status&=~2;
+	if(!machine().side_effects_disabled())
+		m_subcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
 	return 0;
 }
 
-uint8_t sothello_state::subcpu_comm_status()
+uint8_t sothello_state::subcpu_comm_status_r()
 {
 	return m_subcpu_status;
 }
@@ -179,18 +172,25 @@
 	map(0x00, 0x0f).portr("INPUT1");
 	map(0x10, 0x1f).portr("INPUT2");
 	map(0x20, 0x2f).portr("SYSTEM");
-	map(0x30, 0x30).r(FUNC(sothello_state::subcpu_halt_set));
-	map(0x31, 0x31).r(FUNC(sothello_state::subcpu_halt_clear));
-	map(0x32, 0x32).r(FUNC(sothello_state::subcpu_comm_status));
+	map(0x30, 0x30).r(FUNC(sothello_state::subcpu_comm_clear_r));
+	map(0x31, 0x31).r(FUNC(sothello_state::subcpu_comm_nmi_r));
+	map(0x32, 0x32).r(FUNC(sothello_state::subcpu_comm_status_r));
 	map(0x33, 0x33).r(FUNC(sothello_state::soundcpu_status_r));
 	map(0x40, 0x4f).w("soundlatch", FUNC(generic_latch_8_device::write));
 	map(0x50, 0x50).w(FUNC(sothello_state::bank_w));
-	map(0x60, 0x61).mirror(0x02).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write));
-						/* not sure, but the A1 line is ignored, code @ $8b8 */
+	map(0x60, 0x61).mirror(0x02).rw("ymsnd", FUNC(ym2203_device::read), FUNC(ym2203_device::write)); // not sure, but the A1 line is ignored, code @ $8b8
 	map(0x70, 0x73).rw("v9938", FUNC(v9938_device::read), FUNC(v9938_device::write));
 }
 
-/* sound Z80 */
+
+// sound Z80
+
+WRITE_LINE_MEMBER(sothello_state::adpcm_int_w)
+{
+	// only 4 bits are used
+	m_msm->data_w(m_msm_data & 0x0f);
+	m_soundcpu->set_input_line(0, ASSERT_LINE);
+}
 
 void sothello_state::msm_cfg_w(uint8_t data)
 {
@@ -200,7 +200,7 @@
      bit 2 = S2    1
      bit 3 = S1    2
 */
-	m_msm->playmode_w(bitswap<8>((data>>1), 7,6,5,4,3,0,1,2));
+	m_msm->playmode_w(bitswap<3>(data,1,2,3));
 	m_msm->reset_w(data & 1);
 }
 
@@ -241,39 +241,28 @@
 	map(0x05, 0x05).w(FUNC(sothello_state::soundcpu_int_clear_w));
 }
 
-/* sub 6809 */
 
-void sothello_state::unlock_shared_ram()
-{
-	if(!m_subcpu->suspended(SUSPEND_REASON_HALT))
-	{
-		m_subcpu_status|=1;
-	}
-	else
-	{
-		//logerror("%s Sub cpu active!\n",machine().describe_context());
-	}
-}
+// sub 6809
 
 void sothello_state::subcpu_status_w(uint8_t data)
 {
-	unlock_shared_ram();
-}
-
-uint8_t sothello_state::subcpu_status_r()
-{
-	unlock_shared_ram();
-	return 0;
+	m_subcpu_status = 3;
 }
 
 void sothello_state::subcpu_mem_map(address_map &map)
 {
-	map(0x0000, 0x1fff).rw(FUNC(sothello_state::subcpu_status_r), FUNC(sothello_state::subcpu_status_w));
+	map(0x0000, 0x0000).w(FUNC(sothello_state::subcpu_status_w)).nopr();
 	map(0x2000, 0x77ff).ram();
-	map(0x7800, 0x7fff).ram().share("mainsub");  /* upper 0x800 of 6264 is shared with main cpu */
+	map(0x7800, 0x7fff).ram().share("mainsub"); // upper 0x800 of 6264 is shared with main cpu
 	map(0x8000, 0xffff).rom().region("subcpu", 0);
 }
 
+
+
+/******************************************************************************
+    Input Ports
+******************************************************************************/
+
 static INPUT_PORTS_START( sothello )
 	PORT_START("INPUT1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
@@ -328,7 +317,7 @@
 	PORT_DIPSETTING(    0x80, DEF_STR( Normal ) )
 	PORT_DIPSETTING(    0x40, DEF_STR( Hard ) )
 	PORT_DIPSETTING(    0x00, DEF_STR( Very_Hard ) )
-	PORT_DIPNAME( 0x30, 0x10, "Matta" ) /* undo moves */
+	PORT_DIPNAME( 0x30, 0x10, "Matta" ) // undo moves
 	PORT_DIPSETTING(    0x30, "0" )
 	PORT_DIPSETTING(    0x20, "1" )
 	PORT_DIPSETTING(    0x10, "2" )
@@ -340,23 +329,14 @@
 INPUT_PORTS_END
 
 
-WRITE_LINE_MEMBER(sothello_state::adpcm_int)
-{
-	/* only 4 bits are used */
-	m_msm->data_w(m_msm_data & 0x0f);
-	m_soundcpu->set_input_line(0, ASSERT_LINE);
-}
 
-void sothello_state::machine_reset()
-{
-	m_subcpu_status = 0;
-	m_soundcpu_busy = 0;
-	m_msm_data = 0;
-}
+/******************************************************************************
+    Machine Configs
+******************************************************************************/
 
 void sothello_state::sothello(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	Z80(config, m_maincpu, XTAL(21'477'272) / 6);
 	m_maincpu->set_addrmap(AS_PROGRAM, &sothello_state::maincpu_mem_map);
 	m_maincpu->set_addrmap(AS_IO, &sothello_state::maincpu_io_map);
@@ -368,16 +348,16 @@
 	MC6809(config, m_subcpu, XTAL(8'000'000)); // divided by 4 internally
 	m_subcpu->set_addrmap(AS_PROGRAM, &sothello_state::subcpu_mem_map);
 
-	config.set_maximum_quantum(attotime::from_hz(600));
+	config.set_perfect_quantum(m_maincpu);
 
-	/* video hardware */
+	// video hardware
 	v9938_device &v9938(V9938(config, "v9938", XTAL(21'477'272)));
 	v9938.set_screen_ntsc("screen");
-	v9938.set_vram_size(VDP_MEM);
+	v9938.set_vram_size(0x40000);
 	v9938.int_cb().set_inputline("maincpu", 0);
 	SCREEN(config, "screen", SCREEN_TYPE_RASTER);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 
 	GENERIC_LATCH_8(config, "soundlatch");
@@ -392,16 +372,16 @@
 	ymsnd.add_route(3, "mono", 0.50);
 
 	MSM5205(config, m_msm, XTAL(384'000));
-	m_msm->vck_legacy_callback().set(FUNC(sothello_state::adpcm_int));  /* interrupt function */
-	m_msm->set_prescaler_selector(msm5205_device::S48_4B);  /* changed on the fly */
+	m_msm->vck_legacy_callback().set(FUNC(sothello_state::adpcm_int_w)); // interrupt function
+	m_msm->set_prescaler_selector(msm5205_device::S48_4B); // changed on the fly
 	m_msm->add_route(ALL_OUTPUTS, "mono", 1.0);
 }
 
-/***************************************************************************
 
-  Game driver(s)
 
-***************************************************************************/
+/******************************************************************************
+    ROM Definitions
+******************************************************************************/
 
 ROM_START( sothello )
 	ROM_REGION( 0x18000, "maincpu", 0 )
@@ -417,4 +397,12 @@
 	ROM_LOAD( "6.7f",   0x0000, 0x8000, CRC(ee80fc78) SHA1(9a9d7925847d7a36930f0761c70f67a9affc5e7c) )
 ROM_END
 
-GAME( 1986, sothello,  0,       sothello,  sothello, sothello_state, empty_init, ROT0, "Success / Fujiwara", "Super Othello", 0 )
+} // anonymous namespace
+
+
+
+/******************************************************************************
+    Drivers
+******************************************************************************/
+
+GAME( 1986, sothello, 0, sothello, sothello, sothello_state, empty_init, ROT0, "Success / Fujiwara", "Super Othello", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/spec128.cpp mame-0.224+dfsg.1/src/mame/drivers/spec128.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/spec128.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/spec128.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -179,8 +179,7 @@
 
 void spectrum_state::spectrum_128_bank1_w(offs_t offset, uint8_t data)
 {
-	if (m_exp->romcs())
-		m_exp->mreq_w(offset, data);
+	m_exp->mreq_w(offset, data);
 }
 
 uint8_t spectrum_state::spectrum_128_bank1_r(offs_t offset)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/special.cpp mame-0.224+dfsg.1/src/mame/drivers/special.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/special.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/special.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,39 +1,80 @@
 // license:BSD-3-Clause
 // copyright-holders:Miodrag Milanovic
-/***************************************************************************
+/*****************************************************************************************************************
 
-        Specialist driver by Miodrag Milanovic
+Specialist driver by Miodrag Milanovic
 
-        2008-03-15 Preliminary driver.
-        2008-03-20 Cassette support
+2008-03-15 Preliminary driver.
+2008-03-20 Cassette support
 
-****************************************************************************/
+Notes:
+- Scrolling is noticeably slow.
+- Hit Alt to switch between normal and Russian characters.
+
+- Special, specialp, lik, erik: At the first prompt, press Enter for the Monitor. All other keys just beep.
+
+- Specimx: Press Enter to go into a ramdisk File Manager. Press F3 to load a tape (which errors).
+- Specimx -bios 1 and 2 don't set a colour, so a default has been chosen instead of a black screen.
+- Specimx -bios 1 lists a number of programs on the ramdisk, but most of them don't work.
+
+- Lik: B to enter Basic. Haven't found an official way to exit, but you can enter MLOAD and hit Enter twice.
+
+- Unga: It can load and run a tape, like Special. Or, press Y and you're taken to BASIC. You might find that the
+  keyboard is stuck in lowercase, so hit Left-Alt to switch to upper. Now it will work. If you enter SYSTEM to
+  exit, it corrupts itself and runs into the weeds. At the initial prompt, if you hit Enter it jumps to 0000 and
+  thence into the weeds.
+
+- Anakonda: It complains of a disk problem (not emulated), before falling into a cassette loader. If you had
+  loaded a tape from the command line, hit enter 3 times quickly before the tape starts to play. It will load
+  and run.
+
+Important tape notes:
+- If you press any key (including F2 to start the tape), the tape either will not load, or the machine hangs.
+  Same problem occurs if you use the Tab menu.
+- To load a tape from the swlist, you must include the software name on the command-line, or use a frontend.
+  It will load and run by itself at start. DON'T touch anything until it's finished.
+- Tapes from the swlist only work with "special"; they may load on others but unlikely to run.
+
+ToDo:
+- Much mystery surrounds the usage of cassette.
+- Keyboard is a bit strange, especially with Enter key
+- What does or does not get changed by Shift key is all over the place
+- Lik: Space and < keys not working
+- Pioner: Not all keys have been found (Function keys, Left-arrow, more?)
+- Pioner: Monitor roms missing, used ones from "special".
+- Special -bios 2 contains Basic. How to access it?
+- Erik: should have colour and floppy disks, unknown how to access them. No disk software available.
+- Erik: erik_disk_reg_w function is commented out, is it needed? Appears necessary for floppy operation.
+- Specimx: how to access the disks from swlist?
+- Specimx: Machine tends to crash/freeze internally after a while.
+
+
+****************************************************************************************************************/
 
 #include "emu.h"
 #include "includes/special.h"
 
 #include "sound/volt_reg.h"
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
 
 /* Address maps */
 void special_state::specialist_mem(address_map &map)
 {
-	map(0x0000, 0x3fff).bankrw("bank1"); // First bank, hacky, upon reset c000-ffff area should be mirrored at 0000, 4000 and 8000
-	map(0x4000, 0x8fff).ram();  // RAM
-	map(0x9000, 0xbfff).ram().share("videoram"); // Video RAM
-	map(0xc000, 0xefff).rom();  // System ROM
+	map(0x0000, 0x8fff).ram().share("mainram");
+	map(0x0000, 0x2fff).bankr("bank1");
+	map(0x9000, 0xbfff).ram().share("videoram");
+	map(0xc000, 0xefff).rom().region("maincpu",0);
 	map(0xf800, 0xf803).mirror(0x7fc).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
 }
 
 void special_state::specialp_mem(address_map &map)
 {
-	map(0x0000, 0x3fff).bankrw("bank1"); // First bank
-	map(0x4000, 0x7fff).ram();  // RAM
-	map(0x8000, 0xbfff).ram().share("videoram"); // Video RAM
-	map(0xc000, 0xefff).rom();  // System ROM
+	map(0x0000, 0x7fff).ram().share("mainram");
+	map(0x0000, 0x2fff).bankr("bank1");
+	map(0x8000, 0xbfff).ram().share("videoram");
+	map(0xc000, 0xefff).rom().region("maincpu",0);
 	map(0xf800, 0xf803).mirror(0x7fc).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
 }
 
@@ -47,7 +88,7 @@
 	map(0xf800, 0xffff).bankrw("bank6");
 }
 
-void special_state::erik_io_map(address_map &map)
+void special_state::erik_io(address_map &map)
 {
 	map.global_mask(0xff);
 	map(0xf1, 0xf1).rw(FUNC(special_state::erik_rr_reg_r), FUNC(special_state::erik_rr_reg_w));
@@ -64,7 +105,7 @@
 	map(0xc000, 0xffbf).bankrw("bank3");
 	map(0xffc0, 0xffdf).bankrw("bank4");
 	map(0xffe0, 0xffe3).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0xffe4, 0xffe7).ram(); //external 8255
+	map(0xffe4, 0xffe7).rw("ppi2", FUNC(i8255_device::read), FUNC(i8255_device::write)); //external 8255
 	map(0xffe8, 0xffeb).rw(m_fdc, FUNC(fd1793_device::read), FUNC(fd1793_device::write));
 	map(0xffec, 0xffef).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write));
 	map(0xfff0, 0xfff3).rw(FUNC(special_state::specimx_disk_ctrl_r), FUNC(special_state::specimx_disk_ctrl_w));
@@ -80,7 +121,6 @@
 static INPUT_PORTS_START( special )
 /* Alt switches between Latin and Cyrillic alphabets */
 	PORT_START("LINE0")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR('_')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
@@ -89,7 +129,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ins") PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(INSERT))
 
 	PORT_START("LINE1")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("End") PORT_CODE(KEYCODE_END) PORT_CHAR(UCHAR_MAMEKEY(END))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('\\')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('/') PORT_CHAR('?')
@@ -98,7 +137,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F11) PORT_CHAR(UCHAR_MAMEKEY(F11))
 
 	PORT_START("LINE2")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V')
@@ -107,7 +145,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F10) PORT_CHAR(UCHAR_MAMEKEY(F10))
 
 	PORT_START("LINE3")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F12) PORT_CHAR(UCHAR_MAMEKEY(F12))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('@')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D')
@@ -116,7 +153,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F9) PORT_CHAR(UCHAR_MAMEKEY(F9))
 
 	PORT_START("LINE4")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L')
@@ -125,7 +161,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8))
 
 	PORT_START("LINE5")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O')
@@ -134,7 +169,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7))
 
 	PORT_START("LINE6")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R')
@@ -143,7 +177,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6))
 
 	PORT_START("LINE7")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Tab") PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t')
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P')
@@ -152,7 +185,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5))
 
 	PORT_START("LINE8")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A')
@@ -161,7 +193,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4))
 
 	PORT_START("LINE9")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W')
@@ -170,7 +201,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3))
 
 	PORT_START("LINE10")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('^')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y')
@@ -179,7 +209,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2))
 
 	PORT_START("LINE11")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Lat / Cyr") PORT_CODE(KEYCODE_LALT) PORT_CODE(KEYCODE_RALT)
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F')
@@ -188,7 +217,7 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1))
 
 	PORT_START("LINE12")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( specialp )
@@ -243,7 +272,6 @@
 static INPUT_PORTS_START( specimx )
 /* Alt switches between Latin and Cyrillic alphabets */
 	PORT_START("LINE0")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR('_')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
@@ -252,7 +280,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ins") PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(INSERT))
 
 	PORT_START("LINE1")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("End") PORT_CODE(KEYCODE_END) PORT_CHAR(UCHAR_MAMEKEY(END))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('|')
@@ -261,16 +288,14 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F9) PORT_CHAR(UCHAR_MAMEKEY(F9))
 
 	PORT_START("LINE2")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V') PORT_CHAR('v')
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z') PORT_CHAR('z')
 	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR(')')
-	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F9))
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F8) PORT_CHAR(UCHAR_MAMEKEY(F8))
 
 	PORT_START("LINE3")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Tab") PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t')
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('@') PORT_CHAR('`')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D') PORT_CHAR('d')
@@ -279,7 +304,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F7) PORT_CHAR(UCHAR_MAMEKEY(F7))
 
 	PORT_START("LINE4")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_LEFT) PORT_CHAR(UCHAR_MAMEKEY(LEFT))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B') PORT_CHAR('b')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L') PORT_CHAR('l')
@@ -288,7 +312,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F6) PORT_CHAR(UCHAR_MAMEKEY(F6))
 
 	PORT_START("LINE5")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X') PORT_CHAR('x')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O') PORT_CHAR('o')
@@ -297,7 +320,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F5) PORT_CHAR(UCHAR_MAMEKEY(F5))
 
 	PORT_START("LINE6")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T') PORT_CHAR('t')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R') PORT_CHAR('r')
@@ -306,7 +328,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F4) PORT_CHAR(UCHAR_MAMEKEY(F4))
 
 	PORT_START("LINE7")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I') PORT_CHAR('i')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P') PORT_CHAR('p')
@@ -315,7 +336,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F3) PORT_CHAR(UCHAR_MAMEKEY(F3))
 
 	PORT_START("LINE8")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M') PORT_CHAR('m')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A') PORT_CHAR('a')
@@ -324,7 +344,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F2) PORT_CHAR(UCHAR_MAMEKEY(F2))
 
 	PORT_START("LINE9")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S') PORT_CHAR('s')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W') PORT_CHAR('w')
@@ -333,7 +352,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F1) PORT_CHAR(UCHAR_MAMEKEY(F1))
 
 	PORT_START("LINE10")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Home") PORT_CODE(KEYCODE_HOME) PORT_CHAR(UCHAR_MAMEKEY(HOME))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('^')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y') PORT_CHAR('y')
@@ -342,7 +360,6 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F10) PORT_CHAR(UCHAR_MAMEKEY(F10))
 
 	PORT_START("LINE11")
-	PORT_BIT(0x03, IP_ACTIVE_LOW, IPT_UNUSED)
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Alt") PORT_CODE(KEYCODE_LALT) PORT_CODE(KEYCODE_RALT)
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q') PORT_CHAR('q')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F') PORT_CHAR('f')
@@ -351,7 +368,109 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CODE(KEYCODE_ESC) PORT_CHAR(UCHAR_MAMEKEY(ESC))
 
 	PORT_START("LINE12")
-	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( pioner )
+/* Left Alt switches between Latin and Cyrillic alphabets */
+	PORT_START("LINE0")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('K')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("8 _") PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('_')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("RV off") PORT_CODE(KEYCODE_PGUP) // reverse off
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('I')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("LINE1")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('H')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('N')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("6 ,") PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR(',')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('Y')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('M')
+
+	PORT_START("LINE2")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('F')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Alt") PORT_CODE(KEYCODE_LALT)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("4 \"") PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('"')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('R')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('V')
+
+	PORT_START("LINE3")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('S')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('Z')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("2 -") PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('-')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("# *") PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('#') PORT_CHAR('*')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('W')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('A')
+
+	PORT_START("LINE4")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("1 )") PORT_CODE(KEYCODE_1) PORT_CHAR(')')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("+ (") PORT_CODE(KEYCODE_OPENBRACE) PORT_CHAR('+') PORT_CHAR('(')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("LINE5")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('D')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('X')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("3 /") PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('/')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('E')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('C')
+
+	PORT_START("LINE6")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('G')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Space") PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("5 :") PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR(':')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('T')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('B')
+
+	PORT_START("LINE7")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('J')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Repeat") PORT_CODE(KEYCODE_RALT)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("7 .") PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('.')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('U')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("LINE8")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('L')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Home") PORT_CODE(KEYCODE_HOME)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("9 ?") PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR('?')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("RV") PORT_CODE(KEYCODE_PGDN)  // reverse video on
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('O')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("> @") PORT_CODE(KEYCODE_STOP) PORT_CHAR('>') PORT_CHAR('@')
+
+	PORT_START("LINE9")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Backspace") PORT_CODE(KEYCODE_BACKSPACE) PORT_CHAR(8)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0 %") PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR('%')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("$ ;") PORT_CODE(KEYCODE_COLON) PORT_CHAR('$') PORT_CHAR(';')
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('P')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("< ^") PORT_CODE(KEYCODE_COMMA) PORT_CHAR('<') PORT_CHAR('^')
+
+	PORT_START("LINE10")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("\\") PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Down") PORT_CODE(KEYCODE_DOWN) PORT_CHAR(UCHAR_MAMEKEY(DOWN))
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("= !") PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=') PORT_CHAR('!')
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Clear") PORT_CODE(KEYCODE_END) PORT_CHAR(UCHAR_MAMEKEY(END))  // clear screen
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER) PORT_CHAR(13)
+
+	PORT_START("LINE11")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("& ]") PORT_CODE(KEYCODE_MINUS) PORT_CHAR('&') PORT_CHAR(']')
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Right") PORT_CODE(KEYCODE_RIGHT) PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Newline") PORT_CODE(KEYCODE_DEL) PORT_CHAR(UCHAR_MAMEKEY(DEL))  // newline
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("' [") PORT_CODE(KEYCODE_QUOTE) PORT_CHAR('\'') PORT_CHAR('[')
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Up") PORT_CODE(KEYCODE_UP) PORT_CHAR(UCHAR_MAMEKEY(UP))
+
+	PORT_START("LINE12")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
 INPUT_PORTS_END
 
 FLOPPY_FORMATS_MEMBER( special_state::specimx_floppy_formats )
@@ -382,24 +501,24 @@
 	PALETTE(config, m_palette, palette_device::MONOCHROME);
 
 	/* audio hardware */
-	SPEAKER(config, "speaker").front_center();
-	DAC_1BIT(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.0625);
+	SPEAKER(config, "mono").front_center();
+	DAC_1BIT(config, "dac", 0).add_route(ALL_OUTPUTS, "mono", 0.0625);
 	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
 	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
 
 	/* Devices */
 	I8255(config, m_ppi);
-	m_ppi->in_pa_callback().set(FUNC(special_state::specialist_8255_porta_r));
-	m_ppi->out_pa_callback().set(FUNC(special_state::specialist_8255_porta_w));
-	m_ppi->in_pb_callback().set(FUNC(special_state::specialist_8255_portb_r));
-	m_ppi->out_pb_callback().set(FUNC(special_state::specialist_8255_portb_w));
-	m_ppi->in_pc_callback().set(FUNC(special_state::specialist_8255_portc_r));
-	m_ppi->out_pc_callback().set(FUNC(special_state::specialist_8255_portc_w));
+	m_ppi->in_pa_callback().set(FUNC(special_state::porta_r));
+	m_ppi->out_pa_callback().set(FUNC(special_state::porta_w));
+	m_ppi->in_pb_callback().set(FUNC(special_state::portb_r));
+	m_ppi->out_pb_callback().set(FUNC(special_state::portb_w));
+	m_ppi->in_pc_callback().set(FUNC(special_state::portc_r));
+	m_ppi->out_pc_callback().set(FUNC(special_state::portc_w));
 
 	CASSETTE(config, m_cassette);
 	m_cassette->set_formats(rks_cassette_formats);
-	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
-	m_cassette->add_route(ALL_OUTPUTS, "speaker", 0.05);
+	m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
 	m_cassette->set_interface("special_cass");
 
 	SOFTWARE_LIST(config, "cass_list").set_original("special_cass");
@@ -420,12 +539,7 @@
 void special_state::specialm(machine_config &config)
 {
 	special(config);
-	m_ppi->in_pa_callback().set(FUNC(special_state::specialist_8255_porta_r));
-	m_ppi->out_pa_callback().set(FUNC(special_state::specialist_8255_porta_w));
-	m_ppi->in_pb_callback().set(FUNC(special_state::specimx_8255_portb_r));
-	m_ppi->out_pb_callback().set(FUNC(special_state::specialist_8255_portb_w));
-	m_ppi->in_pc_callback().set(FUNC(special_state::specialist_8255_portc_r));
-	m_ppi->out_pc_callback().set(FUNC(special_state::specialist_8255_portc_w));
+	m_ppi->in_pb_callback().set(FUNC(special_state::specimx_portb_r));
 }
 
 void special_state::specimx(machine_config &config)
@@ -433,19 +547,14 @@
 	special(config);
 	m_maincpu->set_addrmap(AS_PROGRAM, &special_state::specimx_mem);
 
-	MCFG_MACHINE_START_OVERRIDE (special_state, specimx )
-	MCFG_MACHINE_RESET_OVERRIDE (special_state, specimx )
-
 	/* video hardware */
 	subdevice<screen_device>("screen")->set_screen_update(FUNC(special_state::screen_update_specimx));
 
-	MCFG_VIDEO_START_OVERRIDE(special_state,specimx)
-
 	m_palette->set_init(FUNC(special_state::specimx_palette));
 	m_palette->set_entries(16);
 
 	/* audio hardware */
-	SPECIMX_SND(config, "custom", 0).add_route(ALL_OUTPUTS, "speaker", 1.0);
+	SPECIMX_SND(config, "custom", 0).add_route(ALL_OUTPUTS, "mono", 1.0);
 
 	/* Devices */
 	PIT8253(config, m_pit, 0);
@@ -456,12 +565,10 @@
 	m_pit->set_clk<2>(2000000);
 	m_pit->out_handler<2>().set("custom", FUNC(specimx_sound_device::set_input_ch2));
 
-	m_ppi->in_pa_callback().set(FUNC(special_state::specialist_8255_porta_r));
-	m_ppi->out_pa_callback().set(FUNC(special_state::specialist_8255_porta_w));
-	m_ppi->in_pb_callback().set(FUNC(special_state::specimx_8255_portb_r));
-	m_ppi->out_pb_callback().set(FUNC(special_state::specialist_8255_portb_w));
-	m_ppi->in_pc_callback().set(FUNC(special_state::specialist_8255_portc_r));
-	m_ppi->out_pc_callback().set(FUNC(special_state::specialistmx_8255_portc_w));
+	m_ppi->in_pb_callback().set(FUNC(special_state::specimx_portb_r));
+	m_ppi->out_pc_callback().set(FUNC(special_state::specimx_portc_w));
+
+	I8255(config, "ppi2");
 
 	FD1793(config, m_fdc, 8_MHz_XTAL / 8);
 	m_fdc->drq_wr_callback().set(FUNC(special_state::fdc_drq));
@@ -478,9 +585,7 @@
 	/* basic machine hardware */
 	Z80(config, m_maincpu, 4000000);
 	m_maincpu->set_addrmap(AS_PROGRAM, &special_state::erik_mem);
-	m_maincpu->set_addrmap(AS_IO, &special_state::erik_io_map);
-
-	MCFG_MACHINE_RESET_OVERRIDE(special_state, erik )
+	m_maincpu->set_addrmap(AS_IO, &special_state::erik_io);
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
@@ -494,25 +599,25 @@
 	PALETTE(config, m_palette, FUNC(special_state::erik_palette), 8);
 
 	/* audio hardware */
-	SPEAKER(config, "speaker").front_center();
-	DAC_1BIT(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.0625);
+	SPEAKER(config, "mono").front_center();
+	DAC_1BIT(config, "dac", 0).add_route(ALL_OUTPUTS, "mono", 0.0625);
 	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
 	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
 
 	/* Devices */
 	CASSETTE(config, m_cassette);
 	m_cassette->set_formats(rks_cassette_formats);
-	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
-	m_cassette->add_route(ALL_OUTPUTS, "speaker", 0.05);
+	m_cassette->set_default_state(CASSETTE_PLAY | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
+	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
 	m_cassette->set_interface("special_cass");
 
 	I8255(config, m_ppi);
-	m_ppi->in_pa_callback().set(FUNC(special_state::specialist_8255_porta_r));
-	m_ppi->out_pa_callback().set(FUNC(special_state::specialist_8255_porta_w));
-	m_ppi->in_pb_callback().set(FUNC(special_state::specialist_8255_portb_r));
-	m_ppi->out_pb_callback().set(FUNC(special_state::specialist_8255_portb_w));
-	m_ppi->in_pc_callback().set(FUNC(special_state::specialist_8255_portc_r));
-	m_ppi->out_pc_callback().set(FUNC(special_state::specialistmx_8255_portc_w));
+	m_ppi->in_pa_callback().set(FUNC(special_state::porta_r));
+	m_ppi->out_pa_callback().set(FUNC(special_state::porta_w));
+	m_ppi->in_pb_callback().set(FUNC(special_state::portb_r));
+	m_ppi->out_pb_callback().set(FUNC(special_state::portb_w));
+	m_ppi->in_pc_callback().set(FUNC(special_state::portc_r));
+	m_ppi->out_pc_callback().set(FUNC(special_state::specimx_portc_w));
 
 	FD1793(config, m_fdc, 8_MHz_XTAL / 8);
 	m_fdc->drq_wr_callback().set(FUNC(special_state::fdc_drq));
@@ -525,78 +630,104 @@
 
 /* ROM definition */
 ROM_START( special )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x3000, "maincpu", ROMREGION_ERASEFF )
 	ROM_SYSTEM_BIOS(0, "2nd", "2nd rev.")
-	ROMX_LOAD( "monitor2_1.rom", 0xc000, 0x0800, CRC(52abde77) SHA1(66ba2ef9eac14a5c0df510224ea25fd5745399cd), ROM_BIOS(0))
-	ROMX_LOAD( "monitor2_2.rom", 0xc800, 0x0800, CRC(c425f719) SHA1(1c322591b4e5c8b01b81362c6801aa6fd9fc1492), ROM_BIOS(0))
-	ROMX_LOAD( "monitor2_3.rom", 0xd000, 0x0800, CRC(d804aeba) SHA1(1585f354719c25e1f59c7cb8b3a3f5d309a7e8fb), ROM_BIOS(0))
+	ROMX_LOAD( "monitor2_1.rom",  0x0000, 0x0800, CRC(52abde77) SHA1(66ba2ef9eac14a5c0df510224ea25fd5745399cd), ROM_BIOS(0))
+	ROMX_LOAD( "monitor2_2.rom",  0x0800, 0x0800, CRC(c425f719) SHA1(1c322591b4e5c8b01b81362c6801aa6fd9fc1492), ROM_BIOS(0))
+	ROMX_LOAD( "monitor2_3.rom",  0x1000, 0x0800, CRC(d804aeba) SHA1(1585f354719c25e1f59c7cb8b3a3f5d309a7e8fb), ROM_BIOS(0))
 	ROM_SYSTEM_BIOS(1, "2rom", "2nd rev. rom disk")
-	ROMX_LOAD( "monitor2_1.rom",  0xc000, 0x0800, CRC(52abde77) SHA1(66ba2ef9eac14a5c0df510224ea25fd5745399cd), ROM_BIOS(1))
-	ROMX_LOAD( "m2_rom-disk.rom", 0xc800, 0x0800, CRC(7bd3d476) SHA1(232341755ae794f8aab4f6181c8d499a66016af2), ROM_BIOS(1))
-	ROMX_LOAD( "monitor2_3.rom",  0xd000, 0x0800, CRC(d804aeba) SHA1(1585f354719c25e1f59c7cb8b3a3f5d309a7e8fb), ROM_BIOS(1))
-	ROM_SYSTEM_BIOS(2, "1b", "1st rev. + BASIC")
-	ROMX_LOAD( "root.rom", 0xc000, 0x0800, CRC(62de741d) SHA1(6c6a29d4340b0b1230c708f9c04ff2ed1c012a76), ROM_BIOS(2))
-	ROMX_LOAD( "pzu2.rom", 0xc800, 0x0800, CRC(49937e13) SHA1(872ae5a7c3496d4404cdd577caa2236424016c66), ROM_BIOS(2))
-	ROMX_LOAD( "pzu3.rom", 0xd000, 0x0800, CRC(dc817a08) SHA1(8101fe924386f38c10ef929e6dea5a83fcf34600), ROM_BIOS(2))
-	ROMX_LOAD( "pzu4.rom", 0xd800, 0x0800, CRC(6793ba23) SHA1(3a27b5dbc6561ea7af5fb30513dc83ec64f1d94c), ROM_BIOS(2))
-	ROMX_LOAD( "pzu5.rom", 0xe000, 0x0800, CRC(13a1a0dc) SHA1(3a0818cb8f36c2c5a9b9916669538ad1702a7710), ROM_BIOS(2))
+	ROMX_LOAD( "monitor2_1.rom",  0x0000, 0x0800, CRC(52abde77) SHA1(66ba2ef9eac14a5c0df510224ea25fd5745399cd), ROM_BIOS(1))
+	ROMX_LOAD( "m2_rom-disk.rom", 0x0800, 0x0800, CRC(7bd3d476) SHA1(232341755ae794f8aab4f6181c8d499a66016af2), ROM_BIOS(1))
+	ROMX_LOAD( "monitor2_3.rom",  0x1000, 0x0800, CRC(d804aeba) SHA1(1585f354719c25e1f59c7cb8b3a3f5d309a7e8fb), ROM_BIOS(1))
+	ROM_SYSTEM_BIOS(2, "1b", "1st rev. + BASIC") // pressing Enter corrupts monitor prompt gfx
+	ROMX_LOAD( "root.rom",        0x0000, 0x0800, CRC(62de741d) SHA1(6c6a29d4340b0b1230c708f9c04ff2ed1c012a76), ROM_BIOS(2))
+	ROMX_LOAD( "pzu2.rom",        0x0800, 0x0800, CRC(49937e13) SHA1(872ae5a7c3496d4404cdd577caa2236424016c66), ROM_BIOS(2))
+	ROMX_LOAD( "pzu3.rom",        0x1000, 0x0800, CRC(dc817a08) SHA1(8101fe924386f38c10ef929e6dea5a83fcf34600), ROM_BIOS(2))
+	ROMX_LOAD( "pzu4.rom",        0x1800, 0x0800, CRC(6793ba23) SHA1(3a27b5dbc6561ea7af5fb30513dc83ec64f1d94c), ROM_BIOS(2))
+	ROMX_LOAD( "pzu5.rom",        0x2000, 0x0800, CRC(13a1a0dc) SHA1(3a0818cb8f36c2c5a9b9916669538ad1702a7710), ROM_BIOS(2))
 	ROM_SYSTEM_BIOS(3, "1st", "1st rev.")
-	ROMX_LOAD( "special1.rom", 0xc000, 0x1000, CRC(217414bd) SHA1(345cd1410fbca8f75421d12d1419f27f81cd35d6), ROM_BIOS(3))
+	ROMX_LOAD( "special1.rom",    0x0000, 0x1000, CRC(217414bd) SHA1(345cd1410fbca8f75421d12d1419f27f81cd35d6), ROM_BIOS(3))
 	ROM_SYSTEM_BIOS(4, "2col", "2nd rev. color")
-	ROMX_LOAD( "col_mon2.rom",   0xc000, 0x0800, CRC(8cebb1b5) SHA1(0c912a25220de8c5135e16c443e4796e6bb6f805), ROM_BIOS(4))
-	ROMX_LOAD( "monitor2_2.rom", 0xc800, 0x0800, CRC(c425f719) SHA1(1c322591b4e5c8b01b81362c6801aa6fd9fc1492), ROM_BIOS(4))
-	ROMX_LOAD( "monitor2_3.rom", 0xd000, 0x0800, CRC(d804aeba) SHA1(1585f354719c25e1f59c7cb8b3a3f5d309a7e8fb), ROM_BIOS(4))
+	ROMX_LOAD( "col_mon2.rom",    0x0000, 0x0800, CRC(8cebb1b5) SHA1(0c912a25220de8c5135e16c443e4796e6bb6f805), ROM_BIOS(4))
+	ROMX_LOAD( "monitor2_2.rom",  0x0800, 0x0800, CRC(c425f719) SHA1(1c322591b4e5c8b01b81362c6801aa6fd9fc1492), ROM_BIOS(4))
+	ROMX_LOAD( "monitor2_3.rom",  0x1000, 0x0800, CRC(d804aeba) SHA1(1585f354719c25e1f59c7cb8b3a3f5d309a7e8fb), ROM_BIOS(4))
 ROM_END
 
 ROM_START( specialm )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "pzu1-m.rom", 0xc000, 0x0800, CRC(61e94485) SHA1(dbe212dcd377cb8cd16000516cd4b3b760ce779e))
-	ROM_LOAD( "pzu2-m.rom", 0xc800, 0x0800, CRC(83d76815) SHA1(9d139eaa6ca6b241fa9fac94ede72abb56d83674))
-	ROM_LOAD( "pzu3-m.rom", 0xd000, 0x0800, CRC(2121ad65) SHA1(b43811d058d818f8c1cee59b405b515f96958656))
-	ROM_LOAD( "pzu4-m.rom", 0xd800, 0x0800, CRC(8bf8218e) SHA1(bd1174c384b04a40dfcaa35aa373c5070304f37b))
+	ROM_REGION( 0x3000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "pzu1-m.rom",       0x0000, 0x0800, CRC(61e94485) SHA1(dbe212dcd377cb8cd16000516cd4b3b760ce779e))
+	ROM_LOAD( "pzu2-m.rom",       0x0800, 0x0800, CRC(83d76815) SHA1(9d139eaa6ca6b241fa9fac94ede72abb56d83674))
+	ROM_LOAD( "pzu3-m.rom",       0x1000, 0x0800, CRC(2121ad65) SHA1(b43811d058d818f8c1cee59b405b515f96958656))
+	ROM_LOAD( "pzu4-m.rom",       0x1800, 0x0800, CRC(8bf8218e) SHA1(bd1174c384b04a40dfcaa35aa373c5070304f37b))
 ROM_END
 
 ROM_START( specialp )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "special6.rom", 0xc000, 0x1000, CRC(f0c5a0ac) SHA1(50b53bd7c05117930aa84653a9ea0fc0c6f0f496) )
+	ROM_REGION( 0x3000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "special6.rom",     0x0000, 0x1000, CRC(f0c5a0ac) SHA1(50b53bd7c05117930aa84653a9ea0fc0c6f0f496) )
 ROM_END
 
 ROM_START( lik )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x3000, "maincpu", 0 )
 	ROM_SYSTEM_BIOS(0, "1st", "1st rev.")
-	ROMX_LOAD( "lik.rom",   0xc000, 0x3000, CRC(705bb3a0) SHA1(f90b009ec9d3303bbda228714dd24de057e744b6), ROM_BIOS(0))
+	ROMX_LOAD( "lik.rom",         0x0000, 0x3000, CRC(705bb3a0) SHA1(f90b009ec9d3303bbda228714dd24de057e744b6), ROM_BIOS(0))
 	ROM_SYSTEM_BIOS(1, "2nd", "2nd rev.")
-	ROMX_LOAD( "lik2.rom",  0xc000, 0x3000, CRC(71820e43) SHA1(a85b4fc33b1ea96a1b8fe0c791f1aab8e967bb44), ROM_BIOS(1))
+	ROMX_LOAD( "lik2.rom",        0x0000, 0x3000, CRC(71820e43) SHA1(a85b4fc33b1ea96a1b8fe0c791f1aab8e967bb44), ROM_BIOS(1))
 ROM_END
 
 ROM_START( specimx )
-	ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASEFF )
-	ROM_SYSTEM_BIOS(0, "fos", "ROM FOS")
-	ROMX_LOAD( "specimx.rom", 0x10000, 0xb800,  CRC(db68f9b1) SHA1(c79888449f8a605267ec3e10dcc8e6e6f43b3a95), ROM_BIOS(0))
-	ROM_SYSTEM_BIOS(1, "nc", "NC")
-	ROMX_LOAD( "ncrdy.rom",   0x10000, 0x10000, CRC(5d04c522) SHA1(d7daa7fe14cd8e0c6f87fd6453ec3e94ea2c259f) ,ROM_BIOS(1))
-	ROM_SYSTEM_BIOS(2, "ramfos", "RAMFOS")
-	ROMX_LOAD( "ramfos.rom",  0x10000, 0x3000, CRC(83e19df4) SHA1(20e5e53eb45729a24c1c7c63e114dbd14e3c4184) ,ROM_BIOS(2))
+	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_SYSTEM_BIOS(0, "fos", "ROM FOS") // colour
+	ROMX_LOAD( "specimx.rom",     0x0000, 0xb800,  CRC(db68f9b1) SHA1(c79888449f8a605267ec3e10dcc8e6e6f43b3a95), ROM_BIOS(0))
+	ROM_SYSTEM_BIOS(1, "nc", "NC") // monochrome
+	ROMX_LOAD( "ncrdy.rom",       0x0000, 0x10000, CRC(5d04c522) SHA1(d7daa7fe14cd8e0c6f87fd6453ec3e94ea2c259f) ,ROM_BIOS(1))
+	ROM_SYSTEM_BIOS(2, "ramfos", "RAMFOS") // monochrome
+	ROMX_LOAD( "ramfos.rom",      0x0000, 0x3000,  CRC(83e19df4) SHA1(20e5e53eb45729a24c1c7c63e114dbd14e3c4184) ,ROM_BIOS(2))
 ROM_END
 
 ROM_START( erik )
-	ROM_REGION( 0x20000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "erik.bin", 0x10000, 0x10000, CRC(6f3208f4) SHA1(41f6e2763ef60d3c7214c98893e580d25346fa2d))
+	ROM_REGION( 0x10000, "maincpu", 0 )
+	ROM_SYSTEM_BIOS(0, "0", "0")
+	ROMX_LOAD( "erik.bin",        0x0000, 0x10000, CRC(6f3208f4) SHA1(41f6e2763ef60d3c7214c98893e580d25346fa2d), ROM_BIOS(0))
+	ROM_SYSTEM_BIOS(1, "1", "1")
+	ROMX_LOAD( "ericrom2.bin",    0x0000, 0x10000, CRC(712e1f1b) SHA1(6b44db4fe6b0834e5ff8a2091e71610f77f81b5e), ROM_BIOS(1))
 ROM_END
 
 ROM_START( pioner )
 	// Ukranian clone with 16KB RAM
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "pioner.rf2", 0xc000, 0x0800, CRC(d6250ab2) SHA1(b953517d883c64857e63139fed52436f77d371cb))
+	ROM_REGION( 0x3000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "pioner.rf2",       0x0000, 0x0800, CRC(d6250ab2) SHA1(b953517d883c64857e63139fed52436f77d371cb))
+	// monitor roms missing from this set. Using ones from 'special'.
+	ROM_LOAD( "monitor2_2.rom",   0x0800, 0x0800, BAD_DUMP CRC(c425f719) SHA1(1c322591b4e5c8b01b81362c6801aa6fd9fc1492))
+	ROM_LOAD( "monitor2_3.rom",   0x1000, 0x0800, BAD_DUMP CRC(d804aeba) SHA1(1585f354719c25e1f59c7cb8b3a3f5d309a7e8fb))
+ROM_END
+
+ROM_START( unga )
+	ROM_REGION( 0x3000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "unga.rom",        0x0000, 0x3000, CRC(b45f2971) SHA1(561b907ee0a305bc5e963ecd70ecb2b132f936f3) )
+ROM_END
+
+ROM_START( anakonda )
+	ROM_REGION( 0x3000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "anakonda.rom",    0x0000, 0x0800, CRC(50ba6462) SHA1(f55a9f8e78a3e97012e343ea35cd787fc45dae35) )
+ROM_END
+
+ROM_START( kharkovsky ) // Made in Kharkiv, Ukraine
+	ROM_REGION( 0x3000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "zagr.bin",        0x0000, 0x0800, CRC(f86ba4db) SHA1(1f48c74ffce88f6e804f776c66d6c03059fca117) )
+	ROM_LOAD( "mon.bin",         0x0800, 0x0800, CRC(2dd1b6d2) SHA1(d5a02a9645f57eb0295d6b8d8cd8c589b47ba591) )
 ROM_END
 
 /* Driver */
 
 //    YEAR  NAME      PARENT   COMPAT  MACHINE   INPUT     CLASS          INIT          COMPANY      FULLNAME                    FLAGS
-COMP( 1985, special,  0,       0,      special,  special,  special_state, init_special, "<unknown>", "Specialist",               0 )
-COMP( 1985, specialm, special, 0,      specialm, special,  special_state, init_special, "<unknown>", "Specialist M",             0 )
-COMP( 1985, pioner,   special, 0,      special,  special,  special_state, init_special, "<unknown>", "Pioner",                   MACHINE_NOT_WORKING )
-COMP( 1985, specialp, special, 0,      specialp, specialp, special_state, init_special, "<unknown>", "Specialist + hires graph", MACHINE_NOT_WORKING )
-COMP( 1985, lik,      special, 0,      special,  lik,      special_state, init_special, "<unknown>", "Lik",                      0 )
-COMP( 1985, specimx,  special, 0,      specimx,  specimx,  special_state, empty_init,   "<unknown>", "Specialist MX",            0 )
-COMP( 1994, erik,     special, 0,      erik,     special,  special_state, init_erik,    "<unknown>", "Erik",                     0 )
+COMP( 1985, special,    0,       0,    special,  special,  special_state, init_special, "<unknown>", "Specialist",               MACHINE_SUPPORTS_SAVE )
+COMP( 1985, specialm,   special, 0,    specialm, special,  special_state, init_special, "<unknown>", "Specialist M",             MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1993, pioner,     special, 0,    special,  pioner,   special_state, init_special, "<unknown>", "Pioner",                   MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1985, specialp,   special, 0,    specialp, specialp, special_state, init_special, "<unknown>", "Specialist + hires graph", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1985, lik,        special, 0,    special,  lik,      special_state, init_special, "<unknown>", "Lik",                      MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1985, specimx,    special, 0,    specimx,  specimx,  special_state, empty_init,   "<unknown>", "Specialist MX",            MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1994, erik,       special, 0,    erik,     special,  special_state, init_erik,    "<unknown>", "Erik",                     MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 198?, unga,       special, 0,    special,  special,  special_state, init_special, "<unknown>", "Unga",                     MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1989, anakonda,   special, 0,    special,  special,  special_state, init_special, "<unknown>", "Anakonda",                 MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 198?, kharkovsky, special, 0,    special,  special,  special_state, init_special, "<unknown>", "Kharkovsky",               MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/special_gambl.cpp mame-0.224+dfsg.1/src/mame/drivers/special_gambl.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/special_gambl.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/special_gambl.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,292 @@
+// license:BSD-3-Clause
+// copyright-holders:MetalliC
+
+/*
+  Gambling hardware based on "Specialist MX" computer
+  (c) 199? Dinaris
+
+  Main components:
+   Z80 CPU,
+   27256 ROM,
+   2x KR580VV55(i8255 PPI),
+   KR580VI53(i8253 PIT),
+   8x KR565RU5(4164) DRAM,
+   3x KR573RU10(HM6516) SRAM
+
+   How to enter statistics mode:
+    - press Test button, "CODE" text will appear
+    - repeat 4x times
+      - press Test button (code_digit - 1) times
+      - press and hold Test button until "INPUT" text appears
+      - release Test button
+    Currently we use 0000 hardware code, in such case game will accept any code sequence.
+   Now you may press "Clear stats" key few times to clear all the non-volatile play statistics.
+   Or press "Clear stats" once, then hold for a several seconds, and then press again - game will clear NVRAM and also raise few flags, effect is not known.
+
+*/
+
+#include "emu.h"
+#include "cpu/z80/z80.h"
+#include "audio/special.h"
+#include "machine/i8255.h"
+#include "machine/pit8253.h"
+#include "machine/nvram.h"
+#include "machine/ticket.h"
+#include "emupal.h"
+#include "screen.h"
+#include "speaker.h"
+
+class dinaris_state : public driver_device
+{
+public:
+	dinaris_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_ppi(*this, "ppi8255")
+		, m_ppi2(*this, "ppi82552")
+		, m_pit(*this, "pit8253")
+		, m_palette(*this, "palette")
+		, m_nvram(*this, "nvram")
+		, m_vram(*this, "vram")
+		, m_hopper(*this, "hopper")
+		, m_lamps(*this, "lamp%u", 0U)
+		, m_sram_en(false)
+		, m_cold_boot(0)
+	{ }
+
+	void dice(machine_config &config);
+
+	DECLARE_CUSTOM_INPUT_MEMBER(boot_r) { return m_cold_boot; }
+	DECLARE_INPUT_CHANGED_MEMBER(ram_test) { m_maincpu->set_input_line(INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE); }
+
+protected:
+	enum
+	{
+		TIMER_COLD_BOOT
+	};
+
+	void machine_start() override;
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+	void dice_palette(palette_device &palette) const;
+	u32 screen_update_dice(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+	void dice_mem(address_map &map);
+	void dice_io(address_map &map);
+
+	required_device<cpu_device> m_maincpu;
+	required_device<i8255_device> m_ppi;
+	required_device<i8255_device> m_ppi2;
+	required_device<pit8253_device> m_pit;
+	required_device<palette_device> m_palette;
+	required_device<nvram_device> m_nvram;
+	required_shared_ptr<u8> m_vram;
+	required_device<hopper_device> m_hopper;
+	output_finder<8> m_lamps;
+
+	void lamps_w(u8 data);
+	u8 ppi2a_r();
+	void ppi2c_w(u8 data);
+	u8 code_r(offs_t offset);
+
+	std::unique_ptr<u8[]> m_sram;
+	bool m_sram_en;
+	int m_cold_boot;
+};
+
+
+static INPUT_PORTS_START(dice)
+	PORT_START("P0")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_GAMBLE_LOW)    // 6 or less / double less
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_GAMBLE_D_UP)   // 12/11
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_GAMBLE_BET)    // bet / field
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_GAMBLE_HALF)   // point/7
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_GAMBLE_HIGH)   // 8 or more / double more
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_GAMBLE_DEAL)   // start / double
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_GAMBLE_PAYOUT) // payout / take
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_CUSTOM) PORT_CUSTOM_MEMBER(dinaris_state, boot_r)
+
+	PORT_START("P1")
+	PORT_DIPNAME(0x01, 0x00, DEF_STR(Language))
+	PORT_DIPSETTING(0x00, DEF_STR(English))
+	PORT_DIPSETTING(0x01, "Russian")
+	PORT_SERVICE_NO_TOGGLE(0x02, IP_ACTIVE_LOW)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_SERVICE1) PORT_NAME("Clear stats")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_COIN1)
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_CUSTOM) PORT_READ_LINE_DEVICE_MEMBER("hopper", hopper_device, line_r)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_SERVICE2) PORT_NAME("Reset")
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("NMI")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_SERVICE3) PORT_NAME("RAM Test") PORT_CHANGED_MEMBER(DEVICE_SELF, dinaris_state, ram_test, 0)
+INPUT_PORTS_END
+
+void dinaris_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	switch (id)
+	{
+	case TIMER_COLD_BOOT:
+		m_cold_boot = 1;
+		break;
+	default:
+		throw emu_fatalerror("Unknown id in dinaris_state::device_timer");
+	}
+}
+
+void dinaris_state::machine_start()
+{
+	m_lamps.resolve();
+
+	constexpr int size = 0x800; // actually used only 256 bytes
+	m_sram = std::make_unique<u8[]>(size);
+	m_nvram->set_base(&m_sram[0], size);
+
+	save_pointer(NAME(m_sram), size);
+	save_item(NAME(m_sram_en));
+	save_item(NAME(m_cold_boot));
+
+	timer_set(attotime::from_msec(100), TIMER_COLD_BOOT);
+}
+
+void dinaris_state::dice_mem(address_map &map)
+{
+	map(0x0000, 0x7fff).rom();
+	map(0x8000, 0x8fff).ram(); // SRAM
+	map(0x9000, 0xffff).ram().share("vram"); // DRAM
+}
+
+void dinaris_state::dice_io(address_map &map)
+{
+	map.global_mask(0x000f);
+	map(0x00, 0x03).rw(m_ppi, FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0x04, 0x07).rw(m_ppi2, FUNC(i8255_device::read), FUNC(i8255_device::write));
+	map(0x08, 0x0b).rw(m_pit, FUNC(pit8253_device::read), FUNC(pit8253_device::write));
+	map(0x0c, 0x0d).r(FUNC(dinaris_state::code_r)).mirror(0x02);
+}
+
+// borrowed from Specialist MX, probably wrong
+static constexpr rgb_t specimx_pens[16] = {
+	{ 0x00, 0x00, 0x00 }, // 0
+	{ 0x00, 0x00, 0xaa }, // 1
+	{ 0x00, 0xaa, 0x00 }, // 2
+	{ 0x00, 0xaa, 0xaa }, // 3
+	{ 0xaa, 0x00, 0x00 }, // 4
+	{ 0xaa, 0x00, 0xaa }, // 5
+	{ 0xaa, 0xaa, 0x00 }, // 6
+	{ 0xaa, 0xaa, 0xaa }, // 7
+	{ 0x55, 0x55, 0x55 }, // 8
+	{ 0x55, 0x55, 0xff }, // 9
+	{ 0x55, 0xff, 0x55 }, // A
+	{ 0x55, 0xff, 0xff }, // B
+	{ 0xff, 0x55, 0x55 }, // C
+	{ 0xff, 0x55, 0xff }, // D
+	{ 0xff, 0xff, 0x55 }, // E
+	{ 0xff, 0xff, 0xff }  // F
+};
+
+void dinaris_state::dice_palette(palette_device &palette) const
+{
+	palette.set_pen_colors(0, specimx_pens);
+}
+
+u32 dinaris_state::screen_update_dice(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	// note: attribute area bytes set colors for 4x2 pix screen elements, not 8x1 like Specialist MX.
+	for (int x = 0; x < 48; x++)
+	{
+		for (int y = 0; y < 256; y++)
+		{
+			u8 const code = m_vram[0x0000 + y + x * 256];
+			u8 const color1 = m_vram[0x4000 + (y & 0xfe) + x * 256];
+			u8 const color2 = m_vram[0x4000 + (y | 0x01) + x * 256];
+			for (int b = 7; b >= 4; b--)
+				bitmap.pix16(y, x * 8 + (7 - b)) = BIT(code, b) ? (color1 & 0xf) : (color1 >> 4);
+			for (int b = 3; b >= 0; b--)
+				bitmap.pix16(y, x * 8 + (7 - b)) = BIT(code, b) ? (color2 & 0xf) : (color2 >> 4);
+		}
+	}
+	return 0;
+}
+
+void dinaris_state::lamps_w(u8 data)
+{
+	// TODO identify each lamp
+	for (int i = 0; i < 8; i++)
+		m_lamps[i] = BIT(data, i);
+}
+
+u8 dinaris_state::ppi2a_r()
+{
+	return m_sram_en ? m_sram[m_ppi2->pb_r()] : 0xff;
+}
+
+void dinaris_state::ppi2c_w(u8 data)
+{
+	if (!BIT(data, 2))
+		m_sram_en = true;
+
+	if (!BIT(data, 1))
+		m_sram_en = false;
+
+	if (!BIT(data, 0) && m_sram_en)
+		m_sram[m_ppi2->pb_r()] = m_ppi2->pa_r();
+
+	m_hopper->motor_w(((data & 0x68) == 0x60) ? 1 : 0);
+}
+
+u8 dinaris_state::code_r(offs_t offset)
+{
+	// it is not clear how statistics mode code was set, related components was removed from PCB
+	// currently we return 0 so game will accept any code sequence
+	return 0x0000 >> (offset * 8);
+}
+
+void dinaris_state::dice(machine_config &config)
+{
+	// Basic machine hardware
+	Z80(config, m_maincpu, XTAL(8'000'000) / 4); // not confirmed
+	m_maincpu->set_addrmap(AS_PROGRAM, &dinaris_state::dice_mem);
+	m_maincpu->set_addrmap(AS_IO, &dinaris_state::dice_io);
+	m_maincpu->set_vblank_int("screen", FUNC(dinaris_state::irq0_line_hold));
+
+	// Video
+	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
+	screen.set_raw(XTAL(8'000'000), 512, 0, 384, 312, 0, 256);
+	screen.set_screen_update(FUNC(dinaris_state::screen_update_dice));
+	screen.set_palette(m_palette);
+
+	PALETTE(config, m_palette, FUNC(dinaris_state::dice_palette), 16);
+
+	// Sound
+	SPEAKER(config, "speaker").front_center();
+	SPECIMX_SND(config, "custom", 0).add_route(ALL_OUTPUTS, "speaker", 1.0);
+
+	PIT8253(config, m_pit, 0);
+	m_pit->set_clk<0>(XTAL(8'000'000) / 4);
+	m_pit->out_handler<0>().set("custom", FUNC(specimx_sound_device::set_input_ch0));
+	m_pit->set_clk<1>(XTAL(8'000'000) / 4);
+	m_pit->out_handler<1>().set("custom", FUNC(specimx_sound_device::set_input_ch1));
+	m_pit->set_clk<2>(XTAL(8'000'000) / 4);
+	m_pit->out_handler<2>().set("custom", FUNC(specimx_sound_device::set_input_ch2));
+
+	// Devices
+	I8255(config, m_ppi);
+	m_ppi->in_pa_callback().set_ioport("P0");
+	m_ppi->in_pb_callback().set_ioport("P1");
+	m_ppi->out_pc_callback().set(FUNC(dinaris_state::lamps_w));
+
+	I8255(config, m_ppi2);
+	m_ppi2->in_pa_callback().set(FUNC(dinaris_state::ppi2a_r));
+	m_ppi2->out_pc_callback().set(FUNC(dinaris_state::ppi2c_w));
+
+	NVRAM(config, m_nvram, nvram_device::DEFAULT_ALL_0);
+	HOPPER(config, m_hopper, attotime::from_msec(100), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW);
+}
+
+ROM_START(dindice)
+	ROM_REGION( 0x8000, "maincpu", 0)
+	ROM_LOAD( "27256.bin", 0x0000, 0x8000, CRC(511f8ba8) SHA1(e75a2cab80ac6b08a19d1adb8ba9bb321aa5e7a8))
+ROM_END
+
+GAME( 199?, dindice, 0,    dice,     dice,     dinaris_state, empty_init, ROT0,  "Dinaris",   "Dice game", MACHINE_SUPPORTS_SAVE|MACHINE_IMPERFECT_COLORS)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/spectrum.cpp mame-0.224+dfsg.1/src/mame/drivers/spectrum.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/spectrum.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/spectrum.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -318,8 +318,7 @@
 
 void spectrum_state::spectrum_rom_w(offs_t offset, uint8_t data)
 {
-	if (m_exp->romcs())
-		m_exp->mreq_w(offset, data);
+	m_exp->mreq_w(offset, data);
 }
 
 uint8_t spectrum_state::spectrum_rom_r(offs_t offset)
@@ -785,7 +784,11 @@
 
 	ADDRESS_MAP_BANK(config, m_specmem).set_map(&spectrum_state::spectrum_map).set_options(ENDIANNESS_LITTLE, 8, 16, 0x10000);
 
+#if 1 // change to 0 in order to get working "Proceed 1" VC1541 FDC
 	config.set_maximum_quantum(attotime::from_hz(60));
+#else
+	config.set_perfect_quantum(m_maincpu);
+#endif
 
 	MCFG_MACHINE_RESET_OVERRIDE(spectrum_state, spectrum )
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/spg29x_lexibook_jg7425.cpp mame-0.224+dfsg.1/src/mame/drivers/spg29x_lexibook_jg7425.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/spg29x_lexibook_jg7425.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/spg29x_lexibook_jg7425.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,7 +12,7 @@
 
 TODO:
 is there an internal ROM / bootstrap area, or does this SunPlus core use vectors in a different way to the one in hyperscan.cpp?
-If SPG290, should probably be merged with hyperscan.cpp
+If SPG290, should probably be merged with hyperscan.cpp (it is)
 
 (only noteworthy features of PCB are ROM + RAM + Cpu Glob)
 
@@ -106,4 +106,14 @@
 	DISK_IMAGE( "lexibook_jg7425_4gbsd", 0, SHA1(dc0985103edec3992efdd493feef6185daedb3fd) )
 ROM_END
 
+ROM_START( lx_aven )
+	ROM_REGION( 0x200000, "maincpu", ROMREGION_32BIT | ROMREGION_LE )
+	ROM_LOAD32_DWORD( "29lv800.bin", 0x000000, 0x100000, CRC(7b107f6c) SHA1(3a8e37e51dab5cab9977261e0ac17ba5194a9370) )
+
+	DISK_REGION( "ata:0:hdd:image" ) /* 4GB SD Card */
+	DISK_IMAGE( "sd-card", 0, SHA1(911da7bf7dac391e3329e17e3f411caafac52f0f) )
+ROM_END
+
+
 CONS( 2015, lx_jg7425,   0,         0,      lexibook_jg7425,   lexibook_jg7425, lexibook_jg7425_state, empty_init, "Lexibook", "Lexibook JG7425 221-in-1", MACHINE_IS_SKELETON )
+CONS( 201?, lx_aven,     0,         0,      lexibook_jg7425,   lexibook_jg7425, lexibook_jg7425_state, empty_init, "Lexibook", "Marvel Avengers TV Game Console (32-bit) (Lexibook)", MACHINE_IS_SKELETON )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/spg2xx.cpp mame-0.224+dfsg.1/src/mame/drivers/spg2xx.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/spg2xx.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/spg2xx.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -317,6 +317,14 @@
 	map(0x200000, 0x3fffff).bankr("upperbank");
 }
 
+
+void spg2xx_game_wfcentro_state::mem_map_wfcentro(address_map &map)
+{
+	map(0x000000, 0x37ffff).bankr("cartbank");
+	map(0x380000, 0x3fffff).ram();
+}
+
+
 static INPUT_PORTS_START( spg2xx ) // base structure for easy debugging / figuring out of inputs
 	PORT_START("P1")
 	PORT_DIPNAME( 0x0001, 0x0001, "P1:0001" )
@@ -629,6 +637,19 @@
 	PORT_MODIFY("P3")
 INPUT_PORTS_END
 
+
+static INPUT_PORTS_START( ordentv )
+	PORT_INCLUDE( spg2xx )
+
+	PORT_MODIFY("P2")
+	PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
+	PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
+	PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_BUTTON1 )
+	PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 )
+INPUT_PORTS_END
+
 static INPUT_PORTS_START( fordrace )
 	PORT_INCLUDE( spg2xx )
 
@@ -662,6 +683,30 @@
 	PORT_BIT(0x1fff, 0x0000, IPT_AD_STICK_X ) PORT_SENSITIVITY(100) PORT_KEYDELTA(100) PORT_MINMAX(0x00,0x1fff) PORT_NAME("Wheel")
 INPUT_PORTS_END
 
+static INPUT_PORTS_START( totspies )
+	PORT_INCLUDE( spg2xx )
+
+	PORT_MODIFY("P1")
+	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
+	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("B")
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("A")
+	PORT_BIT( 0xff80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+	PORT_MODIFY("P2")
+	PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+	// unit also has a 'select' button next to 'OK' and while test mode shows it onscreen too, it doesn't get tested, so probably isn't connected to anything?
+	PORT_MODIFY("P3")
+	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("OK")
+	PORT_BIT( 0xfffe, IP_ACTIVE_LOW, IPT_UNKNOWN )
+INPUT_PORTS_END
+
+
+
 CUSTOM_INPUT_MEMBER(spg2xx_game_fordrace_state::wheel_r)
 {
 	return ioport("WHEEL_REAL")->read() >> 1;
@@ -821,6 +866,31 @@
 
 INPUT_PORTS_END
 
+
+static INPUT_PORTS_START( senwfit )
+	PORT_START("P1")
+	PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )  PORT_16WAY
+	PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )  PORT_16WAY
+	PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )  PORT_16WAY
+	PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )  PORT_16WAY
+	PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Select")
+	PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Start")
+	PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Weight Left")
+	PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Weight Right")
+	PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Up-Left")
+	PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Down-Left")
+	PORT_BIT( 0x1c00, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON7 ) PORT_NAME("Up-Right")
+	PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_NAME("Down-Right")
+	PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_START("P2")
+	PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // unused?
+
+	PORT_START("P3")
+	PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // unused?
+INPUT_PORTS_END
+
 static INPUT_PORTS_START( jjstrip )
 	PORT_START("P1") // active LOW or HIGH?
 	PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
@@ -1025,6 +1095,13 @@
 	m_maincpu->portc_in().set(FUNC(spg2xx_game_state::base_portc_r));
 }
 
+void spg2xx_game_state::spg2xx_pal(machine_config& config)
+{
+	spg2xx(config);
+
+	m_maincpu->set_pal(true);
+	m_screen->set_refresh_hz(50);
+}
 
 void spg2xx_game_fordrace_state::fordrace(machine_config &config)
 {
@@ -1395,7 +1472,7 @@
 
 void spg2xx_game_gssytts_state::machine_start()
 {
-	m_upperbank->configure_entries(0, 4, memregion("maincpu")->base(), 0x400000);
+	m_upperbank->configure_entries(0, memregion("maincpu")->bytes()/0x400000, memregion("maincpu")->base(), 0x400000);
 	m_upperbank->set_entry(1);
 
 	spg2xx_game_state::machine_start();
@@ -1426,6 +1503,75 @@
 }
 
 
+void spg2xx_game_wfcentro_state::wfcentro(machine_config &config)
+{
+	SPG24X(config, m_maincpu, XTAL(27'000'000), m_screen);
+	m_maincpu->set_addrmap(AS_PROGRAM, &spg2xx_game_wfcentro_state::mem_map_wfcentro);
+
+	spg2xx_base(config);
+
+	m_maincpu->porta_in().set(FUNC(spg2xx_game_wfcentro_state::base_porta_r));
+	m_maincpu->portb_in().set(FUNC(spg2xx_game_wfcentro_state::base_portb_r));
+	m_maincpu->portc_in().set(FUNC(spg2xx_game_wfcentro_state::base_portc_r));
+}
+
+
+
+void spg2xx_game_senwfit_state::portc_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	int bank = 0;
+
+	logerror("%s: portc_w %04x (%04x) %c %c %c %c | %c %c %c %c | %c %c %c %c | %c %c %c %c  \n", machine().describe_context(), data, mem_mask,
+		(mem_mask & 0x8000) ? ((data & 0x8000) ? '1' : '0') : 'x',
+		(mem_mask & 0x4000) ? ((data & 0x4000) ? '1' : '0') : 'x',
+		(mem_mask & 0x2000) ? ((data & 0x2000) ? '1' : '0') : 'x',
+		(mem_mask & 0x1000) ? ((data & 0x1000) ? '1' : '0') : 'x',
+		(mem_mask & 0x0800) ? ((data & 0x0800) ? '1' : '0') : 'x',
+		(mem_mask & 0x0400) ? ((data & 0x0400) ? '1' : '0') : 'x',
+		(mem_mask & 0x0200) ? ((data & 0x0200) ? '1' : '0') : 'x',
+		(mem_mask & 0x0100) ? ((data & 0x0100) ? '1' : '0') : 'x',
+		(mem_mask & 0x0080) ? ((data & 0x0080) ? '1' : '0') : 'x',
+		(mem_mask & 0x0040) ? ((data & 0x0040) ? '1' : '0') : 'x',
+		(mem_mask & 0x0020) ? ((data & 0x0020) ? '1' : '0') : 'x',
+		(mem_mask & 0x0010) ? ((data & 0x0010) ? '1' : '0') : 'x',
+		(mem_mask & 0x0008) ? ((data & 0x0008) ? '1' : '0') : 'x',
+		(mem_mask & 0x0004) ? ((data & 0x0004) ? '1' : '0') : 'x',
+		(mem_mask & 0x0002) ? ((data & 0x0002) ? '1' : '0') : 'x',
+		(mem_mask & 0x0001) ? ((data & 0x0001) ? '1' : '0') : 'x');
+
+	if (mem_mask & 1)
+		if (data & 1)
+			bank |= 1;
+
+	if (mem_mask & 2)
+		if (data & 2)
+			bank |= 2;
+
+	if (mem_mask & 4)
+		if (data & 4)
+			bank |= 4;
+
+	m_upperbank->set_entry(bank);
+	m_maincpu->invalidate_cache();
+}
+
+
+void spg2xx_game_senwfit_state::init_senwfit()
+{
+	uint8_t *src = memregion("maincpu")->base();
+	int len = memregion("maincpu")->bytes();
+
+	std::vector<u8> buffer(len);
+
+	for (int i = 0; i < len; i++)
+	{
+		int newaddr = bitswap<25>(i, 24,23,22,20,9,19,18,21,17,16,15,14,13,12,11,10,8,7,6,5,4,3,2,1,0);
+		buffer[i] = src[newaddr];
+	}
+	std::copy(buffer.begin(), buffer.end(), &src[0]);
+
+}
+
 void spg2xx_game_state::rad_skatp(machine_config &config)
 {
 	rad_skat(config);
@@ -1449,6 +1595,26 @@
 	m_maincpu->i2c_r().set(FUNC(spg2xx_game_state::i2c_r));
 }
 
+uint16_t spg2xx_game_ordentv_state::ordentv_portc_r(offs_t offset, uint16_t mem_mask)
+{
+	uint16_t data = m_io_p3->read() ^ (machine().rand() & 1);
+	logerror("%s: Port C Read: %04x (%04x)\n", machine().describe_context(), data, mem_mask);
+	return data;
+}
+
+void spg2xx_game_ordentv_state::ordentv(machine_config &config)
+{
+	SPG24X(config, m_maincpu, XTAL(27'000'000), m_screen);
+	m_maincpu->set_addrmap(AS_PROGRAM, &spg2xx_game_ordentv_state::mem_map_4m);
+
+	spg2xx_base(config);
+
+	m_maincpu->porta_in().set(FUNC(spg2xx_game_ordentv_state::base_porta_r));
+	m_maincpu->portb_in().set(FUNC(spg2xx_game_ordentv_state::base_portb_r));
+	m_maincpu->portc_in().set(FUNC(spg2xx_game_ordentv_state::ordentv_portc_r));
+}
+
+
 ROM_START( rad_skat )
 	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
 	ROM_LOAD16_WORD_SWAP( "skateboarder.bin", 0x000000, 0x400000, CRC(08b9ab91) SHA1(6665edc4740804956136c68065890925a144626b) )
@@ -1481,10 +1647,14 @@
 	ROM_LOAD16_WORD_SWAP( "ablpnpwirelesstennis.bin", 0x000000, 0x400000, CRC(66bd8ef1) SHA1(a83640d5d9e84e10d29a065a61e0d7bbec16c6e4) )
 ROM_END
 
+ROM_START( totspies )
+	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "w321tg.u2", 0x000000, 0x400000, CRC(76152ad7) SHA1(b37ea950670eb927f3f0ab5e38d0e2a5f3ca7904) )
+ROM_END
+
 ROM_START( ablkickb )
 	ROM_REGION( 0x1000000, "maincpu", ROMREGION_ERASE00 )
 	ROM_LOAD16_WORD_SWAP( "ablkickboxing.bin", 0x000000, 0x800000,  CRC(61394c45) SHA1(291d28a39edcb32a8f5d776a5e5c05e6fd0abece) )
-	ROM_LOAD16_WORD_SWAP( "fm25q16a.bin", 0x800000, 0x200000, CRC(aeb472ac) SHA1(500c24b725f6d3308ef8cbdf4259f5be556c7c92) )
 ROM_END
 
 ROM_START( lxspidaj )
@@ -1548,7 +1718,10 @@
 	ROM_CONTINUE(0x800000, 0x800000) // 2nd 8mb
 ROM_END
 
-
+ROM_START( senwfit )
+	ROM_REGION( 0x2000000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "wirelessfit.bin", 0x000000, 0x2000000, CRC(bfdc9c56) SHA1(dd0d4262720fcc3fab5b66d39df9be3419b07178) )
+ROM_END
 
 
 ROM_START( jjstrip )
@@ -1597,6 +1770,21 @@
 	ROM_LOAD16_WORD_SWAP( "speedracer.bin", 0x000000, 0x800000, CRC(4efbcd39) SHA1(2edffbaa9ea309ad308fa60f32d8b7a98ee313c7) )
 ROM_END
 
+ROM_START( ordentv )
+	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "taikeeordenadortv.bin", 0x000000, 0x800000, CRC(ba15895a) SHA1(0a18076cbc3264c91473b8518dfb10d679321b47) )
+ROM_END
+
+ROM_START( wfcentro )
+	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "winfuncentro.bin", 0x000000, 0x800000, CRC(fd6ad052) SHA1(78af844729bf4843dc70531349e38a8c25caf748) )
+ROM_END
+
+ROM_START( tiktokmm )
+	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "webcamthingy.bin", 0x000000, 0x800000, CRC(54c0d4a9) SHA1(709ee607ca447baa6f7e686268df1998372fe617) )
+ROM_END
+
 void spg2xx_game_state::init_crc()
 {
 	// several games have a byte sum checksum listed at the start of ROM, this little helper function logs what it should match.
@@ -1645,6 +1833,13 @@
 	decrypt_ac_ff(ROM, size);
 }
 
+void spg2xx_game_ordentv_state::init_ordentv()
+{
+	// the game will die by jumping to an infinite loop if this check fails, what is it checking?
+	uint16_t* rom = (uint16_t*)memregion("maincpu")->base();
+	rom[0x4fef8] = 0xee07;
+}
+
 
 // year, name, parent, compat, machine, input, class, init, company, fullname, flags
 
@@ -1657,11 +1852,13 @@
 CONS( 2007, rad_fb2,    0,        0, rad_skat,  rad_fb2,   spg2xx_game_state,          init_crc,      "Radica",                                                 "Play TV Football 2",                                                    MACHINE_IMPERFECT_SOUND | MACHINE_NOT_WORKING ) // offers a 2 player option in menus, but seems to have only been programmed for, and released as, a single player unit, P2 controls appear unfinished.
 
 // ABL TV Games
-CONS( 2006, abltenni,   0,        0, spg2xx,    abltenni,  spg2xx_game_state,          empty_init,    "f / V-Tac Technology Co Ltd.",                           "Wireless Tennis (WT2000, ABL TV Game)",                                 MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+CONS( 2006, abltenni,   0,        0, spg2xx,    abltenni,  spg2xx_game_state,          empty_init,    "Advance Bright Ltd / V-Tac Technology Co Ltd.",          "Wireless Tennis (WT2000, ABL TV Game)",                                 MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
 
 CONS( 2006, ablkickb,   0,        0, ablkickb,  ablkickb,  spg2xx_game_albkickb_state, init_ablkickb, "Advance Bright Ltd / Coleco / V-Tac Technology Co Ltd.", "Kick Boxing (BJ8888, ABL TV Game)",                                     MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // 4 motion sensors, one for each limb
 
-CONS( 2007, lxspidaj,   0,        0, spg2xx,    lxspidaj,  spg2xx_game_albkickb_state, init_ablkickb, "Lexibook",                                               "Spider-Man Super TV Air Jet (Lexibook Junior, JG6000SP)",               MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+CONS( 2007, lxspidaj,   0,        0, spg2xx_pal,lxspidaj,  spg2xx_game_albkickb_state, init_ablkickb, "Lexibook",                                               "Spider-Man Super TV Air Jet (Lexibook Junior, JG6000SP)",               MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+
+CONS( 2006, totspies,   0,        0, spg2xx_pal,totspies,  spg2xx_game_state,          empty_init,    "Senario / Marathon - Mystery Animation Inc.",            "Totally Spies! (France)",                                               MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
 
 CONS( 2006, fordrace,   0,        0, fordrace,  fordrace,  spg2xx_game_fordrace_state, empty_init,    "Excalibur Electronics",                                  "Ford Racing",                                                           MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
 
@@ -1682,6 +1879,8 @@
 // The sequel has 'You Take The Stage' on both the box and title screen
 CONS( 2009, gssytts,    0,        0, gssytts,   guitarss,  spg2xx_game_gssytts_state,  empty_init,    "Senario",                                                "Guitar Super Star: You Take The Stage",                                 MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
 
+CONS( 2009, senwfit,    0,        0, gssytts,   senwfit,   spg2xx_game_senwfit_state,  init_senwfit,  "Senario",                                                "Wireless Fitness / Dance Fit (Senario)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+
 // VTech "TV Station" / "TV Learning Station" / "Nitro Vision"
 CONS( 2006, vtechtvssp, 0,        0, spg2xx,    spg2xx,    spg2xx_game_state,          empty_init,    "VTech",                                                  "TV Station (VTech, Spain)",                                             MACHINE_NOT_WORKING )
 CONS( 2006, vtechtvsgr, 0,        0, spg2xx,    spg2xx,    spg2xx_game_state,          empty_init,    "VTech",                                                  "TV Learning Station (VTech, Germany)",                                  MACHINE_NOT_WORKING )
@@ -1702,6 +1901,11 @@
 CONS( 2008, swclone,    0,        0, swclone,   swclone,   spg2xx_game_swclone_state,  init_swclone,  "Hasbro / Tiger Electronics",                             "Star Wars - The Clone Wars",                                            MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
 
 // Mattel games
-CONS( 2005, mattelcs,   0,        0, rad_skat, mattelcs,   spg2xx_game_state,          empty_init,    "Mattel",                                                 "Mattel Classic Sports",                                                 MACHINE_IMPERFECT_SOUND )
+CONS( 2005, mattelcs,   0,        0, rad_skat,  mattelcs,  spg2xx_game_state,          empty_init,    "Mattel",                                                 "Mattel Classic Sports",                                                 MACHINE_IMPERFECT_SOUND )
+
+CONS( 2007, ordentv,    0,        0, ordentv,   ordentv,   spg2xx_game_ordentv_state,  init_ordentv,  "Taikee / V-Tac",                                         "Ordenador-TV (Spain)",                                                  MACHINE_NOT_WORKING )
+
+CONS( 200?, wfcentro,   0,        0, wfcentro,  spg2xx,    spg2xx_game_wfcentro_state, empty_init,    "WinFun",                                                 "Centro TV de Diseno Artistico (Spain)",                                 MACHINE_NOT_WORKING )
 
-// Both the WiWi and Fox Sports units seem to be related to the 'Virtual Interactive' (aka 'Vi') console
+// set 2862 to 0003 (irq enable) when it stalls on boot to show something (doesn't turn on IRQs again otherwise?) needs camera emulating
+CONS( 200?, tiktokmm,   0,        0, spg2xx,    spg2xx,    spg2xx_game_wfcentro_state, empty_init,    "TikTokTech Ltd. / 3T Games / Senario",                   "Moving Music (MM-TV110)",                                 MACHINE_NOT_WORKING )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/spg2xx_pdc.cpp mame-0.224+dfsg.1/src/mame/drivers/spg2xx_pdc.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/spg2xx_pdc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/spg2xx_pdc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -5,15 +5,20 @@
 #include "includes/spg2xx.h"
 
 
-class spg2xx_pdc100_game_state : public spg2xx_game_state
+class spg2xx_pdc_game_state : public spg2xx_game_state
 {
 public:
-	spg2xx_pdc100_game_state(const machine_config &mconfig, device_type type, const char *tag) :
+	spg2xx_pdc_game_state(const machine_config &mconfig, device_type type, const char *tag) :
 		spg2xx_game_state(mconfig, type, tag),
 		m_numbanks(-1)
 	{ }
 
 	void pdc100(machine_config& config);
+	void pdc_tactile(machine_config& config);
+
+	void init_pdc40t();
+	void init_pdc150t();
+	void init_pdc200();
 
 protected:
 	virtual void machine_start() override;
@@ -21,10 +26,42 @@
 
 	virtual void porta_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
 
-private:
+	uint16_t touch_xpos_r()
+	{ // >= 0x800 = right of screen
+		uint16_t ret = ioport("AD1")->read();
+		return ret;
+	}
+
+	uint16_t touch_ypos_r()
+	{ // >= 0x800 = top of screen
+		uint16_t ret = ioport("AD2")->read();
+		return ret;
+	}
+
 	int m_numbanks;
 };
 
+class spg2xx_pdc150t_game_state : public spg2xx_pdc_game_state
+{
+public:
+	spg2xx_pdc150t_game_state(const machine_config& mconfig, device_type type, const char* tag) :
+		spg2xx_pdc_game_state(mconfig, type, tag)
+	{ }
+
+protected:
+	virtual void porta_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
+};
+
+class spg2xx_pdc200_game_state : public spg2xx_pdc_game_state
+{
+public:
+	spg2xx_pdc200_game_state(const machine_config& mconfig, device_type type, const char* tag) :
+		spg2xx_pdc_game_state(mconfig, type, tag)
+	{ }
+
+protected:
+	virtual void porta_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
+};
 
 static INPUT_PORTS_START( pdc100 )
 	PORT_START("P1")
@@ -47,39 +84,200 @@
 
 	PORT_START("P3")
 	PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( pdc_tactile )
+	PORT_START("P1")
+	PORT_BIT( 0x01ff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("A")
+	PORT_BIT( 0xfc00, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_START("P2")
+	PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_START("P3")
+	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Touch")
+	PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("B")
+	PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Pause / Menu")
+	PORT_BIT( 0x0038, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // if this bit flips you get black screen (soft power off?)
+	PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
+	PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x0600, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
+	PORT_BIT( 0xe000, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_START("AD1")
+	PORT_BIT(0xfff, 0x800, IPT_LIGHTGUN_X) PORT_CROSSHAIR(X, 1.10f, -0.055f, 0) PORT_MINMAX(0x000, 0xfff) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
+
+	PORT_START("AD2")
+	PORT_BIT(0xfff, 0x800, IPT_LIGHTGUN_Y) PORT_INVERT PORT_CROSSHAIR(Y, 1.148f, -0.1f, 0) PORT_MINMAX(0x000, 0xfff) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
+
+	PORT_START("AD3")
+	PORT_BIT( 0x003f, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+	PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // unk, causes powerdown
+	PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // unk, causes powerdown
+	PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // unk, causes powerdown
+	PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // unk, causes powerdown
+	PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // unk, causes powerdown
+	PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_UNKNOWN ) // unk, causes powerdown
 INPUT_PORTS_END
 
+static INPUT_PORTS_START( vjpp2 )
+	PORT_START("P1")
+	PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_START("P2")
+	PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
+	PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
+	PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_BUTTON1 )
+	PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 )
+	PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Pause")
+	PORT_BIT( 0xff80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_START("P3")
+	PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+INPUT_PORTS_END
 
-void spg2xx_pdc100_game_state::machine_start()
+void spg2xx_pdc_game_state::machine_start()
 {
 	spg2xx_game_state::machine_start();
 	m_numbanks = memregion("maincpu")->bytes() / 0x800000;
 }
 
-void spg2xx_pdc100_game_state::machine_reset()
+void spg2xx_pdc_game_state::machine_reset()
 {
 	m_current_bank = -1;
 	switch_bank(m_numbanks - 1); // pdc100 must boot from upper bank
 	m_maincpu->reset();
 }
 
-void spg2xx_pdc100_game_state::porta_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+// pdc100 simply writes 0000 at times during bootup while initializing stuff, which causes an invalid bankswitch mid-code execution
+// pdc200 does similar
+// direction bits don't appear to be being set correctly on port writes (similar issue to many other systems)
+
+void spg2xx_pdc_game_state::porta_w(offs_t offset, uint16_t data, uint16_t mem_mask)
 {
-	// pdc100 simply writes 0000 at times during bootup while initializing stuff, which causes an invalid bankswitch mid-code execution
-	if (data & 0xff00)
-		switch_bank(data & (m_numbanks - 1));
+	if ((m_maincpu->pc() < 0x2800) && (data & 0xff00))
+	{
+		int bank = data & 0x7;
+		bank &= (m_numbanks - 1);
+		switch_bank(bank);
+	}
 }
 
+void spg2xx_pdc150t_game_state::porta_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	if ((m_maincpu->pc() < 0x2800) && (data & 0xff00))
+	{
+		int bank = data & 0x7;
+		bank |= (data & 0x0100) ? 8 : 0;
+		bank &= (m_numbanks - 1);
+		switch_bank(bank);
+	}
+}
 
-void spg2xx_pdc100_game_state::pdc100(machine_config &config)
+void spg2xx_pdc200_game_state::porta_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	if ((m_maincpu->pc() < 0x2800) && (data & 0xff00))
+	{
+		int bank = data & 0x7;
+		bank |= (data & 0x8000) ? 8 : 0;
+		bank &= (m_numbanks - 1);
+		switch_bank(bank);
+	}
+}
+
+void spg2xx_pdc_game_state::pdc100(machine_config &config)
 {
 	non_spg_base(config);
-	m_maincpu->porta_out().set(FUNC(spg2xx_pdc100_game_state::porta_w));
+	m_maincpu->porta_out().set(FUNC(spg2xx_pdc_game_state::porta_w));
 	m_maincpu->porta_in().set_ioport("P1");
 	m_maincpu->portb_in().set_ioport("P2");
 	m_maincpu->portc_in().set_ioport("P3"); // not used?
+
+}
+
+void spg2xx_pdc_game_state::pdc_tactile(machine_config& config)
+{
+	pdc100(config);
+
+	m_maincpu->porta_in().set_ioport("P1");
+	m_maincpu->portb_in().set_ioport("P2");
+	m_maincpu->portc_in().set_ioport("P3");
+
+	m_maincpu->adc_in<0>().set(FUNC(spg2xx_pdc_game_state::touch_xpos_r));
+	m_maincpu->adc_in<1>().set(FUNC(spg2xx_pdc_game_state::touch_ypos_r));
+	m_maincpu->adc_in<2>().set_ioport("AD3");
+}
+
+
+void spg2xx_pdc_game_state::init_pdc40t()
+{
+	uint8_t *src = memregion("maincpu")->base();
+	int len = memregion("maincpu")->bytes();
+
+	std::vector<u8> buffer(len);
+
+	for (int i = 0; i < len; i++)
+	{
+		buffer[i] = src[bitswap<26>(i, 18, 20, 16, 17, 24, 25, 19, 23, 22, 21, 5, 6, 7, 8, 13, 15, 14, 9, 10, 12, 11, 1, 2, 3, 4, 0)];
+	}
+	std::copy(buffer.begin(), buffer.end(), &src[0]);
+}
+
+
+void spg2xx_pdc_game_state::init_pdc150t()
+{
+	uint16_t *src = (uint16_t*)memregion("maincpu")->base();
+	int len = memregion("maincpu")->bytes();
+
+	for (int i = 0; i < len/2; i++)
+	{
+		src[i] = bitswap<16>(src[i], 3^8,11^8,2^8,10^8,1^8,9^8,0^8,8^8, 12^8,4^8,13^8,5^8,14^8,6^8,15^8,7^8 );
+	}
+
+#if 0
+	{
+		for (int bank = 0; bank < 16; bank++)
+		{
+			const int length = 0x800000 - 0x10;
+			const int start = (0x800000 * bank) + 0x10;
+			const uint8_t* rom = memregion("maincpu")->base();
+
+			uint32_t checksum = 0x00000000;
+			// the first 0x10 bytes are where the "chksum:xxxxxxxx " string is listed, so skip over them
+			for (int i = start; i < start + length; i++)
+			{
+				checksum += rom[i];
+			}
+
+			printf("Calculated Byte Sum of bytes is %08x)\n", checksum);
+
+
+			FILE *fp;
+			char filename[256];
+			sprintf(filename,"decrypted_%s_%d", machine().system().name, bank);
+			fp=fopen(filename, "w+b");
+			if (fp)
+			{
+				fwrite(&rom[0x800000*bank], 0x800000, 1, fp);
+				fclose(fp);
+			}
+		}
+	}
+#endif
 }
 
+
+
+
 ROM_START( pdc100 )
 	ROM_REGION( 0x4000000, "maincpu", ROMREGION_ERASE00 )
 	// only 1st half of this is used "Jumper resistor (0 ohm) that short A25 to ground"
@@ -88,22 +286,68 @@
 	ROM_IGNORE(0x4000000)
 ROM_END
 
+ROM_START( pdc50 )
+	ROM_REGION( 0x4000000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "pdc50_7050.u3", 0x000000, 0x1000000, CRC(9b4eb348) SHA1(81d2ff5af7b6dc5e1f9277b45f259762e7d24cce) )
+	ROM_RELOAD(0x1000000,0x1000000)
+	ROM_RELOAD(0x2000000,0x1000000)
+	ROM_RELOAD(0x3000000,0x1000000)
+ROM_END
+
+ROM_START( pdc200 )
+	ROM_REGION( 0x8000000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "pdc200.bin", 0x000000, 0x8000000, CRC(9da99f0f) SHA1(0dda8a3deb794e493685d3d41790ee371f9b736e) )
+ROM_END
+
+ROM_START( pdc40t )
+	ROM_REGION( 0x4000000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "pdc_5060.bin", 0x000000, 0x4000000, CRC(28e0c16e) SHA1(fef4af00c737fab2716eef550badbbe0628f26a8) )
+ROM_END
+
+ROM_START( pdc150t )
+	ROM_REGION( 0x8000000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "pdc5070.bin", 0x000000, 0x8000000, CRC(b10e9f29) SHA1(551d62a9ffc18159f7ace12e4363223e0c5cf3c8) )
+ROM_END
+
+
 ROM_START( tmntpdc )
 	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
 	ROM_LOAD16_WORD_SWAP( "pdc_turtles.bin", 0x000000, 0x800000, CRC(ee9e70a3) SHA1(7620f1b7aeaec8032faa8eb7552f775e8d6d14ba) )
 ROM_END
 
+ROM_START( dorapdc )
+	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "pdc_dora_5030.bin", 0x000000, 0x800000, CRC(cea549ad) SHA1(b6ac8ea186d7c624451dd6121932cecb38c1f25f) )
+ROM_END
+
+ROM_START( vjpp2 )
+	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "29lv320at.u2", 0x000000, 0x400000, CRC(de2592eb) SHA1(9b537205808c502cf872e62f9701357ef8e28f3c) )
+ROM_END
 
 // there were older models eg. PDC30 with fewer games, and some differences (eg "Jo Ma" instead of "Jo Ma 2")
 // "Jo Ma 2" shows "Licensed by Mitchell Corporation" (Mitchell made the original Puzzloop on which this style of game is based)  Videos of the original Jo Ma show it lacking this text.
 
 // Other known units
-// PDC Dora the Explorer
 // PDC 30
 // PDC 40
-// PDC 200
+// PDC 20 Sports
+// + more
 
 // This was dumped from an Anncia branded unit, although there's no ingame branding, so ROM is probably the same for all PDC100 units
-CONS( 2008, pdc100,  0,        0, pdc100, pdc100,  spg2xx_pdc100_game_state, empty_init, "Conny",            "PDC100 - Pocket Dream Console", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+CONS( 2008, pdc100,  0,         0, pdc100,      pdc100,       spg2xx_pdc_game_state,     empty_init,   "Conny / Anncia",   "PDC100 - Pocket Dream Console (Anncia, US)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+
+// interestingly this is newer than the PDC100 above, despite containing fewer games
+CONS( 2010, pdc50,    0,        0, pdc100,      pdc100,       spg2xx_pdc_game_state,     empty_init,   "Conny / VideoJet", "PDC50 - Pocket Dream Console (VideoJet, France)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+
+CONS( 2012, pdc200,   0,        0, pdc100,      pdc100,       spg2xx_pdc200_game_state,  init_pdc150t, "Conny / VideoJet", "PDC200 - Pocket Dream Console (VideoJet, France)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+
+CONS( 2011, pdc40t,   0,        0, pdc_tactile, pdc_tactile,  spg2xx_pdc_game_state,     init_pdc40t,  "Conny / VideoJet", "PDC40 Tactile - Pocket Dream Console (VideoJet, France)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // needs touch input
+
+CONS( 2011, pdc150t,  0,        0, pdc_tactile, pdc_tactile,  spg2xx_pdc150t_game_state, init_pdc150t, "Conny / VideoJet", "PDC150 Tactile - Pocket Dream Console (VideoJet, France)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // needs touch input
+
+CONS( 2013, tmntpdc,  0,        0, pdc100,      pdc100,       spg2xx_pdc_game_state,     empty_init,   "Conny / VideoJet", "Teenage Mutant Ninja Turtles - Pocket Dream Console (VideoJet, France)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+
+CONS( 2013, dorapdc,  0,        0, pdc100,      pdc100,       spg2xx_pdc_game_state,     empty_init,   "Conny / VideoJet", "Dora l'exploratrice - Pocket Dream Console (VideoJet, France)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
 
-CONS( 2013, tmntpdc, 0,        0, pdc100, pdc100,  spg2xx_pdc100_game_state, empty_init, "Conny / VideoJet", "Teenage Mutant Ninja Turtles - Pocket Dream Console (France)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+CONS( 200?, vjpp2,    0,        0, pdc100,      vjpp2,        spg2xx_pdc_game_state,     empty_init,   "Conny / VideoJet", "Plug Play TV Games 2 (4-in-1) (VideoJet, France)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/spg2xx_shredmjr.cpp mame-0.224+dfsg.1/src/mame/drivers/spg2xx_shredmjr.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/spg2xx_shredmjr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/spg2xx_shredmjr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -16,6 +16,7 @@
 
 	void shredmjr(machine_config &config);
 	void taikeegr(machine_config &config);
+	void taikeegrp(machine_config &config);
 
 	void init_taikeegr();
 
@@ -111,6 +112,26 @@
 	PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
 INPUT_PORTS_END
 
+static INPUT_PORTS_START( guitarstp )
+	PORT_START("P1")
+	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )   PORT_NAME("Strum Bar Down")
+	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_NAME("Strum Bar Up")
+	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_NAME("Whamming Bar")
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Yellow")
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Blue")
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Red")
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Green")
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Orange")
+	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+	PORT_START("P2")
+	PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+	PORT_START("P3")
+	PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+INPUT_PORTS_END
+
+
 void shredmjr_game_state::shredmjr(machine_config &config)
 {
 	SPG24X(config, m_maincpu, XTAL(27'000'000), m_screen);
@@ -126,16 +147,18 @@
 {
 	SPG24X(config, m_maincpu, XTAL(27'000'000), m_screen);
 	m_maincpu->set_addrmap(AS_PROGRAM, &shredmjr_game_state::mem_map_4m);
-	m_maincpu->set_pal(true);
 
 	spg2xx_base(config);
 
-	m_screen->set_refresh_hz(50);
-//  m_screen->set_size(320, 312);
-
 	m_maincpu->porta_in().set_ioport("P1");
-//  m_maincpu->portb_in().set_ioport("P2");
-//  m_maincpu->portc_in().set_ioport("P3");
+}
+
+void shredmjr_game_state::taikeegrp(machine_config &config)
+{
+	taikeegr(config);
+
+	m_maincpu->set_pal(true);
+	m_screen->set_refresh_hz(50);
 }
 
 
@@ -190,11 +213,24 @@
 	ROM_LOAD16_WORD_SWAP( "guitarstar_s29gl064m11tfir4_0001227e.bin", 0x000000, 0x800000, CRC(feaace47) SHA1(dd426bb4f03a16b1b96b63b4e0d79ea75097bf72) )
 ROM_END
 
+ROM_START( guitarstp )
+	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "29gl064.u2", 0x000000, 0x800000, CRC(1dbcff73) SHA1(b179e4da6f38e7d5ec796bf846a63492d30eb0f5) )
+ROM_END
+
+
+
 
 // there are multiple versions of this with different songs, was also sold by dreamGEAR as 'Shredmaster Jr.' (different title screen)
 // for the UK version the title screen always shows "Guitar Rock", however there are multiple boxes with different titles and song selections.
 // ROM is glued on the underside and soldered to the PCB, very difficult to remove without damaging.
-CONS( 2007, taikeegr,    0,        0,        taikeegr,     taikeegr, shredmjr_game_state, init_taikeegr, "TaiKee", "Rockstar Guitar / Guitar Rock (PAL)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // timing not quite correct yet
-CONS( 2007, shredmjr,    taikeegr, 0,        shredmjr,     taikeegr, shredmjr_game_state, init_taikeegr, "dreamGEAR", "Shredmaster Jr (NTSC)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // ^
+CONS( 2007, taikeegr,    0,        0,        taikeegrp,    taikeegr, shredmjr_game_state, init_taikeegr, "TaiKee", "Rockstar Guitar / Guitar Rock (PAL)", MACHINE_IMPERFECT_TIMING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // timing not quite correct yet
+CONS( 2007, shredmjr,    taikeegr, 0,        shredmjr,     taikeegr, shredmjr_game_state, init_taikeegr, "dreamGEAR", "Shredmaster Jr (NTSC)", MACHINE_IMPERFECT_TIMING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // ^
+
+// doesn't have a Senario logo ingame, but does on box.
+CONS( 200?, guitarst,    0,        0,        taikeegr,     taikeegr, shredmjr_game_state, init_taikeegr, "Senario", "Guitar Star (US, Senario, NTSC)", MACHINE_IMPERFECT_TIMING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // ^
 
-CONS( 200?, guitarst,    0,        0,        taikeegr,     taikeegr, shredmjr_game_state, init_taikeegr, "Senario", "Guitar Star", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // ^
+// this one has a different song selection (same as one in the alt undumped Rockstar Guitar / Guitar Rock.  It was sold as a different product, so hasn't been set as a clone.
+// Unit found in Ireland "imported by Cathay Product Sourcing Ltd." on the box, with address in Ireland
+// ITEM #01109 on instruction sheet, no manufacturer named on either box or instructions
+CONS( 200?, guitarstp,   0,        0,        taikeegrp,    guitarstp,shredmjr_game_state, init_taikeegr, "<unknown>", "Guitar Star (Europe, PAL)", MACHINE_IMPERFECT_TIMING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // ^
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/spg2xx_wiwi.cpp mame-0.224+dfsg.1/src/mame/drivers/spg2xx_wiwi.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/spg2xx_wiwi.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/spg2xx_wiwi.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -18,10 +18,353 @@
 
 	void init_wiwi18();
 
+protected:
+
 private:
 	void portb_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
 };
 
+class spg2xx_game_marc101_state : public spg2xx_game_state
+{
+public:
+	spg2xx_game_marc101_state(const machine_config &mconfig, device_type type, const char *tag) :
+		spg2xx_game_state(mconfig, type, tag),
+		m_prev_porta(0),
+		m_prev_portb(0),
+		m_toggle(false)
+	{ }
+
+	void marc101(machine_config &config);
+
+protected:
+	void machine_start() override;
+	void machine_reset() override;
+
+	virtual void device_timer(emu_timer& timer, device_timer_id id, int param, void* ptr) override;
+
+	virtual uint16_t porta_r();
+	virtual void porta_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
+	virtual void portb_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
+
+	uint16_t m_prev_porta;
+	uint16_t m_prev_portb;
+	bool m_toggle;
+	emu_timer *m_pulse_timer;
+
+private:
+
+};
+
+class spg2xx_game_guitrbus_state : public spg2xx_game_marc101_state
+{
+public:
+	spg2xx_game_guitrbus_state(const machine_config &mconfig, device_type type, const char *tag) :
+		spg2xx_game_marc101_state(mconfig, type, tag)
+	{ }
+
+	void guitrbus(machine_config &config);
+
+protected:
+
+	virtual uint16_t portb_r();
+	virtual void porta_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
+	virtual void portb_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
+};
+
+class spg2xx_game_marc250_state : public spg2xx_game_marc101_state
+{
+public:
+	spg2xx_game_marc250_state(const machine_config &mconfig, device_type type, const char *tag) :
+		spg2xx_game_marc101_state(mconfig, type, tag),
+		m_toggle2(false)
+	{ }
+
+	void init_m527();
+
+protected:
+	void machine_start() override;
+	void machine_reset() override;
+
+	virtual void device_timer(emu_timer& timer, device_timer_id id, int param, void* ptr) override;
+
+	virtual uint16_t porta_r() override;
+	virtual void porta_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
+	virtual void portb_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
+
+private:
+	bool m_toggle2;
+	emu_timer *m_pulse_timer2;
+};
+
+void spg2xx_game_marc101_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	switch (id)
+	{
+	case 0:
+		m_toggle = !m_toggle;
+		//printf("toggle\n");
+		break;
+	}
+}
+
+void spg2xx_game_marc250_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+{
+	switch (id)
+	{
+	case 0:
+		m_toggle = !m_toggle;
+		//printf("toggle\n");
+		break;
+
+	case 1:
+		m_toggle2 = !m_toggle2;
+		//printf("toggle\n");
+		break;
+	}
+}
+
+
+void spg2xx_game_marc101_state::machine_start()
+{
+	spg2xx_game_state::machine_start();
+	m_pulse_timer = timer_alloc(0);
+	m_pulse_timer->adjust(attotime::never);
+
+}
+
+void spg2xx_game_marc101_state::machine_reset()
+{
+	spg2xx_game_state::machine_reset();
+	m_pulse_timer->adjust(attotime::never);
+	m_prev_porta = 0;
+	m_prev_portb = 0;
+	m_toggle = false;
+}
+
+void spg2xx_game_marc250_state::machine_start()
+{
+	spg2xx_game_marc101_state::machine_start();
+	m_pulse_timer2 = timer_alloc(1);
+	m_pulse_timer2->adjust(attotime::never);
+
+	// hack, makes x-racer3 and some others more stable, TODO: find out what is really wrong
+	m_maincpu->set_clock_scale(2.0000f);
+
+}
+
+void spg2xx_game_marc250_state::machine_reset()
+{
+	spg2xx_game_marc101_state::machine_reset();
+	switch_bank(31);
+	m_maincpu->reset();
+
+	m_pulse_timer2->adjust(attotime::never);
+	m_toggle2 = false;
+}
+
+
+void spg2xx_game_marc101_state::marc101(machine_config &config)
+{
+	spg2xx(config);
+
+	m_maincpu->set_pal(true);
+	m_screen->set_refresh_hz(50);
+
+	m_maincpu->porta_in().set(FUNC(spg2xx_game_marc101_state::porta_r));
+	m_maincpu->porta_out().set(FUNC(spg2xx_game_marc101_state::porta_w));
+}
+
+void spg2xx_game_guitrbus_state::guitrbus(machine_config &config)
+{
+	spg2xx(config);
+
+	m_maincpu->portb_in().set(FUNC(spg2xx_game_guitrbus_state::portb_r));
+	m_maincpu->porta_out().set(FUNC(spg2xx_game_guitrbus_state::porta_w));
+	m_maincpu->portb_out().set(FUNC(spg2xx_game_guitrbus_state::portb_w));
+}
+
+
+// are these Port A behaviors related to IO A Special mode on the SoC?
+// the bits being tested do seem to be 'ExtClk2 / ExtClk1'
+
+uint16_t spg2xx_game_marc101_state::porta_r()
+{
+	uint16_t ret = m_io_p1->read() &~ 0x2000;
+
+	ret |= m_toggle ? 0x2000 : 0x0000;
+
+	return ret;
+}
+
+uint16_t spg2xx_game_guitrbus_state::portb_r()
+{
+	uint16_t ret = m_io_p2->read() &~ 0x0008;
+
+	ret |= m_toggle ? 0x0000 : 0x0008;
+
+	return ret;
+}
+
+void spg2xx_game_guitrbus_state::porta_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	logerror("%s: porta_w %04x (%04x) %c %c %c %c | %c %c %c %c | %c %c %c %c | %c %c %c %c  \n", machine().describe_context(), data, mem_mask,
+		(mem_mask & 0x8000) ? ((data & 0x8000) ? '1' : '0') : 'x',
+		(mem_mask & 0x4000) ? ((data & 0x4000) ? '1' : '0') : 'x',
+		(mem_mask & 0x2000) ? ((data & 0x2000) ? '1' : '0') : 'x',
+		(mem_mask & 0x1000) ? ((data & 0x1000) ? '1' : '0') : 'x',
+		(mem_mask & 0x0800) ? ((data & 0x0800) ? '1' : '0') : 'x',
+		(mem_mask & 0x0400) ? ((data & 0x0400) ? '1' : '0') : 'x',
+		(mem_mask & 0x0200) ? ((data & 0x0200) ? '1' : '0') : 'x',
+		(mem_mask & 0x0100) ? ((data & 0x0100) ? '1' : '0') : 'x',
+		(mem_mask & 0x0080) ? ((data & 0x0080) ? '1' : '0') : 'x',
+		(mem_mask & 0x0040) ? ((data & 0x0040) ? '1' : '0') : 'x',
+		(mem_mask & 0x0020) ? ((data & 0x0020) ? '1' : '0') : 'x',
+		(mem_mask & 0x0010) ? ((data & 0x0010) ? '1' : '0') : 'x',
+		(mem_mask & 0x0008) ? ((data & 0x0008) ? '1' : '0') : 'x',
+		(mem_mask & 0x0004) ? ((data & 0x0004) ? '1' : '0') : 'x',
+		(mem_mask & 0x0002) ? ((data & 0x0002) ? '1' : '0') : 'x',
+		(mem_mask & 0x0001) ? ((data & 0x0001) ? '1' : '0') : 'x');
+
+	m_prev_porta = data;
+}
+
+void spg2xx_game_guitrbus_state::portb_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	logerror("%s: portb_w %04x (%04x) %c %c %c %c | %c %c %c %c | %c %c %c %c | %c %c %c %c  \n", machine().describe_context(), data, mem_mask,
+		(mem_mask & 0x8000) ? ((data & 0x8000) ? '1' : '0') : 'x',
+		(mem_mask & 0x4000) ? ((data & 0x4000) ? '1' : '0') : 'x',
+		(mem_mask & 0x2000) ? ((data & 0x2000) ? '1' : '0') : 'x',
+		(mem_mask & 0x1000) ? ((data & 0x1000) ? '1' : '0') : 'x',
+		(mem_mask & 0x0800) ? ((data & 0x0800) ? '1' : '0') : 'x',
+		(mem_mask & 0x0400) ? ((data & 0x0400) ? '1' : '0') : 'x',
+		(mem_mask & 0x0200) ? ((data & 0x0200) ? '1' : '0') : 'x',
+		(mem_mask & 0x0100) ? ((data & 0x0100) ? '1' : '0') : 'x',
+		(mem_mask & 0x0080) ? ((data & 0x0080) ? '1' : '0') : 'x',
+		(mem_mask & 0x0040) ? ((data & 0x0040) ? '1' : '0') : 'x',
+		(mem_mask & 0x0020) ? ((data & 0x0020) ? '1' : '0') : 'x',
+		(mem_mask & 0x0010) ? ((data & 0x0010) ? '1' : '0') : 'x',
+		(mem_mask & 0x0008) ? ((data & 0x0008) ? '1' : '0') : 'x',
+		(mem_mask & 0x0004) ? ((data & 0x0004) ? '1' : '0') : 'x',
+		(mem_mask & 0x0002) ? ((data & 0x0002) ? '1' : '0') : 'x',
+		(mem_mask & 0x0001) ? ((data & 0x0001) ? '1' : '0') : 'x');
+
+	if ((data & 0x0002) != (m_prev_portb & 0x0002))
+	{
+		if ((data & 0x0002))
+		{
+			logerror("ext timer reset\n");
+			m_pulse_timer->adjust(attotime::from_hz(32), 0, attotime::from_hz(32));
+		}
+	}
+
+	m_prev_portb = data;
+}
+
+
+
+
+void spg2xx_game_marc101_state::porta_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	logerror("%s: porta_w %04x (%04x) %c %c %c %c | %c %c %c %c | %c %c %c %c | %c %c %c %c  \n", machine().describe_context(), data, mem_mask,
+		(mem_mask & 0x8000) ? ((data & 0x8000) ? '1' : '0') : 'x',
+		(mem_mask & 0x4000) ? ((data & 0x4000) ? '1' : '0') : 'x',
+		(mem_mask & 0x2000) ? ((data & 0x2000) ? '1' : '0') : 'x',
+		(mem_mask & 0x1000) ? ((data & 0x1000) ? '1' : '0') : 'x',
+		(mem_mask & 0x0800) ? ((data & 0x0800) ? '1' : '0') : 'x',
+		(mem_mask & 0x0400) ? ((data & 0x0400) ? '1' : '0') : 'x',
+		(mem_mask & 0x0200) ? ((data & 0x0200) ? '1' : '0') : 'x',
+		(mem_mask & 0x0100) ? ((data & 0x0100) ? '1' : '0') : 'x',
+		(mem_mask & 0x0080) ? ((data & 0x0080) ? '1' : '0') : 'x',
+		(mem_mask & 0x0040) ? ((data & 0x0040) ? '1' : '0') : 'x',
+		(mem_mask & 0x0020) ? ((data & 0x0020) ? '1' : '0') : 'x',
+		(mem_mask & 0x0010) ? ((data & 0x0010) ? '1' : '0') : 'x',
+		(mem_mask & 0x0008) ? ((data & 0x0008) ? '1' : '0') : 'x',
+		(mem_mask & 0x0004) ? ((data & 0x0004) ? '1' : '0') : 'x',
+		(mem_mask & 0x0002) ? ((data & 0x0002) ? '1' : '0') : 'x',
+		(mem_mask & 0x0001) ? ((data & 0x0001) ? '1' : '0') : 'x');
+
+	// see function at 053E19 (marc101)
+	// it has several states
+	// 00 - wait a while
+	// 01 - set 0x0400 in port a high
+	// 02 - clear 0x0400 in port a
+	// 07 - measure number of times 0x2000 on port a changes, with min/max acceptable values and a timeout
+	// ff - failure (causes blank screen / shutdown + inf loop)
+	if ((data & 0x0400) != (m_prev_porta & 0x0400))
+	{
+		if (!(data & 0x0400))
+		{
+			//logerror("pulse / timer reset\n");
+			m_pulse_timer->adjust(attotime::from_hz(32), 0, attotime::from_hz(32));
+		}
+	}
+
+	m_prev_porta = data;
+}
+
+uint16_t spg2xx_game_marc250_state::porta_r()
+{
+	uint16_t ret = m_io_p1->read() &~ 0x6000;
+	ret |= m_toggle ? 0x2000 : 0x0000;
+	ret |= m_toggle2 ? 0x4000 : 0x0000;
+//  printf("porta %04x\n", ret);
+
+	return ret;
+}
+
+
+void spg2xx_game_marc250_state::porta_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	logerror("%s: porta_w %04x (%04x) %c %c %c %c | %c %c %c %c | %c %c %c %c | %c %c %c %c  \n", machine().describe_context(), data, mem_mask,
+		(mem_mask & 0x8000) ? ((data & 0x8000) ? '1' : '0') : 'x',
+		(mem_mask & 0x4000) ? ((data & 0x4000) ? '1' : '0') : 'x',
+		(mem_mask & 0x2000) ? ((data & 0x2000) ? '1' : '0') : 'x',
+		(mem_mask & 0x1000) ? ((data & 0x1000) ? '1' : '0') : 'x',
+		(mem_mask & 0x0800) ? ((data & 0x0800) ? '1' : '0') : 'x',
+		(mem_mask & 0x0400) ? ((data & 0x0400) ? '1' : '0') : 'x',
+		(mem_mask & 0x0200) ? ((data & 0x0200) ? '1' : '0') : 'x',
+		(mem_mask & 0x0100) ? ((data & 0x0100) ? '1' : '0') : 'x',
+		(mem_mask & 0x0080) ? ((data & 0x0080) ? '1' : '0') : 'x',
+		(mem_mask & 0x0040) ? ((data & 0x0040) ? '1' : '0') : 'x',
+		(mem_mask & 0x0020) ? ((data & 0x0020) ? '1' : '0') : 'x',
+		(mem_mask & 0x0010) ? ((data & 0x0010) ? '1' : '0') : 'x',
+		(mem_mask & 0x0008) ? ((data & 0x0008) ? '1' : '0') : 'x',
+		(mem_mask & 0x0004) ? ((data & 0x0004) ? '1' : '0') : 'x',
+		(mem_mask & 0x0002) ? ((data & 0x0002) ? '1' : '0') : 'x',
+		(mem_mask & 0x0001) ? ((data & 0x0001) ? '1' : '0') : 'x');
+
+	// see function at 8AB2 (marc250 menu)
+	// it has several states
+	// 00 - wait a while
+	// 01 - clear 0x1000 in port a
+	// 02 - wait a while
+	// 05 - check rate of port a bit 0x4000
+
+	// 06 - wait a while
+	// 07 - clear 0x1000 in port a
+	// 08 - wait a while
+	// 09 - check rate of port a bit 0x2000
+
+	// ff - failure (causes blank screen / shutdown + inf loop)
+
+	// function is at 04D918 in x-racer 3 (values tweaked to pass)
+	// but x-racer 3 also seems to need faster CPU or it randomly corrupts (or its an IRQ problem?)
+
+	if ((data & 0x1000) != (m_prev_porta & 0x1000))
+	{
+		if (!(data & 0x1000))
+		{
+			// these values stop the marc250 menu from failing, but not the games
+			//printf("pulse / timer reset\n");
+			m_pulse_timer->adjust(attotime::from_hz(6), 0, attotime::from_hz(6));
+			m_pulse_timer2->adjust(attotime::from_hz(12), 0, attotime::from_hz(12));
+		}
+	}
+
+	m_prev_porta = data;
+}
+
+
 static INPUT_PORTS_START( wiwi18 )
 	PORT_START("P1")
 	PORT_DIPNAME( 0x0001, 0x0001, "IN0" )
@@ -228,6 +571,48 @@
 	PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_CUSTOM )
 INPUT_PORTS_END
 
+static INPUT_PORTS_START( m489 )
+	PORT_START("P1")
+	PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
+
+	PORT_START("P2")
+	PORT_BIT( 0x0003, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 )
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON2 )
+	PORT_BIT( 0xff00, IP_ACTIVE_LOW, IPT_UNUSED )
+
+	PORT_START("P3")
+	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_START1 )
+	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNUSED ) // acts as Button 1 autofire (not connected on unit?)
+	PORT_BIT( 0xfffc, IP_ACTIVE_LOW, IPT_UNUSED )
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( guitrbus )
+	PORT_START("P1")
+	PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Red / Do")
+	PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Yellow / Re")
+	PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Purple / Mi")
+	PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_BUTTON4 ) PORT_NAME("Green / Fa")
+	PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_BUTTON6 ) PORT_NAME("Menu")
+	PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start")
+	PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_BUTTON5 ) PORT_NAME("Blue / Sol")
+
+	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN ) // Logo (either WinFun or no logo)
+
+	PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON8 ) PORT_NAME("Whammy Bar")
+	PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_NAME("Strum")
+
+	PORT_START("P2")
+	PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("P3")
+	PORT_BIT( 0xffff, IP_ACTIVE_HIGH, IPT_UNUSED )
+INPUT_PORTS_END
+
 
 void spg2xx_game_wiwi18_state::init_wiwi18()
 {
@@ -242,8 +627,6 @@
 
 }
 
-
-
 void spg2xx_game_wiwi18_state::portb_w(offs_t offset, uint16_t data, uint16_t mem_mask)
 {
 	logerror("%s: portb_w %04x (%04x) %c %c %c %c | %c %c %c %c | %c %c %c %c | %c %c %c %c  \n", machine().describe_context(), data, mem_mask,
@@ -271,7 +654,212 @@
 		else
 			switch_bank(0);
 	}
+}
+
+
+
+void spg2xx_game_marc101_state::portb_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	if (m_maincpu->pc() < 0x2000)
+	{
+		logerror("%s: portb_w %04x (%04x) %c %c %c %c | %c %c %c %c | %c %c %c %c | %c %c %c %c  \n", machine().describe_context(), data, mem_mask,
+			(mem_mask & 0x8000) ? ((data & 0x8000) ? '1' : '0') : 'x',
+			(mem_mask & 0x4000) ? ((data & 0x4000) ? '1' : '0') : 'x',
+			(mem_mask & 0x2000) ? ((data & 0x2000) ? '1' : '0') : 'x',
+			(mem_mask & 0x1000) ? ((data & 0x1000) ? '1' : '0') : 'x',
+			(mem_mask & 0x0800) ? ((data & 0x0800) ? '1' : '0') : 'x',
+			(mem_mask & 0x0400) ? ((data & 0x0400) ? '1' : '0') : 'x',
+			(mem_mask & 0x0200) ? ((data & 0x0200) ? '1' : '0') : 'x',
+			(mem_mask & 0x0100) ? ((data & 0x0100) ? '1' : '0') : 'x',
+			(mem_mask & 0x0080) ? ((data & 0x0080) ? '1' : '0') : 'x',
+			(mem_mask & 0x0040) ? ((data & 0x0040) ? '1' : '0') : 'x',
+			(mem_mask & 0x0020) ? ((data & 0x0020) ? '1' : '0') : 'x',
+			(mem_mask & 0x0010) ? ((data & 0x0010) ? '1' : '0') : 'x',
+			(mem_mask & 0x0008) ? ((data & 0x0008) ? '1' : '0') : 'x',
+			(mem_mask & 0x0004) ? ((data & 0x0004) ? '1' : '0') : 'x',
+			(mem_mask & 0x0002) ? ((data & 0x0002) ? '1' : '0') : 'x',
+			(mem_mask & 0x0001) ? ((data & 0x0001) ? '1' : '0') : 'x');
+	}
+
+
+	if (m_maincpu->pc() < 0x2000)
+	{
+		// bit 0x1000 isn't set as an output, but clearly needs to be treated as one
+		switch (data & 0x1003)
+		{
+		case 0x0000: switch_bank(7); break;
+		case 0x0001: switch_bank(6); break; // good - heroic pilot
+		case 0x0002: switch_bank(5); break; // good - horrific collapser
+		case 0x0003: switch_bank(4); break; // good - under sea war
+		case 0x1000: switch_bank(3); break; // good - roadman etc.
+		case 0x1001: switch_bank(2); break; // good - santa etc
+		case 0x1002: switch_bank(1); break;
+		case 0x1003: switch_bank(0); break;
+		}
+	}
+}
+
+void spg2xx_game_marc250_state::init_m527()
+{
+
+	// the code being patched turns the IRQ off, code looks a bit like smarttv code..  is SoC IRQ handling wrong?
+	// or is this more security, or something else? games don't run with the IRQ off...
+#if 1
+	uint16_t* rom = (uint16_t*)memregion("maincpu")->base();
+
+	uint16_t ident2[6] = { 0x9512, 0x2862, 0xa70a, 0x0002, 0xd71b, 0x2862 };
+
+	for (int i = 0; i < (0x10000000 / 2) - 6; i++)
+	{
+		bool found = true;
+		for (int j = 0; j < 6; j++)
+		{
+			uint16_t cmp1 = ident2[j];
+			uint16_t cmp2 = rom[i + j];
+
+			if (cmp1 != cmp2)
+				found = false;
+		}
+
+		if (found)
+		{
+			printf("found at %08x\n", i + 3);
+			rom[i + 3] = 0x0003;
+		}
+	}
+
+
+	// pass maze road
+	//rom[((12 * 0x800000) / 2) | 0x0284b5] = 0x0003;
+	// learn numbers
+	//rom[((13 * 0x800000) / 2) | 0x00c055] = 0x0003;
+	// bowling
+	//rom[((17 * 0x800000) / 2) | 0x015e58] = 0x0003;
+	// cliff overhang / gym dancing
+	//rom[((18 * 0x800000) / 2) | 0x01cab4] = 0x0003;
+	rom[((18 * 0x800000) / 2) | 0x021e25] = 0xffff; // secondary 'turn off'
+	// jump chess
+	//rom[((19 * 0x800000) / 2) | 0x012c3a] = 0x0003;
+	// boxing, basketball etc.
+	//rom[((23 * 0x800000) / 2) | 0x00c1bd] = 0x0003;
+	// dash motor
+	//rom[((24 * 0x800000) / 2) | 0x00d62c] = 0x0003;
+	// same for curling
+	//rom[((25 * 0x800000) / 2) | 0x0103c5] = 0x0003;
+	// balloon puyo
+	//rom[((26 * 0x800000) / 2) | 0x0084dd] = 0x0003;
+	// 4 score
+	//rom[((27 * 0x800000) / 2) | 0x145cdd] = 0x0003;
+#endif
+}
+
+void spg2xx_game_marc250_state::portb_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	if (m_maincpu->pc() < 0x2000)
+	{
+		logerror("%s: portb_w %04x (%04x) %c %c %c %c | %c %c %c %c | %c %c %c %c | %c %c %c %c  \n", machine().describe_context(), data, mem_mask,
+			(mem_mask & 0x8000) ? ((data & 0x8000) ? '1' : '0') : 'x',
+			(mem_mask & 0x4000) ? ((data & 0x4000) ? '1' : '0') : 'x',
+			(mem_mask & 0x2000) ? ((data & 0x2000) ? '1' : '0') : 'x',
+			(mem_mask & 0x1000) ? ((data & 0x1000) ? '1' : '0') : 'x',
+			(mem_mask & 0x0800) ? ((data & 0x0800) ? '1' : '0') : 'x',
+			(mem_mask & 0x0400) ? ((data & 0x0400) ? '1' : '0') : 'x',
+			(mem_mask & 0x0200) ? ((data & 0x0200) ? '1' : '0') : 'x',
+			(mem_mask & 0x0100) ? ((data & 0x0100) ? '1' : '0') : 'x',
+			(mem_mask & 0x0080) ? ((data & 0x0080) ? '1' : '0') : 'x',
+			(mem_mask & 0x0040) ? ((data & 0x0040) ? '1' : '0') : 'x',
+			(mem_mask & 0x0020) ? ((data & 0x0020) ? '1' : '0') : 'x',
+			(mem_mask & 0x0010) ? ((data & 0x0010) ? '1' : '0') : 'x',
+			(mem_mask & 0x0008) ? ((data & 0x0008) ? '1' : '0') : 'x',
+			(mem_mask & 0x0004) ? ((data & 0x0004) ? '1' : '0') : 'x',
+			(mem_mask & 0x0002) ? ((data & 0x0002) ? '1' : '0') : 'x',
+			(mem_mask & 0x0001) ? ((data & 0x0001) ? '1' : '0') : 'x');
+	}
+
+	// bank 0  = (unused) 'ROM 18 64M' (dupe)
+	// bank 1  = (unused) 'ROM 18 64M' (dupe)
+	// bank 2  = (unused) 'ROM 18 64M' (dupe)
+	// bank 3  = (unused) 'ROM 18 64M' (dupe)
+	// bank 4  = (unused) 'ROM 18 64M' (dupe)
+	// bank 5  = (unused) 'ROM 18 64M' (dupe)
+	// bank 6  = (used) boots 'kung fu high style' (no bank number check)
+	// bank 7  = (unused) 'ROM 18 64M' (dupe)
+
+	// bank 8  = (used) 'ROM 24 64M'
+	// bank 9  = (used) 'ROM 23 64M'
+	// bank 10 = (unused) 'ROM 18 64M' (dupe)
+	// bank 11 = (unused) 'ROM 18 64M' (dupe)
+	// bank 12 = (used) (doesn't boot)
+	// bank 13 = (used) (doesn't boot)
+	// bank 14 = (used) 'ROM 18 64M'
+	// bank 15 = (unused) 'ROM 18 64M' (dupe)
+
+	// bank 16 = (used) 'ROM 16 64M' (error)
+	// bank 17 = (used) (plays music)
+	// bank 18 = (used) (doesn't boot)
+	// bank 19 = (used)
+	// bank 20 = (used)
+	// bank 21 = (used)
+	// bank 22 = (used)
+	// bank 23 = (used)
+
+	// bank 24 = (used)
+	// bank 25 = (used)
+	// bank 26 = (used)
+	// bank 27 = (used)
+	// bank 28 = (used)
+	// bank 29 = (used)
+	// bank 30 = (used) 'ROM 2 64M'
+	// bank 31 = (used) menu (no bank number check)
+
+	// bits 0x1804 aren't set as an output, but clearly need to be treated as output, also bad values of 0x00ff and 0x0000 are written on startup, with direction bits set!
+	// this seems similar to issues with banking in some other units.
+	if ((m_maincpu->pc() < 0x2000) && (data != 0x00ff) && (data != 0x0000))
+	{
+		switch (data & 0x1807)
+		{
+		case 0x0000: switch_bank(0); break; // unused
+		case 0x0001: switch_bank(1); break; // unused
+		case 0x0002: switch_bank(2); break; // unused
+		case 0x0003: switch_bank(3); break; // unused
+
+		case 0x1000: switch_bank(4); break; // unused
+		case 0x1001: switch_bank(5); break; // unused
+		case 0x1002: switch_bank(6); break; // kung fu (ok)
+		case 0x1003: switch_bank(7); break; // unused
+
+		case 0x0800: switch_bank(8); break; // jogging (ok)
+		case 0x0801: switch_bank(9); break; // power kick (ok)
+		case 0x0802: switch_bank(10); break; // unused
+		case 0x0803: switch_bank(11); break; // unused
+
+		case 0x1800: switch_bank(12); break; // pass maze road
+		case 0x1801: switch_bank(13); break; // learn number
+		case 0x1802: switch_bank(14); break; // final race, motor race
+		case 0x1803: switch_bank(15); break; // unused
+
+		case 0x0004: switch_bank(16); break; // thunder race, speed race, night shooter
+		case 0x0005: switch_bank(17); break; // rescue bees
+		case 0x0006: switch_bank(18); break; // cliff overhang
+		case 0x0007: switch_bank(19); break; // jump chess
+
+		case 0x1004: switch_bank(20); break; // mind link, mystery cave
+		case 0x1005: switch_bank(21); break; // bumper cars, stone age, dance party (need hack)
+		case 0x1006: switch_bank(22); break; // xracer (need hack)
+		case 0x1007: switch_bank(23); break; // basketball (but irq gets turned off?)
+
+		case 0x0804: switch_bank(24); break; // button jumper  dash motor
+		case 0x0805: switch_bank(25); break; // cross river
+		case 0x0806: switch_bank(26); break; // balloon puyu
+		case 0x0807: switch_bank(27); break; // 4 Score
+
+		case 0x1804: switch_bank(28); break; // bubble, malibu
+		case 0x1805: switch_bank(29); break; // goalkeeper
+		case 0x1806: switch_bank(30); break; // fish journey, brick, happy zoo, crazy tramcar
+		case 0x1807: switch_bank(31); break; // menu
 
+		}
+	}
 }
 
 ROM_START( foxsport )
@@ -289,6 +877,22 @@
 	ROM_LOAD16_WORD_SWAP( "lexibook_tv_fitness_center.bin", 0x000000, 0x1000000, CRC(38021230) SHA1(2b949d723a475bfac23d9da4d1a30ea71b332ccb) )
 ROM_END
 
+ROM_START( marc101 )
+	ROM_REGION( 0x4000000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "m489.u6", 0x0000000, 0x4000000, CRC(0a01695f) SHA1(1a13c5eb9dffdc91fc68a98e8f35bd8a019a8373) )
+	ROM_IGNORE(0x4000000) // 2nd half is just random fill unrelated to the game, ROM was twice needed capacity
+ROM_END
+
+ROM_START( marc250 )
+	ROM_REGION( 0x10000000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "m527.u6", 0x0000000, 0x10000000, CRC(4b856cab) SHA1(41c66bbdb0bb1442d7e11da18e9e6b20048445ba) )
+ROM_END
+
+ROM_START( guitrbus )
+	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "winfunguitar.bin", 0x000000, 0x400000, CRC(17419a27) SHA1(19377fcd18b08d3ae8e20de0244b3aaef1b5a66a) )
+ROM_END
+
 // box marked 'Wireless game console' 'Drahtlose Spielekonsole' 87 Sports games included : 18 hyper sports games, 69 arcade games.
 // Unit marked 'Hamy System' 'WiWi'
 // actually a cartridge, but all hardware is in the cart, overriding any internal hardware entirely.  see nes_vt.cp 'mc_sp69' for the '69 arcade game' part
@@ -299,3 +903,12 @@
 CONS( 200?, foxsport, 0,        0, rad_skat, wiwi18,  spg2xx_game_wiwi18_state, init_wiwi18, "Excalibur Electronics", "Fox Sports 7 in 1 Sports Games Plug n' Play", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
 
 // thtere is another 'Drahtlose Spielekonsole 48-in-1' with '11 hyper sports games' (including Running) which are clearly SunPlus and would fit here, with the 37 non-hyper sports games presumably again being a NES/Famiclone cart
+
+CONS( 2014, marc101,     0,        0, marc101, m489,  spg2xx_game_marc101_state, empty_init, "Millennium 2000 GmbH", "Millennium Arcade 101 (M489) (Game Station 2 101-in-1)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+
+CONS( 2015, marc250,     0,        0, marc101, m489,  spg2xx_game_marc250_state, init_m527, "Millennium 2000 GmbH", "Millennium Arcade 250 (M527)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+
+// has the following strings at the start of the ROM
+// "Copyright(C) 2009-2012 ShenZhen Multi-Content Software CO., LTD"
+// "LisencedTo: MCS"
+CONS( 2012, guitrbus,   0,        0, guitrbus,  guitrbus,  spg2xx_game_guitrbus_state,          empty_init,    "WinFun",  "Guitar Buster", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/spg2xx_zone_32bit.cpp mame-0.224+dfsg.1/src/mame/drivers/spg2xx_zone_32bit.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/spg2xx_zone_32bit.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/spg2xx_zone_32bit.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -49,6 +49,18 @@
 	int m_basebank;
 };
 
+class mywicogt_state : public zon32bit_state
+{
+public:
+	mywicogt_state(const machine_config& mconfig, device_type type, const char* tag) :
+		zon32bit_state(mconfig, type, tag)
+	{ }
+
+protected:
+	virtual void porta_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
+};
+
+
 class mywicodx_state : public zon32bit_state
 {
 public:
@@ -153,6 +165,52 @@
 }
 
 
+void mywicogt_state::porta_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	if (1)
+		logerror("%s: porta_w %04x (%04x) %c %c %c %c | %c %c %c %c | %c %c %c %c | %c %c %c %c  \n", machine().describe_context(), data, mem_mask,
+			(mem_mask & 0x8000) ? ((data & 0x8000) ? '1' : '0') : 'x',
+			(mem_mask & 0x4000) ? ((data & 0x4000) ? '1' : '0') : 'x',
+			(mem_mask & 0x2000) ? ((data & 0x2000) ? '1' : '0') : 'x',
+			(mem_mask & 0x1000) ? ((data & 0x1000) ? '1' : '0') : 'x',
+			(mem_mask & 0x0800) ? ((data & 0x0800) ? '1' : '0') : 'x',
+			(mem_mask & 0x0400) ? ((data & 0x0400) ? '1' : '0') : 'x',
+			(mem_mask & 0x0200) ? ((data & 0x0200) ? '1' : '0') : 'x',
+			(mem_mask & 0x0100) ? ((data & 0x0100) ? '1' : '0') : 'x',
+			(mem_mask & 0x0080) ? ((data & 0x0080) ? '1' : '0') : 'x',
+			(mem_mask & 0x0040) ? ((data & 0x0040) ? '1' : '0') : 'x',
+			(mem_mask & 0x0020) ? ((data & 0x0020) ? '1' : '0') : 'x',
+			(mem_mask & 0x0010) ? ((data & 0x0010) ? '1' : '0') : 'x',
+			(mem_mask & 0x0008) ? ((data & 0x0008) ? '1' : '0') : 'x',
+			(mem_mask & 0x0004) ? ((data & 0x0004) ? '1' : '0') : 'x',
+			(mem_mask & 0x0002) ? ((data & 0x0002) ? '1' : '0') : 'x',
+			(mem_mask & 0x0001) ? ((data & 0x0001) ? '1' : '0') : 'x');
+
+//[:] ':maincpu' (000508): porta_w 0b00 (0f00) x x x x | 1 0 1 1 | x x x x | x x x x
+//[:] ':maincpu' (000510): porta_w 0b00 (0f00) x x x x | 1 0 1 1 | x x x x | x x x x
+//[:] ':maincpu' (000518): porta_w 0f00 (0f00) x x x x | 1 1 1 1 | x x x x | x x x x
+
+	if (m_maincpu->pc() < 0x1000)
+	{
+		if (data == 0x0f00)
+		{
+			m_basebank = 1;
+			m_maincpu->invalidate_cache();
+			logerror("changing to bank 1\n");
+
+		}
+		else if (data == 0x0b00)
+		{
+			m_basebank = 0;
+			m_maincpu->invalidate_cache();
+			logerror("changing to bank 0\n");
+		}
+	}
+
+	m_porta_dat = data;
+}
+
+
 void mywicodx_state::porta_w(offs_t offset, uint16_t data, uint16_t mem_mask)
 {
 	if (0)
@@ -747,6 +805,14 @@
 	ROM_CONTINUE(0x1800000, 0x0800000)
 ROM_END
 
+ROM_START( mywicogt )
+	ROM_REGION( 0x2000000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "mywicoguitar.bin", 0x0000000, 0x0800000, CRC(3c037c50) SHA1(3b9a28fb643c9f90563d653be0f38eba09c26f26) )
+	ROM_CONTINUE(0x1000000, 0x0800000)
+	ROM_CONTINUE(0x0800000, 0x0800000)
+	ROM_CONTINUE(0x1800000, 0x0800000)
+ROM_END
+
 
 /*
     Following pinout was used for dumping
@@ -928,6 +994,8 @@
 // The Mi Guitar menu contains 24 games, but they're dupes, and just counting those would exclude the other Mi Fit and Mi Papacon menus (which also contain dupes)
 CONS( 200?, mywicodx,  0, 0, zon32bit, zon32bit, mywicodx_state,  empty_init,      "<unknown>",                                   "My Wico Deluxe (Family Sport 85-in-1)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
 
+CONS( 200?, mywicogt,  0, 0, zon32bit, zon32bit, mywicogt_state,  empty_init,      "<unknown>",                                   "My Wico Guitar", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+
 // issues with 'low battery' always showing, but otherwise functional
 CONS( 200?, oplayer,   0, 0, zon32bit_bat, oplayer, oplayer_100in1_state, init_oplayer, "OPlayer", "OPlayer Mobile Game Console (MGS03-white) (Family Sport 100-in-1)", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/spg2xx_zone.cpp mame-0.224+dfsg.1/src/mame/drivers/spg2xx_zone.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/spg2xx_zone.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/spg2xx_zone.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -341,18 +341,42 @@
 	ROM_LOAD16_WORD_SWAP( "rom.bin", 0x0000, 0x10000000, CRC(59442e00) SHA1(7e91cf6b19c37f9b4fa4dc21e241c6634d6a6f95) )
 ROM_END
 
+ROM_START( zonemini )
+	ROM_REGION( 0x4000000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "zonemini.bin", 0x0000, 0x4000000, CRC(ba8c367c) SHA1(92ce2e895145ad76ea68ab7575d2c52aa0c0c5a9) )
+ROM_END
 
-CONS( 2009, zone40,   0, 0, zone40,     wirels60, zone40_state,      init_zone40,     "Jungle Soft / Ultimate Products (HK) Ltd",    "Zone 40",                             MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-CONS( 2009, itvg49,   0, 0, zone40p,    wirels60, zone40_state,      init_reactmd,    "TaiKee",                                      "Interactive TV Games 49-in-1 (PAL)",  MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // Badminton hangs, otherwise everything runs
-
-CONS( 2010, zone60,   0, 0, wireless60, wirels60, wireless60_state,  empty_init,      "Jungle's Soft / Ultimate Products (HK) Ltd",  "Zone 60",                             MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-CONS( 200?, zone100,  0, 0, wireless60, wirels60, wireless60_state,  init_zone100,    "Jungle's Soft / Ultimate Products (HK) Ltd",  "Zone 100",                            MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // unit was black, menus still show white controllers, unlike wireless 60
-CONS( 2010, wirels60, 0, 0, wireless60, wirels60, wireless60_state,  empty_init,      "Jungle Soft / Kids Station Toys Inc",         "Wireless 60",                         MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-CONS( 2011, lx_jg7415,0, 0, wireless60, wirels60, wireless60_state,  init_lx_jg7415,  "Lexibook",                                    "Lexibook JG7415 120-in-1",            MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+ROM_START( react )
+	ROM_REGION( 0x4000000, "maincpu", ROMREGION_ERASE00 )
+	ROM_LOAD16_WORD_SWAP( "reactor.bin", 0x0000, 0x0800000, CRC(0378c594) SHA1(b2214e3e235f26fb501df6c66a9b2c0da87b1c73))
+	ROM_CONTINUE(0x1000000, 0x0800000)
+	ROM_CONTINUE(0x0800000, 0x0800000)
+	ROM_CONTINUE(0x1800000, 0x0800000)
+	ROM_CONTINUE(0x2000000, 0x0800000)
+	ROM_CONTINUE(0x3000000, 0x0800000)
+	ROM_CONTINUE(0x2800000, 0x0800000)
+	ROM_CONTINUE(0x3800000, 0x0800000)
+ROM_END
 
+// These have games from Waixing and were likely manufactured  by Subor and sold by Ultimate Products Ltd.
+// Many of these games are rewrites of VT1682 based titles, which in turn were based on older NES/VT ones
+// Badminton hangs in units where it is present (cause not yet investigated), otherwise everything runs
+
+CONS( 2009, zone40,   0, 0, zone40,     wirels60, zone40_state,      init_zone40,     "Ultimate Products Ltd.",                      "Zone 40",                             MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+CONS( 2009, itvg49,   0, 0, zone40p,    wirels60, zone40_state,      init_reactmd,    "TaiKee",                                      "Interactive TV Games 49-in-1 (PAL)",  MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+CONS( 200?, zonemini, 0, 0, zone40,     wirels60, zone40_state,      init_reactmd,    "Ultimate Products Ltd.",                      "Zone Mini",                           MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+CONS( 2009, react,    0, 0, zone40,     wirels60, zone40_state,      init_reactmd,    "Ultimate Products Ltd.",                      "Reactor 32-in-1 (NTSC)",              MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
 
 // Two systems in one unit - Genesis on a Chip and SunPlus, only the SunPlus part is currently emulated.  Genesis on a chip is a very poor implementation with many issues on real hardware.
 // This should actually boot to a menu on the MD size, with the SunPlus only being enabled if selected from that menu.  MD side menu runs in some enhanced / custom MD mode tho.
 // Badminton hangs, as it does in the 49-in-1 above
 CONS( 2009, reactmd,  0, 0, zone40p,    wirels60, zone40_state,      init_reactmd,    "AtGames / Sega",                              "Reactor MD (PAL)",                    MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
 
+// These have a newer selection of games by Jungletac instead of the Waixing ones
+
+CONS( 2010, zone60,   0, 0, wireless60, wirels60, wireless60_state,  empty_init,      "Jungle's Soft / Ultimate Products (HK) Ltd",  "Zone 60",                             MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+CONS( 200?, zone100,  0, 0, wireless60, wirels60, wireless60_state,  init_zone100,    "Jungle's Soft / Ultimate Products (HK) Ltd",  "Zone 100",                            MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS ) // unit was black, menus still show white controllers, unlike wireless 60
+CONS( 2010, wirels60, 0, 0, wireless60, wirels60, wireless60_state,  empty_init,      "Jungle Soft / Kids Station Toys Inc",         "Wireless 60",                         MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+CONS( 2011, lx_jg7415,0, 0, wireless60, wirels60, wireless60_state,  init_lx_jg7415,  "Lexibook",                                    "Lexibook JG7415 120-in-1",            MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+
+
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/splash.cpp mame-0.224+dfsg.1/src/mame/drivers/splash.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/splash.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/splash.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -32,14 +32,16 @@
 Sound not working on Return of Lady Frog
 
 TS 2006.12.22:
-- Funny Strip is runing on pSOS RTOS ( http://en.wikipedia.org/wiki/PSOS and http://dr-linux.net/newbase/reference/psosCD/ ) .
-  There's copyright text at $480
+- Funny Strip is running on pSOS RTOS ( http://en.wikipedia.org/wiki/PSOS and http://dr-linux.net/newbase/reference/psosCD/ ) .
+  There's copyright text at $480. In Ring & Ball the copyright text is at 0x7c7a0.
   Also Rebus and TRoLF are running on it (the same internal code structure - traps, interrupt vectors),
   but copyright messages are removed.
 - Rebus protection patch sits at the end of trap $b (rtos call) and in some cases returns 0 in D0.
-  It's not a real protection check i think.
+  It's not a real protection check I think.
+- Ring & Ball is mostly decrypted, currently stops at 'scheda da inizializzare' (board must be initialized). Switching the dip to clear RAM it says
+  'Inizializzazione ok, ver 2.6' (Initialization ok, ver 2.6) then stops. By switching DSW2.8 it's possible to enter test mode.
 
-More notes about Funny Strip protection issues at the bottom of source file (DRIVER INIT)
+More notes about Funny Strip protection issues at the bottom of source file (init_funystrp)
 
 ***************************************************************************/
 
@@ -1051,9 +1053,9 @@
 
 ROM_START( ringball )
 	ROM_REGION( 0x080000, "maincpu", 0 )    /* 68000 code + gfx */
-	// TODO: encrypted, there's a device with scratched part between 68k and roms. u87 looks to have standard 68k vectors with scrambled bits.
-	ROM_LOAD( "u87.bin",      0x000000, 0x040000, CRC(f8f21cfd) SHA1(c258689fc79195945db21663d2df0a33a4412618) )
-	ROM_LOAD( "u111.bin",     0x040000, 0x040000, CRC(11e246b0) SHA1(b056bcaa52ab2898f470a29b0a5c2f3594e2522b) ) // actually "u101"?
+	// TODO: encrypted, there's a device with scratched part between 68k and roms
+	ROM_LOAD16_BYTE( "u87.bin",      0x000000, 0x040000, CRC(f8f21cfd) SHA1(c258689fc79195945db21663d2df0a33a4412618) )
+	ROM_LOAD16_BYTE( "u111.bin",     0x000001, 0x040000, CRC(11e246b0) SHA1(b056bcaa52ab2898f470a29b0a5c2f3594e2522b) ) // actually "u101"?
 
 	ROM_REGION( 0x080000, "audiocpu", 0 )   /* Z80 code + sound data */
 	ROM_LOAD( "u130.bin",     0x000000, 0x080000, CRC(892202ea) SHA1(10b5933b136a6595f739510d380d12c4cefd9f09) )
@@ -1440,6 +1442,35 @@
 	m_maincpu->space(AS_PROGRAM).install_read_handler(0x100000, 0x1fffff, read16sm_delegate(*this, FUNC(funystrp_state::protection_r)));
 }
 
+void funystrp_state::init_ringball() // decryption is preliminary, can probably be simplified / rearranged once completely figured out
+{
+	m_bitmap_type = 0;
+	m_sprite_attr2_shift = 0;
+
+	uint16_t *audiorom = (uint16_t *)memregion("audiocpu")->base();
+
+	membank("sound_bank")->configure_entries(0, 16, &audiorom[0x00000], 0x8000);
+
+	uint16_t *src = (uint16_t *)memregion("maincpu")->base();
+
+	for (int i = 0x0000; i < 0x2000 / 2; i++)  // believed ok
+		src[i] = bitswap<16>(src[i] ^ 0x85cc, 12, 13, 15, 10, 9, 11, 8, 14, 5, 4, 3, 2, 1, 0, 7, 6);
+
+	for (int i = 0x2000 / 2 ; i < 0x4000 / 2; i++)  // believed ok
+		src[i] = bitswap<16>(src[i] ^ 0xb622,  5, 4, 3, 2, 1, 0, 7, 6, 9, 8, 15, 14, 13, 12, 11, 10);
+
+	for (int i = 0x4000 / 2 ; i < 0x8000 / 2; i++) // probably
+		src[i] = bitswap<16>(src[i] ^ 0xb66d, 8, 9, 10, 11, 12, 13, 14, 15, 1, 0, 2, 3, 4, 5, 6, 7);
+
+	for (int i = 0x8000 / 2; i < 0x10000 / 2; i++)  // believed ok
+		src[i] = bitswap<16>(src[i] ^ 0xc8a6, 1, 3, 0, 5, 7, 9, 11, 13, 15, 14, 12, 8, 10, 6, 4, 2);
+
+	// 0x10000 - 0x61817 is 0xff filled
+
+	for (int i = 0x60000 / 2; i < 0x80000 / 2; i ++) // believed ok for 0x7c000 - 0x80000, probably ok for the rest (test mode doesn't appear otherwise)
+		src[i] ^= 0xffff;
+}
+
 GAME( 1992, splash,   0,        splash,   splash,   splash_state,   init_splash,   ROT0, "Gaelco / OMK Software",  "Splash! (Ver. 1.2 World)", MACHINE_SUPPORTS_SAVE )
 GAME( 1992, splash10, splash,   splash,   splash,   splash_state,   init_splash10, ROT0, "Gaelco / OMK Software",  "Splash! (Ver. 1.0 World)", MACHINE_SUPPORTS_SAVE )
 GAME( 1992, paintlad, splash,   splash,   splash,   splash_state,   init_splash,   ROT0, "Gaelco / OMK Software",  "Painted Lady (Splash) (Ver. 1.3 US)", MACHINE_SUPPORTS_SAVE )
@@ -1449,4 +1480,4 @@
 GAME( 1995, rebus,    0,        roldfrog, splash,   splash_state,   init_rebus,    ROT0, "Microhard",              "Rebus", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
 GAME( 199?, funystrp, 0,        funystrp, funystrp, funystrp_state, init_funystrp, ROT0, "Microhard / MagicGames", "Funny Strip", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
 GAME( 199?, puckpepl, funystrp, funystrp, funystrp, funystrp_state, init_funystrp, ROT0, "Microhard",              "Puck People", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE )
-GAME( 199?, ringball, funystrp, funystrp, funystrp, funystrp_state, init_funystrp, ROT0, "Microhard",              "Ring & Ball (unknown title)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) // Wouldn't surprise me if in-game is actually called King & Bell ...
+GAME( 1995, ringball, funystrp, funystrp, funystrp, funystrp_state, init_ringball, ROT0, "Microhard",              "Ring Ball (Ver. 2.6)", MACHINE_NOT_WORKING | MACHINE_UNEMULATED_PROTECTION | MACHINE_SUPPORTS_SAVE ) // Wouldn't surprise me if in-game is actually called King & Bell ...
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/splash_ms.cpp mame-0.224+dfsg.1/src/mame/drivers/splash_ms.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/splash_ms.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/splash_ms.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,583 @@
+// license:BSD-3-Clause
+// copyright-holders:David Haywood
+
+/*
+    Splash (Modular System)
+*/
+
+
+#include "emu.h"
+#include "cpu/m68000/m68000.h"
+#include "cpu/z80/z80.h"
+#include "emupal.h"
+#include "screen.h"
+#include "speaker.h"
+#include "tilemap.h"
+#include "sound/msm5205.h"
+#include "sound/3812intf.h"
+#include "machine/gen_latch.h"
+#include "machine/bankdev.h"
+
+
+class splashms_state : public driver_device
+{
+public:
+	splashms_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu"),
+		m_subcpu(*this, "subcpu"),
+		m_soundcpu(*this, "soundcpu"),
+		m_palette(*this, "palette"),
+		m_screen(*this, "screen"),
+		m_paletteram(*this, "palette"),
+		m_gfxdecode(*this, "gfxdecode"),
+		m_videoram(*this, "videoram"),
+		m_videoram2(*this, "videoram2"),
+		m_bitmapram(*this, "bitmapram"),
+		m_scrollregs(*this, "scrollregs"),
+		m_spriteram(*this, "spriteram"),
+		m_msm(*this, "msm"),
+		m_bgdata(*this, "subcpu"),
+		m_soundlatch(*this, "soundlatch"),
+		m_subram(*this, "subrambank"),
+		m_subrom(*this, "subrombank")
+	{ }
+
+	void splashms(machine_config &config);
+	void init_splashms();
+
+private:
+	required_device<cpu_device> m_maincpu;
+	required_device<cpu_device> m_subcpu;
+	required_device<cpu_device> m_soundcpu;
+
+	required_device<palette_device> m_palette;
+	required_device<screen_device> m_screen;
+
+	required_shared_ptr<uint16_t> m_paletteram;
+	required_device<gfxdecode_device> m_gfxdecode;
+	required_shared_ptr<uint16_t> m_videoram;
+	required_shared_ptr<uint16_t> m_videoram2;
+	required_shared_ptr<uint8_t> m_bitmapram;
+	required_shared_ptr<uint16_t> m_scrollregs;
+	required_shared_ptr<uint16_t> m_spriteram;
+	required_device<msm5205_device> m_msm;
+	required_region_ptr<uint8_t> m_bgdata;
+	required_device<generic_latch_8_device> m_soundlatch;
+	required_device<address_map_bank_device> m_subram;
+	required_device<address_map_bank_device> m_subrom;
+
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	virtual void video_start() override;
+
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+	void splashms_map(address_map &map);
+	void sub_map(address_map &map);
+	void sub_portmap(address_map &map);
+	void sound_map(address_map &map);
+
+	uint16_t unknown_0x40000c_r();
+	uint8_t frommain_command_r();
+	void vram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+
+	uint16_t vram2_r(offs_t offset, uint16_t mem_mask);
+	void vram2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+	TILE_GET_INFO_MEMBER(get_tile_info_tilemap1);
+	TILE_GET_INFO_MEMBER(get_tile_info_tilemap2);
+	tilemap_t *m_bg_tilemap;
+	tilemap_t *m_bg_tilemap2;
+
+	void to_subcpu_0x400004_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+
+	uint8_t m_subcmd;
+
+	void sub_rambankselect_w(uint8_t data);
+	void sub_rombankselect_w(uint8_t data);
+
+	DECLARE_WRITE_LINE_MEMBER(splash_msm5205_int);
+	void splash_adpcm_data_w(uint8_t data);
+	void splash_adpcm_control_w(uint8_t data);
+	int m_adpcm_data;
+
+	void subrambank_map(address_map& map);
+	void subrombank_map(address_map& map);
+
+	void descramble_16x16tiles(uint8_t* src, int len);
+
+};
+
+
+uint16_t splashms_state::unknown_0x40000c_r()
+{
+	logerror("%06x: unknown_0x40000c_r\n", machine().describe_context());
+	return machine().rand();
+}
+
+
+void splashms_state::sub_rambankselect_w(uint8_t data)
+{
+//  logerror("sub_rambankselect_w %02x\n", data);
+	m_subram->set_bank(data&0x7);
+}
+
+void splashms_state::sub_rombankselect_w(uint8_t data)
+{
+//  logerror("sub_rombankselect_w %02x\n", data);
+	m_subrom->set_bank(data & 0x7f);
+}
+
+
+uint8_t splashms_state::frommain_command_r()
+{
+	return m_subcmd;
+}
+
+void splashms_state::to_subcpu_0x400004_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	// no IRQ, subcpu just polls this
+	//popmessage("to_subcpu_0x400004_w %04x\n", data);
+	m_subcmd = data;
+}
+void splashms_state::vram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	COMBINE_DATA(&m_videoram[offset]);
+	m_bg_tilemap->mark_tile_dirty(offset/2);
+}
+
+uint16_t splashms_state::vram2_r(offs_t offset, uint16_t mem_mask)
+{
+	return m_videoram2[offset];
+}
+
+void splashms_state::vram2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+{
+	COMBINE_DATA(&m_videoram2[offset]);
+	m_bg_tilemap2->mark_tile_dirty(offset/2);
+}
+
+TILE_GET_INFO_MEMBER(splashms_state::get_tile_info_tilemap1)
+{
+	int tile = m_videoram[tile_index*2];
+	int attr = m_videoram[(tile_index*2)+1] & 0x0f;
+	int fx = (m_videoram[(tile_index*2)+1] & 0xc0)>>6;
+
+	tileinfo.set(1,tile,attr,TILE_FLIPYX(fx));
+}
+
+TILE_GET_INFO_MEMBER(splashms_state::get_tile_info_tilemap2)
+{
+	int tile = m_videoram2[tile_index*2];
+
+	tile &= 0x1ff;
+
+	int attr = m_videoram2[(tile_index*2)+1] & 0x0f;
+	int fx = (m_videoram2[(tile_index*2)+1] & 0xc0)>>6;
+
+	tileinfo.set(2,tile,attr,TILE_FLIPYX(fx));
+}
+
+uint32_t splashms_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+//  bitmap.fill(0, cliprect);
+
+	for (int y = 0; y < 256; y++)
+	{
+		uint16_t* dst = &bitmap.pix16(y);
+
+		for (int x = 0; x < 512; x++)
+		{
+			uint8_t pix = m_bitmapram[(y * 512) + x];
+			//if (pix)
+			dst[x] = pix + 0x100;
+		}
+	}
+
+	m_bg_tilemap2->set_scrollx(0, 64-(m_scrollregs[0]-0x2));
+	m_bg_tilemap2->set_scrolly(0, -m_scrollregs[1]);
+
+	m_bg_tilemap->set_scrollx(0, 64-(m_scrollregs[2]));
+	m_bg_tilemap->set_scrolly(0, -m_scrollregs[3]);
+
+	m_bg_tilemap2->draw(screen, bitmap, cliprect, 0, 0);
+
+	// TODO, convert to device, share between Modualar System games
+	const int NUM_SPRITES = 0x100;
+	const int X_EXTRA_OFFSET = 64;
+
+	for (int i = NUM_SPRITES-2; i >= 0; i-=2)
+	{
+		gfx_element *gfx = m_gfxdecode->gfx(0);
+
+		uint16_t attr0 = m_spriteram[i + 0];
+		uint16_t attr1 = m_spriteram[i + 1];
+
+		uint16_t attr2 = m_spriteram[i + NUM_SPRITES];
+		//uint16_t attr3 = m_spriteram[i + NUM_SPRITES+1]; // unused?
+
+		int ypos = attr0 & 0x00ff;
+		int xpos = (attr1 & 0xff00)>>8;
+		xpos |= (attr2 & 0x8000) ? 0x100 : 0x000;
+
+		ypos = (0xff - ypos);
+		ypos |= (attr2 & 0x4000) ? 0x100 : 0x000; // maybe
+
+		int tile = (attr0 & 0xff00) >> 8;
+		tile |= (attr1 & 0x003f) << 8;
+
+		int flipx = (attr1 & 0x0040);
+		int flipy = (attr1 & 0x0080);
+
+		gfx->transpen(bitmap,cliprect,tile,(attr2&0x0f00)>>8,flipx,flipy,xpos-16-X_EXTRA_OFFSET,ypos-16,15);
+	}
+
+	m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
+
+	return 0;
+}
+
+void splashms_state::video_start()
+{
+	m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(splashms_state::get_tile_info_tilemap1)), TILEMAP_SCAN_ROWS,  8,  8, 64, 32);
+	m_bg_tilemap2 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(splashms_state::get_tile_info_tilemap2)), TILEMAP_SCAN_ROWS,  16,  16, 64, 32);
+
+	m_bg_tilemap->set_transparent_pen(15);
+	m_bg_tilemap2->set_transparent_pen(0);
+
+}
+
+
+void splashms_state::splashms_map(address_map &map)
+{
+	map(0x000000, 0x03ffff).rom(); // writes to 0x030000 on startup
+
+	map(0x080000, 0x081fff).ram().w(FUNC(splashms_state::vram_w)).share("videoram");
+
+	map(0x08e000, 0x08ffff).rw(FUNC(splashms_state::vram2_r), FUNC(splashms_state::vram2_w)); // mirror needed for paint dripping in attract
+	map(0x090000, 0x091fff).ram().rw(FUNC(splashms_state::vram2_r), FUNC(splashms_state::vram2_w)).share("videoram2");
+
+	map(0x0a0000, 0x0a1fff).ram(); // writes unused data from vram2 area here, but isn't a mirror (eg. has large paint can from attract during gameplay) unused?
+
+	map(0x0c0000, 0x0c000f).ram().share("scrollregs"); // scroll vals
+
+	map(0x100000, 0x1007ff).ram().share("spriteram");
+
+	map(0x200000, 0x200fff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
+
+	map(0x400000, 0x400001).portr("IN0");
+	map(0x400002, 0x400003).portr("IN1");
+	map(0x400004, 0x400005).w(FUNC(splashms_state::to_subcpu_0x400004_w));
+	map(0x400006, 0x400007).portr("IN3");
+	map(0x400008, 0x400009).portr("IN4"); // service mode in here
+
+	map(0x40000c, 0x40000d).r(FUNC(splashms_state::unknown_0x40000c_r));
+
+	map(0x40000e, 0x40000e).w(m_soundlatch, FUNC(generic_latch_8_device::write));
+
+	map(0xff0000, 0xffffff).ram();
+}
+
+void splashms_state::sub_portmap(address_map &map)
+{
+	map.global_mask(0xff);
+	map(0x01, 0x01).w(FUNC(splashms_state::sub_rambankselect_w)); // banking for 0x4000-0x7fff RAM
+	map(0x02, 0x02).w(FUNC(splashms_state::sub_rombankselect_w)); // banking for 0x8000-0xffff ROM
+
+	map(0x03, 0x03).r(FUNC(splashms_state::frommain_command_r));
+}
+
+void splashms_state::sub_map(address_map &map)
+{
+	map(0x0000, 0x0fff).rom();
+	map(0x4000, 0x7fff).m(m_subram, FUNC(address_map_bank_device::amap8));
+	map(0x8000, 0xffff).m(m_subrom, FUNC(address_map_bank_device::amap8));
+}
+
+
+void splashms_state::sound_map(address_map &map)
+{
+	map(0x0000, 0xdfff).rom();
+
+	map(0xe000, 0xe000).w(FUNC(splashms_state::splash_adpcm_control_w));
+	map(0xe400, 0xe400).w(FUNC(splashms_state::splash_adpcm_data_w));
+
+	map(0xe800, 0xe801).rw("ymsnd", FUNC(ym3812_device::read), FUNC(ym3812_device::write));
+
+	map(0xf000, 0xf7ff).ram();
+	map(0xf800, 0xf800).r(m_soundlatch, FUNC(generic_latch_8_device::read));
+}
+
+void splashms_state::machine_start()
+{
+}
+
+void splashms_state::machine_reset()
+{
+	m_subcmd = 0;
+	m_subram->set_bank(0);
+	m_subrom->set_bank(0);
+}
+
+
+
+static INPUT_PORTS_START( splashms )
+	PORT_START("IN0")
+	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START1 )
+	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN1 )
+
+	PORT_START("IN1")
+	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_8WAY PORT_PLAYER(1)
+	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_START2 )
+	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
+
+	PORT_START("IN3")
+	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_DIPNAME( 0x0100, 0x0100, DEF_STR( Unused ) )
+	PORT_DIPSETTING(      0x0100, DEF_STR( Off ) )
+	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
+	PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unused ) )
+	PORT_DIPSETTING(      0x0200, DEF_STR( Off ) )
+	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
+	PORT_DIPNAME( 0x1c00, 0x1c00, DEF_STR( Coin_A ) )
+	PORT_DIPSETTING(      0x0000, "0" )
+	PORT_DIPSETTING(      0x0400, "1" )
+	PORT_DIPSETTING(      0x0800, "2" )
+	PORT_DIPSETTING(      0x0c00, "3" )
+	PORT_DIPSETTING(      0x1000, "4" )
+	PORT_DIPSETTING(      0x1400, "5" )
+	PORT_DIPSETTING(      0x1800, "6" )
+	PORT_DIPSETTING(      0x1c00, "7" )
+	PORT_DIPNAME( 0xe000, 0xe000, DEF_STR( Coin_B ) )
+	PORT_DIPSETTING(      0x0000, "0" )
+	PORT_DIPSETTING(      0x2000, "1" )
+	PORT_DIPSETTING(      0x4000, "2" )
+	PORT_DIPSETTING(      0x6000, "3" )
+	PORT_DIPSETTING(      0x8000, "4" )
+	PORT_DIPSETTING(      0xa000, "5" )
+	PORT_DIPSETTING(      0xc000, "6" )
+	PORT_DIPSETTING(      0xe000, "7" )
+
+	PORT_START("IN4")
+	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_DIPNAME( 0x0100, 0x0100,  DEF_STR( Demo_Sounds ) )
+	PORT_DIPSETTING(      0x0100, DEF_STR( Off ) )
+	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
+	PORT_DIPNAME( 0x0200, 0x0200, DEF_STR( Unused ) )
+	PORT_DIPSETTING(      0x0200, DEF_STR( Off ) )
+	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
+	PORT_SERVICE( 0x0400, IP_ACTIVE_LOW )
+	PORT_DIPNAME( 0x0800, 0x0800, DEF_STR( Unused ) )
+	PORT_DIPSETTING(      0x0800, DEF_STR( Off ) )
+	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
+	PORT_DIPNAME( 0x3000, 0x3000, DEF_STR( Difficulty ) )
+	PORT_DIPSETTING(      0x1000, DEF_STR( Easy ) )
+	PORT_DIPSETTING(      0x3000, DEF_STR( Normal ) )
+	PORT_DIPSETTING(      0x2000, DEF_STR( Hard ) )
+	PORT_DIPSETTING(      0x0000, DEF_STR( Hardest ) )
+	PORT_DIPNAME( 0xc000, 0xc000, DEF_STR( Lives ) )
+	PORT_DIPSETTING(      0x0000, DEF_STR( Free_Play ) )
+	PORT_DIPSETTING(      0x4000, "1" )
+	PORT_DIPSETTING(      0x8000, "2" )
+	PORT_DIPSETTING(      0xc000, "3" )
+INPUT_PORTS_END
+
+static const gfx_layout tiles16x16x4_layout =
+{
+	16,16,
+	RGN_FRAC(1,1),
+	4,
+	{ 0,8,16,24 },
+	{ 0,1,2,3,4,5,6,7, 512,513,514,515,516,517,518,519 },
+	{ STEP16(0,32) },
+	16 * 16 * 4
+};
+
+static const gfx_layout tiles8x8x4_layout =
+{
+	8,8,
+	RGN_FRAC(1,1),
+	4,
+	{ 0,8,16,24 },
+	{ 0,1,2,3,4,5,6,7 },
+	{ STEP8(0,32) },
+	16 * 16
+};
+
+
+static GFXDECODE_START( gfx_splashms )
+	GFXDECODE_ENTRY( "sprites", 0, tiles16x16x4_layout, 0x200, 16 )
+	GFXDECODE_ENTRY( "fgtile", 0, tiles8x8x4_layout, 0, 16 )
+	GFXDECODE_ENTRY( "bgtile", 0, tiles16x16x4_layout, 0, 16 )
+GFXDECODE_END
+
+void splashms_state::splash_adpcm_data_w(uint8_t data)
+{
+	m_adpcm_data = data;
+}
+
+void splashms_state::splash_adpcm_control_w(uint8_t data)
+{
+	m_msm->reset_w(BIT(data, 7));
+}
+
+WRITE_LINE_MEMBER(splashms_state::splash_msm5205_int)
+{
+	m_msm->data_w(m_adpcm_data >> 4);
+	m_adpcm_data = (m_adpcm_data << 4) & 0xf0;
+}
+
+void splashms_state::subrambank_map(address_map &map)
+{
+	map(0x00000, 0x1ffff).ram().share("bitmapram");
+}
+
+void splashms_state::subrombank_map(address_map &map)
+{
+	map(0x000000, 0x3fffff).rom().region("subcpu", 0x000000);
+}
+
+
+void splashms_state::splashms(machine_config &config)
+{
+	/* basic machine hardware */
+	M68000(config, m_maincpu, 20_MHz_XTAL/2);
+	m_maincpu->set_addrmap(AS_PROGRAM, &splashms_state::splashms_map);
+	m_maincpu->set_vblank_int("screen", FUNC(splashms_state::irq4_line_hold));
+
+	Z80(config, m_subcpu, 12_MHz_XTAL/2);
+	m_subcpu->set_addrmap(AS_PROGRAM, &splashms_state::sub_map);
+	m_subcpu->set_addrmap(AS_IO, &splashms_state::sub_portmap);
+
+	ADDRESS_MAP_BANK(config, m_subram).set_map(&splashms_state::subrambank_map).set_options(ENDIANNESS_LITTLE, 8, 17, 0x4000);
+	ADDRESS_MAP_BANK(config, m_subrom).set_map(&splashms_state::subrombank_map).set_options(ENDIANNESS_LITTLE, 8, 22, 0x8000);
+
+
+	Z80(config, m_soundcpu, 16_MHz_XTAL/4);
+	m_soundcpu->set_addrmap(AS_PROGRAM, &splashms_state::sound_map);
+	m_soundcpu->set_periodic_int(FUNC(splashms_state::nmi_line_pulse), attotime::from_hz(60*64));
+
+	/* video hardware */
+	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+	m_screen->set_refresh_hz(60);
+	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500) /* not accurate */);
+	m_screen->set_size(512, 256);
+	m_screen->set_visarea(16, (16+368)-1, 0, 256-16-1);
+	m_screen->set_screen_update(FUNC(splashms_state::screen_update));
+	m_screen->set_palette(m_palette);
+
+	PALETTE(config, m_palette).set_format(palette_device::xBRG_444, 0x800);
+
+	GFXDECODE(config, m_gfxdecode, "palette", gfx_splashms);
+
+	GENERIC_LATCH_8(config, m_soundlatch);
+	m_soundlatch->data_pending_callback().set_inputline(m_soundcpu, INPUT_LINE_IRQ0);
+
+	/* sound hardware */
+	SPEAKER(config, "mono").front_center();
+
+	YM3812(config, "ymsnd", XTAL(16'000'000)/4).add_route(ALL_OUTPUTS, "mono", 0.80);
+
+	MSM5205(config, m_msm, XTAL(384'000));
+	m_msm->vck_legacy_callback().set(FUNC(splashms_state::splash_msm5205_int));
+	m_msm->set_prescaler_selector(msm5205_device::S48_4B);
+	m_msm->add_route(ALL_OUTPUTS, "mono", 0.80);
+}
+
+// reorganize graphics into something we can decode with a single pass
+void splashms_state::descramble_16x16tiles(uint8_t* src, int len)
+{
+	std::vector<uint8_t> buffer(len);
+	{
+		for (int i = 0; i < len; i++)
+		{
+			int j = bitswap<20>(i, 19,18,17,16,15,12,11,10,9,8,7,6,5,14,13,4,3,2,1,0);
+			buffer[j] = src[i];
+		}
+
+		std::copy(buffer.begin(), buffer.end(), &src[0]);
+	}
+}
+
+void splashms_state::init_splashms()
+{
+	descramble_16x16tiles(memregion("bgtile")->base(), memregion("bgtile")->bytes());
+	// fgtile is 8x8 tiles
+}
+
+
+
+ROM_START( splashms )
+	ROM_REGION( 0x040000, "maincpu", 0 )
+	ROM_LOAD16_BYTE( "cpu1_6-1_sp_608a.ic8",  0x000001, 0x020000, CRC(befdbaf0) SHA1(94efdeec1e1311317ffd0fe3d5fdbb02e151b985) )
+	ROM_LOAD16_BYTE( "cpu1_6-1_sp_617a.ic17", 0x000000, 0x020000, CRC(080edb2b) SHA1(6104345bc72cd20051d66c04b97c9a365a88ec3f) )
+
+	ROM_REGION( 0x400000, "subcpu", ROMREGION_ERASE00 ) // extra Z80 for backgrounds!
+	ROM_LOAD( "cpu2_c_sp_c2.ic2", 0x000000, 0x080000, CRC(3a0be09f) SHA1(83abc10ff2c810c8451f583700f140f569e5b6ee) )
+	ROM_LOAD( "cpu2_c_sp_c3.ic3", 0x080000, 0x080000, CRC(c3dc5e9d) SHA1(ce5fb65935cfe225132242e058cd63fa33f9da63) )
+	ROM_LOAD( "cpu2_c_sp_c4.ic4", 0x100000, 0x080000, CRC(4d7b643d) SHA1(40bdcf7eedddc3244cb41530d10009b23b7ac473) )
+	ROM_LOAD( "cpu2_c_sp_c5.ic5", 0x180000, 0x080000, CRC(7ba31717) SHA1(000cf6ec261ac90efc3e4f2dbf6720a54fb3bbdb) )
+	ROM_LOAD( "cpu2_c_sp_c6.ic6", 0x200000, 0x080000, CRC(994e8e16) SHA1(cbe7d9e192d0390b123f1b585a0463634f33b485) )
+	ROM_LOAD( "cpu2_c_sp_c7.ic7", 0x280000, 0x080000, CRC(6ea0be42) SHA1(5cc45ef1f3c8f46e1e7b3ad3313d221a65fb0025) )
+
+	ROM_REGION( 0x010000, "soundcpu", 0 )
+	ROM_LOAD( "snd_9-2_sp_916.ic6", 0x000000, 0x010000, CRC(5567fa22) SHA1(3993c733a0222ca292b60f409c78b45280a5fec6) )
+
+	ROM_REGION( 0x40000, "fgtile", ROMREGION_ERASEFF )
+	ROM_LOAD32_BYTE( "8_sp_837.ic37", 0x000000, 0x010000, CRC(3b544131) SHA1(e7fd97cb24b84739f2481efb1d232f86df4a3d8d) ) // 1xxxxxxxxxxxxxxx = 0xFF
+	ROM_LOAD32_BYTE( "8_sp_830.ic30", 0x000001, 0x010000, CRC(09bb675b) SHA1(49c41ccfce1b0077c430c6bb38bc858aeaf87fb8) ) // has some garbage in the blank space of the paired ROMs
+	ROM_LOAD32_BYTE( "8_sp_822.ic22", 0x000002, 0x010000, CRC(621fcf26) SHA1(a7ff6b12fbbea1bba7c4a397a82ac2fb5c09558a) ) // 1xxxxxxxxxxxxxxx = 0xFF
+	ROM_LOAD32_BYTE( "8_sp_815.ic15", 0x000003, 0x010000, CRC(5641b621) SHA1(e71df1ab5c9b2254495d99657477b52e8843d128) ) // 1xxxxxxxxxxxxxxx = 0xFF
+
+	ROM_REGION( 0x080000, "sprites", ROMREGION_ERASEFF | ROMREGION_INVERT )
+	ROM_LOAD32_BYTE( "5-1_sp_524.ic24", 0x000000, 0x010000, CRC(841c24c1) SHA1(70cb26033999f8184c51849e00bfcb2270f646e8) )
+	ROM_LOAD32_BYTE( "5-1_sp_518.ic18", 0x000001, 0x010000, CRC(499cb813) SHA1(4d22e58530ff8a85b7ffc8ae1ab5986215986b49) )
+	ROM_LOAD32_BYTE( "5-1_sp_512.ic12", 0x000002, 0x010000, CRC(8cb0b132) SHA1(894f84b6a8171ed8c22298ebf1303da020f747ee) )
+	ROM_LOAD32_BYTE( "5-1_sp_503.ic3",  0x000003, 0x010000, CRC(ace09666) SHA1(d223718118b9912643d320832414df942e411e70) )
+	ROM_LOAD32_BYTE( "5-1_sp_525.ic25", 0x040000, 0x010000, CRC(46bde779) SHA1(b4e1dd1952276c2d2a8f3c150d1ba2a1c2b738b7) ) // 11xxxxxxxxxxxxxx = 0xFF
+	ROM_LOAD32_BYTE( "5-1_sp_519.ic19", 0x040001, 0x010000, CRC(69cc9e06) SHA1(85e1495d01e6986f9cd88d6cdbef194c623be111) ) // 11xxxxxxxxxxxxxx = 0xFF
+	ROM_LOAD32_BYTE( "5-1_sp_513.ic13", 0x040002, 0x010000, CRC(659d206f) SHA1(fc8e9ea2d45df83509de3986763cbfc0d4745983) ) // has some garbage in the blank space of the paired ROMs
+	ROM_LOAD32_BYTE( "5-1_sp_504.ic4",  0x040003, 0x010000, CRC(b6806390) SHA1(d95247bcd90bd7b7be355c267f023c19a9d60f66) ) // 11xxxxxxxxxxxxxx = 0xFF
+
+	ROM_REGION( 0x080000, "bgtile", ROMREGION_ERASEFF )
+	ROM_LOAD32_BYTE( "8_sp_833.ic33", 0x000000, 0x020000, CRC(8ac7cd1f) SHA1(aad88db9a82f417774f1d5eef830cc97c0d4b0de) ) // 111xxxxxxxxxxxxxx = 0xFF
+	ROM_LOAD32_BYTE( "8_sp_826.ic26", 0x000001, 0x020000, CRC(b7ec71d8) SHA1(3d4b62559c0ba688b94e605594f3e8e9f2cbefa2) ) // 111xxxxxxxxxxxxxx = 0xFF
+	ROM_LOAD32_BYTE( "8_sp_818.ic18", 0x000002, 0x020000, CRC(ae62a832) SHA1(f825a186e25a1c292aa6f880055341ec14373c0b) ) // 111xxxxxxxxxxxxxx = 0xFF
+	ROM_LOAD32_BYTE( "8_sp_811.ic11", 0x000003, 0x020000, CRC(02e474b4) SHA1(11446655cb73ec4961339fa4ee41200f8b2b81d3) ) // 111xxxxxxxxxxxxxx = 0xFF
+
+
+	ROM_REGION( 0x100, "prom", ROMREGION_ERASEFF )
+	ROM_LOAD( "51-3_502_82s129.ic10",      0x000, 0x100, CRC(15085e44) SHA1(646e7100fcb112594023cf02be036bd3d42cc13c) ) // common PROM found on all? Modular System sets?
+
+	ROM_REGION( 0x100, "protgal", 0 ) // all read protected
+	ROM_LOAD( "5-1_5150_gal16v8as.ic9", 0, 1, NO_DUMP )
+	ROM_LOAD( "5-1_5250_gal16v8as.ic8", 0, 1, NO_DUMP )
+	ROM_LOAD( "7-4_7150_gal20v8as.ic7", 0, 1, NO_DUMP )
+	ROM_LOAD( "7-4_7250_gal20v8as.ic54", 0, 1, NO_DUMP )
+	ROM_LOAD( "7-4_7350_gal16v8as.ic5", 0, 1, NO_DUMP )
+	ROM_LOAD( "7-4_7450_gal16v8as.ic9", 0, 1, NO_DUMP )
+	ROM_LOAD( "7-4_7550_gal16v8as.ic59", 0, 1, NO_DUMP )
+	ROM_LOAD( "7-4_7650_gal20v8as.ic44", 0, 1, NO_DUMP )
+	ROM_LOAD( "51-3_503_gal16v8.ic46", 0, 1, NO_DUMP )
+	ROM_LOAD( "cpu1_6-1_605_gal16v8as.ic13", 0, 1, NO_DUMP )
+	ROM_LOAD( "cpu1_6-1_650_gal16v8as.ic7", 0, 1, NO_DUMP )
+	ROM_LOAD( "cpu2_c_c50_gal16v8as.ic10", 0, 1, NO_DUMP )
+	ROM_LOAD( "snd_9-2_9159_gal16v8as.ic42", 0, 1, NO_DUMP )
+	ROM_LOAD( "snd_9-2_9250_gal20v8as.ic18", 0, 1, NO_DUMP )
+	ROM_LOAD( "snd_9-2_9359_gal16v8as.ic10", 0, 1, NO_DUMP )
+ROM_END
+
+GAME( 1992, splashms,  splash,  splashms,  splashms,  splashms_state, init_splashms, ROT0, "Gaelco", "Splash (Modular System)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/srmp6.cpp mame-0.224+dfsg.1/src/mame/drivers/srmp6.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/srmp6.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/srmp6.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -97,6 +97,12 @@
 	{ }
 
 	void srmp6(machine_config &config);
+
+protected:
+	virtual void machine_start() override;
+	virtual void video_start() override;
+	virtual void device_post_load() override { m_gfxdecode->gfx(0)->mark_all_dirty(); }
+
 private:
 	std::unique_ptr<u16[]> m_tileram;
 	required_shared_ptr<u16> m_chrram;
@@ -107,8 +113,8 @@
 	required_memory_bank m_nile_bank;
 	required_ioport_array<4> m_key_io;
 
-	int m_brightness;
-	u16 m_input_select;
+	u16 m_brightness;
+	u8 m_input_select;
 
 	u16 m_lastb;
 	u16 m_lastb2;
@@ -123,8 +129,7 @@
 	void tileram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
 	void paletteram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
 	u16 irq_ack_r();
-	virtual void machine_start() override;
-	virtual void video_start() override;
+
 	u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	void update_palette();
 	u32 process(u8 b,u32 dst_offset);
@@ -170,9 +175,9 @@
 
 	for (int i = 0; i < m_palette->entries(); i++)
 	{
-		u8 r = m_palette->basemem().read16(i) >>  0 & 0x1F;
-		u8 g = m_palette->basemem().read16(i) >>  5 & 0x1F;
-		u8 b = m_palette->basemem().read16(i) >> 10 & 0x1F;
+		u8 r = m_palette->basemem().read16(i) >>  0 & 0x1f;
+		u8 g = m_palette->basemem().read16(i) >>  5 & 0x1f;
+		u8 b = m_palette->basemem().read16(i) >> 10 & 0x1f;
 
 		if (brg & 0x40)
 		{
@@ -189,7 +194,7 @@
 	m_tileram = make_unique_clear<u16[]>(0x100000*16/2);
 	m_dmaram.allocate(0x100/2);
 
-	/* create the char set (gfx will then be updated dynamically from RAM) */
+	// create the char set (gfx will then be updated dynamically from RAM)
 	m_gfxdecode->set_gfx(0, std::make_unique<gfx_element>(m_palette, tiles8x8_layout, (u8*)m_tileram.get(), 0, m_palette->entries() / 256, 0));
 	m_gfxdecode->gfx(0)->set_granularity(256);
 
@@ -197,6 +202,9 @@
 
 	save_pointer(NAME(m_tileram), 0x100000*16/2);
 	save_item(NAME(m_brightness));
+	save_item(NAME(m_destl));
+	save_item(NAME(m_lastb));
+	save_item(NAME(m_lastb2));
 }
 
 #if 0
@@ -219,7 +227,7 @@
 	bitmap.fill(0, cliprect);
 
 #if 0
-	/* debug */
+	//debug
 	if (machine().input().code_pressed_once(KEYCODE_Q))
 	{
 		++xixi;
@@ -233,7 +241,7 @@
 	}
 #endif
 
-	/* Main spritelist is 0x0000 - 0x1fff in spriteram, sublists follow */
+	// Main spritelist is 0x0000 - 0x1fff in spriteram, sublists follow
 	while (mainlist_offset<0x2000/2)
 	{
 		u16 *sprite_sublist = &sprite_list[sprite_list[mainlist_offset+1]<<3];
@@ -241,7 +249,7 @@
 		s16 global_x,global_y, flip_x, flip_y;
 		u16 global_pal;
 
-		/* end of list marker */
+		// end of list marker
 		if (sprite_list[mainlist_offset+0] == 0x8000)
 			break;
 
@@ -256,7 +264,7 @@
 
 			if ((sprite_list[mainlist_offset+5] & 0x700) == 0x700)
 			{
-				alpha = pal5bit(sprite_list[mainlist_offset+5] & 0x1F);
+				alpha = pal5bit(sprite_list[mainlist_offset+5] & 0x1f);
 			}
 			else
 			{
@@ -374,7 +382,7 @@
 			}
 			break;
 
-		/* unknown registers - there are others */
+		// unknown registers - there are others
 
 		// set by IT4 (jsr $b3c), according flip screen dsw
 		case 0x48/2: //     0 /  0xb0 if flipscreen
@@ -398,7 +406,7 @@
 }
 
 
-/* DMA RLE stuff - the same as CPS3 */
+// DMA RLE stuff - the same as CPS3
 u32 srmp6_state::process(u8 b,u32 dst_offset)
 {
 	int l = 0;
@@ -435,34 +443,32 @@
 
 void srmp6_state::dma_w(offs_t offset, u16 data, u16 mem_mask)
 {
-	u16* dmaram = m_dmaram;
-
-	COMBINE_DATA(&dmaram[offset]);
-	if (offset==13 && dmaram[offset]==0x40)
+	COMBINE_DATA(&m_dmaram[offset]);
+	if (offset==13 && m_dmaram[offset]==0x40)
 	{
-		u32 srctab=2*((((u32)dmaram[5])<<16)|dmaram[4]);
-		u32 srcdata=2*((((u32)dmaram[11])<<16)|dmaram[10]);
-		u32 len=4*(((((u32)dmaram[7]&3)<<16)|dmaram[6])+1); //??? WRONG!
+		u32 srctab=2*((((u32)m_dmaram[5])<<16)|m_dmaram[4]);
+		u32 srcdata=2*((((u32)m_dmaram[11])<<16)|m_dmaram[10]);
+		u32 len=4*(((((u32)m_dmaram[7]&3)<<16)|m_dmaram[6])+1); //??? WRONG!
 		int tempidx = 0;
 
-		/* show params */
+		// show params
 		LOG(("DMA! %04x %04x %04x %04x %04x %04x %04x %04x %04x %04x %04x %04x %04x %04x\n",
-				dmaram[0x00/2],
-				dmaram[0x02/2],
-				dmaram[0x04/2],
-				dmaram[0x06/2],
-				dmaram[0x08/2],
-				dmaram[0x0a/2],
-				dmaram[0x0c/2],
-				dmaram[0x0e/2],
-				dmaram[0x10/2],
-				dmaram[0x12/2],
-				dmaram[0x14/2],
-				dmaram[0x16/2],
-				dmaram[0x18/2],
-				dmaram[0x1a/2]));
+				m_dmaram[0x00/2],
+				m_dmaram[0x02/2],
+				m_dmaram[0x04/2],
+				m_dmaram[0x06/2],
+				m_dmaram[0x08/2],
+				m_dmaram[0x0a/2],
+				m_dmaram[0x0c/2],
+				m_dmaram[0x0e/2],
+				m_dmaram[0x10/2],
+				m_dmaram[0x12/2],
+				m_dmaram[0x14/2],
+				m_dmaram[0x16/2],
+				m_dmaram[0x18/2],
+				m_dmaram[0x1a/2]));
 
-		m_destl = dmaram[9]*0x40000;
+		m_destl = m_dmaram[9]*0x40000;
 
 		m_lastb = 0xfffe;
 		m_lastb2 = 0xffff;
@@ -502,7 +508,7 @@
 	}
 }
 
-/* if tileram is actually bigger than the mapped area, how do we access the rest? */
+// if tileram is actually bigger than the mapped area, how do we access the rest?
 u16 srmp6_state::tileram_r(offs_t offset)
 {
 	return m_chrram[offset];
@@ -513,11 +519,11 @@
 	//u16 tmp;
 	COMBINE_DATA(&m_chrram[offset]);
 
-	/* are the DMA registers enabled some other way, or always mapped here, over RAM? */
+	// are the DMA registers enabled some other way, or always mapped here, over RAM?
 	if (offset >= 0xfff00/2 && offset <= 0xfff1a/2 )
 	{
 		offset &=0x1f;
-		dma_w(offset,data,mem_mask);
+		dma_w(offset ,data, mem_mask);
 	}
 }
 
@@ -529,9 +535,9 @@
 
 	if (brg & 0x40)
 	{
-		u8 r = m_palette->basemem().read16(offset) >>  0 & 0x1F;
-		u8 g = m_palette->basemem().read16(offset) >>  5 & 0x1F;
-		u8 b = m_palette->basemem().read16(offset) >> 10 & 0x1F;
+		u8 r = m_palette->basemem().read16(offset) >>  0 & 0x1f;
+		u8 g = m_palette->basemem().read16(offset) >>  5 & 0x1f;
+		u8 b = m_palette->basemem().read16(offset) >> 10 & 0x1f;
 
 		r = get_fade(r, brg);
 		g = get_fade(g, brg);
@@ -561,18 +567,18 @@
 
 	map(0x480000, 0x480fff).ram().w(FUNC(srmp6_state::paletteram_w)).share("palette");
 
-	map(0x4c0000, 0x4c006f).rw(FUNC(srmp6_state::video_regs_r), FUNC(srmp6_state::video_regs_w)).share("video_regs");    // ? gfx regs ST-0026 NiLe
+	map(0x4c0000, 0x4c006f).rw(FUNC(srmp6_state::video_regs_r), FUNC(srmp6_state::video_regs_w)).share(m_video_regs);    // ? gfx regs ST-0026 NiLe
 	map(0x4d0000, 0x4d0001).r(FUNC(srmp6_state::irq_ack_r));
 	map(0x4e0000, 0x4e00ff).rw("nile", FUNC(nile_device::nile_snd_r), FUNC(nile_device::nile_snd_w));
 	map(0x4e0100, 0x4e0101).rw("nile", FUNC(nile_device::nile_sndctrl_r), FUNC(nile_device::nile_sndctrl_w));
 	//map(0x4e0110, 0x4e0111).noprw(); // ? accessed once ($268dc, written $b.w)
 
 	// CHR RAM: checked [$500000-$5fffff]
-	map(0x500000, 0x5fffff).rw(FUNC(srmp6_state::tileram_r), FUNC(srmp6_state::tileram_w)).share("chrram");
+	map(0x500000, 0x5fffff).rw(FUNC(srmp6_state::tileram_r), FUNC(srmp6_state::tileram_w)).share(m_chrram);
 	//map(0x5fff00, 0x5fff1f).ram(); // ? see routine $5ca8, video_regs related ???
-	//map(0x5fff00, 0x5fffff).w(FUNC(srmp6_state::dma_w)).share("dmaram");
+	//map(0x5fff00, 0x5fffff).w(FUNC(srmp6_state::dma_w)).share(m_dmaram);
 
-	map(0x600000, 0x7fffff).bankr("nile_bank");    // banked ROM (used by ROM check)
+	map(0x600000, 0x7fffff).bankr(m_nile_bank);    // banked ROM (used by ROM check)
 	map(0x800000, 0x9fffff).rom().region("user1", 0);
 	//map(0xf00004, 0xf00005).ram(); // ?
 	//map(0xf00006, 0xf00007).ram(); // ?
@@ -587,7 +593,7 @@
 static INPUT_PORTS_START( srmp6 )
 
 	PORT_START("KEY0")
-	PORT_BIT( 0xfe01, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded
+	PORT_BIT( 0xfe01, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitly discarded
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_A )
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_E )
 	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_I )
@@ -598,7 +604,7 @@
 	PORT_SERVICE_NO_TOGGLE( 0x0100, IP_ACTIVE_LOW )
 
 	PORT_START("KEY1")
-	PORT_BIT( 0xfe41, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded
+	PORT_BIT( 0xfe41, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitly discarded
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_B )
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_F )
 	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_J )
@@ -607,7 +613,7 @@
 	PORT_BIT( 0x0180, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("KEY2")
-	PORT_BIT( 0xfe41, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded
+	PORT_BIT( 0xfe41, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitly discarded
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_C )
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_G )
 	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_K )
@@ -616,14 +622,14 @@
 	PORT_BIT( 0x0180, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_START("KEY3")
-	PORT_BIT( 0xfe61, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitely discarded
+	PORT_BIT( 0xfe61, IP_ACTIVE_LOW, IPT_UNUSED ) // explicitly discarded
 	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_MAHJONG_D )
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_MAHJONG_H )
 	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_MAHJONG_L )
 	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_MAHJONG_PON )
 	PORT_BIT( 0x0180, IP_ACTIVE_LOW, IPT_UNUSED )
 
-	PORT_START("DSW")   /* 16-bit DSW1 (0x0000) +DSW2 (0x0700) */
+	PORT_START("DSW")   // 16-bit DSW1 (0x0000) +DSW2 (0x0700)
 	PORT_DIPNAME( 0x0007, 0x0007, DEF_STR( Coinage ) )      PORT_DIPLOCATION("DSW1:1,2,3")
 	PORT_DIPSETTING(      0x0000, DEF_STR( 5C_1C ) )
 	PORT_DIPSETTING(      0x0001, DEF_STR( 4C_1C ) )
@@ -695,7 +701,7 @@
 
 	BUFFERED_SPRITERAM16(config, m_sprram);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "lspeaker").front_left();
 	SPEAKER(config, "rspeaker").front_right();
 
@@ -710,15 +716,15 @@
 ***************************************************************************/
 
 ROM_START( srmp6 )
-	ROM_REGION( 0x100000, "maincpu", 0 ) /* 68000 Code */
+	ROM_REGION( 0x100000, "maincpu", 0 ) // 68000 Code
 	ROM_LOAD16_BYTE( "sx011-10.4", 0x000001, 0x080000, CRC(8f4318a5) SHA1(44160968cca027b3d42805f2dd42662d11257ef6) )
 	ROM_LOAD16_BYTE( "sx011-11.5", 0x000000, 0x080000, CRC(7503d9cf) SHA1(03ab35f13b6166cb362aceeda18e6eda8d3abf50) )
 
-	ROM_REGION16_BE( 0x200000, "user1", 0 ) /* 68000 Data */
+	ROM_REGION16_BE( 0x200000, "user1", 0 ) // 68000 Data
 	ROM_LOAD16_WORD_SWAP( "sx011-09.10", 0x000000, 0x200000, CRC(58f74438) SHA1(a256e39ca0406e513ab4dbd812fb0b559b4f61f2) )
 
-	/* these are accessed directly by the 68k, DMA device etc.  NOT decoded */
-	ROM_REGION( 0x2000000, "nile", 0)   /* Banked ROM */
+	// these are accessed directly by the 68k, DMA device etc.  NOT decoded
+	ROM_REGION( 0x2000000, "nile", 0)   // Banked ROM
 	ROM_LOAD16_WORD_SWAP( "sx011-08.15", 0x0000000, 0x0400000, CRC(01b3b1f0) SHA1(bbd60509c9ba78358edbcbb5953eafafd6e2eaf5) ) // CHR00
 	ROM_LOAD16_WORD_SWAP( "sx011-07.16", 0x0400000, 0x0400000, CRC(26e57dac) SHA1(91272268977c5fbff7e8fbe1147bf108bd2ed321) ) // CHR01
 	ROM_LOAD16_WORD_SWAP( "sx011-06.17", 0x0800000, 0x0400000, CRC(220ee32c) SHA1(77f39b54891c2381b967534b0f6d380962eadcae) ) // CHR02
@@ -735,4 +741,4 @@
     Game driver(s)
 ***************************************************************************/
 
-GAME( 1995, srmp6, 0, srmp6, srmp6, srmp6_state, empty_init, ROT0, "Seta", "Super Real Mahjong P6 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND)
+GAME( 1995, srmp6, 0, srmp6, srmp6, srmp6_state, empty_init, ROT0, "Seta", "Super Real Mahjong P6 (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/sspeedr.cpp mame-0.224+dfsg.1/src/mame/drivers/sspeedr.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/sspeedr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/sspeedr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,12 +2,14 @@
 // copyright-holders:Stefan Jokisch
 /***************************************************************************
 
-Taito Super Speed Race driver
+Taito / Midway Super Speed Race driver
 
 ***************************************************************************/
 
 #include "emu.h"
 #include "includes/sspeedr.h"
+#include "audio/nl_sspeedr.h"
+#include "speaker.h"
 
 #include "cpu/z80/z80.h"
 #include "machine/watchdog.h"
@@ -17,7 +19,7 @@
 
 
 
-void sspeedr_state::sspeedr_palette(palette_device &palette) const
+void sspeedr_state::palette(palette_device &palette) const
 {
 	for (int i = 0; i < 16; i++)
 	{
@@ -37,13 +39,13 @@
 }
 
 
-void sspeedr_state::sspeedr_int_ack_w(uint8_t data)
+void sspeedr_state::int_ack_w(uint8_t data)
 {
 	m_maincpu->set_input_line(0, CLEAR_LINE);
 }
 
 
-void sspeedr_state::sspeedr_lamp_w(uint8_t data)
+void sspeedr_state::lamp_w(uint8_t data)
 {
 	output().set_value("lampGO", BIT(data, 0));
 	output().set_value("lampEP", BIT(data, 1));
@@ -51,64 +53,111 @@
 }
 
 
-/* uses a 7447A, which is equivalent to an LS47/48 */
+// uses a 7447A, which is equivalent to an LS47/48
 constexpr uint8_t ls48_map[16] =
 	{ 0x3f,0x06,0x5b,0x4f,0x66,0x6d,0x7c,0x07,0x7f,0x67,0x58,0x4c,0x62,0x69,0x78,0x00 };
 
-void sspeedr_state::sspeedr_time_w(offs_t offset, uint8_t data)
+void sspeedr_state::time_w(offs_t offset, uint8_t data)
 {
 	data = data & 15;
 	m_digits[24 + offset] = ls48_map[data];
-	m_led_TIME[offset] = data;
+	m_led_time[offset] = data;
 }
 
 
-void sspeedr_state::sspeedr_score_w(offs_t offset, uint8_t data)
+void sspeedr_state::score_w(offs_t offset, uint8_t data)
 {
 	data = ~data & 15;
 	m_digits[offset] = ls48_map[data];
-	m_led_SCORE[offset] = data;
+	m_led_score[offset] = data;
 }
 
 
-void sspeedr_state::sspeedr_sound_w(uint8_t data)
+void sspeedr_state::sound1_w(uint8_t data)
 {
-	/* not implemented */
+	// **** Output pins from 74174 latch at C2 ****
+
+	// Bits 0-3 (PEDAL_BIT0 to PEDAL_BIT3): accelerator pedal position
+	// Sets the frequency and volume of the engine sound oscillators.
+	m_pedal_bit0->write_line(BIT(data, 0));
+	m_pedal_bit1->write_line(BIT(data, 1));
+	m_pedal_bit2->write_line(BIT(data, 2));
+	m_pedal_bit3->write_line(BIT(data, 3));
+
+	// Bit 4 (HI SHIFT): set when gearshift is in high gear
+	// Modifies the engine sound to be lower pitched at a given speed and
+	// to change more slowly.
+	m_hi_shift->write_line(BIT(data, 4));
+
+	// Bit 5 (LO SHIFT): set when gearshift is in low gear
+	// Modifies the engine sound to be higher pitched at a given speed and
+	// to change faster.
+	m_lo_shift->write_line(BIT(data, 5));
+
+	// Bits 6-7 (D6, D7): not connected.
 }
 
 
-void sspeedr_state::sspeedr_map(address_map &map)
+void sspeedr_state::sound2_w(uint8_t data)
+{
+	// **** Output pins from 74174 latch at D2 ****
+
+	// Bit 0 (BOOM): Set to activate boom sound for a crash. Cleared to
+	// terminate boom.
+	m_boom->write_line(BIT(data, 0));
+
+	// Bit 1 (ENGINE SOUND OFF): Set to turn *off* engine sound.
+	// Used in a crash.
+	m_engine_sound_off->write_line(BIT(data, 1));
+
+	// Bit 2 (NOISE CR 1): tire squealing sound
+	// Set to activate "tire squeal" noise from noise generator.
+	m_noise_cr_1->write_line(BIT(data, 2));
+
+	// Bit 3 (NOISE CR 2): secondary crash noise
+	// Set to activate high-pitched screeching hiss that accompanies BOOM
+	// when the the car crashes. In Super Speed Race, the BOOM and NOISE
+	// CR 2 effects play simultaneously.
+	m_noise_cr_2->write_line(BIT(data, 3));
+
+	// Bit 4 (SILENCE): mute all sound when game is not running.
+	m_silence->write_line(BIT(data, 4));
+
+	// Bits 5-7 (D5, D6, D7): not connected.
+}
+
+
+void sspeedr_state::prg_map(address_map &map)
 {
 	map(0x0000, 0x0fff).rom();
 	map(0x2000, 0x21ff).ram();
-	map(0x7f00, 0x7f17).w(FUNC(sspeedr_state::sspeedr_score_w));
+	map(0x7f00, 0x7f17).w(FUNC(sspeedr_state::score_w));
 }
 
 
-void sspeedr_state::sspeedr_io_map(address_map &map)
+void sspeedr_state::io_map(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0x00, 0x00).portr("IN0");
-	map(0x01, 0x01).portr("IN1");
-	map(0x00, 0x01).w(FUNC(sspeedr_state::sspeedr_sound_w));
-	map(0x02, 0x02).w(FUNC(sspeedr_state::sspeedr_lamp_w));
+	map(0x00, 0x00).portr("IN0").w(FUNC(sspeedr_state::sound1_w));
+	map(0x01, 0x01).portr("IN1").w(FUNC(sspeedr_state::sound2_w));
+	map(0x02, 0x02).w(FUNC(sspeedr_state::lamp_w));
 	map(0x03, 0x03).portr("DSW");
 	map(0x04, 0x04).portr("IN2");
-	map(0x04, 0x05).w(FUNC(sspeedr_state::sspeedr_time_w));
+	map(0x04, 0x05).w(FUNC(sspeedr_state::time_w));
 	map(0x06, 0x06).w("watchdog", FUNC(watchdog_timer_device::reset_w));
-	map(0x10, 0x10).w(FUNC(sspeedr_state::sspeedr_driver_horz_w));
-	map(0x11, 0x11).w(FUNC(sspeedr_state::sspeedr_driver_pic_w));
-	map(0x12, 0x12).w(FUNC(sspeedr_state::sspeedr_driver_horz_2_w));
-	map(0x13, 0x13).w(FUNC(sspeedr_state::sspeedr_drones_horz_w));
-	map(0x14, 0x14).w(FUNC(sspeedr_state::sspeedr_drones_horz_2_w));
-	map(0x15, 0x15).w(FUNC(sspeedr_state::sspeedr_drones_mask_w));
-	map(0x16, 0x16).w(FUNC(sspeedr_state::sspeedr_driver_vert_w));
-	map(0x17, 0x18).w(FUNC(sspeedr_state::sspeedr_track_vert_w));
-	map(0x19, 0x19).w(FUNC(sspeedr_state::sspeedr_track_horz_w));
-	map(0x1a, 0x1a).w(FUNC(sspeedr_state::sspeedr_track_horz_2_w));
-	map(0x1b, 0x1b).w(FUNC(sspeedr_state::sspeedr_track_ice_w));
-	map(0x1c, 0x1e).w(FUNC(sspeedr_state::sspeedr_drones_vert_w));
-	map(0x1f, 0x1f).w(FUNC(sspeedr_state::sspeedr_int_ack_w));
+	map(0x10, 0x10).w(FUNC(sspeedr_state::driver_horz_w));
+	map(0x11, 0x11).w(FUNC(sspeedr_state::driver_pic_w));
+	map(0x12, 0x12).w(FUNC(sspeedr_state::driver_horz_2_w));
+	map(0x13, 0x13).w(FUNC(sspeedr_state::drones_horz_w));
+	map(0x14, 0x14).w(FUNC(sspeedr_state::drones_horz_2_w));
+	map(0x15, 0x15).w(FUNC(sspeedr_state::drones_mask_w));
+	map(0x16, 0x16).w(FUNC(sspeedr_state::driver_vert_w));
+	map(0x17, 0x18).w(FUNC(sspeedr_state::track_vert_w));
+	map(0x19, 0x19).w(FUNC(sspeedr_state::track_horz_w));
+	map(0x1a, 0x1a).w(FUNC(sspeedr_state::track_horz_2_w));
+	map(0x1b, 0x1b).w(FUNC(sspeedr_state::track_ice_w));
+	map(0x1c, 0x1e).w(FUNC(sspeedr_state::drones_vert_w));
+	map(0x1f, 0x1f).w(FUNC(sspeedr_state::int_ack_w));
 }
 
 
@@ -131,8 +180,8 @@
 	PORT_BIT( 0x3f, 0x00, IPT_POSITIONAL ) PORT_POSITIONS(64) PORT_REMAP_TABLE(sspeedr_controller_table) PORT_WRAPS PORT_SENSITIVITY(25) PORT_KEYDELTA(10)
 
 	PORT_START("IN1")
-	/* The gas pedal is adjusted physically so the encoder is at position 2 when the pedal is not pressed. */
-	/* It also only uses half of the encoder. */
+	// The gas pedal is adjusted physically so the encoder is at position 2 when the pedal is not pressed.
+	// It also only uses half of the encoder.
 	PORT_BIT( 0x1f, 0x00, IPT_POSITIONAL_V ) PORT_POSITIONS(30) PORT_REMAP_TABLE(sspeedr_controller_table + 2) PORT_SENSITIVITY(25) PORT_KEYDELTA(20)
 
 	PORT_START("DSW")
@@ -159,6 +208,9 @@
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Shifter") PORT_TOGGLE
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN1 )
+
+	PORT_START("POT_MASTER_VOL")
+	PORT_ADJUSTER( 50, "Pot: Master Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "pot_master_vol")
 INPUT_PORTS_END
 
 
@@ -183,17 +235,17 @@
 
 
 static GFXDECODE_START( gfx_sspeedr )
-	GFXDECODE_ENTRY( "gfx1", 0, car_layout, 0, 1 )
-	GFXDECODE_ENTRY( "gfx2", 0, car_layout, 0, 1 )
+	GFXDECODE_ENTRY( "driver", 0, car_layout, 0, 1 )
+	GFXDECODE_ENTRY( "drone", 0, car_layout, 0, 1 )
 GFXDECODE_END
 
 
 void sspeedr_state::sspeedr(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	Z80(config, m_maincpu, XTAL(19'968'000)/8);
-	m_maincpu->set_addrmap(AS_PROGRAM, &sspeedr_state::sspeedr_map);
-	m_maincpu->set_addrmap(AS_IO, &sspeedr_state::sspeedr_io_map);
+	m_maincpu->set_addrmap(AS_PROGRAM, &sspeedr_state::prg_map);
+	m_maincpu->set_addrmap(AS_IO, &sspeedr_state::io_map);
 	m_maincpu->set_vblank_int("screen", FUNC(sspeedr_state::irq0_line_assert));
 
 	WATCHDOG_TIMER(config, "watchdog");
@@ -204,14 +256,39 @@
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(16 * 1000000 / 15680));
 	screen.set_size(376, 256);
 	screen.set_visarea(0, 375, 0, 247);
-	screen.set_screen_update(FUNC(sspeedr_state::screen_update_sspeedr));
-	screen.screen_vblank().set(FUNC(sspeedr_state::screen_vblank_sspeedr));
+	screen.set_screen_update(FUNC(sspeedr_state::screen_update));
+	screen.screen_vblank().set(FUNC(sspeedr_state::screen_vblank));
 	screen.set_palette(m_palette);
 
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_sspeedr);
-	PALETTE(config, m_palette, FUNC(sspeedr_state::sspeedr_palette), 16);
+	PALETTE(config, m_palette, FUNC(sspeedr_state::palette), 16);
 
 	/* sound hardware */
+	SPEAKER(config, "mono").front_center();
+
+	NETLIST_SOUND(config, "sound_nl", 48000)
+		.set_source(NETLIST_NAME(sspeedr))
+		.add_route(ALL_OUTPUTS, "mono", 1.0);
+
+	NETLIST_LOGIC_INPUT(config, "sound_nl:pedal_bit0", "I_PEDAL_BIT0", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:pedal_bit1", "I_PEDAL_BIT1", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:pedal_bit2", "I_PEDAL_BIT2", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:pedal_bit3", "I_PEDAL_BIT3", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:hi_shift", "I_HI_SHIFT", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:lo_shift", "I_LO_SHIFT", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:boom", "I_BOOM", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:engine_sound_off",
+				"I_ENGINE_SOUND_OFF", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:noise_cr_1", "I_NOISE_CR_1", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:noise_cr_2", "I_NOISE_CR_2", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:silence", "I_SILENCE", 0);
+
+	// Audio output is from an LM3900 op-amp whose output has a
+	// peak-to-peak range of about 12 volts, centered on 6 volts.
+	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "OUTPUT").set_mult_offset(32767.0 / 6.0, -32767.0);
+
+	// Netlist volume-potentiometer interface
+	NETLIST_ANALOG_INPUT(config, "sound_nl:pot_master_vol", "R70.DIAL");
 }
 
 
@@ -220,15 +297,15 @@
 	ROM_LOAD( "ssr0000.pgm", 0x0000, 0x0800, CRC(bfc7069a) SHA1(2f7aa3d3c7cfd804ba4b625c6a8338534a204855) )
 	ROM_LOAD( "ssr0800.pgm", 0x0800, 0x0800, CRC(ec46b59a) SHA1(d5727efecb32ad3d034b885e4a57d7373368ca9e) )
 
-	ROM_REGION( 0x0800, "gfx1", 0 ) /* driver */
+	ROM_REGION( 0x0800, "driver", 0 )
 	ROM_LOAD( "ssrm762a.f3", 0x0000, 0x0800, CRC(de4653a9) SHA1(a6bbffb7eb60581eee43c74d20ca00b50c9a6e07) )
 
-	ROM_REGION( 0x0800, "gfx2", 0 ) /* drone */
+	ROM_REGION( 0x0800, "drone", 0 )
 	ROM_LOAD( "ssrm762b.j3", 0x0000, 0x0800, CRC(ef6a1cd6) SHA1(77c31f14783e5ba90849bdc930b099c8360aeba7) )
 
-	ROM_REGION( 0x0800, "gfx3", 0 ) /* track */
+	ROM_REGION( 0x0800, "track", 0 )
 	ROM_LOAD( "ssrm762c.l3", 0x0000, 0x0800, CRC(ebaad3ee) SHA1(54ac994b505d20c75cf07a4f68da12360ee00153) )
 ROM_END
 
 
-GAMEL( 1979, sspeedr, 0, sspeedr, sspeedr, sspeedr_state, empty_init, ROT270, "Midway", "Super Speed Race", MACHINE_NO_SOUND, layout_sspeedr )
+GAMEL( 1979, sspeedr, 0, sspeedr, sspeedr, sspeedr_state, empty_init, ROT270, "Midway", "Super Speed Race", MACHINE_SUPPORTS_SAVE, layout_sspeedr )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ssv.cpp mame-0.224+dfsg.1/src/mame/drivers/ssv.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ssv.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ssv.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4860,7 +4860,7 @@
 
 // Ultra X Weapon: "developed by Seta" in ending screen
 GAME( 1995,  ultrax,    0,        ultrax,   ultrax,   ssv_state, init_ssv_irq1,      ROT270, "Banpresto / Tsuburaya Productions / Seta", "Ultra X Weapons / Ultra Keibitai",                        MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // 95-01-30 13:27:15 on startup
-GAME( 1995,  ultraxg,   ultrax,   ultrax,   ultrax,   ssv_state, init_ssv_irq1,      ROT270, "Banpresto / Tsuburaya Productions / Seta", "Ultra X Weapons / Ultra Keibitai (GAMEST review build)",  MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // 95-02-16 15:30:24 on startup (newer, but could have pause functionality due to being a review build so left as clone)
+GAME( 1995,  ultraxg,   ultrax,   ultrax,   ultrax,   ssv_state, init_ssv_irq1,      ROT270, "Banpresto / Tsuburaya Productions / Seta", "Ultra X Weapons / Ultra Keibitai (Gamest review build)",  MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE ) // 95-02-16 15:30:24 on startup (newer, but could have pause functionality due to being a review build so left as clone)
 
 GAME( 1996,  janjans1,  0,        janjans1, janjans1, ssv_state, init_ssv,           ROT0,   "Visco",              "Lovely Pop Mahjong JangJang Shimasho (Japan)",                           MACHINE_NO_COCKTAIL | MACHINE_IMPERFECT_GRAPHICS | MACHINE_SUPPORTS_SAVE )
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/stactics.cpp mame-0.224+dfsg.1/src/mame/drivers/stactics.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/stactics.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/stactics.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -311,7 +311,7 @@
 void stactics_state::stactics(machine_config &config)
 {
 	/* basic machine hardware */
-	I8080(config, m_maincpu, 1933560);
+	I8080(config, m_maincpu, 15.46848_MHz_XTAL / 8); // divider not verified
 	m_maincpu->set_addrmap(AS_PROGRAM, &stactics_state::main_map);
 	m_maincpu->set_vblank_int("screen", FUNC(stactics_state::interrupt));
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/starcrus.cpp mame-0.224+dfsg.1/src/mame/drivers/starcrus.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/starcrus.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/starcrus.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,13 +1,15 @@
 // license:BSD-3-Clause
-// copyright-holders:Frank Palazzolo
+// copyright-holders:Frank Palazzolo, Ryan Holtz
 /***************************************************************************
 
-Ramtek Star Cruiser Driver
+    Ramtek Star Cruiser Driver
 
-(no known issues)
+    (no known issues)
 
-Frank Palazzolo
-palazzol@home.com
+    Frank Palazzolo
+    palazzol@home.com
+
+    Netlist Audio by Ryan Holtz
 
 ***************************************************************************/
 
@@ -15,7 +17,6 @@
 #include "includes/starcrus.h"
 
 #include "cpu/i8085/i8085.h"
-#include "sound/samples.h"
 #include "screen.h"
 #include "speaker.h"
 
@@ -84,6 +85,12 @@
 	PORT_DIPSETTING(    0x00, DEF_STR( Alternate ) )
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
+
+	PORT_START("POT_1")
+	PORT_ADJUSTER( 50, "Pot: Noise Level" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "noise_volume")
+
+	PORT_START("POT_2")
+	PORT_ADJUSTER( 50, "Pot: Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "volume")
 INPUT_PORTS_END
 
 
@@ -129,17 +136,6 @@
 GFXDECODE_END
 
 
-static const char *const starcrus_sample_names[] =
-{
-	"*starcrus",
-	"engine",   /* engine sound, channel 0 */
-	"explos1",  /* explosion sound, first part, channel 1 */
-	"explos2",  /* explosion sound, second part, channel 1 */
-	"launch",   /* launch sound, channels 2 and 3 */
-	nullptr
-};
-
-
 void starcrus_state::starcrus(machine_config &config)
 {
 	/* basic machine hardware */
@@ -163,10 +159,20 @@
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
 
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(4);
-	m_samples->set_samples_names(starcrus_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 1.0);
+	NETLIST_SOUND(config, "sound_nl", 48000)
+		.set_source(NETLIST_NAME(starcrus))
+		.add_route(ALL_OUTPUTS, "mono", 1.0);
+
+	NETLIST_LOGIC_INPUT(config, "sound_nl:explode1", "EXPLODE_1.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:explode2", "EXPLODE_2.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:launch1", "LAUNCH_1.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:launch2", "LAUNCH_2.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:engine1", "ENGINE_1.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:engine2", "ENGINE_2.IN", 0);
+	NETLIST_ANALOG_INPUT(config, "sound_nl:noise_volume", "R23.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:volume", "R75.DIAL");
+
+	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "R77.2").set_mult_offset(100000.0, 0.0);
 }
 
 /***************************************************************************
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/starfire.cpp mame-0.224+dfsg.1/src/mame/drivers/starfire.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/starfire.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/starfire.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,11 +1,13 @@
 // license:BSD-3-Clause
-// copyright-holders:Dan Boris, Olivier Galibert, Aaron Giles
+// copyright-holders:Dan Boris, Olivier Galibert, Aaron Giles, Ryan Holtz
 /***************************************************************************
 
     Star Fire/Fire One system
 
     driver by Daniel Boris, Olivier Galibert, Aaron Giles
 
+    netlist audio by Ryan Holtz
+
 ****************************************************************************
 
     Memory map
@@ -41,8 +43,8 @@
 
 Notes:
 
-starfira has one less rom in total than starfire but everything passes as
- ok in the rom test so its probably just an earlier revision or something
+starfira has one less ROM in total than starfire, but everything passes as
+ OK in the ROM test, so it's probably just an earlier revision.
 
 ***************************************************************************/
 
@@ -50,45 +52,45 @@
 #include "includes/starfire.h"
 
 #include "cpu/z80/z80.h"
-#include "sound/samples.h"
 #include "speaker.h"
 
-
 /*************************************
  *
  *  Scratch RAM, mapped into video RAM
  *
  *************************************/
 
-void starfire_state::starfire_scratch_w(offs_t offset, uint8_t data)
+void starfire_base_state::scratch_w(offs_t offset, uint8_t data)
 {
-	/* A12 and A3 select video control registers */
+	/* A12 and A3 select video control registers, only the low 4 addresses have an effect */
 	if ((offset & 0x1008) == 0x1000)
 	{
 		switch (offset & 7)
 		{
-			case 0: m_starfire_vidctrl = data; break;
-			case 1: m_starfire_vidctrl1 = data; break;
-			case 2: m_io2_write(data); break;
+			case 0: m_vidctrl = data; break;
+			case 1: m_vidctrl1 = data; break;
+			case 2:
+			case 3: sound_w(offset & 1, data); break;
+			case 7: music_w((offset >> 10) & 3, data); break;
 			default: break;
 		}
 	}
 
 	/* convert to a videoram offset */
 	offset = (offset & 0x31f) | ((offset & 0xe0) << 5);
-	m_starfire_videoram[offset] = data;
+	m_videoram[offset] = data;
 }
 
 
-uint8_t starfire_state::starfire_scratch_r(offs_t offset)
+uint8_t starfire_base_state::scratch_r(offs_t offset)
 {
 	/* A11 selects input ports */
 	if (offset & 0x800)
-		return m_input_read(offset);
+		return input_r(offset);
 
 	/* convert to a videoram offset */
 	offset = (offset & 0x31f) | ((offset & 0xe0) << 5);
-	return m_starfire_videoram[offset];
+	return m_videoram[offset];
 }
 
 
@@ -99,65 +101,97 @@
  *
  *************************************/
 
-void starfire_state::starfire_sound_w(uint8_t data)
+void starfire_state::sound_w(offs_t offset, uint8_t data)
 {
-	// starfire sound samples (preliminary)
-	uint8_t rise = data & ~m_prev_sound;
-	m_prev_sound = data;
+	m_sound_size->write(BIT(data, 0));
+	m_sound_explosion->write(BIT(data, 1));
+	m_sound_tie->write(BIT(data, 2));
+	m_sound_laser->write(BIT(data, 3));
+	m_sound_track->write(BIT(data, 4));
+	m_sound_lock->write(BIT(data, 5));
+	m_sound_scanner->write(BIT(data, 6));
+	m_sound_overheat->write(BIT(data, 7));
+	synchronize();
+}
 
-	// d0: rumble
-	if (rise & 1) m_samples->start(0, 0, true);
-	if (~data & 1) m_samples->stop(0);
+void fireone_state::sound_w(offs_t offset, uint8_t data)
+{
+	if (offset == 0)
+	{
+		m_sound_left_torpedo->write(BIT(data, 0));
+		m_sound_left_partial_hit->write(BIT(data, 1));
+		m_sound_left_boom->write(BIT(data, 2));
+		m_player_select = BIT(~data, 3);
+		m_pit->write_gate0(BIT(data, 4));
+		m_pit->write_gate1(BIT(data, 5));
+		m_pit->write_gate2(BIT(data, 6));
+		m_sound_off_left->write(BIT(data, 7));  // HACK: There's only one SOUND_OFF signal, but it splits into the left and right mixer stages.
+		m_sound_off_right->write(BIT(data, 7)); // Having the left and right halves split provides a better opportunity for frontier isolation.
+	}
+	else
+	{
+		m_sound_right_torpedo->write(BIT(data, 0));
+		m_sound_right_partial_hit->write(BIT(data, 1));
+		m_sound_right_boom->write(BIT(data, 2));
+		m_sound_torpedo_collision->write(BIT(data, 3));
+		m_sound_submarine_engine->write(BIT(data, 4));
+		m_sound_alert->write(BIT(data, 5));
+		m_sound_sonar_sync->write(BIT(data, 6));
+		m_sound_sonar_enable->write(BIT(~data, 7));
+	}
+}
 
-	// d1: explosion
-	// d2: tie weapon
-	// d3: laser
-	if (rise & 2) m_samples->start(1, 1);
-	if (rise & 4) m_samples->start(2, 2);
-	if (rise & 8) m_samples->start(3, 3);
+void fireone_state::music_w(offs_t offset, uint8_t data)
+{
+	m_pit->write(offset, data);
+}
 
-	// these are from the same generator (called "computer" in schematics)
-	// d4: track
-	// d5: lock
-	// d6: scanner
-	// d7: overheat
-	if (rise & 0x80) m_samples->start(4, 7);
-	else if (rise & 0x40) m_samples->start(4, 6);
-	else if (rise & 0x20) m_samples->start(4, 5);
-	else if (rise & 0x10) m_samples->start(4, 4);
+WRITE_LINE_MEMBER(fireone_state::music_a_out_cb)
+{
+	m_music_a->write(state);
 }
 
-void starfire_state::fireone_sound_w(uint8_t data)
+WRITE_LINE_MEMBER(fireone_state::music_b_out_cb)
 {
-	// TODO: sound
-	m_fireone_select = (data & 0x8) ? 0 : 1;
+	m_music_b->write(state);
 }
 
+WRITE_LINE_MEMBER(fireone_state::music_c_out_cb)
+{
+	m_music_c->write(state);
+}
 
-uint8_t starfire_state::starfire_input_r(offs_t offset)
+uint8_t starfire_state::input_r(offs_t offset)
 {
 	switch (offset & 15)
 	{
-		case 0: return ioport("DSW")->read();
-		case 1:
-		{
-			// d3 and d4 come from the audio circuit, how does it work exactly?
-			// tie_on sounds ok, but laser_on sounds buggy
-			uint8_t tie_on = m_samples->playing(2) ? 0x00 : 0x08;
-			uint8_t laser_on = m_samples->playing(3) ? 0x00 : 0x10;
-			uint8_t input = ioport("SYSTEM")->read() & 0xe7;
-			return input | tie_on | laser_on | 0x10; // disable laser_on for now
-		}
-		case 5: return ioport("STICKZ")->read();
-		case 6: return ioport("STICKX")->read();
-		case 7: return ioport("STICKY")->read();
+		case 0: return m_dsw->read();
+		case 1: return (m_system->read() & 0xe7) | m_sound_tie_on | m_sound_laser_on;
+		case 5: return m_stickz->read();
+		case 6: return m_stickx->read();
+		case 7: return m_sticky->read();
 		default: return 0xff;
 	}
 }
 
-uint8_t starfire_state::fireone_input_r(offs_t offset)
+NETDEV_ANALOG_CALLBACK_MEMBER(starfire_state::tieon1_cb)
+{
+	m_sound_tie_on = (data > 2.5) ? 0x00 : 0x08;
+}
+
+NETDEV_ANALOG_CALLBACK_MEMBER(starfire_state::laseron1_cb)
 {
-	static const uint8_t fireone_paddle_map[64] =
+	m_sound_laser_on = (data > 2.5) ? 0x00 : 0x10;
+}
+
+NETDEV_ANALOG_CALLBACK_MEMBER(starfire_state::sound_out_cb)
+{
+	m_dac->write(std::round(8192.0 * data));
+}
+
+uint8_t fireone_state::input_r(offs_t offset)
+{
+	static const uint8_t s_paddle_map[64] =
 	{
 		0x00,0x01,0x03,0x02,0x06,0x07,0x05,0x04,
 		0x0c,0x0d,0x0f,0x0e,0x0a,0x0b,0x09,0x08,
@@ -171,12 +205,14 @@
 
 	switch (offset & 15)
 	{
-		case 0: return ioport("DSW")->read();
-		case 1: return ioport("SYSTEM")->read();
+		case 0:
+			return m_dsw->read();
+		case 1:
+			return m_system->read();
 		case 2:
 		{
-			uint8_t input = m_fireone_select ? ioport("P1")->read() : ioport("P2")->read();
-			return (input & 0xc0) | fireone_paddle_map[input & 0x3f];
+			const uint8_t input = m_controls[m_player_select]->read();
+			return (input & 0xc0) | s_paddle_map[input & 0x3f];
 		}
 		default: return 0xff;
 	}
@@ -190,12 +226,12 @@
  *
  *************************************/
 
-void starfire_state::main_map(address_map &map)
+void starfire_base_state::main_map(address_map &map)
 {
 	map(0x0000, 0x7fff).rom();
-	map(0x8000, 0x9fff).rw(FUNC(starfire_state::starfire_scratch_r), FUNC(starfire_state::starfire_scratch_w));
-	map(0xa000, 0xbfff).rw(FUNC(starfire_state::starfire_colorram_r), FUNC(starfire_state::starfire_colorram_w)).share("colorram");
-	map(0xc000, 0xffff).rw(FUNC(starfire_state::starfire_videoram_r), FUNC(starfire_state::starfire_videoram_w)).share("videoram");
+	map(0x8000, 0x9fff).rw(FUNC(starfire_base_state::scratch_r), FUNC(starfire_base_state::scratch_w));
+	map(0xa000, 0xbfff).rw(FUNC(starfire_base_state::colorram_r), FUNC(starfire_base_state::colorram_w)).share("colorram");
+	map(0xc000, 0xffff).rw(FUNC(starfire_base_state::videoram_r), FUNC(starfire_base_state::videoram_w)).share("videoram");
 }
 
 
@@ -233,8 +269,8 @@
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_START1 )
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON1 )
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_CUSTOM ) // (audio) TIE ON, see starfire_input_r
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_CUSTOM ) // (audio) LASER ON, see starfire_input_r
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_CUSTOM ) // (audio) TIE ON, see input_r
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_CUSTOM ) // (audio) LASER ON, see input_r
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_TILT ) // SLAM/STATIC
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -252,6 +288,27 @@
 	PORT_CONFNAME( 0x01, 0x01, "Jumper J6/4G: Enable NMI" )
 	PORT_CONFSETTING(    0x00, DEF_STR( No ) )
 	PORT_CONFSETTING(    0x01, DEF_STR( Yes ) )
+
+	PORT_START("POT_TRACK")
+	PORT_ADJUSTER( 50, "Tracking Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "trackvol")
+
+	PORT_START("POT_LASER")
+	PORT_ADJUSTER( 50, "Laser Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "laservol")
+
+	PORT_START("POT_TIE")
+	PORT_ADJUSTER( 50, "Enemy Shot Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "enemyvol")
+
+	PORT_START("POT_SIZE")
+	PORT_ADJUSTER( 50, "'Size' Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "sizevol")
+
+	PORT_START("POT_EXPLO")
+	PORT_ADJUSTER( 50, "Explosion Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "explovol")
+
+	PORT_START("POT_LOH")
+	PORT_ADJUSTER( 50, "Lock/Scan/Overheat Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "lohvol")
+
+	PORT_START("POT_MAIN")
+	PORT_ADJUSTER( 50, "Main Volume" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "mainvol")
 INPUT_PORTS_END
 
 
@@ -296,6 +353,12 @@
 	PORT_BIT( 0x3f, 0x20, IPT_PADDLE ) PORT_MINMAX(0,63) PORT_SENSITIVITY(50) PORT_KEYDELTA(1) PORT_PLAYER(2)
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2)
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
+
+	PORT_START("POT_L")
+	PORT_ADJUSTER( 50, "Mixer Volume (L)" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "volume_l")
+
+	PORT_START("POT_R")
+	PORT_ADJUSTER( 50, "Mixer Volume (R)" )  NETLIST_ANALOG_PORT_CHANGED("sound_nl", "volume_r")
 INPUT_PORTS_END
 
 
@@ -306,51 +369,133 @@
  *
  *************************************/
 
-static const char *const starfire_sample_names[] =
+void starfire_state::machine_start()
+{
+	save_item(NAME(m_sound_tie_on));
+	save_item(NAME(m_sound_laser_on));
+}
+
+void starfire_state::machine_reset()
 {
-	"*starfire",
-	"size",
-	"explosion",
-	"tie",
-	"laser",
-	"track",
-	"lock",
-	"scanner",
-	"overheat",
-	nullptr
-};
+	m_sound_tie_on = 0x08;
+	m_sound_laser_on = 0x10;
+}
+
+void fireone_state::machine_start()
+{
+	save_item(NAME(m_player_select));
+
+	m_pit->set_clockin(0, STARFIRE_CPU_CLOCK.dvalue());
+	m_pit->set_clockin(1, STARFIRE_CPU_CLOCK.dvalue());
+	m_pit->set_clockin(2, STARFIRE_CPU_CLOCK.dvalue());
+}
+
+void fireone_state::machine_reset()
+{
+	m_player_select = 0;
+}
 
 INTERRUPT_GEN_MEMBER(starfire_state::vblank_int)
 {
 	// starfire has a jumper for disabling NMI, used to do a complete RAM test
-	if (m_nmi.read_safe(0x01))
+	if (m_nmi->read())
 		device.execute().pulse_input_line(INPUT_LINE_NMI, attotime::zero);
 }
 
-void starfire_state::fireone(machine_config &config)
+INTERRUPT_GEN_MEMBER(fireone_state::vblank_int)
+{
+	device.execute().pulse_input_line(INPUT_LINE_NMI, attotime::zero);
+}
+
+void starfire_base_state::base_config(machine_config &config)
 {
 	/* basic machine hardware */
 	Z80(config, m_maincpu, STARFIRE_CPU_CLOCK);
-	m_maincpu->set_addrmap(AS_PROGRAM, &starfire_state::main_map);
-	m_maincpu->set_vblank_int("screen", FUNC(starfire_state::vblank_int));
+	m_maincpu->set_addrmap(AS_PROGRAM, &starfire_base_state::main_map);
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
 	m_screen->set_raw(STARFIRE_PIXEL_CLOCK, STARFIRE_HTOTAL, STARFIRE_HBEND, STARFIRE_HBSTART, STARFIRE_VTOTAL, STARFIRE_VBEND, STARFIRE_VBSTART);
-	m_screen->set_screen_update(FUNC(starfire_state::screen_update_starfire));
+	m_screen->set_screen_update(FUNC(starfire_base_state::screen_update));
+}
+
+void fireone_state::fireone(machine_config &config)
+{
+	base_config(config);
+	m_maincpu->set_vblank_int("screen", FUNC(fireone_state::vblank_int));
+
+	PIT8253(config, m_pit);
+	m_pit->out_handler<0>().set(FUNC(fireone_state::music_a_out_cb));
+	m_pit->out_handler<1>().set(FUNC(fireone_state::music_b_out_cb));
+	m_pit->out_handler<2>().set(FUNC(fireone_state::music_c_out_cb));
+
+	/* sound hardware */
+	SPEAKER(config, "lspeaker").front_left();
+	SPEAKER(config, "rspeaker").front_right();
+
+	NETLIST_SOUND(config, "sound_nl", 48000)
+		.set_source(NETLIST_NAME(fireone))
+		.add_route(0, "lspeaker", 1.0)
+		.add_route(1, "rspeaker", 1.0);
+
+	NETLIST_LOGIC_INPUT(config, "sound_nl:ltorp", "LTORP.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:lshpht", "LSHPHT.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:lboom", "LBOOM.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:lsound_off", "SOUND_OFF_L.IN", 0); // HACK: Split the SOUND OFF into left/right halves for better netlist isolation.
+	NETLIST_LOGIC_INPUT(config, "sound_nl:rsound_off", "SOUND_OFF_R.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:rtorp", "RTORP.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:rshpht", "RSHPHT.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:rboom", "RBOOM.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:torpcoll", "TORPCOLL.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:subeng", "SUBENG.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:alert", "ALERT.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:sonar_enable", "SONAR_ENABLE.POS", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:sonar_sync", "SONAR_SYNC.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:music_a", "MUSIC_A.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:music_b", "MUSIC_B.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:music_c", "MUSIC_C.IN", 0);
+	NETLIST_ANALOG_INPUT(config, "sound_nl:volume_l", "R64.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:volume_r", "R65.DIAL");
+
+	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "OUT_L").set_mult_offset(100000.0, 0.0);
+	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout1", 1, "OUT_R").set_mult_offset(100000.0, 0.0);
 }
 
 void starfire_state::starfire(machine_config &config)
 {
-	fireone(config);
+	base_config(config);
+	m_maincpu->set_vblank_int("screen", FUNC(starfire_state::vblank_int));
 
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
 
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(5);
-	m_samples->set_samples_names(starfire_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 1.0);
+	NETLIST_CPU(config, "sound_nl", netlist::config::DEFAULT_CLOCK()).set_source(NETLIST_NAME(starfire));
+
+	NETLIST_LOGIC_INPUT(config, "sound_nl:size", "SIZE.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:sexplo", "SEXPLO.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:stie", "STIE.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:slaser", "SLASER.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:track", "TRACK.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:lock", "LOCK.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:scanner", "SCANNER.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:oheat", "OHEAT.IN", 0);
+
+	NETLIST_ANALOG_INPUT(config, "sound_nl:trackvol", "R16.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:laservol", "R18.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:enemyvol", "R17.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:sizevol", "R19.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:explovol", "R20.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:lohvol", "R15.DIAL");
+	NETLIST_ANALOG_INPUT(config, "sound_nl:mainvol", "R21.DIAL");
+
+	NETLIST_ANALOG_OUTPUT(config, "sound_nl:tieon1", 0).set_params("TIEON1", FUNC(starfire_state::tieon1_cb));
+	NETLIST_ANALOG_OUTPUT(config, "sound_nl:laseron1", 0).set_params("LASERON1", FUNC(starfire_state::laseron1_cb));
+	NETLIST_ANALOG_OUTPUT(config, "sound_nl:output", 0).set_params("OUTPUT", FUNC(starfire_state::sound_out_cb));
+
+	DAC_16BIT_R2R_TWOS_COMPLEMENT(config, m_dac, 0).add_route(ALL_OUTPUTS, "mono", 0.5); // Not actually a DAC, just here to receive output.
+	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
+	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
+	vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
 }
 
 
@@ -440,41 +585,13 @@
 	ROM_LOAD( "prom-2.8a",    0x0020, 0x0020, CRC(9b713924) SHA1(943ad55d232f7bb99886a9a273dd14a1e1533491) ) /* BPROM type is N82S123 */
 ROM_END
 
-
-
-/*************************************
- *
- *  Driver init
- *
- *************************************/
-
-void starfire_state::init_starfire()
-{
-	m_input_read = read8sm_delegate(*this, FUNC(starfire_state::starfire_input_r));
-	m_io2_write = write8smo_delegate(*this, FUNC(starfire_state::starfire_sound_w));
-
-	/* register for state saving */
-	save_item(NAME(m_prev_sound));
-}
-
-void starfire_state::init_fireone()
-{
-	m_input_read = read8sm_delegate(*this, FUNC(starfire_state::fireone_input_r));
-	m_io2_write = write8smo_delegate(*this, FUNC(starfire_state::fireone_sound_w));
-
-	/* register for state saving */
-	save_item(NAME(m_fireone_select));
-}
-
-
-
 /*************************************
  *
  *  Game drivers
  *
  *************************************/
 
-GAME( 1979, starfire, 0,        starfire, starfire, starfire_state, init_starfire, ROT0, "Exidy", "Star Fire (set 1)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, starfirea,starfire, starfire, starfire, starfire_state, init_starfire, ROT0, "Exidy", "Star Fire (set 2)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, fireone,  0,        fireone,  fireone,  starfire_state, init_fireone,  ROT0, "Exidy", "Fire One", MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1979, starfir2, 0,        starfire, starfire, starfire_state, init_starfire, ROT0, "Exidy", "Star Fire 2", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1979, starfire, 0,        starfire, starfire, starfire_state, empty_init, ROT0, "Exidy", "Star Fire (set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, starfirea,starfire, starfire, starfire, starfire_state, empty_init, ROT0, "Exidy", "Star Fire (set 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, fireone,  0,        fireone,  fireone,  fireone_state,  empty_init, ROT0, "Exidy", "Fire One", MACHINE_SUPPORTS_SAVE )
+GAME( 1979, starfir2, 0,        starfire, starfire, starfire_state, empty_init, ROT0, "Exidy", "Star Fire 2", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/starrider.cpp mame-0.224+dfsg.1/src/mame/drivers/starrider.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/starrider.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/starrider.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -263,6 +263,7 @@
 #include "emupal.h"
 
 #include <algorithm>
+#include <iterator>
 #include <memory>
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/startouch.cpp mame-0.224+dfsg.1/src/mame/drivers/startouch.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/startouch.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/startouch.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -62,20 +62,25 @@
 }
 
 ROM_START(europl01)
+
+	// Sleic used different motherboards for this machine. By now, we're adding the all the known BIOSes here
 	ROM_REGION(0x20000, "mb_bios", 0)
-	ROM_LOAD( "award_pci-pnp_586_222951562_v4.51pg.u2", 0x00000, 0x20000, CRC(5bb1bcbc) SHA1(6e2a7b5b3fc892ed20d0b12a1a533231c8953177) )
+	ROM_SYSTEM_BIOS(0, "soyo_m5eh_aw4_52", "Soyo M5EH with Award 4.51pg BIOS")     // Soyo M5EH V1.2 (1MB cache)
+	ROMX_LOAD("award_pci-pnp_586_222951562_v4.51pg.u2", 0x00000, 0x20000, CRC(5bb1bcbc) SHA1(6e2a7b5b3fc892ed20d0b12a1a533231c8953177), ROM_BIOS(0))
+	ROM_SYSTEM_BIOS(1, "bst_m5atd_aw4_52", "Biostar M5ATD with Award 4.51pg BIOS") // Biostar M5ATD V1.2 (ALi M5819P + ALi M1543 B1 + ALi M1531 B1 + UMC UM61L6464F-6)
+	ROMX_LOAD("award_pci_pnp_586_w29c011a.u11",         0x00000, 0x20000, CRC(1ec5749b) SHA1(3dd1dac852b00c8108aaf9c89f47ae1922d645f0), ROM_BIOS(1))
 
 	ROM_REGION(0x8000, "vga_bios", 0)
-	ROM_LOAD( "s3_86c775-86c785_video_bios_v1.01.04.u5", 0x0000, 0x8000, CRC(e718418f) SHA1(1288ce51bb732a346eb7c61d5bdf80ea22454d45) )
+	ROM_LOAD("s3_86c775-86c785_video_bios_v1.01.04.u5", 0x0000, 0x8000, CRC(e718418f) SHA1(1288ce51bb732a346eb7c61d5bdf80ea22454d45))
 
 	ROM_REGION(0x20000, "hd_firmware", 0)
-	ROM_LOAD( "jk200-35.bin", 0x00000, 0x20000, CRC(601fa709) SHA1(13ded4826a64209faac8bc81708172b81195ab96) )
+	ROM_LOAD("jk200-35.bin", 0x00000, 0x20000, CRC(601fa709) SHA1(13ded4826a64209faac8bc81708172b81195ab96))
 
 	ROM_REGION(0x66da4, "dongle", 0)
-	ROM_LOAD( "9b91f19d.hsp", 0x00000, 0x66da4, CRC(0cf78908) SHA1(c596f415accd6b91be85ea8c1b89ea380d0dc6c8) )
+	ROM_LOAD("9b91f19d.hsp", 0x00000, 0x66da4, CRC(0cf78908) SHA1(c596f415accd6b91be85ea8c1b89ea380d0dc6c8))
 
 	DISK_REGION( "ide:0:hdd:image" )
-	DISK_IMAGE( "sleic-petaco_startouch_2001_v2.0", 0, SHA1(3164a5786d6b9bb0dd9910b4d27a77a6b746dedf) ) // labeled startouch_2001 but when run game title is EuroPlay 2001
+	DISK_IMAGE("sleic-petaco_startouch_2001_v2.0", 0, SHA1(3164a5786d6b9bb0dd9910b4d27a77a6b746dedf)) // labeled startouch_2001 but when run game title is EuroPlay 2001
 ROM_END
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/supertnk.cpp mame-0.224+dfsg.1/src/mame/drivers/supertnk.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/supertnk.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/supertnk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -127,6 +127,10 @@
 
 	void init_supertnk();
 
+protected:
+	virtual void machine_start() override;
+	virtual void video_start() override;
+
 private:
 	DECLARE_WRITE_LINE_MEMBER(bankswitch_0_w);
 	DECLARE_WRITE_LINE_MEMBER(bankswitch_1_w);
@@ -139,9 +143,6 @@
 	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	DECLARE_WRITE_LINE_MEMBER(vblank_interrupt);
 
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-	virtual void video_start() override;
 	void supertnk_io_map(address_map &map);
 	void supertnk_map(address_map &map);
 
@@ -159,6 +160,10 @@
 void supertnk_state::machine_start()
 {
 	membank("bank1")->configure_entries(0, 4, memregion("maincpu")->base() + 0x10000, 0x1000);
+
+	save_item(NAME(m_rom_bank));
+	save_item(NAME(m_bitplane_select));
+	save_item(NAME(m_interrupt_enable));
 }
 
 
@@ -228,9 +233,11 @@
 		m_pens[i] = rgb_t(pal1bit(data >> 2), pal1bit(data >> 5), pal1bit(data >> 6));
 	}
 
-	m_videoram[0] = std::make_unique<uint8_t[]>(0x2000);
-	m_videoram[1] = std::make_unique<uint8_t[]>(0x2000);
-	m_videoram[2] = std::make_unique<uint8_t[]>(0x2000);
+	for (int i = 0; i < 3; i++)
+	{
+		m_videoram[i] = std::make_unique<uint8_t[]>(0x2000);
+		save_pointer(NAME(m_videoram[i]), 0x2000, i);
+	}
 }
 
 
@@ -307,18 +314,6 @@
 
 /*************************************
  *
- *  Machine reset
- *
- *************************************/
-
-void supertnk_state::machine_reset()
-{
-}
-
-
-
-/*************************************
- *
  *  Memory handlers
  *
  *************************************/
@@ -515,4 +510,4 @@
 }
 
 
-GAME( 1981, supertnk, 0, supertnk, supertnk, supertnk_state, init_supertnk, ROT90, "Video Games GmbH", "Super Tank", 0 )
+GAME( 1981, supertnk, 0, supertnk, supertnk, supertnk_state, init_supertnk, ROT90, "Video Games GmbH", "Super Tank", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/sys9002.cpp mame-0.224+dfsg.1/src/mame/drivers/sys9002.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/sys9002.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/sys9002.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,19 +2,22 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        Mannesmann Kienzle System 9002 Terminal
+Mannesmann Kienzle System 9002 Terminal
 
-        2017-08-17 Skeleton driver.
+2017-08-17 Skeleton driver.
 
-        Chips used:
-            Siemens SAB8085A-P
-            NEC D8251AFC * 2
-            NEC D4016C-3 * 4 + 2
-            ST M2764A-4F1 * 4
-            HD6845P
+Chips used:
+- Siemens SAB8085A-P
+- NEC D8251AFC * 2
+- NEC D4016C-3 * 4 + 2
+- ST M2764A-4F1 * 4
+- HD6845P
+
+Chargen is missing.
+
+Both uarts are programmed as synchronous. A conversion box is needed
+to talk with RS-232.
 
-Seems a chargen is missing.
-If write to the 6845 is enabled, MAME freezes after 1 or 2 seconds.
 
 ****************************************************************************/
 
@@ -33,8 +36,9 @@
 	sys9002_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_p_videoram(*this, "videoram")
+		, m_vram(*this, "videoram")
 		, m_palette(*this, "palette")
+		, m_p_chargen(*this, "chargen")
 	{ }
 
 	void sys9002(machine_config &config);
@@ -42,35 +46,45 @@
 private:
 	MC6845_UPDATE_ROW(crtc_update_row);
 
-	void sys9002_io(address_map &map);
-	void sys9002_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
+	u8 port11_r();
 
 	required_device<cpu_device> m_maincpu;
-	required_shared_ptr<uint8_t> m_p_videoram;
+	required_shared_ptr<uint8_t> m_vram;
 	required_device<palette_device> m_palette;
+	required_region_ptr<u8> m_p_chargen;
 };
 
 
-void sys9002_state::sys9002_mem(address_map &map)
+void sys9002_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x0000, 0x7fff).rom(); // 4 * 4K ROM
 	map(0x8000, 0x9fff).ram(); // 4 * 2k RAM
 	map(0xa000, 0xa7ff).ram().share("videoram"); // 2k RAM
-	map(0xc000, 0xc07f).ram(); // ??
+	map(0xc000, 0xc7ff).ram(); // attributes??
+	map(0xe000, 0xefff).ram(); // ??
 }
 
-void sys9002_state::sys9002_io(address_map &map)
+void sys9002_state::io_map(address_map &map)
 {
 	map.unmap_value_high();
 	map.global_mask(0xff);
-	//map(0x04, 0x04).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w));  // left commented out as mame freezes after about 2 seconds
-	//map(0x05, 0x05).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
+	map(0x04, 0x04).rw("crtc", FUNC(mc6845_device::status_r), FUNC(mc6845_device::address_w));
+	map(0x05, 0x05).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 	map(0x08, 0x09).rw("uart1", FUNC(i8251_device::read), FUNC(i8251_device::write));
-	map(0x11, 0x11).nopr();  // continuous read
+	map(0x10, 0x11).r(FUNC(sys9002_state::port11_r)); //nopr();  // continuous read
 	map(0x1c, 0x1d).rw("uart2", FUNC(i8251_device::read), FUNC(i8251_device::write));
 }
 
+u8 sys9002_state::port11_r()
+{
+	static u8 data = 0;
+	data += 0x08;
+	return data;
+}
+
 /* Input ports */
 static INPUT_PORTS_START( sys9002 )
 INPUT_PORTS_END
@@ -85,10 +99,10 @@
 	for (x = 0; x < x_count; x++)
 	{
 		mem = (ma + x) & 0x7ff;
-		chr = m_p_videoram[mem];
+		chr = m_vram[mem] & 0x7f;
 
 		/* get pattern of pixels for that character scanline */
-		gfx = chr; //gfx = m_p_chargen[(chr<<4) | ra] ^ ((x == cursor_x) ? 0xff : 0);
+		gfx = m_p_chargen[(chr<<4) | ra] ^ ((x == cursor_x) ? 0xff : 0);
 
 		/* Display a scanline of a character (8 pixels) */
 		*p++ = pens[BIT(gfx, 7)];
@@ -103,30 +117,12 @@
 }
 
 
-static DEVICE_INPUT_DEFAULTS_START( uart1 )
-	DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 )
-	DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 )
-	DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 )
-	DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_7 )
-	DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_ODD )
-	DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
-DEVICE_INPUT_DEFAULTS_END
-
-static DEVICE_INPUT_DEFAULTS_START( uart2 )
-	DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 )
-	DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_9600 )
-	DEVICE_INPUT_DEFAULTS( "RS232_STARTBITS", 0xff, RS232_STARTBITS_1 )
-	DEVICE_INPUT_DEFAULTS( "RS232_DATABITS", 0xff, RS232_DATABITS_8 )
-	DEVICE_INPUT_DEFAULTS( "RS232_PARITY", 0xff, RS232_PARITY_EVEN )
-	DEVICE_INPUT_DEFAULTS( "RS232_STOPBITS", 0xff, RS232_STOPBITS_1 )
-DEVICE_INPUT_DEFAULTS_END
-
 void sys9002_state::sys9002(machine_config &config)
 {
 	/* basic machine hardware */
 	I8085A(config, m_maincpu, XTAL(2'000'000)); // XTAL not visible on images
-	m_maincpu->set_addrmap(AS_PROGRAM, &sys9002_state::sys9002_mem);
-	m_maincpu->set_addrmap(AS_IO, &sys9002_state::sys9002_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &sys9002_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &sys9002_state::io_map);
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER, rgb_t::green()));
@@ -135,7 +131,7 @@
 	screen.set_screen_update("crtc", FUNC(mc6845_device::screen_update));
 	screen.set_size(32*8, 32*8);
 	screen.set_visarea(0*8, 32*8-1, 2*8, 30*8-1);
-	//GFXDECODE(config, "gfxdecode", m_palette, gfx_mx2178);
+	//GFXDECODE(config, "gfxdecode", m_palette, gfx_sys9002);
 	PALETTE(config, m_palette, palette_device::MONOCHROME);
 
 	/* Devices */
@@ -145,13 +141,13 @@
 	crtc.set_char_width(8);
 	crtc.set_update_row_callback(FUNC(sys9002_state::crtc_update_row));
 
-	clock_device &uart_clock(CLOCK(config, "uart_clock", 614400));
+	clock_device &uart_clock(CLOCK(config, "uart_clock", 9600));
 	uart_clock.signal_handler().set("uart1", FUNC(i8251_device::write_txc));
 	uart_clock.signal_handler().append("uart1", FUNC(i8251_device::write_rxc));
 	uart_clock.signal_handler().append("uart2", FUNC(i8251_device::write_txc));
 	uart_clock.signal_handler().append("uart2", FUNC(i8251_device::write_rxc));
 
-	i8251_device &uart1(I8251(config, "uart1", 0)); // 7 bits even parity, x64
+	i8251_device &uart1(I8251(config, "uart1", 0)); // sync
 	uart1.txd_handler().set("rs232a", FUNC(rs232_port_device::write_txd));
 	uart1.dtr_handler().set("rs232a", FUNC(rs232_port_device::write_dtr));
 	uart1.rts_handler().set("rs232a", FUNC(rs232_port_device::write_rts));
@@ -160,9 +156,8 @@
 	rs232a.rxd_handler().set("uart1", FUNC(i8251_device::write_rxd));
 	rs232a.dsr_handler().set("uart1", FUNC(i8251_device::write_dsr));
 	rs232a.cts_handler().set("uart1", FUNC(i8251_device::write_cts));
-	rs232a.set_option_device_input_defaults("terminal", DEVICE_INPUT_DEFAULTS_NAME(uart1));
 
-	i8251_device &uart2(I8251(config, "uart2", 0)); // enabled for transmit only, 8 bits odd parity, x64
+	i8251_device &uart2(I8251(config, "uart2", 0)); // sync
 	uart2.txd_handler().set("rs232b", FUNC(rs232_port_device::write_txd));
 	uart2.dtr_handler().set("rs232b", FUNC(rs232_port_device::write_dtr));
 	uart2.rts_handler().set("rs232b", FUNC(rs232_port_device::write_rts));
@@ -172,19 +167,21 @@
 	rs232b.rxd_handler().set("uart2", FUNC(i8251_device::write_rxd));
 	rs232b.dsr_handler().set("uart2", FUNC(i8251_device::write_dsr));
 	rs232b.cts_handler().set("uart2", FUNC(i8251_device::write_cts));
-	rs232b.set_option_device_input_defaults("terminal", DEVICE_INPUT_DEFAULTS_NAME(uart2));
 }
 
 /* ROM definition */
 ROM_START( sys9002 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x8000, "maincpu", 0 )
 	ROM_LOAD( "55-040.bin", 0x0000, 0x2000, CRC(781eaca9) SHA1(1bdae2bcc43deaef2eb1d6ec302fbadbb779fd48))
 	ROM_LOAD( "55-041.bin", 0x2000, 0x2000, CRC(0f89fe81) SHA1(2dc8de7dabaf11a150cfd34460c5b47612cf5e61))
 	ROM_LOAD( "55-042.bin", 0x4000, 0x2000, CRC(e6fbc837) SHA1(fc11f6a6927709552bedf06b9eb0dc66e9a81264))
 	ROM_LOAD( "55-048.bin", 0x6000, 0x2000, CRC(879ef945) SHA1(a54fc01ac26a3cd05f6d1e1139d6d99198556575))
+
+	ROM_REGION( 0x0800, "chargen", 0 )  // chargen not dumped, using one from mbee for now
+	ROM_LOAD("charrom.bin",  0x0000,  0x0800, BAD_DUMP CRC(b149737b) SHA1(a3cd4f5d0d3c71137cd1f0f650db83333a2e3597) )
 ROM_END
 
 /* Driver */
 
 //    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY               FULLNAME                FLAGS
-COMP( 198?, sys9002, 0,      0,      sys9002, sys9002, sys9002_state, empty_init, "Mannesmann Kienzle", "System 9002 Terminal", MACHINE_IS_SKELETON )
+COMP( 198?, sys9002, 0,      0,      sys9002, sys9002, sys9002_state, empty_init, "Mannesmann Kienzle", "System 9002 Terminal", MACHINE_IS_SKELETON | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/system16.cpp mame-0.224+dfsg.1/src/mame/drivers/system16.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/system16.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/system16.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4105,7 +4105,7 @@
 /* Sys18 */
 void segas1x_bootleg_state::init_shdancbl()
 {
-	uint8_t *mem = m_soundcpu_region->base();;
+	uint8_t *mem = m_soundcpu_region->base();
 
 	/* Copy first 32K of IC45 to Z80 address space */
 	memcpy(mem, mem + 0x10000, 0x8000);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/system1.cpp mame-0.224+dfsg.1/src/mame/drivers/system1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/system1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/system1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -815,6 +815,16 @@
 	map(0x18, 0x1b).rw("pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
 }
 
+void system1_state::blockgal_pio_io_map(address_map &map)
+{
+	map.global_mask(0x1f);
+	map(0x00, 0x00).mirror(0x03).portr("P1");
+	map(0x04, 0x04).mirror(0x03).portr("P2");
+	map(0x08, 0x08).mirror(0x03).portr("SYSTEM");
+	map(0x0d, 0x0d).mirror(0x02).portr("SWA");    // DIP2
+	map(0x10, 0x10).mirror(0x03).portr("SWB");    // DIP1
+	map(0x18, 0x1b).rw("pio", FUNC(z80pio_device::read), FUNC(z80pio_device::write));
+}
 
 /*************************************
  *
@@ -1907,6 +1917,36 @@
 */
 
 static INPUT_PORTS_START( blockgal )
+	PORT_INCLUDE( system1_generic )
+
+	PORT_MODIFY("P1")
+	PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(60) PORT_KEYDELTA(15) PORT_REVERSE
+
+	PORT_MODIFY("P2")
+	PORT_BIT( 0xff, 0x00, IPT_DIAL ) PORT_SENSITIVITY(60) PORT_KEYDELTA(15) PORT_REVERSE PORT_COCKTAIL
+
+	PORT_MODIFY("SYSTEM")
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_COCKTAIL
+
+	PORT_MODIFY("SWB")
+	PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) )  PORT_DIPLOCATION("SWB:2")
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Lives ) )        PORT_DIPLOCATION("SWB:4")
+	PORT_DIPSETTING(    0x08, "2" )
+	PORT_DIPSETTING(    0x00, "3" )
+	PORT_DIPNAME( 0x10, 0x10, DEF_STR( Bonus_Life ) )   PORT_DIPLOCATION("SWB:5")
+	PORT_DIPSETTING(    0x10, "10k 30k 60k 100k 150k" )
+	PORT_DIPSETTING(    0x00, "30k 50k 100k 200k 300k" )
+	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Allow_Continue ) )   PORT_DIPLOCATION("SWB:6")
+	PORT_DIPSETTING(    0x20, DEF_STR( No ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Yes ) )
+	PORT_SERVICE_DIPLOC( 0x80, IP_ACTIVE_LOW, "SWB:8" )
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( blockgalb )
 	PORT_INCLUDE( choplift )
 
 	PORT_MODIFY("P1")
@@ -2245,6 +2285,12 @@
 	encrypted_sys1pio_maps(config);
 }
 
+void system1_state::blockgal(machine_config &config)
+{
+	sys1pioxb(config);
+	m_maincpu->set_addrmap(AS_IO, &system1_state::blockgal_pio_io_map);
+}
+
 void system1_state::sys1ppix_315_5178(machine_config &config)
 {
 	sys1ppi(config);
@@ -5582,7 +5628,7 @@
 GAME( 1986, wboyu,      wboy,     sys1pio,           wboyu,     system1_state, init_bank00,       ROT0,   "Escape (Sega license)", "Wonder Boy (prototype?)", MACHINE_SUPPORTS_SAVE ) // appears to be a very early / unfinished version.
 GAME( 1986, wboy5,      wboy,     sys1piox_315_5135, wboy3,     system1_state, init_bank00,       ROT0,   "bootleg", "Wonder Boy (set 5, bootleg)", MACHINE_SUPPORTS_SAVE )
 GAME( 1986, wboyub,     wboy,     sys1piox_315_5177, wboy,      system1_state, init_bank00,       ROT0,   "bootleg", "Wonder Boy (US bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, blockgal,   0,        sys1pioxb,         blockgal,  system1_state, init_blockgal,     ROT90,  "Sega / Vic Tokai","Block Gal (MC-8123B, 317-0029)", MACHINE_SUPPORTS_SAVE)
+GAME( 1987, blockgal,   0,        blockgal,          blockgal,  system1_state, init_blockgal,     ROT90,  "Sega / Vic Tokai","Block Gal (MC-8123B, 317-0029)", MACHINE_SUPPORTS_SAVE)
 
 /* PIO-based System 1 with ROM banking */
 GAME( 1985, hvymetal,   0,        sys1piox_315_5135, hvymetal,  system1_state, init_bank44,       ROT0,   "Sega", "Heavy Metal (315-5135)", MACHINE_SUPPORTS_SAVE )
@@ -5612,6 +5658,6 @@
 GAME( 1987, wbmld,      wbml,     sys2xboot,         wbml,      system1_state, init_bootsys2d,    ROT0,   "bootleg (mpatou)", "Wonder Boy in Monster Land (decrypted bootleg of Japan New Ver., MC-8123, 317-0043)", MACHINE_SUPPORTS_SAVE )
 GAME( 1987, wbmljod,    wbml,     sys2xboot,         wbml,      system1_state, init_bootsys2d,    ROT0,   "bootleg (mpatou)", "Wonder Boy in Monster Land (decrypted bootleg of Japan Old Ver., MC-8123, 317-0043)", MACHINE_SUPPORTS_SAVE )
 GAME( 1987, dakkochn,   0,        sys2xb,            dakkochn,  system1_state, init_dakkochn,     ROT0,   "White Board", "DakkoChan House (MC-8123B, 317-5014)", MACHINE_SUPPORTS_SAVE )
-GAME( 1987, blockgalb,  blockgal, sys2x,             blockgal,  system1_state, init_bootleg,      ROT90,  "bootleg", "Block Gal (bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, blockgalb,  blockgal, sys2x,             blockgalb, system1_state, init_bootleg,      ROT90,  "bootleg", "Block Gal (bootleg)", MACHINE_SUPPORTS_SAVE )
 GAME( 1988, ufosensi,   0,        sys2rowxb,         ufosensi,  system1_state, init_wbml,         ROT0,   "Sega", "Ufo Senshi Yohko Chan (MC-8123, 317-0064)", MACHINE_SUPPORTS_SAVE )
 GAME( 1988, ufosensib,  ufosensi, sys2rowxboot,      ufosensi,  system1_state, init_bootsys2,     ROT0,   "bootleg", "Ufo Senshi Yohko Chan (bootleg, not encrypted)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/taito_b.cpp mame-0.224+dfsg.1/src/mame/drivers/taito_b.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/taito_b.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/taito_b.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2517,7 +2517,7 @@
 	ym2610_device &ymsnd(YM2610(config, "ymsnd", 16_MHz_XTAL / 2));  /* 8 MHz */
 	ymsnd.irq_handler().set_inputline(m_audiocpu, 0);
 	ymsnd.add_route(0, "mono", 0.25);
-	ymsnd.add_route(1, "mono", 1.0);;
+	ymsnd.add_route(1, "mono", 1.0);
 	ymsnd.add_route(2, "mono", 1.0);
 
 	tc0140syt_device &tc0140syt(TC0140SYT(config, "tc0140syt", 0));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/taito.cpp mame-0.224+dfsg.1/src/mame/drivers/taito.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/taito.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/taito.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -541,6 +541,18 @@
 /*--------------------------------
 / Football
 /-------------------------------*/
+ROM_START(football)
+	ROM_REGION(0x2000, "roms", 0)
+	ROM_LOAD( "fb1.bin", 0x0000, 0x0400, NO_DUMP)
+	ROM_LOAD( "fb2.bin", 0x0400, 0x0400, NO_DUMP)
+	ROM_LOAD( "fb3.bin", 0x0800, 0x0400, NO_DUMP)
+	ROM_LOAD( "fb4.bin", 0x0c00, 0x0400, NO_DUMP)
+	ROM_LOAD( "fb5.bin", 0x1800, 0x0400, NO_DUMP)
+
+	ROM_REGION(0x0800, "cpu2", 0)
+	ROM_LOAD("fb_s2.bin", 0x0000, 0x0400, CRC(48c0e50a) SHA1(dc8d951a84a9ef27882ddc205caeeb92b18ba462))
+	ROM_LOAD("fb_s1.bin", 0x0400, 0x0400, CRC(457c9b78) SHA1(8c17dff49ad397f0c0d90f5fb45f12920335e25b))
+ROM_END
 
 /*--------------------------------
 / Gemini 2000
@@ -1026,6 +1038,7 @@
 GAME(1982,  stest,      0,          taito,  taito, taito_state, init_taito,  ROT0,   "Taito do Brasil",  "Speed Test",                    MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
 GAME(1982,  lunelle,    0,          taito2, taito, taito_state, init_taito,  ROT0,   "Taito do Brasil",  "Lunelle",                       MACHINE_IS_SKELETON_MECHANICAL)
 GAME(1980,  rally,      0,          taito,  taito, taito_state, init_taito,  ROT0,   "Taito do Brasil",  "Rally",                         MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+GAME(1981,  football,   0,          shock,  taito, taito_state, init_taito,  ROT0,   "Taito do Brasil",  "Football",                      MACHINE_MECHANICAL | MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
 
 // dac and vox (sintevox)
 GAME(1981,  fireact,    0,          taito4, taito, taito_state, init_taito,  ROT0,   "Taito do Brasil",  "Fire Action",                   MACHINE_IS_SKELETON_MECHANICAL)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/taito_f3.cpp mame-0.224+dfsg.1/src/mame/drivers/taito_f3.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/taito_f3.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/taito_f3.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3455,7 +3455,7 @@
 all genuine parts including mask ROMs, PALs, ect.  However the 4 program ROMs were replaced with 4 EPROMs without specific labels.
 
 The replacement ROMs were 27C010 type instead of the standard 27C040 that Taito would normaly use.  In the case of Cleopatra
-Fortune, each original program ROM is 0xFF filled from bytes 0x20000 through 0x3FFFF.
+Fortune, each original program ROM is 0xFF filled from bytes 0x20000 through 0x7FFFF.
 
 In cleopatro, the program ROMs match the 1st 1/4 of cleopatr program ROMs except for 1 byte in ic17.bin.  0x1FFFF has been
 changed from 0x00 to 0x03, which amounts to a simple region hack.
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/taitogn.cpp mame-0.224+dfsg.1/src/mame/drivers/taitogn.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/taitogn.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/taitogn.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -357,7 +357,7 @@
 	{
 	}
 
-	void init_coh3002t_nz();
+	void init_nozoom();
 
 	void base_config(machine_config &config);
 	void coh3002t_t2_mp(machine_config &config);
@@ -569,7 +569,7 @@
 	m_flashbank->set_bank(m_jp1->read() << 1);
 }
 
-void taitogn_state::init_coh3002t_nz()
+void taitogn_state::init_nozoom()
 {
 	m_has_zoom = false;
 }
@@ -1095,18 +1095,18 @@
 GAME( 1999, flipmaze,  coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, empty_init, ROT0,   "MOSS / Taito", "Flip Maze (V2.04J 1999/09/02 20:00)", MACHINE_IMPERFECT_SOUND )
 GAME( 2001, shikigam,  coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, empty_init, ROT270, "Alfa System / Taito", "Shikigami no Shiro (V2.03J 2001/08/07 18:11)", MACHINE_IMPERFECT_SOUND )
 GAME( 2001, shikigama, coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, empty_init, ROT270, "Alfa System / Taito", "Shikigami no Shiro - internal build (V1.02J 2001/09/27 18:45)", MACHINE_IMPERFECT_SOUND )
-GAME( 2003, sianniv,   coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, empty_init, ROT270, "Taito", "Space Invaders Anniversary (V2.02J)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // IRQ at the wrong time
+GAME( 2003, sianniv,   coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, init_nozoom,ROT270, "Taito", "Space Invaders Anniversary (V2.02J)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // IRQ at the wrong time
 GAME( 2003, kollon,    coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, empty_init, ROT0,   "Taito", "Kollon (V2.04JA 2003/11/01 12:00)", MACHINE_IMPERFECT_SOUND )
 GAME( 2003, kollonc,   kollon,   coh3002t_cf,    coh3002t_jp1, taitogn_state, empty_init, ROT0,   "Taito", "Kollon (V2.04JC 2003/11/01 12:00)", MACHINE_IMPERFECT_SOUND )
 
 /* Success */
-GAME( 1999, otenamih,  coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, init_coh3002t_nz, ROT0,   "Success", "Otenami Haiken (V2.04J 1999/02/01 18:00:00)", 0 )
-GAME( 2000, psyvaria,  coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, empty_init,       ROT270, "Success", "Psyvariar -Medium Unit- (V2.02O 2000/02/22 13:00)", MACHINE_IMPERFECT_SOUND )
-GAME( 2000, psyvarij,  psyvaria, coh3002t_t1,    coh3002t,     taitogn_state, empty_init,       ROT270, "Success", "Psyvariar -Medium Unit- (V2.04J 2000/02/15 11:00)", MACHINE_IMPERFECT_SOUND )
-GAME( 2000, psyvarrv,  coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, empty_init,       ROT270, "Success", "Psyvariar -Revision- (V2.04J 2000/08/11 22:00)", MACHINE_IMPERFECT_SOUND )
-GAME( 2001, zokuoten,  coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, init_coh3002t_nz, ROT0,   "Success", "Zoku Otenamihaiken (V2.03J 2001/02/16 16:00)", 0 ) // boots the soundcpu without any valid code, causing an infinite NMI loop (currently circumvented)
-GAME( 2004, zooo,      coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, init_coh3002t_nz, ROT0,   "Success", "Zooo (V2.01JA 2004/04/13 12:00)", 0 )
-GAME( 2005, otenamhf,  coh3002t, coh3002t_cf,    coh3002t_jp1, taitogn_state, init_coh3002t_nz, ROT0,   "Success / Warashi", "Otenami Haiken Final (V2.07JC 2005/04/20 15:36)", 0 )
+GAME( 1999, otenamih,  coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, init_nozoom,ROT0,   "Success", "Otenami Haiken (V2.04J 1999/02/01 18:00:00)", 0 )
+GAME( 2000, psyvaria,  coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, empty_init, ROT270, "Success", "Psyvariar -Medium Unit- (V2.02O 2000/02/22 13:00)", MACHINE_IMPERFECT_SOUND )
+GAME( 2000, psyvarij,  psyvaria, coh3002t_t1,    coh3002t,     taitogn_state, empty_init, ROT270, "Success", "Psyvariar -Medium Unit- (V2.04J 2000/02/15 11:00)", MACHINE_IMPERFECT_SOUND )
+GAME( 2000, psyvarrv,  coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, empty_init, ROT270, "Success", "Psyvariar -Revision- (V2.04J 2000/08/11 22:00)", MACHINE_IMPERFECT_SOUND )
+GAME( 2001, zokuoten,  coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, init_nozoom,ROT0,   "Success", "Zoku Otenamihaiken (V2.03J 2001/02/16 16:00)", 0 ) // boots the soundcpu without any valid code, causing an infinite NMI loop (currently circumvented)
+GAME( 2004, zooo,      coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, init_nozoom,ROT0,   "Success", "Zooo (V2.01JA 2004/04/13 12:00)", 0 )
+GAME( 2005, otenamhf,  coh3002t, coh3002t_cf,    coh3002t_jp1, taitogn_state, init_nozoom,ROT0,   "Success / Warashi", "Otenami Haiken Final (V2.07JC 2005/04/20 15:36)", 0 )
 
 /* Takumi */
 GAME( 2001, nightrai,  coh3002t, coh3002t_t1,    coh3002t,     taitogn_state, empty_init, ROT0,   "Takumi", "Night Raid (V2.03J 2001/02/26 17:00)", MACHINE_IMPERFECT_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/taito_l.cpp mame-0.224+dfsg.1/src/mame/drivers/taito_l.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/taito_l.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/taito_l.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -77,7 +77,6 @@
 void taitol_state::state_register()
 {
 	save_item(NAME(m_last_irq_level));
-	save_item(NAME(m_main_high));
 }
 
 void taitol_2cpu_state::state_register()
@@ -94,7 +93,6 @@
 	taitol_2cpu_state::state_register();
 
 	save_item(NAME(m_slave_rombank));
-	save_item(NAME(m_slave_high));
 }
 
 void champwr_state::state_register()
@@ -119,7 +117,6 @@
 void taitol_state::taito_machine_reset()
 {
 	m_last_irq_level = 0;
-	m_main_high = 0;
 }
 
 void taitol_2cpu_state::taito_machine_reset()
@@ -134,7 +131,6 @@
 	m_slave_rombank = 0;
 	m_slave_bnk->set_entry(m_slave_rombank);
 
-	m_slave_high = 0;
 	m_audio_bnk->set_entry(1);
 }
 
@@ -202,38 +198,10 @@
 }
 
 
-void taitol_state::rombankswitch_w(u8 data)
-{
-	if (m_vdp->rom_bank_r() != data)
-	{
-		if (data > m_main_high)
-		{
-			m_main_high = data;
-			logerror("New rom size : %x\n", (m_main_high + 1) * 0x2000);
-		}
-
-		//logerror("robs %d, %02x (%04x)\n", offset, data, m_main_cpu->pc());
-		m_vdp->rom_bank_w(data);
-	}
-}
-
 void fhawk_state::slave_rombank_w(u8 data)
 {
-	data &= 0xf;
-
-	if (m_slave_rombank != data)
-	{
-		if (data > m_slave_high)
-		{
-			m_slave_high = data;
-			logerror("New rom2 size : %x\n", (m_slave_high + 1) * 0x4000);
-		}
-
-		//logerror("robs2 %02x (%04x)\n", data, m_main_cpu->pc());
-
-		m_slave_rombank = data;
-		m_slave_bnk->set_entry(m_slave_rombank);
-	}
+	m_slave_rombank = data & 0xf;
+	m_slave_bnk->set_entry(m_slave_rombank);
 }
 
 u8 fhawk_state::slave_rombank_r()
@@ -313,10 +281,10 @@
 {
 	map(0x0000, 0xfdff).m(m_vdp, FUNC(tc0090lvc_device::cpu_map));
 	map(0xfe00, 0xfeff).rw(m_vdp, FUNC(tc0090lvc_device::vregs_r), FUNC(tc0090lvc_device::vregs_w));
-	map(0xff00, 0xff02).rw(m_vdp, FUNC(tc0090lvc_device::irq_vector_r), FUNC(tc0090lvc_device::irq_vector_w));
-	map(0xff03, 0xff03).r(m_vdp, FUNC(tc0090lvc_device::irq_enable_r)).w(FUNC(taitol_state::irq_enable_w));
-	map(0xff04, 0xff07).rw(m_vdp, FUNC(tc0090lvc_device::ram_bank_r), FUNC(tc0090lvc_device::ram_bank_w));
-	map(0xff08, 0xff08).r(m_vdp, FUNC(tc0090lvc_device::rom_bank_r)).w(FUNC(taitol_state::rombankswitch_w));
+	map(0xff00, 0xff02).mirror(0x00f0).rw(m_vdp, FUNC(tc0090lvc_device::irq_vector_r), FUNC(tc0090lvc_device::irq_vector_w));
+	map(0xff03, 0xff03).mirror(0x00f0).r(m_vdp, FUNC(tc0090lvc_device::irq_enable_r)).w(FUNC(taitol_state::irq_enable_w));
+	map(0xff04, 0xff07).mirror(0x00f0).rw(m_vdp, FUNC(tc0090lvc_device::ram_bank_r), FUNC(tc0090lvc_device::ram_bank_w));
+	map(0xff08, 0xff08).mirror(0x00f0).rw(m_vdp, FUNC(tc0090lvc_device::rom_bank_r), FUNC(tc0090lvc_device::rom_bank_w));
 }
 
 void fhawk_state::fhawk_map(address_map &map)
@@ -379,10 +347,10 @@
 	map(0xe000, 0xe003).rw("ymsnd", FUNC(ym2610_device::read), FUNC(ym2610_device::write));
 	map(0xe200, 0xe200).nopr().w("tc0140syt", FUNC(tc0140syt_device::slave_port_w));
 	map(0xe201, 0xe201).rw("tc0140syt", FUNC(tc0140syt_device::slave_comm_r), FUNC(tc0140syt_device::slave_comm_w));
-	map(0xe400, 0xe403).nopw(); /* pan */
-	map(0xe600, 0xe600).nopw(); /* ? */
-	map(0xee00, 0xee00).nopw(); /* ? */
-	map(0xf000, 0xf000).nopw(); /* ? */
+	map(0xe400, 0xe403).nopw(); // pan
+	map(0xe600, 0xe600).nopw(); // ?
+	map(0xee00, 0xee00).nopw(); // ?
+	map(0xf000, 0xf000).nopw(); // ?
 	map(0xf200, 0xf200).w(FUNC(taitol_2cpu_state::sound_bankswitch_w));
 }
 
@@ -448,7 +416,7 @@
 	map(0xa800, 0xa800).nopr(); // Watchdog
 	map(0xb800, 0xb800).rw("mcu", FUNC(arkanoid_68705p3_device::data_r), FUNC(arkanoid_68705p3_device::data_w));
 	map(0xb801, 0xb801).rw(FUNC(taitol_1cpu_state::mcu_control_r), FUNC(taitol_1cpu_state::mcu_control_w));
-	map(0xbc00, 0xbc00).nopw();    // Control register, function unknown
+	map(0xbc00, 0xbc00).nopw(); // Control register, function unknown
 }
 
 /* bootleg, doesn't have the MCU */
@@ -460,7 +428,7 @@
 	map(0xa800, 0xa800).nopr(); // Watchdog
 	map(0xb801, 0xb801).r(FUNC(taitol_1cpu_state::mcu_control_r));
 //  map(0xb801, 0xb801).w(FUNC(taitol_1cpu_state::mcu_control_w));
-	map(0xbc00, 0xbc00).nopw();    // Control register, function unknown
+	map(0xbc00, 0xbc00).nopw(); // Control register, function unknown
 }
 
 
@@ -469,8 +437,8 @@
 	common_banks_map(map);
 	map(0x8000, 0x9fff).ram();
 	map(0xa000, 0xa003).r(FUNC(taitol_1cpu_state::extport_select_and_ym2203_r)).w(m_ymsnd, FUNC(ym2203_device::write));
-	map(0xa800, 0xa800).nopw();    // Watchdog or interrupt ack
-	map(0xb800, 0xb800).nopw();    // Control register, function unknown
+	map(0xa800, 0xa800).nopw(); // Watchdog or interrupt ack
+	map(0xb800, 0xb800).nopw(); // Control register, function unknown
 }
 
 
@@ -480,27 +448,17 @@
 	map(0x8000, 0x9fff).ram();
 	map(0xa000, 0xa003).rw(m_ymsnd, FUNC(ym2203_device::read), FUNC(ym2203_device::write));
 	map(0xa800, 0xa803).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write));
-	map(0xb000, 0xb000).nopw();    // Control register, function unknown (copy of 8822)
+	map(0xb000, 0xb000).nopw(); // Control register, function unknown (copy of 8822)
 	map(0xb001, 0xb001).nopr(); // Watchdog or interrupt ack (value ignored in cachat)
 }
 
 
-void taitol_1cpu_state::cachat_map(address_map &map)
-{
-	palamed_map(map);
-	map(0xfff8, 0xfff8).r(m_vdp, FUNC(tc0090lvc_device::rom_bank_r)).w(FUNC(taitol_1cpu_state::rombankswitch_w));
-}
-
-
 void horshoes_state::horshoes_map(address_map &map)
 {
 	common_banks_map(map);
 	map(0x8000, 0x9fff).ram();
 	map(0xa000, 0xa003).r(FUNC(horshoes_state::extport_select_and_ym2203_r)).w(m_ymsnd, FUNC(ym2203_device::write));
-	map(0xa800, 0xa800).select(0x000c).lr8(NAME(
-										   [this](offs_t offset) {
-											   return m_upd4701->read_xy(offset >> 2);
-										   }));
+	map(0xa800, 0xa800).select(0x000c).lr8(NAME([this](offs_t offset) { return m_upd4701->read_xy(offset >> 2); }));
 	map(0xa802, 0xa802).r(m_upd4701, FUNC(upd4701_device::reset_x_r));
 	map(0xa803, 0xa803).r(m_upd4701, FUNC(upd4701_device::reset_y_r));
 	map(0xb801, 0xb801).nopr(); // Watchdog or interrupt ack
@@ -1585,9 +1543,6 @@
 {
 	palamed(config);
 
-	/* basic machine hardware */
-	m_main_cpu->set_addrmap(AS_PROGRAM, &taitol_1cpu_state::cachat_map);
-
 	// NEC D70155C for inputs, instead TMP8255AP-5
 }
 
@@ -1690,7 +1645,7 @@
 ROM_END
 
 ROM_START( fhawk )
-	ROM_REGION( 0xa0000, "tc0090lvc", 0 )
+	ROM_REGION( 0x100000, "tc0090lvc", ROMREGION_ERASEFF )
 	ROM_LOAD( "b70-11.ic3", 0x00000, 0x20000, CRC(7d9f7583) SHA1(d8fa7c66a81fb356fa9c72f377bfc31b1837eafb) )
 	ROM_LOAD( "b70-03.ic2", 0x20000, 0x80000, CRC(42d5a9b8) SHA1(10714fe95c372cec12376e615a9abe213aff12bc) )
 
@@ -1706,7 +1661,7 @@
 ROM_END
 
 ROM_START( fhawkj )
-	ROM_REGION( 0xa0000, "tc0090lvc", 0 )
+	ROM_REGION( 0x100000, "tc0090lvc", ROMREGION_ERASEFF )
 	ROM_LOAD( "b70-07.ic3", 0x00000, 0x20000, CRC(939114af) SHA1(66218536dcb3b34ffa01d3c9c2fee365d91cfe00) )
 	ROM_LOAD( "b70-03.ic2", 0x20000, 0x80000, CRC(42d5a9b8) SHA1(10714fe95c372cec12376e615a9abe213aff12bc) )
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tamag1.cpp mame-0.224+dfsg.1/src/mame/drivers/tamag1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tamag1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tamag1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,5 +1,6 @@
 // license:BSD-3-Clause
 // copyright-holders:hap
+// thanks-to:digshadow, segher
 /***************************************************************************
 
   Bandai Tamagotchi generation 1 hardware
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tankbatt.cpp mame-0.224+dfsg.1/src/mame/drivers/tankbatt.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tankbatt.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tankbatt.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,59 +2,74 @@
 // copyright-holders:Brad Oliver
 /***************************************************************************
 
-Tank Battalion memory map (preliminary)
+Tank Battalion memory map (verified)
 
 driver by Brad Oliver
 
-$0000-$000f : bullet ram, first entry is player's bullet
-$0010-$01ff : zero page & stack
-$0200-$07ff : RAM
-$0800-$0bff : videoram
-$0c00-$0c1f : I/O
-
-Read:
-    $0c00-$0c03 : p1 joystick
-    $0c04
-    $0c07       : stop at grid self-test if bit 7 is low
-    $0c0f       : stop at first self-test if bit 7 is low
-
-    $0c18       : Cabinet, 0 = table, 1 = upright
-    $0c19-$0c1a : Coinage, 00 = free play, 01 = 2 coin 1 credit, 10 = 1 coin 2 credits, 11 = 1 coin 1 credit
-    $0c1b-$0c1c : Bonus, 00 = 10000, 01 = 15000, 10 = 20000, 11 = none
-    $0c1d       : Tanks, 0 = 3, 1 = 2
-    $0c1e-$0c1f : ??
-
-Write:
-    $0c00-$0c01 : p1/p2 start leds
-    $0c02       : ?? written to at end of IRQ, either 0 or 1 - coin counter?
-    $0c03       : ?? written to during IRQ if grid test is on
-    $0c08       : ?? written to during IRQ if grid test is on
-    $0c09       : Sound - coin ding
-    $0c0a       : NMI enable (active low) ?? game only ??
-    $0c0b       : Sound - background noise, 0 - low rumble, 1 - high rumble
-    $0c0c       : Sound - player fire
-    $0c0d       : Sound - explosion
-    $0c0f       : NMI enable (active high) ?? demo only ??
-
-    $0c10       : IRQ ack ??
-    $0c18       : Watchdog ?? Not written to while game screen is up
-
-$2000-$3fff : ROM
+Memory Map:
+  $0000-$03ff : Work RAM 0
+  $0400-$07ff : Work RAM 1
+  $0800-$0bff : VRAM
+  $0c00-$0fff : I/O
+  $2000-$3fff : ROM
+
+A 4-bit BCD value is created from the following four bits:
+  Bit 0: A3
+  Bit 1: A4
+  Bit 2: Read
+  Bit 3: !(A10 & A11)
+
+For writes, the following upper ranges are decoded:
+  xxxx 11xx xxx0 0xxx: OUT0
+  xxxx 11xx xxx0 1xxx: OUT1
+  xxxx 11xx xxx1 0xxx: INTACK
+  xxxx 11xx xxx1 1xxx: Watchdog
+
+For reads, the following upper ranges are decoded:
+  xxxx 11xx xxx0 0xxx: IN0
+  xxxx 11xx xxx0 1xxx: IN1
+  xxxx 11xx xxx1 0xxx: -
+  xxxx 11xx xxx1 1xxx: DIP switches
+
+OUT0:
+  000: Edge Pin F  P1 LED (schematic states Unused)
+  001: Edge Pin 6  P2 LED (schematic states Unused)
+  010: Edge Pin H  Coin Counter (schematic states Unused)
+  011: Edge Pin 7  Coin Lockout (schematic states Coin Counter)
+  1xx: Unused
+
+OUT1:
+  000: S1 (Square Wave 1, connected to 2V)
+  001: S2 (Square Wave 2, connected to 4V)
+  010: Sound off (1), on (0)
+  011: Rumble hi (1), rumble low (0)
+  100: Shoot sound effect
+  101: Hit sound effect
+  110: Unused
+  111: NMI Enable
+
+IN0:
+  000: Edge Pin Y  Joystick Up
+  001: Edge Pin M  Joystick Left
+  010: Edge Pin 14 Joystick Down
+  011: Edge Pin 11 Joystick Right
+  100: Edge Pin N  Shoot
+  101: Edge Pin J  Coin 1
+  110: Edge Pin 8  Coin 2
+  111: Edge Pin 9  Service Switch
+
+IN1:
+  000: Edge Pin 21 Joystick Up (Cocktail)
+  001: Edge Pin P  Joystick Left (Cocktail)
+  010: Edge Pin V  Joystick Down (Cocktail)
+  011: Edge Pin 13 Joystick Right (Cocktail)
+  100: Edge Pin 12 Shoot (Cocktail)
+  101: Edge Pin L  P1 Start
+  110: Edge Pin 10 P2 Start
+  111: Edge Pin K  Test DIP Switch
 
 TODO:
-    . Needs proper discrete emulation
-    . Resistor values on the color prom need to be verified
-
-Changes:
-    28 Feb 98 LBO
-        . Fixed the coin interrupts
-        . Fixed the color issues, should be 100% if I guessed at the resistor values properly
-        . Fixed the 2nd player cocktail joystick, had the polarity reversed
-        . Hacked the sound sample triggers so they work better
-
-Known issues:
-    . The 'moving' tank rumble noise seems to keep playing a second too long
-    . Sample support is all a crapshoot. I have no idea how it really works
+    . Resistor values on the color prom need to be corrected
 
 ***************************************************************************/
 
@@ -63,87 +78,35 @@
 
 #include "cpu/m6502/m6502.h"
 #include "machine/74259.h"
-#include "sound/samples.h"
+#include "machine/input_merger.h"
+#include "machine/watchdog.h"
 #include "screen.h"
 #include "speaker.h"
 
 
 void tankbatt_state::machine_start()
 {
-	save_item(NAME(m_nmi_enable));
 	save_item(NAME(m_sound_enable));
 }
 
 uint8_t tankbatt_state::in0_r(offs_t offset)
 {
-	int val;
-
-	val = ioport("P1")->read();
-	return ((val << (7 - offset)) & 0x80);
+	return BIT(m_player_input[0]->read(), offset) << 7;
 }
 
 uint8_t tankbatt_state::in1_r(offs_t offset)
 {
-	int val;
-
-	val = ioport("P2")->read();
-	return ((val << (7 - offset)) & 0x80);
+	return BIT(m_player_input[1]->read(), offset) << 7;
 }
 
 uint8_t tankbatt_state::dsw_r(offs_t offset)
 {
-	int val;
-
-	val = ioport("DSW")->read();
-	return ((val << (7 - offset)) & 0x80);
+	return BIT(m_dips->read(), offset) << 7;
 }
 
-WRITE_LINE_MEMBER(tankbatt_state::interrupt_enable_w)
+void tankbatt_state::intack_w(uint8_t data)
 {
-	m_nmi_enable = !state;
-	m_sound_enable = !state;
-
-	/* hack - turn off the engine noise if the normal game nmi's are disabled */
-	if (state) m_samples->stop(2);
-}
-
-WRITE_LINE_MEMBER(tankbatt_state::demo_interrupt_enable_w)
-{
-	m_nmi_enable = state;
-}
-
-WRITE_LINE_MEMBER(tankbatt_state::sh_expl_w)
-{
-	if (state) // rising edge
-	{
-		m_samples->start(1, 3);
-	}
-}
-
-WRITE_LINE_MEMBER(tankbatt_state::sh_engine_w)
-{
-	if (m_sound_enable)
-	{
-		if (state)
-			m_samples->start(2, 2, true);
-		else
-			m_samples->start(2, 1, true);
-	}
-	else m_samples->stop(2);
-}
-
-WRITE_LINE_MEMBER(tankbatt_state::sh_fire_w)
-{
-	if (state) // rising edge
-	{
-		m_samples->start(0, 0);
-	}
-}
-
-void tankbatt_state::irq_ack_w(uint8_t data)
-{
-	/* 0x6e written at the end of the irq routine, could be either irq ack or a coin sample */
-	m_maincpu->set_input_line(0, CLEAR_LINE);
+	m_maincpu->set_input_line(m6502_device::IRQ_LINE, CLEAR_LINE);
 }
 
 WRITE_LINE_MEMBER(tankbatt_state::coincounter_w)
@@ -159,29 +122,21 @@
 
 void tankbatt_state::main_map(address_map &map)
 {
-	map(0x0000, 0x000f).ram().share("bulletsram");
-	map(0x0010, 0x01ff).ram();
-	map(0x0200, 0x07ff).ram();
-	map(0x0800, 0x0bff).ram().w(FUNC(tankbatt_state::videoram_w)).share("videoram");
-	map(0x0c00, 0x0c07).r(FUNC(tankbatt_state::in0_r)).w("outlatch", FUNC(cd4099_device::write_d0));
-	map(0x0c08, 0x0c0f).r(FUNC(tankbatt_state::in1_r)).w("mainlatch", FUNC(cd4099_device::write_d0));
-	map(0x0c10, 0x0c10).w(FUNC(tankbatt_state::irq_ack_w));
-	map(0x0c18, 0x0c1f).r(FUNC(tankbatt_state::dsw_r));
-	map(0x0c18, 0x0c18).nopw();    /* watchdog ?? */
-	map(0x6000, 0x7fff).rom().region("maincpu", 0);
-	map(0xe000, 0xffff).rom().region("maincpu", 0); //mirror for the reset/irq vectors
-	map(0x2000, 0x5fff).nopr(); //anything else might be left-over for a diagnostic ROM or something related to the discrete sound HW
-	map(0x8000, 0xdfff).nopr();
-}
-
-INTERRUPT_GEN_MEMBER(tankbatt_state::interrupt)
-{
-	if (m_nmi_enable) device.execute().pulse_input_line(INPUT_LINE_NMI, attotime::zero);
+	map.global_mask(0x3fff);
+	map(0x0000, 0x000f).mirror(0x1000).ram().share("bulletsram");
+	map(0x0010, 0x07ff).mirror(0x1000).ram();
+	map(0x0800, 0x0bff).mirror(0x1000).ram().w(FUNC(tankbatt_state::videoram_w)).share("videoram");
+	map(0x0c00, 0x0c07).mirror(0x13e0).r(FUNC(tankbatt_state::in0_r)).w("outlatch0", FUNC(cd4099_device::write_d0));
+	map(0x0c08, 0x0c0f).mirror(0x13e0).r(FUNC(tankbatt_state::in1_r)).w("outlatch1", FUNC(cd4099_device::write_d0));
+	map(0x0c10, 0x0c10).mirror(0x13e7).w(FUNC(tankbatt_state::intack_w));
+	map(0x0c18, 0x0c1f).mirror(0x13e0).r(FUNC(tankbatt_state::dsw_r));
+	map(0x0c18, 0x0c18).mirror(0x13e7).w("watchdog", FUNC(watchdog_timer_device::reset_w));
+	map(0x2000, 0x3fff).rom().region("maincpu", 0);
 }
 
-INPUT_CHANGED_MEMBER(tankbatt_state::coin_inserted)
+TIMER_DEVICE_CALLBACK_MEMBER(tankbatt_state::scanline_interrupt)
 {
-	m_maincpu->set_input_line(0, ASSERT_LINE);
+	m_maincpu->set_input_line(m6502_device::IRQ_LINE, ASSERT_LINE);
 }
 
 static INPUT_PORTS_START( tankbatt )
@@ -191,9 +146,9 @@
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_4WAY
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_4WAY
 	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 )
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_CHANGED_MEMBER(DEVICE_SELF, tankbatt_state,coin_inserted, 0)
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) PORT_CHANGED_MEMBER(DEVICE_SELF, tankbatt_state,coin_inserted, 0)
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_TILT )
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_COIN1 )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 )
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_SERVICE )
 
 	PORT_START("P2")    /* IN1 */
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_4WAY PORT_COCKTAIL
@@ -258,47 +213,41 @@
 
 
 
-static const char *const tankbatt_sample_names[] =
-{
-	"*tankbatt",
-	"fire",
-	"engine1",
-	"engine2",
-	"explode1",
-	nullptr   /* end of array */
-};
-
-
 void tankbatt_state::tankbatt(machine_config &config)
 {
 	/* basic machine hardware */
-	M6502(config, m_maincpu, 1000000); /* 1 MHz ???? */
+	M6502(config, m_maincpu, 18.432_MHz_XTAL / 24); // ϕ0 = 4H
 	m_maincpu->set_addrmap(AS_PROGRAM, &tankbatt_state::main_map);
-	m_maincpu->set_vblank_int("screen", FUNC(tankbatt_state::interrupt));
 
-	cd4099_device &mainlatch(CD4099(config, "mainlatch")); // latches at 4H and 5H (are the empty 4J and 5J locations for LS259 substitution?)
-	mainlatch.q_out_cb<0>().set_nop(); //coin counter mirror?
-	mainlatch.q_out_cb<2>().set(FUNC(tankbatt_state::interrupt_enable_w));
-	mainlatch.q_out_cb<3>().set(FUNC(tankbatt_state::sh_engine_w));
-	mainlatch.q_out_cb<4>().set(FUNC(tankbatt_state::sh_fire_w));
-	mainlatch.q_out_cb<5>().set(FUNC(tankbatt_state::sh_expl_w)); // bit 7 also set by ASL instruction
-	mainlatch.q_out_cb<6>().set_nop(); // bit 7 also set by ASL instruction
-	mainlatch.q_out_cb<7>().set(FUNC(tankbatt_state::demo_interrupt_enable_w));
-
-	cd4099_device &outlatch(CD4099(config, "outlatch"));
-	outlatch.q_out_cb<0>().set_output("led0");
-	outlatch.q_out_cb<1>().set_output("led1");
-	outlatch.q_out_cb<2>().set(FUNC(tankbatt_state::coincounter_w));
-	outlatch.q_out_cb<3>().set(FUNC(tankbatt_state::coinlockout_w));
+	INPUT_MERGER_ALL_HIGH(config, "nmigate").output_handler().set_inputline(m_maincpu, m6502_device::NMI_LINE);
+
+	TIMER(config, "16v").configure_scanline(FUNC(tankbatt_state::scanline_interrupt), "screen", 16, 32);
+
+	WATCHDOG_TIMER(config, "watchdog").set_vblank_count("screen", 16); // system reset pulse is ripple carry output of 74LS161 at 7C
+
+	cd4099_device &outlatch0(CD4099(config, "outlatch0")); // 4099 at 5H or 259 at 5J
+	outlatch0.q_out_cb<0>().set_output("led0");
+	outlatch0.q_out_cb<1>().set_output("led1");
+	outlatch0.q_out_cb<2>().set(FUNC(tankbatt_state::coincounter_w));
+	outlatch0.q_out_cb<3>().set(FUNC(tankbatt_state::coinlockout_w));
+	// Q4 through Q7 are not connected
+
+	cd4099_device &outlatch1(CD4099(config, "outlatch1")); // 4099 at 4H or 259 at 4J
+	outlatch1.q_out_cb<0>().set(m_sound_s1, FUNC(netlist_mame_logic_input_device::write_line));
+	outlatch1.q_out_cb<1>().set(m_sound_s2, FUNC(netlist_mame_logic_input_device::write_line));
+	outlatch1.q_out_cb<2>().set(m_sound_off, FUNC(netlist_mame_logic_input_device::write_line));
+	outlatch1.q_out_cb<3>().set(m_sound_engine_hi, FUNC(netlist_mame_logic_input_device::write_line));
+	outlatch1.q_out_cb<4>().set(m_sound_shoot, FUNC(netlist_mame_logic_input_device::write_line));
+	outlatch1.q_out_cb<5>().set(m_sound_hit, FUNC(netlist_mame_logic_input_device::write_line));
+	// Q6 is not connected
+	outlatch1.q_out_cb<7>().set("nmigate", FUNC(input_merger_device::in_w<1>));
 
 	/* video hardware */
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(60);
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
-	screen.set_size(32*8, 32*8);
-	screen.set_visarea(0*8, 32*8-1, 2*8, 30*8-1);
+	screen.set_raw(18.432_MHz_XTAL / 3, 384, 0, 256, 264, 16, 240); // timing chain is same as in Galaxian
 	screen.set_screen_update(FUNC(tankbatt_state::screen_update));
 	screen.set_palette(m_palette);
+	screen.screen_vblank().set("nmigate", FUNC(input_merger_device::in_w<0>));
 
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_tankbatt);
 	PALETTE(config, m_palette, FUNC(tankbatt_state::tankbatt_palette), 256*2, 256);
@@ -306,10 +255,18 @@
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
 
-	SAMPLES(config, m_samples);
-	m_samples->set_channels(3);
-	m_samples->set_samples_names(tankbatt_sample_names);
-	m_samples->add_route(ALL_OUTPUTS, "mono", 0.25);
+	NETLIST_SOUND(config, "sound_nl", 48000)
+		.set_source(NETLIST_NAME(tankbatt))
+		.add_route(ALL_OUTPUTS, "mono", 1.0);
+
+	NETLIST_LOGIC_INPUT(config, "sound_nl:s1", "S1.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:s2", "S2.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:off", "OFF.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:engine_hi", "ENGINE_HI.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:shoot", "SHOOT.IN", 0);
+	NETLIST_LOGIC_INPUT(config, "sound_nl:hit", "HIT.IN", 0);
+
+	NETLIST_STREAM_OUTPUT(config, "sound_nl:cout0", 0, "R35.2").set_mult_offset(10000.0, 0.0);
 }
 
 
@@ -348,5 +305,5 @@
 	ROM_LOAD( "bct1-1.l3", 0x0000, 0x0100, CRC(d17518bc) SHA1(f3b0deffa586808bc59e9a24ec1699c54ebe84cc) ) // dm74s287n.3l
 ROM_END
 
-GAME( 1980, tankbatt,  0,        tankbatt, tankbatt, tankbatt_state, empty_init, ROT90, "Namco",   "Tank Battalion", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, tankbattb, tankbatt, tankbatt, tankbatt, tankbatt_state, empty_init, ROT90, "bootleg", "Tank Battalion (bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tankbatt,  0,        tankbatt, tankbatt, tankbatt_state, empty_init, ROT90, "Namco",   "Tank Battalion", MACHINE_IMPERFECT_COLORS |MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tankbattb, tankbatt, tankbatt, tankbatt, tankbatt_state, empty_init, ROT90, "bootleg", "Tank Battalion (bootleg)", MACHINE_IMPERFECT_COLORS | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tec1.cpp mame-0.224+dfsg.1/src/mame/drivers/tec1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tec1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tec1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -42,10 +42,12 @@
 to get it to register.
 
 Inbuilt games - press the following sequence of keys:
-- Welcome: RESET D 1 + 0 2 AD 0 2 7 0 GO GO (Paste: D1^02 -0270XX)
-- Nim: RESET AD 3 E 0 GO GO (Paste: -3E0XX)
-- Invaders: RESET AD 3 2 0 GO GO (Paste: -320XX)
-- Luna Lander: RESET AD 4 9 0 GO GO (Paste: -490XX)
+- Invaders:     RESET AD 0 0 0 8 GO GO (Paste: -0008XX)
+- Nim:          RESET AD 0 0 1 0 GO GO (Paste: -0010XX)
+- Lunar Lander: RESET AD 0 0 1 8 GO GO (Paste: -0018XX)
+Tunes:
+- Bealach An Doirin: RESET AD 0 0 2 8 GO GO (Paste: -0028XX)
+- Biking up the strand: RESET AD 0 0 3 0 GO GO (Paste: -0030XX)
 
 Thanks to Chris Schwartz who dumped his ROM for me way back in the old days.
 It's only taken 25 years to get around to emulating it...
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tecmo.cpp mame-0.224+dfsg.1/src/mame/drivers/tecmo.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tecmo.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tecmo.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1105,6 +1105,12 @@
  sound cpu: sharp LH0080A  Z80A @ 4MHz  8705
  this set shows "GF" (revision?) on title screen
  this seems to be a bootleg of a prototype, not sure if it's the other proto set hacked or another rev proto
+ some of the tile roms are half size but the original has a lot of unused data so nothing is missing in game.
+ the various Mitsubishi custom chips present on original board are implemented with standard ttl chips:
+   MN50005XTA on the main board is 11 ttl chips
+   M60002-0118P on the video board is 27 ttl chips
+   MA7053 sil module on the main board is 4 ttl chips
+   these are all properly integrated into the design of the boards, not plug-in sub/daughter boards.
 */
 ROM_START( silkwormb )
 	ROM_REGION( 0x20000, "maincpu", 0 )
@@ -1133,7 +1139,7 @@
 	ROM_LOAD( "silkworm.14",  0x00000, 0x10000, CRC(409df64b) SHA1(cada970bf9cc8f6522e7a71e00fe873568852873) )  /* bg tiles TMM24512 */
 	ROM_LOAD( "e14.15",       0x10000, 0x08000, CRC(b02acdb6) SHA1(6be74bb89680b79b3a5d13af638ed5a0bb077dad) )  /* bg tiles 27C256   */
 	ROM_LOAD( "e15.16",       0x20000, 0x08000, CRC(caf7b25e) SHA1(2c348af9d03efd801cbbc06deb02869bd6449518) )  /* bg tiles 27C256   */
-	ROM_LOAD( "e16.17",       0x30000, 0x08000, CRC(7ec93873) SHA1(0993a3b3e5ca84ef0ea32159825e379ba4cc5fbb) )  /* bg tiles 27C256   */
+	ROM_LOAD( "e16.17",       0x38000, 0x08000, CRC(7ec93873) SHA1(0993a3b3e5ca84ef0ea32159825e379ba4cc5fbb) )  /* bg tiles 27C256   */
 ROM_END
 
 /*
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tecnodar.cpp mame-0.224+dfsg.1/src/mame/drivers/tecnodar.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tecnodar.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tecnodar.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,341 @@
+// license:BSD-3-Clause
+// copyright-holders:AJR
+/*******************************************************************************
+    Skeleton driver for Automatics Pasqual darts with CRT display.
+  ________________________________________________________________________________
+  |    _______                              _______  ______                       |
+  |    |__CN__|                             |__CN__| |__CN_|                  ___ |
+  |   ___  ___                                                                |  ||
+  |   |F|  |F|                   __________                              ___  |  ||
+  |   |U|  |U|                   |74LS373N_|                        ____ |  | |  ||
+  |   |S|  |S|   __________     ___________                         |___||  | |  ||
+  |   |E|  |E|  KS74HCTLS379N   | RAM      |        _________            |  | |C ||
+  |                             |__________|       |_LM380N_|   ______   |__| |N ||
+  |              _________     ____________         _________  |     |   ___  |  ||
+  |              |SN74HC14N    | EMPTY     |       |MT4264-10  |     |   |  | |  ||
+  |                            |___________|        _________  |     |   |  | |  ||
+  |              _________     ____________        |MT4264-10 TMP82C55AP-2  | |  ||
+  |              |74HC32AP|    | EMPTY     |        _________  |     |   |__| |__||
+  |                            |___________|       |MT4264-10  |     |   ___  ___ |
+  |        ___   _________     ____________         _________  |     |   |  | |C ||
+  |        |F|   |GAL16V8_|    | ROM 3     |       |MT4264-10  |_____|   |  | |N ||
+  |        |U|                 |___________|        _________    ______  |  | |  ||
+  |        |S|   _________     ____________        |MT4264-10   |     |  |__|<-ULN2903A
+  |        |E|   |74HC244AP    | ROM 2     |        _________   |     |       |__||
+  |                            |___________|       |MT4264-10   |     |       ___ |
+  |        ___   _________     ____________         _________   |     |       |CN||
+  |        |F|   |74HC244AP    | ROM 1     |       |MT4264-10  AY38910A/P     |__||
+  |        |U|                 |___________|        _________   |     |       ___ |
+  |        |S|       _________    _________  _____ |MT4264-10   |     |       |  ||
+  |        |E|      |74HC244AP   |74HC245AP |XTAL 10.245MHz     |_____|       |C ||
+  |                        ________________    ________________  _____        |N ||
+  |            _________   |Z8400A PS      |   |VIDEO          | |DIPS        |__||
+  |           |_GD4011B|   |_______________|   |_______________|   _________      |
+  |                                                               |CD40208E|      |
+  |_______________________________________________________________________________|
+
+*******************************************************************************/
+
+#include "emu.h"
+#include "cpu/z80/z80.h"
+#include "machine/eepromser.h"
+#include "machine/i8255.h"
+#include "sound/ay8910.h"
+#include "video/tms9928a.h"
+#include "screen.h"
+#include "speaker.h"
+
+class tecnodar_state : public driver_device
+{
+public:
+	tecnodar_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_ppi(*this, "ppi")
+		, m_eeprom(*this, "eeprom")
+		, m_psg(*this, "psg")
+		, m_rombank(*this, "rombank")
+		, m_coins(*this, "COINS")
+		, m_inputs(*this, "IN%u", 0U)
+		, m_input_select(0xffff)
+	{
+	}
+
+	void tecnodar(machine_config &config);
+
+protected:
+	virtual void machine_start() override;
+
+private:
+	void bank_w(offs_t offset, u8 data);
+	u8 inputs_r();
+	u8 ppi_r(offs_t offset);
+	void ppi_w(offs_t offset, u8 data);
+	void ppi_pa_w(u8 data);
+	void ppi_pb_w(u8 data);
+	void ppi_pc_w(u8 data);
+
+	void mem_map(address_map &map);
+	void io_map(address_map &map);
+
+	required_device<z80_device> m_maincpu;
+	required_device<i8255_device> m_ppi;
+	required_device<eeprom_serial_93cxx_device> m_eeprom;
+	required_device<ay8910_device> m_psg;
+	required_memory_bank m_rombank;
+	required_ioport m_coins;
+	required_ioport_array<16> m_inputs;
+
+	u16 m_input_select;
+};
+
+
+void tecnodar_state::machine_start()
+{
+	m_rombank->configure_entries(0, 8, memregion("banked")->base(), 0x4000);
+	m_rombank->set_entry(0);
+
+	save_item(NAME(m_input_select));
+}
+
+
+void tecnodar_state::bank_w(offs_t offset, u8 data)
+{
+	m_rombank->set_entry((offset & 0x0c) >> 2 | (offset & 0x01) << 2);
+}
+
+u8 tecnodar_state::inputs_r()
+{
+	u8 ret = 0xf;
+	for (int i = 0; i < 16; i++)
+		if (!BIT(m_input_select, i))
+			ret &= m_inputs[i]->read();
+
+	return (ret << 4) | m_coins->read();
+}
+
+u8 tecnodar_state::ppi_r(offs_t offset)
+{
+	return m_ppi->read(offset >> 5);
+}
+
+void tecnodar_state::ppi_w(offs_t offset, u8 data)
+{
+	m_ppi->write(offset >> 5, data);
+}
+
+void tecnodar_state::ppi_pa_w(u8 data)
+{
+	m_eeprom->cs_write(BIT(data, 0));
+	m_eeprom->clk_write(BIT(data, 1));
+	m_eeprom->di_write(BIT(data, 2));
+
+	m_input_select = (m_input_select & 0xff00) | data;
+}
+
+void tecnodar_state::ppi_pb_w(u8 data)
+{
+	if (!BIT(data, 7))
+		m_psg->reset(); // maybe
+
+	logerror("%s: Writing %02X to PPI port B\n", machine().describe_context(), data);
+}
+
+void tecnodar_state::ppi_pc_w(u8 data)
+{
+	m_input_select = u16(data) << 8 | (m_input_select & 0x00ff);
+}
+
+void tecnodar_state::mem_map(address_map &map)
+{
+	map(0x0000, 0x3fff).rom().region("program", 0);
+	map(0x4000, 0x7fff).bankr("rombank");
+	map(0x8002, 0x8002).select(0x60).rw(FUNC(tecnodar_state::ppi_r), FUNC(tecnodar_state::ppi_w));
+	map(0x8004, 0x8004).w("psg", FUNC(ay8910_device::data_w));
+	map(0x8008, 0x8008).r("psg", FUNC(ay8910_device::data_r));
+	map(0x800c, 0x800c).w("psg", FUNC(ay8910_device::address_w));
+	map(0x8010, 0x8011).rw("vdp", FUNC(tms9129_device::read), FUNC(tms9129_device::write));
+	map(0xc000, 0xc7ff).ram();
+}
+
+void tecnodar_state::io_map(address_map &map)
+{
+	map.global_mask(0xff);
+	map(0x00, 0xff).w(FUNC(tecnodar_state::bank_w));
+}
+
+
+static INPUT_PORTS_START(tecnodar)
+	PORT_START("DSW")
+	PORT_DIPNAME(0x01, 0x01, DEF_STR(Unknown))
+	PORT_DIPSETTING(0x01, DEF_STR(Off))
+	PORT_DIPSETTING(0x00, DEF_STR(On))
+	PORT_DIPNAME(0x02, 0x02, DEF_STR(Unknown))
+	PORT_DIPSETTING(0x02, DEF_STR(Off))
+	PORT_DIPSETTING(0x00, DEF_STR(On))
+	PORT_DIPNAME(0x04, 0x04, DEF_STR(Unknown))
+	PORT_DIPSETTING(0x04, DEF_STR(Off))
+	PORT_DIPSETTING(0x00, DEF_STR(On))
+	PORT_DIPNAME(0x08, 0x08, DEF_STR(Unknown))
+	PORT_DIPSETTING(0x08, DEF_STR(Off))
+	PORT_DIPSETTING(0x00, DEF_STR(On))
+	PORT_DIPNAME(0x10, 0x10, DEF_STR(Unknown))
+	PORT_DIPSETTING(0x10, DEF_STR(Off))
+	PORT_DIPSETTING(0x00, DEF_STR(On))
+	PORT_DIPNAME(0x20, 0x20, DEF_STR(Unknown))
+	PORT_DIPSETTING(0x20, DEF_STR(Off))
+	PORT_DIPSETTING(0x00, DEF_STR(On))
+	PORT_DIPNAME(0x40, 0x40, DEF_STR(Unknown))
+	PORT_DIPSETTING(0x40, DEF_STR(Off))
+	PORT_DIPSETTING(0x00, DEF_STR(On))
+	PORT_DIPNAME(0x80, 0x80, DEF_STR(Unused))
+	PORT_DIPSETTING(0x80, DEF_STR(Off))
+	PORT_DIPSETTING(0x00, DEF_STR(On))
+
+	PORT_START("COINS")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_COIN1)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_COIN2)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN0")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN1")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN2")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN3")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN4")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN5")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN6")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN7")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN8")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN9")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN10")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN11")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN12")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN13")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN14")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+
+	PORT_START("IN15")
+	PORT_BIT(0x1, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x2, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x4, IP_ACTIVE_LOW, IPT_UNKNOWN)
+	PORT_BIT(0x8, IP_ACTIVE_LOW, IPT_UNKNOWN)
+INPUT_PORTS_END
+
+
+void tecnodar_state::tecnodar(machine_config &config)
+{
+	Z80(config, m_maincpu, 10.245_MHz_XTAL / 3); // GoldStar Z8400APS; divider not verified
+	m_maincpu->set_addrmap(AS_PROGRAM, &tecnodar_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &tecnodar_state::io_map);
+	// NMI is some sort of reset control
+
+	I8255(config, m_ppi); // TMP82C55AP-2
+	m_ppi->out_pa_callback().set(FUNC(tecnodar_state::ppi_pa_w));
+	m_ppi->out_pb_callback().set(FUNC(tecnodar_state::ppi_pb_w));
+	m_ppi->in_pc_callback().set(m_eeprom, FUNC(eeprom_serial_93cxx_device::do_read)).bit(0);
+	m_ppi->out_pc_callback().set(FUNC(tecnodar_state::ppi_pc_w));
+
+	EEPROM_93C46_8BIT(config, m_eeprom); // unknown 8-pin IC
+
+	SCREEN(config, "screen", SCREEN_TYPE_RASTER);
+
+	tms9129_device &vdp(TMS9129(config, "vdp", 10.245_MHz_XTAL)); // surface-scratched 40-pin DIP; exact type unknown
+	vdp.set_screen("screen");
+	vdp.set_vram_size(0x10000); // 8x MT4264-10
+	vdp.int_callback().set_inputline(m_maincpu, INPUT_LINE_IRQ0);
+
+	SPEAKER(config, "mono").front_center();
+
+	AY8910(config, m_psg, 10.245_MHz_XTAL / 6); // Microchip AY38910A/P; divider not verified
+	m_psg->port_a_read_callback().set_ioport("DSW");
+	m_psg->port_b_read_callback().set(FUNC(tecnodar_state::inputs_r));
+	m_psg->add_route(ALL_OUTPUTS, "mono", 1.0);
+}
+
+
+ROM_START(tecnodar)
+	ROM_REGION(0x4000, "program", 0)
+	ROM_LOAD("1_100_333_27c128.bin", 0x0000, 0x4000, CRC(62cdac49) SHA1(7d3c013b14b5db1378c80e24e3e88ddea2d930ec))
+
+	ROM_REGION(0x20000, "banked", 0)
+	ROM_LOAD("2_100_tecno_27c512.bin", 0x00000, 0x10000, CRC(971c0c62) SHA1(0eb6a29a5e07e2ed85d9fc298077fa522213e624))
+	ROM_LOAD("3_100_333_27c512.bin", 0x10000, 0x10000, CRC(f9bbbfe0) SHA1(505480188b4641cf48ca33f1600d4ec501122844))
+	// 2 more ROM sockets are empty
+ROM_END
+
+
+GAME(1991, tecnodar, 0, tecnodar, tecnodar, tecnodar_state, empty_init, ROT0, "Automatics Pasqual", "Tecnodarts", MACHINE_MECHANICAL | MACHINE_NOT_WORKING)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tempest.cpp mame-0.224+dfsg.1/src/mame/drivers/tempest.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tempest.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tempest.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -711,15 +711,15 @@
 
 	/* Mathbox PROMs */
 	ROM_REGION( 0x20, "user2", 0 )
-	ROM_LOAD( "136002.126",   0x0000, 0x0020, CRC(8b04f921) SHA1(317b3397482f13b2d1bc21f296d3b3f9a118787b) )
+	ROM_LOAD( "136002-126.a1",   0x0000, 0x0020, CRC(8b04f921) SHA1(317b3397482f13b2d1bc21f296d3b3f9a118787b) )
 
 	ROM_REGION32_BE( 0x400, "user3", 0 )
-	ROMX_LOAD( "136002.132", 0, 0x100, CRC(2af82e87) SHA1(3816835a9ccf99a76d246adf204989d9261bb065), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.131", 0, 0x100, CRC(b31f6e24) SHA1(ce5f8ca34d06a5cfa0076b47400e61e0130ffe74), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
-	ROMX_LOAD( "136002.130", 1, 0x100, CRC(8119b847) SHA1(c4fbaedd4ce1ad6a4128cbe902b297743edb606a), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.129", 1, 0x100, CRC(09f5a4d5) SHA1(d6f2ac07ca9ee385c08831098b0dcaf56808993b), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
-	ROMX_LOAD( "136002.128", 2, 0x100, CRC(823b61ae) SHA1(d99a839874b45f64e14dae92a036e47a53705d16), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.127", 2, 0x100, CRC(276eadd5) SHA1(55718cd8ec4bcf75076d5ef0ee1ed2551e19d9ba), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-132.l1", 0, 0x100, CRC(2af82e87) SHA1(3816835a9ccf99a76d246adf204989d9261bb065), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-131.k1", 0, 0x100, CRC(b31f6e24) SHA1(ce5f8ca34d06a5cfa0076b47400e61e0130ffe74), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-130.j1", 1, 0x100, CRC(8119b847) SHA1(c4fbaedd4ce1ad6a4128cbe902b297743edb606a), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-129.h1", 1, 0x100, CRC(09f5a4d5) SHA1(d6f2ac07ca9ee385c08831098b0dcaf56808993b), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-128.f1", 2, 0x100, CRC(823b61ae) SHA1(d99a839874b45f64e14dae92a036e47a53705d16), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-127.e1", 2, 0x100, CRC(276eadd5) SHA1(55718cd8ec4bcf75076d5ef0ee1ed2551e19d9ba), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
 ROM_END
 
 
@@ -741,15 +741,15 @@
 
 	/* Mathbox PROMs */
 	ROM_REGION( 0x20, "user2", 0 )
-	ROM_LOAD( "136002.126",   0x0000, 0x0020, CRC(8b04f921) SHA1(317b3397482f13b2d1bc21f296d3b3f9a118787b) )
+	ROM_LOAD( "136002-126.a1",   0x0000, 0x0020, CRC(8b04f921) SHA1(317b3397482f13b2d1bc21f296d3b3f9a118787b) )
 
 	ROM_REGION32_BE( 0x400, "user3", 0 )
-	ROMX_LOAD( "136002.132", 0, 0x100, CRC(2af82e87) SHA1(3816835a9ccf99a76d246adf204989d9261bb065), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.131", 0, 0x100, CRC(b31f6e24) SHA1(ce5f8ca34d06a5cfa0076b47400e61e0130ffe74), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
-	ROMX_LOAD( "136002.130", 1, 0x100, CRC(8119b847) SHA1(c4fbaedd4ce1ad6a4128cbe902b297743edb606a), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.129", 1, 0x100, CRC(09f5a4d5) SHA1(d6f2ac07ca9ee385c08831098b0dcaf56808993b), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
-	ROMX_LOAD( "136002.128", 2, 0x100, CRC(823b61ae) SHA1(d99a839874b45f64e14dae92a036e47a53705d16), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.127", 2, 0x100, CRC(276eadd5) SHA1(55718cd8ec4bcf75076d5ef0ee1ed2551e19d9ba), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-132.l1", 0, 0x100, CRC(2af82e87) SHA1(3816835a9ccf99a76d246adf204989d9261bb065), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-131.k1", 0, 0x100, CRC(b31f6e24) SHA1(ce5f8ca34d06a5cfa0076b47400e61e0130ffe74), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-130.j1", 1, 0x100, CRC(8119b847) SHA1(c4fbaedd4ce1ad6a4128cbe902b297743edb606a), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-129.h1", 1, 0x100, CRC(09f5a4d5) SHA1(d6f2ac07ca9ee385c08831098b0dcaf56808993b), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-128.f1", 2, 0x100, CRC(823b61ae) SHA1(d99a839874b45f64e14dae92a036e47a53705d16), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-127.e1", 2, 0x100, CRC(276eadd5) SHA1(55718cd8ec4bcf75076d5ef0ee1ed2551e19d9ba), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
 ROM_END
 
 
@@ -777,15 +777,15 @@
 
 	/* Mathbox PROMs */
 	ROM_REGION( 0x20, "user2", 0 )
-	ROM_LOAD( "136002.126",   0x0000, 0x0020, CRC(8b04f921) SHA1(317b3397482f13b2d1bc21f296d3b3f9a118787b) )
+	ROM_LOAD( "136002-126.a1",   0x0000, 0x0020, CRC(8b04f921) SHA1(317b3397482f13b2d1bc21f296d3b3f9a118787b) )
 
 	ROM_REGION32_BE( 0x400, "user3", 0 )
-	ROMX_LOAD( "136002.132", 0, 0x100, CRC(2af82e87) SHA1(3816835a9ccf99a76d246adf204989d9261bb065), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.131", 0, 0x100, CRC(b31f6e24) SHA1(ce5f8ca34d06a5cfa0076b47400e61e0130ffe74), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
-	ROMX_LOAD( "136002.130", 1, 0x100, CRC(8119b847) SHA1(c4fbaedd4ce1ad6a4128cbe902b297743edb606a), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.129", 1, 0x100, CRC(09f5a4d5) SHA1(d6f2ac07ca9ee385c08831098b0dcaf56808993b), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
-	ROMX_LOAD( "136002.128", 2, 0x100, CRC(823b61ae) SHA1(d99a839874b45f64e14dae92a036e47a53705d16), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.127", 2, 0x100, CRC(276eadd5) SHA1(55718cd8ec4bcf75076d5ef0ee1ed2551e19d9ba), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-132.l1", 0, 0x100, CRC(2af82e87) SHA1(3816835a9ccf99a76d246adf204989d9261bb065), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-131.k1", 0, 0x100, CRC(b31f6e24) SHA1(ce5f8ca34d06a5cfa0076b47400e61e0130ffe74), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-130.j1", 1, 0x100, CRC(8119b847) SHA1(c4fbaedd4ce1ad6a4128cbe902b297743edb606a), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-129.h1", 1, 0x100, CRC(09f5a4d5) SHA1(d6f2ac07ca9ee385c08831098b0dcaf56808993b), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-128.f1", 2, 0x100, CRC(823b61ae) SHA1(d99a839874b45f64e14dae92a036e47a53705d16), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-127.e1", 2, 0x100, CRC(276eadd5) SHA1(55718cd8ec4bcf75076d5ef0ee1ed2551e19d9ba), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
 ROM_END
 
 
@@ -813,15 +813,15 @@
 
 	/* Mathbox PROMs */
 	ROM_REGION( 0x20, "user2", 0 )
-	ROM_LOAD( "136002.126",   0x0000, 0x0020, CRC(8b04f921) SHA1(317b3397482f13b2d1bc21f296d3b3f9a118787b) )
+	ROM_LOAD( "136002-126.a1",   0x0000, 0x0020, CRC(8b04f921) SHA1(317b3397482f13b2d1bc21f296d3b3f9a118787b) )
 
 	ROM_REGION32_BE( 0x400, "user3", 0 )
-	ROMX_LOAD( "136002.132", 0, 0x100, CRC(2af82e87) SHA1(3816835a9ccf99a76d246adf204989d9261bb065), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.131", 0, 0x100, CRC(b31f6e24) SHA1(ce5f8ca34d06a5cfa0076b47400e61e0130ffe74), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
-	ROMX_LOAD( "136002.130", 1, 0x100, CRC(8119b847) SHA1(c4fbaedd4ce1ad6a4128cbe902b297743edb606a), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.129", 1, 0x100, CRC(09f5a4d5) SHA1(d6f2ac07ca9ee385c08831098b0dcaf56808993b), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
-	ROMX_LOAD( "136002.128", 2, 0x100, CRC(823b61ae) SHA1(d99a839874b45f64e14dae92a036e47a53705d16), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.127", 2, 0x100, CRC(276eadd5) SHA1(55718cd8ec4bcf75076d5ef0ee1ed2551e19d9ba), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-132.l1", 0, 0x100, CRC(2af82e87) SHA1(3816835a9ccf99a76d246adf204989d9261bb065), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-131.k1", 0, 0x100, CRC(b31f6e24) SHA1(ce5f8ca34d06a5cfa0076b47400e61e0130ffe74), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-130.j1", 1, 0x100, CRC(8119b847) SHA1(c4fbaedd4ce1ad6a4128cbe902b297743edb606a), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-129.h1", 1, 0x100, CRC(09f5a4d5) SHA1(d6f2ac07ca9ee385c08831098b0dcaf56808993b), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-128.f1", 2, 0x100, CRC(823b61ae) SHA1(d99a839874b45f64e14dae92a036e47a53705d16), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-127.e1", 2, 0x100, CRC(276eadd5) SHA1(55718cd8ec4bcf75076d5ef0ee1ed2551e19d9ba), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
 ROM_END
 
 
@@ -849,15 +849,15 @@
 
 	/* Mathbox PROMs */
 	ROM_REGION( 0x20, "user2", 0 )
-	ROM_LOAD( "136002.126",   0x0000, 0x0020, CRC(8b04f921) SHA1(317b3397482f13b2d1bc21f296d3b3f9a118787b) )
+	ROM_LOAD( "136002-126.a1",   0x0000, 0x0020, CRC(8b04f921) SHA1(317b3397482f13b2d1bc21f296d3b3f9a118787b) )
 
 	ROM_REGION32_BE( 0x400, "user3", 0 )
-	ROMX_LOAD( "136002.132", 0, 0x100, CRC(2af82e87) SHA1(3816835a9ccf99a76d246adf204989d9261bb065), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.131", 0, 0x100, CRC(b31f6e24) SHA1(ce5f8ca34d06a5cfa0076b47400e61e0130ffe74), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
-	ROMX_LOAD( "136002.130", 1, 0x100, CRC(8119b847) SHA1(c4fbaedd4ce1ad6a4128cbe902b297743edb606a), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.129", 1, 0x100, CRC(09f5a4d5) SHA1(d6f2ac07ca9ee385c08831098b0dcaf56808993b), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
-	ROMX_LOAD( "136002.128", 2, 0x100, CRC(823b61ae) SHA1(d99a839874b45f64e14dae92a036e47a53705d16), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.127", 2, 0x100, CRC(276eadd5) SHA1(55718cd8ec4bcf75076d5ef0ee1ed2551e19d9ba), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-132.l1", 0, 0x100, CRC(2af82e87) SHA1(3816835a9ccf99a76d246adf204989d9261bb065), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-131.k1", 0, 0x100, CRC(b31f6e24) SHA1(ce5f8ca34d06a5cfa0076b47400e61e0130ffe74), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-130.j1", 1, 0x100, CRC(8119b847) SHA1(c4fbaedd4ce1ad6a4128cbe902b297743edb606a), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-129.h1", 1, 0x100, CRC(09f5a4d5) SHA1(d6f2ac07ca9ee385c08831098b0dcaf56808993b), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-128.f1", 2, 0x100, CRC(823b61ae) SHA1(d99a839874b45f64e14dae92a036e47a53705d16), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-127.e1", 2, 0x100, CRC(276eadd5) SHA1(55718cd8ec4bcf75076d5ef0ee1ed2551e19d9ba), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
 ROM_END
 
 
@@ -885,15 +885,15 @@
 
 	/* Mathbox PROMs */
 	ROM_REGION( 0x20, "user2", 0 )
-	ROM_LOAD( "136002.126",   0x0000, 0x0020, CRC(8b04f921) SHA1(317b3397482f13b2d1bc21f296d3b3f9a118787b) )
+	ROM_LOAD( "136002-126.a1",   0x0000, 0x0020, CRC(8b04f921) SHA1(317b3397482f13b2d1bc21f296d3b3f9a118787b) )
 
 	ROM_REGION32_BE( 0x400, "user3", 0 )
-	ROMX_LOAD( "136002.132", 0, 0x100, CRC(2af82e87) SHA1(3816835a9ccf99a76d246adf204989d9261bb065), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.131", 0, 0x100, CRC(b31f6e24) SHA1(ce5f8ca34d06a5cfa0076b47400e61e0130ffe74), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
-	ROMX_LOAD( "136002.130", 1, 0x100, CRC(8119b847) SHA1(c4fbaedd4ce1ad6a4128cbe902b297743edb606a), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.129", 1, 0x100, CRC(09f5a4d5) SHA1(d6f2ac07ca9ee385c08831098b0dcaf56808993b), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
-	ROMX_LOAD( "136002.128", 2, 0x100, CRC(823b61ae) SHA1(d99a839874b45f64e14dae92a036e47a53705d16), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
-	ROMX_LOAD( "136002.127", 2, 0x100, CRC(276eadd5) SHA1(55718cd8ec4bcf75076d5ef0ee1ed2551e19d9ba), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-132.l1", 0, 0x100, CRC(2af82e87) SHA1(3816835a9ccf99a76d246adf204989d9261bb065), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-131.k1", 0, 0x100, CRC(b31f6e24) SHA1(ce5f8ca34d06a5cfa0076b47400e61e0130ffe74), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-130.j1", 1, 0x100, CRC(8119b847) SHA1(c4fbaedd4ce1ad6a4128cbe902b297743edb606a), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-129.h1", 1, 0x100, CRC(09f5a4d5) SHA1(d6f2ac07ca9ee385c08831098b0dcaf56808993b), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
+	ROMX_LOAD( "136002-128.f1", 2, 0x100, CRC(823b61ae) SHA1(d99a839874b45f64e14dae92a036e47a53705d16), ROM_NIBBLE | ROM_SHIFT_NIBBLE_LO | ROM_SKIP(3))
+	ROMX_LOAD( "136002-127.e1", 2, 0x100, CRC(276eadd5) SHA1(55718cd8ec4bcf75076d5ef0ee1ed2551e19d9ba), ROM_NIBBLE | ROM_SHIFT_NIBBLE_HI | ROM_SKIP(3))
 ROM_END
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tetrisp2.cpp mame-0.224+dfsg.1/src/mame/drivers/tetrisp2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tetrisp2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tetrisp2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1929,7 +1929,7 @@
 //  mscreen.set_palette(m_vj_palette_m));
 
 	screen_device &rscreen(SCREEN(config, "rscreen", SCREEN_TYPE_RASTER));
-	rscreen.set_orientation(ROT270);;
+	rscreen.set_orientation(ROT270);
 	rscreen.set_refresh_hz(30);
 	rscreen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
 	rscreen.set_size(0x160, 0xf0);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/thunderx.cpp mame-0.224+dfsg.1/src/mame/drivers/thunderx.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/thunderx.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/thunderx.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -727,46 +727,54 @@
 	ROM_LOAD( "775-c01.bin", 0x00000, 0x08000, CRC(0ced785a) SHA1(1eebe005a968fbaac595c168499107e34763976c) )
 
 	ROM_REGION( 0x100000, "k052109", 0 )    /* tiles */
-	ROM_LOAD32_BYTE( "775-a07a.bin", 0x00000, 0x20000, CRC(e716bdf3) SHA1(82e10132f248aed8cc1aea6bb7afe9a1479c8b59) )
-	ROM_LOAD32_BYTE( "775-a07e.bin", 0x00001, 0x20000, CRC(0986e3a5) SHA1(61c33a3f2e4fde7d23d440b5c3151fe38e25716b) )
-	ROM_LOAD32_BYTE( "775-a08a.bin", 0x00002, 0x20000, CRC(3ddd11a4) SHA1(4831a891d6cb4507053d576eddd658c338318176) )
-	ROM_LOAD32_BYTE( "775-a08e.bin", 0x00003, 0x20000, CRC(1007d963) SHA1(cba4ca058dee1c8cdeb019e1cc50cae76bf419a1) )
-	ROM_LOAD32_BYTE( "775-f07c.bin", 0x80000, 0x10000, CRC(b0b30915) SHA1(0abd858f93f7cc5383a805a5ae06c086c120f208) )
-	ROM_LOAD32_BYTE( "775-f07g.bin", 0x80001, 0x10000, CRC(fbed827d) SHA1(7fcc6cc03ab6238b05799dd50f38c29eb9f98b5a) )
-	ROM_LOAD32_BYTE( "775-f08c.bin", 0x80002, 0x10000, CRC(53abdaec) SHA1(0e0f7fe4bb9139a1ae94506a832153b711961564) )
-	ROM_LOAD32_BYTE( "775-f08g.bin", 0x80003, 0x10000, CRC(3df85a6e) SHA1(25a49abbf6e9fe63d4ff6bfff9219c98aa1b5e7b) )
-	ROM_LOAD32_BYTE( "775-f07d.bin", 0xc0000, 0x10000, CRC(f184be8e) SHA1(c266be12762f7e81edbe4b36f3c96b03f6ec552b) )
-	ROM_LOAD32_BYTE( "775-f07h.bin", 0xc0001, 0x10000, CRC(7b56c348) SHA1(f75c1c0962389f204c8cf1a0bc2da01a922cd742) )
-	ROM_LOAD32_BYTE( "775-f08d.bin", 0xc0002, 0x10000, CRC(102dcace) SHA1(03036b6d9d66a12cb3e97980f149c09d1efbd6d8) )
-	ROM_LOAD32_BYTE( "775-f08h.bin", 0xc0003, 0x10000, CRC(ad9d7016) SHA1(91e9f279b781eefcafffc70afe207f35cc6f4d9d) )
+	ROM_LOAD32_BYTE( "775-a07a.6f", 0x00000, 0x20000, CRC(e716bdf3) SHA1(82e10132f248aed8cc1aea6bb7afe9a1479c8b59) )
+	ROM_LOAD32_BYTE( "775-a07e.5f", 0x00001, 0x20000, CRC(0986e3a5) SHA1(61c33a3f2e4fde7d23d440b5c3151fe38e25716b) )
+	ROM_LOAD32_BYTE( "775-a08a.4f", 0x00002, 0x20000, CRC(3ddd11a4) SHA1(4831a891d6cb4507053d576eddd658c338318176) )
+	ROM_LOAD32_BYTE( "775-a08e.3f", 0x00003, 0x20000, CRC(1007d963) SHA1(cba4ca058dee1c8cdeb019e1cc50cae76bf419a1) )
+	//ROM_LOAD32_BYTE( "775a07a.6f", 0x00000, 0x10000, CRC(bf37d991) SHA1(56dd9daebcb8a2a46925348175b4b5cdf9d42845) ) // also seen on a 'PWB350958 ROMBOARD 34M' with the following, smaller ROMs
+	//ROM_LOAD32_BYTE( "775a07e.5f", 0x00001, 0x10000, CRC(1927cb28) SHA1(a659d10280d4236478a3740ffeef26602077d86e) )
+	//ROM_LOAD32_BYTE( "775a08a.4f", 0x00002, 0x10000, CRC(1fda0814) SHA1(da5541482d60e745a18a5671165cac79ea80711f) )
+	//ROM_LOAD32_BYTE( "775a08e.3f", 0x00003, 0x10000, CRC(74ee0609) SHA1(2fa547a17dc14d4d37f120cc7c7e90cd85460160) )
+	//ROM_LOAD32_BYTE( "775a07b.6e", 0x40000, 0x10000, CRC(ff057896) SHA1(00ec1f6300478a5fc5bcc0187a6dc826664c5322) )
+	//ROM_LOAD32_BYTE( "775a07f.5e", 0x40001, 0x10000, CRC(8488e6ba) SHA1(a6e693aaf2e30fd0c2130d4ba30feb43e208b279) )
+	//ROM_LOAD32_BYTE( "775a08b.4e", 0x40002, 0x10000, CRC(55d79ef4) SHA1(f4b2de68c38b4346b9a4a56578cfe4069caaa3a3) )
+	//ROM_LOAD32_BYTE( "775a08f.3e", 0x40003, 0x10000, CRC(727aadc1) SHA1(884d11104e3b5795654999b2d07eac12e0931800) )
+	ROM_LOAD32_BYTE( "775-f07c.6d",  0x80000, 0x10000, CRC(b0b30915) SHA1(0abd858f93f7cc5383a805a5ae06c086c120f208) )
+	ROM_LOAD32_BYTE( "775-f07g.5d",  0x80001, 0x10000, CRC(fbed827d) SHA1(7fcc6cc03ab6238b05799dd50f38c29eb9f98b5a) )
+	ROM_LOAD32_BYTE( "775-f08c.4d",  0x80002, 0x10000, CRC(53abdaec) SHA1(0e0f7fe4bb9139a1ae94506a832153b711961564) )
+	ROM_LOAD32_BYTE( "775-f08g.3d",  0x80003, 0x10000, CRC(3df85a6e) SHA1(25a49abbf6e9fe63d4ff6bfff9219c98aa1b5e7b) )
+	ROM_LOAD32_BYTE( "775-f07d.7f",  0xc0000, 0x10000, CRC(f184be8e) SHA1(c266be12762f7e81edbe4b36f3c96b03f6ec552b) )
+	ROM_LOAD32_BYTE( "775-f07h.7e",  0xc0001, 0x10000, CRC(7b56c348) SHA1(f75c1c0962389f204c8cf1a0bc2da01a922cd742) )
+	ROM_LOAD32_BYTE( "775-f08d.7d",  0xc0002, 0x10000, CRC(102dcace) SHA1(03036b6d9d66a12cb3e97980f149c09d1efbd6d8) )
+	ROM_LOAD32_BYTE( "775-f08h.7c",  0xc0003, 0x10000, CRC(ad9d7016) SHA1(91e9f279b781eefcafffc70afe207f35cc6f4d9d) )
 
 	ROM_REGION( 0x100000, "k051960", 0 )        /* sprites */
-	ROM_LOAD32_BYTE( "775-a05a.bin", 0x00000, 0x10000, CRC(a0767045) SHA1(e6df0731a9fb3b3d918607de81844e1f9353aac7) )
-	ROM_LOAD32_BYTE( "775-a05e.bin", 0x00001, 0x10000, CRC(2f656f08) SHA1(140e7948c45d27c6705622d588a65b59ebcc624c) )
-	ROM_LOAD32_BYTE( "775-a06a.bin", 0x00002, 0x10000, CRC(77a34ad0) SHA1(3653fb8458c1e7eb7d83b5cd63f02343c0f2d93e) )
-	ROM_LOAD32_BYTE( "775-a06e.bin", 0x00003, 0x10000, CRC(8a910c94) SHA1(0387a7f412a977fa7a5ca685653ac1bb3dfdbbcb) )
-	ROM_LOAD32_BYTE( "775-a05b.bin", 0x40000, 0x10000, CRC(ab8ad4fd) SHA1(c9ae537fa1607fbd11403390d1da923955f0d1ab) )
-	ROM_LOAD32_BYTE( "775-a05f.bin", 0x40001, 0x10000, CRC(1c0eb1b6) SHA1(420eb26acd54ff484301aa2dad587f1b6b437363) )
-	ROM_LOAD32_BYTE( "775-a06b.bin", 0x40002, 0x10000, CRC(563fb565) SHA1(96a2a95ab02456e53651718a7080f18c252451c8) )
-	ROM_LOAD32_BYTE( "775-a06f.bin", 0x40003, 0x10000, CRC(e14995c0) SHA1(1d7fdfb8f9eacb005b0897b2b62b85ce334cd4d6) )
-	ROM_LOAD32_BYTE( "775-f05c.bin", 0x80000, 0x10000, CRC(5647761e) SHA1(ff7983cb0c2f84f7be9d44e20b01266db4b2836a) )
-	ROM_LOAD32_BYTE( "775-f05g.bin", 0x80001, 0x10000, CRC(a1692cca) SHA1(2cefc4b7532a9d29361843419ee427fb9421b79b) )
-	ROM_LOAD32_BYTE( "775-f06c.bin", 0x80002, 0x10000, CRC(5ee6f3c1) SHA1(9138ea3588b63862849f6e783725a711e7e50669) )
-	ROM_LOAD32_BYTE( "775-f06g.bin", 0x80003, 0x10000, CRC(2645274d) SHA1(2fd04b0adbcf53562669946259b59f1ec9c52bda) )
-	ROM_LOAD32_BYTE( "775-f05d.bin", 0xc0000, 0x10000, CRC(ad676a6f) SHA1(f2ca759c8c8a8007aa022d6c058d0431057a639a) )
-	ROM_LOAD32_BYTE( "775-f05h.bin", 0xc0001, 0x10000, CRC(3f925bcf) SHA1(434dd442c0cb5c5c039a69683a3a5f226e49261c) )
-	ROM_LOAD32_BYTE( "775-f06d.bin", 0xc0002, 0x10000, CRC(c8b764fa) SHA1(62f7f59ed36dca7346ec9eb019a4e435e8476dc6) )
-	ROM_LOAD32_BYTE( "775-f06h.bin", 0xc0003, 0x10000, CRC(d6595f59) SHA1(777ea6da2026c90e7fbbc598275c8f95f2eb99c2) )
+	ROM_LOAD32_BYTE( "775-a05a.11f", 0x00000, 0x10000, CRC(a0767045) SHA1(e6df0731a9fb3b3d918607de81844e1f9353aac7) )
+	ROM_LOAD32_BYTE( "775-a05e.10f", 0x00001, 0x10000, CRC(2f656f08) SHA1(140e7948c45d27c6705622d588a65b59ebcc624c) )
+	ROM_LOAD32_BYTE( "775-a06a.9f",  0x00002, 0x10000, CRC(77a34ad0) SHA1(3653fb8458c1e7eb7d83b5cd63f02343c0f2d93e) )
+	ROM_LOAD32_BYTE( "775-a06e.8f",  0x00003, 0x10000, CRC(8a910c94) SHA1(0387a7f412a977fa7a5ca685653ac1bb3dfdbbcb) )
+	ROM_LOAD32_BYTE( "775-a05b.11e", 0x40000, 0x10000, CRC(ab8ad4fd) SHA1(c9ae537fa1607fbd11403390d1da923955f0d1ab) )
+	ROM_LOAD32_BYTE( "775-a05f.10e", 0x40001, 0x10000, CRC(1c0eb1b6) SHA1(420eb26acd54ff484301aa2dad587f1b6b437363) )
+	ROM_LOAD32_BYTE( "775-a06b.9e",  0x40002, 0x10000, CRC(563fb565) SHA1(96a2a95ab02456e53651718a7080f18c252451c8) )
+	ROM_LOAD32_BYTE( "775-a06f.8e",  0x40003, 0x10000, CRC(e14995c0) SHA1(1d7fdfb8f9eacb005b0897b2b62b85ce334cd4d6) )
+	ROM_LOAD32_BYTE( "775-f05c.11d", 0x80000, 0x10000, CRC(5647761e) SHA1(ff7983cb0c2f84f7be9d44e20b01266db4b2836a) )
+	ROM_LOAD32_BYTE( "775-f05g.10d", 0x80001, 0x10000, CRC(a1692cca) SHA1(2cefc4b7532a9d29361843419ee427fb9421b79b) )
+	ROM_LOAD32_BYTE( "775-f06c.9d",  0x80002, 0x10000, CRC(5ee6f3c1) SHA1(9138ea3588b63862849f6e783725a711e7e50669) )
+	ROM_LOAD32_BYTE( "775-f06g.8d",  0x80003, 0x10000, CRC(2645274d) SHA1(2fd04b0adbcf53562669946259b59f1ec9c52bda) )
+	ROM_LOAD32_BYTE( "775-f05d.11c", 0xc0000, 0x10000, CRC(ad676a6f) SHA1(f2ca759c8c8a8007aa022d6c058d0431057a639a) )
+	ROM_LOAD32_BYTE( "775-f05h.10c", 0xc0001, 0x10000, CRC(3f925bcf) SHA1(434dd442c0cb5c5c039a69683a3a5f226e49261c) )
+	ROM_LOAD32_BYTE( "775-f06d.9c",  0xc0002, 0x10000, CRC(c8b764fa) SHA1(62f7f59ed36dca7346ec9eb019a4e435e8476dc6) )
+	ROM_LOAD32_BYTE( "775-f06h.8c",  0xc0003, 0x10000, CRC(d6595f59) SHA1(777ea6da2026c90e7fbbc598275c8f95f2eb99c2) )
 
 	ROM_REGION( 0x80000, "k007232", 0 ) /* k007232 data */
-	ROM_LOAD( "775-a04a.bin", 0x00000, 0x10000, CRC(7efb2e0f) SHA1(fb350a056b547fe4f981bc211e2f9518ae5a3499) )
-	ROM_LOAD( "775-a04b.bin", 0x10000, 0x10000, CRC(f41a2b33) SHA1(dffa06360b6032f7370fe72698aacad4d8779472) )
-	ROM_LOAD( "775-a04c.bin", 0x20000, 0x10000, CRC(e4e58f14) SHA1(23dcb4dfa9a44115d1b730d9efcc314801b811c7) )
-	ROM_LOAD( "775-a04d.bin", 0x30000, 0x10000, CRC(d46736f6) SHA1(586e914a35d3d7a71cccec66ca45a5bbbb9e504b) )
-	ROM_LOAD( "775-f04e.bin", 0x40000, 0x10000, CRC(fbf7e363) SHA1(53578eb7dab8f723439dc12eefade3edb027c148) )
-	ROM_LOAD( "775-f04f.bin", 0x50000, 0x10000, CRC(b031ef2d) SHA1(0124fe15871c3972ef1e2dbaf53d17668c1dccfd) )
-	ROM_LOAD( "775-f04g.bin", 0x60000, 0x10000, CRC(ee107bbb) SHA1(e21de761a0dfd3811ddcbc33d8868479010e86d0) )
-	ROM_LOAD( "775-f04h.bin", 0x70000, 0x10000, CRC(fb0fab46) SHA1(fcbf904f7cf4d265352dc73ed228390b29784aad) )
+	ROM_LOAD( "775-a04a.11b", 0x00000, 0x10000, CRC(7efb2e0f) SHA1(fb350a056b547fe4f981bc211e2f9518ae5a3499) )
+	ROM_LOAD( "775-a04b.10b", 0x10000, 0x10000, CRC(f41a2b33) SHA1(dffa06360b6032f7370fe72698aacad4d8779472) )
+	ROM_LOAD( "775-a04c.9b",  0x20000, 0x10000, CRC(e4e58f14) SHA1(23dcb4dfa9a44115d1b730d9efcc314801b811c7) )
+	ROM_LOAD( "775-a04d.8b",  0x30000, 0x10000, CRC(d46736f6) SHA1(586e914a35d3d7a71cccec66ca45a5bbbb9e504b) )
+	ROM_LOAD( "775-f04e.11a", 0x40000, 0x10000, CRC(fbf7e363) SHA1(53578eb7dab8f723439dc12eefade3edb027c148) )
+	ROM_LOAD( "775-f04f.10a", 0x50000, 0x10000, CRC(b031ef2d) SHA1(0124fe15871c3972ef1e2dbaf53d17668c1dccfd) )
+	ROM_LOAD( "775-f04g.9a",  0x60000, 0x10000, CRC(ee107bbb) SHA1(e21de761a0dfd3811ddcbc33d8868479010e86d0) )
+	ROM_LOAD( "775-f04h.8a",  0x70000, 0x10000, CRC(fb0fab46) SHA1(fcbf904f7cf4d265352dc73ed228390b29784aad) )
 
 	ROM_REGION( 0x0100, "proms", 0 )
 	ROM_LOAD( "775a09.b19",   0x0000, 0x0100, CRC(46d1e0df) SHA1(65dad04a124cc49cbc9bb271f865d77efbc4d57c) )    /* priority encoder (not used) */
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ti99_2.cpp mame-0.224+dfsg.1/src/mame/drivers/ti99_2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ti99_2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ti99_2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -193,6 +193,7 @@
 		m_io992(*this, TI992_IO_TAG),
 		m_cassette(*this, TI992_CASSETTE),
 		m_ram(*this, TI992_RAM_TAG),
+		m_expport(*this, TI992_EXPPORT_TAG),
 		m_otherbank(false),
 		m_rom(nullptr),
 		m_ram_start(0xf000),
@@ -230,6 +231,8 @@
 	required_device<cassette_image_device> m_cassette;
 	required_device<ram_device> m_ram;
 
+	required_device<bus::ti99::internal::ti992_expport_device> m_expport;
+
 	bool m_otherbank;
 
 	uint8_t*   m_rom;
@@ -322,6 +325,7 @@
 */
 uint8_t ti99_2_state::mem_read(offs_t offset)
 {
+	uint8_t value = 0;
 	if (m_maincpu->is_onchip(offset)) return m_maincpu->debug_read_onchip_memory(offset&0xff);
 
 	int page = offset >> 12;
@@ -329,22 +333,23 @@
 	if (page>=0 && page<4)
 	{
 		// ROM, unbanked
-		return m_rom[offset];
+		value = m_rom[offset];
 	}
 	if (page>=4 && page<6)
 	{
 		// ROM, banked on 32K version
 		if (m_otherbank) offset = (offset & 0x1fff) | 0x10000;
-		return m_rom[offset];
+		value = m_rom[offset];
 	}
 
 	if ((page >= m_first_ram_page) && (page < 15))
 	{
-		return m_ram->pointer()[offset - m_ram_start];
+		value = m_ram->pointer()[offset - m_ram_start];
 	}
 
-	LOGMASKED(LOG_WARN, "Unmapped read access at %04x\n", offset);
-	return 0;
+	m_expport->readz(offset, &value);
+
+	return value;
 }
 
 void ti99_2_state::mem_write(offs_t offset, uint8_t data)
@@ -370,7 +375,7 @@
 		return;
 	}
 
-	LOGMASKED(LOG_WARN, "Unmapped write access at %04x\n", offset);
+	m_expport->write(offset, data);
 }
 
 /*
@@ -470,6 +475,9 @@
 
 	// Hexbus
 	HEXBUS(config, TI992_HEXBUS_TAG, 0, hexbus_options, nullptr);
+
+	// Expansion port (backside)
+	TI992_EXPPORT(config, m_expport, 0, ti992_expport_options, nullptr);
 }
 
 /*
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ti99_8.cpp mame-0.224+dfsg.1/src/mame/drivers/ti99_8.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ti99_8.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ti99_8.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -752,7 +752,7 @@
 
 	// Cassette drive
 	SPEAKER(config, "cass_out").front_center();
-	CASSETTE(config, "cassette", 0).add_route(ALL_OUTPUTS, "cass_out", 0.25);;
+	CASSETTE(config, "cassette", 0).add_route(ALL_OUTPUTS, "cass_out", 0.25);
 
 	// GROM library
 	using namespace bus::ti99::internal;
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tigeroad.cpp mame-0.224+dfsg.1/src/mame/drivers/tigeroad.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tigeroad.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tigeroad.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -53,19 +53,12 @@
 
 #include "emu.h"
 #include "includes/tigeroad.h"
+#include "machine/gen_latch.h"
 #include "screen.h"
 #include "speaker.h"
 
 
-
-void tigeroad_state::tigeroad_soundcmd_w(offs_t offset, uint16_t data, uint16_t mem_mask)
-{
-	if (ACCESSING_BITS_8_15)
-		m_soundlatch->write(data >> 8);
-}
-
-
-void tigeroad_state::msm5205_w(uint8_t data)
+void tigeroad_state::msm5205_w(u8 data)
 {
 	m_msm->reset_w(BIT(data, 7));
 	m_msm->data_w(data);
@@ -73,7 +66,7 @@
 	m_msm->vclk_w(0);
 }
 
-void f1dream_state::out3_w(uint8_t data)
+void f1dream_state::out3_w(u8 data)
 {
 	if ((m_old_p3 & 0x20) != (data & 0x20))
 	{
@@ -92,7 +85,7 @@
 	m_old_p3 = data;
 }
 
-void f1dream_state::blktiger_to_mcu_w(uint16_t data)
+void f1dream_state::to_mcu_w(u16 data)
 {
 	m_mcu->set_input_line(MCS51_INT0_LINE, HOLD_LINE);
 
@@ -110,26 +103,28 @@
 	map(0x000000, 0x03ffff).rom();
 
 	map(0xfe0800, 0xfe0cff).ram().share("spriteram");
-	map(0xfe0d00, 0xfe1807).ram();     /* still part of OBJ RAM */
-	map(0xfe4000, 0xfe4001).portr("P1_P2").w(FUNC(tigeroad_state::tigeroad_videoctrl_w));   /* char bank, coin counters, + ? */
-	map(0xfe4002, 0xfe4003).portr("SYSTEM").w(FUNC(tigeroad_state::tigeroad_soundcmd_w)); /* .w(FUNC(tigeroad_state::tigeroad_soundcmd_w)); is replaced in init for for f1dream protection */
+	map(0xfe0d00, 0xfe1807).ram();     // still part of OBJ RAM
+	map(0xfe4000, 0xfe4001).portr("P1_P2");
+	map(0xfe4000, 0xfe4000).w(FUNC(tigeroad_state::videoctrl_w));   // char bank, coin counters, + ?
+	map(0xfe4002, 0xfe4003).portr("SYSTEM");
+	map(0xfe4002, 0xfe4002).w("soundlatch", FUNC(generic_latch_8_device::write));
 	map(0xfe4004, 0xfe4005).portr("DSW");
-	map(0xfe8000, 0xfe8003).w(FUNC(tigeroad_state::tigeroad_scroll_w));
-	map(0xfe800e, 0xfe800f).writeonly();    /* fe800e = watchdog or IRQ acknowledge */
-	map(0xfec000, 0xfec7ff).ram().w(FUNC(tigeroad_state::tigeroad_videoram_w)).share("videoram");
+	map(0xfe8000, 0xfe8003).w(FUNC(tigeroad_state::scroll_w));
+	map(0xfe800e, 0xfe800f).writeonly();    // fe800e = watchdog or IRQ acknowledge
+	map(0xfec000, 0xfec7ff).ram().w(FUNC(tigeroad_state::videoram_w)).share("videoram");
 
 	map(0xff8000, 0xff87ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
 	map(0xffc000, 0xffffff).ram().share("ram16");
 }
 
 
-uint8_t f1dream_state::mcu_shared_r(offs_t offset)
+u8 f1dream_state::mcu_shared_r(offs_t offset)
 {
-	uint8_t ret = m_ram16[(0x3fe0 / 2) + offset];
+	u8 ret = m_ram16[(0x3fe0 / 2) + offset];
 	return ret;
 }
 
-void f1dream_state::mcu_shared_w(offs_t offset, uint8_t data)
+void f1dream_state::mcu_shared_w(offs_t offset, u8 data)
 {
 	m_ram16[(0x3fe0 / 2) + offset] = (m_ram16[(0x3fe0 / 2) + offset] & 0xff00) | data;
 }
@@ -137,7 +132,7 @@
 void f1dream_state::f1dream_map(address_map &map)
 {
 	main_map(map);
-	map(0xfe4002, 0xfe4003).portr("SYSTEM").w(FUNC(f1dream_state::blktiger_to_mcu_w));
+	map(0xfe4002, 0xfe4003).portr("SYSTEM").w(FUNC(f1dream_state::to_mcu_w));
 }
 
 void f1dream_state::f1dream_mcu_io(address_map &map)
@@ -162,25 +157,27 @@
 	map(0x60000, 0x60001).w(FUNC(pushman_state::bballs_mcu_comm_w));
 	// are these mirror addresses or does this PCB have a different addressing?
 	map(0xe0800, 0xe17ff).ram().share("spriteram");
-	map(0xe4000, 0xe4001).portr("P1_P2").w(FUNC(pushman_state::tigeroad_videoctrl_w));
-	map(0xe4002, 0xe4003).portr("SYSTEM").w(FUNC(pushman_state::tigeroad_soundcmd_w));
+	map(0xe4000, 0xe4001).portr("P1_P2");
+	map(0xe4000, 0xe4000).w(FUNC(pushman_state::videoctrl_w));
+	map(0xe4002, 0xe4003).portr("SYSTEM");
+	map(0xe4002, 0xe4002).w("soundlatch", FUNC(generic_latch_8_device::write));
 	map(0xe4004, 0xe4005).portr("DSW");
-	map(0xe8000, 0xe8003).w(FUNC(pushman_state::tigeroad_scroll_w));
-	map(0xe800e, 0xe800f).nopw(); /* ? */
-	map(0xec000, 0xec7ff).ram().w(FUNC(pushman_state::tigeroad_videoram_w)).share("videoram");
+	map(0xe8000, 0xe8003).w(FUNC(pushman_state::scroll_w));
+	map(0xe800e, 0xe800f).nopw(); // ?
+	map(0xec000, 0xec7ff).ram().w(FUNC(pushman_state::videoram_w)).share("videoram");
 
 	map(0xf8000, 0xf87ff).ram().w(m_palette, FUNC(palette_device::write16)).share("palette");
 	map(0xfc000, 0xfffff).ram().share("ram16");
 }
 
-/* Capcom games ONLY */
+// Capcom games ONLY
 void tigeroad_state::sound_map(address_map &map)
 {
 	map(0x0000, 0x7fff).rom();
 	map(0x8000, 0x8001).rw("ym1", FUNC(ym2203_device::read), FUNC(ym2203_device::write));
 	map(0xa000, 0xa001).rw("ym2", FUNC(ym2203_device::read), FUNC(ym2203_device::write));
 	map(0xc000, 0xc7ff).ram();
-	map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
+	map(0xe000, 0xe000).r("soundlatch", FUNC(generic_latch_8_device::read));
 }
 
 void tigeroad_state::sound_port_map(address_map &map)
@@ -189,7 +186,7 @@
 	map(0x7f, 0x7f).w("soundlatch2", FUNC(generic_latch_8_device::write));
 }
 
-/* toramich ONLY */
+// toramich ONLY
 void tigeroad_state::sample_map(address_map &map)
 {
 	map(0x0000, 0xffff).rom();
@@ -202,12 +199,12 @@
 	map(0x01, 0x01).w(FUNC(tigeroad_state::msm5205_w));
 }
 
-/* Pushman / Bouncing Balls */
+// Pushman / Bouncing Balls
 void tigeroad_state::comad_sound_map(address_map &map)
 {
 	map(0x0000, 0x7fff).rom();
 	map(0xc000, 0xc7ff).ram();
-	map(0xe000, 0xe000).r(m_soundlatch, FUNC(generic_latch_8_device::read));
+	map(0xe000, 0xe000).r("soundlatch", FUNC(generic_latch_8_device::read));
 }
 
 void tigeroad_state::comad_sound_io_map(address_map &map)
@@ -473,7 +470,7 @@
 	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
 	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
-	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") /* not sure, probably wrong */
+	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") // not sure, probably wrong
 	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -481,7 +478,7 @@
 	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_COIN2 )
 
 	PORT_START("DSW")
-	PORT_DIPNAME( 0x0001, 0x0001, "Debug Mode (Cheat)")         PORT_DIPLOCATION("SW1:1")    /* Listed as "Screen Skip" */
+	PORT_DIPNAME( 0x0001, 0x0001, "Debug Mode (Cheat)")         PORT_DIPLOCATION("SW1:1")    // Listed as "Screen Skip"
 	PORT_DIPSETTING(      0x0001, DEF_STR( Off ) )
 	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
 	PORT_DIPNAME( 0x0002, 0x0002, "Pull Option" )           PORT_DIPLOCATION("SW1:2")
@@ -540,7 +537,7 @@
 	PORT_BIT( 0x00ff, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_START1 )
 	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START2 )
-	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") /* not sure, probably wrong */
+	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_CUSTOM ) PORT_VBLANK("screen") // not sure, probably wrong
 	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_UNKNOWN )
 	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_SERVICE1 )
@@ -621,26 +618,26 @@
 
 void tigeroad_state::tigeroad(machine_config &config)
 {
-	/* basic machine hardware */
-	M68000(config, m_maincpu, XTAL(10'000'000)); /* verified on pcb */
+	// basic machine hardware
+	M68000(config, m_maincpu, XTAL(10'000'000)); // verified on pcb
 	m_maincpu->set_addrmap(AS_PROGRAM, &tigeroad_state::main_map);
 	m_maincpu->set_vblank_int("screen", FUNC(tigeroad_state::irq2_line_hold));
 
-	Z80(config, m_audiocpu, XTAL(3'579'545)); /* verified on pcb */
+	Z80(config, m_audiocpu, XTAL(3'579'545)); // verified on pcb
 	m_audiocpu->set_addrmap(AS_PROGRAM, &tigeroad_state::sound_map);
 	m_audiocpu->set_addrmap(AS_IO, &tigeroad_state::sound_port_map);
 
-	/* IRQs are triggered by the YM2203 */
+	// IRQs are triggered by the YM2203
 
-	/* video hardware */
+	// video hardware
 	BUFFERED_SPRITERAM16(config, "spriteram");
 
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(60.08);   /* verified on pcb */
+	screen.set_refresh_hz(60.08);   // verified on pcb
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
 	screen.set_size(32*8, 32*8);
 	screen.set_visarea(0*8, 32*8-1, 2*8, 30*8-1);
-	screen.set_screen_update(FUNC(tigeroad_state::screen_update_tigeroad));
+	screen.set_screen_update(FUNC(tigeroad_state::screen_update));
 	screen.screen_vblank().set("spriteram", FUNC(buffered_spriteram16_device::vblank_copy_rising));
 	screen.set_palette(m_palette);
 
@@ -652,20 +649,24 @@
 
 	PALETTE(config, m_palette).set_format(palette_device::xRGB_444, 1024);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 
-	GENERIC_LATCH_8(config, m_soundlatch);
+	GENERIC_LATCH_8(config, "soundlatch");
 	GENERIC_LATCH_8(config, "soundlatch2");
 
-	ym2203_device &ym1(YM2203(config, "ym1", XTAL(3'579'545))); /* verified on pcb */
-	ym1.irq_handler().set_inputline("audiocpu", 0);
+	ym2203_device &ym1(YM2203(config, "ym1", XTAL(3'579'545))); // verified on pcb
+	ym1.irq_handler().set_inputline(m_audiocpu, 0);
 	ym1.add_route(ALL_OUTPUTS, "mono", 0.25);
 
-	ym2203_device &ym2(YM2203(config, "ym2", XTAL(3'579'545))); /* verified on pcb */
+	ym2203_device &ym2(YM2203(config, "ym2", XTAL(3'579'545))); // verified on pcb
 	ym2.add_route(ALL_OUTPUTS, "mono", 0.25);
 }
 
+void f1dream_state::machine_start()
+{
+	save_item(NAME(m_old_p3));
+}
 
 void f1dream_state::f1dream(machine_config &config)
 {
@@ -673,33 +674,33 @@
 
 	m_maincpu->set_addrmap(AS_PROGRAM, &f1dream_state::f1dream_map);
 
-	I8751(config, m_mcu, XTAL(10'000'000)); /* ??? */
+	I8751(config, m_mcu, XTAL(10'000'000)); // ???
 	m_mcu->set_addrmap(AS_IO, &f1dream_state::f1dream_mcu_io);
-	m_mcu->port_out_cb<1>().set(m_soundlatch, FUNC(generic_latch_8_device::write));
+	m_mcu->port_out_cb<1>().set("soundlatch", FUNC(generic_latch_8_device::write));
 	m_mcu->port_out_cb<3>().set(FUNC(f1dream_state::out3_w));
 }
 
-/* same as above but with additional Z80 for samples playback */
+// same as above but with additional Z80 for samples playback
 void tigeroad_state::toramich(machine_config &config)
 {
 	tigeroad(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 
-	z80_device &sample(Z80(config, "sample", 3579545)); /* ? */
+	z80_device &sample(Z80(config, "sample", 3579545)); // ?
 	sample.set_addrmap(AS_PROGRAM, &tigeroad_state::sample_map);
 	sample.set_addrmap(AS_IO, &tigeroad_state::sample_port_map);
-	sample.set_periodic_int(FUNC(tigeroad_state::irq0_line_hold), attotime::from_hz(4000));  /* ? */
+	sample.set_periodic_int(FUNC(tigeroad_state::irq0_line_hold), attotime::from_hz(4000));  // ?
 
-	/* sound hardware */
+	// sound hardware
 	MSM5205(config, m_msm, 384000);
-	m_msm->set_prescaler_selector(msm5205_device::SEX_4B);  /* 4KHz playback ?  */
+	m_msm->set_prescaler_selector(msm5205_device::SEX_4B);  // 4KHz playback ?
 	m_msm->add_route(ALL_OUTPUTS, "mono", 1.0);
 }
 
 void tigeroad_state::f1dream_comad(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	M68000(config, m_maincpu, 8000000);
 	m_maincpu->set_addrmap(AS_PROGRAM, &tigeroad_state::main_map);
 	m_maincpu->set_vblank_int("screen", FUNC(tigeroad_state::irq2_line_hold));
@@ -710,15 +711,15 @@
 
 	config.set_maximum_quantum(attotime::from_hz(3600));
 
-	/* video hardware */
+	// video hardware
 	BUFFERED_SPRITERAM16(config, "spriteram");
 
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(60.08);   /* verified on pcb */
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
+	screen.set_refresh_hz(60.08);   // verified on pcb
+	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500)); // not accurate
 	screen.set_size(32*8, 32*8);
 	screen.set_visarea(0*8, 32*8-1, 2*8, 30*8-1);
-	screen.set_screen_update(FUNC(tigeroad_state::screen_update_tigeroad));
+	screen.set_screen_update(FUNC(tigeroad_state::screen_update));
 	screen.screen_vblank().set("spriteram", FUNC(buffered_spriteram16_device::vblank_copy_rising));
 	screen.set_palette(m_palette);
 
@@ -730,10 +731,10 @@
 
 	PALETTE(config, m_palette).set_format(palette_device::xRGB_444, 1024);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 
-	GENERIC_LATCH_8(config, m_soundlatch);
+	GENERIC_LATCH_8(config, "soundlatch");
 
 	ym2203_device &ym1(YM2203(config, "ym1", 2000000));
 	ym1.irq_handler().set_inputline("audiocpu", 0);
@@ -759,7 +760,7 @@
 	f1dream_comad(config);
 	m_maincpu->set_addrmap(AS_PROGRAM, &pushman_state::pushman_map);
 
-	M68705R3(config, m_mcu, 4000000);    /* No idea */
+	M68705R3(config, m_mcu, 4000000);    // No idea
 	m_mcu->porta_w().set(FUNC(pushman_state::mcu_pa_w));
 	m_mcu->portb_w().set(FUNC(pushman_state::mcu_pb_w));
 	m_mcu->portc_w().set(FUNC(pushman_state::mcu_pc_w));
@@ -779,138 +780,138 @@
 
 ***************************************************************************/
 
-ROM_START( tigeroad ) /* N86614A-5 + N86614B-6 board combo - ECT program roms */
-	ROM_REGION( 0x40000, "maincpu", 0 ) /* 256K for 68000 code */
-	ROM_LOAD16_BYTE( "tre_02.6j", 0x00000, 0x20000, CRC(c394add0) SHA1(f71cceca92ed7d2211f508df9ddfa97e0dd28d11) ) /* Blue ink underline */
-	ROM_LOAD16_BYTE( "tre_04.6k", 0x00001, 0x20000, CRC(73bfbf4a) SHA1(821af477953f7a64f4f1b09e8978fb2bce4138ff) ) /* Blue ink underline */
+ROM_START( tigeroad ) // N86614A-5 + N86614B-6 board combo - ECT program roms
+	ROM_REGION( 0x40000, "maincpu", 0 ) // 256K for 68000 code
+	ROM_LOAD16_BYTE( "tre_02.6j", 0x00000, 0x20000, CRC(c394add0) SHA1(f71cceca92ed7d2211f508df9ddfa97e0dd28d11) ) // Blue ink underline
+	ROM_LOAD16_BYTE( "tre_04.6k", 0x00001, 0x20000, CRC(73bfbf4a) SHA1(821af477953f7a64f4f1b09e8978fb2bce4138ff) ) // Blue ink underline
 
-	ROM_REGION( 0x10000, "audiocpu", 0 ) /* audio CPU */
-	ROM_LOAD( "tru_05.12k", 0x0000, 0x8000, CRC(f9a7c9bf) SHA1(4d37c71aa6523ac21c6e8b23f9957e75ec4304bf) ) /* Red ink underline */
+	ROM_REGION( 0x10000, "audiocpu", 0 )
+	ROM_LOAD( "tru_05.12k", 0x0000, 0x8000, CRC(f9a7c9bf) SHA1(4d37c71aa6523ac21c6e8b23f9957e75ec4304bf) ) // Red ink underline
 
-	/* i8751 microcontroller not populated */
+	// i8751 microcontroller not populated
 
-	/* no samples player in the English version */
+	// no samples player in the English version
 
 	ROM_REGION( 0x008000, "text", 0 )
-	ROM_LOAD( "tr_01.10d", 0x00000, 0x08000, CRC(74a9f08c) SHA1(458958c8d9a2af5df88bb24c9c5bcbd37d6856bc) ) /* 8x8 text */
+	ROM_LOAD( "tr_01.10d", 0x00000, 0x08000, CRC(74a9f08c) SHA1(458958c8d9a2af5df88bb24c9c5bcbd37d6856bc) ) // 8x8 text
 
 	ROM_REGION( 0x100000, "tiles", 0 )
-	ROM_LOAD( "tr-01a.3f", 0x00000, 0x20000, CRC(a8aa2e59) SHA1(792f50d688a4ffb574e41257816bc304d41f0458) ) /* tiles */
+	ROM_LOAD( "tr-01a.3f", 0x00000, 0x20000, CRC(a8aa2e59) SHA1(792f50d688a4ffb574e41257816bc304d41f0458) )
 	ROM_LOAD( "tr-04a.3h", 0x20000, 0x20000, CRC(8863a63c) SHA1(11bfce5b09c5b8a781c658f035d5658c3710d189) )
 	ROM_LOAD( "tr-02a.3j", 0x40000, 0x20000, CRC(1a2c5f89) SHA1(2a2aa2f1e2a0cdd4bbdb25236e49c7cc573db9e9) )
 	ROM_LOAD( "tr-05.3l",  0x60000, 0x20000, CRC(5bf453b3) SHA1(5eef151974c6b818a17756549d24a702e1f3a859) )
 	ROM_LOAD( "tr-03a.2f", 0x80000, 0x20000, CRC(1e0537ea) SHA1(bc65f7104d5f7728b68b3dcb45151c41fc30aa0d) )
 	ROM_LOAD( "tr-06a.2h", 0xa0000, 0x20000, CRC(b636c23a) SHA1(417e289745996bd00114df6ade591e702265d3a5) )
 	ROM_LOAD( "tr-07a.2j", 0xc0000, 0x20000, CRC(5f907d4d) SHA1(1820c5c6e0b078db9c64655c7983ea115ad81036) )
-	ROM_LOAD( "tr_08.2l",  0xe0000, 0x20000, CRC(adee35e2) SHA1(6707cf43a697eb9465449a144ae4508afe2e6496) ) /* EPROM */
+	ROM_LOAD( "tr_08.2l",  0xe0000, 0x20000, CRC(adee35e2) SHA1(6707cf43a697eb9465449a144ae4508afe2e6496) ) // EPROM
 
 	ROM_REGION( 0x080000, "spritegen", 0 )
-	ROM_LOAD32_BYTE( "tr-09a.3b", 0x00003, 0x20000, CRC(3d98ad1e) SHA1(f12cdf50e1708ddae092b9784d4319a7d5f092bc) ) /* sprites */
+	ROM_LOAD32_BYTE( "tr-09a.3b", 0x00003, 0x20000, CRC(3d98ad1e) SHA1(f12cdf50e1708ddae092b9784d4319a7d5f092bc) )
 	ROM_LOAD32_BYTE( "tr-10a.2b", 0x00002, 0x20000, CRC(8f6f03d7) SHA1(08a02cfb373040ea5ffbf5604f68df92a1338bb0) )
 	ROM_LOAD32_BYTE( "tr-11a.3d", 0x00001, 0x20000, CRC(cd9152e5) SHA1(6df3c43c0c41289890296c2b2aeca915dfdae3b0) )
 	ROM_LOAD32_BYTE( "tr-12a.2d", 0x00000, 0x20000, CRC(7d8a99d0) SHA1(af8221cfd2ce9aa3bf296981fb7fddd1e9ef4599) )
 
-	ROM_REGION( 0x08000, "bgmap", 0 )    /* background tilemaps */
+	ROM_REGION( 0x08000, "bgmap", 0 )
 	ROM_LOAD( "tr_13.7l", 0x0000, 0x8000, CRC(a79be1eb) SHA1(4191ccd48f7650930f9a4c2be0790239d7420bb1) )
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "tr.9e", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    /* priority (not used) - N82S129A or compatible */
+	ROM_LOAD( "tr.9e", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    // priority (not used) - N82S129A or compatible
 ROM_END
 
-ROM_START( tigeroadu ) /* N86614A-5 + N86614B-6 board combo - US ROMSTAR program roms */
-	ROM_REGION( 0x40000, "maincpu", 0 ) /* 256K for 68000 code */
-	ROM_LOAD16_BYTE( "tru_02.6j", 0x00000, 0x20000, CRC(8d283a95) SHA1(eb6c9225f79f62c22ae1e8980a557d896f598947) ) /* Red ink underline */
-	ROM_LOAD16_BYTE( "tru_04.6k", 0x00001, 0x20000, CRC(72e2ef20) SHA1(57ab7df2050042690ccfb1f2d170840f926dcf46) ) /* Red ink underline */
+ROM_START( tigeroadu ) // N86614A-5 + N86614B-6 board combo - US ROMSTAR program roms
+	ROM_REGION( 0x40000, "maincpu", 0 ) // 256K for 68000 code
+	ROM_LOAD16_BYTE( "tru_02.6j", 0x00000, 0x20000, CRC(8d283a95) SHA1(eb6c9225f79f62c22ae1e8980a557d896f598947) ) // Red ink underline
+	ROM_LOAD16_BYTE( "tru_04.6k", 0x00001, 0x20000, CRC(72e2ef20) SHA1(57ab7df2050042690ccfb1f2d170840f926dcf46) ) // Red ink underline
 
-	ROM_REGION( 0x10000, "audiocpu", 0 ) /* audio CPU */
-	ROM_LOAD( "tru_05.12k", 0x0000, 0x8000, CRC(f9a7c9bf) SHA1(4d37c71aa6523ac21c6e8b23f9957e75ec4304bf) ) /* Red ink underline */
+	ROM_REGION( 0x10000, "audiocpu", 0 )
+	ROM_LOAD( "tru_05.12k", 0x0000, 0x8000, CRC(f9a7c9bf) SHA1(4d37c71aa6523ac21c6e8b23f9957e75ec4304bf) ) // Red ink underline
 
-	/* i8751 microcontroller not populated */
+	// i8751 microcontroller not populated
 
-	/* no samples player in the English version */
+	// no samples player in the English version
 
 	ROM_REGION( 0x008000, "text", 0 )
-	ROM_LOAD( "tr_01.10d", 0x00000, 0x08000, CRC(74a9f08c) SHA1(458958c8d9a2af5df88bb24c9c5bcbd37d6856bc) ) /* 8x8 text */
+	ROM_LOAD( "tr_01.10d", 0x00000, 0x08000, CRC(74a9f08c) SHA1(458958c8d9a2af5df88bb24c9c5bcbd37d6856bc) ) // 8x8 text
 
 	ROM_REGION( 0x100000, "tiles", 0 )
-	ROM_LOAD( "tr-01a.3f", 0x00000, 0x20000, CRC(a8aa2e59) SHA1(792f50d688a4ffb574e41257816bc304d41f0458) ) /* tiles */
+	ROM_LOAD( "tr-01a.3f", 0x00000, 0x20000, CRC(a8aa2e59) SHA1(792f50d688a4ffb574e41257816bc304d41f0458) )
 	ROM_LOAD( "tr-04a.3h", 0x20000, 0x20000, CRC(8863a63c) SHA1(11bfce5b09c5b8a781c658f035d5658c3710d189) )
 	ROM_LOAD( "tr-02a.3j", 0x40000, 0x20000, CRC(1a2c5f89) SHA1(2a2aa2f1e2a0cdd4bbdb25236e49c7cc573db9e9) )
 	ROM_LOAD( "tr-05.3l",  0x60000, 0x20000, CRC(5bf453b3) SHA1(5eef151974c6b818a17756549d24a702e1f3a859) )
 	ROM_LOAD( "tr-03a.2f", 0x80000, 0x20000, CRC(1e0537ea) SHA1(bc65f7104d5f7728b68b3dcb45151c41fc30aa0d) )
 	ROM_LOAD( "tr-06a.2h", 0xa0000, 0x20000, CRC(b636c23a) SHA1(417e289745996bd00114df6ade591e702265d3a5) )
 	ROM_LOAD( "tr-07a.2j", 0xc0000, 0x20000, CRC(5f907d4d) SHA1(1820c5c6e0b078db9c64655c7983ea115ad81036) )
-	ROM_LOAD( "tr_08.2l",  0xe0000, 0x20000, CRC(adee35e2) SHA1(6707cf43a697eb9465449a144ae4508afe2e6496) ) /* EPROM */
+	ROM_LOAD( "tr_08.2l",  0xe0000, 0x20000, CRC(adee35e2) SHA1(6707cf43a697eb9465449a144ae4508afe2e6496) ) // EPROM
 
 	ROM_REGION( 0x080000, "spritegen", 0 )
-	ROM_LOAD32_BYTE( "tr-09a.3b", 0x00003, 0x20000, CRC(3d98ad1e) SHA1(f12cdf50e1708ddae092b9784d4319a7d5f092bc) ) /* sprites */
+	ROM_LOAD32_BYTE( "tr-09a.3b", 0x00003, 0x20000, CRC(3d98ad1e) SHA1(f12cdf50e1708ddae092b9784d4319a7d5f092bc) )
 	ROM_LOAD32_BYTE( "tr-10a.2b", 0x00002, 0x20000, CRC(8f6f03d7) SHA1(08a02cfb373040ea5ffbf5604f68df92a1338bb0) )
 	ROM_LOAD32_BYTE( "tr-11a.3d", 0x00001, 0x20000, CRC(cd9152e5) SHA1(6df3c43c0c41289890296c2b2aeca915dfdae3b0) )
 	ROM_LOAD32_BYTE( "tr-12a.2d", 0x00000, 0x20000, CRC(7d8a99d0) SHA1(af8221cfd2ce9aa3bf296981fb7fddd1e9ef4599) )
 
-	ROM_REGION( 0x08000, "bgmap", 0 )    /* background tilemaps */
+	ROM_REGION( 0x08000, "bgmap", 0 )
 	ROM_LOAD( "tr_13.7l", 0x0000, 0x8000, CRC(a79be1eb) SHA1(4191ccd48f7650930f9a4c2be0790239d7420bb1) )
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "tr.9e", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    /* priority (not used) - N82S129A or compatible */
+	ROM_LOAD( "tr.9e", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    // priority (not used) - N82S129A or compatible
 ROM_END
 
-ROM_START( toramich ) /* N86614A-5 + N86614B-6 board combo */
-	ROM_REGION( 0x40000, "maincpu", 0 ) /* 256K for 68000 code */
+ROM_START( toramich ) // N86614A-5 + N86614B-6 board combo
+	ROM_REGION( 0x40000, "maincpu", 0 ) // 256K for 68000 code
 	ROM_LOAD16_BYTE( "tr_02.6j", 0x00000, 0x20000, CRC(b54723b1) SHA1(dfad82e96dff072c967dd59e3db71fb3b43b6dcb) )
 	ROM_LOAD16_BYTE( "tr_04.6k", 0x00001, 0x20000, CRC(ab432479) SHA1(b8ec547f7bab67107a7c83931c7ed89142a7af69) )
 
-	ROM_REGION( 0x10000, "audiocpu", 0 ) /* audio CPU */
+	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "tr_05.12k", 0x0000, 0x8000, CRC(3ebe6e62) SHA1(6f5708b6ff8c91bc706f73300e0785f15999d570) )
 
-	/* i8751 microcontroller not populated */
+	// i8751 microcontroller not populated
 
-	ROM_REGION( 0x10000, "sample", 0 ) /* samples player */
+	ROM_REGION( 0x10000, "sample", 0 )
 	ROM_LOAD( "tr_03.11j", 0x0000, 0x10000, CRC(ea1807ef) SHA1(f856e7b592c6df81586821284ea2220468c5ea9d) )
 
 	ROM_REGION( 0x008000, "text", 0 )
-	ROM_LOAD( "tr_01.10d", 0x00000, 0x08000, CRC(74a9f08c) SHA1(458958c8d9a2af5df88bb24c9c5bcbd37d6856bc) ) /* 8x8 text */
+	ROM_LOAD( "tr_01.10d", 0x00000, 0x08000, CRC(74a9f08c) SHA1(458958c8d9a2af5df88bb24c9c5bcbd37d6856bc) ) // 8x8 text
 
 	ROM_REGION( 0x100000, "tiles", 0 )
-	ROM_LOAD( "tr-01a.3f", 0x00000, 0x20000, CRC(a8aa2e59) SHA1(792f50d688a4ffb574e41257816bc304d41f0458) ) /* tiles */
+	ROM_LOAD( "tr-01a.3f", 0x00000, 0x20000, CRC(a8aa2e59) SHA1(792f50d688a4ffb574e41257816bc304d41f0458) )
 	ROM_LOAD( "tr-04a.3h", 0x20000, 0x20000, CRC(8863a63c) SHA1(11bfce5b09c5b8a781c658f035d5658c3710d189) )
 	ROM_LOAD( "tr-02a.3j", 0x40000, 0x20000, CRC(1a2c5f89) SHA1(2a2aa2f1e2a0cdd4bbdb25236e49c7cc573db9e9) )
 	ROM_LOAD( "tr-05.3l",  0x60000, 0x20000, CRC(5bf453b3) SHA1(5eef151974c6b818a17756549d24a702e1f3a859) )
 	ROM_LOAD( "tr-03a.2f", 0x80000, 0x20000, CRC(1e0537ea) SHA1(bc65f7104d5f7728b68b3dcb45151c41fc30aa0d) )
 	ROM_LOAD( "tr-06a.2h", 0xa0000, 0x20000, CRC(b636c23a) SHA1(417e289745996bd00114df6ade591e702265d3a5) )
 	ROM_LOAD( "tr-07a.2j", 0xc0000, 0x20000, CRC(5f907d4d) SHA1(1820c5c6e0b078db9c64655c7983ea115ad81036) )
-	ROM_LOAD( "tr_08.2l",  0xe0000, 0x20000, CRC(adee35e2) SHA1(6707cf43a697eb9465449a144ae4508afe2e6496) ) /* EPROM */
+	ROM_LOAD( "tr_08.2l",  0xe0000, 0x20000, CRC(adee35e2) SHA1(6707cf43a697eb9465449a144ae4508afe2e6496) ) // EPROM
 
 	ROM_REGION( 0x080000, "spritegen", 0 )
-	ROM_LOAD32_BYTE( "tr-09a.3b", 0x00003, 0x20000, CRC(3d98ad1e) SHA1(f12cdf50e1708ddae092b9784d4319a7d5f092bc) ) /* sprites */
+	ROM_LOAD32_BYTE( "tr-09a.3b", 0x00003, 0x20000, CRC(3d98ad1e) SHA1(f12cdf50e1708ddae092b9784d4319a7d5f092bc) )
 	ROM_LOAD32_BYTE( "tr-10a.2b", 0x00002, 0x20000, CRC(8f6f03d7) SHA1(08a02cfb373040ea5ffbf5604f68df92a1338bb0) )
 	ROM_LOAD32_BYTE( "tr-11a.3d", 0x00001, 0x20000, CRC(cd9152e5) SHA1(6df3c43c0c41289890296c2b2aeca915dfdae3b0) )
 	ROM_LOAD32_BYTE( "tr-12a.2d", 0x00000, 0x20000, CRC(7d8a99d0) SHA1(af8221cfd2ce9aa3bf296981fb7fddd1e9ef4599) )
 
-	ROM_REGION( 0x08000, "bgmap", 0 )    /* background tilemaps */
+	ROM_REGION( 0x08000, "bgmap", 0 )
 	ROM_LOAD( "tr_13.7l", 0x0000, 0x8000, CRC(a79be1eb) SHA1(4191ccd48f7650930f9a4c2be0790239d7420bb1) )
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "tr.9e", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    /* priority (not used) - N82S129A or compatible */
+	ROM_LOAD( "tr.9e", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    // priority (not used) - N82S129A or compatible
 ROM_END
 
 ROM_START( tigeroadb )
-	ROM_REGION( 0x40000, "maincpu", 0 ) /* 256K for 68000 code */
+	ROM_REGION( 0x40000, "maincpu", 0 ) // 256K for 68000 code
 	ROM_LOAD16_BYTE( "tgrroad.3",    0x00000, 0x10000, CRC(14c87e07) SHA1(31363b56dd9d387f3ebd7ca1c209148c389ec1aa) )
 	ROM_LOAD16_BYTE( "tgrroad.5",    0x00001, 0x10000, CRC(0904254c) SHA1(9ce7b8a699bc21618032db9b0c5494242ad77a6b) )
 	ROM_LOAD16_BYTE( "tgrroad.2",    0x20000, 0x10000, CRC(cedb1f46) SHA1(bc2d5730ff809fb0f38327d72485d472ab9da54d) )
 	ROM_LOAD16_BYTE( "tgrroad.4",    0x20001, 0x10000, CRC(e117f0b1) SHA1(ed0050247789bedaeb213c3d7c2d2cdb239bb4b4) )
 
-	ROM_REGION( 0x10000, "audiocpu", 0 ) /* audio CPU */
+	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "tru05.bin",    0x0000, 0x8000, CRC(f9a7c9bf) SHA1(4d37c71aa6523ac21c6e8b23f9957e75ec4304bf) )
 
-	/* no samples player in the English version */
+	// no samples player in the English version
 
 	ROM_REGION( 0x008000, "text", 0 )
-	ROM_LOAD( "tr01.bin",     0x00000, 0x08000, CRC(74a9f08c) SHA1(458958c8d9a2af5df88bb24c9c5bcbd37d6856bc) ) /* 8x8 text */
+	ROM_LOAD( "tr01.bin",     0x00000, 0x08000, CRC(74a9f08c) SHA1(458958c8d9a2af5df88bb24c9c5bcbd37d6856bc) ) // 8x8 text
 
 	ROM_REGION( 0x100000, "tiles", 0 )
-	ROM_LOAD( "tr-01a.bin",   0x00000, 0x20000, CRC(a8aa2e59) SHA1(792f50d688a4ffb574e41257816bc304d41f0458) ) /* tiles */
+	ROM_LOAD( "tr-01a.bin",   0x00000, 0x20000, CRC(a8aa2e59) SHA1(792f50d688a4ffb574e41257816bc304d41f0458) )
 	ROM_LOAD( "tr-04a.bin",   0x20000, 0x20000, CRC(8863a63c) SHA1(11bfce5b09c5b8a781c658f035d5658c3710d189) )
 	ROM_LOAD( "tr-02a.bin",   0x40000, 0x20000, CRC(1a2c5f89) SHA1(2a2aa2f1e2a0cdd4bbdb25236e49c7cc573db9e9) )
 	ROM_LOAD( "tr05.bin",     0x60000, 0x20000, CRC(5bf453b3) SHA1(5eef151974c6b818a17756549d24a702e1f3a859) )
@@ -921,34 +922,34 @@
 	ROM_LOAD( "tgrroad.18",   0xf0000, 0x10000, CRC(e2e053cb) SHA1(eb9432140fc167dec5d3273112933201be2be1b3) )
 
 	ROM_REGION( 0x080000, "spritegen", 0 )
-	ROM_LOAD32_BYTE( "tr-09a.bin",   0x00003, 0x20000, CRC(3d98ad1e) SHA1(f12cdf50e1708ddae092b9784d4319a7d5f092bc) ) /* sprites */
+	ROM_LOAD32_BYTE( "tr-09a.bin",   0x00003, 0x20000, CRC(3d98ad1e) SHA1(f12cdf50e1708ddae092b9784d4319a7d5f092bc) )
 	ROM_LOAD32_BYTE( "tr-10a.bin",   0x00002, 0x20000, CRC(8f6f03d7) SHA1(08a02cfb373040ea5ffbf5604f68df92a1338bb0) )
 	ROM_LOAD32_BYTE( "tr-11a.bin",   0x00001, 0x20000, CRC(cd9152e5) SHA1(6df3c43c0c41289890296c2b2aeca915dfdae3b0) )
 	ROM_LOAD32_BYTE( "tr-12a.bin",   0x00000, 0x20000, CRC(7d8a99d0) SHA1(af8221cfd2ce9aa3bf296981fb7fddd1e9ef4599) )
 
-	ROM_REGION( 0x08000, "bgmap", 0 )    /* background tilemaps */
+	ROM_REGION( 0x08000, "bgmap", 0 )
 	ROM_LOAD( "tr13.bin",     0x0000, 0x8000, CRC(a79be1eb) SHA1(4191ccd48f7650930f9a4c2be0790239d7420bb1) )
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "trprom.bin",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    /* priority (not used) */
+	ROM_LOAD( "trprom.bin",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    // priority (not used)
 ROM_END
 
-ROM_START( f1dream ) /* N86614A-5 + N86614B-6 board combo */
-	ROM_REGION( 0x40000, "maincpu", 0 ) /* 256K for 68000 code */
+ROM_START( f1dream ) // N86614A-5 + N86614B-6 board combo
+	ROM_REGION( 0x40000, "maincpu", 0 ) // 256K for 68000 code
 	ROM_LOAD16_BYTE( "f1_02.6j", 0x00000, 0x20000, CRC(3c2ec697) SHA1(bccb431ad92455484420f91770e91db6d69b09ec) )
 	ROM_LOAD16_BYTE( "f1_03.6k", 0x00001, 0x20000, CRC(85ebad91) SHA1(000f5c617417ff20ee9b378166776fecfacdff95) )
 
-	ROM_REGION( 0x10000, "audiocpu", 0 ) /* audio CPU */
+	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "f1_04.12k", 0x0000, 0x8000, CRC(4b9a7524) SHA1(19004958c19ac0af35f2c97790b0082ee2c15bc4) )
 
-	ROM_REGION( 0x1000, "mcu", 0 )  /* i8751 microcontroller */
-	ROM_LOAD( "f1.9j", 0x0000, 0x1000, CRC(c8e6075c) SHA1(d98bd358d30d22a8009cd2728dde1871a8140c23) ) /* labeled F1 */
+	ROM_REGION( 0x1000, "mcu", 0 )  // i8751 microcontroller
+	ROM_LOAD( "f1.9j", 0x0000, 0x1000, CRC(c8e6075c) SHA1(d98bd358d30d22a8009cd2728dde1871a8140c23) ) // labeled F1
 
 	ROM_REGION( 0x008000, "text", 0 )
-	ROM_LOAD( "f1_01.10d", 0x00000, 0x08000, CRC(361caf00) SHA1(8a109e4e116d0c5eea86f9c57c05359754daa5b9) ) /* 8x8 text */
+	ROM_LOAD( "f1_01.10d", 0x00000, 0x08000, CRC(361caf00) SHA1(8a109e4e116d0c5eea86f9c57c05359754daa5b9) ) // 8x8 text
 
 	ROM_REGION( 0x060000, "tiles", 0 )
-	ROM_LOAD( "f1_12.3f",  0x00000, 0x10000, CRC(bc13e43c) SHA1(f9528839858d7a45395062a43b71d80400c73173) ) /* tiles */
+	ROM_LOAD( "f1_12.3f",  0x00000, 0x10000, CRC(bc13e43c) SHA1(f9528839858d7a45395062a43b71d80400c73173) )
 	ROM_LOAD( "f1_10.1f",  0x10000, 0x10000, CRC(f7617ad9) SHA1(746a0ec433d5246ac4dbae17d6498e3d154e2df1) )
 	ROM_LOAD( "f1_14.3h",  0x20000, 0x10000, CRC(e33cd438) SHA1(89a6faea19e8a01b38ba45413609603e559877e9) )
 	ROM_LOAD( "f1_11.2f",  0x30000, 0x10000, CRC(4aa49cd7) SHA1(b7052d51a3cb570299f4db1492a1293c4d8b067f) )
@@ -956,33 +957,33 @@
 	ROM_LOAD( "f1_13.2h",  0x50000, 0x10000, CRC(2a63961e) SHA1(a35e9bf0408716f460487a8d2ae336572a98d2fb) )
 
 	ROM_REGION( 0x040000, "spritegen", 0 )
-	ROM_LOAD32_BYTE( "f1_06.3b", 0x00003, 0x10000, CRC(5e54e391) SHA1(475c968bfeb41b0448e621f59724c7b70d184d36) ) /* sprites */
+	ROM_LOAD32_BYTE( "f1_06.3b", 0x00003, 0x10000, CRC(5e54e391) SHA1(475c968bfeb41b0448e621f59724c7b70d184d36) )
 	ROM_LOAD32_BYTE( "f1_05.2b", 0x00002, 0x10000, CRC(cdd119fd) SHA1(e279ada53f5a1e2ada0195b93399731af213f518) )
 	ROM_LOAD32_BYTE( "f1_08.3d", 0x00001, 0x10000, CRC(811f2e22) SHA1(cca7e8cc43408c2c3067a731a98a8a6418a000aa) )
 	ROM_LOAD32_BYTE( "f1_07.2d", 0x00000, 0x10000, CRC(aa9a1233) SHA1(c2079ad81d67b54483ea5f69ac2edf276ad58ca9) )
 
-	ROM_REGION( 0x08000, "bgmap", 0 )    /* background tilemaps */
+	ROM_REGION( 0x08000, "bgmap", 0 )
 	ROM_LOAD( "f1_15.7l", 0x0000, 0x8000, CRC(978758b7) SHA1(ebd415d70e2f1af3b1bd51f40e7d60f22369638c) )
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "tr.9e", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) /* priority (not used) - N82S129A or compatible */
+	ROM_LOAD( "tr.9e", 0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used) - N82S129A or compatible
 ROM_END
 
 ROM_START( f1dreamb )
-	ROM_REGION( 0x40000, "maincpu", 0 ) /* 256K for 68000 code */
+	ROM_REGION( 0x40000, "maincpu", 0 ) // 256K for 68000 code
 	ROM_LOAD16_BYTE( "f1d_04.bin",   0x00000, 0x10000, CRC(903febad) SHA1(73726b220ce45e1f13798e50fb6455671f1150f3) )
 	ROM_LOAD16_BYTE( "f1d_05.bin",   0x00001, 0x10000, CRC(666fa2a7) SHA1(f38e71293368ddc586f437c38ced1d8ce91527ea) )
 	ROM_LOAD16_BYTE( "f1d_02.bin",   0x20000, 0x10000, CRC(98973c4c) SHA1(a73d396a1c3e43e6250d9e0ab1902d6f754d1ed9) )
 	ROM_LOAD16_BYTE( "f1d_03.bin",   0x20001, 0x10000, CRC(3d21c78a) SHA1(edee180131a5b4d507ce0490fd3890bdd03ce62f) )
 
-	ROM_REGION( 0x10000, "audiocpu", 0 ) /* audio CPU */
+	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "12k_04.bin",   0x0000, 0x8000, CRC(4b9a7524) SHA1(19004958c19ac0af35f2c97790b0082ee2c15bc4) )
 
 	ROM_REGION( 0x008000, "text", 0 )
-	ROM_LOAD( "10d_01.bin",   0x00000, 0x08000, CRC(361caf00) SHA1(8a109e4e116d0c5eea86f9c57c05359754daa5b9) ) /* 8x8 text */
+	ROM_LOAD( "10d_01.bin",   0x00000, 0x08000, CRC(361caf00) SHA1(8a109e4e116d0c5eea86f9c57c05359754daa5b9) ) // 8x8 text
 
 	ROM_REGION( 0x060000, "tiles", 0 )
-	ROM_LOAD( "03f_12.bin",   0x00000, 0x10000, CRC(bc13e43c) SHA1(f9528839858d7a45395062a43b71d80400c73173) ) /* tiles */
+	ROM_LOAD( "03f_12.bin",   0x00000, 0x10000, CRC(bc13e43c) SHA1(f9528839858d7a45395062a43b71d80400c73173) )
 	ROM_LOAD( "01f_10.bin",   0x10000, 0x10000, CRC(f7617ad9) SHA1(746a0ec433d5246ac4dbae17d6498e3d154e2df1) )
 	ROM_LOAD( "03h_14.bin",   0x20000, 0x10000, CRC(e33cd438) SHA1(89a6faea19e8a01b38ba45413609603e559877e9) )
 	ROM_LOAD( "02f_11.bin",   0x30000, 0x10000, CRC(4aa49cd7) SHA1(b7052d51a3cb570299f4db1492a1293c4d8b067f) )
@@ -990,33 +991,33 @@
 	ROM_LOAD( "02h_13.bin",   0x50000, 0x10000, CRC(2a63961e) SHA1(a35e9bf0408716f460487a8d2ae336572a98d2fb) )
 
 	ROM_REGION( 0x040000, "spritegen", 0 )
-	ROM_LOAD32_BYTE( "03b_06.bin",   0x00003, 0x10000, CRC(5e54e391) SHA1(475c968bfeb41b0448e621f59724c7b70d184d36) ) /* sprites */
+	ROM_LOAD32_BYTE( "03b_06.bin",   0x00003, 0x10000, CRC(5e54e391) SHA1(475c968bfeb41b0448e621f59724c7b70d184d36) )
 	ROM_LOAD32_BYTE( "02b_05.bin",   0x00002, 0x10000, CRC(cdd119fd) SHA1(e279ada53f5a1e2ada0195b93399731af213f518) )
 	ROM_LOAD32_BYTE( "03d_08.bin",   0x00001, 0x10000, CRC(811f2e22) SHA1(cca7e8cc43408c2c3067a731a98a8a6418a000aa) )
 	ROM_LOAD32_BYTE( "02d_07.bin",   0x00000, 0x10000, CRC(aa9a1233) SHA1(c2079ad81d67b54483ea5f69ac2edf276ad58ca9) )
 
-	ROM_REGION( 0x08000, "bgmap", 0 )    /* background tilemaps */
+	ROM_REGION( 0x08000, "bgmap", 0 )
 	ROM_LOAD( "07l_15.bin",   0x0000, 0x8000, CRC(978758b7) SHA1(ebd415d70e2f1af3b1bd51f40e7d60f22369638c) )
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "09e_tr.bin",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    /* priority (not used) */
+	ROM_LOAD( "09e_tr.bin",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    // priority (not used)
 ROM_END
 
 ROM_START( f1dreamba )
-	ROM_REGION( 0x40000, "maincpu", 0 ) /* 256K for 68000 code */
+	ROM_REGION( 0x40000, "maincpu", 0 ) // 256K for 68000 code
 	ROM_LOAD16_BYTE( "3.bin",   0x00000, 0x10000, CRC(bdfbbbec) SHA1(08e058f0e612463a2975c4283b7210a3247a90ad) )
 	ROM_LOAD16_BYTE( "5.bin",   0x00001, 0x10000, CRC(cc47cfb2) SHA1(2a6c66f4e7e81550af2d94e4a219a0c03173039e) )
 	ROM_LOAD16_BYTE( "2.bin",   0x20000, 0x10000, CRC(a34f63fb) SHA1(db1ce7ff3a2496649d8357c3999c1ea1a06ba043) )
 	ROM_LOAD16_BYTE( "4.bin",   0x20001, 0x10000, CRC(f98db083) SHA1(07e3e611eed1a77b7cd99c231e401c18465445ce) )
 
-	ROM_REGION( 0x10000, "audiocpu", 0 ) /* audio CPU */
+	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "12k_04.bin",   0x0000, 0x8000, CRC(4b9a7524) SHA1(19004958c19ac0af35f2c97790b0082ee2c15bc4) )
 
 	ROM_REGION( 0x008000, "text", 0 )
-	ROM_LOAD( "10d_01.bin",   0x00000, 0x08000, CRC(361caf00) SHA1(8a109e4e116d0c5eea86f9c57c05359754daa5b9) ) /* 8x8 text */
+	ROM_LOAD( "10d_01.bin",   0x00000, 0x08000, CRC(361caf00) SHA1(8a109e4e116d0c5eea86f9c57c05359754daa5b9) ) // 8x8 text
 
 	ROM_REGION( 0x060000, "tiles", 0 )
-	ROM_LOAD( "03f_12.bin",   0x00000, 0x10000, CRC(bc13e43c) SHA1(f9528839858d7a45395062a43b71d80400c73173) ) /* tiles */
+	ROM_LOAD( "03f_12.bin",   0x00000, 0x10000, CRC(bc13e43c) SHA1(f9528839858d7a45395062a43b71d80400c73173) )
 	ROM_LOAD( "01f_10.bin",   0x10000, 0x10000, CRC(f7617ad9) SHA1(746a0ec433d5246ac4dbae17d6498e3d154e2df1) )
 	ROM_LOAD( "03h_14.bin",   0x20000, 0x10000, CRC(e33cd438) SHA1(89a6faea19e8a01b38ba45413609603e559877e9) )
 	ROM_LOAD( "02f_11.bin",   0x30000, 0x10000, CRC(4aa49cd7) SHA1(b7052d51a3cb570299f4db1492a1293c4d8b067f) )
@@ -1024,16 +1025,16 @@
 	ROM_LOAD( "02h_13.bin",   0x50000, 0x10000, CRC(2a63961e) SHA1(a35e9bf0408716f460487a8d2ae336572a98d2fb) )
 
 	ROM_REGION( 0x040000, "spritegen", 0 )
-	ROM_LOAD32_BYTE( "03b_06.bin",   0x00003, 0x10000, CRC(5e54e391) SHA1(475c968bfeb41b0448e621f59724c7b70d184d36) ) /* sprites */
+	ROM_LOAD32_BYTE( "03b_06.bin",   0x00003, 0x10000, CRC(5e54e391) SHA1(475c968bfeb41b0448e621f59724c7b70d184d36) )
 	ROM_LOAD32_BYTE( "02b_05.bin",   0x00002, 0x10000, CRC(cdd119fd) SHA1(e279ada53f5a1e2ada0195b93399731af213f518) )
 	ROM_LOAD32_BYTE( "03d_08.bin",   0x00001, 0x10000, CRC(811f2e22) SHA1(cca7e8cc43408c2c3067a731a98a8a6418a000aa) )
 	ROM_LOAD32_BYTE( "02d_07.bin",   0x00000, 0x10000, CRC(aa9a1233) SHA1(c2079ad81d67b54483ea5f69ac2edf276ad58ca9) )
 
-	ROM_REGION( 0x08000, "bgmap", 0 )    /* background tilemaps */
+	ROM_REGION( 0x08000, "bgmap", 0 )
 	ROM_LOAD( "07l_15.bin",   0x0000, 0x8000, CRC(978758b7) SHA1(ebd415d70e2f1af3b1bd51f40e7d60f22369638c) )
 
 	ROM_REGION( 0x0100, "proms", 0 )
-	ROM_LOAD( "09e_tr.bin",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    /* priority (not used) */
+	ROM_LOAD( "09e_tr.bin",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    // priority (not used)
 ROM_END
 
 
@@ -1045,7 +1046,7 @@
 	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "pushman.013", 0x00000, 0x08000,  CRC(adfe66c1) SHA1(fa4ed13d655c664b06e9b91292d2c0a88cb5a569) )
 
-	ROM_REGION( 0x01000, "mcu", 0 ) /* Verified same for all 4 currently dumped versions */
+	ROM_REGION( 0x01000, "mcu", 0 ) // Verified same for all 4 currently dumped versions
 	ROM_LOAD( "pushman68705r3p.ic23",  0x00000, 0x01000, CRC(d7916657) SHA1(89c14c6044f082fffe2a8f86d0a82336f4a110a2) )
 
 	ROM_REGION( 0x10000, "text", 0 )
@@ -1063,11 +1064,11 @@
 	ROM_LOAD( "pushman.007", 0x00000, 0x10000, CRC(b70020bd) SHA1(218ca4a08b87b7dc5c1eed99960f4098c4fc7e0c) )
 	ROM_LOAD( "pushman.009", 0x10000, 0x10000, CRC(cc555667) SHA1(6c79e14fc18d1d836392044779cb3219494a3447) )
 
-	ROM_REGION( 0x10000, "bgmap", 0 )    /* bg tilemaps */
+	ROM_REGION( 0x10000, "bgmap", 0 )
 	ROM_LOAD( "pushman.010", 0x00000, 0x08000, CRC(a500132d) SHA1(26b02c9fea69b51c5f7dc1b43b838cd336ebf862) )
 
-	ROM_REGION( 0x0100, "proms", 0 ) /* this is the same as tiger road / f1-dream */
-	ROM_LOAD( "n82s129an.ic82",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) /* priority (not used) */
+	ROM_REGION( 0x0100, "proms", 0 ) // this is the same as tiger road / f1-dream
+	ROM_LOAD( "n82s129an.ic82",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used)
 ROM_END
 
 ROM_START( pushmana )
@@ -1078,7 +1079,7 @@
 	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "pushman.013", 0x00000, 0x08000,  CRC(adfe66c1) SHA1(fa4ed13d655c664b06e9b91292d2c0a88cb5a569) ) // missing from this set?
 
-	ROM_REGION( 0x01000, "mcu", 0 ) /* Verified same for all 4 currently dumped versions */
+	ROM_REGION( 0x01000, "mcu", 0 ) // Verified same for all 4 currently dumped versions
 	ROM_LOAD( "pushman68705r3p.ic23",  0x00000, 0x01000, CRC(d7916657) SHA1(89c14c6044f082fffe2a8f86d0a82336f4a110a2) )
 
 	ROM_REGION( 0x10000, "text", 0 )
@@ -1096,11 +1097,11 @@
 	ROM_LOAD( "pushman.007", 0x00000, 0x10000, CRC(b70020bd) SHA1(218ca4a08b87b7dc5c1eed99960f4098c4fc7e0c) ) // .132
 	ROM_LOAD( "pushman.009", 0x10000, 0x10000, CRC(cc555667) SHA1(6c79e14fc18d1d836392044779cb3219494a3447) ) // .149
 
-	ROM_REGION( 0x10000, "bgmap", 0 )    /* bg tilemaps */
+	ROM_REGION( 0x10000, "bgmap", 0 )
 	ROM_LOAD( "pushmana.189", 0x00000, 0x10000, CRC(59f25598) SHA1(ace33afd6e6d07376ed01048db99b13bcec790d7) )
 
-	ROM_REGION( 0x0100, "proms", 0 ) /* this is the same as tiger road / f1-dream */
-	ROM_LOAD( "n82s129an.ic82",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) /* priority (not used) */
+	ROM_REGION( 0x0100, "proms", 0 ) // this is the same as tiger road / f1-dream
+	ROM_LOAD( "n82s129an.ic82",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used)
 ROM_END
 
 ROM_START( pushmans )
@@ -1111,7 +1112,7 @@
 	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "pman-13.ic216", 0x00000, 0x08000, CRC(bc03827a) SHA1(b4d6ae164bbb7ba19e4934392fe2ba29575f28b9) )
 
-	ROM_REGION( 0x01000, "mcu", 0 ) /* Verified same for all 4 currently dumped versions */
+	ROM_REGION( 0x01000, "mcu", 0 ) // Verified same for all 4 currently dumped versions
 	ROM_LOAD( "pushman68705r3p.ic23",  0x00000, 0x01000, CRC(d7916657) SHA1(89c14c6044f082fffe2a8f86d0a82336f4a110a2) )
 
 	ROM_REGION( 0x10000, "text", 0 )
@@ -1129,26 +1130,26 @@
 	ROM_LOAD( "pman-7.ic132", 0x00000, 0x10000, CRC(208cb197) SHA1(161633b6b0acf25447a5c0b3c6fbf18adc6e2243) )
 	ROM_LOAD( "pman-9.ic149", 0x10000, 0x10000, CRC(77ee8577) SHA1(63d13683dd097d8e7cb71ad3abe04e11f2a58bd3) )
 
-	ROM_REGION( 0x10000, "bgmap", 0 )    /* bg tilemaps */
+	ROM_REGION( 0x10000, "bgmap", 0 )
 	ROM_LOAD( "pman-10.ic189", 0x00000, 0x08000, CRC(5f9ae9a1) SHA1(87619918c28c942780f6dbd3818d4cc69932eefc) )
 
-	ROM_REGION( 0x0100, "proms", 0 ) /* this is the same as tiger road / f1-dream */
-	ROM_LOAD( "n82s129an.ic82",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) /* priority (not used) */
+	ROM_REGION( 0x0100, "proms", 0 ) // this is the same as tiger road / f1-dream
+	ROM_LOAD( "n82s129an.ic82",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used)
 ROM_END
 
-ROM_START( pushmant ) /* Single plane PCB */
+ROM_START( pushmant ) // Single plane PCB
 	ROM_REGION( 0x40000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "12.ic212", 0x000000, 0x10000, CRC(f5c77d86) SHA1(66d2d5dc9f4662efc5a865c9cc1bba653e86a674) )
 	ROM_LOAD16_BYTE( "11.ic197", 0x000001, 0x10000, CRC(2e09ff08) SHA1(9bb05c51c985c3a12fb8d6fd915276e304651eb1) )
 
 	ROM_REGION( 0x10000, "audiocpu", 0 )
-	ROM_LOAD( "13.ic216", 0x00000, 0x08000, CRC(adfe66c1) SHA1(fa4ed13d655c664b06e9b91292d2c0a88cb5a569) ) /* Same as the Comad set */
+	ROM_LOAD( "13.ic216", 0x00000, 0x08000, CRC(adfe66c1) SHA1(fa4ed13d655c664b06e9b91292d2c0a88cb5a569) ) // Same as the Comad set
 
-	ROM_REGION( 0x01000, "mcu", 0 ) /* Verified same for all 4 currently dumped versions */
+	ROM_REGION( 0x01000, "mcu", 0 ) // Verified same for all 4 currently dumped versions
 	ROM_LOAD( "pushman68705r3p.ic23",  0x00000, 0x01000, CRC(d7916657) SHA1(89c14c6044f082fffe2a8f86d0a82336f4a110a2) )
 
 	ROM_REGION( 0x10000, "text", 0 )
-	ROM_LOAD( "1.ic130",  0x00000, 0x08000, CRC(14497754) SHA1(a47d03c56add18c5d9aed221990550b18589ff43) ) /* Same as the Sammy set */
+	ROM_LOAD( "1.ic130",  0x00000, 0x08000, CRC(14497754) SHA1(a47d03c56add18c5d9aed221990550b18589ff43) ) // Same as the Sammy set
 
 	ROM_REGION( 0x40000, "spritegen", 0 )
 	ROM_LOAD32_BYTE( "4.ic58", 0x00000, 0x10000, CRC(69209214) SHA1(c5b527234aefbdfb39864806e2b1784fdf2dd49c) )
@@ -1157,16 +1158,16 @@
 	ROM_LOAD32_BYTE( "3.ic57", 0x00003, 0x10000, CRC(5f1c4e7a) SHA1(751caf2365eccbab6d7de5434c4656ac5bd7f13b) )
 
 	ROM_REGION( 0x40000, "tiles", 0 )
-	ROM_LOAD( "6.ic131", 0x20000, 0x10000, CRC(bd0f9025) SHA1(7262410d4631f1b051c605d5cea5b91e9f68327e) ) /* These 4 are the same as the Sammy set */
+	ROM_LOAD( "6.ic131", 0x20000, 0x10000, CRC(bd0f9025) SHA1(7262410d4631f1b051c605d5cea5b91e9f68327e) ) // These 4 are the same as the Sammy set
 	ROM_LOAD( "8.ic148", 0x30000, 0x10000, CRC(591bd5c0) SHA1(6e0e18e0912fa38e113420ac31c7f36853b830ec) )
 	ROM_LOAD( "7.ic132", 0x00000, 0x10000, CRC(208cb197) SHA1(161633b6b0acf25447a5c0b3c6fbf18adc6e2243) )
 	ROM_LOAD( "9.ic149", 0x10000, 0x10000, CRC(77ee8577) SHA1(63d13683dd097d8e7cb71ad3abe04e11f2a58bd3) )
 
-	ROM_REGION( 0x10000, "bgmap", 0 )    /* bg tilemaps */
-	ROM_LOAD( "10.ic189", 0x00000, 0x08000, CRC(5f9ae9a1) SHA1(87619918c28c942780f6dbd3818d4cc69932eefc) ) /* Same as the Sammy set */
+	ROM_REGION( 0x10000, "bgmap", 0 )
+	ROM_LOAD( "10.ic189", 0x00000, 0x08000, CRC(5f9ae9a1) SHA1(87619918c28c942780f6dbd3818d4cc69932eefc) ) // Same as the Sammy set
 
-	ROM_REGION( 0x0100, "proms", 0 ) /* this is the same as tiger road / f1-dream */
-	ROM_LOAD( "n82s129an.ic82",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) /* priority (not used) */
+	ROM_REGION( 0x0100, "proms", 0 ) // this is the same as tiger road / f1-dream
+	ROM_LOAD( "n82s129an.ic82",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) ) // priority (not used)
 ROM_END
 
 ROM_START( bballs )
@@ -1177,7 +1178,7 @@
 	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "bb13.n4", 0x00000, 0x08000, CRC(1ef78175) SHA1(2e7dcbab3a572c2a6bb67a36ba283a5faeb14a88) )
 
-	ROM_REGION( 0x01000, "mcu", 0 ) /* using dump from bballsa set */
+	ROM_REGION( 0x01000, "mcu", 0 ) // using dump from bballsa set
 	ROM_LOAD( "mc68705r3.bin",  0x00000, 0x01000, CRC(4b37b853) SHA1(c95b7b1dcc6f4730fd08535001e2f02b34ea14c2) BAD_DUMP )
 
 	ROM_REGION( 0x10000, "text", 0 )
@@ -1195,11 +1196,11 @@
 	ROM_LOAD( "bb7.h2", 0x00000, 0x10000, CRC(a352d53b) SHA1(c71e976b7c28630d7af11fffe0d1cfd7d611ee8b) )
 	ROM_LOAD( "bb9.j2", 0x10000, 0x10000, CRC(78d185ac) SHA1(6ed6e1f5eeb93129eeeab6bae22b640c9782f7fc) )
 
-	ROM_REGION( 0x10000, "bgmap", 0 )    /* bg tilemaps */
+	ROM_REGION( 0x10000, "bgmap", 0 )
 	ROM_LOAD( "bb10.l6", 0x00000, 0x08000, CRC(d06498f9) SHA1(9f33bbc40ebe11c03aec29289f76f1c3ca5bf009) )
 
-	ROM_REGION( 0x0100, "proms", 0 ) /* this is the same as tiger road / f1-dream */
-	ROM_LOAD( "bb_prom.e9",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    /* priority (not used) N82S129 BPROM */
+	ROM_REGION( 0x0100, "proms", 0 ) // this is the same as tiger road / f1-dream
+	ROM_LOAD( "bb_prom.e9",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    // priority (not used) N82S129 BPROM
 ROM_END
 
 ROM_START( bballsa )
@@ -1228,11 +1229,11 @@
 	ROM_LOAD( "7.ic132", 0x00000, 0x10000, CRC(2289393a) SHA1(e1370925a92f7d9f96c9431cf1b8dd262c41017e) )
 	ROM_LOAD( "9.ic149", 0x10000, 0x10000, CRC(1fe3d172) SHA1(f7415e8633507a507ec1cd68de224722a726a473) )
 
-	ROM_REGION( 0x10000, "bgmap", 0 )    /* bg tilemaps */
+	ROM_REGION( 0x10000, "bgmap", 0 )
 	ROM_LOAD( "10.ic189", 0x00000, 0x08000, CRC(52e4ab27) SHA1(c9ae15f970b4bf120a4bbee9adcf0e5e4de001e7) )
 
-	ROM_REGION( 0x0100, "proms", 0 ) /* this is the same as tiger road / f1-dream */
-	ROM_LOAD( "bb_prom.e9",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    /* priority (not used) N82S129 BPROM */
+	ROM_REGION( 0x0100, "proms", 0 ) // this is the same as tiger road / f1-dream
+	ROM_LOAD( "bb_prom.e9",   0x0000, 0x0100, CRC(ec80ae36) SHA1(397ec8fc1b106c8b8d4bf6798aa429e8768a101a) )    // priority (not used) N82S129 BPROM
 ROM_END
 
 
@@ -1240,21 +1241,21 @@
 /***************************************************************************/
 
 
-GAME( 1987, tigeroad, 0,        tigeroad, tigeroad, tigeroad_state, empty_init, ROT0, "Capcom", "Tiger Road (US)", 0 )
-GAME( 1987, tigeroadu,tigeroad, tigeroad, tigeroad, tigeroad_state, empty_init, ROT0, "Capcom (Romstar license)", "Tiger Road (US, Romstar license)", 0 )
-GAME( 1987, toramich, tigeroad, toramich, toramich, tigeroad_state, empty_init, ROT0, "Capcom", "Tora e no Michi (Japan)", 0 )
-GAME( 1987, tigeroadb,tigeroad, tigeroad, tigeroad, tigeroad_state, empty_init, ROT0, "bootleg", "Tiger Road (US bootleg)", 0 )
-
-/* F1 Dream has an Intel 8751 microcontroller for protection */
-GAME( 1988, f1dream,  0,        f1dream,      f1dream,  f1dream_state,  empty_init, ROT0, "Capcom (Romstar license)", "F-1 Dream", 0 )
-GAME( 1988, f1dreamb, f1dream,  tigeroad,     f1dream,  tigeroad_state, empty_init, ROT0, "bootleg", "F-1 Dream (bootleg, set 1)", 0 )
-GAME( 1988, f1dreamba,f1dream,  tigeroad,     f1dream,  tigeroad_state, empty_init, ROT0, "bootleg", "F-1 Dream (bootleg, set 2)", 0 )
-
-/* This Comad hardware is based around the F1 Dream design */
-GAME( 1990, pushman,  0,        pushman, pushman,   pushman_state, empty_init, ROT0, "Comad", "Pushman (Korea, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, pushmana, pushman,  pushman, pushman,   pushman_state, empty_init, ROT0, "Comad", "Pushman (Korea, set 2)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, pushmans, pushman,  pushman, pushman,   pushman_state, empty_init, ROT0, "Comad (American Sammy license)", "Pushman (American Sammy license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1990, pushmant, pushman,  pushman, pushman,   pushman_state, empty_init, ROT0, "Comad (Top Tronic license)", "Pushman (Top Tronic license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, tigeroad,  0,        tigeroad, tigeroad, tigeroad_state, empty_init, ROT0, "Capcom",                   "Tiger Road (US)",                  MACHINE_SUPPORTS_SAVE )
+GAME( 1987, tigeroadu, tigeroad, tigeroad, tigeroad, tigeroad_state, empty_init, ROT0, "Capcom (Romstar license)", "Tiger Road (US, Romstar license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, toramich,  tigeroad, toramich, toramich, tigeroad_state, empty_init, ROT0, "Capcom",                   "Tora e no Michi (Japan)",          MACHINE_SUPPORTS_SAVE )
+GAME( 1987, tigeroadb, tigeroad, tigeroad, tigeroad, tigeroad_state, empty_init, ROT0, "bootleg",                  "Tiger Road (US bootleg)",          MACHINE_SUPPORTS_SAVE )
+
+// F1 Dream has an Intel 8751 microcontroller for protection
+GAME( 1988, f1dream,  0,       f1dream,  f1dream, f1dream_state,  empty_init, ROT0, "Capcom (Romstar license)", "F-1 Dream",                  MACHINE_SUPPORTS_SAVE )
+GAME( 1988, f1dreamb, f1dream, tigeroad, f1dream, tigeroad_state, empty_init, ROT0, "bootleg",                  "F-1 Dream (bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
+GAME( 1988, f1dreamba,f1dream, tigeroad, f1dream, tigeroad_state, empty_init, ROT0, "bootleg",                  "F-1 Dream (bootleg, set 2)", MACHINE_SUPPORTS_SAVE )
+
+// This Comad hardware is based around the F1 Dream design
+GAME( 1990, pushman,  0,       pushman, pushman, pushman_state, empty_init, ROT0, "Comad",                          "Pushman (Korea, set 1)",           MACHINE_SUPPORTS_SAVE )
+GAME( 1990, pushmana, pushman, pushman, pushman, pushman_state, empty_init, ROT0, "Comad",                          "Pushman (Korea, set 2)",           MACHINE_SUPPORTS_SAVE )
+GAME( 1990, pushmans, pushman, pushman, pushman, pushman_state, empty_init, ROT0, "Comad (American Sammy license)", "Pushman (American Sammy license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1990, pushmant, pushman, pushman, pushman, pushman_state, empty_init, ROT0, "Comad (Top Tronic license)",     "Pushman (Top Tronic license)",     MACHINE_SUPPORTS_SAVE )
 
-GAME( 1991, bballs,   0,        bballs,  bballs,    pushman_state, empty_init, ROT0, "Comad", "Bouncing Balls", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, bballsa,  bballs,   bballs,  bballs,    pushman_state, empty_init, ROT0, "Comad", "Bouncing Balls (Adult)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, bballs,  0,      bballs, bballs, pushman_state, empty_init, ROT0, "Comad", "Bouncing Balls",         MACHINE_SUPPORTS_SAVE )
+GAME( 1991, bballsa, bballs, bballs, bballs, pushman_state, empty_init, ROT0, "Comad", "Bouncing Balls (Adult)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tispeak.cpp mame-0.224+dfsg.1/src/mame/drivers/tispeak.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tispeak.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tispeak.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -87,7 +87,7 @@
     - VSM(2/2): 16KB CD2320
     - VFD: 8 digits with 14 segments, DP and accent mark
 
-    Speak & Spell (France) "La Dictee Magique", 1980
+    Speak & Spell (France) "La Dictée Magique", 1980
     - MCU: CD2702, label CD2702AN2L (die label TMC0270F 2702A)
     - TMS51xx: CD2801
     - VSM: 16KB CD2352
@@ -854,8 +854,8 @@
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_ENTER) PORT_NAME("Essaie")
 
 	PORT_MODIFY("IN.7")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PGDN) PORT_NAME("Arr" e_ACUTE "t") // -> auto_power_off
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_HOME) PORT_NAME("D" e_ACUTE "part")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_PGDN) PORT_NAME(u8"Arrét") // -> auto_power_off
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_1) PORT_CODE(KEYCODE_HOME) PORT_NAME(u8"Départ")
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_2) PORT_NAME("Rejoue")
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_3) PORT_NAME("Repete")
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_4) PORT_NAME("Aide")
@@ -915,7 +915,7 @@
 
 	PORT_START("IN.3") // R3
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CHAR('N')
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_NAME(N_TILDE)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_COLON) PORT_NAME(u8"Ñ")
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_O) PORT_CHAR('O')
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_P) PORT_CHAR('P')
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_Q) PORT_CHAR('Q')
@@ -992,8 +992,8 @@
 	PORT_START("IN.5") // R5
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_PLUS_PAD) PORT_NAME("+")
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_MINUS_PAD) PORT_NAME("-")
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_ASTERISK) PORT_NAME(UTF8_MULTIPLY)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME(UTF8_DIVIDE)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_ASTERISK) PORT_NAME(u8"×")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_SLASH_PAD) PORT_NAME(u8"÷")
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYPAD ) PORT_CODE(KEYCODE_E) PORT_NAME("Mix It")
 
 	PORT_START("IN.6") // R6
@@ -1248,13 +1248,13 @@
 	PORT_START("IN.3") // O3
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_SLASH) PORT_NAME("Prompt")
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_D) PORT_CODE(KEYCODE_4) PORT_CODE(KEYCODE_4_PAD) PORT_CHAR('D') PORT_NAME("D/4")
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CODE(KEYCODE_ASTERISK) PORT_CHAR('M') PORT_NAME("M/" UTF8_MULTIPLY)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_M) PORT_CODE(KEYCODE_ASTERISK) PORT_CHAR('M') PORT_NAME(u8"M/×")
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_V) PORT_CHAR('V')
 
 	PORT_START("IN.4") // O4
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_HOME) PORT_NAME("Menu")
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_E) PORT_CODE(KEYCODE_5) PORT_CODE(KEYCODE_5_PAD) PORT_CHAR('E') PORT_NAME("E/5")
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CODE(KEYCODE_SLASH_PAD) PORT_CHAR('N') PORT_NAME("N/" UTF8_DIVIDE)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_N) PORT_CODE(KEYCODE_SLASH_PAD) PORT_CHAR('N') PORT_NAME(u8"N/÷")
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD ) PORT_CODE(KEYCODE_W) PORT_CHAR('W')
 
 	PORT_START("IN.5") // O5
@@ -1887,7 +1887,7 @@
 COMP( 1981, snspelluka, snspell,  0, sns_cd2801,   snspell,    tispeak_state, init_snspell,  "Texas Instruments", "Speak & Spell (UK, 1981 version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
 COMP( 1979, snspelljp,  snspell,  0, sns_tmc0281,  snspell,    tispeak_state, init_snspell,  "Texas Instruments", "Speak & Spell (Japan)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
 COMP( 1981, snspellsp,  snspell,  0, snspellsp,    snspellsp,  tispeak_state, init_snspell,  "Texas Instruments", "Speak & Spell (Spanish, prototype)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
-COMP( 1980, snspellfr,  snspell,  0, sns_cd2801,   snspellfr,  tispeak_state, init_snspell,  "Texas Instruments", "La Dictee Magique (France)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
+COMP( 1980, snspellfr,  snspell,  0, sns_cd2801,   snspellfr,  tispeak_state, init_snspell,  "Texas Instruments", u8"La Dictée Magique (France)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
 COMP( 1982, snspellit,  snspell,  0, snspellit,    snspellit,  tispeak_state, init_snspell,  "Texas Instruments", "Grillo Parlante (Italy)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
 
 COMP( 1981, snspellc,   0,        0, snspellc,     snspellc,   tispeak_state, init_snspell,  "Texas Instruments", "Speak & Spell Compact (US, 1981 version)", MACHINE_SUPPORTS_SAVE | MACHINE_IMPERFECT_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tnzs.cpp mame-0.224+dfsg.1/src/mame/drivers/tnzs.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tnzs.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tnzs.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -19,7 +19,7 @@
   Invulnerability isn't possible in 'tnzsop' (level select is stucked to level 6-1).
 
 
-Hardware datails for the newer tnzs board (from pictures):
+Hardware details for the newer tnzs board (from pictures):
 
   Main board
   M6100409A N.ZEALAND STORY (written on label)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/toaplan2.cpp mame-0.224+dfsg.1/src/mame/drivers/toaplan2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/toaplan2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/toaplan2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4489,6 +4489,25 @@
 	ROM_LOAD( "5.bin", 0x00000, 0x20000, CRC(8107c4bd) SHA1(64e2fafa808c16c722454b611a8492a4620a925c) ) // motherboard ROM, unknown purpose
 ROM_END
 
+ROM_START( pipibibsbl3 )
+	ROM_REGION( 0x040000, "maincpu", 0 )            // Main 68K code, not scrambled
+	ROM_LOAD16_BYTE( "5.bin", 0x000000, 0x020000, CRC(7fab770c) SHA1(c96808870c5906e0203f38114702bd660e491a7d) )
+	ROM_LOAD16_BYTE( "6.bin", 0x000001, 0x020000, CRC(9007ef00) SHA1(594052be7351e0b8e30f83abd9a91ab1429d82ef) )
+
+	ROM_REGION( 0x10000, "audiocpu", 0 )            // Sound Z80 code
+	ROM_LOAD( "7.bin", 0x0000, 0x8000, CRC(101c0358) SHA1(162e02d00b7bdcdd3b48a0cd0527b7428435ec50) ) // same data as komocomo in oneshot.cpp
+
+	ROM_REGION( 0x200000, "gp9001_0", 0 )
+	// GFX data differs slightly from Toaplan boards ???
+	ROM_LOAD16_BYTE( "4.bin", 0x000000, 0x080000, CRC(0fcae44b) SHA1(ac72bc79e3a5d0a81647c312d310d00ace017272) )
+	ROM_LOAD16_BYTE( "3.bin", 0x000001, 0x080000, CRC(8bfcdf87) SHA1(4537a7d646d3014f069c6fd0be457bb32e2f18ac) )
+	ROM_LOAD16_BYTE( "2.bin", 0x100000, 0x080000, CRC(abdd2b8b) SHA1(a4246dd63515f01d1227c9a9e16d9f1c739ee39e) )
+	ROM_LOAD16_BYTE( "1.bin", 0x100001, 0x080000, CRC(70faa734) SHA1(4448f4dbded56c142e57293d371e0a422c3a667e) )
+
+	ROM_REGION( 0x8000, "user1", 0 )            // ??? Some sort of table
+	ROM_LOAD( "8.bin", 0x0000, 0x8000, CRC(456dd16e) SHA1(84779ee64d3ea33ba1ba4dee39b504a81c6811a1) ) // 1xxxxxxxxxxxxxx = 0xFF, same data as komocomo in oneshot.cpp
+ROM_END
+
 #define ROMS_FIXEIGHT \
 	ROM_REGION( 0x080000, "maincpu", 0 ) \
 	ROM_LOAD16_WORD_SWAP( "tp-026-1", 0x000000, 0x080000, CRC(f7b1746a) SHA1(0bbea6f111b818bc9b9b2060af4fe900f37cf7f9) ) \
@@ -5643,8 +5662,9 @@
 GAME( 1991, pipibibsp,   pipibibs, pipibibs,     pipibibsp,  toaplan2_state, empty_init,    ROT0,   "Toaplan",         "Pipi & Bibis / Whoopee!! (prototype)",            MACHINE_SUPPORTS_SAVE )
 GAME( 1991, whoopee,     pipibibs, tekipaki,     whoopee,    toaplan2_state, empty_init,    ROT0,   "Toaplan",         "Pipi & Bibis / Whoopee!! (Teki Paki hardware)",   MACHINE_SUPPORTS_SAVE ) // original Whoopee!! boards have a HD647180 instead of Z80
 
-GAME( 1991, pipibibsbl,  pipibibs, pipibibsbl,   pipibibsbl, toaplan2_state, init_pipibibsbl, ROT0, "bootleg (Ryouta Kikaku)", "Pipi & Bibis / Whoopee!! (bootleg, set 1)", MACHINE_SUPPORTS_SAVE )
-GAME( 1991, pipibibsbl2, pipibibs, pipibibsbl,   pipibibsbl, toaplan2_state, empty_init,    ROT0,   "bootleg",                 "Pipi & Bibis / Whoopee!! (bootleg, set 2)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // different memory map, not scrambled
+GAME( 1991, pipibibsbl,  pipibibs, pipibibsbl,   pipibibsbl, toaplan2_state, init_pipibibsbl, ROT0, "bootleg (Ryouta Kikaku)", "Pipi & Bibis / Whoopee!! (Ryouta Kikaku bootleg, encrypted)", MACHINE_SUPPORTS_SAVE )
+GAME( 1991, pipibibsbl2, pipibibs, pipibibsbl,   pipibibsbl, toaplan2_state, empty_init,    ROT0,   "bootleg",                 "Pipi & Bibis / Whoopee!! (bootleg, decrypted)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // different memory map, not scrambled
+GAME( 1991, pipibibsbl3, pipibibs, pipibibsbl,   pipibibsbl, toaplan2_state, empty_init,    ROT0,   "bootleg (Ryouta Kikaku)", "Pipi & Bibis / Whoopee!! (Ryouta Kikaku bootleg, decrypted)", MACHINE_SUPPORTS_SAVE )
 
 GAME( 1993, enmadaio,    0,        enmadaio,     enmadaio,   toaplan2_state, init_enmadaio, ROT0,   "Toaplan / Taito",  "Enma Daio (Japan)", 0 ) // TP-031
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/toki_ms.cpp mame-0.224+dfsg.1/src/mame/drivers/toki_ms.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/toki_ms.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/toki_ms.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -334,6 +334,8 @@
 	void adpcm_w(u8 data);
 	DECLARE_WRITE_LINE_MEMBER(adpcm_int);
 	u8 m_adpcm_data;
+
+	void descramble_16x16tiles(uint8_t* src, int len);
 };
 
 TILE_GET_INFO_MEMBER(toki_ms_state::get_tile_info)
@@ -545,7 +547,7 @@
 	map(0xc000, 0xc7ff).ram();
 	map(0xd000, 0xd7ff).ram();
 	// area 0xdff0-5 is never ever readback, applying a RAM mirror causes sound to go significantly worse,
-	// what they are even for?
+	// what they are even for?  (offset select bankswitch rather than data select?)
 	map(0xdfff, 0xdfff).r(m_soundlatch, FUNC(generic_latch_8_device::read));
 	map(0xe000, 0xe001).w(m_ym1, FUNC(ym2203_device::write));
 	map(0xe002, 0xe003).w(m_ym2, FUNC(ym2203_device::write));
@@ -637,6 +639,7 @@
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 INPUT_PORTS_END
 
+
 static const gfx_layout tiles16x16x4_layout =
 {
 	16,16,
@@ -649,29 +652,27 @@
 };
 
 
-static const gfx_layout tokib_tilelayout =
+static const gfx_layout tiles8x8x4_layout =
 {
-	16,16,  /* 16 by 16 */
-	4096,   /* 4096 characters */
-	4,  /* 4 bits per pixel */
-	{ 4096*16*16*3,4096*16*16*2,4096*16*16*1,4096*16*16*0 },    /* planes */
-	{ 0, 1, 2, 3, 4, 5, 6, 7,
-		0x8000*8+0, 0x8000*8+1, 0x8000*8+2, 0x8000*8+3, 0x8000*8+4,
-		0x8000*8+5, 0x8000*8+6, 0x8000*8+7 },           /* x bit */
-	{
-		0,8,16,24,32,40,48,56,
-		0x10000*8+ 0, 0x10000*8+ 8, 0x10000*8+16, 0x10000*8+24, 0x10000*8+32,
-		0x10000*8+40, 0x10000*8+48, 0x10000*8+56 },         /* y bit */
-	8*8
+	8,8,
+	RGN_FRAC(1,1),
+	4,
+	{ 0,8,16,24 },
+	{ 0,1,2,3,4,5,6,7 },
+	{ STEP8(0,32) },
+	16 * 16
 };
 
+
 static GFXDECODE_START( gfx_toki_ms )
-	GFXDECODE_ENTRY( "gfx1", 0, gfx_8x8x4_planar,    0x100, 16 )
-	GFXDECODE_ENTRY( "gfx2", 0, tiles16x16x4_layout, 0x000, 16 )
-	GFXDECODE_ENTRY( "gfx3", 0, tokib_tilelayout,    0x200, 16 )
-	GFXDECODE_ENTRY( "gfx4", 0, tokib_tilelayout,    0x300, 16 )
+	GFXDECODE_ENTRY( "gfx1", 0, tiles8x8x4_layout, 0x100, 16 )
+
+	GFXDECODE_ENTRY( "sprites", 0, tiles16x16x4_layout, 0x000, 16 )
+	GFXDECODE_ENTRY( "gfx3", 0, tiles16x16x4_layout, 0x200, 16 )
+	GFXDECODE_ENTRY( "gfx4", 0, tiles16x16x4_layout, 0x300, 16 )
 GFXDECODE_END
 
+
 void toki_ms_state::machine_start()
 {
 	membank("sound_bank")->configure_entries(0, 2, memregion("audiocpu")->base() + 0x8000, 0x4000);
@@ -742,51 +743,48 @@
 	ROM_LOAD( "1_tk_101.c19", 0x000000, 0x10000, CRC(a447a394) SHA1(ccaa6aca5c2afc7c05035cb551b8368b18188dd6) )
 
 	ROM_REGION( 0x040000, "gfx1", 0 )
-	ROM_LOAD( "8_tk_825.ic9",      0x000000, 0x10000, CRC(6d04def0) SHA1(36f23b0893dfae6cf4c6f4414ff54bb13cfdad41) )
-	ROM_LOAD( "8_tk_826.ic16",     0x010000, 0x10000, CRC(d3a2a038) SHA1(a2a020397a427f5fd401aad09048c7d4a21cd728) )
-	ROM_LOAD( "8_tk_827.ic24",     0x020000, 0x10000, CRC(d254ae6c) SHA1(cdbdd7d7c6cd4de8b8a0f54e1543caba5f3d11cb) )
-	ROM_LOAD( "8_tk_828.ic31",     0x030000, 0x10000, CRC(a6fae34b) SHA1(d9a276d30bdcc25d9cd299c2502cf910273890f6) )
+	ROM_LOAD32_BYTE( "8_tk_825.ic9",      0x000003, 0x10000, CRC(6d04def0) SHA1(36f23b0893dfae6cf4c6f4414ff54bb13cfdad41) )
+	ROM_LOAD32_BYTE( "8_tk_826.ic16",     0x000002, 0x10000, CRC(d3a2a038) SHA1(a2a020397a427f5fd401aad09048c7d4a21cd728) )
+	ROM_LOAD32_BYTE( "8_tk_827.ic24",     0x000001, 0x10000, CRC(d254ae6c) SHA1(cdbdd7d7c6cd4de8b8a0f54e1543caba5f3d11cb) )
+	ROM_LOAD32_BYTE( "8_tk_828.ic31",     0x000000, 0x10000, CRC(a6fae34b) SHA1(d9a276d30bdcc25d9cd299c2502cf910273890f6) )
 
-	ROM_REGION( 0x100000, "gfx2", ROMREGION_ERASEFF | ROMREGION_INVERT ) // sprites (same rom subboard type as galpanic_ms.cpp)
+	ROM_REGION( 0x100000, "sprites", ROMREGION_ERASEFF | ROMREGION_INVERT ) // sprites (same rom subboard type as galpanic_ms.cpp)
 	ROM_LOAD32_BYTE( "5_tk_501.ic3",         0x000003, 0x010000, CRC(c3cd26b6) SHA1(20d5a68eada4150642365dd61c699b7771de5372) )
 	ROM_LOAD32_BYTE( "5_tk_505.ic12",        0x000002, 0x010000, CRC(ec096351) SHA1(10417266c2280b2d9c301423d8c41ed73d9654c9) )
 	ROM_LOAD32_BYTE( "5_tk_509.ic18",        0x000001, 0x010000, CRC(a1a4ef7b) SHA1(92aad84f14f8257477920012bd1fe033ec96301b) )
 	ROM_LOAD32_BYTE( "5_tk_513.ic24",        0x000000, 0x010000, CRC(8dfda6fa) SHA1(ee2600d6cdcb27500e61dd1beebed904fd2c3ac5) )
-
 	ROM_LOAD32_BYTE( "5_tk_502.ic4",         0x040003, 0x010000, CRC(122d59eb) SHA1(5dc9c55667021630f49cfb70c0c70bdf3ac1e3a7) )
 	ROM_LOAD32_BYTE( "5_tk_506.ic13",        0x040002, 0x010000, CRC(ed92289f) SHA1(fe612e704bf6aefdbd85f1d49a9bbc4d0fef0f95) )
 	ROM_LOAD32_BYTE( "5_tk_510.ic19",        0x040001, 0x010000, CRC(56eb4876) SHA1(113d2b300d7670068e3587f63b4f0b0bd38d84a3) )
 	ROM_LOAD32_BYTE( "5_tk_514.ic25",        0x040000, 0x010000, CRC(b0c7801c) SHA1(99e898bcb4a8c4dc00726908f9095df512539776) )
-
 	ROM_LOAD32_BYTE( "5_tk_503.ic5",         0x080003, 0x010000, CRC(9201545b) SHA1(dee1736946ec781ee035714281298f2e2a48fec1) )
 	ROM_LOAD32_BYTE( "5_tk_507.ic14",        0x080002, 0x010000, CRC(e61eebbd) SHA1(1f854ba98a1cde4473107b8282b88e6412094d19) )
 	ROM_LOAD32_BYTE( "5_tk_511.ic20",        0x080001, 0x010000, CRC(06d9fd86) SHA1(22472905672c956941d41b3e5febb4cb57c91283) )
 	ROM_LOAD32_BYTE( "5_tk_515.ic26",        0x080000, 0x010000, CRC(04b575a7) SHA1(c6c65745511e27b594818e3f7ba7313c0a6f599e) )
-
 	ROM_LOAD32_BYTE( "5_tk_504.ic6",         0x0c0003, 0x010000, CRC(cec71122) SHA1(283d38f998b1ca4fa080bf9fac797f5ac91dd072) )
 	ROM_LOAD32_BYTE( "5_tk_508.ic15",        0x0c0002, 0x010000, CRC(1873ae38) SHA1(a1633ab5c417e9851e285a6b322c06e7d2d0bccd) )
 	ROM_LOAD32_BYTE( "5_tk_512.ic21",        0x0c0001, 0x010000, CRC(0228110f) SHA1(33a29f9f458ca9d0af3c8da8a5b67bab79cecdec) )
 	ROM_LOAD32_BYTE( "5_tk_516.ic27",        0x0c0000, 0x010000, CRC(f4e29429) SHA1(706050b51e0afbddf6ec5c8f14d3649bb05c8550) )
 
 	ROM_REGION( 0x080000, "gfx3", 0 ) // same ROMs as some of the other Toki bootlegs
-	ROM_LOAD( "8_tk_809.ic13",     0x000000, 0x10000, CRC(feb13d35) SHA1(1b78ce1e48d16e58ad0721b30ab87765ded7d24e) )
-	ROM_LOAD( "8_tk_813.ic12",     0x010000, 0x10000, CRC(5b365637) SHA1(434775b0614d904beaf40d7e00c1eaf59b704cb1) )
-	ROM_LOAD( "8_tk_810.ic20",     0x020000, 0x10000, CRC(617c32e6) SHA1(a80f93c83a06acf836e638e4ad2453692622015d) )
-	ROM_LOAD( "8_tk_814.ic19",     0x030000, 0x10000, CRC(2a11c0f0) SHA1(f9b1910c4932f5b95e5a9a8e8d5376c7210bcde7) )
-	ROM_LOAD( "8_tk_811.ic28",     0x040000, 0x10000, CRC(fbc3d456) SHA1(dd10455f2e6c415fb5e39fb239904c499b38ca3e) )
-	ROM_LOAD( "8_tk_815.ic27",     0x050000, 0x10000, CRC(4c2a72e1) SHA1(52a31f88e02e1689c2fffbbd86cbccd0bdab7dcc) )
-	ROM_LOAD( "8_tk_812.ic35",     0x060000, 0x10000, CRC(46a1b821) SHA1(74d9762aef3891463dc100d1bc2d4fdc3c1d163f) )
-	ROM_LOAD( "8_tk_816.ic34",     0x070000, 0x10000, CRC(82ce27f6) SHA1(db29396a336098664f48e3c04930b973a6ffe969) )
+	ROM_LOAD32_BYTE( "8_tk_809.ic13",     0x000003, 0x10000, CRC(feb13d35) SHA1(1b78ce1e48d16e58ad0721b30ab87765ded7d24e) )
+	ROM_LOAD32_BYTE( "8_tk_810.ic20",     0x000002, 0x10000, CRC(617c32e6) SHA1(a80f93c83a06acf836e638e4ad2453692622015d) )
+	ROM_LOAD32_BYTE( "8_tk_811.ic28",     0x000001, 0x10000, CRC(fbc3d456) SHA1(dd10455f2e6c415fb5e39fb239904c499b38ca3e) )
+	ROM_LOAD32_BYTE( "8_tk_812.ic35",     0x000000, 0x10000, CRC(46a1b821) SHA1(74d9762aef3891463dc100d1bc2d4fdc3c1d163f) )
+	ROM_LOAD32_BYTE( "8_tk_813.ic12",     0x040003, 0x10000, CRC(5b365637) SHA1(434775b0614d904beaf40d7e00c1eaf59b704cb1) )
+	ROM_LOAD32_BYTE( "8_tk_814.ic19",     0x040002, 0x10000, CRC(2a11c0f0) SHA1(f9b1910c4932f5b95e5a9a8e8d5376c7210bcde7) )
+	ROM_LOAD32_BYTE( "8_tk_815.ic27",     0x040001, 0x10000, CRC(4c2a72e1) SHA1(52a31f88e02e1689c2fffbbd86cbccd0bdab7dcc) )
+	ROM_LOAD32_BYTE( "8_tk_816.ic34",     0x040000, 0x10000, CRC(82ce27f6) SHA1(db29396a336098664f48e3c04930b973a6ffe969) )
 
 	ROM_REGION( 0x080000, "gfx4", 0 ) // same ROMs as some of the other Toki bootlegs
-	ROM_LOAD( "8_tk_801.ic15",     0x000000, 0x10000, CRC(63026cad) SHA1(c8f3898985d99f2a61d4e17eba66b5989a23d0d7) )
-	ROM_LOAD( "8_tk_805.ic14",     0x010000, 0x10000, CRC(a7f2ce26) SHA1(6b12b3bd872112b42d91ce3c0d5bc95c0fc0f5b5) )
-	ROM_LOAD( "8_tk_802.ic22",     0x020000, 0x10000, CRC(48989aa0) SHA1(109c68c9f0966862194226cecc8b269d9307dd25) )
-	ROM_LOAD( "8_tk_806.ic21",     0x030000, 0x10000, CRC(c2ad9342) SHA1(7c9b5c14c8061e1a57797b79677741b1b98e64fa) )
-	ROM_LOAD( "8_tk_803.ic30",     0x040000, 0x10000, CRC(6cd22b18) SHA1(8281cfd46738448b6890c50c64fb72941e169bee) )
-	ROM_LOAD( "8_tk_807.ic29",     0x050000, 0x10000, CRC(859e313a) SHA1(18ac471a72b3ed42ba74456789adbe323f723660) )
-	ROM_LOAD( "8_tk_804.ic37",     0x060000, 0x10000, CRC(e15c1d0f) SHA1(d0d571dd1055d7307379850313216da86b0704e6) )
-	ROM_LOAD( "8_tk_808.ic36",     0x070000, 0x10000, CRC(6f4b878a) SHA1(4560b1e705a0eb9fad7fdc11fadf952ff67eb264) )
+	ROM_LOAD32_BYTE( "8_tk_801.ic15",     0x000003, 0x10000, CRC(63026cad) SHA1(c8f3898985d99f2a61d4e17eba66b5989a23d0d7) )
+	ROM_LOAD32_BYTE( "8_tk_802.ic22",     0x000002, 0x10000, CRC(48989aa0) SHA1(109c68c9f0966862194226cecc8b269d9307dd25) )
+	ROM_LOAD32_BYTE( "8_tk_803.ic30",     0x000001, 0x10000, CRC(6cd22b18) SHA1(8281cfd46738448b6890c50c64fb72941e169bee) )
+	ROM_LOAD32_BYTE( "8_tk_804.ic37",     0x000000, 0x10000, CRC(e15c1d0f) SHA1(d0d571dd1055d7307379850313216da86b0704e6) )
+	ROM_LOAD32_BYTE( "8_tk_805.ic14",     0x040003, 0x10000, CRC(a7f2ce26) SHA1(6b12b3bd872112b42d91ce3c0d5bc95c0fc0f5b5) )
+	ROM_LOAD32_BYTE( "8_tk_806.ic21",     0x040002, 0x10000, CRC(c2ad9342) SHA1(7c9b5c14c8061e1a57797b79677741b1b98e64fa) )
+	ROM_LOAD32_BYTE( "8_tk_807.ic29",     0x040001, 0x10000, CRC(859e313a) SHA1(18ac471a72b3ed42ba74456789adbe323f723660) )
+	ROM_LOAD32_BYTE( "8_tk_808.ic36",     0x040000, 0x10000, CRC(6f4b878a) SHA1(4560b1e705a0eb9fad7fdc11fadf952ff67eb264) )
 
 	ROM_REGION( 0x100, "protpal", 0 ) // all read protected
 	ROM_LOAD( "5_5140_palce16v8h-25pc.ic9", 0, 1, NO_DUMP )
@@ -808,40 +806,26 @@
 	ROM_LOAD( "1_10110_82s123.ic20",  0x0300, 0x020, CRC(e26e680a) SHA1(9bbe30e98e952a6113c64e1171330153ddf22ce7) )
 ROM_END
 
-void toki_ms_state::init_tokims()
+// reorganize graphics into something we can decode with a single pass
+void toki_ms_state::descramble_16x16tiles(uint8_t* src, int len)
 {
-	// copied verbatim from toki.cpp
-	u8 temp[0x20000];
-
-	int len = memregion("gfx3")->bytes();
-	u8 *rom = memregion("gfx3")->base();
-	for (int offs = 0; offs < len; offs += 0x20000)
+	std::vector<uint8_t> buffer(len);
 	{
-		u8 *base = &rom[offs];
-		memcpy (&temp[0], base, 65536 * 2);
-		for (int i = 0; i < 16; i++)
+		for (int i = 0; i < len; i++)
 		{
-			memcpy(&base[0x00000 + i * 0x800], &temp[0x0000 + i * 0x2000], 0x800);
-			memcpy(&base[0x10000 + i * 0x800], &temp[0x0800 + i * 0x2000], 0x800);
-			memcpy(&base[0x08000 + i * 0x800], &temp[0x1000 + i * 0x2000], 0x800);
-			memcpy(&base[0x18000 + i * 0x800], &temp[0x1800 + i * 0x2000], 0x800);
+			int j = bitswap<20>(i, 19,18,17,16,15,12,11,10,9,8,7,6,5,14,13,4,3,2,1,0);
+			buffer[j] = src[i];
 		}
-	}
 
-	len = memregion("gfx4")->bytes();
-	rom = memregion("gfx4")->base();
-	for (int offs = 0; offs < len; offs += 0x20000)
-	{
-		u8 *base = &rom[offs];
-		memcpy (&temp[0], base, 65536 * 2);
-		for (int i = 0; i < 16; i++)
-		{
-			memcpy(&base[0x00000 + i * 0x800], &temp[0x0000 + i * 0x2000], 0x800);
-			memcpy(&base[0x10000 + i * 0x800], &temp[0x0800 + i * 0x2000], 0x800);
-			memcpy(&base[0x08000 + i * 0x800], &temp[0x1000 + i * 0x2000], 0x800);
-			memcpy(&base[0x18000 + i * 0x800], &temp[0x1800 + i * 0x2000], 0x800);
-		}
+		std::copy(buffer.begin(), buffer.end(), &src[0]);
 	}
 }
 
+void toki_ms_state::init_tokims()
+{
+	descramble_16x16tiles(memregion("gfx3")->base(), memregion("gfx3")->bytes());
+	descramble_16x16tiles(memregion("gfx4")->base(), memregion("gfx4")->bytes());
+	// gfx3 is 8x8 tiles
+}
+
 GAME( 1991, tokims,  toki,  tokims,  tokims,  toki_ms_state, init_tokims, ROT0, "bootleg", "Toki (Modular System)", MACHINE_IMPERFECT_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tonton.cpp mame-0.224+dfsg.1/src/mame/drivers/tonton.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tonton.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tonton.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -45,12 +45,10 @@
 
 private:
 	required_device<v9938_device> m_v9938;
-	void tonton_outport_w(offs_t offset, uint8_t data);
+	void outport_w(offs_t offset, uint8_t data);
 	void hopper_w(uint8_t data);
 	void ay_aout_w(uint8_t data);
 	void ay_bout_w(uint8_t data);
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
 	required_device<cpu_device> m_maincpu;
 	required_device<ticket_dispenser_device> m_hopper;
 	void tonton_io(address_map &map);
@@ -69,10 +67,10 @@
 *          Multi-Purpose Output Port             *
 *************************************************/
 
-void tonton_state::tonton_outport_w(offs_t offset, uint8_t data)
+void tonton_state::outport_w(offs_t offset, uint8_t data)
 {
 	machine().bookkeeping().coin_counter_w(offset, data & 0x01);
-	machine().bookkeeping().coin_lockout_global_w(data & 0x02);  /* Coin Lock */
+	machine().bookkeeping().coin_lockout_global_w(data & 0x02);  // Coin Lock
 
 //  if(data & 0xfe)
 //      logerror("%02x %02x\n",data,offset);
@@ -101,7 +99,7 @@
 {
 	map.global_mask(0xff);
 	map(0x00, 0x00).portr("IN0");
-	map(0x00, 0x00).w(FUNC(tonton_state::tonton_outport_w));
+	map(0x00, 0x00).w(FUNC(tonton_state::outport_w));
 	map(0x01, 0x01).portr("IN1");
 	map(0x01, 0x01).w(FUNC(tonton_state::hopper_w));
 	map(0x02, 0x02).portr("DSW1");
@@ -192,19 +190,6 @@
 
 
 /*************************************************
-*        Machine Start & Reset Routines          *
-*************************************************/
-
-void tonton_state::machine_start()
-{
-}
-
-void tonton_state::machine_reset()
-{
-}
-
-
-/*************************************************
 *      R/W Handlers and Interrupt Routines       *
 *************************************************/
 
@@ -224,14 +209,14 @@
 
 void tonton_state::tonton(machine_config &config)
 {
-	/* basic machine hardware */
-	Z80(config, m_maincpu, CPU_CLOCK);  /* Guess. According to other MSX2 based gambling games */
+	// basic machine hardware
+	Z80(config, m_maincpu, CPU_CLOCK);  // Guess. According to other MSX2 based gambling games
 	m_maincpu->set_addrmap(AS_PROGRAM, &tonton_state::tonton_map);
 	m_maincpu->set_addrmap(AS_IO, &tonton_state::tonton_io);
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0);
 
-	/* video hardware */
+	// video hardware
 	V9938(config, m_v9938, MAIN_CLOCK);
 	m_v9938->set_screen_ntsc("screen");
 	m_v9938->set_vram_size(0x20000);
@@ -240,9 +225,9 @@
 
 	TICKET_DISPENSER(config, m_hopper, attotime::from_msec(HOPPER_PULSE), TICKET_MOTOR_ACTIVE_HIGH, TICKET_STATUS_ACTIVE_LOW );
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
-	ym2149_device &aysnd(YM2149(config, "aysnd", YM2149_CLOCK));   /* Guess. According to other MSX2 based gambling games */
+	ym2149_device &aysnd(YM2149(config, "aysnd", YM2149_CLOCK));   // Guess. According to other MSX2 based gambling games
 	/*
 	  AY8910: Port A out: FF
 	  AY8910: Port B out: FF
@@ -251,8 +236,8 @@
 	  AY8910: Port A out: 00
 	  AY8910: Port B out: 00
 	*/
-	aysnd.port_a_write_callback().set(FUNC(tonton_state::ay_aout_w));    /* Write all bits twice, and then reset them at boot */
-	aysnd.port_b_write_callback().set(FUNC(tonton_state::ay_bout_w));    /* Write all bits twice, and then reset them at boot */
+	aysnd.port_a_write_callback().set(FUNC(tonton_state::ay_aout_w));    // Write all bits twice, and then reset them at boot
+	aysnd.port_b_write_callback().set(FUNC(tonton_state::ay_bout_w));    // Write all bits twice, and then reset them at boot
 	aysnd.add_route(ALL_OUTPUTS, "mono", 0.70);
 }
 
@@ -269,5 +254,5 @@
 ROM_END
 
 
-//    YEAR  NAME     PARENT  MACHINE  INPUT   STATE         INIT        ROT   COMPANY                   FULLNAME                                 FLAGS
-GAME( 1987, tonton,  0,      tonton,  tonton, tonton_state, empty_init, ROT0, "Success / Taiyo Jidoki", "Waku Waku Doubutsu Land TonTon (Japan)", 0 )
+//    YEAR  NAME     PARENT  MACHINE  INPUT   STATE         INIT        ROT   COMPANY                   FULLNAME                                  FLAGS
+GAME( 1987, tonton,  0,      tonton,  tonton, tonton_state, empty_init, ROT0, "Success / Taiyo Jidoki", "Waku Waku Doubutsu Land TonTon (Japan)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tourvis.cpp mame-0.224+dfsg.1/src/mame/drivers/tourvis.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tourvis.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tourvis.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -445,27 +445,29 @@
 	ROMX_LOAD( "v4-60.ic29", 0x0000, 0x8000, CRC(1fd27e22) SHA1(b103d365eac3fa447c2e9addddf6974b4403ed41), ROM_BIOS(0) ) \
 	ROM_SYSTEM_BIOS( 1, "55", "V4-55" ) \
 	ROMX_LOAD( "v4-55.ic29", 0x0000, 0x8000, CRC(87cf66c1) SHA1(d6b42137be7a07a0e299c2d922328a6a9a2b7b8f), ROM_BIOS(1) ) \
-	ROM_SYSTEM_BIOS( 2, "53", "V4-53" ) \
-	ROMX_LOAD( "v4-53.ic29", 0x0000, 0x8000, CRC(bccb53c9) SHA1(a27113d70cf348c7eafa39fc7a76f55f63723ad7), ROM_BIOS(2) ) \
-	ROM_SYSTEM_BIOS( 3, "52", "V4-52" ) \
-	ROMX_LOAD( "v4-52.ic29", 0x0000, 0x8000, CRC(ffd7b0fe) SHA1(d1804865c91e925a01b05cf441e8458a3db23f50), ROM_BIOS(3) ) \
-	ROM_SYSTEM_BIOS( 4, "51", "V4-51" ) \
-	ROMX_LOAD( "v4-51.ic29", 0x0000, 0x8000, CRC(2de0b946) SHA1(c13051453aff3a2329f18ebade75c69aa3b1c28d), ROM_BIOS(4) ) \
-	ROM_SYSTEM_BIOS( 5, "43", "V4-43" ) \
-	ROMX_LOAD( "v4-43.ic29", 0x0000, 0x8000, CRC(88da23f3) SHA1(9d24faa116129783e55c7f79a4a08902a236d5a6), ROM_BIOS(5) ) \
-	ROM_SYSTEM_BIOS( 6, "42", "V4-42" ) \
-	ROMX_LOAD( "v4-42.ic29", 0x0000, 0x8000, CRC(0372606d) SHA1(8c6a63865b0b4951ea032725cf022d353115b93b), ROM_BIOS(6) ) \
-	ROM_SYSTEM_BIOS( 7, "40", "V4-40" ) \
-	ROMX_LOAD( "v4-40.ic29", 0x0000, 0x8000, CRC(ba6290cc) SHA1(92b0e9f55791e892ec209de4fadd80faef370622), ROM_BIOS(7) ) \
-	ROM_SYSTEM_BIOS( 8, "20", "VT-20" ) \
-	ROMX_LOAD( "vt_2.0.bin", 0x0000, 0x8000, CRC(36012f88) SHA1(5bd42fb51aa48ff65e704ea06a9181bb87ed2137), ROM_BIOS(8) ) \
-	ROM_SYSTEM_BIOS( 9, "11", "VT-11" ) \
-	ROMX_LOAD( "vt_1.1.bin", 0x0000, 0x8000, CRC(27abbc36) SHA1(881ea7802b9e241473bc8ced0472e0f1851c9886), ROM_BIOS(9) )
+	ROM_SYSTEM_BIOS( 2, "54", "V4-54" ) \
+	ROMX_LOAD( "v4-54.ic29", 0x0000, 0x8000, CRC(125e7a6e) SHA1(6f03c49acaad4feb9c2187f84fc1cb5451d0eb2b), ROM_BIOS(2) ) \
+	ROM_SYSTEM_BIOS( 3, "53", "V4-53" ) \
+	ROMX_LOAD( "v4-53.ic29", 0x0000, 0x8000, CRC(bccb53c9) SHA1(a27113d70cf348c7eafa39fc7a76f55f63723ad7), ROM_BIOS(3) ) \
+	ROM_SYSTEM_BIOS( 4, "52", "V4-52" ) \
+	ROMX_LOAD( "v4-52.ic29", 0x0000, 0x8000, CRC(ffd7b0fe) SHA1(d1804865c91e925a01b05cf441e8458a3db23f50), ROM_BIOS(4) ) \
+	ROM_SYSTEM_BIOS( 5, "51", "V4-51" ) \
+	ROMX_LOAD( "v4-51.ic29", 0x0000, 0x8000, CRC(2de0b946) SHA1(c13051453aff3a2329f18ebade75c69aa3b1c28d), ROM_BIOS(5) ) \
+	ROM_SYSTEM_BIOS( 6, "43", "V4-43" ) \
+	ROMX_LOAD( "v4-43.ic29", 0x0000, 0x8000, CRC(88da23f3) SHA1(9d24faa116129783e55c7f79a4a08902a236d5a6), ROM_BIOS(6) ) \
+	ROM_SYSTEM_BIOS( 7, "42", "V4-42" ) \
+	ROMX_LOAD( "v4-42.ic29", 0x0000, 0x8000, CRC(0372606d) SHA1(8c6a63865b0b4951ea032725cf022d353115b93b), ROM_BIOS(7) ) \
+	ROM_SYSTEM_BIOS( 8, "40", "V4-40" ) \
+	ROMX_LOAD( "v4-40.ic29", 0x0000, 0x8000, CRC(ba6290cc) SHA1(92b0e9f55791e892ec209de4fadd80faef370622), ROM_BIOS(8) ) \
+	ROM_SYSTEM_BIOS( 9, "20", "VT-20" ) \
+	ROMX_LOAD( "vt_2.0.bin", 0x0000, 0x8000, CRC(36012f88) SHA1(5bd42fb51aa48ff65e704ea06a9181bb87ed2137), ROM_BIOS(9) ) \
+	ROM_SYSTEM_BIOS(10, "11", "VT-11" ) \
+	ROMX_LOAD( "vt_1.1.bin", 0x0000, 0x8000, CRC(27abbc36) SHA1(881ea7802b9e241473bc8ced0472e0f1851c9886), ROM_BIOS(10) )
 
 ROM_START(tourvis)
 	ROM_REGION( 0x100000, "maincpu", ROMREGION_ERASE00 )
 
-	TOURVISION_BIOS /* BIOS rom type is 27C256 */
+	TOURVISION_BIOS // BIOS rom type is 27C256
 ROM_END
 
 GAME( 19??, tourvis, 0, tourvision, tourvision, tourvision_state, init_pce_common, ROT0, "bootleg (Tourvision)", "Tourvision PCE bootleg", MACHINE_IS_BIOS_ROOT | MACHINE_NOT_WORKING )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tricep.cpp mame-0.224+dfsg.1/src/mame/drivers/tricep.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tricep.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tricep.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -24,8 +24,8 @@
 	tricep_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_usart(*this, "usart%u", 0)
-		, m_p_ram(*this, "p_ram")
+		, m_usart(*this, "usart%u", 0U)
+		, m_ram(*this, "mainram")
 	{
 	}
 
@@ -35,13 +35,14 @@
 	uint8_t usart_r(offs_t offset);
 	void usart_w(offs_t offset, uint8_t data);
 
-	void tricep_mem(address_map &map);
+	void mem_map(address_map &map);
 
-	virtual void machine_reset() override;
+	void machine_reset() override;
+	void machine_start() override;
 
 	required_device<cpu_device> m_maincpu;
 	required_device_array<scn2651_device, 4> m_usart;
-	required_shared_ptr<uint16_t> m_p_ram;
+	required_shared_ptr<uint16_t> m_ram;
 
 	uint8_t m_mux;
 };
@@ -63,11 +64,11 @@
 	m_usart[m_mux]->write(offset, data);
 }
 
-void tricep_state::tricep_mem(address_map &map)
+void tricep_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x00000000, 0x0007ffff).ram().share("p_ram");
-	map(0x00fd0000, 0x00fd1fff).rom().region("bios", 0);
+	map(0x00000000, 0x0007ffff).ram().share("mainram");
+	map(0x00fd0000, 0x00fd1fff).rom().region("maincpu", 0);
 	map(0x00ff0028, 0x00ff002b).rw(FUNC(tricep_state::usart_r), FUNC(tricep_state::usart_w));
 	map(0x00ff002e, 0x00ff002f).nopr();
 	map(0x00ff002f, 0x00ff002f).w(FUNC(tricep_state::usart_select_w));
@@ -80,15 +81,20 @@
 
 void tricep_state::machine_reset()
 {
-	uint8_t* bios = memregion("bios")->base();
+	uint8_t* bios = memregion("maincpu")->base();
 
-	memcpy((uint8_t*)m_p_ram.target(),bios,0x2000);
+	memcpy((uint8_t*)m_ram.target(),bios,0x2000);
 
 	m_maincpu->reset();
 
 	m_mux = 0;
 }
 
+void tricep_state::machine_start()
+{
+	save_item(NAME(m_mux));
+}
+
 static const input_device_default terminal_defaults[] =
 {
 	DEVICE_INPUT_DEFAULTS( "RS232_RXBAUD", 0xff, RS232_BAUD_9600 )
@@ -103,7 +109,7 @@
 void tricep_state::tricep(machine_config &config)
 {
 	M68000(config, m_maincpu, 20_MHz_XTAL / 2);
-	m_maincpu->set_addrmap(AS_PROGRAM, &tricep_state::tricep_mem);
+	m_maincpu->set_addrmap(AS_PROGRAM, &tricep_state::mem_map);
 	// TODO: MC68451 MMU
 
 	SCN2651(config, m_usart[0], 5.0688_MHz_XTAL);
@@ -125,7 +131,7 @@
 
 /* ROM definition */
 ROM_START( tricep )
-	ROM_REGION16_BE( 0x2000, "bios", ROMREGION_ERASEFF )
+	ROM_REGION16_BE( 0x2000, "maincpu", 0 )
 	ROM_LOAD16_BYTE( "tri2.4_odd.u37",  0x0001, 0x1000, CRC(31eb2dcf) SHA1(2d9df9262ee1096d0398505e10d209201ac49a5d))
 	ROM_LOAD16_BYTE( "tri2.4_even.u36", 0x0000, 0x1000, CRC(4414dcdc) SHA1(00a3d293617dc691748ae85b6ccdd6723daefc0a))
 ROM_END
@@ -133,4 +139,5 @@
 /* Driver */
 
 //    YEAR  NAME    PARENT  COMPAT  MACHINE  INPUT   CLASS         INIT        COMPANY           FULLNAME  FLAGS
-COMP( 1985, tricep, 0,      0,      tricep,  tricep, tricep_state, empty_init, "Morrow Designs", "Tricep", MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+COMP( 1985, tricep, 0,      0,      tricep,  tricep, tricep_state, empty_init, "Morrow Designs", "Tricep", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
+
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/truco.cpp mame-0.224+dfsg.1/src/mame/drivers/truco.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/truco.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/truco.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,9 +12,7 @@
 
   - The board uses a battery backed ram for protection, mapped at $7c00-$7fff.
   - If the battery backup data is corrupt, it comes up with some sort of code entry screen.
-    As far as I can tell, you can't do anything with it.
-  - Replacing the battery backed ram with an eeprom is not really an option since the game stores the
-    current credits count in the battery backed ram.
+  - The game stores the current credits count in the battery backed ram.
   - System clock is 12 Mhz. The CPU clock is unknown.
   - The Alternate GFX mode is funky. Not only it has different bitmaps, but also the strings with the
     game options are truncated. Title is also truncated.
@@ -71,27 +69,27 @@
   - U1 : 40-pin IC  YES   CPU         MOTOROLA M6809EP               8-bit microprocessor.
   - U2 : 28-pin IC  YES   ROM         M27128A (or M27512FI)          NMOS 128K 16K x 8 UV EPROM (or 64K x 8).
   - U3 : 28-pin IC  YES   ROM         M27128A (or M27512FI)          NMOS 128K 16K x 8 UV EPROM (or 64K x 8).
-  - U4 : 40-pin IC  YES   I/O         ST EF6821P                     PIA: Peripheral Interface Adapter.
-  - U5 : 16-pin IC  YES   TTL         ST M74HC157B1                  Quad 2 Channel Multiplexer.
-  - U6 : 16-pin IC  YES   TTL         ST M74HC157B1                  Quad 2 Channel Multiplexer.
-  - U7 : 16-pin IC  YES   TTL         ST M74HC157B1                  Quad 2 Channel Multiplexer.
-  - U8 : 16-pin IC  YES   TTL         ST M74HC157B1                  Quad 2 Channel Multiplexer.
-  - U9 : 40-pin IC  YES   CRTC        HD6845 / UM6845 / GS GM68A45S  CRT Controller.
-  - U10: 28-pin IC  YES   RAM         KM62256BLP-10                  32K x 8 Low Power CMOS Static RAM.
-  - U11: 14-pin IC  YES   TTL         SN74LS95BN                     4-bit Parallel-Access Shift Registers.
-  - U12: 14-pin IC  YES   TTL         SN74LS95BN                     4-bit Parallel-Access Shift Registers.
-  - U13: 20-pin IC  YES   TTL         SN74LS244N                     Octal Buffers and Line Drivers with 3-State output.
-  - U14: 20-pin IC  YES   TTL         HD74LS374                      Octal D-type Flip-Flops with noninverted 3-state output.
+  - U4 : 40-pin IC  YES   I/O         EF6821P                        PIA: Peripheral Interface Adapter.
+  - U5 : 16-pin IC  YES   TTL         74HC157                        Quad 2 Channel Multiplexer.
+  - U6 : 16-pin IC  YES   TTL         74HC157                        Quad 2 Channel Multiplexer.
+  - U7 : 16-pin IC  YES   TTL         74HC157                        Quad 2 Channel Multiplexer.
+  - U8 : 16-pin IC  YES   TTL         74HC157                        Quad 2 Channel Multiplexer.
+  - U9 : 40-pin IC  YES   CRTC        HD6845 / UM6845 / GM68A45S     CRT Controller.
+  - U10: 28-pin IC  YES   RAM         62256-10                       32K x 8 Low Power CMOS Static RAM.
+  - U11: 14-pin IC  YES   TTL         74LS95                         4-bit Parallel-Access Shift Registers.
+  - U12: 14-pin IC  YES   TTL         74LS95                         4-bit Parallel-Access Shift Registers.
+  - U13: 20-pin IC  YES   TTL         74LS244                        Octal Buffers and Line Drivers with 3-State output.
+  - U14: 20-pin IC  YES   TTL         74LS374                        Octal D-type Flip-Flops with noninverted 3-state output.
   - U15: 20-pin IC  YES   PLD         PALCE16V8H-25                  EE CMOS Zero-Power 20-Pin Universal Programmable Array Logic.
   - U16: 20-pin IC  YES   PLD         PALCE16V8H-25                  EE CMOS Zero-Power 20-Pin Universal Programmable Array Logic.
-  - U17: 14-pin IC  YES   TTL         HD74LS00P                      Quadruple 2-Input NAND Gates.
-  - U18: 14-pin IC  YES   TTL         KS74HCTLS86N                   Quad 2???Input Exclusive OR Gate.
+  - U17: 14-pin IC  YES   TTL         74LS00                         Quad 2-Input NAND Gates.
+  - U18: 14-pin IC  YES   TTL         74HCTLS86                      Quad 2-Input XOR Gates.
   - U19: 16-pin IC  YES   WATCHDOG    MAXIM MAX691                   Microprocessor Supervisory Circuits.
   - U20: 16-pin IC  YES   DARLINGTON  ULN2003                        7 NPN Darlington transistor pairs with high voltage and current capability.
 
 
                              M6809
-                           +---\/---+
+                           .---\/---.
                     GND   1|        |40 !HALT <--
                 --> !NMI  2|        |39 ETAL  <--
   PIA /IRQA & B --> !IRQ  3|        |38 EXTAL <--
@@ -112,10 +110,10 @@
                 <-- A10  18|        |23 A15   -->
                 <-- A11  19|        |22 A14   -->
                 <-- A12  20|        |21 A13   -->
-                           +--------+
+                           '--------'
 
                             PIA 6821
-                          +----\/----+
+                          .----\/----.
                       VSS |01      40| CA1 --- PIA CB1 (*)
   JAMMA S17 (2P_ST) - PA0 |02      39| CA2 --- U19(11). Watchdog/RESET
   JAMMA S14 (SRVSW) - PA1 |03      38| /IRQA - CPU M6809 !IRQ (03)
@@ -136,7 +134,7 @@
         PIA CA1 (*) - CB1 |18      23| /CS2
             U20(06) - CB2 |19      22| CS0
                       VCC |20      21| R/W
-                          +----------+
+                          '----------'
 
     (*) Lines CA1 and CB1 are tied together, being both IN.
         They are connected to JAMMA C16 (COIN1).
@@ -144,42 +142,35 @@
 
   U19:   *** MAX691 ***  Maxim MAX691 Microprocessor Supervisory Circuit.
                          (for battery backup power switching and watchdog).
-  leg 01 [VBATT] ---->
-  leg 02 [VOUT] ----->
-  leg 03 [VCC] ------> VCC
-  leg 04 [GND] ------> GND
-  leg 05 [BATT ON] -->
-  leg 06 [/LOWLINE] ->
-  leg 07 [OSC IN] ---> N/C \  Set 1.6 seconds as WD timeout.
-  leg 08 [OSC SEL] --> N/C /
-  leg 09 [PFI] ------>
-  leg 10 [/PFO] ----->
-  leg 11 [WDI] ------> PIA CA2
-  leg 12 [/CE OUT] -->
-  leg 13 [/CE IN] ---> GND
-  leg 14 [/WDO] ----->
-  leg 15 [/RESET] ---> CPU /RES (37)
-  leg 16 [RESET] ---->
-
-
-  U20:   *** ULN2003 ***
-
-  leg 01 --> N/C
-  leg 02 --> N/C
-  leg 03 --> N/C
-  leg 04 --> PIA PB2 (12)
-  leg 05 --> PIA PB3 (13)
-  leg 06 --> PIA CB2 (19)
-  leg 07 --> PIA PB7 (17)
-  leg 08 --> GND
-  leg 09 --> VCC
-  leg 10 --> CAP --> JAMMA(S10) +Speaker
-  leg 11 --> JAMMA(S26)
-  leg 12 --> JAMMA(C08) Coin Counter 1
-  leg 13 --> JAMMA(S08) Coin Counter 2
-  leg 14 --> N/C
-  leg 15 --> N/C
-  leg 16 --> N/C
+
+                          MAX691
+                        .---\/---.
+        <----- [VBATT]--|01    16|--[PFI] ------>
+        <------ [VOUT]--|02    15|--[/PFO] ----->
+    VCC <------- [VCC]--|03    14|--[WDI] ------> PIA CA2
+    GND <------- [GND]--|04    13|--[/CE OUT] -->
+        <--- [BATT ON]--|05    12|--[/CE IN] ---> GND
+        <-- [/LOWLINE]--|06    11|--[/WDO] ----->
+  * N/C <---- [OSC IN]--|07    10|--[/RESET] ---> CPU /RES (37)
+  * N/C <--- [OSC SEL]--|08    09|--[RESET] ---->
+                        '--------'
+
+  * Set 1.6 seconds as WD timeout.
+
+
+  U20:   *** ULN2003 ***  High-voltage, high-current Darlington transistor array.
+
+                   ULN2003
+                  .---\/---.
+           N/C <--|01    16|--> N/C
+           N/C <--|02    15|--> N/C
+           N/C <--|03    14|--> N/C
+  PIA PB2 (12) <--|04    13|--> JAMMA(S08) Coin Counter 2
+  PIA PB3 (13) <--|05    12|--> JAMMA(C08) Coin Counter 1
+  PIA CB2 (19) <--|06    11|--> JAMMA(S26)
+  PIA PB7 (17) <--|07    10|--> CAP --> JAMMA(S10) +Speaker
+           GND <--|08    09|--> VCC
+                  '--------'
 
 
   JP1:
@@ -201,6 +192,7 @@
 
 *******************************************************************************************************/
 
+
 #include "emu.h"
 #include "includes/truco.h"
 
@@ -212,9 +204,10 @@
 #include "speaker.h"
 
 
-#define MASTER_CLOCK    XTAL(12'000'000)          /* confirmed */
-#define CPU_CLOCK       (MASTER_CLOCK/16)   /* guess */
-#define CRTC_CLOCK      (MASTER_CLOCK/8)    /* guess */
+#define MASTER_CLOCK    XTAL(12'000'000)    // confirmed
+#define CPU_CLOCK       (MASTER_CLOCK/16)   // guess
+#define CRTC_CLOCK      (MASTER_CLOCK/8)    // guess
+
 
 /*******************************************
 *           Read/Write Handlers            *
@@ -240,7 +233,7 @@
 
 void truco_state::portb_w(uint8_t data)
 {
-	m_dac->write(BIT(data, 7)); /* Isolated the bit for Delta-Sigma DAC */
+	m_dac->write(BIT(data, 7)); // Isolated the bit for Delta-Sigma DAC
 
 	if (data & 0x7f)
 		logerror("Port B writes: %2x\n", data);
@@ -263,64 +256,49 @@
 
 void truco_state::main_map(address_map &map)
 {
-	map(0x0000, 0x17ff).ram();                                     /* General purpose RAM */
-	map(0x1800, 0x7bff).ram().share("videoram");                /* Video RAM */
-	map(0x7c00, 0x7fff).ram().share("battery_ram");             /* Battery backed RAM */
+	map(0x0000, 0x17ff).ram();                          // General purpose RAM
+	map(0x1800, 0x7bff).ram().share("videoram");        // Video RAM
+	map(0x7c00, 0x7fff).ram().share("battery_ram");     // Battery backed RAM
 	map(0x8000, 0x8003).rw("pia0", FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 	map(0x8004, 0x8004).w("crtc", FUNC(mc6845_device::address_w));
 	map(0x8005, 0x8005).rw("crtc", FUNC(mc6845_device::register_r), FUNC(mc6845_device::register_w));
 	map(0x8008, 0xffff).rom();
 }
 /*
-CRTC:
+  CRTC MC6845 initialization routine at $a506 only set the first 14 registers (data at $a4e2)
+
+  Register:   00    01    02    03    04    05    06    07    08    09    10    11    12    13
+  Value:     0x5f  0x40  0x4d  0x06  0x0f  0x04  0x0c  0x0e  0x00  0x0f  0x00  0x00  0x00  0xc0
 
-00: 5f
-01: 40
-02: 4d
-03: 06
-04: 0f
-05: 04
-06: 0c
-07: 0e
-08: 00
-09: 0f
-0a: 00
-0b: 00
-0c: 00
-0d: c0
 */
 
+
 /*******************************************
 *         Input Ports Definition           *
 *******************************************/
 
 static INPUT_PORTS_START( truco )
-	PORT_START("P1")    /* IN0 */
-	PORT_DIPNAME( 0x01, 0x01, "IN0-1 (P2 START)" )
-	PORT_DIPSETTING (   0x01, DEF_STR( Off ) )
-	PORT_DIPSETTING (   0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x02, "IN0-2 (SERVICE SW)" )
-	PORT_DIPSETTING (   0x02, DEF_STR( Off ) )
-	PORT_DIPSETTING (   0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x04, "IN0-3 (P2 SELECT)" )
-	PORT_DIPSETTING (   0x04, DEF_STR( Off ) )
-	PORT_DIPSETTING (   0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x08, "IN0-4 (COIN2)" )
-	PORT_DIPSETTING (   0x08, DEF_STR( Off ) )
-	PORT_DIPSETTING (   0x00, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x10, "IN0-5 (TILT SW)" )
-	PORT_DIPSETTING (   0x10, DEF_STR( Off ) )
-	PORT_DIPSETTING (   0x00, DEF_STR( On ) )
-//  PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )        /* Connected to JAMMA S17 (P2 START) */
-//  PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )        /* Connected to JAMMA S14 (SERVICE SW) */
-//  PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )        /* Connected to JAMMA C26 (P2 SELECT) */
-//  PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )        /* Connected to JAMMA S16 (COIN2) */
-//  PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )        /* Connected to JAMMA S15 (TILT SW) */
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )        /* Connected to JAMMA C22 (P1 BUTTON1) */
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )    /* Connected to JAMMA C18/21 (JOY UP & JOY RIGHT) */
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )  /* Connected to JAMMA C19/20 (JOY DOWN & JOY LEFT) */
+	PORT_START("P1")    // IN0
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN )        // Connected to JAMMA S17 (P2 START)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )        // Connected to JAMMA S14 (SERVICE SW)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )        // Connected to JAMMA C26 (P2 SELECT)
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )        // Connected to JAMMA S16 (COIN2)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )        // Connected to JAMMA S15 (TILT SW)
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON1 )        // Connected to JAMMA C22 (P1 BUTTON1)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )    // Connected to JAMMA C18/21 (JOY UP & JOY RIGHT)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )  // Connected to JAMMA C19/20 (JOY DOWN & JOY LEFT)
+
+	PORT_START("COIN")  // IN1
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
-	PORT_START("JMPRS") /* JP1-2 */
+	PORT_START("JMPRS") // JP1-2
 	PORT_DIPNAME( 0x01, 0x01, DEF_STR( Unknown ) )
 	PORT_DIPSETTING (   0x01, DEF_STR( Off ) )
 	PORT_DIPSETTING (   0x00, DEF_STR( On ) )
@@ -345,49 +323,39 @@
 	PORT_DIPNAME( 0x80, 0x80, DEF_STR( Unknown ) )
 	PORT_DIPSETTING (   0x80, DEF_STR( Off ) )
 	PORT_DIPSETTING (   0x00, DEF_STR( On ) )
-
-	PORT_START("COIN")  /* IN1 - FAKE - Used for coinup */
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_COIN1 )
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN )
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNKNOWN )
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNKNOWN )
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_UNKNOWN )
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNKNOWN )
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN )
 INPUT_PORTS_END
 
 
+/*******************************************
+*          Machine Start & Reset           *
+*******************************************/
+
 void truco_state::machine_start()
 {
 	save_item(NAME(m_trigger));
 }
 
-/*******************************************
-*       Machine Reset & Interrupts         *
-*******************************************/
-
 void truco_state::machine_reset()
 {
 	int a;
 
-	/* Setup the data on the battery backed RAM */
+	// Setup the data on the battery backed RAM
 
-	/* IRQ check */
+	// IRQ check
 	m_battery_ram[0x002] = 0x51;
 	m_battery_ram[0x024] = 0x49;
 	m_battery_ram[0x089] = 0x04;
 	m_battery_ram[0x170] = 0x12;
 	m_battery_ram[0x1a8] = 0xd5;
 
-	/* Mainloop check */
+	// mainloop check
 	m_battery_ram[0x005] = 0x04;
 	m_battery_ram[0x22B] = 0x46;
 	m_battery_ram[0x236] = 0xfb;
 	m_battery_ram[0x2fe] = 0x1D;
 	m_battery_ram[0x359] = 0x5A;
 
-	/* Boot check */
+	// boot check
 	a = ( m_battery_ram[0x000] << 8 ) | m_battery_ram[0x001];
 
 	a += 0x4d2;
@@ -397,9 +365,14 @@
 	m_battery_ram[0x020] = m_battery_ram[0x011];
 }
 
+
+/*******************************************
+*           Interrupts Handling            *
+*******************************************/
+
 INTERRUPT_GEN_MEMBER(truco_state::interrupt)
 {
-	/* coinup */
+	// coinup
 
 	if ( ioport("COIN")->read() & 1 )
 	{
@@ -414,17 +387,17 @@
 
 
 /*******************************************
-*              Machine Driver              *
+*              Machine Config              *
 *******************************************/
 
 void truco_state::truco(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	M6809(config, m_maincpu, CPU_CLOCK);
 	m_maincpu->set_addrmap(AS_PROGRAM, &truco_state::main_map);
 	m_maincpu->set_vblank_int("screen", FUNC(truco_state::interrupt));
 
-	WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_msec(1600));    /* 1.6 seconds */
+	WATCHDOG_TIMER(config, m_watchdog).set_time(attotime::from_msec(1600)); // 1.6 seconds
 
 	pia6821_device &pia(PIA6821(config, "pia0", 0));
 	pia.readpa_handler().set_ioport("P1");
@@ -435,22 +408,22 @@
 	pia.irqa_handler().set(FUNC(truco_state::pia_irqa_w));
 	pia.irqb_handler().set(FUNC(truco_state::pia_irqb_w));
 
-	/* video hardware */
+	// video hardware
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(60);
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500) /* not accurate */);
+	screen.set_vblank_time(ATTOSECONDS_IN_USEC(2500));  // not accurate
 	screen.set_size(256, 192);
 	screen.set_visarea(0, 256-1, 0, 192-1);
 	screen.set_screen_update(FUNC(truco_state::screen_update));
 
 	PALETTE(config, "palette", FUNC(truco_state::truco_palette), 16);
 
-	mc6845_device &crtc(MC6845(config, "crtc", CRTC_CLOCK));    /* Identified as UM6845 */
+	mc6845_device &crtc(MC6845(config, "crtc", CRTC_CLOCK));    // identified as UM6845
 	crtc.set_screen("screen");
 	crtc.set_show_border_area(false);
 	crtc.set_char_width(4);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "speaker").front_center();
 	DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.4);
 	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref", 0));
@@ -470,5 +443,6 @@
 	ROM_LOAD( "truco.u2",   0x0c000, 0x4000, CRC(ff355750) SHA1(1538f20b1919928ffca439e4046a104ddfbc756c) )
 ROM_END
 
-//    YEAR  NAME     PARENT  MACHINE  INPUT    STATE        INIT         ROT   COMPANY           FULLNAME      FLAGS
+
+//    YEAR  NAME     PARENT  MACHINE  INPUT    STATE        INIT        ROT    COMPANY           FULLNAME     FLAGS
 GAME( 198?, truco,   0,      truco,   truco,   truco_state, empty_init, ROT0, "Playtronic SRL", "Truco-Tron", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tulip1.cpp mame-0.224+dfsg.1/src/mame/drivers/tulip1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tulip1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tulip1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -77,7 +77,7 @@
 {
 	map(0x00000, 0x1ffff).ram();
 	map(0x20000, 0xdffff).noprw();
-	map(0xe0000, 0xe0fff).ram().share("vram");;
+	map(0xe0000, 0xe0fff).ram().share("vram");
 	map(0xfe000, 0xfffff).rom().region("bios", 0);
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tutankhm.cpp mame-0.224+dfsg.1/src/mame/drivers/tutankhm.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tutankhm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tutankhm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -92,7 +92,6 @@
 #include "machine/watchdog.h"
 #include "screen.h"
 #include "speaker.h"
-#include "schedule.h"
 
 
 /*************************************
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/tvc.cpp mame-0.224+dfsg.1/src/mame/drivers/tvc.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/tvc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/tvc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -575,19 +575,17 @@
 
 	m_int_flipflop = 0;
 
-	uint8_t *ptr = static_cast<uint8_t *>(m_ram->pointer());
-	memset(&ptr[0], 0, m_ram->size());
-
-	m_bank1->space(0).install_ram(0x8000, 0xbfff, &ptr[0x0000]);
-	m_maincpu->space(AS_PROGRAM).install_ram(0x4000, 0x7fff, &ptr[0x4000]);
+	u8 *r = m_ram->pointer();
+	m_bank1->space(0).install_ram(0x8000, 0xbfff, r);
+	m_maincpu->space(AS_PROGRAM).install_ram(0x4000, 0x7fff, r+0x4000);
 	if (m_ram->size() > 0x8000)
 	{
-		m_bank3->space(0).install_ram(0x4000, 0x7fff, &ptr[0x8000]);
-		m_bank4->space(0).install_ram(0x8000, 0xbfff, &ptr[0xc000]);
+		m_bank3->space(0).install_ram(0x4000, 0x7fff, r+0x8000);
+		m_bank4->space(0).install_ram(0x8000, 0xbfff, r+0xc000);
 	}
 
 	memory_share *vram = memshare("vram");
-	if (vram != nullptr)
+	if (vram)
 		m_vram_base = static_cast<uint8_t *>(vram->ptr());
 	m_vram_bank = 0;
 
@@ -598,6 +596,15 @@
 		m_bank1->space(0).install_rom(0x4000, 0x7fff, cart_rom->base());
 		m_bank4->space(0).install_rom(0x0000, 0x3fff, cart_rom->base());
 	}
+
+	save_item(NAME(m_video_mode));
+	save_item(NAME(m_keyline));
+	save_item(NAME(m_active_slot));
+	save_item(NAME(m_int_flipflop));
+	save_item(NAME(m_col));
+	save_item(NAME(m_vram_bank));
+	save_item(NAME(m_cassette_ff));
+	save_item(NAME(m_centronics_ff));
 }
 
 void tvc64p_state::machine_start()
@@ -798,7 +805,7 @@
 	crtc.out_cur_callback().set(FUNC(tvc_state::int_ff_set));
 
 	/* internal ram */
-	RAM(config, RAM_TAG).set_default_size("64K").set_extra_options("32K");
+	RAM(config, RAM_TAG).set_default_value(0x00).set_default_size("64K").set_extra_options("32K");
 
 	/* sound hardware */
 	SPEAKER(config, "mono").front_center();
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/uknc.cpp mame-0.224+dfsg.1/src/mame/drivers/uknc.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/uknc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/uknc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,9 +2,14 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        UKNC
+UKNC (Educational Computer by Scientific Centre) PDP-11 clone.
+Also known as Elektronika MS-0511.
+RAM = 192K (CPU 1 = 64K, CPU 2 = 32K, Videoram = 96K), ROM = 32K.
+Graphics 640x288 pixels.
 
-        12/05/2009 Skeleton driver.
+2009-05-12 Skeleton driver.
+
+Status: both CPUs start in the weeds.
 
 ****************************************************************************/
 
@@ -26,7 +31,7 @@
 
 private:
 	virtual void machine_reset() override;
-	virtual void video_start() override;
+	virtual void machine_start() override;
 	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	required_device<k1801vm2_device> m_maincpu;
 
@@ -38,15 +43,15 @@
 void uknc_state::uknc_mem(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0x7fff).ram();  // RAM
-	map(0x8000, 0xffff).rom();  // ROM
+	map(0x0000, 0x7fff).ram();
+	map(0x8000, 0xffff).rom().region("maincpu",0);
 }
 
 void uknc_state::uknc_sub_mem(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0x7fff).ram();  // RAM
-	map(0x8000, 0xffff).rom();  // ROM
+	map(0x0000, 0x7fff).ram();
+	map(0x8000, 0xffff).rom().region("subcpu",0);
 }
 
 /* Input ports */
@@ -58,7 +63,7 @@
 {
 }
 
-void uknc_state::video_start()
+void uknc_state::machine_start()
 {
 }
 
@@ -70,11 +75,11 @@
 void uknc_state::uknc(machine_config &config)
 {
 	/* basic machine hardware */
-	K1801VM2(config, m_maincpu, 8000000);
+	K1801VM2(config, m_maincpu, 8'000'000);
 	m_maincpu->set_initial_mode(0x8000);
 	m_maincpu->set_addrmap(AS_PROGRAM, &uknc_state::uknc_mem);
 
-	k1801vm2_device &subcpu(K1801VM2(config, "subcpu", 6000000));
+	k1801vm2_device &subcpu(K1801VM2(config, "subcpu", 6'250'000));
 	subcpu.set_initial_mode(0x8000);
 	subcpu.set_addrmap(AS_PROGRAM, &uknc_state::uknc_sub_mem);
 
@@ -91,13 +96,13 @@
 
 /* ROM definition */
 ROM_START( uknc )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "uknc.rom", 0x8000, 0x8000, CRC(a1536994) SHA1(b3c7c678c41ffa9b37f654fbf20fef7d19e6407b))
+	ROM_REGION( 0x8000, "maincpu", 0 )
+	ROM_LOAD( "uknc.rom", 0x0000, 0x8000, CRC(a1536994) SHA1(b3c7c678c41ffa9b37f654fbf20fef7d19e6407b))
 
-	ROM_REGION( 0x10000, "subcpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x8000, "subcpu", ROMREGION_ERASEFF )
 ROM_END
 
 /* Driver */
 
-/*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  STATE       INIT        COMPANY      FULLNAME  FLAGS */
-COMP( 1987, uknc, 0,      0,      uknc,    uknc,  uknc_state, empty_init, "<unknown>", "UKNC",   MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+/*    YEAR  NAME  PARENT  COMPAT  MACHINE  INPUT  STATE       INIT        COMPANY             FULLNAME  FLAGS */
+COMP( 1987, uknc, 0,      0,      uknc,    uknc,  uknc_state, empty_init, "Elektronika", "UKNC / MS-0511",   MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/unistar.cpp mame-0.224+dfsg.1/src/mame/drivers/unistar.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/unistar.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/unistar.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -30,6 +30,7 @@
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
 		, m_chargen(*this, "chargen")
+		, m_palette(*this, "palette")
 	{ }
 
 	void unistar(machine_config &config);
@@ -44,11 +45,12 @@
 	void unistar_palette(palette_device &palette) const;
 	I8275_DRAW_CHARACTER_MEMBER(draw_character);
 
-	void unistar_io(address_map &map);
-	void unistar_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 
 	required_device<cpu_device> m_maincpu;
 	required_region_ptr<u8> m_chargen;
+	required_device<palette_device> m_palette;
 };
 
 
@@ -62,14 +64,14 @@
 	m_maincpu->space(AS_PROGRAM).write_byte(offset, data);
 }
 
-void unistar_state::unistar_mem(address_map &map)
+void unistar_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x0000, 0x2fff).rom();
 	map(0x8000, 0x97ff).ram();
 }
 
-void unistar_state::unistar_io(address_map &map)
+void unistar_state::io_map(address_map &map)
 {
 	//map.unmap_value_high();
 	map(0x00, 0x0f).rw("dmac", FUNC(am9517a_device::read), FUNC(am9517a_device::write));
@@ -133,10 +135,25 @@
 
 I8275_DRAW_CHARACTER_MEMBER(unistar_state::draw_character)
 {
+	// This code just a guess, so that we can see something
+	const rgb_t *palette = m_palette->palette()->entry_list_raw();
+	u8 gfx = m_chargen[(linecount & 15) | (charcode << 4)];
+
+	if (vsp)
+		gfx = 0;
+
+	if (lten)
+		gfx = 0xff;
+
+	if (rvv)
+		gfx ^= 0xff;
+
+	for(u8 i=0;i<8;i++)
+		bitmap.pix32(y, x + i) = palette[BIT(gfx, 7-i) ? (hlgt ? 2 : 1) : 0];
 }
 
 /* F4 Character Displayer */
-static const gfx_layout unistar_charlayout =
+static const gfx_layout charlayout =
 {
 	8, 16,                  /* 8 x 16 characters */
 	128,                    /* 128 characters */
@@ -150,15 +167,15 @@
 };
 
 static GFXDECODE_START( gfx_unistar )
-	GFXDECODE_ENTRY( "chargen", 0x0000, unistar_charlayout, 0, 1 )
+	GFXDECODE_ENTRY( "chargen", 0x0000, charlayout, 0, 1 )
 GFXDECODE_END
 
 void unistar_state::unistar(machine_config &config)
 {
 	/* basic machine hardware */
 	I8085A(config, m_maincpu, 20_MHz_XTAL / 2);
-	m_maincpu->set_addrmap(AS_PROGRAM, &unistar_state::unistar_mem);
-	m_maincpu->set_addrmap(AS_IO, &unistar_state::unistar_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &unistar_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &unistar_state::io_map);
 
 	INPUT_MERGER_ANY_HIGH(config, "rst65").output_handler().set_inputline(m_maincpu, I8085_RST65_LINE);
 	INPUT_MERGER_ANY_HIGH(config, "rst75").output_handler().set_inputline(m_maincpu, I8085_RST75_LINE);
@@ -205,21 +222,21 @@
 	crtc.irq_wr_callback().set("rst75", FUNC(input_merger_device::in_w<0>));
 
 	GFXDECODE(config, "gfxdecode", "palette", gfx_unistar);
-	PALETTE(config, "palette", FUNC(unistar_state::unistar_palette), 3);
+	PALETTE(config, m_palette, FUNC(unistar_state::unistar_palette), 3);
 }
 
 /* ROM definition */
 ROM_START( unistar )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x3000, "maincpu", 0 )
 	ROM_LOAD( "280010c.u48", 0x0000, 0x1000, CRC(613ef521) SHA1(a77459e91617d2882778ab2dada74fcb5f44e949))
 	ROM_LOAD( "280011c.u49", 0x1000, 0x1000, CRC(6cc5e704) SHA1(fb93645f51d5ad0635cbc8a9174c61f96799313d))
 	ROM_LOAD( "280012c.u50", 0x2000, 0x1000, CRC(0b9ca5a5) SHA1(20bf4aeacda14ff7a3cf988c7c0bff6ec60406c7))
 
-	ROM_REGION( 0x0800, "chargen", ROMREGION_ERASEFF )
+	ROM_REGION( 0x0800, "chargen", 0 )
 	ROM_LOAD( "280014a.u1",  0x0000, 0x0800, CRC(a9e1b5b2) SHA1(6f5b597ee1417f1108ac5957b005a927acb5314a))
 ROM_END
 
 /* Driver */
 
 //    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY                FULLNAME                FLAGS
-COMP( 198?, unistar, 0,      0,      unistar, unistar, unistar_state, empty_init, "Callan Data Systems", "Unistar 200 Terminal", MACHINE_IS_SKELETON )
+COMP( 198?, unistar, 0,      0,      unistar, unistar, unistar_state, empty_init, "Callan Data Systems", "Unistar 200 Terminal", MACHINE_IS_SKELETON | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/unk6502_st2xxx.cpp mame-0.224+dfsg.1/src/mame/drivers/unk6502_st2xxx.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/unk6502_st2xxx.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/unk6502_st2xxx.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,161 @@
+// license:BSD-3-Clause
+// copyright-holders:David Haywood
+
+// unknown 6502 based handhelds, possibly ST2205U architecture
+
+// the BBL 380 - 180 in 1 features similar menus / presentation / games to the 'ORB Gaming Retro Arcade Pocket Handheld Games Console with 153 Games' (eg has Matchstick Man, Gang Tie III etc.)
+// https://www.youtube.com/watch?v=NacY2WHd-CY
+
+// these games were ported to unSP hardware at some point, see generaplus_gpl_unknown.cpp
+
+// BIOS calls are made very frequently to the undumped firmware.
+// The most common call ($6058 in bbl380, $6062 in ragc153 & dphh8630) seems to involve downloading a snippet of code from Flash and executing it from RAM at $0300.
+// A variant of this call ($60d2 in bbl380, $60e3 in ragc153 & dphh8630) is invoked with jsr.
+// For these calls, a 24-bit starting address is specified in $82:$81:$80, and the length in bytes is twice the number specified in $84:$83.
+// ST2205U cannot execute code directly from Flash, but has a built-in DMA-compatible NAND interface on Port F ($05).
+// The XOR used on ragc153 & dphh8630 is likely performed by the DMA controller.
+// $6003 performs a table lookup, depositing a sequence of data at $008e.
+// $6000 generates some duration of delay based on the X register.
+// One other BIOS call ($6975 in bbl380, $69d2 in ragc153) has an unknown purpose.
+
+#include "emu.h"
+
+#include "cpu/m6502/st2205u.h"
+#include "screen.h"
+#include "emupal.h"
+#include "speaker.h"
+
+class bbl380_state : public driver_device
+{
+public:
+	bbl380_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
+		m_maincpu(*this, "maincpu"),
+		m_palette(*this, "palette"),
+		m_screen(*this, "screen")
+	{ }
+
+	void bbl380(machine_config &config);
+	void init_ragc153();
+
+private:
+	void lcdc_command_w(u8 data);
+	u8 lcdc_data_r();
+	void lcdc_data_w(u8 data);
+
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+	void bbl380_map(address_map &map);
+
+	required_device<st2xxx_device> m_maincpu;
+	required_device<palette_device> m_palette;
+	required_device<screen_device> m_screen;
+};
+
+uint32_t bbl380_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	return 0;
+}
+
+void bbl380_state::machine_start()
+{
+}
+
+void bbl380_state::machine_reset()
+{
+}
+
+void bbl380_state::lcdc_command_w(u8 data)
+{
+	logerror("%s: LCDC command $%02X\n", machine().describe_context(), data);
+}
+
+u8 bbl380_state::lcdc_data_r()
+{
+	if (!machine().side_effects_disabled())
+		logerror("%s: LCDC data read\n", machine().describe_context());
+	return 0;
+}
+
+void bbl380_state::lcdc_data_w(u8 data)
+{
+	logerror("%s: LCDC data $%02X\n", machine().describe_context(), data);
+}
+
+void bbl380_state::bbl380_map(address_map &map)
+{
+	map(0x000000, 0x3fffff).rom().region("maincpu", 0); // FIXME: probably not directly mapped (ST2205U has serial Flash interface on port F)
+	map(0x600000, 0x600000).w(FUNC(bbl380_state::lcdc_command_w));
+	map(0x604000, 0x604000).rw(FUNC(bbl380_state::lcdc_data_r), FUNC(bbl380_state::lcdc_data_w));
+}
+
+static INPUT_PORTS_START( bbl380 )
+INPUT_PORTS_END
+
+void bbl380_state::bbl380(machine_config &config)
+{
+	ST2205U(config, m_maincpu, 8000000); // unknown clock; type guessed
+	m_maincpu->set_addrmap(AS_DATA, &bbl380_state::bbl380_map);
+
+	SCREEN(config, m_screen, SCREEN_TYPE_LCD); // TFT color LCD
+	m_screen->set_refresh_hz(60);
+	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0));
+	m_screen->set_size(132, 162);
+	m_screen->set_visarea(0, 132-1, 0, 162-1);
+	m_screen->set_screen_update(FUNC(bbl380_state::screen_update));
+	m_screen->set_palette(m_palette);
+
+	PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x200);
+
+	// LCD controller seems to be either Sitronix ST7735R or (if RDDID bytes match) Ilitek ILI9163C
+	// (unless the SoC's built-in one is used and the routines which program these are leftovers)
+	// Several other LCDC models are identified by ragc153 and dphh8630
+}
+
+ROM_START( bbl380 )
+	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "bbl380_st2205u.bin", 0x000000, 0x004000, NO_DUMP ) // internal OTPROM BIOS
+	ROM_LOAD( "bbl 380 180 in 1.bin", 0x000000, 0x400000, CRC(146c88da) SHA1(7f18526a6d8cf991f86febce3418d35aac9f49ad) BAD_DUMP )
+	// 0x0022XX, 0x0026XX, 0x002AXX, 0x002CXX, 0x002DXX, 0x0031XX, 0x0036XX, etc. should not be FF fill
+ROM_END
+
+
+ROM_START( ragc153 )
+	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "ragc153_st2205u.bin", 0x000000, 0x004000, NO_DUMP ) // internal OTPROM BIOS (addresses are different from bbl380)
+	ROM_LOAD( "25q32ams.bin", 0x000000, 0x400000, CRC(de328d73) SHA1(d17b97e9057be4add68b9f5a26e04c9f0a139673) ) // first 0x100 bytes would read as 0xff at regular speed, but give valid looking consistent data at a slower rate
+ROM_END
+
+ROM_START( dphh8630 )
+	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "ragc153_st2205u.bin", 0x000000, 0x004000, NO_DUMP ) // internal OTPROM BIOS
+	ROM_LOAD( "bg25q16.bin", 0x000000, 0x200000, CRC(277850d5) SHA1(740087842e1e63bf99b4ca9c1b2053361f267269) )
+ROM_END
+
+ROM_START( dgun2953 )
+	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "dgun2953_st2205u.bin", 0x000000, 0x004000, NO_DUMP ) // internal OTPROM BIOS
+	ROM_LOAD( "dg160_25x32v_ef3016.bin", 0x000000, 0x400000, CRC(2e993bac) SHA1(4b310e326a47df1980aeef38aa9a59018d7fe76f) )
+ROM_END
+
+
+
+void bbl380_state::init_ragc153()
+{
+	uint8_t *ROM = memregion("maincpu")->base();
+	int size = memregion("maincpu")->bytes();
+
+	for (int i = 0; i < size; i++)
+	{
+		ROM[i] = ROM[i] ^ 0xe4;
+	}
+}
+
+CONS( 200?, bbl380,        0,       0,      bbl380,   bbl380, bbl380_state, empty_init, "BaoBaoLong", "BBL380 - 180 in 1", MACHINE_IS_SKELETON )
+CONS( 200?, ragc153,       0,       0,      bbl380,   bbl380, bbl380_state, init_ragc153, "Orb", "Retro Arcade Game Controller 153-in-1", MACHINE_IS_SKELETON )
+CONS( 200?, dphh8630,      0,       0,      bbl380,   bbl380, bbl380_state, init_ragc153, "PCP", "PCP 8630 - 230-in-1 - Digital Pocket Hand Held System", MACHINE_IS_SKELETON ) // PCP isn't mentioned on packaging
+CONS( 200?, dgun2953,      0,       0,      bbl380,   bbl380, bbl380_state, init_ragc153, "dreamGEAR", "My Arcade Gamer Mini 160-in-1 (DGUN-2953)", MACHINE_IS_SKELETON )
+
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/unkmandd.cpp mame-0.224+dfsg.1/src/mame/drivers/unkmandd.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/unkmandd.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/unkmandd.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:David Haywood
-
-// unkmandd contains unsp code, but no obvious startup code / vectors, so it's probably booting from another device / bootstrapped
-
-#include "emu.h"
-
-#include "screen.h"
-#include "emupal.h"
-#include "speaker.h"
-
-class unkmandd_state : public driver_device
-{
-public:
-	unkmandd_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_palette(*this, "palette"),
-		m_screen(*this, "screen")
-	{ }
-
-	void unkmandd(machine_config &config);
-
-private:
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
-	required_device<palette_device> m_palette;
-	required_device<screen_device> m_screen;
-};
-
-uint32_t unkmandd_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	return 0;
-}
-
-
-
-
-void unkmandd_state::machine_start()
-{
-}
-
-void unkmandd_state::machine_reset()
-{
-}
-
-static INPUT_PORTS_START( unkmandd )
-INPUT_PORTS_END
-
-void unkmandd_state::unkmandd(machine_config &config)
-{
-	// unknown CPU, unsp based
-
-	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
-	m_screen->set_refresh_hz(60);
-	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(0));
-	m_screen->set_size(64*8, 32*8);
-	m_screen->set_visarea(0*8, 40*8-1, 0*8, 30*8-1);
-	m_screen->set_screen_update(FUNC(unkmandd_state::screen_update));
-	m_screen->set_palette(m_palette);
-
-	PALETTE(config, m_palette).set_format(palette_device::xBGR_555, 0x200);
-}
-
-ROM_START( unkmandd )
-	ROM_REGION( 0x800000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "8718_en25f32.bin", 0x000000, 0x400000, CRC(cc138db4) SHA1(379af3d94ae840f52c06416d6cf32e25923af5ae) )
-ROM_END
-
-CONS( 200?, unkmandd,      0,       0,      unkmandd,   unkmandd, unkmandd_state, empty_init, "M&D", "unknown M&D handheld", MACHINE_IS_SKELETON )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/ut88.cpp mame-0.224+dfsg.1/src/mame/drivers/ut88.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/ut88.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/ut88.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -26,17 +26,12 @@
 #include "includes/ut88.h"
 
 #include "formats/rk_cas.h"
-#include "softlist.h"
 #include "ut88mini.lh"
 #include "sound/volt_reg.h"
 #include "screen.h"
 #include "speaker.h"
 
 
-static GFXDECODE_START( gfx_ut88 )
-	GFXDECODE_ENTRY( "chargen", 0x0000, ut88_charlayout, 0, 1 )
-GFXDECODE_END
-
 /* Address maps */
 void ut88mini_state::mem_map(address_map &map)
 {
@@ -48,12 +43,11 @@
 
 void ut88_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x07ff).bankrw("bank1"); // First bank
-	map(0x0800, 0xdfff).ram();  // RAM
+	map(0x0000, 0xdfff).ram().share("mainram");
 	map(0xe000, 0xe7ff).ram();  // Video RAM (not used)
 	map(0xe800, 0xefff).ram().share("videoram"); // Video RAM
 	map(0xf400, 0xf7ff).ram();  // System RAM
-	map(0xf800, 0xffff).rom();  // System ROM
+	map(0xf800, 0xffff).rom().region("maincpu",0);  // System ROM
 }
 
 void ut88mini_state::io_map(address_map &map)
@@ -186,6 +180,35 @@
 	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYPAD) PORT_NAME("Backspace") PORT_CODE(KEYCODE_BACKSPACE)
 INPUT_PORTS_END
 
+const gfx_layout charlayout =
+{
+	8, 8,               /* 8x8 characters */
+	256,                /* 256 characters */
+	1,                /* 1 bits per pixel */
+	{0},                /* no bitplanes; 1 bit per pixel */
+	{0, 1, 2, 3, 4, 5, 6, 7},
+	{0 * 8, 1 * 8, 2 * 8, 3 * 8, 4 * 8, 5 * 8, 6 * 8, 7 * 8},
+	8*8                 /* size of one char */
+};
+
+static GFXDECODE_START( gfx_ut88 )
+	GFXDECODE_ENTRY( "chargen", 0x0000, charlayout, 0, 1 )
+GFXDECODE_END
+
+u32 ut88_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	for (u8 y = 0; y < 28; y++)
+	{
+		for (u8 x = 0; x < 64; x++)
+		{
+			u8 code = m_vram[x +   y*64] & 0x7f;
+			u8 attr = m_vram[x+1 + y*64] & 0x80;
+			m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code | attr, 0, 0,0, x*8,y*8);
+		}
+	}
+	return 0;
+}
+
 /* Machine driver */
 void ut88_state::ut88(machine_config &config)
 {
@@ -246,27 +269,29 @@
 	m_cassette->add_route(ALL_OUTPUTS, "speaker", 0.05);
 	m_cassette->set_interface("ut88_cass");
 
-	SOFTWARE_LIST(config, "cass_list").set_original("ut88");
+	//SOFTWARE_LIST(config, "cass_list").set_original("ut88");   // no suitable software in the list
 }
 
 /* ROM definition */
 ROM_START( ut88 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "ut88.rom", 0xf800, 0x0800, CRC(f433202e) SHA1(a5808a4f68fb10eb7f17f2a05c3b8479fec0e05d) )
-	ROM_REGION(0x0800, "chargen",0)
-	ROM_LOAD ("ut88.fnt", 0x0000, 0x0800, CRC(874b4d29) SHA1(357efbb295cd9e47fa97d4d03f4f1859a915b5c3) )
+	ROM_REGION( 0x0800, "maincpu", 0 )
+	ROM_LOAD( "ut88.rom", 0x0000, 0x0800, CRC(f433202e) SHA1(a5808a4f68fb10eb7f17f2a05c3b8479fec0e05d) )
+
+	ROM_REGION( 0x0800, "chargen",0 )
+	ROM_LOAD( "ut88.fnt", 0x0000, 0x0800, CRC(874b4d29) SHA1(357efbb295cd9e47fa97d4d03f4f1859a915b5c3) )
 ROM_END
 
 ROM_START( ut88mini )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "ut88mini.rom", 0x0000, 0x0400, CRC(ce9213ee) SHA1(16b71b3051a800386d664dbcc5983b783475d0c6) )
-	ROM_REGION( 0x200, "proms", 0 )
-	ROM_LOAD( "ut88key1.rom", 0x0000, 0x0100, CRC(ecfe42c7) SHA1(d7f10bbb05934150c1a258db1c8b4eb65771af59) )
-	ROM_LOAD( "ut88key2.rom", 0x0100, 0x0100, CRC(96324d23) SHA1(9dca3f639fc29d87df56505b3dde668ef2849da3) )
+	ROM_REGION( 0x0400, "maincpu", 0 )
+	ROM_LOAD( "ut88mini.rom", 0x0000, 0x0400, CRC(ce9213ee) SHA1(16b71b3051a800386d664dbcc5983b783475d0c6) ) // DD10,DD11 (0x200 each)
+
+	ROM_REGION( 0x0200, "proms", 0 )
+	ROM_LOAD( "ut88key1.dd15", 0x0000, 0x0100, CRC(ecfe42c7) SHA1(d7f10bbb05934150c1a258db1c8b4eb65771af59) )
+	ROM_LOAD( "ut88key2.dd16", 0x0100, 0x0100, CRC(96324d23) SHA1(9dca3f639fc29d87df56505b3dde668ef2849da3) )
 ROM_END
 
 /* Driver */
 
 /*    YEAR  NAME      PARENT    COMPAT  MACHINE   INPUT     CLASS           INIT        COMPANY      FULLNAME      FLAGS */
-COMP( 1989, ut88mini, 0,        0,      ut88mini, ut88mini, ut88mini_state, empty_init, "<unknown>", "UT-88 mini", 0)
-COMP( 1989, ut88,     ut88mini, 0,      ut88,     ut88,     ut88_state,     empty_init, "<unknown>", "UT-88",      0)
+COMP( 1989, ut88mini, 0,        0,      ut88mini, ut88mini, ut88mini_state, empty_init, "<unknown>", "UT-88 mini", MACHINE_SUPPORTS_SAVE )
+COMP( 1989, ut88,     ut88mini, 0,      ut88,     ut88,     ut88_state,     empty_init, "<unknown>", "UT-88",      MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/vector06.cpp mame-0.224+dfsg.1/src/mame/drivers/vector06.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/vector06.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/vector06.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -13,13 +13,22 @@
  press F12 after initial boot was load (indicated in screen lower part)
  hold Ctrl ("YC" key) during MicroDOS start to format RAM disk (required by some games)
 
+48k MicroDos one-letter commands:
+B   crash?
+D   dir
+E   erase
+K   ?
+O   some kind of status display
+U   user
+
 TODO:
  - correct CPU speed / latency emulation, each machine cycle takes here 4 clocks,
    i.e. INX B 4+1 will be 2*4=8clocks, SHLD addr is 4+3+3+3+3 so it will be 5*4=20clocks and so on
- - "Card Game" wont work, jump to 0 instead of vblank interrupt RST7, something direct.explicit or banking related ?
- - border emulaton
+ - "Card Game" wont work, jump to 0 instead of vblank interrupt RST7, something banking related ?
+ - border emulation
  - separate base unexpanded Vector06C configuration
  - slotify AY8910 sound boards ?
+ - Rus/Lat key doesn't seem to be right?
 
 ****************************************************************************/
 
@@ -28,121 +37,120 @@
 
 #include "formats/vector06_dsk.h"
 #include "screen.h"
-#include "softlist.h"
 #include "speaker.h"
 
 /* Address maps */
-void vector06_state::vector06_mem(address_map &map)
+void vector06_state::mem_map(address_map &map)
 {
 	map(0x0000, 0xffff).bankrw("bank1");
 	map(0x0000, 0x7fff).bankr("bank2");
 	map(0xa000, 0xdfff).bankrw("bank3");
 }
 
-void vector06_state::vector06_io(address_map &map)
+void vector06_state::io_map(address_map &map)
 {
 	map.global_mask(0xff);
 	map.unmap_value_high();
 
-	map(0x00, 0x03).lrw8(NAME([this] (offs_t offset) -> u8 { return m_ppi8255->read(offset^3); }), NAME([this] (offs_t offset, u8 data) { m_ppi8255->write(offset^3, data); }));
-	map(0x04, 0x07).lrw8(NAME([this] (offs_t offset) -> u8 { return m_ppi8255_2->read(offset^3); }), NAME([this] (offs_t offset, u8 data) { m_ppi8255_2->write(offset^3, data); }));
-	map(0x08, 0x0b).lrw8(NAME([this] (offs_t offset) -> u8 { return m_pit8253->read(offset^3); }), NAME([this] (offs_t offset, u8 data) { m_pit8253->write(offset^3, data); }));
-	map(0x0c, 0x0c).w(FUNC(vector06_state::vector06_color_set));
-	map(0x10, 0x10).w(FUNC(vector06_state::vector06_ramdisk_w));
+	map(0x00, 0x03).lrw8(NAME([this] (offs_t offset) -> u8 { return m_ppi1->read(offset^3); }), NAME([this] (offs_t offset, u8 data) { m_ppi1->write(offset^3, data); }));
+	map(0x04, 0x07).lrw8(NAME([this] (offs_t offset) -> u8 { return m_ppi2->read(offset^3); }), NAME([this] (offs_t offset, u8 data) { m_ppi2->write(offset^3, data); }));
+	map(0x08, 0x0b).lrw8(NAME([this] (offs_t offset) -> u8 { return m_pit->read(offset^3); }), NAME([this] (offs_t offset, u8 data) { m_pit->write(offset^3, data); }));
+	map(0x0c, 0x0c).w(FUNC(vector06_state::color_set));
+	map(0x10, 0x10).w(FUNC(vector06_state::ramdisk_w));
 	map(0x14, 0x15).rw(m_ay, FUNC(ay8910_device::data_r), FUNC(ay8910_device::data_address_w));
 	map(0x18, 0x18).rw(m_fdc, FUNC(kr1818vg93_device::data_r), FUNC(kr1818vg93_device::data_w));
 	map(0x19, 0x19).rw(m_fdc, FUNC(kr1818vg93_device::sector_r), FUNC(kr1818vg93_device::sector_w));
 	map(0x1a, 0x1a).rw(m_fdc, FUNC(kr1818vg93_device::track_r), FUNC(kr1818vg93_device::track_w));
 	map(0x1b, 0x1b).rw(m_fdc, FUNC(kr1818vg93_device::status_r), FUNC(kr1818vg93_device::cmd_w));
-	map(0x1c, 0x1c).w(FUNC(vector06_state::vector06_disc_w));
+	map(0x1c, 0x1c).w(FUNC(vector06_state::disc_w));
 }
 
 /* Input ports */
 static INPUT_PORTS_START( vector06 )
 	PORT_START("LINE.0")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Tab") PORT_CODE(KEYCODE_TAB)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Del") PORT_CODE(KEYCODE_DEL)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("BkSp") PORT_CODE(KEYCODE_BACKSPACE)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Left") PORT_CODE(KEYCODE_LEFT)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Up") PORT_CODE(KEYCODE_UP)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Right") PORT_CODE(KEYCODE_RIGHT)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Down") PORT_CODE(KEYCODE_DOWN)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Tab") PORT_CODE(KEYCODE_TAB)         PORT_CHAR(9)
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Del") PORT_CODE(KEYCODE_DEL)         PORT_CHAR(UCHAR_MAMEKEY(DEL))
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Enter") PORT_CODE(KEYCODE_ENTER)     PORT_CHAR(13)
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("BkSp") PORT_CODE(KEYCODE_BACKSPACE)  PORT_CHAR(8)
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Left") PORT_CODE(KEYCODE_LEFT)       PORT_CHAR(UCHAR_MAMEKEY(LEFT))
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Up") PORT_CODE(KEYCODE_UP)           PORT_CHAR(UCHAR_MAMEKEY(UP))
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Right") PORT_CODE(KEYCODE_RIGHT)     PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Down") PORT_CODE(KEYCODE_DOWN)       PORT_CHAR(UCHAR_MAMEKEY(DOWN))
 	PORT_START("LINE.1")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Home") PORT_CODE(KEYCODE_HOME)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Home") PORT_CODE(KEYCODE_HOME)       PORT_CHAR(UCHAR_MAMEKEY(HOME))
 		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("PgUp") PORT_CODE(KEYCODE_PGUP)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CODE(KEYCODE_ESC)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F1") PORT_CODE(KEYCODE_F1)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F2") PORT_CODE(KEYCODE_F2)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F3") PORT_CODE(KEYCODE_F3)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F4") PORT_CODE(KEYCODE_F4)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F5") PORT_CODE(KEYCODE_F5)
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Esc") PORT_CODE(KEYCODE_ESC)         PORT_CHAR(27)
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F1") PORT_CODE(KEYCODE_F1)           PORT_CHAR(UCHAR_MAMEKEY(F1))
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F2") PORT_CODE(KEYCODE_F2)           PORT_CHAR(UCHAR_MAMEKEY(F2))
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F3") PORT_CODE(KEYCODE_F3)           PORT_CHAR(UCHAR_MAMEKEY(F3))
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F4") PORT_CODE(KEYCODE_F4)           PORT_CHAR(UCHAR_MAMEKEY(F4))
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F5") PORT_CODE(KEYCODE_F5)           PORT_CHAR(UCHAR_MAMEKEY(F5))
 	PORT_START("LINE.2")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("1") PORT_CODE(KEYCODE_1)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("2") PORT_CODE(KEYCODE_2)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("3") PORT_CODE(KEYCODE_3)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("5") PORT_CODE(KEYCODE_5)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("6") PORT_CODE(KEYCODE_6)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("7") PORT_CODE(KEYCODE_7)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0") PORT_CODE(KEYCODE_0)             PORT_CHAR('0')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("1 !") PORT_CODE(KEYCODE_1)           PORT_CHAR('1') PORT_CHAR('!')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("2 \"") PORT_CODE(KEYCODE_2)          PORT_CHAR('2') PORT_CHAR('"')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("3 #") PORT_CODE(KEYCODE_3)           PORT_CHAR('3') PORT_CHAR('#')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("4") PORT_CODE(KEYCODE_4)             PORT_CHAR('4')
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("5 %") PORT_CODE(KEYCODE_5)           PORT_CHAR('5') PORT_CHAR('%')
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("6 &") PORT_CODE(KEYCODE_6)           PORT_CHAR('6') PORT_CHAR('&')
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("7 \'") PORT_CODE(KEYCODE_7)          PORT_CHAR('7') PORT_CHAR('\'')
 	PORT_START("LINE.3")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("8") PORT_CODE(KEYCODE_8)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("9") PORT_CODE(KEYCODE_9)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("'") PORT_CODE(KEYCODE_INSERT)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(";") PORT_CODE(KEYCODE_COLON)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(",") PORT_CODE(KEYCODE_COMMA)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("=") PORT_CODE(KEYCODE_EQUALS)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(".") PORT_CODE(KEYCODE_STOP)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("/") PORT_CODE(KEYCODE_SLASH)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("8 (") PORT_CODE(KEYCODE_8)           PORT_CHAR('8') PORT_CHAR('(')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("9 )") PORT_CODE(KEYCODE_9)           PORT_CHAR('9') PORT_CHAR(')')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(": *") PORT_CODE(KEYCODE_MINUS)       PORT_CHAR(':') PORT_CHAR('*')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("; +") PORT_CODE(KEYCODE_COLON)       PORT_CHAR(';') PORT_CHAR('+')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(", <") PORT_CODE(KEYCODE_COMMA)       PORT_CHAR(',') PORT_CHAR('<')
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("- =") PORT_CODE(KEYCODE_EQUALS)      PORT_CHAR('-') PORT_CHAR('=')
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(". >") PORT_CODE(KEYCODE_STOP)        PORT_CHAR('.') PORT_CHAR('>')
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("/ ?") PORT_CODE(KEYCODE_SLASH)       PORT_CHAR('/') PORT_CHAR('?')
 	PORT_START("LINE.4")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("@") PORT_CODE(KEYCODE_QUOTE)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("@ `") PORT_CODE(KEYCODE_QUOTE)       PORT_CHAR('@') PORT_CHAR('`')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A") PORT_CODE(KEYCODE_A)             PORT_CHAR('A') PORT_CHAR('a')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B") PORT_CODE(KEYCODE_B)             PORT_CHAR('B') PORT_CHAR('b')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C") PORT_CODE(KEYCODE_C)             PORT_CHAR('C') PORT_CHAR('c')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D") PORT_CODE(KEYCODE_D)             PORT_CHAR('D') PORT_CHAR('d')
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E") PORT_CODE(KEYCODE_E)             PORT_CHAR('E') PORT_CHAR('e')
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F") PORT_CODE(KEYCODE_F)             PORT_CHAR('F') PORT_CHAR('f')
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G") PORT_CODE(KEYCODE_G)             PORT_CHAR('G') PORT_CHAR('g')
 	PORT_START("LINE.5")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("H") PORT_CODE(KEYCODE_H)             PORT_CHAR('H') PORT_CHAR('h')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("I") PORT_CODE(KEYCODE_I)             PORT_CHAR('I') PORT_CHAR('i')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("J") PORT_CODE(KEYCODE_J)             PORT_CHAR('J') PORT_CHAR('j')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("K") PORT_CODE(KEYCODE_K)             PORT_CHAR('K') PORT_CHAR('k')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("L") PORT_CODE(KEYCODE_L)             PORT_CHAR('L') PORT_CHAR('l')
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("M") PORT_CODE(KEYCODE_M)             PORT_CHAR('M') PORT_CHAR('m')
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("N") PORT_CODE(KEYCODE_N)             PORT_CHAR('N') PORT_CHAR('n')
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("O") PORT_CODE(KEYCODE_O)             PORT_CHAR('O') PORT_CHAR('o')
 	PORT_START("LINE.6")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("P") PORT_CODE(KEYCODE_P)             PORT_CHAR('P') PORT_CHAR('p')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q") PORT_CODE(KEYCODE_Q)             PORT_CHAR('Q') PORT_CHAR('q')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("R") PORT_CODE(KEYCODE_R)             PORT_CHAR('R') PORT_CHAR('r')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("S") PORT_CODE(KEYCODE_S)             PORT_CHAR('S') PORT_CHAR('s')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("T") PORT_CODE(KEYCODE_T)             PORT_CHAR('T') PORT_CHAR('t')
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("U") PORT_CODE(KEYCODE_U)             PORT_CHAR('U') PORT_CHAR('u')
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("V") PORT_CODE(KEYCODE_V)             PORT_CHAR('V') PORT_CHAR('v')
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W") PORT_CODE(KEYCODE_W)             PORT_CHAR('W') PORT_CHAR('w')
 	PORT_START("LINE.7")
-		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X)
-		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y)
-		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z)
-		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("[") PORT_CODE(KEYCODE_OPENBRACE)
-		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("\\") PORT_CODE(KEYCODE_BACKSLASH)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("]") PORT_CODE(KEYCODE_CLOSEBRACE)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("~") PORT_CODE(KEYCODE_TILDE)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Space") PORT_CODE(KEYCODE_SPACE)
+		PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("X") PORT_CODE(KEYCODE_X)             PORT_CHAR('X') PORT_CHAR('x')
+		PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Y") PORT_CODE(KEYCODE_Y)             PORT_CHAR('Y') PORT_CHAR('y')
+		PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z") PORT_CODE(KEYCODE_Z)             PORT_CHAR('Z') PORT_CHAR('z')
+		PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("[ {") PORT_CODE(KEYCODE_OPENBRACE)   PORT_CHAR('{') PORT_CHAR('[')
+		PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("\\ |") PORT_CODE(KEYCODE_BACKSLASH)  PORT_CHAR('|') PORT_CHAR('\\')
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("] }") PORT_CODE(KEYCODE_CLOSEBRACE)  PORT_CHAR('}') PORT_CHAR(']')
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("^ ~") PORT_CODE(KEYCODE_TILDE)       PORT_CHAR('^') PORT_CHAR('~')
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Space") PORT_CODE(KEYCODE_SPACE)     PORT_CHAR(32)
 	PORT_START("LINE.8")
 		PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_UNUSED)
 		PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_UNUSED)
 		PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_UNUSED)
 		PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_UNUSED)
 		PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_UNUSED)
-		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT)
-		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ctrl") PORT_CODE(KEYCODE_LCONTROL)
-		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Rus/Lat") PORT_CODE(KEYCODE_LALT)
+		PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT)    PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
+		PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ctrl YC") PORT_CODE(KEYCODE_LCONTROL)   //PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_SHIFT_2)
+		PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Rus/Lat") PORT_CODE(KEYCODE_LALT) // This acts as a caps lock in the CP/M screen
 	PORT_START("RESET")
-		PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11)
-		PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Reset 2") PORT_CODE(KEYCODE_F12)
+		PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Reset") PORT_CODE(KEYCODE_F11)      PORT_CHAR(UCHAR_MAMEKEY(F11)) PORT_CHANGED_MEMBER(DEVICE_SELF, vector06_state, f11_button, 0)
+		PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("AP2") PORT_CODE(KEYCODE_F12)        PORT_CHAR(UCHAR_MAMEKEY(F12)) PORT_CHANGED_MEMBER(DEVICE_SELF, vector06_state, f12_button, 0)
 
 INPUT_PORTS_END
 
@@ -162,11 +170,11 @@
 {
 	/* basic machine hardware */
 	I8080(config, m_maincpu, 3000000); // actual speed is wrong due to unemulated latency
-	m_maincpu->set_addrmap(AS_PROGRAM, &vector06_state::vector06_mem);
-	m_maincpu->set_addrmap(AS_IO, &vector06_state::vector06_io);
-	m_maincpu->out_status_func().set(FUNC(vector06_state::vector06_status_callback));
-	m_maincpu->set_vblank_int("screen", FUNC(vector06_state::vector06_interrupt));
-	m_maincpu->set_irq_acknowledge_callback(FUNC(vector06_state::vector06_irq_callback));
+	m_maincpu->set_addrmap(AS_PROGRAM, &vector06_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &vector06_state::io_map);
+	m_maincpu->out_status_func().set(FUNC(vector06_state::status_callback));
+	m_maincpu->set_vblank_int("screen", FUNC(vector06_state::irq0_line_hold));
+	m_maincpu->set_irq_acknowledge_callback(FUNC(vector06_state::irq_callback));
 
 	/* video hardware */
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
@@ -174,7 +182,7 @@
 	m_screen->set_vblank_time(ATTOSECONDS_IN_USEC(2500)); /* not accurate */
 	m_screen->set_size(256+64, 256+64);
 	m_screen->set_visarea(0, 256+64-1, 0, 256+64-1);
-	m_screen->set_screen_update(FUNC(vector06_state::screen_update_vector06));
+	m_screen->set_screen_update(FUNC(vector06_state::screen_update));
 	m_screen->set_palette(m_palette);
 
 	PALETTE(config, m_palette, palette_device::BLACK, 16);
@@ -182,17 +190,17 @@
 	SPEAKER(config, "mono").front_center();
 
 	/* devices */
-	I8255(config, m_ppi8255);
-	m_ppi8255->in_pb_callback().set(FUNC(vector06_state::vector06_8255_portb_r));
-	m_ppi8255->in_pc_callback().set(FUNC(vector06_state::vector06_8255_portc_r));
-	m_ppi8255->out_pa_callback().set(FUNC(vector06_state::vector06_8255_porta_w));
-	m_ppi8255->out_pb_callback().set(FUNC(vector06_state::vector06_8255_portb_w));
-
-	I8255(config, m_ppi8255_2);
-	m_ppi8255_2->in_pb_callback().set(FUNC(vector06_state::vector06_romdisk_portb_r));
-	m_ppi8255_2->out_pa_callback().set(FUNC(vector06_state::vector06_romdisk_porta_w));
-	m_ppi8255_2->out_pb_callback().set(FUNC(vector06_state::vector06_romdisk_portb_w));
-	m_ppi8255_2->out_pc_callback().set(FUNC(vector06_state::vector06_romdisk_portc_w));
+	I8255(config, m_ppi1);
+	m_ppi1->in_pb_callback().set(FUNC(vector06_state::ppi1_portb_r));
+	m_ppi1->in_pc_callback().set(FUNC(vector06_state::ppi1_portc_r));
+	m_ppi1->out_pa_callback().set(FUNC(vector06_state::ppi1_porta_w));
+	m_ppi1->out_pb_callback().set(FUNC(vector06_state::ppi1_portb_w));
+
+	I8255(config, m_ppi2);
+	m_ppi2->in_pb_callback().set(FUNC(vector06_state::ppi2_portb_r));
+	m_ppi2->out_pa_callback().set(FUNC(vector06_state::ppi2_porta_w));
+	m_ppi2->out_pb_callback().set(FUNC(vector06_state::ppi2_portb_w));
+	m_ppi2->out_pc_callback().set(FUNC(vector06_state::ppi2_portc_w));
 
 	CASSETTE(config, m_cassette);
 	m_cassette->set_default_state(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED);
@@ -200,8 +208,8 @@
 
 	KR1818VG93(config, m_fdc, 1_MHz_XTAL);
 
-	FLOPPY_CONNECTOR(config, "wd1793:0", vector06_floppies, "qd", vector06_state::floppy_formats);
-	FLOPPY_CONNECTOR(config, "wd1793:1", vector06_floppies, "qd", vector06_state::floppy_formats);
+	FLOPPY_CONNECTOR(config, "fdc:0", vector06_floppies, "qd", vector06_state::floppy_formats);
+	FLOPPY_CONNECTOR(config, "fdc:1", vector06_floppies, "qd", vector06_state::floppy_formats);
 	SOFTWARE_LIST(config, "flop_list").set_original("vector06_flop");
 
 	/* cartridge */
@@ -213,58 +221,61 @@
 
 	SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 0.50);
 
-	PIT8253(config, m_pit8253, 0);
-	m_pit8253->set_clk<0>(1500000);
-	m_pit8253->set_clk<1>(1500000);
-	m_pit8253->set_clk<2>(1500000);
-	m_pit8253->out_handler<0>().set(FUNC(vector06_state::speaker_w));
-	m_pit8253->out_handler<1>().set(FUNC(vector06_state::speaker_w));
-	m_pit8253->out_handler<2>().set(FUNC(vector06_state::speaker_w));
+	PIT8253(config, m_pit, 0);
+	m_pit->set_clk<0>(1500000);
+	m_pit->set_clk<1>(1500000);
+	m_pit->set_clk<2>(1500000);
+	m_pit->out_handler<0>().set(FUNC(vector06_state::speaker_w));
+	m_pit->out_handler<1>().set(FUNC(vector06_state::speaker_w));
+	m_pit->out_handler<2>().set(FUNC(vector06_state::speaker_w));
 
 	// optional
 	AY8910(config, m_ay, 1773400).add_route(ALL_OUTPUTS, "mono", 0.50);
 }
 
+
 /* ROM definition */
 
 ROM_START( vector06 )
-	ROM_REGION( 0x18000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x8000, "maincpu", ROMREGION_ERASEFF )
 	ROM_SYSTEM_BIOS(0, "unboot32k", "Universal Boot 32K")
-	ROMX_LOAD( "unboot32k.rt", 0x10000, 0x8000, CRC(28c9b5cd) SHA1(8cd7fb658896a7066ae93b10eaafa0f12139ad81), ROM_BIOS(0))
+	ROMX_LOAD( "unboot32k.rt", 0x0000, 0x8000, CRC(28c9b5cd) SHA1(8cd7fb658896a7066ae93b10eaafa0f12139ad81), ROM_BIOS(0))
 	ROM_SYSTEM_BIOS(1, "unboot2k", "Universal Boot 2K")
-	ROMX_LOAD( "unboot2k.rt",  0x10000, 0x0800, CRC(4c80dc31) SHA1(7e5e3acfdbea2e52b0d64c5868821deaec383815), ROM_BIOS(1))
+	ROMX_LOAD( "unboot2k.rt",  0x0000, 0x0800, CRC(4c80dc31) SHA1(7e5e3acfdbea2e52b0d64c5868821deaec383815), ROM_BIOS(1))
 	ROM_SYSTEM_BIOS(2, "coman", "Boot Coman")
-	ROMX_LOAD( "coman.rt",     0x10000, 0x0800, CRC(f8c4a85a) SHA1(47fa8b02f09a1d06aa63a2b90b2597b1d93d976f), ROM_BIOS(2))
+	ROMX_LOAD( "coman.rt",     0x0000, 0x0800, CRC(f8c4a85a) SHA1(47fa8b02f09a1d06aa63a2b90b2597b1d93d976f), ROM_BIOS(2))
 	ROM_SYSTEM_BIOS(3, "bootbyte", "Boot Byte")
-	ROMX_LOAD( "bootbyte.rt",  0x10000, 0x0800, CRC(3b42fd9d) SHA1(a112f4fe519bc3dbee85b09040d4804a17c9eda2), ROM_BIOS(3))
+	ROMX_LOAD( "bootbyte.rt",  0x0000, 0x0800, CRC(3b42fd9d) SHA1(a112f4fe519bc3dbee85b09040d4804a17c9eda2), ROM_BIOS(3))
 	ROM_SYSTEM_BIOS(4, "bootos", "Boot OS")
-	ROMX_LOAD( "bootos.rt",    0x10000, 0x0200, CRC(46bef038) SHA1(6732f4a360cd38112c53c458842d31f5b035cf59), ROM_BIOS(4))
+	ROMX_LOAD( "bootos.rt",    0x0000, 0x0200, CRC(46bef038) SHA1(6732f4a360cd38112c53c458842d31f5b035cf59), ROM_BIOS(4))
 	ROM_SYSTEM_BIOS(5, "boot512", "Boot 512")
-	ROMX_LOAD( "boot512.rt",   0x10000, 0x0200, CRC(a0b1c6b2) SHA1(f6fe15cb0974aed30f9b7aa72133324a66d1ed3f), ROM_BIOS(5))
+	ROMX_LOAD( "boot512.rt",   0x0000, 0x0200, CRC(a0b1c6b2) SHA1(f6fe15cb0974aed30f9b7aa72133324a66d1ed3f), ROM_BIOS(5))
 ROM_END
 
 ROM_START( vec1200 )
-	ROM_REGION( 0x18000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "vec1200.bin", 0x10000, 0x2000, CRC(37349224) SHA1(060fbb2c1a89040c929521cfd58cb6f1431a8b75))
+	ROM_REGION( 0x8000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "vec1200.bin", 0x0000, 0x2000, CRC(37349224) SHA1(060fbb2c1a89040c929521cfd58cb6f1431a8b75))
 
 	ROM_REGION( 0x0200, "palette", 0 )
 	ROM_LOAD( "palette.bin", 0x0000, 0x0200, CRC(74b7376b) SHA1(fb56b60babd7e6ed68e5f4e791ad2800d7ef6729))
 ROM_END
 
 ROM_START( pk6128c )
-	ROM_REGION( 0x18000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "6128.bin", 0x10000, 0x4000, CRC(d4f68433) SHA1(ef5ac75f9240ca8996689c23642d4e47e5e774d8))
+	ROM_REGION( 0x8000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "6128.bin", 0x0000, 0x4000, CRC(d4f68433) SHA1(ef5ac75f9240ca8996689c23642d4e47e5e774d8))
 ROM_END
 
-ROM_START( krista2 )
-	ROM_REGION( 0x18000, "maincpu", ROMREGION_ERASEFF )
-	ROM_LOAD( "krista2.epr", 0x10000, 0x0200, CRC(df5440b0) SHA1(bcbbb3cc10aeb17c1262b45111d20279266b9ba4))
+ROM_START( krista2 ) // appears it wants to load a tape at boot
+	ROM_REGION( 0x8000, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "krista2.epr", 0x0000, 0x0200, CRC(df5440b0) SHA1(bcbbb3cc10aeb17c1262b45111d20279266b9ba4))
+
+	ROM_REGION( 0x0200, "palette", 0 )
 	ROM_LOAD( "krista2.pal", 0x0000, 0x0200, CRC(b243da33) SHA1(9af7873e6f8bf452c8d831833ffb02dce833c095))
 ROM_END
 /* Driver */
 
 /*    YEAR  NAME      PARENT    COMPAT  MACHINE   INPUT     CLASS           INIT        COMPANY      FULLNAME       FLAGS */
-COMP( 1987, vector06, 0,        0,      vector06, vector06, vector06_state, empty_init, "<unknown>", "Vector 06c",  0)
-COMP( 1987, vec1200,  vector06, 0,      vector06, vector06, vector06_state, empty_init, "<unknown>", "Vector 1200", MACHINE_NOT_WORKING)
-COMP( 1987, pk6128c,  vector06, 0,      vector06, vector06, vector06_state, empty_init, "<unknown>", "PK-6128c",    MACHINE_NOT_WORKING)
-COMP( 1987, krista2,  vector06, 0,      vector06, vector06, vector06_state, empty_init, "<unknown>", "Krista-2",    MACHINE_NOT_WORKING)
+COMP( 1987, vector06, 0,        0,      vector06, vector06, vector06_state, empty_init, "<unknown>", "Vector 06c",  MACHINE_SUPPORTS_SAVE )
+COMP( 1987, vec1200,  vector06, 0,      vector06, vector06, vector06_state, empty_init, "<unknown>", "Vector 1200", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1987, pk6128c,  vector06, 0,      vector06, vector06, vector06_state, empty_init, "<unknown>", "PK-6128c",    MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1987, krista2,  vector06, 0,      vector06, vector06, vector06_state, empty_init, "<unknown>", "Krista-2",    MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/vector4.cpp mame-0.224+dfsg.1/src/mame/drivers/vector4.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/vector4.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/vector4.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,9 +2,42 @@
 // copyright-holders:Miodrag Milanovic
 /***************************************************************************
 
-        Vector 4
+Vector Graphic Vector 4. Vector Graphic was a Californian company that
+made a few popular computers until they were crushed flat by the IBM PC.
 
-        08/12/2009 Skeleton driver.
+2009-12-08 Skeleton driver.
+
+According to the net the Vector 4 came out in 1982, but BIOS 0 has a date
+of 1979, so perhaps it's for some other model.
+
+Although each bios set identifies as Vector Graphic, none of them align
+to what the user manual says.
+
+The manual gives a list of ports (listed in the i/o address map). There's
+no schematic.
+
+BIOS 0 only talks to UARTs at 2-7 and nothing else. It uses a terminal
+for all communications.
+
+BIOS 1 and 2 only talk to UARTs at 0-7 and the undocumented port 40.
+They also write a video screen at F000-F7FF, but there's no writes
+to any video controller. Also, the chargen roms (2x 2716) are missing.
+
+The system contains a 8088-2 cpu for limited IBM compatibility, but
+the manual has no mention of it besides its existence.
+
+128K RAM (expandable to 256K).
+
+
+TODO:
+- Need schematic
+- H command goes crazy
+- chargen roms
+- video
+- keyboard
+- probable keyboard mcu
+- floppies
+- many other things
 
 ****************************************************************************/
 
@@ -12,6 +45,8 @@
 #include "cpu/z80/z80.h"
 #include "machine/clock.h"
 #include "machine/i8251.h"
+#include "machine/pit8253.h"
+#include "machine/i8255.h"
 #include "bus/rs232/rs232.h"
 
 
@@ -21,6 +56,8 @@
 	vector4_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
+		, m_rom(*this, "maincpu")
+		, m_ram(*this, "mainram")
 	{ }
 
 	void vector4(machine_config &config);
@@ -29,28 +66,41 @@
 	void vector4_io(address_map &map);
 	void vector4_mem(address_map &map);
 
-	virtual void machine_reset() override;
+	memory_passthrough_handler *m_rom_shadow_tap;
 	required_device<cpu_device> m_maincpu;
+	required_region_ptr<u8> m_rom;
+	required_shared_ptr<u8> m_ram;
+	void machine_reset() override;
 };
 
 
 void vector4_state::vector4_mem(address_map &map)
 {
 	map.unmap_value_high();
-	map(0x0000, 0xdfff).ram();
-	map(0xe000, 0xefff).rom();
-	map(0xf000, 0xf7ff).ram();
-	map(0xf800, 0xf8ff).rom();
-	map(0xfc00, 0xffff).ram();
+	map(0x0000, 0xffff).ram().share("mainram");
+	map(0xe000, 0xefff).rom().region("maincpu", 0);
+	//map(0xf000, 0xf7ff).ram().share("videoram");  // bios 1,2
+	map(0xf800, 0xf8ff).rom().region("maincpu", 0x1000);
 }
 
 void vector4_state::vector4_io(address_map &map)
 {
 	map.unmap_value_high();
 	map.global_mask(0xff);
-	map(0x02, 0x03).rw("uart1", FUNC(i8251_device::read), FUNC(i8251_device::write));
-	map(0x04, 0x05).rw("uart2", FUNC(i8251_device::read), FUNC(i8251_device::write));
-	map(0x06, 0x07).rw("uart3", FUNC(i8251_device::read), FUNC(i8251_device::write));
+	map(0x00, 0x01).rw("uart0", FUNC(i8251_device::read), FUNC(i8251_device::write)); // keyboard
+	map(0x02, 0x03).rw("uart1", FUNC(i8251_device::read), FUNC(i8251_device::write)); // terminal, bios 0 only
+	// map(0x02, 0x03)  rom enable and colour - bios 1,2 (bit 0 switches use of 0000-0FFF; LOW = ROM; HIGH = RAM)
+	map(0x04, 0x05).rw("uart2", FUNC(i8251_device::read), FUNC(i8251_device::write)); // modem
+	map(0x06, 0x07).rw("uart3", FUNC(i8251_device::read), FUNC(i8251_device::write)); // serial printer
+	map(0x08, 0x0b).rw("ppi", FUNC(i8255_device::read), FUNC(i8255_device::write));  // parallel/centronics printers
+	// map(0x0c, 0x0c)  select Z80
+	// map(0x0d, 0x0d)  select 8088
+	// map(0x0e, 0x0f)  video controller (uses 32.640 xtal)
+	map(0x10, 0x13).rw("pit", FUNC(pit8253_device::read), FUNC(pit8253_device::write));  // generate 2 baud rates and an interrupt source
+	// map(0x16, 0x17)  RAM address map
+	// map(0x18, 0x19)  Tone Generator
+	// map(0x1c, 0x1f)  Colour Map
+	// map(0x40, 0x40)  undocumented
 }
 
 /* Input ports */
@@ -60,26 +110,45 @@
 
 void vector4_state::machine_reset()
 {
-	m_maincpu->set_state_int(Z80_PC, 0xe000);
+	address_space &program = m_maincpu->space(AS_PROGRAM);
+	program.install_rom(0x0000, 0x0fff, m_rom);   // do it here for F3
+	m_rom_shadow_tap = program.install_read_tap(0xe000, 0xefff, "rom_shadow_r",[this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+		{
+			// delete this tap
+			m_rom_shadow_tap->remove();
+
+			// reinstall ram over the rom shadow
+			m_maincpu->space(AS_PROGRAM).install_ram(0x0000, 0x0fff, m_ram);
+		}
+
+		// return the original data
+		return data;
+	});
 }
 
 
 void vector4_state::vector4(machine_config &config)
 {
 	/* basic machine hardware */
-	Z80(config, m_maincpu, XTAL(4'000'000));
+	Z80(config, m_maincpu, 5'100'000);   // manual says 5.1MHz (8088 uses this frequency too)
 	m_maincpu->set_addrmap(AS_PROGRAM, &vector4_state::vector4_mem);
 	m_maincpu->set_addrmap(AS_IO, &vector4_state::vector4_io);
 
 	/* video hardware */
 	clock_device &uart_clock(CLOCK(config, "uart_clock", 153600));
 	uart_clock.signal_handler().set("uart1", FUNC(i8251_device::write_txc));
+	uart_clock.signal_handler().append("uart0", FUNC(i8251_device::write_txc));
+	uart_clock.signal_handler().append("uart0", FUNC(i8251_device::write_rxc));
 	uart_clock.signal_handler().append("uart1", FUNC(i8251_device::write_rxc));
 	uart_clock.signal_handler().append("uart2", FUNC(i8251_device::write_txc));
 	uart_clock.signal_handler().append("uart2", FUNC(i8251_device::write_rxc));
 	uart_clock.signal_handler().append("uart3", FUNC(i8251_device::write_txc));
 	uart_clock.signal_handler().append("uart3", FUNC(i8251_device::write_rxc));
 
+	I8251(config, "uart0", 0);
+
 	i8251_device &uart1(I8251(config, "uart1", 0));
 	uart1.txd_handler().set("rs232a", FUNC(rs232_port_device::write_txd));
 	uart1.dtr_handler().set("rs232a", FUNC(rs232_port_device::write_dtr));
@@ -109,25 +178,33 @@
 	rs232c.rxd_handler().set("uart3", FUNC(i8251_device::write_rxd));
 	rs232c.dsr_handler().set("uart3", FUNC(i8251_device::write_dsr));
 	rs232c.cts_handler().set("uart3", FUNC(i8251_device::write_cts));
+
+	I8255A(config, "ppi");
+	PIT8253(config, "pit", 0);
 }
 
 /* ROM definition */
 ROM_START( vector4 )
-	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASEFF )
+	ROM_REGION( 0x1100, "maincpu", ROMREGION_ERASEFF )
+	ROM_LOAD( "mfdc.bin", 0x1000, 0x0100, CRC(d82a40d6) SHA1(cd1ef5fb0312cd1640e0853d2442d7d858bc3e3b))
 
-	ROM_SYSTEM_BIOS( 0, "v4c", "ver 4.0c" )
-	ROMX_LOAD( "vg40cl_ihl.bin", 0xe000, 0x0400, CRC(dcaf79e6) SHA1(63619ddb12ff51e5862902fb1b33a6630f555ad7), ROM_BIOS(0))
-	ROMX_LOAD( "vg40ch_ihl.bin", 0xe400, 0x0400, CRC(3ff97d70) SHA1(b401e49aa97ac106c2fd5ee72d89e683ebe34e34), ROM_BIOS(0))
-
-	ROM_SYSTEM_BIOS( 1, "v43", "ver 4.3" )
-	ROMX_LOAD( "vg-em-43.bin",   0xe000, 0x1000, CRC(29a0fcee) SHA1(ca44de527f525b72f78b1c084c39aa6ce21731b5), ROM_BIOS(1))
-
-	ROM_SYSTEM_BIOS( 2, "v5", "ver 5.0" )
-	ROMX_LOAD( "vg-zcb50.bin",   0xe000, 0x1000, CRC(22d692ce) SHA1(cbb21b0acc98983bf5febd59ff67615d71596e36), ROM_BIOS(2))
-	ROM_LOAD( "mfdc.bin", 0xf800, 0x0100, CRC(d82a40d6) SHA1(cd1ef5fb0312cd1640e0853d2442d7d858bc3e3b))
+	ROM_SYSTEM_BIOS( 0, "v4c", "ver 4.0c" ) // VECTOR GRAPHIC MONITOR VERSION 4.0C
+	ROMX_LOAD( "vg40cl_ihl.bin", 0x0000, 0x0400, CRC(dcaf79e6) SHA1(63619ddb12ff51e5862902fb1b33a6630f555ad7), ROM_BIOS(0))
+	ROMX_LOAD( "vg40ch_ihl.bin", 0x0400, 0x0400, CRC(3ff97d70) SHA1(b401e49aa97ac106c2fd5ee72d89e683ebe34e34), ROM_BIOS(0))
+
+	ROM_SYSTEM_BIOS( 1, "v43", "ver 4.3" ) // VECTOR GRAPHIC MONITOR VERSION 4.3
+	ROMX_LOAD( "vg-em-43.bin",   0x0000, 0x1000, CRC(29a0fcee) SHA1(ca44de527f525b72f78b1c084c39aa6ce21731b5), ROM_BIOS(1))
+
+	ROM_SYSTEM_BIOS( 2, "v5", "ver 5.0" ) // VECTOR GRAPHIC EXECUTIVE 5.0
+	ROMX_LOAD( "vg-zcb50.bin",   0x0000, 0x1000, CRC(22d692ce) SHA1(cbb21b0acc98983bf5febd59ff67615d71596e36), ROM_BIOS(2))
+
+	// bios 1,2 need these (pair of 2716) - rom names not known
+	ROM_REGION( 0x1000, "chargen", ROMREGION_ERASEFF )
+	ROM_LOAD( "chargen1.bin", 0x0000, 0x0800, NO_DUMP )
+	ROM_LOAD( "chargen2.bin", 0x0800, 0x0800, NO_DUMP )
 ROM_END
 
 /* Driver */
 
 //    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY            FULLNAME    FLAGS
-COMP( 19??, vector4, 0,      0,      vector4, vector4, vector4_state, empty_init, "Vector Graphics", "Vector 4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+COMP( 1982, vector4, 0,      0,      vector4, vector4, vector4_state, empty_init, "Vector Graphic", "Vector 4", MACHINE_NOT_WORKING | MACHINE_NO_SOUND | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/vegas.cpp mame-0.224+dfsg.1/src/mame/drivers/vegas.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/vegas.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/vegas.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -324,11 +324,13 @@
 		m_uart1(*this, "uart1"),
 		m_uart2(*this, "uart2"),
 		m_io_analog(*this, "AN.%u", 0U),
+		m_io_8way(*this, "8WAY_P%u", 1U),
 		m_io_49way_x(*this, "49WAYX_P%u", 1U),
 		m_io_49way_y(*this, "49WAYY_P%u", 1U),
 		m_io_keypad(*this, "KEYPAD"),
 		m_io_gearshift(*this, "GEAR"),
 		m_io_system(*this, "SYSTEM"),
+		m_io_dips(*this, "DIPS"),
 		m_wheel_driver(*this, "wheel"),
 		m_lamps(*this, "lamp%u", 0U),
 		m_a2d_shift(0)
@@ -369,6 +371,8 @@
 	void init_sf2049se();
 
 	DECLARE_CUSTOM_INPUT_MEMBER(i40_r);
+	DECLARE_CUSTOM_INPUT_MEMBER(gauntleg_p12_r);
+	DECLARE_CUSTOM_INPUT_MEMBER(gauntleg_p34_r);
 	DECLARE_CUSTOM_INPUT_MEMBER(keypad_r);
 	DECLARE_CUSTOM_INPUT_MEMBER(gearshift_r);
 
@@ -383,15 +387,22 @@
 	required_device<midway_ioasic_device> m_ioasic;
 	optional_device<ns16550_device> m_uart1;
 	optional_device<ns16550_device> m_uart2;
+
 	optional_ioport_array<8> m_io_analog;
+	optional_ioport_array<4> m_io_8way;
+
 	optional_ioport_array<4> m_io_49way_x;
 	optional_ioport_array<4> m_io_49way_y;
+
 	optional_ioport m_io_keypad;
 	optional_ioport m_io_gearshift;
 	optional_ioport m_io_system;
+	optional_ioport m_io_dips;
 	output_finder<1> m_wheel_driver;
 	output_finder<16> m_lamps;
 
+	static const uint8_t translate49[7];
+
 	int m_a2d_shift;
 	int8_t m_wheel_force;
 	int m_wheel_offset;
@@ -463,7 +474,7 @@
 void vegas_state::machine_start()
 {
 	/* set the fastest DRC options, but strict verification */
-	m_maincpu->mips3drc_set_options(MIPS3DRC_FASTEST_OPTIONS + MIPS3DRC_STRICT_VERIFY + MIPS3DRC_FLUSH_PC);
+	m_maincpu->mips3drc_set_options(MIPS3DRC_FASTEST_OPTIONS + MIPS3DRC_STRICT_VERIFY);
 
 	m_wheel_driver.resolve();
 	m_lamps.resolve();
@@ -735,26 +746,39 @@
 			break;
 		case 1:
 			// Gun 1 H High
+			// P1 magic = ~0x10;
+			// P1 fight = ~0x20;
+			result = ~m_io_8way[0]->read() & 0x30;
+			//result = 0x70;
 			break;
 		case 2:
 			// Gun 1 V Low
 			break;
 		case 3:
 			// Gun 1 V High
+			// P1 run   = 0x08
+			// P2 magic = 0x10
+			// P2 fight = 0x20
+			// P2 run   = 0x40
+			result = (((m_io_8way[0]->read() & 0x40) >> 3) | ((m_io_8way[1]->read() & 0x7000) >> 8));
+			//result = ~0x7c;
 			break;
 		case 4:
 			// Gun 2 H Low
 			break;
 		case 5:
 			// Gun 2 H High
+			result = ~m_io_8way[2]->read() & 0x30;
 			break;
 		case 6:
 			// Gun 2 V Low
 			break;
 		case 7:
 			// Gun 2 V High
+			result = (((m_io_8way[2]->read() & 0x40) >> 3) | ((m_io_8way[3]->read() & 0x7000) >> 8));
 			break;
 		}
+		logerror("%s: sio_r: offset: %08x index: %d result: %02X\n", machine().describe_context(), offset, index, result);
 		break;
 	}
 	}
@@ -1037,6 +1061,11 @@
 }
 
 /*************************************
+* 49 Way translation matrix
+*************************************/
+const uint8_t vegas_state::translate49[7] = { 0x8, 0xc, 0xe, 0xf, 0x3, 0x1, 0x0 };
+
+/*************************************
 * Optical 49 Way Joystick I40 Board
 *************************************/
 void vegas_state::i40_w(uint32_t data)
@@ -1048,48 +1077,86 @@
 
 CUSTOM_INPUT_MEMBER(vegas_state::i40_r)
 {
-	static const uint8_t translate49[7] = { 0x8, 0xc, 0xe, 0xf, 0x3, 0x1, 0x0 };
-	int index = m_i40_data & 0xf;
-	uint8_t data = 0;
-	switch (index) {
-	case 0:
-		data = translate49[m_io_49way_x[0]->read() >> 4];
-		break;
-	case 1:
-		data = translate49[m_io_49way_y[0]->read() >> 4];
-		break;
-	case 2:
-		data = translate49[m_io_49way_x[1]->read() >> 4];
-		break;
-	case 3:
-		data = translate49[m_io_49way_y[1]->read() >> 4];
-		break;
-	case 4:
-		data = translate49[m_io_49way_x[2]->read() >> 4];
-		break;
-	case 5:
-		data = translate49[m_io_49way_y[2]->read() >> 4];
-		break;
-	case 6:
-		data = translate49[m_io_49way_x[3]->read() >> 4];
-		break;
-	case 7:
-		data = translate49[m_io_49way_y[3]->read() >> 4];
-		break;
-	case 10:
-	case 11:
-	case 12:
-		// I40 Detection
-		data = ~index & 0xf;
-		break;
-	default:
-		//logerror("%s: i40_r: select: %x index: %d data: %x\n", machine().describe_context(), m_i40_data, index, data);
-		break;
+	if (m_io_dips->read() & 0x100) {
+		// 8 way joysticks
+		return m_io_8way[3]->read();
+	}
+	else {
+		// 49 way joysticks via i40 adapter board
+		int index = m_i40_data & 0xf;
+		uint8_t data = 0;
+		switch (index) {
+		case 0:
+			data = translate49[m_io_49way_x[0]->read() >> 4];
+			break;
+		case 1:
+			data = translate49[m_io_49way_y[0]->read() >> 4];
+			break;
+		case 2:
+			data = translate49[m_io_49way_x[1]->read() >> 4];
+			break;
+		case 3:
+			data = translate49[m_io_49way_y[1]->read() >> 4];
+			break;
+		case 4:
+			data = translate49[m_io_49way_x[2]->read() >> 4];
+			break;
+		case 5:
+			data = translate49[m_io_49way_y[2]->read() >> 4];
+			break;
+		case 6:
+			data = translate49[m_io_49way_x[3]->read() >> 4];
+			break;
+		case 7:
+			data = translate49[m_io_49way_y[3]->read() >> 4];
+			break;
+		case 10:
+		case 11:
+		case 12:
+			// I40 Detection
+			data = ~index & 0xf;
+			break;
+		default:
+			//logerror("%s: i40_r: select: %x index: %d data: %x\n", machine().describe_context(), m_i40_data, index, data);
+			break;
+		}
+		//if (m_i40_data & 0x1000)
+		//  printf("%s: i40_r: select: %x index: %d data: %x\n", machine().describe_context().c_str(), m_i40_data, index, data);
+		//m_i40_data &= ~0x1000;
+		return data;
+	}
+}
+
+/*************************************
+* Gauntlet Player 1 & 2 control read
+*************************************/
+CUSTOM_INPUT_MEMBER(vegas_state::gauntleg_p12_r)
+{
+	if (m_io_dips->read() & 0x2000) {
+		// 8 way joysticks
+		return m_io_8way[1]->read() | m_io_8way[0]->read();
+	}
+	else {
+		// 49 way joysticks
+		return  (translate49[m_io_49way_x[1]->read() >> 4] << 12) | (translate49[m_io_49way_y[1]->read() >> 4] << 8) |
+				(translate49[m_io_49way_x[0]->read() >> 4] << 4) |  (translate49[m_io_49way_y[0]->read() >> 4] << 0);
+	}
+}
+
+/*************************************
+* Gauntlet Player 3 & 4 control read
+*************************************/
+CUSTOM_INPUT_MEMBER(vegas_state::gauntleg_p34_r)
+{
+	if (m_io_dips->read() & 0x2000) {
+		// 8 way joysticks
+		return m_io_8way[3]->read() | m_io_8way[2]->read();
+	}
+	else {
+		// 49 way joysticks
+		return  (translate49[m_io_49way_x[3]->read() >> 4] << 12) | (translate49[m_io_49way_y[3]->read() >> 4] << 8) |
+				(translate49[m_io_49way_x[2]->read() >> 4] << 4) |  (translate49[m_io_49way_y[2]->read() >> 4] << 0);
 	}
-	//if (m_i40_data & 0x1000)
-	//  printf("%s: i40_r: select: %x index: %d data: %x\n", machine().describe_context().c_str(), m_i40_data, index, data);
-	//m_i40_data &= ~0x1000;
-	return data;
 }
 
 /*************************************
@@ -1229,8 +1296,8 @@
 	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_SERVICE1 )
 	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN3 )
 	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_COIN4 )
-	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START3 )
+	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_START4 )
 	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_VOLUME_DOWN )
 	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_VOLUME_UP )
 	PORT_BIT( 0x6000, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -1244,7 +1311,7 @@
 	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
 	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
 	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1)
 	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP    ) PORT_PLAYER(2) PORT_8WAY
 	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN  ) PORT_PLAYER(2) PORT_8WAY
 	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT  ) PORT_PLAYER(2) PORT_8WAY
@@ -1252,10 +1319,25 @@
 	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2)
 	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
 	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2)
-	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2)
 
 	PORT_START("IN2")
-	PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP    ) PORT_PLAYER(3) PORT_8WAY
+	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN  ) PORT_PLAYER(3) PORT_8WAY
+	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT  ) PORT_PLAYER(3) PORT_8WAY
+	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3) PORT_8WAY
+	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
+	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
+	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(3)
+	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP    ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN  ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT  ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
+	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
+	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
+	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(4)
 
 	PORT_START("AN.0") PORT_BIT( 0xff, 0x80, IPT_CUSTOM )
 	PORT_START("AN.1") PORT_BIT( 0xff, 0x80, IPT_CUSTOM )
@@ -1266,32 +1348,17 @@
 	PORT_START("AN.6") PORT_BIT( 0xff, 0x80, IPT_CUSTOM )
 	PORT_START("AN.7") PORT_BIT( 0xff, 0x80, IPT_CUSTOM )
 
-INPUT_PORTS_END
+	PORT_START("8WAY_P1")
+	PORT_BIT( 0x00ff, IP_ACTIVE_HIGH, IPT_UNUSED )
 
-static INPUT_PORTS_START( vegas_4p )
-	PORT_INCLUDE(vegas_common)
+	PORT_START("8WAY_P2")
+	PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )
 
-	PORT_MODIFY("SYSTEM")
-	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_START3 )
-	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_START4 )
+	PORT_START("8WAY_P3")
+	PORT_BIT( 0x00ff, IP_ACTIVE_HIGH, IPT_UNUSED )
 
-	PORT_MODIFY("IN2")
-	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_UP    ) PORT_PLAYER(3) PORT_8WAY
-	PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN  ) PORT_PLAYER(3) PORT_8WAY
-	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT  ) PORT_PLAYER(3) PORT_8WAY
-	PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3) PORT_8WAY
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3)
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3)
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3)
-	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x0100, IP_ACTIVE_LOW, IPT_JOYSTICK_UP    ) PORT_PLAYER(4) PORT_8WAY
-	PORT_BIT( 0x0200, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN  ) PORT_PLAYER(4) PORT_8WAY
-	PORT_BIT( 0x0400, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT  ) PORT_PLAYER(4) PORT_8WAY
-	PORT_BIT( 0x0800, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4) PORT_8WAY
-	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4)
-	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4)
-	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4)
-	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
+	PORT_START("8WAY_P4")
+	PORT_BIT( 0xff00, IP_ACTIVE_HIGH, IPT_UNUSED )
 
 INPUT_PORTS_END
 
@@ -1302,6 +1369,9 @@
 	PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_START1 ) PORT_NAME("Start Button")
 	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_UNUSED )
 
+	PORT_MODIFY("IN2")
+	PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_UNUSED  )
+
 INPUT_PORTS_END
 
 /*************************************
@@ -1311,7 +1381,7 @@
  *************************************/
 
 static INPUT_PORTS_START( gauntleg )
-	PORT_INCLUDE(vegas_4p)
+	PORT_INCLUDE(vegas_common)
 
 	PORT_MODIFY("DIPS")
 	PORT_DIPNAME( 0x0001, 0x0001, "PM Dump" )
@@ -1343,20 +1413,74 @@
 	PORT_DIPSETTING(      0x0000, "VGA Res 640x480" ) //VGA res not supported for gauntleg
 
 	PORT_MODIFY("IN1")
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Fight")
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 Magic")
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 Turbo")
-	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Fight")
-	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Magic")
-	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Fight")
+	PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_CUSTOM  ) PORT_CUSTOM_MEMBER(vegas_state, gauntleg_p12_r)
 
 	PORT_MODIFY("IN2")
-	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) PORT_NAME("P3 Fight")
-	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) PORT_NAME("P3 Magic")
-	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) PORT_NAME("P3 Turbo")
-	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(4) PORT_NAME("P4 Fight")
-	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4) PORT_NAME("P4 Magic")
-	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) PORT_NAME("P4 Turbo")
+	PORT_BIT( 0xffff, IP_ACTIVE_LOW, IPT_CUSTOM  ) PORT_CUSTOM_MEMBER(vegas_state, gauntleg_p34_r)
+
+	PORT_MODIFY("8WAY_P1")
+	PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP    ) PORT_PLAYER(1) PORT_8WAY
+	PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN  ) PORT_PLAYER(1) PORT_8WAY
+	PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT  ) PORT_PLAYER(1) PORT_8WAY
+	PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_8WAY
+	PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Magic")
+	PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 Fight")
+	PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 Turbo")
+	PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_MODIFY("8WAY_P2")
+	PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP    ) PORT_PLAYER(2) PORT_8WAY
+	PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN  ) PORT_PLAYER(2) PORT_8WAY
+	PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT  ) PORT_PLAYER(2) PORT_8WAY
+	PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_8WAY
+	PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Magic")
+	PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Fight")
+	PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Turbo")
+	PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_MODIFY("8WAY_P3")
+	PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP    ) PORT_PLAYER(3) PORT_8WAY
+	PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN  ) PORT_PLAYER(3) PORT_8WAY
+	PORT_BIT( 0x0004, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT  ) PORT_PLAYER(3) PORT_8WAY
+	PORT_BIT( 0x0008, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(3) PORT_8WAY
+	PORT_BIT( 0x0010, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(3) PORT_NAME("P3 Magic")
+	PORT_BIT( 0x0020, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(3) PORT_NAME("P3 Fight")
+	PORT_BIT( 0x0040, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(3) PORT_NAME("P3 Turbo")
+	PORT_BIT( 0x0080, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_MODIFY("8WAY_P4")
+	PORT_BIT( 0x0100, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP    ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x0200, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN  ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x0400, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT  ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x0800, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x1000, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(4) PORT_NAME("P4 Magic")
+	PORT_BIT( 0x2000, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(4) PORT_NAME("P4 Fight")
+	PORT_BIT( 0x4000, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(4) PORT_NAME("P4 Turbo")
+	PORT_BIT( 0x8000, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("49WAYX_P1")
+	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
+
+	PORT_START("49WAYY_P1")
+	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1) PORT_REVERSE
+
+	PORT_START("49WAYX_P2")
+	PORT_BIT(0xff, 0x38, IPT_AD_STICK_X) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
+
+	PORT_START("49WAYY_P2")
+	PORT_BIT(0xff, 0x38, IPT_AD_STICK_Y) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2) PORT_REVERSE
+
+	PORT_START("49WAYX_P3")
+	PORT_BIT(0xff, 0x38, IPT_AD_STICK_X) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
+
+	PORT_START("49WAYY_P3")
+	PORT_BIT(0xff, 0x38, IPT_AD_STICK_Y) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3) PORT_REVERSE
+
+	PORT_START("49WAYX_P4")
+	PORT_BIT(0xff, 0x38, IPT_AD_STICK_X) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4)
+
+	PORT_START("49WAYY_P4")
+	PORT_BIT(0xff, 0x38, IPT_AD_STICK_Y) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4) PORT_REVERSE
 
 INPUT_PORTS_END
 
@@ -1379,9 +1503,11 @@
 	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 Jab")
 	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 Strong")
 	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(1) PORT_NAME("P1 Short")
+	PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 Jab")
 	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 Strong")
 	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_PLAYER(2) PORT_NAME("P2 Short")
+	PORT_BIT( 0x8000, IP_ACTIVE_LOW, IPT_UNUSED )
 
 	PORT_MODIFY("IN2")
 	PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_BUTTON6 ) PORT_PLAYER(1) PORT_NAME("P1 Roundhouse")
@@ -1470,7 +1596,7 @@
 
 
 static INPUT_PORTS_START( nbashowt )
-	PORT_INCLUDE(vegas_4p)
+	PORT_INCLUDE(vegas_common)
 
 	PORT_MODIFY("DIPS")
 	PORT_DIPNAME( 0x0001, 0x0000, "Coinage Source" )
@@ -1514,17 +1640,14 @@
 	PORT_DIPSETTING(      0x0000, DEF_STR( On ) )
 
 	PORT_MODIFY("IN1")
-	PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED) // P1 Joystick
 	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("P1 A")
 	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("P1 B")
 	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("P1 Turbo")
-	PORT_BIT( 0x0f00, IP_ACTIVE_LOW, IPT_UNUSED) // P2 Joystick
 	PORT_BIT( 0x1000, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("P2 A")
 	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("P2 B")
 	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("P2 Turbo")
 
 	PORT_MODIFY("IN2")
-	PORT_BIT( 0x000f, IP_ACTIVE_LOW, IPT_UNUSED) // P3 Joystick
 	PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(3) PORT_NAME("P3 A")
 	PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(3) PORT_NAME("P3 B")
 	PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(3) PORT_NAME("P3 Turbo")
@@ -1533,29 +1656,35 @@
 	PORT_BIT( 0x2000, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(4) PORT_NAME("P4 B")
 	PORT_BIT( 0x4000, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(4) PORT_NAME("P4 Turbo")
 
+	PORT_MODIFY("8WAY_P4")
+	PORT_BIT( 0x1, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP    ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x2, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN  ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x4, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT  ) PORT_PLAYER(4) PORT_8WAY
+	PORT_BIT( 0x8, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(4) PORT_8WAY
+
 	PORT_START("49WAYX_P1")
-	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
+	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
 
 	PORT_START("49WAYY_P1")
-	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
+	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(1)
 
 	PORT_START("49WAYX_P2")
-	PORT_BIT(0xff, 0x38, IPT_AD_STICK_X) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
+	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
 
 	PORT_START("49WAYY_P2")
-	PORT_BIT(0xff, 0x38, IPT_AD_STICK_Y) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
+	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(2)
 
 	PORT_START("49WAYX_P3")
-	PORT_BIT(0xff, 0x38, IPT_AD_STICK_X) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
+	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
 
 	PORT_START("49WAYY_P3")
-	PORT_BIT(0xff, 0x38, IPT_AD_STICK_Y) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
+	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(3)
 
 	PORT_START("49WAYX_P4")
-	PORT_BIT(0xff, 0x38, IPT_AD_STICK_X) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4)
+	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4)
 
 	PORT_START("49WAYY_P4")
-	PORT_BIT(0xff, 0x38, IPT_AD_STICK_Y) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4)
+	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00, 0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_PLAYER(4)
 
 INPUT_PORTS_END
 
@@ -2111,6 +2240,9 @@
 
 	ROM_REGION16_LE( 0x10000, "dcs", 0 ) // Vegas SIO boot ROM
 	ROM_LOAD16_BYTE( "vegassio.bin", 0x000000, 0x8000, CRC(d1470e23) SHA1(f6e8405cfa604528c0224401bc374a6df9caccef) )
+
+	ROM_REGION( 0x2000, "serial_security_pic", 0 ) // security PIC (provides game ID code and serial number)
+	ROM_LOAD( "322_gauntlet.u37", 0x0000, 0x2000, CRC(0fe0bd0a) SHA1(bfd54572e2923d26392e89961d044357f551872a) )
 ROM_END
 
 
@@ -2136,6 +2268,9 @@
 
 	ROM_REGION16_LE( 0x10000, "dcs", 0 ) // Vegas SIO boot ROM
 	ROM_LOAD16_BYTE( "vegassio.bin", 0x000000, 0x8000, CRC(d1470e23) SHA1(f6e8405cfa604528c0224401bc374a6df9caccef) )
+
+	ROM_REGION( 0x2000, "serial_security_pic", 0 ) // security PIC (provides game ID code and serial number)
+	ROM_LOAD( "322_gauntlet.u37", 0x0000, 0x2000, CRC(0fe0bd0a) SHA1(bfd54572e2923d26392e89961d044357f551872a) )
 ROM_END
 
 
@@ -2151,6 +2286,9 @@
 
 	ROM_REGION16_LE( 0x10000, "dcs", 0 ) // Vegas SIO boot ROM
 	ROM_LOAD16_BYTE( "vegassio.bin", 0x000000, 0x8000, CRC(d1470e23) SHA1(f6e8405cfa604528c0224401bc374a6df9caccef) )
+
+	ROM_REGION( 0x2000, "serial_security_pic", 0 ) // security PIC (provides game ID code and serial number)
+	ROM_LOAD( "346_gauntlet-dl.u37", 0x0000, 0x2000, CRC(09420dd3) SHA1(9ffc62049b3e329b525469849944896163b1582b) )
 ROM_END
 
 
@@ -2166,6 +2304,9 @@
 
 	ROM_REGION16_LE( 0x10000, "dcs", 0 ) // Vegas SIO boot ROM
 	ROM_LOAD16_BYTE( "vegassio.bin", 0x000000, 0x8000, CRC(d1470e23) SHA1(f6e8405cfa604528c0224401bc374a6df9caccef) )
+
+	ROM_REGION( 0x2000, "serial_security_pic", 0 ) // security PIC (provides game ID code and serial number)
+	ROM_LOAD( "346_gauntlet-dl.u37", 0x0000, 0x2000, CRC(09420dd3) SHA1(9ffc62049b3e329b525469849944896163b1582b) )
 ROM_END
 
 
@@ -2512,9 +2653,9 @@
 GAME( 1999, roadburn1,  roadburn,  roadburn, roadburn, vegas_state, init_roadburn, ROT0, "Atari Games",  "Road Burners (ver 1.0)", MACHINE_SUPPORTS_SAVE )
 
 // Vegas/Durango + Vegas SIO + Voodoo banshee
-GAME( 1998, nbashowt,   0,         nbashowt, nbashowt, vegas_state, init_nbashowt, ROT0, "Midway Games", "NBA Showtime: NBA on NBC (ver 2.0)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1999, nbanfl,     0,         nbanfl,   nbashowt, vegas_state, init_nbanfl,   ROT0, "Midway Games", "NBA Showtime / NFL Blitz 2000 (ver 2.1)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 2000, nbagold ,   0,         nbagold,  nbashowt, vegas_state, init_nbagold,  ROT0, "Midway Games", "NBA Showtime Gold / NFL Blitz 2000 (ver 3.0) (SportsStation)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1998, nbashowt,   0,         nbashowt, nbashowt, vegas_state, init_nbashowt, ROT0, "Midway Games", "NBA Showtime: NBA on NBC (ver 2.0)", MACHINE_SUPPORTS_SAVE )
+GAME( 1999, nbanfl,     0,         nbanfl,   nbashowt, vegas_state, init_nbanfl,   ROT0, "Midway Games", "NBA Showtime / NFL Blitz 2000 (ver 2.1)", MACHINE_SUPPORTS_SAVE )
+GAME( 2000, nbagold ,   0,         nbagold,  nbashowt, vegas_state, init_nbagold,  ROT0, "Midway Games", "NBA Showtime Gold / NFL Blitz 2000 (ver 3.0) (SportsStation)", MACHINE_SUPPORTS_SAVE )
 
 // Durango + Denver SIO + Voodoo 3
 GAMEL( 1999, sf2049,     0,        sf2049,   sf2049,   vegas_state, init_sf2049,   ROT0, "Atari Games",  "San Francisco Rush 2049", MACHINE_SUPPORTS_SAVE, layout_sf2049 )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/vgmplay.cpp mame-0.224+dfsg.1/src/mame/drivers/vgmplay.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/vgmplay.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/vgmplay.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -61,11 +61,13 @@
 
 #include <zlib.h>
 
+#include <algorithm>
+#include <iterator>
 #include <list>
 #include <memory>
+#include <queue>
 #include <utility>
 #include <vector>
-#include <queue>
 
 #define AS_IO16             1
 
@@ -3935,12 +3937,12 @@
 	m_vsu_vue[1]->add_route(1, m_mixer, 1.0, AUTO_ALLOC_INPUT, 1);
 
 	SAA1099(config, m_saa1099[0], 0);
-	m_saa1099[0]->add_route(ALL_OUTPUTS, m_mixer, 0.5, AUTO_ALLOC_INPUT, 0);
-	m_saa1099[0]->add_route(ALL_OUTPUTS, m_mixer, 0.5, AUTO_ALLOC_INPUT, 1);
+	m_saa1099[0]->add_route(0, m_mixer, 1.0, AUTO_ALLOC_INPUT, 0);
+	m_saa1099[0]->add_route(1, m_mixer, 1.0, AUTO_ALLOC_INPUT, 1);
 
 	SAA1099(config, m_saa1099[1], 0);
-	m_saa1099[1]->add_route(ALL_OUTPUTS, m_mixer, 0.5, AUTO_ALLOC_INPUT, 0);
-	m_saa1099[1]->add_route(ALL_OUTPUTS, m_mixer, 0.5, AUTO_ALLOC_INPUT, 1);
+	m_saa1099[1]->add_route(0, m_mixer, 1.0, AUTO_ALLOC_INPUT, 0);
+	m_saa1099[1]->add_route(1, m_mixer, 1.0, AUTO_ALLOC_INPUT, 1);
 
 	ES5503(config, m_es5503[0], 0);
 	m_es5503[0]->set_channels(2);
@@ -3956,12 +3958,14 @@
 
 	ES5505(config, m_es5505[0], 0);
 	// TODO m_es5505[0]->set_addrmap(0, &vgmplay_state::es5505_map<0>);
+	// TODO m_es5505[0]->set_addrmap(1, &vgmplay_state::es5505_map<0>);
 	m_es5505[0]->set_channels(1);
 	m_es5505[0]->add_route(0, m_mixer, 0.5, AUTO_ALLOC_INPUT, 0);
 	m_es5505[0]->add_route(1, m_mixer, 0.5, AUTO_ALLOC_INPUT, 1);
 
 	ES5505(config, m_es5505[1], 0);
 	// TODO m_es5505[1]->set_addrmap(0, &vgmplay_state::es5505_map<1>);
+	// TODO m_es5505[1]->set_addrmap(1, &vgmplay_state::es5505_map<1>);
 	m_es5505[1]->set_channels(1);
 	m_es5505[1]->add_route(0, m_mixer, 0.5, AUTO_ALLOC_INPUT, 0);
 	m_es5505[1]->add_route(1, m_mixer, 0.5, AUTO_ALLOC_INPUT, 1);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/vigilant.cpp mame-0.224+dfsg.1/src/mame/drivers/vigilant.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/vigilant.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/vigilant.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -584,7 +584,7 @@
 	ym1.add_route(3, "lspeaker",  0.50);
 	ym1.add_route(3, "rspeaker", 0.50);
 
-	ym2203_device &ym2(YM2203(config, "ym2", 18432000/6));;
+	ym2203_device &ym2(YM2203(config, "ym2", 18432000/6));
 	ym2.add_route(0, "lspeaker",  0.35);
 	ym2.add_route(0, "rspeaker", 0.35);
 	ym2.add_route(1, "lspeaker",  0.35);
@@ -954,7 +954,13 @@
 	ROM_LOAD( "tbp24s10_7a.ic52", 0x0000, 0x0100, CRC(c324835e) SHA1(cf6ffe38523badfda211d341410e93e647de87a9) ) // tbp24s10, 82s129-equivalent - video timing
 ROM_END
 
-ROM_START( vigilantbl ) /* Bootleg */
+/* Bootleg
+   "JB 306" silkscreen part# on bottom board, "VT-20" sticker on top board.
+   The various Nanao custom chips are implemented with standard ttl, makes the bottom board considerably larger.
+   The 3 additional proms are part of the KNA6074601 custom chip implementation.
+   The differing pal has some unused pins repurposed as part of the KNA6032701 custom chip implementation.
+   The board-board connectors are 2x 50-pin vs the 2x 60-pin used on original game. */
+ROM_START( vigilantbl )
 	ROM_REGION( 0x30000, "maincpu", 0 ) /* 64k for code + 128k for bankswitching */
 	ROM_LOAD( "g07_c03.bin",  0x00000, 0x08000, CRC(9dcca081) SHA1(6d086b70e6bf1fbafa746ef5c82334645f199be9) )
 	ROM_LOAD( "j07_c04.bin",  0x10000, 0x10000, CRC(e0159105) SHA1(da6d74ec075863c67c0ce21b07a54029d138f688) )
@@ -985,10 +991,16 @@
 	ROM_REGION( 0x10000, "m72", 0 ) /* samples */
 	ROM_LOAD( "d04_c01.bin",  0x00000, 0x10000, CRC(9b85101d) SHA1(6b8a0f33b9b66bb968f7b61e49d19a6afad8db95) )
 
-	ROM_REGION( 0x0600, "plds", 0 ) /* All are pal16l8 - not convinced these exist in this form on bootleg */
-	ROM_LOAD( "vg_b-8r.ic90", 0x0000, 0x0117, CRC(df368a7a) SHA1(597d85d1f90b7ee0188f2d849792ee02ff2ea48b) )
-	ROM_LOAD( "vg_b-4m.ic38", 0x0200, 0x0117, CRC(dbca4204) SHA1(d8e190f2dc4d6285f22be331d01ed402520d2017) )
-	ROM_LOAD( "vg_b-1b.ic1",  0x0400, 0x0117, CRC(922e5167) SHA1(08efdfdfeb35f3f73b6fd3d5c0c2a386dea5f617) )
+	ROM_REGION( 0x0600, "plds", 0 ) /* 3x pal16l8 */
+	ROM_LOAD( "p09_16l8.bin", 0x0000, 0x0117, CRC(df368a7a) SHA1(597d85d1f90b7ee0188f2d849792ee02ff2ea48b) )  // == official set ic90
+	ROM_LOAD( "m05_16l8.bin", 0x0200, 0x0117, CRC(dbca4204) SHA1(d8e190f2dc4d6285f22be331d01ed402520d2017) )  // == official set ic38
+	ROM_LOAD( "b01_16l8.bin", 0x0400, 0x0104, CRC(1beae498) SHA1(031c2f589eb715dc3909614bab8d89994f69be80) )
+
+	ROM_REGION( 0x0400, "proms", 0 ) /* 4x 82s129 */
+	ROM_LOAD( "a07_129.bin",  0x0000, 0x0100, CRC(c324835e) SHA1(cf6ffe38523badfda211d341410e93e647de87a9) ) // == official set ic52
+	ROM_LOAD( "t10_129a.bin", 0x0100, 0x0100, CRC(1513df33) SHA1(7ab5066e3b5eb47fc4d5498b168929a9ade9bb7c) )
+	ROM_LOAD( "u10_129b.bin", 0x0200, 0x0100, CRC(06661d00) SHA1(aa12a31751cad355ad545d92485432d6be12b45e) )
+	ROM_LOAD( "v10_129c.bin", 0x0300, 0x0100, CRC(3f186bc8) SHA1(e5270fbc16c5844294cf20b42e57f4edaabbe629) )
 ROM_END
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/votrtnt.cpp mame-0.224+dfsg.1/src/mame/drivers/votrtnt.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/votrtnt.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/votrtnt.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -55,7 +55,7 @@
 private:
 	virtual void machine_reset() override;
 
-	void _6802_mem(address_map &map);
+	void mem_map(address_map &map);
 
 	required_device<m6802_cpu_device> m_maincpu;
 	required_device<votrax_sc01_device> m_votrax;
@@ -81,13 +81,13 @@
       x   1   1   x     *   *   *   *     *   *   *   *     *   *   *   *    R  ROM (2332 4kx8 Mask ROM, inside potted brick)
 */
 
-void votrtnt_state::_6802_mem(address_map &map)
+void votrtnt_state::mem_map(address_map &map)
 {
 	map.unmap_value_high();
 	map(0x0000, 0x03ff).mirror(0x9c00).ram(); /* RAM, 2114*2 (0x400 bytes) mirrored 4x */
 	map(0x2000, 0x2001).mirror(0x9ffe).rw("acia", FUNC(acia6850_device::read), FUNC(acia6850_device::write));
 	map(0x4000, 0x4000).mirror(0x9fff).w(m_votrax, FUNC(votrax_sc01_device::write));
-	map(0x6000, 0x6fff).mirror(0x9000).rom(); /* ROM in potted block */
+	map(0x6000, 0x6fff).mirror(0x9000).rom().region("maincpu",0); /* ROM in potted block */
 }
 
 
@@ -141,7 +141,7 @@
 	/* basic machine hardware */
 	M6802(config, m_maincpu, 2.4576_MHz_XTAL);  // 2.4576MHz XTAL, verified; divided by 4 inside the MC6802
 	m_maincpu->set_ram_enable(false);
-	m_maincpu->set_addrmap(AS_PROGRAM, &votrtnt_state::_6802_mem);
+	m_maincpu->set_addrmap(AS_PROGRAM, &votrtnt_state::mem_map);
 
 	/* video hardware */
 	//config.set_default_layout(layout_votrtnt);
@@ -173,8 +173,8 @@
 ******************************************************************************/
 
 ROM_START(votrtnt)
-	ROM_REGION(0x10000, "maincpu", 0)
-	ROM_LOAD("cn49752n.bin", 0x6000, 0x1000, CRC(a44e1af3) SHA1(af83b9e84f44c126b24ee754a22e34ca992a8d3d)) /* 2332 mask rom inside potted brick */
+	ROM_REGION(0x1000, "maincpu", 0)
+	ROM_LOAD("cn49752n.bin", 0x0000, 0x1000, CRC(a44e1af3) SHA1(af83b9e84f44c126b24ee754a22e34ca992a8d3d)) /* 2332 mask rom inside potted brick */
 ROM_END
 
 
@@ -183,4 +183,4 @@
 ******************************************************************************/
 
 //    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY   FULLNAME        FLAGS
-COMP( 1980, votrtnt, 0,      0,      votrtnt, votrtnt, votrtnt_state, empty_init, "Votrax", "Type 'N Talk", 0 )
+COMP( 1980, votrtnt, 0,      0,      votrtnt, votrtnt, votrtnt_state, empty_init, "Votrax", "Type 'N Talk", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/vp101.cpp mame-0.224+dfsg.1/src/mame/drivers/vp101.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/vp101.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/vp101.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -106,6 +106,9 @@
 #include "imagedev/harddriv.h"
 #include "screen.h"
 
+#define VERBOSE (0)
+#include "logmacro.h"
+
 class vp10x_state : public driver_device
 {
 public:
@@ -113,8 +116,7 @@
 		: driver_device(mconfig, type, tag),
 			m_maincpu(*this, "maincpu"),
 			m_mainram(*this, "mainram"),
-			m_ata(*this, "ata"),
-			m_in0(*this, "IN0")
+			m_ata(*this, "ata")
 	{ }
 
 	void vp50(machine_config &config);
@@ -126,7 +128,14 @@
 
 	uint32_t tty_ready_r();
 	void tty_w(uint32_t data);
-	uint32_t test_r() { return 0xffffffff; }
+	uint32_t test_r();
+	uint32_t sound_r(offs_t offset);
+	void sound_w(offs_t offset, uint32_t data);
+	void fb_base_w(uint32_t data);
+	uint32_t video_r(offs_t offset);
+	void video_w(offs_t offset, uint32_t data);
+	uint32_t video2_r(offs_t offset);
+	void video2_w(offs_t offset, uint32_t data);
 
 	uint32_t pic_r();
 	void pic_w(uint32_t data);
@@ -152,7 +161,6 @@
 	required_device<mips3_device> m_maincpu;
 	required_shared_ptr<uint32_t> m_mainram;
 	required_device<ata_interface_device> m_ata;
-	required_ioport m_in0;
 
 	// driver_device overrides
 	virtual void video_start() override;
@@ -161,6 +169,9 @@
 	int m_dmarq_state;
 	uint32_t m_dma_ptr;
 	uint32_t m_spi_select;
+	uint32_t m_unk_sound_toggle;
+	uint32_t m_sound_cmd;
+	uint32_t m_fb_base;
 };
 
 void vp10x_state::machine_reset()
@@ -171,12 +182,19 @@
 
 void vp10x_state::machine_start()
 {
-	m_maincpu->mips3drc_set_options(MIPS3DRC_FASTEST_OPTIONS);
+	m_maincpu->mips3drc_set_options(MIPS3DRC_FASTEST_OPTIONS | MIPS3DRC_DISABLE_INTRABLOCK);
 //  m_maincpu->add_fastram(0x00000000, 0x03ffffff, false, m_mainram);
 }
 
+uint32_t vp10x_state::test_r()
+{
+	LOG("%s: test_r\n", machine().describe_context());
+	return 0xffffffff;
+}
+
 void vp10x_state::dmaaddr_w(uint32_t data)
 {
+	LOG("%s: dmaaddr_w: %08x\n", machine().describe_context(), data);
 	m_dma_ptr = (data & 0x07ffffff);
 }
 
@@ -228,7 +246,7 @@
 
 void vp10x_state::pic_w(uint32_t data)
 {
-	//printf("%02x to pic_cmd\n", data&0xff);
+	LOG("%s: pic_w: %08x\n", machine().describe_context(), data);
 	if ((data & 0xff) == 0)
 	{
 		return;
@@ -239,12 +257,13 @@
 
 uint32_t vp10x_state::spi_r()
 {
+	LOG("%s: spi_r\n", machine().describe_context());
 	return 0xffffffff;
 }
 
 void vp10x_state::spi_w(uint32_t data)
 {
-//  printf("%d to SPI select\n", data);
+	LOG("%s: spi_w: %08x\n", machine().describe_context(), data);
 	m_spi_select = data;
 }
 
@@ -257,7 +276,7 @@
 	for (int y = 0; y < 240; y++)
 	{
 		uint32_t *line = &bitmap.pix32(y);
-		const uint32_t *video_ram = (const uint32_t *) &m_mainram[(0x7400000/4) + (y * (0x1000/4)) + 4];
+		const uint32_t *video_ram = (const uint32_t *) &m_mainram[(m_fb_base/4) + (y * (0x1000/4)) + 4];
 
 		for (int x = 0; x < 320; x++)
 		{
@@ -266,6 +285,17 @@
 			*line++ = word;
 		}
 	}
+
+	if (machine().input().code_pressed_once(KEYCODE_R))
+		m_maincpu->set_input_line(MIPS3_IRQ0, ASSERT_LINE);
+	if (machine().input().code_pressed_once(KEYCODE_T))
+		m_maincpu->set_input_line(MIPS3_IRQ1, ASSERT_LINE);
+	if (machine().input().code_pressed_once(KEYCODE_Y))
+		m_maincpu->set_input_line(MIPS3_IRQ2, ASSERT_LINE);
+	if (machine().input().code_pressed_once(KEYCODE_U))
+		m_maincpu->set_input_line(MIPS3_IRQ3, ASSERT_LINE);
+	if (machine().input().code_pressed_once(KEYCODE_I))
+		m_maincpu->set_input_line(MIPS3_IRQ4, ASSERT_LINE);
 	return 0;
 }
 
@@ -294,6 +324,7 @@
 
 uint32_t vp10x_state::tty_ready_r()
 {
+	LOG("%s: tty_ready_r\n", machine().describe_context());
 	return 0x60;    // must return &0x20 for output at tty_w to continue
 }
 
@@ -301,23 +332,124 @@
 {
 // uncomment to see startup messages - it says "RAM OK" and "EPI RSS Ver 4.5.1" followed by "<RSS active>" and then lots of dots
 // Special Forces also says "<inited tv_cap> = 00000032"
-//  printf("%c", data);
+	if (data >= 0x20 || data == 0x09)
+		printf("%c", data);
+	else if (data == 0x0d)
+		printf("\n");
+}
+
+uint32_t vp10x_state::video_r(offs_t offset)
+{
+	uint32_t data = 0;
+	if (offset == (0x10 >> 2))
+	{
+		data = 0xffffffff;
+	}
+	LOG("%s: video_r %08x: %08x\n", machine().describe_context(), 0x1a000000 + (offset << 2), data);
+	return data;
+}
+
+void vp10x_state::video_w(offs_t offset, uint32_t data)
+{
+	LOG("%s: video_w %08x = %08x\n", machine().describe_context(), 0x1a000000 + (offset << 2), data);
+}
+
+uint32_t vp10x_state::video2_r(offs_t offset)
+{
+	uint32_t data = machine().rand();
+	//LOG("%s: video2_r %08x: %08x\n", machine().describe_context(), 0x1a800000 + (offset << 2), data);
+	return data;
+}
+
+void vp10x_state::video2_w(offs_t offset, uint32_t data)
+{
+	//LOG("%s: video2_w %08x = %08x\n", machine().describe_context(), 0x1a800000 + (offset << 2), data);
+}
+
+void vp10x_state::fb_base_w(uint32_t data)
+{
+	m_fb_base = data & 0x07ffffff;
+}
+
+uint32_t vp10x_state::sound_r(offs_t offset)
+{
+	switch (offset)
+	{
+	case 0:
+		LOG("%s: sound_r: hardware flags(?): 11000000 = %08x\n", machine().describe_context(), 1 << 4);
+		return (1 << 4); // Flag that sound hardware is initialized
+	case 3:
+	{
+		uint32_t cmd_return = 0;
+		bool known = true;
+		switch (m_sound_cmd)
+		{
+		case 0xa6:
+			cmd_return = 0x0000000e;
+			break;
+		case 0xfc:
+			cmd_return = 0x00004352; // Some sort of info request? Looks like ASCII, 'CR' - codec is from Crystal Semi?
+			break;
+		default:
+			known = false;
+			break;
+		}
+		if (known)
+		{
+			LOG("%s: sound_r: sound command return value(?): 11000004 = %08x for cmd %02x\n", machine().describe_context(), cmd_return, m_sound_cmd);
+		}
+		else
+		{
+			LOG("%s: sound_r: sound command return value(?): 11000004 = %08x for unknown cmd %02x\n", machine().describe_context(), cmd_return, m_sound_cmd);
+		}
+		return cmd_return;
+	}
+	case 4:
+		m_unk_sound_toggle ^= 1;
+		LOG("%s: sound_r: unknown: 11000010 = %08x\n", machine().describe_context(), m_unk_sound_toggle);
+		return m_unk_sound_toggle; // Unknown
+	default:
+		LOG("%s: sound_r: %08x\n", machine().describe_context(), 0x11000000 | (offset << 2));
+		return 0;
+	}
+}
+
+void vp10x_state::sound_w(offs_t offset, uint32_t data)
+{
+	switch (offset)
+	{
+	case 1:
+		LOG("%s: sound_w: command(?): 11000004 = %08x\n", machine().describe_context(), data);
+		m_sound_cmd = data;
+		return;
+	default:
+		LOG("%s: sound_w: %08x = %08x\n", machine().describe_context(), 0x11000000 | (offset << 2), data);
+		return;
+	}
 }
 
 void vp10x_state::main_map(address_map &map)
 {
 	map(0x00000000, 0x07ffffff).ram().share("mainram");
+	map(0x11000000, 0x11000013).rw(FUNC(vp10x_state::sound_r), FUNC(vp10x_state::sound_w));
 	map(0x14000000, 0x14000003).r(FUNC(vp10x_state::test_r));
+	map(0x18000010, 0x18000013).w(FUNC(vp10x_state::fb_base_w));
+	map(0x1a000000, 0x1a000013).rw(FUNC(vp10x_state::video_r), FUNC(vp10x_state::video_w));
+	map(0x1a800000, 0x1a800003).rw(FUNC(vp10x_state::video2_r), FUNC(vp10x_state::video2_w));
 	map(0x1c000000, 0x1c000003).w(FUNC(vp10x_state::tty_w));        // RSS OS code uses this one
 	map(0x1c000014, 0x1c000017).r(FUNC(vp10x_state::tty_ready_r));
 	map(0x1c400000, 0x1c400003).w(FUNC(vp10x_state::tty_w));        // boot ROM code uses this one
 	map(0x1c400014, 0x1c400017).r(FUNC(vp10x_state::tty_ready_r));
-	map(0x1ca0000c, 0x1ca0000f).portr("IN0");
-	map(0x1ca00010, 0x1ca00013).r(FUNC(vp10x_state::test_r));        // bits here cause various test mode stuff
+	map(0x1ca00000, 0x1ca00003).portr("GUNX");
+	map(0x1ca00004, 0x1ca00007).portr("GUNY");
+	map(0x1ca00008, 0x1ca0000b).portr("GUNBUTTONS");
+	map(0x1ca0000c, 0x1ca0000f).portr("BUTTONS");
+	map(0x1ca00010, 0x1ca00013).portr("DIPS");
 	map(0x1cf00000, 0x1cf00003).noprw().nopr();
 	map(0x1d000030, 0x1d000033).w(FUNC(vp10x_state::dmaaddr_w));    // ATA DMA destination address
 	map(0x1d000040, 0x1d00005f).rw(m_ata, FUNC(ata_interface_device::cs0_r), FUNC(ata_interface_device::cs0_w)).umask32(0x0000ffff);
 	map(0x1d000060, 0x1d00007f).rw(m_ata, FUNC(ata_interface_device::cs1_r), FUNC(ata_interface_device::cs1_w)).umask32(0x0000ffff);
+
 	map(0x1f200000, 0x1f200003).rw(FUNC(vp10x_state::pic_r), FUNC(vp10x_state::pic_w));
 	map(0x1f807000, 0x1f807fff).ram().share("nvram");
 	map(0x1fc00000, 0x1fffffff).rom().region("maincpu", 0);
@@ -340,14 +472,70 @@
 	map(0xff1ff818, 0xff1ff81b).rw(FUNC(vp10x_state::spi_r), FUNC(vp10x_state::spi_w));
 }
 
-static INPUT_PORTS_START( vp101 )
-	PORT_START("IN0")
+static INPUT_PORTS_START( jnero )
+	PORT_START("GUNX")
+	PORT_BIT( 0x1ff, 0x000, IPT_LIGHTGUN_X ) PORT_MINMAX(0x000, 0x1ff) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
+
+	PORT_START("GUNY")
+	PORT_BIT( 0xff, 0x00, IPT_LIGHTGUN_Y ) PORT_MINMAX(0x00, 0xff) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
+
+	PORT_START("GUNBUTTONS")
+	PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1) PORT_NAME("Trigger")
+	PORT_BIT( 0x00000002, IP_ACTIVE_LOW,  IPT_BUTTON2 ) PORT_PLAYER(1) PORT_NAME("Sense")
+	PORT_BIT( 0x00000004, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(1) PORT_NAME("Pump")
+	PORT_BIT( 0x00000010, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2) PORT_NAME("Trigger")
+	PORT_BIT( 0x00000020, IP_ACTIVE_LOW,  IPT_BUTTON2 ) PORT_PLAYER(2) PORT_NAME("Sense")
+	PORT_BIT( 0x00000040, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_PLAYER(2) PORT_NAME("Pump")
+	PORT_BIT( 0xffffff88, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("BUTTONS")
 	PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_COIN1 )
 	PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_START1 )
 	PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_COIN2 )
-	PORT_BIT( 0x00000008,  IP_ACTIVE_LOW, IPT_START2 )
+	PORT_BIT( 0x00000008, IP_ACTIVE_LOW, IPT_START2 )
+	PORT_BIT (0x00000040, IP_ACTIVE_LOW, IPT_SERVICE1 )
+	PORT_BIT (0x00000080, IP_ACTIVE_LOW, IPT_SERVICE2 )
+	PORT_BIT (0x00001000, IP_ACTIVE_LOW, IPT_VOLUME_DOWN )
+	PORT_BIT (0x00002000, IP_ACTIVE_LOW, IPT_VOLUME_UP )
+	PORT_BIT( 0xffffcf30, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("DIPS")
+	PORT_DIPNAME( 0x00000010, 0x00000010, DEF_STR( Test ) )
+	PORT_DIPSETTING(          0x00000010, DEF_STR( Off ) )
+	PORT_DIPSETTING(          0x00000000, DEF_STR( On ) )
+	PORT_BIT( 0xffffefaf, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_BIT( 0x00001040, IP_ACTIVE_LOW,  IPT_UNUSED )
+INPUT_PORTS_END
 
-	PORT_BIT( 0xfffffff0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+static INPUT_PORTS_START( specfrce )
+	PORT_START("GUNX")
+	PORT_BIT( 0x1ff, 0x000, IPT_LIGHTGUN_X ) PORT_MINMAX(0x000, 0x1ff) PORT_CROSSHAIR(X, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
+
+	PORT_START("GUNY")
+	PORT_BIT( 0xff, 0x00, IPT_LIGHTGUN_Y ) PORT_MINMAX(0x00, 0xff) PORT_CROSSHAIR(Y, 1.0, 0.0, 0) PORT_SENSITIVITY(50) PORT_KEYDELTA(10)
+
+	PORT_START("GUNBUTTONS")
+	PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_NAME("Trigger")
+	PORT_BIT( 0x00000002, IP_ACTIVE_LOW,  IPT_BUTTON2 ) PORT_NAME("Sense")
+	PORT_BIT( 0x00000004, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Pump")
+	PORT_BIT( 0xfffffff8, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("BUTTONS")
+	PORT_BIT( 0x00000001, IP_ACTIVE_LOW, IPT_COIN1 )
+	PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_START1 )
+	PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_COIN2 )
+	PORT_BIT (0x00000040, IP_ACTIVE_LOW, IPT_SERVICE1 )
+	PORT_BIT (0x00000080, IP_ACTIVE_LOW, IPT_SERVICE2 )
+	PORT_BIT (0x00001000, IP_ACTIVE_LOW, IPT_VOLUME_DOWN )
+	PORT_BIT (0x00002000, IP_ACTIVE_LOW, IPT_VOLUME_UP )
+	PORT_BIT( 0xffffcf38, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("DIPS")
+	PORT_DIPNAME( 0x00000010, 0x00000010, DEF_STR( Test ) )
+	PORT_DIPSETTING(          0x00000010, DEF_STR( Off ) )
+	PORT_DIPSETTING(          0x00000000, DEF_STR( On ) )
+	PORT_BIT( 0xffffefaf, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_BIT( 0x00001040, IP_ACTIVE_LOW,  IPT_UNUSED )
 INPUT_PORTS_END
 
 static INPUT_PORTS_START( vp50 )
@@ -356,8 +544,10 @@
 	PORT_BIT( 0x00000002, IP_ACTIVE_LOW, IPT_START1 )
 	PORT_BIT( 0x00000004, IP_ACTIVE_LOW, IPT_COIN2 )
 	PORT_BIT( 0x00000008,  IP_ACTIVE_LOW, IPT_START2 )
-
 	PORT_BIT( 0xfffffff0, IP_ACTIVE_HIGH, IPT_UNKNOWN )
+
+	PORT_START("IN1")
+	PORT_BIT( 0xffffffff, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 INPUT_PORTS_END
 
 void vp10x_state::vp101(machine_config &config)
@@ -465,8 +655,8 @@
 	DISK_IMAGE_READONLY("rhn010104", 0, SHA1(5bc2e5817b29bf42ec483414242795fd76d749d9) )
 ROM_END
 
-GAME( 2002,  specfrce,  0,          vp101,  vp101, vp10x_state, empty_init, ROT0, "ICE/Play Mechanix",    "Special Forces Elite Training (v01.02.00)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2002,  specfrceo, specfrce,   vp101,  vp101, vp10x_state, empty_init, ROT0, "ICE/Play Mechanix",    "Special Forces Elite Training (v01.01.01)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2003,  rhnation,  0,          vp50,   vp50,  vp10x_state, empty_init, ROT0, "ICE/Play Mechanix",    "Rhythm Nation (v01.00.04, boot v3.1.5)",    MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
-GAME( 2004,  jnero,     0,          vp101,  vp101, vp10x_state, empty_init, ROT0, "ICE/Play Mechanix",    "Johnny Nero Action Hero (v01.01.08)",       MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
-GAME( 2006,  zoofari,   0,          vp50,   vp50,  vp10x_state, empty_init, ROT0, "ICE/Play Mechanix",    "Zoofari",                                   MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 2002,  specfrce,  0,          vp101,  specfrce, vp10x_state, empty_init, ROT0, "ICE/Play Mechanix",    "Special Forces Elite Training (v01.02.00)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2002,  specfrceo, specfrce,   vp101,  specfrce, vp10x_state, empty_init, ROT0, "ICE/Play Mechanix",    "Special Forces Elite Training (v01.01.01)", MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2003,  rhnation,  0,          vp50,   vp50,     vp10x_state, empty_init, ROT0, "ICE/Play Mechanix",    "Rhythm Nation (v01.00.04, boot v3.1.5)",    MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
+GAME( 2004,  jnero,     0,          vp101,  jnero,    vp10x_state, empty_init, ROT0, "ICE/Play Mechanix",    "Johnny Nero Action Hero (v01.01.08)",       MACHINE_NOT_WORKING | MACHINE_NO_SOUND )
+GAME( 2006,  zoofari,   0,          vp50,   vp50,     vp10x_state, empty_init, ROT0, "ICE/Play Mechanix",    "Zoofari",                                   MACHINE_NOT_WORKING | MACHINE_NO_SOUND)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/vp415.cpp mame-0.224+dfsg.1/src/mame/drivers/vp415.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/vp415.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/vp415.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -508,7 +508,7 @@
 
 	// Module S: Control
 	I8031(config, m_ctrlcpu, XTAL(11'059'200)); // 11.059MHz, per schematic
-	m_ctrlcpu->port_out_cb<1>().set(FUNC(vp415_state::ctrl_cpu_port1_w));;
+	m_ctrlcpu->port_out_cb<1>().set(FUNC(vp415_state::ctrl_cpu_port1_w));
 	m_ctrlcpu->port_in_cb<1>().set(FUNC(vp415_state::ctrl_cpu_port1_r));
 	m_ctrlcpu->port_out_cb<3>().set(FUNC(vp415_state::ctrl_cpu_port3_w));
 	m_ctrlcpu->port_in_cb<3>().set(FUNC(vp415_state::ctrl_cpu_port3_r));
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/vsmile.cpp mame-0.224+dfsg.1/src/mame/drivers/vsmile.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/vsmile.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/vsmile.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -13,6 +13,11 @@
 #include "softlist.h"
 #include "speaker.h"
 
+#include "vsmile.lh"
+
+#define VERBOSE (1)
+#include "logmacro.h"
+
 /************************************
  *
  *  Common
@@ -54,6 +59,11 @@
 {
 	vsmile_base_state::machine_start();
 
+	m_redled.resolve();
+	m_yellowled.resolve();
+	m_blueled.resolve();
+	m_greenled.resolve();
+
 	save_item(NAME(m_ctrl_rts));
 	save_item(NAME(m_ctrl_select));
 }
@@ -82,6 +92,25 @@
 	//printf("Ctrl Rx: %02x\n", data);
 	m_ctrl[0]->data_w(data);
 	m_ctrl[1]->data_w(data);
+
+	//TODO: should be moved to pad code somehow
+	if ((data & 0xF0) == 0x60)
+	{
+		if (m_ctrl_select[0])
+		{
+			m_redled[0] = BIT(data, 3);
+			m_yellowled[0] = BIT(data, 2);
+			m_blueled[0] = BIT(data, 1);
+			m_greenled[0] = BIT(data, 0);
+		}
+		if (m_ctrl_select[1])
+		{
+			m_redled[1] = BIT(data, 3);
+			m_yellowled[1] = BIT(data, 2);
+			m_blueled[1] = BIT(data, 1);
+			m_greenled[1] = BIT(data, 0);
+		}
+	}
 }
 
 uint16_t vsmile_state::portb_r()
@@ -91,8 +120,9 @@
 
 void vsmile_state::portb_w(offs_t offset, uint16_t data, uint16_t mem_mask)
 {
-	if (BIT(mem_mask, 4))
-		m_cart->set_cs2(BIT(data, 4));
+	LOG("%s: portb_w: %04x & %04x (bit 1: %d & %d)\n", machine().describe_context(), data, mem_mask, BIT(data, 1), BIT(mem_mask, 1));
+	if (BIT(mem_mask, 1) && m_cart)
+		m_cart->set_cs2(BIT(~data, 1));
 }
 
 uint16_t vsmile_state::portc_r()
@@ -241,6 +271,8 @@
 
 void vsmile_base_state::vsmile_base(machine_config &config)
 {
+	config.set_default_layout(layout_vsmile);
+
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
 	m_screen->set_refresh_hz(60);
 	m_screen->set_size(320, 262);
@@ -269,6 +301,7 @@
 	m_maincpu->add_route(ALL_OUTPUTS, "lspeaker", 0.5);
 	m_maincpu->add_route(ALL_OUTPUTS, "rspeaker", 0.5);
 	m_maincpu->portb_in().set(FUNC(vsmile_state::portb_r));
+	m_maincpu->portb_out().set(FUNC(vsmile_state::portb_w));
 	m_maincpu->portc_in().set(FUNC(vsmile_state::portc_r));
 	m_maincpu->portc_out().set(FUNC(vsmile_state::portc_w));
 	m_maincpu->uart_tx().set(FUNC(vsmile_state::uart_rx));
@@ -323,9 +356,22 @@
 
 ROM_START( vsmilem )
 	ROM_REGION16_BE( 0x800000, "sysrom", ROMREGION_ERASEFF )
-	ROM_LOAD16_WORD_SWAP( "vsmilemotion.bin", 0x000000, 0x200000, CRC(60fa5426) SHA1(91e0b7b44b975df65095d6ee622436d65fb1aca5) ) // from a Spanish unit (but doesn't seem region specific)
+	ROM_SYSTEM_BIOS( 0, "bios0", "bios0" )
+	ROMX_LOAD( "vsmilemotion.bin", 0x000000, 0x200000, CRC(60fa5426) SHA1(91e0b7b44b975df65095d6ee622436d65fb1aca5), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(0) ) // from a Spanish unit (but doesn't seem region specific)
+
+	/* This ROM doesn't show the 'Motion' logo at all, but was dumped from a Motion unit
+
+	    Console says "Vtech V.Smile V-motion Active Learning System"
+	    "FCC ID 62R-0788, IC 1135D-0788" "53-36600-056-080"
+	    melted into plastic "VT8281"
+	    The PCB has the code 35-078800-001-103_708979-2.
+	*/
+	ROM_SYSTEM_BIOS( 1, "bios1", "bios1" )
+	ROMX_LOAD( "vmotionbios.bin", 0x000000, 0x200000, CRC(427087ea) SHA1(dc9eaa55f4a0047b6069ef73beea86d26f0f5394), ROM_GROUPWORD | ROM_REVERSE | ROM_BIOS(1) ) // from a US unit
+
 ROM_END
 
-//    year, name,    parent, compat, machine, input,   class,         init,       company, fullname,              flags
-CONS( 2005, vsmile,  0,      0,      vsmile,  vsmile,  vsmile_state,  empty_init, "VTech", "V.Smile",             MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
-CONS( 2008, vsmilem, vsmile, 0,      vsmilem, vsmilem, vsmilem_state, empty_init, "VTech", "V.Smile Motion",      MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+
+//    year, name,    parent, compat, machine, input,   class,         init,       company, fullname,         flags
+CONS( 2005, vsmile,  0,      0,      vsmile,  vsmile,  vsmile_state,  empty_init, "VTech", "V.Smile",        MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
+CONS( 2008, vsmilem, vsmile, 0,      vsmilem, vsmilem, vsmilem_state, empty_init, "VTech", "V.Smile Motion", MACHINE_IMPERFECT_SOUND | MACHINE_IMPERFECT_GRAPHICS )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/vt1682.cpp mame-0.224+dfsg.1/src/mame/drivers/vt1682.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/vt1682.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/vt1682.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -676,6 +676,27 @@
 	required_ioport m_io_p1;
 };
 
+class vt1682_lxts3_state : public vt_vt1682_state
+{
+public:
+	vt1682_lxts3_state(const machine_config& mconfig, device_type type, const char* tag) :
+		vt_vt1682_state(mconfig, type, tag),
+		m_io_p1(*this, "IN0")
+	{ }
+
+	void vt1682_lxts3(machine_config& config);
+	void vt1682_unk1682(machine_config& config);
+
+	void unk1682_init();
+	void njp60in1_init();
+
+protected:
+	uint8_t uio_porta_r();
+
+private:
+	required_ioport m_io_p1;
+};
+
 class vt1682_exsport_state : public vt_vt1682_state
 {
 public:
@@ -3482,7 +3503,7 @@
 			dstaddr++;
 
 		// update registers
-		set_dma_dt_addr(dstaddr);;
+		set_dma_dt_addr(dstaddr);
 		set_dma_sr_addr(srcaddr);
 	}
 }
@@ -4301,7 +4322,7 @@
 			bytes_in = 2;
 		}
 
-		int xbase = x;;
+		int xbase = x;
 
 		for (int xx = 0; xx < tilesize_wide; xx += 4) // tile x pixels
 		{
@@ -5658,6 +5679,30 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_NAME("Pad Right") PORT_16WAY
 INPUT_PORTS_END
 
+static INPUT_PORTS_START( lxts3 )
+	PORT_START("IN0")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 )
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 )
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 )
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( njp60in1 )
+	PORT_START("IN0")
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 )
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON1 )
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 )
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON3 )
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT )
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICK_UP )
+INPUT_PORTS_END
+
 static INPUT_PORTS_START( exsprt48 )
 	PORT_START("P1")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
@@ -5680,6 +5725,21 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2)
 INPUT_PORTS_END
 
+static INPUT_PORTS_START( dance555 )
+	PORT_START("P1")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_PLAYER(1)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_PLAYER(1)
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START1 )
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_NAME("Pad Up") PORT_16WAY // NOT A JOYSTICK!!
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_NAME("Pad Down") PORT_16WAY
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_JOYSTICK_LEFT ) PORT_NAME("Pad Left") PORT_16WAY
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_JOYSTICK_RIGHT ) PORT_NAME("Pad Right") PORT_16WAY
+
+	PORT_START("P2")
+	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
+INPUT_PORTS_END
+
 
 // this controller code is just designed to feed the games with data they're happy with, it probably has no grounds in reality
 // as I don't know how they really work.  presumably wireless with timeouts, sending signals for brief periods that need to be
@@ -5833,7 +5893,12 @@
 	m_rightdac->add_route(0, "mono", 0.5);
 }
 
-
+uint8_t vt1682_lxts3_state::uio_porta_r()
+{
+	uint8_t ret = m_io_p1->read();
+	logerror("%s: porta_r returning: %02x (INPUTS)\n", machine().describe_context(), ret);
+	return ret;
+}
 
 uint8_t vt1682_dance_state::uio_porta_r()
 {
@@ -5894,6 +5959,48 @@
 	m_uio->porta_out().set(FUNC(vt1682_dance_state::uio_porta_w));
 }
 
+void vt1682_lxts3_state::vt1682_lxts3(machine_config& config)
+{
+	vt_vt1682_ntscbase(config);
+	vt_vt1682_common(config);
+
+	M6502(config.replace(), m_maincpu, MAIN_CPU_CLOCK_PAL); // no opcode bitswap
+	m_maincpu->set_addrmap(AS_PROGRAM, &vt1682_lxts3_state::vt_vt1682_map);
+
+	m_leftdac->reset_routes();
+	m_rightdac->reset_routes();
+
+	config.device_remove(":lspeaker");
+	config.device_remove(":rspeaker");
+
+	SPEAKER(config, "mono").front_center();
+	m_leftdac->add_route(0, "mono", 0.5);
+	m_rightdac->add_route(0, "mono", 0.5);
+
+	m_uio->porta_in().set(FUNC(vt1682_lxts3_state::uio_porta_r));
+}
+
+void vt1682_lxts3_state::vt1682_unk1682(machine_config& config)
+{
+	vt_vt1682_palbase(config);
+	vt_vt1682_common(config);
+
+	M6502(config.replace(), m_maincpu, MAIN_CPU_CLOCK_PAL); // no opcode bitswap
+	m_maincpu->set_addrmap(AS_PROGRAM, &vt1682_lxts3_state::vt_vt1682_map);
+
+	m_leftdac->reset_routes();
+	m_rightdac->reset_routes();
+
+	config.device_remove(":lspeaker");
+	config.device_remove(":rspeaker");
+
+	SPEAKER(config, "mono").front_center();
+	m_leftdac->add_route(0, "mono", 0.5);
+	m_rightdac->add_route(0, "mono", 0.5);
+
+	m_uio->porta_in().set(FUNC(vt1682_lxts3_state::uio_porta_r));
+}
+
 
 void vt1682_wow_state::vt1682_wow(machine_config& config)
 {
@@ -5925,8 +6032,28 @@
 }
 
 
+void vt1682_lxts3_state::unk1682_init()
+{
+	regular_init();
+
+	uint8_t* ROM = memregion("mainrom")->base();
+	// this jumps to a function on startup that has a bunch of jumps / accesses to the 3xxx region, which is internal ROM
+	// but bypassing it allows the unit to boot.
+	ROM[0x7ef43] = 0xea;
+	ROM[0x7ef44] = 0xea;
+	ROM[0x7ef45] = 0xea;
+}
 
+void vt1682_lxts3_state::njp60in1_init()
+{
+	regular_init();
 
+	uint8_t* ROM = memregion("mainrom")->base();
+	// first jsr in the code is for some port based security(?) check, might be SEEPROM
+	ROM[0x7ff44] = 0xea;
+	ROM[0x7ff45] = 0xea;
+	ROM[0x7ff46] = 0xea;
+}
 
 // the VT1682 can have 0x1000 bytes of internal ROM, but none of the software dumped makes use of it.
 
@@ -5945,6 +6072,16 @@
 	ROM_LOAD( "zone.bin", 0x000000, 0x1000000, CRC(50726ae8) SHA1(bcedcd61728dce7b430784585be14109af542cc2) )
 ROM_END
 
+ROM_START( zone7in1p )
+	ROM_REGION( 0x2000000, "mainrom", 0 )
+	ROM_LOAD( "zone7in1.bin", 0x000000, 0x1000000, CRC(40bbfb80) SHA1(f65a900abea13977713bbe3b5e736e6d4d106f2c) )
+ROM_END
+
+ROM_START( dance555 )
+	ROM_REGION( 0x2000000, "mainrom", 0 )
+	ROM_LOAD( "39vf6401.u3", 0x000000, 0x800000, CRC(13b1ccef) SHA1(3eb494816a1781a5e6a45bd0562b2b8326598ef7) )
+ROM_END
+
 ROM_START( miwi2_16 )
 	ROM_REGION( 0x2000000, "mainrom", ROMREGION_ERASE00 )
 	ROM_LOAD( "miwi 2 16 arcade games and drum master vt168.bin", 0x00000, 0x1000000, CRC(00c115c5) SHA1(fa5fdb448dd9b963351d71fe94e2072f5c872a18) )
@@ -5976,31 +6113,73 @@
 	ROM_LOAD( "48in1sports.bin", 0x00000, 0x2000000, CRC(8e490541) SHA1(aeb01b3d7229fc888b36aaa924fe6b10597a7783) )
 ROM_END
 
+ROM_START( xing48 )
+	ROM_REGION( 0x2000000, "mainrom", ROMREGION_ERASE00 )
+	ROM_LOAD( "xing48in1.bin", 0x00000, 0x0800000, CRC(c601a4ae) SHA1(ec1219ede01a48df6bfd01675e715f6b13d2b43e) )
+	ROM_CONTINUE(0x1000000, 0x0800000)
+	ROM_CONTINUE(0x0800000, 0x0800000)
+	ROM_CONTINUE(0x1800000, 0x0800000)
+ROM_END
+
+
 ROM_START( wowwg )
 	ROM_REGION( 0x2000000, "mainrom", 0 )
 	ROM_LOAD( "msp55lv128.bin", 0x00000, 0x1000000, CRC(f607c40c) SHA1(66d3960c3b8fbab06a88cf039419c79a6c8633f0) )
 	ROM_RELOAD(0x1000000,0x1000000)
 ROM_END
 
+ROM_START( unk1682 )
+	ROM_REGION( 0x1000, "internal", 0 )
+	// this appears to use the internal ROM on startup, so mark it as missing
+	ROM_LOAD( "101in1.internal.rom", 0x00000, 0x1000, NO_DUMP )
+
+	ROM_REGION( 0x2000000, "mainrom", 0 )
+	ROM_LOAD( "vt1682_101in1.bin", 0x00000, 0x0800000, CRC(82879200) SHA1(c1977d1733f8849326286102c0755629d0406ec4) )
+	ROM_CONTINUE(0x0800000, 0x0800000)
+	ROM_CONTINUE(0x1000000, 0x0800000)
+	ROM_CONTINUE(0x1800000, 0x0800000)
+
+	// also has a 24c02N SEEPROM, no accesses noted (maybe accessed from 'internal ROM' code?)
+ROM_END
+
+ROM_START( njp60in1 )
+	ROM_REGION( 0x2000000, "mainrom", 0 ) // the 6Mbyte - 7Mbyte region of the ROM is missing, causing Extreme Power Soccer to fail
+	ROM_LOAD( "60-in-1.bin", 0x00000, 0x0800000, CRC(7b2ee951) SHA1(fc7c214704908b85676efc64a21930483d24a457) )
+	ROM_CONTINUE(0x0800000, 0x0800000)
+	ROM_CONTINUE(0x1000000, 0x0800000)
+	ROM_CONTINUE(0x1800000, 0x0800000)
+
+	// also has a 24c02n SEEPROM, seems to access it on startup (security check?)
+ROM_END
+
+
 ROM_START( 110dance )
 	ROM_REGION( 0x2000000, "mainrom", 0 )
 	ROM_LOAD( "110songdancemat.bin", 0x00000, 0x2000000, CRC(cd668e41) SHA1(975bfe05f4cce047860b05766bc8539218f6014f) )
 ROM_END
 
+ROM_START( lxts3 )
+	ROM_REGION( 0x800000, "mainrom", 0 )
+	ROM_LOAD( "lexibooktoystory_mx29lv640mt_00c2227e.bin", 0x00000, 0x800000, CRC(91344ae7) SHA1(597fc4a27dd1fb6e6f5fda1c4ea237c07e9dba71))
+ROM_END
+
 
 // TODO: this is a cartridge based system (actually, verify this, it seems some versions simply had built in games) move these to SL if verified as from cartridge config
 //  actually it appears that for the cart based systems these are 'fake systems' anyway, where the base unit is just a Famiclone but as soon as you plug in a cart none of
 //  the internal hardware gets used at all.
 
 CONS( 200?, ii8in1,    0,  0,  intech_interact,    intec, intec_interact_state, regular_init,  "Intec", "InterAct 8-in-1", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
 CONS( 200?, ii32in1,   0,  0,  intech_interact,    intec, intec_interact_state, regular_init,  "Intec", "InterAct 32-in-1", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 // a 40-in-1 also exists which combines the above
 
-CONS( 200?, zone7in1,  0,  0,  intech_interact,    miwi2, intec_interact_state, regular_init,  "<unknown>", "Zone 7-in-1 Sports (US)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-// UK version of Zone 7-in-1 has different games (Boxing / Tennis / Golf / Fishing / Table Tennis / Bowling / Football) with Fishing replacing Baseball
+CONS( 200?, zone7in1,  0,         0,  intech_interact,    miwi2, intec_interact_state, regular_init,  "Ultimate Products Ltd.", "Zone 7-in-1 Sports (NTSC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+CONS( 200?, zone7in1p, zone7in1,  0,  intech_interact,    miwi2, intec_interact_state, regular_init,  "Ultimate Products Ltd.", "Zone 7-in-1 Sports (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // has Fishing instead of Baseball, and Ultimate Products banners in the Football game
+
+
 
-CONS( 200?, miwi2_16,  0,  0,  intech_interact,    miwi2, intec_interact_state, regular_init,  "<unknown>", "MiWi2 16-in-1 + Drum Master", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // clearly older code, Highway has uncensored title screen, selection screen has 'Arcase' instead of 'Arcade'
-CONS( 200?, miwi2_7,   0,  0,  intech_interact,    miwi2, intec_interact_state, regular_init,  "<unknown>", "MiWi2 7-in-1 Sports", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+CONS( 200?, miwi2_16,  0,  0,  intech_interact,    miwi2, intec_interact_state, regular_init,  "Macro Winners", "MiWi2 16-in-1 + Drum Master", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // clearly older code, Highway has uncensored title screen, selection screen has 'Arcase' instead of 'Arcade'
+CONS( 200?, miwi2_7,   0,  0,  intech_interact,    miwi2, intec_interact_state, regular_init,  "Macro Winners", "MiWi2 7-in-1 Sports", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
 // ViMax seems to be identical software to MiWi2
 
 CONS( 200?, intact89,  0,  0,  intech_interact_bank, miwi2, intec_interact_state, banked_init,  "Intec", "InterAct Complete Video Game - 89-in-1", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
@@ -6029,15 +6208,15 @@
 // the timing code for MotorStorm differs between these sets (although fails wiht our emulation in both cases, even if the game runs fine in other collections)
 CONS( 200?, exsprt48,   0,         0,  vt1682_exsport,    exsprt48, vt1682_exsport_state, regular_init,  "Excite", "Excite Sports Wireless Interactive TV Game - 48-in-1 (NTSC)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // "32 Arcade, 8 Sports, 8 Stadium"
 CONS( 200?, itvg48,     exsprt48,  0,  vt1682_exsportp,   exsprt48, vt1682_exsport_state, regular_init,  "TaiKee", "Interactive TV Games 48-in-1 (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // ^
+
+// This has a different selection of games to the above, Dancing as extra under Music, Doesn't have Poker under Brain, Ball Shoot instead of 'Noshery' under Arcade
+// imported by Cathay Product Sourcing Ltd. (Ireland) no other manufacturer information on box, not sure if Xing is name of manufacturer or product
+CONS( 200?, xing48,     0,         0,  vt1682_exsportp,   exsprt48, vt1682_exsport_state, regular_init,  "Xing", "Xing Wireless Interactive TV Game 'Wi TV Zone' 48-in-1 (Europe, PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // ^
 /*
-There is at least one alt US version of Excite Sports Wireless Interactive TV Game - 48-in-1 also on VT1682
+The above was also released in the US as Excite Sports Wireless Interactive TV Game - 48-in-1 with an almost identical box to exsprt48 unit, but with the different games noted.
 
 It is still advertised as 48-in-1, 8 Interactive Sports Games, 8 Olympic games, 32 Arcade Games
 see https://www.youtube.com/watch?v=tHMX71daHAk
-Changes:
-Dancing as extra under Music
-Doesn't have Poker under Brain
-Ball Shoot instead of 'Noshery' under Arcade
 
 This might be a regional / store thing if some places didn't want to sell a unit with a Poker game in it?
 */
@@ -6046,6 +6225,23 @@
 // 'Riding Horse' on the other hand actually needs PAL timings, so this unit clearly was designed for PAL regions, however 'Explosion' was left broken.
 CONS( 200?, wowwg,  0,  0,  vt1682_wow, exsprt48, vt1682_wow_state, regular_init, "Wow", "Wow Wireless Gaming (PAL)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND) // needs high colour line mode for main menu
 
+
 CONS( 200?, 110dance,  0,  0,  vt1682_dance, 110dance, vt1682_dance_state, regular_init, "<unknown>", "Retro Dance Mat (110 song Super StepMania + 9-in-1 games) (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND)
 
+// songs 5-8 are repeats of songs 1-4, but probably not a bug?
+CONS( 200?, dance555,  0,  0,  vt1682_exsportp,   dance555, vt1682_exsport_state, regular_init,  "Subor", "Sports and Dance Fit Games Mat D-555 (PAL)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+
 // NJ Pocket 60-in-1 (NJ-250) is meant to have similar games to the mini-games found in wowwg and 110dance, so almost certainly fits here
+
+// manual explicitly states it has NTSC output only (unit can be connected to a TV) and both Ranning Horse + Explosion (Bomberman) are the NTSC versions
+// has 21.477 Mhz XTAL
+CONS( 200?, njp60in1,  0,  0,   vt1682_lxts3, njp60in1, vt1682_lxts3_state, njp60in1_init, "<unknown>", "NJ Pocket 60-in-1 handheld 'X zero' (NTSC)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND) // needs high colour line mode for main menu
+
+// this appears to be related to the NJ Pocket, claims 101-in-1 but has some duplicates.
+// Like the 'Wow Wireless gaming' it incorrectly mixes the PAL version of 'Ranning Horse' with the NTSC version of 'Bomberman', it has no TV output.
+// has 26.6017 Mhz (6xPAL) XTAL
+CONS( 200?, unk1682,  0,  0,   vt1682_unk1682, lxts3, vt1682_lxts3_state, unk1682_init, "<unknown>", "unknown VT1682-based 101-in-1 handheld (PAL)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND) // needs high colour line mode for main menu
+
+CONS( 2010, lxts3,    0,  0,   vt1682_lxts3, lxts3, vt1682_lxts3_state, regular_init,  "Lexibook", "Toy Story 3 (Lexibook)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // random number generation issues on 2 games, linescroll on racing games
+
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/vtech1.cpp mame-0.224+dfsg.1/src/mame/drivers/vtech1.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/vtech1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/vtech1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -40,7 +40,6 @@
 #include "sound/spkrdev.h"
 #include "video/mc6847.h"
 
-#include "softlist.h"
 #include "speaker.h"
 
 #include "formats/imageutl.h"
@@ -64,15 +63,16 @@
 class vtech1_state : public driver_device
 {
 public:
-	vtech1_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_videoram(*this, "videoram"),
-		m_maincpu(*this, "maincpu"),
-		m_mc6847(*this, "mc6847"),
-		m_speaker(*this, "speaker"),
-		m_cassette(*this, "cassette"),
-		m_ioexp(*this, "io"),
-		m_memexp(*this, "mem")
+	vtech1_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_vram(*this, "videoram")
+		, m_maincpu(*this, "maincpu")
+		, m_crtc(*this, "crtc")
+		, m_speaker(*this, "speaker")
+		, m_cassette(*this, "cassette")
+		, m_io_keyboard(*this, "X%u", 0U)
+		, m_ioexp(*this, "io")
+		, m_memexp(*this, "mem")
 	{
 	}
 
@@ -85,11 +85,10 @@
 	void init_vtech1h();
 
 private:
-	uint8_t vtech1_lightpen_r(offs_t offset);
-	uint8_t vtech1_keyboard_r(offs_t offset);
-	void vtech1_latch_w(uint8_t data);
-
-	void vtech1_video_bank_w(uint8_t data);
+	uint8_t lightpen_r(offs_t offset);
+	uint8_t keyboard_r(offs_t offset);
+	void latch_w(uint8_t data);
+	void video_bank_w(uint8_t data);
 	uint8_t mc6847_videoram_r(offs_t offset);
 
 	DECLARE_SNAPSHOT_LOAD_MEMBER(snapshot_cb);
@@ -103,12 +102,12 @@
 	static const uint8_t VZ_BASIC = 0xf0;
 	static const uint8_t VZ_MCODE = 0xf1;
 
-	required_shared_ptr<uint8_t> m_videoram;
-
+	required_shared_ptr<uint8_t> m_vram;
 	required_device<cpu_device> m_maincpu;
-	required_device<mc6847_base_device> m_mc6847;
+	required_device<mc6847_base_device> m_crtc;
 	required_device<speaker_sound_device> m_speaker;
 	required_device<cassette_image_device> m_cassette;
+	required_ioport_array<8> m_io_keyboard;
 	required_device<vtech_ioexp_slot_device> m_ioexp;
 	required_device<vtech_memexp_slot_device> m_memexp;
 };
@@ -191,31 +190,25 @@
     INPUTS
 ***************************************************************************/
 
-uint8_t vtech1_state::vtech1_lightpen_r(offs_t offset)
+uint8_t vtech1_state::lightpen_r(offs_t offset)
 {
 	logerror("vtech1_lightpen_r(%d)\n", offset);
 	return 0xff;
 }
 
-uint8_t vtech1_state::vtech1_keyboard_r(offs_t offset)
+uint8_t vtech1_state::keyboard_r(offs_t offset)
 {
 	uint8_t result = 0x3f;
 
 	// bit 0 to 5, keyboard input
-	if (!BIT(offset, 0)) result &= ioport("keyboard_0")->read();
-	if (!BIT(offset, 1)) result &= ioport("keyboard_1")->read();
-	if (!BIT(offset, 2)) result &= ioport("keyboard_2")->read();
-	if (!BIT(offset, 3)) result &= ioport("keyboard_3")->read();
-	if (!BIT(offset, 4)) result &= ioport("keyboard_4")->read();
-	if (!BIT(offset, 5)) result &= ioport("keyboard_5")->read();
-	if (!BIT(offset, 6)) result &= ioport("keyboard_6")->read();
-	if (!BIT(offset, 7)) result &= ioport("keyboard_7")->read();
+	for (u8 i = 0; i < 8; i++)
+		if (!BIT(offset, i)) result &= m_io_keyboard[i]->read();
 
 	// bit 6, cassette input
 	result |= (m_cassette->input() > 0.04) ? 0 : 0x40;
 
 	// bit 7, field sync
-	result |= m_mc6847->fs_r() << 7;
+	result |= m_crtc->fs_r() << 7;
 
 	return result;
 }
@@ -225,24 +218,24 @@
     I/O LATCH
 ***************************************************************************/
 
-void vtech1_state::vtech1_latch_w(uint8_t data)
+void vtech1_state::latch_w(uint8_t data)
 {
 	if (LOG_VTECH1_LATCH)
 		logerror("vtech1_latch_w $%02X\n", data);
 
 	// bit 1, SHRG mod (if installed)
-	if (m_videoram.bytes() == 0x2000)
+	if (m_vram.bytes() == 0x2000)
 	{
-		m_mc6847->gm0_w(BIT(data, 1));
-		m_mc6847->gm2_w(BIT(data, 1));
+		m_crtc->gm0_w(BIT(data, 1));
+		m_crtc->gm2_w(BIT(data, 1));
 	}
 
 	// bit 2, cassette out (actually bits 1 and 2 perform this function, so either can be used)
 	m_cassette->output( BIT(data, 2) ? 1.0 : -1.0);
 
 	// bit 3 and 4, vdc mode control lines
-	m_mc6847->ag_w(BIT(data, 3));
-	m_mc6847->css_w(BIT(data, 4));
+	m_crtc->ag_w(BIT(data, 3));
+	m_crtc->css_w(BIT(data, 4));
 
 	// bit 0 and 5, speaker
 	m_speaker->level_w((BIT(data, 5) << 1) | BIT(data, 0));
@@ -253,7 +246,7 @@
     MEMORY BANKING
 ***************************************************************************/
 
-void vtech1_state::vtech1_video_bank_w(uint8_t data)
+void vtech1_state::video_bank_w(uint8_t data)
 {
 	membank("bank4")->set_entry(data & 0x03);
 }
@@ -267,10 +260,10 @@
 {
 	if (offset == ~0) return 0xff;
 
-	m_mc6847->inv_w(BIT(m_videoram[offset], 6));
-	m_mc6847->as_w(BIT(m_videoram[offset], 7));
+	m_crtc->inv_w(BIT(m_vram[offset], 6));
+	m_crtc->as_w(BIT(m_vram[offset], 7));
 
-	return m_videoram[offset];
+	return m_vram[offset];
 }
 
 
@@ -281,10 +274,10 @@
 void vtech1_state::init_vtech1h()
 {
 	// the SHRG mod replaces the standard videoram chip with an 8k chip
-	m_videoram.allocate(0x2000);
+	m_vram.allocate(0x2000);
 
 	m_maincpu->space(AS_PROGRAM).install_readwrite_bank(0x7000, 0x77ff, "bank4");
-	membank("bank4")->configure_entries(0, 4, m_videoram, 0x800);
+	membank("bank4")->configure_entries(0, 4, m_vram, 0x800);
 	membank("bank4")->set_entry(0);
 }
 
@@ -296,37 +289,34 @@
 void vtech1_state::laser110_mem(address_map &map)
 {
 	map(0x0000, 0x3fff).rom(); // basic rom
-	map(0x6800, 0x6fff).rw(FUNC(vtech1_state::vtech1_keyboard_r), FUNC(vtech1_state::vtech1_latch_w));
+	map(0x6800, 0x6fff).rw(FUNC(vtech1_state::keyboard_r), FUNC(vtech1_state::latch_w));
 	map(0x7000, 0x77ff).ram().share("videoram"); // 6847
 	map(0x7800, 0x7fff).ram(); // 2k user ram
 }
 
 void vtech1_state::laser210_mem(address_map &map)
 {
-	map(0x0000, 0x3fff).rom(); // basic rom
-	map(0x6800, 0x6fff).rw(FUNC(vtech1_state::vtech1_keyboard_r), FUNC(vtech1_state::vtech1_latch_w));
-	map(0x7000, 0x77ff).ram().share("videoram"); // 6847
+	laser110_mem(map);
 	map(0x7800, 0x8fff).ram(); // 6k user ram
 }
 
 void vtech1_state::laser310_mem(address_map &map)
 {
-	map(0x0000, 0x3fff).rom(); // basic rom
-	map(0x6800, 0x6fff).rw(FUNC(vtech1_state::vtech1_keyboard_r), FUNC(vtech1_state::vtech1_latch_w));
-	map(0x7000, 0x77ff).ram().share("videoram"); // 6847
+	laser110_mem(map);
 	map(0x7800, 0xb7ff).ram(); // 16k user ram
 }
 
 void vtech1_state::vtech1_io(address_map &map)
 {
 	map.global_mask(0xff);
-	map(0x40, 0x4f).r(FUNC(vtech1_state::vtech1_lightpen_r));
+	map(0x40, 0x4f).r(FUNC(vtech1_state::lightpen_r));
 }
 
 void vtech1_state::vtech1_shrg_io(address_map &map)
 {
+	map.global_mask(0xff);
 	vtech1_io(map);
-	map(0xd0, 0xdf).w(FUNC(vtech1_state::vtech1_video_bank_w));
+	map(0xd0, 0xdf).w(FUNC(vtech1_state::video_bank_w));
 }
 
 
@@ -335,8 +325,7 @@
 ***************************************************************************/
 
 static INPUT_PORTS_START(vtech1)
-	PORT_START("keyboard_0")
-	PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_START("X0")
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("R       RETURN  LEFT$")   PORT_CODE(KEYCODE_R)     PORT_CHAR('R')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q       FOR     CHR$")    PORT_CODE(KEYCODE_Q)     PORT_CHAR('Q')
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E       NEXT    LEN(")    PORT_CODE(KEYCODE_E)     PORT_CHAR('E')
@@ -344,8 +333,7 @@
 	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W       TO      VAL(")    PORT_CODE(KEYCODE_W)     PORT_CHAR('W')
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("T       THEN    MID$")    PORT_CODE(KEYCODE_T)     PORT_CHAR('T')
 
-	PORT_START("keyboard_1")
-	PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_START("X1")
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F       GOSUB   RND(")    PORT_CODE(KEYCODE_F)     PORT_CHAR('F')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A       MODE(   ASC(")    PORT_CODE(KEYCODE_A)     PORT_CHAR('A')
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D       DIM     RESTORE") PORT_CODE(KEYCODE_D)     PORT_CHAR('D')
@@ -353,8 +341,7 @@
 	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("S       STEP    STR$(")   PORT_CODE(KEYCODE_S)     PORT_CHAR('S')
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G       GOTO    STOP")    PORT_CODE(KEYCODE_G)     PORT_CHAR('G')
 
-	PORT_START("keyboard_2")
-	PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_START("X2")
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("V       LPRINT  USR")     PORT_CODE(KEYCODE_V)     PORT_CHAR('V')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z       PEEK(   INP")     PORT_CODE(KEYCODE_Z)     PORT_CHAR('Z')
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C       CONT    COPY")    PORT_CODE(KEYCODE_C)     PORT_CHAR('C')
@@ -362,8 +349,7 @@
 	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("X       POKE    OUT")     PORT_CODE(KEYCODE_X)     PORT_CHAR('X')
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B       LLIST   SOUND")   PORT_CODE(KEYCODE_B)     PORT_CHAR('B')
 
-	PORT_START("keyboard_3")
-	PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_START("X3")
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("4  $    VERIFY  ATN(")    PORT_CODE(KEYCODE_4)     PORT_CHAR('4') PORT_CHAR('$')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("1  !    CSAVE   SIN(")    PORT_CODE(KEYCODE_1)     PORT_CHAR('1') PORT_CHAR('!')
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("3  #    CRUN    TAN(")    PORT_CODE(KEYCODE_3)     PORT_CHAR('3') PORT_CHAR('#')
@@ -371,8 +357,7 @@
 	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("2  \"    CLOAD   COS(")   PORT_CODE(KEYCODE_2)     PORT_CHAR('2') PORT_CHAR('\"')
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("5  %    LIST    LOG(")    PORT_CODE(KEYCODE_5)     PORT_CHAR('5') PORT_CHAR('%')
 
-	PORT_START("keyboard_4")
-	PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_START("X4")
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("M  \\    \xE2\x86\x90")   PORT_CODE(KEYCODE_M)     PORT_CHAR('M') PORT_CHAR('\\') PORT_CHAR(UCHAR_MAMEKEY(LEFT))
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("SPACE   \xE2\x86\x93")    PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ') PORT_CHAR('~')  PORT_CHAR(UCHAR_MAMEKEY(DOWN))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(",  <    \xE2\x86\x92")    PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')  PORT_CHAR(UCHAR_MAMEKEY(RIGHT))
@@ -380,8 +365,7 @@
 	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(".  >    \xE2\x86\x91")    PORT_CODE(KEYCODE_STOP)  PORT_CHAR('.') PORT_CHAR('>')  PORT_CHAR(UCHAR_MAMEKEY(UP))
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("N  ^    COLOR   USING")   PORT_CODE(KEYCODE_N)     PORT_CHAR('N') PORT_CHAR('^')
 
-	PORT_START("keyboard_5")
-	PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_START("X5")
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("7  '    END     SGN(")    PORT_CODE(KEYCODE_7)     PORT_CHAR('7') PORT_CHAR('\'')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("0  @    DATA    INT(")    PORT_CODE(KEYCODE_0)     PORT_CHAR('0') PORT_CHAR('@')
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("8  (    NEW     SQR(")    PORT_CODE(KEYCODE_8)     PORT_CHAR('8') PORT_CHAR('(')
@@ -389,8 +373,7 @@
 	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("9  )    READ    ABS(")    PORT_CODE(KEYCODE_9)     PORT_CHAR('9') PORT_CHAR(')')
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("6  &    RUN     EXP(")    PORT_CODE(KEYCODE_6)     PORT_CHAR('6') PORT_CHAR('&')
 
-	PORT_START("keyboard_6")
-	PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_START("X6")
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("U       IF      INKEY$")  PORT_CODE(KEYCODE_U)     PORT_CHAR('U')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("P  ]    PRINT   NOT")     PORT_CODE(KEYCODE_P)     PORT_CHAR('P') PORT_CHAR(']')
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("I       INPUT   AND")     PORT_CODE(KEYCODE_I)     PORT_CHAR('I')
@@ -398,23 +381,13 @@
 	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("O  [    LET     OR")      PORT_CODE(KEYCODE_O)     PORT_CHAR('O') PORT_CHAR('[')
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Y       ELSE    RIGHT$(") PORT_CODE(KEYCODE_Y)     PORT_CHAR('Y')
 
-	PORT_START("keyboard_7")
-	PORT_BIT(0xc0, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_START("X7")
 	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("J       REM     RESET")   PORT_CODE(KEYCODE_J)     PORT_CHAR('J')
 	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(";  +    [Rubout]")        PORT_CODE(KEYCODE_COLON) PORT_CHAR(';') PORT_CHAR('+')  PORT_CHAR(UCHAR_MAMEKEY(DEL))
 	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("K  /    TAB(    POINT")   PORT_CODE(KEYCODE_K)     PORT_CHAR('K') PORT_CHAR('/')
 	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME(":  *    [Inverse]")       PORT_CODE(KEYCODE_QUOTE) PORT_CHAR(':') PORT_CHAR('*')  PORT_CHAR(UCHAR_MAMEKEY(HOME))
 	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("L  ?    [Insert]")        PORT_CODE(KEYCODE_L)     PORT_CHAR('L') PORT_CHAR('?')  PORT_CHAR(UCHAR_MAMEKEY(INSERT))
 	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("H       CLS     SET")     PORT_CODE(KEYCODE_H)     PORT_CHAR('H')
-
-	/* Enhanced options not available on real hardware */
-	PORT_START("CONFIG")
-	PORT_CONFNAME( 0x01, 0x01, "Autorun on Quickload")
-	PORT_CONFSETTING(    0x00, DEF_STR(No))
-	PORT_CONFSETTING(    0x01, DEF_STR(Yes))
-//  PORT_CONFNAME( 0x08, 0x08, "Cassette Speaker")
-//  PORT_CONFSETTING(    0x08, DEF_STR(On))
-//  PORT_CONFSETTING(    0x00, DEF_STR(Off))
 INPUT_PORTS_END
 
 
@@ -432,12 +405,12 @@
 	m_maincpu->set_addrmap(AS_IO, &vtech1_state::vtech1_io);
 
 	// video hardware
-	MC6847_PAL(config, m_mc6847, XTAL(4'433'619));
-	m_mc6847->set_screen("screen");
-	m_mc6847->fsync_wr_callback().set_inputline(m_maincpu, 0).invert();
-	m_mc6847->input_callback().set(FUNC(vtech1_state::mc6847_videoram_r));
-	m_mc6847->set_black_and_white(true);
-	m_mc6847->set_get_fixed_mode(mc6847_pal_device::MODE_GM1);
+	MC6847_PAL(config, m_crtc, XTAL(4'433'619));
+	m_crtc->set_screen("screen");
+	m_crtc->fsync_wr_callback().set_inputline(m_maincpu, 0).invert();
+	m_crtc->input_callback().set(FUNC(vtech1_state::mc6847_videoram_r));
+	m_crtc->set_black_and_white(true);
+	m_crtc->set_get_fixed_mode(mc6847_pal_device::MODE_GM1);
 	// GM2 = GND, GM0 = GND, INTEXT = GND
 	// other lines not connected
 
@@ -475,11 +448,11 @@
 void vtech1_state::laser200(machine_config &config)
 {
 	laser110(config);
-	MC6847_PAL(config.replace(), m_mc6847, XTAL(4'433'619));
-	m_mc6847->set_screen("screen");
-	m_mc6847->fsync_wr_callback().set_inputline(m_maincpu, 0).invert();
-	m_mc6847->input_callback().set(FUNC(vtech1_state::mc6847_videoram_r));
-	m_mc6847->set_get_fixed_mode(mc6847_pal_device::MODE_GM1);
+	MC6847_PAL(config.replace(), m_crtc, XTAL(4'433'619));
+	m_crtc->set_screen("screen");
+	m_crtc->fsync_wr_callback().set_inputline(m_maincpu, 0).invert();
+	m_crtc->input_callback().set(FUNC(vtech1_state::mc6847_videoram_r));
+	m_crtc->set_get_fixed_mode(mc6847_pal_device::MODE_GM1);
 	// GM2 = GND, GM0 = GND, INTEXT = GND
 	// other lines not connected
 }
@@ -503,11 +476,11 @@
 	laser310(config);
 	m_maincpu->set_addrmap(AS_IO, &vtech1_state::vtech1_shrg_io);
 
-	MC6847_PAL(config.replace(), m_mc6847, XTAL(4'433'619));
-	m_mc6847->set_screen("screen");
-	m_mc6847->fsync_wr_callback().set_inputline(m_maincpu, 0).invert();
-	m_mc6847->input_callback().set(FUNC(vtech1_state::mc6847_videoram_r));
-	m_mc6847->set_get_fixed_mode(mc6847_pal_device::MODE_GM1);
+	MC6847_PAL(config.replace(), m_crtc, XTAL(4'433'619));
+	m_crtc->set_screen("screen");
+	m_crtc->fsync_wr_callback().set_inputline(m_maincpu, 0).invert();
+	m_crtc->input_callback().set(FUNC(vtech1_state::mc6847_videoram_r));
+	m_crtc->set_get_fixed_mode(mc6847_pal_device::MODE_GM1);
 	// INTEXT = GND
 	// other lines not connected
 }
@@ -569,13 +542,13 @@
 ***************************************************************************/
 
 //    YEAR  NAME       PARENT    COMPAT  MACHINE    INPUT   CLASS         INIT          COMPANY                   FULLNAME                          FLAGS
-COMP( 1983, laser110,  0,        0,      laser110,  vtech1, vtech1_state, empty_init,   "Video Technology",       "Laser 110",                      0 )
-COMP( 1983, laser200,  0,        0,      laser200,  vtech1, vtech1_state, empty_init,   "Video Technology",       "Laser 200",                      0 )
-COMP( 1983, vz200de,   laser200, 0,      laser200,  vtech1, vtech1_state, empty_init,   "Video Technology",       "VZ-200 (Germany & Netherlands)", MACHINE_NOT_WORKING )
-COMP( 1983, fellow,    laser200, 0,      laser200,  vtech1, vtech1_state, empty_init,   "Salora",                 "Fellow (Finland)",               0 )
-COMP( 1983, tx8000,    laser200, 0,      laser200,  vtech1, vtech1_state, empty_init,   "Texet",                  "TX-8000 (UK)",                   0 )
-COMP( 1984, laser210,  0,        0,      laser210,  vtech1, vtech1_state, empty_init,   "Video Technology",       "Laser 210",                      0 )
-COMP( 1984, vz200,     laser210, 0,      laser210,  vtech1, vtech1_state, empty_init,   "Dick Smith Electronics", "VZ-200 (Oceania)",               0 )
-COMP( 1984, laser310,  0,        0,      laser310,  vtech1, vtech1_state, empty_init,   "Video Technology",       "Laser 310",                      0 )
-COMP( 1984, vz300,     laser310, 0,      laser310,  vtech1, vtech1_state, empty_init,   "Dick Smith Electronics", "VZ-300 (Oceania)",               0 )
-COMP( 1984, laser310h, laser310, 0,      laser310h, vtech1, vtech1_state, init_vtech1h, "Video Technology",       "Laser 310 (SHRG)",               MACHINE_UNOFFICIAL )
+COMP( 1983, laser110,  0,        0,      laser110,  vtech1, vtech1_state, empty_init,   "Video Technology",       "Laser 110",                      MACHINE_SUPPORTS_SAVE )
+COMP( 1983, laser200,  0,        0,      laser200,  vtech1, vtech1_state, empty_init,   "Video Technology",       "Laser 200",                      MACHINE_SUPPORTS_SAVE )
+COMP( 1983, vz200de,   laser200, 0,      laser200,  vtech1, vtech1_state, empty_init,   "Video Technology",       "VZ-200 (Germany & Netherlands)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+COMP( 1983, fellow,    laser200, 0,      laser200,  vtech1, vtech1_state, empty_init,   "Salora",                 "Fellow (Finland)",               MACHINE_SUPPORTS_SAVE )
+COMP( 1983, tx8000,    laser200, 0,      laser200,  vtech1, vtech1_state, empty_init,   "Texet",                  "TX-8000 (UK)",                   MACHINE_SUPPORTS_SAVE )
+COMP( 1984, laser210,  0,        0,      laser210,  vtech1, vtech1_state, empty_init,   "Video Technology",       "Laser 210",                      MACHINE_SUPPORTS_SAVE )
+COMP( 1984, vz200,     laser210, 0,      laser210,  vtech1, vtech1_state, empty_init,   "Dick Smith Electronics", "VZ-200 (Oceania)",               MACHINE_SUPPORTS_SAVE )
+COMP( 1984, laser310,  0,        0,      laser310,  vtech1, vtech1_state, empty_init,   "Video Technology",       "Laser 310",                      MACHINE_SUPPORTS_SAVE )
+COMP( 1984, vz300,     laser310, 0,      laser310,  vtech1, vtech1_state, empty_init,   "Dick Smith Electronics", "VZ-300 (Oceania)",               MACHINE_SUPPORTS_SAVE )
+COMP( 1984, laser310h, laser310, 0,      laser310h, vtech1, vtech1_state, init_vtech1h, "Video Technology",       "Laser 310 (SHRG)",               MACHINE_UNOFFICIAL | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/vtech2.cpp mame-0.224+dfsg.1/src/mame/drivers/vtech2.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/vtech2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/vtech2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -107,7 +107,7 @@
 	map(0x00000, 0x03fff).rom().region("maincpu", 0);
 	map(0x04000, 0x07fff).rom().region("maincpu", 0x4000);
 	map(0x08000, 0x0bfff).rw(FUNC(vtech2_state::mmio_r), FUNC(vtech2_state::mmio_w));
-	map(0x0c000, 0x0ffff).ram().share(m_videoram);
+	map(0x0c000, 0x0ffff).ram().share(m_vram);
 	map(0x10000, 0x13fff).noprw();
 	map(0x14000, 0x17fff).noprw();
 	map(0x18000, 0x1bfff).noprw();
@@ -129,7 +129,7 @@
 	map(0x10000, 0x13fff).ram();
 	map(0x14000, 0x17fff).ram();
 	map(0x18000, 0x1bfff).ram();
-	map(0x1c000, 0x1ffff).ram().share(m_videoram);
+	map(0x1c000, 0x1ffff).ram().share(m_vram);
 	map(0x20000, 0x23fff).noprw(); // TODO: 64k ram expansion pak
 	map(0x24000, 0x27fff).noprw(); // TODO: 64k ram expansion pak
 	map(0x28000, 0x2bfff).noprw(); // TODO: 64k ram expansion pak
@@ -147,7 +147,7 @@
 	map(0x10000, 0x13fff).ram();
 	map(0x14000, 0x17fff).ram();
 	map(0x18000, 0x1bfff).ram();
-	map(0x1c000, 0x1ffff).ram().share(m_videoram);
+	map(0x1c000, 0x1ffff).ram().share(m_vram);
 	map(0x20000, 0x23fff).ram();
 	map(0x24000, 0x27fff).ram();
 	map(0x28000, 0x2bfff).ram();
@@ -471,11 +471,6 @@
 		palette.set_pen_indirect(512 + i, i);
 }
 
-INTERRUPT_GEN_MEMBER(vtech2_state::vtech2_interrupt)
-{
-	m_maincpu->set_input_line(0, HOLD_LINE);
-}
-
 static const floppy_interface vtech2_floppy_interface =
 {
 	FLOPPY_STANDARD_5_25_SSDD_40,
@@ -489,7 +484,7 @@
 	Z80(config, m_maincpu, 3694700);        /* 3.694700 MHz */
 	m_maincpu->set_addrmap(AS_PROGRAM, &vtech2_state::mem_map);
 	m_maincpu->set_addrmap(AS_IO, &vtech2_state::io_map);
-	m_maincpu->set_vblank_int("screen", FUNC(vtech2_state::vtech2_interrupt));
+	m_maincpu->set_vblank_int("screen", FUNC(vtech2_state::irq0_line_hold));
 	config.set_maximum_quantum(attotime::from_hz(60));
 
 	ADDRESS_MAP_BANK(config, "banka").set_map(&vtech2_state::m_map350).set_options(ENDIANNESS_LITTLE, 8, 18, 0x4000);
@@ -503,7 +498,7 @@
 	screen.set_vblank_time(0);
 	screen.set_size(88*8, 24*8+32);
 	screen.set_visarea(0*8, 88*8-1, 0*8, 24*8+32-1);
-	screen.set_screen_update(FUNC(vtech2_state::screen_update_laser));
+	screen.set_screen_update(FUNC(vtech2_state::screen_update));
 	screen.set_palette(m_palette);
 
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_vtech2);
@@ -515,7 +510,7 @@
 
 	CASSETTE(config, m_cassette);
 	m_cassette->set_formats(vtech2_cassette_formats);
-	m_cassette->set_default_state(CASSETTE_PLAY);
+	m_cassette->set_default_state(CASSETTE_STOPPED);
 	m_cassette->add_route(ALL_OUTPUTS, "mono", 0.05);
 
 	VTECH_IOEXP_SLOT(config, "io").set_io_space(m_maincpu, AS_IO);
@@ -556,8 +551,10 @@
 ROM_START(laser350)
 	ROM_REGION(0x8000,"maincpu",0)
 	ROM_LOAD("27-0401-00-00.u6", 0x0000, 0x8000, CRC(9bed01f7) SHA1(3210fddfab2f4c7855fa902fb8e2fc18d10d48f1))
+
 	ROM_REGION(0x2000,"gfx1",0)
 	ROM_LOAD( "27-393-00.u10", 0x0000, 0x2000, CRC(d47313a2) SHA1(4650e8e339aad628c0e5d8a1944b21abff793446) )
+
 	ROM_REGION(0x0100,"gfx2",ROMREGION_ERASEFF)
 	/* initialized in init_laser */
 ROM_END
@@ -567,8 +564,10 @@
 // There should be two roms, one 0x2000 long for the font at u10, and one longer one for the os rom at u6.
 	ROM_REGION(0x8000,"maincpu",0)
 	ROM_LOAD("27-0401-00-00.u6", 0x0000, 0x8000, CRC(9bed01f7) SHA1(3210fddfab2f4c7855fa902fb8e2fc18d10d48f1)) // may be dumped at wrong size; label is: "VTL 27-0401-00-00 // 6133-7081 // 8611MAK"
+
 	ROM_REGION(0x2000,"gfx1",0)
 	ROM_LOAD( "27-393-00.u10", 0x0000, 0x2000, CRC(d47313a2) SHA1(4650e8e339aad628c0e5d8a1944b21abff793446) ) // label is "TMS 2364-25NL // D8614L // ZA234015 // 27-393-00/VT 85 // SINGAPORE"
+
 	ROM_REGION(0x0100,"gfx2",ROMREGION_ERASEFF)
 	/* initialized in init_laser */
 ROM_END
@@ -576,8 +575,10 @@
 ROM_START(laser700)
 	ROM_REGION(0x8000,"maincpu",0)
 	ROM_LOAD("27-0401-00-00.u6", 0x0000, 0x8000, CRC(9bed01f7) SHA1(3210fddfab2f4c7855fa902fb8e2fc18d10d48f1))
+
 	ROM_REGION(0x2000,"gfx1",0)
 	ROM_LOAD( "27-393-00.u10", 0x0000, 0x2000, CRC(d47313a2) SHA1(4650e8e339aad628c0e5d8a1944b21abff793446) )
+
 	ROM_REGION(0x0100,"gfx2",ROMREGION_ERASEFF)
 	/* initialized in init_laser */
 ROM_END
@@ -590,6 +591,6 @@
 ***************************************************************************/
 
 //    YEAR   NAME      PARENT    COMPAT  MACHINE   INPUT     CLASS         INIT        COMPANY             FULLNAME      FLAGS
-COMP( 1985, laser350, 0,        0,      laser350, laser350, vtech2_state, init_laser, "Video Technology", "Laser 350" , 0)
-COMP( 1985, laser500, laser350, 0,      laser500, laser500, vtech2_state, init_laser, "Video Technology", "Laser 500" , 0)
-COMP( 1985, laser700, laser350, 0,      laser700, laser500, vtech2_state, init_laser, "Video Technology", "Laser 700" , 0)
+COMP( 1985, laser350, 0,        0,      laser350, laser350, vtech2_state, init_laser, "Video Technology", "Laser 350" , MACHINE_SUPPORTS_SAVE )
+COMP( 1985, laser500, laser350, 0,      laser500, laser500, vtech2_state, init_laser, "Video Technology", "Laser 500" , MACHINE_SUPPORTS_SAVE )
+COMP( 1985, laser700, laser350, 0,      laser700, laser500, vtech2_state, init_laser, "Video Technology", "Laser 700" , MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/williams.cpp mame-0.224+dfsg.1/src/mame/drivers/williams.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/williams.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/williams.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -541,7 +541,7 @@
 void mayday_state::main_map(address_map &map)
 {
 	defender_state::main_map(map);
-	/* install a handler to catch protection checks */
+	// install a handler to catch protection checks
 	map(0xa190, 0xa191).r(FUNC(mayday_state::protection_r));
 }
 
@@ -593,7 +593,7 @@
 void bubbles_state::main_map(address_map &map)
 {
 	base_map(map);
-	/* bubbles has a full 8-bit-wide CMOS */
+	// bubbles has a full 8-bit-wide CMOS
 	map(0xcc00, 0xcfff).w(FUNC(bubbles_state::cmos_w)).share("nvram");
 }
 
@@ -606,12 +606,12 @@
 void spdball_state::main_map(address_map &map)
 {
 	base_map(map);
-	/* install extra input handlers */
+	// install extra input handlers
 	map(0xc800, 0xc800).portr("AN0");
 	map(0xc801, 0xc801).portr("AN1");
 	map(0xc802, 0xc802).portr("AN2");
 	map(0xc803, 0xc803).portr("AN3");
-	/* add a third PIA */
+	// add a third PIA
 	map(0xc808, 0xc80b).mirror(0x00f0).rw(m_pia[3], FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 }
 
@@ -682,7 +682,7 @@
 }
 
 
-/* mysticm and inferno: D000-DFFF is RAM */
+// mysticm and inferno: D000-DFFF is RAM
 void williams_d000_ram_state::d000_map(address_map &map)
 {
 	common_map(map);
@@ -691,7 +691,7 @@
 }
 
 
-/* tshoot and joust2: D000-DFFF is ROM */
+// tshoot and joust2: D000-DFFF is ROM
 void williams_d000_rom_state::d000_map(address_map &map)
 {
 	common_map(map);
@@ -708,7 +708,7 @@
 
 void defender_state::sound_map(address_map &map)
 {
-	map(0x0000, 0x007f).ram();     /* internal RAM */
+	map(0x0000, 0x007f).ram();     // internal RAM
 	map(0x0400, 0x0403).mirror(0x8000).rw(m_pia[2], FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 	map(0xb000, 0xffff).rom();
 }
@@ -716,8 +716,8 @@
 
 void williams_state::sound_map(address_map &map)
 {
-	map(0x0000, 0x007f).ram();     /* internal RAM */
-	map(0x0080, 0x00ff).ram();     /* MC6810 RAM */
+	map(0x0000, 0x007f).ram();     // internal RAM
+	map(0x0080, 0x00ff).ram();     // MC6810 RAM
 	map(0x0400, 0x0403).mirror(0x8000).rw(m_pia[2], FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 	map(0xb000, 0xffff).rom();
 }
@@ -725,8 +725,8 @@
 /* Same as above, but for second sound board */
 void blaster_state::sound2_map(address_map &map)
 {
-	map(0x0000, 0x007f).ram();     /* internal RAM */
-	map(0x0080, 0x00ff).ram();     /* MC6810 RAM */
+	map(0x0000, 0x007f).ram();     // internal RAM
+	map(0x0080, 0x00ff).ram();     // MC6810 RAM
 	map(0x0400, 0x0403).mirror(0x8000).rw(m_pia[3], FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 	map(0xb000, 0xffff).rom();
 }
@@ -741,8 +741,8 @@
 
 void williams2_state::sound_map(address_map &map)
 {
-	map(0x0000, 0x007f).ram();     /* internal RAM */
-	map(0x0080, 0x00ff).ram();     /* MC6810 RAM */
+	map(0x0000, 0x007f).ram();     // internal RAM
+	map(0x0080, 0x00ff).ram();     // MC6810 RAM
 	map(0x2000, 0x2003).mirror(0x1ffc).rw(m_pia[2], FUNC(pia6821_device::read), FUNC(pia6821_device::write));
 	map(0xe000, 0xffff).rom();
 }
@@ -828,8 +828,8 @@
 	PORT_BIT( 0xfe, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 
 	PORT_START("IN2")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE4 ) PORT_NAME("Auto Up / Manual Down") PORT_TOGGLE /* Default to Auto Up */
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Advance") /* ? */
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_SERVICE4 ) PORT_NAME("Auto Up / Manual Down") PORT_TOGGLE // Default to Auto Up
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_SERVICE ) PORT_NAME("Advance") // ?
 	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_SERVICE1 ) PORT_NAME("Test Credit")
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -863,10 +863,10 @@
 	PORT_DIPSETTING(    0x02, "30k/50k" )       PORT_CONDITION("IN2",0x01,NOTEQUALS,0x01)
 	PORT_DIPSETTING(    0x00, "30k/50k" )       PORT_CONDITION("IN2",0x01,EQUALS,0x01)
 	PORT_DIPSETTING(    0x02, "40k/70k" )       PORT_CONDITION("IN2",0x01,EQUALS,0x01)
-	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ))       /* documented as unused */
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ))       // documented as unused
 	PORT_DIPSETTING(    0x04, DEF_STR( Off ))
 	PORT_DIPSETTING(    0x00, DEF_STR( On ))
-	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ))       /* documented as unused */
+	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ))       // documented as unused
 	PORT_DIPSETTING(    0x08, DEF_STR( Off ))
 	PORT_DIPSETTING(    0x00, DEF_STR( On ))
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_COIN1 )
@@ -1106,7 +1106,7 @@
 
 static INPUT_PORTS_START( sinistar )
 	PORT_START("IN0")
-	/* pseudo analog joystick, see below */
+	// pseudo analog joystick, see below
 
 	PORT_START("IN1")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 )
@@ -1125,10 +1125,10 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 
-	PORT_START("49WAYX")    /* converted by port_0_49way_r() */
+	PORT_START("49WAYX")    // converted by port_0_49way_r()
 	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
 
-	PORT_START("49WAYY")    /* converted by port_0_49way_r() */
+	PORT_START("49WAYY")    // converted by port_0_49way_r()
 	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE
 INPUT_PORTS_END
 
@@ -1187,17 +1187,17 @@
 	PORT_START("INP2")
 	PORT_BIT( 0x0f, IP_ACTIVE_HIGH, IPT_UNUSED )
 
-	PORT_START("49WAYX")    /* converted by port_0_49way_r() */
+	PORT_START("49WAYX")    // converted by port_0_49way_r()
 	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
 
-	PORT_START("49WAYY")    /* converted by port_0_49way_r() */
+	PORT_START("49WAYY")    // converted by port_0_49way_r()
 	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE
 INPUT_PORTS_END
 
 
 static INPUT_PORTS_START( blastkit )
 	PORT_START("IN0")
-	/* pseudo analog joystick, see below */
+	// pseudo analog joystick, see below
 
 	PORT_START("IN1")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 )
@@ -1213,10 +1213,10 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_TILT )
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_UNKNOWN )
 
-	PORT_START("49WAYX")    /* converted by port_0_49way_r() */
+	PORT_START("49WAYX")    // converted by port_0_49way_r()
 	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_X ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10)
 
-	PORT_START("49WAYY")    /* converted by port_0_49way_r() */
+	PORT_START("49WAYY")    // converted by port_0_49way_r()
 	PORT_BIT( 0xff, 0x38, IPT_AD_STICK_Y ) PORT_MINMAX(0x00,0x6f) PORT_SENSITIVITY(100) PORT_KEYDELTA(10) PORT_REVERSE
 
 	PORT_START("IN3")
@@ -1265,16 +1265,16 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
 
-	PORT_START("AN0")       /* analog */
+	PORT_START("AN0")       // analog
 	PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(1)
 
-	PORT_START("AN1")       /* analog */
+	PORT_START("AN1")       // analog
 	PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_PLAYER(1)
 
-	PORT_START("AN2")       /* analog */
+	PORT_START("AN2")       // analog
 	PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(2)
 
-	PORT_START("AN3")       /* analog */
+	PORT_START("AN3")       // analog
 	PORT_BIT( 0xff, 0x00, IPT_TRACKBALL_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_PLAYER(2)
 INPUT_PORTS_END
 
@@ -1355,7 +1355,7 @@
 	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
 	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_START1 )
 	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_START2 )
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) /* Key */
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_UNUSED ) // Key
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON1 )
 
 	PORT_START("IN1")
@@ -1386,7 +1386,7 @@
 	PORT_START("IN1")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_NAME("Grenade")
 	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Gobble")
-	PORT_BIT( 0x3c, IP_ACTIVE_HIGH, IPT_UNUSED ) /* 0011-1100 output */
+	PORT_BIT( 0x3c, IP_ACTIVE_HIGH, IPT_UNUSED ) // 0011-1100 output
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_START1 )
 	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_START2 )
 
@@ -1534,7 +1534,7 @@
 
 void williams_state::williams_base(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	MC6809E(config, m_maincpu, MASTER_CLOCK/3/4);
 	m_maincpu->set_addrmap(AS_PROGRAM, &williams_state::base_map);
 
@@ -1551,7 +1551,7 @@
 
 	WATCHDOG_TIMER(config, m_watchdog);
 
-	/* video hardware */
+	// video hardware
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
 	m_screen->set_video_attributes(VIDEO_UPDATE_SCANLINE | VIDEO_ALWAYS_UPDATE);
 	m_screen->set_raw(MASTER_CLOCK*2/3, 512, 6, 298, 260, 7, 247);
@@ -1559,14 +1559,14 @@
 
 	PALETTE(config, m_palette, FUNC(williams_state::palette_init), 256);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "speaker").front_center();
 	MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.25); // mc1408.ic6
 	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
 	vref.add_route(0, "dac", 1.0, DAC_VREF_POS_INPUT);
 	vref.add_route(0, "dac", -1.0, DAC_VREF_NEG_INPUT);
 
-	/* pia */
+	// pia
 	INPUT_MERGER_ANY_HIGH(config, "mainirq").output_handler().set_inputline(m_maincpu, M6809_IRQ_LINE);
 
 	INPUT_MERGER_ANY_HIGH(config, "soundirq").output_handler().set_inputline(m_soundcpu, M6808_IRQ_LINE);
@@ -1592,7 +1592,7 @@
 {
 	williams_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 
 	m_maincpu->set_addrmap(AS_PROGRAM, &defender_state::main_map);
 	m_soundcpu->set_addrmap(AS_PROGRAM, &defender_state::sound_map);
@@ -1606,7 +1606,7 @@
 void defender_state::jin(machine_config &config)  // needs a different screen size or the credit text is clipped
 {
 	defender(config);
-	/* basic machine hardware */
+	// basic machine hardware
 	m_screen->set_visarea(0, 315, 7, 247-1);
 }
 
@@ -1615,9 +1615,9 @@
 {
 	williams_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 
-	/* pia */
+	// pia
 	m_pia[0]->readpa_handler().set_ioport("IN0").mask(0x30);
 	m_pia[0]->readpa_handler().append("mux_0", FUNC(ls157_device::output_r)).mask(0x0f);
 	m_pia[0]->readpa_handler().append("mux_1", FUNC(ls157_device::output_r)).lshift(6).mask(0xc0);
@@ -1640,10 +1640,10 @@
 {
 	williams_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &spdball_state::main_map);
 
-	/* pia */
+	// pia
 	PIA6821(config, m_pia[3], 0);
 	m_pia[3]->readpa_handler().set_ioport("IN3");
 	m_pia[3]->readpb_handler().set_ioport("IN4");
@@ -1654,9 +1654,9 @@
 {
 	williams_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 
-	/* pia */
+	// pia
 	m_pia[0]->writepa_handler().set("ticket", FUNC(ticket_dispenser_device::motor_w)).bit(7);
 	m_pia[0]->ca2_handler().set(FUNC(williams_state::lottofun_coin_lock_w));
 
@@ -1668,13 +1668,13 @@
 {
 	williams_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &sinistar_state::main_map);
 
-	/* sound hardware */
+	// sound hardware
 	HC55516(config, "cvsd", 0).add_route(ALL_OUTPUTS, "speaker", 0.8);
 
-	/* pia */
+	// pia
 	m_pia[0]->readpa_handler().set(FUNC(williams_state::port_0_49way_r));
 
 	m_pia[2]->ca2_handler().set("cvsd", FUNC(hc55516_device::digit_w));
@@ -1686,7 +1686,7 @@
 {
 	williams_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &bubbles_state::main_map);
 }
 
@@ -1695,15 +1695,15 @@
 {
 	williams_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 
-	/* video hardware */
+	// video hardware
 	m_screen->set_visarea(6, 298-1, 8, 240-1);
 
-	/* sound hardware */
+	// sound hardware
 	HC55516(config, "cvsd", 0).add_route(ALL_OUTPUTS, "speaker", 0.8);
 
-	/* pia */
+	// pia
 	m_pia[1]->writepb_handler().set(FUNC(playball_state::snd_cmd_w));
 
 	m_pia[2]->ca2_handler().set("cvsd", FUNC(hc55516_device::digit_w));
@@ -1715,13 +1715,13 @@
 {
 	williams_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &blaster_state::main_map);
 
-	/* video hardware */
+	// video hardware
 	m_screen->set_screen_update(FUNC(blaster_state::screen_update));
 
-	/* pia */
+	// pia
 	m_pia[0]->readpa_handler().set("mux_a", FUNC(ls157_x2_device::output_r));
 	m_pia[0]->cb2_handler().set("mux_a", FUNC(ls157_x2_device::select_w));
 
@@ -1737,11 +1737,11 @@
 {
 	blastkit(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	M6808(config, m_soundcpu_b, SOUND_CLOCK); // internal clock divider of 4, effective frequency is 894.886kHz
 	m_soundcpu_b->set_addrmap(AS_PROGRAM, &blaster_state::sound2_map);
 
-	/* pia */
+	// pia
 	m_pia[0]->readpb_handler().set("mux_b", FUNC(ls157_device::output_r)).mask(0x0f);
 	m_pia[0]->readpb_handler().append_ioport("IN1").mask(0xf0);
 	m_pia[0]->cb2_handler().set("mux_a", FUNC(ls157_x2_device::select_w));
@@ -1766,7 +1766,7 @@
 	m_pia[3]->irqa_handler().set("soundirq_b", FUNC(input_merger_any_high_device::in_w<0>));
 	m_pia[3]->irqb_handler().set("soundirq_b", FUNC(input_merger_any_high_device::in_w<1>));
 
-	/* sound hardware */
+	// sound hardware
 	config.device_remove("speaker");
 	config.device_remove("dac");
 	config.device_remove("vref");
@@ -1783,10 +1783,10 @@
 
 void williams2_state::williams2_base(machine_config &config)
 {
-	/* basic machine hardware */
+	// basic machine hardware
 	MC6809E(config, m_maincpu, MASTER_CLOCK/3/4);
 
-	M6808(config, m_soundcpu, MASTER_CLOCK/3); /* yes, this is different from the older games */
+	M6808(config, m_soundcpu, MASTER_CLOCK/3); // yes, this is different from the older games
 	m_soundcpu->set_addrmap(AS_PROGRAM, &williams2_state::sound_map);
 
 	ADDRESS_MAP_BANK(config, "bank8000").set_map(&williams2_state::bank8000_map).set_options(ENDIANNESS_BIG, 8, 12, 0x800);
@@ -1801,7 +1801,7 @@
 
 	WATCHDOG_TIMER(config, m_watchdog);
 
-	/* video hardware */
+	// video hardware
 	PALETTE(config, m_palette).set_entries(1024);
 	GFXDECODE(config, m_gfxdecode, m_palette, gfx_williams2);
 
@@ -1810,7 +1810,7 @@
 	m_screen->set_raw(MASTER_CLOCK*2/3, 512, 8, 284, 260, 8, 248);
 	m_screen->set_screen_update(FUNC(williams2_state::screen_update));
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "speaker").front_center();
 	MC1408(config, "dac", 0).add_route(ALL_OUTPUTS, "speaker", 0.5); // unknown DAC
 	voltage_regulator_device &vref(VOLTAGE_REGULATOR(config, "vref"));
@@ -1820,7 +1820,7 @@
 	INPUT_MERGER_ANY_HIGH(config, "mainirq").output_handler().set_inputline(m_maincpu, M6809_IRQ_LINE);
 	INPUT_MERGER_ANY_HIGH(config, "soundirq").output_handler().set_inputline(m_soundcpu, M6808_IRQ_LINE);
 
-	/* pia */
+	// pia
 	PIA6821(config, m_pia[0], 0);
 	m_pia[0]->readpa_handler().set_ioport("IN0");
 	m_pia[0]->readpb_handler().set_ioport("IN1");
@@ -1846,7 +1846,7 @@
 	williams2_base(config);
 	m_maincpu->set_addrmap(AS_PROGRAM, &inferno_state::d000_map);
 
-	/* pia */
+	// pia
 	m_pia[0]->readpa_handler().set("mux", FUNC(ls157_x2_device::output_r));
 	m_pia[0]->ca2_handler().set("mux", FUNC(ls157_x2_device::select_w));
 
@@ -1863,7 +1863,7 @@
 	m_screen->set_raw(MASTER_CLOCK*2/3, 512, 8, 284, 256, 8, 248);
 	m_screen->set_screen_update(FUNC(mysticm_state::screen_update));
 
-	/* pia */
+	// pia
 	m_pia[0]->irqa_handler().set_inputline("maincpu", M6809_FIRQ_LINE);
 	m_pia[0]->irqb_handler().set("mainirq", FUNC(input_merger_any_high_device::in_w<0>));
 
@@ -1876,10 +1876,10 @@
 {
 	williams2_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &tshoot_state::d000_map);
 
-	/* pia */
+	// pia
 	m_pia[0]->readpa_handler().set("mux", FUNC(ls157_x2_device::output_r));
 	m_pia[0]->writepb_handler().set(FUNC(tshoot_state::lamp_w));
 	m_pia[0]->ca2_handler().set("mux", FUNC(ls157_x2_device::select_w));
@@ -1901,12 +1901,12 @@
 {
 	williams2_base(config);
 
-	/* basic machine hardware */
+	// basic machine hardware
 	m_maincpu->set_addrmap(AS_PROGRAM, &joust2_state::d000_map);
 
 	WILLIAMS_CVSD_SOUND(config, m_cvsd_sound).add_route(ALL_OUTPUTS, "speaker", 1.0);
 
-	/* pia */
+	// pia
 	m_pia[0]->readpa_handler().set_ioport("IN0").mask(0xf0);
 	m_pia[0]->readpa_handler().append("mux", FUNC(ls157_device::output_r)).mask(0x0f);
 	m_pia[0]->ca2_handler().set("mux", FUNC(ls157_device::select_w));
@@ -1994,7 +1994,7 @@
 	ROM_LOAD( "decoder.1",   0x0000, 0x0200, CRC(8dd98da5) SHA1(da979604f7a2aa8b5a6d4a5debd2e80f77569e35) )
 ROM_END
 
-/* the white set seems to be the source of the defcmnd & startrkd bootlegs */
+// the white set seems to be the source of the defcmnd & startrkd bootlegs
 ROM_START( defenderw )
 	ROM_REGION( 0x19000, "maincpu", 0 )
 	ROM_LOAD( "rom1.bin",     0x0d000, 0x1000, CRC(5af871e3) SHA1(f9a42619b37db2eb07d0302ac9d0ff5c1923c21d) )
@@ -2061,7 +2061,7 @@
 	ROM_CONTINUE ( 0x000, 0x800 ) // cut rom instead?
 ROM_END
 
-/* I suspect this one is a bad dump */
+// I suspect this one is a bad dump
 ROM_START( tornado2 )
 	ROM_REGION( 0x19000, "maincpu", 0 )
 	ROM_LOAD( "tto15.bin", 0x0d000, 0x1000, BAD_DUMP CRC(910ac603) SHA1(33705b5ce4242a5865a8b4ecf27aa9e656067ea3) ) //  1ST AND 2ND HALF IDENTICAL
@@ -2396,6 +2396,29 @@
 	ROM_LOAD( "decoder.6",   0x0200, 0x0200, CRC(83faf25e) SHA1(30002643d08ed983a6701a7c4b5ee74a2f4a1adb) )
 ROM_END
 
+ROM_START( robotronun )
+	ROM_REGION( 0x19000, "maincpu", 0 )
+	ROM_LOAD( "roboun11.10b", 0x0d000, 0x1000, CRC(13797024) SHA1(d426a50e75dabe936de643c83a548da5e399331c) )
+	ROM_LOAD( "roboun11.11b", 0x0e000, 0x1000, CRC(7e3c1b87) SHA1(f8c6cbe3688f256f41a121255fc08f575f6a4b4f) )
+	ROM_LOAD( "roboun11.12b", 0x0f000, 0x1000, CRC(645d543e) SHA1(fad7cea868ebf17347c4bc5193d647bbd8f9517b) )
+	ROM_LOAD( "roboun11.1b",  0x10000, 0x1000, CRC(66c7d3ef) SHA1(f6d60e26c209c1df2cc01ac07ad5559daa1b7118) )
+	ROM_LOAD( "roboun11.2b",  0x11000, 0x1000, CRC(5bc6c614) SHA1(4d6e82bc29f49100f7751ccfc6a9ff35695b84b3) )
+	ROM_LOAD( "roboun11.3b",  0x12000, 0x1000, CRC(e99a82be) SHA1(06a8c8dd0b4726eb7f0bb0e89c8533931d75fc1c) )
+	ROM_LOAD( "roboun11.4b",  0x13000, 0x1000, CRC(afb1c561) SHA1(aaf89c19fd8f4e8750717169eb1af476aef38a5e) )
+	ROM_LOAD( "roboun11.5b",  0x14000, 0x1000, CRC(62691e77) SHA1(79b4680ce19bd28882ae823f0e7b293af17cbb91) )
+	ROM_LOAD( "roboun11.6b",  0x15000, 0x1000, CRC(bd2c853d) SHA1(f76ec5432a7939b33a27be1c6855e2dbe6d9fdc8) )
+	ROM_LOAD( "roboun11.7b",  0x16000, 0x1000, CRC(8981a43b) SHA1(8ecab99093d42cb66e177dfa7cf7e352667930ca) )
+	ROM_LOAD( "roboun11.8b",  0x17000, 0x1000, CRC(3a96e88c) SHA1(7ae38a609ed9a6f62ca003cab719740ed7651b7c) )
+	ROM_LOAD( "roboun11.9b",  0x18000, 0x1000, CRC(b124367b) SHA1(fd9d75b866f0ebbb723f84889337e6814496a103) )
+
+	ROM_REGION( 0x10000, "soundcpu", 0 )
+	ROM_LOAD( "roboun11.snd", 0xf000, 0x1000, CRC(c56c1d28) SHA1(15afefef11bfc3ab78f61ab046701db78d160ec3) )
+
+	ROM_REGION( 0x0400, "proms", 0 )
+	ROM_LOAD( "decoder.4",   0x0000, 0x0200, CRC(e6631c23) SHA1(9988723269367fb44ef83f627186a1c88cf7877e) )
+	ROM_LOAD( "decoder.6",   0x0200, 0x0200, CRC(83faf25e) SHA1(30002643d08ed983a6701a7c4b5ee74a2f4a1adb) )
+ROM_END
+
 ROM_START( robotron87 )
 	ROM_REGION( 0x19000, "maincpu", 0 )
 	ROM_LOAD( "robotron.sba", 0x0d000, 0x1000, CRC(13797024) SHA1(d426a50e75dabe936de643c83a548da5e399331c) )
@@ -2634,82 +2657,130 @@
 ROM_END
 
 
-ROM_START( sinistar )
-	ROM_REGION( 0x19000, "maincpu", 0 )
-	ROM_LOAD( "sinistar.10",  0x0e000, 0x1000, CRC(3d670417) SHA1(81802622bee8dbea5c0f08019d87d941dcdbe292) )
-	ROM_LOAD( "sinistar.11",  0x0f000, 0x1000, CRC(3162bc50) SHA1(2f38e572ab9c731e38dfe9bad3cc8222a775c5ea) )
-	ROM_LOAD( "sinistar.01",  0x10000, 0x1000, CRC(f6f3a22c) SHA1(026d8cab07734fa294a5645edbe65a904bcbc302) )
-	ROM_LOAD( "sinistar.02",  0x11000, 0x1000, CRC(cab3185c) SHA1(423d1e3b0c07333ec582529bc4d0b7baf591820a) )
-	ROM_LOAD( "sinistar.03",  0x12000, 0x1000, CRC(1ce1b3cc) SHA1(5bc03d7249529d827dc60c087e074ab3e4ea7361) )
-	ROM_LOAD( "sinistar.04",  0x13000, 0x1000, CRC(6da632ba) SHA1(72c0c3d5a5ca87ca4d95fcedaf834206e4633950) )
-	ROM_LOAD( "sinistar.05",  0x14000, 0x1000, CRC(b662e8fc) SHA1(828a89d2ea13d8a362dae708f86bff54cb231887) )
-	ROM_LOAD( "sinistar.06",  0x15000, 0x1000, CRC(2306183d) SHA1(703e29e6446856615760a4897c0f5d79cc7bdfb2) )
-	ROM_LOAD( "sinistar.07",  0x16000, 0x1000, CRC(e5dd918e) SHA1(bf4e2ada6a59d246218544d822ba5355da925924) )
-	ROM_LOAD( "sinistar.08",  0x17000, 0x1000, CRC(4785a787) SHA1(8c7eca656b2c23b0da41a8c7ce51a2735cab85a4) )
-	ROM_LOAD( "sinistar.09",  0x18000, 0x1000, CRC(50cb63ad) SHA1(96e28e4fef98fff2649741a266fa590e0313e3b0) )
-
-	ROM_REGION( 0x10000, "soundcpu", 0 )
-	ROM_LOAD( "speech.ic7",   0xb000, 0x1000, CRC(e1019568) SHA1(442f4f3ccd2e1db2136d2ffb121ea442921f87ca) )
-	ROM_LOAD( "speech.ic5",   0xc000, 0x1000, CRC(cf3b5ffd) SHA1(d5d51c550581c9d46ab331dd4fd32541a2ef598e) )
-	ROM_LOAD( "speech.ic6",   0xd000, 0x1000, CRC(ff8d2645) SHA1(16fa2a602acbbc182dd96bab113ab18356f3daf0) )
-	ROM_LOAD( "speech.ic4",   0xe000, 0x1000, CRC(4b56a626) SHA1(44430cd5c110ec751b0bfb8ae99b26d443350db1) )
-	ROM_LOAD( "sinistar.snd", 0xf000, 0x1000, CRC(b82f4ddb) SHA1(c70c7dd6e88897920d7709a260f27810f66aade1) )
+/*
+Sinistar
 
-	ROM_REGION( 0x0400, "proms", 0 )
-	ROM_LOAD( "decoder.4",   0x0000, 0x0200, CRC(e6631c23) SHA1(9988723269367fb44ef83f627186a1c88cf7877e) )
-	ROM_LOAD( "decoder.6",   0x0200, 0x0200, CRC(83faf25e) SHA1(30002643d08ed983a6701a7c4b5ee74a2f4a1adb) )
-ROM_END
+Multiple different ROM boards are known to exist:
 
-ROM_START( sinistar1 )
-	ROM_REGION( 0x19000, "maincpu", 0 )
-	ROM_LOAD( "sinrev1.10",   0x0e000, 0x1000, CRC(ea87a53f) SHA1(4e4bad5315a8f5740c926ee5681879919a5be37f) )
-	ROM_LOAD( "sinrev1.11",   0x0f000, 0x1000, CRC(88d36e80) SHA1(bb9adaf5b73f9874e52dc2f5fd35e22f8b4fc258) )
-	ROM_LOAD( "sinrev1.01",   0x10000, 0x1000, CRC(3810d7b8) SHA1(dcd690cbc958a2f97f022765315d77fb7c7d8e8b) )
-	ROM_LOAD( "sinistar.02",  0x11000, 0x1000, CRC(cab3185c) SHA1(423d1e3b0c07333ec582529bc4d0b7baf591820a) )
-	ROM_LOAD( "sinrev1.03",   0x12000, 0x1000, CRC(7c984ca9) SHA1(b32b7d15194051db5d29acf95b049e2eccf6d393) )
-	ROM_LOAD( "sinrev1.04",   0x13000, 0x1000, CRC(cc6c4f24) SHA1(b4375544e02a19458c6fcc85edb31025c0b8eb71) )
-	ROM_LOAD( "sinrev1.05",   0x14000, 0x1000, CRC(12285bfe) SHA1(6d433103332ddda2f2af23febc0b15aa93db1f31) )
-	ROM_LOAD( "sinrev1.06",   0x15000, 0x1000, CRC(7a675f35) SHA1(3a7e9fdb2aef52dc29d33799694737038802b6e0) )
-	ROM_LOAD( "sinrev1.07",   0x16000, 0x1000, CRC(b0463243) SHA1(95d597856a1942bd176f5f62db0d691f8f2f2932) )
-	ROM_LOAD( "sinrev1.08",   0x17000, 0x1000, CRC(909040d4) SHA1(5361cc378bdace0799227e901341747dce9bb029) )
-	ROM_LOAD( "sinrev1.09",   0x18000, 0x1000, CRC(cc949810) SHA1(2d2d1cccd7e43b63e424c34ab5215a412e2b9809) )
-
-	ROM_REGION( 0x10000, "soundcpu", 0 )
-	ROM_LOAD( "speech.ic7",   0xb000, 0x1000, CRC(e1019568) SHA1(442f4f3ccd2e1db2136d2ffb121ea442921f87ca) )
-	ROM_LOAD( "speech.ic5",   0xc000, 0x1000, CRC(cf3b5ffd) SHA1(d5d51c550581c9d46ab331dd4fd32541a2ef598e) )
-	ROM_LOAD( "speech.ic6",   0xd000, 0x1000, CRC(ff8d2645) SHA1(16fa2a602acbbc182dd96bab113ab18356f3daf0) )
-	ROM_LOAD( "speech.ic4",   0xe000, 0x1000, CRC(4b56a626) SHA1(44430cd5c110ec751b0bfb8ae99b26d443350db1) )
-	ROM_LOAD( "sinistar.snd", 0xf000, 0x1000, CRC(b82f4ddb) SHA1(c70c7dd6e88897920d7709a260f27810f66aade1) )
+Rev.3:
+ ROM board known to come with final production rev. 2 labels with corresponding part numbers and two rev. 3
+ upgrade ROMs: white labels and orange stripe:
+
+    SINISTAR          SINISTAR
+    ROM 8-B    and    ROM 11-B
+    REV. 3            REV. 3
+
+ ROM board known to come with all rev. 2 upgrade ROMs (as described below): white labels and red stripe plus the
+ two rev. 3 upgrade ROMs as described above
+
+Rev.2:
+ Earlier ROM boards known to have all upgrade styled labels, white with red stripe, in the format:
+
+  SINISTAR
+  ROM  1-B
+  REV. 2
+
+Although not currently dumped, "true" rev.1 Sinistar ROMs are believed to be numbered 16-3004-23 through 16-3004-33,
+  with speech ROMs 16-3004-34 through 16-3004-37  (labels believed to be solid brown)
+There is known to be a "perfect" version of Sinistar, that being the original version presented to Williams by the
+  dev team. The dev team thought this version had the best game play while Williams decided it was too easy (IE: it
+  could be played too long on one quarter)
+
+*/
+ROM_START( sinistar ) // rev. 3
+	ROM_REGION( 0x19000, "maincpu", 0 ) // solid RED labels with final production part numbers
+	ROM_LOAD( "sinistar_rom_10-b_16-3004-62.4c", 0x0e000, 0x1000, CRC(3d670417) SHA1(81802622bee8dbea5c0f08019d87d941dcdbe292) )
+	ROM_LOAD( "sinistar_rom_11-b_16-3004-63.4a", 0x0f000, 0x1000, CRC(3162bc50) SHA1(2f38e572ab9c731e38dfe9bad3cc8222a775c5ea) )
+	ROM_LOAD( "sinistar_rom_1-b_16-3004-53.1d",  0x10000, 0x1000, CRC(f6f3a22c) SHA1(026d8cab07734fa294a5645edbe65a904bcbc302) )
+	ROM_LOAD( "sinistar_rom_2-b_16-3004-54.1c",  0x11000, 0x1000, CRC(cab3185c) SHA1(423d1e3b0c07333ec582529bc4d0b7baf591820a) )
+	ROM_LOAD( "sinistar_rom_3-b_16-3004-55.1a",  0x12000, 0x1000, CRC(1ce1b3cc) SHA1(5bc03d7249529d827dc60c087e074ab3e4ea7361) )
+	ROM_LOAD( "sinistar_rom_4-b_16-3004-56.2d",  0x13000, 0x1000, CRC(6da632ba) SHA1(72c0c3d5a5ca87ca4d95fcedaf834206e4633950) )
+	ROM_LOAD( "sinistar_rom_5-b_16-3004-57.2c",  0x14000, 0x1000, CRC(b662e8fc) SHA1(828a89d2ea13d8a362dae708f86bff54cb231887) )
+	ROM_LOAD( "sinistar_rom_6-b_16-3004-58.2a",  0x15000, 0x1000, CRC(2306183d) SHA1(703e29e6446856615760a4897c0f5d79cc7bdfb2) )
+	ROM_LOAD( "sinistar_rom_7-b_16-3004-59.3d",  0x16000, 0x1000, CRC(e5dd918e) SHA1(bf4e2ada6a59d246218544d822ba5355da925924) )
+	ROM_LOAD( "sinistar_rom_8-b_16-3004-60.3c",  0x17000, 0x1000, CRC(4785a787) SHA1(8c7eca656b2c23b0da41a8c7ce51a2735cab85a4) )
+	ROM_LOAD( "sinistar_rom_9-b_16-3004-61.3a",  0x18000, 0x1000, CRC(50cb63ad) SHA1(96e28e4fef98fff2649741a266fa590e0313e3b0) )
+
+	ROM_REGION( 0x10000, "soundcpu", 0 )
+	ROM_LOAD( "3004_speech_ic7_r1_16-3004-52.ic7", 0xb000, 0x1000, CRC(e1019568) SHA1(442f4f3ccd2e1db2136d2ffb121ea442921f87ca) )
+	ROM_LOAD( "3004_speech_ic5_r1_16-3004-50.ic5", 0xc000, 0x1000, CRC(cf3b5ffd) SHA1(d5d51c550581c9d46ab331dd4fd32541a2ef598e) )
+	ROM_LOAD( "3004_speech_ic6_r1_16-3004-51.ic6", 0xd000, 0x1000, CRC(ff8d2645) SHA1(16fa2a602acbbc182dd96bab113ab18356f3daf0) )
+	ROM_LOAD( "3004_speech_ic4_r1_16-3004-49.ic4", 0xe000, 0x1000, CRC(4b56a626) SHA1(44430cd5c110ec751b0bfb8ae99b26d443350db1) )
+	ROM_LOAD( "video_sound_rom_9_std.808",         0xf000, 0x1000, CRC(b82f4ddb) SHA1(c70c7dd6e88897920d7709a260f27810f66aade1) )
+
+/*
+    ROM_REGION( 0x10000, "soundcpu_b", 0 ) // Stereo sound requires 2nd sound board as used in the cockpit version
+    ROM_LOAD( "3004_speech_ic7_r1_16-3004-52.ic7", 0xb000, 0x1000, CRC(e1019568) SHA1(442f4f3ccd2e1db2136d2ffb121ea442921f87ca) )
+    ROM_LOAD( "3004_speech_ic5_r1_16-3004-50.ic5", 0xc000, 0x1000, CRC(cf3b5ffd) SHA1(d5d51c550581c9d46ab331dd4fd32541a2ef598e) )
+    ROM_LOAD( "3004_speech_ic6_r1_16-3004-51.ic6", 0xd000, 0x1000, CRC(ff8d2645) SHA1(16fa2a602acbbc182dd96bab113ab18356f3daf0) )
+    ROM_LOAD( "3004_speech_ic4_r1_16-3004-49.ic4", 0xe000, 0x1000, CRC(4b56a626) SHA1(44430cd5c110ec751b0bfb8ae99b26d443350db1) )
+    ROM_LOAD( "sinistar_stereo_18-a.ic12",         0xf000, 0x1000, CRC(b5c70082) SHA1(643af087b57da3a71c68372c79c5777e0c1fbef7) ) // not sure if all speech ROMs need to be here too
+*/
+
+	ROM_REGION( 0x0400, "proms", 0 )
+	ROM_LOAD( "a-5342-09694.3c",   0x0000, 0x0200, CRC(e6631c23) SHA1(9988723269367fb44ef83f627186a1c88cf7877e) ) // Decoder PROM 4 - Horizontal - 7641-5 BPROM
+	ROM_LOAD( "a-5342-09821.3g",   0x0200, 0x0200, CRC(83faf25e) SHA1(30002643d08ed983a6701a7c4b5ee74a2f4a1adb) ) // Decoder PROM 6 - Vertical - 7641-5 BPROM
+ROM_END
+
+ROM_START( sinistar2 ) // rev. 2
+	ROM_REGION( 0x19000, "maincpu", 0 ) // solid RED labels with final production part numbers
+	ROM_LOAD( "sinistar_rom_10-b_16-3004-47.4c", 0x0e000, 0x1000, CRC(3d670417) SHA1(81802622bee8dbea5c0f08019d87d941dcdbe292) ) //  == rev. 3 PN 16-3004-62
+	ROM_LOAD( "sinistar_rom_11-b_16-3004-48.4a", 0x0f000, 0x1000, CRC(792c8b00) SHA1(1f847ca8a67595927c36d69cead02813c2431c7b) ) //  unique to rev. 2
+	ROM_LOAD( "sinistar_rom_1-b_16-3004-38.1d",  0x10000, 0x1000, CRC(f6f3a22c) SHA1(026d8cab07734fa294a5645edbe65a904bcbc302) ) //  == rev. 3 PN 16-3004-53
+	ROM_LOAD( "sinistar_rom_2-b_16-3004-39.1c",  0x11000, 0x1000, CRC(cab3185c) SHA1(423d1e3b0c07333ec582529bc4d0b7baf591820a) ) //  == rev. 3 PN 16-3004-54
+	ROM_LOAD( "sinistar_rom_3-b_16-3004-40.1a",  0x12000, 0x1000, CRC(1ce1b3cc) SHA1(5bc03d7249529d827dc60c087e074ab3e4ea7361) ) //  == rev. 3 PN 16-3004-55
+	ROM_LOAD( "sinistar_rom_4-b_16-3004-41.2d",  0x13000, 0x1000, CRC(6da632ba) SHA1(72c0c3d5a5ca87ca4d95fcedaf834206e4633950) ) //  == rev. 3 PN 16-3004-56
+	ROM_LOAD( "sinistar_rom_5-b_16-3004-42.2c",  0x14000, 0x1000, CRC(b662e8fc) SHA1(828a89d2ea13d8a362dae708f86bff54cb231887) ) //  == rev. 3 PN 16-3004-57
+	ROM_LOAD( "sinistar_rom_6-b_16-3004-43.2a",  0x15000, 0x1000, CRC(2306183d) SHA1(703e29e6446856615760a4897c0f5d79cc7bdfb2) ) //  == rev. 3 PN 16-3004-57
+	ROM_LOAD( "sinistar_rom_7-b_16-3004-44.3d",  0x16000, 0x1000, CRC(e5dd918e) SHA1(bf4e2ada6a59d246218544d822ba5355da925924) ) //  == rev. 3 PN 16-3004-59
+	ROM_LOAD( "sinistar_rom_8-b_16-3004-45.3c",  0x17000, 0x1000, CRC(d7ecee45) SHA1(f9552035409bce0a36ed93a677b28f8cd361f8f1) ) //  unique to rev. 2
+	ROM_LOAD( "sinistar_rom_9-b_16-3004-46.3a",  0x18000, 0x1000, CRC(50cb63ad) SHA1(96e28e4fef98fff2649741a266fa590e0313e3b0) ) //  == rev. 3 PN 16-3004-61
+
+	ROM_REGION( 0x10000, "soundcpu", 0 )
+	ROM_LOAD( "3004_speech_ic7_r1_16-3004-52.ic7", 0xb000, 0x1000, CRC(e1019568) SHA1(442f4f3ccd2e1db2136d2ffb121ea442921f87ca) )
+	ROM_LOAD( "3004_speech_ic5_r1_16-3004-50.ic5", 0xc000, 0x1000, CRC(cf3b5ffd) SHA1(d5d51c550581c9d46ab331dd4fd32541a2ef598e) )
+	ROM_LOAD( "3004_speech_ic6_r1_16-3004-51.ic6", 0xd000, 0x1000, CRC(ff8d2645) SHA1(16fa2a602acbbc182dd96bab113ab18356f3daf0) )
+	ROM_LOAD( "3004_speech_ic4_r1_16-3004-49.ic4", 0xe000, 0x1000, CRC(4b56a626) SHA1(44430cd5c110ec751b0bfb8ae99b26d443350db1) )
+	ROM_LOAD( "video_sound_rom_9_std.808",         0xf000, 0x1000, CRC(b82f4ddb) SHA1(c70c7dd6e88897920d7709a260f27810f66aade1) )
+
+/*
+    ROM_REGION( 0x10000, "soundcpu_b", 0 ) // Stereo sound requires 2nd sound board as used in the cockpit version
+    ROM_LOAD( "3004_speech_ic7_r1_16-3004-52.ic7", 0xb000, 0x1000, CRC(e1019568) SHA1(442f4f3ccd2e1db2136d2ffb121ea442921f87ca) )
+    ROM_LOAD( "3004_speech_ic5_r1_16-3004-50.ic5", 0xc000, 0x1000, CRC(cf3b5ffd) SHA1(d5d51c550581c9d46ab331dd4fd32541a2ef598e) )
+    ROM_LOAD( "3004_speech_ic6_r1_16-3004-51.ic6", 0xd000, 0x1000, CRC(ff8d2645) SHA1(16fa2a602acbbc182dd96bab113ab18356f3daf0) )
+    ROM_LOAD( "3004_speech_ic4_r1_16-3004-49.ic4", 0xe000, 0x1000, CRC(4b56a626) SHA1(44430cd5c110ec751b0bfb8ae99b26d443350db1) )
+    ROM_LOAD( "sinistar_stereo_18-a.ic12",         0xf000, 0x1000, CRC(b5c70082) SHA1(643af087b57da3a71c68372c79c5777e0c1fbef7) ) // not sure if all speech ROMs need to be here too
+*/
+
+	ROM_REGION( 0x0400, "proms", 0 )
+	ROM_LOAD( "a-5342-09694.3c",   0x0000, 0x0200, CRC(e6631c23) SHA1(9988723269367fb44ef83f627186a1c88cf7877e) ) // Decoder PROM 4 - Horizontal - 7641-5 BPROM
+	ROM_LOAD( "a-5342-09821.3g",   0x0200, 0x0200, CRC(83faf25e) SHA1(30002643d08ed983a6701a7c4b5ee74a2f4a1adb) ) // Decoder PROM 6 - Vertical - 7641-5 BPROM
+ROM_END
+
+ROM_START( sinistarp ) // solid pink labels - 1982 AMOA prototype
+	ROM_REGION( 0x19000, "maincpu", 0 )
+	ROM_LOAD( "sinistar_rom_10-b_16-3004-21.4c", 0x0e000, 0x1000, CRC(ea87a53f) SHA1(4e4bad5315a8f5740c926ee5681879919a5be37f) )
+	ROM_LOAD( "sinistar_rom_11-b_16-3004-22.4a", 0x0f000, 0x1000, CRC(88d36e80) SHA1(bb9adaf5b73f9874e52dc2f5fd35e22f8b4fc258) )
+	ROM_LOAD( "sinistar_rom_1-b_16-3004-12.1d",  0x10000, 0x1000, CRC(3810d7b8) SHA1(dcd690cbc958a2f97f022765315d77fb7c7d8e8b) )
+	ROM_LOAD( "sinistar_rom_2-b_16-3004-13.1c",  0x11000, 0x1000, CRC(cab3185c) SHA1(423d1e3b0c07333ec582529bc4d0b7baf591820a) ) // only this one ROM remains the same through to rev. 3
+	ROM_LOAD( "sinistar_rom_3-b_16-3004-14.1a",  0x12000, 0x1000, CRC(7c984ca9) SHA1(b32b7d15194051db5d29acf95b049e2eccf6d393) )
+	ROM_LOAD( "sinistar_rom_4-b_16-3004-15.2d",  0x13000, 0x1000, CRC(cc6c4f24) SHA1(b4375544e02a19458c6fcc85edb31025c0b8eb71) )
+	ROM_LOAD( "sinistar_rom_5-b_16-3004-16.2c",  0x14000, 0x1000, CRC(12285bfe) SHA1(6d433103332ddda2f2af23febc0b15aa93db1f31) )
+	ROM_LOAD( "sinistar_rom_6-b_16-3004-17.2a",  0x15000, 0x1000, CRC(7a675f35) SHA1(3a7e9fdb2aef52dc29d33799694737038802b6e0) )
+	ROM_LOAD( "sinistar_rom_7-b_16-3004-18.3d",  0x16000, 0x1000, CRC(b0463243) SHA1(95d597856a1942bd176f5f62db0d691f8f2f2932) )
+	ROM_LOAD( "sinistar_rom_8-b_16-3004-19.3c",  0x17000, 0x1000, CRC(909040d4) SHA1(5361cc378bdace0799227e901341747dce9bb029) )
+	ROM_LOAD( "sinistar_rom_9-b_16-3004-20.3a",  0x18000, 0x1000, CRC(cc949810) SHA1(2d2d1cccd7e43b63e424c34ab5215a412e2b9809) )
+
+	ROM_REGION( 0x10000, "soundcpu", 0 )
+	ROM_LOAD( "3004_speech_ic7_r1.ic7",    0xb000, 0x1000, CRC(e1019568) SHA1(442f4f3ccd2e1db2136d2ffb121ea442921f87ca) ) // same data as later sets, but no official part number assigned yet
+	ROM_LOAD( "3004_speech_ic5_r1.ic5",    0xc000, 0x1000, CRC(cf3b5ffd) SHA1(d5d51c550581c9d46ab331dd4fd32541a2ef598e) )
+	ROM_LOAD( "3004_speech_ic6_r1.ic6",    0xd000, 0x1000, CRC(ff8d2645) SHA1(16fa2a602acbbc182dd96bab113ab18356f3daf0) )
+	ROM_LOAD( "3004_speech_ic4_r1.ic4",    0xe000, 0x1000, CRC(4b56a626) SHA1(44430cd5c110ec751b0bfb8ae99b26d443350db1) )
+	ROM_LOAD( "video_sound_rom_9_std.808", 0xf000, 0x1000, CRC(b82f4ddb) SHA1(c70c7dd6e88897920d7709a260f27810f66aade1) )
 
 	ROM_REGION( 0x0400, "proms", 0 )
-	ROM_LOAD( "decoder.4",   0x0000, 0x0200, CRC(e6631c23) SHA1(9988723269367fb44ef83f627186a1c88cf7877e) )
-	ROM_LOAD( "decoder.6",   0x0200, 0x0200, CRC(83faf25e) SHA1(30002643d08ed983a6701a7c4b5ee74a2f4a1adb) )
-ROM_END
-
-ROM_START( sinistar2 )
-	ROM_REGION( 0x19000, "maincpu", 0 )
-	ROM_LOAD( "sinistar.10",  0x0e000, 0x1000, CRC(3d670417) SHA1(81802622bee8dbea5c0f08019d87d941dcdbe292) )
-	ROM_LOAD( "sinrev2.11",   0x0f000, 0x1000, CRC(792c8b00) SHA1(1f847ca8a67595927c36d69cead02813c2431c7b) )
-	ROM_LOAD( "sinistar.01",  0x10000, 0x1000, CRC(f6f3a22c) SHA1(026d8cab07734fa294a5645edbe65a904bcbc302) )
-	ROM_LOAD( "sinistar.02",  0x11000, 0x1000, CRC(cab3185c) SHA1(423d1e3b0c07333ec582529bc4d0b7baf591820a) )
-	ROM_LOAD( "sinistar.03",  0x12000, 0x1000, CRC(1ce1b3cc) SHA1(5bc03d7249529d827dc60c087e074ab3e4ea7361) )
-	ROM_LOAD( "sinistar.04",  0x13000, 0x1000, CRC(6da632ba) SHA1(72c0c3d5a5ca87ca4d95fcedaf834206e4633950) )
-	ROM_LOAD( "sinistar.05",  0x14000, 0x1000, CRC(b662e8fc) SHA1(828a89d2ea13d8a362dae708f86bff54cb231887) )
-	ROM_LOAD( "sinistar.06",  0x15000, 0x1000, CRC(2306183d) SHA1(703e29e6446856615760a4897c0f5d79cc7bdfb2) )
-	ROM_LOAD( "sinistar.07",  0x16000, 0x1000, CRC(e5dd918e) SHA1(bf4e2ada6a59d246218544d822ba5355da925924) )
-	ROM_LOAD( "sinrev2.08",   0x17000, 0x1000, CRC(d7ecee45) SHA1(f9552035409bce0a36ed93a677b28f8cd361f8f1) )
-	ROM_LOAD( "sinistar.09",  0x18000, 0x1000, CRC(50cb63ad) SHA1(96e28e4fef98fff2649741a266fa590e0313e3b0) )
-
-	ROM_REGION( 0x10000, "soundcpu", 0 )
-	ROM_LOAD( "speech.ic7",   0xb000, 0x1000, CRC(e1019568) SHA1(442f4f3ccd2e1db2136d2ffb121ea442921f87ca) )
-	ROM_LOAD( "speech.ic5",   0xc000, 0x1000, CRC(cf3b5ffd) SHA1(d5d51c550581c9d46ab331dd4fd32541a2ef598e) )
-	ROM_LOAD( "speech.ic6",   0xd000, 0x1000, CRC(ff8d2645) SHA1(16fa2a602acbbc182dd96bab113ab18356f3daf0) )
-	ROM_LOAD( "speech.ic4",   0xe000, 0x1000, CRC(4b56a626) SHA1(44430cd5c110ec751b0bfb8ae99b26d443350db1) )
-	ROM_LOAD( "sinistar.snd", 0xf000, 0x1000, CRC(b82f4ddb) SHA1(c70c7dd6e88897920d7709a260f27810f66aade1) )
-
-	ROM_REGION( 0x0400, "proms", 0 )
-	ROM_LOAD( "decoder.4",   0x0000, 0x0200, CRC(e6631c23) SHA1(9988723269367fb44ef83f627186a1c88cf7877e) )
-	ROM_LOAD( "decoder.6",   0x0200, 0x0200, CRC(83faf25e) SHA1(30002643d08ed983a6701a7c4b5ee74a2f4a1adb) )
+	ROM_LOAD( "a-5342-09694.3c",   0x0000, 0x0200, CRC(e6631c23) SHA1(9988723269367fb44ef83f627186a1c88cf7877e) ) // Decoder ROM 4 - Horizontal - 7641-5 BPROM
+	ROM_LOAD( "a-5342-09821.3g",   0x0200, 0x0200, CRC(83faf25e) SHA1(30002643d08ed983a6701a7c4b5ee74a2f4a1adb) ) // Decoder ROM 6 - Vertical - 7641-5 BPROM
 ROM_END
 
 
@@ -2764,7 +2835,7 @@
 	ROM_REGION( 0x10000, "soundcpu_b", 0 )
 	ROM_LOAD( "18.sb10",      0xf000, 0x1000, CRC(c33a3145) SHA1(6ffe2da7b70c0b576fbc1790a33eecdbb9ee3d02) )
 
-	ROM_REGION( 0x0c00, "proms", 0 )        /* color & video-decoder PROM data */
+	ROM_REGION( 0x0c00, "proms", 0 )        // color & video-decoder PROM data
 	ROM_LOAD( "4.u42",        0x0800, 0x0200, CRC(e6631c23) SHA1(9988723269367fb44ef83f627186a1c88cf7877e) )
 	ROM_LOAD( "6.u23",        0x0a00, 0x0200, CRC(83faf25e) SHA1(30002643d08ed983a6701a7c4b5ee74a2f4a1adb) )
 	ROM_LOAD( "blaster.col",  0x0000, 0x0800, CRC(bac50bc4) SHA1(80a48eb97c6f02703210d00498f9669c36e64326) )
@@ -2797,7 +2868,7 @@
 	ROM_REGION( 0x10000, "soundcpu_b", 0 )
 	ROM_LOAD( "18.sb10",      0xf000, 0x1000, CRC(c33a3145) SHA1(6ffe2da7b70c0b576fbc1790a33eecdbb9ee3d02) )
 
-	ROM_REGION( 0x0c00, "proms", 0 )        /* color & video-decoder PROM data */
+	ROM_REGION( 0x0c00, "proms", 0 )        // color & video-decoder PROM data
 	ROM_LOAD( "4.u42",        0x0800, 0x0200, CRC(e6631c23) SHA1(9988723269367fb44ef83f627186a1c88cf7877e) )
 	ROM_LOAD( "6.u23",        0x0a00, 0x0200, CRC(83faf25e) SHA1(30002643d08ed983a6701a7c4b5ee74a2f4a1adb) )
 	ROM_LOAD( "blaster.col",  0x0000, 0x0800, CRC(bac50bc4) SHA1(80a48eb97c6f02703210d00498f9669c36e64326) )
@@ -2828,7 +2899,7 @@
 	ROM_REGION( 0x10000, "soundcpu", 0 )
 	ROM_LOAD( "blastkit.18", 0xf000, 0x1000, CRC(c33a3145) SHA1(6ffe2da7b70c0b576fbc1790a33eecdbb9ee3d02) )
 
-	ROM_REGION( 0x0c00, "proms", 0 )        /* color & video-decoder PROM data */
+	ROM_REGION( 0x0c00, "proms", 0 )        // color & video-decoder PROM data
 	ROM_LOAD( "4.u42",        0x0800, 0x0200, CRC(e6631c23) SHA1(9988723269367fb44ef83f627186a1c88cf7877e) )
 	ROM_LOAD( "6.u23",        0x0a00, 0x0200, CRC(83faf25e) SHA1(30002643d08ed983a6701a7c4b5ee74a2f4a1adb) )
 	ROM_LOAD( "blaster.col",  0x0000, 0x0800, CRC(bac50bc4) SHA1(80a48eb97c6f02703210d00498f9669c36e64326) )
@@ -2945,7 +3016,7 @@
 	ROM_LOAD( "mm13_1.a21", 0x44000, 0x2000, CRC(ef4b79db) SHA1(346057cb8c4593df44fb36771553e60610fe1a0c) ) /* IC21 */
 	ROM_LOAD( "mm12_1.a19", 0x46000, 0x2000, CRC(a1f04bf0) SHA1(389bdb7c9e395af9275abfb20c3ab51bc12dc4db) ) /* IC19 */
 
-	/* sound CPU */
+	// sound CPU
 	ROM_REGION( 0x10000, "soundcpu", 0 )
 	ROM_LOAD( "mm01_1.a08", 0x0e000, 0x2000, CRC(65339512) SHA1(144625d2905c953383bcc90cd2435d332394883f) ) /* IC8  */
 
@@ -2954,7 +3025,7 @@
 	ROM_LOAD( "mm21_1.b58", 0x02000, 0x2000, CRC(cb90b3c5) SHA1(f28cca2c3ff23d6c9e2952a1b08ab2875655ec70) ) /* IC58 */
 	ROM_LOAD( "mm19_1.b41", 0x04000, 0x2000, CRC(e274df86) SHA1(9876a487c5efa350ced31acbc39df22c8d414677) ) /* IC41 */
 
-	ROM_REGION( 0x200, "proms", 0 ) /* not hooked up */
+	ROM_REGION( 0x200, "proms", 0 ) // not hooked up
 	ROM_LOAD( "ic14.bpr",   0x00000,  0x020, CRC(27a6d555) SHA1(988d55092d7d0243a867986873dfd12be67280c7) )
 	ROM_LOAD( "ic47.bpr",   0x00000,  0x100, CRC(efb03024) SHA1(4c3e3de374f7959a03dcfcb8a29a372685f3b273) )
 	ROM_LOAD( "ic60.bpr",   0x00000,  0x200, CRC(0ea3f7fb) SHA1(a8a2a7fbc1a3527a8e2cda71d737afaa717902f1) )
@@ -2984,7 +3055,7 @@
 	ROM_LOAD( "cpu_2764_ic21_rom13_proto6.i9",  0x44000, 0x2000, CRC(e387a785) SHA1(de98d503f4d2c947c701ff96628114b34da45f93) ) /* ic21 */ // different
 	ROM_LOAD( "cpu_2764_ic19_rom12_proto6.g9",  0x46000, 0x2000, CRC(a1f04bf0) SHA1(389bdb7c9e395af9275abfb20c3ab51bc12dc4db) ) /* ic19 */
 
-	/* sound cpu */
+	// sound CPU
 	ROM_REGION( 0x10000, "soundcpu", 0 )
 	ROM_LOAD( "cpu_2764_ic8_rom1_proto4.f0", 0x0e000, 0x2000, CRC(65339512) SHA1(144625d2905c953383bcc90cd2435d332394883f) )    /* ic8  */
 
@@ -3019,7 +3090,7 @@
 	ROM_LOAD( "rom13.ic21", 0x44000, 0x2000, CRC(ec016c9b) SHA1(f2e40abd14b8b4944b792dd453ebe92eb64355ae) )  /* IC21 */
 	ROM_LOAD( "rom12.ic19", 0x46000, 0x2000, CRC(98ae7afa) SHA1(6a904408419f576352bd2f895727fd17c0541ff8) )  /* IC19 */
 
-	/* sound CPU */
+	// sound CPU
 	ROM_REGION( 0x10000, "soundcpu", 0 )
 	ROM_LOAD( "rom1.ic8",   0xe000, 0x2000, CRC(011a94a7) SHA1(9f54a742a87ba56b9517e33e556f57dce6eb2eab) )    /* IC8  */
 
@@ -3055,7 +3126,7 @@
 	ROM_LOAD( "ic21.inf", 0x44000, 0x2000, CRC(c405f853) SHA1(6bd74d065a6043849e083c2822925b82c6fedb00) )   /* IC21 */
 	ROM_LOAD( "ic19.inf", 0x46000, 0x2000, CRC(ade7645a) SHA1(bfaab1840e3171df895a2333a30b9dac214b3351) )   /* IC19 */
 
-	/* sound CPU */
+	// sound CPU
 	ROM_REGION( 0x10000, "soundcpu", 0 )
 	ROM_LOAD( "ic8.inf", 0x0e000, 0x2000, CRC(4e3123b8) SHA1(f453feed3ae3b6430db49eb4325f62eecfee9f5e) )    /* IC8  */
 
@@ -3096,11 +3167,11 @@
 	ROM_LOAD( "cpu_2732_ic21_rom14_rev1.9i",  0x44000, 0x2000, CRC(0bbd867c) SHA1(f2db9fc57b6afb762715617345e8c3dcb89b6cc2) )
 	ROM_LOAD( "cpu_2732_ic19_rom12_rev1.9g",  0x46000, 0x2000, CRC(b9221ed1) SHA1(428ea8f3e2fa58d875f581f5de6e0d05ed855a45) )
 
-	/* sound CPU */
+	// sound CPU
 	ROM_REGION( 0x10000, "soundcpu", 0 )
 	ROM_LOAD( "cpu_2764_ic8_rom1_rev1.0f", 0x0E000, 0x2000, CRC(84517c3c) SHA1(de0b6473953783c091ddcc7aaa89fc1ec3b9d378) )
 
-	/* sound board */
+	// sound board
 	ROM_REGION( 0x90000, "cvsd:cpu", 0 )
 	ROM_LOAD( "snd_27256_rom23_rev1.u4",  0x10000, 0x8000, CRC(3af6b47d) SHA1(aff19d65a4d9c249dec6a9e04a4066fada0f8fa1) )
 	ROM_RELOAD(             0x18000, 0x8000 )
@@ -3120,7 +3191,7 @@
 	ROM_LOAD( "vid_27128_ic58_rom21_rev1.9f", 0x04000, 0x4000, CRC(aa94bf05) SHA1(3412dd181e2c12dc2dd1caabfe7e737005b0ccd7) )
 	ROM_LOAD( "vid_27128_ic41_rom22_rev1.9d", 0x08000, 0x4000, CRC(c41e3daa) SHA1(fafe76bebd6eaf2cd124c1030e3a58eb5a6cddc6) )
 
-	ROM_REGION( 0x200, "proms", 0 ) /* not hooked up */
+	ROM_REGION( 0x200, "proms", 0 ) // not hooked up
 	ROM_LOAD( "vid_82s123_ic14_a-5282-10295.2b",   0x00000, 0x020, CRC(85057e40) SHA1(c34cdd24d77031450493da50d4ad02813f9b30a8) )
 	ROM_LOAD( "vid_82s129_ic47_a-5282-10294.15d",  0x00000, 0x100, CRC(efb03024) SHA1(4c3e3de374f7959a03dcfcb8a29a372685f3b273) )
 	ROM_LOAD( "vid_82s147a_ic60_a-5282-10292.12f", 0x00000, 0x200, CRC(0ea3f7fb) SHA1(a8a2a7fbc1a3527a8e2cda71d737afaa717902f1) )
@@ -3152,11 +3223,11 @@
 	ROM_LOAD( "cpu_2732_ic21_rom14_rev1.9i",  0x44000, 0x2000, CRC(0bbd867c) SHA1(f2db9fc57b6afb762715617345e8c3dcb89b6cc2) )
 	ROM_LOAD( "cpu_2732_ic19_rom12_rev1.9g",  0x46000, 0x2000, CRC(b9221ed1) SHA1(428ea8f3e2fa58d875f581f5de6e0d05ed855a45) )
 
-	/* sound CPU */
+	// sound CPU
 	ROM_REGION( 0x10000, "soundcpu", 0 )
 	ROM_LOAD( "cpu_2764_ic8_rom1_rev1.0f", 0x0E000, 0x2000, CRC(84517c3c) SHA1(de0b6473953783c091ddcc7aaa89fc1ec3b9d378) )
 
-	/* sound board */
+	// sound board
 	ROM_REGION( 0x90000, "cvsd:cpu", 0 )
 	ROM_LOAD( "snd_27256_rom23_rev1.u4",  0x10000, 0x8000, CRC(3af6b47d) SHA1(aff19d65a4d9c249dec6a9e04a4066fada0f8fa1) )
 	ROM_RELOAD(             0x18000, 0x8000 )
@@ -3176,7 +3247,7 @@
 	ROM_LOAD( "vid_27128_ic58_rom21_rev1.9f", 0x04000, 0x4000, CRC(aa94bf05) SHA1(3412dd181e2c12dc2dd1caabfe7e737005b0ccd7) )
 	ROM_LOAD( "vid_27128_ic41_rom22_rev1.9d", 0x08000, 0x4000, CRC(c41e3daa) SHA1(fafe76bebd6eaf2cd124c1030e3a58eb5a6cddc6) )
 
-	ROM_REGION( 0x200, "proms", 0 ) /* not hooked up */
+	ROM_REGION( 0x200, "proms", 0 ) // not hooked up
 	ROM_LOAD( "vid_82s123_ic14_a-5282-10295.2b",   0x00000, 0x020, CRC(85057e40) SHA1(c34cdd24d77031450493da50d4ad02813f9b30a8) )
 	ROM_LOAD( "vid_82s129_ic47_a-5282-10294.15d",  0x00000, 0x100, CRC(efb03024) SHA1(4c3e3de374f7959a03dcfcb8a29a372685f3b273) )
 	ROM_LOAD( "vid_82s147a_ic60_a-5282-10292.12f", 0x00000, 0x200, CRC(0ea3f7fb) SHA1(a8a2a7fbc1a3527a8e2cda71d737afaa717902f1) )
@@ -3203,7 +3274,7 @@
 	m_blitter_config = WILLIAMS_BLITTER_NONE;
 	m_blitter_clip_address = 0x0000;
 
-	/* apply simple decryption by swapping bits 0 and 7 */
+	// apply simple decryption by swapping bits 0 and 7
 	for (int i = 0xd000; i < 0x19000; i++)
 		rom[i] = bitswap<8>(rom[i],0,6,5,4,3,2,1,7);
 }
@@ -3352,27 +3423,27 @@
  *
  *************************************/
 
-/* Defender hardware games */
-GAME( 1980, defender,   0,        defender,       defender, defender_state,       empty_init,    ROT0,   "Williams", "Defender (Red label)", MACHINE_SUPPORTS_SAVE ) // developers left Williams in 1981 and formed Vid Kidz
-GAME( 1980, defenderg,  defender, defender,       defender, defender_state,       empty_init,    ROT0,   "Williams", "Defender (Green label)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, defenderb,  defender, defender,       defender, defender_state,       empty_init,    ROT0,   "Williams", "Defender (Blue label)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, defenderw,  defender, defender,       defender, defender_state,       empty_init,    ROT0,   "Williams", "Defender (White label)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, defenderj,  defender, defender,       defender, defender_state,       empty_init,    ROT0,   "Williams (Taito Corporation license)", "T.T Defender", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, defndjeu,   defender, defender,       defender, defndjeu_state,       empty_init,    ROT0,   "bootleg (Jeutel)", "Defender (bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
-GAME( 1980, tornado1,   defender, defender,       defender, defndjeu_state,       empty_init,    ROT0,   "bootleg (Jeutel)", "Tornado (set 1, Defender bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, tornado2,   defender, defender,       defender, defndjeu_state,       empty_init,    ROT0,   "bootleg (Jeutel)", "Tornado (set 2, Defender bootleg)", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // bad dump?
-GAME( 1980, zero,       defender, defender,       defender, defndjeu_state,       empty_init,    ROT0,   "bootleg (Jeutel)", "Zero (set 1, Defender bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, zero2,      defender, defender,       defender, defndjeu_state,       empty_init,    ROT0,   "bootleg (Amtec)", "Zero (set 2, Defender bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, defcmnd,    defender, defender,       defender, defender_state,       empty_init,    ROT0,   "bootleg", "Defense Command (Defender bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, defence,    defender, defender,       defender, defender_state,       empty_init,    ROT0,   "bootleg (Outer Limits)", "Defence Command (Defender bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, startrkd,   defender, defender,       defender, defender_state,       empty_init,    ROT0,   "bootleg", "Star Trek (Defender bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1980, attackf,    defender, defender,       defender, defender_state,       empty_init,    ROT0,   "bootleg (FAMARE S.A.)", "Attack (Defender bootleg)", MACHINE_SUPPORTS_SAVE )
-GAME( 1981, galwars2,   defender, defender,       defender, defender_state,       empty_init,    ROT0,   "bootleg (Sonic)", "Galaxy Wars II (Defender bootleg)", MACHINE_SUPPORTS_SAVE ) // Sega Sonic - Sega S.A., only displays Sonic on title screen
-
-GAME( 1980, mayday,     0,        defender,       mayday,   mayday_state,         empty_init,    ROT0,   "Hoei", "Mayday (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) // \  original by Hoei, which one of these 3 sets is bootleg/licensed/original is unknown
-GAME( 1980, maydaya,    mayday,   defender,       mayday,   mayday_state,         empty_init,    ROT0,   "Hoei", "Mayday (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) //  > these games have an unemulated protection chip of some sort which is hacked around in /machine/williams.cpp "protection_r" function
-GAME( 1980, maydayb,    mayday,   defender,       mayday,   mayday_state,         empty_init,    ROT0,   "Hoei", "Mayday (set 3)", MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) // /
-GAME( 1980, batlzone,   mayday,   defender,       mayday,   mayday_state,         empty_init,    ROT0,   "bootleg (Video Game)", "Battle Zone (bootleg of Mayday)", MACHINE_SUPPORTS_SAVE )//    the bootleg may or may not use the same protection chip, or some hack around it.
+// Defender hardware games
+GAME( 1980, defender,   0,        defender,       defender, defender_state,       empty_init,    ROT0,   "Williams",                             "Defender (Red label)",               MACHINE_SUPPORTS_SAVE ) // developers left Williams in 1981 and formed Vid Kidz
+GAME( 1980, defenderg,  defender, defender,       defender, defender_state,       empty_init,    ROT0,   "Williams",                             "Defender (Green label)",             MACHINE_SUPPORTS_SAVE )
+GAME( 1980, defenderb,  defender, defender,       defender, defender_state,       empty_init,    ROT0,   "Williams",                             "Defender (Blue label)",              MACHINE_SUPPORTS_SAVE )
+GAME( 1980, defenderw,  defender, defender,       defender, defender_state,       empty_init,    ROT0,   "Williams",                             "Defender (White label)",             MACHINE_SUPPORTS_SAVE )
+GAME( 1980, defenderj,  defender, defender,       defender, defender_state,       empty_init,    ROT0,   "Williams (Taito Corporation license)", "T.T Defender",                       MACHINE_SUPPORTS_SAVE )
+GAME( 1980, defndjeu,   defender, defender,       defender, defndjeu_state,       empty_init,    ROT0,   "bootleg (Jeutel)",                     "Defender (bootleg)",                 MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tornado1,   defender, defender,       defender, defndjeu_state,       empty_init,    ROT0,   "bootleg (Jeutel)",                     "Tornado (set 1, Defender bootleg)",  MACHINE_SUPPORTS_SAVE )
+GAME( 1980, tornado2,   defender, defender,       defender, defndjeu_state,       empty_init,    ROT0,   "bootleg (Jeutel)",                     "Tornado (set 2, Defender bootleg)",  MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) // bad dump?
+GAME( 1980, zero,       defender, defender,       defender, defndjeu_state,       empty_init,    ROT0,   "bootleg (Jeutel)",                     "Zero (set 1, Defender bootleg)",     MACHINE_SUPPORTS_SAVE )
+GAME( 1980, zero2,      defender, defender,       defender, defndjeu_state,       empty_init,    ROT0,   "bootleg (Amtec)",                      "Zero (set 2, Defender bootleg)",     MACHINE_SUPPORTS_SAVE )
+GAME( 1980, defcmnd,    defender, defender,       defender, defender_state,       empty_init,    ROT0,   "bootleg",                              "Defense Command (Defender bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, defence,    defender, defender,       defender, defender_state,       empty_init,    ROT0,   "bootleg (Outer Limits)",               "Defence Command (Defender bootleg)", MACHINE_SUPPORTS_SAVE )
+GAME( 1981, startrkd,   defender, defender,       defender, defender_state,       empty_init,    ROT0,   "bootleg",                              "Star Trek (Defender bootleg)",       MACHINE_SUPPORTS_SAVE )
+GAME( 1980, attackf,    defender, defender,       defender, defender_state,       empty_init,    ROT0,   "bootleg (Famaresa)",                   "Attack (Defender bootleg)",          MACHINE_SUPPORTS_SAVE )
+GAME( 1981, galwars2,   defender, defender,       defender, defender_state,       empty_init,    ROT0,   "bootleg (Sonic)",                      "Galaxy Wars II (Defender bootleg)",  MACHINE_SUPPORTS_SAVE ) // Sega Sonic - Sega S.A., only displays Sonic on title screen
+
+GAME( 1980, mayday,     0,        defender,       mayday,   mayday_state,         empty_init,    ROT0,   "Hoei",                 "Mayday (set 1)",                  MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) // \  original by Hoei, which one of these 3 sets is bootleg/licensed/original is unknown
+GAME( 1980, maydaya,    mayday,   defender,       mayday,   mayday_state,         empty_init,    ROT0,   "Hoei",                 "Mayday (set 2)",                  MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) //  > these games have an unemulated protection chip of some sort which is hacked around in /machine/williams.cpp "protection_r" function
+GAME( 1980, maydayb,    mayday,   defender,       mayday,   mayday_state,         empty_init,    ROT0,   "Hoei",                 "Mayday (set 3)",                  MACHINE_SUPPORTS_SAVE | MACHINE_UNEMULATED_PROTECTION ) // /
+GAME( 1980, batlzone,   mayday,   defender,       mayday,   mayday_state,         empty_init,    ROT0,   "bootleg (Video Game)", "Battle Zone (bootleg of Mayday)", MACHINE_SUPPORTS_SAVE ) // the bootleg may or may not use the same protection chip, or some hack around it.
 
 GAME( 1981, colony7,    0,        defender,       colony7,  defender_state,       empty_init,    ROT270, "Taito", "Colony 7 (set 1)", MACHINE_SUPPORTS_SAVE )
 GAME( 1981, colony7a,   colony7,  defender,       colony7,  defender_state,       empty_init,    ROT270, "Taito", "Colony 7 (set 2)", MACHINE_SUPPORTS_SAVE )
@@ -3381,47 +3452,48 @@
 
 
 
-/* Standard Williams hardware */
+// Standard Williams hardware
 GAME( 1981, stargate,   0,        williams_base,  stargate, williams_state,       init_stargate, ROT0,   "Williams / Vid Kidz", "Stargate", MACHINE_SUPPORTS_SAVE )
 
-GAME( 1982, robotron,   0,        williams_base,  robotron, williams_state,       init_robotron, ROT0,   "Williams / Vid Kidz", "Robotron: 2084 (Solid Blue label)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, robotronyo, robotron, williams_base,  robotron, williams_state,       init_robotron, ROT0,   "Williams / Vid Kidz", "Robotron: 2084 (Yellow/Orange label)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, robotron,   0,        williams_base,  robotron, williams_state,       init_robotron, ROT0,   "Williams / Vid Kidz",                   "Robotron: 2084 (Solid Blue label)",    MACHINE_SUPPORTS_SAVE )
+GAME( 1982, robotronyo, robotron, williams_base,  robotron, williams_state,       init_robotron, ROT0,   "Williams / Vid Kidz",                   "Robotron: 2084 (Yellow/Orange label)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, robotronun, robotron, williams_base,  robotron, williams_state,       init_robotron, ROT0,   "Williams / Vid Kidz (Unidesa license)", "Robotron: 2084 (Unidesa license)",     MACHINE_SUPPORTS_SAVE )
+
 // the 3 below are all noteworthy hacks of the Solid BLue set
 GAME( 1987, robotron87, robotron, williams_base,  robotron, williams_state,       init_robotron, ROT0,   "hack", "Robotron: 2084 (1987 'shot-in-the-corner' bugfix)", MACHINE_SUPPORTS_SAVE ) // fixes a reset bug.
-GAME( 2012, robotron12, robotron, williams_base,  robotron, williams_state,       init_robotron, ROT0,   "hack", "Robotron: 2084 (2012 'wave 201 start' hack)", MACHINE_SUPPORTS_SAVE ) // includes sitc bug fix, used for competitive play.
-GAME( 2015, robotrontd, robotron, williams_base,  robotron, williams_state,       init_robotron, ROT0,   "hack", "Robotron: 2084 (2015 'tie-die V2' hack)", MACHINE_SUPPORTS_SAVE ) // inc. sitc fix, mods by some of the original developers, see backstory here http://www.robotron2084guidebook.com/gameplay/raceto100million/robo2k14_tie-die-romset/  (I guess there's a tie-die V1 before it was released to the public?)
+GAME( 2012, robotron12, robotron, williams_base,  robotron, williams_state,       init_robotron, ROT0,   "hack", "Robotron: 2084 (2012 'wave 201 start' hack)",       MACHINE_SUPPORTS_SAVE ) // includes sitc bug fix, used for competitive play.
+GAME( 2015, robotrontd, robotron, williams_base,  robotron, williams_state,       init_robotron, ROT0,   "hack", "Robotron: 2084 (2015 'tie-die V2' hack)",           MACHINE_SUPPORTS_SAVE ) // inc. sitc fix, mods by some of the original developers, see backstory here http://www.robotron2084guidebook.com/gameplay/raceto100million/robo2k14_tie-die-romset/  (I guess there's a tie-die V1 before it was released to the public?)
 
 GAME( 1982, joust,      0,        williams_muxed, joust,    williams_muxed_state, init_joust,    ROT0,   "Williams", "Joust (White/Green label)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, joustr,     joust,    williams_muxed, joust,    williams_muxed_state, init_joust,    ROT0,   "Williams", "Joust (Solid Red label)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, joustwr,    joust,    williams_muxed, joust,    williams_muxed_state, init_joust,    ROT0,   "Williams", "Joust (White/Red label)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, joustr,     joust,    williams_muxed, joust,    williams_muxed_state, init_joust,    ROT0,   "Williams", "Joust (Solid Red label)",   MACHINE_SUPPORTS_SAVE )
+GAME( 1982, joustwr,    joust,    williams_muxed, joust,    williams_muxed_state, init_joust,    ROT0,   "Williams", "Joust (White/Red label)",   MACHINE_SUPPORTS_SAVE )
 
 GAME( 1982, bubbles,    0,        bubbles,        bubbles,  bubbles_state,        empty_init,    ROT0,   "Williams", "Bubbles", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, bubblesr,   bubbles,  bubbles,        bubbles,  bubbles_state,        empty_init,    ROT0,   "Williams", "Bubbles (Solid Red label)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, bubblesr,   bubbles,  bubbles,        bubbles,  bubbles_state,        empty_init,    ROT0,   "Williams", "Bubbles (Solid Red label)",   MACHINE_SUPPORTS_SAVE )
 GAME( 1982, bubblesp,   bubbles,  bubbles,        bubbles,  bubbles_state,        empty_init,    ROT0,   "Williams", "Bubbles (prototype version)", MACHINE_SUPPORTS_SAVE )
 
 GAME( 1982, splat,      0,        williams_muxed, splat,    williams_muxed_state, init_splat,    ROT0,   "Williams", "Splat!", MACHINE_SUPPORTS_SAVE )
 
-GAME( 1982, sinistar,   0,        sinistar,       sinistar, sinistar_state,       empty_init,    ROT270, "Williams", "Sinistar (revision 3)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, sinistar1,  sinistar, sinistar,       sinistar, sinistar_state,       empty_init,    ROT270, "Williams", "Sinistar (prototype version)", MACHINE_SUPPORTS_SAVE )
-GAME( 1982, sinistar2,  sinistar, sinistar,       sinistar, sinistar_state,       empty_init,    ROT270, "Williams", "Sinistar (revision 2)", MACHINE_SUPPORTS_SAVE )
+GAME( 1982, sinistar,   0,        sinistar,       sinistar, sinistar_state,       empty_init,    ROT270, "Williams", "Sinistar (revision 3)",        MACHINE_SUPPORTS_SAVE )
+GAME( 1982, sinistar2,  sinistar, sinistar,       sinistar, sinistar_state,       empty_init,    ROT270, "Williams", "Sinistar (revision 2)",        MACHINE_SUPPORTS_SAVE )
+GAME( 1982, sinistarp,  sinistar, sinistar,       sinistar, sinistar_state,       empty_init,    ROT270, "Williams", "Sinistar (AMOA-82 prototype)", MACHINE_SUPPORTS_SAVE )
 
 GAME( 1983, playball,   0,        playball,       playball, playball_state,       empty_init,    ROT270, "Williams", "PlayBall! (prototype)", MACHINE_SUPPORTS_SAVE )
 
-GAME( 1983, blaster,    0,        blaster,        blaster,  blaster_state,        empty_init,    ROT0,   "Williams / Vid Kidz", "Blaster", MACHINE_SUPPORTS_SAVE )
-GAME( 1983, blastero,   blaster,  blaster,        blaster,  blaster_state,        empty_init,    ROT0,   "Williams / Vid Kidz", "Blaster (location test)", MACHINE_SUPPORTS_SAVE )
+GAME( 1983, blaster,    0,        blaster,        blaster,  blaster_state,        empty_init,    ROT0,   "Williams / Vid Kidz", "Blaster",                  MACHINE_SUPPORTS_SAVE )
+GAME( 1983, blastero,   blaster,  blaster,        blaster,  blaster_state,        empty_init,    ROT0,   "Williams / Vid Kidz", "Blaster (location test)",  MACHINE_SUPPORTS_SAVE )
 GAME( 1983, blasterkit, blaster,  blastkit,       blastkit, blaster_state,        empty_init,    ROT0,   "Williams / Vid Kidz", "Blaster (conversion kit)", MACHINE_SUPPORTS_SAVE ) // mono sound
 
 GAME( 1985, spdball,    0,        spdball,        spdball,  spdball_state,        empty_init,    ROT0,   "Williams", "Speed Ball - Contest at Neonworld (prototype)", MACHINE_SUPPORTS_SAVE )
 
-GAME( 1985, alienar,    0,        williams_muxed, alienar,  williams_muxed_state, init_alienar,  ROT0,   "Duncan Brown", "Alien Arena", MACHINE_SUPPORTS_SAVE )
+GAME( 1985, alienar,    0,        williams_muxed, alienar,  williams_muxed_state, init_alienar,  ROT0,   "Duncan Brown", "Alien Arena",                    MACHINE_SUPPORTS_SAVE )
 GAME( 1985, alienaru,   alienar,  williams_muxed, alienar,  williams_muxed_state, init_alienaru, ROT0,   "Duncan Brown", "Alien Arena (Stargate upgrade)", MACHINE_SUPPORTS_SAVE )
 
 GAME( 1987, lottofun,   0,        lottofun,       lottofun, williams_state,       init_lottofun, ROT0,   "H.A.R. Management", "Lotto Fun", MACHINE_SUPPORTS_SAVE )
 
 
-
-/* 2nd Generation Williams hardware with tilemaps */
-GAME( 1983, mysticm,    0,        mysticm,        mysticm, mysticm_state,         empty_init,    ROT0,   "Williams", "Mystic Marathon", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE)
+// 2nd Generation Williams hardware with tilemaps
+GAME( 1983, mysticm,    0,        mysticm,        mysticm, mysticm_state,         empty_init,    ROT0,   "Williams", "Mystic Marathon",             MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE)
 GAME( 1983, mysticmp,   mysticm,  mysticm,        mysticm, mysticm_state,         empty_init,    ROT0,   "Williams", "Mystic Marathon (prototype)", MACHINE_WRONG_COLORS | MACHINE_SUPPORTS_SAVE ) // newest roms are 'proto 6' ?
 
 GAME( 1984, tshoot,     0,        tshoot,         tshoot,  tshoot_state,          empty_init,    ROT0,   "Williams", "Turkey Shoot (prototype)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/witch.cpp mame-0.224+dfsg.1/src/mame/drivers/witch.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/witch.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/witch.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1044,8 +1044,7 @@
 ROM_END
 
 
-/* Witch (With ranking) */
-ROM_START( witchb )
+ROM_START( witchb ) /* Witch (With ranking) */
 	ROM_REGION( 0x20000, "maincpu", 0 )
 	ROM_LOAD( "x.u5", 0x00000, 0x20000, CRC(d0818777) SHA1(a6232fef84bec3cfb4a6122a48e96e7b7950e013) )
 
@@ -1087,6 +1086,27 @@
 ROM_END
 
 
+ROM_START( witchstar ) /* Licensed for Korea */
+	ROM_REGION( 0x20000, "maincpu", 0 )
+	ROM_LOAD( "7_excellent.u5", 0x00000, 0x20000, CRC(303c3a6d) SHA1(38983b0925d2a018b6718b3af5e95cf91b1850d6) )
+
+	ROM_REGION( 0x10000, "sub", 0 )
+	ROM_LOAD( "8_excellent.s6", 0x00000, 0x08000, CRC(82460b82) SHA1(d85a9d77edaa67dfab8ff6ac4cb6273f0904b3c0) ) /* Same data as the Witch set */
+
+	ROM_REGION( 0x20000, "gfx1", 0 )
+	ROM_LOAD( "6_excellent.u3", 0x00000, 0x20000,  CRC(7007ced4) SHA1(6a0aac3ff9a4d5360c8ba1142f010add1b430ada) ) /* Same data as the Witch set */
+
+	ROM_REGION( 0x40000, "gfx2", 0 )
+	ROM_LOAD( "5_excellent.a1", 0x00000, 0x40000,  CRC(257dc030) SHA1(ada08c3f8e93fd00d4ec7d152cdcf49c130be08e) )
+
+	ROM_REGION( 0x40000, "essnd", 0 )
+	ROM_LOAD( "9_excellent.v10", 0x00000, 0x40000, CRC(62e42371) SHA1(5042abc2176d0c35fd6b698eca4145f93b0a3944) ) /* Same data as the Witch set */
+
+	ROM_REGION( 0x100, "prom", 0 )
+	ROM_LOAD( "tbp24s10n.10k", 0x000, 0x100, CRC(ee7b9d8f) SHA1(3a7b75befab83bc37e4e403ad3632841c2d37707) ) /* Currently unused, unknown use */
+ROM_END
+
+
 ROM_START( pbchmp95 ) /* Licensed for Germany? */
 	ROM_REGION( 0x20000, "maincpu", 0 )
 	ROM_LOAD( "3.bin", 0x00000, 0x20000, CRC(e881aa05) SHA1(10d259396cac4b9a1b72c262c11ffa5efbdac433) )
@@ -1107,6 +1127,7 @@
 	ROM_LOAD( "tbp24s10n.10k", 0x000, 0x100, CRC(ee7b9d8f) SHA1(3a7b75befab83bc37e4e403ad3632841c2d37707) ) /* Currently unused, unknown use */
 ROM_END
 
+
 ROM_START( keirinou ) /* ES8611 PCB */
 	ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 )
 	ROM_LOAD( "y5-03.y5",     0x000000, 0x008000, CRC(df2acc37) SHA1(9ad953843ba7859a55888fb87591cc8d322136ad) )
@@ -1139,8 +1160,9 @@
 	m_subcpu->space(AS_PROGRAM).install_read_handler(0x7000, 0x700f, read8sm_delegate(*this, FUNC(witch_state::prot_read_700x)));
 }
 
-GAME( 1987, keirinou, 0,     keirinou, keirinou, keirinou_state, empty_init, ROT0, "Excellent System", "Keirin Ou", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, witch,    0,     witch,    witch,    witch_state,    init_witch, ROT0, "Vic Tokai (Excellent System license)", "Witch", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, witchb,   witch, witch,    witch,    witch_state,    init_witch, ROT0, "Vic Tokai (Excellent System license)", "Witch (with ranking)", MACHINE_SUPPORTS_SAVE )
-GAME( 1992, witchs,   witch, witch,    witch,    witch_state,    init_witch, ROT0, "Vic Tokai (Sega license)", "Witch (Sega license)", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, pbchmp95, witch, witch,    witch,    witch_state,    init_witch, ROT0, "Veltmeijer Automaten", "Pinball Champ '95", MACHINE_SUPPORTS_SAVE )
+GAME( 1987, keirinou,  0,     keirinou, keirinou, keirinou_state, empty_init, ROT0, "Excellent System",                     "Keirin Ou", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, witch,     0,     witch,    witch,    witch_state,    init_witch, ROT0, "Vic Tokai (Excellent System license)", "Witch", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, witchb,    witch, witch,    witch,    witch_state,    init_witch, ROT0, "Vic Tokai (Excellent System license)", "Witch (with ranking)", MACHINE_SUPPORTS_SAVE )
+GAME( 1992, witchs,    witch, witch,    witch,    witch_state,    init_witch, ROT0, "Vic Tokai (Sega license)",             "Witch (Sega license)", MACHINE_SUPPORTS_SAVE )
+GAME( 1994, witchstar, witch, witch,    witch,    witch_state,    init_witch, ROT0, "Fovis Korea Co. Ltd.",                 "Witch Star", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, pbchmp95,  witch, witch,    witch,    witch_state,    init_witch, ROT0, "Veltmeijer Automaten",                 "Pinball Champ '95", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/wpc_an.cpp mame-0.224+dfsg.1/src/mame/drivers/wpc_an.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/wpc_an.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/wpc_an.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,14 +7,64 @@
         and pressing the start button, or else you get "PINBALL MISSING":
     W (right ball shooter, c6 r2)
     E (right trough, c6 r3)
-    [ (dummy jaw opto, c5 r1)
-    ] (right outlane, c5 r2)
-    \ (right slingshot kicker, c5 r3)
+    DEL (dummy jaw opto, c5 r1)
+    HOME (right outlane, c5 r2)
+    END (right slingshot kicker, c5 r3)
     It's possible not all of these are strictly necessary to make it work.
 
-    TODO: replace the 8x8 pinball input matrix keymap by some sort of common interface for the williams system 6, 9, 10, 11 and wpc_an;
-    while the actual purpose of the switches differ per machine (and some machines like wpc_an have one switch permanently closed as a test switch),
-    the entire matrix should be mapped to keyboard keys, there are more than enough keys on a 104 key keyboard to do it, even avoiding MAME's reserved keys.
+    TODO: replace the 8x8 pinball input matrix keymap by some sort of common
+    interface for the Williams system 6, 9, 10, 11/a/b/c and WPC;
+    while the actual purpose of the switches differ per machine (and some
+    machines like WPC have one switch permanently closed as a test switch),
+    the entire matrix should be mapped to keyboard keys, there are more than
+    enough keys on a 104 key keyboard to do it, even avoiding MAME's reserved
+    keys.
+
+    The A-13502 System11 BG sound adapter board (used by Dr. Dude WPC, and by
+    the 200 or so prototype Funhouse machines):
+    See https://www.ipdb.org/files/966/Williams_1990_Funhouse_Prototype_Manual_Addendum.pdf
+    The Funhouse prototype manual addendum shows the A-13502 board connects to
+    the HDR 17X2 "I/O SOUND" connector as such:
+     A4 A3 A2 A1 A0 WDEN R/W
+      0  x  x  x  x    x   x   open bus
+      x  1  x  x  x    x   x   open bus
+      x  x  x  x  x    1   x   open bus
+      1  0  *  *  *    0   x   The used registers, see below; R/W is ignored, so only writable registers should be written and readable ones read!
+      1  0  0  0  0    0   W   CPUSTROBE - pulse low the /A input on a 74LS123 retriggerable monostable multivibrator which pulses CB1 on the sound board low briefly[1]
+      1  0  0  0  1    0   W   CPUDATALD - write data to a 74LS374 octal latch U1 to be placed onto the sound board bus; the bus is only driven while the pulse from the 74LS123 is low, otherwise tristate
+      1  0  0  1  0    0   R   SNDSTROBE - read the data from the 74LS374 octal latch U2 written there by the sound board having asserted CB2 (/stbo), and clear the semaphore
+      1  0  0  1  1    0   R   SNDSTATUS - read the sound semaphore state on D0
+      1  0  1  0  0    0   W   /RESET    - D0 state is written to S11_BG /RESET
+
+    The S11_BG sound board asserting CB2 (/stbo) both latches data into U2 and
+    sets the semaphore.
+    The schematic, unlike the WPC Sound Board does NOT show a connection
+    between the semaphore state and WPC /FIRQ (pin 34) like the WPC Sound
+    board (wpc_snd.cpp) does, but this could be an omission.
+
+    [1] R=8k(?) and C=.1uf, which pulses the CB1 (/stb) pin on the sound board
+    input low according to the datasheet formula:
+        TS = KRC, where K is the constant ~0.37, R is 8000(difficult to read),
+        and C is 0.0000001, for a result of 296us
+
+    Exactly which addresses cause the WPC ASIC to assert low the WDEN pin is
+    not clear, but presumably it is asserted in the 0x0x3fc0-3fdf area,
+    meaning that the addresses actually used are 0x3fd0 thru 0x3fd4 (offsets
+    0x20-0x24).
+    See machine/wpc.h
+
+    TODO: (wpc in general)
+    The /FIRQ signal from the WPC sound board is directly connected to the
+    MC68B09E maincpu, along with the /FIRQ signal generated from inside the
+    WPC ASIC itself (see machine/wpc.cpp and wpc.h) and needs to properly
+    handle both the 'external, unmaskable' version of the signal generated by
+    audio/wpcsnd.cpp AND the internal, maskable/settable/resettable/maybe-
+    source-selectable version of the signal, generated within the WPC ASIC
+    itself or by another device connected to other ASIC pins.
+    This would likely involve one or more input_merger devices.
+    The exact details of how this all works may not be documented publicly
+    anywhere, so may require hardware tests and logic analysis to figure it
+    out fully.
 */
 
 
@@ -55,7 +105,7 @@
 
 	// devices
 	required_device<cpu_device> m_maincpu;
-	optional_device<s11c_bg_device> m_bg;  // only used with Dr. Dude
+	optional_device<s11c_bg_device> m_bg;  // only used w/ Dr. Dude and Funhouse Proto
 	optional_device<wpcsnd_device> m_wpcsnd;
 	required_memory_bank m_cpubank;
 	required_device<wpc_device> m_wpc;
@@ -103,14 +153,14 @@
 	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
 
 	PORT_START("INP1")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER )  // left flipper
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER )  // right flipper
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_LALT) // left flipper
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RALT) // right flipper
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_START )
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_TILT )
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER )
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER )
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER )
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER )
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_LCONTROL) // coin on dd_p06/dd_p7, otherwise unused?
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_RCONTROL)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_LSHIFT)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SPACE)
 
 	PORT_START("INP2")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_A)
@@ -153,6 +203,16 @@
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DOWN)
 
 	PORT_START("INP20")
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DEL)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_HOME)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_END)
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PGUP)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_PGDN)
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_0_PAD)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_DEL_PAD)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_ENTER_PAD)
+
+	PORT_START("INP40")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_Q)
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_W)
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_E)
@@ -162,22 +222,25 @@
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_I)
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_O)
 
-	PORT_START("INP40")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_LALT)
-	PORT_BIT( 0xfe, IP_ACTIVE_LOW, IPT_UNKNOWN )
-
 	PORT_START("INP80")
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNKNOWN )
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_2_PAD)
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_3_PAD)
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_7_PAD)
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_8_PAD)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_9_PAD)
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_SLASH_PAD)
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_ASTERISK)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_CODE(KEYCODE_4_PAD)
 
 	PORT_START("COIN")
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_COIN1 )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_COIN2 )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_COIN3 )
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_COIN4 )
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service / Escape") PORT_CODE(KEYCODE_DEL_PAD)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_SERVICE ) PORT_NAME("Service / Escape") PORT_CODE(KEYCODE_6_PAD)
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_VOLUME_DOWN ) PORT_CODE(KEYCODE_MINUS_PAD)
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_VOLUME_UP ) PORT_CODE(KEYCODE_PLUS_PAD)
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Begin Test / Enter") PORT_CODE(KEYCODE_ENTER_PAD)
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Begin Test / Enter") PORT_CODE(KEYCODE_5_PAD)
 
 	PORT_START("DIPS")
 	PORT_DIPNAME(0x01,0x01,"Switch 1") PORT_DIPLOCATION("SWA:1")
@@ -379,7 +442,6 @@
 
 	SPEAKER(config, "speaker").front_center();
 	S11C_BG(config, m_bg);
-	m_bg->set_romregion("sound1");
 	m_bg->add_route(ALL_OUTPUTS, "speaker", 1.0);
 }
 
@@ -389,10 +451,13 @@
 ROM_START(dd_p7)
 	ROM_REGION(0x30000, "maincpu", ROMREGION_ERASEFF)
 	ROM_LOAD("dude_u6.p7", 0x10000, 0x20000, CRC(b6c35b98) SHA1(5e9d70ce40669e2f402561dc1d8aa70a8b8a2958))
-	ROM_REGION(0x40000, "sound1", 0)
-	ROM_LOAD("dude_u4.l1", 0x10000, 0x10000, CRC(3eeef714) SHA1(74dcc83958cb62819e0ac36ca83001694faafec7))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("dude_u4.l1", 0x00000, 0x10000, CRC(3eeef714) SHA1(74dcc83958cb62819e0ac36ca83001694faafec7))
+	ROM_RELOAD( 0x10000, 0x10000)
 	ROM_LOAD("dude_u19.l1", 0x20000, 0x10000, CRC(dc7b985b) SHA1(f672d1f1fe1d1d887113ea6ccd745a78f7760526))
-	ROM_LOAD("dude_u20.l1", 0x30000, 0x10000, CRC(a83d53dd) SHA1(92a81069c42c7760888201fb0787fa7ddfbf1658))
+	ROM_RELOAD( 0x30000, 0x10000)
+	ROM_LOAD("dude_u20.l1", 0x40000, 0x10000, CRC(a83d53dd) SHA1(92a81069c42c7760888201fb0787fa7ddfbf1658))
+	ROM_RELOAD( 0x50000, 0x10000)
 	ROM_REGION(0x8000, "fixed", 0)
 	ROM_FILL(0x0000,0x8000,0x00)
 ROM_END
@@ -400,10 +465,13 @@
 ROM_START(dd_p06)
 	ROM_REGION(0x30000, "maincpu", ROMREGION_ERASEFF)
 	ROM_LOAD("u6-pa6.wpc", 0x10000, 0x20000, CRC(fb72571b) SHA1(a12b32eac3141c881064e6de2f49d6d213248fde))
-	ROM_REGION(0x40000, "sound1", 0)
-	ROM_LOAD("dude_u4.l1", 0x10000, 0x10000, CRC(3eeef714) SHA1(74dcc83958cb62819e0ac36ca83001694faafec7))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("dude_u4.l1", 0x00000, 0x10000, CRC(3eeef714) SHA1(74dcc83958cb62819e0ac36ca83001694faafec7))
+	ROM_RELOAD( 0x10000, 0x10000)
 	ROM_LOAD("dude_u19.l1", 0x20000, 0x10000, CRC(dc7b985b) SHA1(f672d1f1fe1d1d887113ea6ccd745a78f7760526))
-	ROM_LOAD("dude_u20.l1", 0x30000, 0x10000, CRC(a83d53dd) SHA1(92a81069c42c7760888201fb0787fa7ddfbf1658))
+	ROM_RELOAD( 0x30000, 0x10000)
+	ROM_LOAD("dude_u20.l1", 0x40000, 0x10000, CRC(a83d53dd) SHA1(92a81069c42c7760888201fb0787fa7ddfbf1658))
+	ROM_RELOAD( 0x50000, 0x10000)
 	ROM_REGION(0x8000, "fixed", 0)
 	ROM_FILL(0x0000,0x8000,0x00)
 ROM_END
@@ -451,6 +519,26 @@
 	ROM_FILL(0x0000,0x8000,0x00)
 ROM_END
 
+ROM_START(fh_l2)
+	ROM_REGION(0x30000, "maincpu", ROMREGION_ERASEFF)
+	ROM_LOAD("u6-l2.rom", 0x10000, 0x20000, CRC(7a8a3278) SHA1(b35c1149862724ea70cc810f14141e51b365e950))
+	ROM_REGION(0x180000, "sound1", 0)
+	ROM_LOAD("fh_u14.sl2", 0x000000, 0x20000, CRC(3394b69b) SHA1(34690688f00106b725b27a6975cdbf1e077e3bb3))
+	ROM_RELOAD( 0x000000 + 0x20000, 0x20000)
+	ROM_RELOAD( 0x000000 + 0x40000, 0x20000)
+	ROM_RELOAD( 0x000000 + 0x60000, 0x20000)
+	ROM_LOAD("fh_u15.sl2", 0x080000, 0x20000, CRC(0744b9f5) SHA1(b626601d82e6b1cf25f7fdcca31e623fc14a3f92))
+	ROM_RELOAD( 0x080000 + 0x20000, 0x20000)
+	ROM_RELOAD( 0x080000 + 0x40000, 0x20000)
+	ROM_RELOAD( 0x080000 + 0x60000, 0x20000)
+	ROM_LOAD("fh_u18.sl2", 0x100000, 0x20000, CRC(11c8944a) SHA1(425d8da5a036c41e054d201b99856319fd5ef9e2))
+	ROM_RELOAD( 0x100000 + 0x20000, 0x20000)
+	ROM_RELOAD( 0x100000 + 0x40000, 0x20000)
+	ROM_RELOAD( 0x100000 + 0x60000, 0x20000)
+	ROM_REGION(0x8000, "fixed", 0)
+	ROM_FILL(0x0000,0x8000,0x00)
+ROM_END
+
 ROM_START(fh_l3)
 	ROM_REGION(0x30000, "maincpu", ROMREGION_ERASEFF)
 	ROM_LOAD("u6-l3.rom", 0x10000, 0x20000, CRC(7a74d702) SHA1(91540cdc62c855b4139b202aa6ad5440b2dee141))
@@ -531,6 +619,18 @@
 	ROM_FILL(0x0000,0x8000,0x00)
 ROM_END
 
+ROM_START(fh_pa1)
+	ROM_REGION(0x30000, "maincpu", ROMREGION_ERASEFF)
+	ROM_LOAD("u6-l2.rom", 0x10000, 0x20000, CRC(7a8a3278) SHA1(b35c1149862724ea70cc810f14141e51b365e950))
+	ROM_REGION(0x80000, "bg:cpu", ROMREGION_ERASEFF)
+	ROM_LOAD("fh_u4.pa1", 0x00000, 0x20000, CRC(9f0a716d) SHA1(3d3ec250b0b4344844ad8ce5bcbb326f934b22d3))
+	ROM_LOAD("fh_u19.pa1", 0x20000, 0x20000, CRC(b0fb5ddf) SHA1(138c2aa283f7ced90637e981063f520bf46c57df))
+	ROM_LOAD("fh_u20.pa1", 0x40000, 0x20000, CRC(bb864f78) SHA1(ed861bd5df382e7efac103a1acb3d810ee4b15dc))
+
+	ROM_REGION(0x8000, "fixed", 0)
+	ROM_FILL(0x0000,0x8000,0x00)
+ROM_END
+
 
 /*-----------------
 /  Harley Davidson #20001
@@ -718,21 +818,23 @@
 	ROM_FILL(0x0000,0x8000,0x00)
 ROM_END
 
-GAME(1990,  tfa_13,     0,      wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Bally",     "WPC Test Fixture: Alphanumeric (1.3)",                     MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990,  dd_p7,      dd_l2,  wpc_an_dd, wpc_an, wpc_an_state, init_wpc_an, ROT0, "Bally",     "Dr. Dude (PA-7 WPC)",                                      MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990,  dd_p06,     dd_l2,  wpc_an_dd, wpc_an, wpc_an_state, init_wpc_an, ROT0, "Bally",     "Dr. Dude (PA-6 WPC)",                                      MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990,  fh_l9,      0,      wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse L-9 (SL-2m)",                                     MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990,  fh_l9b,     fh_l9,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse L-9 (SL-2m) Bootleg Improved German translation", MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1996,  fh_905h,    fh_l9,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse 9.05H",                                           MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990,  fh_l3,      fh_l9,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse L-3",                                             MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990,  fh_l4,      fh_l9,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse L-4",                                             MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1990,  fh_l5,      fh_l9,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse L-5",                                             MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991,  hd_l3,      0,      wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Bally",     "Harley Davidson (L-3)",                                    MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991,  hd_l2,      hd_l3,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Bally",     "Harley Davidson (L-2)",                                    MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991,  hd_l1,      hd_l3,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Bally",     "Harley Davidson (L-1)",                                    MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1992,  bop_l7,     0,      wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "The Machine: Bride of Pinbot (L-7)",                       MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991,  bop_l6,     bop_l7, wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "The Machine: Bride of Pinbot (L-6)",                       MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991,  bop_l5,     bop_l7, wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "The Machine: Bride of Pinbot (L-5)",                       MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991,  bop_l4,     bop_l7, wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "The Machine: Bride of Pinbot (L-4)",                       MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991,  bop_l3,     bop_l7, wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "The Machine: Bride of Pinbot (L-3)",                       MACHINE_IS_SKELETON_MECHANICAL)
-GAME(1991,  bop_l2,     bop_l7, wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "The Machine: Bride of Pinbot (L-2)",                       MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990,  tfa_13,     0,      wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Bally",     "WPC Test Fixture: Alphanumeric (1.3)",                       MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990,  dd_p7,      dd_l2,  wpc_an_dd, wpc_an, wpc_an_state, init_wpc_an, ROT0, "Bally",     "Dr. Dude (PA-7 WPC)",                                        MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990,  dd_p06,     dd_l2,  wpc_an_dd, wpc_an, wpc_an_state, init_wpc_an, ROT0, "Bally",     "Dr. Dude (PA-6 WPC)",                                        MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990,  fh_l9,      0,      wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse (L-9, SL-2m)",                                      MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990,  fh_l9b,     fh_l9,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse (L-9, SL-2m, bootleg improved German translation)", MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1996,  fh_905h,    fh_l9,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse (9.05H)",                                           MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990,  fh_l2,      fh_l9,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse (L-2)",                                             MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990,  fh_l3,      fh_l9,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse (L-3)",                                             MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990,  fh_l4,      fh_l9,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse (L-4)",                                             MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990,  fh_l5,      fh_l9,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse (L-5)",                                             MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1990,  fh_pa1,     fh_l9,  wpc_an_dd, wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "Funhouse (L-2, prototype PA-1 System 11 sound)",             MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991,  hd_l3,      0,      wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Bally",     "Harley Davidson (L-3)",                                      MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991,  hd_l2,      hd_l3,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Bally",     "Harley Davidson (L-2)",                                      MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991,  hd_l1,      hd_l3,  wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Bally",     "Harley Davidson (L-1)",                                      MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1992,  bop_l7,     0,      wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "The Machine: Bride of Pinbot (L-7)",                         MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991,  bop_l6,     bop_l7, wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "The Machine: Bride of Pinbot (L-6)",                         MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991,  bop_l5,     bop_l7, wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "The Machine: Bride of Pinbot (L-5)",                         MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991,  bop_l4,     bop_l7, wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "The Machine: Bride of Pinbot (L-4)",                         MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991,  bop_l3,     bop_l7, wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "The Machine: Bride of Pinbot (L-3)",                         MACHINE_IS_SKELETON_MECHANICAL)
+GAME(1991,  bop_l2,     bop_l7, wpc_an,    wpc_an, wpc_an_state, init_wpc_an, ROT0, "Williams",  "The Machine: Bride of Pinbot (L-2)",                         MACHINE_IS_SKELETON_MECHANICAL)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/wpc_dcs.cpp mame-0.224+dfsg.1/src/mame/drivers/wpc_dcs.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/wpc_dcs.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/wpc_dcs.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -25,7 +25,7 @@
 		, nvram(*this, "nvram")
 		, lamp(*this, "lamp")
 		, out(*this, "out")
-		, swarray(*this, "SW.%u", 0)
+		, swarray(*this, "SW.%u", 0U)
 	{ }
 
 	void wpc_dcs(machine_config &config);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/wpc_s.cpp mame-0.224+dfsg.1/src/mame/drivers/wpc_s.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/wpc_s.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/wpc_s.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -15,15 +15,15 @@
 {
 public:
 	wpc_s_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-			maincpu(*this, "maincpu"),
-			dcs(*this, "dcs"),
-			rombank(*this, "rombank"),
-			mainram(*this, "mainram"),
-			nvram(*this, "nvram"),
-			pic(*this, "pic"),
-			lamp(*this, "lamp"),
-			out(*this, "out")
+		: driver_device(mconfig, type, tag)
+		, maincpu(*this, "maincpu")
+		, dcs(*this, "dcs")
+		, rombank(*this, "rombank")
+		, mainram(*this, "mainram")
+		, nvram(*this, "nvram")
+		, pic(*this, "pic")
+		, lamp(*this, "lamp")
+		, out(*this, "out")
 	{ }
 
 	void wpc_s(machine_config &config);
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/xavix_2000.cpp mame-0.224+dfsg.1/src/mame/drivers/xavix_2000.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/xavix_2000.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/xavix_2000.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,287 @@
+// license:BSD-3-Clause
+// copyright-holders:David Haywood
+/***************************************************************************/
+
+/* (XaviX 2000 type CPU) hardware titles (2nd XaviX generation?)
+
+   these use the SSD 2000 NEC 85605-621 type CPU
+
+   This CPU type adds extra opcodes that don't appear to be present in the 97/98 types
+   It does not appear to support the bitmap modes or 16-bit ROMs found in the 2002 type
+
+   It is possible some games in the regular xavix.cpp drivers use this type, there
+   does not appear to be a way to tell unless the extra opcodes are used or the CPU
+   has been decapped
+
+*/
+
+#include "emu.h"
+#include "includes/xavix_2002.h"
+
+// #define VERBOSE 1
+#include "logmacro.h"
+
+static INPUT_PORTS_START( xavix )
+	PORT_START("IN0")
+	PORT_DIPNAME( 0x01, 0x00, "IN0" )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
+
+	PORT_START("IN1")
+	PORT_DIPNAME( 0x01, 0x00, "IN1" )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
+
+	PORT_START("AN0")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN1")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN2")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN3")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN4")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN5")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN6")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN7")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("MOUSE0X")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("MOUSE0Y")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("MOUSE1X")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("MOUSE1Y")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("REGION") // PAL/NTSC flag
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_CUSTOM )
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( xavix_i2c )
+	PORT_INCLUDE(xavix)
+
+	PORT_MODIFY("IN1")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( epo_ebox )
+	PORT_INCLUDE(xavix)
+
+	PORT_MODIFY("IN0")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) // select
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) // back
+	// 04/08 not used for buttons?
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( epo_bowl )
+	PORT_INCLUDE(xavix)
+
+	PORT_MODIFY("IN0")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
+
+	PORT_MODIFY("IN1")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( epo_sdb )
+	PORT_INCLUDE(xavix)
+
+	PORT_MODIFY("MOUSE0X")
+	PORT_BIT( 0xff, 0x00, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(1)
+	PORT_MODIFY("MOUSE0Y")
+	PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_PLAYER(1)
+	PORT_MODIFY("MOUSE1X")
+	PORT_BIT( 0xff, 0x00, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(2)
+	PORT_MODIFY("MOUSE1Y")
+	PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_PLAYER(2)
+
+	PORT_MODIFY("IN0")
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
+
+	PORT_MODIFY("IN1")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( ttv_lotr )
+	PORT_INCLUDE(xavix)
+
+	PORT_MODIFY("IN1")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(xavix_i2c_lotr_state, camera_r)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(xavix_i2c_lotr_state, camera_r)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( ttv_mx )
+	PORT_INCLUDE(xavix_i2c)
+
+	PORT_MODIFY("IN0")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) // Accel
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) // Brake
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Pause")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_NAME("Motion Up") // you tilt the device, but actual inputs are digital
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_NAME("Motion Down")
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_NAME("Motion Left")
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_NAME("Motion Right")
+INPUT_PORTS_END
+
+
+void xavix_state::xavix2000(machine_config &config)
+{
+	xavix(config);
+
+	XAVIX2000(config.replace(), m_maincpu, MAIN_CLOCK);
+	m_maincpu->set_addrmap(AS_PROGRAM, &xavix_state::xavix_map);
+	m_maincpu->set_addrmap(5, &xavix_state::xavix_lowbus_map);
+	m_maincpu->set_addrmap(6, &xavix_state::xavix_extbus_map);
+	m_maincpu->set_vblank_int("screen", FUNC(xavix_state::interrupt));
+	m_maincpu->set_vector_callback(FUNC(xavix_state::get_vectors));
+
+	m_palette->set_entries(512);
+}
+
+void xavix_state::xavix2000_nv(machine_config &config)
+{
+	xavix2000(config);
+
+	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
+}
+
+void xavix_2000_nv_sdb_state::xavix2000_nv_sdb(machine_config &config)
+{
+	xavix2000_nv(config);
+
+	m_anport->read_0_callback().set(FUNC(xavix_2000_nv_sdb_state::sdb_anport0_r));
+	m_anport->read_1_callback().set(FUNC(xavix_2000_nv_sdb_state::sdb_anport1_r));
+	m_anport->read_2_callback().set(FUNC(xavix_2000_nv_sdb_state::sdb_anport2_r));
+	m_anport->read_3_callback().set(FUNC(xavix_2000_nv_sdb_state::sdb_anport3_r));
+}
+
+void xavix_i2c_state::xavix2000_i2c_24c04(machine_config &config)
+{
+	xavix2000(config);
+
+	I2C_24C04(config, "i2cmem", 0);
+}
+
+void xavix_i2c_state::xavix2000_i2c_24c02(machine_config &config)
+{
+	xavix2000(config);
+
+	I2C_24C02(config, "i2cmem", 0);
+}
+
+
+
+ROM_START( epo_sdb )
+	ROM_REGION(0x400000, "bios", ROMREGION_ERASE00)
+	ROM_LOAD("superdashball.bin", 0x000000, 0x400000, CRC(a004a764) SHA1(47a96822d4d7d6a0f6be5cd729c3747dbab65979) )
+ROM_END
+
+ROM_START( epo_ebox )
+	ROM_REGION(0x400000, "bios", ROMREGION_ERASE00)
+	ROM_LOAD("exciteboxing.bin", 0x000000, 0x400000, CRC(e25ae4f5) SHA1(7f7b613f0ab8f43f5cad0d13de538921e77cae9c) )
+ROM_END
+
+ROM_START( epo_bowl )
+	ROM_REGION(0x200000, "bios", ROMREGION_ERASE00)
+	ROM_LOAD("bowling.bin", 0x000000, 0x200000, CRC(d34f8d9e) SHA1(ebe3792172dc43904b9226beb27f1da89d2388cc) )
+ROM_END
+
+ROM_START( ttv_sw )
+	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "jedi.bin", 0x000000, 0x800000, CRC(51cae5fd) SHA1(1ed8d556f31b4182259ca8c766d60c824d8d9744) )
+ROM_END
+
+ROM_START( ttv_lotr )
+	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "lotr.bin", 0x000000, 0x800000, CRC(a034ecd5) SHA1(264a9d4327af0a075841ad6129db67d82cf741f1) )
+ROM_END
+
+ROM_START( ttv_mx )
+	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "mxdirtrebel.bin", 0x000000, 0x800000, CRC(e64bf1a1) SHA1(137f97d7d857697a13e0c8984509994dc7bc5fc5) )
+ROM_END
+
+ROM_START( drgqst )
+	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "dragonquest.bin", 0x000000, 0x800000, CRC(3d24413f) SHA1(1677e81cedcf349de7bf091a232dc82c6424efba) )
+ROM_END
+
+ROM_START( ban_onep )
+	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00)
+	ROM_LOAD("onepiece.bin", 0x000000, 0x800000, CRC(c5cb5a5f) SHA1(db85f6cc48d77c5a4967b9b8e2999167e3dfc8c8) )
+ROM_END
+
+// doesn't use extra opcodes?
+CONS( 2002, epo_ebox, 0, 0, xavix2000_nv,        epo_ebox,    xavix_state,             init_xavix, "Epoch / SSD Company LTD",       "Excite Boxing (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // doesn't use XaviX2000 extra opcodes, but had that type of CPU
+ // die not confirmed, but uses extra opcodes.  (hangs on title screen due to combination of freq_timer_done nested interrupts tripping, and waiting on bits in input ports to change
+CONS( 2002, epo_bowl, 0, 0, xavix2000_i2c_24c02, epo_bowl,    xavix_i2c_state,         init_xavix, "Epoch / SSD Company LTD",       "Excite Bowling (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+
+CONS( 2004, epo_sdb,  0, 0, xavix2000_nv_sdb,    epo_sdb,     xavix_2000_nv_sdb_state, init_xavix, "Epoch / SSD Company LTD",       "Super Dash Ball (Japan)",  MACHINE_IMPERFECT_SOUND )
+
+CONS( 2005, ttv_sw,   0, 0, xavix2000_i2c_24c02, ttv_lotr,    xavix_i2c_lotr_state,    init_xavix, "Tiger / SSD Company LTD",       "Star Wars Saga Edition - Lightsaber Battle Game", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+CONS( 2005, ttv_lotr, 0, 0, xavix2000_i2c_24c02, ttv_lotr,    xavix_i2c_lotr_state,    init_xavix, "Tiger / SSD Company LTD",       "Lord Of The Rings - Warrior of Middle-Earth", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+CONS( 2005, ttv_mx,   0, 0, xavix2000_i2c_24c04, ttv_mx,      xavix_i2c_state,         init_xavix, "Tiger / SSD Company LTD",       "MX Dirt Rebel", MACHINE_IMPERFECT_SOUND )
+CONS( 2003, drgqst,   0, 0, xavix2000_i2c_24c02, ttv_lotr,    xavix_i2c_lotr_state,    init_xavix, "Square Enix / SSD Company LTD", "Kenshin Dragon Quest: Yomigaerishi Densetsu no Ken", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
+
+// hangs after starting a game, or after quite a long time in attract mode (first problem could be bad save data read with the eeprom code, 2nd problem might just be how it is, ends up in a dead loop, not executing invalid code, idle timeout / battery saver)
+CONS( 2004, ban_onep, 0, 0, xavix2000_i2c_24c04, ttv_lotr,    xavix_i2c_lotr_state, init_xavix, "Bandai / SSD Company LTD",         "One Piece Punch Battle (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/xavix_2002.cpp mame-0.224+dfsg.1/src/mame/drivers/xavix_2002.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/xavix_2002.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/xavix_2002.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,547 @@
+// license:BSD-3-Clause
+// copyright-holders:David Haywood
+/***************************************************************************/
+
+/* SuperXaviX (XaviX 2002 type CPU) hardware titles (3rd XaviX generation?)
+
+  these use the SSD 2002 NEC 85054-611 type CPU
+  differences include support for 16-bit ROMs, high resolution bitmap modes, interlace screen modes, extra IO
+
+   XavixPort Golf is "SSD 2003 SuperXaviX MXIC 2003 3009" (not dumped yet, but actually marked as SuperXaviX unlike the others!)
+
+*/
+
+#include "emu.h"
+#include "includes/xavix_2002.h"
+
+// #define VERBOSE 1
+#include "logmacro.h"
+
+/* The 'XaviXPORT' isn't a real console, more of a TV adapter, all the actual hardware (CPU including video hw, sound hw) is in the cartridges and controllers
+   and can vary between games, see notes at top of driver.
+
+   The 'Domyos Interactive System (DiS)' released in France by Decathlon appears to be identical to XaviXPORT (but for PAL regions, and with an entirely different software range)
+*/
+
+
+static INPUT_PORTS_START( xavix )
+	PORT_START("IN0")
+	PORT_DIPNAME( 0x01, 0x00, "IN0" )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
+
+	PORT_START("IN1")
+	PORT_DIPNAME( 0x01, 0x00, "IN1" )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
+
+	PORT_START("AN0")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN1")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN2")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN3")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN4")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN5")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN6")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("AN7")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("MOUSE0X")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("MOUSE0Y")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("MOUSE1X")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+	PORT_START("MOUSE1Y")
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_UNUSED )
+
+	PORT_START("REGION") // PAL/NTSC flag
+	PORT_BIT( 0xff, IP_ACTIVE_HIGH, IPT_CUSTOM )
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( xavix_i2c )
+	PORT_INCLUDE(xavix)
+
+	PORT_MODIFY("IN1")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( epo_tfit )
+	PORT_INCLUDE(xavix)
+
+	PORT_MODIFY("IN0")
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) // select
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) // back
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 )
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
+
+	PORT_MODIFY("IN1")
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
+INPUT_PORTS_END
+
+
+static INPUT_PORTS_START( mrangbat )
+	PORT_INCLUDE(xavix_i2c)
+
+	PORT_MODIFY("IN0")
+	PORT_DIPNAME( 0x01, 0x00, "IN0" )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
+
+	PORT_MODIFY("IN1")
+	PORT_DIPNAME( 0x01, 0x00, "IN1" )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On ) )
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
+	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
+
+	PORT_START("EX0") // NOT A JOYSTICK!!
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_16WAY // Red/Up 1
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_16WAY // Red/Up 2
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_16WAY // Green / Circle / Right 2
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_16WAY // Pink / Star / Left 2
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_16WAY // Blue / Square / Right 1
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_16WAY // Yellow / Triangle / Left 1
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 )
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON8 )
+
+
+	PORT_START("EX1")
+	PORT_DIPNAME( 0x01, 0x00, "EX1" )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
+
+	PORT_START("EX2")
+	PORT_DIPNAME( 0x01, 0x00, "EX2" )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
+	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
+	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x04, DEF_STR( On ) )
+	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x08, DEF_STR( On ) )
+	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
+	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
+	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
+	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
+	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
+	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( xavix_bowl )
+	PORT_INCLUDE(xavix)
+
+	PORT_MODIFY("IN1")
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(xavix_i2c_bowl_state, camera_r)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(xavix_i2c_bowl_state, camera_r)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
+INPUT_PORTS_END
+
+static INPUT_PORTS_START( xavixp )
+	PORT_INCLUDE(xavix)
+
+	PORT_MODIFY("REGION") // PAL/NTSC flag
+	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_CUSTOM )
+INPUT_PORTS_END
+
+
+/* SuperXavix IO port handliner (per game) */
+
+uint8_t xavix_i2c_jmat_state::read_extended_io0()
+{
+	LOG("%s: read_extended_io0\n", machine().describe_context());
+	return 0x00;
+}
+
+uint8_t xavix_i2c_jmat_state::read_extended_io1()
+{
+	LOG("%s: read_extended_io1\n", machine().describe_context());
+
+	// reads this by reading the byte, then shifting right 4 times to place value into carry flag
+	return m_i2cmem->read_sda() << 3;
+	//return 0x00;
+}
+
+uint8_t xavix_i2c_jmat_state::read_extended_io2()
+{
+	LOG("%s: read_extended_io2\n", machine().describe_context());
+	return 0x00;
+}
+
+void xavix_i2c_jmat_state::write_extended_io0(uint8_t data)
+{
+	LOG("%s: io0_data_w %02x\n", machine().describe_context(), data);
+}
+
+void xavix_i2c_jmat_state::write_extended_io1(uint8_t data)
+{
+	LOG("%s: io1_data_w %02x\n", machine().describe_context(), data);
+
+	m_i2cmem->write_sda((data & 0x08) >> 3);
+	m_i2cmem->write_scl((data & 0x10) >> 4);
+
+}
+
+void xavix_i2c_jmat_state::write_extended_io2(uint8_t data)
+{
+	LOG("%s: io2_data_w %02x\n", machine().describe_context(), data);
+}
+
+READ_LINE_MEMBER(xavix_i2c_lotr_state::camera_r) // seems to be some kind of camera status bits
+{
+	return machine().rand();
+}
+
+READ_LINE_MEMBER(xavix_i2c_bowl_state::camera_r) // seems to be some kind of camera status bits
+{
+	return machine().rand();
+}
+
+void xavix_state::xavix2002(machine_config &config)
+{
+	xavix(config);
+
+	XAVIX2002(config.replace(), m_maincpu, MAIN_CLOCK);
+	m_maincpu->set_addrmap(AS_PROGRAM, &xavix_state::xavix_map);
+	m_maincpu->set_addrmap(5, &xavix_state::superxavix_lowbus_map); // has extra video, io etc.
+	m_maincpu->set_addrmap(6, &xavix_state::xavix_extbus_map);
+	m_maincpu->set_vblank_int("screen", FUNC(xavix_state::interrupt));
+	m_maincpu->set_vector_callback(FUNC(xavix_state::get_vectors));
+
+	m_palette->set_entries(512);
+
+	XAVIX2002IO(config, m_xavix2002io, 0);
+}
+
+
+
+void xavix_i2c_jmat_state::xavix2002_i2c_jmat(machine_config &config)
+{
+	xavix2002_i2c_24c04(config);
+
+	m_xavix2002io->read_0_callback().set(FUNC(xavix_i2c_jmat_state::read_extended_io0));
+	m_xavix2002io->write_0_callback().set(FUNC(xavix_i2c_jmat_state::write_extended_io0));
+	m_xavix2002io->read_1_callback().set(FUNC(xavix_i2c_jmat_state::read_extended_io1));
+	m_xavix2002io->write_1_callback().set(FUNC(xavix_i2c_jmat_state::write_extended_io1));
+	m_xavix2002io->read_2_callback().set(FUNC(xavix_i2c_jmat_state::read_extended_io2));
+	m_xavix2002io->write_2_callback().set(FUNC(xavix_i2c_jmat_state::write_extended_io2));
+}
+
+void xavix2002_superpttv_state::xavix2002_superpctv(machine_config& config)
+{
+	xavix2002(config);
+
+	m_xavix2002io->read_0_callback().set(FUNC(xavix2002_superpttv_state::read_extended_io0));
+	m_xavix2002io->read_1_callback().set(FUNC(xavix2002_superpttv_state::read_extended_io1));
+	m_xavix2002io->read_2_callback().set(FUNC(xavix2002_superpttv_state::read_extended_io2));
+}
+
+
+void xavix_i2c_state::xavix2002_i2c_24c04(machine_config &config)
+{
+	xavix2002(config);
+
+	I2C_24C04(config, "i2cmem", 0);
+}
+
+void xavix_i2c_state::xavix2002_i2c_mrangbat(machine_config &config)
+{
+	xavix2002(config);
+
+	I2C_24C02(config, "i2cmem", 0); // 24C02?
+
+	m_xavix2002io->read_0_callback().set_ioport("EX0");
+	m_xavix2002io->read_1_callback().set_ioport("EX1");
+	m_xavix2002io->read_2_callback().set_ioport("EX2");
+}
+
+
+// XaviXPORT
+ROM_START( xavtenni )
+	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "xavixtennis.bin", 0x000000, 0x800000, CRC(23a1d918) SHA1(2241c59e8ea8328013e55952ebf9060ea0a4675b) )
+ROM_END
+
+ROM_START( xavbaseb )
+	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "xpbaseball.bin", 0x000000, 0x800000, CRC(e9ed692d) SHA1(537e390e972156dc7da66ee127ae4c8052038ee5) )
+ROM_END
+
+ROM_START( xavbowl )
+	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "xpbowling.bin", 0x000000, 0x800000, CRC(2873460b) SHA1(ea8e2392f5a12961a23eb66dca8e07dec81ce8c8) )
+ROM_END
+
+ROM_START( xavbassf )
+	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "xpbassfishing.bin", 0x000000, 0x800000, CRC(09ab2f29) SHA1(616254176315d0947002e9ae5a6371a3ffa2e8eb) )
+
+	// code for the nRF24E1s, stored in SEEPROMs.  One in the cartridge, one in the rod/reel
+	ROM_REGION( 0x1001, "reel_io", ROMREGION_ERASE00 )
+	ROM_LOAD( "xpbassfishingnrf24e1reel.bin", 0x0000, 0x1001, CRC(cfbb19ae) SHA1(32464e4e4be33fdbc7768311f93ce437a316c616) )
+
+	ROM_REGION( 0x800000, "base_io", ROMREGION_ERASE00 )
+	ROM_LOAD( "xpbassfishingnrf24e1cart.bin", 0x0000, 0x1001, CRC(62f6303e) SHA1(126b2663e252fb80948f53153e4046e63dd8be32) )
+ROM_END
+
+ROM_START( xavbox )
+	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "xpboxing.bin", 0x000000, 0x800000, CRC(b61e7717) SHA1(162b9c53ac8c9d7b6972db44f7bc1cb0a7837b70) )
+ROM_END
+
+// Several of the XaviXport and DiS games are 2 glob setups (and must have some kind of banking)
+
+ROM_START( xavjmat )
+	ROM_REGION( 0x0800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "u2", 0x0000000, 0x0800000, CRC(1420640d) SHA1(dd714cd57cff885293688f74f69b5c1726e20ec0) )
+
+	ROM_REGION( 0x0800000, "biosu3", ROMREGION_ERASE00 )
+	ROM_LOAD( "u3", 0x0000000, 0x0800000, CRC(52dc318c) SHA1(dc50e0747ba29cfb1048fd4a55d26870086c869b) )
+ROM_END
+
+// currently copies the wrong code into RAM to execute (due to extended ROM size, and possible banking)
+// [:] ':maincpu' (00E074): rom_dmatrg_w (do DMA?) 01
+// [:]   (possible DMA op SRC 00ebe2d3 DST 358a LEN 0398)
+//         needs to come from 006be2d3 (so still from lower 8MB, not upper 8MB)
+
+ROM_START( xavmusic )
+	ROM_REGION( 0x0800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "u2", 0x0000000, 0x0800000, CRC(e7c8ad59) SHA1(d47fac8b480de4db88a1b306ff8830a65d1738a3) )
+
+	ROM_REGION( 0x0800000, "biosu3", ROMREGION_ERASE00 )
+	ROM_LOAD( "u3", 0x0000000, 0x0800000, CRC(977c956f) SHA1(debc086d0cf6c391002ad163e7bfaa2f010cc8f5) )
+ROM_END
+
+
+// Domyos DiS (XaviX 2002 based titles)
+ROM_START( domfitex )
+	ROM_REGION( 0x0800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "u2", 0x0000000, 0x0800000,  CRC(841fe3cd) SHA1(8678b8a0c5198b24169a84dbe3ae979bb0838f23) )
+
+	ROM_REGION( 0x0800000, "biosu3", ROMREGION_ERASE00 )
+	ROM_LOAD( "u3", 0x0000000, 0x0800000, CRC(1dc844ea) SHA1(c23da9006227f7fe4982998c17759d403a47472a) )
+ROM_END
+
+ROM_START( domfitch )
+	ROM_REGION( 0x0800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "u2", 0x0000000, 0x0800000, CRC(0ff2a7a6) SHA1(9b924cc4330e3f8d9204390854048fe2325bfdf7) )
+
+	ROM_REGION( 0x0800000, "biosu3", ROMREGION_ERASE00 )
+	ROM_LOAD( "u3", 0x0000000, 0x0800000, CRC(284583f6) SHA1(bd2d5304f1e01eed656b5de957ec0a0330a3d969) )
+ROM_END
+
+ROM_START( domdance )
+	ROM_REGION( 0x0800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "u2", 0x0000000, 0x0800000, CRC(74f9499d) SHA1(a64235075e32567cd6d2ab7b1284efcb8e7538e2) )
+
+	ROM_REGION( 0x0800000, "biosu3", ROMREGION_ERASE00 )
+	ROM_LOAD( "u3", 0x0000000, 0x0800000, CRC(e437565c) SHA1(f6db219ea14404b698ca453f6e50c726b2e77abb) )
+ROM_END
+
+ROM_START( domstepc )
+	ROM_REGION( 0x0800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "u2", 0x0000000, 0x0800000, CRC(cb37b5e9) SHA1(b742e3db98f36720adf5af9096c6bc235279de12) )
+
+	ROM_REGION( 0x0800000, "biosu3", ROMREGION_ERASE00 )
+	ROM_LOAD( "u3", 0x0000000, 0x0800000, CRC(dadaa744) SHA1(fd7ca77232a8fe228fc93b0a8a47ba3260349d90) )
+ROM_END
+
+ROM_START( mrangbat )
+	ROM_REGION(0x400000, "bios", ROMREGION_ERASE00)
+	ROM_LOAD("powerrangerspad.bin", 0x000000, 0x400000, CRC(d3a98775) SHA1(485c66242dd0ee436a278d23005aece48d606431) )
+ROM_END
+
+ROM_START( tmy_thom )
+	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
+	ROM_LOAD( "thomastank.bin", 0x000000, 0x800000, CRC(a52a23be) SHA1(e5b3500239d9e56eb5405f7585982959e5a162da) )
+ROM_END
+
+ROM_START( epo_tfit )
+	ROM_REGION(0x400000, "bios", ROMREGION_ERASE00)
+	ROM_LOAD("tennisfitness.bin", 0x000000, 0x400000, CRC(cbf65bd2) SHA1(30b3da6f061b2dd91679db42a050f715901beb87) )
+ROM_END
+
+ROM_START( suprpctv )
+	ROM_REGION(0x800000, "bios", ROMREGION_ERASE00) // inverted line?
+	ROM_LOAD("superpctv.bin", 0x200000, 0x200000, CRC(4a55a81c) SHA1(178b4b595a3aefc6d1c176031b436fc3312009e7) )
+	ROM_CONTINUE(0x000000, 0x200000)
+	ROM_CONTINUE(0x600000, 0x200000)
+	ROM_CONTINUE(0x400000, 0x200000)
+ROM_END
+
+ROM_START( udance )
+	ROM_REGION(0x800000, "bios", ROMREGION_ERASE00)
+	ROM_LOAD("udancerom0.bin", 0x000000, 0x800000, CRC(3066580a) SHA1(545257c75a892894faf386f4ab9a31967cdbe8ae) )
+
+	ROM_REGION(0x800000, "biosx", ROMREGION_ERASE00)
+	ROM_LOAD("udancerom1.bin", 0x000000, 0x800000, CRC(7dbaabde) SHA1(38c523dcdf8185465fc550fb9b0e8c7909f839be) )
+ROM_END
+
+
+CONS( 2004, xavtenni, 0, 0, xavix2002_i2c_24c04, xavix_i2c,  xavix_i2c_state,      init_xavix, "SSD Company LTD",         "XaviX Tennis (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+CONS( 2004, xavbaseb, 0, 0, xavix2002_i2c_24c04, xavix_i2c,  xavix_i2c_state,      init_xavix, "SSD Company LTD",         "XaviX Baseball (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+CONS( 2004, xavbowl,  0, 0, xavix2002_i2c_24c04, xavix_bowl, xavix_i2c_bowl_state, init_xavix, "SSD Company LTD",         "XaviX Bowling (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // has IR 'Camera'
+CONS( 2004, xavbox,   0, 0, xavix2002_i2c_jmat, xavix,  xavix_i2c_jmat_state,      init_xavix, "SSD Company LTD",         "XaviX Boxing (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // has IR 'Camera'
+// Bass Fishing PCB is just like Tennis except with an RF daughterboard.
+CONS( 2004, xavbassf, 0, 0, xavix2002_i2c_24c04, xavix_i2c,  xavix_i2c_state,      init_xavix, "SSD Company LTD",         "XaviX Bass Fishing (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+// TODO: check SEEPROM type and hookup, banking!
+CONS( 2005, xavjmat,  0, 0, xavix2002_i2c_jmat,  xavix,      xavix_i2c_jmat_state, init_xavix, "SSD Company LTD",         "Jackie Chan J-Mat Fitness (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+CONS( 2007, xavmusic, 0, 0, xavix2002_i2c_jmat,  xavix,      xavix_i2c_jmat_state, init_xavix, "SSD Company LTD",         "XaviX Music & Circuit (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+// https://arnaudmeyer.wordpress.com/domyos-interactive-system/
+// Domyos Fitness Adventure
+// Domyos Fitness Challenge
+// Domyos Fitness Exercises
+// Domyos Fit Race
+// Domyos Soft Fitness
+// Domyos Fitness Dance
+// Domyos Fitness Play
+// Domyos Fitness Training
+
+// Domyos Bike Concept (not listed on site above)
+
+// Has SEEPROM and an RTC.  Exercise has some leftover PC buffer stuff.  (TODO, check SEEPROM type, RTC type, banking) (both Exercises and Challenge are identical PCBs)
+CONS( 2008, domfitex, 0, 0, xavix2002_i2c_jmat, xavixp, xavix_i2c_jmat_state, init_xavix, "Decathlon / SSD Company LTD", "Domyos Fitness Exercises (Domyos Interactive System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+CONS( 2008, domfitch, 0, 0, xavix2002_i2c_jmat, xavixp, xavix_i2c_jmat_state, init_xavix, "Decathlon / SSD Company LTD", "Domyos Fitness Challenge (Domyos Interactive System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+CONS( 2007, domdance, 0, 0, xavix2002_i2c_jmat, xavixp, xavix_i2c_jmat_state, init_xavix, "Decathlon / SSD Company LTD", "Domyos Fitness Dance (Domyos Interactive System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+CONS( 2007, domstepc, 0, 0, xavix2002_i2c_jmat, xavixp, xavix_i2c_jmat_state, init_xavix, "Decathlon / SSD Company LTD", "Domyos Step Concept (Domyos Interactive System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+// some DIS games run on XaviX 2 instead, see xavix2.cpp for Domyos Fitness Adventure and Domyos Bike Concept
+
+CONS( 2005, mrangbat, 0, 0, xavix2002_i2c_mrangbat, mrangbat,   xavix_i2c_state, init_xavix, "Bandai / SSD Company LTD", "Mahou Taiketsu Magiranger - Magimat de Dance & Battle (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+CONS( 2004, epo_tfit, 0, 0, xavix2002_i2c_24c04,    epo_tfit,   xavix_i2c_state, init_xavix, "Epoch / SSD Company LTD",  "Excite Sports Tennis x Fitness (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // Epoch Tennis and Fitness has 24LC04
+
+// TODO: does it have an SEEPROM? why does it hang? full title?
+CONS( 2005, tmy_thom, 0, 0, xavix2002_i2c_24c04,    xavix_i2c,  xavix_i2c_state, init_xavix, "Tomy / SSD Company LTD",   "Thomas and Friends (Tomy)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+// has HT24LC16
+CONS( 2008, udance,   0, 0, xavix2002, xavix, xavix_state, init_xavix, "Tiger / SSD Company LTD", "U-Dance", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+// this has RAM in the usual ROM space, needs handling, also has Atmel 24LC64.
+CONS( 200?, suprpctv, 0, 0, xavix2002_superpctv,    xavix,      xavix2002_superpttv_state, init_xavix, "Epoch / SSD Company LTD", "Super PC TV (Epoch)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
+
+
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/xavix.cpp mame-0.224+dfsg.1/src/mame/drivers/xavix.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/xavix.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/xavix.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -233,10 +233,6 @@
 #include "emu.h"
 #include "includes/xavix.h"
 
-// NTSC clock for regular XaviX?
-#define MAIN_CLOCK XTAL(21'477'272)
-// some games (eg Radica Opus) run off a 3.579545MHz XTAL ( same as the above /6 ) so presumably there is a divider / multiplier circuit on some PCBs?
-// TODO: what's the PAL clock?
 
 /* rad_madf has callf #$8f3f21 in various places, and expects to jump to code in ROM, it is unclear how things map in this case, as presumably
    the CPU 0 page memory and stack are still at 0 but ROM must be in the 3xxx range (game hasn't got far enough to call this yet to help either)
@@ -547,22 +543,7 @@
 INPUT_PORTS_END
 
 
-static INPUT_PORTS_START( epo_tfit )
-	PORT_INCLUDE(xavix)
 
-	PORT_MODIFY("IN0")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) // select
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) // back
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 )
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_BUTTON4 )
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP )
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN )
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT )
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT )
-
-	PORT_MODIFY("IN1")
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
-INPUT_PORTS_END
 
 
 static INPUT_PORTS_START( tomcpin )
@@ -582,176 +563,6 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_POWER_OFF ) PORT_NAME("Power Switch") // pressing this will turn the game off.
 INPUT_PORTS_END
 
-static INPUT_PORTS_START( mrangbat )
-	PORT_INCLUDE(xavix_i2c)
-
-	PORT_MODIFY("IN0")
-	PORT_DIPNAME( 0x01, 0x00, "IN0" )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
-
-	PORT_MODIFY("IN1")
-	PORT_DIPNAME( 0x01, 0x00, "IN1" )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On ) )
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
-	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
-
-	PORT_START("EX0") // NOT A JOYSTICK!!
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1) PORT_16WAY // Red/Up 1
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(2) PORT_16WAY // Red/Up 2
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(2) PORT_16WAY // Green / Circle / Right 2
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(2) PORT_16WAY // Pink / Star / Left 2
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1) PORT_16WAY // Blue / Square / Right 1
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1) PORT_16WAY // Yellow / Triangle / Left 1
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_BUTTON7 )
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_BUTTON8 )
-
-
-	PORT_START("EX1")
-	PORT_DIPNAME( 0x01, 0x00, "EX1" )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
-
-	PORT_START("EX2")
-	PORT_DIPNAME( 0x01, 0x00, "EX2" )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x01, DEF_STR( On ) )
-	PORT_DIPNAME( 0x02, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x02, DEF_STR( On ) )
-	PORT_DIPNAME( 0x04, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x04, DEF_STR( On ) )
-	PORT_DIPNAME( 0x08, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x08, DEF_STR( On ) )
-	PORT_DIPNAME( 0x10, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x10, DEF_STR( On ) )
-	PORT_DIPNAME( 0x20, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x20, DEF_STR( On ) )
-	PORT_DIPNAME( 0x40, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x40, DEF_STR( On ) )
-	PORT_DIPNAME( 0x80, 0x00, DEF_STR( Unknown ) )
-	PORT_DIPSETTING(    0x00, DEF_STR( Off ) )
-	PORT_DIPSETTING(    0x80, DEF_STR( On ) )
-INPUT_PORTS_END
-
-static INPUT_PORTS_START( epo_bowl )
-	PORT_INCLUDE(xavix)
-
-	PORT_MODIFY("IN0")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) PORT_PLAYER(1)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_PLAYER(1)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_PLAYER(1)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_PLAYER(1)
-
-	PORT_MODIFY("IN1")
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
-INPUT_PORTS_END
-
-
-static INPUT_PORTS_START( ttv_lotr )
-	PORT_INCLUDE(xavix)
-
-	PORT_MODIFY("IN1")
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(xavix_i2c_lotr_state, camera_r)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(xavix_i2c_lotr_state, camera_r)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
-INPUT_PORTS_END
-
-static INPUT_PORTS_START( xavix_bowl )
-	PORT_INCLUDE(xavix)
-
-	PORT_MODIFY("IN1")
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(xavix_i2c_bowl_state, camera_r)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_MEMBER(xavix_i2c_bowl_state, camera_r)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_CUSTOM ) PORT_READ_LINE_DEVICE_MEMBER("i2cmem", i2cmem_device, read_sda)
-INPUT_PORTS_END
-
-static INPUT_PORTS_START( epo_sdb )
-	PORT_INCLUDE(xavix)
-
-	PORT_MODIFY("MOUSE0X")
-	PORT_BIT( 0xff, 0x00, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(1)
-	PORT_MODIFY("MOUSE0Y")
-	PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_PLAYER(1)
-	PORT_MODIFY("MOUSE1X")
-	PORT_BIT( 0xff, 0x00, IPT_AD_STICK_X ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_REVERSE PORT_PLAYER(2)
-	PORT_MODIFY("MOUSE1Y")
-	PORT_BIT( 0xff, 0x00, IPT_AD_STICK_Y ) PORT_SENSITIVITY(25) PORT_KEYDELTA(32) PORT_PLAYER(2)
-
-	PORT_MODIFY("IN0")
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(2)
-
-	PORT_MODIFY("IN1")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) PORT_PLAYER(1)
-INPUT_PORTS_END
-
 static INPUT_PORTS_START( ltv_tam )
 	PORT_INCLUDE(xavix_i2c)
 
@@ -819,14 +630,6 @@
 
 
 
-static INPUT_PORTS_START( xavixp )
-	PORT_INCLUDE(xavix)
-
-	PORT_MODIFY("REGION") // PAL/NTSC flag
-	PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_CUSTOM )
-INPUT_PORTS_END
-
-
 /* Test mode lists the following
 
   LED (on power button?)
@@ -1208,19 +1011,6 @@
 	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_POWER_OFF ) PORT_NAME("Power Switch") // pressing this will turn the game off.
 INPUT_PORTS_END
 
-static INPUT_PORTS_START( ttv_mx )
-	PORT_INCLUDE(xavix_i2c)
-
-	PORT_MODIFY("IN0")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_BUTTON1 ) // Accel
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_BUTTON2 ) // Brake
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_BUTTON3 ) PORT_NAME("Pause")
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_UNUSED )
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_JOYSTICK_UP ) PORT_NAME("Motion Up") // you tilt the device, but actual inputs are digital
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_JOYSTICK_DOWN ) PORT_NAME("Motion Down")
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_JOYSTICK_LEFT ) PORT_NAME("Motion Left")
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_JOYSTICK_RIGHT ) PORT_NAME("Motion Right")
-INPUT_PORTS_END
 
 
 static INPUT_PORTS_START( rad_fb )
@@ -1613,81 +1403,7 @@
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
 }
 
-void xavix_state::xavix2000(machine_config &config)
-{
-	xavix(config);
 
-	XAVIX2000(config.replace(), m_maincpu, MAIN_CLOCK);
-	m_maincpu->set_addrmap(AS_PROGRAM, &xavix_state::xavix_map);
-	m_maincpu->set_addrmap(5, &xavix_state::xavix_lowbus_map);
-	m_maincpu->set_addrmap(6, &xavix_state::xavix_extbus_map);
-	m_maincpu->set_vblank_int("screen", FUNC(xavix_state::interrupt));
-	m_maincpu->set_vector_callback(FUNC(xavix_state::get_vectors));
-
-	m_palette->set_entries(512);
-}
-
-void xavix_state::xavix2002(machine_config &config)
-{
-	xavix(config);
-
-	XAVIX2002(config.replace(), m_maincpu, MAIN_CLOCK);
-	m_maincpu->set_addrmap(AS_PROGRAM, &xavix_state::xavix_map);
-	m_maincpu->set_addrmap(5, &xavix_state::superxavix_lowbus_map); // has extra video, io etc.
-	m_maincpu->set_addrmap(6, &xavix_state::xavix_extbus_map);
-	m_maincpu->set_vblank_int("screen", FUNC(xavix_state::interrupt));
-	m_maincpu->set_vector_callback(FUNC(xavix_state::get_vectors));
-
-	m_palette->set_entries(512);
-
-	XAVIX2002IO(config, m_xavix2002io, 0);
-}
-
-
-
-void xavix_i2c_jmat_state::xavix2002_i2c_jmat(machine_config &config)
-{
-	xavix2002_i2c_24c04(config);
-
-	m_xavix2002io->read_0_callback().set(FUNC(xavix_i2c_jmat_state::read_extended_io0));
-	m_xavix2002io->write_0_callback().set(FUNC(xavix_i2c_jmat_state::write_extended_io0));
-	m_xavix2002io->read_1_callback().set(FUNC(xavix_i2c_jmat_state::read_extended_io1));
-	m_xavix2002io->write_1_callback().set(FUNC(xavix_i2c_jmat_state::write_extended_io1));
-	m_xavix2002io->read_2_callback().set(FUNC(xavix_i2c_jmat_state::read_extended_io2));
-	m_xavix2002io->write_2_callback().set(FUNC(xavix_i2c_jmat_state::write_extended_io2));
-}
-
-
-void xavix_state::xavix2000_nv(machine_config &config)
-{
-	xavix2000(config);
-
-	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
-}
-
-void xavix_2000_nv_sdb_state::xavix2000_nv_sdb(machine_config &config)
-{
-	xavix2000_nv(config);
-
-	m_anport->read_0_callback().set(FUNC(xavix_2000_nv_sdb_state::sdb_anport0_r));
-	m_anport->read_1_callback().set(FUNC(xavix_2000_nv_sdb_state::sdb_anport1_r));
-	m_anport->read_2_callback().set(FUNC(xavix_2000_nv_sdb_state::sdb_anport2_r));
-	m_anport->read_3_callback().set(FUNC(xavix_2000_nv_sdb_state::sdb_anport3_r));
-}
-
-void xavix_i2c_state::xavix2000_i2c_24c04(machine_config &config)
-{
-	xavix2000(config);
-
-	I2C_24C04(config, "i2cmem", 0);
-}
-
-void xavix_i2c_state::xavix2000_i2c_24c02(machine_config &config)
-{
-	xavix2000(config);
-
-	I2C_24C02(config, "i2cmem", 0);
-}
 
 void xavix_mtrk_state::xavix_mtrk(machine_config &config)
 {
@@ -1843,28 +1559,6 @@
 }
 
 
-void xavix_i2c_state::xavix2002_i2c_24c04(machine_config &config)
-{
-	xavix2002(config);
-
-	I2C_24C04(config, "i2cmem", 0);
-}
-
-void xavix_i2c_state::xavix2002_i2c_mrangbat(machine_config &config)
-{
-	xavix2002(config);
-
-	I2C_24C02(config, "i2cmem", 0); // 24C02?
-
-	m_xavix2002io->read_0_callback().set_ioport("EX0");
-	//m_xavix2002io->write_0_callback().set(FUNC(xavix_i2c_jmat_state::write_extended_io0));
-	m_xavix2002io->read_1_callback().set_ioport("EX1");
-	//m_xavix2002io->write_1_callback().set(FUNC(xavix_i2c_jmat_state::write_extended_io1));
-	m_xavix2002io->read_2_callback().set_ioport("EX2");
-	//m_xavix2002io->write_2_callback().set(FUNC(xavix_i2c_jmat_state::write_extended_io2));
-
-}
-
 
 void xavix_state::init_xavix()
 {
@@ -2020,11 +1714,6 @@
 	ROM_LOAD("excitefishing.bin", 0x000000, 0x400000, CRC(9c85b261) SHA1(6a363faed2ec89c5176e46554a98ca1e20132579) )
 ROM_END
 
-ROM_START( epo_bowl )
-	ROM_REGION(0x200000, "bios", ROMREGION_ERASE00)
-	ROM_LOAD("bowling.bin", 0x000000, 0x200000, CRC(d34f8d9e) SHA1(ebe3792172dc43904b9226beb27f1da89d2388cc) )
-ROM_END
-
 ROM_START( epo_esdx )
 	ROM_REGION(0x400000, "bios", ROMREGION_ERASE00)
 	ROM_LOAD("baseballdx.bin", 0x000000, 0x400000, CRC(fe2e832e) SHA1(e6343f5e5f52316538d918d0d67c15764aa40f65) )
@@ -2279,7 +1968,7 @@
 CONS( 2000, epo_epp,   0,          0,  xavix,            epo_epp,  xavix_state,          init_xavix,    "Epoch / SSD Company LTD",                      "Excite Ping Pong (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
 CONS( 2000, epo_eppk,  epo_epp,    0,  xavix,            epo_epp,  xavix_state,          init_xavix,    "Epoch / SSD Company LTD / Sonokong",           "Real Ping Pong (Korea)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
 
-// Excite Ping Pong 2 is from 2003, and there's a 3rd game from 2006 also
+// Excite Ping Pong 2 is from 2003
 
 CONS( 2006, epo_epp3,   0,          0,  xavix,            epo_epp,  xavix_state,          init_xavix,    "Epoch / SSD Company LTD",                     "Challenge Ai-chan! Excite Ping Pong (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
 
@@ -2336,226 +2025,5 @@
 
 CONS( 2002, gcslottv, 0,           0,  xavix_cart_gcslottv,  gcslottv,     xavix_cart_gcslottv_state,     init_xavix,    "Takara / Sammy / DCT / SSD Company LTD",       "Gachinko Contest! Slot machine TV (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND /*|MACHINE_IS_BIOS_ROOT*/ )
 
-
-
 // Let’s!TVプレイ 超にんきスポット!ころがしほーだい たまごっちりぞーと   (Let's! TV Play Chou Ninki Spot! Korogashi-Houdai Tamagotchi Resort) (only on the Japanese list? http://test.shinsedai.co.jp/english/products/Applied/list.html )   This also allows you to use an IR reciever to import a Tamagotchi from compatible games
 CONS( 2006, ltv_tam,  0,           0,  xavix_i2c_24lc04_tam,  ltv_tam,xavix_i2c_ltv_tam_state,      init_xavix,    "Bandai / SSD Company LTD",                      "Let's! TV Play Chou Ninki Spot! Korogashi-Houdai Tamagotchi Resort (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-
-
-/* SuperXaviX(?) (XaviX 2000 type CPU) hardware titles (2nd XaviX generation?)
-
-   these use the SSD 2000 NEC 85605-621 type CPU
-
-   XavixPort Golf is "SSD 2003 SuperXaviX MXIC 2003 3009" (not dumped yet, but actually marked as SuperXaviX unlike the others!)
-
-   This CPU type adds extra opcodes that don't appear to be present in the 97/98 types
-   It does not appear to support the bitmap modes or 16-bit ROMs found in the 2002 type
-*/
-
-ROM_START( epo_sdb )
-	ROM_REGION(0x400000, "bios", ROMREGION_ERASE00)
-	ROM_LOAD("superdashball.bin", 0x000000, 0x400000, CRC(a004a764) SHA1(47a96822d4d7d6a0f6be5cd729c3747dbab65979) )
-ROM_END
-
-ROM_START( epo_ebox )
-	ROM_REGION(0x400000, "bios", ROMREGION_ERASE00)
-	ROM_LOAD("exciteboxing.bin", 0x000000, 0x400000, CRC(e25ae4f5) SHA1(7f7b613f0ab8f43f5cad0d13de538921e77cae9c) )
-ROM_END
-
-ROM_START( ttv_sw )
-	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "jedi.bin", 0x000000, 0x800000, CRC(51cae5fd) SHA1(1ed8d556f31b4182259ca8c766d60c824d8d9744) )
-ROM_END
-
-ROM_START( ttv_lotr )
-	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "lotr.bin", 0x000000, 0x800000, CRC(a034ecd5) SHA1(264a9d4327af0a075841ad6129db67d82cf741f1) )
-ROM_END
-
-ROM_START( ttv_mx )
-	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "mxdirtrebel.bin", 0x000000, 0x800000, CRC(e64bf1a1) SHA1(137f97d7d857697a13e0c8984509994dc7bc5fc5) )
-ROM_END
-
-ROM_START( drgqst )
-	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "dragonquest.bin", 0x000000, 0x800000, CRC(3d24413f) SHA1(1677e81cedcf349de7bf091a232dc82c6424efba) )
-ROM_END
-
-ROM_START( ban_onep )
-	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00)
-	ROM_LOAD("onepiece.bin", 0x000000, 0x800000, CRC(c5cb5a5f) SHA1(db85f6cc48d77c5a4967b9b8e2999167e3dfc8c8) )
-ROM_END
-
-
-CONS( 2002, epo_ebox, 0, 0, xavix2000_nv,        epo_epp,     xavix_state,             init_xavix, "Epoch / SSD Company LTD",       "Excite Boxing (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // doesn't use XaviX2000 extra opcodes, but had that type of CPU
- // die not confirmed, but uses extra opcodes.  (hangs on title screen due to combination of freq_timer_done nested interrupts tripping, and waiting on bits in input ports to change
-CONS( 2002, epo_bowl, 0, 0, xavix2000_i2c_24c02, epo_bowl,    xavix_i2c_state,         init_xavix, "Epoch / SSD Company LTD",       "Excite Bowling (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-
-CONS( 2004, epo_sdb,  0, 0, xavix2000_nv_sdb,    epo_sdb,     xavix_2000_nv_sdb_state, init_xavix, "Epoch / SSD Company LTD",       "Super Dash Ball (Japan)",  MACHINE_IMPERFECT_SOUND )
-
-CONS( 2005, ttv_sw,   0, 0, xavix2000_i2c_24c02, ttv_lotr,    xavix_i2c_lotr_state,    init_xavix, "Tiger / SSD Company LTD",       "Star Wars Saga Edition - Lightsaber Battle Game", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-CONS( 2005, ttv_lotr, 0, 0, xavix2000_i2c_24c02, ttv_lotr,    xavix_i2c_lotr_state,    init_xavix, "Tiger / SSD Company LTD",       "Lord Of The Rings - Warrior of Middle-Earth", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-CONS( 2005, ttv_mx,   0, 0, xavix2000_i2c_24c04, ttv_mx,      xavix_i2c_state,         init_xavix, "Tiger / SSD Company LTD",       "MX Dirt Rebel", MACHINE_IMPERFECT_SOUND )
-CONS( 2003, drgqst,   0, 0, xavix2000_i2c_24c02, ttv_lotr,    xavix_i2c_lotr_state,    init_xavix, "Square Enix / SSD Company LTD", "Kenshin Dragon Quest: Yomigaerishi Densetsu no Ken", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-
-// hangs after starting a game, or after quite a long time in attract mode (first problem could be bad save data read with the eeprom code, 2nd problem might just be how it is, ends up in a dead loop, not executing invalid code, idle timeout / battery saver)
-CONS( 2004, ban_onep, 0, 0, xavix2000_i2c_24c04, ttv_lotr,    xavix_i2c_lotr_state, init_xavix, "Bandai / SSD Company LTD",         "One Piece Punch Battle (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND )
-
-/* SuperXaviX (XaviX 2002 type CPU) hardware titles (3rd XaviX generation?)
-
-  these use the SSD 2002 NEC 85054-611 type CPU
-  differences include support for 16-bit ROMs, various bitmap modes, interlace screen modes etc.
-  possibly higher horizontal resolution for bitmap layers with others scaled to fit?
-
-*/
-
-/* The 'XaviXPORT' isn't a real console, more of a TV adapter, all the actual hardware (CPU including video hw, sound hw) is in the cartridges and controllers
-   and can vary between games, see notes at top of driver.
-
-   The 'Domyos Interactive System (DiS)' released in France by Decathlon appears to be identical to XaviXPORT (but for PAL regions, and with an entirely different software range)
-*/
-
-// XaviXPORT
-ROM_START( xavtenni )
-	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "xavixtennis.bin", 0x000000, 0x800000, CRC(23a1d918) SHA1(2241c59e8ea8328013e55952ebf9060ea0a4675b) )
-ROM_END
-
-ROM_START( xavbaseb )
-	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "xpbaseball.bin", 0x000000, 0x800000, CRC(e9ed692d) SHA1(537e390e972156dc7da66ee127ae4c8052038ee5) )
-ROM_END
-
-ROM_START( xavbowl )
-	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "xpbowling.bin", 0x000000, 0x800000, CRC(2873460b) SHA1(ea8e2392f5a12961a23eb66dca8e07dec81ce8c8) )
-ROM_END
-
-ROM_START( xavbassf )
-	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "xpbassfishing.bin", 0x000000, 0x800000, CRC(09ab2f29) SHA1(616254176315d0947002e9ae5a6371a3ffa2e8eb) )
-
-	// code for the nRF24E1s, stored in SEEPROMs.  One in the cartridge, one in the rod/reel
-	ROM_REGION( 0x1001, "reel_io", ROMREGION_ERASE00 )
-	ROM_LOAD( "xpbassfishingnrf24e1reel.bin", 0x0000, 0x1001, CRC(cfbb19ae) SHA1(32464e4e4be33fdbc7768311f93ce437a316c616) )
-
-	ROM_REGION( 0x800000, "base_io", ROMREGION_ERASE00 )
-	ROM_LOAD( "xpbassfishingnrf24e1cart.bin", 0x0000, 0x1001, CRC(62f6303e) SHA1(126b2663e252fb80948f53153e4046e63dd8be32) )
-ROM_END
-
-ROM_START( xavbox )
-	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "xpboxing.bin", 0x000000, 0x800000, CRC(b61e7717) SHA1(162b9c53ac8c9d7b6972db44f7bc1cb0a7837b70) )
-ROM_END
-
-// Several of the XaviXport and DiS games are 2 glob setups (and must have some kind of banking)
-
-ROM_START( xavjmat )
-	ROM_REGION( 0x0800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "u2", 0x0000000, 0x0800000, CRC(1420640d) SHA1(dd714cd57cff885293688f74f69b5c1726e20ec0) )
-
-	ROM_REGION( 0x0800000, "biosu3", ROMREGION_ERASE00 )
-	ROM_LOAD( "u3", 0x0000000, 0x0800000, CRC(52dc318c) SHA1(dc50e0747ba29cfb1048fd4a55d26870086c869b) )
-ROM_END
-
-// currently copies the wrong code into RAM to execute (due to extended ROM size, and possible banking)
-// [:] ':maincpu' (00E074): rom_dmatrg_w (do DMA?) 01
-// [:]   (possible DMA op SRC 00ebe2d3 DST 358a LEN 0398)
-//         needs to come from 006be2d3 (so still from lower 8MB, not upper 8MB)
-
-ROM_START( xavmusic )
-	ROM_REGION( 0x0800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "u2", 0x0000000, 0x0800000, CRC(e7c8ad59) SHA1(d47fac8b480de4db88a1b306ff8830a65d1738a3) )
-
-	ROM_REGION( 0x0800000, "biosu3", ROMREGION_ERASE00 )
-	ROM_LOAD( "u3", 0x0000000, 0x0800000, CRC(977c956f) SHA1(debc086d0cf6c391002ad163e7bfaa2f010cc8f5) )
-ROM_END
-
-
-// Domyos DiS (XaviX 2002 based titles)
-ROM_START( domfitex )
-	ROM_REGION( 0x0800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "u2", 0x0000000, 0x0800000,  CRC(841fe3cd) SHA1(8678b8a0c5198b24169a84dbe3ae979bb0838f23) )
-
-	ROM_REGION( 0x0800000, "biosu3", ROMREGION_ERASE00 )
-	ROM_LOAD( "u3", 0x0000000, 0x0800000, CRC(1dc844ea) SHA1(c23da9006227f7fe4982998c17759d403a47472a) )
-ROM_END
-
-ROM_START( domfitch )
-	ROM_REGION( 0x0800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "u2", 0x0000000, 0x0800000, CRC(0ff2a7a6) SHA1(9b924cc4330e3f8d9204390854048fe2325bfdf7) )
-
-	ROM_REGION( 0x0800000, "biosu3", ROMREGION_ERASE00 )
-	ROM_LOAD( "u3", 0x0000000, 0x0800000, CRC(284583f6) SHA1(bd2d5304f1e01eed656b5de957ec0a0330a3d969) )
-ROM_END
-
-ROM_START( domdance )
-	ROM_REGION( 0x0800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "u2", 0x0000000, 0x0800000, CRC(74f9499d) SHA1(a64235075e32567cd6d2ab7b1284efcb8e7538e2) )
-
-	ROM_REGION( 0x0800000, "biosu3", ROMREGION_ERASE00 )
-	ROM_LOAD( "u3", 0x0000000, 0x0800000, CRC(e437565c) SHA1(f6db219ea14404b698ca453f6e50c726b2e77abb) )
-ROM_END
-
-ROM_START( domstepc )
-	ROM_REGION( 0x0800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "u2", 0x0000000, 0x0800000, CRC(cb37b5e9) SHA1(b742e3db98f36720adf5af9096c6bc235279de12) )
-
-	ROM_REGION( 0x0800000, "biosu3", ROMREGION_ERASE00 )
-	ROM_LOAD( "u3", 0x0000000, 0x0800000, CRC(dadaa744) SHA1(fd7ca77232a8fe228fc93b0a8a47ba3260349d90) )
-ROM_END
-
-ROM_START( mrangbat )
-	ROM_REGION(0x400000, "bios", ROMREGION_ERASE00)
-	ROM_LOAD("powerrangerspad.bin", 0x000000, 0x400000, CRC(d3a98775) SHA1(485c66242dd0ee436a278d23005aece48d606431) )
-ROM_END
-
-ROM_START( tmy_thom )
-	ROM_REGION( 0x800000, "bios", ROMREGION_ERASE00 )
-	ROM_LOAD( "thomastank.bin", 0x000000, 0x800000, CRC(a52a23be) SHA1(e5b3500239d9e56eb5405f7585982959e5a162da) )
-ROM_END
-
-ROM_START( epo_tfit )
-	ROM_REGION(0x400000, "bios", ROMREGION_ERASE00)
-	ROM_LOAD("tennisfitness.bin", 0x000000, 0x400000, CRC(cbf65bd2) SHA1(30b3da6f061b2dd91679db42a050f715901beb87) )
-ROM_END
-
-
-CONS( 2004, xavtenni, 0, 0, xavix2002_i2c_24c04, xavix_i2c,  xavix_i2c_state,      init_xavix, "SSD Company LTD",         "XaviX Tennis (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-CONS( 2004, xavbaseb, 0, 0, xavix2002_i2c_24c04, xavix_i2c,  xavix_i2c_state,      init_xavix, "SSD Company LTD",         "XaviX Baseball (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-CONS( 2004, xavbowl,  0, 0, xavix2002_i2c_24c04, xavix_bowl, xavix_i2c_bowl_state, init_xavix, "SSD Company LTD",         "XaviX Bowling (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // has IR 'Camera'
-CONS( 2004, xavbox,   0, 0, xavix2002_i2c_jmat, xavix,  xavix_i2c_jmat_state,      init_xavix, "SSD Company LTD",         "XaviX Boxing (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND ) // has IR 'Camera'
-// Bass Fishing PCB is just like Tennis except with an RF daughterboard.
-CONS( 2004, xavbassf, 0, 0, xavix2002_i2c_24c04, xavix_i2c,  xavix_i2c_state,      init_xavix, "SSD Company LTD",         "XaviX Bass Fishing (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-// TODO: check SEEPROM type and hookup, banking!
-CONS( 2005, xavjmat,  0, 0, xavix2002_i2c_jmat,  xavix,      xavix_i2c_jmat_state, init_xavix, "SSD Company LTD",         "Jackie Chan J-Mat Fitness (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-CONS( 2007, xavmusic, 0, 0, xavix2002_i2c_jmat,  xavix,      xavix_i2c_jmat_state, init_xavix, "SSD Company LTD",         "XaviX Music & Circuit (XaviXPORT)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-// https://arnaudmeyer.wordpress.com/domyos-interactive-system/
-// Domyos Fitness Adventure
-// Domyos Fitness Challenge
-// Domyos Fitness Exercises
-// Domyos Fit Race
-// Domyos Soft Fitness
-// Domyos Fitness Dance
-// Domyos Fitness Play
-// Domyos Fitness Training
-
-// Domyos Bike Concept (not listed on site above)
-
-// Has SEEPROM and an RTC.  Exercise has some leftover PC buffer stuff.  (TODO, check SEEPROM type, RTC type, banking) (both Exercises and Challenge are identical PCBs)
-CONS( 2008, domfitex, 0, 0, xavix2002_i2c_jmat, xavixp, xavix_i2c_jmat_state, init_xavix, "Decathlon / SSD Company LTD", "Domyos Fitness Exercises (Domyos Interactive System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-CONS( 2008, domfitch, 0, 0, xavix2002_i2c_jmat, xavixp, xavix_i2c_jmat_state, init_xavix, "Decathlon / SSD Company LTD", "Domyos Fitness Challenge (Domyos Interactive System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-CONS( 2007, domdance, 0, 0, xavix2002_i2c_jmat, xavixp, xavix_i2c_jmat_state, init_xavix, "Decathlon / SSD Company LTD", "Domyos Fitness Dance (Domyos Interactive System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-CONS( 2007, domstepc, 0, 0, xavix2002_i2c_jmat, xavixp, xavix_i2c_jmat_state, init_xavix, "Decathlon / SSD Company LTD", "Domyos Step Concept (Domyos Interactive System)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-// some DIS games run on XaviX 2 instead, see xavix2.cpp for Domyos Fitness Adventure and Domyos Bike Concept
-
-CONS( 2005, mrangbat, 0, 0, xavix2002_i2c_mrangbat, mrangbat,   xavix_i2c_state, init_xavix, "Bandai / SSD Company LTD", "Mahou Taiketsu Magiranger - Magimat de Dance & Battle (Japan)", MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
-
-CONS( 2004, epo_tfit, 0, 0, xavix2002_i2c_24c04,    epo_tfit,   xavix_i2c_state, init_xavix, "Epoch / SSD Company LTD",  "Excite Sports Tennis x Fitness (Japan)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_SOUND ) // Epoch Tennis and Fitness has 24LC04
-
-// TODO: does it have an SEEPROM? why does it hang? full title?
-CONS( 2005, tmy_thom, 0, 0, xavix2002_i2c_24c04,    xavix_i2c,  xavix_i2c_state, init_xavix, "Tomy / SSD Company LTD",   "Thomas and Friends (Tomy)", MACHINE_NOT_WORKING | MACHINE_IMPERFECT_GRAPHICS | MACHINE_IMPERFECT_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/xmen.cpp mame-0.224+dfsg.1/src/mame/drivers/xmen.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/xmen.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/xmen.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -8,13 +8,19 @@
 
 notes:
 
-the way the double screen works in xmen6p is not fully understood
+The way the double screen works in xmen6p is not fully understood.
 
-the board only has one of each gfx chip, the only additional chip not found
+One of the screens probably has a buffer to delay it by 1 frame. If you
+hardcode buffering to the right screen, the intro is synced correctly,
+but in-game is not. Buffer the left screen and then in-game is correct,
+but the intro is not.
+
+The board only has one of each gfx chip, the only additional chip not found
 on the 2/4p board is 053253.  This chip is also on Run n Gun which is
-likewise a 2 screen game
+likewise a 2 screen game.
 
 ***************************************************************************/
+
 #include "emu.h"
 #include "includes/xmen.h"
 #include "includes/konamipt.h"
@@ -46,8 +52,11 @@
 		/* bit 2 is data */
 		/* bit 3 is clock (active high) */
 		/* bit 4 is cs (active low) */
-		/* bit 5 is enabled in IRQ3, disabled in IRQ5 (sprite DMA start?) */
 		ioport("EEPROMOUT")->write(data, 0xff);
+
+		/* bit 5 is enabled in IRQ3, disabled in IRQ5 (sprite DMA start?) */
+		/* bit 7 used in xmen6p to select other tilemap bank (see halfway level 5) */
+		m_xmen6p_tilemap_select = BIT(data, 7);
 	}
 	if (ACCESSING_BITS_8_15)
 	{
@@ -56,7 +65,7 @@
 		/* bit 9 = enable char ROM reading through the video RAM */
 		/* bit 10 = sound irq, but with some kind of hold */
 		m_k052109->set_rmrd_line((data & 0x0200) ? ASSERT_LINE : CLEAR_LINE);
-		if(data & 0x4) {
+		if(data & 0x400) {
 			logerror("tick!\n");
 			m_audiocpu->set_input_line(0, HOLD_LINE);
 		}
@@ -114,9 +123,9 @@
 {
 	map(0x000000, 0x03ffff).rom();
 	map(0x080000, 0x0fffff).rom();
-	map(0x100000, 0x100fff).ram().share("spriteramleft");   /* sprites (screen 1) */
+	map(0x100000, 0x100fff).ram().share("spriteram0"); // left screen
 	map(0x101000, 0x101fff).ram();
-	map(0x102000, 0x102fff).ram().share("spriteramright");  /* sprites (screen 2) */
+	map(0x102000, 0x102fff).ram().share("spriteram1"); // right screen
 	map(0x103000, 0x103fff).ram();     /* 6p - a buffer? */
 	map(0x104000, 0x104fff).ram().w("palette", FUNC(palette_device::write16)).share("palette");
 	map(0x108000, 0x108001).w(FUNC(xmen_state::eeprom_w));
@@ -130,7 +139,7 @@
 	map(0x10a00c, 0x10a00d).r(m_k053246, FUNC(k053247_device::k053246_r)); /* sprites */
 	map(0x110000, 0x113fff).ram();     /* main RAM */
 /*  map(0x18c000, 0x197fff).w("k052109", FUNC(k052109_device:write)).umask16(0x00ff).share("tilemapleft"); */
-	map(0x18c000, 0x197fff).ram().share("tilemapleft"); /* left tilemap (p1,p2,p3 counters) */
+	map(0x18c000, 0x197fff).ram().share("tilemap0"); // left screen
 	map(0x18fa00, 0x18fa01).w(FUNC(xmen_state::xmen_18fa00_w));
 /*
     map(0x1ac000, 0x1af7ff).readonly();
@@ -142,7 +151,7 @@
     map(0x1b4000, 0x1b77ff).readonly();
     map(0x1b4000, 0x1b77ff).writeonly();
 */
-	map(0x1ac000, 0x1b7fff).ram().share("tilemapright"); /* right tilemap */
+	map(0x1ac000, 0x1b7fff).ram().share("tilemap1"); // right screen
 
 	/* what are the regions below buffers? (used by hw or software?) */
 /*
@@ -152,7 +161,7 @@
     map(0x1d0000, 0x1d37ff).readonly();
     map(0x1d0000, 0x1d37ff).writeonly();
 */
-	map(0x1cc000, 0x1d7fff).ram(); /* tilemap ? */
+	map(0x1cc000, 0x1d7fff).ram().share("tilemap2"); // left screen
 
 	/* whats the stuff below, buffers? */
 /*
@@ -163,7 +172,7 @@
     map(0x1f4000, 0x1f77ff).readonly();
     map(0x1f4000, 0x1f77ff).writeonly();
 */
-	map(0x1ec000, 0x1f7fff).ram(); /* tilemap ? */
+	map(0x1ec000, 0x1f7fff).ram().share("tilemap3"); // right screen
 }
 
 
@@ -270,13 +279,12 @@
 	save_item(NAME(m_layer_colorbase));
 	save_item(NAME(m_layerpri));
 	save_item(NAME(m_vblank_irq_mask));
+	save_item(NAME(m_xmen6p_tilemap_select));
 }
 
 void xmen_state::machine_reset()
 {
-	int i;
-
-	for (i = 0; i < 3; i++)
+	for (int i = 0; i < 3; i++)
 	{
 		m_layerpri[i] = 0;
 		m_layer_colorbase[i] = 0;
@@ -295,7 +303,6 @@
 
 	if(scanline == 0) // sprite DMA irq?
 		m_maincpu->set_input_line(5, HOLD_LINE);
-
 }
 
 void xmen_state::xmen(machine_config &config)
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/z80ne.cpp mame-0.224+dfsg.1/src/mame/drivers/z80ne.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/z80ne.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/z80ne.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -87,8 +87,36 @@
             9000-9FFF EPROM     EPROM to be written
             8400-8FFF EPROM     firmware
 
+Quick Instructions:
+  Z80NE:
+  - Use 0-F to enter an address (or use mouse in artwork)
+  - Hold CTRL press 0 to show data at that address (CTRL cannot be held with mouse)
+  - Use 0-F to enter data
+  - CTRL 0 to advance to next address
+  - CTRL 2 to view/change CPU registers
+  - CTRL 0 change register, advance to next
+  Z80NET
+  - In Machine Configuration, select your preferred baud rate, and reboot machine.
+  - CTRL 6 to load a tape, press A or B to choose tape device, choose Play.
+  - After this, click any key, enter 1000, CTRL 4 to run.
+  - CTRL 5 to save
+  - All tapes in software list (except bioritmi & tapebas) are BASIC programs.
+  - To use tapebas, load side 1 in the normal way, run it, select side 2 for cas 0, play, the rest loads
+  - The Basic is bilingual - ENG for English, ITA for Italian, so enter ENG.
+  - Then for any Basic program in software list: CLOAD hit Play RUN
+  Z80NETB
+  - BASIC-only, English only. A version of TRS80 Level II Basic. Not compatible with software list.
+  Z80NETF
+  - There is a choice of 5 bioses, via the Machine Configuration menu
+  - EP382:  same as Z80NET.
+  - EP548:  same as Z80NETB.
+  - EP390:  for swlist-item "basic55k". Press B, from the menu select 2, runs. Type ENG for English.
+            It can load and run tapes from the swlist, although it seems to often have load errors.
+  - EP1390: requires a floppy to boot from. Disks marked as NE-DOS 1.5 should work.
+  - EP2390: uses ports 8x, not emulated, not working. For NE-DOS G.1
 
-******************************************************************************/
+
+*********************************************************************************************************/
 
 /* Core includes */
 #include "emu.h"
@@ -113,25 +141,22 @@
 
 /* LX.382 CPU Board RAM */
 /* LX.382 CPU Board EPROM */
-void z80ne_state::main_mem(address_map &map)
+void z80ne_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x03ff).bankrw("bank1");
-	map(0x0400, 0x7fff).ram();
-	map(0x8000, 0x83ff).bankr("bank2");
-	map(0x8400, 0xffff).nopr().nopw();
+	map(0x0000, 0x7fff).ram().share("mainram");
+	map(0x8000, 0x83ff).rom().region("maincpu",0);
 }
 
-void z80net_state::main_mem(address_map &map)
+void z80net_state::mem_map(address_map &map)
 {
-	map(0x0000, 0x03ff).bankrw("bank1");
-	map(0x0400, 0x7fff).ram();
-	map(0x8000, 0x83ff).bankr("bank2");
+	map(0x0000, 0x7fff).ram().share("mainram");
+	map(0x8000, 0x83ff).rom().region("maincpu",0);
 	map(0x8400, 0xebff).ram();
 	map(0xec00, 0xedff).ram().share("videoram"); /* (6847) */
 	map(0xee00, 0xffff).ram();
 }
 
-void z80netb_state::main_mem(address_map &map)
+void z80netb_state::mem_map(address_map &map)
 {
 	map(0x0000, 0x3fff).rom();
 	map(0x4000, 0xebff).ram();
@@ -139,7 +164,7 @@
 	map(0xee00, 0xffff).ram();
 }
 
-void z80ne_state::main_io(address_map &map)
+void z80ne_state::io_map(address_map &map)
 {
 	map.global_mask(0xff);
 	map(0xee, 0xee).rw(m_uart, FUNC(ay31015_device::receive), FUNC(ay31015_device::transmit));
@@ -147,7 +172,7 @@
 	map(0xf0, 0xff).rw(FUNC(z80ne_state::lx383_r), FUNC(z80ne_state::lx383_w));
 }
 
-void z80net_state::main_io(address_map &map)
+void z80net_state::io_map(address_map &map)
 {
 	map.global_mask(0xff);
 	map(0xea, 0xea).r(FUNC(z80net_state::lx387_data_r));
@@ -157,21 +182,18 @@
 	map(0xf0, 0xff).rw(FUNC(z80net_state::lx383_r), FUNC(z80net_state::lx383_w));
 }
 
-void z80netf_state::main_mem(address_map &map)
+void z80netf_state::mem_map(address_map &map)
 {
 	map(0x0000, 0x03ff).bankrw("bank1");
 	map(0x0400, 0x3fff).bankrw("bank2");
 	map(0x4000, 0x7fff).ram();
 	map(0x8000, 0x83ff).bankrw("bank3");
 	map(0x8400, 0xdfff).ram();
-	map(0xe000, 0xebff).nopr().nopw();
 	map(0xec00, 0xedff).ram().share("videoram"); /* (6847) */
-	map(0xee00, 0xefff).nopr().nopw();
 	map(0xf000, 0xf3ff).bankrw("bank4");
-	map(0xf400, 0xffff).nopr().nopw();
 }
 
-void z80netf_state::main_io(address_map &map)
+void z80netf_state::io_map(address_map &map)
 {
 	map.global_mask(0xff);
 	map(0xd0, 0xd7).rw(FUNC(z80netf_state::lx390_fdc_r), FUNC(z80netf_state::lx390_fdc_w));
@@ -195,30 +217,30 @@
 	 * In natural mode the CTRL key is mapped on shift
 	 */
 	PORT_START("ROW0")          /* IN0 keys row 0 */
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 0") PORT_CODE(KEYCODE_0)          //PORT_CHAR('0') PORT_CHAR('=')
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 1") PORT_CODE(KEYCODE_1)          //PORT_CHAR('1') PORT_CHAR('!')
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 2") PORT_CODE(KEYCODE_2)          //PORT_CHAR('2') PORT_CHAR('"')
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 3") PORT_CODE(KEYCODE_3)          //PORT_CHAR('3') PORT_CHAR(0x00a3) // ??
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 4") PORT_CODE(KEYCODE_4)          //PORT_CHAR('4') PORT_CHAR('$')
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 5") PORT_CODE(KEYCODE_5)          //PORT_CHAR('5') PORT_CHAR('%')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 6") PORT_CODE(KEYCODE_6)          //PORT_CHAR('6') PORT_CHAR('&')
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 7") PORT_CODE(KEYCODE_7)          //PORT_CHAR('7') PORT_CHAR('/')
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 0") PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR('=') // set address, increment
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 1") PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('-') // ?
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 2") PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('R') // registers
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 3") PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('T') // single-step
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 4") PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('X') // go
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 5") PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('L') // load
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 6") PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('S') // save
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 7") PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('K') // reserved for future expansion
 
 	PORT_START("ROW1")          /* IN1 keys row 1 */
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 8") PORT_CODE(KEYCODE_8)          //PORT_CHAR('8') PORT_CHAR('(')
-	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 9") PORT_CODE(KEYCODE_9)          //PORT_CHAR('9') PORT_CHAR(')')
-	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 A") PORT_CODE(KEYCODE_A)          //PORT_CHAR('a') PORT_CHAR('A')
-	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 B") PORT_CODE(KEYCODE_B)          //PORT_CHAR('b') PORT_CHAR('B')
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 C") PORT_CODE(KEYCODE_C)          //PORT_CHAR('c') PORT_CHAR('C')
-	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 D") PORT_CODE(KEYCODE_D)          //PORT_CHAR('d') PORT_CHAR('D')
-	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 E") PORT_CODE(KEYCODE_E)          //PORT_CHAR('e') PORT_CHAR('E')
-	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 F") PORT_CODE(KEYCODE_F)          //PORT_CHAR('f') PORT_CHAR('F')
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 8") PORT_CODE(KEYCODE_8) PORT_CHAR('8')
+	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 9") PORT_CODE(KEYCODE_9) PORT_CHAR('9')
+	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 A") PORT_CODE(KEYCODE_A) PORT_CHAR('A')
+	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 B") PORT_CODE(KEYCODE_B) PORT_CHAR('B')
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 C") PORT_CODE(KEYCODE_C) PORT_CHAR('C')
+	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 D") PORT_CODE(KEYCODE_D) PORT_CHAR('D')
+	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 E") PORT_CODE(KEYCODE_E) PORT_CHAR('E')
+	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 F") PORT_CODE(KEYCODE_F) PORT_CHAR('F')
 
 	PORT_START("CTRL")          /* CONTROL key */
 	PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_UNUSED )
-	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 CTRL") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) //PORT_CHAR(UCHAR_SHIFT_1)
+	PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 CTRL") PORT_CODE(KEYCODE_LCONTROL) PORT_CODE(KEYCODE_RCONTROL) PORT_CHAR(UCHAR_SHIFT_1)
 	PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_UNUSED )
 	PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNUSED )
@@ -227,7 +249,7 @@
 	PORT_START("RST")           /* RESET key */
 	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("LX.384 Reset")  PORT_CODE(KEYCODE_F3) PORT_CHANGED_MEMBER(DEVICE_SELF, z80ne_state, z80ne_reset, 0)
 
-	/* Settings */
+	/* Settings - need to reboot after altering these */
 	PORT_START("LX.385")
 	PORT_CONFNAME(0x07, 0x04, "LX.385 Cassette: P1,P3 Data Rate")
 	PORT_CONFSETTING( 0x01, "A-B: 300 bps")
@@ -246,7 +268,7 @@
 
 	/* LX.387 Keyboard BREAK key */
 	PORT_START("LX387_BRK")
-	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Break") PORT_CODE(KEYCODE_INSERT) PORT_CHAR(UCHAR_MAMEKEY(INSERT)) PORT_CHANGED_MEMBER(DEVICE_SELF, z80net_state, z80net_nmi, 0)
+	PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Break") PORT_CODE(KEYCODE_END) PORT_CHAR(UCHAR_MAMEKEY(END)) PORT_CHANGED_MEMBER(DEVICE_SELF, z80net_state, z80net_nmi, 0)
 
 	/* LX.387 Keyboard (Encoded by KR2376) */
 
@@ -419,8 +441,8 @@
 {
 	/* basic machine hardware */
 	Z80(config, m_maincpu, Z80NE_CPU_SPEED_HZ);
-	m_maincpu->set_addrmap(AS_PROGRAM, &z80ne_state::main_mem);
-	m_maincpu->set_addrmap(AS_IO, &z80ne_state::main_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &z80ne_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &z80ne_state::io_map);
 
 	AY31015(config, m_uart);
 
@@ -442,9 +464,6 @@
 
 	config.set_default_layout(layout_z80ne);
 
-	/* internal ram */
-	RAM(config, m_ram).set_default_size("32K");
-
 	// all known tapes require LX.388 expansion
 	//SOFTWARE_LIST(config, "cass_list").set_original("z80ne_cass");
 }
@@ -468,8 +487,8 @@
 {
 	z80ne(config);
 
-	m_maincpu->set_addrmap(AS_PROGRAM, &z80net_state::main_mem);
-	m_maincpu->set_addrmap(AS_IO, &z80net_state::main_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &z80net_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &z80net_state::io_map);
 
 	lx387(config);
 
@@ -484,9 +503,6 @@
 
 	config.set_default_layout(layout_z80net);
 
-	/* internal ram */
-	m_ram->set_default_size("32K").set_extra_options("1K");
-
 	SOFTWARE_LIST(config, "cass_list").set_original("z80ne_cass");
 }
 
@@ -494,8 +510,8 @@
 {
 	/* basic machine hardware */
 	Z80(config, m_maincpu, Z80NE_CPU_SPEED_HZ);
-	m_maincpu->set_addrmap(AS_PROGRAM, &z80netb_state::main_mem);
-	m_maincpu->set_addrmap(AS_IO, &z80netb_state::main_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &z80netb_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &z80netb_state::io_map);
 
 	AY31015(config, m_uart);
 
@@ -528,18 +544,16 @@
 
 	config.set_default_layout(layout_z80netb);
 
-	/* internal ram */
-	RAM(config, m_ram).set_default_size("32K").set_extra_options("1K");
-
-	SOFTWARE_LIST(config, "cass_list").set_original("z80ne_cass");
+	// none of the software is compatible
+	//SOFTWARE_LIST(config, "cass_list").set_original("z80ne_cass");
 }
 
 void z80netf_state::z80netf(machine_config &config)
 {
 	/* basic machine hardware */
 	Z80(config, m_maincpu, Z80NE_CPU_SPEED_HZ);
-	m_maincpu->set_addrmap(AS_PROGRAM, &z80netf_state::main_mem);
-	m_maincpu->set_addrmap(AS_IO, &z80netf_state::main_io);
+	m_maincpu->set_addrmap(AS_PROGRAM, &z80netf_state::mem_map);
+	m_maincpu->set_addrmap(AS_IO, &z80netf_state::io_map);
 
 	AY31015(config, m_uart);
 
@@ -579,7 +593,7 @@
 	config.set_default_layout(layout_z80netf);
 
 	/* internal ram */
-	RAM(config, m_ram).set_default_size("56K");
+	RAM(config, m_ram).set_default_size("56K").set_default_value(0x00);
 
 	SOFTWARE_LIST(config, "cass_list").set_original("z80ne_cass");
 	SOFTWARE_LIST(config, "flop_list").set_original("z80ne_flop");
@@ -591,20 +605,20 @@
 
 
 ROM_START( z80ne )
-	ROM_REGION(0x20000, "z80ne", 0)
-	ROM_LOAD( "ep382.ic5", 0x14000, 0x0400, CRC(55818366) SHA1(adcac04b83c09265517b7bafbc2f5f665d751bec) )
+	ROM_REGION(0x0400, "maincpu", 0)
+	ROM_LOAD( "ep382.ic5", 0x0000, 0x0400, CRC(55818366) SHA1(adcac04b83c09265517b7bafbc2f5f665d751bec) )
 ROM_END
 
 ROM_START( z80net )
-	ROM_REGION(0x20000, "z80ne", 0)
-	ROM_LOAD( "ep382.ic5", 0x14000, 0x0400, CRC(55818366) SHA1(adcac04b83c09265517b7bafbc2f5f665d751bec) )
+	ROM_REGION(0x0400, "maincpu", 0)
+	ROM_LOAD( "ep382.ic5", 0x0000, 0x0400, CRC(55818366) SHA1(adcac04b83c09265517b7bafbc2f5f665d751bec) )
 ROM_END
 
 ROM_START( z80netb )
 /*
  * 16k Basic
  */
-	ROM_REGION(0x10000, "z80ne", 0)
+	ROM_REGION(0x4000, "maincpu", 0)
 	ROM_LOAD( "548-1.ic1", 0x0000, 0x0800, CRC(868cad39) SHA1(0ea8af010786a080f823a879a4211f5712d260da) )
 	ROM_LOAD( "548-2.ic2", 0x0800, 0x0800, CRC(ac297d99) SHA1(ccf31d3f9d02c3b68a0ee3be4984424df0e83ab0) )
 	ROM_LOAD( "548-3.ic3", 0x1000, 0x0800, CRC(9c1fe511) SHA1(ff5b6e49a137c2ff9cb760c39bfd85ce4b52bb7d) )
@@ -616,30 +630,29 @@
 ROM_END
 
 ROM_START( z80netf )
-	ROM_REGION(0x20000, "z80ne", 0) /* 64k for code  64k for banked code */
+	ROM_REGION(0x5000, "maincpu", 0)
 	/* ep548 banked at 0x0000 - 0x3FFF */
-	ROM_LOAD(  "548-1.ic1", 0x10000, 0x0800, CRC(868cad39) SHA1(0ea8af010786a080f823a879a4211f5712d260da) )
-	ROM_LOAD(  "548-2.ic2", 0x10800, 0x0800, CRC(ac297d99) SHA1(ccf31d3f9d02c3b68a0ee3be4984424df0e83ab0) )
-	ROM_LOAD(  "548-3.ic3", 0x11000, 0x0800, CRC(9c1fe511) SHA1(ff5b6e49a137c2ff9cb760c39bfd85ce4b52bb7d) )
-	ROM_LOAD(  "548-4.ic4", 0x11800, 0x0800, CRC(cb5e0de3) SHA1(0beaa8927faaf61f6c3fc0ea1d3d5670f901aae3) )
-	ROM_LOAD(  "548-5.ic5", 0x12000, 0x0800, CRC(0bd4559c) SHA1(e736a3124819ffb43e96a8114cd188f18d538053) )
-	ROM_LOAD(  "548-6.ic6", 0x12800, 0x0800, CRC(6d663034) SHA1(57588be4e360658dbb313946d7a608e36c1fdd68) )
-	ROM_LOAD(  "548-7.ic7", 0x13000, 0x0800, CRC(0bab06c0) SHA1(d52f1519c798e91f25648e996b1db174d90ce0f5) )
-	ROM_LOAD(  "548-8.ic8", 0x13800, 0x0800, CRC(f381b594) SHA1(2de7a8941ba48d463974c73d62e994d3cbe2868d) )
-
-	/* ep382 - banked at 0x0000 - 0x03FF */
-	ROM_LOAD(  "ep382.ic5", 0x14000, 0x0400, CRC(55818366) SHA1(adcac04b83c09265517b7bafbc2f5f665d751bec) )
-
-	/* ep390 - banked at 0x0000 - 0x03FF */
-	ROM_LOAD(  "ep390.ic6", 0x14400, 0x0400, CRC(e4dd7de9) SHA1(523caa97112a9e67cc078c1a70ceee94ec232093) )
-	/* ep1390 - banked at 0x0000 - 0x03FF */
-	ROM_LOAD( "ep1390.ic6", 0x14800, 0x0400, CRC(dc2cbc1d) SHA1(e23418b8f8261a17892f3a73ec09c72bb02e1d0b) )
-	/* ep2390 - banked at 0x0000 - 0x03FF */
-	ROM_LOAD( "ep2390.ic6", 0x14C00, 0x0400, CRC(28d28eee) SHA1(b80f75c1ac4905ae369ecbc9b9ce120cc85502ed) )
+	ROM_LOAD(  "548-1.ic1", 0x0000, 0x0800, CRC(868cad39) SHA1(0ea8af010786a080f823a879a4211f5712d260da) )
+	ROM_LOAD(  "548-2.ic2", 0x0800, 0x0800, CRC(ac297d99) SHA1(ccf31d3f9d02c3b68a0ee3be4984424df0e83ab0) )
+	ROM_LOAD(  "548-3.ic3", 0x1000, 0x0800, CRC(9c1fe511) SHA1(ff5b6e49a137c2ff9cb760c39bfd85ce4b52bb7d) )
+	ROM_LOAD(  "548-4.ic4", 0x1800, 0x0800, CRC(cb5e0de3) SHA1(0beaa8927faaf61f6c3fc0ea1d3d5670f901aae3) )
+	ROM_LOAD(  "548-5.ic5", 0x2000, 0x0800, CRC(0bd4559c) SHA1(e736a3124819ffb43e96a8114cd188f18d538053) )
+	ROM_LOAD(  "548-6.ic6", 0x2800, 0x0800, CRC(6d663034) SHA1(57588be4e360658dbb313946d7a608e36c1fdd68) )
+	ROM_LOAD(  "548-7.ic7", 0x3000, 0x0800, CRC(0bab06c0) SHA1(d52f1519c798e91f25648e996b1db174d90ce0f5) )
+	ROM_LOAD(  "548-8.ic8", 0x3800, 0x0800, CRC(f381b594) SHA1(2de7a8941ba48d463974c73d62e994d3cbe2868d) )
+
+	/* ep382 - 8000 */
+	ROM_LOAD(  "ep382.ic5", 0x4000, 0x0400, CRC(55818366) SHA1(adcac04b83c09265517b7bafbc2f5f665d751bec) )
+	/* ep390 - F000 */
+	ROM_LOAD(  "ep390.ic6", 0x4400, 0x0400, CRC(e4dd7de9) SHA1(523caa97112a9e67cc078c1a70ceee94ec232093) )
+	/* ep1390 - F000 */
+	ROM_LOAD( "ep1390.ic6", 0x4800, 0x0400, CRC(dc2cbc1d) SHA1(e23418b8f8261a17892f3a73ec09c72bb02e1d0b) )
+	/* ep2390 - F000 */
+	ROM_LOAD( "ep2390.ic6", 0x4C00, 0x0400, CRC(28d28eee) SHA1(b80f75c1ac4905ae369ecbc9b9ce120cc85502ed) )
 ROM_END
 
 //    YEAR  NAME     PARENT  COMPAT  MACHINE  INPUT    CLASS          INIT        COMPANY               FULLNAME                      FLAGS
-COMP( 1980, z80ne,   0,      0,      z80ne,   z80ne,   z80ne_state,   empty_init, "Nuova Elettronica",  "Z80NE",                      MACHINE_NO_SOUND_HW)
-COMP( 1980, z80net,  z80ne,  0,      z80net,  z80net,  z80net_state,  empty_init, "Nuova Elettronica",  "Z80NE + LX.388",             MACHINE_NO_SOUND_HW)
-COMP( 1980, z80netb, z80ne,  0,      z80netb, z80net,  z80netb_state, empty_init, "Nuova Elettronica",  "Z80NE + LX.388 + Basic 16k", MACHINE_NO_SOUND_HW)
-COMP( 1980, z80netf, z80ne,  0,      z80netf, z80netf, z80netf_state, empty_init, "Nuova Elettronica",  "Z80NE + LX.388 + LX.390",    MACHINE_NO_SOUND_HW)
+COMP( 1980, z80ne,   0,      0,      z80ne,   z80ne,   z80ne_state,   init_z80ne, "Nuova Elettronica",  "Z80NE",                      MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+COMP( 1980, z80net,  z80ne,  0,      z80net,  z80net,  z80net_state,  init_z80ne, "Nuova Elettronica",  "Z80NE + LX.388",             MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+COMP( 1980, z80netb, z80ne,  0,      z80netb, z80net,  z80netb_state, init_z80ne, "Nuova Elettronica",  "Z80NE + LX.388 + Basic 16k", MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
+COMP( 1980, z80netf, z80ne,  0,      z80netf, z80netf, z80netf_state, empty_init, "Nuova Elettronica",  "Z80NE + LX.388 + LX.390",    MACHINE_NO_SOUND_HW | MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/zaurus.cpp mame-0.224+dfsg.1/src/mame/drivers/zaurus.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/zaurus.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/zaurus.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -5,10 +5,7 @@
     Sharp Zaurus PDA skeleton driver (SL, ARM/Linux based, 4th generation)
 
     TODO:
-    - PXA-255 ID opcode fails on this
     - ARM TLB look-up errors?
-    - RTC IRQ doesn't fire?
-    - For whatever reason, after RTC check ARM executes invalid code at 0-0x200
     - Dumps are questionable
 
 =========================================================================================================================================
@@ -1407,6 +1404,7 @@
 #include "cpu/arm7/arm7.h"
 #include "cpu/arm7/arm7core.h"
 #include "machine/pxa255.h"
+#include "machine/sa1110.h"
 #include "machine/timer.h"
 #include "emupal.h"
 #include "screen.h"
@@ -1423,121 +1421,133 @@
 public:
 	zaurus_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-		, m_pxa_periphs(*this, "pxa_periphs")
 		, m_maincpu(*this, "maincpu")
 		, m_ram(*this, "ram")
 	{ }
 
-	void zaurus_base(machine_config &config);
-	void zaurus_sa1110(machine_config &config);
-	void zaurus_pxa250(machine_config &config);
-	void zaurus_pxa255(machine_config &config);
-	void zaurus_pxa270(machine_config &config);
-
-private:
+protected:
 	// driver_device overrides
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 
-	void zaurus_map(address_map &map);
-
 	// devices
-	required_device<pxa255_periphs_device> m_pxa_periphs;
 	required_device<cpu_device> m_maincpu;
 	required_shared_ptr<uint32_t> m_ram;
-
-	uint8_t m_rtc_tick;
-	uint32_t rtc_r(offs_t offset);
-	void rtc_w(offs_t offset, uint32_t data);
-	TIMER_DEVICE_CALLBACK_MEMBER(rtc_irq_callback);
 };
 
+class zaurus_sa_state : public zaurus_state
+{
+public:
+	zaurus_sa_state(const machine_config &mconfig, device_type type, const char *tag)
+		: zaurus_state(mconfig, type, tag)
+		, m_sa_periphs(*this, "sa_periphs")
+	{ }
 
-uint32_t zaurus_state::rtc_r(offs_t offset)
+	void zaurus_sa1110(machine_config &config);
+
+private:
+	void main_map(address_map &map);
+
+	required_device<sa1110_periphs_device> m_sa_periphs;
+};
+
+class zaurus_pxa_state : public zaurus_state
 {
-	osd_printf_debug("%08x\n", offset << 2);
+public:
+	zaurus_pxa_state(const machine_config &mconfig, device_type type, const char *tag)
+		: zaurus_state(mconfig, type, tag)
+		, m_pxa_periphs(*this, "pxa_periphs")
+		, m_power(*this, "PWR")
+	{ }
 
-	return 0;
-}
+	void zaurus_pxa_base(machine_config &config);
+	void zaurus_pxa250(machine_config &config);
+	void zaurus_pxa255(machine_config &config);
+	void zaurus_pxa270(machine_config &config);
+
+	DECLARE_INPUT_CHANGED_MEMBER( system_start );
+
+private:
+	void main_map(address_map &map);
+
+	required_device<pxa255_periphs_device> m_pxa_periphs;
+	required_ioport m_power;
+};
 
-void zaurus_state::rtc_w(offs_t offset, uint32_t data)
+void zaurus_sa_state::main_map(address_map &map)
 {
-	osd_printf_debug("%08x %08x\n", offset << 2, data);
+	map(0x00000000, 0x00ffffff).ram().region("firmware", 0);
+	map(0x90020000, 0x9002001f).rw(m_sa_periphs, FUNC(sa1110_periphs_device::power_r), FUNC(sa1110_periphs_device::power_w));
+	map(0x90050000, 0x90050023).rw(m_sa_periphs, FUNC(sa1110_periphs_device::intc_r), FUNC(sa1110_periphs_device::intc_w));
+	map(0xc0000000, 0xc07fffff).ram().share("ram");
 }
 
-void zaurus_state::zaurus_map(address_map &map)
+void zaurus_pxa_state::main_map(address_map &map)
 {
 	map(0x00000000, 0x001fffff).ram().region("firmware", 0);
-	map(0x40900000, 0x4090000f).rw(FUNC(zaurus_state::rtc_r), FUNC(zaurus_state::rtc_w));
 	map(0x40000000, 0x400002ff).rw(m_pxa_periphs, FUNC(pxa255_periphs_device::dma_r), FUNC(pxa255_periphs_device::dma_w));
 	map(0x40400000, 0x40400083).rw(m_pxa_periphs, FUNC(pxa255_periphs_device::i2s_r), FUNC(pxa255_periphs_device::i2s_w));
+	map(0x40900000, 0x4090000f).rw(m_pxa_periphs, FUNC(pxa255_periphs_device::rtc_r), FUNC(pxa255_periphs_device::rtc_w));
 	map(0x40a00000, 0x40a0001f).rw(m_pxa_periphs, FUNC(pxa255_periphs_device::ostimer_r), FUNC(pxa255_periphs_device::ostimer_w));
 	map(0x40d00000, 0x40d00017).rw(m_pxa_periphs, FUNC(pxa255_periphs_device::intc_r), FUNC(pxa255_periphs_device::intc_w));
 	map(0x40e00000, 0x40e0006b).rw(m_pxa_periphs, FUNC(pxa255_periphs_device::gpio_r), FUNC(pxa255_periphs_device::gpio_w));
+	map(0x40f00000, 0x40f00037).rw(m_pxa_periphs, FUNC(pxa255_periphs_device::power_r), FUNC(pxa255_periphs_device::power_w));
+	map(0x41300000, 0x4130000b).rw(m_pxa_periphs, FUNC(pxa255_periphs_device::clocks_r), FUNC(pxa255_periphs_device::clocks_w));
 	map(0x44000000, 0x4400021f).rw(m_pxa_periphs, FUNC(pxa255_periphs_device::lcd_r), FUNC(pxa255_periphs_device::lcd_w));
 	map(0xa0000000, 0xa07fffff).ram().share("ram");
 }
 
-static INPUT_PORTS_START( zaurus )
-INPUT_PORTS_END
-
-void zaurus_state::machine_start()
+INPUT_CHANGED_MEMBER( zaurus_pxa_state::system_start )
 {
+	m_pxa_periphs->gpio_bit_w(10, m_power->read());
 }
 
-void zaurus_state::machine_reset()
-{
-}
+static INPUT_PORTS_START( zaurus_sa )
+INPUT_PORTS_END
 
+static INPUT_PORTS_START( zaurus_pxa )
+	PORT_START("PWR")
+	PORT_BIT( 0x00000001, IP_ACTIVE_HIGH, IPT_START1 ) PORT_NAME("Start System") PORT_CHANGED_MEMBER(DEVICE_SELF, zaurus_pxa_state, system_start, 0)
+INPUT_PORTS_END
 
-/* TODO: Hack */
-TIMER_DEVICE_CALLBACK_MEMBER(zaurus_state::rtc_irq_callback)
+void zaurus_state::machine_start()
 {
-#if 1
-	m_rtc_tick++;
-	m_rtc_tick &= 1;
-
-	if(m_rtc_tick & 1)
-		m_pxa_periphs->set_irq_line(PXA255_INT_RTC_HZ, 1);
-	else
-		m_pxa_periphs->set_irq_line(PXA255_INT_RTC_HZ, 0);
-#else
-	(void)m_rtc_tick;
-#endif
 }
 
-void zaurus_state::zaurus_base(machine_config &config)
+void zaurus_state::machine_reset()
 {
-	m_maincpu->set_addrmap(AS_PROGRAM, &zaurus_state::zaurus_map);
-	TIMER(config, "rtc_timer").configure_periodic(FUNC(zaurus_state::rtc_irq_callback), attotime::from_hz(XTAL(32'768)));
 }
 
-void zaurus_state::zaurus_sa1110(machine_config &config)
+void zaurus_sa_state::zaurus_sa1110(machine_config &config)
 {
 	SA1110(config, m_maincpu, SA1110_CLOCK);
-	PXA255_PERIPHERALS(config, m_pxa_periphs, SA1110_CLOCK, m_maincpu); // TODO: Correct peripherals
-	zaurus_base(config);
+	m_maincpu->set_addrmap(AS_PROGRAM, &zaurus_sa_state::main_map);
+
+	SA1110_PERIPHERALS(config, m_sa_periphs, SA1110_CLOCK, m_maincpu);
 }
 
-void zaurus_state::zaurus_pxa250(machine_config &config)
+void zaurus_pxa_state::zaurus_pxa250(machine_config &config)
 {
-	PXA255(config, m_maincpu, PXA250_CLOCK); // TODO: Correct CPU type
-	PXA255_PERIPHERALS(config, m_pxa_periphs, PXA250_CLOCK, m_maincpu); // TODO: Correct peripherals
-	zaurus_base(config);
+	PXA250(config, m_maincpu, PXA250_CLOCK);
+	m_maincpu->set_addrmap(AS_PROGRAM, &zaurus_pxa_state::main_map);
+
+	PXA255_PERIPHERALS(config, m_pxa_periphs, PXA250_CLOCK, m_maincpu);
 }
 
-void zaurus_state::zaurus_pxa255(machine_config &config)
+void zaurus_pxa_state::zaurus_pxa255(machine_config &config)
 {
 	PXA255(config, m_maincpu, PXA255_CLOCK);
+	m_maincpu->set_addrmap(AS_PROGRAM, &zaurus_pxa_state::main_map);
+
 	PXA255_PERIPHERALS(config, m_pxa_periphs, PXA255_CLOCK, m_maincpu);
-	zaurus_base(config);
 }
 
-void zaurus_state::zaurus_pxa270(machine_config &config)
+void zaurus_pxa_state::zaurus_pxa270(machine_config &config)
 {
-	PXA255(config, m_maincpu, PXA270_CLOCK); // TODO: Correct CPU type
+	PXA270(config, m_maincpu, PXA270_CLOCK);
+	m_maincpu->set_addrmap(AS_PROGRAM, &zaurus_pxa_state::main_map);
+
 	PXA255_PERIPHERALS(config, m_pxa_periphs, PXA270_CLOCK, m_maincpu); // TODO: Correct peripherals
-	zaurus_base(config);
 }
 
 /***************************************************************************
@@ -1546,8 +1556,16 @@
 
 ***************************************************************************/
 
-/* was labeled SL-C500 */
 ROM_START( zsl5500 )
+	ROM_REGION32_LE( 0x1000000, "firmware", ROMREGION_ERASE00 )
+	ROM_SYSTEM_BIOS( 0, "2.58", "OS Pack 2.58" ) \
+	ROMX_LOAD( "ospack-2.58", 0x0000000, 0x1000000, CRC(31c4d3ef) SHA1(a3b67fb45160bdb990e34dca5c389ed345c000c6), ROM_BIOS(0) )
+	ROM_SYSTEM_BIOS( 1, "3.10", "OS Pack 3.10" ) \
+	ROMX_LOAD( "ospack-3.10", 0x0000000, 0x1000000, CRC(d4b28f84) SHA1(fb7839ccde92f71fd80c4e04718783e684010398), ROM_BIOS(1) )
+ROM_END
+
+/* was labeled SL-C500 */
+ROM_START( zslc500 )
 	ROM_REGION32_LE( 0x200000, "firmware", ROMREGION_ERASE00 )
 	ROM_LOAD( "sl-c500 v1.20,zimage.bin", 0x000000, 0x13c000, BAD_DUMP CRC(dc1c259f) SHA1(8150744196a72821ae792462d0381182274c2ce0) )
 ROM_END
@@ -1577,9 +1595,10 @@
 	ROM_LOAD( "openzaurus 3.5.3 - zimage-sharp sl-c1000-20050427214434.bin", 0x000000, 0x128980, BAD_DUMP  CRC(1e1a9279) SHA1(909ac3f00385eced55822d6a155b79d9d25f43b3) )
 ROM_END
 
-COMP( 2002, zsl5500,  0, 0, zaurus_sa1110, zaurus, zaurus_state, empty_init, "Sharp", "Zaurus SL-5500 \"Collie\"",           MACHINE_IS_SKELETON )
-COMP( 2002, zsl5600,  0, 0, zaurus_pxa250, zaurus, zaurus_state, empty_init, "Sharp", "Zaurus SL-5600 / SL-B500 \"Poodle\"", MACHINE_IS_SKELETON )
-COMP( 2003, zslc750,  0, 0, zaurus_pxa255, zaurus, zaurus_state, empty_init, "Sharp", "Zaurus SL-C750 \"Shepherd\" (Japan)", MACHINE_IS_SKELETON )
-COMP( 2004, zslc760,  0, 0, zaurus_pxa255, zaurus, zaurus_state, empty_init, "Sharp", "Zaurus SL-C760 \"Husky\" (Japan)",    MACHINE_IS_SKELETON )
-COMP( 200?, zslc3000, 0, 0, zaurus_pxa270, zaurus, zaurus_state, empty_init, "Sharp", "Zaurus SL-C3000 \"Spitz\" (Japan)",   MACHINE_IS_SKELETON )
-COMP( 200?, zslc1000, 0, 0, zaurus_pxa270, zaurus, zaurus_state, empty_init, "Sharp", "Zaurus SL-C3000 \"Akita\" (Japan)",   MACHINE_IS_SKELETON )
+COMP( 2002, zsl5500,  0, 0, zaurus_sa1110, zaurus_sa,  zaurus_sa_state,  empty_init, "Sharp", "Zaurus SL-5500 \"Collie\"",           MACHINE_IS_SKELETON )
+COMP( 2002, zslc500,  0, 0, zaurus_pxa250, zaurus_pxa, zaurus_pxa_state, empty_init, "Sharp", "Zaurus SL-C500",                      MACHINE_IS_SKELETON )
+COMP( 2002, zsl5600,  0, 0, zaurus_pxa250, zaurus_pxa, zaurus_pxa_state, empty_init, "Sharp", "Zaurus SL-5600 / SL-B500 \"Poodle\"", MACHINE_IS_SKELETON )
+COMP( 2003, zslc750,  0, 0, zaurus_pxa255, zaurus_pxa, zaurus_pxa_state, empty_init, "Sharp", "Zaurus SL-C750 \"Shepherd\" (Japan)", MACHINE_IS_SKELETON )
+COMP( 2004, zslc760,  0, 0, zaurus_pxa255, zaurus_pxa, zaurus_pxa_state, empty_init, "Sharp", "Zaurus SL-C760 \"Husky\" (Japan)",    MACHINE_IS_SKELETON )
+COMP( 200?, zslc3000, 0, 0, zaurus_pxa270, zaurus_pxa, zaurus_pxa_state, empty_init, "Sharp", "Zaurus SL-C3000 \"Spitz\" (Japan)",   MACHINE_IS_SKELETON )
+COMP( 200?, zslc1000, 0, 0, zaurus_pxa270, zaurus_pxa, zaurus_pxa_state, empty_init, "Sharp", "Zaurus SL-C3000 \"Akita\" (Japan)",   MACHINE_IS_SKELETON )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/zaxxon.cpp mame-0.224+dfsg.1/src/mame/drivers/zaxxon.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/zaxxon.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/zaxxon.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -255,7 +255,7 @@
 
 #include "emu.h"
 #include "includes/zaxxon.h"
-#include "audio/segasnd.h"
+#include "audio/segausb.h"
 
 #include "cpu/z80/z80.h"
 #include "machine/gen_latch.h"
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/zerozone.cpp mame-0.224+dfsg.1/src/mame/drivers/zerozone.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/zerozone.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/zerozone.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -40,13 +40,10 @@
 #include "speaker.h"
 
 
-void zerozone_state::sound_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void zerozone_state::sound_w(uint8_t data)
 {
-	if (ACCESSING_BITS_8_15)
-	{
-		m_soundlatch->write(data >> 8);
-		m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80
-	}
+	m_soundlatch->write(data);
+	m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); // Z80
 }
 
 
@@ -57,13 +54,13 @@
 	map(0x080002, 0x080003).portr("INPUTS");
 	map(0x080008, 0x080009).portr("DSWB");
 	map(0x08000a, 0x08000b).portr("DSWA");
-	map(0x084000, 0x084001).w(FUNC(zerozone_state::sound_w));
+	map(0x084000, 0x084000).w(FUNC(zerozone_state::sound_w));
 	map(0x088000, 0x0881ff).ram().w("palette", FUNC(palette_device::write16)).share("palette");
-	map(0x098000, 0x098001).ram();     /* Watchdog? */
-	map(0x09ce00, 0x09ffff).ram().w(FUNC(zerozone_state::tilemap_w)).share("videoram");
-	map(0x0b4000, 0x0b4001).w(FUNC(zerozone_state::tilebank_w));
+	map(0x098000, 0x098001).ram();     // Watchdog?
+	map(0x09ce00, 0x09ffff).ram().w(FUNC(zerozone_state::tilemap_w)).share(m_vram);
+	map(0x0b4001, 0x0b4001).w(FUNC(zerozone_state::tilebank_w));
 	map(0x0c0000, 0x0cffff).ram();
-	map(0x0f8000, 0x0f87ff).ram();     /* Never read from */
+	map(0x0f8000, 0x0f87ff).ram();     // Never read from
 }
 
 void zerozone_state::sound_map(address_map &map)
@@ -146,18 +143,18 @@
 
 static const gfx_layout charlayout =
 {
-	8,8,    /* 8*8 characters */
-	RGN_FRAC(1,1),  /* 4096 characters */
-	4,  /* 4 bits per pixel */
+	8,8,    // 8*8 characters
+	RGN_FRAC(1,1),  // 4096 characters
+	4,  // 4 bits per pixel
 	{ 0, 1, 2, 3 },
 	{ 0, 4, 8+0, 8+4, 16+0, 16+4, 24+0, 24+4 },
 	{ 0*32, 1*32, 2*32, 3*32, 4*32, 5*32, 6*32, 7*32 },
-	32*8    /* every sprite takes 32 consecutive bytes */
+	32*8    // every sprite takes 32 consecutive bytes
 };
 
 
 static GFXDECODE_START( gfx_zerozone )
-	GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 )         /* sprites & playfield */
+	GFXDECODE_ENTRY( "gfx1", 0, charlayout, 0, 256 )         // sprites & playfield
 GFXDECODE_END
 
 
@@ -180,16 +177,16 @@
 
 void zerozone_state::zerozone(machine_config &config)
 {
-	/* basic machine hardware */
-	M68000(config, m_maincpu, 10000000);   /* 10 MHz */
+	// basic machine hardware
+	M68000(config, m_maincpu, 10_MHz_XTAL);
 	m_maincpu->set_addrmap(AS_PROGRAM, &zerozone_state::main_map);
 
-	Z80(config, m_audiocpu, 1000000);  /* 1 MHz ??? */
+	Z80(config, m_audiocpu, 16_MHz_XTAL / 16);  // divisor not verified, 1 MHz ???
 	m_audiocpu->set_addrmap(AS_PROGRAM, &zerozone_state::sound_map);
 
 	config.set_maximum_quantum(attotime::from_hz(600));
 
-	/* video hardware */
+	// video hardware
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_refresh_hz(60);
 	screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
@@ -203,7 +200,7 @@
 
 	PALETTE(config, "palette").set_format(palette_device::RRRRGGGGBBBBRGBx, 256);
 
-	/* sound hardware */
+	// sound hardware
 	SPEAKER(config, "mono").front_center();
 
 	GENERIC_LATCH_8(config, m_soundlatch);
@@ -220,39 +217,39 @@
 
 ***************************************************************************/
 
-ROM_START( zerozone )
-	ROM_REGION( 0x20000, "maincpu", 0 )     /* 128k for 68000 code */
+ROM_START( zerozone ) // PCB 'COMAD MADE IN KOREA 93 EDIT00', sticker 'COMAD-078'
+	ROM_REGION( 0x20000, "maincpu", 0 )     // 128k for 68000 code
 	ROM_LOAD16_BYTE( "zz-4.rom", 0x0000, 0x10000, CRC(83718b9b) SHA1(b3fc6da5816142b9c92a7b8615eb5bcb2c78ea46) )
 	ROM_LOAD16_BYTE( "zz-5.rom", 0x0001, 0x10000, CRC(18557f41) SHA1(6ef908732b7775c1ea2b33f799635075db5756de) )
 
-	ROM_REGION( 0x10000, "audiocpu", 0 )      /* sound cpu */
+	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "zz-1.rom", 0x00000, 0x08000, CRC(223ccce5) SHA1(3aa25ca914960b929dc853d07a958ed874e42fee) )
 
 	ROM_REGION( 0x080000, "gfx1", 0 )
 	ROM_LOAD( "zz-6.rom", 0x00000, 0x80000, CRC(c8b906b9) SHA1(1775d69df6397d6772b20c65751d44556d76c033) )
 
-	ROM_REGION( 0x40000, "oki", 0 )      /* ADPCM samples */
+	ROM_REGION( 0x40000, "oki", 0 )      // ADPCM samples
 	ROM_LOAD( "zz-2.rom", 0x00000, 0x20000, CRC(c7551e81) SHA1(520de3074fa6a71fef10d5a76cba5580fd1cbbae) )
 	ROM_LOAD( "zz-3.rom", 0x20000, 0x20000, CRC(e348ff5e) SHA1(6d2755d9b31366f4c2ddd296790234deb8f821c8) )
 ROM_END
 
-ROM_START( lvgirl94 )
-	ROM_REGION( 0x20000, "maincpu", 0 )     /* 128k for 68000 code */
+ROM_START( lvgirl94 ) // PCB 'COMAD MADE IN KOREA 93 EDIT00', sticker 'COMAD-078'
+	ROM_REGION( 0x20000, "maincpu", 0 )     // 128k for 68000 code
 	ROM_LOAD16_BYTE( "rom4", 0x0000, 0x10000, CRC(c4fb449e) SHA1(dd1c567ba2cf951267dd622e2e9af265e742f246) )
 	ROM_LOAD16_BYTE( "rom5", 0x0001, 0x10000, CRC(5d446a1a) SHA1(2d7ea25e5b86e7cf4eb7f10daa1eaaaed6830a53) )
 
 	ROM_REGION( 0x080000, "gfx1", 0 )
 	ROM_LOAD( "rom6", 0x00000, 0x40000, CRC(eeeb94ba) SHA1(9da09312c090ef2d40f596247d9a7decf3724e54) )
 
-	/* sound roms are the same as zerozone */
-	ROM_REGION( 0x10000, "audiocpu", 0 )      /* sound cpu */
+	// sound roms are the same as zerozone
+	ROM_REGION( 0x10000, "audiocpu", 0 )
 	ROM_LOAD( "rom1", 0x00000, 0x08000, CRC(223ccce5) SHA1(3aa25ca914960b929dc853d07a958ed874e42fee) )
 
-	ROM_REGION( 0x40000, "oki", 0 )      /* ADPCM samples */
+	ROM_REGION( 0x40000, "oki", 0 )      // ADPCM samples
 	ROM_LOAD( "rom2", 0x00000, 0x20000, CRC(c7551e81) SHA1(520de3074fa6a71fef10d5a76cba5580fd1cbbae) )
 	ROM_LOAD( "rom3", 0x20000, 0x20000, CRC(e348ff5e) SHA1(6d2755d9b31366f4c2ddd296790234deb8f821c8) )
 ROM_END
 
 
-GAME( 1993, zerozone, 0, zerozone, zerozone, zerozone_state, empty_init, ROT0, "Comad", "Zero Zone", MACHINE_SUPPORTS_SAVE )
+GAME( 1993, zerozone, 0, zerozone, zerozone, zerozone_state, empty_init, ROT0, "Comad", "Zero Zone",                 MACHINE_SUPPORTS_SAVE )
 GAME( 1994, lvgirl94, 0, zerozone, zerozone, zerozone_state, empty_init, ROT0, "Comad", "Las Vegas Girl (Girl '94)", MACHINE_SUPPORTS_SAVE )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/zn.cpp mame-0.224+dfsg.1/src/mame/drivers/zn.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/zn.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/zn.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3998,6 +3998,23 @@
 	ROM_LOAD( "mg05", 0x000000, 0x000008, CRC(5748a4ca) SHA1(c88d73f6a646a9ddefdfd84cba70d591759c069f) )
 ROM_END
 
+ROM_START( doappk )
+	TPS_BIOS
+
+	ROM_REGION32_LE( 0x02800000, "bankedroms", 0 )
+	ROM_LOAD16_BYTE( "doapp_u0119.119", 0x0000001, 0x100000, CRC(9084704e) SHA1(616b3e65a32768767209ae77c48ad34d11b31754) )
+	ROM_LOAD16_BYTE( "doapp_u0120.120", 0x0000000, 0x100000, CRC(720a6983) SHA1(d38783110440ffa00036b86f97bff5edb6a5673f) )
+	ROM_LOAD( "doapp-0.216",         0x0400000, 0x400000, CRC(acc6c539) SHA1(a744567a3d75634098b1749103307981be9acbdd) )
+	ROM_LOAD( "doapp-1.217",         0x0800000, 0x400000, CRC(14b961c4) SHA1(3fae1fcb4665ba8bad391881b26c2d087718d42f) )
+	ROM_LOAD( "doapp-2.218",         0x0c00000, 0x400000, CRC(134f698f) SHA1(6422972cf5d30a0f09f0c20f042691d5969207b4) )
+	ROM_LOAD( "doapp-3.219",         0x1000000, 0x400000, CRC(1c6540f3) SHA1(8631fde93a1da6325d7b31c7edf12c964f0ac4fc) )
+	ROM_LOAD( "doapp-4.220",         0x1400000, 0x400000, CRC(f83bacf7) SHA1(5bd66da993f0db966581dde80dd7e5b377754412) )
+	ROM_LOAD( "doapp-5.221",         0x1800000, 0x400000, CRC(e11e8b71) SHA1(b1d1b9532b5f074ce216a603436d5674d136865d) )
+
+	ROM_REGION( 0x8, "cat702_2", 0 )
+	ROM_LOAD( "mg05", 0x000000, 0x000008, CRC(5748a4ca) SHA1(c88d73f6a646a9ddefdfd84cba70d591759c069f) )
+ROM_END
+
 ROM_START( tondemo )
 	TPS_BIOS
 
@@ -5258,6 +5275,7 @@
 GAME( 1997, glpracr2j, glpracr2, coh1002m,    zn,       tecmo_zn_state, empty_init, ROT0, "Tecmo",                  "Gallop Racer 2 (Japan)",             MACHINE_IMPERFECT_SOUND )
 GAME( 1997, glpracr2l, glpracr2, coh1002ml,   zn,       tecmo_zn_state, empty_init, ROT0, "Tecmo",                  "Gallop Racer 2 Link HW (Japan)",     MACHINE_IMPERFECT_SOUND )
 GAME( 1998, doapp,     coh1002m, coh1002m,    zn,       tecmo_zn_state, empty_init, ROT0, "Tecmo",                  "Dead Or Alive ++ (Japan)",           MACHINE_IMPERFECT_SOUND )
+GAME( 1998, doappk,    doapp,    coh1002m,    zn,       tecmo_zn_state, empty_init, ROT0, "Tecmo",                  "Dead Or Alive ++ (Korea)",           MACHINE_IMPERFECT_SOUND )
 GAME( 1998, cbaj,      coh1002m, cbaj,        zn,       cbaj_state,     empty_init, ROT0, "UEP Systems",            "Cool Boarders Arcade Jam",           MACHINE_IMPERFECT_SOUND )
 GAME( 1998, shngmtkb,  coh1002m, coh1002m,    zn,       tecmo_zn_state, empty_init, ROT0, "Sunsoft / Activision",   "Shanghai Matekibuyuu",               MACHINE_IMPERFECT_SOUND )
 GAME( 1999, tondemo,   coh1002m, coh1002m,    zn,       tecmo_zn_state, empty_init, ROT0, "Tecmo",                  "Tondemo Crisis (Japan)",             MACHINE_IMPERFECT_SOUND )
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/zorba.cpp mame-0.224+dfsg.1/src/mame/drivers/zorba.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/zorba.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/zorba.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -72,8 +72,8 @@
 
 void zorba_state::zorba_mem(address_map &map)
 {
-	map(0x0000, 0x3fff).ram().share("mainram").lr8(NAME([this] (offs_t offset) { if(m_rom_in_map) return m_rom[offset]; else return m_ram[offset]; }));
-	map(0x4000, 0xffff).ram();
+	map(0x0000, 0xffff).ram().share("mainram");
+	map(0x0000, 0x3fff).bankr("bank1");
 }
 
 
@@ -275,11 +275,12 @@
 	save_item(NAME(m_printer_select));
 
 	save_item(NAME(m_term_data));
-	save_item(NAME(m_rom_in_map));
 
 	m_printer_prowriter = false;
 	m_printer_fault = 0;
 	m_printer_select = 0;
+	m_bank1->configure_entry(0, m_ram);
+	m_bank1->configure_entry(1, m_rom);
 }
 
 void zorba_state::machine_reset()
@@ -293,7 +294,7 @@
 	m_printer_prowriter = BIT(m_config_port->read(), 0);
 	m_pia0->cb1_w(m_printer_prowriter ? m_printer_select : m_printer_fault);
 
-	m_rom_in_map = true;
+	m_bank1->set_entry(1);
 
 	m_maincpu->reset();
 }
@@ -306,25 +307,25 @@
 uint8_t zorba_state::ram_r()
 {
 	if (!machine().side_effects_disabled())
-		m_rom_in_map = false;
+		m_bank1->set_entry(0);
 	return 0;
 }
 
 void zorba_state::ram_w(uint8_t data)
 {
-	m_rom_in_map = false;
+	m_bank1->set_entry(0);
 }
 
 uint8_t zorba_state::rom_r()
 {
 	if (!machine().side_effects_disabled())
-		m_rom_in_map = true;
+		m_bank1->set_entry(1);
 	return 0;
 }
 
 void zorba_state::rom_w(uint8_t data)
 {
-	m_rom_in_map = true;
+	m_bank1->set_entry(1);
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/drivers/zr107.cpp mame-0.224+dfsg.1/src/mame/drivers/zr107.cpp
--- mame-0.222+dfsg.1/src/mame/drivers/zr107.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/drivers/zr107.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -392,7 +392,7 @@
 	{
 		case 0: /* 7seg LEDs on PCB */
 		case 1:
-			m_pcb_digit[offset] = bitswap<8>(~data,7,0,1,2,3,4,5,6) & 0x7f;
+			m_pcb_digit[offset] = bitswap<7>(~data,0,1,2,3,4,5,6);
 			break;
 
 		case 2: /* Parallel data register */
diff -Nru mame-0.222+dfsg.1/src/mame/includes/abc1600.h mame-0.224+dfsg.1/src/mame/includes/abc1600.h
--- mame-0.222+dfsg.1/src/mame/includes/abc1600.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/abc1600.h	2020-08-26 08:57:19.000000000 +0000
@@ -62,6 +62,7 @@
 	abc1600_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
 		m_maincpu(*this, MC68008P8_TAG),
+		m_mac(*this, ABC1600_MAC_TAG),
 		m_dma0(*this, Z8410AB1_0_TAG),
 		m_dma1(*this, Z8410AB1_1_TAG),
 		m_dma2(*this, Z8410AB1_2_TAG),
@@ -82,6 +83,7 @@
 	{ }
 
 	required_device<m68000_base_device> m_maincpu;
+	required_device<abc1600_mac_device> m_mac;
 	required_device<z80dma_device> m_dma0;
 	required_device<z80dma_device> m_dma1;
 	required_device<z80dma_device> m_dma2;
@@ -115,7 +117,11 @@
 	void fw1_w(uint8_t data);
 	void spec_contr_reg_w(uint8_t data);
 
-	DECLARE_WRITE_LINE_MEMBER( dbrq_w );
+	void dbrq_w(int state);
+	uint8_t dma0_iorq_r(offs_t offset) { return m_sysfs ? m_mac->dma0_iorq_r(offset) : (m_bus0i->read_tren() & m_bus0x->read_tren()); }
+	void dma0_iorq_w(offs_t offset, uint8_t data) { if (m_sysfs) m_mac->dma0_iorq_w(offset, data); else { m_bus0i->write_tren(data); m_bus0x->write_tren(data); }; }
+	uint8_t dma1_iorq_r(offs_t offset) { return m_sysscc ? m_mac->dma1_iorq_r(offset) : m_bus1->read_tren(); }
+	void dma1_iorq_w(offs_t offset, uint8_t data) { if (m_sysscc) m_mac->dma1_iorq_w(offset, data); else m_bus1->write_tren(data); }
 
 	uint8_t cio_pa_r();
 	uint8_t cio_pb_r();
@@ -123,15 +129,18 @@
 	uint8_t cio_pc_r();
 	void cio_pc_w(uint8_t data);
 
-	DECLARE_WRITE_LINE_MEMBER( nmi_w );
+	void nmi_w(int state);
 
 	void cpu_space_map(address_map &map);
 
-	DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
-
-	void update_drdy0();
-	void update_drdy1();
-	void update_drdy2();
+	void update_pren0(int state);
+	void update_pren1(int state);
+	void update_drdy0(int state);
+	void update_drdy1(int state);
+	void sccrq_a_w(int state) { m_sccrq_a = state; update_drdy1(0); }
+	void sccrq_b_w(int state) { m_sccrq_b = state; update_drdy1(0); }
+	void dart_irq_w(int state) { m_dart_irq = state; m_maincpu->set_input_line(M68K_IRQ_5, (m_dart_irq || m_scc_irq) ? ASSERT_LINE : CLEAR_LINE); }
+	void scc_irq_w(int state) { m_scc_irq = state; m_maincpu->set_input_line(M68K_IRQ_5, (m_dart_irq || m_scc_irq) ? ASSERT_LINE : CLEAR_LINE); }
 
 	// DMA
 	int m_dmadis;
@@ -149,6 +158,10 @@
 	uint8_t m_csb;                // card select
 	int m_atce;                 // V.24 channel A external clock enable
 	int m_btce;                 // V.24 channel B external clock enable
+	bool m_sccrq_a;
+	bool m_sccrq_b;
+	int m_dart_irq;
+	int m_scc_irq;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/ac1.h mame-0.224+dfsg.1/src/mame/includes/ac1.h
--- mame-0.222+dfsg.1/src/mame/includes/ac1.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/ac1.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/*****************************************************************************
- *
- * includes/ac1.h
- *
- ****************************************************************************/
-#ifndef MAME_INCLUDES_AC1_H
-#define MAME_INCLUDES_AC1_H
-
-#pragma once
-
-#include "machine/z80pio.h"
-#include "imagedev/cassette.h"
-#include "emupal.h"
-
-class ac1_state : public driver_device
-{
-public:
-	ac1_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag)
-		, m_cassette(*this, "cassette")
-		, m_maincpu(*this, "maincpu")
-		, m_gfxdecode(*this, "gfxdecode")
-		, m_palette(*this, "palette")
-		, m_io_line(*this, "LINE.%u", 0)
-	{ }
-
-	void init_ac1();
-	virtual void machine_reset() override;
-	virtual void video_start() override;
-	uint32_t screen_update_ac1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	uint32_t screen_update_ac1_32(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	uint8_t ac1_port_b_r();
-	uint8_t ac1_port_a_r();
-	void ac1_port_a_w(uint8_t data);
-	void ac1_port_b_w(uint8_t data);
-
-	void ac1_32(machine_config &config);
-	void ac1(machine_config &config);
-	void ac1_32_mem(address_map &map);
-	void ac1_io(address_map &map);
-	void ac1_mem(address_map &map);
-private:
-	required_device<cassette_image_device> m_cassette;
-	required_device<cpu_device> m_maincpu;
-	required_device<gfxdecode_device> m_gfxdecode;
-	required_device<palette_device> m_palette;
-	required_ioport_array<7> m_io_line;
-};
-
-/*----------- defined in video/ac1.c -----------*/
-extern const gfx_layout ac1_charlayout;
-
-#endif // MAME_INCLUDES_AC1_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/atom.h mame-0.224+dfsg.1/src/mame/includes/atom.h
--- mame-0.222+dfsg.1/src/mame/includes/atom.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/atom.h	2020-08-26 08:57:19.000000000 +0000
@@ -33,7 +33,6 @@
 #define R6522_TAG       "ic1"
 #define I8271_TAG       "ic13"
 #define MC6854_TAG      "econet_ic1"
-#define SCREEN_TAG      "screen"
 #define CENTRONICS_TAG  "centronics"
 #define BASERAM_TAG     "baseram"
 
@@ -45,29 +44,26 @@
 {
 public:
 	atom_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-			m_maincpu(*this, SY6502_TAG),
-			m_vdg(*this, MC6847_TAG),
-			m_cassette(*this, "cassette"),
-			m_fdc(*this, I8271_TAG),
-			m_centronics(*this, CENTRONICS_TAG),
-			m_speaker(*this, "speaker"),
-			m_cart(*this, "cartslot"),
-			m_y0(*this, "Y0"),
-			m_y1(*this, "Y1"),
-			m_y2(*this, "Y2"),
-			m_y3(*this, "Y3"),
-			m_y4(*this, "Y4"),
-			m_y5(*this, "Y5"),
-			m_y6(*this, "Y6"),
-			m_y7(*this, "Y7"),
-			m_y8(*this, "Y8"),
-			m_y9(*this, "Y9"),
-			m_y10(*this, "Y10"),
-			m_rpt(*this, "RPT"),
-			m_video_ram(*this, "video_ram")
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, SY6502_TAG)
+		, m_vdg(*this, MC6847_TAG)
+		, m_cassette(*this, "cassette")
+		, m_fdc(*this, I8271_TAG)
+		, m_centronics(*this, CENTRONICS_TAG)
+		, m_speaker(*this, "speaker")
+		, m_cart(*this, "cartslot")
+		, m_vram(*this, "videoram")
+		, m_io_keyboard(*this, "Y%u", 0U)
+		, m_ppi(*this, INS8255_TAG)
+		, m_via(*this, R6522_TAG)
 	{ }
 
+	void atombb(machine_config &config);
+	void atom(machine_config &config);
+	void atom_common(machine_config &config);
+	DECLARE_INPUT_CHANGED_MEMBER( trigger_reset );
+
+protected:
 	required_device<cpu_device> m_maincpu;
 	required_device<mc6847_base_device> m_vdg;
 	required_device<cassette_image_device> m_cassette;
@@ -75,51 +71,38 @@
 	required_device<centronics_device> m_centronics;
 	required_device<speaker_sound_device> m_speaker;
 	optional_device<generic_slot_device> m_cart;
-	required_ioport m_y0;
-	required_ioport m_y1;
-	required_ioport m_y2;
-	required_ioport m_y3;
-	required_ioport m_y4;
-	required_ioport m_y5;
-	required_ioport m_y6;
-	required_ioport m_y7;
-	required_ioport m_y8;
-	required_ioport m_y9;
-	required_ioport m_y10;
-	required_ioport m_rpt;
+	required_shared_ptr<uint8_t> m_vram;
+	required_ioport_array<12> m_io_keyboard;
+	required_device<i8255_device> m_ppi;
+	required_device<via6522_device> m_via;
 
 	virtual void machine_start() override;
+	virtual void machine_reset() override;
 
 	void ppi_pa_w(uint8_t data);
 	uint8_t ppi_pb_r();
 	uint8_t ppi_pc_r();
 	void ppi_pc_w(uint8_t data);
 	uint8_t vdg_videoram_r(offs_t offset);
-	DECLARE_INPUT_CHANGED_MEMBER( trigger_reset );
 	DECLARE_WRITE_LINE_MEMBER( atom_8271_interrupt_callback );
 	DECLARE_WRITE_LINE_MEMBER( motor_w );
 
-	/* video state */
-	required_shared_ptr<uint8_t> m_video_ram;
-
 	/* keyboard state */
-	int m_keylatch;
+	u8 m_keylatch;
 
 	/* cassette state */
-	int m_hz2400;
-	int m_pc0;
-	int m_pc1;
+	bool m_hz2400;
+	bool m_pc0;
+	bool m_pc1;
 
 	/* devices */
-	int m_previous_i8271_int_state;
+	bool m_previous_i8271_int_state;
 	DECLARE_FLOPPY_FORMATS(floppy_formats);
-	TIMER_DEVICE_CALLBACK_MEMBER(cassette_output_tick);
+	DECLARE_WRITE_LINE_MEMBER(cassette_output_tick);
 
 	image_init_result load_cart(device_image_interface &image, generic_slot_device &slot);
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER(cart_load) { return load_cart(image, *m_cart); }
 	DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb);
-	void atombb(machine_config &config);
-	void atom(machine_config &config);
 	void atom_mem(address_map &map);
 	void atombb_mem(address_map &map);
 	void prophet_mem(address_map &map);
@@ -129,14 +112,18 @@
 {
 public:
 	atomeb_state(const machine_config &mconfig, device_type type, const char *tag)
-		: atom_state(mconfig, type, tag),
-		m_ext(*this, "rom_a%x", 0),
-		m_e0(*this, "rom_e0"),
-		m_e1(*this, "rom_e1")
+		: atom_state(mconfig, type, tag)
+		, m_ext(*this, "rom_a%x", 0)
+		, m_e0(*this, "rom_e0")
+		, m_e1(*this, "rom_e1")
 	{
 	}
 
-	virtual void machine_start() override;
+	void atomeb(machine_config &config);
+
+private:
+	void machine_start() override;
+	void machine_reset() override;
 
 	uint8_t eprom_r();
 	void eprom_w(uint8_t data);
@@ -144,7 +131,7 @@
 	uint8_t dos_r(offs_t offset);
 
 	/* eprom state */
-	int m_eprom;
+	u8 m_eprom;
 
 	required_device_array<generic_slot_device, 16> m_ext;
 	required_device<generic_slot_device> m_e0;
@@ -153,7 +140,6 @@
 	template<int I> DECLARE_DEVICE_IMAGE_LOAD_MEMBER(ext_load) { return load_cart(image, *m_ext[I]); }
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER(e0_load) { return load_cart(image, *m_e0); }
 	DECLARE_DEVICE_IMAGE_LOAD_MEMBER(e1_load) { return load_cart(image, *m_e1); }
-	void atomeb(machine_config &config);
 	void atomeb_mem(address_map &map);
 };
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/b2m.h mame-0.224+dfsg.1/src/mame/includes/b2m.h
--- mame-0.222+dfsg.1/src/mame/includes/b2m.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/b2m.h	2020-08-26 08:57:19.000000000 +0000
@@ -27,62 +27,59 @@
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
 		, m_speaker(*this, "speaker")
-		, m_pit(*this, "pit8253")
+		, m_pit(*this, "pit")
 		, m_ram(*this, RAM_TAG)
 		, m_palette(*this, "palette")
-		, m_fdc(*this, "fd1793")
-		, m_fd(*this, "fd%u", 0U)
-		, m_pic(*this, "pic8259")
+		, m_fdc(*this, "fdc")
+		, m_fd(*this, "fdc:%u", 0U)
+		, m_pic(*this, "pic")
 	{ }
 
-	uint8_t b2m_keyboard_r(offs_t offset);
-	void b2m_palette_w(offs_t offset, uint8_t data);
-	uint8_t b2m_palette_r(offs_t offset);
-	void b2m_localmachine_w(uint8_t data);
-	uint8_t b2m_localmachine_r();
-	void init_b2m();
+	void b2mrom(machine_config &config);
+	void b2m(machine_config &config);
+
+private:
+	uint8_t keyboard_r(offs_t offset);
+	void palette_w(offs_t offset, uint8_t data);
+	uint8_t palette_r(offs_t offset);
+	void localmachine_w(uint8_t data);
+	uint8_t localmachine_r();
 
 	void b2m_palette(palette_device &palette) const;
-	uint32_t screen_update_b2m(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	INTERRUPT_GEN_MEMBER(b2m_vblank_interrupt);
-	DECLARE_WRITE_LINE_MEMBER(bm2_pit_out1);
-	void b2m_8255_porta_w(uint8_t data);
-	void b2m_8255_portb_w(uint8_t data);
-	void b2m_8255_portc_w(uint8_t data);
-	uint8_t b2m_8255_portb_r();
-	void b2m_ext_8255_portc_w(uint8_t data);
-	uint8_t b2m_romdisk_porta_r();
-	void b2m_romdisk_portb_w(uint8_t data);
-	void b2m_romdisk_portc_w(uint8_t data);
-	DECLARE_WRITE_LINE_MEMBER(b2m_fdc_drq);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	INTERRUPT_GEN_MEMBER(vblank_interrupt);
+	DECLARE_WRITE_LINE_MEMBER(pit_out1);
+	void ppi1_porta_w(uint8_t data);
+	void ppi1_portb_w(uint8_t data);
+	void ppi1_portc_w(uint8_t data);
+	uint8_t ppi1_portb_r();
+	void ppi2_portc_w(uint8_t data);
+	uint8_t romdisk_porta_r();
+	void romdisk_portb_w(uint8_t data);
+	void romdisk_portc_w(uint8_t data);
+	DECLARE_WRITE_LINE_MEMBER(fdc_drq);
 	DECLARE_FLOPPY_FORMATS( b2m_floppy_formats );
 
-	void b2mrom(machine_config &config);
-	void b2m(machine_config &config);
 	void b2m_io(address_map &map);
 	void b2m_mem(address_map &map);
 	void b2m_rom_io(address_map &map);
-protected:
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-	virtual void video_start() override;
-
-	void b2m_postload();
-	void b2m_set_bank(int bank);
-
-	uint8_t m_b2m_8255_porta;
-	uint8_t m_b2m_video_scroll;
-	uint8_t m_b2m_8255_portc;
-
-	uint8_t m_b2m_video_page;
-	uint8_t m_b2m_drive;
-	uint8_t m_b2m_side;
+	void machine_start() override;
+	void machine_reset() override;
+
+	void postload();
+	void set_bank(int bank);
+
+	uint8_t m_porta;
+	uint8_t m_video_scroll;
+	uint8_t m_portc;
+
+	uint8_t m_video_page;
 
-	uint8_t m_b2m_romdisk_lsb;
-	uint8_t m_b2m_romdisk_msb;
+	uint8_t m_romdisk_lsb;
+	uint8_t m_romdisk_msb;
 
-	uint8_t m_b2m_color[4];
-	uint8_t m_b2m_localmachine;
+	uint8_t m_color[4];
+	uint8_t m_localmachine;
 	uint8_t m_vblank_state;
 	required_device<cpu_device> m_maincpu;
 	required_device<speaker_sound_device> m_speaker;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/bishi.h mame-0.224+dfsg.1/src/mame/includes/bishi.h
--- mame-0.222+dfsg.1/src/mame/includes/bishi.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/bishi.h	2020-08-26 08:57:19.000000000 +0000
@@ -27,7 +27,6 @@
 	bishi_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_audiocpu(*this, "audiocpu"),
 		m_k056832(*this, "k056832"),
 		m_k054338(*this, "k054338"),
 		m_k055555(*this, "k055555"),
@@ -45,16 +44,12 @@
 	K056832_CB_MEMBER(tile_callback);
 
 	void bishi(machine_config &config);
-	void dobouchn(machine_config &config);
 	void main_map(address_map &map);
 protected:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void video_start() override;
 private:
-	/* memory pointers */
-	uint8_t *    m_ram;
-
 	/* misc */
 	uint16_t     m_cur_control;
 	uint16_t     m_cur_control2;
@@ -64,7 +59,6 @@
 
 	/* devices */
 	required_device<cpu_device> m_maincpu;
-	optional_device<cpu_device> m_audiocpu;
 	required_device<k056832_device> m_k056832;
 	required_device<k054338_device> m_k054338;
 	required_device<k055555_device> m_k055555;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/bk.h mame-0.224+dfsg.1/src/mame/includes/bk.h
--- mame-0.222+dfsg.1/src/mame/includes/bk.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/bk.h	2020-08-26 08:57:19.000000000 +0000
@@ -18,41 +18,40 @@
 public:
 	bk_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
-		, m_bk0010_video_ram(*this, "video_ram")
+		, m_vram(*this, "videoram")
 		, m_maincpu(*this, "maincpu")
 		, m_cassette(*this, "cassette")
-		, m_io_keyboard(*this, "LINE%u", 0)
+		, m_io_keyboard(*this, "LINE%u", 0U)
 	{ }
 
 	void bk0010(machine_config &config);
 	void bk0010fd(machine_config &config);
 
 private:
-	uint16_t m_scrool;
-	required_shared_ptr<uint16_t> m_bk0010_video_ram;
+	uint16_t m_scroll;
 	uint16_t m_kbd_state;
 	uint16_t m_key_code;
 	uint16_t m_key_pressed;
 	uint16_t m_key_irq_vector;
 	uint16_t m_drive;
 	emu_timer *m_kbd_timer;
-	uint16_t bk_key_state_r();
-	uint16_t bk_key_code_r();
-	uint16_t bk_vid_scrool_r();
-	uint16_t bk_key_press_r();
-	void bk_key_state_w(uint16_t data);
-	void bk_vid_scrool_w(uint16_t data);
-	void bk_key_press_w(uint16_t data);
-	uint16_t bk_floppy_cmd_r();
-	void bk_floppy_cmd_w(uint16_t data);
-	uint16_t bk_floppy_data_r();
-	void bk_floppy_data_w(uint16_t data);
+	uint16_t key_state_r();
+	uint16_t key_code_r();
+	uint16_t vid_scroll_r();
+	uint16_t key_press_r();
+	void key_state_w(uint16_t data);
+	void vid_scroll_w(uint16_t data);
+	void key_press_w(uint16_t data);
+	uint16_t floppy_cmd_r();
+	void floppy_cmd_w(uint16_t data);
+	uint16_t floppy_data_r();
+	void floppy_data_w(uint16_t data);
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
-	virtual void video_start() override;
-	uint32_t screen_update_bk0010(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	TIMER_CALLBACK_MEMBER(keyboard_callback);
-	uint8_t bk0010_irq_callback(offs_t offset);
+	uint8_t irq_callback(offs_t offset);
+	required_shared_ptr<uint16_t> m_vram;
 	required_device<t11_device> m_maincpu;
 	required_device<cassette_image_device> m_cassette;
 	required_ioport_array<12> m_io_keyboard;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/btoads.h mame-0.224+dfsg.1/src/mame/includes/btoads.h
--- mame-0.222+dfsg.1/src/mame/includes/btoads.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/btoads.h	2020-08-26 08:57:19.000000000 +0000
@@ -21,13 +21,13 @@
 public:
 	btoads_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag),
-		m_vram_fg0(*this, "vram_fg0", 16),
-		m_vram_fg1(*this, "vram_fg1", 16),
-		m_vram_fg_data(*this, "vram_fg_data"),
-		m_vram_bg0(*this, "vram_bg0"),
-		m_vram_bg1(*this, "vram_bg1"),
-		m_sprite_scale(*this, "sprite_scale"),
-		m_sprite_control(*this, "sprite_control"),
+		m_vram_fg0(*this, "vram_fg0", 32),
+		m_vram_fg1(*this, "vram_fg1", 32),
+		m_vram_fg_data(*this, "vram_fg_data", 32),
+		m_vram_bg0(*this, "vram_bg0", 32),
+		m_vram_bg1(*this, "vram_bg1", 32),
+		m_sprite_scale(*this, "sprite_scale", 32),
+		m_sprite_control(*this, "sprite_control", 32),
 		m_maincpu(*this, "maincpu"),
 		m_audiocpu(*this, "audiocpu"),
 		m_bsmt(*this, "bsmt"),
@@ -82,8 +82,11 @@
 	uint16_t m_sprite_dest_offs;
 	uint16_t m_misc_control;
 	int m_xcount;
+	std::unique_ptr<uint8_t[]> m_nvram_data;
 
 	// in drivers/btoads
+	void nvram_w(offs_t offset, uint8_t data);
+	uint8_t nvram_r(offs_t offset);
 	void main_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	uint16_t main_sound_r();
 	void sound_data_w(uint8_t data);
@@ -99,8 +102,6 @@
 	void display_control_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	void scroll0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	void scroll1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void paletteram_w(offs_t offset, uint16_t data);
-	uint16_t paletteram_r(offs_t offset);
 	void vram_bg0_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	void vram_bg1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	uint16_t vram_bg0_r(offs_t offset);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/busicom.h mame-0.224+dfsg.1/src/mame/includes/busicom.h
--- mame-0.222+dfsg.1/src/mame/includes/busicom.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/busicom.h	2020-08-26 08:57:19.000000000 +0000
@@ -31,7 +31,6 @@
 protected:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
-	virtual void video_start() override;
 
 private:
 	uint8_t keyboard_r();
diff -Nru mame-0.222+dfsg.1/src/mame/includes/carpolo.h mame-0.224+dfsg.1/src/mame/includes/carpolo.h
--- mame-0.222+dfsg.1/src/mame/includes/carpolo.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/carpolo.h	2020-08-26 08:57:19.000000000 +0000
@@ -17,6 +17,9 @@
 #include "machine/7474.h"
 #include "machine/74148.h"
 #include "machine/74153.h"
+#include "machine/netlist.h"
+#include "netlist/nl_setup.h"
+#include "audio/nl_carpolo.h"
 #include "emupal.h"
 
 class carpolo_state : public driver_device
@@ -47,6 +50,7 @@
 		, m_dial(*this, "DIAL%u", 0U)
 		, m_in(*this, "IN%u", 0U)
 		, m_pedals(*this, "PEDALS")
+		, m_player_crash(*this, "sound_nl:player_crash%u", 1U)
 	{ }
 
 	void init_carpolo();
@@ -151,6 +155,8 @@
 										int x2, int y2, int code2, int flipy2,
 										int *col_x, int *col_y);
 	void main_map(address_map &map);
+
+	required_device_array<netlist_mame_logic_input_device, 4> m_player_crash;
 };
 
 #endif // MAME_INCLUDES_CARPOLO_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/cave.h mame-0.224+dfsg.1/src/mame/includes/cave.h
--- mame-0.222+dfsg.1/src/mame/includes/cave.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/cave.h	2020-08-26 08:57:19.000000000 +0000
@@ -45,6 +45,7 @@
 		, m_int_timer_right(*this, "int_timer_right")
 		, m_eeprom(*this, "eeprom")
 		, m_gfxdecode(*this, "gfxdecode.%u", 0U)
+		, m_spr_gfxdecode(*this, "spr_gfxdecode.%u", 0U)
 		, m_screen(*this, "screen.%u", 0U)
 		, m_palette(*this, "palette.%u", 0U)
 		, m_tilemap(*this, "tilemap.%u", 0U)
@@ -149,7 +150,6 @@
 	DECLARE_MACHINE_RESET(sailormn);
 	DECLARE_VIDEO_START(spr_4bpp);
 	DECLARE_VIDEO_START(spr_8bpp);
-	DECLARE_VIDEO_START(korokoro);
 	DECLARE_VIDEO_START(ppsatan);
 	void cave_palette(palette_device &palette);
 	void dfeveron_palette(palette_device &palette);
@@ -176,8 +176,6 @@
 	DECLARE_WRITE_LINE_MEMBER(sound_irq_gen);
 	void update_irq_state();
 	void unpack_sprites(int chip);
-	void ddp_unpack_sprites(int chip);
-	void esprade_unpack_sprites(int chip);
 	void sailormn_unpack_tiles(int chip);
 
 	virtual void machine_start() override;
@@ -238,6 +236,9 @@
 	bitmap_ind16 m_sprite_zbuf[4];
 	u16       m_sprite_zbuf_baseval;
 
+	std::unique_ptr<u8[]> m_sprite_gfx[4];
+	offs_t                m_sprite_gfx_mask[4];
+
 	int       m_num_sprites[4];
 
 	int       m_spriteram_bank[4];
@@ -253,7 +254,6 @@
 	int       m_kludge;
 	emu_timer *m_vblank_end_timer;
 
-	u16       m_sprite_base_pal;
 	u16       m_sprite_granularity;
 	u32       m_max_sprite_clk[4]; // max usable clock for sprites
 
@@ -290,6 +290,7 @@
 	optional_device<timer_device> m_int_timer_right;
 	optional_device<eeprom_serial_93cxx_device> m_eeprom;
 	optional_device_array<gfxdecode_device, 4> m_gfxdecode;
+	optional_device_array<gfxdecode_device, 4> m_spr_gfxdecode;
 	optional_device_array<screen_device, 4> m_screen;
 	optional_device_array<palette_device, 4> m_palette;
 	optional_device_array<tilemap038_device, 4> m_tilemap;
@@ -302,7 +303,7 @@
 
 	inline void tilemap_draw(int chip, screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect, u32 flags, u32 priority, u32 priority2, int GFX);
 	void set_pens(int chip);
-	void vh_start(u16 sprcol_base, u16 sprcol_granularity);
+	void vh_start(u16 sprcol_granularity);
 	void get_sprite_info_cave(int chip);
 	void get_sprite_info_donpachi(int chip);
 	void sprite_init();
diff -Nru mame-0.222+dfsg.1/src/mame/includes/cinemat.h mame-0.224+dfsg.1/src/mame/includes/cinemat.h
--- mame-0.222+dfsg.1/src/mame/includes/cinemat.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/cinemat.h	2020-08-26 08:57:19.000000000 +0000
@@ -11,6 +11,7 @@
 #pragma once
 
 #include "cpu/ccpu/ccpu.h"
+#include "audio/cinemat.h"
 #include "machine/74259.h"
 #include "sound/ay8910.h"
 #include "sound/samples.h"
@@ -25,31 +26,34 @@
 		, m_maincpu(*this, "maincpu")
 		, m_ay1(*this, "ay1")
 		, m_outlatch(*this, "outlatch")
-		, m_samples(*this, "samples")
 		, m_vector(*this, "vector")
 		, m_screen(*this, "screen")
 		, m_rambase(*this, "rambase")
 		, m_inputs(*this, "INPUTS")
 		, m_switches(*this, "SWITCHES")
-		, m_gear_input(*this, "GEAR")
 		, m_wheel(*this, "WHEEL")
 		, m_analog_x(*this, "ANALOGX")
 		, m_analog_y(*this, "ANALOGY")
 		, m_led(*this, "led")
 		, m_pressed(*this, "pressed%u", 0U)
+		, m_coin_detected(0)
+		, m_coin_last_reset(0)
+		, m_mux_select(0)
+		, m_gear(0)
+		, m_vector_color(255, 255, 255)
+		, m_lastx(0)
+		, m_lasty(0)
 	{ }
 
 	required_device<ccpu_cpu_device> m_maincpu;
 	optional_device<ay8910_device> m_ay1;
 	required_device<ls259_device> m_outlatch;
-	optional_device<samples_device> m_samples;
 	required_device<vector_device> m_vector;
 	required_device<screen_device> m_screen;
-	optional_shared_ptr<uint16_t> m_rambase;
+	optional_shared_ptr<s16> m_rambase;
 
 	required_ioport m_inputs;
 	required_ioport m_switches;
-	optional_ioport m_gear_input;
 	optional_ioport m_wheel;
 	optional_ioport m_analog_x;
 	optional_ioport m_analog_y;
@@ -57,32 +61,27 @@
 	output_finder<> m_led;
 	output_finder<10> m_pressed;
 
-	uint32_t m_current_shift;
-	uint32_t m_last_shift;
-	uint32_t m_last_shift2;
-	uint32_t m_current_pitch;
-	uint32_t m_last_frame;
-	uint8_t m_coin_detected;
-	uint8_t m_coin_last_reset;
-	uint8_t m_mux_select;
-	int m_gear;
+	u8 m_coin_detected;
+	u8 m_coin_last_reset;
+	u8 m_mux_select;
+	u8 m_gear;
 	rgb_t m_vector_color;
-	int16_t m_lastx;
-	int16_t m_lasty;
-	uint8_t inputs_r(offs_t offset);
-	uint8_t switches_r(offs_t offset);
-	uint8_t coin_input_r();
+	s16 m_lastx;
+	s16 m_lasty;
+	u8 inputs_r(offs_t offset);
+	u8 switches_r(offs_t offset);
+	u8 coin_input_r();
 	WRITE_LINE_MEMBER(coin_reset_w);
 	WRITE_LINE_MEMBER(mux_select_w);
-	uint8_t speedfrk_wheel_r(offs_t offset);
-	uint8_t speedfrk_gear_r(offs_t offset);
+	u8 speedfrk_wheel_r(offs_t offset);
+	u8 speedfrk_gear_r(offs_t offset);
 	virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w);
-	uint8_t joystick_read();
+	u8 joystick_read();
 	DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
 	void init_speedfrk();
-	uint32_t screen_update_cinemat(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-	uint32_t screen_update_spacewar(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-	void cinemat_vector_callback(int16_t sx, int16_t sy, int16_t ex, int16_t ey, uint8_t shift);
+	u32 screen_update_cinemat(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+	u32 screen_update_spacewar(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+	void cinemat_vector_callback(s16 sx, s16 sy, s16 ex, s16 ey, u8 shift);
 	void ripoff(machine_config &config);
 	void wotw(machine_config &config);
 	void speedfrk(machine_config &config);
@@ -94,55 +93,23 @@
 	void barrier(machine_config &config);
 	void armora(machine_config &config);
 
+	template<int Index>
+	DECLARE_WRITE_LINE_MEMBER(speedfrk_gear_change_w)
+	{
+		if (state)
+			m_gear = Index;
+	}
+
+	ioport_value speedfrk_gear_number_r()
+	{
+		return m_gear;
+	}
+
 protected:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
-	virtual void sound_start() override;
-	virtual void sound_reset() override;
 
-	DECLARE_WRITE_LINE_MEMBER(spacewar_sound0_w);
-	DECLARE_WRITE_LINE_MEMBER(spacewar_sound1_w);
-	DECLARE_WRITE_LINE_MEMBER(spacewar_sound2_w);
-	DECLARE_WRITE_LINE_MEMBER(spacewar_sound3_w);
-	DECLARE_WRITE_LINE_MEMBER(spacewar_sound4_w);
-	DECLARE_WRITE_LINE_MEMBER(barrier_sound0_w);
-	DECLARE_WRITE_LINE_MEMBER(barrier_sound1_w);
-	DECLARE_WRITE_LINE_MEMBER(barrier_sound2_w);
 	DECLARE_WRITE_LINE_MEMBER(speedfrk_start_led_w);
-	DECLARE_WRITE_LINE_MEMBER(speedfrk_sound3_w);
-	DECLARE_WRITE_LINE_MEMBER(speedfrk_sound4_w);
-	DECLARE_WRITE_LINE_MEMBER(starhawk_sound0_w);
-	DECLARE_WRITE_LINE_MEMBER(starhawk_sound1_w);
-	DECLARE_WRITE_LINE_MEMBER(starhawk_sound2_w);
-	DECLARE_WRITE_LINE_MEMBER(starhawk_sound3_w);
-	DECLARE_WRITE_LINE_MEMBER(starhawk_sound4_w);
-	DECLARE_WRITE_LINE_MEMBER(starhawk_sound7_w);
-	DECLARE_WRITE_LINE_MEMBER(tailg_sound_w);
-	DECLARE_WRITE_LINE_MEMBER(warrior_sound0_w);
-	DECLARE_WRITE_LINE_MEMBER(warrior_sound1_w);
-	DECLARE_WRITE_LINE_MEMBER(warrior_sound2_w);
-	DECLARE_WRITE_LINE_MEMBER(warrior_sound3_w);
-	DECLARE_WRITE_LINE_MEMBER(warrior_sound4_w);
-	DECLARE_WRITE_LINE_MEMBER(armora_sound0_w);
-	DECLARE_WRITE_LINE_MEMBER(armora_sound1_w);
-	DECLARE_WRITE_LINE_MEMBER(armora_sound2_w);
-	DECLARE_WRITE_LINE_MEMBER(armora_sound3_w);
-	DECLARE_WRITE_LINE_MEMBER(armora_sound4_w);
-	DECLARE_WRITE_LINE_MEMBER(ripoff_sound1_w);
-	DECLARE_WRITE_LINE_MEMBER(ripoff_sound2_w);
-	DECLARE_WRITE_LINE_MEMBER(ripoff_sound3_w);
-	DECLARE_WRITE_LINE_MEMBER(ripoff_sound4_w);
-	DECLARE_WRITE_LINE_MEMBER(ripoff_sound7_w);
-	DECLARE_WRITE_LINE_MEMBER(starcas_sound0_w);
-	DECLARE_WRITE_LINE_MEMBER(starcas_sound1_w);
-	DECLARE_WRITE_LINE_MEMBER(starcas_sound2_w);
-	DECLARE_WRITE_LINE_MEMBER(starcas_sound3_w);
-	DECLARE_WRITE_LINE_MEMBER(starcas_sound4_w);
-	DECLARE_WRITE_LINE_MEMBER(wotw_sound0_w);
-	DECLARE_WRITE_LINE_MEMBER(wotw_sound1_w);
-	DECLARE_WRITE_LINE_MEMBER(wotw_sound2_w);
-	DECLARE_WRITE_LINE_MEMBER(wotw_sound3_w);
-	DECLARE_WRITE_LINE_MEMBER(wotw_sound4_w);
 
 	void cinemat_nojmi_4k(machine_config &config);
 	void cinemat_jmi_4k(machine_config &config);
@@ -151,17 +118,6 @@
 	void cinemat_jmi_16k(machine_config &config);
 	void cinemat_jmi_32k(machine_config &config);
 
-	void spacewar_sound(machine_config &config);
-	void barrier_sound(machine_config &config);
-	void speedfrk_sound(machine_config &config);
-	void starhawk_sound(machine_config &config);
-	void tailg_sound(machine_config &config);
-	void warrior_sound(machine_config &config);
-	void armora_sound(machine_config &config);
-	void ripoff_sound(machine_config &config);
-	void starcas_sound(machine_config &config);
-	void wotw_sound(machine_config &config);
-
 	void program_map_4k(address_map &map);
 	void program_map_8k(address_map &map);
 	void program_map_16k(address_map &map);
@@ -182,15 +138,7 @@
 
 protected:
 	virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override;
-	uint8_t sundance_inputs_r(offs_t offset);
-	DECLARE_WRITE_LINE_MEMBER(sundance_sound0_w);
-	DECLARE_WRITE_LINE_MEMBER(sundance_sound1_w);
-	DECLARE_WRITE_LINE_MEMBER(sundance_sound2_w);
-	DECLARE_WRITE_LINE_MEMBER(sundance_sound3_w);
-	DECLARE_WRITE_LINE_MEMBER(sundance_sound4_w);
-	DECLARE_WRITE_LINE_MEMBER(sundance_sound7_w);
-
-	void sundance_sound(machine_config &config);
+	u8 sundance_inputs_r(offs_t offset);
 };
 
 
@@ -205,15 +153,6 @@
 
 protected:
 	virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override;
-	DECLARE_WRITE_LINE_MEMBER(solarq_sound0_w);
-	DECLARE_WRITE_LINE_MEMBER(solarq_sound1_w);
-	DECLARE_WRITE_LINE_MEMBER(solarq_sound4_w);
-
-	void solarq_sound(machine_config &config);
-
-private:
-	float m_target_volume;
-	float m_current_volume;
 };
 
 
@@ -229,14 +168,7 @@
 
 protected:
 	virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override;
-	uint8_t boxingb_dial_r(offs_t offset);
-	DECLARE_WRITE_LINE_MEMBER(boxingb_sound0_w);
-	DECLARE_WRITE_LINE_MEMBER(boxingb_sound1_w);
-	DECLARE_WRITE_LINE_MEMBER(boxingb_sound2_w);
-	DECLARE_WRITE_LINE_MEMBER(boxingb_sound3_w);
-	DECLARE_WRITE_LINE_MEMBER(boxingb_sound4_w);
-
-	void boxingb_sound(machine_config &config);
+	u8 boxingb_dial_r(offs_t offset);
 };
 
 
@@ -250,10 +182,10 @@
 protected:
 	TIMER_CALLBACK_MEMBER(synced_sound_w);
 	DECLARE_WRITE_LINE_MEMBER(demon_sound4_w);
-	uint8_t sound_porta_r();
-	uint8_t sound_portb_r();
-	void sound_portb_w(uint8_t data);
-	void sound_output_w(uint8_t data);
+	u8 sound_porta_r();
+	u8 sound_portb_r();
+	void sound_portb_w(u8 data);
+	void sound_output_w(u8 data);
 
 	virtual void sound_start() override;
 	virtual void sound_reset() override;
@@ -264,10 +196,10 @@
 	void demon_sound_ports(address_map &map);
 
 private:
-	uint8_t m_sound_fifo[16];
-	uint8_t m_sound_fifo_in;
-	uint8_t m_sound_fifo_out;
-	uint8_t m_last_portb_write;
+	u8 m_sound_fifo[16];
+	u8 m_sound_fifo_in;
+	u8 m_sound_fifo_out;
+	u8 m_last_portb_write;
 };
 
 
@@ -282,9 +214,9 @@
 
 protected:
 	virtual DECLARE_WRITE_LINE_MEMBER(vector_control_w) override;
-	uint8_t qb3_frame_r();
-	void qb3_ram_bank_w(uint8_t data);
-	void qb3_sound_fifo_w(uint8_t data);
+	u8 qb3_frame_r();
+	void qb3_ram_bank_w(u8 data);
+	void qb3_sound_fifo_w(u8 data);
 
 	virtual void sound_reset() override;
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/crshrace.h mame-0.224+dfsg.1/src/mame/includes/crshrace.h
--- mame-0.222+dfsg.1/src/mame/includes/crshrace.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/crshrace.h	2020-08-26 08:57:19.000000000 +0000
@@ -18,62 +18,62 @@
 public:
 	crshrace_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
-		m_videoram1(*this, "videoram1"),
-		m_videoram2(*this, "videoram2"),
+		m_videoram(*this, "videoram.%u", 0U),
 		m_z80bank(*this, "bank1"),
 		m_maincpu(*this, "maincpu"),
 		m_audiocpu(*this, "audiocpu"),
 		m_spr(*this, "vsystem_spr"),
 		m_k053936(*this, "k053936"),
-		m_spriteram(*this, "spriteram"),
-		m_spriteram2(*this, "spriteram2"),
+		m_spriteram(*this, "spriteram.%u", 0U),
 		m_gfxdecode(*this, "gfxdecode"),
 		m_palette(*this, "palette"),
 		m_soundlatch(*this, "soundlatch")
 	{ }
 
-	/* memory pointers */
-	required_shared_ptr<uint16_t> m_videoram1;
-	required_shared_ptr<uint16_t> m_videoram2;
+	void crshrace(machine_config &config);
+
+	void init_crshrace2();
+	void init_crshrace();
+
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	virtual void video_start() override;
+
+private:
+	// memory pointers
+	required_shared_ptr_array<uint16_t, 2> m_videoram;
 
 	required_memory_bank m_z80bank;
 
+	// devices
 	required_device<cpu_device> m_maincpu;
 	required_device<z80_device> m_audiocpu;
 	required_device<vsystem_spr_device> m_spr;
 	required_device<k053936_device> m_k053936;
-	required_device<buffered_spriteram16_device> m_spriteram;
-	required_device<buffered_spriteram16_device> m_spriteram2;
+	required_device_array<buffered_spriteram16_device, 2> m_spriteram;
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_device<palette_device> m_palette;
 	required_device<generic_latch_8_device> m_soundlatch;
 
-	/* video-related */
-	tilemap_t   *m_tilemap1;
-	tilemap_t   *m_tilemap2;
-	int       m_roz_bank;
-	int       m_gfxctrl;
-	int       m_flipscreen;
-	uint32_t crshrace_tile_callback( uint32_t code );
-
-	/* devices */
-	void crshrace_sh_bankswitch_w(uint8_t data);
-	void crshrace_videoram1_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void crshrace_videoram2_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void crshrace_roz_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void crshrace_gfxctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void init_crshrace2();
-	void init_crshrace();
+	// video-related
+	tilemap_t *m_tilemap[2];
+	uint8_t m_roz_bank;
+	uint8_t m_gfxctrl;
+	uint8_t m_flipscreen;
+
+	uint32_t tile_callback(uint32_t code);
+	void sh_bankswitch_w(uint8_t data);
+	template<uint8_t Which> void videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { COMBINE_DATA(&m_videoram[Which][offset]); m_tilemap[Which]->mark_tile_dirty(offset); }
+	void roz_bank_w(offs_t offset, uint8_t data);
+	void gfxctrl_w(offs_t offset, uint8_t data);
 	TILE_GET_INFO_MEMBER(get_tile_info1);
 	TILE_GET_INFO_MEMBER(get_tile_info2);
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-	virtual void video_start() override;
-	uint32_t screen_update_crshrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void draw_bg( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect );
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	void draw_bg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	void draw_fg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void crshrace(machine_config &config);
-	void crshrace_map(address_map &map);
+
+	void main_map(address_map &map);
 	void sound_io_map(address_map &map);
 	void sound_map(address_map &map);
 };
diff -Nru mame-0.222+dfsg.1/src/mame/includes/dai.h mame-0.224+dfsg.1/src/mame/includes/dai.h
--- mame-0.222+dfsg.1/src/mame/includes/dai.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/dai.h	2020-08-26 08:57:19.000000000 +0000
@@ -13,7 +13,6 @@
 #include "audio/dai_snd.h"
 #include "machine/i8255.h"
 #include "machine/pit8253.h"
-#include "machine/ram.h"
 #include "machine/tms5501.h"
 #include "imagedev/cassette.h"
 #include "emupal.h"
@@ -22,15 +21,17 @@
 class dai_state : public driver_device
 {
 public:
-	dai_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_pit(*this, "pit8253"),
-		m_tms5501(*this, "tms5501"),
-		m_sound(*this, "custom"),
-		m_cassette(*this, "cassette"),
-		m_ram(*this, RAM_TAG),
-		m_palette(*this, "palette")
+	dai_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_pit(*this, "pit")
+		, m_tms5501(*this, "tms5501")
+		, m_sound(*this, "custom")
+		, m_cassette(*this, "cassette")
+		, m_rom(*this, "maincpu")
+		, m_ram(*this, "mainram")
+		, m_palette(*this, "palette")
+		, m_io_keyboard(*this, "IN%u", 0U)
 	{ }
 
 	void dai(machine_config &config);
@@ -38,46 +39,45 @@
 private:
 	enum
 	{
-		TIMER_BOOTSTRAP,
 		TIMER_TMS5501
 	};
 
-	required_device<cpu_device> m_maincpu;
-	required_device<pit8253_device> m_pit;
-	required_device<tms5501_device> m_tms5501;
-	required_device<dai_sound_device> m_sound;
-	required_device<cassette_image_device> m_cassette;
-	required_device<ram_device> m_ram;
-	required_device<palette_device> m_palette;
-
-	uint8_t m_paddle_select;
-	uint8_t m_paddle_enable;
-	uint8_t m_cassette_motor[2];
-	uint8_t m_keyboard_scan_mask;
-	unsigned short m_4_colours_palette[4];
-	void dai_stack_interrupt_circuit_w(uint8_t data);
-	uint8_t dai_io_discrete_devices_r(offs_t offset);
-	void dai_io_discrete_devices_w(offs_t offset, uint8_t data);
-	uint8_t dai_amd9511_r();
-	void dai_amd9511_w(offs_t offset, uint8_t data);
-	uint8_t dai_pit_r(offs_t offset);
-	void dai_pit_w(offs_t offset, uint8_t data);
-	uint8_t dai_keyboard_r();
-	void dai_keyboard_w(uint8_t data);
+	u8 m_paddle_select;
+	u8 m_paddle_enable;
+	u8 m_cassette_motor[2];
+	u8 m_keyboard_scan_mask;
+	u8 m_4_colours_palette[4];
+	void stack_interrupt_circuit_w(u8 data);
+	u8 io_discrete_devices_r(offs_t offset);
+	void io_discrete_devices_w(offs_t offset, u8 data);
+	u8 amd9511_r();
+	void amd9511_w(offs_t offset, u8 data);
+	u8 pit_r(offs_t offset);
+	void pit_w(offs_t offset, u8 data);
+	u8 keyboard_r();
+	void keyboard_w(u8 data);
 	void dai_palette(palette_device &palette) const;
-	uint32_t screen_update_dai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	void dai_update_memory(int dai_rom_bank);
+	u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	IRQ_CALLBACK_MEMBER(int_ack);
 
-	void dai_io(address_map &map);
-	void dai_mem(address_map &map);
+	void mem_map(address_map &map);
 
 	static const rgb_t s_palette[16];
 
-protected:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+
+	memory_passthrough_handler *m_rom_shadow_tap;
+	required_device<cpu_device> m_maincpu;
+	required_device<pit8253_device> m_pit;
+	required_device<tms5501_device> m_tms5501;
+	required_device<dai_sound_device> m_sound;
+	required_device<cassette_image_device> m_cassette;
+	required_region_ptr<u8> m_rom;
+	required_shared_ptr<u8> m_ram;
+	required_device<palette_device> m_palette;
+	required_ioport_array<9> m_io_keyboard;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/ddragon.h mame-0.224+dfsg.1/src/mame/includes/ddragon.h
--- mame-0.222+dfsg.1/src/mame/includes/ddragon.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/ddragon.h	2020-08-26 08:57:19.000000000 +0000
@@ -157,8 +157,10 @@
 	void ddragon_map(address_map &map);
 	void ddragonba_sub_map(address_map &map);
 	void sound_map(address_map &map);
+	void ddragon6809_sound_map(address_map &map);
 	void sub_map(address_map &map);
 	void sub_6309_map(address_map &map);
+	void sub_6809_map(address_map &map);
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/dragon.h mame-0.224+dfsg.1/src/mame/includes/dragon.h
--- mame-0.222+dfsg.1/src/mame/includes/dragon.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/dragon.h	2020-08-26 08:57:19.000000000 +0000
@@ -93,14 +93,17 @@
 	dragon200e_state(const machine_config &mconfig, device_type type, const char *tag)
 		: dragon64_state(mconfig, type, tag)
 		, m_char_rom(*this, "chargen")
+		, m_lk1(*this, "LK1")
 	{
 	}
 
+	uint8_t sam_read(offs_t offset);
 	MC6847_GET_CHARROM_MEMBER(char_rom_r);
 
 	void dragon200e(machine_config &config);
 private:
 	required_memory_region m_char_rom;
+	required_ioport m_lk1;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/electron.h mame-0.224+dfsg.1/src/mame/includes/electron.h
--- mame-0.222+dfsg.1/src/mame/includes/electron.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/electron.h	2020-08-26 08:57:19.000000000 +0000
@@ -45,7 +45,6 @@
 		, m_screen(*this, "screen")
 		, m_cassette(*this, "cassette")
 		, m_beeper(*this, "beeper")
-		, m_region_basic(*this, "basic")
 		, m_region_mos(*this, "mos")
 		, m_keybd(*this, "LINE.%u", 0)
 		, m_exp(*this, "exp")
@@ -58,6 +57,8 @@
 
 	void electron64(machine_config &config);
 
+	static void plus3_default(device_t* device);
+
 	DECLARE_INPUT_CHANGED_MEMBER( trigger_reset );
 
 protected:
@@ -111,7 +112,6 @@
 	required_device<screen_device> m_screen;
 	required_device<cassette_image_device> m_cassette;
 	required_device<beep_device> m_beeper;
-	required_memory_region m_region_basic;
 	required_memory_region m_region_mos;
 	required_ioport_array<14> m_keybd;
 	required_device<electron_expansion_slot_device> m_exp;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/eprom.h mame-0.224+dfsg.1/src/mame/includes/eprom.h
--- mame-0.222+dfsg.1/src/mame/includes/eprom.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/eprom.h	2020-08-26 08:57:19.000000000 +0000
@@ -45,7 +45,6 @@
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
 	void video_int_ack_w(uint16_t data);
-	void video_int_ack_extra_w(uint16_t data);
 	TIMER_DEVICE_CALLBACK_MEMBER(scanline_update);
 	uint8_t adc_r(offs_t offset);
 	void eprom_latch_w(uint8_t data);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/funworld.h mame-0.224+dfsg.1/src/mame/includes/funworld.h
--- mame-0.222+dfsg.1/src/mame/includes/funworld.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/funworld.h	2020-08-26 08:57:19.000000000 +0000
@@ -35,6 +35,7 @@
 	void witchryl(machine_config &config);
 	void fw_brick_1(machine_config &config);
 	void fw_brick_2(machine_config &config);
+	void gratispk(machine_config &config);
 
 	void init_saloon();
 	void init_mongolnw();
@@ -43,6 +44,7 @@
 	void init_dino4();
 	void init_ctunk();
 	void init_jolycdig();
+	void init_impera16();
 
 protected:
 	void funworld_videoram_w(offs_t offset, uint8_t data);
@@ -75,6 +77,7 @@
 	void fw_brick_map(address_map &map);
 	void saloon_map(address_map &map);
 	void witchryl_map(address_map &map);
+	void gratispk_map(address_map &map);
 
 	required_shared_ptr<uint8_t> m_videoram;
 	required_shared_ptr<uint8_t> m_colorram;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/galaxy.h mame-0.224+dfsg.1/src/mame/includes/galaxy.h
--- mame-0.222+dfsg.1/src/mame/includes/galaxy.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/galaxy.h	2020-08-26 08:57:19.000000000 +0000
@@ -24,9 +24,9 @@
 		, m_screen(*this, "screen")
 		, m_cassette(*this, "cassette")
 		, m_ram(*this, RAM_TAG)
-		, m_region_gfx1(*this, "gfx1")
-	{
-	}
+		, m_p_chargen(*this, "chargen")
+		, m_io_keyboard(*this, "LINE%u", 0U)
+	{ }
 
 	void galaxy(machine_config &config);
 	void galaxyp(machine_config &config);
@@ -35,29 +35,20 @@
 	void init_galaxyp();
 
 private:
-	uint8_t galaxy_keyboard_r(offs_t offset);
-	void galaxy_latch_w(uint8_t data);
-	virtual void video_start() override;
-	DECLARE_MACHINE_RESET(galaxy);
-	DECLARE_MACHINE_RESET(galaxyp);
-	uint32_t screen_update_galaxy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	INTERRUPT_GEN_MEMBER(galaxy_interrupt);
+	uint8_t keyboard_r(offs_t offset);
+	void latch_w(uint8_t data);
+	void machine_start() override;
+	void machine_reset() override;
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	TIMER_CALLBACK_MEMBER(gal_video);
-	IRQ_CALLBACK_MEMBER(galaxy_irq_callback);
-	void galaxy_set_timer();
-	void galaxy_setup_snapshot (const uint8_t * data, uint32_t size);
+	IRQ_CALLBACK_MEMBER(irq_callback);
+	void set_timer();
+	void setup_snapshot (const uint8_t * data, uint32_t size);
 	DECLARE_SNAPSHOT_LOAD_MEMBER(snapshot_cb);
 	void galaxy_mem(address_map &map);
 	void galaxyp_io(address_map &map);
 	void galaxyp_mem(address_map &map);
 
-	required_device<cpu_device> m_maincpu;
-	required_device<screen_device> m_screen;
-	required_device<cassette_image_device> m_cassette;
-	required_device<ram_device> m_ram;
-	required_memory_region m_region_gfx1;
-	ioport_port *m_io_ports[8];
-
 	int m_interrupts_enabled;
 	uint8_t m_latch_value;
 	uint32_t m_gal_cnt;
@@ -66,6 +57,13 @@
 	uint32_t m_start_addr;
 	emu_timer *m_gal_video_timer;
 	bitmap_ind16 m_bitmap;
+
+	required_device<cpu_device> m_maincpu;
+	required_device<screen_device> m_screen;
+	required_device<cassette_image_device> m_cassette;
+	optional_device<ram_device> m_ram;
+	required_region_ptr<u8> m_p_chargen;
+	required_ioport_array<8> m_io_keyboard;
 };
 
 #endif // MAME_INCLUDES_GALAXY_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/galeb.h mame-0.224+dfsg.1/src/mame/includes/galeb.h
--- mame-0.222+dfsg.1/src/mame/includes/galeb.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/galeb.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/*****************************************************************************
- *
- * includes/galeb.h
- *
- ****************************************************************************/
-#ifndef MAME_INCLUDES_GALEB_H
-#define MAME_INCLUDES_GALEB_H
-
-#pragma once
-
-#include "sound/dac.h"
-#include "emupal.h"
-
-class galeb_state : public driver_device
-{
-public:
-	galeb_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-		m_video_ram(*this, "video_ram"),
-		m_maincpu(*this, "maincpu"),
-		m_gfxdecode(*this, "gfxdecode"),
-		m_palette(*this, "palette"),
-		m_keyboard(*this, "LINE%u", 0),
-		m_dac(*this, "dac"),
-		m_dac_state(0)
-	{
-	}
-
-	void galeb(machine_config &config);
-
-private:
-	required_shared_ptr<uint8_t> m_video_ram;
-	void dac_w(uint8_t data);
-	uint8_t keyboard_r(offs_t offset);
-	uint8_t tape_status_r();
-	uint8_t tape_data_r();
-	void tape_data_w(uint8_t data);
-	virtual void video_start() override;
-	uint32_t screen_update_galeb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	required_device<cpu_device> m_maincpu;
-	required_device<gfxdecode_device> m_gfxdecode;
-	required_device<palette_device> m_palette;
-	required_ioport_array<8> m_keyboard;
-	required_device<dac_1bit_device> m_dac;
-
-	void galeb_mem(address_map &map);
-
-	virtual void machine_start() override;
-
-	int m_dac_state;
-};
-
-/*----------- defined in video/galeb.c -----------*/
-
-extern const gfx_layout galeb_charlayout;
-
-#endif // MAME_INCLUDES_GALEB_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/gb.h mame-0.224+dfsg.1/src/mame/includes/gb.h
--- mame-0.222+dfsg.1/src/mame/includes/gb.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/gb.h	2020-08-26 08:57:19.000000000 +0000
@@ -155,7 +155,7 @@
 	uint8_t megaduck_sound_r1(offs_t offset);
 	void megaduck_sound_w2(offs_t offset, uint8_t data);
 	uint8_t megaduck_sound_r2(offs_t offset);
-	void megaduck_palette(palette_device &palette) const;;
+	void megaduck_palette(palette_device &palette) const;
 	void megaduck_map(address_map &map);
 
 	uint8_t cart_r(offs_t offset);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/generalplus_gpl16250_nand.h mame-0.224+dfsg.1/src/mame/includes/generalplus_gpl16250_nand.h
--- mame-0.222+dfsg.1/src/mame/includes/generalplus_gpl16250_nand.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/generalplus_gpl16250_nand.h	2020-08-26 08:57:19.000000000 +0000
@@ -35,6 +35,7 @@
 	void nand_vbaby();
 	void nand_tsm();
 	void nand_beambox();
+	void nand_kiugames();
 
 protected:
 	virtual void machine_start() override;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/goldstar.h mame-0.224+dfsg.1/src/mame/includes/goldstar.h
--- mame-0.222+dfsg.1/src/mame/includes/goldstar.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/goldstar.h	2020-08-26 08:57:19.000000000 +0000
@@ -233,6 +233,7 @@
 
 	void init_lucky8a();
 	void init_lucky8f();
+	void init_lucky8l();
 	void init_magoddsc();
 	void init_flaming7();
 	void init_flam7_tw();
diff -Nru mame-0.222+dfsg.1/src/mame/includes/gotcha.h mame-0.224+dfsg.1/src/mame/includes/gotcha.h
--- mame-0.222+dfsg.1/src/mame/includes/gotcha.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/gotcha.h	2020-08-26 08:57:19.000000000 +0000
@@ -42,19 +42,19 @@
 	virtual void video_start() override;
 
 private:
-	void gotcha_lamps_w(uint16_t data);
-	void gotcha_fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void gotcha_bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void gotcha_gfxbank_select_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void gotcha_gfxbank_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void gotcha_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void gotcha_oki_bank_w(uint8_t data);
-	TILEMAP_MAPPER_MEMBER(gotcha_tilemap_scan);
+	void lamps_w(uint16_t data);
+	void fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+	void bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+	void gfxbank_select_w(uint8_t data);
+	void gfxbank_w(uint8_t data);
+	void scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+	void oki_bank_w(uint8_t data);
+	TILEMAP_MAPPER_MEMBER(tilemap_scan);
 	TILE_GET_INFO_MEMBER(fg_get_tile_info);
 	TILE_GET_INFO_MEMBER(bg_get_tile_info);
-	uint32_t screen_update_gotcha(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	inline void get_tile_info( tile_data &tileinfo, int tile_index ,uint16_t *vram, int color_offs);
-	void gotcha_map(address_map &map);
+	void main_map(address_map &map);
 	void sound_map(address_map &map);
 
 	/* memory pointers */
@@ -64,11 +64,11 @@
 	optional_device<decospr_device> m_sprgen;
 
 	/* video-related */
-	tilemap_t     *m_bg_tilemap;
-	tilemap_t     *m_fg_tilemap;
-	int         m_banksel;
-	int         m_gfxbank[4];
-	uint16_t      m_scroll[4];
+	tilemap_t *m_bg_tilemap;
+	tilemap_t *m_fg_tilemap;
+	uint8_t m_banksel;
+	uint8_t m_gfxbank[4];
+	uint16_t m_scroll[4];
 
 	/* devices */
 	required_device<cpu_device> m_audiocpu;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/hec2hrp.h mame-0.224+dfsg.1/src/mame/includes/hec2hrp.h
--- mame-0.222+dfsg.1/src/mame/includes/hec2hrp.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/hec2hrp.h	2020-08-26 08:57:19.000000000 +0000
@@ -3,41 +3,7 @@
 /////////////////////////////////////////////////////////////////////
 //////   HECTOR HEADER FILE /////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////
-/*
-        Hector 2HR+
-        Victor
-        Hector 2HR
-        Hector HRX
-        Hector MX40c
-        Hector MX80c
-        Hector 1
-        Interact
-
-        12/05/2009 Skeleton driver - Micko : mmicko@gmail.com
-        31/06/2009 Video - Robbbert
-
-        29/10/2009 Update skeleton to functional machine
-                    by yo_fr            (jj.stac @ aliceadsl.fr)
-
-                => add Keyboard,
-                => add color,
-                => add cassette,
-                => add sn76477 sound and 1bit sound,
-                => add joysticks (stick, pot, fire)
-                => add BR/HR switching
-                => add bank switch for HRX
-                => add device MX80c and bank switching for the ROM
-        03/01/2010 Update and clean prog  by yo_fr       (jj.stac@aliceadsl.fr)
-                => add the port mapping for keyboard
-        20/11/2010 : synchronization between uPD765 and Z80 are now OK, CP/M running! JJStacino
-        11/11/2011 : add the minidisque support -3 pouces 1/2 driver-  JJStacino  (jj.stac @ aliceadsl.fr)
-
-            don't forget to keep some information about these machine see DChector project : http://dchector.free.fr/ made by DanielCoulom
-            (and thank's to Daniel!) and Yves site : http://hectorvictor.free.fr/ (thank's too Yves!)
-
-    TODO :  Add the cartridge function,
-            Adjust the one shot and A/D timing (sn76477)
-*/
+
 #ifndef MAME_INCLUDES_HEC2HRP_H
 #define MAME_INCLUDES_HEC2HRP_H
 
@@ -48,6 +14,7 @@
 #include "imagedev/printer.h"
 #include "machine/upd765.h"
 #include "machine/wd_fdc.h"
+#include "machine/ram.h"
 #include "sound/discrete.h"  /* for 1 Bit sound*/
 #include "sound/sn76477.h"   /* for sn sound*/
 #include "emupal.h"
@@ -82,21 +49,24 @@
 {
 public:
 	hec2hrp_state(const machine_config &mconfig, device_type type, const char *tag)
-		: driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_cassette(*this, "cassette"),
-		m_printer(*this, "printer"),
-		m_palette(*this, "palette"),
-		m_disc2cpu(*this, "disc2cpu"),
-		m_discrete(*this, "discrete"),
-		m_sn(*this, "sn76477"),
-		m_videoram(*this,"videoram"),
-		m_hector_videoram(*this,"hector_videoram") ,
-		m_keyboard(*this, "KEY.%u", 0),
-		m_minidisc_fdc(*this, "wd179x"),
-		m_floppy0(*this, "wd179x:0"),
-		m_upd_fdc(*this, "upd765"),
-		m_upd_connector(*this, "upd765:%u", 0U)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_cassette(*this, "cassette")
+		, m_printer(*this, "printer")
+		, m_palette(*this, "palette")
+		, m_vram(*this,"videoram")
+		, m_bank(*this, "bank%u", 0U)
+		, m_rom(*this, "maincpu")
+		, m_ram(*this, RAM_TAG)
+		, m_hector_vram(*this,"hector_videoram")
+		, m_disc2cpu(*this, "disc2cpu")
+		, m_discrete(*this, "discrete")
+		, m_sn(*this, "sn76477")
+		, m_keyboard(*this, "KEY.%u", 0)
+		, m_minidisc_fdc(*this, "wd179x")
+		, m_floppy0(*this, "wd179x:0")
+		, m_upd_fdc(*this, "upd765")
+		, m_upd_connector(*this, "upd765:%u", 0U)
 	{}
 
 	void hec2mx80(machine_config &config);
@@ -107,13 +77,19 @@
 	void hec2hr(machine_config &config);
 	void hector_audio(machine_config &config);
 
-	void hector_init();
+	void init_mx40();
+	void init_mdhrx();
+	void init_victor();
+	void init_hrx();
+	void init_interact();
+	void hector1(machine_config &config);
+	void interact(machine_config &config);
+	void interact_common(machine_config &config);
 
-protected:
-	DECLARE_VIDEO_START(hec2hrp);
+private:
 	void hector_hr(bitmap_ind16 &bitmap, uint8_t *page, int ymax, int yram);
-	void hector_reset(int hr, int with_d2);
-
+	void hector_reset(bool hr, bool with_d2);
+	void video_start() override;
 	void keyboard_w(uint8_t data);
 	uint8_t keyboard_r(offs_t offset);
 	void sn_2000_w(offs_t offset, uint8_t data);
@@ -122,15 +98,13 @@
 	void sn_3000_w(uint8_t data);
 	void color_a_w(uint8_t data);
 	void color_b_w(uint8_t data);
-
-	required_device<cpu_device> m_maincpu;
-	required_device<cassette_image_device> m_cassette;
-	optional_device<printer_image_device> m_printer;
-	required_device<palette_device> m_palette;
-
-private:
+	bool m_has_disc2;
+	bool m_has_minidisc;
+	bool m_is_hr;
+	bool m_is_extended;
+	void init_palette(palette_device &);
+	void hector_init();
 	void minidisc_control_w(uint8_t data);
-
 	void switch_bank_w(offs_t offset, uint8_t data);
 	uint8_t io_8255_r(offs_t offset);
 	void io_8255_w(offs_t offset, uint8_t data);
@@ -151,37 +125,24 @@
 
 	DECLARE_FLOPPY_FORMATS(minidisc_formats);
 
-	optional_device<cpu_device> m_disc2cpu;
-	required_device<discrete_device> m_discrete;
-	required_device<sn76477_device> m_sn;
-	optional_shared_ptr<uint8_t> m_videoram;
-	optional_shared_ptr<uint8_t> m_hector_videoram;
-	required_ioport_array<9> m_keyboard;
-
-	optional_device<fd1793_device> m_minidisc_fdc;
-	optional_device<floppy_connector> m_floppy0;
-
-	optional_device<upd765a_device> m_upd_fdc;
-	optional_device_array<floppy_connector, 2> m_upd_connector;
-
-	uint8_t m_hector_flag_hr;
-	uint8_t m_hector_flag_80c;
+	bool m_hector_flag_hr;
+	bool m_hector_flag_80c;
 	uint8_t m_hector_color[4];
 	uint8_t m_hector_disc2_data_r_ready;
 	uint8_t m_hector_disc2_data_w_ready;
 	uint8_t m_hector_disc2_data_read;
 	uint8_t m_hector_disc2_data_write;
-	uint8_t m_hector_disc2_rnmi;
+	bool m_hector_disc2_rnmi;
 	uint8_t m_state3000;
-	uint8_t m_write_cassette;
+	bool m_write_cassette;
 	emu_timer *m_cassette_timer;
 	uint8_t m_ck_signal;
-	uint8_t m_flag_clk;
+	bool m_flag_clk;
 	double m_pin_value[29][2];
-	int m_au[17];
-	int m_val_mixer;
-	int m_oldstate3000;
-	int m_oldstate1000;
+	u8 m_au[17];
+	u8 m_val_mixer;
+	u8 m_oldstate3000;
+	u8 m_oldstate1000;
 	uint8_t m_pot0;
 	uint8_t m_pot1;
 	uint8_t m_actions;
@@ -190,18 +151,15 @@
 	uint8_t m_hector_port_c_h;
 	uint8_t m_hector_port_c_l;
 	uint8_t m_hector_port_cmd;
-	uint8_t m_cassette_bit;
-	uint8_t m_cassette_bit_mem;
+	bool m_cassette_bit;
+	bool m_cassette_bit_mem;
 	uint8_t m_data_k7;
 	int m_counter_write;
-	int m_irq_current_state;
-	int m_nmi_current_state;
-	int m_hector_cmd[10];
-	int m_hector_nb_cde;
-	int m_hector_flag_result;
-	int m_print;
-	uint8_t m_hector_videoram_hrx[0x04000];
+	bool m_irq_current_state;
+	bool m_nmi_current_state;
+	uint8_t m_hector_videoram_hrx[0x4000];
 
+	DECLARE_MACHINE_RESET(interact);
 	DECLARE_MACHINE_START(hec2hrp);
 	DECLARE_MACHINE_RESET(hec2hrp);
 	DECLARE_MACHINE_START(hec2hrx);
@@ -213,18 +171,14 @@
 
 	DECLARE_WRITE_LINE_MEMBER( disc2_fdc_interrupt );
 	DECLARE_WRITE_LINE_MEMBER( disc2_fdc_dma_irq );
-	int has_disc2();
-	int has_minidisc();
-	int is_hr();
-	int is_extended();
+
 	void update_state(int Adresse, int Value );
 	void init_sn76477();
 	void update_sound(uint8_t data);
-	void init_palette();
 	void hector_80c(bitmap_ind16 &bitmap, uint8_t *page, int ymax, int yram);
-	/*----------- defined in machine/hecdisk2.c -----------*/
-
 	void hector_disc2_reset();
+	uint32_t screen_update_interact(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	void interact_mem(address_map &map);
 
 	void hec2hrp_io(address_map &map);
 	void hec2hrp_mem(address_map &map);
@@ -235,6 +189,24 @@
 	void hec2mx80_io(address_map &map);
 	void hecdisc2_io(address_map &map);
 	void hecdisc2_mem(address_map &map);
+
+	required_device<cpu_device> m_maincpu;
+	required_device<cassette_image_device> m_cassette;
+	optional_device<printer_image_device> m_printer;
+	required_device<palette_device> m_palette;
+	optional_shared_ptr<uint8_t> m_vram;
+	optional_memory_bank_array<4> m_bank;
+	required_region_ptr<u8> m_rom;
+	optional_device<ram_device> m_ram;
+	optional_shared_ptr<uint8_t> m_hector_vram;
+	optional_device<cpu_device> m_disc2cpu;
+	required_device<discrete_device> m_discrete;
+	required_device<sn76477_device> m_sn;
+	required_ioport_array<9> m_keyboard;
+	optional_device<fd1793_device> m_minidisc_fdc;
+	optional_device<floppy_connector> m_floppy0;
+	optional_device<upd765a_device> m_upd_fdc;
+	optional_device_array<floppy_connector, 2> m_upd_connector;
 };
 
 #endif // MAME_INCLUDES_HEC2HRP_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/hng64.h mame-0.224+dfsg.1/src/mame/includes/hng64.h
--- mame-0.222+dfsg.1/src/mame/includes/hng64.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/hng64.h	2020-08-26 08:57:19.000000000 +0000
@@ -385,10 +385,6 @@
 	void hng64_sprite_clear_even_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
 	void hng64_sprite_clear_odd_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
 	void hng64_videoram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
-	uint8_t hng64_comm_space_r(offs_t offset);
-	void hng64_comm_space_w(offs_t offset, uint8_t data);
-	uint8_t hng64_comm_mmu_r(offs_t offset);
-	void hng64_comm_mmu_w(offs_t offset, uint8_t data);
 
 	// shared ram access
 	uint8_t ioport0_r();
@@ -431,13 +427,7 @@
 
 	void set_irq(uint32_t irq_vector);
 	uint32_t m_irq_pending;
-	uint8_t *m_comm_rom;
-	std::unique_ptr<uint8_t[]> m_comm_ram;
-	uint8_t m_mmu_regs[8];
-	uint32_t m_mmua[6];
-	uint16_t m_mmub[6];
-	uint8_t read_comm_data(uint32_t offset);
-	void write_comm_data(uint32_t offset,uint8_t data);
+
 	TIMER_CALLBACK_MEMBER(comhack_callback);
 	emu_timer *m_comhack_timer;
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/lucky74.h mame-0.224+dfsg.1/src/mame/includes/lucky74.h
--- mame-0.222+dfsg.1/src/mame/includes/lucky74.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/lucky74.h	2020-08-26 08:57:19.000000000 +0000
@@ -27,7 +27,7 @@
 	void lucky74(machine_config &config);
 
 protected:
-	virtual void machine_start() override { m_lamps.resolve(); }
+	virtual void machine_start() override;
 	virtual void video_start() override;
 	virtual void machine_reset() override;
 	virtual void sound_start() override;
@@ -39,21 +39,21 @@
 	void usart_8251_w(uint8_t data);
 	uint8_t copro_sm7831_r();
 	void copro_sm7831_w(uint8_t data);
-	void lucky74_fg_videoram_w(offs_t offset, uint8_t data);
-	void lucky74_fg_colorram_w(offs_t offset, uint8_t data);
-	void lucky74_bg_videoram_w(offs_t offset, uint8_t data);
-	void lucky74_bg_colorram_w(offs_t offset, uint8_t data);
+	void fg_videoram_w(offs_t offset, uint8_t data);
+	void fg_colorram_w(offs_t offset, uint8_t data);
+	void bg_videoram_w(offs_t offset, uint8_t data);
+	void bg_colorram_w(offs_t offset, uint8_t data);
 	void ym2149_portb_w(uint8_t data);
 	void lamps_a_w(uint8_t data);
 	void lamps_b_w(uint8_t data);
 	TILE_GET_INFO_MEMBER(get_fg_tile_info);
 	TILE_GET_INFO_MEMBER(get_bg_tile_info);
-	void lucky74_palette(palette_device &palette) const;
-	uint32_t screen_update_lucky74(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	void palette(palette_device &palette) const;
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	INTERRUPT_GEN_MEMBER(nmi_interrupt);
-	DECLARE_WRITE_LINE_MEMBER(lucky74_adpcm_int);
-	void lucky74_map(address_map &map);
-	void lucky74_portmap(address_map &map);
+	DECLARE_WRITE_LINE_MEMBER(adpcm_int);
+	void prg_map(address_map &map);
+	void portmap(address_map &map);
 
 	uint8_t m_ym2149_portb;
 	uint8_t m_usart_8251;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/lviv.h mame-0.224+dfsg.1/src/mame/includes/lviv.h
--- mame-0.222+dfsg.1/src/mame/includes/lviv.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/lviv.h	2020-08-26 08:57:19.000000000 +0000
@@ -41,7 +41,8 @@
 	DECLARE_INPUT_CHANGED_MEMBER(reset_button);
 
 private:
-	virtual void machine_reset() override;
+	void machine_reset() override;
+	void machine_start() override;
 
 	void lviv_palette(palette_device &palette) const;
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -49,19 +50,19 @@
 	uint8_t io_r(offs_t offset);
 	void io_w(offs_t offset, uint8_t data);
 
-	uint8_t ppi_0_porta_r();
-	uint8_t ppi_0_portb_r();
-	uint8_t ppi_0_portc_r();
-	uint8_t ppi_1_porta_r();
-	uint8_t ppi_1_portb_r();
-	uint8_t ppi_1_portc_r();
-
-	void ppi_0_porta_w(uint8_t data);
-	void ppi_0_portb_w(uint8_t data);
-	void ppi_0_portc_w(uint8_t data);
-	void ppi_1_porta_w(uint8_t data);
-	void ppi_1_portb_w(uint8_t data);
-	void ppi_1_portc_w(uint8_t data);
+	uint8_t ppi0_porta_r();
+	uint8_t ppi0_portb_r();
+	uint8_t ppi0_portc_r();
+	uint8_t ppi1_porta_r();
+	uint8_t ppi1_portb_r();
+	uint8_t ppi1_portc_r();
+
+	void ppi0_porta_w(uint8_t data);
+	void ppi0_portb_w(uint8_t data);
+	void ppi0_portc_w(uint8_t data);
+	void ppi1_porta_w(uint8_t data);
+	void ppi1_portb_w(uint8_t data);
+	void ppi1_portc_w(uint8_t data);
 
 	DECLARE_SNAPSHOT_LOAD_MEMBER(snapshot_cb);
 
@@ -87,7 +88,7 @@
 	required_ioport_array<12> m_key;
 	required_ioport m_joy_port;
 
-	uint8_t* m_video_ram;
+	uint8_t* m_vram;
 	uint16_t m_colortable[1][4];
 	uint8_t m_ppi_port_outputs[2][3];
 	uint8_t m_startup_mem_map;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/m72.h mame-0.224+dfsg.1/src/mame/includes/m72.h
--- mame-0.222+dfsg.1/src/mame/includes/m72.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/m72.h	2020-08-26 08:57:19.000000000 +0000
@@ -84,7 +84,7 @@
 	void rtype(machine_config &config);
 	void imgfightb(machine_config &config);
 	void lohtb(machine_config &config);
-	void imgfightj(machine_config &config);
+	void imgfight(machine_config &config);
 	void mrheli(machine_config &config);
 	void nspiritj(machine_config &config);
 
@@ -94,7 +94,6 @@
 	void init_m72_8751();
 	void init_dbreedm72();
 	void init_nspirit();
-	void init_imgfight();
 
 private:
 	required_device<cpu_device> m_maincpu;
@@ -172,7 +171,6 @@
 	// game specific
 	void bchopper_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask = ~0);
 	void nspirit_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask = ~0);
-	void imgfight_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask = ~0);
 	void loht_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask = ~0);
 	void dbreedm72_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask = ~0);
 	void dkgenm72_sample_trigger_w(offs_t offset, u16 data, u16 mem_mask = ~0);
@@ -192,7 +190,7 @@
 	void machine_start() override;
 	void machine_reset() override;
 	DECLARE_VIDEO_START(m72);
-	DECLARE_VIDEO_START(imgfightj);
+	DECLARE_VIDEO_START(imgfight);
 	DECLARE_VIDEO_START(mrheli);
 	DECLARE_VIDEO_START(nspiritj);
 	DECLARE_VIDEO_START(xmultipl);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/mac.h mame-0.224+dfsg.1/src/mame/includes/mac.h
--- mame-0.222+dfsg.1/src/mame/includes/mac.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/mac.h	2020-08-26 08:57:19.000000000 +0000
@@ -23,7 +23,6 @@
 #include "machine/applefdc.h"
 #include "machine/ncr539x.h"
 #include "machine/ncr5380.h"
-#include "machine/mackbd.h"
 #include "machine/macrtc.h"
 #include "sound/asc.h"
 #include "sound/awacs.h"
@@ -35,10 +34,6 @@
 #define MAC_SCREEN_NAME "screen"
 #define MAC_539X_1_TAG "539x_1"
 #define MAC_539X_2_TAG "539x_2"
-#define MACKBD_TAG "mackbd"
-
-// uncomment to run i8021 keyboard in original Mac/512(e)/Plus
-//#define MAC_USE_EMULATED_KBD (1)
 
 // model helpers
 #define ADB_IS_BITBANG  ((mac->m_model == MODEL_MAC_SE || mac->m_model == MODEL_MAC_CLASSIC) || (mac->m_model >= MODEL_MAC_II && mac->m_model <= MODEL_MAC_IICI) || (mac->m_model == MODEL_MAC_SE30) || (mac->m_model == MODEL_MAC_QUADRA_700))
@@ -81,7 +76,6 @@
 		m_539x_2(*this, MAC_539X_2_TAG),
 		m_ncr5380(*this, "ncr5380"),
 		m_fdc(*this, "fdc"),
-		m_mackbd(*this, MACKBD_TAG),
 		m_rtc(*this, "rtc"),
 		m_mouse0(*this, "MOUSE0"),
 		m_mouse1(*this, "MOUSE1"),
@@ -100,7 +94,6 @@
 	{
 	}
 
-	void add_mackbd(machine_config &config);
 	void add_scsi(machine_config &config, bool cdrom = false);
 	void add_base_devices(machine_config &config, bool rtc = true, bool super_woz = false);
 	void add_asc(machine_config &config, asc_device::asc_type type = asc_device::asc_type::ASC);
@@ -265,7 +258,6 @@
 	optional_device<ncr539x_device> m_539x_2;
 	optional_device<ncr5380_device> m_ncr5380;
 	required_device<applefdc_base_device> m_fdc;
-	optional_device<mackbd_device> m_mackbd;
 	optional_device<rtc3430042_device> m_rtc;
 
 	required_ioport m_mouse0, m_mouse1, m_mouse2;
@@ -309,24 +301,6 @@
 	bool m_main_buffer;
 	int m_snd_vol;
 
-#ifndef MAC_USE_EMULATED_KBD
-	/* used to store the reply to most keyboard commands */
-	int m_keyboard_reply;
-
-	/* Keyboard communication in progress? */
-	int m_kbd_comm;
-	int m_kbd_receive;
-	/* timer which is used to time out inquiry */
-	emu_timer *m_inquiry_timeout;
-
-	int m_kbd_shift_reg;
-	int m_kbd_shift_count;
-
-	/* keycode buffer (used for keypad/arrow key transition) */
-	int m_keycode_buf[2];
-	int m_keycode_buf_index;
-#endif
-
 	/* keyboard matrix to detect transition - macadb needs to stop relying on this */
 	int m_key_matrix[7];
 
@@ -555,10 +529,6 @@
 	uint32_t screen_update_macsonora(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	uint32_t screen_update_macpbwd(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
 	DECLARE_WRITE_LINE_MEMBER(mac_rbv_vbl);
-#ifndef MAC_USE_EMULATED_KBD
-	TIMER_CALLBACK_MEMBER(kbd_clock);
-	TIMER_CALLBACK_MEMBER(inquiry_timeout_func);
-#endif
 	TIMER_CALLBACK_MEMBER(mac_6015_tick);
 	TIMER_CALLBACK_MEMBER(mac_adbrefresh_tick);
 	TIMER_CALLBACK_MEMBER(mac_scanline_tick);
@@ -566,7 +536,6 @@
 	TIMER_CALLBACK_MEMBER(dafb_cursor_tick);
 	TIMER_CALLBACK_MEMBER(mac_adb_tick);    // macadb.c
 	TIMER_CALLBACK_MEMBER(mac_pmu_tick);    // macadb.c
-	DECLARE_WRITE_LINE_MEMBER(mac_via_out_cb2);
 	DECLARE_WRITE_LINE_MEMBER(mac_adb_via_out_cb2);
 	uint8_t mac_via_in_a();
 	uint8_t mac_via_in_b();
@@ -595,10 +564,6 @@
 	DECLARE_WRITE_LINE_MEMBER(mac_via2_irq);
 	void dafb_recalc_ints();
 	void set_scc_waitrequest(int waitrequest);
-	int scan_keyboard();
-	void keyboard_init();
-	void kbd_shift_out(int data);
-	void keyboard_receive(int val);
 	void mac_driver_init(model_t model);
 	void mac_install_memory(offs_t memory_begin, offs_t memory_end, offs_t memory_size, void *memory_data, int is_rom, const char *bank);
 	offs_t mac_dasm_override(std::ostream &stream, offs_t pc, const util::disasm_interface::data_buffer &opcodes, const util::disasm_interface::data_buffer &params);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/mcr68.h mame-0.224+dfsg.1/src/mame/includes/mcr68.h
--- mame-0.222+dfsg.1/src/mame/includes/mcr68.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/mcr68.h	2020-08-26 08:57:19.000000000 +0000
@@ -13,7 +13,7 @@
 #include "machine/timer.h"
 #include "machine/watchdog.h"
 #include "audio/midway.h"
-#include "audio/williams.h"
+#include "audio/s11c_bg.h"
 #include "machine/6840ptm.h"
 #include "machine/adc0844.h"
 #include "screen.h"
@@ -26,7 +26,7 @@
 		driver_device(mconfig, type, tag),
 		m_sounds_good(*this, "sg"),
 		m_turbo_cheap_squeak(*this, "tcs"),
-		m_cvsd_sound(*this, "cvsd"),
+		m_bg(*this, "bg"),
 		m_adc(*this, "adc"),
 		m_videoram(*this, "videoram"),
 		m_spriteram(*this, "spriteram") ,
@@ -56,7 +56,7 @@
 private:
 	optional_device<midway_sounds_good_device> m_sounds_good;
 	optional_device<midway_turbo_cheap_squeak_device> m_turbo_cheap_squeak;
-	optional_device<williams_cvsd_sound_device> m_cvsd_sound;
+	optional_device<s11c_bg_device> m_bg;
 	optional_device<adc0844_device> m_adc;
 
 	required_shared_ptr<uint16_t> m_videoram;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/megadriv_acbl.h mame-0.224+dfsg.1/src/mame/includes/megadriv_acbl.h
--- mame-0.222+dfsg.1/src/mame/includes/megadriv_acbl.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/megadriv_acbl.h	2020-08-26 08:57:19.000000000 +0000
@@ -24,6 +24,7 @@
 	void init_topshoot();
 	void init_puckpkmn();
 	void init_hshavoc();
+	void init_barek2();
 	void init_barek3();
 	void init_sonic2mb();
 	void init_twinktmb();
@@ -34,6 +35,7 @@
 	uint16_t bl_710000_r();
 	void aladmdb_w(uint16_t data);
 	uint16_t aladmdb_r();
+	uint16_t barek2mb_r();
 	uint16_t jparkmb_r();
 	uint16_t twinktmb_r();
 	uint16_t mk3mdb_dsw_r(offs_t offset);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/metalmx.h mame-0.224+dfsg.1/src/mame/includes/metalmx.h
--- mame-0.222+dfsg.1/src/mame/includes/metalmx.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/metalmx.h	2020-08-26 08:57:19.000000000 +0000
@@ -65,8 +65,8 @@
 	required_device<atari_cage_device> m_cage;
 
 	required_shared_ptr<uint32_t> m_adsp_internal_program_ram;
-	required_shared_ptr<uint16_t> m_gsp_dram;
-	required_shared_ptr<uint16_t> m_gsp_vram;
+	required_shared_ptr<uint32_t> m_gsp_dram;
+	required_shared_ptr<uint32_t> m_gsp_vram;
 };
 
 #endif // MAME_INCLUDES_METALMX_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/midvunit.h mame-0.224+dfsg.1/src/mame/includes/midvunit.h
--- mame-0.222+dfsg.1/src/mame/includes/midvunit.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/midvunit.h	2020-08-26 08:57:19.000000000 +0000
@@ -61,7 +61,6 @@
 		m_watchdog(*this, "watchdog"),
 		m_palette(*this, "palette"),
 		m_adc(*this, "adc"),
-		m_midway_serial_pic(*this, "serial_pic"),
 		m_midway_serial_pic2(*this, "serial_pic2"),
 		m_midway_ioasic(*this, "ioasic"),
 		m_ata(*this, "ata"),
@@ -159,9 +158,6 @@
 	void crusnwld_serial_data_w(uint32_t data);
 	uint32_t bit_data_r(offs_t offset);
 	void bit_reset_w(uint32_t data);
-	uint32_t offroadc_serial_status_r();
-	uint32_t offroadc_serial_data_r();
-	void offroadc_serial_data_w(uint32_t data);
 	uint32_t midvplus_misc_r(offs_t offset);
 	void midvplus_misc_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
 	void midvplus_xf1_w(uint8_t data);
@@ -184,7 +180,6 @@
 	required_device<watchdog_timer_device> m_watchdog;
 	required_device<palette_device> m_palette;
 	optional_device<adc0844_device> m_adc;
-	optional_device<midway_serial_pic_device> m_midway_serial_pic;
 	optional_device<midway_serial_pic2_device> m_midway_serial_pic2;
 	optional_device<midway_ioasic_device> m_midway_ioasic;
 	optional_device<ata_interface_device> m_ata;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/midwunit.h mame-0.224+dfsg.1/src/mame/includes/midwunit.h
--- mame-0.222+dfsg.1/src/mame/includes/midwunit.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/midwunit.h	2020-08-26 08:57:19.000000000 +0000
@@ -10,13 +10,22 @@
 
 #pragma once
 
+#include "audio/dcs.h"
+#include "cpu/tms34010/tms34010.h"
 #include "machine/midwayic.h"
+#include "video/midtunit.h"
+#include "emupal.h"
 
-class midwunit_state : public midtunit_state
+class midwunit_state : public driver_device
 {
 public:
 	midwunit_state(const machine_config &mconfig, device_type type, const char *tag)
-		: midtunit_state(mconfig, type, tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_video(*this, "video")
+		, m_dcs(*this, "dcs")
+		, m_palette(*this, "palette")
+		, m_gfxrom(*this, "gfxrom")
 		, m_midway_serial_pic(*this, "serial_security_sim")
 		, m_midway_serial_pic_emu(*this, "serial_security")
 		, m_nvram(*this, "nvram")
@@ -53,12 +62,18 @@
 	uint16_t midwunit_sound_r();
 	uint16_t midwunit_sound_state_r();
 	void midwunit_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void umk3_palette_hack_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+	void umk3_palette_hack_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	void wwfmania_io_0_w(uint16_t data);
 
 	void init_mk3_common();
 	void main_map(address_map &map);
 
+	required_device<tms340x0_device> m_maincpu;
+	required_device<midtunit_video_device> m_video;
+	required_device<dcs_audio_device> m_dcs;
+	required_device<palette_device> m_palette;
+	required_memory_region m_gfxrom;
+
 	optional_device<midway_serial_pic_device> m_midway_serial_pic;
 	optional_device<midway_serial_pic_emu_device> m_midway_serial_pic_emu;
 	required_shared_ptr<uint16_t> m_nvram;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/midxunit.h mame-0.224+dfsg.1/src/mame/includes/midxunit.h
--- mame-0.222+dfsg.1/src/mame/includes/midxunit.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/midxunit.h	2020-08-26 08:57:19.000000000 +0000
@@ -10,17 +10,26 @@
 
 #pragma once
 
-#include "midtunit.h"
-#include "machine/midwayic.h"
+#include "audio/dcs.h"
+#include "cpu/tms34010/tms34010.h"
+#include "cpu/pic16c5x/pic16c5x.h"
+#include "machine/nvram.h"
+#include "video/midtunit.h"
+#include "emupal.h"
 
 
-class midxunit_state : public midtunit_state
+class midxunit_state : public driver_device
 {
 public:
 	midxunit_state(const machine_config &mconfig, device_type type, const char *tag)
-		: midtunit_state(mconfig, type, tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_video(*this, "video")
+		, m_dcs(*this, "dcs")
+		, m_palette(*this, "palette")
+		, m_gfxrom(*this, "gfxrom")
 		, m_nvram(*this, "nvram")
-		, m_midway_serial_pic(*this, "serial_pic")
+		, m_pic(*this, "pic")
 		, m_gun_recoil(*this, "Player%u_Gun_Recoil", 1U)
 		, m_gun_led(*this, "Player%u_Gun_LED", 1U)
 	{ }
@@ -32,35 +41,44 @@
 	virtual void machine_reset() override;
 
 private:
-	uint16_t midxunit_cmos_r(offs_t offset);
-	void midxunit_cmos_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+	uint8_t midxunit_cmos_r(offs_t offset);
+	void midxunit_cmos_w(offs_t offset, uint8_t data);
 	void midxunit_io_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	void midxunit_unknown_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	DECLARE_WRITE_LINE_MEMBER(adc_int_w);
-	uint16_t midxunit_status_r();
-	uint16_t midxunit_uart_r(offs_t offset);
-	void midxunit_uart_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	uint16_t midxunit_security_r();
-	void midxunit_security_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void midxunit_security_clock_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	uint16_t midxunit_sound_r();
-	uint16_t midxunit_sound_state_r();
-	void midxunit_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+	uint32_t midxunit_status_r();
+	uint8_t midxunit_uart_r(offs_t offset);
+	void midxunit_uart_w(offs_t offset, uint8_t data);
+	uint32_t midxunit_security_r();
+	void midxunit_security_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
+	void midxunit_security_clock_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
 	DECLARE_WRITE_LINE_MEMBER(midxunit_dcs_output_full);
+	uint32_t midxunit_dma_r(offs_t offset, uint32_t mem_mask = ~0);
+	void midxunit_dma_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
 
 	void main_map(address_map &map);
 
-	required_shared_ptr<uint16_t> m_nvram;
-	required_device<midway_serial_pic_device> m_midway_serial_pic;
+	required_device<tms340x0_device> m_maincpu;
+	required_device<midtunit_video_device> m_video;
+	required_device<dcs_audio_device> m_dcs;
+	required_device<palette_device> m_palette;
+	required_memory_region m_gfxrom;
+
+	required_device<nvram_device> m_nvram;
+	required_device<pic16c57_device> m_pic;
 	output_finder<3> m_gun_recoil;
 	output_finder<3> m_gun_led;
 
 	uint8_t m_cmos_write_enable;
 	uint16_t m_iodata[8];
-	uint8_t m_ioshuffle[16];
 	uint8_t m_uart[8];
-	uint8_t m_security_bits;
 	bool m_adc_int;
+	std::unique_ptr<uint8_t[]> m_nvram_data;
+
+	uint8_t m_pic_command;
+	uint8_t m_pic_data;
+	uint8_t m_pic_clk;
+	uint8_t m_pic_status;
 };
 
 #endif // MAME_INCLUDES_MIDXUNIT_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/midyunit.h mame-0.224+dfsg.1/src/mame/includes/midyunit.h
--- mame-0.222+dfsg.1/src/mame/includes/midyunit.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/midyunit.h	2020-08-26 08:57:19.000000000 +0000
@@ -63,6 +63,7 @@
 	void init_trog();
 	void init_totcarn();
 	void init_mkyawdim();
+	void init_mkyawdim2();
 	void init_shimpact();
 	void init_hiimpact();
 	void init_mkyturbo();
@@ -156,6 +157,8 @@
 	uint16_t midyunit_dma_r(offs_t offset);
 	void midyunit_dma_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	void yawdim_oki_bank_w(uint8_t data);
+	void yawdim2_oki_bank_w(uint8_t data);
+	uint8_t yawdim2_soundlatch_r();
 	TMS340X0_TO_SHIFTREG_CB_MEMBER(to_shiftreg);
 	TMS340X0_FROM_SHIFTREG_CB_MEMBER(from_shiftreg);
 	TMS340X0_SCANLINE_IND16_CB_MEMBER(scanline_update);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/midzeus.h mame-0.224+dfsg.1/src/mame/includes/midzeus.h
--- mame-0.222+dfsg.1/src/mame/includes/midzeus.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/midzeus.h	2020-08-26 08:57:19.000000000 +0000
@@ -69,7 +69,6 @@
 		: driver_device(mconfig, type, tag),
 		m_nvram(*this, "nvram"),
 		m_ram_base(*this, "ram_base"),
-		m_firewire(*this, "firewire"),
 		m_tms32031_control(*this, "tms32031_ctl"),
 		m_zeusbase(*this, "zeusbase"),
 		m_m48t35(*this, "m48t35"),
@@ -95,7 +94,6 @@
 
 	required_shared_ptr<uint32_t> m_nvram;
 	required_shared_ptr<uint32_t> m_ram_base;
-	optional_shared_ptr<uint32_t> m_firewire;
 	required_shared_ptr<uint32_t> m_tms32031_control;
 	optional_shared_ptr<uint32_t> m_zeusbase;
 
@@ -104,12 +102,8 @@
 	void cmos_protect_w(uint32_t data);
 	uint32_t zpram_r(offs_t offset);
 	void zpram_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
-	uint32_t disk_asic_r(offs_t offset);
-	void disk_asic_w(offs_t offset, uint32_t data);
 	uint32_t disk_asic_jr_r(offs_t offset);
 	void disk_asic_jr_w(offs_t offset, uint32_t data);
-	uint32_t firewire_r(offs_t offset);
-	void firewire_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
 	uint32_t tms32031_control_r(offs_t offset);
 	void tms32031_control_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0);
 	void keypad_select_w(offs_t offset, uint32_t data);
@@ -125,10 +119,8 @@
 	uint32_t trackball_r(offs_t offset);
 	void init_invasn();
 	void init_mk4();
-	DECLARE_MACHINE_START(midzeus);
-	DECLARE_MACHINE_RESET(midzeus);
-	DECLARE_VIDEO_START(midzeus);
-	uint32_t screen_update_midzeus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	INTERRUPT_GEN_MEMBER(display_irq);
 	TIMER_CALLBACK_MEMBER(display_irq_off);
 	TIMER_CALLBACK_MEMBER(invasn_gun_callback);
@@ -136,7 +128,12 @@
 	void invasn(machine_config &config);
 	void mk4(machine_config &config);
 	void zeus_map(address_map &map);
+
 protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	virtual void video_start() override;
+
 	optional_device<timekeeper_device> m_m48t35;
 	required_device<cpu_device> m_maincpu;
 	required_device<screen_device> m_screen;
@@ -151,20 +148,22 @@
 	optional_ioport m_io_49way_y;
 	optional_ioport m_io_keypad;
 	output_finder<7> m_digits;
-	emu_timer *m_display_irq_off_timer;
-	uint8_t            crusnexo_leds_select;
-	uint32_t           disk_asic[0x10];
-	uint32_t           disk_asic_jr[0x10];
 
-	uint8_t cmos_protected;
+	emu_timer *     m_display_irq_off_timer;
+	uint8_t         m_crusnexo_leds_select;
+	uint32_t        m_disk_asic_jr[0x10];
+
+	uint8_t         m_cmos_protected;
+
+	emu_timer *     m_timer[2];
 
-	emu_timer *timer[2];
 private:
-	uint32_t           gun_control;
-	uint8_t            gun_irq_state;
-	emu_timer *        gun_timer[2];
-	int32_t            gun_x[2], gun_y[2];
-	uint8_t            keypad_select;
+	uint32_t        m_gun_control;
+	uint8_t         m_gun_irq_state;
+	emu_timer *     m_gun_timer[2];
+	int32_t         m_gun_x[2], m_gun_y[2];
+	uint8_t         m_keypad_select;
+
 	void exit_handler();
 	void zeus_pointer_w(uint32_t which, uint32_t data, bool logit);
 	void zeus_register16_w(offs_t offset, uint16_t data, bool logit);
@@ -187,22 +186,22 @@
 	void waveram_plot_check_depth_nowrite(int y, int x, uint16_t color, uint16_t depth);
 
 	std::unique_ptr<midzeus_renderer> m_poly;
-	uint8_t m_log_fifo;
+	uint8_t     m_log_fifo;
 
-	uint32_t m_zeus_fifo[20];
-	uint8_t m_zeus_fifo_words;
-	int16_t m_zeus_matrix[3][3];
-	int32_t m_zeus_point[3];
-	int16_t m_zeus_light[3];
-	void *m_zeus_renderbase;
-	uint32_t m_zeus_palbase;
-	uint32_t m_zeus_unkbase;
-	int m_zeus_enable_logging;
-	uint32_t m_zeus_objdata;
-	rectangle m_zeus_cliprect;
+	uint32_t    m_zeus_fifo[20];
+	uint8_t     m_zeus_fifo_words;
+	int16_t     m_zeus_matrix[3][3];
+	int32_t     m_zeus_point[3];
+	int16_t     m_zeus_light[3];
+	void *      m_zeus_renderbase;
+	uint32_t    m_zeus_palbase;
+	uint32_t    m_zeus_unkbase;
+	int         m_zeus_enable_logging;
+	uint32_t    m_zeus_objdata;
+	rectangle   m_zeus_cliprect;
 
 	std::unique_ptr<uint32_t[]> m_waveram[2];
-	int m_yoffs;
-	int m_texel_width;
-	int m_is_mk4b;
+	int         m_yoffs;
+	int         m_texel_width;
+	int         m_is_mk4b;
 };
diff -Nru mame-0.222+dfsg.1/src/mame/includes/mikro80.h mame-0.224+dfsg.1/src/mame/includes/mikro80.h
--- mame-0.222+dfsg.1/src/mame/includes/mikro80.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/mikro80.h	2020-08-26 08:57:19.000000000 +0000
@@ -18,31 +18,18 @@
 class mikro80_state : public driver_device
 {
 public:
-	enum
-	{
-		TIMER_RESET
-	};
-
-	mikro80_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_cursor_ram(*this, "cursor_ram"),
-		m_video_ram(*this, "video_ram"),
-		m_ppi8255(*this, "ppi8255"),
-		m_cassette(*this, "cassette"),
-		m_region_maincpu(*this, "maincpu"),
-		m_region_gfx1(*this, "gfx1"),
-		m_bank1(*this, "bank1"),
-		m_io_line0(*this, "LINE0"),
-		m_io_line1(*this, "LINE1"),
-		m_io_line2(*this, "LINE2"),
-		m_io_line3(*this, "LINE3"),
-		m_io_line4(*this, "LINE4"),
-		m_io_line5(*this, "LINE5"),
-		m_io_line6(*this, "LINE6"),
-		m_io_line7(*this, "LINE7"),
-		m_io_line8(*this, "LINE8") ,
-		m_dac(*this, "dac"),
-		m_maincpu(*this, "maincpu")
+	mikro80_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_aram(*this, "attrram")
+		, m_vram(*this, "videoram")
+		, m_ppi(*this, "ppi8255")
+		, m_cassette(*this, "cassette")
+		, m_rom(*this, "maincpu")
+		, m_ram(*this, "mainram")
+		, m_p_chargen(*this, "chargen")
+		, m_io_keyboard(*this, "LINE%u", 0U)
+		, m_dac(*this, "dac")
+		, m_maincpu(*this, "maincpu")
 	{ }
 
 	void kristall(machine_config &config);
@@ -53,43 +40,34 @@
 	void init_mikro80();
 
 private:
-	required_shared_ptr<uint8_t> m_cursor_ram;
-	required_shared_ptr<uint8_t> m_video_ram;
-	int m_keyboard_mask;
-	int m_key_mask;
-	void radio99_sound_w(uint8_t data);
-	uint8_t mikro80_8255_portb_r();
-	uint8_t mikro80_8255_portc_r();
-	void mikro80_8255_porta_w(uint8_t data);
-	void mikro80_8255_portc_w(uint8_t data);
-	uint8_t mikro80_keyboard_r(offs_t offset);
-	void mikro80_keyboard_w(offs_t offset, uint8_t data);
-	void mikro80_tape_w(uint8_t data);
-	uint8_t mikro80_tape_r();
+	u8 m_keyboard_mask;
+	u8 m_key_mask;
+	void sound_w(u8 data);
+	u8 portb_r();
+	u8 portc_r();
+	u8 kristall2_portc_r();
+	void porta_w(u8 data);
+	void portc_w(u8 data);
+	void tape_w(u8 data);
+	u8 tape_r();
 	virtual void machine_reset() override;
-	virtual void video_start() override;
-	uint32_t screen_update_mikro80(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	virtual void machine_start() override;
+	u32 screen_update_mikro80(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	void kristall_io(address_map &map);
 	void mikro80_io(address_map &map);
 	void mikro80_mem(address_map &map);
 	void radio99_io(address_map &map);
 
-	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
-	required_device<i8255_device> m_ppi8255;
+	memory_passthrough_handler *m_rom_shadow_tap;
+	required_shared_ptr<uint8_t> m_aram;
+	required_shared_ptr<uint8_t> m_vram;
+	required_device<i8255_device> m_ppi;
 	required_device<cassette_image_device> m_cassette;
-	required_memory_region m_region_maincpu;
-	required_memory_region m_region_gfx1;
-	required_memory_bank m_bank1;
-	required_ioport m_io_line0;
-	required_ioport m_io_line1;
-	required_ioport m_io_line2;
-	required_ioport m_io_line3;
-	required_ioport m_io_line4;
-	required_ioport m_io_line5;
-	required_ioport m_io_line6;
-	required_ioport m_io_line7;
-	required_ioport m_io_line8;
+	required_region_ptr<u8> m_rom;
+	required_shared_ptr<u8> m_ram;
+	required_region_ptr<u8> m_p_chargen;
+	required_ioport_array<9> m_io_keyboard;
 	optional_device<dac_bit_interface> m_dac;
 	required_device<cpu_device> m_maincpu;
 };
diff -Nru mame-0.222+dfsg.1/src/mame/includes/model3.h mame-0.224+dfsg.1/src/mame/includes/model3.h
--- mame-0.222+dfsg.1/src/mame/includes/model3.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/model3.h	2020-08-26 08:57:19.000000000 +0000
@@ -104,6 +104,7 @@
 	void model3_20(machine_config &config);
 	void model3_21(machine_config &config);
 
+	void getbass(machine_config &config);
 	void scud(machine_config &config);
 	void lostwsga(machine_config &config);
 
@@ -382,6 +383,8 @@
 	void model3_snd(address_map &map);
 	void scsp1_map(address_map &map);
 	void scsp2_map(address_map &map);
+	void getbass_iocpu_mem(address_map &map);
+	void getbass_iocpu_io(address_map &map);
 };
 
 #endif // MAME_INCLUDES_MODEL3_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/mpu4.h mame-0.224+dfsg.1/src/mame/includes/mpu4.h
--- mame-0.222+dfsg.1/src/mame/includes/mpu4.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/mpu4.h	2020-08-26 08:57:19.000000000 +0000
@@ -14,13 +14,15 @@
 #include "machine/steppers.h"
 #include "machine/roc10937.h"
 #include "machine/meters.h"
+
+#include "machine/bacta_datalogger.h"
+
 #include "emupal.h"
 
 
 #define MPU4_MASTER_CLOCK           XTAL(6'880'000)
 #define VIDEO_MASTER_CLOCK          XTAL(10'000'000)
 
-
 #ifdef MAME_DEBUG
 #define MPU4VIDVERBOSE 1
 #else
@@ -61,7 +63,7 @@
 #define SIX_REEL_1TO8  4    // Two reels on the meter drives
 #define SIX_REEL_5TO8  5    // Like FIVE_REEL_5TO8, but with an extra reel elsewhere
 #define SEVEN_REEL     6    // Mainly club machines, significant reworking of reel hardware
-#define FLUTTERBOX     7    // Will you start the fans, please!  A fan using a reel mux-like setup, but not actually a reel
+#define FLUTTERBOX     7    // A fan feature using a reel mux-like setup, but not actually a reel
 
 //Lamp extension
 #define NO_EXTENDER         0 // As originally designed
@@ -74,6 +76,8 @@
 #define CARD_A          1
 #define CARD_B          2
 #define CARD_C          3
+#define SIMPLE_CARD     4
+
 
 //Hopper info
 #define TUBES               0
@@ -112,6 +116,7 @@
 		, m_pia6(*this, "pia_ic6")
 		, m_pia7(*this, "pia_ic7")
 		, m_pia8(*this, "pia_ic8")
+		, m_pia_ic4ss(*this, "pia_ic4ss")
 		, m_port_mux(*this, {"ORANGE1", "ORANGE2", "BLACK1", "BLACK2", "ORANGE1", "ORANGE2", "DIL1", "DIL2"})
 		, m_aux1_port(*this, "AUX1")
 		, m_aux2_port(*this, "AUX2")
@@ -122,6 +127,7 @@
 		, m_meters(*this, "meters")
 		, m_ym2413(*this, "ym2413")
 		, m_ay8913(*this, "ay8913")
+		, m_dataport(*this, "dataport")
 		, m_lamps(*this, "lamp%u", 0U)
 		, m_mpu4leds(*this, "mpu4led%u", 0U)
 		, m_digits(*this, "digit%u", 0U)
@@ -160,6 +166,7 @@
 	void init_m4_led_a();
 	void init_m4_led_b();
 	void init_m4_led_c();
+	void init_m4_led_simple();
 	void init_m4_andycp10c();
 	void init_m_blsbys();
 	void init_m_oldtmr();
@@ -233,7 +240,7 @@
 	void mpu4_memmap(address_map &map);
 	void lamp_extend_small(int data);
 	void lamp_extend_large(int data,int column,int active);
-	void led_write_latch(int latch, int data, int column);
+	void led_write_extender(int latch, int data, int column);
 	void update_meters();
 	void ic23_update();
 	void ic24_output(int data);
@@ -309,6 +316,8 @@
 	DECLARE_WRITE_LINE_MEMBER(pia_gb_ca2_w);
 	DECLARE_WRITE_LINE_MEMBER(pia_gb_cb2_w);
 
+	DECLARE_WRITE_LINE_MEMBER(dataport_rxd);
+
 	required_device<cpu_device> m_maincpu;
 	optional_device<rocvfd_device> m_vfd;
 	optional_device<ptm6840_device> m_6840ptm;
@@ -319,6 +328,7 @@
 	optional_device<pia6821_device> m_pia6;
 	optional_device<pia6821_device> m_pia7;
 	optional_device<pia6821_device> m_pia8;
+	optional_device<pia6821_device> m_pia_ic4ss;
 	required_ioport_array<8> m_port_mux;
 	required_ioport m_aux1_port;
 	required_ioport m_aux2_port;
@@ -329,6 +339,7 @@
 	required_device<meters_device> m_meters;
 	optional_device<ym2413_device> m_ym2413;
 	optional_device<ay8913_device> m_ay8913;
+	optional_device<bacta_datalogger_device> m_dataport;
 
 	// not all systems have this many lamps/LEDs/digits but the driver is too much of a mess to split up now
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/mrdo.h mame-0.224+dfsg.1/src/mame/includes/mrdo.h
--- mame-0.222+dfsg.1/src/mame/includes/mrdo.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/mrdo.h	2020-08-26 08:57:19.000000000 +0000
@@ -28,6 +28,7 @@
 
 	void mrdo(machine_config &config);
 	void mrlo(machine_config &config);
+	void mrdobl(machine_config &config);
 
 protected:
 	virtual void video_start() override;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/mw8080bw.h mame-0.224+dfsg.1/src/mame/includes/mw8080bw.h
--- mame-0.222+dfsg.1/src/mame/includes/mw8080bw.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/mw8080bw.h	2020-08-26 08:57:19.000000000 +0000
@@ -385,6 +385,11 @@
 
 	void zzzap(machine_config &config);
 
+	void lagunar(machine_config &config);
+
+protected:
+	void zzzap_common(machine_config &config);
+
 private:
 	void io_map(address_map &map);
 };
diff -Nru mame-0.222+dfsg.1/src/mame/includes/namcos2.h mame-0.224+dfsg.1/src/mame/includes/namcos2.h
--- mame-0.222+dfsg.1/src/mame/includes/namcos2.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/namcos2.h	2020-08-26 08:57:19.000000000 +0000
@@ -126,6 +126,11 @@
 	void init_marvland();
 	void init_rthun2();
 
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	virtual void video_start() override;
+
 private:
 
 enum
@@ -202,7 +207,6 @@
 	void system_reset_w(uint8_t data);
 	void reset_all_subcpus(int state);
 
-	virtual void video_start() override;
 	void video_start_luckywld();
 	void video_start_metlhawk();
 	void video_start_sgunner();
@@ -218,9 +222,6 @@
 	uint16_t gfx_ctrl_r();
 	void gfx_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-
 	void create_shadow_table();
 	void apply_clip( rectangle &clip, const rectangle &cliprect );
 
@@ -230,7 +231,6 @@
 	required_shared_ptr<uint8_t> m_dpram; /* 2Kx8 */
 	optional_shared_ptr<uint16_t> m_spriteram;
 	uint16_t m_gfx_ctrl;
-	uint16_t m_serial_comms_ctrl[0x8];
 	unsigned m_finallap_prot_count;
 	int m_sendval;
 
@@ -241,11 +241,11 @@
 	uint16_t namcos2_68k_key_r(offs_t offset);
 	void namcos2_68k_key_w(offs_t offset, uint16_t data);
 	uint16_t namcos2_finallap_prot_r(offs_t offset);
-	void GollyGhostUpdateLED_c4( int data );
-	void GollyGhostUpdateLED_c6( int data );
-	void GollyGhostUpdateLED_c8( int data );
-	void GollyGhostUpdateLED_ca( int data );
-	void GollyGhostUpdateDiorama_c0( int data );
+	void GollyGhostUpdateLED_c4(int data);
+	void GollyGhostUpdateLED_c6(int data);
+	void GollyGhostUpdateLED_c8(int data);
+	void GollyGhostUpdateLED_ca(int data);
+	void GollyGhostUpdateDiorama_c0(int data);
 	void TilemapCB(uint16_t code, int *tile, int *mask);
 	void TilemapCB_finalap2(uint16_t code, int *tile, int *mask);
 	void RozCB_luckywld(uint16_t code, int *tile, int *mask, int which);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/namcos86.h mame-0.224+dfsg.1/src/mame/includes/namcos86.h
--- mame-0.222+dfsg.1/src/mame/includes/namcos86.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/namcos86.h	2020-08-26 08:57:19.000000000 +0000
@@ -53,15 +53,15 @@
 	void coin_w(uint8_t data);
 	void led_w(uint8_t data);
 	void cus115_w(offs_t offset, uint8_t data);
-	void videoram1_w(offs_t offset, uint8_t data);;
-	void videoram2_w(offs_t offset, uint8_t data);;
-	void tilebank_select_w(offs_t offset, uint8_t data);;
-	void scroll0_w(offs_t offset, uint8_t data);;
-	void scroll1_w(offs_t offset, uint8_t data);;
-	void scroll2_w(offs_t offset, uint8_t data);;
-	void scroll3_w(offs_t offset, uint8_t data);;
-	void backcolor_w(uint8_t data);;
-	void spriteram_w(offs_t offset, uint8_t data);;
+	void videoram1_w(offs_t offset, uint8_t data);
+	void videoram2_w(offs_t offset, uint8_t data);
+	void tilebank_select_w(offs_t offset, uint8_t data);
+	void scroll0_w(offs_t offset, uint8_t data);
+	void scroll1_w(offs_t offset, uint8_t data);
+	void scroll2_w(offs_t offset, uint8_t data);
+	void scroll3_w(offs_t offset, uint8_t data);
+	void backcolor_w(uint8_t data);
+	void spriteram_w(offs_t offset, uint8_t data);
 
 	TILE_GET_INFO_MEMBER(get_tile_info0);
 	TILE_GET_INFO_MEMBER(get_tile_info1);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/nemesis.h mame-0.224+dfsg.1/src/mame/includes/nemesis.h
--- mame-0.222+dfsg.1/src/mame/includes/nemesis.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/nemesis.h	2020-08-26 08:57:19.000000000 +0000
@@ -139,7 +139,7 @@
 	void nemesis_colorram2_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	void nemesis_charram_word_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	void nemesis_filter_w(offs_t offset, uint8_t data);
-	void gx400_speech_start_w(uint8_t data);
+	void gx400_speech_w(offs_t offset, uint8_t data);
 	void salamand_speech_start_w(uint8_t data);
 	uint8_t nemesis_portA_r();
 	void city_sound_bank_w(uint8_t data);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/ondra.h mame-0.224+dfsg.1/src/mame/includes/ondra.h
--- mame-0.222+dfsg.1/src/mame/includes/ondra.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/ondra.h	2020-08-26 08:57:19.000000000 +0000
@@ -11,63 +11,55 @@
 #pragma once
 
 #include "imagedev/cassette.h"
+#include "sound/beep.h"
 #include "machine/ram.h"
 
 class ondra_state : public driver_device
 {
 public:
-	ondra_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_video_enable(0),
-		m_bank1_status(0),
-		m_bank2_status(0),
-		m_nmi_check_timer(nullptr),
-		m_maincpu(*this, "maincpu"),
-		m_cassette(*this, "cassette"),
-		m_ram(*this, RAM_TAG),
-		m_region_maincpu(*this, "maincpu"),
-		m_bank1(*this, "bank1"),
-		m_bank2(*this, "bank2"),
-		m_bank3(*this, "bank3"),
-		m_lines(*this, "LINE%u", 0),
-		m_nmi(*this, "NMI")
-	{
-	}
+	ondra_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_cassette(*this, "cassette")
+		, m_ram(*this, RAM_TAG)
+		, m_rom(*this, "maincpu")
+		, m_bank1(*this, "bank1")
+		, m_bank3(*this, "bank3")
+		, m_beep(*this, "beeper")
+		, m_io_keyboard(*this, "LINE%u", 0U)
+	{ }
 
 	void ondra(machine_config &config);
+	DECLARE_INPUT_CHANGED_MEMBER(nmi_button);
 
 private:
-	uint8_t ondra_keyboard_r(offs_t offset);
-	void ondra_port_03_w(uint8_t data);
-	void ondra_port_09_w(uint8_t data);
-	void ondra_port_0a_w(uint8_t data);
-	uint32_t screen_update_ondra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	u8 keyboard_r(offs_t offset);
+	void port03_w(u8 data);
+	u8 port09_r();
+	void port0a_w(u8 data);
+	u32 screen_update_ondra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	DECLARE_WRITE_LINE_MEMBER(vblank_irq);
-	TIMER_CALLBACK_MEMBER(nmi_check_callback);
 
-	void ondra_io(address_map &map);
-	void ondra_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
-	virtual void video_start() override;
 
-	void ondra_update_banks();
+	void update_banks();
 
-	uint8_t m_video_enable;
-	uint8_t m_bank1_status;
-	uint8_t m_bank2_status;
-	emu_timer *m_nmi_check_timer;
+	bool m_video_enable;
+	u8 m_bank_status;
+	u8 m_bank_old;
 
 	required_device<cpu_device> m_maincpu;
 	required_device<cassette_image_device> m_cassette;
 	required_device<ram_device> m_ram;
-	required_memory_region m_region_maincpu;
+	required_memory_region m_rom;
 	required_memory_bank m_bank1;
-	required_memory_bank m_bank2;
 	required_memory_bank m_bank3;
-	required_ioport_array<10> m_lines;
-	required_ioport m_nmi;
+	required_device<beep_device> m_beep;
+	required_ioport_array<10> m_io_keyboard;
 };
 
 #endif // MAME_INCLUDES_ONDRA_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/orao.h mame-0.224+dfsg.1/src/mame/includes/orao.h
--- mame-0.222+dfsg.1/src/mame/includes/orao.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/orao.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/*****************************************************************************
- *
- * includes/orao.h
- *
- ****************************************************************************/
-#ifndef MAME_INCLUDES_ORAO_H
-#define MAME_INCLUDES_ORAO_H
-
-#pragma once
-
-#include "sound/spkrdev.h"
-#include "imagedev/cassette.h"
-
-class orao_state : public driver_device
-{
-public:
-	orao_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_memory(*this, "memory"),
-		m_video_ram(*this, "video_ram"),
-		m_maincpu(*this, "maincpu"),
-		m_speaker(*this, "speaker"),
-		m_cassette(*this, "cassette"),
-		m_line(*this, "LINE.%u", 0),
-		m_beep(0)
-	{ }
-
-	void orao(machine_config &config);
-
-	void init_orao();
-	void init_orao103();
-
-private:
-	uint8_t orao_io_r(offs_t offset);
-	void orao_io_w(offs_t offset, uint8_t data);
-	virtual void machine_reset() override;
-	virtual void video_start() override;
-	uint32_t screen_update_orao(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
-	void orao_mem(address_map &map);
-
-	required_shared_ptr<uint8_t> m_memory;
-	required_shared_ptr<uint8_t> m_video_ram;
-	required_device<cpu_device> m_maincpu;
-	required_device<speaker_sound_device> m_speaker;
-	required_device<cassette_image_device> m_cassette;
-	required_ioport_array<20> m_line;
-	uint8_t m_beep;
-};
-
-#endif // MAME_INCLUDES_ORAO_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/orion.h mame-0.224+dfsg.1/src/mame/includes/orion.h
--- mame-0.222+dfsg.1/src/mame/includes/orion.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/orion.h	2020-08-26 08:57:19.000000000 +0000
@@ -86,13 +86,7 @@
 	void orion_romdisk_portb_w(uint8_t data);
 	void orion_romdisk_portc_w(uint8_t data);
 	DECLARE_FLOPPY_FORMATS( orion_floppy_formats );
-
-	void orion128_io(address_map &map);
-	void orion128_mem(address_map &map);
-	void orionpro_io(address_map &map);
-	void orionpro_mem(address_map &map);
-	void orionz80_io(address_map &map);
-	void orionz80_mem(address_map &map);
+	void machine_start() override;
 
 	uint8_t m_orion128_video_mode;
 	uint8_t m_orion128_video_page;
@@ -135,8 +129,11 @@
 	void orionz80_switch_bank();
 	void orion_set_video_mode(int width);
 	void orionpro_bank_switch();
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
+
+private:
+	void machine_reset() override;
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 };
 
 class orion_z80_state : public orion_state
@@ -149,9 +146,10 @@
 	void orionz80(machine_config &config);
 	void orionz80ms(machine_config &config);
 
-protected:
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
+private:
+	void machine_reset() override;
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 };
 
 class orion_pro_state : public orion_state
@@ -163,8 +161,10 @@
 
 	void orionpro(machine_config &config);
 
-protected:
-	virtual void machine_reset() override;
+private:
+	void machine_reset() override;
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 };
 
 #endif // MAME_INCLUDES_ORION_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/partner.h mame-0.224+dfsg.1/src/mame/includes/partner.h
--- mame-0.222+dfsg.1/src/mame/includes/partner.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/partner.h	2020-08-26 08:57:19.000000000 +0000
@@ -24,37 +24,39 @@
 	partner_state(const machine_config &mconfig, device_type type, const char *tag)
 		: radio86_state(mconfig, type, tag)
 		, m_ram(*this, RAM_TAG)
-		, m_fdc(*this, "wd1793")
+		, m_fdc(*this, "fdc")
 		, m_bank(*this, "bank%u", 1U)
-	{
-	}
+	{ }
 
-	uint8_t partner_floppy_r(offs_t offset);
-	void partner_floppy_w(offs_t offset, uint8_t data);
-	void partner_win_memory_page_w(uint8_t data);
-	void partner_mem_page_w(uint8_t data);
 	void init_partner();
+	void partner(machine_config &config);
+
+private:
+	u8 floppy_r(offs_t offset);
+	void floppy_w(offs_t offset, u8 data);
+	void win_memory_page_w(u8 data);
+	void mem_page_w(u8 data);
 
 	I8275_DRAW_CHARACTER_MEMBER(display_pixels);
 
 	DECLARE_FLOPPY_FORMATS( floppy_formats );
 
-	void partner(machine_config &config);
-	void partner_mem(address_map &map);
-protected:
-	void partner_window_1(uint8_t bank_num, uint16_t offset,uint8_t *rom);
-	void partner_window_2(uint8_t bank_num, uint16_t offset,uint8_t *rom);
-	void partner_iomap_bank(uint8_t *rom);
-	void partner_bank_switch();
+	void mem_map(address_map &map);
+
+	void window_1(uint8_t bank_num, uint16_t offset,uint8_t *rom);
+	void window_2(uint8_t bank_num, uint16_t offset,uint8_t *rom);
+	void iomap_bank(uint8_t *rom);
+	void bank_switch();
 
-	uint8_t m_mem_page;
-	uint8_t m_win_mem_page;
+	u8 m_mem_page;
+	u8 m_win_mem_page;
 
 	required_device<ram_device> m_ram;
 	required_device<fd1793_device> m_fdc;
 	required_memory_bank_array<13> m_bank;
 
-	virtual void machine_reset() override;
+	void machine_reset() override;
+	void machine_start() override;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/pdp11.h mame-0.224+dfsg.1/src/mame/includes/pdp11.h
--- mame-0.222+dfsg.1/src/mame/includes/pdp11.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/pdp11.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:SIMH project
-/*****************************************************************************
- *
- * includes/pdp11.h
- *
- ****************************************************************************/
-
-#ifndef PDP11_H_
-#define PDP11_H_
-
-/*
- * taken from PDP11/pdp11_defs.h in SIMH
- */
-
-/* Device CSRs */
-
-#define CSR_V_GO        0                               /* go */
-#define CSR_V_IE        6                               /* interrupt enable */
-#define CSR_V_DONE      7                               /* done */
-#define CSR_V_BUSY      11                              /* busy */
-#define CSR_V_ERR       15                              /* error */
-#define CSR_GO          (1u << CSR_V_GO)
-#define CSR_IE          (1u << CSR_V_IE)
-#define CSR_DONE        (1u << CSR_V_DONE)
-#define CSR_BUSY        (1u << CSR_V_BUSY)
-#define CSR_ERR         (1u << CSR_V_ERR)
-
-
-#define clear_virq(_callback, _csr, _ie, _intrq) \
-	if ((_csr) & (_ie)) { (_intrq) = CLEAR_LINE; }
-
-#define raise_virq(_callback, _csr, _ie, _intrq) \
-	if ((_csr) & (_ie)) { (_intrq) = ASSERT_LINE; _callback (ASSERT_LINE); }
-
-
-#define UPDATE_16BIT(_storage, _data, _mask) \
-	do { *_storage = ((*_storage & ~_mask) | (_data & _mask)); } while (0)
-
-
-#endif /* PDP11_H_ */
diff -Nru mame-0.222+dfsg.1/src/mame/includes/pecom.h mame-0.224+dfsg.1/src/mame/includes/pecom.h
--- mame-0.222+dfsg.1/src/mame/includes/pecom.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/pecom.h	2020-08-26 08:57:19.000000000 +0000
@@ -7,80 +7,69 @@
 
 #include "cpu/cosmac/cosmac.h"
 #include "imagedev/cassette.h"
-#include "machine/ram.h"
 #include "sound/cdp1869.h"
 
-#define SCREEN_TAG  "screen"
-#define CDP1802_TAG "cdp1802"
-#define CDP1869_TAG "cdp1869"
-
-#define PECOM_CHAR_RAM_SIZE 0x800
-
 class pecom_state : public driver_device
 {
 public:
-	pecom_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_cdp1802(*this, CDP1802_TAG),
-		m_cdp1869(*this, CDP1869_TAG),
-		m_cassette(*this, "cassette"),
-		m_ram(*this, RAM_TAG),
-		m_bank1(*this, "bank1"),
-		m_bank2(*this, "bank2"),
-		m_bank3(*this, "bank3"),
-		m_bank4(*this, "bank4"),
-		m_io_cnt(*this, "CNT"),
-		m_io_ports(*this, "LINE%u", 0U)
+	pecom_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_cdp1869(*this, "cdp1869")
+		, m_cassette(*this, "cassette")
+		, m_bank1(*this, "bank1")
+		, m_bank3(*this, "bank3")
+		, m_bank4(*this, "bank4")
+		, m_rom(*this, "maincpu")
+		, m_ram(*this, "mainram")
+		, m_io_cnt(*this, "CNT")
+		, m_io_keyboard(*this, "LINE%d", 0U)
 	{ }
 
 	DECLARE_INPUT_CHANGED_MEMBER(ef_w);
 	void pecom64(machine_config &config);
 
-protected:
-	uint8_t pecom_cdp1869_charram_r(offs_t offset);
-	void pecom_cdp1869_charram_w(offs_t offset, uint8_t data);
-	uint8_t pecom_cdp1869_pageram_r(offs_t offset);
-	void pecom_cdp1869_pageram_w(offs_t offset, uint8_t data);
-	void pecom_bank_w(uint8_t data);
-	uint8_t pecom_keyboard_r();
-	void pecom_cdp1869_w(offs_t offset, uint8_t data);
+private:
+	uint8_t cdp1869_charram_r(offs_t offset);
+	void cdp1869_charram_w(offs_t offset, uint8_t data);
+	uint8_t cdp1869_pageram_r(offs_t offset);
+	void cdp1869_pageram_w(offs_t offset, uint8_t data);
+	void bank_w(uint8_t data);
+	uint8_t keyboard_r();
+	void cdp1869_w(offs_t offset, uint8_t data);
 	TIMER_CALLBACK_MEMBER(reset_tick);
 	DECLARE_READ_LINE_MEMBER(clear_r);
 	DECLARE_READ_LINE_MEMBER(ef2_r);
 	DECLARE_WRITE_LINE_MEMBER(q_w);
 	void sc_w(uint8_t data);
-	DECLARE_WRITE_LINE_MEMBER(pecom_prd_w);
-	CDP1869_CHAR_RAM_READ_MEMBER(pecom_char_ram_r);
-	CDP1869_CHAR_RAM_WRITE_MEMBER(pecom_char_ram_w);
-	CDP1869_PCB_READ_MEMBER(pecom_pcb_r);
+	DECLARE_WRITE_LINE_MEMBER(prd_w);
+	CDP1869_CHAR_RAM_READ_MEMBER(char_ram_r);
+	CDP1869_CHAR_RAM_WRITE_MEMBER(char_ram_w);
+	CDP1869_PCB_READ_MEMBER(pcb_r);
 
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
-	virtual void video_start() override;
-	void pecom_video(machine_config &config);
 	void cdp1869_page_ram(address_map &map);
-	void pecom64_io(address_map &map);
-	void pecom64_mem(address_map &map);
-
-private:
-	required_device<cosmac_device> m_cdp1802;
-	required_device<cdp1869_device> m_cdp1869;
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 
 	std::unique_ptr<uint8_t[]> m_charram;           /* character generator ROM */
-	int m_reset;                /* CPU mode */
-	int m_dma;              /* memory refresh DMA */
+	bool m_reset;                /* CPU mode */
+	bool m_dma;              /* memory refresh DMA */
 
 	/* timers */
 	emu_timer *m_reset_timer;   /* power on reset timer */
 
+	required_device<cosmac_device> m_maincpu;
+	required_device<cdp1869_device> m_cdp1869;
 	required_device<cassette_image_device> m_cassette;
-	required_device<ram_device> m_ram;
 	required_memory_bank m_bank1;
-	required_memory_bank m_bank2;
 	required_memory_bank m_bank3;
 	required_memory_bank m_bank4;
+	required_region_ptr<u8> m_rom;
+	required_shared_ptr<u8> m_ram;
 	required_ioport m_io_cnt;
-	required_ioport_array<26> m_io_ports;
+	required_ioport_array<26> m_io_keyboard;
 };
 
 #endif // MAME_INCLUDES_PECOM_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/pgm.h mame-0.224+dfsg.1/src/mame/includes/pgm.h
--- mame-0.222+dfsg.1/src/mame/includes/pgm.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/pgm.h	2020-08-26 08:57:19.000000000 +0000
@@ -81,9 +81,20 @@
 	u16 *                    m_bg_videoram;
 	u16 *                    m_tx_videoram;
 	u16 *                    m_rowscrollram;
-	std::unique_ptr<u16[]>   m_spritebufferram; // buffered spriteram
 
 	/* video-related */
+	struct sprite_t
+	{
+		int x,y;
+		bool xgrow, ygrow;
+		u32 xzoom, yzoom;
+		u32 color, offs;
+		u32 width, height;
+		u8 flip, pri;
+	};
+
+	std::unique_ptr<sprite_t[]> m_spritelist;
+	struct sprite_t *m_sprite_ptr_pre;
 	tilemap_t     *m_bg_tilemap;
 	tilemap_t     *m_tx_tilemap;
 
@@ -128,7 +139,8 @@
 	void draw_sprite_new_zoomed(int wide, int high, int xpos, int ypos, int palt, int flip, bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, u32 xzoom, bool xgrow, u32 yzoom, bool ygrow, int pri);
 	void draw_sprite_line_basic(int wide, u16* dest, u8* destpri, const rectangle &cliprect, int flip, int xpos, int pri, int realxsize, int palt, bool draw);
 	void draw_sprite_new_basic(int wide, int high, int xpos, int ypos, int palt, int flip, bitmap_ind16 &bitmap, const rectangle &cliprect, bitmap_ind8 &priority_bitmap, int pri);
-	void draw_sprites(bitmap_ind16& spritebitmap, const rectangle &cliprect, u16 *sprite_source, bitmap_ind8& priority_bitmap);
+	void draw_sprites(bitmap_ind16& spritebitmap, const rectangle &cliprect, bitmap_ind8& priority_bitmap);
+	void get_sprites();
 	void pgm_basic_mem(address_map &map);
 	void pgm_z80_io(address_map &map);
 	void pgm_z80_mem(address_map &map);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/pk8000.h mame-0.224+dfsg.1/src/mame/includes/pk8000.h
--- mame-0.222+dfsg.1/src/mame/includes/pk8000.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/pk8000.h	2020-08-26 08:57:19.000000000 +0000
@@ -15,11 +15,11 @@
 		, m_maincpu(*this, "maincpu")
 	{ }
 
+protected:
 	uint8_t _84_porta_r();
 	void _84_porta_w(uint8_t data);
 	void _84_portc_w(uint8_t data);
 
-protected:
 	uint8_t video_color_r();
 	void video_color_w(uint8_t data);
 	uint8_t text_start_r();
diff -Nru mame-0.222+dfsg.1/src/mame/includes/pmd85.h mame-0.224+dfsg.1/src/mame/includes/pmd85.h
--- mame-0.222+dfsg.1/src/mame/includes/pmd85.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/pmd85.h	2020-08-26 08:57:19.000000000 +0000
@@ -14,6 +14,7 @@
 #include "machine/pit8253.h"
 #include "machine/i8255.h"
 #include "imagedev/cassette.h"
+#include "sound/spkrdev.h"
 #include "machine/ram.h"
 #include "emupal.h"
 
@@ -21,37 +22,24 @@
 class pmd85_state : public driver_device
 {
 public:
-	pmd85_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_ram(*this, RAM_TAG),
-		m_cassette(*this, "cassette"),
-		m_pit8253(*this, "pit8253"),
-		m_uart(*this, "uart"),
-		m_ppi8255_0(*this, "ppi8255_0"),
-		m_ppi8255_1(*this, "ppi8255_1"),
-		m_ppi8255_2(*this, "ppi8255_2"),
-		m_ppi8255_3(*this, "ppi8255_3"),
-		m_region_maincpu(*this, "maincpu"),
-		m_bank1(*this, "bank1"),
-		m_bank2(*this, "bank2"),
-		m_bank3(*this, "bank3"),
-		m_bank4(*this, "bank4"),
-		m_bank5(*this, "bank5"),
-		m_bank6(*this, "bank6"),
-		m_bank7(*this, "bank7"),
-		m_bank8(*this, "bank8"),
-		m_bank9(*this, "bank9"),
-		m_bank10(*this, "bank10"),
-		m_bank11(*this, "bank11"),
-		m_bank12(*this, "bank12"),
-		m_bank13(*this, "bank13"),
-		m_bank14(*this, "bank14"),
-		m_bank15(*this, "bank15"),
-		m_bank16(*this, "bank16"),
-		m_io_dsw0(*this, "DSW0"),
-		m_palette(*this, "palette"),
-		m_leds(*this, "led%u", 0U)
+	pmd85_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_rom(*this, "maincpu")
+		, m_ram(*this, RAM_TAG)
+		, m_cassette(*this, "cassette")
+		, m_speaker(*this, "speaker")
+		, m_pit(*this, "pit")
+		, m_uart(*this, "uart")
+		, m_ppi0(*this, "ppi0")
+		, m_ppi1(*this, "ppi1")
+		, m_ppi2(*this, "ppi2")
+		, m_ppi3(*this, "ppi3")
+		, m_bank(*this, "bank%d", 0U)
+		, m_io_dsw0(*this, "DSW0")
+		, m_palette(*this, "palette")
+		, m_io_keyboard(*this, "KEY%u", 0U)
+		, m_leds(*this, "led%u", 0U)
 	{ }
 
 	void pmd85(machine_config &config, bool with_uart = true);
@@ -78,6 +66,7 @@
 		TIMER_CASSETTE
 	};
 
+	bool m_txd, m_rts;
 	uint8_t m_rom_module_present;
 	uint8_t m_ppi_port_outputs[4][3];
 	uint8_t m_startup_mem_map;
@@ -88,83 +77,52 @@
 	uint8_t m_model;
 	emu_timer * m_cassette_timer;
 	void (pmd85_state::*update_memory)();
-	uint8_t pmd85_io_r(offs_t offset);
-	void pmd85_io_w(offs_t offset, uint8_t data);
+	uint8_t io_r(offs_t offset);
+	void io_w(offs_t offset, uint8_t data);
 	uint8_t mato_io_r(offs_t offset);
 	void mato_io_w(offs_t offset, uint8_t data);
 
 	virtual void machine_reset() override;
-	uint32_t screen_update_pmd85(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	TIMER_CALLBACK_MEMBER(pmd85_cassette_timer_callback);
-	uint8_t pmd85_ppi_0_porta_r();
-	uint8_t pmd85_ppi_0_portb_r();
-	uint8_t pmd85_ppi_0_portc_r();
-	void pmd85_ppi_0_porta_w(uint8_t data);
-	void pmd85_ppi_0_portb_w(uint8_t data);
-	void pmd85_ppi_0_portc_w(uint8_t data);
-	uint8_t mato_ppi_0_portb_r();
-	uint8_t mato_ppi_0_portc_r();
-	void mato_ppi_0_portc_w(uint8_t data);
-	uint8_t pmd85_ppi_1_porta_r();
-	uint8_t pmd85_ppi_1_portb_r();
-	uint8_t pmd85_ppi_1_portc_r();
-	void pmd85_ppi_1_porta_w(uint8_t data);
-	void pmd85_ppi_1_portb_w(uint8_t data);
-	void pmd85_ppi_1_portc_w(uint8_t data);
-	uint8_t pmd85_ppi_2_porta_r();
-	uint8_t pmd85_ppi_2_portb_r();
-	uint8_t pmd85_ppi_2_portc_r();
-	void pmd85_ppi_2_porta_w(uint8_t data);
-	void pmd85_ppi_2_portb_w(uint8_t data);
-	void pmd85_ppi_2_portc_w(uint8_t data);
-	uint8_t pmd85_ppi_3_porta_r();
-	uint8_t pmd85_ppi_3_portb_r();
-	uint8_t pmd85_ppi_3_portc_r();
-	void pmd85_ppi_3_porta_w(uint8_t data);
-	void pmd85_ppi_3_portb_w(uint8_t data);
-	void pmd85_ppi_3_portc_w(uint8_t data);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	TIMER_CALLBACK_MEMBER(cassette_timer_callback);
+	uint8_t ppi0_porta_r();
+	uint8_t ppi0_portb_r();
+	uint8_t ppi0_portc_r();
+	void ppi0_porta_w(uint8_t data);
+	void ppi0_portb_w(uint8_t data);
+	void ppi0_portc_w(uint8_t data);
+	uint8_t mato_ppi0_portb_r();
+	uint8_t mato_ppi0_portc_r();
+	void mato_ppi0_portc_w(uint8_t data);
+	uint8_t ppi1_porta_r();
+	uint8_t ppi1_portb_r();
+	uint8_t ppi1_portc_r();
+	void ppi1_porta_w(uint8_t data);
+	void ppi1_portb_w(uint8_t data);
+	void ppi1_portc_w(uint8_t data);
+	uint8_t ppi2_porta_r();
+	uint8_t ppi2_portb_r();
+	uint8_t ppi2_portc_r();
+	void ppi2_porta_w(uint8_t data);
+	void ppi2_portb_w(uint8_t data);
+	void ppi2_portc_w(uint8_t data);
+	uint8_t ppi3_porta_r();
+	uint8_t ppi3_portb_r();
+	uint8_t ppi3_portc_r();
+	void ppi3_porta_w(uint8_t data);
+	void ppi3_portb_w(uint8_t data);
+	void ppi3_portc_w(uint8_t data);
 
 	void alfa_mem(address_map &map);
 	void c2717_mem(address_map &map);
-	void mato_io_map(address_map &map);
+	void mato_io(address_map &map);
 	void mato_mem(address_map &map);
 	void pmd852a_mem(address_map &map);
 	void pmd853_mem(address_map &map);
-	void pmd85_io_map(address_map &map);
+	void pmd85_io(address_map &map);
 	void pmd85_mem(address_map &map);
 
-	virtual void machine_start() override { m_leds.resolve(); }
-
-	required_device<cpu_device> m_maincpu;
-	required_device<ram_device> m_ram;
-	required_device<cassette_image_device> m_cassette;
-	required_device<pit8253_device> m_pit8253;
-	optional_device<i8251_device> m_uart;
-	optional_device<i8255_device> m_ppi8255_0;
-	optional_device<i8255_device> m_ppi8255_1;
-	optional_device<i8255_device> m_ppi8255_2;
-	optional_device<i8255_device> m_ppi8255_3;
-	required_memory_region m_region_maincpu;
-	required_memory_bank m_bank1;
-	required_memory_bank m_bank2;
-	required_memory_bank m_bank3;
-	required_memory_bank m_bank4;
-	optional_memory_bank m_bank5;
-	optional_memory_bank m_bank6;
-	optional_memory_bank m_bank7;
-	optional_memory_bank m_bank8;
-	optional_memory_bank m_bank9;
-	optional_memory_bank m_bank10;
-	optional_memory_bank m_bank11;
-	optional_memory_bank m_bank12;
-	optional_memory_bank m_bank13;
-	optional_memory_bank m_bank14;
-	optional_memory_bank m_bank15;
-	optional_memory_bank m_bank16;
-	optional_ioport m_io_dsw0;
-	ioport_port *m_io_port[16];
-	required_device<palette_device> m_palette;
-	output_finder<3> m_leds;
+	virtual void machine_start() override;
 
 	void pmd851_update_memory();
 	void pmd852a_update_memory();
@@ -172,10 +130,25 @@
 	void alfa_update_memory();
 	void mato_update_memory();
 	void c2717_update_memory();
-	void pmd85_common_driver_init();
+	void common_driver_init();
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
-	bool m_txd, m_rts;
+	required_device<cpu_device> m_maincpu;
+	required_region_ptr<u8> m_rom;
+	required_device<ram_device> m_ram;
+	required_device<cassette_image_device> m_cassette;
+	required_device<speaker_sound_device> m_speaker;
+	required_device<pit8253_device> m_pit;
+	optional_device<i8251_device> m_uart;
+	optional_device<i8255_device> m_ppi0;
+	optional_device<i8255_device> m_ppi1;
+	optional_device<i8255_device> m_ppi2;
+	optional_device<i8255_device> m_ppi3;
+	optional_memory_bank_array<17> m_bank;
+	optional_ioport m_io_dsw0;
+	required_device<palette_device> m_palette;
+	optional_ioport_array<16> m_io_keyboard;
+	output_finder<3> m_leds;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/pp01.h mame-0.224+dfsg.1/src/mame/includes/pp01.h
--- mame-0.222+dfsg.1/src/mame/includes/pp01.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/pp01.h	2020-08-26 08:57:19.000000000 +0000
@@ -27,13 +27,15 @@
 	pp01_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
-		, m_pit(*this, "pit8253")
+		, m_pit(*this, "pit")
 		, m_ppi1(*this, "ppi1")
 		, m_ppi2(*this, "ppi2")
 		, m_speaker(*this, "speaker")
 		, m_ram(*this, RAM_TAG)
 		, m_uart(*this, "uart")
 		, m_cass(*this, "cassette")
+		, m_bank(*this, "bank%d", 0U)
+		, m_io_keyboard(*this, "LINE%d", 0U)
 	{ }
 
 	void pp01(machine_config &config);
@@ -41,17 +43,8 @@
 protected:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
-	virtual void video_start() override;
 
 private:
-	required_device<cpu_device> m_maincpu;
-	required_device<pit8253_device> m_pit;
-	required_device<i8255_device> m_ppi1;
-	required_device<i8255_device> m_ppi2;
-	required_device<speaker_sound_device> m_speaker;
-	required_device<ram_device> m_ram;
-	required_device<i8251_device> m_uart;
-	required_device<cassette_image_device> m_cass;
 	uint8_t m_video_scroll;
 	uint8_t m_memory_block[16];
 	uint8_t m_video_write_mode;
@@ -82,6 +75,17 @@
 	void set_memory(uint8_t block, uint8_t data);
 	void io_map(address_map &map);
 	void mem_map(address_map &map);
+
+	required_device<cpu_device> m_maincpu;
+	required_device<pit8253_device> m_pit;
+	required_device<i8255_device> m_ppi1;
+	required_device<i8255_device> m_ppi2;
+	required_device<speaker_sound_device> m_speaker;
+	required_device<ram_device> m_ram;
+	required_device<i8251_device> m_uart;
+	required_device<cassette_image_device> m_cass;
+	required_memory_bank_array<16> m_bank;
+	required_ioport_array<17> m_io_keyboard;
 };
 
 #endif // MAME_INCLUDES_PP01_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/primo.h mame-0.224+dfsg.1/src/mame/includes/primo.h
--- mame-0.222+dfsg.1/src/mame/includes/primo.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/primo.h	2020-08-26 08:57:19.000000000 +0000
@@ -23,20 +23,20 @@
 class primo_state : public driver_device
 {
 public:
-	primo_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_iec(*this, CBM_IEC_TAG),
-		m_speaker(*this, "speaker"),
-		m_cassette(*this, "cassette"),
-		m_cart1(*this, "cartslot1"),
-		m_cart2(*this, "cartslot2"),
-		m_screen(*this, "screen"),
-		m_mem_exp_port(*this, "MEMORY_EXPANSION"),
-		m_clock_port(*this, "CPU_CLOCK"),
-		m_keyboard_port(*this, "IN%u", 0U),
-		m_reset_port(*this, "RESET"),
-		m_video_ram(*this, "videoram")
+	primo_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_iec(*this, CBM_IEC_TAG)
+		, m_speaker(*this, "speaker")
+		, m_cassette(*this, "cassette")
+		, m_cart1(*this, "cartslot1")
+		, m_cart2(*this, "cartslot2")
+		, m_screen(*this, "screen")
+		, m_mem_exp_port(*this, "MEMORY_EXPANSION")
+		, m_clock_port(*this, "CPU_CLOCK")
+		, m_keyboard_port(*this, "IN%u", 0U)
+		, m_reset_port(*this, "RESET")
+		, m_vram(*this, "videoram")
 	{ }
 
 	void init_primo();
@@ -50,29 +50,28 @@
 	void primoa48(machine_config &config);
 
 private:
-	uint8_t primo_be_1_r(offs_t offset);
-	uint8_t primo_be_2_r();
-	void primo_ki_1_w(uint8_t data);
-	void primo_ki_2_w(uint8_t data);
-	void primo_FD_w(uint8_t data);
-	virtual void machine_reset() override;
-	virtual void machine_start() override;
+	uint8_t be_1_r(offs_t offset);
+	uint8_t be_2_r();
+	void ki_1_w(uint8_t data);
+	void ki_2_w(uint8_t data);
+	void FD_w(uint8_t data);
+	void machine_reset() override;
+	void machine_start() override;
 	DECLARE_MACHINE_RESET(primob);
-	uint32_t screen_update_primo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	DECLARE_WRITE_LINE_MEMBER(vblank_irq);
-	void primo_draw_scanline(bitmap_ind16 &bitmap, int primo_scanline);
-	void primo_update_memory();
-	void primo_common_machine_init();
-	void primo_setup_pss(uint8_t* snapshot_data, uint32_t snapshot_size);
-	void primo_setup_pp(uint8_t* quickload_data, uint32_t quickload_size);
+	void update_memory();
+	void common_machine_init();
+	void setup_pss(uint8_t* snapshot_data, uint32_t snapshot_size);
+	void setup_pp(uint8_t* quickload_data, uint32_t quickload_size);
 	DECLARE_SNAPSHOT_LOAD_MEMBER(snapshot_cb);
 	DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb);
 
 	void primo32_mem(address_map &map);
 	void primo48_mem(address_map &map);
 	void primo64_mem(address_map &map);
-	void primoa_port(address_map &map);
-	void primob_port(address_map &map);
+	void primoa_io(address_map &map);
+	void primob_io(address_map &map);
 
 	required_device<cpu_device> m_maincpu;
 	required_device<cbm_iec_device> m_iec;
@@ -85,7 +84,7 @@
 	required_ioport m_clock_port;
 	required_ioport_array<4> m_keyboard_port;
 	required_ioport m_reset_port;
-	required_shared_ptr<uint8_t> m_video_ram;
+	required_shared_ptr<uint8_t> m_vram;
 
 	memory_region *m_cart1_rom;
 	memory_region *m_cart2_rom;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/qix.h mame-0.224+dfsg.1/src/mame/includes/qix.h
--- mame-0.222+dfsg.1/src/mame/includes/qix.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/qix.h	2020-08-26 08:57:19.000000000 +0000
@@ -168,6 +168,8 @@
 protected:
 	virtual void machine_start() override;
 
+	optional_device<m68705p_device> m_mcu;
+
 private:
 	uint8_t coin_r();
 	void coin_w(uint8_t data);
@@ -178,8 +180,6 @@
 	void mcu_porta_w(uint8_t data);
 	void mcu_portb_w(uint8_t data);
 
-	required_device<m68705p_device> m_mcu;
-
 	/* machine state */
 	uint8_t  m_68705_porta_out;
 	uint8_t  m_coinctrl;
@@ -194,6 +194,7 @@
 	{ }
 
 	void zookeep(machine_config &config);
+	void zookeepbl(machine_config &config);
 	void video(machine_config &config);
 
 protected:
diff -Nru mame-0.222+dfsg.1/src/mame/includes/radio86.h mame-0.224+dfsg.1/src/mame/includes/radio86.h
--- mame-0.222+dfsg.1/src/mame/includes/radio86.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/radio86.h	2020-08-26 08:57:19.000000000 +0000
@@ -22,56 +22,23 @@
 class radio86_state : public driver_device
 {
 public:
-	enum
-	{
-		TIMER_RESET
-	};
-
-	radio86_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_cassette(*this, "cassette"),
-		m_cart(*this, "cartslot"),
-		m_dma8257(*this, "dma8257"),
-		m_ppi8255_1(*this, "ppi8255_1"),
-		m_ppi8255_2(*this, "ppi8255_2"),
-		m_region_maincpu(*this, "maincpu"),
-		m_bank1(*this, "bank1"),
-		m_io_line(*this, "LINE%u", 0),
-		m_io_cline(*this, "CLINE%u", 0),
-		m_palette(*this, "palette"),
-		m_charmap(*this, "gfx1")
+	radio86_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_cassette(*this, "cassette")
+		, m_cart(*this, "cartslot")
+		, m_dma(*this, "dma")
+		, m_ppi1(*this, "ppi1")
+		, m_ppi2(*this, "ppi2")
+		, m_rom(*this, "maincpu")
+		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
+		, m_io_line(*this, "LINE%u", 0U)
+		, m_io_cline(*this, "CLINE%u", 0U)
+		, m_palette(*this, "palette")
+		, m_chargen(*this, "chargen")
 	{ }
 
-	uint8_t m_tape_value;
-	int m_keyboard_mask;
-	std::unique_ptr<uint8_t[]> m_radio_ram_disk;
-	uint8_t m_romdisk_lsb;
-	uint8_t m_romdisk_msb;
-	uint8_t m_disk_sel;
-	uint8_t radio_cpu_state_r();
-	uint8_t radio_io_r(offs_t offset);
-	void radio_io_w(offs_t offset, uint8_t data);
-	void radio86_pagesel(uint8_t data);
-	void init_radioram();
-	void init_radio86();
-	void radio86_palette(palette_device &palette) const;
-	uint8_t radio86_8255_portb_r2();
-	uint8_t radio86_8255_portc_r2();
-	void radio86_8255_porta_w2(uint8_t data);
-	void radio86_8255_portc_w2(uint8_t data);
-	uint8_t rk7007_8255_portc_r();
-	uint8_t kr03_8255_portb_r2();
-	void hrq_w(int state);
-	uint8_t radio86rom_romdisk_porta_r();
-	uint8_t radio86ram_romdisk_porta_r();
-	void radio86_romdisk_portb_w(uint8_t data);
-	void radio86_romdisk_portc_w(uint8_t data);
-	uint8_t memory_read_byte(offs_t offset);
-	void memory_write_byte(offs_t offset, uint8_t data);
-	I8275_DRAW_CHARACTER_MEMBER(display_pixels);
-	required_device<cpu_device> m_maincpu;
-
 	void impuls03(machine_config &config);
 	void mikron2(machine_config &config);
 	void rk7007(machine_config &config);
@@ -81,20 +48,14 @@
 	void radio16(machine_config &config);
 	void radioram(machine_config &config);
 	void kr03(machine_config &config);
+	void init_radioram();
+	void init_radio86();
 
 protected:
-	required_device<cassette_image_device> m_cassette;
-	optional_device<generic_slot_device> m_cart;    // for ROMDisk - only Radio86K & Orion?
-	optional_device<i8257_device> m_dma8257;
-	required_device<i8255_device> m_ppi8255_1;
-	optional_device<i8255_device> m_ppi8255_2;
-	required_memory_region m_region_maincpu;
-	required_memory_bank m_bank1;
-	required_ioport_array<9> m_io_line;
-	optional_ioport_array<8> m_io_cline;
 
-	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
-	virtual void machine_reset() override;
+
+	void machine_reset() override;
+	void machine_start() override;
 
 	void radio86_init_keyboard();
 
@@ -107,8 +68,48 @@
 	void radio86rom_mem(address_map &map);
 	void rk7007_io(address_map &map);
 
+	uint8_t m_tape_value;
+	uint8_t radio_cpu_state_r();
+	uint8_t radio_io_r(offs_t offset);
+	void radio_io_w(offs_t offset, uint8_t data);
+	uint8_t radio86_8255_portb_r2();
+	uint8_t radio86_8255_portc_r2();
+	uint8_t rk7007_8255_portc_r();
+	void radio86_8255_porta_w2(uint8_t data);
+	void radio86_8255_portc_w2(uint8_t data);
+	void radio86_palette(palette_device &palette) const;
+	void hrq_w(int state);
+	uint8_t memory_read_byte(offs_t offset);
+	void memory_write_byte(offs_t offset, uint8_t data);
+
+	memory_passthrough_handler *m_rom_shadow_tap;
+	required_device<cpu_device> m_maincpu;
+	required_device<cassette_image_device> m_cassette;
+	optional_device<generic_slot_device> m_cart;    // for ROMDisk - only Radio86K & Orion?
+	optional_device<i8257_device> m_dma;
+	required_device<i8255_device> m_ppi1;
+	optional_device<i8255_device> m_ppi2;
+	required_region_ptr<u8> m_rom;
+	optional_shared_ptr<u8> m_ram;
+	optional_memory_bank m_bank1;
+	required_ioport_array<9> m_io_line;
+	optional_ioport_array<8> m_io_cline;
 	required_device<palette_device> m_palette;
-	optional_region_ptr<uint8_t> m_charmap;
+	optional_region_ptr<uint8_t> m_chargen;
+
+private:
+	int m_keyboard_mask;
+	std::unique_ptr<uint8_t[]> m_radio_ram_disk;
+	uint8_t m_romdisk_lsb;
+	uint8_t m_romdisk_msb;
+	uint8_t m_disk_sel;
+	void radio86_pagesel(uint8_t data);
+	uint8_t kr03_8255_portb_r2();
+	uint8_t radio86rom_romdisk_porta_r();
+	uint8_t radio86ram_romdisk_porta_r();
+	void radio86_romdisk_portb_w(uint8_t data);
+	void radio86_romdisk_portc_w(uint8_t data);
+	I8275_DRAW_CHARACTER_MEMBER(display_pixels);
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/s11a.h mame-0.224+dfsg.1/src/mame/includes/s11a.h
--- mame-0.222+dfsg.1/src/mame/includes/s11a.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/s11a.h	2020-08-26 08:57:19.000000000 +0000
@@ -18,19 +18,16 @@
 		: s11_state(mconfig, type, tag)
 	{ }
 
+	void s11a_base(machine_config &config);
 	void s11a(machine_config &config);
+	void s11a_obg(machine_config &config);
 
 	void init_s11a();
 
-	void bgbank_w(uint8_t data);
 	void dig0_w(uint8_t data);
 
 private:
 	DECLARE_MACHINE_RESET(s11a);
-
-	void s11a_audio_map(address_map &map);
-	void s11a_bg_map(address_map &map);
-	void s11a_main_map(address_map &map);
 };
 
 #endif // MAME_INCLUDES_S11A_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/s11b.h mame-0.224+dfsg.1/src/mame/includes/s11b.h
--- mame-0.222+dfsg.1/src/mame/includes/s11b.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/s11b.h	2020-08-26 08:57:19.000000000 +0000
@@ -16,10 +16,11 @@
 public:
 	s11b_state(const machine_config &mconfig, device_type type, const char *tag)
 		: s11a_state(mconfig, type, tag)
-		, m_bg_hc55516(*this, "hc55516_bg")
 	{ }
 
+	void s11b_base(machine_config &config);
 	void s11b(machine_config &config);
+	void s11b_jokerz(machine_config &config);
 
 	void init_s11b();
 	void init_s11b_invert();
@@ -29,22 +30,12 @@
 	void pia2c_pb_w(uint8_t data);
 	void pia34_pa_w(uint8_t data);
 
-	void bg_speech_clock_w(uint8_t data);
-	void bg_speech_digit_w(uint8_t data);
-
 protected:
 	void set_invert(bool inv) { m_invert = inv; }
 
 private:
 	DECLARE_MACHINE_RESET(s11b);
 
-	void s11b_audio_map(address_map &map);
-	void s11b_bg_map(address_map &map);
-	void s11b_main_map(address_map &map);
-
-	optional_device<hc55516_device> m_bg_hc55516;
-
-
 	bool m_invert;  // later System 11B games start expecting inverted data to the display LED segments.
 };
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/s11c.h mame-0.224+dfsg.1/src/mame/includes/s11c.h
--- mame-0.222+dfsg.1/src/mame/includes/s11c.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/s11c.h	2020-08-26 08:57:19.000000000 +0000
@@ -24,12 +24,6 @@
 
 protected:
 	virtual void machine_reset() override;
-
-private:
-
-	void s11c_main_map(address_map &map);
-	void s11c_audio_map(address_map &map);
-	void s11c_bg_map(address_map &map);
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/s11.h mame-0.224+dfsg.1/src/mame/includes/s11.h
--- mame-0.222+dfsg.1/src/mame/includes/s11.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/s11.h	2020-08-26 08:57:19.000000000 +0000
@@ -11,8 +11,10 @@
 
 #include "cpu/m6800/m6800.h"
 #include "audio/s11c_bg.h"
+#include "audio/pinsnd88.h"
 #include "machine/6821pia.h"
 #include "machine/genpin.h"
+#include "machine/input_merger.h"
 #include "sound/dac.h"
 #include "sound/hc55516.h"
 #include "sound/ym2151.h"
@@ -23,9 +25,14 @@
 
 // Length of time in cycles between IRQs on the main 6808 CPU
 // This length is determined by the settings of the W14 and W15 jumpers
-// It can be 0x300, 0x380, 0x700 or 0x780 cycles long.
-// IRQ length is always 32 cycles
-#define S11_IRQ_CYCLES 0x380
+// IRQ pulse width is always 32 cycles
+// All machines I've looked at so far have W14 present and W15 absent
+// which makes the timer int fire every 0x380 E-clocks (1MHz/0x380, ~1.116KHz)
+// It is possible to have W15 present and W14 absent instead,
+// which makes the timer fire every 0x700 E-clocks (1MHz/0x700, ~558Hz)
+// but I am unaware of any games which make use of this feature.
+// define the define below to enable the W15-instead-of-W14 feature.
+#undef S11_W15
 
 class s11_state : public genpin_class
 {
@@ -33,9 +40,12 @@
 	s11_state(const machine_config &mconfig, device_type type, const char *tag)
 		: genpin_class(mconfig, type, tag)
 		, m_maincpu(*this, "maincpu")
+		, m_mainirq(*this, "mainirq")
+		, m_piairq(*this, "piairq")
 		, m_audiocpu(*this, "audiocpu")
-		, m_bgcpu(*this, "bgcpu")
+		, m_audioirq(*this, "audioirq")
 		, m_hc55516(*this, "hc55516")
+		, m_dac(*this, "dac")
 		, m_pias(*this, "pias")
 		, m_pia21(*this, "pia21")
 		, m_pia24(*this, "pia24")
@@ -43,13 +53,15 @@
 		, m_pia2c(*this, "pia2c")
 		, m_pia30(*this, "pia30")
 		, m_pia34(*this, "pia34")
-		, m_pia40(*this, "pia40")
-		, m_ym(*this, "ym2151")
-		, m_bg(*this, "bgm")
+		, m_bg(*this, "bg")
+		, m_ps88(*this, "ps88")
 		, m_digits(*this, "digit%u", 0U)
+		, m_swarray(*this, "SW.%u", 0U)
 		{ }
 
 	void s11(machine_config &config);
+	void s11_bgs(machine_config &config);
+	void s11_bgm(machine_config &config);
 
 	void init_s11();
 
@@ -71,8 +83,6 @@
 	void pia34_pa_w(uint8_t data);
 	void pia34_pb_w(uint8_t data);
 	DECLARE_WRITE_LINE_MEMBER(pia34_cb2_w);
-	void pia40_pb_w(uint8_t data);
-	DECLARE_WRITE_LINE_MEMBER(pia40_cb2_w);
 
 	DECLARE_WRITE_LINE_MEMBER(pias_ca2_w);
 	DECLARE_WRITE_LINE_MEMBER(pias_cb2_w);
@@ -82,24 +92,28 @@
 	DECLARE_WRITE_LINE_MEMBER(pia28_ca2_w) { }; // comma3&4
 	DECLARE_WRITE_LINE_MEMBER(pia28_cb2_w) { }; // comma1&2
 	DECLARE_WRITE_LINE_MEMBER(pia30_cb2_w) { }; // dummy to stop error log filling up
-	DECLARE_WRITE_LINE_MEMBER(ym2151_irq_w);
 	DECLARE_WRITE_LINE_MEMBER(pia_irq);
+	DECLARE_WRITE_LINE_MEMBER(main_irq);
 
 	uint8_t switch_r();
 	void switch_w(uint8_t data);
 	uint8_t pia28_w7_r();
 
+	void s11_main_map(address_map &map);
+	void s11_audio_map(address_map &map);
+
 protected:
 	DECLARE_MACHINE_RESET(s11);
-	void s11_audio_map(address_map &map);
-	void s11_bg_map(address_map &map);
-	void s11_main_map(address_map &map);
 
 	// devices
 	required_device<cpu_device> m_maincpu;
+	required_device<input_merger_device> m_mainirq;
+	required_device<input_merger_device> m_piairq;
+	// the following devices are optional because certain board variants (i.e. system 11c) do not have the audio section on the mainboard populated
 	optional_device<m6802_cpu_device> m_audiocpu;
-	optional_device<cpu_device> m_bgcpu;
+	optional_device<input_merger_device> m_audioirq;
 	optional_device<hc55516_device> m_hc55516;
+	optional_device<mc1408_device> m_dac;
 	optional_device<pia6821_device> m_pias;
 	required_device<pia6821_device> m_pia21;
 	required_device<pia6821_device> m_pia24;
@@ -107,10 +121,10 @@
 	required_device<pia6821_device> m_pia2c;
 	required_device<pia6821_device> m_pia30;
 	required_device<pia6821_device> m_pia34;
-	optional_device<pia6821_device> m_pia40;
-	optional_device<ym2151_device> m_ym;
 	optional_device<s11c_bg_device> m_bg;
+	optional_device<pinsnd88_device> m_ps88;
 	output_finder<63> m_digits;
+	required_ioport_array<8> m_swarray;
 
 	// getters/setters
 	uint8_t get_strobe() { return m_strobe; }
@@ -131,12 +145,14 @@
 
 	uint8_t m_sound_data;
 	uint8_t m_strobe;
-	uint8_t m_kbdrow;
+	uint8_t m_switch_col;
 	uint8_t m_diag;
 	uint32_t m_segment1;
 	uint32_t m_segment2;
+	uint32_t m_timer_count;
 	emu_timer* m_irq_timer;
-	bool m_irq_active;
+	bool m_timer_irq_active;
+	bool m_pia_irq_active;
 };
 
 #endif // MAME_INCLUDES_S11_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/samcoupe.h mame-0.224+dfsg.1/src/mame/includes/samcoupe.h
--- mame-0.222+dfsg.1/src/mame/includes/samcoupe.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/samcoupe.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,221 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Lee Hammerton, Dirk Best
-/*****************************************************************************
- *
- * includes/coupe.h
- *
- * SAM Coupe
- *
- * Driver by Lee Hammerton
- *
- ****************************************************************************/
-
-#ifndef MAME_INCLUDES_SAMCOUPE_H
-#define MAME_INCLUDES_SAMCOUPE_H
-
-#pragma once
-
-#include "bus/centronics/ctronics.h"
-#include "imagedev/cassette.h"
-#include "imagedev/floppy.h"
-#include "machine/msm6242.h"
-#include "machine/ram.h"
-#include "machine/wd_fdc.h"
-#include "sound/spkrdev.h"
-#include "emupal.h"
-#include "screen.h"
-
-/* screen dimensions */
-#define SAM_BLOCK           8
-
-#define SAM_TOTAL_WIDTH     SAM_BLOCK*96
-#define SAM_TOTAL_HEIGHT    312
-#define SAM_SCREEN_WIDTH    SAM_BLOCK*64
-#define SAM_SCREEN_HEIGHT   192
-#define SAM_BORDER_LEFT     SAM_BLOCK*4
-#define SAM_BORDER_RIGHT    SAM_BLOCK*4
-#define SAM_BORDER_TOP      37
-#define SAM_BORDER_BOTTOM   46
-
-/* interrupt sources */
-#define SAM_LINE_INT     0x01
-#define SAM_MOUSE_INT    0x02
-#define SAM_MIDIIN_INT   0x04
-#define SAM_FRAME_INT    0x08
-#define SAM_MIDIOUT_INT  0x10
-
-
-class samcoupe_state :  public driver_device
-{
-public:
-	samcoupe_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_screen(*this, "screen"),
-		m_speaker(*this, "speaker"),
-		m_cassette(*this, "cassette"),
-		m_lpt1(*this, "lpt1"),
-		m_lpt2(*this, "lpt2"),
-		m_ram(*this, RAM_TAG),
-		m_rtc(*this, "sambus_clock"),
-		m_fdc(*this, "wd1772"),
-		m_wd1772_0(*this, "wd1772:0"),
-		m_wd1772_1(*this, "wd1772:1"),
-		m_region_maincpu(*this, "maincpu"),
-		m_keyboard_row_fe(*this, "keyboard_row_fe"),
-		m_keyboard_row_fd(*this, "keyboard_row_fd"),
-		m_keyboard_row_fb(*this, "keyboard_row_fb"),
-		m_keyboard_row_f7(*this, "keyboard_row_f7"),
-		m_keyboard_row_ef(*this, "keyboard_row_ef"),
-		m_keyboard_row_df(*this, "keyboard_row_df"),
-		m_keyboard_row_bf(*this, "keyboard_row_bf"),
-		m_keyboard_row_7f(*this, "keyboard_row_7f"),
-		m_keyboard_row_ff(*this, "keyboard_row_ff"),
-		m_mouse_buttons(*this, "mouse_buttons"),
-		m_io_mouse_x(*this, "mouse_x"),
-		m_io_mouse_y(*this, "mouse_y"),
-		m_config(*this, "config"),
-		m_joy1(*this, "joy_1"),
-		m_joy2(*this, "joy_2")
-	{
-		sam_bank_read_ptr[0] = nullptr;
-		sam_bank_write_ptr[0] = nullptr;
-		sam_bank_read_ptr[1] = nullptr;
-		sam_bank_write_ptr[1] = nullptr;
-		sam_bank_read_ptr[2] = nullptr;
-		sam_bank_write_ptr[2] = nullptr;
-		sam_bank_read_ptr[3] = nullptr;
-		sam_bank_write_ptr[3] = nullptr;
-	}
-
-	void samcoupe(machine_config &config);
-
-protected:
-	enum
-	{
-		TIMER_IRQ_OFF,
-		TIMER_MOUSE_RESET,
-		TIMER_VIDEO_UPDATE
-	};
-
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-	virtual void video_start() override;
-
-	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
-
-private:
-	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-
-	bitmap_ind16 m_bitmap;
-
-	emu_timer *m_video_update_timer;
-
-	uint8_t m_lmpr, m_hmpr, m_vmpr; /* memory pages */
-	uint8_t m_lext, m_hext;       /* extended memory page */
-	uint8_t m_border;           /* border */
-	uint8_t m_clut[16];         /* color lookup table, 16 entries */
-	uint8_t m_line_int;         /* line interrupt */
-	uint8_t m_status;           /* status register */
-
-	/* attribute */
-	uint8_t m_attribute;
-
-	/* mouse */
-	int m_mouse_index;
-	emu_timer *m_mouse_reset;
-	uint8_t m_mouse_data[9];
-	int m_mouse_x, m_mouse_y;
-	uint8_t *m_videoram;
-	void samcoupe_ext_mem_w(offs_t offset, uint8_t data);
-	uint8_t samcoupe_disk_r(offs_t offset);
-	void samcoupe_disk_w(offs_t offset, uint8_t data);
-	uint8_t samcoupe_pen_r(offs_t offset);
-	void samcoupe_clut_w(offs_t offset, uint8_t data);
-	uint8_t samcoupe_status_r(offs_t offset);
-	void samcoupe_line_int_w(uint8_t data);
-	uint8_t samcoupe_lmpr_r();
-	void samcoupe_lmpr_w(uint8_t data);
-	uint8_t samcoupe_hmpr_r();
-	void samcoupe_hmpr_w(uint8_t data);
-	uint8_t samcoupe_vmpr_r();
-	void samcoupe_vmpr_w(uint8_t data);
-	uint8_t samcoupe_midi_r();
-	void samcoupe_midi_w(uint8_t data);
-	uint8_t samcoupe_keyboard_r(offs_t offset);
-	void samcoupe_border_w(uint8_t data);
-	uint8_t samcoupe_attributes_r();
-	void samcoupe_palette(palette_device &palette) const;
-	INTERRUPT_GEN_MEMBER(samcoupe_frame_interrupt);
-	TIMER_CALLBACK_MEMBER(irq_off);
-	TIMER_CALLBACK_MEMBER(samcoupe_mouse_reset);
-	TIMER_CALLBACK_MEMBER(sam_video_update_callback);
-	uint8_t samcoupe_lpt1_busy_r();
-	void samcoupe_lpt1_strobe_w(uint8_t data);
-	uint8_t samcoupe_lpt2_busy_r();
-	void samcoupe_lpt2_strobe_w(uint8_t data);
-	uint8_t samcoupe_rtc_r(offs_t offset);
-	void samcoupe_rtc_w(offs_t offset, uint8_t data);
-
-	uint8_t sam_bank1_r(offs_t offset);
-	void sam_bank1_w(offs_t offset, uint8_t data);
-	uint8_t sam_bank2_r(offs_t offset);
-	void sam_bank2_w(offs_t offset, uint8_t data);
-	uint8_t sam_bank3_r(offs_t offset);
-	void sam_bank3_w(offs_t offset, uint8_t data);
-	uint8_t sam_bank4_r(offs_t offset);
-	void sam_bank4_w(offs_t offset, uint8_t data);
-
-	uint8_t* sam_bank_read_ptr[4];
-	uint8_t* sam_bank_write_ptr[4];
-	DECLARE_FLOPPY_FORMATS( floppy_formats );
-	required_device<cpu_device> m_maincpu;
-	required_device<screen_device> m_screen;
-	required_device<speaker_sound_device> m_speaker;
-	required_device<cassette_image_device> m_cassette;
-	required_device<centronics_device> m_lpt1;
-	required_device<centronics_device> m_lpt2;
-	required_device<ram_device> m_ram;
-	required_device<msm6242_device> m_rtc;
-	required_device<wd1772_device> m_fdc;
-	required_device<floppy_connector> m_wd1772_0;
-	required_device<floppy_connector> m_wd1772_1;
-	required_memory_region m_region_maincpu;
-	required_ioport m_keyboard_row_fe;
-	required_ioport m_keyboard_row_fd;
-	required_ioport m_keyboard_row_fb;
-	required_ioport m_keyboard_row_f7;
-	required_ioport m_keyboard_row_ef;
-	required_ioport m_keyboard_row_df;
-	required_ioport m_keyboard_row_bf;
-	required_ioport m_keyboard_row_7f;
-	required_ioport m_keyboard_row_ff;
-	required_ioport m_mouse_buttons;
-	required_ioport m_io_mouse_x;
-	required_ioport m_io_mouse_y;
-	required_ioport m_config;
-	required_ioport m_joy1;
-	required_ioport m_joy2;
-
-	void draw_mode4_line(int y, int hpos);
-	void draw_mode3_line(int y, int hpos);
-	void draw_mode12_block(bitmap_ind16 &bitmap, int vpos, int hpos, uint8_t mask);
-	void draw_mode2_line(int y, int hpos);
-	void draw_mode1_line(int y, int hpos);
-	void samcoupe_update_bank(address_space &space, int bank_num, uint8_t *memory, int is_readonly);
-	void samcoupe_install_ext_mem(address_space &space);
-	void samcoupe_update_memory(address_space &space);
-	uint8_t samcoupe_mouse_r();
-	void samcoupe_irq(uint8_t src);
-
-	DECLARE_WRITE_LINE_MEMBER(write_lpt1_busy);
-	DECLARE_WRITE_LINE_MEMBER(write_lpt2_busy);
-
-	int m_lpt1_busy;
-	int m_lpt2_busy;
-
-	void samcoupe_io(address_map &map);
-	void samcoupe_mem(address_map &map);
-};
-
-#endif // MAME_INCLUDES_SAMCOUPE_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/segag80r.h mame-0.224+dfsg.1/src/mame/includes/segag80r.h
--- mame-0.222+dfsg.1/src/mame/includes/segag80r.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/segag80r.h	2020-08-26 08:57:19.000000000 +0000
@@ -10,8 +10,10 @@
 
 #pragma once
 
+#include "audio/segag80.h"
 #include "audio/segag80r.h"
-#include "audio/segasnd.h"
+#include "audio/segaspeech.h"
+#include "audio/segausb.h"
 #include "machine/i8255.h"
 #include "machine/segag80.h"
 #include "sound/samples.h"
@@ -23,11 +25,11 @@
 
 class sega005_sound_device;
 
-class segag80r_state : public segag80snd_common
+class segag80r_state : public driver_device
 {
 public:
 	segag80r_state(const machine_config &mconfig, device_type type, const char *tag) :
-		segag80snd_common(mconfig, type, tag),
+		driver_device(mconfig, type, tag),
 		m_mainram(*this, "mainram"),
 		m_videoram(*this, "videoram"),
 		m_sn1(*this, "sn1"),
@@ -36,7 +38,8 @@
 		m_audiocpu(*this, "audiocpu"),
 		m_soundbrd(*this, "soundbrd"),
 		m_samples(*this, "samples"),
-		m_speech(*this, "segaspeech"),
+		m_speech(*this, "speech"),
+		m_g80_audio(*this, "g80sound"),
 		m_usbsnd(*this, "usbsnd"),
 		m_005snd(*this, "005"),
 		m_gfxdecode(*this, "gfxdecode"),
@@ -53,11 +56,11 @@
 	void monster2(machine_config &config);
 	void sega005(machine_config &config);
 	void spaceod(machine_config &config);
-	void astrob_sound_board(machine_config &config);
 	void sega005_sound_board(machine_config &config);
 	void spaceod_sound_board(machine_config &config);
 	void monsterb_sound_board(machine_config &config);
 
+	void init_waitstates();
 	void init_spaceod();
 	void init_sindbadm();
 	void init_pignewt();
@@ -91,7 +94,8 @@
 	optional_device<cpu_device> m_audiocpu;
 	optional_device<monsterb_sound_device> m_soundbrd;
 	optional_device<samples_device> m_samples;
-	optional_device<speech_sound_device> m_speech;
+	optional_device<sega_speech_device> m_speech;
+	optional_device<segag80_audio_device> m_g80_audio;
 	optional_device<usb_sound_device> m_usbsnd;
 	optional_device<sega005_sound_device> m_005snd;
 	required_device<gfxdecode_device> m_gfxdecode;
@@ -147,7 +151,6 @@
 	void pignewt_back_port_w(offs_t offset, uint8_t data);
 	void sindbadm_videoram_w(offs_t offset, uint8_t data);
 	void sindbadm_back_port_w(offs_t offset, uint8_t data);
-	void astrob_sound_w(offs_t offset, uint8_t data);
 	void spaceod_sound_w(offs_t offset, uint8_t data);
 
 	void usb_ram_w(offs_t offset, uint8_t data);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/segag80v.h mame-0.224+dfsg.1/src/mame/includes/segag80v.h
--- mame-0.222+dfsg.1/src/mame/includes/segag80v.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/segag80v.h	2020-08-26 08:57:19.000000000 +0000
@@ -6,7 +6,10 @@
 
 *************************************************************************/
 
-#include "audio/segasnd.h"
+#include "audio/segaspeech.h"
+#include "audio/segausb.h"
+#include "audio/segag80.h"
+#include "cpu/z80/z80.h"
 #include "machine/segag80.h"
 #include "sound/ay8910.h"
 #include "sound/samples.h"
@@ -14,20 +17,45 @@
 
 #include "screen.h"
 
-class segag80v_state : public segag80snd_common
+#define CPU_CLOCK           8000000     /* not used when video boards are connected */
+#define VIDEO_CLOCK         15468480
+
+class segag80v_state : public driver_device
 {
 public:
-	segag80v_state(const machine_config &mconfig, device_type type, const char *tag)
-		: segag80snd_common(mconfig, type, tag),
+	segag80v_state(const machine_config &mconfig, device_type type, const char *tag) :
+		driver_device(mconfig, type, tag),
+		m_mainrom(*this, "maincpu"),
 		m_mainram(*this, "mainram"),
 		m_vectorram(*this, "vectorram"),
 		m_maincpu(*this, "maincpu"),
 		m_samples(*this, "samples"),
-		m_speech(*this, "segaspeech"),
+		m_speech(*this, "speech"),
 		m_usb(*this, "usbsnd"),
+		m_g80_audio(*this, "g80sound"),
 		m_aysnd(*this, "aysnd"),
 		m_vector(*this, "vector"),
-		m_screen(*this, "screen")
+		m_screen(*this, "screen"),
+		m_d7d6(*this, "D7D6"),
+		m_d5d4(*this, "D5D4"),
+		m_d3d2(*this, "D3D2"),
+		m_d1d0(*this, "D1D0"),
+		m_fc(*this, "FC"),
+		m_coins(*this, "COINS"),
+		m_spinner(*this, "SPINNER"),
+		m_mult_data{0,0},
+		m_mult_result(0),
+		m_spinner_select(0),
+		m_spinner_sign(0),
+		m_spinner_count(0),
+		m_coin_ff_state(0),
+		m_coin_last_state(0),
+		m_edgint_ff_state(0),
+		m_scrambled_write_pc(0),
+		m_decrypt(nullptr),
+		m_min_x(0),
+		m_min_y(0),
+		m_draw_end_time(attotime::zero)
 	{ }
 
 	void g80v_base(machine_config &config);
@@ -37,6 +65,7 @@
 	void zektor(machine_config &config);
 	void spacfury(machine_config &config);
 
+	void init_waitstates();
 	void init_zektor();
 	void init_startrek();
 	void init_elim4();
@@ -44,59 +73,89 @@
 	void init_tacscan();
 	void init_spacfury();
 
-	DECLARE_INPUT_CHANGED_MEMBER(service_switch);
 	DECLARE_READ_LINE_MEMBER(elim4_joint_coin_r);
+	DECLARE_READ_LINE_MEMBER(draw_r);
+	DECLARE_WRITE_LINE_MEMBER(service_switch_w);
+	DECLARE_WRITE_LINE_MEMBER(irq_ack_w);
+
+	template<int _Index>
+	DECLARE_WRITE_LINE_MEMBER( coin_w )
+	{
+		const u8 mask = 1 << _Index;
+
+		if (state == 0 && (m_coin_last_state & mask) != 0)
+			m_coin_ff_state |= mask;
+		else
+			m_coin_ff_state &= ~mask;
+
+		if (state)
+			m_coin_last_state |= mask;
+		else
+			m_coin_last_state &= ~mask;
+
+		update_int();
+	}
 
 private:
-	required_shared_ptr<uint8_t> m_mainram;
-	required_shared_ptr<uint8_t> m_vectorram;
+	required_memory_region m_mainrom;
+	required_shared_ptr<u8> m_mainram;
+	required_shared_ptr<u8> m_vectorram;
 
-	required_device<cpu_device> m_maincpu;
+	required_device<z80_device> m_maincpu;
 	optional_device<samples_device> m_samples;
-	optional_device<speech_sound_device> m_speech;
+	optional_device<sega_speech_device> m_speech;
 	optional_device<usb_sound_device> m_usb;
+	optional_device<segag80_audio_device> m_g80_audio;
 	optional_device<ay8912_device> m_aysnd;
 	required_device<vector_device> m_vector;
 	required_device<screen_device> m_screen;
 
-
-	uint8_t m_mult_data[2];
-	uint16_t m_mult_result;
-	uint8_t m_spinner_select;
-	uint8_t m_spinner_sign;
-	uint8_t m_spinner_count;
+	required_ioport m_d7d6;
+	required_ioport m_d5d4;
+	required_ioport m_d3d2;
+	required_ioport m_d1d0;
+	required_ioport m_fc;
+	optional_ioport m_coins;
+	optional_ioport m_spinner;
+
+	u8 m_mult_data[2];
+	u16 m_mult_result;
+	u8 m_spinner_select;
+	u8 m_spinner_sign;
+	u8 m_spinner_count;
+	u8 m_coin_ff_state;
+	u8 m_coin_last_state;
+	u8 m_edgint_ff_state;
 	offs_t m_scrambled_write_pc;
 	segag80_decrypt_func m_decrypt;
 	int m_min_x;
 	int m_min_y;
-	uint8_t g80v_opcode_r(offs_t offset);
-	void mainram_w(offs_t offset, uint8_t data);
-	void vectorram_w(offs_t offset, uint8_t data);
-	uint8_t mangled_ports_r(offs_t offset);
-	void spinner_select_w(uint8_t data);
-	uint8_t spinner_input_r();
-	uint8_t elim4_input_r();
-	void multiply_w(offs_t offset, uint8_t data);
-	uint8_t multiply_r();
-	void coin_count_w(uint8_t data);
-	void unknown_w(uint8_t data);
-
-	void elim1_sh_w(uint8_t data);
-	void elim2_sh_w(uint8_t data);
-	void zektor1_sh_w(uint8_t data);
-	void zektor2_sh_w(uint8_t data);
-	void spacfury1_sh_w(uint8_t data);
-	void spacfury2_sh_w(uint8_t data);
+	attotime m_draw_end_time;
+
+	u8 opcode_r(offs_t offset);
+	u8 mainrom_r(offs_t offset);
+	void mainram_w(offs_t offset, u8 data);
+	void vectorram_w(offs_t offset, u8 data);
+	u8 mangled_ports_r(offs_t offset);
+	void spinner_select_w(u8 data);
+	u8 spinner_input_r();
+	u8 elim4_input_r();
+	void multiply_w(offs_t offset, u8 data);
+	u8 multiply_r();
+	void coin_count_w(u8 data);
+	void unknown_w(u8 data);
+	void update_int();
+	void vblank_callback(screen_device &screen, bool state);
 
-	void usb_ram_w(offs_t offset, uint8_t data);
+	void usb_ram_w(offs_t offset, u8 data);
 
 	virtual void machine_start() override;
 	virtual void video_start() override;
 	uint32_t screen_update_segag80v(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-	inline bool adjust_xy(int rawx, int rawy, int *outx, int *outy);
+	inline bool adjust_xy(int rawx, int rawy, int &outx, int &outy);
 	void sega_generate_vector_list();
 	offs_t decrypt_offset(offs_t offset);
-	inline uint8_t demangle(uint8_t d7d6, uint8_t d5d4, uint8_t d3d2, uint8_t d1d0);
+	inline u8 demangle(u8 d7d6, u8 d5d4, u8 d3d2, u8 d1d0);
 
 	void main_map(address_map &map);
 	void opcodes_map(address_map &map);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/seicross.h mame-0.224+dfsg.1/src/mame/includes/seicross.h
--- mame-0.222+dfsg.1/src/mame/includes/seicross.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/seicross.h	2020-08-26 08:57:19.000000000 +0000
@@ -26,15 +26,18 @@
 		m_videoram(*this, "videoram"),
 		m_row_scroll(*this, "row_scroll"),
 		m_spriteram2(*this, "spriteram2"),
-		m_colorram(*this, "colorram"),
-		m_decrypted_opcodes(*this, "decrypted_opcodes")
+		m_colorram(*this, "colorram")
 	{ }
 
 	void no_nvram(machine_config &config);
 	void friskytb(machine_config &config);
 	void nvram(machine_config &config);
+	void sectznt(machine_config &config);
 
-	void init_friskytb();
+protected:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	virtual void video_start() override;
 
 private:
 	required_device<cpu_device> m_maincpu;
@@ -51,7 +54,6 @@
 	required_shared_ptr<uint8_t> m_row_scroll;
 	required_shared_ptr<uint8_t> m_spriteram2;
 	required_shared_ptr<uint8_t> m_colorram;
-	optional_shared_ptr<uint8_t> m_decrypted_opcodes;
 
 	uint8_t m_portb;
 	tilemap_t *m_bg_tilemap;
@@ -66,9 +68,6 @@
 
 	INTERRUPT_GEN_MEMBER(vblank_irq);
 
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-	virtual void video_start() override;
 	void seicross_palette(palette_device &palette) const;
 
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -78,7 +77,6 @@
 
 	void dac_w(uint8_t data);
 
-	void decrypted_opcodes_map(address_map &map);
 	void main_map(address_map &map);
 	void main_portmap(address_map &map);
 	void mcu_no_nvram_map(address_map &map);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/special.h mame-0.224+dfsg.1/src/mame/includes/special.h
--- mame-0.222+dfsg.1/src/mame/includes/special.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/special.h	2020-08-26 08:57:19.000000000 +0000
@@ -29,26 +29,27 @@
 class special_state : public driver_device
 {
 public:
-	special_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_ppi(*this, "ppi8255"),
-		m_fdc(*this, "fd1793"),
-		m_dac(*this, "dac"),
-		m_pit(*this, "pit8253"),
-		m_cassette(*this, "cassette"),
-		m_fdd(*this, "fd%u", 0U),
-		m_ram(*this, RAM_TAG),
-		m_p_videoram(*this, "videoram"),
-		m_region_maincpu(*this, "maincpu"),
-		m_bank1(*this, "bank1"),
-		m_bank2(*this, "bank2"),
-		m_bank3(*this, "bank3"),
-		m_bank4(*this, "bank4"),
-		m_bank5(*this, "bank5"),
-		m_bank6(*this, "bank6"),
-		m_io_line(*this, "LINE%u", 0U),
-		m_palette(*this, "palette")
+	special_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_ppi(*this, "ppi")
+		, m_fdc(*this, "fdc")
+		, m_dac(*this, "dac")
+		, m_pit(*this, "pit")
+		, m_cassette(*this, "cassette")
+		, m_fdd(*this, "fd%u", 0U)
+		, m_ram(*this, RAM_TAG)
+		, m_vram(*this, "videoram")
+		, m_rom(*this, "maincpu")
+		, m_mram(*this, "mainram")
+		, m_bank1(*this, "bank1")
+		, m_bank2(*this, "bank2")
+		, m_bank3(*this, "bank3")
+		, m_bank4(*this, "bank4")
+		, m_bank5(*this, "bank5")
+		, m_bank6(*this, "bank6")
+		, m_io_keyboard(*this, "LINE%u", 0U)
+		, m_palette(*this, "palette")
 	{ }
 
 	void special(machine_config &config);
@@ -69,32 +70,34 @@
 		TIMER_PIT8253_GATES
 	};
 
+	// specimx
 	void specimx_select_bank(offs_t offset, uint8_t data);
 	void video_memory_w(offs_t offset, uint8_t data);
 	void specimx_video_color_w(uint8_t data);
 	uint8_t specimx_video_color_r();
 	uint8_t specimx_disk_ctrl_r();
 	void specimx_disk_ctrl_w(offs_t offset, uint8_t data);
+	uint8_t specimx_portb_r();
+	void specimx_portc_w(uint8_t data);
+	void specimx_set_bank(offs_t i, uint8_t data);
+	// erik
 	uint8_t erik_rr_reg_r();
 	void erik_rr_reg_w(uint8_t data);
 	uint8_t erik_rc_reg_r();
 	void erik_rc_reg_w(uint8_t data);
 	uint8_t erik_disk_reg_r();
 	void erik_disk_reg_w(uint8_t data);
-	uint8_t specialist_8255_porta_r();
-	uint8_t specialist_8255_portb_r();
-	uint8_t specimx_8255_portb_r();
-	uint8_t specialist_8255_portc_r();
-	void specialist_8255_porta_w(uint8_t data);
-	void specialist_8255_portb_w(uint8_t data);
-	void specialist_8255_portc_w(uint8_t data);
-	void specialistmx_8255_portc_w(uint8_t data);
+	void erik_set_bank();
+	// special
+	u8 kbd_r();
+	uint8_t porta_r();
+	uint8_t portb_r();
+	uint8_t portc_r();
+	void porta_w(uint8_t data);
+	void portb_w(uint8_t data);
+	void portc_w(uint8_t data);
 
-	DECLARE_MACHINE_RESET(erik);
 	void erik_palette(palette_device &palette) const;
-	DECLARE_MACHINE_START(specimx);
-	DECLARE_MACHINE_RESET(specimx);
-	DECLARE_VIDEO_START(specimx);
 	void specimx_palette(palette_device &palette) const;
 	uint32_t screen_update_special(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	uint32_t screen_update_erik(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -102,25 +105,26 @@
 	uint32_t screen_update_specimx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	DECLARE_WRITE_LINE_MEMBER(fdc_drq);
 	DECLARE_FLOPPY_FORMATS( specimx_floppy_formats );
+	void machine_start() override;
+	void machine_reset() override;
 
-	void erik_io_map(address_map &map);
+	void erik_io(address_map &map);
 	void erik_mem(address_map &map);
 	void specialist_mem(address_map &map);
 	void specialp_mem(address_map &map);
 	void specimx_mem(address_map &map);
 
-	void specimx_set_bank(offs_t i, uint8_t data);
-	void erik_set_bank();
 	std::unique_ptr<uint8_t[]> m_specimx_colorram;
 	uint8_t m_erik_color_1;
 	uint8_t m_erik_color_2;
 	uint8_t m_erik_background;
 	uint8_t m_specimx_color;
-	int m_specialist_8255_porta;
-	int m_specialist_8255_portb;
-	int m_specialist_8255_portc;
+	u8 m_porta;
+	u8 m_portb;
+	u8 m_portc;
 	uint8_t m_RR_register;
 	uint8_t m_RC_register;
+	u8 m_drive;
 	required_device<cpu_device> m_maincpu;
 	optional_device<i8255_device> m_ppi;
 	optional_device<fd1793_device> m_fdc;
@@ -129,16 +133,16 @@
 	optional_device<cassette_image_device> m_cassette;
 	optional_device_array<floppy_connector, 2> m_fdd;
 	optional_device<ram_device> m_ram;
-	optional_shared_ptr<uint8_t> m_p_videoram;
-	int m_drive;
-	required_memory_region m_region_maincpu;
+	optional_shared_ptr<uint8_t> m_vram;
+	required_region_ptr<u8> m_rom;
+	optional_shared_ptr<u8> m_mram;
 	required_memory_bank m_bank1;
 	optional_memory_bank m_bank2;
 	optional_memory_bank m_bank3;
 	optional_memory_bank m_bank4;
 	optional_memory_bank m_bank5;
 	optional_memory_bank m_bank6;
-	required_ioport_array<13> m_io_line;
+	required_ioport_array<13> m_io_keyboard;
 	required_device<palette_device> m_palette;
 };
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/spg2xx.h mame-0.224+dfsg.1/src/mame/includes/spg2xx.h
--- mame-0.222+dfsg.1/src/mame/includes/spg2xx.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/spg2xx.h	2020-08-26 08:57:19.000000000 +0000
@@ -34,12 +34,14 @@
 	{ }
 
 	void spg2xx_base(machine_config &config);
+	void spg2xx(machine_config &config);
+	void spg2xx_pal(machine_config &config);
+
 	void rad_skat(machine_config &config);
 	void rad_skatp(machine_config &config);
 	void rad_sktv(machine_config &config);
 	void rad_crik(machine_config &config);
 	void non_spg_base(machine_config &config);
-	void spg2xx(machine_config &config);
 	void comil(machine_config &config);
 	void tvsprt10(machine_config &config);
 	void guitarfv(machine_config &config);
@@ -218,12 +220,29 @@
 
 	virtual void portc_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
 
-private:
 	required_memory_bank m_upperbank;
 
+private:
+
 	void mem_map_upperbank(address_map& map);
 };
 
+class spg2xx_game_senwfit_state : public spg2xx_game_gssytts_state
+{
+public:
+	spg2xx_game_senwfit_state(const machine_config &mconfig, device_type type, const char *tag) :
+		spg2xx_game_gssytts_state(mconfig, type, tag)
+	{ }
+
+	void init_senwfit();
+protected:
+
+	virtual void portc_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
+
+private:
+};
+
+
 class spg2xx_game_senspeed_state : public spg2xx_game_state
 {
 public:
@@ -255,5 +274,44 @@
 private:
 };
 
+
+
+class spg2xx_game_wfcentro_state : public spg2xx_game_state
+{
+public:
+	spg2xx_game_wfcentro_state(const machine_config &mconfig, device_type type, const char *tag) :
+		spg2xx_game_state(mconfig, type, tag)
+	{ }
+
+	void wfcentro(machine_config &config);
+
+protected:
+//  virtual void machine_start() override;
+//  virtual void machine_reset() override;
+
+//  virtual void portc_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override;
+
+private:
+
+	void mem_map_wfcentro(address_map& map);
+};
+
+class spg2xx_game_ordentv_state : public spg2xx_game_state
+{
+public:
+	spg2xx_game_ordentv_state(const machine_config &mconfig, device_type type, const char *tag) :
+		spg2xx_game_state(mconfig, type, tag)
+	{ }
+
+	void ordentv(machine_config &config);
+
+	void init_ordentv();
+
+protected:
+
+	uint16_t ordentv_portc_r(offs_t offset, uint16_t mem_mask = ~0);
+private:
+};
+
 
 #endif // MAME_INCLUDES_SPG2XX_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/splash.h mame-0.224+dfsg.1/src/mame/includes/splash.h
--- mame-0.222+dfsg.1/src/mame/includes/splash.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/splash.h	2020-08-26 08:57:19.000000000 +0000
@@ -130,6 +130,7 @@
 	void funystrp(machine_config &config);
 
 	void init_funystrp();
+	void init_ringball();
 
 protected:
 	virtual void machine_start() override;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/sspeedr.h mame-0.224+dfsg.1/src/mame/includes/sspeedr.h
--- mame-0.222+dfsg.1/src/mame/includes/sspeedr.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/sspeedr.h	2020-08-26 08:57:19.000000000 +0000
@@ -6,6 +6,7 @@
 #pragma once
 
 #include "emupal.h"
+#include "machine/netlist.h"
 
 class sspeedr_state : public driver_device
 {
@@ -16,48 +17,64 @@
 		, m_gfxdecode(*this, "gfxdecode")
 		, m_palette(*this, "palette")
 		, m_digits(*this, "digit%u", 0U)
+		, m_pedal_bit0(*this, "sound_nl:pedal_bit0")
+		, m_pedal_bit1(*this, "sound_nl:pedal_bit1")
+		, m_pedal_bit2(*this, "sound_nl:pedal_bit2")
+		, m_pedal_bit3(*this, "sound_nl:pedal_bit3")
+		, m_hi_shift(*this, "sound_nl:hi_shift")
+		, m_lo_shift(*this, "sound_nl:lo_shift")
+		, m_boom(*this, "sound_nl:boom")
+		, m_engine_sound_off(*this, "sound_nl:engine_sound_off")
+		, m_noise_cr_1(*this, "sound_nl:noise_cr_1")
+		, m_noise_cr_2(*this, "sound_nl:noise_cr_2")
+		, m_silence(*this, "sound_nl:silence")
+		, m_track(*this, "track")
 	{ }
 
 	void sspeedr(machine_config &config);
 
-private:
-	void sspeedr_int_ack_w(uint8_t data);
-	void sspeedr_lamp_w(uint8_t data);
-	void sspeedr_time_w(offs_t offset, uint8_t data);
-	void sspeedr_score_w(offs_t offset, uint8_t data);
-	void sspeedr_sound_w(uint8_t data);
-	void sspeedr_driver_horz_w(uint8_t data);
-	void sspeedr_driver_horz_2_w(uint8_t data);
-	void sspeedr_driver_vert_w(uint8_t data);
-	void sspeedr_driver_pic_w(uint8_t data);
-	void sspeedr_drones_horz_w(uint8_t data);
-	void sspeedr_drones_horz_2_w(uint8_t data);
-	void sspeedr_drones_mask_w(uint8_t data);
-	void sspeedr_drones_vert_w(offs_t offset, uint8_t data);
-	void sspeedr_track_horz_w(uint8_t data);
-	void sspeedr_track_horz_2_w(uint8_t data);
-	void sspeedr_track_vert_w(offs_t offset, uint8_t data);
-	void sspeedr_track_ice_w(uint8_t data);
-	void sspeedr_palette(palette_device &palette) const;
-	uint32_t screen_update_sspeedr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	DECLARE_WRITE_LINE_MEMBER(screen_vblank_sspeedr);
-	void sspeedr_io_map(address_map &map);
-	void sspeedr_map(address_map &map);
-
-	uint8_t m_led_TIME[2];
-	uint8_t m_led_SCORE[24];
-	int m_toggle;
-	unsigned m_driver_horz;
-	unsigned m_driver_vert;
-	unsigned m_driver_pic;
-	unsigned m_drones_horz;
-	unsigned m_drones_vert[3];
-	unsigned m_drones_mask;
-	unsigned m_track_horz;
-	unsigned m_track_vert[2];
-	unsigned m_track_ice;
+protected:
 	virtual void video_start() override;
 	virtual void machine_start() override { m_digits.resolve(); }
+
+private:
+	void int_ack_w(uint8_t data);
+	void lamp_w(uint8_t data);
+	void time_w(offs_t offset, uint8_t data);
+	void score_w(offs_t offset, uint8_t data);
+	void sound1_w(uint8_t data);
+	void sound2_w(uint8_t data);
+	void driver_horz_w(uint8_t data);
+	void driver_horz_2_w(uint8_t data);
+	void driver_vert_w(uint8_t data);
+	void driver_pic_w(uint8_t data);
+	void drones_horz_w(uint8_t data);
+	void drones_horz_2_w(uint8_t data);
+	void drones_mask_w(uint8_t data);
+	void drones_vert_w(offs_t offset, uint8_t data);
+	void track_horz_w(uint8_t data);
+	void track_horz_2_w(uint8_t data);
+	void track_vert_w(offs_t offset, uint8_t data);
+	void track_ice_w(uint8_t data);
+	void palette(palette_device &palette) const;
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	DECLARE_WRITE_LINE_MEMBER(screen_vblank);
+	void io_map(address_map &map);
+	void prg_map(address_map &map);
+
+	uint8_t m_led_time[2];
+	uint8_t m_led_score[24];
+	uint8_t m_toggle;
+	uint16_t m_driver_horz;
+	uint8_t m_driver_vert;
+	uint8_t m_driver_pic;
+	uint16_t m_drones_horz;
+	uint8_t m_drones_vert[3];
+	uint8_t m_drones_mask;
+	uint16_t m_track_horz;
+	uint8_t m_track_vert[2];
+	uint8_t m_track_ice;
+
 	void draw_track(bitmap_ind16 &bitmap);
 	void draw_drones(bitmap_ind16 &bitmap, const rectangle &cliprect);
 	void draw_driver(bitmap_ind16 &bitmap, const rectangle &cliprect);
@@ -65,6 +82,18 @@
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_device<palette_device> m_palette;
 	output_finder<26> m_digits;
+	required_device<netlist_mame_logic_input_device> m_pedal_bit0;
+	required_device<netlist_mame_logic_input_device> m_pedal_bit1;
+	required_device<netlist_mame_logic_input_device> m_pedal_bit2;
+	required_device<netlist_mame_logic_input_device> m_pedal_bit3;
+	required_device<netlist_mame_logic_input_device> m_hi_shift;
+	required_device<netlist_mame_logic_input_device> m_lo_shift;
+	required_device<netlist_mame_logic_input_device> m_boom;
+	required_device<netlist_mame_logic_input_device> m_engine_sound_off;
+	required_device<netlist_mame_logic_input_device> m_noise_cr_1;
+	required_device<netlist_mame_logic_input_device> m_noise_cr_2;
+	required_device<netlist_mame_logic_input_device> m_silence;
+	required_region_ptr<uint8_t> m_track;
 };
 
 #endif // MAME_INCLUDES_SSPEEDR_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/starcrus.h mame-0.224+dfsg.1/src/mame/includes/starcrus.h
--- mame-0.222+dfsg.1/src/mame/includes/starcrus.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/starcrus.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,12 +1,14 @@
 // license:BSD-3-Clause
-// copyright-holders:Frank Palazzolo
+// copyright-holders:Frank Palazzolo, Ryan Holtz
 #ifndef MAME_INCLUDES_STARCRUS_H
 #define MAME_INCLUDES_STARCRUS_H
 
 #pragma once
 
-#include "sound/samples.h"
 #include "emupal.h"
+#include "machine/netlist.h"
+#include "netlist/nl_setup.h"
+#include "audio/nl_starcrus.h"
 
 class starcrus_state : public driver_device
 {
@@ -14,10 +16,12 @@
 	starcrus_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag) ,
 		m_maincpu(*this, "maincpu"),
-		m_samples(*this, "samples"),
 		m_gfxdecode(*this, "gfxdecode"),
 		m_palette(*this, "palette"),
-		m_led(*this, "led2")
+		m_led(*this, "led2"),
+		m_explode(*this, "sound_nl:explode%u", 1U),
+		m_launch(*this, "sound_nl:launch%u", 1U),
+		m_engine(*this, "sound_nl:engine%u", 1U)
 	{ }
 
 	void starcrus(machine_config &config);
@@ -41,7 +45,6 @@
 	virtual void video_start() override;
 
 	required_device<cpu_device> m_maincpu;
-	required_device<samples_device> m_samples;
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_device<palette_device> m_palette;
 
@@ -66,20 +69,8 @@
 	int m_s1_sprite;
 	int m_s2_sprite;
 
-	int m_engine1_on;
-	int m_engine2_on;
-	int m_explode1_on;
-	int m_explode2_on;
-	int m_launch1_on;
-	int m_launch2_on;
-
 	int m_collision_reg;
 
-	int m_engine_sound_playing;
-	int m_explode_sound_playing;
-	int m_launch1_sound_playing;
-	int m_launch2_sound_playing;
-
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	int collision_check_s1s2();
 	int collision_check_p1p2();
@@ -88,6 +79,10 @@
 
 	void starcrus_io_map(address_map &map);
 	void starcrus_map(address_map &map);
+
+	required_device_array<netlist_mame_logic_input_device, 2> m_explode;
+	required_device_array<netlist_mame_logic_input_device, 2> m_launch;
+	required_device_array<netlist_mame_logic_input_device, 2> m_engine;
 };
 
 #endif // MAME_INCLUDES_STARCRUS_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/starfire.h mame-0.224+dfsg.1/src/mame/includes/starfire.h
--- mame-0.222+dfsg.1/src/mame/includes/starfire.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/starfire.h	2020-08-26 08:57:19.000000000 +0000
@@ -10,7 +10,13 @@
 
 #pragma once
 
-#include "sound/samples.h"
+#include "machine/netlist.h"
+#include "machine/pit8253.h"
+#include "netlist/nl_setup.h"
+#include "audio/nl_fireone.h"
+#include "audio/nl_starfire.h"
+#include "sound/dac.h"
+#include "sound/volt_reg.h"
 #include "screen.h"
 
 
@@ -26,67 +32,173 @@
 #define STARFIRE_NUM_PENS       (0x40)
 
 
-class starfire_state : public driver_device
+class starfire_base_state : public driver_device
 {
 public:
-	starfire_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_starfire_colorram(*this, "colorram"),
-		m_starfire_videoram(*this, "videoram"),
-		m_samples(*this, "samples"),
-		m_nmi(*this, "NMI"),
-		m_input_read(*this),
-		m_io2_write(*this),
-		m_maincpu(*this, "maincpu"),
-		m_screen(*this, "screen")
+	starfire_base_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_screen(*this, "screen")
+		, m_colorram(*this, "colorram")
+		, m_videoram(*this, "videoram")
+		, m_dsw(*this, "DSW")
+		, m_system(*this, "SYSTEM")
+	{ }
+
+protected:
+	virtual void video_start() override;
+
+	void base_config(machine_config &config);
+	void main_map(address_map &map);
+
+	required_device<cpu_device> m_maincpu;
+	required_device<screen_device> m_screen;
+	required_shared_ptr<uint8_t> m_colorram;
+	required_shared_ptr<uint8_t> m_videoram;
+	required_ioport m_dsw;
+	required_ioport m_system;
+
+	uint8_t m_vidctrl;
+	uint8_t m_vidctrl1;
+	uint8_t m_color;
+	uint16_t m_colors[STARFIRE_NUM_PENS];
+
+	emu_timer* m_scanline_timer;
+	bitmap_rgb32 m_screen_bitmap;
+
+	virtual uint8_t input_r(offs_t offset) = 0;
+	virtual void sound_w(offs_t offset, uint8_t data) = 0;
+	virtual void music_w(offs_t offset, uint8_t data) { };
+
+	void scratch_w(offs_t offset, uint8_t data);
+	uint8_t scratch_r(offs_t offset);
+	void colorram_w(offs_t offset, uint8_t data);
+	uint8_t colorram_r(offs_t offset);
+	void videoram_w(offs_t offset, uint8_t data);
+	uint8_t videoram_r(offs_t offset);
+	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+	TIMER_CALLBACK_MEMBER(scanline_callback);
+	void get_pens(pen_t *pens);
+	void scanline_callback(uint32_t data);
+};
+
+class starfire_state : public starfire_base_state
+{
+public:
+	starfire_state(const machine_config &mconfig, device_type type, const char *tag)
+		: starfire_base_state(mconfig, type, tag)
+		, m_dac(*this, "dac") // just to have a sound device
+		, m_nmi(*this, "NMI")
+		, m_stickz(*this, "STICKZ")
+		, m_stickx(*this, "STICKX")
+		, m_sticky(*this, "STICKY")
+		, m_sound_size(*this, "sound_nl:size")
+		, m_sound_explosion(*this, "sound_nl:sexplo")
+		, m_sound_tie(*this, "sound_nl:stie")
+		, m_sound_laser(*this, "sound_nl:slaser")
+		, m_sound_track(*this, "sound_nl:track")
+		, m_sound_lock(*this, "sound_nl:lock")
+		, m_sound_scanner(*this, "sound_nl:scanner")
+		, m_sound_overheat(*this, "sound_nl:oheat")
 	{ }
 
-	void fireone(machine_config &config);
 	void starfire(machine_config &config);
 
-	void init_starfire();
-	void init_fireone();
+private:
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+
+	required_device<dac_word_interface> m_dac;
+
+	required_ioport m_nmi;
+	required_ioport m_stickz;
+	required_ioport m_stickx;
+	required_ioport m_sticky;
+
+	virtual uint8_t input_r(offs_t offset) override;
+	virtual void sound_w(offs_t offset, uint8_t data) override;
+
+	INTERRUPT_GEN_MEMBER(vblank_int);
+
+	NETDEV_ANALOG_CALLBACK_MEMBER(tieon1_cb);
+	NETDEV_ANALOG_CALLBACK_MEMBER(laseron1_cb);
+	NETDEV_ANALOG_CALLBACK_MEMBER(sound_out_cb);
+
+	uint8_t m_sound_tie_on;
+	uint8_t m_sound_laser_on;
+
+	required_device<netlist_mame_logic_input_device> m_sound_size;
+	required_device<netlist_mame_logic_input_device> m_sound_explosion;
+	required_device<netlist_mame_logic_input_device> m_sound_tie;
+	required_device<netlist_mame_logic_input_device> m_sound_laser;
+	required_device<netlist_mame_logic_input_device> m_sound_track;
+	required_device<netlist_mame_logic_input_device> m_sound_lock;
+	required_device<netlist_mame_logic_input_device> m_sound_scanner;
+	required_device<netlist_mame_logic_input_device> m_sound_overheat;
+};
+
+class fireone_state : public starfire_base_state
+{
+public:
+	fireone_state(const machine_config &mconfig, device_type type, const char *tag)
+		: starfire_base_state(mconfig, type, tag)
+		, m_pit(*this, "pit")
+		, m_controls(*this, "P%u", 1U)
+		, m_sound_left_partial_hit(*this, "sound_nl:lshpht")
+		, m_sound_right_partial_hit(*this, "sound_nl:rshpht")
+		, m_sound_left_torpedo(*this, "sound_nl:ltorp")
+		, m_sound_right_torpedo(*this, "sound_nl:rtorp")
+		, m_sound_left_boom(*this, "sound_nl:lboom")
+		, m_sound_right_boom(*this, "sound_nl:rboom")
+		, m_sound_torpedo_collision(*this, "sound_nl:torpcoll")
+		, m_sound_submarine_engine(*this, "sound_nl:subeng")
+		, m_sound_alert(*this, "sound_nl:alert")
+		, m_sound_sonar_enable(*this, "sound_nl:sonar_enable")
+		, m_sound_sonar_sync(*this, "sound_nl:sonar_sync")
+		, m_sound_off_left(*this, "sound_nl:lsound_off")
+		, m_sound_off_right(*this, "sound_nl:rsound_off")
+		, m_music_a(*this, "sound_nl:music_a")
+		, m_music_b(*this, "sound_nl:music_b")
+		, m_music_c(*this, "sound_nl:music_c")
+	{ }
+
+	void fireone(machine_config &config);
 
 private:
-	required_shared_ptr<uint8_t> m_starfire_colorram;
-	required_shared_ptr<uint8_t> m_starfire_videoram;
-	optional_device<samples_device> m_samples;
-	optional_ioport m_nmi;
-
-	uint8_t m_prev_sound;
-	uint8_t m_fireone_select;
-
-	uint8_t m_starfire_vidctrl;
-	uint8_t m_starfire_vidctrl1;
-	uint8_t m_starfire_color;
-	uint16_t m_starfire_colors[STARFIRE_NUM_PENS];
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
 
-	read8sm_delegate m_input_read;
-	write8smo_delegate m_io2_write;
+	required_device<pit8253_device> m_pit;
+	required_ioport_array<2> m_controls;
 
-	emu_timer* m_scanline_timer;
-	bitmap_rgb32 m_starfire_screen;
+	DECLARE_WRITE_LINE_MEMBER(music_a_out_cb);
+	DECLARE_WRITE_LINE_MEMBER(music_b_out_cb);
+	DECLARE_WRITE_LINE_MEMBER(music_c_out_cb);
 
-	required_device<cpu_device> m_maincpu;
-	required_device<screen_device> m_screen;
+	virtual uint8_t input_r(offs_t offset) override;
+	virtual void sound_w(offs_t offset, uint8_t data) override;
+	virtual void music_w(offs_t offset, uint8_t data) override;
+
+	uint8_t m_player_select;
 
-	void starfire_scratch_w(offs_t offset, uint8_t data);
-	uint8_t starfire_scratch_r(offs_t offset);
-	uint8_t starfire_input_r(offs_t offset);
-	uint8_t fireone_input_r(offs_t offset);
-	void starfire_sound_w(uint8_t data);
-	void fireone_sound_w(uint8_t data);
-	void starfire_colorram_w(offs_t offset, uint8_t data);
-	uint8_t starfire_colorram_r(offs_t offset);
-	void starfire_videoram_w(offs_t offset, uint8_t data);
-	uint8_t starfire_videoram_r(offs_t offset);
-	virtual void video_start() override;
-	uint32_t screen_update_starfire(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-	TIMER_CALLBACK_MEMBER(starfire_scanline_callback);
 	INTERRUPT_GEN_MEMBER(vblank_int);
-	void get_pens(pen_t *pens);
 
-	void main_map(address_map &map);
+	required_device<netlist_mame_logic_input_device> m_sound_left_partial_hit;
+	required_device<netlist_mame_logic_input_device> m_sound_right_partial_hit;
+	required_device<netlist_mame_logic_input_device> m_sound_left_torpedo;
+	required_device<netlist_mame_logic_input_device> m_sound_right_torpedo;
+	required_device<netlist_mame_logic_input_device> m_sound_left_boom;
+	required_device<netlist_mame_logic_input_device> m_sound_right_boom;
+	required_device<netlist_mame_logic_input_device> m_sound_torpedo_collision;
+	required_device<netlist_mame_logic_input_device> m_sound_submarine_engine;
+	required_device<netlist_mame_logic_input_device> m_sound_alert;
+	required_device<netlist_mame_logic_input_device> m_sound_sonar_enable;
+	required_device<netlist_mame_logic_input_device> m_sound_sonar_sync;
+	required_device<netlist_mame_logic_input_device> m_sound_off_left;
+	required_device<netlist_mame_logic_input_device> m_sound_off_right;
+	required_device<netlist_mame_logic_input_device> m_music_a;
+	required_device<netlist_mame_logic_input_device> m_music_b;
+	required_device<netlist_mame_logic_input_device> m_music_c;
 };
 
 #endif // MAME_INCLUDES_STARFIRE_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/swtpc09.h mame-0.224+dfsg.1/src/mame/includes/swtpc09.h
--- mame-0.222+dfsg.1/src/mame/includes/swtpc09.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/swtpc09.h	2020-08-26 08:57:19.000000000 +0000
@@ -12,7 +12,6 @@
 #pragma once
 
 #include "cpu/m6809/m6809.h"
-#include "video/generic.h"
 #include "machine/wd_fdc.h"
 #include "imagedev/floppy.h"
 #include "machine/6840ptm.h"
diff -Nru mame-0.222+dfsg.1/src/mame/includes/system1.h mame-0.224+dfsg.1/src/mame/includes/system1.h
--- mame-0.222+dfsg.1/src/mame/includes/system1.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/system1.h	2020-08-26 08:57:19.000000000 +0000
@@ -59,6 +59,7 @@
 	void sys2(machine_config &config);
 	void sys2_315_5177(machine_config &config);
 	void nob(machine_config &config);
+	void blockgal(machine_config &config);
 	void sys1ppisx_315_5041(machine_config &config);
 	void sys1piox_315_5132(machine_config &config);
 	void sys1piox_315_5162(machine_config &config);
@@ -238,6 +239,7 @@
 	void nobo_map(address_map &map);
 	void sound_map(address_map &map);
 	void system1_map(address_map &map);
+	void blockgal_pio_io_map(address_map &map);
 	void system1_pio_io_map(address_map &map);
 	void system1_ppi_io_map(address_map &map);
 };
diff -Nru mame-0.222+dfsg.1/src/mame/includes/taito_l.h mame-0.224+dfsg.1/src/mame/includes/taito_l.h
--- mame-0.222+dfsg.1/src/mame/includes/taito_l.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/taito_l.h	2020-08-26 08:57:19.000000000 +0000
@@ -37,10 +37,7 @@
 protected:
 	/* misc */
 	int m_last_irq_level;
-	int m_main_high;
-
 	void irq_enable_w(u8 data);
-	void rombankswitch_w(u8 data);
 
 	void mcu_control_w(u8 data);
 	u8 mcu_control_r();
@@ -54,10 +51,10 @@
 	virtual void state_register();
 	virtual void taito_machine_reset();
 
-	required_device<cpu_device>                       m_main_cpu;
-	required_device<tc0090lvc_device>                 m_vdp;
-	optional_device<upd4701_device>                   m_upd4701;
-	required_memory_region                            m_main_prg;
+	required_device<cpu_device>       m_main_cpu;
+	required_device<tc0090lvc_device> m_vdp;
+	optional_device<upd4701_device>   m_upd4701;
+	required_memory_region            m_main_prg;
 };
 
 
@@ -104,7 +101,6 @@
 		, m_slave_prg(*this, "slave")
 		, m_slave_bnk(*this, "slavebank")
 		, m_slave_rombank(0)
-		, m_slave_high(0)
 	{
 	}
 
@@ -126,7 +122,6 @@
 	required_memory_bank        m_slave_bnk;
 
 	u8  m_slave_rombank;
-	u8  m_slave_high;
 };
 
 
@@ -199,7 +194,6 @@
 	virtual void state_register() override;
 	virtual void taito_machine_reset() override;
 
-	void cachat_map(address_map &map);
 	void palamed_map(address_map &map);
 	void plotting_map(address_map &map);
 	void puzznic_map(address_map &map);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/tankbatt.h mame-0.224+dfsg.1/src/mame/includes/tankbatt.h
--- mame-0.222+dfsg.1/src/mame/includes/tankbatt.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/tankbatt.h	2020-08-26 08:57:19.000000000 +0000
@@ -5,7 +5,12 @@
 
 #pragma once
 
-#include "sound/samples.h"
+#include "machine/timer.h"
+#include "machine/netlist.h"
+
+#include "netlist/nl_setup.h"
+#include "audio/nl_tankbatt.h"
+
 #include "emupal.h"
 #include "tilemap.h"
 
@@ -15,44 +20,52 @@
 	tankbatt_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
 		m_maincpu(*this, "maincpu"),
-		m_samples(*this, "samples"),
 		m_gfxdecode(*this, "gfxdecode"),
 		m_palette(*this, "palette"),
 		m_bulletsram(*this, "bulletsram"),
-		m_videoram(*this, "videoram")
+		m_videoram(*this, "videoram"),
+		m_player_input(*this, "P%u", 1U),
+		m_dips(*this, "DSW"),
+		m_sound_s1(*this, "sound_nl:s1"),
+		m_sound_s2(*this, "sound_nl:s2"),
+		m_sound_off(*this, "sound_nl:off"),
+		m_sound_engine_hi(*this, "sound_nl:engine_hi"),
+		m_sound_shoot(*this, "sound_nl:shoot"),
+		m_sound_hit(*this, "sound_nl:hit")
 	{ }
 
 	void tankbatt(machine_config &config);
 
-	DECLARE_INPUT_CHANGED_MEMBER(coin_inserted);
-
 private:
 	required_device<cpu_device> m_maincpu;
-	required_device<samples_device> m_samples;
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_device<palette_device> m_palette;
 
 	required_shared_ptr<uint8_t> m_bulletsram;
 	required_shared_ptr<uint8_t> m_videoram;
 
-	int m_nmi_enable;
+	required_ioport_array<2> m_player_input;
+	required_ioport m_dips;
+
+	required_device<netlist_mame_logic_input_device> m_sound_s1;
+	required_device<netlist_mame_logic_input_device> m_sound_s2;
+	required_device<netlist_mame_logic_input_device> m_sound_off;
+	required_device<netlist_mame_logic_input_device> m_sound_engine_hi;
+	required_device<netlist_mame_logic_input_device> m_sound_shoot;
+	required_device<netlist_mame_logic_input_device> m_sound_hit;
+
 	int m_sound_enable;
 	tilemap_t *m_bg_tilemap;
 
 	uint8_t in0_r(offs_t offset);
 	uint8_t in1_r(offs_t offset);
 	uint8_t dsw_r(offs_t offset);
-	DECLARE_WRITE_LINE_MEMBER(interrupt_enable_w);
-	DECLARE_WRITE_LINE_MEMBER(demo_interrupt_enable_w);
-	DECLARE_WRITE_LINE_MEMBER(sh_expl_w);
-	DECLARE_WRITE_LINE_MEMBER(sh_engine_w);
-	DECLARE_WRITE_LINE_MEMBER(sh_fire_w);
-	void irq_ack_w(uint8_t data);
-	DECLARE_WRITE_LINE_MEMBER(coincounter_w);
-	DECLARE_WRITE_LINE_MEMBER(coinlockout_w);
+	void intack_w(uint8_t data);
+	void coincounter_w(int state);
+	void coinlockout_w(int state);
 	void videoram_w(offs_t offset, uint8_t data);
 
-	INTERRUPT_GEN_MEMBER(interrupt);
+	TIMER_DEVICE_CALLBACK_MEMBER(scanline_interrupt);
 
 	TILE_GET_INFO_MEMBER(get_bg_tile_info);
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/tigeroad.h mame-0.224+dfsg.1/src/mame/includes/tigeroad.h
--- mame-0.222+dfsg.1/src/mame/includes/tigeroad.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/tigeroad.h	2020-08-26 08:57:19.000000000 +0000
@@ -8,8 +8,6 @@
 #include "cpu/z80/z80.h"
 #include "cpu/mcs51/mcs51.h"
 
-#include "machine/gen_latch.h"
-
 #include "sound/2203intf.h"
 #include "sound/msm5205.h"
 
@@ -24,17 +22,15 @@
 public:
 	tigeroad_state(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_palette(*this, "palette")
+		, m_has_coinlock(true)
 		, m_spriteram(*this, "spriteram")
 		, m_videoram(*this, "videoram")
-		, m_ram16(*this, "ram16")
-		, m_maincpu(*this, "maincpu")
 		, m_audiocpu(*this, "audiocpu")
 		, m_msm(*this, "msm")
 		, m_gfxdecode(*this, "gfxdecode")
-		, m_palette(*this, "palette")
 		, m_spritegen(*this, "spritegen")
-		, m_soundlatch(*this, "soundlatch")
-		, m_has_coinlock(true)
 	{ }
 
 	void toramich(machine_config &config);
@@ -42,39 +38,43 @@
 	void f1dream_comad(machine_config &config);
 
 protected:
-	required_device<buffered_spriteram16_device> m_spriteram;
-	required_shared_ptr<uint16_t> m_videoram;
-	required_shared_ptr<uint16_t> m_ram16;
-	int m_bgcharbank;
-	tilemap_t *m_bg_tilemap;
-	tilemap_t *m_fg_tilemap;
-	void tigeroad_soundcmd_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void tigeroad_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void tigeroad_videoctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void tigeroad_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void msm5205_w(uint8_t data);
-	TILE_GET_INFO_MEMBER(get_bg_tile_info);
-	TILE_GET_INFO_MEMBER(get_fg_tile_info);
-	TILEMAP_MAPPER_MEMBER(tigeroad_tilemap_scan);
-	virtual void video_start() override;
-	uint32_t screen_update_tigeroad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	required_device<cpu_device> m_maincpu;
+	required_device<palette_device> m_palette;
+
+	void soundcmd_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+	void videoram_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+	void videoctrl_w(u8 data);
+	void scroll_w(offs_t offset, u16 data, u16 mem_mask = ~0);
+
+	void main_map(address_map &map);
+	// misc
+	bool m_has_coinlock;
+
+private:
+	required_device<buffered_spriteram16_device> m_spriteram;
+	required_shared_ptr<u16> m_videoram;
 	required_device<cpu_device> m_audiocpu;
 	optional_device<msm5205_device> m_msm;
 	required_device<gfxdecode_device> m_gfxdecode;
-	required_device<palette_device> m_palette;
 	required_device<tigeroad_spr_device> m_spritegen;
-	required_device<generic_latch_8_device> m_soundlatch;
+
+	u8 m_bgcharbank;
+	tilemap_t *m_bg_tilemap;
+	tilemap_t *m_fg_tilemap;
 
 	void comad_sound_io_map(address_map &map);
 	void comad_sound_map(address_map &map);
-	void main_map(address_map &map);
 	void sample_map(address_map &map);
 	void sample_port_map(address_map &map);
 	void sound_map(address_map &map);
 	void sound_port_map(address_map &map);
-	/* misc */
-	bool m_has_coinlock;
+
+	void msm5205_w(u8 data);
+	TILE_GET_INFO_MEMBER(get_bg_tile_info);
+	TILE_GET_INFO_MEMBER(get_fg_tile_info);
+	TILEMAP_MAPPER_MEMBER(tigeroad_tilemap_scan);
+	virtual void video_start() override;
+	u32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 };
 
 
@@ -97,20 +97,21 @@
 	void pushman(machine_config &config);
 	void bballs(machine_config &config);
 
+protected:
+	virtual void machine_start() override;
+
 private:
-	uint16_t mcu_comm_r(offs_t offset, uint16_t mem_mask = ~0);
-	void pushman_mcu_comm_w(offs_t offset, uint16_t data);
-	void bballs_mcu_comm_w(uint16_t data);
-
-	void mcu_pa_w(uint8_t data);
-	void mcu_pb_w(uint8_t data);
-	void mcu_pc_w(uint8_t data);
+	u16 mcu_comm_r(offs_t offset, u16 mem_mask = ~0);
+	void pushman_mcu_comm_w(offs_t offset, u16 data);
+	void bballs_mcu_comm_w(u16 data);
+
+	void mcu_pa_w(u8 data);
+	void mcu_pb_w(u8 data);
+	void mcu_pc_w(u8 data);
 
 	void bballs_map(address_map &map);
 	void pushman_map(address_map &map);
 
-	virtual void machine_start() override;
-
 	required_device<m68705u_device> m_mcu;
 
 	bool    m_host_semaphore, m_mcu_semaphore;
@@ -125,23 +126,28 @@
 	f1dream_state(const machine_config &mconfig, device_type type, const char *tag)
 		: tigeroad_state(mconfig, type, tag)
 		, m_mcu(*this, "mcu")
+		, m_ram16(*this, "ram16")
 		, m_old_p3(0xff)
 	{
 	}
 
 	void f1dream(machine_config &config);
 
+protected:
+	virtual void machine_start() override;
+
 private:
 	void f1dream_map(address_map &map);
 	void f1dream_mcu_io(address_map &map);
 
-	void out3_w(uint8_t data);
+	void out3_w(u8 data);
 
-	uint8_t mcu_shared_r(offs_t offset);
-	void mcu_shared_w(offs_t offset, uint8_t data);
+	u8 mcu_shared_r(offs_t offset);
+	void mcu_shared_w(offs_t offset, u8 data);
 
-	void blktiger_to_mcu_w(uint16_t data);
+	void to_mcu_w(u16 data);
 
 	required_device<i8751_device> m_mcu;
-	uint8_t m_old_p3;
+	required_shared_ptr<u16> m_ram16;
+	u8 m_old_p3;
 };
diff -Nru mame-0.222+dfsg.1/src/mame/includes/truco.h mame-0.224+dfsg.1/src/mame/includes/truco.h
--- mame-0.222+dfsg.1/src/mame/includes/truco.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/truco.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,5 +1,6 @@
 // license:BSD-3-Clause
 // copyright-holders:Ernesto Corvi, Roberto Fresca
+
 #ifndef MAME_INCLUDES_TRUCO_H
 #define MAME_INCLUDES_TRUCO_H
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/ut88.h mame-0.224+dfsg.1/src/mame/includes/ut88.h
--- mame-0.222+dfsg.1/src/mame/includes/ut88.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/ut88.h	2020-08-26 08:57:19.000000000 +0000
@@ -16,40 +16,39 @@
 #include "imagedev/cassette.h"
 #include "emupal.h"
 
-class ut88_base_state : public driver_device
+class ut88_common : public driver_device
 {
 public:
-	ut88_base_state(const machine_config &mconfig, device_type type, const char *tag)
+	ut88_common(const machine_config &mconfig, device_type type, const char *tag)
 		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
 		, m_cassette(*this, "cassette")
-		, m_region_maincpu(*this, "maincpu")
 		, m_io_line0(*this, "LINE0")
 		, m_io_line1(*this, "LINE1")
 		, m_io_line2(*this, "LINE2")
-		, m_maincpu(*this, "maincpu")
 	{
 	}
 
 protected:
 	uint8_t tape_r();
 
+	required_device<cpu_device> m_maincpu;
 	required_device<cassette_image_device> m_cassette;
-	required_memory_region m_region_maincpu;
 	required_ioport m_io_line0;
 	required_ioport m_io_line1;
 	required_ioport m_io_line2;
-	required_device<cpu_device> m_maincpu;
 };
 
-class ut88_state : public ut88_base_state
+class ut88_state : public ut88_common
 {
 public:
 	ut88_state(const machine_config &mconfig, device_type type, const char *tag)
-		: ut88_base_state(mconfig, type, tag)
-		, m_ppi(*this, "ppi8255")
+		: ut88_common(mconfig, type, tag)
+		, m_ppi(*this, "ppi")
 		, m_dac(*this, "dac")
-		, m_p_videoram(*this, "videoram")
-		, m_bank1(*this, "bank1")
+		, m_vram(*this, "videoram")
+		, m_rom(*this, "maincpu")
+		, m_ram(*this, "mainram")
 		, m_io_line3(*this, "LINE3")
 		, m_io_line4(*this, "LINE4")
 		, m_io_line5(*this, "LINE5")
@@ -63,16 +62,8 @@
 	void ut88(machine_config &config);
 
 private:
-	virtual void driver_init() override;
-	virtual void machine_reset() override;
-	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
-
-	enum
-	{
-		TIMER_RESET,
-		TIMER_UPDATE_DISPLAY
-	};
-
+	void machine_start() override;
+	void machine_reset() override;
 	uint8_t keyboard_r(offs_t offset);
 	void keyboard_w(offs_t offset, uint8_t data);
 	void sound_w(uint8_t data);
@@ -87,10 +78,12 @@
 
 	int m_keyboard_mask;
 
+	memory_passthrough_handler *m_rom_shadow_tap;
 	required_device<i8255_device> m_ppi;
 	required_device<dac_bit_interface> m_dac;
-	required_shared_ptr<uint8_t> m_p_videoram;
-	required_memory_bank m_bank1;
+	required_shared_ptr<uint8_t> m_vram;
+	required_region_ptr<u8> m_rom;
+	required_shared_ptr<u8> m_ram;
 	required_ioport m_io_line3;
 	required_ioport m_io_line4;
 	required_ioport m_io_line5;
@@ -101,20 +94,20 @@
 	required_device<palette_device> m_palette;
 };
 
-class ut88mini_state : public ut88_base_state
+class ut88mini_state : public ut88_common
 {
 public:
 	ut88mini_state(const machine_config &mconfig, device_type type, const char *tag)
-		: ut88_base_state(mconfig, type, tag)
-		, m_region_proms(*this, "proms")
+		: ut88_common(mconfig, type, tag)
+		, m_proms(*this, "proms")
 		, m_digits(*this, "digit%u", 0U)
 	{ }
 
 	void ut88mini(machine_config &config);
 
 private:
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
+	void machine_start() override;
+	void machine_reset() override;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
 	void io_map(address_map &map);
@@ -122,22 +115,17 @@
 
 	enum
 	{
-		TIMER_RESET,
 		TIMER_UPDATE_DISPLAY
 	};
 
 	uint8_t keyboard_r();
 	void led_w(offs_t offset, uint8_t data);
 
-	required_memory_region m_region_proms;
+	required_memory_region m_proms;
 
 	int m_lcd_digit[6];
 	output_finder<6> m_digits;
 };
 
-/*----------- defined in video/ut88.c -----------*/
-
-extern const gfx_layout ut88_charlayout;
-
 
 #endif // MAME_INCLUDES_UT88_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/vaportra.h mame-0.224+dfsg.1/src/mame/includes/vaportra.h
--- mame-0.222+dfsg.1/src/mame/includes/vaportra.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/vaportra.h	2020-08-26 08:57:19.000000000 +0000
@@ -57,7 +57,7 @@
 
 	uint8_t irq6_ack_r();
 	void irq6_ack_w(uint8_t data);
-	void priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);;
+	void priority_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	void palette_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	void palette_ext_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/vector06.h mame-0.224+dfsg.1/src/mame/includes/vector06.h
--- mame-0.222+dfsg.1/src/mame/includes/vector06.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/vector06.h	2020-08-26 08:57:19.000000000 +0000
@@ -32,61 +32,61 @@
 class vector06_state : public driver_device
 {
 public:
-	vector06_state(const machine_config &mconfig, device_type type, const char *tag) :
-		driver_device(mconfig, type, tag),
-		m_maincpu(*this, "maincpu"),
-		m_speaker(*this, "speaker"),
-		m_cassette(*this, "cassette"),
-		m_cart(*this, "cartslot"),
-		m_fdc(*this, "wd1793"),
-		m_floppy0(*this, "wd1793:0"),
-		m_floppy1(*this, "wd1793:1"),
-		m_ay(*this, "aysnd"),
-		m_ram(*this, RAM_TAG),
-		m_palette(*this, "palette"),
-		m_screen(*this, "screen"),
-		m_ppi8255(*this, "ppi8255"),
-		m_ppi8255_2(*this, "ppi8255_2"),
-		m_pit8253(*this, "pit8253"),
-		m_bank1(*this, "bank1"),
-		m_bank2(*this, "bank2"),
-		m_bank3(*this, "bank3"),
-		m_region_maincpu(*this, "maincpu"),
-		m_line(*this, "LINE.%u", 0),
-		m_reset(*this, "RESET")
+	vector06_state(const machine_config &mconfig, device_type type, const char *tag)
+		: driver_device(mconfig, type, tag)
+		, m_maincpu(*this, "maincpu")
+		, m_rom(*this, "maincpu")
+		, m_speaker(*this, "speaker")
+		, m_cassette(*this, "cassette")
+		, m_cart(*this, "cartslot")
+		, m_fdc(*this, "fdc")
+		, m_floppy0(*this, "fdc:0")
+		, m_floppy1(*this, "fdc:1")
+		, m_ay(*this, "aysnd")
+		, m_ram(*this, RAM_TAG)
+		, m_palette(*this, "palette")
+		, m_screen(*this, "screen")
+		, m_ppi1(*this, "ppi1")
+		, m_ppi2(*this, "ppi2")
+		, m_pit(*this, "pit")
+		, m_bank1(*this, "bank1")
+		, m_bank2(*this, "bank2")
+		, m_bank3(*this, "bank3")
+		, m_io_keyboard(*this, "LINE.%u", 0U)
+		, m_io_reset(*this, "RESET")
 	{ }
 
 	void vector06(machine_config &config);
+	DECLARE_INPUT_CHANGED_MEMBER(f11_button);
+	DECLARE_INPUT_CHANGED_MEMBER(f12_button);
 
 private:
 	DECLARE_FLOPPY_FORMATS(floppy_formats);
 
-	uint8_t vector06_8255_portb_r();
-	uint8_t vector06_8255_portc_r();
-	void vector06_8255_porta_w(uint8_t data);
-	void vector06_8255_portb_w(uint8_t data);
-	void vector06_color_set(uint8_t data);
-	uint8_t vector06_romdisk_portb_r();
-	void vector06_romdisk_portb_w(uint8_t data);
-	void vector06_romdisk_porta_w(uint8_t data);
-	void vector06_romdisk_portc_w(uint8_t data);
-	void vector06_disc_w(uint8_t data);
-	void vector06_status_callback(uint8_t data);
-	void vector06_ramdisk_w(uint8_t data);
+	uint8_t ppi1_portb_r();
+	uint8_t ppi1_portc_r();
+	void ppi1_porta_w(uint8_t data);
+	void ppi1_portb_w(uint8_t data);
+	void color_set(uint8_t data);
+	uint8_t ppi2_portb_r();
+	void ppi2_portb_w(uint8_t data);
+	void ppi2_porta_w(uint8_t data);
+	void ppi2_portc_w(uint8_t data);
+	void disc_w(uint8_t data);
+	void status_callback(uint8_t data);
+	void ramdisk_w(uint8_t data);
 	DECLARE_WRITE_LINE_MEMBER(speaker_w);
-	void vector06_set_video_mode(int width);
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-	virtual void video_start() override;
-	uint32_t screen_update_vector06(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	INTERRUPT_GEN_MEMBER(vector06_interrupt);
-	TIMER_CALLBACK_MEMBER(reset_check_callback);
-	IRQ_CALLBACK_MEMBER(vector06_irq_callback);
+	void machine_start() override;
+	void machine_reset() override;
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
+	IRQ_CALLBACK_MEMBER(irq_callback);
+	void update_mem();
 
-	void vector06_io(address_map &map);
-	void vector06_mem(address_map &map);
+	void io_map(address_map &map);
+	void mem_map(address_map &map);
 
 	required_device<i8080_cpu_device> m_maincpu;
+	required_region_ptr<u8> m_rom;
 	required_device<speaker_sound_device> m_speaker;
 	required_device<cassette_image_device> m_cassette;
 	required_device<generic_slot_device> m_cart;
@@ -97,28 +97,24 @@
 	required_device<ram_device> m_ram;
 	required_device<palette_device> m_palette;
 	required_device<screen_device> m_screen;
-	required_device<i8255_device> m_ppi8255, m_ppi8255_2;
-	required_device<pit8253_device> m_pit8253;
+	required_device<i8255_device> m_ppi1, m_ppi2;
+	required_device<pit8253_device> m_pit;
 	required_memory_bank m_bank1;
 	required_memory_bank m_bank2;
 	required_memory_bank m_bank3;
-	required_memory_region m_region_maincpu;
-	required_ioport_array<9> m_line;
-	required_ioport m_reset;
+	required_ioport_array<9> m_io_keyboard;
+	required_ioport m_io_reset;
 
 	uint8_t m_keyboard_mask;
 	uint8_t m_color_index;
-	uint8_t m_video_mode;
 	uint8_t m_romdisk_msb;
 	uint8_t m_romdisk_lsb;
 	uint8_t m_vblank_state;
 	uint8_t m_rambank;
 	uint8_t m_aylatch;
+	bool m_video_mode;
 	bool m_stack_state;
 	bool m_romen;
-	emu_timer *m_reset_check_timer;
-
-	void update_mem();
 };
 
 #endif // MAME_INCLUDES_VECTOR06_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/volfied.h mame-0.224+dfsg.1/src/mame/includes/volfied.h
--- mame-0.222+dfsg.1/src/mame/includes/volfied.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/volfied.h	2020-08-26 08:57:19.000000000 +0000
@@ -42,10 +42,10 @@
 
 private:
 	uint16_t video_ram_r(offs_t offset);
-	void video_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);;
-	void video_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);;
+	void video_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+	void video_ctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	uint16_t video_ctrl_r();
-	void video_mask_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);;
+	void video_mask_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
 	void counters_w(uint8_t data);
 	void volfied_colpri_cb(u32 &sprite_colbank, u32 &pri_mask, u16 sprite_ctrl);
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
diff -Nru mame-0.222+dfsg.1/src/mame/includes/vsmile.h mame-0.224+dfsg.1/src/mame/includes/vsmile.h
--- mame-0.222+dfsg.1/src/mame/includes/vsmile.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/vsmile.h	2020-08-26 08:57:19.000000000 +0000
@@ -68,6 +68,10 @@
 		: vsmile_base_state(mconfig, type, tag)
 		, m_ctrl(*this, "ctrl%u", 1U)
 		, m_dsw_region(*this, "REGION")
+		, m_redled(*this, "redled%u", 1U)
+		, m_yellowled(*this, "yellowled%u", 1U)
+		, m_blueled(*this, "blueled%u", 1U)
+		, m_greenled(*this, "greenled%u", 1U)
 	{ }
 
 	void vsmile(machine_config &config);
@@ -110,6 +114,11 @@
 	required_device_array<vsmile_ctrl_port_device, 2> m_ctrl;
 	required_ioport m_dsw_region;
 
+	output_finder<2> m_redled;
+	output_finder<2> m_yellowled;
+	output_finder<2> m_blueled;
+	output_finder<2> m_greenled;
+
 	bool m_ctrl_rts[2];
 	bool m_ctrl_select[2];
 };
diff -Nru mame-0.222+dfsg.1/src/mame/includes/vtech2.h mame-0.224+dfsg.1/src/mame/includes/vtech2.h
--- mame-0.222+dfsg.1/src/mame/includes/vtech2.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/vtech2.h	2020-08-26 08:57:19.000000000 +0000
@@ -33,7 +33,7 @@
 		, m_laser_file(*this, "floppy%u", 0U)
 		, m_gfxdecode(*this, "gfxdecode")
 		, m_palette(*this, "palette")
-		, m_videoram(*this, "videoram")
+		, m_vram(*this, "videoram")
 		, m_io_keyboard(*this, {"ROW0", "ROW1", "ROW2", "ROW3", "ROW4", "ROW5", "ROW6", "ROW7", "ROWD", "ROWC", "ROWB", "ROWA"})
 		, m_banka(*this, "banka")
 		, m_bankb(*this, "bankb")
@@ -52,6 +52,7 @@
 
 protected:
 	virtual void machine_reset() override;
+	virtual void machine_start() override;
 
 private:
 	void laser_fdc_w(offs_t offset, uint8_t data);
@@ -59,8 +60,7 @@
 	void laser_two_color_w(uint8_t data);
 	uint8_t laser_fdc_r(offs_t offset);
 	void vtech2_palette(palette_device &palette) const;
-	uint32_t screen_update_laser(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
-	INTERRUPT_GEN_MEMBER(vtech2_interrupt);
+	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	void mmio_w(uint8_t data);
 	uint8_t mmio_r(offs_t offset);
 	uint8_t cart_r(offs_t offset);
@@ -75,6 +75,8 @@
 	void m_map500(address_map &map);
 	void m_map700(address_map &map);
 
+	void init_waitstates();
+
 	required_device<cpu_device> m_maincpu;
 	required_device<speaker_sound_device> m_speaker;
 	required_device<cassette_image_device> m_cassette;
@@ -82,7 +84,7 @@
 	optional_device_array<legacy_floppy_image_device, 2> m_laser_file;
 	required_device<gfxdecode_device> m_gfxdecode;
 	required_device<palette_device> m_palette;
-	optional_shared_ptr<u8> m_videoram;
+	optional_shared_ptr<u8> m_vram;
 	required_ioport_array<12> m_io_keyboard;
 	required_device<address_map_bank_device> m_banka;
 	required_device<address_map_bank_device> m_bankb;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/xavix_2000.h mame-0.224+dfsg.1/src/mame/includes/xavix_2000.h
--- mame-0.222+dfsg.1/src/mame/includes/xavix_2000.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/xavix_2000.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,27 @@
+// license:BSD-3-Clause
+// copyright-holders:David Haywood
+#ifndef MAME_INCLUDES_XAVIX_2000_H
+#define MAME_INCLUDES_XAVIX_2000_H
+
+#include "xavix.h"
+
+
+class xavix_2000_nv_sdb_state : public xavix_state
+{
+public:
+	xavix_2000_nv_sdb_state(const machine_config &mconfig, device_type type, const char *tag)
+		: xavix_state(mconfig, type, tag)
+	{ }
+
+	void xavix2000_nv_sdb(machine_config &config);
+
+protected:
+
+private:
+	uint8_t sdb_anport0_r() { return m_mouse0x->read()^0x7f; }
+	uint8_t sdb_anport1_r() { return m_mouse0y->read()^0x7f; }
+	uint8_t sdb_anport2_r() { return m_mouse1x->read()^0x7f; }
+	uint8_t sdb_anport3_r() { return m_mouse1y->read()^0x7f; }
+};
+
+#endif // MAME_INCLUDES_XAVIX_2000_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/xavix_2002.h mame-0.224+dfsg.1/src/mame/includes/xavix_2002.h
--- mame-0.222+dfsg.1/src/mame/includes/xavix_2002.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/xavix_2002.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,55 @@
+// license:BSD-3-Clause
+// copyright-holders:David Haywood
+#ifndef MAME_INCLUDES_XAVIX_2002_H
+#define MAME_INCLUDES_XAVIX_2002_H
+
+#include "xavix_2000.h"
+
+class xavix_i2c_jmat_state : public xavix_i2c_state
+{
+public:
+	xavix_i2c_jmat_state(const machine_config &mconfig, device_type type, const char *tag)
+		: xavix_i2c_state(mconfig, type, tag)
+	{ }
+
+	void xavix2002_i2c_jmat(machine_config &config);
+
+private:
+	uint8_t read_extended_io0();
+	uint8_t read_extended_io1();
+	uint8_t read_extended_io2();
+	void write_extended_io0(uint8_t data);
+	void write_extended_io1(uint8_t data);
+	void write_extended_io2(uint8_t data);
+};
+
+class xavix2002_superpttv_state : public xavix_state
+{
+public:
+	xavix2002_superpttv_state(const machine_config &mconfig, device_type type, const char *tag)
+		: xavix_state(mconfig, type, tag)
+	{ }
+
+	void xavix2002_superpctv(machine_config &config);
+
+private:
+	uint8_t read_extended_io0() { return 0x00; };
+	uint8_t read_extended_io1() { return 0x00; };
+	uint8_t read_extended_io2() { return 0x00; };
+	//void write_extended_io0(uint8_t data);
+	//void write_extended_io1(uint8_t data);
+	//void write_extended_io2(uint8_t data);
+};
+
+class xavix_i2c_bowl_state : public xavix_i2c_state
+{
+public:
+	xavix_i2c_bowl_state(const machine_config &mconfig, device_type type, const char *tag)
+		: xavix_i2c_state(mconfig, type, tag)
+	{ }
+
+	DECLARE_READ_LINE_MEMBER(camera_r);
+};
+
+
+#endif // MAME_INCLUDES_XAVIX_2002_H
diff -Nru mame-0.222+dfsg.1/src/mame/includes/xavix.h mame-0.224+dfsg.1/src/mame/includes/xavix.h
--- mame-0.222+dfsg.1/src/mame/includes/xavix.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/xavix.h	2020-08-26 08:57:19.000000000 +0000
@@ -24,6 +24,12 @@
 #include "machine/xavix_anport.h"
 #include "machine/xavix_math.h"
 
+// NTSC clock for regular XaviX?
+#define MAIN_CLOCK XTAL(21'477'272)
+// some games (eg Radica Opus) run off a 3.579545MHz XTAL ( same as the above /6 ) so presumably there is a divider / multiplier circuit on some PCBs?
+// TODO: what's the PAL clock?
+
+
 class xavix_sound_device : public device_t, public device_sound_interface
 {
 public:
@@ -596,26 +602,6 @@
 };
 
 
-class xavix_2000_nv_sdb_state : public xavix_state
-{
-public:
-	xavix_2000_nv_sdb_state(const machine_config &mconfig, device_type type, const char *tag)
-		: xavix_state(mconfig, type, tag)
-	{ }
-
-	void xavix2000_nv_sdb(machine_config &config);
-
-protected:
-
-private:
-	uint8_t sdb_anport0_r() { return m_mouse0x->read()^0x7f; }
-	uint8_t sdb_anport1_r() { return m_mouse0y->read()^0x7f; }
-	uint8_t sdb_anport2_r() { return m_mouse1x->read()^0x7f; }
-	uint8_t sdb_anport3_r() { return m_mouse1y->read()^0x7f; }
-
-};
-
-
 class xavix_i2c_state : public xavix_state
 {
 public:
@@ -673,24 +659,6 @@
 };
 
 
-class xavix_i2c_jmat_state : public xavix_i2c_state
-{
-public:
-	xavix_i2c_jmat_state(const machine_config &mconfig, device_type type, const char *tag)
-		: xavix_i2c_state(mconfig, type, tag)
-	{ }
-
-	void xavix2002_i2c_jmat(machine_config &config);
-
-private:
-	uint8_t read_extended_io0();
-	uint8_t read_extended_io1();
-	uint8_t read_extended_io2();
-	void write_extended_io0(uint8_t data);
-	void write_extended_io1(uint8_t data);
-	void write_extended_io2(uint8_t data);
-};
-
 
 class xavix_i2c_lotr_state : public xavix_i2c_state
 {
@@ -705,15 +673,6 @@
 	//virtual void write_io1(uint8_t data, uint8_t direction) override;
 };
 
-class xavix_i2c_bowl_state : public xavix_i2c_state
-{
-public:
-	xavix_i2c_bowl_state(const machine_config &mconfig, device_type type, const char *tag)
-		: xavix_i2c_state(mconfig, type, tag)
-	{ }
-
-	DECLARE_READ_LINE_MEMBER(camera_r);
-};
 
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/xbox_usb.h mame-0.224+dfsg.1/src/mame/includes/xbox_usb.h
--- mame-0.222+dfsg.1/src/mame/includes/xbox_usb.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/xbox_usb.h	2020-08-26 08:57:19.000000000 +0000
@@ -6,6 +6,9 @@
 #pragma once
 
 #include <forward_list>
+#include <functional>
+#include <memory>
+
 
 struct OHCIEndpointDescriptor {
 	int mps; // MaximumPacketSize
diff -Nru mame-0.222+dfsg.1/src/mame/includes/xmen.h mame-0.224+dfsg.1/src/mame/includes/xmen.h
--- mame-0.222+dfsg.1/src/mame/includes/xmen.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/xmen.h	2020-08-26 08:57:19.000000000 +0000
@@ -20,10 +20,8 @@
 public:
 	xmen_state(const machine_config &mconfig, device_type type, const char *tag) :
 		driver_device(mconfig, type, tag),
-		m_xmen6p_spriteramleft(*this, "spriteramleft"),
-		m_xmen6p_spriteramright(*this, "spriteramright"),
-		m_xmen6p_tilemapleft(*this, "tilemapleft"),
-		m_xmen6p_tilemapright(*this, "tilemapright"),
+		m_xmen6p_spriteram(*this, "spriteram%u", 0),
+		m_xmen6p_tilemap(*this, "tilemap%u", 0),
 		m_maincpu(*this, "maincpu"),
 		m_audiocpu(*this, "audiocpu"),
 		m_k054539(*this, "k054539"),
@@ -49,14 +47,13 @@
 	/* for xmen6p */
 	std::unique_ptr<bitmap_ind16> m_screen_right;
 	std::unique_ptr<bitmap_ind16> m_screen_left;
-	optional_shared_ptr<uint16_t> m_xmen6p_spriteramleft;
-	optional_shared_ptr<uint16_t> m_xmen6p_spriteramright;
-	optional_shared_ptr<uint16_t> m_xmen6p_tilemapleft;
-	optional_shared_ptr<uint16_t> m_xmen6p_tilemapright;
-	uint16_t *   m_k053247_ram;
+	optional_shared_ptr_array<uint16_t, 2> m_xmen6p_spriteram;
+	optional_shared_ptr_array<uint16_t, 4> m_xmen6p_tilemap;
+	uint16_t * m_k053247_ram;
+	bool       m_xmen6p_tilemap_select;
 
 	/* misc */
-	uint8_t       m_vblank_irq_mask;
+	uint8_t    m_vblank_irq_mask;
 
 	/* devices */
 	required_device<cpu_device> m_maincpu;
diff -Nru mame-0.222+dfsg.1/src/mame/includes/z80ne.h mame-0.224+dfsg.1/src/mame/includes/z80ne.h
--- mame-0.222+dfsg.1/src/mame/includes/z80ne.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/z80ne.h	2020-08-26 08:57:19.000000000 +0000
@@ -69,11 +69,10 @@
 		: driver_device(mconfig, type, tag),
 		m_uart(*this, "uart"),
 		m_uart_clock(*this, "uart_clock"),
-		m_maincpu(*this, "z80ne"),
+		m_maincpu(*this, "maincpu"),
 		m_cassette1(*this, "cassette"),
 		m_cassette2(*this, "cassette2"),
 		m_ram(*this, RAM_TAG),
-		m_region_z80ne(*this, "z80ne"),
 		m_bank1(*this, "bank1"),
 		m_bank2(*this, "bank2"),
 		m_bank3(*this, "bank3"),
@@ -84,24 +83,24 @@
 		m_io_rst(*this, "RST"),
 		m_io_lx_385(*this, "LX.385"),
 		m_lx383_digits(*this, "digit%u", 0U)
-	{
-	}
+		, m_rom(*this, "maincpu")
+		, m_mram(*this, "mainram")
+	{ }
 
 	void z80ne(machine_config &config);
+	void init_z80ne();
 
 	DECLARE_INPUT_CHANGED_MEMBER(z80ne_reset);
 
 protected:
 	virtual void machine_start() override;
 	virtual void machine_reset() override;
-	virtual void driver_init() override;
 
 	void base_reset();
+	void save_state_vars();
 
 	DECLARE_FLOPPY_FORMATS(floppy_formats);
 
-	required_device<ay31015_device> m_uart;
-	required_device<clock_device> m_uart_clock;
 	uint8_t m_lx383_scan_counter;
 	uint8_t m_lx383_key[LX383_KEYS];
 	int m_lx383_downsampler;
@@ -121,11 +120,13 @@
 
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
+	memory_passthrough_handler *m_rom_shadow_tap;
+	required_device<ay31015_device> m_uart;
+	required_device<clock_device> m_uart_clock;
 	required_device<cpu_device> m_maincpu;
 	required_device<cassette_image_device> m_cassette1;
 	required_device<cassette_image_device> m_cassette2;
-	required_device<ram_device> m_ram;
-	required_memory_region m_region_z80ne;
+	optional_device<ram_device> m_ram;
 	optional_memory_bank m_bank1;
 	optional_memory_bank m_bank2;
 	optional_memory_bank m_bank3;
@@ -136,16 +137,16 @@
 	required_ioport m_io_rst;
 	required_ioport m_io_lx_385;
 	output_finder<8> m_lx383_digits;
+	required_region_ptr<u8> m_rom;
+	optional_shared_ptr<u8> m_mram;
 
 	emu_timer *m_timer_nmi;
-	emu_timer *m_timer_reset;
 
 	cassette_image_device *cassette_device_image();
-	void reset_lx382_banking();
 
 private:
-	void main_mem(address_map &map);
-	void main_io(address_map &map);
+	void mem_map(address_map &map);
+	void io_map(address_map &map);
 };
 
 class z80net_state : public z80ne_state
@@ -168,7 +169,6 @@
 
 protected:
 	virtual void machine_reset() override;
-	virtual void driver_init() override;
 
 	DECLARE_READ_LINE_MEMBER(lx387_shift_r);
 	DECLARE_READ_LINE_MEMBER(lx387_control_r);
@@ -184,10 +184,10 @@
 
 	void reset_lx387();
 
-	void main_io(address_map &map);
+	void io_map(address_map &map);
 
 private:
-	void main_mem(address_map &map);
+	void mem_map(address_map &map);
 };
 
 class z80netb_state : public z80net_state
@@ -202,10 +202,9 @@
 
 protected:
 	virtual void machine_reset() override;
-	virtual void driver_init() override { }
 
 private:
-	void main_mem(address_map &map);
+	void mem_map(address_map &map);
 };
 
 class z80netf_state : public z80netb_state
@@ -235,11 +234,10 @@
 		uint8_t head;  /* current head */
 	};
 
-	void main_mem(address_map &map);
-	void main_io(address_map &map);
+	void mem_map(address_map &map);
+	void io_map(address_map &map);
 
 	void lx390_motor_w(uint8_t data);
-	uint8_t lx390_reset_bank();
 	uint8_t lx390_fdc_r(offs_t offset);
 	void lx390_fdc_w(offs_t offset, uint8_t data);
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/zerozone.h mame-0.224+dfsg.1/src/mame/includes/zerozone.h
--- mame-0.222+dfsg.1/src/mame/includes/zerozone.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/zerozone.h	2020-08-26 08:57:19.000000000 +0000
@@ -28,14 +28,20 @@
 
 	void zerozone(machine_config &config);
 
+protected:
+	// driver_device overrides
+	virtual void machine_start() override;
+	virtual void machine_reset() override;
+	virtual void video_start() override;
+
 private:
 	// in drivers/zerozone.cpp
-	void sound_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+	void sound_w(uint8_t data);
 	DECLARE_WRITE_LINE_MEMBER(vblank_w);
 
 	// in video/zerozone.cpp
 	void tilemap_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
-	void tilebank_w(uint16_t data);
+	void tilebank_w(uint8_t data);
 
 	// devices
 	required_device<cpu_device> m_maincpu;
@@ -47,21 +53,16 @@
 	// currently this driver uses generic palette handling
 
 	required_device<gfxdecode_device> m_gfxdecode;
-	// state
+
 	// video-related
-	uint16_t         m_tilebank;
-	tilemap_t     *m_zz_tilemap;
+	uint8_t m_tilebank;
+	tilemap_t *m_zz_tilemap;
 
 	uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 
 	void main_map(address_map &map);
 	void sound_map(address_map &map);
 
-	// driver_device overrides
-	virtual void machine_start() override;
-	virtual void machine_reset() override;
-
-	virtual void video_start() override;
 	TILE_GET_INFO_MEMBER(get_zerozone_tile_info);
 };
 
diff -Nru mame-0.222+dfsg.1/src/mame/includes/zorba.h mame-0.224+dfsg.1/src/mame/includes/zorba.h
--- mame-0.222+dfsg.1/src/mame/includes/zorba.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/includes/zorba.h	2020-08-26 08:57:19.000000000 +0000
@@ -29,6 +29,7 @@
 		, m_config_port(*this, "CNF")
 		, m_rom(*this, "maincpu")
 		, m_ram(*this, "mainram")
+		, m_bank1(*this, "bank1")
 		, m_p_chargen(*this, "chargen")
 		, m_maincpu(*this, "maincpu")
 		, m_dma(*this, "dma")
@@ -94,6 +95,7 @@
 
 	required_region_ptr<u8>             m_rom;
 	required_shared_ptr<u8>             m_ram;
+	required_memory_bank                m_bank1;
 	required_region_ptr<uint8_t>        m_p_chargen;
 
 	required_device<cpu_device>         m_maincpu;
@@ -124,7 +126,6 @@
 	int     m_printer_select;
 
 	uint8_t m_term_data;
-	bool m_rom_in_map;
 };
 
 #endif // MAME_INCLUDES_ZORBA_H
diff -Nru mame-0.222+dfsg.1/src/mame/layout/280zzzap.lay mame-0.224+dfsg.1/src/mame/layout/280zzzap.lay
--- mame-0.222+dfsg.1/src/mame/layout/280zzzap.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/280zzzap.lay	2020-08-26 08:57:19.000000000 +0000
@@ -91,6 +91,34 @@
 		</bezel>
 	</view>
 
+	<view name="Widescreen Color Overlay + Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<overlay name="overlay" element="overlay">
+			<bounds x="0" y="0" width="640" height="480" />
+		</overlay>
+
+		<bezel element="shifter" inputtag="IN0" inputmask="0x10">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
+	<view name="Widescreen Color Overlay + Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<overlay name="overlay" element="overlay">
+			<bounds x="0" y="0" width="640" height="480" />
+		</overlay>
+
+		<bezel element="shifter" inputtag="IN0" inputmask="0x10">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
 	<view name="Color Overlay">
 		<screen index="0">
 			<bounds x="0" y="0" width="640" height="480" />
diff -Nru mame-0.222+dfsg.1/src/mame/layout/4dpi.lay mame-0.224+dfsg.1/src/mame/layout/4dpi.lay
--- mame-0.222+dfsg.1/src/mame/layout/4dpi.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/4dpi.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+copyright-holders:Patrick Mackinlay
+
+Silicon Graphics Personal IRIS.
+
+TODO: confirm sequence/layout of LEDs
+
+-->
+<mamelayout version="2">
+  <element name="led" defstate="1">
+	<disk state="1">
+	  <color red="0.0" green="0.2" blue="0.0" />
+	</disk>
+	<disk state="0">
+	  <color red="0.0" green="1.0" blue="0.0" />
+	</disk>
+  </element>
+  <view name="Graphics">
+	<screen index="0">
+	  <bounds x="0" y="0" width="1280" height="1024" />
+	</screen>
+	<repeat count="5">
+	  <param name="n" start="0" increment="1" />
+	  <param name="x" start="1250" increment="-20" />
+	  <bezel name="led~n~" element="led">
+		<bounds x="~x~" y="1024" width="10" height="10" />
+	  </bezel>
+	</repeat>
+  </view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/avrmax.lay mame-0.224+dfsg.1/src/mame/layout/avrmax.lay
--- mame-0.222+dfsg.1/src/mame/layout/avrmax.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/avrmax.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+
+<!-- NOTE: no chesspieces simulation here -->
+
+<!-- define elements -->
+
+	<element name="digit" defstate="0">
+		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
+	</element>
+
+	<element name="but" defstate="0">
+		<disk state="0"><color red="0.21" green="0.2" blue="0.2" /></disk>
+		<disk state="1"><color red="0.31" green="0.3" blue="0.3" /></disk>
+	</element>
+
+	<element name="text_1"><text string="A1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_2"><text string="B2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_3"><text string="C3"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_4"><text string="D4"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_5"><text string="E5"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_6"><text string="F6"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_7"><text string="G7"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_8"><text string="H8"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+
+	<element name="text_fn"><text string="FN"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_cl"><text string="CL"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_go"><text string="GO"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+
+
+<!-- build screen -->
+
+	<view name="Internal Layout">
+		<bounds left="-5" right="80" top="5" bottom="47" />
+
+		<bezel name="digit0" element="digit"><bounds x="0" y="10" width="10" height="15" /></bezel>
+		<bezel name="digit1" element="digit"><bounds x="10" y="10" width="10" height="15" /></bezel>
+		<bezel name="digit2" element="digit"><bounds x="20" y="10" width="10" height="15" /></bezel>
+		<bezel name="digit3" element="digit"><bounds x="30" y="10" width="10" height="15" /></bezel>
+
+		<bezel element="text_1"><bounds x="50" y="6" width="5" height="4" /></bezel>
+		<bezel element="text_2"><bounds x="60" y="6" width="5" height="4" /></bezel>
+		<bezel element="text_3"><bounds x="70" y="6" width="5" height="4" /></bezel>
+		<bezel element="text_4"><bounds x="50" y="16" width="5" height="4" /></bezel>
+		<bezel element="text_5"><bounds x="60" y="16" width="5" height="4" /></bezel>
+		<bezel element="text_6"><bounds x="70" y="16" width="5" height="4" /></bezel>
+		<bezel element="text_7"><bounds x="50" y="26" width="5" height="4" /></bezel>
+		<bezel element="text_8"><bounds x="60" y="26" width="5" height="4" /></bezel>
+		<bezel element="text_fn"><bounds x="50" y="36" width="5" height="4" /></bezel>
+		<bezel element="text_cl"><bounds x="60" y="36" width="5" height="4" /></bezel>
+		<bezel element="text_go"><bounds x="70" y="36" width="5" height="4" /></bezel>
+
+		<bezel element="but" inputtag="IN.0" inputmask="0x01"><bounds x="50" y="10" width="5" height="5" /></bezel>
+		<bezel element="but" inputtag="IN.1" inputmask="0x01"><bounds x="60" y="10" width="5" height="5" /></bezel>
+		<bezel element="but" inputtag="IN.2" inputmask="0x01"><bounds x="70" y="10" width="5" height="5" /></bezel>
+		<bezel element="but" inputtag="IN.3" inputmask="0x01"><bounds x="50" y="20" width="5" height="5" /></bezel>
+		<bezel element="but" inputtag="IN.0" inputmask="0x02"><bounds x="60" y="20" width="5" height="5" /></bezel>
+		<bezel element="but" inputtag="IN.1" inputmask="0x02"><bounds x="70" y="20" width="5" height="5" /></bezel>
+		<bezel element="but" inputtag="IN.2" inputmask="0x02"><bounds x="50" y="30" width="5" height="5" /></bezel>
+		<bezel element="but" inputtag="IN.3" inputmask="0x02"><bounds x="60" y="30" width="5" height="5" /></bezel>
+		<bezel element="but" inputtag="IN.0" inputmask="0x04"><bounds x="50" y="40" width="5" height="5" /></bezel>
+		<bezel element="but" inputtag="IN.1" inputmask="0x04"><bounds x="60" y="40" width="5" height="5" /></bezel>
+		<bezel element="but" inputtag="IN.2" inputmask="0x04"><bounds x="70" y="40" width="5" height="5" /></bezel>
+
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/brkball.lay mame-0.224+dfsg.1/src/mame/layout/brkball.lay
--- mame-0.222+dfsg.1/src/mame/layout/brkball.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/brkball.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<mamelayout version="2">
+	<element name="dotmatrixdot">
+	<dotmatrixdot>
+		<color red="0" green="0" blue="0" />
+	</dotmatrixdot>
+	</element>
+	<element name="dmd_background">
+		<rect>
+			<color red="0.2" green="0.0" blue="0"/>
+		</rect>
+	</element>
+
+	<view name="main">
+		<repeat count="21">
+			<param name="y" start="0" increment="1" />
+			<param name="base" start="0" increment="65" />
+			<repeat count="65">
+				<param name="x" start="0" increment="1" />
+				<param name="dot" start="~base~" increment="1" />
+				<backdrop name="dotmatrix~dot~" element="dotmatrixdot" state="0">
+				<bounds x="~x~" y="~y~" width="1" height="1" />
+				</backdrop>
+			</repeat>
+		</repeat>
+		<backdrop element="dmd_background">
+			<bounds x="149" y="0" width="102" height="42"/>
+		</backdrop>
+		<screen index="0">
+			<bounds x="0" y="42" width="400" height="300" />
+		</screen>
+		<screen index="1">
+			<bounds x="149" y="0" width="102" height="42"/>
+		</screen>
+	</view>
+	<view name="no led">
+		<screen index="0">
+			<bounds x="0" y="0" width="400" height="300" />
+		</screen>
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/buggybjr.lay mame-0.224+dfsg.1/src/mame/layout/buggybjr.lay
--- mame-0.222+dfsg.1/src/mame/layout/buggybjr.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/buggybjr.lay	2020-08-26 08:57:19.000000000 +0000
@@ -72,4 +72,26 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="soundbrd:YM2149_IC19_A" inputmask="0x40">
+
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="soundbrd:YM2149_IC19_A" inputmask="0x40">
+
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/buggychl.lay mame-0.224+dfsg.1/src/mame/layout/buggychl.lay
--- mame-0.222+dfsg.1/src/mame/layout/buggychl.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/buggychl.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,40 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x08">
+			<bounds x="496" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x08">
+			<bounds x="-48" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Vertical Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x08">
+			<bounds x="446" y="648" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Vertical Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x08">
+			<bounds x="2" y="648" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/cbombers.lay mame-0.224+dfsg.1/src/mame/layout/cbombers.lay
--- mame-0.222+dfsg.1/src/mame/layout/cbombers.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/cbombers.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="INPUTS" inputmask="0x01000000">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="INPUTS" inputmask="0x01000000">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/changela.lay mame-0.224+dfsg.1/src/mame/layout/changela.lay
--- mame-0.222+dfsg.1/src/mame/layout/changela.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/changela.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x01">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x01">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/chqflag.lay mame-0.224+dfsg.1/src/mame/layout/chqflag.lay
--- mame-0.222+dfsg.1/src/mame/layout/chqflag.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/chqflag.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,40 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="IN2" inputmask="0x01">
+			<bounds x="496" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="IN2" inputmask="0x01">
+			<bounds x="-48" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Vertical Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="IN2" inputmask="0x01">
+			<bounds x="446" y="648" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Vertical Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="IN2" inputmask="0x01">
+			<bounds x="2" y="648" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/cischeat.lay mame-0.224+dfsg.1/src/mame/layout/cischeat.lay
--- mame-0.222+dfsg.1/src/mame/layout/cischeat.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/cischeat.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN2" inputmask="0x02">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN2" inputmask="0x02">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/ck_master.lay mame-0.224+dfsg.1/src/mame/layout/ck_master.lay
--- mame-0.222+dfsg.1/src/mame/layout/ck_master.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/ck_master.lay	2020-08-26 08:57:19.000000000 +0000
@@ -366,7 +366,7 @@
 <!-- build screen -->
 
 	<view name="Internal Layout">
-		<bounds left="-12" right="106.5" top="-1.5" bottom="87.5" />
+		<bounds left="-12.5" right="106.5" top="-1.5" bottom="87.5" />
 
 		<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
 		<group ref="sb_ui"><bounds x="-11" y="3" width="10" height="80" /></group>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/cncchess.lay mame-0.224+dfsg.1/src/mame/layout/cncchess.lay
--- mame-0.222+dfsg.1/src/mame/layout/cncchess.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/cncchess.lay	1970-01-01 00:00:00.000000000 +0000
@@ -1,280 +0,0 @@
-<?xml version="1.0"?>
-<!--
-license:CC0
--->
-<mamelayout version="2">
-
-<!-- NOTE: no chesspieces simulation here -->
-
-<!-- define elements -->
-
-	<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
-	<element name="disk_blackb"><disk><color red="0" green="0" blue="0" /></disk></element>
-	<element name="black"><rect><color red="0.25" green="0.25" blue="0.25" /></rect></element>
-	<element name="disk_black"><disk><color red="0.25" green="0.25" blue="0.25" /></disk></element>
-	<element name="white"><rect><color red="0.75" green="0.75" blue="0.75" /></rect></element>
-	<element name="orange"><rect><color red="0.75" green="0.35" blue="0.05" /></rect></element>
-	<element name="red"><rect><color red="1.0" green="0.1" blue="0.15" /></rect></element>
-
-	<element name="digit" defstate="0">
-		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
-	</element>
-
-	<element name="led" defstate="0">
-		<disk state="1"><color red="1.0" green="0.1" blue="0.15" /></disk>
-		<disk state="0"><color red="0.15" green="0.02" blue="0.03" /></disk>
-	</element>
-
-	<element name="hl" defstate="0">
-		<text string=" "/>
-		<rect state="1"><color red="0" green="0" blue="0" /></rect>
-	</element>
-
-	<element name="text_br">
-		<rect><color red="0.75" green="0.35" blue="0.05" /></rect>
-		<text string="RESET"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-
-	<element name="text_b01a">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="A"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b01b">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="[P]"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b02a">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="B"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b02b">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="[R]"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b03a">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="C"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b03b">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="[N]"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b04a">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="D"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b04b">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="[B]"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b05a">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="E"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b05b">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="[Q]"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b06a">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="F"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b06b">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="[K]"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b07a">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="G"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b07b">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="MD"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b08a">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="H"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-	<element name="text_b08b">
-		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
-		<text string="GO"><color red="0.85" green="0.85" blue="0.85" /></text>
-	</element>
-
-	<element name="text_b09a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="1"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b09b">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="[P]"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b10a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="2"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b10b">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="[R]"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b11a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="3"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b11b">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="[N]"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b12a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="4"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b12b">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="[B]"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b13a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="5"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b13b">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="[Q]"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b14a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="6"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b14b">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="[K]"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b15a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="7"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b15b">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="SP"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b16a">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="8"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-	<element name="text_b16b">
-		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
-		<text string="IP"><color red="0.05" green="0.05" blue="0.05" /></text>
-	</element>
-
-
-<!-- build screen -->
-
-	<view name="Internal Layout">
-		<bounds left="8.8" right="55.3" top="20" bottom="42.5" />
-
-	<!-- outer part, display -->
-
-		<bezel element="black"><bounds x="8.7" y="22" width="46.7" height="0.7" /></bezel>
-		<bezel element="black"><bounds x="8.7" y="23.4" width="46.7" height="0.7" /></bezel>
-		<bezel element="black"><bounds x="8.7" y="24.8" width="46.7" height="0.7" /></bezel>
-		<bezel element="blackb"><bounds x="20" y="20" width="28" height="20" /></bezel>
-
-		<bezel element="black"><bounds x="19.3" y="27.3" width="32.0" height="20" /></bezel>
-		<bezel element="black"><bounds x="17.3" y="29.3" width="36.0" height="20" /></bezel>
-		<bezel element="blackb"><bounds x="18" y="28" width="34.6" height="20" /></bezel>
-		<bezel element="disk_black"><bounds x="17.3" y="27.3" width="4" height="4" /></bezel>
-		<bezel element="disk_blackb"><bounds x="18" y="28" width="2.6" height="2.6" /></bezel>
-		<bezel element="disk_black"><bounds x="49.3" y="27.3" width="4" height="4" /></bezel>
-		<bezel element="disk_blackb"><bounds x="50" y="28" width="2.6" height="2.6" /></bezel>
-		<bezel element="blackb"><bounds x="19.3" y="28" width="32.0" height="20" /></bezel>
-		<bezel element="blackb"><bounds x="18" y="29.3" width="34.6" height="20" /></bezel>
-		<bezel element="blackb"><bounds x="15" y="42.6" width="50" height="20" /></bezel>
-
-		<bezel element="blackb"><bounds x="25.3" y="22" width="20" height="6.5" /></bezel>
-		<bezel name="digit0" element="digit"><bounds x="28.3" y="23" width="3" height="4.5" /></bezel>
-		<bezel name="digit1" element="digit"><bounds x="31.3" y="23" width="3" height="4.5" /></bezel>
-		<bezel name="digit2" element="digit"><bounds x="36.3" y="23" width="3" height="4.5" /></bezel>
-		<bezel name="digit3" element="digit"><bounds x="39.3" y="23" width="3" height="4.5" /></bezel>
-		<bezel element="disk_blackb"><bounds x="30.82" y="27.0" width="0.55" height="0.55" /></bezel>
-		<bezel element="disk_blackb"><bounds x="33.82" y="27.0" width="0.55" height="0.55" /></bezel>
-		<bezel element="disk_blackb"><bounds x="38.82" y="27.0" width="0.55" height="0.55" /></bezel>
-		<bezel element="disk_blackb"><bounds x="41.82" y="27.0" width="0.55" height="0.55" /></bezel>
-		<bezel name="1.8" element="led"><bounds x="35.15" y="24.0" width="0.45" height="0.45" /></bezel>
-		<bezel name="0.8" element="led"><bounds x="35.0" y="26.05" width="0.45" height="0.45" /></bezel>
-		<bezel element="red"><bounds x="25.3" y="22" width="20" height="6.5" /><color alpha="0.15" /></bezel>
-
-	<!-- button panel -->
-
-		<bezel element="black"><bounds x="20" y="30" width="2.6" height="4.5" /></bezel>
-		<bezel element="black"><bounds x="24" y="30" width="2.6" height="4.5" /></bezel>
-		<bezel element="black"><bounds x="28" y="30" width="2.6" height="4.5" /></bezel>
-		<bezel element="black"><bounds x="32" y="30" width="2.6" height="4.5" /></bezel>
-		<bezel element="black"><bounds x="36" y="30" width="2.6" height="4.5" /></bezel>
-		<bezel element="black"><bounds x="40" y="30" width="2.6" height="4.5" /></bezel>
-		<bezel element="black"><bounds x="44" y="30" width="2.6" height="4.5" /></bezel>
-		<bezel element="black"><bounds x="48" y="30" width="2.6" height="4.5" /></bezel>
-		<bezel element="white"><bounds x="20" y="36.2" width="2.6" height="4.5" /></bezel>
-		<bezel element="white"><bounds x="24" y="36.2" width="2.6" height="4.5" /></bezel>
-		<bezel element="white"><bounds x="28" y="36.2" width="2.6" height="4.5" /></bezel>
-		<bezel element="white"><bounds x="32" y="36.2" width="2.6" height="4.5" /></bezel>
-		<bezel element="white"><bounds x="36" y="36.2" width="2.6" height="4.5" /></bezel>
-		<bezel element="white"><bounds x="40" y="36.2" width="2.6" height="4.5" /></bezel>
-		<bezel element="white"><bounds x="44" y="36.2" width="2.6" height="4.5" /></bezel>
-		<bezel element="white"><bounds x="48" y="36.2" width="2.6" height="4.5" /></bezel>
-
-		<bezel element="text_b01a"><bounds x="20.10" y="30.4" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b01b"><bounds x="20.15" y="32.0" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b02a"><bounds x="24.10" y="30.4" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b02b"><bounds x="24.15" y="32.0" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b03a"><bounds x="28.10" y="30.4" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b03b"><bounds x="28.15" y="32.0" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b04a"><bounds x="32.10" y="30.4" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b04b"><bounds x="32.15" y="32.0" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b05a"><bounds x="36.10" y="30.4" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b05b"><bounds x="36.15" y="32.0" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b06a"><bounds x="40.10" y="30.4" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b06b"><bounds x="40.15" y="32.0" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b07a"><bounds x="44.10" y="30.4" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b07b"><bounds x="44.15" y="32.0" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b08a"><bounds x="48.10" y="30.4" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b08b"><bounds x="48.15" y="32.0" width="2.4" height="1.9" /></bezel>
-
-		<bezel element="text_b09a"><bounds x="20.10" y="36.6" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b09b"><bounds x="20.15" y="38.2" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b10a"><bounds x="24.10" y="36.6" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b10b"><bounds x="24.15" y="38.2" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b11a"><bounds x="28.10" y="36.6" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b11b"><bounds x="28.15" y="38.2" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b12a"><bounds x="32.10" y="36.6" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b12b"><bounds x="32.15" y="38.2" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b13a"><bounds x="36.10" y="36.6" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b13b"><bounds x="36.15" y="38.2" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b14a"><bounds x="40.10" y="36.6" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b14b"><bounds x="40.15" y="38.2" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b15a"><bounds x="44.10" y="36.6" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b15b"><bounds x="44.15" y="38.2" width="2.4" height="1.9" /></bezel>
-		<bezel element="text_b16a"><bounds x="48.10" y="36.6" width="2.4" height="1.2" /></bezel>
-		<bezel element="text_b16b"><bounds x="48.15" y="38.2" width="2.4" height="1.9" /></bezel>
-
-		<bezel element="hl" inputtag="IN.2" inputmask="0x08"><bounds x="20" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.2" inputmask="0x04"><bounds x="24" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.2" inputmask="0x02"><bounds x="28" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.2" inputmask="0x01"><bounds x="32" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.3" inputmask="0x08"><bounds x="36" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.3" inputmask="0x04"><bounds x="40" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.3" inputmask="0x02"><bounds x="44" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.3" inputmask="0x01"><bounds x="48" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.0" inputmask="0x08"><bounds x="20" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.0" inputmask="0x04"><bounds x="24" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.0" inputmask="0x02"><bounds x="28" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.0" inputmask="0x01"><bounds x="32" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.1" inputmask="0x08"><bounds x="36" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.1" inputmask="0x04"><bounds x="40" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.1" inputmask="0x02"><bounds x="44" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-		<bezel element="hl" inputtag="IN.1" inputmask="0x01"><bounds x="48" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
-
-		<bezel element="orange"><bounds x="10.8" y="37.15" width="4.5" height="2.6" /></bezel>
-		<bezel element="text_br"><bounds x="10.9" y="37.65" width="4.3" height="1.5" /></bezel>
-		<bezel element="hl" inputtag="RESET" inputmask="0x01"><bounds x="10.8" y="37.15" width="4.5" height="2.6" /><color alpha="0.25" /></bezel>
-
-	</view>
-</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/conic_cchess.lay mame-0.224+dfsg.1/src/mame/layout/conic_cchess.lay
--- mame-0.222+dfsg.1/src/mame/layout/conic_cchess.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/conic_cchess.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,280 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+
+<!-- NOTE: no chesspieces simulation here -->
+
+<!-- define elements -->
+
+	<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
+	<element name="disk_blackb"><disk><color red="0" green="0" blue="0" /></disk></element>
+	<element name="black"><rect><color red="0.25" green="0.25" blue="0.25" /></rect></element>
+	<element name="disk_black"><disk><color red="0.25" green="0.25" blue="0.25" /></disk></element>
+	<element name="white"><rect><color red="0.75" green="0.75" blue="0.75" /></rect></element>
+	<element name="orange"><rect><color red="0.75" green="0.35" blue="0.05" /></rect></element>
+	<element name="red"><rect><color red="1.0" green="0.1" blue="0.15" /></rect></element>
+
+	<element name="digit" defstate="0">
+		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
+	</element>
+
+	<element name="led" defstate="0">
+		<disk state="1"><color red="1.0" green="0.1" blue="0.15" /></disk>
+		<disk state="0"><color red="0.15" green="0.02" blue="0.03" /></disk>
+	</element>
+
+	<element name="hl" defstate="0">
+		<text string=" "/>
+		<rect state="1"><color red="0" green="0" blue="0" /></rect>
+	</element>
+
+	<element name="text_br">
+		<rect><color red="0.75" green="0.35" blue="0.05" /></rect>
+		<text string="RESET"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+
+	<element name="text_b01a">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="A"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b01b">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="[P]"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b02a">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="B"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b02b">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="[R]"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b03a">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="C"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b03b">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="[N]"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b04a">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="D"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b04b">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="[B]"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b05a">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="E"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b05b">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="[Q]"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b06a">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="F"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b06b">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="[K]"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b07a">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="G"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b07b">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="MD"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b08a">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="H"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+	<element name="text_b08b">
+		<rect><color red="0.25" green="0.25" blue="0.25" /></rect>
+		<text string="GO"><color red="0.85" green="0.85" blue="0.85" /></text>
+	</element>
+
+	<element name="text_b09a">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="1"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b09b">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="[P]"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b10a">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="2"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b10b">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="[R]"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b11a">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="3"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b11b">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="[N]"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b12a">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="4"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b12b">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="[B]"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b13a">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="5"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b13b">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="[Q]"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b14a">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="6"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b14b">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="[K]"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b15a">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="7"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b15b">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="SP"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b16a">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="8"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+	<element name="text_b16b">
+		<rect><color red="0.75" green="0.75" blue="0.75" /></rect>
+		<text string="IP"><color red="0.05" green="0.05" blue="0.05" /></text>
+	</element>
+
+
+<!-- build screen -->
+
+	<view name="Internal Layout">
+		<bounds left="8.8" right="55.3" top="20" bottom="42.5" />
+
+	<!-- outer part, display -->
+
+		<bezel element="black"><bounds x="8.7" y="22" width="46.7" height="0.7" /></bezel>
+		<bezel element="black"><bounds x="8.7" y="23.4" width="46.7" height="0.7" /></bezel>
+		<bezel element="black"><bounds x="8.7" y="24.8" width="46.7" height="0.7" /></bezel>
+		<bezel element="blackb"><bounds x="20" y="20" width="28" height="20" /></bezel>
+
+		<bezel element="black"><bounds x="19.3" y="27.3" width="32.0" height="20" /></bezel>
+		<bezel element="black"><bounds x="17.3" y="29.3" width="36.0" height="20" /></bezel>
+		<bezel element="blackb"><bounds x="18" y="28" width="34.6" height="20" /></bezel>
+		<bezel element="disk_black"><bounds x="17.3" y="27.3" width="4" height="4" /></bezel>
+		<bezel element="disk_blackb"><bounds x="18" y="28" width="2.6" height="2.6" /></bezel>
+		<bezel element="disk_black"><bounds x="49.3" y="27.3" width="4" height="4" /></bezel>
+		<bezel element="disk_blackb"><bounds x="50" y="28" width="2.6" height="2.6" /></bezel>
+		<bezel element="blackb"><bounds x="19.3" y="28" width="32.0" height="20" /></bezel>
+		<bezel element="blackb"><bounds x="18" y="29.3" width="34.6" height="20" /></bezel>
+		<bezel element="blackb"><bounds x="15" y="42.6" width="50" height="20" /></bezel>
+
+		<bezel element="blackb"><bounds x="25.3" y="22" width="20" height="6.5" /></bezel>
+		<bezel name="digit0" element="digit"><bounds x="28.3" y="23" width="3" height="4.5" /></bezel>
+		<bezel name="digit1" element="digit"><bounds x="31.3" y="23" width="3" height="4.5" /></bezel>
+		<bezel name="digit2" element="digit"><bounds x="36.3" y="23" width="3" height="4.5" /></bezel>
+		<bezel name="digit3" element="digit"><bounds x="39.3" y="23" width="3" height="4.5" /></bezel>
+		<bezel element="disk_blackb"><bounds x="30.82" y="27.0" width="0.55" height="0.55" /></bezel>
+		<bezel element="disk_blackb"><bounds x="33.82" y="27.0" width="0.55" height="0.55" /></bezel>
+		<bezel element="disk_blackb"><bounds x="38.82" y="27.0" width="0.55" height="0.55" /></bezel>
+		<bezel element="disk_blackb"><bounds x="41.82" y="27.0" width="0.55" height="0.55" /></bezel>
+		<bezel name="1.8" element="led"><bounds x="35.15" y="24.0" width="0.45" height="0.45" /></bezel>
+		<bezel name="0.8" element="led"><bounds x="35.0" y="26.05" width="0.45" height="0.45" /></bezel>
+		<bezel element="red"><bounds x="25.3" y="22" width="20" height="6.5" /><color alpha="0.15" /></bezel>
+
+	<!-- button panel -->
+
+		<bezel element="black"><bounds x="20" y="30" width="2.6" height="4.5" /></bezel>
+		<bezel element="black"><bounds x="24" y="30" width="2.6" height="4.5" /></bezel>
+		<bezel element="black"><bounds x="28" y="30" width="2.6" height="4.5" /></bezel>
+		<bezel element="black"><bounds x="32" y="30" width="2.6" height="4.5" /></bezel>
+		<bezel element="black"><bounds x="36" y="30" width="2.6" height="4.5" /></bezel>
+		<bezel element="black"><bounds x="40" y="30" width="2.6" height="4.5" /></bezel>
+		<bezel element="black"><bounds x="44" y="30" width="2.6" height="4.5" /></bezel>
+		<bezel element="black"><bounds x="48" y="30" width="2.6" height="4.5" /></bezel>
+		<bezel element="white"><bounds x="20" y="36.2" width="2.6" height="4.5" /></bezel>
+		<bezel element="white"><bounds x="24" y="36.2" width="2.6" height="4.5" /></bezel>
+		<bezel element="white"><bounds x="28" y="36.2" width="2.6" height="4.5" /></bezel>
+		<bezel element="white"><bounds x="32" y="36.2" width="2.6" height="4.5" /></bezel>
+		<bezel element="white"><bounds x="36" y="36.2" width="2.6" height="4.5" /></bezel>
+		<bezel element="white"><bounds x="40" y="36.2" width="2.6" height="4.5" /></bezel>
+		<bezel element="white"><bounds x="44" y="36.2" width="2.6" height="4.5" /></bezel>
+		<bezel element="white"><bounds x="48" y="36.2" width="2.6" height="4.5" /></bezel>
+
+		<bezel element="text_b01a"><bounds x="20.10" y="30.4" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b01b"><bounds x="20.15" y="32.0" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b02a"><bounds x="24.10" y="30.4" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b02b"><bounds x="24.15" y="32.0" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b03a"><bounds x="28.10" y="30.4" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b03b"><bounds x="28.15" y="32.0" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b04a"><bounds x="32.10" y="30.4" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b04b"><bounds x="32.15" y="32.0" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b05a"><bounds x="36.10" y="30.4" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b05b"><bounds x="36.15" y="32.0" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b06a"><bounds x="40.10" y="30.4" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b06b"><bounds x="40.15" y="32.0" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b07a"><bounds x="44.10" y="30.4" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b07b"><bounds x="44.15" y="32.0" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b08a"><bounds x="48.10" y="30.4" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b08b"><bounds x="48.15" y="32.0" width="2.4" height="1.9" /></bezel>
+
+		<bezel element="text_b09a"><bounds x="20.10" y="36.6" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b09b"><bounds x="20.15" y="38.2" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b10a"><bounds x="24.10" y="36.6" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b10b"><bounds x="24.15" y="38.2" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b11a"><bounds x="28.10" y="36.6" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b11b"><bounds x="28.15" y="38.2" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b12a"><bounds x="32.10" y="36.6" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b12b"><bounds x="32.15" y="38.2" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b13a"><bounds x="36.10" y="36.6" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b13b"><bounds x="36.15" y="38.2" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b14a"><bounds x="40.10" y="36.6" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b14b"><bounds x="40.15" y="38.2" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b15a"><bounds x="44.10" y="36.6" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b15b"><bounds x="44.15" y="38.2" width="2.4" height="1.9" /></bezel>
+		<bezel element="text_b16a"><bounds x="48.10" y="36.6" width="2.4" height="1.2" /></bezel>
+		<bezel element="text_b16b"><bounds x="48.15" y="38.2" width="2.4" height="1.9" /></bezel>
+
+		<bezel element="hl" inputtag="IN.2" inputmask="0x08"><bounds x="20" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.2" inputmask="0x04"><bounds x="24" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.2" inputmask="0x02"><bounds x="28" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.2" inputmask="0x01"><bounds x="32" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.3" inputmask="0x08"><bounds x="36" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.3" inputmask="0x04"><bounds x="40" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.3" inputmask="0x02"><bounds x="44" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.3" inputmask="0x01"><bounds x="48" y="30" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.0" inputmask="0x08"><bounds x="20" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.0" inputmask="0x04"><bounds x="24" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.0" inputmask="0x02"><bounds x="28" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.0" inputmask="0x01"><bounds x="32" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.1" inputmask="0x08"><bounds x="36" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.1" inputmask="0x04"><bounds x="40" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.1" inputmask="0x02"><bounds x="44" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hl" inputtag="IN.1" inputmask="0x01"><bounds x="48" y="36.2" width="2.6" height="4.5" /><color alpha="0.25" /></bezel>
+
+		<bezel element="orange"><bounds x="10.8" y="37.15" width="4.5" height="2.6" /></bezel>
+		<bezel element="text_br"><bounds x="10.9" y="37.65" width="4.3" height="1.5" /></bezel>
+		<bezel element="hl" inputtag="RESET" inputmask="0x01"><bounds x="10.8" y="37.15" width="4.5" height="2.6" /><color alpha="0.25" /></bezel>
+
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/contcirc.lay mame-0.224+dfsg.1/src/mame/layout/contcirc.lay
--- mame-0.222+dfsg.1/src/mame/layout/contcirc.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/contcirc.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN1" inputmask="0x10">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN1" inputmask="0x10">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/crmaze2p.lay mame-0.224+dfsg.1/src/mame/layout/crmaze2p.lay
--- mame-0.222+dfsg.1/src/mame/layout/crmaze2p.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/crmaze2p.lay	2020-08-26 08:57:19.000000000 +0000
@@ -18,11 +18,11 @@
 		</disk>
 		<text string="ESCAPE" state="0">
 			<color red="0.5" green="0.0" blue="0.0" />
-			<bounds x="2" y="1.5" width="4" height="4" />
+			<bounds x="1.7" y="1.5" width="4" height="4" />
 		</text>
 		<text string="ESCAPE" state="1">
 			<color red="1.0" green="0.0" blue="0.0" />
-			<bounds x="2" y="1.5" width="4" height="4" />
+			<bounds x="1.7" y="1.5" width="4" height="4" />
 		</text>
 	</element>
 
@@ -46,7 +46,7 @@
 	</element>
 
 	<view name="Monitor and Lamps">
-		<bezel name="lamp41" element="ESCAPE">
+		<bezel name="lamp41" element="ESCAPE" inputtag="BLACK2" inputmask="0x40">
 			<bounds x="514" y="267" width="30" height="30" />
 		</bezel>
 		<bezel name="P1" element="P1">
diff -Nru mame-0.222+dfsg.1/src/mame/layout/crmaze4p.lay mame-0.224+dfsg.1/src/mame/layout/crmaze4p.lay
--- mame-0.222+dfsg.1/src/mame/layout/crmaze4p.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/crmaze4p.lay	2020-08-26 08:57:19.000000000 +0000
@@ -18,11 +18,11 @@
 		</disk>
 		<text string="ESCAPE" state="0">
 			<color red="0.5" green="0.0" blue="0.0" />
-			<bounds x="2" y="2" width="4" height="4" />
+			<bounds x="1.7" y="1.5" width="4" height="4" />
 		</text>
 		<text string="ESCAPE" state="1">
 			<color red="1.0" green="0.0" blue="0.0" />
-			<bounds x="2" y="2" width="4" height="4" />
+			<bounds x="1.7" y="1.5" width="4" height="4" />
 		</text>
 	</element>
 
@@ -59,7 +59,7 @@
 	</element>
 
 	<view name="Monitor and Lamps">
-		<bezel name="lamp41" element="ESCAPE">
+		<bezel name="lamp41" element="ESCAPE" inputtag="BLACK2" inputmask="0x40">
 			<bounds x="514" y="267" width="30" height="30" />
 		</bezel>
 		<bezel name="P1" element="P1">
diff -Nru mame-0.222+dfsg.1/src/mame/layout/dblaxle.lay mame-0.224+dfsg.1/src/mame/layout/dblaxle.lay
--- mame-0.222+dfsg.1/src/mame/layout/dblaxle.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/dblaxle.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x02">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x02">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/dct11em.lay mame-0.224+dfsg.1/src/mame/layout/dct11em.lay
--- mame-0.222+dfsg.1/src/mame/layout/dct11em.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/dct11em.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+	<element name="a_led">
+		<disk state="0">
+			<color red="0.0" green="0.75" blue="0.0" />
+		</disk>
+		<disk state="1">
+			<color red="0.0" green="0.15" blue="0.0" />
+		</disk>
+	</element>
+
+	<element name="digit" defstate="0">
+		<led7seg>
+			<color red="0.75" green="0.0" blue="0.0" />
+		</led7seg>
+	</element>
+
+	<element name="background">
+		<rect>
+			<bounds left="0" top="0" right="1" bottom="1" />
+			<color red="0.0" green="0.0" blue="0.0" />
+		</rect>
+	</element>
+
+	<view name="Default Layout">
+		<screen index="0">
+			<bounds x="0" y="0" width="362" height="262" />
+		</screen>
+		<!-- Black background -->
+		<backdrop element="background">
+			<bounds left="0" top="262" right="274" bottom="350" />
+		</backdrop>
+
+		<bezel name="led0" element="a_led">
+			<bounds left="300" top="300" right="310" bottom="310" />
+		</bezel>
+
+		<bezel name="digit11" element="digit">
+			<bounds left="10" top="267" right="44" bottom="305" />
+		</bezel>
+		<bezel name="digit10" element="digit">
+			<bounds left="54" top="267" right="88" bottom="305" />
+		</bezel>
+		<bezel name="digit9" element="digit">
+			<bounds left="98" top="267" right="132" bottom="305" />
+		</bezel>
+		<bezel name="digit8" element="digit">
+			<bounds left="142" top="267" right="176" bottom="305" />
+		</bezel>
+		<bezel name="digit7" element="digit">
+			<bounds left="186" top="267" right="220" bottom="305" />
+		</bezel>
+		<bezel name="digit6" element="digit">
+			<bounds left="230" top="267" right="264" bottom="305" />
+		</bezel>
+
+		<bezel name="digit5" element="digit">
+			<bounds left="10" top="307" right="44" bottom="345" />
+		</bezel>
+		<bezel name="digit4" element="digit">
+			<bounds left="54" top="307" right="88" bottom="345" />
+		</bezel>
+		<bezel name="digit3" element="digit">
+			<bounds left="98" top="307" right="132" bottom="345" />
+		</bezel>
+		<bezel name="digit2" element="digit">
+			<bounds left="142" top="307" right="176" bottom="345" />
+		</bezel>
+		<bezel name="digit1" element="digit">
+			<bounds left="186" top="307" right="220" bottom="345" />
+		</bezel>
+		<bezel name="digit0" element="digit">
+			<bounds left="230" top="307" right="264" bottom="345" />
+		</bezel>
+
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/destroyr.lay mame-0.224+dfsg.1/src/mame/layout/destroyr.lay
--- mame-0.222+dfsg.1/src/mame/layout/destroyr.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/destroyr.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN1" inputmask="0x02">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN1" inputmask="0x02">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/enforce.lay mame-0.224+dfsg.1/src/mame/layout/enforce.lay
--- mame-0.222+dfsg.1/src/mame/layout/enforce.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/enforce.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN2" inputmask="0x01">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN2" inputmask="0x01">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/f1gpstar.lay mame-0.224+dfsg.1/src/mame/layout/f1gpstar.lay
--- mame-0.222+dfsg.1/src/mame/layout/f1gpstar.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/f1gpstar.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN2" inputmask="0x20">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN2" inputmask="0x20">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/fidel_cc10c.lay mame-0.224+dfsg.1/src/mame/layout/fidel_cc10c.lay
--- mame-0.222+dfsg.1/src/mame/layout/fidel_cc10c.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/fidel_cc10c.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,159 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+
+<!-- NOTE: no chesspieces simulation here -->
+
+<!-- define elements -->
+
+	<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
+	<element name="white"><rect><color red="1" green="1" blue="1" /></rect></element>
+	<element name="gray"><rect><color red="0.6" green="0.6" blue="0.6" /></rect></element>
+
+	<element name="digit" defstate="0">
+		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
+	</element>
+
+	<element name="led" defstate="0">
+		<disk state="1"><color red="1.0" green="0.1" blue="0.15" /></disk>
+		<disk state="0"><color red="0.1" green="0.01" blue="0.015" /></disk>
+	</element>
+
+	<element name="hl" defstate="0">
+		<text string=" ">
+			<bounds x="0.0" y="0.0" width="1.0" height="1.0" />
+			<color red="0.0" green="0.0" blue="0.0" />
+		</text>
+		<rect state="1">
+			<bounds x="0.0" y="0.0" width="1.0" height="1.0" />
+			<color red="0.0" green="0.0" blue="0.0" />
+		</rect>
+	</element>
+
+	<element name="text_check"><text string="CHECK"><color red="0.6" green="0.6" blue="0.6" /></text></element>
+	<element name="text_lose"><text string="I LOSE"><color red="0.6" green="0.6" blue="0.6" /></text></element>
+	<element name="text_from"><text string="FROM"><color red="0.6" green="0.6" blue="0.6" /></text></element>
+	<element name="text_to"><text string="TO"><color red="0.6" green="0.6" blue="0.6" /></text></element>
+
+	<element name="text_b1">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="RE"><color red="0.07" green="0.07" blue="0.07" /></text>
+	</element>
+	<element name="text_b2a">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="DM"><color red="0.07" green="0.07" blue="0.07" /></text>
+	</element>
+	<element name="text_b2b">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="PB"><color red="0.07" green="0.07" blue="0.07" /></text>
+	</element>
+	<element name="text_b3">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="CL"><color red="0.07" green="0.07" blue="0.07" /></text>
+	</element>
+	<element name="text_b4">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="EN"><color red="0.07" green="0.07" blue="0.07" /></text>
+	</element>
+	<element name="text_b5">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="A1"><color red="0.07" green="0.07" blue="0.07" /></text>
+	</element>
+	<element name="text_b6">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="b2"><color red="0.07" green="0.07" blue="0.07" /></text>
+	</element>
+	<element name="text_b7">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="C3"><color red="0.07" green="0.07" blue="0.07" /></text>
+	</element>
+	<element name="text_b8">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="d4"><color red="0.07" green="0.07" blue="0.07" /></text>
+	</element>
+	<element name="text_b9">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="E5"><color red="0.07" green="0.07" blue="0.07" /></text>
+	</element>
+	<element name="text_b10">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="F6"><color red="0.07" green="0.07" blue="0.07" /></text>
+	</element>
+	<element name="text_b11">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="G7"><color red="0.07" green="0.07" blue="0.07" /></text>
+	</element>
+	<element name="text_b12">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="H8"><color red="0.07" green="0.07" blue="0.07" /></text>
+	</element>
+
+
+<!-- build screen -->
+
+	<view name="Internal Layout">
+		<bounds left="-0.5" right="18" top="7.7" bottom="32" />
+
+	<!-- 7segs/leds -->
+
+		<element ref="text_check"><bounds x="1" y="8.2" width="8" height="2" /></element>
+		<element ref="text_lose"><bounds x="10.5" y="8.2" width="8" height="2" /></element>
+		<element name="4.a" ref="led"><bounds x="0" y="8.5" width="1.5" height="1.5" /></element>
+		<element name="5.a" ref="led"><bounds x="9.5" y="8.5" width="1.5" height="1.5" /></element>
+
+		<element ref="text_from"><bounds x="0" y="17.2" width="8" height="2" /></element>
+		<element ref="text_to"><bounds x="9.5" y="17.2" width="8" height="2" /></element>
+
+		<element name="digit0" ref="digit"><bounds x="0" y="11" width="4" height="6" /></element>
+		<element name="digit1" ref="digit"><bounds x="4" y="11" width="4" height="6" /></element>
+		<element name="digit2" ref="digit"><bounds x="9.5" y="11" width="4" height="6" /></element>
+		<element name="digit3" ref="digit"><bounds x="13.5" y="11" width="4" height="6" /></element>
+
+	<!-- button panel -->
+
+		<element ref="white"><bounds x="0" y="20" width="4" height="3.5" /></element>
+		<element ref="white"><bounds x="4.5" y="20" width="4" height="3.5" /></element>
+		<element ref="white"><bounds x="9" y="20" width="4" height="3.5" /></element>
+		<element ref="white"><bounds x="13.5" y="20" width="4" height="3.5" /></element>
+		<element ref="white"><bounds x="0" y="24" width="4" height="3.5" /></element>
+		<element ref="white"><bounds x="4.5" y="24" width="4" height="3.5" /></element>
+		<element ref="white"><bounds x="9" y="24" width="4" height="3.5" /></element>
+		<element ref="white"><bounds x="13.5" y="24" width="4" height="3.5" /></element>
+		<element ref="white"><bounds x="0" y="28" width="4" height="3.5" /></element>
+		<element ref="white"><bounds x="4.5" y="28" width="4" height="3.5" /></element>
+		<element ref="white"><bounds x="9" y="28" width="4" height="3.5" /></element>
+		<element ref="white"><bounds x="13.5" y="28" width="4" height="3.5" /></element>
+
+		<element ref="text_b1"><bounds x="0.1" y="20.75" width="3.8" height="2" /></element>
+		<element ref="text_b2a" blend="multiply"><bounds x="4.6" y="19.9" width="3.8" height="2" /></element>
+		<element ref="text_b2b" blend="multiply"><bounds x="4.6" y="21.6" width="3.8" height="2" /></element>
+		<element ref="text_b3"><bounds x="9.1" y="20.75" width="3.8" height="2" /></element>
+		<element ref="text_b4"><bounds x="13.6" y="20.75" width="3.8" height="2" /></element>
+		<element ref="text_b5"><bounds x="0.1" y="24.75" width="3.8" height="2" /></element>
+		<element ref="text_b6"><bounds x="4.6" y="24.75" width="3.8" height="2" /></element>
+		<element ref="text_b7"><bounds x="9.1" y="24.75" width="3.8" height="2" /></element>
+		<element ref="text_b8"><bounds x="13.6" y="24.75" width="3.8" height="2" /></element>
+		<element ref="text_b9"><bounds x="0.1" y="28.75" width="3.8" height="2" /></element>
+		<element ref="text_b10"><bounds x="4.6" y="28.75" width="3.8" height="2" /></element>
+		<element ref="text_b11"><bounds x="9.1" y="28.75" width="3.8" height="2" /></element>
+		<element ref="text_b12"><bounds x="13.6" y="28.75" width="3.8" height="2" /></element>
+
+		<element ref="gray" blend="multiply"><bounds x="-0.2" y="19.8" width="17.9" height="11.9" /></element>
+
+		<element ref="hl" inputtag="RESET" inputmask="0x01"><bounds x="0" y="20" width="4" height="3.5" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x02"><bounds x="4.5" y="20" width="4" height="3.5" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x04"><bounds x="9" y="20" width="4" height="3.5" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x01"><bounds x="13.5" y="20" width="4" height="3.5" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x80"><bounds x="0" y="24" width="4" height="3.5" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x40"><bounds x="4.5" y="24" width="4" height="3.5" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x20"><bounds x="9" y="24" width="4" height="3.5" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x10"><bounds x="13.5" y="24" width="4" height="3.5" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x08"><bounds x="0" y="28" width="4" height="3.5" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x04"><bounds x="4.5" y="28" width="4" height="3.5" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x02"><bounds x="9" y="28" width="4" height="3.5" /><color alpha="0.2" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x01"><bounds x="13.5" y="28" width="4" height="3.5" /><color alpha="0.2" /></element>
+
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/finallap.lay mame-0.224+dfsg.1/src/mame/layout/finallap.lay
--- mame-0.222+dfsg.1/src/mame/layout/finallap.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/finallap.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="MCUH" inputmask="0x20">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="MCUH" inputmask="0x20">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/fts2in1.lay mame-0.224+dfsg.1/src/mame/layout/fts2in1.lay
--- mame-0.222+dfsg.1/src/mame/layout/fts2in1.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/fts2in1.lay	2020-08-26 08:57:19.000000000 +0000
@@ -1,190 +1,262 @@
 <?xml version="1.0"?>
 <!--
 license:CC0
--->
+copyright-holders:Vas Crabb
 
+Super Two in One control panel
+Based on recommended button layout in manual
+-->
 <mamelayout version="2">
-	<element name="bluelamp" defstate="0">
+
+	<!-- define button-lamps -->
+
+	<element name="hold1" defstate="0">
+		<rect state="1">
+			<color red="1.0" green="0.5" blue="0.0" />
+		</rect>
+		<rect state="0">
+			<color red="0.15" green="0.075" blue="0.0" />
+		</rect>
+		<text string="LEFT STOP">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.1" width="1" height="0.25" />
+		</text>
+		<text string="TAKE SCORE">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.375" width="1" height="0.25" />
+		</text>
+		<text string="HOLD 1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.65" width="1" height="0.25" />
+		</text>
+	</element>
+
+	<element name="hold2" defstate="0">
+		<rect state="1">
+			<color red="1.0" green="0.5" blue="0.0" />
+		</rect>
+		<rect state="0">
+			<color red="0.15" green="0.075" blue="0.0" />
+		</rect>
+		<text string="CENTER STOP">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.1" width="1" height="0.25" />
+		</text>
+		<text string="BIG">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.375" width="1" height="0.25" />
+		</text>
+		<text string="HOLD 2">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.65" width="1" height="0.25" />
+		</text>
+	</element>
+
+	<element name="hold3" defstate="0">
+		<rect state="1">
+			<color red="1.0" green="0.5" blue="0.0" />
+		</rect>
+		<rect state="0">
+			<color red="0.15" green="0.075" blue="0.0" />
+		</rect>
+		<text string="RIGHT STOP">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.1" width="1" height="0.25" />
+		</text>
+		<text string="SMALL">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.375" width="1" height="0.25" />
+		</text>
+		<text string="HOLD 3">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.65" width="1" height="0.25" />
+		</text>
+	</element>
+
+	<element name="hold4" defstate="0">
+		<rect state="1">
+			<color red="1.0" green="0.5" blue="0.0" />
+		</rect>
+		<rect state="0">
+			<color red="0.15" green="0.075" blue="0.0" />
+		</rect>
+		<text string="DOUBLE-UP">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.375" width="1" height="0.25" />
+		</text>
+		<text string="HOLD 4">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.65" width="1" height="0.25" />
+		</text>
+	</element>
+
+	<element name="hold5" defstate="0">
+		<rect state="1">
+			<color red="1.0" green="0.5" blue="0.0" />
+		</rect>
+		<rect state="0">
+			<color red="0.15" green="0.075" blue="0.0" />
+		</rect>
+		<text string="BET">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.375" width="1" height="0.25" />
+		</text>
+		<text string="HOLD 5">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.65" width="1" height="0.25" />
+		</text>
+	</element>
+
+	<element name="start" defstate="0">
+		<rect state="1">
+			<color red="0.0" green="1.0" blue="0.0" />
+		</rect>
+		<rect state="0">
+			<color red="0.0" green="0.15" blue="0.0" />
+		</rect>
+		<text string="ALL STOP">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.1" width="1" height="0.25" />
+		</text>
+		<text string="START">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0.375" width="1" height="0.25" />
+		</text>
+	</element>
+
+
+	<!-- define basic elements -->
+
+	<element name="cpanel">
+		<rect>
+			<color red="0.0" green="0.0" blue="0.0" />
+		</rect>
+	</element>
+
+	<element name="hold_b" defstate="0">
+		<rect state="1">
+			<color red="0.7" green="0.35" blue="0.0" />
+		</rect>
+		<rect state="0">
+			<color red="0.1" green="0.05" blue="0.0" />
+		</rect>
+	</element>
+
+	<element name="start_b" defstate="0">
 		<rect state="1">
-			<color red="0.2" green="0.2" blue="1.0" />
+			<color red="0.0" green="0.7" blue="0.0" />
 		</rect>
 		<rect state="0">
-			<color red="0.04" green="0.04" blue="0.20" />
+			<color red="0.0" green="0.1" blue="0.0" />
 		</rect>
 	</element>
 
-  <element name="stop1" defstate="0">
-	<rect state="1">
-	  <color red="0.2" green="0.2" blue="1.0" />
-	</rect>
-	<rect state="0">
-	  <color red="0.04" green="0.04" blue="0.20" />
-	</rect>
-
-	<text string="HOLD 1">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.05" width="1" height="0.25" />
-	</text>
-
-	<text string="STOP 1">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.35" width="1" height="0.25" />
-	</text>
-
-	<text string="TAKE">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.65" width="1" height="0.25" />
-	</text>
-  </element>
-
-  <element name="stop2" defstate="0">
-	<rect state="1">
-	  <color red="0.2" green="0.2" blue="1.0" />
-	</rect>
-	<rect state="0">
-	  <color red="0.04" green="0.04" blue="0.20" />
-	</rect>
-
-	<text string="HOLD 2">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.05" width="1" height="0.25" />
-	</text>
-
-	<text string="STOP 2">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.35" width="1" height="0.25" />
-	</text>
-
-	<text string="BIG">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.65" width="1" height="0.25" />
-	</text>
-  </element>
-
-  <element name="stop3" defstate="0">
-	<rect state="1">
-	  <color red="0.2" green="0.2" blue="1.0" />
-	</rect>
-	<rect state="0">
-	  <color red="0.04" green="0.04" blue="0.20" />
-	</rect>
-
-	<text string="HOLD 3">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.05" width="1" height="0.25" />
-	</text>
-
-	<text string="STOP 3">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.35" width="1" height="0.25" />
-	</text>
-
-	<text string="SMALL">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.65" width="1" height="0.25" />
-	</text>
-  </element>
-
-  <element name="hold4" defstate="0">
-	<rect state="1">
-	  <color red="0.2" green="0.2" blue="1.0" />
-	</rect>
-	<rect state="0">
-	  <color red="0.04" green="0.04" blue="0.20" />
-	</rect>
-
-	<text string="HOLD 4">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.05" width="1" height="0.25" />
-	</text>
-
-	<text string="DOUBLE">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.65" width="1" height="0.25" />
-	</text>
-  </element>
-
-  <element name="hold5" defstate="0">
-	<rect state="1">
-	  <color red="0.2" green="0.2" blue="1.0" />
-	</rect>
-	<rect state="0">
-	  <color red="0.04" green="0.04" blue="0.20" />
-	</rect>
-
-	<text string="HOLD 5">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.05" width="1" height="0.25" />
-	</text>
-
-	<text string="BET">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.65" width="1" height="0.25" />
-	</text>
-  </element>
-
-  <element name="start1" defstate="0">
-	<rect state="1">
-	  <color red="0.2" green="0.2" blue="1.0" />
-	</rect>
-	<rect state="0">
-	  <color red="0.04" green="0.04" blue="0.20" />
-	</rect>
-
-	<text string="START">
-	  <color red="1.0" green="0.0" blue="0.0" />
-	  <bounds x="0" y="0.05" width="1" height="0.25" />
-	</text>
-  </element>
 
-  <view name="Simple Artwork">
-		<bounds left="0" right="400" top="0" bottom="330" />
+	<!-- define cpanel degradee elements -->
+
+	<element name="cpanel1">
+		<rect>
+			<color red="0.20" green="0.20" blue="0.20" />
+		</rect>
+	</element>
+
+	<element name="cpanel2">
+		<rect>
+			<color red="0.15" green="0.15" blue="0.15" />
+		</rect>
+	</element>
+
+	<element name="cpanel3">
+		<rect>
+			<color red="0.10" green="0.10" blue="0.10" />
+		</rect>
+	</element>
+
+	<element name="cpanel4">
+		<rect>
+			<color red="0.05" green="0.05" blue="0.05" />
+		</rect>
+	</element>
+
+
+	<view name="Button Lamps">
 		<screen index="0">
-			<bounds left="0" right="400" top="0" bottom="300" />
+			<bounds left="0" top="0" right="4" bottom="3" />
 		</screen>
 
-	<!-- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_START1 ) (port IN1) -->
-	<bezel name="lamp1" element="start1" inputtag="IN1" inputmask="0x40">
-			<bounds x="10" y="312" width="16" height="16" />
-		</bezel>
-
-	<!-- PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_BUTTON1 ) PORT_NAME("Hold 1, Take, Odds, Stop 1") -->
-	<bezel name="lamp5" element="stop1" inputtag="IN0" inputmask="0x10">
-	  <bounds x="30" y="312" width="16" height="16" />
-	</bezel>
-
-	<!-- PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_NAME("Hold 2, Big, Stop 2") -->
-	<bezel name="lamp3" element="stop2" inputtag="IN0" inputmask="0x80">
-	  <bounds x="50" y="312" width="16" height="16" />
-	</bezel>
-
-	<!-- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON3 ) PORT_NAME("Hold 3, Small, Stop 3") -->
-	<bezel name="lamp2" element="stop3" inputtag="IN0" inputmask="0x40">
-	  <bounds x="70" y="312" width="16" height="16" />
-	</bezel>
-
-	<!-- PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_BUTTON4 ) PORT_NAME("Hold 4, Double") -->
-	<bezel name="lamp4" element="hold4" inputtag="IN0" inputmask="0x20">
-	  <bounds x="90" y="312" width="16" height="16" />
-	</bezel>
-
-	<!-- PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_BUTTON5 ) PORT_NAME("Hold 5, Bet") -->
-	<bezel name="lamp0" element="hold5" inputtag="IN0" inputmask="0x01" >
-	  <bounds x="110" y="312" width="16" height="16" />
-	</bezel>
-
-	<!-- gets set when displaying a hand in poker, doesn't seem button related -->
-		<!--
-	<bezel name="lamp6" element="bluelamp">
-		    <bounds x="130" y="312" width="16" height="16" />
-		</bezel>
-	-->
-
-	<!-- always set, maybe cabinet marquee or just global enable? -->
-		<!--
-	<bezel name="lamp7" element="bluelamp">
-		    <bounds x="150" y="312" width="16" height="16" />
+		<bezel element="cpanel">
+			<bounds left="0" right="4" top="3" bottom="3.40" />
+		</bezel>
+
+		<bezel element="cpanel1">
+			<bounds left="0" right="4" top="3.01" bottom="3.39" />
+		</bezel>
+
+		<bezel element="cpanel2">
+			<bounds left="0" right="4" top="3.02" bottom="3.38" />
+		</bezel>
+
+		<bezel element="cpanel3">
+			<bounds left="0" right="4" top="3.03" bottom="3.37" />
+		</bezel>
+
+		<bezel element="cpanel4">
+			<bounds left="0" right="4" top="3.04" bottom="3.36" />
+		</bezel>
+
+		<bezel element="cpanel">
+			<bounds left="0" right="4" top="3.05" bottom="3.35" />
+		</bezel>
+
+
+		<!-- define lamps -->
+
+		<bezel name="lamp5" element="hold_b" inputtag="IN0" inputmask="0x10">
+			<bounds x="0.05" y="3.08" width="0.50" height="0.24" />
+		</bezel>
+		<bezel name="lamp5" element="hold1" inputtag="IN0" inputmask="0x10">
+			<bounds x="0.07" y="3.10" width="0.46" height="0.20" />
+		</bezel>
+
+
+		<bezel name="lamp3" element="hold_b" inputtag="IN0" inputmask="0x80">
+			<bounds x="0.72" y="3.08" width="0.50" height="0.24" />
 		</bezel>
-	-->
+		<bezel name="lamp3" element="hold2" inputtag="IN0" inputmask="0x80">
+			<bounds x="0.74" y="3.10" width="0.46" height="0.20" />
+		</bezel>
+
+
+		<bezel name="lamp2" element="hold_b" inputtag="IN0" inputmask="0x40">
+			<bounds x="1.39" y="3.08" width="0.50" height="0.24" />
+		</bezel>
+		<bezel name="lamp2" element="hold3" inputtag="IN0" inputmask="0x40">
+			<bounds x="1.41" y="3.10" width="0.46" height="0.20" />
+		</bezel>
+
+
+		<bezel name="lamp4" element="hold_b" inputtag="IN0" inputmask="0x20">
+			<bounds x="2.06" y="3.08" width="0.50" height="0.24" />
+		</bezel>
+		<bezel name="lamp4" element="hold4" inputtag="IN0" inputmask="0x20">
+			<bounds x="2.08" y="3.10" width="0.46" height="0.20" />
+		</bezel>
+
+
+		<bezel name="lamp0" element="hold_b" inputtag="IN0" inputmask="0x01">
+			<bounds x="2.73" y="3.08" width="0.50" height="0.24" />
+		</bezel>
+		<bezel name="lamp0" element="hold5" inputtag="IN0" inputmask="0x01">
+			<bounds x="2.75" y="3.10" width="0.46" height="0.20" />
+		</bezel>
+
+
+		<bezel name="lamp1" element="start_b" inputtag="IN1" inputmask="0x40">
+			<bounds x="3.45" y="3.08" width="0.50" height="0.24" />
+		</bezel>
+		<bezel name="lamp1" element="start" inputtag="IN1" inputmask="0x40">
+			<bounds x="3.47" y="3.10" width="0.46" height="0.20" />
+		</bezel>
+
 	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/gigatron.lay mame-0.224+dfsg.1/src/mame/layout/gigatron.lay
--- mame-0.222+dfsg.1/src/mame/layout/gigatron.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/gigatron.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+	<element name="led" defstate="0">
+		<rect state="1">
+			<color red="0.75" green="0.0" blue="0.0" />
+		</rect>
+		<rect state="0">
+			<color red="0.20" green="0.0" blue="0.0" />
+		</rect>
+	</element>
+
+	<view name="Default Layout">
+		<screen index="0">
+			<bounds x="0" y="30" width="640" height="480" />
+		</screen>
+		<bezel name="blinken1" element="led">
+			<bounds x="15" y="15" width="10" height="10" />
+		</bezel>
+		<bezel name="blinken2" element="led">
+			<bounds x="30" y="15" width="10" height="10" />
+		</bezel>
+		<bezel name="blinken3" element="led">
+			<bounds x="45" y="15" width="10" height="10" />
+		</bezel>
+		<bezel name="blinken4" element="led">
+			<bounds x="60" y="15" width="10" height="10" />
+		</bezel>
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/grchamp.lay mame-0.224+dfsg.1/src/mame/layout/grchamp.lay
--- mame-0.222+dfsg.1/src/mame/layout/grchamp.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/grchamp.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,40 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="TILT" inputmask="0x04">
+			<bounds x="496" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="TILT" inputmask="0x04">
+			<bounds x="-48" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Vertical Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="TILT" inputmask="0x04">
+			<bounds x="446" y="648" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Vertical Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="TILT" inputmask="0x04">
+			<bounds x="2" y="648" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/k1003.lay mame-0.224+dfsg.1/src/mame/layout/k1003.lay
--- mame-0.222+dfsg.1/src/mame/layout/k1003.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/k1003.lay	2020-08-26 08:57:19.000000000 +0000
@@ -22,53 +22,53 @@
 		</bezel>
 
 		<!-- first 2 digits are away from others -->
-		<bezel name="digit0" element="digit">
+		<bezel name="digit1" element="digit">
 			<bounds left="0" top="10" right="48" bottom="90" />
 		</bezel>
-		<bezel name="digit1" element="digit">
+		<bezel name="digit0" element="digit">
 			<bounds left="48" top="10" right="96" bottom="90" />
 		</bezel>
 
-		<bezel name="digit2" element="digit">
+		<bezel name="digit15" element="digit">
 			<bounds left="196" top="10" right="244" bottom="90" />
 		</bezel>
-		<bezel name="digit3" element="digit">
+		<bezel name="digit14" element="digit">
 			<bounds left="244" top="10" right="292" bottom="90" />
 		</bezel>
-		<bezel name="digit4" element="digit">
+		<bezel name="digit13" element="digit">
 			<bounds left="292" top="10" right="340" bottom="90" />
 		</bezel>
-		<bezel name="digit5" element="digit">
+		<bezel name="digit12" element="digit">
 			<bounds left="340" top="10" right="388" bottom="90" />
 		</bezel>
-		<bezel name="digit6" element="digit">
+		<bezel name="digit11" element="digit">
 			<bounds left="388" top="10" right="436" bottom="90" />
 		</bezel>
-		<bezel name="digit7" element="digit">
+		<bezel name="digit10" element="digit">
 			<bounds left="436" top="10" right="484" bottom="90" />
 		</bezel>
-		<bezel name="digit8" element="digit">
+		<bezel name="digit9" element="digit">
 			<bounds left="484" top="10" right="532" bottom="90" />
 		</bezel>
-		<bezel name="digit9" element="digit">
+		<bezel name="digit8" element="digit">
 			<bounds left="532" top="10" right="580" bottom="90" />
 		</bezel>
-		<bezel name="digit10" element="digit">
+		<bezel name="digit7" element="digit">
 			<bounds left="580" top="10" right="628" bottom="90" />
 		</bezel>
-		<bezel name="digit11" element="digit">
+		<bezel name="digit6" element="digit">
 			<bounds left="628" top="10" right="676" bottom="90" />
 		</bezel>
-		<bezel name="digit12" element="digit">
+		<bezel name="digit5" element="digit">
 			<bounds left="676" top="10" right="724" bottom="90" />
 		</bezel>
-		<bezel name="digit13" element="digit">
+		<bezel name="digit4" element="digit">
 			<bounds left="772" top="10" right="820" bottom="90" />
 		</bezel>
-		<bezel name="digit14" element="digit">
+		<bezel name="digit3" element="digit">
 			<bounds left="820" top="10" right="868" bottom="90" />
 		</bezel>
-		<bezel name="digit15" element="digit">
+		<bezel name="digit2" element="digit">
 			<bounds left="868" top="10" right="916" bottom="90" />
 		</bezel>
 	</view>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/konamigt.lay mame-0.224+dfsg.1/src/mame/layout/konamigt.lay
--- mame-0.222+dfsg.1/src/mame/layout/konamigt.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/konamigt.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN1" inputmask="0x10">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN1" inputmask="0x10">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/lagunar.lay mame-0.224+dfsg.1/src/mame/layout/lagunar.lay
--- mame-0.222+dfsg.1/src/mame/layout/lagunar.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/lagunar.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,40 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x10">
+			<bounds x="496" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x10">
+			<bounds x="-48" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Vertical Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x10">
+			<bounds x="446" y="648" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Vertical Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x10">
+			<bounds x="2" y="648" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/mephisto_academy.lay mame-0.224+dfsg.1/src/mame/layout/mephisto_academy.lay
--- mame-0.222+dfsg.1/src/mame/layout/mephisto_academy.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/mephisto_academy.lay	2020-08-26 08:57:19.000000000 +0000
@@ -3,7 +3,21 @@
 license:CC0
 -->
 <mamelayout version="2">
+
 <!-- define elements -->
+
+	<element name="ledo">
+		<disk><color red="0.1" green="0.1" blue="0.1" /></disk>
+	</element>
+	<element name="ledr" defstate="0">
+		<disk state="0"><color red="0" green="0" blue="0" /></disk>
+		<disk state="1"><color red="1" green="0" blue="0" /></disk>
+	</element>
+	<element name="ledg" defstate="0">
+		<disk state="0"><color red="0" green="0" blue="0" /></disk>
+		<disk state="1"><color red="0" green="1" blue="0" /></disk>
+	</element>
+
 	<element name="led" defstate="0">
 		<disk state="0">
 			<color red="0.20" green="0.0" blue="0.0" />
@@ -389,47 +403,65 @@
 	</group>
 
 	<group name="panel">
-		<bounds left="0" right="75.25" top="0" bottom="8.5" />
+		<bounds left="0" right="100" top="0" bottom="10" />
 
 		<bezel element="text_lcd"><bounds x="1" y="6.5" width="24" height="1.7" /></bezel>
 		<group ref="lcd"><bounds x="1" y="0" width="23.55" height="6.25" /></group>
 
-		<bezel name="led100" element="led">     <bounds x="29.1" y="0.1" width="1.3" height="1.3" />    </bezel>
-		<bezel name="led101" element="led">     <bounds x="35.1" y="0.1" width="1.3" height="1.3" />    </bezel>
-		<bezel name="led102" element="led">     <bounds x="41.1" y="0.1" width="1.3" height="1.3" />    </bezel>
-		<bezel name="led103" element="led">     <bounds x="47.1" y="0.1" width="1.3" height="1.3" />    </bezel>
-		<bezel name="led108" element="led">     <bounds x="54.1" y="0.1" width="1.3" height="1.3" />    </bezel>
-		<bezel name="led109" element="led">     <bounds x="60.1" y="0.1" width="1.3" height="1.3" />    </bezel>
-		<bezel name="led114" element="led">     <bounds x="66.1" y="0.1" width="1.3" height="1.3" />    </bezel>
-		<bezel name="led115" element="led">     <bounds x="72.1" y="0.1" width="1.3" height="1.3" />    </bezel>
-
-		<bezel element="text_train">            <bounds x="27.25" y="2" width="5" height="1.5" />   </bezel>
-		<bezel element="text_info">         <bounds x="33.25" y="2" width="5" height="1.5" />   </bezel>
-		<bezel element="text_mem">          <bounds x="39.25" y="2" width="5" height="1.5" />   </bezel>
-		<bezel element="text_pos">          <bounds x="45.25" y="2" width="5" height="1.5" />   </bezel>
-		<bezel element="text_lev">          <bounds x="52.25" y="2" width="5" height="1.5" />   </bezel>
-		<bezel element="text_fct">          <bounds x="58.25" y="2" width="5" height="1.5" />   </bezel>
-		<bezel element="text_ent">          <bounds x="64.25" y="2" width="5" height="1.5" />   </bezel>
-		<bezel element="text_cl">           <bounds x="71.25" y="2" width="3" height="1.5" />   </bezel>
-
-		<bezel element="text_p6">           <bounds x="27.25" y="6.5" width="5" height="1.5" /> </bezel>
-		<bezel element="text_p5">           <bounds x="33.25" y="6.5" width="5" height="1.5" /> </bezel>
-		<bezel element="text_p4">           <bounds x="39.25" y="6.5" width="5" height="1.5" /> </bezel>
-		<bezel element="text_p3">           <bounds x="45.25" y="6.5" width="5" height="1.5" /> </bezel>
-		<bezel element="text_p2">           <bounds x="52.25" y="6.5" width="5" height="1.5" /> </bezel>
-		<bezel element="text_p1">           <bounds x="58.25" y="6.5" width="5" height="1.5" /> </bezel>
-		<bezel element="text_newgame">      <bounds x="65.25" y="6.70" width="9" height="1.5" />    </bezel>
-		<bezel element="text_black">        <bounds x="64" y="0" width="2" height="1.3" />  </bezel>
-		<bezel element="text_white">        <bounds x="70" y="0" width="2" height="1.3" />  </bezel>
-
-		<bezel element="hlb" inputtag="KEY" inputmask="0x01">       <bounds x="29" y="3.75" width="1.5" height="2.5" /> </bezel>
-		<bezel element="hlb" inputtag="KEY" inputmask="0x02">       <bounds x="35" y="3.75" width="1.5" height="2.5" /> </bezel>
-		<bezel element="hlb" inputtag="KEY" inputmask="0x04">       <bounds x="41" y="3.75" width="1.5" height="2.5" /> </bezel>
-		<bezel element="hlb" inputtag="KEY" inputmask="0x08">       <bounds x="47" y="3.75" width="1.5" height="2.5" /> </bezel>
-		<bezel element="hlb" inputtag="KEY" inputmask="0x10">       <bounds x="54" y="3.75" width="1.5" height="2.5" /> </bezel>
-		<bezel element="hlb" inputtag="KEY" inputmask="0x20">       <bounds x="60" y="3.75" width="1.5" height="2.5" /> </bezel>
-		<bezel element="hlbr" inputtag="KEY" inputmask="0x40">      <bounds x="66" y="3.75" width="1.5" height="2.5" /> </bezel>
-		<bezel element="hlbr" inputtag="KEY" inputmask="0x80">      <bounds x="72" y="3.75" width="1.5" height="2.5" /> </bezel>
+		<bezel element="text_train">        <bounds x="29.25" y="2" width="5" height="1.5" />   </bezel>
+		<bezel element="text_info">         <bounds x="35.25" y="2" width="5" height="1.5" />   </bezel>
+		<bezel element="text_mem">          <bounds x="41.25" y="2" width="5" height="1.5" />   </bezel>
+		<bezel element="text_pos">          <bounds x="47.25" y="2" width="5" height="1.5" />   </bezel>
+		<bezel element="text_lev">          <bounds x="53.25" y="2" width="5" height="1.5" />   </bezel>
+		<bezel element="text_fct">          <bounds x="59.25" y="2" width="5" height="1.5" />   </bezel>
+		<bezel element="text_ent">          <bounds x="67.25" y="2" width="5" height="1.5" />   </bezel>
+		<bezel element="text_cl">           <bounds x="74.25" y="2" width="3" height="1.5" />   </bezel>
+
+		<bezel element="text_p6">           <bounds x="29.25" y="6.5" width="5" height="1.5" /> </bezel>
+		<bezel element="text_p5">           <bounds x="35.25" y="6.5" width="5" height="1.5" /> </bezel>
+		<bezel element="text_p4">           <bounds x="41.25" y="6.5" width="5" height="1.5" /> </bezel>
+		<bezel element="text_p3">           <bounds x="47.25" y="6.5" width="5" height="1.5" /> </bezel>
+		<bezel element="text_p2">           <bounds x="53.25" y="6.5" width="5" height="1.5" /> </bezel>
+		<bezel element="text_p1">           <bounds x="59.25" y="6.5" width="5" height="1.5" /> </bezel>
+		<bezel element="text_newgame">      <bounds x="68.25" y="6.70" width="9" height="1.5" />    </bezel>
+		<bezel element="text_black">        <bounds x="67" y="0" width="2" height="1.3" />  </bezel>
+		<bezel element="text_white">        <bounds x="73" y="0" width="2" height="1.3" />  </bezel>
+
+		<bezel element="hlb" inputtag="KEY" inputmask="0x01">       <bounds x="31" y="3.75" width="1.5" height="2.5" /> </bezel>
+		<bezel element="hlb" inputtag="KEY" inputmask="0x02">       <bounds x="37" y="3.75" width="1.5" height="2.5" /> </bezel>
+		<bezel element="hlb" inputtag="KEY" inputmask="0x04">       <bounds x="43" y="3.75" width="1.5" height="2.5" /> </bezel>
+		<bezel element="hlb" inputtag="KEY" inputmask="0x08">       <bounds x="49" y="3.75" width="1.5" height="2.5" /> </bezel>
+		<bezel element="hlb" inputtag="KEY" inputmask="0x10">       <bounds x="55" y="3.75" width="1.5" height="2.5" /> </bezel>
+		<bezel element="hlb" inputtag="KEY" inputmask="0x20">       <bounds x="61" y="3.75" width="1.5" height="2.5" /> </bezel>
+		<bezel element="hlbr" inputtag="KEY" inputmask="0x40">      <bounds x="69" y="3.75" width="1.5" height="2.5" /> </bezel>
+		<bezel element="hlbr" inputtag="KEY" inputmask="0x80">      <bounds x="75" y="3.75" width="1.5" height="2.5" /> </bezel>
+
+		<element ref="ledo"><bounds x="31.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element ref="ledo"><bounds x="37.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element ref="ledo"><bounds x="43.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element ref="ledo"><bounds x="49.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element ref="ledo"><bounds x="55.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element ref="ledo"><bounds x="61.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element ref="ledo"><bounds x="69.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element ref="ledo"><bounds x="75.1" y="0.1" width="1.3" height="1.3" /></element>
+
+		<element name="0.0" ref="ledr" blend="add"><bounds x="31.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="1.0" ref="ledr" blend="add"><bounds x="37.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="2.0" ref="ledr" blend="add"><bounds x="43.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="3.0" ref="ledr" blend="add"><bounds x="49.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="0.2" ref="ledr" blend="add"><bounds x="55.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="1.2" ref="ledr" blend="add"><bounds x="61.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="2.2" ref="ledr" blend="add"><bounds x="69.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="3.2" ref="ledr" blend="add"><bounds x="75.1" y="0.1" width="1.3" height="1.3" /></element>
+
+		<element name="0.1" ref="ledg" blend="add"><bounds x="31.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="1.1" ref="ledg" blend="add"><bounds x="37.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="2.1" ref="ledg" blend="add"><bounds x="43.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="3.1" ref="ledg" blend="add"><bounds x="49.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="0.3" ref="ledg" blend="add"><bounds x="55.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="1.3" ref="ledg" blend="add"><bounds x="61.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="2.3" ref="ledg" blend="add"><bounds x="69.1" y="0.1" width="1.3" height="1.3" /></element>
+		<element name="3.3" ref="ledg" blend="add"><bounds x="75.1" y="0.1" width="1.3" height="1.3" /></element>
 	</group>
 
 
@@ -439,7 +471,7 @@
 		<bounds left="0" right="100" top="0" bottom="98" />
 		<element ref="background"><bounds x="13" y="0" width="87" height="98" /></element>
 
-	<!-- chessboard coords -->
+		<!-- chessboard coords -->
 		<bezel element="white"><bounds x="16.5" y="2.5" width="81" height="81" /></bezel>
 		<bezel element="text_8"><bounds x="13.7" y="7" width="2" height="2" /></bezel>
 		<bezel element="text_7"><bounds x="13.7" y="17" width="2" height="2" /></bezel>
@@ -459,9 +491,8 @@
 		<bezel element="text_g"><bounds x="81" y="84.5" width="2" height="2" /></bezel>
 		<bezel element="text_h"><bounds x="91" y="84.5" width="2" height="2" /></bezel>
 
-
-	<!-- LCD panel -->
-		<group ref="panel"><bounds x="18" y="88" width="75.25" height="8.5" /></group>
+		<!-- LCD panel -->
+		<group ref="panel"><bounds x="18" y="88" width="100" height="10" /></group>
 
 		<group ref="sb_board"><bounds x="17" y="3" width="80" height="80" /></group>
 		<group ref="sb_ui"><bounds x="1.5" y="3" width="10" height="80" /></group>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/namcofl.lay mame-0.224+dfsg.1/src/mame/layout/namcofl.lay
--- mame-0.222+dfsg.1/src/mame/layout/namcofl.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/namcofl.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN1" inputmask="0x10">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN1" inputmask="0x10">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/novag_cforte.lay mame-0.224+dfsg.1/src/mame/layout/novag_cforte.lay
--- mame-0.222+dfsg.1/src/mame/layout/novag_cforte.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/novag_cforte.lay	2020-08-26 08:57:19.000000000 +0000
@@ -142,12 +142,12 @@
 	<element name="text_r8a"><text string="Go"><color red="0.51" green="0.5" blue="0.49" /></text></element>
 	<element name="text_r8b"><text string=" "><color red="0.51" green="0.5" blue="0.49" /></text></element>
 
-	<element name="text_p7"><image file="chess/bp.png"/></element>
-	<element name="text_p8"><image file="chess/bn.png"/></element>
-	<element name="text_p9"><image file="chess/bb.png"/></element>
-	<element name="text_p10"><image file="chess/br.png"/></element>
-	<element name="text_p11"><image file="chess/bq.png"/></element>
-	<element name="text_p12"><image file="chess/bk.png"/></element>
+	<element name="text_p1"><image file="chess/bk.png"><color alpha="0.85" /></image></element>
+	<element name="text_p2"><image file="chess/bq.png"><color alpha="0.85" /></image></element>
+	<element name="text_p3"><image file="chess/bb.png"><color alpha="0.85" /></image></element>
+	<element name="text_p4"><image file="chess/bn.png"><color alpha="0.85" /></image></element>
+	<element name="text_p5"><image file="chess/br.png"><color alpha="0.85" /></image></element>
+	<element name="text_p6"><image file="chess/bp.png"><color alpha="0.85" /></image></element>
 
 
 <!-- sb board -->
@@ -536,12 +536,12 @@
 		<bezel element="white"><bounds x="101.4" y="70.44" width="5.7" height="3.7" /></bezel>
 		<bezel element="static_red"><bounds x="101.4" y="78.15" width="5.7" height="3.7" /></bezel>
 
-		<bezel element="text_p12"><bounds x="93.33" y="24.70" width="2.5" height="2.5" /><color alpha="0.9" /></bezel>
-		<bezel element="text_p11"><bounds x="93.33" y="32.41" width="2.5" height="2.5" /><color alpha="0.9" /></bezel>
-		<bezel element="text_p9"><bounds x="93.33" y="40.13" width="2.5" height="2.5" /><color alpha="0.9" /></bezel>
-		<bezel element="text_p8"><bounds x="93.33" y="47.84" width="2.5" height="2.5" /><color alpha="0.9" /></bezel>
-		<bezel element="text_p10"><bounds x="93.33" y="55.56" width="2.5" height="2.5" /><color alpha="0.9" /></bezel>
-		<bezel element="text_p7"><bounds x="93.33" y="63.27" width="2.5" height="2.5" /><color alpha="0.9" /></bezel>
+		<bezel element="text_p1"><bounds x="93.18" y="24.50" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p2"><bounds x="93.18" y="32.21" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p3"><bounds x="93.18" y="39.93" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p4"><bounds x="93.18" y="47.64" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p5"><bounds x="93.18" y="55.36" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p6"><bounds x="93.18" y="63.07" width="2.9" height="2.9" /></bezel>
 
 		<bezel element="text_r2x"><bounds x="101.4" y="33.01" width="5.7" height="1.4" /></bezel>
 		<bezel element="text_r3x"><bounds x="101.4" y="40.73" width="5.7" height="1.4" /></bezel>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/novag_micro.lay mame-0.224+dfsg.1/src/mame/layout/novag_micro.lay
--- mame-0.222+dfsg.1/src/mame/layout/novag_micro.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/novag_micro.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,489 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+
+<!-- define elements -->
+
+	<element name="whitew"><rect><color red="1" green="1" blue="1" /></rect></element>
+	<element name="white2"><rect><color red="0.9" green="0.9" blue="0.92" /></rect></element>
+	<element name="whitem"><rect><color red="0.69" green="0.68" blue="0.67" /></rect></element>
+	<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
+	<element name="blacka"><rect><color red="0.12" green="0.12" blue="0.12" /></rect></element>
+
+	<element name="ledr" defstate="0">
+		<disk state="1"><color red="1.0" green="0.1" blue="0.15" /></disk>
+		<disk state="0"><color red="0.17" green="0.015" blue="0.02" /></disk>
+	</element>
+	<element name="ledg" defstate="0">
+		<disk state="1"><color red="0.1" green="0.95" blue="0.05" /></disk>
+		<disk state="0"><color red="0.015" green="0.16" blue="0.01" /></disk>
+	</element>
+
+	<element name="button" defstate="0">
+		<rect state="0"><color red="1.0" green="1.0" blue="1.0" /></rect>
+		<rect state="1"><color red="0.82" green="0.82" blue="0.82" /></rect>
+	</element>
+
+	<element name="text_1"><text string="1"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+
+	<element name="text_a"><text string="A"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+
+	<element name="text_l1"><text string="CHECK" align="2"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_l2"><text string="MATE" align="2"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_l3"><text string="ERROR" align="2"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+
+	<element name="text_l5"><text string="WHITE" align="1"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_l6"><text string="BLACK" align="1"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_l7"><text string="VERIFY" align="1"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+	<element name="text_l8"><text string="SET UP" align="1"><color red="0.85" green="0.85" blue="0.85" /></text></element>
+
+	<element name="text_b1">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="B/W"><color red="0" green="0" blue="0" /></text>
+	</element>
+	<element name="text_b2">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="VERIFY"><color red="0" green="0" blue="0" /></text>
+	</element>
+	<element name="text_b3">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="SET UP"><color red="0" green="0" blue="0" /></text>
+	</element>
+	<element name="text_b4">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="NEW GAME"><color red="0" green="0" blue="0" /></text>
+	</element>
+	<element name="text_b5">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="LEVEL"><color red="0" green="0" blue="0" /></text>
+	</element>
+	<element name="text_b6">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="SOUND"><color red="0" green="0" blue="0" /></text>
+	</element>
+	<element name="text_b7">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="TAKE BACK"><color red="0" green="0" blue="0" /></text>
+	</element>
+	<element name="text_b8">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="GO"><color red="0" green="0" blue="0" /></text>
+	</element>
+
+	<element name="text_p1"><image file="chess/bk.png"></image></element>
+	<element name="text_p2"><image file="chess/bq.png"></image></element>
+	<element name="text_p3"><image file="chess/br.png"></image></element>
+	<element name="text_p4"><image file="chess/bb.png"></image></element>
+	<element name="text_p5"><image file="chess/bn.png"></image></element>
+	<element name="text_p6"><image file="chess/bp.png"></image></element>
+
+
+<!-- sb board -->
+
+	<element name="cblack"><rect><color red="0.5" green="0.37" blue="0.3" /></rect></element>
+	<element name="cwhite"><rect><color red="0.81" green="0.8" blue="0.79" /></rect></element>
+
+	<element name="hlbb" defstate="0">
+		<text string=" "><bounds x="0" y="0" width="1" height="1" /></text>
+		<disk state="1">
+			<bounds x="0.12" y="0.12" width="0.76" height="0.76" />
+			<color red="0" green="0" blue="0" />
+		</disk>
+	</element>
+
+	<element name="piece" defstate="0">
+		<image file="chess/wp.png" state="1"/>
+		<image file="chess/wn.png" state="2"/>
+		<image file="chess/wb.png" state="3"/>
+		<image file="chess/wr.png" state="4"/>
+		<image file="chess/wq.png" state="5"/>
+		<image file="chess/wk.png" state="6"/>
+
+		<image file="chess/bp.png" state="7"/>
+		<image file="chess/bn.png" state="8"/>
+		<image file="chess/bb.png" state="9"/>
+		<image file="chess/br.png" state="10"/>
+		<image file="chess/bq.png" state="11"/>
+		<image file="chess/bk.png" state="12"/>
+
+		<!-- selected pieces -->
+		<image file="chess/wp.png" state="13"><color alpha="0.5" /></image>
+		<image file="chess/wn.png" state="14"><color alpha="0.5" /></image>
+		<image file="chess/wb.png" state="15"><color alpha="0.5" /></image>
+		<image file="chess/wr.png" state="16"><color alpha="0.5" /></image>
+		<image file="chess/wq.png" state="17"><color alpha="0.5" /></image>
+		<image file="chess/wk.png" state="18"><color alpha="0.5" /></image>
+
+		<image file="chess/bp.png" state="19"><color alpha="0.5" /></image>
+		<image file="chess/bn.png" state="20"><color alpha="0.5" /></image>
+		<image file="chess/bb.png" state="21"><color alpha="0.5" /></image>
+		<image file="chess/br.png" state="22"><color alpha="0.5" /></image>
+		<image file="chess/bq.png" state="23"><color alpha="0.5" /></image>
+		<image file="chess/bk.png" state="24"><color alpha="0.5" /></image>
+	</element>
+
+	<group name="sb_board">
+		<bounds x="0" y="0" width="80" height="80" />
+
+		<!-- squares (avoid seams) -->
+		<bezel element="cwhite"><bounds x="0"  y="0" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="10" y="0" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="20" y="0" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="30" y="0" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="40" y="0" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="50" y="0" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="60" y="0" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="70" y="0" width="10" height="11" /></bezel>
+
+		<bezel element="cblack"><bounds x="0"  y="10" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="10" y="10" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="20" y="10" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="30" y="10" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="40" y="10" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="50" y="10" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="60" y="10" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="70" y="10" width="10" height="11" /></bezel>
+
+		<bezel element="cwhite"><bounds x="0"  y="20" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="10" y="20" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="20" y="20" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="30" y="20" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="40" y="20" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="50" y="20" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="60" y="20" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="70" y="20" width="10" height="11" /></bezel>
+
+		<bezel element="cblack"><bounds x="0"  y="30" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="10" y="30" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="20" y="30" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="30" y="30" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="40" y="30" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="50" y="30" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="60" y="30" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="70" y="30" width="10" height="11" /></bezel>
+
+		<bezel element="cwhite"><bounds x="0"  y="40" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="10" y="40" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="20" y="40" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="30" y="40" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="40" y="40" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="50" y="40" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="60" y="40" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="70" y="40" width="10" height="11" /></bezel>
+
+		<bezel element="cblack"><bounds x="0"  y="50" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="10" y="50" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="20" y="50" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="30" y="50" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="40" y="50" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="50" y="50" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="60" y="50" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="70" y="50" width="10" height="11" /></bezel>
+
+		<bezel element="cwhite"><bounds x="0"  y="60" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="10" y="60" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="20" y="60" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="30" y="60" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="40" y="60" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="50" y="60" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="60" y="60" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="70" y="60" width="10" height="11" /></bezel>
+
+		<bezel element="cblack"><bounds x="0"  y="70" width="11" height="10" /></bezel>
+		<bezel element="cwhite"><bounds x="10" y="70" width="11" height="10" /></bezel>
+		<bezel element="cblack"><bounds x="20" y="70" width="11" height="10" /></bezel>
+		<bezel element="cwhite"><bounds x="30" y="70" width="11" height="10" /></bezel>
+		<bezel element="cblack"><bounds x="40" y="70" width="11" height="10" /></bezel>
+		<bezel element="cwhite"><bounds x="50" y="70" width="11" height="10" /></bezel>
+		<bezel element="cblack"><bounds x="60" y="70" width="11" height="10" /></bezel>
+		<bezel element="cwhite"><bounds x="70" y="70" width="10" height="10" /></bezel>
+
+		<!-- sensors, pieces -->
+		<repeat count="8">
+			<param name="y" start="0" increment="10" />
+			<param name="i" start="8" increment="-1" />
+
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x01"><bounds x="0"  y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x02"><bounds x="10" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x04"><bounds x="20" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x08"><bounds x="30" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x10"><bounds x="40" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x20"><bounds x="50" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x40"><bounds x="60" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x80"><bounds x="70" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+
+			<bezel name="piece_a~i~" element="piece"><bounds x="0"  y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_b~i~" element="piece"><bounds x="10" y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_c~i~" element="piece"><bounds x="20" y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_d~i~" element="piece"><bounds x="30" y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_e~i~" element="piece"><bounds x="40" y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_f~i~" element="piece"><bounds x="50" y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_g~i~" element="piece"><bounds x="60" y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_h~i~" element="piece"><bounds x="70" y="~y~" width="10" height="10" /></bezel>
+		</repeat>
+	</group>
+
+
+<!-- sb ui -->
+
+	<element name="hlub" defstate="0">
+		<rect state="1"><color red="0" green="0" blue="0" /></rect>
+	</element>
+
+	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uib2">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uib3">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uih2">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uiu2a">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uiu2b">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uiu2c">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uiu2d">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uiu3a" defstate="0">
+		<simplecounter maxstate="999" digits="1" align="2">
+			<color red="0.81" green="0.8" blue="0.79" />
+		</simplecounter>
+	</element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uiu3c" defstate="0">
+		<simplecounter maxstate="999" digits="1" align="1">
+			<color red="0.81" green="0.8" blue="0.79" />
+		</simplecounter>
+	</element>
+
+	<group name="sb_ui">
+		<bounds x="0" y="0" width="10" height="80" />
+		<bezel element="cblack"><bounds x="0" y="0" width="10" height="1" /></bezel>
+		<bezel element="cblack"><bounds x="0" y="7" width="10" height="1" /></bezel>
+		<bezel element="cblack"><bounds x="0" y="79" width="10" height="1" /></bezel>
+		<bezel element="text_uit1"><bounds x="0" y="2" width="10" height="2" /></bezel>
+		<bezel element="text_uit2"><bounds x="0" y="4" width="10" height="2" /></bezel>
+
+		<!-- board -->
+		<bezel element="text_uib1"><bounds x="0" y="9" width="10" height="2" /></bezel>
+		<bezel element="cwhite"><bounds x="1" y="11.5" width="8" height="2.5" /></bezel>
+		<bezel element="cwhite"><bounds x="1" y="15" width="8" height="2.5" /></bezel>
+
+		<bezel element="text_uib2"><bounds x="1.5" y="11.75" width="7" height="2" /></bezel>
+		<bezel element="text_uib3"><bounds x="1.5" y="15.25" width="7" height="2" /></bezel>
+
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x200"><bounds x="1" y="11.5" width="8" height="2.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x100"><bounds x="1" y="15" width="8" height="2.5" /><color alpha="0.25" /></bezel>
+
+		<!-- spawn -->
+		<bezel element="text_uis1"><bounds x="0" y="20.5" width="10" height="2" /></bezel>
+		<bezel element="cwhite"><bounds x="1" y="23" width="8" height="12" /></bezel>
+		<bezel element="cwhite"><bounds x="1" y="36" width="8" height="12" /></bezel>
+
+		<bezel name="piece_ui1" element="piece"><bounds x="1" y="23" width="4" height="4" /></bezel>
+		<bezel name="piece_ui2" element="piece"><bounds x="1" y="27" width="4" height="4" /></bezel>
+		<bezel name="piece_ui3" element="piece"><bounds x="1" y="31" width="4" height="4" /></bezel>
+		<bezel name="piece_ui4" element="piece"><bounds x="5" y="23" width="4" height="4" /></bezel>
+		<bezel name="piece_ui5" element="piece"><bounds x="5" y="27" width="4" height="4" /></bezel>
+		<bezel name="piece_ui6" element="piece"><bounds x="5" y="31" width="4" height="4" /></bezel>
+		<bezel name="piece_ui7" element="piece"><bounds x="1" y="36" width="4" height="4" /></bezel>
+		<bezel name="piece_ui8" element="piece"><bounds x="1" y="40" width="4" height="4" /></bezel>
+		<bezel name="piece_ui9" element="piece"><bounds x="1" y="44" width="4" height="4" /></bezel>
+		<bezel name="piece_ui10" element="piece"><bounds x="5" y="36" width="4" height="4" /></bezel>
+		<bezel name="piece_ui11" element="piece"><bounds x="5" y="40" width="4" height="4" /></bezel>
+		<bezel name="piece_ui12" element="piece"><bounds x="5" y="44" width="4" height="4" /></bezel>
+
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0001"><bounds x="1" y="23" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0002"><bounds x="1" y="27" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0004"><bounds x="1" y="31" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0008"><bounds x="5" y="23" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0010"><bounds x="5" y="27" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0020"><bounds x="5" y="31" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0040"><bounds x="1" y="36" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0080"><bounds x="1" y="40" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0100"><bounds x="1" y="44" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0200"><bounds x="5" y="36" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0400"><bounds x="5" y="40" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0800"><bounds x="5" y="44" width="4" height="4" /><color alpha="0.25" /></bezel>
+
+		<!-- hand -->
+		<bezel element="text_uih1"><bounds x="0" y="51" width="10" height="2" /></bezel>
+		<bezel element="cblack"><bounds x="1" y="53.5" width="8" height="6" /></bezel>
+		<bezel name="piece_ui0" element="piece"><bounds x="2" y="53.5" width="6" height="6" /></bezel>
+
+		<bezel element="cwhite"><bounds x="1" y="60.5" width="8" height="2.5" /></bezel>
+		<bezel element="text_uih2"><bounds x="1.5" y="60.75" width="7" height="2" /></bezel>
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x08"><bounds x="1" y="60.5" width="8" height="2.5" /><color alpha="0.25" /></bezel>
+
+		<!-- undo -->
+		<bezel element="text_uiu1"><bounds x="0" y="66" width="10" height="2" /></bezel>
+		<bezel element="cwhite"><bounds x="1" y="68.5" width="1.7" height="6" /></bezel>
+		<bezel element="cwhite"><bounds x="3.1" y="68.5" width="1.7" height="6" /></bezel>
+		<bezel element="cwhite"><bounds x="5.2" y="68.5" width="1.7" height="6" /></bezel>
+		<bezel element="cwhite"><bounds x="7.3" y="68.5" width="1.7" height="6" /></bezel>
+		<bezel element="text_uiu2a"><bounds x="1" y="69.5" width="1.7" height="4" /></bezel>
+		<bezel element="text_uiu2b"><bounds x="3.1" y="69.5" width="1.7" height="4" /></bezel>
+		<bezel element="text_uiu2c"><bounds x="5.2" y="69.5" width="1.7" height="4" /></bezel>
+		<bezel element="text_uiu2d"><bounds x="7.3" y="69.5" width="1.7" height="4" /></bezel>
+
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x10"><bounds x="1" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x20"><bounds x="3.1" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x40"><bounds x="5.2" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x80"><bounds x="7.3" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></bezel>
+
+		<bezel name="count_ui0" element="text_uiu3a"><bounds x="0" y="75" width="4" height="2" /></bezel>
+		<bezel name="count_ui1" element="text_uiu3c"><bounds x="6" y="75" width="4" height="2" /></bezel>
+		<bezel element="text_uiu3b"><bounds x="4" y="75" width="2" height="2" /></bezel>
+	</group>
+
+
+<!-- build screen -->
+
+	<view name="Internal Layout">
+		<bounds left="-16" right="87" top="-1" bottom="106.5" />
+
+		<group ref="sb_board"><bounds x="3" y="3" width="80" height="80" /></group>
+		<group ref="sb_ui"><bounds x="-14.5" y="3" width="10" height="80" /></group>
+
+	<!-- chessboard coords -->
+
+		<bezel element="text_8"><bounds x="83.5" y="7" width="2" height="2" /></bezel>
+		<bezel element="text_7"><bounds x="83.5" y="17" width="2" height="2" /></bezel>
+		<bezel element="text_6"><bounds x="83.5" y="27" width="2" height="2" /></bezel>
+		<bezel element="text_5"><bounds x="83.5" y="37" width="2" height="2" /></bezel>
+		<bezel element="text_4"><bounds x="83.5" y="47" width="2" height="2" /></bezel>
+		<bezel element="text_3"><bounds x="83.5" y="57" width="2" height="2" /></bezel>
+		<bezel element="text_2"><bounds x="83.5" y="67" width="2" height="2" /></bezel>
+		<bezel element="text_1"><bounds x="83.5" y="77" width="2" height="2" /></bezel>
+
+		<bezel element="text_a"><bounds x="7"  y="0.4" width="2" height="2" /></bezel>
+		<bezel element="text_b"><bounds x="17" y="0.4" width="2" height="2" /></bezel>
+		<bezel element="text_c"><bounds x="27" y="0.4" width="2" height="2" /></bezel>
+		<bezel element="text_d"><bounds x="37" y="0.4" width="2" height="2" /></bezel>
+		<bezel element="text_e"><bounds x="47" y="0.4" width="2" height="2" /></bezel>
+		<bezel element="text_f"><bounds x="57" y="0.4" width="2" height="2" /></bezel>
+		<bezel element="text_g"><bounds x="67" y="0.4" width="2" height="2" /></bezel>
+		<bezel element="text_h"><bounds x="77" y="0.4" width="2" height="2" /></bezel>
+
+	<!-- chessboard leds, labels -->
+
+		<bezel name="2.0" element="ledr"><bounds x="0.5" y="7.25" width="1.5" height="1.5" /></bezel>
+		<bezel name="2.1" element="ledr"><bounds x="0.5" y="17.25" width="1.5" height="1.5" /></bezel>
+		<bezel name="2.2" element="ledr"><bounds x="0.5" y="27.25" width="1.5" height="1.5" /></bezel>
+		<bezel name="2.3" element="ledr"><bounds x="0.5" y="37.25" width="1.5" height="1.5" /></bezel>
+		<bezel name="2.4" element="ledr"><bounds x="0.5" y="47.25" width="1.5" height="1.5" /></bezel>
+		<bezel name="2.5" element="ledr"><bounds x="0.5" y="57.25" width="1.5" height="1.5" /></bezel>
+		<bezel name="1.0" element="ledr"><bounds x="0.5" y="67.25" width="1.5" height="1.5" /></bezel>
+		<bezel name="1.1" element="ledr"><bounds x="0.5" y="77.25" width="1.5" height="1.5" /></bezel>
+
+		<bezel name="0.0" element="ledr"><bounds x="7.25" y="84" width="1.5" height="1.5" /></bezel>
+		<bezel name="0.1" element="ledr"><bounds x="17.25" y="84" width="1.5" height="1.5" /></bezel>
+		<bezel name="0.2" element="ledr"><bounds x="27.25" y="84" width="1.5" height="1.5" /></bezel>
+		<bezel name="0.3" element="ledr"><bounds x="37.25" y="84" width="1.5" height="1.5" /></bezel>
+		<bezel name="0.4" element="ledr"><bounds x="47.25" y="84" width="1.5" height="1.5" /></bezel>
+		<bezel name="0.5" element="ledr"><bounds x="57.25" y="84" width="1.5" height="1.5" /></bezel>
+		<bezel name="1.4" element="ledr"><bounds x="67.25" y="84" width="1.5" height="1.5" /></bezel>
+		<bezel name="1.5" element="ledr"><bounds x="77.25" y="84" width="1.5" height="1.5" /></bezel>
+
+		<bezel name="3.a" element="ledg"><bounds x="12.25" y="87" width="1.5" height="1.5" /></bezel>
+		<bezel name="5.a" element="ledg"><bounds x="32.25" y="87" width="1.5" height="1.5" /></bezel>
+		<bezel name="1.3" element="ledg"><bounds x="52.25" y="87" width="1.5" height="1.5" /></bezel>
+		<bezel name="1.2" element="ledg"><bounds x="72.25" y="87" width="1.5" height="1.5" /></bezel>
+
+		<bezel element="text_l1"><bounds x="-5.8" y="79.5" width="8" height="2" /></bezel>
+		<bezel element="text_l2"><bounds x="-5.8" y="59.5" width="8" height="2" /></bezel>
+		<bezel element="text_l3"><bounds x="-5.8" y="19.5" width="8" height="2" /></bezel>
+
+		<bezel element="text_l5"><bounds x="14.5" y="86.8" width="8" height="2" /></bezel>
+		<bezel element="text_l6"><bounds x="34.5" y="86.8" width="8" height="2" /></bezel>
+		<bezel element="text_l7"><bounds x="54.5" y="86.8" width="8" height="2" /></bezel>
+		<bezel element="text_l8"><bounds x="74.5" y="86.8" width="8" height="2" /></bezel>
+
+	<!-- bottom side buttons -->
+
+		<element ref="whitew"><bounds x="-1" y="90" width="88" height="16.5" /></element>
+
+		<element ref="text_b1"><bounds x="3" y="92.5" width="10" height="2" /></element>
+		<element ref="text_b2"><bounds x="13" y="92.5" width="10" height="2" /></element>
+		<element ref="text_b3"><bounds x="23" y="92.5" width="10" height="2" /></element>
+		<element ref="text_b5"><bounds x="43" y="92.5" width="10" height="2" /></element>
+		<element ref="text_b6"><bounds x="53" y="92.5" width="10" height="2" /></element>
+		<element ref="text_b8"><bounds x="73" y="92.5" width="10" height="2" /></element>
+		<element ref="text_b4"><bounds x="32" y="92.5" width="12" height="2" /></element>
+		<element ref="text_b7"><bounds x="62" y="92.5" width="12" height="2" /></element>
+
+		<element ref="text_p6"><bounds x="15.75" y="98.8" width="4.5" height="4.5" /></element>
+		<element ref="text_p3"><bounds x="25.75" y="98.8" width="4.5" height="4.5" /></element>
+		<element ref="text_p5"><bounds x="35.75" y="98.8" width="4.5" height="4.5" /></element>
+		<element ref="text_p4"><bounds x="45.75" y="98.8" width="4.5" height="4.5" /></element>
+		<element ref="text_p2"><bounds x="55.75" y="98.8" width="4.5" height="4.5" /></element>
+		<element ref="text_p1"><bounds x="65.75" y="98.8" width="4.5" height="4.5" /></element>
+
+		<element ref="blackb"><bounds x="4.5" y="95" width="7" height="3.5" /></element>
+		<element ref="blackb"><bounds x="14.5" y="95" width="7" height="3.5" /></element>
+		<element ref="blackb"><bounds x="24.5" y="95" width="7" height="3.5" /></element>
+		<element ref="blackb"><bounds x="34.5" y="95" width="7" height="3.5" /></element>
+		<element ref="blackb"><bounds x="44.5" y="95" width="7" height="3.5" /></element>
+		<element ref="blackb"><bounds x="54.5" y="95" width="7" height="3.5" /></element>
+		<element ref="blackb"><bounds x="64.5" y="95" width="7" height="3.5" /></element>
+		<element ref="blackb"><bounds x="74.5" y="95" width="7" height="3.5" /></element>
+
+		<element ref="whitem" blend="multiply"><bounds x="-1" y="90" width="88" height="16.5" /></element>
+		<element ref="blacka" blend="add"><bounds x="-1" y="90" width="88" height="16.5" /></element>
+
+		<element ref="white2"><bounds x="4.9" y="95.4" width="6.2" height="2.7" /></element>
+		<element ref="white2"><bounds x="14.9" y="95.4" width="6.2" height="2.7" /></element>
+		<element ref="white2"><bounds x="24.9" y="95.4" width="6.2" height="2.7" /></element>
+		<element ref="white2"><bounds x="34.9" y="95.4" width="6.2" height="2.7" /></element>
+		<element ref="white2"><bounds x="44.9" y="95.4" width="6.2" height="2.7" /></element>
+		<element ref="white2"><bounds x="54.9" y="95.4" width="6.2" height="2.7" /></element>
+		<element ref="white2"><bounds x="64.9" y="95.4" width="6.2" height="2.7" /></element>
+		<element ref="white2"><bounds x="74.9" y="95.4" width="6.2" height="2.7" /></element>
+
+		<element ref="button" blend="multiply" inputtag="IN.0" inputmask="0x10"><bounds x="4.5" y="95" width="7" height="3.5" /></element>
+		<element ref="button" blend="multiply" inputtag="IN.0" inputmask="0x20"><bounds x="14.5" y="95" width="7" height="3.5" /></element>
+		<element ref="button" blend="multiply" inputtag="IN.0" inputmask="0x40"><bounds x="24.5" y="95" width="7" height="3.5" /></element>
+		<element ref="button" blend="multiply" inputtag="IN.0" inputmask="0x80"><bounds x="34.5" y="95" width="7" height="3.5" /></element>
+		<element ref="button" blend="multiply" inputtag="IN.0" inputmask="0x01"><bounds x="44.5" y="95" width="7" height="3.5" /></element>
+		<element ref="button" blend="multiply" inputtag="IN.0" inputmask="0x02"><bounds x="54.5" y="95" width="7" height="3.5" /></element>
+		<element ref="button" blend="multiply" inputtag="IN.0" inputmask="0x04"><bounds x="64.5" y="95" width="7" height="3.5" /></element>
+		<element ref="button" blend="multiply" inputtag="IN.0" inputmask="0x08"><bounds x="74.5" y="95" width="7" height="3.5" /></element>
+
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/novag_sforte.lay mame-0.224+dfsg.1/src/mame/layout/novag_sforte.lay
--- mame-0.222+dfsg.1/src/mame/layout/novag_sforte.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/novag_sforte.lay	2020-08-26 08:57:19.000000000 +0000
@@ -101,30 +101,12 @@
 	<element name="text_r8a"><text string="Go"><color red="0.51" green="0.5" blue="0.49" /></text></element>
 	<element name="text_r8b"><text string=" "><color red="0.51" green="0.5" blue="0.49" /></text></element>
 
-	<element name="text_king">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="[K]"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_queen">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="[Q]"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_rook">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="[R]"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_bishop">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="[B]"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_knight">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="[N]"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_pawn">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="[P]"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
+	<element name="text_p1"><image file="chess/bk.png"><color alpha="0.85" /></image></element>
+	<element name="text_p2"><image file="chess/bq.png"><color alpha="0.85" /></image></element>
+	<element name="text_p3"><image file="chess/bb.png"><color alpha="0.85" /></image></element>
+	<element name="text_p4"><image file="chess/bn.png"><color alpha="0.85" /></image></element>
+	<element name="text_p5"><image file="chess/br.png"><color alpha="0.85" /></image></element>
+	<element name="text_p6"><image file="chess/bp.png"><color alpha="0.85" /></image></element>
 
 
 <!-- sb board -->
@@ -517,12 +499,12 @@
 		<bezel element="text_l7"><bounds x="87.5" y="70.59" width="3" height="3" /></bezel>
 		<bezel element="text_l8"><bounds x="87.5" y="78.30" width="3" height="3" /></bezel>
 
-		<bezel element="text_king"><bounds x="97.13" y="24.70" width="3" height="2.2" /></bezel>
-		<bezel element="text_queen"><bounds x="97.13" y="32.41" width="3" height="2.2" /></bezel>
-		<bezel element="text_bishop"><bounds x="97.13" y="40.13" width="3" height="2.2" /></bezel>
-		<bezel element="text_knight"><bounds x="97.13" y="47.84" width="3" height="2.2" /></bezel>
-		<bezel element="text_rook"><bounds x="97.13" y="55.56" width="3" height="2.2" /></bezel>
-		<bezel element="text_pawn"><bounds x="97.13" y="63.27" width="3" height="2.2" /></bezel>
+		<bezel element="text_p1"><bounds x="97.18" y="24.50" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p2"><bounds x="97.18" y="32.21" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p3"><bounds x="97.18" y="39.93" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p4"><bounds x="97.18" y="47.64" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p5"><bounds x="97.18" y="55.36" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p6"><bounds x="97.18" y="63.07" width="2.9" height="2.9" /></bezel>
 
 		<bezel element="hlb" inputtag="IN.7" inputmask="0x04"><bounds x="86" y="24.00" width="6" height="4" /><color alpha="0.4" /></bezel>
 		<bezel element="hlb" inputtag="IN.6" inputmask="0x04"><bounds x="86" y="31.71" width="6" height="4" /><color alpha="0.4" /></bezel>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/novag_supercon.lay mame-0.224+dfsg.1/src/mame/layout/novag_supercon.lay
--- mame-0.222+dfsg.1/src/mame/layout/novag_supercon.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/novag_supercon.lay	2020-08-26 08:57:19.000000000 +0000
@@ -10,6 +10,7 @@
 	<element name="static_gray"><rect><color red="0.51" green="0.5" blue="0.49" /></rect></element>
 	<element name="static_red"><rect><color red="0.7" green="0.13" blue="0.12" /></rect></element>
 
+	<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
 	<element name="black"><rect><color red="0.17" green="0.15" blue="0.15" /></rect></element>
 	<element name="white"><rect><color red="0.81" green="0.8" blue="0.79" /></rect></element>
 
@@ -80,37 +81,19 @@
 	<element name="text_rg6"><text string="Black"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 	<element name="text_rg7"><text string="White"><color red="0.81" green="0.8" blue="0.79" /></text></element>
 
-	<element name="text_king1"><text string="[K]"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_queen1"><text string="[Q]"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_rook1"><text string="[R]"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_bishop1"><text string="[B]"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_knight1"><text string="[N]"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-	<element name="text_pawn1"><text string="[P]"><color red="0.81" green="0.8" blue="0.79" /></text></element>
-
-	<element name="text_king2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="[K]"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_queen2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="[Q]"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_rook2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="[R]"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_bishop2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="[B]"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_knight2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="[N]"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
-	<element name="text_pawn2">
-		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
-		<text string="[P]"><color red="0.1" green="0.1" blue="0.1" /></text>
-	</element>
+	<element name="text_p1"><image file="chess/wk.png"><color alpha="0.9" /></image></element>
+	<element name="text_p2"><image file="chess/wq.png"><color alpha="0.9" /></image></element>
+	<element name="text_p3"><image file="chess/wb.png"><color alpha="0.9" /></image></element>
+	<element name="text_p4"><image file="chess/wn.png"><color alpha="0.9" /></image></element>
+	<element name="text_p5"><image file="chess/wr.png"><color alpha="0.9" /></image></element>
+	<element name="text_p6"><image file="chess/wp.png"><color alpha="0.9" /></image></element>
+
+	<element name="text_p7"><image file="chess/bk.png"><color alpha="0.85" /></image></element>
+	<element name="text_p8"><image file="chess/bq.png"><color alpha="0.85" /></image></element>
+	<element name="text_p9"><image file="chess/bb.png"><color alpha="0.85" /></image></element>
+	<element name="text_p10"><image file="chess/bn.png"><color alpha="0.85" /></image></element>
+	<element name="text_p11"><image file="chess/br.png"><color alpha="0.85" /></image></element>
+	<element name="text_p12"><image file="chess/bp.png"><color alpha="0.85" /></image></element>
 
 	<element name="text_rb00"><text string="Multi Move"><color red="0.51" green="0.5" blue="0.49" /></text></element>
 	<element name="text_rb01"><text string="Player/Player"><color red="0.51" green="0.5" blue="0.49" /></text></element>
@@ -138,6 +121,16 @@
 	<element name="text_rb18"><text string="Show Moves"><color red="0.51" green="0.5" blue="0.49" /></text></element>
 	<element name="text_rb19"><text string="Go"><color red="0.51" green="0.5" blue="0.49" /></text></element>
 
+	<element name="text_ro00"><text string="Start"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+	<element name="text_ro01"><text string="Large Book"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+	<element name="text_ro08"><text string="Priority"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+	<element name="text_ro09"><text string="Pro-Op II"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+	<element name="text_ro0c"><text string="Pro-Op I"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+	<element name="text_ro0d"><text string="Delete"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+
+	<element name="text_ro10"><text string="Enter"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+	<element name="text_ro14"><text string="Clear Book"><color red="0.51" green="0.5" blue="0.49" /></text></element>
+
 	<element name="text_setup">
 		<rect><color red="0.0" green="0.0" blue="0.0" /></rect>
 		<text string="SET UP"><color red="0.51" green="0.5" blue="0.49" /></text>
@@ -427,17 +420,16 @@
 	</group>
 
 
-<!-- build screen -->
+<!-- default view -->
 
-	<view name="Internal Layout">
+	<group name="default">
 		<bounds left="-19.5" right="116" top="-0.5" bottom="88.5" />
 
 		<bezel element="cblack"><bounds x="2.5" y="2.5" width="80.5" height="81" /></bezel>
 		<group ref="sb_board"><bounds x="3" y="3" width="80" height="80" /></group>
 		<bezel element="cwhite"><bounds x="82.95" y="2.5" width="1" height="81" /></bezel>
 
-	<!-- left side labels -->
-
+		<!-- left side labels -->
 		<bezel element="white"><bounds x="-5.5" y="5.833" width="2.2" height="30.333" /></bezel>
 		<bezel element="static_black"><bounds x="-5.166" y="6.166" width="2.2" height="29.666" /></bezel>
 		<bezel element="text_depth"><bounds x="-4.5" y="5.833" width="2" height="30.333" /><orientation rotate="90" /></bezel>
@@ -448,8 +440,7 @@
 
 		<group ref="sb_ui"><bounds x="-17.5" y="3" width="10" height="80" /></group>
 
-	<!-- chessboard coords -->
-
+		<!-- chessboard coords -->
 		<bezel element="text_8"><bounds x="-0.3" y="5" width="2" height="2" /></bezel>
 		<bezel element="text_7"><bounds x="-0.3" y="15" width="2" height="2" /></bezel>
 		<bezel element="text_6"><bounds x="-0.3" y="25" width="2" height="2" /></bezel>
@@ -473,8 +464,7 @@
 		<bezel element="text_g"><bounds x="65" y="84.75" width="2" height="2" /></bezel>
 		<bezel element="text_h"><bounds x="75" y="84.75" width="2" height="2" /></bezel>
 
-	<!-- chessboard leds -->
-
+		<!-- chessboard leds -->
 		<bezel name="1.0" element="ledr"><bounds x="-0.5" y="7.5" width="2" height="1" /></bezel>
 		<bezel name="1.1" element="ledr"><bounds x="-0.5" y="17.5" width="2" height="1" /></bezel>
 		<bezel name="1.2" element="ledr"><bounds x="-0.5" y="27.5" width="2" height="1" /></bezel>
@@ -493,8 +483,7 @@
 		<bezel name="2.6" element="ledr"><bounds x="67.5" y="84.5" width="1" height="2" /></bezel>
 		<bezel name="2.7" element="ledr"><bounds x="77.5" y="84.5" width="1" height="2" /></bezel>
 
-	<!-- right side buttons -->
-
+		<!-- right side buttons -->
 		<bezel element="static_gray"><bounds x="95.333" y="12.5" width="9.333" height="29" /></bezel>
 		<bezel element="static_black"><bounds x="95.533" y="12.7" width="8.933" height="28.6" /></bezel>
 		<bezel element="text_setup"><bounds x="96.5" y="11.8" width="7" height="1.5" /></bezel>
@@ -538,12 +527,12 @@
 		<bezel element="white"><bounds x="88" y="66" width="6" height="4" /></bezel>
 		<bezel element="white"><bounds x="88" y="76" width="6" height="4" /></bezel>
 
-		<bezel element="text_king2"><bounds x="88" y="6.7" width="6" height="2.2" /></bezel>
-		<bezel element="text_queen2"><bounds x="88" y="16.7" width="6" height="2.2" /></bezel>
-		<bezel element="text_bishop2"><bounds x="88" y="26.7" width="6" height="2.2" /></bezel>
-		<bezel element="text_knight2"><bounds x="88" y="36.7" width="6" height="2.2" /></bezel>
-		<bezel element="text_rook2"><bounds x="88" y="46.7" width="6" height="2.2" /></bezel>
-		<bezel element="text_pawn2"><bounds x="88" y="56.7" width="6" height="2.2" /></bezel>
+		<bezel element="text_p7"> <bounds x="89.55" y="6.45"  width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p8"> <bounds x="89.55" y="16.45" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p9"> <bounds x="89.55" y="26.45" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p10"><bounds x="89.55" y="36.45" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p11"><bounds x="89.55" y="46.45" width="2.9" height="2.9" /></bezel>
+		<bezel element="text_p12"><bounds x="89.55" y="56.45" width="2.9" height="2.9" /></bezel>
 
 		<bezel element="hlb" inputtag="IN.0" inputmask="0x02"><bounds x="88" y="6" width="6" height="4" /><color alpha="0.4" /></bezel>
 		<bezel element="hlb" inputtag="IN.1" inputmask="0x02"><bounds x="88" y="16" width="6" height="4" /><color alpha="0.4" /></bezel>
@@ -574,8 +563,7 @@
 		<bezel element="hlb" inputtag="IN.6" inputmask="0x01"><bounds x="97" y="66" width="6" height="4" /><color alpha="0.4" /></bezel>
 		<bezel element="hlb" inputtag="IN.7" inputmask="0x01"><bounds x="97" y="76" width="6" height="4" /><color alpha="0.25" /></bezel>
 
-	<!-- right side leds -->
-
+		<!-- right side leds -->
 		<bezel element="black"><bounds x="107" y="2.5" width="1" height="81" /></bezel>
 
 		<bezel element="text_rg0"><bounds x="107" y="5.7" width="10" height="1.5" /></bezel>
@@ -587,12 +575,12 @@
 		<bezel element="text_rg6"><bounds x="107" y="65.7" width="10" height="1.5" /></bezel>
 		<bezel element="text_rg7"><bounds x="107" y="75.7" width="10" height="1.5" /></bezel>
 
-		<bezel element="text_king1"><bounds x="107.2" y="8.7" width="10" height="1.5" /></bezel>
-		<bezel element="text_queen1"><bounds x="107.2" y="18.7" width="10" height="1.5" /></bezel>
-		<bezel element="text_bishop1"><bounds x="107.2" y="28.7" width="10" height="1.5" /></bezel>
-		<bezel element="text_knight1"><bounds x="107.2" y="38.7" width="10" height="1.5" /></bezel>
-		<bezel element="text_rook1"><bounds x="107.2" y="48.7" width="10" height="1.5" /></bezel>
-		<bezel element="text_pawn1"><bounds x="107.2" y="58.7" width="10" height="1.5" /></bezel>
+		<bezel element="text_p1"><bounds x="111" y="8.5"  width="2" height="2" /></bezel>
+		<bezel element="text_p2"><bounds x="111" y="18.5" width="2" height="2" /></bezel>
+		<bezel element="text_p3"><bounds x="111" y="28.5" width="2" height="2" /></bezel>
+		<bezel element="text_p4"><bounds x="111" y="38.5" width="2" height="2" /></bezel>
+		<bezel element="text_p5"><bounds x="111" y="48.5" width="2" height="2" /></bezel>
+		<bezel element="text_p6"><bounds x="111" y="58.5" width="2" height="2" /></bezel>
 
 		<bezel name="0.0" element="ledg"><bounds x="111" y="7.5" width="2" height="1" /></bezel>
 		<bezel name="0.1" element="ledg"><bounds x="111" y="17.5" width="2" height="1" /></bezel>
@@ -602,6 +590,64 @@
 		<bezel name="0.5" element="ledg"><bounds x="111" y="57.5" width="2" height="1" /></bezel>
 		<bezel name="0.6" element="ledg"><bounds x="111" y="67.5" width="2" height="1" /></bezel>
 		<bezel name="0.7" element="ledg"><bounds x="111" y="77.5" width="2" height="1" /></bezel>
+	</group>
+
+
+<!-- programmable openings keypad overlay sheet -->
 
+	<group name="overlay">
+		<bounds left="-19.5" right="116" top="-0.5" bottom="88.5" />
+
+		<!-- block buttons -->
+		<bezel element="hlb" inputtag="IN.1" inputmask="0x00" inputraw="1"><bounds x="88" y="16" width="6" height="4" /></bezel>
+		<bezel element="hlb" inputtag="IN.2" inputmask="0x00" inputraw="1"><bounds x="88" y="26" width="6" height="4" /></bezel>
+		<bezel element="hlb" inputtag="IN.5" inputmask="0x00" inputraw="1"><bounds x="88" y="56" width="6" height="4" /></bezel>
+
+		<bezel element="hlb" inputtag="IN.1" inputmask="0x00" inputraw="1"><bounds x="97" y="16" width="6" height="4" /></bezel>
+		<bezel element="hlb" inputtag="IN.2" inputmask="0x00" inputraw="1"><bounds x="97" y="26" width="6" height="4" /></bezel>
+		<bezel element="hlb" inputtag="IN.4" inputmask="0x00" inputraw="1"><bounds x="97" y="46" width="6" height="4" /></bezel>
+		<bezel element="hlb" inputtag="IN.5" inputmask="0x00" inputraw="1"><bounds x="97" y="56" width="6" height="4" /></bezel>
+		<bezel element="hlb" inputtag="IN.6" inputmask="0x00" inputraw="1"><bounds x="97" y="66" width="6" height="4" /></bezel>
+
+		<group ref="default"><bounds left="-19.5" right="116" top="-0.5" bottom="88.5" /></group>
+
+		<!-- erase -->
+		<bezel element="blackb"><bounds x="86" y="0" width="1" height="88" /></bezel>
+		<bezel element="blackb"><bounds x="95" y="0" width="1" height="88" /></bezel>
+		<bezel element="blackb"><bounds x="104" y="0" width="1" height="88" /></bezel>
+
+		<bezel element="blackb"><bounds x="84.5" y="0.8" width="22" height="5" /></bezel>
+		<bezel element="blackb"><bounds x="84.5" y="10.2" width="22" height="25.6" /></bezel>
+		<bezel element="blackb"><bounds x="84.5" y="40.2" width="22" height="5.6" /></bezel>
+		<bezel element="blackb"><bounds x="84.5" y="50.2" width="22" height="15.6" /></bezel>
+		<bezel element="blackb"><bounds x="84.5" y="70.2" width="22" height="5.6" /></bezel>
+
+		<bezel element="blackb"><bounds x="96" y="45" width="8" height="30" /></bezel>
+
+		<!-- labels -->
+		<bezel element="text_ro00"><bounds x="84" y="4.2" width="14" height="1.5" /></bezel>
+		<bezel element="text_ro01"><bounds x="84" y="10.3" width="14" height="1.5" /></bezel>
+		<bezel element="text_ro08"><bounds x="84" y="34.2" width="14" height="1.5" /></bezel>
+		<bezel element="text_ro09"><bounds x="84" y="44.2" width="14" height="1.5" /></bezel>
+		<bezel element="text_ro0c"><bounds x="84" y="64.2" width="14" height="1.5" /></bezel>
+		<bezel element="text_ro0d"><bounds x="84" y="74.2" width="14" height="1.5" /></bezel>
+
+		<bezel element="text_ro10"><bounds x="93" y="4.2" width="14" height="1.5" /></bezel>
+		<bezel element="text_ro14"><bounds x="93" y="34.2" width="14" height="1.5" /></bezel>
+		<bezel element="text_rb19"><bounds x="93" y="74.2" width="14" height="1.5" /></bezel>
+	</group>
+
+
+<!-- build screen -->
+
+	<view name="Internal Layout (Default)">
+		<bounds left="-19.5" right="116" top="-0.5" bottom="88.5" />
+		<group ref="default"><bounds left="-19.5" right="116" top="-0.5" bottom="88.5" /></group>
 	</view>
+
+	<view name="Internal Layout (P.O. Overlay)">
+		<bounds left="-19.5" right="116" top="-0.5" bottom="88.5" />
+		<group ref="overlay"><bounds left="-19.5" right="116" top="-0.5" bottom="88.5" /></group>
+	</view>
+
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/outrun.lay mame-0.224+dfsg.1/src/mame/layout/outrun.lay
--- mame-0.222+dfsg.1/src/mame/layout/outrun.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/outrun.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x02">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x02">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/overdriv.lay mame-0.224+dfsg.1/src/mame/layout/overdriv.lay
--- mame-0.222+dfsg.1/src/mame/layout/overdriv.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/overdriv.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,40 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="INPUTS" inputmask="0x01">
+			<bounds x="496" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="INPUTS" inputmask="0x01">
+			<bounds x="-48" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Vertical Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="INPUTS" inputmask="0x01">
+			<bounds x="446" y="648" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Vertical Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="INPUTS" inputmask="0x01">
+			<bounds x="2" y="648" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/pdrift.lay mame-0.224+dfsg.1/src/mame/layout/pdrift.lay
--- mame-0.222+dfsg.1/src/mame/layout/pdrift.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/pdrift.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x02">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x02">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/polepos.lay mame-0.224+dfsg.1/src/mame/layout/polepos.lay
--- mame-0.222+dfsg.1/src/mame/layout/polepos.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/polepos.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x02">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x02">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/radr.lay mame-0.224+dfsg.1/src/mame/layout/radr.lay
--- mame-0.222+dfsg.1/src/mame/layout/radr.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/radr.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="mainpcb:P1_A" inputmask="0x01">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="mainpcb:P1_A" inputmask="0x01">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/roundup5.lay mame-0.224+dfsg.1/src/mame/layout/roundup5.lay
--- mame-0.222+dfsg.1/src/mame/layout/roundup5.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/roundup5.lay	2020-08-26 08:57:19.000000000 +0000
@@ -55,9 +55,7 @@
 		<screen index="0">
 			<bounds x="0" y="0" width="640" height="480" />
 		</screen>
-
-<bezel element="shifter" inputtag="IN0" inputmask="0x0008">
-
+		<bezel element="shifter" inputtag="IN0" inputmask="0x0008">
 			<bounds x="606" y="414" width="32" height="64" />
 			<color alpha="0.6" />
 		</bezel>
@@ -66,11 +64,27 @@
 		<screen index="0">
 			<bounds x="0" y="0" width="640" height="480" />
 		</screen>
-
-<bezel element="shifter" inputtag="IN0" inputmask="0x0008">
-
+		<bezel element="shifter" inputtag="IN0" inputmask="0x0008">
 			<bounds x="2" y="414" width="32" height="64" />
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x0008">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x0008">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/saitek_ccompan.lay mame-0.224+dfsg.1/src/mame/layout/saitek_ccompan.lay
--- mame-0.222+dfsg.1/src/mame/layout/saitek_ccompan.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/saitek_ccompan.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,627 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+
+<!-- define elements -->
+
+	<element name="black"><rect><color red="0" green="0" blue="0" /></rect></element>
+	<element name="black2"><rect><color red="0.18" green="0.17" blue="0.17" /></rect></element>
+	<element name="white"><rect><color red="1" green="1" blue="1" /></rect></element>
+
+	<element name="hl" defstate="0">
+		<rect state="0"><color red="1" green="1" blue="1" /></rect>
+		<rect state="1"><color red="0.86" green="0.86" blue="0.86" /></rect>
+	</element>
+
+	<element name="led" defstate="0">
+		<disk state="1"><color red="1.0" green="0.1" blue="0.15" /></disk>
+		<disk state="0"><color red="0.2" green="0.02" blue="0.03" /></disk>
+	</element>
+
+	<element name="text_1">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="1"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_2">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="2"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_3">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="3"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_4">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="4"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_5">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="5"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_6">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="6"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_7">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="7"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_8">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="8"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+
+	<element name="text_a">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="A"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_b">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="B"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_c">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="C"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_d">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="D"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_e">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="E"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_f">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="F"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_g">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="G"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+	<element name="text_h">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="H"><color red="0.15" green="0.14" blue="0.14" /></text>
+	</element>
+
+	<element name="text_l1">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="COLOR" align="1"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_l2">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="SIDES SWAPPED" align="1"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_l3">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="MULTI MOVE" align="1"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_l4">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="COMPUTING" align="1"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_l5">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="CHECK" align="1"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_l6">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="MATE" align="1"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+
+	<element name="text_b1a">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="CHANGE"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_b1b">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="LEVEL"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_b2a">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="MULTI"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_b2b">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="MOVE"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_b3a">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="TAKE"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_b3b">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="BACK"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_b4b">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="PLAY"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_b5b">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="COLOR"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_b6a">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="SWAP"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_b6b">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="SIDES"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_b7a">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="CLEAR"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_b7b">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="BOARD"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_b8a">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="NEW"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+	<element name="text_b8b">
+		<rect><color red="1" green="1" blue="1" /></rect>
+		<text string="GAME"><color red="0.12" green="0.12" blue="0.12" /></text>
+	</element>
+
+	<element name="text_p1"><image file="chess/bk.png"/></element>
+	<element name="text_p2"><image file="chess/bq.png"/></element>
+	<element name="text_p3"><image file="chess/br.png"/></element>
+	<element name="text_p4"><image file="chess/bb.png"/></element>
+	<element name="text_p5"><image file="chess/bn.png"/></element>
+	<element name="text_p6"><image file="chess/bp.png"/></element>
+
+
+<!-- sb board -->
+
+	<element name="cblack"><rect><color red="0.41" green="0.4" blue="0.39" /></rect></element>
+	<element name="cwhite"><rect><color red="0.81" green="0.8" blue="0.79" /></rect></element>
+
+	<element name="hlbb" defstate="0">
+		<text string=" "><bounds x="0" y="0" width="1" height="1" /></text>
+		<disk state="1">
+			<bounds x="0.12" y="0.12" width="0.76" height="0.76" />
+			<color red="0" green="0" blue="0" />
+		</disk>
+	</element>
+
+	<element name="piece" defstate="0">
+		<image file="chess/wp.png" state="1"/>
+		<image file="chess/wn.png" state="2"/>
+		<image file="chess/wb.png" state="3"/>
+		<image file="chess/wr.png" state="4"/>
+		<image file="chess/wq.png" state="5"/>
+		<image file="chess/wk.png" state="6"/>
+
+		<image file="chess/bp.png" state="7"/>
+		<image file="chess/bn.png" state="8"/>
+		<image file="chess/bb.png" state="9"/>
+		<image file="chess/br.png" state="10"/>
+		<image file="chess/bq.png" state="11"/>
+		<image file="chess/bk.png" state="12"/>
+
+		<!-- selected pieces -->
+		<image file="chess/wp.png" state="13"><color alpha="0.5" /></image>
+		<image file="chess/wn.png" state="14"><color alpha="0.5" /></image>
+		<image file="chess/wb.png" state="15"><color alpha="0.5" /></image>
+		<image file="chess/wr.png" state="16"><color alpha="0.5" /></image>
+		<image file="chess/wq.png" state="17"><color alpha="0.5" /></image>
+		<image file="chess/wk.png" state="18"><color alpha="0.5" /></image>
+
+		<image file="chess/bp.png" state="19"><color alpha="0.5" /></image>
+		<image file="chess/bn.png" state="20"><color alpha="0.5" /></image>
+		<image file="chess/bb.png" state="21"><color alpha="0.5" /></image>
+		<image file="chess/br.png" state="22"><color alpha="0.5" /></image>
+		<image file="chess/bq.png" state="23"><color alpha="0.5" /></image>
+		<image file="chess/bk.png" state="24"><color alpha="0.5" /></image>
+	</element>
+
+	<group name="sb_board">
+		<bounds x="0" y="0" width="80" height="80" />
+
+		<!-- squares (avoid seams) -->
+		<bezel element="cwhite"><bounds x="0"  y="0" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="10" y="0" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="20" y="0" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="30" y="0" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="40" y="0" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="50" y="0" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="60" y="0" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="70" y="0" width="10" height="11" /></bezel>
+
+		<bezel element="cblack"><bounds x="0"  y="10" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="10" y="10" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="20" y="10" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="30" y="10" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="40" y="10" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="50" y="10" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="60" y="10" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="70" y="10" width="10" height="11" /></bezel>
+
+		<bezel element="cwhite"><bounds x="0"  y="20" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="10" y="20" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="20" y="20" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="30" y="20" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="40" y="20" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="50" y="20" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="60" y="20" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="70" y="20" width="10" height="11" /></bezel>
+
+		<bezel element="cblack"><bounds x="0"  y="30" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="10" y="30" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="20" y="30" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="30" y="30" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="40" y="30" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="50" y="30" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="60" y="30" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="70" y="30" width="10" height="11" /></bezel>
+
+		<bezel element="cwhite"><bounds x="0"  y="40" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="10" y="40" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="20" y="40" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="30" y="40" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="40" y="40" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="50" y="40" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="60" y="40" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="70" y="40" width="10" height="11" /></bezel>
+
+		<bezel element="cblack"><bounds x="0"  y="50" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="10" y="50" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="20" y="50" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="30" y="50" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="40" y="50" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="50" y="50" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="60" y="50" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="70" y="50" width="10" height="11" /></bezel>
+
+		<bezel element="cwhite"><bounds x="0"  y="60" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="10" y="60" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="20" y="60" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="30" y="60" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="40" y="60" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="50" y="60" width="11" height="11" /></bezel>
+		<bezel element="cwhite"><bounds x="60" y="60" width="11" height="11" /></bezel>
+		<bezel element="cblack"><bounds x="70" y="60" width="10" height="11" /></bezel>
+
+		<bezel element="cblack"><bounds x="0"  y="70" width="11" height="10" /></bezel>
+		<bezel element="cwhite"><bounds x="10" y="70" width="11" height="10" /></bezel>
+		<bezel element="cblack"><bounds x="20" y="70" width="11" height="10" /></bezel>
+		<bezel element="cwhite"><bounds x="30" y="70" width="11" height="10" /></bezel>
+		<bezel element="cblack"><bounds x="40" y="70" width="11" height="10" /></bezel>
+		<bezel element="cwhite"><bounds x="50" y="70" width="11" height="10" /></bezel>
+		<bezel element="cblack"><bounds x="60" y="70" width="11" height="10" /></bezel>
+		<bezel element="cwhite"><bounds x="70" y="70" width="10" height="10" /></bezel>
+
+		<!-- sensors, pieces -->
+		<repeat count="8">
+			<param name="y" start="0" increment="10" />
+			<param name="i" start="8" increment="-1" />
+
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x01"><bounds x="0"  y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x02"><bounds x="10" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x04"><bounds x="20" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x08"><bounds x="30" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x10"><bounds x="40" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x20"><bounds x="50" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x40"><bounds x="60" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+			<bezel element="hlbb" inputtag="board:RANK.~i~" inputmask="0x80"><bounds x="70" y="~y~" width="10" height="10" /><color alpha="0.04" /></bezel>
+
+			<bezel name="piece_a~i~" element="piece"><bounds x="0"  y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_b~i~" element="piece"><bounds x="10" y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_c~i~" element="piece"><bounds x="20" y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_d~i~" element="piece"><bounds x="30" y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_e~i~" element="piece"><bounds x="40" y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_f~i~" element="piece"><bounds x="50" y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_g~i~" element="piece"><bounds x="60" y="~y~" width="10" height="10" /></bezel>
+			<bezel name="piece_h~i~" element="piece"><bounds x="70" y="~y~" width="10" height="10" /></bezel>
+		</repeat>
+	</group>
+
+
+<!-- sb ui -->
+
+	<element name="hlub" defstate="0">
+		<rect state="1"><color red="0" green="0" blue="0" /></rect>
+	</element>
+
+	<element name="text_uit1"><text string="S.BOARD"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uit2"><text string="INTERFACE"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uib1"><text string="BOARD:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uib2">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="RESET"><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uib3">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="CLEAR"><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uis1"><text string="SPAWN:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uih1"><text string="HAND:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uih2">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="REMOVE"><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uiu1"><text string="UNDO:"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uiu2a">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string=" &lt;&lt;"><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uiu2b">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string=" &lt;  "><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uiu2c">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string="   &gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uiu2d">
+		<rect><color red="0.81" green="0.8" blue="0.79" /></rect>
+		<text string=" &gt;&gt;"><color red="0.01" green="0.01" blue="0.01" /></text>
+	</element>
+	<element name="text_uiu3a" defstate="0">
+		<simplecounter maxstate="999" digits="1" align="2">
+			<color red="0.81" green="0.8" blue="0.79" />
+		</simplecounter>
+	</element>
+	<element name="text_uiu3b"><text string="/"><color red="0.81" green="0.8" blue="0.79" /></text></element>
+	<element name="text_uiu3c" defstate="0">
+		<simplecounter maxstate="999" digits="1" align="1">
+			<color red="0.81" green="0.8" blue="0.79" />
+		</simplecounter>
+	</element>
+
+	<group name="sb_ui">
+		<bounds x="0" y="0" width="10" height="80" />
+		<bezel element="cblack"><bounds x="0" y="0" width="10" height="1" /></bezel>
+		<bezel element="cblack"><bounds x="0" y="7" width="10" height="1" /></bezel>
+		<bezel element="cblack"><bounds x="0" y="79" width="10" height="1" /></bezel>
+		<bezel element="text_uit1"><bounds x="0" y="2" width="10" height="2" /></bezel>
+		<bezel element="text_uit2"><bounds x="0" y="4" width="10" height="2" /></bezel>
+
+		<!-- board -->
+		<bezel element="text_uib1"><bounds x="0" y="9" width="10" height="2" /></bezel>
+		<bezel element="cwhite"><bounds x="1" y="11.5" width="8" height="2.5" /></bezel>
+		<bezel element="cwhite"><bounds x="1" y="15" width="8" height="2.5" /></bezel>
+
+		<bezel element="text_uib2"><bounds x="1.5" y="11.75" width="7" height="2" /></bezel>
+		<bezel element="text_uib3"><bounds x="1.5" y="15.25" width="7" height="2" /></bezel>
+
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x200"><bounds x="1" y="11.5" width="8" height="2.5" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x100"><bounds x="1" y="15" width="8" height="2.5" /><color alpha="0.25" /></bezel>
+
+		<!-- spawn -->
+		<bezel element="text_uis1"><bounds x="0" y="20.5" width="10" height="2" /></bezel>
+		<bezel element="cwhite"><bounds x="1" y="23" width="8" height="12" /></bezel>
+		<bezel element="cwhite"><bounds x="1" y="36" width="8" height="12" /></bezel>
+
+		<bezel name="piece_ui1" element="piece"><bounds x="1" y="23" width="4" height="4" /></bezel>
+		<bezel name="piece_ui2" element="piece"><bounds x="1" y="27" width="4" height="4" /></bezel>
+		<bezel name="piece_ui3" element="piece"><bounds x="1" y="31" width="4" height="4" /></bezel>
+		<bezel name="piece_ui4" element="piece"><bounds x="5" y="23" width="4" height="4" /></bezel>
+		<bezel name="piece_ui5" element="piece"><bounds x="5" y="27" width="4" height="4" /></bezel>
+		<bezel name="piece_ui6" element="piece"><bounds x="5" y="31" width="4" height="4" /></bezel>
+		<bezel name="piece_ui7" element="piece"><bounds x="1" y="36" width="4" height="4" /></bezel>
+		<bezel name="piece_ui8" element="piece"><bounds x="1" y="40" width="4" height="4" /></bezel>
+		<bezel name="piece_ui9" element="piece"><bounds x="1" y="44" width="4" height="4" /></bezel>
+		<bezel name="piece_ui10" element="piece"><bounds x="5" y="36" width="4" height="4" /></bezel>
+		<bezel name="piece_ui11" element="piece"><bounds x="5" y="40" width="4" height="4" /></bezel>
+		<bezel name="piece_ui12" element="piece"><bounds x="5" y="44" width="4" height="4" /></bezel>
+
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0001"><bounds x="1" y="23" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0002"><bounds x="1" y="27" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0004"><bounds x="1" y="31" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0008"><bounds x="5" y="23" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0010"><bounds x="5" y="27" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0020"><bounds x="5" y="31" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0040"><bounds x="1" y="36" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0080"><bounds x="1" y="40" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0100"><bounds x="1" y="44" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0200"><bounds x="5" y="36" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0400"><bounds x="5" y="40" width="4" height="4" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:SPAWN" inputmask="0x0800"><bounds x="5" y="44" width="4" height="4" /><color alpha="0.25" /></bezel>
+
+		<!-- hand -->
+		<bezel element="text_uih1"><bounds x="0" y="51" width="10" height="2" /></bezel>
+		<bezel element="cblack"><bounds x="1" y="53.5" width="8" height="6" /></bezel>
+		<bezel name="piece_ui0" element="piece"><bounds x="2" y="53.5" width="6" height="6" /></bezel>
+
+		<bezel element="cwhite"><bounds x="1" y="60.5" width="8" height="2.5" /></bezel>
+		<bezel element="text_uih2"><bounds x="1.5" y="60.75" width="7" height="2" /></bezel>
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x08"><bounds x="1" y="60.5" width="8" height="2.5" /><color alpha="0.25" /></bezel>
+
+		<!-- undo -->
+		<bezel element="text_uiu1"><bounds x="0" y="66" width="10" height="2" /></bezel>
+		<bezel element="cwhite"><bounds x="1" y="68.5" width="1.7" height="6" /></bezel>
+		<bezel element="cwhite"><bounds x="3.1" y="68.5" width="1.7" height="6" /></bezel>
+		<bezel element="cwhite"><bounds x="5.2" y="68.5" width="1.7" height="6" /></bezel>
+		<bezel element="cwhite"><bounds x="7.3" y="68.5" width="1.7" height="6" /></bezel>
+		<bezel element="text_uiu2a"><bounds x="1" y="69.5" width="1.7" height="4" /></bezel>
+		<bezel element="text_uiu2b"><bounds x="3.1" y="69.5" width="1.7" height="4" /></bezel>
+		<bezel element="text_uiu2c"><bounds x="5.2" y="69.5" width="1.7" height="4" /></bezel>
+		<bezel element="text_uiu2d"><bounds x="7.3" y="69.5" width="1.7" height="4" /></bezel>
+
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x10"><bounds x="1" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x20"><bounds x="3.1" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x40"><bounds x="5.2" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></bezel>
+		<bezel element="hlub" inputtag="board:UI" inputmask="0x80"><bounds x="7.3" y="68.5" width="1.7" height="6" /><color alpha="0.25" /></bezel>
+
+		<bezel name="count_ui0" element="text_uiu3a"><bounds x="0" y="75" width="4" height="2" /></bezel>
+		<bezel name="count_ui1" element="text_uiu3c"><bounds x="6" y="75" width="4" height="2" /></bezel>
+		<bezel element="text_uiu3b"><bounds x="4" y="75" width="2" height="2" /></bezel>
+	</group>
+
+
+<!-- right side panel -->
+
+	<group name="panel">
+		<bounds x="87" y="5" width="31" height="59" />
+		<element ref="white"><bounds x="87" y="5" width="31" height="59" /></element>
+
+		<element ref="text_p1"><bounds x="112.7" y="9.25" width="2.8" height="2.8" /></element>
+		<element ref="text_p2"><bounds x="112.7" y="12.25" width="2.8" height="2.8" /></element>
+		<element ref="text_p3"><bounds x="112.7" y="15.25" width="2.8" height="2.8" /></element>
+		<element ref="text_p4"><bounds x="112.7" y="18.25" width="2.8" height="2.8" /></element>
+		<element ref="text_p5"><bounds x="112.7" y="21.25" width="2.8" height="2.8" /></element>
+		<element ref="text_p6"><bounds x="112.7" y="24.25" width="2.8" height="2.8" /></element>
+
+		<element ref="black"><bounds x="88.7" y="9.1" width="27.6" height="0.3" /></element>
+		<element ref="black"><bounds x="88.7" y="12.1" width="27.6" height="0.3" /></element>
+		<element ref="black"><bounds x="88.7" y="15.1" width="27.6" height="0.3" /></element>
+		<element ref="black"><bounds x="88.7" y="18.1" width="27.6" height="0.3" /></element>
+		<element ref="black"><bounds x="88.7" y="21.1" width="27.6" height="0.3" /></element>
+		<element ref="black"><bounds x="88.7" y="24.1" width="27.6" height="0.3" /></element>
+		<element ref="black"><bounds x="88.7" y="27.1" width="27.6" height="0.3" /></element>
+		<element ref="white"><bounds x="101.3" y="8" width="2.4" height="25" /></element>
+
+		<element ref="black"><bounds x="88.7"  y="29.7" width="5.1" height="5.6" /></element>
+		<element ref="black"><bounds x="96.2"  y="29.7" width="5.1" height="5.6" /></element>
+		<element ref="black"><bounds x="103.7" y="29.7" width="5.1" height="5.6" /></element>
+		<element ref="black"><bounds x="111.0" y="29.5" width="5.5" height="6.0" /></element>
+		<element ref="black"><bounds x="88.7"  y="37.7" width="5.1" height="5.6" /></element>
+		<element ref="black"><bounds x="96.2"  y="37.7" width="5.1" height="5.6" /></element>
+		<element ref="black"><bounds x="103.7" y="37.7" width="5.1" height="5.6" /></element>
+		<element ref="black"><bounds x="111.0" y="37.5" width="5.5" height="6.0" /></element>
+
+		<element ref="black"><bounds x="88.7"  y="45.7" width="7.6" height="5.6" /></element>
+		<element ref="black"><bounds x="98.7"  y="45.7" width="7.6" height="5.6" /></element>
+		<element ref="black"><bounds x="108.7" y="45.7" width="7.6" height="5.6" /></element>
+		<element ref="black"><bounds x="88.7"  y="53.7" width="7.6" height="5.6" /></element>
+		<element ref="black"><bounds x="98.7"  y="53.7" width="7.6" height="5.6" /></element>
+		<element ref="black"><bounds x="108.7" y="53.7" width="7.6" height="5.6" /></element>
+
+		<element ref="white"><bounds x="89.0"  y="30" width="4.5" height="5" /></element>
+		<element ref="white"><bounds x="96.5"  y="30" width="4.5" height="5" /></element>
+		<element ref="white"><bounds x="104.0" y="30" width="4.5" height="5" /></element>
+		<element ref="white"><bounds x="111.5" y="30" width="4.5" height="5" /></element>
+		<element ref="white"><bounds x="89.0"  y="38" width="4.5" height="5" /></element>
+		<element ref="white"><bounds x="96.5"  y="38" width="4.5" height="5" /></element>
+		<element ref="white"><bounds x="104.0" y="38" width="4.5" height="5" /></element>
+		<element ref="white"><bounds x="111.5" y="38" width="4.5" height="5" /></element>
+
+		<element ref="white"><bounds x="89"  y="46" width="7" height="5" /></element>
+		<element ref="white"><bounds x="99"  y="46" width="7" height="5" /></element>
+		<element ref="white"><bounds x="109" y="46" width="7" height="5" /></element>
+		<element ref="white"><bounds x="89"  y="54" width="7" height="5" /></element>
+		<element ref="white"><bounds x="99"  y="54" width="7" height="5" /></element>
+		<element ref="white"><bounds x="109" y="54" width="7" height="5" /></element>
+
+		<element ref="text_p1"><bounds x="91.1"  y="47" width="2.8" height="2.8" /></element>
+		<element ref="text_p2"><bounds x="101.1" y="47" width="2.8" height="2.8" /></element>
+		<element ref="text_p3"><bounds x="111.1" y="47" width="2.8" height="2.8" /></element>
+		<element ref="text_p4"><bounds x="91.1"  y="55" width="2.8" height="2.8" /></element>
+		<element ref="text_p5"><bounds x="101.1" y="55" width="2.8" height="2.8" /></element>
+		<element ref="text_p6"><bounds x="111.1" y="55" width="2.8" height="2.8" /></element>
+
+		<element ref="black2" blend="add"><bounds x="87" y="5" width="31" height="59" /></element>
+
+		<element ref="text_l1"><bounds x="92.3" y="10.1" width="10" height="1.3" /></element>
+		<element ref="text_l2"><bounds x="92.3" y="13.1" width="10" height="1.3" /></element>
+		<element ref="text_l3"><bounds x="92.3" y="16.1" width="10" height="1.3" /></element>
+		<element ref="text_l4"><bounds x="92.3" y="19.1" width="10" height="1.3" /></element>
+		<element ref="text_l5"><bounds x="92.3" y="22.1" width="10" height="1.3" /></element>
+		<element ref="text_l6"><bounds x="92.3" y="25.1" width="10" height="1.3" /></element>
+
+		<element ref="text_b1a"><bounds x="89.0"  y="32.2" width="4.5" height="1.3" /></element>
+		<element ref="text_b1b"><bounds x="89.0"  y="33.4" width="4.5" height="1.3" /></element>
+		<element ref="text_b2a"><bounds x="96.5"  y="32.2" width="4.5" height="1.3" /></element>
+		<element ref="text_b2b"><bounds x="96.5"  y="33.4" width="4.5" height="1.3" /></element>
+		<element ref="text_b3a"><bounds x="104.0" y="32.2" width="4.5" height="1.3" /></element>
+		<element ref="text_b3b"><bounds x="104.0" y="33.4" width="4.5" height="1.3" /></element>
+		<element ref="text_b4b"><bounds x="111.5" y="33.4" width="4.5" height="1.3" /></element>
+
+		<element ref="text_b5b"><bounds x="89.0"  y="41.4" width="4.5" height="1.3" /></element>
+		<element ref="text_b6a"><bounds x="96.5"  y="40.2" width="4.5" height="1.3" /></element>
+		<element ref="text_b6b"><bounds x="96.5"  y="41.4" width="4.5" height="1.3" /></element>
+		<element ref="text_b7a"><bounds x="104.0" y="40.2" width="4.5" height="1.3" /></element>
+		<element ref="text_b7b"><bounds x="104.0" y="41.4" width="4.5" height="1.3" /></element>
+		<element ref="text_b8a"><bounds x="111.5" y="40.2" width="4.5" height="1.3" /></element>
+		<element ref="text_b8b"><bounds x="111.5" y="41.4" width="4.5" height="1.3" /></element>
+
+		<element ref="cwhite" blend="multiply"><bounds x="87" y="5" width="31" height="59" /></element>
+
+		<element ref="hl" blend="multiply" inputtag="IN.1" inputmask="0x80"><bounds x="89.0"  y="30" width="4.5" height="5" /></element>
+		<element ref="hl" blend="multiply" inputtag="IN.1" inputmask="0x40"><bounds x="96.5"  y="30" width="4.5" height="5" /></element>
+		<element ref="hl" blend="multiply" inputtag="IN.1" inputmask="0x20"><bounds x="104.0" y="30" width="4.5" height="5" /></element>
+		<element ref="hl" blend="multiply" inputtag="IN.1" inputmask="0x08"><bounds x="111.5" y="30" width="4.5" height="5" /></element>
+		<element ref="hl" blend="multiply" inputtag="IN.0" inputmask="0x80"><bounds x="89.0"  y="38" width="4.5" height="5" /></element>
+		<element ref="hl" blend="multiply" inputtag="IN.0" inputmask="0x40"><bounds x="96.5"  y="38" width="4.5" height="5" /></element>
+		<element ref="hl" blend="multiply" inputtag="IN.1" inputmask="0x10"><bounds x="104.0" y="38" width="4.5" height="5" /></element>
+		<element ref="hl" blend="multiply" inputtag="IN.1" inputmask="0x02"><bounds x="111.5" y="38" width="4.5" height="5" /></element>
+
+		<element ref="hl" blend="multiply" inputtag="IN.0" inputmask="0x20"><bounds x="89"  y="46" width="7" height="5" /></element>
+		<element ref="hl" blend="multiply" inputtag="IN.0" inputmask="0x10"><bounds x="99"  y="46" width="7" height="5" /></element>
+		<element ref="hl" blend="multiply" inputtag="IN.1" inputmask="0x04"><bounds x="109" y="46" width="7" height="5" /></element>
+		<element ref="hl" blend="multiply" inputtag="IN.0" inputmask="0x08"><bounds x="89"  y="54" width="7" height="5" /></element>
+		<element ref="hl" blend="multiply" inputtag="IN.0" inputmask="0x04"><bounds x="99"  y="54" width="7" height="5" /></element>
+		<element ref="hl" blend="multiply" inputtag="IN.0" inputmask="0x02"><bounds x="109" y="54" width="7" height="5" /></element>
+
+		<element name="10.a" ref="led"><bounds x="90" y="10" width="1.5" height="1.5" /></element>
+		<element name="11.a" ref="led"><bounds x="90" y="13" width="1.5" height="1.5" /></element>
+		<element name="2.2" ref="led"><bounds x="90" y="16" width="1.5" height="1.5" /></element>
+		<element name="4.2" ref="led"><bounds x="90" y="19" width="1.5" height="1.5" /></element>
+		<element name="6.2" ref="led"><bounds x="90" y="22" width="1.5" height="1.5" /></element>
+		<element name="8.2" ref="led"><bounds x="90" y="25" width="1.5" height="1.5" /></element>
+
+		<element name="0.2" ref="led"><bounds x="105" y="10" width="1.5" height="1.5" /></element>
+		<element name="1.2" ref="led"><bounds x="105" y="13" width="1.5" height="1.5" /></element>
+		<element name="3.2" ref="led"><bounds x="105" y="16" width="1.5" height="1.5" /></element>
+		<element name="5.2" ref="led"><bounds x="105" y="19" width="1.5" height="1.5" /></element>
+		<element name="7.2" ref="led"><bounds x="105" y="22" width="1.5" height="1.5" /></element>
+		<element name="9.2" ref="led"><bounds x="105" y="25" width="1.5" height="1.5" /></element>
+	</group>
+
+
+<!-- build screen -->
+
+	<view name="Internal Layout">
+		<bounds left="-14" right="120" top="-1" bottom="88" />
+
+		<bezel element="black2"><bounds x="3.7" y="2.7" width="80.6" height="80.6" /></bezel>
+		<element ref="cwhite"><bounds x="-1" y="-1" width="88.5" height="89" /></element>
+		<group ref="sb_board"><bounds x="4" y="3" width="80" height="80" /></group>
+		<group ref="sb_ui"><bounds x="-12.5" y="3" width="10" height="80" /></group>
+
+		<element ref="cwhite"><bounds x="87" y="-1" width="33" height="89" /></element>
+		<group ref="panel"><bounds x="88" y="28.7" width="31" height="59" /></group>
+
+		<bezel element="text_8"><bounds x="-0.4" y="7"  width="2" height="2" /></bezel>
+		<bezel element="text_7"><bounds x="-0.4" y="17" width="2" height="2" /></bezel>
+		<bezel element="text_6"><bounds x="-0.4" y="27" width="2" height="2" /></bezel>
+		<bezel element="text_5"><bounds x="-0.4" y="37" width="2" height="2" /></bezel>
+		<bezel element="text_4"><bounds x="-0.4" y="47" width="2" height="2" /></bezel>
+		<bezel element="text_3"><bounds x="-0.4" y="57" width="2" height="2" /></bezel>
+		<bezel element="text_2"><bounds x="-0.4" y="67" width="2" height="2" /></bezel>
+		<bezel element="text_1"><bounds x="-0.4" y="77" width="2" height="2" /></bezel>
+
+		<bezel element="text_a"><bounds x="8"  y="85.6" width="2" height="2" /></bezel>
+		<bezel element="text_b"><bounds x="18" y="85.6" width="2" height="2" /></bezel>
+		<bezel element="text_c"><bounds x="28" y="85.6" width="2" height="2" /></bezel>
+		<bezel element="text_d"><bounds x="38" y="85.6" width="2" height="2" /></bezel>
+		<bezel element="text_e"><bounds x="48" y="85.6" width="2" height="2" /></bezel>
+		<bezel element="text_f"><bounds x="58" y="85.6" width="2" height="2" /></bezel>
+		<bezel element="text_g"><bounds x="68" y="85.6" width="2" height="2" /></bezel>
+		<bezel element="text_h"><bounds x="78" y="85.6" width="2" height="2" /></bezel>
+
+		<bezel name="7.1" element="led"><bounds x="1.6" y="7.25"  width="1.5" height="1.5" /></bezel>
+		<bezel name="6.1" element="led"><bounds x="1.6" y="17.25" width="1.5" height="1.5" /></bezel>
+		<bezel name="5.1" element="led"><bounds x="1.6" y="27.25" width="1.5" height="1.5" /></bezel>
+		<bezel name="4.1" element="led"><bounds x="1.6" y="37.25" width="1.5" height="1.5" /></bezel>
+		<bezel name="3.1" element="led"><bounds x="1.6" y="47.25" width="1.5" height="1.5" /></bezel>
+		<bezel name="2.1" element="led"><bounds x="1.6" y="57.25" width="1.5" height="1.5" /></bezel>
+		<bezel name="1.1" element="led"><bounds x="1.6" y="67.25" width="1.5" height="1.5" /></bezel>
+		<bezel name="0.1" element="led"><bounds x="1.6" y="77.25" width="1.5" height="1.5" /></bezel>
+
+		<bezel name="0.0" element="led"><bounds x="8.25"  y="83.9" width="1.5" height="1.5" /></bezel>
+		<bezel name="1.0" element="led"><bounds x="18.25" y="83.9" width="1.5" height="1.5" /></bezel>
+		<bezel name="2.0" element="led"><bounds x="28.25" y="83.9" width="1.5" height="1.5" /></bezel>
+		<bezel name="3.0" element="led"><bounds x="38.25" y="83.9" width="1.5" height="1.5" /></bezel>
+		<bezel name="4.0" element="led"><bounds x="48.25" y="83.9" width="1.5" height="1.5" /></bezel>
+		<bezel name="5.0" element="led"><bounds x="58.25" y="83.9" width="1.5" height="1.5" /></bezel>
+		<bezel name="6.0" element="led"><bounds x="68.25" y="83.9" width="1.5" height="1.5" /></bezel>
+		<bezel name="7.0" element="led"><bounds x="78.25" y="83.9" width="1.5" height="1.5" /></bezel>
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/saitek_chesstrvi.lay mame-0.224+dfsg.1/src/mame/layout/saitek_chesstrvi.lay
--- mame-0.222+dfsg.1/src/mame/layout/saitek_chesstrvi.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/saitek_chesstrvi.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,159 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+
+<!-- NOTE: no chesspieces simulation here -->
+
+<!-- define elements -->
+
+	<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
+	<element name="black2"><rect><color red="0.12" green="0.12" blue="0.12" /></rect></element>
+	<element name="white"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
+	<element name="white2"><rect><color red="0.75" green="0.76" blue="0.78" /></rect></element>
+
+	<element name="button" defstate="0">
+		<rect state="0"><color red="0.26" green="0.25" blue="0.25" /></rect>
+		<rect state="1"><color red="0.36" green="0.35" blue="0.35" /></rect>
+	</element>
+
+	<element name="text_l01a"><text string="A" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l01b"><text string="1" align="2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l02a"><text string="B" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l02b"><text string="2" align="2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l03a"><text string="C" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l03b"><text string="3" align="2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l04a"><text string="D" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l04b"><text string="4" align="2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l05a"><text string="E" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l05b"><text string="5" align="2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l06a"><text string="F" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l06b"><text string="6" align="2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l07a"><text string="G" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l07b"><text string="7" align="2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l08a"><text string="H" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l08b"><text string="8" align="2"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+
+	<element name="text_l09a"><text string="LEVEL"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l09b"><text string="CS" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l10a"><text string="FIND" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l10b"><text string="POSITION" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l11a"><text string="ENTER" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l11b"><text string="POSITION" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l12a"><text string="MULTI" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l12b"><text string="MOVE" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l13a"><text string="NEW" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l13b"><text string="GAME" align="1"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l14"><text string="C E"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+	<element name="text_l15"><text string="ENTER"><color red="0.8" green="0.8" blue="0.8" /></text></element>
+
+	<element name="text_p1"><image file="chess/wk.png"><color alpha="0.87" /></image></element>
+	<element name="text_p2"><image file="chess/wq.png"><color alpha="0.87" /></image></element>
+	<element name="text_p3"><image file="chess/wr.png"><color alpha="0.87" /></image></element>
+	<element name="text_p4"><image file="chess/wb.png"><color alpha="0.87" /></image></element>
+	<element name="text_p5"><image file="chess/wn.png"><color alpha="0.87" /></image></element>
+	<element name="text_p6"><image file="chess/wp.png"><color alpha="0.87" /></image></element>
+
+
+<!-- digits -->
+
+	<element name="lcd_bg"><rect><color red="0.54" green="0.57" blue="0.58" /></rect></element>
+
+	<element name="digit" defstate="0">
+		<led7seg><color red="0.2" green="0.16" blue="0.16" /></led7seg>
+	</element>
+	<element name="seg0" defstate="0">
+		<rect><color red="0.54" green="0.57" blue="0.58" /></rect>
+		<text state="1" string="COMPUTING"><color red="0.2" green="0.16" blue="0.16" /></text>
+		<text state="0" string="COMPUTING"><color red="0.49412" green="0.51765" blue="0.51765" /></text>
+	</element>
+
+	<group name="digits">
+		<bounds x="18" y="23.5" width="74" height="27.5" />
+		<bezel element="lcd_bg"><bounds x="18" y="23.5" width="74" height="27.5" /></bezel>
+		<bezel name="computing" element="seg0"><bounds x="40" y="25.7" width="30" height="4" /></bezel>
+		<bezel name="digit3" element="digit"><bounds x="29.5" y="30" width="10" height="14" /></bezel>
+		<bezel name="digit2" element="digit"><bounds x="40" y="30" width="10" height="14" /></bezel>
+		<bezel name="digit1" element="digit"><bounds x="60" y="30" width="10" height="14" /></bezel>
+		<bezel name="digit0" element="digit"><bounds x="70.5" y="30" width="10" height="14" /></bezel>
+	</group>
+
+
+<!-- button panel -->
+
+	<group name="buttons">
+		<bounds x="-1" y="28.5" width="32" height="10.1" />
+
+		<bezel element="text_p6"><bounds x="0.7"  y="32.18" width="1.6" height="1.6" /></bezel>
+		<bezel element="text_p5"><bounds x="4.7"  y="32.18" width="1.6" height="1.6" /></bezel>
+		<bezel element="text_p4"><bounds x="8.7"  y="32.18" width="1.6" height="1.6" /></bezel>
+		<bezel element="text_p3"><bounds x="12.7" y="32.18" width="1.6" height="1.6" /></bezel>
+		<bezel element="text_p2"><bounds x="16.7" y="32.18" width="1.6" height="1.6" /></bezel>
+		<bezel element="text_p1"><bounds x="20.7" y="32.18" width="1.6" height="1.6" /></bezel>
+
+		<bezel element="button" inputtag="IN.0" inputmask="0x01"><bounds x="0" y="30" width="3" height="2.2" /></bezel>
+		<bezel element="button" inputtag="IN.0" inputmask="0x02"><bounds x="4" y="30" width="3" height="2.2" /></bezel>
+		<bezel element="button" inputtag="IN.0" inputmask="0x04"><bounds x="8" y="30" width="3" height="2.2" /></bezel>
+		<bezel element="button" inputtag="IN.0" inputmask="0x08"><bounds x="12" y="30" width="3" height="2.2" /></bezel>
+		<bezel element="button" inputtag="IN.1" inputmask="0x01"><bounds x="16" y="30" width="3" height="2.2" /></bezel>
+		<bezel element="button" inputtag="IN.1" inputmask="0x02"><bounds x="20" y="30" width="3" height="2.2" /></bezel>
+		<bezel element="button" inputtag="IN.1" inputmask="0x04"><bounds x="24" y="30" width="3" height="2.2" /></bezel>
+		<bezel element="button" inputtag="IN.1" inputmask="0x08"><bounds x="28" y="30" width="3" height="2.2" /></bezel>
+
+		<bezel element="button" inputtag="IN.2" inputmask="0x01"><bounds x="0" y="35" width="3" height="2.2" /></bezel>
+		<bezel element="button" inputtag="IN.2" inputmask="0x02"><bounds x="4" y="35" width="3" height="2.2" /></bezel>
+		<bezel element="button" inputtag="IN.2" inputmask="0x04"><bounds x="8" y="35" width="3" height="2.2" /></bezel>
+		<bezel element="button" inputtag="IN.3" inputmask="0x04"><bounds x="12" y="35" width="3" height="2.2" /></bezel>
+		<bezel element="button" inputtag="IN.2" inputmask="0x08"><bounds x="16" y="35" width="3" height="2.2" /></bezel>
+		<bezel element="button" inputtag="IN.3" inputmask="0x01"><bounds x="20" y="35" width="3" height="2.2" /></bezel>
+		<bezel element="button" inputtag="IN.3" inputmask="0x02"><bounds x="26" y="35" width="3" height="2.2" /></bezel>
+
+		<bezel element="text_l01a"><bounds x="0.3"  y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l01b"><bounds x="0.3"  y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l02a"><bounds x="4.3"  y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l02b"><bounds x="4.3"  y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l03a"><bounds x="8.3"  y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l03b"><bounds x="8.3"  y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l04a"><bounds x="12.3" y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l04b"><bounds x="12.3" y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l05a"><bounds x="16.3" y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l05b"><bounds x="16.3" y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l06a"><bounds x="20.3" y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l06b"><bounds x="20.3" y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l07a"><bounds x="24.3" y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l07b"><bounds x="24.3" y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l08a"><bounds x="28.3" y="28.5" width="2.4" height="1.3" /></bezel>
+		<bezel element="text_l08b"><bounds x="28.3" y="28.5" width="2.4" height="1.3" /></bezel>
+
+		<bezel element="white"><bounds x="25" y="32.55" width="1" height="1" /></bezel>
+		<bezel element="white"><bounds x="29" y="32.55" width="1" height="1" /></bezel>
+		<bezel element="blackb"><bounds x="29.15" y="32.7" width="0.7" height="0.7" /></bezel>
+
+		<bezel element="text_l09a"><bounds x="0" y="37.7" width="3" height="0.8" /></bezel>
+		<bezel element="text_l09b"><bounds x="2.5" y="37.6" width="3" height="0.5" /></bezel>
+		<bezel element="text_l10a"><bounds x="4" y="37.35" width="4" height="0.8" /></bezel>
+		<bezel element="text_l10b"><bounds x="4" y="38.15" width="4" height="0.8" /></bezel>
+		<bezel element="text_l11a"><bounds x="8" y="37.35" width="4" height="0.8" /></bezel>
+		<bezel element="text_l11b"><bounds x="8" y="38.15" width="4" height="0.8" /></bezel>
+		<bezel element="text_l12a"><bounds x="12.5" y="37.35" width="4" height="0.8" /></bezel>
+		<bezel element="text_l12b"><bounds x="12.5" y="38.15" width="4" height="0.8" /></bezel>
+		<bezel element="text_l13a"><bounds x="16.7" y="37.35" width="4" height="0.8" /></bezel>
+		<bezel element="text_l13b"><bounds x="16.7" y="38.15" width="4" height="0.8" /></bezel>
+		<bezel element="text_l14"><bounds x="20" y="37.7" width="3" height="0.8" /></bezel>
+		<bezel element="text_l15"><bounds x="26" y="37.7" width="3" height="0.8" /></bezel>
+	</group>
+
+
+<!-- build screen -->
+
+	<view name="Internal Layout">
+		<bounds left="-0.775" right="31.775" top="20" bottom="39.3" />
+
+		<bezel element="white2"><bounds x="-0.775" y="20" width="32.55" height="7.7" /></bezel>
+		<bezel element="black2"><bounds x="7.85" y="20.85" width="15.3" height="6.0" /></bezel>
+		<group ref="digits"><bounds x="8" y="21" width="15" height="5.7" /></group>
+		<group ref="buttons"><bounds x="-1" y="28.5" width="32" height="10.1" /></group>
+	</view>
+
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/saitek_cp2000.lay mame-0.224+dfsg.1/src/mame/layout/saitek_cp2000.lay
--- mame-0.222+dfsg.1/src/mame/layout/saitek_cp2000.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/saitek_cp2000.lay	2020-08-26 08:57:19.000000000 +0000
@@ -600,12 +600,10 @@
 <!-- build screen -->
 
 	<view name="Internal Layout">
-		<bounds left="61" right="198.25" top="0" bottom="86" />
+		<bounds left="49.75" right="186" top="0" bottom="86" />
 
 		<group ref="sb_board"><bounds x="102" y="2" width="82" height="82" /></group>
-
-		<!-- putting sb_ui on the right side, since chesscomputer has its own ui on the left -->
-		<group ref="sb_ui"><bounds x="186" y="2" width="10.25" height="82" /></group>
+		<group ref="sb_ui"><bounds x="51.25" y="2" width="10.25" height="82" /></group>
 
 	<!-- left side display -->
 
diff -Nru mame-0.222+dfsg.1/src/mame/layout/saitek_intchess.lay mame-0.224+dfsg.1/src/mame/layout/saitek_intchess.lay
--- mame-0.222+dfsg.1/src/mame/layout/saitek_intchess.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/saitek_intchess.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,200 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+
+<!-- define elements -->
+
+	<element name="black"><rect><color red="0" green="0" blue="0" /></rect></element>
+	<element name="white"><rect><color red="1" green="1" blue="1" /></rect></element>
+	<element name="whitea"><rect><color red="0.1" green="0.1" blue="0.1" /></rect></element>
+	<element name="whitem"><rect><color red="0.8" green="0.8" blue="0.8" /></rect></element>
+	<element name="orange"><rect><color red="0.8" green="0.5" blue="0.05" /></rect></element>
+
+	<element name="hl" defstate="0">
+		<rect state="0"><color red="1" green="1" blue="1" /></rect>
+		<rect state="1"><color red="0.8" green="0.8" blue="0.8" /></rect>
+	</element>
+
+	<element name="digit" defstate="0">
+		<led7seg><color red="1.0" green="0.1" blue="0.15" /></led7seg>
+	</element>
+
+	<element name="text_1"><text string="1"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_2"><text string="2"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_3"><text string="3"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_4"><text string="4"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_5"><text string="5"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_6"><text string="6"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_7"><text string="7"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_8"><text string="8"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_a"><text string="A"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_b"><text string="B"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_c"><text string="C"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_d"><text string="D"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_e"><text string="E"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_f"><text string="F"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_g"><text string="G"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_h"><text string="H"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+
+	<element name="text_l00"><text string="RESET"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_l02"><text string="LEVEL"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_l03"><text string="NEW GAME"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+
+	<element name="text_l11"><text string="MODE"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_l12"><text string="C SQUARE"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_l13"><text string="C BOARD"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_l14"><text string="PLACE"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_l15"><text string="FIND"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_l16"><text string="NEXT BEST"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+
+	<element name="text_l21"><text string="RECORD"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_l22"><text string="FLASH"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_l23"><text string="TAKE BACK"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_l24"><text string="STEP"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_l25"><text string="CLEAR"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+	<element name="text_l26"><text string="ENTER"><color red="0.66" green="0.66" blue="0.66" /></text></element>
+
+	<element name="text_p1"><image file="chess/bp.png" /></element>
+	<element name="text_p2"><image file="chess/bn.png" /></element>
+	<element name="text_p3"><image file="chess/bb.png" /></element>
+	<element name="text_p4"><image file="chess/br.png" /></element>
+	<element name="text_p5"><image file="chess/bq.png" /></element>
+	<element name="text_p6"><image file="chess/bk.png" /></element>
+
+
+<!-- chesscomputer -->
+
+	<group name="main">
+		<bounds left="-2" right="48" top="46.5" bottom="124" />
+
+		<bezel name="digit0" element="digit"><bounds x="15" y="88" width="4" height="6" /></bezel>
+		<bezel name="digit1" element="digit"><bounds x="19" y="88" width="4" height="6" /></bezel>
+		<bezel name="digit2" element="digit"><bounds x="23" y="88" width="4" height="6" /></bezel>
+		<bezel name="digit3" element="digit"><bounds x="27" y="88" width="4" height="6" /></bezel>
+
+		<!-- buttons -->
+		<element ref="orange"><bounds x="0"  y="100" width="4" height="4" /></element>
+		<element ref="orange"><bounds x="6"  y="100" width="4" height="4" /></element>
+		<element ref="orange"><bounds x="18" y="100" width="4" height="4" /></element>
+		<element ref="orange"><bounds x="24" y="100" width="4" height="4" /></element>
+		<element ref="orange"><bounds x="36" y="100" width="4" height="4" /></element>
+		<element ref="orange"><bounds x="42" y="100" width="4" height="4" /></element>
+
+		<element ref="orange"><bounds x="0"  y="107" width="4" height="4" /></element>
+		<element ref="orange"><bounds x="6"  y="107" width="4" height="4" /></element>
+		<element ref="orange"><bounds x="18" y="107" width="4" height="4" /></element>
+		<element ref="orange"><bounds x="24" y="107" width="4" height="4" /></element>
+		<element ref="orange"><bounds x="36" y="107" width="4" height="4" /></element>
+		<element ref="orange"><bounds x="42" y="107" width="4" height="4" /></element>
+
+		<element ref="white"><bounds x="0"  y="117" width="4" height="4" /></element>
+		<element ref="white"><bounds x="6"  y="117" width="4" height="4" /></element>
+		<element ref="white"><bounds x="12" y="117" width="4" height="4" /></element>
+		<element ref="white"><bounds x="18" y="117" width="4" height="4" /></element>
+		<element ref="white"><bounds x="24" y="117" width="4" height="4" /></element>
+		<element ref="white"><bounds x="30" y="117" width="4" height="4" /></element>
+		<element ref="white"><bounds x="36" y="117" width="4" height="4" /></element>
+		<element ref="white"><bounds x="42" y="117" width="4" height="4" /></element>
+
+		<element ref="text_p1"><bounds x="0.4"  y="117.4" width="3.2" height="3.2" /></element>
+		<element ref="text_p2"><bounds x="6.4"  y="117.4" width="3.2" height="3.2" /></element>
+		<element ref="text_p3"><bounds x="12.4" y="117.4" width="3.2" height="3.2" /></element>
+		<element ref="text_p4"><bounds x="18.4" y="117.4" width="3.2" height="3.2" /></element>
+		<element ref="text_p5"><bounds x="24.4" y="117.4" width="3.2" height="3.2" /></element>
+		<element ref="text_p6"><bounds x="30.4" y="117.4" width="3.2" height="3.2" /></element>
+		<element ref="black"><bounds x="36.8" y="117.8" width="2.4" height="2.4" /></element>
+		<element ref="white"><bounds x="37.2" y="118.2" width="1.6" height="1.6" /></element>
+		<element ref="black"><bounds x="42.8" y="117.8" width="2.4" height="2.4" /></element>
+
+		<element ref="whitea" blend="add"><bounds x="0"  y="117" width="4" height="4" /></element>
+		<element ref="whitea" blend="add"><bounds x="6"  y="117" width="4" height="4" /></element>
+		<element ref="whitea" blend="add"><bounds x="12" y="117" width="4" height="4" /></element>
+		<element ref="whitea" blend="add"><bounds x="18" y="117" width="4" height="4" /></element>
+		<element ref="whitea" blend="add"><bounds x="24" y="117" width="4" height="4" /></element>
+		<element ref="whitea" blend="add"><bounds x="30" y="117" width="4" height="4" /></element>
+		<element ref="whitea" blend="add"><bounds x="36" y="117" width="4" height="4" /></element>
+		<element ref="whitea" blend="add"><bounds x="42" y="117" width="4" height="4" /></element>
+
+		<element ref="whitem" blend="multiply"><bounds x="-1" y="116" width="50" height="6" /></element>
+
+		<element ref="hl" blend="multiply" inputtag="X3" inputmask="0x04"><bounds x="0"  y="100" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X1" inputmask="0x04"><bounds x="6"  y="100" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X2" inputmask="0x04"><bounds x="18" y="100" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X4" inputmask="0x08"><bounds x="24" y="100" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X3" inputmask="0x08"><bounds x="36" y="100" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X3" inputmask="0x10"><bounds x="42" y="100" width="4" height="4" /></element>
+
+		<element ref="hl" blend="multiply" inputtag="X4" inputmask="0x04"><bounds x="0"  y="107" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X1" inputmask="0x10"><bounds x="6"  y="107" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X2" inputmask="0x10"><bounds x="18" y="107" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X4" inputmask="0x10"><bounds x="24" y="107" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X1" inputmask="0x08"><bounds x="36" y="107" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X2" inputmask="0x08"><bounds x="42" y="107" width="4" height="4" /></element>
+
+		<element ref="hl" blend="multiply" inputtag="X1" inputmask="0x01"><bounds x="0"  y="117" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X2" inputmask="0x01"><bounds x="6"  y="117" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X3" inputmask="0x01"><bounds x="12" y="117" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X4" inputmask="0x01"><bounds x="18" y="117" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X1" inputmask="0x02"><bounds x="24" y="117" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X2" inputmask="0x02"><bounds x="30" y="117" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X3" inputmask="0x02"><bounds x="36" y="117" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="X4" inputmask="0x02"><bounds x="42" y="117" width="4" height="4" /></element>
+
+		<element ref="whitem"><bounds x="42" y="90" width="4" height="4" /></element>
+		<element ref="hl" blend="multiply" inputtag="RESET" inputmask="0x01"><bounds x="42" y="90" width="4" height="4" /></element>
+
+		<!-- labels -->
+		<bezel element="text_a"><bounds x="0"  y="114.5" width="4" height="1.9" /></bezel>
+		<bezel element="text_b"><bounds x="6"  y="114.5" width="4" height="1.9" /></bezel>
+		<bezel element="text_c"><bounds x="12" y="114.5" width="4" height="1.9" /></bezel>
+		<bezel element="text_d"><bounds x="18" y="114.5" width="4" height="1.9" /></bezel>
+		<bezel element="text_e"><bounds x="24" y="114.5" width="4" height="1.9" /></bezel>
+		<bezel element="text_f"><bounds x="30" y="114.5" width="4" height="1.9" /></bezel>
+		<bezel element="text_g"><bounds x="36" y="114.5" width="4" height="1.9" /></bezel>
+		<bezel element="text_h"><bounds x="42" y="114.5" width="4" height="1.9" /></bezel>
+
+		<bezel element="text_1"><bounds x="0"  y="121.4" width="4" height="1.9" /></bezel>
+		<bezel element="text_2"><bounds x="6"  y="121.4" width="4" height="1.9" /></bezel>
+		<bezel element="text_3"><bounds x="12" y="121.4" width="4" height="1.9" /></bezel>
+		<bezel element="text_4"><bounds x="18" y="121.4" width="4" height="1.9" /></bezel>
+		<bezel element="text_5"><bounds x="24" y="121.4" width="4" height="1.9" /></bezel>
+		<bezel element="text_6"><bounds x="30" y="121.4" width="4" height="1.9" /></bezel>
+		<bezel element="text_7"><bounds x="36" y="121.4" width="4" height="1.9" /></bezel>
+		<bezel element="text_8"><bounds x="42" y="121.4" width="4" height="1.9" /></bezel>
+
+		<bezel element="text_l00"><bounds x="40" y="88.5" width="8" height="1.1" /></bezel>
+		<bezel element="text_l02"><bounds x="4"  y="97.3" width="8" height="1.1" /></bezel>
+		<bezel element="text_l03"><bounds x="16" y="97.3" width="8" height="1.1" /></bezel>
+
+		<bezel element="text_l11"><bounds x="-2" y="98.5" width="8" height="1.1" /></bezel>
+		<bezel element="text_l12"><bounds x="4"  y="98.5" width="8" height="1.1" /></bezel>
+		<bezel element="text_l13"><bounds x="16" y="98.5" width="8" height="1.1" /></bezel>
+		<bezel element="text_l14"><bounds x="22" y="98.5" width="8" height="1.1" /></bezel>
+		<bezel element="text_l15"><bounds x="34" y="98.5" width="8" height="1.1" /></bezel>
+		<bezel element="text_l16"><bounds x="40" y="98.5" width="8" height="1.1" /></bezel>
+
+		<bezel element="text_l21"><bounds x="-2" y="105.5" width="8" height="1.1" /></bezel>
+		<bezel element="text_l22"><bounds x="4"  y="105.5" width="8" height="1.1" /></bezel>
+		<bezel element="text_l23"><bounds x="16" y="105.5" width="8" height="1.1" /></bezel>
+		<bezel element="text_l24"><bounds x="22" y="105.5" width="8" height="1.1" /></bezel>
+		<bezel element="text_l25"><bounds x="34" y="105.5" width="8" height="1.1" /></bezel>
+		<bezel element="text_l26"><bounds x="40" y="105.5" width="8" height="1.1" /></bezel>
+	</group>
+
+
+<!-- build screen -->
+
+	<view name="Internal Layout (Full)">
+		<bounds left="-2" right="48" top="46.5" bottom="124" />
+		<group ref="main"><bounds left="-2" right="48" top="46.5" bottom="124" /></group>
+		<screen index="0"><bounds x="-2" y="46.5" width="50" height="37.5" /></screen>
+	</view>
+
+	<view name="Internal Layout (Main Unit)">
+		<bounds left="-2" right="48" top="87" bottom="124" />
+		<group ref="main"><bounds left="-2" right="48" top="46.5" bottom="124" /></group>
+	</view>
+
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/saitek_schess.lay mame-0.224+dfsg.1/src/mame/layout/saitek_schess.lay
--- mame-0.222+dfsg.1/src/mame/layout/saitek_schess.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/saitek_schess.lay	2020-08-26 08:57:19.000000000 +0000
@@ -323,6 +323,7 @@
 
 <!-- buttons -->
 
+	<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
 	<element name="black"><rect><color red="0.21" green="0.2" blue="0.2" /></rect></element>
 	<element name="rmask"><rect><color red="0.73" green="0.03" blue="0.09" /></rect></element>
 
@@ -359,15 +360,42 @@
 	<element name="text_p6"><image file="chess/wp.png"></image></element>
 
 	<group name="buttons">
-		<bounds x="-1" y="0" width="20" height="30" />
+		<bounds x="-1" y="-1" width="20" height="31" />
 
-		<element ref="text_p1"><bounds x="1.6" y="0" width="1.8" height="1.8" /></element>
-		<element ref="text_p2"><bounds x="7.6" y="0" width="1.8" height="1.8" /></element>
+		<element ref="blackb"><bounds x="-0.2" y="-0.2" width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="5.8"  y="-0.2" width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="11.8" y="-0.2" width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="-0.2" y="3.8"  width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="5.8"  y="3.8"  width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="11.8" y="3.8"  width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="-0.2" y="7.8"  width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="5.8"  y="7.8"  width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="11.8" y="7.8"  width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="-0.2" y="11.8" width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="5.8"  y="11.8" width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="11.8" y="11.8" width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="-0.2" y="15.8" width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="5.8"  y="15.8" width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="11.8" y="15.8" width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="-0.2" y="19.8" width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="5.8"  y="19.8" width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="11.8" y="19.8" width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="-0.2" y="25.55" width="5.4" height="3.4" /></element>
+		<element ref="blackb"><bounds x="11.6" y="25.35" width="5.8" height="3.8" /></element>
+
+		<element ref="text_p1"><bounds x="1.6"  y="0" width="1.8" height="1.8" /></element>
+		<element ref="text_p2"><bounds x="7.6"  y="0" width="1.8" height="1.8" /></element>
 		<element ref="text_p3"><bounds x="13.6" y="0" width="1.8" height="1.8" /></element>
-		<element ref="text_p5"><bounds x="1.6" y="4" width="1.8" height="1.8" /></element>
-		<element ref="text_p4"><bounds x="7.6" y="4" width="1.8" height="1.8" /></element>
+		<element ref="text_p5"><bounds x="1.6"  y="4" width="1.8" height="1.8" /></element>
+		<element ref="text_p4"><bounds x="7.6"  y="4" width="1.8" height="1.8" /></element>
 		<element ref="text_p6"><bounds x="13.6" y="4" width="1.8" height="1.8" /></element>
-		<element ref="rmask" blend="multiply"><bounds x="0" y="0" width="20" height="20" /></element>
+
+		<element ref="rmask" blend="multiply"><bounds x="1.6"  y="0" width="1.8" height="1.8" /></element>
+		<element ref="rmask" blend="multiply"><bounds x="7.6"  y="0" width="1.8" height="1.8" /></element>
+		<element ref="rmask" blend="multiply"><bounds x="13.6" y="0" width="1.8" height="1.8" /></element>
+		<element ref="rmask" blend="multiply"><bounds x="1.6"  y="4" width="1.8" height="1.8" /></element>
+		<element ref="rmask" blend="multiply"><bounds x="7.6"  y="4" width="1.8" height="1.8" /></element>
+		<element ref="rmask" blend="multiply"><bounds x="13.6" y="4" width="1.8" height="1.8" /></element>
 
 		<element ref="text_l1"><bounds x="0" y="8.4" width="5" height="0.9" /></element>
 		<element ref="text_l2a"><bounds x="6" y="8" width="5" height="0.9" /></element>
@@ -430,25 +458,25 @@
 		<element name="9.1" ref="led"><bounds x="14.07" y="21.85" width="0.86" height="0.86" /></element>
 		<element name="9.0" ref="led"><bounds x="2.07" y="27.4" width="0.86" height="0.86" /></element>
 
-		<element ref="hl" inputtag="IN.0" inputmask="0x80"><bounds x="0"  y="0" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.1" inputmask="0x80"><bounds x="6"  y="0" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.1" inputmask="0x40"><bounds x="12" y="0" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.0" inputmask="0x40"><bounds x="0"  y="4" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.2" inputmask="0x80"><bounds x="6"  y="4" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.2" inputmask="0x40"><bounds x="12" y="4" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.0" inputmask="0x20"><bounds x="0"  y="8" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.1" inputmask="0x10"><bounds x="6"  y="8" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.2" inputmask="0x20"><bounds x="12" y="8" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.0" inputmask="0x10"><bounds x="0"  y="12" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.1" inputmask="0x20"><bounds x="6"  y="12" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.2" inputmask="0x10"><bounds x="12" y="12" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.0" inputmask="0x08"><bounds x="0"  y="16" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.1" inputmask="0x08"><bounds x="6"  y="16" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.2" inputmask="0x08"><bounds x="12" y="16" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.0" inputmask="0x04"><bounds x="0"  y="20" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.1" inputmask="0x04"><bounds x="6"  y="20" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.2" inputmask="0x04"><bounds x="12" y="20" width="5" height="3" /><color alpha="0.15" /></element>
-		<element ref="hl" inputtag="IN.1" inputmask="0x02"><bounds x="12" y="25.75" width="5" height="3" /><color alpha="0.15" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x80"><bounds x="0"  y="0" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x80"><bounds x="6"  y="0" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x40"><bounds x="12" y="0" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x40"><bounds x="0"  y="4" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.2" inputmask="0x80"><bounds x="6"  y="4" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.2" inputmask="0x40"><bounds x="12" y="4" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x20"><bounds x="0"  y="8" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x10"><bounds x="6"  y="8" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.2" inputmask="0x20"><bounds x="12" y="8" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x10"><bounds x="0"  y="12" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x20"><bounds x="6"  y="12" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.2" inputmask="0x10"><bounds x="12" y="12" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x08"><bounds x="0"  y="16" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x08"><bounds x="6"  y="16" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.2" inputmask="0x08"><bounds x="12" y="16" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.0" inputmask="0x04"><bounds x="0"  y="20" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x04"><bounds x="6"  y="20" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.2" inputmask="0x04"><bounds x="12" y="20" width="5" height="3" /><color alpha="0.1" /></element>
+		<element ref="hl" inputtag="IN.1" inputmask="0x02"><bounds x="12" y="25.75" width="5" height="3" /><color alpha="0.1" /></element>
 	</group>
 
 
@@ -460,7 +488,8 @@
 		<group ref="sb_board"><bounds x="10" y="10" width="80" height="80" /></group>
 		<group ref="sb_ui"><bounds x="-4.5" y="10" width="10" height="80" /></group>
 
-		<group ref="buttons"><bounds x="96" y="40" width="34.75" height="52.125" /></group>
+		<element ref="black"><bounds x="93" y="6" width="39" height="88" /></element>
+		<group ref="buttons"><bounds x="96" y="38.25" width="34.75" height="54" /></group>
 
 		<repeat count="8">
 			<param name="x" start="10" increment="10" />
diff -Nru mame-0.222+dfsg.1/src/mame/layout/saitek_ssystem3.lay mame-0.224+dfsg.1/src/mame/layout/saitek_ssystem3.lay
--- mame-0.222+dfsg.1/src/mame/layout/saitek_ssystem3.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/saitek_ssystem3.lay	2020-08-26 08:57:19.000000000 +0000
@@ -12,18 +12,10 @@
 	<element name="blackb"><rect><color red="0" green="0" blue="0" /></rect></element>
 	<element name="brown"><rect><color red="0.4" green="0.2" blue="0.1" /></rect></element>
 
-	<element name="lcd_bg" defstate="1">
-		<rect state="1"><color red="0.58" green="0.61" blue="0.62" /></rect>
-		<rect state="0"><color red="0.40" green="0.42" blue="0.43" /></rect>
-	</element>
-
 	<element name="hl" defstate="0">
 		<text string=" "/>
 		<rect state="1"><color red="0" green="0" blue="0" /></rect>
 	</element>
-	<element name="nothing" defstate="0">
-		<text string=" "/>
-	</element>
 
 	<element name="switch" defstate="0">
 		<disk>
@@ -48,6 +40,48 @@
 		</disk>
 	</element>
 
+	<element name="switch2" defstate="0">
+		<rect state="0">
+			<bounds x="0" y="1" width="4" height="4" />
+			<color red="0.2" green="0.2" blue="0.2" />
+		</rect>
+		<rect state="0">
+			<bounds x="0" y="0" width="4" height="4" />
+			<color red="0.8" green="0.8" blue="0.8" />
+		</rect>
+		<rect state="1">
+			<bounds x="0" y="0" width="4" height="4" />
+			<color red="0.2" green="0.2" blue="0.2" />
+		</rect>
+		<rect state="1">
+			<bounds x="0" y="1" width="4" height="4" />
+			<color red="0.8" green="0.8" blue="0.8" />
+		</rect>
+	</element>
+
+	<element name="text_v0"><text string="8"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_v1"><text string="7"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_v2"><text string="6"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_v3"><text string="5"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_v4"><text string="4"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_v5"><text string="3"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_v6"><text string="2"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_v7"><text string="1"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+
+	<element name="text_a0"><text string="A"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_a1"><text string="B"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_a2"><text string="C"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_a3"><text string="D"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_a4"><text string="E"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_a5"><text string="F"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_a6"><text string="G"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+	<element name="text_a7"><text string="H"><color red="0.65" green="0.65" blue="0.653" /></text></element>
+
+	<element name="text_cu1"><text string="LOOK"><color red="0.65" green="0.65" blue="0.65" /></text></element>
+	<element name="text_cu2"><text string="&#x2193;NOW &#x2191;MOVE"><color red="0.65" green="0.65" blue="0.65" /></text></element>
+	<element name="text_cu3"><text string="LIGHT"><color red="0.65" green="0.65" blue="0.65" /></text></element>
+	<element name="text_cu4"><text string="&#x2193;ON &#x2191;OFF"><color red="0.65" green="0.65" blue="0.65" /></text></element>
+
 	<element name="text_n1">
 		<rect><color red="0.8" green="0.8" blue="0.8" /></rect>
 		<text string="1" align="1"><color red="0.1" green="0.1" blue="0.1" /></text>
@@ -160,16 +194,86 @@
 	<element name="text_u3"><text string="TIME"><color red="0.65" green="0.65" blue="0.65" /></text></element>
 
 
-<!-- build screen -->
+<!-- lcd screen 1 -->
 
-	<view name="Internal Layout">
-		<bounds left="-2" right="48" top="2" bottom="32" />
+	<element name="lcd_bg" defstate="1">
+		<rect state="1"><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect state="0"><color red="0.40" green="0.42" blue="0.43" /></rect>
+	</element>
 
-		<bezel element="brown"><bounds x="-2" y="12" width="52" height="6" /></bezel>
+	<element name="nothing" defstate="0"><text string=" "/></element>
 
+	<group name="lcd1">
+		<bounds x="-1" y="3" width="18" height="8" />
 		<screen index="0" blend="alpha"><bounds x="0" y="4" width="15.8" height="6" /></screen>
 		<element ref="nothing" blend="add" inputtag="IN.4" inputmask="0x00" inputraw="1"><bounds x="-1" y="3" width="18" height="8" /></element>
 		<element ref="lcd_bg" blend="multiply" inputtag="IN.4" inputmask="0x02" inputraw="1"><bounds x="-1" y="3" width="18" height="8" /></element>
+	</group>
+
+
+<!-- lcd screen 2 -->
+
+	<element name="whitew"><rect><color red="1" green="1" blue="1" /></rect></element>
+	<element name="lcd2m"><rect><color red="0.69" green="0.69" blue="0.69" /></rect></element>
+
+	<element name="lcd_cb">
+		<rect><bounds x="-2.5" y="-2.5" width="45" height="45" /><color red="0.05" green="0.55" blue="0.4" /></rect>
+
+		<rect><bounds x="0"  y="0" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="10" y="0" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="20" y="0" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="30" y="0" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="5"  y="5" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="15" y="5" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="25" y="5" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="35" y="5" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+
+		<rect><bounds x="0"  y="10" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="10" y="10" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="20" y="10" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="30" y="10" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="5"  y="15" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="15" y="15" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="25" y="15" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="35" y="15" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+
+		<rect><bounds x="0"  y="20" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="10" y="20" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="20" y="20" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="30" y="20" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="5"  y="25" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="15" y="25" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="25" y="25" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="35" y="25" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+
+		<rect><bounds x="0"  y="30" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="10" y="30" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="20" y="30" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="30" y="30" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="5"  y="35" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="15" y="35" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="25" y="35" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+		<rect><bounds x="35" y="35" width="5" height="5" /><color red="0.58" green="0.61" blue="0.62" /></rect>
+	</element>
+
+	<group name="lcd2">
+		<bounds x="1.5" y="2.9" width="122.6" height="122.1" />
+		<element ref="whitew"><bounds x="6.2" y="7.6" width="113.3" height="112.8" /></element>
+		<screen index="1" blend="alpha"><bounds x="9.8" y="10" width="106" height="108" /></screen>
+		<element ref="lcd_cb" blend="multiply"><bounds x="1.5" y="2.9" width="122.6" height="122.1" /></element>
+
+		<element ref="nothing" blend="add" inputtag="IN.4" inputmask="0x00" inputraw="1"><bounds x="6.2" y="7.6" width="113.3" height="112.8" /></element>
+		<element ref="lcd2m" blend="multiply" inputtag="IN.4" inputmask="0x04" inputraw="1"><bounds x="6.2" y="7.6" width="113.3" height="112.8" /></element>
+	</group>
+
+
+<!-- master unit -->
+
+	<group name="main">
+		<bounds left="-2" right="48" top="2" bottom="32" />
+		<group ref="lcd1"><bounds x="-1" y="3" width="18" height="8" /></group>
+
+		<bezel element="brown"><bounds x="-2" y="12" width="52" height="6" /></bezel>
 
 		<bezel element="switch" inputtag="IN.4" inputmask="0x02" inputraw="1"><bounds x="30.0" y="5.5" width="1.2" height="2.4" /></bezel>
 		<bezel element="switch" inputtag="IN.4" inputmask="0x01" inputraw="1"><bounds x="34.4" y="5.5" width="1.2" height="2.4" /></bezel>
@@ -246,6 +350,53 @@
 		<bezel element="text_b9a"><bounds x="41" y="30.2" width="6" height="0.9" /></bezel>
 		<bezel element="text_b0b"><bounds x="-2.3" y="29.2" width="2" height="0.9" /></bezel>
 		<bezel element="text_b9b"><bounds x="46.3" y="29.2" width="2" height="0.9" /></bezel>
+	</group>
+
+
+<!-- build screen -->
+
+	<view name="Internal Layout (Full)">
+		<bounds left="26" right="100" top="0" bottom="30" />
+		<group ref="main"><bounds x="50" y="0" width="50" height="30" /></group>
+		<group ref="lcd2"><bounds x="29.3" y="0.35" width="17.37" height="17.3" /></group>
+
+		<bezel element="brown"><bounds x="26" y="0" width="2" height="30" /></bezel>
+		<bezel element="brown"><bounds x="48" y="0" width="2" height="30" /></bezel>
+		<bezel element="brown"><bounds x="49" y="10" width="2" height="6" /></bezel>
+
+		<repeat count="8">
+			<param name="y" start="1.75" increment="1.93" />
+			<param name="i" start="0" increment="1" />
+			<element ref="text_v~i~"><bounds x="28.6" y="~y~" width="1.5" height="0.9" /></element>
+		</repeat>
+		<repeat count="8">
+			<param name="x" start="30.45" increment="1.93" />
+			<param name="i" start="0" increment="1" />
+			<element ref="text_a~i~"><bounds x="~x~" y="17.2" width="1.5" height="0.9" /></element>
+		</repeat>
+
+		<bezel element="switch2" inputtag="IN.6" inputmask="0x01" inputraw="1"><bounds x="36" y="24" width="4" height="5" /></bezel>
+		<bezel element="switch2" inputtag="IN.4" inputmask="0x04" inputraw="1"><bounds x="42" y="24" width="4" height="5" /></bezel>
+
+		<bezel element="text_cu1"><bounds x="35" y="21.9" width="6" height="0.9" /></bezel>
+		<bezel element="text_cu2"><bounds x="35" y="22.9" width="6" height="0.9" /></bezel>
+		<bezel element="text_cu3"><bounds x="41" y="21.9" width="6" height="0.9" /></bezel>
+		<bezel element="text_cu4"><bounds x="41" y="22.9" width="6" height="0.9" /></bezel>
+	</view>
+
+	<view name="Internal Layout (Master Unit)">
+		<bounds x="0" y="0" width="50" height="30" />
+		<group ref="main"><bounds x="0" y="0" width="50" height="30" /></group>
+	</view>
 
+	<view name="Internal Layout (Screen 1)">
+		<bounds x="0" y="4" width="15.8" height="6" />
+		<group ref="lcd1"><bounds x="-1" y="3" width="18" height="8" /></group>
 	</view>
+
+	<view name="Internal Layout (Screen 2)">
+		<bounds x="6.2" y="7.6" width="113.3" height="112.8" />
+		<group ref="lcd2"><bounds x="1.5" y="2.9" width="122.6" height="122.1" /></group>
+	</view>
+
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/sdk86.lay mame-0.224+dfsg.1/src/mame/layout/sdk86.lay
--- mame-0.222+dfsg.1/src/mame/layout/sdk86.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/sdk86.lay	2020-08-26 08:57:19.000000000 +0000
@@ -22,9 +22,12 @@
 	<view name="Default Layout">
 
 		<!-- Background -->
-		<backdrop element="background">
+		<screen index="0">
+			<bounds left="0" top="0" right="362" bottom="69" />
+		</screen>
+		<bezel element="background">
 			<bounds left="0" top="0" right="362" bottom="69" />
-		</backdrop>
+		</bezel>
 
 		<!-- LEDs -->
 		<bezel name="digit7" element="digit">
@@ -54,10 +57,4 @@
 
 	</view>
 
-	<view name="Terminal">
-		<screen index="0">
-			<bounds left="0" top="0" right="4" bottom="3" />
-		</screen>
-	</view>
-
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/speedfrk.lay mame-0.224+dfsg.1/src/mame/layout/speedfrk.lay
--- mame-0.222+dfsg.1/src/mame/layout/speedfrk.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/speedfrk.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,129 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+	<element name="shifter" defstate="0">
+		<rect>
+			<bounds left="0" right="64" top="0" bottom="64" />
+			<color red="0.85" green="0.4" blue="0.3" />
+		</rect>
+		<rect>
+			<bounds left="2" right="62" top="2" bottom="62" />
+			<color red="0.14" green="0.17" blue="0.2" />
+		</rect>
+		<rect>
+			<bounds left="14" right="18" top="15" bottom="49" />
+			<color red="0.44" green="0.47" blue="0.5" />
+		</rect>
+		<rect>
+			<bounds left="46" right="50" top="15" bottom="49" />
+			<color red="0.44" green="0.47" blue="0.5" />
+		</rect>
+		<rect>
+			<bounds left="14" right="50" top="30" bottom="34" />
+			<color red="0.44" green="0.47" blue="0.5" />
+		</rect>
+		<disk>
+			<bounds left="14" right="18" top="13" bottom="17" />
+			<color red="0.44" green="0.47" blue="0.5" />
+		</disk>
+		<disk>
+			<bounds left="46" right="50" top="13" bottom="17" />
+			<color red="0.44" green="0.47" blue="0.5" />
+		</disk>
+		<disk>
+			<bounds left="14" right="18" top="47" bottom="51" />
+			<color red="0.44" green="0.47" blue="0.5" />
+		</disk>
+		<disk>
+			<bounds left="46" right="50" top="47" bottom="51" />
+			<color red="0.44" green="0.47" blue="0.5" />
+		</disk>
+		<text string="1">
+			<bounds left="3" right="29" top="2" bottom="12" />
+			<color red="1.0" green="1.0" blue="1.0" />
+		</text>
+		<text string="2">
+			<bounds left="3" right="29" top="52" bottom="62" />
+			<color red="1.0" green="1.0" blue="1.0" />
+		</text>
+		<text string="3">
+			<bounds left="34" right="61" top="2" bottom="12" />
+			<color red="1.0" green="1.0" blue="1.0" />
+		</text>
+		<text string="4">
+			<bounds left="34" right="61" top="52" bottom="62" />
+			<color red="1.0" green="1.0" blue="1.0" />
+		</text>
+		<text string="1" state="0">
+			<bounds left="3" right="29" top="2" bottom="12" />
+			<color red="1.0" green="1.0" blue="0.4" />
+		</text>
+		<text string="2" state="1">
+			<bounds left="3" right="29" top="52" bottom="62" />
+			<color red="1.0" green="1.0" blue="0.4" />
+		</text>
+		<text string="3" state="2">
+			<bounds left="34" right="61" top="2" bottom="12" />
+			<color red="1.0" green="1.0" blue="0.4" />
+		</text>
+		<text string="4" state="3">
+			<bounds left="34" right="61" top="52" bottom="62" />
+			<color red="1.0" green="1.0" blue="0.4" />
+		</text>
+		<disk state="0">
+			<bounds left="9" right="23" top="14" bottom="28" />
+			<color red="0.85" green="0.4" blue="0.3" />
+		</disk>
+		<disk state="1">
+			<bounds left="9" right="23" top="36" bottom="50" />
+			<color red="0.85" green="0.4" blue="0.3" />
+		</disk>
+		<disk state="2">
+			<bounds left="41" right="55" top="14" bottom="28" />
+			<color red="0.85" green="0.4" blue="0.3" />
+		</disk>
+		<disk state="3">
+			<bounds left="41" right="55" top="36" bottom="50" />
+			<color red="0.85" green="0.4" blue="0.3" />
+		</disk>
+	</element>
+
+	<view name="Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<element ref="shifter" inputtag="GEAR" inputmask="0x0f" inputraw="1">
+			<bounds x="574" y="414" width="64" height="64" />
+			<color alpha="0.6" />
+		</element>
+	</view>
+	<view name="Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<element ref="shifter" inputtag="GEAR" inputmask="0x0f" inputraw="1">
+			<bounds x="2" y="414" width="64" height="64" />
+			<color alpha="0.6" />
+		</element>
+	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<element ref="shifter" inputtag="GEAR" inputmask="0x0f" inputraw="1">
+			<bounds x="648" y="414" width="64" height="64" />
+			<color alpha="0.65" />
+		</element>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<element ref="shifter" inputtag="GEAR" inputmask="0x0f" inputraw="1">
+			<bounds x="-72" y="414" width="64" height="64" />
+			<color alpha="0.65" />
+		</element>
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/speedrs.lay mame-0.224+dfsg.1/src/mame/layout/speedrs.lay
--- mame-0.222+dfsg.1/src/mame/layout/speedrs.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/speedrs.lay	2020-08-26 08:57:19.000000000 +0000
@@ -79,4 +79,19 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<bounds left="0" right="640" top="0" bottom="480" />
+		<screen index="0">
+			<bounds x="0" y="0" width="738.46" height="480" />
+		</screen>
+		<bezel element="black">
+			<bounds x="640" y="0" width="100" height="480" />
+		</bezel>
+		<bezel element="shifter" inputtag="IN.2" inputmask="0x02">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<!-- No need for a Widescreen Shifter-L as Shifter-L performs exactly
+	what a widescreen Shifter-L layout would do. -->
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/spyhunt.lay mame-0.224+dfsg.1/src/mame/layout/spyhunt.lay
--- mame-0.222+dfsg.1/src/mame/layout/spyhunt.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/spyhunt.lay	2020-08-26 08:57:19.000000000 +0000
@@ -153,6 +153,168 @@
 		</bezel>
 	</view>
 
+	<view name="Lamps + Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+
+		<bezel name="lamp1" element="lamp_miss">
+			<bounds x="5" y="641" width="60" height="25" />
+		</bezel>
+		<bezel name="lamp0" element="lamp_oil">
+			<bounds x="72" y="641" width="59" height="25" />
+		</bezel>
+		<bezel name="lamp2" element="lamp_van">
+			<bounds x="172" y="641" width="85" height="25" />
+		</bezel>
+		<bezel name="lamp3" element="lamp_smoke">
+			<bounds x="295" y="641" width="93" height="25" />
+		</bezel>
+		<bezel name="lamp4" element="lamp_gun">
+			<bounds x="390" y="641" width="90" height="25" />
+		</bezel>
+
+		<bezel element="shifter" inputtag="ssio:IP0" inputmask="0x10">
+			<bounds x="496" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
+	<view name="Lamps + Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+
+		<bezel name="lamp1" element="lamp_miss">
+			<bounds x="5" y="641" width="60" height="25" />
+		</bezel>
+		<bezel name="lamp0" element="lamp_oil">
+			<bounds x="72" y="641" width="59" height="25" />
+		</bezel>
+		<bezel name="lamp2" element="lamp_van">
+			<bounds x="172" y="641" width="85" height="25" />
+		</bezel>
+		<bezel name="lamp3" element="lamp_smoke">
+			<bounds x="295" y="641" width="93" height="25" />
+		</bezel>
+		<bezel name="lamp4" element="lamp_gun">
+			<bounds x="390" y="641" width="90" height="25" />
+		</bezel>
+
+		<bezel element="shifter" inputtag="ssio:IP0" inputmask="0x10">
+			<bounds x="-48" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
+	<view name="Widescreen Lamps and Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+
+		<bezel name="lamp1" element="lamp_miss">
+			<bounds x="494" y="430" width="60" height="25" />
+		</bezel>
+		<bezel name="lamp0" element="lamp_oil">
+			<bounds x="493" y="455" width="59" height="25" />
+		</bezel>
+		<bezel name="lamp2" element="lamp_van">
+			<bounds x="494" y="480" width="85" height="25" />
+		</bezel>
+		<bezel name="lamp3" element="lamp_smoke">
+			<bounds x="492" y="505" width="93" height="25" />
+		</bezel>
+		<bezel name="lamp4" element="lamp_gun">
+			<bounds x="494" y="530" width="90" height="25" />
+		</bezel>
+
+		<bezel element="shifter" inputtag="ssio:IP0" inputmask="0x10">
+			<bounds x="496" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
+	<view name="Widescreen Lamps and Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+
+		<bezel name="lamp1" element="lamp_miss">
+			<bounds x="-70" y="430" width="60" height="25" />
+		</bezel>
+		<bezel name="lamp0" element="lamp_oil">
+			<bounds x="-69" y="455" width="59" height="25" />
+		</bezel>
+		<bezel name="lamp2" element="lamp_van">
+			<bounds x="-95" y="480" width="85" height="25" />
+		</bezel>
+		<bezel name="lamp3" element="lamp_smoke">
+			<bounds x="-102" y="505" width="93" height="25" />
+		</bezel>
+		<bezel name="lamp4" element="lamp_gun">
+			<bounds x="-100" y="530" width="90" height="25" />
+		</bezel>
+
+		<bezel element="shifter" inputtag="ssio:IP0" inputmask="0x10">
+			<bounds x="-48" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
+	<view name="Vertical Widescreen Lamps + Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+
+		<bezel name="lamp1" element="lamp_miss">
+			<bounds x="5" y="641" width="60" height="25" />
+		</bezel>
+		<bezel name="lamp0" element="lamp_oil">
+			<bounds x="72" y="641" width="59" height="25" />
+		</bezel>
+		<bezel name="lamp2" element="lamp_van">
+			<bounds x="172" y="641" width="85" height="25" />
+		</bezel>
+		<bezel name="lamp3" element="lamp_smoke">
+			<bounds x="295" y="641" width="93" height="25" />
+		</bezel>
+		<bezel name="lamp4" element="lamp_gun">
+			<bounds x="390" y="641" width="90" height="25" />
+		</bezel>
+
+		<bezel element="shifter" inputtag="ssio:IP0" inputmask="0x10">
+			<bounds x="446" y="667" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
+	<view name="Vertical Widescreen Lamps + Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+
+		<bezel name="lamp1" element="lamp_miss">
+			<bounds x="5" y="641" width="60" height="25" />
+		</bezel>
+		<bezel name="lamp0" element="lamp_oil">
+			<bounds x="72" y="641" width="59" height="25" />
+		</bezel>
+		<bezel name="lamp2" element="lamp_van">
+			<bounds x="172" y="641" width="85" height="25" />
+		</bezel>
+		<bezel name="lamp3" element="lamp_smoke">
+			<bounds x="295" y="641" width="93" height="25" />
+		</bezel>
+		<bezel name="lamp4" element="lamp_gun">
+			<bounds x="390" y="641" width="90" height="25" />
+		</bezel>
+
+		<bezel element="shifter" inputtag="ssio:IP0" inputmask="0x10">
+			<bounds x="2" y="667" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
 	<view name="Lamps">
 		<screen index="0">
 			<bounds x="0" y="0" width="480" height="640" />
diff -Nru mame-0.222+dfsg.1/src/mame/layout/spyhunttec.lay mame-0.224+dfsg.1/src/mame/layout/spyhunttec.lay
--- mame-0.222+dfsg.1/src/mame/layout/spyhunttec.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/spyhunttec.lay	2020-08-26 08:57:19.000000000 +0000
@@ -153,6 +153,168 @@
 		</bezel>
 	</view>
 
+	<view name="Lamps + Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+
+		<bezel name="lamp1" element="lamp_miss">
+			<bounds x="5" y="641" width="60" height="25" />
+		</bezel>
+		<bezel name="lamp0" element="lamp_oil">
+			<bounds x="72" y="641" width="59" height="25" />
+		</bezel>
+		<bezel name="lamp2" element="lamp_van">
+			<bounds x="172" y="641" width="85" height="25" />
+		</bezel>
+		<bezel name="lamp3" element="lamp_smoke">
+			<bounds x="295" y="641" width="93" height="25" />
+		</bezel>
+		<bezel name="lamp4" element="lamp_gun">
+			<bounds x="390" y="641" width="90" height="25" />
+		</bezel>
+
+		<bezel element="shifter" inputtag="IN2" inputmask="0x10">
+			<bounds x="496" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
+	<view name="Lamps + Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+
+		<bezel name="lamp1" element="lamp_miss">
+			<bounds x="5" y="641" width="60" height="25" />
+		</bezel>
+		<bezel name="lamp0" element="lamp_oil">
+			<bounds x="72" y="641" width="59" height="25" />
+		</bezel>
+		<bezel name="lamp2" element="lamp_van">
+			<bounds x="172" y="641" width="85" height="25" />
+		</bezel>
+		<bezel name="lamp3" element="lamp_smoke">
+			<bounds x="295" y="641" width="93" height="25" />
+		</bezel>
+		<bezel name="lamp4" element="lamp_gun">
+			<bounds x="390" y="641" width="90" height="25" />
+		</bezel>
+
+		<bezel element="shifter" inputtag="IN2" inputmask="0x10">
+			<bounds x="-48" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
+	<view name="Widescreen Lamps and Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+
+		<bezel name="lamp1" element="lamp_miss">
+			<bounds x="494" y="430" width="60" height="25" />
+		</bezel>
+		<bezel name="lamp0" element="lamp_oil">
+			<bounds x="493" y="455" width="59" height="25" />
+		</bezel>
+		<bezel name="lamp2" element="lamp_van">
+			<bounds x="494" y="480" width="85" height="25" />
+		</bezel>
+		<bezel name="lamp3" element="lamp_smoke">
+			<bounds x="492" y="505" width="93" height="25" />
+		</bezel>
+		<bezel name="lamp4" element="lamp_gun">
+			<bounds x="494" y="530" width="90" height="25" />
+		</bezel>
+
+		<bezel element="shifter" inputtag="IN2" inputmask="0x10">
+			<bounds x="496" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
+	<view name="Widescreen Lamps and Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+
+		<bezel name="lamp1" element="lamp_miss">
+			<bounds x="-70" y="430" width="60" height="25" />
+		</bezel>
+		<bezel name="lamp0" element="lamp_oil">
+			<bounds x="-69" y="455" width="59" height="25" />
+		</bezel>
+		<bezel name="lamp2" element="lamp_van">
+			<bounds x="-95" y="480" width="85" height="25" />
+		</bezel>
+		<bezel name="lamp3" element="lamp_smoke">
+			<bounds x="-102" y="505" width="93" height="25" />
+		</bezel>
+		<bezel name="lamp4" element="lamp_gun">
+			<bounds x="-100" y="530" width="90" height="25" />
+		</bezel>
+
+		<bezel element="shifter" inputtag="IN2" inputmask="0x10">
+			<bounds x="-48" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
+	<view name="Vertical Widescreen Lamps + Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+
+		<bezel name="lamp1" element="lamp_miss">
+			<bounds x="5" y="641" width="60" height="25" />
+		</bezel>
+		<bezel name="lamp0" element="lamp_oil">
+			<bounds x="72" y="641" width="59" height="25" />
+		</bezel>
+		<bezel name="lamp2" element="lamp_van">
+			<bounds x="172" y="641" width="85" height="25" />
+		</bezel>
+		<bezel name="lamp3" element="lamp_smoke">
+			<bounds x="295" y="641" width="93" height="25" />
+		</bezel>
+		<bezel name="lamp4" element="lamp_gun">
+			<bounds x="390" y="641" width="90" height="25" />
+		</bezel>
+
+		<bezel element="shifter" inputtag="IN2" inputmask="0x10">
+			<bounds x="446" y="667" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
+	<view name="Vertical Widescreen Lamps + Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+
+		<bezel name="lamp1" element="lamp_miss">
+			<bounds x="5" y="641" width="60" height="25" />
+		</bezel>
+		<bezel name="lamp0" element="lamp_oil">
+			<bounds x="72" y="641" width="59" height="25" />
+		</bezel>
+		<bezel name="lamp2" element="lamp_van">
+			<bounds x="172" y="641" width="85" height="25" />
+		</bezel>
+		<bezel name="lamp3" element="lamp_smoke">
+			<bounds x="295" y="641" width="93" height="25" />
+		</bezel>
+		<bezel name="lamp4" element="lamp_gun">
+			<bounds x="390" y="641" width="90" height="25" />
+		</bezel>
+
+		<bezel element="shifter" inputtag="IN2" inputmask="0x10">
+			<bounds x="2" y="667" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+
 	<view name="Lamps">
 		<screen index="0">
 			<bounds x="0" y="0" width="480" height="640" />
diff -Nru mame-0.222+dfsg.1/src/mame/layout/stocker.lay mame-0.224+dfsg.1/src/mame/layout/stocker.lay
--- mame-0.222+dfsg.1/src/mame/layout/stocker.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/stocker.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN1" inputmask="0x02">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN1" inputmask="0x02">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/topracer.lay mame-0.224+dfsg.1/src/mame/layout/topracer.lay
--- mame-0.222+dfsg.1/src/mame/layout/topracer.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/topracer.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="648" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x20">
+			<bounds x="606" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x20">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/topspeed.lay mame-0.224+dfsg.1/src/mame/layout/topspeed.lay
--- mame-0.222+dfsg.1/src/mame/layout/topspeed.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/topspeed.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN1" inputmask="0x10">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN1" inputmask="0x10">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/turbotag.lay mame-0.224+dfsg.1/src/mame/layout/turbotag.lay
--- mame-0.222+dfsg.1/src/mame/layout/turbotag.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/turbotag.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,40 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="ssio:IP0" inputmask="0x10">
+			<bounds x="488" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="ssio:IP0" inputmask="0x10">
+			<bounds x="-40" y="574" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Vertical Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="ssio:IP0" inputmask="0x10">
+			<bounds x="446" y="648" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Vertical Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="480" height="640" />
+		</screen>
+		<bezel element="shifter" inputtag="ssio:IP0" inputmask="0x10">
+			<bounds x="2" y="648" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/v4addlad.lay mame-0.224+dfsg.1/src/mame/layout/v4addlad.lay
--- mame-0.222+dfsg.1/src/mame/layout/v4addlad.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/v4addlad.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,552 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+	<element name="£" defstate="0">
+		<text string="JACKPOT £" state="0">
+			<color red="0.5" green="0.5" blue="0.5" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="SKILLSTOP" defstate="0">
+		<text string="SKILL STOP" state="0">
+			<color red="0.1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="BOOST" defstate="0">
+		<text string="BOOST" state="0">
+			<color red="0.1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+
+	<element name="EXTRA" defstate="0">
+		<text string="EXTRA" state="0">
+			<color red="0.1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="10P" defstate="0">
+		<text string="10p" state="0">
+			<color red="0.1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="20P" defstate="0">
+		<text string="20p" state="0">
+			<color red="0.1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="50P" defstate="0">
+		<text string="50p" state="0">
+			<color red="0.1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="£1" defstate="0">
+		<text string="£1" state="0">
+			<color red="0.1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="SNAKE" defstate="0">
+		<text string="S" state="0">
+			<color red="0.1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="LADDER" defstate="0">
+		<text string="L" state="0">
+			<color red="0.1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="A" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.5" green="0.0" blue="0.0" />
+		</rect>
+		<text string="A" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="1.0" green="0.0" blue="0.0" />
+		</rect>
+		<text string="A" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+	<element name="B" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.5" blue="0.0" />
+		</rect>
+		<text string="B" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="1.0" blue="0.0" />
+		</rect>
+		<text string="B" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+	<element name="C" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="0.5" />
+		</rect>
+		<text string="C" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="1.0" />
+		</rect>
+		<text string="C" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+	<element name="CONTINUE" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.5" green="0.5" blue="0.0" />
+		</rect>
+		<text string="CONTINUE" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="1.0" green="1.0" blue="0.0" />
+		</rect>
+		<text string="CONTINUE" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+	<element name="PASS" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="0.2" />
+		</rect>
+		<text string="PASS" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.3" blue="1.0" />
+		</rect>
+		<text string="PASS" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+
+	</element>
+
+	<element name="COLLECT" defstate="0">
+		<text string="COLLECT" state="0">
+			<color red="0.1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="8" />
+		</text>
+	</element>
+	<element name="START" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.2" green="0.3" blue="0.0" />
+		</rect>
+		<text string="START" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.2" green="1.0" blue="0.0" />
+		</rect>
+		<text string="START" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+
+
+
+	<element name="digit" defstate="0">
+	<led7seg>
+		<color red="1.0" green="0.0" blue="0.0" />
+	</led7seg>
+	</element>
+	<element name="matrixlamp">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="20" />
+			<color red="0.3" green="0.3" blue="0.3" />
+		</rect>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="20" />
+			<color red="1.0" green="1.0" blue="1.0" />
+		</rect>
+	</element>
+
+
+	<view name="Monitor and Lamps">
+		<bezel name="£" element="£">
+			<bounds x="0" y="0" width="20" height="10" />
+		</bezel>
+		<bezel name="digit0" element="digit">
+			<bounds x="10" y="10" width="5" height="10" />
+		</bezel>
+		<bezel name="digit1" element="digit">
+			<bounds x="15" y="10" width="5" height="10" />
+		</bezel>
+		<bezel name="digit2" element="digit">
+			<bounds x="20" y="10" width="5" height="10" />
+		</bezel>
+
+		<bezel name="lamp64" element="matrixlamp" state="0">
+			<bounds x="25" y="0" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp65" element="matrixlamp" state="0">
+			<bounds x="45" y="0" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp66" element="matrixlamp" state="0">
+			<bounds x="65" y="0" width="20" height="20"/>
+		</bezel>
+		<bezel name="SNAKE" element="SNAKE">
+			<bounds x="67" y="2" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp67" element="matrixlamp" state="0">
+			<bounds x="85" y="0" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp68" element="matrixlamp" state="0">
+			<bounds x="105" y="0" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp69" element="matrixlamp" state="0">
+			<bounds x="125" y="0" width="20" height="20"/>
+		</bezel>
+		<bezel name="SNAKE" element="SNAKE">
+			<bounds x="127" y="2" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp70" element="matrixlamp" state="0">
+			<bounds x="145" y="0" width="20" height="20"/>
+		</bezel>
+		<bezel name="LADDER" element="LADDER">
+			<bounds x="147" y="2" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp71" element="matrixlamp" state="0">
+			<bounds x="165" y="0" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp72" element="matrixlamp" state="0">
+			<bounds x="25" y="20" width="20" height="20"/>
+		</bezel>
+		<bezel name="LADDER" element="LADDER">
+			<bounds x="27" y="22" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp73" element="matrixlamp" state="0">
+			<bounds x="45" y="20" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp74" element="matrixlamp" state="0">
+			<bounds x="65" y="20" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp75" element="matrixlamp" state="0">
+			<bounds x="85" y="20" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp76" element="matrixlamp" state="0">
+			<bounds x="105" y="20" width="20" height="20"/>
+		</bezel>
+		<bezel name="£1" element="£1">
+			<bounds x="107" y="22" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp77" element="matrixlamp" state="0">
+			<bounds x="125" y="20" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp78" element="matrixlamp" state="0">
+			<bounds x="145" y="20" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp79" element="matrixlamp" state="0">
+			<bounds x="165" y="20" width="20" height="20"/>
+		</bezel>
+
+
+		<bezel name="lamp80" element="matrixlamp" state="0">
+			<bounds x="25" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="£1" element="£1">
+			<bounds x="27" y="42" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp81" element="matrixlamp" state="0">
+			<bounds x="45" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp82" element="matrixlamp" state="0">
+			<bounds x="65" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp83" element="matrixlamp" state="0">
+			<bounds x="85" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp84" element="matrixlamp" state="0">
+			<bounds x="105" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="LADDER" element="LADDER">
+			<bounds x="107" y="42" width="16" height="16" />
+		</bezel>
+
+		<bezel name="lamp85" element="matrixlamp" state="0">
+			<bounds x="125" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="EXTRA" element="EXTRA">
+			<bounds x="127" y="42" width="16" height="16" />
+		</bezel>
+
+		<bezel name="lamp86" element="matrixlamp" state="0">
+			<bounds x="145" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp87" element="matrixlamp" state="0">
+			<bounds x="165" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="LADDER" element="LADDER">
+			<bounds x="167" y="42" width="16" height="16" />
+		</bezel>
+
+
+		<bezel name="lamp88" element="matrixlamp" state="0">
+			<bounds x="25" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp89" element="matrixlamp" state="0">
+			<bounds x="45" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="LADDER" element="LADDER">
+			<bounds x="47" y="62" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp90" element="matrixlamp" state="0">
+			<bounds x="65" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp91" element="matrixlamp" state="0">
+			<bounds x="85" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="50P" element="50P">
+			<bounds x="87" y="62" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp92" element="matrixlamp" state="0">
+			<bounds x="105" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp93" element="matrixlamp" state="0">
+			<bounds x="125" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="SNAKE" element="SNAKE">
+			<bounds x="127" y="62" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp94" element="matrixlamp" state="0">
+			<bounds x="145" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="£1" element="£1">
+			<bounds x="147" y="62" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp95" element="matrixlamp" state="0">
+			<bounds x="165" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="SNAKE" element="SNAKE">
+			<bounds x="167" y="62" width="16" height="16" />
+		</bezel>
+
+		<bezel name="lamp96" element="matrixlamp" state="0">
+			<bounds x="25" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="SNAKE" element="SNAKE">
+			<bounds x="27" y="82" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp97" element="matrixlamp" state="0">
+			<bounds x="45" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp98" element="matrixlamp" state="0">
+			<bounds x="65" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="50P" element="50P">
+			<bounds x="67" y="82" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp99" element="matrixlamp" state="0">
+			<bounds x="85" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp100" element="matrixlamp" state="0">
+			<bounds x="105" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp101" element="matrixlamp" state="0">
+			<bounds x="125" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp102" element="matrixlamp" state="0">
+			<bounds x="145" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp103" element="matrixlamp" state="0">
+			<bounds x="165" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="50P" element="50P">
+			<bounds x="167" y="82" width="16" height="16" />
+		</bezel>
+
+
+		<bezel name="lamp104" element="matrixlamp" state="0">
+			<bounds x="25" y="100" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp105" element="matrixlamp" state="0">
+			<bounds x="45" y="100" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp106" element="matrixlamp" state="0">
+			<bounds x="65" y="100" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp107" element="matrixlamp" state="0">
+			<bounds x="85" y="100" width="20" height="20"/>
+		</bezel>
+		<bezel name="LADDER" element="LADDER">
+			<bounds x="87" y="102" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp108" element="matrixlamp" state="0">
+			<bounds x="105" y="100" width="20" height="20"/>
+		</bezel>
+		<bezel name="LADDER" element="LADDER">
+			<bounds x="107" y="102" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp109" element="matrixlamp" state="0">
+			<bounds x="125" y="100" width="20" height="20"/>
+		</bezel>
+		<bezel name="20P" element="20P">
+			<bounds x="127" y="102" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp110" element="matrixlamp" state="0">
+			<bounds x="145" y="100" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp111" element="matrixlamp" state="0">
+			<bounds x="165" y="100" width="20" height="20"/>
+		</bezel>
+
+
+		<bezel name="lamp112" element="matrixlamp" state="0">
+			<bounds x="25" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="20P" element="20P">
+			<bounds x="27" y="122" width="8" height="8" />
+		</bezel>
+		<bezel name="SNAKE" element="SNAKE">
+			<bounds x="27" y="132" width="8" height="8" />
+		</bezel>
+		<bezel name="lamp113" element="matrixlamp" state="0">
+			<bounds x="45" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="SNAKE" element="SNAKE">
+			<bounds x="47" y="122" width="8" height="8" />
+		</bezel>
+		<bezel name="lamp114" element="matrixlamp" state="0">
+			<bounds x="65" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp115" element="matrixlamp" state="0">
+			<bounds x="85" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="10P" element="10P">
+			<bounds x="87" y="122" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp116" element="matrixlamp" state="0">
+			<bounds x="105" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp117" element="matrixlamp" state="0">
+			<bounds x="125" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp118" element="matrixlamp" state="0">
+			<bounds x="145" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="EXTRA" element="EXTRA">
+			<bounds x="147" y="122" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp119" element="matrixlamp" state="0">
+			<bounds x="165" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="SNAKE" element="SNAKE">
+			<bounds x="167" y="122" width="16" height="16" />
+		</bezel>
+
+		<bezel name="lamp120" element="matrixlamp" state="0">
+			<bounds x="25" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp121" element="matrixlamp" state="0">
+			<bounds x="45" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp122" element="matrixlamp" state="0">
+			<bounds x="65" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="BOOST" element="BOOST">
+			<bounds x="67" y="142" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp123" element="matrixlamp" state="0">
+			<bounds x="85" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp124" element="matrixlamp" state="0">
+			<bounds x="105" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp125" element="matrixlamp" state="0">
+			<bounds x="125" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="LADDER" element="LADDER">
+			<bounds x="127" y="142" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp126" element="matrixlamp" state="0">
+			<bounds x="145" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp127" element="matrixlamp" state="0">
+			<bounds x="165" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp55" element="matrixlamp" state="0">
+			<bounds x="200" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="SKILLSTOP" element="SKILLSTOP">
+			<bounds x="202" y="142" width="16" height="16" />
+		</bezel>
+
+
+		<bezel name="COLLECTLAMP" element="CONTINUE">
+			<bounds x="0" y="200" width="16" height="16" />
+		</bezel>
+		<bezel name="COLLECT" element="COLLECT" inputtag="BLACK1" inputmask="0x10">
+			<bounds x="0" y="220" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp34" element="PASS" inputtag="BLACK1" inputmask="0x08">
+			<bounds x="0" y="240" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp40" element="A" inputtag="BLACK1" inputmask="0x04">
+			<bounds x="0" y="260" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp42" element="B" inputtag="BLACK1" inputmask="0x02">
+			<bounds x="0" y="280" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp49" element="C" inputtag="BLACK1" inputmask="0x01">
+			<bounds x="0" y="300" width="16" height="16" />
+		</bezel>
+
+		<bezel name="lamp26" element="START" inputtag="BLACK2" inputmask="0x10">
+			<bounds x="564" y="200" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp33" element="CONTINUE" inputtag="BLACK2" inputmask="0x08">
+			<bounds x="564" y="220" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp41" element="A" inputtag="BLACK2" inputmask="0x04">
+			<bounds x="564" y="240" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp48" element="B" inputtag="BLACK2" inputmask="0x02">
+			<bounds x="564" y="260" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp50" element="C" inputtag="BLACK2" inputmask="0x01">
+			<bounds x="564" y="280" width="16" height="16" />
+		</bezel>
+		<screen index="0">
+			<bounds x="50" y="200" width="504" height="296" />
+		</screen>
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/v4barqst.lay mame-0.224+dfsg.1/src/mame/layout/v4barqst.lay
--- mame-0.222+dfsg.1/src/mame/layout/v4barqst.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/v4barqst.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,603 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+	<element name="£10" defstate="0">
+		<text string="£10" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="£10" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="£5" defstate="0">
+		<text string="£5" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="£5" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="£3" defstate="0">
+		<text string="£3" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="£3" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="£2" defstate="0">
+		<text string="£2" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="£2" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="£1" defstate="0">
+		<text string="£1" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="£1" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="50p" defstate="0">
+		<text string="50p" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="50p" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="20p" defstate="0">
+		<text string="20p" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="20p" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="10p" defstate="0">
+		<text string="10p" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="10p" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="LIT" defstate="0">
+		<text string="LIT" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="LIT" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="8" defstate="0">
+		<text string="8" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="8" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="7" defstate="0">
+		<text string="7" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="7" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="6" defstate="0">
+		<text string="6" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="6" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="5" defstate="0">
+		<text string="5" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="5" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="4" defstate="0">
+		<text string="4" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="4" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="3" defstate="0">
+		<text string="3" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="3" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="2" defstate="0">
+		<text string="2" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="2" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="1" defstate="0">
+		<text string="1" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="1" state="1">
+			<color red="0.8" green="0.8" blue="0.8" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+	<element name="BAR" defstate="0">
+		<text string="BAR" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="BAR" state="1">
+			<color red="0.8" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+
+	<element name="Q" defstate="0">
+		<text string="Q" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+		<text string="Q" state="1">
+			<color red="0.2" green="0.8" blue="0.2" />
+			<bounds x="0" y="0" width="4" height="4" />
+		</text>
+	</element>
+
+	<element name="A" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.5" green="0.0" blue="0.0" />
+		</rect>
+		<text string="A" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="1.0" green="0.0" blue="0.0" />
+		</rect>
+		<text string="A" state="1">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+	<element name="B" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.5" blue="0.0" />
+		</rect>
+		<text string="B" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="1.0" blue="0.0" />
+		</rect>
+		<text string="B" state="1">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+	<element name="C" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="0.5" />
+		</rect>
+		<text string="C" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="1.0" />
+		</rect>
+		<text string="C" state="1">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+	<element name="CONTINUE" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.5" green="0.2" blue="0.0" />
+		</rect>
+		<text string="CONTINUE" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="1.0" green="0.4" blue="0.0" />
+		</rect>
+		<text string="CONTINUE" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+	<element name="PASS" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.5" green="0.2" blue="0.0" />
+		</rect>
+		<text string="PASS" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="1.0" green="0.4" blue="0.0" />
+		</rect>
+		<text string="PASS" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+
+	<element name="COLLECT" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.3" green="0.3" blue="0.0" />
+		</rect>
+		<text string="COLLECT" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="1.0" green="1.0" blue="0.0" />
+		</rect>
+		<text string="COLLECT" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+
+	<element name="START" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.3" blue="0.0" />
+		</rect>
+		<text string="START" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="1.0" blue="0.0" />
+		</rect>
+		<text string="START" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+
+
+
+
+	<view name="Monitor and Lamps">
+		<bezel name="lamp7" element="8" state="0">
+			<bounds x="150" y="0" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp7" element="BAR" state="0">
+			<bounds x="170" y="0" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp6" element="LIT" state="0">
+			<bounds x="190" y="0" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp5" element="£10" state="0">
+			<bounds x="210" y="0" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp15" element="7" state="0">
+			<bounds x="150" y="20" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp15" element="BAR" state="0">
+			<bounds x="170" y="20" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp14" element="LIT" state="0">
+			<bounds x="190" y="20" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp13" element="£5" state="0">
+			<bounds x="210" y="20" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp23" element="6" state="0">
+			<bounds x="150" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp23" element="BAR" state="0">
+			<bounds x="170" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp22" element="LIT" state="0">
+			<bounds x="190" y="40" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp21" element="£3" state="0">
+			<bounds x="210" y="40" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp31" element="5" state="0">
+			<bounds x="150" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp31" element="BAR" state="0">
+			<bounds x="170" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp30" element="LIT" state="0">
+			<bounds x="190" y="60" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp29" element="£2" state="0">
+			<bounds x="210" y="60" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp39" element="4" state="0">
+			<bounds x="150" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp39" element="BAR" state="0">
+			<bounds x="170" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp38" element="LIT" state="0">
+			<bounds x="190" y="80" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp37" element="£1" state="0">
+			<bounds x="210" y="80" width="20" height="20"/>
+		</bezel>
+
+
+		<bezel name="lamp47" element="3" state="0">
+			<bounds x="150" y="100" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp47" element="BAR" state="0">
+			<bounds x="170" y="100" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp46" element="LIT" state="0">
+			<bounds x="190" y="100" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp45" element="50p" state="0">
+			<bounds x="210" y="100" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp55" element="2" state="0">
+			<bounds x="150" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp55" element="BAR" state="0">
+			<bounds x="170" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp54" element="LIT" state="0">
+			<bounds x="190" y="120" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp53" element="20p" state="0">
+			<bounds x="210" y="120" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp63" element="1" state="0">
+			<bounds x="150" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp63" element="BAR" state="0">
+			<bounds x="170" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp62" element="LIT" state="0">
+			<bounds x="190" y="140" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp61" element="10p" state="0">
+			<bounds x="210" y="140" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp80" element="Q" state="0">
+			<bounds x="0" y="30" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp81" element="Q" state="0">
+			<bounds x="20" y="30" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp82" element="BAR" state="0">
+			<bounds x="40" y="30" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp83" element="Q" state="0">
+			<bounds x="60" y="30" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp84" element="Q" state="0">
+			<bounds x="80" y="30" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp85" element="Q" state="0">
+			<bounds x="100" y="30" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp86" element="BAR" state="0">
+			<bounds x="120" y="30" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp88" element="Q" state="0">
+			<bounds x="0" y="50" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp89" element="BAR" state="0">
+			<bounds x="20" y="50" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp90" element="Q" state="0">
+			<bounds x="40" y="50" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp91" element="Q" state="0">
+			<bounds x="60" y="50" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp92" element="BAR" state="0">
+			<bounds x="80" y="50" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp93" element="Q" state="0">
+			<bounds x="100" y="50" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp94" element="Q" state="0">
+			<bounds x="120" y="50" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp96" element="BAR" state="0">
+			<bounds x="0" y="70" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp97" element="Q" state="0">
+			<bounds x="20" y="70" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp98" element="Q" state="0">
+			<bounds x="40" y="70" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp99" element="BAR" state="0">
+			<bounds x="60" y="70" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp100" element="Q" state="0">
+			<bounds x="80" y="70" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp101" element="BAR" state="0">
+			<bounds x="100" y="70" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp102" element="Q" state="0">
+			<bounds x="120" y="70" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp104" element="BAR" state="0">
+			<bounds x="0" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp105" element="Q" state="0">
+			<bounds x="20" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp106" element="BAR" state="0">
+			<bounds x="40" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp107" element="Q" state="0">
+			<bounds x="60" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp108" element="Q" state="0">
+			<bounds x="80" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp109" element="Q" state="0">
+			<bounds x="100" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp110" element="BAR" state="0">
+			<bounds x="120" y="90" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp112" element="Q" state="0">
+			<bounds x="0" y="110" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp113" element="Q" state="0">
+			<bounds x="20" y="110" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp114" element="BAR" state="0">
+			<bounds x="40" y="110" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp115" element="Q" state="0">
+			<bounds x="60" y="110" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp116" element="BAR" state="0">
+			<bounds x="80" y="110" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp117" element="Q" state="0">
+			<bounds x="100" y="110" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp118" element="Q" state="0">
+			<bounds x="120" y="110" width="20" height="20"/>
+		</bezel>
+
+		<bezel name="lamp120" element="Q" state="0">
+			<bounds x="0" y="130" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp121" element="BAR" state="0">
+			<bounds x="20" y="130" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp122" element="Q" state="0">
+			<bounds x="40" y="130" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp123" element="Q" state="0">
+			<bounds x="60" y="130" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp124" element="BAR" state="0">
+			<bounds x="80" y="130" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp125" element="BAR" state="0">
+			<bounds x="100" y="130" width="20" height="20"/>
+		</bezel>
+		<bezel name="lamp126" element="Q" state="0">
+			<bounds x="120" y="130" width="20" height="20"/>
+		</bezel>
+
+
+		<bezel name="lamp25" element="COLLECT" inputtag="BLACK2" inputmask="0x40">
+			<bounds x="0" y="200" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp32" element="PASS" inputtag="BLACK1" inputmask="0x10">
+			<bounds x="0" y="220" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp33" element="A" inputtag="BLACK1" inputmask="0x08">
+			<bounds x="0" y="240" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp40" element="B" inputtag="BLACK1" inputmask="0x04">
+			<bounds x="0" y="260" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp42" element="C" inputtag="BLACK1" inputmask="0x02">
+			<bounds x="0" y="280" width="16" height="16" />
+		</bezel>
+
+		<bezel name="lamp24" element="START" inputtag="BLACK2" inputmask="0x80">
+			<bounds x="564" y="200" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp26" element="CONTINUE" inputtag="BLACK2" inputmask="0x10">
+			<bounds x="564" y="220" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp34" element="A" inputtag="BLACK2" inputmask="0x08">
+			<bounds x="564" y="240" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp41" element="B" inputtag="BLACK2" inputmask="0x04">
+			<bounds x="564" y="260" width="16" height="16" />
+		</bezel>
+		<bezel name="lamp48" element="C" inputtag="BLACK2" inputmask="0x02">
+			<bounds x="564" y="280" width="16" height="16" />
+		</bezel>
+		<screen index="0">
+			<bounds x="50" y="200" width="504" height="296" />
+		</screen>
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/v4psi.lay mame-0.224+dfsg.1/src/mame/layout/v4psi.lay
--- mame-0.222+dfsg.1/src/mame/layout/v4psi.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/v4psi.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+	<element name="overlay">
+		<rect>
+			<bounds left="0" top="0" right="1" bottom="0.12" />
+			<color red="0.055" green="0.43" blue="0.04" />
+		</rect>
+		<rect>
+			<bounds left="0" top="0.12" right="1" bottom="0.85" />
+			<color red="0.66" green="0.65" blue="0.05" />
+		</rect>
+		<rect>
+			<bounds left="0" top="0.85" right="1" bottom="1.0" />
+			<color red="0.69" green="0.28" blue="0.00" />
+		</rect>
+	</element>
+
+	<view name="Monitor with Overlay">
+		<screen index="0">
+			<bounds x="0" y="0" width="504" height="296" />
+		</screen>
+		<overlay element="overlay">
+			<bounds x="0" y="0" width="504" height="296" />
+		</overlay>
+
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/v4strike.lay mame-0.224+dfsg.1/src/mame/layout/v4strike.lay
--- mame-0.222+dfsg.1/src/mame/layout/v4strike.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/v4strike.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,465 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+	<element name="GEMS" defstate="0">
+		<text string="GEMS" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="0" width="16" height="7" />
+		</text>
+		<text string="FOR" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="8" width="16" height="7" />
+		</text>
+	</element>
+	<element name="FREEZE" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="0.2" />
+		</rect>
+		<text string="FREEZE">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="0" width="16" height="7" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="1.0" />
+		</rect>
+	</element>
+	<element name="GO" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.2" green="0.2" blue="0.0" />
+		</rect>
+		<text string="GO ON">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="0" width="16" height="7" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.8" green="0.8" blue="0.0" />
+		</rect>
+	</element>
+	<element name="FREEGAME">
+		<text string="FREE">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="0" width="16" height="7" />
+		</text>
+		<text string="GAME">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="8" width="16" height="7" />
+		</text>
+	</element>
+	<element name="50P" defstate="0">
+		<text string="50p" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="£1" defstate="0">
+		<text string="£1" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="£2" defstate="0">
+		<text string="£2" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="£3" defstate="0">
+		<text string="£3" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="£4" defstate="0">
+		<text string="£4" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="£5" defstate="0">
+		<text string="£5" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="£6" defstate="0">
+		<text string="£6" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="£10" defstate="0">
+		<text string="£10" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="£20" defstate="0">
+		<text string="£20" state="0">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="0" y="0" width="16" height="16" />
+		</text>
+	</element>
+	<element name="TRAIL1" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="252" height="16" />
+			<color red="0.2" green="0.2" blue="0.2" />
+		</rect>
+		<rect state ="1">
+			<bounds x="0" y="0" width="252" height="16" />
+			<color red="1.0" green="1.0" blue="1.0" />
+		</rect>
+	</element>
+	<element name="TRAIL2" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="80" height="16" />
+			<color red="0.0" green="0.2" blue="0.0" />
+		</rect>
+		<rect state ="1">
+			<bounds x="0" y="0" width="80" height="16" />
+			<color red="0.0" green="1.0" blue="0.3" />
+		</rect>
+	</element>
+	<element name="TRAIL3" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="80" height="16" />
+			<color red="0.2" green="0.2" blue="0.0" />
+		</rect>
+		<rect state ="1">
+			<bounds x="0" y="0" width="80" height="16" />
+			<color red="1.0" green="1.0" blue="0.0" />
+		</rect>
+	</element>
+	<element name="TRAIL4" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="80" height="16" />
+			<color red="0.2" green="0.0" blue="0.0" />
+		</rect>
+		<rect state ="1">
+			<bounds x="0" y="0" width="80" height="16" />
+			<color red="1.0" green="0.0" blue="0.0" />
+		</rect>
+	</element>
+	<element name="RED" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.5" green="0.0" blue="0.0" />
+		</rect>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="1.0" green="0.0" blue="0.0" />
+		</rect>
+	</element>
+	<element name="YELLOW" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.5" green="0.5" blue="0.0" />
+		</rect>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="1.0" green="1.0" blue="0.0" />
+		</rect>
+	</element>
+	<element name="GREEN" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.5" blue="0.0" />
+		</rect>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="1.0" blue="0.0" />
+		</rect>
+	</element>
+
+	<element name="PASS" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="0.2" />
+		</rect>
+		<text string="PASS">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.3" blue="1.0" />
+		</rect>
+	</element>
+
+	<element name="GET" defstate="0">
+		<text string="COLLECT" state="0">
+			<color red="0.1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="8" />
+		</text>
+		<text string="COLLECT" state="1">
+			<color red="1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="8" />
+		</text>
+	</element>
+
+	<element name="COLLECT" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="16" height="10" />
+			<color red="0.5" green="0.2" blue="0.0" />
+		</rect>
+		<text string="COLLECT" state="0">
+			<color red="0.1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="16" height="10" />
+			<color red="1.0" green="0.4" blue="0.0" />
+		</rect>
+		<text string="COLLECT" state="1">
+			<color red="0.1" green="0.1" blue="0.1" />
+			<bounds x="0" y="0" width="16" height="8" />
+		</text>
+	</element>
+
+	<element name="START" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="16" height="10" />
+			<color red="0.0" green="0.3" blue="0.1" />
+		</rect>
+		<text string="START" state="0">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="16" height="10" />
+			<color red="0.0" green="1.0" blue="0.3" />
+		</rect>
+		<text string="START" state="1">
+			<color red="0.0" green="0.0" blue="0.0" />
+			<bounds x="0" y="0" width="16" height="8" />
+		</text>
+	</element>
+
+	<element name="HELP" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="0.0" />
+		</rect>
+		<text string="HELP" state="0">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="0.0" />
+		</rect>
+		<text string="HELP" state="1">
+			<color red="1.0" green="1.0" blue="1.0" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+	</element>
+
+	<element name="PLAY" defstate="0">
+		<rect state ="0">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="0.3" />
+		</rect>
+		<text string="PLAY">
+			<color red="0.2" green="0.2" blue="0.2" />
+			<bounds x="2" y="2" width="16" height="8" />
+		</text>
+		<rect state ="1">
+			<bounds x="0" y="0" width="20" height="10" />
+			<color red="0.0" green="0.0" blue="1.0" />
+		</rect>
+	</element>
+
+	<element name="digit" defstate="0">
+	<led7seg>
+		<color red="1.0" green="0.0" blue="0.0" />
+	</led7seg>
+	</element>
+
+
+	<view name="Monitor and Lamps">
+		<bezel name="lamp85" element="TRAIL1">
+			<bounds x="50" y="10" width="252" height="60" />
+		</bezel>
+		<bezel name="lamp85" element="TRAIL2">
+			<bounds x="252" y="10" width="80" height="60" />
+		</bezel>
+		<bezel name="lamp85" element="TRAIL3">
+			<bounds x="332" y="10" width="80" height="60" />
+		</bezel>
+		<bezel name="lamp85" element="TRAIL4">
+			<bounds x="412" y="10" width="80" height="60" />
+		</bezel>
+		<bezel name="digit14" element="digit">
+			<bounds x="100" y="10" width="40" height="60" />
+		</bezel>
+		<bezel name="digit15" element="digit">
+			<bounds x="140" y="10" width="40" height="60" />
+		</bezel>
+		<bezel name="lamp85" element="GET">
+			<bounds x="50" y="10" width="50" height="60" />
+		</bezel>
+		<bezel name="GEMS" element="GEMS">
+			<bounds x="180" y="10" width="72" height="60" />
+		</bezel>
+		<bezel name="£5" element="£5">
+			<bounds x="252" y="10" width="80" height="60" />
+		</bezel>
+		<bezel name="£10" element="£10">
+			<bounds x="332" y="10" width="80" height="60" />
+		</bezel>
+		<bezel name="£20" element="£20">
+			<bounds x="412" y="10" width="80" height="60" />
+		</bezel>
+
+		<bezel name="lamp93" element="TRAIL1">
+			<bounds x="50" y="70" width="252" height="60" />
+		</bezel>
+		<bezel name="lamp93" element="TRAIL2">
+			<bounds x="252" y="70" width="80" height="60" />
+		</bezel>
+		<bezel name="lamp93" element="TRAIL3">
+			<bounds x="332" y="70" width="80" height="60" />
+		</bezel>
+		<bezel name="lamp93" element="TRAIL4">
+			<bounds x="412" y="70" width="80" height="60" />
+		</bezel>
+		<bezel name="digit12" element="digit">
+			<bounds x="100" y="70" width="40" height="60" />
+		</bezel>
+		<bezel name="digit13" element="digit">
+			<bounds x="140" y="70" width="40" height="60" />
+		</bezel>
+		<bezel name="lamp93" element="GET">
+			<bounds x="50" y="70" width="50" height="60" />
+		</bezel>
+		<bezel name="GEMS" element="GEMS">
+			<bounds x="180" y="70" width="72" height="60" />
+		</bezel>
+		<bezel name="£2" element="£2">
+			<bounds x="252" y="70" width="80" height="60" />
+		</bezel>
+		<bezel name="£4" element="£4">
+			<bounds x="332" y="70" width="80" height="60" />
+		</bezel>
+		<bezel name="£6" element="£6">
+			<bounds x="412" y="70" width="80" height="60" />
+		</bezel>
+
+		<bezel name="lamp101" element="TRAIL1">
+			<bounds x="50" y="130" width="252" height="60" />
+		</bezel>
+		<bezel name="lamp101" element="TRAIL2">
+			<bounds x="252" y="130" width="80" height="60" />
+		</bezel>
+		<bezel name="lamp101" element="TRAIL3">
+			<bounds x="332" y="130" width="80" height="60" />
+		</bezel>
+		<bezel name="lamp101" element="TRAIL4">
+			<bounds x="412" y="130" width="80" height="60" />
+		</bezel>
+		<bezel name="digit10" element="digit">
+			<bounds x="100" y="130" width="40" height="60" />
+		</bezel>
+		<bezel name="digit11" element="digit">
+			<bounds x="140" y="130" width="40" height="60" />
+		</bezel>
+		<bezel name="lamp101" element="GET">
+			<bounds x="50" y="130" width="50" height="60" />
+		</bezel>
+		<bezel name="GEMS" element="GEMS">
+			<bounds x="180" y="130" width="72" height="60" />
+		</bezel>
+		<bezel name="£1" element="£1">
+			<bounds x="252" y="130" width="80" height="60" />
+		</bezel>
+		<bezel name="£2" element="£2">
+			<bounds x="332" y="130" width="80" height="60" />
+		</bezel>
+		<bezel name="£3" element="£3">
+			<bounds x="412" y="130" width="80" height="60" />
+		</bezel>
+
+		<bezel name="lamp109" element="TRAIL1">
+			<bounds x="50" y="190" width="252" height="60" />
+		</bezel>
+		<bezel name="lamp109" element="TRAIL2">
+			<bounds x="252" y="190" width="80" height="60" />
+		</bezel>
+		<bezel name="lamp109" element="TRAIL3">
+			<bounds x="332" y="190" width="80" height="60" />
+		</bezel>
+		<bezel name="lamp109" element="TRAIL4">
+			<bounds x="412" y="190" width="80" height="60" />
+		</bezel>
+		<bezel name="digit8" element="digit">
+			<bounds x="100" y="190" width="40" height="60" />
+		</bezel>
+		<bezel name="digit9" element="digit">
+			<bounds x="140" y="190" width="40" height="60" />
+		</bezel>
+		<bezel name="lamp109" element="GET">
+			<bounds x="50" y="190" width="50" height="60" />
+		</bezel>
+		<bezel name="GEMS" element="GEMS">
+			<bounds x="180" y="190" width="72" height="60" />
+		</bezel>
+		<bezel name="FREEGAME" element="FREEGAME">
+			<bounds x="252" y="190" width="80" height="60" />
+		</bezel>
+		<bezel name="50P" element="50P">
+			<bounds x="332" y="190" width="80" height="60" />
+		</bezel>
+		<bezel name="£1" element="£1">
+			<bounds x="412" y="190" width="80" height="60" />
+		</bezel>
+
+		<bezel name="lamp25" element="COLLECT" inputtag="BLACK2" inputmask="0x40">
+			<bounds x="0" y="310" width="48" height="50" />
+		</bezel>
+		<bezel name="lamp32" element="RED" inputtag="BLACK1" inputmask="0x10">
+			<bounds x="0" y="360" width="48" height="50" />
+		</bezel>
+		<bezel name="lamp34" element="YELLOW" inputtag="BLACK1" inputmask="0x08">
+			<bounds x="0" y="410" width="48" height="50" />
+		</bezel>
+		<bezel name="lamp41" element="GREEN" inputtag="BLACK1" inputmask="0x04">
+			<bounds x="0" y="460" width="48" height="50" />
+		</bezel>
+		<bezel name="lamp48" element="PLAY" inputtag="BLACK1" inputmask="0x02">
+			<bounds x="0" y="510" width="48" height="50" />
+		</bezel>
+
+		<bezel name="lamp24" element="START" inputtag="BLACK2" inputmask="0x80">
+			<bounds x="560" y="310" width="48" height="50" />
+		</bezel>
+		<bezel name="lamp26" element="RED" inputtag="BLACK2" inputmask="0x10">
+			<bounds x="560" y="360" width="48" height="50" />
+		</bezel>
+		<bezel name="lamp33" element="YELLOW" inputtag="BLACK2" inputmask="0x08">
+			<bounds x="560" y="410" width="48" height="50" />
+		</bezel>
+		<bezel name="lamp40" element="GREEN" inputtag="BLACK2" inputmask="0x04">
+			<bounds x="560" y="460" width="48" height="50" />
+		</bezel>
+		<bezel name="lamp42" element="HELP" inputtag="BLACK2" inputmask="0x02">
+			<bounds x="564" y="510" width="48" height="50" />
+		</bezel>
+		<bezel name="lamp51" element="FREEZE" inputtag="ORANGE1" inputmask="0x10">
+			<bounds x="250" y="560" width="50" height="50" />
+		</bezel>
+
+		<bezel name="lamp35" element="GO" inputtag="ORANGE1" inputmask="0x40">
+			<bounds x="300" y="560" width="50" height="50" />
+		</bezel>
+
+		<screen index="0">
+			<bounds x="50" y="260" width="504" height="296" />
+		</screen>
+
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/vsmile.lay mame-0.224+dfsg.1/src/mame/layout/vsmile.lay
--- mame-0.222+dfsg.1/src/mame/layout/vsmile.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/vsmile.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,72 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+	<element name="redled" defstate="0">
+		<disk state="1">
+			<color red="0.75" green="0.0" blue="0.0" />
+		</disk>
+		<disk state="0">
+			<color red="0.20" green="0.0" blue="0.0" />
+		</disk>
+	</element>
+	<element name="yellowled" defstate="0">
+		<disk state="1">
+			<color red="0.75" green="0.75" blue="0.0" />
+		</disk>
+		<disk state="0">
+			<color red="0.20" green="0.20" blue="0.0" />
+		</disk>
+	</element>
+	<element name="blueled" defstate="0">
+		<disk state="1">
+			<color red="0" green="0.0" blue="0.75" />
+		</disk>
+		<disk state="0">
+			<color red="0.0" green="0.0" blue="0.20" />
+		</disk>
+	</element>
+	<element name="greenled" defstate="0">
+		<disk state="1">
+			<color red="0.0" green="0.75" blue="0.0" />
+		</disk>
+		<disk state="0">
+			<color red="0.0" green="0.20" blue="0.0" />
+		</disk>
+	</element>
+	<view name="Screen Only">
+		<screen index="0">
+			<bounds x="0" y="0" width="320" height="240" />
+		</screen>
+	</view>
+	<view name="Screen with Controller LEDs">
+		<screen index="0">
+			<bounds x="0" y="0" width="320" height="240" />
+		</screen>
+		<bezel name="redled1" element="redled">
+			<bounds x="5" y="245" width="10" height="10" />
+		</bezel>
+		<bezel name="yellowled1" element="yellowled">
+			<bounds x="20" y="245" width="10" height="10" />
+		</bezel>
+		<bezel name="blueled1" element="blueled">
+			<bounds x="35" y="245" width="10" height="10" />
+		</bezel>
+		<bezel name="greenled1" element="greenled">
+			<bounds x="50" y="245" width="10" height="10" />
+		</bezel>
+		<bezel name="redled2" element="redled">
+			<bounds x="260" y="245" width="10" height="10" />
+		</bezel>
+		<bezel name="yellowled2" element="yellowled">
+			<bounds x="275" y="245" width="10" height="10" />
+		</bezel>
+		<bezel name="blueled2" element="blueled">
+			<bounds x="290" y="245" width="10" height="10" />
+		</bezel>
+		<bezel name="greenled2" element="greenled">
+			<bounds x="305" y="245" width="10" height="10" />
+		</bezel>
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/warrior.lay mame-0.224+dfsg.1/src/mame/layout/warrior.lay
--- mame-0.222+dfsg.1/src/mame/layout/warrior.lay	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/warrior.lay	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!--
+license:CC0
+-->
+<mamelayout version="2">
+	<element name="pit">
+		<rect>
+			<bounds x="0" y="0" height="190" width="190" />
+			<color red="0" green="0" blue="0.50" />
+		</rect>
+		<rect>
+			<bounds x="10" y="10" height="170" width="170" />
+			<color red="0" green="0" blue="0.40" />
+		</rect>
+		<rect>
+			<bounds x="20" y="20" height="150" width="150" />
+			<color red="0" green="0" blue="0.30" />
+		</rect>
+		<rect>
+			<bounds x="30" y="30" height="130" width="130" />
+			<color red="0" green="0" blue="0.20" />
+		</rect>
+		<rect>
+			<bounds x="40" y="40" height="110" width="110" />
+			<color red="0" green="0" blue="0.10" />
+		</rect>
+		<rect>
+			<bounds x="50" y="50" height="90" width="90" />
+			<color red="0" green="0" blue="0" />
+		</rect>
+	</element>
+	<element name="p1start">
+		<disk>
+			<bounds x="0" y="0" height="130" width="130" />
+			<color red="0" green="1" blue="0" />
+		</disk>
+	</element>
+	<element name="p2start">
+		<rect>
+			<bounds x="0" y="0" height="130" width="130" />
+			<color red="1" green="0" blue="0" />
+		</rect>
+		<rect>
+			<bounds x="5" y="5" height="120" width="120" />
+			<color red="0" green="0" blue="0" />
+		</rect>
+	</element>
+	<view name="Color_Overlay">
+		<backdrop name="pit1" element="pit">
+			<bounds x="270" y="330" width="190" height="190" />
+			<color alpha=".8" />
+		</backdrop>
+		<backdrop name="pit2" element="pit">
+			<bounds x="580" y="270" width="190" height="190" />
+			<color alpha=".8" />
+		</backdrop>
+		<backdrop name="p1start" element="p1start">
+			<bounds x="75" y="75" width="130" height="130" />
+			<color alpha=".4" />
+		</backdrop>
+		<backdrop name="p2start" element="p2start">
+			<bounds x="825" y="580" width="130" height="130" />
+			<color alpha=".4" />
+		</backdrop>
+		<screen index="0">
+			<bounds x="0" y="0" width="1024" height="768" />
+		</screen>
+	</view>
+</mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/layout/wecleman.lay mame-0.224+dfsg.1/src/mame/layout/wecleman.lay
--- mame-0.222+dfsg.1/src/mame/layout/wecleman.lay	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/layout/wecleman.lay	2020-08-26 08:57:19.000000000 +0000
@@ -69,4 +69,22 @@
 			<color alpha="0.6" />
 		</bezel>
 	</view>
+	<view name="Widescreen Shifter-R">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x20">
+			<bounds x="648" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
+	<view name="Widescreen Shifter-L">
+		<screen index="0">
+			<bounds x="0" y="0" width="640" height="480" />
+		</screen>
+		<bezel element="shifter" inputtag="IN0" inputmask="0x20">
+			<bounds x="-40" y="414" width="32" height="64" />
+			<color alpha="0.65" />
+		</bezel>
+	</view>
 </mamelayout>
diff -Nru mame-0.222+dfsg.1/src/mame/machine/abc1600mac.cpp mame-0.224+dfsg.1/src/mame/machine/abc1600mac.cpp
--- mame-0.222+dfsg.1/src/mame/machine/abc1600mac.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/abc1600mac.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -116,7 +116,8 @@
 	m_page_ram(*this, "page_ram"),
 	m_watchdog(*this, "watchdog"),
 	m_cpu(*this, finder_base::DUMMY_TAG),
-	m_task(0)
+	m_task(0),
+	m_cause(0)
 {
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/machine/ac1.cpp mame-0.224+dfsg.1/src/mame/machine/ac1.cpp
--- mame-0.222+dfsg.1/src/mame/machine/ac1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/ac1.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/***************************************************************************
-
-        AC1 video driver by Miodrag Milanovic
-
-        15/01/2009 Preliminary driver.
-
-****************************************************************************/
-
-#include "emu.h"
-#include "machine/z80pio.h"
-#include "imagedev/cassette.h"
-#include "includes/ac1.h"
-
-uint8_t ac1_state::ac1_port_b_r()
-{
-	uint8_t data = 0x7f;
-
-	if (m_cassette->input() > 0.03)
-		data |= 0x80;
-
-	return data;
-}
-
-#define BNOT(x) ((x) ? 0 : 1)
-
-uint8_t ac1_state::ac1_port_a_r()
-{
-	uint8_t line0 = m_io_line[0]->read();
-	uint8_t line1 = m_io_line[1]->read();
-	uint8_t line2 = m_io_line[2]->read();
-	uint8_t line3 = m_io_line[3]->read();
-	uint8_t line4 = m_io_line[4]->read();
-	uint8_t line5 = m_io_line[5]->read();
-	uint8_t line6 = m_io_line[6]->read();
-
-	uint8_t SH    = BNOT(BIT(line6,0));
-	uint8_t CTRL  = BNOT(BIT(line6,1));
-	uint8_t SPACE = BIT(line6,2);
-	uint8_t ENTER = BIT(line6,3);
-	uint8_t BACK  = BIT(line6,4);
-
-	uint8_t all = line0 | line1 | line2 | line3 | line4 | line5;
-	uint8_t s1 = BNOT(BIT(all,0));uint8_t z1 = (line0 !=0) ? 0 : 1;
-	uint8_t s2 = BNOT(BIT(all,1));uint8_t z2 = (line1 !=0) ? 0 : 1;
-	uint8_t s3 = BNOT(BIT(all,2));uint8_t z3 = (line2 !=0) ? 0 : 1;
-	uint8_t s4 = BNOT(BIT(all,3));uint8_t z4 = (line3 !=0) ? 0 : 1;
-	uint8_t s5 = BNOT(BIT(all,4));uint8_t z5 = (line4 !=0) ? 0 : 1;
-	uint8_t s6 = BNOT(BIT(all,5));uint8_t z6 = (line5 !=0) ? 0 : 1;
-	uint8_t s7 = BNOT(BIT(all,6));
-	uint8_t s8 = BNOT(BIT(all,7));
-	uint8_t tast,td0,td1,td2,td3,td4,td5,td6,dg5;
-
-	/* Additional double keys */
-	if (SPACE) {
-		z1 = 0; s1 = 0; SH = 0;
-	}
-	if (ENTER) {
-		z4 = 0; s6 = 0; CTRL = 0;
-	}
-	if (BACK) {
-		z4 = 0; s1 = 0; CTRL = 0;
-	}
-
-	tast = BNOT(s1 & s2 & s3 & s4 & s5 &s6 & s7 & s8);
-	td0  = BNOT(s2 & s4 & s6 & s8);
-	td1  = BNOT(s3 & s4 & s7 & s8);
-	td2  = BNOT(s5 & s6 & s7 & s8);
-	td3  = BNOT(z2 & z4 & z6);
-	td4  = BNOT(BNOT(BNOT(z1 & z2) & SH) & z5 & z6);
-	dg5  = BNOT(z3 & z4 & z5 & z6);
-	td5  = BNOT(BNOT(dg5 & BNOT(SH)) & z1 & z2);
-	td6  = (dg5 & CTRL);
-	return td0 + (td1 << 1) +(td2 << 2) +(td3 << 3) +(td4 << 4) +(td5 << 5) +(td6 << 6) +(tast << 7);
-}
-
-void ac1_state::ac1_port_a_w(uint8_t data)
-{
-}
-
-void ac1_state::ac1_port_b_w(uint8_t data)
-{
-	/*
-
-	    bit     description
-
-	    0
-	    1       RTTY receive
-	    2       RTTY transmit
-	    3       RTTY PTT
-	    4
-	    5
-	    6       cassette out
-	    7       cassette in
-
-	*/
-	m_cassette->output((data & 0x40) ? -1.0 : +1.0);
-}
-
-/* Driver initialization */
-void ac1_state::init_ac1()
-{
-}
-
-void ac1_state::machine_reset()
-{
-}
diff -Nru mame-0.222+dfsg.1/src/mame/machine/apple3.cpp mame-0.224+dfsg.1/src/mame/machine/apple3.cpp
--- mame-0.222+dfsg.1/src/mame/machine/apple3.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/apple3.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -480,7 +480,8 @@
 
 WRITE_LINE_MEMBER(apple3_state::vbl_w)
 {
-	if ((state) && (m_charwrt))
+	// do the font upload at the end of VBL, not the start
+	if ((!state) && (m_charwrt))
 	{
 		apple3_write_charmem();
 	}
diff -Nru mame-0.222+dfsg.1/src/mame/machine/b2m.cpp mame-0.224+dfsg.1/src/mame/machine/b2m.cpp
--- mame-0.222+dfsg.1/src/mame/machine/b2m.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/b2m.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -11,14 +11,9 @@
 
 #include "emu.h"
 #include "cpu/i8085/i8085.h"
-#include "imagedev/cassette.h"
-#include "machine/wd_fdc.h"
-#include "machine/pic8259.h"
-#include "machine/i8251.h"
 #include "includes/b2m.h"
-#include "machine/ram.h"
 
-uint8_t b2m_state::b2m_keyboard_r(offs_t offset)
+uint8_t b2m_state::keyboard_r(offs_t offset)
 {
 	uint8_t key = 0x00;
 	if (offset < 0x100) {
@@ -39,7 +34,7 @@
 }
 
 
-void b2m_state::b2m_set_bank(int bank)
+void b2m_state::set_bank(int bank)
 {
 	uint8_t *rom;
 	address_space &space = m_maincpu->space(AS_PROGRAM);
@@ -61,7 +56,7 @@
 						membank("bank2")->set_base(ram + 0x2800);
 						membank("bank3")->set_base(ram + 0x3000);
 						membank("bank4")->set_base(ram + 0x7000);
-						membank("bank5")->set_base(rom + 0x10000);
+						membank("bank5")->set_base(rom);
 						break;
 #if 0
 		case 1 :
@@ -70,9 +65,9 @@
 
 						membank("bank1")->set_base(ram);
 						membank("bank2")->set_base(ram + 0x2800);
-						membank("bank3")->set_base(rom + 0x12000);
-						membank("bank4")->set_base(rom + 0x16000);
-						membank("bank5")->set_base(rom + 0x10000);
+						membank("bank3")->set_base(rom + 0x2000);
+						membank("bank4")->set_base(rom + 0x6000);
+						membank("bank5")->set_base(rom);
 						break;
 #endif
 		case 2 :
@@ -80,30 +75,30 @@
 						space.unmap_write(0xe000, 0xffff);
 
 						membank("bank1")->set_base(ram);
-						space.install_read_handler(0x2800, 0x2fff, read8sm_delegate(*this, FUNC(b2m_state::b2m_keyboard_r)));
+						space.install_read_handler(0x2800, 0x2fff, read8sm_delegate(*this, FUNC(b2m_state::keyboard_r)));
 						membank("bank3")->set_base(ram + 0x10000);
 						membank("bank4")->set_base(ram + 0x7000);
-						membank("bank5")->set_base(rom + 0x10000);
+						membank("bank5")->set_base(rom);
 						break;
 		case 3 :
 						space.unmap_write(0x2800, 0x2fff);
 						space.unmap_write(0xe000, 0xffff);
 
 						membank("bank1")->set_base(ram);
-						space.install_read_handler(0x2800, 0x2fff, read8sm_delegate(*this, FUNC(b2m_state::b2m_keyboard_r)));
+						space.install_read_handler(0x2800, 0x2fff, read8sm_delegate(*this, FUNC(b2m_state::keyboard_r)));
 						membank("bank3")->set_base(ram + 0x14000);
 						membank("bank4")->set_base(ram + 0x7000);
-						membank("bank5")->set_base(rom + 0x10000);
+						membank("bank5")->set_base(rom);
 						break;
 		case 4 :
 						space.unmap_write(0x2800, 0x2fff);
 						space.unmap_write(0xe000, 0xffff);
 
 						membank("bank1")->set_base(ram);
-						space.install_read_handler(0x2800, 0x2fff, read8sm_delegate(*this, FUNC(b2m_state::b2m_keyboard_r)));
+						space.install_read_handler(0x2800, 0x2fff, read8sm_delegate(*this, FUNC(b2m_state::keyboard_r)));
 						membank("bank3")->set_base(ram + 0x18000);
 						membank("bank4")->set_base(ram + 0x7000);
-						membank("bank5")->set_base(rom + 0x10000);
+						membank("bank5")->set_base(rom);
 
 						break;
 		case 5 :
@@ -111,10 +106,10 @@
 						space.unmap_write(0xe000, 0xffff);
 
 						membank("bank1")->set_base(ram);
-						space.install_read_handler(0x2800, 0x2fff, read8sm_delegate(*this, FUNC(b2m_state::b2m_keyboard_r)));
+						space.install_read_handler(0x2800, 0x2fff, read8sm_delegate(*this, FUNC(b2m_state::keyboard_r)));
 						membank("bank3")->set_base(ram + 0x1c000);
 						membank("bank4")->set_base(ram + 0x7000);
-						membank("bank5")->set_base(rom + 0x10000);
+						membank("bank5")->set_base(rom);
 
 						break;
 		case 6 :
@@ -131,44 +126,44 @@
 						space.unmap_write(0x7000, 0xdfff);
 						space.unmap_write(0xe000, 0xffff);
 
-						membank("bank1")->set_base(rom + 0x10000);
-						membank("bank2")->set_base(rom + 0x10000);
-						membank("bank3")->set_base(rom + 0x10000);
-						membank("bank4")->set_base(rom + 0x10000);
-						membank("bank5")->set_base(rom + 0x10000);
+						membank("bank1")->set_base(rom);
+						membank("bank2")->set_base(rom);
+						membank("bank3")->set_base(rom);
+						membank("bank4")->set_base(rom);
+						membank("bank5")->set_base(rom);
 						break;
 	}
 }
 
 
-WRITE_LINE_MEMBER(b2m_state::bm2_pit_out1)
+WRITE_LINE_MEMBER(b2m_state::pit_out1)
 {
 	m_speaker->level_w(state);
 }
 
-void b2m_state::b2m_8255_porta_w(uint8_t data)
+void b2m_state::ppi1_porta_w(uint8_t data)
 {
-	m_b2m_8255_porta = data;
+	m_porta = data;
 }
 
-void b2m_state::b2m_8255_portb_w(uint8_t data)
+void b2m_state::ppi1_portb_w(uint8_t data)
 {
-	m_b2m_video_scroll = data;
+	m_video_scroll = data;
 }
 
-void b2m_state::b2m_8255_portc_w(uint8_t data)
+void b2m_state::ppi1_portc_w(uint8_t data)
 {
-	m_b2m_8255_portc = data;
-	b2m_set_bank(m_b2m_8255_portc & 7);
-	m_b2m_video_page = (m_b2m_8255_portc >> 7) & 1;
+	m_portc = data;
+	set_bank(m_portc & 7);
+	m_video_page = BIT(m_portc, 7);
 }
 
-uint8_t b2m_state::b2m_8255_portb_r()
+uint8_t b2m_state::ppi1_portb_r()
 {
-	return m_b2m_video_scroll;
+	return m_video_scroll;
 }
 
-WRITE_LINE_MEMBER( b2m_state::b2m_fdc_drq )
+WRITE_LINE_MEMBER( b2m_state::fdc_drq )
 {
 	/* Clears HALT state of CPU when data is ready to read */
 	if (state)
@@ -176,27 +171,22 @@
 }
 
 
-void b2m_state::b2m_ext_8255_portc_w(uint8_t data)
+void b2m_state::ppi2_portc_w(uint8_t data)
 {
-	uint8_t drive = ((data >> 1) & 1) ^ 1;
-	uint8_t side  = (data  & 1) ^ 1;
+	uint8_t drive = BIT(~data, 1);
+	uint8_t side  = BIT(~data, 0);
 
 	floppy_image_device *floppy = nullptr;
 	if (m_fd[drive].found())
 		floppy = m_fd[drive]->get_device();
 
-	if (floppy != nullptr)
+	if (floppy)
 		floppy->mon_w(0);
 	m_fdc->set_floppy(floppy);
-	if (m_b2m_drive!=drive) {
-		m_b2m_drive = drive;
-	}
 
-	if (m_b2m_side!=side) {
-		m_b2m_side = side;
-		if (floppy != nullptr)
-			floppy->ss_w(side);
-	}
+	if (floppy)
+		floppy->ss_w(side);
+
 	/*
 	    When bit 5 is set CPU is in HALT state and stay there until
 	    DRQ is triggered from floppy side
@@ -207,84 +197,75 @@
 	}
 }
 
-uint8_t b2m_state::b2m_romdisk_porta_r()
-{
-	uint8_t *romdisk = memregion("maincpu")->base() + 0x12000;
-	return romdisk[m_b2m_romdisk_msb*256+m_b2m_romdisk_lsb];
-}
-
-void b2m_state::b2m_romdisk_portb_w(uint8_t data)
+uint8_t b2m_state::romdisk_porta_r()
 {
-	m_b2m_romdisk_lsb = data;
+	uint8_t *romdisk = memregion("maincpu")->base() + 0x2000;
+	return romdisk[m_romdisk_msb*256+m_romdisk_lsb];
 }
 
-void b2m_state::b2m_romdisk_portc_w(uint8_t data)
+void b2m_state::romdisk_portb_w(uint8_t data)
 {
-	m_b2m_romdisk_msb = data & 0x7f;
+	m_romdisk_lsb = data;
 }
 
-/* Driver initialization */
-void b2m_state::init_b2m()
+void b2m_state::romdisk_portc_w(uint8_t data)
 {
-	m_vblank_state = 0;
+	m_romdisk_msb = data & 0x7f;
 }
 
-void b2m_state::b2m_palette_w(offs_t offset, uint8_t data)
+void b2m_state::palette_w(offs_t offset, uint8_t data)
 {
-	uint8_t b = (3 - ((data >> 6) & 3)) * 0x55;
-	uint8_t g = (3 - ((data >> 4) & 3)) * 0x55;
-	uint8_t r = (3 - ((data >> 2) & 3)) * 0x55;
+	uint8_t b = BIT(~data, 6, 2) * 0x55;
+	uint8_t g = BIT(~data, 4, 2) * 0x55;
+	uint8_t r = BIT(~data, 2, 2) * 0x55;
 
-	uint8_t bw = (3 - (data & 3)) * 0x55;
+	uint8_t bw = BIT(~data, 0, 2) * 0x55;
 
-	m_b2m_color[offset & 3] = data;
+	m_color[offset & 3] = data;
 
-	if (ioport("MONITOR")->read()==1) {
+	if (ioport("MONITOR")->read()==1)
 		m_palette->set_pen_color(offset, r, g, b);
-	} else {
+	else
 		m_palette->set_pen_color(offset, bw, bw, bw);
-	}
 }
 
-uint8_t b2m_state::b2m_palette_r(offs_t offset)
+uint8_t b2m_state::palette_r(offs_t offset)
 {
-	return m_b2m_color[offset];
+	return m_color[offset];
 }
 
-void b2m_state::b2m_localmachine_w(uint8_t data)
+void b2m_state::localmachine_w(uint8_t data)
 {
-	m_b2m_localmachine = data;
+	m_localmachine = data;
 }
 
-uint8_t b2m_state::b2m_localmachine_r()
+uint8_t b2m_state::localmachine_r()
 {
-	return m_b2m_localmachine;
+	return m_localmachine;
 }
 
-void b2m_state::b2m_postload()
+void b2m_state::postload()
 {
-	b2m_set_bank(m_b2m_8255_portc & 7);
+	set_bank(m_portc & 7);
 }
 
 void b2m_state::machine_start()
 {
 	/* register for state saving */
-	save_item(NAME(m_b2m_8255_porta));
-	save_item(NAME(m_b2m_video_scroll));
-	save_item(NAME(m_b2m_8255_portc));
-	save_item(NAME(m_b2m_video_page));
-	save_item(NAME(m_b2m_drive));
-	save_item(NAME(m_b2m_side));
-	save_item(NAME(m_b2m_romdisk_lsb));
-	save_item(NAME(m_b2m_romdisk_msb));
-	save_pointer(NAME(m_b2m_color), 4);
-	save_item(NAME(m_b2m_localmachine));
+	save_item(NAME(m_porta));
+	save_item(NAME(m_video_scroll));
+	save_item(NAME(m_portc));
+	save_item(NAME(m_video_page));
+	save_item(NAME(m_romdisk_lsb));
+	save_item(NAME(m_romdisk_msb));
+	save_pointer(NAME(m_color), 4);
+	save_item(NAME(m_localmachine));
 	save_item(NAME(m_vblank_state));
 
-	machine().save().register_postload(save_prepost_delegate(FUNC(b2m_state::b2m_postload), this));
+	machine().save().register_postload(save_prepost_delegate(FUNC(b2m_state::postload), this));
 }
 
-INTERRUPT_GEN_MEMBER(b2m_state::b2m_vblank_interrupt)
+INTERRUPT_GEN_MEMBER(b2m_state::vblank_interrupt)
 {
 	m_vblank_state++;
 	if (m_vblank_state>1) m_vblank_state=0;
@@ -293,8 +274,52 @@
 
 void b2m_state::machine_reset()
 {
-	m_b2m_side = 0;
-	m_b2m_drive = 0;
+	m_vblank_state = 0;
+	set_bank(7);
+}
+
+uint32_t b2m_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	uint8_t code1;
+	uint8_t code2;
+	uint8_t col;
+	int y, x, b;
+	uint8_t *ram = m_ram->pointer();
+
+	for (x = 0; x < 48; x++)
+	{
+		for (y = 0; y < 256; y++)
+		{
+			u16 t = x*256 + ((y + m_video_scroll) & 0xff);
+			if (m_video_page==0)
+			{
+				code1 = ram[0x11000 + t];
+				code2 = ram[0x15000 + t];
+			}
+			else
+			{
+				code1 = ram[0x19000 + t];
+				code2 = ram[0x1d000 + t];
+			}
+			for (b = 7; b >= 0; b--)
+			{
+				col = (BIT(code2, b)<<1) + BIT(code1, b);
+				bitmap.pix16(y, x*8+b) =  col;
+			}
+		}
+	}
+
+	return 0;
+}
+
+void b2m_state::b2m_palette(palette_device &palette) const
+{
+	static constexpr rgb_t b2m_pens[4] = {
+		{ 0x00, 0x00, 0x00 }, // 0
+		{ 0x00, 0x00, 0x00 }, // 1
+		{ 0x00, 0x00, 0x00 }, // 2
+		{ 0x00, 0x00, 0x00 }, // 3
+	};
 
-	b2m_set_bank(7);
+	palette.set_pen_colors(0, b2m_pens);
 }
diff -Nru mame-0.222+dfsg.1/src/mame/machine/bacta_datalogger.cpp mame-0.224+dfsg.1/src/mame/machine/bacta_datalogger.cpp
--- mame-0.222+dfsg.1/src/mame/machine/bacta_datalogger.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/bacta_datalogger.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,219 @@
+// license:BSD-3-Clause
+// copyright-holders:James Wallace
+#include "emu.h"
+#include "bacta_datalogger.h"
+
+#define LOG_DATA    (1U << 1)
+
+//#define VERBOSE (LOG_DATA)
+//#define LOG_OUTPUT_STREAM std::cout
+
+#include "logmacro.h"
+
+#define LOGDATA(...)    LOGMASKED(LOG_DATA,    __VA_ARGS__)
+
+/***********************************************************************************************************
+  BACTA Datalogger emulation
+  The British Amusement and Catering Trade Association created a standard for the tracking of statistics
+  and other features on British AWPs across hardware manufacturers.
+  The specification is very simple, a 1200 baud null modem connection  via RS232, with the logger sending an
+  ACK command (0x06) on receipt of a valid character, and NAK (0x15) on error.
+  In this emulation, the simplest possible device is simulated here, derived from the RS232 null_modem.
+  We only handle the feedback for acknowledgment, and limited logging.
+************************************************************************************************************/
+
+// device type definition
+DEFINE_DEVICE_TYPE(BACTA_DATALOGGER, bacta_datalogger_device, "bacta_datalogger", "BACTA Datalogger")
+
+//-------------------------------------------------
+//  bacta_datalogger_device - constructor
+//-------------------------------------------------
+
+bacta_datalogger_device::bacta_datalogger_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+	: bacta_datalogger_device(mconfig, BACTA_DATALOGGER, tag, owner, clock)
+{
+}
+
+bacta_datalogger_device::bacta_datalogger_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+	: device_t(mconfig, BACTA_DATALOGGER, tag, owner, clock),
+	device_serial_interface(mconfig, *this),
+	m_rxd_handler(*this),
+	m_last_input(-1),
+	m_output_char(0)
+{
+}
+
+void bacta_datalogger_device::device_start()
+{
+	m_rxd_handler.resolve_safe();
+}
+
+void bacta_datalogger_device::device_reset()
+{
+	int startbits = 1;
+	int databits = 8;
+	parity_t parity = device_serial_interface::PARITY_ODD;
+	stop_bits_t stopbits =  device_serial_interface::STOP_BITS_1;
+
+	set_data_frame(startbits, databits, parity, stopbits);
+
+	set_tra_rate(1200);
+
+	set_rcv_rate(1200);
+
+	output_rxd(1);
+}
+
+void bacta_datalogger_device::tx_queue()
+{
+	if (is_transmit_register_empty())
+	{
+		if (m_output_char != -1)
+		{
+			set_tra_rate(1200);
+			transmit_register_setup(m_output_char);
+			m_output_char = -1;
+		}
+	}
+}
+
+void bacta_datalogger_device::tra_callback()
+{
+	output_rxd(transmit_register_get_data_bit());
+}
+
+void bacta_datalogger_device::tra_complete()
+{
+	// Shut down transmitter until there's a character
+	set_tra_rate(attotime::never);
+	tx_queue();
+}
+
+void bacta_datalogger_device::rcv_complete()
+{
+	u8 data;
+
+	receive_register_extract();
+
+	data = get_received_char();
+	if (data != 0x00)
+	{
+		if (data > 0x80)
+		{
+			data &= ~0x80;
+			LOGDATA("Retransmission of %x\n",data);
+			if ( data == m_last_input)
+			{
+				return;
+			}
+		}
+		m_last_input = data;
+		switch (data)
+		{
+			case 0x01:
+				LOGDATA("(%c) Prize 1 vend or 0x01\n",data);
+				break;
+			case 0x02:
+				LOGDATA("(%c) Prize 2 vend or 0x02\n",data);
+				break;
+			case 0x03:
+				LOGDATA("(%c) Prize 3 vend or 0x03\n",data);
+				break;
+			case 0x04:
+				LOGDATA("(%c) Prize 4 vend or 0x04\n",data);
+				break;
+			case 0x05:
+				LOGDATA("(%c) Remote Credit or 0x05\n",data);
+				break;
+			case 0x07:
+				LOGDATA("(%c) Idle or 0x07\n",data);
+				break;
+			case 0x08:
+				LOGDATA("(%c) Change or 0x08\n",data);
+				break;
+			case 0x09:
+			case 0x0a:
+			case 0x0b:
+			case 0x0c:
+			case 0x0d:
+			case 0x0e:
+			case 0x0f:
+				LOGDATA("(%c) User defined message or 0x0%x\n",data,data);
+				break;
+			case 0x2b:
+				LOGDATA("(%c) Cashbox door open 0x2b\n",data);
+				break;
+			case 0x2c:
+				LOGDATA("(%c) Cashbox door closed 0x2c\n",data);
+				break;
+			case 0x2d:
+				LOGDATA("(%c) Service door open 0x2d\n",data);
+				break;
+			case 0x2e:
+				LOGDATA("(%c) Service door closed 0x2e\n",data);
+				break;
+			case 0x60:
+				LOGDATA("(%c) Primary message (0x%x), next byte is message length\n",data,data);
+				break;
+			case 0x61:
+				LOGDATA("(%c) Coin Tube / Hopper Levels 0x61 \n",data);
+				break;
+			case 0x62:
+				LOGDATA("(%c) Secondary message (0x%x), next byte is message length\n",data,data);
+				break;
+			case 0x63:
+				LOGDATA("(%c) Critical Fault 0x63\n",data);
+				break;
+			case 0x64:
+				LOGDATA("(%c) Non Critical Fault 0x64\n",data);
+				break;
+			case 0x65:
+				LOGDATA("(%c) Manufacturer Message Header 0x65, next byte is message length\n",data);
+				break;
+			case 0x66:
+				LOGDATA("(%c) Potential Parameter Data request 0x66, not currently supported\n",data);
+				break;
+			case 0x67:
+				LOGDATA("(%c) Potential Parameter Report request 0x67, not currently supported\n",data);
+				break;
+			case 0x68:
+				LOGDATA("(%c) Multi-Stake Multi-Game message 0x68\n",data);
+				break;
+			case 0x69:
+				LOGDATA("(%c) Cashless source 0x69\n",data);
+				break;
+			case 0x70:
+			case 0x71:
+			case 0x72:
+			case 0x73:
+			case 0x74:
+			case 0x75:
+			case 0x76:
+			case 0x77:
+			case 0x78:
+			case 0x79:
+			case 0x7a:
+			case 0x7b:
+			case 0x7c:
+			case 0x7d:
+			case 0x7e:
+			case 0x7f:
+				LOGDATA("(%c) User defined message (0x%x), next byte is message length\n",data,data);
+				break;
+
+			default:
+				LOGDATA("(%c) Received: %02x\n",data, data);
+				break;
+		}
+		m_output_char = 0x06;//ACK
+		tx_queue();
+	}
+	else
+	{
+		if (data != 0x00)
+		{
+			m_output_char = 0x15;//NAK
+			tx_queue();
+		}
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/mame/machine/bacta_datalogger.h mame-0.224+dfsg.1/src/mame/machine/bacta_datalogger.h
--- mame-0.222+dfsg.1/src/mame/machine/bacta_datalogger.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/bacta_datalogger.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,39 @@
+// license:BSD-3-Clause
+// copyright-holders:James Wallace
+#ifndef MAME_BACTA_DATALOGGER_H
+#define MAME_BACTA_DATALOGGER_H
+
+#include "diserial.h"
+
+class bacta_datalogger_device : public device_t,
+	public device_serial_interface
+{
+public:
+	bacta_datalogger_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+
+	virtual WRITE_LINE_MEMBER( write_txd ) {device_serial_interface::rx_w(state); }
+	auto rxd_handler() { return m_rxd_handler.bind(); }
+
+	DECLARE_WRITE_LINE_MEMBER( output_rxd ) { m_rxd_handler(state); }
+
+protected:
+	bacta_datalogger_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	virtual void tra_callback() override;
+	virtual void tra_complete() override;
+	virtual void rcv_complete() override;
+
+private:
+	void tx_queue();
+
+	devcb_write_line m_rxd_handler;
+	uint8_t m_last_input;
+	uint8_t m_output_char;
+};
+
+DECLARE_DEVICE_TYPE(BACTA_DATALOGGER, bacta_datalogger_device)
+
+#endif // MAME_BACTA_DATALOGGER_H
diff -Nru mame-0.222+dfsg.1/src/mame/machine/bk.cpp mame-0.224+dfsg.1/src/mame/machine/bk.cpp
--- mame-0.222+dfsg.1/src/mame/machine/bk.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/bk.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,8 +10,6 @@
 
 
 #include "emu.h"
-#include "imagedev/cassette.h"
-#include "machine/i8255.h"
 #include "includes/bk.h"
 
 
@@ -56,13 +54,20 @@
 
 void bk_state::machine_start()
 {
+	save_item(NAME(m_scroll));
+	save_item(NAME(m_kbd_state));
+	save_item(NAME(m_key_code));
+	save_item(NAME(m_key_pressed));
+	save_item(NAME(m_key_irq_vector));
+	save_item(NAME(m_drive));
+
 	m_maincpu->set_input_line(t11_device::VEC_LINE, ASSERT_LINE);
 
 	m_kbd_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(bk_state::keyboard_callback), this));
 	m_kbd_timer->adjust(attotime::from_hz(2400), 0, attotime::from_hz(2400));
 }
 
-uint8_t bk_state::bk0010_irq_callback(offs_t offset)
+uint8_t bk_state::irq_callback(offs_t offset)
 {
 	m_maincpu->set_input_line(0, CLEAR_LINE);
 	return m_key_irq_vector;
@@ -71,25 +76,25 @@
 void bk_state::machine_reset()
 {
 	m_kbd_state = 0;
-	m_scrool = 01330;
+	m_scroll = 01330;
 }
 
-uint16_t bk_state::bk_key_state_r()
+uint16_t bk_state::key_state_r()
 {
 	return m_kbd_state;
 }
-uint16_t bk_state::bk_key_code_r()
+uint16_t bk_state::key_code_r()
 {
 	m_kbd_state &= ~0x80; // mark reading done
 	m_key_pressed = 0;
 	return m_key_code;
 }
-uint16_t bk_state::bk_vid_scrool_r()
+uint16_t bk_state::vid_scroll_r()
 {
-	return m_scrool;
+	return m_scroll;
 }
 
-uint16_t bk_state::bk_key_press_r()
+uint16_t bk_state::key_press_r()
 {
 	double level = m_cassette->input();
 	uint16_t cas = (level < 0) ? 0 : 0x20;
@@ -97,27 +102,27 @@
 	return 0x8080 | m_key_pressed | cas;
 }
 
-void bk_state::bk_key_state_w(uint16_t data)
+void bk_state::key_state_w(uint16_t data)
 {
 	m_kbd_state = (m_kbd_state & ~0x40) | (data & 0x40);
 }
 
-void bk_state::bk_vid_scrool_w(uint16_t data)
+void bk_state::vid_scroll_w(uint16_t data)
 {
-	m_scrool = data;
+	m_scroll = data;
 }
 
-void bk_state::bk_key_press_w(uint16_t data)
+void bk_state::key_press_w(uint16_t data)
 {
 	m_cassette->output(BIT(data, 6) ? 1.0 : -1.0);
 }
 
-uint16_t bk_state::bk_floppy_cmd_r()
+uint16_t bk_state::floppy_cmd_r()
 {
 	return 0;
 }
 
-void bk_state::bk_floppy_cmd_w(uint16_t data)
+void bk_state::floppy_cmd_w(uint16_t data)
 {
 	if (BIT(data, 0))
 		m_drive = 0;
@@ -135,11 +140,27 @@
 		m_drive = -1;
 }
 
-uint16_t bk_state::bk_floppy_data_r()
+uint16_t bk_state::floppy_data_r()
 {
 	return 0;
 }
 
-void bk_state::bk_floppy_data_w(uint16_t data)
+void bk_state::floppy_data_w(uint16_t data)
 {
 }
+
+u32 bk_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	u16 nOfs = (m_scroll - 728) % 256;
+
+	for (u16 y = 0; y < 256; y++)
+	{
+		for (u16 x = 0; x < 32; x++)
+		{
+			u16 code = m_vram[((y+nOfs) %256)*32 + x];
+			for (u8 b = 0; b < 16; b++)
+				bitmap.pix16(y, x*16 + b) =  BIT(code, b);
+		}
+	}
+	return 0;
+}
diff -Nru mame-0.222+dfsg.1/src/mame/machine/cit101_kbd.cpp mame-0.224+dfsg.1/src/mame/machine/cit101_kbd.cpp
--- mame-0.222+dfsg.1/src/mame/machine/cit101_kbd.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/cit101_kbd.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -8,15 +8,46 @@
     a single bidirectional wire at 4800 bits per second. Unlike the
     VT100 keyboard whose layout it mimics (indicator LEDs included),
     the CIT-101 keyboard transmits standard ASCII codes for most keys,
-    and the complexity of decoding these strongly suggests that this
-    must be done by some sort of MCU. There are also a few special
-    characters with the 8th bit set, including the numeric keypad,
-    the cursor keys, the Return key and the all-important no-key code.
-
-    TODO: identify and dump MCU for low-level emulation
-    TODO: indicator LEDs
-    TODO: make repeat key do something
-    TODO: CTRL+G doesn't seem to generate a beep
+    and a MCU is used to decode the scans, generate clicks and beeps
+    and handle serial communications. The keyboard also transmits a
+    few non-ASCII codes with the most significant bit set (and
+    modifiers encoded in the next two bits):
+
+        80       (No key pressed)
+        82       Set-Up
+        83       Return (host may interpret this as CR or CR+LF)
+        84       Up
+        85       Down
+        86       Right
+        87       Left
+        88       PF1
+        89       PF2
+        8A       PF3
+        8B       PF4
+        8C       , (on numeric keypad)
+        8D       - (on numeric keypad)
+        8E       . (on numeric keypad)
+        8F       Enter (on numeric keypad)
+        90       0 (on numeric keypad)
+        91       1 (on numeric keypad)
+        92       2 (on numeric keypad)
+        93       3 (on numeric keypad)
+        94       4 (on numeric keypad)
+        95       5 (on numeric keypad)
+        96       6 (on numeric keypad)
+        97       7 (on numeric keypad)
+        98       8 (on numeric keypad)
+        99       9 (on numeric keypad)
+        9A       Home
+        9B       Break
+        9C       No Scroll
+        9D       (Keyboard ID: QWERTY layout)
+        9E       (Keyboard ID: AZERTY layout)
+        9F       (Invalid key)
+
+    Two types of host commands are processed. Commands with bit 0
+    set affect the LEDs, and commands with bit 0 clear affect the
+    beeper. Sending a command is necessary to initiate a new scan.
 
 **********************************************************************/
 
@@ -24,277 +55,339 @@
 #include "cit101_kbd.h"
 #include "speaker.h"
 
-#include "machine/keyboard.ipp"
-
 //**************************************************************************
-//  HLE KEYBOARD DEVICE
+//  LLE KEYBOARD DEVICE
 //**************************************************************************
 
-DEFINE_DEVICE_TYPE(CIT101_HLE_KEYBOARD, cit101_hle_keyboard_device, "cit101_hle_kbd", "CIT-101 HLE Keyboard")
+DEFINE_DEVICE_TYPE(CIT101_KEYBOARD, cit101_keyboard_device, "cit101_kbd", "CIT-101 Keyboard")
+DEFINE_DEVICE_TYPE(CIT101E_KEYBOARD, cit101e_keyboard_device, "cit101e_kbd", "CIT-101e Keyboard")
 
-cit101_hle_keyboard_device::cit101_hle_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
-	: device_t(mconfig, CIT101_HLE_KEYBOARD, tag, owner, clock)
-	, device_matrix_keyboard_interface(mconfig, *this, "KEYS0", "KEYS1", "KEYS2", "KEYS3")
-	, device_buffered_serial_interface(mconfig, *this)
-	, m_modifiers(*this, "MODIFIERS")
+cit101_keyboard_device::cit101_keyboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+	: device_t(mconfig, type, tag, owner, clock)
+	, m_mcu(*this, "mcu")
 	, m_beeper(*this, "beeper")
+	, m_keys(*this, "KEYS%d", 0U)
+	, m_kbid(*this, "KBID")
+	, m_leds(*this, "led%d", 0U)
 	, m_txd_callback(*this)
-	, m_command{0, 1}
+	, m_kbid_enabled(false)
 {
 }
 
-INPUT_PORTS_START(cit101_hle_keyboard)
-	PORT_START("MODIFIERS")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_SHIFT_2) PORT_CODE(KEYCODE_LCONTROL)
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_SHIFT_1) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT)
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_TOGGLE PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_CODE(KEYCODE_CAPSLOCK)
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Repeat") PORT_CODE(KEYCODE_RCONTROL)
-
-	PORT_START("KEYS0")
-	PORT_BIT(0x00000003, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x00000004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("] }") PORT_CHAR(']') PORT_CHAR('}') PORT_CHAR(0x1d) PORT_CODE(KEYCODE_CLOSEBRACE)
-	PORT_BIT(0x00000008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("\\ |") PORT_CHAR('\\') PORT_CHAR('|') PORT_CHAR(0x1c) PORT_CODE(KEYCODE_BACKSLASH)
-	PORT_BIT(0x00000010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('[') PORT_CHAR('{') PORT_CODE(KEYCODE_OPENBRACE)
-	PORT_BIT(0x00000020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Z") PORT_CHAR('z') PORT_CHAR('Z') PORT_CHAR(0x1a) PORT_CODE(KEYCODE_Z)
-	PORT_BIT(0x00000040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Y") PORT_CHAR('y') PORT_CHAR('Y') PORT_CHAR(0x19) PORT_CODE(KEYCODE_Y)
-	PORT_BIT(0x00000080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("X") PORT_CHAR('x') PORT_CHAR('X') PORT_CHAR(0x18) PORT_CODE(KEYCODE_X)
-	PORT_BIT(0x00000100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("W") PORT_CHAR('W') PORT_CHAR('W') PORT_CHAR(0x17) PORT_CODE(KEYCODE_W)
-	PORT_BIT(0x00000200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("V") PORT_CHAR('v') PORT_CHAR('V') PORT_CHAR(0x16) PORT_CODE(KEYCODE_V)
-	PORT_BIT(0x00000400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("U") PORT_CHAR('u') PORT_CHAR('U') PORT_CHAR(0x15) PORT_CODE(KEYCODE_U)
-	PORT_BIT(0x00000800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("T") PORT_CHAR('t') PORT_CHAR('T') PORT_CHAR(0x14) PORT_CODE(KEYCODE_T)
-	PORT_BIT(0x00001000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("S") PORT_CHAR('s') PORT_CHAR('S') PORT_CHAR(0x13) PORT_CODE(KEYCODE_S)
-	PORT_BIT(0x00002000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("R") PORT_CHAR('r') PORT_CHAR('R') PORT_CHAR(0x12) PORT_CODE(KEYCODE_R)
-	PORT_BIT(0x00004000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Q") PORT_CHAR('q') PORT_CHAR('Q') PORT_CHAR(0x11) PORT_CODE(KEYCODE_Q)
-	PORT_BIT(0x00008000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("P") PORT_CHAR('p') PORT_CHAR('P') PORT_CHAR(0x10) PORT_CODE(KEYCODE_P)
-	PORT_BIT(0x00010000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("O") PORT_CHAR('o') PORT_CHAR('O') PORT_CHAR(0x0f) PORT_CODE(KEYCODE_O)
-	PORT_BIT(0x00020000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("N") PORT_CHAR('n') PORT_CHAR('N') PORT_CHAR(0x0e) PORT_CODE(KEYCODE_N)
-	PORT_BIT(0x00040000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("M") PORT_CHAR('m') PORT_CHAR('M') PORT_CODE(KEYCODE_M)
-	PORT_BIT(0x00080000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("L") PORT_CHAR('l') PORT_CHAR('L') PORT_CHAR(0x0c) PORT_CODE(KEYCODE_L)
-	PORT_BIT(0x00100000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("K") PORT_CHAR('k') PORT_CHAR('K') PORT_CHAR(0x0b) PORT_CODE(KEYCODE_K)
-	PORT_BIT(0x00200000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("J") PORT_CHAR('j') PORT_CHAR('J') PORT_CODE(KEYCODE_J)
-	PORT_BIT(0x00400000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("I") PORT_CHAR('i') PORT_CHAR('I') PORT_CODE(KEYCODE_I)
-	PORT_BIT(0x00800000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("H") PORT_CHAR('h') PORT_CHAR('H') PORT_CODE(KEYCODE_H)
-	PORT_BIT(0x01000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("G (Bell)") PORT_CHAR('g') PORT_CHAR('G') PORT_CHAR(0x07) PORT_CODE(KEYCODE_G)
-	PORT_BIT(0x02000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("F") PORT_CHAR('f') PORT_CHAR('F') PORT_CHAR(0x06) PORT_CODE(KEYCODE_F)
-	PORT_BIT(0x04000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("E") PORT_CHAR('e') PORT_CHAR('E') PORT_CHAR(0x05) PORT_CODE(KEYCODE_E)
-	PORT_BIT(0x08000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("D") PORT_CHAR('d') PORT_CHAR('D') PORT_CHAR(0x04) PORT_CODE(KEYCODE_D)
-	PORT_BIT(0x10000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("C") PORT_CHAR('c') PORT_CHAR('C') PORT_CHAR(0x03) PORT_CODE(KEYCODE_C)
-	PORT_BIT(0x20000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("B") PORT_CHAR('b') PORT_CHAR('B') PORT_CHAR(0x02) PORT_CODE(KEYCODE_B)
-	PORT_BIT(0x40000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("A") PORT_CHAR('a') PORT_CHAR('A') PORT_CHAR(0x01) PORT_CODE(KEYCODE_A)
-	PORT_BIT(0x80000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("` ~") PORT_CHAR('`') PORT_CHAR('~') PORT_CHAR(0x1e) PORT_CODE(KEYCODE_TILDE)
-
-	PORT_START("KEYS1")
-	PORT_BIT(0x00000003, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x00000004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('=') PORT_CHAR('+') PORT_CODE(KEYCODE_EQUALS)
-	PORT_BIT(0x00000008, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x00000010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(';') PORT_CHAR(':') PORT_CODE(KEYCODE_COLON)
-	PORT_BIT(0x00000020, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x00000040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('9') PORT_CHAR('(') PORT_CODE(KEYCODE_9)
-	PORT_BIT(0x00000080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('8') PORT_CHAR('*') PORT_CODE(KEYCODE_8)
-	PORT_BIT(0x00000100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('7') PORT_CHAR('&') PORT_CODE(KEYCODE_7)
-	PORT_BIT(0x00000200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('6') PORT_CHAR('^') PORT_CODE(KEYCODE_6)
-	PORT_BIT(0x00000400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('5') PORT_CHAR('%') PORT_CODE(KEYCODE_5)
-	PORT_BIT(0x00000800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('4') PORT_CHAR('$') PORT_CODE(KEYCODE_4)
-	PORT_BIT(0x00001000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("3 # \xc2\xa3") PORT_CHAR('3') PORT_CHAR('#', 0xa3) PORT_CODE(KEYCODE_3)
-	PORT_BIT(0x00002000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('2') PORT_CHAR('@') PORT_CODE(KEYCODE_2)
-	PORT_BIT(0x00004000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('1') PORT_CHAR('!') PORT_CODE(KEYCODE_1)
-	PORT_BIT(0x00008000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('0') PORT_CHAR(')') PORT_CODE(KEYCODE_0)
-	PORT_BIT(0x00010000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("/ ?") PORT_CHAR('/') PORT_CHAR('?') PORT_CHAR(0x1f) PORT_CODE(KEYCODE_SLASH)
-	PORT_BIT(0x00020000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('.') PORT_CHAR('>') PORT_CODE(KEYCODE_STOP)
-	PORT_BIT(0x00040000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('-') PORT_CHAR('_') PORT_CODE(KEYCODE_MINUS)
-	PORT_BIT(0x00080000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(',') PORT_CHAR('<') PORT_CODE(KEYCODE_COMMA)
-	PORT_BIT(0x00f00000, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x01000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR('\'') PORT_CHAR('"') PORT_CODE(KEYCODE_QUOTE)
-	PORT_BIT(0x7e000000, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(' ') PORT_CODE(KEYCODE_SPACE)
-
-	PORT_START("KEYS2")
-	PORT_BIT(0x00000001, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Delete") PORT_CHAR(0x7f) PORT_CODE(KEYCODE_DEL)
-	PORT_BIT(0x0000000e, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x00000010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(0x1b) PORT_CODE(KEYCODE_ESC)
-	PORT_BIT(0x001fffe0, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x00200000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Line Feed") PORT_CHAR(0x0a) PORT_CODE(KEYCODE_RALT)
-	PORT_BIT(0x00400000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(0x09) PORT_CODE(KEYCODE_TAB)
-	PORT_BIT(0x00800000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Back Space") PORT_CHAR(0x08) PORT_CODE(KEYCODE_BACKSPACE)
-	PORT_BIT(0xff000000, IP_ACTIVE_HIGH, IPT_UNUSED)
-
-	PORT_START("KEYS3")
-	PORT_BIT(0x00000001, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x00000002, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Test Key 2")
-	PORT_BIT(0x00000004, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Test Key 1")
-	PORT_BIT(0x00000008, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("No Scroll") PORT_CHAR(UCHAR_MAMEKEY(SCRLOCK)) PORT_CODE(KEYCODE_LALT)
-	PORT_BIT(0x00000010, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Break") PORT_CHAR(UCHAR_MAMEKEY(PAUSE)) PORT_CODE(KEYCODE_END)
-	PORT_BIT(0x00000020, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Clr Home") PORT_CHAR(UCHAR_MAMEKEY(HOME)) PORT_CODE(KEYCODE_HOME)
-	PORT_BIT(0x00000040, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) PORT_CODE(KEYCODE_9_PAD)
-	PORT_BIT(0x00000080, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) PORT_CODE(KEYCODE_8_PAD)
-	PORT_BIT(0x00000100, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD)) PORT_CODE(KEYCODE_7_PAD)
-	PORT_BIT(0x00000200, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(6_PAD)) PORT_CODE(KEYCODE_6_PAD)
-	PORT_BIT(0x00000400, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(5_PAD)) PORT_CODE(KEYCODE_5_PAD)
-	PORT_BIT(0x00000800, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(4_PAD)) PORT_CODE(KEYCODE_4_PAD)
-	PORT_BIT(0x00001000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(3_PAD)) PORT_CODE(KEYCODE_3_PAD)
-	PORT_BIT(0x00002000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(2_PAD)) PORT_CODE(KEYCODE_2_PAD)
-	PORT_BIT(0x00004000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(1_PAD)) PORT_CODE(KEYCODE_1_PAD)
-	PORT_BIT(0x00008000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(0_PAD)) PORT_CODE(KEYCODE_0_PAD)
-	PORT_BIT(0x00010000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD)) PORT_CODE(KEYCODE_ENTER_PAD)
-	PORT_BIT(0x00020000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD)) PORT_CODE(KEYCODE_DEL_PAD)
-	PORT_BIT(0x00040000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) PORT_CODE(KEYCODE_MINUS_PAD)
-	PORT_BIT(0x00080000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(COMMA_PAD)) PORT_CODE(KEYCODE_PLUS_PAD)
-	PORT_BIT(0x00100000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("PF4") PORT_CHAR(UCHAR_MAMEKEY(F4)) PORT_CODE(KEYCODE_F4)
-	PORT_BIT(0x00200000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("PF3") PORT_CHAR(UCHAR_MAMEKEY(F3)) PORT_CODE(KEYCODE_F3)
-	PORT_BIT(0x00400000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("PF2") PORT_CHAR(UCHAR_MAMEKEY(F2)) PORT_CODE(KEYCODE_F2)
-	PORT_BIT(0x00800000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("PF1") PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_CODE(KEYCODE_F1)
-	PORT_BIT(0x01000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_CODE(KEYCODE_LEFT)
-	PORT_BIT(0x02000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CODE(KEYCODE_RIGHT)
-	PORT_BIT(0x04000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CODE(KEYCODE_DOWN)
-	PORT_BIT(0x08000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(UP)) PORT_CODE(KEYCODE_UP)
-	PORT_BIT(0x10000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Return") PORT_CHAR(0x0d) PORT_CODE(KEYCODE_ENTER)
-	PORT_BIT(0x20000000, IP_ACTIVE_HIGH, IPT_KEYBOARD) PORT_NAME("Set-Up") PORT_CHAR(UCHAR_MAMEKEY(F5)) PORT_CODE(KEYCODE_F5)
-	PORT_BIT(0x40000000, IP_ACTIVE_HIGH, IPT_UNUSED)
-	PORT_BIT(0x80000000, IP_ACTIVE_HIGH, IPT_UNUSED) // actually used for special stop code
-INPUT_PORTS_END
-
-void cit101_hle_keyboard_device::device_add_mconfig(machine_config &config)
+cit101_keyboard_device::cit101_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cit101_keyboard_device(mconfig, CIT101_KEYBOARD, tag, owner, clock)
 {
-	SPEAKER(config, "mono").front_center();
-	BEEP(config, m_beeper, 786).add_route(ALL_OUTPUTS, "mono", 0.50);
 }
 
-ioport_constructor cit101_hle_keyboard_device::device_input_ports() const
+cit101e_keyboard_device::cit101e_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+	: cit101_keyboard_device(mconfig, CIT101E_KEYBOARD, tag, owner, clock)
 {
-	return INPUT_PORTS_NAME(cit101_hle_keyboard);
 }
 
-void cit101_hle_keyboard_device::device_resolve_objects()
+void cit101_keyboard_device::device_resolve_objects()
 {
 	m_txd_callback.resolve_safe();
+	m_leds.resolve();
 }
 
-void cit101_hle_keyboard_device::device_start()
+void cit101_keyboard_device::device_start()
 {
-	// keyboard USART configured for mode 8Eh
-	set_data_frame(1, 8, PARITY_NONE, STOP_BITS_1_5);
-	set_rate(4800);
-
-	save_item(NAME(m_command));
+	save_item(NAME(m_kbid_enabled));
 }
 
-void cit101_hle_keyboard_device::device_reset()
+WRITE_LINE_MEMBER(cit101_keyboard_device::write_rxd)
 {
-	stop_processing();
+	m_mcu->set_input_line(MCS48_INPUT_IRQ, state ? CLEAR_LINE : ASSERT_LINE);
 }
 
-void cit101_hle_keyboard_device::tra_callback()
+
+void cit101_keyboard_device::p2_w(u8 data)
 {
-	m_txd_callback(transmit_register_get_data_bit());
+	m_txd_callback(!BIT(data, 7));
+	m_beeper->set_state(BIT(data, 5)); // Bit 6 also involved?
 }
 
-WRITE_LINE_MEMBER(cit101_hle_keyboard_device::write_rxd)
+void cit101_keyboard_device::leds_w(u8 data)
 {
-	rx_w(state);
+	m_kbid_enabled = !BIT(data, 0);
+
+	// Bit 7 = ON LINE
+	// Bit 6 = OFF LINE
+	// Bit 5 = KBD LOCKED
+	// Bit 4 = L1
+	// Bit 3 = L2
+	// Bit 2 = L3
+	// Bit 1 = L4
+	for (int i = 0; i < 7; i++)
+		m_leds[i] = !BIT(data, 7 - i);
 }
 
-void cit101_hle_keyboard_device::received_byte(u8 byte)
+u8 cit101_keyboard_device::keys_r()
 {
-	if (m_command[BIT(byte, 0)] != byte)
-	{
-		logerror("Command byte %d = %02X\n", BIT(byte, 0), byte);
+	u16 strobes = m_mcu->p1_r() | u16(m_mcu->p2_r() & 0x07) << 8;
+	u8 ret = 0xff;
 
-		// probably not correct
-		if (!BIT(byte, 0))
-			m_beeper->set_state(BIT(byte, 2));
+	for (int n = 0; n < 11; n++)
+		if (!BIT(strobes, 10 - n))
+			ret &= m_keys[n]->read();
 
-		m_command[BIT(byte, 0)] = byte;
-	}
+	if (m_kbid_enabled)
+		ret &= m_kbid->read();
 
-	start_processing(attotime::from_hz(76800)); // guess
+	return ret;
 }
 
-void cit101_hle_keyboard_device::send_key(u8 code)
+void cit101_keyboard_device::prog_map(address_map &map)
 {
-	transmit_byte(code);
+	map(0x000, 0x7ff).rom().region("program", 0);
 }
 
-void cit101_hle_keyboard_device::send_translated(u8 row, u8 column)
+void cit101_keyboard_device::ext_map(address_map &map)
+{
+	map(0x00, 0x00).mirror(0xff).w(FUNC(cit101_keyboard_device::leds_w));
+}
+
+
+INPUT_PORTS_START(cit101_common_keys)
+	PORT_START("SHIFT")
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_TOGGLE PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK)) PORT_CODE(KEYCODE_CAPSLOCK)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_SHIFT_1) PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT)
+	PORT_BIT(0xe7, IP_ACTIVE_LOW, IPT_UNUSED)
+
+	PORT_START("MODIFIERS")
+	PORT_BIT(1, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Rept") PORT_CODE(KEYCODE_RCONTROL)
+	PORT_BIT(2, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Ctrl") PORT_CHAR(UCHAR_SHIFT_2) PORT_CODE(KEYCODE_LCONTROL)
+
+	PORT_START("KEYS0")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("PF3") PORT_CHAR(UCHAR_MAMEKEY(F3)) PORT_CODE(KEYCODE_F3)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("PF4") PORT_CHAR(UCHAR_MAMEKEY(F4)) PORT_CODE(KEYCODE_F4)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(9_PAD)) PORT_CODE(KEYCODE_9_PAD)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) PORT_CODE(KEYCODE_MINUS_PAD)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(6_PAD)) PORT_CODE(KEYCODE_6_PAD)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(COMMA_PAD)) PORT_CODE(KEYCODE_PLUS_PAD)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(3_PAD)) PORT_CODE(KEYCODE_3_PAD)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD)) PORT_CODE(KEYCODE_ENTER_PAD)
+
+	PORT_START("KEYS1")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("PF1") PORT_CHAR(UCHAR_MAMEKEY(F1)) PORT_CODE(KEYCODE_F1)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("PF2") PORT_CHAR(UCHAR_MAMEKEY(F2)) PORT_CODE(KEYCODE_F2)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(7_PAD)) PORT_CODE(KEYCODE_7_PAD)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(8_PAD)) PORT_CODE(KEYCODE_8_PAD)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(4_PAD)) PORT_CODE(KEYCODE_4_PAD)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(5_PAD)) PORT_CODE(KEYCODE_5_PAD)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(1_PAD)) PORT_CODE(KEYCODE_1_PAD)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(2_PAD)) PORT_CODE(KEYCODE_2_PAD)
+
+	PORT_START("KEYS2")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Home  Clr") PORT_CHAR(UCHAR_MAMEKEY(HOME)) PORT_CODE(KEYCODE_HOME)
+	PORT_BIT(0x3e, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(0_PAD)) PORT_CODE(KEYCODE_0_PAD)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD)) PORT_CODE(KEYCODE_DEL_PAD)
+
+	PORT_START("KEYS3")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(LEFT)) PORT_CODE(KEYCODE_LEFT)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(RIGHT)) PORT_CODE(KEYCODE_RIGHT)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("`  ~") PORT_CHAR('`') PORT_CHAR('~') PORT_CHAR(0x1e) PORT_CODE(KEYCODE_TILDE)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Break") PORT_CHAR(UCHAR_MAMEKEY(PAUSE)) PORT_CODE(KEYCODE_END)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Back Space") PORT_CHAR(0x08) PORT_CODE(KEYCODE_BACKSPACE)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Delete") PORT_CHAR(UCHAR_MAMEKEY(DEL)) PORT_CODE(KEYCODE_DEL)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Line Feed") PORT_CHAR(0x0a) PORT_CODE(KEYCODE_RALT)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("\\  |") PORT_CHAR('\\') PORT_CHAR('|') PORT_CHAR(0x1c) PORT_CODE(KEYCODE_BACKSLASH)
+
+	PORT_START("KEYS4")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(UP)) PORT_CODE(KEYCODE_UP)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(UCHAR_MAMEKEY(DOWN)) PORT_CODE(KEYCODE_DOWN)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('-') PORT_CHAR('_') PORT_CODE(KEYCODE_MINUS)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('=') PORT_CHAR('+') PORT_CODE(KEYCODE_EQUALS)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('[') PORT_CHAR('{') PORT_CODE(KEYCODE_OPENBRACE)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("]  }") PORT_CHAR(']') PORT_CHAR('}') PORT_CHAR(0x1d) PORT_CODE(KEYCODE_CLOSEBRACE)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('\'') PORT_CHAR('"') PORT_CODE(KEYCODE_QUOTE)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Return") PORT_CHAR(0x0d) PORT_CODE(KEYCODE_ENTER)
+
+	PORT_START("KEYS5")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('9') PORT_CHAR('(') PORT_CODE(KEYCODE_9)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('0') PORT_CHAR(')') PORT_CODE(KEYCODE_0)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("O") PORT_CHAR('o') PORT_CHAR('O') PORT_CHAR(0x0f) PORT_CODE(KEYCODE_O)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("P") PORT_CHAR('p') PORT_CHAR('P') PORT_CHAR(0x10) PORT_CODE(KEYCODE_P)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("L") PORT_CHAR('l') PORT_CHAR('L') PORT_CHAR(0x0c) PORT_CODE(KEYCODE_L)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(';') PORT_CHAR(':') PORT_CODE(KEYCODE_COLON)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('.') PORT_CHAR('>') PORT_CODE(KEYCODE_STOP)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("/  ?") PORT_CHAR('/') PORT_CHAR('?') PORT_CHAR(0x1f) PORT_CODE(KEYCODE_SLASH)
+
+	PORT_START("KEYS6")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('7') PORT_CHAR('&') PORT_CODE(KEYCODE_7)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('8') PORT_CHAR('*') PORT_CODE(KEYCODE_8)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("U") PORT_CHAR('u') PORT_CHAR('U') PORT_CHAR(0x15) PORT_CODE(KEYCODE_U)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("I") PORT_CHAR('i') PORT_CHAR('I') PORT_CODE(KEYCODE_I)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("J") PORT_CHAR('j') PORT_CHAR('J') PORT_CODE(KEYCODE_J)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("K") PORT_CHAR('k') PORT_CHAR('K') PORT_CHAR(0x0b) PORT_CODE(KEYCODE_K)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("M") PORT_CHAR('m') PORT_CHAR('M') PORT_CODE(KEYCODE_M)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(',') PORT_CHAR('<') PORT_CODE(KEYCODE_COMMA)
+
+	PORT_START("KEYS7")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('5') PORT_CHAR('%') PORT_CODE(KEYCODE_5)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('6') PORT_CHAR('^') PORT_CODE(KEYCODE_6)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("T") PORT_CHAR('t') PORT_CHAR('T') PORT_CHAR(0x14) PORT_CODE(KEYCODE_T)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Y") PORT_CHAR('y') PORT_CHAR('Y') PORT_CHAR(0x19) PORT_CODE(KEYCODE_Y)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("G (Bell)") PORT_CHAR('g') PORT_CHAR('G') PORT_CHAR(0x07) PORT_CODE(KEYCODE_G)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("H") PORT_CHAR('h') PORT_CHAR('H') PORT_CODE(KEYCODE_H)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("B") PORT_CHAR('b') PORT_CHAR('B') PORT_CHAR(0x02) PORT_CODE(KEYCODE_B)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("N") PORT_CHAR('n') PORT_CHAR('N') PORT_CHAR(0x0e) PORT_CODE(KEYCODE_N)
+
+	PORT_START("KEYS8")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("3  # \xc2\xa3") PORT_CHAR('3') PORT_CHAR('#', 0xa3) PORT_CODE(KEYCODE_3)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('4') PORT_CHAR('$') PORT_CODE(KEYCODE_4)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("E") PORT_CHAR('e') PORT_CHAR('E') PORT_CHAR(0x05) PORT_CODE(KEYCODE_E)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("R") PORT_CHAR('r') PORT_CHAR('R') PORT_CHAR(0x12) PORT_CODE(KEYCODE_R)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("D") PORT_CHAR('d') PORT_CHAR('D') PORT_CHAR(0x04) PORT_CODE(KEYCODE_D)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F") PORT_CHAR('f') PORT_CHAR('F') PORT_CHAR(0x06) PORT_CODE(KEYCODE_F)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("C") PORT_CHAR('c') PORT_CHAR('C') PORT_CHAR(0x03) PORT_CODE(KEYCODE_C)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("V") PORT_CHAR('v') PORT_CHAR('V') PORT_CHAR(0x16) PORT_CODE(KEYCODE_V)
+
+	PORT_START("KEYS9")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('1') PORT_CHAR('!') PORT_CODE(KEYCODE_1)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('2') PORT_CHAR('@') PORT_CODE(KEYCODE_2)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q") PORT_CHAR('q') PORT_CHAR('Q') PORT_CHAR(0x11) PORT_CODE(KEYCODE_Q)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W") PORT_CHAR('w') PORT_CHAR('W') PORT_CHAR(0x17) PORT_CODE(KEYCODE_W)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A") PORT_CHAR('a') PORT_CHAR('A') PORT_CHAR(0x01) PORT_CODE(KEYCODE_A)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("S") PORT_CHAR('s') PORT_CHAR('S') PORT_CHAR(0x13) PORT_CODE(KEYCODE_S)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z") PORT_CHAR('z') PORT_CHAR('Z') PORT_CHAR(0x1a) PORT_CODE(KEYCODE_Z)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("X") PORT_CHAR('x') PORT_CHAR('X') PORT_CHAR(0x18) PORT_CODE(KEYCODE_X)
+
+	PORT_START("KEYS10")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Set-Up") PORT_CHAR(UCHAR_MAMEKEY(F5)) PORT_CODE(KEYCODE_F5)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(0x1b) PORT_CODE(KEYCODE_ESC)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(0x09) PORT_CODE(KEYCODE_TAB)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_UNUSED)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("No Scroll") PORT_CHAR(UCHAR_MAMEKEY(SCRLOCK)) PORT_CODE(KEYCODE_LALT)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(' ') PORT_CODE(KEYCODE_SPACE)
+INPUT_PORTS_END
+
+INPUT_PORTS_START(cit101_keyboard)
+	PORT_INCLUDE(cit101_common_keys)
+
+	PORT_MODIFY("KEYS3")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("`  ~") PORT_CHAR('`') PORT_CHAR('~') PORT_CHAR(0x1e) PORT_CODE(KEYCODE_TILDE) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('<') PORT_CHAR('>') PORT_CODE(KEYCODE_TILDE) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("\\  |") PORT_CHAR('\\') PORT_CHAR('|') PORT_CHAR(0x1c) PORT_CODE(KEYCODE_BACKSLASH) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("`  # \xc2\xa3") PORT_CHAR('`') PORT_CHAR('#', 0xa3) PORT_CODE(KEYCODE_BACKSLASH) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+
+	PORT_MODIFY("KEYS4")
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('-') PORT_CHAR('_') PORT_CODE(KEYCODE_MINUS) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('\'') PORT_CHAR('?') PORT_CODE(KEYCODE_MINUS) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('=') PORT_CHAR('+') PORT_CODE(KEYCODE_EQUALS) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('^') PORT_CHAR('~') PORT_CODE(KEYCODE_EQUALS) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('[') PORT_CHAR('{') PORT_CODE(KEYCODE_OPENBRACE) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('@') PORT_CHAR('\\') PORT_CODE(KEYCODE_OPENBRACE) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("]  }") PORT_CHAR(']') PORT_CHAR('}') PORT_CHAR(0x1d) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('&') PORT_CHAR('*') PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('\'') PORT_CHAR('"') PORT_CODE(KEYCODE_QUOTE) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('|') PORT_CHAR('[') PORT_CODE(KEYCODE_QUOTE) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+
+	PORT_MODIFY("KEYS5")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('9') PORT_CHAR('(') PORT_CODE(KEYCODE_9) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('9') PORT_CHAR(')') PORT_CODE(KEYCODE_9) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('0') PORT_CHAR(')') PORT_CODE(KEYCODE_0) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('0') PORT_CHAR('=') PORT_CODE(KEYCODE_0) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(';') PORT_CHAR(':') PORT_CODE(KEYCODE_COLON) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x20, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('{') PORT_CHAR('}') PORT_CODE(KEYCODE_COLON) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('.') PORT_CHAR('>') PORT_CODE(KEYCODE_STOP) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('.') PORT_CHAR(':') PORT_CODE(KEYCODE_STOP) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('/') PORT_CHAR('?') PORT_CODE(KEYCODE_SLASH) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('-') PORT_CHAR('_') PORT_CODE(KEYCODE_SLASH) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+
+	PORT_MODIFY("KEYS6")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('7') PORT_CHAR('&') PORT_CODE(KEYCODE_7) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('7') PORT_CHAR('/') PORT_CODE(KEYCODE_7) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('8') PORT_CHAR('*') PORT_CODE(KEYCODE_8) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('8') PORT_CHAR('(') PORT_CODE(KEYCODE_8) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(',') PORT_CHAR('<') PORT_CODE(KEYCODE_COMMA) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR(',') PORT_CHAR(';') PORT_CODE(KEYCODE_COMMA) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+
+	PORT_MODIFY("KEYS7")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('6') PORT_CHAR('^') PORT_CODE(KEYCODE_6) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('6') PORT_CHAR('+') PORT_CODE(KEYCODE_6) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+
+	PORT_MODIFY("KEYS8")
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("3  # \xc2\xa3") PORT_CHAR('3') PORT_CHAR('#', 0xa3) PORT_CODE(KEYCODE_3) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x01, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('3') PORT_CHAR(']') PORT_CODE(KEYCODE_3) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+
+	PORT_MODIFY("KEYS9")
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('2') PORT_CHAR('@') PORT_CODE(KEYCODE_2) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x02, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CHAR('2') PORT_CHAR('"') PORT_CODE(KEYCODE_2) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q") PORT_CHAR('q') PORT_CHAR('Q') PORT_CHAR(0x11) PORT_CODE(KEYCODE_Q) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x04, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A") PORT_CHAR('a') PORT_CHAR('A') PORT_CHAR(0x01) PORT_CODE(KEYCODE_Q) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W") PORT_CHAR('w') PORT_CHAR('W') PORT_CHAR(0x17) PORT_CODE(KEYCODE_W) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x08, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z") PORT_CHAR('z') PORT_CHAR('Z') PORT_CHAR(0x1a) PORT_CODE(KEYCODE_W) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("A") PORT_CHAR('a') PORT_CHAR('A') PORT_CHAR(0x01) PORT_CODE(KEYCODE_A) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x10, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Q") PORT_CHAR('q') PORT_CHAR('Q') PORT_CHAR(0x11) PORT_CODE(KEYCODE_A) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Z") PORT_CHAR('z') PORT_CHAR('Z') PORT_CHAR(0x1a) PORT_CODE(KEYCODE_Z) PORT_CONDITION("KBID", 0x01, EQUALS, 0x01)
+	PORT_BIT(0x40, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("W") PORT_CHAR('w') PORT_CHAR('W') PORT_CHAR(0x17) PORT_CODE(KEYCODE_Z) PORT_CONDITION("KBID", 0x01, EQUALS, 0x00)
+
+	PORT_START("KBID")
+	PORT_CONFNAME(0x01, 0x01, "Keyboard Layout")
+	PORT_CONFSETTING(0x01, "QWERTY")
+	PORT_CONFSETTING(0x00, "AZERTY")
+	PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED)
+INPUT_PORTS_END
+
+INPUT_PORTS_START(cit101e_keyboard)
+	PORT_INCLUDE(cit101_common_keys)
+
+	PORT_MODIFY("KEYS0")
+	PORT_BIT(0x80, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Keypad Enter  Print") PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD)) PORT_CODE(KEYCODE_ENTER_PAD)
+
+	PORT_START("KBID")
+	PORT_CONFNAME(0x01, 0x01, "Shift+Tab Code")
+	PORT_CONFSETTING(0x01, "FS")
+	PORT_CONFSETTING(0x00, "HT")
+	PORT_BIT(0xfe, IP_ACTIVE_LOW, IPT_UNUSED)
+INPUT_PORTS_END
+
+ioport_constructor cit101_keyboard_device::device_input_ports() const
 {
-	const ioport_value modifiers = m_modifiers->read();
+	return INPUT_PORTS_NAME(cit101_keyboard);
+}
 
-	logerror("Key row %d column %d\n", row, column);
-	switch (row)
-	{
-	case 0:
-		if (column < 5)
-			send_key((BIT(modifiers, 0) ? 0x1f : BIT(modifiers, 1) ? 0x7f : 0x5f) - column);
-		else if (column < 31)
-			send_key((BIT(modifiers, 0) ? 0x1f : BIT(modifiers, 1) || BIT(modifiers, 2) ? 0x5f : 0x7f) - column);
-		else
-			send_key(BIT(modifiers, 0) ? 0x1e : BIT(modifiers, 1) ? '~' : 0x7f - column);
-		break;
-	case 1:
-		if (BIT(modifiers, 0) && column == 16)
-			send_key(0x2f - column);
-		else if (!BIT(modifiers, 1) || column == 31)
-			send_key((column == 31 && BIT(modifiers, 0) ? 0x1f : 0x3f) - column);
-		else switch (0x3f - column)
-		{
-		case '=':
-			send_key('+');
-			break;
-		case ';':
-			send_key(':');
-			break;
-		case '9':
-			send_key('(');
-			break;
-		case '8':
-			send_key('*');
-			break;
-		case '7':
-			send_key('&');
-			break;
-		case '6':
-			send_key('^');
-			break;
-		case '2':
-			send_key('@');
-			break;
-		case '0':
-			send_key(')');
-			break;
-		case '-':
-			send_key('_');
-			break;
-		case '\'':
-			send_key('"');
-			break;
-		default:
-			send_key(0x2f ^ column);
-			break;
-		}
-		break;
-	case 2:
-		send_key((column == 0) ? 0x7f : 0x1f - column);
-		break;
-	case 3:
-		send_key((0x9f - column) | (BIT(modifiers, 0) ? 0x40 : 0) | (BIT(modifiers, 1) ? 0x20 : 0));
-		break;
-	}
+ioport_constructor cit101e_keyboard_device::device_input_ports() const
+{
+	return INPUT_PORTS_NAME(cit101e_keyboard);
 }
 
-void cit101_hle_keyboard_device::key_make(u8 row, u8 column)
+void cit101_keyboard_device::device_add_mconfig(machine_config &config)
 {
-	send_translated(row, column);
+	I8035(config, m_mcu, 2.376_MHz_XTAL); // TMP8048P in EA mode (location marked "8048/8035/8748" on original keyboard)
+	m_mcu->set_addrmap(AS_PROGRAM, &cit101_keyboard_device::prog_map);
+	m_mcu->set_addrmap(AS_IO, &cit101_keyboard_device::ext_map);
+	m_mcu->bus_in_cb().set(FUNC(cit101_keyboard_device::keys_r));
+	m_mcu->p2_in_cb().set_ioport("SHIFT");
+	m_mcu->p2_out_cb().set(FUNC(cit101_keyboard_device::p2_w));
+	m_mcu->t0_in_cb().set_ioport("MODIFIERS").bit(0);
+	m_mcu->t1_in_cb().set_ioport("MODIFIERS").bit(1);
+
+	SPEAKER(config, "mono").front_center();
+	BEEP(config, m_beeper, 786).add_route(ALL_OUTPUTS, "mono", 0.5); // unknown frequency (original keyboard has a NE555)
 }
 
-void cit101_hle_keyboard_device::key_repeat(u8 row, u8 column)
+
+ROM_START(cit101_kbd)
+	ROM_REGION(0x800, "program", 0)
+	ROM_LOAD("pkb00.ic4", 0x000, 0x800, CRC(f93f9ce1) SHA1(50fe6b5448f8ec330fa09e8b0125b5b09c680859)) // 1st and 2nd halves identical
+ROM_END
+
+ROM_START(cit101e_kbd)
+	ROM_REGION(0x1000, "program", 0)
+	ROM_LOAD("101e-v12b_kbd_rom.ic4", 0x0000, 0x1000, CRC(b9eeac40) SHA1(1bbbe0d422f87c856a10de5a1492297958ff47f6)) // 1st and 2nd halves identical
+ROM_END
+
+const tiny_rom_entry *cit101_keyboard_device::device_rom_region() const
 {
-	send_translated(row, column);
+	return ROM_NAME(cit101_kbd);
 }
 
-void cit101_hle_keyboard_device::scan_complete()
+const tiny_rom_entry *cit101e_keyboard_device::device_rom_region() const
 {
-	if (are_all_keys_up())
-	{
-		send_key(0x80);
-		stop_processing();
-	}
+	return ROM_NAME(cit101e_kbd);
 }
diff -Nru mame-0.222+dfsg.1/src/mame/machine/cit101_kbd.h mame-0.224+dfsg.1/src/mame/machine/cit101_kbd.h
--- mame-0.222+dfsg.1/src/mame/machine/cit101_kbd.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/cit101_kbd.h	2020-08-26 08:57:19.000000000 +0000
@@ -11,55 +11,80 @@
 
 #pragma once
 
-#include "machine/keyboard.h"
+#include "cpu/mcs48/mcs48.h"
 #include "sound/beep.h"
-#include "diserial.h"
 
 
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
 
-// ======================> cit101_hle_keyboard_device
+// ======================> cit101_keyboard_device
 
-class cit101_hle_keyboard_device : public device_t, public device_matrix_keyboard_interface<4U>, public device_buffered_serial_interface<16U>
+class cit101_keyboard_device : public device_t
 {
 public:
-	// construction/destruction
-	cit101_hle_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
+	// device type constructor
+	cit101_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
 
-	// configuration
+	static constexpr feature_type imperfect_features() { return feature::SOUND; }
+
+	// callback configuration
 	auto txd_callback() { return m_txd_callback.bind(); }
 
+	// serial line input
 	DECLARE_WRITE_LINE_MEMBER(write_rxd);
 
 protected:
-	// device_t overrides
-	virtual void device_add_mconfig(machine_config &config) override;
-	virtual ioport_constructor device_input_ports() const override;
+	cit101_keyboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+
+	// device-level overrides
 	virtual void device_resolve_objects() override;
 	virtual void device_start() override;
-	virtual void device_reset() override;
-
-	// device_buffered_serial_interface overrides
-	virtual void tra_callback() override;
-	virtual void received_byte(u8 byte) override;
-
-	// device_matrix_keyboard_interface overrides
-	virtual void key_make(u8 row, u8 column) override;
-	virtual void key_repeat(u8 row, u8 column) override;
-	virtual void scan_complete() override;
+	virtual ioport_constructor device_input_ports() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
 
-	void send_translated(u8 row, u8 column);
-	void send_key(u8 code);
 private:
-	required_ioport m_modifiers;
+	// MCU handlers
+	void p2_w(u8 data);
+	void leds_w(u8 data);
+	u8 keys_r();
+
+	// address maps
+	void prog_map(address_map &map);
+	void ext_map(address_map &map);
+
+	// object finders
+	required_device<mcs48_cpu_device> m_mcu;
 	required_device<beep_device> m_beeper;
+	required_ioport_array<11> m_keys;
+	required_ioport m_kbid;
+	output_finder<7> m_leds;
+
+	// output callback
 	devcb_write_line m_txd_callback;
-	u8 m_command[2];
+
+	// internal state
+	bool m_kbid_enabled;
+};
+
+// ======================> cit101e_keyboard_device
+
+class cit101e_keyboard_device : public cit101_keyboard_device
+{
+public:
+	// device type constructor
+	cit101e_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
+
+protected:
+	// device-level overrides
+	virtual ioport_constructor device_input_ports() const override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
-// device type definition
-DECLARE_DEVICE_TYPE(CIT101_HLE_KEYBOARD, cit101_hle_keyboard_device)
+// device type declarations
+DECLARE_DEVICE_TYPE(CIT101_KEYBOARD, cit101_keyboard_device)
+DECLARE_DEVICE_TYPE(CIT101E_KEYBOARD, cit101e_keyboard_device)
 
 #endif
diff -Nru mame-0.222+dfsg.1/src/mame/machine/cmi_mkbd.cpp mame-0.224+dfsg.1/src/mame/machine/cmi_mkbd.cpp
--- mame-0.222+dfsg.1/src/mame/machine/cmi_mkbd.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/cmi_mkbd.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -56,6 +56,7 @@
 	, m_dp3(*this, "dp3")
 	, m_keypad_a_port(*this, "KEYPAD_A")
 	, m_keypad_b_port(*this, "KEYPAD_B")
+	, m_analog(*this, "ANALOG")
 	, m_key_mux_ports{ { *this, "KEY_%u_0", 0 }, { *this, "KEY_%u_1", 0 }, { *this, "KEY_%u_2", 0 }, { *this, "KEY_%u_3", 0 } }
 	, m_digit(*this, "digit%u", 0U)
 {
@@ -128,20 +129,6 @@
 
 void cmi_music_keyboard_device::cmi10_u20_b_w(u8 data)
 {
-	// connected to alphanumeric display control lines
-	u8 const addr = bitswap<2>(data, 0, 1);
-
-	m_dp1->ce_w(BIT(data, 6));
-	m_dp1->cu_w(BIT(data, 7));
-	m_dp1->addr_w(addr);
-
-	m_dp2->ce_w(BIT(data, 4));
-	m_dp2->cu_w(BIT(data, 5));
-	m_dp2->addr_w(addr);
-
-	m_dp3->ce_w(BIT(data, 2));
-	m_dp3->cu_w(BIT(data, 3));
-	m_dp3->addr_w(addr);
 }
 
 READ_LINE_MEMBER( cmi_music_keyboard_device::cmi10_u20_cb1_r )
@@ -159,10 +146,30 @@
 
 WRITE_LINE_MEMBER( cmi_music_keyboard_device::cmi10_u20_cb2_w )
 {
-	// connected to alphanumeric display write strobe
+	uint8_t data = m_cmi10_pia_u20->a_output() & 0x7f;
+	uint8_t b_port = m_cmi10_pia_u20->b_output();
+	int addr = (BIT(b_port, 0) << 1) | BIT(b_port, 1);
+
+	/* DP1 */
+	m_dp1->ce_w(BIT(b_port, 6));
+	m_dp1->cu_w(BIT(b_port, 7));
 	m_dp1->wr_w(state);
+	m_dp1->addr_w(addr);
+	m_dp1->data_w(data);
+
+	/* DP2 */
+	m_dp2->ce_w(BIT(b_port, 4));
+	m_dp2->cu_w(BIT(b_port, 5));
 	m_dp2->wr_w(state);
+	m_dp2->addr_w(addr);
+	m_dp2->data_w(data);
+
+	/* DP3 */
+	m_dp3->ce_w(BIT(b_port, 2));
+	m_dp3->cu_w(BIT(b_port, 3));
 	m_dp3->wr_w(state);
+	m_dp3->addr_w(addr);
+	m_dp3->data_w(data);
 }
 
 template <unsigned N> void cmi_music_keyboard_device::update_dp(offs_t offset, u16 data)
@@ -194,9 +201,9 @@
 		u8 keyval;
 		int state = 1;
 
-		if (mux == 0 && key == 3)
+		if (module == 1 && mux == 2 && key == 3)
 		{
-			//keyval = input_port_read(device->machine, "ANALOG");
+			keyval = m_analog->read();
 
 			/* Unpressed */
 			if (keyval <= 0)
@@ -234,6 +241,18 @@
 		data |= BIT(keyval, key) << module;
 	}
 
+	/* Now do KD7 */
+	{
+		int bit = 0;
+
+		if (BIT(sel, 3))
+			bit = BIT(m_keypad_a_port->read(), sel & 7);
+		else if (!BIT(sel, 4))
+			bit = BIT(m_keypad_b_port->read(), sel & 7);
+
+		data |= (bit && BIT(sel, 7)) << 7;
+	}
+
 	return data;
 #endif
 }
@@ -243,13 +262,9 @@
 	m_kbd_acia_irq = state;
 
 	if (m_kbd_acia_irq)
-	{
 		m_cpu->set_input_line(INPUT_LINE_IRQ0, ASSERT_LINE);
-	}
 	else if (!m_cmi_acia_irq)
-	{
 		m_cpu->set_input_line(INPUT_LINE_IRQ0, CLEAR_LINE);
-	}
 }
 
 WRITE_LINE_MEMBER( cmi_music_keyboard_device::cmi_acia_int )
@@ -435,6 +450,9 @@
 
 	PORT_START("KEY_2_3")
 	PORT_BIT(0xff, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("F6")
+
+	PORT_START("ANALOG")
+	PORT_BIT(0xff, 0x00, IPT_PEDAL) PORT_MINMAX(0, 128) PORT_SENSITIVITY(100) PORT_KEYDELTA(50)
 INPUT_PORTS_END
 
 ioport_constructor cmi_music_keyboard_device::device_input_ports() const
diff -Nru mame-0.222+dfsg.1/src/mame/machine/cmi_mkbd.h mame-0.224+dfsg.1/src/mame/machine/cmi_mkbd.h
--- mame-0.222+dfsg.1/src/mame/machine/cmi_mkbd.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/cmi_mkbd.h	2020-08-26 08:57:19.000000000 +0000
@@ -76,6 +76,7 @@
 
 	required_ioport m_keypad_a_port;
 	required_ioport m_keypad_b_port;
+	required_ioport m_analog;
 
 	required_ioport_array<3> m_key_mux_ports[4];
 
diff -Nru mame-0.222+dfsg.1/src/mame/machine/dai.cpp mame-0.224+dfsg.1/src/mame/machine/dai.cpp
--- mame-0.222+dfsg.1/src/mame/machine/dai.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/dai.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -23,11 +23,8 @@
 {
 	switch (id)
 	{
-	case TIMER_BOOTSTRAP:
-		m_maincpu->set_pc(0xc000);
-		break;
 	case TIMER_TMS5501:
-		m_tms5501->xi7_w((ioport("IN8")->read() & 0x04) ? 1:0);
+		m_tms5501->xi7_w(BIT(m_io_keyboard[8]->read(), 2));
 		timer_set(attotime::from_hz(100), TIMER_TMS5501);
 		break;
 	default:
@@ -41,33 +38,24 @@
 
 /* Memory */
 
-void dai_state::dai_stack_interrupt_circuit_w(uint8_t data)
+void dai_state::stack_interrupt_circuit_w(uint8_t data)
 {
 	m_tms5501->sens_w(1);
 	m_tms5501->sens_w(0);
 }
 
-void dai_state::dai_update_memory(int dai_rom_bank)
-{
-	membank("bank2")->set_entry(dai_rom_bank);
-}
-
-
-uint8_t dai_state::dai_keyboard_r()
+uint8_t dai_state::keyboard_r()
 {
 	uint8_t data = 0x00;
-	static const char *const keynames[] = { "IN0", "IN1", "IN2", "IN3", "IN4", "IN5", "IN6", "IN7" };
 
-	for (int i = 0; i < 8; i++)
-	{
+	for (u8 i = 0; i < 8; i++)
 		if (m_keyboard_scan_mask & (1 << i))
-			data |= ioport(keynames[i])->read();
-	}
+			data |= m_io_keyboard[i]->read();
 
 	return data;
 }
 
-void dai_state::dai_keyboard_w(uint8_t data)
+void dai_state::keyboard_w(uint8_t data)
 {
 	m_keyboard_scan_mask = data;
 }
@@ -79,16 +67,33 @@
 
 void dai_state::machine_start()
 {
-	membank("bank2")->configure_entries(0, 4, memregion("maincpu")->base() + 0x010000, 0x1000);
-	timer_set(attotime::zero, TIMER_BOOTSTRAP);
+	membank("bank2")->configure_entries(0, 4, m_rom + 0x2000, 0x1000);
 	timer_set(attotime::from_hz(100), TIMER_TMS5501);
-
-	memset(m_ram->pointer(), 0, m_ram->size());
+	save_item(NAME(m_paddle_select));
+	save_item(NAME(m_paddle_enable));
+	save_item(NAME(m_cassette_motor));
+	save_item(NAME(m_keyboard_scan_mask));
+	save_item(NAME(m_4_colours_palette));
 }
 
 void dai_state::machine_reset()
 {
-	membank("bank1")->set_base(m_ram->pointer());
+	address_space &program = m_maincpu->space(AS_PROGRAM);
+	program.install_rom(0x0000, 0x07ff, m_rom);   // do it here for F3
+	m_rom_shadow_tap = program.install_read_tap(0xc000, 0xc7ff, "rom_shadow_r",[this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+		{
+			// delete this tap
+			m_rom_shadow_tap->remove();
+
+			// reinstall ram over the rom shadow
+			m_maincpu->space(AS_PROGRAM).install_ram(0x0000, 0x07ff, m_ram);
+		}
+
+		// return the original data
+		return data;
+	});
 }
 
 /***************************************************************************
@@ -120,13 +125,13 @@
                 bit 6-7         ROM bank switching
 ***************************************************************************/
 
-uint8_t dai_state::dai_io_discrete_devices_r(offs_t offset)
+uint8_t dai_state::io_discrete_devices_r(offs_t offset)
 {
-	uint8_t data = 0x00;
+	uint8_t data = 0xff;
 
-	switch(offset & 0x000f) {
-	case 0x00:
-		data = ioport("IN8")->read();
+	switch(offset & 0x0f) {
+	case 0:
+		data = m_io_keyboard[8]->read();
 		data |= 0x08;           // serial ready
 		if (machine().rand()&0x01)
 			data |= 0x40;       // random number generator
@@ -135,42 +140,40 @@
 		break;
 
 	default:
-		data = 0xff;
 		LOG_DAI_PORT_R (offset, data, "discrete devices - unmapped");
-
 		break;
 	}
 	return data;
 }
 
-void dai_state::dai_io_discrete_devices_w(offs_t offset, uint8_t data)
+void dai_state::io_discrete_devices_w(offs_t offset, uint8_t data)
 {
 	switch(offset & 0x000f) {
 	case 0x04:
 		m_sound->set_volume(offset, data);
 		LOG_DAI_PORT_W (offset, data&0x0f, "discrete devices - osc. 0 volume");
-		LOG_DAI_PORT_W (offset, (data&0xf0)>>4, "discrete devices - osc. 1 volume");
+		LOG_DAI_PORT_W (offset, BIT(data, 4, 4), "discrete devices - osc. 1 volume");
 		break;
 
 	case 0x05:
 		m_sound->set_volume(offset, data);
 		LOG_DAI_PORT_W (offset, data&0x0f, "discrete devices - osc. 2 volume");
-		LOG_DAI_PORT_W (offset, (data&0xf0)>>4, "discrete devices - noise volume");
+		LOG_DAI_PORT_W (offset, BIT(data, 4, 4), "discrete devices - noise volume");
 		break;
 
 	case 0x06:
-		m_paddle_select = (data&0x06)>>2;
-		m_paddle_enable = (data&0x08)>>3;
-		m_cassette_motor[0] = (data&0x10)>>4;
-		m_cassette_motor[1] = (data&0x20)>>5;
+		m_paddle_select = BIT(data, 1, 2);
+		m_paddle_enable = BIT(data, 3);
+		m_cassette_motor[0] = BIT(data, 4);
+		m_cassette_motor[1] = BIT(data, 5);
 		m_cassette->change_state(m_cassette_motor[0]?CASSETTE_MOTOR_DISABLED:CASSETTE_MOTOR_ENABLED, CASSETTE_MASK_MOTOR);
-		m_cassette->output((data & 0x01) ? -1.0 : 1.0);
-		dai_update_memory ((data&0xc0)>>6);
-		LOG_DAI_PORT_W (offset, (data&0x06)>>2, "discrete devices - paddle select");
-		LOG_DAI_PORT_W (offset, (data&0x08)>>3, "discrete devices - paddle enable");
-		LOG_DAI_PORT_W (offset, (data&0x10)>>4, "discrete devices - cassette motor 1");
-		LOG_DAI_PORT_W (offset, (data&0x20)>>5, "discrete devices - cassette motor 2");
-		LOG_DAI_PORT_W (offset, (data&0xc0)>>6, "discrete devices - ROM bank");
+		m_cassette->output(BIT(data, 0) ? -1.0 : 1.0);
+		membank("bank2")->set_entry(BIT(data, 6, 2));
+		LOG_DAI_PORT_W (offset, BIT(data, 1, 2), "discrete devices - paddle select");
+		LOG_DAI_PORT_W (offset, BIT(data, 3), "discrete devices - paddle enable");
+		LOG_DAI_PORT_W (offset, BIT(data, 4), "discrete devices - cassette motor 1");
+		LOG_DAI_PORT_W (offset, BIT(data, 5), "discrete devices - cassette motor 2");
+		LOG_DAI_PORT_W (offset, BIT(data, 6, 2), "discrete devices - ROM bank");
 		break;
 
 	default:
@@ -188,14 +191,14 @@
 
 ***************************************************************************/
 
-uint8_t dai_state::dai_pit_r(offs_t offset)
+uint8_t dai_state::pit_r(offs_t offset)
 {
-	return m_pit->read((offset >> 1) & 3);
+	return m_pit->read(BIT(offset, 1, 2));
 }
 
-void dai_state::dai_pit_w(offs_t offset, uint8_t data)
+void dai_state::pit_w(offs_t offset, uint8_t data)
 {
-	m_pit->write((offset >> 1) & 3, data);
+	m_pit->write(BIT(offset, 1, 2), data);
 }
 
 /***************************************************************************
@@ -204,13 +207,13 @@
 
 ***************************************************************************/
 
-uint8_t dai_state::dai_amd9511_r()
+uint8_t dai_state::amd9511_r()
 {
-	/* optional and no present at this moment */
+	/* optional and not present at this moment */
 	return 0xff;
 }
 
-void dai_state::dai_amd9511_w(offs_t offset, uint8_t data)
+void dai_state::amd9511_w(offs_t offset, uint8_t data)
 {
 	logerror ("Writing to AMD9511 math chip, %04x, %02x\n", offset, data);
 }
diff -Nru mame-0.222+dfsg.1/src/mame/machine/dragon.cpp mame-0.224+dfsg.1/src/mame/machine/dragon.cpp
--- mame-0.222+dfsg.1/src/mame/machine/dragon.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/dragon.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -111,12 +111,10 @@
 	if (ddr & 0x04)
 	{
 		page_rom(data & 0x04 ? true : false);
-		logerror("pia1_pb_changed\n");
 	}
 }
 
 
-
 //-------------------------------------------------
 //  page_rom - Controls rom paging in Dragon 64,
 //  and Dragon Alpha.
@@ -138,6 +136,26 @@
 }
 
 
+/***************************************************************************
+  DRAGON200-E
+***************************************************************************/
+
+uint8_t dragon200e_state::sam_read(offs_t offset)
+{
+	uint8_t data = sam().display_read(offset);
+	m_vdg->as_w(data & 0x80 ? ASSERT_LINE : CLEAR_LINE);
+	m_vdg->intext_w(data & 0x80 ? CLEAR_LINE : ASSERT_LINE);
+	m_vdg->inv_w(m_lk1->read() ? ASSERT_LINE : CLEAR_LINE);
+	return data;
+}
+
+MC6847_GET_CHARROM_MEMBER(dragon200e_state::char_rom_r)
+{
+	uint16_t addr = (line << 8) | (BIT(pia_1().b_output(), 4) << 7) | ch;
+	return m_char_rom->base()[addr & 0xfff];
+}
+
+
 /***************************************************************************
   DRAGON64 PLUS
 ***************************************************************************/
diff -Nru mame-0.222+dfsg.1/src/mame/machine/electron.cpp mame-0.224+dfsg.1/src/mame/machine/electron.cpp
--- mame-0.222+dfsg.1/src/mame/machine/electron.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/electron.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -151,6 +151,10 @@
 
 uint8_t electron_state::electron_mem_r(offs_t offset)
 {
+	uint8_t data = 0xff;
+
+	data &= m_exp->expbus_r(offset);
+
 	switch (m_mrb.read_safe(0))
 	{
 	case 0x00: /* Normal */
@@ -167,11 +171,15 @@
 		if (m_mrb_mapped && (offset < 0x3000 || !m_vdu_drivers)) offset += 0x8000;
 		break;
 	}
-	return m_ram->read(offset);
+	data &= m_ram->read(offset);
+
+	return data;
 }
 
 void electron_state::electron_mem_w(offs_t offset, uint8_t data)
 {
+	m_exp->expbus_w(offset, data);
+
 	switch (m_mrb.read_safe(0))
 	{
 	case 0x00: /* Normal */
@@ -232,7 +240,7 @@
 	case 10:
 	case 11:
 		/* BASIC */
-		data = m_region_basic->base()[offset & 0x3fff];
+		data = m_region_mos->base()[offset & 0x3fff];
 		break;
 
 	default:
@@ -319,7 +327,7 @@
 	/* The processor will run at 2MHz during an access cycle to the ROM */
 	m_maincpu->set_clock_scale(1.0f);
 
-	return m_region_mos->base()[offset & 0x3fff];
+	return m_region_mos->base()[0x4000 | offset];
 }
 
 void electron_state::electron_mos_w(offs_t offset, uint8_t data)
diff -Nru mame-0.222+dfsg.1/src/mame/machine/esqpanel.cpp mame-0.224+dfsg.1/src/mame/machine/esqpanel.cpp
--- mame-0.222+dfsg.1/src/mame/machine/esqpanel.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/esqpanel.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,12 +12,13 @@
 // External panel support
 //**************************************************************************
 
+#include <list>
 #include <mutex>
 #include <set>
 #include <sstream>
 #include <string>
 #include <thread>
-#include <list>
+
 
 namespace esqpanel {
 
diff -Nru mame-0.222+dfsg.1/src/mame/machine/galaxy.cpp mame-0.224+dfsg.1/src/mame/machine/galaxy.cpp
--- mame-0.222+dfsg.1/src/mame/machine/galaxy.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/galaxy.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -17,7 +17,7 @@
   I/O devices
 ***************************************************************************/
 
-uint8_t galaxy_state::galaxy_keyboard_r(offs_t offset)
+uint8_t galaxy_state::keyboard_r(offs_t offset)
 {
 	if (offset == 0)
 	{
@@ -25,12 +25,10 @@
 		return (level >  0) ? 0xfe : 0xff;
 	}
 	else
-	{
-		return m_io_ports[(offset>>3) & 0x07]->read() & (0x01<<(offset & 0x07)) ? 0xfe : 0xff;
-	}
+		return m_io_keyboard[(offset>>3) & 0x07]->read() & (0x01<<(offset & 0x07)) ? 0xfe : 0xff;
 }
 
-void galaxy_state::galaxy_latch_w(uint8_t data)
+void galaxy_state::latch_w(uint8_t data)
 {
 	double val = (((data >>6) & 1 ) + ((data >> 2) & 1) - 1) * 32000;
 	m_latch_value = data;
@@ -43,14 +41,9 @@
   Interrupts
 ***************************************************************************/
 
-INTERRUPT_GEN_MEMBER(galaxy_state::galaxy_interrupt)
-{
-	device.execute().set_input_line(0, HOLD_LINE);
-}
-
-IRQ_CALLBACK_MEMBER(galaxy_state::galaxy_irq_callback)
+IRQ_CALLBACK_MEMBER(galaxy_state::irq_callback)
 {
-	galaxy_set_timer();
+	set_timer();
 	m_interrupts_enabled = true;
 	return 0xff;
 }
@@ -62,7 +55,7 @@
 #define GALAXY_SNAPSHOT_V1_SIZE 8268
 #define GALAXY_SNAPSHOT_V2_SIZE 8244
 
-void galaxy_state::galaxy_setup_snapshot(const uint8_t * data, uint32_t size)
+void galaxy_state::setup_snapshot(const uint8_t * data, uint32_t size)
 {
 	switch (size)
 	{
@@ -138,7 +131,7 @@
 
 	image.fread( snapshot_data, snapshot_size);
 
-	galaxy_setup_snapshot(snapshot_data, snapshot_size);
+	setup_snapshot(snapshot_data, snapshot_size);
 
 	return image_init_result::PASS;
 }
@@ -150,62 +143,29 @@
 
 void galaxy_state::init_galaxy()
 {
-	static const char *const keynames[] = { "LINE0", "LINE1", "LINE2", "LINE3", "LINE4", "LINE5", "LINE6", "LINE7" };
-
 	address_space &space = m_maincpu->space(AS_PROGRAM);
 	space.install_readwrite_bank( 0x2800, 0x2800 + m_ram->size() - 1, "bank1");
 	membank("bank1")->set_base(m_ram->pointer());
 
 	if (m_ram->size() < (6 + 48) * 1024)
-	{
 		space.nop_readwrite( 0x2800 + m_ram->size(), 0xffff);
-	}
-
-	for ( int i = 0; i < 8; i++ )
-	{
-		m_io_ports[i] = ioport( keynames[i] );
-	}
-}
-
-/***************************************************************************
-  Machine Initialization
-***************************************************************************/
-
-MACHINE_RESET_MEMBER(galaxy_state,galaxy)
-{
-	address_space &space = m_maincpu->space(AS_PROGRAM);
-
-	/* ROM 2 enable/disable */
-	if (ioport("ROM2")->read()) {
-		space.install_read_bank(0x1000, 0x1fff, "bank10");
-	} else {
-		space.nop_read(0x1000, 0x1fff);
-	}
-	space.nop_write(0x1000, 0x1fff);
-
-	if (ioport("ROM2")->read())
-		membank("bank10")->set_base(memregion("maincpu")->base() + 0x1000);
-
-	m_interrupts_enabled = true;
 }
 
 void galaxy_state::init_galaxyp()
 {
-	init_galaxy();
-}
-
-MACHINE_RESET_MEMBER(galaxy_state,galaxyp)
-{
 	uint8_t *ROM = memregion("maincpu")->base();
-	address_space &space = m_maincpu->space(AS_PROGRAM);
-
 	ROM[0x0037] = 0x29;
 	ROM[0x03f9] = 0xcd;
 	ROM[0x03fa] = 0x00;
 	ROM[0x03fb] = 0xe0;
+}
 
-	space.install_read_bank(0xe000, 0xefff, "bank11");
-	space.nop_write(0xe000, 0xefff);
-	membank("bank11")->set_base(memregion("maincpu")->base() + 0xe000);
+/***************************************************************************
+  Machine Initialization
+***************************************************************************/
+
+void galaxy_state::machine_reset()
+{
 	m_interrupts_enabled = true;
 }
+
diff -Nru mame-0.222+dfsg.1/src/mame/machine/harddriv.cpp mame-0.224+dfsg.1/src/mame/machine/harddriv.cpp
--- mame-0.222+dfsg.1/src/mame/machine/harddriv.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/harddriv.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -37,7 +37,6 @@
 void harddriv_state::device_start()
 {
 	m_lamps.resolve();
-	//atarigen_state::machine_start();
 
 	/* predetermine memory regions */
 	m_adsp_pgm_memory_word = (uint16_t *)(reinterpret_cast<uint8_t *>(m_adsp_pgm_memory.target()) + 1);
@@ -50,7 +49,6 @@
 void  harddriv_state::device_reset()
 {
 	/* generic reset */
-	//atarigen_state::machine_reset();
 	if (m_slapstic_device.found()) m_slapstic_device->slapstic_reset();
 
 	/* halt several of the DSPs to start */
diff -Nru mame-0.222+dfsg.1/src/mame/machine/hec2hrp.cpp mame-0.224+dfsg.1/src/mame/machine/hec2hrp.cpp
--- mame-0.222+dfsg.1/src/mame/machine/hec2hrp.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/hec2hrp.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -36,15 +36,12 @@
     - http://dchector.free.fr/
     - http://hectorvictor.free.fr/
 
-    TODO :  Add cartridge functionality,
-            Adjust the one shot and A/D timing (sn76477)
 */
 
 #include "emu.h"
 #include "includes/hec2hrp.h"
 
 #include "cpu/z80/z80.h"
-#include "sound/wave.h"      /* for K7 sound */
 
 #include "speaker.h"
 
@@ -67,36 +64,48 @@
 hec2mx40
 */
 
-/* Helper function*/
-int hec2hrp_state::has_disc2()
+
+void hec2hrp_state::init_mx40()
+{
+	m_has_disc2 = true;
+	m_has_minidisc = false;
+	m_is_hr = true;
+	m_is_extended = true;
+}
+
+void hec2hrp_state::init_mdhrx()
 {
-	return ((strncmp(machine().system().name , "hec2hrx"  , 7)==0) ||
-			(strncmp(machine().system().name , "hec2mx40" , 8)==0) ||
-			(strncmp(machine().system().name , "hec2mx80" , 8)==0));
+	m_has_disc2 = false;
+	m_has_minidisc = true;
+	m_is_hr = true;
+	m_is_extended = true;
 }
 
-int hec2hrp_state::has_minidisc()
+void hec2hrp_state::init_victor()
 {
-	return ((strncmp(machine().system().name , "hec2mdhrx", 9)==0));
+	m_has_disc2 = false;
+	m_has_minidisc = false;
+	m_is_hr = true;
+	m_is_extended = false;
 }
 
-int hec2hrp_state::is_hr()
+void hec2hrp_state::init_hrx()
 {
-	return ((strncmp(machine().system().name , "hec2hr"   , 6)==0) ||  //Aviable for hr & hrp
-			(strncmp(machine().system().name , "hec2mdhrx", 9)==0) ||
-			(strncmp(machine().system().name , "victor"   , 6)==0) ||
-			(strncmp(machine().system().name , "hec2mx40" , 8)==0) ||
-			(strncmp(machine().system().name , "hec2mx80" , 8)==0));
+	m_has_disc2 = true;
+	m_has_minidisc = false;
+	m_is_hr = false;
+	m_is_extended = true;
 }
 
-int hec2hrp_state::is_extended()
+void hec2hrp_state::init_interact()
 {
-	return ((strncmp(machine().system().name , "hec2mdhrx", 9)==0) ||
-			(strncmp(machine().system().name , "hec2hrx"  , 7)==0) ||
-			(strncmp(machine().system().name , "hec2mx40" , 8)==0) ||
-			(strncmp(machine().system().name , "hec2mx80" , 8)==0));
+	m_has_disc2 = false;
+	m_has_minidisc = false;
+	m_is_hr = false;
+	m_is_extended = false;
 }
 
+
 /* Cassette timer*/
 TIMER_CALLBACK_MEMBER(hec2hrp_state::cassette_clock)
 {
@@ -119,61 +128,57 @@
 		floppy->ss_w(BIT(data, 4));
 	}
 
-	membank("bank2")->set_entry(BIT(data, 5) ? HECTOR_BANK_BASE : HECTOR_BANK_DISC);
+	m_bank[2]->set_entry(BIT(data, 5) ? HECTOR_BANK_BASE : HECTOR_BANK_DISC);
 }
 
 void hec2hrp_state::switch_bank_w(offs_t offset, uint8_t data)
 {
 	if (offset==0x00)
 	{
-		if (is_extended())
-		{
-			membank("bank1")->set_entry(HECTOR_BANK_VIDEO);
-		}
-		if (m_flag_clk == 1)
+		if (m_is_extended)
+			m_bank[1]->set_entry(HECTOR_BANK_VIDEO);
+
+		if (m_flag_clk)
 		{
-			m_flag_clk = 0;
+			m_flag_clk = false;
 			m_maincpu->set_unscaled_clock(XTAL(5'000'000));
 		}
 	}
 
 	if (offset==0x04)
 	{
-		m_hector_flag_hr = 0;
-		if (is_extended())
-		{
-			membank("bank1")->set_entry(HECTOR_BANK_VIDEO);
-		}
-		if (m_flag_clk == 0)
+		m_hector_flag_hr = false;
+		if (m_is_extended)
+			m_bank[1]->set_entry(HECTOR_BANK_VIDEO);
+
+		if (!m_flag_clk)
 		{
-			m_flag_clk = 1;
+			m_flag_clk = true;
 			m_maincpu->set_unscaled_clock(XTAL(1'750'000));
 		}
 	}
 
 	if (offset==0x08)
 	{
-		if (is_extended())
-		{
-			membank("bank1")->set_entry(HECTOR_BANK_PROG);
-		}
-		if (m_flag_clk == 1)
+		if (m_is_extended)
+			m_bank[1]->set_entry(HECTOR_BANK_PROG);
+
+		if (m_flag_clk)
 		{
-			m_flag_clk = 0;
+			m_flag_clk = false;
 			m_maincpu->set_unscaled_clock(XTAL(5'000'000));
 		}
 	}
 
 	if (offset == 0x0c)
 	{
-		m_hector_flag_hr = 0;
-		if (is_extended())
-		{
-			membank("bank1")->set_entry(HECTOR_BANK_PROG);
-		}
-		if (m_flag_clk == 0)
+		m_hector_flag_hr = false;
+		if (m_is_extended)
+			m_bank[1]->set_entry(HECTOR_BANK_PROG);
+
+		if (!m_flag_clk)
 		{
-			m_flag_clk = 1;
+			m_flag_clk = true;
 			m_maincpu->set_unscaled_clock(XTAL(1'750'000));
 		}
 	}
@@ -196,31 +201,28 @@
 		if (data & 0x01) /* Reset machine */
 		{
 			m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
-			if (is_hr())
+			if (m_is_hr)
 			{
-				m_hector_flag_hr = 1;
-				if (is_extended())
+				m_hector_flag_hr = true;
+				if (m_is_extended)
 				{
-					membank("bank1")->set_entry(HECTOR_BANK_PROG);
-					membank("bank2")->set_entry(HECTORMX_BANK_PAGE0);
+					m_bank[1]->set_entry(HECTOR_BANK_PROG);
+					m_bank[2]->set_entry(HECTORMX_BANK_PAGE0);
 				}
 				//RESET DISC II unit
-				if (has_disc2())
+				if (m_has_disc2)
 					hector_disc2_reset();
 
 				/* floppy md master reset */
-				if (has_minidisc())
+				if (m_has_minidisc)
 					m_minidisc_fdc->reset();
 			}
 			else
-			{
-				m_hector_flag_hr=0;
-			}
-
+				m_hector_flag_hr = false;
 
-		/*Common flag*/
-		m_hector_flag_80c = 0;
-		m_flag_clk = 0;
+			/*Common flag*/
+			m_hector_flag_80c = false;
+			m_flag_clk = false;
 		}
 
 		m_actions = 0;
@@ -232,21 +234,27 @@
 
 		if (data & 0x08) /* Pot(0)+*/
 			m_pot0 += 1;
-		if (m_pot0>128) m_pot0 = 128;
+
+		if (m_pot0>128)
+			m_pot0 = 128;
 
 		if (data & 0x10) /* Pot(0)-*/
 			m_pot0 -= 1;
 
-		if (m_pot0>250) m_pot0 = 0;
+		if (m_pot0>250)
+			m_pot0 = 0;
 
 		if (data & 0x20) /* Pot(1)+*/
 			m_pot1 += 1;
-		if (m_pot1>128) m_pot1 = 128;
+
+		if (m_pot1>128)
+			m_pot1 = 128;
 
 		if (data & 0x40) /* Pot(1)-*/
 			m_pot1 -= 1;
 
-		if (m_pot1>250) m_pot1 = 0;
+		if (m_pot1>250)
+			m_pot1 = 0;
 	}
 
 	/* in all case return the requested value */
@@ -284,23 +292,19 @@
 	}
 	else
 	{
-		if (m_write_cassette == 0)
+		if (!m_write_cassette)
 		{
 			level = m_cassette->input();
 
 			if  (level < -0.08)
-				m_cassette_bit = 0x00;
+				m_cassette_bit = false;
 			if (level > +0.08)
-				m_cassette_bit = 0x01;
+				m_cassette_bit = true;
 		}
 
-		if ((m_cassette_bit != m_cassette_bit_mem) && (m_cassette_bit !=0))
-		{
-			if (m_data_k7 == 0x00)
-				m_data_k7 =  0x80;
-			else
-				m_data_k7 =  0x00;
-		}
+		if ((m_cassette_bit != m_cassette_bit_mem) && m_cassette_bit)
+			m_data_k7 = m_data_k7 ? 0 : 0x80;
+
 		value = ( m_ck_signal & 0x7F ) + m_data_k7;
 		m_cassette_bit_mem = m_cassette_bit;
 	}
@@ -309,13 +313,14 @@
 void hec2hrp_state::sn_3000_w(uint8_t data)
 {
 	m_state3000 = data & 0xf8; /* except bit 0 to 2*/
-	if ((data & 7) != m_oldstate3000 )
+	data &= 7;
+	if (data != m_oldstate3000 )
 	{
 		/* Update sn76477 only when necessary!*/
-		update_state(0x3000, data & 7 );
-		update_sound(data & 7);
+		update_state(0x3000, data);
+		update_sound(data);
 	}
-	m_oldstate3000 = data & 7;
+	m_oldstate3000 = data;
 }
 
 /* Color Interface */
@@ -324,18 +329,16 @@
 	if (data & 0x40)
 	{
 		/* Bit 6 => motor ON/OFF => for cassette state!*/
-		if (m_write_cassette==0)
+		if (!m_write_cassette)
 		{
-				m_cassette->change_state(
-						CASSETTE_MOTOR_ENABLED,
-						CASSETTE_MASK_MOTOR);
+			m_cassette->change_state(CASSETTE_MOTOR_ENABLED, CASSETTE_MASK_MOTOR);
 			// m_cassette->set_state(CASSETTE_PLAY | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED);
 		}
 	}
 	else
 	{   /* stop motor*/
 		m_cassette->set_state(CASSETTE_STOPPED);
-		m_write_cassette=0;
+		m_write_cassette = false;
 		m_counter_write =0;
 	}
 	if (((data & 0x80) != (m_oldstate1000 & 0x80)) && ((m_oldstate1000 & 7)==(data & 7)) ) /* Bit7 had change but not the color statement*/
@@ -345,15 +348,14 @@
 
 		if (m_counter_write > 5)
 		{
-			/* Wait several cycle before lauch the record to prevent somes bugs*/
+			/* Wait several cycles before launch recording to prevent somes bugs*/
 			m_counter_write = 6;
-			if (m_write_cassette==0)
-			{   /* C'est la 1er fois => record*/
-				m_cassette->change_state(
-						CASSETTE_MOTOR_ENABLED,
-						CASSETTE_MASK_MOTOR);
+			if (!m_write_cassette)
+			{
+				// record
+				m_cassette->change_state( CASSETTE_MOTOR_ENABLED, CASSETTE_MASK_MOTOR);
 				m_cassette->set_state(CASSETTE_RECORD);
-				m_write_cassette=1;
+				m_write_cassette = true;
 			}
 		}
 		/* cassette data */
@@ -361,22 +363,25 @@
 	}
 
 	/* Other bit : color definition*/
-	m_hector_color[0] =  data        & 0x07 ;
-	m_hector_color[2] = ((data >> 3)  & 0x07) | (m_hector_color[2] & 0x40);
+	m_hector_color[0] = data & 0x07 ;
+	m_hector_color[2] = BIT(data, 3, 3) | (m_hector_color[2] & 0x40);
 
 	m_oldstate1000=data; /* For next step*/
 }
 
 void hec2hrp_state::color_b_w(uint8_t data)
 {
-	m_hector_color[1] =  data        & 0x07;
-	m_hector_color[3] = (data >> 3)  & 0x07;
+	m_hector_color[1] = data & 0x07;
+	m_hector_color[3] = BIT(data, 3, 3);
 
 	/* Half light on color 2 only on HR machines:*/
-	if (data & 0x40) m_hector_color[2] |= 8; else m_hector_color[2] &= 7;
+	if (data & 0x40)
+		m_hector_color[2] |= 8;
+	else
+		m_hector_color[2] &= 7;
 
 	/* Play bit*/
-	m_discrete->write(NODE_01,  (data & 0x80) ? 0:1 );
+	m_discrete->write(NODE_01, (data & 0x80) ? 0:1 );
 }
 
 
@@ -391,20 +396,20 @@
 	uint8_t data =0;
 	uint8_t data_l=0;
 	uint8_t data_h=0;
+	offset &= 3;
 
-
-	if ((offset & 0x3) == 0x0) /* Port A */
+	if (offset == 0) /* Port A */
 		data = m_hector_port_a;
-
-	if ((offset & 0x3) == 0x1) /* Port B */
+	else
+	if (offset == 1) /* Port B */
 	{
 		data = m_hector_port_b;
 		#ifdef DEBUG_TRACE_COM_HECTOR
 			printf("\nLecture data par Hector %x (portB)",data);
 		#endif
 	}
-
-	if ((offset & 0x3) == 0x2) /* Port C */
+	else
+	if (offset == 2) /* Port C */
 	{
 		data_l = (m_hector_port_c_l & 0x0f);
 		data_h = (m_hector_port_c_h & 0xf0);
@@ -414,18 +419,18 @@
 
 		if (BIT(m_hector_port_cmd, 3))                  /* Quartet sup en entree ?*/
 		{
-			m_hector_port_c_h = (m_hector_port_c_h & 0x0c0);    /* Clear bits 4 & 5*/
+			m_hector_port_c_h = (m_hector_port_c_h & 0xc0);    /* Clear bits 4 & 5*/
 
 			if (m_hector_disc2_data_w_ready != 0x00)
-				m_hector_port_c_h = m_hector_port_c_h + 0x010;  // PC4 (data write ready from Disc II to Hector)
+				m_hector_port_c_h = m_hector_port_c_h + 0x10;  // PC4 (data write ready from Disc II to Hector)
 
 			if (m_hector_disc2_data_r_ready != 0x00)
-				m_hector_port_c_h = m_hector_port_c_h + 0x020;  // PC5 (data read ready from Hector to Disc2)
+				m_hector_port_c_h = m_hector_port_c_h + 0x20;  // PC5 (data read ready from Hector to Disc2)
 
-			m_hector_port_c_h = m_hector_port_c_h & 0x07F;      // PC7 (printer busy=0)
+			m_hector_port_c_h = m_hector_port_c_h & 0x7F;      // PC7 (printer busy=0)
 			data_h =  m_hector_port_c_h;
 		}
-		data= data_l + data_h;
+		data = data_l + data_h;
 	}
 	return data;  // Return the value!
 }
@@ -434,8 +439,9 @@
 
 void hec2hrp_state::io_8255_w(offs_t offset, uint8_t data)
 {
+	offset &= 3;
 	/* 8255 in mode 0 */
-	if ((offset & 0x3) == 0x0) /* Port A => to printer or Disc II*/
+	if (offset == 0) /* Port A => to printer or Disc II*/
 	{
 		m_hector_port_a = data;
 		/* Port A => to printer*/
@@ -443,16 +449,13 @@
 		So, everything sent to the Disc2 unit will be printed too! */
 
 		if (BIT(m_hector_port_c_l, 0)) // PC0 (bit 0) = strobe printer
-		{
 			m_printer->output(m_hector_port_a);
-		}
 	}
-
-	if ((offset & 0x3) == 0x1) /* Port B */
+	else
+	if (offset == 1) /* Port B */
 		m_hector_port_b = data;
-
-
-	if ((offset & 0x3) == 0x2) /* Port C => depending cmd word */
+	else
+	if (offset == 2) /* Port C => depending cmd word */
 	{
 		if (!BIT(m_hector_port_cmd, 0))
 		{
@@ -477,11 +480,8 @@
 		if (!BIT(m_hector_port_cmd, 3))
 			m_hector_port_c_h = (data & 0xf0);
 	}
-
-	if ((offset & 0x3) == 0x3) /* command */
-	{
+	else  // offset=3
 		m_hector_port_cmd = data;
-	}
 }
 /* End of 8255 managing */
 
@@ -489,36 +489,87 @@
 /*******************  PIO write handler for MX40 *******************/
 void hec2hrp_state::mx40_io_port_w(offs_t offset, uint8_t data)
 {
+	offset &= 0xff;
+
 	/* Bank switching on several address */
-	if ((offset &0x0ff) == 0x40) /* Port page 0*/
-		membank("bank2")->set_entry(HECTORMX_BANK_PAGE0);
-	if ((offset &0x0ff) == 0x41) /* Port page 1*/
-	{
-		membank("bank2")->set_entry(HECTORMX_BANK_PAGE1);
-		m_hector_flag_80c=0;
-	}
-	if ((offset &0x0ff) == 0x44) /* Port page 2  => 42 pour MX80*/
-		membank("bank2")->set_entry(HECTORMX_BANK_PAGE2);
-	if ((offset &0x0ff) == 0x49) /* Port screen resolution*/
-		m_hector_flag_80c=0;/* No 80c in 40c !*/
+	if (offset == 0x40) /* Port page 0*/
+		m_bank[2]->set_entry(HECTORMX_BANK_PAGE0);
+	else
+	if (offset == 0x41) /* Port page 1*/
+	{
+		m_bank[2]->set_entry(HECTORMX_BANK_PAGE1);
+		m_hector_flag_80c = false;
+	}
+	else
+	if (offset == 0x44) /* Port page 2  => 42 on MX80*/
+		m_bank[2]->set_entry(HECTORMX_BANK_PAGE2);
+	else
+	if (offset == 0x49) /* Port screen resolution*/
+		m_hector_flag_80c = false;/* No 80c in 40c !*/
 }
 
 /*******************  PIO write handlerfor MX80 *******************/
 void hec2hrp_state::mx80_io_port_w(offs_t offset, uint8_t data)
 {
-	if ((offset &0x0ff) == 0x40) /* Port page 0*/
-		membank("bank2")->set_entry(HECTORMX_BANK_PAGE0);
-	if ((offset &0x0ff) == 0x41) /* Port page 1*/
-	{
-		membank("bank2")->set_entry(HECTORMX_BANK_PAGE1);
-		m_hector_flag_80c=0;
-	}
-	if ((offset &0x0ff) == 0x42) /* Port page 2  => different port on MX40 */
-		membank("bank2")->set_entry(HECTORMX_BANK_PAGE2);
-	if ((offset &0x0ff) == 0x49) /* Port screen resolution*/
-		m_hector_flag_80c=1;
+	offset &= 0xff;
+
+	if (offset == 0x40) /* Port page 0*/
+		m_bank[2]->set_entry(HECTORMX_BANK_PAGE0);
+	else
+	if (offset == 0x41) /* Port page 1*/
+	{
+		m_bank[2]->set_entry(HECTORMX_BANK_PAGE1);
+		m_hector_flag_80c = false;
+	}
+	else
+	if (offset == 0x42) /* Port page 2  => different port on MX40 */
+		m_bank[2]->set_entry(HECTORMX_BANK_PAGE2);
+	else
+	if (offset == 0x49) /* Port screen resolution*/
+		m_hector_flag_80c = true;
 }
 
+void hec2hrp_state::video_start()
+{
+	save_item(NAME(m_has_disc2));
+	save_item(NAME(m_has_minidisc));
+	save_item(NAME(m_is_hr));
+	save_item(NAME(m_is_extended));
+	save_item(NAME(m_hector_flag_hr));
+	save_item(NAME(m_hector_flag_80c));
+	save_item(NAME(m_hector_color));
+	save_item(NAME(m_hector_disc2_data_r_ready));
+	save_item(NAME(m_hector_disc2_data_w_ready));
+	save_item(NAME(m_hector_disc2_data_read));
+	save_item(NAME(m_hector_disc2_data_write));
+	save_item(NAME(m_hector_disc2_rnmi));
+	save_item(NAME(m_state3000));
+	save_item(NAME(m_write_cassette));
+	save_item(NAME(m_ck_signal));
+	save_item(NAME(m_flag_clk));
+	save_item(NAME(m_pin_value));
+	save_item(NAME(m_au));
+	save_item(NAME(m_val_mixer));
+	save_item(NAME(m_oldstate3000));
+	save_item(NAME(m_oldstate1000));
+	save_item(NAME(m_pot0));
+	save_item(NAME(m_pot1));
+	save_item(NAME(m_actions));
+	save_item(NAME(m_hector_port_a));
+	save_item(NAME(m_hector_port_b));
+	save_item(NAME(m_hector_port_c_h));
+	save_item(NAME(m_hector_port_c_l));
+	save_item(NAME(m_hector_port_cmd));
+	save_item(NAME(m_cassette_bit));
+	save_item(NAME(m_cassette_bit_mem));
+	save_item(NAME(m_data_k7));
+	save_item(NAME(m_counter_write));
+	save_item(NAME(m_irq_current_state));
+	save_item(NAME(m_nmi_current_state));
+	save_item(NAME(m_hector_videoram_hrx));
+}
+
+
 /********************************************************************************
  sound management
 ********************************************************************************/
@@ -530,63 +581,63 @@
 {
 	case 0x2000:
 	{
-		m_au[ 0] =  ((Value & 0x080 )==0) ? 0 : 1 ;
-		m_au[ 8] =  ((Value & 0x040 )==0) ? 0 : 1 ;
+		m_au[ 0] = BIT(Value, 7);
+		m_au[ 8] = BIT(Value, 6);
 		break;
 	}
 
 	case 0x2001:
 	{
-		m_au[ 1] =  ((Value & 0x080 )==0) ? 0 : 1 ;
-		m_au[ 9] =  ((Value & 0x040 )==0) ? 0 : 1 ;
+		m_au[ 1] = BIT(Value, 7);
+		m_au[ 9] = BIT(Value, 6);
 		break;
 	}
 
 	case 0x2002:
 	{
-		m_au[ 2] =  ((Value & 0x080 )==0) ? 0 : 1 ;
-		m_au[10] =  ((Value & 0x040 )==0) ? 0 : 1 ;
+		m_au[ 2] = BIT(Value, 7);
+		m_au[10] = BIT(Value, 6);
 		break;
 	}
 
 	case 0x2003:
 	{
-		m_au[ 3] =  ((Value & 0x080 )==0) ? 0 : 1 ;
-		m_au[11] =  ((Value & 0x040 )==0) ? 0 : 1 ;
+		m_au[ 3] = BIT(Value, 7);
+		m_au[11] = BIT(Value, 6);
 		break;
 	}
 
 	case 0x2800:
 	{
-		m_au[ 4] =  ((Value & 0x080 )==0) ? 0 : 1 ;
-		m_au[12] =  ((Value & 0x040 )==0) ? 0 : 1 ;
+		m_au[ 4] = BIT(Value, 7);
+		m_au[12] = BIT(Value, 6);
 		break;
 	}
 
 	case 0x2801:
 	{
-		m_au[ 5] =  ((Value & 0x080 )==0) ? 0 : 1 ;
-		m_au[13] =  ((Value & 0x040 )==0) ? 0 : 1 ;
+		m_au[ 5] = BIT(Value, 7);
+		m_au[13] = BIT(Value, 6);
 		break;
 	}
 
 	case 0x2802:
 	{
-		m_au[ 6] = ((Value & 0x080 )==0) ? 0 : 1 ;
-		m_au[14] = ((Value & 0x040 )==0) ? 0 : 1 ;
+		m_au[ 6] = BIT(Value, 7);
+		m_au[14] = BIT(Value, 6);
 		break;
 	}
 
 	case 0x2803:
 	{
-		m_au[ 7] =  ((Value & 0x080 )==0) ? 0 : 1 ;
-		m_au[15] =  ((Value & 0x040 )==0) ? 0 : 1 ;
+		m_au[ 7] = BIT(Value, 7);
+		m_au[15] = BIT(Value, 6);
 		break;
 	}
 
 	case 0x3000:
 	{
-		m_val_mixer = (Value & 7) ;
+		m_val_mixer = Value & 7;
 		break;
 	}
 	default: break;
@@ -632,8 +683,8 @@
 	m_pin_value[17][0] = CAP_N(47.0) ;  /* measured */
 	m_pin_value[17][1] = CAP_N(580.0) ; /* measured */
 	/* R VCO   Version 3*/
-	m_pin_value[18][1] = RES_K(1400.0   );/* Measured 1300, instead of 1Mohm*/
-	m_pin_value[18][0] = RES_K( 203.548 );/* Measured 223, instead of 193.548 (1000 // 240KOhm)*/
+	m_pin_value[18][1] = RES_K(1400.0); /* Measured 1300, instead of 1Mohm*/
+	m_pin_value[18][0] = RES_K(203.548);/* Measured 223, instead of 193.548 (1000 // 240KOhm)*/
 
 	/* VCO Controle*/
 	m_pin_value[16][0] = 0.0;  /* Volts  */
@@ -667,14 +718,14 @@
 	m_pin_value[6][1] = CAP_U(08.60);    /* 0.48*/
 
 	/* Values from schematic */
-	m_pin_value[5][1] = RES_K(3.30 ) ;   /* 330Kohm*/
-	m_pin_value[5][0] = RES_K(1.76 ) ;   /* 76 Kohm*/
+	m_pin_value[5][1] = RES_K(3.30 );    /* 330Kohm*/
+	m_pin_value[5][0] = RES_K(1.76 );    /* 76 Kohm*/
 
 	/* Noise is not controlled by the audio bus! */
 	/* Only value[0] is documented! */
-	m_pin_value[4][0] = RES_K(47) ;      /* 47 K ohm*/
+	m_pin_value[4][0] = RES_K(47);       /* 47 K ohm*/
 	m_pin_value[12][0] = RES_K(100);     /* 100K ohm*/
-	m_pin_value[3][0] = 0 ;              /* NC*/
+	m_pin_value[3][0] = 0;               /* NC*/
 
 	/* Envelope-related */
 	m_pin_value[ 1][0] = 0;
@@ -684,31 +735,18 @@
 	m_pin_value[28][1] = 1;
 
 	/* SN pins initialized to 0 */
-	m_au[0]=0;
-	m_au[1]=0;
-	m_au[2]=0;
-	m_au[3]=0;
-	m_au[4]=0;
-	m_au[5]=0;
-	m_au[6]=0;
-	m_au[7]=0;
-	m_au[8]=0;
-	m_au[9]=0;
-	m_au[10]=0;
-	m_au[11]=0;
-	m_au[12]=0;
-	m_au[13]=0;
-	m_au[14]=0;
-	m_au[15]=0;
+	for (u8 i = 0; i < 16; i++)
+		m_au[i]=0;
+
 	m_val_mixer = 0;
 }
 
 void hec2hrp_state::update_sound(uint8_t data)
 {
 	/* MIXER */
-	m_sn->mixer_a_w(((m_val_mixer & 0x04)==4) ? 1 : 0);
-	m_sn->mixer_b_w(((m_val_mixer & 0x01)==1) ? 1 : 0);
-	m_sn->mixer_c_w(((m_val_mixer & 0x02)==2) ? 1 : 0); /* Measured on HRX*/
+	m_sn->mixer_a_w(BIT(m_val_mixer, 2));
+	m_sn->mixer_b_w(BIT(m_val_mixer, 0));
+	m_sn->mixer_c_w(BIT(m_val_mixer, 1)); /* Measured on HRX*/
 
 	/* VCO oscillator */
 	if (m_au[12]==1)
@@ -716,17 +754,17 @@
 	else
 		m_sn->vco_res_w(m_pin_value[18][m_au[10]]); /* no AU11 */
 
-	m_sn->vco_cap_w(m_pin_value[17][m_au[2 ]]);
+	m_sn->vco_cap_w(m_pin_value[17][m_au[2]]);
 	m_sn->pitch_voltage_w(m_pin_value[19][m_au[15]]);
 	m_sn->vco_voltage_w(m_pin_value[16][m_au[15]]);
 	m_sn->vco_w(m_pin_value[22][m_au[12]]); /* VCO Select Ext/SLF */
 
 	/* SLF */
-	m_sn->slf_res_w(m_pin_value[20][m_au[ 9]]); /* AU10 */
-	m_sn->slf_cap_w(m_pin_value[21][m_au[1 ]]);
+	m_sn->slf_res_w(m_pin_value[20][m_au[9]]); /* AU10 */
+	m_sn->slf_cap_w(m_pin_value[21][m_au[1]]);
 
 	/* One Shot */
-	m_sn->one_shot_res_w(m_pin_value[24][     0]); /* NC */
+	m_sn->one_shot_res_w(m_pin_value[24][0]); /* NC */
 	m_sn->one_shot_cap_w(m_pin_value[23][m_au[13]]);
 
 	/* amplitude value*/
@@ -734,7 +772,7 @@
 
 	/* attack/decay */
 	m_sn->attack_res_w(m_pin_value[10][m_au[ 8]]);
-	m_sn->decay_res_w(m_pin_value[7 ][m_au[11]]);
+	m_sn->decay_res_w(m_pin_value[7][m_au[11]]);
 	m_sn->attack_decay_cap_w(m_pin_value[8][m_au[0]]);
 
 	/* filter */
@@ -746,23 +784,23 @@
 	m_sn->feedback_res_w(m_pin_value[12][0]);
 
 	/* envelope */
-	m_sn->envelope_1_w(m_pin_value[1 ][m_au[6]]);
+	m_sn->envelope_1_w(m_pin_value[1] [m_au[6]]);
 	m_sn->envelope_2_w(m_pin_value[28][m_au[7]]);
 
 	/* finally, enable */
 	m_sn->enable_w(m_pin_value[9][m_au[14]]);
 }
 
-void hec2hrp_state::hector_reset(int hr, int with_d2)
+void hec2hrp_state::hector_reset(bool hr, bool with_d2)
 {
 	// Hector init
 	m_hector_flag_hr = hr;
-	m_flag_clk = 0;
-	m_write_cassette = 0;
+	m_flag_clk = false;
+	m_write_cassette = false;
 	m_maincpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
 
 	// Disc II init
-	if (with_d2 == 1)
+	if (with_d2)
 	{
 		m_disc2cpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
 		m_upd_fdc->reset();
@@ -791,7 +829,6 @@
 void hec2hrp_state::hector_audio(machine_config &config)
 {
 	SPEAKER(config, "mono").front_center();
-	WAVE(config, "wave", m_cassette).add_route(0, "mono", 0.25);  /* Sound level for cassette, as it is in mono => output channel=0*/
 
 	SN76477(config, m_sn);
 	m_sn->set_noise_params(RES_K(47), RES_K(330), CAP_P(390));
@@ -857,7 +894,7 @@
 	m_disc2cpu->pulse_input_line(INPUT_LINE_RESET, attotime::zero);
 	m_upd_fdc->reset();
 	// Select ROM to cold restart
-	membank("bank3")->set_entry(DISCII_BANK_ROM);
+	m_bank[3]->set_entry(DISCII_BANK_ROM);
 
 	// Clear the Hardware's buffers
 	m_hector_disc2_data_r_ready = 0x0; /* =ff when PC2 = true and data is in read buffer (state->m_hector_disc2_data_read) */
@@ -874,13 +911,13 @@
 uint8_t hec2hrp_state::disc2_io00_port_r()
 {
 	/* Switch Disc 2 to RAM */
-	membank("bank3")->set_entry(DISCII_BANK_RAM);
+	m_bank[3]->set_entry(DISCII_BANK_RAM);
 	return 0;
 }
 void hec2hrp_state::disc2_io00_port_w(uint8_t data)
 {
 	/* Switch Disc 2 to RAM */
-	membank("bank3")->set_entry(DISCII_BANK_RAM);
+	m_bank[3]->set_entry(DISCII_BANK_RAM);
 }
 uint8_t hec2hrp_state::disc2_io20_port_r()
 {
diff -Nru mame-0.222+dfsg.1/src/mame/machine/hng64_net.cpp mame-0.224+dfsg.1/src/mame/machine/hng64_net.cpp
--- mame-0.222+dfsg.1/src/mame/machine/hng64_net.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/hng64_net.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,7 +3,7 @@
 /* HNG64 Communication / Network CPU */
 
 // this is driven by a KL5C80A12CFP which is basically a super-charged Z80
-// most of this MMU handling etc. should be moved to the core.
+// MMU handling has been moved to the core; the rest is not implemented yet.
 
 // I believe this CPU is used for network only (the racing games) and not related to the I/O MCU
 
@@ -16,106 +16,17 @@
 #include "includes/hng64.h"
 #include "cpu/z80/kl5c80a12.h"
 
-uint8_t hng64_state::read_comm_data(uint32_t offset)
-{
-	if((offset & 0x10000) == 0)
-		return m_comm_rom[offset & 0xffff];
-
-	if(offset & 0x10000)
-		return m_comm_ram[(offset & 0xffff)];
-
-	printf("%08x\n",offset);
-	return 0xff;
-}
-
-void hng64_state::write_comm_data(uint32_t offset,uint8_t data)
-{
-	if((offset & 0x10000) == 0)
-	{
-		//m_comm_rom[offset];
-		return;
-	}
-	if(offset & 0x10000)
-	{
-		m_comm_ram[offset & 0xffff] = data;
-		return;
-	}
-
-
-	printf("%08x %02x\n",offset,data);
-
-}
-
-uint8_t hng64_state::hng64_comm_space_r(offs_t offset)
-{
-	if((offset & 0xfc00) == 0) // B0 is fixed at 0-0x3ff
-		return m_comm_rom[offset];
-
-	for(int i=0;i<5;i++)
-	{
-		if(offset >= m_mmub[i] && offset <= m_mmub[i+1]-1)
-			return read_comm_data(m_mmua[i]|offset);
-	}
-
-	return 0xff;
-}
-
-void hng64_state::hng64_comm_space_w(offs_t offset, uint8_t data)
-{
-	if((offset & 0xfc00) == 0) // B0 is fixed at 0-0x3ff
-		return;// m_comm_rom[offset];
-
-	for(int i=0;i<5;i++)
-	{
-		if(offset >= m_mmub[i] && offset <= m_mmub[i+1]-1)
-		{
-			write_comm_data(m_mmua[i]|offset,data);
-			return;
-		}
-	}
-}
-
-uint8_t hng64_state::hng64_comm_mmu_r(offs_t offset)
-{
-	return m_mmu_regs[offset];
-}
-
-#define MMUA (m_mmu_regs[(offset&~1)+0]>>6)|(m_mmu_regs[(offset&~1)+1]<<2)
-#define MMUB (m_mmu_regs[(offset&~1)+0]&0x3f)
-
-void hng64_state::hng64_comm_mmu_w(offs_t offset, uint8_t data)
-{
-	m_mmu_regs[offset] = data;
-
-	/* cheap: avoid to overwrite read only params*/
-	if((offset & 6) == 6)
-	{
-		m_mmu_regs[6] = m_mmu_regs[6] & 0x3f;
-		m_mmu_regs[7] = 0xf0;
-
-	}
-
-	{
-		m_mmua[offset/2+1] = (m_mmu_regs[(offset&~1)+0]>>6)|(m_mmu_regs[(offset&~1)+1]<<2);
-		m_mmua[offset/2+1]*= 0x400;
-		m_mmub[offset/2+1] = (m_mmu_regs[(offset&~1)+0]&0x3f);
-		m_mmub[offset/2+1]++;
-		m_mmub[offset/2+1]*= 0x400;
-		//printf("%d A %08x B %04x\n",offset/2,m_mmua[offset/2],m_mmub[offset/2]);
-		//printf("A %04x B %02x\n",MMUA,MMUB);
-	}
-}
-
 void hng64_state::hng_comm_map(address_map &map)
 {
-	map(0x0000, 0xffff).rw(FUNC(hng64_state::hng64_comm_space_r), FUNC(hng64_state::hng64_comm_space_w));
+	map(0x00000, 0x7ffff).rom().region("user2", 0);
+	map(0xf0000, 0xfffff).ram();
 }
 
 void hng64_state::hng_comm_io_map(address_map &map)
 {
 	map.global_mask(0xff);
 	/* Reserved for the KL5C80 internal hardware */
-	map(0x00, 0x07).rw(FUNC(hng64_state::hng64_comm_mmu_r), FUNC(hng64_state::hng64_comm_mmu_w));
+//  map(0x00, 0x07).rw(FUNC(hng64_state::hng64_comm_mmu_r), FUNC(hng64_state::hng64_comm_mmu_w));
 //  map(0x08, 0x1f).noprw();              /* Reserved */
 //  map(0x20, 0x25).rw(hng64_state::));   /* Timer/Counter B */           /* hng64 writes here */
 //  map(0x27, 0x27).noprw();              /* Reserved */
@@ -137,9 +48,6 @@
 {
 //  m_comm->pulse_input_line(INPUT_LINE_NMI, attotime::zero); // reset the CPU and let 'er rip
 //  m_comm->set_input_line(INPUT_LINE_HALT, ASSERT_LINE);     // hold on there pardner...
-
-	m_mmub[0] = 0;
-	m_mmub[5] = 0; // rolls back to 0xffff
 }
 
 void hng64_state::hng64_network(machine_config &config)
diff -Nru mame-0.222+dfsg.1/src/mame/machine/lviv.cpp mame-0.224+dfsg.1/src/mame/machine/lviv.cpp
--- mame-0.222+dfsg.1/src/mame/machine/lviv.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/lviv.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -24,7 +24,7 @@
 {
 	uint8_t *ram = m_ram->pointer();
 
-	if (m_ppi_port_outputs[0][2] & 0x02)
+	if (BIT(m_ppi_port_outputs[0][2], 1))
 	{
 		m_bank[0]->set_base(ram);
 		m_bank[1]->set_base(ram + 0x4000);
@@ -41,17 +41,17 @@
 	machine().schedule_soft_reset();
 }
 
-uint8_t lviv_state::ppi_0_porta_r()
+uint8_t lviv_state::ppi0_porta_r()
 {
 	return 0xff;
 }
 
-uint8_t lviv_state::ppi_0_portb_r()
+uint8_t lviv_state::ppi0_portb_r()
 {
 	return 0xff;
 }
 
-uint8_t lviv_state::ppi_0_portc_r()
+uint8_t lviv_state::ppi0_portc_r()
 {
 	uint8_t data = m_ppi_port_outputs[0][2] & 0x0f;
 	if (m_cassette->input() > 0.038)
@@ -61,32 +61,32 @@
 	return data;
 }
 
-void lviv_state::ppi_0_porta_w(uint8_t data)
+void lviv_state::ppi0_porta_w(uint8_t data)
 {
 	m_ppi_port_outputs[0][0] = data;
 }
 
-void lviv_state::ppi_0_portb_w(uint8_t data)
+void lviv_state::ppi0_portb_w(uint8_t data)
 {
 	m_ppi_port_outputs[0][1] = data;
 	update_palette(data&0x7f);
 }
 
-void lviv_state::ppi_0_portc_w(uint8_t data)/* tape in/out, video memory on/off */
+void lviv_state::ppi0_portc_w(uint8_t data)/* tape in/out, video memory on/off */
 {
 	m_ppi_port_outputs[0][2] = data;
-	if (m_ppi_port_outputs[0][1]&0x80)
-		m_speaker->level_w(data & 0x01);
-	m_cassette->output((data & 0x01) ? -1.0 : 1.0);
+	if (BIT(m_ppi_port_outputs[0][1], 7))
+		m_speaker->level_w(BIT(data, 0));
+	m_cassette->output(BIT(data, 0) ? -1.0 : 1.0);
 	update_memory();
 }
 
-uint8_t lviv_state::ppi_1_porta_r()
+uint8_t lviv_state::ppi1_porta_r()
 {
 	return 0xff;
 }
 
-uint8_t lviv_state::ppi_1_portb_r()/* keyboard reading */
+uint8_t lviv_state::ppi1_portb_r()/* keyboard reading */
 {
 	return ((m_ppi_port_outputs[1][0] & 0x01) ? 0xff : m_key[0]->read()) &
 		   ((m_ppi_port_outputs[1][0] & 0x02) ? 0xff : m_key[1]->read()) &
@@ -98,7 +98,7 @@
 		   ((m_ppi_port_outputs[1][0] & 0x80) ? 0xff : m_key[7]->read());
 }
 
-uint8_t lviv_state::ppi_1_portc_r()/* keyboard reading */
+uint8_t lviv_state::ppi1_portc_r()/* keyboard reading */
 {
 	return ((m_ppi_port_outputs[1][2] & 0x01) ? 0xff : m_key[ 8]->read()) &
 		   ((m_ppi_port_outputs[1][2] & 0x02) ? 0xff : m_key[ 9]->read()) &
@@ -106,17 +106,17 @@
 		   ((m_ppi_port_outputs[1][2] & 0x08) ? 0xff : m_key[11]->read());
 }
 
-void lviv_state::ppi_1_porta_w(uint8_t data)/* kayboard scaning */
+void lviv_state::ppi1_porta_w(uint8_t data)/* kayboard scanning */
 {
 	m_ppi_port_outputs[1][0] = data;
 }
 
-void lviv_state::ppi_1_portb_w(uint8_t data)
+void lviv_state::ppi1_portb_w(uint8_t data)
 {
 	m_ppi_port_outputs[1][1] = data;
 }
 
-void lviv_state::ppi_1_portc_w(uint8_t data)/* kayboard scaning */
+void lviv_state::ppi1_portc_w(uint8_t data)/* kayboard scanning */
 {
 	m_ppi_port_outputs[1][2] = data;
 }
@@ -131,7 +131,7 @@
 	}
 	else
 	{
-		const uint8_t switch_val = (offset >> 4) & 0x3;
+		const uint8_t switch_val = BIT(offset, 4, 2);
 		switch (switch_val)
 		{
 		case 0:
@@ -164,11 +164,11 @@
 		m_bank[0]->set_base(ram);
 		m_bank[1]->set_base(ram + 0x4000);
 		m_bank[2]->set_base(ram + 0x8000);
-		m_bank[3]->set_base(m_maincpu_region->base() + 0x010000);
+		m_bank[3]->set_base(m_maincpu_region->base());
 	}
 	else
 	{
-		const uint8_t switch_val = (offset >> 4) & 0x3;
+		const uint8_t switch_val = BIT(offset, 4, 2);
 		switch (switch_val)
 		{
 		case 0:
@@ -189,7 +189,7 @@
 {
 	address_space &space = m_maincpu->space(AS_PROGRAM);
 
-	m_video_ram = m_ram->pointer() + 0xc000;
+	m_vram = m_ram->pointer() + 0xc000;
 
 	m_startup_mem_map = 1;
 
@@ -199,14 +199,18 @@
 	space.unmap_write(0xC000, 0xffff);
 
 	uint8_t *mem = m_maincpu_region->base();
-	m_bank[0]->set_base(mem + 0x010000);
-	m_bank[1]->set_base(mem + 0x010000);
-	m_bank[2]->set_base(mem + 0x010000);
-	m_bank[3]->set_base(mem + 0x010000);
-
-	/*memset(m_ram->pointer(), 0, sizeof(unsigned char)*0xffff);*/
+	m_bank[0]->set_base(mem);
+	m_bank[1]->set_base(mem);
+	m_bank[2]->set_base(mem);
+	m_bank[3]->set_base(mem);
 }
 
+void lviv_state::machine_start()
+{
+	save_item(NAME(m_colortable));
+	save_item(NAME(m_ppi_port_outputs));
+	save_item(NAME(m_startup_mem_map));
+}
 
 /*******************************************************************************
 Lviv snapshot files (SAV)
diff -Nru mame-0.222+dfsg.1/src/mame/machine/mac.cpp mame-0.224+dfsg.1/src/mame/machine/mac.cpp
--- mame-0.222+dfsg.1/src/mame/machine/mac.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/mac.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -506,315 +506,6 @@
 }
 
 
-/*
-    R Nabet 000531 : added keyboard code
-*/
-
-/* *************************************************************************
- * non-ADB keyboard support
- *
- * The keyboard uses a i8021 (?) microcontroller.
- * It uses a bidirectional synchonous serial line, connected to the VIA (SR feature)
- *
- * Our emulation is more a hack than anything else - the keyboard controller is
- * not emulated, instead we interpret keyboard commands directly.  I made
- * many guesses, which may be wrong
- *
- * todo :
- * * find the correct model number for the Mac Plus keyboard ?
- * * emulate original Macintosh keyboards (2 layouts : US and international)
- *
- * references :
- * * IM III-29 through III-32 and III-39 through III-42
- * * IM IV-250
- * *************************************************************************/
-
-/*
-    scan_keyboard()
-
-    scan the keyboard, and returns key transition code (or nullptr ($7B) if none)
-*/
-#ifndef MAC_USE_EMULATED_KBD
-int mac_state::scan_keyboard()
-{
-	int i, j;
-	int keybuf = 0;
-	int keycode;
-
-	if (m_keycode_buf_index)
-	{
-		return m_keycode_buf[--m_keycode_buf_index];
-	}
-
-	for (i=0; i<7; i++)
-	{
-		keybuf = m_keys[i]->read();
-
-		if (keybuf != m_key_matrix[i])
-		{
-			/* if state has changed, find first bit which has changed */
-			if (LOG_KEYBOARD)
-				logerror("keyboard state changed, %d %X\n", i, keybuf);
-
-			for (j=0; j<16; j++)
-			{
-				if (((keybuf ^ m_key_matrix[i]) >> j) & 1)
-				{
-					/* update m_key_matrix */
-					m_key_matrix[i] = (m_key_matrix[i] & ~ (1 << j)) | (keybuf & (1 << j));
-
-					if (i < 4)
-					{
-						/* create key code */
-						keycode = (i << 5) | (j << 1) | 0x01;
-						if (! (keybuf & (1 << j)))
-						{
-							/* key up */
-							keycode |= 0x80;
-						}
-						return keycode;
-					}
-					else if (i < 6)
-					{
-						/* create key code */
-						keycode = ((i & 3) << 5) | (j << 1) | 0x01;
-
-						if ((keycode == 0x05) || (keycode == 0x0d) || (keycode == 0x11) || (keycode == 0x1b))
-						{
-							/* these keys cause shift to be pressed (for compatibility with mac 128/512) */
-							if (keybuf & (1 << j))
-							{
-								/* key down */
-								if (! (m_key_matrix[3] & 0x0100))
-								{
-									/* shift key is really up */
-									m_keycode_buf[0] = keycode;
-									m_keycode_buf[1] = 0x79;
-									m_keycode_buf_index = 2;
-									return 0x71;    /* "presses" shift down */
-								}
-							}
-							else
-							{   /* key up */
-								if (! (m_key_matrix[3] & 0x0100))
-								{
-									/* shift key is really up */
-									m_keycode_buf[0] = keycode | 0x80;
-									m_keycode_buf[1] = 0x79;
-									m_keycode_buf_index = 2;
-									return 0xF1;    /* "releases" shift */
-								}
-							}
-						}
-
-						if (! (keybuf & (1 << j)))
-						{
-							/* key up */
-							keycode |= 0x80;
-						}
-						m_keycode_buf[0] = keycode;
-						m_keycode_buf_index = 1;
-						return 0x79;
-					}
-					else /* i == 6 */
-					{
-						/* create key code */
-						keycode = (j << 1) | 0x01;
-						if (! (keybuf & (1 << j)))
-						{
-							/* key up */
-							keycode |= 0x80;
-						}
-						m_keycode_buf[0] = keycode;
-						m_keycode_buf_index = 1;
-						return 0x79;
-					}
-				}
-			}
-		}
-	}
-
-	return 0x7B;    /* return nullptr */
-}
-
-/*
-    power-up init
-*/
-void mac_state::keyboard_init()
-{
-	int i;
-
-	/* init flag */
-	m_kbd_comm = false;
-	m_kbd_receive = false;
-	m_kbd_shift_reg=0;
-	m_kbd_shift_count=0;
-
-	/* clear key matrix */
-	for (i=0; i<7; i++)
-	{
-		m_key_matrix[i] = 0;
-	}
-
-	/* purge transmission buffer */
-	m_keycode_buf_index = 0;
-}
-#endif
-
-/******************* Keyboard <-> VIA communication ***********************/
-
-#ifdef MAC_USE_EMULATED_KBD
-
-WRITE_LINE_MEMBER(mac_state::mac_kbd_clk_in)
-{
-	printf("CLK: %d\n", state^1);
-	m_via1->write_cb1(state ? 0 : 1);
-}
-
-WRITE_LINE_MEMBER(mac_state::mac_via_out_cb2)
-{
-	printf("Sending %d to kbd (PC=%x)\n", data, m_maincpu->pc());
-	m_mackbd->data_w((data & 1) ? ASSERT_LINE : CLEAR_LINE);
-}
-
-#else   // keyboard HLE
-
-TIMER_CALLBACK_MEMBER(mac_state::kbd_clock)
-{
-	int i;
-
-	if (m_kbd_comm == true)
-	{
-		for (i=0; i<8; i++)
-		{
-			/* Put data on CB2 if we are sending*/
-			if (m_kbd_receive == false)
-				m_via1->write_cb2(m_kbd_shift_reg&0x80?1:0);
-			m_kbd_shift_reg <<= 1;
-			m_via1->write_cb1(0);
-			m_via1->write_cb1(1);
-		}
-		if (m_kbd_receive == true)
-		{
-			m_kbd_receive = false;
-			/* Process the command received from mac */
-			keyboard_receive(m_kbd_shift_reg & 0xff);
-		}
-		else
-		{
-			/* Communication is over */
-			m_kbd_comm = false;
-		}
-	}
-}
-
-void mac_state::kbd_shift_out(int data)
-{
-	if (m_kbd_comm == true)
-	{
-		m_kbd_shift_reg = data;
-		machine().scheduler().timer_set(attotime::from_msec(1), timer_expired_delegate(FUNC(mac_state::kbd_clock),this));
-	}
-}
-
-WRITE_LINE_MEMBER(mac_state::mac_via_out_cb2)
-{
-	if (m_kbd_comm == false && state == 0)
-	{
-		/* Mac pulls CB2 down to initiate communication */
-		m_kbd_comm = true;
-		m_kbd_receive = true;
-		machine().scheduler().timer_set(attotime::from_usec(100), timer_expired_delegate(FUNC(mac_state::kbd_clock),this));
-	}
-	if (m_kbd_comm == true && m_kbd_receive == true)
-	{
-		/* Shift in what mac is sending */
-		m_kbd_shift_reg = (m_kbd_shift_reg & ~1) | state;
-	}
-}
-
-/*
-    called when inquiry times out (1/4s)
-*/
-TIMER_CALLBACK_MEMBER(mac_state::inquiry_timeout_func)
-{
-	if (LOG_KEYBOARD)
-		logerror("keyboard enquiry timeout\n");
-	kbd_shift_out(0x7B); /* always send nullptr */
-}
-
-/*
-    called when a command is received from the mac
-*/
-void mac_state::keyboard_receive(int val)
-{
-	switch (val)
-	{
-	case 0x10:
-		/* inquiry - returns key transition code, or nullptr ($7B) if time out (1/4s) */
-		if (LOG_KEYBOARD)
-			logerror("keyboard command : inquiry\n");
-
-		m_inquiry_timeout->adjust(
-			attotime(0, DOUBLE_TO_ATTOSECONDS(0.25)), 0);
-		break;
-
-	case 0x14:
-		/* instant - returns key transition code, or nullptr ($7B) */
-		if (LOG_KEYBOARD)
-			logerror("keyboard command : instant\n");
-
-		kbd_shift_out(scan_keyboard());
-		break;
-
-	case 0x16:
-		/* model number - resets keyboard, return model number */
-		if (LOG_KEYBOARD)
-			logerror("keyboard command : model number\n");
-
-		{   /* reset */
-			int i;
-
-			/* clear key matrix */
-			for (i=0; i<7; i++)
-			{
-				m_key_matrix[i] = 0;
-			}
-
-			/* purge transmission buffer */
-			m_keycode_buf_index = 0;
-		}
-
-		/* format : 1 if another device (-> keypad ?) connected | next device (-> keypad ?) number 1-8
-		                    | keyboard model number 1-8 | 1  */
-		/* keyboards :
-		    3 : mac 512k, US and international layout ? Mac plus ???
-		    other values : Apple II keyboards ?
-		*/
-		/* keypads :
-		    ??? : standard keypad (always available on Mac Plus) ???
-		*/
-		kbd_shift_out(0x17);   /* probably wrong */
-		break;
-
-	case 0x36:
-		/* test - resets keyboard, return ACK ($7D) or NAK ($77) */
-		if (LOG_KEYBOARD)
-			logerror("keyboard command : test\n");
-
-		kbd_shift_out(0x7D);   /* ACK */
-		break;
-
-	default:
-		if (LOG_KEYBOARD)
-			logerror("unknown keyboard command 0x%X\n", val);
-
-		kbd_shift_out(0);
-		break;
-	}
-}
-#endif
-
 /* *************************************************************************
  * Mouse
  * *************************************************************************/
@@ -2040,13 +1731,6 @@
 	m_via2_vbl = 0;
 	m_se30_vbl_enable = 0;
 	m_nubus_irq_state = 0xff;
-#ifndef MAC_USE_EMULATED_KBD
-	m_keyboard_reply = 0;
-	m_kbd_comm = 0;
-	m_kbd_receive = 0;
-	m_kbd_shift_reg = 0;
-	m_kbd_shift_count = 0;
-#endif
 	m_mouse_bit_x = m_mouse_bit_y = 0;
 	m_pm_data_send = m_pm_data_recv = m_pm_ack = m_pm_req = m_pm_dptr = 0;
 	m_pm_state = 0;
@@ -2186,16 +1870,11 @@
 	}
 
 	/* setup keyboard */
-#ifndef MAC_USE_EMULATED_KBD
-	keyboard_init();
-	m_inquiry_timeout = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(mac_state::inquiry_timeout_func),this));
-#else
 	/* clear key matrix for macadb */
 	for (int i=0; i<7; i++)
 	{
 		m_key_matrix[i] = 0;
 	}
-#endif
 
 	/* save state stuff */
 	machine().save().register_postload(save_prepost_delegate(FUNC(mac_state::mac_state_load), this));
@@ -2293,24 +1972,6 @@
 		this->adb_vblank();
 	}
 
-#ifndef MAC_USE_EMULATED_KBD
-	/* handle keyboard */
-	if (m_kbd_comm == true && m_kbd_receive == false)
-	{
-		int keycode = scan_keyboard();
-
-		if (keycode != 0x7B)
-		{
-			/* if key pressed, send the code */
-
-			logerror("keyboard enquiry successful, keycode %X\n", keycode);
-
-			m_inquiry_timeout->reset();
-			kbd_shift_out(keycode);
-		}
-	}
-#endif
-
 	/* signal VBlank on CA1 input on the VIA */
 	if ((m_model < MODEL_MAC_II) || (m_model == MODEL_MAC_PB140) || (m_model == MODEL_MAC_PB160) || (m_model == MODEL_MAC_QUADRA_700))
 	{
diff -Nru mame-0.222+dfsg.1/src/mame/machine/mackbd.cpp mame-0.224+dfsg.1/src/mame/machine/mackbd.cpp
--- mame-0.222+dfsg.1/src/mame/machine/mackbd.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/mackbd.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,287 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:R. Belmont
-/*
-    Apple Macintosh original/512/Plus keyboard
-    Emulation by R. Belmont
-
-    Port definitions from "IM Underground Volume 1"
-    http://bitsavers.org/pdf/apple/mac/IM_Underground_Vol_1_1985.pdf
-
-    Key matrix for keyboard:
-
-    Cols  0   1   2   3   4   5   6   7   8    Rows
-          G   B   T   5   0   P   ;   .  n/a     0
-          H  n/a  Y   6   8   I   K   M  Enter   1
-          F   V   R   4   -   [   '   N  Backsp  2
-          D   C   E   3   7   U   J   /   `      3
-          S   X   W   2   9   O   L   ,  Space   4
-          A   Z   Q   1   =   ]  Ret  \  Tab     5
-
-    Port 0:
-
-    x-------  Clock, pulled up, driven by the 8021
-    -x------  Caps Lock
-    --x-----  Row 5 readback (tied to Vcc for keypad)
-    ---x----  Row 4 readback
-    ----x---  Row 3 readback
-    -----x--  Row 2 readback
-    ------x-  Row 1 readback
-    -------x  Row 0 readback
-
-    Port 1:
-
-    x-------  Column 8 strobe
-    -x------  Column 7 strobe
-    --x-----  Column 6 strobe
-    ---x----  Column 5 strobe
-    ----x---  Column 4 strobe
-    -----x--  Column 3 strobe
-    ------x-  Column 2 strobe
-    -------x  Column 1 strobe
-
-    Port 2:
-    x---      Command/Apple
-    -x--      Shift
-    --x-      Column 0 strobe
-    ---x      Data, pulled up, driven by both sides
-
-    The T1 line is "Option".
-
-    There is a later M0110 keyboard version which uses a GI PIC1657; we do not have a dump of that version.
-*/
-
-
-#include "emu.h"
-#include "mackbd.h"
-#include "cpu/mcs48/mcs48.h"
-
-//**************************************************************************
-//  MACROS / CONSTANTS
-//**************************************************************************
-
-#define MACKBD_CPU_TAG  "mackbd"
-
-//**************************************************************************
-//  DEVICE DEFINITIONS
-//**************************************************************************
-
-DEFINE_DEVICE_TYPE(MACKBD, mackbd_device, "mackbd", "Macintosh Keyboard")
-
-ROM_START( mackbd )
-	ROM_REGION(0x800, MACKBD_CPU_TAG, 0)
-	// original Mac keyboard and optional external keypad
-	ROM_LOAD( "ip8021h_2173.bin", 0x000000, 0x000400, CRC(5fbd9a94) SHA1(32a3b58afb445a8675b12a4de3aec2fa00c99222) )
-	// Mac Plus all-in-one keyboard (not yet supported)
-	ROM_LOAD( "341-0332-a.bin", 0x000400, 0x000400, CRC(6554f5b6) SHA1(a80404a122d74721cda13b285c412057c2c78bd7) )
-ROM_END
-
-
-static INPUT_PORTS_START( mackbd )
-	PORT_START("COL0")
-	PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_G) PORT_CHAR('g') PORT_CHAR('G')
-	PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_H) PORT_CHAR('h') PORT_CHAR('H')
-	PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_F) PORT_CHAR('f') PORT_CHAR('F')
-	PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_D) PORT_CHAR('d') PORT_CHAR('D')
-	PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S')
-	PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A')
-
-	PORT_START("COL1")
-	PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_B) PORT_CHAR('b') PORT_CHAR('B')
-	PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN)
-	PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_V) PORT_CHAR('v') PORT_CHAR('V')
-	PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_C) PORT_CHAR('c') PORT_CHAR('C')
-	PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_X) PORT_CHAR('x') PORT_CHAR('X')
-	PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z')
-
-	PORT_START("COL2")
-	PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_T) PORT_CHAR('t') PORT_CHAR('T')
-	PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Y) PORT_CHAR('y') PORT_CHAR('Y')
-	PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_R) PORT_CHAR('r') PORT_CHAR('R')
-	PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_E) PORT_CHAR('e') PORT_CHAR('E')
-	PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W')
-	PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_Q) PORT_CHAR('q') PORT_CHAR('Q')
-
-	PORT_START("COL3")
-	PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_5) PORT_CHAR('5') PORT_CHAR('%')
-	PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_6) PORT_CHAR('6') PORT_CHAR('^')
-	PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_4) PORT_CHAR('4') PORT_CHAR('$')
-	PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_3) PORT_CHAR('3') PORT_CHAR('#')
-	PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_2) PORT_CHAR('2') PORT_CHAR('@')
-	PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_1) PORT_CHAR('1') PORT_CHAR('!')
-
-	PORT_START("COL4")
-	PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_0) PORT_CHAR('0') PORT_CHAR(')')
-	PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_8) PORT_CHAR('8') PORT_CHAR('*')
-	PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_MINUS)  PORT_CHAR('-') PORT_CHAR('_')
-	PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_7) PORT_CHAR('7') PORT_CHAR('&')
-	PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_9) PORT_CHAR('9') PORT_CHAR('(')
-	PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_EQUALS) PORT_CHAR('=') PORT_CHAR('+')
-
-	PORT_START("COL5")
-	PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_P) PORT_CHAR('p') PORT_CHAR('P')
-	PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_I) PORT_CHAR('i') PORT_CHAR('I')
-	PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR('[') PORT_CHAR('{')
-	PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_U) PORT_CHAR('u') PORT_CHAR('U')
-	PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_O) PORT_CHAR('o') PORT_CHAR('O')
-	PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR(']') PORT_CHAR('}')
-
-	PORT_START("COL6")
-	PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COLON)  PORT_CHAR(';') PORT_CHAR(':')
-	PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_K) PORT_CHAR('k') PORT_CHAR('K')
-	PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_QUOTE)  PORT_CHAR('\'') PORT_CHAR('"')
-	PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_J) PORT_CHAR('j') PORT_CHAR('J')
-	PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_L) PORT_CHAR('l') PORT_CHAR('L')
-	PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_ENTER) PORT_CHAR('\r') PORT_NAME("Return")
-
-	PORT_START("COL7")
-	PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_STOP) PORT_CHAR('.') PORT_CHAR('>')
-	PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_M) PORT_CHAR('m') PORT_CHAR('M')
-	PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_N) PORT_CHAR('n') PORT_CHAR('N')
-	PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SLASH) PORT_CHAR('/') PORT_CHAR('?')
-	PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_COMMA) PORT_CHAR(',') PORT_CHAR('<')
-	PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSLASH) PORT_CHAR('\\') PORT_CHAR('|')
-
-	PORT_START("COL8")
-	PORT_BIT(0x0020, IP_ACTIVE_LOW, IPT_UNKNOWN)
-	PORT_BIT(0x0010, IP_ACTIVE_LOW, IPT_UNKNOWN)
-	PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_BACKSPACE)  PORT_CHAR(8)
-	PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TILDE) PORT_CHAR('`') PORT_CHAR('~')
-	PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_SPACE) PORT_CHAR(' ')
-	PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_CODE(KEYCODE_TAB) PORT_CHAR('\t')
-
-	PORT_START("MODS")
-	PORT_BIT(0x0001, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Caps Lock") PORT_CODE(KEYCODE_CAPSLOCK) PORT_TOGGLE
-	PORT_BIT(0x0002, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Option") PORT_CODE(KEYCODE_LALT) PORT_CHAR(UCHAR_SHIFT_2)
-	PORT_BIT(0x0004, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Shift") PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT) PORT_CHAR(UCHAR_SHIFT_1)
-	PORT_BIT(0x0008, IP_ACTIVE_LOW, IPT_KEYBOARD) PORT_NAME("Command") PORT_CODE(KEYCODE_LCONTROL)
-INPUT_PORTS_END
-
-//-------------------------------------------------
-//  device_add_mconfig - add device configuration
-//-------------------------------------------------
-
-void mackbd_device::device_add_mconfig(machine_config &config)
-{
-	mcs48_cpu_device &cpu(I8021(config, m_maincpu, 3000000));   // "the approximate clock rate of the MPU is 3 MHz"
-	cpu.bus_in_cb().set(FUNC(mackbd_device::p0_r));
-	cpu.bus_out_cb().set(FUNC(mackbd_device::p0_w));
-	cpu.p1_in_cb().set(FUNC(mackbd_device::p1_r));
-	cpu.p1_out_cb().set(FUNC(mackbd_device::p1_w));
-	cpu.p2_in_cb().set(FUNC(mackbd_device::p2_r));
-	cpu.p2_out_cb().set(FUNC(mackbd_device::p2_w));
-	cpu.t1_in_cb().set_ioport("MODS").bit(1); // option
-}
-
-const tiny_rom_entry *mackbd_device::device_rom_region() const
-{
-	return ROM_NAME( mackbd );
-}
-
-ioport_constructor mackbd_device::device_input_ports() const
-{
-	return INPUT_PORTS_NAME( mackbd );
-}
-
-//**************************************************************************
-//  LIVE DEVICE
-//**************************************************************************
-
-//-------------------------------------------------
-//  mackbd_device - constructor
-//-------------------------------------------------
-
-mackbd_device::mackbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
-	device_t(mconfig, MACKBD, tag, owner, clock),
-	m_maincpu(*this, MACKBD_CPU_TAG),
-	m_col(*this, "COL%u", 0U),
-	m_clkout_handler(*this),
-	m_dataout_handler(*this)
-{
-}
-
-//-------------------------------------------------
-//  device_start - device-specific startup
-//-------------------------------------------------
-
-void mackbd_device::device_start()
-{
-	m_clkout_handler.resolve_safe();
-	m_dataout_handler.resolve_safe();
-	m_sync = timer_alloc(0);
-}
-
-
-//-------------------------------------------------
-//  device_reset - device-specific reset
-//-------------------------------------------------
-
-void mackbd_device::device_reset()
-{
-	p0 = p1 = p2 = 0xff;
-	datain = true;
-	m_clkout_handler(1);
-	m_dataout_handler(1);
-}
-
-u8 mackbd_device::p0_r()
-{
-	u8 ret = p0;
-
-	for(int i=0; i<8; i++)
-		if(!(p1 & (1<<i)))
-			ret &= m_col[i+1]->read();
-
-	if(!(p2 & 0x02))
-		ret &= m_col[0]->read();
-
-	// capslock
-	if(!(ioport("MODS")->read() & 0x1))
-		ret &= ~0x40;
-
-	return ret;
-}
-
-void mackbd_device::p0_w(u8 data)
-{
-	u8 delta = p0 ^ data;
-	p0 = data;
-
-	if(delta & 0x80)
-		m_sync->adjust(attotime::zero);
-}
-
-void mackbd_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
-{
-	m_clkout_handler(p0 & 0x80 ? ASSERT_LINE : CLEAR_LINE);
-}
-
-u8 mackbd_device::p1_r()
-{
-	return p1;
-}
-
-void mackbd_device::p1_w(u8 data)
-{
-	p1 = data;
-}
-
-u8 mackbd_device::p2_r()
-{
-	// Keypad has bit 5 connected to GND, but this is the keyboard.
-	u8 ret = p2;
-	if(!datain)
-		ret &= 0xfe;
-	ret &= ioport("MODS")->read() | ~0x0c;
-	return ret;
-}
-
-void mackbd_device::p2_w(u8 data)
-{
-	p2 = data;
-	m_dataout_handler(p2 & datain & 1);
-}
-
-void mackbd_device::datain_w(int state)
-{
-	datain = state;
-}
diff -Nru mame-0.222+dfsg.1/src/mame/machine/mackbd.h mame-0.224+dfsg.1/src/mame/machine/mackbd.h
--- mame-0.222+dfsg.1/src/mame/machine/mackbd.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/mackbd.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,58 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:R. Belmont
-#ifndef MAME_MACHINE_MACKBD_H
-#define MAME_MACHINE_MACKBD_H
-
-#pragma once
-
-
-//**************************************************************************
-//  TYPE DEFINITIONS
-//**************************************************************************
-
-// ======================> mackbd_device
-
-class mackbd_device :  public device_t
-{
-public:
-	// config helper
-	auto clkout_handler() { return m_clkout_handler.bind(); }
-	auto dataout_handler() { return m_dataout_handler.bind(); }
-	void datain_w(int state);
-
-	// construction/destruction
-	mackbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-
-protected:
-	// device-level overrides
-	virtual void device_start() override;
-	virtual void device_reset() override;
-	virtual void device_add_mconfig(machine_config &config) override;
-	virtual const tiny_rom_entry *device_rom_region() const override;
-	virtual ioport_constructor device_input_ports() const override;
-	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
-
-private:
-	required_device<cpu_device> m_maincpu;
-	required_ioport_array<9> m_col;
-	devcb_write_line m_clkout_handler;
-	devcb_write_line m_dataout_handler;
-	emu_timer *m_sync;
-
-	u8 p0, p1, p2;
-	bool datain;
-
-	void scan_kbd_col(int col);
-
-	u8 p0_r();
-	void p0_w(u8 data);
-	u8 p1_r();
-	void p1_w(u8 data);
-	u8 p2_r();
-	void p2_w(u8 data);
-};
-
-// device type definition
-DECLARE_DEVICE_TYPE(MACKBD, mackbd_device)
-
-#endif // MAME_MACHINE_MACKBD_H
diff -Nru mame-0.222+dfsg.1/src/mame/machine/mct_adr.cpp mame-0.224+dfsg.1/src/mame/machine/mct_adr.cpp
--- mame-0.222+dfsg.1/src/mame/machine/mct_adr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/mct_adr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -177,6 +177,9 @@
 	m_memory_refresh_rate = 0x18186;
 	m_nvram_protect = 0x7;
 
+	m_dma_invalid_address = 0;
+	m_dma_memory_failed_address = 0;
+
 	m_isr = 0;
 	m_imr = 0x10; // firmware diagnostic expects network interrupts to be unmasked at boot
 
diff -Nru mame-0.222+dfsg.1/src/mame/machine/midwayic.cpp mame-0.224+dfsg.1/src/mame/machine/midwayic.cpp
--- mame-0.222+dfsg.1/src/mame/machine/midwayic.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/midwayic.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -107,11 +107,6 @@
 	m_data[0] = temp & 0xff;
 	m_data[1] = (temp >> 8) & 0xff;
 	m_data[2] = (temp >> 16) & 0xff;
-
-	/* special hack for RevX */
-	m_ormask = 0x80;
-	if (upper == 419)
-		m_ormask = 0x00;
 }
 
 
@@ -130,7 +125,6 @@
 	save_item(NAME(m_idx));
 	save_item(NAME(m_status));
 	save_item(NAME(m_bits));
-	save_item(NAME(m_ormask));
 }
 
 DEFINE_DEVICE_TYPE(MIDWAY_SERIAL_PIC, midway_serial_pic_device, "midway_serial_pic_sim", "Midway Serial PIC Simulation")
@@ -152,8 +146,7 @@
 	m_buff(0),
 	m_idx(0),
 	m_status(0),
-	m_bits(0),
-	m_ormask(0)
+	m_bits(0)
 {
 	memset(m_data,0,sizeof(m_data));
 }
@@ -191,8 +184,11 @@
 
 u8 midway_serial_pic_device::read()
 {
-	logerror("%s:security R = %04X\n", machine().describe_context(), m_buff);
-	m_status = 1;
+	if (!machine().side_effects_disabled())
+	{
+		logerror("%s:security R = %04X\n", machine().describe_context(), m_buff);
+		m_status = 1;
+	}
 	return m_buff;
 }
 
@@ -208,9 +204,8 @@
 	if (!m_status)
 	{
 		/* the self-test writes 1F, 0F, and expects to read an F in the low 4 bits */
-		/* Cruis'n World expects the high bit to be set as well */
 		if (data & 0x0f)
-			m_buff = m_ormask | data;
+			m_buff = data & 0xf;
 		else
 			m_buff = m_data[m_idx++ % sizeof(m_data)];
 	}
@@ -222,6 +217,14 @@
  *  Original serial number PIC
  *  interface - emulation
  *
+ *  PIC16C57 wiring notes:
+ *  PORTA - 4bit command in (usually 0 = read SN#)
+ *  PORTB - 8bit data out
+ *  PORTC bit 7 - access clock in
+ *  PORTC bit 6 - status out
+ *  PORTC bit 2 - in/out (optional) MK41T56N RTC/NVRAM Data
+ *  PORTC bit 1 - out (optional) MK41T56N RTC/NVRAM Clock
+ *
  *************************************/
 
 
@@ -234,6 +237,7 @@
 
 midway_serial_pic_emu_device::midway_serial_pic_emu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
 	device_t(mconfig, MIDWAY_SERIAL_PIC_EMU, tag, owner, clock)
+	, m_pic(*this, "pic")
 {
 }
 
@@ -243,52 +247,62 @@
 
 void midway_serial_pic_emu_device::device_start()
 {
-}
+	save_item(NAME(m_command));
+	save_item(NAME(m_data_out));
+	save_item(NAME(m_clk));
+	save_item(NAME(m_status));
 
+	m_command = 0;
+	m_data_out = 0;
+	m_clk = 0;
+	m_status = 0;
+}
 
-uint8_t midway_serial_pic_emu_device::read_a()
+WRITE_LINE_MEMBER(midway_serial_pic_emu_device::reset_w)
 {
-//  printf("%s: read_a\n", machine().describe_context().c_str());
-	return 0x00;
+	if (!state) // fixme, PIC should be stopped while 0 and start running at 0->1 transition
+		m_pic->reset();
 }
 
-uint8_t midway_serial_pic_emu_device::read_b()
+u8 midway_serial_pic_emu_device::status_r()
 {
-//  printf("%s: read_b\n", machine().describe_context().c_str());
-	return 0x00;
+	return m_status;
 }
 
-uint8_t midway_serial_pic_emu_device::read_c()
+u8 midway_serial_pic_emu_device::read()
 {
-//  used
-//  printf("%s: read_c\n", machine().describe_context().c_str());
-	return 0x00;
+	return m_data_out;
 }
 
-void midway_serial_pic_emu_device::write_a(uint8_t data)
+void midway_serial_pic_emu_device::write(u8 data)
 {
-//  printf("%s: write_a %02x\n", machine().describe_context().c_str(), data);
+	// perhaps this should be split in 2 handlers ?
+	m_command = data & 0x0f;
+	m_clk = BIT(data, 4);
 }
 
-void midway_serial_pic_emu_device::write_b(uint8_t data)
+u8 midway_serial_pic_emu_device::read_c()
 {
-//  printf("%s: write_b %02x\n", machine().describe_context().c_str(), data);
+	u8 data = 0;
+	data |= m_clk << 7;
+	// bit 2 RTC Data
+	return data;
 }
 
-void midway_serial_pic_emu_device::write_c(uint8_t data)
+void midway_serial_pic_emu_device::write_c(u8 data)
 {
-//  used
+	m_status = BIT(data, 6);
+	// bits 1 and 2 is RTC Clock and Data
 //  printf("%s: write_c %02x\n", machine().describe_context().c_str(), data);
 }
 
 void midway_serial_pic_emu_device::device_add_mconfig(machine_config &config)
 {
-	pic16c57_device &pic(PIC16C57(config, "pic", 12000000));    /* ? Mhz */
-	pic.write_a().set(FUNC(midway_serial_pic_emu_device::write_a));
-	pic.read_b().set(FUNC(midway_serial_pic_emu_device::read_b));
-	pic.write_b().set(FUNC(midway_serial_pic_emu_device::write_b));
-	pic.read_c().set(FUNC(midway_serial_pic_emu_device::read_c));
-	pic.write_c().set(FUNC(midway_serial_pic_emu_device::write_c));
+	PIC16C57(config, m_pic, 4000000);    /* ? Mhz */
+	m_pic->read_a().set([this]() { return m_command; });
+	m_pic->write_b().set([this](u8 data) { m_data_out = data; });
+	m_pic->read_c().set(FUNC(midway_serial_pic_emu_device::read_c));
+	m_pic->write_c().set(FUNC(midway_serial_pic_emu_device::write_c));
 }
 
 
@@ -390,17 +404,20 @@
 {
 	uint8_t result = 0;
 
-	/* if we're still holding the data ready bit high, do it */
-	if (m_latch & 0xf00)
+	if (!machine().side_effects_disabled())
 	{
-		if (machine().time() > m_latch_expire_time)
-			m_latch &= 0xff;
-		else
-			m_latch -= 0x100;
-		result = 1;
-	}
+		/* if we're still holding the data ready bit high, do it */
+		if (m_latch & 0xf00)
+		{
+			if (machine().time() > m_latch_expire_time)
+				m_latch &= 0xff;
+			else
+				m_latch -= 0x100;
+			result = 1;
+		}
 
-	logerror("%s:PIC status %d\n", machine().describe_context(), result);
+		logerror("%s:PIC status %d\n", machine().describe_context(), result);
+	}
 	return result;
 }
 
@@ -410,7 +427,8 @@
 	uint8_t result = 0;
 
 	/* PIC data register */
-	logerror("%s:PIC data read (index=%d total=%d latch=%03X) =", machine().describe_context(), m_index, m_total, m_latch);
+	if (!machine().side_effects_disabled())
+		logerror("%s:PIC data read (index=%d total=%d latch=%03X) =", machine().describe_context(), m_index, m_total, m_latch);
 
 	/* return the current result */
 	if (m_latch & 0xf00)
@@ -420,7 +438,8 @@
 	else if (m_index < m_total)
 		result = 0xff;
 
-	logerror("%02X\n", result);
+	if (!machine().side_effects_disabled())
+		logerror("%02X\n", result);
 	return result;
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/machine/midwayic.h mame-0.224+dfsg.1/src/mame/machine/midwayic.h
--- mame-0.222+dfsg.1/src/mame/machine/midwayic.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/midwayic.h	2020-08-26 08:57:19.000000000 +0000
@@ -51,7 +51,6 @@
 	uint8_t   m_idx;
 	uint8_t   m_status;
 	uint8_t   m_bits;
-	uint8_t   m_ormask;
 };
 
 
@@ -66,6 +65,11 @@
 	// construction/destruction
 	midway_serial_pic_emu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+	u8 read();
+	void write(u8 data);
+	u8 status_r();
+	DECLARE_WRITE_LINE_MEMBER(reset_w);
+
 protected:
 	midway_serial_pic_emu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 
@@ -74,12 +78,15 @@
 	virtual void device_start() override;
 
 private:
-	uint8_t read_a();
-	uint8_t read_b();
-	uint8_t read_c();
-	void write_a(uint8_t data);
-	void write_b(uint8_t data);
-	void write_c(uint8_t data);
+	required_device<pic16c57_device> m_pic;
+
+	u8 read_c();
+	void write_c(u8 data);
+
+	u8 m_command;
+	u8 m_data_out;
+	u8 m_clk;
+	u8 m_status;
 };
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/machine/midwunit.cpp mame-0.224+dfsg.1/src/mame/machine/midwunit.cpp
--- mame-0.222+dfsg.1/src/mame/machine/midwunit.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/midwunit.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,10 +7,6 @@
 **************************************************************************/
 
 #include "emu.h"
-#include "cpu/tms34010/tms34010.h"
-#include "cpu/m6809/m6809.h"
-#include "audio/dcs.h"
-#include "includes/midtunit.h"
 #include "includes/midwunit.h"
 
 #define LOG_UNKNOWN (1 << 0)
@@ -64,6 +60,9 @@
 
 void midwunit_state::midwunit_io_w(offs_t offset, uint16_t data, uint16_t mem_mask)
 {
+	// apply I/O shuffling
+	offset = m_ioshuffle[offset % 16];
+
 	offset %= 8;
 	int oldword = m_iodata[offset];
 	int newword = oldword;
@@ -79,6 +78,7 @@
 
 			/* bit 5 (active low) reset security chip */
 			if (m_midway_serial_pic) m_midway_serial_pic->reset_w(newword & 0x20);
+			if (m_midway_serial_pic_emu) m_midway_serial_pic_emu->reset_w(newword & 0x20);
 			break;
 
 		case 3:
@@ -119,6 +119,7 @@
 		{
 			int picret = 0;
 			if (m_midway_serial_pic) picret = m_midway_serial_pic->status_r();
+			if (m_midway_serial_pic_emu) picret = m_midway_serial_pic_emu->status_r();
 
 			return (picret << 12) | midwunit_sound_state_r();
 		}
@@ -160,7 +161,7 @@
 /********************** Mortal Kombat 3 **********************/
 
 
-void midwunit_state::umk3_palette_hack_w(address_space &space, offs_t offset, uint16_t data, uint16_t mem_mask)
+void midwunit_state::umk3_palette_hack_w(offs_t offset, uint16_t data, uint16_t mem_mask)
 {
 	/*
 	    UMK3 uses a circular buffer to hold pending palette changes; the buffer holds 17 entries
@@ -181,7 +182,7 @@
 	    without significantly impacting the rest of the system.
 	*/
 	COMBINE_DATA(&m_umk3_palette[offset]);
-	space.device().execute().adjust_icount(-100);
+	m_maincpu->adjust_icount(-100);
 /*  printf("in=%04X%04X  out=%04X%04X\n", m_umk3_palette[3], m_umk3_palette[2], m_umk3_palette[1], m_umk3_palette[0]); */
 }
 
@@ -209,14 +210,14 @@
 void midwunit_state::init_umk3()
 {
 	init_mk3_common();
-	m_maincpu->space(AS_PROGRAM).install_write_handler(0x0106a060, 0x0106a09f, write16_delegate(*this, FUNC(midwunit_state::umk3_palette_hack_w)));
+	m_maincpu->space(AS_PROGRAM).install_write_handler(0x0106a060, 0x0106a09f, write16s_delegate(*this, FUNC(midwunit_state::umk3_palette_hack_w)));
 	m_umk3_palette = m_mainram + (0x6a060>>4);
 }
 
 void midwunit_state::init_umk3r11()
 {
 	init_mk3_common();
-	m_maincpu->space(AS_PROGRAM).install_write_handler(0x0106a060, 0x0106a09f, write16_delegate(*this, FUNC(midwunit_state::umk3_palette_hack_w)));
+	m_maincpu->space(AS_PROGRAM).install_write_handler(0x0106a060, 0x0106a09f, write16s_delegate(*this, FUNC(midwunit_state::umk3_palette_hack_w)));
 	m_umk3_palette = m_mainram + (0x6a060>>4);
 }
 
@@ -241,6 +242,7 @@
 
 /********************** WWF Wrestlemania **********************/
 
+// note: other game's PCBs probably shuffle I/O addresses too, but only WWF game code use/require this.
 void midwunit_state::wwfmania_io_0_w(uint16_t data)
 {
 	/* start with the originals */
@@ -336,6 +338,7 @@
 {
 	uint16_t picret = 0;
 	if (m_midway_serial_pic) picret = m_midway_serial_pic->read();
+	if (m_midway_serial_pic_emu) picret = m_midway_serial_pic_emu->read();
 	return picret;
 }
 
@@ -345,6 +348,7 @@
 	if (offset == 0 && ACCESSING_BITS_0_7)
 	{
 		if (m_midway_serial_pic) m_midway_serial_pic->write(data);
+		if (m_midway_serial_pic_emu) m_midway_serial_pic_emu->write(data);
 	}
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/machine/midxunit.cpp mame-0.224+dfsg.1/src/mame/machine/midxunit.cpp
--- mame-0.222+dfsg.1/src/mame/machine/midxunit.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/midxunit.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,12 +7,7 @@
 **************************************************************************/
 
 #include "emu.h"
-#include "cpu/tms34010/tms34010.h"
-#include "cpu/m6809/m6809.h"
-#include "audio/dcs.h"
-#include "includes/midtunit.h"
 #include "includes/midxunit.h"
-#include "midwayic.h"
 
 #define LOG_IO      (1 << 0)
 #define LOG_UART    (1 << 1)
@@ -29,14 +24,14 @@
  *
  *************************************/
 
-uint16_t midxunit_state::midxunit_cmos_r(offs_t offset)
+uint8_t midxunit_state::midxunit_cmos_r(offs_t offset)
 {
-	return m_nvram[offset];
+	return m_nvram_data[offset];
 }
 
-void midxunit_state::midxunit_cmos_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void midxunit_state::midxunit_cmos_w(offs_t offset, uint8_t data)
 {
-	COMBINE_DATA(m_nvram+offset);
+	m_nvram_data[offset] = data;
 }
 
 
@@ -105,10 +100,10 @@
  *
  *************************************/
 
-uint16_t midxunit_state::midxunit_status_r()
+uint32_t midxunit_state::midxunit_status_r()
 {
 	/* low bit indicates whether the ADC is done reading the current input */
-	return (m_midway_serial_pic->status_r() << 1) | (m_adc_int ? 1 : 0);
+	return (m_pic_status << 1) | (m_adc_int ? 1 : 0);
 }
 
 
@@ -127,14 +122,9 @@
 }
 
 
-uint16_t midxunit_state::midxunit_uart_r(offs_t offset)
+uint8_t midxunit_state::midxunit_uart_r(offs_t offset)
 {
-	int result = 0;
-
-	/* convert to a byte offset */
-	if (offset & 1)
-		return 0;
-	offset /= 2;
+	uint8_t result = 0;
 
 	/* switch off the offset */
 	switch (offset)
@@ -152,7 +142,7 @@
 			/* non-loopback case: bit 0 means data ready, bit 2 means ok to send */
 			else
 			{
-				int temp = midxunit_sound_state_r();
+				int temp = m_dcs->control_r();
 				result |= (temp & 0x800) >> 9;
 				result |= (~temp & 0x400) >> 10;
 				machine().scheduler().synchronize();
@@ -167,7 +157,11 @@
 
 			/* non-loopback case: read from the DCS system */
 			else
-				result = midxunit_sound_r();
+			{
+				LOGMASKED(LOG_SOUND, "%08X:Sound read\n", m_maincpu->pc());
+
+				result = m_dcs->data_r();
+			}
 			break;
 
 		case 5: /* register 5 seems to be like 3, but with in/out swapped */
@@ -179,7 +173,7 @@
 			/* non-loopback case: bit 0 means data ready, bit 2 means ok to send */
 			else
 			{
-				int temp = midxunit_sound_state_r();
+				int temp = m_dcs->control_r();
 				result |= (temp & 0x800) >> 11;
 				result |= (~temp & 0x400) >> 8;
 				machine().scheduler().synchronize();
@@ -196,14 +190,8 @@
 }
 
 
-void midxunit_state::midxunit_uart_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void midxunit_state::midxunit_uart_w(offs_t offset, uint8_t data)
 {
-	/* convert to a byte offset, ignoring MSB writes */
-	if ((offset & 1) || !ACCESSING_BITS_0_7)
-		return;
-	offset /= 2;
-	data &= 0xff;
-
 	/* switch off the offset */
 	switch (offset)
 	{
@@ -215,7 +203,7 @@
 
 			/* non-loopback case: send to the DCS system */
 			else
-				midxunit_sound_w(0, data, mem_mask);
+				m_dcs->data_w(data);
 			break;
 
 		case 5: /* register 5 write seems to reset things */
@@ -253,12 +241,19 @@
 	m_gun_recoil.resolve();
 	m_gun_led.resolve();
 
+	m_nvram_data = std::make_unique<uint8_t[]>(0x2000);
+	m_nvram->set_base(m_nvram_data.get(), 0x2000);
+
 	save_item(NAME(m_cmos_write_enable));
 	save_item(NAME(m_iodata));
-	save_item(NAME(m_ioshuffle));
 	save_item(NAME(m_uart));
-	save_item(NAME(m_security_bits));
 	save_item(NAME(m_adc_int));
+	save_pointer(NAME(m_nvram_data), 0x2000);
+
+	save_item(NAME(m_pic_command));
+	save_item(NAME(m_pic_data));
+	save_item(NAME(m_pic_clk));
+	save_item(NAME(m_pic_status));
 }
 
 void midxunit_state::machine_reset()
@@ -267,9 +262,10 @@
 	m_dcs->reset_w(0);
 	m_dcs->reset_w(1);
 
-	/* reset I/O shuffling */
-	for (int i = 0; i < 16; i++)
-		m_ioshuffle[i] = i % 8;
+	m_pic_command = 0;
+	m_pic_data = 0;
+	m_pic_clk = 0;
+	m_pic_status = 0;
 
 	m_dcs->set_io_callbacks(write_line_delegate(*this, FUNC(midxunit_state::midxunit_dcs_output_full)), write_line_delegate(*this));
 }
@@ -282,59 +278,49 @@
  *
  *************************************/
 
-uint16_t midxunit_state::midxunit_security_r()
+uint32_t midxunit_state::midxunit_security_r()
 {
-	return m_midway_serial_pic->read();
+	return m_pic_data;
 }
 
-void midxunit_state::midxunit_security_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void midxunit_state::midxunit_security_w(offs_t offset, uint32_t data, uint32_t mem_mask)
 {
 	if (ACCESSING_BITS_0_7)
-		m_security_bits = data & 0x0f;
+		m_pic_command = data & 0x0f;
 }
 
 
-void midxunit_state::midxunit_security_clock_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void midxunit_state::midxunit_security_clock_w(offs_t offset, uint32_t data, uint32_t mem_mask)
 {
-	if (offset == 0 && ACCESSING_BITS_0_7)
-		m_midway_serial_pic->write(((~data & 2) << 3) | m_security_bits);
+	if (ACCESSING_BITS_0_7)
+		m_pic_clk = BIT(data, 1);
 }
 
 
 
 /*************************************
  *
- *  Sound write handlers
+ *  DMA registers (inverted word select)
  *
  *************************************/
 
-uint16_t midxunit_state::midxunit_sound_r()
+uint32_t midxunit_state::midxunit_dma_r(offs_t offset, uint32_t mem_mask)
 {
-	LOGMASKED(LOG_SOUND, "%08X:Sound read\n", m_maincpu->pc());
-
-	return m_dcs->data_r() & 0xff;
-}
+	uint32_t result = 0;
 
+	if (ACCESSING_BITS_16_31)
+		result |= m_video->midtunit_dma_r(offset * 2);
+	if (ACCESSING_BITS_0_15)
+		result |= uint32_t(m_video->midtunit_dma_r(offset * 2 + 1)) << 16;
 
-uint16_t midxunit_state::midxunit_sound_state_r()
-{
-	return m_dcs->control_r();
+	return result;
 }
 
 
-void midxunit_state::midxunit_sound_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void midxunit_state::midxunit_dma_w(offs_t offset, uint32_t data, uint32_t mem_mask)
 {
-	/* check for out-of-bounds accesses */
-	if (offset)
-	{
-		LOGMASKED(LOG_SOUND | LOG_UNKNOWN, "%s: Unexpected write to sound (hi) = %04X\n", machine().describe_context(), data);
-		return;
-	}
-
-	/* call through based on the sound type */
-	if (ACCESSING_BITS_0_7)
-	{
-		LOGMASKED(LOG_SOUND, "%s: Sound write = %04X\n", machine().describe_context(), data);
-		m_dcs->data_w(data & 0xff);
-	}
+	if (ACCESSING_BITS_16_31)
+		m_video->midtunit_dma_w(offset * 2, data & 0xffff);
+	if (ACCESSING_BITS_0_15)
+		m_video->midtunit_dma_w(offset * 2 + 1, data >> 16);
 }
diff -Nru mame-0.222+dfsg.1/src/mame/machine/midyunit.cpp mame-0.224+dfsg.1/src/mame/machine/midyunit.cpp
--- mame-0.222+dfsg.1/src/mame/machine/midyunit.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/midyunit.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -18,6 +18,7 @@
 #define SOUND_CVSD                  3
 #define SOUND_ADPCM                 4
 #define SOUND_YAWDIM                5
+#define SOUND_YAWDIM2               6
 
 
 
@@ -303,6 +304,7 @@
 			break;
 
 		case SOUND_YAWDIM:
+		case SOUND_YAWDIM2:
 			break;
 	}
 }
@@ -450,6 +452,13 @@
 	init_generic(6, SOUND_YAWDIM, 0, 0);
 }
 
+void midyunit_state::init_mkyawdim2()
+{
+	m_audiocpu->space(AS_PROGRAM).install_write_handler(0x9000, 0x97ff, write8smo_delegate(*this, FUNC(midyunit_state::yawdim2_oki_bank_w)));
+	m_audiocpu->space(AS_PROGRAM).install_read_handler(0xa000, 0xa7ff, read8smo_delegate(*this, FUNC(midyunit_state::yawdim2_soundlatch_r)));
+	init_mkyawdim();
+}
+
 
 /*************************************
  *
@@ -551,6 +560,7 @@
 			break;
 
 		case SOUND_YAWDIM:
+		case SOUND_YAWDIM2:
 			break;
 	}
 }
@@ -595,5 +605,10 @@
 				m_soundlatch->write(data);
 				m_audiocpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
 				break;
+
+			case SOUND_YAWDIM2:
+				m_soundlatch->write(data);
+				m_audiocpu->set_input_line(INPUT_LINE_NMI, ASSERT_LINE);
+				break;
 		}
 }
diff -Nru mame-0.222+dfsg.1/src/mame/machine/mikro80.cpp mame-0.224+dfsg.1/src/mame/machine/mikro80.cpp
--- mame-0.222+dfsg.1/src/mame/machine/mikro80.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/mikro80.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,101 +10,90 @@
 
 
 #include "emu.h"
-#include "cpu/i8085/i8085.h"
 #include "includes/mikro80.h"
 
 /* Driver initialization */
 void mikro80_state::init_mikro80()
 {
-	/* set initialy ROM to be visible on first bank */
-	uint8_t *RAM = m_region_maincpu->base();
-	memset(RAM,0x0000,0x0800); // make frist page empty by default
-	m_bank1->configure_entries(1, 2, RAM, 0x0000);
-	m_bank1->configure_entries(0, 2, RAM, 0xf800);
 	m_key_mask = 0x7f;
 }
 
 void mikro80_state::init_radio99()
 {
-	init_mikro80();
 	m_key_mask = 0xff;
 }
 
-uint8_t mikro80_state::mikro80_8255_portb_r()
+u8 mikro80_state::portb_r()
 {
-	uint8_t key = 0xff;
-	if ((m_keyboard_mask & 0x01)!=0) { key &= m_io_line0->read(); }
-	if ((m_keyboard_mask & 0x02)!=0) { key &= m_io_line1->read(); }
-	if ((m_keyboard_mask & 0x04)!=0) { key &= m_io_line2->read(); }
-	if ((m_keyboard_mask & 0x08)!=0) { key &= m_io_line3->read(); }
-	if ((m_keyboard_mask & 0x10)!=0) { key &= m_io_line4->read(); }
-	if ((m_keyboard_mask & 0x20)!=0) { key &= m_io_line5->read(); }
-	if ((m_keyboard_mask & 0x40)!=0) { key &= m_io_line6->read(); }
-	if ((m_keyboard_mask & 0x80)!=0) { key &= m_io_line7->read(); }
+	u8 key = 0xff;
+	for (u8 i = 0; i < 8; i++)
+		if (BIT(m_keyboard_mask, i))
+			key &= m_io_keyboard[i]->read();
+
 	return key & m_key_mask;
 }
 
-uint8_t mikro80_state::mikro80_8255_portc_r()
+u8 mikro80_state::portc_r()
+{
+	return m_io_keyboard[8]->read();
+}
+
+u8 mikro80_state::kristall2_portc_r()
 {
-	return m_io_line8->read();
+	return (m_io_keyboard[8]->read() & 0xfe) | ((m_cassette->input() < 0.04) ? 1 : 0);
 }
 
-void mikro80_state::mikro80_8255_porta_w(uint8_t data)
+void mikro80_state::porta_w(u8 data)
 {
 	m_keyboard_mask = data ^ 0xff;
 }
 
-void mikro80_state::mikro80_8255_portc_w(uint8_t data)
+void mikro80_state::portc_w(u8 data)
 {
+	m_cassette->output(BIT(data, 7) ? 1.0 : -1.0);   // for Kristall2 only
 }
 
-void mikro80_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
+void mikro80_state::machine_start()
 {
-	switch (id)
-	{
-	case TIMER_RESET:
-		m_bank1->set_entry(0);
-		break;
-	default:
-		throw emu_fatalerror("Unknown id in mikro80_state::device_timer");
-	}
+	save_item(NAME(m_keyboard_mask));
+	save_item(NAME(m_key_mask));
 }
 
 void mikro80_state::machine_reset()
 {
-	timer_set(attotime::from_usec(10), TIMER_RESET);
-	m_bank1->set_entry(1);
 	m_keyboard_mask = 0;
-}
 
+	address_space &program = m_maincpu->space(AS_PROGRAM);
+	program.install_rom(0x0000, 0x07ff, m_rom);   // do it here for F3
+	m_rom_shadow_tap = program.install_read_tap(0xf800, 0xffff, "rom_shadow_r",[this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+		{
+			// delete this tap
+			m_rom_shadow_tap->remove();
 
-uint8_t mikro80_state::mikro80_keyboard_r(offs_t offset)
-{
-	return m_ppi8255->read(offset^0x03);
-}
+			// reinstall ram over the rom shadow
+			m_maincpu->space(AS_PROGRAM).install_ram(0x0000, 0x07ff, m_ram);
+		}
 
-void mikro80_state::mikro80_keyboard_w(offs_t offset, uint8_t data)
-{
-	m_ppi8255->write(offset^0x03, data);
+		// return the original data
+		return data;
+	});
 }
 
-
-void mikro80_state::mikro80_tape_w(uint8_t data)
+void mikro80_state::tape_w(u8 data)
 {
-	m_cassette->output(data & 0x01 ? 1 : -1);
+	// Todo: this is incorrect, to be fixed when the CMT schematic can be found
+	m_cassette->output(BIT(data, 0) ? 1.0 : -1.0);
 }
 
 
-uint8_t mikro80_state::mikro80_tape_r()
+u8 mikro80_state::tape_r()
 {
-	double level = m_cassette->input();
-	if (level <  0) {
-			return 0x00;
-	}
-	return 0xff;
+	return (m_cassette->input() < 0.04) ? 0xff : 0;
 }
 
-void mikro80_state::radio99_sound_w(uint8_t data)
+void mikro80_state::sound_w(u8 data)
 {
 	m_dac->write(BIT(data, 1));
 }
diff -Nru mame-0.222+dfsg.1/src/mame/machine/model1io2.cpp mame-0.224+dfsg.1/src/mame/machine/model1io2.cpp
--- mame-0.222+dfsg.1/src/mame/machine/model1io2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/model1io2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -386,7 +386,7 @@
 
 
 //**************************************************************************
-//  FGPA (Virtua Cop)
+//  FPGA (Virtua Cop)
 //**************************************************************************
 
 uint8_t model1io2_device::fpga_r(offs_t offset)
diff -Nru mame-0.222+dfsg.1/src/mame/machine/mpu4.cpp mame-0.224+dfsg.1/src/mame/machine/mpu4.cpp
--- mame-0.222+dfsg.1/src/mame/machine/mpu4.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/mpu4.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -23,6 +23,7 @@
   This is the core driver, no video specific stuff should go in here.
   This driver holds all the mechanical games.
 
+    Old logs shown here from pre-GIT days:
      06-2011: Fixed boneheaded interface glitch that was causing samples to not be cancelled correctly.
               Added the ability to read each segment of an LED display separately, this may be necessary for some
               games that use them as surrogate lamp lines.
@@ -158,7 +159,7 @@
            |   |                 |
            |   |                 |                    PA0-PA7, INPUT AUX1 connector
            |   |                 |
-           |   |                 |             CA2  OUTPUT, serial port Transmit line
+           |   |                 |             CA2  OUTPUT, serial port Transmit line (Tx)
            |   |                 |             CA1  not connected
            |   |                 |             IRQA connected to IRQ of CPU
            |   |                 |
@@ -251,9 +252,8 @@
 TODO: - Distinguish door switches using manual
       - Complete stubs for hoppers (needs slightly better 68681 emulation, and new 'hoppers' device emulation)
       - It seems that the MPU4 core program relies on some degree of persistence when switching strobes and handling
-      writes to the various hardware ports. This explains the occasional lamping/LED blackout and switching bugs
-      For now, we're ignoring any extra writes to strobes, as the alternative is to assign a timer to *everything* and
-      start modelling the individual hysteresis curves of filament lamps.
+      writes to the various hardware ports. This explains the occasional lamping/LED blackout and switching bugs.
+      Ideally, this needs converting to the PWM device, but that will be a complex job with this many outputs.
       - Fix BwB characteriser, need to be able to calculate stabiliser bytes. Anyone fancy reading 6809 source?
       - Strange bug in Andy's Great Escape - Mystery nudge sound effect is not played, mpu4 latches in silence instead (?)
 
@@ -300,7 +300,7 @@
 	if (m_lamp_strobe_ext_persistence == 0)
 	{
 		//One write to reset the drive lines, one with the data, one to clear the lines, so only the 2nd write does anything
-		//Once again, lamp persistences would take care of this, but we can't do that
+		//TODO: PWM
 		for (i = 0; i < 5; i++)
 		{
 			m_lamps[(8*column)+i+128] = BIT(lamp_ext_data, i);
@@ -334,7 +334,7 @@
 			if (m_lamp_strobe_ext != column)
 			{
 				for (i = 0; i < 8; i++)
-				{//CHECK, this includes bit 7
+				{//CHECK, this includes bit 7, which seems wrong
 					m_lamps[(8*column)+i+128+lampbase] = BIT(data, i);
 				}
 				m_lamp_strobe_ext = column;
@@ -348,27 +348,25 @@
 	}
 }
 
-void mpu4_state::led_write_latch(int latch, int data, int column)
+void mpu4_state::led_write_extender(int latch, int data, int starting_column)
 {
-	int diff,i,j;
+	int diff,i,j, ext_strobe;
 
 	diff = (latch ^ m_last_latch) & latch;
-	column = 7 - column; // like main board, these are wired up in reverse
-	data = ~data;//inverted drive lines?
+	ext_strobe = (7 - starting_column) * 8;
 
+	data = ~data;//invert drive lines
 	for (i=0; i<5; i++)
 	{
-		// FIXME: this doesn't look like it could possibly be correct - it can produce 0..17 but with lots of aliasing
 		if (diff & (1<<i))
 		{
-			column += i;
+			for (j=0; j<8; j++)
+			{
+				m_mpu4leds[(ext_strobe + i) | j], BIT(data, j);
+			}
+			m_digits[(ext_strobe + i)] = data;
 		}
 	}
-	for (j=0; j<8; j++)
-	{
-		m_mpu4leds[(column << 3) | j], BIT(data, j);
-	}
-	m_digits[column << 3] = data; // FIXME should this really be so sparse?
 
 	m_last_latch = diff;
 }
@@ -465,12 +463,10 @@
 	m_chr_value     = 0;
 
 
-	{
-		if (m_numbanks)
-			m_bank1->set_entry(m_numbanks);
+	if (m_numbanks)
+		m_bank1->set_entry(m_numbanks);
 
-		m_maincpu->reset();
-	}
+	m_maincpu->reset();
 }
 
 
@@ -512,7 +508,6 @@
 {
 //  printf("bankswitch_w %02x\n", data);
 
-	// m_pageset is never even set??
 	m_pageval = (data & 0x03);
 	m_bank1->set_entry((m_pageval + (m_pageset ? 4 : 0)) & m_numbanks);
 }
@@ -528,8 +523,6 @@
 {
 //  printf("bankset_w %02x\n", data);
 
-	// m_pageset is never even set??
-
 	m_pageval = (data - 2);//writes 2 and 3, to represent 0 and 1 - a hangover from the half page design?
 	m_bank1->set_entry((m_pageval + (m_pageset ? 4 : 0)) & m_numbanks);
 }
@@ -605,7 +598,6 @@
 		{
 			/* Some games (like Connect 4) use 'programmable' LED displays, built from light display lines in section 2. */
 			/* These are mostly low-tech machines, where such wiring proved cheaper than an extender card */
-			/* TODO: replace this with 'segment' lamp masks, to make it more generic */
 			uint8_t pled_segs[2] = {0,0};
 
 			static const int lamps1[8] = { 106, 107, 108, 109, 104, 105, 110, 111 };
@@ -713,6 +705,13 @@
 }
 
 
+WRITE_LINE_MEMBER(mpu4_state::dataport_rxd)
+{
+	m_serial_data = state;
+	m_pia4->cb1_w(state);
+	LOG_IC3(("Dataport RX %x\n",state));
+}
+
 /* IC4, 7 seg leds, 50Hz timer reel sensors, current sensors */
 void mpu4_state::pia_ic4_porta_w(uint8_t data)
 {
@@ -751,16 +750,13 @@
 
 uint8_t mpu4_state::pia_ic4_portb_r()
 {
-	/// TODO: this shouldn't be clocked from a read callback
 	if ( m_serial_data )
 	{
 		m_ic4_input_b |=  0x80;
-		m_pia4->cb1_w(1);
 	}
 	else
 	{
 		m_ic4_input_b &= ~0x80;
-		m_pia4->cb1_w(0);
 	}
 
 	if (!m_reel_mux)
@@ -819,7 +815,7 @@
 
 WRITE_LINE_MEMBER(mpu4_state::pia_ic4_cb2_w)
 {
-	LOG_IC3(("%s: IC4 PIA Write CA (input MUX strobe /LED B), %02X\n", machine().describe_context(),state));
+	LOG_IC3(("%s: IC4 PIA Write CB (Reel optic flag), %02X\n", machine().describe_context(),state));
 	m_reel_flag=state;
 }
 
@@ -874,7 +870,7 @@
 	case NO_EXTENDER:
 		if (m_led_extender == CARD_B)
 		{
-			led_write_latch(data & 0x1f, m_pia4->a_output(),m_input_strobe);
+			led_write_extender(data & 0x1f, m_pia4->a_output(),m_input_strobe);
 		}
 		else if ((m_led_extender != CARD_A) && (m_led_extender != NO_EXTENDER))
 		{
@@ -1029,10 +1025,22 @@
 	}
 	if (m_led_extender == CARD_A)
 	{
-		led_write_latch(data & 0x07, m_pia4->a_output(),m_input_strobe);
+		led_write_extender(data & 0x07, m_pia4->a_output(),m_input_strobe);
+	}
+	else if (m_led_extender == SIMPLE_CARD)
+	{
+		if(m_led_strobe != m_input_strobe)
+		{
+			for(int i=0; i<8; i++)
+			{
+				m_mpu4leds[( ( (7 - m_input_strobe) + 8) << 3) | i] = BIT(m_pia4->a_output(), i);
+			}
+			m_digits[(7 - m_input_strobe) + 8] = m_pia4->a_output();
+		}
+		m_led_strobe = m_input_strobe;
 	}
-
 }
+
 uint8_t mpu4_state::pia_ic5_portb_r()
 {
 	if (m_hopper == HOPPER_NONDUART_B)
@@ -1068,7 +1076,7 @@
 WRITE_LINE_MEMBER(mpu4_state::pia_ic5_ca2_w)
 {
 	LOG(("%s: IC5 PIA Write CA2 (Serial Tx) %2x\n",machine().describe_context(),state));
-	m_serial_data = state;
+	m_dataport->write_txd(state);
 }
 
 
@@ -1357,6 +1365,7 @@
 			}
 
 			{
+				LOG_SS(("%s: GAMEBOARD: Volume Set to %2x\n", machine().describe_context(),data));
 				float percent = (32-m_global_volume)/32.0;
 				m_msm6376->set_output_gain(0, percent);
 				m_msm6376->set_output_gain(1, percent);
@@ -1388,7 +1397,6 @@
 WRITE_LINE_MEMBER(mpu4_state::pia_gb_ca2_w)
 {
 	LOG_SS(("%s: GAMEBOARD: OKI RESET data = %02X\n", machine().describe_context(), state));
-
 //  reset line
 }
 
@@ -1398,6 +1406,7 @@
 	if (m_bwb_bank)
 	{
 		//printf("pia_gb_cb2_w %d\n", state);
+		//m_pageset?
 		m_pageval = state;
 		m_bank1->set_entry((m_pageval + (m_pageset ? 4 : 0)) & m_numbanks);
 	}
@@ -1583,17 +1592,17 @@
 	PORT_DIPSETTING(    0x80, DEF_STR( On  ) )
 
 	PORT_START("AUX1")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("0")
-	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("1")
-	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("2")
-	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("3")
-	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("4")
-	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("5")
-	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("6")
-	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("7")
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_0")
+	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_1")
+	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_2")
+	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_3")
+	PORT_BIT(0x10, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_4")
+	PORT_BIT(0x20, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_5")
+	PORT_BIT(0x40, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_6")
+	PORT_BIT(0x80, IP_ACTIVE_HIGH, IPT_OTHER) PORT_NAME("A1_7")
 
 	PORT_START("AUX2")
-	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM)
+	PORT_BIT(0x01, IP_ACTIVE_HIGH, IPT_CUSTOM) //Lockouts, in same order as below
 	PORT_BIT(0x02, IP_ACTIVE_HIGH, IPT_CUSTOM)
 	PORT_BIT(0x04, IP_ACTIVE_HIGH, IPT_CUSTOM)
 	PORT_BIT(0x08, IP_ACTIVE_HIGH, IPT_CUSTOM)
@@ -2380,6 +2389,11 @@
 	m_led_extender = CARD_C;
 }
 
+void mpu4_state::init_m4_led_simple()
+{
+	m_led_extender = SIMPLE_CARD;
+}
+
 //TODO: Replace with standard six reels once sets are sorted out - is really six_reel_std
 void mpu4_state::init_m4altreels()
 {
@@ -3048,6 +3062,9 @@
 	m_pia8->irqb_handler().set(FUNC(mpu4_state::cpu0_irq));
 
 	METERS(config, m_meters, 0).set_number(8);
+
+	BACTA_DATALOGGER(config, m_dataport, 0);
+	m_dataport->rxd_handler().set(FUNC(mpu4_state::dataport_rxd));
 }
 
 void mpu4_state::mpu4_common2(machine_config &config)
@@ -3056,15 +3073,14 @@
 	m_ptm_ic3ss->set_external_clocks(0, 0, 0);
 	m_ptm_ic3ss->o1_callback().set("ptm_ic3ss", FUNC(ptm6840_device::set_c2));
 	m_ptm_ic3ss->o2_callback().set("ptm_ic3ss", FUNC(ptm6840_device::set_c1));
-	//m_ptm_ic3ss->o3_callback().set("ptm_ic3ss", FUNC(ptm6840_device::set_g1));
-	//m_ptm_ic3ss->irq_callback().set(FUNC(mpu4_state::cpu1_ptm_irq));
+	m_ptm_ic3ss->o3_callback().set("ptm_ic3ss", FUNC(ptm6840_device::set_g1));
 
-	pia6821_device &pia_ic4ss(PIA6821(config, "pia_ic4ss", 0));
-	pia_ic4ss.readpb_handler().set(FUNC(mpu4_state::pia_gb_portb_r));
-	pia_ic4ss.writepa_handler().set(FUNC(mpu4_state::pia_gb_porta_w));
-	pia_ic4ss.writepb_handler().set(FUNC(mpu4_state::pia_gb_portb_w));
-	pia_ic4ss.ca2_handler().set(FUNC(mpu4_state::pia_gb_ca2_w));
-	pia_ic4ss.cb2_handler().set(FUNC(mpu4_state::pia_gb_cb2_w));
+	PIA6821(config, m_pia_ic4ss, 0);
+	m_pia_ic4ss->readpb_handler().set(FUNC(mpu4_state::pia_gb_portb_r));
+	m_pia_ic4ss->writepa_handler().set(FUNC(mpu4_state::pia_gb_porta_w));
+	m_pia_ic4ss->writepb_handler().set(FUNC(mpu4_state::pia_gb_portb_w));
+	m_pia_ic4ss->ca2_handler().set(FUNC(mpu4_state::pia_gb_ca2_w));
+	m_pia_ic4ss->cb2_handler().set(FUNC(mpu4_state::pia_gb_cb2_w));
 }
 
 /* machine driver for MOD 2 board */
@@ -3130,7 +3146,7 @@
 	mpu4_common2(config);
 	mpu4_std_6reel(config);
 
-	OKIM6376(config, m_msm6376, 128000);     //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz
+	OKIM6376(config, m_msm6376, 128000);     //Adjusted by IC3, default to 16KHz sample. Can also be 85430 at 10.5KHz and 64000 at 8KHz
 	m_msm6376->add_route(ALL_OUTPUTS, "lspeaker", 1.0);
 	m_msm6376->add_route(ALL_OUTPUTS, "rspeaker", 1.0);
 }
@@ -3143,7 +3159,7 @@
 	mpu4_common2(config);
 	mpu4_type2_6reel(config);
 
-	OKIM6376(config, m_msm6376, 128000);     //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz
+	OKIM6376(config, m_msm6376, 128000);     //Adjusted by IC3, default to 16KHz sample. Can also be 85430 at 10.5KHz and 64000 at 8KHz
 	m_msm6376->add_route(ALL_OUTPUTS, "lspeaker", 1.0);
 	m_msm6376->add_route(ALL_OUTPUTS, "rspeaker", 1.0);
 }
@@ -3156,7 +3172,7 @@
 	mpu4_common2(config);
 	mpu4_std_5reel(config);
 
-	OKIM6376(config, m_msm6376, 128000);     //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz
+	OKIM6376(config, m_msm6376, 128000);     //Adjusted by IC3, default to 16KHz sample. Can also be 85430 at 10.5KHz and 64000 at 8KHz
 	m_msm6376->add_route(ALL_OUTPUTS, "lspeaker", 1.0);
 	m_msm6376->add_route(ALL_OUTPUTS, "rspeaker", 1.0);
 }
@@ -3168,7 +3184,7 @@
 	mpu4_common2(config);
 	mpu4_bwb_5reel(config);
 
-	OKIM6376(config, m_msm6376, 128000);     //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz
+	OKIM6376(config, m_msm6376, 128000);     //Adjusted by IC3, default to 16KHz sample. Can also be 85430 at 10.5KHz and 64000 at 8KHz
 	m_msm6376->add_route(ALL_OUTPUTS, "lspeaker", 1.0);
 	m_msm6376->add_route(ALL_OUTPUTS, "rspeaker", 1.0);
 }
diff -Nru mame-0.222+dfsg.1/src/mame/machine/n64.cpp mame-0.224+dfsg.1/src/mame/machine/n64.cpp
--- mame-0.222+dfsg.1/src/mame/machine/n64.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/n64.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1653,7 +1653,7 @@
 		time recommended for letting the SI devices settle after startup.
 		This allows the initialization routines for the SI to see that a
 		proper amount of time has passed since system startup. */
-		m_vr4300->burn_cycles(93750000/2);
+		m_vr4300->adjust_icount(-93750000/2);
 	}
 
 	if(offset > 0x1c/4)
diff -Nru mame-0.222+dfsg.1/src/mame/machine/namco65.cpp mame-0.224+dfsg.1/src/mame/machine/namco65.cpp
--- mame-0.222+dfsg.1/src/mame/machine/namco65.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/namco65.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -164,7 +164,7 @@
 	map(0x3003, 0x3003).r(FUNC(namcoc65_device::mcudi3_r));
 	map(0x5000, 0x57ff).rw(FUNC(namcoc65_device::dpram_byte_r), FUNC(namcoc65_device::dpram_byte_w));
 	map(0x6000, 0x6fff).nopr(); /* watchdog */
-	map(0x8000, 0xffff).rom().region("external", 0);; /* external ROM socket */
+	map(0x8000, 0xffff).rom().region("external", 0); /* external ROM socket */
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/machine/namcos2.cpp mame-0.224+dfsg.1/src/mame/machine/namcos2.cpp
--- mame-0.222+dfsg.1/src/mame/machine/namcos2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/namcos2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -80,13 +80,12 @@
 	for (int i = 0; i < 0x10; i++)
 		m_audiobank->configure_entry(i, memregion("audiocpu")->base() + (i % max) * 0x4000);
 
+	save_pointer(NAME(m_eeprom), 0x2000);
+	save_item(NAME(m_sendval));
 }
 
 void namcos2_state::machine_reset()
 {
-//  address_space &space = m_maincpu->space(AS_PROGRAM);
-//  address_space &audio_space = m_audiocpu->space(AS_PROGRAM);
-
 	/* Initialise the bank select in the sound CPU */
 	m_audiobank->set_entry(0); /* Page in bank 0 */
 
@@ -203,7 +202,7 @@
 		break;
 
 	case NAMCOS2_STEEL_GUNNER_2:
-		switch( offset )
+		switch(offset)
 		{
 			case 4: return 0x15a;
 		}
@@ -360,20 +359,19 @@
 
 void namcos2_state::namcos2_68k_key_w(offs_t offset, uint16_t data)
 {
-	int gametype = m_gametype;
-	if( gametype == NAMCOS2_MARVEL_LAND && offset == 5 )
+	if( m_gametype == NAMCOS2_MARVEL_LAND && offset == 5 )
 	{
 		if (data == 0x615E) m_sendval = 1;
 	}
-	if( gametype == NAMCOS2_ROLLING_THUNDER_2 && offset == 4 )
+	if( m_gametype == NAMCOS2_ROLLING_THUNDER_2 && offset == 4 )
 	{
 		if (data == 0x13EC) m_sendval = 1;
 	}
-	if( gametype == NAMCOS2_ROLLING_THUNDER_2 && offset == 7 )
+	if( m_gametype == NAMCOS2_ROLLING_THUNDER_2 && offset == 7 )
 	{
 		if (data == 0x13EC) m_sendval = 1;
 	}
-	if( gametype == NAMCOS2_MARVEL_LAND && offset == 6 )
+	if( m_gametype == NAMCOS2_MARVEL_LAND && offset == 6 )
 	{
 		if (data == 0x1001) m_sendval = 0;
 	}
diff -Nru mame-0.222+dfsg.1/src/mame/machine/nl_breakout.cpp mame-0.224+dfsg.1/src/mame/machine/nl_breakout.cpp
--- mame-0.222+dfsg.1/src/mame/machine/nl_breakout.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/nl_breakout.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -345,7 +345,7 @@
 	TTL_7408_DIP(H2)
 	TTL_7427_DIP(H3)
 	TTL_7400_DIP(H4)
-	DM9312_DIP(H5)
+	TTL_9312_DIP(H5)
 	TTL_9310_DIP(H6)
 	TTL_7408_DIP(H7)
 
@@ -355,7 +355,7 @@
 	TTL_74175_DIP(J1)
 	TTL_7404_DIP(J2)
 	TTL_7402_DIP(J3)
-	DM9312_DIP(J4)
+	TTL_9312_DIP(J4)
 	TTL_7448_DIP(J5)
 	TTL_9310_DIP(J6)
 	TTL_7420_DIP(J7)
@@ -366,7 +366,7 @@
 	TTL_7486_DIP(K2)
 	TTL_7430_DIP(K3)
 	TTL_7408_DIP(K4)
-	DM9312_DIP(K5)
+	TTL_9312_DIP(K5)
 	TTL_9310_DIP(K6)
 	TTL_7486_DIP(K7)
 	TTL_7474_DIP(K8)
@@ -376,7 +376,7 @@
 	TTL_7486_DIP(L2)
 	TTL_82S16_DIP(L3) // Ram chip
 	TTL_7411_DIP(L4)
-	DM9312_DIP(L5)
+	TTL_9312_DIP(L5)
 	TTL_9310_DIP(L6)
 	TTL_7486_DIP(L7)
 	TTL_74193_DIP(L8)
@@ -386,7 +386,7 @@
 	TTL_7483_DIP(M2)
 	TTL_7486_DIP(M3)
 	TTL_7410_DIP(M4)
-	DM9312_DIP(M5)
+	TTL_9312_DIP(M5)
 	TTL_9310_DIP(M6)
 	TTL_7427_DIP(M8)
 	TTL_7404_DIP(M9)
@@ -395,7 +395,7 @@
 	TTL_7483_DIP(N2)
 	TTL_7486_DIP(N3)
 	TTL_7411_DIP(N4)
-	DM9312_DIP(N5)
+	TTL_9312_DIP(N5)
 	TTL_9310_DIP(N6)
 	TTL_7408_DIP(N7)
 
diff -Nru mame-0.222+dfsg.1/src/mame/machine/nl_dpatrol.cpp mame-0.224+dfsg.1/src/mame/machine/nl_dpatrol.cpp
--- mame-0.222+dfsg.1/src/mame/machine/nl_dpatrol.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/nl_dpatrol.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -473,8 +473,8 @@
 
 	TTL_9322(C7, 16H, S5, S1, S6, S2, GROUND, S4, GROUND, S3, GROUND)
 	TTL_7448(C6, C7.Y1, C7.Y2, C7.Y4, C7.Y3, P, SCORE_WINDOW, 16H)
-	DM9312(B6, 2H, 4H, 8H, 8H, C6.f, GROUND, GROUND, C6.b, C6.e, GROUND, GROUND, C6.c)
-	DM9312(A6, 2V, 4V, 8V, 8H, C6.a, GROUND, GROUND, C6.g, GROUND,  GROUND, GROUND, C6.d)
+	TTL_9312(B6, 2H, 4H, 8H, 8H, C6.f, GROUND, GROUND, C6.b, C6.e, GROUND, GROUND, C6.c)
+	TTL_9312(A6, 2V, 4V, 8V, 8H, C6.a, GROUND, GROUND, C6.g, GROUND,  GROUND, GROUND, C6.d)
 	TTL_7408_AND(B5_4, A6.YQ, B6.YQ)
 	TTL_7474(A5_1, CLOCK, B5_4.Q, P, P)
 	ALIAS(COMP_SCORE_Q, A5_1.Q)
diff -Nru mame-0.222+dfsg.1/src/mame/machine/nl_palestra.cpp mame-0.224+dfsg.1/src/mame/machine/nl_palestra.cpp
--- mame-0.222+dfsg.1/src/mame/machine/nl_palestra.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/nl_palestra.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -26,6 +26,14 @@
 
 #define SLOW_BUT_ACCURATE 0
 
+#ifndef __PLIB_PREPROCESSOR__
+#if defined(__GNUC__) && !defined(__clang__)
+	#if defined(__MINGW32__) && !defined(__x86_64) && defined(__i386__) && ((__GNUC__ > 10) || ((__GNUC__ == 10) && (__GNUC_MINOR__ >= 0)))
+		#pragma GCC optimize ("O1")
+	#endif
+#endif
+#endif
+
 NETLIST_START(palestra)
 
 //  SOLVER(Solver, 10000000) to maintain accuracy when SLOW is set and CAP()s are connected
diff -Nru mame-0.222+dfsg.1/src/mame/machine/nl_stuntcyc.cpp mame-0.224+dfsg.1/src/mame/machine/nl_stuntcyc.cpp
--- mame-0.222+dfsg.1/src/mame/machine/nl_stuntcyc.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/nl_stuntcyc.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -443,8 +443,8 @@
 
 	TTL_9322(C7, 16H, S5, S1, S6, S2, GROUND, S3, GROUND, S4, GROUND)
 	TTL_7448(C6, C7.Y1, C7.Y2, C7.Y3, C7.Y4, P, SCORE_WINDOW, 16H)
-	DM9312(B6, 2H, 4H, 8V, 8H, C6.f, GROUND, GROUND, C6.b, C6.e, GROUND, GROUND, C6.c)
-	DM9312(A6, 2V, 4V, 8V, 8H, C6.a, GROUND, GROUND, C6.g, GROUND,  GROUND, GROUND, C6.d)
+	TTL_9312(B6, 2H, 4H, 8V, 8H, C6.f, GROUND, GROUND, C6.b, C6.e, GROUND, GROUND, C6.c)
+	TTL_9312(A6, 2V, 4V, 8V, 8H, C6.a, GROUND, GROUND, C6.g, GROUND,  GROUND, GROUND, C6.d)
 	TTL_7408_AND(B5_4, A6.YQ, B6.YQ)
 	TTL_7474(A5_1, CLOCK, B5_4.Q, P, P)
 	ALIAS(COMP_SCORE_Q, A5_1.Q)
diff -Nru mame-0.222+dfsg.1/src/mame/machine/nl_stuntcyc.h mame-0.224+dfsg.1/src/mame/machine/nl_stuntcyc.h
--- mame-0.222+dfsg.1/src/mame/machine/nl_stuntcyc.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/nl_stuntcyc.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,6 +1,12 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
+#ifndef MAME_MACHINE_NL_STUNTCYC_H
+#define MAME_MACHINE_NL_STUNTCYC_H
+
+#pragma once
 
 #include "netlist/nl_setup.h"
 
 NETLIST_EXTERNAL(stuntcyc)
+
+#endif // MAME_MACHINE_NL_STUNTCYC_H
diff -Nru mame-0.222+dfsg.1/src/mame/machine/nl_tank.cpp mame-0.224+dfsg.1/src/mame/machine/nl_tank.cpp
--- mame-0.222+dfsg.1/src/mame/machine/nl_tank.cpp	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/nl_tank.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,1931 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+
+/***************************************************************************
+
+  Netlist (tank) included from atarittl.cpp
+
+***************************************************************************/
+
+#include "netlist/devices/net_lib.h"
+
+static NETLIST_START(NE556_DIP)
+	NE555(A)
+	NE555(B)
+
+	NET_C(A.GND, B.GND)
+	NET_C(A.VCC, B.VCC)
+
+	DIPPINS(      /*        +--------------+        */
+		 A.DISCH, /* 1DISCH |1     ++    14| VCC    */ A.VCC,
+		A.THRESH, /* 1THRES |2           13| 2DISCH */ B.DISCH,
+		  A.CONT, /*  1CONT |3           12| 2THRES */ B.THRESH,
+		 A.RESET, /* 1RESET |4   NE556   11| 2CONT  */ B.CONT,
+		   A.OUT, /*   1OUT |5           10| 2RESET */ B.RESET,
+		  A.TRIG, /*  1TRIG |6            9| 2OUT   */ B.OUT,
+		   A.GND, /*    GND |7            8| 2TRIG  */ B.TRIG
+				  /*        +--------------+        */
+	)
+NETLIST_END()
+
+NETLIST_START(tank)
+
+	SOLVER(Solver, 16000)
+	PARAM(Solver.ACCURACY, 5e-4)
+	PARAM(Solver.DYNAMIC_TS, 1)
+	PARAM(Solver.DYNAMIC_LTE, 1e-2)
+	PARAM(Solver.DYNAMIC_MIN_TIMESTEP, 1e-7)
+
+	ANALOG_INPUT(V5, 5)
+	ANALOG_INPUT(V12, 12)
+	//ANALOG_INPUT(VM12, GND)
+	ALIAS(VCC, V5)
+	ALIAS(P, V5)
+
+	LOCAL_SOURCE(NE556_DIP)
+
+	RES(R4, RES_K(3.3))
+	RES(R5, RES_K(3.3))
+	RES(R6, RES_K(3.3))
+	RES(R7, RES_K(3.3))
+	RES(R7V, 680)
+	RES(R8, RES_K(3.3))
+	RES(R8A, 470)
+	RES(R9, RES_K(3.3))
+	RES(R9A, 470)
+	RES(R10, RES_K(3.3))
+	RES(R10A, 470)
+	RES(R11, RES_K(3.3))
+	RES(R11A, 470)
+	RES(R3V, 560)
+	RES(R4V, RES_K(1))
+	RES(R5V, RES_K(1))
+	RES(R6V, RES_K(1))
+	RES(R13, RES_K(4.7))
+	RES(R15, RES_K(47))
+	RES(R16, RES_K(33))
+	RES(R19, RES_K(1)) // Guess; VGLTank.pdf doesn't say.
+	RES(R20, RES_K(1)) // Guess; VGLTank.pdf doesn't say.
+	RES(R21, RES_K(1)) // Guess; VGLTank.pdf doesn't say.
+	RES(R22, RES_K(1)) // Guess; VGLTank.pdf doesn't say.
+	RES(R23, RES_K(1)) // Guess; VGLTank.pdf doesn't say.
+	RES(R24, RES_K(1)) // Guess; VGLTank.pdf doesn't say.
+	RES(R25, RES_K(1)) // Guess; VGLTank.pdf doesn't say.
+	RES(R26, RES_K(1)) // Guess; VGLTank.pdf doesn't say.
+	RES(R27, 470)
+	RES(R28, RES_M(1.8))
+	RES(R29, RES_M(1.8))
+	RES(R32, 470)
+	RES(R34V, 560)
+	//RES(R35M2, RES_K(100))
+	//RES(R36M1, RES_K(100))
+	RES(R37A, RES_K(100))
+	RES(R38, RES_K(100))
+	RES(R40, RES_K(4.7))
+	RES(R41, RES_K(4.7))
+	RES(R42, 100)
+	RES(R43, 100)
+	//RES(R48A, 560)
+	RES(R48B, RES_K(4.7))
+	RES(R49B, RES_K(4.7))
+	RES(R50B, RES_K(4.7))
+	RES(R51B, RES_K(4.7))
+	RES(R52B, 100)
+	RES(R53A, RES_K(220))
+	RES(R53B, 100)
+	RES(R54A, RES_K(680))
+	RES(R54B, 100)
+	RES(R55A, RES_K(10))
+	RES(R55B, 100)
+	RES(R56A, RES_K(100))
+	RES(R56B, RES_K(4.7))
+	RES(R57, RES_K(4.7))
+	RES(R58, RES_K(4.7))
+	RES(R59A, RES_K(180))
+	RES(R59B, RES_K(4.7))
+	RES(R60A, RES_M(1))
+	RES(R60B, 100)
+	RES(R61, 100)
+	RES(R62, 100)
+	RES(R63A, RES_M(2.2))
+	RES(R63B, 100)
+	RES(R64A, RES_K(180))
+	//RES(R64M2, RES_K(4.7))
+	//RES(R65M2, RES_K(3.9))
+	//RES(R66M2, RES_K(1))
+	//RES(R67M2, RES_K(10))
+	//RES(R68M2, RES_K(33))
+	RES(R69, RES_K(470))
+	//RES(R69M2, RES_K(180))
+	RES(R70A, RES_M(1))
+	//RES(R70M2, RES_K(330))
+	RES(R71A, RES_K(680))
+	//RES(R71M2, RES_K(680))
+	RES(R72A, RES_K(180))
+	//RES(R72M2, RES_K(22))
+	RES(R73A, RES_M(1))
+	//RES(R73M1, RES_K(22))
+	//RES(R74M1, RES_K(180))
+	//RES(R75M1, RES_K(330))
+	//RES(R76M1, RES_K(680))
+	//RES(R77M1, RES_K(10))
+	//RES(R78M1, RES_K(33))
+	//RES(R79M1, RES_K(3.9))
+	//RES(R80M1, RES_K(1))
+	//RES(R81M1, RES_K(4.7))
+	//RES(R100M1, RES_K(1))
+	//RES(R101M1, 680)
+	//RES(R102M2, RES_K(1))
+	//RES(R103M2, 680)
+	RES(R102MX, RES_K(33))
+	RES(R103MX, RES_K(33))
+	RES(R104MX, RES_K(33))
+	RES(R106MX, RES_K(33))
+	RES(R107MX, RES_K(33))
+	RES(R108MX, RES_K(33))
+	RES(RUNK1, RES_K(47))
+
+	CAP(C2, CAP_U(0.1))
+	CAP(C4, CAP_U(0.001))
+	CAP(C5, CAP_U(0.001))
+	CAP(C6, CAP_U(0.001))
+	CAP(C7, CAP_U(0.001))
+	CAP(C8, CAP_U(100))
+	CAP(C9, CAP_U(22))
+	CAP(C11, CAP_U(47))
+	CAP(C12, CAP_U(22))
+	CAP(C15, CAP_U(0.01))
+	CAP(C16, CAP_U(0.01))
+	CAP(C17, CAP_P(100))
+	CAP(C18, CAP_U(1))
+	CAP(C19, CAP_U(1))
+	CAP(C21, CAP_P(100))
+	CAP(C23, CAP_P(100))
+	CAP(C24, CAP_U(0.1))
+	CAP(C25, CAP_U(100))
+	CAP(C26, CAP_U(0.1))
+	CAP(C27, CAP_U(0.1))
+	CAP(C27A, CAP_U(0.001))
+	CAP(C28A, CAP_U(1))
+	//CAP(C29, CAP_U(10))
+	CAP(C30, CAP_U(0.1))
+	CAP(C30A, CAP_U(0.001))
+	CAP(C31, CAP_U(0.1))
+	CAP(C31A, CAP_U(1))
+	CAP(C32A, CAP_U(0.1))
+	CAP(C33C, CAP_U(0.1))
+	CAP(C34C, CAP_U(0.1))
+	// CAP(C34A, CAP_U(0.01)) Decoupling
+	CAP(C35C, CAP_U(0.1))
+	CAP(C35A, CAP_U(5))
+	CAP(C36C, CAP_U(0.1))
+	CAP(C36A, CAP_U(0.1))
+	CAP(C38A, CAP_U(5))
+	CAP(C39, CAP_U(0.1))
+	CAP(C39A, CAP_U(0.001))
+	CAP(C40, CAP_U(0.1))
+	CAP(C40A, CAP_U(0.1))
+	CAP(C41, CAP_U(0.1))
+	CAP(C41A, CAP_U(5))
+	CAP(C42, CAP_U(0.1))
+	CAP(C43A, CAP_P(220))
+	//CAP(C43M2, CAP_U(0.001))
+	//CAP(C44M2, CAP_U(5))
+	//CAP(C47M2, CAP_U(0.001))
+	//CAP(C48M2, CAP_U(0.1))
+	//CAP(C49M2, CAP_U(10))
+	//CAP(C50M2, CAP_U(22))
+	//CAP(C51M1, CAP_U(22))
+	//CAP(C52M1, CAP_U(0.001))
+	//CAP(C53M1, CAP_U(0.1))
+	//CAP(C54M1, CAP_U(10))
+	//CAP(C55M1, CAP_U(0.001))
+	//CAP(C56M1, CAP_U(5))
+	CAP(C100, CAP_U(0.001))
+	CAP(C101, CAP_U(1))
+	CAP(C106, CAP_U(1))
+	CAP(C110, CAP_U(0.001))
+	CAP(C111, CAP_U(0.001))
+
+	POT(SHOT_NOISE_VOL, RES_K(50))
+	POT(BOOM_NOISE_VOL, RES_K(50))
+	//POT(MOTOR1_VOL, RES_K(10))
+	//POT(MOTOR1_VOL2, RES_K(100))
+	//POT(MOTOR2_VOL, RES_K(10))
+	//POT(MOTOR2_VOL2, RES_K(100))
+	POT(PLAYTIME, RES_M(1))
+	POT(FIRE1_ADJUST, RES_K(50))
+
+	SWITCH(P1_LEFT_UP)
+	SWITCH(P1_LEFT_DOWN)
+	SWITCH(P1_RIGHT_UP)
+	SWITCH(P1_RIGHT_DOWN)
+	SWITCH(P1_FIRE)
+	SWITCH(P2_LEFT_UP)
+	SWITCH(P2_LEFT_DOWN)
+	SWITCH(P2_RIGHT_UP)
+	SWITCH(P2_RIGHT_DOWN)
+	SWITCH(P2_FIRE)
+
+	SWITCH2(COIN1)
+	SWITCH2(COIN2)
+
+	DIODE(CR1, "1N914")
+	DIODE(CR2, "1N914")
+	DIODE(CR3, "1N914")
+	DIODE(CR5, "1N914")
+	DIODE(CR6, "1N914")
+	DIODE(CR7, "1N914")
+	DIODE(CR8, "1N914")
+	DIODE(CR9, "1N914")
+	DIODE(CR10, "1N914")
+	DIODE(CR11, "1N914")
+	DIODE(CR12, "1N914")
+	//DIODE(CR13M2, "1N914")
+	//DIODE(CR14M1, "1N914")
+	DIODE(CR19, "1N914")
+	DIODE(CR22, "1N914")
+
+	QBJT_EB(Q2, "2N3644")
+	QBJT_EB(Q3, "2N3643")
+	QBJT_EB(Q4, "2N3643")
+	QBJT_EB(Q6, "2N3644")
+	QBJT_EB(Q7, "2N3644")
+	QBJT_EB(Q27, "2N3643")
+	QBJT_EB(Q28, "2N3644")
+	QBJT_EB(Q29, "2N3643")
+	QBJT_EB(Q30, "2N3644")
+	QBJT_EB(Q31, "2N3643")
+	QBJT_EB(Q32, "2N3644")
+	QBJT_EB(Q33, "2N3643")
+	QBJT_EB(Q34, "2N3644")
+
+	TTL_7404_DIP(IC_H3)
+	TTL_7400_DIP(IC_B6)
+	TTL_7402_DIP(IC_D6)
+	TTL_74107_DIP(IC_E6)
+	TTL_7474_DIP(IC_J6)
+	TTL_7402_DIP(IC_N6)
+	TTL_7404_DIP(IC_A7)
+	NET_C(VCC, IC_H3.14, IC_B6.14, IC_D6.14, IC_E6.14, IC_J6.14, IC_N6.14, IC_A7.14, IC_J6.4, IC_J6.10)
+	NET_C(GND, IC_H3.7,  IC_B6.7,  IC_D6.7,  IC_E6.7,  IC_J6.7,  IC_N6.7,  IC_A7.7)
+
+	TTL_7408_DIP(IC_A11)
+	TTL_7402_DIP(IC_B11)
+	TTL_7410_DIP(IC_B12)
+	TTL_74107_DIP(IC_C12)
+	TTL_9316_DIP(IC_D12)
+	TTL_9316_DIP(IC_E12)
+	TTL_7493_DIP(IC_F12)
+	TTL_7493_DIP(IC_H12)
+	NET_C(VCC, IC_A11.14, IC_B11.14, IC_B12.14, IC_C12.14, IC_D12.16, IC_E12.16, IC_F12.5,  IC_H12.5)
+	NET_C(GND, IC_A11.7,  IC_B11.7,  IC_B12.7,  IC_C12.7,  IC_D12.8,  IC_E12.8,  IC_F12.10, IC_H12.10)
+
+	TTL_74107_DIP(IC_J12)
+	TTL_7474_DIP(IC_K12)
+	TTL_7402_DIP(IC_A13)
+	TTL_7420_DIP(IC_D13)
+	TTL_7404_DIP(IC_E13)
+	TTL_7400_DIP(IC_J13)
+	TTL_7410_DIP(IC_A14)
+	TTL_7400_DIP(IC_B14)
+	NET_C(VCC, IC_J12.14, IC_K12.14, IC_A13.14, IC_D13.14, IC_E13.14, IC_J13.14, IC_A14.14, IC_B14.14)
+	NET_C(GND, IC_J12.7,  IC_K12.7,  IC_A13.7,  IC_D13.7,  IC_E13.7,  IC_J13.7,  IC_A14.7,  IC_B14.7)
+
+	TTL_7400_DIP(IC_B13)
+	TTL_7410_DIP(IC_C13)
+	TTL_7400_DIP(IC_E14)
+	TTL_7474_DIP(IC_L12)
+	TTL_7474_DIP(IC_L9)
+	TTL_7408_DIP(IC_L8)
+	TTL_7400_DIP(IC_K8)
+	NET_C(VCC, IC_B13.14, IC_C13.14, IC_E14.14, IC_L12.14, IC_L9.14, IC_L8.14, IC_K8.14)
+	NET_C(GND, IC_B13.7,  IC_C13.7,  IC_E14.7,  IC_L12.7,  IC_L9.7,  IC_L8.7,  IC_K8.7)
+
+	TTL_7474_DIP(IC_K9)
+	SUBMODEL(NE556_DIP, IC_C11)
+	TTL_7492_DIP(IC_A12)
+	TTL_7404_DIP(IC_M13)
+	TTL_7402_DIP(IC_E15)
+	TTL_7410_DIP(IC_F14)
+	TTL_7427_DIP(IC_K13)
+	TTL_7400_DIP(IC_L13)
+	NET_C(VCC, IC_K9.14, IC_C11.14, IC_A12.5,  IC_M13.14, IC_E15.14, IC_F14.14, IC_K13.14, IC_L13.14)
+	NET_C(GND, IC_K9.7,  IC_C11.7,  IC_A12.10, IC_M13.7,  IC_E15.7,  IC_F14.7,  IC_K13.7,  IC_L13.7)
+
+	TTL_74107_DIP(IC_D8)
+	TTL_74193_DIP(IC_H10)
+	TTL_7408_DIP(IC_H11)
+	TTL_7410_DIP(IC_C14)
+	TTL_9316_DIP(IC_H14)
+	TTL_7493_DIP(IC_J14)
+	TTL_7402_DIP(IC_D15)
+	TTL_7400_DIP(IC_D14)
+	NET_C(VCC, IC_D8.14, IC_H10.16, IC_H11.14, IC_C14.14, IC_H14.16, IC_J14.5,  IC_D15.14, IC_D14.14)
+	NET_C(GND, IC_D8.7,  IC_H10.8,  IC_H11.7,  IC_C14.7,  IC_H14.8,  IC_J14.10, IC_D15.7,  IC_D14.7)
+
+	TTL_7493_DIP(IC_L14)
+	TTL_9316_DIP(IC_K14)
+	TTL_74193_DIP(IC_F11)
+	TTL_7486_DIP(IC_E8)
+	TTL_7402_DIP(IC_N7)
+	TTL_7400_DIP(IC_B15)
+	TTL_7402_DIP(IC_B9)
+	TTL_7408_DIP(IC_B7)
+	NET_C(VCC, IC_L14.5,  IC_K14.16, IC_F11.16, IC_E8.14, IC_N7.14, IC_B15.14, IC_B9.14, IC_B7.14)
+	NET_C(GND, IC_L14.10, IC_K14.8,  IC_F11.8,  IC_E8.7,  IC_N7.7,  IC_B15.7,  IC_B9.7,  IC_B7.7)
+
+	TTL_7404_DIP(IC_B10)
+	TTL_9602_DIP(IC_C9)
+	TTL_7474_DIP(IC_A8)
+	TTL_7474_DIP(IC_A15)
+	TTL_7400_DIP(IC_A9)
+	TTL_9602_DIP(IC_C8)
+	TTL_7402_DIP(IC_B8)
+	TTL_7474_DIP(IC_J8)
+	NET_C(VCC, IC_B10.14, IC_C9.16, IC_A8.14, IC_A15.14, IC_A9.14, IC_C8.16, IC_B8.14, IC_J8.14)
+	NET_C(GND, IC_B10.7,  IC_C9.8,  IC_A8.7,  IC_A15.7,  IC_A9.7,  IC_C8.8,  IC_B8.7,  IC_J8.7)
+
+	TTL_7493_DIP(IC_C10)
+	TTL_7493_DIP(IC_D11)
+	TTL_7493_DIP(IC_E11)
+	TTL_7402_DIP(IC_J7)
+	TTL_7404_DIP(IC_D11V)
+	TTL_7402_DIP(IC_L7)
+	TTL_7402_DIP(IC_D7)
+	TTL_74165_DIP(IC_N10)
+	NET_C(VCC, IC_C10.5,  IC_D11.5,  IC_E11.5,  IC_J7.14, IC_D11V.14, IC_L7.14, IC_D7.14, IC_N10.16)
+	NET_C(GND, IC_C10.10, IC_D11.10, IC_E11.10, IC_J7.7,  IC_D11V.7,  IC_L7.7,  IC_D7.7,  IC_N10.8)
+
+	NE555_DIP(IC_H6)
+	NET_C(VCC, IC_H6.8)
+	NET_C(GND, IC_H6.1)
+
+	// Coin Handling
+	NET_C(COIN1.1, COIN1_NC)
+	NET_C(COIN1.2, COIN1_NO)
+	NET_C(COIN2.1, COIN2_NC)
+	NET_C(COIN2.2, COIN2_NO)
+	NET_C(GND, COIN1.Q, COIN2.Q)
+
+	ALIAS(COIN1_NO, IC_B6.5)
+	ALIAS(COIN1_NC, IC_B6.1)
+	ALIAS(COIN2_NO, IC_B6.9)
+	ALIAS(COIN2_NC, IC_B6.13)
+
+	NET_C(IC_B6.2, IC_B6.6, IC_D6.9)
+	NET_C(IC_B6.4, IC_B6.3, IC_N6.5)
+	NET_C(IC_B6.12, IC_B6.8, IC_D6.8)
+	NET_C(IC_B6.10, IC_B6.11, IC_N6.6)
+
+	NET_C(IC_D6.10, IC_D6.11)
+	NET_C(ATTRACTQ, IC_D6.12)
+
+	NET_C(IC_D6.13, IC_J6.12, IC_J6.13, IC_J6.1)
+	NET_C(IC_J6.9, IC_J6.2)
+	NET_C(V128, IC_J6.3, IC_J6.11, IC_E6.9)
+	NET_C(IC_J6.5, IC_E6.12)
+	NET_C(VCC, IC_E6.1, IC_E6.4)
+	ALIAS(COIN, IC_J6.5)
+	ALIAS(COINQ, IC_J6.6)
+
+	NET_C(IC_E6.3, IC_N6.3)
+	NET_C(IC_N6.4, IC_N6.2)
+
+	NET_C(GND, IC_D6.3)
+	NET_C(COINQ, IC_D6.2)
+	ALIAS(START, IC_D6.1)
+
+	// Game Timer / Attract
+	NET_C(V5, PLAYTIME.2, PLAYTIME.3)
+	NET_C(PLAYTIME.1, R54A.1, R53A.1)
+	NET_C(R54A.2, IC_H6.6, IC_H6.7, R53A.2, R60A.1, C25.1)
+	NET_C(R60A.2, Q2.B)
+	NET_C(GND, C25.2, Q3.E, Q4.E, C24.2)
+	NET_C(IC_H6.5, C24.1, R59A.1)
+	NET_C(R59A.2, R63A.1, Q2.E)
+	NET_C(V5, R56A.1, R55A.1)
+	NET_C(R56A.2, Q3.C, Q4.B)
+	NET_C(R63A.2, R55A.2, Q4.C, IC_H3.5)
+	ALIAS(GNE, IC_H3.6)
+	NET_C(IC_H6.4, ATTRACTQ)
+	NET_C(IC_H6.3, IC_D6.5)
+	NET_C(IC_D6.4, IC_E6.11)
+	NET_C(V5, IC_E6.10) // No antenna to spark, so we pretend we never get a spark
+	ALIAS(ATTRACT, IC_E6.6)
+	NET_C(IC_D6.6, ATTRACT)
+	ALIAS(ATTRACTQ, IC_E6.5)
+	NET_C(IC_N6.9, ATTRACTQ)
+	NET_C(GND, IC_N6.8) // No antenna to spark, so we pretend we never get a spark
+	NET_C(IC_N6.10, IC_E6.13)
+	NET_C(START, IC_E6.8, IC_H3.3)
+	NET_C(IC_H3.4, IC_H6.2)
+	ALIAS(STARTQ, IC_H3.4)
+
+	// H Info
+	NET_C(H128, IC_A13.12)
+	NET_C(H_SYNC, IC_A13.8)
+	NET_C(IC_A13.10, IC_A13.11)
+	NET_C(IC_A13.13, IC_A13.9)
+	ALIAS(H_INFO, IC_A13.13)
+	ALIAS(H_INFOQ, IC_A13.10)
+
+	// V Info
+	NET_C(V16, IC_J13.9)
+	NET_C(V64, IC_J13.10)
+	NET_C(V512Q, IC_J13.2)
+	NET_C(IC_J13.8, IC_J13.12)
+	NET_C(IC_J13.3, IC_J13.13)
+	NET_C(IC_J13.11, IC_J13.1)
+	ALIAS(V_INFO, IC_J13.3)
+	ALIAS(V_INFOQ, IC_J13.11)
+
+	// Reset 2
+	NET_C(H256, IC_A11.2)
+	NET_C(H452, IC_A11.1)
+	ALIAS(RESET2, IC_A11.3)
+
+	// Main Timing & Sync
+	CLOCK(CLK, 14318000)
+	NET_C(VCC, CLK.VCC)
+	NET_C(GND, CLK.GND)
+
+	NET_C(CLK.Q, IC_A7.1, IC_A7.3)
+	ALIAS(CLOCKQ, IC_A7.4)
+
+	// Horizontal Timing
+	NET_C(IC_A7.2, IC_K12.3, IC_E12.2, IC_D12.2)
+	NET_C(V5, IC_E12.7, IC_E12.10, IC_E12.9, IC_D12.10, IC_D12.9, IC_C12.1, IC_C12.4, IC_C12.8, IC_C12.11, IC_C12.10, IC_K12.4, IC_K12.1)
+	ALIAS(H1, IC_E12.14)
+	ALIAS(H2, IC_E12.13)
+	ALIAS(H4, IC_E12.12)
+	ALIAS(H8, IC_E12.11)
+	NET_C(IC_E12.15, IC_D12.7)
+	ALIAS(H16, IC_D12.14)
+	ALIAS(H32, IC_D12.13)
+	ALIAS(H64, IC_D12.12)
+	ALIAS(H128, IC_D12.11)
+	NET_C(IC_D12.15, IC_C12.12)
+	NET_C(IC_C12.3, IC_C12.9)
+	ALIAS(H256, IC_C12.3)
+	ALIAS(H256Q, IC_C12.2)
+	ALIAS(H452, IC_C12.5)
+	NET_C(IC_C12.6, IC_B12.5)
+	ALIAS(H452Q, IC_C12.6)
+	NET_C(H256, IC_D13.1)
+	NET_C(H128, IC_D13.4)
+	NET_C(H64, IC_D13.5)
+	NET_C(H2, IC_D13.2)
+	NET_C(IC_D13.6, IC_K12.2)
+	NET_C(IC_E12.1, IC_D12.1, IC_C12.13, IC_B12.3, IC_K12.5, IC_B14.5)
+	ALIAS(H_RESETQ, IC_K12.5)
+	ALIAS(H_RESET, IC_K12.6)
+	NET_C(H32Q, IC_B14.1)
+	NET_C(IC_B14.6, IC_B14.2)
+	NET_C(IC_B14.3, IC_B14.4)
+	ALIAS(H_BLANK, IC_B14.6)
+	NET_C(H_BLANK, IC_B12.4)
+	NET_C(H4, IC_E13.9)
+	NET_C(H16, IC_E13.11)
+	NET_C(H32, IC_E13.13)
+	NET_C(H64, IC_E13.5)
+	ALIAS(H4Q, IC_E13.8)
+	ALIAS(H16Q, IC_E13.10)
+	ALIAS(H32Q, IC_E13.12)
+	ALIAS(H64Q, IC_E13.6)
+	ALIAS(H_SYNCQ, IC_B12.6)
+	NET_C(H_SYNCQ, IC_E13.3, IC_A14.10)
+	NET_C(H_INFO, IC_A14.11)
+	NET_C(H64Q, IC_A14.9)
+	NET_C(IC_A14.8, IC_A14.3, IC_A14.4, IC_A14.5)
+	NET_C(IC_A14.6, IC_B11.5)
+	NET_C(H8, IC_B11.3)
+	NET_C(H16, IC_B11.2)
+	NET_C(IC_B11.1, IC_B12.2)
+	NET_C(H2, IC_B12.13)
+	NET_C(IC_E13.4, IC_B12.1)
+	ALIAS(H_SYNC, IC_E13.4)
+	ALIAS(H_COUNTQ, IC_B12.12)
+
+	// Vertical Timing
+	NET_C(V8, IC_J13.5)
+	NET_C(V512, IC_J13.4)
+	NET_C(IC_J13.6, IC_K12.12)
+	NET_C(H_RESET, IC_K12.11)
+	NET_C(VCC, IC_K12.10, IC_K12.13)
+	ALIAS(V_RESETQ, IC_K12.9)
+	ALIAS(V_RESET, IC_K12.8)
+	NET_C(V_RESET, IC_F12.2, IC_F12.3, IC_H12.2, IC_H12.3, IC_B11.12)
+	NET_C(H_BLANK, IC_F12.14)
+	NET_C(IC_F12.12, IC_F12.1)
+	NET_C(IC_F12.11, IC_H12.14)
+	NET_C(IC_H12.12, IC_H12.1)
+	NET_C(IC_H12.11, IC_J12.12)
+	NET_C(VCC, IC_J12.1, IC_J12.4, IC_J12.8, IC_J12.11)
+	NET_C(IC_J12.3, IC_J12.9)
+	NET_C(V_RESETQ, IC_J12.13, IC_J12.10)
+	ALIAS(V1, IC_F12.12)
+	ALIAS(V2, IC_F12.9)
+	ALIAS(V4, IC_F12.8)
+	ALIAS(V8, IC_F12.11)
+	ALIAS(V16, IC_H12.12)
+	ALIAS(V32, IC_H12.9)
+	ALIAS(V64, IC_H12.8)
+	ALIAS(V128, IC_H12.11)
+	ALIAS(V256, IC_J12.3)
+	ALIAS(V256Q, IC_J12.2)
+	ALIAS(V512, IC_J12.5)
+	ALIAS(V512Q, IC_J12.6)
+	NET_C(V8, IC_B11.8)
+	NET_C(IC_B11.10, IC_B11.11)
+	NET_C(IC_B11.13, IC_B11.9)
+	ALIAS(V_SYNC, IC_B11.10)
+	NET_C(V_SYNC, IC_B11.6)
+	ALIAS(COMP_SYNC, IC_B11.4)
+
+	// Out-of-Bounds Detection
+	NET_C(RESET2, IC_D13.10)
+	NET_C(H16, IC_D13.12)
+	NET_C(H128, IC_D13.9, IC_C13.4)
+	NET_C(H32, IC_D13.13, IC_C13.3)
+	NET_C(H452Q, IC_C13.5)
+	NET_C(IC_D13.8, IC_B13.9)
+	NET_C(IC_C13.6, IC_B13.12)
+	NET_C(IC_B13.8, IC_B13.13)
+	NET_C(IC_B13.11, IC_B13.10, IC_E14.5)
+	NET_C(V_INFOQ, IC_E14.4)
+	ALIAS(OOB, IC_E14.6)
+
+	// Tank Resets
+	NET_C(OOB, IC_K8.1, IC_K8.12)
+	NET_C(TANK2, IC_K8.2)
+	NET_C(STARTQ, IC_L8.1, IC_L8.13)
+	NET_C(IC_K8.3, IC_L8.2)
+	NET_C(IC_L8.3, IC_L12.1, IC_L12.13)
+	NET_C(VCC, IC_L12.2, IC_L12.4, IC_L12.10, IC_L12.12)
+	NET_C(RESET2, IC_L12.3)
+	NET_C(V256, IC_L12.11)
+	ALIAS(HRST2Q, IC_L12.5)
+	ALIAS(VRST2Q, IC_L12.9)
+
+	NET_C(TANK1, IC_K8.13)
+	NET_C(IC_K8.11, IC_L8.12)
+	NET_C(IC_L8.11, IC_L9.1, IC_L9.13)
+	NET_C(VCC, IC_L9.2, IC_L9.4, IC_L9.10, IC_L9.12)
+	NET_C(H_INFOQ, IC_L9.11)
+	NET_C(V_RESET, IC_L9.3)
+	ALIAS(HRST1Q, IC_L9.9)
+	ALIAS(VRST1Q, IC_L9.5)
+
+	// HMCE
+	NET_C(GND, IC_K9.12)
+	NET_C(VCC, IC_K9.4, IC_K9.13, IC_K9.1)
+	NET_C(VLD2, IC_K9.11)
+	NET_C(H452Q, IC_K9.3)
+	NET_C(IC_K9.5, IC_K9.10)
+	NET_C(IC_K9.9, IC_K9.2)
+	ALIAS(HMCEQ, IC_K9.5)
+	ALIAS(HMCE, IC_K9.6)
+
+	// Blo-Up 1 & Blo-Up 2
+	NET_C(V5, R28.1, R29.1)
+	NET_C(GND, C19.2, C18.2, C15.2, C16.2)
+	NET_C(R28.2, IC_C11.2, IC_C11.1, C19.1)
+	NET_C(R29.2, IC_C11.12, IC_C11.13, C18.1)
+	NET_C(C15.1, IC_C11.3)
+	NET_C(C16.1, IC_C11.11)
+	NET_C(HT1Q, IC_C11.4, IC_C11.6)
+	NET_C(HT2Q, IC_C11.8, IC_C11.10)
+	ALIAS(BLO_UP1, IC_C11.5)
+	ALIAS(BLO_UP2, IC_C11.9)
+
+	// Flash & TM1
+	NET_C(GND, IC_A12.6, IC_A12.7)
+	NET_C(V_RESETQ, IC_A12.14)
+	NET_C(IC_A12.12, IC_A12.1, IC_B12.10)
+	NET_C(IC_A12.11, IC_B12.9)
+	HINT(IC_A12.9, NC)
+	NET_C(VLD2, IC_B12.11)
+	NET_C(ATTRACTQ, IC_M13.1)
+	NET_C(IC_M13.2, IC_A13.2)
+	NET_C(IC_B12.8, IC_A13.3)
+	ALIAS(FLASH, IC_A12.8)
+	ALIAS(TM1, IC_A13.1)
+
+	// Tank 1 Control
+	NET_C(GND, P1_RIGHT_UP.1, P1_RIGHT_DOWN.1, P1_LEFT_UP.1, P1_LEFT_DOWN.1)
+	NET_C(GND, C39.2, C40.2, C41.2, C42.2)
+	NET_C(VCC, R56B.1, R57.1, R58.1, R59B.1, CR9.K, CR10.K, CR11.K, CR12.K)
+
+	NET_C(P1_RIGHT_UP.2, R63B.1)
+	NET_C(R63B.2, R59B.2, CR9.A, C42.1, IC_E15.2, IC_E15.12)
+	NET_C(P1_RIGHT_DOWN.2, R61.1)
+	NET_C(R61.2, R57.2, CR11.A, C40.1, IC_E15.6, IC_E15.9)
+	NET_C(P1_LEFT_UP.2, R62.1)
+	NET_C(R62.2, R58.2, CR10.A, C41.1, IC_E15.8, IC_E15.3)
+	NET_C(P1_LEFT_DOWN.2, R60B.1)
+	NET_C(R60B.2, R56B.2, CR12.A, C39.1, IC_E15.11, IC_E15.5)
+
+	ALIAS(ACC1, IC_E15.1)
+	ALIAS(STOP1, IC_E15.4)
+	ALIAS(RR1, IC_E15.10)
+	ALIAS(RL1, IC_E15.13)
+
+	NET_C(TM1, IC_E14.2, IC_C14.10, IC_E14.12, IC_E14.9)
+	NET_C(STOP1, IC_E14.1)
+	NET_C(ACC1, IC_C14.11)
+	NET_C(RR1, IC_E14.13)
+	NET_C(RL1, IC_E14.10)
+
+	NET_C(BOUNCE1Q, IC_F14.5)
+	NET_C(ATTRACTQ, IC_F14.4)
+	NET_C(IC_E14.3, IC_F14.3)
+	NET_C(IC_F14.6, IC_J14.2, IC_J14.3)
+	NET_C(IC_C14.8, IC_J14.1)
+	NET_C(IC_J14.9, IC_K13.9, IC_H14.4)
+	NET_C(IC_J14.8, IC_K13.10, IC_L13.9, IC_H14.5)
+	NET_C(IC_J14.11, IC_K13.11, IC_L13.10, IC_H14.6)
+	NET_C(IC_L13.8, IC_C14.9)
+
+	NET_C(GND, IC_H14.3)
+	NET_C(VCC, IC_H14.10, IC_H14.7)
+	NET_C(VLD1, IC_H14.2)
+	NET_C(IC_K13.8, IC_M13.5)
+	NET_C(IC_M13.6, IC_H14.1)
+	NET_C(IC_H14.15, IC_M13.11)
+	NET_C(IC_H14.9, IC_M13.10, IC_L13.4)
+	NET_C(BOUNCE1Q, IC_L13.5)
+	ALIAS(G01, IC_L13.6)
+
+	NET_C(HIT2Q, IC_H11.5)
+	NET_C(IC_E14.11, IC_H11.4)
+	NET_C(IC_H11.6, IC_H10.5)
+	NET_C(IC_E14.8, IC_H10.4)
+	NET_C(STARTQ, IC_H10.11)
+	NET_C(VCC, IC_H10.9)
+	NET_C(GND, IC_H10.15, IC_H10.1, IC_H10.10, IC_H10.14)
+	NET_C(IC_H10.12, IC_H11.10)
+	NET_C(IC_H10.13, IC_H11.9)
+	NET_C(IC_H11.8, IC_D8.12)
+	NET_C(VCC, IC_D8.1, IC_D8.4)
+	NET_C(STARTQ, IC_D8.13)
+	HINT(IC_D8.3, NC)
+	ALIAS(P1D0, IC_H10.3)
+	ALIAS(P1D1, IC_H10.2)
+	ALIAS(P1D2, IC_H10.6)
+	ALIAS(P1D3, IC_H10.7)
+	ALIAS(P1D4, IC_D8.2)
+	ALIAS(P1SP0, IC_J14.9)
+	ALIAS(P1SP1, IC_J14.8)
+	ALIAS(P1SP2, IC_J14.11)
+
+	// Tank 2 Control
+	NET_C(GND, P2_RIGHT_UP.1, P2_RIGHT_DOWN.1, P2_LEFT_UP.1, P2_LEFT_DOWN.1)
+	NET_C(GND, C33C.2, C34C.2, C35C.2, C36C.2)
+	NET_C(VCC, R48B.1, R49B.1, R50B.1, R51B.1, CR5.K, CR6.K, CR7.K, CR8.K)
+
+	NET_C(P2_RIGHT_UP.2, R55B.1)
+	NET_C(R55B.2, R51B.2, CR5.A, C36C.1, IC_D15.2, IC_D15.12)
+	NET_C(P2_RIGHT_DOWN.2, R53B.1)
+	NET_C(R53B.2, R49B.2, CR7.A, C34C.1, IC_D15.6, IC_D15.9)
+	NET_C(P2_LEFT_UP.2, R54B.1)
+	NET_C(R54B.2, R50B.2, CR6.A, C35C.1, IC_D15.8, IC_D15.3)
+	NET_C(P2_LEFT_DOWN.2, R52B.1)
+	NET_C(R52B.2, R48B.2, CR8.A, C33C.1, IC_D15.11, IC_D15.5)
+
+	ALIAS(ACC2, IC_D15.1)
+	ALIAS(STOP2, IC_D15.4)
+	ALIAS(RR2, IC_D15.10)
+	ALIAS(RL2, IC_D15.13)
+
+	NET_C(TM1, IC_D14.2, IC_C14.4, IC_D14.12, IC_D14.9)
+	NET_C(STOP2, IC_D14.1)
+	NET_C(ACC2, IC_C14.3)
+	NET_C(RR2, IC_D14.13)
+	NET_C(RL2, IC_D14.10)
+
+	NET_C(BOUNCE2Q, IC_F14.9)
+	NET_C(ATTRACTQ, IC_F14.10)
+	NET_C(IC_D14.3, IC_F14.11)
+	NET_C(IC_F14.8, IC_L14.2, IC_L14.3)
+	NET_C(IC_C14.6, IC_L14.1)
+	NET_C(IC_L14.9, IC_K13.4, IC_K14.4)
+	NET_C(IC_L14.8, IC_K13.5, IC_L13.12, IC_K14.5)
+	NET_C(IC_L14.11, IC_K13.3, IC_L13.13, IC_K14.6)
+	NET_C(IC_L13.11, IC_C14.5)
+
+	NET_C(GND, IC_K14.3)
+	NET_C(VCC, IC_K14.10, IC_K14.7)
+	NET_C(VLD2, IC_K14.2)
+	NET_C(IC_K13.6, IC_M13.9)
+	NET_C(IC_M13.8, IC_K14.1)
+	NET_C(IC_K14.15, IC_M13.13)
+	NET_C(IC_K14.9, IC_M13.12, IC_L13.2)
+	NET_C(BOUNCE2Q, IC_L13.1)
+	ALIAS(G02, IC_L13.3)
+
+	NET_C(HIT1Q, IC_H11.2)
+	NET_C(IC_D14.11, IC_H11.1)
+	NET_C(IC_H11.3, IC_F11.5)
+	NET_C(IC_D14.8, IC_F11.4)
+	NET_C(STARTQ, IC_F11.11)
+	NET_C(VCC, IC_F11.9)
+	NET_C(GND, IC_F11.15, IC_F11.1, IC_F11.10, IC_F11.14)
+	NET_C(IC_F11.12, IC_H11.12)
+	NET_C(IC_F11.13, IC_H11.13)
+	NET_C(IC_H11.11, IC_D8.9)
+	NET_C(VCC, IC_D8.8, IC_D8.11)
+	NET_C(STARTQ, IC_D8.10)
+	HINT(IC_D8.6, NC)
+	ALIAS(P2D0, IC_F11.3)
+	ALIAS(P2D1, IC_F11.2)
+	ALIAS(P2D2, IC_F11.6)
+	ALIAS(P2D3, IC_F11.7)
+	NET_C(IC_D8.5, IC_E8.10)
+	ALIAS(P2D4, IC_D8.5)
+	NET_C(BOUNCE2, IC_E8.9)
+	ALIAS(P2D4S, IC_E8.8)
+	ALIAS(P2SP0, IC_L14.9)
+	ALIAS(P2SP1, IC_L14.8)
+	ALIAS(P2SP2, IC_L14.11)
+
+	// Shell 1 Control
+	NET_C(GND, P1_FIRE.1, C31.2, C100.2, IC_C9.12, IC_C9.4)
+	NET_C(P1_FIRE.2, R43.1)
+	NET_C(R43.2, C31.1, R41.2, CR2.A, IC_B15.1)
+	NET_C(VCC, R41.1, CR2.K)
+	NET_C(BLO_UP2, IC_N7.5)
+	NET_C(SRS1, IC_N7.6)
+	NET_C(IC_N7.4, IC_A15.1)
+	NET_C(HMCEQ, IC_A15.3)
+	NET_C(ATTRACTQ, IC_A15.2)
+	NET_C(VCC, IC_A15.4, RUNK1.2, FIRE1_ADJUST.3, FIRE1_ADJUST.2, IC_C9.3, IC_A8.1, IC_A8.4)
+	NET_C(V_RESET, IC_A8.3, IC_A8.11)
+	NET_C(IC_A15.5, IC_B15.13)
+	NET_C(IC_B15.11, IC_C9.11, IC_B15.2)
+	NET_C(IC_B15.3, IC_B15.12)
+	NET_C(PLAYFIELD, IC_B9.8, IC_B7.4, C100.1)
+	NET_C(SHELL1, IC_B7.5)
+	NET_C(IC_B7.6, IC_B9.6)
+	NET_C(HIT2, IC_B9.5)
+	NET_C(IC_B9.4, IC_C9.13)
+	NET_C(C11.1, IC_C9.15)
+	NET_C(C11.2, IC_C9.14, FIRE1_ADJUST.1)
+	NET_C(C12.1, IC_C9.1)
+	NET_C(C12.2, IC_C9.2, RUNK1.1)
+	NET_C(IC_C9.10, IC_C9.5)
+	ALIAS(FIRE1, IC_C9.10)
+	ALIAS(FIRE1Q, IC_C9.9)
+	ALIAS(EXPL1, IC_C9.6)
+	ALIAS(EXPL1Q, IC_C9.7)
+	NET_C(TANK2, IC_B9.9)
+	NET_C(IC_B9.10, IC_B9.11)
+	NET_C(TANK1, IC_B10.9)
+	NET_C(IC_B10.8, IC_B9.12)
+	ALIAS(TANK1Q, IC_B10.8)
+	NET_C(HT1Q, IC_B10.5)
+	NET_C(IC_B10.6, IC_B9.2)
+	NET_C(IC_B9.13, IC_B9.3)
+	NET_C(IC_B9.1, IC_A9.1)
+	NET_C(IC_A9.3, IC_A9.12, IC_A8.2)
+	NET_C(IC_A9.11, IC_A9.2)
+	NET_C(IC_A8.5, IC_E8.5)
+	ALIAS(BOUNCE1, IC_A8.5)
+	NET_C(IC_A8.6, IC_A9.13)
+	ALIAS(BOUNCE1Q, IC_A8.6)
+	NET_C(P1D4, IC_E8.4)
+	ALIAS(P1D4S, IC_E8.6)
+
+	// Shell 2 Control
+	NET_C(GND, P2_FIRE.1, C30.2, IC_C8.12, IC_C8.4)
+	NET_C(P2_FIRE.2, R42.1)
+	NET_C(R42.2, C30.1, R40.2, CR3.A, IC_B15.4)
+	NET_C(VCC, R40.1, CR3.K)
+	NET_C(BLO_UP1, IC_N7.3)
+	NET_C(SRS2, IC_N7.2)
+	NET_C(IC_N7.1, IC_A15.13)
+	NET_C(HMCEQ, IC_A15.11)
+	NET_C(ATTRACTQ, IC_A15.12)
+	NET_C(VCC, IC_A15.10, R16.2, R15.2, IC_C8.3, IC_A8.10, IC_A8.13)
+	NET_C(IC_A15.9, IC_B15.10)
+	NET_C(IC_B15.8, IC_C8.11, IC_B15.5)
+	NET_C(IC_B15.6, IC_B15.9)
+	NET_C(PLAYFIELD, IC_B8.8, IC_B7.1)
+	NET_C(SHELL2, IC_B7.2)
+	NET_C(IC_B7.3, IC_B8.6)
+	NET_C(HIT1, IC_B8.5)
+	NET_C(IC_B8.4, IC_C8.13)
+	NET_C(C8.1, IC_C8.15)
+	NET_C(C8.2, IC_C8.14, R16.1)
+	NET_C(C9.1, IC_C8.1)
+	NET_C(C9.2, IC_C8.2, R15.1)
+	NET_C(IC_C8.10, IC_C8.5)
+	ALIAS(FIRE2, IC_C8.10)
+	ALIAS(FIRE2Q, IC_C8.9)
+	ALIAS(EXPL2, IC_C8.6)
+	ALIAS(EXPL2Q, IC_C8.7)
+	NET_C(TANK1, IC_B8.9)
+	NET_C(IC_B8.10, IC_B8.12)
+	NET_C(TANK2, IC_B10.11)
+	NET_C(IC_B10.10, IC_B8.11)
+	ALIAS(TANK2Q, IC_B10.10)
+	NET_C(HT2Q, IC_B10.3)
+	NET_C(IC_B10.4, IC_B8.2)
+	NET_C(IC_B8.13, IC_B8.3)
+	NET_C(IC_B8.1, IC_A9.4)
+	NET_C(IC_A9.6, IC_A9.9, IC_A8.12)
+	NET_C(IC_A9.8, IC_A9.5)
+	ALIAS(BOUNCE2, IC_A8.9)
+	NET_C(IC_A8.8, IC_A9.10)
+	ALIAS(BOUNCE2Q, IC_A8.8)
+
+	// Score
+	NET_C(VCC, IC_J8.1, IC_J8.13)
+	NET_C(GND, IC_J8.2, IC_J8.12)
+	NET_C(TANK2, IC_K8.4)
+	NET_C(SHELL1, IC_K8.5)
+	NET_C(IC_K8.6, IC_J8.4)
+	NET_C(V_RESET, IC_J8.3, IC_J8.11)
+	NET_C(IC_J8.5, IC_J7.2)
+	NET_C(MTK2, IC_J7.3)
+	NET_C(IC_J7.1, IC_C10.14)
+	NET_C(START, IC_C10.2, IC_C10.3, IC_D11.2, IC_D11.3, IC_E11.2, IC_E11.3)
+	ALIAS(HIT2, IC_J8.5)
+	ALIAS(HIT2Q, IC_J8.6)
+	ALIAS(HIT1, IC_J8.9)
+	ALIAS(HIT1Q, IC_J8.8)
+	ALIAS(HT1Q, IC_J7.13)
+	ALIAS(HT2Q, IC_J7.1)
+	NET_C(IC_C10.12, IC_C10.1)
+	ALIAS(SCR1A, IC_C10.12)
+	ALIAS(SCR1B, IC_C10.9)
+	ALIAS(SCR1C, IC_C10.8)
+	ALIAS(SCR1D, IC_C10.11)
+	NET_C(TANK1, IC_K8.10)
+	NET_C(SHELL2, IC_K8.9)
+	NET_C(IC_K8.8, IC_J8.10)
+	NET_C(IC_J8.9, IC_J7.12)
+	NET_C(MTK1, IC_J7.11)
+	NET_C(IC_J7.13, IC_D11.1)
+	NET_C(SCR1D, IC_D11.14)
+	NET_C(IC_D11.12, IC_E11.1)
+	NET_C(IC_D11.11, IC_E11.14)
+	ALIAS(SCR1E, IC_D11.11)
+	ALIAS(SCR2A, IC_D11.9)
+	ALIAS(SCR2B, IC_D11.8)
+	ALIAS(SCR2C, IC_D11.11)
+	ALIAS(SCR1F, IC_E11.12)
+	ALIAS(SCR2D, IC_E11.9)
+	ALIAS(SCR2E, IC_E11.8)
+	ALIAS(SCR2F, IC_E11.11)
+
+	// Memory
+	TTL_9322_DIP(IC_F10)
+	TTL_9322_DIP(IC_F8)
+	TTL_9322_DIP(IC_D10)
+	TTL_9322_DIP(IC_E10)
+	NET_C(VCC, IC_F10.16, IC_F8.16, IC_D10.16, IC_E10.16)
+	NET_C(GND, IC_F10.8,  IC_F8.8,  IC_D10.8,  IC_E10.8, IC_F10.15, IC_F8.15, IC_D10.15, IC_E10.15)
+
+	TTL_7400_DIP(IC_H8)
+	NET_C(VCC, IC_H8.14)
+	NET_C(GND, IC_H8.7)
+
+	NET_C(H64, IC_F10.1, IC_F8.1, IC_H8.2)
+	NET_C(H64Q, IC_H8.12)
+	NET_C(H452Q, IC_D10.1, IC_E10.1)
+	NET_C(P1D0, IC_F10.2)
+	NET_C(P2D0, IC_F10.3)
+	NET_C(P1D1, IC_F10.5)
+	NET_C(P2D1, IC_F10.6)
+	NET_C(P1D2, IC_F10.14)
+	NET_C(P2D2, IC_F10.13)
+	NET_C(P1D3, IC_F10.11)
+	NET_C(P2D3, IC_F10.10)
+
+	NET_C(P1D4, IC_F8.2)
+	NET_C(P2D4, IC_F8.3)
+	NET_C(P1D4S, IC_F8.5)
+	NET_C(P2D4S, IC_F8.6)
+	NET_C(P1T2, IC_F8.14)
+	NET_C(P2T2, IC_F8.13)
+	NET_C(P1T3, IC_F8.11)
+	NET_C(P2T3, IC_F8.10)
+
+	NET_C(P1T4, IC_H8.13)
+	NET_C(P2T4, IC_H8.1)
+	NET_C(IC_H8.11, IC_H8.10)
+	NET_C(IC_H8.3, IC_H8.9)
+
+	NET_C(SCR1A, IC_D10.2)
+	NET_C(SCR2A, IC_D10.3)
+	NET_C(SCR1B, IC_D10.5)
+	NET_C(SCR2B, IC_D10.6)
+	NET_C(SCR1C, IC_D10.14)
+	NET_C(SCR2C, IC_D10.13)
+	NET_C(SCR1D, IC_D10.11)
+	NET_C(SCR2D, IC_D10.10)
+
+	NET_C(SCR1E, IC_E10.2)
+	NET_C(SCR2E, IC_E10.3)
+	NET_C(SCR1F, IC_E10.5)
+	NET_C(SCR2F, IC_E10.6)
+	NET_C(GND, IC_E10.14, IC_E10.13, IC_E10.11, IC_E10.10)
+
+	ALIAS(D0, IC_F10.4)
+	ALIAS(D1, IC_F10.7)
+	ALIAS(D2, IC_F10.12)
+	ALIAS(D3, IC_F10.9)
+
+	ALIAS(D4, IC_F8.4)
+	ALIAS(D4S, IC_F8.7)
+	ALIAS(T2, IC_F8.12)
+	ALIAS(T3, IC_F8.9)
+
+	ALIAS(T4, IC_H8.8)
+
+	ALIAS(SCRA, IC_D10.4)
+	ALIAS(SCRB, IC_D10.7)
+	ALIAS(SCRC, IC_D10.12)
+	ALIAS(SCRD, IC_D10.9)
+
+	ALIAS(SCRE, IC_E10.4)
+	ALIAS(SCRF, IC_E10.7)
+	HINT(IC_E10.12, NC)
+	HINT(IC_E10.9, NC)
+
+	TTL_74153_DIP(IC_D9)
+	TTL_74153_DIP(IC_E9)
+	TTL_74153_DIP(IC_J9)
+	TTL_74153_DIP(IC_H9)
+	TTL_74153_DIP(IC_F9)
+	NET_C(VCC, IC_D9.16, IC_E9.16, IC_J9.16, IC_H9.16, IC_F9.16)
+	NET_C(GND, IC_D9.8,  IC_E9.8,  IC_J9.8,  IC_H9.8,  IC_F9.8)
+	NET_C(GND, IC_D9.1,  IC_E9.1,  IC_J9.1,  IC_H9.1,  IC_F9.1)
+	NET_C(GND, IC_D9.15, IC_E9.15, IC_J9.15, IC_H9.15, IC_F9.15)
+
+	NET_C(VCC, R13.1)
+
+	NET_C(R13.2, IC_D9.6)
+	NET_C(GND,   IC_D9.5)
+	NET_C(VCC,   IC_D9.4)
+	NET_C(R13.2, IC_D9.3)
+	NET_C(V256,  IC_D9.10)
+	NET_C(SCRF,  IC_D9.11)
+	NET_C(D3,    IC_D9.12)
+	NET_C(V256,  IC_D9.13)
+
+	NET_C(V128,  IC_E9.6)
+	NET_C(SCRE,  IC_E9.5)
+	NET_C(D2,    IC_E9.4)
+	NET_C(V128,  IC_E9.3)
+	NET_C(V64,   IC_E9.10)
+	NET_C(SCRD,  IC_E9.11)
+	NET_C(D1,    IC_E9.12)
+	NET_C(V64,   IC_E9.13)
+
+	NET_C(GND,   IC_J9.6)
+	NET_C(SCRC,  IC_J9.5)
+	NET_C(D0,    IC_J9.4)
+	NET_C(V32,   IC_J9.3)
+	NET_C(D4S,   IC_J9.10)
+	NET_C(SCRB,  IC_J9.11)
+	NET_C(H32Q,  IC_J9.12)
+	NET_C(V16,   IC_J9.13)
+
+	NET_C(D3,    IC_H9.6)
+	NET_C(SCRA,  IC_H9.5)
+	NET_C(D4,    IC_H9.4)
+	NET_C(H452,  IC_H9.3)
+	NET_C(D2,    IC_H9.10)
+	NET_C(V16,   IC_H9.11)
+	NET_C(T4,    IC_H9.12)
+	NET_C(H256,  IC_H9.13)
+
+	NET_C(D1,    IC_F9.6)
+	NET_C(V8,    IC_F9.5)
+	NET_C(T3,    IC_F9.4)
+	NET_C(H128,  IC_F9.3)
+	NET_C(D0,    IC_F9.10)
+	NET_C(V4,    IC_F9.11)
+	NET_C(T2,    IC_F9.12)
+	NET_C(H64,   IC_F9.13)
+
+	NET_C(H_INFOQ, IC_D9.14, IC_E9.14, IC_J9.14, IC_H9.14, IC_F9.14, IC_E8.13)
+	NET_C(V_INFOQ, IC_D9.2,  IC_E9.2,  IC_J9.2,  IC_H9.2,  IC_F9.2,  IC_E8.12)
+
+	PROM_MK28000_DIP(IC_R10)
+	PARAM(IC_R10.ROM, "gfx")
+	NET_C(VCC, IC_R10.1, IC_R10.14, IC_R10.24)
+	NET_C(GND, IC_R10.9)
+	NET_C(H16, IC_R10.13)
+	NET_C(IC_E8.11, IC_R10.15)
+	NET_C(IC_D9.7, IC_R10.8)
+	NET_C(IC_D9.9, IC_R10.10)
+	NET_C(IC_E9.7, IC_R10.11)
+	NET_C(IC_E9.9, IC_R10.12)
+	NET_C(IC_J9.7, IC_R10.7)
+	NET_C(IC_J9.9, IC_R10.6)
+	NET_C(IC_H9.7, IC_R10.5)
+	NET_C(IC_H9.9, IC_R10.4)
+	NET_C(IC_F9.7, IC_R10.3)
+	NET_C(IC_F9.9, IC_R10.2)
+
+	TTL_7406_DIP(IC_M10)
+	TTL_7406_DIP(IC_N13)
+	NET_C(VCC, IC_M10.14, IC_N13.14)
+	NET_C(GND, IC_M10.7)
+	NET_C(GND, IC_N13.7, R19.2, R20.2, R21.2, R22.2, R23.2, R24.2, R25.2, R26.2)
+	NET_C(IC_R10.16, R19.1, IC_M10.9)
+	NET_C(IC_R10.17, R20.1, IC_M10.5)
+	NET_C(IC_R10.18, R21.1, IC_M10.11)
+	NET_C(IC_R10.19, R22.1, IC_M10.13)
+	NET_C(IC_R10.20, R23.1, IC_M10.1)
+	NET_C(IC_R10.21, R24.1, IC_M10.3)
+	NET_C(IC_R10.22, R25.1, IC_N13.11)
+	NET_C(IC_R10.23, R26.1, IC_N13.9)
+	ALIAS(ROM_D7, IC_M10.8)
+	ALIAS(ROM_D6, IC_M10.6)
+	ALIAS(ROM_D5, IC_M10.10)
+	ALIAS(ROM_D4, IC_M10.12)
+	ALIAS(ROM_D3, IC_M10.2)
+	ALIAS(ROM_D2, IC_M10.4)
+	ALIAS(ROM_D1, IC_N13.10)
+	ALIAS(ROM_D0, IC_N13.8)
+
+	// Video Summing
+	NET_C(VCC, IC_N10.10)
+	NET_C(GND, IC_N10.15)
+	NET_C(H4Q, IC_N10.2)
+	NET_C(PFLDQ, IC_N10.1)
+	ALIAS(FIELD, IC_N10.7)
+	NET_C(ROM_D0, IC_N10.11)
+	NET_C(ROM_D1, IC_N10.12)
+	NET_C(ROM_D2, IC_N10.13)
+	NET_C(ROM_D3, IC_N10.14)
+	NET_C(ROM_D4, IC_N10.3)
+	NET_C(ROM_D5, IC_N10.4)
+	NET_C(ROM_D6, IC_N10.5)
+	NET_C(ROM_D7, IC_N10.6)
+
+	NET_C(IC_N10.9, IC_K13.2)
+	NET_C(V512, IC_K13.13)
+	NET_C(MINEFIELD, IC_K13.1)
+	ALIAS(PLAYFIELD, IC_K13.12)
+
+	NET_C(GNE, IC_C14.2)
+	NET_C(V_INFO, IC_C14.1)
+	NET_C(FLASH, IC_C14.13)
+
+	NET_C(IC_K13.12, IC_A11.4)
+	NET_C(IC_C14.12, IC_A11.5)
+	ALIAS(PLAYFIELD_VIDEO, IC_A11.6)
+
+	NET_C(PLAYFIELD_VIDEO, IC_F14.13, IC_D11V.9)
+	NET_C(TANK1Q, IC_B10.1)
+	NET_C(V_INFO, IC_F14.1)
+	NET_C(H452Q,IC_F14.2)
+	NET_C(SHELL1, IC_L7.11)
+	NET_C(BLAST1, IC_L7.12)
+	NET_C(IC_L7.13, IC_H8.5)
+	NET_C(IC_D11V.8, IC_H8.4)
+	NET_C(TANK2, IC_D7.12)
+	NET_C(MINE, IC_D7.11)
+	NET_C(SHELL2, IC_N7.8)
+	NET_C(BLAST2, IC_N7.9)
+	NET_C(IC_D7.13, IC_B7.10)
+	NET_C(IC_N7.10, IC_B7.9)
+
+	NET_C(IC_B10.2, R5V.1)
+	NET_C(IC_F14.12, R34V.1)
+	NET_C(IC_H8.6, R6V.1)
+	NET_C(IC_B7.8, R4V.1)
+
+	NET_C(VCC, R7V.1)
+	NET_C(R7V.2, R3V.1, C2.1)
+	NET_C(GND, C2.2)
+	NET_C(R5V.2, R34V.2, R6V.2, R3V.2, R4V.2, CR1.A, RVID.1)
+	NET_C(CR1.K, COMP_SYNC)
+	//RES(RPROBE, 220)
+	//NET_C(RPROBE.2, RVID.1)
+	//ALIAS(VIDEO_PROBE, RPROBE.1)
+	RES(RVID, RES_K(10))
+	NET_C(RVID.2, GND)
+	ALIAS(VIDEO_OUT, RVID.1)
+
+	// Video Probe
+	//NET_C(PFLDQ, VIDEO_PROBE)
+	//TTL_7404_GATE(PROBE_BUF1)
+	//TTL_7404_GATE(PROBE_BUF2)
+	//NET_C(VCC, PROBE_BUF1.VCC, PROBE_BUF2.VCC)
+	//NET_C(GND, PROBE_BUF1.GND, PROBE_BUF2.GND)
+
+	// Playfield & Score Load
+	NET_C(V_INFO, IC_H13.1)
+	NET_C(V32, IC_H13.2)
+	NET_C(H256, C23.1)
+	NET_C(C23.2, R32.1, IC_H13.13)
+	NET_C(V_INFOQ, IC_A10.2)
+	NET_C(H32, C17.1)
+	NET_C(C17.2, R27.1, IC_A10.1)
+	NET_C(GND, R32.2, R27.2)
+	NET_C(IC_H13.12, IC_A10.5)
+	NET_C(IC_A10.3, IC_A10.4)
+	NET_C(IC_A10.6, IC_A10.9)
+	NET_C(H_INFOQ, IC_A10.10)
+	ALIAS(PFLDQ, IC_A10.8)
+
+	// Mine Matrix
+	TTL_7400_DIP(IC_A10)
+	TTL_7486_DIP(IC_F13)
+	NET_C(VCC, IC_A10.14, IC_F13.14)
+	NET_C(GND, IC_A10.7,  IC_F13.7)
+
+	NET_C(V8, IC_A10.13)
+	NET_C(H8, IC_A10.12)
+	ALIAS(SQUARES, IC_A10.11)
+	NET_C(V4, IC_F13.10)
+	NET_C(V2, IC_F13.9)
+	NET_C(H4, IC_F13.12)
+	NET_C(H2, IC_F13.13)
+	NET_C(IC_F13.8, IC_F13.5)
+	NET_C(IC_F13.11, IC_F13.4)
+	ALIAS(CHECKERBOARD, IC_F13.6)
+	NET_C(SQUARES, IC_D7.3)
+	NET_C(CHECKERBOARD, IC_D7.2)
+	ALIAS(MINE_MATRIX, IC_D7.1)
+
+	// Minefield
+	TTL_7410_DIP(IC_H13)
+	NET_C(VCC, IC_H13.14)
+	NET_C(GND, IC_H13.7)
+
+	NET_C(V256Q, IC_H13.5)
+	NET_C(V128, IC_H13.4, IC_H13.10)
+	NET_C(V32, IC_H13.3, IC_H13.11)
+	NET_C(V256, IC_A11.12)
+	NET_C(H_SYNC, IC_A11.13)
+	NET_C(IC_A11.11, IC_H13.9)
+	NET_C(H452, IC_C13.9)
+	NET_C(H452Q, IC_C13.1)
+	NET_C(H256, IC_C13.2)
+	NET_C(H128, IC_C13.10, IC_C13.13)
+	NET_C(H16, IC_C13.11)
+	NET_C(IC_H13.6, IC_B14.9)
+	NET_C(IC_H13.8, IC_B14.13)
+	ALIAS(MEV, IC_B14.8)
+	ALIAS(MEVQ, IC_B14.11)
+	NET_C(MEV, IC_B14.12)
+	NET_C(IC_C13.8, IC_B13.5)
+	NET_C(IC_C13.12, IC_B13.2)
+	ALIAS(MEH, IC_B13.3)
+	ALIAS(MEHQ, IC_B13.6)
+	NET_C(MEH, IC_B13.4)
+	NET_C(MEVQ, IC_B14.10, IC_A13.5)
+	NET_C(MEHQ, IC_B13.1, IC_A13.6)
+	ALIAS(MINEFIELD, IC_A13.4)
+
+	// Mine Control
+	TTL_7400_DIP(IC_K7)
+	TTL_7420_DIP(IC_E7)
+	TTL_7474_DIP(IC_H7)
+	TTL_8277_DIP(IC_F7)
+	NET_C(VCC, IC_K7.14, IC_E7.14, IC_H7.14, IC_F7.16, IC_F7.12, IC_F7.6)
+	NET_C(GND, IC_K7.7,  IC_E7.7,  IC_H7.7,  IC_F7.8,  IC_H7.2,  IC_H7.12, IC_F7.7, IC_F7.10, IC_F7.5, IC_F7.11)
+
+	NET_C(IC_F7.3, IC_F7.13)
+	NET_C(MEV, IC_A11.10)
+	NET_C(V8, IC_A11.9)
+	NET_C(IC_A11.8, IC_F7.9, IC_H7.3, IC_H7.11)
+	NET_C(STARTQ, IC_H7.1, IC_H7.13, IC_F7.1)
+	NET_C(TANK1, IC_K7.13)
+	NET_C(TANK2, IC_K7.1)
+	NET_C(MINE, IC_K7.12, IC_K7.2)
+	NET_C(IC_K7.11, IC_H7.4)
+	NET_C(IC_K7.3, IC_H7.10)
+	ALIAS(MTK1, IC_H7.5)
+	ALIAS(MTK1Q, IC_H7.6)
+	ALIAS(MTK2, IC_H7.9)
+	ALIAS(MTK2Q, IC_H7.8)
+
+	NET_C(MTK1Q, IC_K7.10)
+	NET_C(MTK2Q, IC_K7.9)
+	NET_C(IC_K7.8, IC_J7.8)
+	NET_C(IC_F7.14, IC_J7.9)
+	NET_C(IC_J7.10, IC_F7.4, IC_E7.5)
+	NET_C(FIELD, IC_E7.4)
+	NET_C(MINE_MATRIX, IC_E7.2)
+	NET_C(MINEFIELD, IC_E7.1)
+	NET_C(IC_E7.6, IC_E7.9, IC_E7.10, IC_E7.12, IC_E7.13)
+	ALIAS(MINE, IC_E7.8)
+
+	// Horizontal & Vertical Load
+	TTL_7404_DIP(IC_J11)
+	TTL_7402_DIP(IC_K11)
+	TTL_9321_DIP(IC_L11)
+	NET_C(VCC, IC_J11.14, IC_K11.14, IC_L11.16)
+	NET_C(GND, IC_J11.7,  IC_K11.7,  IC_L11.8, C21.2)
+
+	NET_C(V_RESET, IC_K11.8)
+	NET_C(V2, IC_K11.12)
+	NET_C(IC_K11.10, IC_K11.11)
+	NET_C(IC_K11.13, IC_K11.9, IC_J11.3)
+	NET_C(IC_J11.4, IC_K11.5, IC_K11.2)
+	NET_C(H16, IC_D14.5)
+	NET_C(H_INFO, IC_D14.4)
+	NET_C(IC_D14.6, IC_L11.1)
+	NET_C(H32, IC_L11.2)
+	NET_C(H64, IC_L11.3)
+	NET_C(IC_L11.4, C21.1)
+	NET_C(IC_L11.5, IC_K11.6)
+	NET_C(IC_L11.7, IC_K11.3)
+	ALIAS(LDH2BQ, IC_L11.7)
+	ALIAS(LDH2AQ, IC_L11.6)
+	ALIAS(LDH1BQ, IC_L11.5)
+	ALIAS(LDH1AQ, IC_L11.4)
+	NET_C(IC_K11.4, IC_J11.5)
+	NET_C(IC_K11.1, IC_J11.1)
+	ALIAS(VLD1, IC_K11.4)
+	ALIAS(VLD1Q, IC_J11.6)
+	ALIAS(VLD2, IC_K11.1)
+	ALIAS(VLD2Q, IC_J11.2)
+
+	// Horizontal & Vertical Motion Latches
+	TTL_7474_DIP(IC_M8)
+	TTL_7474_DIP(IC_N8)
+	TTL_7474_DIP(IC_M12)
+	TTL_7474_DIP(IC_N12)
+	TTL_7474_DIP(IC_M9)
+	TTL_7474_DIP(IC_N9)
+	TTL_7474_DIP(IC_M11)
+	TTL_7474_DIP(IC_N11)
+	NET_C(VCC, IC_M8.14, IC_N8.14, IC_M12.14, IC_N12.14, IC_M9.14, IC_N9.14, IC_M11.14, IC_N11.14)
+	NET_C(GND, IC_M8.7,  IC_N8.7,  IC_M12.7,  IC_N12.7,  IC_M9.7,  IC_N9.7,  IC_M11.7,  IC_N11.7)
+	NET_C(VCC, IC_M8.10, IC_M8.4, IC_N8.10, IC_N8.4, IC_M12.10, IC_M12.4, IC_N12.10, IC_N12.4, IC_N9.4)
+	NET_C(VCC, IC_M9.13, IC_M9.1, IC_N9.13, IC_M11.13, IC_M11.1, IC_N11.13, IC_N11.4)
+
+	NET_C(VLD1Q, IC_M8.11, IC_M8.3, IC_N8.11, IC_N8.3, IC_M9.11, IC_M9.3, IC_N9.11, IC_N9.3)
+	NET_C(VLD2Q, IC_M12.11, IC_M12.3, IC_N12.11, IC_N12.3, IC_M11.11, IC_M11.3, IC_N11.11, IC_N11.3)
+	NET_C(G01, IC_L8.5, IC_M9.10, IC_M9.4, IC_N9.10, IC_N9.1)
+	NET_C(G02, IC_L8.9, IC_M11.10, IC_M11.4, IC_N11.10, IC_N11.1)
+	NET_C(H_COUNTQ, IC_L8.4, IC_L8.10)
+	NET_C(IC_L8.6, IC_M8.13, IC_M8.1, IC_N8.13, IC_N8.1)
+	NET_C(IC_L8.8, IC_M12.13, IC_M12.1, IC_N12.13, IC_N12.1)
+	NET_C(ROM_D0, IC_M8.12, IC_M12.12)
+	NET_C(ROM_D1, IC_M8.2, IC_M12.2)
+	NET_C(ROM_D2, IC_N8.12, IC_N12.12)
+	NET_C(ROM_D3, IC_N8.2, IC_N12.2)
+	NET_C(ROM_D4, IC_M9.12, IC_M11.12)
+	NET_C(ROM_D5, IC_M9.2, IC_M11.2)
+	NET_C(ROM_D6, IC_N9.12, IC_N11.12)
+	NET_C(ROM_D7, IC_N9.2, IC_N11.2)
+
+	ALIAS(HA1, IC_M8.9)
+	ALIAS(HB1, IC_M8.5)
+	ALIAS(HC1, IC_N8.9)
+	ALIAS(HD1, IC_N8.5)
+	ALIAS(HA2, IC_M12.9)
+	ALIAS(HB2, IC_M12.5)
+	ALIAS(HC2, IC_N12.9)
+	ALIAS(HD2, IC_N12.5)
+
+	ALIAS(VA1, IC_M9.9)
+	ALIAS(VB1, IC_M9.5)
+	ALIAS(VC1, IC_N9.9)
+	ALIAS(VD1, IC_N9.5)
+	ALIAS(VA2, IC_M11.9)
+	ALIAS(VB2, IC_M11.5)
+	ALIAS(VC2, IC_N11.9)
+	ALIAS(VD2, IC_N11.5)
+
+	// Tank 1 Motion
+	TTL_9316_DIP(IC_A1)
+	TTL_9316_DIP(IC_B1)
+	TTL_9316_DIP(IC_A2)
+	TTL_9316_DIP(IC_B2)
+	TTL_9316_DIP(IC_C2)
+	TTL_74165_DIP(IC_A3)
+	TTL_74165_DIP(IC_B3)
+	TTL_74107_DIP(IC_N1)
+	NET_C(VCC, IC_A1.16, IC_B1.16, IC_A2.16, IC_B2.16, IC_C2.16, IC_A3.16, IC_B3.16, IC_N1.14)
+	NET_C(GND, IC_A1.8,  IC_B1.8,  IC_A2.8,  IC_B2.8,  IC_C2.8,  IC_A3.8,  IC_B3.8,  IC_N1.7)
+
+	TTL_7420_DIP(IC_M1)
+	TTL_7410_DIP(IC_M2)
+	TTL_7400_DIP(IC_C1)
+	TTL_7404_DIP(IC_J3)
+	TTL_7404_DIP(IC_A6)
+	TTL_7486_DIP(IC_K3)
+	TTL_7402_DIP(IC_L3)
+	TTL_7474_DIP(IC_F3)
+	NET_C(VCC, IC_M1.14, IC_M2.14, IC_C1.14, IC_J3.14, IC_A6.14, IC_K3.14, IC_L3.14, IC_F3.14)
+	NET_C(GND, IC_M1.7,  IC_M2.7,  IC_C1.7,  IC_J3.7,  IC_A6.7,  IC_K3.7,  IC_L3.7,  IC_F3.7)
+
+	NET_C(HA1, IC_A1.3)
+	NET_C(HB1, IC_A1.4)
+	NET_C(HC1, IC_A1.5)
+	NET_C(HD1, IC_A1.6)
+
+	NET_C(VA1, IC_A2.3)
+	NET_C(VB1, IC_A2.4)
+	NET_C(VC1, IC_A2.5)
+	NET_C(VD1, IC_A2.6)
+
+	NET_C(HRST1Q, IC_A1.1, IC_B1.1, IC_N1.10, IC_N1.13)
+	NET_C(VRST1Q, IC_A2.1, IC_B2.1, IC_C2.1)
+
+	NET_C(CLOCKQ, IC_A6.9)
+	NET_C(IC_A6.8, IC_A1.2, IC_B1.2, IC_A3.2, IC_B3.2, IC_F3.11)
+	ALIAS(CLOCK1, IC_A6.8)
+
+	NET_C(H_COUNTQ, IC_A6.1)
+	NET_C(IC_A6.2, IC_A2.2, IC_B2.2, IC_C2.2)
+	ALIAS(H_COUNT1, IC_A6.2)
+
+	NET_C(VCC, IC_A1.7, IC_A1.10, IC_B1.10, IC_B1.3, IC_B1.4, IC_B1.5)
+	NET_C(VCC, IC_N1.1, IC_N1.4, IC_N1.8, IC_N1.11)
+	NET_C(VCC, IC_A2.7, IC_A2.10, IC_B2.10, IC_B2.3, IC_B2.4, IC_B2.5, IC_B2.6, IC_C2.3, IC_C2.5, IC_C2.6)
+	NET_C(VCC, IC_F3.13, IC_A3.10)
+	NET_C(GND, IC_B1.6, IC_C2.4)
+
+	NET_C(IC_A1.15, IC_B1.7, IC_M1.5)
+	NET_C(IC_B1.15, IC_N1.12, IC_M2.5, IC_M1.1)
+	NET_C(IC_N1.3, IC_N1.9, IC_M2.4, IC_M1.2)
+	NET_C(IC_N1.6, IC_M2.3, IC_M1.4)
+	NET_C(IC_M1.6, IC_A1.9, IC_B1.9)
+	ALIAS(THR1Q, IC_M1.6)
+	ALIAS(THW1Q, IC_M2.6)
+
+	NET_C(IC_A2.15, IC_B2.7, IC_C2.7, IC_C1.12)
+	NET_C(IC_B2.15, IC_C2.10)
+	NET_C(IC_C2.15, IC_C1.13, IC_F3.10)
+	NET_C(IC_C1.11, IC_A2.9, IC_B2.9, IC_C2.9)
+	ALIAS(TVR1Q, IC_C1.11)
+
+	NET_C(THW1Q, IC_F3.12)
+	ALIAS(WINDO1, IC_F3.8)
+	NET_C(IC_F3.9, IC_A3.15, IC_B3.15, IC_L3.11)
+	NET_C(IC_A3.9, IC_B3.10)
+	NET_C(IC_B3.7, IC_K3.1)
+
+	NET_C(FLASH, IC_C1.10, IC_J3.3)
+	NET_C(BLO_UP1, IC_C1.9)
+	ALIAS(FLASHQ, IC_J3.4)
+	NET_C(IC_C1.8, IC_K3.2)
+	NET_C(IC_K3.3, IC_L3.12)
+	ALIAS(TANK1, IC_L3.13)
+
+	NET_C(LDH1AQ, IC_A3.1)
+	NET_C(LDH1BQ, IC_B3.1)
+
+	NET_C(ROM_D0, IC_A3.11, IC_B3.11)
+	NET_C(ROM_D1, IC_A3.12, IC_B3.12)
+	NET_C(ROM_D2, IC_A3.13, IC_B3.13)
+	NET_C(ROM_D3, IC_A3.14, IC_B3.14)
+	NET_C(ROM_D4, IC_A3.3, IC_B3.3)
+	NET_C(ROM_D5, IC_A3.4, IC_B3.4)
+	NET_C(ROM_D6, IC_A3.5, IC_B3.5)
+	NET_C(ROM_D7, IC_A3.6, IC_B3.6)
+
+	ALIAS(P1T2, IC_A2.13)
+	ALIAS(P1T3, IC_A2.12)
+	ALIAS(P1T4, IC_A2.11)
+
+	// Tank 2 Motion Circuit
+	TTL_9316_DIP(IC_A5)
+	TTL_9316_DIP(IC_B5)
+	TTL_9316_DIP(IC_A4)
+	TTL_9316_DIP(IC_B4)
+	TTL_9316_DIP(IC_C4)
+	TTL_74165_DIP(IC_C3)
+	TTL_74165_DIP(IC_D3)
+	TTL_74107_DIP(IC_N5)
+	NET_C(VCC, IC_A5.16, IC_B5.16, IC_A4.16, IC_B4.16, IC_C4.16, IC_C3.16, IC_D3.16, IC_N5.14)
+	NET_C(GND, IC_A5.8,  IC_B5.8,  IC_A4.8,  IC_B4.8,  IC_C4.8,  IC_C3.8,  IC_D3.8,  IC_N5.7)
+
+	TTL_7402_DIP(IC_C6)
+	TTL_7420_DIP(IC_M5)
+	TTL_7410_DIP(IC_M4)
+	TTL_7400_DIP(IC_C5)
+	NET_C(VCC, IC_C6.14, IC_M5.14, IC_M4.14, IC_C5.14)
+	NET_C(GND, IC_C6.7,  IC_M5.7,  IC_M4.7,  IC_C5.7)
+
+	NET_C(CLOCKQ, IC_A6.5)
+	ALIAS(CLOCK2, IC_A6.5)
+	NET_C(IC_A6.6, IC_A5.2, IC_B5.2, IC_F3.3, IC_C3.2, IC_D3.2)
+	NET_C(HRST2Q, IC_A5.1, IC_B5.1, IC_N5.10, IC_N5.13)
+	NET_C(VCC, IC_B5.10, IC_B5.3, IC_B5.4, IC_B5.5, IC_N5.1, IC_N5.4, IC_N5.8, IC_N5.11, IC_C3.10, IC_F3.1, IC_A5.7, IC_A5.10)
+	NET_C(GND, IC_B5.6)
+
+	NET_C(IC_B4.15, IC_C4.10)
+	NET_C(IC_C3.9, IC_D3.10)
+	NET_C(THW2Q, IC_F3.2)
+	NET_C(TVW2, IC_F3.4)
+
+	NET_C(IC_F3.5, IC_C3.15, IC_D3.15, IC_C6.3)
+
+	NET_C(HA2, IC_A5.3)
+	NET_C(HB2, IC_A5.4)
+	NET_C(HC2, IC_A5.5)
+	NET_C(HD2, IC_A5.6)
+	NET_C(IC_A5.15, IC_B5.7, IC_M5.1)
+	NET_C(IC_B5.15, IC_N5.12, IC_M5.2, IC_M4.5)
+	NET_C(IC_N5.3, IC_N5.9, IC_M5.5, IC_M4.3)
+	NET_C(IC_N5.6, IC_M5.4, IC_M4.4)
+	ALIAS(THR2Q, IC_M5.6)
+	ALIAS(THW2Q, IC_M4.6)
+	NET_C(THR2Q, IC_A5.9, IC_B5.9)
+
+	NET_C(ROM_D0, IC_C3.11, IC_D3.11)
+	NET_C(ROM_D1, IC_C3.12, IC_D3.12)
+	NET_C(ROM_D2, IC_C3.13, IC_D3.13)
+	NET_C(ROM_D3, IC_C3.14, IC_D3.14)
+	NET_C(ROM_D4, IC_C3.3, IC_D3.3)
+	NET_C(ROM_D5, IC_C3.4, IC_D3.4)
+	NET_C(ROM_D6, IC_C3.5, IC_D3.5)
+	NET_C(ROM_D7, IC_C3.6, IC_D3.6)
+
+	ALIAS(WINDO2, IC_F3.6)
+	NET_C(LDH2AQ, IC_C3.1)
+	NET_C(LDH2BQ, IC_D3.1)
+
+	NET_C(BLO_UP2, IC_C5.13)
+	NET_C(FLASH, IC_C5.12)
+	NET_C(IC_C5.11, IC_K3.10)
+	NET_C(IC_D3.9, IC_K3.9)
+	NET_C(IC_K3.2, IC_C6.2)
+	ALIAS(TANK2, IC_C6.1)
+
+	NET_C(VA2, IC_A4.3)
+	NET_C(VB2, IC_A4.4)
+	NET_C(VC2, IC_A4.5)
+	NET_C(VD2, IC_A4.6)
+
+	NET_C(VCC, IC_A4.7, IC_A4.10, IC_B4.10, IC_B4.3, IC_B4.4, IC_B4.5, IC_B4.6, IC_C4.3, IC_C4.5, IC_C4.6)
+	NET_C(GND, IC_C4.4)
+
+	NET_C(H_COUNTQ, IC_A6.3)
+	NET_C(IC_A6.4, IC_A4.2, IC_B4.2, IC_C4.2)
+	ALIAS(HCOUNT2, IC_A6.4)
+
+	NET_C(VRST2Q, IC_A4.1, IC_B4.1, IC_C4.1)
+	ALIAS(P2T2, IC_A4.13)
+	ALIAS(P2T3, IC_A4.12)
+	ALIAS(P2T4, IC_A4.11)
+
+	NET_C(IC_A4.15, IC_B4.7, IC_C4.7, IC_C5.10)
+	NET_C(IC_C4.15, IC_C5.9)
+	NET_C(IC_C5.8, IC_A4.9, IC_B4.9, IC_C4.9)
+	ALIAS(TVR2Q, IC_C5.8)
+	ALIAS(TVW2, IC_C4.15)
+
+	// Shell 1 Motion
+	TTL_7474_DIP(IC_D1)
+	TTL_7474_DIP(IC_E1)
+	TTL_9316_DIP(IC_H1)
+	TTL_9316_DIP(IC_J1)
+	TTL_9316_DIP(IC_F1)
+	TTL_9316_DIP(IC_H2)
+	TTL_9316_DIP(IC_J2)
+	TTL_74107_DIP(IC_L1)
+	TTL_7408_DIP(IC_F2)
+	NET_C(VCC, IC_D1.14, IC_E1.14, IC_H1.16, IC_J1.16, IC_F1.16, IC_H2.16, IC_J2.16, IC_L1.14, IC_F2.14, IC_F1.1)
+	NET_C(GND, IC_D1.7,  IC_E1.7,  IC_H1.8,  IC_J1.8,  IC_F1.8,  IC_H2.8,  IC_J2.8,  IC_L1.7,  IC_F2.7)
+
+	TTL_7402_DIP(IC_K1)
+	TTL_7404_DIP(IC_N4)
+	TTL_7420_DIP(IC_L2)
+	TTL_7486_DIP(IC_K2)
+	TTL_7474_DIP(IC_N3)
+	TTL_7408_DIP(IC_M3)
+	TTL_7474_DIP(IC_D2)
+	TTL_7474_DIP(IC_E2)
+	NET_C(VCC, IC_K1.14, IC_N4.14, IC_L2.14, IC_K2.14, IC_N3.14, IC_M3.14, IC_D2.14, IC_E2.14)
+	NET_C(GND, IC_K1.7,  IC_N4.7,  IC_L2.7,  IC_K2.7,  IC_N3.7,  IC_M3.7,  IC_D2.7,  IC_E2.7)
+
+	NET_C(VCC, R4.1, R5.1, R6.1, R7.1, R8.1, R9.1, R10.1, R11.1)
+	NET_C(VCC, IC_H2.7, IC_H2.10, IC_J2.10, IC_J2.3, IC_J2.4, IC_J2.5, IC_L1.1, IC_L1.4, IC_L1.8, IC_L1.11, IC_N3.1)
+	NET_C(VCC, IC_F1.7, IC_F1.10, IC_H1.10, IC_H1.3, IC_H1.4, IC_H1.5, IC_H1.6, IC_J1.3, IC_J1.5, IC_J1.6)
+	NET_C(VCC, IC_D1.1, IC_D1.13, IC_E1.1, IC_H2.1, IC_J2.1, IC_D2.4, IC_D2.10, IC_E2.4, IC_E2.10, IC_E1.10)
+	NET_C(VCC, IC_H1.1, IC_J1.1)
+	NET_C(GND, C110.2, IC_N3.2, IC_J2.6, IC_J1.4)
+
+	NET_C(VLD1, IC_M2.1, IC_M2.2)
+	NET_C(FIRE1Q, IC_M2.13)
+	NET_C(IC_M2.12, IC_D2.3, IC_D2.11, IC_E2.3, IC_E2.11, IC_D1.3, IC_D1.11, IC_E1.3, IC_E1.11)
+	NET_C(EXPL1, IC_J3.13)
+	NET_C(IC_J3.12, IC_D2.1, IC_D2.13, IC_E2.1, IC_E2.13, IC_D1.4, IC_D1.10, IC_E1.4, IC_E1.13)
+	NET_C(HMCE, IC_F2.12, IC_F2.5, IC_F2.9, IC_C1.1)
+	NET_C(IC_D2.5, IC_F2.13)
+	NET_C(IC_E2.5, IC_F2.4)
+	NET_C(IC_D2.9, IC_F2.10)
+	NET_C(IC_E2.9, IC_C1.2)
+
+	NET_C(FIRE1Q, C110.1, IC_C1.4)
+	NET_C(EXPL1Q, IC_C1.5)
+	ALIAS(FPE1, IC_C1.6)
+	NET_C(IC_C1.6, IC_L3.2)
+	NET_C(THW1Q, IC_L3.3)
+	NET_C(IC_L3.1, IC_J3.1)
+	NET_C(IC_J3.2, IC_M3.4, IC_N3.4)
+	NET_C(IC_M3.6, IC_H2.9, IC_J2.9)
+	NET_C(IC_M1.8, IC_M3.5)
+
+	NET_C(IC_F2.11, IC_H2.3)
+	NET_C(IC_F2.6, IC_H2.4)
+	NET_C(IC_F2.8, IC_H2.5)
+	NET_C(IC_C1.3, IC_H2.6)
+
+	NET_C(CLOCK1, IC_H2.2, IC_J2.2)
+	NET_C(H_COUNT1, IC_F1.2, IC_H1.2, IC_J1.2)
+
+	NET_C(IC_H2.15, IC_J2.7, IC_M1.13, IC_N3.3)
+	NET_C(IC_J2.15, IC_L1.12, IC_M1.12, IC_M2.9)
+	NET_C(IC_L1.3, IC_L1.9, IC_M1.10, IC_M2.10)
+	NET_C(IC_L1.5, IC_M1.9, IC_M2.11)
+	NET_C(IC_N3.6, IC_L1.10, IC_L1.13)
+
+	NET_C(IC_D1.5, IC_F1.3)
+	NET_C(IC_D1.9, IC_F1.4)
+	NET_C(IC_E1.5, IC_F1.5)
+	NET_C(IC_E1.9, IC_F1.6)
+
+	NET_C(IC_F1.15, IC_H1.7, IC_J1.7, IC_F2.2)
+	NET_C(IC_H1.15, IC_J1.10)
+	NET_C(IC_J1.15, IC_J3.11, IC_F2.1)
+	NET_C(IC_F2.3, IC_K1.12)
+	NET_C(FPE1, IC_K1.9)
+	NET_C(TVR1Q, IC_K1.8)
+	ALIAS(SRS1, IC_K1.10)
+	NET_C(IC_K1.10, IC_K1.11)
+	NET_C(IC_K1.13, IC_J1.9, IC_H1.9, IC_F1.9)
+
+	NET_C(IC_J3.10, IC_L3.5)
+	NET_C(IC_M2.8, IC_L3.6)
+	NET_C(IC_L3.4, IC_L2.1, IC_L2.9)
+	NET_C(FIRE1Q, IC_J3.5)
+	NET_C(IC_J3.6, IC_L2.2)
+	NET_C(S4V1, IC_L3.9)
+	NET_C(S8H1, IC_L3.8)
+	NET_C(IC_L3.10, IC_L2.4)
+	NET_C(S4H1, IC_M3.9)
+	NET_C(S8V1, IC_M3.10)
+	NET_C(IC_M3.8, IC_L2.5)
+	NET_C(IC_L2.6, IC_N4.5)
+	ALIAS(SHELL1, IC_N4.6)
+
+	NET_C(S4V1, IC_K2.5)
+	NET_C(S8V1, IC_K2.4)
+	NET_C(S4H1, IC_K2.10)
+	NET_C(S8H1, IC_K2.9)
+	NET_C(S2V1, IC_K2.12)
+	NET_C(S2H1, IC_K2.13)
+	NET_C(IC_K2.6, IC_K2.2, IC_K1.2)
+	NET_C(IC_K2.8, IC_K2.1, IC_K1.3)
+	NET_C(FLASHQ, IC_K3.4)
+	NET_C(IC_K3.3, IC_K3.5)
+	NET_C(IC_K3.6, IC_L2.12)
+	NET_C(IC_K1.1, IC_K1.6)
+	NET_C(IC_K2.11, IC_K1.5)
+	NET_C(IC_K1.4, IC_L2.13)
+	NET_C(EXPL1, IC_L2.10)
+	NET_C(IC_L2.8, IC_N4.9)
+	ALIAS(BLAST1, IC_N4.8)
+
+	ALIAS(S2H1, IC_H2.13)
+	ALIAS(S4H1, IC_H2.12)
+	ALIAS(S8H1, IC_H2.11)
+
+	ALIAS(S2V1, IC_F1.13)
+	ALIAS(S4V1, IC_F1.12)
+	ALIAS(S8V1, IC_F1.11)
+
+	NET_C(ROM_D0, R4.2, IC_D2.2)
+	NET_C(ROM_D1, R6.2, IC_E2.2)
+	NET_C(ROM_D2, R8.2, IC_E2.12)
+	NET_C(ROM_D3, R10.2, IC_D2.12)
+	NET_C(ROM_D4, R11.2, IC_D1.2)
+	NET_C(ROM_D5, R9.2, IC_D1.12)
+	NET_C(ROM_D6, R7.2, IC_E1.2)
+	NET_C(ROM_D7, R5.2, IC_E1.12)
+
+	// Shell 2 Motion
+	TTL_7474_DIP(IC_E4)
+	TTL_7474_DIP(IC_D4)
+	TTL_7474_DIP(IC_D5)
+	TTL_7474_DIP(IC_E5)
+	TTL_9316_DIP(IC_H4)
+	TTL_9316_DIP(IC_J4)
+	TTL_9316_DIP(IC_F5)
+	TTL_9316_DIP(IC_H5)
+	TTL_9316_DIP(IC_J5)
+	NET_C(VCC, IC_E4.14, IC_D4.14, IC_D5.14, IC_E5.14, IC_H4.16, IC_J4.16, IC_F5.16, IC_H5.16, IC_J5.16)
+	NET_C(GND, IC_E4.7,  IC_D4.7,  IC_D5.7,  IC_E5.7,  IC_H4.8,  IC_J4.8,  IC_F5.8,  IC_H5.8,  IC_J5.8)
+
+	TTL_74107_DIP(IC_L5)
+	TTL_7486_DIP(IC_K4)
+	TTL_7402_DIP(IC_K5)
+	TTL_7408_DIP(IC_F4)
+	TTL_7420_DIP(IC_L4)
+	NET_C(VCC, IC_L5.14, IC_K4.14, IC_K5.14, IC_F4.14, IC_L4.14)
+	NET_C(GND, IC_L5.7,  IC_K4.7,  IC_K5.7,  IC_F4.7,  IC_L4.7)
+
+	NET_C(VCC, IC_E4.4, IC_D4.4, IC_E4.10, IC_D4.10, IC_D5.1, IC_D5.13, IC_E5.1)
+	NET_C(VCC, IC_J4.10, IC_J4.3, IC_J4.4, IC_J4.5, IC_H5.10, IC_H5.3, IC_H5.4, IC_H5.5, IC_H5.6, IC_J5.3, IC_J5.5, IC_J5.6)
+	NET_C(VCC, IC_H4.1, IC_H4.7, IC_H4.10, IC_J4.1, IC_F5.1, IC_F5.7, IC_F5.10, IC_H5.1, IC_J5.1, IC_N3.13, IC_L5.8, IC_L5.11, IC_L5.1, IC_L5.4, IC_E5.10)
+	NET_C(GND, C111.2, IC_J4.6, IC_J5.4, IC_N3.12)
+
+	NET_C(FIRE2Q, IC_M4.1, IC_M4.2)
+	NET_C(VLD2, IC_M4.13)
+	NET_C(IC_M4.12, IC_E4.3, IC_D4.3, IC_E4.11, IC_D4.11, IC_D5.3, IC_D5.11, IC_E5.3, IC_E5.11)
+
+	NET_C(EXPL2, IC_H3.11)
+	NET_C(IC_H3.10, IC_E4.1, IC_D4.1, IC_E4.13, IC_D4.13, IC_E5.13, IC_D5.4, IC_D5.10, IC_E5.4)
+
+	NET_C(IC_E4.5, IC_F4.2)
+	NET_C(IC_D4.5, IC_F4.5)
+	NET_C(IC_E4.9, IC_F4.9)
+	NET_C(IC_D4.9, IC_C5.5)
+	NET_C(HMCE, IC_F4.1, IC_F4.4, IC_F4.10, IC_C5.4)
+
+	NET_C(IC_F4.3, IC_H4.3)
+	NET_C(IC_F4.6, IC_H4.4)
+	NET_C(IC_F4.8, IC_H4.5)
+	NET_C(IC_C5.6, IC_H4.6)
+
+	NET_C(HCOUNT2, IC_F5.2, IC_H5.2, IC_J5.2)
+	NET_C(IC_H5.15, IC_J5.10)
+	NET_C(IC_J5.15, IC_H3.13, IC_F4.12)
+	NET_C(IC_F5.15, IC_H5.7, IC_J5.7, IC_F4.13)
+	NET_C(IC_F4.11, IC_C6.12)
+	NET_C(FPE2, IC_C6.8)
+	NET_C(TVR2Q, IC_C6.9)
+	NET_C(IC_C6.10, IC_C6.11)
+	ALIAS(SRS2, IC_C6.10)
+	NET_C(IC_C6.13, IC_F5.9, IC_H5.9, IC_J5.9)
+
+	NET_C(IC_D5.5, IC_F5.3)
+	NET_C(IC_D5.9, IC_F5.4)
+	NET_C(IC_E5.5, IC_F5.5)
+	NET_C(IC_E5.9, IC_F5.6)
+
+	NET_C(CLOCK2, IC_H4.2, IC_J4.2)
+	NET_C(IC_H4.15, IC_J4.7, IC_M5.9, IC_N3.11)
+	NET_C(IC_J4.15, IC_L5.9, IC_M5.10, IC_M4.11)
+	NET_C(IC_L5.5, IC_L5.12, IC_M5.12, IC_M4.10)
+	NET_C(IC_L5.3, IC_M5.13, IC_M4.9)
+	NET_C(IC_M4.8, IC_K5.11)
+	NET_C(IC_H3.12, IC_K5.12)
+
+	NET_C(FIRE2Q, C111.1, IC_C5.1)
+	NET_C(EXPL2Q, IC_C5.2)
+	NET_C(IC_C5.3, IC_C6.6)
+	ALIAS(FPE2, IC_C5.3)
+	NET_C(THW2Q, IC_C6.5)
+	NET_C(IC_C6.4, IC_H3.1)
+	NET_C(IC_H3.2, IC_N3.10, IC_M3.2)
+	NET_C(IC_M5.8, IC_M3.1)
+	NET_C(IC_M3.3, IC_H4.9, IC_J4.9)
+	NET_C(IC_N3.8, IC_L5.10, IC_L5.13)
+
+	NET_C(S4H2, IC_M3.12)
+	NET_C(S8V2, IC_M3.13)
+	NET_C(S4V2, IC_K5.3)
+	NET_C(S8H2, IC_K5.2)
+	NET_C(IC_M3.11, IC_L4.5)
+	NET_C(IC_K5.1, IC_L4.2)
+	NET_C(FIRE2Q, IC_H3.9)
+	NET_C(IC_H3.8, IC_L4.4)
+
+	NET_C(IC_K5.13, IC_L4.13, IC_L4.1)
+	NET_C(IC_L4.6, IC_N4.11)
+	ALIAS(SHELL2, IC_N4.10)
+
+	NET_C(S4V2, IC_K4.1)
+	NET_C(S8V2, IC_K4.2)
+	NET_C(S4H2, IC_K4.10)
+	NET_C(S8H2, IC_K4.9)
+	NET_C(S2H2, IC_K4.12)
+	NET_C(S2V2, IC_K4.13)
+	NET_C(IC_K4.3, IC_K4.4, IC_K5.6)
+	NET_C(IC_K4.8, IC_K4.5, IC_K5.5)
+	NET_C(FLASHQ, IC_K3.12)
+	NET_C(IC_K4.6, IC_K3.13)
+	NET_C(IC_K5.4, IC_K5.9)
+	NET_C(IC_K5.11, IC_K5.8)
+	NET_C(IC_K3.11, IC_L4.12)
+	NET_C(IC_K5.10, IC_L4.10)
+	NET_C(EXPL2, IC_L4.9)
+	NET_C(IC_L4.8, IC_N4.13)
+	ALIAS(BLAST2, IC_N4.12)
+
+	ALIAS(S2H2, IC_H4.13)
+	ALIAS(S4H2, IC_H4.12)
+	ALIAS(S8H2, IC_H4.11)
+	ALIAS(S2V2, IC_F5.13)
+	ALIAS(S4V2, IC_F5.12)
+	ALIAS(S8V2, IC_F5.11)
+
+	NET_C(ROM_D0, IC_E4.2)
+	NET_C(ROM_D1, IC_D4.2)
+	NET_C(ROM_D2, IC_E4.12)
+	NET_C(ROM_D3, IC_D4.12)
+	NET_C(ROM_D4, IC_D5.2)
+	NET_C(ROM_D5, IC_D5.12)
+	NET_C(ROM_D6, IC_E5.2)
+	NET_C(ROM_D7, IC_E5.12)
+
+	// Boom Com
+	TTL_9602_DIP(IC_N14)
+	NET_C(VCC, IC_N14.16, IC_N14.3, IC_N14.5, IC_N14.13, R38.2)
+	NET_C(GND, IC_N14.8, R10A.2, R9A.2)
+	NET_C(MTK1, IC_L7.5)
+	NET_C(EXPL1, C5.1)
+	NET_C(C5.2, R10A.1, IC_L7.6)
+	NET_C(MTK2, IC_L7.9)
+	NET_C(EXPL2, C6.1)
+	NET_C(C6.2, R9A.1, IC_L7.8)
+	NET_C(IC_L7.4, IC_K7.4)
+	NET_C(IC_L7.10, IC_K7.5)
+	NET_C(IC_K7.6, IC_N14.4)
+	NET_C(IC_N14.1, C27.1)
+	NET_C(IC_N14.2, C27.2, R38.1)
+	NET_C(IC_N14.6, IC_N13.5)
+	ALIAS(BOOM_COM, IC_N13.6)
+
+	// HLE Noise Gen
+	CLOCK(NOISE_CLOCK, 10000)
+	NET_C(NOISE_CLOCK.GND, GND)
+	NET_C(NOISE_CLOCK.VCC, V12)
+
+	SYS_NOISE_MT_N(HLE_NOISE, 0.05)
+	NET_C(HLE_NOISE.I, NOISE_CLOCK.Q)
+
+	// Noise Generation
+	OPAMP(IC_NOISE_OP, "UA741")
+	NET_C(V12, IC_NOISE_OP.VCC, R71A.1, R70A.1)
+	NET_C(R71A.2, C40A.1, HLE_NOISE.1)
+	NET_C(C40A.2, C43A.1, R70A.2, R73A.1, IC_NOISE_OP.GND)
+	NET_C(GND, HLE_NOISE.2, C43A.2, R73A.2, C38A.1)
+	NET_C(C38A.2, R69.1, C39A.1, IC_NOISE_OP.MINUS)
+	NET_C(IC_NOISE_OP.PLUS, R69.2, C39A.2)
+	ALIAS(NOISE, IC_NOISE_OP.OUT)
+
+	// Shot Sound
+	MC3340_DIP(IC_K6)
+	NET_C(V12, IC_K6.8)
+	NET_C(GND, SHOT_NOISE_VOL.1, C32A.2, IC_K6.3, C27A.2, C28A.2, Q7.C)
+	NET_C(NOISE, SHOT_NOISE_VOL.3)
+	NET_C(SHOT_NOISE_VOL.2, C32A.1, C31A.1)
+	NET_C(C31A.2, IC_K6.2)
+	NET_C(IC_K6.6, C27A.1)
+	NET_C(VCC, R64A.1)
+	NET_C(SHOT_COM, CR19.K)
+	NET_C(CR19.A, R64A.2, Q7.B, C28A.1)
+	NET_C(IC_K6.2, Q7.E)
+	ALIAS(SHOT, IC_K6.7)
+
+	// Shot Com
+	NET_C(FIRE1, C7.1)
+	NET_C(FIRE2, C4.1)
+	NET_C(C7.2, R8A.1, IC_L7.2)
+	NET_C(C4.2, R11A.1, IC_L7.3)
+	NET_C(GND, IC_N14.12, R8A.2, R11A.2)
+	NET_C(IC_L7.1, IC_N14.11)
+	NET_C(IC_N14.15, C26.1)
+	NET_C(IC_N14.14, C26.2, R37A.1)
+	NET_C(R37A.2, VCC)
+	NET_C(IC_N14.10, IC_N13.3)
+	ALIAS(SHOT_COM, IC_N13.4)
+
+	// Boom Sound
+	MC3340_DIP(IC_L6)
+	NET_C(V12, IC_L6.8)
+	NET_C(NOISE, BOOM_NOISE_VOL.3)
+	NET_C(GND, BOOM_NOISE_VOL.1, C36A.2, C41A.2, Q6.C, C30A.2)
+	NET_C(BOOM_NOISE_VOL.2, C36A.1, C35A.1)
+	NET_C(C35A.2, IC_L6.1)
+	NET_C(BOOM_COM, CR22.K)
+	NET_C(CR22.A, R72A.2, C41A.1, Q6.B)
+	NET_C(V5, R72A.1)
+	NET_C(Q6.E, IC_L6.2)
+	NET_C(IC_L6.6, C30A.1)
+	ALIAS(BOOM, IC_L6.7)
+
+	// Motor 1 Sound
+	/*TTL_7406_DIP(IC_K15)
+	NE555_DIP(IC_L15)
+	NE566_DIP(IC_M15)
+	MC3340_DIP(IC_N15)
+	NET_C(VCC, IC_K15.14, IC_L15.8, IC_L15.4, Q29.C)
+	NET_C(V12, IC_M15.8, IC_N15.8, R73M1.1, Q27.C, R100M1.1, Q30.E, R36M1.1)
+	NET_C(GND, IC_K15.7, C54M1.2, C51M1.2, C53M1.2, C55M1.2, R78M1.2, IC_L15.1)
+	NET_C(P1SP2, IC_K15.13)
+	NET_C(P1SP1, IC_K15.11)
+	NET_C(P1SP0, IC_K15.9)
+	NET_C(IC_K15.12, R74M1.2)
+	NET_C(IC_K15.10, R75M1.2)
+	NET_C(IC_K15.8, R76M1.2)
+	NET_C(R73M1.2, R74M1.1, R75M1.1, R76M1.1, C54M1.1, Q27.B)
+	NET_C(C54M1.2, MOTOR1_VOL.1)
+	NET_C(MOTOR1_VOL.3, Q27.E, Q28.B, C52M1.1, IC_M15.5)
+	NET_C(R100M1.2, MOTOR1_VOL2.3, MOTOR1_VOL2.2)
+	NET_C(MOTOR1_VOL2.1, Q28.E)
+	NET_C(MOTOR1_VOL.2, R101M1.1)
+	NET_C(CR14M1.A, IC_L15.2)
+	NET_C(Q28.C, R77M1.1, IC_L15.7)
+	NET_C(IC_L15.6, C51M1.1, CR14M1.K, R77M1.2, Q29.B)
+	NET_C(Q29.E, R78M1.1, C56M1.2)
+	NET_C(C56M1.1, IC_N15.3)
+	NET_C(IC_M15.7, C53M1.1)
+	NET_C(C52M1.2, R36M1.2, IC_M15.6)
+	NET_C(IC_M15.4, R80M1.1, R79M1.1)
+	NET_C(R80M1.2, GND)
+	NET_C(R101M1.2, R79M1.2, Q30.C, IC_N15.2)
+	NET_C(ATTRACT, IC_N13.1)
+	NET_C(IC_N13.2, R81M1.1)
+	NET_C(R81M1.2, Q30.B)
+	NET_C(IC_N15.6, C55M1.1)
+	RES(R555OUT1, RES_K(1))
+	NET_C(R555OUT1.1, IC_L15.3)
+	NET_C(GND, R555OUT1.2)
+	ALIAS(MOTOR1, IC_N15.7)*/
+	ALIAS(MOTOR1, GND)
+
+	// Motor 2 Sound
+	/*NE555_DIP(IC_J15)
+	NE566_DIP(IC_H15)
+	MC3340_DIP(IC_F15)
+	NET_C(VCC, IC_J15.8, IC_J15.4, Q33.C)
+	NET_C(V12, IC_H15.8, IC_F15.8, R72M2.1, Q31.C, R102M2.1, R35M2.1)
+	NET_C(GND, C49M2.2, C50M2.2, C48M2.2, C43M2.2, R68M2.2, IC_J15.1)
+	NET_C(P2SP2, IC_K15.1)
+	NET_C(P2SP1, IC_K15.3)
+	NET_C(P2SP0, IC_K15.5)
+	NET_C(IC_K15.2, R69M2.2)
+	NET_C(IC_K15.4, R70M2.2)
+	NET_C(IC_K15.6, R71M2.2)
+	NET_C(R72M2.2, R71M2.1, R70M2.1, R69M2.1, C49M2.1, Q31.B)
+	NET_C(C49M2.2, MOTOR2_VOL.1)
+	NET_C(MOTOR2_VOL.3, Q31.E, Q32.B, C47M2.1, IC_H15.5)
+	NET_C(R102M2.2, MOTOR2_VOL2.3, MOTOR2_VOL2.2)
+	NET_C(MOTOR2_VOL2.1, Q32.E)
+	NET_C(MOTOR2_VOL.2, R103M2.1)
+	NET_C(CR13M2.A, IC_J15.2)
+	NET_C(Q32.C, R67M2.1, IC_J15.7)
+	NET_C(IC_J15.6, C50M2.1, CR13M2.K, R67M2.2, Q33.B)
+	NET_C(Q33.E, R68M2.1, C44M2.2)
+	NET_C(C44M2.1, IC_F15.3)
+	NET_C(IC_H15.7, C48M2.1)
+	NET_C(C47M2.2, R35M2.2, IC_H15.6)
+	NET_C(IC_H15.4, R66M2.1, R65M2.1)
+	NET_C(GND, R66M2.2)
+	NET_C(R103M2.2, R65M2.2, Q34.C, IC_F15.2)
+	NET_C(ATTRACT, IC_N13.13)
+	NET_C(IC_N13.12, R64M2.1)
+	NET_C(R64M2.2, Q34.B)
+	NET_C(IC_F15.6, C43M2.1)
+	RES(R555OUT2, RES_K(1))
+	NET_C(R555OUT2.1, IC_J15.3)
+	NET_C(GND, R555OUT2.2)
+	ALIAS(MOTOR2, IC_F15.7)*/
+	ALIAS(MOTOR2, GND)
+
+	// Mixer
+	NET_C(MOTOR1, R102MX.1)
+	NET_C(MOTOR2, R106MX.1)
+	NET_C(BOOM, R103MX.1, R107MX.1)
+	NET_C(SHOT, R104MX.1, R108MX.1)
+	NET_C(R102MX.2, R103MX.2, R104MX.2, C101.1)
+	NET_C(R106MX.2, R107MX.2, R108MX.2, C106.1)
+	ALIAS(OUT1, C101.2)
+	ALIAS(OUT2, C106.2)
+	NET_C(C101.2, GND)
+	NET_C(C106.2, GND)
+
+	// Unused Gates / Pins
+	NET_C(GND, IC_E8.1, IC_E8.2)
+	NET_C(GND, IC_E13.1)
+	NET_C(GND, IC_A7.5, IC_A7.9, IC_A7.11, IC_A7.13)
+	NET_C(GND, IC_J14.14)
+	NET_C(GND, IC_E12.3, IC_E12.4, IC_E12.5, IC_E12.6)
+	NET_C(GND, IC_D12.3, IC_D12.4, IC_D12.5, IC_D12.6)
+	NET_C(GND, IC_N7.11, IC_N7.12)
+	NET_C(GND, IC_B7.12, IC_B7.13)
+	NET_C(GND, IC_D7.5, IC_D7.6, IC_D7.8, IC_D7.9)
+	NET_C(GND, IC_L14.14)
+	NET_C(GND, IC_A14.1, IC_A14.2, IC_A14.13)
+	NET_C(GND, IC_B10.13)
+	NET_C(GND, IC_D11V.1, IC_D11V.3, IC_D11V.5, IC_D11V.11, IC_D11V.13)
+	NET_C(GND, IC_M13.3)
+	NET_C(GND, IC_L11.13, IC_L11.14)
+	NET_C(VCC, IC_L11.15)
+	NET_C(GND, IC_N4.1, IC_N4.3)
+	NET_C(GND, IC_A6.11, IC_A6.13)
+	NET_C(GND, IC_N6.11, IC_N6.12)
+	NET_C(GND, IC_J7.5, IC_J7.6)
+	NET_C(GND, IC_F13.1, IC_F13.2)
+	NET_C(VCC, IC_J11.9, IC_J11.11, IC_J11.13)
+	NET_C(VCC, IC_J3.9)
+	NET_C(VCC, IC_N13.1, IC_N13.13)
+NETLIST_END()
diff -Nru mame-0.222+dfsg.1/src/mame/machine/nl_tank.h mame-0.224+dfsg.1/src/mame/machine/nl_tank.h
--- mame-0.222+dfsg.1/src/mame/machine/nl_tank.h	1970-01-01 00:00:00.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/nl_tank.h	2020-08-26 08:57:19.000000000 +0000
@@ -0,0 +1,12 @@
+// license:BSD-3-Clause
+// copyright-holders:Ryan Holtz
+#ifndef MAME_MACHINE_NL_TANK_H
+#define MAME_MACHINE_NL_TANK_H
+
+#pragma once
+
+#include "netlist/nl_setup.h"
+
+NETLIST_EXTERNAL(tank)
+
+#endif // MAME_MACHINE_NL_TANK_H
diff -Nru mame-0.222+dfsg.1/src/mame/machine/ondra.cpp mame-0.224+dfsg.1/src/mame/machine/ondra.cpp
--- mame-0.222+dfsg.1/src/mame/machine/ondra.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/ondra.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,81 +12,118 @@
 #include "emu.h"
 #include "includes/ondra.h"
 
-#include "cpu/z80/z80.h"
 
-
-uint8_t ondra_state::ondra_keyboard_r(offs_t offset)
+u8 ondra_state::keyboard_r(offs_t offset)
 {
-	uint8_t retVal = 0x00;
+	u8 data = 0x60;
+	offset &= 15;
 
-	double const valcas = m_cassette->input();
-	if (valcas < 0.00)
-		retVal |= 0x80;
+	data |= (m_cassette->input() < 0.00) ? 0x80: 0;
 
-	if ((offset & 0x0f) < m_lines.size())
-		retVal |= m_lines[offset & 0x0f]->read();
+	if (offset < m_io_keyboard.size())
+		data |= (m_io_keyboard[offset]->read() & 0x1f);
 	else
-		retVal |= 0x1f;
+		data |= 0x1f;
 
-	return retVal;
+	return data;
 }
 
-void ondra_state::ondra_update_banks()
+void ondra_state::update_banks()
 {
 	address_space &space = m_maincpu->space(AS_PROGRAM);
-	uint8_t *mem = m_region_maincpu->base();
+	u8 *m = m_rom->base();
+	u8 *r = m_ram->pointer();
 
-	if (m_bank1_status==0) {
-		space.unmap_write(0x0000, 0x3fff);
-		m_bank1->set_base(mem + 0x010000);
-	} else {
-		space.install_write_bank(0x0000, 0x3fff, "bank1");
-		m_bank1->set_base(m_ram->pointer() + 0x0000);
+	if (BIT(m_bank_status, 0) != BIT(m_bank_old, 0))
+	{
+		if (BIT(m_bank_status, 0))
+		{
+			space.install_write_bank(0x0000, 0x3fff, "bank1");
+			m_bank1->set_base(r);
+		}
+		else
+		{
+			space.unmap_write(0x0000, 0x3fff);
+			m_bank1->set_base(m);
+		}
 	}
-	m_bank2->set_base(m_ram->pointer() + 0x4000);
-	if (m_bank2_status==0) {
-		space.install_readwrite_bank(0xe000, 0xffff, "bank3");
-		m_bank3->set_base(m_ram->pointer() + 0xe000);
-	} else {
-		space.unmap_write(0xe000, 0xffff);
-		space.install_read_handler (0xe000, 0xffff, read8sm_delegate(*this, FUNC(ondra_state::ondra_keyboard_r)));
+
+	if (BIT(m_bank_status, 1) != BIT(m_bank_old, 1))
+	{
+		if (BIT(m_bank_status, 1))
+		{
+			space.unmap_write(0xe000, 0xffff);
+			space.install_read_handler (0xe000, 0xffff, read8sm_delegate(*this, FUNC(ondra_state::keyboard_r)));
+		}
+		else
+		{
+			space.install_readwrite_bank(0xe000, 0xffff, "bank3");
+			m_bank3->set_base(r + 0xe000);
+		}
 	}
-}
 
-void ondra_state::ondra_port_03_w(uint8_t data)
-{
-	m_video_enable = data & 1;
-	m_bank1_status = (data >> 1) & 1;
-	m_bank2_status = (data >> 2) & 1;
-	ondra_update_banks();
-	m_cassette->output(((data >> 3) & 1) ? -1.0 : +1.0);
+	m_bank_old = m_bank_status;
 }
 
-void ondra_state::ondra_port_09_w(uint8_t data)
+/*
+0 - video on/off
+1 - banking
+2 - banking
+3 - cassette out
+4 - A0 on pits
+5 - A1 on pits */
+void ondra_state::port03_w(u8 data)
 {
+	if (BIT(data, 1, 2) != m_bank_status)
+	{
+		m_bank_status = BIT(data, 1, 2);
+		update_banks();
+	}
+
+	m_video_enable = BIT(data, 0);
+	m_cassette->output(BIT(data, 3) ? -1.0 : +1.0);
 }
 
-void ondra_state::ondra_port_0a_w(uint8_t data)
+
+// external connection
+u8 ondra_state::port09_r()
 {
+	return 0xff;
 }
 
-TIMER_CALLBACK_MEMBER(ondra_state::nmi_check_callback)
+/*
+0 - a LED next to keyboard
+1 - a LED next to keyboard
+2 - external
+3 - external
+4 - cassette relay
+5 - speaker
+6 - speaker
+7 - speaker */
+void ondra_state::port0a_w(u8 data)
 {
-	if ((m_nmi->read() & 1) == 1)
-	{
-		m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
-	}
+	static u16 tones[8] = { 0, 110, 156, 220, 311, 440, 622, 880 };  // a guess
+
+	m_cassette->change_state(BIT(data,4) ? CASSETTE_MOTOR_ENABLED : CASSETTE_MOTOR_DISABLED, CASSETTE_MASK_MOTOR);
+	u16 tone = tones[BIT(data, 5, 3)];
+	m_beep->set_state(tone? 1 : 0);
+	if (tone)
+		m_beep->set_clock(tone);
 }
 
 void ondra_state::machine_reset()
 {
-	m_bank1_status = 0;
-	m_bank2_status = 0;
-	ondra_update_banks();
+	m_beep->set_state(0);
+	m_video_enable = 0;
+	m_bank_status = 0;
+	m_bank_old = 0xff;
+	update_banks();
 }
 
 void ondra_state::machine_start()
 {
-	m_nmi_check_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(ondra_state::nmi_check_callback), this));
-	m_nmi_check_timer->adjust(attotime::from_hz(10), 0, attotime::from_hz(10));
+	save_item(NAME(m_video_enable));
+	save_item(NAME(m_bank_status));
+	save_item(NAME(m_bank_old));
+	membank("bank2")->set_base(m_ram->pointer() + 0x4000);
 }
diff -Nru mame-0.222+dfsg.1/src/mame/machine/orao.cpp mame-0.224+dfsg.1/src/mame/machine/orao.cpp
--- mame-0.222+dfsg.1/src/mame/machine/orao.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/orao.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/***************************************************************************
-
-        Orao machine driver by Miodrag Milanovic
-
-        23/02/2008 Sound support added.
-        22/02/2008 Preliminary driver.
-
-****************************************************************************/
-
-#include "emu.h"
-#include "imagedev/cassette.h"
-#include "includes/orao.h"
-
-
-/* Driver initialization */
-void orao_state::init_orao()
-{
-	memset(m_memory,0xff,0x6000);
-}
-
-void orao_state::init_orao103()
-{
-	memset(m_memory,0xff,0x6000);
-}
-
-void orao_state::machine_reset()
-{
-}
-
-uint8_t orao_state::orao_io_r(offs_t offset)
-{
-	double level;
-
-		switch(offset) {
-		/* Keyboard*/
-		case 0x07FC : return m_line[0]->read();
-		case 0x07FD : return m_line[1]->read();
-		case 0x07FA : return m_line[2]->read();
-		case 0x07FB : return m_line[3]->read();
-		case 0x07F6 : return m_line[4]->read();
-		case 0x07F7 : return m_line[5]->read();
-		case 0x07EE : return m_line[6]->read();
-		case 0x07EF : return m_line[7]->read();
-		case 0x07DE : return m_line[8]->read();
-		case 0x07DF : return m_line[9]->read();
-		case 0x07BE : return m_line[10]->read();
-		case 0x07BF : return m_line[11]->read();
-		case 0x077E : return m_line[12]->read();
-		case 0x077F : return m_line[13]->read();
-		case 0x06FE : return m_line[14]->read();
-		case 0x06FF : return m_line[15]->read();
-		case 0x05FE : return m_line[16]->read();
-		case 0x05FF : return m_line[17]->read();
-		case 0x03FE : return m_line[18]->read();
-		case 0x03FF : return m_line[19]->read();
-		/* Tape */
-		case 0x07FF :
-					level = m_cassette->input();
-					if (level <  0) {
-						return 0x00;
-					}
-					return 0xff;
-		}
-
-
-		return 0xff;
-}
-
-
-void orao_state::orao_io_w(offs_t offset, uint8_t data)
-{
-	if (offset == 0x0800)
-	{
-		m_speaker->level_w(m_beep);
-		m_cassette->output(m_beep ? 1.0 : -1.0);
-		m_beep ^= 1;
-	}
-}
diff -Nru mame-0.222+dfsg.1/src/mame/machine/orion.cpp mame-0.224+dfsg.1/src/mame/machine/orion.cpp
--- mame-0.222+dfsg.1/src/mame/machine/orion.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/orion.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -13,7 +13,6 @@
 #include "emu.h"
 #include "includes/orion.h"
 
-#include "imagedev/cassette.h"
 #include "screen.h"
 
 
@@ -42,29 +41,24 @@
 	m_romdisk_msb = data;
 }
 
-void orion_state::machine_start()
-{
-	m_video_mode_mask = 7;
-}
-
 uint8_t orion_state::orion128_system_r(offs_t offset)
 {
-	return m_ppi8255_2->read(offset & 3);
+	return m_ppi2->read(offset & 3);
 }
 
 void orion_state::orion128_system_w(offs_t offset, uint8_t data)
 {
-	m_ppi8255_2->write(offset & 3, data);
+	m_ppi2->write(offset & 3, data);
 }
 
 uint8_t orion_state::orion128_romdisk_r(offs_t offset)
 {
-	return m_ppi8255_1->read(offset & 3);
+	return m_ppi1->read(offset & 3);
 }
 
 void orion_state::orion128_romdisk_w(offs_t offset, uint8_t data)
 {
-	m_ppi8255_1->write(offset & 3, data);
+	m_ppi1->write(offset & 3, data);
 }
 
 void orion_state::orion_set_video_mode(int width)
@@ -75,9 +69,9 @@
 
 void orion_state::orion128_video_mode_w(uint8_t data)
 {
-	if ((data & 0x80)!=(m_orion128_video_mode & 0x80))
+	if (BIT(data, 7)!=BIT(m_orion128_video_mode, 7))
 	{
-		if ((data & 0x80)==0x80)
+		if (BIT(data, 7))
 		{
 			if (m_video_mode_mask == 31)
 			{
@@ -104,9 +98,9 @@
 {
 	if (m_orion128_video_page != data)
 	{
-		if ((data & 0x80)!=(m_orion128_video_page & 0x80))
+		if (BIT(data, 7)!=BIT(m_orion128_video_page, 7))
 		{
-			if ((data & 0x80)==0x80)
+			if (BIT(data, 7))
 			{
 				if (m_video_mode_mask == 31)
 				{
@@ -141,16 +135,40 @@
 
 void orion_state::machine_reset()
 {
+	m_video_mode_mask = 7;
 	m_orion128_video_page = 0;
 	m_orion128_video_mode = 0;
 	m_orion128_memory_page = -1;
-	m_bank1->set_base(m_region_maincpu->base() + 0xf800);
+	m_bank1->set_base(m_rom + 0xf800);
 	m_bank2->set_base(m_ram->pointer() + 0xf000);
 	m_orion128_video_width = SCREEN_WIDTH_384;
 	orion_set_video_mode(384);
 	radio86_init_keyboard();
 }
 
+void orion_state::machine_start()
+{
+	save_item(NAME(m_tape_value));
+	save_item(NAME(m_orion128_video_mode));
+	save_item(NAME(m_orion128_video_page));
+	save_item(NAME(m_orion128_video_width));
+	save_item(NAME(m_video_mode_mask));
+	save_item(NAME(m_orionpro_pseudo_color));
+	save_item(NAME(m_romdisk_lsb));
+	save_item(NAME(m_romdisk_msb));
+	save_item(NAME(m_orion128_memory_page));
+	save_item(NAME(m_orionz80_memory_page));
+	save_item(NAME(m_orionz80_dispatcher));
+	save_item(NAME(m_speaker_data));
+	save_item(NAME(m_orionpro_ram0_segment));
+	save_item(NAME(m_orionpro_ram1_segment));
+	save_item(NAME(m_orionpro_ram2_segment));
+	save_item(NAME(m_orionpro_page));
+	save_item(NAME(m_orionpro_128_page));
+	save_item(NAME(m_orionpro_rom2_segment));
+	save_item(NAME(m_orionpro_dispatcher));
+}
+
 void orion_state::orion_disk_control_w(uint8_t data)
 {
 	floppy_connector *names[] = { m_fd0, m_fd1, m_fd2, m_fd3};
@@ -197,43 +215,26 @@
 uint8_t orion_state::orionz80_floppy_rtc_r(offs_t offset)
 {
 	if ((offset >= 0x60) && (offset <= 0x6f))
-	{
 		return m_rtc->read(offset-0x60);
-	}
 	else
-	{
 		return orion128_floppy_r(offset);
-	}
 }
 
 void orion_state::orionz80_floppy_rtc_w(offs_t offset, uint8_t data)
 {
 	if ((offset >= 0x60) && (offset <= 0x6f))
-	{
 		m_rtc->write(offset-0x60,data);
-	}
 	else
-	{
 		orion128_floppy_w(offset,data);
-	}
-}
-
-
-void orion_z80_state::machine_start()
-{
-	m_video_mode_mask = 7;
 }
 
 void orion_state::orionz80_sound_w(uint8_t data)
 {
 	if (m_speaker_data == 0)
-	{
 		m_speaker_data = data;
-	}
 	else
-	{
 		m_speaker_data = 0;
-	}
+
 	m_speaker->level_w(m_speaker_data);
 
 }
@@ -243,7 +244,6 @@
 	m_speaker->level_w(BIT(data, 4));
 }
 
-
 void orion_state::orionz80_switch_bank()
 {
 	uint8_t bank_select;
@@ -282,7 +282,7 @@
 		space.install_write_handler(0xff00, 0xffff, write8smo_delegate(*this, FUNC(orion_state::orionz80_sound_w)));
 
 		m_bank3->set_base(m_ram->pointer() + 0xf000);
-		m_bank5->set_base(m_region_maincpu->base() + 0xf800);
+		m_bank5->set_base(m_rom + 0xf800);
 
 	}
 	else
@@ -329,12 +329,12 @@
 	space.install_write_handler(0xff00, 0xffff, write8smo_delegate(*this, FUNC(orion_z80_state::orionz80_sound_w)));
 
 
-	m_bank1->set_base(m_region_maincpu->base() + 0xf800);
+	m_bank1->set_base(m_rom + 0xf800);
 	m_bank2->set_base(m_ram->pointer() + 0x4000);
 	m_bank3->set_base(m_ram->pointer() + 0xf000);
-	m_bank5->set_base(m_region_maincpu->base() + 0xf800);
-
+	m_bank5->set_base(m_rom + 0xf800);
 
+	m_video_mode_mask = 7;
 	m_orion128_video_page = 0;
 	m_orion128_video_mode = 0;
 	m_orionz80_memory_page = 0;
@@ -348,17 +348,14 @@
 INTERRUPT_GEN_MEMBER(orion_state::orionz80_interrupt)
 {
 	if ((m_orionz80_dispatcher & 0x40)==0x40)
-	{
 		device.execute().set_input_line(0, HOLD_LINE);
-	}
 }
 
 uint8_t orion_state::orionz80_io_r(offs_t offset)
 {
 	if (offset == 0xFFFD)
-	{
 		return m_ay8912->data_r();
-	}
+
 	return 0xff;
 }
 
@@ -383,12 +380,6 @@
 	}
 }
 
-
-
-
-
-
-
 void orion_state::orionpro_bank_switch()
 {
 	address_space &space = m_maincpu->space(AS_PROGRAM);
@@ -397,9 +388,8 @@
 	uint8_t *ram = m_ram->pointer();
 
 	if (is128==1)
-	{
 		page = m_orionpro_128_page & 7;
-	}
+
 	space.install_write_bank(0x0000, 0x1fff, "bank1");
 	space.install_write_bank(0x2000, 0x3fff, "bank2");
 	space.install_write_bank(0x4000, 0x7fff, "bank3");
@@ -423,12 +413,12 @@
 	if ((m_orionpro_dispatcher & 0x10)==0x10)
 	{   // ROM1 enabled
 		space.unmap_write(0x0000, 0x1fff);
-		m_bank1->set_base(m_region_maincpu->base() + 0x20000);
+		m_bank1->set_base(m_rom + 0x20000);
 	}
 	if ((m_orionpro_dispatcher & 0x08)==0x08)
 	{   // ROM2 enabled
 		space.unmap_write(0x2000, 0x3fff);
-		m_bank2->set_base(m_region_maincpu->base() + 0x22000 + (m_orionpro_rom2_segment & 7) * 0x2000);
+		m_bank2->set_base(m_rom + 0x22000 + (m_orionpro_rom2_segment & 7) * 0x2000);
 	}
 
 	if ((m_orionpro_dispatcher & 0x02)==0x00)
diff -Nru mame-0.222+dfsg.1/src/mame/machine/partner.cpp mame-0.224+dfsg.1/src/mame/machine/partner.cpp
--- mame-0.222+dfsg.1/src/mame/machine/partner.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/partner.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -11,7 +11,6 @@
 
 #include "emu.h"
 #include "cpu/i8085/i8085.h"
-#include "imagedev/cassette.h"
 #include "includes/radio86.h"
 #include "includes/partner.h"
 
@@ -21,97 +20,104 @@
 	m_tape_value = 0x80;
 }
 
-void partner_state::partner_window_1(uint8_t bank_num, uint16_t offset,uint8_t *rom)
+void partner_state::window_1(u8 bank_num, u16 offset, u8 *rom)
 {
-	switch(m_win_mem_page) {
+	switch(m_win_mem_page)
+	{
 		case 2 : // FDD BIOS
-				m_bank[bank_num]->set_base(rom + 0x16000 + offset);
+				m_bank[bank_num]->set_base(rom + 0x6000 + offset);
 				break;
 		case 4 : // MCPG BIOS
-				m_bank[bank_num]->set_base(rom + 0x14000 + offset);
+				m_bank[bank_num]->set_base(rom + 0x4000 + offset);
 				break;
 		default : // BIOS
-				m_bank[bank_num]->set_base(rom + 0x10000 + offset);
+				m_bank[bank_num]->set_base(rom + offset);
 				break;
 	}
 }
 
-void partner_state::partner_window_2(uint8_t bank_num, uint16_t offset,uint8_t *rom)
+void partner_state::window_2(u8 bank_num, u16 offset, u8 *rom)
 {
-	switch(m_win_mem_page) {
+	switch(m_win_mem_page)
+	{
 		case 4 : // MCPG FONT
-				m_bank[bank_num]->set_base(rom + 0x18000 + offset);
+				m_bank[bank_num]->set_base(rom + 0x8000 + offset);
 				break;
 		default : // BIOS
-				m_bank[bank_num]->set_base(rom + 0x10000 + offset);
+				m_bank[bank_num]->set_base(rom + offset);
 				break;
 	}
 }
 
-uint8_t partner_state::partner_floppy_r(offs_t offset)
+u8 partner_state::floppy_r(offs_t offset)
 {
-	if (offset<0x100) {
-		switch(offset & 3) {
+	if (offset<0x100)
+		switch(offset & 3)
+		{
 			case 0x00 : return m_fdc->status_r();
 			case 0x01 : return m_fdc->track_r();
 			case 0x02 : return m_fdc->sector_r();
 			default   :
 						return m_fdc->data_r();
 		}
-	} else {
+	else
 		return 0;
-	}
 }
 
-void partner_state::partner_floppy_w(offs_t offset, uint8_t data)
+void partner_state::floppy_w(offs_t offset, u8 data)
 {
-	if (offset<0x100) {
-		switch(offset & 3) {
+	if (offset<0x100)
+		switch(offset & 3)
+		{
 			case 0x00 : m_fdc->cmd_w(data); break;
 			case 0x01 : m_fdc->track_w(data);break;
 			case 0x02 : m_fdc->sector_w(data);break;
 			default   : m_fdc->data_w(data);break;
 		}
-	} else {
+	else
+	{
 		floppy_image_device *floppy0 = m_fdc->subdevice<floppy_connector>("0")->get_device();
 		floppy_image_device *floppy1 = m_fdc->subdevice<floppy_connector>("1")->get_device();
 
-		if (((data >> 6) & 1)==1) {
+		if (BIT(data, 6))
+		{
 			m_fdc->set_floppy(floppy0);
 			floppy0->mon_w(0);
-			floppy0->ss_w(data >> 7);
+			floppy0->ss_w(BIT(data, 7));
 		}
 		else
 			floppy0->mon_w(1);
 
-		if (((data >> 3) & 1)==1) {
+		if (BIT(data, 3))
+		{
 			m_fdc->set_floppy(floppy1);
 			floppy1->mon_w(0);
-			floppy1->ss_w(data >> 7);
+			floppy1->ss_w(BIT(data, 7));
 		}
 		else
 			floppy1->mon_w(1);
 	}
 }
 
-void partner_state::partner_iomap_bank(uint8_t *rom)
+void partner_state::iomap_bank(u8 *rom)
 {
 	address_space &space = m_maincpu->space(AS_PROGRAM);
-	switch(m_win_mem_page) {
+	switch(m_win_mem_page)
+	{
 		case 2 :
 				// FDD
-				space.install_write_handler(0xdc00, 0xddff, write8sm_delegate(*this, FUNC(partner_state::partner_floppy_w)));
-				space.install_read_handler (0xdc00, 0xddff, read8sm_delegate(*this, FUNC(partner_state::partner_floppy_r)));
+				space.install_write_handler(0xdc00, 0xddff, write8sm_delegate(*this, FUNC(partner_state::floppy_w)));
+				space.install_read_handler (0xdc00, 0xddff, read8sm_delegate(*this, FUNC(partner_state::floppy_r)));
 				break;
 		case 4 :
 				// Timer
 				break;
 		default : // BIOS
-				m_bank[10]->set_base(rom + 0x10000);
+				m_bank[10]->set_base(rom);
 				break;
 	}
 }
-void partner_state::partner_bank_switch()
+void partner_state::bank_switch()
 {
 	address_space &space = m_maincpu->space(AS_PROGRAM);
 	uint8_t *rom = memregion("maincpu")->base();
@@ -133,60 +139,63 @@
 	space.unmap_write(0xe800, 0xffff);
 
 	// BANK 1 (0x0000 - 0x07ff)
-	if (m_mem_page==0) {
+	if (m_mem_page==0)
+	{
 		space.unmap_write(0x0000, 0x07ff);
-		m_bank[0]->set_base(rom + 0x10000);
-	} else {
-		if (m_mem_page==7) {
+		m_bank[0]->set_base(rom);
+	}
+	else
+	{
+		if (m_mem_page==7)
 			m_bank[0]->set_base(ram + 0x8000);
-		} else {
-			m_bank[0]->set_base(ram + 0x0000);
-		}
+		else
+			m_bank[0]->set_base(ram);
 	}
 
 	// BANK 2 (0x0800 - 0x3fff)
-	if (m_mem_page==7) {
+	if (m_mem_page==7)
 		m_bank[1]->set_base(ram + 0x8800);
-	} else {
+	else
 		m_bank[1]->set_base(ram + 0x0800);
-	}
 
 	// BANK 3 (0x4000 - 0x5fff)
-	if (m_mem_page==7) {
+	if (m_mem_page==7)
 		m_bank[2]->set_base(ram + 0xC000);
-	} else {
-		if (m_mem_page==10) {
+	else
+	{
+		if (m_mem_page==10)
+		{
 			//window 1
 			space.unmap_write(0x4000, 0x5fff);
-			partner_window_1(2, 0, rom);
-		} else {
-			m_bank[2]->set_base(ram + 0x4000);
+			window_1(2, 0, rom);
 		}
+		else
+			m_bank[2]->set_base(ram + 0x4000);
 	}
 
 	// BANK 4 (0x6000 - 0x7fff)
-	if (m_mem_page==7) {
+	if (m_mem_page==7)
 		m_bank[3]->set_base(ram + 0xe000);
-	} else {
+	else
 		m_bank[3]->set_base(ram + 0x6000);
-	}
 
 	// BANK 5 (0x8000 - 0x9fff)
-	switch (m_mem_page) {
+	switch (m_mem_page)
+	{
 		case 5:
 		case 10:
 				//window 2
 				space.unmap_write(0x8000, 0x9fff);
-				partner_window_2(4, 0, rom);
+				window_2(4, 0, rom);
 				break;
 		case 8:
 		case 9:
 				//window 1
 				space.unmap_write(0x8000, 0x9fff);
-				partner_window_1(4, 0, rom);
+				window_1(4, 0, rom);
 				break;
 		case 7:
-				m_bank[4]->set_base(ram + 0x0000);
+				m_bank[4]->set_base(ram);
 				break;
 		default:
 				m_bank[4]->set_base(ram + 0x8000);
@@ -194,18 +203,19 @@
 	}
 
 	// BANK 6 (0xa000 - 0xb7ff)
-	switch (m_mem_page) {
+	switch (m_mem_page)
+	{
 		case 5:
 		case 10:
 				//window 2
 				space.unmap_write(0xa000, 0xb7ff);
-				partner_window_2(5, 0, rom);
+				window_2(5, 0, rom);
 				break;
 		case 6:
 		case 8:
 				//BASIC
 				space.unmap_write(0xa000, 0xb7ff);
-				m_bank[5]->set_base(rom + 0x12000); // BASIC
+				m_bank[5]->set_base(rom + 0x2000); // BASIC
 				break;
 		case 7:
 				m_bank[5]->set_base(ram + 0x2000);
@@ -216,19 +226,20 @@
 	}
 
 	// BANK 7 (0xb800 - 0xbfff)
-	switch (m_mem_page) {
+	switch (m_mem_page)
+	{
 		case 4:
 		case 5:
 		case 10:
 				//window 2
 				space.unmap_write(0xb800, 0xbfff);
-				partner_window_2(6, 0x1800, rom);
+				window_2(6, 0x1800, rom);
 				break;
 		case 6:
 		case 8:
 				//BASIC
 				space.unmap_write(0xb800, 0xbfff);
-				m_bank[6]->set_base(rom + 0x13800); // BASIC
+				m_bank[6]->set_base(rom + 0x3800); // BASIC
 				break;
 		case 7:
 				m_bank[6]->set_base(ram + 0x3800);
@@ -239,14 +250,15 @@
 	}
 
 	// BANK 8 (0xc000 - 0xc7ff)
-	switch (m_mem_page) {
+	switch (m_mem_page)
+	{
 		case 7:
 				m_bank[7]->set_base(ram + 0x4000);
 				break;
 		case 8:
 		case 10:
 				space.unmap_write(0xc000, 0xc7ff);
-				m_bank[7]->set_base(rom + 0x10000);
+				m_bank[7]->set_base(rom);
 				break;
 		default:
 				m_bank[7]->set_base(ram + 0xc000);
@@ -254,7 +266,8 @@
 	}
 
 	// BANK 9 (0xc800 - 0xcfff)
-	switch (m_mem_page) {
+	switch (m_mem_page)
+	{
 		case 7:
 				m_bank[8]->set_base(ram + 0x4800);
 				break;
@@ -262,11 +275,11 @@
 		case 9:
 				// window 2
 				space.unmap_write(0xc800, 0xcfff);
-				partner_window_2(8, 0, rom);
+				window_2(8, 0, rom);
 				break;
 		case 10:
 				space.unmap_write(0xc800, 0xcfff);
-				m_bank[8]->set_base(rom + 0x10800);
+				m_bank[8]->set_base(rom + 0x0800);
 				break;
 		default:
 				m_bank[8]->set_base(ram + 0xc800);
@@ -274,7 +287,8 @@
 	}
 
 	// BANK 10 (0xd000 - 0xd7ff)
-	switch (m_mem_page) {
+	switch (m_mem_page)
+	{
 		case 7:
 				m_bank[9]->set_base(ram + 0x5000);
 				break;
@@ -282,7 +296,7 @@
 		case 9:
 				// window 2
 				space.unmap_write(0xd000, 0xd7ff);
-				partner_window_2(9, 0x0800, rom);
+				window_2(9, 0x0800, rom);
 				break;
 		default:
 				m_bank[9]->set_base(ram + 0xd000);
@@ -290,66 +304,72 @@
 	}
 
 	// BANK 11 (0xdc00 - 0xddff)
-	partner_iomap_bank(rom);
+	iomap_bank(rom);
 
 	// BANK 12 (0xe000 - 0xe7ff)
-	if (m_mem_page==1) {
-		m_bank[11]->set_base(rom + 0x10000);
-	} else {
+	if (m_mem_page==1)
+		m_bank[11]->set_base(rom);
+	else
 		//window 1
-		partner_window_1(12, 0, rom);
-	}
+		window_1(12, 0, rom);
 
 	// BANK 13 (0xe800 - 0xffff)
-	switch (m_mem_page) {
+	switch (m_mem_page)
+	{
 		case 3:
 		case 4:
 		case 5:
 				// window 1
-				partner_window_1(12, 0x800, rom);
+				window_1(12, 0x800, rom);
 				break;
 		default:
 				// BIOS
-				m_bank[12]->set_base(rom + 0x10800);
+				m_bank[12]->set_base(rom + 0x0800);
 				break;
 	}
 }
 
-void partner_state::partner_win_memory_page_w(uint8_t data)
+void partner_state::win_memory_page_w(u8 data)
 {
 	m_win_mem_page = ~data;
-	partner_bank_switch();
+	bank_switch();
 }
 
-void partner_state::partner_mem_page_w(uint8_t data)
+void partner_state::mem_page_w(u8 data)
 {
 	m_mem_page = (data >> 4) & 0x0f;
-	partner_bank_switch();
+	bank_switch();
 }
 
 I8275_DRAW_CHARACTER_MEMBER(partner_state::display_pixels)
 {
 	int i;
 	const rgb_t *palette = m_palette->palette()->entry_list_raw();
-	const uint8_t *charmap = m_charmap + 0x400 * (gpa * 2 + hlgt);
-	uint8_t pixels = charmap[(linecount & 7) + (charcode << 3)] ^ 0xff;
-	if (vsp) {
+	const u8 *charmap = m_chargen + 0x400 * (gpa * 2 + hlgt);
+	u8 pixels = charmap[(linecount & 7) + (charcode << 3)] ^ 0xff;
+	if (vsp)
 		pixels = 0;
-	}
-	if (lten) {
+
+	if (lten)
 		pixels = 0xff;
-	}
-	if (rvv) {
+
+	if (rvv)
 		pixels ^= 0xff;
-	}
-	for(i=0;i<6;i++) {
+
+	for(i=0;i<6;i++)
 		bitmap.pix32(y, x + i) = palette[(pixels >> (5-i)) & 1];
-	}
 }
 
 void partner_state::machine_reset()
 {
 	m_mem_page = 0;
 	m_win_mem_page = 0;
-	partner_bank_switch();
+	bank_switch();
+}
+
+void partner_state::machine_start()
+{
+	save_item(NAME(m_tape_value));
+	save_item(NAME(m_mem_page));
+	save_item(NAME(m_win_mem_page));
 }
diff -Nru mame-0.222+dfsg.1/src/mame/machine/pecom.cpp mame-0.224+dfsg.1/src/mame/machine/pecom.cpp
--- mame-0.222+dfsg.1/src/mame/machine/pecom.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/pecom.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -17,79 +17,65 @@
 	m_reset = 1;
 }
 
-void pecom_state::machine_start()
-{
-	m_reset_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pecom_state::reset_tick),this));
-}
-
 void pecom_state::machine_reset()
 {
-	uint8_t *rom = memregion(CDP1802_TAG)->base();
-	address_space &space = m_cdp1802->space(AS_PROGRAM);
-
+	address_space &space = m_maincpu->space(AS_PROGRAM);
+	m_bank1->set_entry(1);
 
-	space.unmap_write(0x0000, 0x3fff);
-	space.install_write_bank(0x4000, 0x7fff, "bank2");
-	space.unmap_write(0xf000, 0xf7ff);
-	space.unmap_write(0xf800, 0xffff);
+	space.unmap_write(0xf000, 0xffff);
 	space.install_read_bank (0xf000, 0xf7ff, "bank3");
 	space.install_read_bank (0xf800, 0xffff, "bank4");
-	m_bank1->set_base(rom + 0x8000);
-	m_bank2->set_base(m_ram->pointer() + 0x4000);
-	m_bank3->set_base(rom + 0xf000);
-	m_bank4->set_base(rom + 0xf800);
+	m_bank3->set_base(m_rom + 0x7000);
+	m_bank4->set_base(m_rom + 0x7800);
 
 	m_reset = 0;
 	m_dma = 0;
 	m_reset_timer->adjust(attotime::from_msec(5));
 }
 
-uint8_t pecom_state::pecom_cdp1869_charram_r(offs_t offset)
+uint8_t pecom_state::cdp1869_charram_r(offs_t offset)
 {
 	return m_cdp1869->char_ram_r(offset);
 }
 
-void pecom_state::pecom_cdp1869_charram_w(offs_t offset, uint8_t data)
+void pecom_state::cdp1869_charram_w(offs_t offset, uint8_t data)
 {
 	return m_cdp1869->char_ram_w(offset, data);
 }
 
-uint8_t pecom_state::pecom_cdp1869_pageram_r(offs_t offset)
+uint8_t pecom_state::cdp1869_pageram_r(offs_t offset)
 {
 	return m_cdp1869->page_ram_r(offset);
 }
 
-void pecom_state::pecom_cdp1869_pageram_w(offs_t offset, uint8_t data)
+void pecom_state::cdp1869_pageram_w(offs_t offset, uint8_t data)
 {
 	return m_cdp1869->page_ram_w(offset, data);
 }
 
-void pecom_state::pecom_bank_w(uint8_t data)
+void pecom_state::bank_w(uint8_t data)
 {
-	address_space &space2 = m_cdp1802->space(AS_PROGRAM);
-	uint8_t *rom = memregion(CDP1802_TAG)->base();
-	m_cdp1802->space(AS_PROGRAM).install_write_bank(0x0000, 0x3fff, "bank1");
-	m_bank1->set_base(m_ram->pointer() + 0x0000);
+	address_space &space = m_maincpu->space(AS_PROGRAM);
+	m_bank1->set_entry(0);
 
 	if (data==2)
 	{
-		space2.install_read_handler (0xf000, 0xf7ff, read8sm_delegate(*this, FUNC(pecom_state::pecom_cdp1869_charram_r)));
-		space2.install_write_handler(0xf000, 0xf7ff, write8sm_delegate(*this, FUNC(pecom_state::pecom_cdp1869_charram_w)));
-		space2.install_read_handler (0xf800, 0xffff, read8sm_delegate(*this, FUNC(pecom_state::pecom_cdp1869_pageram_r)));
-		space2.install_write_handler(0xf800, 0xffff, write8sm_delegate(*this, FUNC(pecom_state::pecom_cdp1869_pageram_w)));
+		space.install_read_handler (0xf000, 0xf7ff, read8sm_delegate(*this, FUNC(pecom_state::cdp1869_charram_r)));
+		space.install_write_handler(0xf000, 0xf7ff, write8sm_delegate(*this, FUNC(pecom_state::cdp1869_charram_w)));
+		space.install_read_handler (0xf800, 0xffff, read8sm_delegate(*this, FUNC(pecom_state::cdp1869_pageram_r)));
+		space.install_write_handler(0xf800, 0xffff, write8sm_delegate(*this, FUNC(pecom_state::cdp1869_pageram_w)));
 	}
 	else
 	{
-		space2.unmap_write(0xf000, 0xf7ff);
-		space2.unmap_write(0xf800, 0xffff);
-		space2.install_read_bank (0xf000, 0xf7ff, "bank3");
-		space2.install_read_bank (0xf800, 0xffff, "bank4");
-		m_bank3->set_base(rom + 0xf000);
-		m_bank4->set_base(rom + 0xf800);
+		space.unmap_write(0xf000, 0xffff);
+		space.install_read_bank (0xf000, 0xf7ff, "bank3");
+		space.install_read_bank (0xf800, 0xffff, "bank4");
+		m_bank3->set_base(m_rom + 0x7000);
+		m_bank4->set_base(m_rom + 0x7800);
 	}
 }
 
-uint8_t pecom_state::pecom_keyboard_r()
+uint8_t pecom_state::keyboard_r()
 {
 	/*
 	   INP command BUS -> M(R(X)) BUS -> D
@@ -97,10 +83,10 @@
 	   Address is available on address bus during reading of value from port, and that is
 	   used to determine keyboard line reading
 	*/
-	uint16_t addr = m_cdp1802->state_int(cosmac_device::COSMAC_R0 + m_cdp1802->state_int(cosmac_device::COSMAC_X));
+	uint16_t addr = m_maincpu->state_int(cosmac_device::COSMAC_R0 + m_maincpu->state_int(cosmac_device::COSMAC_X));
 	/* just in case someone is reading non existing ports */
 	if (addr<0x7cca || addr>0x7ce3) return 0;
-	return m_io_ports[addr - 0x7cca]->read() & 0x03;
+	return m_io_keyboard[addr - 0x7cca]->read();
 }
 
 /* CDP1802 Interface */
@@ -112,10 +98,29 @@
 
 READ_LINE_MEMBER(pecom_state::ef2_r)
 {
-	int shift = BIT(m_io_cnt->read(), 1);
+	bool shift = BIT(m_io_cnt->read(), 1);
 	double cas = m_cassette->input();
 
-	return (cas > 0.0) | shift;
+	return (cas < -0.02) | shift; // touching shift kills cassette load
+}
+
+WRITE_LINE_MEMBER(pecom_state::q_w)
+{
+	m_cassette->output(state ? -1.0 : +1.0);
+}
+
+void pecom_state::sc_w(uint8_t data)
+{
+	switch (data)
+	{
+		case COSMAC_STATE_CODE_S2_DMA:
+			// DMA acknowledge clears the DMAOUT request
+			m_maincpu->set_input_line(COSMAC_INPUT_LINE_DMAOUT, CLEAR_LINE);
+			break;
+
+		default:
+			break;
+	}
 }
 
 /*
@@ -140,28 +145,4 @@
     return flags;
 }
 */
-WRITE_LINE_MEMBER(pecom_state::q_w)
-{
-	m_cassette->output(state ? -1.0 : +1.0);
-}
 
-void pecom_state::sc_w(uint8_t data)
-{
-	switch (data)
-	{
-	case COSMAC_STATE_CODE_S0_FETCH:
-		// not connected
-		break;
-
-	case COSMAC_STATE_CODE_S1_EXECUTE:
-		break;
-
-	case COSMAC_STATE_CODE_S2_DMA:
-		// DMA acknowledge clears the DMAOUT request
-		m_cdp1802->set_input_line(COSMAC_INPUT_LINE_DMAOUT, CLEAR_LINE);
-		break;
-
-	case COSMAC_STATE_CODE_S3_INTERRUPT:
-		break;
-	}
-}
diff -Nru mame-0.222+dfsg.1/src/mame/machine/pgmcrypt.cpp mame-0.224+dfsg.1/src/mame/machine/pgmcrypt.cpp
--- mame-0.222+dfsg.1/src/mame/machine/pgmcrypt.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/pgmcrypt.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1663,3 +1663,27 @@
 		src[i] = x;
 	}
 }
+
+void pgm_dwpc_decrypt(running_machine &machine)
+{
+	uint16_t *src = (uint16_t *)(machine.root_device().memregion("user1")->base());
+
+	int rom_size = 0x80000;
+
+	for(int i=0; i<rom_size/2; i++) {
+		uint16_t x = src[i];
+
+		IGS27_CRYPT1_ALT
+		IGS27_CRYPT2
+		IGS27_CRYPT3
+		IGS27_CRYPT4_ALT
+		IGS27_CRYPT5_ALT
+		IGS27_CRYPT6
+		IGS27_CRYPT7_ALT
+		IGS27_CRYPT8
+
+		x ^= mm_tab[(i>> 1) & 0xff] << 8;
+
+		src[i] = x;
+	}
+}
diff -Nru mame-0.222+dfsg.1/src/mame/machine/pgmcrypt.h mame-0.224+dfsg.1/src/mame/machine/pgmcrypt.h
--- mame-0.222+dfsg.1/src/mame/machine/pgmcrypt.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/pgmcrypt.h	2020-08-26 08:57:19.000000000 +0000
@@ -22,6 +22,7 @@
 void pgm_ket_decrypt(running_machine &machine);
 void pgm_espgal_decrypt(running_machine &machine);
 void pgm_happy6_decrypt(running_machine &machine);
+void pgm_dwpc_decrypt(running_machine &machine);
 void sdwx_decrypt(running_machine &machine);
 void hauntedh_decrypt(running_machine &machine);
 void chessc2_decrypt(running_machine &machine);
diff -Nru mame-0.222+dfsg.1/src/mame/machine/pgmprot_igs025_igs012.cpp mame-0.224+dfsg.1/src/mame/machine/pgmprot_igs025_igs012.cpp
--- mame-0.222+dfsg.1/src/mame/machine/pgmprot_igs025_igs012.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/pgmprot_igs025_igs012.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -179,6 +179,21 @@
 	mem16[0x1304f2 / 2] = 0x4e93;
 }
 
+void pgm_012_025_state::init_drgw2c101()
+{
+	u16 *mem16 = (u16 *)memregion("maincpu")->base();
+
+	drgw2_common_init();
+
+	const int region = 0x05;
+	m_igs025->m_kb_region = region;
+	m_igs025->m_kb_game_id = region | (region << 8) | (region << 16) | (region << 24);
+
+	mem16[0x1306e4 / 2] = 0x4e93;
+	mem16[0x13078a / 2] = 0x4e93;
+	mem16[0x13081a / 2] = 0x4e93;
+}
+
 void pgm_012_025_state::init_drgw2j()
 {
 	u16 *mem16 = (u16 *)memregion("maincpu")->base();
diff -Nru mame-0.222+dfsg.1/src/mame/machine/pgmprot_igs025_igs012.h mame-0.224+dfsg.1/src/mame/machine/pgmprot_igs025_igs012.h
--- mame-0.222+dfsg.1/src/mame/machine/pgmprot_igs025_igs012.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/pgmprot_igs025_igs012.h	2020-08-26 08:57:19.000000000 +0000
@@ -15,6 +15,7 @@
 	void init_drgw2();
 	void init_dw2v100x();
 	void init_drgw2c();
+	void init_drgw2c101();
 	void init_drgw2j();
 	void init_drgw2hk();
 
diff -Nru mame-0.222+dfsg.1/src/mame/machine/pgmprot_igs027a_type1.cpp mame-0.224+dfsg.1/src/mame/machine/pgmprot_igs027a_type1.cpp
--- mame-0.222+dfsg.1/src/mame/machine/pgmprot_igs027a_type1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/pgmprot_igs027a_type1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -226,8 +226,6 @@
 	/* protection CPU */
 	ARM7(config, m_prot, 20000000);   // 55857E?
 	m_prot->set_addrmap(AS_PROGRAM, &pgm_arm_type1_state::_55857E_arm7_map);
-
-//  subdevice<screen_device>("screen")->set_refresh_hz(59.17); // Correct?
 }
 
 void pgm_arm_type1_state::pgm_arm_type1_sim(machine_config &config) // When simulated
@@ -245,8 +243,6 @@
 //  pgm_arm_type1(config); // When ARM7 ROM is dumped and hooked up
 
 	m_maincpu->set_addrmap(AS_PROGRAM, &pgm_arm_type1_state::cavepgm_mem);
-
-	subdevice<screen_device>("screen")->set_refresh_hz(59.17); // verified on pcb
 }
 
 void pgm_arm_type1_state::arm7_type1_latch_init()
@@ -1020,39 +1016,104 @@
 	}
 }
 
+static u32 py2k2_sprite_offset(u16 base, u16 pos)
+{
+	u16 ret = 0;
+	u16 offset = (base * 16) + (pos & 0xf);
+
+	switch (base & ~0x3f)
+	{
+		case 0x000: ret = bitswap<16>(offset ^ 0x0030, 15, 14, 13, 12, 11, 10, 0, 2, 3, 9, 5, 4, 8, 7, 6, 1); break;
+		case 0x040: ret = bitswap<16>(offset ^ 0x03c0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 1, 2, 0, 5, 3, 4); break;
+		case 0x080: ret = bitswap<16>(offset ^ 0x0000, 15, 14, 13, 12, 11, 10, 0, 3, 4, 6, 8, 7, 5, 9, 2, 1); break;
+		case 0x0c0: ret = bitswap<16>(offset ^ 0x0001, 15, 14, 13, 12, 11, 10, 6, 5, 4, 3, 2, 1, 9, 8, 7, 0); break;
+		case 0x100: ret = bitswap<16>(offset ^ 0x0030, 15, 14, 13, 12, 11, 10, 0, 2, 3, 9, 5, 4, 8, 7, 6, 1); break;
+		case 0x140: ret = bitswap<16>(offset ^ 0x01c0, 15, 14, 13, 12, 11, 10, 2, 8, 7, 6, 4, 3, 5, 9, 0, 1); break;
+		case 0x180: ret = bitswap<16>(offset ^ 0x0141, 15, 14, 13, 12, 11, 10, 4, 8, 2, 6, 1, 7, 9, 5, 3, 0); break;
+		case 0x1c0: ret = bitswap<16>(offset ^ 0x0090, 15, 14, 13, 12, 11, 10, 5, 3, 7, 2, 1, 4, 0, 9, 8, 6); break;
+		case 0x200: ret = bitswap<16>(offset ^ 0x02a1, 15, 14, 13, 12, 11, 10, 9, 1, 7, 8, 5, 6, 2, 4, 3, 0); break;
+		case 0x240: ret = bitswap<16>(offset ^ 0x0000, 15, 14, 13, 12, 11, 10, 3, 2, 1, 0, 9, 8, 7, 6, 5, 4); break;
+		case 0x280: ret = bitswap<16>(offset ^ 0x02a1, 15, 14, 13, 12, 11, 10, 9, 1, 7, 8, 5, 6, 2, 4, 3, 0); break;
+		case 0x2c0: ret = bitswap<16>(offset ^ 0x0000, 15, 14, 13, 12, 11, 10, 0, 3, 4, 6, 8, 7, 5, 9, 2, 1); break;
+		case 0x300: ret = bitswap<16>(offset ^ 0x03c0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 1, 2, 0, 5, 3, 4); break;
+		case 0x340: ret = bitswap<16>(offset ^ 0x0030, 15, 14, 13, 12, 11, 10, 0, 2, 3, 9, 5, 4, 8, 7, 6, 1); break;
+		case 0x380: ret = bitswap<16>(offset ^ 0x0001, 15, 14, 13, 12, 11, 10, 6, 5, 4, 3, 2, 1, 9, 8, 7, 0); break;
+		case 0x3c0: ret = bitswap<16>(offset ^ 0x0090, 15, 14, 13, 12, 11, 10, 5, 3, 7, 2, 1, 4, 0, 9, 8, 6); break;
+		case 0x400: ret = bitswap<16>(offset ^ 0x02a1, 15, 14, 13, 12, 11, 10, 9, 1, 7, 8, 5, 6, 2, 4, 3, 0); break;
+		case 0x440: ret = bitswap<16>(offset ^ 0x03c0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 1, 2, 0, 5, 3, 4); break;
+		case 0x480: ret = bitswap<16>(offset ^ 0x0141, 15, 14, 13, 12, 11, 10, 4, 8, 2, 6, 1, 7, 9, 5, 3, 0); break;
+		case 0x4c0: ret = bitswap<16>(offset ^ 0x01c0, 15, 14, 13, 12, 11, 10, 2, 8, 7, 6, 4, 3, 5, 9, 0, 1); break;
+		case 0x500: ret = bitswap<16>(offset ^ 0x0141, 15, 14, 13, 12, 11, 10, 4, 8, 2, 6, 1, 7, 9, 5, 3, 0); break;
+		case 0x540: ret = bitswap<16>(offset ^ 0x0030, 15, 14, 13, 12, 11, 10, 0, 2, 3, 9, 5, 4, 8, 7, 6, 1); break;
+		case 0x580: ret = bitswap<16>(offset ^ 0x03c0, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 1, 2, 0, 5, 3, 4); break;
+		case 0x5c0: ret = bitswap<16>(offset ^ 0x0090, 15, 14, 13, 12, 11, 10, 5, 3, 7, 2, 1, 4, 0, 9, 8, 6); break;
+		case 0x600: ret = bitswap<16>(offset ^ 0x0000, 15, 14, 13, 12, 11, 10, 0, 3, 4, 6, 8, 7, 5, 9, 2, 1); break;
+		case 0x640: ret = bitswap<16>(offset ^ 0x0000, 15, 14, 13, 12, 11, 10, 6, 7, 8, 9, 0, 1, 2, 3, 4, 5); break;
+	}
+
+	if (offset >= 0xce80/2 && offset <= 0xceff/2) ret -= 0x0100;
+	if (offset >= 0xcf00/2 && offset <= 0xcf7f/2) ret += 0x0100;
+
+	return ret;
+}
+
 /* preliminary */
 void pgm_arm_type1_state::command_handler_py2k2(int pc)
 {
 	switch (m_ddp3lastcommand)
 	{
-		default:
-			puzzli2_printf("%06x command %02x | %04x\n", pc, m_ddp3lastcommand, m_value0);
-			m_valueresponse = 0x880000;
-			break;
-
+		case 0x30:
+			m_valueresponse = py2k2_sprite_offset(m_py2k2_sprite_base, m_py2k2_sprite_pos++);
+		break;
+		case 0x32:
+			m_py2k2_sprite_base = m_value0;
+			m_py2k2_sprite_pos = 0;
+			m_valueresponse = py2k2_sprite_offset(m_py2k2_sprite_base, m_py2k2_sprite_pos++);
+		break;
+		case 0xba:
+			m_valueresponse = m_py2k2_prev_base;
+			m_py2k2_prev_base = m_value0;
+		break;
+		case 0x99: // reset?
+			m_py2k2_prev_base = m_value0;
+			m_simregion = m_region->read();
+			m_valuekey = 0x100;
+			m_valueresponse = 0x00880000 | m_simregion<<8;
+		break;
 		case 0xc0:
 			puzzli2_printf("%06x command %02x | %04x\n", pc, m_ddp3lastcommand, m_value0);
 			m_valueresponse = 0x880000;
 			break;
-
+		case 0xc3:
+			m_valueresponse = 0x904000 + ((m_extra_ram[0xc0] + (m_value0 * 0x40)) * 4);
+		break;
+		case 0xd0:
+			m_valueresponse = 0xa01000 + (m_value0 * 0x20);
+		break;
+		case 0xdc:
+			m_valueresponse = 0xa00800 + (m_value0 * 0x40);
+		break;
+		case 0xe0:
+			m_valueresponse = 0xa00000 + ((m_value0 & 0x1f) * 0x40);
+		break;
 		case 0xcb: // Background layer 'x' select (pgm3in1, same as kov)
 			m_valueresponse = 0x880000;
-			m_kov_cb_value = m_value0;
 		break;
-
 		case 0xcc: // Background layer offset (pgm3in1, same as kov)
 		{
 			int y = m_value0;
 			if (y & 0x400) y = -(0x400 - (y & 0x3ff));
-			m_valueresponse = 0x900000 + ((m_kov_cb_value + (y * 0x40)) * 4);
+			m_valueresponse = 0x900000 + ((m_extra_ram[0xcb] + (y * 0x40)) * 4);
 		}
 		break;
-
-		case 0x99: // reset?
-			m_simregion = m_region->read();
-			m_valuekey = 0x100;
-			m_valueresponse = 0x00880000 | m_simregion<<8;
-
+		case 0x33:
+		case 0x34:
+		case 0x35:
+		case 0x37:
+		case 0x38:
+		default:
+			puzzli2_printf("%06x command %02x | %04x\n", pc, m_ddp3lastcommand, m_value0);
+			m_valueresponse = 0x880000;
 			break;
 	}
 }
@@ -2221,6 +2282,13 @@
 	arm_sim_handler = &pgm_arm_type1_state::command_handler_py2k2;
 	m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x500000, 0x500005, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_r)), write16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_w)));
 	m_maincpu->space(AS_PROGRAM).install_read_handler(0x4f0000, 0x4f003f, read16sm_delegate(*this, FUNC(pgm_arm_type1_state::arm7_type1_sim_protram_r)));
+
+	m_py2k2_sprite_pos = 0;
+	m_py2k2_sprite_base = 0;
+	m_py2k2_prev_base = 0;
+	save_item(NAME(m_py2k2_sprite_pos));
+	save_item(NAME(m_py2k2_sprite_base));
+	save_item(NAME(m_py2k2_prev_base));
 }
 
 void pgm_arm_type1_state::init_pgm3in1()
diff -Nru mame-0.222+dfsg.1/src/mame/machine/pgmprot_igs027a_type1.h mame-0.224+dfsg.1/src/mame/machine/pgmprot_igs027a_type1.h
--- mame-0.222+dfsg.1/src/mame/machine/pgmprot_igs027a_type1.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/pgmprot_igs027a_type1.h	2020-08-26 08:57:19.000000000 +0000
@@ -128,6 +128,10 @@
 
 	int command_31_write_type;
 
+	// py2k2 protection related
+	u16 m_py2k2_sprite_pos;
+	u16 m_py2k2_sprite_base;
+	u16 m_py2k2_prev_base;
 
 	// the maximum level size returned or read by the device appears to be this size
 	u16 level_structure[8][10];
diff -Nru mame-0.222+dfsg.1/src/mame/machine/pgmprot_igs027a_type2.cpp mame-0.224+dfsg.1/src/mame/machine/pgmprot_igs027a_type2.cpp
--- mame-0.222+dfsg.1/src/mame/machine/pgmprot_igs027a_type2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/pgmprot_igs027a_type2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -271,10 +271,20 @@
 void pgm_arm_type2_state::init_dwpc()
 {
 	pgm_basic_init();
+	pgm_dwpc_decrypt(machine());
 	kov2_latch_init();
-	pgm_mm_decrypt(machine()); // encryption is the same as martial masters
+
+	// we only have a JAPAN internal ROM dumped for now, so hack it to allow booting the Chinese version
+	u8 *armrom = memregion("prot")->base();
+	armrom[0x3c8] = 0x01;
 }
 
+void pgm_arm_type2_state::init_dwpc101j()
+{
+	pgm_basic_init();
+	kov2_latch_init();
+	pgm_mm_decrypt(machine()); // encryption is the same as martial masters
+}
 
 INPUT_PORTS_START( kov2 )
 	PORT_INCLUDE ( pgm )
diff -Nru mame-0.222+dfsg.1/src/mame/machine/pgmprot_igs027a_type2.h mame-0.224+dfsg.1/src/mame/machine/pgmprot_igs027a_type2.h
--- mame-0.222+dfsg.1/src/mame/machine/pgmprot_igs027a_type2.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/pgmprot_igs027a_type2.h	2020-08-26 08:57:19.000000000 +0000
@@ -16,6 +16,7 @@
 	void init_ddp2();
 	void init_dw2001();
 	void init_dwpc();
+	void init_dwpc101j();
 
 	void pgm_arm_type2(machine_config &config);
 	void pgm_arm_type2_22m(machine_config &config);
diff -Nru mame-0.222+dfsg.1/src/mame/machine/pmd85.cpp mame-0.224+dfsg.1/src/mame/machine/pmd85.cpp
--- mame-0.222+dfsg.1/src/mame/machine/pmd85.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/pmd85.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,9 +12,8 @@
 ***************************************************************************/
 
 #include "emu.h"
-#include "cpu/i8085/i8085.h"
 #include "includes/pmd85.h"
-#include "machine/pit8253.h"
+
 
 
 enum {PMD85_LED_1 = 0, PMD85_LED_2, PMD85_LED_3};
@@ -29,8 +28,6 @@
 
 	if (m_startup_mem_map)
 	{
-		uint8_t *mem = m_region_maincpu->base();
-
 		space.unmap_write(0x0000, 0x0fff);
 		space.nop_write(0x1000, 0x1fff);
 		space.unmap_write(0x2000, 0x2fff);
@@ -39,13 +36,13 @@
 		space.nop_read(0x1000, 0x1fff);
 		space.nop_read(0x3000, 0x3fff);
 
-		m_bank1->set_base(mem + 0x010000);
-		m_bank3->set_base(mem + 0x010000);
-		m_bank5->set_base(ram + 0xc000);
-
-		m_bank6->set_base(mem + 0x010000);
-		m_bank7->set_base(mem + 0x010000);
-		m_bank8->set_base(ram + 0xc000);
+		m_bank[1]->set_base(m_rom);
+		m_bank[3]->set_base(m_rom);
+		m_bank[5]->set_base(ram + 0xc000);
+
+		m_bank[6]->set_base(m_rom);
+		m_bank[7]->set_base(m_rom);
+		m_bank[8]->set_base(ram + 0xc000);
 	}
 	else
 	{
@@ -58,11 +55,11 @@
 		space.install_read_bank(0x1000, 0x1fff, "bank2");
 		space.install_read_bank(0x3000, 0x3fff, "bank4");
 
-		m_bank1->set_base(ram);
-		m_bank2->set_base(ram + 0x1000);
-		m_bank3->set_base(ram + 0x2000);
-		m_bank4->set_base(ram + 0x3000);
-		m_bank5->set_base(ram + 0x4000);
+		m_bank[1]->set_base(ram);
+		m_bank[2]->set_base(ram + 0x1000);
+		m_bank[3]->set_base(ram + 0x2000);
+		m_bank[4]->set_base(ram + 0x3000);
+		m_bank[5]->set_base(ram + 0x4000);
 	}
 }
 
@@ -73,21 +70,19 @@
 
 	if (m_startup_mem_map)
 	{
-		uint8_t *mem = m_region_maincpu->base();
-
 		space.unmap_write(0x0000, 0x0fff);
 		space.unmap_write(0x2000, 0x2fff);
 
-		m_bank1->set_base(mem + 0x010000);
-		m_bank2->set_base(ram + 0x9000);
-		m_bank3->set_base(mem + 0x010000);
-		m_bank4->set_base(ram + 0xb000);
-		m_bank5->set_base(ram + 0xc000);
-		m_bank6->set_base(mem + 0x010000);
-		m_bank7->set_base(ram + 0x9000);
-		m_bank8->set_base(mem + 0x010000);
-		m_bank9->set_base(ram + 0xb000);
-		m_bank10->set_base(ram + 0xc000);
+		m_bank[1]->set_base(m_rom);
+		m_bank[2]->set_base(ram + 0x9000);
+		m_bank[3]->set_base(m_rom);
+		m_bank[4]->set_base(ram + 0xb000);
+		m_bank[5]->set_base(ram + 0xc000);
+		m_bank[6]->set_base(m_rom);
+		m_bank[7]->set_base(ram + 0x9000);
+		m_bank[8]->set_base(m_rom);
+		m_bank[9]->set_base(ram + 0xb000);
+		m_bank[10]->set_base(ram + 0xc000);
 
 	}
 	else
@@ -95,48 +90,47 @@
 		space.install_write_bank(0x0000, 0x0fff, "bank1");
 		space.install_write_bank(0x2000, 0x2fff, "bank3");
 
-		m_bank1->set_base(ram);
-		m_bank2->set_base(ram + 0x1000);
-		m_bank3->set_base(ram + 0x2000);
-		m_bank4->set_base(ram + 0x5000);
-		m_bank5->set_base(ram + 0x4000);
+		m_bank[1]->set_base(ram);
+		m_bank[2]->set_base(ram + 0x1000);
+		m_bank[3]->set_base(ram + 0x2000);
+		m_bank[4]->set_base(ram + 0x5000);
+		m_bank[5]->set_base(ram + 0x4000);
 	}
 }
 
 void pmd85_state::pmd853_update_memory()
 {
-	uint8_t *mem = m_region_maincpu->base();
 	uint8_t *ram = m_ram->pointer();
 
 	if (m_startup_mem_map)
 	{
-		m_bank1->set_base(mem + 0x010000);
-		m_bank2->set_base(mem + 0x010000);
-		m_bank3->set_base(mem + 0x010000);
-		m_bank4->set_base(mem + 0x010000);
-		m_bank5->set_base(mem + 0x010000);
-		m_bank6->set_base(mem + 0x010000);
-		m_bank7->set_base(mem + 0x010000);
-		m_bank8->set_base(mem + 0x010000);
-		m_bank9->set_base(ram);
-		m_bank10->set_base(ram + 0x2000);
-		m_bank11->set_base(ram + 0x4000);
-		m_bank12->set_base(ram + 0x6000);
-		m_bank13->set_base(ram + 0x8000);
-		m_bank14->set_base(ram + 0xa000);
-		m_bank15->set_base(ram + 0xc000);
-		m_bank16->set_base(ram + 0xe000);
+		m_bank[1]->set_base(m_rom);
+		m_bank[2]->set_base(m_rom);
+		m_bank[3]->set_base(m_rom);
+		m_bank[4]->set_base(m_rom);
+		m_bank[5]->set_base(m_rom);
+		m_bank[6]->set_base(m_rom);
+		m_bank[7]->set_base(m_rom);
+		m_bank[8]->set_base(m_rom);
+		m_bank[9]->set_base(ram);
+		m_bank[10]->set_base(ram + 0x2000);
+		m_bank[11]->set_base(ram + 0x4000);
+		m_bank[12]->set_base(ram + 0x6000);
+		m_bank[13]->set_base(ram + 0x8000);
+		m_bank[14]->set_base(ram + 0xa000);
+		m_bank[15]->set_base(ram + 0xc000);
+		m_bank[16]->set_base(ram + 0xe000);
 	}
 	else
 	{
-		m_bank1->set_base(ram);
-		m_bank2->set_base(ram + 0x2000);
-		m_bank3->set_base(ram + 0x4000);
-		m_bank4->set_base(ram + 0x6000);
-		m_bank5->set_base(ram + 0x8000);
-		m_bank6->set_base(ram + 0xa000);
-		m_bank7->set_base(ram + 0xc000);
-		m_bank8->set_base(m_pmd853_memory_mapping ? mem + 0x010000 : ram + 0xe000);
+		m_bank[1]->set_base(ram);
+		m_bank[2]->set_base(ram + 0x2000);
+		m_bank[3]->set_base(ram + 0x4000);
+		m_bank[4]->set_base(ram + 0x6000);
+		m_bank[5]->set_base(ram + 0x8000);
+		m_bank[6]->set_base(ram + 0xa000);
+		m_bank[7]->set_base(ram + 0xc000);
+		m_bank[8]->set_base(m_pmd853_memory_mapping ? m_rom : ram + 0xe000);
 	}
 }
 
@@ -147,18 +141,16 @@
 
 	if (m_startup_mem_map)
 	{
-		uint8_t *mem = m_region_maincpu->base();
-
 		space.unmap_write(0x0000, 0x0fff);
 		space.unmap_write(0x1000, 0x33ff);
 		space.nop_write(0x3400, 0x3fff);
 
-		m_bank1->set_base(mem + 0x010000);
-		m_bank2->set_base(mem + 0x011000);
-		m_bank4->set_base(ram + 0xc000);
-		m_bank5->set_base(mem + 0x010000);
-		m_bank6->set_base(mem + 0x011000);
-		m_bank7->set_base(ram + 0xc000);
+		m_bank[1]->set_base(m_rom);
+		m_bank[2]->set_base(m_rom + 0x1000);
+		m_bank[4]->set_base(ram + 0xc000);
+		m_bank[5]->set_base(m_rom);
+		m_bank[6]->set_base(m_rom + 0x1000);
+		m_bank[7]->set_base(ram + 0xc000);
 	}
 	else
 	{
@@ -166,10 +158,10 @@
 		space.install_write_bank(0x1000, 0x33ff, "bank2");
 		space.install_write_bank(0x3400, 0x3fff, "bank3");
 
-		m_bank1->set_base(ram);
-		m_bank2->set_base(ram + 0x1000);
-		m_bank3->set_base(ram + 0x3400);
-		m_bank4->set_base(ram + 0x4000);
+		m_bank[1]->set_base(ram);
+		m_bank[2]->set_base(ram + 0x1000);
+		m_bank[3]->set_base(ram + 0x3400);
+		m_bank[4]->set_base(ram + 0x4000);
 	}
 }
 
@@ -180,44 +172,41 @@
 
 	if (m_startup_mem_map)
 	{
-		uint8_t *mem = m_region_maincpu->base();
-
 		space.unmap_write(0x0000, 0x3fff);
 
-		m_bank1->set_base(mem + 0x010000);
-		m_bank2->set_base(ram + 0xc000);
-		m_bank3->set_base(mem + 0x010000);
-		m_bank4->set_base(ram + 0xc000);
+		m_bank[1]->set_base(m_rom);
+		m_bank[2]->set_base(ram + 0xc000);
+		m_bank[3]->set_base(m_rom);
+		m_bank[4]->set_base(ram + 0xc000);
 	}
 	else
 	{
 		space.install_write_bank(0x0000, 0x3fff, "bank1");
 
-		m_bank1->set_base(ram);
-		m_bank2->set_base(ram + 0x4000);
+		m_bank[1]->set_base(ram);
+		m_bank[2]->set_base(ram + 0x4000);
 	}
 }
 
 void pmd85_state::c2717_update_memory()
 {
 	address_space& space = m_maincpu->space(AS_PROGRAM);
-	uint8_t *mem = m_region_maincpu->base();
 	uint8_t *ram = m_ram->pointer();
 
 	if (m_startup_mem_map)
 	{
 		space.unmap_write(0x0000, 0x3fff);
 
-		m_bank1->set_base(mem + 0x010000);
-		m_bank2->set_base(ram + 0x4000);
-		m_bank3->set_base(mem + 0x010000);
-		m_bank4->set_base(ram + 0xc000);
+		m_bank[1]->set_base(m_rom);
+		m_bank[2]->set_base(ram + 0x4000);
+		m_bank[3]->set_base(m_rom);
+		m_bank[4]->set_base(ram + 0xc000);
 	}
 	else
 	{
 		space.install_write_bank(0x0000, 0x3fff, "bank1");
-		m_bank1->set_base(ram);
-		m_bank2->set_base(ram + 0x4000);
+		m_bank[1]->set_base(ram);
+		m_bank[2]->set_base(ram + 0x4000);
 	}
 }
 
@@ -229,36 +218,37 @@
 
 *******************************************************************************/
 
-uint8_t pmd85_state::pmd85_ppi_0_porta_r()
+uint8_t pmd85_state::ppi0_porta_r()
 {
 	return 0xff;
 }
 
-uint8_t pmd85_state::pmd85_ppi_0_portb_r()
+uint8_t pmd85_state::ppi0_portb_r()
 {
-	return m_io_port[(m_ppi_port_outputs[0][0] & 0x0f)]->read() & m_io_port[15]->read();
+	return m_io_keyboard[(m_ppi_port_outputs[0][0] & 0x0f)]->read() & m_io_keyboard[15]->read();
 }
 
-uint8_t pmd85_state::pmd85_ppi_0_portc_r()
+uint8_t pmd85_state::ppi0_portc_r()
 {
 	return 0xff;
 }
 
-void pmd85_state::pmd85_ppi_0_porta_w(uint8_t data)
+void pmd85_state::ppi0_porta_w(uint8_t data)
 {
 	m_ppi_port_outputs[0][0] = data;
 }
 
-void pmd85_state::pmd85_ppi_0_portb_w(uint8_t data)
+void pmd85_state::ppi0_portb_w(uint8_t data)
 {
 	m_ppi_port_outputs[0][1] = data;
 }
 
-void pmd85_state::pmd85_ppi_0_portc_w(uint8_t data)
+void pmd85_state::ppi0_portc_w(uint8_t data)
 {
 	m_ppi_port_outputs[0][2] = data;
 	m_leds[PMD85_LED_2] = BIT(data, 3);
-	m_leds[PMD85_LED_3] = BIT(data, 2);
+	//m_leds[PMD85_LED_3] = BIT(data, 2);
+	m_speaker->level_w(BIT(data, 2));
 }
 
 /*******************************************************************************
@@ -269,31 +259,30 @@
 
 *******************************************************************************/
 
-uint8_t pmd85_state::mato_ppi_0_portb_r()
+uint8_t pmd85_state::mato_ppi0_portb_r()
 {
-	int i;
-	uint8_t data = 0xff;
+	u8 i,data = 0xff;
 
 	for (i = 0; i < 8; i++)
-	{
 		if (!BIT(m_ppi_port_outputs[0][0], i))
-			data &= m_io_port[i]->read();
-	}
+			data &= m_io_keyboard[i]->read();
+
 	return data;
 }
 
-uint8_t pmd85_state::mato_ppi_0_portc_r()
+uint8_t pmd85_state::mato_ppi0_portc_r()
 {
-	u8 data = m_io_port[8]->read() & 0x7f;
+	u8 data = m_io_keyboard[8]->read() & 0x7f;
 	data |= (m_cassette->input() > 0.038) ? 0x80 : 0;
 	return data;
 }
 
-void pmd85_state::mato_ppi_0_portc_w(uint8_t data)
+void pmd85_state::mato_ppi0_portc_w(uint8_t data)
 {
 	m_ppi_port_outputs[0][2] = data;
 	m_leds[PMD85_LED_2] = BIT(data, 3);
 	m_leds[PMD85_LED_3] = BIT(data, 2);
+	m_speaker->level_w(BIT(data, 1));
 	m_cassette->output(BIT(data, 0) ? 1 : -1);
 }
 
@@ -305,32 +294,32 @@
 
 *******************************************************************************/
 
-uint8_t pmd85_state::pmd85_ppi_1_porta_r()
+uint8_t pmd85_state::ppi1_porta_r()
 {
 	return 0xff;
 }
 
-uint8_t pmd85_state::pmd85_ppi_1_portb_r()
+uint8_t pmd85_state::ppi1_portb_r()
 {
 	return 0xff;
 }
 
-uint8_t pmd85_state::pmd85_ppi_1_portc_r()
+uint8_t pmd85_state::ppi1_portc_r()
 {
 	return 0xff;
 }
 
-void pmd85_state::pmd85_ppi_1_porta_w(uint8_t data)
+void pmd85_state::ppi1_porta_w(uint8_t data)
 {
 	m_ppi_port_outputs[1][0] = data;
 }
 
-void pmd85_state::pmd85_ppi_1_portb_w(uint8_t data)
+void pmd85_state::ppi1_portb_w(uint8_t data)
 {
 	m_ppi_port_outputs[1][1] = data;
 }
 
-void pmd85_state::pmd85_ppi_1_portc_w(uint8_t data)
+void pmd85_state::ppi1_portc_w(uint8_t data)
 {
 	m_ppi_port_outputs[1][2] = data;
 }
@@ -347,32 +336,32 @@
 
 *******************************************************************************/
 
-uint8_t pmd85_state::pmd85_ppi_2_porta_r()
+uint8_t pmd85_state::ppi2_porta_r()
 {
 	return 0xff;
 }
 
-uint8_t pmd85_state::pmd85_ppi_2_portb_r()
+uint8_t pmd85_state::ppi2_portb_r()
 {
 	return 0xff;
 }
 
-uint8_t pmd85_state::pmd85_ppi_2_portc_r()
+uint8_t pmd85_state::ppi2_portc_r()
 {
 	return 0xff;
 }
 
-void pmd85_state::pmd85_ppi_2_porta_w(uint8_t data)
+void pmd85_state::ppi2_porta_w(uint8_t data)
 {
 	m_ppi_port_outputs[2][0] = data;
 }
 
-void pmd85_state::pmd85_ppi_2_portb_w(uint8_t data)
+void pmd85_state::ppi2_portb_w(uint8_t data)
 {
 	m_ppi_port_outputs[2][1] = data;
 }
 
-void pmd85_state::pmd85_ppi_2_portc_w(uint8_t data)
+void pmd85_state::ppi2_portc_w(uint8_t data)
 {
 	m_ppi_port_outputs[2][2] = data;
 }
@@ -403,35 +392,35 @@
 
 *******************************************************************************/
 
-uint8_t pmd85_state::pmd85_ppi_3_porta_r()
+uint8_t pmd85_state::ppi3_porta_r()
 {
-	if (memregion("user1")->base() != nullptr)
+	if (memregion("user1")->base())
 		return memregion("user1")->base()[m_ppi_port_outputs[3][1] | (m_ppi_port_outputs[3][2] << 8)];
 	else
 		return 0;
 }
 
-uint8_t pmd85_state::pmd85_ppi_3_portb_r()
+uint8_t pmd85_state::ppi3_portb_r()
 {
 	return 0xff;
 }
 
-uint8_t pmd85_state::pmd85_ppi_3_portc_r()
+uint8_t pmd85_state::ppi3_portc_r()
 {
 	return 0xff;
 }
 
-void pmd85_state::pmd85_ppi_3_porta_w(uint8_t data)
+void pmd85_state::ppi3_porta_w(uint8_t data)
 {
 	m_ppi_port_outputs[3][0] = data;
 }
 
-void pmd85_state::pmd85_ppi_3_portb_w(uint8_t data)
+void pmd85_state::ppi3_portb_w(uint8_t data)
 {
 	m_ppi_port_outputs[3][1] = data;
 }
 
-void pmd85_state::pmd85_ppi_3_portc_w(uint8_t data)
+void pmd85_state::ppi3_portc_w(uint8_t data)
 {
 	m_ppi_port_outputs[3][2] = data;
 }
@@ -459,7 +448,7 @@
 
 *******************************************************************************/
 
-uint8_t pmd85_state::pmd85_io_r(offs_t offset)
+uint8_t pmd85_state::io_r(offs_t offset)
 {
 	if (m_startup_mem_map)
 	{
@@ -472,7 +461,7 @@
 				switch (offset & 0x80)
 				{
 					case 0x80:  /* Motherboard 8255 */
-							return m_ppi8255_0->read(offset & 0x03);
+							return m_ppi0->read(offset & 0x03);
 				}
 				break;
 		case 0x08:  /* ROM module connector */
@@ -481,7 +470,7 @@
 					switch (offset & 0x80)
 					{
 						case 0x80:  /* ROM module 8255 */
-							return m_ppi8255_3->read(offset & 0x03);
+							return m_ppi3->read(offset & 0x03);
 					}
 				}
 				break;
@@ -494,11 +483,11 @@
 								case 0x10:  /* 8251 (cassette recorder, V24) */
 										return m_uart->read(offset & 0x01);
 								case 0x40:  /* 8255 (GPIO/0, GPIO/1) */
-										return m_ppi8255_1->read(offset & 0x03);
+										return m_ppi1->read(offset & 0x03);
 								case 0x50:  /* 8253 */
-										return m_pit8253->read(offset & 0x03);
+										return m_pit->read(offset & 0x03);
 								case 0x70:  /* 8255 (IMS-2) */
-										return m_ppi8255_2->read(offset & 0x03);
+										return m_ppi2->read(offset & 0x03);
 							}
 							break;
 					case 0x80:  /* external interfaces */
@@ -513,7 +502,7 @@
 	return 0xff;
 }
 
-void pmd85_state::pmd85_io_w(offs_t offset, uint8_t data)
+void pmd85_state::io_w(offs_t offset, uint8_t data)
 {
 	if (m_startup_mem_map)
 	{
@@ -527,7 +516,7 @@
 				switch (offset & 0x80)
 				{
 					case 0x80:  /* Motherboard 8255 */
-							m_ppi8255_0->write(offset & 0x03, data);
+							m_ppi0->write(offset & 0x03, data);
 							/* PMD-85.3 memory banking */
 							if ((offset & 0x03) == 0x03)
 							{
@@ -543,7 +532,7 @@
 					switch (offset & 0x80)
 					{
 						case 0x80:  /* ROM module 8255 */
-							m_ppi8255_3->write(offset & 0x03, data);
+							m_ppi3->write(offset & 0x03, data);
 							break;
 					}
 				}
@@ -558,14 +547,14 @@
 										m_uart->write(offset & 0x01, data);
 										break;
 								case 0x40:  /* 8255 (GPIO/0, GPIO/0) */
-										m_ppi8255_1->write(offset & 0x03, data);
+										m_ppi1->write(offset & 0x03, data);
 										break;
 								case 0x50:  /* 8253 */
-										m_pit8253->write(offset & 0x03, data);
+										m_pit->write(offset & 0x03, data);
 										logerror ("8253 writing. Address: %02x, Data: %02x\n", offset, data);
 										break;
 								case 0x70:  /* 8255 (IMS-2) */
-										m_ppi8255_2->write(offset & 0x03, data);
+										m_ppi2->write(offset & 0x03, data);
 										break;
 							}
 							break;
@@ -602,7 +591,7 @@
 				switch (offset & 0x80)
 				{
 					case 0x80:  /* Motherboard 8255 */
-							return m_ppi8255_0->read(offset & 0x03);
+							return m_ppi0->read(offset & 0x03);
 				}
 				break;
 	}
@@ -625,7 +614,7 @@
 				switch (offset & 0x80)
 				{
 					case 0x80:  /* Motherboard 8255 */
-							return m_ppi8255_0->write(offset & 0x03, data);
+							return m_ppi0->write(offset & 0x03, data);
 				}
 				break;
 	}
@@ -636,19 +625,19 @@
 	switch (id)
 	{
 	case TIMER_CASSETTE:
-		pmd85_cassette_timer_callback(ptr, param);
+		cassette_timer_callback(ptr, param);
 		break;
 	default:
 		throw emu_fatalerror("Unknown id in pmd85_state::device_timer");
 	}
 }
 
-TIMER_CALLBACK_MEMBER(pmd85_state::pmd85_cassette_timer_callback)
+TIMER_CALLBACK_MEMBER(pmd85_state::cassette_timer_callback)
 {
 	bool data;
 	bool current_level;
 
-	if (!(m_io_dsw0->read() & 0x02))   /* V.24 / Tape Switch */
+	if (!BIT(m_io_dsw0->read(), 1))   /* V.24 / Tape Switch */
 	{
 		/* tape reading */
 		if (m_cassette->get_state()&CASSETTE_PLAY)
@@ -711,18 +700,8 @@
 	machine().schedule_soft_reset();
 }
 
-void pmd85_state::pmd85_common_driver_init()
+void pmd85_state::common_driver_init()
 {
-	static const char *const keynames[] = {
-		"KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5", "KEY6", "KEY7",
-		"KEY8", "KEY9", "KEY10", "KEY11", "KEY12", "KEY13", "KEY14", "KEY15"
-	};
-
-	for ( int i = 0; i < 16; i++ )
-	{
-		m_io_port[i] = ioport( keynames[i] );
-	}
-
 	m_previous_level = 0;
 	m_clk_level = m_clk_level_tape = 1;
 	m_cassette_timer = timer_alloc(TIMER_CASSETTE);
@@ -733,67 +712,52 @@
 {
 	m_model = PMD85_1;
 	update_memory = &pmd85_state::pmd851_update_memory;
-	pmd85_common_driver_init();
+	common_driver_init();
 }
 
 void pmd85_state::init_pmd852()
 {
 	m_model = PMD85_2;
 	update_memory = &pmd85_state::pmd851_update_memory;
-	pmd85_common_driver_init();
+	common_driver_init();
 }
 
 void pmd85_state::init_pmd852a()
 {
 	m_model = PMD85_2A;
 	update_memory = &pmd85_state::pmd852a_update_memory;
-	pmd85_common_driver_init();
+	common_driver_init();
 }
 
 void pmd85_state::init_pmd853()
 {
 	m_model = PMD85_3;
 	update_memory = &pmd85_state::pmd853_update_memory;
-	pmd85_common_driver_init();
+	common_driver_init();
 }
 
 void pmd85_state::init_alfa()
 {
 	m_model = ALFA;
 	update_memory = &pmd85_state::alfa_update_memory;
-	pmd85_common_driver_init();
+	common_driver_init();
 }
 
 void pmd85_state::init_mato()
 {
 	m_model = MATO;
 	update_memory = &pmd85_state::mato_update_memory;
-
-	static const char *const keynames[] = {
-		"KEY0", "KEY1", "KEY2", "KEY3", "KEY4", "KEY5", "KEY6", "KEY7", "KEY8"
-	};
-
-	for ( int i = 0; i < 9; i++ )
-	{
-		m_io_port[i] = ioport( keynames[i] );
-	}
-	for ( int i = 9; i < 16; i++ )
-	{
-		m_io_port[i] = nullptr;
-	}
 }
 
 void pmd85_state::init_c2717()
 {
 	m_model = C2717;
 	update_memory = &pmd85_state::c2717_update_memory;
-	pmd85_common_driver_init();
+	common_driver_init();
 }
 
 void pmd85_state::machine_reset()
 {
-	int i, j;
-
 	/* checking for Rom Module */
 	m_rom_module_present = 0;
 	switch (m_model)
@@ -810,13 +774,28 @@
 			break;
 	}
 
-	for (i = 0; i < 4; i++)
-		for (j = 0; j < 3; j++)
+	for (u8 i = 0; i < 4; i++)
+		for (u8 j = 0; j < 3; j++)
 			m_ppi_port_outputs[i][j] = 0;
 
 	/* memory initialization */
-	memset(m_ram->pointer(), 0, sizeof(unsigned char)*0x10000);
 	m_pmd853_memory_mapping = 1;
 	m_startup_mem_map = 1;
 	(this->*update_memory)();
 }
+
+void pmd85_state::machine_start()
+{
+	m_leds.resolve();
+	save_item(NAME(m_txd));
+	save_item(NAME(m_rts));
+	save_item(NAME(m_rom_module_present));
+	save_item(NAME(m_ppi_port_outputs));
+	save_item(NAME(m_startup_mem_map));
+	save_item(NAME(m_pmd853_memory_mapping));
+	save_item(NAME(m_previous_level));
+	save_item(NAME(m_clk_level));
+	save_item(NAME(m_clk_level_tape));
+	save_item(NAME(m_model));
+}
+
diff -Nru mame-0.222+dfsg.1/src/mame/machine/poly88.cpp mame-0.224+dfsg.1/src/mame/machine/poly88.cpp
--- mame-0.222+dfsg.1/src/mame/machine/poly88.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/poly88.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -178,6 +178,16 @@
 void poly88_state::machine_start()
 {
 	m_onboard_ram = make_unique_clear<u8[]>(0x200);
+	save_pointer(NAME(m_onboard_ram), 0x200);
+	save_item(NAME(m_int_vector));
+	save_item(NAME(m_dtr));
+	save_item(NAME(m_rts));
+	save_item(NAME(m_txd));
+	save_item(NAME(m_rxd));
+	save_item(NAME(m_cassold));
+	save_item(NAME(m_casspol));
+	save_item(NAME(m_cass_data));
+	save_item(NAME(m_onboard_disable));
 }
 
 void poly88_state::machine_reset()
diff -Nru mame-0.222+dfsg.1/src/mame/machine/pp01.cpp mame-0.224+dfsg.1/src/mame/machine/pp01.cpp
--- mame-0.222+dfsg.1/src/mame/machine/pp01.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/pp01.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -23,33 +23,35 @@
 	uint16_t addroffset = part ? 0x1000  : 0x0000;
 	uint8_t *ram = m_ram->pointer();
 
-	if (BIT(m_video_write_mode,3)) {
+	if (BIT(m_video_write_mode,3))
+	{
 		// Copy mode
-		if(BIT(m_video_write_mode,0)) {
+		if(BIT(m_video_write_mode,0))
 			ram[0x6000+offset+addroffset] = data;
-		} else {
+		else
 			ram[0x6000+offset+addroffset] = 0;
-		}
-		if(BIT(m_video_write_mode,1)) {
+
+		if(BIT(m_video_write_mode,1))
 			ram[0xa000+offset+addroffset] = data;
-		} else {
+		else
 			ram[0xa000+offset+addroffset] = 0;
-		}
-		if(BIT(m_video_write_mode,2)) {
+
+		if(BIT(m_video_write_mode,2))
 			ram[0xe000+offset+addroffset] = data;
-		} else {
+		else
 			ram[0xe000+offset+addroffset] = 0;
-		}
-	} else {
-		if (block==0) {
+
+	}
+	else
+	{
+		if (block==0)
 			ram[0x6000+offset+addroffset] = data;
-		}
-		if (block==1) {
+		else
+		if (block==1)
 			ram[0xa000+offset+addroffset] = data;
-		}
-		if (block==2) {
+		else
+		if (block==2)
 			ram[0xe000+offset+addroffset] = data;
-		}
 	}
 }
 
@@ -85,14 +87,14 @@
 	uint8_t *mem = memregion("maincpu")->base();
 	address_space &space = m_maincpu->space(AS_PROGRAM);
 	uint16_t startaddr = block*0x1000;
-	uint16_t endaddr   = ((block+1)*0x1000)-1;
-	uint8_t  blocknum  = block + 1;
-	char bank[10];
-	sprintf(bank,"bank%d",blocknum);
-	if (data>=0xE0 && data<=0xEF) {
+	uint16_t endaddr   = startaddr+0xfff;
+
+	if (data>=0xE0 && data<=0xEF)
+	{
 		// This is RAM
-		space.install_read_bank (startaddr, endaddr, bank);
-		switch(data) {
+		space.install_read_bank (startaddr, endaddr, m_bank[block]);
+		switch(data)
+		{
 		case 0xe6 :
 			space.install_write_handler(startaddr, endaddr, write8sm_delegate(*this, FUNC(pp01_state::video_r_1_w)));
 			break;
@@ -112,16 +114,21 @@
 			space.install_write_handler(startaddr, endaddr, write8sm_delegate(*this, FUNC(pp01_state::video_b_2_w)));
 			break;
 		default:
-			space.install_write_bank(startaddr, endaddr, bank);
+			space.install_write_bank(startaddr, endaddr, m_bank[block]);
 			break;
 		}
 
-		membank(bank)->set_base(m_ram->pointer() + (data & 0x0F)* 0x1000);
-	} else if (data>=0xF8) {
-		space.install_read_bank (startaddr, endaddr, bank);
+		m_bank[block]->set_base(m_ram->pointer() + (data & 0x0F)* 0x1000);
+	}
+	else
+	if (data>=0xFC)
+	{
+		space.install_read_bank (startaddr, endaddr, m_bank[block]);
 		space.unmap_write(startaddr, endaddr);
-		membank(bank)->set_base(mem + ((data & 0x0F)-8)* 0x1000+0x10000);
-	} else {
+		m_bank[block]->set_base(mem + (data & 0x03)* 0x1000);
+	}
+	else
+	{
 		logerror("%02x %02x\n",block,data);
 		space.unmap_readwrite (startaddr, endaddr);
 	}
@@ -131,7 +138,8 @@
 {
 	int i;
 	memset(m_memory_block,0xff,16);
-	for(i=0;i<16;i++) {
+	for(i=0;i<16;i++)
+	{
 		m_memory_block[i] = 0xff;
 		set_memory(i, 0xff);
 	}
@@ -151,6 +159,15 @@
 
 void pp01_state::machine_start()
 {
+	save_item(NAME(m_video_scroll));
+	save_item(NAME(m_memory_block));
+	save_item(NAME(m_video_write_mode));
+	save_item(NAME(m_key_line));
+	save_item(NAME(m_txe));
+	save_item(NAME(m_txd));
+	save_item(NAME(m_rts));
+	save_item(NAME(m_casspol));
+	save_item(NAME(m_cass_data));
 }
 
 TIMER_DEVICE_CALLBACK_MEMBER( pp01_state::kansas_r )
@@ -202,12 +219,7 @@
 
 uint8_t pp01_state::ppi1_portb_r()
 {
-	static const char *const keynames[] = {
-		"LINE0", "LINE1", "LINE2", "LINE3", "LINE4", "LINE5", "LINE6", "LINE7",
-		"LINE8", "LINE9", "LINEA", "LINEB", "LINEC", "LINED", "LINEE", "LINEF"
-	};
-
-	return (ioport(keynames[m_key_line])->read() & 0x3F) | (ioport("LINEALL")->read() & 0xC0);
+	return m_io_keyboard[m_key_line]->read() | m_io_keyboard[16]->read();
 }
 void pp01_state::ppi1_portb_w(uint8_t data)
 {
diff -Nru mame-0.222+dfsg.1/src/mame/machine/primo.cpp mame-0.224+dfsg.1/src/mame/machine/primo.cpp
--- mame-0.222+dfsg.1/src/mame/machine/primo.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/primo.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -39,14 +39,14 @@
 
 *******************************************************************************/
 
-void primo_state::primo_update_memory()
+void primo_state::update_memory()
 {
 	address_space& space = m_maincpu->space(AS_PROGRAM);
 	switch (m_port_FD & 0x03)
 	{
 		case 0x00:  /* Original ROM */
 			space.unmap_write(0x0000, 0x3fff);
-			membank("bank1")->set_base(memregion("maincpu")->base() + 0x10000);
+			membank("bank1")->set_base(memregion("maincpu")->base());
 			break;
 		case 0x01:  /* EPROM extension 1 */
 			space.unmap_write(0x0000, 0x3fff);
@@ -70,7 +70,7 @@
 
 *******************************************************************************/
 
-uint8_t primo_state::primo_be_1_r(offs_t offset)
+uint8_t primo_state::be_1_r(offs_t offset)
 {
 	uint8_t data = 0x00;
 
@@ -95,7 +95,7 @@
 	return data;
 }
 
-uint8_t primo_state::primo_be_2_r()
+uint8_t primo_state::be_2_r()
 {
 	uint8_t data = 0xff;
 
@@ -125,7 +125,7 @@
 	return data;
 }
 
-void primo_state::primo_ki_1_w(uint8_t data)
+void primo_state::ki_1_w(uint8_t data)
 {
 	// bit 7 - NMI generator enable/disable
 	m_nmi = BIT(data, 7);
@@ -161,7 +161,7 @@
 	}
 }
 
-void primo_state::primo_ki_2_w(uint8_t data)
+void primo_state::ki_2_w(uint8_t data)
 {
 	// bit 7, 6 - not used
 
@@ -184,12 +184,12 @@
 //  logerror ("IOW KI-2 data:%02x\n", data);
 }
 
-void primo_state::primo_FD_w(uint8_t data)
+void primo_state::FD_w(uint8_t data)
 {
 	if (!m_mem_exp_port->read())
 	{
 		m_port_FD = data;
-		primo_update_memory();
+		update_memory();
 	}
 }
 
@@ -211,16 +211,20 @@
 
 *******************************************************************************/
 
-void primo_state::primo_common_machine_init()
+void primo_state::common_machine_init()
 {
 	if (m_mem_exp_port->read())
 		m_port_FD = 0x00;
-	primo_update_memory();
+	update_memory();
 	m_maincpu->set_clock_scale(m_clock_port->read() ? 1.5 : 1.0);
 }
 
 void primo_state::machine_start()
 {
+	save_item(NAME(m_video_memory_base));
+	save_item(NAME(m_port_FD));
+	save_item(NAME(m_nmi));
+
 	std::string region_tag;
 	m_cart1_rom = memregion(region_tag.assign(m_cart1->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
 	m_cart2_rom = memregion(region_tag.assign(m_cart2->tag()).append(GENERIC_ROM_REGION_TAG).c_str());
@@ -228,12 +232,12 @@
 
 void primo_state::machine_reset()
 {
-	primo_common_machine_init();
+	common_machine_init();
 }
 
 MACHINE_RESET_MEMBER(primo_state,primob)
 {
-	primo_common_machine_init();
+	common_machine_init();
 
 //removed   cbm_drive_0_config(SERIAL, 8);
 //removed   cbm_drive_1_config(SERIAL, 9);
@@ -245,7 +249,7 @@
 
 *******************************************************************************/
 
-void primo_state::primo_setup_pss (uint8_t* snapshot_data, uint32_t snapshot_size)
+void primo_state::setup_pss (uint8_t* snapshot_data, uint32_t snapshot_size)
 {
 	/* Z80 registers */
 	m_maincpu->set_state_int(Z80_BC, snapshot_data[4] + snapshot_data[5]*256);
@@ -272,9 +276,8 @@
 	// KI-1 bit 4 - speaker
 	m_speaker->level_w(BIT(snapshot_data[30], 4));
 
-
 	/* memory */
-	for (int i = 0; i < 0xc000; i++)
+	for (u16 i = 0; i < 0xc000; i++)
 		m_maincpu->space(AS_PROGRAM).write_byte(i + 0x4000, snapshot_data[i + 38]);
 }
 
@@ -292,7 +295,7 @@
 		return image_init_result::FAIL;
 	}
 
-	primo_setup_pss(&snapshot_data[0], snapshot_size);
+	setup_pss(&snapshot_data[0], snapshot_size);
 
 	return image_init_result::PASS;
 }
@@ -304,15 +307,12 @@
 *******************************************************************************/
 
 
-void primo_state::primo_setup_pp(uint8_t* quickload_data, uint32_t quickload_size)
+void primo_state::setup_pp(uint8_t* quickload_data, uint32_t quickload_size)
 {
-	uint16_t load_addr;
-	uint16_t start_addr;
+	u16 load_addr = quickload_data[0] + quickload_data[1]*256;
+	u16 start_addr = quickload_data[2] + quickload_data[3]*256;
 
-	load_addr = quickload_data[0] + quickload_data[1]*256;
-	start_addr = quickload_data[2] + quickload_data[3]*256;
-
-	for (int i = 4; i < quickload_size; i++)
+	for (u32 i = 4; i < quickload_size; i++)
 		m_maincpu->space(AS_PROGRAM).write_byte(start_addr+i-4, quickload_data[i]);
 
 	m_maincpu->set_state_int(Z80_PC, start_addr);
@@ -329,7 +329,26 @@
 		return image_init_result::FAIL;
 	}
 
-	primo_setup_pp(&quickload_data[0], quickload_size);
+	setup_pp(&quickload_data[0], quickload_size);
 
 	return image_init_result::PASS;
 }
+
+u32 primo_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	u32 ma = m_video_memory_base;
+
+	for (u8 y = 0; y < 192; y++)
+	{
+		u16 *p = &bitmap.pix16(y);
+		for (u16 x = 0; x < 32; x++)
+		{
+			u8 data = m_vram[ma+x];
+			for (u8 i = 0; i < 8; i++)
+				*p++ = BIT(data, i^7);
+		}
+		ma += 32;
+	}
+	return 0;
+}
+
diff -Nru mame-0.222+dfsg.1/src/mame/machine/qix.cpp mame-0.224+dfsg.1/src/mame/machine/qix.cpp
--- mame-0.222+dfsg.1/src/mame/machine/qix.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/qix.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -33,7 +33,10 @@
 
 void zookeep_state::machine_start()
 {
-	qixmcu_state::machine_start();
+	if (m_mcu)
+		qixmcu_state::machine_start();
+	else
+		qix_state::machine_start();
 
 	/* configure the banking */
 	m_vidbank->configure_entry(0, memregion("videocpu")->base() + 0xa000);
diff -Nru mame-0.222+dfsg.1/src/mame/machine/radio86.cpp mame-0.224+dfsg.1/src/mame/machine/radio86.cpp
--- mame-0.222+dfsg.1/src/mame/machine/radio86.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/radio86.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -11,7 +11,6 @@
 
 #include "emu.h"
 #include "cpu/i8085/i8085.h"
-#include "machine/i8255.h"
 #include "includes/radio86.h"
 
 
@@ -25,30 +24,23 @@
 /* Driver initialization */
 void radio86_state::init_radio86()
 {
-	/* set initialy ROM to be visible on first bank */
-	uint8_t *RAM = m_region_maincpu->base();
-	memset(RAM,0x0000,0x1000); // make frist page empty by default
-	m_bank1->configure_entries(1, 2, RAM, 0x0000);
-	m_bank1->configure_entries(0, 2, RAM, 0xf800);
 	radio86_init_keyboard();
 }
 
 void radio86_state::init_radioram()
 {
 	init_radio86();
-	m_radio_ram_disk = std::make_unique<uint8_t[]>(0x20000);
-	memset(m_radio_ram_disk.get(),0,0x20000);
+	m_radio_ram_disk = make_unique_clear<u8[]>(0x20000);
+	save_pointer(NAME(m_radio_ram_disk), 0x20000);
 }
 
-uint8_t radio86_state::radio86_8255_portb_r2()
+u8 radio86_state::radio86_8255_portb_r2()
 {
-	uint8_t key = 0xff;
-	for (int i = 0; i < 8; i++)
-	{
-		if (BIT(m_keyboard_mask, i)) {
+	u8 key = 0xff;
+	for (u8 i = 0; i < 8; i++)
+		if (BIT(m_keyboard_mask, i))
 			key &= m_io_line[i]->read();
-		}
-	}
+
 	return key;
 }
 
@@ -70,41 +62,39 @@
 	return key;
 }
 
-uint8_t radio86_state::radio86_8255_portc_r2()
+u8 radio86_state::radio86_8255_portc_r2()
 {
 	double level = m_cassette->input();
-	uint8_t dat = m_io_line[8]->read();
-	if (level <  0) {
+	u8 dat = m_io_line[8]->read();
+	if (level < 0)
 		dat ^= m_tape_value;
-	}
+
 	return dat;
 }
 
-void radio86_state::radio86_8255_porta_w2(uint8_t data)
+void radio86_state::radio86_8255_porta_w2(u8 data)
 {
 	m_keyboard_mask = data ^ 0xff;
 }
 
-void radio86_state::radio86_8255_portc_w2(uint8_t data)
+void radio86_state::radio86_8255_portc_w2(u8 data)
 {
 	m_cassette->output(data & 0x01 ? 1 : -1);
 }
 
 
-uint8_t radio86_state::rk7007_8255_portc_r()
+u8 radio86_state::rk7007_8255_portc_r()
 {
 	double level = m_cassette->input();
-	uint8_t key = 0xff;
-	for (int i = 0; i < 8; i++)
-	{
-		if ((m_keyboard_mask & (1 << i))!=0) {
+	u8 key = 0xff;
+	for (u8 i = 0; i < 8; i++)
+		if ((m_keyboard_mask & (1 << i))!=0)
 			key &= m_io_cline[i]->read();
-		}
-	}
+
 	key &= 0xe0;
-	if (level <  0) {
+	if (level < 0)
 		key ^= m_tape_value;
-	}
+
 	return key;
 }
 
@@ -114,94 +104,101 @@
 	m_maincpu->set_input_line(INPUT_LINE_HALT, state);
 
 	/* HACK - this should be connected to the BUSACK line of Z80 */
-	m_dma8257->hlda_w(state);
+	m_dma->hlda_w(state);
 }
 
-uint8_t radio86_state::memory_read_byte(offs_t offset)
+u8 radio86_state::memory_read_byte(offs_t offset)
 {
 	address_space& prog_space = m_maincpu->space(AS_PROGRAM);
 	return prog_space.read_byte(offset);
 }
 
-void radio86_state::memory_write_byte(offs_t offset, uint8_t data)
+void radio86_state::memory_write_byte(offs_t offset, u8 data)
 {
 	address_space& prog_space = m_maincpu->space(AS_PROGRAM);
 	return prog_space.write_byte(offset, data);
 }
 
-void radio86_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
-{
-	switch (id)
-	{
-	case TIMER_RESET:
-		m_bank1->set_entry(0);
-		break;
-	default:
-		throw emu_fatalerror("Unknown id in radio86_state::device_timer");
-	}
-}
-
-
-uint8_t radio86_state::radio_cpu_state_r()
+u8 radio86_state::radio_cpu_state_r()
 {
-	// FIXME: the driver should handler the status callback rather than accessing this through the state interface
+	// FIXME: the driver should handle the status callback rather than accessing this through the state interface
 	return m_maincpu->state_int(i8080_cpu_device::I8085_STATUS);
 }
 
-uint8_t radio86_state::radio_io_r(offs_t offset)
+u8 radio86_state::radio_io_r(offs_t offset)
 {
 	return m_maincpu->space(AS_PROGRAM).read_byte((offset << 8) + offset);
 }
 
-void radio86_state::radio_io_w(offs_t offset, uint8_t data)
+void radio86_state::radio_io_w(offs_t offset, u8 data)
 {
 	m_maincpu->space(AS_PROGRAM).write_byte((offset << 8) + offset,data);
 }
 
 void radio86_state::machine_reset()
 {
-	timer_set(attotime::from_usec(10), TIMER_RESET);
-	m_bank1->set_entry(1);
-
 	m_keyboard_mask = 0;
 	m_disk_sel = 0;
+
+	address_space &program = m_maincpu->space(AS_PROGRAM);
+	program.install_rom(0x0000, 0x0fff, m_rom);   // do it here for F3
+	m_rom_shadow_tap = program.install_read_tap(0xf000, 0xffff, "rom_shadow_r",[this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+		{
+			// delete this tap
+			m_rom_shadow_tap->remove();
+
+			// reinstall ram over the rom shadow
+			m_maincpu->space(AS_PROGRAM).install_ram(0x0000, 0x0fff, m_ram);
+		}
+
+		// return the original data
+		return data;
+	});
 }
 
+void radio86_state::machine_start()
+{
+	save_item(NAME(m_tape_value));
+	save_item(NAME(m_keyboard_mask));
+	save_item(NAME(m_romdisk_lsb));
+	save_item(NAME(m_romdisk_msb));
+	save_item(NAME(m_disk_sel));
+}
 
-void radio86_state::radio86_pagesel(uint8_t data)
+void radio86_state::radio86_pagesel(u8 data)
 {
 	m_disk_sel = data;
 }
 
-uint8_t radio86_state::radio86rom_romdisk_porta_r()
+u8 radio86_state::radio86rom_romdisk_porta_r()
 {
-	uint16_t addr = (m_romdisk_msb << 8) | m_romdisk_lsb;
+	u16 addr = (m_romdisk_msb << 8) | m_romdisk_lsb;
 	if (m_cart->exists() && addr < m_cart->get_rom_size())
 		return m_cart->read_rom(addr);
 	else
 		return 0xff;
 }
 
-uint8_t radio86_state::radio86ram_romdisk_porta_r()
+u8 radio86_state::radio86ram_romdisk_porta_r()
 {
-	uint8_t *romdisk = m_region_maincpu->base() + 0x10000;
-	if ((m_disk_sel & 0x0f) ==0) {
+	u8 *romdisk = m_rom + 0x10000;
+	if ((m_disk_sel & 0x0f) ==0)
 		return romdisk[m_romdisk_msb*256+m_romdisk_lsb];
-	} else {
-		if (m_disk_sel==0xdf) {
-			return m_radio_ram_disk[m_romdisk_msb*256+m_romdisk_lsb + 0x10000];
-		} else {
-			return m_radio_ram_disk[m_romdisk_msb*256+m_romdisk_lsb];
-		}
-	}
+	else
+	if (m_disk_sel==0xdf)
+		return m_radio_ram_disk[m_romdisk_msb*256+m_romdisk_lsb + 0x10000];
+	else
+		return m_radio_ram_disk[m_romdisk_msb*256+m_romdisk_lsb];
 }
 
-void radio86_state::radio86_romdisk_portb_w(uint8_t data)
+void radio86_state::radio86_romdisk_portb_w(u8 data)
 {
 	m_romdisk_lsb = data;
 }
 
-void radio86_state::radio86_romdisk_portc_w(uint8_t data)
+void radio86_state::radio86_romdisk_portc_w(u8 data)
 {
 	m_romdisk_msb = data;
 }
@@ -209,7 +206,7 @@
 I8275_DRAW_CHARACTER_MEMBER(radio86_state::display_pixels)
 {
 	rgb_t const *const palette = m_palette->palette()->entry_list_raw();
-	uint8_t pixels = m_charmap[(linecount & 7) + (charcode << 3)] ^ 0xff;
+	u8 pixels = m_chargen[(linecount & 7) + (charcode << 3)] ^ 0xff;
 	if (vsp)
 		pixels = 0;
 
@@ -219,7 +216,7 @@
 	if (rvv)
 		pixels ^= 0xff;
 
-	for (int i = 0; i < 6; i++)
+	for (u8 i = 0; i < 6; i++)
 		bitmap.pix32(y, x + i) = palette[(pixels >> (5-i)) & 1 ? (hlgt ? 2 : 1) : 0];
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/machine/s32comm.cpp mame-0.224+dfsg.1/src/mame/machine/s32comm.cpp
--- mame-0.222+dfsg.1/src/mame/machine/s32comm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/s32comm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -133,6 +133,8 @@
 	m_zfg = 0;
 	m_cn = 0;
 	m_fg = 0;
+
+	std::fill(std::begin(m_shared), std::end(m_shared), 0);
 }
 
 uint8_t s32comm_device::zfg_r(offs_t offset)
diff -Nru mame-0.222+dfsg.1/src/mame/machine/samcoupe.cpp mame-0.224+dfsg.1/src/mame/machine/samcoupe.cpp
--- mame-0.222+dfsg.1/src/mame/machine/samcoupe.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/samcoupe.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,334 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Lee Hammerton, Dirk Best
-/***************************************************************************
-
-    Miles Gordon Technology SAM Coupe
-
-***************************************************************************/
-
-#include "emu.h"
-#include "includes/samcoupe.h"
-
-/***************************************************************************
-    CONSTANTS
-***************************************************************************/
-
-#define LMPR_RAM0    0x20   /* If bit set ram is paged into bank 0, else its rom0 */
-#define LMPR_ROM1    0x40   /* If bit set rom1 is paged into bank 3, else its ram */
-#define HMPR_MCNTRL  0x80   /* If set external RAM is enabled */
-
-
-/***************************************************************************
-    MEMORY BANKING
-***************************************************************************/
-
-uint8_t samcoupe_state::sam_bank1_r(offs_t offset)
-{
-	if (sam_bank_read_ptr[0])
-		return sam_bank_read_ptr[0][offset];
-
-	return 0xff;
-}
-
-void samcoupe_state::sam_bank1_w(offs_t offset, uint8_t data)
-{
-	if (sam_bank_write_ptr[0])
-		sam_bank_write_ptr[0][offset] = data;
-}
-
-
-uint8_t samcoupe_state::sam_bank2_r(offs_t offset)
-{
-	if (sam_bank_read_ptr[1])
-		return sam_bank_read_ptr[1][offset];
-
-	return 0xff;
-}
-
-void samcoupe_state::sam_bank2_w(offs_t offset, uint8_t data)
-{
-	if (sam_bank_write_ptr[1])
-		sam_bank_write_ptr[1][offset] = data;
-}
-
-
-uint8_t samcoupe_state::sam_bank3_r(offs_t offset)
-{
-	if (sam_bank_read_ptr[2])
-		return sam_bank_read_ptr[2][offset];
-
-	return 0xff;
-}
-
-void samcoupe_state::sam_bank3_w(offs_t offset, uint8_t data)
-{
-	if (sam_bank_write_ptr[2])
-		sam_bank_write_ptr[2][offset] = data;
-}
-
-
-uint8_t samcoupe_state::sam_bank4_r(offs_t offset)
-{
-	if (sam_bank_read_ptr[3])
-		return sam_bank_read_ptr[3][offset];
-
-	return 0xff;
-}
-
-void samcoupe_state::sam_bank4_w(offs_t offset, uint8_t data)
-{
-	if (sam_bank_write_ptr[3])
-		sam_bank_write_ptr[3][offset] = data;
-}
-
-void samcoupe_state::samcoupe_update_bank(address_space &space, int bank_num, uint8_t *memory, int is_readonly)
-{
-	sam_bank_read_ptr[bank_num-1] = memory;
-	if (!is_readonly)
-		sam_bank_write_ptr[bank_num-1] = memory;
-	else
-		sam_bank_write_ptr[bank_num-1] = nullptr;
-
-	// installing banks on the fly is too slow (20% speed in Manic Miner gameplay vs 300% speed)
-#if 0
-	char bank[10];
-	sprintf(bank,"bank%d",bank_num);
-	if (memory)
-	{
-		membank(bank)->set_base(memory);
-		space.install_read_bank (((bank_num-1) * 0x4000), ((bank_num-1) * 0x4000) + 0x3FFF, bank);
-		if (is_readonly) {
-			space.unmap_write(((bank_num-1) * 0x4000), ((bank_num-1) * 0x4000) + 0x3FFF);
-		} else {
-			space.install_write_bank(((bank_num-1) * 0x4000), ((bank_num-1) * 0x4000) + 0x3FFF, bank);
-		}
-	} else {
-		space.nop_readwrite(((bank_num-1) * 0x4000), ((bank_num-1) * 0x4000) + 0x3FFF);
-	}
-#endif
-}
-
-
-void samcoupe_state::samcoupe_install_ext_mem(address_space &space)
-{
-	uint8_t *mem;
-
-	/* bank 3 */
-	if (m_lext >> 6 < m_ram->size() >> 20)
-		mem = &m_ram->pointer()[(m_ram->size() & 0xfffff) + (m_lext >> 6) * 0x100000 + (m_lext & 0x3f) * 0x4000];
-	else
-		mem = nullptr;
-
-	samcoupe_update_bank(space, 3, mem, false);
-
-	/* bank 4 */
-	if (m_hext >> 6 < m_ram->size() >> 20)
-		mem = &m_ram->pointer()[(m_ram->size() & 0xfffff) + (m_hext >> 6) * 0x100000 + (m_hext & 0x3f) * 0x4000];
-	else
-		mem = nullptr;
-
-	samcoupe_update_bank(space, 4, mem, false);
-}
-
-
-void samcoupe_state::samcoupe_update_memory(address_space &space)
-{
-	const int page_mask = ((m_ram->size() & 0xfffff) / 0x4000) - 1;
-	uint8_t *rom = m_region_maincpu->base();
-	uint8_t *memory;
-	int is_readonly;
-
-	/* BANK1 */
-	if (m_lmpr & LMPR_RAM0)   /* Is ram paged in at bank 1 */
-	{
-		if ((m_lmpr & 0x1F) <= page_mask)
-			memory = &m_ram->pointer()[(m_lmpr & page_mask) * 0x4000];
-		else
-			memory = nullptr;  /* Attempt to page in non existent ram region */
-		is_readonly = false;
-	}
-	else
-	{
-		memory = rom;   /* Rom0 paged in */
-		is_readonly = true;
-	}
-	samcoupe_update_bank(space, 1, memory, is_readonly);
-
-
-	/* BANK2 */
-	if (((m_lmpr + 1) & 0x1f) <= page_mask)
-		memory = &m_ram->pointer()[((m_lmpr + 1) & page_mask) * 0x4000];
-	else
-		memory = nullptr;  /* Attempt to page in non existent ram region */
-	samcoupe_update_bank(space, 2, memory, false);
-
-	/* only update bank 3 and 4 when external memory is not enabled */
-	if (m_hmpr & HMPR_MCNTRL)
-	{
-		samcoupe_install_ext_mem(space);
-	}
-	else
-	{
-		/* BANK3 */
-		if ((m_hmpr & 0x1F) <= page_mask )
-			memory = &m_ram->pointer()[(m_hmpr & page_mask)*0x4000];
-		else
-			memory = nullptr;  /* Attempt to page in non existent ram region */
-		samcoupe_update_bank(space, 3, memory, false);
-
-
-		/* BANK4 */
-		if (m_lmpr & LMPR_ROM1)  /* Is Rom1 paged in at bank 4 */
-		{
-			memory = rom + 0x4000;
-			is_readonly = true;
-		}
-		else
-		{
-			if (((m_hmpr + 1) & 0x1f) <= page_mask)
-				memory = &m_ram->pointer()[((m_hmpr + 1) & page_mask) * 0x4000];
-			else
-				memory = nullptr;  /* Attempt to page in non existent ram region */
-			is_readonly = false;
-		}
-		samcoupe_update_bank(space, 4, memory, false);
-	}
-
-	/* video memory location */
-	if (m_vmpr & 0x40)   /* if bit set in 2 bank screen mode */
-		m_videoram = &m_ram->pointer()[((m_vmpr & 0x1e) & page_mask) * 0x4000];
-	else
-		m_videoram = &m_ram->pointer()[((m_vmpr & 0x1f) & page_mask) * 0x4000];
-}
-
-
-void samcoupe_state::samcoupe_ext_mem_w(offs_t offset, uint8_t data)
-{
-	address_space &space_program = m_maincpu->space(AS_PROGRAM);
-
-	if (offset & 1)
-		m_hext = data;
-	else
-		m_lext = data;
-
-	/* external RAM enabled? */
-	if (m_hmpr & HMPR_MCNTRL)
-	{
-		samcoupe_install_ext_mem(space_program);
-	}
-}
-
-
-/***************************************************************************
-    REAL TIME CLOCK
-***************************************************************************/
-
-uint8_t samcoupe_state::samcoupe_rtc_r(offs_t offset)
-{
-	return m_rtc->read(offset >> 12);
-}
-
-
-void samcoupe_state::samcoupe_rtc_w(offs_t offset, uint8_t data)
-{
-	m_rtc->write(offset >> 12, data);
-}
-
-
-/***************************************************************************
-    MOUSE
-***************************************************************************/
-
-TIMER_CALLBACK_MEMBER(samcoupe_state::samcoupe_mouse_reset)
-{
-	m_mouse_index = 0;
-}
-
-uint8_t samcoupe_state::samcoupe_mouse_r()
-{
-	uint8_t result;
-
-	/* on a read, reset the timer */
-	m_mouse_reset->adjust(attotime::from_usec(50));
-
-	/* update when we are about to read the first real values */
-	if (m_mouse_index == 2)
-	{
-		/* update values */
-		int mouse_x = m_io_mouse_x->read();
-		int mouse_y = m_io_mouse_y->read();
-
-		int mouse_dx = m_mouse_x - mouse_x;
-		int mouse_dy = m_mouse_y - mouse_y;
-
-		m_mouse_x = mouse_x;
-		m_mouse_y = mouse_y;
-
-		/* button state */
-		m_mouse_data[2] = m_mouse_buttons->read();
-
-		/* y-axis */
-		m_mouse_data[3] = (mouse_dy & 0xf00) >> 8;
-		m_mouse_data[4] = (mouse_dy & 0x0f0) >> 4;
-		m_mouse_data[5] = (mouse_dy & 0x00f) >> 0;
-
-		/* x-axis */
-		m_mouse_data[6] = (mouse_dx & 0xf00) >> 8;
-		m_mouse_data[7] = (mouse_dx & 0x0f0) >> 4;
-		m_mouse_data[8] = (mouse_dx & 0x00f) >> 0;
-	}
-
-	/* get current value */
-	result = m_mouse_data[m_mouse_index++];
-
-	/* reset if we are at the end */
-	if (m_mouse_index == sizeof(m_mouse_data))
-		m_mouse_index = 1;
-
-	return result;
-}
-
-void samcoupe_state::machine_start()
-{
-	m_mouse_reset = timer_alloc(TIMER_MOUSE_RESET);
-
-	/* schedule our video updates */
-	m_video_update_timer = timer_alloc(TIMER_VIDEO_UPDATE);
-	m_video_update_timer->adjust(m_screen->time_until_pos(0, 0));
-}
-
-/***************************************************************************
-    RESET
-***************************************************************************/
-
-void samcoupe_state::machine_reset()
-{
-	address_space &space = m_maincpu->space(AS_PROGRAM);
-	address_space &spaceio = m_maincpu->space(AS_IO);
-
-	/* initialize state */
-	m_lmpr = 0x0f;      /* ROM0 paged in, ROM1 paged out RAM Banks */
-	m_hmpr = 0x01;
-	m_vmpr = 0x81;
-	m_line_int = 0xff;  /* line interrupts disabled */
-	m_status = 0x1f;    /* no interrupts active */
-
-	/* initialize mouse */
-	m_mouse_index = 0;
-	m_mouse_data[0] = 0xff;
-	m_mouse_data[1] = 0xff;
-
-	if (m_config->read() & 0x01)
-	{
-		/* install RTC */
-		spaceio.install_readwrite_handler(0xef, 0xef, 0, 0, 0xff00, read8sm_delegate(*this, FUNC(samcoupe_state::samcoupe_rtc_r)), write8sm_delegate(*this, FUNC(samcoupe_state::samcoupe_rtc_w)));
-	}
-	else
-	{
-		/* no RTC support */
-		spaceio.unmap_readwrite(0xef, 0xef, 0xff00);
-	}
-
-	/* initialize memory */
-	samcoupe_update_memory(space);
-}
diff -Nru mame-0.222+dfsg.1/src/mame/machine/scramble.cpp mame-0.224+dfsg.1/src/mame/machine/scramble.cpp
--- mame-0.222+dfsg.1/src/mame/machine/scramble.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/scramble.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -448,7 +448,7 @@
 	{
 		int bits[8];
 		for (int i = 0;i < 8;i++)
-			bits[i] = BIT(A, i);;
+			bits[i] = BIT(A, i);
 
 		uint8_t xormask = 0xff;
 		if (bits[0] ^ bits[1]) xormask ^= 0x01;
diff -Nru mame-0.222+dfsg.1/src/mame/machine/special.cpp mame-0.224+dfsg.1/src/mame/machine/special.cpp
--- mame-0.222+dfsg.1/src/mame/machine/special.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/special.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -18,104 +18,95 @@
 /* Driver initialization */
 void special_state::init_special()
 {
-	/* set initialy ROM to be visible on first bank */
-	uint8_t *RAM = m_region_maincpu->base();
-	memset(RAM,0x0000,0x4000); // make first page empty by default
-	m_bank1->configure_entries(1, 2, RAM, 0x0000);
-	m_bank1->configure_entries(0, 2, RAM, 0xc000);
+	m_bank1->configure_entry(0, m_mram);
+	m_bank1->configure_entry(1, m_rom);
 }
 
-uint8_t special_state::specialist_8255_porta_r()
+uint8_t special_state::porta_r()
 {
 	for (int i = 0; i < 8; i++)
-		if (m_io_line[i]->read() != 0xff)
+		if (m_io_keyboard[i]->read() < 0xfc)
 			return (1 << i) ^ 0xff;
 
 	return 0xff;
 }
 
-uint8_t special_state::specialist_8255_portb_r()
+u8 special_state::kbd_r()
 {
-	uint8_t dat = 0xff;
+	u8 data = 0xfc;
 
-	for (int i = 0; i < 8; i++)
-		if (!BIT(m_specialist_8255_porta, i))
-			dat &= m_io_line[i]->read();
-
-	for (int i = 0; i < 4; i++)
-		if (!BIT(m_specialist_8255_portc, i))
-			dat &= m_io_line[8 + i]->read();
+	if (m_porta < 0xff)
+		for (u8 i = 0; i < 8; i++)
+			if (!BIT(m_porta, i))
+				data &= m_io_keyboard[i]->read();
+
+	if (BIT(m_portc, 0, 4) < 0x0f)
+		for (u8 i = 0; i < 4; i++)
+			if (!BIT(m_portc, i))
+				data &= m_io_keyboard[8 + i]->read();
 
 	// shift key
-	if (BIT(~m_io_line[12]->read(), 0))
-		dat &= 0xfd;
-
-	// cassette
-	if (m_cassette->input() > 0.01)
-		dat &= 0xfe;
+	if (m_io_keyboard[12]->read())
+		data |= 2;
 
-	// strobe if a key is pressed
-	if (dat < 0xfc) dat &= 0x7f;
-
-	return dat;
+	return data;
 }
 
-uint8_t special_state::specimx_8255_portb_r()
+uint8_t special_state::portb_r()
 {
-	uint8_t dat = 0xff;
+	u8 data = kbd_r();
 
-	for (int i = 0; i < 8; i++)
-		if (!BIT(m_specialist_8255_porta, i))
-			dat &= m_io_line[i]->read();
+	// strobe if a key is pressed
+	// TODO: this conflicts with function keys - to check
+	if ((data & 0xfc) < 0xfc)
+		data &= 0x7f;
+
+	// cassette
+	if (m_cassette->input() > 0.01)
+		data |= 0x81;
 
-	for (int i = 0; i < 4; i++)
-		if (!BIT(m_specialist_8255_portc, i))
-			dat &= m_io_line[8 + i]->read();
+	return data;
+}
 
-	// shift key
-	if (BIT(~m_io_line[12]->read(), 0))
-		dat &= 0xfd;
+uint8_t special_state::specimx_portb_r()
+{
+	u8 data = kbd_r();
 
 	// cassette
 	if (m_cassette->input() > 0.01)
-		dat &= 0xfe;
+		data |= 0x81;
 
-	return dat;
+	return data;
 }
 
-uint8_t special_state::specialist_8255_portc_r()
+uint8_t special_state::portc_r()
 {
-	for (int i = 0; i < 4; i++)
-		if (m_io_line[8 + i]->read() != 0xff)
+	for (u8 i = 0; i < 4; i++)
+		if (m_io_keyboard[8 + i]->read() < 0xfc)
 			return (1 << i) ^ 0x0f;
 
 	return 0x0f;
 }
 
-void special_state::specialist_8255_porta_w(uint8_t data)
+void special_state::porta_w(uint8_t data)
 {
-	m_specialist_8255_porta = data;
+	m_porta = data;
 }
 
-void special_state::specialist_8255_portb_w(uint8_t data)
+void special_state::portb_w(uint8_t data)
 {
-	m_specialist_8255_portb = data;
+	m_portb = data;
 }
 
-void special_state::specialist_8255_portc_w(uint8_t data)
+void special_state::portc_w(uint8_t data)
 {
-	m_specialist_8255_portc = data;
-
-	m_cassette->output(BIT(data, 7) ? 1 : -1);
-
-	m_dac->write(BIT(data, 5)); //beeper
-
+	specimx_portc_w(data);
 	m_bank1->set_entry(BIT(data, 4));
 }
 
-void special_state::specialistmx_8255_portc_w(uint8_t data)
+void special_state::specimx_portc_w(uint8_t data)
 {
-	m_specialist_8255_portc = data;
+	m_portc = data;
 
 	m_cassette->output(BIT(data, 7) ? 1 : -1);
 
@@ -186,13 +177,9 @@
 			space.unmap_write(0x0000, 0x8fff);
 			space.unmap_write(0x9000, 0xbfff);
 
-			m_bank1->set_base(m_region_maincpu->base() + 0x10000);
-			m_bank2->set_base(m_region_maincpu->base() + 0x19000);
-
-			if (data & 0x80)
-				m_bank3->set_base(ram + 0x1c000);
-			else
-				m_bank3->set_base(ram + 0xc000);
+			m_bank1->set_base(m_rom);
+			m_bank2->set_base(m_rom + 0x9000);
+			m_bank3->set_base(ram + (BIT(data, 7) ? 0x1c000 : 0xc000));
 
 			break;
 	}
@@ -203,17 +190,6 @@
 	specimx_set_bank(offset, data);
 }
 
-MACHINE_START_MEMBER(special_state,specimx)
-{
-	m_drive = 0;
-}
-
-MACHINE_RESET_MEMBER(special_state,specimx)
-{
-	specimx_set_bank(2, 0); // Initiali load ROM disk
-	timer_set(attotime::zero, TIMER_PIT8253_GATES);
-}
-
 uint8_t special_state::specimx_disk_ctrl_r()
 {
 	return 0xff;
@@ -258,10 +234,9 @@
 void special_state::erik_set_bank()
 {
 	uint8_t bank1 = m_RR_register & 3;
-	uint8_t bank2 = (m_RR_register >> 2) & 3;
-	uint8_t bank3 = (m_RR_register >> 4) & 3;
-	uint8_t bank4 = (m_RR_register >> 6) & 3;
-	uint8_t *mem = m_region_maincpu->base();
+	uint8_t bank2 = BIT(m_RR_register, 2, 2);
+	uint8_t bank3 = BIT(m_RR_register, 4, 2);
+	uint8_t bank4 = BIT(m_RR_register, 6, 2);
 	uint8_t *ram = m_ram->pointer();
 	address_space &space = m_maincpu->space(AS_PROGRAM);
 
@@ -281,7 +256,7 @@
 			break;
 		case    0:
 			space.unmap_write(0x0000, 0x3fff);
-			m_bank1->set_base(mem + 0x10000);
+			m_bank1->set_base(m_rom);
 			break;
 	}
 	switch(bank2)
@@ -293,7 +268,7 @@
 			break;
 		case    0:
 			space.unmap_write(0x4000, 0x8fff);
-			m_bank2->set_base(mem + 0x14000);
+			m_bank2->set_base(m_rom + 0x4000);
 			break;
 	}
 	switch(bank3)
@@ -305,7 +280,7 @@
 			break;
 		case    0:
 			space.unmap_write(0x9000, 0xbfff);
-			m_bank3->set_base(mem + 0x19000);
+			m_bank3->set_base(m_rom + 0x9000);
 			break;
 	}
 	switch(bank4)
@@ -313,13 +288,13 @@
 		case    1:
 		case    2:
 		case    3:
-			m_bank4->set_base(ram + 0x10000*(bank4-1) + 0x0c000);
-			m_bank5->set_base(ram + 0x10000*(bank4-1) + 0x0f000);
-			m_bank6->set_base(ram + 0x10000*(bank4-1) + 0x0f800);
+			m_bank4->set_base(ram + 0x10000*(bank4-1) + 0xc000);
+			m_bank5->set_base(ram + 0x10000*(bank4-1) + 0xf000);
+			m_bank6->set_base(ram + 0x10000*(bank4-1) + 0xf800);
 			break;
 		case    0:
 			space.unmap_write(0xc000, 0xefff);
-			m_bank4->set_base(mem + 0x1c000);
+			m_bank4->set_base(m_rom + 0xc000);
 			space.unmap_write(0xf000, 0xf7ff);
 			space.nop_read(0xf000, 0xf7ff);
 			space.install_readwrite_handler(0xf800, 0xf803, 0, 0x7fc, 0, read8sm_delegate(*m_ppi, FUNC(i8255_device::read)), write8sm_delegate(*m_ppi, FUNC(i8255_device::write)));
@@ -334,11 +309,48 @@
 	m_erik_background = 0;
 }
 
-MACHINE_RESET_MEMBER(special_state,erik)
+void special_state::machine_reset()
 {
-	m_RR_register = 0x00;
-	m_RC_register = 0x00;
-	erik_set_bank();
+	if (m_bank6) // erik
+	{
+		m_erik_color_1 = 0;
+		m_erik_color_2 = 0;
+		m_erik_background = 0;
+		m_RR_register = 0x00;
+		m_RC_register = 0x00;
+		erik_set_bank();
+	}
+	else
+	if (m_bank4) // specimx
+	{
+		m_specimx_color = 0xF0;  // default for -bios 1/2, since they don't have colour
+		specimx_set_bank(2, 0); // Initial load ROM disk
+		timer_set(attotime::zero, TIMER_PIT8253_GATES);
+	}
+}
+
+void special_state::machine_start()
+{
+	if (m_bank6) // erik
+	{
+		save_item(NAME(m_erik_color_1));
+		save_item(NAME(m_erik_color_2));
+		save_item(NAME(m_erik_background));
+		save_item(NAME(m_RR_register));
+		save_item(NAME(m_RC_register));
+	}
+	else
+	if (m_bank4) // specimx
+	{
+		m_specimx_colorram = std::make_unique<uint8_t[]>(0x3000);
+		save_pointer(NAME(m_specimx_colorram), 0x3000);
+		save_item(NAME(m_drive));
+		save_item(NAME(m_specimx_color));
+	}
+
+	save_item(NAME(m_porta));
+	save_item(NAME(m_portb));
+	save_item(NAME(m_portc));
 }
 
 uint8_t special_state::erik_rr_reg_r()
@@ -361,7 +373,7 @@
 {
 	m_RC_register = data;
 	m_erik_color_1 = m_RC_register & 7;
-	m_erik_color_2 = (m_RC_register >> 3) & 7;
+	m_erik_color_2 = BIT(m_RC_register, 3, 3);
 	m_erik_background = BIT(m_RC_register, 6) + BIT(m_RC_register, 7) * 4;
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/machine/swim.h mame-0.224+dfsg.1/src/mame/machine/swim.h
--- mame-0.222+dfsg.1/src/mame/machine/swim.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/swim.h	2020-08-26 08:57:19.000000000 +0000
@@ -8,10 +8,11 @@
     early Macs
 
 *********************************************************************/
-
 #ifndef MAME_MACHINE_SWIM_H
 #define MAME_MACHINE_SWIM_H
 
+#pragma once
+
 #include "machine/applefdc.h"
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/machine/taitocchip.cpp mame-0.224+dfsg.1/src/mame/machine/taitocchip.cpp
--- mame-0.222+dfsg.1/src/mame/machine/taitocchip.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/taitocchip.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -226,14 +226,14 @@
 	upd.pb_out_cb().set([this] (u8 data) { m_out_pb_cb(data); });
 	upd.pc_out_cb().set([this] (u8 data) { m_out_pc_cb(data); });
 	upd.pf_out_cb().set([this] (u8 data) { logerror("%s port F written %.2x\n", machine().describe_context(), data); }); // internal? related to locking out the 68k?
-	upd.an0_func().set([this] { return BIT(m_in_ad_cb(), 0); });
-	upd.an1_func().set([this] { return BIT(m_in_ad_cb(), 1); });
-	upd.an2_func().set([this] { return BIT(m_in_ad_cb(), 2); });
-	upd.an3_func().set([this] { return BIT(m_in_ad_cb(), 3); });
-	upd.an4_func().set([this] { return BIT(m_in_ad_cb(), 4); });
-	upd.an5_func().set([this] { return BIT(m_in_ad_cb(), 5); });
-	upd.an6_func().set([this] { return BIT(m_in_ad_cb(), 6); });
-	upd.an7_func().set([this] { return BIT(m_in_ad_cb(), 7); });
+	upd.an0_func().set([this] { return BIT(m_in_ad_cb(), 0) ? 0xff : 0; });
+	upd.an1_func().set([this] { return BIT(m_in_ad_cb(), 1) ? 0xff : 0; });
+	upd.an2_func().set([this] { return BIT(m_in_ad_cb(), 2) ? 0xff : 0; });
+	upd.an3_func().set([this] { return BIT(m_in_ad_cb(), 3) ? 0xff : 0; });
+	upd.an4_func().set([this] { return BIT(m_in_ad_cb(), 4) ? 0xff : 0; });
+	upd.an5_func().set([this] { return BIT(m_in_ad_cb(), 5) ? 0xff : 0; });
+	upd.an6_func().set([this] { return BIT(m_in_ad_cb(), 6) ? 0xff : 0; });
+	upd.an7_func().set([this] { return BIT(m_in_ad_cb(), 7) ? 0xff : 0; });
 
 	ADDRESS_MAP_BANK(config, m_upd4464_bank, 0);
 	m_upd4464_bank->set_map(&taito_cchip_device::cchip_ram_bank);
diff -Nru mame-0.222+dfsg.1/src/mame/machine/teleprinter.h mame-0.224+dfsg.1/src/mame/machine/teleprinter.h
--- mame-0.222+dfsg.1/src/mame/machine/teleprinter.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/teleprinter.h	2020-08-26 08:57:19.000000000 +0000
@@ -11,7 +11,7 @@
 /***************************************************************************
     DEVICE CONFIGURATION MACROS
 ***************************************************************************/
-#define TELEPRINTER_TAG "teleprinter"
+
 #define TELEPRINTER_SCREEN_TAG "tty_screen"
 
 /***************************************************************************
diff -Nru mame-0.222+dfsg.1/src/mame/machine/tigeroad.cpp mame-0.224+dfsg.1/src/mame/machine/tigeroad.cpp
--- mame-0.222+dfsg.1/src/mame/machine/tigeroad.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/tigeroad.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,7 +3,7 @@
 #include "emu.h"
 #include "includes/tigeroad.h"
 
-uint16_t pushman_state::mcu_comm_r(offs_t offset, uint16_t mem_mask)
+u16 pushman_state::mcu_comm_r(offs_t offset, u16 mem_mask)
 {
 	switch (offset & 0x03)
 	{
@@ -20,7 +20,7 @@
 	return 0xffff;
 }
 
-void pushman_state::pushman_mcu_comm_w(offs_t offset, uint16_t data)
+void pushman_state::pushman_mcu_comm_w(offs_t offset, u16 data)
 {
 	switch (offset & 0x01)
 	{
@@ -35,24 +35,24 @@
 	}
 }
 
-void pushman_state::bballs_mcu_comm_w(uint16_t data)
+void pushman_state::bballs_mcu_comm_w(u16 data)
 {
 	m_host_latch = data;
 	m_host_semaphore = true;
 	m_mcu->set_input_line(M68705_IRQ_LINE, ASSERT_LINE);
 }
 
-void pushman_state::mcu_pa_w(uint8_t data)
+void pushman_state::mcu_pa_w(u8 data)
 {
 	m_mcu_output = (m_mcu_output & 0xff00) | (u16(data) & 0x00ff);
 }
 
-void pushman_state::mcu_pb_w(uint8_t data)
+void pushman_state::mcu_pb_w(u8 data)
 {
 	m_mcu_output = (m_mcu_output & 0x00ff) | (u16(data) << 8);
 }
 
-void pushman_state::mcu_pc_w(uint8_t data)
+void pushman_state::mcu_pc_w(u8 data)
 {
 	if (BIT(data, 0))
 	{
diff -Nru mame-0.222+dfsg.1/src/mame/machine/ut88.cpp mame-0.224+dfsg.1/src/mame/machine/ut88.cpp
--- mame-0.222+dfsg.1/src/mame/machine/ut88.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/ut88.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -25,24 +25,6 @@
 
 
 /* Driver initialization */
-void ut88_state::driver_init()
-{
-	/* set initially ROM to be visible on first bank */
-	uint8_t *ram = m_region_maincpu->base();
-	memset(ram, 0x0000, 0x0800); // make first page empty by default
-	m_bank1->configure_entries(1, 2, ram, 0x0000);
-	m_bank1->configure_entries(0, 2, ram, 0xf800);
-}
-
-
-void ut88_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
-{
-	if (id == TIMER_RESET)
-	{
-		m_bank1->set_entry(0);
-	}
-}
-
 void ut88mini_state::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr)
 {
 	if (id == TIMER_UPDATE_DISPLAY)
@@ -89,11 +71,29 @@
 
 void ut88_state::machine_reset()
 {
-	timer_set(attotime::from_usec(10), TIMER_RESET);
-	m_bank1->set_entry(1);
 	m_keyboard_mask = 0;
+	address_space &program = m_maincpu->space(AS_PROGRAM);
+	program.install_rom(0x0000, 0x07ff, m_rom);   // do it here for F3
+	m_rom_shadow_tap = program.install_read_tap(0xf800, 0xffff, "rom_shadow_r",[this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+		{
+			// delete this tap
+			m_rom_shadow_tap->remove();
+
+			// reinstall ram over the rom shadow
+			m_maincpu->space(AS_PROGRAM).install_ram(0x0000, 0x07ff, m_ram);
+		}
+
+		// return the original data
+		return data;
+	});
 }
 
+void ut88_state::machine_start()
+{
+	save_item(NAME(m_keyboard_mask));
+}
 
 uint8_t ut88_state::keyboard_r(offs_t offset)
 {
@@ -113,7 +113,7 @@
 }
 
 
-uint8_t ut88_base_state::tape_r()
+uint8_t ut88_common::tape_r()
 {
 	double level = m_cassette->input();
 	return (level <  0) ? 0 : 0xff;
@@ -122,8 +122,8 @@
 uint8_t ut88mini_state::keyboard_r()
 {
 	// This is real keyboard implementation
-	uint8_t *keyrom1 = m_region_proms->base();
-	uint8_t *keyrom2 = m_region_proms->base()+100;
+	uint8_t *keyrom1 = m_proms->base();
+	uint8_t *keyrom2 = m_proms->base()+100;
 
 	uint8_t key = keyrom2[m_io_line1->read()];
 
@@ -165,6 +165,7 @@
 {
 	m_digits.resolve();
 	timer_set(attotime::from_hz(60), TIMER_UPDATE_DISPLAY);
+	save_item(NAME(m_lcd_digit));
 }
 
 void ut88mini_state::machine_reset()
diff -Nru mame-0.222+dfsg.1/src/mame/machine/vector06.cpp mame-0.224+dfsg.1/src/mame/machine/vector06.cpp
--- mame-0.222+dfsg.1/src/mame/machine/vector06.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/vector06.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -14,23 +14,19 @@
 #include "screen.h"
 
 
-uint8_t vector06_state::vector06_8255_portb_r()
+uint8_t vector06_state::ppi1_portb_r()
 {
 	uint8_t key = 0xff;
-	if (BIT(m_keyboard_mask, 0)) key &= m_line[0]->read();
-	if (BIT(m_keyboard_mask, 1)) key &= m_line[1]->read();
-	if (BIT(m_keyboard_mask, 2)) key &= m_line[2]->read();
-	if (BIT(m_keyboard_mask, 3)) key &= m_line[3]->read();
-	if (BIT(m_keyboard_mask, 4)) key &= m_line[4]->read();
-	if (BIT(m_keyboard_mask, 5)) key &= m_line[5]->read();
-	if (BIT(m_keyboard_mask, 6)) key &= m_line[6]->read();
-	if (BIT(m_keyboard_mask, 7)) key &= m_line[7]->read();
+	for (u8 i = 0; i < 8; i++)
+		if (BIT(m_keyboard_mask, i))
+			key &= m_io_keyboard[i]->read();
+
 	return key;
 }
 
-uint8_t vector06_state::vector06_8255_portc_r()
+uint8_t vector06_state::ppi1_portc_r()
 {
-	uint8_t ret = m_line[8]->read();
+	uint8_t ret = m_io_keyboard[8]->read();
 
 	if (m_cassette->input() > 0)
 		ret |= 0x10;
@@ -38,28 +34,24 @@
 	return ret;
 }
 
-void vector06_state::vector06_8255_porta_w(uint8_t data)
+void vector06_state::ppi1_porta_w(uint8_t data)
 {
 	m_keyboard_mask = data ^ 0xff;
 }
 
-void vector06_state::vector06_set_video_mode(int width)
-{
-	rectangle visarea(0, width+64-1, 0, 256+64-1);
-	m_screen->configure(width+64, 256+64, visarea, m_screen->frame_period().attoseconds());
-}
-
-void vector06_state::vector06_8255_portb_w(uint8_t data)
+void vector06_state::ppi1_portb_w(uint8_t data)
 {
 	m_color_index = data & 0x0f;
-	if ((data & 0x10) != m_video_mode)
+	if (BIT(data, 4) != m_video_mode)
 	{
-		m_video_mode = data & 0x10;
-		vector06_set_video_mode((m_video_mode==0x10) ? 512 : 256);
+		m_video_mode = BIT(data, 4);
+		u16 width = m_video_mode ? 512 : 256;
+		rectangle visarea(0, width+64-1, 0, 256+64-1);
+		m_screen->configure(width+64, 256+64, visarea, m_screen->frame_period().attoseconds());
 	}
 }
 
-void vector06_state::vector06_color_set(uint8_t data)
+void vector06_state::color_set(uint8_t data)
 {
 	uint8_t r = (data & 7) << 5;
 	uint8_t g = ((data >> 3) & 7) << 5;
@@ -68,7 +60,7 @@
 }
 
 
-uint8_t vector06_state::vector06_romdisk_portb_r()
+uint8_t vector06_state::ppi2_portb_r()
 {
 	uint16_t addr = ((m_romdisk_msb & 0x7f) << 8) | m_romdisk_lsb;
 	if ((m_romdisk_msb & 0x80) && m_cart->exists() && addr < m_cart->get_rom_size())
@@ -77,46 +69,42 @@
 		return m_ay->data_r();
 }
 
-void vector06_state::vector06_romdisk_portb_w(uint8_t data)
+void vector06_state::ppi2_portb_w(uint8_t data)
 {
 	m_aylatch = data;
 }
 
-void vector06_state::vector06_romdisk_porta_w(uint8_t data)
+void vector06_state::ppi2_porta_w(uint8_t data)
 {
 	m_romdisk_lsb = data;
 }
 
-void vector06_state::vector06_romdisk_portc_w (uint8_t data)
+void vector06_state::ppi2_portc_w (uint8_t data)
 {
 	if (data & 4)
 		m_ay->address_data_w((data >> 1) & 1, m_aylatch);
 	m_romdisk_msb = data;
 }
 
-INTERRUPT_GEN_MEMBER(vector06_state::vector06_interrupt)
-{
-	device.execute().set_input_line(0, HOLD_LINE);
-}
-
-IRQ_CALLBACK_MEMBER(vector06_state::vector06_irq_callback)
+IRQ_CALLBACK_MEMBER(vector06_state::irq_callback)
 {
 	// Interrupt is RST 7
 	return 0xff;
 }
 
-TIMER_CALLBACK_MEMBER(vector06_state::reset_check_callback)
+INPUT_CHANGED_MEMBER(vector06_state::f11_button)
 {
-	uint8_t val = m_reset->read();
-
-	if (BIT(val, 0))
+	if (newval)
 	{
 		m_romen = true;
 		update_mem();
 		m_maincpu->reset();
 	}
+}
 
-	if (BIT(val, 1))
+INPUT_CHANGED_MEMBER(vector06_state::f12_button)
+{
+	if (newval)
 	{
 		m_romen = false;
 		update_mem();
@@ -124,7 +112,7 @@
 	}
 }
 
-void vector06_state::vector06_disc_w(uint8_t data)
+void vector06_state::disc_w(uint8_t data)
 {
 	floppy_image_device *floppy = nullptr;
 
@@ -146,26 +134,28 @@
 
 void vector06_state::update_mem()
 {
-	if ((m_rambank & 0x10) && m_stack_state) {
-		int sentry = ((m_rambank >> 2) & 3) + 1;
+	if (BIT(m_rambank, 4) && m_stack_state)
+	{
+		u8 sentry = ((m_rambank >> 2) & 3) + 1;
 		m_bank1->set_entry(sentry);
 		m_bank3->set_entry(sentry);
-		m_bank2->set_base(m_ram->pointer() + sentry * 0x10000);
+		m_bank2->set_entry(sentry + 1u);
 	}
-	else {
+	else
+	{
 		m_bank1->set_entry(0);
-		int ventry = 0;
-		if (m_rambank & 0x20)
+		u8 ventry = 0;
+		if (BIT(m_rambank, 5))
 			ventry = (m_rambank & 3) + 1;
 		m_bank3->set_entry(ventry);
 		if (m_romen)
-			m_bank2->set_base(m_region_maincpu->base() + 0x10000);
+			m_bank2->set_entry(0);
 		else
-			m_bank2->set_base(m_ram->pointer());
+			m_bank2->set_entry(1);
 	}
 }
 
-void vector06_state::vector06_ramdisk_w(uint8_t data)
+void vector06_state::ramdisk_w(uint8_t data)
 {
 	const uint8_t oldbank = m_rambank;
 	m_rambank = data;
@@ -173,11 +163,11 @@
 		update_mem();
 }
 
-void vector06_state::vector06_status_callback(uint8_t data)
+void vector06_state::status_callback(uint8_t data)
 {
 	const bool oldstate = m_stack_state;
 	m_stack_state = bool(data & i8080_cpu_device::STATUS_STACK);
-	if (oldstate != m_stack_state && (m_rambank & 0x10))
+	if ((oldstate != m_stack_state) && BIT(m_rambank, 4))
 		update_mem();
 }
 
@@ -188,8 +178,23 @@
 
 void vector06_state::machine_start()
 {
-	m_reset_check_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(vector06_state::reset_check_callback), this));
-	m_reset_check_timer->adjust(attotime::from_hz(50), 0, attotime::from_hz(50));
+	u8 *r = m_ram->pointer();
+
+	m_bank1->configure_entries(0, 5, r, 0x10000);
+	m_bank2->configure_entry(0, m_rom);
+	m_bank2->configure_entries(1, 5, r, 0x10000);
+	m_bank3->configure_entries(0, 5, r + 0xa000, 0x10000);
+
+	save_item(NAME(m_keyboard_mask));
+	save_item(NAME(m_color_index));
+	save_item(NAME(m_romdisk_msb));
+	save_item(NAME(m_romdisk_lsb));
+	save_item(NAME(m_vblank_state));
+	save_item(NAME(m_rambank));
+	save_item(NAME(m_aylatch));
+	save_item(NAME(m_video_mode));
+	save_item(NAME(m_stack_state));
+	save_item(NAME(m_romen));
 }
 
 void vector06_state::machine_reset()
@@ -198,13 +203,12 @@
 	m_rambank = 0;
 	m_romen = true;
 
-	m_bank1->configure_entries(0, 5, m_ram->pointer(), 0x10000);
-	for (int i = 0; i < 5; i++)
-		m_bank3->configure_entry(i, m_ram->pointer() + 0x10000 * i + 0xa000);
-
 	update_mem();
 
 	m_keyboard_mask = 0;
 	m_color_index = 0;
 	m_video_mode = 0;
+	m_bank1->set_entry(0);
+	m_bank2->set_entry(0);
+	m_bank3->set_entry(0);
 }
diff -Nru mame-0.222+dfsg.1/src/mame/machine/vtech2.cpp mame-0.224+dfsg.1/src/mame/machine/vtech2.cpp
--- mame-0.222+dfsg.1/src/mame/machine/vtech2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/vtech2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -27,6 +27,8 @@
 
 void vtech2_state::init_laser()
 {
+	init_waitstates();
+
 	uint8_t *gfx = memregion("gfx2")->base();
 	int i;
 
@@ -68,6 +70,29 @@
 	m_language = m_io_keyboard[5]->read() & 0x30;
 }
 
+void vtech2_state::machine_start()
+{
+	save_item(NAME(m_laser_frame_message));
+	save_item(NAME(m_laser_frame_time));
+	save_item(NAME(m_laser_latch));
+	save_item(NAME(m_laser_track_x2));
+	save_item(NAME(m_laser_fdc_status));
+	save_item(NAME(m_laser_fdc_data));
+	save_item(NAME(m_laser_data));
+	save_item(NAME(m_laser_fdc_edge));
+	save_item(NAME(m_laser_fdc_bits));
+	save_item(NAME(m_laser_drive));
+	save_item(NAME(m_laser_fdc_start));
+	save_item(NAME(m_laser_fdc_write));
+	save_item(NAME(m_laser_fdc_offs));
+	save_item(NAME(m_laser_fdc_latch));
+	save_item(NAME(m_level_old));
+	save_item(NAME(m_cassette_bit));
+	save_item(NAME(m_laser_bg_mode));
+	save_item(NAME(m_laser_two_color));
+	save_item(NAME(m_language));
+	save_item(NAME(m_cart_size));
+}
 
 uint8_t vtech2_state::cart_r(offs_t offset)
 {
@@ -76,6 +101,38 @@
 	return m_cart->read_rom(offset);
 }
 
+// The ULA inserts one waitstate for every read and write in each space (MT 07094, MT 07141)
+void vtech2_state::init_waitstates()
+{
+	address_space &mem = m_maincpu->space(AS_PROGRAM);
+	address_space &io = m_maincpu->space(AS_IO);
+
+	mem.install_read_tap(0x0000, 0xffff, "mem_wait_r", [this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+			m_maincpu->adjust_icount(-1);
+		return data;
+	});
+	mem.install_write_tap(0x0000, 0xffff, "mem_wait_w", [this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+			m_maincpu->adjust_icount(-1);
+		return data;
+	});
+	io.install_read_tap(0x00, 0xff, "io_wait_r", [this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+			m_maincpu->adjust_icount(-1);
+		return data;
+	});
+	io.install_write_tap(0x00, 0xff, "io_wait_w", [this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+			m_maincpu->adjust_icount(-1);
+		return data;
+	});
+}
+
 
 /*************************************************
  * memory mapped I/O read
diff -Nru mame-0.222+dfsg.1/src/mame/machine/wpc.h mame-0.224+dfsg.1/src/mame/machine/wpc.h
--- mame-0.222+dfsg.1/src/mame/machine/wpc.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/wpc.h	2020-08-26 08:57:19.000000000 +0000
@@ -12,6 +12,7 @@
 #pragma once
 
 
+// Note: the numbers here are offsets from the WPC device base address, which is 0x3FB0 on the WPC_AN hardware
 /* A = Alpha-numeric
  * M = DMD
  * F = Fliptronics
diff -Nru mame-0.222+dfsg.1/src/mame/machine/x68k_kbd.cpp mame-0.224+dfsg.1/src/mame/machine/x68k_kbd.cpp
--- mame-0.222+dfsg.1/src/mame/machine/x68k_kbd.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/x68k_kbd.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -112,149 +112,149 @@
 
 	PORT_START("LINE0")
 	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_UNUSED) // unused
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("ESC")                              PORT_CODE(KEYCODE_ESC)         PORT_CHAR(27)                     // Escape
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("1  !  \xE3\x81\xAC")               PORT_CODE(KEYCODE_1)           PORT_CHAR('1') PORT_CHAR('!')     // 1 ! ぬ (nu)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("2  \"  \xE3\x81\xB5")              PORT_CODE(KEYCODE_2)           PORT_CHAR('2') PORT_CHAR('\"')    // 2 " ふ (fu)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("3  #  \xE3\x81\x82  \xE3\x81\x81") PORT_CODE(KEYCODE_3)           PORT_CHAR('3') PORT_CHAR('#')     // 3 # あ ぁ (a)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("4  $  \xE3\x81\x86  \xE3\x81\x85") PORT_CODE(KEYCODE_4)           PORT_CHAR('4') PORT_CHAR('$')     // 4 $ う ぅ (u)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("5  %  \xE3\x81\x88  \xE3\x81\x87") PORT_CODE(KEYCODE_5)           PORT_CHAR('5') PORT_CHAR('%')     // 5 % え ぇ (e)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("6  &  \xE3\x81\x8A  \xE3\x81\x89") PORT_CODE(KEYCODE_6)           PORT_CHAR('6') PORT_CHAR('&')     // 6 & お ぉ (o)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"ESC")                   PORT_CODE(KEYCODE_ESC)        PORT_CHAR(27)                       // Escape
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"1  !  \u306c")          PORT_CODE(KEYCODE_1)          PORT_CHAR('1') PORT_CHAR('!')       // 1 ! ぬ (nu)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"2  \"  \u3075")         PORT_CODE(KEYCODE_2)          PORT_CHAR('2') PORT_CHAR('\"')      // 2 " ふ (fu)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"3  #  \u3042  \u3041")  PORT_CODE(KEYCODE_3)          PORT_CHAR('3') PORT_CHAR('#')       // 3 # あ ぁ (a)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"4  $  \u3046  \u3045")  PORT_CODE(KEYCODE_4)          PORT_CHAR('4') PORT_CHAR('$')       // 4 $ う ぅ (u)
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"5  %  \u3048  \u3047")  PORT_CODE(KEYCODE_5)          PORT_CHAR('5') PORT_CHAR('%')       // 5 % え ぇ (e)
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"6  &  \u304a  \u3049")  PORT_CODE(KEYCODE_6)          PORT_CHAR('6') PORT_CHAR('&')       // 6 & お ぉ (o)
 
 	PORT_START("LINE1")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("7  \'  \xE3\x82\x84  \xE3\x82\x83") PORT_CODE(KEYCODE_7)          PORT_CHAR('7') PORT_CHAR('\'')    // 7 ' や ゃ (ya)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("8  (  \xE3\x82\x86  \xE3\x82\x85")  PORT_CODE(KEYCODE_8)          PORT_CHAR('8') PORT_CHAR('(')     // 8 ( ゆ ゅ (yu)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("9  )  \xE3\x82\x88  \xE3\x82\x87")  PORT_CODE(KEYCODE_9)          PORT_CHAR('9') PORT_CHAR(')')     // 9 ) よ ょ (yo)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("0  \xE3\x82\x8F  \xE3\x82\x92")     PORT_CODE(KEYCODE_0)          PORT_CHAR('0')                    // 0 わ を (wa wo)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("-  =  \xE3\x81\xBB")                PORT_CODE(KEYCODE_MINUS)      PORT_CHAR('-') PORT_CHAR('=')     // - = ほ (ho)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("^  \xE3\x81\xB8")                   PORT_CODE(KEYCODE_EQUALS)     PORT_CHAR('^')                    // ^ へ (he)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("\xC2\xA5  |  \xE3\x83\xBC")         PORT_CODE(KEYCODE_TILDE)      PORT_CHAR('\\') PORT_CHAR('|')    // Yen | ー (sound extension)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("BS")                                PORT_CODE(KEYCODE_BACKSPACE)  PORT_CHAR(8)                      // BS (backspace)
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"7  \'  \u3084  \u3083") PORT_CODE(KEYCODE_7)          PORT_CHAR('7') PORT_CHAR('\'')      // 7 ' や ゃ (ya)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"8  (  \u3086  \u3085")  PORT_CODE(KEYCODE_8)          PORT_CHAR('8') PORT_CHAR('(')       // 8 ( ゆ ゅ (yu)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"9  )  \u3088  \u3087")  PORT_CODE(KEYCODE_9)          PORT_CHAR('9') PORT_CHAR(')')       // 9 ) よ ょ (yo)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"0  \u308f  \u3092")     PORT_CODE(KEYCODE_0)          PORT_CHAR('0')                      // 0 わ を (wa wo)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"-  =  \u307b")          PORT_CODE(KEYCODE_MINUS)      PORT_CHAR('-') PORT_CHAR('=')       // - = ほ (ho)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"^  \u3078")             PORT_CODE(KEYCODE_EQUALS)     PORT_CHAR('^')                      // ^ へ (he)
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"¥  |  \u30fc")          PORT_CODE(KEYCODE_TILDE)      PORT_CHAR('\\') PORT_CHAR('|')      // Yen | ー (sound extension)
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"BS")                    PORT_CODE(KEYCODE_BACKSPACE)  PORT_CHAR(8)                        // BS (backspace)
 
 	PORT_START("LINE2")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("TAB")                               PORT_CODE(KEYCODE_TAB)        PORT_CHAR(9)                      // TAB
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Q  \xE3\x81\x9F")                   PORT_CODE(KEYCODE_Q)          PORT_CHAR('q') PORT_CHAR('Q')     // Q た (ta)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("W  \xE3\x81\xA6")                   PORT_CODE(KEYCODE_W)          PORT_CHAR('w') PORT_CHAR('W')     // W て (te)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("E  \xE3\x81\x84  \xE3\x81\x83")     PORT_CODE(KEYCODE_E)          PORT_CHAR('e') PORT_CHAR('E')     // E い ぃ (i)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("R  \xE3\x81\x99")                   PORT_CODE(KEYCODE_R)          PORT_CHAR('r') PORT_CHAR('R')     // R す (su)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("T  \xE3\x81\x8B")                   PORT_CODE(KEYCODE_T)          PORT_CHAR('t') PORT_CHAR('T')     // T か (ka)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Y  \xE3\x82\x93")                   PORT_CODE(KEYCODE_Y)          PORT_CHAR('y') PORT_CHAR('Y')     // Y ん (n)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("U  \xE3\x81\xAA")                   PORT_CODE(KEYCODE_U)          PORT_CHAR('u') PORT_CHAR('U')     // U な (na)
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"TAB")                   PORT_CODE(KEYCODE_TAB)        PORT_CHAR(9)                        // TAB
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Q  \u305f")             PORT_CODE(KEYCODE_Q)          PORT_CHAR('q') PORT_CHAR('Q')       // Q た (ta)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"W  \u3066")             PORT_CODE(KEYCODE_W)          PORT_CHAR('w') PORT_CHAR('W')       // W て (te)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"E  \u3044  \u3043")     PORT_CODE(KEYCODE_E)          PORT_CHAR('e') PORT_CHAR('E')       // E い ぃ (i)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"R  \u3059")             PORT_CODE(KEYCODE_R)          PORT_CHAR('r') PORT_CHAR('R')       // R す (su)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"T  \u304b")             PORT_CODE(KEYCODE_T)          PORT_CHAR('t') PORT_CHAR('T')       // T か (ka)
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Y  \u3093")             PORT_CODE(KEYCODE_Y)          PORT_CHAR('y') PORT_CHAR('Y')       // Y ん (n)
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"U  \u306a")             PORT_CODE(KEYCODE_U)          PORT_CHAR('u') PORT_CHAR('U')       // U な (na)
 
 	PORT_START("LINE3")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("I  \xE3\x81\xAB")                   PORT_CODE(KEYCODE_I)          PORT_CHAR('i') PORT_CHAR('I')     // I に (ni)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("O  \xE3\x82\x89")                   PORT_CODE(KEYCODE_O)          PORT_CHAR('o') PORT_CHAR('O')     // O ら (ra)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("P  \xE3\x81\x9B")                   PORT_CODE(KEYCODE_P)          PORT_CHAR('p') PORT_CHAR('P')     // P せ (se)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("@  `  \xE3\x82\x9B")                PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR('@') PORT_CHAR('`')     // @ ` ゛ (dakuten)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("[  {  \xE3\x82\x9C \xE3\x80\x8C")   PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('[') PORT_CHAR('{')     // [ { ゜ 「 (handakuten kagikakko)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )                                                 PORT_CODE(KEYCODE_ENTER)      PORT_CHAR(13)                     // Return
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("A  \xE3\x81\xA1")                   PORT_CODE(KEYCODE_A)          PORT_CHAR('a') PORT_CHAR('A')     // A ち (chi)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("S  \xE3\x81\xA8")                   PORT_CODE(KEYCODE_S)          PORT_CHAR('s') PORT_CHAR('S')     // S と (to)
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"I  \u306b")             PORT_CODE(KEYCODE_I)          PORT_CHAR('i') PORT_CHAR('I')       // I に (ni)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"O  \u3089")             PORT_CODE(KEYCODE_O)          PORT_CHAR('o') PORT_CHAR('O')       // O ら (ra)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"P  \u305b")             PORT_CODE(KEYCODE_P)          PORT_CHAR('p') PORT_CHAR('P')       // P せ (se)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"@  `  \u309b")          PORT_CODE(KEYCODE_OPENBRACE)  PORT_CHAR('@') PORT_CHAR('`')       // @ ` ゛ (dakuten)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"[  {  \u309c \u300c")   PORT_CODE(KEYCODE_CLOSEBRACE) PORT_CHAR('[') PORT_CHAR('{')       // [ { ゜ 「 (handakuten kagikakko)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )                                       PORT_CODE(KEYCODE_ENTER)      PORT_CHAR(13)                       // Return
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"A  \u3061")             PORT_CODE(KEYCODE_A)          PORT_CHAR('a') PORT_CHAR('A')       // A ち (chi)
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"S  \u3068")             PORT_CODE(KEYCODE_S)          PORT_CHAR('s') PORT_CHAR('S')       // S と (to)
 
 	PORT_START("LINE4")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("D  \xE3\x81\x97")                   PORT_CODE(KEYCODE_D)          PORT_CHAR('d') PORT_CHAR('D')     // D し (shi)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("F  \xE3\x81\xAF")                   PORT_CODE(KEYCODE_F)          PORT_CHAR('f') PORT_CHAR('F')     // F は (ha)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("G  \xE3\x81\x8D")                   PORT_CODE(KEYCODE_G)          PORT_CHAR('g') PORT_CHAR('G')     // G き (ki)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("H  \xE3\x81\x8F")                   PORT_CODE(KEYCODE_H)          PORT_CHAR('h') PORT_CHAR('H')     // H く (ku)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("J  \xE3\x81\xBE")                   PORT_CODE(KEYCODE_J)          PORT_CHAR('j') PORT_CHAR('J')     // J ま (ma)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("K  \xE3\x81\xAE")                   PORT_CODE(KEYCODE_K)          PORT_CHAR('k') PORT_CHAR('K')     // K の (no)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("L  \xE3\x82\x8A")                   PORT_CODE(KEYCODE_L)          PORT_CHAR('l') PORT_CHAR('L')     // L り (ri)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(";  +  \xE3\x82\x8C")                PORT_CODE(KEYCODE_COLON)      PORT_CHAR(';') PORT_CHAR('+')     // ; + れ (re)
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"D  \u3057")             PORT_CODE(KEYCODE_D)          PORT_CHAR('d') PORT_CHAR('D')       // D し (shi)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"F  \u306f")             PORT_CODE(KEYCODE_F)          PORT_CHAR('f') PORT_CHAR('F')       // F は (ha)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"G  \u304d")             PORT_CODE(KEYCODE_G)          PORT_CHAR('g') PORT_CHAR('G')       // G き (ki)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"H  \u304f")             PORT_CODE(KEYCODE_H)          PORT_CHAR('h') PORT_CHAR('H')       // H く (ku)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"J  \u307e")             PORT_CODE(KEYCODE_J)          PORT_CHAR('j') PORT_CHAR('J')       // J ま (ma)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"K  \u306e")             PORT_CODE(KEYCODE_K)          PORT_CHAR('k') PORT_CHAR('K')       // K の (no)
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"L  \u308a")             PORT_CODE(KEYCODE_L)          PORT_CHAR('l') PORT_CHAR('L')       // L り (ri)
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8";  +  \u308c")          PORT_CODE(KEYCODE_COLON)      PORT_CHAR(';') PORT_CHAR('+')       // ; + れ (re)
 
 	PORT_START("LINE5")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(":  *  \xE3\x81\x91")                PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR(':') PORT_CHAR('*')     // : *　け (ke)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("]  }  \xE3\x82\x80  \xE3\x80\x8D")  PORT_CODE(KEYCODE_BACKSLASH)  PORT_CHAR(']') PORT_CHAR('}')     // ] } む 」 (mu kagikakko)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Z  \xE3\x81\xA4  \xE3\x81\xA3")     PORT_CODE(KEYCODE_Z)          PORT_CHAR('z') PORT_CHAR('Z')     // Z つ っ (tsu)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("X  \xE3\x81\x95")                   PORT_CODE(KEYCODE_X)          PORT_CHAR('x') PORT_CHAR('X')     // X さ (sa)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("C  \xE3\x81\x9D")                   PORT_CODE(KEYCODE_C)          PORT_CHAR('c') PORT_CHAR('C')     // C そ (so)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("V  \xE3\x81\xB2")                   PORT_CODE(KEYCODE_V)          PORT_CHAR('v') PORT_CHAR('V')     // V ひ (hi)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("B  \xE3\x81\x93")                   PORT_CODE(KEYCODE_B)          PORT_CHAR('b') PORT_CHAR('B')     // B こ (ko)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("N  \xE3\x81\xBF")                   PORT_CODE(KEYCODE_N)          PORT_CHAR('n') PORT_CHAR('N')     // N み (mi)
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8":  *  \u3051")          PORT_CODE(KEYCODE_QUOTE)      PORT_CHAR(':') PORT_CHAR('*')       // : *　け (ke)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"]  }  \u3080  \u300d")  PORT_CODE(KEYCODE_BACKSLASH)  PORT_CHAR(']') PORT_CHAR('}')       // ] } む 」 (mu kagikakko)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Z  \u3064  \u3063")     PORT_CODE(KEYCODE_Z)          PORT_CHAR('z') PORT_CHAR('Z')       // Z つ っ (tsu)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"X  \u3055")             PORT_CODE(KEYCODE_X)          PORT_CHAR('x') PORT_CHAR('X')       // X さ (sa)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"C  \u305d")             PORT_CODE(KEYCODE_C)          PORT_CHAR('c') PORT_CHAR('C')       // C そ (so)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"V  \u3072")             PORT_CODE(KEYCODE_V)          PORT_CHAR('v') PORT_CHAR('V')       // V ひ (hi)
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"B  \u3053")             PORT_CODE(KEYCODE_B)          PORT_CHAR('b') PORT_CHAR('B')       // B こ (ko)
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"N  \u307f")             PORT_CODE(KEYCODE_N)          PORT_CHAR('n') PORT_CHAR('N')       // N み (mi)
 
 	PORT_START("LINE6")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("M  \xE3\x82\x82")                   PORT_CODE(KEYCODE_M)          PORT_CHAR('m') PORT_CHAR('M')     // M も (mo)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(",  <  \xE3\x81\xAD  \xE3\x80\x81")  PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(',') PORT_CHAR('<')     // , < ね 、 (ne comma)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(".  >  \xE3\x82\x8B  \xE3\x80\x82")  PORT_CODE(KEYCODE_STOP)       PORT_CHAR('.') PORT_CHAR('>')     // . > る 。 (ru stop)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("/  ?  \xE3\x82\x81  \xE3\x83\xBB")  PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('/') PORT_CHAR('?')     // / ? め ・ (me interpunct)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("_  \xE3\x82\x8D")                                                 PORT_CHAR('_')                    // Underscore (shifted only?) ろ (ro)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Space")                             PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')                    // Space
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("HOME")                              PORT_CODE(KEYCODE_HOME)       PORT_CHAR(UCHAR_MAMEKEY(HOME))    // HOME
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("DEL")                               PORT_CODE(KEYCODE_DEL)        PORT_CHAR(UCHAR_MAMEKEY(DEL))     // DEL
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"M  \u3082")             PORT_CODE(KEYCODE_M)          PORT_CHAR('m') PORT_CHAR('M')       // M も (mo)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8",  <  \u306d  \u3001")  PORT_CODE(KEYCODE_COMMA)      PORT_CHAR(',') PORT_CHAR('<')       // , < ね 、 (ne comma)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8".  >  \u308b  \u3002")  PORT_CODE(KEYCODE_STOP)       PORT_CHAR('.') PORT_CHAR('>')       // . > る 。 (ru stop)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"/  ?  \u3081  \u30fb")  PORT_CODE(KEYCODE_SLASH)      PORT_CHAR('/') PORT_CHAR('?')       // / ? め ・ (me interpunct)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"_  \u308d")                                           PORT_CHAR('_')                      // Underscore (shifted only?) ろ (ro)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Space")                 PORT_CODE(KEYCODE_SPACE)      PORT_CHAR(' ')                      // Space
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"HOME")                  PORT_CODE(KEYCODE_HOME)       PORT_CHAR(UCHAR_MAMEKEY(HOME))      // HOME
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"DEL")                   PORT_CODE(KEYCODE_DEL)        PORT_CHAR(UCHAR_MAMEKEY(DEL))       // DEL
 
 	PORT_START("LINE7")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("ROLL UP")                           PORT_CODE(KEYCODE_PGUP)       PORT_CHAR(UCHAR_MAMEKEY(PGUP))    // ROLL UP
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("ROLL DOWN")                         PORT_CODE(KEYCODE_PGDN)       PORT_CHAR(UCHAR_MAMEKEY(PGDN))    // ROLL DOWN
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("UNDO")                              PORT_CODE(KEYCODE_END)        PORT_CHAR(UCHAR_MAMEKEY(END))     // UNDO
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Cursor Left")                       PORT_CODE(KEYCODE_LEFT)       PORT_CHAR(UCHAR_MAMEKEY(LEFT))    // Left
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Cursor Up")                         PORT_CODE(KEYCODE_UP)         PORT_CHAR(UCHAR_MAMEKEY(UP))      // Up
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Cursor Right")                      PORT_CODE(KEYCODE_RIGHT)      PORT_CHAR(UCHAR_MAMEKEY(RIGHT))   // Right
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Cursor Down")                       PORT_CODE(KEYCODE_DOWN)       PORT_CHAR(UCHAR_MAMEKEY(DOWN))    // Down
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey CLR")                        PORT_CODE(KEYCODE_NUMLOCK)    PORT_CHAR(UCHAR_MAMEKEY(NUMLOCK)) // CLR (clear)
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"ROLL UP")               PORT_CODE(KEYCODE_PGUP)       PORT_CHAR(UCHAR_MAMEKEY(PGUP))      // ROLL UP
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"ROLL DOWN")             PORT_CODE(KEYCODE_PGDN)       PORT_CHAR(UCHAR_MAMEKEY(PGDN))      // ROLL DOWN
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"UNDO")                  PORT_CODE(KEYCODE_END)        PORT_CHAR(UCHAR_MAMEKEY(END))       // UNDO
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Cursor Left")           PORT_CODE(KEYCODE_LEFT)       PORT_CHAR(UCHAR_MAMEKEY(LEFT))      // Left
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Cursor Up")             PORT_CODE(KEYCODE_UP)         PORT_CHAR(UCHAR_MAMEKEY(UP))        // Up
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Cursor Right")          PORT_CODE(KEYCODE_RIGHT)      PORT_CHAR(UCHAR_MAMEKEY(RIGHT))     // Right
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Cursor Down")           PORT_CODE(KEYCODE_DOWN)       PORT_CHAR(UCHAR_MAMEKEY(DOWN))      // Down
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey CLR")            PORT_CODE(KEYCODE_NUMLOCK)    PORT_CHAR(UCHAR_MAMEKEY(NUMLOCK))   // CLR (clear)
 
 	PORT_START("LINE8")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey /")                          PORT_CODE(KEYCODE_SLASH_PAD)  PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD)) // / (numpad)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey *")                          PORT_CODE(KEYCODE_ASTERISK)   PORT_CHAR(UCHAR_MAMEKEY(ASTERISK))  // * (numpad)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey -")                          PORT_CODE(KEYCODE_MINUS_PAD)  PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) // - (numpad)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey 7")                          PORT_CODE(KEYCODE_7_PAD)      PORT_CHAR(UCHAR_MAMEKEY(7_PAD))     // 7 (numpad)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey 8")                          PORT_CODE(KEYCODE_8_PAD)      PORT_CHAR(UCHAR_MAMEKEY(8_PAD))     // 8 (numpad)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey 9")                          PORT_CODE(KEYCODE_9_PAD)      PORT_CHAR(UCHAR_MAMEKEY(9_PAD))     // 9 (numpad)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey +")                          PORT_CODE(KEYCODE_PLUS_PAD)   PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD))  // + (numpad)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey 4")                          PORT_CODE(KEYCODE_4_PAD)      PORT_CHAR(UCHAR_MAMEKEY(4_PAD))     // 4 (numpad)
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey /")              PORT_CODE(KEYCODE_SLASH_PAD)  PORT_CHAR(UCHAR_MAMEKEY(SLASH_PAD)) // / (numpad)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey *")              PORT_CODE(KEYCODE_ASTERISK)   PORT_CHAR(UCHAR_MAMEKEY(ASTERISK))  // * (numpad)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey -")              PORT_CODE(KEYCODE_MINUS_PAD)  PORT_CHAR(UCHAR_MAMEKEY(MINUS_PAD)) // - (numpad)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey 7")              PORT_CODE(KEYCODE_7_PAD)      PORT_CHAR(UCHAR_MAMEKEY(7_PAD))     // 7 (numpad)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey 8")              PORT_CODE(KEYCODE_8_PAD)      PORT_CHAR(UCHAR_MAMEKEY(8_PAD))     // 8 (numpad)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey 9")              PORT_CODE(KEYCODE_9_PAD)      PORT_CHAR(UCHAR_MAMEKEY(9_PAD))     // 9 (numpad)
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey +")              PORT_CODE(KEYCODE_PLUS_PAD)   PORT_CHAR(UCHAR_MAMEKEY(PLUS_PAD))  // + (numpad)
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey 4")              PORT_CODE(KEYCODE_4_PAD)      PORT_CHAR(UCHAR_MAMEKEY(4_PAD))     // 4 (numpad)
 
 	PORT_START("LINE9")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey 5")                          PORT_CODE(KEYCODE_5_PAD)      PORT_CHAR(UCHAR_MAMEKEY(5_PAD))     // 5 (numpad)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey 6")                          PORT_CODE(KEYCODE_6_PAD)      PORT_CHAR(UCHAR_MAMEKEY(6_PAD))     // 6 (numpad)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey =")                                                                                            // = (numpad)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey 1")                          PORT_CODE(KEYCODE_1_PAD)      PORT_CHAR(UCHAR_MAMEKEY(1_PAD))     // 1 (numpad)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey 2")                          PORT_CODE(KEYCODE_2_PAD)      PORT_CHAR(UCHAR_MAMEKEY(2_PAD))     // 2 (numpad)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey 3")                          PORT_CODE(KEYCODE_3_PAD)      PORT_CHAR(UCHAR_MAMEKEY(3_PAD))     // 3 (numpad)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey ENTER")                      PORT_CODE(KEYCODE_ENTER_PAD)  PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD)) // Enter (numpad)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey 0")                          PORT_CODE(KEYCODE_0_PAD)      PORT_CHAR(UCHAR_MAMEKEY(0_PAD))     // 0 (numpad)
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey 5")              PORT_CODE(KEYCODE_5_PAD)      PORT_CHAR(UCHAR_MAMEKEY(5_PAD))     // 5 (numpad)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey 6")              PORT_CODE(KEYCODE_6_PAD)      PORT_CHAR(UCHAR_MAMEKEY(6_PAD))     // 6 (numpad)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey =")                                                                                // = (numpad)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey 1")              PORT_CODE(KEYCODE_1_PAD)      PORT_CHAR(UCHAR_MAMEKEY(1_PAD))     // 1 (numpad)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey 2")              PORT_CODE(KEYCODE_2_PAD)      PORT_CHAR(UCHAR_MAMEKEY(2_PAD))     // 2 (numpad)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey 3")              PORT_CODE(KEYCODE_3_PAD)      PORT_CHAR(UCHAR_MAMEKEY(3_PAD))     // 3 (numpad)
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey ENTER")          PORT_CODE(KEYCODE_ENTER_PAD)  PORT_CHAR(UCHAR_MAMEKEY(ENTER_PAD)) // Enter (numpad)
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey 0")              PORT_CODE(KEYCODE_0_PAD)      PORT_CHAR(UCHAR_MAMEKEY(0_PAD))     // 0 (numpad)
 
 	PORT_START("LINEA")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey ,")                                                                                            // , (numpad)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Tenkey .")                          PORT_CODE(KEYCODE_DEL_PAD)    PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD))   // . (numpad)
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("\xE8\xA8\x98\xE5\x8F\xB7\xE5\x85\xA5\xE5\x8A\x9B (Symbol input)")                                     // 記号入力 (Kigou nyuuryoku - Symbol input)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("\xE7\x99\xBB\xE9\x8C\xB2 (Register)")                                                                 // 登録 (Touroku - Register)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Help")                                                                                                // Help
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("XF1")                               PORT_CODE(KEYCODE_F11)        PORT_CHAR(UCHAR_MAMEKEY(F11))       // XF1
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("XF2")                               PORT_CODE(KEYCODE_F12)        PORT_CHAR(UCHAR_MAMEKEY(F12))       // XF2
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("XF3")                                                                                                 // XF3
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey ,")                                                                                // , (numpad)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Tenkey .")              PORT_CODE(KEYCODE_DEL_PAD)    PORT_CHAR(UCHAR_MAMEKEY(DEL_PAD))   // . (numpad)
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"\u8a18\u53f7\u5165\u529b (Symbol input)")                                                 // 記号入力 (Kigou nyuuryoku - Symbol input)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"\u767b\u9332 (Register)")                                                                 // 登録 (Touroku - Register)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Help")                                                                                    // Help
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"XF1")                   PORT_CODE(KEYCODE_F11)        PORT_CHAR(UCHAR_MAMEKEY(F11))       // XF1
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"XF2")                   PORT_CODE(KEYCODE_F12)        PORT_CHAR(UCHAR_MAMEKEY(F12))       // XF2
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"XF3")                                                                                     // XF3
 
 	PORT_START("LINEB")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("XF4")                                                                                                 // XF4
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("XF5")                               PORT_CODE(KEYCODE_RALT)                                           // XF5
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("\xE3\x81\x8B\xE3\x81\xAA (Kana)")                                                                     // かな (Kana)
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("\xE3\x83\xAD\xE3\x83\xBC\xE3\x83\x9E\xE5\xAD\x97 (Romaji)")                                           // ローマ字 (Romaji)
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("\xE3\x82\xB3\xE3\x83\xBC\xE3\x83\x89\xE5\x85\xA5\xE5\x8A\x9B (Code input)")                           // コード入力 (Code nyuuryoku - Code input)
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("CAPS")                              PORT_CODE(KEYCODE_CAPSLOCK)  PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))   // CAPS (Caps lock)
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("INS")                               PORT_CODE(KEYCODE_INSERT)    PORT_CHAR(UCHAR_MAMEKEY(INSERT))     // INS (Insert)
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("\xE3\x81\xB2\xE3\x82\x89\xE3\x81\x8C\xE3\x81\xAA (Hiragana)") PORT_CODE(KEYCODE_LALT)                 // ひらがな (Hiragana)
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"XF4")                                                                                     // XF4
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"XF5")                   PORT_CODE(KEYCODE_RALT)                                           // XF5
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"\u304b\u306a (Kana)")                                                                     // かな (Kana)
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"\u30ed\u30fc\u30de\u5b57 (Romaji)")                                                       // ローマ字 (Romaji)
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"\u30b3\u30fc\u30c9\u5165\u529b (Code input)")                                             // コード入力 (Code nyuuryoku - Code input)
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"CAPS")                  PORT_CODE(KEYCODE_CAPSLOCK)  PORT_CHAR(UCHAR_MAMEKEY(CAPSLOCK))   // CAPS (Caps lock)
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"INS")                   PORT_CODE(KEYCODE_INSERT)    PORT_CHAR(UCHAR_MAMEKEY(INSERT))     // INS (Insert)
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"\u3072\u3089\u304c\u306a (Hiragana)") PORT_CODE(KEYCODE_LALT)                             // ひらがな (Hiragana)
 
 	PORT_START("LINEC")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("\xE5\x85\xA8\xE8\xA7\x92 (Fullwidth)") PORT_CODE(KEYCODE_RCONTROL)                                    // 全角 (Zenkaku - Fullwidth)
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Break")  /* Break */
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("Copy")  /* Copy */
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("F1")                                PORT_CODE(KEYCODE_F1)         PORT_CHAR(UCHAR_MAMEKEY(F1))        // F1
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("F2")                                PORT_CODE(KEYCODE_F2)         PORT_CHAR(UCHAR_MAMEKEY(F2))        // F2
-	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("F3")                                PORT_CODE(KEYCODE_F3)         PORT_CHAR(UCHAR_MAMEKEY(F3))        // F3
-	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("F4")                                PORT_CODE(KEYCODE_F4)         PORT_CHAR(UCHAR_MAMEKEY(F4))        // F4
-	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("F5")                                PORT_CODE(KEYCODE_F5)         PORT_CHAR(UCHAR_MAMEKEY(F5))        // F5
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"\u5168\u89d2 (Fullwidth)") PORT_CODE(KEYCODE_RCONTROL)                                    // 全角 (Zenkaku - Fullwidth)
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Break")                                                                                   // Break
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"Copy")                                                                                    // Copy
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"F1")                    PORT_CODE(KEYCODE_F1)         PORT_CHAR(UCHAR_MAMEKEY(F1))        // F1
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"F2")                    PORT_CODE(KEYCODE_F2)         PORT_CHAR(UCHAR_MAMEKEY(F2))        // F2
+	PORT_BIT( 0x20, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"F3")                    PORT_CODE(KEYCODE_F3)         PORT_CHAR(UCHAR_MAMEKEY(F3))        // F3
+	PORT_BIT( 0x40, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"F4")                    PORT_CODE(KEYCODE_F4)         PORT_CHAR(UCHAR_MAMEKEY(F4))        // F4
+	PORT_BIT( 0x80, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"F5")                    PORT_CODE(KEYCODE_F5)         PORT_CHAR(UCHAR_MAMEKEY(F5))        // F5
 
 	PORT_START("LINED")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("F6")                                PORT_CODE(KEYCODE_F6)         PORT_CHAR(UCHAR_MAMEKEY(F6))        // F6
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("F7")                                PORT_CODE(KEYCODE_F7)         PORT_CHAR(UCHAR_MAMEKEY(F7))        // F7
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("F8")                                PORT_CODE(KEYCODE_F8)         PORT_CHAR(UCHAR_MAMEKEY(F8))        // F8
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("F9")                                PORT_CODE(KEYCODE_F9)         PORT_CHAR(UCHAR_MAMEKEY(F9))        // F9
-	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("F10")                               PORT_CODE(KEYCODE_F10)        PORT_CHAR(UCHAR_MAMEKEY(F10))       // F10
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"F6")                    PORT_CODE(KEYCODE_F6)         PORT_CHAR(UCHAR_MAMEKEY(F6))        // F6
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"F7")                    PORT_CODE(KEYCODE_F7)         PORT_CHAR(UCHAR_MAMEKEY(F7))        // F7
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"F8")                    PORT_CODE(KEYCODE_F8)         PORT_CHAR(UCHAR_MAMEKEY(F8))        // F8
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"F9")                    PORT_CODE(KEYCODE_F9)         PORT_CHAR(UCHAR_MAMEKEY(F9))        // F9
+	PORT_BIT( 0x10, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"F10")                   PORT_CODE(KEYCODE_F10)        PORT_CHAR(UCHAR_MAMEKEY(F10))       // F10
 	// 0x6d reserved
 	// 0x6e reserved
 	// 0x6f reserved
 
 	PORT_START("LINEE")
-	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("SHIFT")   PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT)     PORT_CHAR(UCHAR_SHIFT_1)            // Shift
-	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("CTRL")                              PORT_CODE(KEYCODE_LCONTROL)                                       // Control
-	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("OPT.1")                             PORT_CODE(KEYCODE_PRTSCR)                                         // Opt1
-	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME("OPT.2")                             PORT_CODE(KEYCODE_PAUSE)                                          // Opt2
+	PORT_BIT( 0x01, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"SHIFT")  PORT_CODE(KEYCODE_LSHIFT) PORT_CODE(KEYCODE_RSHIFT)  PORT_CHAR(UCHAR_SHIFT_1)    // Shift
+	PORT_BIT( 0x02, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"CTRL")                  PORT_CODE(KEYCODE_LCONTROL)                                       // Control
+	PORT_BIT( 0x04, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"OPT.1")                 PORT_CODE(KEYCODE_PRTSCR)                                         // Opt1
+	PORT_BIT( 0x08, IP_ACTIVE_HIGH, IPT_KEYBOARD )  PORT_NAME(u8"OPT.2")                 PORT_CODE(KEYCODE_PAUSE)                                          // Opt2
 INPUT_PORTS_END
 
 ioport_constructor x68k_keyboard_device::device_input_ports() const
diff -Nru mame-0.222+dfsg.1/src/mame/machine/xavix.cpp mame-0.224+dfsg.1/src/mame/machine/xavix.cpp
--- mame-0.222+dfsg.1/src/mame/machine/xavix.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/xavix.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -379,15 +379,6 @@
 /* Per Game IO port callbacks */
 
 
-READ_LINE_MEMBER(xavix_i2c_lotr_state::camera_r) // seems to be some kind of camera status bits
-{
-	return machine().rand();
-}
-
-READ_LINE_MEMBER(xavix_i2c_bowl_state::camera_r) // seems to be some kind of camera status bits
-{
-	return machine().rand();
-}
 
 READ_LINE_MEMBER(xavix_ekara_state::ekara_multi0_r)
 {
@@ -512,48 +503,6 @@
 	m_extraiowrite = extraiowrite;
 }
 
-/* SuperXavix IO port handliner (per game) */
-
-uint8_t xavix_i2c_jmat_state::read_extended_io0()
-{
-	LOG("%s: read_extended_io0\n", machine().describe_context());
-	return 0x00;
-}
-
-uint8_t xavix_i2c_jmat_state::read_extended_io1()
-{
-	LOG("%s: read_extended_io1\n", machine().describe_context());
-
-	// reads this by reading the byte, then shifting right 4 times to place value into carry flag
-	return m_i2cmem->read_sda() << 3;
-	//return 0x00;
-}
-
-uint8_t xavix_i2c_jmat_state::read_extended_io2()
-{
-	LOG("%s: read_extended_io2\n", machine().describe_context());
-	return 0x00;
-}
-
-void xavix_i2c_jmat_state::write_extended_io0(uint8_t data)
-{
-	LOG("%s: io0_data_w %02x\n", machine().describe_context(), data);
-}
-
-void xavix_i2c_jmat_state::write_extended_io1(uint8_t data)
-{
-	LOG("%s: io1_data_w %02x\n", machine().describe_context(), data);
-
-	m_i2cmem->write_sda((data & 0x08) >> 3);
-	m_i2cmem->write_scl((data & 0x10) >> 4);
-
-}
-
-void xavix_i2c_jmat_state::write_extended_io2(uint8_t data)
-{
-	LOG("%s: io2_data_w %02x\n", machine().describe_context(), data);
-}
-
 // the cart pins Popira 2 uses for IO with cart gc0010 are not controllable by the CPU on other ekara systems
 
 READ_LINE_MEMBER(xavix_popira2_cart_state::i2c_r)
diff -Nru mame-0.222+dfsg.1/src/mame/machine/z80ne.cpp mame-0.224+dfsg.1/src/mame/machine/z80ne.cpp
--- mame-0.222+dfsg.1/src/mame/machine/z80ne.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/machine/z80ne.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -65,38 +65,38 @@
 	}
 }
 
-
-void z80ne_state::driver_init()
+void z80ne_state::save_state_vars()
 {
-	/* first two entries point to rom on reset */
-	uint8_t *RAM = m_region_z80ne->base();
-	m_bank1->configure_entry(0, &RAM[0x00000]); /* RAM   at 0x0000 */
-	m_bank1->configure_entry(1, &RAM[0x14000]); /* ep382 at 0x0000 */
-	m_bank2->configure_entry(0, &RAM[0x14000]); /* ep382 at 0x8000 */
+	save_item(NAME(m_lx383_scan_counter));
+	save_item(NAME(m_lx383_key));
+	save_item(NAME(m_lx383_downsampler));
+	save_item(NAME(m_lx385_ctrl));
 }
 
-void z80net_state::driver_init()
+void z80ne_state::init_z80ne()
 {
-	z80ne_state::driver_init();
+	save_state_vars();
 }
 
 void z80netf_state::driver_init()
 {
+	save_state_vars();
+
 	/* first two entries point to rom on reset */
-	uint8_t *RAM = m_region_z80ne->base();
-	m_bank1->configure_entry(0, &RAM[0x00000]); /* RAM   at 0x0000-0x03FF */
-	m_bank1->configure_entries(1, 3, &RAM[0x14400], 0x0400); /* ep390, ep1390, ep2390 at 0x0000-0x03FF */
-	m_bank1->configure_entry(4, &RAM[0x14000]); /* ep382 at 0x0000-0x03FF */
-	m_bank1->configure_entry(5, &RAM[0x10000]); /* ep548 at 0x0000-0x03FF */
+	u8 *r = m_ram->pointer();
+	m_bank1->configure_entry(0, r); /* RAM   at 0x0000-0x03FF */
+	m_bank1->configure_entries(1, 3, m_rom+0x4400, 0x0400); /* ep390, ep1390, ep2390 at 0x0000-0x03FF */
+	m_bank1->configure_entry(4, m_rom+0x4000); /* ep382 at 0x0000-0x03FF */
+	m_bank1->configure_entry(5, m_rom); /* ep548 at 0x0000-0x03FF */
 
-	m_bank2->configure_entry(0, &RAM[0x00400]); /* RAM   at 0x0400 */
-	m_bank2->configure_entry(1, &RAM[0x10400]); /* ep548 at 0x0400-0x3FFF */
+	m_bank2->configure_entry(0, r+0x0400); /* RAM   at 0x0400 */
+	m_bank2->configure_entry(1, m_rom+0x0400); /* ep548 at 0x0400-0x3FFF */
 
-	m_bank3->configure_entry(0, &RAM[0x08000]); /* RAM   at 0x8000 */
-	m_bank3->configure_entry(1, &RAM[0x14000]); /* ep382 at 0x8000 */
+	m_bank3->configure_entry(0, r+0x4000); /* RAM   at 0x8000 */
+	m_bank3->configure_entry(1, m_rom+0x4000); /* ep382 at 0x8000 */
 
-	m_bank4->configure_entry(0, &RAM[0x0F000]); /* RAM   at 0xF000 */
-	m_bank4->configure_entries(1, 3, &RAM[0x14400], 0x0400); /* ep390, ep1390, ep2390 at 0xF000 */
+	m_bank4->configure_entry(0, r+0x5000); /* RAM   at 0xF000 */
+	m_bank4->configure_entries(1, 3, m_rom+0x4400, 0x0400); /* ep390, ep1390, ep2390 at 0xF000 */
 
 }
 
@@ -151,10 +151,8 @@
 	case 0:
 		m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
 		break;
-	case 1:
-		// switch to RAM bank at address 0x0000
-		m_bank1->set_entry(0);
-		break;
+	default:
+		printf("Invalid timer %d encountered\n",id);
 	}
 }
 
@@ -164,16 +162,6 @@
 	m_lx387_kr2376->set_input_pin( kr2376_device::KR2376_PII, 0);
 }
 
-void z80ne_state::reset_lx382_banking()
-{
-	/* switch to ROM bank at address 0x0000 */
-	m_bank1->set_entry(1);
-	m_bank2->set_entry(0);  /* ep382 at 0x8000 */
-
-	/* after the first 3 bytes have been read from ROM, switch the RAM back in */
-	m_timer_reset->adjust(m_maincpu->cycles_to_attotime(2));
-}
-
 void z80netf_state::reset_lx390_banking()
 {
 	switch (m_io_config->read() & 0x07)
@@ -185,8 +173,6 @@
 		m_bank2->set_entry(0);  /* RAM   at 0x0400 */
 		m_bank3->set_entry(1);  /* ep382 at 0x8000 */
 		m_bank4->set_entry(0);  /* RAM   at 0xF000 */
-		// after the first 3 bytes have been read from ROM, switch the RAM back in
-		m_timer_reset->adjust(m_maincpu->cycles_to_attotime(2));
 		break;
 	case 0x02: /* EP548  16k BASIC */
 		if (VERBOSE)
@@ -271,19 +257,34 @@
 	m_uart_clock->set_unscaled_clock(m_cass_data.speed * 16);
 
 	lx385_ctrl_w(0);
-
 }
 
 void z80ne_state::machine_reset()
 {
-	reset_lx382_banking();
 	base_reset();
+
+	address_space &program = m_maincpu->space(AS_PROGRAM);
+	program.install_rom(0x0000, 0x03ff, m_rom);   // do it here for F3
+	m_rom_shadow_tap = program.install_read_tap(0x8000, 0x83ff, "rom_shadow_r",[this](offs_t offset, u8 &data, u8 mem_mask)
+	{
+		if (!machine().side_effects_disabled())
+		{
+			// delete this tap
+			m_rom_shadow_tap->remove();
+
+			// reinstall ram over the rom shadow
+			m_maincpu->space(AS_PROGRAM).install_ram(0x0000, 0x03ff, m_mram);
+		}
+
+		// return the original data
+		return data;
+	});
 }
 
 void z80net_state::machine_reset()
 {
-	z80ne_state::machine_reset();
 	reset_lx387();
+	z80ne_state::machine_reset();
 }
 
 void z80netb_state::machine_reset()
@@ -297,41 +298,51 @@
 	reset_lx390_banking();
 	base_reset();
 	reset_lx387();
+
+	// basic roms are exempt from memory tap
+	if ((m_io_config->read() & 0x07) != 2)
+	{
+		address_space &program = m_maincpu->space(AS_PROGRAM);
+		m_rom_shadow_tap = program.install_read_tap(0x8000, 0xf3ff, "rom_shadow_r",[this](offs_t offset, u8 &data, u8 mem_mask)
+		{
+			if (!machine().side_effects_disabled())
+			{
+				// delete this tap
+				m_rom_shadow_tap->remove();
+
+				// reinstall ram over the rom shadow
+				m_bank1->set_entry(0);
+			}
+
+			// return the original data
+			return data;
+		});
+	}
 }
 
 INPUT_CHANGED_MEMBER(z80ne_state::z80ne_reset)
 {
-	uint8_t rst;
-	rst = m_io_rst->read();
+	uint8_t rst = m_io_rst->read();
 
 	if ( ! BIT(rst, 0))
-	{
 		machine().schedule_soft_reset();
-	}
 }
 
 INPUT_CHANGED_MEMBER(z80net_state::z80net_nmi)
 {
-	uint8_t nmi;
-	nmi = m_io_lx387_brk->read();
+	uint8_t nmi = m_io_lx387_brk->read();
 
 	if ( ! BIT(nmi, 0))
-	{
 		m_maincpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
-	}
 }
 
 void z80ne_state::machine_start()
 {
 	m_timer_nmi = timer_alloc(0);
-	m_timer_reset = timer_alloc(1);
 
 	m_lx383_digits.resolve();
 
 	m_lx385_ctrl = 0x1f;
-	save_item(NAME(m_lx383_scan_counter));
-	save_item(NAME(m_lx383_downsampler));
-	save_item(NAME(m_lx383_key));
 	m_cassette_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(z80ne_state::z80ne_cassette_tc), this));
 	m_kbd_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(z80ne_state::z80ne_kbd_scan), this));
 	m_kbd_timer->adjust(attotime::from_hz(1000), 0, attotime::from_hz(1000));
@@ -402,7 +413,7 @@
 	else
 	{
 		// after writing to port 0xF8 and the first ~M1 cycles strike a NMI for single step execution
-		m_timer_reset->adjust(m_maincpu->cycles_to_attotime(1));
+		m_timer_nmi->adjust(m_maincpu->cycles_to_attotime(1));
 	}
 }
 
@@ -590,7 +601,7 @@
 
 	floppy_image_device *floppy = nullptr;
 
-	for (int f = 0; f < 4; f++)
+	for (u8 f = 0; f < 4; f++)
 		if (BIT(data, f))
 			floppy = m_floppy[f]->get_device();
 
@@ -613,24 +624,6 @@
 	}
 }
 
-uint8_t z80netf_state::lx390_reset_bank()
-{
-	offs_t pc;
-
-	/* if PC is not in range, we are under integrated debugger control, DON'T SWAP */
-	pc = m_maincpu->pc();
-	if((pc >= 0xf000) && (pc <=0xffff))
-	{
-		LOG("lx390_reset_bank, reset memory bank 1\n");
-		m_bank1->set_entry(0); /* RAM at 0x0000 (bank 1) */
-	}
-	else
-	{
-		LOG("lx390_reset_bank, bypass because in debugger\n");
-	}
-	return 0xff;
-}
-
 uint8_t z80netf_state::lx390_fdc_r(offs_t offset)
 {
 	uint8_t d;
@@ -655,7 +648,7 @@
 		break;
 	case 6:
 		d = 0xff;
-		lx390_reset_bank();
+		m_bank1->set_entry(0);
 		break;
 	case 7:
 		d = m_wd1771->data_r() ^ 0xff;
diff -Nru mame-0.222+dfsg.1/src/mame/mame.lst mame-0.224+dfsg.1/src/mame/mame.lst
--- mame-0.222+dfsg.1/src/mame/mame.lst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/mame.lst	2020-08-26 08:57:19.000000000 +0000
@@ -101,8 +101,10 @@
 4d35                            // IP12: Personal Iris 4D/35, R3000A @36MHz
 
 @source:4enlinea.cpp
-4enlinea                        // (c) 1991 System Compumatic
-k7_olym                         //
+4enlinea                        // (c) 1991 Compumatic / CIC Play
+4enlineb                        // (c) 1991 Compumatic / CIC Play
+k7_olym                         // (c) 1994 K7 Kursaal
+sprtdart                        // (c) 1993 Compumatic / Desarrollos y Recambios S.L.
 
 @source:4enraya.cpp
 4enraya                         // (c) 1990 IDSA
@@ -2399,6 +2401,7 @@
 astrof                          // (c) [1980?]
 astrof2                         // (c) [1980?]
 astrof3                         // (c) [1980?]
+astroff                         // bootleg (Famaresa)
 spfghmk2                        // (c) [1979] Data East Corporation
 spfghmk22                       // (c) [1979] Data East Corporation
 sstarbtl                        // bootleg
@@ -2769,6 +2772,7 @@
 aavenger                        //
 atarians                        //
 midearth                        //
+mideartha                       //
 spcrider                        //
 time2000                        //
 
@@ -3090,6 +3094,10 @@
 avigo_fr                        // 1997 Avigo (French)
 avigo_it                        // 1997 Avigo (Italian)
 
+@source:avrmax.cpp
+avrmax
+avrmaxg
+
 @source:avt.cpp
 avtbingo                        // (c) 1985 AVT
 avtnfl                          // (c) 1989 AVT
@@ -3294,11 +3302,6 @@
 mechattu                        // A8002 'MA' (c) 1989
 mechattu1                       // A8002 'MA' (c) 1989
 
-@source:bbl380.cpp
-bbl380
-ragc153
-dphh8630
-
 @source:bcs3.cpp
 bcs3                            //
 bcs3a                           //
@@ -3355,6 +3358,7 @@
 
 @source:bfcobra.cpp
 beeline                         // 1991 BFM
+brkball                         // 1994 BFM / ATOD
 escounts                        // 1990 BFM
 inquiztr                        // 1989 BFM
 qos                             // 1992 BFM
@@ -9231,6 +9235,7 @@
 bingor3                         // (c) 2002 Unknown
 bingor4                         // (c) 2002 Unknown
 bingor5                         // (c) 2002 Unknown
+bingor6                         // (c) 1991 AWR Hard & Soft
 vip2000                         // (c) Paloma-Elektronik
 
 @source:bingowav.cpp
@@ -9250,7 +9255,6 @@
 sbishi                          // GX675 (c) 1998 (Japan)
 sbishik                         // GX675 (c) 1998 (Korea)
 sbishika                        // GX675 (c) 1998 (Korea)
-dobouchn                        //
 
 @source:bitel.cpp
 feap90                          //
@@ -10233,6 +10237,7 @@
 outr2sto                        // 2004.09 Outrun 2 Special Tours
 outr2st                         // 2004.12 Outrun 2 Special Tours (Rev A)
 outr2stj                        // 2004.12 Outrun 2 Special Tours (Japan) (Rev A)
+scg05nt                         // 2004.10 Sega Golf Club Network Pro Tour 2005 (Rev C) (GDX-0010C)
 scg06nt                         // 2005.12 Sega Golf Club 2006: Next Tours (Rev A)
 vcop3a                          // 2003.02.26 Virtua Cop 3 (Rev A)
 vcop3                           // 2003.05.21 Virtua Cop 3 (Rev B)
@@ -10339,6 +10344,10 @@
 
 @source:cit101.cpp
 cit101                          // (c) 1980 C. Itoh
+cit101e                         // (c) 1983 C. Itoh
+
+@source:cit101xl.cpp
+cit101xl                        //
 
 @source:cit220.cpp
 cit220p                         // (c) 1984 C. Itoh
@@ -10539,6 +10548,7 @@
 @source:compuchess.cpp
 ccmk1                           // Chess Champion MK I
 cmpchess
+cmpchess2
 cncchess
 
 @source:compmahj.cpp
@@ -11004,6 +11014,7 @@
 mpangj                          // 11/10/2000 (c) 2000 Mitchell (Japan)
 mpangr1                         // 25/09/2000 (c) 2000 Mitchell (Euro)
 mpangu                          // 10/10/2000 (c) 2000 Mitchell (USA)
+mpanga                          // 10/10/2000 (c) 2000 Mitchell (Asia)
 msh                             // 24/10/1995 (c) 1995 (Euro)
 msha                            // 24/10/1995 (c) 1995 (Asia)
 mshb                            // 17/11/1995 (c) 1995 (Brazil)
@@ -11059,6 +11070,7 @@
 qndream                         // 26/08/1996 (c) 1996 (Japan)
 ringdest                        // 02/09/1994 (c) 1994 (Euro)
 ringdesta                       // 31/08/1994 (c) 1994 (Asia)
+ringdestb                       // 02/09/1994 (c) 1994 (Brazil) - factory region hack?
 ringdesth                       // 02/09/1994 (c) 1994 (Hispanic)
 ringdstd                        //
 rmancp2j                        // 22/09/1995 (c) 1995 (Japan)
@@ -11256,9 +11268,6 @@
 cpzodiac                        //
 cpzodiacj                       //
 
-@source:craft.cpp
-craft                           // Craft, by [lft]
-
 @source:crazybal.cpp
 crazybal                        // EGS
 
@@ -11564,7 +11573,8 @@
 
 @source:dblewing.cpp
 dblewing                        // MBE (c) 1993 Mitchell
-dblewinga                       // MBE (c) 1994 Mitchell
+dblewinga                       // MBE (c) 1993 Mitchell
+dblewingb                       // MBE (c) 1994 Mitchell
 
 @source:dbox.cpp
 dbox                            // (c) 1996 Nokia Multimedia
@@ -11765,8 +11775,10 @@
 jupk_513                        //
 jupk_g51                        //
 lah_106c                        //
+lah_107                         //
 lah_110                         //
 lah_112                         //
+lah_f104                        //
 lah_l104                        //
 lah_l108                        //
 lw3_200                         //
@@ -11775,6 +11787,7 @@
 lw3_207                         //
 lw3_207c                        //
 lw3_208                         //
+mj_130                          //
 rab_103                         //
 rab_130                         //
 rab_320                         //
@@ -11817,6 +11830,7 @@
 bay_d300                        //
 bay_d400                        //
 bay_e400                        //
+bay_f201                        //
 baywatch                        //
 bmf_at                          //
 bmf_be                          //
@@ -13037,8 +13051,18 @@
 emu2                            //
 
 @source:emu3.cpp
+emax2                           //
 emu3                            //
 
+@source:emu68k.cpp
+carnaval                        //
+orbit9090                       //
+phatt                           //
+procuss                         //
+proteus1                        //
+proteusxr                       //
+vintkeys                        //
+
 @source:enigma2.cpp
 enigma2                         // (c) 1981 Game Plan (Zilec Electronics license)
 enigma2a                        // (c) 1984 Zilec Electronics (bootleg?)
@@ -13273,9 +13297,9 @@
 targc                           // (c) 1980
 teetert                         // (c) 1981
 venture                         // (c) 1981
-venture2                        // (c) 1981
-venture2b                       // bootleg
 venture4                        // (c) 1981
+venture5a                       // (c) 1981
+venture5b                       // bootleg
 
 @source:exidy440.cpp
 catch22                         // (c) 1985
@@ -13299,8 +13323,15 @@
 attckexd                        // (c) 1977 Exidy
 attckexd2                       // (c) 1977 Exidy
 deathrac                        // (c) 1976 Exidy
+destdrby                        // (c) 1976 Exidy
 rhunting                        // bootleg of deathrac
 
+@source:exorciser.cpp
+exorciser                       // 1975 Motorola
+
+@source:exorterm.cpp
+exorterm155                     // (c) 1979 Motorola
+
 @source:exp85.cpp
 exp85                           //
 
@@ -13497,6 +13528,7 @@
 @source:fidel_cc1.cpp
 cc1                             //
 cc3                             //
+cc10c
 
 @source:fidel_cc10.cpp
 cc10                            //
@@ -13550,6 +13582,7 @@
 feasbu                          //
 feasgla                         //
 feasglaa                        //
+feasglab                        //
 feag                            //
 feag2100                        //
 feag2100a                       //
@@ -13822,6 +13855,8 @@
 funquiz                         // (c) 198? Fun World
 funquiza                        // (c) 1990 Fun World
 funquizb                        // (c) 1990 Fun World
+gratispk                        // (c) 1995 Mega Soft
+gratispka                       // (c) 1995 Mega Soft
 jokercrd                        // (c) 1993 Vesely Svet
 jollycrd                        // (c) 1985 TAB-Austria
 jollycrda                       // (c) 1985 TAB-Austria
@@ -13838,13 +13873,18 @@
 jolycdif                        // 1990 bootleg
 jolycdig                        // 1993 bootleg
 jolycdih                        // 1990 bootleg
+jolycdii                        // 1993 bootleg
 jolycdit                        // 199? bootleg
 jolycdsp                        // (c) 1992 TAB-Austria
 jolycmzs                        // (c) 1993 MZS Tech
 jolyjokr                        // (c) 198? Impera
 jolyjokra                       // (c) 198? Impera
-jolyjokrb                       // (c) 198? Impera
+jolyjokrb1                      // (c) 1985 Impera
+jolyjokrb2                      // (c) 1985 Impera
 jolyjokrc                       // (c) 198? Apple Time
+jolyjokrm                       // (c) 198? Impera
+jolyjokro                       // (c) 198? Impera
+jolyjokrp                       // (c) 198? Impera
 lluck3x3                        // (c) 1991 TAB-Austria
 lluck4x1                        // (c) 1991 TAB-Austria
 lunapark                        // 1998 unknown.
@@ -13858,6 +13898,7 @@
 mongolnw                        // 199? bootleg
 multiwin                        // (c) 1992 Fun World
 nevadafw                        // 199? unknown
+nkoulit                         // 1995 JK Amusement
 novoplay                        // (c) 1986 Novomatic
 pool10                          // (c) 1996 C.M.C.
 pool10b                         // (c) 1996 C.M.C.
@@ -13873,6 +13914,7 @@
 potgame                         // (c) 1996 C.M.C.
 powercrd                        // (c) 1993 Fun World
 rcdino4                         // 1998 unknown
+reflexcrd                       // (c) 1999 TAB-Austria
 royal                           // 2001, hack.
 royalcdfr                       // (c) 1991 TAB-Austria
 royalcrd                        // (c) 1991 TAB-Austria
@@ -13971,6 +14013,11 @@
 surfplnt                        // (c) 1997 - Ref 971223
 surfplnt40                      // (c) 1997 - Ref 970514
 
+@source:gaelcof3.cpp
+autopapa                        //
+donpepito                       //
+susanita                        //
+
 @source:gaelcopc.cpp
 rriders                         //
 tokyocop                        // (c) 2003 (Arcade TV Game List - P.168, Right, 19 from bottom)
@@ -14060,6 +14107,7 @@
 armorcar2                       // (c) 1981 Stern
 asideral                        // bootleg
 astrians                        //
+ataqandr                        // bootleg (FAR S.A.)
 atlantis                        // (c) 1981 Comsoft
 atlantis2                       // (c) 1981 Comsoft
 atlantisb                       // bootleg
@@ -14148,8 +14196,6 @@
 mooncmw                         // bootleg
 mooncptc                        // bootleg (Petaco S.A.)
 sirio2                          // bootleg (Calfesa S.L.)
-sirio2a                         // bootleg (Calfesa S.L.)
-ataqandr                        // bootleg (FAR S.A.)
 mooncreg                        // bootleg
 mooncrgx                        // bootleg
 mooncrs2                        // bootleg
@@ -14225,6 +14271,7 @@
 spactrai                        //
 spcdrag                         // bootleg
 spcdraga                        // bootleg
+spctrek                         // bootleg
 spctbird                        // (c) Fortrek
 spdcoin                         // (c) 1984 Stern
 sstarcrs                        // Taito (Brazil)
@@ -14265,6 +14312,8 @@
 galaktron                       // bootleg (Petaco S.A.)
 zerotimed                       // hack (Datamat)
 zerotimemc                      // hack (Marti Colls)
+zerotimeu                       // hack
+galaxcirsa                      // bootleg (Cirsa)
 zigzagb                         // (c) 1982 LAX (bootleg)
 zigzagb2                        // (c) 1982 LAX (bootleg)
 
@@ -14726,6 +14775,11 @@
 suprpokra                       // (c) 1986 Grayhound Electronics
 suprpokrb                       // (c) 1986 Grayhound Electronics
 
+@source:generalplus_gpl_unknown.cpp
+pcp8718
+pcp8728
+unkunsp
+
 @source:generalplus_gpl16250_mobigo.cpp
 mobigo
 mobigos
@@ -14733,10 +14787,13 @@
 
 @source:generalplus_gpl16250_nand.cpp
 wlsair60                        // Wireless Air 60
+kiugames
 jak_car2
 jak_gtg
 jak_sspop
 jak_hmhsm
+jak_hmg2
+jak_hsmg2
 jak_umdf
 jak_duck
 jak_swc
@@ -14753,6 +14810,7 @@
 gormiti
 tkmag220                        //
 myac220
+imgame
 
 @source:generalplus_gpl16250_romram.cpp
 paccon
@@ -14774,6 +14832,7 @@
 jak_tmnthp
 jak_dchp
 jak_ddhp
+jak_prhp
 
 @source:geneve.cpp
 geneve                          // 1987 Myarc Geneve 9640
@@ -14962,7 +15021,6 @@
 
 @source:goldnpkr.cpp
 animpkr                         // 198?, Unknown
-animpkra                        // 198?, Unknown
 bchancep                        // 198?, Unknown
 bchanceq                        // 198?, Unknown
 bonuspkr                        // 1984, Galanthis Inc.
@@ -15030,6 +15088,7 @@
 potnpkri                        // Bootleg
 potnpkrj                        // Bootleg
 potnpkrk                        // Bootleg
+potnpkrl                        // Bootleg
 pottnpkr                        // Bootleg
 royale                          // Unknown
 royalea                         // Unknown
@@ -15136,6 +15195,9 @@
 cmasterf                        // (c) 1991 Dyna Electronics
 cmasterg                        // (c) 1991 Dyna Electronics
 cmasterh                        // (c) 1991 Dyna Electronics
+cmasteri                        // (c) 1991 Dyna Electronics
+cmasterj                        // (c) 1991 Dyna Electronics
+cmasterk                        // (c) 1991 Dyna Electronics
 cmezspin                        // (c) 1991 Dyna Electronics
 cmfun                           // (c) 1995 Dyna Electronics
 cmpacman                        //
@@ -15182,6 +15244,7 @@
 lucky8i                         // 199?, Eagle, licensed by Wing
 lucky8j                         // 199?, hack
 lucky8k                         // (c) 1989 Wing. With CPU NEC D315-5136
+lucky8l                         // (c) 1989 Wing Co. Ltd
 luckybar                        // unknown
 luckylad                        // (c) 1985 Wing Co. Ltd
 magodds                         // 198? (c) Micro Manufacturing Ltd.
@@ -15232,6 +15295,7 @@
 nfb96txt                        // (c) 2000 Amcoe
 nfm                             // bootleg
 nfma                            // bootleg
+noved                           // bootleg
 ns8lines                        // unknown
 ns8linew                        // unknown
 ns8linewa                       // unknown
@@ -15749,6 +15813,7 @@
 racedrivcb4                     // 136077           (c) 1990
 racedrivcg                      // 136077           (c) 1990
 racedrivcg4                     // 136077           (c) 1990
+racedrivcp                      // 136077           (c) 1990
 racedrivg                       // 136077           (c) 1990
 racedrivg1                      // 136077           (c) 1990
 racedrivg4                      // 136077           (c) 1990
@@ -15804,6 +15869,8 @@
 hec2mdhrx                       //
 hec2mx40                        //
 hec2mx80                        //
+hector1                         //
+interact                        //
 victor                          //
 
 @source:hektor.cpp
@@ -15889,6 +15956,7 @@
 uspbball                        // US Games
 
 @source:hh_sm510.cpp
+bassmate                        // Telko
 exospace                        // Elektronika
 gnw_ball                        // Nintendo
 gnw_bfight                      // Nintendo
@@ -15901,6 +15969,7 @@
 gnw_climber                     // Nintendo
 gnw_climbern                    // Nintendo
 gnw_dkcirc                      // Nintendo
+gnw_dkhockey                    // Nintendo
 gnw_dkjr                        // Nintendo
 gnw_dkjrp                       // Nintendo
 gnw_dkong                       // Nintendo
@@ -16645,10 +16714,6 @@
 @source:intellect02.cpp
 intel02                         //
 
-@source:interact.cpp
-hector1                         //
-interact                        //
-
 @source:interpro.cpp
 ip2000                          // Intergraph InterPro/InterServe 20x0
 ip2400                          // Intergraph InterPro/InterServe 24x0
@@ -17135,6 +17200,7 @@
 trivialp                        // (c) 1996
 trivialpd                       // (c) 1996
 trivialpo                       // (c) 1996
+jpmreno
 
 @source:jpmimpctsw.cpp
 j6aceclb                        // Ace Of Clubs (Crystal)
@@ -18346,9 +18412,14 @@
 @source:jpmsys5.cpp
 cashcade                        // Cashcade (JPM)
 monoplcl                        // Monopoly Classic (JPM)
+monoplcld                       //
 monopldx                        // Monopoly Deluxe (JPM)
+monopldx1                       // Monopoly Deluxe (JPM)
+monopldxd                       //
 monopoly                        // Monopoly (JPM)
-monopolya                       // Monopoly (JPM)
+monopolyd                       // Monopoly (JPM)
+monopoly4                       // Monopoly (JPM)
+monopoly3                       // Monopoly (JPM)
 
 @source:jpmsys5sw.cpp
 j5ar80                          // Around The World In Eighty Days (JPM)
@@ -18663,9 +18734,15 @@
 k5                              //
 k5m                             //
 
+@source:kawai_ksp10.cpp
+ksp10                           //
+
 @source:kawai_r100.cpp
 r100                            //
 
+@source:kawai_sx240.cpp
+sx240                           //
+
 @source:kaypro.cpp
 kaypro1                         // Kaypro 1
 kaypro10                        // Kaypro 10/83
@@ -18886,11 +18963,12 @@
 mariorou
 
 @source:konmedal68k.cpp
-kzaurus
+dobouchn
+kattobas
 koropens
+kzaurus
 pwrchanc
 ymcapsul
-kattobas
 
 @source:quickpick5.cpp
 quickp5
@@ -18924,6 +19002,11 @@
 korgm1r                         //
 korgm1rex                       //
 
+@source:korgws.cpp
+korgwsad                        //
+korgwsex                        //
+korgwssr                        //
+
 @source:korgz3.cpp
 korgz3                          //
 
@@ -19222,6 +19305,9 @@
 @source:lee1214.cpp
 lee1214d                        //
 
+@source:lee1220.cpp
+lee1220                         //
+
 @source:legionna.cpp
 cupsoc                          // (c) 1992 Seibu
 cupsoca                         // (c) 1992 Seibu
@@ -19318,6 +19404,16 @@
 lft1230                         //
 lft1510                         //
 
+@source:lft_chiptune.cpp
+powernin                        // Power Ninja Action Challenge, by [lft] (2009)
+hwchiptn                        // The Hardware Chiptune Project, by [lft] and kryo (2007)
+
+@source:lft_craft.cpp
+craft                           // Craft, by [lft] (2008)
+
+@source:lft_phasor.cpp
+phasor                          // Phasor, by [lft] (2010)
+
 @source:lg-dvd.cpp
 lggp40                          //
 
@@ -19459,6 +19555,7 @@
 lucky21d                        // (c) 199? Wing Co. Ltd
 lucky25                         // (c) 199? Wing Co. Ltd
 lucky37                         // (c) 199? Wing Co. Ltd
+bingo75                         // (c) 199? Wing Co. Ltd
 
 @source:lucky74.cpp
 excitbj                         // (c) 1992 Wing Co. Ltd
@@ -19619,6 +19716,7 @@
 gallop                          // (c) 1991 (Japan)
 hharry                          // (c) 1990 (World)
 hharryu                         // (c) 1990 Irem America (US)
+hharryb                       // bootleg
 imgfight                        // (c) 1988 (World)
 imgfightb                       // bootleg
 imgfightj                       // (c) 1988 (Japan)
@@ -19820,10 +19918,14 @@
 magicarde                       // (c) 1994 Impera
 magicardf                       // (c) 199? Impera
 magicardj                       // (c) 1998 Impera
+magicardw                       // (c) 1993 Impera
 magicle                         // (c) 2001 Impera
 quingo                          // (c) 1999 Impera
 belslots                        // (c) 1999 Impera
 bigdeal0                        // (c) 2001 Impera
+puzzleme                        // (c) 199? Impera
+unkte06                         // (c) 199? Impera
+lucky7i                         // (c) 199? Impera
 
 @source:magiceyes_pollux_vr3520f.cpp
 didj                            // (c) 2008 Leapfrog
@@ -19941,6 +20043,7 @@
 mastboyo                        // (c) 1987 - No Ref on the PCB
 mastboyoa                       // (c) 1987 - No Ref on the PCB
 mastboyob
+mastboyoc
 
 @source:matmania.cpp
 excthour                        // TA-0015 (c) 1985 + Taito license
@@ -22049,6 +22152,7 @@
 
 @source:megadriv_acbl.cpp
 aladmdb                         // MegaDrive-based hack
+barek2mb                        // MegaDrive-based hack
 barek3mb                        // MegaDrive-based hack
 jparkmb                         // MegaDrive-based hack
 mk3mdb                          // MegaDrive-based hack
@@ -22215,6 +22319,11 @@
 crzyddz2                        // 2006 Sealy
 menghong                        // 2004? Sealy
 
+@source:mephisto_academy.cpp
+academy
+academyg
+academyga
+
 @source:mephisto_berlin.cpp
 berl16                          // 1992 Mephisto Berlin 68000
 berl16a                         // 1992 Mephisto Berlin 68000
@@ -22317,14 +22426,12 @@
 monteciv                        // 1990 Mephisto Monte Carlo IV LE
 
 @source:mephisto_polgar.cpp
-polgar                          // 1989 Mephisto Polgar
+polgar                          // 1990 Mephisto Polgar
+polgara                         // 1989 Mephisto Polgar
 polgar10                        // 1990 Mephisto Polgar 10MHz
 polgar101                       // 1990 Mephisto Polgar 10MHz
 mrisc                           // 1992 Mephisto RISC 1MB
 mrisc2                          // 1994 Mephisto RISC II
-academy                         // 1989 Mephisto Academy
-academyg                        // 1989 Mephisto Academy
-academyga                       // 1989 Mephisto Academy
 milano                          // 1991 Mephisto Milano
 milanoa                         // 1991 Mephisto Milano
 nshort                          // 1993 Mephisto Nigel Short
@@ -22583,7 +22690,10 @@
 dm3270                          //
 
 @source:microdar.cpp
-microdar                        //
+dibifuca                        //
+cfarwest                        // (c) 1997 Compumatic
+prospdp                         // (c) 1997 Compumatic
+diolakoa                        // (c) 1997 Compumatic
 
 @source:microdec.cpp
 md2                             //
@@ -22592,6 +22702,9 @@
 @source:microkit.cpp
 microkit                        //
 
+@source:microkorg.cpp
+microkorg                       //
+
 @source:micromon.cpp
 micromon7141                    //
 
@@ -22658,6 +22771,7 @@
 crusnusa                        // (c) 1994 Midway
 crusnusa21                      // (c) 1994 Midway
 crusnusa40                      // (c) 1994 Midway
+crusnusa41                      // (c) 1994 Midway
 crusnwld                        // (c) 1996 Midway
 crusnwld13                      // (c) 1996 Midway
 crusnwld17                      // (c) 1996 Midway
@@ -22972,7 +23086,8 @@
 daytonata                       // 1994?   Kyle Hodgetts hack
 daytonagtx                      // 2004    Kyle Hodgetts hack
 desert                          // 1994.07 Desert Tank
-doa                             // 1996.11 Dead or Alive (Revision B)
+doa                             // 1997.01 Dead or Alive (Revision C)
+doab                            // 1996.12 Dead or Alive (Revision B)
 doaa                            // 1996.11 Dead or Alive (Revision A)
 dynabb                          // 1996.08 Dynamite Baseball
 dynabb97                        // 1997.04 Dynamite Baseball 97 (Revision A)
@@ -23121,6 +23236,9 @@
 monacogp                        // (c) 1980 Sega
 monacogpa                       // (c) 1980 Sega
 
+@source:monkey_king_3b.cpp
+rs70_648                        //
+
 @source:monon_color.cpp
 mononcol                        // (c) 2011 M&D
 
@@ -23313,6 +23431,7 @@
 m4chaseid                       //
 m4chaseie                       //
 m4chaseif                       //
+m4chaseig                       //
 m4clbveg                        // Club Vegas (Barcrest)
 m4clbvega                       //
 m4clbvegb                       //
@@ -25231,6 +25350,17 @@
 m4monte__k                      //
 m4monte__l                      //
 m4monte__m                      //
+m4montez
+m4monteza
+m4montezb
+m4montezc
+m4montezd
+m4monteze
+m4montezf
+m4montezg
+m4montezh
+m4montezi
+m4montezj
 m4nudbnk                        // Nudge Banker (Barcrest)
 m4nudbnk__a                     //
 m4nudbnk__b                     //
@@ -28881,70 +29011,351 @@
 
 @source:mpu4vid.cpp
 v4addlad                        // Adders and Ladders
+v4addladd                       //
 v4addlad20                      //
 v4barqs2                        // Barquest 2 (v0.3)
-v4barqst                        // Barquest (v2.6d)
+v4barqst                        // Barquest (v2.6)
+v4barqstd                       //
 v4big40                         // Big 40
+v4big40a
+v4big40b
+v4big40c
+v4big40d
+v4big40e
+v4big40f
+v4big40g
+v4big40h
+v4big40i
+v4big40j
+v4big40k
 v4bigfrt                        // Big Fruits
+v4bigfrta
+v4bigfrtb
+v4bigfrtc
 v4bios                          // MPU4 Video Firmware
 v4blox                          // Blox
 v4bloxd                         //
 v4bubbnk                        // Bubbly Bonk
+v4bubbnka
+v4bubbnkb
+v4bubbnkc
+v4bubbnkd
 v4bulblx                        // Bullion Blox
+v4bulblxa
+v4bulblxb
+v4bulblxc
 v4cmaze                         // The Crystal Maze (v1.3)
 v4cmaze2                        // The New Crystal Maze Featuring Ocean Zone
-v4cmaze2a                       //
+v4cmaze2_amld                       //
 v4cmaze2b                       //
 v4cmaze2c                       //
 v4cmaze2d                       //
 v4cmaze3                        // The Crystal Maze Team Challenge
-v4cmaze3a                       //
+v4cmaze3_amld                       //
 v4cmaze3b                       //
 v4cmaze3c                       //
 v4cmaze3d                       //
-v4cmazea                        //
+v4cmaze_amld                        //
 v4cmazeb                        //
 v4cmazec                        //
 v4cmazed                        //
 v4cmazedat                      //
 v4cshinf                        // Cash Inferno
+v4cshinfa
+v4cshinfb
+v4cshinfd
+v4cshinfe
+v4cshinff
+v4cshinfg
+v4cshinfh
+v4cshinfi
+v4cshinfj
+v4cshinfk
+v4cshinfl
+v4cshinfm
+v4cshinfn
+v4cshinfo
+v4cshinfp
+v4cshinfq
+v4cshinfr
+v4cshinfs
+v4cshinf3
+v4cshinfu
+v4cshinf3a
+v4cshinfw
 v4cybcas                        // Cyber Casino
 v4dbltak                        // Double Take
+v4dbltaka
+v4dbltakb
 v4eyedwn                        // Eyes Down
 v4eyedwnd                       //
 v4frfact                        // Fruit Factory
+v4frfacta
+v4frfactb
+v4frfactc
+v4frfactd
+v4frfacte
+v4frfactf
 v4gldrsh                        // Gold Rush
+v4gldrsha
+v4gldrshb
+v4gldrshc
+v4gldrshd
+v4gldrshe
+v4gldrshf
+v4gldrshg
+v4gldrshh
+v4gldrshi
+v4gldrshj
+v4gldrshk
+v4gldrshl
+v4gldrshm
+v4gldrshn
+v4gldrsho
+v4gldrshp
+v4gldrshq
+v4gldrshr
+v4gldrshs
+v4gldrsht
+v4gldrshu
+v4gldrsh3
 v4mate                          // The Mating Game
 v4mated                         //
 v4mazbel                        // Mazooma Belle
-v4mazbla                        //
+v4mazbel15                        //
+v4mazbel15a
 v4mdice                         // Miami Dice
+v4mdicea
+v4mdiceb
+v4mdicec
+v4mdiced
+v4mdicee
+v4mdicef
+v4mdiceg
+v4mdiceh
+v4mdicei
+v4mdicej
+v4mdicek
+v4mdicel
+v4mdicem
+v4mdicen
+v4mdiceo
+v4mdicep
+v4mdiceq
+v4mdicer
+v4mdices
+v4mdicet
+v4mdiceu
+v4mdicev
+v4mdicew
+v4mdice5
+v4mdiceger                         // Miami Dice
+v4mdice6
 v4megbuk                        // Megabucks Poker
-v4miami                         // Miami Dice
+v4megbuka
+v4megbukb
+v4megbukc
 v4missis                        // Mississippi Lady
 v4monte                         // Monte Carlo Or Bust
+v4montea
+v4montec
+v4monted
+v4montee
+v4monteg
+v4monteb
+v4monteba
+v4montebb
+v4monte5
+v4monte5a
+v4monte5b
+v4montek
+v4montel
+v4montem
+v4monten
+v4monteo
+v4montep
+v4monteq
+v4monter
+v4montes
+v4montet
+v4monteu
+v4montev
+v4montew
+v4montex
+v4montey
+v4montez
+v4monteaa
+v4monteab
+v4monteac
+v4montead
+v4monteae
+v4monteaf
+v4monteag
+v4monteah
+v4monteai
+v4monteaj
+v4monteak
+v4monteal
+v4monteam
+v4montean
+v4monteao
+v4monte9
+v4monte9a
+v4monte9b
+v4monte9c
+v4monte9d
+v4monte9e
+v4monte9f
+v4monte9g
+v4monte9h
+v4monte9i
+v4monte9j
+v4monte9k
+v4monte9l
+v4monte9m
+v4monte9n
+v4monte9o
+v4montezz
+v4monteger
 v4opt3                          // Option 3
 v4opt3d                         //
 v4ovrmn3                        // Over Moon Pt3
-v4picdil                        // Piccadilly Nights
+v4ovrmn3a
+v4ovrmn3b
+v4ovrmn3c
+v4ovrmn3d
+v4picdil                        // Piccadilly Night
+v4picdila
+v4picdilz
 v4psi                           // Prize Space Invaders
-v4psia                          //
-v4psib                          //
-v4psi14d                        //
-v4psi20d                        //
-v4psi214                        //
+v4psibc                          //
+v4psi14                          //
+v4psibcd                        //
+v4psid                        //
+v4psi14a                        //
 v4pztet                         // Prize Tetris
-v4pzteta                        //
+v4pzteta
+v4pztetb                        //
+v4pztetc
 v4quidgr                        // Ten Quid Grid
 v4quidgr2                       //
 v4quidgr2d                      //
 v4quidgrd                       //
 v4redhtp                        // Red Hot Poker
+v4redhtpa
+v4redhtpb
+v4redhtpc
+v4redhtpd
+v4redhtpe
+v4redhtpf
+v4redhtpg
+v4redhtph
+v4redhtpi
+v4redhtpj
+v4redhtpk
+v4redhtpl
+v4redhtpm
+v4redhtpn
+v4redhtpo
+v4redhtpp
+v4redhtpq
+v4redhtpr
+v4redhtps
+v4redhtpt
+v4redhtpu
+v4redhtpv
+v4redhtpw
+v4redhtpx
+v4redhtpy
+v4redhtpz
+v4redhtpaa
+v4redhtpab
+v4redhtparc
+v4redhtpunk
+v4redhtp2
+v4redhtp2a
+v4redhtp2b
+v4redhtp2c
+v4redhtp2d
+v4redhtp2e
+v4redhtp2f
+v4redhtp2g
+v4redhtp2z
 v4rencas                        // Reno Casino
+v4rencasa
+v4rencasb
+v4rencasc
+v4rencasd
+v4rencase
+v4rencasf
+v4rencasg
+v4rencash
+v4rencasi
 v4reno                          // Reno Reels
+v4renoa
+v4renob
+v4renoc
+v4renod
+v4renoe
+v4renof
+v4renog
+v4renoh
+v4renoi
+v4renoj
+v4renok
+v4renol
+v4renom
+v4renon
+v4renoo
+v4renop
+v4renoq
+v4renor
+v4renos
+v4renot
+v4renou
+v4reno8
+v4reno7
+v4reno5
 v4rhmaz                         // Red Hot Mazooma Belle
+v4rhmaza
+v4rhmazb
+v4rhmazc
+v4rhmazd
+v4rhmaze
+v4rhmazf
+v4rhmazg
+v4rhmazh
+v4rhmazi
+v4rhmazj
+v4rhmazk
 v4shpwnd                        // Shop Window
+v4shpwnda
+v4shpwndb
+v4shpwndc
+v4shpwndd
+v4shpwnde
+v4shpwndf
+v4shpwndg
+v4shpwndh
+v4shpwndi
+v4shpwndj
+v4shpwndk
+v4shpwndl
+v4shpwndm
 v4sixx                          // 6-X
+v4sixxa
+v4sixxb
+v4sixxc
+v4sixxd
+v4sixxe
+v4sixxf
+v4sixxg
+v4sixxh
+v4sixxi
+v4sixxj
+v4sixxk
+v4sixxl
+v4sixxm
 v4sklcsh                        // Skill Cash
 v4skltrk                        // Skill Trek
 v4skltrka                       //
@@ -28953,14 +29364,52 @@
 v4strike2d                      //
 v4striked                       //
 v4sunbst                        // Sunburst
+v4sunbsta
+v4sunbstb
+v4sunbstc
+v4sunbstd
+v4sunbste
+v4sunbstf
+v4sunbstg
+v4sunbsth
+v4sunbsti
+v4sunbstj
+v4sunbstk
+v4sunbstl
+v4sunbstm
+v4sunbstn
+v4sunbsto
+v4sunbstp
+v4sunbstq
+v4sunbstr
+v4sunbsts
+v4sunbstt
+v4sunbstu
 v4tetrs                         // BwB Tetris v 2.2
 v4tetrs1                        // BwB Tetris v 1.0
-v4time                          // Time Machine
+v4tmach                         // Time Machine
+v4tmachd
+v4tmach1
+v4tmach1d
+v4tmach2
+v4tmach2d
 v4timebn                        // Time Bandit
+v4timebna
+v4timebnb
+v4timebnc
+v4timebnd
+v4timebne
 v4turnov                        // Turnover
+v4turnova
+v4turnovc
+v4turnovd
 v4vgpok                         // Vegas Poker (prototype release 2)
 v4wize                          // Wize Move (v1.3d)
-v4wizea                         // Wize Move
+v4wizen
+v4wizeb
+v4wizec
+v4wized
+v4wizeo                         // Wize Move
 
 @source:mpu5sw.cpp
 m55050                          // Fifty Fifty (Bwb)
@@ -29609,6 +30058,7 @@
 mrdu                            // bootleg
 mrlo                            // bootleg
 mrdofabr                        // bootleg (Fabremar)
+mrdobl                          // bootleg
 yankeedo                        // bootleg
 
 @source:mrflea.cpp
@@ -31636,6 +32086,8 @@
 pjoypj001
 afbm7800
 dnce2000
+vtvppong
+papsudok
 
 @source:nes_sh6578.cpp
 bandgpad
@@ -31643,6 +32095,9 @@
 cpatrolm
 ts_handy11
 ablwikid
+maxx5in1
+maxx6in1
+max10in1
 
 @source:nes_vt.cpp
 vdogdeme
@@ -31652,7 +32107,6 @@
 vtsndtest                       // From V.R. Technology VT SDK
 vtboxing                        // From V.R. Technology VT SDK
 ablpinb
-papsudok
 mc_dgear
 dgun2500
 dgun2561
@@ -31662,6 +32116,10 @@
 lxcmcyfz
 lxcmcydp
 lxcmcysp
+lxcmcypp
+lxcmcycr
+lxccminn
+lxccplan
 rtvgc300
 rtvgc300fz
 red5mam
@@ -31701,6 +32159,7 @@
 sudopptv
 zudugo
 ablping
+protpp
 vgpocket
 vgpmini
 sy889
@@ -31727,21 +32186,30 @@
 otrail
 denv150
 techni4
+duetpp
+sporzbx
 ablmini
 senwld
+zonefusn
 
 @source:vt1682.cpp
 ii8in1
 ii32in1
 zone7in1
+zone7in1p
+dance555
 miwi2_16
 miwi2_7
 intact89
 intg5410
 exsprt48
 itvg48
+xing48
 wowwg
 110dance
+lxts3
+unk1682
+njp60in1
 
 @source:newbrain.cpp
 newbrain                        //
@@ -31752,6 +32220,9 @@
 news                            // "Virus"??? ((c) 1993 Poby in ROM VIRUS.4)
 newsa                           // "Jeansole / Poby
 
+@source:news_38xx.cpp
+nws3860                         // Sony NEWS NWS-3860
+
 @source:news_68k.cpp
 nws1580                         // Sony NEWS NWS-1580
 
@@ -32029,6 +32500,9 @@
 diablo68                        //
 scorpio68                       //
 
+@source:novag_micro.cpp
+nmicro
+
 @source:novag_micro2.cpp
 nmicro2
 
@@ -32048,6 +32522,7 @@
 sfortea2                        //
 sforteb                         //
 sfortec                         //
+sfortec1                        //
 
 @source:novag_supremo.cpp
 supremo
@@ -32118,7 +32593,8 @@
 jopac                           // 1983 Jopac JO7400
 odyssey2                        // Magnavox Odyssey 2 - 1978-1983
 odyssey3                        // Magnavox Odyssey 3 / Command Center (prototype)
-videopac                        // 1979 Videopac G7000/C52
+videopac                        // 1979 Videopac G7000
+videopacf                       // 1979 Videopac C52
 
 @source:offtwall.cpp
 offtwall                        // 136090           (c) 1991
@@ -32321,11 +32797,11 @@
 mschamp                         // hack by RAYGLO MFG "Zola-Puc" (c) 1992/1993
 mschamps                        // hack (hack of the Rayglo hack?)
 msheartb                        // hack
-mspacmbmc                       // bootleg (Marti Colls / Falgas)
 mspacii                         // bootleg
 mspacii2                        // bootleg
 mspacmab                        // bootleg
 mspacmab2                       // bootleg
+mspacmab3                       // bootleg
 mspacman                        // (c) 1981 Midway  // made by General Computer
 mspacmanbcc                     // bootleg
 mspacmanbco                     // bootleg
@@ -32338,6 +32814,8 @@
 mspacmancr                      // bootleg on Crush Roller board
 mspacmat                        // hack
 mspacmbe                        // bootleg
+mspacmbmc                       // bootleg (Marti Colls / Falgas)
+mspacmbn                        // bootleg
 mspacmnf                        // hack
 mspacpls                        // hack
 newpuc2                         // hack
@@ -33401,27 +33879,30 @@
 ddpdojblka                      //
 ddpdojblkbl                     //
 dmnfrnt                         // (c) 2002 Demon Front
-dmnfrnta                        //
-dmnfrntb                        //
+dmnfrnt103                      //
+dmnfrnt102                      //
 dmnfrntpcb                      //
 drgw2                           // (c) 1997 Dragon World 2
-drgw2c                          //
-drgw2hk                         //
-drgw2j                          //
+drgw2100x                       //
+drgw2101c                       //
+drgw2100c                       //
+drgw2100hk                      //
+drgw2100j                       //
 drgw3                           // (c) 1998 Dragon World 3
 drgw3100                        //
 drgw3103                        //
 drgw3105                        //
 dw2001                          // (c) 2001 Dragon World 2001
-dw2v100x                        //
 dwex                            // (c) 2000 Dragon World 3 EX V100
 dwex101cn                       // (c) 2001 Dragon World 3 EX V101CN
 dwpc                            // (c) 2001 Dragon World Pretty Chance
+dwpc101j                        //
 espgal                          // (c) 2003 Espgaluda
 espgalbl                        //
 happy6                          // (c) 2004 Happy 6
 happy6101                       //
 happy6100hk                     //
+happy6100cn                     //
 ket                             // (c) 2002 Ketsui
 ket1                            //
 keta                            //
@@ -33439,8 +33920,8 @@
 killbld106                      //
 killbldp                        // (c) 2004 Killing Blade Plus
 kov                             // (c) 1999 Knights of Valor
-kov100                          //
-kov100hk                        //
+kov111                          //
+kov114                          //
 kov115                          //
 kov2                            // (c) 2000 Knights of Valor 2
 kov2100                         //
@@ -33452,6 +33933,7 @@
 kov2p                           // (c) 2000 Knights of Valor 2 Nine Dragons
 kov2p200                        //
 kov2p202                        //
+kov2p203                        //
 kov2p204                        //
 kovlsjb                         // bootleg
 kovlsjba                        // bootleg
@@ -33469,21 +33951,23 @@
 kovsh102                        //
 kovsh103                        //
 kovshp                          // (c) 2004 Knights of Valor Superheroes PLUS
-kovshpa                         //
+kovshp100                       //
 kovshxas                        // bootleg
 kovytzy                         // (c) 1999 Knights of Valour: Yi Tong Zhong Yuan
 martmast                        // (c) 2001 Martial Masters
-martmastc                       //
-martmastc103                    //
-martmastc102                    //
+martmast104c                    //
+martmast103c                    //
+martmast102c                    //
 martmasttw                      //
 olds                            // (c) 1999 Oriental Legend Super / Special
 olds100                         //
 olds100a                        //
 olds103t                        //
 oldsplus                        // (c) 2004 Oriental Legend Super Plus
+oldsplus203                     //
 orlegend                        // (c) 1997 Oriental Legend
 orlegend105k                    //
+orlegend105t                    //
 orlegend111c                    //
 orlegend111k                    //
 orlegend111t                    //
@@ -33492,11 +33976,13 @@
 orlegende                       //
 pgm                             // Base Unit
 pgm3in1                         // (c) 2004 Photo Y2K2 3-in-1
+pgm3in1c100                     //
 photoy2k                        // (c) 1999 Photo Y2k
-photoy2k102                     //
+photoy2k102j                    //
 photoy2k103j                    // (c) 1999 Photo Y2k
 photoy2k104                     //
 puzlstar                        // (c) 1999 Puzzle Star
+puzlstara                       //
 puzzli2                         // (c) 1999 Puzzli 2
 puzzli2s                        // (c) 2001 Puzzli 2 Super
 py2k2                           // (c) 2001 Photo Y2K2 (M101XX)
@@ -33508,6 +33994,7 @@
 theglad100                      //
 theglad101                      //
 thegladpcb                      //
+thegladpcba                     //
 
 @source:pgm2.cpp
 ddpdojt                         // (c) 2010
@@ -33597,6 +34084,7 @@
 kok                             //
 
 @source:photoply.cpp
+photoply99sp                    // (c) 1999 Funworld
 photoply                        //
 photoply2k4                     //
 
@@ -34471,6 +34959,7 @@
 zookeep                         // ZA  (c) 1982 Taito America Corporation
 zookeep2                        // ZA  (c) 1982 Taito America Corporation
 zookeep3                        // ZA  (c) 1982 Taito America Corporation
+zookeepbl                       // bootleg
 
 @source:ql.cpp
 ql                              // 1984 Sinclair QL (UK)
@@ -34525,7 +35014,8 @@
 quizshow                        // 005464           1976/04 [2650]
 
 @source:qvt70.cpp
-qvt70                           //
+qvt70                           // (c) 1992 Qume Corp.
+qvt82                           // (c) 1993 Qume Corp.
 
 @source:qvt102.cpp
 qvt102                          // (c) 1983 Qume Corp.
@@ -35214,6 +35704,7 @@
 grgar_l1                        //
 grgar_t1                        //
 lzbal_l2                        //
+lzbal_l2sp                      //
 lzbal_t2                        //
 scrpn_l1                        //
 scrpn_t1                        //
@@ -35283,8 +35774,12 @@
 @source:sage2.cpp
 sage2
 
+@source:saitek_ccompan.cpp
+ccompan
+
 @source:saitek_chesstrv.cpp
 chesstrv
+chesstrvi
 
 @source:saitek_corona.cpp
 corona
@@ -35299,6 +35794,9 @@
 @source:saitek_exchess.cpp
 exchess
 
+@source:saitek_intchess.cpp
+intchess
+
 @source:saitek_leonardo.cpp
 galileo
 leonardo
@@ -36289,6 +36787,7 @@
 dinoki4                         // 2008.08 Kodai Ouja Kyouryuu King - Mezame yo! Arata-naru Chikara!! (Japan, Ver 4.000) (MDA-C0061)
 dinoking                        // 2005.09 Kodai Ouja Kyouryuu King / Ancient Ruler Dinosaur King
 dinokior                        //
+kingyoch                        // 2009.03 Yataimura Kingyosukui (4-player, China, Ver 1.000)
 loveber3                        //
 loveber3cn                      //
 lovebero                        //
@@ -36447,6 +36946,8 @@
 radrad                          // (c) 1982 Nichibutsu USA
 radradj                         // (c) 1982 Logitec Corp
 sectrzon                        // (c) 1984 + Alice
+sectrzona                       // (c) 1984 + Alice
+sectrzont                       // (c) 1984 + Alice (on Tecfri PCB)
 seicross                        // (c) 1984 + Alice
 seicrossa                       // (c) 1984 + Alice
 
@@ -36950,6 +37451,9 @@
 @source:sigma21.cpp
 sigma21                         //
 
+@source:sigmab31.cpp
+cptlucky                        // (c) 199? Sigma
+
 @source:sigmab52.cpp
 jwildb52                        // (c) 199? Sigma
 jwildb52a                       // (c) 199? Sigma
@@ -37102,7 +37606,8 @@
 opwolf3                         // D74 (c) 1994 Taito Corporation Japan
 opwolf3j                        // D74 (c) 1994 Taito Corporation
 opwolf3u                        // D74 (c) 1994 Taito America Corporation
-slapshot                        // D71 (c) 1994 Taito Corporation (Japan)
+slapshot                        // D71 (c) 1994 Taito Corporation Japan (Ver 3.0 O)
+slapshotj                       // D71 (c) 1994 Taito Corporation (Ver 2.2 J)
 
 @source:slc1.cpp
 slc1                            //
@@ -37167,6 +37672,7 @@
 sureshot                        // (c) 1985 SMS MFG CORP
 smsjoker                        // (c) 1985 SMS MFG CORP
 sms4in1                         // (c) 1984 SMS MFG CORP
+sms4in1a                        // (c) 1984 SMS MFG CORP
 trvhang                         // (c) 1984 SMS MFG CORP
 trvhanga                        // (c) 1984 SMS MFG CORP
 
@@ -37177,6 +37683,7 @@
 @source:snesb51.cpp
 mk3snes
 snes4sl
+snes4sln
 
 @source:snesb.cpp
 denseib                         // bootleg
@@ -37419,13 +37926,19 @@
 specpls2                        // 1986 ZX Spectrum +2
 
 @source:special.cpp
+anakonda                        //
 erik                            //
+kharkovsky                      //
 lik                             //
 pioner                          //
 special                         //
 specialm                        //
 specialp                        //
 specimx                         //
+unga                            //
+
+@source:special_gambl.cpp
+dindice                         //
 
 @source:specpls3.cpp
 sp3e8bit                        // 2002 ZX Spectrum +3e 8bit IDE
@@ -37505,6 +38018,7 @@
 
 @source:spg29x_lexibook_jg7425.cpp
 lx_jg7425
+lx_aven
 
 @source:spg2xx.cpp
 rad_skat                        //
@@ -37514,6 +38028,7 @@
 mattelcs                        //
 comil                           //
 abltenni                        //
+totspies
 fordrace
 tvsprt10                        //
 decathln
@@ -37525,6 +38040,7 @@
 guitarssa
 tmntbftc
 gssytts
+senwfit
 jjstrip
 vtechtvssp                      // (c) 2006 VTech
 vtechtvsgr                      // (c) 2006 VTech
@@ -37533,6 +38049,9 @@
 swclone
 dreamlss
 senspeed
+ordentv
+wfcentro
+tiktokmm
 
 @source:spg2xx_digimake.cpp
 rad_digi
@@ -37596,7 +38115,13 @@
 
 @source:spg2xx_pdc.cpp
 pdc100
+pdc50
+pdc200
+pdc40t
+pdc150t
 tmntpdc
+dorapdc
+vjpp2
 
 @source:spg2xx_playvision.cpp
 pvmil                           //
@@ -37621,6 +38146,7 @@
 taikeegr                        //
 shredmjr                        //
 guitarst
+guitarstp
 
 @source:spg2xx_smarttv.cpp
 smartvad
@@ -37638,6 +38164,9 @@
 wiwi18                          //
 foxsport
 lexifit
+marc101
+marc250
+guitrbus
 
 @source:spg2xx_zone.cpp
 wirels60                        // Wireless 60
@@ -37647,9 +38176,12 @@
 zone60                          // Zone 60
 zone100                         //
 lx_jg7415                       //
+zonemini
+react
 
 @source:spg2xx_zone_32bit.cpp
 mywicodx                        //
+mywicogt
 zon32bit                        // Zone 32-bit
 oplayer
 dnv200fs
@@ -37683,6 +38215,9 @@
 splash10                        // (c) 1992 - Ref 922804
 ringball                        // not a gaelco game but based on splash code
 
+@source:splash_ms.cpp
+splashms
+
 @source:splus.cpp
 spset005                        // (c) 1993 IGT - International Game Technology
 spset015                        // (c) 1993 IGT - International Game Technology
@@ -38558,6 +39093,7 @@
 drakor                          //
 fireact                         //
 fireactd                        //
+football                        //
 gemini2k                        //
 gemini2k1                       //
 gork                            //
@@ -39162,6 +39698,9 @@
 @source:tecnbras.cpp
 tecnbras                        //
 
+@source:tecnodar.cpp
+tecnodar                        //
+
 @source:tehkanwc.cpp
 gridiron                        // (c) 1985 Tehkan
 teedoff                         // 6102 - (c) 1986 Tecmo
@@ -39773,6 +40312,7 @@
 pipibibsa                       // TP-025
 pipibibsbl                      // (c) 1991 Ryouta Kikaku (bootleg)
 pipibibsbl2                     // bootleg
+pipibibsbl3                     // (c) 1991 Ryouta Kikaku (bootleg)
 pipibibsp                       // TP-025
 pwrkick                         // (c) 1994 Sunwise
 shippumd                        // (c) 1994 Raizing/8ing
@@ -40256,12 +40796,15 @@
 @source:unixpc.cpp
 3b1                             // 3B1 "Unix PC"
 
+@source:unk6502_st2xxx.cpp
+bbl380
+ragc153
+dphh8630
+dgun2953
+
 @source:unkhorse.cpp
 unkhorse                        //
 
-@source:unkmandd.cpp
-unkmandd
-
 @source:unkpoker.cpp
 unkpoker                         //
 
@@ -41305,12 +41848,13 @@
 playball                        // (c) 1983
 robotron                        // (c) 1982
 robotronyo                      // (c) 1982
+robotronun                      // (c) 1982
 robotron87                      //
 robotron12                      //
 robotrontd                      //
 sinistar                        // (c) 1982
-sinistar1                       // (c) 1982
 sinistar2                       // (c) 1982
+sinistarp                       // (c) 1982 prototype (shown at AMOA 1982 show)
 spdball                         // (c) 1985
 splat                           // (c) 1982
 stargate                        // (c) 1981
@@ -41330,11 +41874,12 @@
 wiping                          // (c) 1982
 
 @source:witch.cpp
+keirinou                        // (c) 1987 Excellent System
 pbchmp95                        // (c) 1995 Veltmeijer Automaten
 witch                           // (c) 1992 Excellent System
 witchb                          // (c) 1992 Excellent System
 witchs                          // (c) 1992 Sega / Vic Tokai license
-keirinou
+witchstar                       // (c) 1994 Fovis Korea Co. Ltd.
 
 @source:wiz.cpp
 kungfut                         // (c) 1984 Seibu Kaihatsu
@@ -41462,11 +42007,13 @@
 dd_p06                          //
 dd_p7                           //
 fh_905h                         //
+fh_l2                           //
 fh_l3                           //
 fh_l4                           //
 fh_l5                           //
 fh_l9                           //
 fh_l9b                          //
+fh_pa1                          //
 hd_l1                           //
 hd_l2                           //
 hd_l3                           //
@@ -41758,15 +42305,11 @@
 rad_madf                        //
 rad_fb                          //
 rad_socr                        //
-epo_bowl                        //
 epo_esdx                        //
 epo_epp                         //
 epo_eppk                        //
 epo_epp3                        //
 epo_efdx                        //
-epo_tfit
-epo_ebox                        //
-epo_sdb                         //
 epo_guru                        //
 epo_dmon                        //
 rad_rh                          //
@@ -41781,8 +42324,6 @@
 tcarnavi                        //
 tomcpin
 tomplc
-mrangbat
-ban_onep                        //
 ekara                           //
 ekaraa                          //
 ekaraj                          //
@@ -41798,10 +42339,22 @@
 jpopira                         //
 evio                            //
 gcslottv                        //
+
+@source:xavix_2000.cpp
+epo_ebox                        //
+epo_bowl                        //
+epo_sdb                         //
 ttv_sw                          //
 ttv_lotr                        //
 ttv_mx                          //
 drgqst                          //
+ban_onep                        //
+
+@source:xavix_2002.cpp
+suprpctv
+udance
+mrangbat
+epo_tfit
 tmy_thom                        //
 xavtenni                        //
 xavbaseb                        //
@@ -42060,6 +42613,7 @@
 
 @source:zaurus.cpp
 zsl5500                         // Sharp Zaurus SL-5500 "Collie"
+zslc500                         // Sharp Zaurus SL-C500
 zsl5600                         // Sharp Zaurus SL-5600 / SL-B500 "Poodle"
 zslc1000                        // Sharp Zaurus SL-C1000 "Akita"
 zslc3000                        // Sharp Zaurus SL-C3000 "Spitz"
@@ -42117,6 +42671,7 @@
 coh1002m                        //
 coh3002c                        //
 doapp                           // Dead Or Alive ++ (JAPAN)
+doappk                          // Dead Or Alive ++ (Korea)
 flamegun                        // Flame Gunner (USA)
 flamegunj                       // Flame Gunner (JAPAN)
 ftimpact                        // Fighters' Impact (Ver 2.02O)
diff -Nru mame-0.222+dfsg.1/src/mame/mess.flt mame-0.224+dfsg.1/src/mame/mess.flt
--- mame-0.222+dfsg.1/src/mame/mess.flt	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/mess.flt	2020-08-26 08:57:19.000000000 +0000
@@ -96,6 +96,7 @@
 aussiebyte.cpp
 ave_arb.cpp
 avigo.cpp
+avrmax.cpp
 ax20.cpp
 b16.cpp
 b2m.cpp
@@ -106,7 +107,6 @@
 basssta.cpp
 bbc.cpp
 bbcbc.cpp
-bbl380.cpp
 bcs3.cpp
 bebox.cpp
 bert.cpp
@@ -161,6 +161,7 @@
 chessmate.cpp
 chessmst.cpp
 cit101.cpp
+cit101xl.cpp
 cit1500.cpp
 cit220.cpp
 cking_master.cpp
@@ -190,7 +191,6 @@
 cortex.cpp
 cosmicos.cpp
 cp1.cpp
-craft.cpp
 crimson.cpp
 crvision.cpp
 ct486.cpp
@@ -257,6 +257,7 @@
 emma2.cpp
 emu2.cpp
 emu3.cpp
+emu68k.cpp
 enmirage.cpp
 ep64.cpp
 epic14e.cpp
@@ -276,6 +277,8 @@
 evmbug.cpp
 excali64.cpp
 exelv.cpp
+exorciser.cpp
+exorterm.cpp
 exp85.cpp
 facit4440.cpp
 falco5220.cpp
@@ -326,7 +329,7 @@
 gamepock.cpp
 gb.cpp
 gba.cpp
-generalplus_gpl16250.cpp
+generalplus_gpl_unknown.cpp
 generalplus_gpl16250_mobigo.cpp
 generalplus_gpl16250_nand.cpp
 generalplus_gpl16250_rom.cpp
@@ -420,7 +423,6 @@
 inteladv.cpp
 intellec4.cpp
 intellect02.cpp
-interact.cpp
 interpro.cpp
 intv.cpp
 ipc.cpp
@@ -460,7 +462,9 @@
 kawai_k1.cpp
 kawai_k4.cpp
 kawai_k5.cpp
+kawai_ksp10.cpp
 kawai_r100.cpp
+kawai_sx240.cpp
 kaypro.cpp
 kc.cpp
 kdt6.cpp
@@ -471,6 +475,7 @@
 korgdvp1.cpp
 korgdw8k.cpp
 korgm1.cpp
+korgws.cpp
 korgz3.cpp
 kramermc.cpp
 krokha.cpp
@@ -487,7 +492,11 @@
 leapster.cpp
 learnwin.cpp
 lee1214.cpp
+lee1220.cpp
 lft.cpp
+lft_chiptune.cpp
+lft_craft.cpp
+lft_phasor.cpp
 lg-dvd.cpp
 lilith.cpp
 lisa.cpp
@@ -497,7 +506,6 @@
 lola8a.cpp
 lviv.cpp
 lwriter.cpp
-lx_jg7425.cpp
 lynx.cpp
 m20.cpp
 m24.cpp
@@ -531,6 +539,7 @@
 mekd3.cpp
 mekd4.cpp
 mekd5.cpp
+mephisto_academy.cpp
 mephisto_berlin.cpp
 mephisto_brikett.cpp
 mephisto_glasgow.cpp
@@ -552,6 +561,7 @@
 microb.cpp
 microdec.cpp
 microkit.cpp
+microkorg.cpp
 micromon.cpp
 micronic.cpp
 microtan.cpp
@@ -582,6 +592,7 @@
 mod8.cpp
 modellot.cpp
 molecular.cpp
+monkey_king_3b.cpp
 monon_color.cpp
 monty.cpp
 mpc3000.cpp
@@ -629,6 +640,7 @@
 nes_sh6578.cpp
 nes_vt.cpp
 newbrain.cpp
+news_38xx.cpp
 news_68k.cpp
 news_r3k.cpp
 next.cpp
@@ -640,6 +652,7 @@
 novag_cforte.cpp
 novag_const.cpp
 novag_diablo.cpp
+novag_micro.cpp
 novag_micro2.cpp
 novag_savant.cpp
 novag_sexpert.cpp
@@ -769,8 +782,6 @@
 qx10.cpp
 r9751.cpp
 radio86.cpp
-rad_eu3a05.cpp
-rad_eu3a14.cpp
 rainbow.cpp
 rambo.cpp
 ravens.cpp
@@ -810,11 +821,13 @@
 sacstate.cpp
 sag.cpp
 sage2.cpp
+saitek_ccompan.cpp
 saitek_chesstrv.cpp
 saitek_corona.cpp
 saitek_cp2000.cpp
 saitek_delta1.cpp
 saitek_exchess.cpp
+saitek_intchess.cpp
 saitek_leonardo.cpp
 saitek_mark5.cpp
 saitek_minichess.cpp
@@ -1020,7 +1033,7 @@
 unistar.cpp
 univac.cpp
 unixpc.cpp
-unkmandd.cpp
+unk6502_st2xxx.cpp
 ut88.cpp
 uzebox.cpp
 v100.cpp
@@ -1044,7 +1057,6 @@
 vic20.cpp
 victor9k.cpp
 vidbrain.cpp
-vii.cpp
 vip.cpp
 vis.cpp
 vixen.cpp
@@ -1085,6 +1097,8 @@
 x1twin.cpp
 x68k.cpp
 xavix.cpp
+xavix_2000.cpp
+xavix_2002.cpp
 xavix2.cpp
 xbase09.cpp
 xbox.cpp
diff -Nru mame-0.222+dfsg.1/src/mame/nl.lst mame-0.224+dfsg.1/src/mame/nl.lst
--- mame-0.222+dfsg.1/src/mame/nl.lst	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/nl.lst	2020-08-26 08:57:19.000000000 +0000
@@ -22,6 +22,45 @@
 
 /* FIXME: games commented out complain about being a clone of a game not in the driver */
 
+@source:cinemat.cpp
+armora                          // (c) 1980
+armorap                         // (c) 1980
+armorar                         // (c) 1980 Cinematronics (Rock-ola license)
+barrier                         // (c) 1979 Vectorbeam
+boxingb                         // (c) 1981
+demon                           // (c) 1982 Rock-ola
+qb3                             // (c) 1982 Rock-ola - prototype
+ripoff                          // (c) 1980
+solarq                          // (c) 1981
+spaceftr                        // (c) 1981 Zaccaria
+spaceshp                        // (c) 1978 Cinematronics (Sega licence)
+spacewar                        // (c) 1977
+speedfrk                        // (c) 1979 Vectorbeam
+starcas                         // (c) 1980
+starcas1                        // (c) 1980
+starcasc                        // (c) 1980
+starcase                        // (c) 1980 Cinematronics (Mottoeis license)
+starcasp                        // (c) 1980 prototype
+starhawk                        // (c) 1979
+stellcas                        // bootleg
+sundance                        // (c) 1979
+tailg                           // (c) 1979
+warrior                         // (c) 1979 Vectorbeam
+wotw                            // (c) 1981
+wotwc                           // (c) 1981
+
+@source:carpolo.cpp
+carpolo                         // (c) 1977
+
+@source:starfire.cpp
+fireone                         // (c) 1979 Exidy
+starfir2                        // (c) 1979 Exidy
+starfire                        // Exidy [1979?]
+starfirea                       // Exidy [1979?]
+
+@source:flyball.cpp
+flyball
+
 @source:galaxian.cpp
 600                             // GX353 (c) 1981 Konami
 amidar                          // GX337 (c) 1982 Konami
@@ -279,6 +318,7 @@
 gunfight                        // 597 [1975] Dave Nutting Associates / Midway
 gunfighto                       // 597 [1975] Dave Nutting Associates / Midway
 280zzzap                        // 610 [1976] Dave Nutting Associates / Midway
+lagunar                         // 622 [1977] Midway
 
 @source:palestra.cpp
 palestra
@@ -295,6 +335,49 @@
 popeyejo
 popeyehs
 
+@source:segag80r.cpp
+005                             // (c) 1981
+astrob                          // (c) 1981
+astrob1                         // (c) 1981
+astrob2                         // (c) 1981
+astrob2a                        // (c) 1981
+astrob2b                        // (c) 1981
+astrobg                         // (c) 1981
+monsterb                        // (c) 1982
+monsterb2                       // (c) 1982
+pignewt                         // (c) 1983
+pignewta                        // (c) 1983
+sindbadm                        // 834-5244 (c) 1983 Sega
+spaceod                         // (c) 1981
+spaceod2                        // (c) 1981
+
+@source:segag80v.cpp
+elim2                           // (c) 1981 Gremlin
+elim2a                          // (c) 1981 Gremlin
+elim2c                          // (c) 1981 Gremlin
+elim4                           // (c) 1981 Gremlin
+elim4p                          // (c) 1981 Gremlin
+spacfury                        // (c) 1981
+spacfurya                       // no copyright notice
+spacfuryb                       // no copyright notice
+startrek                        // (c) 1982
+tacscan                         // (c) 1982
+zektor                          // (c) 1982
+
+@source:zaxxon.cpp
+congo                           // 605-5167 (c) 1983 (2 board stack)
+congoa                          // 605-5167 (c) 1983 (3 board stack)
+futspy                          // (c) 1984
+ixion                           // (c) 1983
+razmataz                        // modified 834-0213, 834-0214 (c) 1983
+szaxxon                         // (c) 1982
+tiptop                          // 605-5167 (c) 1983 (3 board stack)
+zaxxon                          // (c) 1982
+zaxxon2                         // (c) 1982
+zaxxon3                         // (c) 1982
+zaxxonb                         // bootleg
+zaxxonj                         // (c) 1982
+
 @source:segas16b.cpp
 aceattac                        // (c) 1988 (FD1094)
 //afightere
@@ -438,6 +521,11 @@
 wrestwar2                       // (c) 1989 (FD1094)
 wrestwar2d                      //
 
+@source:sspeedr.cpp
+sspeedr                         // Midway
+
+@source:starcrus.cpp
+starcrus
 
 @source:testpat.cpp
 tp1983
diff -Nru mame-0.222+dfsg.1/src/mame/video/ac1.cpp mame-0.224+dfsg.1/src/mame/video/ac1.cpp
--- mame-0.222+dfsg.1/src/mame/video/ac1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/ac1.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,61 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/***************************************************************************
-
-        AC1 video driver by Miodrag Milanovic
-
-        15/01/2009 Preliminary driver.
-
-****************************************************************************/
-
-#include "emu.h"
-#include "includes/ac1.h"
-
-#define AC1_VIDEO_MEMORY        0x1000
-
-const gfx_layout ac1_charlayout =
-{
-	6, 8,               /* 6x8 characters */
-	256,                /* 256 characters */
-	1,                  /* 1 bits per pixel */
-	{0},                /* no bitplanes; 1 bit per pixel */
-	{7, 6, 5, 4, 3, 2},
-	{0 * 8, 1 * 8, 2 * 8, 3 * 8, 4 * 8, 5 * 8, 6 * 8, 7 * 8},
-	8*8                 /* size of one char */
-};
-
-void ac1_state::video_start()
-{
-}
-
-uint32_t ac1_state::screen_update_ac1(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	int x,y;
-	address_space &space = m_maincpu->space(AS_PROGRAM);
-
-	for(y = 0; y < 16; y++ )
-	{
-		for(x = 0; x < 64; x++ )
-		{
-			int code = space.read_byte(AC1_VIDEO_MEMORY + x + y*64);
-			m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,  code , 0, 0,0, 63*6-x*6,15*8-y*8);
-		}
-	}
-	return 0;
-}
-
-uint32_t ac1_state::screen_update_ac1_32(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	int x,y;
-	address_space &space = m_maincpu->space(AS_PROGRAM);
-
-	for(y = 0; y < 32; y++ )
-	{
-		for(x = 0; x < 64; x++ )
-		{
-			int code = space.read_byte(AC1_VIDEO_MEMORY + x + y*64);
-			m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,  code , 0, 0,0, 63*6-x*6,31*8-y*8);
-		}
-	}
-	return 0;
-}
diff -Nru mame-0.222+dfsg.1/src/mame/video/apple2.cpp mame-0.224+dfsg.1/src/mame/video/apple2.cpp
--- mame-0.222+dfsg.1/src/mame/video/apple2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/apple2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -118,6 +118,7 @@
 	save_item(NAME(m_GSborder));
 	save_item(NAME(m_newvideo));
 	save_item(NAME(m_monochrome));
+	save_item(NAME(m_rgbmode));
 	save_item(NAME(m_shr_palette));
 }
 
@@ -136,6 +137,7 @@
 	m_80store = false;
 	m_monohgr = false;
 	m_newvideo = 0x01;
+	m_rgbmode = 3;  // default to color DHGR
 }
 
 WRITE_LINE_MEMBER(a2_video_device::txt_w)
@@ -174,6 +176,14 @@
 {
 	// select double hi-res
 	screen().update_now();
+
+	// RGB cards shift in a mode bit on the rising edge
+	if ((m_dhires) && (state))
+	{
+		m_rgbmode = (m_rgbmode << 1) & 3;
+		m_rgbmode |= m_80col ? 1 : 0;
+	}
+
 	m_dhires = !state;
 }
 
@@ -453,7 +463,7 @@
 
 	switch (m_sysconfig & 0x03)
 	{
-		case 0: fg = WHITE; break;
+		case 0: case 4: fg = WHITE; break;
 		case 1: fg = WHITE; break;
 		case 2: fg = GREEN; break;
 		case 3: fg = ORANGE; break;
@@ -570,7 +580,7 @@
 
 	switch (m_sysconfig & 0x03)
 	{
-		case 0: fg = WHITE; break;
+		case 0: case 4: fg = WHITE; break;
 		case 1: fg = WHITE; break;
 		case 2: fg = GREEN; break;
 		case 3: fg = ORANGE; break;
@@ -750,13 +760,14 @@
 	int fg = 0;
 	int bg = 0;
 
+	if (m_aux_ptr)
+	{
+		aux_page = m_aux_ptr;
+	}
+
 	if (m_80col)
 	{
 		start_address = 0x400;
-		if (m_aux_ptr)
-		{
-			aux_page = m_aux_ptr;
-		}
 	}
 	else
 	{
@@ -768,7 +779,7 @@
 
 	switch (m_sysconfig & 0x03)
 	{
-		case 0: fg = WHITE; break;
+		case 0: case 4: fg = WHITE; break;
 		case 1: fg = WHITE; break;
 		case 2: fg = GREEN; break;
 		case 3: fg = ORANGE; break;
@@ -795,6 +806,13 @@
 			{
 				/* calculate address */
 				address = start_address + ((((row/8) & 0x07) << 7) | (((row/8) & 0x18) * 5 + col));
+				if (((m_sysconfig & 7) == 4) && (m_dhires))
+				{
+					u8 tmp = aux_page[address];
+					fg = tmp>>4;
+					bg = tmp & 0xf;
+				}
+
 				plot_text_character(bitmap, col * 14, row, 2, m_ram_ptr[address],
 					m_char_ptr, m_char_size, fg, bg);
 			}
@@ -815,7 +833,7 @@
 
 	switch (m_sysconfig & 0x03)
 	{
-		case 0: fg = WHITE; break;
+		case 0: case 4: fg = WHITE; break;
 		case 1: fg = WHITE; break;
 		case 2: fg = GREEN; break;
 		case 3: fg = ORANGE; break;
@@ -1027,6 +1045,12 @@
 				mon_type = 1;
 			}
 
+			// IIgs $C021 monochrome HGR
+			if (m_monochrome & 0x80)
+			{
+				mon_type = 1;
+			}
+
 			switch (mon_type)
 			{
 				case 0:
@@ -1225,6 +1249,8 @@
 	uint32_t w;
 	int page = m_page2 ? 0x4000 : 0x2000;
 	int mon_type = m_sysconfig & 0x03;
+	bool bIsRGB = ((m_sysconfig & 7) == 4);
+	bool bIsRGBMixed = ((bIsRGB) && (m_rgbmode == 1));
 
 	// IIgs force-monochrome-DHR setting
 	if (m_newvideo & 0x20)
@@ -1232,6 +1258,12 @@
 		mon_type = 1;
 	}
 
+	// IIe RGB card monochrome DHR
+	if ((bIsRGB) && (m_rgbmode == 0))
+	{
+		mon_type = 1;
+	}
+
 	/* sanity checks */
 	if (beginrow < cliprect.top())
 		beginrow = cliprect.top();
@@ -1265,19 +1297,96 @@
 
 		p = &bitmap.pix16(row);
 
+		// RGB DHR 160-wide mode
+		if ((bIsRGB) && (m_rgbmode == 2))
+		{
+			mon_type = 4;
+		}
+
 		for (col = 0; col < 80; col++)
 		{
 			w =     (((uint32_t) vram_row[col+0] & 0x7f) <<  0)
 				|   (((uint32_t) vram_row[col+1] & 0x7f) <<  7)
 				|   (((uint32_t) vram_row[col+2] & 0x7f) << 14);
 
+			/*
+			    DHGR pixel layout:
+			    column & 3 =  0        1        2        3
+			               nBBBAAAA nDDCCCCB nFEEEEDD nGGGGFFF
+
+			    n is don't care on the stock hardware's NTSC output.
+
+			    On RGB cards, in mixed mode (DHGR with special mode value == 1), n
+			    controls if a pixel quad starting in that byte is color or monochrome.
+			    Pixel quads A&B are controlled by n in byte 0, C&D by n in byte 1,
+			    E&F by n in byte 2, and G by n in byte 3.
+			*/
+
 			switch (mon_type)
 			{
 				case 0:
-					for (b = 0; b < 7; b++)
+					// every 3rd column, the first pixel quad is controlled by the previous
+					// byte's MSB, because we always draw 2 quads per column.
+					if ((bIsRGBMixed) && ((col & 3) == 3))
 					{
-						v = m_dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F];
-						*(p++) = v;
+						uint32_t tw = (w >> 6);
+
+						if (!(vram_row[col-1] & 0x80))
+						{
+							for (b = 0; b < 4; b++)
+							{
+								v = (tw & 1);
+								tw >>= 1;
+								*(p++) = v ? WHITE : BLACK;
+							}
+						}
+						else
+						{
+							for (b = 0; b < 4; b++)
+							{
+								v = m_dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F];
+								*(p++) = v;
+							}
+						}
+
+						if (!(vram_row[col] & 0x80))
+						{
+							for (b = 4; b < 7; b++)
+							{
+								v = (tw & 1);
+								tw >>= 1;
+								*(p++) = v ? WHITE : BLACK;
+							}
+						}
+						else
+						{
+							for (b = 4; b < 7; b++)
+							{
+								v = m_dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F];
+								*(p++) = v;
+							}
+						}
+					}
+					else
+					{
+						if ((bIsRGBMixed) && !(vram_row[col] & 0x80))
+						{
+							uint32_t tw = (w >> 6);
+							for (b = 0; b < 7; b++)
+							{
+								v = (tw & 1);
+								tw >>= 1;
+								*(p++) = v ? WHITE : BLACK;
+							}
+						}
+						else
+						{
+							for (b = 0; b < 7; b++)
+							{
+								v = m_dhires_artifact_map[((((w >> (b + 7-1)) & 0x0F) * 0x11) >> (((2-(col*7+b))) & 0x03)) & 0x0F];
+								*(p++) = v;
+							}
+						}
 					}
 					break;
 
@@ -1310,6 +1419,35 @@
 						*(p++) = v ? ORANGE : BLACK;
 					}
 					break;
+
+				// RGB 160-wide mode (which has a much simpler VRAM layout)
+				case 4:
+					if (col == 0)
+					{
+						// Center the 480-wide image in the 560-wide display.
+						// Aspect ratio won't be perfect, but it's in range.
+						for (b = 0; b < 40; b++)
+						{
+							*(p++) = BLACK;
+						}
+					}
+					v = vram_row[col];
+					*(p++) = v & 0xf;
+					*(p++) = v & 0xf;
+					*(p++) = v & 0xf;
+					v >>= 4;
+					*(p++) = v & 0xf;
+					*(p++) = v & 0xf;
+					*(p++) = v & 0xf;
+					break;
+			}
+		}
+
+		if (mon_type == 4)
+		{
+			for (b = 0; b < 40; b++)
+			{
+				*(p++) = BLACK;
 			}
 		}
 	}
diff -Nru mame-0.222+dfsg.1/src/mame/video/apple2.h mame-0.224+dfsg.1/src/mame/video/apple2.h
--- mame-0.222+dfsg.1/src/mame/video/apple2.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/apple2.h	2020-08-26 08:57:19.000000000 +0000
@@ -32,8 +32,8 @@
 	bool m_an2;
 	bool m_80store;
 	bool m_monohgr;
-	uint8_t m_GSfg, m_GSbg, m_GSborder, m_newvideo, m_monochrome;
-	uint32_t m_GSborder_colors[16], m_shr_palette[256];
+	u8 m_GSfg, m_GSbg, m_GSborder, m_newvideo, m_monochrome, m_rgbmode;
+	u32 m_GSborder_colors[16], m_shr_palette[256];
 	std::unique_ptr<bitmap_ind16> m_8bit_graphics;
 	std::unique_ptr<uint16_t[]> m_hires_artifact_map;
 	std::unique_ptr<uint16_t[]> m_dhires_artifact_map;
diff -Nru mame-0.222+dfsg.1/src/mame/video/atarirle.cpp mame-0.224+dfsg.1/src/mame/video/atarirle.cpp
--- mame-0.222+dfsg.1/src/mame/video/atarirle.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/atarirle.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,7 +2,7 @@
 // copyright-holders:Aaron Giles
 /***************************************************************************
 
-    atarirle.c
+    atarirle.cpp
 
     RLE sprite handling for early-to-mid 90's Atari raster games.
 
diff -Nru mame-0.222+dfsg.1/src/mame/video/b2m.cpp mame-0.224+dfsg.1/src/mame/video/b2m.cpp
--- mame-0.222+dfsg.1/src/mame/video/b2m.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/b2m.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/***************************************************************************
-
-        Bashkiria-2M video driver by Miodrag Milanovic
-
-        28/03/2008 Preliminary driver.
-
-****************************************************************************/
-
-
-#include "emu.h"
-#include "includes/b2m.h"
-#include "machine/ram.h"
-
-void b2m_state::video_start()
-{
-}
-
-uint32_t b2m_state::screen_update_b2m(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	uint8_t code1;
-	uint8_t code2;
-	uint8_t col;
-	int y, x, b;
-	uint8_t *ram = m_ram->pointer();
-
-	for (x = 0; x < 48; x++)
-	{
-		for (y = 0; y < 256; y++)
-		{
-			if (m_b2m_video_page==0) {
-				code1 = ram[0x11000 + x*256 + ((y + m_b2m_video_scroll) & 0xff)];
-				code2 = ram[0x15000 + x*256 + ((y + m_b2m_video_scroll) & 0xff)];
-			} else {
-				code1 = ram[0x19000 + x*256 + ((y + m_b2m_video_scroll) & 0xff)];
-				code2 = ram[0x1d000 + x*256 + ((y + m_b2m_video_scroll) & 0xff)];
-			}
-			for (b = 7; b >= 0; b--)
-			{
-				col = (((code2 >> b) & 0x01)<<1) + ((code1 >> b) & 0x01);
-				bitmap.pix16(y, x*8+b) =  col;
-			}
-		}
-	}
-
-	return 0;
-}
-
-void b2m_state::b2m_palette(palette_device &palette) const
-{
-	static constexpr rgb_t b2m_pens[4] = {
-		{ 0x00, 0x00, 0x00 }, // 0
-		{ 0x00, 0x00, 0x00 }, // 1
-		{ 0x00, 0x00, 0x00 }, // 2
-		{ 0x00, 0x00, 0x00 }, // 3
-	};
-
-	palette.set_pen_colors(0, b2m_pens);
-}
diff -Nru mame-0.222+dfsg.1/src/mame/video/bk.cpp mame-0.224+dfsg.1/src/mame/video/bk.cpp
--- mame-0.222+dfsg.1/src/mame/video/bk.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/bk.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/***************************************************************************
-
-        BK video driver by Miodrag Milanovic
-
-        10/03/2008 Preliminary driver.
-
-****************************************************************************/
-
-
-#include "emu.h"
-#include "includes/bk.h"
-
-
-void bk_state::video_start()
-{
-}
-
-uint32_t bk_state::screen_update_bk0010(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	uint16_t code;
-	int y, x, b;
-	int nOfs;
-
-	nOfs = (m_scrool - 728) % 256;
-
-	for (y = 0; y < 256; y++)
-	{
-		for (x = 0; x < 32; x++)
-		{
-			code = m_bk0010_video_ram[((y+nOfs) %256)*32 + x];
-			for (b = 0; b < 16; b++)
-			{
-				bitmap.pix16(y, x*16 + b) =  (code >> b) & 0x01;
-			}
-		}
-	}
-	return 0;
-}
diff -Nru mame-0.222+dfsg.1/src/mame/video/blstroid.cpp mame-0.224+dfsg.1/src/mame/video/blstroid.cpp
--- mame-0.222+dfsg.1/src/mame/video/blstroid.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/blstroid.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,10 +7,8 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "cpu/m68000/m68000.h"
-#include "machine/atarigen.h"
-#include "video/atarimo.h"
 #include "includes/blstroid.h"
+#include "cpu/m68000/m68000.h"
 
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/video/bosco.cpp mame-0.224+dfsg.1/src/mame/video/bosco.cpp
--- mame-0.222+dfsg.1/src/mame/video/bosco.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/bosco.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -91,7 +91,6 @@
 inline void bosco_state::get_tile_info_bosco(tile_data &tileinfo,int tile_index,int ram_offs)
 {
 	uint8_t attr = m_videoram[ram_offs + tile_index + 0x800];
-	tileinfo.category = (attr & 0x20) >> 5;
 	tileinfo.group = attr & 0x3f;
 	tileinfo.set(0,
 			m_videoram[ram_offs + tile_index],
@@ -250,18 +249,14 @@
 	fg_clip &= cliprect;
 
 	bitmap.fill(m_palette->black_pen(), cliprect);
-	m_starfield->draw_starfield(bitmap,bg_clip,flip);
+	m_starfield->draw_starfield(bitmap, bg_clip, flip);
 
-	m_bg_tilemap->draw(screen, bitmap, bg_clip, 0,0);
-	m_fg_tilemap->draw(screen, bitmap, fg_clip, 0,0);
+	draw_sprites(bitmap, bg_clip, flip);
 
-	draw_sprites(bitmap,bg_clip,flip);
+	m_bg_tilemap->draw(screen, bitmap, bg_clip);
+	m_fg_tilemap->draw(screen, bitmap, fg_clip);
 
-	/* draw the high priority characters */
-	m_bg_tilemap->draw(screen, bitmap, bg_clip, 1,0);
-	m_fg_tilemap->draw(screen, bitmap, fg_clip, 1,0);
-
-	draw_bullets(bitmap,cliprect,flip);
+	draw_bullets(bitmap, cliprect, flip);
 
 	/* It looks like H offsets 221-223 are skipped over, moving the radar tilemap
 	   (including the 'bullets' on it) 3 pixels to the left */
diff -Nru mame-0.222+dfsg.1/src/mame/video/btoads.cpp mame-0.224+dfsg.1/src/mame/video/btoads.cpp
--- mame-0.222+dfsg.1/src/mame/video/btoads.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/btoads.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -121,25 +121,6 @@
 
 /*************************************
  *
- *  Palette RAM
- *
- *************************************/
-
-void btoads_state::paletteram_w(offs_t offset, uint16_t data)
-{
-	m_tlc34076->write(offset/2, data);
-}
-
-
-uint16_t btoads_state::paletteram_r(offs_t offset)
-{
-	return m_tlc34076->read(offset/2);
-}
-
-
-
-/*************************************
- *
  *  Background video RAM
  *
  *************************************/
diff -Nru mame-0.222+dfsg.1/src/mame/video/busicom.cpp mame-0.224+dfsg.1/src/mame/video/busicom.cpp
--- mame-0.222+dfsg.1/src/mame/video/busicom.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/busicom.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1814,37 +1814,29 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 };
 
-void busicom_state::video_start()
-{
-}
-
 uint32_t busicom_state::screen_update_busicom(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	int y, x, b, j;
 	//34x44
-	for (y = 0; y < 11; y++)
+	for (u8 y = 0; y < 11; y++)
 	{
 		uint8_t col = 8 * m_printer_line_color[y];
-		for (x = 0; x < 17; x++)
+		for (u8 x = 0; x < 17; x++)
 		{
 			uint8_t chr = m_printer_line[y][x];
-			for (j = 0; j < 44; j++) {
-				for (b = 0; b < 34; b++)
-				{
+			for (u8 j = 0; j < 44; j++)
+			{
+				for (u8 b = 0; b < 34; b++)
 					bitmap.pix16((y*44)+j, x*40+b) =  printer_font[44*34 * chr + j*34 + b] + col ;
-				}
-				for (b = 34; b < 40; b++)
-				{
-					bitmap.pix16((y*44)+j, x*40+b) =  0;
-				}
 
+				for (u8 b = 34; b < 40; b++)
+					bitmap.pix16((y*44)+j, x*40+b) =  0;
 			}
 		}
 	}
 	return 0;
 }
-static constexpr uint8_t color[] = { 0xFF,0xDB,0xB7,0x92,0x6E,0x49,0x25,0x00 };
 
+static constexpr uint8_t color[] = { 0xFF,0xDB,0xB7,0x92,0x6E,0x49,0x25,0x00 };
 static constexpr uint8_t color_red[] = { 0xb0,0xb5,0xc0,0xc5,0xd0,0xd5,0xdf };
 
 void busicom_state::busicom_palette(palette_device &palette) const
diff -Nru mame-0.222+dfsg.1/src/mame/video/cave.cpp mame-0.224+dfsg.1/src/mame/video/cave.cpp
--- mame-0.222+dfsg.1/src/mame/video/cave.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/cave.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -89,9 +89,8 @@
 
 ***************************************************************************/
 
-void cave_state::vh_start(u16 sprcol_base, u16 sprcol_granularity)
+void cave_state::vh_start(u16 sprcol_granularity)
 {
-	m_sprite_base_pal = sprcol_base;
 	m_sprite_granularity = sprcol_granularity;
 
 	sprite_init();
@@ -125,25 +124,19 @@
 // 4 bit sprite granularity
 VIDEO_START_MEMBER(cave_state,spr_4bpp)
 {
-	vh_start(0, 16);
+	vh_start(16);
 }
 
 // 8 bit sprite granularity
 VIDEO_START_MEMBER(cave_state,spr_8bpp)
 {
-	vh_start(0, 256);
-}
-
-// korokoro (different sprite base palette)
-VIDEO_START_MEMBER(cave_state,korokoro)
-{
-	vh_start(0x3c00, 16);
+	vh_start(256);
 }
 
 // ppsatan (3 screen)
 VIDEO_START_MEMBER(cave_state,ppsatan)
 {
-	vh_start(0x3c00, 16);
+	vh_start(16);
 	for (int chip = 1; chip < 3; chip++)
 	{
 		m_background_pen[chip] = m_gfxdecode[chip]->gfx(0)->colorbase() +
@@ -231,12 +224,11 @@
 void cave_state::get_sprite_info_cave(int chip)
 {
 	chip %= 4;
-	const u8 *base_gfx = m_spriteregion[chip]->base();
-	const int code_max = m_spriteregion[chip]->bytes() / (16*16);
 
 	if (m_sprite[chip] == nullptr)
 		return;
 
+	gfx_element *gfx = m_spr_gfxdecode[chip]->gfx(0);
 	sprite_cave *sprite = m_sprite[chip].get();
 
 	const int glob_flipx = m_videoregs[chip][0] & 0x8000;
@@ -285,8 +277,7 @@
 			break;
 
 		/* Bound checking */
-		code %= code_max;
-		sprite->pen_data = base_gfx + (16 * 16) * code;
+		sprite->pen_data = &m_sprite_gfx[chip][(code << 8) & m_sprite_gfx_mask[chip]];
 
 		int flipx = attr & 0x0008;
 		int flipy = attr & 0x0004;
@@ -344,7 +335,7 @@
 		sprite->priority    = (attr & 0x0030) >> 4;
 		sprite->flags       = SPRITE_VISIBLE_CAVE;
 		sprite->line_offset = sprite->tile_width;
-		sprite->base_pen    = m_sprite_base_pal + (((attr & 0x3f00) >> 8) * m_sprite_granularity);   // first 0x4000 colors
+		sprite->base_pen    = gfx->colorbase() + (((attr & 0x3f00) >> 8) * gfx->granularity());   // first 0x4000 colors
 
 		if (glob_flipx) { x = max_x - x - sprite->total_width;  flipx = !flipx; }
 		if (glob_flipy) { y = max_y - y - sprite->total_height; flipy = !flipy; }
@@ -363,12 +354,11 @@
 void cave_state::get_sprite_info_donpachi(int chip)
 {
 	chip %= 4;
-	const u8 *base_gfx = m_spriteregion[chip]->base();
-	const int code_max = m_spriteregion[chip]->bytes() / (16*16);
 
 	if (m_sprite[chip] == nullptr)
 		return;
 
+	gfx_element *gfx = m_spr_gfxdecode[chip]->gfx(0);
 	sprite_cave *sprite = m_sprite[chip].get();
 
 	const int glob_flipx = m_videoregs[chip][0] & 0x8000;
@@ -404,8 +394,7 @@
 		sprite->tile_height = sprite->total_height = ((size >> 0) & 0x1f) * 16;
 
 		/* Bound checking */
-		code %= code_max;
-		sprite->pen_data = base_gfx + (16*16) * code;
+		sprite->pen_data = &m_sprite_gfx[chip][(code << 8) & m_sprite_gfx_mask[chip]];
 
 		if (x > 0x1ff)  x -= 0x400;
 		if (y > 0x1ff)  y -= 0x400;
@@ -424,12 +413,12 @@
 		if (m_spritetype[0] & TYPE_ISPWRINST2)    /* pwrinst2 */
 		{
 			sprite->priority = ((attr & 0x0010) >> 4) + 2;
-			sprite->base_pen = m_sprite_base_pal + ((((attr & 0x3f00) >> 8) + ((attr & 0x0020) << 1)) * m_sprite_granularity);
+			sprite->base_pen = gfx->colorbase() + ((((attr & 0x3f00) >> 8) + ((attr & 0x0020) << 1)) * gfx->granularity());
 		}
 		else
 		{
 			sprite->priority = (attr & 0x0030) >> 4;
-			sprite->base_pen = m_sprite_base_pal + (((attr & 0x3f00) >> 8) * m_sprite_granularity);  // first 0x4000 colors
+			sprite->base_pen = gfx->colorbase() + (((attr & 0x3f00) >> 8) * gfx->granularity());  // first 0x4000 colors
 		}
 
 		sprite->flags = SPRITE_VISIBLE_CAVE;
@@ -477,7 +466,7 @@
 	for (int chip = 0; chip < 4; chip++)
 	{
 		m_max_sprite_clk[chip] = 0;
-		if (m_videoregs[chip])
+		if (m_videoregs[chip] && m_spr_gfxdecode[chip])
 		{
 			for (int screen = 0; screen < 4; screen++)
 			{
@@ -492,6 +481,7 @@
 			}
 			m_num_sprites[chip] = m_spriteram[chip].bytes() / 0x10 / 2;
 			m_sprite[chip] = std::make_unique<sprite_cave []>(m_num_sprites[chip]);
+			m_spr_gfxdecode[chip]->gfx(0)->set_granularity(m_sprite_granularity);
 		}
 		else
 		{
diff -Nru mame-0.222+dfsg.1/src/mame/video/crshrace.cpp mame-0.224+dfsg.1/src/mame/video/crshrace.cpp
--- mame-0.222+dfsg.1/src/mame/video/crshrace.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/crshrace.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -13,14 +13,14 @@
 
 TILE_GET_INFO_MEMBER(crshrace_state::get_tile_info1)
 {
-	int code = m_videoram1[tile_index];
+	int code = m_videoram[0][tile_index];
 
 	tileinfo.set(1, (code & 0xfff) + (m_roz_bank << 12), code >> 12, 0);
 }
 
 TILE_GET_INFO_MEMBER(crshrace_state::get_tile_info2)
 {
-	int code = m_videoram2[tile_index];
+	int code = m_videoram[1][tile_index];
 
 	tileinfo.set(0, code, 0, 0);
 }
@@ -33,19 +33,19 @@
 ***************************************************************************/
 
 
-uint32_t crshrace_state::crshrace_tile_callback( uint32_t code )
+uint32_t crshrace_state::tile_callback(uint32_t code)
 {
-	return m_spriteram2->buffer()[code&0x7fff];
+	return m_spriteram[1]->buffer()[code&0x7fff];
 }
 
 
 void crshrace_state::video_start()
 {
-	m_tilemap1 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(crshrace_state::get_tile_info1)), TILEMAP_SCAN_ROWS, 16, 16, 64, 64);
-	m_tilemap2 = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(crshrace_state::get_tile_info2)), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
+	m_tilemap[0] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(crshrace_state::get_tile_info1)), TILEMAP_SCAN_ROWS, 16, 16, 64, 64);
+	m_tilemap[1] = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(crshrace_state::get_tile_info2)), TILEMAP_SCAN_ROWS, 8, 8, 64, 64);
 
-	m_tilemap1->set_transparent_pen(0x0f);
-	m_tilemap2->set_transparent_pen(0xff);
+	m_tilemap[0]->set_transparent_pen(0x0f);
+	m_tilemap[1]->set_transparent_pen(0xff);
 
 }
 
@@ -56,38 +56,21 @@
 
 ***************************************************************************/
 
-void crshrace_state::crshrace_videoram1_w(offs_t offset, uint16_t data, uint16_t mem_mask)
-{
-	COMBINE_DATA(&m_videoram1[offset]);
-	m_tilemap1->mark_tile_dirty(offset);
-}
 
-void crshrace_state::crshrace_videoram2_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void crshrace_state::roz_bank_w(offs_t offset, uint8_t data)
 {
-	COMBINE_DATA(&m_videoram2[offset]);
-	m_tilemap2->mark_tile_dirty(offset);
-}
-
-void crshrace_state::crshrace_roz_bank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
-{
-	if (ACCESSING_BITS_0_7)
+	if (m_roz_bank != data)
 	{
-		if (m_roz_bank != (data & 0xff))
-		{
-			m_roz_bank = data & 0xff;
-			m_tilemap1->mark_all_dirty();
-		}
+		m_roz_bank = data;
+		m_tilemap[0]->mark_all_dirty();
 	}
 }
 
 
-void crshrace_state::crshrace_gfxctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void crshrace_state::gfxctrl_w(offs_t offset, uint8_t data)
 {
-	if (ACCESSING_BITS_0_7)
-	{
-		m_gfxctrl = data & 0xdf;
-		m_flipscreen = data & 0x20;
-	}
+	m_gfxctrl = data;
+	m_flipscreen = data & 0x20;
 }
 
 
@@ -97,21 +80,21 @@
 
 ***************************************************************************/
 
-void crshrace_state::draw_bg( screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect )
+void crshrace_state::draw_bg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	m_tilemap2->draw(screen, bitmap, cliprect, 0, 0);
+	m_tilemap[1]->draw(screen, bitmap, cliprect, 0, 0);
 }
 
 
 void crshrace_state::draw_fg(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	m_k053936->zoom_draw(screen, bitmap, cliprect, m_tilemap1, 0, 0, 1);
+	m_k053936->zoom_draw(screen, bitmap, cliprect, m_tilemap[0], 0, 0, 1);
 }
 
 
-uint32_t crshrace_state::screen_update_crshrace(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t crshrace_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	if (m_gfxctrl & 0x04)   /* display disable? */
+	if (m_gfxctrl & 0x04)   // display disable?
 	{
 		bitmap.fill(m_palette->black_pen(), cliprect);
 		return 0;
@@ -123,8 +106,8 @@
 
 	switch (m_gfxctrl & 0xfb)
 	{
-		case 0x00:  /* high score screen */
-			m_spr->draw_sprites(m_spriteram->buffer(), 0x2000,  screen, bitmap, cliprect);
+		case 0x00:  // high score screen
+			m_spr->draw_sprites(m_spriteram[0]->buffer(), 0x2000,  screen, bitmap, cliprect);
 			draw_bg(screen, bitmap, cliprect);
 			draw_fg(screen, bitmap, cliprect);
 			break;
@@ -132,7 +115,7 @@
 		case 0x02:
 			draw_bg(screen, bitmap, cliprect);
 			draw_fg(screen, bitmap, cliprect);
-			m_spr->draw_sprites(m_spriteram->buffer(), 0x2000,  screen, bitmap, cliprect);
+			m_spr->draw_sprites(m_spriteram[0]->buffer(), 0x2000,  screen, bitmap, cliprect);
 			break;
 		default:
 			popmessage("gfxctrl = %02x", m_gfxctrl);
diff -Nru mame-0.222+dfsg.1/src/mame/video/cyberbal.cpp mame-0.224+dfsg.1/src/mame/video/cyberbal.cpp
--- mame-0.222+dfsg.1/src/mame/video/cyberbal.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/cyberbal.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,7 +7,6 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "machine/atarigen.h"
 #include "includes/cyberbal.h"
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/video/dai.cpp mame-0.224+dfsg.1/src/mame/video/dai.cpp
--- mame-0.222+dfsg.1/src/mame/video/dai.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/dai.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -9,7 +9,7 @@
   Krzysztof Strzecha
 
   All video modes are emulated but not fully tested yet.
-  dai_state::screen_update_dai() function needs strong cleanup and optimalisation.
+  dai_state::screen_update() function needs strong cleanup and optimisation.
 
 
 ***************************************************************************/
@@ -47,12 +47,12 @@
 	palette.set_pen_colors(0, s_palette);
 }
 
-uint32_t dai_state::screen_update_dai(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t dai_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	address_space &space = m_maincpu->space(AS_PROGRAM);
 	int i, j, k, l;
 
-	uint8_t* char_rom = memregion("gfx1")->base();
+	uint8_t* char_rom = memregion("chargen")->base();
 
 	uint16_t dai_video_memory_start = 0xbfff;
 	uint16_t dai_scan_lines = 604;    /* scan lines of PAL tv */
diff -Nru mame-0.222+dfsg.1/src/mame/video/decbac06.h mame-0.224+dfsg.1/src/mame/video/decbac06.h
--- mame-0.222+dfsg.1/src/mame/video/decbac06.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/decbac06.h	2020-08-26 08:57:19.000000000 +0000
@@ -7,7 +7,10 @@
 
 #include "screen.h"
 #include "tilemap.h"
+
 #include <memory>
+#include <utility>
+
 
 typedef device_delegate<void (tile_data &tileinfo, u32 &tile, u32 &colour, u32 &flags)> decbac06_tile_cb_delegate;
 
diff -Nru mame-0.222+dfsg.1/src/mame/video/elan_eu3a14vid.cpp mame-0.224+dfsg.1/src/mame/video/elan_eu3a14vid.cpp
--- mame-0.222+dfsg.1/src/mame/video/elan_eu3a14vid.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/elan_eu3a14vid.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -468,7 +468,7 @@
 	// this register use is questionable
 	if (m_ramtilecfg[0] & 0x80)
 	{
-		int rtm_size;;
+		int rtm_size;
 		int rtm_pagewidth;
 		int rtm_pageheight;
 		int rtm_yscroll;
diff -Nru mame-0.222+dfsg.1/src/mame/video/galaga.cpp mame-0.224+dfsg.1/src/mame/video/galaga.cpp
--- mame-0.222+dfsg.1/src/mame/video/galaga.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/galaga.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -229,9 +229,9 @@
 uint32_t galaga_state::screen_update_galaga(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	bitmap.fill(m_palette->black_pen(), cliprect);
-	m_starfield->draw_starfield(bitmap,cliprect,0);
+	m_starfield->draw_starfield(bitmap,cliprect, 0);
 	draw_sprites(bitmap,cliprect);
-	m_fg_tilemap->draw(screen, bitmap, cliprect, 0,0);
+	m_fg_tilemap->draw(screen, bitmap, cliprect);
 	return 0;
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/video/galaxy.cpp mame-0.224+dfsg.1/src/mame/video/galaxy.cpp
--- mame-0.222+dfsg.1/src/mame/video/galaxy.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/galaxy.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,9 +12,7 @@
 
 #include "emu.h"
 #include "includes/galaxy.h"
-
 #include "cpu/z80/z80.h"
-#include "screen.h"
 
 
 TIMER_CALLBACK_MEMBER(galaxy_state::gal_video)
@@ -23,19 +21,17 @@
 	int y, x;
 	if (m_interrupts_enabled == true)
 	{
-		uint8_t *gfx = m_region_gfx1->base();
-		uint8_t dat = (m_latch_value & 0x3c) >> 2;
+		uint8_t dat = BIT(m_latch_value, 2, 4);
 		if ((m_gal_cnt >= 48 * 2) && (m_gal_cnt < 48 * 210))  // display on screen just m_first 208 lines
 		{
-			uint8_t mode = (m_latch_value >> 1) & 1; // bit 2 latch represents mode
-			uint16_t addr = (m_maincpu->state_int(Z80_I) << 8) | m_maincpu->state_int(Z80_R) | ((m_latch_value & 0x80) ^ 0x80);
-			if (mode == 0)
+			uint16_t addr = (m_maincpu->state_int(Z80_I) << 8) | m_maincpu->state_int(Z80_R) | (~m_latch_value & 0x80);
+			if (!BIT(m_latch_value, 1)) // bit 2 latch represents mode
 			{
 				// Text mode
 				if (m_first == 0 && (m_maincpu->state_int(Z80_R) & 0x1f) == 0)
 				{
 					// Due to a fact that on real processor latch value is set at
-					// the end of last cycle we need to skip dusplay of double
+					// the end of last cycle we need to skip display of double
 					// m_first char in each row
 					m_code = 0x00;
 					m_first = 1;
@@ -44,27 +40,27 @@
 				{
 					m_code = space.read_byte(addr) & 0xbf;
 					m_code += (m_code & 0x80) >> 1;
-					m_code = gfx[(m_code & 0x7f) +(dat << 7 )] ^ 0xff;
+					m_code = m_p_chargen[(m_code & 0x7f) +(dat << 7 )] ^ 0xff;
 					m_first = 0;
 				}
 				y = m_gal_cnt / 48 - 2;
 				x = (m_gal_cnt % 48) * 8;
 
-				m_bitmap.pix16(y, x ) = (m_code >> 0) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 1) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 2) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 3) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 4) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 5) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 6) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 7) & 1;
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 0);
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 1);
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 2);
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 3);
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 4);
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 5);
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 6);
+				m_bitmap.pix16(y, x   ) = BIT(m_code, 7);
 			}
 			else
 			{ // Graphics mode
 				if (m_first < 4 && (m_maincpu->state_int(Z80_R) & 0x1f) == 0)
 				{
 					// Due to a fact that on real processor latch value is set at
-					// the end of last cycle we need to skip dusplay of 4 times
+					// the end of last cycle we need to skip display of 4 times
 					// m_first char in each row
 					m_code = 0x00;
 					m_first++;
@@ -79,40 +75,35 @@
 
 				/* hack - until calc of R is fixed in Z80 */
 				if (x == 11 * 8 && y == 0)
-				{
 					m_start_addr = addr;
-				}
+
 				if ((x / 8 >= 11) && (x / 8 < 44))
-				{
 					m_code = space.read_byte(m_start_addr + y * 32 + (m_gal_cnt % 48) - 11) ^ 0xff;
-				}
 				else
-				{
 					m_code = 0x00;
-				}
 				/* end of hack */
 
-				m_bitmap.pix16(y, x ) = (m_code >> 0) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 1) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 2) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 3) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 4) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 5) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 6) & 1; x++;
-				m_bitmap.pix16(y, x ) = (m_code >> 7) & 1;
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 0);
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 1);
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 2);
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 3);
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 4);
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 5);
+				m_bitmap.pix16(y, x++ ) = BIT(m_code, 6);
+				m_bitmap.pix16(y, x   ) = BIT(m_code, 7);
 			}
 		}
 		m_gal_cnt++;
 	}
 }
 
-void galaxy_state::galaxy_set_timer()
+void galaxy_state::set_timer()
 {
 	m_gal_cnt = 0;
 	m_gal_video_timer->adjust(attotime::zero, 0, attotime::from_hz(6144000 / 8));
 }
 
-void galaxy_state::video_start()
+void galaxy_state::machine_start()
 {
 	m_gal_cnt = 0;
 
@@ -120,9 +111,16 @@
 	m_gal_video_timer->adjust(attotime::zero, 0, attotime::never);
 
 	m_screen->register_screen_bitmap(m_bitmap);
+
+	save_item(NAME(m_interrupts_enabled));
+	save_item(NAME(m_latch_value));
+	save_item(NAME(m_gal_cnt));
+	save_item(NAME(m_code));
+	save_item(NAME(m_first));
+	save_item(NAME(m_start_addr));
 }
 
-uint32_t galaxy_state::screen_update_galaxy(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t galaxy_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	m_gal_video_timer->adjust(attotime::zero, 0, attotime::never);
 	if (m_interrupts_enabled == false)
diff -Nru mame-0.222+dfsg.1/src/mame/video/galeb.cpp mame-0.224+dfsg.1/src/mame/video/galeb.cpp
--- mame-0.222+dfsg.1/src/mame/video/galeb.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/galeb.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/***************************************************************************
-
-        Galeb video driver by Miodrag Milanovic
-
-        01/03/2008 Updated to work with latest SVN code
-        22/02/2008 Preliminary driver.
-
-****************************************************************************/
-
-
-#include "emu.h"
-#include "includes/galeb.h"
-
-
-const gfx_layout galeb_charlayout =
-{
-	8, 8,               /* 8x8 characters */
-	256,                /* 256 characters */
-	1,                /* 1 bits per pixel */
-	{0},                /* no bitplanes; 1 bit per pixel */
-	{7, 6, 5, 4, 3, 2, 1, 0},
-	{0 * 8, 1 * 8, 2 * 8, 3 * 8, 4 * 8, 5 * 8, 6 * 8, 7 * 8},
-	8*8                 /* size of one char */
-};
-
-void galeb_state::video_start()
-{
-}
-
-uint32_t galeb_state::screen_update_galeb(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	int x,y;
-
-	for(y = 0; y < 16; y++ )
-	{
-		for(x = 0; x < 48; x++ )
-		{
-			int code = m_video_ram[15 + x + y*64];
-			m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,  code , 0, 0,0, x*8,y*8);
-		}
-	}
-	return 0;
-}
diff -Nru mame-0.222+dfsg.1/src/mame/video/gauntlet.cpp mame-0.224+dfsg.1/src/mame/video/gauntlet.cpp
--- mame-0.222+dfsg.1/src/mame/video/gauntlet.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/gauntlet.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,8 +7,6 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "machine/atarigen.h"
-#include "video/atarimo.h"
 #include "includes/gauntlet.h"
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/video/gotcha.cpp mame-0.224+dfsg.1/src/mame/video/gotcha.cpp
--- mame-0.222+dfsg.1/src/mame/video/gotcha.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/gotcha.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,7 +10,7 @@
 
 ***************************************************************************/
 
-TILEMAP_MAPPER_MEMBER(gotcha_state::gotcha_tilemap_scan)
+TILEMAP_MAPPER_MEMBER(gotcha_state::tilemap_scan)
 {
 	return (col & 0x1f) | (row << 5) | ((col & 0x20) << 5);
 }
@@ -43,8 +43,8 @@
 
 void gotcha_state::video_start()
 {
-	m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(gotcha_state::fg_get_tile_info)), tilemap_mapper_delegate(*this, FUNC(gotcha_state::gotcha_tilemap_scan)), 16, 16, 64, 32);
-	m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(gotcha_state::bg_get_tile_info)), tilemap_mapper_delegate(*this, FUNC(gotcha_state::gotcha_tilemap_scan)), 16, 16, 64, 32);
+	m_fg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(gotcha_state::fg_get_tile_info)), tilemap_mapper_delegate(*this, FUNC(gotcha_state::tilemap_scan)), 16, 16, 64, 32);
+	m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(gotcha_state::bg_get_tile_info)), tilemap_mapper_delegate(*this, FUNC(gotcha_state::tilemap_scan)), 16, 16, 64, 32);
 
 	m_fg_tilemap->set_transparent_pen(0);
 
@@ -53,37 +53,33 @@
 }
 
 
-void gotcha_state::gotcha_fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void gotcha_state::fgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
 {
 	COMBINE_DATA(&m_fgvideoram[offset]);
 	m_fg_tilemap->mark_tile_dirty(offset);
 }
 
-void gotcha_state::gotcha_bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void gotcha_state::bgvideoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
 {
 	COMBINE_DATA(&m_bgvideoram[offset]);
 	m_bg_tilemap->mark_tile_dirty(offset);
 }
 
-void gotcha_state::gotcha_gfxbank_select_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void gotcha_state::gfxbank_select_w(uint8_t data)
 {
-	if (ACCESSING_BITS_8_15)
-		m_banksel = (data & 0x0300) >> 8;
+	m_banksel = data & 0x03;
 }
 
-void gotcha_state::gotcha_gfxbank_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void gotcha_state::gfxbank_w(uint8_t data)
 {
-	if (ACCESSING_BITS_8_15)
+	if (m_gfxbank[m_banksel] != (data & 0x0f))
 	{
-		if (m_gfxbank[m_banksel] != ((data & 0x0f00) >> 8))
-		{
-			m_gfxbank[m_banksel] = (data & 0x0f00) >> 8;
-			machine().tilemap().mark_all_dirty();
-		}
+		m_gfxbank[m_banksel] = data & 0x0f;
+		machine().tilemap().mark_all_dirty();
 	}
 }
 
-void gotcha_state::gotcha_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void gotcha_state::scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
 {
 	COMBINE_DATA(&m_scroll[offset]);
 
@@ -97,10 +93,10 @@
 }
 
 
-uint32_t gotcha_state::screen_update_gotcha(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t gotcha_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
-	m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
+	m_bg_tilemap->draw(screen, bitmap, cliprect);
+	m_fg_tilemap->draw(screen, bitmap, cliprect);
 	m_sprgen->draw_sprites(bitmap, cliprect, m_spriteram, 0x400);
 	return 0;
 }
diff -Nru mame-0.222+dfsg.1/src/mame/video/hec2hrp.cpp mame-0.224+dfsg.1/src/mame/video/hec2hrp.cpp
--- mame-0.222+dfsg.1/src/mame/video/hec2hrp.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/hec2hrp.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -3,35 +3,7 @@
 /////////////////////////////////////////////////////////////////////////////////
 ///// Hector video
 /////////////////////////////////////////////////////////////////////////////////
-/*      Hector 2HR+
-        Victor
-        Hector 2HR
-        Hector HRX
-        Hector MX40c
-        Hector MX80c
-        Hector 1
-        Interact
-
-        12/05/2009 Skeleton driver - Micko : mmicko@gmail.com
-        31/06/2009 Video - Robbbert
-
-        29/10/2009 Update skeleton to functional machine
-                    by yo_fr            (jj.stac @ aliceadsl.fr)
-
-                => add Keyboard,
-                => add color,
-                => add cassette,
-                => add sn76477 sound and 1bit sound,
-                => add joysticks (stick, pot, fire)
-                => add BR/HR switching
-                => add bank switch for HRX
-                => add device MX80c and bank switching for the ROM
-    Important note : the keyboard function has been taken from the
-                    DChector project : http://dchector.free.fr/ made by DanielCoulom
-                    (thanks Daniel)
-    TODO :  Add the cartridge function,
-            Adjust the one shot and A/D timing (sn76477)
-*/
+
 
 #include "emu.h"
 #include "includes/hec2hrp.h"
@@ -39,7 +11,7 @@
 #include "screen.h"
 
 
-void hec2hrp_state::init_palette()
+void hec2hrp_state::init_palette(palette_device &palette)
 {
 	m_hector_color[0] = 0; // black
 	m_hector_color[1] = 1; // red
@@ -69,7 +41,6 @@
 
 void hec2hrp_state::hector_hr(bitmap_ind16 &bitmap, uint8_t *page, int ymax, int yram)
 {
-	uint8_t *hector_color = m_hector_color;
 	int sy = 0;
 	int ma = 0;
 	for (int y = 0; y <= ymax; y++)
@@ -78,15 +49,22 @@
 		for (int x = ma; x < ma + yram; x++)
 		{
 			uint8_t gfx = *(page + x);
-			*pix++ = hector_color[(gfx >> 0) & 0x03];
-			*pix++ = hector_color[(gfx >> 2) & 0x03];
-			*pix++ = hector_color[(gfx >> 4) & 0x03];
-			*pix++ = hector_color[(gfx >> 6) & 0x03];
+			*pix++ = m_hector_color[BIT(gfx, 0, 2)];
+			*pix++ = m_hector_color[BIT(gfx, 2, 2)];
+			*pix++ = m_hector_color[BIT(gfx, 4, 2)];
+			*pix++ = m_hector_color[BIT(gfx, 6, 2)];
 		}
 		ma+=yram;
 	}
 }
 
+uint32_t hec2hrp_state::screen_update_interact(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+{
+	screen.set_visible_area(0, 113, 0, 75);
+	hector_hr(bitmap, m_vram, 77, 32);
+	return 0;
+}
+
 void hec2hrp_state::hector_80c(bitmap_ind16 &bitmap, uint8_t *page, int ymax, int yram)
 {
 	int sy = 0;
@@ -97,46 +75,33 @@
 		for (int x = ma; x < ma + yram; x++)
 		{
 			uint8_t gfx = *(page + x);
-			*pix++ = (gfx & 0x01) ? 7 : 0;
-			*pix++ = (gfx & 0x02) ? 7 : 0;
-			*pix++ = (gfx & 0x04) ? 7 : 0;
-			*pix++ = (gfx & 0x08) ? 7 : 0;
-			*pix++ = (gfx & 0x10) ? 7 : 0;
-			*pix++ = (gfx & 0x20) ? 7 : 0;
-			*pix++ = (gfx & 0x40) ? 7 : 0;
-			*pix++ = (gfx & 0x80) ? 7 : 0;
+			for (u8 i = 0; i < 8; i++)
+				*pix++ = BIT(gfx, i) ? 7 : 0;
 		}
 		ma += yram;
 	}
 }
 
-
-VIDEO_START_MEMBER(hec2hrp_state,hec2hrp)
-{
-	init_palette();
-}
-
 uint32_t hec2hrp_state::screen_update_hec2hrp(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	uint8_t *videoram = m_videoram;
-	uint8_t *videoram_HR = m_hector_videoram;
-	if (m_hector_flag_hr==1)
+	if (m_hector_flag_hr)
 	{
-		if (m_hector_flag_80c==0)
+		if (!m_hector_flag_80c)
 		{
 			screen.set_visible_area(0, 243, 0, 227);
-			hector_hr(bitmap , &videoram_HR[0], 227, 64);
+			hector_hr(bitmap , m_hector_vram, 227, 64);
 		}
 		else
 		{
 			screen.set_visible_area(0, 243*2, 0, 227);
-			hector_80c(bitmap , &videoram_HR[0], 227, 64);
+			hector_80c(bitmap , m_hector_vram, 227, 64);
 		}
 	}
 	else
 	{
 		screen.set_visible_area(0, 113, 0, 75);
-		hector_hr(bitmap, videoram,  77, 32);
+		hector_hr(bitmap, m_vram, 77, 32);
 	}
 	return 0;
 }
+
diff -Nru mame-0.222+dfsg.1/src/mame/video/k057714.cpp mame-0.224+dfsg.1/src/mame/video/k057714.cpp
--- mame-0.222+dfsg.1/src/mame/video/k057714.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/k057714.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -40,6 +40,8 @@
 	m_fb_origin_x = 0;
 	m_fb_origin_y = 0;
 
+	m_reg_6c = 0;
+
 	for (auto & elem : m_frame)
 	{
 		elem.base = 0;
diff -Nru mame-0.222+dfsg.1/src/mame/video/light.cpp mame-0.224+dfsg.1/src/mame/video/light.cpp
--- mame-0.222+dfsg.1/src/mame/video/light.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/light.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -314,7 +314,7 @@
 		const uint32_t end_x = m_lg1.m_x_end_i;
 		const uint32_t end_y = m_lg1.m_y_end_i;
 		const uint32_t src_start_x = start_x + (m_lg1.m_xy_move >> 16);
-		const uint32_t src_start_y = start_y + (uint16_t)m_lg1.m_xy_move;;
+		const uint32_t src_start_y = start_y + (uint16_t)m_lg1.m_xy_move;
 
 		LOGMASKED(LOG_REX, "LG1: Command %08x: Block copy from %d,%d-%d,%d inclusive.\n", m_lg1.m_command, start_x, start_y, end_x, end_y);
 		if (copy)
diff -Nru mame-0.222+dfsg.1/src/mame/video/lucky74.cpp mame-0.224+dfsg.1/src/mame/video/lucky74.cpp
--- mame-0.222+dfsg.1/src/mame/video/lucky74.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/lucky74.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -82,7 +82,7 @@
                                            _
 
 
-    Regarding the abobe diagram, there are 2 different states controlled by both 06B53P.
+    Regarding the above diagram, there are 2 different states controlled by both 06B53P.
     Each state arrange a different palette that will be assigned to each graphics bank.
 
     As we can see here, same pin of different PROMs are connected together in parallel.
@@ -100,32 +100,32 @@
 #include "includes/lucky74.h"
 
 
-void lucky74_state::lucky74_fg_videoram_w(offs_t offset, uint8_t data)
+void lucky74_state::fg_videoram_w(offs_t offset, uint8_t data)
 {
 	m_fg_videoram[offset] = data;
 	m_fg_tilemap->mark_tile_dirty(offset);
 }
 
-void lucky74_state::lucky74_fg_colorram_w(offs_t offset, uint8_t data)
+void lucky74_state::fg_colorram_w(offs_t offset, uint8_t data)
 {
 	m_fg_colorram[offset] = data;
 	m_fg_tilemap->mark_tile_dirty(offset);
 }
 
-void lucky74_state::lucky74_bg_videoram_w(offs_t offset, uint8_t data)
+void lucky74_state::bg_videoram_w(offs_t offset, uint8_t data)
 {
 	m_bg_videoram[offset] = data;
 	m_bg_tilemap->mark_tile_dirty(offset);
 }
 
-void lucky74_state::lucky74_bg_colorram_w(offs_t offset, uint8_t data)
+void lucky74_state::bg_colorram_w(offs_t offset, uint8_t data)
 {
 	m_bg_colorram[offset] = data;
 	m_bg_tilemap->mark_tile_dirty(offset);
 }
 
 
-void lucky74_state::lucky74_palette(palette_device &palette) const
+void lucky74_state::palette(palette_device &palette) const
 {
 	// There are 2 states (see the technical notes).
 	// We're constructing a double-sized palette with one half for each state.
@@ -233,7 +233,7 @@
 	m_fg_tilemap->set_transparent_pen(0);
 }
 
-uint32_t lucky74_state::screen_update_lucky74(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t lucky74_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
 	m_fg_tilemap->draw(screen, bitmap, cliprect, 0, 0);
diff -Nru mame-0.222+dfsg.1/src/mame/video/lviv.cpp mame-0.224+dfsg.1/src/mame/video/lviv.cpp
--- mame-0.222+dfsg.1/src/mame/video/lviv.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/lviv.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -62,7 +62,7 @@
 	{
 		for (int x = 0; x < 256; x += 4)
 		{
-			const uint8_t data = m_video_ram[(y << 6) | (x >> 2)];
+			const uint8_t data = m_vram[(y << 6) | (x >> 2)];
 
 			int pen = m_colortable[0][((data & 0x08) >> 3) | ((data & 0x80) >> (3+3))];
 			bitmap.pix16(y, x + 0) = pen;
diff -Nru mame-0.222+dfsg.1/src/mame/video/m72.cpp mame-0.224+dfsg.1/src/mame/video/m72.cpp
--- mame-0.222+dfsg.1/src/mame/video/m72.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/m72.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -106,7 +106,7 @@
 	m_bg_tilemap->set_transmask(1,0x00ff,0xff00);
 
 	//m_bg_tilemap->set_transmask(2,0x0001,0xfffe);
-	m_bg_tilemap->set_transmask(2,0x0007,0xfff8); // needed for lohtj japan warning to look correct
+	m_bg_tilemap->set_transmask(2,0x0007,0xfff8); // needed for lohtj Japan warning to look correct
 
 	memset(m_spriteram->buffer(),0,m_spriteram->bytes());
 
@@ -149,22 +149,22 @@
 	m_bg_tilemap->set_scrolldy(-128,16);
 }
 
-VIDEO_START_MEMBER(m72_state,imgfightj)
+VIDEO_START_MEMBER(m72_state,imgfight)
 {
 	VIDEO_START_CALL_MEMBER(m72);
-	m_bg_tilemap->set_transmask(2,0xff00,0x00ff); // for japan message
+	m_bg_tilemap->set_transmask(2,0xff00,0x00ff); // for RAM/ROM & Japan message
 }
 
 VIDEO_START_MEMBER(m72_state,nspiritj)
 {
 	VIDEO_START_CALL_MEMBER(m72);
-	m_bg_tilemap->set_transmask(2,0x001f,0xffe0); // for japan message
+	m_bg_tilemap->set_transmask(2,0x001f,0xffe0); // for Japan message
 }
 
 VIDEO_START_MEMBER(m72_state,mrheli)
 {
 	VIDEO_START_CALL_MEMBER(m72);
-	m_bg_tilemap->set_transmask(2,0x00ff,0xff00); // for japan message
+	m_bg_tilemap->set_transmask(2,0x00ff,0xff00); // for Japan message
 }
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/video/midzeus.cpp mame-0.224+dfsg.1/src/mame/video/midzeus.cpp
--- mame-0.222+dfsg.1/src/mame/video/midzeus.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/midzeus.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -204,16 +204,14 @@
 		m_state(state)
 {}
 
-VIDEO_START_MEMBER(midzeus_state,midzeus)
+void midzeus_state::video_start()
 {
-	int i;
-
 	/* allocate memory for "wave" RAM */
 	m_waveram[0] = std::make_unique<uint32_t[]>(WAVERAM0_WIDTH * WAVERAM0_HEIGHT * 8/4);
 	m_waveram[1] = std::make_unique<uint32_t[]>(WAVERAM1_WIDTH * WAVERAM1_HEIGHT * 8/4);
 
 	/* initialize a 5-5-5 palette */
-	for (i = 0; i < 32768; i++)
+	for (int i = 0; i < 32768; i++)
 		m_palette->set_pen_color(i, pal5bit(i >> 10), pal5bit(i >> 5), pal5bit(i >> 0));
 
 	/* initialize polygon engine */
@@ -272,10 +270,8 @@
  *
  *************************************/
 
-uint32_t midzeus_state::screen_update_midzeus(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t midzeus_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	int x, y;
-
 	m_poly->wait("VIDEO_UPDATE");
 
 	/* normal update case */
@@ -283,10 +279,10 @@
 	{
 		const void *base = waveram1_ptr_from_expanded_addr(m_zeusbase[0xcc]);
 		int xoffs = screen.visible_area().min_x;
-		for (y = cliprect.min_y; y <= cliprect.max_y; y++)
+		for (int y = cliprect.min_y; y <= cliprect.max_y; y++)
 		{
 			uint16_t *dest = &bitmap.pix16(y);
-			for (x = cliprect.min_x; x <= cliprect.max_x; x++)
+			for (int x = cliprect.min_x; x <= cliprect.max_x; x++)
 				dest[x] = WAVERAM_READPIX(base, y, x - xoffs) & 0x7fff;
 		}
 	}
@@ -304,10 +300,10 @@
 		if (m_yoffs < 0) m_yoffs = 0;
 		base = waveram0_ptr_from_block_addr(m_yoffs << 12);
 
-		for (y = cliprect.min_y; y <= cliprect.max_y; y++)
+		for (int y = cliprect.min_y; y <= cliprect.max_y; y++)
 		{
 			uint16_t *dest = &bitmap.pix16(y);
-			for (x = cliprect.min_x; x <= cliprect.max_x; x++)
+			for (int x = cliprect.min_x; x <= cliprect.max_x; x++)
 			{
 				uint8_t tex = get_texel_8bit(base, y, x, m_texel_width);
 				dest[x] = (tex << 8) | tex;
diff -Nru mame-0.222+dfsg.1/src/mame/video/mikro80.cpp mame-0.224+dfsg.1/src/mame/video/mikro80.cpp
--- mame-0.222+dfsg.1/src/mame/video/mikro80.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/mikro80.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/***************************************************************************
-
-        Mikro-80 video driver by Miodrag Milanovic
-
-        10/03/2008 Preliminary driver.
-
-****************************************************************************/
-
-
-#include "emu.h"
-#include "includes/mikro80.h"
-
-
-void mikro80_state::video_start()
-{
-}
-
-uint32_t mikro80_state::screen_update_mikro80(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	uint8_t *gfx = m_region_gfx1->base();
-	int x,y,b;
-
-	for(y = 0; y < 32*8; y++ )
-	{
-		for(x = 0; x < 64; x++ )
-		{
-			int addr = x + (y / 8)*64;
-			uint8_t code = gfx[m_video_ram [addr]*8+ (y % 8)];
-			uint8_t attr = m_cursor_ram[addr+1] & 0x80 ? 1 : 0;
-			for (b = 7; b >= 0; b--)
-			{
-				uint8_t col = (code >> b) & 0x01;
-				bitmap.pix16(y, x*8+(7-b)) =  attr ? col ^ 1 : col;
-			}
-		}
-	}
-	return 0;
-}
diff -Nru mame-0.222+dfsg.1/src/mame/video/namcos2.cpp mame-0.224+dfsg.1/src/mame/video/namcos2.cpp
--- mame-0.222+dfsg.1/src/mame/video/namcos2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/namcos2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -70,6 +70,8 @@
 void namcos2_state::video_start()
 {
 	create_shadow_table();
+
+	save_item(NAME(m_gfx_ctrl));
 }
 
 void namcos2_state::apply_clip(rectangle &clip, const rectangle &cliprect)
diff -Nru mame-0.222+dfsg.1/src/mame/video/ondra.cpp mame-0.224+dfsg.1/src/mame/video/ondra.cpp
--- mame-0.222+dfsg.1/src/mame/video/ondra.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/ondra.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/***************************************************************************
-
-        Ondra driver by Miodrag Milanovic
-
-        08/09/2008 Preliminary driver.
-
-****************************************************************************/
-
-
-#include "emu.h"
-#include "includes/ondra.h"
-#include "machine/ram.h"
-
-
-
-void ondra_state::video_start()
-{
-	m_video_enable = 0;
-}
-
-uint32_t ondra_state::screen_update_ondra(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	uint8_t code1,code2;
-	int y, x, b;
-	int Vaddr = 0x2800;
-
-	if (m_video_enable==1) {
-		for (x = 0; x < 40; x++)
-		{
-			for (y = 127; y >=0; y--)
-			{
-				code1 = m_ram->pointer()[0xd700 + Vaddr + 0x80];
-				code2 = m_ram->pointer()[0xd700 + Vaddr + 0x00];
-				for (b = 0; b < 8; b++)
-				{
-					bitmap.pix16(2*y, x*8+b) =  ((code1 << b) & 0x80) ? 1 : 0;
-					bitmap.pix16(2*y+1, x*8+b) =  ((code2 << b) & 0x80) ? 1 : 0;
-				}
-				Vaddr++;
-			}
-			Vaddr = (Vaddr - 128) - 256;
-		}
-	}
-	return 0;
-}
diff -Nru mame-0.222+dfsg.1/src/mame/video/orao.cpp mame-0.224+dfsg.1/src/mame/video/orao.cpp
--- mame-0.222+dfsg.1/src/mame/video/orao.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/orao.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/***************************************************************************
-
-        Orao video driver by Miodrag Milanovic
-
-        01/03/2008 Updated to work with latest SVN code
-        22/02/2008 Preliminary driver.
-
-****************************************************************************/
-
-#include "emu.h"
-#include "includes/orao.h"
-
-void orao_state::video_start()
-{
-}
-
-uint32_t orao_state::screen_update_orao(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	uint8_t code;
-	int y, x, b;
-
-	int addr = 0;
-	for (y = 0; y < 256; y++)
-	{
-		int horpos = 0;
-		for (x = 0; x < 32; x++)
-		{
-			code = m_video_ram[addr++];
-			for (b = 0; b < 8; b++)
-			{
-				bitmap.pix16(y, horpos++) =  (code >> b) & 0x01;
-			}
-		}
-	}
-	return 0;
-}
diff -Nru mame-0.222+dfsg.1/src/mame/video/pecom.cpp mame-0.224+dfsg.1/src/mame/video/pecom.cpp
--- mame-0.222+dfsg.1/src/mame/video/pecom.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/pecom.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -11,13 +11,10 @@
 #include "emu.h"
 #include "includes/pecom.h"
 
-#include "sound/wave.h"
-#include "speaker.h"
 
-
-void pecom_state::pecom_cdp1869_w(offs_t offset, uint8_t data)
+void pecom_state::cdp1869_w(offs_t offset, uint8_t data)
 {
-	uint16_t ma = m_cdp1802->get_memory_address();
+	uint16_t ma = m_maincpu->get_memory_address();
 
 	switch (offset + 3)
 	{
@@ -43,12 +40,7 @@
 	}
 }
 
-void pecom_state::cdp1869_page_ram(address_map &map)
-{
-	map(0x000, 0x3ff).mirror(0x400).ram();
-}
-
-CDP1869_CHAR_RAM_READ_MEMBER(pecom_state::pecom_char_ram_r )
+CDP1869_CHAR_RAM_READ_MEMBER(pecom_state::char_ram_r )
 {
 	uint8_t column = pmd & 0x7f;
 	uint16_t charaddr = (column << 4) | cma;
@@ -56,7 +48,7 @@
 	return m_charram[charaddr];
 }
 
-CDP1869_CHAR_RAM_WRITE_MEMBER(pecom_state::pecom_char_ram_w )
+CDP1869_CHAR_RAM_WRITE_MEMBER(pecom_state::char_ram_w )
 {
 	uint8_t column = pmd & 0x7f;
 	uint16_t charaddr = (column << 4) | cma;
@@ -64,45 +56,32 @@
 	m_charram[charaddr] = data;
 }
 
-CDP1869_PCB_READ_MEMBER(pecom_state::pecom_pcb_r )
+CDP1869_PCB_READ_MEMBER(pecom_state::pcb_r )
 {
 	return BIT(pmd, 7);
 }
 
-WRITE_LINE_MEMBER(pecom_state::pecom_prd_w)
+WRITE_LINE_MEMBER(pecom_state::prd_w)
 {
 	// every other PRD triggers a DMAOUT request
 	if (m_dma)
-	{
-		m_cdp1802->set_input_line(COSMAC_INPUT_LINE_DMAOUT, HOLD_LINE);
-	}
+		m_maincpu->set_input_line(COSMAC_INPUT_LINE_DMAOUT, HOLD_LINE);
 
 	m_dma = !m_dma;
 }
 
-void pecom_state::video_start()
+void pecom_state::machine_start()
 {
+	m_bank1->configure_entry(0, m_ram);
+	m_bank1->configure_entry(1, m_rom);
+
 	/* allocate memory */
-	m_charram = std::make_unique<uint8_t[]>(PECOM_CHAR_RAM_SIZE);
+	m_charram = std::make_unique<uint8_t[]>(0x0800);
 
 	/* register for state saving */
 	save_item(NAME(m_reset));
 	save_item(NAME(m_dma));
-	save_pointer(NAME(m_charram), PECOM_CHAR_RAM_SIZE);
+	save_pointer(NAME(m_charram), 0x0800);
+	m_reset_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(pecom_state::reset_tick),this));
 }
 
-void pecom_state::pecom_video(machine_config &config)
-{
-	SPEAKER(config, "mono").front_center();
-
-	CDP1869(config, m_cdp1869, cdp1869_device::DOT_CLK_PAL, &pecom_state::cdp1869_page_ram);
-	m_cdp1869->add_pal_screen(config, SCREEN_TAG, cdp1869_device::DOT_CLK_PAL);
-	m_cdp1869->set_color_clock(cdp1869_device::COLOR_CLK_PAL);
-	m_cdp1869->set_pcb_read_callback(FUNC(pecom_state::pecom_pcb_r));
-	m_cdp1869->set_char_ram_read_callback(FUNC(pecom_state::pecom_char_ram_r));
-	m_cdp1869->set_char_ram_write_callback(FUNC(pecom_state::pecom_char_ram_w));
-	m_cdp1869->pal_ntsc_callback().set_constant(1);
-	m_cdp1869->prd_callback().set(FUNC(pecom_state::pecom_prd_w));
-	m_cdp1869->add_route(ALL_OUTPUTS, "mono", 0.25);
-	WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25);
-}
diff -Nru mame-0.222+dfsg.1/src/mame/video/pgm.cpp mame-0.224+dfsg.1/src/mame/video/pgm.cpp
--- mame-0.222+dfsg.1/src/mame/video/pgm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/pgm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -19,6 +19,9 @@
 // bg pri is 2
 // sprite already here is 1 / 3
 
+static inline bool get_flipy(u8 flip) { return BIT(flip, 1); }
+static inline bool get_flipx(u8 flip) { return BIT(flip, 0); }
+
 inline void pgm_state::pgm_draw_pix(int xdrawpos, int pri, u16* dest, u8* destpri, const rectangle &cliprect, u16 srcdat)
 {
 	if ((xdrawpos >= cliprect.min_x) && (xdrawpos <= cliprect.max_x))
@@ -110,7 +113,7 @@
 					if (xzoombit && xgrow)
 					{ // double this column
 
-						if (!(flip & 0x01))
+						if (!get_flipx(flip))
 							xdrawpos = xpos + xcntdraw;
 						else
 							xdrawpos = xpos + realxsize - xcntdraw;
@@ -119,7 +122,7 @@
 
 						xcntdraw++;
 
-						if (!(flip & 0x01))
+						if (!get_flipx(flip))
 							xdrawpos = xpos + xcntdraw;
 						else
 							xdrawpos = xpos + realxsize - xcntdraw;
@@ -134,7 +137,7 @@
 					}
 					else //normal column
 					{
-						if (!(flip & 0x01))
+						if (!get_flipx(flip))
 							xdrawpos = xpos + xcntdraw;
 						else
 							xdrawpos = xpos + realxsize - xcntdraw;
@@ -219,7 +222,7 @@
 			const int temp_abit = m_abit;
 			const int temp_boffset = m_boffset;
 
-			if (!(flip & 0x02))
+			if (!get_flipy(flip))
 				ydrawpos = ypos + ycntdraw;
 			else
 				ydrawpos = ypos + realysize - ycntdraw;
@@ -242,7 +245,7 @@
 			m_abit = temp_abit;
 			m_boffset = temp_boffset;
 
-			if (!(flip & 0x02))
+			if (!get_flipy(flip))
 				ydrawpos = ypos + ycntdraw;
 			else
 				ydrawpos = ypos + realysize - ycntdraw;
@@ -257,7 +260,7 @@
 			{
 				draw_sprite_line(wide, nullptr, nullptr, cliprect, xzoom, xgrow, flip, xpos, pri, realxsize, palt, false);
 
-				if (!(flip & 0x02))
+				if (!get_flipy(flip))
 				{
 					if (ydrawpos >= cliprect.max_y)
 						return;
@@ -279,7 +282,7 @@
 		}
 		else /* normal line */
 		{
-			if (!(flip & 0x02))
+			if (!get_flipy(flip))
 				ydrawpos = ypos + ycntdraw;
 			else
 				ydrawpos = ypos + realysize - ycntdraw;
@@ -294,7 +297,7 @@
 			{
 				draw_sprite_line(wide, nullptr, nullptr, cliprect, xzoom, xgrow, flip, xpos, pri, realxsize, palt, false);
 
-				if (!(flip & 0x02))
+				if (!get_flipy(flip))
 				{
 					if (ydrawpos >= cliprect.max_y)
 						return;
@@ -337,7 +340,7 @@
 					{
 						xoffset++;
 
-						if (!(flip & 0x01))
+						if (!get_flipx(flip))
 							xdrawpos = xpos + xcntdraw;
 						else
 							xdrawpos = xpos + realxsize - xcntdraw;
@@ -376,7 +379,7 @@
 					{
 						xoffset++;
 
-						if (!(flip & 0x01))
+						if (!get_flipx(flip))
 							xdrawpos = xpos + xcntdraw;
 						else
 							xdrawpos = xpos + realxsize - xcntdraw;
@@ -425,7 +428,7 @@
 
 	while (ycnt < high)
 	{
-		if (!(flip & 0x02))
+		if (!get_flipy(flip))
 			ydrawpos = ypos + ycntdraw;
 		else
 			ydrawpos = ypos + realysize - ycntdraw;
@@ -440,7 +443,7 @@
 		{
 			draw_sprite_line_basic(wide, nullptr, nullptr, cliprect, flip, xpos, pri, realxsize, palt, false);
 
-			if (!(flip & 0x02))
+			if (!get_flipy(flip))
 			{
 				if (ydrawpos >= cliprect.max_y)
 					return;
@@ -458,42 +461,85 @@
 }
 
 
-void pgm_state::draw_sprites(bitmap_ind16& spritebitmap, const rectangle &cliprect, u16 *sprite_source, bitmap_ind8& priority_bitmap)
+void pgm_state::draw_sprites(bitmap_ind16& spritebitmap, const rectangle &cliprect, bitmap_ind8& priority_bitmap)
 {
-	/* ZZZZ Zxxx xxxx xxxx
-	   zzzz z-yy yyyy yyyy
-	   -ffp pppp Pvvv vvvv
-	   vvvv vvvv vvvv vvvv
-	   wwww wwwh hhhh hhhh
-	*/
+	struct sprite_t *sprite_ptr = m_sprite_ptr_pre;
+	while (sprite_ptr != m_spritelist.get())
+	{
+		sprite_ptr--;
 
-	const u16 *finish = m_spritebufferram.get() + (0xa00 / 2);
+		m_boffset = sprite_ptr->offs;
+		if ((!sprite_ptr->xzoom) && (!sprite_ptr->yzoom))
+		{
+			draw_sprite_new_basic(sprite_ptr->width, sprite_ptr->height,
+				sprite_ptr->x, sprite_ptr->y,
+				sprite_ptr->color, sprite_ptr->flip,
+				spritebitmap, cliprect, priority_bitmap,
+				sprite_ptr->pri);
+		}
+		else
+		{
+			draw_sprite_new_zoomed(sprite_ptr->width, sprite_ptr->height,
+				sprite_ptr->x, sprite_ptr->y,
+				sprite_ptr->color, sprite_ptr->flip,
+				spritebitmap, cliprect, priority_bitmap,
+				sprite_ptr->xzoom, sprite_ptr->xgrow, sprite_ptr->yzoom, sprite_ptr->ygrow, sprite_ptr->pri);
+		}
+	}
+}
+
+/*
+        Sprite list format (10 bytes per sprites, 256 entries)
+
+    Offset Bits
+           fedcba98 76543210
+    00     x------- -------- Horizontal Zoom/Shrink mode select
+           -xxxx--- -------- Horizontal Zoom/Shrink table select
+           -----xxx xxxxxxxx X position (11 bit signed)
+
+    02     x------- -------- Vertical Zoom/Shrink mode select
+           -xxxx--- -------- Vertical Zoom/Shrink table select
+           -----xxx xxxxxxxx Y position (10 bit signed)
+
+    04     -x------ -------- Flip Y
+           --x----- -------- Flip X
+           ---xxxxx -------- Palette select (32 color each)
+           -------- x------- Priority (Over(0) or Under(1) background)
+           -------- -xxxxxxx Sprite mask ROM address MSB
+    06     xxxxxxxx xxxxxxxx Sprite mask ROM address LSB
+
+    08     x------- -------- Another sprite width bit?
+           -xxxxxx- -------- Sprite width (16 pixel each)
+           -------x xxxxxxxx Sprite height (1 pixel each)
+
+*/
+void pgm_state::get_sprites()
+{
+	m_sprite_ptr_pre = m_spritelist.get();
 
-	u16* start = sprite_source;
+	u16 *sprite_source = &m_mainram[0];
+	const u16 *finish = &m_mainram[0xa00 / 2];
+	const u16* sprite_zoomtable = &m_videoregs[0x1000 / 2];
 
 	while (sprite_source < finish)
 	{
 		if (!sprite_source[4]) break; /* is this right? */
-		sprite_source += 5;
-	}
-	sprite_source -= 5;
 
-	while (sprite_source >= start)
-	{
-		int xpos =          sprite_source[0] & 0x07ff;
-		int ypos =          sprite_source[1] & 0x03ff;
-		int xzom =         (sprite_source[0] & 0x7800) >> 11;
-		const bool xgrow = (sprite_source[0] & 0x8000) >> 15;
-		int yzom =         (sprite_source[1] & 0x7800) >> 11;
-		const bool ygrow = (sprite_source[1] & 0x8000) >> 15;
-		const int palt =   (sprite_source[2] & 0x1f00) >> 8;
-		const int flip =   (sprite_source[2] & 0x6000) >> 13;
-		int boff =        ((sprite_source[2] & 0x007f) << 16) | (sprite_source[3] & 0xffff);
-		const int wide =   (sprite_source[4] & 0x7e00) >> 9;
-		const int high =    sprite_source[4] & 0x01ff;
-		const int pri =    (sprite_source[2] & 0x0080) >>  7;
+		int xzom =                 (sprite_source[0] & 0x7800) >> 11;
+		const bool xgrow =         (sprite_source[0] & 0x8000) >> 15;
+		m_sprite_ptr_pre->x =      (sprite_source[0] & 0x03ff) - (sprite_source[0] & 0x0400);
+
+		int yzom =                 (sprite_source[1] & 0x7800) >> 11;
+		const bool ygrow =         (sprite_source[1] & 0x8000) >> 15;
+		m_sprite_ptr_pre->y =      (sprite_source[1] & 0x01ff) - (sprite_source[1] & 0x0200);
+
+		m_sprite_ptr_pre->flip =   (sprite_source[2] & 0x6000) >> 13;
+		m_sprite_ptr_pre->color =  (sprite_source[2] & 0x1f00) >> 8;
+		m_sprite_ptr_pre->pri =    (sprite_source[2] & 0x0080) >>  7;
+		m_sprite_ptr_pre->offs =  ((sprite_source[2] & 0x007f) << 16) | (sprite_source[3] & 0xffff);
 
-		const u16* sprite_zoomtable = &m_videoregs[0x1000 / 2];
+		m_sprite_ptr_pre->width =  (sprite_source[4] & 0x7e00) >> 9;
+		m_sprite_ptr_pre->height =  sprite_source[4] & 0x01ff;
 
 		if (xgrow)
 		{
@@ -507,19 +553,12 @@
 			yzom = 0x10 - yzom;
 		}
 
-		u32 xzoom = (sprite_zoomtable[xzom * 2] << 16) | sprite_zoomtable[xzom * 2 + 1];
-		u32 yzoom = (sprite_zoomtable[yzom * 2] << 16) | sprite_zoomtable[yzom * 2 + 1];
-
-		if (xpos > 0x3ff) xpos -= 0x800;
-		if (ypos > 0x1ff) ypos -= 0x400;
-
-		//if ((priority == 1) && (pri == 0)) break;
-
-		m_boffset = boff;
-		if ((!xzoom) && (!yzoom)) draw_sprite_new_basic(wide, high, xpos, ypos, palt, flip, spritebitmap, cliprect, priority_bitmap, pri);
-		else draw_sprite_new_zoomed(wide, high, xpos, ypos, palt, flip, spritebitmap, cliprect, priority_bitmap, xzoom, xgrow, yzoom, ygrow, pri);
-
-		sprite_source -= 5;
+		m_sprite_ptr_pre->xzoom = (sprite_zoomtable[xzom * 2] << 16) | sprite_zoomtable[xzom * 2 + 1];
+		m_sprite_ptr_pre->yzoom = (sprite_zoomtable[yzom * 2] << 16) | sprite_zoomtable[yzom * 2 + 1];
+		m_sprite_ptr_pre->xgrow = xgrow;
+		m_sprite_ptr_pre->ygrow = ygrow;
+		m_sprite_ptr_pre++;
+		sprite_source += 5;
 	}
 }
 
@@ -578,6 +617,9 @@
 
 void pgm_state::video_start()
 {
+	m_spritelist = std::make_unique<sprite_t[]>(0xa00/2/5);
+	m_sprite_ptr_pre = m_spritelist.get();
+
 	m_aoffset = 0;
 	m_abit = 0;
 	m_boffset = 0;
@@ -588,10 +630,6 @@
 	m_bg_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(pgm_state::get_bg_tile_info)), TILEMAP_SCAN_ROWS, 32, 32, 64, 16);
 	m_bg_tilemap->set_transparent_pen(31);
 	m_bg_tilemap->set_scroll_rows(16 * 32);
-
-	m_spritebufferram = make_unique_clear<u16[]>(0xa00/2);
-
-	save_pointer(NAME(m_spritebufferram), 0xa00/2);
 }
 
 u32 pgm_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
@@ -607,7 +645,7 @@
 
 	m_bg_tilemap->draw(screen, bitmap, cliprect, 0, 2);
 
-	draw_sprites(bitmap, cliprect, m_spritebufferram.get(), screen.priority());
+	draw_sprites(bitmap, cliprect, screen.priority());
 
 	m_tx_tilemap->set_scrolly(0, m_videoregs[0x5000/2]);
 	m_tx_tilemap->set_scrollx(0, m_videoregs[0x6000/2]); // Check
@@ -623,6 +661,9 @@
 	if (state)
 	{
 		/* first 0xa00 of main ram = sprites, seems to be buffered, DMA? */
-		memcpy(m_spritebufferram.get(), m_mainram, 0xa00);
+		get_sprites();
+
+		// vblank start interrupt
+		m_maincpu->set_input_line(M68K_IRQ_6, HOLD_LINE);
 	}
 }
diff -Nru mame-0.222+dfsg.1/src/mame/video/pin64.h mame-0.224+dfsg.1/src/mame/video/pin64.h
--- mame-0.222+dfsg.1/src/mame/video/pin64.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/pin64.h	2020-08-26 08:57:19.000000000 +0000
@@ -1,13 +1,14 @@
 // license:BSD-3-Clause
 // copyright-holders:Ryan Holtz
-#pragma once
+#ifndef MAME_VIDEO_PIN64_H
+#define MAME_VIDEO_PIN64_H
 
-#ifndef PIN64_H
-#define PIN64_H
+#pragma once
 
 #include <cstdio>
-#include <vector>
 #include <map>
+#include <vector>
+
 
 #define PIN64_ENABLE_CAPTURE (0)
 
@@ -176,4 +177,4 @@
 	static const uint8_t CAP_ID[8];
 };
 
-#endif // PIN64_H
+#endif // MAME_VIDEO_PIN64_H
diff -Nru mame-0.222+dfsg.1/src/mame/video/pp01.cpp mame-0.224+dfsg.1/src/mame/video/pp01.cpp
--- mame-0.222+dfsg.1/src/mame/video/pp01.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/pp01.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -12,10 +12,6 @@
 #include "emu.h"
 #include "includes/pp01.h"
 
-void pp01_state::video_start()
-{
-}
-
 uint32_t pp01_state::screen_update_pp01(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	uint8_t const *const ram = m_ram->pointer();
@@ -24,9 +20,10 @@
 	{
 		for (int x = 0; x < 32; x++)
 		{
-			uint8_t const code_r = ram[0x6000 + ((y+m_video_scroll)&0xff)*32 + x];
-			uint8_t const code_g = ram[0xa000 + ((y+m_video_scroll)&0xff)*32 + x];
-			uint8_t const code_b = ram[0xe000 + ((y+m_video_scroll)&0xff)*32 + x];
+			u16 t = ((y+m_video_scroll)&0xff)*32 + x;
+			uint8_t const code_r = ram[0x6000 + t];
+			uint8_t const code_g = ram[0xa000 + t];
+			uint8_t const code_b = ram[0xe000 + t];
 			for (int b = 0; b < 8; b++)
 			{
 				uint8_t const col = (BIT(code_r, b) << 2) | (BIT(code_g, b) << 1) | (BIT(code_b, b) << 0);
diff -Nru mame-0.222+dfsg.1/src/mame/video/primo.cpp mame-0.224+dfsg.1/src/mame/video/primo.cpp
--- mame-0.222+dfsg.1/src/mame/video/primo.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/primo.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Krzysztof Strzecha
-/***************************************************************************
-
-  primo.c
-
-  Functions to emulate the video hardware of Primo.
-
-  Krzysztof Strzecha
-
-***************************************************************************/
-
-#include "emu.h"
-#include "includes/primo.h"
-
-
-
-void primo_state::primo_draw_scanline(bitmap_ind16 &bitmap, int primo_scanline)
-{
-	int x, i;
-	uint8_t data;
-
-	/* set up scanline */
-	uint16_t *scanline = &bitmap.pix16(primo_scanline);
-
-	/* address of current line in Primo video memory */
-	const uint8_t* primo_video_ram_line = &m_video_ram[m_video_memory_base + 32 * primo_scanline];
-
-	for (x=0; x<256; x+=8)
-	{
-		data = primo_video_ram_line[x/8];
-
-		for (i=0; i<8; i++)
-			scanline[x+i]=(data & (0x80>>i)) ? 1 : 0;
-
-	}
-}
-
-
-uint32_t primo_state::screen_update_primo(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	int primo_scanline;
-
-	for (primo_scanline=0; primo_scanline<192; primo_scanline++)
-		primo_draw_scanline( bitmap, primo_scanline);
-	return 0;
-}
diff -Nru mame-0.222+dfsg.1/src/mame/video/rampart.cpp mame-0.224+dfsg.1/src/mame/video/rampart.cpp
--- mame-0.222+dfsg.1/src/mame/video/rampart.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/rampart.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,8 +7,6 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "machine/atarigen.h"
-#include "video/atarimo.h"
 #include "includes/rampart.h"
 
 /*************************************
diff -Nru mame-0.222+dfsg.1/src/mame/video/renegade.cpp mame-0.224+dfsg.1/src/mame/video/renegade.cpp
--- mame-0.222+dfsg.1/src/mame/video/renegade.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/renegade.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -64,6 +64,8 @@
 
 	m_fg_tilemap->set_transparent_pen(0);
 	m_bg_tilemap->set_scrolldx(256, 0);
+	m_fg_tilemap->set_scrolldy(10, 10);
+	m_bg_tilemap->set_scrolldy(10, 10);
 
 	save_item(NAME(m_scrollx));
 }
@@ -75,8 +77,8 @@
 
 	while (source < finish)
 	{
-		// 224 matches reference (stage 1 boss in kuniokun is aligned with the train door)
-		int sy = 224 - source[0];
+		// reference: stage 1 boss in kuniokun is aligned with the train door
+		int sy = 234 - source[0];
 
 		//if (sy >= 0)
 		{
@@ -96,7 +98,7 @@
 			if (flip_screen())
 			{
 				sx = 240 - sx;
-				sy = 224 - sy;
+				sy = 260 - sy;
 				xflip = !xflip;
 			}
 
diff -Nru mame-0.222+dfsg.1/src/mame/video/samcoupe.cpp mame-0.224+dfsg.1/src/mame/video/samcoupe.cpp
--- mame-0.222+dfsg.1/src/mame/video/samcoupe.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/samcoupe.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,171 +0,0 @@
-// license:GPL-2.0+
-// copyright-holders:Lee Hammerton, Dirk Best
-/***************************************************************************
-
-    Miles Gordon Technology SAM Coupe
-
-***************************************************************************/
-
-#include "emu.h"
-#include "includes/samcoupe.h"
-
-
-/***************************************************************************
-    MACROS
-***************************************************************************/
-
-/* border color from border register */
-#define BORDER_COLOR(x) ((x & 0x20) >> 2 | (x & 0x07))
-
-/* foreground and background color from attribute byte in mode 1 and 2 */
-#define ATTR_BG(x)      ((x >> 3) & 0x0f)
-#define ATTR_FG(x)      (((x >> 3) & 0x08) | (x & 0x07))
-
-
-/***************************************************************************
-    IMPLEMENTATION
-***************************************************************************/
-
-void samcoupe_state::video_start()
-{
-	m_screen->register_screen_bitmap(m_bitmap);
-}
-
-uint32_t samcoupe_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	copybitmap(bitmap, m_bitmap, 0, 0, 0, 0, cliprect);
-	return 0;
-}
-
-void samcoupe_state::draw_mode4_line(int y, int hpos)
-{
-	uint8_t *videoram = m_videoram;
-
-	/* get start address */
-	uint8_t *vram = videoram + ((y - SAM_BORDER_TOP) * 128) + ((hpos - SAM_BORDER_LEFT) / 4);
-
-	for (int i = 0; i < (SAM_BLOCK*2)/4; i++)
-	{
-		/* draw 2 pixels (doublewidth) */
-		m_bitmap.pix16(y, hpos + i * 4 + 0) = m_clut[(*vram >> 4) & 0x0f];
-		m_bitmap.pix16(y, hpos + i * 4 + 1) = m_clut[(*vram >> 4) & 0x0f];
-		m_bitmap.pix16(y, hpos + i * 4 + 2) = m_clut[(*vram >> 0) & 0x0f];
-		m_bitmap.pix16(y, hpos + i * 4 + 3) = m_clut[(*vram >> 0) & 0x0f];
-
-		/* move to next address */
-		vram++;
-
-		/* attribute register contains the third displayed byte */
-		if (i == 2)
-			m_attribute = *vram;
-	}
-}
-
-void samcoupe_state::draw_mode3_line(int y, int hpos)
-{
-	uint8_t *videoram = m_videoram;
-
-	/* get start address */
-	uint8_t *vram = videoram + ((y - SAM_BORDER_TOP) * 128) + ((hpos - SAM_BORDER_LEFT) / 4);
-
-	for (int i = 0; i < (SAM_BLOCK*2)/4; i++)
-	{
-		/* draw 4 pixels */
-		m_bitmap.pix16(y, hpos + i * 4 + 0) = m_clut[(*vram >> 6) & 0x03];
-		m_bitmap.pix16(y, hpos + i * 4 + 1) = m_clut[(*vram >> 4) & 0x03];
-		m_bitmap.pix16(y, hpos + i * 4 + 2) = m_clut[(*vram >> 2) & 0x03];
-		m_bitmap.pix16(y, hpos + i * 4 + 3) = m_clut[(*vram >> 0) & 0x03];
-
-		/* move to next address */
-		vram++;
-
-		/* attribute register contains the third displayed byte */
-		if (i == 2)
-			m_attribute = *vram;
-	}
-}
-
-void samcoupe_state::draw_mode12_block(bitmap_ind16 &bitmap, int vpos, int hpos, uint8_t mask)
-{
-	/* extract colors from attribute */
-	uint8_t ink = m_clut[ATTR_FG(m_attribute)];
-	uint8_t pap = m_clut[ATTR_BG(m_attribute)];
-
-	/* draw block of 8 pixels (doubled to 16) */
-	for (int i = 0; i < SAM_BLOCK; i++)
-	{
-		bitmap.pix16(vpos, hpos + i*2 + 0) = BIT(mask, 7 - i) ? ink : pap;
-		bitmap.pix16(vpos, hpos + i*2 + 1) = BIT(mask, 7 - i) ? ink : pap;
-	}
-}
-
-void samcoupe_state::draw_mode2_line(int y, int hpos)
-{
-	uint8_t *videoram = m_videoram;
-
-	int cell = (y - SAM_BORDER_TOP) * 32 + (hpos - SAM_BORDER_LEFT) / SAM_BLOCK / 2;
-
-	uint8_t mask = videoram[cell];
-	m_attribute = videoram[cell + 0x2000];
-
-	draw_mode12_block(m_bitmap, y, hpos, mask);
-}
-
-void samcoupe_state::draw_mode1_line(int y, int hpos)
-{
-	uint8_t *videoram = m_videoram;
-
-	uint8_t mask = videoram[((((y - SAM_BORDER_TOP) & 0xc0) << 5) | (((y - SAM_BORDER_TOP) & 0x07) << 8) | (((y - SAM_BORDER_TOP) & 0x38) << 2)) + (hpos - SAM_BORDER_LEFT) / SAM_BLOCK / 2];
-	m_attribute = videoram[32*192 + (((y - SAM_BORDER_TOP) & 0xf8) << 2) + (hpos - SAM_BORDER_LEFT) / SAM_BLOCK / 2];
-
-	draw_mode12_block(m_bitmap, y, hpos, mask);
-}
-
-TIMER_CALLBACK_MEMBER(samcoupe_state::sam_video_update_callback)
-{
-	int vpos = m_screen->vpos();
-	int hpos = m_screen->hpos();
-
-	int next_vpos = vpos;
-	int next_hpos = hpos + SAM_BLOCK*2;
-
-	/* next scanline? */
-	if (next_hpos >= SAM_BORDER_LEFT + SAM_SCREEN_WIDTH + SAM_BORDER_RIGHT)
-	{
-		next_vpos = (vpos + 1) % (SAM_BORDER_TOP + SAM_SCREEN_HEIGHT + SAM_BORDER_BOTTOM);
-		next_hpos = 0;
-	}
-
-	/* display disabled? (only in mode 3 or 4) */
-	if (BIT(m_vmpr, 6) && BIT(m_border, 7))
-	{
-		m_bitmap.plot_box(hpos, vpos, SAM_BLOCK*2, 1, 0);
-	}
-	else
-	{
-		/* border area? */
-		if (vpos < SAM_BORDER_TOP || vpos >= SAM_BORDER_TOP + SAM_SCREEN_HEIGHT || hpos < SAM_BORDER_LEFT || hpos >= SAM_BORDER_LEFT + SAM_SCREEN_WIDTH)
-		{
-			m_attribute = 0xff;
-			m_bitmap.plot_box(hpos, vpos, SAM_BLOCK*2, 1, m_clut[BORDER_COLOR(m_border)]);
-		}
-		else
-		{
-			/* main screen area */
-			switch ((m_vmpr & 0x60) >> 5)
-			{
-			case 0: draw_mode1_line(vpos, hpos); break;
-			case 1: draw_mode2_line(vpos, hpos); break;
-			case 2: draw_mode3_line(vpos, hpos); break;
-			case 3: draw_mode4_line(vpos, hpos); break;
-			}
-		}
-	}
-
-	/* do we need to trigger the scanline interrupt (interrupt happens at the start of the right border before the specified line)? */
-	if (m_line_int < SAM_SCREEN_HEIGHT && hpos == SAM_BORDER_LEFT + SAM_SCREEN_WIDTH && vpos == (m_line_int + SAM_BORDER_TOP - 1))
-		samcoupe_irq(SAM_LINE_INT);
-
-	/* schedule next update */
-	m_video_update_timer->adjust(m_screen->time_until_pos(next_vpos, next_hpos));
-}
diff -Nru mame-0.222+dfsg.1/src/mame/video/segag80v.cpp mame-0.224+dfsg.1/src/mame/video/segag80v.cpp
--- mame-0.222+dfsg.1/src/mame/video/segag80v.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/segag80v.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -9,13 +9,17 @@
 #include "emu.h"
 #include "includes/segag80v.h"
 
-#define VECTOR_CLOCK        15468480            /* master clock */
-#define U34_CLOCK           (VECTOR_CLOCK/3)    /* clock for interrupt chain */
-#define VCL_CLOCK           (U34_CLOCK/2)       /* clock for vector generator */
-#define U51_CLOCK           (VCL_CLOCK/16)      /* clock for phase generator */
-#define IRQ_CLOCK           (U34_CLOCK/0x1f788) /* 40Hz interrupt */
+#define VECTOR_CLOCK        15468480            // master clock
+#define U34_CLOCK           (VECTOR_CLOCK/3)    // clock for interrupt chain
+#define VCL_CLOCK           (U34_CLOCK/2)       // clock for vector generator
+#define U51_CLOCK           (VCL_CLOCK/16)      // clock for phase generator
+#define IRQ_CLOCK           (U34_CLOCK/0x1f788) // 40Hz interrupt
 
 
+static constexpr attoseconds_t VCL_ATTOS = HZ_TO_ATTOSECONDS(VCL_CLOCK);
+static constexpr attoseconds_t U51_ATTOS = HZ_TO_ATTOSECONDS(U51_CLOCK);
+static constexpr attoseconds_t IRQ_ATTOS = HZ_TO_ATTOSECONDS(IRQ_CLOCK);
+
 
 
 /*
@@ -73,247 +77,239 @@
         A1-A8 = sum of VEC angle and SYM angle (low 8 bits)
         A9 = sum of bit 8 of VEC angle and SYM angle, plus 1 for phase 13
 
-
 */
 
 
-inline bool segag80v_state::adjust_xy(int rawx, int rawy, int *outx, int *outy)
+
+inline bool segag80v_state::adjust_xy(int rawx, int rawy, int &outx, int &outy)
 {
 	bool clipped = false;
 
-	/* first apply the XOR at 0x200 */
-	*outx = (rawx & 0x7ff) ^ 0x200;
-	*outy = (rawy & 0x7ff) ^ 0x200;
-
-	/* apply clipping logic to X */
-	if ((*outx & 0x600) == 0x200)
-		*outx = 0x000, clipped = true;
-	else if ((*outx & 0x600) == 0x400)
-		*outx = 0x3ff, clipped = true;
+	// first apply the XOR at 0x200
+	outx = (rawx & 0x7ff) ^ 0x200;
+	outy = (rawy & 0x7ff) ^ 0x200;
+
+	// apply clipping logic to X
+	if ((outx & 0x600) == 0x200)
+		outx = 0x000, clipped = true;
+	else if ((outx & 0x600) == 0x400)
+		outx = 0x3ff, clipped = true;
 	else
-		*outx &= 0x3ff;
+		outx &= 0x3ff;
 
-	/* apply clipping logic to Y */
-	if ((*outy & 0x600) == 0x200)
-		*outy = 0x000, clipped = true;
-	else if ((*outy & 0x600) == 0x400)
-		*outy = 0x3ff, clipped = true;
+	// apply clipping logic to Y
+	if ((outy & 0x600) == 0x200)
+		outy = 0x000, clipped = true;
+	else if ((outy & 0x600) == 0x400)
+		outy = 0x3ff, clipped = true;
 	else
-		*outy &= 0x3ff;
+		outy &= 0x3ff;
 
-	/* convert into .16 values */
-	*outx = (*outx - (m_min_x - 512)) << 16;
-	*outy = (*outy - (m_min_y - 512)) << 16;
+	// convert into .16 values
+	outx = (outx - (m_min_x - 512)) << 16;
+	outy = (outy - (m_min_y - 512)) << 16;
 	return clipped;
 }
 
 
 void segag80v_state::sega_generate_vector_list()
 {
-	uint8_t *sintable = memregion("proms")->base();
-	double total_time = 1.0 / (double)IRQ_CLOCK;
-	uint16_t symaddr = 0;
-	uint8_t *vectorram = m_vectorram;
+	attoseconds_t time_remaining = IRQ_ATTOS;
+	u8 *sintable = memregion("proms")->base();
+	u8 *vectorram = m_vectorram;
+	u16 symaddr = 0;
 
 	m_vector->clear_list();
 
-	/* Loop until we run out of time. */
-	while (total_time > 0)
+	// Loop until we run out of time.
+	while (time_remaining > 0)
 	{
-		uint16_t curx, cury, xaccum, yaccum;
-		uint16_t vecaddr, symangle;
-		uint8_t scale, draw;
-
-		/* The "draw" flag is clocked at the end of phase 0. */
-		draw = vectorram[symaddr++ & 0xfff];
-
-		/* The low byte of the X coordinate is latched into the        */
-		/* up/down counters at U15/U16 during phase 1. */
-		curx = vectorram[symaddr++ & 0xfff];
-
-		/* The low 3 bits of the high byte of the X coordinate are     */
-		/* latched into the up/down counter at U17 during phase 2.     */
-		/* Bit 2 of the input is latched as both bit 2 and 3. */
+		// The "draw" flag is clocked at the end of phase 0.
+		u8 draw = vectorram[symaddr++ & 0xfff];
+
+		// The low byte of the X coordinate is latched into the
+		// up/down counters at U15/U16 during phase 1.
+		u16 curx = vectorram[symaddr++ & 0xfff];
+
+		// The low 3 bits of the high byte of the X coordinate are
+		// latched into the up/down counter at U17 during phase 2.
+		// Bit 2 of the input is latched as both bit 2 and 3.
 		curx |= (vectorram[symaddr++ & 0xfff] & 7) << 8;
 		curx |= (curx << 1) & 0x800;
 
-		/* The low byte of the Y coordinate is latched into the        */
-		/* up/down counters at U18/U19 during phase 3. */
-		cury = vectorram[symaddr++ & 0xfff];
-
-		/* The low 3 bits of the high byte of the X coordinate are     */
-		/* latched into the up/down counter at U17 during phase 4.     */
-		/* Bit 2 of the input is latched as both bit 2 and 3. */
+		// The low byte of the Y coordinate is latched into the
+		// up/down counters at U18/U19 during phase 3.
+		u16 cury = vectorram[symaddr++ & 0xfff];
+
+		// The low 3 bits of the high byte of the X coordinate are
+		// latched into the up/down counter at U17 during phase 4.
+		// Bit 2 of the input is latched as both bit 2 and 3.
 		cury |= (vectorram[symaddr++ & 0xfff] & 7) << 8;
 		cury |= (cury << 1) & 0x800;
 
-		/* The low byte of the vector address is latched into the      */
-		/* counters at U10/U11 during phase 5. */
-		vecaddr = vectorram[symaddr++ & 0xfff];
+		// The low byte of the vector address is latched into the
+		// counters at U10/U11 during phase 5.
+		u16 vecaddr = vectorram[symaddr++ & 0xfff];
 
-		/* The low 4 bits of the high byte of the vector address is    */
-		/* latched into the counter at U12 during phase 6. */
+		// The low 4 bits of the high byte of the vector address is
+		// latched into the counter at U12 during phase 6.
 		vecaddr |= (vectorram[symaddr++ & 0xfff] & 0xf) << 8;
 
-		/* The low byte of the symbol angle is latched into the tri-   */
-		/* state flip flop at U55 at the end of phase 7. */
-		symangle = vectorram[symaddr++ & 0xfff];
+		// The low byte of the symbol angle is latched into the tri-
+		// state flip flop at U55 at the end of phase 7.
+		u16 symangle = vectorram[symaddr++ & 0xfff];
 
-		/* The low 2 bits of the high byte of the symbol angle are     */
-		/* latched into flip flops at U26 at the end of phase 8. */
+		// The low 2 bits of the high byte of the symbol angle are
+		// latched into flip flops at U26 at the end of phase 8.
 		symangle |= (vectorram[symaddr++ & 0xfff] & 3) << 8;
 
-		/* The scale is latched in phase 9 as the X input to the       */
-		/* 25LS14 multiplier at U8. */
-		scale = vectorram[symaddr++ & 0xfff];
+		// The scale is latched in phase 9 as the X input to the
+		// 25LS14 multiplier at U8.
+		u8 scale = vectorram[symaddr++ & 0xfff];
 
-		/* Account for the 10 phases so far. */
-		total_time -= 10.0 / (double)U51_CLOCK;
+		// Account for the 10 phases so far.
+		time_remaining -= 10 * U51_ATTOS;
 
-		/* Skip the rest if we're not drawing this symbol. */
+		// Skip the rest if we're not drawing this symbol.
 		if (draw & 1)
 		{
-			int adjx, adjy, clipped;
-
-			/* Add a starting point to the vector list. */
-			clipped = adjust_xy(curx, cury, &adjx, &adjy);
+			// Add a starting point to the vector list.
+			int adjx, adjy;
+			bool clipped = adjust_xy(curx, cury, adjx, adjy);
 			if (!clipped)
 				m_vector->add_point(adjx, adjy, 0, 0);
 
-			/* Loop until we run out of time. */
-			while (total_time > 0)
+			// Loop until we run out of time.
+			while (time_remaining > 0)
 			{
-				uint16_t vecangle, length, deltax, deltay;
-				uint8_t attrib, intensity;
-				uint32_t color;
-
-				/* The 'attribute' byte is latched at the end of phase 10 into */
-				/* the tri-state flip flop at U2. The low bit controls whether */
-				/* or not the beam is enabled. Bits 1-6 control the RGB color  */
-				/* (2 bits per component). In addition, bit 7 of this value is */
-				/* latched into U52, which controls the pre-load value for the */
-				/* phase generator. If bit 7 is high, then the phase generator */
-				/* will reset back to 0 and draw a new symbol; if bit 7 is low */
-				/* the phase generator will reset back to 10 and draw another  */
-				/* vector. */
-				attrib = vectorram[vecaddr++ & 0xfff];
-
-				/* The length of the vector is loaded into the shift registers */
-				/* at U6/U7 during phase 11. During phase 12, the 25LS14       */
-				/* multiplier at U8 is used to multiply the length by the      */
-				/* scale that was loaded during phase 9. The length is clocked */
-				/* bit by bit out of U6/U7 and the result is clocked into the  */
-				/* other side. After the multiply, the 9 MSBs are loaded into  */
-				/* the counter chain at U15/16/17 and are used to count how    */
-				/* long to draw the vector. */
-				length = (vectorram[vecaddr++ & 0xfff] * scale) >> 7;
-
-				/* The vector angle low byte is latched at the end of phase 12 */
-				/* into the tri-state flip flop at U56. */
-				vecangle = vectorram[vecaddr++ & 0xfff];
-
-				/* The vector angle high byte is preset on the CD bus during   */
-				/* phases 13 and 14, and is used as inputs to the adder at     */
-				/* U46. */
+				// The 'attribute' byte is latched at the end of phase 10 into
+				// the tri-state flip flop at U2. The low bit controls whether
+				// or not the beam is enabled. Bits 1-6 control the RGB color
+				// (2 bits per component). In addition, bit 7 of this value is
+				// latched into U52, which controls the pre-load value for the
+				// phase generator. If bit 7 is high, then the phase generator
+				// will reset back to 0 and draw a new symbol; if bit 7 is low
+				// the phase generator will reset back to 10 and draw another
+				// vector.
+				u8 attrib = vectorram[vecaddr++ & 0xfff];
+
+				// The length of the vector is loaded into the shift registers
+				// at U6/U7 during phase 11. During phase 12, the 25LS14
+				// multiplier at U8 is used to multiply the length by the
+				// scale that was loaded during phase 9. The length is clocked
+				// bit by bit out of U6/U7 and the result is clocked into the
+				// other side. After the multiply, the 9 MSBs are loaded into
+				// the counter chain at U15/16/17 and are used to count how
+				// long to draw the vector.
+				u16 length = (vectorram[vecaddr++ & 0xfff] * scale) >> 7;
+
+				// The vector angle low byte is latched at the end of phase 12
+				// into the tri-state flip flop at U56.
+				u16 vecangle = vectorram[vecaddr++ & 0xfff];
+
+				// The vector angle high byte is preset on the CD bus during
+				// phases 13 and 14, and is used as inputs to the adder at
+				// U46.
 				vecangle |= (vectorram[vecaddr++ & 0xfff] & 3) << 8;
 
-				/* The X increment value is looked up first (phase 13). The    */
-				/* sum of the latched symbol angle and the vector angle is     */
-				/* used as input to the PROM at U39. A0 is tied to ground.     */
-				/* A1-A9 map to bits 0-8 of the summed angles. The output from */
-				/* the PROM is latched into U48. */
-				deltax = sintable[((vecangle + symangle) & 0x1ff) << 1];
-
-				/* The Y increment value is looked up second (phase 14). The   */
-				/* angle sum is used once again as the input to the PROM, but  */
-				/* this time an additional 0x100 is effectively added to it    */
-				/* before it is used; this separates sin from cos. The output  */
-				/* from the PROM is latched into U49. */
-				deltay = sintable[((vecangle + symangle + 0x100) & 0x1ff) << 1];
-
-				/* Account for the 4 phases for data fetching. */
-				total_time -= 4.0 / (double)U51_CLOCK;
-
-				/* Compute color/intensity values from the attributes */
-				color = vector_device::color222((attrib >> 1) & 0x3f);
+				// The X increment value is looked up first (phase 13). The
+				// sum of the latched symbol angle and the vector angle is
+				// used as input to the PROM at U39. A0 is tied to ground.
+				// A1-A9 map to bits 0-8 of the summed angles. The output from
+				// the PROM is latched into U48.
+				u16 deltax = sintable[((vecangle + symangle) & 0x1ff) << 1];
+
+				// The Y increment value is looked up second (phase 14). The
+				// angle sum is used once again as the input to the PROM, but
+				// this time an additional 0x100 is effectively added to it
+				// before it is used; this separates sin from cos. The output
+				// from the PROM is latched into U49.
+				u16 deltay = sintable[((vecangle + symangle + 0x100) & 0x1ff) << 1];
+
+				// Account for the 4 phases for data fetching.
+				time_remaining -= 4 * U51_ATTOS;
+
+				// Compute color/intensity values from the attributes
+				u32 color = vector_device::color222((attrib >> 1) & 0x3f);
+				u8 intensity = 0;
 				if ((attrib & 1) && color)
 					intensity = 0xff;
-				else
-					intensity = 0;
 
-				/* Loop over the length of the vector. */
-				clipped = adjust_xy(curx, cury, &adjx, &adjy);
-				xaccum = yaccum = 0;
-				while (length-- != 0 && total_time > 0)
+				// Loop over the length of the vector.
+				clipped = adjust_xy(curx, cury, adjx, adjy);
+				u16 xaccum = 0;
+				u16 yaccum = 0;
+				while (length-- != 0 && time_remaining > 0)
 				{
-					int newclip;
-
-					/* The adders at U44/U45 are used as X accumulators. The value */
-					/* from U48 is repeatedly added to itself here. The carry out  */
-					/* of bit 8 clocks the up/down counters at U15/U16/U17. Bit 7  */
-					/* of the input value from U48 is used as a carry in to round  */
-					/* small values downward and larger values upward. */
+					// The adders at U44/U45 are used as X accumulators. The value
+					// from U48 is repeatedly added to itself here. The carry out
+					// of bit 8 clocks the up/down counters at U15/U16/U17. Bit 7
+					// of the input value from U48 is used as a carry in to round
+					// small values downward and larger values upward.
 					xaccum += deltax + (deltax >> 7);
 
-					/* Bit 9 of the summed angles controls the direction the up/   */
-					/* down counters at U15/U16/U17. */
+					// Bit 9 of the summed angles controls the direction the up/
+					// down counters at U15/U16/U17.
 					if (((vecangle + symangle) & 0x200) == 0)
 						curx += xaccum >> 8;
 					else
 						curx -= xaccum >> 8;
 					xaccum &= 0xff;
 
-					/* The adders at U46/U47 are used as Y accumulators. The value */
-					/* from U49 is repeatedly added to itself here. The carry out  */
-					/* of bit 8 clocks the up/down counters at U18/U19/U20. Bit 7  */
-					/* of the input value from U49 is used as a carry in to round  */
-					/* small values downward and larger values upward. */
+					// The adders at U46/U47 are used as Y accumulators. The value
+					// from U49 is repeatedly added to itself here. The carry out
+					// of bit 8 clocks the up/down counters at U18/U19/U20. Bit 7
+					// of the input value from U49 is used as a carry in to round
+					// small values downward and larger values upward.
 					yaccum += deltay + (deltay >> 7);
 
-					/* Bit 9 of the summed angles controls the direction the up/   */
-					/* down counters at U18/U19/U20. */
+					// Bit 9 of the summed angles controls the direction the up/
+					// down counters at U18/U19/U20.
 					if (((vecangle + symangle + 0x100) & 0x200) == 0)
 						cury += yaccum >> 8;
 					else
 						cury -= yaccum >> 8;
 					yaccum &= 0xff;
 
-					/* Apply the clipping from the DAC circuit. If the values clip */
-					/* the beam is turned off, but the computations continue right */
-					/* on going. */
-					newclip = adjust_xy(curx, cury, &adjx, &adjy);
+					// Apply the clipping from the DAC circuit. If the values clip
+					// the beam is turned off, but the computations continue right
+					// on going.
+					bool newclip = adjust_xy(curx, cury, adjx, adjy);
 					if (newclip != clipped)
 					{
-						/* if we're just becoming unclipped, add an empty point */
+						// if we're just becoming unclipped, add an empty point
 						if (!newclip)
 							m_vector->add_point(adjx, adjy, 0, 0);
 
-						/* otherwise, add a colored point */
+						// otherwise, add a colored point
 						else
 							m_vector->add_point(adjx, adjy, color, intensity);
 					}
 					clipped = newclip;
 
-					/* account for vector drawing time */
-					total_time -= 1.0 / (double)VCL_CLOCK;
+					// account for vector drawing time
+					time_remaining -= VCL_ATTOS;
 				}
 
-				/* We're done; if we are not clipped, add a final point. */
+				// We're done; if we are not clipped, add a final point.
 				if (!clipped)
 					m_vector->add_point(adjx, adjy, color, intensity);
 
-				/* if the high bit of the attribute is set, we break out of   */
-				/* this loop and fetch another symbol */
+				// if the high bit of the attribute is set, we break out of
+				// this loop and fetch another symbol
 				if (attrib & 0x80)
 					break;
 			}
 		}
 
-		/* if the high bit of the draw flag is set, we break out of this loop */
-		/* and stop the rendering altogether for this frame. */
+		// if the high bit of the draw flag is set, we break out of this loop
+		// and stop the rendering altogether for this frame.
 		if (draw & 0x80)
 			break;
 	}
+
+	// set the drawing end time for this frame
+	m_draw_end_time = machine().scheduler().time() + attotime(0, IRQ_ATTOS - time_remaining);
 }
 
 
@@ -328,12 +324,12 @@
 	if (!m_vectorram.bytes())
 		throw emu_fatalerror("segag80v_state::video_start: !vectorram.bytes()");
 
-	m_min_x =m_screen->visible_area().min_x;
-	m_min_y =m_screen->visible_area().min_y;
+	m_min_x = m_screen->visible_area().min_x;
+	m_min_y = m_screen->visible_area().min_y;
 }
 
 
-uint32_t segag80v_state::screen_update_segag80v(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+u32 segag80v_state::screen_update_segag80v(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
 	sega_generate_vector_list();
 	m_vector->screen_update(screen, bitmap, cliprect);
diff -Nru mame-0.222+dfsg.1/src/mame/video/segas24.cpp mame-0.224+dfsg.1/src/mame/video/segas24.cpp
--- mame-0.222+dfsg.1/src/mame/video/segas24.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/segas24.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -5,13 +5,12 @@
  *
  */
 
-#include <vector>
-#include <algorithm>
-
 #include "emu.h"
-#include "video/segaic24.h"
 #include "includes/segas24.h"
 
+#include <algorithm>
+#include <vector>
+
 
 namespace {
 	struct layer_sort {
diff -Nru mame-0.222+dfsg.1/src/mame/video/seta001.cpp mame-0.224+dfsg.1/src/mame/video/seta001.cpp
--- mame-0.222+dfsg.1/src/mame/video/seta001.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/seta001.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -27,7 +27,7 @@
 	TODO:
 	use getter callbacks in drivers for spriterams rather than allocating memory
 	here, then we won't have to allocate extra memory for seta.cpp games which
-	appear to have 0x800 bytes of RAM that isn't connceted to the sprite chip
+	appear to have 0x800 bytes of RAM that isn't connected to the sprite chip
 	between the banks.
 
 	*/
diff -Nru mame-0.222+dfsg.1/src/mame/video/sgi_gr1.cpp mame-0.224+dfsg.1/src/mame/video/sgi_gr1.cpp
--- mame-0.222+dfsg.1/src/mame/video/sgi_gr1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/sgi_gr1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -217,6 +217,7 @@
 	m_dr4 = DR4_MEGOPT;
 
 	m_fifo.clear();
+	m_int_fifo_cb(CLEAR_LINE);
 }
 
 u8 sgi_gr1_device::dr0_r()
diff -Nru mame-0.222+dfsg.1/src/mame/video/special.cpp mame-0.224+dfsg.1/src/mame/video/special.cpp
--- mame-0.222+dfsg.1/src/mame/video/special.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/special.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -19,7 +19,7 @@
 	{
 		for (int y = 0; y < 256; y++)
 		{
-			uint8_t const code = m_p_videoram[y + x*256];
+			uint8_t const code = m_vram[y + x*256];
 			for (int b = 7; b >= 0; b--)
 				bitmap.pix16(y, x*8+(7-b)) = BIT(code, b);
 		}
@@ -33,7 +33,7 @@
 	{
 		for (int y = 0; y < 256; y++)
 		{
-			uint8_t const code = m_p_videoram[y + x*256];
+			uint8_t const code = m_vram[y + x*256];
 			for (int b = 7; b >= 0; b--)
 				bitmap.pix16(y, x*8+(7-b)) = BIT(code, b);
 		}
@@ -66,12 +66,6 @@
 	palette.set_pen_colors(0, specimx_pens);
 }
 
-
-VIDEO_START_MEMBER(special_state,specimx)
-{
-	m_specimx_colorram = std::make_unique<uint8_t[]>(0x3000);
-}
-
 uint32_t special_state::screen_update_specimx(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	for (int x = 0; x < 48; x++)
diff -Nru mame-0.222+dfsg.1/src/mame/video/sspeedr.cpp mame-0.224+dfsg.1/src/mame/video/sspeedr.cpp
--- mame-0.222+dfsg.1/src/mame/video/sspeedr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/sspeedr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -10,73 +10,73 @@
 #include "includes/sspeedr.h"
 
 
-void sspeedr_state::sspeedr_driver_horz_w(uint8_t data)
+void sspeedr_state::driver_horz_w(uint8_t data)
 {
 	m_driver_horz = (m_driver_horz & 0x100) | data;
 }
 
 
-void sspeedr_state::sspeedr_driver_horz_2_w(uint8_t data)
+void sspeedr_state::driver_horz_2_w(uint8_t data)
 {
 	m_driver_horz = (m_driver_horz & 0xff) | ((data & 1) << 8);
 }
 
 
-void sspeedr_state::sspeedr_driver_vert_w(uint8_t data)
+void sspeedr_state::driver_vert_w(uint8_t data)
 {
 	m_driver_vert = data;
 }
 
 
-void sspeedr_state::sspeedr_driver_pic_w(uint8_t data)
+void sspeedr_state::driver_pic_w(uint8_t data)
 {
 	m_driver_pic = data & 0x1f;
 }
 
 
-void sspeedr_state::sspeedr_drones_horz_w(uint8_t data)
+void sspeedr_state::drones_horz_w(uint8_t data)
 {
 	m_drones_horz = (m_drones_horz & 0x100) | data;
 }
 
 
-void sspeedr_state::sspeedr_drones_horz_2_w(uint8_t data)
+void sspeedr_state::drones_horz_2_w(uint8_t data)
 {
 	m_drones_horz = (m_drones_horz & 0xff) | ((data & 1) << 8);
 }
 
 
-void sspeedr_state::sspeedr_drones_mask_w(uint8_t data)
+void sspeedr_state::drones_mask_w(uint8_t data)
 {
 	m_drones_mask = data & 0x3f;
 }
 
 
-void sspeedr_state::sspeedr_drones_vert_w(offs_t offset, uint8_t data)
+void sspeedr_state::drones_vert_w(offs_t offset, uint8_t data)
 {
 	m_drones_vert[offset] = data;
 }
 
 
-void sspeedr_state::sspeedr_track_horz_w(uint8_t data)
+void sspeedr_state::track_horz_w(uint8_t data)
 {
 	m_track_horz = (m_track_horz & 0x100) | data;
 }
 
 
-void sspeedr_state::sspeedr_track_horz_2_w(uint8_t data)
+void sspeedr_state::track_horz_2_w(uint8_t data)
 {
 	m_track_horz = (m_track_horz & 0xff) | ((data & 1) << 8);
 }
 
 
-void sspeedr_state::sspeedr_track_vert_w(offs_t offset, uint8_t data)
+void sspeedr_state::track_vert_w(offs_t offset, uint8_t data)
 {
 	m_track_vert[offset] = data & 0x7f;
 }
 
 
-void sspeedr_state::sspeedr_track_ice_w(uint8_t data)
+void sspeedr_state::track_ice_w(uint8_t data)
 {
 	m_track_ice = data & 0x07;
 }
@@ -84,12 +84,7 @@
 
 void sspeedr_state::draw_track(bitmap_ind16 &bitmap)
 {
-	const uint8_t* p = memregion("gfx3")->base();
-
-	int x;
-	int y;
-
-	for (x = 0; x < 376; x++)
+	for (int x = 0; x < 376; x++)
 	{
 		unsigned counter_x = x + m_track_horz + 0x50;
 
@@ -116,9 +111,9 @@
 			counter_x -= 0x1c8;
 		}
 
-		y = 0;
+		int y = 0;
 
-		/* upper landscape */
+		// upper landscape
 
 		for (; y < m_track_vert[0]; y++)
 		{
@@ -131,22 +126,22 @@
 
 			if (counter_x & 2)
 			{
-				bitmap.pix16(y, x) = p[offset] / 16;
+				bitmap.pix16(y, x) = m_track[offset] / 16;
 			}
 			else
 			{
-				bitmap.pix16(y, x) = p[offset] % 16;
+				bitmap.pix16(y, x) = m_track[offset] % 16;
 			}
 		}
 
-		/* street */
+		// street
 
 		for (; y < 128 + m_track_vert[1]; y++)
 		{
 			bitmap.pix16(y, x) = flag ? 15 : 0;
 		}
 
-		/* lower landscape */
+		// lower landscape
 
 		for (; y < 248; y++)
 		{
@@ -159,11 +154,11 @@
 
 			if (counter_x & 2)
 			{
-				bitmap.pix16(y, x) = p[offset] / 16;
+				bitmap.pix16(y, x) = m_track[offset] / 16;
 			}
 			else
 			{
-				bitmap.pix16(y, x) = p[offset] % 16;
+				bitmap.pix16(y, x) = m_track[offset] % 16;
 			}
 		}
 	}
@@ -177,26 +172,21 @@
 		0xf, 0x4, 0x3, 0x9, 0x7, 0xc
 	};
 
-	int i;
-
-	for (i = 0; i < 6; i++)
+	for (int i = 0; i < 6; i++)
 	{
-		int x;
-		int y;
-
 		if ((m_drones_mask >> i) & 1)
 		{
 			continue;
 		}
 
-		x = (code[i] << 5) - m_drones_horz - 0x50;
+		int x = (code[i] << 5) - m_drones_horz - 0x50;
 
 		if (x <= -32)
 		{
 			x += 0x1c8;
 		}
 
-		y = 0xf0 - m_drones_vert[i >> 1];
+		int y = 0xf0 - m_drones_vert[i >> 1];
 
 
 			m_gfxdecode->gfx(1)->transpen(bitmap,cliprect,
@@ -211,22 +201,19 @@
 
 void sspeedr_state::draw_driver(bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	int x;
-	int y;
-
 	if (!(m_driver_pic & 0x10))
 	{
 		return;
 	}
 
-	x = 0x1e0 - m_driver_horz - 0x50;
+	int x = 0x1e0 - m_driver_horz - 0x50;
 
 	if (x <= -32)
 	{
 		x += 0x1c8;
 	}
 
-	y = 0xf0 - m_driver_vert;
+	int y = 0xf0 - m_driver_vert;
 
 
 		m_gfxdecode->gfx(0)->transpen(bitmap,cliprect,
@@ -241,10 +228,23 @@
 void sspeedr_state::video_start()
 {
 	m_toggle = 0;
+
+	save_item(NAME(m_led_time));
+	save_item(NAME(m_led_score));
+	save_item(NAME(m_toggle));
+	save_item(NAME(m_driver_horz));
+	save_item(NAME(m_driver_vert));
+	save_item(NAME(m_driver_pic));
+	save_item(NAME(m_drones_horz));
+	save_item(NAME(m_drones_vert));
+	save_item(NAME(m_drones_mask));
+	save_item(NAME(m_track_horz));
+	save_item(NAME(m_track_vert));
+	save_item(NAME(m_track_ice));
 }
 
 
-uint32_t sspeedr_state::screen_update_sspeedr(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t sspeedr_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	draw_track(bitmap);
 	draw_drones(bitmap, cliprect);
@@ -253,7 +253,7 @@
 }
 
 
-WRITE_LINE_MEMBER(sspeedr_state::screen_vblank_sspeedr)
+WRITE_LINE_MEMBER(sspeedr_state::screen_vblank)
 {
 	// rising edge
 	if (state)
diff -Nru mame-0.222+dfsg.1/src/mame/video/stactics.cpp mame-0.224+dfsg.1/src/mame/video/stactics.cpp
--- mame-0.222+dfsg.1/src/mame/video/stactics.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/stactics.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -430,10 +430,7 @@
 {
 	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	screen.set_video_attributes(VIDEO_ALWAYS_UPDATE);
-	screen.set_refresh_hz(60);
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
-	screen.set_size(32*8, 32*8);
-	screen.set_visarea(0*8, 32*8-1, 0*8, 30*8-1);
+	screen.set_raw(15.46848_MHz_XTAL / 3, 328, 0, 256, 262, 0, 232);
 	screen.set_screen_update(FUNC(stactics_state::screen_update));
 	screen.set_palette("palette");
 
diff -Nru mame-0.222+dfsg.1/src/mame/video/starcrus.cpp mame-0.224+dfsg.1/src/mame/video/starcrus.cpp
--- mame-0.222+dfsg.1/src/mame/video/starcrus.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/starcrus.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -40,40 +40,13 @@
 	save_item(NAME(m_p2_sprite));
 	save_item(NAME(m_s1_sprite));
 	save_item(NAME(m_s2_sprite));
-	save_item(NAME(m_engine1_on));
-	save_item(NAME(m_engine2_on));
-	save_item(NAME(m_explode1_on));
-	save_item(NAME(m_explode2_on));
-	save_item(NAME(m_launch1_on));
-	save_item(NAME(m_launch2_on));
 	save_item(NAME(m_collision_reg));
-	save_item(NAME(m_engine_sound_playing));
-	save_item(NAME(m_explode_sound_playing));
-	save_item(NAME(m_launch1_sound_playing));
-	save_item(NAME(m_launch2_sound_playing));
 }
 
 void starcrus_state::ship_parm_1_w(uint8_t data)
 {
-	m_s1_sprite = data&0x1f;
-	m_engine1_on = ((data&0x20)>>5)^0x01;
-
-	if (m_engine1_on || m_engine2_on)
-	{
-		if (m_engine_sound_playing == 0)
-		{
-			m_engine_sound_playing = 1;
-			m_samples->start(0, 0, true); /* engine sample */
-		}
-	}
-	else
-	{
-		if (m_engine_sound_playing == 1)
-		{
-			m_engine_sound_playing = 0;
-			m_samples->stop(0);
-		}
-	}
+	m_s1_sprite = data & 0x1f;
+	m_engine[0]->write_line(BIT(data, 5));
 }
 
 void starcrus_state::ship_parm_2_w(uint8_t data)
@@ -81,99 +54,21 @@
 	m_s2_sprite = data & 0x1f;
 	m_led = !BIT(data, 7); /* game over lamp */
 	machine().bookkeeping().coin_counter_w(0, ((data & 0x40) >> 6) ^ 0x01);    /* coin counter */
-	m_engine2_on = ((data & 0x20) >> 5) ^ 0x01;
-
-	if (m_engine1_on || m_engine2_on)
-	{
-		if (m_engine_sound_playing == 0)
-		{
-			m_engine_sound_playing = 1;
-			m_samples->start(0, 0, true); /* engine sample */
-		}
-	}
-	else
-	{
-		if (m_engine_sound_playing == 1)
-		{
-			m_engine_sound_playing = 0;
-			m_samples->stop(0);
-		}
-	}
-
+	m_engine[1]->write_line(BIT(data, 5));
 }
 
 void starcrus_state::proj_parm_1_w(uint8_t data)
 {
 	m_p1_sprite = data & 0x0f;
-	m_launch1_on = ((data & 0x20) >> 5) ^ 0x01;
-	m_explode1_on = ((data & 0x10) >> 4) ^ 0x01;
-
-	if (m_explode1_on || m_explode2_on)
-	{
-		if (m_explode_sound_playing == 0)
-		{
-			m_explode_sound_playing = 1;
-			m_samples->start(1, 1, true);  /* explosion initial sample */
-		}
-	}
-	else
-	{
-		if (m_explode_sound_playing == 1)
-		{
-			m_explode_sound_playing = 0;
-			m_samples->start(1,2);    /* explosion ending sample */
-		}
-	}
-
-	if (m_launch1_on)
-	{
-		if (m_launch1_sound_playing == 0)
-		{
-			m_launch1_sound_playing = 1;
-			m_samples->start(2,3);    /* launch sample */
-		}
-	}
-	else
-	{
-		m_launch1_sound_playing = 0;
-	}
+	m_launch[0]->write_line(BIT(data, 5));
+	m_explode[0]->write_line(BIT(data, 4));
 }
 
 void starcrus_state::proj_parm_2_w(uint8_t data)
 {
 	m_p2_sprite = data & 0x0f;
-	m_launch2_on = ((data & 0x20) >> 5) ^ 0x01;
-	m_explode2_on = ((data & 0x10) >> 4) ^ 0x01;
-
-	if (m_explode1_on || m_explode2_on)
-	{
-		if (m_explode_sound_playing == 0)
-		{
-			m_explode_sound_playing = 1;
-			m_samples->start(1, 1, true);  /* explosion initial sample */
-		}
-	}
-	else
-	{
-		if (m_explode_sound_playing == 1)
-		{
-			m_explode_sound_playing = 0;
-			m_samples->start(1,2);    /* explosion ending sample */
-		}
-	}
-
-	if (m_launch2_on)
-	{
-		if (m_launch2_sound_playing == 0)
-		{
-			m_launch2_sound_playing = 1;
-			m_samples->start(3,3);    /* launch sample */
-		}
-	}
-	else
-	{
-		m_launch2_sound_playing = 0;
-	}
+	m_launch[1]->write_line(BIT(data, 5));
+	m_explode[1]->write_line(BIT(data, 4));
 }
 
 int starcrus_state::collision_check_s1s2()
diff -Nru mame-0.222+dfsg.1/src/mame/video/starfire.cpp mame-0.224+dfsg.1/src/mame/video/starfire.cpp
--- mame-0.222+dfsg.1/src/mame/video/starfire.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/starfire.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -17,17 +17,17 @@
  *
  *************************************/
 
-void starfire_state::video_start()
+void starfire_base_state::video_start()
 {
-	m_screen->register_screen_bitmap(m_starfire_screen);
-	m_scanline_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(starfire_state::starfire_scanline_callback),this));
+	m_screen->register_screen_bitmap(m_screen_bitmap);
+	m_scanline_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(starfire_base_state::scanline_callback),this));
 	m_scanline_timer->adjust(m_screen->time_until_pos(STARFIRE_VBEND), STARFIRE_VBEND);
 
 	/* register for state saving */
-	save_item(NAME(m_starfire_vidctrl));
-	save_item(NAME(m_starfire_vidctrl1));
-	save_item(NAME(m_starfire_color));
-	save_item(NAME(m_starfire_colors));
+	save_item(NAME(m_vidctrl));
+	save_item(NAME(m_vidctrl1));
+	save_item(NAME(m_color));
+	save_item(NAME(m_colors));
 }
 
 
@@ -37,7 +37,7 @@
  *
  *************************************/
 
-void starfire_state::starfire_colorram_w(offs_t offset, uint8_t data)
+void starfire_base_state::colorram_w(offs_t offset, uint8_t data)
 {
 	/* handle writes to the pseudo-color RAM */
 	if ((offset & 0xe0) == 0)
@@ -45,19 +45,19 @@
 		int palette_index = (offset & 0x1f) | ((offset & 0x200) >> 4);
 
 		/* set RAM regardless */
-		int cl = (m_starfire_vidctrl1 & 0x80) ? m_starfire_color : (data & 0x1f);
+		int cl = (m_vidctrl1 & 0x80) ? m_color : (data & 0x1f);
 		int cr = (data >> 5) | ((offset & 0x100) >> 5);
-		cr |= (m_starfire_vidctrl1 & 0x80) ? (m_starfire_color & 0x10) : (data & 0x10);
+		cr |= (m_vidctrl1 & 0x80) ? (m_color & 0x10) : (data & 0x10);
 
-		m_starfire_colorram[offset & ~0x100] = cl;
-		m_starfire_colorram[offset |  0x100] = cr;
+		m_colorram[offset & ~0x100] = cl;
+		m_colorram[offset |  0x100] = cr;
 
-		m_starfire_color = cl;
+		m_color = cl;
 
 		/* don't modify the palette unless the TRANS bit is set */
-		if (m_starfire_vidctrl1 & 0x40)
+		if (m_vidctrl1 & 0x40)
 		{
-			m_starfire_colors[palette_index] = ((cl & 0x3) << 7) | ((cr & 0xf) << 3) | ((cl & 0x1c) >> 2);
+			m_colors[palette_index] = ((cl & 0x3) << 7) | ((cr & 0xf) << 3) | ((cl & 0x1c) >> 2);
 		}
 	}
 
@@ -65,30 +65,30 @@
 	else
 	{
 		/* set RAM based on CDRM */
-		m_starfire_colorram[offset] = (m_starfire_vidctrl1 & 0x80) ? m_starfire_color : (data & 0x1f);
-		m_starfire_color = (m_starfire_vidctrl1 & 0x80) ? m_starfire_color : (data & 0x1f);
+		m_colorram[offset] = (m_vidctrl1 & 0x80) ? m_color : (data & 0x1f);
+		m_color = (m_vidctrl1 & 0x80) ? m_color : (data & 0x1f);
 	}
 }
 
-uint8_t starfire_state::starfire_colorram_r(offs_t offset)
+uint8_t starfire_base_state::colorram_r(offs_t offset)
 {
 	/* handle writes to the pseudo-color RAM, which also happen on reads */
 	if ((offset & 0xe0) == 0)
 	{
 		int palette_index = (offset & 0x1f) | ((offset & 0x200) >> 4);
-		int cl = m_starfire_colorram[offset & ~0x100];
-		int cr = m_starfire_colorram[offset |  0x100];
+		int cl = m_colorram[offset & ~0x100];
+		int cr = m_colorram[offset |  0x100];
 
 		/* don't modify the palette unless the TRANS bit is set */
-		if (m_starfire_vidctrl1 & 0x40)
+		if (m_vidctrl1 & 0x40)
 		{
-			m_starfire_colors[palette_index] = ((cl & 0x3) << 7) | ((cr & 0xf) << 3) | ((cl & 0x1c) >> 2);
+			m_colors[palette_index] = ((cl & 0x3) << 7) | ((cr & 0xf) << 3) | ((cl & 0x1c) >> 2);
 		}
 
 		return cl | ((cr & 0x7) << 5);
 	}
 
-	return m_starfire_colorram[offset];
+	return m_colorram[offset];
 }
 
 /*************************************
@@ -97,26 +97,26 @@
  *
  *************************************/
 
-void starfire_state::starfire_videoram_w(offs_t offset, uint8_t data)
+void starfire_base_state::videoram_w(offs_t offset, uint8_t data)
 {
 	int sh, lr, dm, ds, mask, d0, dalu;
 	int offset1 = offset & 0x1fff;
 	int offset2 = (offset + 0x100) & 0x1fff;
 
 	/* PROT */
-	if (!(offset & 0xe0) && !(m_starfire_vidctrl1 & 0x20))
+	if (!(offset & 0xe0) && !(m_vidctrl1 & 0x20))
 		return;
 
 	/* selector 6A */
 	if (offset & 0x2000)
 	{
-		sh = (m_starfire_vidctrl >> 1) & 0x07;
-		lr = m_starfire_vidctrl & 0x01;
+		sh = (m_vidctrl >> 1) & 0x07;
+		lr = m_vidctrl & 0x01;
 	}
 	else
 	{
-		sh = (m_starfire_vidctrl >> 5) & 0x07;
-		lr = (m_starfire_vidctrl >> 4) & 0x01;
+		sh = (m_vidctrl >> 5) & 0x07;
+		lr = (m_vidctrl >> 4) & 0x01;
 	}
 
 	/* mirror bits 5B/5C/5D/5E */
@@ -132,18 +132,18 @@
 	/* ROLL */
 	if ((offset & 0x1f00) == 0x1f00)
 	{
-		if (m_starfire_vidctrl1 & 0x10)
+		if (m_vidctrl1 & 0x10)
 			mask &= 0x00ff;
 		else
 			mask &= 0xff00;
 	}
 
 	/* ALU 8B/8D */
-	d0 = (m_starfire_videoram[offset1] << 8) | m_starfire_videoram[offset2];
+	d0 = (m_videoram[offset1] << 8) | m_videoram[offset2];
 	dalu = d0 & ~mask;
 	d0 &= mask;
 	ds &= mask;
-	switch (~m_starfire_vidctrl1 & 15)
+	switch (~m_vidctrl1 & 15)
 	{
 		case 0:     dalu |= ds ^ mask;              break;
 		case 1:     dalu |= (ds | d0) ^ mask;       break;
@@ -164,20 +164,20 @@
 	}
 
 	/* final output */
-	m_starfire_videoram[offset1] = dalu >> 8;
-	m_starfire_videoram[offset2] = dalu;
+	m_videoram[offset1] = dalu >> 8;
+	m_videoram[offset2] = dalu;
 
 	/* color output */
-	if (!(offset & 0x2000) && !(m_starfire_vidctrl1 & 0x80))
+	if (!(offset & 0x2000) && !(m_vidctrl1 & 0x80))
 	{
 		if (mask & 0xff00)
-			m_starfire_colorram[offset1] = m_starfire_color;
+			m_colorram[offset1] = m_color;
 		if (mask & 0x00ff)
-			m_starfire_colorram[offset2] = m_starfire_color;
+			m_colorram[offset2] = m_color;
 	}
 }
 
-uint8_t starfire_state::starfire_videoram_r(offs_t offset)
+uint8_t starfire_base_state::videoram_r(offs_t offset)
 {
 	int sh, mask, d0;
 	int offset1 = offset & 0x1fff;
@@ -185,9 +185,9 @@
 
 	/* selector 6A */
 	if (offset & 0x2000)
-		sh = (m_starfire_vidctrl >> 1) & 0x07;
+		sh = (m_vidctrl >> 1) & 0x07;
 	else
-		sh = (m_starfire_vidctrl >> 5) & 0x07;
+		sh = (m_vidctrl >> 5) & 0x07;
 
 	/* shifters 6D/6E */
 	mask = 0xff00 >> sh;
@@ -195,14 +195,14 @@
 	/* ROLL */
 	if ((offset & 0x1f00) == 0x1f00)
 	{
-		if (m_starfire_vidctrl1 & 0x10)
+		if (m_vidctrl1 & 0x10)
 			mask &= 0x00ff;
 		else
 			mask &= 0xff00;
 	}
 
 	/* munge the results */
-	d0 = (m_starfire_videoram[offset1] & (mask >> 8)) | (m_starfire_videoram[offset2] & mask);
+	d0 = (m_videoram[offset1] & (mask >> 8)) | (m_videoram[offset2] & mask);
 	d0 = (d0 << sh) | (d0 >> (8 - sh));
 	return d0 & 0xff;
 }
@@ -215,41 +215,41 @@
  *
  *************************************/
 
-void starfire_state::get_pens(pen_t *pens)
+void starfire_base_state::get_pens(pen_t *pens)
 {
 	offs_t offs;
 
 	for (offs = 0; offs < STARFIRE_NUM_PENS; offs++)
 	{
-		uint16_t color = m_starfire_colors[offs];
+		uint16_t color = m_colors[offs];
 
 		pens[offs] = rgb_t(pal3bit(color >> 6), pal3bit(color >> 3), pal3bit(color >> 0));
 	}
 }
 
-TIMER_CALLBACK_MEMBER(starfire_state::starfire_scanline_callback)
+TIMER_CALLBACK_MEMBER(starfire_base_state::scanline_callback)
 {
 	pen_t pens[STARFIRE_NUM_PENS];
 	int y = param;
 
 	get_pens(pens);
 
-	uint8_t *pix = &m_starfire_videoram[y];
-	uint8_t *col = &m_starfire_colorram[y];
+	uint8_t *pix = &m_videoram[y];
+	uint8_t *col = &m_colorram[y];
 
 	for (int x = 0; x < 256; x += 8)
 	{
 		int data = pix[0];
 		int color = col[0];
 
-		m_starfire_screen.pix32(y, x + 0) = pens[color | ((data >> 2) & 0x20)];
-		m_starfire_screen.pix32(y, x + 1) = pens[color | ((data >> 1) & 0x20)];
-		m_starfire_screen.pix32(y, x + 2) = pens[color | ((data >> 0) & 0x20)];
-		m_starfire_screen.pix32(y, x + 3) = pens[color | ((data << 1) & 0x20)];
-		m_starfire_screen.pix32(y, x + 4) = pens[color | ((data << 2) & 0x20)];
-		m_starfire_screen.pix32(y, x + 5) = pens[color | ((data << 3) & 0x20)];
-		m_starfire_screen.pix32(y, x + 6) = pens[color | ((data << 4) & 0x20)];
-		m_starfire_screen.pix32(y, x + 7) = pens[color | ((data << 5) & 0x20)];
+		m_screen_bitmap.pix32(y, x + 0) = pens[color | ((data >> 2) & 0x20)];
+		m_screen_bitmap.pix32(y, x + 1) = pens[color | ((data >> 1) & 0x20)];
+		m_screen_bitmap.pix32(y, x + 2) = pens[color | ((data >> 0) & 0x20)];
+		m_screen_bitmap.pix32(y, x + 3) = pens[color | ((data << 1) & 0x20)];
+		m_screen_bitmap.pix32(y, x + 4) = pens[color | ((data << 2) & 0x20)];
+		m_screen_bitmap.pix32(y, x + 5) = pens[color | ((data << 3) & 0x20)];
+		m_screen_bitmap.pix32(y, x + 6) = pens[color | ((data << 4) & 0x20)];
+		m_screen_bitmap.pix32(y, x + 7) = pens[color | ((data << 5) & 0x20)];
 
 		pix += 256;
 		col += 256;
@@ -260,9 +260,9 @@
 	m_scanline_timer->adjust(m_screen->time_until_pos(y), y);
 }
 
-uint32_t starfire_state::screen_update_starfire(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t starfire_base_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
-	copybitmap(bitmap, m_starfire_screen, 0, 0, 0, 0, cliprect);
+	copybitmap(bitmap, m_screen_bitmap, 0, 0, 0, 0, cliprect);
 
 	return 0;
 }
diff -Nru mame-0.222+dfsg.1/src/mame/video/suprridr.cpp mame-0.224+dfsg.1/src/mame/video/suprridr.cpp
--- mame-0.222+dfsg.1/src/mame/video/suprridr.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/suprridr.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -167,19 +167,19 @@
 	const rectangle &visarea = screen.visible_area();
 
 	/* render left 4 columns with no scroll */
-	subclip = visarea;;
+	subclip = visarea;
 	subclip.max_x = subclip.min_x + (m_flipx ? 1*8 : 4*8) - 1;
 	subclip &= cliprect;
 	m_bg_tilemap_noscroll->draw(screen, bitmap, subclip, 0, 0);
 
 	/* render right 1 column with no scroll */
-	subclip = visarea;;
+	subclip = visarea;
 	subclip.min_x = subclip.max_x - (m_flipx ? 4*8 : 1*8) + 1;
 	subclip &= cliprect;
 	m_bg_tilemap_noscroll->draw(screen, bitmap, subclip, 0, 0);
 
 	/* render the middle columns normally */
-	subclip = visarea;;
+	subclip = visarea;
 	subclip.min_x += m_flipx ? 1*8 : 4*8;
 	subclip.max_x -= m_flipx ? 4*8 : 1*8;
 	subclip &= cliprect;
diff -Nru mame-0.222+dfsg.1/src/mame/video/tigeroad.cpp mame-0.224+dfsg.1/src/mame/video/tigeroad.cpp
--- mame-0.222+dfsg.1/src/mame/video/tigeroad.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/tigeroad.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -4,53 +4,46 @@
 #include "includes/tigeroad.h"
 
 
-void tigeroad_state::tigeroad_videoram_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void tigeroad_state::videoram_w(offs_t offset, u16 data, u16 mem_mask)
 {
 	COMBINE_DATA(&m_videoram[offset]);
 	m_fg_tilemap->mark_tile_dirty(offset);
 }
 
-void tigeroad_state::tigeroad_videoctrl_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void tigeroad_state::videoctrl_w(u8 data)
 {
-	int bank;
+	// bit 1 flips screen
 
-	if (ACCESSING_BITS_8_15)
+	if (flip_screen() != (data & 0x02))
 	{
-		data = (data >> 8) & 0xff;
-
-		/* bit 1 flips screen */
-
-		if (flip_screen() != (data & 0x02))
-		{
-			flip_screen_set(data & 0x02);
-			machine().tilemap().mark_all_dirty();
-		}
+		flip_screen_set(data & 0x02);
+		machine().tilemap().mark_all_dirty();
+	}
 
-		/* bit 2 selects bg char bank */
+	// bit 2 selects bg char bank
 
-		bank = (data & 0x04) >> 2;
+	u8 bank = (data & 0x04) >> 2;
 
-		if (m_bgcharbank != bank)
-		{
-			m_bgcharbank = bank;
-			m_bg_tilemap->mark_all_dirty();
-		}
+	if (m_bgcharbank != bank)
+	{
+		m_bgcharbank = bank;
+		m_bg_tilemap->mark_all_dirty();
+	}
 
-		/* bits 4-5 are coin lockouts */
-		if (m_has_coinlock)
-		{
-			machine().bookkeeping().coin_lockout_w(0, !(data & 0x10));
-			machine().bookkeeping().coin_lockout_w(1, !(data & 0x20));
-		}
+	// bits 4-5 are coin lockouts
+	if (m_has_coinlock)
+	{
+		machine().bookkeeping().coin_lockout_w(0, !(data & 0x10));
+		machine().bookkeeping().coin_lockout_w(1, !(data & 0x20));
+	}
 
-		/* bits 6-7 are coin counters */
+	// bits 6-7 are coin counters
 
-		machine().bookkeeping().coin_counter_w(0, data & 0x40);
-		machine().bookkeeping().coin_counter_w(1, data & 0x80);
-	}
+	machine().bookkeeping().coin_counter_w(0, data & 0x40);
+	machine().bookkeeping().coin_counter_w(1, data & 0x80);
 }
 
-void tigeroad_state::tigeroad_scroll_w(offs_t offset, uint16_t data, uint16_t mem_mask)
+void tigeroad_state::scroll_w(offs_t offset, u16 data, u16 mem_mask)
 {
 	int scroll = 0;
 
@@ -71,7 +64,7 @@
 
 TILE_GET_INFO_MEMBER(tigeroad_state::get_bg_tile_info)
 {
-	uint8_t *tilerom = memregion("bgmap")->base();
+	u8 *tilerom = memregion("bgmap")->base();
 
 	int data = tilerom[tile_index];
 	int attr = tilerom[tile_index + 1];
@@ -85,8 +78,7 @@
 
 TILE_GET_INFO_MEMBER(tigeroad_state::get_fg_tile_info)
 {
-	uint16_t *videoram = m_videoram;
-	int data = videoram[tile_index];
+	int data = m_videoram[tile_index];
 	int attr = data >> 8;
 	int code = (data & 0xff) + ((attr & 0xc0) << 2) + ((attr & 0x20) << 5);
 	int color = attr & 0x0f;
@@ -97,7 +89,7 @@
 
 TILEMAP_MAPPER_MEMBER(tigeroad_state::tigeroad_tilemap_scan)
 {
-	/* logical (col,row) -> memory offset */
+	// logical (col,row) -> memory offset
 	return 2 * (col % 8) + 16 * ((127 - row) % 8) + 128 * (col / 8) + 2048 * ((127 - row) / 8);
 }
 
@@ -115,9 +107,11 @@
 	m_bg_tilemap->set_transmask(1, 0x1ff, 0xfe00);
 
 	m_fg_tilemap->set_transparent_pen(3);
+
+	save_item(NAME(m_bgcharbank));
 }
 
-uint32_t tigeroad_state::screen_update_tigeroad(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+u32 tigeroad_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	m_bg_tilemap->draw(screen, bitmap, cliprect, TILEMAP_DRAW_LAYER1, 0);
 	m_spritegen->draw_sprites(bitmap, cliprect, m_spriteram->buffer(), m_spriteram->bytes(), flip_screen(), true);
diff -Nru mame-0.222+dfsg.1/src/mame/video/toobin.cpp mame-0.224+dfsg.1/src/mame/video/toobin.cpp
--- mame-0.222+dfsg.1/src/mame/video/toobin.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/toobin.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,7 +7,6 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "machine/atarigen.h"
 #include "includes/toobin.h"
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/video/truco.cpp mame-0.224+dfsg.1/src/mame/video/truco.cpp
--- mame-0.222+dfsg.1/src/mame/video/truco.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/truco.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,7 +2,7 @@
 // copyright-holders:Ernesto Corvi, Roberto Fresca
 /***************************************************************************
 
-  video.c
+  Truco-Tron
 
   Functions to emulate the video hardware of the machine.
 
@@ -28,7 +28,7 @@
 			b >>= 1;
 		}
 
-		palette.set_pen_color(i,rgb_t(r,g,b));
+		palette.set_pen_color(i, rgb_t(r, g, b));
 	}
 }
 
diff -Nru mame-0.222+dfsg.1/src/mame/video/ut88.cpp mame-0.224+dfsg.1/src/mame/video/ut88.cpp
--- mame-0.222+dfsg.1/src/mame/video/ut88.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/ut88.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Miodrag Milanovic
-/***************************************************************************
-
-        UT88 video driver by Miodrag Milanovic
-
-        06/03/2008 Preliminary driver.
-
-****************************************************************************/
-
-
-#include "emu.h"
-#include "includes/ut88.h"
-
-
-const gfx_layout ut88_charlayout =
-{
-	8, 8,               /* 8x8 characters */
-	256,                /* 256 characters */
-	1,                /* 1 bits per pixel */
-	{0},                /* no bitplanes; 1 bit per pixel */
-	{0, 1, 2, 3, 4, 5, 6, 7},
-	{0 * 8, 1 * 8, 2 * 8, 3 * 8, 4 * 8, 5 * 8, 6 * 8, 7 * 8},
-	8*8                 /* size of one char */
-};
-
-uint32_t ut88_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
-{
-	for (int y = 0; y < 28; y++)
-	{
-		for (int x = 0; x < 64; x++)
-		{
-			int code = m_p_videoram[x +   y*64] & 0x7f;
-			int attr = m_p_videoram[x+1 + y*64] & 0x80;
-			m_gfxdecode->gfx(0)->opaque(bitmap,cliprect, code | attr, 0, 0,0, x*8,y*8);
-		}
-	}
-	return 0;
-}
diff -Nru mame-0.222+dfsg.1/src/mame/video/vector06.cpp mame-0.224+dfsg.1/src/mame/video/vector06.cpp
--- mame-0.222+dfsg.1/src/mame/video/vector06.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/vector06.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -13,18 +13,14 @@
 #include "includes/vector06.h"
 
 
-void vector06_state::video_start()
-{
-}
-
-uint32_t vector06_state::screen_update_vector06(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t vector06_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
 	uint8_t code1,code2,code3,code4;
 	uint8_t col;
 	int y, x, b,draw_y;
 	uint8_t *ram = m_ram->pointer();
 
-	int width = (m_video_mode==0x00) ? 256 : 512;
+	u16 width = (m_video_mode) ? 512 : 256;
 	rectangle screen_area(0,width+64-1,0,256+64-1);
 	// fill border color
 	bitmap.fill(m_color_index, screen_area);
@@ -42,12 +38,13 @@
 			code4 = ram[0xe000 + x*256 + y];
 			for (b = 0; b < 8; b++)
 			{
-				col = ((code1 >> b) & 0x01) * 8 + ((code2 >> b) & 0x01) * 4 + ((code3 >> b) & 0x01)* 2+ ((code4 >> b) & 0x01);
-				if (m_video_mode==0x00) {
-					bitmap.pix16(draw_y, x*8+(7-b)+32) =  col;
-				} else {
-					bitmap.pix16(draw_y, x*16+(7-b)*2+1+32) =  ((code2 >> b) & 0x01) * 2;
-					bitmap.pix16(draw_y, x*16+(7-b)*2+32)   =  ((code3 >> b) & 0x01) * 2;
+				col = BIT(code1, b) * 8 + BIT(code2, b) * 4 + BIT(code3, b)* 2+ BIT(code4, b);
+				if (!m_video_mode)
+					bitmap.pix16(draw_y, x*8+(7-b)+32) = col;
+				else
+				{
+					bitmap.pix16(draw_y, x*16+(7-b)*2+1+32) = BIT(code2, b) * 2;
+					bitmap.pix16(draw_y, x*16+(7-b)*2+32)   = BIT(code3, b) * 2;
 				}
 			}
 		}
diff -Nru mame-0.222+dfsg.1/src/mame/video/vicdual-97269pb.cpp mame-0.224+dfsg.1/src/mame/video/vicdual-97269pb.cpp
--- mame-0.222+dfsg.1/src/mame/video/vicdual-97269pb.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/vicdual-97269pb.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -144,7 +144,7 @@
 
 			case 0x4:
 				// black-to-blue
-				return rgb_t(0, 0, (gradient_flags & 0x0f) * 0x11);;
+				return rgb_t(0, 0, (gradient_flags & 0x0f) * 0x11);
 				break;
 
 			case 0xf:
diff -Nru mame-0.222+dfsg.1/src/mame/video/vtech2.cpp mame-0.224+dfsg.1/src/mame/video/vtech2.cpp
--- mame-0.222+dfsg.1/src/mame/video/vtech2.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/vtech2.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -112,9 +112,8 @@
 	0x26a0,0x2ea0,0x36a0,0x3ea0,0x27a0,0x2fa0,0x37a0,0x3fa0
 };
 
-uint32_t vtech2_state::screen_update_laser(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
+uint32_t vtech2_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	uint8_t *videoram = m_videoram;
 	int offs, x, y;
 	int full_refresh = 1;
 	int lang_offs = 0;
@@ -146,7 +145,7 @@
 					int sx, sy, code, color = m_laser_two_color;
 					sy = BORDER_V/2 + y;
 					sx = BORDER_H/2 + x * 8;
-					code = videoram[offs];
+					code = m_vram[offs];
 					m_gfxdecode->gfx(2)->opaque(bitmap,cliprect,code,color,0,0,sx,sy);
 				}
 			}
@@ -165,8 +164,8 @@
 					int sx, sy, code, color;
 					sy = BORDER_V/2 + y;
 					sx = BORDER_H/2 + x * 16;
-					code = videoram[offs];
-					color = videoram[offs+1];
+					code = m_vram[offs];
+					color = m_vram[offs+1];
 					m_gfxdecode->gfx(3)->opaque(bitmap,cliprect,code,color,0,0,sx,sy);
 				}
 			}
@@ -185,7 +184,7 @@
 					int sx, sy, code;
 					sy = BORDER_V/2 + y;
 					sx = BORDER_H/2 + x * 8;
-					code = videoram[offs];
+					code = m_vram[offs];
 					m_gfxdecode->gfx(5)->opaque(bitmap,cliprect,code,0,0,0,sx,sy);
 				}
 			}
@@ -205,7 +204,7 @@
 					int sx, sy, code;
 					sy = BORDER_V/2 + y * 2;
 					sx = BORDER_H/2 + x * 8;
-					code = videoram[offs];
+					code = m_vram[offs];
 					m_gfxdecode->gfx(6)->opaque(bitmap,cliprect,code,0,0,0,sx,sy);
 				}
 			}
@@ -224,7 +223,7 @@
 					int sx, sy, code, color = m_laser_two_color;
 					sy = BORDER_V/2 + y;
 					sx = BORDER_H/2 + x * 16;
-					code = videoram[offs];
+					code = m_vram[offs];
 					m_gfxdecode->gfx(3)->opaque(bitmap,cliprect,code,color,0,0,sx,sy);
 				}
 			}
@@ -243,8 +242,8 @@
 					int sx, sy, code, color;
 					sy = BORDER_V/2 + y;
 					sx = BORDER_H/2 + x * 32;
-					code = videoram[offs];
-					color = videoram[offs+1];
+					code = m_vram[offs];
+					color = m_vram[offs+1];
 					m_gfxdecode->gfx(4)->opaque(bitmap,cliprect,code,color,0,0,sx,sy);
 				}
 			}
@@ -265,7 +264,7 @@
 					int sx, sy, code, color = m_laser_two_color;
 					sy = BORDER_V/2 + y * 8;
 					sx = BORDER_H/2 + x * 8;
-					code = videoram[0x3800+offs] + lang_offs;
+					code = m_vram[0x3800+offs] + lang_offs;
 					m_gfxdecode->gfx(0)->opaque(bitmap,cliprect,code,color,0,0,sx,sy);
 				}
 			}
@@ -281,8 +280,8 @@
 					int sx, sy, code, color = 0;
 					sy = BORDER_V/2 + y * 8;
 					sx = BORDER_H/2 + x * 16;
-					code = videoram[0x3800+offs] + lang_offs;
-					color = videoram[0x3801+offs];
+					code = m_vram[0x3800+offs] + lang_offs;
+					color = m_vram[0x3801+offs];
 					m_gfxdecode->gfx(1)->opaque(bitmap,cliprect,code,color,0,0,sx,sy);
 				}
 			}
diff -Nru mame-0.222+dfsg.1/src/mame/video/x1.cpp mame-0.224+dfsg.1/src/mame/video/x1.cpp
--- mame-0.222+dfsg.1/src/mame/video/x1.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/x1.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -1,14 +1,18 @@
 // license:LGPL-2.1+
 // copyright-holders:Angelo Salese, Barry Rodewald
-/****************************************************************************
+/******************************************************************************
  *
  * Sharp X1 Video functions
  *
  * TODO:
- * - make this to be scanline renderer, fix palette partial updates;
- * - take mc6845 device functions into account;
+ * - Rewrite drawing functions by taking scanline renderer into account
+ *   * cfr. x1fdemo raster effect on first screen.
+ * - Use mc6845 internal functions instead of breaking encapsulation
+ *   * annoying due of the double height/width stuff.
+ * - Improve border drawing, pinpoint what are the visible limits for a mc6845;
+ * - Move X1Turbo features into specific overrides;
  *
- ***************************************************************************/
+ *****************************************************************************/
 
 #include "emu.h"
 #include "includes/x1.h"
@@ -24,10 +28,13 @@
 	m_gfx_bitmap_ram = make_unique_clear<uint8_t[]>(0xc000*2);
 	m_bitmapbank->configure_entries(0, 2, m_gfx_bitmap_ram.get(), 0xc000);
 	m_bitmapbank->set_entry(0);
+	// TODO: set this up only on x1turbo
 	m_pal_4096 = make_unique_clear<uint8_t[]>(0x1000*3);
 }
 
-void x1_state::x1_draw_pixel(bitmap_rgb32 &bitmap,int y,int x,uint16_t pen,uint8_t width,uint8_t height)
+// helper for a single tile pixel taking height and width into account
+// TODO: height is never used
+void x1_state::x1_draw_pixel(bitmap_rgb32 &bitmap, int y, int x, uint16_t pen, uint8_t width, uint8_t height)
 {
 	if(!m_screen->visible_area().contains(x, y))
 		return;
@@ -71,8 +78,8 @@
 #define mc6845_update_addr      (((m_crtc_vreg[0x12]<<8) & 0x3f00) | (m_crtc_vreg[0x13] & 0xff))
 
 
-/* adjust tile index when we are under double height condition */
-uint8_t x1_state::check_prev_height(int x,int y,int x_size)
+// separate tile index when we are under double height condition
+uint8_t x1_state::check_prev_height(int x, int y, int x_size)
 {
 	uint8_t prev_tile = m_tvram[(x+((y-1)*x_size)+mc6845_start_addr) & 0x7ff];
 	uint8_t cur_tile = m_tvram[(x+(y*x_size)+mc6845_start_addr) & 0x7ff];
@@ -85,8 +92,9 @@
 	return 0;
 }
 
-/* Exoa II - Warroid: if double height isn't enabled on the first tile of the line then double height is disabled on everything else. */
-uint8_t x1_state::check_line_valid_height(int y,int x_size,int height)
+// exoa2: if double height isn't enabled on the first tile of the row then it is masked out on every other tile.
+// (game enables it for sprite/background collision)
+uint8_t x1_state::check_line_valid_height(int y, int x_size, int height)
 {
 	uint8_t line_attr = m_avram[(0+(y*x_size)+mc6845_start_addr) & 0x7ff];
 
@@ -96,47 +104,51 @@
 	return height;
 }
 
-void x1_state::draw_fgtilemap(bitmap_rgb32 &bitmap,const rectangle &cliprect)
+// tilemap drawing
+void x1_state::draw_fgtilemap(bitmap_rgb32 &bitmap, const rectangle &cliprect)
 {
 	/*
 	    attribute table:
 	    x--- ---- double width
 	    -x-- ---- double height
 	    --x- ---- PCG select
-	    ---x ---- color blinking
+	    ---x ---- color blinking (if 1 reverses color patterns rather than true blinking)
 	    ---- x--- reverse color
 	    ---- -xxx color pen
 
+	    X1 Turbo can also access an additional Kanji VRAM area
 	    x--- ---- select Kanji ROM
 	    -x-- ---- Kanji side (0=left, 1=right)
 	    --x- ---- Underline
-	    ---x ---- Kanji ROM select (0=level 1, 1=level 2) (TODO: implement this)
+	    ---x ---- Kanji ROM select (0=level 1, 1=level 2)
 	    ---- xxxx Kanji upper 4 bits
 	*/
 
-	int y,x,res_x,res_y;
+	int y, x, res_x, res_y;
 	uint32_t tile_offset;
-	uint8_t x_size,y_size;
+	uint8_t x_size, y_size;
 
 	x_size = mc6845_h_display;
 	y_size = mc6845_v_display;
 
+	//don't bother if screen is off
 	if(x_size == 0 || y_size == 0)
-		return; //don't bother if screen is off
+		return;
 
 	if(x_size != 80 && x_size != 40 && y_size != 25)
 		popmessage("%d %d",x_size,y_size);
 
-	for (y=0;y<y_size;y++)
+	for (y = 0; y < y_size; y++)
 	{
-		for (x=0;x<x_size;x++)
+		for (x = 0; x < x_size; x++)
 		{
+			// prepare information for this specific row/col
 			int tile = m_tvram[((x+y*x_size)+mc6845_start_addr) & 0x7ff];
 			int color = m_avram[((x+y*x_size)+mc6845_start_addr) & 0x7ff] & 0x1f;
 			int width = BIT(m_avram[((x+y*x_size)+mc6845_start_addr) & 0x7ff], 7);
 			int height = BIT(m_avram[((x+y*x_size)+mc6845_start_addr) & 0x7ff], 6);
 			int pcg_bank = BIT(m_avram[((x+y*x_size)+mc6845_start_addr) & 0x7ff], 5);
-			uint8_t *gfx_data = pcg_bank ? m_pcg_ram.get() : m_cg_rom; //machine.root_device().memregion(pcg_bank ? "pcg" : "cgrom")->base();
+			uint8_t *gfx_data = pcg_bank ? m_pcg_ram.get() : m_cg_rom;
 			int knj_enable = 0;
 			int knj_side = 0;
 			int knj_bank = 0;
@@ -146,6 +158,7 @@
 				knj_enable = BIT(m_kvram[((x+y*x_size)+mc6845_start_addr) & 0x7ff], 7);
 				knj_side = BIT(m_kvram[((x+y*x_size)+mc6845_start_addr) & 0x7ff], 6);
 				knj_uline = BIT(m_kvram[((x+y*x_size)+mc6845_start_addr) & 0x7ff], 5);
+				// TODO: verify usage and implement
 				//knj_lv2 = BIT(m_kvram[((x+y*x_size)+mc6845_start_addr) & 0x7ff], 4);
 				knj_bank = m_kvram[((x+y*x_size)+mc6845_start_addr) & 0x7ff] & 0x0f;
 				if(knj_enable)
@@ -156,7 +169,7 @@
 			}
 
 			{
-				int pen[3],pen_mask,pcg_pen,xi,yi,dy;
+				int pen[3], pen_mask, pcg_pen, xi, yi, dy;
 
 				pen_mask = color & 7;
 
@@ -167,22 +180,24 @@
 				if(height && y)
 					dy = check_prev_height(x,y,x_size);
 
-				/* guess: assume that Kanji VRAM doesn't double the vertical size */
+				/* guess: assume that if Kanji read is enabled then no double height can occur */
 				if(knj_enable) { height = 0; }
 
-				for(yi=0;yi<mc6845_tile_height;yi++)
+				for(yi = 0; yi < mc6845_tile_height; yi++)
 				{
-					for(xi=0;xi<8;xi++)
+					for(xi = 0; xi < 8; xi++)
 					{
-						if(knj_enable) //kanji select
+						if(knj_enable)
 						{
+							// Kanji ROM read
 							tile_offset  = tile * 16;
 							tile_offset += (yi+dy*(m_scrn_reg.v400_mode+1)) >> (height+m_scrn_reg.v400_mode);
 							pen[0] = gfx_data[tile_offset+0x0000]>>(7-xi) & (pen_mask & 1)>>0;
 							pen[1] = gfx_data[tile_offset+0x0000]>>(7-xi) & (pen_mask & 2)>>1;
 							pen[2] = gfx_data[tile_offset+0x0000]>>(7-xi) & (pen_mask & 4)>>2;
 
-							if(yi == mc6845_tile_height-1 && knj_uline) //underlined attribute
+							// apply underline
+							if(yi == mc6845_tile_height-1 && knj_uline)
 							{
 								pen[0] = (pen_mask & 1)>>0;
 								pen[1] = (pen_mask & 2)>>1;
@@ -192,8 +207,9 @@
 							if((yi >= 16 && m_scrn_reg.v400_mode == 0) || (yi >= 32 && m_scrn_reg.v400_mode == 1))
 								pen[0] = pen[1] = pen[2] = 0;
 						}
-						else if(pcg_bank) // PCG
+						else if(pcg_bank)
 						{
+							// PCG read
 							tile_offset  = tile * 8;
 							tile_offset += (yi+dy*(m_scrn_reg.v400_mode+1)) >> (height+m_scrn_reg.v400_mode);
 
@@ -206,6 +222,7 @@
 						}
 						else
 						{
+							// ANK read (-> BIOS GFX ROM)
 							tile_offset  = tile * (8*(m_scrn_reg.ank_sel+1));
 							tile_offset += (yi+dy*(m_scrn_reg.v400_mode+1)) >> (height+m_scrn_reg.v400_mode);
 
@@ -213,6 +230,7 @@
 							pen[1] = gfx_data[tile_offset+m_scrn_reg.ank_sel*0x0800]>>(7-xi) & (pen_mask & 2)>>1;
 							pen[2] = gfx_data[tile_offset+m_scrn_reg.ank_sel*0x0800]>>(7-xi) & (pen_mask & 4)>>2;
 
+							// disable drawing it goes beyond the available tile space
 							if(m_scrn_reg.ank_sel)
 							{
 								if((yi >= 16 && m_scrn_reg.v400_mode == 0) || (yi >= 32 && m_scrn_reg.v400_mode == 1))
@@ -225,27 +243,34 @@
 							}
 						}
 
-						pcg_pen = pen[2]<<2|pen[1]<<1|pen[0]<<0;
+						pcg_pen = (pen[2] << 2)|(pen[1] << 1)|(pen[0] << 0);
 
-						if(color & 0x10 && m_screen->frame_number() & 0x10) //reverse flickering
-							pcg_pen^=7;
+						// apply blink reverser
+						// TODO: verify interval
+						if(color & 0x10 && m_screen->frame_number() & 0x10)
+							pcg_pen ^= 7;
 
+						// ignore a color entry of zero (drawn at mixing time)
 						if(pcg_pen == 0 && (!(color & 8)))
 							continue;
 
-						if(color & 8) //revert the used color pen
-							pcg_pen^=7;
+						// reverse attribute
+						if(color & 8)
+							pcg_pen ^= 7;
 
+						// X1Turbo only: the black clip register overrides the pen with black if it's hit
 						if((m_scrn_reg.blackclip & 8) && (color == (m_scrn_reg.blackclip & 7)))
-							pcg_pen = 0; // clip the pen to black
+							pcg_pen = 0;
 
 						res_x = x*8+xi*(width+1);
 						res_y = y*(mc6845_tile_height)+yi;
 
-						if(res_y < cliprect.min_y || res_y > cliprect.max_y) // partial update, TODO: optimize
+						// apply partial update
+						// TODO: not working properly, see top of file
+						if(res_y < cliprect.min_y || res_y > cliprect.max_y)
 							continue;
 
-						x1_draw_pixel(bitmap,res_y,res_x,pcg_pen,width,0);
+						x1_draw_pixel(bitmap, res_y, res_x, pcg_pen, width, 0);
 					}
 				}
 			}
@@ -284,51 +309,61 @@
 	return pri_mask_calc;
 }
 
-void x1_state::draw_gfxbitmap(bitmap_rgb32 &bitmap,const rectangle &cliprect, int plane,int pri)
+// bitmap drawing
+void x1_state::draw_gfxbitmap(bitmap_rgb32 &bitmap, const rectangle &cliprect, int plane, int pri)
 {
-	int xi,yi,x,y;
-	int pen_r,pen_g,pen_b,color;
+	int xi, yi, x, y;
+	int pen_r, pen_g, pen_b, color;
 	int pri_mask_val;
-	uint8_t x_size,y_size;
+	uint8_t x_size, y_size;
 	int gfx_offset;
 
 	x_size = mc6845_h_display;
 	y_size = mc6845_v_display;
 
+	//don't bother if screen is off
 	if(x_size == 0 || y_size == 0)
-		return; //don't bother if screen is off
+		return;
 
 	if(x_size != 80 && x_size != 40 && y_size != 25)
 		popmessage("%d %d",x_size,y_size);
 
 	//popmessage("%04x %02x",mc6845_start_addr,mc6845_tile_height);
 
-	for (y=0;y<y_size;y++)
+	for (y = 0; y < y_size; y++)
 	{
-		for(x=0;x<x_size;x++)
+		for(x = 0; x < x_size; x++)
 		{
-			for(yi=0;yi<(mc6845_tile_height);yi++)
+			for(yi = 0; yi < (mc6845_tile_height); yi++)
 			{
-				for(xi=0;xi<8;xi++)
+				for(xi = 0; xi < 8; xi++)
 				{
 					gfx_offset = ((x+(y*x_size)) + mc6845_start_addr) & 0x7ff;
+					// X1Turbo only: apply extra offset bank
 					gfx_offset+= ((yi >> m_scrn_reg.v400_mode) * 0x800) & 0x3fff;
+					// X1Turbo only: plane variable, for double buffering
 					pen_b = (m_gfx_bitmap_ram[gfx_offset+0x0000+plane*0xc000]>>(7-xi)) & 1;
 					pen_r = (m_gfx_bitmap_ram[gfx_offset+0x4000+plane*0xc000]>>(7-xi)) & 1;
 					pen_g = (m_gfx_bitmap_ram[gfx_offset+0x8000+plane*0xc000]>>(7-xi)) & 1;
 
 					color =  (pen_g<<2 | pen_r<<1 | pen_b<<0) | 8;
 
+					// checkout priority mixing
+					// TODO: due of this we loop twice, it should be handled at mixing time instead.
 					pri_mask_val = priority_mixer_pri(color);
 					if(pri_mask_val & pri) continue;
 
-					if((color == 8 && m_scrn_reg.blackclip & 0x10) || (color == 9 && m_scrn_reg.blackclip & 0x20)) // bitmap color clip to black conditions
+					// X1Turbo only: the black clip register overrides the pen with black if it's hit
+					if((color == 8 && m_scrn_reg.blackclip & 0x10) || (color == 9 && m_scrn_reg.blackclip & 0x20))
 						color = 0;
 
-					if(y*(mc6845_tile_height)+yi < cliprect.min_y || y*(mc6845_tile_height)+yi > cliprect.max_y) // partial update TODO: optimize
+					// apply partial update
+					// TODO: not working properly, see top of file
+					if(y*(mc6845_tile_height)+yi < cliprect.min_y || y*(mc6845_tile_height)+yi > cliprect.max_y)
 						continue;
 
-					x1_draw_pixel(bitmap,y*(mc6845_tile_height)+yi,x*8+xi,color,0,0);
+					// TODO: call a fn subset instead of looping for a width/height that is never hit
+					x1_draw_pixel(bitmap, y*(mc6845_tile_height)+yi, x*8+xi, color, 0, 0);
 				}
 			}
 		}
@@ -339,15 +374,15 @@
 {
 	bitmap.fill(rgb_t(0xff,0x00,0x00,0x00), cliprect);
 
-	/* TODO: correct calculation thru mc6845 regs */
+	// TODO: correct calculation thru mc6845 regs
 	m_xstart = ((mc6845_h_char_total - mc6845_h_sync_pos) * 8) / 2;
 	m_ystart = ((mc6845_v_char_total - mc6845_v_sync_pos) * 8) / 2;
 
 //  popmessage("%d %d %d %d",mc6845_h_sync_pos,mc6845_v_sync_pos,mc6845_h_char_total,mc6845_v_char_total);
 
-	draw_gfxbitmap(bitmap,cliprect,m_scrn_reg.disp_bank,m_scrn_reg.pri);
-	draw_fgtilemap(bitmap,cliprect);
-	draw_gfxbitmap(bitmap,cliprect,m_scrn_reg.disp_bank,m_scrn_reg.pri^0xff);
+	draw_gfxbitmap(bitmap, cliprect, m_scrn_reg.disp_bank, m_scrn_reg.pri);
+	draw_fgtilemap(bitmap, cliprect);
+	draw_gfxbitmap(bitmap, cliprect, m_scrn_reg.disp_bank, m_scrn_reg.pri ^ 0xff);
 
 	return 0;
 }
diff -Nru mame-0.222+dfsg.1/src/mame/video/xmen.cpp mame-0.224+dfsg.1/src/mame/video/xmen.cpp
--- mame-0.222+dfsg.1/src/mame/video/xmen.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/xmen.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -95,8 +95,8 @@
 	m_k052109->tilemap_draw(screen, bitmap, cliprect, layer[1], 0, 2);
 	m_k052109->tilemap_draw(screen, bitmap, cliprect, layer[2], 0, 4);
 
-/* this isn't supported anymore and it is unsure if still needed; keeping here for reference
-    pdrawgfx_shadow_lowpri = 1; fix shadows of boulders in front of feet */
+	/* this isn't supported anymore and it is unsure if still needed; keeping here for reference
+	pdrawgfx_shadow_lowpri = 1; fix shadows of boulders in front of feet */
 	m_k053246->k053247_sprites_draw( bitmap, cliprect);
 	return 0;
 }
@@ -104,14 +104,12 @@
 
 uint32_t xmen_state::screen_update_xmen6p_left(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	int x, y;
-
-	for(y = 0; y < 32 * 8; y++)
+	for(int y = 0; y < 32 * 8; y++)
 	{
 		uint16_t* line_dest = &bitmap.pix16(y);
 		uint16_t* line_src = &m_screen_left->pix16(y);
 
-		for (x = 12 * 8; x < 52 * 8; x++)
+		for (int x = 12 * 8; x < 52 * 8; x++)
 			line_dest[x] = line_src[x];
 	}
 
@@ -120,14 +118,12 @@
 
 uint32_t xmen_state::screen_update_xmen6p_right(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	int x, y;
-
-	for(y = 0; y < 32 * 8; y++)
+	for(int y = 0; y < 32 * 8; y++)
 	{
 		uint16_t* line_dest = &bitmap.pix16(y);
 		uint16_t* line_src = &m_screen_right->pix16(y);
 
-		for (x = 12 * 8; x < 52 * 8; x++)
+		for (int x = 12 * 8; x < 52 * 8; x++)
 			line_dest[x] = line_src[x];
 	}
 
@@ -143,51 +139,28 @@
 		int layer[3], bg_colorbase;
 		bitmap_ind16 * renderbitmap;
 		rectangle cliprect;
-		int offset;
-
-	//  const rectangle *visarea = m_screen->visible_area();
-	//  cliprect = *visarea;
 
+		// const rectangle *visarea = m_screen->visible_area();
+		// cliprect = *visarea;
 		cliprect.set(0, 64 * 8 - 1, 2 * 8, 30 * 8 - 1);
 
+		int index = m_screen->frame_number() & 1;
+		renderbitmap = index ? m_screen_right.get() : m_screen_left.get();
 
-		if (m_screen->frame_number() & 0x01)
-		{
-			/* copy the desired spritelist to the chip */
-			memcpy(m_k053247_ram, m_xmen6p_spriteramright, 0x1000);
-
-			/* we write the entire content of the tileram to the chip to ensure
-			   everything gets marked as dirty and the desired tilemap is rendered
-			   this is not very efficient!
-			   */
-			for (offset = 0; offset < (0xc000 / 2); offset++)
-			{
-				m_k052109->write(offset, m_xmen6p_tilemapright[offset] & 0x00ff);
-			}
-
+		/* copy the desired spritelist to the chip */
+		memcpy(m_k053247_ram, m_xmen6p_spriteram[index], 0x1000);
 
-			renderbitmap = m_screen_right.get();
-		}
-		else
+		/* we write the entire content of the tileram to the chip to ensure
+		   everything gets marked as dirty and the desired tilemap is rendered
+		   this is not very efficient!
+		*/
+		index += m_xmen6p_tilemap_select ? 2 : 0;
+		for (int offset = 0; offset < (0xc000 / 2); offset++)
 		{
-			/* copy the desired spritelist to the chip */
-			memcpy(m_k053247_ram, m_xmen6p_spriteramleft, 0x1000);
-
-			/* we write the entire content of the tileram to the chip to ensure
-			   everything gets marked as dirty and the desired tilemap is rendered
-
-			   this is not very efficient!
-			   */
-			for (offset = 0; offset < (0xc000 / 2); offset++)
-			{
-				m_k052109->write(offset, m_xmen6p_tilemapleft[offset] & 0x00ff);
-			}
-
-
-			renderbitmap = m_screen_left.get();
+			if (index == 0 || (offset != 0x1c80 && offset != 0x1e80))
+				m_k052109->write(offset, m_xmen6p_tilemap[index][offset] & 0x00ff);
 		}
 
-
 		bg_colorbase = m_k053251->get_palette_index(k053251_device::CI4);
 		m_sprite_colorbase = m_k053251->get_palette_index(k053251_device::CI1);
 		m_layer_colorbase[0] = m_k053251->get_palette_index(k053251_device::CI3);
@@ -212,8 +185,8 @@
 		m_k052109->tilemap_draw(*m_screen, *renderbitmap, cliprect, layer[1], 0, 2);
 		m_k052109->tilemap_draw(*m_screen, *renderbitmap, cliprect, layer[2], 0, 4);
 
-	/* this isn't supported anymore and it is unsure if still needed; keeping here for reference
-	    pdrawgfx_shadow_lowpri = 1; fix shadows of boulders in front of feet */
-		m_k053246->k053247_sprites_draw( *renderbitmap, cliprect);
+		/* this isn't supported anymore and it is unsure if still needed; keeping here for reference
+		pdrawgfx_shadow_lowpri = 1; fix shadows of boulders in front of feet */
+		m_k053246->k053247_sprites_draw(*renderbitmap, cliprect);
 	}
 }
diff -Nru mame-0.222+dfsg.1/src/mame/video/xybots.cpp mame-0.224+dfsg.1/src/mame/video/xybots.cpp
--- mame-0.222+dfsg.1/src/mame/video/xybots.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/xybots.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -7,8 +7,6 @@
 ****************************************************************************/
 
 #include "emu.h"
-#include "machine/atarigen.h"
-#include "video/atarimo.h"
 #include "includes/xybots.h"
 
 
diff -Nru mame-0.222+dfsg.1/src/mame/video/zerozone.cpp mame-0.224+dfsg.1/src/mame/video/zerozone.cpp
--- mame-0.222+dfsg.1/src/mame/video/zerozone.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/mame/video/zerozone.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -2,7 +2,7 @@
 // copyright-holders:Brad Oliver
 /***************************************************************************
 
-  video/zerozone.c
+  video/zerozone.cpp
 
 ***************************************************************************/
 
@@ -16,7 +16,7 @@
 }
 
 
-void zerozone_state::tilebank_w(uint16_t data)
+void zerozone_state::tilebank_w(uint8_t data)
 {
 //  popmessage ("Data %04x",data);
 	m_tilebank = data & 0x07;
@@ -36,13 +36,13 @@
 
 void zerozone_state::video_start()
 {
-	// i'm not 100% sure it should be opaque, pink title screen looks strange in las vegas girls
-	// but if its transparent other things look incorrect
+	// I'm not 100% sure it should be opaque, pink title screen looks strange in Las Vegas Girls
+	// but if it's transparent other things look incorrect
 	m_zz_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(*this, FUNC(zerozone_state::get_zerozone_tile_info)), TILEMAP_SCAN_COLS, 8, 8, 64, 32);
 }
 
 uint32_t zerozone_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
 {
-	m_zz_tilemap->draw(screen, bitmap, cliprect, 0, 0);
+	m_zz_tilemap->draw(screen, bitmap, cliprect);
 	return 0;
 }
diff -Nru mame-0.222+dfsg.1/src/osd/eminline.h mame-0.224+dfsg.1/src/osd/eminline.h
--- mame-0.222+dfsg.1/src/osd/eminline.h	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/osd/eminline.h	2020-08-26 08:57:19.000000000 +0000
@@ -370,7 +370,7 @@
 	static_assert(sizeof(val) == sizeof(unsigned), "expected 32-bit unsigned int");
 	return unsigned(__builtin_popcount(static_cast<unsigned>(val)));
 #else
-	// optimal Hamming weight assuing fast 32*32->32
+	// optimal Hamming weight assuming fast 32*32->32
 	constexpr uint32_t m1(0x55555555);
 	constexpr uint32_t m2(0x33333333);
 	constexpr uint32_t m4(0x0f0f0f0f);
diff -Nru mame-0.222+dfsg.1/src/osd/modules/render/drawd3d.cpp mame-0.224+dfsg.1/src/osd/modules/render/drawd3d.cpp
--- mame-0.222+dfsg.1/src/osd/modules/render/drawd3d.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/osd/modules/render/drawd3d.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -209,6 +209,7 @@
 	d3d9_create_fn d3d9_create_ptr = d3dintf->d3d9_dll->bind<d3d9_create_fn>("Direct3DCreate9");
 	if (d3d9_create_ptr == nullptr)
 	{
+		global_free(d3dintf);
 		osd_printf_verbose("Direct3D: Unable to find Direct3D 9 runtime library\n");
 		return true;
 	}
@@ -216,6 +217,7 @@
 	d3dintf->d3dobj = (*d3d9_create_ptr)(D3D_SDK_VERSION);
 	if (d3dintf->d3dobj == nullptr)
 	{
+		global_free(d3dintf);
 		osd_printf_verbose("Direct3D: Unable to initialize Direct3D 9\n");
 		return true;
 	}
@@ -971,6 +973,7 @@
 	{
 		d3dintf->d3dobj->Release();
 		global_free(d3dintf);
+		d3dintf = nullptr;
 	}
 }
 
diff -Nru mame-0.222+dfsg.1/src/osd/windows/window.cpp mame-0.224+dfsg.1/src/osd/windows/window.cpp
--- mame-0.222+dfsg.1/src/osd/windows/window.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/osd/windows/window.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -72,7 +72,8 @@
 #define FULLSCREEN_STYLE_EX             WS_EX_TOPMOST
 
 // minimum window dimension
-#define MIN_WINDOW_DIM                  200
+#define MIN_WINDOW_DIMX                 200
+#define MIN_WINDOW_DIMY                 50
 
 // custom window messages
 #define WM_USER_REDRAW                  (WM_USER + 2)
@@ -1294,8 +1295,8 @@
 		case WM_GETMINMAXINFO:
 		{
 			auto *minmax = (MINMAXINFO *)lparam;
-			minmax->ptMinTrackSize.x = MIN_WINDOW_DIM;
-			minmax->ptMinTrackSize.y = MIN_WINDOW_DIM;
+			minmax->ptMinTrackSize.x = MIN_WINDOW_DIMX;
+			minmax->ptMinTrackSize.y = MIN_WINDOW_DIMY;
 			break;
 		}
 
@@ -1498,14 +1499,6 @@
 	// get the minimum width/height for the current layout
 	m_target->compute_minimum_size(minwidth, minheight);
 
-	// clamp against the absolute minimum
-	propwidth = std::max(propwidth, MIN_WINDOW_DIM);
-	propheight = std::max(propheight, MIN_WINDOW_DIM);
-
-	// clamp against the minimum width and height
-	propwidth = std::max(propwidth, minwidth);
-	propheight = std::max(propheight, minheight);
-
 	// clamp against the maximum (fit on one screen for full screen mode)
 	if (fullscreen())
 	{
@@ -1517,13 +1510,25 @@
 		maxwidth = monitor->usuable_position_size().width() - extrawidth;
 		maxheight = monitor->usuable_position_size().height() - extraheight;
 
-		// further clamp to the maximum width/height in the window
+		// clamp minimum against half of maximum to allow resizing very large targets (eg. SVG screen)
+		minwidth = std::min(minwidth, maxwidth / 2);
+		minheight = std::min(minheight, maxheight / 2);
+
+		// clamp maximum to the maximum width/height in the window
 		if (m_win_config.width != 0)
 			maxwidth = std::min(maxwidth, m_win_config.width + extrawidth);
 		if (m_win_config.height != 0)
 			maxheight = std::min(maxheight, m_win_config.height + extraheight);
 	}
 
+	// clamp against the absolute minimum
+	propwidth = std::max(propwidth, MIN_WINDOW_DIMX);
+	propheight = std::max(propheight, MIN_WINDOW_DIMY);
+
+	// clamp against the minimum width and height
+	propwidth = std::max(propwidth, minwidth);
+	propheight = std::max(propheight, minheight);
+
 	// clamp to the maximum
 	propwidth = std::min(propwidth, maxwidth);
 	propheight = std::min(propheight, maxheight);
@@ -1580,10 +1585,10 @@
 	m_target->compute_minimum_size(minwidth, minheight);
 
 	// expand to our minimum dimensions
-	if (minwidth < MIN_WINDOW_DIM)
-		minwidth = MIN_WINDOW_DIM;
-	if (minheight < MIN_WINDOW_DIM)
-		minheight = MIN_WINDOW_DIM;
+	if (minwidth < MIN_WINDOW_DIMX)
+		minwidth = MIN_WINDOW_DIMX;
+	if (minheight < MIN_WINDOW_DIMY)
+		minheight = MIN_WINDOW_DIMY;
 
 	// account for extra window stuff
 	minwidth += wnd_extra_width();
@@ -1844,7 +1849,7 @@
 		// otherwise, set a small size and maximize from there
 		else
 		{
-			SetWindowPos(platform_window(), HWND_TOP, 0, 0, MIN_WINDOW_DIM, MIN_WINDOW_DIM, SWP_NOZORDER);
+			SetWindowPos(platform_window(), HWND_TOP, 0, 0, MIN_WINDOW_DIMX, MIN_WINDOW_DIMY, SWP_NOZORDER);
 			maximize_window();
 		}
 	}
diff -Nru mame-0.222+dfsg.1/src/tools/chdman.cpp mame-0.224+dfsg.1/src/tools/chdman.cpp
--- mame-0.222+dfsg.1/src/tools/chdman.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/tools/chdman.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -38,8 +38,8 @@
 //**************************************************************************
 //  CONSTANTS & DEFINES
 //**************************************************************************
-// MINGW has adopted the MSVC formatting for 64-bit ints as of GCC 4.4 and deprecated it as of GCC 10
-#if defined(WIN32) && defined(__GNUC__) && (__GNUC__ < 10)
+// MINGW has adopted the MSVC formatting for 64-bit ints as of GCC 4.4 and deprecated it as of GCC 9.3
+#if defined(WIN32) && defined(__GNUC__) && ((__GNUC__ < 9) || ((__GNUC__ == 9) && (__GNUC_MINOR__ < 3)))
 #define I64FMT   "I64"
 #elif !defined(__APPLE__) && defined(__LP64__)
 #define I64FMT   "l"
diff -Nru mame-0.222+dfsg.1/src/tools/floptool.cpp mame-0.224+dfsg.1/src/tools/floptool.cpp
--- mame-0.222+dfsg.1/src/tools/floptool.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/tools/floptool.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -62,6 +62,8 @@
 #include "formats/flex_dsk.h"
 #include "formats/uniflex_dsk.h"
 
+#include "formats/mdos_dsk.h"
+
 
 static floppy_format_type floppy_formats[] = {
 	FLOPPY_MFI_FORMAT,
@@ -112,7 +114,9 @@
 	FLOPPY_OS9_FORMAT,
 
 	FLOPPY_FLEX_FORMAT,
-	FLOPPY_UNIFLEX_FORMAT
+	FLOPPY_UNIFLEX_FORMAT,
+
+	FLOPPY_MDOS_FORMAT
 };
 
 void CLIB_DECL ATTR_PRINTF(1,2) logerror(const char *format, ...)
diff -Nru mame-0.222+dfsg.1/src/tools/unidasm.cpp mame-0.224+dfsg.1/src/tools/unidasm.cpp
--- mame-0.222+dfsg.1/src/tools/unidasm.cpp	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/src/tools/unidasm.cpp	2020-08-26 08:57:19.000000000 +0000
@@ -57,6 +57,7 @@
 #include "cpu/h8/h8hd.h"
 #include "cpu/h8/h8s2000d.h"
 #include "cpu/h8/h8s2600d.h"
+#include "cpu/h16/h16dasm.h"
 #include "cpu/h8500/h8500dasm.h"
 #include "cpu/hcd62121/hcd62121d.h"
 #include "cpu/hd61700/hd61700d.h"
@@ -399,6 +400,7 @@
 	{ "h8s2000",         be,  0, []() -> util::disasm_interface * { return new h8s2000_disassembler; } },
 	{ "h8s2600",         be,  0, []() -> util::disasm_interface * { return new h8s2600_disassembler; } },
 	{ "h8500",           be,  0, []() -> util::disasm_interface * { return new h8500_disassembler; } },
+	{ "h16",             be,  0, []() -> util::disasm_interface * { return new h16_disassembler; } },
 	{ "hc11",            be,  0, []() -> util::disasm_interface * { return new hc11_disassembler; } },
 	{ "hcd62121",        le,  0, []() -> util::disasm_interface * { return new hcd62121_disassembler; } },
 	{ "hd61700",         le, -1, []() -> util::disasm_interface * { return new hd61700_disassembler; } },
diff -Nru mame-0.222+dfsg.1/.travis.yml mame-0.224+dfsg.1/.travis.yml
--- mame-0.222+dfsg.1/.travis.yml	2020-06-26 14:54:18.000000000 +0000
+++ mame-0.224+dfsg.1/.travis.yml	2020-08-26 08:57:19.000000000 +0000
@@ -1,20 +1,49 @@
 language: cpp
-compiler:
-  - gcc
-  - clang
-os:
-  - linux
-  - osx
-dist: bionic
-osx_image: xcode11.5
-matrix:
-  exclude:
+dist: focal
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - gcc-10
+    - g++-10
+    - libsdl2-dev
+    - libsdl2-ttf-dev
+    - libasound2-dev
+    - libxinerama-dev
+    - libxi-dev
+    - qt5-default
+    update: true
+  homebrew:
+    packages:
+    - sdl2
+    - sdl2_ttf
+    update: true
+jobs:
+  include:
     - os: osx
+      osx_image: xcode11.6
+      compiler: clang
+      env: SUBTARGET=ci   MAME=mameci64
+    - os: linux
+      arch: amd64
       compiler: gcc
+      env: SUBTARGET=ci   MAME=mameci64
     - os: linux
-      compiler: clang
-env:
-  - SUBTARGET=tiny   MAME=mametiny64
+      arch: arm64
+      compiler: gcc
+      env: SUBTARGET=ci   MAME=mameci
+    - os: linux
+      arch: s390x
+      compiler: gcc
+      env: SUBTARGET=ci   MAME=mameci64
+    - os: linux
+      arch: ppc64le
+      compiler: gcc
+      env: SUBTARGET=ci   MAME=mameci64
+  allow_failures:
+    - arch: ppc64le
+  fast_finish: true
 script:
   - if [ $TRAVIS_OS_NAME == 'linux' ]; then
     if [ $CC == 'clang' ]; then
@@ -24,13 +53,6 @@
     elif [ $TRAVIS_OS_NAME == 'osx' ]; then
     unset LDOPTS && make -j2 OPTIMIZE=0 USE_LIBSDL=1 TOOLS=1 && ./$MAME -validate;
     fi
-sudo: required
-before_install:
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y; fi"
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo apt-get update -qq; fi"
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo apt-get install -y --force-yes gcc-10 g++-10 libsdl2-dev libsdl2-ttf-dev libasound2-dev libxinerama-dev libxi-dev qt5-default; fi"
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then brew update; fi"
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then brew install sdl2 sdl2_ttf; fi"
 branches:
   only:
     - master